From james.hilliard1 at gmail.com Wed Feb 1 00:02:48 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 17:02:48 -0700 Subject: [Buildroot] [PATCH 1/1] package/neon-2-sse: bump to version 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f Message-ID: <20230201000248.1104432-1-james.hilliard1@gmail.com> Drop patch which is now upstream. Signed-off-by: James Hilliard --- .../neon-2-sse/0001-Fix-cmake-languages.patch | 40 ------------------- package/neon-2-sse/neon-2-sse.hash | 2 +- package/neon-2-sse/neon-2-sse.mk | 2 +- 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 package/neon-2-sse/0001-Fix-cmake-languages.patch diff --git a/package/neon-2-sse/0001-Fix-cmake-languages.patch b/package/neon-2-sse/0001-Fix-cmake-languages.patch deleted file mode 100644 index e0becb1ffa..0000000000 --- a/package/neon-2-sse/0001-Fix-cmake-languages.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 186ec82e033d8c718d760d14945535a9d7e160fd Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sun, 29 Jan 2023 21:00:27 -0700 -Subject: [PATCH] Fix cmake languages - -When no language is set cmake defaults to C and CXX, since we support -C by itself we should set the project language to C so that we don't -get a compiler error when building without a CXX toolchain. - -Fixes: -CMake Error at CMakeLists.txt:5 (project): - No CMAKE_CXX_COMPILER could be found. - - Tell CMake where to find the compiler by setting either the environment - variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path - to the compiler, or to the compiler name if it is in the PATH. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/intel/ARM_NEON_2_x86_SSE/pull/62] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e4b8980..8f58e79 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,7 +2,7 @@ - # Modification: Copyright (C) 2017 David Hirvonen - - cmake_minimum_required(VERSION 3.0) --project(NEON_2_SSE VERSION 1.0.0) -+project(NEON_2_SSE VERSION 1.0.0 LANGUAGES C) - - add_library(${PROJECT_NAME} INTERFACE) - --- -2.34.1 - diff --git a/package/neon-2-sse/neon-2-sse.hash b/package/neon-2-sse/neon-2-sse.hash index ded20d58f5..f964d2fa61 100644 --- a/package/neon-2-sse/neon-2-sse.hash +++ b/package/neon-2-sse/neon-2-sse.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 019fbc7ec25860070a1d90e12686fc160cfb33e22aa063c80f52b363f1361e9d neon-2-sse-a15b489e1222b2087007546b4912e21293ea86ff.tar.gz +sha256 4567ca8c8cbc8ce0ea3ddb9dc0f158707eb85c631cb400fd7010cd299cdc5377 neon-2-sse-097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f.tar.gz # License files, locally calculated sha256 7022f51b439a5915e933ecc270c83e24ca0cb2cceeb08b0132dcd4dbb03ed2dc LICENSE diff --git a/package/neon-2-sse/neon-2-sse.mk b/package/neon-2-sse/neon-2-sse.mk index 3e87c62e21..ee6f5446b6 100644 --- a/package/neon-2-sse/neon-2-sse.mk +++ b/package/neon-2-sse/neon-2-sse.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEON_2_SSE_VERSION = a15b489e1222b2087007546b4912e21293ea86ff +NEON_2_SSE_VERSION = 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f NEON_2_SSE_SITE = $(call github,intel,ARM_NEON_2_x86_SSE,$(NEON_2_SSE_VERSION)) NEON_2_SSE_LICENSE = BSD-2-Clause NEON_2_SSE_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 02:37:55 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 19:37:55 -0700 Subject: [Buildroot] [PATCH 1/2] package/ell: bump to version 0.56 Message-ID: <20230201023756.1418443-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 68832c3201..c0f1731676 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 a7d0df846af839bbea1b80f292166371070328854b3fa785b5c607fe600552ad ell-0.53.tar.xz +sha256 58eb8b2b64087f7479d5db6a830a0656c536d93e5f11d4c9a4443ce8760a1b63 ell-0.56.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index b27d6feb65..994b0e19f0 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.53 +ELL_VERSION = 0.56 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 02:37:56 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 19:37:56 -0700 Subject: [Buildroot] [PATCH 2/2] package/iwd: bump to version 2.2 In-Reply-To: <20230201023756.1418443-1-james.hilliard1@gmail.com> References: <20230201023756.1418443-1-james.hilliard1@gmail.com> Message-ID: <20230201023756.1418443-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 e7971cd637..be048b3da6 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 9fd13512dc27d83efb8d341f7df98f5488f70131686021fcd0d93fc97af013b8 iwd-1.30.tar.xz +sha256 dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570 iwd-2.2.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 5ffbde334e..b0a2f6e9ed 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.30 +IWD_VERSION = 2.2 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:46 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:46 -0700 Subject: [Buildroot] [PATCH 01/13] package/libnice: bump to version 0.1.21 Message-ID: <20230201051658.383420-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/libnice/libnice.hash | 2 +- package/libnice/libnice.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnice/libnice.hash b/package/libnice/libnice.hash index 83b28a9ad9..cf6d825f83 100644 --- a/package/libnice/libnice.hash +++ b/package/libnice/libnice.hash @@ -1,5 +1,5 @@ # Locally computed after checking pgp signature -sha256 6747af710998cf708a2e8ceef51cccd181373d94201dd4b8d40797a070ed47cc libnice-0.1.19.tar.gz +sha256 72e73a2acf20f59093e21d5601606e405873503eb35f346fa621de23e99b3b39 libnice-0.1.21.tar.gz # Hash for license files: sha256 9246b2ee8b1db30cf03d5d9719ad8bb5edce1cadc85f8cfef319c23d24d950b5 COPYING diff --git a/package/libnice/libnice.mk b/package/libnice/libnice.mk index 2b223bedd3..56ee35e452 100644 --- a/package/libnice/libnice.mk +++ b/package/libnice/libnice.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNICE_VERSION = 0.1.19 -LIBNICE_SITE = http://nice.freedesktop.org/releases +LIBNICE_VERSION = 0.1.21 +LIBNICE_SITE = https://libnice.freedesktop.org/releases LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL LIBNICE_DEPENDENCIES = libglib2 host-pkgconf -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:47 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:47 -0700 Subject: [Buildroot] [PATCH 02/13] package/gstreamer1: bump to version 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 5fb52606fe..db0ed5bede 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.4.tar.xz.sha256sum -sha256 67c1edf8c3c339cda5dde85f4f7b953bb9607c2d13ae970e2491c5c4c055ef5f gstreamer-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.0.tar.xz.sha256sum +sha256 78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09 gstreamer-1.22.0.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 16c016b145..09d1a10ce7 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.20.4 +GSTREAMER1_VERSION = 1.22.0 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:49 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:49 -0700 Subject: [Buildroot] [PATCH 04/13] package/gst1-plugins-good: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-4-james.hilliard1@gmail.com> Add new xingmux config option. Signed-off-by: James Hilliard --- package/gstreamer1/gst1-plugins-good/Config.in | 5 +++++ .../gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in index 67df206eea..d7ec16e800 100644 --- a/package/gstreamer1/gst1-plugins-good/Config.in +++ b/package/gstreamer1/gst1-plugins-good/Config.in @@ -246,6 +246,11 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE help Parse a .wav file into raw audio +config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX + bool "xingmux" + help + Add XING tags to mpeg audio files + config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M bool "y4m" help diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index b30c512878..3e219faad8 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.4.tar.xz.sha256sum -sha256 b16130fbe632fa8547c2147a0ef575b0140fb521065c5cb121c72ddbd23b64da gst-plugins-good-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.0.tar.xz.sha256sum +sha256 582e617271e7f314d1a2211e3e3856ae2e4303c8c0d6114e9c4a5ea5719294b0 gst-plugins-good-1.22.0.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 cc7bab5824..93c2328bda 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.4 +GST1_PLUGINS_GOOD_VERSION = 1.22.0 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 @@ -324,6 +324,12 @@ else GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavparse=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX),y) +GST1_PLUGINS_GOOD_CONF_OPTS += -Dxingmux=enabled +else +GST1_PLUGINS_GOOD_CONF_OPTS += -Dxingmux=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dy4m=enabled else -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:50 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:50 -0700 Subject: [Buildroot] [PATCH 05/13] package/gst1-plugins-bad: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-5-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 c8789a707d..90b3a18982 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.4.tar.xz.sha256sum -sha256 a1a3f53b3604d9a04fdd0bf9a1a616c3d2dab5320489e9ecee1178e81e33a16a gst-plugins-bad-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.0.tar.xz.sha256sum +sha256 3c9d9300f5f4fb3e3d36009379d1fb6d9ecd79c1a135df742b8a68417dd663a1 gst-plugins-bad-1.22.0.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 14710a2501..8f11ce6b37 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.4 +GST1_PLUGINS_BAD_VERSION = 1.22.0 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.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:48 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:48 -0700 Subject: [Buildroot] [PATCH 03/13] package/gst1-plugins-base: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-3-james.hilliard1@gmail.com> The videoconvert and videoscale plugins have been combined into the new videoconvertscale plugin. Rework config options using videoconvert/videoscale to use the new videoconvertscale option. Signed-off-by: James Hilliard --- Config.in.legacy | 14 ++++++++++++++ package/gstreamer1/gst1-plugins-base/Config.in | 13 ++++--------- .../gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- .../gst1-plugins-base/gst1-plugins-base.mk | 14 ++++---------- .../gstreamer1-editing-services/Config.in | 3 +-- package/webkitgtk/Config.in | 3 +-- package/wpewebkit/Config.in | 3 +-- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 41c5fdefb3..3fff2b1ddd 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,20 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + bool "videoscale removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoscale option has been combined with videoconvert. + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT + bool "videoconvert removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoconvert option has been combined with videoscale. + config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 bool "imx-gpu-viv X11 output has been removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in index bd4ee0b994..df10774ac7 100644 --- a/package/gstreamer1/gst1-plugins-base/Config.in +++ b/package/gstreamer1/gst1-plugins-base/Config.in @@ -59,10 +59,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING help various encoding-related elements -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - bool "videoconvert" +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + bool "videoconvertscale (mandatory for video playback)" + default y help - Colorspace conversion + Colorspace conversion, resizes video config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO bool "gio" @@ -123,12 +124,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE help Adjusts video frames -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE - bool "videoscale (mandatory for video playback)" - default y - help - Resizes video - config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME bool "volume (mandatory for audio playback)" default y diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 5c729d832f..bac4f8398a 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.4.tar.xz.sha256sum -sha256 8d181b7abe4caf23ee9f9ec5b4d3e232640452464e39495bfffb6d776fc97225 gst-plugins-base-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.0.tar.xz.sha256sum +sha256 f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d gst-plugins-base-1.22.0.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 d225cdf910..7d509331fe 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.4 +GST1_PLUGINS_BASE_VERSION = 1.22.0 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 @@ -147,10 +147,10 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dencoding=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y) -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=enabled +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE),y) +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvertscale=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=disabled +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvertscale=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO),y) @@ -219,12 +219,6 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dvideorate=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y) -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=enabled -else -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME),y) GST1_PLUGINS_BASE_CONF_OPTS += -Dvolume=enabled else diff --git a/package/gstreamer1/gstreamer1-editing-services/Config.in b/package/gstreamer1/gstreamer1-editing-services/Config.in index 9c41e8142b..e824781d47 100644 --- a/package/gstreamer1/gstreamer1-editing-services/Config.in +++ b/package/gstreamer1/gstreamer1-editing-services/Config.in @@ -6,9 +6,8 @@ config BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE # runtime - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT # runtime + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC # runtime - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME # runtime select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE # runtime help diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index cafe497491..dc5d738dae 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -104,8 +104,7 @@ config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 04ed40bd92..7a8dc557c3 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -97,8 +97,7 @@ config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:51 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:51 -0700 Subject: [Buildroot] [PATCH 06/13] package/gst1-plugins-ugly: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-6-james.hilliard1@gmail.com> Remove xingmux config option which has been moved to the gst1-plugins-good package. Signed-off-by: James Hilliard --- Config.in.legacy | 7 +++++++ package/gstreamer1/gst1-plugins-ugly/Config.in | 5 ----- .../gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 8 +------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3fff2b1ddd..1c5af2652a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX + bool "xingmux moved" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX + help + The xingmux option has been moved to gst1-plugins-good. + config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE bool "videoscale removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in index ba19989892..54766ffa8c 100644 --- a/package/gstreamer1/gst1-plugins-ugly/Config.in +++ b/package/gstreamer1/gst1-plugins-ugly/Config.in @@ -26,11 +26,6 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB help DVD subtitle parser and decoder -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX - bool "xingmux" - help - Add XING tags to mpeg audio files - config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA bool "realmedia" help diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 4ec29e6894..21579216df 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.4.tar.xz.sha256sum -sha256 5c9ec6bab96517e438b3f9bae0ceb84d3436f3da9bbe180cf4d28e32a7251b59 gst-plugins-ugly-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz.sha256sum +sha256 a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c gst-plugins-ugly-1.22.0.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 20382719c3..9f16fa3da8 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.4 +GST1_PLUGINS_UGLY_VERSION = 1.22.0 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 @@ -51,12 +51,6 @@ else GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=enabled -else -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=enabled else -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:52 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:52 -0700 Subject: [Buildroot] [PATCH 07/13] package/gst1-devtools: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-7-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 fc504a2c12..46480445ab 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.4.tar.xz.sha256sum -sha256 82a293600273f4dd3eed567aae510ca0c7d629c3807788b00e6cdbd1d2459a84 gst-devtools-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.0.tar.xz.sha256sum +sha256 4d21fee5c15f2877c0b1f6c2da0cdba67ce7caab2c199ab27e91a1394d5ba195 gst-devtools-1.22.0.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 fbb04c92ef..8fd3321d9e 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.4 +GST1_DEVTOOLS_VERSION = 1.22.0 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.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:53 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:53 -0700 Subject: [Buildroot] [PATCH 08/13] package/gst1-libav: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-8-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 78f5b5bb07..c2c58ab2fe 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.4.tar.xz.sha256sum -sha256 04ccbdd58fb31dd94098da599209834a0e7661638c5703381dd0a862c56fc532 gst-libav-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.0.tar.xz.sha256sum +sha256 0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1 gst-libav-1.22.0.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index a867af5147..d4b3873af1 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.4 +GST1_LIBAV_VERSION = 1.22.0 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.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:54 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:54 -0700 Subject: [Buildroot] [PATCH 09/13] package/gst1-vaapi: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-9-james.hilliard1@gmail.com> Update config option names and dependency requirements. Signed-off-by: James Hilliard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 37 +++++++++++++++---- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 5baaa4dfb7..6dec625c93 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.4.tar.xz.sha256sum -sha256 ab12596144c05506e9782374c5d2cdfb3069fca89908d6de360d947bb77fd06a gstreamer-vaapi-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.0.tar.xz.sha256sum +sha256 593ccad19f88e5fa29f40f98356c007806bd535828707b1406944d16a90bdff5 gstreamer-vaapi-1.22.0.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 bd6c16be3e..3d9eb91ffb 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.4 +GST1_VAAPI_VERSION = 1.22.0 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+ @@ -18,19 +18,40 @@ GST1_VAAPI_DEPENDENCIES += \ libdrm GST1_VAAPI_CONF_OPTS += \ - -Dwith_drm=yes \ - -Dwith_x11=no \ - -Dwith_glx=no \ - -Dwith_wayland=no \ - -Dwith_egl=no \ + -Ddrm=enabled \ + -Degl=enabled \ -Dexamples=disabled \ -Dtests=disabled \ -Ddoc=disabled ifeq ($(BR2_PACKAGE_GST1_VAAPI_ENCODERS),y) -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=yes +GST1_VAAPI_CONF_OPTS += -Dencoders=enabled else -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=no +GST1_VAAPI_CONF_OPTS += -Dencoders=disabled +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) +GST1_VAAPI_CONF_OPTS += -Degl=enabled +GST1_VAAPI_DEPENDENCIES += libegl +else +GST1_VAAPI_CONF_OPTS += -Degl=disabled +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +GST1_VAAPI_CONF_OPTS += -Dwayland=enabled +else +GST1_VAAPI_CONF_OPTS += -Dwayland=disabled +endif + +ifeq ($(BR2_PACKAGE_XORG7),y) +GST1_VAAPI_CONF_OPTS += -Dx11=enabled +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +GST1_VAAPI_CONF_OPTS += -Dglx=enabled +else +GST1_VAAPI_CONF_OPTS += -Dglx=disabled +endif +else +GST1_VAAPI_CONF_OPTS += -Dx11=disabled -Dglx=disabled endif $(eval $(meson-package)) -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:57 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:57 -0700 Subject: [Buildroot] [PATCH 12/13] package/gst-omx: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-12-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 140ad626f7..51ea74a0cb 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.4.tar.xz.sha256sum -sha256 70ddd485e2dcab79070164d61ad2ff3a63e15a1d7abf9075d86eb77762b0edfd gst-omx-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.0.tar.xz.sha256sum +sha256 dbc951a99af532380e599aa8acd9e1385fdb299b46b5868cd2be4230ad888341 gst-omx-1.22.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index d644c44995..6f7168279b 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.4 +GST_OMX_VERSION = 1.22.0 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:55 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:55 -0700 Subject: [Buildroot] [PATCH 10/13] package/gst1-rtsp-server: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-10-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 b6a31f8796..f37e7bb292 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.4.tar.xz.sha256sum -sha256 88d9ef634e59aeb8cc183ad5ae444557c5a88dd49d833b9072bc6e1fae6a3d7d gst-rtsp-server-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.0.tar.xz.sha256sum +sha256 aea24eeb59ee5fadfac355de2f7cecb51966c3e147e5ad7cfb4c314f1a4086ed gst-rtsp-server-1.22.0.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 0b18c1fcf8..6b4bd49fde 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.4 +GST1_RTSP_SERVER_VERSION = 1.22.0 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.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:56 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:56 -0700 Subject: [Buildroot] [PATCH 11/13] package/gstreamer1-editing-services: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-11-james.hilliard1@gmail.com> Add a patch fixing an incorrect gstreamer-validate-1.0 dependency name. Signed-off-by: James Hilliard --- ...treamer-validate-1.0-dependency-name.patch | 35 +++++++++++++++++++ .../gstreamer1-editing-services.hash | 4 +-- .../gstreamer1-editing-services.mk | 2 +- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch diff --git a/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch b/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch new file mode 100644 index 0000000000..6c190d3727 --- /dev/null +++ b/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch @@ -0,0 +1,35 @@ +From c3edd999195445319ea619b6d719d7743f5b560d Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 31 Jan 2023 21:38:09 -0700 +Subject: [PATCH] Fix gstreamer-validate-1.0 dependency name + +The gst-devtools project generates gstreamer-validate-1.0.pc, this +must match the dependency in gst-editing-services for detection +to work properly. + +Fixes: +Run-time dependency gst-validate-1.0 found: NO (tried pkgconfig and cmake) + +Signed-off-by: James Hilliard +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3859] +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index bdc47f5d8b..b949f55317 100644 +--- a/meson.build ++++ b/meson.build +@@ -110,7 +110,7 @@ if host_machine.system() != 'windows' + endif + gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, + fallback : ['gstreamer', 'gst_controller_dep']) +-gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : get_option('validate'), ++gstvalidate_dep = dependency('gstreamer-validate-1.0', version : gst_req, required : get_option('validate'), + fallback : ['gst-devtools', 'validate_dep']) + + gio_dep = dependency('gio-2.0', version: glib_req) +-- +2.34.1 + diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 308596d7cd..bd5dcfdbaf 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.4.tar.xz.sha256sum -sha256 aa03e983af5d79c1befffe3575b034e60960619a96bf877447cb73c28016fc41 gst-editing-services-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.0.tar.xz.sha256sum +sha256 2a23856379af03586b66c193910fa8bb963024580bc2337c7405578dc077aa79 gst-editing-services-1.22.0.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 77feb15991..0ae9205c3b 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.4 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.0 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.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:58 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:58 -0700 Subject: [Buildroot] [PATCH 13/13] package/gst1-python: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-13-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 adb116ac4c..128a739c2c 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.4.tar.xz.sha256sum -sha256 5eb4136d03e2a495f4499c8b2e6d9d3e7b5e73c5a8b8acf9213d57bc6a7bd3c1 gst-python-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.0.tar.xz.sha256sum +sha256 6c63ad364ca4617eb2cbb3975ab26c66760eb3c7a6adf5be69f99c11e21ef3a5 gst-python-1.22.0.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index feb2de718a..2fc268b0ac 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.4 +GST1_PYTHON_VERSION = 1.22.0 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.34.1 From KAMenyaev at sberdevices.ru Wed Feb 1 06:00:01 2023 From: KAMenyaev at sberdevices.ru (KAMenyaev at sberdevices.ru) Date: Wed, 1 Feb 2023 09:00:01 +0300 Subject: [Buildroot] [PATCH 1/1] package/tinyalsa: add option to enable utility tools Message-ID: <20230201060001.134150-1-KAMenyaev@sberdevices.ru> From: Konstantin Menyaev Add option to enable useful tools, like tinyplay, tinymix, etc. Signed-off-by: Konstantin Menyaev --- package/tinyalsa/Config.in | 9 +++++++++ package/tinyalsa/tinyalsa.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/tinyalsa/Config.in b/package/tinyalsa/Config.in index d9ce22c8a7..b4d4aeb276 100644 --- a/package/tinyalsa/Config.in +++ b/package/tinyalsa/Config.in @@ -13,5 +13,14 @@ config BR2_PACKAGE_TINYALSA https://github.com/tinyalsa/tinyalsa +if BR2_PACKAGE_TINYALSA + +config BR2_PACKAGE_TINYALSA_TOOLS + bool "tinyalsa tools" + help + Build utility tools (tinyplay, tinycap, tinymix, tinypcminfo) + +endif #BR2_PACKAGE_TINYALSA + comment "tinyalsa needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index b5c39e35d6..fe6d373ec8 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -9,6 +9,12 @@ TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3-Clause TINYALSA_LICENSE_FILES = NOTICE TINYALSA_INSTALL_STAGING = YES -TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled +TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled + +ifeq ($(BR2_PACKAGE_TINYALSA_TOOLS),y) +TINYALSA_CONF_OPTS += -Dutils=enabled +else +TINYALSA_CONF_OPTS += -Dutils=disabled +endif $(eval $(meson-package)) -- 2.39.1 From thomas.petazzoni at bootlin.com Wed Feb 1 07:00:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 01 Feb 2023 07:00:28 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-01-31 Message-ID: <20230201070035.450A160E4B@smtp3.osuosl.org> Hello, Autobuild statistics for 2023-01-31 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 5 | 2 | 0 | 7 | 2022.11.x | 14 | 22 | 0 | 36 | master | 202 | 303 | 0 | 505 | Classification of failures by reason for master ----------------------------------------------- host-fwup-1.9.1 | 24 fwup-1.9.1 | 21 fluent-bit-2.0.8 | 20 libfuse3-3.13.0 | 13 bash-5.2.15 | 11 host-binutils-2.38 | 9 norm-1.5.8 | 8 unknown | 8 host-pahole-1.24 | 7 elfutils-0.186 | 6 jack2-1.9.21 | 6 xz-5.2.10 | 6 gerbera-1.10.0 | 5 host-go-1.19.5 | 5 host-rust-1.66.1 | 5 janet-1.26.0 | 5 libglib2-2.72.3 | 5 linux-6.1.5 | 5 opkg-0.4.5 | 5 xxhash-0.8.1 | 5 dahdi-linux-3.2.0 | 4 dmalloc-5.6.5 | 4 gobject-introspection-1.72.0 | 4 pixz-1.0.7 | 4 wolfssl-5.5.3 | 4 fxdiv-63058eff77e11aa15bf53... | 3 glibc-2.36-81-g4f4d7a13edfd... | 3 host-binutils-2.39 | 3 mobile-broadband-provider-i... | 3 nerdctl-1.0.0 | 3 ntp-4.2.8p15 | 3 python-bcrypt-4.0.1 | 3 python-cryptography-39.0.0 | 3 qemu-7.2.0 | 3 assimp-5.2.5 | 2 cairo-1.16.0 | 2 f2fs-tools-1.15.0 | 2 gvfs-1.48.1 | 2 host-binutils-2.37 | 2 host-gcc-final-10.4.0 | 2 host-sentry-cli-2.8.0 | 2 libcamera-apps-1.1.0 | 2 libostree-2022.7 | 2 linux-5.10.145-cip17 | 2 ltp-testsuite-20220930 | 2 optee-client-3.19.0 | 2 perl-5.36.0 | 2 python-numpy-1.23.5 | 2 zeek-4.1.1 | 2 bind-9.16.33 | 1 binutils-arc-2020.09-release | 1 bird-2.0.11 | 1 coreutils-9.1 | 1 dbus-cxx-2.3.1 | 1 dhcp-4.4.3-P1 | 1 edk2-edk2-stable202208 | 1 efivar-38 | 1 frr-8.4.2 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fwts-22.09.00 | 1 gmp-6.2.1 | 1 gnuradio-3.10.4.0 | 1 google-breakpad-c85eb4a59b6... | 1 host-delve-1.20.0 | 1 host-gdb-arc-2020.09-releas... | 1 host-python-maturin-0.14.9 | 1 host-runc-1.1.4 | 1 ipmitool-1_8_19 | 1 jemalloc-5.3.0 | 1 json-c-0.16 | 1 libcap-ng-0.8.3 | 1 libdeflate-1.15 | 1 libgpg-error-1.46 | 1 libmad-0.15.1b | 1 libvorbis-1.3.7 | 1 liquid-dsp-1.4.0 | 1 lpc32xxcdl-2.11 | 1 matio-1.5.23 | 1 multipath-tools-0.9.4 | 1 musl-1.2.3 | 1 mutt-2.2.9 | 1 neon-2-sse-a15b489e1222b208... | 1 pcre2-10.42 | 1 rsync-3.2.7 | 1 rtl8723ds-bt-14cedf3a9fec1a... | 1 sexpect-2.3.14 | 1 traceroute-2.1.0 | 1 uclibc-1.0.42 | 1 ulog-0389d243352255f6182326... | 1 valgrind-3.19.0 | 1 vlc-3.0.18 | 1 xenomai-3.0.10 | 1 xfsprogs-5.14.2 | 1 zabbix-5.4.9 | 1 zlib-ng-2.0.6 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/c03a7ea4fa911768517c671cf8911dd1e583d418 | ORPH mips | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/8185261a1f11beec862de86e1d5e0576bb7efd8c | ORPH mips | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/7f300f0b35c79ea2299be9c405c6e2d005bee83e | ORPH mips | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/cfbd6319263686801f111223058060d153a3211a | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/94b7350e8d9443f636de2897fa3653fca120e4aa | ORPH arceb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/484e88878c809d18363e9c5848ffa86d6793a977 | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/2eb76c4f23519ac853e3f832726d23f1a96b3a53 | ORPH xtensa | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/86d9900c9060fa3df2a126f2f8b9f4722eda72e7 | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/14c5411ac5936204fcc26b56bb67c95e9583adfa | ORPH microblaze | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/b9f741ed1073385bb5ff10dabbea30d2c6430700 | ORPH x86_64 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/5fbc831620e72cb901765031491786015a1f5a5a | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/2de7c92214648809a267f0e74e7691aea4c4b09d | ORPH microblazeel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/402039a5ee4d23cb8634191bde3590723432c9de | ORPH sh4aeb | bind-9.16.33 | NOK | http://autobuild.buildroot.net/results/80c1754c1e500970cfb81bf71221409856533913 | ORPH arc | binutils-arc-2020.09-release | NOK | http://autobuild.buildroot.net/results/006a934a15abbac13d80f97f710e484d8fc6367f | arc | bird-2.0.11 | NOK | http://autobuild.buildroot.net/results/16c7d44b86b6cff4707cfc0ec111197f7e728b79 | powerpc | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/9f82169a3a8bc883af21cdb60f2c44450e340721 | powerpc | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/41f9ff89593f7fd5c8727bd355e1cd4e735f549a | sh4a | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/e76e2a32c6c1ced860b8d6b2bad35506642d037b | ORPH x86_64 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/06607b1d142b4bfcaf31980f9255407637c73661 | aarch64_be | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/c762b04dee0d0552efdd7c6de22d8159cd9fc41b | mips64el | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/ef817fa147298e51a3be004546426ca4951bfd19 | powerpc64le | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/407265f845c1acc9f2bf46bc346fe7aa9f75f024 | or1k | dbus-cxx-2.3.1 | NOK | http://autobuild.buildroot.net/results/61ac1cecfc5af2261ff7dca3f4931b13a29f4a0a | sh4 | dhcp-4.4.3-P1 | NOK | http://autobuild.buildroot.net/results/155bc9f83a0c0f2a08c1396f949e87f207b8aefa | ORPH i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/418b63ce6f2a29247ba04675b748b2dfcd8a6eda | ORPH i586 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/eb8f9e26e4a63716ff8ed66e486f93209943b98c | ORPH i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/161c08abe4cfaaa08b8598b06677d2b2b1cb64a0 | ORPH i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/37cbdd461bcdef2ed507ea56f799219b4af5342e | ORPH x86_64 | edk2-edk2-stable202208 | NOK | http://autobuild.buildroot.net/results/c8b319ccdd2b515be6805b3d2abad30711205d00 | aarch64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/6f5fa4e67763439f64260685fe6862c99130cb14 | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/cb4b5d18591d8bfa53460fea45ff69708cb165cd | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/c454a24a97c1a0b9ded4143549ec73c974ca0694 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/b12c739a37525469de2ed97cccc99c402047b49e | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3f81aa51cf204372e06400c0b65be7d398b4e9b5 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/2893e59bb2b5d7260ca486ba8a7fbc685ddba5f9 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/01a9852f28639a03f781a7390c7c0090f76a48b1 | ORPH or1k | f2fs-tools-1.15.0 | NOK | http://autobuild.buildroot.net/results/8fbd9c9d98de1bfa095f782aea6c9f8751c5c9c3 | or1k | f2fs-tools-1.15.0 | NOK | http://autobuild.buildroot.net/results/86f83e04be0e89e9153d205bfff7d530084e37ea | aarch64 | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/755b705c3b4fae5fbe5ac7d0b0ec707518f1b51f | sh4aeb | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/596e1793170d57372b6b109d825d1576ddef24ed | sh4 | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/a03d3fef83f5ddb560201d4824f1a0d18cbbf777 | mips64 | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/291161e513081e693dfd11d4c636bbcbc81115ed | microblaze | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/a5d92b6a1a6960917639ae501073ac5288d9b025 | mips64el | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/d182ac02ce84109d5a695d3f02e3376dc41958c2 | armeb | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/7c5a2b5a4425e4d6ce7720ba295176a16d142cf4 | armeb | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/d200442c7ad5bbcaad811edee9d2a5c0771f6336 | sparc64 | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/46404ea2d3f3491b5e69e21c96519a48c84f0720 | mipsel | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/5a0ecf2311988034801be0393aaa4656277e9770 | arm | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/75ff8cb73b98652937535d56924ef49b353339f5 | arm | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/f5dee7623bc8af19dcdc3fc6c642b0174538e3fc | armeb | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/2fe2a33ef5f973f4ea116a02153b83d6a4f9dae5 | aarch64_be | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/f8faaf1498dd44c594fb8f3a61890727bc4f2bd1 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/55c18476212c34d2e066ae51fc911af13e433ab6 | mips | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/c413e1b5e8ab44d8a7ede7d70a03767b3ff1b63d | powerpc64le | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/f40dea7e9e82151128142e60572e534683e31c05 | microblazeel | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/85312092b0ca251f74690f37088a6bad322de793 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/cde4de57aebfcdf1636332c25a109d0266af2884 | armeb | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/cee20b9ef5ad030948a994553d089b2445149454 | xtensa | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/c6e167ae05153917b8afc421221bce262d03976e | sparc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/4e386d11379e8472369087b9b0fecdd24b4892cb | mipsel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/68cd935e4c60b7944ae511e1dbed31eca187c946 | aarch64 | fwts-22.09.00 | NOK | http://autobuild.buildroot.net/results/96d6f4c0f9d2201b03cf468a3d593fd05c5d8268 | arm | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e0eacc4bb6abff040c1d1f16925bd672949e1d16 | arm | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e51895e530c4a931b0fc4bb97c2d11c8edebc18f | sparc64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/c7fc39552b35155e522c0f867fdba1f9edb6a27d | mips64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/9cc600c5f88ff449a0cd2294d15302c0b18bead2 | powerpc64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/b206a8d9e778dcc313f4fd834a49c567ab449bab | armeb | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8f1111c5d2c1366ff29f7d0132a994a4b822dca0 | x86_64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3bc94f4d3345e7cc76ab59600c101b57b5abf63a | mipsel | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/bac9a84dafb33a77c5f893e5c3f7f5dc53c7f0ea | or1k | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7e99a7c1583a8a63415d0ef5b2bab550c1826e61 | mips64el | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/41d7a7aa16c5c92eb328444e012b36576e85703c | m68k | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/bb1e8345778e60be18d7c7e1b3361922a05974e7 | sparc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/a983490ae8c4c15781712f3b0cd0781410281fbc | mips64el | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ffa0b7f5f80b97994204c9857b1554b788cbdcbf | powerpc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/2fc295ded2a5e6b95e8e81a0942f90db5eb3cffd | powerpc64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/b7725765e6348730444ff84fa6a3357037ba11b5 | nios2 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/4718dae608e51e92a6411199a8358ad102968ba5 | riscv32 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/b9777fffdea5354db36f8d2ce3e06352b72611ca | aarch64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/6a75c8561f528da5dd6fda3dd2e34184a4517e22 | powerpc64le | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/2c7b225b1cc5d4924fa635147a09f8c2c2ef2129 | microblaze | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/2fa5a0b6401cc8f789ee8a11efe4a79789684df4 | aarch64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/4d1c45e161a49b39d914f33bb65cb8f2609f8b84 | mipsel | fxdiv-63058eff77e11aa15bf53... | NOK | http://autobuild.buildroot.net/results/a9db782dd3610058dfb5c44db2fa8b719b12000b | mips64el | fxdiv-63058eff77e11aa15bf53... | NOK | http://autobuild.buildroot.net/results/18eb0f3e1a5a7fb389c9ad1bbed2db78fc36245b | x86_64 | fxdiv-63058eff77e11aa15bf53... | NOK | http://autobuild.buildroot.net/results/627574e02fe878390b12c2a100672247f450261d | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/b4e57afe4096280f247a2886ad3de40fcb5c360f | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/12e146565a394255f6b428e6b9b4f6a9312ed338 | mipsel | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/b9fa61f9b0ebacbe70ca8359aa62dc3a91964e46 | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/20b73fc190c275d39ce52bfe59ea280c74c4bdc8 | m68k | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/b5d47a707efe96923b9e3a606f5caa1c5475d4c0 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e680edc4c8d2686fa4de42594fae90a467b88707 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/86e5ffee1b1ad2b85f4248886dd9f637342b101a | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/559848cbc50f0c3ee555d63eabaa5195cec9fb39 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/7bc8476f8a19b671597fe86c771deeaad269923f | ORPH i686 | gnuradio-3.10.4.0 | NOK | http://autobuild.buildroot.net/results/af0152a233cc0242f862b6093f52eb0b9e315522 | s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/ce3eeca32b8e1d2de431bb782c2e9adc3c0f749c | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2c0ffbd97486abe6fe3cfc6e87a528f8f5f3acfc | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d385f8a7dd00e28c0e1c7b05399f676ca62ada35 | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/aa337b0b9441b7d3b898509b4f2e23f6dc6f644b | ORPH arm | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/01bf701a48497c803211d7b2ce1eb466c1d35992 | mips64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/9609a528cd923353a6291229b5bdacecc61f0fb5 | ORPH mipsel | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/69bdc07b4114844179b3a331fbcae0be856ae4c8 | ORPH mips64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/e6654f796dae6aa768b32e5468e66c54d9351557 | sh4a | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/78498e0380577ab0d2acf308c241734860089e8a | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/9597684ed8fca90f927cf50782fcbb00bee13fc3 | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/c35f738eb3ce5159582b1afd2b9ca0f0a5af6b1c | mips64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/3beed9ecb68aaf30a891830f385834585e58a41c | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/aed5958d7ebbabf84de49a265b8c82f53dcd3de2 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/92aaff832805f746480b1733c05120298296b8ed | powerpc64le | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/7eb518eefdb990f42546ef628d334a4027cd7454 | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/69eb00656616f5eb813648f3d7f1fbde778ce9ab | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e50ab2ac80b64a30e28de6e0b8b7734cac17d520 | aarch64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/443ce7edb7d306ec536a845e29bed45686e905f3 | sparc | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/345866ada537aaebe3a1e201116af3ec56cb9d81 | or1k | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/d73dd5a654452358032271f77768023cf55a2b7d | mips64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/90ad28fd811fb40085463d37720f9903b9be64d2 | arm | host-delve-1.20.0 | NOK | http://autobuild.buildroot.net/results/e95359a068f3a3e7e3d80acc6fbd28f2e3e25a2b | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/5b072c4a35624ec393269d5ade3e4537a39a22c0 | nios2 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ca727d5c3a2404cc9cac3e252a92390c309519ba | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/a6cfa358f35a4b15f81637533c35367f94bdf808 | arc | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7f8b9ef35e122adbf0cca6c1b14d69cb47a6e347 | m68k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/1d9adb870f284eff7178342056d48aff1fc547e2 | riscv32 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d2b832f53025944a286bd027ad96b98269448d52 | microblazeel | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/6fd287c6b348140ffab2b1ba18a02ebf8f25daad | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3c5c9b083e129d87d6ae5630997157eee1bba582 | mips | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/6dae5cc73aca865a98862e984a5dd0ae67527387 | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e1cd7c42eb4daec6dcfe2cb1a444c3f64e56d7cf | xtensa | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/5b93dce8773ff6ccf0ff6479ca3d57da23eb468e | powerpc64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7d9ee9d53781c0934fb37d934df36b1cfd836048 | mips64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/63445e8a46fff99e317c07660c735f0416d699d4 | powerpc64le | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/1bd75b7b5e0e7ef1c8e930e0c397480109b837f1 | sparc | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/508ff798da6402bd9f69243c247f49977778504f | aarch64_be | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/0032fb377ae46ed2622aba323f19a33f89733d51 | arm | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/354cdfb6c6ffc9a502552a4265cf8ddaf68d63f5 | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/dceed1ff73b97b960bf09047578cfe1f617fa2a6 | armeb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/b39d04e1580b688b03c5dc3274306a7cb5c91757 | m68k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/38d94f950bbb633a1183c4a782042f0d3780e9a6 | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/6e9d85e2436e9df0d130c611dd237f7d20554051 | powerpc64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/dfd3641bbbdf1e9daf563025330b878e692f7dc2 | m68k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/132cf1a204516d62926bad10ffdb7761ad11fbbe | arm | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8d98ed784fae0791139a5197116db3095e4cb076 | arceb | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/3dd43a444b04d08cde2f83d284d2a0ea61d93c26 | microblaze | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/0d62bac24bc8b2bf2df9213dff93f75ecfc3517a | arceb | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/012b815627a12b899dea8b035e20a56d52e12090 | ORPH mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/dc1867046a2a08e7aa728f5fc067a73a2f7def0f | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f88237b44c5eed0a0e0098ab8b7178350519b18f | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/d6c7b97a2486635a86ee95a570c3fb0e017e7120 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/14181a41583d4346f3c4bda969c83df01fa777ec | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/a16228fb62d0a501c63359597cb4f66b8a1b57eb | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/dfa0d2e94f91b33e81cff6e83d49f2a757163155 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1da1e44f0042fe0345d3e4cf830d30fcdf84e9c7 | xtensa | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/334b39ea40fc685f64ca7b4c7c25c2a7abe728ba | mipsel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/cc4123e8028e7dafe8c779eb6300fb054c24c8cf | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2bd2633902a3bb826079129160fa49dbbd8381d5 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/6379adee5bcc4a41aadb4a7de34c24ad73fb2f98 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/a5ece21a2742db8c82f0472f630942ad39f6b5a1 | aarch64 | host-python-maturin-0.14.9 | NOK | http://autobuild.buildroot.net/results/cc6f8e31fb5f04f171f9258fef179a4fdaf27f27 | mips64 | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/ed11c2ce668c163bd6c544eaca3195bef5a8678a | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/25ea6048fde3bfd99c4ebcf12763c9c8c6ff1c44 | mipsel | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/47799a8edc2884fb348f78b75951682562845575 | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/11c9f67112069c696c7119499f921358e7ccb22f | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/a3b5c4996ca7efdb4b0482173d3323b4d5676eef | mips | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/32b83a5be46d2c51f528975f262980d0cd205bb8 | mips | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/c3628adfb15b33e9c2b7a74ccb591a793c98921c | powerpc64le | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/511abdc17256a5ecee67a0fc4c6a9565d197324c | or1k | ipmitool-1_8_19 | NOK | http://autobuild.buildroot.net/results/e440999aa09534b54b219a48d06da4d2f216d39b | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/5d60808f99088909e517c4e58f1961c0c83493e0 | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/a6495af7dc754dff8c9a262d7910de7ef298244d | s390x | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/d1884b4d235928da03dfdf67feec09f509dc9185 | aarch64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/2696f42d77c3f8826a8f1670464b7cf4b8651a2a | mipsel | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/581cfe21191507485473c546338c7b6d281715ca | microblaze | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/a77633d016cf477d411689c0434ff7ed97da37ed | xtensa | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/8a64759ca41b1bfd0c3579c83889ec33eb785751 | powerpc64 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/6444e8ef17925fb2eea36c4b16ae63df7eead802 | riscv32 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/fc63ef9e7df62502bb5320392a3c25f5c6b7a96f | sh4eb | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/cc32d715239b30819b122dc2cd6c82ab95d946e8 | riscv64 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/caa24d0142e8bd3e1b19f2c38f825da13508eef5 | sh4 | jemalloc-5.3.0 | NOK | http://autobuild.buildroot.net/results/5fd46593dbfd5d480456a7f9962afd29ed0c2fde | riscv64 | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/041ed53d3237b86856dd488cb68132905dd793fd | armeb | libcamera-apps-1.1.0 | NOK | http://autobuild.buildroot.net/results/656121dfc7822788ed70c66952c0f7590c152a4e | mipsel | libcamera-apps-1.1.0 | NOK | http://autobuild.buildroot.net/results/1867412523ba300058f52dece43dea66ec15f0f3 | or1k | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/0edca16eebe44e343b55e3e8f9233fa79001baed | arm | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/f3b857f4d412d6b083badb2dd5abb7b1af2553bc | or1k | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/14c0d75a88bfdcd2ff663dc5932567fc89a8e58a | aarch64 | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/8e1adbb1bab7804900d764a0c6286e544b499781 | or1k | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/6dba0e45632efaa6155e2dd19393801074ada31f | sparc64 | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/e095278f89a00e4e20198110fa3748f04071698a | powerpc | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/6568aab407338d5ab929d44988ee58f488f2b660 | powerpc64le | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/1687c1f48c672e849ac1ab8c9fa9afed6d3f03ab | mips64el | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/d582522b25cc0257003f006cb8be1f08e0d6d503 | microblazeel | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/28f9b3f89918f71f7d00734c3c62ffed57e64397 | mipsel | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/80a5f9b02f8c754b8e4bf2ec3d55bdb333a54f36 | microblaze | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/3926f89af855ad70aa4fc04469916ba26ccd2c88 | mips64 | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/a984d275d949e8dc989870d2d2b6f6c7168d52bb | or1k | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/80613c2cc051f43f238139c4e115b5104db69bd4 | powerpc | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/17fd5dad2e3c384b99d6abe7ba44a3cac72edff1 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/aec1a4eda207fa890aeba82e6cb0541346413eab | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/1d3e8cc2f8a8d3e0b5c6cfc0d75ce7f459932125 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/822b53542ec4c5d5dfef099c3e33e7dcd1c072e6 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/004ee39278690f11415c2bd4496b93d1eed747f8 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/4277d67aa70524fbe12896a7349a8c72826ed8ec | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/5fd97c464fde422d4fef525a15be76de55e39f51 | ORPH arm | libmad-0.15.1b | NOK | http://autobuild.buildroot.net/results/a7dce0abea1b54cda8b544d4b13e11839d1e8c78 | ORPH aarch64_be | libostree-2022.7 | NOK | http://autobuild.buildroot.net/results/b30090b5d9cff1eaf1aad31ba628e224b15f9139 | arm | libostree-2022.7 | NOK | http://autobuild.buildroot.net/results/af6402b749b51f112508eec019be4f7b63866f97 | powerpc | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/e42892e58d2393e06304fae28ca7943cf9e5d00a | mips64 | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/c89823649ee4c685c07f0501fa2664d2d11843ce | ORPH powerpc | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/e10f54118d18d5a82e9731fc1a9977e2f6db5b94 | ORPH sh4a | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/ecb3514459642e751b3a19a49b941c4f242d1c56 | ORPH m68k | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/31887e1f8f1acfaa1984d30eb4c28c732b091c7d | ORPH sh4aeb | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/b7c2fff8cc8cec3019af8c4392dfcf1c52473233 | ORPH sh4a | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/33c3e39a85fa6826d228444893caaffbbbb37402 | ORPH arceb | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/ace40dfcb8565e50704115aa74772bc69bc83c79 | ORPH arm | liquid-dsp-1.4.0 | NOK | http://autobuild.buildroot.net/results/63a6812fe41f72a59d1c78e5e9b5d876686ee121 | arm | lpc32xxcdl-2.11 | NOK | http://autobuild.buildroot.net/results/acfc7f3e3a160847a7b534753d695037d18c6c87 | ORPH x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/9038dce0d99f2ec90f7ad3b0b8b9f7bace675f59 | sparc64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/9ac8c48d90d77d1c0bead213d9f888a9c8ea06b6 | nios2 | matio-1.5.23 | NOK | http://autobuild.buildroot.net/results/0e0ca9839030c564e7deeca0ee0c8af865c5152b | mips64el | mobile-broadband-provider-i... | NOK | http://autobuild.buildroot.net/results/f15cfa9202610a097b820e7221297ef70a903d82 | ORPH sh4aeb | mobile-broadband-provider-i... | NOK | http://autobuild.buildroot.net/results/8b5783bc03a6d29aa84385ca9d94f33487bd7edf | ORPH or1k | mobile-broadband-provider-i... | NOK | http://autobuild.buildroot.net/results/24cee463eb6f8c60b60f50137c28a119be382520 | ORPH mips64el | multipath-tools-0.9.4 | NOK | http://autobuild.buildroot.net/results/0e692f898762c47b019765c5c9143c62e32991c2 | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/c50f0459c426b0447eab524f887c07451ed2b597 | mips | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/bdcb0338362acf5a9f3006430318c282b92e74b4 | i686 | neon-2-sse-a15b489e1222b208... | NOK | http://autobuild.buildroot.net/results/42944d8151f5ed8927a6e3a853d5fc272f582c88 | aarch64 | nerdctl-1.0.0 | NOK | http://autobuild.buildroot.net/results/ba46ba63883c3beaf12fc3597404d813fd0fbd04 | s390x | nerdctl-1.0.0 | NOK | http://autobuild.buildroot.net/results/75e21f2d9525c6a93edbd3d2a331b241e51647f1 | i686 | nerdctl-1.0.0 | NOK | http://autobuild.buildroot.net/results/51fddb12c234a148b4c65ca12f8f8cc2792583be | powerpc64le | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/f3ef7d3c76b3100221a81f4796c6469254fe7f78 | ORPH x86_64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/bd1e6871410818377b371fa06d7d60328f15f56d | ORPH microblaze | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/06290e81856d6261eed5281a55bf790f747ecafc | ORPH nios2 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/7aefe63fc39522c9cdabf5fd0c01f8e6b676311c | ORPH riscv32 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/80f666c32d3d7948991056fa7d47b5bd8b0e7e6c | ORPH arm | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/37b7cb6c1edf7f855b5cbc1d43ac9670f3ecaa2f | ORPH x86_64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/d69d19fb6a152dfa334bd31cfa3165117cf83dc1 | ORPH arm | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/4e3983ce16e3ba3b3e450655fd592d902ddd5538 | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/88b41b56a0ecaf8cdcb57ce6d662f414c9c02ab9 | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/a743d25c0dc7bdd8a5d4ae09e463e03ecc1883ec | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/7cbafad6a1c3db5875aef428d0a061384bfad653 | ORPH or1k | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/f091ac470349e7dd1541531242bfc32b26c16296 | ORPH aarch64 | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/acf8f819a5012b400ea7ae7a7907e63665e3fe89 | ORPH xtensa | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/501831f12f61023c1abc513669b6f139a33ab01c | ORPH or1k | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/e9570f2b50401e828dbdd96e94332b198dd74571 | ORPH sh4eb | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/3e7cbaab4a1cba524b97e9b2e61bdf670c5a85e0 | ORPH arc | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/3ba001ab11be72d543819672d9cc267f461730e3 | m68k | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/c5083dc21bdd060c88b6b7ba6ddf105c9c73698e | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/2b332116b0cabc903c9b6920c6cf0eb2dc8bd4da | ORPH arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/13f50641633cd3eec5e27b727d9a85cfa04692e9 | arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/cdbb22d0a0b9aef983c858360cf0d4ebdd809cc2 | mips64el | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/ae5218c718387fda9f230c2e715d2d8c93146a85 | or1k | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/22a1d6c845d400c59663f1775dea5a2c9684b34c | aarch64 | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/3e7f8e15796c9817e4466ac464f3eafc1964ec05 | arm | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/99acd3d9d9f5b26e755db855de86baec448d758f | powerpc64le | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/be2c3d7092c22f460c8814e00a8409b4cf841f16 | s390x | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/09a3967aa00590d959670a9fe9299a4dcad40c0c | mips64el | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/75df240787d4aefeb46854132c1b13d0b14b1e18 | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/851e3204e82a811158d68b6c91e4ce0231c2c190 | aarch64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/fa23843ff36c22b345046a9e7b540387fae41448 | s390x | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/d4dc81c724dff9a390c8808bd9ed808964aed5bd | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/479cd4d4666bc2fe38146c41926bb0b543bf9354 | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/4e1b69071f1b383e0f2709d46b3246d0eb66c288 | x86_64 | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/9082ee10057b1535412aa79c9f07350ba4e53c40 | mips | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/fbdd688d520e61b855a7cdc7163ec97b63df1643 | i586 | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/161aa74118eee19328eab5c8d0839fbceb2dae60 | arc | rsync-3.2.7 | NOK | http://autobuild.buildroot.net/results/3fbf5a40ed48b172f6001c6c0a1286fa4e68fed9 | armeb | rtl8723ds-bt-14cedf3a9fec1a... | NOK | http://autobuild.buildroot.net/results/69c74d13e374bd1d3645a17e89325061b2676a18 | riscv64 | sexpect-2.3.14 | NOK | http://autobuild.buildroot.net/results/a2b69fdf67d520aa4d2718bd688d88d102842cdf | microblazeel | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/d6173a2968db8e388e0e3aa0bb0711641328d18f | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/93b2a05680744179833f75ce160f033577743e5b | i686 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/6311c8a54aed28e77eb215d2fda49f30e1252b22 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/4f06c8f178c3e3cd4dfea25bd97282616e020271 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/2fd4999737f00cf2e43d1722c4de83a1aea32a4e | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/b9c6a302a5dca72e4fd36ecaa27b8a0e5e26baed | or1k | unknown | NOK | http://autobuild.buildroot.net/results/bc4a0ddc67e3f784a62a112f28705e3c2677d326 | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/4a3de4f5780c83e08d51d3f462672d3d96c8e850 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/4b726acb248fd5e9d89637f8a4b490bf2abe99dd | or1k | unknown | NOK | http://autobuild.buildroot.net/results/7eb3d8faf48d95d1b041fd415e7b080c87d8e1d8 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/20f545de615f15c2b70a37e5d54737d8b8f7b146 | mips64el | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/6f83c9d29ff7ef62f90d5a6470e23b8938e76f5b | ORPH microblazeel | vlc-3.0.18 | NOK | http://autobuild.buildroot.net/results/21b9cb0f406ad6c7bd9562e888d96a31d4db1d0b | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/b13d188223f1871ab0d0c3eacb975ee947343201 | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/9129a0b4b2d20a9af47c42c637ff3fff6eb3c5bf | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/6234fba149330e1596547a1b9fbd1ba39e6fd00c | riscv32 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/ead914c2aebbfaa7ed6f77c30a860858a9b0b1d8 | sh4 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/817f92e38edd58d954c0e44e3a842a616aed5fc2 | mips | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/f6c2e790915c9302cb0e283f1555beaf0149c2f7 | ORPH microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/bcd8c34ab7dfd17aaad56d1e1e9d83c1c8946eb2 | ORPH microblaze | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/df5ad3070f25af0df76d02d23b1d4e52822dcbe9 | ORPH x86_64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/9a0d3dca015d41d92f1231d4b2c03cb15f10c3d4 | ORPH or1k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/0c84ea1a838fd3f97917eba868e37f8c446ce36f | ORPH mips64el | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/9004e0e19df6fc4acaab764c40d01ae2117264a0 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/e0423b31666f3f0806566043b893621b8eab8bbc | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/3bb60cbf372458b47d2285efa1bdc2bb647bf6b0 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/4aad8e248d480cf8b738987454f5b3b653bd2fbe | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/cdcfcccac9059c41bbf15c80543263045d3ebd3a | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/3f8fdf4a938fdfdd260bc03341f5982a96ddd754 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/6850a352d9738f8e48373f8d6ea85981a9e55a62 | ORPH nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/3ae937f5da099e18f255ea9a3d505a74cc7ccd4e | sparc64 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/52b761778df3e16efc68623a6b37b2f06c75d1bb | sparc64 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/da67bce743c49bd8bffa01dc43e2fbccfd687696 | arm | zlib-ng-2.0.6 | NOK | http://autobuild.buildroot.net/results/11ebc3bf1b59d15afeaeb0cd1bd769b2a0727542 | ORPH Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 1 unknown | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/8d2044a60020d8d0dbbf85896c0116bfa33d222d | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/b01cc19a6f646eb6a644c3232a7328f07dda13d9 | Classification of failures by reason for 2022.11.x -------------------------------------------------- xxhash-0.8.1 | 3 host-pahole-1.24 | 2 linux-6.0.19 | 2 efivar-38 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 fstrcmp-0.7.D001 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 gocryptfs-2.2.1 | 1 host-go-1.19.5 | 1 janus-gateway-1.0.3 | 1 kmod-30 | 1 libdeflate-1.15 | 1 mender-3.4.0 | 1 rtl8189es-e58bd86c9d9408c64... | 1 xenomai-3.0.10 | 1 xz-5.2.7 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | efivar-38 | NOK | http://autobuild.buildroot.net/results/dc0e9b4dc72c90fdc6db7e5158e3f408a00fc601 | x86_64 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/cd84fcd65ff841fc62b77eac7e2d83389bf0838a | powerpc | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/2019a42cbec6dde7d1e4b152a2afafa5e637bd00 | arm | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/3d5e7adbace9bae9fd379c2ef8b30f740777ee11 | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/367e6435b482030994a06c33dd7039c60c1a3a26 | x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f64bcbefa901fc5e8f8fa6376aa0f5a179c26ff1 | ORPH s390x | gocryptfs-2.2.1 | NOK | http://autobuild.buildroot.net/results/b0b59a545ecd9fc2e3d09e898fcccb622171312c | aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/7622e8d9a829b998bef621b045fd379b8f6870e2 | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/5b470415ca78411ae258f07636caad2c9a3065d9 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8de60a3347b819c0cc59a3962c115617132fa01d | mips64el | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/4232fe51254d0f30455f92520ff2cfea6079aa6d | arceb | kmod-30 | NOK | http://autobuild.buildroot.net/results/5fa05646e9d3b2c6d482538cf687abac4c32bc49 | arm | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/6abfe47238e27325734cfe86173cc08fb8e7fb16 | s390x | linux-6.0.19 | NOK | http://autobuild.buildroot.net/results/202fc154c67375aec40be5e2c61895944fac34b1 | ORPH nios2 | linux-6.0.19 | NOK | http://autobuild.buildroot.net/results/962096b3718f0aa2b069c07606b2a5c5acc578dc | ORPH powerpc64le | mender-3.4.0 | NOK | http://autobuild.buildroot.net/results/a47bb16272d033af1297d64cf4a451f5b5b383b3 | powerpc64le | rtl8189es-e58bd86c9d9408c64... | NOK | http://autobuild.buildroot.net/results/40ee78819899aa854cb5384a2f4aa37704384e41 | sh4eb | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/d5c6f066203ff0570c2aa9b3083d3007fd6001d7 | microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/e26207da8ab45597af56bc0cf28a03c808df573f | ORPH aarch64_be | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/0276bae5e9e36731d2a64a3de16449832ee2e08b | ORPH mips64el | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/2c62ce81ea5dcdde4db97c97d3a2f15a27f18815 | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/c0ffe026640564d8445753ed2626b5fbe76c15a6 | ORPH Gitlab CI results for 2023-01-31 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestAarch64Pages64kGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971547 | ORPH TestAarch64Pages64kMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971548 | ORPH TestAarch64Pages64kuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971549 | ORPH TestCheckPackage | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971783 | TestClangCompilerRT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971359 | ORPH TestCpioDracutMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971301 | ORPH TestCrudiniPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971360 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971361 | ORPH TestDropbear | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971362 | ORPH TestDtbocfg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971363 | ORPH TestExecline | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971364 | ORPH TestExt2r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971308 | ORPH ...rch64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971559 | ORPH ...tlinAarch64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971561 | ORPH ...arch64MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971562 | ORPH ...otlinAarch64MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971564 | ORPH ...ch64UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971566 | ORPH ...linAarch64UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971567 | ORPH ...h64beGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971569 | ORPH ...inAarch64beGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971570 | ORPH ...64beUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971571 | ORPH ...nAarch64beUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971572 | ORPH ...750dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971573 | ORPH ...nArcle750dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971574 | ORPH ...ehs38GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971575 | ORPH ...inArclehs38GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971576 | ORPH ...hs38UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971578 | ORPH ...nArclehs38UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971579 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971581 | ORPH ...mebv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971582 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971584 | ORPH ...rmebv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971585 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971587 | ORPH ...ebv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971588 | ORPH ...5eabiGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971590 | ORPH ...inArmv5eabiGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971591 | ORPH ...v5eabiMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971592 | ORPH ...linArmv5eabiMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971595 | ORPH ...eabiUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971597 | ORPH ...nArmv5eabiUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971599 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971602 | ORPH ...Armv6eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971605 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971606 | ORPH ...nArmv6eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971607 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971608 | ORPH ...rmv6eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971609 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971610 | ORPH ...Armv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971611 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971612 | ORPH ...nArmv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971613 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971614 | ORPH ...rmv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971615 | ORPH ...mv7mUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971616 | ORPH ...tlinArmv7mUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971617 | ORPH ...8xxxUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971618 | ORPH ...nM68k68xxxUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971619 | ORPH ...fireUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971620 | ORPH ...8kcoldfireUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971621 | ORPH ...azebeGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971622 | ORPH ...icroblazebeGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971623 | ORPH ...lazebeMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971624 | ORPH ...MicroblazebeMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971625 | ORPH ...zebeUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971626 | ORPH ...croblazebeUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971627 | ORPH ...azeelGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971628 | ORPH ...icroblazeelGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971629 | ORPH ...lazeelMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971630 | ORPH ...MicroblazeelMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971631 | ORPH ...zeelUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971632 | ORPH ...croblazeelUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971633 | ORPH ...ips32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971634 | ORPH ...otlinMips32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971635 | ORPH ...Mips32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971636 | ORPH ...ootlinMips32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971638 | ORPH ...ps32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971639 | ORPH ...tlinMips32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971640 | ORPH ...s32elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971641 | ORPH ...linMips32elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971642 | ORPH ...ps32elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971643 | ORPH ...tlinMips32elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971644 | ORPH ...32elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971645 | ORPH ...inMips32elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971646 | ORPH ...2r5elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971648 | ORPH ...nMips32r5elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971649 | ORPH ...32r5elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971650 | ORPH ...inMips32r5elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971651 | ORPH ...r5elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971652 | ORPH ...Mips32r5elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971653 | ORPH ...2r6elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971655 | ORPH ...nMips32r6elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971657 | ORPH ...32r6elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971658 | ORPH ...inMips32r6elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971659 | ORPH ...r6elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971661 | ORPH ...Mips32r6elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971663 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971664 | ORPH ...Mips64eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971665 | ORPH ...4eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971666 | ORPH ...nMips64eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971667 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971668 | ORPH ...ips64eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971669 | ORPH ...64n32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971670 | ORPH ...inMips64n32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971671 | ORPH ...s64n32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971673 | ORPH ...linMips64n32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971675 | ORPH ...4n32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971676 | ORPH ...nMips64n32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971677 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971678 | ORPH ...ps64r6eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971679 | ORPH ...6eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971680 | ORPH ...ips64r6eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971681 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971682 | ORPH ...s64r6eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971683 | ORPH ...Nios2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971684 | ORPH ...ootlinNios2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971685 | ORPH ...enriscMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971686 | ORPH ...tlinOpenriscMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971687 | ORPH ...riscUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971688 | ORPH ...inOpenriscUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971689 | ORPH ...440fpGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971690 | ORPH ...owerpc440fpGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971691 | ORPH ...c440fpMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971692 | ORPH ...Powerpc440fpMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971693 | ORPH ...40fpUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971694 | ORPH ...werpc440fpUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971695 | ORPH ...e5500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971696 | ORPH ...erpc64e5500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971697 | ORPH ...e6500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971698 | ORPH ...erpc64e6500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971699 | ORPH ...4e6500MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971700 | ORPH ...werpc64e6500MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971701 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971702 | ORPH ...c64lepower8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971703 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971704 | ORPH ...pc64lepower8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971705 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971706 | ORPH ...rpc64power8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971707 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971708 | ORPH ...erpc64power8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971709 | ORPH ...300c3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971710 | ORPH ...werpce300c3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971711 | ORPH ...e300c3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971712 | ORPH ...owerpce300c3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971713 | ORPH ...00c3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971714 | ORPH ...erpce300c3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971715 | ORPH ...500mcGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971716 | ORPH ...werpce500mcGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971717 | ORPH ...e500mcMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971718 | ORPH ...owerpce500mcMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971719 | ORPH ...00mcUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971720 | ORPH ...erpce500mcUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971721 | ORPH ...lp32dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971722 | ORPH ...lp64dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971723 | ORPH ...iscv64lp64dGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971725 | ORPH ...4lp64dMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971726 | ORPH ...Riscv64lp64dMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971727 | ORPH ...p64dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971728 | ORPH ...scv64lp64dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971729 | ORPH ...0xz13GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971730 | ORPH ...linS390xz13GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971731 | ORPH ...Shsh4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971732 | ORPH ...ootlinShsh4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971733 | ORPH ...nShsh4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971734 | ORPH ...BootlinShsh4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971736 | ORPH ...hsh4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971737 | ORPH ...otlinShsh4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971739 | ORPH ...h4aebGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971740 | ORPH ...linShsh4aebGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971741 | ORPH ...sh4aebMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971742 | ORPH ...tlinShsh4aebMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971743 | ORPH ...arc64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971744 | ORPH ...tlinSparc64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971745 | ORPH ...rcv8UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971746 | ORPH ...linSparcv8UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971747 | ORPH ...X8664GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971748 | ORPH ...ootlinX8664GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971749 | ORPH ...nX8664MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971750 | ORPH ...BootlinX8664MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971751 | ORPH ...8664UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971752 | ORPH ...otlinX8664UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971753 | ORPH ...orei7GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971754 | ORPH ...X8664corei7GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971755 | ORPH ...corei7MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971756 | ORPH ...nX8664corei7MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971757 | ORPH ...rei7UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971758 | ORPH ...8664corei7UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971759 | ORPH ...664v2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971760 | ORPH ...8664v2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971761 | ORPH ...64v2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971762 | ORPH ...664v3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971763 | ORPH ...8664v3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971764 | ORPH ...64v3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971765 | ORPH ...664v4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971766 | ORPH ...8664v4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971767 | ORPH ...64v4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971768 | ORPH ...core2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971769 | ORPH ...linX86core2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971770 | ORPH ...6core2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971771 | ORPH ...tlinX86core2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971772 | ORPH ...ore2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971773 | ORPH ...inX86core2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971774 | ORPH ...6i686GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971775 | ORPH ...tlinX86i686GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971776 | ORPH ...86i686MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971777 | ORPH ...otlinX86i686MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971778 | ORPH ...i686UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971779 | ORPH ...linX86i686UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971780 | ORPH ...lx60UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971781 | ORPH ...Xtensalx60UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971782 | ORPH ...ToolchainBuildrootMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971550 | ORPH ...olchainBuildrootuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971551 | ORPH ...xternalToolchainCCache | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971553 | ORPH ...ernalToolchainCtngMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971554 | ORPH ...rnalToolchainLinaroArm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971555 | ORPH ...ToolchainSourceryArmv4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971556 | ORPH ...ToolchainSourceryArmv5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971557 | ORPH ...ToolchainSourceryArmv7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971558 | ORPH TestGdbArc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971365 | ORPH TestGdbFullTarget | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971366 | ORPH ...GdbHostOnlyAllFeatures | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971367 | ORPH TestGdbHostOnlyDefault | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971368 | ORPH TestGdbserverOnly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971369 | ORPH TestGetDevelopers | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971784 | ORPH TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971370 | ORPH TestGst1Python | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971371 | ORPH TestHWLoc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971372 | ORPH TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971373 | ORPH ...ystemSystemdRoNetworkd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971347 | ORPH ...so9660SyslinuxExternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971325 | ORPH TestLibshdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971375 | ORPH TestLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971380 | ORPH TestLuaHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971393 | ORPH TestLuaInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971395 | ORPH TestLuaLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971376 | ORPH TestLuaLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971378 | ORPH TestLuaLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971382 | ORPH TestLuaLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971384 | ORPH TestLuaLuaCffi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971386 | ORPH TestLuaLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971387 | ORPH TestLuaLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971407 | ORPH TestLuaLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971409 | ORPH TestLuaLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971391 | ORPH TestLuaLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971411 | ORPH TestLuaLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971399 | ORPH TestLuaLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971415 | ORPH TestLuaLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971401 | ORPH TestLuaLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971417 | ORPH TestLuaLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971419 | ORPH TestLuaLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971389 | ORPH TestLuaLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971413 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971421 | ORPH TestLuaLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971405 | ORPH TestLuaLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971397 | ORPH TestLuaLzlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971426 | ORPH TestLuaRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971528 | ORPH TestLuaUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971403 | ORPH TestLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971381 | ORPH TestLuajitHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971394 | ORPH TestLuajitInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971396 | ORPH TestLuajitLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971377 | ORPH TestLuajitLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971379 | ORPH TestLuajitLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971383 | ORPH TestLuajitLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971385 | ORPH TestLuajitLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971388 | ORPH TestLuajitLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971408 | ORPH TestLuajitLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971410 | ORPH TestLuajitLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971392 | ORPH TestLuajitLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971412 | ORPH TestLuajitLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971400 | ORPH TestLuajitLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971416 | ORPH TestLuajitLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971402 | ORPH TestLuajitLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971418 | ORPH TestLuajitLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971420 | ORPH TestLuajitLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971390 | ORPH TestLuajitLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971414 | ORPH TestLuajitLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971422 | ORPH TestLuajitLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971406 | ORPH TestLuajitLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971398 | ORPH TestLuajitRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971529 | ORPH TestLuajitTurbolua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971540 | ORPH TestLuajitUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971404 | ORPH TestLuvi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971424 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971425 | ORPH TestMender | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971427 | ORPH TestMsrTools | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971428 | ORPH TestNcdu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971429 | ORPH TestNetdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971430 | ORPH TestNoTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971289 | ORPH TestOctave | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971431 | ORPH TestOla | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971432 | ORPH TestOpenJdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971433 | ORPH TestOpenSshGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971434 | ORPH TestOpenSshuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971435 | ORPH TestOpkg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971436 | ORPH TestPerl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971437 | ORPH TestPerlClassLoad | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971438 | ORPH TestPerlDBDmysql | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971439 | ORPH TestPerlEncodeDetect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971440 | ORPH TestPerlGDGraph | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971441 | ORPH TestPerlHTMLParser | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971442 | ORPH TestPerlIOSocketMulticast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971443 | ORPH TestPerlIOSocketSSL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971444 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971446 | ORPH TestPerlMailDKIM | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971447 | ORPH TestPerlX10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971448 | ORPH TestPerlXMLLibXML | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971449 | ORPH TestPerllibwwwperl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971445 | ORPH TestPhpApcu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971450 | ORPH TestPhpLuaLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971451 | ORPH TestPhpLuaLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971452 | ORPH TestPhpPam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971453 | ORPH TestPhpPeclDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971454 | ORPH TestPixz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971455 | ORPH TestPolkitInitd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971456 | ORPH TestPolkitSystemd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971457 | ORPH TestProsodyLua51 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971459 | ORPH TestProsodyLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971460 | ORPH TestPyNdiff | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971509 | ORPH TestPython3Py | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971461 | ORPH TestPython3PyPyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971463 | ORPH TestPython3Pyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971464 | ORPH TestPythonAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971469 | ORPH TestPythonAvro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971473 | ORPH TestPythonPahoMQTT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971503 | ORPH TestPythonPy3Aexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971466 | ORPH TestPythonPy3Argh | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971467 | ORPH TestPythonPy3Attrs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971468 | ORPH TestPythonPy3Autobahn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971471 | ORPH TestPythonPy3Automat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971472 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971474 | ORPH TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971475 | ORPH TestPythonPy3Botocore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971476 | ORPH TestPythonPy3Can | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971477 | ORPH TestPythonPy3Cbor | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971478 | ORPH TestPythonPy3Click | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971479 | ORPH TestPythonPy3Colorzero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971480 | ORPH TestPythonPy3Constantly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971481 | ORPH TestPythonPy3Construct | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971482 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971483 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971484 | ORPH TestPythonPy3DBusFast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971485 | ORPH TestPythonPy3DBusNext | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971486 | ORPH TestPythonPy3Dicttoxml2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971487 | ORPH TestPythonPy3Distro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971488 | ORPH TestPythonPy3Django | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971489 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971490 | ORPH TestPythonPy3Flask | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971491 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971492 | ORPH TestPythonPy3Git | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971493 | ORPH TestPythonPy3Gitdb2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971494 | ORPH TestPythonPy3GnuPG | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971495 | ORPH TestPythonPy3Gobject | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971496 | ORPH TestPythonPy3Gpiozero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971497 | ORPH TestPythonPy3Incremental | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971498 | ORPH TestPythonPy3Iptables | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971499 | ORPH TestPythonPy3Jmespath | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971500 | ORPH TestPythonPy3Libftdi1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971374 | ORPH TestPythonPy3Munch | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971501 | ORPH TestPythonPy3Passlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971504 | ORPH TestPythonPy3Pexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971505 | ORPH TestPythonPy3PyAlsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971506 | ORPH TestPythonPy3Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971508 | ORPH TestPythonPy3Pytest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971510 | ORPH ...PythonPy3PytestAsyncio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971511 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971512 | ORPH TestPythonPy3Qrcode | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971513 | ORPH TestPythonPy3RSA | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971515 | ORPH TestPythonPy3RpiGpio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971514 | ORPH TestPythonPy3S3transfer | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971517 | ORPH TestPythonPy3SciPy | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971518 | ORPH ...thonPy3ServiceIdentity | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971519 | ORPH TestPythonPy3Smmap2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971520 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971521 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971522 | ORPH TestPythonPy3Txaio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971523 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971524 | ORPH TestPythonPy3Ubjson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971525 | ORPH ...y3UnitTestXmlReporting | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971526 | ORPH TestPythonPy3rtoml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971516 | ORPH TestPythonPybind | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971507 | ORPH TestRedis | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971527 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971530 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971531 | ORPH TestS6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971532 | ORPH TestS6Networking | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971533 | ORPH TestS6PortableUtils | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971534 | ORPH TestS6Rc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971536 | ORPH TestSudo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971537 | ORPH TestSyslogNg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971538 | ORPH TestTmux | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971539 | ORPH TestUbi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971334 | ORPH TestUbootOpensslPkgConfig | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971541 | ORPH TestZ3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971542 | ORPH TestZerofree | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971543 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971544 | ORPH TestZfsMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971545 | ORPH TestZfsUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971546 | ORPH -- http://autobuild.buildroot.net From peter at korsgaard.com Wed Feb 1 07:23:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 01 Feb 2023 08:23:29 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/fluent-bit: needs arch support and C++ for wasm In-Reply-To: <20230130121930.3472747-3-thomas@devoogdt.com> (Thomas Devoogdt's message of "Mon, 30 Jan 2023 13:19:30 +0100") References: <20230130121930.3472747-1-thomas@devoogdt.com> <20230130121930.3472747-3-thomas@devoogdt.com> Message-ID: <87357p4zny.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > From: Thomas Devoogdt > See: > https://github.com/fluent/fluent-bit/tree/master/lib/wasm-micro-runtime-WAMR-1.1.1#supported-architectures-and-platforms > MIPS & RISCV32 are mentioned in the supported list, > but that seems to be wrong, so excluded those. > Fixes: > - http://autobuild.buildroot.org/results/dfb/dfb8f71d7e016cdfd3beb4b8196081898bd49ae2/build-end.log > - http://autobuild.buildroot.org/results/ecf/ecfe7b67af68cd7f397a50360900cd9a7afc830e/build-end.log > Signed-off-by: Thomas Devoogdt > --- > package/fluent-bit/Config.in | 15 +++++++++++++++ > package/fluent-bit/fluent-bit.mk | 6 ++++++ > 2 files changed, 21 insertions(+) > diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in > index 11ceb55d4f..50437cab60 100644 > --- a/package/fluent-bit/Config.in > +++ b/package/fluent-bit/Config.in > @@ -10,3 +10,18 @@ config BR2_PACKAGE_FLUENT_BIT > comment "fluent-bit needs a glibc toolchain" > depends on !BR2_TOOLCHAIN_USES_GLIBC > + > +if BR2_PACKAGE_FLUENT_BIT > + > +config BR2_PACKAGE_FLUENT_BIT_WASM > + bool "Build with WASM runtime support" > + depends on BR2_INSTALL_LIBSTDCPP > + # see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms > + default y if BR2_arc > + default y if BR2_arm || BR2_armeb > + default y if BR2_aarch64 || BR2_aarch64_be > + default y if BR2_i386 || BR2_x86_64 > + default y if BR2_RISCV_64 > + default y if BR2_xtensa I know that Yann suggested this, but it doesn't work. We cannot mix the arch dependencies like this with an option with a prompt, because the user can still manually enable the option on an unsupported architecture. You were also missing some help text and I think this "filters written in WASM" feature is quite unlikely to be used, so I changed it to default off with: config BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS bool # see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms default y if BR2_arc default y if BR2_arm || BR2_armeb default y if BR2_aarch64 || BR2_aarch64_be default y if BR2_i386 || BR2_x86_64 default y if BR2_RISCV_64 default y if BR2_xtensa config BR2_PACKAGE_FLUENT_BIT_WASM bool "wasm runtime support" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS help Support for WASM-based plugins. And committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 1 07:22:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 1 Feb 2023 08:22:25 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: needs arch support and C++ for wasm Message-ID: <20230201072406.6992D82DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aff4317797c34c78747f4c6c5ee8d9a1bc0ae270 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See: https://github.com/fluent/fluent-bit/tree/master/lib/wasm-micro-runtime-WAMR-1.1.1#supported-architectures-and-platforms MIPS & RISCV32 are mentioned in the supported list, but that seems to be wrong, so excluded those. Fixes: - http://autobuild.buildroot.org/results/dfb/dfb8f71d7e016cdfd3beb4b8196081898bd49ae2/build-end.log - http://autobuild.buildroot.org/results/ecf/ecfe7b67af68cd7f397a50360900cd9a7afc830e/build-end.log Signed-off-by: Thomas Devoogdt [Peter: Move arch dependency to _WASM_ARCH_SUPPORTS blind option, add help text, use normal style for prompt and fix indentation] Signed-off-by: Peter Korsgaard --- package/fluent-bit/Config.in | 21 +++++++++++++++++++++ package/fluent-bit/fluent-bit.mk | 6 ++++++ 2 files changed, 27 insertions(+) diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 11ceb55d4f..6c2299e695 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -8,5 +8,26 @@ config BR2_PACKAGE_FLUENT_BIT https://github.com/fluent/fluent-bit +if BR2_PACKAGE_FLUENT_BIT + +config BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + bool + # see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms + default y if BR2_arc + default y if BR2_arm || BR2_armeb + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + default y if BR2_RISCV_64 + default y if BR2_xtensa + +config BR2_PACKAGE_FLUENT_BIT_WASM + bool "wasm runtime support" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + help + Support for WASM-based plugins. + +endif + comment "fluent-bit needs a glibc toolchain" depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index c84042a0fa..6e9a33e02e 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -17,6 +17,12 @@ FLUENT_BIT_CONF_OPTS += \ -DFLB_CHUNK_TRACE=No \ -DFLB_BACKTRACE=No +ifeq ($(BR2_PACKAGE_FLUENT_BIT_WASM),y) +FLUENT_BIT_CONF_OPTS += -DFLB_WASM=Yes +else +FLUENT_BIT_CONF_OPTS += -DFLB_WASM=No +endif + ifeq ($(BR2_PACKAGE_LUAJIT),y) FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=Yes FLUENT_BIT_DEPENDENCIES += luajit From thomas at devoogdt.com Wed Feb 1 07:37:35 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 1 Feb 2023 08:37:35 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/fluent-bit: needs arch support and C++ for wasm In-Reply-To: <87357p4zny.fsf@dell.be.48ers.dk> References: <20230130121930.3472747-1-thomas@devoogdt.com> <20230130121930.3472747-3-thomas@devoogdt.com> <87357p4zny.fsf@dell.be.48ers.dk> Message-ID: Hi, There was indeed a reason why I first did it otherwise, I was a little bit confused at first, but the solution with a blind option indeed seems to be the only right solution. Thx for fixing this up! kr, Thomas Devoogdt Op wo 1 feb. 2023 om 08:23 schreef Peter Korsgaard : > > >>>>> "Thomas" == Thomas Devoogdt writes: > > > From: Thomas Devoogdt > > See: > > https://github.com/fluent/fluent-bit/tree/master/lib/wasm-micro-runtime-WAMR-1.1.1#supported-architectures-and-platforms > > > MIPS & RISCV32 are mentioned in the supported list, > > but that seems to be wrong, so excluded those. > > > Fixes: > > - http://autobuild.buildroot.org/results/dfb/dfb8f71d7e016cdfd3beb4b8196081898bd49ae2/build-end.log > > - http://autobuild.buildroot.org/results/ecf/ecfe7b67af68cd7f397a50360900cd9a7afc830e/build-end.log > > > Signed-off-by: Thomas Devoogdt > > --- > > package/fluent-bit/Config.in | 15 +++++++++++++++ > > package/fluent-bit/fluent-bit.mk | 6 ++++++ > > 2 files changed, 21 insertions(+) > > > diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in > > index 11ceb55d4f..50437cab60 100644 > > --- a/package/fluent-bit/Config.in > > +++ b/package/fluent-bit/Config.in > > @@ -10,3 +10,18 @@ config BR2_PACKAGE_FLUENT_BIT > > > comment "fluent-bit needs a glibc toolchain" > > depends on !BR2_TOOLCHAIN_USES_GLIBC > > + > > +if BR2_PACKAGE_FLUENT_BIT > > + > > +config BR2_PACKAGE_FLUENT_BIT_WASM > > + bool "Build with WASM runtime support" > > + depends on BR2_INSTALL_LIBSTDCPP > > + # see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms > > + default y if BR2_arc > > + default y if BR2_arm || BR2_armeb > > + default y if BR2_aarch64 || BR2_aarch64_be > > + default y if BR2_i386 || BR2_x86_64 > > + default y if BR2_RISCV_64 > > + default y if BR2_xtensa > > I know that Yann suggested this, but it doesn't work. We cannot mix the > arch dependencies like this with an option with a prompt, because the > user can still manually enable the option on an unsupported > architecture. > > You were also missing some help text and I think this "filters written > in WASM" feature is quite unlikely to be used, so I changed it to > default off with: > > config BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS > bool > # see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms > default y if BR2_arc > default y if BR2_arm || BR2_armeb > default y if BR2_aarch64 || BR2_aarch64_be > default y if BR2_i386 || BR2_x86_64 > default y if BR2_RISCV_64 > default y if BR2_xtensa > > config BR2_PACKAGE_FLUENT_BIT_WASM > bool "wasm runtime support" > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS > help > Support for WASM-based plugins. > > And committed, thanks. > > -- > Bye, Peter Korsgaard From baruch at tkos.co.il Wed Feb 1 08:29:54 2023 From: baruch at tkos.co.il (Baruch Siach) Date: Wed, 1 Feb 2023 10:29:54 +0200 Subject: [Buildroot] [PATCH] package/sexpect: requires MMU Message-ID: <00c897a75f46008a2e4ddfa3a17eeef7641420a6.1675240194.git.baruch@tkos.co.il> Disable when MMU is not available for target. Fixes: http://autobuild.buildroot.net/results/a2b69fdf67d520aa4d2718bd688d88d102842cdf Signed-off-by: Baruch Siach --- package/sexpect/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sexpect/Config.in b/package/sexpect/Config.in index bdf5c3bbf59c..e558af26f0a6 100644 --- a/package/sexpect/Config.in +++ b/package/sexpect/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SEXPECT bool "sexpect" + depends on BR2_USE_MMU # fork() help sexpect is another implementation of Expect which is specifically designed for Shell scripts -- 2.39.1 From fperrad at gmail.com Wed Feb 1 09:02:24 2023 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 1 Feb 2023 10:02:24 +0100 Subject: [Buildroot] [PATCH] package/luaposix: bump to version 36.1 Message-ID: <20230201090224.17033-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/luaposix/luaposix.hash | 2 +- package/luaposix/luaposix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash index fc0b5fa74..2d54a6901 100644 --- a/package/luaposix/luaposix.hash +++ b/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e0fcb4996f76aa49ae3e5edf69978171091e3d69d5de5589d591d227f8a427c1 luaposix-36.0.tar.gz +sha256 7944c2b4fbcef0667d407302740d87645325e751fd8d819f2b253c5d9ad0d497 luaposix-36.1.tar.gz sha256 ea0fdaae50b0d31a81c2c99f4354264783c71043fd40522feaa40eecc069599b LICENSE diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index 1a537defc..d17c8188b 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 36.0 +LUAPOSIX_VERSION = 36.1 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE -- 2.37.2 From proud4124 at gmail.com Wed Feb 1 19:31:43 2023 From: proud4124 at gmail.com (Takashi Yasuda) Date: Wed, 1 Feb 2023 19:31:43 +0000 Subject: [Buildroot] libc testsuite Message-ID: Hi all, I'm looking for the alternative to in-tree glibc testsuite [1] to test the libc installed on my board, especially for comparing the stabilities of glibc, musl, and uclibc, regardless of the architecture. I found the uclibc-ng-test [2], but it seems to be no longer actively maintained, so the test cases may be outdated. Is there a more reliable option? Thanks, Yasuda [1] https://github.com/bminor/glibc/blob/master/scripts/evaluate-test.sh [2] https://github.com/wbx-github/uclibc-ng-test -------------- next part -------------- An HTML attachment was scrubbed... URL: From laurent at vivier.eu Wed Feb 1 13:46:06 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 14:46:06 +0100 Subject: [Buildroot] [PATCH v9 0/3] package: add petitboot to use with qemu-system-m68k Message-ID: <20230201134609.2040073-1-laurent@vivier.eu> qemu-system-m68k has introduced in v6.0 a new pure virtual machine that is now supported by linux v5.19. The goal of this series is to provide petitboot as an embedded bootloader for it (like it is for the IBM POWER machine). The first patch introduces petitboot package, the second patch the configuration to build buildroot with petitboot for the QEMU machine. You can test it with: qemu-system-m68k -M virt -kernel images/vmlinux \ -initrd images/rootfs.cpio.xz \ -append "console=ttyGF0" --nographic Signed-off-by: Laurent Vivier v9: - remove dependency on BR2_PACKAGE_PS3_UTILS - Add Thomas' Rb - rebase v8: - use linux.fragment rather than linux.config - rebase v7: - set BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y - fix errors reported by check-package - add gitlab testing (C?dric) - update boot-qemu-image.py to support petitboot v6: - rebase v5: - remove BR2_CCACHE_DIR, BR2_PACKAGE_DTC and BR2_PACKAGE_DTC_PROGRAMS v4: - address Thomas' comments - remove petitboot-mtd config as libflash is not available v3: v2: v1: - first version, I messed up with list subscription and git-publish... Laurent Vivier (3): package: add petitboot board/qemu/m68k-virt: Add virt-m68k linux config support/scripts/boot-qemu-image.py: manage petitboot interface DEVELOPERS | 5 ++ board/qemu/m68k-virt/linux.fragment | 21 ++++++ board/qemu/m68k-virt/readme.txt | 5 ++ configs/qemu_m68k_virt_petitboot_defconfig | 31 ++++++++ package/Config.in | 1 + package/kexec/Config.in | 2 +- package/petitboot/63-md-raid-arrays.rules | 41 +++++++++++ package/petitboot/65-md-incremental.rules | 69 ++++++++++++++++++ package/petitboot/66-add-sg-module.rules | 2 + package/petitboot/Config.in | 23 ++++++ package/petitboot/S14silence-console | 9 +++ package/petitboot/S15pb-discover | 38 ++++++++++ package/petitboot/fs-overlay/etc/inittab | 34 +++++++++ package/petitboot/fs-overlay/etc/locale | 1 + package/petitboot/fs-overlay/init | 8 ++ package/petitboot/kexec-restart | 8 ++ package/petitboot/petitboot-console-ui.rules | 6 ++ package/petitboot/petitboot.hash | 2 + package/petitboot/petitboot.mk | 77 ++++++++++++++++++++ package/petitboot/removable-event-poll.rules | 4 + package/petitboot/shell_config | 19 +++++ package/petitboot/shell_profile | 2 + support/scripts/boot-qemu-image.py | 13 +++- 23 files changed, 417 insertions(+), 4 deletions(-) create mode 100644 board/qemu/m68k-virt/linux.fragment create mode 100644 board/qemu/m68k-virt/readme.txt create mode 100644 configs/qemu_m68k_virt_petitboot_defconfig create mode 100644 package/petitboot/63-md-raid-arrays.rules create mode 100644 package/petitboot/65-md-incremental.rules create mode 100644 package/petitboot/66-add-sg-module.rules create mode 100644 package/petitboot/Config.in create mode 100755 package/petitboot/S14silence-console create mode 100755 package/petitboot/S15pb-discover create mode 100644 package/petitboot/fs-overlay/etc/inittab create mode 100644 package/petitboot/fs-overlay/etc/locale create mode 100755 package/petitboot/fs-overlay/init create mode 100755 package/petitboot/kexec-restart create mode 100644 package/petitboot/petitboot-console-ui.rules create mode 100644 package/petitboot/petitboot.hash create mode 100644 package/petitboot/petitboot.mk create mode 100644 package/petitboot/removable-event-poll.rules create mode 100644 package/petitboot/shell_config create mode 100755 package/petitboot/shell_profile -- 2.39.1 From laurent at vivier.eu Wed Feb 1 13:46:07 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 14:46:07 +0100 Subject: [Buildroot] [PATCH v9 1/3] package: add petitboot In-Reply-To: <20230201134609.2040073-1-laurent@vivier.eu> References: <20230201134609.2040073-1-laurent@vivier.eu> Message-ID: <20230201134609.2040073-2-laurent@vivier.eu> from https://github.com/glevand/petitboot--buildroot Updated to work with m68k architecture rather than PlayStation3 (focused on qemu-system-m68k virt machine) Signed-off-by: Laurent Vivier --- DEVELOPERS | 3 + package/Config.in | 1 + package/kexec/Config.in | 2 +- package/petitboot/63-md-raid-arrays.rules | 41 +++++++++++ package/petitboot/65-md-incremental.rules | 69 ++++++++++++++++++ package/petitboot/66-add-sg-module.rules | 2 + package/petitboot/Config.in | 23 ++++++ package/petitboot/S14silence-console | 9 +++ package/petitboot/S15pb-discover | 38 ++++++++++ package/petitboot/fs-overlay/etc/inittab | 34 +++++++++ package/petitboot/fs-overlay/etc/locale | 1 + package/petitboot/fs-overlay/init | 8 ++ package/petitboot/kexec-restart | 8 ++ package/petitboot/petitboot-console-ui.rules | 6 ++ package/petitboot/petitboot.hash | 2 + package/petitboot/petitboot.mk | 77 ++++++++++++++++++++ package/petitboot/removable-event-poll.rules | 4 + package/petitboot/shell_config | 19 +++++ package/petitboot/shell_profile | 2 + 19 files changed, 348 insertions(+), 1 deletion(-) create mode 100644 package/petitboot/63-md-raid-arrays.rules create mode 100644 package/petitboot/65-md-incremental.rules create mode 100644 package/petitboot/66-add-sg-module.rules create mode 100644 package/petitboot/Config.in create mode 100755 package/petitboot/S14silence-console create mode 100755 package/petitboot/S15pb-discover create mode 100644 package/petitboot/fs-overlay/etc/inittab create mode 100644 package/petitboot/fs-overlay/etc/locale create mode 100755 package/petitboot/fs-overlay/init create mode 100755 package/petitboot/kexec-restart create mode 100644 package/petitboot/petitboot-console-ui.rules create mode 100644 package/petitboot/petitboot.hash create mode 100644 package/petitboot/petitboot.mk create mode 100644 package/petitboot/removable-event-poll.rules create mode 100644 package/petitboot/shell_config create mode 100755 package/petitboot/shell_profile diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577f1..d56e4643eaf8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1766,6 +1766,9 @@ F: package/aircrack-ng/ N: Laurent Charpentier F: package/open-lldp/ +N: Laurent Vivier +F: package/petitboot/ + N: Lee Jones F: boot/afboot-stm32/ diff --git a/package/Config.in b/package/Config.in index 83fddf316f75..c3641ea91c6b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2654,6 +2654,7 @@ menu "System tools" source "package/openrc/Config.in" source "package/openvmtools/Config.in" source "package/pamtester/Config.in" + source "package/petitboot/Config.in" source "package/polkit/Config.in" source "package/powerpc-utils/Config.in" source "package/procps-ng/Config.in" diff --git a/package/kexec/Config.in b/package/kexec/Config.in index 90a7bc2672bd..092a80b171fc 100644 --- a/package/kexec/Config.in +++ b/package/kexec/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_KEXEC depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x + BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x || BR2_m68k help Kexec is a user space utility for loading another kernel and asking the currently running kernel to do something with diff --git a/package/petitboot/63-md-raid-arrays.rules b/package/petitboot/63-md-raid-arrays.rules new file mode 100644 index 000000000000..92aec36e69d4 --- /dev/null +++ b/package/petitboot/63-md-raid-arrays.rules @@ -0,0 +1,41 @@ +# do not edit this file, it will be overwritten on update + +SUBSYSTEM!="block", GOTO="md_end" + +# handle md arrays +ACTION!="add|change", GOTO="md_end" +KERNEL!="md*", GOTO="md_end" + +# partitions have no md/{array_state,metadata_version}, but should not +# for that reason be ignored. +ENV{DEVTYPE}=="partition", GOTO="md_ignore_state" + +# container devices have a metadata version of e.g. 'external:ddf' and +# never leave state 'inactive' +ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state" +TEST!="md/array_state", ENV{SYSTEMD_READY}="0", GOTO="md_end" +ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end" +LABEL="md_ignore_state" + +IMPORT{program}="/sbin/mdadm --detail --export $devnode" +ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace" +ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}" +ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}" +ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace" +ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n" +ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n" +ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n" + +IMPORT{builtin}="blkid" +OPTIONS+="link_priority=100" +OPTIONS+="watch" +ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" +ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" + +ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service" + +# Tell systemd to run mdmon for our container, if we need it. +ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c" +ENV{MD_MON_THIS}=="?*", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service" + +LABEL="md_end" diff --git a/package/petitboot/65-md-incremental.rules b/package/petitboot/65-md-incremental.rules new file mode 100644 index 000000000000..153d12fe6f7e --- /dev/null +++ b/package/petitboot/65-md-incremental.rules @@ -0,0 +1,69 @@ +# This file causes block devices with Linux RAID (mdadm) signatures to +# automatically cause mdadm to be run. +# See udev(8) for syntax + +# Don't process any events if anaconda is running as anaconda brings up +# raid devices manually +ENV{ANACONDA}=="?*", GOTO="md_end" + +# Also don't process disks that are slated to be a multipath device +ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="md_end" + +# We process add events on block devices (since they are ready as soon as +# they are added to the system), but we must process change events as well +# on any dm devices (like LUKS partitions or LVM logical volumes) and on +# md devices because both of these first get added, then get brought live +# and trigger a change event. The reason we don't process change events +# on bare hard disks is because if you stop all arrays on a disk, then +# run fdisk on the disk to change the partitions, when fdisk exits it +# triggers a change event, and we want to wait until all the fdisks on +# all member disks are done before we do anything. Unfortunately, we have +# no way of knowing that, so we just have to let those arrays be brought +# up manually after fdisk has been run on all of the disks. + +# First, process all add events (md and dm devices will not really do +# anything here, just regular disks, and this also won't get any imsm +# array members either) +SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="linux_raid_member", \ + RUN+="/sbin/mdadm -I --export $env{DEVNAME}" + +# Next, check to make sure the BIOS raid stuff wasn't turned off via cmdline +IMPORT{cmdline}="noiswmd" +IMPORT{cmdline}="nodmraid" +ENV{noiswmd}=="?*", GOTO="md_imsm_inc_end" +ENV{nodmraid}=="?*", GOTO="md_imsm_inc_end" +SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="isw_raid_member", \ + RUN+="/sbin/mdadm -I $env{DEVNAME}" +LABEL="md_imsm_inc_end" + +SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}=="?*", \ + RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}" +SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}!="?*", \ + RUN+="/sbin/mdadm -If $name" + +# Next make sure that this isn't a dm device we should skip for some reason +ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="dm_change_end" +ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="dm_change_end" +ENV{DM_SUSPENDED}=="1", GOTO="dm_change_end" +KERNEL=="dm-*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \ + ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}" +LABEL="dm_change_end" + +# Finally catch any nested md raid arrays. If we brought up an md raid +# array that's part of another md raid array, it won't be ready to be used +# until the change event that occurs when it becomes live +KERNEL=="md*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \ + ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}" + +# In case the initramfs only started some of the arrays in our container, +# run incremental assembly on the container itself. Note: we ran mdadm +# on the container in 64-md-raid.rules, and that's how the MD_LEVEL +# environment variable is already set. If that disappears from the other +# file, we will need to add this line into the middle of the next rule: +# IMPORT{program}="/sbin/mdadm -D --export $tempnode", \ + +SUBSYSTEM=="block", ACTION=="add|change", KERNEL=="md*", \ + ENV{MD_LEVEL}=="container", RUN+="/sbin/mdadm -I $env{DEVNAME}" + + +LABEL="md_end" diff --git a/package/petitboot/66-add-sg-module.rules b/package/petitboot/66-add-sg-module.rules new file mode 100644 index 000000000000..ae18d28c570e --- /dev/null +++ b/package/petitboot/66-add-sg-module.rules @@ -0,0 +1,2 @@ +# load modules to scsi disks, if they aren't in kernel +SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg" diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in new file mode 100644 index 000000000000..d87f9d2450a0 --- /dev/null +++ b/package/petitboot/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_PETITBOOT + bool "petitboot" + # petitboot needs udev /dev management + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_TARGET_PANEL + select BR2_PACKAGE_NCURSES_TARGET_FORM + select BR2_PACKAGE_NCURSES_TARGET_MENU + # run-time dependency only + select BR2_PACKAGE_KEXEC_LITE if !BR2_PACKAGE_KEXEC + # run-time dependency only + select BR2_PACKAGE_POWERPC_UTILS if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + # run-time dependency only + select BR2_PACKAGE_NVME if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + help + Petitboot is a small kexec-based bootloader + + http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html + +comment "petitboot requires udev to be enabled" + depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/petitboot/S14silence-console b/package/petitboot/S14silence-console new file mode 100755 index 000000000000..2ce6b39f427b --- /dev/null +++ b/package/petitboot/S14silence-console @@ -0,0 +1,9 @@ +#!/bin/sh + +case "$1" in + start) + echo 1 1 1 1 > /proc/sys/kernel/printk + ;; +esac + +exit 0 diff --git a/package/petitboot/S15pb-discover b/package/petitboot/S15pb-discover new file mode 100755 index 000000000000..9d9ec57de3f0 --- /dev/null +++ b/package/petitboot/S15pb-discover @@ -0,0 +1,38 @@ +#!/bin/sh + +LOGFILE=/var/log/petitboot/pb-discover.log +PIDFILE=/var/run/petitboot.pid + +PATH=/usr/bin:/usr/sbin:/bin:/sbin +export PATH + +verbose= +if pb-config debug | grep -q enabled +then + verbose=-v +fi + +case "$1" in + start) + ulimit -c unlimited + mkdir -p -m 0775 $(dirname $LOGFILE) + mkdir -p -m 0775 /var/petitboot + # Set permissions for normal users + chown -R root:petitgroup $(dirname $LOGFILE) + chown -R root:petitgroup /var/petitboot + + export $(cat /etc/locale) + pb-discover -l $LOGFILE $verbose & + echo $! > $PIDFILE + ;; + stop) + pid=$(cat $PIDFILE) + [ -n "$pid" ] && kill -TERM $pid + ;; + *) + echo "Usage: $0 {start|stop}" + exit 1 + ;; +esac + +exit 0 diff --git a/package/petitboot/fs-overlay/etc/inittab b/package/petitboot/fs-overlay/etc/inittab new file mode 100644 index 000000000000..1f503d5d56f7 --- /dev/null +++ b/package/petitboot/fs-overlay/etc/inittab @@ -0,0 +1,34 @@ +# /etc/inittab +# +# Copyright (C) 2001 Erik Andersen +# +# Note: BusyBox init doesn't support runlevels. The runlevels field is +# completely ignored by BusyBox init. If you want runlevels, use +# sysvinit. +# +# Format for each entry: ::: +# +# id == tty to run on, or empty for /dev/console +# runlevels == ignored +# action == one of sysinit, respawn, askfirst, wait, and once +# process == program to run + +# Startup the system +::sysinit:/bin/mount -t proc proc /proc +::sysinit:/bin/mount -o remount,rw / # REMOUNT_ROOTFS_RW +::sysinit:/bin/mkdir -p /dev/pts +::sysinit:/bin/mkdir -p /dev/shm +::sysinit:/bin/mount -a +::sysinit:/bin/hostname -F /etc/hostname +# now run any rc scripts +::sysinit:/etc/init.d/rcS +::sysinit:/sbin/petitboot-nc +# Stuff to do for the 3-finger salute +::ctrlaltdel:/sbin/reboot + +# Stuff to do before rebooting +::shutdown:/etc/init.d/rcK +::shutdown:/bin/umount -a -r +::shutdown:/sbin/swapoff -a + +::restart:/usr/sbin/kexec-restart diff --git a/package/petitboot/fs-overlay/etc/locale b/package/petitboot/fs-overlay/etc/locale new file mode 100644 index 000000000000..655683630776 --- /dev/null +++ b/package/petitboot/fs-overlay/etc/locale @@ -0,0 +1 @@ +LANG=en_US.utf-8 diff --git a/package/petitboot/fs-overlay/init b/package/petitboot/fs-overlay/init new file mode 100755 index 000000000000..1e56178db162 --- /dev/null +++ b/package/petitboot/fs-overlay/init @@ -0,0 +1,8 @@ +#!/bin/sh +# devtmpfs does not get automounted for initramfs +/bin/mount -t devtmpfs devtmpfs /dev +exec 0/dev/console +exec 2>/dev/console +exec /sbin/init "$@" + diff --git a/package/petitboot/kexec-restart b/package/petitboot/kexec-restart new file mode 100755 index 000000000000..0175e76df4cd --- /dev/null +++ b/package/petitboot/kexec-restart @@ -0,0 +1,8 @@ +#!/bin/sh + +/usr/sbin/kexec -f -e + +while : +do + sleep 1 +done diff --git a/package/petitboot/petitboot-console-ui.rules b/package/petitboot/petitboot-console-ui.rules new file mode 100644 index 000000000000..cbf1b7e1d765 --- /dev/null +++ b/package/petitboot/petitboot-console-ui.rules @@ -0,0 +1,6 @@ + +# spawn a petitboot UI on common user-visible interface devices +SUBSYSTEM=="tty", KERNEL=="ttyGF*", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" +SUBSYSTEM=="tty", KERNEL=="hvc*", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" +SUBSYSTEM=="tty", KERNEL=="tty0", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" +SUBSYSTEM=="tty", KERNEL=="ttyS*", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" diff --git a/package/petitboot/petitboot.hash b/package/petitboot/petitboot.hash new file mode 100644 index 000000000000..ccb58eed0e34 --- /dev/null +++ b/package/petitboot/petitboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 b42ae4fb2a81e9cf68f727c3f54c6312788c654bd97628ec9ba61b19a68990e6 petitboot-v1.13.tar.gz diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk new file mode 100644 index 000000000000..b04710a535d3 --- /dev/null +++ b/package/petitboot/petitboot.mk @@ -0,0 +1,77 @@ +################################################################################ +# +# petitboot +# +################################################################################ + +PETITBOOT_VERSION = v1.13 +PETITBOOT_SITE ?= https://github.com/open-power/petitboot/releases/download/$(PETITBOOT_VERSION) +PETITBOOT_DEPENDENCIES = elfutils ncurses udev host-bison host-flex lvm2 +PETITBOOT_LICENSE = GPLv2 +PETITBOOT_LICENSE_FILES = COPYING + +PETITBOOT_CONF_OPTS += --with-ncurses --without-twin-x11 --without-twin-fbdev \ + --localstatedir=/var \ + --enable-crypt \ + HOST_PROG_KEXEC=/usr/sbin/kexec \ + HOST_PROG_SHUTDOWN=/usr/sbin/kexec-restart \ + $(if $(BR2_PACKAGE_BUSYBOX),--with-tftp=busybox --enable-busybox) + +ifdef PETITBOOT_DEBUG +PETITBOOT_CONF_OPTS += --enable-debug +endif + +ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) +PETITBOOT_CONF_OPTS += --with-ncursesw MENU_LIB=-lmenuw FORM_LIB=-lformw +endif + +define PETITBOOT_POST_INSTALL + $(INSTALL) -D -m 0755 $(@D)/utils/bb-kexec-reboot \ + $(TARGET_DIR)/usr/libexec/petitboot + $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/petitboot/boot.d + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/01-create-default-dtb \ + $(TARGET_DIR)/etc/petitboot/boot.d/ + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ + $(TARGET_DIR)/etc/petitboot/boot.d/ + + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S14silence-console \ + $(TARGET_DIR)/etc/init.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S15pb-discover \ + $(TARGET_DIR)/etc/init.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/kexec-restart \ + $(TARGET_DIR)/usr/sbin/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/petitboot-console-ui.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/removable-event-poll.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/63-md-raid-arrays.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/65-md-incremental.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/66-add-sg-module.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + + ln -sf /usr/sbin/pb-udhcpc \ + $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ + + mkdir -p $(TARGET_DIR)/home/petituser + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/shell_profile \ + $(TARGET_DIR)/home/petituser/.profile + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/shell_config \ + $(TARGET_DIR)/home/petituser/.shrc + + $(MAKE) -C $(@D)/po DESTDIR=$(TARGET_DIR) install +endef + +define PETITBOOT_POST_INSTALL_DTB + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/30-dtb-updates \ + $(TARGET_DIR)/etc/petitboot/boot.d/ +endef + +PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL + +ifeq ($(BR2_PACKAGE_DTC),y) +PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL_DTB +endif + +$(eval $(autotools-package)) diff --git a/package/petitboot/removable-event-poll.rules b/package/petitboot/removable-event-poll.rules new file mode 100644 index 000000000000..b736aef6101f --- /dev/null +++ b/package/petitboot/removable-event-poll.rules @@ -0,0 +1,4 @@ + +# petitboot needs notification for media change events on removable devices, +# which we only get if we've set the poll_msecs sysfs attribute. +ACTION!="remove", ATTR{removable}=="1", ATTR{events_poll_msecs}="2000" diff --git a/package/petitboot/shell_config b/package/petitboot/shell_config new file mode 100644 index 000000000000..59337ff53039 --- /dev/null +++ b/package/petitboot/shell_config @@ -0,0 +1,19 @@ +#!bin/sh + +reset + +echo "Exiting petitboot. Type 'exit' to return." +echo "You may run 'pb-sos' to gather diagnostic data" + +if [[ "$(id -u)" != "0" ]]; then + echo "" | sudo -S /bin/true 2&>1 >> /dev/null + if [[ $? = 0 ]]; then + echo "No password set, running as root. You may set a password in the System Configuration screen." + sudo -i + sudo -K + exit + fi + export PS1='$ ' +else + export PS1='# ' +fi diff --git a/package/petitboot/shell_profile b/package/petitboot/shell_profile new file mode 100755 index 000000000000..40062b423b79 --- /dev/null +++ b/package/petitboot/shell_profile @@ -0,0 +1,2 @@ +export ENV="/home/petituser/.shrc" +/usr/libexec/petitboot/pb-console -- 2.39.1 From laurent at vivier.eu Wed Feb 1 13:46:08 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 14:46:08 +0100 Subject: [Buildroot] [PATCH v9 2/3] board/qemu/m68k-virt: Add virt-m68k linux config In-Reply-To: <20230201134609.2040073-1-laurent@vivier.eu> References: <20230201134609.2040073-1-laurent@vivier.eu> Message-ID: <20230201134609.2040073-3-laurent@vivier.eu> Build a 5.19 (first version with the m68k virt machine) kernel for "qemu-system-m68k -M virt" machine. Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth --- DEVELOPERS | 2 ++ board/qemu/m68k-virt/linux.fragment | 21 +++++++++++++++++ board/qemu/m68k-virt/readme.txt | 5 +++++ configs/qemu_m68k_virt_petitboot_defconfig | 26 ++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 board/qemu/m68k-virt/linux.fragment create mode 100644 board/qemu/m68k-virt/readme.txt create mode 100644 configs/qemu_m68k_virt_petitboot_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index d56e4643eaf8..9db1568422a8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1768,6 +1768,8 @@ F: package/open-lldp/ N: Laurent Vivier F: package/petitboot/ +F: board/qemu/m68k-virt/ +F: configs/qemu_m68k_virt_petitboot_defconfig N: Lee Jones F: boot/afboot-stm32/ diff --git a/board/qemu/m68k-virt/linux.fragment b/board/qemu/m68k-virt/linux.fragment new file mode 100644 index 000000000000..49416982601c --- /dev/null +++ b/board/qemu/m68k-virt/linux.fragment @@ -0,0 +1,21 @@ +CONFIG_BLK_DEV_INITRD=y +CONFIG_KEXEC=y +CONFIG_BOOTINFO_PROC=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_MD=y +CONFIG_MD_LINEAR=y +CONFIG_MD_MULTIPATH=y +CONFIG_MD_FAULTY=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_UNSTRIPED=y +CONFIG_DM_CRYPT=y +CONFIG_DM_SNAPSHOT=y +CONFIG_DM_THIN_PROVISIONING=y +CONFIG_DM_CACHE=y +CONFIG_DM_WRITECACHE=y +CONFIG_DM_EBS=y +CONFIG_DM_ERA=y +CONFIG_DM_CLONE=y +CONFIG_DM_MIRROR=y +CONFIG_DM_RAID=y +CONFIG_DM_ZERO=y diff --git a/board/qemu/m68k-virt/readme.txt b/board/qemu/m68k-virt/readme.txt new file mode 100644 index 000000000000..714b74c70ea1 --- /dev/null +++ b/board/qemu/m68k-virt/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + + qemu-system-m68k -M virt -kernel output/images/vmlinux -initrd output/images/rootfs.cpio.xz -append "console=ttyGF0" --nographic # qemu_m68k_virt_petitboot_defconfig + +The petiboot menu will appear in the terminal where QEMU has been started. diff --git a/configs/qemu_m68k_virt_petitboot_defconfig b/configs/qemu_m68k_virt_petitboot_defconfig new file mode 100644 index 000000000000..b3497c12b46b --- /dev/null +++ b/configs/qemu_m68k_virt_petitboot_defconfig @@ -0,0 +1,26 @@ +BR2_m68k=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_CCACHE=y +BR2_RELRO_NONE=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Petitboot" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_ROOTFS_MERGED_USR=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyGF0" +BR2_ROOTFS_OVERLAY="package/petitboot/fs-overlay" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" +BR2_LINUX_KERNEL_DEFCONFIG="virt" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/m68k-virt/linux.fragment" +BR2_LINUX_KERNEL_XZ=y +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KEXEC=y +BR2_PACKAGE_KEXEC_ZLIB=y +BR2_PACKAGE_ETHTOOL=y +BR2_PACKAGE_NET_TOOLS=y +BR2_PACKAGE_NETCAT=y +BR2_PACKAGE_RSYNC=y +BR2_PACKAGE_PETITBOOT=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_XZ=y -- 2.39.1 From laurent at vivier.eu Wed Feb 1 13:46:09 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 14:46:09 +0100 Subject: [Buildroot] [PATCH v9 3/3] support/scripts/boot-qemu-image.py: manage petitboot interface In-Reply-To: <20230201134609.2040073-1-laurent@vivier.eu> References: <20230201134609.2040073-1-laurent@vivier.eu> Message-ID: <20230201134609.2040073-4-laurent@vivier.eu> Petitboot doesn't start a shell but a GUI. Manage the menu to switch to the shell. Use "poweroff -f" as we don't have init Enable the test for qemu_m68K_virt. Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth --- configs/qemu_m68k_virt_petitboot_defconfig | 5 +++++ support/scripts/boot-qemu-image.py | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/configs/qemu_m68k_virt_petitboot_defconfig b/configs/qemu_m68k_virt_petitboot_defconfig index b3497c12b46b..cb63a2deeed4 100644 --- a/configs/qemu_m68k_virt_petitboot_defconfig +++ b/configs/qemu_m68k_virt_petitboot_defconfig @@ -8,6 +8,8 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_MERGED_USR=y BR2_TARGET_GENERIC_GETTY_PORT="ttyGF0" BR2_ROOTFS_OVERLAY="package/petitboot/fs-overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" @@ -24,3 +26,6 @@ BR2_PACKAGE_RSYNC=y BR2_PACKAGE_PETITBOOT=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_XZ=y +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/support/scripts/boot-qemu-image.py b/support/scripts/boot-qemu-image.py index ba50ea69ee9a..8dd3b4c654e1 100755 --- a/support/scripts/boot-qemu-image.py +++ b/support/scripts/boot-qemu-image.py @@ -36,7 +36,7 @@ def main(): time.sleep(1) try: - child.expect(["buildroot login:"], timeout=600) + idx = child.expect(["buildroot login:", "Exit to shell"], timeout=600) except pexpect.EOF as e: # Some emulations require a fork of qemu-system, which may be # missing on the system, and is not provided by Buildroot. @@ -55,7 +55,11 @@ def main(): print("System did not boot in time, exiting.") sys.exit(1) - child.sendline("root\r") + if idx == 0: + child.sendline("root\r") + elif idx == 1: + time.sleep(1) + child.sendline("\r") try: child.expect(["# "], timeout=600) @@ -66,7 +70,10 @@ def main(): print("Timeout while waiting for shell") sys.exit(1) - child.sendline("poweroff\r") + if idx == 0: + child.sendline("poweroff\r") + elif idx == 1: + child.sendline("poweroff -f\r") try: child.expect(["System halted"], timeout=600) -- 2.39.1 From kjroland75 at hotmail.com Wed Feb 1 15:57:52 2023 From: kjroland75 at hotmail.com (Kenneth Roland) Date: Wed, 1 Feb 2023 15:57:52 +0000 Subject: [Buildroot] Libarchive always throws an error when building In-Reply-To: References: Message-ID: Hello Buildroot team, I guess this is my way of submitting a bug report, here goes. Current .config is attached, but renamed as buildroot.config as I couldn't get Dolphin (KDE) to show the hidden file. This project of mine was to build an ISO for an old Thinkpad that would act as a reciever from https://github.com/badaix/snapcast, but I couldn't find anything useful on this libarchive error. "libarchive-dev" is installed on the host using "apt install". You guys probably know how to recreate this, but the host is just a Debian netinst, no DE, and then git installed. Installed dependencies as of https://medium.com/@hungryspider/building-custom-linux-for-raspberry-pi-using-buildroot-f81efc7aa817, cloned the Buildroot repo from Github, " make pc_x86_64_bios_defconfig", and then replaced the .config file generated by the one I used the first time (was sanity/dependancy checking). Ran make, which ran for about a good 30-45 mins until it stopped and I saw the libarchive error. Host info (uname -a) Linux blackbox 6.0.0-0.deb11.6-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.0.12-1~bpo11+1 (2022-12-19) x86_64 GNU/Linux ```checking whether the /mnt/hdd/buildroot/output/host/bin/x86_64-buildroot-linux-gnu-gcc linker (/mnt/hdd/buildroot/output/host/bin/x86_64-buildroot-linux-gnu-ld -m elf_ x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking pkg-config is at least version 0.20... yes checking for LIBARCHIVE... no configure: error: Package requirements (libarchive) were not met: Package 'iconv', required by 'libarchive', not found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables LIBARCHIVE_CFLAGS and LIBARCHIVE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. make: *** [package/pkg-generic.mk:283: /mnt/hdd/buildroot/output/build/opkg-0.4.5/.stamp_configured] Error 1``` [https://miro.medium.com/max/1200/0*6J1fXBTEsPODw5I5] Building custom Linux for Raspberry Pi using Buildroot Connect the USB end of the USB to Serial cable to your computer and open the serial port using a serial terminal software such as Gtkterm with baud rate set to 115200 . medium.com ? ? ? [https://opengraph.githubassets.com/39abea8770e3ae33931f8598335f8b3b04f8a288fcc7e7f4579cf2ea74afbb37/badaix/snapcast] GitHub - badaix/snapcast: Synchronous multiroom audio player Installation from source. Please follow this guide to build Snapcast for. Linux; FreeBSD; macOS; Android; OpenWrt; Buildroot; Raspberry Pi; Windows; SnapOS. The bravest among you may be interested in SnapOS, a small and fast-booting "just enough" OS to run Snapcast as an appliance.. There is a guide (with the necessary buildfiles) available to build SnapOS, which comes in two flavors: github.com ? ? ? ? -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: buildroot.config Type: application/octet-stream Size: 136246 bytes Desc: buildroot.config URL: From fontaine.fabrice at gmail.com Wed Feb 1 17:35:17 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 1 Feb 2023 18:35:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/rng-tools: bump to version 6.16 In-Reply-To: <20230130205603.GA3864@scaer> References: <20230114161002.35480-1-fontaine.fabrice@gmail.com> <20230130205603.GA3864@scaer> Message-ID: Hi Yann, Le lun. 30 janv. 2023 ? 21:56, Yann E. MORIN a ?crit : > Fabrice, All, > > On 2023-01-14 17:10 +0100, Fabrice Fontaine spake thusly: > > https://github.com/nhorman/rng-tools/releases/tag/v6.16 > [--SNIP--] > > diff --git a/package/rng-tools/rng-tools.hash > b/package/rng-tools/rng-tools.hash > > index be2ee13969..4c86791267 100644 > > --- a/package/rng-tools/rng-tools.hash > > +++ b/package/rng-tools/rng-tools.hash > > @@ -1,3 +1,3 @@ > > # Locally computed > > -sha256 > bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a > rng-tools-6.15.tar.gz > > +sha256 > 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 > rng-tools-6.16.tar.gz > > This hash does not match here, and we've had a report on IRC that it > does not work either. In both cases, we get this hash instead: > 8e518d45be68f42d0873732a9ac3ecfe0f10c4a9bd5d5f44180a49be8ebda96f > > Can you check on your side, how you ended up with 17666...90894? > I see that there is, only, one autobuilder failure. However, I retested again on a fresh tarball and 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 is the correct sha256 for https://github.com/nhorman/rng-tools/archive/v6.16/rng-tools-6.16.tar.gz. > Regards, > Yann E. MORIN. > > > sha256 > 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > > diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/ > rng-tools.mk > > index f736193a23..3e565103e4 100644 > > --- a/package/rng-tools/rng-tools.mk > > +++ b/package/rng-tools/rng-tools.mk > > @@ -4,14 +4,14 @@ > > # > > > ################################################################################ > > > > -RNG_TOOLS_VERSION = 6.15 > > +RNG_TOOLS_VERSION = 6.16 > > RNG_TOOLS_SITE = $(call > github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) > > RNG_TOOLS_LICENSE = GPL-2.0 > > RNG_TOOLS_LICENSE_FILES = COPYING > > RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project > > RNG_TOOLS_SELINUX_MODULES = rngd > > > > -RNG_TOOLS_DEPENDENCIES = host-pkgconf openssl > > +RNG_TOOLS_DEPENDENCIES = host-pkgconf libcap openssl > > # From git > > RNG_TOOLS_AUTORECONF = YES > > > > @@ -45,6 +45,13 @@ else > > RNG_TOOLS_CONF_OPTS += --without-nistbeacon > > endif > > > > +ifeq ($(BR2_PACKAGE_RNG_TOOLS_QRYPT),y) > > +RNG_TOOLS_DEPENDENCIES += jansson libcurl > > +RNG_TOOLS_CONF_OPTS += --with-qrypt > > +else > > +RNG_TOOLS_CONF_OPTS += --without-qrypt > > +endif > > + > > define RNG_TOOLS_INSTALL_INIT_SYSV > > $(INSTALL) -D -m 755 package/rng-tools/S21rngd \ > > $(TARGET_DIR)/etc/init.d/S21rngd > > -- > > 2.39.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. | > > '------------------------------^-------^------------------^--------------------' > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From ps.report at gmx.net Wed Feb 1 17:41:54 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 1 Feb 2023 18:41:54 +0100 Subject: [Buildroot] Libarchive always throws an error when building In-Reply-To: References: Message-ID: <20230201184154.2c7e2680@gmx.net> Hello Roland, On Wed, 1 Feb 2023 15:57:52 +0000, Kenneth Roland wrote: > Hello Buildroot team, > I guess this is my way of submitting a bug report, here goes. > > Current .config is attached, but renamed as buildroot.config as I couldn't get Dolphin (KDE) to show the hidden file. This project of mine was to build an ISO for an old Thinkpad that would act as a reciever from https://github.com/badaix/snapcast, but I couldn't find anything useful on this libarchive error. "libarchive-dev" is installed on the host using "apt install". You guys probably know how to recreate this, but the host is just a Debian netinst, no DE, and then git installed. Installed dependencies as of https://medium.com/@hungryspider/building-custom-linux-for-raspberry-pi-using-buildroot-f81efc7aa817, cloned the Buildroot repo from Github, " make pc_x86_64_bios_defconfig", and then replaced the .config file generated by the one I used the first time (was sanity/dependancy checking). Ran make, which ran for about a good 30-45 mins until it stopped and I saw the libarchive error. > > Host info (uname -a) > Linux blackbox 6.0.0-0.deb11.6-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.0.12-1~bpo11+1 (2022-12-19) x86_64 GNU/Linux > > ```checking whether the /mnt/hdd/buildroot/output/host/bin/x86_64-buildroot-linux-gnu-gcc linker (/mnt/hdd/buildroot/output/host/bin/x86_64-buildroot-linux-gnu-ld -m elf_ > x86_64) supports shared libraries... yes > checking whether -lc should be explicitly linked in... no > checking dynamic linker characteristics... GNU/Linux ld.so > checking how to hardcode library paths into programs... immediate > checking whether stripping libraries is possible... yes > checking if libtool supports shared libraries... yes > checking whether to build shared libraries... yes > checking whether to build static libraries... no > checking pkg-config is at least version 0.20... yes > checking for LIBARCHIVE... no > configure: error: Package requirements (libarchive) were not met: > > Package 'iconv', required by 'libarchive', not found > > Consider adjusting the PKG_CONFIG_PATH environment variable if you > installed software in a non-standard prefix. > > Alternatively, you may set the environment variables LIBARCHIVE_CFLAGS > and LIBARCHIVE_LIBS to avoid the need to call pkg-config. > See the pkg-config man page for more details. > make: *** [package/pkg-generic.mk:283: /mnt/hdd/buildroot/output/build/opkg-0.4.5/.stamp_configured] Error 1``` From host/x86_64-buildroot-linux-gnu/sysroot/usr/lib/pkgconfig/libarchive.pc: [...] Requires.private: iconv libssl libcrypto From build/libarchive-3.6.2/configure.ac: AC_ARG_WITH([iconv], AS_HELP_STRING([--without-iconv], [Don't try to link against iconv])) And with the following local buildroot patch: diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cfc148d01d..02cca9cee9 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -70,7 +70,7 @@ endif ifeq ($(BR2_PACKAGE_LIBICONV),y) LIBARCHIVE_DEPENDENCIES += libiconv else -LIBARCHIVE_CONF_OPTS += --without-libiconv-prefix +LIBARCHIVE_CONF_OPTS += --without-libiconv-prefix --without-iconv endif ifeq ($(BR2_PACKAGE_LIBXML2),y) The opkg package builds without errors (after re-build of the libarchive package)... Regards, Peter > > [https://miro.medium.com/max/1200/0*6J1fXBTEsPODw5I5] > Building custom Linux for Raspberry Pi using Buildroot > Connect the USB end of the USB to Serial cable to your computer and open the serial port using a serial terminal software such as Gtkterm with baud rate set to 115200 . > medium.com > ? > ? > ? > > > [https://opengraph.githubassets.com/39abea8770e3ae33931f8598335f8b3b04f8a288fcc7e7f4579cf2ea74afbb37/badaix/snapcast] > GitHub - badaix/snapcast: Synchronous multiroom audio player > Installation from source. Please follow this guide to build Snapcast for. Linux; FreeBSD; macOS; Android; OpenWrt; Buildroot; Raspberry Pi; Windows; SnapOS. The bravest among you may be interested in SnapOS, a small and fast-booting "just enough" OS to run Snapcast as an appliance.. There is a guide (with the necessary buildfiles) available to build SnapOS, which comes in two flavors: > github.com > ? > ? > ? > ? > > From ps.report at gmx.net Wed Feb 1 17:45:15 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 1 Feb 2023 18:45:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/rng-tools: bump to version 6.16 In-Reply-To: References: <20230114161002.35480-1-fontaine.fabrice@gmail.com> <20230130205603.GA3864@scaer> Message-ID: <20230201184515.0e6a9a53@gmx.net> Hello *, On Wed, 1 Feb 2023 18:35:17 +0100, Fabrice Fontaine wrote: > Hi Yann, > > Le lun. 30 janv. 2023 ? 21:56, Yann E. MORIN a > ?crit : > > > Fabrice, All, > > > > On 2023-01-14 17:10 +0100, Fabrice Fontaine spake thusly: > > > https://github.com/nhorman/rng-tools/releases/tag/v6.16 > > [--SNIP--] > > > diff --git a/package/rng-tools/rng-tools.hash > > b/package/rng-tools/rng-tools.hash > > > index be2ee13969..4c86791267 100644 > > > --- a/package/rng-tools/rng-tools.hash > > > +++ b/package/rng-tools/rng-tools.hash > > > @@ -1,3 +1,3 @@ > > > # Locally computed > > > -sha256 > > bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a > > rng-tools-6.15.tar.gz > > > +sha256 > > 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 > > rng-tools-6.16.tar.gz > > > > This hash does not match here, and we've had a report on IRC that it > > does not work either. In both cases, we get this hash instead: > > 8e518d45be68f42d0873732a9ac3ecfe0f10c4a9bd5d5f44180a49be8ebda96f > > > > Can you check on your side, how you ended up with 17666...90894? > > > > I see that there is, only, one autobuilder failure. > However, I retested again on a fresh tarball and > 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 is the > correct sha256 for > https://github.com/nhorman/rng-tools/archive/v6.16/rng-tools-6.16.tar.gz. See https://github.blog/changelog/2023-01-30-git-archive-checksums-may-change/ for an possible explanation for the download hash diffs... Regards, Peter > > > > Regards, > > Yann E. MORIN. > > > > > sha256 > > 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > > > diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/ > > rng-tools.mk > > > index f736193a23..3e565103e4 100644 > > > --- a/package/rng-tools/rng-tools.mk > > > +++ b/package/rng-tools/rng-tools.mk > > > @@ -4,14 +4,14 @@ > > > # > > > > > ################################################################################ > > > > > > -RNG_TOOLS_VERSION = 6.15 > > > +RNG_TOOLS_VERSION = 6.16 > > > RNG_TOOLS_SITE = $(call > > github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) > > > RNG_TOOLS_LICENSE = GPL-2.0 > > > RNG_TOOLS_LICENSE_FILES = COPYING > > > RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project > > > RNG_TOOLS_SELINUX_MODULES = rngd > > > > > > -RNG_TOOLS_DEPENDENCIES = host-pkgconf openssl > > > +RNG_TOOLS_DEPENDENCIES = host-pkgconf libcap openssl > > > # From git > > > RNG_TOOLS_AUTORECONF = YES > > > > > > @@ -45,6 +45,13 @@ else > > > RNG_TOOLS_CONF_OPTS += --without-nistbeacon > > > endif > > > > > > +ifeq ($(BR2_PACKAGE_RNG_TOOLS_QRYPT),y) > > > +RNG_TOOLS_DEPENDENCIES += jansson libcurl > > > +RNG_TOOLS_CONF_OPTS += --with-qrypt > > > +else > > > +RNG_TOOLS_CONF_OPTS += --without-qrypt > > > +endif > > > + > > > define RNG_TOOLS_INSTALL_INIT_SYSV > > > $(INSTALL) -D -m 755 package/rng-tools/S21rngd \ > > > $(TARGET_DIR)/etc/init.d/S21rngd > > > -- > > > 2.39.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. | > > > > '------------------------------^-------^------------------^--------------------' > > > > Best Regards, > > Fabrice From ps.report at gmx.net Wed Feb 1 18:04:50 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 1 Feb 2023 19:04:50 +0100 Subject: [Buildroot] Libarchive always throws an error when building In-Reply-To: <20230201184154.2c7e2680@gmx.net> References: <20230201184154.2c7e2680@gmx.net> Message-ID: <20230201190450.4636771a@gmx.net> Hello *, On Wed, 1 Feb 2023 18:41:54 +0100, Peter Seiderer wrote: > Hello Roland, > > On Wed, 1 Feb 2023 15:57:52 +0000, Kenneth Roland wrote: > > > Hello Buildroot team, > > I guess this is my way of submitting a bug report, here goes. > > > > Current .config is attached, but renamed as buildroot.config as I couldn't get Dolphin (KDE) to show the hidden file. This project of mine was to build an ISO for an old Thinkpad that would act as a reciever from https://github.com/badaix/snapcast, but I couldn't find anything useful on this libarchive error. "libarchive-dev" is installed on the host using "apt install". You guys probably know how to recreate this, but the host is just a Debian netinst, no DE, and then git installed. Installed dependencies as of https://medium.com/@hungryspider/building-custom-linux-for-raspberry-pi-using-buildroot-f81efc7aa817, cloned the Buildroot repo from Github, " make pc_x86_64_bios_defconfig", and then replaced the .config file generated by the one I used the first time (was sanity/dependancy checking). Ran make, which ran for about a good 30-45 mins until it stopped and I saw the libarchive error. > > > > Host info (uname -a) > > Linux blackbox 6.0.0-0.deb11.6-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.0.12-1~bpo11+1 (2022-12-19) x86_64 GNU/Linux > > > > ```checking whether the /mnt/hdd/buildroot/output/host/bin/x86_64-buildroot-linux-gnu-gcc linker (/mnt/hdd/buildroot/output/host/bin/x86_64-buildroot-linux-gnu-ld -m elf_ > > x86_64) supports shared libraries... yes > > checking whether -lc should be explicitly linked in... no > > checking dynamic linker characteristics... GNU/Linux ld.so > > checking how to hardcode library paths into programs... immediate > > checking whether stripping libraries is possible... yes > > checking if libtool supports shared libraries... yes > > checking whether to build shared libraries... yes > > checking whether to build static libraries... no > > checking pkg-config is at least version 0.20... yes > > checking for LIBARCHIVE... no > > configure: error: Package requirements (libarchive) were not met: > > > > Package 'iconv', required by 'libarchive', not found > > > > Consider adjusting the PKG_CONFIG_PATH environment variable if you > > installed software in a non-standard prefix. > > > > Alternatively, you may set the environment variables LIBARCHIVE_CFLAGS > > and LIBARCHIVE_LIBS to avoid the need to call pkg-config. > > See the pkg-config man page for more details. > > make: *** [package/pkg-generic.mk:283: /mnt/hdd/buildroot/output/build/opkg-0.4.5/.stamp_configured] Error 1``` > > From host/x86_64-buildroot-linux-gnu/sysroot/usr/lib/pkgconfig/libarchive.pc: > > [...] > Requires.private: iconv libssl libcrypto > > > From build/libarchive-3.6.2/configure.ac: > > AC_ARG_WITH([iconv], > AS_HELP_STRING([--without-iconv], [Don't try to link against iconv])) > > > And with the following local buildroot patch: > > diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk > index cfc148d01d..02cca9cee9 100644 > --- a/package/libarchive/libarchive.mk > +++ b/package/libarchive/libarchive.mk > @@ -70,7 +70,7 @@ endif > ifeq ($(BR2_PACKAGE_LIBICONV),y) > LIBARCHIVE_DEPENDENCIES += libiconv > else > -LIBARCHIVE_CONF_OPTS += --without-libiconv-prefix > +LIBARCHIVE_CONF_OPTS += --without-libiconv-prefix --without-iconv > endif But the right fix should be this [1] libarchive upstream commit (untested)... Regards, Peter [1] https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 > > ifeq ($(BR2_PACKAGE_LIBXML2),y) > > > The opkg package builds without errors (after re-build of the libarchive package)... > > Regards, > Peter > > > > > > [https://miro.medium.com/max/1200/0*6J1fXBTEsPODw5I5] > > Building custom Linux for Raspberry Pi using Buildroot > > Connect the USB end of the USB to Serial cable to your computer and open the serial port using a serial terminal software such as Gtkterm with baud rate set to 115200 . > > medium.com > > ? > > ? > > ? > > > > > > [https://opengraph.githubassets.com/39abea8770e3ae33931f8598335f8b3b04f8a288fcc7e7f4579cf2ea74afbb37/badaix/snapcast] > > GitHub - badaix/snapcast: Synchronous multiroom audio player > > Installation from source. Please follow this guide to build Snapcast for. Linux; FreeBSD; macOS; Android; OpenWrt; Buildroot; Raspberry Pi; Windows; SnapOS. The bravest among you may be interested in SnapOS, a small and fast-booting "just enough" OS to run Snapcast as an appliance.. There is a guide (with the necessary buildfiles) available to build SnapOS, which comes in two flavors: > > github.com > > ? > > ? > > ? > > ? > > > > > From bernd.kuhls at t-online.de Wed Feb 1 18:10:05 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 1 Feb 2023 19:10:05 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libarchive: Only add "iconv" to the .pc file if needed Message-ID: <20230201181005.731564-1-bernd.kuhls@t-online.de> Fix the following build failure with fwup raised since bump to version 3.6.2 in commit 380341b249175382691f268de4b41d3843ff0acc and https://github.com/libarchive/libarchive/commit/a83f3d327aefe8d628230f326621b014d82f55b4 checking for pkg-config... /tmp/instance-19/output-1/host/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for ARCHIVE... no configure: error: Requires libarchive. Libarchive must be built with zlib support. Fixes: http://autobuild.buildroot.net/results/f5d/f5d549fb4f08156ba5952ce75926f7fd2242bfdf/ Signed-off-by: Bernd Kuhls --- v2: added dependency to host-pkgconf to fix autoconf error ...y-add-iconv-to-the-pc-file-if-needed.patch | 44 +++++++++++++++++++ package/libarchive/libarchive.mk | 4 ++ 2 files changed, 48 insertions(+) create mode 100644 package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch new file mode 100644 index 0000000000..c93944f789 --- /dev/null +++ b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch @@ -0,0 +1,44 @@ +From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 +From: Peter Pentchev +Date: Thu, 29 Dec 2022 00:04:40 +0200 +Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) + +Hi, + +Thanks for writing and maintaining libarchive! + +What do you think about this trivial change that does not add "iconv" to +the pkg-config file's list of required packages unless it is actually +needed? On at least Debian GNU/Linux systems, the iconv(3) function is +part of the system C library and there is no Debian package that +installs an iconv.pc file, so I had to make this change to the Debian +package of libarchive. + +Thanks again, and keep up the great work! + +G'luck, +Peter + +Downloaded from upstream commit: +https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99bff20d1..e2715cfde 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then + AC_CHECK_HEADERS([localcharset.h]) + am_save_LIBS="$LIBS" + LIBS="${LIBS} ${LIBICONV}" +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" ++ if test -n "$LIBICONV"; then ++ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" ++ fi + AC_CHECK_FUNCS([locale_charset]) + LIBS="${am_save_LIBS}" + if test "x$ac_cv_func_locale_charset" != "xyes"; then diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cfc148d01d..cd7c13fbed 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -11,6 +11,10 @@ LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING LIBARCHIVE_CPE_ID_VENDOR = libarchive +# We're patching configure.ac +LIBARCHIVE_AUTORECONF = YES +# needed for autoreconf +LIBARCHIVE_DEPENDENCIES += host-pkgconf ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) -- 2.39.1 From nerv at dawncrow.de Wed Feb 1 19:27:11 2023 From: nerv at dawncrow.de (=?UTF-8?q?Andr=C3=A9=20Zwing?=) Date: Wed, 1 Feb 2023 20:27:11 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: Remove openal from my list Message-ID: <20230201192711.1632095-1-nerv@dawncrow.de> Signed-off-by: Andr? Zwing --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577..d526451ca3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -133,7 +133,6 @@ F: boot/ti-k3-r5-loader/ N: Andr? Zwing F: package/libkrb5/ -F: package/openal/ F: package/p7zip/ F: package/wine/ -- 2.25.1 From kjroland75 at hotmail.com Wed Feb 1 19:27:35 2023 From: kjroland75 at hotmail.com (Kenneth Roland) Date: Wed, 1 Feb 2023 19:27:35 +0000 Subject: [Buildroot] Libarchive always throws an error when building In-Reply-To: <20230201190450.4636771a@gmx.net> References: <20230201184154.2c7e2680@gmx.net> <20230201190450.4636771a@gmx.net> Message-ID: Hello Peter, After applying the patch you mentioned, as well as installing libssl-dev, I now have this error. ?```checking whether the /mnt/hdd/sct/output/host/bin/aarch64-buildroot-linux-gnu-gcc linker (/mnt/hdd/sct/output/host/bin/aarch64-buildroot-linux-gnu-ld) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking pkg-config is at least version 0.20... /mnt/hdd/sct/output/host/bin/pkgconf: error while loading shared libraries: libpkgconf.so.3: cannot open shared object file: No such file or directory no checking for LIBARCHIVE... no configure: error: in `/mnt/hdd/sct/output/build/opkg-0.4.5': configure: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. Alternatively, you may set the environment variables LIBARCHIVE_CFLAGS and LIBARCHIVE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See `config.log' for more details make: *** [package/pkg-generic.mk:283: /mnt/hdd/sct/output/build/opkg-0.4.5/.stamp_configured] Error 1``` From a quick search, libpkgconf.so.3 is found on RPM systems, which isn't the case here, but somehow it has something to do with pkg-config being too old. Do I need to update my path, and if so, is that the bash file found in my user's home folder? Or is there another patch I can apply? Thanks, Kenneth -------------- next part -------------- An HTML attachment was scrubbed... URL: From nerv at dawncrow.de Wed Feb 1 19:21:57 2023 From: nerv at dawncrow.de (=?UTF-8?q?Andr=C3=A9=20Zwing?=) Date: Wed, 1 Feb 2023 20:21:57 +0100 Subject: [Buildroot] [PATCH] package/wine: bump to version 8.0 Message-ID: <20230201192157.1631613-1-nerv@dawncrow.de> Multiple library checks are obsolete, either due to removal or due to built-in solutions. License file changed due to update of copyright year. Signed-off-by: Andr? Zwing --- ...a-avoid-mpg123-functions-with-suffix.patch | 21 ----------- ...d-avoid-mpg123-functions-with-suffix.patch | 21 ----------- package/wine/wine.hash | 4 +-- package/wine/wine.mk | 35 ++----------------- 4 files changed, 5 insertions(+), 76 deletions(-) delete mode 100644 package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch delete mode 100644 package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch diff --git a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch b/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 8332db4b38..0000000000 --- a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 75b70efdaa2d4baa064271098878b79f66df155f -Author: Andr? Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - l3codeca.acm: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/75b70efdaa2d4baa064271098878b79f66df155f] -Signed-off-by: Andr? Zwing - -diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in -index 451794b2624..31765766d4e 100644 ---- a/dlls/l3codeca.acm/Makefile.in -+++ b/dlls/l3codeca.acm/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = l3codeca.acm - IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mpegl3.c diff --git a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch b/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 16f2ba2898..0000000000 --- a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 8d441659f7c7ae359e06a99e7abaae57792356a0 -Author: Andr? Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - mp3dmod: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/8d441659f7c7ae359e06a99e7abaae57792356a0] -Signed-off-by: Andr? Zwing - -diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in -index dabbb1dfeae..3ba343a4d34 100644 ---- a/dlls/mp3dmod/Makefile.in -+++ b/dlls/mp3dmod/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = mp3dmod.dll - IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mp3dmod.c diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 9a7a1c342a..b87964da12 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 5b43e27d5c085cb18f97394e46180310d5eef7c1d91c6895432a3889b2de086b wine-7.0.tar.xz +sha256 0272c20938f8721ae4510afaa8b36037457dd57661e4d664231079b9e91c792e wine-8.0.tar.xz # Locally calculated sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB -sha256 7c360930e51d56c8fa12fe1df8ed348ac77a9ad73f9582a303919469399b3ce4 LICENSE +sha256 793d045546467c8f49e35fbd6e02859e57e78f8bb53571e8200bffd0e966dfa8 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index a1c65bef4e..a629bf0dd6 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 7.0 +WINE_VERSION = 8.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/7.0 +WINE_SITE = https://dl.winehq.org/wine/source/8.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_CPE_ID_VENDOR = winehq @@ -27,7 +27,6 @@ WINE_CONF_OPTS = \ --without-mingw \ --without-opencl \ --without-oss \ - --without-vkd3d \ --without-vulkan # Wine uses a wrapper around gcc, and uses the value of --host to @@ -131,20 +130,6 @@ else WINE_CONF_OPTS += --without-v4l2 endif -ifeq ($(BR2_PACKAGE_OPENAL),y) -WINE_CONF_OPTS += --with-openal -WINE_DEPENDENCIES += openal -else -WINE_CONF_OPTS += --without-openal -endif - -ifeq ($(BR2_PACKAGE_OPENLDAP),y) -WINE_CONF_OPTS += --with-ldap -WINE_DEPENDENCIES += openldap -else -WINE_CONF_OPTS += --without-ldap -endif - ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) WINE_CONF_OPTS += --with-osmesa WINE_DEPENDENCIES += mesa3d @@ -266,19 +251,8 @@ endif # Wine only needs the host tools to be built, so cut-down the # build time by building just what we need. -HOST_WINE_TOOLS = \ - tools \ - tools/sfnt2fon \ - tools/widl \ - tools/winebuild \ - tools/winegcc \ - tools/wmc \ - tools/wrc - define HOST_WINE_BUILD_CMDS - $(foreach t, $(HOST_WINE_TOOLS), - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/$(t) - ) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) __tooldeps__ endef # Wine only needs its host variant to be built, not that it is @@ -304,10 +278,8 @@ HOST_WINE_CONF_OPTS += \ --without-gssapi \ --without-gstreamer \ --without-krb5 \ - --without-ldap \ --without-mingw \ --without-netapi \ - --without-openal \ --without-opencl \ --without-opengl \ --without-osmesa \ @@ -318,7 +290,6 @@ HOST_WINE_CONF_OPTS += \ --without-sdl \ --without-usb \ --without-v4l2 \ - --without-vkd3d \ --without-vulkan \ --without-x \ --without-xcomposite \ -- 2.25.1 From gsmecher at threespeedlogic.com Wed Feb 1 19:59:56 2023 From: gsmecher at threespeedlogic.com (Graeme Smecher) Date: Wed, 1 Feb 2023 11:59:56 -0800 Subject: [Buildroot] [PATCH 1/1] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. Message-ID: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from buildroot into the linux tree, these .dts files are copied to arch/arm64/boot. Unfortunately, the post-image.sh script expects to find them in arch/arm64/boot/xilinx. This patch does not require the xilinx/ prefix to be present when symlinking the device-tree to system.dtb where u-boot expects to find it. Signed-off-by: Graeme Smecher --- board/zynqmp/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index ed6dbe188c..c5de2db820 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -5,7 +5,7 @@ # devicetree listed in the config. FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ ${BR2_CONFIG}) [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -- 2.35.1 From huth at tuxfamily.org Wed Feb 1 20:38:20 2023 From: huth at tuxfamily.org (Thomas Huth) Date: Wed, 1 Feb 2023 21:38:20 +0100 Subject: [Buildroot] [PATCH v9 1/3] package: add petitboot In-Reply-To: <20230201134609.2040073-2-laurent@vivier.eu> References: <20230201134609.2040073-1-laurent@vivier.eu> <20230201134609.2040073-2-laurent@vivier.eu> Message-ID: <20230201213820.7c66aa8c@tuxfamily.org> Am Wed, 1 Feb 2023 14:46:07 +0100 schrieb Laurent Vivier : > from https://github.com/glevand/petitboot--buildroot > > Updated to work with m68k architecture rather than PlayStation3 > (focused on qemu-system-m68k virt machine) > > Signed-off-by: Laurent Vivier > --- ... > diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk > new file mode 100644 > index 000000000000..b04710a535d3 > --- /dev/null > +++ b/package/petitboot/petitboot.mk > @@ -0,0 +1,77 @@ > +################################################################################ > +# > +# petitboot > +# > +################################################################################ > + > +PETITBOOT_VERSION = v1.13 > +PETITBOOT_SITE ?= https://github.com/open-power/petitboot/releases/download/$(PETITBOOT_VERSION) > +PETITBOOT_DEPENDENCIES = elfutils ncurses udev host-bison host-flex lvm2 > +PETITBOOT_LICENSE = GPLv2 Sorry for not noticing this in my last review ... but looking at the other packages, I think this should be "GPL-2.0" instead of "GPLv2" nowadays? Apart from that, patch looks fine to me know, so with that changed: Reviewed-by: Thomas Huth From laurent at vivier.eu Wed Feb 1 20:48:45 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 21:48:45 +0100 Subject: [Buildroot] [PATCH v10 0/3] package: add petitboot to use with qemu-system-m68k Message-ID: <20230201204848.2099336-1-laurent@vivier.eu> qemu-system-m68k has introduced in v6.0 a new pure virtual machine that is now supported by linux v5.19. The goal of this series is to provide petitboot as an embedded bootloader for it (like it is for the IBM POWER machine). The first patch introduces petitboot package, the second patch the configuration to build buildroot with petitboot for the QEMU machine. You can test it with: qemu-system-m68k -M virt -kernel images/vmlinux \ -initrd images/rootfs.cpio.xz \ -append "console=ttyGF0" --nographic Signed-off-by: Laurent Vivier v10: - set PETITBOOT_LICENSE to GPL-2.0 v9: - remove dependency on BR2_PACKAGE_PS3_UTILS - Add Thomas' Rb - rebase v8: - use linux.fragment rather than linux.config - rebase v7: - set BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y - fix errors reported by check-package - add gitlab testing (C?dric) - update boot-qemu-image.py to support petitboot v6: - rebase v5: - remove BR2_CCACHE_DIR, BR2_PACKAGE_DTC and BR2_PACKAGE_DTC_PROGRAMS v4: - address Thomas' comments - remove petitboot-mtd config as libflash is not available v3: v2: v1: - first version, I messed up with list subscription and git-publish... Laurent Vivier (3): package: add petitboot board/qemu/m68k-virt: Add virt-m68k linux config support/scripts/boot-qemu-image.py: manage petitboot interface DEVELOPERS | 5 ++ board/qemu/m68k-virt/linux.fragment | 21 ++++++ board/qemu/m68k-virt/readme.txt | 5 ++ configs/qemu_m68k_virt_petitboot_defconfig | 31 ++++++++ package/Config.in | 1 + package/kexec/Config.in | 2 +- package/petitboot/63-md-raid-arrays.rules | 41 +++++++++++ package/petitboot/65-md-incremental.rules | 69 ++++++++++++++++++ package/petitboot/66-add-sg-module.rules | 2 + package/petitboot/Config.in | 23 ++++++ package/petitboot/S14silence-console | 9 +++ package/petitboot/S15pb-discover | 38 ++++++++++ package/petitboot/fs-overlay/etc/inittab | 34 +++++++++ package/petitboot/fs-overlay/etc/locale | 1 + package/petitboot/fs-overlay/init | 8 ++ package/petitboot/kexec-restart | 8 ++ package/petitboot/petitboot-console-ui.rules | 6 ++ package/petitboot/petitboot.hash | 2 + package/petitboot/petitboot.mk | 77 ++++++++++++++++++++ package/petitboot/removable-event-poll.rules | 4 + package/petitboot/shell_config | 19 +++++ package/petitboot/shell_profile | 2 + support/scripts/boot-qemu-image.py | 13 +++- 23 files changed, 417 insertions(+), 4 deletions(-) create mode 100644 board/qemu/m68k-virt/linux.fragment create mode 100644 board/qemu/m68k-virt/readme.txt create mode 100644 configs/qemu_m68k_virt_petitboot_defconfig create mode 100644 package/petitboot/63-md-raid-arrays.rules create mode 100644 package/petitboot/65-md-incremental.rules create mode 100644 package/petitboot/66-add-sg-module.rules create mode 100644 package/petitboot/Config.in create mode 100755 package/petitboot/S14silence-console create mode 100755 package/petitboot/S15pb-discover create mode 100644 package/petitboot/fs-overlay/etc/inittab create mode 100644 package/petitboot/fs-overlay/etc/locale create mode 100755 package/petitboot/fs-overlay/init create mode 100755 package/petitboot/kexec-restart create mode 100644 package/petitboot/petitboot-console-ui.rules create mode 100644 package/petitboot/petitboot.hash create mode 100644 package/petitboot/petitboot.mk create mode 100644 package/petitboot/removable-event-poll.rules create mode 100644 package/petitboot/shell_config create mode 100755 package/petitboot/shell_profile -- 2.39.1 From laurent at vivier.eu Wed Feb 1 20:48:47 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 21:48:47 +0100 Subject: [Buildroot] [PATCH v10 2/3] board/qemu/m68k-virt: Add virt-m68k linux config In-Reply-To: <20230201204848.2099336-1-laurent@vivier.eu> References: <20230201204848.2099336-1-laurent@vivier.eu> Message-ID: <20230201204848.2099336-3-laurent@vivier.eu> Build a 5.19 (first version with the m68k virt machine) kernel for "qemu-system-m68k -M virt" machine. Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth --- DEVELOPERS | 2 ++ board/qemu/m68k-virt/linux.fragment | 21 +++++++++++++++++ board/qemu/m68k-virt/readme.txt | 5 +++++ configs/qemu_m68k_virt_petitboot_defconfig | 26 ++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 board/qemu/m68k-virt/linux.fragment create mode 100644 board/qemu/m68k-virt/readme.txt create mode 100644 configs/qemu_m68k_virt_petitboot_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index d56e4643eaf8..9db1568422a8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1768,6 +1768,8 @@ F: package/open-lldp/ N: Laurent Vivier F: package/petitboot/ +F: board/qemu/m68k-virt/ +F: configs/qemu_m68k_virt_petitboot_defconfig N: Lee Jones F: boot/afboot-stm32/ diff --git a/board/qemu/m68k-virt/linux.fragment b/board/qemu/m68k-virt/linux.fragment new file mode 100644 index 000000000000..49416982601c --- /dev/null +++ b/board/qemu/m68k-virt/linux.fragment @@ -0,0 +1,21 @@ +CONFIG_BLK_DEV_INITRD=y +CONFIG_KEXEC=y +CONFIG_BOOTINFO_PROC=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_MD=y +CONFIG_MD_LINEAR=y +CONFIG_MD_MULTIPATH=y +CONFIG_MD_FAULTY=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_UNSTRIPED=y +CONFIG_DM_CRYPT=y +CONFIG_DM_SNAPSHOT=y +CONFIG_DM_THIN_PROVISIONING=y +CONFIG_DM_CACHE=y +CONFIG_DM_WRITECACHE=y +CONFIG_DM_EBS=y +CONFIG_DM_ERA=y +CONFIG_DM_CLONE=y +CONFIG_DM_MIRROR=y +CONFIG_DM_RAID=y +CONFIG_DM_ZERO=y diff --git a/board/qemu/m68k-virt/readme.txt b/board/qemu/m68k-virt/readme.txt new file mode 100644 index 000000000000..714b74c70ea1 --- /dev/null +++ b/board/qemu/m68k-virt/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + + qemu-system-m68k -M virt -kernel output/images/vmlinux -initrd output/images/rootfs.cpio.xz -append "console=ttyGF0" --nographic # qemu_m68k_virt_petitboot_defconfig + +The petiboot menu will appear in the terminal where QEMU has been started. diff --git a/configs/qemu_m68k_virt_petitboot_defconfig b/configs/qemu_m68k_virt_petitboot_defconfig new file mode 100644 index 000000000000..b3497c12b46b --- /dev/null +++ b/configs/qemu_m68k_virt_petitboot_defconfig @@ -0,0 +1,26 @@ +BR2_m68k=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_CCACHE=y +BR2_RELRO_NONE=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Petitboot" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_ROOTFS_MERGED_USR=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyGF0" +BR2_ROOTFS_OVERLAY="package/petitboot/fs-overlay" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" +BR2_LINUX_KERNEL_DEFCONFIG="virt" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/m68k-virt/linux.fragment" +BR2_LINUX_KERNEL_XZ=y +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KEXEC=y +BR2_PACKAGE_KEXEC_ZLIB=y +BR2_PACKAGE_ETHTOOL=y +BR2_PACKAGE_NET_TOOLS=y +BR2_PACKAGE_NETCAT=y +BR2_PACKAGE_RSYNC=y +BR2_PACKAGE_PETITBOOT=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_XZ=y -- 2.39.1 From laurent at vivier.eu Wed Feb 1 20:48:48 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 21:48:48 +0100 Subject: [Buildroot] [PATCH v10 3/3] support/scripts/boot-qemu-image.py: manage petitboot interface In-Reply-To: <20230201204848.2099336-1-laurent@vivier.eu> References: <20230201204848.2099336-1-laurent@vivier.eu> Message-ID: <20230201204848.2099336-4-laurent@vivier.eu> Petitboot doesn't start a shell but a GUI. Manage the menu to switch to the shell. Use "poweroff -f" as we don't have init Enable the test for qemu_m68K_virt. Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth --- configs/qemu_m68k_virt_petitboot_defconfig | 5 +++++ support/scripts/boot-qemu-image.py | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/configs/qemu_m68k_virt_petitboot_defconfig b/configs/qemu_m68k_virt_petitboot_defconfig index b3497c12b46b..cb63a2deeed4 100644 --- a/configs/qemu_m68k_virt_petitboot_defconfig +++ b/configs/qemu_m68k_virt_petitboot_defconfig @@ -8,6 +8,8 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_MERGED_USR=y BR2_TARGET_GENERIC_GETTY_PORT="ttyGF0" BR2_ROOTFS_OVERLAY="package/petitboot/fs-overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" @@ -24,3 +26,6 @@ BR2_PACKAGE_RSYNC=y BR2_PACKAGE_PETITBOOT=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_XZ=y +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/support/scripts/boot-qemu-image.py b/support/scripts/boot-qemu-image.py index ba50ea69ee9a..8dd3b4c654e1 100755 --- a/support/scripts/boot-qemu-image.py +++ b/support/scripts/boot-qemu-image.py @@ -36,7 +36,7 @@ def main(): time.sleep(1) try: - child.expect(["buildroot login:"], timeout=600) + idx = child.expect(["buildroot login:", "Exit to shell"], timeout=600) except pexpect.EOF as e: # Some emulations require a fork of qemu-system, which may be # missing on the system, and is not provided by Buildroot. @@ -55,7 +55,11 @@ def main(): print("System did not boot in time, exiting.") sys.exit(1) - child.sendline("root\r") + if idx == 0: + child.sendline("root\r") + elif idx == 1: + time.sleep(1) + child.sendline("\r") try: child.expect(["# "], timeout=600) @@ -66,7 +70,10 @@ def main(): print("Timeout while waiting for shell") sys.exit(1) - child.sendline("poweroff\r") + if idx == 0: + child.sendline("poweroff\r") + elif idx == 1: + child.sendline("poweroff -f\r") try: child.expect(["System halted"], timeout=600) -- 2.39.1 From laurent at vivier.eu Wed Feb 1 20:48:46 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 21:48:46 +0100 Subject: [Buildroot] [PATCH v10 1/3] package: add petitboot In-Reply-To: <20230201204848.2099336-1-laurent@vivier.eu> References: <20230201204848.2099336-1-laurent@vivier.eu> Message-ID: <20230201204848.2099336-2-laurent@vivier.eu> from https://github.com/glevand/petitboot--buildroot Updated to work with m68k architecture rather than PlayStation3 (focused on qemu-system-m68k virt machine) Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth --- DEVELOPERS | 3 + package/Config.in | 1 + package/kexec/Config.in | 2 +- package/petitboot/63-md-raid-arrays.rules | 41 +++++++++++ package/petitboot/65-md-incremental.rules | 69 ++++++++++++++++++ package/petitboot/66-add-sg-module.rules | 2 + package/petitboot/Config.in | 23 ++++++ package/petitboot/S14silence-console | 9 +++ package/petitboot/S15pb-discover | 38 ++++++++++ package/petitboot/fs-overlay/etc/inittab | 34 +++++++++ package/petitboot/fs-overlay/etc/locale | 1 + package/petitboot/fs-overlay/init | 8 ++ package/petitboot/kexec-restart | 8 ++ package/petitboot/petitboot-console-ui.rules | 6 ++ package/petitboot/petitboot.hash | 2 + package/petitboot/petitboot.mk | 77 ++++++++++++++++++++ package/petitboot/removable-event-poll.rules | 4 + package/petitboot/shell_config | 19 +++++ package/petitboot/shell_profile | 2 + 19 files changed, 348 insertions(+), 1 deletion(-) create mode 100644 package/petitboot/63-md-raid-arrays.rules create mode 100644 package/petitboot/65-md-incremental.rules create mode 100644 package/petitboot/66-add-sg-module.rules create mode 100644 package/petitboot/Config.in create mode 100755 package/petitboot/S14silence-console create mode 100755 package/petitboot/S15pb-discover create mode 100644 package/petitboot/fs-overlay/etc/inittab create mode 100644 package/petitboot/fs-overlay/etc/locale create mode 100755 package/petitboot/fs-overlay/init create mode 100755 package/petitboot/kexec-restart create mode 100644 package/petitboot/petitboot-console-ui.rules create mode 100644 package/petitboot/petitboot.hash create mode 100644 package/petitboot/petitboot.mk create mode 100644 package/petitboot/removable-event-poll.rules create mode 100644 package/petitboot/shell_config create mode 100755 package/petitboot/shell_profile diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577f1..d56e4643eaf8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1766,6 +1766,9 @@ F: package/aircrack-ng/ N: Laurent Charpentier F: package/open-lldp/ +N: Laurent Vivier +F: package/petitboot/ + N: Lee Jones F: boot/afboot-stm32/ diff --git a/package/Config.in b/package/Config.in index 83fddf316f75..c3641ea91c6b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2654,6 +2654,7 @@ menu "System tools" source "package/openrc/Config.in" source "package/openvmtools/Config.in" source "package/pamtester/Config.in" + source "package/petitboot/Config.in" source "package/polkit/Config.in" source "package/powerpc-utils/Config.in" source "package/procps-ng/Config.in" diff --git a/package/kexec/Config.in b/package/kexec/Config.in index 90a7bc2672bd..092a80b171fc 100644 --- a/package/kexec/Config.in +++ b/package/kexec/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_KEXEC depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x + BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x || BR2_m68k help Kexec is a user space utility for loading another kernel and asking the currently running kernel to do something with diff --git a/package/petitboot/63-md-raid-arrays.rules b/package/petitboot/63-md-raid-arrays.rules new file mode 100644 index 000000000000..92aec36e69d4 --- /dev/null +++ b/package/petitboot/63-md-raid-arrays.rules @@ -0,0 +1,41 @@ +# do not edit this file, it will be overwritten on update + +SUBSYSTEM!="block", GOTO="md_end" + +# handle md arrays +ACTION!="add|change", GOTO="md_end" +KERNEL!="md*", GOTO="md_end" + +# partitions have no md/{array_state,metadata_version}, but should not +# for that reason be ignored. +ENV{DEVTYPE}=="partition", GOTO="md_ignore_state" + +# container devices have a metadata version of e.g. 'external:ddf' and +# never leave state 'inactive' +ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state" +TEST!="md/array_state", ENV{SYSTEMD_READY}="0", GOTO="md_end" +ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end" +LABEL="md_ignore_state" + +IMPORT{program}="/sbin/mdadm --detail --export $devnode" +ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace" +ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}" +ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}" +ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace" +ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n" +ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n" +ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n" + +IMPORT{builtin}="blkid" +OPTIONS+="link_priority=100" +OPTIONS+="watch" +ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" +ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" + +ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service" + +# Tell systemd to run mdmon for our container, if we need it. +ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c" +ENV{MD_MON_THIS}=="?*", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service" + +LABEL="md_end" diff --git a/package/petitboot/65-md-incremental.rules b/package/petitboot/65-md-incremental.rules new file mode 100644 index 000000000000..153d12fe6f7e --- /dev/null +++ b/package/petitboot/65-md-incremental.rules @@ -0,0 +1,69 @@ +# This file causes block devices with Linux RAID (mdadm) signatures to +# automatically cause mdadm to be run. +# See udev(8) for syntax + +# Don't process any events if anaconda is running as anaconda brings up +# raid devices manually +ENV{ANACONDA}=="?*", GOTO="md_end" + +# Also don't process disks that are slated to be a multipath device +ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="md_end" + +# We process add events on block devices (since they are ready as soon as +# they are added to the system), but we must process change events as well +# on any dm devices (like LUKS partitions or LVM logical volumes) and on +# md devices because both of these first get added, then get brought live +# and trigger a change event. The reason we don't process change events +# on bare hard disks is because if you stop all arrays on a disk, then +# run fdisk on the disk to change the partitions, when fdisk exits it +# triggers a change event, and we want to wait until all the fdisks on +# all member disks are done before we do anything. Unfortunately, we have +# no way of knowing that, so we just have to let those arrays be brought +# up manually after fdisk has been run on all of the disks. + +# First, process all add events (md and dm devices will not really do +# anything here, just regular disks, and this also won't get any imsm +# array members either) +SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="linux_raid_member", \ + RUN+="/sbin/mdadm -I --export $env{DEVNAME}" + +# Next, check to make sure the BIOS raid stuff wasn't turned off via cmdline +IMPORT{cmdline}="noiswmd" +IMPORT{cmdline}="nodmraid" +ENV{noiswmd}=="?*", GOTO="md_imsm_inc_end" +ENV{nodmraid}=="?*", GOTO="md_imsm_inc_end" +SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="isw_raid_member", \ + RUN+="/sbin/mdadm -I $env{DEVNAME}" +LABEL="md_imsm_inc_end" + +SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}=="?*", \ + RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}" +SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}!="?*", \ + RUN+="/sbin/mdadm -If $name" + +# Next make sure that this isn't a dm device we should skip for some reason +ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="dm_change_end" +ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="dm_change_end" +ENV{DM_SUSPENDED}=="1", GOTO="dm_change_end" +KERNEL=="dm-*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \ + ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}" +LABEL="dm_change_end" + +# Finally catch any nested md raid arrays. If we brought up an md raid +# array that's part of another md raid array, it won't be ready to be used +# until the change event that occurs when it becomes live +KERNEL=="md*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \ + ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}" + +# In case the initramfs only started some of the arrays in our container, +# run incremental assembly on the container itself. Note: we ran mdadm +# on the container in 64-md-raid.rules, and that's how the MD_LEVEL +# environment variable is already set. If that disappears from the other +# file, we will need to add this line into the middle of the next rule: +# IMPORT{program}="/sbin/mdadm -D --export $tempnode", \ + +SUBSYSTEM=="block", ACTION=="add|change", KERNEL=="md*", \ + ENV{MD_LEVEL}=="container", RUN+="/sbin/mdadm -I $env{DEVNAME}" + + +LABEL="md_end" diff --git a/package/petitboot/66-add-sg-module.rules b/package/petitboot/66-add-sg-module.rules new file mode 100644 index 000000000000..ae18d28c570e --- /dev/null +++ b/package/petitboot/66-add-sg-module.rules @@ -0,0 +1,2 @@ +# load modules to scsi disks, if they aren't in kernel +SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg" diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in new file mode 100644 index 000000000000..d87f9d2450a0 --- /dev/null +++ b/package/petitboot/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_PETITBOOT + bool "petitboot" + # petitboot needs udev /dev management + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_TARGET_PANEL + select BR2_PACKAGE_NCURSES_TARGET_FORM + select BR2_PACKAGE_NCURSES_TARGET_MENU + # run-time dependency only + select BR2_PACKAGE_KEXEC_LITE if !BR2_PACKAGE_KEXEC + # run-time dependency only + select BR2_PACKAGE_POWERPC_UTILS if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + # run-time dependency only + select BR2_PACKAGE_NVME if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + help + Petitboot is a small kexec-based bootloader + + http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html + +comment "petitboot requires udev to be enabled" + depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/petitboot/S14silence-console b/package/petitboot/S14silence-console new file mode 100755 index 000000000000..2ce6b39f427b --- /dev/null +++ b/package/petitboot/S14silence-console @@ -0,0 +1,9 @@ +#!/bin/sh + +case "$1" in + start) + echo 1 1 1 1 > /proc/sys/kernel/printk + ;; +esac + +exit 0 diff --git a/package/petitboot/S15pb-discover b/package/petitboot/S15pb-discover new file mode 100755 index 000000000000..9d9ec57de3f0 --- /dev/null +++ b/package/petitboot/S15pb-discover @@ -0,0 +1,38 @@ +#!/bin/sh + +LOGFILE=/var/log/petitboot/pb-discover.log +PIDFILE=/var/run/petitboot.pid + +PATH=/usr/bin:/usr/sbin:/bin:/sbin +export PATH + +verbose= +if pb-config debug | grep -q enabled +then + verbose=-v +fi + +case "$1" in + start) + ulimit -c unlimited + mkdir -p -m 0775 $(dirname $LOGFILE) + mkdir -p -m 0775 /var/petitboot + # Set permissions for normal users + chown -R root:petitgroup $(dirname $LOGFILE) + chown -R root:petitgroup /var/petitboot + + export $(cat /etc/locale) + pb-discover -l $LOGFILE $verbose & + echo $! > $PIDFILE + ;; + stop) + pid=$(cat $PIDFILE) + [ -n "$pid" ] && kill -TERM $pid + ;; + *) + echo "Usage: $0 {start|stop}" + exit 1 + ;; +esac + +exit 0 diff --git a/package/petitboot/fs-overlay/etc/inittab b/package/petitboot/fs-overlay/etc/inittab new file mode 100644 index 000000000000..1f503d5d56f7 --- /dev/null +++ b/package/petitboot/fs-overlay/etc/inittab @@ -0,0 +1,34 @@ +# /etc/inittab +# +# Copyright (C) 2001 Erik Andersen +# +# Note: BusyBox init doesn't support runlevels. The runlevels field is +# completely ignored by BusyBox init. If you want runlevels, use +# sysvinit. +# +# Format for each entry: ::: +# +# id == tty to run on, or empty for /dev/console +# runlevels == ignored +# action == one of sysinit, respawn, askfirst, wait, and once +# process == program to run + +# Startup the system +::sysinit:/bin/mount -t proc proc /proc +::sysinit:/bin/mount -o remount,rw / # REMOUNT_ROOTFS_RW +::sysinit:/bin/mkdir -p /dev/pts +::sysinit:/bin/mkdir -p /dev/shm +::sysinit:/bin/mount -a +::sysinit:/bin/hostname -F /etc/hostname +# now run any rc scripts +::sysinit:/etc/init.d/rcS +::sysinit:/sbin/petitboot-nc +# Stuff to do for the 3-finger salute +::ctrlaltdel:/sbin/reboot + +# Stuff to do before rebooting +::shutdown:/etc/init.d/rcK +::shutdown:/bin/umount -a -r +::shutdown:/sbin/swapoff -a + +::restart:/usr/sbin/kexec-restart diff --git a/package/petitboot/fs-overlay/etc/locale b/package/petitboot/fs-overlay/etc/locale new file mode 100644 index 000000000000..655683630776 --- /dev/null +++ b/package/petitboot/fs-overlay/etc/locale @@ -0,0 +1 @@ +LANG=en_US.utf-8 diff --git a/package/petitboot/fs-overlay/init b/package/petitboot/fs-overlay/init new file mode 100755 index 000000000000..1e56178db162 --- /dev/null +++ b/package/petitboot/fs-overlay/init @@ -0,0 +1,8 @@ +#!/bin/sh +# devtmpfs does not get automounted for initramfs +/bin/mount -t devtmpfs devtmpfs /dev +exec 0/dev/console +exec 2>/dev/console +exec /sbin/init "$@" + diff --git a/package/petitboot/kexec-restart b/package/petitboot/kexec-restart new file mode 100755 index 000000000000..0175e76df4cd --- /dev/null +++ b/package/petitboot/kexec-restart @@ -0,0 +1,8 @@ +#!/bin/sh + +/usr/sbin/kexec -f -e + +while : +do + sleep 1 +done diff --git a/package/petitboot/petitboot-console-ui.rules b/package/petitboot/petitboot-console-ui.rules new file mode 100644 index 000000000000..cbf1b7e1d765 --- /dev/null +++ b/package/petitboot/petitboot-console-ui.rules @@ -0,0 +1,6 @@ + +# spawn a petitboot UI on common user-visible interface devices +SUBSYSTEM=="tty", KERNEL=="ttyGF*", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" +SUBSYSTEM=="tty", KERNEL=="hvc*", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" +SUBSYSTEM=="tty", KERNEL=="tty0", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" +SUBSYSTEM=="tty", KERNEL=="ttyS*", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" diff --git a/package/petitboot/petitboot.hash b/package/petitboot/petitboot.hash new file mode 100644 index 000000000000..ccb58eed0e34 --- /dev/null +++ b/package/petitboot/petitboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 b42ae4fb2a81e9cf68f727c3f54c6312788c654bd97628ec9ba61b19a68990e6 petitboot-v1.13.tar.gz diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk new file mode 100644 index 000000000000..f7f54850ee04 --- /dev/null +++ b/package/petitboot/petitboot.mk @@ -0,0 +1,77 @@ +################################################################################ +# +# petitboot +# +################################################################################ + +PETITBOOT_VERSION = v1.13 +PETITBOOT_SITE ?= https://github.com/open-power/petitboot/releases/download/$(PETITBOOT_VERSION) +PETITBOOT_DEPENDENCIES = elfutils ncurses udev host-bison host-flex lvm2 +PETITBOOT_LICENSE = GPL-2.0 +PETITBOOT_LICENSE_FILES = COPYING + +PETITBOOT_CONF_OPTS += --with-ncurses --without-twin-x11 --without-twin-fbdev \ + --localstatedir=/var \ + --enable-crypt \ + HOST_PROG_KEXEC=/usr/sbin/kexec \ + HOST_PROG_SHUTDOWN=/usr/sbin/kexec-restart \ + $(if $(BR2_PACKAGE_BUSYBOX),--with-tftp=busybox --enable-busybox) + +ifdef PETITBOOT_DEBUG +PETITBOOT_CONF_OPTS += --enable-debug +endif + +ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) +PETITBOOT_CONF_OPTS += --with-ncursesw MENU_LIB=-lmenuw FORM_LIB=-lformw +endif + +define PETITBOOT_POST_INSTALL + $(INSTALL) -D -m 0755 $(@D)/utils/bb-kexec-reboot \ + $(TARGET_DIR)/usr/libexec/petitboot + $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/petitboot/boot.d + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/01-create-default-dtb \ + $(TARGET_DIR)/etc/petitboot/boot.d/ + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ + $(TARGET_DIR)/etc/petitboot/boot.d/ + + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S14silence-console \ + $(TARGET_DIR)/etc/init.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S15pb-discover \ + $(TARGET_DIR)/etc/init.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/kexec-restart \ + $(TARGET_DIR)/usr/sbin/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/petitboot-console-ui.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/removable-event-poll.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/63-md-raid-arrays.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/65-md-incremental.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/66-add-sg-module.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + + ln -sf /usr/sbin/pb-udhcpc \ + $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ + + mkdir -p $(TARGET_DIR)/home/petituser + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/shell_profile \ + $(TARGET_DIR)/home/petituser/.profile + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/shell_config \ + $(TARGET_DIR)/home/petituser/.shrc + + $(MAKE) -C $(@D)/po DESTDIR=$(TARGET_DIR) install +endef + +define PETITBOOT_POST_INSTALL_DTB + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/30-dtb-updates \ + $(TARGET_DIR)/etc/petitboot/boot.d/ +endef + +PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL + +ifeq ($(BR2_PACKAGE_DTC),y) +PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL_DTB +endif + +$(eval $(autotools-package)) diff --git a/package/petitboot/removable-event-poll.rules b/package/petitboot/removable-event-poll.rules new file mode 100644 index 000000000000..b736aef6101f --- /dev/null +++ b/package/petitboot/removable-event-poll.rules @@ -0,0 +1,4 @@ + +# petitboot needs notification for media change events on removable devices, +# which we only get if we've set the poll_msecs sysfs attribute. +ACTION!="remove", ATTR{removable}=="1", ATTR{events_poll_msecs}="2000" diff --git a/package/petitboot/shell_config b/package/petitboot/shell_config new file mode 100644 index 000000000000..59337ff53039 --- /dev/null +++ b/package/petitboot/shell_config @@ -0,0 +1,19 @@ +#!bin/sh + +reset + +echo "Exiting petitboot. Type 'exit' to return." +echo "You may run 'pb-sos' to gather diagnostic data" + +if [[ "$(id -u)" != "0" ]]; then + echo "" | sudo -S /bin/true 2&>1 >> /dev/null + if [[ $? = 0 ]]; then + echo "No password set, running as root. You may set a password in the System Configuration screen." + sudo -i + sudo -K + exit + fi + export PS1='$ ' +else + export PS1='# ' +fi diff --git a/package/petitboot/shell_profile b/package/petitboot/shell_profile new file mode 100755 index 000000000000..40062b423b79 --- /dev/null +++ b/package/petitboot/shell_profile @@ -0,0 +1,2 @@ +export ENV="/home/petituser/.shrc" +/usr/libexec/petitboot/pb-console -- 2.39.1 From luca.ceresoli at bootlin.com Wed Feb 1 21:52:37 2023 From: luca.ceresoli at bootlin.com (Luca Ceresoli) Date: Wed, 1 Feb 2023 22:52:37 +0100 Subject: [Buildroot] [PATCH 1/1] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. In-Reply-To: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> References: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> Message-ID: <20230201225237.0fb5dacb@booty> Hi Graeme, On Wed, 1 Feb 2023 11:59:56 -0800 Graeme Smecher wrote: > If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > buildroot into the linux tree, these .dts files are copied to > arch/arm64/boot. Unfortunately, the post-image.sh script expects to find > them in arch/arm64/boot/xilinx. > > This patch does not require the xilinx/ prefix to be present when > symlinking the device-tree to system.dtb where u-boot expects to find > it. > > Signed-off-by: Graeme Smecher > --- > board/zynqmp/post-image.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh > index ed6dbe188c..c5de2db820 100755 > --- a/board/zynqmp/post-image.sh > +++ b/board/zynqmp/post-image.sh > @@ -5,7 +5,7 @@ > # devicetree listed in the config. > > FIRST_DT=$(sed -nr \ > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ I think the following simpler change would also work. Can you check that please? - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\2|p' \ -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From gsmecher at threespeedlogic.com Wed Feb 1 22:16:47 2023 From: gsmecher at threespeedlogic.com (Graeme Smecher) Date: Wed, 1 Feb 2023 14:16:47 -0800 Subject: [Buildroot] [PATCH 1/1] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. In-Reply-To: <20230201225237.0fb5dacb@booty> References: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> <20230201225237.0fb5dacb@booty> Message-ID: Hi Luca, On 2023-02-01 13:52, Luca Ceresoli wrote: > Hi Graeme, > > On Wed, 1 Feb 2023 11:59:56 -0800 > Graeme Smecher wrote: > >> If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from >> buildroot into the linux tree, these .dts files are copied to >> arch/arm64/boot. Unfortunately, the post-image.sh script expects to find >> them in arch/arm64/boot/xilinx. >> >> This patch does not require the xilinx/ prefix to be present when >> symlinking the device-tree to system.dtb where u-boot expects to find >> it. >> >> Signed-off-by: Graeme Smecher >> --- >> board/zynqmp/post-image.sh | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh >> index ed6dbe188c..c5de2db820 100755 >> --- a/board/zynqmp/post-image.sh >> +++ b/board/zynqmp/post-image.sh >> @@ -5,7 +5,7 @@ >> # devicetree listed in the config. >> >> FIRST_DT=$(sed -nr \ >> - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ >> + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ > > I think the following simpler change would also work. Can you check > that please? > > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\2|p' \ Assuming you intended \1, not \2 here - this suggestion breaks behaviour for a couple of defconfigs in the tree. If I run the ZCU106 defconfig through this regexp, I get: $ cat configs/zynqmp_zcu106_defconfig | sed -nr -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\1|p' xilinx/zynqmp-zcu106-revA ...this creates a dangling symlink in output/images (system.dtb -> xilinx/zynqmp-zcu106-revA.dtb). The right behaviour is to strip any prefixes that exist, without requiring any. Something like: - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(.*/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ This is less Xilinx-specific, although it seems a tad greedy. best, Graeme From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:36 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:36 +0100 Subject: [Buildroot] [PATCH 2/7] configs/olimex_a13_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-3-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/olimex_a13_olinuxino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a13_olinuxino_defconfig b/configs/olimex_a13_olinuxino_defconfig index 6d25d7d0a1..8469ce1fd0 100644 --- a/configs/olimex_a13_olinuxino_defconfig +++ b/configs/olimex_a13_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a13-olinuxino" @@ -15,7 +15,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A13-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -28,7 +28,7 @@ BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:40 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:40 +0100 Subject: [Buildroot] [PATCH 6/7] configs/olimex_a33_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-7-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/olimex_a33_olinuxino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a33_olinuxino_defconfig b/configs/olimex_a33_olinuxino_defconfig index cdbc63efe1..35398ac6da 100644 --- a/configs/olimex_a33_olinuxino_defconfig +++ b/configs/olimex_a33_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a7=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="A33-olinuxino" @@ -15,7 +15,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A33-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -31,7 +31,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a33_olinuxino/boot # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:37 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:37 +0100 Subject: [Buildroot] [PATCH 3/7] configs/olimex_a20_olinuxino_lime2_defconfig: bump Linux to 6.1.9 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-4-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/olimex_a20_olinuxino_lime2_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index a0ebcaed66..50a0986ab2 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.15 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:41 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:41 +0100 Subject: [Buildroot] [PATCH 7/7] configs/olimex_a64_olinuxino_defconfig: bump Linux to 6.1.9, U-Boot to 2023.01 and ATF to v2.8 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-8-giulio.benetti@benettiengineering.com> Linux 6.1.9 installs more modules and this makes rootfs size to increase and the default 60M size is not enough. So let's expand rootfs size to 120M. Signed-off-by: Giulio Benetti --- configs/olimex_a64_olinuxino_defconfig | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configs/olimex_a64_olinuxino_defconfig b/configs/olimex_a64_olinuxino_defconfig index 53e8c2ece5..dd445e8ce0 100644 --- a/configs/olimex_a64_olinuxino_defconfig +++ b/configs/olimex_a64_olinuxino_defconfig @@ -2,13 +2,13 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.8" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -16,7 +16,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="a64-olinuxino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -33,7 +33,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-olinuxino" @@ -43,6 +43,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_GENERIC_ISSUE="Welcome to Olimex A64-OLinuXino" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:34 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:34 +0100 Subject: [Buildroot] [PATCH 0/7] Bump Linux, U-boot and ATF versions for olimex_a* boards Message-ID: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> I could not test the changes on Olinuxino A10 and Olinuxino A20 Lime2 because I don't have those boards. But A13 works correctly and it's very similar to A10, while A20 Lime2 has only a different topology of DDR3 and it's been upstreamed for long time so I think it's reasonable to commit the entire patchset. Giulio Giulio Benetti (7): configs/olimex_a10_olinuxino_lime_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 configs/olimex_a13_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 configs/olimex_a20_olinuxino_lime2_defconfig: bump Linux to 6.1.9 configs/olimex_a20_olinuxino_lime_defconfig: bump Linux to 6.1.9 configs/olimex_a20_olinuxino_micro_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 configs/olimex_a33_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 configs/olimex_a64_olinuxino_defconfig: bump Linux to 6.1.9, U-Boot to 2023.01 and ATF to v2.8 configs/olimex_a10_olinuxino_lime_defconfig | 8 ++++---- configs/olimex_a13_olinuxino_defconfig | 8 ++++---- configs/olimex_a20_olinuxino_lime2_defconfig | 6 +++--- configs/olimex_a20_olinuxino_lime_defconfig | 6 +++--- configs/olimex_a20_olinuxino_micro_defconfig | 8 ++++---- configs/olimex_a33_olinuxino_defconfig | 8 ++++---- configs/olimex_a64_olinuxino_defconfig | 11 ++++++----- 7 files changed, 28 insertions(+), 27 deletions(-) -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:38 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:38 +0100 Subject: [Buildroot] [PATCH 4/7] configs/olimex_a20_olinuxino_lime_defconfig: bump Linux to 6.1.9 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-5-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/olimex_a20_olinuxino_lime_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index f685d19421..25ecf31146 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.15 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:35 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:35 +0100 Subject: [Buildroot] [PATCH 1/7] configs/olimex_a10_olinuxino_lime_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/olimex_a10_olinuxino_lime_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a10_olinuxino_lime_defconfig b/configs/olimex_a10_olinuxino_lime_defconfig index d0e00301f7..9c454b1915 100644 --- a/configs/olimex_a10_olinuxino_lime_defconfig +++ b/configs/olimex_a10_olinuxino_lime_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a10-olinuxino" @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a10_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -33,7 +33,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A10-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:39 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:39 +0100 Subject: [Buildroot] [PATCH 5/7] configs/olimex_a20_olinuxino_micro_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-6-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/olimex_a20_olinuxino_micro_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index 1394c0b8b8..a7a6eb51a0 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-micro" @@ -33,7 +33,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino_MICRO" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -- 2.34.1 From bernd.kuhls at t-online.de Wed Feb 1 22:51:04 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 1 Feb 2023 23:51:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: fix build error with newer mesa3d Message-ID: <20230201225104.3433262-1-bernd.kuhls@t-online.de> Fixes build error: output/build/kodi-19.5-Matrix/xbmc/windowing/X11/GLContextEGL.h:16:10: fatal error: EGL/eglextchromium.h: No such file or directory 16 | #include introduced by mesa3d 22.3 with this commit https://gitlab.freedesktop.org/mesa/mesa/-/commit/f5bb9dd738ace274c97507adea073b6c609469b2 using this defconfig BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls --- package/kodi/0005-Fix-EGL-build.patch | 58 +++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 package/kodi/0005-Fix-EGL-build.patch diff --git a/package/kodi/0005-Fix-EGL-build.patch b/package/kodi/0005-Fix-EGL-build.patch new file mode 100644 index 0000000000..cefa8cbdb4 --- /dev/null +++ b/package/kodi/0005-Fix-EGL-build.patch @@ -0,0 +1,58 @@ +From 3fed131284b53b0e42c87c672f02dc3e91e40b22 Mon Sep 17 00:00:00 2001 +From: Alan Swanson +Date: Mon, 19 Dec 2022 21:28:13 +0200 +Subject: [PATCH] Work around Mesa eglchromium.h removal + +I have polished Alan's snippet to buildable state and tested +on Kodi from Debian sid. + +Backported EGL fix from upstream commit: +https://github.com/xbmc/xbmc/commit/2968130023ea6ee4327119dc969758840c4a5941 + +Signed-off-by: Vasyl Gello +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindEGL.cmake | 6 ++++++ + xbmc/windowing/X11/GLContextEGL.h | 4 ++++ + 2 files changed, 10 insertions(+) + +diff --git a/cmake/modules/FindEGL.cmake b/cmake/modules/FindEGL.cmake +index b00fe08a25f95..a68a8db901222 100644 +--- a/cmake/modules/FindEGL.cmake ++++ b/cmake/modules/FindEGL.cmake +@@ -9,6 +9,7 @@ + # EGL_INCLUDE_DIRS - the EGL include directory + # EGL_LIBRARIES - the EGL libraries + # EGL_DEFINITIONS - the EGL definitions ++# HAVE_EGLEXTANGLE - if eglext_angle.h exists else use eglextchromium.h + # + # and the following imported targets:: + # +@@ -35,6 +36,11 @@ if(EGL_FOUND) + set(EGL_LIBRARIES ${EGL_LIBRARY}) + set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR}) + set(EGL_DEFINITIONS -DHAS_EGL=1) ++ include(CheckIncludeFiles) ++ check_include_files("EGL/egl.h;EGL/eglext.h;EGL/eglext_angle.h" HAVE_EGLEXTANGLE) ++ if(HAVE_EGLEXTANGLE) ++ list(APPEND EGL_DEFINITIONS "-DHAVE_EGLEXTANGLE=1") ++ endif() + + if(NOT TARGET EGL::EGL) + add_library(EGL::EGL UNKNOWN IMPORTED) +diff --git a/xbmc/windowing/X11/GLContextEGL.h b/xbmc/windowing/X11/GLContextEGL.h +index 99a6a9024e8c6..afea0b7c43eac 100644 +--- a/xbmc/windowing/X11/GLContextEGL.h ++++ b/xbmc/windowing/X11/GLContextEGL.h +@@ -13,7 +13,11 @@ + #include "threads/CriticalSection.h" + + #include ++#ifdef HAVE_EGLEXTANGLE ++#include ++#else + #include ++#endif + #include + + class CGLContextEGL : public CGLContext -- 2.39.1 From thomas.petazzoni at bootlin.com Thu Feb 2 06:45:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 02 Feb 2023 06:45:07 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-01 Message-ID: <20230202064514.8A14641A37@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-01 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 3 | 2 | 0 | 5 | 2022.11.x | 14 | 19 | 0 | 33 | master | 172 | 335 | 3 | 510 | Classification of failures by reason for master ----------------------------------------------- host-fwup-1.9.1 | 28 fwup-1.9.1 | 18 xz-5.2.10 | 17 jack2-1.9.21 | 16 host-go-1.19.5 | 11 norm-1.5.8 | 10 libfuse3-3.13.0 | 8 opkg-0.4.5 | 8 bash-5.2.15 | 7 fluent-bit-2.0.8 | 7 gvfs-1.48.1 | 7 host-binutils-2.38 | 7 linux-6.1.5 | 7 host-pahole-1.24 | 6 python-bunch-1.0.1 | 6 xxhash-0.8.1 | 6 gerbera-1.10.0 | 5 glibc-2.36-81-g4f4d7a13edfd... | 5 gobject-introspection-1.72.0 | 5 libglib2-2.72.3 | 5 libgpg-error-1.46 | 5 dahdi-linux-3.2.0 | 4 host-binutils-2.37 | 4 host-sentry-cli-2.8.0 | 4 libcap-ng-0.8.3 | 4 libgcrypt-1.10.1 | 4 pixz-1.0.7 | 4 python-bcrypt-4.0.1 | 4 unknown | 4 wolfssl-5.5.3 | 4 zabbix-5.4.9 | 4 brltty-6.5 | 3 elfutils-0.186 | 3 fontconfig-2.13.1 | 3 freeradius-client-1.1.7 | 3 gobject-introspection | 3 host-rust-1.66.1 | 3 nerdctl-1.0.0 | 3 bat-0.19.0 | 2 google-breakpad-c85eb4a59b6... | 2 host-binutils-2.39 | 2 hyperfine-1.14.0 | 2 linux-5.10.145-cip17 | 2 mongodb-4.2.18 | 2 netsurf-3.10 | 2 ntp-4.2.8p15 | 2 pcre2-10.42 | 2 python-cryptography-39.0.0 | 2 traceroute-2.1.0 | 2 uqmi-0a19b5b77140465c29e2af... | 2 acpid-2.0.34 | 1 afboot-stm32-3566acd582e553... | 1 alsa-lib-1.2.8 | 1 apparmor-3.1.2 | 1 berkeleydb-5.3.28 | 1 bird-2.0.11 | 1 boost-1.80.0 | 1 btrfs-progs-5.16.2 | 1 crun-1.7.2 | 1 efivar-38 | 1 fftw-quad-3.3.8 | 1 flac-1.4.2 | 1 flann-1.9.2 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 fs/ubi/ubi.mk:51: /tmp/inst... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 glmark2-06e78b67702b5413335... | 1 glog-0.6.0 | 1 gummiboot-2bcd919c681c952eb... | 1 host-gcc-final-10.4.0 | 1 host-gcc-final-11.3.0 | 1 host-gcc-initial-12.2.0 | 1 host-python-maturin-0.14.9 | 1 kexec-2.0.25 | 1 kmod-30 | 1 libndp-1.8 | 1 libnss-3.87 | 1 libvorbis-1.3.7 | 1 linux-fusion-9.0.3 | 1 lirc-tools-0.10.2 | 1 ltp-testsuite-20220930 | 1 lttng-babeltrace-1.5.7 | 1 lttng-modules-2.13.7 | 1 lxc-5.0.2 | 1 ocf-linux-20171122 | 1 open62541-v1.3.4 | 1 openvmtools-11.3.5-18557794 | 1 pixman-0.42.2 | 1 postgresql-15.1 | 1 python-numpy-1.23.5 | 1 python-orjson-3.8.4 | 1 python-pyicu-2.10.2 | 1 quickjs-2021-03-27 | 1 uccp420wlan-6.9.1 | 1 uclibc-1.0.42 | 1 vdr-2.6.3 | 1 xdriver_xf86-video-geode-2.... | 1 xfsprogs-5.14.2 | 1 xvisor-0.3.1 | 1 zip-3.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/8d4e01c43ed62fa33327975abdcc37f8b17743e4 | ORPH arm | afboot-stm32-3566acd582e553... | NOK | http://autobuild.buildroot.net/results/c08330c410abc384b008c923a7e0736fce5d968a | or1k | alsa-lib-1.2.8 | NOK | http://autobuild.buildroot.net/results/02b21fd211bf4266028b72eb024df86bbb6d038c | arceb | apparmor-3.1.2 | NOK | http://autobuild.buildroot.net/results/b4fe1287b42076c1d2b82da306f61d0b0d9e6479 | arceb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/dc81ba14f0cac9c70ec7e5beb7c16f0d2d6d4c86 | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/7ce2f336f8ede2eebfb2b8ba7d0405c89980464d | ORPH mips | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/d25c36fa0f32e56a4f9db8ed21bd98ca59920787 | ORPH powerpc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/4f8da8a51ef877cdfaf6ab4fb936a22636bef5e1 | ORPH mips64el | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/1f319789a87e055bbd074b020193b67adab4ac56 | ORPH xtensa | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/d40e87855a4b44fb207ddfec9183aca1336ed4d5 | ORPH powerpc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/34bd798693455de1e569a8136da7cb3a697a19fd | ORPH x86_64 | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/3566a772ef76c31f5d427f968269b99adb0750bf | mips | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/da25d808283e0ee099dad2ab7ca797c6ba0eb3b9 | sh4 | berkeleydb-5.3.28 | NOK | http://autobuild.buildroot.net/results/f5083d1f8b98f923de8160aa89855733e10a7063 | ORPH arm | bird-2.0.11 | NOK | http://autobuild.buildroot.net/results/e2bbd0ca1fddaa71f223712be8e2e63f31ca2da1 | arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/392bd89315f4a5062558e647f77a3a5238c1a63e | mipsel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/65b12428267b52a1368abef45779e63fd7a15af4 | mips | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/4339a830c763ed2efdc28b90e9f7a45438dfac9d | microblazeel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/3eb49c8c41963ce22b94c179223129818e3ff03b | or1k | btrfs-progs-5.16.2 | NOK | http://autobuild.buildroot.net/results/52a39ff69d2db9866ee3fc65567bdb9fb2181602 | ORPH mipsel | crun-1.7.2 | NOK | http://autobuild.buildroot.net/results/f7a7ddd433437fa778950281af04643d7db972c3 | sparc64 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/1bbc2b3eec84e1fc0686c1f148471d396d5b0898 | armeb | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/20021f9b71e0ea4692d44f7c7070c15b394ffab1 | riscv64 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/a0fea114fd79971c4ce4a4512cbce4d5923feaa3 | s390x | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/c3a799a4e9874dc850d086ce61ca215eb45cb4f6 | aarch64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/1ba67891df0499237f315a59a3220a4078d9b62b | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/636b86910612560769e19ca6df5c74c291758525 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/92c347d5cebb2cde9f91730748abf6b06380f0a0 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/96fd22c7cdedb7d02a560f46cfc298b7c9208023 | ORPH powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/fd7aaabef32184afe0826e21d81b492935ccd5ee | ORPH sh4aeb | flac-1.4.2 | NOK | http://autobuild.buildroot.net/results/620eaa2419ae69dec66e02be13a2eb50a2b3af83 | mips64el | flann-1.9.2 | NOK | http://autobuild.buildroot.net/results/5dcc29a942368cb4c0eb12c21b5c12fc877eded7 | aarch64_be | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/db4dca11d2186c6aa1fc47bc7f34cad69a02acd3 | powerpc64le | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/7c0b6cd07d623c6dfa552634b57856c2faf3c5e2 | aarch64_be | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/55b1f8d587a10357c228ff3c4313675239be9d21 | powerpc64 | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/2fc0a32d52be56525edaffcf7ec461c834e90854 | aarch64 | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/620b062db8a331f86a218e5b3b80395500f09435 | aarch64_be | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/f0514c217fd5cb4d6f07bb8bd7aaf71e3e9b50cb | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/df9901b7b52c7933e6a4ef4503f80e336e0e299e | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/0f303a32561b33aaa1dbb9c469333b9777180f13 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/8c829744f7991d8dfd7447b70cdd61e5478ef9f9 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/aeb4cb12ff37e96e036ab93bf15703e7753bbea2 | ORPH riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/25fbee9c28e5b3f114b06da35f1f0b0a8db44195 | riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/3c2d0281cb26676ee4581c6fc4f747c0959309f9 | riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/6afb37875b282c3475e420d9a3d424dafb80cb08 | arc | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/dcdd3b4cae74c4c0ca155e7db83db9032c35fdda | mipsel | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/c3bab75326a425786798079ce330f5724dff0cc5 | mips | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/faa2cc501565a6d81f43b905feb0ecb25eea7a7e | mips | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/ef488b35ef95912ad209ed062a998eb976055b29 | mips64 | fs/ubi/ubi.mk:51: /tmp/inst... | NOK | http://autobuild.buildroot.net/results/ec6f6e7e9b643534ed37f41ecd27df0e7ddae731 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/dd412baf8f9312c42b59076bae1e85a60264461f | powerpc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/19494f7dc0d460eaed1b2006ef19a2e082d47ba7 | or1k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/ca536d3ccba15f8f57af23d6e15aaa23bd7824db | mips64el | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/b7e81ee0800602e08cb323b3a7cc64e720365052 | or1k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/f49e42e64e610d37a06fb6941558d28e561089c5 | mips64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/0ef5021be1cb43728dd3e155fb547d926cd57152 | s390x | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/4a21636890fce1750ed285436fc5cdfb47d90b65 | nios2 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/47c578e74e70ce22781bb05caf6712a43ef16ed8 | microblaze | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d8f0dde87b56d9a9756f27b1288aff0996684adc | powerpc64le | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/9e5c4ea12c1a6acacfe17d8bc2d0ff3499e86298 | xtensa | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7a9efd870165569a783f297475b2553824cbcb4d | sparc64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/84b2e3e8bff331435e63e1e4a4ab6c699bad62b6 | mips64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/b0e976bff8076fa5d50b2c1600111ab0ea8e3dc5 | aarch64_be | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/110fb35d4c9c022d600381106c7296385086d71e | aarch64_be | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/317507c834edbad4379f2f9b1913d0507dbeb6ff | i686 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ffefc92bd86d606ff1dcefc3c2710b1a88a04b6a | nios2 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7c92d4618440c66764bbbcbf1c9637f77f848571 | x86_64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/75800541af18fca312cdc1bed32b6e2a18d34bcd | nios2 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ec81ad75862dd9e25a4464a535af5a484cb67f5f | mips64el | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/38185fa177eb5cc4905bec7760cb7bb4e4de3851 | arm | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8214d7a33b1cb25d72450a429d2b933539a3b419 | arc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/4f61473b4c68ce907109a05d1ed0cf3b14de97eb | arc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/fb424825c21330b8a87703c3cbcd68c48810b100 | sh4a | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3b9d83a0f9d8c346aaf6900aea206952466d1685 | mips64el | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8fe00f5a7b474d2f27dfc4f989e281e2c34d5dbd | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/b033bb5f06ead6bf623cb54d576c7a9dcabad148 | nios2 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/0732ccc310aa52d32b569e72733efe14ff61acb8 | mips64el | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/a7ceaa8cf8d0a50f5790fa2c0d96a99f4e3b876f | sh4 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/990d0286c3f63d93fb6f09f15511c9ee04ca1b9b | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/838a4f0141c238e3391927ac08c23e79209cefc1 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/13db1f6bd84eecd70cca022e0543611d328346f5 | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/c1b0bb58c952bdcd0d6b63de3fc10385ea7e0b9a | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/490523b6260273d2e00a1bea66d2d4c49cbe501b | powerpc64 | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/f01bd5b70a53313bef6e0500d2120ad58b3a5c97 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/52daa688b341e28f8ded613665e359a72031e714 | aarch64 | glmark2-06e78b67702b5413335... | NOK | http://autobuild.buildroot.net/results/bbd90f11975b691f694412a6fc3446f37dd7c0aa | riscv64 | glog-0.6.0 | NOK | http://autobuild.buildroot.net/results/49b6f8268a91e2392e880ce52b7f892ef41a0b55 | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/e9106719c92cff325040720e94ecf384e59f76e6 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/29730d4d341516f15a1f5dc5ded2419318b34ccd | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/d10553b4f92bc297a633bab4772aca5994860ea6 | nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/561d47cfe7a27ed0e25985aca39980ac69a43223 | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d616444a34ed8879fc1d61e7fe87545b49da7cf2 | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f686adec0283da6c72076fe13cdbc5c1811ba5e4 | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/58c0fb46c87e76a44fac1f3d2927d3ea8295b4fa | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/e2e7ab69578cfbe3074baf2f94fc5e2c7cdc6e1e | ORPH arm | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/b6e2cd511f913ebc626f7eadc0e2496c9f2977dc | mipsel | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/c3fb2f019663741947b0888cca9ab2f1309ab01c | i586 | gummiboot-2bcd919c681c952eb... | NOK | http://autobuild.buildroot.net/results/b503ea7341d4e865ec9f288922d3063f08f8ea67 | mipsel | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/53816e64ab18541cb78c7cef62dda5873267f042 | ORPH s390x | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/58246cc30cdb3e278597e9b63b58d5dab64280a8 | ORPH nios2 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/7da35f6fac6df78ae91c840ef32af9a5f5d5a62f | ORPH x86_64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/daa230ffb7536175990669cfb95aae71b176e764 | ORPH powerpc64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/9ad4b3eabb1cfcd56a124bf5d0d42fd51d8234ef | ORPH sparc64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/115a27158ab16bd0f82c311849507610bd70e096 | ORPH powerpc64le | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/44463cd74d0b617c3aa246a6ed16f00a37ce25af | ORPH arceb | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/95a23561fff47cfaf91e0b5162b4300a8acc6698 | mips64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/64acd43cc8ca29ce1ea7df518118bde6e7d02309 | xtensa | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/04cc6ad0b397e790c1d8932d7506a775edfb1bee | sh4a | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/bcddcee118610404fe919172f70ad77c8bbb8782 | or1k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2da7f810282f4e0832179b8df9a4f8808f0afcad | mipsel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/12c0f087748437dfda94414d10180fd7723afec5 | riscv32 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/4b72e625c98bc61c07db63ad47b74024ee69d7c6 | sparc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/4d2af7a3894ef38c661bc34c778824712c1add29 | mipsel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/baa72f384a0765e12b065663c1fea62d3e18aa27 | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6ada8e68fd706498aeac323d3972d20e6b62cde8 | aarch64_be | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/ef3f25bbd04d65f1bf9b6f8cb25fea97a80046d8 | powerpc | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/958fc489eb7ca7cf1551e77fd001a6bf7024bfdd | powerpc | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/ceca9b5ceff75442c7605e0edd269b3a15ffea86 | x86_64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/5dce05289e7961861d9b62d670a035aeaaa5f3ac | microblazeel | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/5fc0aa211fcba67a8a067c6d98963c8f518d34f5 | xtensa | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/15219ce297be728b824b8afd1e4c3ecdf8624b26 | or1k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/0e167421afda575d421e5b75a02fe3cb2e4cfabe | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/f5ac81272c40b6401d39fb83a2dbd58e9d5b7c60 | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/fb3624fbe4e5229da498740b0bc8e0d3cfc4fa33 | riscv32 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/a31edccedc11487dfa20f278d105c137f24b6247 | sh4a | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/002b603eeb8380d29d0b8b0f3793293f67d165a2 | mips64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/af1d596f53dd88c0976eeca6be0c1860b8b5b893 | or1k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/87187c6882a4d516a6582be13a7db25e38a774fd | i686 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/6d17ba1217af25bc031cb47aa0dbc7fb835ca2af | or1k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3cb5befc7c49f14321ddf575246007c220a44d74 | m68k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e265ba753c441f6ae60075042e66e75b9073a9a4 | arc | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/29f0cabfe8c94fae0766c911175ae565d20c705c | arceb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7514e3556b4112a75047f55ab2b44de407828a5c | sh4a | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e729b881ec8301b7e78988eb2e2262c88f9b3d1b | sh4 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d9cb94c8003026c7d21e8882a34b7b6ba30c821b | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/6c241f285208eedd646875ff38af4cab20c48f10 | powerpc64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3bdd030ecd1fd69693b4d7619ca96eb2cd87cee7 | x86_64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/0ea27cb5dcc21884618dc50bd6c213aec8da38fb | arc | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d70e0d4a0fa805baa376fcd72142be8271a2bfa3 | riscv32 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ff24569c9c25df649eaa282f78cf4111a16165b3 | mipsel | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/2a7b0ff05e3420b0374b7dc25b5f9ab56194717f | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/eb34fbaaf8d71aa5cc4674ee12842e2e40e28f6b | mips | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/4bb36cf80ba1820881edd22f809d2bcb720862f4 | armeb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e23676808ed36f0ade5ad531b89357e30b73af5b | mips | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/c75aadf1a4132496ab64622b79593f4c41cd8196 | x86_64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ba7373995cfdbc3b53667e457e8661633816ad95 | riscv32 | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/f9db426c5f9ef48e742b92851ca587dc6f82da33 | microblazeel | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/941abe8a57fc3a59059d7fc69e1e585552541fa2 | arceb | host-gcc-initial-12.2.0 | NOK | http://autobuild.buildroot.net/results/655b9a44a07014d274238644846ff7c3e39a1b71 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/ba8fa7af8352cd65a3a9d6927c8d40f6c01f2321 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/8e52dd78f29ae2e9352aca3f6c4209a35456d63a | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/d01dce5e7dbf8063f71a62006c8e676fc629ff05 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/9d9f8ecedd25c29798f9c50cbda9789897f50922 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f5e7f9b585da2f6002d0d38a126339fe1ebe55e8 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/d15e504fddc5c77a6861f4c3b3b9c7ff624d5e97 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/bf01a959c5608bde5c1efc0082733c20a7a17ba4 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/a65bc23a8cda34b8c1e365432aafab1c23f84579 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/9db632607f4333469a3fcfb160147e47dbeaf475 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/799ef3267ab3bc357f40b721be968c58ae318b47 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/a6ed60544ffb0225a93e5fec397cba1b0528a0c1 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/aa2f23a6d551190df62eb26e6c135aa2bf1cce61 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/6993cd6183c6c33e9803bcaf8c8ca732e024e1dd | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/be14569c54b60a56ab37ac464fb86d128e5137ef | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8ca78ce116774286933c440fa8b00459a1f57fbc | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/42dfec5afcc34e54e8ee8dacb9fa0f0e3f5b7ce3 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c830eecb134dbead9003014dd93c17c8b0c3e569 | sparc64 | host-python-maturin-0.14.9 | NOK | http://autobuild.buildroot.net/results/23f802d3d7ba96939d36916bc4dcaedaf8eea4be | armeb | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/d864e592014c24a5f1dd096fdec240d83e5c414a | armeb | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/cb4711005dd0766b5f80d2a815bee131400d0e61 | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/202b42ca3c1a25ed8c1d05fb97e06b2be11d4483 | mips64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/ec92ce423e04caec00328d55f81455625b732879 | xtensa | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/f8b48dd47d5d6ce912b9dce66b8fa30956b6e5fe | arceb | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/57fed06f3cdd73436c81969aa98c86aae6ad128f | or1k | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/54cc389fee1ca34ab6455aed1c084fc743e1133b | powerpc64le | hyperfine-1.14.0 | NOK | http://autobuild.buildroot.net/results/3eb0fa2dee6cbfbeae1f9640d399c362637801e5 | ORPH x86_64 | hyperfine-1.14.0 | NOK | http://autobuild.buildroot.net/results/bb4190b8af3fbfc66b6a8537e0a1ff7b8e46ca37 | ORPH mips64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/68f7eec804e3159cbe90064691d1c7d53a0d62bf | mips64el | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/35ff103afa7315ba9c1ea35f5b3fd509dda3bf9f | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/c82551eaa62a293731ad1626c8d599d58bb63a39 | powerpc64le | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/c802c405966fad34548454d3860ab02e84671f34 | mips | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/de7c4851dc333df14ba9e2cef095e4a2d38a3fe6 | powerpc64le | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/925d3000fee3ded8407766d2caf25357d1a370c5 | s390x | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/66a60e106e578464db8d22433738380a39790a03 | mips | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/ab0c68a7a4d7df7861f7a28b3126ff2ec851e316 | aarch64_be | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/a1eebcf786cc0af943ca5157bfdf975ccf40be43 | arm | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/4d9fb7d913aae1d321acd2c73b86c4c19eb58475 | or1k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/2869b35a031faa9f05e172dda4baebb75e23d590 | powerpc64le | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/60b12ca955739be9f49de1b52970e49163cda226 | microblaze | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/e50cfaa56bc7d29d21d30c57e4f677757fc6ccb0 | powerpc64le | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/42cedb4d394ce1120334a2e5a3da4b4647ac12c5 | powerpc | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/e591241b7c7a51ad4a4c08593c9f7699ed73108d | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/c46508633c74395ae1dc3b6e4cdeed9210a657d8 | armeb | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/27b3dff6575099e8e8f36bbf8283a551d0d20a91 | ORPH armeb | kmod-30 | NOK | http://autobuild.buildroot.net/results/40647bed164a8ad535b900fdf5d09d600ced6f3c | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/a9dd7e93994557fc267843fc4dfb542d914fd81a | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/6540f81fb4108b52a542d459bef7b466d5c36c6f | or1k | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/bad686930c52d2132dfae5965e168eada32232fc | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/a35e190e5f2e90b79e1365000359b851b5932a1a | or1k | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/5843f77eacf0c6a2f94c4854a19fa912faeeca6b | mips | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/a019fca7a6feef0e20922d37b5bf45529176bdeb | i686 | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/af8160be7d79690e8a7fe3c92bd6ceb22fad1695 | sh4eb | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/b745ebcaf36a2ea8b34c8bf07e068324de1820b9 | powerpc64le | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/49d2dbd03f4691e59094dbae1488180cd2c47e97 | powerpc64le | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/856b295d5e94e15bd510cd6165b0636d1ca4bd60 | i686 | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/19dd0243b3bc8c82914a852694ea75d802ef08ff | powerpc64le | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/3938e6ba878fa2e12ebd52e4b5e34ddadc3ffdc1 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/04b2c0044dd33f9457e480eac7c84e188a0bd7c8 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/5e3afca87208aa77e8edae9470aaa1fb7080c8d7 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/8059ae7fc5065dc7fb3e198d7de1ca537a1e9e00 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/854704351646a6929dbfef19bfb55824f18d2b6f | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/8e64223a4cb96e4e6c7b579646e27e23d09adfe5 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/892349acf9a72a36100edf5e6bf9fb8a6436a258 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/5b8adf7ac81928c3071d29a602b90fc22fd20b0b | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/d99f1b042e1a7cbb09056468380007e9c1234ddd | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/2ae46deb5f11b03d64709b702108313da523ab43 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/a16b3deffd616a0cd9b10eb962f82aa0c724cdba | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/f13e988c2e40653a5608914595bb073a63ae65e0 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/26fb07ca54892a413a65a3bc0dc8809605a4133b | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/57034f1cf3c997d67445d8527a89c084c459dfd2 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/f808d9a4fa13b39430633daa91b2e45b9f468113 | ORPH riscv64 | libndp-1.8 | NOK | http://autobuild.buildroot.net/results/4dea0f50d6c3f884762be9fd7debfdf7f133123a | sh4a | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/9d18bd99f66699e1a7e0785160ffdb15adc38222 | powerpc | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/dab159120e693856917b5294dd0e1da80de35351 | sh4a | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/08d22bb5d3cb8f94b8a14e556f3f92dd879b4394 | ORPH mipsel | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/8fd031cf2df528538973350da4653fb4fc0a3ee6 | ORPH mips | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/dd32e27f7a9355e454d5f09ce39369344f93d1e3 | ORPH powerpc | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/b6b5f6daf9732e125cd3023ba7870225430410ed | ORPH sh4a | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/52034975dfdd11d2e0cb7969bb395f00dbedad09 | ORPH mipsel | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/3835d604569739ad985fefb61642fb1f4c9ca488 | ORPH mips | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/62405e4b74fa93aa2327249ac5c60b37c7e37d32 | ORPH mips64el | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/d2fe49dffed2eae712f261a785963f6b86b79bed | ORPH mips | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/68b992424c4c5b9bda864088437aa726dab06efb | ORPH sparc64 | linux-fusion-9.0.3 | NOK | http://autobuild.buildroot.net/results/8668b0debd4d6db3067044be7b5d08189ff8e617 | ORPH powerpc | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/c1e72d7e71e0e75f36b6f2a4607310ff084be1cd | ORPH x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/2d369d8b8a669e902bdc479961a43010264230d3 | arceb | lttng-babeltrace-1.5.7 | NOK | http://autobuild.buildroot.net/results/e0e41ca10d8a847fadfbd9455d463a0d57b27bef | microblazeel | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/b08b0c138d344bfbff18eb9f411d1357dab6fcb7 | aarch64_be | lxc-5.0.2 | NOK | http://autobuild.buildroot.net/results/c7d8b6361275f0a8aa01e78814dfa19a84bde547 | aarch64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/59dee59117659369e4bd5e296bf2825abd2bf72b | aarch64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/ebf4151aac9718255f979015cf849cca754a2c51 | aarch64 | nerdctl-1.0.0 | NOK | http://autobuild.buildroot.net/results/a7c5f28f9e6cf8da7026bab5c2284fc4fc7e89f7 | arm | nerdctl-1.0.0 | NOK | http://autobuild.buildroot.net/results/eaf0c6649b5663be911145622a306473849b2d0d | powerpc64le | nerdctl-1.0.0 | NOK | http://autobuild.buildroot.net/results/bad88cf7ac3ea53e28ba6e16e5a374f5fe1a0da2 | mips64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/3c9f872868fca60f947b35593ea5135531334a43 | nios2 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/c29a210bfb3377f1c873981123ad8da91532a2ff | i586 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/8600d58e2656ef0ec2c562c8676b98d59c5d73f4 | ORPH microblazeel | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/de7028cea50e329fa27131fad2c48f4ba1dacda3 | ORPH riscv64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/da7154b2a0dcd21474d92c451c6463be4d755776 | ORPH sparc64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/d87331619ad6f837c6b8ae0cd516fb1aff72618e | ORPH nios2 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/12b76abb7d5df113656bc892b48edcaef105a6e3 | ORPH arm | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/a7d2eeab76b1391e5733ef09dac751655b005a6c | ORPH sparc | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/197d98d06024806887621fdcffb3eb4bd7031ef6 | ORPH x86_64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/4e9f9aaeaee2b228fb53aa84094c881b9ce9aa20 | ORPH m68k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/859e7f4ab19806cd21dac1e097da2e0448926831 | ORPH m68k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/3dfbe85fdd1e7a1bc8a132d925abe47f7a4bc7c4 | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/1a1016e7aa77f5608f66c4344541c220e31fbd3b | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/352911fba22bca1353b335772c70d1ffa75f3860 | ORPH powerpc64le | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/af7e6b185b932f0bfac9c113e9c4d129fd5d1faa | ORPH nios2 | open62541-v1.3.4 | NOK | http://autobuild.buildroot.net/results/2b3bf9142d1de0a1f500ba53b82b52248458e32f | ORPH x86_64 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/ecbe8f9244ba0764eae2f3db0007415b320f22bd | mipsel | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/29d5d20660318620befb78af3be06896d4a70e99 | ORPH powerpc64 | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/b844d753f5d1969e941e2a865c7ff760fde37d9c | ORPH aarch64_be | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/7cc3bceddd4ba016164d31d2718138c43cb8b976 | ORPH sparc64 | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/5dc839d26b34824f78311c5e745d51209f7a1987 | ORPH s390x | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/9a54d6267fb69657bf994f77a1193c37dff01066 | ORPH powerpc64 | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/f604b2e3cdc0b8d8fcdfc847a3b2c8904fff649c | ORPH powerpc | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/87d5ebbe2db2358da05751c087e31b8528d8b0e7 | ORPH m68k | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/3c0cb8ff764fb97c9d0498a4d58857351b659676 | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/c0143efe721bbbabb2f612a0db82b63064d6a7ae | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/117760f1157cad340e3021dfdbd770d5e6d0face | ORPH arm | pixman-0.42.2 | NOK | http://autobuild.buildroot.net/results/ef78c43674aea0fc7d8194fbed6bf35c50105844 | sh4a | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/359f12c8cdd3666e8658db0aa2fe1e3ae516db25 | sparc | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/ec2736b0ff7fd5f1237420472b8aa10b83d012c2 | mips64el | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/cf85b5e16809b32e0953c4f97f8fb1eeedcecddd | sparc | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/472fd0a7e739a547cd3e5795eeadf666ee41d5c8 | sh4a | postgresql-15.1 | NOK | http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a | powerpc | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/6745e1ccf8707ce7893a6f9db6d42649b6b9f0e6 | x86_64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/a3911b9240c2e4465187dc1588071807d2e552b9 | s390x | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/9b5bfbe43caffc3160f62600f15e13a0cd4deaf5 | powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/57f80cdec8b5efb8bccbf7fc75465a9bb1b61a2f | powerpc64 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/fb179701f35ce0b92ac1fca8eb377d48bb8dd889 | armeb | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/accbb9c3c6adb2cabfec82af148a0b4d0ee2ebea | nios2 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/362db3810c48e46551271acd23363dd80f6f8b6c | nios2 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/4528413f52358f6c466f24cddbac5b56e677b042 | aarch64 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/64c53ee81df6567063d38bfd92b259b49cb1ea7e | s390x | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/0b24235b4df2fc7bdb4e4da7c43f3eabba591b61 | sparc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/634697dba427bbf8b1c009f4f118d88b56c6477a | x86_64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/dd5bf18fb3bbe24293d2a0230fa1c8c7780fa739 | mips | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/a3e9984f816dc459dd180cd8aabd6ea090b3a748 | mips | python-orjson-3.8.4 | NOK | http://autobuild.buildroot.net/results/7291d123479411e632b8380f0045a18814dc23ae | arc | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/fb97a98cb6779c4976a9203f8c4d87e002cda3d9 | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/e404152462c16d5471cc9be35fa7a941a490f66b | or1k | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/a17749f0b78eda4f4fdb4442e52567e45609878c | i686 | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/a62d899eb0ae6f104ee3b4af7ba9ff774fa6aada | sparc64 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/35b8790bb9ddd180b191da49d7ad20eb84f89495 | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/17734790285de49b67f0712ab6e0e41b0738669b | m68k | unknown | NOK | http://autobuild.buildroot.net/results/ddda24c6899c2d9fbbbb1578c6ab49c5d8091b48 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/493914a77ad443181c49b223157ca4f12e7af49b | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/423bc0739904c9a2ce63744cc3a31bd9f8205555 | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/ad99454be8f4b5327a3b727692e85d7c657bb84c | xtensa | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/93640e438729259cb8033ccfb656a60ba234d878 | ORPH sparc64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/4ea5c7051c65487f2fc8935430aca19167a37e01 | ORPH or1k | vdr-2.6.3 | NOK | http://autobuild.buildroot.net/results/135c05445b314ff24bddf197ee1dd99b74b8f5ce | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/5a8d253b09f68028ba47f8d19de27f1d131b1734 | riscv32 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/d04a3109ab0fcbdeef789a6bae6211d7a2374320 | mips | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/4e70be2d2c161094cf33f161d784a212b7c21bea | armeb | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/7fc95c043573c92d76dad539183dbb7168591d08 | i686 | xdriver_xf86-video-geode-2.... | NOK | http://autobuild.buildroot.net/results/d1dae8c7ba9dc82fbbcc5914ea3b378e48304617 | mipsel | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/602eb6874b9c8c67a0cbe0ce07b16b652e69a1e3 | ORPH x86_64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/27266075215b44e41c12aa9b925028b08a089bfd | mips64el | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/6be47f1f9957170e834625f13e2d01dc4b0d1c7e | ORPH arm | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/0fc774f5538e682278f161c59ddfa9cfaedd9212 | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/82ae36bf03c1cb8fd192100e77c28c65e50dd954 | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/fb957653db5bd2a83ac4c13f3a1640ddaee3bc23 | ORPH mipsel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/37b528c1cab64063c93c5e5229fc2a62bdc4c3b2 | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/a11e3250a57115a25ca6b41777572b7a27b17247 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/26cd3a80fb8208af25b22c8e2f7decec700f0a37 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/12585ac99ee541b648d93fb5e1821c7cd07f8003 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/5762fcfc8cba26b97836f792392f1d1b46634d47 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/2f3a453718ff970c05379280c25a38eadbde3ba0 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/c3ec9830f40989ca627c6affd1a444410f4173a0 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/9e591e0c8fafc896ec9e5e186b6422eed6ce5aab | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/78992aa9ae6b1691c374873701d7c77445262d98 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/0af3e80d8be9db4c4e97b6cd9d90bd73b9c6d2ae | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/b1e0f0617bf1cf1e2e8e3732131eb17b06fbf449 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/9d306ab41666c88945982091404c1d7bfe1df9de | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/cb341041361d0901cb564594618f1e1cc734dc58 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/46daa2e92eaceda60d9916dd35d240d7692c4d96 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/52fd3cb7e5d11f476a9ccd192bf186d18147d74d | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/8cf2280a058136d1096eb140381a4afdd3369500 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/c03dce385b6b120851e59147d3189860a463174d | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/86a0815bb605d9ba3ec2d4cd8bb3c4b3a533da9a | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/75977d059e01d17012a84d96bdcce74c4fc8d9e3 | ORPH nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/a0786eeca53356adf3223fcfb5967ca0a93d99aa | arm | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/e1c07778116c5a1cb764f9a900b3d5ca312c88d7 | i686 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/efcdb62725ee6494d7925d07f3eb2e31693042a9 | riscv64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/56573730fa06e95a9bbce0c6501bdf27edbcb872 | armeb | zip-3.0 | NOK | http://autobuild.buildroot.net/results/a10b59d2c896e361d74611e07fb5f03efd93a09e | Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 1 poppler-22.10.0 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/49f02a7e56d269e20a6b637683ce3c88975be111 | xtensa | poppler-22.10.0 | NOK | http://autobuild.buildroot.net/results/ed27829893ba138098f70d409869e78a1cdaf186 | Classification of failures by reason for 2022.11.x -------------------------------------------------- python-numpy-1.23.4 | 3 xxhash-0.8.1 | 2 efivar-38 | 1 fdk-aac-2.0.2 | 1 frr-8.3.1 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 hawktracer-2ec19d7192334414... | 1 host-binutils-2.37 | 1 janus-gateway-1.0.3 | 1 libvorbis-1.3.7 | 1 lpc32xxcdl-2.11 | 1 lttng-modules-2.13.1 | 1 mender-3.4.0 | 1 qemu-7.1.0 | 1 rauc-1.8 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | efivar-38 | NOK | http://autobuild.buildroot.net/results/fc15df0450babf29414d7e0ffc99eff448a891fd | mipsel | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/b60c706ec3e45c61121ea5c43b96de9e7a203dff | arc | frr-8.3.1 | NOK | http://autobuild.buildroot.net/results/a282c5d458f1646d1180c159f79a11475ddf8a2e | arceb | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/e485cf1b4452d1b7d2d9ec799d2c3cc4db2176dd | powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/247e3c486c7b833545ba06623adb6fa2d2b2af49 | ORPH mips64el | hawktracer-2ec19d7192334414... | NOK | http://autobuild.buildroot.net/results/4f29df86fb21c6812960b44250e0a752c2848492 | mipsel | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/0863cdf354e9ba55a47b18c5560eb8327fcf965e | aarch64_be | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/bcfb4e5b59a53be237ac3a5060f47179d3040532 | powerpc | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/b21f42543575c82cb42a47f99530e04a626f4a9a | armeb | lpc32xxcdl-2.11 | NOK | http://autobuild.buildroot.net/results/c5b25a89447a078da003987c271346074412da12 | ORPH or1k | lttng-modules-2.13.1 | NOK | http://autobuild.buildroot.net/results/4c19083735070eb3c16f160ed1cb599a81c46a79 | s390x | mender-3.4.0 | NOK | http://autobuild.buildroot.net/results/6cb111afdbf1f711ba16af5403556b19a0c772f4 | aarch64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/4836b72161e14b73165ad8c1ba08d9c09ca621fb | aarch64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/a50f3eb6463e0ebc141f6f2c4e1f00cd7e5a1d3b | mipsel | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/ac0bd4f2c1c795c86a5757d5af08cda3fcf8fe07 | riscv32 | qemu-7.1.0 | NOK | http://autobuild.buildroot.net/results/d61681a1760ccef534d4a7c41e96cef3d89e9fad | powerpc | rauc-1.8 | NOK | http://autobuild.buildroot.net/results/da171c2a14700f21980f72a231986af966db20fc | armeb | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/f12e1cf38ab29f46be593cee365e55fef9d9227d | ORPH mipsel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/dbf3919a595e18415e658f34e3af56932b5129b3 | ORPH -- http://autobuild.buildroot.net From thomas at devoogdt.com Thu Feb 2 07:15:17 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 2 Feb 2023 08:15:17 +0100 Subject: [Buildroot] [PATCH] package/fluent-bit: add support for non glibc toolchain Message-ID: <20230202071518.3961314-1-thomas@devoogdt.com> From: Thomas Devoogdt - require threads and dynamic library support - require sync_4 support - provide fts.h trough musl-fts 'static_assert()' is not available if no C++ toolchain or no glibc is used, so add two patches to fix this Signed-off-by: Thomas Devoogdt --- .../0002-lib-c-ares-fixup-static_assert.patch | 56 +++++++++++++++++++ .../0003-lib-cfl-fixup-static_assert.patch | 33 +++++++++++ package/fluent-bit/Config.in | 10 +++- package/fluent-bit/fluent-bit.mk | 11 +++- 4 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch create mode 100644 package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch No idea if there is an interest in uClibc or musl-enabled toolchains regarding buildroot? I was able to compile fluent-bit for most of the supported platforms with a limited amount of changes. I had to create two patches in two libs. One (cfl) was already upstreamed, and added the link to it. The other (c-ares) should be fixed by the m4 bump. I guess that fluent-bit will bump those sub-libs over time, so we can drop these patches. arm-aarch64 [ 1/44]: OK bootlin-aarch64-glibc [ 2/44]: OK bootlin-arcle-hs38-uclibc [ 3/44]: OK bootlin-armv5-uclibc [ 4/44]: OK bootlin-armv7-glibc [ 5/44]: OK bootlin-armv7m-uclibc [ 6/44]: SKIPPED bootlin-armv7-musl [ 7/44]: OK bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED bootlin-m68k-68040-uclibc [ 9/44]: OK bootlin-microblazeel-uclibc [10/44]: OK bootlin-mipsel32r6-glibc [11/44]: OK bootlin-mipsel-uclibc [12/44]: OK bootlin-nios2-glibc [13/44]: OK bootlin-openrisc-uclibc [14/44]: OK bootlin-powerpc64le-power8-glibc [15/44]: OK bootlin-powerpc-e500mc-uclibc [16/44]: OK bootlin-riscv32-glibc [17/44]: OK bootlin-riscv64-glibc [18/44]: OK bootlin-riscv64-musl [19/44]: OK bootlin-sh4-uclibc [20/44]: OK bootlin-sparc64-glibc [21/44]: OK bootlin-sparc-uclibc [22/44]: SKIPPED bootlin-x86-64-glibc [23/44]: OK bootlin-x86-64-musl [24/44]: OK bootlin-x86-64-uclibc [25/44]: OK bootlin-xtensa-uclibc [26/44]: OK br-arm-basic [27/44]: OK br-arm-full-nothread [28/44]: SKIPPED br-arm-full-static [29/44]: SKIPPED br-i386-pentium4-full [30/44]: OK br-i386-pentium-mmx-musl [31/44]: OK br-mips64-n64-full [32/44]: OK br-mips64r6-el-hf-glibc [33/44]: OK br-powerpc-603e-basic-cpp [34/44]: OK br-powerpc64-power7-glibc [35/44]: OK linaro-aarch64-be [36/44]: OK linaro-aarch64 [37/44]: OK linaro-arm [38/44]: OK sourcery-arm-armv4t [39/44]: OK sourcery-arm [40/44]: OK sourcery-arm-thumb2 [41/44]: OK sourcery-mips64 [42/44]: OK sourcery-mips [43/44]: OK sourcery-nios2 [44/44]: OK 44 builds, 5 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed diff --git a/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch new file mode 100644 index 0000000000..de5d0d06a8 --- /dev/null +++ b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch @@ -0,0 +1,56 @@ +From aca354ae22c55fa6051d04a9f674fe0825443a94 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:26:56 +0100 +Subject: [PATCH] lib: c-ares: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/c-ares/c-ares/issues/504 + +Signed-off-by: Thomas Devoogdt +--- + lib/c-ares-1.18.1/configure | 4 ++++ + lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/lib/c-ares-1.18.1/configure b/lib/c-ares-1.18.1/configure +index 737f0a0dd..b99b7ed49 100755 +--- a/lib/c-ares-1.18.1/configure ++++ b/lib/c-ares-1.18.1/configure +@@ -6316,6 +6316,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +@@ -6393,6 +6395,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +diff --git a/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 b/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 +index 229de3091..fe4a11c67 100644 +--- a/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 ++++ b/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 +@@ -37,6 +37,9 @@ + #serial 9 + + m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ ++ ++#define static_assert _Static_assert ++ + template + struct check + { +-- +2.39.0 + diff --git a/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch b/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch new file mode 100644 index 0000000000..7b99a8e4de --- /dev/null +++ b/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch @@ -0,0 +1,33 @@ +From 8d17fc961fef2e88f4c8fa2316af925d5466ca4d Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:38:15 +0100 +Subject: [PATCH] lib: cfl: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 + +Signed-off-by: Thomas Devoogdt +--- + lib/cfl/lib/xxhash/xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/cfl/lib/xxhash/xxhash.h b/lib/cfl/lib/xxhash/xxhash.h +index 08ab79457..511c4d12b 100644 +--- a/lib/cfl/lib/xxhash/xxhash.h ++++ b/lib/cfl/lib/xxhash/xxhash.h +@@ -1546,8 +1546,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else +-- +2.39.0 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 6c2299e695..f53eacb447 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_FLUENT_BIT bool "fluent-bit" - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_STATIC_LIBS # dlfcn.h + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBYAML help @@ -29,5 +32,6 @@ config BR2_PACKAGE_FLUENT_BIT_WASM endif -comment "fluent-bit needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC +comment "fluent-bit needs a toolchain w/ threads, dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 6e9a33e02e..151afc34aa 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -47,12 +47,19 @@ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +FLUENT_BIT_DEPENDENCIES += musl-fts +FLUENT_BIT_LINKER_FLAGS += -lfts +endif + # Uses __atomic_compare_exchange_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS=-latomic +FLUENT_BIT_LINKER_FLAGS += -latomic endif +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LINKER_FLAGS)" + define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ $(TARGET_DIR)/etc/init.d/S99fluent-bit -- 2.39.0 From thomas at devoogdt.com Thu Feb 2 07:15:18 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 2 Feb 2023 08:15:18 +0100 Subject: [Buildroot] [PATCH] package/fluent-bit: add support for non glibc toolchain In-Reply-To: <20230202071518.3961314-1-thomas@devoogdt.com> References: <20230202071518.3961314-1-thomas@devoogdt.com> Message-ID: <20230202071518.3961314-2-thomas@devoogdt.com> From: Thomas Devoogdt - require threads and dynamic library support - require sync_4 support - provide fts.h trough musl-fts static_assert is not available if no C++ toolchain or no glibc is used, so add two patches to fix this Signed-off-by: Thomas Devoogdt --- .../0002-lib-c-ares-fixup-static_assert.patch | 56 +++++++++++++++++++ .../0003-lib-cfl-fixup-static_assert.patch | 33 +++++++++++ package/fluent-bit/Config.in | 10 +++- package/fluent-bit/fluent-bit.mk | 11 +++- 4 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch create mode 100644 package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch No idea if there is interrese arm-aarch64 [ 1/44]: OK bootlin-aarch64-glibc [ 2/44]: OK bootlin-arcle-hs38-uclibc [ 3/44]: OK bootlin-armv5-uclibc [ 4/44]: OK bootlin-armv7-glibc [ 5/44]: OK bootlin-armv7m-uclibc [ 6/44]: SKIPPED bootlin-armv7-musl [ 7/44]: OK bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED bootlin-m68k-68040-uclibc [ 9/44]: OK bootlin-microblazeel-uclibc [10/44]: OK bootlin-mipsel32r6-glibc [11/44]: OK bootlin-mipsel-uclibc [12/44]: OK bootlin-nios2-glibc [13/44]: OK bootlin-openrisc-uclibc [14/44]: OK bootlin-powerpc64le-power8-glibc [15/44]: OK bootlin-powerpc-e500mc-uclibc [16/44]: OK bootlin-riscv32-glibc [17/44]: OK bootlin-riscv64-glibc [18/44]: OK bootlin-riscv64-musl [19/44]: OK bootlin-sh4-uclibc [20/44]: OK bootlin-sparc64-glibc [21/44]: OK bootlin-sparc-uclibc [22/44]: SKIPPED bootlin-x86-64-glibc [23/44]: OK bootlin-x86-64-musl [24/44]: OK bootlin-x86-64-uclibc [25/44]: OK bootlin-xtensa-uclibc [26/44]: OK br-arm-basic [27/44]: OK br-arm-full-nothread [28/44]: SKIPPED br-arm-full-static [29/44]: SKIPPED br-i386-pentium4-full [30/44]: OK br-i386-pentium-mmx-musl [31/44]: OK br-mips64-n64-full [32/44]: OK br-mips64r6-el-hf-glibc [33/44]: OK br-powerpc-603e-basic-cpp [34/44]: OK br-powerpc64-power7-glibc [35/44]: OK linaro-aarch64-be [36/44]: OK linaro-aarch64 [37/44]: OK linaro-arm [38/44]: OK sourcery-arm-armv4t [39/44]: OK sourcery-arm [40/44]: OK sourcery-arm-thumb2 [41/44]: OK sourcery-mips64 [42/44]: OK sourcery-mips [43/44]: OK sourcery-nios2 [44/44]: OK 44 builds, 5 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed diff --git a/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch new file mode 100644 index 0000000000..de5d0d06a8 --- /dev/null +++ b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch @@ -0,0 +1,56 @@ +From aca354ae22c55fa6051d04a9f674fe0825443a94 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:26:56 +0100 +Subject: [PATCH] lib: c-ares: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/c-ares/c-ares/issues/504 + +Signed-off-by: Thomas Devoogdt +--- + lib/c-ares-1.18.1/configure | 4 ++++ + lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/lib/c-ares-1.18.1/configure b/lib/c-ares-1.18.1/configure +index 737f0a0dd..b99b7ed49 100755 +--- a/lib/c-ares-1.18.1/configure ++++ b/lib/c-ares-1.18.1/configure +@@ -6316,6 +6316,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +@@ -6393,6 +6395,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +diff --git a/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 b/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 +index 229de3091..fe4a11c67 100644 +--- a/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 ++++ b/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 +@@ -37,6 +37,9 @@ + #serial 9 + + m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ ++ ++#define static_assert _Static_assert ++ + template + struct check + { +-- +2.39.0 + diff --git a/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch b/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch new file mode 100644 index 0000000000..7b99a8e4de --- /dev/null +++ b/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch @@ -0,0 +1,33 @@ +From 8d17fc961fef2e88f4c8fa2316af925d5466ca4d Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:38:15 +0100 +Subject: [PATCH] lib: cfl: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 + +Signed-off-by: Thomas Devoogdt +--- + lib/cfl/lib/xxhash/xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/cfl/lib/xxhash/xxhash.h b/lib/cfl/lib/xxhash/xxhash.h +index 08ab79457..511c4d12b 100644 +--- a/lib/cfl/lib/xxhash/xxhash.h ++++ b/lib/cfl/lib/xxhash/xxhash.h +@@ -1546,8 +1546,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else +-- +2.39.0 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 6c2299e695..f53eacb447 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_FLUENT_BIT bool "fluent-bit" - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_STATIC_LIBS # dlfcn.h + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBYAML help @@ -29,5 +32,6 @@ config BR2_PACKAGE_FLUENT_BIT_WASM endif -comment "fluent-bit needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC +comment "fluent-bit needs a toolchain w/ threads, dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 6e9a33e02e..151afc34aa 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -47,12 +47,19 @@ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +FLUENT_BIT_DEPENDENCIES += musl-fts +FLUENT_BIT_LINKER_FLAGS += -lfts +endif + # Uses __atomic_compare_exchange_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS=-latomic +FLUENT_BIT_LINKER_FLAGS += -latomic endif +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LINKER_FLAGS)" + define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ $(TARGET_DIR)/etc/init.d/S99fluent-bit -- 2.39.0 From luca.ceresoli at bootlin.com Thu Feb 2 08:21:20 2023 From: luca.ceresoli at bootlin.com (Luca Ceresoli) Date: Thu, 2 Feb 2023 09:21:20 +0100 Subject: [Buildroot] [PATCH 1/1] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. In-Reply-To: References: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> <20230201225237.0fb5dacb@booty> Message-ID: <20230202092120.319d6b00@booty> Hi Graeme, On Wed, 1 Feb 2023 14:16:47 -0800 Graeme Smecher wrote: > Hi Luca, > > On 2023-02-01 13:52, Luca Ceresoli wrote: > > Hi Graeme, > > > > On Wed, 1 Feb 2023 11:59:56 -0800 > > Graeme Smecher wrote: > > > >> If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > >> buildroot into the linux tree, these .dts files are copied to > >> arch/arm64/boot. Unfortunately, the post-image.sh script expects to find > >> them in arch/arm64/boot/xilinx. > >> > >> This patch does not require the xilinx/ prefix to be present when > >> symlinking the device-tree to system.dtb where u-boot expects to find > >> it. > >> > >> Signed-off-by: Graeme Smecher > >> --- > >> board/zynqmp/post-image.sh | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh > >> index ed6dbe188c..c5de2db820 100755 > >> --- a/board/zynqmp/post-image.sh > >> +++ b/board/zynqmp/post-image.sh > >> @@ -5,7 +5,7 @@ > >> # devicetree listed in the config. > >> > >> FIRST_DT=$(sed -nr \ > >> - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > >> + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ > > > > I think the following simpler change would also work. Can you check > > that please? > > > > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > > + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\2|p' \ > > Assuming you intended \1, not \2 here - this suggestion breaks behaviour for a couple of defconfigs in the tree. If I run the ZCU106 defconfig through this regexp, I get: > > $ cat configs/zynqmp_zcu106_defconfig | sed -nr -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\1|p' > xilinx/zynqmp-zcu106-revA > > ...this creates a dangling symlink in output/images (system.dtb -> xilinx/zynqmp-zcu106-revA.dtb). Right. > The right behaviour is to strip any prefixes that exist, without requiring any. Something like: > > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(.*/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ > > This is less Xilinx-specific, although it seems a tad greedy. Yes, better keeping the xilinx prefix as this is a xilinx-specific script anyway. Reviewed-by: Luca Ceresoli -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From christian at paral.in Thu Feb 2 08:49:50 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 00:49:50 -0800 Subject: [Buildroot] Go 1.20 changes required in Buildroot In-Reply-To: References: Message-ID: Hi all, Go 1.20 includes a change which breaks our build infra for go in Buildroot: https://go.dev/doc/go1.20#bootstrap The minimum required version of go-bootstrap is now go 1.17.13 or later. Otherwise the build fails with this error: building_Go_requires_Go_1_17_13_or_later As Go 1.4 was the previous version that could be compiled with C, there is now no way to bootstrap go with a C compiler. ... unless a process like this is used: - build host-go-bootstrap-1.4-20170531 - build host-go-bootstrap-1.19.5 with go1.4-bootstrap - build host-go-1.20 with host-go-bootstrap-1.19.5 ... which could be viable for Buildroot, at least for now. Previous discussion on this: https://lore.kernel.org/all/20220525234312.643dfc03 at windsurf/T/ An existing patch is still Pending Review which fixes a separate but related issue: we cannot build go-bootstrap-1.4 on arm64. The proposed fix above would still not work correctly on arm64. That patch linked above fixes this issue by using a Go compiler installed on the host machine (/usr/bin/go) to bootstrap host-go in that case. I'll send a patch soon which upgrades to go1.20 using the above 3-stage bootstrap process. It's not pretty, but it will work for now. A potentially cleaner solution would be to bootstrap with gccgo, or depend on the host Go binaries to bootstrap (as linked above), or to download pre-compiled binaries to bootstrap. Best regards, Christian Stewart ---------- Forwarded message --------- From: 'Michael Knyszek' via golang-nuts Date: Wed, Feb 1, 2023 at 11:36 AM Subject: [go-nuts] Go 1.20 is released To: Cc: golang-dev , golang-nuts Hello gophers, We have just released Go 1.20. To find out what has changed in Go 1.20, read the release notes: https://go.dev/doc/go1.20 You can download binary and source distributions from our download page: https://go.dev/dl/#go1.20 If you have Go installed already, an easy way to try go1.20 is by using the go command: $ go install golang.org/dl/go1.20 at latest $ go1.20 download To compile from source using a Git clone, update to the release with git checkout go1.20 and build as usual. Thanks to everyone who contributed to the release! Cheers, Michael, Matthew, and Dmitri for the Go team From christian at paral.in Thu Feb 2 10:55:43 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 02:55:43 -0800 Subject: [Buildroot] [PATCH v1 2/3] package/go: bump to version 1.20 In-Reply-To: <20230202105544.315452-1-christian@paral.in> References: <20230202105544.315452-1-christian@paral.in> Message-ID: <20230202105544.315452-2-christian@paral.in> The latest Go release, version 1.20, arrives six months after Go 1.19. Most of its changes are in the implementation of the toolchain, runtime, and libraries. https://go.dev/doc/go1.20 Signed-off-by: Christian Stewart --- ...03-runtime-support-riscv64-SV57-mode.patch | 65 ------------------- package/go/Config.in.host | 2 +- package/go/go.hash | 2 +- package/go/go.mk | 4 +- 4 files changed, 4 insertions(+), 69 deletions(-) delete mode 100644 package/go/0003-runtime-support-riscv64-SV57-mode.patch diff --git a/package/go/0003-runtime-support-riscv64-SV57-mode.patch b/package/go/0003-runtime-support-riscv64-SV57-mode.patch deleted file mode 100644 index f51c2ca093..0000000000 --- a/package/go/0003-runtime-support-riscv64-SV57-mode.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6618c7af436488fa12018cdcd31eeedb3a698745 Mon Sep 17 00:00:00 2001 -From: Dmitry Vyukov -Date: Fri, 27 May 2022 18:55:35 +0200 -Subject: [PATCH] runtime: support riscv64 SV57 mode - -Riscv64 has SV57 mode when user-space VA is 56 bits. -Linux kernel recently got support for this mode and Go binaries started crashing as: - -runtime: lfstack.push invalid packing: node=0xffffff5908a940 cnt=0x1 -packed=0xffff5908a9400001 -> node=0xffff5908a940 - -Adjust lfstack code to use only 8 top bits of pointers on riscv64. - -For context see: -https://groups.google.com/g/syzkaller-bugs/c/lU0GQTZoNQQ/m/O_c3vmE3AAAJ - -Update #54104 - -Change-Id: Ib5d3d6a79c0c6eddf11618d73fcc8bc1832a9c25 -Signed-off-by: Christian Stewart ---- - -Upstream: https://go-review.googlesource.com/c/go/+/409055/4 ---- - src/runtime/lfstack_64bit.go | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/runtime/lfstack_64bit.go b/src/runtime/lfstack_64bit.go -index 154130cf63..39fa647b9e 100644 ---- a/src/runtime/lfstack_64bit.go -+++ b/src/runtime/lfstack_64bit.go -@@ -36,12 +36,21 @@ const ( - // We use one bit to distinguish between the two ranges. - aixAddrBits = 57 - aixCntBits = 64 - aixAddrBits + 3 -+ -+ // Riscv64 SV57 mode gives 56 bits of userspace VA. -+ // lfstack code supports it, but broader support for SV57 mode is incomplete, -+ // and there may be other issues (see #54104). -+ riscv64AddrBits = 56 -+ riscv64CntBits = 64 - riscv64AddrBits + 3 - ) - - func lfstackPack(node *lfnode, cnt uintptr) uint64 { - if GOARCH == "ppc64" && GOOS == "aix" { - return uint64(uintptr(unsafe.Pointer(node)))<<(64-aixAddrBits) | uint64(cnt&(1<> aixCntBits << 3) | 0xa<<56))) - } -+ if GOARCH == "riscv64" { -+ return (*lfnode)(unsafe.Pointer(uintptr(val >> riscv64CntBits << 3))) -+ } - return (*lfnode)(unsafe.Pointer(uintptr(val >> cntBits << 3))) - } --- -2.35.1 - diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 43cb62309d..b87b862cec 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,9 +2,9 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS # See https://go.dev/doc/install/source#environment # See src/go/build/syslist.go for the list of supported architectures - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ || BR2_mips64 || BR2_mips64el || BR2_riscv || BR2_s390x diff --git a/package/go/go.hash b/package/go/go.hash index 4c22f0f274..204e508fc3 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 3a29ff0421beaf6329292b8a46311c9fbf06c800077ceddef5fb7f8d5b1ace33 go1.20.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index b0dd002712..18d3a80212 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.5 +GO_VERSION = 1.20 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -151,7 +151,7 @@ define HOST_GO_INSTALL_CMDS cp -a $(@D)/lib $(HOST_GO_ROOT)/ mkdir -p $(HOST_GO_ROOT)/pkg - cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ + cp -a $(@D)/pkg/include $(HOST_GO_ROOT)/pkg/ cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ # https://golang.org/issue/2775 -- 2.39.1 From christian at paral.in Thu Feb 2 10:55:42 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 02:55:42 -0800 Subject: [Buildroot] [PATCH v1 1/3] package/go-bootstrap: split into two stages: go1.4 and go1.19.5 Message-ID: <20230202105544.315452-1-christian@paral.in> Go 1.20 will require a minimum version of go 1.17.13 to bootstrap. https://go.dev/doc/go1.20#bootstrap As Go 1.4 was the previous version that could be compiled with C, there is now no way to bootstrap go with a C compiler, unless we use a two-stage bootstrap: - build host-go-bootstrap-1.4-20170531 - build host-go-bootstrap-1.19.5 with host-go-bootstrap-1.4-20170531 - build host-go-1.20 with host-go-bootstrap-1.19.5 This is implemented in this commit first, before upgrading host-go to 1.20. Note: the .patch files from package/go version 1.19.x are not necessary for package/go-bootstrap-stage2 and have not been included there. Discussion of possible alternate approaches for future use: https://lore.kernel.org/all/CA+h8R2rtcynkCBsz=_9yANOEguyPCOcQDj8_ns+cv8RS8+8t9A at mail.gmail.com/ https://lore.kernel.org/all/20220525234312.643dfc03 at windsurf/T/ Signed-off-by: Christian Stewart --- DEVELOPERS | 2 + package/Config.in.host | 3 +- package/go-bootstrap-stage1/Config.in.host | 6 ++ .../go-bootstrap-stage1.hash} | 0 .../go-bootstrap-stage1.mk | 46 +++++++++++++++ package/go-bootstrap-stage2/Config.in.host | 4 ++ .../go-bootstrap-stage2.hash | 3 + .../go-bootstrap-stage2.mk | 56 +++++++++++++++++++ package/go-bootstrap/Config.in.host | 7 --- package/go-bootstrap/go-bootstrap.mk | 50 ----------------- package/go/Config.in.host | 6 +- package/go/go.mk | 9 ++- 12 files changed, 127 insertions(+), 65 deletions(-) create mode 100644 package/go-bootstrap-stage1/Config.in.host rename package/{go-bootstrap/go-bootstrap.hash => go-bootstrap-stage1/go-bootstrap-stage1.hash} (100%) create mode 100644 package/go-bootstrap-stage1/go-bootstrap-stage1.mk create mode 100644 package/go-bootstrap-stage2/Config.in.host create mode 100644 package/go-bootstrap-stage2/go-bootstrap-stage2.hash create mode 100644 package/go-bootstrap-stage2/go-bootstrap-stage2.mk delete mode 100644 package/go-bootstrap/Config.in.host delete mode 100644 package/go-bootstrap/go-bootstrap.mk diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577..16119b008a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -549,6 +549,8 @@ F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ +F: package/go-bootstrap-stage1/ +F: package/go-bootstrap-stage2/ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ diff --git a/package/Config.in.host b/package/Config.in.host index b76bea60d0..6374547b39 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -39,7 +39,8 @@ menu "Host utilities" source "package/genpart/Config.in.host" source "package/gnupg/Config.in.host" source "package/go/Config.in.host" - source "package/go-bootstrap/Config.in.host" + source "package/go-bootstrap-stage1/Config.in.host" + source "package/go-bootstrap-stage2/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imagemagick/Config.in.host" diff --git a/package/go-bootstrap-stage1/Config.in.host b/package/go-bootstrap-stage1/Config.in.host new file mode 100644 index 0000000000..56a743caf9 --- /dev/null +++ b/package/go-bootstrap-stage1/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS + bool + # See src/cmd/dist/unix.c for the list of supported architectures + default y if BR2_HOSTARCH = "x86" + default y if BR2_HOSTARCH = "x86_64" + default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.hash b/package/go-bootstrap-stage1/go-bootstrap-stage1.hash similarity index 100% rename from package/go-bootstrap/go-bootstrap.hash rename to package/go-bootstrap-stage1/go-bootstrap-stage1.hash diff --git a/package/go-bootstrap-stage1/go-bootstrap-stage1.mk b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk new file mode 100644 index 0000000000..77e7046cd7 --- /dev/null +++ b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# go-bootstrap-stage1 +# +################################################################################ + +# Use last C-based Go compiler: v1.4.x +# See https://golang.org/doc/install/source#bootstrapFromSource +GO_BOOTSTRAP_STAGE1_VERSION = 1.4-bootstrap-20171003 +GO_BOOTSTRAP_STAGE1_SITE = https://dl.google.com/go +GO_BOOTSTRAP_STAGE1_SOURCE = go$(GO_BOOTSTRAP_STAGE1_VERSION).tar.gz + +GO_BOOTSTRAP_STAGE1_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE1_LICENSE_FILES = LICENSE + +# The toolchain is needed for HOSTCC_NOCACHE used to compile the Go compiler. +HOST_GO_BOOTSTRAP_STAGE1_DEPENDENCIES = toolchain + +HOST_GO_BOOTSTRAP_STAGE1_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE1_VERSION) + +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV = \ + GOOS=linux \ + GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_STAGE1_ROOT)" \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + CC=$(HOSTCC_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE1_BUILD_CMDS + cd $(@D)/src && $(HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV) ./make.bash +endef + +define HOST_GO_BOOTSTRAP_STAGE1_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + + # https://golang.org/issue/2775 + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap-stage2/Config.in.host b/package/go-bootstrap-stage2/Config.in.host new file mode 100644 index 0000000000..967ddaed1d --- /dev/null +++ b/package/go-bootstrap-stage2/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash new file mode 100644 index 0000000000..4c22f0f274 --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash @@ -0,0 +1,3 @@ +# From https://go.dev/dl +sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk new file mode 100644 index 0000000000..da2e1f4f46 --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -0,0 +1,56 @@ +################################################################################ +# +# go-bootstrap-stage2 +# +################################################################################ + +GO_BOOTSTRAP_STAGE2_VERSION = 1.19.5 +GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang +GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz + +GO_BOOTSTRAP_STAGE2_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE2_LICENSE_FILES = LICENSE + +# Use go-bootstrap-stage1 to bootstrap. +HOST_GO_BOOTSTRAP_STAGE2_DEPENDENCIES = host-go-bootstrap-stage1 +HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_BOOTSTRAP_ROOT) + +HOST_GO_BOOTSTRAP_STAGE2_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE2_VERSION) + +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV = \ + GO111MODULE=off \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE1_ROOT) \ + GOROOT_FINAL=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + GOOS=linux \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE2_BUILD_CMDS + cd $(@D)/src && \ + $(HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) +endef + +define HOST_GO_BOOTSTRAP_STAGE2_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ + + mkdir -p $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg + cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + cp -a $(@D)/pkg/tool $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + + # https://golang.org/issue/2775 + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ + + # Set all file timestamps to prevent the go compiler from rebuilding any + # built in packages when programs are built. + find $(HOST_GO_BOOTSTRAP_STAGE2_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap/Config.in.host b/package/go-bootstrap/Config.in.host deleted file mode 100644 index fab80d24b4..0000000000 --- a/package/go-bootstrap/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS - bool - # See src/cmd/dist/unix.c for the list of support - # architectures - default y if BR2_HOSTARCH = "x86" - default y if BR2_HOSTARCH = "x86_64" - default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.mk b/package/go-bootstrap/go-bootstrap.mk deleted file mode 100644 index 71696a1540..0000000000 --- a/package/go-bootstrap/go-bootstrap.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# go-bootstrap -# -################################################################################ - -# Use last C-based Go compiler: v1.4.x -# See https://golang.org/doc/install/source#bootstrapFromSource -GO_BOOTSTRAP_VERSION = 1.4-bootstrap-20171003 -GO_BOOTSTRAP_SITE = https://dl.google.com/go -GO_BOOTSTRAP_SOURCE = go$(GO_BOOTSTRAP_VERSION).tar.gz - -GO_BOOTSTRAP_LICENSE = BSD-3-Clause -GO_BOOTSTRAP_LICENSE_FILES = LICENSE - -# To build programs that need cgo support the toolchain needs to be -# available, so the toolchain is not needed to build host-go-bootstrap -# itself, but needed by other packages that depend on -# host-go-bootstrap. -HOST_GO_BOOTSTRAP_DEPENDENCIES = toolchain - -HOST_GO_BOOTSTRAP_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_VERSION) - -# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE -# here. See https://github.com/golang/go/issues/11685. -HOST_GO_BOOTSTRAP_MAKE_ENV = \ - GOOS=linux \ - GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_ROOT)" \ - GOROOT="$(@D)" \ - GOBIN="$(@D)/bin" \ - CC=$(HOSTCC_NOCCACHE) \ - CGO_ENABLED=0 - -define HOST_GO_BOOTSTRAP_BUILD_CMDS - cd $(@D)/src && $(HOST_GO_BOOTSTRAP_MAKE_ENV) ./make.bash -endef - -define HOST_GO_BOOTSTRAP_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_ROOT)/bin/go - $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_ROOT)/bin/gofmt - - cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_ROOT)/ - cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_ROOT)/ - - # There is a known issue which requires the go sources to be installed - # https://golang.org/issue/2775 - cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_ROOT)/ -endef - -$(eval $(host-generic-package)) diff --git a/package/go/Config.in.host b/package/go/Config.in.host index ded02d3b3a..43cb62309d 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,7 +2,9 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + # See https://go.dev/doc/install/source#environment + # See src/go/build/syslist.go for the list of supported architectures + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ || BR2_mips64 || BR2_mips64el || BR2_riscv || BR2_s390x @@ -28,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go/go.mk b/package/go/go.mk index c38ae0b99c..b0dd002712 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -12,7 +12,7 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap +HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -121,12 +121,12 @@ HOST_GO_HOST_ENV = \ CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \ CGO_LDFLAGS="$(HOST_LDFLAGS)" -# The go build system is not compatible with ccache, so use -# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_ROOT) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -154,7 +154,6 @@ define HOST_GO_INSTALL_CMDS cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ - # There is a known issue which requires the go sources to be installed # https://golang.org/issue/2775 cp -a $(@D)/src $(HOST_GO_ROOT)/ -- 2.39.1 From christian at paral.in Thu Feb 2 10:55:44 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 02:55:44 -0800 Subject: [Buildroot] [PATCH v1 3/3] package/go: use host compiler when go-bootstrap unsupported In-Reply-To: <20230202105544.315452-1-christian@paral.in> References: <20230202105544.315452-1-christian@paral.in> Message-ID: <20230202105544.315452-3-christian@paral.in> All Go compiler versions > 1.4.x (old) are written in Go, and require a existing compiled Go version to use to build from source. https://golang.org/doc/install/source#bootstrapFromSource The process for "bootstrapping" the Go compiler in Buildroot is: 1. Compile a C/C++ cross-compiler (gcc) as the host toolchain. 2. Build go-bootstrap-stage1 (which is Go 1.4.x and written in C) 3. Build go-bootstrap-stage2 (which is Go 1.19.x and written in Go) 3. Build go 1.20 (written in Go) using go-bootstrap-stage2. go-bootstrap-stage1 does not work on 64-bit arm. The Go 1.4.x bootstrap compiler is compatible with x86, x86_64, and arm (32 bit) only. This patch adds a fallback to require a host Go compiler to build host-go when BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS is not set. Signed-off-by: Christian Stewart --- v1 -> v2: - thanks Thomas for the review & suggestions - added NEEDS_HOST_GO boolean - added dependency checks to support/dependencies/dependencies.sh - removed unnecessary changes to go-bootstrap package v2 -> v3: - add dependency on toolchain if Cgo is enabled v3 -> v4: - updates for go1.20 - updates for go-bootstrap-stage{1,2} Signed-off-by: Christian Stewart --- Config.in | 4 ++++ package/go-bootstrap-stage2/go-bootstrap-stage2.mk | 2 +- package/go/Config.in.host | 2 +- package/go/go.mk | 14 ++++++++++++-- support/dependencies/dependencies.sh | 4 ++++ 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Config.in b/Config.in index 86699f58c6..c53757f671 100644 --- a/Config.in +++ b/Config.in @@ -58,6 +58,10 @@ config BR2_HOST_GCC_AT_LEAST_9 # When adding new entries above, be sure to update # the HOSTCC_MAX_VERSION variable in the Makefile. +# Hidden boolean selected if bootstrapping Go w/ GCC is not supported. +config BR2_NEEDS_HOST_GO + bool + # Hidden boolean selected by packages in need of Java in order to build # (example: kodi) config BR2_NEEDS_HOST_JAVA diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk index da2e1f4f46..421342ee02 100644 --- a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -13,7 +13,7 @@ GO_BOOTSTRAP_STAGE2_LICENSE_FILES = LICENSE # Use go-bootstrap-stage1 to bootstrap. HOST_GO_BOOTSTRAP_STAGE2_DEPENDENCIES = host-go-bootstrap-stage1 -HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_BOOTSTRAP_ROOT) +HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_BOOTSTRAP_ROOT) HOST_GO_BOOTSTRAP_STAGE2_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE2_VERSION) diff --git a/package/go/Config.in.host b/package/go/Config.in.host index b87b862cec..7f049ff1ae 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -30,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + select BR2_NEEDS_HOST_GO if !BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go/go.mk b/package/go/go.mk index 18d3a80212..9dcc9321f9 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -12,7 +12,6 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -109,6 +108,11 @@ else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS HOST_GO_CGO_ENABLED = 1 endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +ifeq ($(HOST_GO_CGO_ENABLED),1) +# For cgo support the toolchain needs to be available. +HOST_GO_DEPENDENCIES += toolchain +endif + # For the convenience of host golang packages HOST_GO_HOST_ENV = \ $(HOST_GO_COMMON_ENV) \ @@ -126,7 +130,6 @@ HOST_GO_HOST_ENV = \ HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -136,6 +139,13 @@ HOST_GO_MAKE_ENV = \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ $(HOST_GO_CROSS_ENV) +# Use the Go compiler bootstrapped by Buildroot if available. +# Otherwise, use the host Go compiler. +ifeq ($(BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS),y) +HOST_GO_DEPENDENCIES += host-go-bootstrap-stage2 +HOST_GO_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) +endif + define HOST_GO_BUILD_CMDS cd $(@D)/src && \ $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 4b5012b807..89a8f6adc0 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -207,6 +207,10 @@ if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then fi fi +if grep -q ^BR2_NEEDS_HOST_GO=y $BR2_CONFIG ; then + check_prog_host "go" +fi + if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then check_prog_host "java" JAVA_GCJ=$(java -version 2>&1 | grep gcj) -- 2.39.1 From luca.ceresoli at bootlin.com Thu Feb 2 11:29:43 2023 From: luca.ceresoli at bootlin.com (Luca Ceresoli) Date: Thu, 2 Feb 2023 12:29:43 +0100 Subject: [Buildroot] [PATCH 5/7] configs/olimex_a20_olinuxino_micro_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 In-Reply-To: <20230201223241.3867678-6-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> <20230201223241.3867678-6-giulio.benetti@benettiengineering.com> Message-ID: <20230202122943.3c2851d7@booty> Hi Giulio, On Wed, 1 Feb 2023 23:32:39 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Thanks, this was a good opportunity to remove the dust from my Mini and power it on once again! For this patch: Tested-by: Luca Ceresoli For the whole series: Reviewed-by: Luca Ceresoli -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From christian at paral.in Thu Feb 2 13:08:37 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:08:37 -0800 Subject: [Buildroot] [PATCH v1 1/3] package/go-bootstrap: split into two stages: go1.4 and go1.19.5 In-Reply-To: <20230202105544.315452-1-christian@paral.in> References: <20230202105544.315452-1-christian@paral.in> Message-ID: Hi all, On Thu, Feb 2, 2023 at 2:55 AM Christian Stewart wrote: > +# Use go-bootstrap-stage1 to bootstrap. > +HOST_GO_BOOTSTRAP_STAGE2_DEPENDENCIES = host-go-bootstrap-stage1 > +HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_BOOTSTRAP_ROOT) This HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV += line should be dropped (it's overwritten below in the file). Thanks, Christian Stewart From christian at paral.in Thu Feb 2 13:13:52 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:13:52 -0800 Subject: [Buildroot] [PATCH v1 1/3] package/docker-engine: bump version to v23.0.0 Message-ID: <20230202131354.1193243-1-christian@paral.in> This update requires a workaround for the non-standard vendor/ structure in the docker-engine repository, which has an invalid vendor/modules.txt file. Removing the vendor/modules.txt file fixes the build error. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 The go download post-process script uses go mod init to create the go.mod file which specifies a language version of go1.16 on default. Use go mod edit to adjust the go.mod file to the required minimum version go1.19 for generic types. https://github.com/moby/moby/releases/tag/v23.0.0 Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d15b1359cb..670cbd414b 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 2a9b72ca78..9c193a29a5 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.22 +DOCKER_ENGINE_VERSION = 23.0.0 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -62,6 +62,19 @@ else DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs endif +# update the go module version to go1.19 +# docker-engine does not use go modules +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_ENGINE_CONFIGURE_CMDS + if [ -f $(@D)/vendor/modules.txt ]; then \ + rm $(@D)/vendor/modules.txt; \ + fi + cd $(@D); \ + $(HOST_GO_HOST_ENV) $(DOCKER_ENGINE_GO_ENV) \ + $(GO_BIN) mod edit -go=1.19 go.mod +endef + DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD -- 2.39.1 From christian at paral.in Thu Feb 2 13:13:53 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:13:53 -0800 Subject: [Buildroot] [PATCH v1 2/3] package/docker-proxy: drop package In-Reply-To: <20230202131354.1193243-1-christian@paral.in> References: <20230202131354.1193243-1-christian@paral.in> Message-ID: <20230202131354.1193243-2-christian@paral.in> The docker-proxy binary (libnetwork) has been merged into the docker-engine source (moby). Drop the docker-proxy package and add cmd/docker-proxy as a build target of docker-engine instead. https://github.com/moby/libnetwork/commit/563fe8e248f3afac75a270f693f38bdc3eea7bf3 Signed-off-by: Christian Stewart --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/docker-engine/Config.in | 1 - package/docker-engine/docker-engine.mk | 2 +- package/docker-proxy/Config.in | 19 ------------------- package/docker-proxy/docker-proxy.hash | 3 --- package/docker-proxy/docker-proxy.mk | 21 --------------------- 8 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 package/docker-proxy/Config.in delete mode 100644 package/docker-proxy/docker-proxy.hash delete mode 100644 package/docker-proxy/docker-proxy.mk diff --git a/Config.in.legacy b/Config.in.legacy index 41c5fdefb3..75099f4404 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy removed" + select BR2_LEGACY + select BR2_PACKAGE_DOCKER_ENGINE + help + docker-proxy has been dropped by upstream since version + 563fe8. it has been merged into docker-engine (moby). + config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 bool "imx-gpu-viv X11 output has been removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577..7d4f9aa6fe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -545,7 +545,6 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-compose/ F: package/docker-engine/ -F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ diff --git a/package/Config.in b/package/Config.in index 83fddf316f..dc460ca852 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2615,7 +2615,6 @@ menu "System tools" source "package/docker-cli/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" - source "package/docker-proxy/Config.in" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 1f0efb8fcc..b5a356eab9 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_USE_MMU # containerd select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency - select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency help Docker is a platform to build, ship, diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 9c193a29a5..2ea2f0a45d 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -24,7 +24,7 @@ DOCKER_ENGINE_LDFLAGS = \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs -DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_ENGINE_DEPENDENCIES += libapparmor diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in deleted file mode 100644 index 7e40536537..0000000000 --- a/package/docker-proxy/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_DOCKER_PROXY - bool "docker-proxy" - 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 - help - Libnetwork is a Container Network Model that provides a - consistent programming interface and the required network - abstractions for applications. - - This package provides docker-proxy, a run-time dependency of - Docker. - - https://github.com/docker/libnetwork - -comment "docker-proxy needs a 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_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash deleted file mode 100644 index 63296f14c1..0000000000 --- a/package/docker-proxy/docker-proxy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 05bf95637bae134d12d02bd7a7854cd0c768e6fccb662c2c64523f05b997b204 docker-proxy-f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk deleted file mode 100644 index fe7982e8f6..0000000000 --- a/package/docker-proxy/docker-proxy.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# docker-proxy -# -################################################################################ - -DOCKER_PROXY_VERSION = f6ccccb1c082a432c2a5814aaedaca56af33d9ea -DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) - -DOCKER_PROXY_LICENSE = Apache-2.0 -DOCKER_PROXY_LICENSE_FILES = LICENSE - -DOCKER_PROXY_DEPENDENCIES = host-pkgconf - -DOCKER_PROXY_BUILD_TARGETS = cmd/proxy - -define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy -endef - -$(eval $(golang-package)) -- 2.39.1 From christian at paral.in Thu Feb 2 13:13:54 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:13:54 -0800 Subject: [Buildroot] [PATCH v1 3/3] package/docker-cli: bump version to v23.0.0 In-Reply-To: <20230202131354.1193243-1-christian@paral.in> References: <20230202131354.1193243-1-christian@paral.in> Message-ID: <20230202131354.1193243-3-christian@paral.in> This update requires a workaround for the non-standard vendor/ structure in the docker-engine repository, which has an invalid vendor/modules.txt file. Removing the vendor/modules.txt file fixes the build error. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 The go download post-process script uses go mod init to create the go.mod file which specifies a language version of go1.16 on default. Use go mod edit to adjust the go.mod file to the required minimum version go1.19 for generic types. https://github.com/moby/moby/releases/tag/v23.0.0 Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.hash | 3 ++- package/docker-cli/docker-cli.mk | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index c6db95f9b3..253efd4001 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz +# Locally calculated +sha256 3379d06cd6177832b91f4796c680b6bf15c7895773448716b4c3c5253f611d1b docker-cli-23.0.0.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index cb44c68c1b..3b155b5675 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.22 +DOCKER_CLI_VERSION = 23.0.0 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 @@ -29,6 +29,19 @@ DOCKER_CLI_TAGS += osusergo netgo DOCKER_CLI_GO_ENV = CGO_ENABLED=no endif +# update the go module version to go1.19 +# docker-cli does not use go modules +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_CONFIGURE_CMDS + if [ -f $(@D)/vendor/modules.txt ]; then \ + rm $(@D)/vendor/modules.txt; \ + fi + cd $(@D); \ + $(HOST_GO_HOST_ENV) $(DOCKER_CLI_GO_ENV) \ + $(GO_BIN) mod edit -go=1.19 go.mod +endef + DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) $(eval $(golang-package)) -- 2.39.1 From christian at paral.in Thu Feb 2 13:26:50 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:26:50 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/balena-engine: bump to version 20.10.26 Message-ID: <20230202132650.1537778-1-christian@paral.in> This update requires a workaround for the non-standard vendor/ structure in the balena-engine repository, which has an invalid vendor/modules.txt file. Removing the vendor/modules.txt file fixes the build error. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 The go download post-process script uses go mod init to create the go.mod file which specifies a language version of go1.16 on default. Use go mod edit to adjust the go.mod file to the required minimum version go1.19 for generic types used by docker-engine. (Fixes a build error). Remove the vendor/archive sub-tree (fixes a build error) because Go no longer allows having duplicate packages in GOPATH and GOROOT. vendor/archive/tar cannot be in vendor/ because it exists in the standard library. Remove it from vendor/. https://github.com/balena-os/balena-engine/releases/tag/v20.10.26 Signed-off-by: Christian Stewart --- package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 4adb8ce561..6a92a40cc8 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz +sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index ecfb62bfbf..3b8b2f9ac6 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 20.10.21 +BALENA_ENGINE_VERSION = 20.10.26 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 @@ -34,6 +34,18 @@ BALENA_ENGINE_TAGS = \ BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine +# remove the conflicting vendor/modules.txt +# remove the conflicting vendor/archive (not allowed in go1.20) +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define BALENA_ENGINE_CONFIGURE_CMDS + if [ -f $(@D)/vendor/modules.txt ]; then \ + rm $(@D)/vendor/modules.txt; \ + fi + if [ -d $(@D)/vendor/archive ]; then \ + rm -rf $(@D)/vendor/archive; \ + fi +endef + ifeq ($(BR2_INIT_SYSTEMD),y) BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald -- 2.39.1 From christian at paral.in Thu Feb 2 13:31:51 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:31:51 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/cni-plugins: bump version to 1.2.0 Message-ID: <20230202133151.1671576-1-christian@paral.in> Adds new device driver main/dummy and various bug fixes/cleanups. https://github.com/containernetworking/plugins/releases/tag/v1.2.0 Signed-off-by: Christian Stewart --- package/cni-plugins/cni-plugins.hash | 2 +- package/cni-plugins/cni-plugins.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/cni-plugins/cni-plugins.hash b/package/cni-plugins/cni-plugins.hash index fc3b5a7ead..0c3e07c91c 100644 --- a/package/cni-plugins/cni-plugins.hash +++ b/package/cni-plugins/cni-plugins.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c86c44877c47f69cd23611e22029ab26b613f620195b76b3ec20f589367a7962 cni-plugins-1.1.1.tar.gz +sha256 f3496ddda9c7770a0b695b67ae7ee80a4ee331ac2745af4830054b81627f79b7 cni-plugins-1.2.0.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/cni-plugins/cni-plugins.mk b/package/cni-plugins/cni-plugins.mk index b30937095a..be02c2ff45 100644 --- a/package/cni-plugins/cni-plugins.mk +++ b/package/cni-plugins/cni-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_VERSION = 1.1.1 +CNI_PLUGINS_VERSION = 1.2.0 CNI_PLUGINS_SITE = $(call github,containernetworking,plugins,v$(CNI_PLUGINS_VERSION)) CNI_PLUGINS_LICENSE = Apache-2.0 CNI_PLUGINS_LICENSE_FILES = LICENSE @@ -12,6 +12,7 @@ CNI_PLUGINS_LICENSE_FILES = LICENSE CNI_PLUGINS_BUILD_TARGETS = \ plugins/ipam/dhcp \ plugins/main/bridge \ + plugins/main/dummy \ plugins/main/host-device \ plugins/main/ipvlan \ plugins/main/loopback \ -- 2.39.1 From christian at paral.in Thu Feb 2 13:34:53 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:34:53 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/containerd: bump to version 1.6.16 Message-ID: <20230202133453.1747150-1-christian@paral.in> Bugfixes and improvements. https://github.com/containerd/containerd/releases/tag/v1.6.16 Signed-off-by: Christian Stewart --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 04a29949d7..16474089d1 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 b86e5c42f58b8348422c972513ff49783c0d505ed84e498d0d0245c5992e4320 containerd-1.6.12.tar.gz +sha256 e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a containerd-1.6.16.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 192175800c..c27e538a30 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.12 +CONTAINERD_VERSION = 1.6.16 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE -- 2.39.1 From neal.frager at amd.com Thu Feb 2 13:38:17 2023 From: neal.frager at amd.com (Neal Frager) Date: Thu, 2 Feb 2023 13:38:17 +0000 Subject: [Buildroot] [PATCH v1 1/1] board/versal/post-image.sh: do not require xilinx/ prefix for .dts files Message-ID: <20230202133817.56293-1-neal.frager@amd.com> If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from buildroot into the linux tree, these .dts files are copied to arch/arm64/boot. Unfortunately, the post-image.sh script expects to find them in arch/arm64/boot/xilinx. This patch does not require the xilinx/ prefix to be present when symlinking the device-tree to system.dtb where u-boot expects to find it. It is effectively applying the below patch for zynqmp to versal as well: https://patchwork.ozlabs.org/project/buildroot/patch/20230201195956.1758827-1-gsmecher at threespeedlogic.com/ Signed-off-by: Neal Frager --- board/versal/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh index f45f29a155..92e65ed3b7 100755 --- a/board/versal/post-image.sh +++ b/board/versal/post-image.sh @@ -5,7 +5,7 @@ # devicetree listed in the config. FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ ${BR2_CONFIG}) [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -- 2.17.1 From neal.frager at amd.com Thu Feb 2 13:40:17 2023 From: neal.frager at amd.com (Frager, Neal) Date: Thu, 2 Feb 2023 13:40:17 +0000 Subject: [Buildroot] [PATCH 1/1] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. In-Reply-To: <20230202092120.319d6b00@booty> References: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> <20230201225237.0fb5dacb@booty> <20230202092120.319d6b00@booty> Message-ID: Hi Graeme, > Hi Luca, > > On 2023-02-01 13:52, Luca Ceresoli wrote: > > Hi Graeme, > > > > On Wed, 1 Feb 2023 11:59:56 -0800 > > Graeme Smecher wrote: > > > >> If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > >> buildroot into the linux tree, these .dts files are copied to > >> arch/arm64/boot. Unfortunately, the post-image.sh script expects to > >> find them in arch/arm64/boot/xilinx. > >> > >> This patch does not require the xilinx/ prefix to be present when > >> symlinking the device-tree to system.dtb where u-boot expects to > >> find it. > >> > >> Signed-off-by: Graeme Smecher > >> --- > >> board/zynqmp/post-image.sh | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/board/zynqmp/post-image.sh > >> b/board/zynqmp/post-image.sh index ed6dbe188c..c5de2db820 100755 > >> --- a/board/zynqmp/post-image.sh > >> +++ b/board/zynqmp/post-image.sh > >> @@ -5,7 +5,7 @@ > >> # devicetree listed in the config. > >> > >> FIRST_DT=$(sed -nr \ > >> - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > >> + -e > >> + 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\. > >> + ]*).*"$|\2|p' \ > > > > I think the following simpler change would also work. Can you check > > that please? > > > > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > > + -e > > + 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\2| > > + p' \ > > Assuming you intended \1, not \2 here - this suggestion breaks behaviour for a couple of defconfigs in the tree. If I run the ZCU106 defconfig through this regexp, I get: > > $ cat configs/zynqmp_zcu106_defconfig | sed -nr -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\1|p' > xilinx/zynqmp-zcu106-revA > > ...this creates a dangling symlink in output/images (system.dtb -> xilinx/zynqmp-zcu106-revA.dtb). > Right. > The right behaviour is to strip any prefixes that exist, without requiring any. Something like: > > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > + -e > + 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(.*/)?([-_/[:alnum:]\\.]*).*"$ > + |\2|p' \ > > This is less Xilinx-specific, although it seems a tad greedy. > Yes, better keeping the xilinx prefix as this is a xilinx-specific script anyway. > Reviewed-by: Luca Ceresoli Thank you for your patch. Reviewed-by: Neal Frager Best regards, Neal Frager AMD From christian at paral.in Thu Feb 2 13:41:49 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:41:49 -0800 Subject: [Buildroot] [PATCH 1/1] package/docker-compose: security bump version to 2.15.1 Message-ID: <20230202134149.1864294-1-christian@paral.in> Fix CVE-2022-27664 and CVE-2022-32149 high-risk vulnerability. Many other bugfixes, enhancements, and improvements. https://github.com/docker/compose/releases/tag/v2.15.1 Signed-off-by: Christian Stewart --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 7a7ab5f110..2c924d5080 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5cbf6cd1dd8ce98c5e2d62ca7f622e96abce444979b8e8852b033213a98e2049 docker-compose-2.14.0.tar.gz +sha256 346571ca487bf3f4b3dc9caeadc88a645354b0e098fa60f350249ec35ab3f240 docker-compose-2.15.1.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index ef9ee97196..3bced8bb7b 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.14.0 +DOCKER_COMPOSE_VERSION = 2.15.1 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE -- 2.39.1 From christian at paral.in Thu Feb 2 13:46:23 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:46:23 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/moby-buildkit: bump to version 0.11.2 Message-ID: <20230202134623.1912767-1-christian@paral.in> https://github.com/moby/buildkit/releases/tag/v0.11.2 Signed-off-by: Christian Stewart --- 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 43ee1b12c9..ef927636d9 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5ffe5a2d11736719649dae962461f66df394ae4cc1e58294e5f2bd4d4632d9d0 moby-buildkit-0.10.6.tar.gz +sha256 b1746575f37715a8a2f2df5bab77ea081ba8436854e241792702109fc9e3653d moby-buildkit-0.11.2.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 59d68a7dca..a25f676710 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.10.6 +MOBY_BUILDKIT_VERSION = 0.11.2 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE -- 2.39.1 From christian at paral.in Thu Feb 2 13:51:01 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:51:01 -0800 Subject: [Buildroot] [PATCH 1/1] package/nerdctl: bump version to 1.2.0 Message-ID: <20230202135101.1949947-1-christian@paral.in> https://github.com/containerd/nerdctl/releases/tag/v1.2.0 Signed-off-by: Christian Stewart --- package/nerdctl/nerdctl.hash | 2 +- package/nerdctl/nerdctl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash index e253fb74b2..8f2c678198 100644 --- a/package/nerdctl/nerdctl.hash +++ b/package/nerdctl/nerdctl.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 ae468c65480e9c6679e0dd23d466b723e7f19bff779d4e2e0fa4629be343af2a nerdctl-1.0.0.tar.gz +sha256 08a84b9481b37dbd8cc6f955dbec0c18a1934bcffeb135fd5d2dc23987152b7c nerdctl-1.2.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk index fdf60cb189..7556bcc391 100644 --- a/package/nerdctl/nerdctl.mk +++ b/package/nerdctl/nerdctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NERDCTL_VERSION = 1.0.0 +NERDCTL_VERSION = 1.2.0 NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) NERDCTL_LICENSE = Apache-2.0 -- 2.39.1 From arnout at mind.be Thu Feb 2 15:27:43 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 2 Feb 2023 16:27:43 +0100 Subject: [Buildroot] [PATCH] package/python-pytest: remove runtime dependency on python-toml Message-ID: <20230202152743.3916949-1-arnout@mind.be> Since version 7.2 [1], with Python 3.11+ pytest no longer uses tomli to parse pyproject.toml but instead uses tomllib which is part of Python itself [2]. Note that toml was replaced with tomli in version 7.0, so the dependency was anyway incorrect. Note that tomllib is unconditionally installed as part of Python 3.11, there is no PYTHON3_LIBTOML option or anything like that that needs to be selected. [1] https://docs.pytest.org/en/latest/changelog.html#pytest-7-2-0-2022-10-23 [2] https://github.com/pytest-dev/pytest/pull/9741 Signed-off-by: Arnout Vandecappelle --- I can't be bother with sending a patch changing toml to tomli for 2022.11 - it's going EOL in two months anyway, and apparently nobody noticed... --- package/python-pytest/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in index c3956c76d2..9bbc9ea2d2 100644 --- a/package/python-pytest/Config.in +++ b/package/python-pytest/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_PYTEST select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_PLUGGY # runtime select BR2_PACKAGE_PYTHON_PY # runtime - select BR2_PACKAGE_PYTHON_TOML # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help pytest is a framework that makes building simple and scalable -- 2.39.1 From giulio.benetti at benettiengineering.com Thu Feb 2 15:42:39 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 2 Feb 2023 16:42:39 +0100 Subject: [Buildroot] [PATCH 2/2] package/postgresql: work around gcc bug 43744 In-Reply-To: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> References: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> Message-ID: <20230202154239.325711-2-giulio.benetti@benettiengineering.com> Package postgresql suffers from gcc bug 43744 other than 85180, so let's work around disabling compiler optimization for this gcc bug too. Fixes: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a Signed-off-by: Giulio Benetti --- package/postgresql/postgresql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 5313e03b12..2ffcac6595 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -101,7 +101,7 @@ endif POSTGRESQL_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_43744)$(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),) POSTGRESQL_CFLAGS += -O0 endif -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 2 15:42:38 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 2 Feb 2023 16:42:38 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain/Config.in: extend gcc bug 43744 to every sh architecture Message-ID: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 544b423001..01215e0e96 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -115,7 +115,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_43744 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 - depends on BR2_sh4 + depends on BR2_sh # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63261. This bug no # longer exists in gcc 8.x. -- 2.34.1 From bernd.kuhls at t-online.de Thu Feb 2 19:25:26 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 2 Feb 2023 20:25:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.19.0 Message-ID: <20230202192526.30357-1-bernd.kuhls@t-online.de> Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls --- 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 3c50faf23f..781e089de8 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f97fe20248e0eb452f77e9b69f2fb1510b852152b3af4f9a8b20680c854888d1 xmrig-6.18.1.tar.gz +sha256 772f947058e5b89ca9bf34128487def47796870b547439a9b0524ddd1899420c xmrig-6.19.0.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index ca5bcecfbe..f345ba9cf9 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.18.1 +XMRIG_VERSION = 6.19.0 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE -- 2.39.1 From ju.o at free.fr Thu Feb 2 20:20:01 2023 From: ju.o at free.fr (Julien Olivain) Date: Thu, 2 Feb 2023 21:20:01 +0100 Subject: [Buildroot] [PATCH v6 1/2] package/rdma-core: new package Message-ID: <20230202202002.3272959-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 Tested-by: Shamraiz Ashraf Signed-off-by: Julien Olivain --- Changes v5 -> v6: - Update rdma-core from v43.0 to v44.0 - Removed the patch in v5, now included upstream - Update kernel in test from 5.15.80 to 5.15.91 Changes v4 -> v5: - Update rdma-core from v42.0 to v43.0 Also add a patch to fix an issue introduced in v43.0 - Update kernel in test from 5.15.68 to 5.15.80 - v5 patch series now includes the perftest package Changes v3 -> v4: - Update kernel in test from 5.15.61 to 5.15.68 - Included Thomas' review comments: - Moved linux-rdma.fragment to test directory - Updated test script to reflect new file location - Fixed typo in readme.txt - Add a comment in Config.in describing when the "rdma" command is needed. Changes v2 -> v3: - Update package version from 41.0 to 42.0 - Update kernel in test from 5.15.48 to 5.15.61 Changes v1 -> v2: - Update package version from 39.0 to 41.0 - Add test_rdma_core.py entry to DEVELOPERS file - Update kernel in test from 5.15.30 to 5.15.48 - Moved Config.in rdma comment in main pkg description --- Tested on branch master at commit aff4317 with commands: make check-package ... 0 warnings generated python3 -m flake8 support/testing/tests/package/test_rdma_core.py [no-output] support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_rdma_core.TestRdmaCore ... OK ./utils/test-pkg -a -p rdma-core arm-aarch64 [ 1/44]: OK bootlin-aarch64-glibc [ 2/44]: OK bootlin-arcle-hs38-uclibc [ 3/44]: OK bootlin-armv5-uclibc [ 4/44]: OK bootlin-armv7-glibc [ 5/44]: OK bootlin-armv7m-uclibc [ 6/44]: SKIPPED bootlin-armv7-musl [ 7/44]: OK bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED bootlin-m68k-68040-uclibc [ 9/44]: OK bootlin-microblazeel-uclibc [10/44]: OK bootlin-mipsel32r6-glibc [11/44]: OK bootlin-mipsel-uclibc [12/44]: OK bootlin-nios2-glibc [13/44]: OK bootlin-openrisc-uclibc [14/44]: OK bootlin-powerpc64le-power8-glibc [15/44]: OK bootlin-powerpc-e500mc-uclibc [16/44]: OK bootlin-riscv32-glibc [17/44]: OK bootlin-riscv64-glibc [18/44]: OK bootlin-riscv64-musl [19/44]: OK bootlin-sh4-uclibc [20/44]: OK bootlin-sparc64-glibc [21/44]: OK bootlin-sparc-uclibc [22/44]: SKIPPED bootlin-x86-64-glibc [23/44]: OK bootlin-x86-64-musl [24/44]: OK bootlin-x86-64-uclibc [25/44]: OK bootlin-xtensa-uclibc [26/44]: OK br-arm-basic [27/44]: OK br-arm-full-nothread [28/44]: SKIPPED br-arm-full-static [29/44]: SKIPPED br-i386-pentium4-full [30/44]: OK br-i386-pentium-mmx-musl [31/44]: OK br-mips64-n64-full [32/44]: OK br-mips64r6-el-hf-glibc [33/44]: OK br-powerpc-603e-basic-cpp [34/44]: OK br-powerpc64-power7-glibc [35/44]: OK linaro-aarch64-be [36/44]: OK linaro-aarch64 [37/44]: OK linaro-arm [38/44]: OK sourcery-arm-armv4t [39/44]: OK sourcery-arm [40/44]: OK sourcery-arm-thumb2 [41/44]: OK sourcery-mips64 [42/44]: OK sourcery-mips [43/44]: OK sourcery-nios2 [44/44]: OK 44 builds, 5 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- DEVELOPERS | 3 + package/Config.in | 1 + package/rdma-core/Config.in | 22 ++++++ package/rdma-core/rdma-core.hash | 5 ++ package/rdma-core/rdma-core.mk | 24 ++++++ package/rdma-core/readme.txt | 75 +++++++++++++++++++ .../testing/tests/package/test_rdma_core.py | 43 +++++++++++ .../test_rdma_core/linux-rdma.fragment | 9 +++ 8 files changed, 182 insertions(+) create mode 100644 package/rdma-core/Config.in 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 create mode 100644 support/testing/tests/package/test_rdma_core/linux-rdma.fragment diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577..5eb746f8b4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1696,6 +1696,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/tinycompress/ F: package/z3/ @@ -1711,6 +1712,8 @@ F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_rdma_core.py +F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py N: Julien Viard de Galbert diff --git a/package/Config.in b/package/Config.in index 83fddf316f..1f6db14d56 100644 --- a/package/Config.in +++ b/package/Config.in @@ -573,6 +573,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..437cf903ac --- /dev/null +++ b/package/rdma-core/Config.in @@ -0,0 +1,22 @@ +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. + + Note: The 'rdma' utility program is provided by the + 'iproute2' package, when compiled with the package 'libmnl' + also selected. This program is needed to configure + InfiniBand and RDMA networks from the command line. + + https://github.com/linux-rdma/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/rdma-core.hash b/package/rdma-core/rdma-core.hash new file mode 100644 index 0000000000..1aff44f7f4 --- /dev/null +++ b/package/rdma-core/rdma-core.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 4a2eec55b37ac25f25e7680a372f71c1781c23808542bd31fb68dc0448b8cba2 rdma-core-44.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..885821bf98 --- /dev/null +++ b/package/rdma-core/rdma-core.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# rdma-core +# +################################################################################ + +RDMA_CORE_VERSION = 44.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..9a95226ef4 --- /dev/null +++ b/package/rdma-core/readme.txt @@ -0,0 +1,75 @@ +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 configuration, 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). The Kernel +config fragment file used for package test can be used as a starting +point. See: + + support/testing/tests/package/test_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 -d 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..614fb51f48 --- /dev/null +++ b/support/testing/tests/package/test_rdma_core.py @@ -0,0 +1,43 @@ +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.91" + 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="{}" + 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 + """.format( + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") + ) + + 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") diff --git a/support/testing/tests/package/test_rdma_core/linux-rdma.fragment b/support/testing/tests/package/test_rdma_core/linux-rdma.fragment new file mode 100644 index 0000000000..e305f27e62 --- /dev/null +++ b/support/testing/tests/package/test_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 -- 2.39.1 From ju.o at free.fr Thu Feb 2 20:20:02 2023 From: ju.o at free.fr (Julien Olivain) Date: Thu, 2 Feb 2023 21:20:02 +0100 Subject: [Buildroot] [PATCH v6 2/2] package/perftest: new package In-Reply-To: <20230202202002.3272959-1-ju.o@free.fr> References: <20230202202002.3272959-1-ju.o@free.fr> Message-ID: <20230202202002.3272959-2-ju.o@free.fr> Open Fabrics Performance Tests. This is a collection of tests written over uverbs intended for use as a performance micro-benchmark. The tests may be used for HW or SW tuning as well as for functional testing. https://github.com/linux-rdma/perftest Tested-by: Shamraiz Ashraf Signed-off-by: Julien Olivain --- Changes v5 -> v6: - Update perftest from version 4.5-0.18 to 4.5-0.20 - Update kernel in test from 5.15.80 to 5.15.91 - Add perftest entries in DEVELOPERS file Changes v1 -> v5: - introduce perftest package in v5 patch series --- Tested on branch main at commit aff4317 with commands: make check-package ... 0 warnings generated python3 -m flake8 support/testing/tests/package/test_perftest.py [no-output] support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_perftest.TestPerftest ... OK ./utils/test-pkg -a -p perftest arm-aarch64 [ 1/44]: OK bootlin-aarch64-glibc [ 2/44]: OK bootlin-arcle-hs38-uclibc [ 3/44]: SKIPPED bootlin-armv5-uclibc [ 4/44]: SKIPPED bootlin-armv7-glibc [ 5/44]: OK bootlin-armv7m-uclibc [ 6/44]: SKIPPED bootlin-armv7-musl [ 7/44]: SKIPPED bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED bootlin-m68k-68040-uclibc [ 9/44]: SKIPPED bootlin-microblazeel-uclibc [10/44]: SKIPPED bootlin-mipsel32r6-glibc [11/44]: SKIPPED bootlin-mipsel-uclibc [12/44]: SKIPPED bootlin-nios2-glibc [13/44]: SKIPPED bootlin-openrisc-uclibc [14/44]: SKIPPED bootlin-powerpc64le-power8-glibc [15/44]: OK bootlin-powerpc-e500mc-uclibc [16/44]: OK bootlin-riscv32-glibc [17/44]: OK bootlin-riscv64-glibc [18/44]: OK bootlin-riscv64-musl [19/44]: SKIPPED bootlin-sh4-uclibc [20/44]: SKIPPED bootlin-sparc64-glibc [21/44]: OK bootlin-sparc-uclibc [22/44]: SKIPPED bootlin-x86-64-glibc [23/44]: OK bootlin-x86-64-musl [24/44]: SKIPPED bootlin-x86-64-uclibc [25/44]: OK bootlin-xtensa-uclibc [26/44]: SKIPPED br-arm-basic [27/44]: SKIPPED br-arm-full-nothread [28/44]: SKIPPED br-arm-full-static [29/44]: SKIPPED br-i386-pentium4-full [30/44]: OK br-i386-pentium-mmx-musl [31/44]: SKIPPED br-mips64-n64-full [32/44]: SKIPPED br-mips64r6-el-hf-glibc [33/44]: SKIPPED br-powerpc-603e-basic-cpp [34/44]: OK br-powerpc64-power7-glibc [35/44]: OK linaro-aarch64-be [36/44]: SKIPPED linaro-aarch64 [37/44]: OK linaro-arm [38/44]: OK sourcery-arm-armv4t [39/44]: SKIPPED sourcery-arm [40/44]: SKIPPED sourcery-arm-thumb2 [41/44]: OK sourcery-mips64 [42/44]: SKIPPED sourcery-mips [43/44]: SKIPPED sourcery-nios2 [44/44]: SKIPPED 44 builds, 28 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- DEVELOPERS | 2 + package/Config.in | 1 + package/perftest/Config.in | 41 ++++++++++++++++ package/perftest/perftest.hash | 3 ++ package/perftest/perftest.mk | 15 ++++++ .../testing/tests/package/test_perftest.py | 48 +++++++++++++++++++ 6 files changed, 110 insertions(+) create mode 100644 package/perftest/Config.in create mode 100644 package/perftest/perftest.hash create mode 100644 package/perftest/perftest.mk create mode 100644 support/testing/tests/package/test_perftest.py diff --git a/DEVELOPERS b/DEVELOPERS index 5eb746f8b4..7abfbe3c44 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1692,6 +1692,7 @@ F: package/gnupg2/ F: package/glslsandbox-player/ F: package/octave/ F: package/ola/ +F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ @@ -1709,6 +1710,7 @@ F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ +F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py diff --git a/package/Config.in b/package/Config.in index 1f6db14d56..f32209db95 100644 --- a/package/Config.in +++ b/package/Config.in @@ -133,6 +133,7 @@ menu "Debugging, profiling and benchmark" source "package/oprofile/Config.in" source "package/pax-utils/Config.in" source "package/pcm-tools/Config.in" + source "package/perftest/Config.in" source "package/piglit/Config.in" source "package/ply/Config.in" source "package/poke/Config.in" diff --git a/package/perftest/Config.in b/package/perftest/Config.in new file mode 100644 index 0000000000..9b2e46e64a --- /dev/null +++ b/package/perftest/Config.in @@ -0,0 +1,41 @@ +config BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS + bool + # Accurate cycle measurement in perftest is implemented for a + # limited set of architectures, see: + # https://github.com/linux-rdma/perftest/blob/v4.5-0.20/src/get_clock.h + # Note: the package has also a fallback to use "asm/timex.h" + # from the Kernel, in + # "$(LINUX_DIR)/arch/$(KERNEL_ARCH)/include". It is not + # reflected here as this path is not well tested. + default y if BR2_i386 || BR2_x86_64 + default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 && !BR2_ARM_CPU_ARMV6 + default y if BR2_aarch64 + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x + default y if BR2_sparc || BR2_sparc64 + default y if BR2_riscv + +config BR2_PACKAGE_PERFTEST + bool "perftest" + depends on BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS # rdma-core + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # rdma-core + depends on BR2_TOOLCHAIN_HAS_THREADS + # musl does not define sysconf(_SC_LEVEL1_DCACHE_LINESIZE) + depends on !BR2_TOOLCHAIN_USES_MUSL + depends on BR2_USE_MMU # rdma-core + select BR2_PACKAGE_PCIUTILS + select BR2_PACKAGE_RDMA_CORE # libibverbs, librdmacm, libibumad + help + Open Fabrics Performance Tests. + + This is a collection of tests written over uverbs intended + for use as a performance micro-benchmark. The tests may be + used for HW or SW tuning as well as for functional testing. + + https://github.com/linux-rdma/perftest + +comment "perftest 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/perftest/perftest.hash b/package/perftest/perftest.hash new file mode 100644 index 0000000000..4333231c44 --- /dev/null +++ b/package/perftest/perftest.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 32e667dac1c0dd41a3951c5a54b961a8e28db5d9478caea2dfc268a312968c99 perftest-4.5-0.20.tar.gz +sha256 763adb7d5094f2127b026adea8701f042d28d4b1f6fb8b6e828989227a9cf7f5 COPYING diff --git a/package/perftest/perftest.mk b/package/perftest/perftest.mk new file mode 100644 index 0000000000..7ad20d0974 --- /dev/null +++ b/package/perftest/perftest.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# perftest +# +################################################################################ + +PERFTEST_VERSION = 4.5-0.20 +PERFTEST_SITE = $(call github,linux-rdma,perftest,v$(PERFTEST_VERSION)) +PERFTEST_LICENSE = GPL-2.0 or BSD-2-Clause +PERFTEST_LICENSE_FILES = COPYING +PERFTEST_DEPENDENCIES = pciutils rdma-core +# Fetched from Github, with no configure script +PERFTEST_AUTORECONF = YES + +$(eval $(autotools-package)) diff --git a/support/testing/tests/package/test_perftest.py b/support/testing/tests/package/test_perftest.py new file mode 100644 index 0000000000..680b70d784 --- /dev/null +++ b/support/testing/tests/package/test_perftest.py @@ -0,0 +1,48 @@ +import os + +import infra.basetest + + +class TestPerftest(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.91" + 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="{}" + 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 + BR2_PACKAGE_PERFTEST=y + """.format( + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") + ) + + 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("ip link set dev eth0 up") + self.assertRunOk("rdma link add rxe0 type rxe netdev eth0") + + # start a server + self.assertRunOk("ib_read_bw > /dev/null 2>&1 &") + + # start a client + self.assertRunOk("sleep 1 && ib_read_bw 127.0.0.1") -- 2.39.1 From ps.report at gmx.net Thu Feb 2 20:41:16 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 2 Feb 2023 21:41:16 +0100 Subject: [Buildroot] Libarchive always throws an error when building In-Reply-To: References: <20230201184154.2c7e2680@gmx.net> <20230201190450.4636771a@gmx.net> Message-ID: <20230202214116.2478d971@gmx.net> Hello Roland, On Wed, 1 Feb 2023 19:27:35 +0000, Kenneth Roland wrote: > Hello Peter, > After applying the patch you mentioned, as well as installing libssl-dev, I now have this error. Host installed packages are ignored by the buildroot system, never do this... > > > ?```checking whether the /mnt/hdd/sct/output/host/bin/aarch64-buildroot-linux-gnu-gcc linker (/mnt/hdd/sct/output/host/bin/aarch64-buildroot-linux-gnu-ld) supports shared libraries... yes > checking whether -lc should be explicitly linked in... no > checking dynamic linker characteristics... GNU/Linux ld.so > checking how to hardcode library paths into programs... immediate > checking whether stripping libraries is possible... yes > checking if libtool supports shared libraries... yes > checking whether to build shared libraries... yes > checking whether to build static libraries... no > checking pkg-config is at least version 0.20... /mnt/hdd/sct/output/host/bin/pkgconf: error while loading shared libraries: libpkgconf.so.3: cannot open shared object file: No such file or directory > no > checking for LIBARCHIVE... no > configure: error: in `/mnt/hdd/sct/output/build/opkg-0.4.5': > configure: error: The pkg-config script could not be found or is too old. Make sure it > is in your PATH or set the PKG_CONFIG environment variable to the full > path to pkg-config. > > Alternatively, you may set the environment variables LIBARCHIVE_CFLAGS > and LIBARCHIVE_LIBS to avoid the need to call pkg-config. > See the pkg-config man page for more details. > > To get pkg-config, see . > See `config.log' for more details > make: *** [package/pkg-generic.mk:283: /mnt/hdd/sct/output/build/opkg-0.4.5/.stamp_configured] Error 1``` See the proper patch from Bernd Kuhls (including AUTORECONF and host-pkagconf dependency): http://lists.busybox.net/pipermail/buildroot/2023-February/660921.html https://patchwork.ozlabs.org/project/buildroot/patch/20230201181005.731564-1-bernd.kuhls at t-online.de/ Regards, Peter > > > From a quick search, libpkgconf.so.3 is found on RPM systems, which isn't the case here, but somehow it has something to do with pkg-config being too old. Do I need to update my path, and if so, is that the bash file found in my user's home folder? Or is there another patch I can apply? Thanks, > Kenneth From ps.report at gmx.net Thu Feb 2 20:46:55 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 2 Feb 2023 21:46:55 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libarchive: Only add "iconv" to the .pc file if needed In-Reply-To: <20230201181005.731564-1-bernd.kuhls@t-online.de> References: <20230201181005.731564-1-bernd.kuhls@t-online.de> Message-ID: <20230202214655.11ccfccf@gmx.net> On Wed, 1 Feb 2023 19:10:05 +0100, Bernd Kuhls wrote: > Fix the following build failure with fwup raised since bump to version > 3.6.2 in commit 380341b249175382691f268de4b41d3843ff0acc and > https://github.com/libarchive/libarchive/commit/a83f3d327aefe8d628230f326621b014d82f55b4 > > checking for pkg-config... /tmp/instance-19/output-1/host/bin/pkg-config > checking pkg-config is at least version 0.9.0... yes > checking for ARCHIVE... no > configure: error: Requires libarchive. Libarchive must be built with zlib support. > > Fixes: > http://autobuild.buildroot.net/results/f5d/f5d549fb4f08156ba5952ce75926f7fd2242bfdf/ And some opkg autobuild failures: http://autobuild.buildroot.net/results/3c0cb8ff764fb97c9d0498a4d58857351b659676/ http://autobuild.buildroot.net/results/87d5ebbe2db2358da05751c087e31b8528d8b0e7/ http://autobuild.buildroot.net/results/f604b2e3cdc0b8d8fcdfc847a3b2c8904fff649c/ http://autobuild.buildroot.net/results/9a54d6267fb69657bf994f77a1193c37dff01066/ http://autobuild.buildroot.net/results/5dc839d26b34824f78311c5e745d51209f7a1987/ http://autobuild.buildroot.net/results/7cc3bceddd4ba016164d31d2718138c43cb8b976/ http://autobuild.buildroot.net/results/b844d753f5d1969e941e2a865c7ff760fde37d9c/ http://autobuild.buildroot.net/results/29d5d20660318620befb78af3be06896d4a70e99/ Regards, Peter > > Signed-off-by: Bernd Kuhls > --- > v2: added dependency to host-pkgconf to fix autoconf error > > ...y-add-iconv-to-the-pc-file-if-needed.patch | 44 +++++++++++++++++++ > package/libarchive/libarchive.mk | 4 ++ > 2 files changed, 48 insertions(+) > create mode 100644 package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > > diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > new file mode 100644 > index 0000000000..c93944f789 > --- /dev/null > +++ b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > @@ -0,0 +1,44 @@ > +From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 > +From: Peter Pentchev > +Date: Thu, 29 Dec 2022 00:04:40 +0200 > +Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) > + > +Hi, > + > +Thanks for writing and maintaining libarchive! > + > +What do you think about this trivial change that does not add "iconv" to > +the pkg-config file's list of required packages unless it is actually > +needed? On at least Debian GNU/Linux systems, the iconv(3) function is > +part of the system C library and there is no Debian package that > +installs an iconv.pc file, so I had to make this change to the Debian > +package of libarchive. > + > +Thanks again, and keep up the great work! > + > +G'luck, > +Peter > + > +Downloaded from upstream commit: > +https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 > + > +Signed-off-by: Bernd Kuhls > +--- > + configure.ac | 4 +++- > + 1 file changed, 3 insertions(+), 1 deletion(-) > + > +diff --git a/configure.ac b/configure.ac > +index 99bff20d1..e2715cfde 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then > + AC_CHECK_HEADERS([localcharset.h]) > + am_save_LIBS="$LIBS" > + LIBS="${LIBS} ${LIBICONV}" > +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" > ++ if test -n "$LIBICONV"; then > ++ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" > ++ fi > + AC_CHECK_FUNCS([locale_charset]) > + LIBS="${am_save_LIBS}" > + if test "x$ac_cv_func_locale_charset" != "xyes"; then > diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk > index cfc148d01d..cd7c13fbed 100644 > --- a/package/libarchive/libarchive.mk > +++ b/package/libarchive/libarchive.mk > @@ -11,6 +11,10 @@ LIBARCHIVE_INSTALL_STAGING = YES > LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 > LIBARCHIVE_LICENSE_FILES = COPYING > LIBARCHIVE_CPE_ID_VENDOR = libarchive > +# We're patching configure.ac > +LIBARCHIVE_AUTORECONF = YES > +# needed for autoreconf > +LIBARCHIVE_DEPENDENCIES += host-pkgconf > > ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) > ifeq ($(BR2_STATIC_LIBS),y) From peter at korsgaard.com Thu Feb 2 21:04:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 2 Feb 2023 22:04:32 +0100 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230202210432.2998354-1-peter@korsgaard.com> 4.9.x / 6.0.x is now EOL. 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 e18b515311..a0e9286bd3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.5" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 157f267a9d..927172e8fa 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 bc7f6d9a8a8bbe9a723e82346bba94b58d926f78bfba106b21e041e0290076fc linux-6.1.5.tar.xz +sha256 d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b linux-6.1.9.tar.xz sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e7359bd2935b54fe8bb821cf748591c36a95bed019e752d3e4d5803d9da1ccb4 linux-5.15.87.tar.xz -sha256 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 linux-5.10.162.tar.xz -sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz +sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz +sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz +sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz -sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz +sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz +sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1ad9fffcd3..3a5207e0b6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -397,13 +397,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.302" if BR2_KERNEL_HEADERS_4_14 - default "4.19.269" if BR2_KERNEL_HEADERS_4_19 - default "5.4.228" if BR2_KERNEL_HEADERS_5_4 - default "5.10.162" if BR2_KERNEL_HEADERS_5_10 - default "5.15.87" if BR2_KERNEL_HEADERS_5_15 + default "4.14.304" if BR2_KERNEL_HEADERS_4_14 + default "4.19.271" if BR2_KERNEL_HEADERS_4_19 + default "5.4.230" if BR2_KERNEL_HEADERS_5_4 + default "5.10.166" if BR2_KERNEL_HEADERS_5_10 + default "5.15.91" if BR2_KERNEL_HEADERS_5_15 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 - default "6.1.5" if BR2_KERNEL_HEADERS_6_1 + default "6.1.9" if BR2_KERNEL_HEADERS_6_1 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 christian at paral.in Fri Feb 3 02:05:59 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 18:05:59 -0800 Subject: [Buildroot] [PATCH v1 1/3] package/docker-engine: bump version to v23.0.0 In-Reply-To: <20230202131354.1193243-1-christian@paral.in> References: <20230202131354.1193243-1-christian@paral.in> Message-ID: Hi all, Upon further testing I've discovered some bugs/quirks with this new Docker version and will need to investigate a bit further before we merge this. Marked as RFC on Patchwork for now. I'd still appreciate your thoughts on dropping docker-proxy as well as any objections to the CONFIGURE workaround to fix the Go modules issue. Thanks, Christian Stewart On Thu, Feb 2, 2023 at 5:13 AM Christian Stewart wrote: > > This update requires a workaround for the non-standard vendor/ structure in the > docker-engine repository, which has an invalid vendor/modules.txt file. > > Removing the vendor/modules.txt file fixes the build error. > > Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > > The go download post-process script uses go mod init to create the go.mod file > which specifies a language version of go1.16 on default. Use go mod edit to > adjust the go.mod file to the required minimum version go1.19 for generic types. > > https://github.com/moby/moby/releases/tag/v23.0.0 > > Signed-off-by: Christian Stewart > --- > package/docker-engine/docker-engine.hash | 2 +- > package/docker-engine/docker-engine.mk | 15 ++++++++++++++- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash > index d15b1359cb..670cbd414b 100644 > --- a/package/docker-engine/docker-engine.hash > +++ b/package/docker-engine/docker-engine.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz > +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk > index 2a9b72ca78..9c193a29a5 100644 > --- a/package/docker-engine/docker-engine.mk > +++ b/package/docker-engine/docker-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DOCKER_ENGINE_VERSION = 20.10.22 > +DOCKER_ENGINE_VERSION = 23.0.0 > DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) > > DOCKER_ENGINE_LICENSE = Apache-2.0 > @@ -62,6 +62,19 @@ else > DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs > endif > > +# update the go module version to go1.19 > +# docker-engine does not use go modules > +# remove the conflicting vendor/modules.txt > +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > +define DOCKER_ENGINE_CONFIGURE_CMDS > + if [ -f $(@D)/vendor/modules.txt ]; then \ > + rm $(@D)/vendor/modules.txt; \ > + fi > + cd $(@D); \ > + $(HOST_GO_HOST_ENV) $(DOCKER_ENGINE_GO_ENV) \ > + $(GO_BIN) mod edit -go=1.19 go.mod > +endef > + > DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) > > define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD > -- > 2.39.1 > From bugzilla at busybox.net Fri Feb 3 02:22:42 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 03 Feb 2023 02:22:42 +0000 Subject: [Buildroot] [Bug 15311] New: App crashes in function QQmlPropertyCache::property(int) const on ARM 64bit Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15311 Bug ID: 15311 Summary: App crashes in function QQmlPropertyCache::property(int) const on ARM 64bit Product: buildroot Version: 2022.11.1 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: 1183341255 at qq.com CC: buildroot at uclibc.org Target Milestone: --- We use the gcc11 compiler to compile the qt5webview module. The compilation is normal. This error occurs when running the sample minibrowser of qt5vebview, resulting in crash. It is found that the gcc11 compiler is faulty by searching. The gcc10 compiler returns to normal. We hope to run on the gcc11 compiler, so we need to solve this bug. Specific bug information can be viewed here:https://bugreports.qt.io/browse/QTBUG-99545 -- You are receiving this mail because: You are on the CC list for the bug. From christian at paral.in Fri Feb 3 03:44:40 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 19:44:40 -0800 Subject: [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16 Message-ID: <20230203034443.326513-1-christian@paral.in> Bugfixes and improvements. We now install the containerd.service systemd unit. https://github.com/containerd/containerd/releases/tag/v1.6.16 Signed-off-by: Christian Stewart --- v1 -> v2: - install containerd systemd unit (now required by docker-engine and others) Signed-off-by: Christian Stewart --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 04a29949d7..16474089d1 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 b86e5c42f58b8348422c972513ff49783c0d505ed84e498d0d0245c5992e4320 containerd-1.6.12.tar.gz +sha256 e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a containerd-1.6.16.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 192175800c..4a0d6ec38b 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.12 +CONTAINERD_VERSION = 1.6.16 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE @@ -41,4 +41,10 @@ else CONTAINERD_TAGS += no_btrfs endif +define CONTAINERD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/containerd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/containerd.service + $(SED) 's,/usr/local/bin,/usr/bin,g' $(TARGET_DIR)/usr/lib/systemd/system/containerd.service +endef + $(eval $(golang-package)) -- 2.39.1 From christian at paral.in Fri Feb 3 03:44:41 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 19:44:41 -0800 Subject: [Buildroot] [PATCH v2 2/4] package/docker-engine: bump version to v23.0.0 In-Reply-To: <20230203034443.326513-1-christian@paral.in> References: <20230203034443.326513-1-christian@paral.in> Message-ID: <20230203034443.326513-2-christian@paral.in> This update requires a workaround for the non-standard vendor/ structure in the docker-engine repository, which has an invalid vendor/modules.txt file. Removing the vendor/modules.txt file fixes the build error. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 The go download post-process script uses go mod init to create the go.mod file which specifies a language version of go1.16 on default. Use go mod edit to adjust the go.mod file to the required minimum version go1.19 for generic types used by docker-engine. (Fixes a build error). Note that this changes the go.mod language version and is not required to be equal to the current Go tool version. Note that as of v23.0.0 docker-engine expects containerd to be started by systemd if --containerd= flag is set in dockerd.service, whereas in previous versions containerd was started by the docker daemon as a sub-process. There is no sysv unit for containerd, but this is OK: in the Docker sysv init file S60dockerd, we do not set the --containerd flag. The docker daemon will start containerd as a sub-process automatically due to the absence of this flag. Signed-off-by: Christian Stewart --- v1 -> v2: - clarify commit message about containerd.service and sysv compat - fix formatting in S60dockerd - bundle commit into a series with required containerd changes Signed-off-by: Christian Stewart --- package/docker-engine/S60dockerd | 2 +- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 16 +++++++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/package/docker-engine/S60dockerd b/package/docker-engine/S60dockerd index def8bea149..7591f9fe66 100644 --- a/package/docker-engine/S60dockerd +++ b/package/docker-engine/S60dockerd @@ -10,7 +10,7 @@ DAEMON_ARGS="" do_start() { echo -n "Starting $NAME: " start-stop-daemon --start --quiet --background --make-pidfile \ - --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \ + --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \ && echo "OK" || echo "FAIL" } diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d15b1359cb..670cbd414b 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 2a9b72ca78..208688cc43 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.22 +DOCKER_ENGINE_VERSION = 23.0.0 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -40,6 +40,7 @@ ifeq ($(BR2_INIT_SYSTEMD),y) DOCKER_ENGINE_DEPENDENCIES += systemd DOCKER_ENGINE_TAGS += systemd journald endif + ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y) DOCKER_ENGINE_TAGS += experimental endif @@ -62,6 +63,19 @@ else DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs endif +# update the go module version to go1.19 +# docker-engine does not use go modules +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_ENGINE_CONFIGURE_CMDS + if [ -f $(@D)/vendor/modules.txt ]; then \ + rm $(@D)/vendor/modules.txt; \ + fi + cd $(@D); \ + $(HOST_GO_HOST_ENV) $(DOCKER_ENGINE_GO_ENV) \ + $(GO_BIN) mod edit -go=1.19 go.mod +endef + DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD -- 2.39.1 From christian at paral.in Fri Feb 3 03:44:42 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 19:44:42 -0800 Subject: [Buildroot] [PATCH v2 3/4] package/docker-proxy: drop package In-Reply-To: <20230203034443.326513-1-christian@paral.in> References: <20230203034443.326513-1-christian@paral.in> Message-ID: <20230203034443.326513-3-christian@paral.in> The docker-proxy binary (libnetwork) has been merged into the docker-engine source (moby). Drop the docker-proxy package and add cmd/docker-proxy as a build target of docker-engine instead. https://github.com/moby/libnetwork/commit/563fe8e248f3afac75a270f693f38bdc3eea7bf3 Signed-off-by: Christian Stewart --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/docker-engine/Config.in | 1 - package/docker-engine/docker-engine.mk | 2 +- package/docker-proxy/Config.in | 19 ------------------- package/docker-proxy/docker-proxy.hash | 3 --- package/docker-proxy/docker-proxy.mk | 21 --------------------- 8 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 package/docker-proxy/Config.in delete mode 100644 package/docker-proxy/docker-proxy.hash delete mode 100644 package/docker-proxy/docker-proxy.mk diff --git a/Config.in.legacy b/Config.in.legacy index 41c5fdefb3..75099f4404 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy removed" + select BR2_LEGACY + select BR2_PACKAGE_DOCKER_ENGINE + help + docker-proxy has been dropped by upstream since version + 563fe8. it has been merged into docker-engine (moby). + config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 bool "imx-gpu-viv X11 output has been removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577..7d4f9aa6fe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -545,7 +545,6 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-compose/ F: package/docker-engine/ -F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ diff --git a/package/Config.in b/package/Config.in index 83fddf316f..dc460ca852 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2615,7 +2615,6 @@ menu "System tools" source "package/docker-cli/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" - source "package/docker-proxy/Config.in" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 1f0efb8fcc..b5a356eab9 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_USE_MMU # containerd select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency - select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency help Docker is a platform to build, ship, diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 208688cc43..68855dc926 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -24,7 +24,7 @@ DOCKER_ENGINE_LDFLAGS = \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs -DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_ENGINE_DEPENDENCIES += libapparmor diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in deleted file mode 100644 index 7e40536537..0000000000 --- a/package/docker-proxy/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_DOCKER_PROXY - bool "docker-proxy" - 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 - help - Libnetwork is a Container Network Model that provides a - consistent programming interface and the required network - abstractions for applications. - - This package provides docker-proxy, a run-time dependency of - Docker. - - https://github.com/docker/libnetwork - -comment "docker-proxy needs a 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_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash deleted file mode 100644 index 63296f14c1..0000000000 --- a/package/docker-proxy/docker-proxy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 05bf95637bae134d12d02bd7a7854cd0c768e6fccb662c2c64523f05b997b204 docker-proxy-f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk deleted file mode 100644 index fe7982e8f6..0000000000 --- a/package/docker-proxy/docker-proxy.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# docker-proxy -# -################################################################################ - -DOCKER_PROXY_VERSION = f6ccccb1c082a432c2a5814aaedaca56af33d9ea -DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) - -DOCKER_PROXY_LICENSE = Apache-2.0 -DOCKER_PROXY_LICENSE_FILES = LICENSE - -DOCKER_PROXY_DEPENDENCIES = host-pkgconf - -DOCKER_PROXY_BUILD_TARGETS = cmd/proxy - -define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy -endef - -$(eval $(golang-package)) -- 2.39.1 From christian at paral.in Fri Feb 3 03:44:43 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 19:44:43 -0800 Subject: [Buildroot] [PATCH v2 4/4] package/docker-cli: bump version to v23.0.0 In-Reply-To: <20230203034443.326513-1-christian@paral.in> References: <20230203034443.326513-1-christian@paral.in> Message-ID: <20230203034443.326513-4-christian@paral.in> This update requires a workaround for the non-standard vendor/ structure in the docker-engine repository, which has an invalid vendor/modules.txt file. Removing the vendor/modules.txt file fixes the build error. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 The go download post-process script uses go mod init to create the go.mod file which specifies a language version of go1.16 on default. Use go mod edit to adjust the go.mod file to the required minimum version go1.19 for generic types used by docker-engine. (Fixes a build error). Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index c6db95f9b3..ff981be963 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz +sha256 3379d06cd6177832b91f4796c680b6bf15c7895773448716b4c3c5253f611d1b docker-cli-23.0.0.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index cb44c68c1b..3b155b5675 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.22 +DOCKER_CLI_VERSION = 23.0.0 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 @@ -29,6 +29,19 @@ DOCKER_CLI_TAGS += osusergo netgo DOCKER_CLI_GO_ENV = CGO_ENABLED=no endif +# update the go module version to go1.19 +# docker-cli does not use go modules +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_CONFIGURE_CMDS + if [ -f $(@D)/vendor/modules.txt ]; then \ + rm $(@D)/vendor/modules.txt; \ + fi + cd $(@D); \ + $(HOST_GO_HOST_ENV) $(DOCKER_CLI_GO_ENV) \ + $(GO_BIN) mod edit -go=1.19 go.mod +endef + DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) $(eval $(golang-package)) -- 2.39.1 From thomas.petazzoni at bootlin.com Fri Feb 3 06:45:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 03 Feb 2023 06:45:54 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-02 Message-ID: <20230203064600.916B6611F1@smtp3.osuosl.org> Hello, Autobuild statistics for 2023-02-02 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 7 | 2 | 0 | 9 | 2022.11.x | 13 | 20 | 0 | 33 | master | 177 | 303 | 1 | 481 | Classification of failures by reason for master ----------------------------------------------- host-fwup-1.9.1 | 22 fwup-1.9.1 | 20 bash-5.2.15 | 17 host-go-1.19.5 | 15 host-pahole-1.24 | 9 host-binutils-2.38 | 8 linux-6.1.5 | 8 opkg-0.4.5 | 8 jack2-1.9.21 | 7 libglib2-2.72.3 | 7 xz-5.2.10 | 7 dahdi-linux-3.2.0 | 6 gobject-introspection-1.72.0 | 6 host-sentry-cli-2.8.0 | 6 pixz-1.0.7 | 6 glibc-2.36-81-g4f4d7a13edfd... | 5 libgpg-error-1.46 | 4 norm-1.5.8 | 4 perl-5.36.0 | 4 python-bcrypt-4.0.1 | 4 python-numpy-1.23.5 | 4 uclibc-1.0.42 | 4 xxhash-0.8.1 | 4 acpid-2.0.34 | 3 efivar-38 | 3 fluent-bit-2.0.8 | 3 host-rust-1.66.1 | 3 libnss-3.87 | 3 ltp-testsuite-20220930 | 3 unknown | 3 bat-0.19.0 | 2 brltty-6.5 | 2 elfutils-0.186 | 2 fontconfig-2.13.1 | 2 fs/ubifs/ubifs.mk:49: /home... | 2 gerbera-1.10.0 | 2 gmp-6.2.1 | 2 gvfs-1.48.1 | 2 host-binutils-2.37 | 2 host-binutils-2.39 | 2 json-c-0.16 | 2 libfuse3-3.13.0 | 2 libgcrypt-1.10.1 | 2 mpv-0.33.1 | 2 mutt-2.2.9 | 2 optee-client-3.19.0 | 2 python-cryptography-39.0.0 | 2 ulog-0389d243352255f6182326... | 2 wolfssl-5.5.3 | 2 android-tools-4.2.2+git2013... | 1 avro-c-1.11.1 | 1 boost-1.80.0 | 1 bullet-3.21 | 1 cairo-1.16.0 | 1 cni-plugins-1.1.1 | 1 dash-0.5.11.5 | 1 dawgdic-16ac537ba9883ff01b6... | 1 dropbear-2022.83 | 1 erlang-22.3.4.22 | 1 frr-8.4.2 | 1 fs/btrfs/btrfs.mk:55: /home... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 glibmm-2.68.2 | 1 gobject-introspection | 1 gummiboot-2bcd919c681c952eb... | 1 host-python-maturin-0.14.9 | 1 imx-alsa-plugins-rel_imx_4.... | 1 kexec-2.0.25 | 1 kvmtool-f77d646ba01d04be5aa... | 1 libblockdev-2.26 | 1 libcamera-apps-1.1.0 | 1 libcap-ng-0.8.3 | 1 libsigrok-0.5.2 | 1 libxml2-2.10.3 | 1 linux-5.10.145-cip17 | 1 linux-5.10.145-cip17-rt7 | 1 liquid-dsp-1.4.0 | 1 lirc-tools-0.10.2 | 1 mariadb-10.3.36 | 1 matio-1.5.23 | 1 mesa3d-22.3.4 | 1 mxs-bootlets-10.12.01 | 1 ne10-1.2.1 | 1 netsurf-3.10 | 1 nginx-1.22.1 | 1 numactl-2.0.16 | 1 nut-2.8.0 | 1 pcre2-10.42 | 1 pcsc-lite-1.9.9 | 1 python-bunch-1.0.1 | 1 quickjs-2021-03-27 | 1 rtl_433-22.11 | 1 skalibs-2.12.0.1 | 1 ssdp-responder-1.9 | 1 strongswan-5.9.8 | 1 tealdeer-1.6.1 | 1 ti-k3-r5-loader-2022.10 | 1 tor-0.4.7.13 | 1 traceroute-2.1.0 | 1 uccp420wlan-6.9.1 | 1 uqmi-0a19b5b77140465c29e2af... | 1 valgrind-3.19.0 | 1 xenomai-3.0.10 | 1 zeek-4.1.1 | 1 zeromq-4.3.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/53e0b30cadbad90ef8ba61c39b5dd054dadc5a32 | ORPH mips64 | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/6af089a8aa7c9282f3642ae92b1b298df4af09c0 | ORPH mips64 | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/47b173c02f26e63c14ef1b686c808076cb9466c4 | ORPH mips64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/281acf637b1b33000b507a773e9dd90f0978d0cf | mips64 | avro-c-1.11.1 | NOK | http://autobuild.buildroot.net/results/74bd5cecfface38bef3b6a175c978ec20aac68b0 | or1k | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/a293eb0b947f041dd6214f6dda03b53d4b4cb22c | ORPH microblaze | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/87fcd26cd983d4716f8efb6b7b5f53343c57fc17 | ORPH mips64el | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/22575c04d9b1dd81f0fce43775dbe2c9cecb9c53 | ORPH microblazeel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/aa1257ee7fe1dd18be8bc10fb9de402ca1cdb911 | ORPH armeb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/a12f274360e466ec3ba1768dc44d02fe8b430466 | ORPH armeb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/e95dceeb340dd928c9dab302a687dda89f8d4af8 | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/d24d0a4b814d4d18a0e6872cf19d7ed30938fce4 | ORPH x86_64 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/c94e58a995bbc6bf8f8b170b3d19713fa115dc34 | ORPH arceb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/e2d1cdc259214a71ac404f14341997dcaa0ba6e6 | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/8ab3ed1e1269da43f5ea2d0c6fa69890e8027df1 | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/1cce17834935a8230106979b44da1bab21858e21 | ORPH microblaze | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/0adf8ebe5079aed0b1e7d8eaca49e6c910ca7e43 | ORPH x86_64 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/b0e5fcab9eeb799e31bca27fcb7280b728349bc6 | ORPH mips64 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/12e9aa42938e9c881a93bc1c4c9024b8c642df18 | ORPH arceb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/0ff34b89455edba5bdceee1a7cc322c7cfeb59f8 | ORPH x86_64 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/f8cb91f7f9ac6a46bb2ecfc22c1e42cf699f28d3 | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/f1f806af2f46e97b05f932bc0799c265c5138faf | ORPH armeb | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/a25f60dccfb2ad56114b0f6802e15403e75b229e | arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/9d940b5d5d9488c741c7bee8f426daffbeeea044 | arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/64d963395cf0383003e68c3c5f4f4a587f0d6c46 | powerpc64le | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/1a4d57fa7ecfc1111e2c24742cc346b073fb69d6 | microblazeel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/837ca4f9ab76b582136cfb517b16924af14a80a3 | nios2 | bullet-3.21 | NOK | http://autobuild.buildroot.net/results/97b9aad5a2c1cb80d9efb0e5f39d3143a8a61651 | armeb | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/dfffc0d5d48beaabe2cfa23d23857abb576efb6b | i586 | cni-plugins-1.1.1 | NOK | http://autobuild.buildroot.net/results/59fe4e0cea93abe0553ac2d717ab6219bb8ed656 | i686 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/c0bd0bced08c698d91bf61cef4a99067a278bcc3 | sparc | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/90c6a4e6fd1c442e4bb04d3a65217e654397c048 | microblaze | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/3eaac933918bf3c2c57e502dc8d75e2f5f117a93 | powerpc64le | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/9b7ad88e8c8f013d438214838bfb6647266afe5c | mips | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/f6d8ebbc5f8294ce16b07fedc05853e97cd931d2 | aarch64_be | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/e6b7fd62f4fdec8fcf2c2e0e9990a4ac5c0e2782 | xtensa | dash-0.5.11.5 | NOK | http://autobuild.buildroot.net/results/5eb61c6b77f5ef71d5c99a353174f4dc133ea0d2 | ORPH arceb | dawgdic-16ac537ba9883ff01b6... | NOK | http://autobuild.buildroot.net/results/2355ab9b9a8594463e195d9657df41f9a3c72c64 | riscv64 | dropbear-2022.83 | NOK | http://autobuild.buildroot.net/results/edbc6b915292abfba42fc7fcadc2eff1c8dd6e1e | mips64el | efivar-38 | NOK | http://autobuild.buildroot.net/results/2270f2ad58838327b823fbbe73a35efe9b00c1b4 | i586 | efivar-38 | NOK | http://autobuild.buildroot.net/results/06697fd7e5b94c441f3110878899894583886f4e | i586 | efivar-38 | NOK | http://autobuild.buildroot.net/results/552d66a4eb07e429a53bf934a79ba46671401936 | or1k | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/6237714cd398b9b02e0dc2d4989fa1570ffe1727 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/660dceb10059b3acdee0b4ac219fa9574f0cd40c | ORPH arm | erlang-22.3.4.22 | NOK | http://autobuild.buildroot.net/results/522ea05bbc4fe86d2aba0feeca31092ec3769018 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/11dd5ddf9ab3cfd1464a212f4e3d923832d53462 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/176b6784b0bcdb7601fc4b3cf1f11de6893c7774 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/94d5729c9903f7502f510fd8297a19dfbc69e83d | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/f9a5063e4f0ef728b256904187431ef697e04b35 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/3309bce201343d2fcde39ab567300d8c21a7fff9 | ORPH xtensa | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/b4aada606d4fa21810edb3f2dc98586c1c26dd44 | aarch64_be | fs/btrfs/btrfs.mk:55: /home... | NOK | http://autobuild.buildroot.net/results/4c07315debc15b962fbe8e3ff976f4bd910d971b | arc | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/8711babc34893c7b84975af9b744195f49a48c59 | sparc64 | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/84f13b28ba1060193b00197523c2bc6d0ef24b84 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/843cfe86c2c5410459f4ce7f712966e9cfffc416 | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/c8138825a83ae817b2dac35666e63dddbfb5c21b | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/6b96f0042c91e72796217145cf06439bf9e10200 | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/be0ebf20cdf812a5b8b5f99c1bf6590899395588 | i686 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/7c48c6105e9027a56733d5e1905596b63429bf66 | x86_64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/9af74db4d661817044618cadb621ba0485fd1ecc | powerpc64le | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/62c226fde28e10cc5d6d31aa9493e9d5976d95ad | s390x | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/a4ca1236e5a9821df869e27f0c40b0eced8685d3 | sh4eb | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/b911daee3dea4ac6e995e6e88723358979dea6ae | mips | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/cbd13691742c7e47dc9dcf7949291673c9adf4e7 | x86_64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/1f085427d8aae5a27802ca36b0ec2733fbdff825 | powerpc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/9a18a4b30a35e266215a7c2cd22f736305ab8378 | mips | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/47e4d8e1adce3d1dee3bcf5aa72584bab4292262 | powerpc64le | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/098b24dbf46ab84f16f4b20e4bedc264da71fb58 | s390x | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/1887f0f1827df1e3f087f3ae7461225f39d7392b | or1k | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/cce845a2cc819146813a2373c3cb00448d23c599 | or1k | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/cee80983cff8ce48494921e8ba2c3805c31714eb | or1k | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/4e777772b0182a7cba18df83d880fa97eb984b40 | i686 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/919dc2b0655b2c2673b8adc3aabb426a195a02f5 | sparc64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/01716279ea72338955735f10fd648e4b75f56853 | nios2 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7802a390003a774fc44c731d11097c241e0dfee8 | mipsel | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/49a8e09ac94be96f2fce16c8f3304e54a35de9d2 | powerpc64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d4154ff57a7c7a108eabc31211146a36a4f7b4a8 | or1k | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/23ec98ef13be7d1135f4013173677fbd52ad0b95 | powerpc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/4388cf0935dd6e7bb65a7c3124a65d5c8f6f8773 | m68k | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/783fdab1db8cdeef0d14b49a1c720886fd28e661 | riscv32 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/f602dfc777ee5c4bf3f8e026494cb2ccf0a0cdc8 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/4d35bc19aab3c6f6255fbb2570e17ebcfa104706 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/4cdcc6e3c184a9237e9b735b80681a0cf79ba82a | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e0394a4cc156a9c7be939f2668e1efe31d76e3fb | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/bad3ececba126be3d16683502ee56ccea5e0b502 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/15113526c20d696b5e3f0872f6a36a6052986edc | or1k | glibmm-2.68.2 | NOK | http://autobuild.buildroot.net/results/4fc9392d9e0188810fe5171c6860fecd2479d448 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/ddf47166d8ec2d5631d2dd81f039342d1315279e | ORPH riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/ab11c696d7dcccbd67166533e25702203f8cb56f | ORPH microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/84b8e3da76df77beb48851f5e9192db121a7e18c | s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/77e040aec694fd84b85411d63dbeacb91dfee583 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/bf6d606fb63cf35e24f3d160a01e37a8eb67e9e5 | ORPH mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/eddf60932c365d4681444ff5e905cec42dc52e72 | ORPH mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/555338315f339a02670efc26b656a79211a62c1f | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d65ba69aa60feb8f06e0b63db327faf6d7295327 | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/4e955fc1bf97545d0afb05de1180fd9c778b7546 | ORPH x86_64 | gummiboot-2bcd919c681c952eb... | NOK | http://autobuild.buildroot.net/results/08e4d20b0b08a5f18f0c1bd9cb78ee73ba4f4b74 | powerpc64le | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/4c8a8a94f7b2267668687f8bdbb37d9847ad50ae | ORPH sparc64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/b0dd50a74961d05c26666012ebb135ebdade4209 | ORPH armeb | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/a726deb23014b79b15b9ea88c84e042180c9ed79 | sparc64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/033e72d9310aadbcc8928b520a986f36f23b48e0 | powerpc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/4c91c9ee2b55f49512f147701d9fcdbccf34982c | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/9cb54fe163c1cac8e02be547e38e2095746b96d7 | powerpc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/08db32f899885389b8616aab603b693f69ed7cfc | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/a015ab14cdf0bda5c42ec08f9d5412f43ee4c24d | mips64el | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/da406ca810d6f26dfccfe6a75424139891e12cd3 | xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/7869d45d5feac72bbac6d16c144a8fe1b5439b1a | aarch64_be | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e0320dbc6c92e1ff9c9b87b8e6eee7bf4db56436 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/8e88624c74be9ad469622db0b70d612c825f32eb | arm | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/730e7c627342ee124f5b484a65140c2d27f65d00 | sparc | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/9e3fa76c6ff58f33e4a261321a6ba2b7382c537a | sparc | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d7b9520a38c7a0fae66f6542c1609200cc68a387 | powerpc64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/fdd8db662d71caad02327eefd9639a9a860c149e | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/06d46aa0eec7e16c2da589e58f1eff259d80d61e | aarch64_be | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3b3e5f761353e552f45679fc23b356e9ac2938ba | sparc64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ce510c4eb688aa494c0369b2c0b8fd986f8e7c90 | sh4eb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/c3cdce9556d6634bf8b82e5fcc68b0783ddc8f73 | aarch64_be | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/9380740a77790050c4e60aae63b8b64fdcda1c8d | powerpc64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d7d29be7fea7b2e8a0c5c0237946c0635100fea9 | armeb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/48d2b3d9ef0dc3b9c8c3c897c268dc08d2b0be81 | mips64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/beeb5c43be33b1e422d4b2327a799d52256bbfea | sh4eb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ff80790070b92c4f31f9c19ba80a9e7ba0d4a7d1 | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/a68071c232b02a2d79f2876785ae8880704e5827 | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/acb1e9001f713774230b5906a0912c7351a850cf | aarch64_be | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3620ece383636433c06c58434819a1f83187935e | arceb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8426a0579d1ea17ac86785b68686a3cf46323415 | m68k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/cc91fe25469926b33db0c51dab438df9e545eb64 | arm | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8f6a0e1fc284c88e5e2cda1a2f94aa721de359c6 | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/0dd6abbd3db05ffade67e4191df78278f5f4b0ce | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/622ae6f478a1f43353d65ab6b86c6de390d128c4 | arm | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/da479d92663dfa6bc5857cce37da19f4b44e73b5 | powerpc64le | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7376c031953911f71cd974ecbc09bb6ee8ed9a90 | mips64el | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e130aba82bed51a357cb7cc9ad833c0cc23d91fd | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/95119aecf6ee7220aa2858cfd9d619714cf2bffd | powerpc64le | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/5703061f1b6e722a07555df3d89d65772e820eb4 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/6ed8ffd00f5711875a5c9c770fa4f3f364a9fe47 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/5a5c52b909cea51e2328548ad7f13f81bcdac589 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/2c01f058487a149cdab1a71e2fc586dec6a498e5 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/6a4cd44bea1259ad2819d6cb9dc6e1236952da9f | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f9e4fc8522a7719418307f46192147c48cb65eae | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/c72a0d61d9aa3f4c85d352173cdc1527ecdb479b | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/c32c08909766e46ebee7fa13d980540a2ef4c5a0 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/cae9be44b101a5fb6c34bf2d00f155194c7039da | aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/46499c8d4e787688cf882262413ff2e69c21998e | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/516ab16d0bb3b81a2ddf1615a01038aca1e98fd1 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/42c784ae9df9d0b3a1680da312a77a8a170df1bc | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/c26e08ce27e87c888d01e3ac7c4d07adce3c97cd | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/2713fd690a69b7f463fbbbca1f172c60d1e7d78d | riscv32 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/efb274fdfa01509dfb0f26943a3f93053d754dc6 | microblazeel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/b8497ce2b8a871e4ac91b7506908beec3125288e | arceb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/dc49a91fffbee276c4d2668b4cdb1fae48e670a3 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ad6f218301a23e9bff85c7fd1d74d3fe8260f892 | sh4a | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/167c14e13ccb13e002efed461d46cf74c7e3ab52 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/bb9ea1ebcb81a0b87215822ec3b9bf704b4ffb8d | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/b2d06fcd51c7e2a8e7535c1ebf21befd2f923009 | sh4eb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/3f0d13f5a72d7edbaf9f59e14823276a4c51a937 | s390x | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/9a94a8f5946f0f3b61ca00f07848ec5ba2395983 | sparc64 | host-python-maturin-0.14.9 | NOK | http://autobuild.buildroot.net/results/03ae6e2c838e149bfee196ee3a734059365f6c2b | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/01e8c0bd1634d303156f0558eeac0ae98d0022ae | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/a5a8b9c939aa6b4d247c88744202f13cc47bc8ca | armeb | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/fc017d7e3e131b026c0fcf72f7f6d375d6d83d4e | m68k | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/4bd9603ad1478a41d4f00b5a467daf0321139c6d | nios2 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/91290f39fb1207879167c698cfa6eb99b502aa30 | mips64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/b59963f9706a55a20acbbb89b107622512576958 | arceb | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/cf9752ce97b850c9f84092849941b330e941400a | x86_64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/61ff0273c309fcb2d5535f002161558bdf802ea9 | armeb | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/efb7bf2bbdee51920effcde954de272db9ed3329 | arm | imx-alsa-plugins-rel_imx_4.... | NOK | http://autobuild.buildroot.net/results/f2b8b1b180b9dc4447df28903c98dcec77cef2a9 | mipsel | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/0077dd7f1d873b4f96db74298a76987fae25f159 | microblazeel | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/e73d087842ebf01caaf8970892aef915ac1a0749 | arm | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/6cb8eb1be2ad2f70ac883cc63cd8641229045daf | mips | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/3cb86b316fe01ad705c4ad8094cd7832b0d311d1 | x86_64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/e07f11c3102d3af7c896bab58e5c860a9b09e565 | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/3e26b3dfad9a518614035bcaa162dbda5221d408 | mips | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/7ec3e206a4d7ce8dbc3839900a2d3d91fab230e0 | or1k | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/ba96ba0c08cb4a8fa4fe3580a06b36719a0a9cf5 | riscv64 | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/3fb052dad3c8a2c934a0c50eb5ed5ef33375d9bd | armeb | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/7ce4e8dc541ad977e31c357ee8d962ad99feea18 | ORPH x86_64 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/f0dba05a8384fff66838b6f851e7697e48fe5f1f | x86_64 | libblockdev-2.26 | NOK | http://autobuild.buildroot.net/results/6e1c532935157024f42e1180a25c39938b3998d1 | ORPH powerpc64 | libcamera-apps-1.1.0 | NOK | http://autobuild.buildroot.net/results/519d002311dc345c1c2713302770bb6386e828d0 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/90744e59992d197dcd9e8d1e3f80ad5cd9e8b7f3 | arm | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/f9ce4e2c73101f1430615e9cad727fe38f70a65a | or1k | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/780c6b01b830d10fce248c5698c8ba60de7748f5 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/767abddd528b0432499161405c6e8335e742d9ab | ORPH armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/e23d4c60fb6bbf58f763167541800a8811f82393 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/b072ad3747cfa59c08fe7ee740225caa4744e87f | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/d7b7a78b72f2c374942fc3689c8e1bc5cd3ab171 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/59b5676ac11b3ac5d21c6ee33f075dbd55fee1f9 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/b34b0b3979544e2987da3f3f5d36ce54da957c17 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/5ae8fe64fc331be06c922291b4de7203bb3622b7 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/6de0507bbd9c1d366eccd6ffa579dcc614294b6c | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/2a83f7dbc8536c4da50fd327538cf0b908ce9ee2 | aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/c52052eebdb5a3e70f553dc5670957fade8c52ec | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/64f5ec7a1fefdb84c68d0dc3717e05bc5b96a8da | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/be4454bf0de2beb1365fe1019dac5c500b37c9b5 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/05f6e682437a813db4fe2b4984f73216623f9ec7 | ORPH mips | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/379d1d09740f713ef0e596046d4457594532b1e0 | mips64el | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/6c142e9881c3d4ed3be8437bd1b93f2fd1ad7dd3 | or1k | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/7dc4efe8ccc401afccc6489921d54af8836be2cd | arceb | libsigrok-0.5.2 | NOK | http://autobuild.buildroot.net/results/1efd80d0c3fb99bbb6babb1936e493ca3ad60ce8 | ORPH xtensa | libxml2-2.10.3 | NOK | http://autobuild.buildroot.net/results/5d342f639a2b633f32a23e8c41456bdd34536b3c | mips64 | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/e118ec23b32e9ca1f2da2c5c49d276d50c49d31b | ORPH microblazeel | linux-5.10.145-cip17-rt7 | NOK | http://autobuild.buildroot.net/results/39acd8bcb5878d51b321c1ff06c592206ac90626 | ORPH sh4a | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/32148c0f682c2570d47d94c489f701d588d8ba27 | ORPH mips64 | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/7966d155b6413412d8da8ef2331a26f597883591 | ORPH powerpc | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/750d9cd28e508daf1223f34141c2dc2cb05001b5 | ORPH mips64el | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/edb09f032211ca0443884978c7ae775b43d71ee5 | ORPH arc | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/17e6c3f5e0ff1b27a3b05636caf85586efa386d2 | ORPH aarch64_be | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/dafb02e0057a58dbfe3db83016b6b707026eea03 | ORPH sh4aeb | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/4b7e2c0ca0d0ae1fcb5aae7d1ba880282e4b7300 | ORPH mips | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/170bed47540bbd662a8c3b533988e8512301f317 | ORPH arm | liquid-dsp-1.4.0 | NOK | http://autobuild.buildroot.net/results/3e80c7395318b41cf3f9d42bf26d668ce5d6a5ad | aarch64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/baf7ab819ed03df4a680755942b6031db89368f0 | ORPH sh4a | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/48dea60ea7f9023e99758f60cd4b19d739906d1d | sparc64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/96b2e7790210f3f3423a08efe8fad713f850fcb7 | powerpc64le | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/712d3ca61744a015a24b590b4e1474a31a9998ba | sparc | mariadb-10.3.36 | NOK | http://autobuild.buildroot.net/results/f5057a2250b7a1da6f0154e3666dd76fa75fa85b | ORPH nios2 | matio-1.5.23 | NOK | http://autobuild.buildroot.net/results/e54b0ba74300beeb4c77a9a1603704dd30d3e031 | arm | mesa3d-22.3.4 | NOK | http://autobuild.buildroot.net/results/346f19c3934f07e1ff7b41ddc6c4f85d75d77f36 | aarch64_be | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/5323370552b56e13f40e36b5225402b612143c7d | powerpc64le | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/ad04e9a278e61bf09de392e365bee14952fe71e8 | aarch64_be | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/4d27d19625a36eeaa332cf0441afb693d86b335f | sh4a | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/0680dbc95601fcd8cdf07b926ea5e9be2079c7bf | arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/777416852771e3d7a267cdd82d370f3b55ddf45b | ORPH aarch64 | ne10-1.2.1 | NOK | http://autobuild.buildroot.net/results/086f350ebef0ec3821aa1c1133a867dd4e36526c | powerpc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/eb72214017fe27757d8bbf4503a5d6a22819a6f5 | arm | nginx-1.22.1 | NOK | http://autobuild.buildroot.net/results/f3886cfb12826e97a485853109f0042a232b2982 | arm | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/68cc8463e86128688b62e5b42fe81e07381acd34 | ORPH aarch64_be | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/103987c98ce190316740dc158992b980036aabac | ORPH powerpc | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/a5c71d8cd429647769b1ed1411442661728270b2 | ORPH powerpc64le | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/fed396a3458f8a979ec6131235bb1afc50c22759 | ORPH or1k | numactl-2.0.16 | NOK | http://autobuild.buildroot.net/results/a9103623601cbb591d4b3fd66e5843a2cd16ad2b | mips64el | nut-2.8.0 | NOK | http://autobuild.buildroot.net/results/2bc4bb6a56e5b27228f9a55611ba8c13e29a8b9c | powerpc64le | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/308b275f9fea3f4f97f0f7cf7b390fd9647c3092 | ORPH powerpc64 | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/77187cf59f24a52c25883a858958a1973fe918a6 | ORPH mipsel | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/8f0d0e33c495c828f53bc9e32ed3e48ace72824f | ORPH mips64 | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/425f9c25e27f46dd181467c888208b810102e862 | ORPH microblazeel | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/f51c3e84d569ca6dfdfc2cefe5c4de9bdbc4f538 | ORPH powerpc64le | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/47a83c43d54b4176fd52a77176aab5d14faefbea | ORPH or1k | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/95843e6b1e277b1917386abb3b0c427c09f93767 | ORPH mipsel | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/b8fb1775d38410d8b4f3843ee3c729f6bfb3a638 | ORPH powerpc | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/11157897a8d2f8a1a74c55a637d5edac1bfed7a1 | m68k | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/e0b710a814f36fcce8da04371dd71787192e1d6a | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/64227df570d310ac5fbd2c2764ce632528181796 | ORPH or1k | pcsc-lite-1.9.9 | NOK | http://autobuild.buildroot.net/results/7519c9a90154eae0b4608c7877bb5784daf5ddc1 | ORPH arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/be1f4a62ecfc7e65ea7b64e8ef15579d9814d284 | or1k | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/08d87e0d0ef0223b2f8f2a59b13de24c97c42c7d | sparc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/56ca27b88420e160e5702dbe301dbbcea5370bbc | arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/99f01b4a582b5470a59e9d1bb20133e500d6f771 | aarch64 | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/fa70a585833059e6d229a295226b33784c0f2027 | aarch64 | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/8d54c99573431b43a73364074f33811c6998c89a | i686 | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/7b9892d5a05b58c596ae7d5944ec8cb2388ed103 | arm | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/5facf207784fa0e4605723093db462a719f1c54b | arm | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/c53ee5b2e111167061ec299e2aa6f91d7d90e315 | arm | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/c9db861e206437a533c05ad98cfdda6b3602394d | powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/c91d21e7bd1221a3bc1804c59200def5d3748e52 | mips | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/5835817d60eb9779ba7fb81892426e3e30762827 | powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/e8ebef4bf8c387b1679f01cea721f5a3dec3ad1b | i686 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/5322a673fb003e6ec45cb61310664d7427c885e1 | powerpc64 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/10c2cf51430a4f88ce0b225f8480c591fdcbbb0d | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/f549699d2fbbbd402e06dd20383981ad33e59dff | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/0289903ba4cb519df4b0e7469b3a1a30cad6a8e9 | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/7dddebdce5e5055601c9f4e807786f1a5e967bd1 | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/8ac8803c7427800c7875c82eb62d8e85726612fe | i686 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/0c9aac1f48676256e43d1f3d9b1ccd4748d03b2b | sh4aeb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/ddc542c393ac8c3ddeb809c62e47202271c4dc68 | microblaze | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/37ec7133862a1492af93e12661575068acf29c48 | aarch64_be | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/6bde94a026c1f4e2a147632a1f9939f66da9cafe | or1k | skalibs-2.12.0.1 | NOK | http://autobuild.buildroot.net/results/725bce7ef61c02f082be0ae99638b1c29e656de3 | nios2 | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 | aarch64 | strongswan-5.9.8 | NOK | http://autobuild.buildroot.net/results/3e7907d9d3863119e73723518caa4f0f46bf67a1 | x86_64 | tealdeer-1.6.1 | NOK | http://autobuild.buildroot.net/results/8fcbc18e67185e900a1f547e7e4386008d21a90c | aarch64 | ti-k3-r5-loader-2022.10 | NOK | http://autobuild.buildroot.net/results/855773ae975e8998dae1a693ca096f6fbd35c0dc | xtensa | tor-0.4.7.13 | NOK | http://autobuild.buildroot.net/results/6f102f1f5891b10ade216dbf37e17651d2b00fae | or1k | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/0c12d537d6ff03171c8deee72f22a4b75183951f | nios2 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/3e0717088d08379369acd8a29bfc792c9cf61e70 | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/372bd8c54d35dd5239508c71093f1d4643aa7cdc | powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/89a3b7cbfd68bcb8600da412673838f67f89dd83 | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/8731d747a4ad48e3be10358fd31b16bea74fce97 | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/d80b2827c1906c6147fd898067fb6202be37605e | sparc64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/d9325c522f97fdc74c07f3364394b2c40867cf28 | powerpc64le | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/1733ead45aac547b567e43653ec99e7fb7a2a7c1 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/11a6de30174bba0b22b43b182b9247154f10f990 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/df626f4b14e481b5e178af374f613d8fdeb6bca8 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/b58130b694382d75d70053537b8db642abb6d015 | sparc64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/58faaf660abef33af9fd2913728404323953554b | ORPH mips64 | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/5c333196b795e75c42dc42b749d56c61feca4331 | ORPH riscv32 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/0b32b8fc1b0ce5b15b94dc2b79ffc4d90e078676 | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/907a5967439c3157c426023b0be1e613092d7bfe | i686 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/d63e688833fa523a5dd9265bbf41089188d478c3 | microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/72fe77edf6194ca8d7f827310547a9c72da8c7dc | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/7ccfb9514a36fc5f2ea3df5f77fb2872faf5cbca | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/efa25b6d773fc6ea3c022b5910126896372edd60 | ORPH x86_64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/ed0ec16494004d116d80b274203fe17526a2ee03 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/90fbc288564d74eae2adec6796e279a152d80282 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/b7f221f8057edad91bce8f049ecc2771234ce25a | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/7841d9eac4a22b6017eacda8ed7b257581cbb805 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/a858628274d12478992407fd10a116572588828c | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/ea3f545bdd059f98ae077a781fca26d16ae1bdc7 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/76ecd71355c43b94fe127ae0c09de437fcda6fca | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/fc7cea1b65babdb6c07160d2adf69205dd5f442e | ORPH m68k | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/9120ecc67f77c4316cf57114a2e0c0efc4d07863 | aarch64 | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/33849e7481cb8050c876673e102cc85c09825d5e | Classification of failures by reason for 2022.02.x -------------------------------------------------- host-delve-1.8.0 | 1 janus-gateway-0.11.6 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/3ea7d6491ed7e7f7f4ff8599ec5dd7130dc6fd60 | sparc | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/1f49e42cd33a9dc9d75108e3c2c39b6d997f65be | Classification of failures by reason for 2022.11.x -------------------------------------------------- host-pahole-1.24 | 3 glibc-2.36-66-ga1dc0be03c9d... | 2 fs/ubifs/ubifs.mk:49: /home... | 1 gerbera-1.10.0 | 1 host-binutils-2.38 | 1 host-go-1.19.5 | 1 libglib2-2.72.3 | 1 libnss-3.84 | 1 lirc-tools-0.10.2 | 1 mpv-0.33.1 | 1 perl-5.34.1 | 1 python-cryptography-38.0.1 | 1 qemu-7.1.0 | 1 quickjs-2021-03-27 | 1 uboot-tools-2021.07 | 1 unknown | 1 zabbix-5.4.9 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/f29599f7ccbe6889b60d250086e1a6b3e6b51945 | i686 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/61b1856af8c1b6711409639796a123c8d5e910b1 | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/4807000643acaeb282277d3a128e32ce6404b853 | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/379db648e34b99f05a194f47ba42bf8d52439df8 | i686 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/f5ae3184e376ee858415c479ff0e7b7721294d6e | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/3717aa01d531610fa09aa6c7a33795dd36031ecc | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/54c6f8385b0ad0111c00dc693772583c99bac4d2 | microblazeel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1c7884d635c9a3e39b6c0e2ae4055f16d257548b | arc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/caf24a1c7a0284e1533b7d08846cf3c81889f266 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/19450e40df046eb154a2c6207ddd2d851f474c08 | mipsel | libnss-3.84 | NOK | http://autobuild.buildroot.net/results/ae4356cfb58ace8a7687ae2d7382a26acfad47c0 | mipsel | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/9ddffaf1d0bc2a99b255fec853b35294be977521 | ORPH x86_64 | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/79970b5e43daf76e63fa5c3ce56a0e78ccc6016f | mips64 | perl-5.34.1 | NOK | http://autobuild.buildroot.net/results/56665e5cbfaab9de3dc1d5640a4adf8c3be9e6c7 | mips | python-cryptography-38.0.1 | NOK | http://autobuild.buildroot.net/results/2abbb66a923e8a86b9fa01c740d16e7d84d91376 | riscv32 | qemu-7.1.0 | NOK | http://autobuild.buildroot.net/results/3008696b7272f61040bd0b2812586a2e215151b3 | or1k | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/1ce0158686a5e60fa5143493b91e771a8b39ebd3 | sparc | uboot-tools-2021.07 | NOK | http://autobuild.buildroot.net/results/6fdd9fcd5741ec828a4c57c3292c09e3103f625e | or1k | unknown | NOK | http://autobuild.buildroot.net/results/81bafbe77abe2c38cf28f5733981de22472ba84d | s390x | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/74b7ac08ecfc18e9ca9b9526a5267d6f32681d09 | -- http://autobuild.buildroot.net From peter at korsgaard.com Fri Feb 3 07:28:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:28:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-compose: security bump version to 2.15.1 In-Reply-To: <20230202134149.1864294-1-christian@paral.in> (Christian Stewart's message of "Thu, 2 Feb 2023 05:41:49 -0800") References: <20230202134149.1864294-1-christian@paral.in> Message-ID: <87sffn2onv.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Fix CVE-2022-27664 and CVE-2022-32149 high-risk vulnerability. > Many other bugfixes, enhancements, and improvements. > https://github.com/docker/compose/releases/tag/v2.15.1 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 3 07:28:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:28:55 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/containerd: bump to version 1.6.16 In-Reply-To: <20230202133453.1747150-1-christian@paral.in> (Christian Stewart's message of "Thu, 2 Feb 2023 05:34:53 -0800") References: <20230202133453.1747150-1-christian@paral.in> Message-ID: <87o7qb2onc.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Bugfixes and improvements. > https://github.com/containerd/containerd/releases/tag/v1.6.16 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From buildroot at heine.tech Fri Feb 3 07:29:33 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Fri, 03 Feb 2023 08:29:33 +0100 Subject: [Buildroot] =?utf-8?b?Pz09P3V0Zi04P3E/IFthdXRvYnVpbGQuYnVpbGRy?= =?utf-8?q?oot=2Enet=5D_Your_daily_results_for_2023-02-02?= Message-ID: <66d07-63dcb800-3-60a2a380@15361192> Hi Thomas, On Friday, February 03, 2023 07:45 CET, Thomas Petazzoni wrote: > Hello, > > Build failures related to your packages: > > arch | reason | url > -------------+--------------------------------+--------------------------------------------------------------------------------- > arc | boost-1.80.0 | http://autobuild.buildroot.net/results/64d963395cf0383003e68c3c5f4f4a587f0d6c46 > I submitted a patch for this a while back. I think it got lost. Care to take a look? https://patchwork.ozlabs.org/project/buildroot/patch/20221223133401.97844-1-buildroot at heine.tech/ Regards, Michael From peter at korsgaard.com Fri Feb 3 07:30:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:30:14 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/cni-plugins: bump version to 1.2.0 In-Reply-To: <20230202133151.1671576-1-christian@paral.in> (Christian Stewart's message of "Thu, 2 Feb 2023 05:31:51 -0800") References: <20230202133151.1671576-1-christian@paral.in> Message-ID: <87k00z2ol5.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Adds new device driver main/dummy and various bug fixes/cleanups. > https://github.com/containernetworking/plugins/releases/tag/v1.2.0 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 3 07:30:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:30:40 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/moby-buildkit: bump to version 0.11.2 In-Reply-To: <20230202134623.1912767-1-christian@paral.in> (Christian Stewart's message of "Thu, 2 Feb 2023 05:46:23 -0800") References: <20230202134623.1912767-1-christian@paral.in> Message-ID: <87fsbn2okf.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > https://github.com/moby/buildkit/releases/tag/v0.11.2 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 3 07:31:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:31:34 +0100 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series In-Reply-To: <20230202210432.2998354-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 2 Feb 2023 22:04:32 +0100") References: <20230202210432.2998354-1-peter@korsgaard.com> Message-ID: <87bkmb2oix.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > 4.9.x / 6.0.x is now EOL. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From christian at paral.in Fri Feb 3 07:37:55 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 23:37:55 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/containerd: bump to version 1.6.16 In-Reply-To: <87o7qb2onc.fsf@dell.be.48ers.dk> References: <20230202133453.1747150-1-christian@paral.in> <87o7qb2onc.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, I also sent a v2 of this series which adds the containerd.service for systemd. Thanks & best, Christian On Thu, Feb 2, 2023, 11:28 PM Peter Korsgaard wrote: > >>>>> "Christian" == Christian Stewart writes: > > > Bugfixes and improvements. > > https://github.com/containerd/containerd/releases/tag/v1.6.16 > > > Signed-off-by: Christian Stewart > > Committed, thanks. > > -- > Bye, Peter Korsgaard -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Fri Feb 3 07:39:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:39:16 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16 In-Reply-To: <20230203034443.326513-1-christian@paral.in> (Christian Stewart's message of "Thu, 2 Feb 2023 19:44:40 -0800") References: <20230203034443.326513-1-christian@paral.in> Message-ID: <877cwz2o63.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Bugfixes and improvements. > We now install the containerd.service systemd unit. > https://github.com/containerd/containerd/releases/tag/v1.6.16 > Signed-off-by: Christian Stewart > --- > v1 -> v2: > - install containerd systemd unit (now required by docker-engine and others) > Signed-off-by: Christian Stewart Sorry, this is the commit I've applied, not v1. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 3 07:39:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:39:49 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/containerd: bump to version 1.6.16 In-Reply-To: (Christian Stewart's message of "Thu, 2 Feb 2023 23:37:55 -0800") References: <20230202133453.1747150-1-christian@paral.in> <87o7qb2onc.fsf@dell.be.48ers.dk> Message-ID: <87357n2o56.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Hi Peter, > I also sent a v2 of this series which adds the containerd.service for > systemd. Yes, that is the one I have applied, not v1. Sorry about the confusion. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 3 07:26:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 3 Feb 2023 08:26:52 +0100 Subject: [Buildroot] [git commit] package/docker-compose: security bump version to 2.15.1 Message-ID: <20230203074021.3870A83610@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67c92fbd5004a750e6af253dd1eba4c3f669ef42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-27664 and CVE-2022-32149 high-risk vulnerability. Many other bugfixes, enhancements, and improvements. https://github.com/docker/compose/releases/tag/v2.15.1 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 7a7ab5f110..2c924d5080 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5cbf6cd1dd8ce98c5e2d62ca7f622e96abce444979b8e8852b033213a98e2049 docker-compose-2.14.0.tar.gz +sha256 346571ca487bf3f4b3dc9caeadc88a645354b0e098fa60f350249ec35ab3f240 docker-compose-2.15.1.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index ef9ee97196..3bced8bb7b 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.14.0 +DOCKER_COMPOSE_VERSION = 2.15.1 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Feb 3 07:32:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 3 Feb 2023 08:32:00 +0100 Subject: [Buildroot] [git commit] package/moby-buildkit: bump to version 0.11.2 Message-ID: <20230203074021.50F5C83612@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c7c179e9a50b908b14aa2dd2f11c5df5a42109a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/moby/buildkit/releases/tag/v0.11.2 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- 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 43ee1b12c9..ef927636d9 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5ffe5a2d11736719649dae962461f66df394ae4cc1e58294e5f2bd4d4632d9d0 moby-buildkit-0.10.6.tar.gz +sha256 b1746575f37715a8a2f2df5bab77ea081ba8436854e241792702109fc9e3653d moby-buildkit-0.11.2.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 59d68a7dca..a25f676710 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.10.6 +MOBY_BUILDKIT_VERSION = 0.11.2 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Feb 3 07:32:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 3 Feb 2023 08:32:00 +0100 Subject: [Buildroot] [git commit] package/cni-plugins: bump version to 1.2.0 Message-ID: <20230203074021.42F2383611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb6410b09b339a372e1cc9b9f09901635ebdf406 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Adds new device driver main/dummy and various bug fixes/cleanups. https://github.com/containernetworking/plugins/releases/tag/v1.2.0 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/cni-plugins/cni-plugins.hash | 2 +- package/cni-plugins/cni-plugins.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/cni-plugins/cni-plugins.hash b/package/cni-plugins/cni-plugins.hash index fc3b5a7ead..0c3e07c91c 100644 --- a/package/cni-plugins/cni-plugins.hash +++ b/package/cni-plugins/cni-plugins.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c86c44877c47f69cd23611e22029ab26b613f620195b76b3ec20f589367a7962 cni-plugins-1.1.1.tar.gz +sha256 f3496ddda9c7770a0b695b67ae7ee80a4ee331ac2745af4830054b81627f79b7 cni-plugins-1.2.0.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/cni-plugins/cni-plugins.mk b/package/cni-plugins/cni-plugins.mk index b30937095a..be02c2ff45 100644 --- a/package/cni-plugins/cni-plugins.mk +++ b/package/cni-plugins/cni-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_VERSION = 1.1.1 +CNI_PLUGINS_VERSION = 1.2.0 CNI_PLUGINS_SITE = $(call github,containernetworking,plugins,v$(CNI_PLUGINS_VERSION)) CNI_PLUGINS_LICENSE = Apache-2.0 CNI_PLUGINS_LICENSE_FILES = LICENSE @@ -12,6 +12,7 @@ CNI_PLUGINS_LICENSE_FILES = LICENSE CNI_PLUGINS_BUILD_TARGETS = \ plugins/ipam/dhcp \ plugins/main/bridge \ + plugins/main/dummy \ plugins/main/host-device \ plugins/main/ipvlan \ plugins/main/loopback \ From peter at korsgaard.com Fri Feb 3 07:32:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 3 Feb 2023 08:32:09 +0100 Subject: [Buildroot] [git commit] package/containerd: bump to version 1.6.16 Message-ID: <20230203074021.7D0E683611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7ea83dd2df315ba4f492a9ef6b24152ba4cc4f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bugfixes and improvements. We now install the containerd.service systemd unit. https://github.com/containerd/containerd/releases/tag/v1.6.16 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 04a29949d7..16474089d1 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 b86e5c42f58b8348422c972513ff49783c0d505ed84e498d0d0245c5992e4320 containerd-1.6.12.tar.gz +sha256 e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a containerd-1.6.16.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 192175800c..4a0d6ec38b 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.12 +CONTAINERD_VERSION = 1.6.16 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE @@ -41,4 +41,10 @@ else CONTAINERD_TAGS += no_btrfs endif +define CONTAINERD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/containerd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/containerd.service + $(SED) 's,/usr/local/bin,/usr/bin,g' $(TARGET_DIR)/usr/lib/systemd/system/containerd.service +endef + $(eval $(golang-package)) From peter at korsgaard.com Fri Feb 3 07:32:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 3 Feb 2023 08:32:00 +0100 Subject: [Buildroot] [git commit] package/nerdctl: bump version to 1.2.0 Message-ID: <20230203074021.61BC983616@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02658dcc01f62aef26045affe37d21e6d3250256 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/containerd/nerdctl/releases/tag/v1.2.0 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/nerdctl/nerdctl.hash | 2 +- package/nerdctl/nerdctl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash index e253fb74b2..8f2c678198 100644 --- a/package/nerdctl/nerdctl.hash +++ b/package/nerdctl/nerdctl.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 ae468c65480e9c6679e0dd23d466b723e7f19bff779d4e2e0fa4629be343af2a nerdctl-1.0.0.tar.gz +sha256 08a84b9481b37dbd8cc6f955dbec0c18a1934bcffeb135fd5d2dc23987152b7c nerdctl-1.2.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk index fdf60cb189..7556bcc391 100644 --- a/package/nerdctl/nerdctl.mk +++ b/package/nerdctl/nerdctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NERDCTL_VERSION = 1.0.0 +NERDCTL_VERSION = 1.2.0 NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) NERDCTL_LICENSE = Apache-2.0 From peter at korsgaard.com Fri Feb 3 07:32:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 3 Feb 2023 08:32:00 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230203074021.6F44C82DD2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=def789059af78cd65294cafa4288cb41691e86c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 4.9.x / 6.0.x is now EOL. 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 e18b515311..a0e9286bd3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.5" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 157f267a9d..927172e8fa 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 bc7f6d9a8a8bbe9a723e82346bba94b58d926f78bfba106b21e041e0290076fc linux-6.1.5.tar.xz +sha256 d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b linux-6.1.9.tar.xz sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e7359bd2935b54fe8bb821cf748591c36a95bed019e752d3e4d5803d9da1ccb4 linux-5.15.87.tar.xz -sha256 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 linux-5.10.162.tar.xz -sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz +sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz +sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz +sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz -sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz +sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz +sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1ad9fffcd3..3a5207e0b6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -397,13 +397,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.302" if BR2_KERNEL_HEADERS_4_14 - default "4.19.269" if BR2_KERNEL_HEADERS_4_19 - default "5.4.228" if BR2_KERNEL_HEADERS_5_4 - default "5.10.162" if BR2_KERNEL_HEADERS_5_10 - default "5.15.87" if BR2_KERNEL_HEADERS_5_15 + default "4.14.304" if BR2_KERNEL_HEADERS_4_14 + default "4.19.271" if BR2_KERNEL_HEADERS_4_19 + default "5.4.230" if BR2_KERNEL_HEADERS_5_4 + default "5.10.166" if BR2_KERNEL_HEADERS_5_10 + default "5.15.91" if BR2_KERNEL_HEADERS_5_15 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 - default "6.1.5" if BR2_KERNEL_HEADERS_6_1 + default "6.1.9" if BR2_KERNEL_HEADERS_6_1 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 luca.ceresoli at bootlin.com Fri Feb 3 07:47:43 2023 From: luca.ceresoli at bootlin.com (Luca Ceresoli) Date: Fri, 3 Feb 2023 08:47:43 +0100 Subject: [Buildroot] [PATCH v1 1/1] board/versal/post-image.sh: do not require xilinx/ prefix for .dts files In-Reply-To: <20230202133817.56293-1-neal.frager@amd.com> References: <20230202133817.56293-1-neal.frager@amd.com> Message-ID: <20230203084743.0c49f73c@booty> Hi Neal, On Thu, 2 Feb 2023 13:38:17 +0000 Neal Frager wrote: > If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > buildroot into the linux tree, these .dts files are copied to > arch/arm64/boot. Unfortunately, the post-image.sh script expects to find > them in arch/arm64/boot/xilinx. > > This patch does not require the xilinx/ prefix to be present when > symlinking the device-tree to system.dtb where u-boot expects to find > it. > > It is effectively applying the below patch for zynqmp to versal as well: > https://patchwork.ozlabs.org/project/buildroot/patch/20230201195956.1758827-1-gsmecher at threespeedlogic.com/ > > Signed-off-by: Neal Frager > --- > board/versal/post-image.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh > index f45f29a155..92e65ed3b7 100755 > --- a/board/versal/post-image.sh > +++ b/board/versal/post-image.sh > @@ -5,7 +5,7 @@ > # devicetree listed in the config. > > FIRST_DT=$(sed -nr \ > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ Reviewed-by: Luca Ceresoli -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From stefan at agner.ch Fri Feb 3 10:46:45 2023 From: stefan at agner.ch (Stefan Agner) Date: Fri, 3 Feb 2023 11:46:45 +0100 Subject: [Buildroot] [PATCH] package/dbus-broker: bump to release 33 Message-ID: <175cc1e7e72602b9c0e8d6b761cf72b375383189.1675421166.git.stefan@agner.ch> This release contains mostly a bugfixes, with some improvements around error handling for unimplemented functionality and resiliency against runtime changes of dbus service-files. Signed-off-by: Stefan Agner --- package/dbus-broker/dbus-broker.hash | 2 +- package/dbus-broker/dbus-broker.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash index f6c2cbe160..89b27ddddc 100644 --- a/package/dbus-broker/dbus-broker.hash +++ b/package/dbus-broker/dbus-broker.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index e82b79220d..c4e3679a2e 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_BROKER_VERSION = 32 +DBUS_BROKER_VERSION = 33 DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) -- 2.39.1 From buildroot at busybox.net Fri Feb 3 10:42:52 2023 From: buildroot at busybox.net (busybox.net) Date: 3 Feb 2023 02:42:52 -0800 Subject: [Buildroot] buildroot@busybox.net have 3 Pending incoming emails Message-ID: <20230203024252.8E7A851294F844A4@busybox.net> An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Fri Feb 3 16:20:41 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 03 Feb 2023 16:20:41 +0000 Subject: [Buildroot] [Bug 15316] New: xscreensaver should check if linux-pam is enabled Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15316 Bug ID: 15316 Summary: xscreensaver should check if linux-pam is enabled Product: buildroot Version: 2022.11.1 Hardware: All OS: Linux Status: NEW Severity: trivial Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: jbittner.br.bugs at gmail.com CC: buildroot at uclibc.org Target Milestone: --- At present, xscreensaver needs to be setuid root to read /etc/shadow to handle login verification for screen locking. By having xscreensaver check if linux-pam is enabled and adding --with-pam to ./configure, screen locking can be enabled without setuid. Note: the relevant utility from linux-pam, unix_chkpwd *DOES* need to be setuid root -- You are receiving this mail because: You are on the CC list for the bug. From aperez at igalia.com Fri Feb 3 21:24:17 2023 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 3 Feb 2023 23:24:17 +0200 Subject: [Buildroot] [PATCH 1/1] package/webkitgtk: security bump to version 2.38.4 Message-ID: <20230203212417.874198-1-aperez@igalia.com> Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://webkitgtk.org/2023/02/02/webkitgtk2.38.4-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index eff7f5c18f..34fd19d3de 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums -md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz -sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz -sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums +md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz +sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz +sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b1bca7b88a..b42ac3b644 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.3 +WEBKITGTK_VERSION = 2.38.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES -- 2.39.1 From aperez at igalia.com Fri Feb 3 23:04:55 2023 From: aperez at igalia.com (Adrian Perez de Castro) Date: Sat, 4 Feb 2023 01:04:55 +0200 Subject: [Buildroot] [PATCH] package/wpewebkit: security bump to version 2.38.4 Message-ID: <20230203230455.1566166-1-aperez@igalia.com> Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.4.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index ccd928b3df..dcd082e045 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums -md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz -sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz -sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums +md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz +sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz +sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 4c50ed9955..34ee405de1 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.3 +WPEWEBKIT_VERSION = 2.38.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES -- 2.39.1 From yann.morin.1998 at free.fr Sat Feb 4 11:46:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 12:46:01 +0100 Subject: [Buildroot] [git commit] package/webkitgtk: security bump to version 2.38.4 Message-ID: <20230204114805.49FAE82B38@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca203080d132d44fc0b62148066b85cce66628fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://webkitgtk.org/2023/02/02/webkitgtk2.38.4-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index eff7f5c18f..34fd19d3de 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums -md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz -sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz -sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums +md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz +sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz +sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b1bca7b88a..b42ac3b644 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.3 +WEBKITGTK_VERSION = 2.38.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Sat Feb 4 11:46:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 12:46:04 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: security bump to version 2.38.4 Message-ID: <20230204114805.53C0C82AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02ace135ee0d31d30021cd000d0594bb6360ca94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.4.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index ccd928b3df..dcd082e045 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums -md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz -sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz -sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums +md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz +sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz +sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b2bbc0301b..54f37fd702 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.3 +WPEWEBKIT_VERSION = 2.38.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Sat Feb 4 11:49:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 12:49:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/webkitgtk: security bump to version 2.38.4 In-Reply-To: <20230203212417.874198-1-aperez@igalia.com> References: <20230203212417.874198-1-aperez@igalia.com> Message-ID: <20230204114900.GA14083@scaer> Adrian, All On 2023-02-03 23:24 +0200, Adrian Perez de Castro spake thusly: > Bugfix release, with many security fixes, including (but not limited to) > patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. > > Release notes: > > https://webkitgtk.org/2023/02/02/webkitgtk2.38.4-released.html > > Accompanying security advisory: > > https://webkitgtk.org/security/WSA-2023-0001.html > > Signed-off-by: Adrian Perez de Castro Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/webkitgtk/webkitgtk.hash | 8 ++++---- > package/webkitgtk/webkitgtk.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > index eff7f5c18f..34fd19d3de 100644 > --- a/package/webkitgtk/webkitgtk.hash > +++ b/package/webkitgtk/webkitgtk.hash > @@ -1,7 +1,7 @@ > -# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums > -md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz > -sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz > -sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz > +# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums > +md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz > +sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz > +sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz > > # Hashes for license files: > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > index b1bca7b88a..b42ac3b644 100644 > --- a/package/webkitgtk/webkitgtk.mk > +++ b/package/webkitgtk/webkitgtk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WEBKITGTK_VERSION = 2.38.3 > +WEBKITGTK_VERSION = 2.38.4 > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > WEBKITGTK_INSTALL_STAGING = YES > -- > 2.39.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 Feb 4 11:49:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 12:49:15 +0100 Subject: [Buildroot] [PATCH] package/wpewebkit: security bump to version 2.38.4 In-Reply-To: <20230203230455.1566166-1-aperez@igalia.com> References: <20230203230455.1566166-1-aperez@igalia.com> Message-ID: <20230204114915.GB14083@scaer> Adrian, All, On 2023-02-04 01:04 +0200, Adrian Perez de Castro spake thusly: > Bugfix release, with many security fixes, including (but not limited to) > patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. > > Release notes: > > https://wpewebkit.org/release/wpewebkit-2.38.4.html > > Accompanying security advisory: > > https://wpewebkit.org/security/WSA-2023-0001.html > > Signed-off-by: Adrian Perez de Castro Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/wpewebkit/wpewebkit.hash | 8 ++++---- > package/wpewebkit/wpewebkit.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash > index ccd928b3df..dcd082e045 100644 > --- a/package/wpewebkit/wpewebkit.hash > +++ b/package/wpewebkit/wpewebkit.hash > @@ -1,7 +1,7 @@ > -# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums > -md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz > -sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz > -sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz > +# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums > +md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz > +sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz > +sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz > > # Hashes for license files: > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk > index 4c50ed9955..34ee405de1 100644 > --- a/package/wpewebkit/wpewebkit.mk > +++ b/package/wpewebkit/wpewebkit.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WPEWEBKIT_VERSION = 2.38.3 > +WPEWEBKIT_VERSION = 2.38.4 > WPEWEBKIT_SITE = http://www.wpewebkit.org/releases > WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz > WPEWEBKIT_INSTALL_STAGING = YES > -- > 2.39.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 Feb 4 11:52:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 12:52:12 +0100 Subject: [Buildroot] [PATCH] package/dbus-broker: bump to release 33 In-Reply-To: <175cc1e7e72602b9c0e8d6b761cf72b375383189.1675421166.git.stefan@agner.ch> References: <175cc1e7e72602b9c0e8d6b761cf72b375383189.1675421166.git.stefan@agner.ch> Message-ID: <20230204115212.GC14083@scaer> Stefan, All, On 2023-02-03 11:46 +0100, Stefan Agner spake thusly: > This release contains mostly a bugfixes, with some improvements around > error handling for unimplemented functionality and resiliency against > runtime changes of dbus service-files. > > Signed-off-by: Stefan Agner > --- > package/dbus-broker/dbus-broker.hash | 2 +- > package/dbus-broker/dbus-broker.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash > index f6c2cbe160..89b27ddddc 100644 > --- a/package/dbus-broker/dbus-broker.hash > +++ b/package/dbus-broker/dbus-broker.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz > +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz > sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE > sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS > sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md Unfortunately, there are issues with licensing info: $ make dbus-broker-legal-info [...] ERROR: subprojects/libcstdaux-1/AUTHORS has wrong sha256 hash: ERROR: expected: 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 ERROR: got : e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 ERROR: Incomplete download, or man-in-the-middle (MITM) attack make[1]: *** [package/dbus-broker/dbus-broker.mk:71: dbus-broker-legal-info] Error 1 make: *** [Makefile:23: _all] Error 2 Can you look into that and resubmit the bump, please? Regards, Yann E. MORIN. > diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk > index e82b79220d..c4e3679a2e 100644 > --- a/package/dbus-broker/dbus-broker.mk > +++ b/package/dbus-broker/dbus-broker.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DBUS_BROKER_VERSION = 32 > +DBUS_BROKER_VERSION = 33 > DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz > DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) > > -- > 2.39.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 Feb 4 12:56:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 13:56:11 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/docker-engine: bump version to v23.0.0 In-Reply-To: <20230203034443.326513-2-christian@paral.in> References: <20230203034443.326513-1-christian@paral.in> <20230203034443.326513-2-christian@paral.in> Message-ID: <20230204125611.GD14083@scaer> Christian, All, On 2023-02-02 19:44 -0800, Christian Stewart via buildroot spake thusly: > This update requires a workaround for the non-standard vendor/ structure in the > docker-engine repository, which has an invalid vendor/modules.txt file. > > Removing the vendor/modules.txt file fixes the build error. > > Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > > The go download post-process script uses go mod init to create the go.mod file > which specifies a language version of go1.16 on default. Use go mod edit to > adjust the go.mod file to the required minimum version go1.19 for generic types > used by docker-engine. (Fixes a build error). Note that this changes the go.mod > language version and is not required to be equal to the current Go tool version. > > Note that as of v23.0.0 docker-engine expects containerd to be started by > systemd if --containerd= flag is set in dockerd.service, whereas in previous > versions containerd was started by the docker daemon as a sub-process. > > There is no sysv unit for containerd, but this is OK: in the Docker sysv init > file S60dockerd, we do not set the --containerd flag. The docker daemon will > start containerd as a sub-process automatically due to the absence of this flag. > > Signed-off-by: Christian Stewart > > --- > > v1 -> v2: > > - clarify commit message about containerd.service and sysv compat > - fix formatting in S60dockerd > - bundle commit into a series with required containerd changes > > Signed-off-by: Christian Stewart > --- > package/docker-engine/S60dockerd | 2 +- > package/docker-engine/docker-engine.hash | 2 +- > package/docker-engine/docker-engine.mk | 16 +++++++++++++++- > 3 files changed, 17 insertions(+), 3 deletions(-) > > diff --git a/package/docker-engine/S60dockerd b/package/docker-engine/S60dockerd > index def8bea149..7591f9fe66 100644 > --- a/package/docker-engine/S60dockerd > +++ b/package/docker-engine/S60dockerd > @@ -10,7 +10,7 @@ DAEMON_ARGS="" > do_start() { > echo -n "Starting $NAME: " > start-stop-daemon --start --quiet --background --make-pidfile \ > - --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \ > + --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \ TAB-to-space conversion. Although I personally prefer that, that is not the road we've decided to go down in Buildroot, see for reference: package/busybox/S01syslogd In any case, fixing/converting can adshouldbe done in its own patch. (You missed the TAB on line 35, by the way.) > && echo "OK" || echo "FAIL" > } > > diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash > index d15b1359cb..670cbd414b 100644 > --- a/package/docker-engine/docker-engine.hash > +++ b/package/docker-engine/docker-engine.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz > +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk > index 2a9b72ca78..208688cc43 100644 > --- a/package/docker-engine/docker-engine.mk > +++ b/package/docker-engine/docker-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DOCKER_ENGINE_VERSION = 20.10.22 > +DOCKER_ENGINE_VERSION = 23.0.0 > DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) > > DOCKER_ENGINE_LICENSE = Apache-2.0 > @@ -40,6 +40,7 @@ ifeq ($(BR2_INIT_SYSTEMD),y) > DOCKER_ENGINE_DEPENDENCIES += systemd > DOCKER_ENGINE_TAGS += systemd journald > endif > + Spurious empty line, although it does make the code look nicer. Maybe move that with the sysv-init refactoring/cleanup? > ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y) > DOCKER_ENGINE_TAGS += experimental > endif > @@ -62,6 +63,19 @@ else > DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs > endif > > +# update the go module version to go1.19 > +# docker-engine does not use go modules > +# remove the conflicting vendor/modules.txt > +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > +define DOCKER_ENGINE_CONFIGURE_CMDS > + if [ -f $(@D)/vendor/modules.txt ]; then \ > + rm $(@D)/vendor/modules.txt; \ > + fi No need to test for the presence of a file to remove it; just forcibly remove it: rm -f $(@D)/vendor/modules.txt Regards, Yann E. MORIN. > + cd $(@D); \ > + $(HOST_GO_HOST_ENV) $(DOCKER_ENGINE_GO_ENV) \ > + $(GO_BIN) mod edit -go=1.19 go.mod > +endef > + > DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) > > define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD > -- > 2.39.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 sorganov at gmail.com Sat Feb 4 13:47:09 2023 From: sorganov at gmail.com (Sergey Organov) Date: Sat, 4 Feb 2023 16:47:09 +0300 Subject: [Buildroot] [PATCH] package/openvpn: get rid of -e in S60openvpn shebang Message-ID: <20230204134709.4160596-1-sorganov@gmail.com> The -e switch makes the script terminate on error from start-stop-daemon, rendering unreachable the code that checks the exit status. There is no need in the -e switch in the first place either, as the script takes care of errors handling. Signed-off-by: Sergey Organov --- package/openvpn/S60openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn index f097cf11ec..00156c80db 100644 --- a/package/openvpn/S60openvpn +++ b/package/openvpn/S60openvpn @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # # Original version by Robert Leslie # , edited by iwj and cs base-commit: c7ea83dd2df315ba4f492a9ef6b24152ba4cc4f3 -- 2.30.1 From peter at korsgaard.com Sat Feb 4 14:01:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 04 Feb 2023 15:01:48 +0100 Subject: [Buildroot] [PATCH 1/2] package/ell: bump to version 0.56 In-Reply-To: <20230201023756.1418443-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 19:37:55 -0700") References: <20230201023756.1418443-1-james.hilliard1@gmail.com> Message-ID: <87tu011qcz.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 14:03:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 04 Feb 2023 15:03:35 +0100 Subject: [Buildroot] [PATCH 2/2] package/iwd: bump to version 2.2 In-Reply-To: <20230201023756.1418443-2-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 19:37:56 -0700") References: <20230201023756.1418443-1-james.hilliard1@gmail.com> <20230201023756.1418443-2-james.hilliard1@gmail.com> Message-ID: <87pmap1qa0.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. There looks to be a 2.3 release available with some bugfixes. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 14:00:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 15:00:06 +0100 Subject: [Buildroot] [git commit] package/ell: bump to version 0.56 Message-ID: <20230204140414.9F79483242@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=607eafa2cd0656929db4bc8a743b28b0c48df8e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 68832c3201..c0f1731676 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 a7d0df846af839bbea1b80f292166371070328854b3fa785b5c607fe600552ad ell-0.53.tar.xz +sha256 58eb8b2b64087f7479d5db6a830a0656c536d93e5f11d4c9a4443ce8760a1b63 ell-0.56.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index b27d6feb65..994b0e19f0 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.53 +ELL_VERSION = 0.56 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 Sat Feb 4 14:00:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 15:00:18 +0100 Subject: [Buildroot] [git commit] package/iwd: bump to version 2.2 Message-ID: <20230204140414.A897D82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13de1138f89909890e945b6e433e64ebbaab01ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 e7971cd637..be048b3da6 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 9fd13512dc27d83efb8d341f7df98f5488f70131686021fcd0d93fc97af013b8 iwd-1.30.tar.xz +sha256 dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570 iwd-2.2.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 5ffbde334e..b0a2f6e9ed 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.30 +IWD_VERSION = 2.2 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Sat Feb 4 14:30:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 15:30:48 +0100 Subject: [Buildroot] [git commit] package/openvpn: get rid of -e in S60openvpn shebang Message-ID: <20230204143633.76B5E83483@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=28ca1da23433d58112304c191c319ac11edc5d77 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The -e switch makes the script terminate on error from start-stop-daemon, rendering unreachable the code that checks the exit status. There is no need in the -e switch in the first place either, as the script takes care of errors handling. Signed-off-by: Sergey Organov Signed-off-by: Yann E. MORIN --- package/openvpn/S60openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn index f097cf11ec..00156c80db 100644 --- a/package/openvpn/S60openvpn +++ b/package/openvpn/S60openvpn @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # # Original version by Robert Leslie # , edited by iwj and cs From yann.morin.1998 at free.fr Sat Feb 4 14:39:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 15:39:48 +0100 Subject: [Buildroot] [PATCH] package/openvpn: get rid of -e in S60openvpn shebang In-Reply-To: <20230204134709.4160596-1-sorganov@gmail.com> References: <20230204134709.4160596-1-sorganov@gmail.com> Message-ID: <20230204143948.GB24755@scaer> Sergey, All, On 2023-02-04 16:47 +0300, Sergey Organov spake thusly: > The -e switch makes the script terminate on error from > start-stop-daemon, rendering unreachable the code that checks the exit > status. > > There is no need in the -e switch in the first place either, as the > script takes care of errors handling. > > Signed-off-by: Sergey Organov Applied to master, thanks. However, this script has a lot of coding style issues: $ ./utils/check-package package/openvpn/S60openvpn:14: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/openvpn/S60openvpn:15: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/openvpn/S60openvpn:16: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/openvpn/S60openvpn:17: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/openvpn/S60openvpn:18: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/openvpn/S60openvpn:21: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) [...] package/openvpn/S60openvpn:0: DAEMON variable not defined (http://nightly.buildroot.org/#adding-packages-start-script) Could you look into bringing this old script up to today's standards, please? Regards, Yann E. MORIN. > --- > package/openvpn/S60openvpn | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn > index f097cf11ec..00156c80db 100644 > --- a/package/openvpn/S60openvpn > +++ b/package/openvpn/S60openvpn > @@ -1,4 +1,4 @@ > -#!/bin/sh -e > +#!/bin/sh > # > # Original version by Robert Leslie > # , edited by iwj and cs > > base-commit: c7ea83dd2df315ba4f492a9ef6b24152ba4cc4f3 > -- > 2.30.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 Feb 4 14:52:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 15:52:57 +0100 Subject: [Buildroot] [git commit] package/libarchive: Only add "iconv" to the .pc file if needed Message-ID: <20230204145402.EDB69835C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9525bc7e64e8f44c31ab9dfd3f516ecb35982429 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with fwup raised since bump to version 3.6.2 in commit 380341b249175382691f268de4b41d3843ff0acc and https://github.com/libarchive/libarchive/commit/a83f3d327aefe8d628230f326621b014d82f55b4 checking for pkg-config... /tmp/instance-19/output-1/host/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for ARCHIVE... no configure: error: Requires libarchive. Libarchive must be built with zlib support. Fixes: http://autobuild.buildroot.net/results/f5d/f5d549fb4f08156ba5952ce75926f7fd2242bfdf/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...1-Only-add-iconv-to-the-pc-file-if-needed.patch | 44 ++++++++++++++++++++++ package/libarchive/libarchive.mk | 4 ++ 2 files changed, 48 insertions(+) diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch new file mode 100644 index 0000000000..c93944f789 --- /dev/null +++ b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch @@ -0,0 +1,44 @@ +From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 +From: Peter Pentchev +Date: Thu, 29 Dec 2022 00:04:40 +0200 +Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) + +Hi, + +Thanks for writing and maintaining libarchive! + +What do you think about this trivial change that does not add "iconv" to +the pkg-config file's list of required packages unless it is actually +needed? On at least Debian GNU/Linux systems, the iconv(3) function is +part of the system C library and there is no Debian package that +installs an iconv.pc file, so I had to make this change to the Debian +package of libarchive. + +Thanks again, and keep up the great work! + +G'luck, +Peter + +Downloaded from upstream commit: +https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99bff20d1..e2715cfde 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then + AC_CHECK_HEADERS([localcharset.h]) + am_save_LIBS="$LIBS" + LIBS="${LIBS} ${LIBICONV}" +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" ++ if test -n "$LIBICONV"; then ++ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" ++ fi + AC_CHECK_FUNCS([locale_charset]) + LIBS="${am_save_LIBS}" + if test "x$ac_cv_func_locale_charset" != "xyes"; then diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cfc148d01d..cd7c13fbed 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -11,6 +11,10 @@ LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING LIBARCHIVE_CPE_ID_VENDOR = libarchive +# We're patching configure.ac +LIBARCHIVE_AUTORECONF = YES +# needed for autoreconf +LIBARCHIVE_DEPENDENCIES += host-pkgconf ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) From yann.morin.1998 at free.fr Sat Feb 4 14:54:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 15:54:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: do not add iconv for Requires.private In-Reply-To: References: <20221218130225.353325-1-fontaine.fabrice__19944.8251792759$1671368580$gmane$org@gmail.com> Message-ID: <20230204145438.GC24755@scaer> Fabrice, All, On 2022-12-29 18:53 +0100, Bernd Kuhls spake thusly: > Am Sun, 18 Dec 2022 14:02:25 +0100 schrieb Fabrice Fontaine: > > > Fix the following build failure with fwup raised since bump to version > > 3.6.2 in commit 380341b249175382691f268de4b41d3843ff0acc and > > https://github.com/libarchive/libarchive/commit/ > a83f3d327aefe8d628230f326621b014d82f55b4: > > > > checking for pkg-config... /tmp/instance-19/output-1/host/bin/pkg-config > > checking pkg-config is at least version 0.9.0... yes checking for > > ARCHIVE... no configure: error: Requires libarchive. Libarchive must be > > built with zlib support. > > Hi, > > upstream committed a different fix: > http://patchwork.ozlabs.org/project/buildroot/patch/ > 20221229175254.224876-1-bernd.kuhls at t-online.de/ I have applied that patch from Bernd instead, 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 Sat Feb 4 14:55:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 15:55:14 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libarchive: Only add "iconv" to the .pc file if needed In-Reply-To: <20230201181005.731564-1-bernd.kuhls@t-online.de> References: <20230201181005.731564-1-bernd.kuhls@t-online.de> Message-ID: <20230204145514.GD24755@scaer> Bernd, All, On 2023-02-01 19:10 +0100, Bernd Kuhls spake thusly: > Fix the following build failure with fwup raised since bump to version > 3.6.2 in commit 380341b249175382691f268de4b41d3843ff0acc and > https://github.com/libarchive/libarchive/commit/a83f3d327aefe8d628230f326621b014d82f55b4 > > checking for pkg-config... /tmp/instance-19/output-1/host/bin/pkg-config > checking pkg-config is at least version 0.9.0... yes > checking for ARCHIVE... no > configure: error: Requires libarchive. Libarchive must be built with zlib support. > > Fixes: > http://autobuild.buildroot.net/results/f5d/f5d549fb4f08156ba5952ce75926f7fd2242bfdf/ > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > v2: added dependency to host-pkgconf to fix autoconf error > > ...y-add-iconv-to-the-pc-file-if-needed.patch | 44 +++++++++++++++++++ > package/libarchive/libarchive.mk | 4 ++ > 2 files changed, 48 insertions(+) > create mode 100644 package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > > diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > new file mode 100644 > index 0000000000..c93944f789 > --- /dev/null > +++ b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > @@ -0,0 +1,44 @@ > +From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 > +From: Peter Pentchev > +Date: Thu, 29 Dec 2022 00:04:40 +0200 > +Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) > + > +Hi, > + > +Thanks for writing and maintaining libarchive! > + > +What do you think about this trivial change that does not add "iconv" to > +the pkg-config file's list of required packages unless it is actually > +needed? On at least Debian GNU/Linux systems, the iconv(3) function is > +part of the system C library and there is no Debian package that > +installs an iconv.pc file, so I had to make this change to the Debian > +package of libarchive. > + > +Thanks again, and keep up the great work! > + > +G'luck, > +Peter > + > +Downloaded from upstream commit: > +https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 > + > +Signed-off-by: Bernd Kuhls > +--- > + configure.ac | 4 +++- > + 1 file changed, 3 insertions(+), 1 deletion(-) > + > +diff --git a/configure.ac b/configure.ac > +index 99bff20d1..e2715cfde 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then > + AC_CHECK_HEADERS([localcharset.h]) > + am_save_LIBS="$LIBS" > + LIBS="${LIBS} ${LIBICONV}" > +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" > ++ if test -n "$LIBICONV"; then > ++ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" > ++ fi > + AC_CHECK_FUNCS([locale_charset]) > + LIBS="${am_save_LIBS}" > + if test "x$ac_cv_func_locale_charset" != "xyes"; then > diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk > index cfc148d01d..cd7c13fbed 100644 > --- a/package/libarchive/libarchive.mk > +++ b/package/libarchive/libarchive.mk > @@ -11,6 +11,10 @@ LIBARCHIVE_INSTALL_STAGING = YES > LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 > LIBARCHIVE_LICENSE_FILES = COPYING > LIBARCHIVE_CPE_ID_VENDOR = libarchive > +# We're patching configure.ac > +LIBARCHIVE_AUTORECONF = YES > +# needed for autoreconf > +LIBARCHIVE_DEPENDENCIES += host-pkgconf > > ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) > ifeq ($(BR2_STATIC_LIBS),y) > -- > 2.39.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 ryanbarnett3 at gmail.com Sat Feb 4 19:54:27 2023 From: ryanbarnett3 at gmail.com (Ryan Barnett) Date: Sat, 4 Feb 2023 13:54:27 -0600 Subject: [Buildroot] [PATCH] package/python-pytest: remove runtime dependency on python-toml In-Reply-To: <20230202152743.3916949-1-arnout@mind.be> References: <20230202152743.3916949-1-arnout@mind.be> Message-ID: On Thu, Feb 2, 2023 at 9:28 AM Arnout Vandecappelle wrote: > > Since version 7.2 [1], with Python 3.11+ pytest no longer uses tomli to > parse pyproject.toml but instead uses tomllib which is part of Python > itself [2]. Note that toml was replaced with tomli in version 7.0, so > the dependency was anyway incorrect. > > Note that tomllib is unconditionally installed as part of Python 3.11, > there is no PYTHON3_LIBTOML option or anything like that that needs to > be selected. > > [1] https://docs.pytest.org/en/latest/changelog.html#pytest-7-2-0-2022-10-23 > [2] https://github.com/pytest-dev/pytest/pull/9741 > > Signed-off-by: Arnout Vandecappelle Reviewed-by: Ryan Barnett > --- > I can't be bother with sending a patch changing toml to tomli for > 2022.11 - it's going EOL in two months anyway, and apparently nobody > noticed... > --- > package/python-pytest/Config.in | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in > index c3956c76d2..9bbc9ea2d2 100644 > --- a/package/python-pytest/Config.in > +++ b/package/python-pytest/Config.in > @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_PYTEST > select BR2_PACKAGE_PYTHON_PACKAGING # runtime > select BR2_PACKAGE_PYTHON_PLUGGY # runtime > select BR2_PACKAGE_PYTHON_PY # runtime > - select BR2_PACKAGE_PYTHON_TOML # runtime > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > help > pytest is a framework that makes building simple and scalable > -- > 2.39.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Sat Feb 4 20:37:50 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 4 Feb 2023 21:37:50 +0100 Subject: [Buildroot] [PATCH] package/libfuse3: bump to version 3.13.1 Message-ID: <20230204203750.513283-1-giulio.benetti@benettiengineering.com> Fixes: http://autobuild.buildroot.net/results/a98/a984d275d949e8dc989870d2d2b6f6c7168d52bb/ Signed-off-by: Giulio Benetti --- package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index 691bfbc9d6..f697f4ad3f 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 224544214204eb348b548d6faa7a9bc91b053aacfc92e8b5da3f478c76ae4a03 libfuse3-3.13.0.tar.gz +sha256 96399b09b91bc717a9e96ffea660d611e6a342547c1abd4d0e858b3dca9d5a13 libfuse3-3.13.1.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index d94f7d3d3a..a2e9775868 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.13.0 +LIBFUSE3_VERSION = 3.13.1 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Sat Feb 4 20:40:50 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 4 Feb 2023 21:40:50 +0100 Subject: [Buildroot] [PATCH] package/libfuse3: fix build failure due to missing __off64_t in musl In-Reply-To: <20230131153608.434059-1-giulio.benetti@benettiengineering.com> References: <20230131153608.434059-1-giulio.benetti@benettiengineering.com> Message-ID: This patch is superseded by this one: https://patchwork.ozlabs.org/project/buildroot/patch/20230204203750.513283-1-giulio.benetti at benettiengineering.com/ Best regards -- Giulio Benetti Benetti Engineering sas On 31/01/23 16:36, Giulio Benetti wrote: > Add upstream patch[0] that substitute __off64_t with off64_t that is > present in glibc, uclibc and musl. > > [0]: https://github.com/libfuse/libfuse/commit/19d95c0e701076407dc1f3cfd39e12e28b332927 > > Fixes: > http://autobuild.buildroot.net/results/a98/a984d275d949e8dc989870d2d2b6f6c7168d52bb/ > > Signed-off-by: Giulio Benetti > --- > .../0001-use-off_t-over-__off64_t.patch | 56 +++++++++++++++++++ > 1 file changed, 56 insertions(+) > create mode 100644 package/libfuse3/0001-use-off_t-over-__off64_t.patch > > diff --git a/package/libfuse3/0001-use-off_t-over-__off64_t.patch b/package/libfuse3/0001-use-off_t-over-__off64_t.patch > new file mode 100644 > index 0000000000..ce29ba0f44 > --- /dev/null > +++ b/package/libfuse3/0001-use-off_t-over-__off64_t.patch > @@ -0,0 +1,56 @@ > +From 19d95c0e701076407dc1f3cfd39e12e28b332927 Mon Sep 17 00:00:00 2001 > +From: psykose > +Date: Sat, 14 Jan 2023 21:31:56 +0000 > +Subject: [PATCH] use off_t over __off64_t > + > +when -D_FILE_OFFSET_BITS=64 is defined, the off_t type is 64 bits wide > +already. the fuse_common.h header already checks for this, and errors > +when it is not, so be consistent with all the other uses of off_t. > + > +some libcs like musl do not have a 32-bit off_t type, and don't define > +__off64_t. > + > +Signed-off-by: Giulio Benetti > +--- > + example/hello_ll_uds.c | 4 ++-- > + include/fuse_lowlevel.h | 8 ++++---- > + 2 files changed, 6 insertions(+), 6 deletions(-) > + > +diff --git a/example/hello_ll_uds.c b/example/hello_ll_uds.c > +index c1f64d7..f291fed 100644 > +--- a/example/hello_ll_uds.c > ++++ b/example/hello_ll_uds.c > +@@ -277,8 +277,8 @@ static ssize_t stream_read(int fd, void *buf, size_t buf_len, void *userdata) { > + return (res == -1) ? res : (res + prev_res); > + } > + > +-static ssize_t stream_splice_send(int fdin, __off64_t *offin, int fdout, > +- __off64_t *offout, size_t len, > ++static ssize_t stream_splice_send(int fdin, off_t *offin, int fdout, > ++ off_t *offout, size_t len, > + unsigned int flags, void *userdata) { > + (void)userdata; > + > +diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h > +index ff0d966..96088d7 100644 > +--- a/include/fuse_lowlevel.h > ++++ b/include/fuse_lowlevel.h > +@@ -130,11 +130,11 @@ struct fuse_forget_data { > + struct fuse_custom_io { > + ssize_t (*writev)(int fd, struct iovec *iov, int count, void *userdata); > + ssize_t (*read)(int fd, void *buf, size_t buf_len, void *userdata); > +- ssize_t (*splice_receive)(int fdin, __off64_t *offin, int fdout, > +- __off64_t *offout, size_t len, > ++ ssize_t (*splice_receive)(int fdin, off_t *offin, int fdout, > ++ off_t *offout, size_t len, > + unsigned int flags, void *userdata); > +- ssize_t (*splice_send)(int fdin, __off64_t *offin, int fdout, > +- __off64_t *offout, size_t len, > ++ ssize_t (*splice_send)(int fdin, off_t *offin, int fdout, > ++ off_t *offout, size_t len, > + unsigned int flags, void *userdata); > + }; > + > +-- > +2.34.1 > + From sorganov at gmail.com Sat Feb 4 20:52:21 2023 From: sorganov at gmail.com (Sergey Organov) Date: Sat, 04 Feb 2023 23:52:21 +0300 Subject: [Buildroot] [PATCH] package/openvpn: get rid of -e in S60openvpn shebang In-Reply-To: <20230204143948.GB24755@scaer> (Yann E. MORIN's message of "Sat, 4 Feb 2023 15:39:48 +0100") References: <20230204134709.4160596-1-sorganov@gmail.com> <20230204143948.GB24755@scaer> Message-ID: <875ych17cq.fsf@osv.gnss.ru> "Yann E. MORIN" writes: > Sergey, All, > > On 2023-02-04 16:47 +0300, Sergey Organov spake thusly: >> The -e switch makes the script terminate on error from >> start-stop-daemon, rendering unreachable the code that checks the exit >> status. >> >> There is no need in the -e switch in the first place either, as the >> script takes care of errors handling. >> >> Signed-off-by: Sergey Organov > > Applied to master, thanks. Thank you in turn! > > However, this script has a lot of coding style issues: > > $ ./utils/check-package > package/openvpn/S60openvpn:14: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) > package/openvpn/S60openvpn:15: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) > package/openvpn/S60openvpn:16: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) > package/openvpn/S60openvpn:17: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) > package/openvpn/S60openvpn:18: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) > package/openvpn/S60openvpn:21: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) > [...] > package/openvpn/S60openvpn:0: DAEMON variable not defined (http://nightly.buildroot.org/#adding-packages-start-script) > > Could you look into bringing this old script up to today's standards, > please? Sorry, probably not me, as I'm currently using rather old buildroot version, and it'd be problematic for me to check such changes against the mainline. Best regards, -- Sergey Organov From peter at korsgaard.com Sat Feb 4 22:33:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 04 Feb 2023 23:33:03 +0100 Subject: [Buildroot] [PATCH] package/sexpect: requires MMU In-Reply-To: <00c897a75f46008a2e4ddfa3a17eeef7641420a6.1675240194.git.baruch@tkos.co.il> (Baruch Siach via buildroot's message of "Wed, 1 Feb 2023 10:29:54 +0200") References: <00c897a75f46008a2e4ddfa3a17eeef7641420a6.1675240194.git.baruch@tkos.co.il> Message-ID: <87leld12ow.fsf@dell.be.48ers.dk> >>>>> "Baruch" == Baruch Siach via buildroot writes: > Disable when MMU is not available for target. > Fixes: > http://autobuild.buildroot.net/results/a2b69fdf67d520aa4d2718bd688d88d102842cdf > Signed-off-by: Baruch Siach Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 22:33:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 04 Feb 2023 23:33:03 +0100 Subject: [Buildroot] [PATCH] package/sexpect: requires MMU In-Reply-To: <00c897a75f46008a2e4ddfa3a17eeef7641420a6.1675240194.git.baruch@tkos.co.il> (Baruch Siach via buildroot's message of "Wed, 1 Feb 2023 10:29:54 +0200") References: <00c897a75f46008a2e4ddfa3a17eeef7641420a6.1675240194.git.baruch@tkos.co.il> Message-ID: <87leld12ow.fsf@dell.be.48ers.dk> >>>>> "Baruch" == Baruch Siach via buildroot writes: > Disable when MMU is not available for target. > Fixes: > http://autobuild.buildroot.net/results/a2b69fdf67d520aa4d2718bd688d88d102842cdf > Signed-off-by: Baruch Siach Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 22:35:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 04 Feb 2023 23:35:23 +0100 Subject: [Buildroot] [PATCH] package/luaposix: bump to version 36.1 In-Reply-To: <20230201090224.17033-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 1 Feb 2023 10:02:24 +0100") References: <20230201090224.17033-1-francois.perrad@gadz.org> Message-ID: <87cz6p12l0.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > Signed-off-by: Francois Perrad Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 22:32:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:32:40 +0100 Subject: [Buildroot] [git commit] package/sexpect: requires MMU Message-ID: <20230204223549.8A9C8836A3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9717b303683ba7ec035de004c6f2ddd195d07808 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable when MMU is not available for target. Fixes: http://autobuild.buildroot.net/results/a2b69fdf67d520aa4d2718bd688d88d102842cdf Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/sexpect/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sexpect/Config.in b/package/sexpect/Config.in index bdf5c3bbf5..e558af26f0 100644 --- a/package/sexpect/Config.in +++ b/package/sexpect/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SEXPECT bool "sexpect" + depends on BR2_USE_MMU # fork() help sexpect is another implementation of Expect which is specifically designed for Shell scripts From peter at korsgaard.com Sat Feb 4 22:33:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:33:17 +0100 Subject: [Buildroot] [git commit] package/luaposix: bump to version 36.1 Message-ID: <20230204223549.932BB835AB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2c3e8ea8b2107ac514baddaed97921112a90cb7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/luaposix/luaposix.hash | 2 +- package/luaposix/luaposix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash index fc0b5fa747..2d54a6901e 100644 --- a/package/luaposix/luaposix.hash +++ b/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e0fcb4996f76aa49ae3e5edf69978171091e3d69d5de5589d591d227f8a427c1 luaposix-36.0.tar.gz +sha256 7944c2b4fbcef0667d407302740d87645325e751fd8d819f2b253c5d9ad0d497 luaposix-36.1.tar.gz sha256 ea0fdaae50b0d31a81c2c99f4354264783c71043fd40522feaa40eecc069599b LICENSE diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index 1a537defc4..d17c8188b5 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 36.0 +LUAPOSIX_VERSION = 36.1 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Feb 4 22:43:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 04 Feb 2023 23:43:43 +0100 Subject: [Buildroot] [PATCH 01/13] package/libnice: bump to version 0.1.21 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:46 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <878rhd1274.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:18:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:18:41 +0100 Subject: [Buildroot] [PATCH 02/13] package/gstreamer1: bump to version 1.22.0 In-Reply-To: <20230201051658.383420-2-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:47 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-2-james.hilliard1@gmail.com> Message-ID: <874js110ku.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:18:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:18:47 +0100 Subject: [Buildroot] [PATCH 04/13] package/gst1-plugins-good: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-4-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:49 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-4-james.hilliard1@gmail.com> Message-ID: <87zg9tyq7c.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Add new xingmux config option. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:18:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:18:50 +0100 Subject: [Buildroot] [PATCH 05/13] package/gst1-plugins-bad: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-5-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:50 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-5-james.hilliard1@gmail.com> Message-ID: <87v8khyq79.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:18:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:18:56 +0100 Subject: [Buildroot] [PATCH 03/13] package/gst1-plugins-base: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-3-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:48 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-3-james.hilliard1@gmail.com> Message-ID: <87r0v5yq73.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > The videoconvert and videoscale plugins have been combined into > the new videoconvertscale plugin. > Rework config options using videoconvert/videoscale to use the new > videoconvertscale option. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:19:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:01 +0100 Subject: [Buildroot] [PATCH 06/13] package/gst1-plugins-ugly: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-6-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:51 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-6-james.hilliard1@gmail.com> Message-ID: <87mt5tyq6y.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Remove xingmux config option which has been moved to the > gst1-plugins-good package. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:19:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:08 +0100 Subject: [Buildroot] [PATCH 08/13] package/gst1-libav: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-8-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:53 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-8-james.hilliard1@gmail.com> Message-ID: <87edr5yq6r.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:19:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:04 +0100 Subject: [Buildroot] [PATCH 07/13] package/gst1-devtools: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-7-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:52 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-7-james.hilliard1@gmail.com> Message-ID: <87ilghyq6v.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:19:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:22 +0100 Subject: [Buildroot] [PATCH 09/13] package/gst1-vaapi: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-9-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:54 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-9-james.hilliard1@gmail.com> Message-ID: <87a61tyq6d.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Update config option names and dependency requirements. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:19:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:25 +0100 Subject: [Buildroot] [PATCH 12/13] package/gst-omx: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-12-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:57 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-12-james.hilliard1@gmail.com> Message-ID: <875ychyq6a.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 22:42:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:42:23 +0100 Subject: [Buildroot] [git commit] package/libnice: bump to version 0.1.21 Message-ID: <20230204231934.37FA0836A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c392e8b76f73d2b8ebfba2117ed6b03d902b8243 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/libnice/libnice.hash | 2 +- package/libnice/libnice.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnice/libnice.hash b/package/libnice/libnice.hash index 83b28a9ad9..cf6d825f83 100644 --- a/package/libnice/libnice.hash +++ b/package/libnice/libnice.hash @@ -1,5 +1,5 @@ # Locally computed after checking pgp signature -sha256 6747af710998cf708a2e8ceef51cccd181373d94201dd4b8d40797a070ed47cc libnice-0.1.19.tar.gz +sha256 72e73a2acf20f59093e21d5601606e405873503eb35f346fa621de23e99b3b39 libnice-0.1.21.tar.gz # Hash for license files: sha256 9246b2ee8b1db30cf03d5d9719ad8bb5edce1cadc85f8cfef319c23d24d950b5 COPYING diff --git a/package/libnice/libnice.mk b/package/libnice/libnice.mk index 2b223bedd3..56ee35e452 100644 --- a/package/libnice/libnice.mk +++ b/package/libnice/libnice.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNICE_VERSION = 0.1.19 -LIBNICE_SITE = http://nice.freedesktop.org/releases +LIBNICE_VERSION = 0.1.21 +LIBNICE_SITE = https://libnice.freedesktop.org/releases LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL LIBNICE_DEPENDENCIES = libglib2 host-pkgconf From peter at korsgaard.com Sat Feb 4 22:50:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:50:54 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bad: bump version to 1.22.0 Message-ID: <20230204231934.67545836A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=895840edd2784492d9b7066330b43842b703343b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 c8789a707d..90b3a18982 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.4.tar.xz.sha256sum -sha256 a1a3f53b3604d9a04fdd0bf9a1a616c3d2dab5320489e9ecee1178e81e33a16a gst-plugins-bad-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.0.tar.xz.sha256sum +sha256 3c9d9300f5f4fb3e3d36009379d1fb6d9ecd79c1a135df742b8a68417dd663a1 gst-plugins-bad-1.22.0.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 14710a2501..8f11ce6b37 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.4 +GST1_PLUGINS_BAD_VERSION = 1.22.0 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 Sat Feb 4 22:51:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:51:14 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-ugly: bump version to 1.22.0 Message-ID: <20230204231934.74341836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f1fef1499427d508363c29920468e8f5a495709 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove xingmux config option which has been moved to the gst1-plugins-good package. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ package/gstreamer1/gst1-plugins-ugly/Config.in | 5 ----- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 8 +------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3fff2b1ddd..1c5af2652a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX + bool "xingmux moved" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX + help + The xingmux option has been moved to gst1-plugins-good. + config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE bool "videoscale removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in index ba19989892..54766ffa8c 100644 --- a/package/gstreamer1/gst1-plugins-ugly/Config.in +++ b/package/gstreamer1/gst1-plugins-ugly/Config.in @@ -26,11 +26,6 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB help DVD subtitle parser and decoder -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX - bool "xingmux" - help - Add XING tags to mpeg audio files - config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA bool "realmedia" help diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 4ec29e6894..21579216df 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.4.tar.xz.sha256sum -sha256 5c9ec6bab96517e438b3f9bae0ceb84d3436f3da9bbe180cf4d28e32a7251b59 gst-plugins-ugly-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz.sha256sum +sha256 a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c gst-plugins-ugly-1.22.0.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 20382719c3..9f16fa3da8 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.4 +GST1_PLUGINS_UGLY_VERSION = 1.22.0 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 @@ -51,12 +51,6 @@ else GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=enabled -else -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=enabled else From peter at korsgaard.com Sat Feb 4 23:05:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:05:47 +0100 Subject: [Buildroot] [git commit] package/gst1-libav: bump version to 1.22.0 Message-ID: <20230204231934.89D37836B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e8f9b34f336da6c50bb7f854f8b3921b31d3398 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 78f5b5bb07..c2c58ab2fe 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.4.tar.xz.sha256sum -sha256 04ccbdd58fb31dd94098da599209834a0e7661638c5703381dd0a862c56fc532 gst-libav-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.0.tar.xz.sha256sum +sha256 0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1 gst-libav-1.22.0.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index a867af5147..d4b3873af1 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.4 +GST1_LIBAV_VERSION = 1.22.0 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 Sat Feb 4 22:44:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:44:03 +0100 Subject: [Buildroot] [git commit] package/gstreamer1: bump to version 1.22.0 Message-ID: <20230204231934.42FDF836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e30ce907d58e5f675704545599ca77ce2035acd2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 5fb52606fe..db0ed5bede 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.4.tar.xz.sha256sum -sha256 67c1edf8c3c339cda5dde85f4f7b953bb9607c2d13ae970e2491c5c4c055ef5f gstreamer-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.0.tar.xz.sha256sum +sha256 78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09 gstreamer-1.22.0.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 16c016b145..09d1a10ce7 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.20.4 +GSTREAMER1_VERSION = 1.22.0 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 4 23:06:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:06:00 +0100 Subject: [Buildroot] [git commit] package/gst1-vaapi: bump version to 1.22.0 Message-ID: <20230204231934.93ABC836A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33d4c226e582f6c0086431c4d9154e462cb3cf34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update config option names and dependency requirements. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 37 +++++++++++++++++++++------ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 5baaa4dfb7..6dec625c93 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.4.tar.xz.sha256sum -sha256 ab12596144c05506e9782374c5d2cdfb3069fca89908d6de360d947bb77fd06a gstreamer-vaapi-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.0.tar.xz.sha256sum +sha256 593ccad19f88e5fa29f40f98356c007806bd535828707b1406944d16a90bdff5 gstreamer-vaapi-1.22.0.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 bd6c16be3e..3d9eb91ffb 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.4 +GST1_VAAPI_VERSION = 1.22.0 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+ @@ -18,19 +18,40 @@ GST1_VAAPI_DEPENDENCIES += \ libdrm GST1_VAAPI_CONF_OPTS += \ - -Dwith_drm=yes \ - -Dwith_x11=no \ - -Dwith_glx=no \ - -Dwith_wayland=no \ - -Dwith_egl=no \ + -Ddrm=enabled \ + -Degl=enabled \ -Dexamples=disabled \ -Dtests=disabled \ -Ddoc=disabled ifeq ($(BR2_PACKAGE_GST1_VAAPI_ENCODERS),y) -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=yes +GST1_VAAPI_CONF_OPTS += -Dencoders=enabled else -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=no +GST1_VAAPI_CONF_OPTS += -Dencoders=disabled +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) +GST1_VAAPI_CONF_OPTS += -Degl=enabled +GST1_VAAPI_DEPENDENCIES += libegl +else +GST1_VAAPI_CONF_OPTS += -Degl=disabled +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +GST1_VAAPI_CONF_OPTS += -Dwayland=enabled +else +GST1_VAAPI_CONF_OPTS += -Dwayland=disabled +endif + +ifeq ($(BR2_PACKAGE_XORG7),y) +GST1_VAAPI_CONF_OPTS += -Dx11=enabled +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +GST1_VAAPI_CONF_OPTS += -Dglx=enabled +else +GST1_VAAPI_CONF_OPTS += -Dglx=disabled +endif +else +GST1_VAAPI_CONF_OPTS += -Dx11=disabled -Dglx=disabled endif $(eval $(meson-package)) From peter at korsgaard.com Sat Feb 4 23:06:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:06:39 +0100 Subject: [Buildroot] [git commit] package/gst1-rtsp-server: bump version to 1.22.0 Message-ID: <20230204231934.9D6F9836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbca109741661d39d7eeaf7ea0e2f25ecbd3bfb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 b6a31f8796..f37e7bb292 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.4.tar.xz.sha256sum -sha256 88d9ef634e59aeb8cc183ad5ae444557c5a88dd49d833b9072bc6e1fae6a3d7d gst-rtsp-server-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.0.tar.xz.sha256sum +sha256 aea24eeb59ee5fadfac355de2f7cecb51966c3e147e5ad7cfb4c314f1a4086ed gst-rtsp-server-1.22.0.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 0b18c1fcf8..6b4bd49fde 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.4 +GST1_RTSP_SERVER_VERSION = 1.22.0 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 Sat Feb 4 23:07:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:07:18 +0100 Subject: [Buildroot] [git commit] package/gstreamer1-editing-services: bump version to 1.22.0 Message-ID: <20230204231934.A6DC2836A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abfea72d452b1279244f4cc33c2919ea32719306 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a patch fixing an incorrect gstreamer-validate-1.0 dependency name. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...ix-gstreamer-validate-1.0-dependency-name.patch | 35 ++++++++++++++++++++++ .../gstreamer1-editing-services.hash | 4 +-- .../gstreamer1-editing-services.mk | 2 +- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch b/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch new file mode 100644 index 0000000000..6c190d3727 --- /dev/null +++ b/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch @@ -0,0 +1,35 @@ +From c3edd999195445319ea619b6d719d7743f5b560d Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 31 Jan 2023 21:38:09 -0700 +Subject: [PATCH] Fix gstreamer-validate-1.0 dependency name + +The gst-devtools project generates gstreamer-validate-1.0.pc, this +must match the dependency in gst-editing-services for detection +to work properly. + +Fixes: +Run-time dependency gst-validate-1.0 found: NO (tried pkgconfig and cmake) + +Signed-off-by: James Hilliard +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3859] +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index bdc47f5d8b..b949f55317 100644 +--- a/meson.build ++++ b/meson.build +@@ -110,7 +110,7 @@ if host_machine.system() != 'windows' + endif + gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, + fallback : ['gstreamer', 'gst_controller_dep']) +-gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : get_option('validate'), ++gstvalidate_dep = dependency('gstreamer-validate-1.0', version : gst_req, required : get_option('validate'), + fallback : ['gst-devtools', 'validate_dep']) + + gio_dep = dependency('gio-2.0', version: glib_req) +-- +2.34.1 + diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 308596d7cd..bd5dcfdbaf 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.4.tar.xz.sha256sum -sha256 aa03e983af5d79c1befffe3575b034e60960619a96bf877447cb73c28016fc41 gst-editing-services-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.0.tar.xz.sha256sum +sha256 2a23856379af03586b66c193910fa8bb963024580bc2337c7405578dc077aa79 gst-editing-services-1.22.0.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 77feb15991..0ae9205c3b 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.4 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.0 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 Sat Feb 4 23:05:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:05:15 +0100 Subject: [Buildroot] [git commit] package/gst1-devtools: bump version to 1.22.0 Message-ID: <20230204231934.80256836A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=538277d63c80c7099920869ef4f97f0c5b738f77 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 fc504a2c12..46480445ab 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.4.tar.xz.sha256sum -sha256 82a293600273f4dd3eed567aae510ca0c7d629c3807788b00e6cdbd1d2459a84 gst-devtools-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.0.tar.xz.sha256sum +sha256 4d21fee5c15f2877c0b1f6c2da0cdba67ce7caab2c199ab27e91a1394d5ba195 gst-devtools-1.22.0.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 fbb04c92ef..8fd3321d9e 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.4 +GST1_DEVTOOLS_VERSION = 1.22.0 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 Sat Feb 4 22:48:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:48:41 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-good: bump version to 1.22.0 Message-ID: <20230204231934.5D3E4836AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d019b4c061e1ba1dc08ac680996e022720fcf097 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new xingmux config option. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/Config.in | 5 +++++ package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in index 67df206eea..d7ec16e800 100644 --- a/package/gstreamer1/gst1-plugins-good/Config.in +++ b/package/gstreamer1/gst1-plugins-good/Config.in @@ -246,6 +246,11 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE help Parse a .wav file into raw audio +config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX + bool "xingmux" + help + Add XING tags to mpeg audio files + config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M bool "y4m" help diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index b30c512878..3e219faad8 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.4.tar.xz.sha256sum -sha256 b16130fbe632fa8547c2147a0ef575b0140fb521065c5cb121c72ddbd23b64da gst-plugins-good-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.0.tar.xz.sha256sum +sha256 582e617271e7f314d1a2211e3e3856ae2e4303c8c0d6114e9c4a5ea5719294b0 gst-plugins-good-1.22.0.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 cc7bab5824..93c2328bda 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.4 +GST1_PLUGINS_GOOD_VERSION = 1.22.0 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 @@ -324,6 +324,12 @@ else GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavparse=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX),y) +GST1_PLUGINS_GOOD_CONF_OPTS += -Dxingmux=enabled +else +GST1_PLUGINS_GOOD_CONF_OPTS += -Dxingmux=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dy4m=enabled else From peter at korsgaard.com Sat Feb 4 23:18:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:18:10 +0100 Subject: [Buildroot] [git commit] package/gst-omx: bump version to 1.22.0 Message-ID: <20230204231934.B04FA836AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd333b414005f1191dd03908df1964fae19b2ec2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 140ad626f7..51ea74a0cb 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.4.tar.xz.sha256sum -sha256 70ddd485e2dcab79070164d61ad2ff3a63e15a1d7abf9075d86eb77762b0edfd gst-omx-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.0.tar.xz.sha256sum +sha256 dbc951a99af532380e599aa8acd9e1385fdb299b46b5868cd2be4230ad888341 gst-omx-1.22.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index d644c44995..6f7168279b 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.4 +GST_OMX_VERSION = 1.22.0 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 Sat Feb 4 23:18:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:18:24 +0100 Subject: [Buildroot] [git commit] package/gst1-python: bump version to 1.22.0 Message-ID: <20230204231934.B9D97836A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b53e11f2ec049002a4c3c2829aaa0e7a31551f1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 adb116ac4c..128a739c2c 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.4.tar.xz.sha256sum -sha256 5eb4136d03e2a495f4499c8b2e6d9d3e7b5e73c5a8b8acf9213d57bc6a7bd3c1 gst-python-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.0.tar.xz.sha256sum +sha256 6c63ad364ca4617eb2cbb3975ab26c66760eb3c7a6adf5be69f99c11e21ef3a5 gst-python-1.22.0.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index feb2de718a..2fc268b0ac 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.4 +GST1_PYTHON_VERSION = 1.22.0 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 Sat Feb 4 23:19:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:30 +0100 Subject: [Buildroot] [PATCH 10/13] package/gst1-rtsp-server: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-10-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:55 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-10-james.hilliard1@gmail.com> Message-ID: <871qn5yq65.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 22:47:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:47:30 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-base: bump version to 1.22.0 Message-ID: <20230204231934.4FEB9836A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dde95c589767fe995f338d34a3ea9e5e8743c6d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The videoconvert and videoscale plugins have been combined into the new videoconvertscale plugin. Rework config options using videoconvert/videoscale to use the new videoconvertscale option. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- Config.in.legacy | 14 ++++++++++++++ package/gstreamer1/gst1-plugins-base/Config.in | 13 ++++--------- .../gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 14 ++++---------- package/gstreamer1/gstreamer1-editing-services/Config.in | 3 +-- package/webkitgtk/Config.in | 3 +-- package/wpewebkit/Config.in | 3 +-- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 41c5fdefb3..3fff2b1ddd 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,20 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + bool "videoscale removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoscale option has been combined with videoconvert. + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT + bool "videoconvert removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoconvert option has been combined with videoscale. + config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 bool "imx-gpu-viv X11 output has been removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in index bd4ee0b994..df10774ac7 100644 --- a/package/gstreamer1/gst1-plugins-base/Config.in +++ b/package/gstreamer1/gst1-plugins-base/Config.in @@ -59,10 +59,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING help various encoding-related elements -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - bool "videoconvert" +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + bool "videoconvertscale (mandatory for video playback)" + default y help - Colorspace conversion + Colorspace conversion, resizes video config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO bool "gio" @@ -123,12 +124,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE help Adjusts video frames -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE - bool "videoscale (mandatory for video playback)" - default y - help - Resizes video - config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME bool "volume (mandatory for audio playback)" default y diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 5c729d832f..bac4f8398a 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.4.tar.xz.sha256sum -sha256 8d181b7abe4caf23ee9f9ec5b4d3e232640452464e39495bfffb6d776fc97225 gst-plugins-base-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.0.tar.xz.sha256sum +sha256 f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d gst-plugins-base-1.22.0.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 d225cdf910..7d509331fe 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.4 +GST1_PLUGINS_BASE_VERSION = 1.22.0 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 @@ -147,10 +147,10 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dencoding=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y) -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=enabled +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE),y) +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvertscale=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=disabled +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvertscale=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO),y) @@ -219,12 +219,6 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dvideorate=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y) -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=enabled -else -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME),y) GST1_PLUGINS_BASE_CONF_OPTS += -Dvolume=enabled else diff --git a/package/gstreamer1/gstreamer1-editing-services/Config.in b/package/gstreamer1/gstreamer1-editing-services/Config.in index 9c41e8142b..e824781d47 100644 --- a/package/gstreamer1/gstreamer1-editing-services/Config.in +++ b/package/gstreamer1/gstreamer1-editing-services/Config.in @@ -6,9 +6,8 @@ config BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE # runtime - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT # runtime + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC # runtime - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME # runtime select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE # runtime help diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index cafe497491..dc5d738dae 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -104,8 +104,7 @@ config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 04ed40bd92..7a8dc557c3 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -97,8 +97,7 @@ config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX From peter at korsgaard.com Sat Feb 4 23:19:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:35 +0100 Subject: [Buildroot] [PATCH 11/13] package/gstreamer1-editing-services: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-11-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:56 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-11-james.hilliard1@gmail.com> Message-ID: <87wn4xxblk.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Add a patch fixing an incorrect gstreamer-validate-1.0 dependency > name. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:19:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:39 +0100 Subject: [Buildroot] [PATCH 13/13] package/gst1-python: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-13-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:58 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-13-james.hilliard1@gmail.com> Message-ID: <87sfflxblg.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Sun Feb 5 02:37:09 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 4 Feb 2023 19:37:09 -0700 Subject: [Buildroot] [PATCH 1/1] package/gst1-vaapi: fix x11 dependencies Message-ID: <20230205023709.799349-1-james.hilliard1@gmail.com> The x11 feature needs libx11 and libxrandr support. Select and depend on these when x11 is enabled. Fixes: gst1-vaapi-1.22.0/meson.build:96:0: ERROR: Dependency "xrandr" not found, tried pkgconfig and cmake Signed-off-by: James Hilliard --- package/gstreamer1/gst1-vaapi/Config.in | 2 ++ package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in index ade8b83a5f..a1062097ed 100644 --- a/package/gstreamer1/gst1-vaapi/Config.in +++ b/package/gstreamer1/gst1-vaapi/Config.in @@ -8,6 +8,8 @@ config BR2_PACKAGE_GST1_VAAPI select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help gstreamer-vaapi consists in a collection of VA-API based plugins for GStreamer and helper libraries. diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 3d9eb91ffb..9533cdf2b6 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -43,8 +43,9 @@ else GST1_VAAPI_CONF_OPTS += -Dwayland=disabled endif -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy) GST1_VAAPI_CONF_OPTS += -Dx11=enabled +GST1_VAAPI_DEPENDENCIES += xlib_libX11 xlib_libXrandr ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) GST1_VAAPI_CONF_OPTS += -Dglx=enabled else -- 2.34.1 From james.hilliard1 at gmail.com Sun Feb 5 04:22:32 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 4 Feb 2023 21:22:32 -0700 Subject: [Buildroot] [PATCH 1/1] package/gst1-plugins-bad: add new va option Message-ID: <20230205042232.1014672-1-james.hilliard1@gmail.com> This option enables va plugin support. These plugins are vaapi based encoders/decoders that are eventually intended to replace the legacy vaapi plugins. Details: https://gstreamer.freedesktop.org/documentation/va/index.html Signed-off-by: James Hilliard --- package/gstreamer1/gst1-plugins-bad/Config.in | 11 +++++++++++ .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index bcb4cb1545..1e89cd124f 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -629,6 +629,17 @@ comment "uvch264 needs a toolchain w/ threads, wchar, gcc >= 4.9" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA + bool "va" + depends on !BR2_STATIC_LIBS # libva + depends on BR2_TOOLCHAIN_HAS_THREADS # libva + select BR2_PACKAGE_LIBVA + help + VA-API new plugin + +comment "va needs a toolchain w/ threads, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC bool "voaacenc" select BR2_PACKAGE_VO_AACENC diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 8f11ce6b37..dfe1f1c9eb 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -745,6 +745,16 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Duvch264=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dva=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += libva +ifeq ($(BR2_PACKAGE_LIBDRM),y) +GST1_PLUGINS_BAD_DEPENDENCIES += libdrm +endif +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dva=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dvoaacenc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += vo-aacenc -- 2.34.1 From bernd.kuhls at t-online.de Sun Feb 5 08:16:17 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 5 Feb 2023 09:16:17 +0100 Subject: [Buildroot] [PATCH 3/3] package/freeswitch: security bump version to 1.10.9 In-Reply-To: <20230205081617.113018-1-bernd.kuhls@t-online.de> References: <20230205081617.113018-1-bernd.kuhls@t-online.de> Message-ID: <20230205081617.113018-3-bernd.kuhls@t-online.de> Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 Upstream removed zrtp support: https://github.com/signalwire/freeswitch/pull/1848 Signed-off-by: Bernd Kuhls --- Upstream release notes declares: "This is an important release containing security fixes and stability improvements." without mentioning any CVEs. package/freeswitch/freeswitch.hash | 5 ++--- package/freeswitch/freeswitch.mk | 11 +---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 18a36ff23c..3518d60b49 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,11 +1,10 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.8.-release.tar.xz.sha256 -sha256 1176b26b2f463de2980e5be953f81ced94d23c784452bd41e086d3933a88be5f freeswitch-1.10.8.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.9.-release.tar.xz.sha256 +sha256 f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 freeswitch-1.10.9.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 6234dd8e97..7497cc4964 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.8 +FREESWITCH_VERSION = 1.10.9 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -81,15 +81,6 @@ FREESWITCH_CONF_OPTS = \ --without-python \ --disable-system-xmlrpc-c -# zrtp supports a limited set of archs, sparc support is also broken due -# to a broken ld call by gcc, see libs/libzrtp/include/zrtp_config.h -ifeq ($(BR2_i386)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le)$(BR2_x86_64),y) -FREESWITCH_LICENSE_FILES += libs/libzrtp/src/zrtp_legal.c -FREESWITCH_CONF_OPTS += --enable-zrtp -else -FREESWITCH_CONF_OPTS += --disable-zrtp -endif - # Enable optional modules FREESWITCH_ENABLED_MODULES += \ applications/mod_avmd \ -- 2.39.1 From bernd.kuhls at t-online.de Sun Feb 5 08:16:15 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 5 Feb 2023 09:16:15 +0100 Subject: [Buildroot] [PATCH 1/3] package/libks: bump version to 1.8.2 Message-ID: <20230205081617.113018-1-bernd.kuhls@t-online.de> Needed for upcoming bump of freeswitch to version 1.10.9. 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 d4ad7ebbbc..dba442bdd2 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz +sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index 4aca5c5c4c..c4f0cd5c78 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.8.0 +LIBKS_VERSION = 1.8.2 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright -- 2.39.1 From bernd.kuhls at t-online.de Sun Feb 5 08:16:16 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 5 Feb 2023 09:16:16 +0100 Subject: [Buildroot] [PATCH 2/3] package/sofia-sip: bump version to 1.13.12 In-Reply-To: <20230205081617.113018-1-bernd.kuhls@t-online.de> References: <20230205081617.113018-1-bernd.kuhls@t-online.de> Message-ID: <20230205081617.113018-2-bernd.kuhls@t-online.de> Switch to github helper due to lack of upstream-provided tarball. Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 776136bb15..4617725571 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 daf75c41408c559c2d58a8fd4d39be4a8ff5144bc1db220d4dbc28deeed6670a sofia-sip-1.13.9-f6ee306084.tar.gz +sha256 03dda8653367501b7b1188a6b6513416902372e27475553de9318ee89ac390ff sofia-sip-1.13.12.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 9071d964e4..59c365365b 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,10 +4,11 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.9 -SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-f6ee306084.tar.gz -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip +SOFIA_SIP_VERSION = 1.13.12 +SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION)) SOFIA_SIP_INSTALL_STAGING = YES +# Fetched from github, no pre-generated configure script provided +SOFIA_SIP_AUTORECONF = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS -- 2.39.1 From br015 at umbiko.net Sun Feb 5 08:20:15 2023 From: br015 at umbiko.net (Andreas Ziegler) Date: Sun, 05 Feb 2023 09:20:15 +0100 Subject: [Buildroot] [PATCH 1/4] package/libtraceevent: new package In-Reply-To: References: Message-ID: Hi Maxime, libtraceevent and libtracefs are libraries, thus should be positioned under "Target packages" -> "Libraries". Introducing a "Debugging, profiling and benchmark" category here would probably be appropriate. Tested successfully on x86_64 hardware. Kind regards, Andreas On 2023-01-30 18:44, Maxime Chevallier wrote: > > Introduce the libtraceevent library, that used to be bundled with the > trace-cmd tool. This library is now used by several tools and libraries > such as trace-cmd, libtracefs and rtla. > > This package tries to install libraries in /usr/local/lib by default, > hence the redefinition of the "prefix" variable, so that the library > gets installed in "/usr/lib" instead. > > The same applies to the pkgconfig handling of the proved Makefile, > which > installs the .pc files in the /usr/local area by default, hence the > redefinition of the pkgconfig_dir to either the correct directory > within the > staging area, or to empty value for the target to avoid installing the > .pc > in that case. > > Signed-off-by: Maxime Chevallier > --- > DEVELOPERS | 3 +++ > package/Config.in | 1 + > package/libtraceevent/Config.in | 9 +++++++ > package/libtraceevent/libtraceevent.mk | 33 ++++++++++++++++++++++++++ > 4 files changed, 46 insertions(+) > create mode 100644 package/libtraceevent/Config.in > create mode 100644 package/libtraceevent/libtraceevent.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 706ee80ece..fcf05e0aa0 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2106,6 +2106,9 @@ F: package/postgresql/ > F: package/protozero/ > F: package/timescaledb/ > > +N: Maxime Chevallier > +F: package/libtraceevent/ > + > N: Michael Durrant > F: board/arcturus/ > F: configs/arcturus_ucp1020_defconfig > diff --git a/package/Config.in b/package/Config.in > index 83fddf316f..2f0e6dcb18 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -117,6 +117,7 @@ menu "Debugging, profiling and benchmark" > source "package/kyua/Config.in" > source "package/latencytop/Config.in" > source "package/libbpf/Config.in" > + source "package/libtraceevent/Config.in" > source "package/lmbench/Config.in" > source "package/lsof/Config.in" > source "package/ltp-testsuite/Config.in" > diff --git a/package/libtraceevent/Config.in > b/package/libtraceevent/Config.in > new file mode 100644 > index 0000000000..d351e3b4de > --- /dev/null > +++ b/package/libtraceevent/Config.in > @@ -0,0 +1,9 @@ > +config BR2_PACKAGE_LIBTRACEEVENT > + bool "libtraceevent" > + help > + libtraceevent is a library that interfaces with the ftrace > + subsystem in the linux kernel. > + It used to be bundled directly in the trace-cmd > + tool, but it was eventually extracted so that it can be used > + by multiple other tools and libraries, such as libtracefs and > + rtla. From br015 at umbiko.net Sun Feb 5 08:22:56 2023 From: br015 at umbiko.net (Andreas Ziegler) Date: Sun, 05 Feb 2023 09:22:56 +0100 Subject: [Buildroot] [PATCH 3/4] package/linux-tools: add rtla In-Reply-To: References: Message-ID: Hi Maxime, I was able to build RTLA after some adaptions, see below. On 2023-01-30 18:44, Maxime Chevallier wrote: > > The RealTime Linux Analysis tool includes a set of commands that relies > on the osnoise and timerlat tracers from the ftrace kernel subsystem, > allowing to analyze the lantency sources coming from the hardware and > the kernel itself. > > This tool was introduced in v5.17, and relies on libtracefs and > libtraceevent, although libtraceevent itself is already a dependency > for > libtracefs. > > Signed-off-by: Maxime Chevallier > --- > DEVELOPERS | 1 + > package/linux-tools/Config.in | 10 +++++++ > package/linux-tools/linux-tool-rtla.mk.in | 32 +++++++++++++++++++++++ > 3 files changed, 43 insertions(+) > create mode 100644 package/linux-tools/linux-tool-rtla.mk.in > > diff --git a/DEVELOPERS b/DEVELOPERS > index fe7194f817..8f459c796a 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2109,6 +2109,7 @@ F: package/timescaledb/ > N: Maxime Chevallier > F: package/libtraceevent/ > F: package/libtracefs > +F: package/linux-tools/linux-tool-rtla.mk.in > > N: Michael Durrant > F: board/arcturus/ > diff --git a/package/linux-tools/Config.in > b/package/linux-tools/Config.in > index 8a0b6d5802..186392b816 100644 > --- a/package/linux-tools/Config.in > +++ b/package/linux-tools/Config.in > @@ -102,6 +102,16 @@ config > BR2_PACKAGE_LINUX_TOOLS_PERF_NEEDS_HOST_PYTHON3 > > endif > > +config BR2_PACKAGE_LINUX_TOOLS_RTLA > + bool "rtla" Since a version dependency exists, you might add: depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 > + select BR2_PACKAGE_LINUX_TOOLS > + select BR2_PACKAGE_LIBTRACEFS > + help > + Linux 5.17 and later has 2 new tracers, osnoise and timerlat. > + There tracers allow performing latency analysis, for which > + the rtla tool provides wrapper commands to visualize and > + extrace latency traces and reports. > + > config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS > bool"selftests" > depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash > diff --git a/package/linux-tools/linux-tool-rtla.mk.in > b/package/linux-tools/linux-tool-rtla.mk.in > new file mode 100644 > index 0000000000..a736e3b785 > --- /dev/null > +++ b/package/linux-tools/linux-tool-rtla.mk.in > @@ -0,0 +1,32 @@ > +################################################################################ > +# > +# rtla > +# > +################################################################################ > + > +LINUX_TOOLS += rtla > + > +RTLA_DEPENDENCIES = host-pkgconf libtracefs RTLA needs some kernel features; better to include them here, saves time experimenting: # linux kernel needs FTRACE, TIMERLAT_TRACER, HIST_TRIGGERS for RTLA to work ifeq ($(BR2_PACKAGE_LINUX_TOOLS_RTLA),y) define RTLA_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_FTRACE) $(call KCONFIG_ENABLE_OPT,CONFIG_TIMERLAT_TRACER) $(call KCONFIG_ENABLE_OPT,CONFIG_HIST_TRIGGERS) endef endif > +RTLA_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ > + CC=$(TARGET_CC) \ > + LDFLAGS="$(TARGET_LDFLAGS)" \ > + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig > + The RTLA Makefile unconditionally compiles with stack smashing protection; linking fails on builds configured without this feature: # adapted from linux-tool-tmon.mk.in ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) define RTLA_DISABLE_STACK_PROTECTOR $(SED) 's/-fstack-protector.* //' $(LINUX_DIR)/tools/tracing/rtla/Makefile endef endif > +define RTLA_BUILD_CMDS > + $(Q)if ! grep install $(LINUX_DIR)/tools/tracing/rtla/Makefile > >/dev/null 2>&1 ; then \ > + echo "Your kernel version is too old and does not implement the rtla > tool." ; \ > + echo "At least kernel 5.17 must be used." ; \ > + exit 1 ; \ > + fi > + $(RTLA_DISABLE_STACK_PROTECTOR) > + $(TARGET_MAKE_ENV) \ > + $(MAKE) $(RTLA_MAKE_OPTS) \ > + -C $(LINUX_DIR)/tools/tracing rtla > +endef > + > +define RTLA_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/tracing \ > + $(RTLA_MAKE_OPTS) \ > + DESTDIR=$(TARGET_DIR) \ > + rtla_install > +endef rtla_install fails with: Makefile:34: *** NOTICE: rst2man required to generate man pages. Stop. because it tries to build and install man pages also. Better to use a custom install command: # The rtla_install target tries to create and install manpages, # which terminates with an error and cannot be disabled define RTLA_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(LINUX_DIR)/tools/tracing/rtla/rtla \ $(TARGET_DIR)/usr/bin/rtla endef Kind regards, Andreas > -- > 2.39.1 From peter at korsgaard.com Sun Feb 5 09:01:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 10:01:42 +0100 Subject: [Buildroot] [PATCH 3/3] package/freeswitch: security bump version to 1.10.9 In-Reply-To: <20230205081617.113018-3-bernd.kuhls@t-online.de> References: <20230205081617.113018-1-bernd.kuhls@t-online.de> <20230205081617.113018-3-bernd.kuhls@t-online.de> Message-ID: On 05/02/2023 09.16, Bernd Kuhls wrote: > Release notes: > https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 > > Upstream removed zrtp support: > https://github.com/signalwire/freeswitch/pull/1848 > > Signed-off-by: Bernd Kuhls Fixed the checkpatch warning and applied, thanks; package/freeswitch/freeswitch.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 08:53:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 09:53:53 +0100 Subject: [Buildroot] [git commit] package/freeswitch: security bump version to 1.10.9 Message-ID: <20230205090205.CD8F4836B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46683dd4a6e65b5ae3188440e9ae8eaf055d9a85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 Upstream removed zrtp support: https://github.com/signalwire/freeswitch/pull/1848 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/freeswitch/freeswitch.hash | 5 ++--- package/freeswitch/freeswitch.mk | 11 +---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 18a36ff23c..3497a3283f 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,11 +1,10 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.8.-release.tar.xz.sha256 -sha256 1176b26b2f463de2980e5be953f81ced94d23c784452bd41e086d3933a88be5f freeswitch-1.10.8.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.9.-release.tar.xz.sha256 +sha256 f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 freeswitch-1.10.9.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 6234dd8e97..7497cc4964 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.8 +FREESWITCH_VERSION = 1.10.9 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -81,15 +81,6 @@ FREESWITCH_CONF_OPTS = \ --without-python \ --disable-system-xmlrpc-c -# zrtp supports a limited set of archs, sparc support is also broken due -# to a broken ld call by gcc, see libs/libzrtp/include/zrtp_config.h -ifeq ($(BR2_i386)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le)$(BR2_x86_64),y) -FREESWITCH_LICENSE_FILES += libs/libzrtp/src/zrtp_legal.c -FREESWITCH_CONF_OPTS += --enable-zrtp -else -FREESWITCH_CONF_OPTS += --disable-zrtp -endif - # Enable optional modules FREESWITCH_ENABLED_MODULES += \ applications/mod_avmd \ From yann.morin.1998 at free.fr Sun Feb 5 10:15:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 11:15:57 +0100 Subject: [Buildroot] [PATCH 3/3] package/freeswitch: security bump version to 1.10.9 In-Reply-To: References: <20230205081617.113018-1-bernd.kuhls@t-online.de> <20230205081617.113018-3-bernd.kuhls@t-online.de> Message-ID: <20230205101557.GA2960@scaer> Peter, All, On 2023-02-05 10:01 +0100, Peter Korsgaard spake thusly: > On 05/02/2023 09.16, Bernd Kuhls wrote: > >Release notes: > >https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 > > > >Upstream removed zrtp support: > >https://github.com/signalwire/freeswitch/pull/1848 > > > >Signed-off-by: Bernd Kuhls > > Fixed the checkpatch warning and applied, thanks; You only applied this patch 3/3, but patches 1/3 and 2/3 (likbks and sofia-sip bumps) are marked as being needed first. So I've applied them now. Bernd, it would have been nice that the patch bumping freeswitch would mention that it has a dependency on newer libks and sofia-sip versions. Indeed, if the freeswitch bump is backported to a maintenance branch, them the two other bumps will have to be backported too, and if that is not mentioned in the commit log, that will not be obvious to notice. Regards, Yann E. MORIN. > package/freeswitch/freeswitch.hash:2: separation does not match expectation > (http://nightly.buildroot.org/#adding-packages-hash > > -- > Bye, Peter Korsgaard > > _______________________________________________ > 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 Feb 5 10:16:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 11:16:15 +0100 Subject: [Buildroot] [git commit] package/libks: bump version to 1.8.2 Message-ID: <20230205101810.8142E836ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e09e7987b986d01e86e4ec45319e2dd5945259c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- 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 d4ad7ebbbc..dba442bdd2 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz +sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index 4aca5c5c4c..c4f0cd5c78 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.8.0 +LIBKS_VERSION = 1.8.2 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright From yann.morin.1998 at free.fr Sun Feb 5 10:16:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 11:16:19 +0100 Subject: [Buildroot] [git commit] package/sofia-sip: bump version to 1.13.12 Message-ID: <20230205101810.8BBE8836EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8bb962724e3a76112b7c374ae6a1c4521f97cc65 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to github helper due to lack of upstream-provided tarball. Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 776136bb15..4617725571 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 daf75c41408c559c2d58a8fd4d39be4a8ff5144bc1db220d4dbc28deeed6670a sofia-sip-1.13.9-f6ee306084.tar.gz +sha256 03dda8653367501b7b1188a6b6513416902372e27475553de9318ee89ac390ff sofia-sip-1.13.12.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 9071d964e4..59c365365b 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,10 +4,11 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.9 -SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-f6ee306084.tar.gz -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip +SOFIA_SIP_VERSION = 1.13.12 +SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION)) SOFIA_SIP_INSTALL_STAGING = YES +# Fetched from github, no pre-generated configure script provided +SOFIA_SIP_AUTORECONF = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS From yann.morin.1998 at free.fr Sun Feb 5 10:18:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 11:18:55 +0100 Subject: [Buildroot] [PATCH 1/3] package/libks: bump version to 1.8.2 In-Reply-To: <20230205081617.113018-1-bernd.kuhls@t-online.de> References: <20230205081617.113018-1-bernd.kuhls@t-online.de> Message-ID: <20230205101855.GB2960@scaer> Bernd, All, On 2023-02-05 09:16 +0100, Bernd Kuhls spake thusly: > Needed for upcoming bump of freeswitch to version 1.10.9. Please also mention that in the package that actually requires the bump. > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 d4ad7ebbbc..dba442bdd2 100644 > --- a/package/libks/libks.hash > +++ b/package/libks/libks.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz > +sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz > sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright > diff --git a/package/libks/libks.mk b/package/libks/libks.mk > index 4aca5c5c4c..c4f0cd5c78 100644 > --- a/package/libks/libks.mk > +++ b/package/libks/libks.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBKS_VERSION = 1.8.0 > +LIBKS_VERSION = 1.8.2 > LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) > LIBKS_LICENSE = MIT > LIBKS_LICENSE_FILES = copyright > -- > 2.39.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 Feb 5 10:19:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 11:19:10 +0100 Subject: [Buildroot] [PATCH 2/3] package/sofia-sip: bump version to 1.13.12 In-Reply-To: <20230205081617.113018-2-bernd.kuhls@t-online.de> References: <20230205081617.113018-1-bernd.kuhls@t-online.de> <20230205081617.113018-2-bernd.kuhls@t-online.de> Message-ID: <20230205101910.GC2960@scaer> Bernd, All, On 2023-02-05 09:16 +0100, Bernd Kuhls spake thusly: > Switch to github helper due to lack of upstream-provided tarball. > > Needed for upcoming bump of freeswitch to version 1.10.9. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/sofia-sip/sofia-sip.hash | 2 +- > package/sofia-sip/sofia-sip.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash > index 776136bb15..4617725571 100644 > --- a/package/sofia-sip/sofia-sip.hash > +++ b/package/sofia-sip/sofia-sip.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 daf75c41408c559c2d58a8fd4d39be4a8ff5144bc1db220d4dbc28deeed6670a sofia-sip-1.13.9-f6ee306084.tar.gz > +sha256 03dda8653367501b7b1188a6b6513416902372e27475553de9318ee89ac390ff sofia-sip-1.13.12.tar.gz > sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING > sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS > diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk > index 9071d964e4..59c365365b 100644 > --- a/package/sofia-sip/sofia-sip.mk > +++ b/package/sofia-sip/sofia-sip.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -SOFIA_SIP_VERSION = 1.13.9 > -SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-f6ee306084.tar.gz > -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip > +SOFIA_SIP_VERSION = 1.13.12 > +SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION)) > SOFIA_SIP_INSTALL_STAGING = YES > +# Fetched from github, no pre-generated configure script provided > +SOFIA_SIP_AUTORECONF = YES > SOFIA_SIP_DEPENDENCIES = host-pkgconf > SOFIA_SIP_LICENSE = LGPL-2.1+ > SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS > -- > 2.39.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 Feb 5 10:45:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 11:45:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: security bump to version 2.38.3 In-Reply-To: <20230117135943.2893779-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Tue, 17 Jan 2023 15:59:43 +0200") References: <20230117135943.2893779-1-aperez@igalia.com> Message-ID: <87o7q8xue3.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > Bugfix release, with security fixes for CVE-2022-42852, CVE-2022-42856, > CVE-2022-42867, CVE-2022-46691, CVE-2022-46692, CVE-2022-46698, > CVE-2022-46699, CVE-2022-46700, CVE-2022-42823, and CVE-2022-42799. > Release notes: > https://wpewebkit.org/release/wpewebkit-2.38.3.html > https://wpewebkit.org/release/wpewebkit-2.38.2.html > https://wpewebkit.org/release/wpewebkit-2.38.1.html > Accompanying security advisories: > https://wpewebkit.org/security/WSA-2022-0011.html > https://wpewebkit.org/security/WSA-2022-0010.html > Additionally, the update brings in important bug fixes for the > Bubblewrap sandbox support, scrolling in certain web sites, multimedia > playback, and build fixes. > Signed-off-by: Adrian Perez de Castro Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 10:49:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 11:49:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xlib_libXpm: security bump version to 3.5.15 In-Reply-To: <20230117200707.2730524-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 17 Jan 2023 21:07:07 +0100") References: <20230117200707.2730524-1-bernd.kuhls@t-online.de> Message-ID: <87k00wxu8j.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-January/003313.html > Fixes CVE-2022-4883, CVE-2022-44617 & CVE-2022-46285: > https://lists.x.org/archives/xorg-announce/2023-January/003312.html > Updated license hash due to upstream commit: > https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/501494c6c68a84114fdd0b44d4b67ef9cde776c9 > Added configure option to disable compressed pixmaps support: > https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/4841039e5385f264d12757903894f47c64f59361 > Signed-off-by: Bernd Kuhls Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 10:48:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 11:48:58 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/x11r7/xlib_libXpm: security bump version to 3.5.15 Message-ID: <20230205104925.3665D7FEC8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe8c4143f77b1037a2391963cd379d2eea906444 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003313.html Fixes CVE-2022-4883, CVE-2022-44617 & CVE-2022-46285: https://lists.x.org/archives/xorg-announce/2023-January/003312.html Updated license hash due to upstream commit: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/501494c6c68a84114fdd0b44d4b67ef9cde776c9 Added configure option to disable compressed pixmaps support: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/4841039e5385f264d12757903894f47c64f59361 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit a0dfd717f3ff888b4ab6d8c40bb6a01a939370cb) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 8 ++++---- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index 9ccfb4c8de..733c404543 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003261.html -sha256 f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2 libXpm-3.5.14.tar.xz -sha512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-January/003313.html +sha256 60bb906c5c317a6db863e39b69c4a83fdbd2ae2154fcf47640f8fefc9fdfd1c1 libXpm-3.5.15.tar.xz +sha512 955d716fcea2c9d868ab941c56f017b39bfa0f47fd2904e9b04c6a9be17f23f8b8c906da9c90a89a789f1f399d419641705ff5b6f9921820e34d4807c7a1992f libXpm-3.5.15.tar.xz # Locally calculated -sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING +sha256 a80d706759624a04aa90fd62bc644a360fc3d72e08dcbfb129f167c11ca285de COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 417dcfec38..970ec93407 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.14 +XLIB_LIBXPM_VERSION = 3.5.15 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT @@ -16,6 +16,7 @@ XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(TARGET_NLS_DEPENDENCIES) XLIB_LIBXPM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +XLIB_LIBXPM_CONF_OPTS = --disable-open-zfile ifeq ($(BR2_SYSTEM_ENABLE_NLS),) XLIB_LIBXPM_CONF_ENV += ac_cv_search_gettext=no From peter at korsgaard.com Sun Feb 5 10:48:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 11:48:52 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/x11r7/xlib_libXpm: bump version to 3.5.14 Message-ID: <20230205104925.277F98370A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c9c714a24a3f7f47ac9a5e7913c6feaac59a4295 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x https://lists.x.org/archives/xorg-announce/2022-November/003261.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 7d2fff78049392f2dae82f5ea9f5a0dbac225f4d) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 8 +++----- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index edfdaab335..9ccfb4c8de 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,8 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-December/003034.html -md5 6f0ecf8d103d528cfc803aa475137afa libXpm-3.5.13.tar.bz2 -sha1 38b1a2728adb49f4e255aba1530f51789815ffc4 libXpm-3.5.13.tar.bz2 -sha256 9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25 libXpm-3.5.13.tar.bz2 -sha512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5 libXpm-3.5.13.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003261.html +sha256 f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2 libXpm-3.5.14.tar.xz +sha512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz # Locally calculated sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 7b645dc9e6..417dcfec38 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.13 -XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2 -XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXPM_VERSION = 3.5.14 +XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz +XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project From peter at korsgaard.com Sun Feb 5 10:47:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 11:47:25 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/x11r7/xlib_libXpm: bump version to 3.5.14 Message-ID: <20230205105119.D25DA83734@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2724f705c3ad766d31551ddcc56b7e73081f6551 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x https://lists.x.org/archives/xorg-announce/2022-November/003261.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 7d2fff78049392f2dae82f5ea9f5a0dbac225f4d) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 8 +++----- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index edfdaab335..9ccfb4c8de 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,8 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-December/003034.html -md5 6f0ecf8d103d528cfc803aa475137afa libXpm-3.5.13.tar.bz2 -sha1 38b1a2728adb49f4e255aba1530f51789815ffc4 libXpm-3.5.13.tar.bz2 -sha256 9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25 libXpm-3.5.13.tar.bz2 -sha512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5 libXpm-3.5.13.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003261.html +sha256 f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2 libXpm-3.5.14.tar.xz +sha512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz # Locally calculated sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 7b645dc9e6..417dcfec38 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.13 -XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2 -XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXPM_VERSION = 3.5.14 +XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz +XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project From peter at korsgaard.com Sun Feb 5 10:48:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 11:48:23 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/x11r7/xlib_libXpm: security bump version to 3.5.15 Message-ID: <20230205105119.DC05E83735@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db058b26f0694742a12381e2075ef297cdff076c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003313.html Fixes CVE-2022-4883, CVE-2022-44617 & CVE-2022-46285: https://lists.x.org/archives/xorg-announce/2023-January/003312.html Updated license hash due to upstream commit: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/501494c6c68a84114fdd0b44d4b67ef9cde776c9 Added configure option to disable compressed pixmaps support: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/4841039e5385f264d12757903894f47c64f59361 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit a0dfd717f3ff888b4ab6d8c40bb6a01a939370cb) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 8 ++++---- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index 9ccfb4c8de..733c404543 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003261.html -sha256 f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2 libXpm-3.5.14.tar.xz -sha512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-January/003313.html +sha256 60bb906c5c317a6db863e39b69c4a83fdbd2ae2154fcf47640f8fefc9fdfd1c1 libXpm-3.5.15.tar.xz +sha512 955d716fcea2c9d868ab941c56f017b39bfa0f47fd2904e9b04c6a9be17f23f8b8c906da9c90a89a789f1f399d419641705ff5b6f9921820e34d4807c7a1992f libXpm-3.5.15.tar.xz # Locally calculated -sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING +sha256 a80d706759624a04aa90fd62bc644a360fc3d72e08dcbfb129f167c11ca285de COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 417dcfec38..970ec93407 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.14 +XLIB_LIBXPM_VERSION = 3.5.15 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT @@ -16,6 +16,7 @@ XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(TARGET_NLS_DEPENDENCIES) XLIB_LIBXPM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +XLIB_LIBXPM_CONF_OPTS = --disable-open-zfile ifeq ($(BR2_SYSTEM_ENABLE_NLS),) XLIB_LIBXPM_CONF_ENV += ac_cv_search_gettext=no From peter at korsgaard.com Sun Feb 5 10:53:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 11:53:37 +0100 Subject: [Buildroot] [PATCH 3/3] package/freeswitch: security bump version to 1.10.9 In-Reply-To: <20230205101557.GA2960@scaer> (Yann E. MORIN's message of "Sun, 5 Feb 2023 11:15:57 +0100") References: <20230205081617.113018-1-bernd.kuhls@t-online.de> <20230205081617.113018-3-bernd.kuhls@t-online.de> <20230205101557.GA2960@scaer> Message-ID: <87fsbkxu1a.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > On 2023-02-05 10:01 +0100, Peter Korsgaard spake thusly: >> On 05/02/2023 09.16, Bernd Kuhls wrote: >> >Release notes: >> >https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 >> > >> >Upstream removed zrtp support: >> >https://github.com/signalwire/freeswitch/pull/1848 >> > >> >Signed-off-by: Bernd Kuhls >> >> Fixed the checkpatch warning and applied, thanks; > You only applied this patch 3/3, but patches 1/3 and 2/3 (likbks and > sofia-sip bumps) are marked as being needed first. So I've applied them > now. Ups, thanks for fixing it! > Bernd, it would have been nice that the patch bumping freeswitch would > mention that it has a dependency on newer libks and sofia-sip versions. > Indeed, if the freeswitch bump is backported to a maintenance branch, > them the two other bumps will have to be backported too, and if that is > not mentioned in the commit log, that will not be obvious to notice. Yes please! -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 12:07:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 13:07:48 +0100 Subject: [Buildroot] [PATCH v1] package/git: bump version to 2.39.1 In-Reply-To: <87v8l1abjx.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Fri, 20 Jan 2023 08:51:30 +0100") References: <20230118213517.5946-1-ps.report@gmx.net> <87v8l1abjx.fsf@dell.be.48ers.dk> Message-ID: <87bkm8xqln.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Peter" == Peter Seiderer writes: >> - fixes CVE-2022-41903 and CVE-2022-23521 >> For details see [1]. >> [1] https://lore.kernel.org/git/xmqq7cxl9h0i.fsf at gitster.g/ >> Signed-off-by: Peter Seiderer > Committed after adjusting the summary to make it clear that this is a > security bump, thanks. For 2022.02.x / 2022.11.x I have instead bumped to 2.31.6, which contains the same security fixes. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 12:05:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 13:05:42 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/git: security bump to version 2.31.6 Message-ID: <20230205120807.9F59D8373B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=486eae3194824239eab90a71c61be4154ec1a0c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes the following security issues: * CVE-2022-41903: git log has the ability to display commits using an arbitrary format with its --format specifiers. This functionality is also exposed to git archive via the export-subst gitattribute. When processing the padding operators (e.g., %<(, %<|(, %>(, %>>(, or %><( ), an integer overflow can occur in pretty.c::format_and_pad_commit() where a size_t is improperly stored as an int, and then added as an offset to a subsequent memcpy() call. This overflow can be triggered directly by a user running a command which invokes the commit formatting machinery (e.g., git log --format=...). It may also be triggered indirectly through git archive via the export-subst mechanism, which expands format specifiers inside of files within the repository during a git archive. This integer overflow can result in arbitrary heap writes, which may result in remote code execution. * CVE-2022-23521: gitattributes are a mechanism to allow defining attributes for paths. These attributes can be defined by adding a `.gitattributes` file to the repository, which contains a set of file patterns and the attributes that should be set for paths matching this pattern. When parsing gitattributes, multiple integer overflows can occur when there is a huge number of path patterns, a huge number of attributes for a single pattern, or when the declared attribute names are huge. These overflows can be triggered via a crafted `.gitattributes` file that may be part of the commit history. Git silently splits lines longer than 2KB when parsing gitattributes from a file, but not when parsing them from the index. Consequentially, the failure mode depends on whether the file exists in the working tree, the index or both. This integer overflow can result in arbitrary heap reads and writes, which may result in remote code execution. Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index af09ea817b..9a472b49ec 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 dbc80f88d36fcde2c7acaaa9343cfab0f56effe9aee60e5eb00f3f36b8a619b4 git-2.31.5.tar.xz +sha256 e0fa851e4ccb990c57793a3cfcbf7c8981fbacab175025ea15db9ecd57434cee git-2.31.6.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 653b4f46ad..0b4e93a8b6 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.31.5 +GIT_VERSION = 2.31.6 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From peter at korsgaard.com Sun Feb 5 12:04:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 13:04:18 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/git: security bump to version 2.31.6 Message-ID: <20230205120921.091E58373F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70485003c5a6e8a3508760db46a98d2d9b20df2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes the following security issues: * CVE-2022-41903: git log has the ability to display commits using an arbitrary format with its --format specifiers. This functionality is also exposed to git archive via the export-subst gitattribute. When processing the padding operators (e.g., %<(, %<|(, %>(, %>>(, or %><( ), an integer overflow can occur in pretty.c::format_and_pad_commit() where a size_t is improperly stored as an int, and then added as an offset to a subsequent memcpy() call. This overflow can be triggered directly by a user running a command which invokes the commit formatting machinery (e.g., git log --format=...). It may also be triggered indirectly through git archive via the export-subst mechanism, which expands format specifiers inside of files within the repository during a git archive. This integer overflow can result in arbitrary heap writes, which may result in remote code execution. * CVE-2022-23521: gitattributes are a mechanism to allow defining attributes for paths. These attributes can be defined by adding a `.gitattributes` file to the repository, which contains a set of file patterns and the attributes that should be set for paths matching this pattern. When parsing gitattributes, multiple integer overflows can occur when there is a huge number of path patterns, a huge number of attributes for a single pattern, or when the declared attribute names are huge. These overflows can be triggered via a crafted `.gitattributes` file that may be part of the commit history. Git silently splits lines longer than 2KB when parsing gitattributes from a file, but not when parsing them from the index. Consequentially, the failure mode depends on whether the file exists in the working tree, the index or both. This integer overflow can result in arbitrary heap reads and writes, which may result in remote code execution. Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index af09ea817b..9a472b49ec 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 dbc80f88d36fcde2c7acaaa9343cfab0f56effe9aee60e5eb00f3f36b8a619b4 git-2.31.5.tar.xz +sha256 e0fa851e4ccb990c57793a3cfcbf7c8981fbacab175025ea15db9ecd57434cee git-2.31.6.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 653b4f46ad..0b4e93a8b6 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.31.5 +GIT_VERSION = 2.31.6 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From thomas.petazzoni at bootlin.com Sun Feb 5 12:15:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:15:59 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain/Config.in: extend gcc bug 43744 to every sh architecture In-Reply-To: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> References: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> Message-ID: <20230205131559.6f79944f@windsurf> On Thu, 2 Feb 2023 16:42:38 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti It would be nice to have a non-empty commit log, which explains which other CPU is affected by the bug, and perhaps a defconfig that exhibits the issue, or something like that. Thanks a lot! 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 Sun Feb 5 12:15:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:15:54 +0100 Subject: [Buildroot] [git commit] package/gst1-vaapi: fix x11 dependencies Message-ID: <20230205121750.52D3A83747@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2e1b425a810981c3394426f09842518d9ee445ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The x11 feature needs libx11 and libxrandr support. Select and depend on these when x11 is enabled. Fixes: gst1-vaapi-1.22.0/meson.build:96:0: ERROR: Dependency "xrandr" not found, tried pkgconfig and cmake Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-vaapi/Config.in | 2 ++ package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in index ade8b83a5f..a1062097ed 100644 --- a/package/gstreamer1/gst1-vaapi/Config.in +++ b/package/gstreamer1/gst1-vaapi/Config.in @@ -8,6 +8,8 @@ config BR2_PACKAGE_GST1_VAAPI select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help gstreamer-vaapi consists in a collection of VA-API based plugins for GStreamer and helper libraries. diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 3d9eb91ffb..9533cdf2b6 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -43,8 +43,9 @@ else GST1_VAAPI_CONF_OPTS += -Dwayland=disabled endif -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy) GST1_VAAPI_CONF_OPTS += -Dx11=enabled +GST1_VAAPI_DEPENDENCIES += xlib_libX11 xlib_libXrandr ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) GST1_VAAPI_CONF_OPTS += -Dglx=enabled else From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:48 +0100 Subject: [Buildroot] [git commit] configs/olimex_a10_olinuxino_lime_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230205121914.5CB3C8376E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f54c7ffce70d583dbd85718f23d1bd7b18a0a744 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a10_olinuxino_lime_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a10_olinuxino_lime_defconfig b/configs/olimex_a10_olinuxino_lime_defconfig index d0e00301f7..9c454b1915 100644 --- a/configs/olimex_a10_olinuxino_lime_defconfig +++ b/configs/olimex_a10_olinuxino_lime_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a10-olinuxino" @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a10_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -33,7 +33,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A10-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:52 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino_micro_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230205121914.896AB8376E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f23405b39a850b54c61b719bf7d079664d773fc6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_micro_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index 1394c0b8b8..a7a6eb51a0 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-micro" @@ -33,7 +33,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino_MICRO" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:51 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino_lime_defconfig: bump Linux to 6.1.9 Message-ID: <20230205121914.7CC6283772@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e624207495b25403ad370d595ebb37fad3f74176 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index f685d19421..25ecf31146 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.15 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:49 +0100 Subject: [Buildroot] [git commit] configs/olimex_a13_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230205121914.662B38376F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b85b4d21d96f232b09b27eaf70a869c5bf66a30 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a13_olinuxino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a13_olinuxino_defconfig b/configs/olimex_a13_olinuxino_defconfig index 6d25d7d0a1..8469ce1fd0 100644 --- a/configs/olimex_a13_olinuxino_defconfig +++ b/configs/olimex_a13_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a13-olinuxino" @@ -15,7 +15,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A13-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -28,7 +28,7 @@ BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:53 +0100 Subject: [Buildroot] [git commit] configs/olimex_a33_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230205121914.944028376F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4ac41042515944eafb892c8c26ea3b940211136 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a33_olinuxino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a33_olinuxino_defconfig b/configs/olimex_a33_olinuxino_defconfig index cdbc63efe1..35398ac6da 100644 --- a/configs/olimex_a33_olinuxino_defconfig +++ b/configs/olimex_a33_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a7=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="A33-olinuxino" @@ -15,7 +15,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A33-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -31,7 +31,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a33_olinuxino/boot # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:50 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino_lime2_defconfig: bump Linux to 6.1.9 Message-ID: <20230205121914.7267A83771@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=720d30f9d29327e326916457bb74eeeb976b3ff1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime2_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index a0ebcaed66..50a0986ab2 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.15 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:54 +0100 Subject: [Buildroot] [git commit] configs/olimex_a64_olinuxino_defconfig: bump Linux to 6.1.9, U-Boot to 2023.01 and ATF to v2.8 Message-ID: <20230205121914.9E5EB83771@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3d7f7a73bb025152e6594ab812a2bfa893851f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Linux 6.1.9 installs more modules and this makes rootfs size to increase and the default 60M size is not enough. So let's expand rootfs size to 120M. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a64_olinuxino_defconfig | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configs/olimex_a64_olinuxino_defconfig b/configs/olimex_a64_olinuxino_defconfig index 53e8c2ece5..dd445e8ce0 100644 --- a/configs/olimex_a64_olinuxino_defconfig +++ b/configs/olimex_a64_olinuxino_defconfig @@ -2,13 +2,13 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.8" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -16,7 +16,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="a64-olinuxino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -33,7 +33,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-olinuxino" @@ -43,6 +43,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_GENERIC_ISSUE="Welcome to Olimex A64-OLinuXino" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From thomas.petazzoni at bootlin.com Sun Feb 5 12:19:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:19:37 +0100 Subject: [Buildroot] [PATCH 0/7] Bump Linux, U-boot and ATF versions for olimex_a* boards In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230205131937.05c15418@windsurf> On Wed, 1 Feb 2023 23:32:34 +0100 Giulio Benetti wrote: > Giulio Benetti (7): > configs/olimex_a10_olinuxino_lime_defconfig: bump Linux to 6.1.9 and > U-Boot to 2023.01 > configs/olimex_a13_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot > to 2023.01 > configs/olimex_a20_olinuxino_lime2_defconfig: bump Linux to 6.1.9 > configs/olimex_a20_olinuxino_lime_defconfig: bump Linux to 6.1.9 > configs/olimex_a20_olinuxino_micro_defconfig: bump Linux to 6.1.9 and > U-Boot to 2023.01 > configs/olimex_a33_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot > to 2023.01 > configs/olimex_a64_olinuxino_defconfig: bump Linux to 6.1.9, U-Boot to > 2023.01 and ATF to v2.8 All applied, thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 5 12:20:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:20:53 +0100 Subject: [Buildroot] [PATCH 1/1] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. In-Reply-To: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> References: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> Message-ID: <20230205132053.740a7efe@windsurf> On Wed, 1 Feb 2023 11:59:56 -0800 Graeme Smecher wrote: > If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > buildroot into the linux tree, these .dts files are copied to > arch/arm64/boot. Unfortunately, the post-image.sh script expects to find > them in arch/arm64/boot/xilinx. > > This patch does not require the xilinx/ prefix to be present when > symlinking the device-tree to system.dtb where u-boot expects to find > it. > > Signed-off-by: Graeme Smecher > --- > board/zynqmp/post-image.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 5 12:20:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:20:58 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: Remove openal from my list In-Reply-To: <20230201192711.1632095-1-nerv@dawncrow.de> References: <20230201192711.1632095-1-nerv@dawncrow.de> Message-ID: <20230205132058.0411cb56@windsurf> On Wed, 1 Feb 2023 20:27:11 +0100 Andr? Zwing wrote: > Signed-off-by: Andr? Zwing > --- > DEVELOPERS | 1 - > 1 file changed, 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 5 12:20:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:20:45 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: Remove openal from my list Message-ID: <20230205122112.D634D8377B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c8cda8c94e00dc4571a6ad1b3f9c1c617a63873 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Andr?? Zwing Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577..d526451ca3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -133,7 +133,6 @@ F: boot/ti-k3-r5-loader/ N: Andr?? Zwing F: package/libkrb5/ -F: package/openal/ F: package/p7zip/ F: package/wine/ From thomas.petazzoni at bootlin.com Sun Feb 5 12:20:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:20:46 +0100 Subject: [Buildroot] [git commit] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. Message-ID: <20230205122112.DF1208377C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70477e5fee6e92b1d783257a8b3e57a78007438e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from buildroot into the linux tree, these .dts files are copied to arch/arm64/boot. Unfortunately, the post-image.sh script expects to find them in arch/arm64/boot/xilinx. This patch does not require the xilinx/ prefix to be present when symlinking the device-tree to system.dtb where u-boot expects to find it. Signed-off-by: Graeme Smecher Reviewed-by: Luca Ceresoli Reviewed-by: Neal Frager Signed-off-by: Thomas Petazzoni --- board/zynqmp/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index ed6dbe188c..c5de2db820 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -5,7 +5,7 @@ # devicetree listed in the config. FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ ${BR2_CONFIG}) [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb From thomas.petazzoni at bootlin.com Sun Feb 5 12:24:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:24:10 +0100 Subject: [Buildroot] [git commit] board/versal/post-image.sh: do not require xilinx/ prefix for .dts files Message-ID: <20230205122418.ABFA383782@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=122c85985f199f48f02c5fbd411111629023fc37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from buildroot into the linux tree, these .dts files are copied to arch/arm64/boot. Unfortunately, the post-image.sh script expects to find them in arch/arm64/boot/xilinx. This patch does not require the xilinx/ prefix to be present when symlinking the device-tree to system.dtb where u-boot expects to find it. It is effectively applying the below patch for zynqmp to versal as well: https://patchwork.ozlabs.org/project/buildroot/patch/20230201195956.1758827-1-gsmecher at threespeedlogic.com/ Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- board/versal/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh index f45f29a155..92e65ed3b7 100755 --- a/board/versal/post-image.sh +++ b/board/versal/post-image.sh @@ -5,7 +5,7 @@ # devicetree listed in the config. FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ ${BR2_CONFIG}) [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb From thomas.petazzoni at bootlin.com Sun Feb 5 12:24:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:24:20 +0100 Subject: [Buildroot] [PATCH v1 1/1] board/versal/post-image.sh: do not require xilinx/ prefix for .dts files In-Reply-To: <20230202133817.56293-1-neal.frager@amd.com> References: <20230202133817.56293-1-neal.frager@amd.com> Message-ID: <20230205132420.6a559edd@windsurf> On Thu, 2 Feb 2023 13:38:17 +0000 Neal Frager via buildroot wrote: > If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > buildroot into the linux tree, these .dts files are copied to > arch/arm64/boot. Unfortunately, the post-image.sh script expects to find > them in arch/arm64/boot/xilinx. > > This patch does not require the xilinx/ prefix to be present when > symlinking the device-tree to system.dtb where u-boot expects to find > it. > > It is effectively applying the below patch for zynqmp to versal as well: > https://patchwork.ozlabs.org/project/buildroot/patch/20230201195956.1758827-1-gsmecher at threespeedlogic.com/ > > Signed-off-by: Neal Frager > --- > board/versal/post-image.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 5 12:28:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:28:07 +0100 Subject: [Buildroot] [git commit] package/python-pytest: remove runtime dependency on python-toml Message-ID: <20230205122816.34E968378B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f802249c6227fa1b7299e59d8fff43b98cb2106d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since version 7.2 [1], with Python 3.11+ pytest no longer uses tomli to parse pyproject.toml but instead uses tomllib which is part of Python itself [2]. Note that toml was replaced with tomli in version 7.0, so the dependency was anyway incorrect. Note that tomllib is unconditionally installed as part of Python 3.11, there is no PYTHON3_LIBTOML option or anything like that that needs to be selected. [1] https://docs.pytest.org/en/latest/changelog.html#pytest-7-2-0-2022-10-23 [2] https://github.com/pytest-dev/pytest/pull/9741 Signed-off-by: Arnout Vandecappelle Reviewed-by: Ryan Barnett Signed-off-by: Thomas Petazzoni --- package/python-pytest/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in index c3956c76d2..9bbc9ea2d2 100644 --- a/package/python-pytest/Config.in +++ b/package/python-pytest/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_PYTEST select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_PLUGGY # runtime select BR2_PACKAGE_PYTHON_PY # runtime - select BR2_PACKAGE_PYTHON_TOML # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help pytest is a framework that makes building simple and scalable From yann.morin.1998 at free.fr Sun Feb 5 12:29:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:29:22 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bad: add new va option Message-ID: <20230205122936.6936483798@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f291a384388a4d48c118b68fb25affb868fb280 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This option enables va plugin support. These plugins are vaapi based encoders/decoders that are eventually intended to replace the legacy vaapi plugins. Details: https://gstreamer.freedesktop.org/documentation/va/index.html Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-bad/Config.in | 11 +++++++++++ package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index bcb4cb1545..1e89cd124f 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -629,6 +629,17 @@ comment "uvch264 needs a toolchain w/ threads, wchar, gcc >= 4.9" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA + bool "va" + depends on !BR2_STATIC_LIBS # libva + depends on BR2_TOOLCHAIN_HAS_THREADS # libva + select BR2_PACKAGE_LIBVA + help + VA-API new plugin + +comment "va needs a toolchain w/ threads, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC bool "voaacenc" select BR2_PACKAGE_VO_AACENC diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 8f11ce6b37..dfe1f1c9eb 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -745,6 +745,16 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Duvch264=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dva=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += libva +ifeq ($(BR2_PACKAGE_LIBDRM),y) +GST1_PLUGINS_BAD_DEPENDENCIES += libdrm +endif +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dva=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dvoaacenc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += vo-aacenc From peter at korsgaard.com Sun Feb 5 12:31:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 13:31:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/ssdp-responder: fix misspelled define directive In-Reply-To: <20230123051808.2213859-1-troglobit@gmail.com> (Joachim Wiberg's message of "Mon, 23 Jan 2023 06:18:07 +0100") References: <20230123051808.2213859-1-troglobit@gmail.com> Message-ID: <877cwwxpik.fsf@dell.be.48ers.dk> >>>>> "Joachim" == Joachim Wiberg writes: > Signed-off-by: Joachim Wiberg Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 12:31:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 13:31:03 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/ssdp-responder: fix misspelled define directive Message-ID: <20230205123151.D641C837A1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=03c15062c33a92145ef28d71819ce52adb8851fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN (cherry picked from commit 6e0ba6bfc2d28a8079d336a18cc50f0825952ec2) Signed-off-by: Peter Korsgaard --- package/ssdp-responder/ssdp-responder.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index 3fee4c2006..d878e3c629 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,7 +25,7 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP-RESPONDER_INSTALL_INIT_SYSTEMD +define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service endef From peter at korsgaard.com Sun Feb 5 12:30:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 13:30:51 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/ssdp-responder: fix misspelled define directive Message-ID: <20230205123313.371E2837A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3909dfbb818c8fc25def5c136fa8d4620f7f4a1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN (cherry picked from commit 6e0ba6bfc2d28a8079d336a18cc50f0825952ec2) Signed-off-by: Peter Korsgaard --- package/ssdp-responder/ssdp-responder.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index 3fee4c2006..d878e3c629 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,7 +25,7 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP-RESPONDER_INSTALL_INIT_SYSTEMD +define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service endef From yann.morin.1998 at free.fr Sun Feb 5 12:32:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:32:48 +0100 Subject: [Buildroot] [git commit] package/libfuse3: bump to version 3.13.1 Message-ID: <20230205123440.72299837B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b439a721e0e74e3e97ee10a89853ab6a4b8a627 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/a98/a984d275d949e8dc989870d2d2b6f6c7168d52bb/ Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index 691bfbc9d6..f697f4ad3f 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 224544214204eb348b548d6faa7a9bc91b053aacfc92e8b5da3f478c76ae4a03 libfuse3-3.13.0.tar.gz +sha256 96399b09b91bc717a9e96ffea660d611e6a342547c1abd4d0e858b3dca9d5a13 libfuse3-3.13.1.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index d94f7d3d3a..a2e9775868 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.13.0 +LIBFUSE3_VERSION = 3.13.1 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sun Feb 5 12:36:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:36:06 +0100 Subject: [Buildroot] [PATCH] package/libfuse3: bump to version 3.13.1 In-Reply-To: <20230204203750.513283-1-giulio.benetti@benettiengineering.com> References: <20230204203750.513283-1-giulio.benetti@benettiengineering.com> Message-ID: <20230205123606.GD2960@scaer> Giulio, All, On 2023-02-04 21:37 +0100, Giulio Benetti spake thusly: > Fixes: > http://autobuild.buildroot.net/results/a98/a984d275d949e8dc989870d2d2b6f6c7168d52bb/ > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libfuse3/libfuse3.hash | 2 +- > package/libfuse3/libfuse3.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash > index 691bfbc9d6..f697f4ad3f 100644 > --- a/package/libfuse3/libfuse3.hash > +++ b/package/libfuse3/libfuse3.hash > @@ -1,3 +1,3 @@ > # Locally calculated sha256 checksums > -sha256 224544214204eb348b548d6faa7a9bc91b053aacfc92e8b5da3f478c76ae4a03 libfuse3-3.13.0.tar.gz > +sha256 96399b09b91bc717a9e96ffea660d611e6a342547c1abd4d0e858b3dca9d5a13 libfuse3-3.13.1.tar.gz > sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE > diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk > index d94f7d3d3a..a2e9775868 100644 > --- a/package/libfuse3/libfuse3.mk > +++ b/package/libfuse3/libfuse3.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBFUSE3_VERSION = 3.13.0 > +LIBFUSE3_VERSION = 3.13.1 > LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) > LIBFUSE3_LICENSE = LGPL-2.1 > LIBFUSE3_LICENSE_FILES = LICENSE > -- > 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 Feb 5 12:36:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:36:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/gst1-plugins-bad: add new va option In-Reply-To: <20230205042232.1014672-1-james.hilliard1@gmail.com> References: <20230205042232.1014672-1-james.hilliard1@gmail.com> Message-ID: <20230205123623.GE2960@scaer> James, All, On 2023-02-04 21:22 -0700, James Hilliard spake thusly: > This option enables va plugin support. > > These plugins are vaapi based encoders/decoders that are eventually > intended to replace the legacy vaapi plugins. > > Details: > https://gstreamer.freedesktop.org/documentation/va/index.html > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gstreamer1/gst1-plugins-bad/Config.in | 11 +++++++++++ > .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 10 ++++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in > index bcb4cb1545..1e89cd124f 100644 > --- a/package/gstreamer1/gst1-plugins-bad/Config.in > +++ b/package/gstreamer1/gst1-plugins-bad/Config.in > @@ -629,6 +629,17 @@ comment "uvch264 needs a toolchain w/ threads, wchar, gcc >= 4.9" > depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > > +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA > + bool "va" > + depends on !BR2_STATIC_LIBS # libva > + depends on BR2_TOOLCHAIN_HAS_THREADS # libva > + select BR2_PACKAGE_LIBVA > + help > + VA-API new plugin > + > +comment "va needs a toolchain w/ threads, dynamic library" > + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS > + > config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC > bool "voaacenc" > select BR2_PACKAGE_VO_AACENC > diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk > index 8f11ce6b37..dfe1f1c9eb 100644 > --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk > +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk > @@ -745,6 +745,16 @@ else > GST1_PLUGINS_BAD_CONF_OPTS += -Duvch264=disabled > endif > > +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA),y) > +GST1_PLUGINS_BAD_CONF_OPTS += -Dva=enabled > +GST1_PLUGINS_BAD_DEPENDENCIES += libva > +ifeq ($(BR2_PACKAGE_LIBDRM),y) > +GST1_PLUGINS_BAD_DEPENDENCIES += libdrm > +endif > +else > +GST1_PLUGINS_BAD_CONF_OPTS += -Dva=disabled > +endif > + > ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC),y) > GST1_PLUGINS_BAD_CONF_OPTS += -Dvoaacenc=enabled > GST1_PLUGINS_BAD_DEPENDENCIES += vo-aacenc > -- > 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 Feb 5 12:36:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:36:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/gst1-vaapi: fix x11 dependencies In-Reply-To: <20230205023709.799349-1-james.hilliard1@gmail.com> References: <20230205023709.799349-1-james.hilliard1@gmail.com> Message-ID: <20230205123644.GF2960@scaer> James, All, On 2023-02-04 19:37 -0700, James Hilliard spake thusly: > The x11 feature needs libx11 and libxrandr support. > > Select and depend on these when x11 is enabled. > > Fixes: > gst1-vaapi-1.22.0/meson.build:96:0: ERROR: Dependency "xrandr" not found, tried pkgconfig and cmake > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gstreamer1/gst1-vaapi/Config.in | 2 ++ > package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 3 ++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in > index ade8b83a5f..a1062097ed 100644 > --- a/package/gstreamer1/gst1-vaapi/Config.in > +++ b/package/gstreamer1/gst1-vaapi/Config.in > @@ -8,6 +8,8 @@ config BR2_PACKAGE_GST1_VAAPI > select BR2_PACKAGE_LIBDRM > select BR2_PACKAGE_GST1_PLUGINS_BASE > select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers > + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 > help > gstreamer-vaapi consists in a collection of VA-API based > plugins for GStreamer and helper libraries. > diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk > index 3d9eb91ffb..9533cdf2b6 100644 > --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk > +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk > @@ -43,8 +43,9 @@ else > GST1_VAAPI_CONF_OPTS += -Dwayland=disabled > endif > > -ifeq ($(BR2_PACKAGE_XORG7),y) > +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy) > GST1_VAAPI_CONF_OPTS += -Dx11=enabled > +GST1_VAAPI_DEPENDENCIES += xlib_libX11 xlib_libXrandr > ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) > GST1_VAAPI_CONF_OPTS += -Dglx=enabled > else > -- > 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 Feb 5 12:40:49 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 13:40:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: add CPE variables Message-ID: <20230205124049.5139-1-fontaine.fabrice@gmail.com> cpe:2.3:a:treasuredata:fluent_bit is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atreasuredata%3Afluent_bit Signed-off-by: Fabrice Fontaine --- package/fluent-bit/fluent-bit.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 6e9a33e02e..879437e5f4 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -8,6 +8,8 @@ FLUENT_BIT_VERSION = 2.0.8 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE +FLUENT_BIT_CPE_ID_VENDOR = treasuredata +FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl FLUENT_BIT_CONF_OPTS += \ -- 2.39.0 From yann.morin.1998 at free.fr Sun Feb 5 12:51:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:51:13 +0100 Subject: [Buildroot] [git commit] package/rdma-core: new package Message-ID: <20230205125237.A6202837ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is the userspace components for the Linux Kernel's drivers/infiniband subsystem. https://github.com/linux-rdma/rdma-core Tested-by: Shamraiz Ashraf Signed-off-by: Julien Olivain [yann.morin.1998 at free.fr: - select iproute2 as it provides the 'rdma' utility ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 + package/Config.in | 1 + package/rdma-core/Config.in | 20 ++++++ package/rdma-core/rdma-core.hash | 5 ++ package/rdma-core/rdma-core.mk | 24 +++++++ package/rdma-core/readme.txt | 75 ++++++++++++++++++++++ support/testing/tests/package/test_rdma_core.py | 43 +++++++++++++ .../package/test_rdma_core/linux-rdma.fragment | 9 +++ 8 files changed, 180 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d526451ca3..73905748ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1695,6 +1695,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/tinycompress/ F: package/z3/ @@ -1710,6 +1711,8 @@ F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_rdma_core.py +F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py N: Julien Viard de Galbert diff --git a/package/Config.in b/package/Config.in index 83fddf316f..1f6db14d56 100644 --- a/package/Config.in +++ b/package/Config.in @@ -573,6 +573,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..59f5ef63ae --- /dev/null +++ b/package/rdma-core/Config.in @@ -0,0 +1,20 @@ +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_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_IPROUTE2 # runtime + 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 + +comment "rdma-core needs a toolchain w/ headers >= 3.4, threads, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \ + || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash new file mode 100644 index 0000000000..1aff44f7f4 --- /dev/null +++ b/package/rdma-core/rdma-core.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 4a2eec55b37ac25f25e7680a372f71c1781c23808542bd31fb68dc0448b8cba2 rdma-core-44.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..885821bf98 --- /dev/null +++ b/package/rdma-core/rdma-core.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# rdma-core +# +################################################################################ + +RDMA_CORE_VERSION = 44.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..9a95226ef4 --- /dev/null +++ b/package/rdma-core/readme.txt @@ -0,0 +1,75 @@ +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 configuration, 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). The Kernel +config fragment file used for package test can be used as a starting +point. See: + + support/testing/tests/package/test_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 -d 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..614fb51f48 --- /dev/null +++ b/support/testing/tests/package/test_rdma_core.py @@ -0,0 +1,43 @@ +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.91" + 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="{}" + 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 + """.format( + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") + ) + + 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") diff --git a/support/testing/tests/package/test_rdma_core/linux-rdma.fragment b/support/testing/tests/package/test_rdma_core/linux-rdma.fragment new file mode 100644 index 0000000000..e305f27e62 --- /dev/null +++ b/support/testing/tests/package/test_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 From yann.morin.1998 at free.fr Sun Feb 5 12:54:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:54:16 +0100 Subject: [Buildroot] [PATCH v6 1/2] package/rdma-core: new package In-Reply-To: <20230202202002.3272959-1-ju.o@free.fr> References: <20230202202002.3272959-1-ju.o@free.fr> Message-ID: <20230205125416.GG2960@scaer> Julien, All, On 2023-02-02 21:20 +0100, Julien Olivain spake thusly: > This is the userspace components for the Linux Kernel's > drivers/infiniband subsystem. > > https://github.com/linux-rdma/rdma-core > > Tested-by: Shamraiz Ashraf > Signed-off-by: Julien Olivain > --- [--SNIP--] > diff --git a/package/rdma-core/Config.in b/package/rdma-core/Config.in > new file mode 100644 > index 0000000000..437cf903ac > --- /dev/null > +++ b/package/rdma-core/Config.in > @@ -0,0 +1,22 @@ > +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. > + > + Note: The 'rdma' utility program is provided by the > + 'iproute2' package, when compiled with the package 'libmnl' > + also selected. This program is needed to configure > + InfiniBand and RDMA networks from the command line. Since it requires that utility from iproute2, I added a select (and appropriate dependencies),and dropped that comment. Applied to master, thanks. Regards, Yann E. MORIN. > + https://github.com/linux-rdma/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/rdma-core.hash b/package/rdma-core/rdma-core.hash > new file mode 100644 > index 0000000000..1aff44f7f4 > --- /dev/null > +++ b/package/rdma-core/rdma-core.hash > @@ -0,0 +1,5 @@ > +# Locally calculated > +sha256 4a2eec55b37ac25f25e7680a372f71c1781c23808542bd31fb68dc0448b8cba2 rdma-core-44.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..885821bf98 > --- /dev/null > +++ b/package/rdma-core/rdma-core.mk > @@ -0,0 +1,24 @@ > +################################################################################ > +# > +# rdma-core > +# > +################################################################################ > + > +RDMA_CORE_VERSION = 44.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..9a95226ef4 > --- /dev/null > +++ b/package/rdma-core/readme.txt > @@ -0,0 +1,75 @@ > +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 configuration, 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). The Kernel > +config fragment file used for package test can be used as a starting > +point. See: > + > + support/testing/tests/package/test_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 -d 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..614fb51f48 > --- /dev/null > +++ b/support/testing/tests/package/test_rdma_core.py > @@ -0,0 +1,43 @@ > +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.91" > + 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="{}" > + 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 > + """.format( > + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") > + ) > + > + 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") > diff --git a/support/testing/tests/package/test_rdma_core/linux-rdma.fragment b/support/testing/tests/package/test_rdma_core/linux-rdma.fragment > new file mode 100644 > index 0000000000..e305f27e62 > --- /dev/null > +++ b/support/testing/tests/package/test_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 > -- > 2.39.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 ju.o at free.fr Sun Feb 5 13:03:55 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 5 Feb 2023 14:03:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/z3: bump to version 4.12.1 Message-ID: <20230205130355.797050-1-ju.o@free.fr> For change log since v4.12.0, see: - https://github.com/Z3Prover/z3/releases/tag/z3-4.12.1 Signed-off-by: Julien Olivain --- Patch tested on branch master at commit 8bb9627 with commands: make check-package ... 0 warnings generated support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_z3 ... OK ./utils/test-pkg -p z3 ... 6 builds, 4 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/z3/z3.hash | 2 +- package/z3/z3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/z3/z3.hash b/package/z3/z3.hash index 517e2f4923..8a511c3fe5 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5f575f0a3950760436217da1cc1a714569b6d4f664a75bb6775876328cf0a580 z3-4.12.0.tar.gz +sha256 a3735fabf00e1341adcc70394993c05fd3e2ae167a3e9bb46045e33084eb64a3 z3-4.12.1.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index ecd79325dc..45c412ad12 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.12.0 +Z3_VERSION = 4.12.1 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 5 13:06:00 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 14:06:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/opusfile: fix CVE-2022-47021 Message-ID: <20230205130600.18051-1-fontaine.fabrice@gmail.com> A null pointer dereference issue was discovered in functions op_get_data and op_open1 in opusfile.c in xiph opusfile 0.9 thru 0.12 allows attackers to cause denial of service or other unspecified impacts. Signed-off-by: Fabrice Fontaine --- ...ocation-failure-from-ogg_sync_buffer.patch | 44 +++++++++++++++++++ package/opusfile/opusfile.mk | 3 ++ 2 files changed, 47 insertions(+) create mode 100644 package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch diff --git a/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch new file mode 100644 index 0000000000..2ef08502ab --- /dev/null +++ b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch @@ -0,0 +1,44 @@ +From 0a4cd796df5b030cb866f3f4a5e41a4b92caddf5 Mon Sep 17 00:00:00 2001 +From: Ralph Giles +Date: Tue, 6 Sep 2022 19:04:31 -0700 +Subject: [PATCH] Propagate allocation failure from ogg_sync_buffer. + +Instead of segfault, report OP_EFAULT if ogg_sync_buffer returns +a null pointer. This allows more graceful recovery by the caller +in the unlikely event of a fallible ogg_malloc call. + +We do check the return value elsewhere in the code, so the new +checks make the code more consistent. + +Thanks to https://github.com/xiph/opusfile/issues/36 for reporting. + +Signed-off-by: Timothy B. Terriberry +Signed-off-by: Mark Harris + +[Retrieved from: +https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5] +Signed-off-by: Fabrice Fontaine +--- + src/opusfile.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/opusfile.c b/src/opusfile.c +index ca219b2..3c3c81e 100644 +--- a/src/opusfile.c ++++ b/src/opusfile.c +@@ -148,6 +148,7 @@ static int op_get_data(OggOpusFile *_of,int _nbytes){ + int nbytes; + OP_ASSERT(_nbytes>0); + buffer=(unsigned char *)ogg_sync_buffer(&_of->oy,_nbytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + nbytes=(int)(*_of->callbacks.read)(_of->stream,buffer,_nbytes); + OP_ASSERT(nbytes<=_nbytes); + if(OP_LIKELY(nbytes>0))ogg_sync_wrote(&_of->oy,nbytes); +@@ -1527,6 +1528,7 @@ static int op_open1(OggOpusFile *_of, + if(_initial_bytes>0){ + char *buffer; + buffer=ogg_sync_buffer(&_of->oy,(long)_initial_bytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + memcpy(buffer,_initial_data,_initial_bytes*sizeof(*buffer)); + ogg_sync_wrote(&_of->oy,(long)_initial_bytes); + } diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk index 72ae82e801..63553a81e7 100644 --- a/package/opusfile/opusfile.mk +++ b/package/opusfile/opusfile.mk @@ -11,6 +11,9 @@ OPUSFILE_LICENSE = BSD-3-Clause OPUSFILE_LICENSE_FILES = COPYING OPUSFILE_INSTALL_STAGING = YES +# 0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch +OPUSFILE_IGNORE_CVES += CVE-2022-47021 + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPUSFILE_DEPENDENCIES += openssl else -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 5 13:23:07 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 14:23:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: add utf8proc optional dependency Message-ID: <20230205132307.41753-1-fontaine.fabrice@gmail.com> utf8proc is an optional dependency since version 2.3 and https://github.com/tmux/tmux/commit/6c94774b70f72952c4c512e4aa59a207ca1c34f2 Signed-off-by: Fabrice Fontaine --- package/tmux/tmux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 281b7d8ee6..b1c0af1a83 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -11,6 +11,13 @@ TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_UTF8PROC),y) +TMUX_DEPENDENCIES += utf8proc +TMUX_CONF_OPTS += --enable-utf8proc +else +TMUX_CONF_OPTS += --disable-utf8proc +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 5 14:00:02 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 15:00:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/modsecurity2: security bump to version 2.9.7 Message-ID: <20230205140002.154492-1-fontaine.fabrice@gmail.com> - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads in ModSecurity before 2.9.7 may allow for Web Application Firewall bypasses and buffer overflows on the Web Application Firewall when executing rules that read the FILES_TMP_CONTENT collection. - host-pkgconf is mandatory and used to find libxml2 since https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 - pcre2 is supported since: https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES Signed-off-by: Fabrice Fontaine --- package/modsecurity2/Config.in | 2 +- package/modsecurity2/modsecurity2.hash | 4 ++-- package/modsecurity2/modsecurity2.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in index 2870386a99..fb1bfc960e 100644 --- a/package/modsecurity2/Config.in +++ b/package/modsecurity2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_MODSECURITY2 bool "modsecurity2" depends on BR2_PACKAGE_APACHE select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help ModSecurity is an open source, cross-platform web application firewall (WAF) module. Known as the "Swiss Army Knife" of diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash index a19f4823a8..2c77ffd830 100644 --- a/package/modsecurity2/modsecurity2.hash +++ b/package/modsecurity2/modsecurity2.hash @@ -1,5 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.5/modsecurity-2.9.5.tar.gz.sha256 -sha256 e2bfc8cd8b8de1e21f054d310543373ea5d89adbd96784e832be0da3e4dc149e modsecurity-2.9.5.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz.sha256 +sha256 2a28fcfccfef21581486f98d8d5fe0397499749b8380f60ec7bb1c08478e1839 modsecurity-2.9.7.tar.gz # Locally computed sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index a1ad8fe5bc..c251291e64 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODSECURITY2_VERSION = 2.9.5 +MODSECURITY2_VERSION = 2.9.7 MODSECURITY2_SOURCE = modsecurity-$(MODSECURITY2_VERSION).tar.gz MODSECURITY2_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) MODSECURITY2_LICENSE = Apache-2.0 @@ -12,11 +12,10 @@ MODSECURITY2_LICENSE_FILES = LICENSE MODSECURITY2_CPE_ID_VENDOR = trustwave MODSECURITY2_CPE_ID_PRODUCT = modsecurity MODSECURITY2_INSTALL_STAGING = YES -MODSECURITY2_DEPENDENCIES = apache libxml2 pcre +MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 MODSECURITY2_CONF_OPTS = \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ - --with-libxml=$(STAGING_DIR)/usr \ + --with-pcre2=$(STAGING_DIR)/usr/bin/pcre2-config \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ --with-apu=$(STAGING_DIR)/usr/bin/apu-1-config \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ -- 2.39.0 From thomas.petazzoni at bootlin.com Sun Feb 5 14:00:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 15:00:23 +0100 Subject: [Buildroot] [PATCH] toolchain: make paranoid check of library/header paths unconditional In-Reply-To: <20221107214903.1565321-1-yann.morin.1998@free.fr> References: <20221107214903.1565321-1-yann.morin.1998@free.fr> Message-ID: <20230205150023.105dfc14@windsurf> On Mon, 7 Nov 2022 22:49:03 +0100 "Yann E. MORIN" wrote: > When we introduced support for the paranoid check of unsafe libraries > and headers path with commit 4ac8f78d3771 (Add option for paranoid > unsafe path checking) back in 2014, we made it optional, as we expected > that would break quite a few packages. > > Now, almost 8 years later, we only have three packages that explicitly > reference the option (dillo, gnuradio, and libtalloc), either in a patch > or in their .mk. > > The option has been enabled by default since 2016, with 61c8854cef2a > (toolchain: enable paranoid unsafe path check by default), and that has > not triggered many build failures in a while. > > The minimal defconfig used by test-pkg has also had it enabled as of > b6c98b3549d8 (minimal.config: add BR2_COMPILER_PARANOID_UNSAFE_PATH=y) > in 2017. > > It is time to make that globally unconditional now. > > There is still a remnant, in our binutils patches. As our toolchain may > get used outside of Buildroot, people may got the expectation that path > poisoning is only a warning, so we keep the current behaviour. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Romain Naour > --- > Config.in | 18 ------------------ > package/Makefile.in | 3 +-- > support/config-fragments/minimal.config | 1 - > toolchain/toolchain-wrapper.c | 21 ++++----------------- > 4 files changed, 5 insertions(+), 38 deletions(-) Acked-by: Thomas Petazzoni Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sun Feb 5 14:06:02 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 15:06:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/upx: security bump to version 4.0.2 Message-ID: <20230205140602.161881-1-fontaine.fabrice@gmail.com> Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to cause a denial of service (abort) via a crafted file. Fix CVE-2023-23457: A Segmentation fault was found in UPX in PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a crafted input file allows invalid memory address access that could lead to a denial of service. https://github.com/upx/upx/blob/v4.0.2/NEWS Signed-off-by: Fabrice Fontaine --- package/upx/upx.hash | 2 +- package/upx/upx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 9f7c40c819..7c24906152 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz +sha256 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f upx-4.0.2-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index ef346b2310..6018b0a63d 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPX_VERSION = 4.0.1 +UPX_VERSION = 4.0.2 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ -- 2.39.0 From yann.morin.1998 at free.fr Sun Feb 5 14:03:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:03:50 +0100 Subject: [Buildroot] [git commit] package/perftest: new package Message-ID: <20230205140752.DD7F383829@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4ecefa3ccbe29b1e047c97a995a7c966a191583 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Open Fabrics Performance Tests. This is a collection of tests written over uverbs intended for use as a performance micro-benchmark. The tests may be used for HW or SW tuning as well as for functional testing. https://github.com/linux-rdma/perftest Tested-by: Shamraiz Ashraf Signed-off-by: Julien Olivain [yann.morin.1998 at free.fr - move all arch-related dependencies to _ARCH_SUPPORTS - include musl condition in comment and its dependnecies ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/perftest/Config.in | 41 ++++++++++++++++++++++ package/perftest/perftest.hash | 3 ++ package/perftest/perftest.mk | 15 ++++++++ support/testing/tests/package/test_perftest.py | 48 ++++++++++++++++++++++++++ 6 files changed, 110 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 73905748ce..3eb7fba339 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1691,6 +1691,7 @@ F: package/gnupg2/ F: package/glslsandbox-player/ F: package/octave/ F: package/ola/ +F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ @@ -1708,6 +1709,7 @@ F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ +F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py diff --git a/package/Config.in b/package/Config.in index 1f6db14d56..f32209db95 100644 --- a/package/Config.in +++ b/package/Config.in @@ -133,6 +133,7 @@ menu "Debugging, profiling and benchmark" source "package/oprofile/Config.in" source "package/pax-utils/Config.in" source "package/pcm-tools/Config.in" + source "package/perftest/Config.in" source "package/piglit/Config.in" source "package/ply/Config.in" source "package/poke/Config.in" diff --git a/package/perftest/Config.in b/package/perftest/Config.in new file mode 100644 index 0000000000..25cd1a9b8d --- /dev/null +++ b/package/perftest/Config.in @@ -0,0 +1,41 @@ +config BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS + bool + # Accurate cycle measurement in perftest is implemented for a + # limited set of architectures, see: + # https://github.com/linux-rdma/perftest/blob/v4.5-0.20/src/get_clock.h + # Note: the package has also a fallback to use "asm/timex.h" + # from the Kernel, in + # "$(LINUX_DIR)/arch/$(KERNEL_ARCH)/include". It is not + # reflected here as this path is not well tested. + default y if BR2_i386 || BR2_x86_64 + default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 && !BR2_ARM_CPU_ARMV6 + default y if BR2_aarch64 + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x + default y if BR2_sparc || BR2_sparc64 + default y if BR2_riscv + depends on BR2_USE_MMU # rdma-core + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # rdma-core + +config BR2_PACKAGE_PERFTEST + bool "perftest" + depends on BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS # rdma-core + # musl does not define sysconf(_SC_LEVEL1_DCACHE_LINESIZE) + depends on !BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_PCIUTILS + select BR2_PACKAGE_RDMA_CORE + help + Open Fabrics Performance Tests. + + This is a collection of tests written over uverbs intended + for use as a performance micro-benchmark. The tests may be + used for HW or SW tuning as well as for functional testing. + + https://github.com/linux-rdma/perftest + +comment "perftest needs a glibc or uClibc toolchain w/ threads, dynamic library" + depends on BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ + || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/perftest/perftest.hash b/package/perftest/perftest.hash new file mode 100644 index 0000000000..4333231c44 --- /dev/null +++ b/package/perftest/perftest.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 32e667dac1c0dd41a3951c5a54b961a8e28db5d9478caea2dfc268a312968c99 perftest-4.5-0.20.tar.gz +sha256 763adb7d5094f2127b026adea8701f042d28d4b1f6fb8b6e828989227a9cf7f5 COPYING diff --git a/package/perftest/perftest.mk b/package/perftest/perftest.mk new file mode 100644 index 0000000000..7ad20d0974 --- /dev/null +++ b/package/perftest/perftest.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# perftest +# +################################################################################ + +PERFTEST_VERSION = 4.5-0.20 +PERFTEST_SITE = $(call github,linux-rdma,perftest,v$(PERFTEST_VERSION)) +PERFTEST_LICENSE = GPL-2.0 or BSD-2-Clause +PERFTEST_LICENSE_FILES = COPYING +PERFTEST_DEPENDENCIES = pciutils rdma-core +# Fetched from Github, with no configure script +PERFTEST_AUTORECONF = YES + +$(eval $(autotools-package)) diff --git a/support/testing/tests/package/test_perftest.py b/support/testing/tests/package/test_perftest.py new file mode 100644 index 0000000000..680b70d784 --- /dev/null +++ b/support/testing/tests/package/test_perftest.py @@ -0,0 +1,48 @@ +import os + +import infra.basetest + + +class TestPerftest(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.91" + 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="{}" + 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 + BR2_PACKAGE_PERFTEST=y + """.format( + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") + ) + + 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("ip link set dev eth0 up") + self.assertRunOk("rdma link add rxe0 type rxe netdev eth0") + + # start a server + self.assertRunOk("ib_read_bw > /dev/null 2>&1 &") + + # start a client + self.assertRunOk("sleep 1 && ib_read_bw 127.0.0.1") From yann.morin.1998 at free.fr Sun Feb 5 14:09:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:09:05 +0100 Subject: [Buildroot] [PATCH v6 2/2] package/perftest: new package In-Reply-To: <20230202202002.3272959-2-ju.o@free.fr> References: <20230202202002.3272959-1-ju.o@free.fr> <20230202202002.3272959-2-ju.o@free.fr> Message-ID: <20230205140905.GH2960@scaer> Julien, All, On 2023-02-02 21:20 +0100, Julien Olivain spake thusly: > Open Fabrics Performance Tests. > > This is a collection of tests written over uverbs intended > for use as a performance micro-benchmark. The tests may be > used for HW or SW tuning as well as for functional testing. > > https://github.com/linux-rdma/perftest > > Tested-by: Shamraiz Ashraf > Signed-off-by: Julien Olivain Applied to master, thanks. I however did a few cleanups: - move all arch-related dependencies to _ARCH_SUPPORTS - include musl condition in comment and its dependnecies Regards, Yann E. MORIN. > --- > Changes v5 -> v6: > - Update perftest from version 4.5-0.18 to 4.5-0.20 > - Update kernel in test from 5.15.80 to 5.15.91 > - Add perftest entries in DEVELOPERS file > > Changes v1 -> v5: > - introduce perftest package in v5 patch series > --- > Tested on branch main at commit aff4317 with commands: > > make check-package > ... > 0 warnings generated > > python3 -m flake8 support/testing/tests/package/test_perftest.py > [no-output] > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_perftest.TestPerftest > ... > OK > > ./utils/test-pkg -a -p perftest > arm-aarch64 [ 1/44]: OK > bootlin-aarch64-glibc [ 2/44]: OK > bootlin-arcle-hs38-uclibc [ 3/44]: SKIPPED > bootlin-armv5-uclibc [ 4/44]: SKIPPED > bootlin-armv7-glibc [ 5/44]: OK > bootlin-armv7m-uclibc [ 6/44]: SKIPPED > bootlin-armv7-musl [ 7/44]: SKIPPED > bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED > bootlin-m68k-68040-uclibc [ 9/44]: SKIPPED > bootlin-microblazeel-uclibc [10/44]: SKIPPED > bootlin-mipsel32r6-glibc [11/44]: SKIPPED > bootlin-mipsel-uclibc [12/44]: SKIPPED > bootlin-nios2-glibc [13/44]: SKIPPED > bootlin-openrisc-uclibc [14/44]: SKIPPED > bootlin-powerpc64le-power8-glibc [15/44]: OK > bootlin-powerpc-e500mc-uclibc [16/44]: OK > bootlin-riscv32-glibc [17/44]: OK > bootlin-riscv64-glibc [18/44]: OK > bootlin-riscv64-musl [19/44]: SKIPPED > bootlin-sh4-uclibc [20/44]: SKIPPED > bootlin-sparc64-glibc [21/44]: OK > bootlin-sparc-uclibc [22/44]: SKIPPED > bootlin-x86-64-glibc [23/44]: OK > bootlin-x86-64-musl [24/44]: SKIPPED > bootlin-x86-64-uclibc [25/44]: OK > bootlin-xtensa-uclibc [26/44]: SKIPPED > br-arm-basic [27/44]: SKIPPED > br-arm-full-nothread [28/44]: SKIPPED > br-arm-full-static [29/44]: SKIPPED > br-i386-pentium4-full [30/44]: OK > br-i386-pentium-mmx-musl [31/44]: SKIPPED > br-mips64-n64-full [32/44]: SKIPPED > br-mips64r6-el-hf-glibc [33/44]: SKIPPED > br-powerpc-603e-basic-cpp [34/44]: OK > br-powerpc64-power7-glibc [35/44]: OK > linaro-aarch64-be [36/44]: SKIPPED > linaro-aarch64 [37/44]: OK > linaro-arm [38/44]: OK > sourcery-arm-armv4t [39/44]: SKIPPED > sourcery-arm [40/44]: SKIPPED > sourcery-arm-thumb2 [41/44]: OK > sourcery-mips64 [42/44]: SKIPPED > sourcery-mips [43/44]: SKIPPED > sourcery-nios2 [44/44]: SKIPPED > 44 builds, 28 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > --- > DEVELOPERS | 2 + > package/Config.in | 1 + > package/perftest/Config.in | 41 ++++++++++++++++ > package/perftest/perftest.hash | 3 ++ > package/perftest/perftest.mk | 15 ++++++ > .../testing/tests/package/test_perftest.py | 48 +++++++++++++++++++ > 6 files changed, 110 insertions(+) > create mode 100644 package/perftest/Config.in > create mode 100644 package/perftest/perftest.hash > create mode 100644 package/perftest/perftest.mk > create mode 100644 support/testing/tests/package/test_perftest.py > > diff --git a/DEVELOPERS b/DEVELOPERS > index 5eb746f8b4..7abfbe3c44 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1692,6 +1692,7 @@ F: package/gnupg2/ > F: package/glslsandbox-player/ > F: package/octave/ > F: package/ola/ > +F: package/perftest/ > F: package/ptm2human/ > F: package/python-distro/ > F: package/python-gnupg/ > @@ -1709,6 +1710,7 @@ F: support/testing/tests/package/test_ncdu.py > F: support/testing/tests/package/test_octave.py > F: support/testing/tests/package/test_ola.py > F: support/testing/tests/package/test_ola/ > +F: support/testing/tests/package/test_perftest.py > F: support/testing/tests/package/test_python_distro.py > F: support/testing/tests/package/test_python_gnupg.py > F: support/testing/tests/package/test_python_pyalsa.py > diff --git a/package/Config.in b/package/Config.in > index 1f6db14d56..f32209db95 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -133,6 +133,7 @@ menu "Debugging, profiling and benchmark" > source "package/oprofile/Config.in" > source "package/pax-utils/Config.in" > source "package/pcm-tools/Config.in" > + source "package/perftest/Config.in" > source "package/piglit/Config.in" > source "package/ply/Config.in" > source "package/poke/Config.in" > diff --git a/package/perftest/Config.in b/package/perftest/Config.in > new file mode 100644 > index 0000000000..9b2e46e64a > --- /dev/null > +++ b/package/perftest/Config.in > @@ -0,0 +1,41 @@ > +config BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS > + bool > + # Accurate cycle measurement in perftest is implemented for a > + # limited set of architectures, see: > + # https://github.com/linux-rdma/perftest/blob/v4.5-0.20/src/get_clock.h > + # Note: the package has also a fallback to use "asm/timex.h" > + # from the Kernel, in > + # "$(LINUX_DIR)/arch/$(KERNEL_ARCH)/include". It is not > + # reflected here as this path is not well tested. > + default y if BR2_i386 || BR2_x86_64 > + default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 && !BR2_ARM_CPU_ARMV6 > + default y if BR2_aarch64 > + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le > + default y if BR2_s390x > + default y if BR2_sparc || BR2_sparc64 > + default y if BR2_riscv > + > +config BR2_PACKAGE_PERFTEST > + bool "perftest" > + depends on BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS > + depends on !BR2_STATIC_LIBS # rdma-core > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # rdma-core > + depends on BR2_TOOLCHAIN_HAS_THREADS > + # musl does not define sysconf(_SC_LEVEL1_DCACHE_LINESIZE) > + depends on !BR2_TOOLCHAIN_USES_MUSL > + depends on BR2_USE_MMU # rdma-core > + select BR2_PACKAGE_PCIUTILS > + select BR2_PACKAGE_RDMA_CORE # libibverbs, librdmacm, libibumad > + help > + Open Fabrics Performance Tests. > + > + This is a collection of tests written over uverbs intended > + for use as a performance micro-benchmark. The tests may be > + used for HW or SW tuning as well as for functional testing. > + > + https://github.com/linux-rdma/perftest > + > +comment "perftest 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/perftest/perftest.hash b/package/perftest/perftest.hash > new file mode 100644 > index 0000000000..4333231c44 > --- /dev/null > +++ b/package/perftest/perftest.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 32e667dac1c0dd41a3951c5a54b961a8e28db5d9478caea2dfc268a312968c99 perftest-4.5-0.20.tar.gz > +sha256 763adb7d5094f2127b026adea8701f042d28d4b1f6fb8b6e828989227a9cf7f5 COPYING > diff --git a/package/perftest/perftest.mk b/package/perftest/perftest.mk > new file mode 100644 > index 0000000000..7ad20d0974 > --- /dev/null > +++ b/package/perftest/perftest.mk > @@ -0,0 +1,15 @@ > +################################################################################ > +# > +# perftest > +# > +################################################################################ > + > +PERFTEST_VERSION = 4.5-0.20 > +PERFTEST_SITE = $(call github,linux-rdma,perftest,v$(PERFTEST_VERSION)) > +PERFTEST_LICENSE = GPL-2.0 or BSD-2-Clause > +PERFTEST_LICENSE_FILES = COPYING > +PERFTEST_DEPENDENCIES = pciutils rdma-core > +# Fetched from Github, with no configure script > +PERFTEST_AUTORECONF = YES > + > +$(eval $(autotools-package)) > diff --git a/support/testing/tests/package/test_perftest.py b/support/testing/tests/package/test_perftest.py > new file mode 100644 > index 0000000000..680b70d784 > --- /dev/null > +++ b/support/testing/tests/package/test_perftest.py > @@ -0,0 +1,48 @@ > +import os > + > +import infra.basetest > + > + > +class TestPerftest(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.91" > + 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="{}" > + 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 > + BR2_PACKAGE_PERFTEST=y > + """.format( > + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") > + ) > + > + 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("ip link set dev eth0 up") > + self.assertRunOk("rdma link add rxe0 type rxe netdev eth0") > + > + # start a server > + self.assertRunOk("ib_read_bw > /dev/null 2>&1 &") > + > + # start a client > + self.assertRunOk("sleep 1 && ib_read_bw 127.0.0.1") > -- > 2.39.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 Feb 5 14:11:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:11:25 +0100 Subject: [Buildroot] [git commit] toolchain: make paranoid check of library/header paths unconditional Message-ID: <20230205141216.418DC83837@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93e7fc3e53bff9db971f3ae951d93d3bd1a39d1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When we introduced support for the paranoid check of unsafe libraries and headers path with commit 4ac8f78d3771 (Add option for paranoid unsafe path checking) back in 2014, we made it optional, as we expected that would break quite a few packages. Now, almost 8 years later, we only have three packages that explicitly reference the option (dillo, gnuradio, and libtalloc), either in a patch or in their .mk. The option has been enabled by default since 2016, with 61c8854cef2a (toolchain: enable paranoid unsafe path check by default), and that has not triggered many build failures in a while. The minimal defconfig used by test-pkg has also had it enabled as of b6c98b3549d8 (minimal.config: add BR2_COMPILER_PARANOID_UNSAFE_PATH=y) in 2017. It is time to make that globally unconditional now. There is still a remnant, in our binutils patches. As our toolchain may get used outside of Buildroot, people may got the expectation that path poisoning is only a warning, so we keep the current behaviour. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Romain Naour Acked-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- Config.in | 18 ------------------ package/Makefile.in | 3 +-- support/config-fragments/minimal.config | 1 - toolchain/toolchain-wrapper.c | 21 ++++----------------- 4 files changed, 5 insertions(+), 38 deletions(-) diff --git a/Config.in b/Config.in index 86699f58c6..0d7641633c 100644 --- a/Config.in +++ b/Config.in @@ -685,24 +685,6 @@ config BR2_GLOBAL_PATCH_DIR menu "Advanced" -config BR2_COMPILER_PARANOID_UNSAFE_PATH - bool "paranoid check of library/header paths" - default y - help - By default, when this option is disabled, when the Buildroot - cross-compiler will encounter an unsafe library or header path - (such as /usr/include, or /usr/lib), the compiler will display - a warning. - - By enabling this option, this warning is turned into an error, - which will completely abort the build when such unsafe paths - are encountered. - - Note that this mechanism is available for both the internal - toolchain (through the toolchain wrapper and binutils patches) - and external toolchain backends (through the toolchain - wrapper). - config BR2_FORCE_HOST_BUILD bool "Force the building of host dependencies" help diff --git a/package/Makefile.in b/package/Makefile.in index 7f1b00ba24..d70aded82b 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -426,9 +426,8 @@ else ifeq ($(BR2_SHARED_STATIC_LIBS),y) SHARED_STATIC_LIBS_OPTS = --enable-static --enable-shared endif -ifeq ($(BR2_COMPILER_PARANOID_UNSAFE_PATH),y) +# Used by our binutils patches. export BR_COMPILER_PARANOID_UNSAFE_PATH=enabled -endif include package/pkg-download.mk include package/pkg-autotools.mk diff --git a/support/config-fragments/minimal.config b/support/config-fragments/minimal.config index 71344e2c69..3430fcce11 100644 --- a/support/config-fragments/minimal.config +++ b/support/config-fragments/minimal.config @@ -4,5 +4,4 @@ BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set # BR2_TARGET_ROOTFS_TAR is not set -BR2_COMPILER_PARANOID_UNSAFE_PATH=y BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 37b24dd24a..4c08e97237 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -154,12 +154,9 @@ static const struct str_len_s unsafe_opts[] = { * or separated (e.g. -I /foo/bar). In the first case, we need only print * the argument as it already contains the path (arg_has_path), while in * the second case we need to print both (!arg_has_path). - * - * If paranoid, exit in error instead of just printing a warning. */ static void check_unsafe_path(const char *arg, const char *path, - int paranoid, int arg_has_path) { const struct str_len_s *p; @@ -168,14 +165,12 @@ static void check_unsafe_path(const char *arg, if (strncmp(path, p->str, p->len)) continue; fprintf(stderr, - "%s: %s: unsafe header/library path used in cross-compilation: '%s%s%s'\n", + "%s: ERROR: unsafe header/library path used in cross-compilation: '%s%s%s'\n", program_invocation_short_name, - paranoid ? "ERROR" : "WARNING", arg, arg_has_path ? "" : "' '", /* close single-quote, space, open single-quote */ arg_has_path ? "" : path); /* so that arg and path are properly quoted. */ - if (paranoid) - exit(1); + exit(1); } } @@ -250,8 +245,6 @@ int main(int argc, char **argv) char *progpath = argv[0]; char *basename; char *env_debug; - char *paranoid_wrapper; - int paranoid; int ret, i, count = 0, debug = 0, found_shared = 0; /* Debug the wrapper to see arguments it was called with. @@ -470,12 +463,6 @@ int main(int argc, char **argv) #endif } - paranoid_wrapper = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); - if (paranoid_wrapper && strlen(paranoid_wrapper) > 0) - paranoid = 1; - else - paranoid = 0; - /* Check for unsafe library and header paths */ for (i = 1; i < argc; i++) { const struct str_len_s *opt; @@ -492,9 +479,9 @@ int main(int argc, char **argv) i++; if (i == argc) break; - check_unsafe_path(argv[i-1], argv[i], paranoid, 0); + check_unsafe_path(argv[i-1], argv[i], 0); } else - check_unsafe_path(argv[i], argv[i] + opt->len, paranoid, 1); + check_unsafe_path(argv[i], argv[i] + opt->len, 1); } } From yann.morin.1998 at free.fr Sun Feb 5 14:12:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:12:42 +0100 Subject: [Buildroot] [PATCH] toolchain: make paranoid check of library/header paths unconditional In-Reply-To: <20230205150023.105dfc14@windsurf> References: <20221107214903.1565321-1-yann.morin.1998@free.fr> <20230205150023.105dfc14@windsurf> Message-ID: <20230205141242.GI2960@scaer> All, On 2023-02-05 15:00 +0100, Thomas Petazzoni via buildroot spake thusly: > On Mon, 7 Nov 2022 22:49:03 +0100 > "Yann E. MORIN" wrote: > > When we introduced support for the paranoid check of unsafe libraries > > and headers path with commit 4ac8f78d3771 (Add option for paranoid > > unsafe path checking) back in 2014, we made it optional, as we expected > > that would break quite a few packages. [--SNIP--] > > It is time to make that globally unconditional now. > > > > There is still a remnant, in our binutils patches. As our toolchain may > > get used outside of Buildroot, people may got the expectation that path > > poisoning is only a warning, so we keep the current behaviour. > > > > Signed-off-by: Yann E. MORIN > > Cc: Thomas Petazzoni > > Cc: Romain Naour > > --- > > Config.in | 18 ------------------ > > package/Makefile.in | 3 +-- > > support/config-fragments/minimal.config | 1 - > > toolchain/toolchain-wrapper.c | 21 ++++----------------- > > 4 files changed, 5 insertions(+), 38 deletions(-) > > Acked-by: Thomas Petazzoni Applied to master, 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 thomas.petazzoni at bootlin.com Sun Feb 5 14:13:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 15:13:15 +0100 Subject: [Buildroot] [git commit] package/elf2flt: fix error when building gdb for target on m68k Message-ID: <20230205141346.2F75283842@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6f15e85b3ac58ba1d387ea86945d3fabf4f8990 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Thomas reported that m68k fails to build when enabling BR2_PACKAGE_GDB. It fails when building gdb for the target with the following error: elf2flt: ERROR: text=0x3c826 overlaps data=0x256e0 ? It turns out that the gdb binary has another problematic input section (.gcc_except_table), which causes elf2flt to try to append to the .text output section, after it has already moved on with appending sections to the .data output section. elf2flt cannot append to a previous output section once it has moved on to another output section. Update the existing elf2flt patch to also add an exception for .gcc_except_table. Reported-by: Thomas Petazzoni Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni --- ...-fatal-error-regression-on-m68k-xtensa-ri.patch | 47 +++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch index 278709cb1c..616bbc891f 100644 --- a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch +++ b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch @@ -1,8 +1,7 @@ -From 65ac5f9e69cfb989d970da74c41e478774d29be5 Mon Sep 17 00:00:00 2001 +From a8c9f650b82109abf7aa730f298ea5182ed62613 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 9 Aug 2022 21:06:05 +0200 -Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, - riscv64 +Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64 Commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") changed the condition of which input sections that should be included @@ -12,16 +11,15 @@ to: ((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == (SEC_DATA | SEC_READONLY | SEC_RELOC)) -On ARM, the .eh_frame input section does not have the SEC_RELOC flag -set, so this specific change had no effect on ARM. +On ARM, the .eh_frame input section does not have the SEC_RELOC flag set, +so on ARM, this change caused .eh_frame to move from .text to .data. -However, on e.g. m68k and riscv64, the .eh_frame input section does -have the SEC_RELOC flag set, which means that after commit ba379d08bb78 -("elf2flt: fix for segfault on some ARM ELFs"), read-only relocation -data sections were placed in .text output section, instead of .data -output section. +However, on e.g. m68k, xtensa and riscv64, the .eh_frame input section +does have the SEC_RELOC flag set, which means that the change in +commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") +caused .eh_frame to move in an opposite way, i.e. from .data to .text. -This will result in a fatal error on m68k, xtensa and riscv64: +This resulted in a fatal error on m68k, xtensa and riscv64: ERROR: text=0x3bab8 overlaps data=0x33f60 ? This is because elf2flt cannot append to .text after .data has been @@ -36,21 +34,26 @@ to .text after .data has been appended to (which will require elf2flt to move/relocate everything that has already been appended to .data, since the virtual addresses are contiguous). -However, for now, add an exception for m68k, xtensa and riscv64 -(specifically for the problematic input section, .eh_frame), so that we -get the same behavior as older elf2flt releases, where we put read-only -relocation data in .data, which was working perfectly fine. +However, for now, add an exception for input sections which have all +three flags SEC_DATA, SEC_READONLY, and SEC_RELOC set, and which have a +name equal to a problematic input section (.eh_frame, .gcc_except_table). +That way, we get the same behavior as older elf2flt releases for m68k, +xtensa and riscv64, where we put read-only relocation data in .data, +which was working perfectly fine. + +This exception will not change any behavior on ARM, as the .eh_frame +input section does not have flag SEC_RELOC set. Signed-off-by: Niklas Cassel --- - elf2flt.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) + elf2flt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/elf2flt.c b/elf2flt.c -index 9c32f9a..a680c89 100644 +index e0d7891..39d035f 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -340,8 +340,15 @@ compare_relocs (const void *pa, const void *pb) +@@ -341,8 +341,13 @@ compare_relocs (const void *pa, const void *pb) static bool ro_reloc_data_section_should_be_in_text(asection *s) { @@ -58,10 +61,8 @@ index 9c32f9a..a680c89 100644 - (SEC_DATA | SEC_READONLY | SEC_RELOC); + if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == + (SEC_DATA | SEC_READONLY | SEC_RELOC)) { -+#if defined(TARGET_m68k) || defined(TARGET_riscv64) || defined(TARGET_xtensa) -+ if (!strcmp(".eh_frame", s->name)) ++ if (!strcmp(".eh_frame", s->name) || !strcmp(".gcc_except_table", s->name)) + return false; -+#endif + return true; + } + return false; @@ -69,5 +70,5 @@ index 9c32f9a..a680c89 100644 static uint32_t * -- -2.37.1 +2.39.0 From thomas.petazzoni at bootlin.com Sun Feb 5 14:15:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 15:15:02 +0100 Subject: [Buildroot] [PATCH] package/elf2flt: fix error when building gdb for target on m68k In-Reply-To: <20230117153503.2075602-1-niklas.cassel@wdc.com> References: <20230117153503.2075602-1-niklas.cassel@wdc.com> Message-ID: <20230205151502.07fd434d@windsurf> Hello Niklas, On Tue, 17 Jan 2023 16:35:03 +0100 Niklas Cassel via buildroot wrote: > Thomas reported that m68k fails to build when enabling BR2_PACKAGE_GDB. > > It fails when building gdb for the target with the following error: > elf2flt: ERROR: text=0x3c826 overlaps data=0x256e0 ? > > It turns out that the gdb binary has another problematic input section > (.gcc_except_table), which causes elf2flt to try to append to the .text > output section, after it has already moved on with appending sections > to the .data output section. > > elf2flt cannot append to a previous output section once it has moved on > to another output section. > > Update the existing elf2flt patch to also add an exception for > .gcc_except_table. > > Reported-by: Thomas Petazzoni > Signed-off-by: Niklas Cassel > --- > ...l-error-regression-on-m68k-xtensa-ri.patch | 47 ++++++++++--------- > 1 file changed, 24 insertions(+), 23 deletions(-) Many, many thanks for looking into this. It's a bit annoying that those special sections have to be special-cased. Hopefully this will not encounter too many of those special cases. In the mean time, I've applied your patch to master. Thanks again! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 5 14:17:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 15:17:51 +0100 Subject: [Buildroot] [PATCH 1/2] package/lzop: provide a patch to allow overriding of modification time In-Reply-To: <20230119121004.3416962-2-casey@xogium.me> References: <20230119121004.3416962-1-casey@xogium.me> <20230119121004.3416962-2-casey@xogium.me> Message-ID: <20230205151751.2173e6de@windsurf> Hello, On Thu, 19 Jan 2023 13:10:03 +0100 Casey Reeves wrote: > This patch allows lzop to override the modification time using > $SOURCE_DATE_EPOCH. > The original patch written by Florian B?uerle is for lzop 1.04, and > hence needed to be backported to the 1.03 release buildroot is making > use of. Any reason why we're not using lzop 1.04 ? Maybe we should bump lzop 1.04 first ? > --- /dev/null > +++ b/package/lzop/0003-allow-overriding-modification-time.patch > @@ -0,0 +1,46 @@ > +From d3717065d4b4dd7dfa88ebc154185ce752127e93 Mon Sep 17 00:00:00 2001 > +From: Casey Reeves > +Date: Thu, 19 Jan 2023 10:06:31 +0100 > +Subject: [PATCH] allow overriding modification time Could you preserve the authorship of the original patch at https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch ? Your patch is pretty much exactly the same, so we really want to keep the original authorship. The patch should still carry your Signed-off-by and a reference to where the original patch was found. Thanks! 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 Sun Feb 5 14:24:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:24:34 +0100 Subject: [Buildroot] [git commit] package/opusfile: fix CVE-2022-47021 Message-ID: <20230205142502.3323483840@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae65870e652088dd65ca41d63304893d1d4443a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A null pointer dereference issue was discovered in functions op_get_data and op_open1 in opusfile.c in xiph opusfile 0.9 thru 0.12 allows attackers to cause denial of service or other unspecified impacts. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...e-allocation-failure-from-ogg_sync_buffer.patch | 44 ++++++++++++++++++++++ package/opusfile/opusfile.mk | 3 ++ 2 files changed, 47 insertions(+) diff --git a/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch new file mode 100644 index 0000000000..2ef08502ab --- /dev/null +++ b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch @@ -0,0 +1,44 @@ +From 0a4cd796df5b030cb866f3f4a5e41a4b92caddf5 Mon Sep 17 00:00:00 2001 +From: Ralph Giles +Date: Tue, 6 Sep 2022 19:04:31 -0700 +Subject: [PATCH] Propagate allocation failure from ogg_sync_buffer. + +Instead of segfault, report OP_EFAULT if ogg_sync_buffer returns +a null pointer. This allows more graceful recovery by the caller +in the unlikely event of a fallible ogg_malloc call. + +We do check the return value elsewhere in the code, so the new +checks make the code more consistent. + +Thanks to https://github.com/xiph/opusfile/issues/36 for reporting. + +Signed-off-by: Timothy B. Terriberry +Signed-off-by: Mark Harris + +[Retrieved from: +https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5] +Signed-off-by: Fabrice Fontaine +--- + src/opusfile.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/opusfile.c b/src/opusfile.c +index ca219b2..3c3c81e 100644 +--- a/src/opusfile.c ++++ b/src/opusfile.c +@@ -148,6 +148,7 @@ static int op_get_data(OggOpusFile *_of,int _nbytes){ + int nbytes; + OP_ASSERT(_nbytes>0); + buffer=(unsigned char *)ogg_sync_buffer(&_of->oy,_nbytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + nbytes=(int)(*_of->callbacks.read)(_of->stream,buffer,_nbytes); + OP_ASSERT(nbytes<=_nbytes); + if(OP_LIKELY(nbytes>0))ogg_sync_wrote(&_of->oy,nbytes); +@@ -1527,6 +1528,7 @@ static int op_open1(OggOpusFile *_of, + if(_initial_bytes>0){ + char *buffer; + buffer=ogg_sync_buffer(&_of->oy,(long)_initial_bytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + memcpy(buffer,_initial_data,_initial_bytes*sizeof(*buffer)); + ogg_sync_wrote(&_of->oy,(long)_initial_bytes); + } diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk index 72ae82e801..63553a81e7 100644 --- a/package/opusfile/opusfile.mk +++ b/package/opusfile/opusfile.mk @@ -11,6 +11,9 @@ OPUSFILE_LICENSE = BSD-3-Clause OPUSFILE_LICENSE_FILES = COPYING OPUSFILE_INSTALL_STAGING = YES +# 0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch +OPUSFILE_IGNORE_CVES += CVE-2022-47021 + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPUSFILE_DEPENDENCIES += openssl else From yann.morin.1998 at free.fr Sun Feb 5 14:24:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:24:30 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: add CPE variables Message-ID: <20230205142502.294968387B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=32602f9cbb7ec0e0beca5ea0d69671ff41d46323 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:treasuredata:fluent_bit is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atreasuredata%3Afluent_bit Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/fluent-bit/fluent-bit.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 6e9a33e02e..879437e5f4 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -8,6 +8,8 @@ FLUENT_BIT_VERSION = 2.0.8 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE +FLUENT_BIT_CPE_ID_VENDOR = treasuredata +FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl FLUENT_BIT_CONF_OPTS += \ From yann.morin.1998 at free.fr Sun Feb 5 14:24:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:24:43 +0100 Subject: [Buildroot] [git commit] package/upx: security bump to version 4.0.2 Message-ID: <20230205142502.4A34A8388E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02befac8f9404ae30d0d090221d21a8460c82ec7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to cause a denial of service (abort) via a crafted file. Fix CVE-2023-23457: A Segmentation fault was found in UPX in PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a crafted input file allows invalid memory address access that could lead to a denial of service. https://github.com/upx/upx/blob/v4.0.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/upx/upx.hash | 2 +- package/upx/upx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 9f7c40c819..7c24906152 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz +sha256 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f upx-4.0.2-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index ef346b2310..6018b0a63d 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPX_VERSION = 4.0.1 +UPX_VERSION = 4.0.2 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ From yann.morin.1998 at free.fr Sun Feb 5 14:24:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:24:39 +0100 Subject: [Buildroot] [git commit] package/modsecurity2: security bump to version 2.9.7 Message-ID: <20230205142502.3EDC683883@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42e34cf10f9eb037aa8c48a4fb9e8f521901b983 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads in ModSecurity before 2.9.7 may allow for Web Application Firewall bypasses and buffer overflows on the Web Application Firewall when executing rules that read the FILES_TMP_CONTENT collection. - host-pkgconf is mandatory and used to find libxml2 since https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 - pcre2 is supported since: https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modsecurity2/Config.in | 2 +- package/modsecurity2/modsecurity2.hash | 4 ++-- package/modsecurity2/modsecurity2.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in index 2870386a99..fb1bfc960e 100644 --- a/package/modsecurity2/Config.in +++ b/package/modsecurity2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_MODSECURITY2 bool "modsecurity2" depends on BR2_PACKAGE_APACHE select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help ModSecurity is an open source, cross-platform web application firewall (WAF) module. Known as the "Swiss Army Knife" of diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash index a19f4823a8..2c77ffd830 100644 --- a/package/modsecurity2/modsecurity2.hash +++ b/package/modsecurity2/modsecurity2.hash @@ -1,5 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.5/modsecurity-2.9.5.tar.gz.sha256 -sha256 e2bfc8cd8b8de1e21f054d310543373ea5d89adbd96784e832be0da3e4dc149e modsecurity-2.9.5.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz.sha256 +sha256 2a28fcfccfef21581486f98d8d5fe0397499749b8380f60ec7bb1c08478e1839 modsecurity-2.9.7.tar.gz # Locally computed sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index a1ad8fe5bc..c251291e64 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODSECURITY2_VERSION = 2.9.5 +MODSECURITY2_VERSION = 2.9.7 MODSECURITY2_SOURCE = modsecurity-$(MODSECURITY2_VERSION).tar.gz MODSECURITY2_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) MODSECURITY2_LICENSE = Apache-2.0 @@ -12,11 +12,10 @@ MODSECURITY2_LICENSE_FILES = LICENSE MODSECURITY2_CPE_ID_VENDOR = trustwave MODSECURITY2_CPE_ID_PRODUCT = modsecurity MODSECURITY2_INSTALL_STAGING = YES -MODSECURITY2_DEPENDENCIES = apache libxml2 pcre +MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 MODSECURITY2_CONF_OPTS = \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ - --with-libxml=$(STAGING_DIR)/usr \ + --with-pcre2=$(STAGING_DIR)/usr/bin/pcre2-config \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ --with-apu=$(STAGING_DIR)/usr/bin/apu-1-config \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ From fontaine.fabrice at gmail.com Sun Feb 5 14:25:43 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 15:25:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 4.0.3 Message-ID: <20230205142543.285695-1-fontaine.fabrice@gmail.com> Fix CVE-2023-0411, CVE-2023-0412, CVE-2023-0413, CVE-2023-0414, CVE-2023-0415, CVE-2023-0416 and CVE-2023-0417 https://www.wireshark.org/security/wnpa-sec-2023-01 https://www.wireshark.org/security/wnpa-sec-2023-02 https://www.wireshark.org/security/wnpa-sec-2023-03 https://www.wireshark.org/security/wnpa-sec-2023-04 https://www.wireshark.org/security/wnpa-sec-2023-05 https://www.wireshark.org/security/wnpa-sec-2023-06 https://www.wireshark.org/security/wnpa-sec-2023-07 https://www.wireshark.org/docs/relnotes/wireshark-4.0.3.html Signed-off-by: Fabrice Fontaine --- 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 e9026b8caa..7128b560ae 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-4.0.2.txt -sha1 0127180ff18515b086fe5603f767f53ddaa64c1a wireshark-4.0.2.tar.xz -sha256 f35915699f2f9b28ddb211202d40ec8984e5834d3c911483144a4984ba44411d wireshark-4.0.2.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.3.txt +sha1 243b0057cfe6d447662e81b5646110aaf8b63c81 wireshark-4.0.3.tar.xz +sha256 6c51e15bcc0afb93734e686dbff354ffd159f570bd2904bcbbad6f3feb7e9511 wireshark-4.0.3.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index e2a424ef0f..12c36575df 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.0.2 +WIRESHARK_VERSION = 4.0.3 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license -- 2.39.0 From yann.morin.1998 at free.fr Sun Feb 5 14:27:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:27:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/upx: security bump to version 4.0.2 In-Reply-To: <20230205140602.161881-1-fontaine.fabrice@gmail.com> References: <20230205140602.161881-1-fontaine.fabrice@gmail.com> Message-ID: <20230205142705.GJ2960@scaer> Fabrice, All, On 2023-02-05 15:06 +0100, Fabrice Fontaine spake thusly: > Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in > UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to > cause a denial of service (abort) via a crafted file. > > Fix CVE-2023-23457: A Segmentation fault was found in UPX in > PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a > crafted input file allows invalid memory address access that could lead > to a denial of service. > > https://github.com/upx/upx/blob/v4.0.2/NEWS > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/upx/upx.hash | 2 +- > package/upx/upx.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/upx/upx.hash b/package/upx/upx.hash > index 9f7c40c819..7c24906152 100644 > --- a/package/upx/upx.hash > +++ b/package/upx/upx.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz > +sha256 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f upx-4.0.2-src.tar.xz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/upx/upx.mk b/package/upx/upx.mk > index ef346b2310..6018b0a63d 100644 > --- a/package/upx/upx.mk > +++ b/package/upx/upx.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -UPX_VERSION = 4.0.1 > +UPX_VERSION = 4.0.2 > UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) > UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz > UPX_LICENSE = GPL-2.0+ > -- > 2.39.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 Feb 5 14:27:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:27:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/modsecurity2: security bump to version 2.9.7 In-Reply-To: <20230205140002.154492-1-fontaine.fabrice@gmail.com> References: <20230205140002.154492-1-fontaine.fabrice@gmail.com> Message-ID: <20230205142740.GK2960@scaer> Fabrice, All, On 2023-02-05 15:00 +0100, Fabrice Fontaine spake thusly: > - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads > in ModSecurity before 2.9.7 may allow for Web Application Firewall > bypasses and buffer overflows on the Web Application Firewall when > executing rules that read the FILES_TMP_CONTENT collection. > - host-pkgconf is mandatory and used to find libxml2 since > https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 > - pcre2 is supported since: > https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 > > https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/modsecurity2/Config.in | 2 +- > package/modsecurity2/modsecurity2.hash | 4 ++-- > package/modsecurity2/modsecurity2.mk | 7 +++---- > 3 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in > index 2870386a99..fb1bfc960e 100644 > --- a/package/modsecurity2/Config.in > +++ b/package/modsecurity2/Config.in > @@ -2,7 +2,7 @@ config BR2_PACKAGE_MODSECURITY2 > bool "modsecurity2" > depends on BR2_PACKAGE_APACHE > select BR2_PACKAGE_LIBXML2 > - select BR2_PACKAGE_PCRE > + select BR2_PACKAGE_PCRE2 > help > ModSecurity is an open source, cross-platform web application > firewall (WAF) module. Known as the "Swiss Army Knife" of > diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash > index a19f4823a8..2c77ffd830 100644 > --- a/package/modsecurity2/modsecurity2.hash > +++ b/package/modsecurity2/modsecurity2.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.5/modsecurity-2.9.5.tar.gz.sha256 > -sha256 e2bfc8cd8b8de1e21f054d310543373ea5d89adbd96784e832be0da3e4dc149e modsecurity-2.9.5.tar.gz > +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz.sha256 > +sha256 2a28fcfccfef21581486f98d8d5fe0397499749b8380f60ec7bb1c08478e1839 modsecurity-2.9.7.tar.gz > > # Locally computed > sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE > diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk > index a1ad8fe5bc..c251291e64 100644 > --- a/package/modsecurity2/modsecurity2.mk > +++ b/package/modsecurity2/modsecurity2.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MODSECURITY2_VERSION = 2.9.5 > +MODSECURITY2_VERSION = 2.9.7 > MODSECURITY2_SOURCE = modsecurity-$(MODSECURITY2_VERSION).tar.gz > MODSECURITY2_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) > MODSECURITY2_LICENSE = Apache-2.0 > @@ -12,11 +12,10 @@ MODSECURITY2_LICENSE_FILES = LICENSE > MODSECURITY2_CPE_ID_VENDOR = trustwave > MODSECURITY2_CPE_ID_PRODUCT = modsecurity > MODSECURITY2_INSTALL_STAGING = YES > -MODSECURITY2_DEPENDENCIES = apache libxml2 pcre > +MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 > > MODSECURITY2_CONF_OPTS = \ > - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ > - --with-libxml=$(STAGING_DIR)/usr \ > + --with-pcre2=$(STAGING_DIR)/usr/bin/pcre2-config \ > --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ > --with-apu=$(STAGING_DIR)/usr/bin/apu-1-config \ > --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ > -- > 2.39.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 Feb 5 14:28:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:28:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/opusfile: fix CVE-2022-47021 In-Reply-To: <20230205130600.18051-1-fontaine.fabrice@gmail.com> References: <20230205130600.18051-1-fontaine.fabrice@gmail.com> Message-ID: <20230205142844.GL2960@scaer> Fabrice, All, On 2023-02-05 14:06 +0100, Fabrice Fontaine spake thusly: > A null pointer dereference issue was discovered in functions op_get_data > and op_open1 in opusfile.c in xiph opusfile 0.9 thru 0.12 allows > attackers to cause denial of service or other unspecified impacts. > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...ocation-failure-from-ogg_sync_buffer.patch | 44 +++++++++++++++++++ > package/opusfile/opusfile.mk | 3 ++ > 2 files changed, 47 insertions(+) > create mode 100644 package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch > > diff --git a/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch > new file mode 100644 > index 0000000000..2ef08502ab > --- /dev/null > +++ b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch > @@ -0,0 +1,44 @@ > +From 0a4cd796df5b030cb866f3f4a5e41a4b92caddf5 Mon Sep 17 00:00:00 2001 > +From: Ralph Giles > +Date: Tue, 6 Sep 2022 19:04:31 -0700 > +Subject: [PATCH] Propagate allocation failure from ogg_sync_buffer. > + > +Instead of segfault, report OP_EFAULT if ogg_sync_buffer returns > +a null pointer. This allows more graceful recovery by the caller > +in the unlikely event of a fallible ogg_malloc call. > + > +We do check the return value elsewhere in the code, so the new > +checks make the code more consistent. > + > +Thanks to https://github.com/xiph/opusfile/issues/36 for reporting. > + > +Signed-off-by: Timothy B. Terriberry > +Signed-off-by: Mark Harris > + > +[Retrieved from: > +https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5] > +Signed-off-by: Fabrice Fontaine > +--- > + src/opusfile.c | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/src/opusfile.c b/src/opusfile.c > +index ca219b2..3c3c81e 100644 > +--- a/src/opusfile.c > ++++ b/src/opusfile.c > +@@ -148,6 +148,7 @@ static int op_get_data(OggOpusFile *_of,int _nbytes){ > + int nbytes; > + OP_ASSERT(_nbytes>0); > + buffer=(unsigned char *)ogg_sync_buffer(&_of->oy,_nbytes); > ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; > + nbytes=(int)(*_of->callbacks.read)(_of->stream,buffer,_nbytes); > + OP_ASSERT(nbytes<=_nbytes); > + if(OP_LIKELY(nbytes>0))ogg_sync_wrote(&_of->oy,nbytes); > +@@ -1527,6 +1528,7 @@ static int op_open1(OggOpusFile *_of, > + if(_initial_bytes>0){ > + char *buffer; > + buffer=ogg_sync_buffer(&_of->oy,(long)_initial_bytes); > ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; > + memcpy(buffer,_initial_data,_initial_bytes*sizeof(*buffer)); > + ogg_sync_wrote(&_of->oy,(long)_initial_bytes); > + } > diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk > index 72ae82e801..63553a81e7 100644 > --- a/package/opusfile/opusfile.mk > +++ b/package/opusfile/opusfile.mk > @@ -11,6 +11,9 @@ OPUSFILE_LICENSE = BSD-3-Clause > OPUSFILE_LICENSE_FILES = COPYING > OPUSFILE_INSTALL_STAGING = YES > > +# 0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch > +OPUSFILE_IGNORE_CVES += CVE-2022-47021 > + > ifeq ($(BR2_PACKAGE_OPENSSL),y) > OPUSFILE_DEPENDENCIES += openssl > else > -- > 2.39.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 Feb 5 14:31:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:31:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: add CPE variables In-Reply-To: <20230205124049.5139-1-fontaine.fabrice@gmail.com> References: <20230205124049.5139-1-fontaine.fabrice@gmail.com> Message-ID: <20230205143152.GM2960@scaer> Fabrice, All, On 2023-02-05 13:40 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:treasuredata:fluent_bit is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atreasuredata%3Afluent_bit Even though it's not obvious from the github repository, I checked and indeed Treasure Data is the original "editor" for fluentbit. > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/fluent-bit/fluent-bit.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk > index 6e9a33e02e..879437e5f4 100644 > --- a/package/fluent-bit/fluent-bit.mk > +++ b/package/fluent-bit/fluent-bit.mk > @@ -8,6 +8,8 @@ FLUENT_BIT_VERSION = 2.0.8 > FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) > FLUENT_BIT_LICENSE = Apache-2.0 > FLUENT_BIT_LICENSE_FILES = LICENSE > +FLUENT_BIT_CPE_ID_VENDOR = treasuredata > +FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit > FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl > > FLUENT_BIT_CONF_OPTS += \ > -- > 2.39.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 Feb 5 14:37:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:37:50 +0100 Subject: [Buildroot] [git commit] package/wireshark: security bump to version 4.0.3 Message-ID: <20230205143927.C4FA7838A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce2ac1fecfdd61c01bb34984624f2d37fea91f91 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2023-0411, CVE-2023-0412, CVE-2023-0413, CVE-2023-0414, CVE-2023-0415, CVE-2023-0416 and CVE-2023-0417 https://www.wireshark.org/security/wnpa-sec-2023-01 https://www.wireshark.org/security/wnpa-sec-2023-02 https://www.wireshark.org/security/wnpa-sec-2023-03 https://www.wireshark.org/security/wnpa-sec-2023-04 https://www.wireshark.org/security/wnpa-sec-2023-05 https://www.wireshark.org/security/wnpa-sec-2023-06 https://www.wireshark.org/security/wnpa-sec-2023-07 https://www.wireshark.org/docs/relnotes/wireshark-4.0.3.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- 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 e9026b8caa..7128b560ae 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-4.0.2.txt -sha1 0127180ff18515b086fe5603f767f53ddaa64c1a wireshark-4.0.2.tar.xz -sha256 f35915699f2f9b28ddb211202d40ec8984e5834d3c911483144a4984ba44411d wireshark-4.0.2.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.3.txt +sha1 243b0057cfe6d447662e81b5646110aaf8b63c81 wireshark-4.0.3.tar.xz +sha256 6c51e15bcc0afb93734e686dbff354ffd159f570bd2904bcbbad6f3feb7e9511 wireshark-4.0.3.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index e2a424ef0f..12c36575df 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.0.2 +WIRESHARK_VERSION = 4.0.3 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From yann.morin.1998 at free.fr Sun Feb 5 14:39:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:39:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 4.0.3 In-Reply-To: <20230205142543.285695-1-fontaine.fabrice@gmail.com> References: <20230205142543.285695-1-fontaine.fabrice@gmail.com> Message-ID: <20230205143944.GN2960@scaer> Fabrice, All, On 2023-02-05 15:25 +0100, Fabrice Fontaine spake thusly: > Fix CVE-2023-0411, CVE-2023-0412, CVE-2023-0413, CVE-2023-0414, > CVE-2023-0415, CVE-2023-0416 and CVE-2023-0417 > > https://www.wireshark.org/security/wnpa-sec-2023-01 > https://www.wireshark.org/security/wnpa-sec-2023-02 > https://www.wireshark.org/security/wnpa-sec-2023-03 > https://www.wireshark.org/security/wnpa-sec-2023-04 > https://www.wireshark.org/security/wnpa-sec-2023-05 > https://www.wireshark.org/security/wnpa-sec-2023-06 > https://www.wireshark.org/security/wnpa-sec-2023-07 > > https://www.wireshark.org/docs/relnotes/wireshark-4.0.3.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 e9026b8caa..7128b560ae 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-4.0.2.txt > -sha1 0127180ff18515b086fe5603f767f53ddaa64c1a wireshark-4.0.2.tar.xz > -sha256 f35915699f2f9b28ddb211202d40ec8984e5834d3c911483144a4984ba44411d wireshark-4.0.2.tar.xz > +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.3.txt > +sha1 243b0057cfe6d447662e81b5646110aaf8b63c81 wireshark-4.0.3.tar.xz > +sha256 6c51e15bcc0afb93734e686dbff354ffd159f570bd2904bcbbad6f3feb7e9511 wireshark-4.0.3.tar.xz > > # Locally calculated > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk > index e2a424ef0f..12c36575df 100644 > --- a/package/wireshark/wireshark.mk > +++ b/package/wireshark/wireshark.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WIRESHARK_VERSION = 4.0.2 > +WIRESHARK_VERSION = 4.0.3 > WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz > WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions > WIRESHARK_LICENSE = wireshark license > -- > 2.39.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 Feb 5 14:42:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:42:05 +0100 Subject: [Buildroot] [git commit] package/tmux: add utf8proc optional dependency Message-ID: <20230205144220.73E8F838AE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f618aa388535181c281c85e2b5264532de4ef0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master utf8proc is an optional dependency since version 2.3 and https://github.com/tmux/tmux/commit/6c94774b70f72952c4c512e4aa59a207ca1c34f2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/tmux/tmux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 281b7d8ee6..b1c0af1a83 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -11,6 +11,13 @@ TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_UTF8PROC),y) +TMUX_DEPENDENCIES += utf8proc +TMUX_CONF_OPTS += --enable-utf8proc +else +TMUX_CONF_OPTS += --disable-utf8proc +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS From yann.morin.1998 at free.fr Sun Feb 5 14:42:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:42:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: add utf8proc optional dependency In-Reply-To: <20230205132307.41753-1-fontaine.fabrice@gmail.com> References: <20230205132307.41753-1-fontaine.fabrice@gmail.com> Message-ID: <20230205144242.GO2960@scaer> Fabrice, All, On 2023-02-05 14:23 +0100, Fabrice Fontaine spake thusly: > utf8proc is an optional dependency since version 2.3 and > https://github.com/tmux/tmux/commit/6c94774b70f72952c4c512e4aa59a207ca1c34f2 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/tmux/tmux.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk > index 281b7d8ee6..b1c0af1a83 100644 > --- a/package/tmux/tmux.mk > +++ b/package/tmux/tmux.mk > @@ -11,6 +11,13 @@ TMUX_LICENSE_FILES = COPYING > TMUX_CPE_ID_VENDOR = tmux_project > TMUX_DEPENDENCIES = libevent ncurses host-pkgconf > > +ifeq ($(BR2_PACKAGE_UTF8PROC),y) > +TMUX_DEPENDENCIES += utf8proc > +TMUX_CONF_OPTS += --enable-utf8proc > +else > +TMUX_CONF_OPTS += --disable-utf8proc > +endif > + > # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear > # can reject the user connection. See man shells. > define TMUX_ADD_TMUX_TO_SHELLS > -- > 2.39.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 Feb 5 14:42:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:42:56 +0100 Subject: [Buildroot] [git commit] package/z3: bump to version 4.12.1 Message-ID: <20230205144323.6CEC9838B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a7b1b913e756358b40359115c12fff241d4ca92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For change log since v4.12.0, see: - https://github.com/Z3Prover/z3/releases/tag/z3-4.12.1 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/z3/z3.hash | 2 +- package/z3/z3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/z3/z3.hash b/package/z3/z3.hash index 517e2f4923..8a511c3fe5 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5f575f0a3950760436217da1cc1a714569b6d4f664a75bb6775876328cf0a580 z3-4.12.0.tar.gz +sha256 a3735fabf00e1341adcc70394993c05fd3e2ae167a3e9bb46045e33084eb64a3 z3-4.12.1.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index ecd79325dc..45c412ad12 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.12.0 +Z3_VERSION = 4.12.1 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Sun Feb 5 14:43:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:43:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/z3: bump to version 4.12.1 In-Reply-To: <20230205130355.797050-1-ju.o@free.fr> References: <20230205130355.797050-1-ju.o@free.fr> Message-ID: <20230205144340.GP2960@scaer> Julien, All, On 2023-02-05 14:03 +0100, Julien Olivain spake thusly: > For change log since v4.12.0, see: > - https://github.com/Z3Prover/z3/releases/tag/z3-4.12.1 > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > Patch tested on branch master at commit 8bb9627 with commands: > > make check-package > ... > 0 warnings generated > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_z3 > ... > OK > > ./utils/test-pkg -p z3 > ... > 6 builds, 4 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > --- > package/z3/z3.hash | 2 +- > package/z3/z3.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/z3/z3.hash b/package/z3/z3.hash > index 517e2f4923..8a511c3fe5 100644 > --- a/package/z3/z3.hash > +++ b/package/z3/z3.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 5f575f0a3950760436217da1cc1a714569b6d4f664a75bb6775876328cf0a580 z3-4.12.0.tar.gz > +sha256 a3735fabf00e1341adcc70394993c05fd3e2ae167a3e9bb46045e33084eb64a3 z3-4.12.1.tar.gz > sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt > diff --git a/package/z3/z3.mk b/package/z3/z3.mk > index ecd79325dc..45c412ad12 100644 > --- a/package/z3/z3.mk > +++ b/package/z3/z3.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -Z3_VERSION = 4.12.0 > +Z3_VERSION = 4.12.1 > Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) > Z3_LICENSE = MIT > Z3_LICENSE_FILES = LICENSE.txt > -- > 2.39.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 Feb 5 14:50:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 15:50:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix openssl dependency Message-ID: <20230205145036.654667-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: Makefile:576: *** libopenssl is in the dependency chain of fluent-bit that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Fixes: - http://autobuild.buildroot.org/results/9c3b8e19063f7587877fdb0598739b55abccb3e8 Signed-off-by: Fabrice Fontaine --- package/fluent-bit/fluent-bit.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 879437e5f4..13077e53cc 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -10,7 +10,7 @@ FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit -FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl +FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 5 14:55:32 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 15:55:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: bump to version 3.3a Message-ID: <20230205145532.659422-1-fontaine.fabrice@gmail.com> systemd is an optional dependency since https://github.com/tmux/tmux/commit/fc7f1e7acb3539a43df46136e971f770515e0b0d https://github.com/tmux/tmux/blob/3.3a/CHANGES Signed-off-by: Fabrice Fontaine --- package/tmux/tmux.hash | 2 +- package/tmux/tmux.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index 75538e09ae..b5c0fe58d0 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386 tmux-3.1c.tar.gz +sha256 e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f tmux-3.3a.tar.gz sha256 c031bd37f464c534277814f6aa38686fa023d094261d57fd2545ad592bb53ccd COPYING diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index b1c0af1a83..47ee9b16ca 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,13 +4,20 @@ # ################################################################################ -TMUX_VERSION = 3.1c +TMUX_VERSION = 3.3a TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +TMUX_DEPENDENCIES += systemd +TMUX_CONF_OPTS += --enable-systemd +else +TMUX_CONF_OPTS += --disable-systemd +endif + ifeq ($(BR2_PACKAGE_UTF8PROC),y) TMUX_DEPENDENCIES += utf8proc TMUX_CONF_OPTS += --enable-utf8proc -- 2.39.0 From yann.morin.1998 at free.fr Sun Feb 5 15:02:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 16:02:31 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: fix openssl dependency Message-ID: <20230205150429.0640A838BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78e3637dd26766976d09e5d8286613f67975f8d6 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 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: Makefile:576: *** libopenssl is in the dependency chain of fluent-bit that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Fixes: - http://autobuild.buildroot.org/results/9c3b8e19063f7587877fdb0598739b55abccb3e8 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/fluent-bit/fluent-bit.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 879437e5f4..13077e53cc 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -10,7 +10,7 @@ FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit -FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl +FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ From yann.morin.1998 at free.fr Sun Feb 5 15:04:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 16:04:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix openssl dependency In-Reply-To: <20230205145036.654667-1-fontaine.fabrice@gmail.com> References: <20230205145036.654667-1-fontaine.fabrice@gmail.com> Message-ID: <20230205150459.GQ2960@scaer> Fabrice, All, On 2023-02-05 15:50 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since the addition of the package > in commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: > > Makefile:576: *** libopenssl is in the dependency chain of fluent-bit that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. > > Fixes: > - http://autobuild.buildroot.org/results/9c3b8e19063f7587877fdb0598739b55abccb3e8 > > Signed-off-by: Fabrice Fontaine Nice catch, applied to master, thanks. Regards, Yann E. MORIN. > --- > package/fluent-bit/fluent-bit.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk > index 879437e5f4..13077e53cc 100644 > --- a/package/fluent-bit/fluent-bit.mk > +++ b/package/fluent-bit/fluent-bit.mk > @@ -10,7 +10,7 @@ FLUENT_BIT_LICENSE = Apache-2.0 > FLUENT_BIT_LICENSE_FILES = LICENSE > FLUENT_BIT_CPE_ID_VENDOR = treasuredata > FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit > -FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl > +FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl > > FLUENT_BIT_CONF_OPTS += \ > -DFLB_DEBUG=No \ > -- > 2.39.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 Feb 5 15:21:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 16:21:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.19.0 In-Reply-To: <20230202192526.30357-1-bernd.kuhls@t-online.de> References: <20230202192526.30357-1-bernd.kuhls@t-online.de> Message-ID: <20230205152108.GR2960@scaer> Bernd, All, On 2023-02-02 20:25 +0100, Bernd Kuhls spake thusly: > Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 3c50faf23f..781e089de8 100644 > --- a/package/xmrig/xmrig.hash > +++ b/package/xmrig/xmrig.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 f97fe20248e0eb452f77e9b69f2fb1510b852152b3af4f9a8b20680c854888d1 xmrig-6.18.1.tar.gz > +sha256 772f947058e5b89ca9bf34128487def47796870b547439a9b0524ddd1899420c xmrig-6.19.0.tar.gz > sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE > diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk > index ca5bcecfbe..f345ba9cf9 100644 > --- a/package/xmrig/xmrig.mk > +++ b/package/xmrig/xmrig.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -XMRIG_VERSION = 6.18.1 > +XMRIG_VERSION = 6.19.0 > XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) > XMRIG_LICENSE = GPL-3.0+ > XMRIG_LICENSE_FILES = LICENSE > -- > 2.39.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 Feb 5 15:35:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 16:35:52 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/balena-engine: bump to version 20.10.26 In-Reply-To: <20230202132650.1537778-1-christian@paral.in> References: <20230202132650.1537778-1-christian@paral.in> Message-ID: <20230205153552.GS2960@scaer> Christian, All, On 2023-02-02 05:26 -0800, Christian Stewart via buildroot spake thusly: > This update requires a workaround for the non-standard vendor/ structure in the > balena-engine repository, which has an invalid vendor/modules.txt file. > > Removing the vendor/modules.txt file fixes the build error. > > Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > > The go download post-process script uses go mod init to create the go.mod file That's not correct. The download go-post-process script does not run that command at all. Furthermore, in the case of the balena-engine package, the go-post-process script actually does absolutely nothing at all. Indeed, it will notice that the vendor/ directory already exists, and thus will exit early: 17 # Already vendored tarball, nothing to do 18 if tar tf "${output}" | grep -q "^[^/]*/vendor" ; then 19 exit 0 20 fi 21 22 post_process_unpack "${base_name}" "${output}" 23 24 # Do the Go vendoring 25 pushd "${base_name}" > /dev/null 26 27 if [ ! -f go.mod ]; then 28 echo "ERROR: no vendor/ folder and no go.mod, aborting" 29 exit 1 30 fi 31 32 go mod vendor -v -modcacherw 33 popd > /dev/null 34 35 post_process_repack $(pwd) "${base_name}" "${output}" Furthermore, for balena-engine, this all works because it is not using the go-mod infra, and despite this uses a populated vendor/ directory. So, we're not running the vendoring as it is already done, and we can thus delete the problematic file. So, you'll have to reword/rework the explanations. Note that this also applies to your other patches touching the docker-related packages, notably "package/docker-engine: bump version to v23.0.0", so I'll mark the rest of that series as changes requested too. Regards, Yann E. MORIN. > which specifies a language version of go1.16 on default. Use go mod edit to > adjust the go.mod file to the required minimum version go1.19 for generic types > used by docker-engine. (Fixes a build error). > > Remove the vendor/archive sub-tree (fixes a build error) because Go no longer > allows having duplicate packages in GOPATH and GOROOT. vendor/archive/tar cannot > be in vendor/ because it exists in the standard library. Remove it from vendor/. > > https://github.com/balena-os/balena-engine/releases/tag/v20.10.26 > > Signed-off-by: Christian Stewart > --- > package/balena-engine/balena-engine.hash | 2 +- > package/balena-engine/balena-engine.mk | 14 +++++++++++++- > 2 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash > index 4adb8ce561..6a92a40cc8 100644 > --- a/package/balena-engine/balena-engine.hash > +++ b/package/balena-engine/balena-engine.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz > +sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk > index ecfb62bfbf..3b8b2f9ac6 100644 > --- a/package/balena-engine/balena-engine.mk > +++ b/package/balena-engine/balena-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BALENA_ENGINE_VERSION = 20.10.21 > +BALENA_ENGINE_VERSION = 20.10.26 > BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) > > BALENA_ENGINE_LICENSE = Apache-2.0 > @@ -34,6 +34,18 @@ BALENA_ENGINE_TAGS = \ > > BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine > > +# remove the conflicting vendor/modules.txt > +# remove the conflicting vendor/archive (not allowed in go1.20) > +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > +define BALENA_ENGINE_CONFIGURE_CMDS > + if [ -f $(@D)/vendor/modules.txt ]; then \ > + rm $(@D)/vendor/modules.txt; \ No need to test if a file exists before removing it; just unconditionally delete it: rm -f $(@D)/vendor/modules.txt > + fi > + if [ -d $(@D)/vendor/archive ]; then \ > + rm -rf $(@D)/vendor/archive; \ Ditto, just delete the directory without checking whether it exists. Regards, Yann E. MORIN. > + fi > +endef > + > ifeq ($(BR2_INIT_SYSTEMD),y) > BALENA_ENGINE_DEPENDENCIES += systemd > BALENA_ENGINE_TAGS += journald > -- > 2.39.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 Feb 5 17:09:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 18:09:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgit2: security bump to 1.5.1 In-Reply-To: <20230124125528.5801-1-nicolas.cavallari@green-communications.fr> (Nicolas Cavallari's message of "Tue, 24 Jan 2023 13:55:28 +0100") References: <20230124125528.5801-1-nicolas.cavallari@green-communications.fr> Message-ID: <87357kxcnj.fsf@dell.be.48ers.dk> >>>>> "Nicolas" == Nicolas Cavallari writes: > Fixes CVE-2023-22742: when compiled with BR2_PACKAGE_LIBSSH2, > libgit2 fails to verify SSH keys by default. > https://github.com/libgit2/libgit2/blob/v1.5.1/docs/changelog.md > Signed-off-by: Nicolas Cavallari Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 17:08:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 18:08:31 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgit2: link with -latomic if needed Message-ID: <20230205170914.D23A2838DE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b1a7b69abcc65517a443de986b5e249d30e9696 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x libgit2 is currently a library without any reverse dependencies so the missing atomic symbols do not cause build failures yet. libgit2 uses the atomics intrinsics on gcc >= 4.7 and the sync intrinsics on previous gcc versions. Since gcc 4.9 is the new minimum, ignore the sync intrinsics requirements. The next version of libgit2 will also build a binary, which will expose the problem. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni (cherry picked from commit e992a3e7712f6f87fcbddb1844a5cbf51a1d82bb) Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 3f1e6e1593..9b5e2b897d 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -44,4 +44,9 @@ else LIBGIT2_CONF_OPTS += -DUSE_HTTPS=OFF endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBGIT2_CONF_OPTS += \ + -DCMAKE_SHARED_LINKER_FLAGS=-latomic +endif + $(eval $(cmake-package)) From peter at korsgaard.com Sun Feb 5 17:08:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 18:08:39 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgit2: bump to 1.5.0 Message-ID: <20230205170914.DD29B838DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a7e02bdfd7e7175f7f55673a1b1563ab8b1633e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x It includes an option to build a command line program that can be used to replace git in simple cases. The upcoming sha256 repository support made them steal the sha256 code from RFC6234, hence the license change. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni (cherry picked from commit 7c8e34f4d20598a6536a6d63b6c4a97eb3b794cf) Signed-off-by: Peter Korsgaard --- package/libgit2/Config.in | 10 ++++++++++ package/libgit2/libgit2.hash | 4 ++-- package/libgit2/libgit2.mk | 16 ++++++++++++++-- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/package/libgit2/Config.in b/package/libgit2/Config.in index a6a9728ff0..5d28f054f2 100644 --- a/package/libgit2/Config.in +++ b/package/libgit2/Config.in @@ -12,3 +12,13 @@ config BR2_PACKAGE_LIBGIT2 comment "libgit2 needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + +if BR2_PACKAGE_LIBGIT2 + +config BR2_PACKAGE_LIBGIT2_CLI + bool "enable command line interface (git2_cli)" + help + Enable a command-line interface for libgit2. + It aims to be git-compatible. + +endif diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 3b5837f789..fb760fd4cc 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f48b961e463a9e4e7e7e58b21a0fb5a9b2a1d24d9ba4d15870a0c9b8ad965163 libgit2-1.4.3.tar.gz -sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING +sha256 8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e libgit2-1.5.0.tar.gz +sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 9b5e2b897d..9409011eb4 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,9 +4,14 @@ # ################################################################################ -LIBGIT2_VERSION = 1.4.3 +LIBGIT2_VERSION = 1.5.0 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) +LIBGIT2_LICENSE = \ + GPL-2.0 with linking exception, \ + MIT (sha1), \ + BSD-3-Clause (sha256), \ + wildmatch license (wildmatch), \ + CC0-1.0 (xoroshiro256) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES @@ -44,8 +49,15 @@ else LIBGIT2_CONF_OPTS += -DUSE_HTTPS=OFF endif +ifeq ($(BR2_PACKAGE_LIBGIT2_CLI),y) +LIBGIT2_CONF_OPTS += -DBUILD_CLI=ON +else +LIBGIT2_CONF_OPTS += -DBUILD_CLI=OFF +endif + ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) LIBGIT2_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS=-latomic \ -DCMAKE_SHARED_LINKER_FLAGS=-latomic endif From peter at korsgaard.com Sun Feb 5 17:08:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 18:08:25 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgit2: bump version to 1.4.3 Message-ID: <20230205170914.C3A01838DD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89c63ae8724354fada0894792b1bde0eb9e57759 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x git added restrictions on config files to fix CVE 2022-24765. libgit2 adopted these changes for compatibility reasons, even if the vuln is not exploitable in libgit2. https://github.com/libgit2/libgit2/releases/tag/v1.4.3 Signed-off-by: Nicolas Cavallari Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 01ee7f84fb9da338d36fbaad3cf8a07391a843d3) Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index ada411ea22..3b5837f789 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 901c2b4492976b86477569502a41c31b274b69adc177149c02099ea88404ef19 libgit2-1.4.2.tar.gz +sha256 f48b961e463a9e4e7e7e58b21a0fb5a9b2a1d24d9ba4d15870a0c9b8ad965163 libgit2-1.4.3.tar.gz sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index e94dd9c370..3f1e6e1593 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.4.2 +LIBGIT2_VERSION = 1.4.3 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) LIBGIT2_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 5 17:08:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 18:08:47 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgit2: security bump to 1.5.1 Message-ID: <20230205170914.E787F838DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66cec4d25c48d8acdd6d85b4ea176a0cbac91501 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes CVE-2023-22742: when compiled with BR2_PACKAGE_LIBSSH2, libgit2 fails to verify SSH keys by default. https://github.com/libgit2/libgit2/blob/v1.5.1/docs/changelog.md Signed-off-by: Nicolas Cavallari Signed-off-by: Peter Korsgaard (cherry picked from commit cc47da516cf5b76752d63361a8a7579d93e6fbbb) Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index fb760fd4cc..e834525df5 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e libgit2-1.5.0.tar.gz +sha256 7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88 libgit2-1.5.1.tar.gz sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 9409011eb4..c962c8030f 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.5.0 +LIBGIT2_VERSION = 1.5.1 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From peter at korsgaard.com Sun Feb 5 17:08:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 18:08:19 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgit2: bump version to 1.4.2 Message-ID: <20230205170914.B73C9838DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0683331971cf50ce7b071278e0ecd05253fffe51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x 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) (cherry picked from commit ba8c268e00bce6cbcb2d7d29143a34afaa5fdc46) Signed-off-by: Peter Korsgaard --- 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 peter at korsgaard.com Sun Feb 5 17:07:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 18:07:09 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/libgit2: security bump to 1.5.1 Message-ID: <20230205171024.9D017838E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b25f3d1723a35e1dffcfcb0168367697ba20e2b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes CVE-2023-22742: when compiled with BR2_PACKAGE_LIBSSH2, libgit2 fails to verify SSH keys by default. https://github.com/libgit2/libgit2/blob/v1.5.1/docs/changelog.md Signed-off-by: Nicolas Cavallari Signed-off-by: Peter Korsgaard (cherry picked from commit cc47da516cf5b76752d63361a8a7579d93e6fbbb) Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index fb760fd4cc..e834525df5 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e libgit2-1.5.0.tar.gz +sha256 7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88 libgit2-1.5.1.tar.gz sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 9409011eb4..c962c8030f 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.5.0 +LIBGIT2_VERSION = 1.5.1 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From giulio.benetti at benettiengineering.com Sun Feb 5 21:25:21 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 5 Feb 2023 22:25:21 +0100 Subject: [Buildroot] [PATCH v2] toolchain/Config.in: extend gcc bug 43744 to every sh architecture In-Reply-To: <20230205131559.6f79944f@windsurf> References: <20230205131559.6f79944f@windsurf> Message-ID: <20230205212521.903480-1-giulio.benetti@benettiengineering.com> Gcc bug 43744 affects seems to affect all SH family because it already affects: 1) sh4, here you can find a buildroot defconfig that fails to build: http://autobuild.buildroot.net/results/1db/1db6c59c98e3c09fa13277076ee2fbe7967f1f6b/defconfig 2) sh4a, here you can find a buildroot defconfig that fails to build: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a/defconfig Note also that gcc bugzilla entry reports the bug for SH and not for sub-architectures: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43744 So let's extend the bug to BR2_sh to match the entire SH architecture. Signed-off-by: Giulio Benetti --- V1->V2: * add a commit log with details about gcc bug 43744 as pointed by Thomas Petazzoni --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 544b423001..01215e0e96 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -115,7 +115,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_43744 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 - depends on BR2_sh4 + depends on BR2_sh # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63261. This bug no # longer exists in gcc 8.x. -- 2.34.1 From dario.binacchi at amarulasolutions.com Sun Feb 5 21:41:31 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 5 Feb 2023 22:41:31 +0100 Subject: [Buildroot] [PATCH 1/2] configs/beaglebone: bump Linux version to 5.10.145-ti-r54 Message-ID: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> The previous version failed to boot from sd card with a log reported by the document [1]. In my case it always failed, a 100% failure against 75% reported by the document. Instead of adding the patch to fix the problem, I preferred to update the kernel version as suggested by the document itself. Tested on beaglebone black. [1] https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 Signed-off-by: Dario Binacchi --- configs/beaglebone_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 639b491e9746..dff7dea422ee 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.145-ti-r54)/linux-5.10.145-ti-r54.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" -- 2.32.0 From dario.binacchi at amarulasolutions.com Sun Feb 5 21:41:32 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 5 Feb 2023 22:41:32 +0100 Subject: [Buildroot] [PATCH 2/2] configs/beaglebone: bump U-Boot version to 2022.10 In-Reply-To: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> References: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> Message-ID: <20230205214132.6941-2-dario.binacchi@amarulasolutions.com> Starting from version 2021.10 only distro booting is supported, as reported by commit ff8f277e9121 ("ti: am335x_evm: Switch to DISTRO_BOOT only"). The patch allows to update U-Boot to versions later than 2021.10. Tested on beaglebone black. Signed-off-by: Dario Binacchi --- board/beaglebone/extlinux.conf | 4 ++++ board/beaglebone/genimage.cfg | 1 + board/beaglebone/post-build.sh | 2 ++ configs/beaglebone_defconfig | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 board/beaglebone/extlinux.conf diff --git a/board/beaglebone/extlinux.conf b/board/beaglebone/extlinux.conf new file mode 100644 index 000000000000..4a08c9dedad9 --- /dev/null +++ b/board/beaglebone/extlinux.conf @@ -0,0 +1,4 @@ +label beaglebone-buildroot + kernel /zImage + fdtdir / + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait \ No newline at end of file diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index 987d20507551..4b026fda8431 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -12,6 +12,7 @@ image boot.vfat { "am335x-bonegreen.dtb", "am335x-boneblack-wireless.dtb", "am335x-bonegreen-wireless.dtb", + "extlinux" } } diff --git a/board/beaglebone/post-build.sh b/board/beaglebone/post-build.sh index ffdd19138c7f..b7afd92ffeae 100755 --- a/board/beaglebone/post-build.sh +++ b/board/beaglebone/post-build.sh @@ -2,3 +2,5 @@ BOARD_DIR="$(dirname $0)" cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index dff7dea422ee..0207916d0166 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -34,7 +34,7 @@ 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="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set -- 2.32.0 From peter at korsgaard.com Sun Feb 5 23:00:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 00:00:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: security bump to version 5.0.2 In-Reply-To: <20230120192846.7362-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 20 Jan 2023 20:28:46 +0100") References: <20230120192846.7362-1-fontaine.fabrice@gmail.com> Message-ID: <87y1pbwwdl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2022-47952: lxc-user-nic in lxc through 5.0.1 is installed > setuid root, and may allow local users to infer whether any file > exists, even within a protected directory tree, because "Failed to > open" often indicates that a file does not exist, whereas "does not > refer to a network namespace path" often indicates that a file exists. > NOTE: this is different from CVE-2018-6556 because the CVE-2018-6556 > fix design was based on the premise that "we will report back to the > user that the open() failed but the user has no way of knowing why it > failed"; however, in many realistic cases, there are no plausible > reasons for failing except that the file does not exist. > - Drop patches (already in version) > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x, thanks. I see that there isn't a new 4.0.x release. Do you know if 4.0.x is also vulnerable to this issue? -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 22:44:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 23:44:05 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/lxc: security bump to version 5.0.2 Message-ID: <20230205230055.0D87C838EB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4631f48fe79aa83d352fb5eb254f39ea54926ba6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x - Fix CVE-2022-47952: lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may allow local users to infer whether any file exists, even within a protected directory tree, because "Failed to open" often indicates that a file does not exist, whereas "does not refer to a network namespace path" often indicates that a file exists. NOTE: this is different from CVE-2018-6556 because the CVE-2018-6556 fix design was based on the premise that "we will report back to the user that the open() failed but the user has no way of knowing why it failed"; however, in many realistic cases, there are no plausible reasons for failing except that the file does not exist. - Drop patches (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit cd7bfba252095ffaf93d22c7379b409bbdf64d46) Signed-off-by: Peter Korsgaard --- ...etect-where-struct-mount_attr-is-declared.patch | 186 --------------------- ...ll_method_async-to-replace-the-asyncv-one.patch | 47 ------ ...003-build-detect-sys-pidfd.h-availability.patch | 55 ------ package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 5 files changed, 2 insertions(+), 290 deletions(-) diff --git a/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch b/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch deleted file mode 100644 index 8de7adcc56..0000000000 --- a/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch +++ /dev/null @@ -1,186 +0,0 @@ -From c1115e1503bf955c97f4cf3b925a6a9f619764c3 Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Tue, 9 Aug 2022 16:14:25 +0200 -Subject: [PATCH] build: detect where struct mount_attr is declared - -Fixes: #4176 -Signed-off-by: Christian Brauner (Microsoft) -[Retrieved from: -https://github.com/lxc/lxc/commit/c1115e1503bf955c97f4cf3b925a6a9f619764c3] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 30 ++++++++++++++++++++++++++++-- - src/lxc/conf.c | 6 +++--- - src/lxc/conf.h | 2 +- - src/lxc/mount_utils.c | 6 +++--- - src/lxc/syscall_wrappers.h | 12 ++++++++++-- - 5 files changed, 45 insertions(+), 11 deletions(-) - -diff --git a/meson.build b/meson.build -index a145faf069..f679aabbc8 100644 ---- a/meson.build -+++ b/meson.build -@@ -590,7 +590,6 @@ decl_headers = ''' - foreach decl: [ - '__aligned_u64', - 'struct clone_args', -- 'struct mount_attr', - 'struct open_how', - 'struct rtnl_link_stats64', - ] -@@ -610,7 +609,6 @@ foreach tuple: [ - ['struct seccomp_notif_sizes'], - ['struct clone_args'], - ['__aligned_u64'], -- ['struct mount_attr'], - ['struct open_how'], - ['struct rtnl_link_stats64'], - ] -@@ -630,6 +628,34 @@ foreach tuple: [ - endif - endforeach - -+## Types. -+decl_headers = ''' -+#include -+''' -+ -+# We get -1 if the size cannot be determined -+if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 -+ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), true) -+ found_types += 'struct mount_attr (sys/mount.h)' -+else -+ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) -+ missing_types += 'struct mount_attr (sys/mount.h)' -+endif -+ -+## Types. -+decl_headers = ''' -+#include -+''' -+ -+# We get -1 if the size cannot be determined -+if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 -+ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), true) -+ found_types += 'struct mount_attr (linux/mount.h)' -+else -+ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), false) -+ missing_types += 'struct mount_attr (linux/mount.h)' -+endif -+ - ## Headers. - foreach ident: [ - ['bpf', '''#include -diff --git a/src/lxc/conf.c b/src/lxc/conf.c -index ffbe74c2f6..4193cd07f5 100644 ---- a/src/lxc/conf.c -+++ b/src/lxc/conf.c -@@ -2885,7 +2885,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) - struct lxc_mount_options opts = {}; - int dfd_from; - const char *source_relative, *target_relative; -- struct lxc_mount_attr attr = {}; -+ struct mount_attr attr = {}; - - ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts); - if (ret < 0) -@@ -3005,7 +3005,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) - - /* Set propagation mount options. */ - if (opts.attr.propagation) { -- attr = (struct lxc_mount_attr) { -+ attr = (struct mount_attr) { - .propagation = opts.attr.propagation, - }; - -@@ -4109,7 +4109,7 @@ int lxc_idmapped_mounts_parent(struct lxc_handler *handler) - - for (;;) { - __do_close int fd_from = -EBADF, fd_userns = -EBADF; -- struct lxc_mount_attr attr = {}; -+ struct mount_attr attr = {}; - struct lxc_mount_options opts = {}; - ssize_t ret; - -diff --git a/src/lxc/conf.h b/src/lxc/conf.h -index 7dc2f15b60..772479f9e1 100644 ---- a/src/lxc/conf.h -+++ b/src/lxc/conf.h -@@ -223,7 +223,7 @@ struct lxc_mount_options { - unsigned long mnt_flags; - unsigned long prop_flags; - char *data; -- struct lxc_mount_attr attr; -+ struct mount_attr attr; - char *raw_options; - }; - -diff --git a/src/lxc/mount_utils.c b/src/lxc/mount_utils.c -index bba75f933c..88dd73ee36 100644 ---- a/src/lxc/mount_utils.c -+++ b/src/lxc/mount_utils.c -@@ -31,7 +31,7 @@ lxc_log_define(mount_utils, lxc); - * setting in @attr_set, but must also specify MOUNT_ATTR__ATIME in the - * @attr_clr field. - */ --static inline void set_atime(struct lxc_mount_attr *attr) -+static inline void set_atime(struct mount_attr *attr) - { - switch (attr->attr_set & MOUNT_ATTR__ATIME) { - case MOUNT_ATTR_RELATIME: -@@ -272,7 +272,7 @@ int create_detached_idmapped_mount(const char *path, int userns_fd, - { - __do_close int fd_tree_from = -EBADF; - unsigned int open_tree_flags = OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC; -- struct lxc_mount_attr attr = { -+ struct mount_attr attr = { - .attr_set = MOUNT_ATTR_IDMAP | attr_set, - .attr_clr = attr_clr, - .userns_fd = userns_fd, -@@ -335,7 +335,7 @@ int __fd_bind_mount(int dfd_from, const char *path_from, __u64 o_flags_from, - __u64 attr_clr, __u64 propagation, int userns_fd, - bool recursive) - { -- struct lxc_mount_attr attr = { -+ struct mount_attr attr = { - .attr_set = attr_set, - .attr_clr = attr_clr, - .propagation = propagation, -diff --git a/src/lxc/syscall_wrappers.h b/src/lxc/syscall_wrappers.h -index a5e98b565c..c8a7d0c7b7 100644 ---- a/src/lxc/syscall_wrappers.h -+++ b/src/lxc/syscall_wrappers.h -@@ -18,6 +18,12 @@ - #include "macro.h" - #include "syscall_numbers.h" - -+#if HAVE_STRUCT_MOUNT_ATTR -+#include -+#elif HAVE_UAPI_STRUCT_MOUNT_ATTR -+#include -+#endif -+ - #ifdef HAVE_LINUX_MEMFD_H - #include - #endif -@@ -210,16 +216,18 @@ extern int fsmount(int fs_fd, unsigned int flags, unsigned int attr_flags); - /* - * mount_setattr() - */ --struct lxc_mount_attr { -+#if !HAVE_STRUCT_MOUNT_ATTR && !HAVE_UAPI_STRUCT_MOUNT_ATTR -+struct mount_attr { - __u64 attr_set; - __u64 attr_clr; - __u64 propagation; - __u64 userns_fd; - }; -+#endif - - #if !HAVE_MOUNT_SETATTR - static inline int mount_setattr(int dfd, const char *path, unsigned int flags, -- struct lxc_mount_attr *attr, size_t size) -+ struct mount_attr *attr, size_t size) - { - return syscall(__NR_mount_setattr, dfd, path, flags, attr, size); - } diff --git a/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch b/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch deleted file mode 100644 index 22013cb363..0000000000 --- a/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Thu, 25 Aug 2022 05:45:53 -0700 -Subject: [PATCH] use sd_bus_call_method_async to replace the asyncv one - -The sd_bus_call_method_asyncv's 10th parameter is of type -va_list and supplying NULL when invoking it causes compilation -error. Just replace it with the async one. - -Signed-off-by: Chen Qi -[Retrieved from: -https://github.com/lxc/lxc/commit/b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 4 ++-- - src/lxc/cgroups/cgfsng.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 21955a0504..f8bdcf4e83 100644 ---- a/meson.build -+++ b/meson.build -@@ -295,9 +295,9 @@ if not want_sd_bus.disabled() - has_sd_bus = false - endif - -- if not cc.has_function('sd_bus_call_method_asyncv', prefix: '#include ', dependencies: libsystemd) -+ if not cc.has_function('sd_bus_call_method_async', prefix: '#include ', dependencies: libsystemd) - if not sd_bus_optional -- error('libsystemd misses required sd_bus_call_method_asyncv function') -+ error('libsystemd misses required sd_bus_call_method_async function') - endif - - has_sd_bus = false -diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c -index 8a3615893f..d90e5385e1 100644 ---- a/src/lxc/cgroups/cgfsng.c -+++ b/src/lxc/cgroups/cgfsng.c -@@ -1232,7 +1232,7 @@ static int unpriv_systemd_create_scope(struct cgroup_ops *ops, struct lxc_conf * - if (r < 0) - return log_error(SYSTEMD_SCOPE_FAILED, "Failed to connect to user bus: %s", strerror(-r)); - -- r = sd_bus_call_method_asyncv(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL, NULL); -+ r = sd_bus_call_method_async(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL); - if (r < 0) - return log_error(SYSTEMD_SCOPE_FAILED, "Failed to subscribe to signals: %s", strerror(-r)); - diff --git a/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch b/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch deleted file mode 100644 index 3aa598407f..0000000000 --- a/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ef1e0607b82e27350c2d677d649c6a0a9693fd40 Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Tue, 9 Aug 2022 16:27:40 +0200 -Subject: [PATCH] build: detect sys/pidfd.h availability - -Fixes: #4176 -Signed-off-by: Christian Brauner (Microsoft) - -[Retrieved from: -https://github.com/lxc/lxc/commit/ef1e0607b82e27350c2d677d649c6a0a9693fd40] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 1 + - src/lxc/process_utils.h | 6 ++++++ - 2 files changed, 7 insertions(+) - -diff --git a/meson.build b/meson.build -index f679aabbc8..e999542336 100644 ---- a/meson.build -+++ b/meson.build -@@ -735,6 +735,7 @@ foreach tuple: [ - ['sys/resource.h'], - ['sys/memfd.h'], - ['sys/personality.h'], -+ ['sys/pidfd.h'], - ['sys/signalfd.h'], - ['sys/timerfd.h'], - ['pty.h'], -diff --git a/src/lxc/process_utils.h b/src/lxc/process_utils.h -index 9c15b15741..ed84741d0e 100644 ---- a/src/lxc/process_utils.h -+++ b/src/lxc/process_utils.h -@@ -15,6 +15,10 @@ - #include - #include - -+#if HAVE_SYS_PIDFD_H -+#include -+#endif -+ - #include "compiler.h" - #include "syscall_numbers.h" - -@@ -136,9 +140,11 @@ - #endif - - /* waitid */ -+#if !HAVE_SYS_PIDFD_H - #ifndef P_PIDFD - #define P_PIDFD 3 - #endif -+#endif - - #ifndef CLONE_ARGS_SIZE_VER0 - #define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index c18e062cc1..2dd983a361 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d8195423bb1e206f8521d24b6cde4789f043960c7cf065990a9cf741dcfd4222 lxc-5.0.1.tar.gz +sha256 bea08d2e49efcee34fa58acd2bc95c0adc64d291c07f4cfaf4ac1d8ac5a36f45 lxc-5.0.2.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index e1639c5f15..4a4d3a6212 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 5.0.1 +LXC_VERSION = 5.0.2 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 Sun Feb 5 23:01:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 00:01:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-future: security bump to version 0.18.3 In-Reply-To: <20230120192952.8159-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 20 Jan 2023 20:29:52 +0100") References: <20230120192952.8159-1-fontaine.fabrice@gmail.com> Message-ID: <87ttzzwwbw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-40899: An issue discovered in Python Charmers Future 0.18.2 > and earlier allows remote attackers to cause a denial of service via > crafted Set-Cookie header from malicious web server. > https://github.com/PythonCharmers/python-future/releases/tag/v0.18.3 > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 23:01:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 00:01:29 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/python-future: security bump to version 0.18.3 Message-ID: <20230205230240.EDF41838F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2284f82eca1d1ca61c0e4d54b67590f6a6090e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix CVE-2022-40899: An issue discovered in Python Charmers Future 0.18.2 and earlier allows remote attackers to cause a denial of service via crafted Set-Cookie header from malicious web server. https://github.com/PythonCharmers/python-future/releases/tag/v0.18.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 51eb81ddcf340457cff13286fd1aa04082c4903a) Signed-off-by: Peter Korsgaard --- package/python-future/python-future.hash | 6 +++--- package/python-future/python-future.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-future/python-future.hash b/package/python-future/python-future.hash index 4fb5d2a2d7..3b2bbb0212 100644 --- a/package/python-future/python-future.hash +++ b/package/python-future/python-future.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.python.org/pypi/future/json -md5 e4579c836b9c025872efe230f6270349 future-0.18.2.tar.gz -sha256 b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d future-0.18.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/future/json +md5 dedcb70d14b23388670d54145aab8be4 future-0.18.3.tar.gz +sha256 34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307 future-0.18.3.tar.gz # Locally computed sha256 checksums sha256 916e561392d48471b9c23437f56e2652f320cb3b119ceaa162edf41016f746b9 LICENSE.txt diff --git a/package/python-future/python-future.mk b/package/python-future/python-future.mk index 76f32180ac..57bf13d83b 100644 --- a/package/python-future/python-future.mk +++ b/package/python-future/python-future.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FUTURE_VERSION = 0.18.2 +PYTHON_FUTURE_VERSION = 0.18.3 PYTHON_FUTURE_SOURCE = future-$(PYTHON_FUTURE_VERSION).tar.gz -PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/45/0b/38b06fd9b92dc2b68d58b75f900e97884c45bedd2ff83203d933cf5851c9 +PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/8f/2e/cf6accf7415237d6faeeebdc7832023c90e0282aa16fd3263db0eb4715ec PYTHON_FUTURE_SETUP_TYPE = setuptools PYTHON_FUTURE_LICENSE = MIT PYTHON_FUTURE_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Sun Feb 5 23:01:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 00:01:10 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/python-future: security bump to version 0.18.3 Message-ID: <20230205230241.46236838F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14e35225d8e314c4ded7799843fb80de8e182e28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fix CVE-2022-40899: An issue discovered in Python Charmers Future 0.18.2 and earlier allows remote attackers to cause a denial of service via crafted Set-Cookie header from malicious web server. https://github.com/PythonCharmers/python-future/releases/tag/v0.18.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 51eb81ddcf340457cff13286fd1aa04082c4903a) Signed-off-by: Peter Korsgaard --- package/python-future/python-future.hash | 6 +++--- package/python-future/python-future.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-future/python-future.hash b/package/python-future/python-future.hash index 4fb5d2a2d7..3b2bbb0212 100644 --- a/package/python-future/python-future.hash +++ b/package/python-future/python-future.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.python.org/pypi/future/json -md5 e4579c836b9c025872efe230f6270349 future-0.18.2.tar.gz -sha256 b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d future-0.18.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/future/json +md5 dedcb70d14b23388670d54145aab8be4 future-0.18.3.tar.gz +sha256 34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307 future-0.18.3.tar.gz # Locally computed sha256 checksums sha256 916e561392d48471b9c23437f56e2652f320cb3b119ceaa162edf41016f746b9 LICENSE.txt diff --git a/package/python-future/python-future.mk b/package/python-future/python-future.mk index 76f32180ac..57bf13d83b 100644 --- a/package/python-future/python-future.mk +++ b/package/python-future/python-future.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FUTURE_VERSION = 0.18.2 +PYTHON_FUTURE_VERSION = 0.18.3 PYTHON_FUTURE_SOURCE = future-$(PYTHON_FUTURE_VERSION).tar.gz -PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/45/0b/38b06fd9b92dc2b68d58b75f900e97884c45bedd2ff83203d933cf5851c9 +PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/8f/2e/cf6accf7415237d6faeeebdc7832023c90e0282aa16fd3263db0eb4715ec PYTHON_FUTURE_SETUP_TYPE = setuptools PYTHON_FUTURE_LICENSE = MIT PYTHON_FUTURE_LICENSE_FILES = LICENSE.txt From fancp2007 at gmail.com Mon Feb 6 00:20:22 2023 From: fancp2007 at gmail.com (Scott Fan) Date: Mon, 6 Feb 2023 08:20:22 +0800 Subject: [Buildroot] [PATCH 1/2] configs/beaglebone: bump Linux version to 5.10.145-ti-r54 In-Reply-To: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> References: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> Message-ID: Could you test it with kernel 5.10.162-ti-r56 ? https://github.com/beagleboard/linux/releases/tag/5.10.162-ti-r56 Scott Fan On Mon, Feb 6, 2023 at 5:42 AM Dario Binacchi < dario.binacchi at amarulasolutions.com> wrote: > The previous version failed to boot from sd card with a log reported by > the document [1]. In my case it always failed, a 100% failure against > 75% reported by the document. > > Instead of adding the patch to fix the problem, I preferred to update > the kernel version as suggested by the document itself. > > Tested on beaglebone black. > > [1] > https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 > Signed-off-by > : > Dario Binacchi > --- > configs/beaglebone_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig > index 639b491e9746..dff7dea422ee 100644 > --- a/configs/beaglebone_defconfig > +++ b/configs/beaglebone_defconfig > @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c > board/beaglebone/genimage.cfg" > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call > github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call > github,beagleboard,linux,5.10.145-ti-r54)/linux-5.10.145-ti-r54.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack > am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless > am335x-bonegreen-wireless" > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From christian at paral.in Mon Feb 6 05:11:06 2023 From: christian at paral.in (Christian Stewart) Date: Sun, 5 Feb 2023 21:11:06 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/balena-engine: bump to version 20.10.26 In-Reply-To: <20230205153552.GS2960@scaer> References: <20230202132650.1537778-1-christian@paral.in> <20230205153552.GS2960@scaer> Message-ID: Yann, On Sun, Feb 5, 2023, 7:36 AM Yann E. MORIN wrote: > Christian, All, > > On 2023-02-02 05:26 -0800, Christian Stewart via buildroot spake thusly: > > This update requires a workaround for the non-standard vendor/ structure > in the > > balena-engine repository, which has an invalid vendor/modules.txt file. > > > > Removing the vendor/modules.txt file fixes the build error. > > > > Reference: > https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > > > > The go download post-process script uses go mod init to create the > go.mod file > > That's not correct. The download go-post-process script does not run > that command at all. > My mistake, I had a commit in my working branch that adds go mod init if the go.mod doesn't exist. Thanks, Christian > -------------- next part -------------- An HTML attachment was scrubbed... URL: From me at stevenhay.com Mon Feb 6 05:27:12 2023 From: me at stevenhay.com (=?UTF-8?B?yo7JkEggx53KjMedyodT?=) Date: Mon, 6 Feb 2023 00:27:12 -0500 Subject: [Buildroot] [PATCH 2/2] support/scripts/graph-depends allow for forward and reverse depends on same graph In-Reply-To: <20230123231224.3772679-2-me@stevenhay.com> References: <20230123231224.3772679-2-me@stevenhay.com> Message-ID: All, Wanted to bump this email thread to see what we think of the second part (the meat) of this patch. On 1/23/23 6:12 PM, Steve Hay wrote: > The current implementation of buildroot depe dependency graphing > either does forward- or reverse-dependency traversal. > > This patch enables buildroot to graph forward and reverse dependencies on the > graph for the same package: (Diagram Credit: Yann E. MORRIN) > > $ make pkg-d-graph-both-depends > > pkg A -. .-> pkg E > \ / > pkg B ----> pkg D ----> pkg F > / \ > pkg C -' '-> pkg G > > In the above example a single graph shows pkg {A,B,C} are needed > by pkg D, and pkg D is a dependency of pkg {E,F,G}. > > The variables DEPTH and RDEPTH can be passed into the graphing functions to > specify the maximum depths of direct and reverse dependencies to control graph > size. > > Makefile documentation is also updated. > > Signed-off-by: Steve Hay > > --- > Changes v1 -> v2: > - Enhanced patch description. (Yann) > - Added Makefile documentation. (Yann) > - Completed the implementation of graph-both-depends. (Yann) > - Added ability to control depth of the generated graph. > - Ensured both forward and reverse dependencies are checked for --check-only case. (Yann) > --- > Makefile | 7 ++++ > package/pkg-generic.mk | 7 +++- > support/scripts/graph-depends | 69 ++++++++++++++++++++++------------- > 3 files changed, 55 insertions(+), 28 deletions(-) > > diff --git a/Makefile b/Makefile > index 8517d563d5..e47544fd42 100644 > --- a/Makefile > +++ b/Makefile > @@ -1163,7 +1163,14 @@ help: > @echo ' -show-recursive-rdepends' > @echo ' - Recursively list packages which have as a dependency' > @echo ' -graph-depends - Generate a graph of '\''s dependencies' > + @echo ' DEPTH, if set on the command line, is used to specify maximum' > + @echo ' depth to graph dependencies.' > @echo ' -graph-rdepends - Generate a graph of '\''s reverse dependencies' > + @echo ' RDEPTH, if set on the command line, is used to specify maximum' > + @echo ' depth to graph reverse dependencies.' > + @echo ' -graph-both-depends' > + @echo ' - Generate a graph of both '\''s forward and' > + @echo ' reverse dependencies. DEPTH and RDEPTH work as described above.' > @echo ' -dirclean - Remove build directory' > @echo ' -reconfigure - Restart the build from the configure step' > @echo ' -rebuild - Restart the build from the build step' > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 2f8ba39edf..6ddb304a12 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -1031,10 +1031,13 @@ $(1)-show-info: > $$(info $$(call clean-json,{ $$(call json-info,$(2)) })) > > $(1)-graph-depends: graph-depends-requirements > - $(call pkg-graph-depends,$(1),--direct) > + $(call pkg-graph-depends,$(1),--direct --depth $(or $(DEPTH),0)) > > $(1)-graph-rdepends: graph-depends-requirements > - $(call pkg-graph-depends,$(1),--reverse) > + $(call pkg-graph-depends,$(1),--reverse --rdepth $(or $(RDEPTH),0)) > + > +$(1)-graph-both-depends: graph-depends-requirements > + $(call pkg-graph-depends,$(1),--direct --reverse --depth $(or $(DEPTH),0) --rdepth $(or $(RDEPTH),0)) > > $(1)-all-source: $(1)-source > $(1)-all-source: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-source) > diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends > index 3e3373950f..0285afb46d 100755 > --- a/support/scripts/graph-depends > +++ b/support/scripts/graph-depends > @@ -159,11 +159,11 @@ def check_circular_deps(deps): > > # This functions trims down the dependency list of all packages. > # It applies in sequence all the dependency-elimination methods. > -def remove_extra_deps(deps, rootpkg, transitive, arrow_dir): > +def remove_extra_deps(deps, rootpkg, transitive, direct): > # For the direct dependencies, find and eliminate mandatory > # deps, and add them to the root package. Don't do it for a > # reverse graph, because mandatory deps are only direct deps. > - if arrow_dir == "forward": > + if direct: > for pkg in list(deps.keys()): > if not pkg == rootpkg: > for d in get_mandatory_deps(pkg, deps): > @@ -197,14 +197,16 @@ def print_attrs(outfile, pkg, pkg_type, pkg_version, depth, colors): > outfile.write("%s [color=%s,style=filled]\n" % (name, color)) > > > + > # Print the dependency graph of a package > def print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, > - arrow_dir, draw_graph, depth, max_depth, pkg, colors, done_deps=None): > + direct, draw_graph, depth, max_depth, pkg, colors, done_deps=None): > if done_deps is None: > done_deps = [] > if pkg in done_deps: > return > done_deps.append(pkg) > + > if draw_graph: > print_attrs(outfile, pkg, dict_types[pkg], dict_versions[pkg], depth, colors) > elif depth != 0: > @@ -231,9 +233,12 @@ def print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exc > break > if add: > if draw_graph: > - outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(pkg), pkg_node_name(d), arrow_dir)) > + if direct: > + outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(pkg), pkg_node_name(d), "forward")) > + else: > + outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(d), pkg_node_name(pkg), "forward")) > print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, > - arrow_dir, draw_graph, depth + 1, max_depth, d, colors, done_deps) > + direct, draw_graph, depth + 1, max_depth, d, colors, done_deps) > > > def parse_args(): > @@ -246,6 +251,8 @@ def parse_args(): > help="Graph the dependencies of PACKAGE") > parser.add_argument("--depth", '-d', metavar="DEPTH", dest="depth", type=int, default=0, > help="Limit the dependency graph to DEPTH levels; 0 means no limit.") > + parser.add_argument("--rdepth", metavar="RDEPTH", dest="rdepth", type=int, default=0, > + help="Limit the dependency graph to DEPTH levels; 0 means no limit.") > parser.add_argument("--stop-on", "-s", metavar="PACKAGE", dest="stop_list", action="append", > help="Do not graph past this package (can be given multiple times)." + > " Can be a package name or a glob, " + > @@ -265,9 +272,9 @@ def parse_args(): > default=False) > parser.add_argument("--no-transitive", dest="transitive", action='store_false', > help="Draw (do not draw) transitive dependencies") > - parser.add_argument("--direct", dest="direct", action='store_true', default=True, > + parser.add_argument("--direct", dest="direct", action='store_true', default=False, > help="Draw direct dependencies (the default)") > - parser.add_argument("--reverse", dest="direct", action='store_false', > + parser.add_argument("--reverse", dest="reverse", action='store_true', default=False, > help="Draw reverse dependencies") > parser.add_argument("--quiet", '-q', dest="quiet", action='store_true', > help="Quiet") > @@ -292,6 +299,9 @@ def main(): > sys.exit(1) > outfile = open(args.outfile, "w") > > + if not args.direct and not args.reverse: # select default direct if none is specified. > + args.direct = True > + > if args.package is None: > mode = MODE_FULL > rootpkg = 'all' > @@ -312,13 +322,9 @@ def main(): > if args.exclude_mandatory: > exclude_list += MANDATORY_DEPS > > - if args.direct: > - arrow_dir = "forward" > - else: > - if mode == MODE_FULL: > - logging.error("--reverse needs a package") > - sys.exit(1) > - arrow_dir = "back" > + if args.reverse and mode == MODE_FULL: > + logging.error("--reverse needs a package") > + sys.exit(1) > > draw_graph = not args.flat_list > > @@ -330,23 +336,34 @@ def main(): > logging.error("Error: incorrect color list '%s'" % args.colors) > sys.exit(1) > > - deps, rdeps, dict_types, dict_versions = brpkgutil.get_dependency_tree() > - dict_deps = deps if args.direct else rdeps > - > - check_circular_deps(dict_deps) > - if check_only: > - sys.exit(0) > - > - dict_deps = remove_extra_deps(dict_deps, rootpkg, args.transitive, arrow_dir) > > # Start printing the graph data > - if draw_graph: > + if not check_only and draw_graph: > outfile.write("digraph G {\n") > > - print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, > - arrow_dir, draw_graph, 0, args.depth, rootpkg, colors) > + deps, rdeps, dict_types, dict_versions = brpkgutil.get_dependency_tree() > > - if draw_graph: > + # forward > + if args.direct: > + dict_deps = deps > + direct = True > + check_circular_deps(dict_deps) > + if not check_only: > + dict_deps = remove_extra_deps(dict_deps, rootpkg, args.transitive, direct) > + print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, > + direct, draw_graph, 0, args.depth, rootpkg, colors) > + > + # reverse > + if args.reverse: > + dict_deps = rdeps > + direct = False > + check_circular_deps(dict_deps) > + if not check_only: > + dict_deps = remove_extra_deps(dict_deps, rootpkg, args.transitive, direct) > + print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, > + direct, draw_graph, 0, args.rdepth, rootpkg, colors) > + > + if not check_only and draw_graph: > outfile.write("}\n") > else: > outfile.write("\n") From maxime.chevallier at bootlin.com Mon Feb 6 07:34:45 2023 From: maxime.chevallier at bootlin.com (Maxime Chevallier) Date: Mon, 6 Feb 2023 08:34:45 +0100 Subject: [Buildroot] [PATCH 1/4] package/libtraceevent: new package In-Reply-To: References: Message-ID: <20230206083445.4ad1e510@pc-7.home> Hello Andreas, On Sun, 05 Feb 2023 09:20:15 +0100 Andreas Ziegler wrote: > Hi Maxime, > > libtraceevent and libtracefs are libraries, thus should be positioned > under "Target packages" -> "Libraries". Oops my bad, I should have put them there indeed. > Introducing a "Debugging, profiling and benchmark" category here > would probably be appropriate. Good idea ! > Tested successfully on x86_64 hardware. Thanks a lot ! I'll respin with the proposed changes then. Best regards, Maxime > Kind regards, > Andreas > > On 2023-01-30 18:44, Maxime Chevallier wrote: > > > > Introduce the libtraceevent library, that used to be bundled with > > the trace-cmd tool. This library is now used by several tools and > > libraries such as trace-cmd, libtracefs and rtla. > > > > This package tries to install libraries in /usr/local/lib by > > default, hence the redefinition of the "prefix" variable, so that > > the library gets installed in "/usr/lib" instead. > > > > The same applies to the pkgconfig handling of the proved Makefile, > > which > > installs the .pc files in the /usr/local area by default, hence the > > redefinition of the pkgconfig_dir to either the correct directory > > within the > > staging area, or to empty value for the target to avoid installing > > the .pc > > in that case. > > > > Signed-off-by: Maxime Chevallier > > --- > > DEVELOPERS | 3 +++ > > package/Config.in | 1 + > > package/libtraceevent/Config.in | 9 +++++++ > > package/libtraceevent/libtraceevent.mk | 33 > > ++++++++++++++++++++++++++ 4 files changed, 46 insertions(+) > > create mode 100644 package/libtraceevent/Config.in > > create mode 100644 package/libtraceevent/libtraceevent.mk > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index 706ee80ece..fcf05e0aa0 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -2106,6 +2106,9 @@ F: package/postgresql/ > > F: package/protozero/ > > F: package/timescaledb/ > > > > +N: Maxime Chevallier > > +F: package/libtraceevent/ > > + > > N: Michael Durrant > > F: board/arcturus/ > > F: configs/arcturus_ucp1020_defconfig > > diff --git a/package/Config.in b/package/Config.in > > index 83fddf316f..2f0e6dcb18 100644 > > --- a/package/Config.in > > +++ b/package/Config.in > > @@ -117,6 +117,7 @@ menu "Debugging, profiling and benchmark" > > source "package/kyua/Config.in" > > source "package/latencytop/Config.in" > > source "package/libbpf/Config.in" > > + source "package/libtraceevent/Config.in" > > source "package/lmbench/Config.in" > > source "package/lsof/Config.in" > > source "package/ltp-testsuite/Config.in" > > diff --git a/package/libtraceevent/Config.in > > b/package/libtraceevent/Config.in > > new file mode 100644 > > index 0000000000..d351e3b4de > > --- /dev/null > > +++ b/package/libtraceevent/Config.in > > @@ -0,0 +1,9 @@ > > +config BR2_PACKAGE_LIBTRACEEVENT > > + bool "libtraceevent" > > + help > > + libtraceevent is a library that interfaces with the > > ftrace > > + subsystem in the linux kernel. > > + It used to be bundled directly in the trace-cmd > > + tool, but it was eventually extracted so that it can be > > used > > + by multiple other tools and libraries, such as > > libtracefs and > > + rtla. From maxime.chevallier at bootlin.com Mon Feb 6 07:39:31 2023 From: maxime.chevallier at bootlin.com (Maxime Chevallier) Date: Mon, 6 Feb 2023 08:39:31 +0100 Subject: [Buildroot] [PATCH 3/4] package/linux-tools: add rtla In-Reply-To: References: Message-ID: <20230206083931.759b3ee3@pc-7.home> Hello Andreas, On Sun, 05 Feb 2023 09:22:56 +0100 Andreas Ziegler wrote: > Hi Maxime, > > I was able to build RTLA after some adaptions, see below. Thanks for the effort, I appreciate ! > On 2023-01-30 18:44, Maxime Chevallier wrote: > > > > The RealTime Linux Analysis tool includes a set of commands that > > relies on the osnoise and timerlat tracers from the ftrace kernel > > subsystem, allowing to analyze the lantency sources coming from the > > hardware and the kernel itself. > > > > This tool was introduced in v5.17, and relies on libtracefs and > > libtraceevent, although libtraceevent itself is already a > > dependency for > > libtracefs. > > > > Signed-off-by: Maxime Chevallier > > --- > > DEVELOPERS | 1 + > > package/linux-tools/Config.in | 10 +++++++ > > package/linux-tools/linux-tool-rtla.mk.in | 32 > > +++++++++++++++++++++++ 3 files changed, 43 insertions(+) > > create mode 100644 package/linux-tools/linux-tool-rtla.mk.in > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index fe7194f817..8f459c796a 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -2109,6 +2109,7 @@ F: package/timescaledb/ > > N: Maxime Chevallier > > F: package/libtraceevent/ > > F: package/libtracefs > > +F: package/linux-tools/linux-tool-rtla.mk.in > > > > N: Michael Durrant > > F: board/arcturus/ > > diff --git a/package/linux-tools/Config.in > > b/package/linux-tools/Config.in > > index 8a0b6d5802..186392b816 100644 > > --- a/package/linux-tools/Config.in > > +++ b/package/linux-tools/Config.in > > @@ -102,6 +102,16 @@ config > > BR2_PACKAGE_LINUX_TOOLS_PERF_NEEDS_HOST_PYTHON3 > > > > endif > > > > +config BR2_PACKAGE_LINUX_TOOLS_RTLA > > + bool "rtla" > > Since a version dependency exists, you might add: > depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 Good call ! > > + select BR2_PACKAGE_LINUX_TOOLS > > + select BR2_PACKAGE_LIBTRACEFS > > + help > > + Linux 5.17 and later has 2 new tracers, osnoise and > > timerlat. > > + There tracers allow performing latency analysis, for > > which > > + the rtla tool provides wrapper commands to visualize and > > + extrace latency traces and reports. > > + > > config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS > > bool"selftests" > > depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash > > diff --git a/package/linux-tools/linux-tool-rtla.mk.in > > b/package/linux-tools/linux-tool-rtla.mk.in > > new file mode 100644 > > index 0000000000..a736e3b785 > > --- /dev/null > > +++ b/package/linux-tools/linux-tool-rtla.mk.in > > @@ -0,0 +1,32 @@ > > +################################################################################ > > +# > > +# rtla > > +# > > +################################################################################ > > + > > +LINUX_TOOLS += rtla > > + > > +RTLA_DEPENDENCIES = host-pkgconf libtracefs > > RTLA needs some kernel features; better to include them here, saves > time experimenting: > > # linux kernel needs FTRACE, TIMERLAT_TRACER, HIST_TRIGGERS for RTLA > to work > ifeq ($(BR2_PACKAGE_LINUX_TOOLS_RTLA),y) > define RTLA_LINUX_CONFIG_FIXUPS > $(call KCONFIG_ENABLE_OPT,CONFIG_FTRACE) > $(call KCONFIG_ENABLE_OPT,CONFIG_TIMERLAT_TRACER) > $(call KCONFIG_ENABLE_OPT,CONFIG_HIST_TRIGGERS) > endef > endif Oh I wasn't aware that we could enable kernel options that way. I'll include them in the v2, along with CONFIG_OSNOISE_TRACER that is also required. > > +RTLA_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ > > + CC=$(TARGET_CC) \ > > + LDFLAGS="$(TARGET_LDFLAGS)" \ > > + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig > > + > > The RTLA Makefile unconditionally compiles with stack smashing > protection; linking fails on builds configured without this feature: > > # adapted from linux-tool-tmon.mk.in > ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) > define RTLA_DISABLE_STACK_PROTECTOR > $(SED) 's/-fstack-protector.* //' > $(LINUX_DIR)/tools/tracing/rtla/Makefile > endef > endif Good catch too, I didn't see that. > > +define RTLA_BUILD_CMDS > > + $(Q)if ! grep install > > $(LINUX_DIR)/tools/tracing/rtla/Makefile > > >/dev/null 2>&1 ; then \ > > + echo "Your kernel version is too old and does not > > implement the rtla tool." ; \ > > + echo "At least kernel 5.17 must be used." ; \ > > + exit 1 ; \ > > + fi > > + > > $(RTLA_DISABLE_STACK_PROTECTOR) > > > + $(TARGET_MAKE_ENV) \ > > + $(MAKE) $(RTLA_MAKE_OPTS) \ > > + -C $(LINUX_DIR)/tools/tracing rtla > > +endef > > + > > +define RTLA_INSTALL_TARGET_CMDS > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/tracing \ > > + $(RTLA_MAKE_OPTS) \ > > + DESTDIR=$(TARGET_DIR) \ > > + rtla_install > > +endef > > rtla_install fails with: > Makefile:34: *** NOTICE: rst2man required to generate man pages. > Stop. because it tries to build and install man pages also. Better to > use a custom install command: > > # The rtla_install target tries to create and install manpages, > # which terminates with an error and cannot be disabled > define RTLA_INSTALL_TARGET_CMDS > $(INSTALL) -m 0755 -D $(LINUX_DIR)/tools/tracing/rtla/rtla \ > $(TARGET_DIR)/usr/bin/rtla > endef Ok makes sense as well :) Thanks a lot for the review, tests and fixes ! Maxime > Kind regards, > Andreas > > > -- > > 2.39.1 From fontaine.fabrice at gmail.com Mon Feb 6 08:12:22 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 6 Feb 2023 09:12:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: security bump to version 5.0.2 In-Reply-To: <87y1pbwwdl.fsf@dell.be.48ers.dk> References: <20230120192846.7362-1-fontaine.fabrice@gmail.com> <87y1pbwwdl.fsf@dell.be.48ers.dk> Message-ID: Hello, Le lun. 6 f?vr. 2023 ? 00:00, Peter Korsgaard a ?crit : > >>>>> "Fabrice" == Fabrice Fontaine writes: > > > - Fix CVE-2022-47952: lxc-user-nic in lxc through 5.0.1 is installed > > setuid root, and may allow local users to infer whether any file > > exists, even within a protected directory tree, because "Failed to > > open" often indicates that a file does not exist, whereas "does not > > refer to a network namespace path" often indicates that a file exists. > > NOTE: this is different from CVE-2018-6556 because the CVE-2018-6556 > > fix design was based on the premise that "we will report back to the > > user that the open() failed but the user has no way of knowing why it > > failed"; however, in many realistic cases, there are no plausible > > reasons for failing except that the file does not exist. > > - Drop patches (already in version) > > > Signed-off-by: Fabrice Fontaine > > Committed to 2022.11.x, thanks. > > I see that there isn't a new 4.0.x release. Do you know if 4.0.x is also > vulnerable to this issue? > To my understanding 4.0.x is also vulnerable. https://github.com/lxc/lxc/commit/1b0469530d7a38b8f8990e114b52530d1bf7f3b8 should be backported. > > -- > Bye, Peter Korsgaard > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Mon Feb 6 06:48:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 06 Feb 2023 06:48:05 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-05 Message-ID: <20230206064813.9B98D81587@smtp1.osuosl.org> Hello, Autobuild statistics for 2023-02-05 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 4 | 2 | 0 | 6 | 2022.11.x | 10 | 8 | 0 | 18 | master | 151 | 190 | 2 | 343 | Classification of failures by reason for master ----------------------------------------------- host-sentry-cli-2.8.0 | 9 host-pahole-1.24 | 8 norm-1.5.8 | 8 host-binutils-2.38 | 7 xz-5.2.10 | 7 libgcrypt-1.10.1 | 6 linux-6.1.9 | 6 xxhash-0.8.1 | 6 libfuse3-3.13.0 | 5 python-numpy-1.23.5 | 5 unknown | 5 bash-5.2.15 | 4 gerbera-1.10.0 | 4 host-binutils-2.39 | 4 host-go-1.19.5 | 4 jack2-1.9.21 | 4 dmalloc-5.6.5 | 3 fontconfig-2.13.1 | 3 glibc-2.36-81-g4f4d7a13edfd... | 3 gobject-introspection-1.72.0 | 3 libglib2-2.72.3 | 3 libgpg-error-1.46 | 3 python-bunch-1.0.1 | 3 python-cryptography-39.0.0 | 3 cairo-1.16.0 | 2 dahdi-linux-3.2.0 | 2 fdk-aac-2.0.2 | 2 gobject-introspection | 2 host-binutils-2.37 | 2 host-rust-1.66.1 | 2 libcap-ng-0.8.3 | 2 linux-5.10.145-cip17 | 2 optee-client-3.19.0 | 2 sdl-1.2.15 | 2 ssdp-responder-1.9 | 2 uccp420wlan-6.9.1 | 2 zabbix-5.4.9 | 2 apcupsd-3.14.14 | 1 assimp-5.2.5 | 1 avro-c-1.11.1 | 1 brltty-6.5 | 1 btrfs-progs-5.16.2 | 1 efivar-38 | 1 elfutils-0.186 | 1 file-5.43 | 1 flann-1.9.2 | 1 frr-8.4.2 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gdb-11.2 | 1 gdb-12.1 | 1 google-breakpad-c85eb4a59b6... | 1 gst1-plugins-bad-1.22.0 | 1 host-gcc-final-12.2.0 | 1 host-libarchive-3.6.2 | 1 json-c-0.16 | 1 libcamera-v0.0.3 | 1 libdeflate-1.15 | 1 libnss-3.87 | 1 libusb-1.0.26 | 1 linux-5.10.145-cip17-rt7 | 1 ltp-testsuite-20220930 | 1 luaossl-20220711-0 | 1 lxc-5.0.2 | 1 mongodb-4.2.18 | 1 nginx-1.22.1 | 1 ntp-4.2.8p15 | 1 ocf-linux-20171122 | 1 openssh-9.1p1 | 1 opus-1.3.1 | 1 pv-1.6.20 | 1 python-bcrypt-4.0.1 | 1 qemu-7.2.0 | 1 quickjs-2021-03-27 | 1 reaver-1.6.6 | 1 rtl8192eu-94bce7798bbb18de6... | 1 sysrepo-2.2.12 | 1 toolchain-external-codescap... | 1 uclibc-1.0.42 | 1 uclibc-ng-test-6790eafe897b... | 1 v4l2loopback-0.12.7 | 1 valgrind-3.19.0 | 1 xlib_libX11-1.8.3 | 1 xvisor-0.3.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/3832c21085e76b9665ed4fe75624306060d0c002 | mips64el | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/3b392951da8677740607f73338a5bece2cf10259 | ORPH arm | avro-c-1.11.1 | NOK | http://autobuild.buildroot.net/results/987b14bc901e7180a48c2035a2821742ef8c0916 | i686 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/d8649a9dd3a52e530683c898047a967b490eec12 | ORPH xtensa | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/1cb032cf506d9e01743f9670c7fafd817e25a97c | ORPH i686 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/10d8f9d0fe5d97127f9a1d0bf479046b9e12b225 | ORPH m68k | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/f48a929c2739ab6d60666058e06801e197fc8964 | ORPH mipsel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/c5d2e20abe527198a04c765712f1df985ef5e5d1 | or1k | btrfs-progs-5.16.2 | NOK | http://autobuild.buildroot.net/results/794ac9108b5f2eaa86b4972c2de7ccd46058e904 | ORPH xtensa | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/aaa0322c0abdfd607a53e1930c2bec490fb2b91d | aarch64 | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/435fd155486527fee8bd30ebad016339c8f2a588 | i686 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/e480672a234b3b0b5ab5b3a4be159a02822d40dd | riscv32 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/ad6cd06bcb2dceedce4a13bc91f06085bfa147d2 | i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/2c5d7ec02909fb6b8ebc715f1c60ee58febce47f | ORPH powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/e0ce7b79036ba3d3b7900a52ee43aa9f06762467 | ORPH powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/1c707222000653b5ba4a3f36d035eb7048276b4a | ORPH aarch64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/af198e32b6856d63f78c61a5ca5a8edaeea2316b | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/cc0292a4fc02ef18c16d95472c1afc76955f73fd | ORPH mips | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/eeca556a608d0dffb685b0eca6c15239297eca50 | mips | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/cf1073e00b83a39874d2d4cf743e71cc5d098805 | mips | file-5.43 | NOK | http://autobuild.buildroot.net/results/d44a730c32c8da5ae664521ce4d565dc77c8f499 | ORPH arm | flann-1.9.2 | NOK | http://autobuild.buildroot.net/results/da16a49d2d369746fc06efcb2babc5c9b32b866d | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/7daecb1688eb7214c4557ce1024bb028784901a1 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/b40bcdbbc322cdb16d1c4d9db9481bfd58d9d850 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/8e35acb503c0eeac01b52587bb7526a7cfdf0647 | ORPH xtensa | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/4d889b1ce86f71d066811f0e05dec2fef3fabf92 | or1k | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/ae01ee4ebf8bc2bbffea52236ccd0a121f3c436b | mips | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/0d8827576461ef6efaed98429443862a9b9cb604 | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/58596249090f2b2ea1ea53fd14c6d40978cefa9c | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/037b272e8c5ec1934fa8737f36a5e8a693c38fd6 | mipsel | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/f22bd07edab4fab8ce26dfb0370d38010b54524e | arm | gdb-11.2 | NOK | http://autobuild.buildroot.net/results/1a956256f5bd5df7f8f392c1d79dd68138993ca2 | ORPH or1k | gdb-12.1 | NOK | http://autobuild.buildroot.net/results/87426441a1e224766ce058c09928703a30974a25 | ORPH armeb | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/0099c1b1196b552351e7cacf925fcfc80b5d256b | mips64el | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/091a699816c4ee08205761ffc3540713fac0a23e | sparc64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/b1c729d9bd773bbee6f38cbb577f6b7b2351cca1 | xtensa | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/90cc79c560fced58497fed9d95a849ae517e579b | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/ec9a7aae2e32d38c39e5c1b7c4651e7515890112 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/61e09ff86380a9f03715d28f5e6c25a6db664c07 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/c3d626e048a1cb30b802aea40f3b827ff0883e19 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/d763904f84668d04cafa8b7bd8daf07034a94e0f | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/277fa0b59d6d9700f3b476f6bfe60687aa5f3a81 | microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0cc842dce82a9d1a7fbfeb4a90b12563872d28c9 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/a305cbd2c00264cd2e03b14256a30b18542561c3 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1b21440e836a55453d137ca34fa5f72504e6fafe | ORPH mips | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/b3dc6c793cf99c1bf8a28d30be45033620cd6de4 | mips | gst1-plugins-bad-1.22.0 | NOK | http://autobuild.buildroot.net/results/d70e31761cff8f6cf39785b2da8d9102b3ec03a5 | ORPH microblaze | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/04057155d39af416cce807b1886e525af9b2c4c3 | mips64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/37e8e89809525ae0c8e1435320e95b6930600936 | i686 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/ce52bc61d2fcf18b3fd793b070e6f1174747706a | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/40b1ddbeaddfe62b683216237603d6ab9cdbc7db | sparc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/af7e8d6786a4efbbf5aafb327ad265afc86f20a8 | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6fb2e6d61324044f45d0d8e556466081e4d304ca | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/19223dcd22c299c9dd76ac6f2fbf2059f9277c67 | armeb | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/07c0c75efb056a7e03d1c458d231a47d95328cf4 | sparc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/c3a5a51d9d1f2d4e7e6658781031577ec057b6de | powerpc64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/bce42afe933c576735dcce149b328a9414cfad06 | aarch64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/d76b13b3ced94d2deac45cc48e0956e6ccbbad83 | nios2 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/abaf8096af73d2366615e65025d51c319095a98d | aarch64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/17ef5e0d68dced6cb1d82047c8299909b3dac8b7 | microblazeel | host-gcc-final-12.2.0 | NOK | http://autobuild.buildroot.net/results/0f6a5af8708f3dd48e3a88b74e977d43a2cf4320 | powerpc64le | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/bb6841ed3924a7097836bd26e97d43e4849239c4 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/2388a38a8ecbac494ffa8a14f73faa15199e32cf | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/2781982e8cb013a95e624bd53dd6313e8c6d895c | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/587b7f06cf598b5cbfb6007f503de8c0732b8590 | xtensa | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/03417616aeb6f78a74ef30d84c90e94c7447ab8e | microblazeel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/0979d0e6df6f2f3b67ce948f654950d3060abca2 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8d840685051a600acd4fb527a51f226555a90c4b | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1acc37eca729ecfc57000249db48b99ba99301d3 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/309912b3ade150ba6eb2b0f3300fa3eeb89ff65d | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c5eda5e31b73e5b9a52b27028db1a86190e7b11a | arceb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/bb0917d255b1636fa78cd99c8043211a738f7e33 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/370eb758b38f13bd6f51f89ef6c94718c632f425 | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/04e40ee7ba838eaac8d7fce0ef84c9e2d83940cb | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/7b2e6ef33e47f85908d562042d5e0815aa42ca8f | aarch64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/eb69113bf18912632058d958cba95845a6abe35f | xtensa | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/459f31f842c7dc9f9e36835cfd6182698125dc38 | s390x | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/42ba8bdcdc271ab88cd0737b0ab2eace51353687 | microblazeel | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/fde8ad38cdf510f280a842cee7570dcc01897167 | mips | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/bbf1366a0b723d3dfd5679c03e36c4c3c3aeb538 | arm | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/4699b885c683d014c281935feaff5219096a2794 | armeb | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/8f88e4664407d6c85d17db185411fb6f081b643b | x86_64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/f969a5f654e20923056830531a59c1c310c418df | powerpc64le | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/032bb50f1bce3734199b4b1bef2e646764d3c5f6 | mips64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/3829916afe08915bd59d62425bd7f645b352b932 | mips64el | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/3458b86ae002b9112d96eed55e5d0cae879f57b2 | mips64el | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/605e52c6de5cca6783d4a1d679605160cc2515e4 | mips64el | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/d57bf1299c6c22e546180d6f5b5b48ee13a24b4b | powerpc | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/07ce27491d81a58ed737336cfb724a57bc9804ed | or1k | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/c6e3068fb40ad0e0dc2294023f9650664d2364b3 | arc | libcamera-v0.0.3 | NOK | http://autobuild.buildroot.net/results/8636f7c12684cb69c0f8e67aad933b46585ea4e5 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/cc77bfc19479dc8ef706c81a5f46cb322f1ae886 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/7fb1d5c255247bd857e1256f5c58f3282a8b0b99 | arm | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/5d48a382ed025446e5e0a6c5a817a672a0ca918b | or1k | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/0fc8e2525402545265d8c73f285b2eb9d0877bff | powerpc64le | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/7a96fc5e9e5f16d9a857036da3ee866c64896cae | mips64el | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/7b9cf69328ff68244c9d4fc100101c5b209d332c | x86_64 | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/64183c8264f5937b0bd1cb34d6cab1794ea0a75a | sh4a | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/28466fd93ff40073d2e929b9b77a033c30e2cb8c | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/7ee72221e3de1b8f3e1cbf42ce200ea0d4c199ca | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/d3967cccf472b4f2e9f716ee4b3c787e0ba6a587 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/c4ffd86ec73ef2757fd6708dd5be42f04b9975a2 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/80a46b03c4eb2c2deb6f8ac7c39d5fdd955142c7 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/b3bc43f46eebefebe615ab5c7226c4379b3d1146 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/a59cb3b33b01e7fda7cdfdffbe634a8e3c7f2c4f | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/ffe7dc310c2d502386d4e68ff3d09819f0750c3c | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/3a80d80ef05742c6b1b0e3a007ae6d88a5873af9 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/3b66a55f2b87761b498b749325781faf298a1f98 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/1773b4399427cc3fffbf98b0a6e010769422f94e | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/f189bd3f656bc3b5e561f2201eca9e12f868f249 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/e84f1f57e5b6bf5a5575bc0bc0899db9016f4c81 | ORPH mipsel | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/3b19d4c49b2fa3d7d1a2c6d28245f8c0da1379c2 | or1k | libusb-1.0.26 | NOK | http://autobuild.buildroot.net/results/a7acfc486325f3fb130f4f3003ea99693d3d1147 | mips64el | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/7598abe2a7989d051d3e3df979933de173e1e65b | ORPH mips64el | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/973bfab0f642b1e0f59dc52b08173cd3d55b873f | ORPH sh4eb | linux-5.10.145-cip17-rt7 | NOK | http://autobuild.buildroot.net/results/e6c1835585b88e90e925083aad64dc7e0e655b8c | ORPH mipsel | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/090aa793b9c8e3f16a579c115f910497bd08ba2a | ORPH s390x | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/e2e33d29ee661b3ef8f33582a49383c8a5258f26 | ORPH powerpc | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/26806b0b0d11a87fbab3724eb6c275cccf653c62 | ORPH powerpc | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/b872d0648b3361c7757dc8e6d05338fadff9947b | ORPH mips64el | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/ca1e25396b6771fcf873abf8e191caadbc13ab0a | ORPH mips | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/768eef80d45a116d3777b5ecb3adac2204887d93 | ORPH sh4aeb | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/8533505a9c57d14f07ab2653ae7a5dc9d87a24ed | mips64 | luaossl-20220711-0 | NOK | http://autobuild.buildroot.net/results/99fa02f9f5c30b73eaf5c39cffc6186fddd06d8b | aarch64_be | lxc-5.0.2 | NOK | http://autobuild.buildroot.net/results/24744227b60482cc23722ed97c6a8252f7b1cff9 | x86_64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/4dfdab874db6c131c53281073b6b58c9b11901d5 | aarch64_be | nginx-1.22.1 | NOK | http://autobuild.buildroot.net/results/502ad9e7c43c5063570df4be1de98a5337e1fd62 | x86_64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/4db61be83e36e80ee7cd5e0f4bb2430d9519bcd1 | ORPH powerpc64le | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/b99af474df5011cc442082cddd002a1c6df1adea | ORPH or1k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/f3c236942d13443c564585ad6e5105bf9a1e8907 | ORPH aarch64_be | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/c12640f2b7416ccbcd153552f34095bb3c27fdea | ORPH powerpc64le | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/bdac7e1d91e8d287c190d41d26928674cb2cd1cf | ORPH arm | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/139bcd6e45cdd9ccc02d790348baff5e2c960910 | ORPH nios2 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/11f6b5c24eb451dd42ac7ab8d1ea055491752bbe | ORPH s390x | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/93104b6cb419c96733862bbebcd17df35f8c731c | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/8518b300aea3b95b6e51936722431f2c7f39e80b | ORPH mips64el | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/a05ff6e7346ded81b51068da3e5662d2084142b0 | ORPH m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/7e27e0260c7d5ae78563e71358868db0a475b061 | ORPH m68k | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/194d24815391641a040098c7de43cdf8362087b1 | arm | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/50f080175a712c305e8a05c26638baf10d165c49 | armeb | opus-1.3.1 | NOK | http://autobuild.buildroot.net/results/0b2fbaae3cd4cbb1a12ae2b71a944dbd400a01b1 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/81d6fe0b72aace546ad0e5c38ca1cf7b89d018a9 | ORPH powerpc64le | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/35c50b0658a886cee240b64234df68920d7b63a3 | arm | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/8181a52415c1fc20ec3ee14fb52fa031c3faa454 | powerpc64le | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/0ff85bd3ea1ffd895173611a95a36acb4f8953b5 | sparc | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/529bf997ef153fd73531e9d1b174495a7aa60a75 | arm | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/ad03fed3920482a850b3514b7cdbdf198b1a7b3d | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/f4a33c7026a02444aa5056b42e9e1c24662772f6 | mipsel | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/f28c8e813e1b0ac0dc171d6b957afe62ba078bbf | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/cc871b20ac3862223d5020a9a616eff22a302a3d | armeb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/726de085dea6b96fe0db57c2ecc5a40d686524e3 | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/40e49899712a723ad425fa56c101826148daa875 | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/afe370554ff1c2f375fdd373c0eac4f5c36a5d91 | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/1fc275b905ceea815c410d61e91de24963d17a63 | mipsel | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/27bec47e903a40c2aea451799c47f510a6524c16 | microblaze | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/87c7420e7a0bb20ca60e7842b3e8bf350e18557b | arc | reaver-1.6.6 | NOK | http://autobuild.buildroot.net/results/16a6e489bf4ff4ebccbf1897330708176054c869 | s390x | rtl8192eu-94bce7798bbb18de6... | NOK | http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2 | sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/0346bd37797e3e163f16f9d34190cd31cb3a5910 | ORPH sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/f462772aed8a85a04024442250072c5e0d78b8c4 | ORPH sh4a | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 | arc | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 | riscv32 | sysrepo-2.2.12 | NOK | http://autobuild.buildroot.net/results/3ecca1a33cbd65626267faa66f2c9892d2bc9f84 | mips64 | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/5355693ed45527c909a32691dc5d4c310eedbb48 | ORPH powerpc64le | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/a83c1e774c86b02df62cd8095382cfa6d8e2cf1c | ORPH aarch64_be | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/73b7de4994414c00ab103913e94d8fdcac72df3d | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/6aff5a8fe919ba64c184f8ba0d130de983250e66 | arm | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/02895ef56d5bc2c2d9dc2a6409c7b8e54a5b4c4f | arc | unknown | NOK | http://autobuild.buildroot.net/results/1d2446347e769d1ed81064032e413348bf57ca66 | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/9c3b8e19063f7587877fdb0598739b55abccb3e8 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/ffdd7cabff753f9446209d9544fc7e9808408042 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/6a066355c24c526a4aea5ba7ad70b18265d3999a | mips | unknown | NOK | http://autobuild.buildroot.net/results/2477c64c0d71b71a8f912fee80a7af6e76f47543 | powerpc64 | v4l2loopback-0.12.7 | NOK | http://autobuild.buildroot.net/results/6364f0688191662c50e9fc3e4efe0ba9140db39c | powerpc | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/4368c6148e79798f58aab97e945c5104e5761b06 | ORPH arm | xlib_libX11-1.8.3 | NOK | http://autobuild.buildroot.net/results/2f6ada73c2eff5c9390603d9e0b7901338068c9d | aarch64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/6fd3fc9d6f83954b02d604847ee7d2bbda77f412 | microblaze | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/a9473c9c39617831b988b92162d1c893cf724de5 | ORPH microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/6274f687793a097728dba444bf51bc44ff9832e0 | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/e277ce10904d50c0e524ea19f2c7f1cfe5fc05d5 | ORPH microblaze | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/dbc6f4cc09a58e0630903a9312b61c9038008166 | ORPH arm | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/4933d7332a277d5778e0a6062940d4ff7361b7e0 | ORPH mips64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/8fe4b97d488428edc01bd13d4e21b49daeb1b204 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/ac244b973a41f0942acf7a9ca1cba9091014b7b1 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/054257846d5fbb467a782fea1e2be594c7bdb098 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/ede695a1e2535b84f3e5f14515bb8e04c3eb3901 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/cb1f97bca1e3dc294377406dbea35d1c58226b49 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/531663887997ee8a37fe773b3dfcffa326b0e08a | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/332f446f3bb5e6627300b04a77af07cd91797817 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/681297952cff21b0e0ca4bafd7a1ba753586470f | ORPH s390x | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/c7aa6a823da12dd2db2a1295a40ede8811a4b2b4 | powerpc64le | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/2582d2d2082f12668a4abc22f39f1d1dbcc432c8 | Classification of failures by reason for 2022.02.x -------------------------------------------------- host-go-1.18.9 | 1 unknown | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | host-go-1.18.9 | NOK | http://autobuild.buildroot.net/results/6d8308e9d6868f078596834488578b8f0850a820 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/909362085c67a98983fcb90f767e02e95c944f6f | Classification of failures by reason for 2022.11.x -------------------------------------------------- gobject-introspection-1.72.0 | 1 host-go-1.19.5 | 1 host-pahole-1.24 | 1 quickjs-2021-03-27 | 1 tcf-agent-1.7.0 | 1 unknown | 1 xz-5.2.7 | 1 zabbix-5.4.9 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1a86140e3d594707e4a5c094abb0b48fb9f1437a | ORPH mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/44d224648f4bf96e01b18f4d0b33a56f5fd65520 | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/977c6264a97fcef185aa82ca23955d78026943ce | or1k | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2 | microblazeel | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/26ed04dd9b667b9e59244013121a2a1a0ea7f391 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/302ec571766997a06d71c5924de2c93823446e8b | microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/37c927b01e98e9d5a2d241ae4d74d9d9524b03f5 | ORPH aarch64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/e09e7e9f361322c0c077f211b4d39e4768ca0569 | Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.6 | 7.0.11 | acpica | DISTRO | https://release-monitoring.org/project/00018 | 20220331 | 20222010 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 43 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.5.4 | 4.6.0 | alfred | DISTRO | https://release-monitoring.org/project/241870 | 2022.1 | 2023.0 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 13.0.0_r24 | angularjs | DISTRO | https://release-monitoring.org/project/21321 | 1.8.2 | 1.8.3 | apitrace | DISTRO | https://release-monitoring.org/project/06170 | 10.0 | 11.1 | apr | DISTRO | https://release-monitoring.org/project/00095 | 1.7.0 | 1.7.2 | apr-util | DISTRO | https://release-monitoring.org/project/00096 | 1.6.1 | 1.6.3 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 11.4.3 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.29.1 | 20.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.46.0 | atkmm | DISTRO | https://release-monitoring.org/project/07962 | 2.36.1 | 2.36.2 | atop | DISTRO | https://release-monitoring.org/project/00135 | 2.8.0 | 2.8.1 | audit | DISTRO | https://release-monitoring.org/project/15225 | 3.0.7 | 3.0.9 | avocado | DISTRO | https://release-monitoring.org/project/13385 | 98.0 | 100.1 | avrdude | DISTRO | https://release-monitoring.org/project/10751 | 6.4 | 7.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_07_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.12.1 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 20.10.21 | 20.10.26 | bat | DISTRO | https://release-monitoring.org/project/241901 | 0.19.0 | 0.22.1 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2023.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2022.3 | 2023.0 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.2.16 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.2.16 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.2.16 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.5 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.38 | 2.40 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.11 | 2.0.12 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 24.0.1 | bluez5_utils | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bluez5_utils-headers | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH boost | DISTRO | https://release-monitoring.org/project/06845 | 1.80.0 | 1.81.0 | bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.2.3 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.16.2 | 6.1.3 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.21 | 3.25 | busybox | DISTRO | https://release-monitoring.org/project/00230 | 1.35.0 | 1.36.0 | ORPH cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.8 | cairomm | DISTRO | https://release-monitoring.org/project/07959 | 1.16.1 | 1.16.2 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.7.4 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.5.0 | 1.5.2 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 3.9.1 | 4.2.0 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.15 | 7.0 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.18.0 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.7 | 1.0.0 | clang | DISTRO | https://release-monitoring.org/project/11811 | 11.1.0 | 15.0.7 | clinfo | DISTRO | https://release-monitoring.org/project/10503 | 3.0.21.02.21 | 3.0.23.01.25 | cloop | DISTRO | https://release-monitoring.org/project/21332 | 3.14.1.3 | 3.14.1.3+... | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.22.3 | 3.25.2 | collectl | DISTRO | https://release-monitoring.org/project/00330 | 4.3.2 | 4.3.7 | compiler-rt | GUESS | https://release-monitoring.org/project/17705 | 11.1.0 | 900 | crucible | DISTRO | https://release-monitoring.org/project/267616 | 2022.05.25 | 2022.12.06 | crudini | DISTRO | https://release-monitoring.org/project/21669 | 0.9.3 | 0.9.4 | crun | DISTRO | https://release-monitoring.org/project/96792 | 1.7.2 | 1.8 | cryptopp | DISTRO | https://release-monitoring.org/project/14487 | 8.6.0 | 8.7.0 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.16 | 1.28.17 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.7.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | dado | DISTRO | https://release-monitoring.org/project/58442 | 1.8.3-1 | 2.1.0-1 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.9 | 3.0.10 | dash | DISTRO | https://release-monitoring.org/project/00394 | 0.5.11.5 | 0.5.12 | ORPH datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.13.2 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.3.4 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.2.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.4.0 | dbus | DISTRO | https://release-monitoring.org/project/05356 | 1.12.24 | 1.14.4 | ORPH dbus-broker | DISTRO | https://release-monitoring.org/project/271475 | 32 | 33 | dbus-python | DISTRO | https://release-monitoring.org/project/00402 | 1.2.18 | 1.3.2 | ORPH dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH ddrescue | DISTRO | https://release-monitoring.org/project/00410 | 1.26 | 1.27 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.20.0 | 1.20.1 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20220117 | 1.3-20221229 | ORPH diffutils | DISTRO | https://release-monitoring.org/project/00436 | 3.8 | 3.9 | ORPH dnsmasq | DISTRO | https://release-monitoring.org/project/00444 | 2.88 | 2.89 | docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 20.10.22 | 23.0.0 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 20.10.22 | 23.0.0 | dracut | DISTRO | https://release-monitoring.org/project/10627 | 057 | 059 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.21.4 | 9.23.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH dust | DISTRO | https://release-monitoring.org/project/141344 | 0.8.1 | 0.8.4 | ORPH e2fsprogs | DISTRO | https://release-monitoring.org/project/00646 | 1.46.5 | 1.46.6 | ORPH easy-rsa | DISTRO | https://release-monitoring.org/project/17770 | 3.1.1 | 3.1.2 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.18 | 1.19 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202211 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.1 | 1.26.3 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 21.12 | 23.01 | elfutils | DISTRO | https://release-monitoring.org/project/05679 | 0.186 | 0.188 | ORPH elixir | DISTRO | https://release-monitoring.org/project/00673 | 1.9.4 | 1.14.3 | empty | DISTRO | https://release-monitoring.org/project/20564 | 0.6.22b | 0.6.23c | ORPH enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.1 | 0.25.4 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 25.2.2 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.21 | 1.0.22 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.11.1 | 1.11.5 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.9.1 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.16 | 1.0.22 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.29 | 1.0.30 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.14 | 1.0.15 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.10 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.8 | 1.0.9 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.47 | 1.0.49 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.27 | 1.0.29 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.47 | 1.2.7 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.13 | 1.1.16 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.23 | 1.0.25 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.5.6 | 1.6.1 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.32 | 1.0.36 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.12 | 1.0.15 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.10 | 1.0.12 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.9.0.1 | 2.9.1.0 | exiv2 | DISTRO | https://release-monitoring.org/project/00769 | 0.27.5 | 0.27.6 | feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.9.1 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.35 | 6.4.36 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.3 | 5.1.2 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH file | DISTRO | https://release-monitoring.org/project/00807 | 5.43 | 5.44 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.33 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.21.0 | flashrom | DISTRO | https://release-monitoring.org/project/10202 | 1.2.1 | 1.3.0 | flatbuffers | DISTRO | https://release-monitoring.org/project/16642 | 2.0.8 | 23.1.21 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.4 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fluent-bit | DISTRO | https://release-monitoring.org/project/267335 | 2.0.8 | 2.0.9 | fmc | GUESS | https://release-monitoring.org/project/145761 | LSDK-21.08 | 0.2.0 | font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 6.2.1 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.14.2 | ORPH freeradius-server | DISTRO | https://release-monitoring.org/project/00853 | 3.2.0 | 3.2.1 | fscryptctl | DISTRO | https://release-monitoring.org/project/270981 | 1.0.0 | 1.1.0 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 22.09.00 | 23.01.00 | gawk | DISTRO | https://release-monitoring.org/project/00868 | 5.2.0 | 5.2.1 | ORPH gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 4.0.0 | ORPH gdal | DISTRO | https://release-monitoring.org/project/00881 | 3.5.1 | 3.6.2 | gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.5.5 | 2.6.2 | gerbera | DISTRO | https://release-monitoring.org/project/18420 | 1.10.0 | 1.12.1 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.56.1 | 10.0.0 | gitlab-runner | DISTRO | https://release-monitoring.org/project/11337 | 15.5.0 | 15.8.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.1 | 2.74.0 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.74.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnupg2 | DISTRO | https://release-monitoring.org/project/01215 | 2.3.8 | 2.4.0 | gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.10.4.0 | 3.10.5.1 | go | DISTRO | https://release-monitoring.org/project/01227 | 1.19.5 | 1.20 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.72.0 | 1.74.0 | ORPH gpsd | DISTRO | https://release-monitoring.org/project/06846 | 3.24 | 3.25 | gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.9 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 7.1.0 | ORPH grantlee | DISTRO | https://release-monitoring.org/project/21448 | 5.2.0 | 5.3.1 | graphicsmagick | DISTRO | https://release-monitoring.org/project/01248 | 1.3.38 | 1.3.40 | grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.51.1 | 1.52.0 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 43.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gssdp | DISTRO | https://release-monitoring.org/project/01262 | 1.4.0.1 | 1.6.2 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.1.0 | gst1-shark | DISTRO | https://release-monitoring.org/project/21854 | v0.7.5 | 0.8.1 | gstd | DISTRO | https://release-monitoring.org/project/235022 | 0.14.0 | 0.15.0 | ORPH gtest | DISTRO | https://release-monitoring.org/project/18290 | 1.12.1 | 1.13.0 | gtkmm3 | DISTRO | https://release-monitoring.org/project/311572 | 3.22.0 | 3.24.7 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.6.2 | guile | DISTRO | https://release-monitoring.org/project/01277 | 3.0.8 | 3.0.9 | gupnp | DISTRO | https://release-monitoring.org/project/01281 | 1.4.3 | 1.6.3 | gupnp-av | DISTRO | https://release-monitoring.org/project/01282 | 0.14.0 | 0.14.1 | gupnp-tools | DISTRO | https://release-monitoring.org/project/01284 | 0.10.3 | 0.12.0 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.50.3 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2022.09.1 | 2023.01.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.6.5 | 2.7.2 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 5.3.1 | 6.0.0 | heimdal | DISTRO | https://release-monitoring.org/project/01307 | 7.7.1 | 7.8.0 | ORPH hiawatha | DISTRO | https://release-monitoring.org/project/13375 | 11.2 | 11.3 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.13.1 | ORPH hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.22.10 | ORPH htop | DISTRO | https://release-monitoring.org/project/01332 | 3.2.1 | 3.2.2 | ORPH htpdate | DISTRO | https://release-monitoring.org/project/132187 | 1.3.6 | 1.3.7 | hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.365 | 0.367 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.8.0 | 2.9.0 | hyperfine | DISTRO | https://release-monitoring.org/project/18526 | 1.14.0 | 1.15.0 | ORPH i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.43.0 | 2.45.1 | ibm-sw-tpm2 | DISTRO | https://release-monitoring.org/project/18952 | 1661 | 1682 | icu | DISTRO | https://release-monitoring.org/project/16134 | 70-1 | 72-1 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.41 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-51 | 7.1.0-60 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.10.0 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.6.0 | ORPH intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 22.6.6 | 23.1.0 | intel-mediasdk | DISTRO | https://release-monitoring.org/project/21814 | 22.6.5 | 23.1.0 | iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.493 | 3.494 | ipset | DISTRO | https://release-monitoring.org/project/01393 | 7.16 | 7.17 | iputils | DISTRO | https://release-monitoring.org/project/01395 | 20211215 | 20221126 | irqbalance | DISTRO | https://release-monitoring.org/project/01402 | 1.9.0 | 1.9.2 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | irssi | DISTRO | https://release-monitoring.org/project/01404 | 1.4.2 | 1.4.3 | iwd | DISTRO | https://release-monitoring.org/project/18380 | 2.2 | 2.3 | ORPH jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.21 | 1.9.22 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 1.1.1 | 1.1.2 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 4.0.0 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.6 | 1.9 | jpeg-turbo | DISTRO | https://release-monitoring.org/project/01648 | 2.1.4 | 2.1.5 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.13.1 | 1.13.2 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.2 | jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.10.0 | 3.10.1 | kexec | DISTRO | https://release-monitoring.org/project/12689 | 2.0.25 | 2.0.26 | ORPH kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.102.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.102.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.102.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.102.0 | kodi | DISTRO | https://release-monitoring.org/project/20547 | 19.5-Matrix | 20.0-Nexus | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.7-Ma... | 20.3.2-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.3-Ma... | 20.5.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-jsonschemabuilder | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.4-Ma... | 20.1.3-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.5-Ma... | 20.1.3-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.1-Ma... | 20.5.0-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.6-Ma... | 20.6.0-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.2.2-Ma... | 20.6.1-Nexus | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.11-M... | 20.3.1-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.6-Ma... | 20.4.0-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.3.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.4.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.3.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.4-Ma... | 20.3.1-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 20.3.0-Nexus | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.5-Ma... | 20.4.0-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.1-Ma... | 20.4.2-Nexus | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.3.1-Ma... | 20.6.1-Nexus | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.16-M... | 20.3.4-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-texturepacker | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.2.0-Ma... | 20.2.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.2-Ma... | 20.1.1-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.3-Ma... | 20.2.1-Nexus | ksmbd-tools | DISTRO | https://release-monitoring.org/project/241856 | 3.4.6 | 3.4.7 | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 2.1.0 | 2.2.0 | lapack | DISTRO | https://release-monitoring.org/project/01534 | 3.10.1 | 3.11.0 | leafpad | DISTRO | https://release-monitoring.org/project/01544 | 0.8.18.1 | 0.8.19 | ORPH lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.3 | 0.3.95 | leptonica | DISTRO | https://release-monitoring.org/project/01549 | 1.82.0 | 1.83.0 | less | DISTRO | https://release-monitoring.org/project/01550 | 590 | 608 | ORPH libabseil-cpp | DISTRO | https://release-monitoring.org/project/115295 | 20220623.1 | 20230125.0 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libass | DISTRO | https://release-monitoring.org/project/01560 | 0.16.0 | 0.17.0 | libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.26 | 2.28-1 | ORPH libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.7 | libcamera | GUESS | https://release-monitoring.org/project/301902 | v0.0.3 | 0.0.4 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.65 | 2.67 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 3.0.0 | libdeflate | DISTRO | https://release-monitoring.org/project/242778 | 1.15 | 1.17 | libdnet | DISTRO | https://release-monitoring.org/project/06308 | 1.16.1 | 1.16.3 | ORPH libebml | DISTRO | https://release-monitoring.org/project/07879 | 1.4.2 | 1.4.4 | libedit | DISTRO | https://release-monitoring.org/project/01599 | 20210910-3.1 | 20221030-3.1 | libevdev | DISTRO | https://release-monitoring.org/project/20540 | 1.12.1 | 1.13.0 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.13.1 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.40.0 | ORPH libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.72.3 | 2.74.5 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.4.0 | 1.6.0 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.17.1 | 1.18.0 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.30 | ORPH libgsasl | DISTRO | https://release-monitoring.org/project/01563 | 1.10.0 | 2.2.0 | ORPH libgsm | DISTRO | https://release-monitoring.org/project/12587 | 1.0.19 | 1.0.22 | libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.8.3 | libgtk3 | DISTRO | https://release-monitoring.org/project/311549 | 3.24.35 | 3.24.36 | libhtp | DISTRO | https://release-monitoring.org/project/01632 | 0.5.40 | 0.5.42 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.40 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.16 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.17 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.2 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.20.1 | 1.22.1 | libmatroska | DISTRO | https://release-monitoring.org/project/01657 | 1.6.3 | 1.7.1 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.13 | 0.12.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.8 | 3.1.10 | libmodplug | DISTRO | https://release-monitoring.org/project/05669 | d1b97ed | 0.8.9.0 | ORPH libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.9.1 | libnetconf2 | DISTRO | https://release-monitoring.org/project/31639 | 2.1.25 | 2.1.28 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.2 | ORPH libnftnl | DISTRO | https://release-monitoring.org/project/01681 | 1.2.3 | 1.2.4 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.2.2 | 5.0.0 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.14 | libopenssl | DISTRO | https://release-monitoring.org/project/20333 | 1.1.1q | 1.1.1s | libpam-tacplus | DISTRO | https://release-monitoring.org/project/20537 | 1.6.1 | 1.7.0 | ORPH libpcap | DISTRO | https://release-monitoring.org/project/01702 | 1.10.2 | 1.10.3 | libpeas | DISTRO | https://release-monitoring.org/project/06871 | 1.32.0 | 1.34.0 | ORPH libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.7.4 | libqrtr-glib | DISTRO | https://release-monitoring.org/project/192056 | 1.0.0 | 1.2.2 | librelp | DISTRO | https://release-monitoring.org/project/01713 | 1.10.0 | 1.11.0 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.54.5 | librtas | DISTRO | https://release-monitoring.org/project/10717 | 2.0.3 | 2.0.4 | ORPH libselinux | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.2 | 3.2.2 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.2 | 2.5.0 | libtalloc | DISTRO | https://release-monitoring.org/project/01733 | 2.3.4 | 2.4.0 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH libtool | DISTRO | https://release-monitoring.org/project/01741 | 2.4.6 | 2.4.7 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.8 | libucl | DISTRO | https://release-monitoring.org/project/21371 | 0.8.1 | 0.8.2 | libupnp | DISTRO | https://release-monitoring.org/project/21315 | 1.14.13 | 1.14.15 | libupnpp | DISTRO | https://release-monitoring.org/project/15849 | 0.21.0 | 0.22.4 | ORPH liburing | DISTRO | https://release-monitoring.org/project/230185 | 2.2 | 2.3 | libva-utils | DISTRO | https://release-monitoring.org/project/16334 | 2.16.0 | 2.17.1 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.14.1 | libvirt | DISTRO | https://release-monitoring.org/project/13830 | 7.10.0 | 9.0.0 | libwpe | DISTRO | https://release-monitoring.org/project/17789 | 1.14.0 | 1.14.1 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.29 | 4.4.33 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.4.0 | 1.5.0 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.54.06 | libyang | DISTRO | https://release-monitoring.org/project/18554 | 2.1.4 | 2.1.30 | lighttpd | DISTRO | https://release-monitoring.org/project/01817 | 1.4.67 | 1.4.68 | lilv | DISTRO | https://release-monitoring.org/project/01818 | 0.24.12 | 0.24.20 | links | DISTRO | https://release-monitoring.org/project/01822 | 2.26 | 2.28 | ORPH linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.1.63 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20221214 | 20230117 | liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.4.0 | 1.5.0 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2023.01.19 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.15 | 1.0.16 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.13.0 | 1.0.0 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.20.1 | 3.21.0 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | lsof | DISTRO | https://release-monitoring.org/project/01844 | 4.96.5 | 4.98.0 | ORPH ltp-testsuite | DISTRO | https://release-monitoring.org/project/21502 | 20220930 | 20230127 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.6 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.11 | lttng-libust | DISTRO | https://release-monitoring.org/project/07135 | 2.13.1 | 2.13.5 | lttng-modules | DISTRO | https://release-monitoring.org/project/07141 | 2.13.7 | 2.13.8 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.8 | 2.13.9 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luarocks | DISTRO | https://release-monitoring.org/project/01856 | 3.9.1 | 3.9.2 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.43.0-0 | 1.44.2-1 | ORPH luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.13.0 | 2.14.0 | ORPH lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.18 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzma-alone | DISTRO | https://release-monitoring.org/project/242840 | 9.22 | 2201 | ORPH lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.4 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.36 | 10.11.1 | ORPH mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.2 | 3.3.0 | mc | DISTRO | https://release-monitoring.org/project/01954 | 4.8.28 | 4.8.29 | mcelog | DISTRO | https://release-monitoring.org/project/08093 | 189 | 191 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.6.0 | 0.1.6.1 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.2.16 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.17 | 1.6.18 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 6.10 | mesa3d-demos | DISTRO | https://release-monitoring.org/project/16781 | 8.4.0 | 8.5.0 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.46.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | minizip | DISTRO | https://release-monitoring.org/project/301509 | 3.0.7 | 3.0.8 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.20.4 | 1.21.2 | modsecurity2 | DISTRO | https://release-monitoring.org/project/68638 | 2.9.7 | 3.0.8 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 6.2.0 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.8 | 7.9 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.32.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.182 | 6.12.0.190 | mpc | DISTRO | https://release-monitoring.org/project/01667 | 1.2.1 | 1.3.1 | ORPH mpd | DISTRO | https://release-monitoring.org/project/14864 | 0.23.11 | 0.23.12 | mpfr | DISTRO | https://release-monitoring.org/project/02019 | 4.1.1 | 4.2.0 | ORPH mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.31.2 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.35.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 5.0.0 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.22 | 1.8.23 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.38 | 4.0.42 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.18 | 2.2.2 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.3-20221224 | 6.4-20230128 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.32.4 | 0.32.5 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | 1.218 | 1.219 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.33.1 | 1.37.1 | netopeer2 | DISTRO | https://release-monitoring.org/project/114978 | 2.1.42 | 2.1.49 | network-manager | DISTRO | https://release-monitoring.org/project/21197 | 1.40.10 | 1.40.12 | ORPH networkd-dispatcher | DISTRO | https://release-monitoring.org/project/242008 | 2.2.3 | 2.2.4 | newt | DISTRO | https://release-monitoring.org/project/15129 | 0.52.21 | 0.52.23 | ORPH nftables | DISTRO | https://release-monitoring.org/project/02082 | 1.0.5 | 1.0.6 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.51.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.22.1 | 1.23.3 | nginx-modsecurity | DISTRO | https://release-monitoring.org/project/68639 | 1.0.2 | 1.0.3 | ninja | DISTRO | https://release-monitoring.org/project/02089 | 1.11.1.g9... | 1.11.1 | nmap | DISTRO | https://release-monitoring.org/project/02096 | 7.92 | 7.93 | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 16.18.1 | 19.6.0 | noip | DISTRO | https://release-monitoring.org/project/21539 | 2.1.9 | 3.0.0 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.151 | 390.157 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 525.85.05 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 2.3 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.34 | 2.0 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.6.1 | openal | DISTRO | https://release-monitoring.org/project/08172 | 1.22.0 | 1.23.0 | ORPH opencl-clhpp | DISTRO | https://release-monitoring.org/project/271141 | 2.0.16 | 2022.09.30 | opencore-amr | DISTRO | https://release-monitoring.org/project/21548 | 0.1.5 | 0.1.6 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.17 | 4.7.0 | opencv4 | DISTRO | https://release-monitoring.org/project/06615 | 4.6.0 | 4.7.0 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.10.0 | openipmi | DISTRO | https://release-monitoring.org/project/02549 | 2.0.32 | 2.0.33 | ORPH openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.14.1+1 | 21+8 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.4 | ORPH openocd | DISTRO | https://release-monitoring.org/project/02557 | 0.11.0 | 0.12.0 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.46 | opensc | DISTRO | https://release-monitoring.org/project/02559 | 0.22.0 | 0.23.0 | openssh | DISTRO | https://release-monitoring.org/project/02565 | 9.1p1 | 9.2p1 | ORPH openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 11.3.5-18... | 12.1.5 | openvpn | DISTRO | https://release-monitoring.org/project/02567 | 2.5.7 | 2.6.0 | ORPH opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.6.1 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.19.0 | 3.20.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.19.0 | 3.20.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.19.0 | 3.20.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.19.0 | 3.20.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.32 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.2.16 | ORPH osm2pgsql | DISTRO | https://release-monitoring.org/project/02575 | 1.7.2 | 1.8.0 | paho-mqtt-c | DISTRO | https://release-monitoring.org/project/21375 | 1.3.11 | 1.3.12 | pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.1 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.13 | 0.17.2 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.7 | ORPH pciutils | DISTRO | https://release-monitoring.org/project/02605 | 3.8.0 | 3.9.0 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202212 | ORPH pdbg | DISTRO | https://release-monitoring.org/project/21378 | 3.5 | 3.6 | perl-class-method-modifiers | DISTRO | https://release-monitoring.org/project/06735 | 2.13 | 2.14 | perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.89 | 6.90 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-file-sharedir-install | DISTRO | https://release-monitoring.org/project/11851 | 0.13 | 0.14 | perl-gdgraph | DISTRO | https://release-monitoring.org/project/09187 | 1.54 | 1.56 | perl-html-parser | DISTRO | https://release-monitoring.org/project/02967 | 3.80 | 3.81 | perl-image-exiftool | DISTRO | https://release-monitoring.org/project/06175 | 12.50 | 12.55 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.080 | 2.081 | perl-json-maybexs | DISTRO | https://release-monitoring.org/project/11953 | 1.004003 | 1.004004 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20200824 | 1.20220520 | perl-mime-tools | DISTRO | https://release-monitoring.org/project/11809 | 5.509 | 5.510 | perl-mojolicious-plugin-aut... | DISTRO | https://release-monitoring.org/project/21729 | 1.37 | 1.39 | perl-moo | DISTRO | https://release-monitoring.org/project/03123 | 2.005004 | 2.005005 | perl-net-ssh2 | DISTRO | https://release-monitoring.org/project/03163 | 0.72 | 0.73 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.93_01 | 1.92 | perl-package-stash | DISTRO | https://release-monitoring.org/project/11885 | 0.39 | 0.40 | perl-plack | DISTRO | https://release-monitoring.org/project/06578 | 1.0048 | 1.0050 | perl-sub-install | DISTRO | https://release-monitoring.org/project/03345 | 0.928 | 0.929 | perl-sub-quote | DISTRO | https://release-monitoring.org/project/12678 | 2.006006 | 2.006008 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-type-tiny | DISTRO | https://release-monitoring.org/project/14406 | 1.012004 | 2.002001 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0208 | php | DISTRO | https://release-monitoring.org/project/03627 | 8.1.14 | 8.2.2 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.22 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-memcached | DISTRO | https://release-monitoring.org/project/17400 | 3.1.5 | 3.2.0 | ORPH php-pam | DISTRO | https://release-monitoring.org/project/241707 | 2.2.3 | 2.2.4 | php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.2.0 | pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.62 | 0.3.65 | pipewire-media-session | DISTRO | https://release-monitoring.org/project/236416 | 0.4.1 | 0.4.2 | ORPH pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.9.4 | ORPH pngquant | DISTRO | https://release-monitoring.org/project/03674 | 2.17.0 | 2.18.0 | poco | DISTRO | https://release-monitoring.org/project/05418 | 1.12.2 | 1.12.4 | poke | DISTRO | https://release-monitoring.org/project/179926 | 2.4 | 3.0 | ORPH policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 22.10.0 | 23.02.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.10 | 1.3.11 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.15 | privoxy | DISTRO | https://release-monitoring.org/project/03712 | 3.0.33 | 3.0.34 | ORPH procps-ng | DISTRO | https://release-monitoring.org/project/03708 | 3.3.17 | 4.0.2 | ORPH proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 9.1.1 | prosody | DISTRO | https://release-monitoring.org/project/03709 | 0.11.14 | 0.12.2 | pru-software-support | DISTRO | https://release-monitoring.org/project/21825 | 6.0.1 | 6.1.0 | psmisc | DISTRO | https://release-monitoring.org/project/03721 | 23.5 | 23.6 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH putty | DISTRO | https://release-monitoring.org/project/05749 | 0.76 | 0.78 | python-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.5.1 | 0.6.0 | python-aiohttp-jinja2 | DISTRO | https://release-monitoring.org/project/21247 | 1.5 | 1.5.1 | python-alembic | DISTRO | https://release-monitoring.org/project/03766 | 1.9.1 | 1.9.2 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 22.12.1 | 23.1.1 | python-beautifulsoup4 | DISTRO | https://release-monitoring.org/project/03779 | 4.11.1 | 4.11.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.26.45 | 1.26.64 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.29.45 | 1.29.64 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.6.1 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 4.1.5 | 4.1.6 | python-dnspython | DISTRO | https://release-monitoring.org/project/13190 | 2.2.1 | 2.3.0 | python-dtschema | DISTRO | https://release-monitoring.org/project/100908 | 2022.12 | 2023.1 | python-flask-babel | DISTRO | https://release-monitoring.org/project/20024 | 2.0.0 | 3.0.1 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 3.0.2 | 3.0.3 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 1.0.1 | 1.1.1 | python-flatbuffers | DISTRO | https://release-monitoring.org/project/85010 | 2.0.7 | 23.1.21 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.30 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.10 | python-hiredis | DISTRO | https://release-monitoring.org/project/12002 | 2.0.0 | 2.2.1 | python-iptables | DISTRO | https://release-monitoring.org/project/11475 | 1.0.0 | 1.0.1 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 8.8.0 | 8.9.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.6 | 2.4.7 | python-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.1.1 | 2.1.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.6.3 | python-maturin | DISTRO | https://release-monitoring.org/project/42653 | 0.14.9 | 0.14.12 | python-mbstrdecoder | DISTRO | https://release-monitoring.org/project/21702 | 1.1.1 | 1.1.2 | python-mypy-extensions | DISTRO | https://release-monitoring.org/project/23367 | 0.4.3 | 1.0.0 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.23.5 | 1.24.2 | python-orjson | DISTRO | https://release-monitoring.org/project/31737 | 3.8.4 | 3.8.5 | python-packaging | DISTRO | https://release-monitoring.org/project/11718 | 22.0 | 23.0 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.12.0 | 3.0.0 | python-pathspec | DISTRO | https://release-monitoring.org/project/15607 | 0.10.3 | 0.11.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.11.0 | 5.11.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 22.3.1 | 23.0 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.16.0 | 3.17 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.2 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 3.0.2 | 3.1.2 | python-pypa-build | DISTRO | https://release-monitoring.org/project/132276 | 0.9.0 | 0.10.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.15.6 | 5.15.8 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.7.3 | 0.7.4 | python-pysmb | DISTRO | https://release-monitoring.org/project/21589 | 1.2.9 | 1.2.9.1 | python-pytest | DISTRO | https://release-monitoring.org/project/03765 | 7.2.0 | 7.2.1 | python-pythran | DISTRO | https://release-monitoring.org/project/21140 | 0.12.0 | 0.12.1 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2022.7 | 2022.7.1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 24.0.1 | 25.0.0b1 | python-qrcode | DISTRO | https://release-monitoring.org/project/20011 | 7.3.1 | 7.4.2 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 4.4.0 | 4.4.2 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.28.1 | 2.28.2 | python-rtoml | DISTRO | https://release-monitoring.org/project/62048 | 0.8.0 | 0.9.0 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-scipy | DISTRO | https://release-monitoring.org/project/04768 | 1.8.1 | 1.10.0 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.12.1 | 1.14.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 65.6.3 | 67.1.0 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.18.1 | 3.18.3 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.19.25 | 6.7.6 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.4.42 | 2.0.1 | python-systemd | DISTRO | https://release-monitoring.org/project/07314 | 234 | 235 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 5.2.0 | 5.2.1 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.8.0 | 5.9.0 | python-txaio | DISTRO | https://release-monitoring.org/project/07202 | 22.2.1 | 23.1.1 | python-typeguard | DISTRO | https://release-monitoring.org/project/38819 | 2.13.3 | 3.0.0b2 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.13 | 1.26.14 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.2.5 | 0.2.6 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 57.2 | 58.0b1 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.23.0 | 2.23.1 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 1.4.2 | 1.5.1 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.32 | 0.33 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.6 | 3.0.8 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.39.4 | 0.47.1 | python-zlmdb | DISTRO | https://release-monitoring.org/project/66674 | 22.6.1 | 23.1.1 | qcom-db410c-firmware | DISTRO | https://release-monitoring.org/project/235382 | 1034.2.1 | 1036.1 | qlibc | DISTRO | https://release-monitoring.org/project/21737 | 2.4.7 | 2.4.8 | ORPH qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 11.2.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.38.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.8 | 6.4.2 | qt6base | DISTRO | https://release-monitoring.org/project/07927 | 6.4.0 | 6.4.2 | qt6serialport | DISTRO | https://release-monitoring.org/project/07927 | 6.4.0 | 6.4.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.3 | 1.4 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-c | DISTRO | https://release-monitoring.org/project/13768 | 0.11.0 | 0.12.0 | ragel | DISTRO | https://release-monitoring.org/project/12105 | 6.10 | 7.0.4 | ORPH ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | raspberrypi-usbboot | DISTRO | https://release-monitoring.org/project/115700 | 2021.07.01 | 20221215-... | ORPH re2 | DISTRO | https://release-monitoring.org/project/10500 | 2022-12-01 | 2023-02-01 | redis | DISTRO | https://release-monitoring.org/project/04181 | 7.0.7 | 7.0.8 | refpolicy | DISTRO | https://release-monitoring.org/project/21663 | 2.20220106 | 2.20221101 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.5 | 2.0.1 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 7.9.2 | rrdtool | DISTRO | https://release-monitoring.org/project/04214 | 1.7.2 | 1.8.0 | ORPH rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2204.1 | 8.2212.0 | rt-tests | DISTRO | https://release-monitoring.org/project/59450 | 2.4 | 2.5 | rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.1.0 | ruby | DISTRO | https://release-monitoring.org/project/04223 | 3.1.3 | 3.2.0 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.66.1 | 1.67.0 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.66.1 | 1.67.0 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.42.0 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.11.1.2 | 2.11.2.0 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.4 | 2.3.5.5 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.8.0 | 1.0.8.1 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.6.0.0 | 2.6.0.1 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.5.1.1 | 2.5.1.2 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.5.0 | 2.2.5.1 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.3.2 | 0.5.3.3 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.12 | 4.17.5 | sane-backends | DISTRO | https://release-monitoring.org/project/04760 | 1.1.1 | 1.2.1 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.4.0 | sdl2_mixer | DISTRO | https://release-monitoring.org/project/04782 | 2.0.4 | 2.6.2 | ORPH sdl2_net | DISTRO | https://release-monitoring.org/project/04783 | 2.0.1 | 2.2.0 | ORPH sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdl_sound | DISTRO | https://release-monitoring.org/project/10262 | 1.0.3 | 2.0.1 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | selinux-python | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | semodule-utils | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | ORPH sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 2.8.0 | 2.12.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.5.4 | ser2net | DISTRO | https://release-monitoring.org/project/21655 | 4.3.8 | 4.3.11 | serd | DISTRO | https://release-monitoring.org/project/230531 | 0.30.14 | 0.30.16 | shairport-sync | DISTRO | https://release-monitoring.org/project/21384 | 3.3.9 | 4.1.1 | ORPH shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.2 | ORPH shim | DISTRO | https://release-monitoring.org/project/10719 | 15.4 | 15.7 | sispmctl | DISTRO | https://release-monitoring.org/project/21653 | 4.9 | 4.10 | skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.12.0.1 | 2.13.0.0 | snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.10 | 3.5.0 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.40.0 | 3.1.53.0 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sord | DISTRO | https://release-monitoring.org/project/230536 | 0.16.12 | 0.16.14 | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | spawn-fcgi | DISTRO | https://release-monitoring.org/project/05388 | 1.6.4 | 1.6.5 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice | DISTRO | https://release-monitoring.org/project/04871 | 0.15.0 | 0.15.1 | sqlcipher | DISTRO | https://release-monitoring.org/project/11213 | 4.5.1 | 4.5.3 | start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.19 | ORPH stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.5 | 1.0.7 | stress-ng | DISTRO | https://release-monitoring.org/project/12538 | 0.13.05 | 0.15.03 | strongswan | DISTRO | https://release-monitoring.org/project/04899 | 5.9.8 | 5.9.9 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.65 | 5.67 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.5 | ORPH suricata | DISTRO | https://release-monitoring.org/project/10925 | 6.0.6 | 6.0.10 | synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.29.3 | 0.30.2 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.38.1 | 4.0.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.46.0 | sysrepo | DISTRO | https://release-monitoring.org/project/34820 | 2.2.12 | 2.2.36 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.6.1 | 12.6.2 | ORPH system-config-printer | DISTRO | https://release-monitoring.org/project/08855 | 1.5.15 | 1.5.18 | ORPH systemd | DISTRO | https://release-monitoring.org/project/05440 | 250.8 | 252 | systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.04 | ORPH tbb | DISTRO | https://release-monitoring.org/project/08217 | 2021.5.0 | 2021.7.0 | tcl | DISTRO | https://release-monitoring.org/project/04941 | 8.6.12 | 8.6.13 | ORPH tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | tcllib | DISTRO | https://release-monitoring.org/project/04943 | 1.20 | 1.21 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.4.2 | 4.4.3 | ORPH terminology | DISTRO | https://release-monitoring.org/project/04951 | 1.12.1 | 1.13.0 | tesseract-ocr | DISTRO | https://release-monitoring.org/project/04954 | 5.0.1 | 5.3.0 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.5 | 2.5.2 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.17.0 | ORPH timescaledb | DISTRO | https://release-monitoring.org/project/17545 | 2.9.1 | 2.9.2 | tinifier | DISTRO | https://release-monitoring.org/project/241900 | 3.4.0 | 4.0.1 | tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20220801 | 20230101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tio | DISTRO | https://release-monitoring.org/project/20587 | 1.47 | 2.5 | tk | DISTRO | https://release-monitoring.org/project/11426 | 8.6.12 | 8.6.13 | tmux | DISTRO | https://release-monitoring.org/project/04980 | 3.1c | 3.3a | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 3.0.0 | ORPH tpm2-pkcs11 | DISTRO | https://release-monitoring.org/project/18777 | 1.8.0 | 1.9.0 | tpm2-tools | DISTRO | https://release-monitoring.org/project/12841 | 5.2 | 5.4 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.1.0 | 4.0.1 | ORPH trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | 2.9.7 | 3.1.6 | traceroute | DISTRO | https://release-monitoring.org/project/14877 | 2.1.0 | 2.1.1 | tree | DISTRO | https://release-monitoring.org/project/05006 | 2.0.2 | 2.1.0 | tzdata | DISTRO | https://release-monitoring.org/project/05021 | 2022f | 2022g | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2023.01 | uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.12 | 0.13.1 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 4.3.0.0 | 4.4.0.0 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 3.2 | unrar | DISTRO | https://release-monitoring.org/project/13306 | 6.1.7 | 6.2.5 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.7.1 | ORPH upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.19 | 0.99.20 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH uuu | DISTRO | https://release-monitoring.org/project/259328 | 1.5.11 | 1.5.21 | vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.56.3 | ORPH valgrind | DISTRO | https://release-monitoring.org/project/13639 | 3.19.0 | 3.20.0 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.7 | 1.0 | vis-network | DISTRO | https://release-monitoring.org/project/270536 | 9.1.0 | 9.1.2 | volk | DISTRO | https://release-monitoring.org/project/147733 | 2.5.2 | 3.0.0 | vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vte | DISTRO | https://release-monitoring.org/project/10895 | 0.66.2 | 0.70.2 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.45 | 3.2.47 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.240 | ORPH waf | DISTRO | https://release-monitoring.org/project/05116 | 2.0.24 | 2.0.25 | wavpack | DISTRO | https://release-monitoring.org/project/05121 | 5.5.0 | 5.6.0 | ORPH waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 1.0.0 | webp | DISTRO | https://release-monitoring.org/project/01761 | 1.2.4 | 1.3.0 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH weston | DISTRO | https://release-monitoring.org/project/13745 | 10.0.1 | 11.0.1 | whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.14 | 5.5.15 | wine | DISTRO | https://release-monitoring.org/project/05134 | 7.0 | 8.1 | wireless-regdb | DISTRO | https://release-monitoring.org/project/15257 | 2022.02.18 | 2022.08.12 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.8 | 0.4.13 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.15.1 | 0.16.1 | wtfutil | DISTRO | https://release-monitoring.org/project/243189 | 0.41.0 | 0.42.0 | xapian | DISTRO | https://release-monitoring.org/project/15919 | 1.4.19 | 1.4.22 | xapp_beforelight | DISTRO | https://release-monitoring.org/project/21724 | 1.0.5 | 1.0.6 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20230201 | xapp_xvidtune | DISTRO | https://release-monitoring.org/project/14952 | 1.0.3 | 1.0.4 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.5 | 4.17.0 | xfsprogs | DISTRO | https://release-monitoring.org/project/05188 | 5.14.2 | 6.1.1 | ORPH xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.37 | 2.38 | xlib_libX11 | DISTRO | https://release-monitoring.org/project/01764 | 1.8.3 | 1.8.4 | xmrig | DISTRO | https://release-monitoring.org/project/17499 | 6.18.1 | 6.19.0 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 6.03 | 6.06.1 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.22 | 3.23 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 376 | 378 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.1 | 0.3.2 | xz | DISTRO | https://release-monitoring.org/project/05277 | 5.2.10 | 5.4.1 | ORPH yad | DISTRO | https://release-monitoring.org/project/05280 | 0.40.0 | 12.3 | zabbix | DISTRO | https://release-monitoring.org/project/05492 | 5.4.9 | 6.2.7 | zchunk | DISTRO | https://release-monitoring.org/project/178035 | 1.2.2 | 1.2.3 | zeek | DISTRO | https://release-monitoring.org/project/267106 | 4.1.1 | 5.1.2 | zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.1.7 | 2.1.9 | zic | DISTRO | https://release-monitoring.org/project/16905 | 2022f | 2022g | Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 ffmpeg | CVE-2022-3965 | https://security-tracker.debian.org/tracker/CVE-2022-3965 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 nasm | CVE-2022-46457 | https://security-tracker.debian.org/tracker/CVE-2022-46457 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tmux | CVE-2022-47016 | https://security-tracker.debian.org/tracker/CVE-2022-47016 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dropbear | CVE-2021-36369 | https://security-tracker.debian.org/tracker/CVE-2021-36369 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 ffmpeg | CVE-2022-3965 | https://security-tracker.debian.org/tracker/CVE-2022-3965 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-3998 | https://security-tracker.debian.org/tracker/CVE-2021-3998 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2021-3981 | https://security-tracker.debian.org/tracker/CVE-2021-3981 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2022-0711 | https://security-tracker.debian.org/tracker/CVE-2022-0711 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libbpf | CVE-2021-45940 | https://security-tracker.debian.org/tracker/CVE-2021-45940 libbpf | CVE-2021-45941 | https://security-tracker.debian.org/tracker/CVE-2021-45941 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libxslt | CVE-2022-29824 | https://security-tracker.debian.org/tracker/CVE-2022-29824 lighttpd | CVE-2022-41556 | https://security-tracker.debian.org/tracker/CVE-2022-41556 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 lxc | CVE-2022-47952 | https://security-tracker.debian.org/tracker/CVE-2022-47952 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mender | CVE-2022-29555 | https://security-tracker.debian.org/tracker/CVE-2022-29555 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 modsecurity2 | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 modsecurity2 | CVE-2023-24021 | https://security-tracker.debian.org/tracker/CVE-2023-24021 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 nodejs | CVE-2022-35256 | https://security-tracker.debian.org/tracker/CVE-2022-35256 nodejs | CVE-2022-43548 | https://security-tracker.debian.org/tracker/CVE-2022-43548 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 opusfile | CVE-2022-47021 | https://security-tracker.debian.org/tracker/CVE-2022-47021 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 patchelf | CVE-2022-44940 | https://security-tracker.debian.org/tracker/CVE-2022-44940 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 proftpd | CVE-2021-46854 | https://security-tracker.debian.org/tracker/CVE-2021-46854 python-aiohttp | CVE-2022-33124 | https://security-tracker.debian.org/tracker/CVE-2022-33124 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-45198 | https://security-tracker.debian.org/tracker/CVE-2022-45198 python-pillow | CVE-2022-45199 | https://security-tracker.debian.org/tracker/CVE-2022-45199 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pyjwt | CVE-2022-29217 | https://security-tracker.debian.org/tracker/CVE-2022-29217 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python-web2py | CVE-2022-33146 | https://security-tracker.debian.org/tracker/CVE-2022-33146 python-werkzeug | CVE-2022-29361 | https://security-tracker.debian.org/tracker/CVE-2022-29361 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3611 | https://security-tracker.debian.org/tracker/CVE-2021-3611 qemu | CVE-2021-3750 | https://security-tracker.debian.org/tracker/CVE-2021-3750 qemu | CVE-2021-3929 | https://security-tracker.debian.org/tracker/CVE-2021-3929 qemu | CVE-2021-3947 | https://security-tracker.debian.org/tracker/CVE-2021-3947 qemu | CVE-2021-4158 | https://security-tracker.debian.org/tracker/CVE-2021-4158 qemu | CVE-2021-4206 | https://security-tracker.debian.org/tracker/CVE-2021-4206 qemu | CVE-2021-4207 | https://security-tracker.debian.org/tracker/CVE-2021-4207 qemu | CVE-2022-0358 | https://security-tracker.debian.org/tracker/CVE-2022-0358 qemu | CVE-2022-26353 | https://security-tracker.debian.org/tracker/CVE-2022-26353 qemu | CVE-2022-26354 | https://security-tracker.debian.org/tracker/CVE-2022-26354 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-35414 | https://security-tracker.debian.org/tracker/CVE-2022-35414 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 rabbitmq-server | CVE-2021-22116 | https://security-tracker.debian.org/tracker/CVE-2021-22116 rabbitmq-server | CVE-2021-22117 | https://security-tracker.debian.org/tracker/CVE-2021-22117 rabbitmq-server | CVE-2021-32718 | https://security-tracker.debian.org/tracker/CVE-2021-32718 rabbitmq-server | CVE-2021-32719 | https://security-tracker.debian.org/tracker/CVE-2021-32719 rabbitmq-server | CVE-2022-31008 | https://security-tracker.debian.org/tracker/CVE-2022-31008 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 rpm | CVE-2021-3521 | https://security-tracker.debian.org/tracker/CVE-2021-3521 rpm | CVE-2021-35937 | https://security-tracker.debian.org/tracker/CVE-2021-35937 rpm | CVE-2021-35938 | https://security-tracker.debian.org/tracker/CVE-2021-35938 rpm | CVE-2021-35939 | https://security-tracker.debian.org/tracker/CVE-2021-35939 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 sdl2 | CVE-2022-4743 | https://security-tracker.debian.org/tracker/CVE-2022-4743 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 sofia-sip | CVE-2023-22741 | https://security-tracker.debian.org/tracker/CVE-2023-22741 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tmux | CVE-2022-47016 | https://security-tracker.debian.org/tracker/CVE-2022-47016 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unbound | CVE-2022-30698 | https://security-tracker.debian.org/tracker/CVE-2022-30698 unbound | CVE-2022-30699 | https://security-tracker.debian.org/tracker/CVE-2022-30699 unbound | CVE-2022-3204 | https://security-tracker.debian.org/tracker/CVE-2022-3204 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 usbguard | CVE-2019-25058 | https://security-tracker.debian.org/tracker/CVE-2019-25058 vim | CVE-2023-0049 | https://security-tracker.debian.org/tracker/CVE-2023-0049 vim | CVE-2023-0051 | https://security-tracker.debian.org/tracker/CVE-2023-0051 vim | CVE-2023-0054 | https://security-tracker.debian.org/tracker/CVE-2023-0054 vim | CVE-2023-0288 | https://security-tracker.debian.org/tracker/CVE-2023-0288 vim | CVE-2023-0433 | https://security-tracker.debian.org/tracker/CVE-2023-0433 wavpack | CVE-2022-2476 | https://security-tracker.debian.org/tracker/CVE-2022-2476 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 ffmpeg | CVE-2022-3965 | https://security-tracker.debian.org/tracker/CVE-2022-3965 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 modsecurity2 | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 modsecurity2 | CVE-2023-24021 | https://security-tracker.debian.org/tracker/CVE-2023-24021 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 opusfile | CVE-2022-47021 | https://security-tracker.debian.org/tracker/CVE-2022-47021 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 sdl2 | CVE-2022-4743 | https://security-tracker.debian.org/tracker/CVE-2022-4743 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 sofia-sip | CVE-2023-22741 | https://security-tracker.debian.org/tracker/CVE-2023-22741 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tmux | CVE-2022-47016 | https://security-tracker.debian.org/tracker/CVE-2022-47016 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 vim | CVE-2023-0049 | https://security-tracker.debian.org/tracker/CVE-2023-0049 vim | CVE-2023-0051 | https://security-tracker.debian.org/tracker/CVE-2023-0051 vim | CVE-2023-0054 | https://security-tracker.debian.org/tracker/CVE-2023-0054 vim | CVE-2023-0288 | https://security-tracker.debian.org/tracker/CVE-2023-0288 vim | CVE-2023-0433 | https://security-tracker.debian.org/tracker/CVE-2023-0433 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From peter at korsgaard.com Mon Feb 6 08:32:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 09:32:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: fix build with libressl >= 3.5.0 In-Reply-To: <20230115182724.377966-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 15 Jan 2023 19:27:24 +0100") References: <20230115182724.377966-1-fontaine.fabrice@gmail.com> Message-ID: <87wn4vdwjf.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with libressl raised since bump to > version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: > In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: > /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': > /tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} > 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) > | ^~ > Fixes: > - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 08:26:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 09:26:47 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/mariadb: fix build with libressl >= 3.5.0 Message-ID: <20230206083307.030578390C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a542730884998f5f421617c76b238ab4a67d17b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fix the following build failure with libressl raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': /tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) | ^~ Fixes: - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 22e926e9af915303180d35b5c41ea5fbf411d753) Signed-off-by: Peter Korsgaard --- ...sl_compat.h-fix-build-with-libressl-3.5.0.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch b/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 0000000000..fd3e6e6607 --- /dev/null +++ b/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,39 @@ +From 79ed770a37c8669390a58a4485dd8f5565fe2497 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 15 Jan 2023 19:12:05 +0100 +Subject: [PATCH] include/ssl_compat.h: fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: +/tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': +/tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} + 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/MariaDB/server/pull/2435] +--- + include/ssl_compat.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/ssl_compat.h b/include/ssl_compat.h +index 664f3aac87c..3678e5fa084 100644 +--- a/include/ssl_compat.h ++++ b/include/ssl_compat.h +@@ -19,7 +19,8 @@ + /* OpenSSL version specific definitions */ + #if defined(OPENSSL_VERSION_NUMBER) + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ ++ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + #define HAVE_OPENSSL11 1 + #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) + #define ERR_remove_state(X) ERR_clear_error() +-- +2.39.0 + From thomas.petazzoni at bootlin.com Mon Feb 6 08:34:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 09:34:39 +0100 Subject: [Buildroot] [git commit] package/xxhash: use MOREFLAGS instead of overriding CFLAGS Message-ID: <20230206083621.0D5EB83950@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfef88762d19b2fd8f99b55cee5c9ebaf986e1c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set MOREFLAGS instead of overriding CFLAGS to avoid the following build failure raised since commit 94b66fb49cd57d0863245fbe0a3dc0833e76aad0: /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /tmp/ccabb8cF.o: relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC Fixes: - http://autobuild.buildroot.org/results/953133575d8c13266f1450fa545e70e4a518508d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xxhash/xxhash.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 40e3c2696c..75d375a2fa 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -28,8 +28,7 @@ endif define XXHASH_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - CFLAGS="$(TARGET_CFLAGS) -DXXH_NO_INLINE_HINTS" \ - $(XXHASH_TARGETS) + MOREFLAGS=-DXXH_NO_INLINE_HINTS $(XXHASH_TARGETS) endef define XXHASH_INSTALL_STAGING_CMDS From peter at korsgaard.com Mon Feb 6 08:41:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 09:41:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: security bump to version 5.0.2 In-Reply-To: (Fabrice Fontaine's message of "Mon, 6 Feb 2023 09:12:22 +0100") References: <20230120192846.7362-1-fontaine.fabrice@gmail.com> <87y1pbwwdl.fsf@dell.be.48ers.dk> Message-ID: <87sffjdw37.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: Hi, >> Committed to 2022.11.x, thanks. >> >> I see that there isn't a new 4.0.x release. Do you know if 4.0.x is also >> vulnerable to this issue? >> > To my understanding 4.0.x is also vulnerable. > https://github.com/lxc/lxc/commit/1b0469530d7a38b8f8990e114b52530d1bf7f3b8 > should be backported. Ok, thanks. Will you send a patch for 2022.02.x? -- Bye, Peter Korsgaard From dario.binacchi at amarulasolutions.com Mon Feb 6 08:45:51 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Mon, 6 Feb 2023 09:45:51 +0100 Subject: [Buildroot] [PATCH 1/2] configs/beaglebone: bump Linux version to 5.10.145-ti-r54 In-Reply-To: References: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> Message-ID: Hi Scott, On Mon, Feb 6, 2023 at 1:20 AM Scott Fan wrote: > > Could you test it with kernel 5.10.162-ti-r56 ? > > https://github.com/beagleboard/linux/releases/tag/5.10.162-ti-r56 Thanks for your suggestion, I will test with kernel 5.10.162-ti-r56 kernel. Thanks and regards, Dario > > Scott Fan > > > On Mon, Feb 6, 2023 at 5:42 AM Dario Binacchi wrote: >> >> The previous version failed to boot from sd card with a log reported by >> the document [1]. In my case it always failed, a 100% failure against >> 75% reported by the document. >> >> Instead of adding the patch to fix the problem, I preferred to update >> the kernel version as suggested by the document itself. >> >> Tested on beaglebone black. >> >> [1] https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 >> Signed-off-by: Dario Binacchi >> --- >> configs/beaglebone_defconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig >> index 639b491e9746..dff7dea422ee 100644 >> --- a/configs/beaglebone_defconfig >> +++ b/configs/beaglebone_defconfig >> @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" >> # Kernel >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_TARBALL=y >> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" >> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.145-ti-r54)/linux-5.10.145-ti-r54.tar.gz" >> BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" >> BR2_LINUX_KERNEL_DTS_SUPPORT=y >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" >> -- >> 2.32.0 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From thomas.petazzoni at bootlin.com Mon Feb 6 08:47:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 09:47:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/xxhash: set MOREFLAGS In-Reply-To: <20230119184846.3693-1-fontaine.fabrice@gmail.com> References: <20230119184846.3693-1-fontaine.fabrice@gmail.com> Message-ID: <20230206094727.07b2902b@windsurf> On Thu, 19 Jan 2023 19:48:46 +0100 Fabrice Fontaine wrote: > Set MOREFLAGS instead of overriding CFLAGS to avoid the following build > failure raised since commit 94b66fb49cd57d0863245fbe0a3dc0833e76aad0: > > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /tmp/ccabb8cF.o: relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC > > Fixes: > - http://autobuild.buildroot.org/results/953133575d8c13266f1450fa545e70e4a518508d > > Signed-off-by: Fabrice Fontaine > --- > package/xxhash/xxhash.mk | 3 +-- > 1 file changed, 1 insertion(+), 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 Mon Feb 6 08:50:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 09:50:15 +0100 Subject: [Buildroot] [git commit] boot/barebox: pass required environment variables for reproducible build Message-ID: <20230206085219.40B8283958@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c90bd74ebb264ccc925f10a142ccd82ef63a4601 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Barebox makes use of the same variables as the linux kernel does for handling reproducible build -- KBUILD_BUILD_HOST, KBUILD_BUILD_TIMESTAMP, KBUILD_BUILD_USER. This patch sets the proper variables based on linux/linux.mk, and passes them to the make invocation when building, to ensure a reproducible build is possible when BR2_REPRODUCIBLE is enabled. Signed-off-by: Casey Reeves Signed-off-by: Thomas Petazzoni --- boot/barebox/barebox.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index da151d3c25..90be8c1ecc 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -74,6 +74,13 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) +ifeq ($(BR2_REPRODUCIBLE),y) +$(1)_MAKE_ENV += \ + KBUILD_BUILD_USER=buildroot \ + KBUILD_BUILD_HOST=buildroot \ + KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" +endif + ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) $(1)_KCONFIG_DEFCONFIG = $$(call qstrip,$$(BR2_TARGET_$(1)_BOARD_DEFCONFIG))_defconfig else ifeq ($$(BR2_TARGET_$(1)_USE_CUSTOM_CONFIG),y) @@ -121,7 +128,7 @@ endef define $(1)_BUILD_CMDS $$($(1)_BUILD_BAREBOXENV_CMDS) - $$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) + $$($(1)_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) $$($(1)_BUILD_CUSTOM_ENV) endef From thomas.petazzoni at bootlin.com Mon Feb 6 08:54:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 09:54:04 +0100 Subject: [Buildroot] [PATCH 2/2] boot/barebox: pass required environment variables for reproducible build In-Reply-To: <20230119121004.3416962-3-casey@xogium.me> References: <20230119121004.3416962-1-casey@xogium.me> <20230119121004.3416962-3-casey@xogium.me> Message-ID: <20230206095404.3662d995@windsurf> On Thu, 19 Jan 2023 13:10:04 +0100 Casey Reeves wrote: > Barebox makes use of the same variables as the linux kernel does for > handling reproducible build -- KBUILD_BUILD_HOST, > KBUILD_BUILD_TIMESTAMP, KBUILD_BUILD_USER. This patch sets the proper > variables based on linux/linux.mk, and passes them to the make > invocation when building, to ensure a reproducible build is possible > when BR2_REPRODUCIBLE is enabled. > > Signed-off-by: Casey Reeves > --- > boot/barebox/barebox.mk | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 08:54:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 09:54:21 +0100 Subject: [Buildroot] [git commit] package/libcamera-apps: bump to version 1.1.1 Message-ID: <20230206085501.335CC83967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80d98cd2a1c0eeb5c3083b3265c4f3221d1cb3c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- package/libcamera-apps/libcamera-apps.hash | 2 +- package/libcamera-apps/libcamera-apps.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash index cc2d3b6926..fbb3150cb5 100644 --- a/package/libcamera-apps/libcamera-apps.hash +++ b/package/libcamera-apps/libcamera-apps.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2d895ad5d11a6004b1e84eb8d486d5dca64dda1b41e0f4f3f87904666f249e3e libcamera-apps-1.1.0.tar.gz +sha256 c05e29e02da05fa92739941295d96dcb93324805f7b348ad182e7e29e7e0c520 libcamera-apps-1.1.1.tar.gz sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index a5d9227250..290ee9a026 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAMERA_APPS_VERSION = 1.1.0 +LIBCAMERA_APPS_VERSION = 1.1.1 LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,v$(LIBCAMERA_APPS_VERSION)) LIBCAMERA_APPS_LICENSE = BSD-2-Clause LIBCAMERA_APPS_LICENSE_FILES = license.txt From thomas.petazzoni at bootlin.com Mon Feb 6 08:55:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 09:55:01 +0100 Subject: [Buildroot] [PATCH] package/libcamera-apps: bump to version 1.1.1 In-Reply-To: <20230131132327.636417-1-marcus.folkesson@gmail.com> References: <20230131132327.636417-1-marcus.folkesson@gmail.com> Message-ID: <20230206095501.5519ddd1@windsurf> On Tue, 31 Jan 2023 14:23:27 +0100 Marcus Folkesson wrote: > Signed-off-by: Marcus Folkesson > --- > package/libcamera-apps/libcamera-apps.hash | 2 +- > package/libcamera-apps/libcamera-apps.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 Mon Feb 6 09:14:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 10:14:11 +0100 Subject: [Buildroot] [git commit] package/libcamera-apps: fix overflow conversion error Message-ID: <20230206092728.87DAF83972@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bbf8d89810479d2cc4777b84f3cc49bc3548d868 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Upstream commit: https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861 Fixes: - http://autobuild.buildroot.net/results/758631a9fcd62835844f78914a36dfb579e7beba/ Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- ...ore-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch b/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch new file mode 100644 index 0000000000..fbd1d2d4ba --- /dev/null +++ b/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch @@ -0,0 +1,35 @@ +From a65682a97e19f96b86aeceb3ca3befb1687e3861 Mon Sep 17 00:00:00 2001 +From: Marcus Folkesson +Date: Tue, 31 Jan 2023 09:14:15 +0100 +Subject: [PATCH] core: pass VIDIOC_QUERYCAP as unsigned long + +VIDIOC_QUARYCAP is an unsigned long and should be passed as one. + +Get rid of the following error: +core/libcamera_app.cpp:33:22: error: overflow in conversion from 'long unsigned int' to 'int' changes value from '2154321408' to '-2140645888' [-Werror=overflow] + 33 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); + +Upstream: https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861 +Signed-off-by: Marcus Folkesson +--- + core/libcamera_app.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/core/libcamera_app.cpp b/core/libcamera_app.cpp +index 04696fb..8cb6563 100644 +--- a/core/libcamera_app.cpp ++++ b/core/libcamera_app.cpp +@@ -30,7 +30,9 @@ static void check_camera_stack() + return; + + v4l2_capability caps; +- int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); ++ unsigned long request = VIDIOC_QUERYCAP; ++ ++ int ret = ioctl(fd, request, &caps); + close(fd); + + if (ret < 0 || strcmp((char *)caps.driver, "bm2835 mmal")) +-- +2.38.1 + From arnout at mind.be Mon Feb 6 09:28:39 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 10:28:39 +0100 Subject: [Buildroot] Development flow to track .config In-Reply-To: References: Message-ID: <562fd1af-139a-1aa8-4c71-bd7c6a001fe3@mind.be> On 31/01/2023 22:36, Edgar Bonet wrote: > Hello! > > Ramon Crichlow wrote: >> Is the following flow best practice? If not please suggest a better one. >> >> 1. Make a change to .config using make menuconfig >> 2. Diff the change between .config and .config.old >> 3. Edit abc_defconfig to mirror the changes in step 2 >> 4. Commit abc_defconfig > > Not sure it's the best, but here is what I do: > > 1. git switch -c 'my-custom-branch' > 2. make some_board_defconfig > 3. make nconfig # or your preferred variant of menuconfig, save and exit > 4. make savedefconfig # this will save the relevant changes to some_board_defconfig If you want to start from scratch instead of an existing defconfig, or if you want to save with a different filename, you can use make savedefconfig BR2_DEFCONFIG=/path/to/defconfig/file Regards, Arnout > 5. git commit -a -m 'My custom changes to some_board_defconfig' > > Best regards, > > Edgar. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Mon Feb 6 09:28:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 10:28:02 +0100 Subject: [Buildroot] [git commit] toolchain/Config.in: extend gcc bug 43744 to every sh architecture Message-ID: <20230206092943.645F78397B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee7cf14b5188aca5f17dd38ab0b6673d5789942b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Gcc bug 43744 affects seems to affect all SH family because it already affects: 1) sh4, here you can find a buildroot defconfig that fails to build: http://autobuild.buildroot.net/results/1db/1db6c59c98e3c09fa13277076ee2fbe7967f1f6b/defconfig 2) sh4a, here you can find a buildroot defconfig that fails to build: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a/defconfig Note also that gcc bugzilla entry reports the bug for SH and not for sub-architectures: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43744 So let's extend the bug to BR2_sh to match the entire SH architecture. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 544b423001..01215e0e96 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -115,7 +115,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_43744 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 - depends on BR2_sh4 + depends on BR2_sh # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63261. This bug no # longer exists in gcc 8.x. From thomas.petazzoni at bootlin.com Mon Feb 6 09:46:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 10:46:21 +0100 Subject: [Buildroot] [PATCH] package/libcamera-apps: fix overflow conversion error In-Reply-To: <20230131133626.638374-1-marcus.folkesson@gmail.com> References: <20230131133626.638374-1-marcus.folkesson@gmail.com> Message-ID: <20230206104621.5445bec9@windsurf> On Tue, 31 Jan 2023 14:36:26 +0100 Marcus Folkesson wrote: > Upstream commit: > https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861 > > Fixes: > - http://autobuild.buildroot.net/results/758631a9fcd62835844f78914a36dfb579e7beba/ > > Signed-off-by: Marcus Folkesson > --- > ...ass-VIDIOC_QUERYCAP-as-unsigned-long.patch | 34 +++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch Applied to master after adding a link to the upstream commit in the patch itself. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 09:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 10:46:35 +0100 Subject: [Buildroot] [PATCH v2] toolchain/Config.in: extend gcc bug 43744 to every sh architecture In-Reply-To: <20230205212521.903480-1-giulio.benetti@benettiengineering.com> References: <20230205131559.6f79944f@windsurf> <20230205212521.903480-1-giulio.benetti@benettiengineering.com> Message-ID: <20230206104635.3032742a@windsurf> On Sun, 5 Feb 2023 22:25:21 +0100 Giulio Benetti wrote: > Gcc bug 43744 affects seems to affect all SH family because it already > affects: > 1) sh4, here you can find a buildroot defconfig that fails to build: > http://autobuild.buildroot.net/results/1db/1db6c59c98e3c09fa13277076ee2fbe7967f1f6b/defconfig > 2) sh4a, here you can find a buildroot defconfig that fails to build: > http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a/defconfig > Note also that gcc bugzilla entry reports the bug for SH and not for > sub-architectures: > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43744 > > So let's extend the bug to BR2_sh to match the entire SH architecture. > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * add a commit log with details about gcc bug 43744 as pointed by Thomas Petazzoni > --- > toolchain/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 09:51:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 10:51:28 +0100 Subject: [Buildroot] [git commit] docs/website: fixing js for the new feed source Message-ID: <20230206095233.BB95C83988@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca97c78ee0e069c70b8fa051012ea02c911dbf2d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Feed source is moved to a local atom file available on the web server to remove further problems with unreliable feed sources. Moving the feed required a bit of refactor of the load_activity function so it won't download two times te same url. This change requires a cron job like this enabled on the website: * * * * * wget -O new.atom https://lore.kernel.org/buildroot/new.atom Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- docs/website/js/buildroot.js | 70 +++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/docs/website/js/buildroot.js b/docs/website/js/buildroot.js index bf80f11d7a..288e3e745c 100644 --- a/docs/website/js/buildroot.js +++ b/docs/website/js/buildroot.js @@ -1,39 +1,50 @@ -function load_activity(feedurl, divid) { - let container = document.getElementById(divid); +function display_activity(result, activity) { + let loaded = 0; + let nb_display = 8; + let container; + if (result==null) return; + for (let i = 0; i < result.feed.entry.length; i++) { + let entry = result.feed.entry[i]; + if (activity==="commit" && entry.title.toString().indexOf("git commit") !== -1) { + container = document.getElementById("commit-activity"); + } else if (activity==="mailing-list" && entry.title.toString().indexOf("git commit") === -1) { + container = document.getElementById("mailing-list-activity"); + } else { + continue; + } + loaded += 1 + if (loaded > nb_display) + break; + let div = document.createElement("p"); + let link = document.createElement("a"); + let d = new Date(entry.updated); + let data = '[' + d.toLocaleDateString() + '] ' + entry.title; + let text = document.createTextNode(data); + link.appendChild(text); + link.title = entry.title; + link.href = entry.link._href; + div.appendChild(link); + container.appendChild(div); + } + for (let i = 0; i < (nb_display - loaded); i++) { + container.appendChild(document.createElement("p")); + } +} + +function load_activity(feedurl) { $.ajax({ - url: "https://cors-anywhere.herokuapp.com/" + feedurl + url: feedurl }) .done(function(data){ let x2js = new X2JS(); let result = x2js.xml_str2json(data.documentElement.outerHTML); - let loaded = 0; - let nb_display = 8; - if (result==null) return; - for (let i = 0; i < result.feed.entry.length; i++) { - let entry = result.feed.entry[i]; - if (entry.title.indexOf("git commit") !== -1) - continue; - loaded += 1; - if (loaded > nb_display) - break; - let div = document.createElement("p"); - let link = document.createElement("a"); - let d = new Date(entry.published); - let data = '[' + d.toLocaleDateString() + '] ' + entry.title; - let text = document.createTextNode(data); - link.appendChild(text); - link.title = entry.title; - link.href = entry.link._href; - div.appendChild(link); - container.appendChild(div); - } - let empty = nb_display - loaded; - for (let i = 0; i < empty; i++) { - container.appendChild(document.createElement("p")); - } + display_activity(result, "commit"); + display_activity(result, "mailing-list"); }); } + + function google_analytics() { let _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-21761074-1']); @@ -86,8 +97,7 @@ jQuery(document).ready(function($) { url = url.split(/[\\/]/).pop(); $('.nav a[href="/' + url + '"]').parent().addClass('active'); - load_activity("http://buildroot-busybox.2317881.n4.nabble.com/Buildroot-busybox-ft2.xml", "mailing-list-activity"); - load_activity("http://git.buildroot.org/buildroot/atom/?h=master", "commit-activity"); + load_activity("/new.atom"); $('#slides').html('') }); From peter at korsgaard.com Mon Feb 6 09:59:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 10:59:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongoose: fix build with gcc 4.8 In-Reply-To: <20230114170738.1101463-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 14 Jan 2023 18:07:38 +0100") References: <20230114170738.1101463-1-fontaine.fabrice@gmail.com> Message-ID: <87mt5rdsif.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with gcc 4.8 raised since bump to > version 7.8 in commit f9e51e1150f59962577358b3da5c390ca4749291: > /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c: In function 'mg_iotest': > /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c:4484:3: error: 'for' loop initial declarations are only allowed in C99 mode > for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) { > ^ > Fixes: > - http://autobuild.buildroot.org/results/c538c6d8e87e4e24097c9878ee15083802276505 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From heiko.thiery at gmail.com Mon Feb 6 09:59:24 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 6 Feb 2023 10:59:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/iputils: bump version to 20221126 In-Reply-To: <20221126003807.462157-1-pevik@seznam.cz> References: <20221126003807.462157-1-pevik@seznam.cz> Message-ID: Hi Petr, Am Sa., 26. Nov. 2022 um 01:38 Uhr schrieb Petr Vorel : > > From: Petr Vorel > > This release removed: ninfod, rarpd, rdisc > => add entries to Config.in.legacy. > > LICENSE file got updated (just to use SPDX) > => update checksum. > > Signed-off-by: Petr Vorel Reviewed-by: Heiko Thiery > --- > Config.in.legacy | 24 ++++++++++++++++++++++++ > package/iputils/Config.in | 25 ------------------------- > package/iputils/iputils.hash | 6 +++--- > package/iputils/iputils.mk | 9 ++------- > 4 files changed, 29 insertions(+), 35 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index b3c35d6b07..6d20092ca4 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,30 @@ endif > > comment "Legacy options removed in 2022.11" > > +config BR2_PACKAGE_IPUTILS_NINFOD > + bool "iputils 20221126 removed ninfod" > + select BR2_LEGACY > + help > + iputils 20221126 removed ninfod. > + > +config BR2_PACKAGE_IPUTILS_RARPD > + bool "iputils 20221126 removed rarpd" > + select BR2_LEGACY > + help > + iputils 20221126 removed rarpd. > + > +config BR2_PACKAGE_IPUTILS_RDISC > + bool "iputils 20221126 removed rdisc" > + select BR2_LEGACY > + help > + iputils 20221126 removed rdisc. > + > +config BR2_PACKAGE_IPUTILS_RDISC_SERVER > + bool "iputils 20221126 removed rdisc" > + select BR2_LEGACY > + help > + iputils 20221126 removed rdisc. > + > config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 > bool "libopenssl rc5 was never enabled" > select BR2_LEGACY > diff --git a/package/iputils/Config.in b/package/iputils/Config.in > index 1a8b555570..ec7bc5418d 100644 > --- a/package/iputils/Config.in > +++ b/package/iputils/Config.in > @@ -28,37 +28,12 @@ config BR2_PACKAGE_IPUTILS_PING > help > Installs ping. > > -config BR2_PACKAGE_IPUTILS_RARPD > - bool "rarpd" > - help > - Installs rarpd. > - > -config BR2_PACKAGE_IPUTILS_RDISC > - bool "rdisc" > - default y > - help > - Installs rdisc. > - > -config BR2_PACKAGE_IPUTILS_RDISC_SERVER > - bool "rdisc (server code)" > - default y > - depends on BR2_PACKAGE_IPUTILS_RDISC > - help > - Builds rdisc with server code. > - > config BR2_PACKAGE_IPUTILS_TRACEPATH > bool "tracepath" > default y > help > Installs tracepath. > > -config BR2_PACKAGE_IPUTILS_NINFOD > - bool "ninfod" > - default y > - depends on BR2_TOOLCHAIN_HAS_THREADS # ninfod requires > - help > - Installs ninfod. > - > comment "ninfod needs a toolchain w/ threads" > depends on !BR2_TOOLCHAIN_HAS_THREADS > > diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash > index db52d990f2..ea23f27f3c 100644 > --- a/package/iputils/iputils.hash > +++ b/package/iputils/iputils.hash > @@ -1,6 +1,6 @@ > -# https://github.com/iputils/iputils/releases/download/20211215/sha256sum.asc > -sha256 b6f67fc705490673ff4471d006221b4a2f1b1180b929d9fefd771352621ccedf iputils-20211215.tar.gz > +# https://github.com/iputils/iputils/releases/download/20221126/sha256sum.asc > +sha256 745ea711fe06d5c57d470d21acce3c3ab866eb6afb69379a16c6d60b89bd4311 iputils-20221126.tar.gz > # Locally computed > -sha256 973281334c2da6364fa6bdc44c1f0f8d60d80d73c782982ffc5d53b0a31aa042 LICENSE > +sha256 2c9f29d982c48665c30b3adaf400c048988fd256eb91c691e351eb3b6a8b2036 LICENSE > sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/LICENSE.GPL2 > diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk > index 84059de330..fe4468ec19 100644 > --- a/package/iputils/iputils.mk > +++ b/package/iputils/iputils.mk > @@ -11,7 +11,7 @@ > # and IPv6 updates. > # http://www.spinics.net/lists/netdev/msg279881.html > > -IPUTILS_VERSION = 20211215 > +IPUTILS_VERSION = 20221126 > IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) > IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause > IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 > @@ -21,19 +21,14 @@ IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) > # Selectively build binaries > IPUTILS_CONF_OPTS += \ > -DBUILD_CLOCKDIFF=$(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),true,false) \ > - -DBUILD_RARPD=$(if $(BR2_PACKAGE_IPUTILS_RARPD),true,false) \ > - -DBUILD_RDISC=$(if $(BR2_PACKAGE_IPUTILS_RDISC),true,false) \ > - -DENABLE_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \ > -DBUILD_TRACEPATH=$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),true,false) \ > - -DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) \ > -DSKIP_TESTS=true > > # Selectively select the appropriate SELinux refpolicy modules > IPUTILS_SELINUX_MODULES = \ > $(if $(BR2_PACKAGE_IPUTILS_ARPING),netutils) \ > $(if $(BR2_PACKAGE_IPUTILS_PING),netutils) \ > - $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) \ > - $(if $(BR2_PACKAGE_IPUTILS_RDISC),rdisc) > + $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) > > # > # arping > -- > 2.38.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Mon Feb 6 09:59:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 10:59:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/gpsd: bump to version 3.25 In-Reply-To: <20230114181556.1371822-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 14 Jan 2023 19:15:56 +0100") References: <20230114181556.1371822-1-fontaine.fabrice@gmail.com> Message-ID: <87ilgfdsgw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patch (not needed anymore) > https://gitlab.com/gpsd/gpsd/-/blob/release-3.25/NEWS > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 10:01:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:01:01 +0100 Subject: [Buildroot] [git commit] package/mongoose: fix build with gcc 4.8 Message-ID: <20230206100111.44810839C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6139aeacd847487a296f1c7b8a9d302d678cd8ab 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 7.8 in commit f9e51e1150f59962577358b3da5c390ca4749291: /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c: In function 'mg_iotest': /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c:4484:3: error: 'for' loop initial declarations are only allowed in C99 mode for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) { ^ Fixes: - http://autobuild.buildroot.org/results/c538c6d8e87e4e24097c9878ee15083802276505 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mongoose/mongoose.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 8d06ed4689..0693f7553a 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -13,7 +13,7 @@ MONGOOSE_INSTALL_STAGING = YES # static library MONGOOSE_INSTALL_TARGET = NO -MONGOOSE_CFLAGS = $(TARGET_CFLAGS) +MONGOOSE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGOOSE_DEPENDENCIES += openssl From peter at korsgaard.com Mon Feb 6 10:01:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:01:01 +0100 Subject: [Buildroot] [git commit] package/gpsd: bump to version 3.25 Message-ID: <20230206100111.4FD34839F0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c7fece853f3def9a425eccc384b9dacb1010051 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (not needed anymore) https://gitlab.com/gpsd/gpsd/-/blob/release-3.25/NEWS Signed-off-by: Fabrice Fontaine Tested-by: Yann E. MORIN Acked-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- package/gpsd/0001-gpsctl-fix-yodaification.patch | 44 ------------------------ package/gpsd/gpsd.hash | 2 +- package/gpsd/gpsd.mk | 2 +- 3 files changed, 2 insertions(+), 46 deletions(-) diff --git a/package/gpsd/0001-gpsctl-fix-yodaification.patch b/package/gpsd/0001-gpsctl-fix-yodaification.patch deleted file mode 100644 index 753ff300eb..0000000000 --- a/package/gpsd/0001-gpsctl-fix-yodaification.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 72ae7ce646792b07061cbbb31ed47f55a1d2422c Mon Sep 17 00:00:00 2001 -Message-Id: <72ae7ce646792b07061cbbb31ed47f55a1d2422c.1663075350.git.yann.morin at orange.com> -From: "Yann E. MORIN" -Date: Tue, 13 Sep 2022 15:10:48 +0200 -Subject: [PATCH] gpsctl: fix yodaification - -Commit d5a672abd98a (gpsctl.c: Style tweaks. Yoda style, braces, // -comments.) claimed "No functional changes", but mis-treated a comparison -when it was converted to yoda-style (simplified diff): - - - if (write(gpsdata->gps_fd, buf, strlen(buf)) <= 0) { - + if (0 <= write(gpsdata->gps_fd, buf, strlen(buf))) { - -As one may notice, the comparison operator was not reversed while the -operands were. - -This got silently fixed in commit 3219ab9f6a89 (gpsctl.c: First cut at ---ship sending commands to running gpsd.) but this is completely -unrelated. - -Fix that comparison. - -Signed-off-by: Yann E. MORIN -Upstream status: not applicable as already fixed. ---- - gpsctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gpsctl.c b/gpsctl.c -index cb342af87..ef59a6622 100644 ---- a/gpsctl.c -+++ b/gpsctl.c -@@ -96,7 +96,7 @@ static bool gps_query(struct gps_data_t *gpsdata, - if ('\n' != buf[strnlen(buf, sizeof(buf) - 1) - 1]) { - (void)strlcat(buf, "\n", sizeof(buf)); - } -- if (0 <= write(gpsdata->gps_fd, buf, strnlen(buf, sizeof(buf)))) { -+ if (0 >= write(gpsdata->gps_fd, buf, strnlen(buf, sizeof(buf)))) { - GPSD_LOG(LOG_ERROR, &context.errout, "gps_query(), write failed\n"); - return false; - } --- -2.25.1 - diff --git a/package/gpsd/gpsd.hash b/package/gpsd/gpsd.hash index f415c3af0f..15e1181ed9 100644 --- a/package/gpsd/gpsd.hash +++ b/package/gpsd/gpsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c gpsd-3.24.tar.gz +sha256 b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2 gpsd-3.25.tar.gz sha256 fdf339997bbca9eaf507476b82fbcac608fc39a3d89b86b51e16db4c9f933716 COPYING diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 961ebde649..d7425513fd 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSD_VERSION = 3.24 +GPSD_VERSION = 3.25 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-2-Clause GPSD_LICENSE_FILES = COPYING From james.hilliard1 at gmail.com Mon Feb 6 10:02:10 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 03:02:10 -0700 Subject: [Buildroot] [PATCH 1/1] package/iwd: bump to version 2.3 Message-ID: <20230206100210.1220585-1-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 be048b3da6..1647f93d9e 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 dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570 iwd-2.2.tar.xz +sha256 b0506d797a8bfb88f3c3eeea5e49dcf4ee8e6cef118f57c118e587eeb377ac64 iwd-2.3.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index b0a2f6e9ed..c54031b102 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 2.2 +IWD_VERSION = 2.3 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Feb 6 10:02:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:02:10 +0100 Subject: [Buildroot] [PATCH] docs/website: fixing js for the new feed source In-Reply-To: <20220925160320.80027-1-angelo@amarulasolutions.com> References: <20220925160320.80027-1-angelo@amarulasolutions.com> Message-ID: <20230206110210.235520f6@windsurf> On Sun, 25 Sep 2022 18:03:20 +0200 Angelo Compagnucci wrote: > Feed source is moved to a local atom file available on the web server to > remove further problems with unreliable feed sources. > Moving the feed required a bit of refactor of the load_activity function > so it won't download two times te same url. > > This change requires a cron job like this enabled on the website: > * * * * * wget -O new.atom https://lore.kernel.org/buildroot/new.atom > > Signed-off-by: Angelo Compagnucci > --- > docs/website/js/buildroot.js | 70 ++++++++++++++++++++---------------- > 1 file changed, 40 insertions(+), 30 deletions(-) Finally applied, now that the cronjob is in place on the server! Thanks a lot for your contribution and patience! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 6 10:03:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:03:10 +0100 Subject: [Buildroot] [next] package/thermald: bump to 2.5.1 In-Reply-To: <20221127141926.1976657-1-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 11:19:26 -0300") References: <20221127141926.1976657-1-ricardo.martincoski@gmail.com> Message-ID: <87edr3dsbl.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > README.txt states only these changes: > - Static analysis fixes > - Missing init, which causes skipping of conditions in a Dell system > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 6 10:02:53 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 11:02:53 +0100 Subject: [Buildroot] [git commit] package/yajl: explicitly request a tag in _SITE Message-ID: <20230206100315.9B99A839FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5be76a39d3a0c21d6f3ceeab0889edc3cec9f2f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The yajl repository has both a branch and a tag names 2.1.0. Because of this, when we use the usual github URL [1], github doesn't return a tarball but rather an ASCII string: the given path has multiple possibilities: #, # This obviously (and fortunately) leads to a hash check failure. To make sure we get the tag and not the branch, we should use a URL that explicitly asks for refs/tags/2.1.0 [2]. We can't change VERSION to include refs/tags, because that also affects the _SOURCE default, the contents of the tarball, the CPE ID and the release-monitoring access. Therefore, add the refs/tags/ prefix to the github helper call. [1] https://github.com/lloyd/yajl/archive/2.1.0/yajl-2.1.0.tar.gz [1] https://github.com/lloyd/yajl/archive/refs/tags/2.1.0/yajl-2.1.0.tar.gz Signed-off-by: Arnout Vandecappelle --- package/yajl/yajl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index 1fb16f50e9..d14a68b402 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -5,7 +5,7 @@ ################################################################################ YAJL_VERSION = 2.1.0 -YAJL_SITE = $(call github,lloyd,yajl,$(YAJL_VERSION)) +YAJL_SITE = $(call github,lloyd,yajl,refs/tags/$(YAJL_VERSION)) YAJL_INSTALL_STAGING = YES YAJL_LICENSE = ISC YAJL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 6 10:03:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:03:19 +0100 Subject: [Buildroot] [git commit] package/thermald: bump to 2.5.1 Message-ID: <20230206100434.5DF8283A2B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11d98385f56e61e2928707f056c001ceec5d06e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master README.txt states only these changes: - Static analysis fixes - Missing init, which causes skipping of conditions in a Dell system Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/thermald/thermald.hash | 2 +- package/thermald/thermald.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/thermald/thermald.hash b/package/thermald/thermald.hash index eceff77d37..9693813ca9 100644 --- a/package/thermald/thermald.hash +++ b/package/thermald/thermald.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e6515678ce8ff37978a453e1617a087a40ba3a31809a42c1768b6f816e564cc9 thermald-2.5.tar.gz +sha256 75c165df45b3d09c904d314c8c19789158e9538f46e3d2b606457dc631eb3af5 thermald-2.5.1.tar.gz sha256 e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d COPYING diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk index 38f6b5a00f..fd0246745f 100644 --- a/package/thermald/thermald.mk +++ b/package/thermald/thermald.mk @@ -4,7 +4,7 @@ # ################################################################################ -THERMALD_VERSION = 2.5 +THERMALD_VERSION = 2.5.1 THERMALD_SITE = $(call github,intel,thermal_daemon,v$(THERMALD_VERSION)) # fetched from Github, with no configure script THERMALD_AUTORECONF = YES From heiko.thiery at gmail.com Mon Feb 6 10:09:07 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 6 Feb 2023 11:09:07 +0100 Subject: [Buildroot] [PATCH 2/2] package/crudini: add host-crudini In-Reply-To: <20220920232154.1219792-2-KAMenyaev@sberdevices.ru> References: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> <20220920232154.1219792-2-KAMenyaev@sberdevices.ru> Message-ID: Hi, Am Mi., 21. Sept. 2022 um 01:24 Uhr schrieb Konstantin Menyaev via buildroot : > > From: Konstantin Menyaev > > Make the host variant of crudini package. This can be useful in > post-{build,image} scripts. > > Signed-off-by: Konstantin Menyaev Reviewed-by: Heiko Thiery > --- > package/Config.in.host | 1 + > package/crudini/Config.in.host | 9 +++++++++ > package/crudini/crudini.mk | 1 + > 3 files changed, 11 insertions(+) > create mode 100644 package/crudini/Config.in.host > > diff --git a/package/Config.in.host b/package/Config.in.host > index fb805577d1..055e846e39 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -12,6 +12,7 @@ menu "Host utilities" > source "package/checksec/Config.in.host" > source "package/cmake/Config.in.host" > source "package/cramfs/Config.in.host" > + source "package/crudini/Config.in.host" > source "package/cryptsetup/Config.in.host" > source "package/dbus-python/Config.in.host" > source "package/delve/Config.in.host" > diff --git a/package/crudini/Config.in.host b/package/crudini/Config.in.host > new file mode 100644 > index 0000000000..5e0040883f > --- /dev/null > +++ b/package/crudini/Config.in.host > @@ -0,0 +1,9 @@ > +config BR2_PACKAGE_HOST_CRUDINI > + bool "host crudini" > + depends on BR2_PACKAGE_HOST_PYTHON3 > + select BR2_PACKAGE_HOST_PYTHON_INIPARSE # runtime > + help > + A utility for handling ini files from the command line and > + shell scripts > + > + https://pypi.python.org/pypi/crudini > diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk > index 7141e2b2a0..c376c5f777 100644 > --- a/package/crudini/crudini.mk > +++ b/package/crudini/crudini.mk > @@ -11,3 +11,4 @@ CRUDINI_LICENSE = GPL-2.0 > CRUDINI_LICENSE_FILES = COPYING > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.37.3 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From heiko.thiery at gmail.com Mon Feb 6 10:12:00 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 6 Feb 2023 11:12:00 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-iniparse: add host-python-iniparse In-Reply-To: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> References: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> Message-ID: Hi, Am Mi., 21. Sept. 2022 um 01:24 Uhr schrieb : > > From: Konstantin Menyaev > > Make the host variant of python-iniparse > as host-crudini dependency. > > Signed-off-by: Konstantin Menyaev Reviewed-by: Heiko Thiery > --- > package/Config.in.host | 1 + > package/python-iniparse/Config.in.host | 11 +++++++++++ > package/python-iniparse/python-iniparse.mk | 1 + > 3 files changed, 13 insertions(+) > create mode 100644 package/python-iniparse/Config.in.host > > diff --git a/package/Config.in.host b/package/Config.in.host > index f437ef680c..fb805577d1 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -72,6 +72,7 @@ menu "Host utilities" > source "package/pkgconf/Config.in.host" > source "package/pru-software-support/Config.in.host" > source "package/pwgen/Config.in.host" > + source "package/python-iniparse/Config.in.host > source "package/python-cython/Config.in.host" > source "package/python-greenlet/Config.in.host" > source "package/python-kflash/Config.in.host" > diff --git a/package/python-iniparse/Config.in.host b/package/python-iniparse/Config.in.host > new file mode 100644 > index 0000000000..e93022e815 > --- /dev/null > +++ b/package/python-iniparse/Config.in.host > @@ -0,0 +1,11 @@ > +config BR2_PACKAGE_HOST_PYTHON_INIPARSE > + bool "host python-iniparse" > + select BR2_PACKAGE_HOST_PYTHON_SIX # runtime > + help > + iniparse is an INI parser for Python which is API compatible > + with the standard library's ConfigParser, preserves > + structure of INI files (order of sections & options, > + indentation, comments, and blank lines are preserved when > + data is updated), and is more convenient to use. > + > + https://pypi.python.org/pypi/iniparse > diff --git a/package/python-iniparse/python-iniparse.mk b/package/python-iniparse/python-iniparse.mk > index d31a490bd8..e76987d1e9 100644 > --- a/package/python-iniparse/python-iniparse.mk > +++ b/package/python-iniparse/python-iniparse.mk > @@ -12,3 +12,4 @@ PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE > PYTHON_INIPARSE_SETUP_TYPE = setuptools > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.37.3 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Mon Feb 6 10:17:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:17:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/iwd: bump to version 2.3 In-Reply-To: <20230206100210.1220585-1-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 6 Feb 2023 03:02:10 -0700") References: <20230206100210.1220585-1-james.hilliard1@gmail.com> Message-ID: <87a61rdrnt.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 10:17:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:17:15 +0100 Subject: [Buildroot] [git commit] package/iwd: bump to version 2.3 Message-ID: <20230206101742.CFC8083A3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6929c0cdd944c86b0affbe04cf72c2c0398da64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 be048b3da6..1647f93d9e 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 dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570 iwd-2.2.tar.xz +sha256 b0506d797a8bfb88f3c3eeea5e49dcf4ee8e6cef118f57c118e587eeb377ac64 iwd-2.3.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index b0a2f6e9ed..c54031b102 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 2.2 +IWD_VERSION = 2.3 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 Mon Feb 6 10:19:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:19:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: bump to version 3.3a In-Reply-To: <20230205145532.659422-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 5 Feb 2023 15:55:32 +0100") References: <20230205145532.659422-1-fontaine.fabrice@gmail.com> Message-ID: <875ycfdrjv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > systemd is an optional dependency since > https://github.com/tmux/tmux/commit/fc7f1e7acb3539a43df46136e971f770515e0b0d > https://github.com/tmux/tmux/blob/3.3a/CHANGES > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 10:20:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:20:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.19.0 In-Reply-To: <20230205152108.GR2960@scaer> (Yann E. MORIN's message of "Sun, 5 Feb 2023 16:21:08 +0100") References: <20230202192526.30357-1-bernd.kuhls@t-online.de> <20230205152108.GR2960@scaer> Message-ID: <871qn3dri1.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Bernd, All, > On 2023-02-02 20:25 +0100, Bernd Kuhls spake thusly: >> Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md >> >> Signed-off-by: Bernd Kuhls > Applied to master, thanks. Looks like that wasn't done after all, but now I've committed it - Thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 10:19:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:19:44 +0100 Subject: [Buildroot] [git commit] package/xmrig: bump version to 6.19.0 Message-ID: <20230206102110.8813B83A68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67ceef8affcb0300efcabab886e9819f56351fd6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 3c50faf23f..781e089de8 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f97fe20248e0eb452f77e9b69f2fb1510b852152b3af4f9a8b20680c854888d1 xmrig-6.18.1.tar.gz +sha256 772f947058e5b89ca9bf34128487def47796870b547439a9b0524ddd1899420c xmrig-6.19.0.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index ca5bcecfbe..f345ba9cf9 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.18.1 +XMRIG_VERSION = 6.19.0 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 6 10:19:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:19:32 +0100 Subject: [Buildroot] [git commit] package/tmux: bump to version 3.3a Message-ID: <20230206102110.7DEE483A66@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e279599d255a79c08ef20b97b96eb248689d52a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master systemd is an optional dependency since https://github.com/tmux/tmux/commit/fc7f1e7acb3539a43df46136e971f770515e0b0d https://github.com/tmux/tmux/blob/3.3a/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tmux/tmux.hash | 2 +- package/tmux/tmux.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index 75538e09ae..b5c0fe58d0 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386 tmux-3.1c.tar.gz +sha256 e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f tmux-3.3a.tar.gz sha256 c031bd37f464c534277814f6aa38686fa023d094261d57fd2545ad592bb53ccd COPYING diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index b1c0af1a83..47ee9b16ca 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,13 +4,20 @@ # ################################################################################ -TMUX_VERSION = 3.1c +TMUX_VERSION = 3.3a TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +TMUX_DEPENDENCIES += systemd +TMUX_CONF_OPTS += --enable-systemd +else +TMUX_CONF_OPTS += --disable-systemd +endif + ifeq ($(BR2_PACKAGE_UTF8PROC),y) TMUX_DEPENDENCIES += utf8proc TMUX_CONF_OPTS += --enable-utf8proc From angelo at amarulasolutions.com Mon Feb 6 10:22:35 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 11:22:35 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.162-cip24 Message-ID: <20230206102235.63667-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- linux/Config.in | 8 ++++---- linux/linux.hash | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index a0e9286bd3..774f1e0975 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -32,7 +32,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.145-cip17)" + bool "Latest CIP SLTS version (5.10.162-cip24)" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL help CIP launched in the spring of 2016 to address the needs of @@ -52,7 +52,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.145-cip17-rt7)" + bool "Latest CIP RT SLTS version (5.10.162-cip24-rt10)" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL help Same as the CIP version, but this is the PREEMPT_RT realtime @@ -129,8 +129,8 @@ endif config BR2_LINUX_KERNEL_VERSION string default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION - default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.145-cip17-rt7" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "5.10.162-cip24-rt10" 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 927172e8fa..e88abe5bb8 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,8 +10,8 @@ sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux- sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed -sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz -sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz +sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz +sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING -- 2.25.1 From peter at korsgaard.com Mon Feb 6 10:23:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:23:28 +0100 Subject: [Buildroot] [next 01/25] *: fix typo for separate(d|) in text In-Reply-To: <20221127130739.1862398-2-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:15 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-2-ricardo.martincoski@gmail.com> Message-ID: <87v8kfcctb.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > seperate is a common misspelling of separate > Fix all the typos in the tree that are not related to patch files. > CHANGES > seperate -> separate, in the list of changes > Config.in.legacy > seperate -> separate, in option name and help texts > package/leafnode2/leafnode2.mk > seperate -> separate, in a comment > system/Config.in > seperated -> separated, in a help text > Cc: Bernd Kuhls > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 10:24:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:24:08 +0100 Subject: [Buildroot] [next 02/25] package, legacy: fix typo for "daemon" on help text In-Reply-To: <20221127130739.1862398-3-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:16 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-3-ricardo.martincoski@gmail.com> Message-ID: <87r0v3ccs7.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > deamon -> daemon > At same time, in Config.in.legacy fix other typos in the same help text: > spae -> space > monolitic -> monolithic > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 10:26:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:26:27 +0100 Subject: [Buildroot] [next 03/25] Config.in.legacy: fix typo on BR2_PACKAGE_MEDIAART_BACKEND_QT In-Reply-To: <20221127130739.1862398-4-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:17 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-4-ricardo.martincoski@gmail.com> Message-ID: <87mt5rccoc.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Currently using this minimal .config: > BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF=y > triggers: > *** Legacy options removed in 2018.05 *** > [ ] libmediaart none backend option renamed (NEW) > [*] libmediaart gdk-pixbuf backend option renamed > [*] libmediaart qt backend option renamed > Commit "8553b39887 libmediaart: rename options to have proper prefix", > part of the 2018.05 release had a copy&paste error. > As stated in the beginning of the file: > The oldest symbols will be removed again after about two years. > But while we carry these legacy symbols, let's fix the typo. > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski > --- > NOTE: Maybe it is time to drop old legacy symbols again? > If so, some patches in this series can be dropped. Possibly, but they don't really cause a big maintenance issue, so I've left them for now. Committed, thanks. > --- > Config.in.legacy | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/Config.in.legacy b/Config.in.legacy > index 4eff5b55d6..9ce1004b0c 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -2594,7 +2594,7 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF > BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to > BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF > -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF > +config BR2_PACKAGE_MEDIAART_BACKEND_QT > bool "libmediaart qt backend option renamed" > select BR2_LEGACY > help > -- > 2.34.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From heiko.thiery at gmail.com Mon Feb 6 10:35:24 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 6 Feb 2023 11:35:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/netopeer2: fix sysv init script, does not start In-Reply-To: <20230131142003.1354787-1-troglobit@gmail.com> References: <20230131142003.1354787-1-troglobit@gmail.com> Message-ID: Hi Joachim, Am Di., 31. Jan. 2023 um 15:20 Uhr schrieb Joachim Wiberg : > > - The netopeer server forks to background by default, no need for '-b' > - The path to the daemon is /usr/sbin, not /usr/bin > > Signed-off-by: Joachim Wiberg Acked-by: Heiko Thiery > --- > package/netopeer2/S52netopeer2 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/netopeer2/S52netopeer2 b/package/netopeer2/S52netopeer2 > index cf53a8f109..cadd6b9feb 100644 > --- a/package/netopeer2/S52netopeer2 > +++ b/package/netopeer2/S52netopeer2 > @@ -8,7 +8,7 @@ NETOPEER2_SERVER_ARGS="" > start() { > printf 'Starting %s: ' "$DAEMON" > > - start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ > + start-stop-daemon -S -q -p $PIDFILE -x "/usr/sbin/$DAEMON" \ > -- $NETOPEER2_SERVER_ARGS > status=$? > if [ "$status" -eq 0 ]; then > -- > 2.34.1 > From angelo at amarulasolutions.com Mon Feb 6 10:45:59 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 11:45:59 +0100 Subject: [Buildroot] [PATCH] docs/website: better recent commits/discussions output Message-ID: <20230206104559.86803-1-angelo@amarulasolutions.com> Removing the "[Buildroot]" and the "Re:" from messages title to have a cleaner look on the "news" boxes. Signed-off-by: Angelo Compagnucci --- docs/website/js/buildroot.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/website/js/buildroot.js b/docs/website/js/buildroot.js index 288e3e745c..b2975fb609 100644 --- a/docs/website/js/buildroot.js +++ b/docs/website/js/buildroot.js @@ -19,6 +19,8 @@ function display_activity(result, activity) { let link = document.createElement("a"); let d = new Date(entry.updated); let data = '[' + d.toLocaleDateString() + '] ' + entry.title; + data = data.replace("Re: ",""); + data = data.replace("[Buildroot] ",""); let text = document.createTextNode(data); link.appendChild(text); link.title = entry.title; -- 2.25.1 From peter at korsgaard.com Mon Feb 6 10:22:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:22:17 +0100 Subject: [Buildroot] [git commit] *: fix typo for separate(d|) in text Message-ID: <20230206105450.32C5E83371@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4092d2a3546c1edfcb27f9d00fd4e7cac9878d2f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master seperate is a common misspelling of separate Fix all the typos in the tree that are not related to patch files. CHANGES seperate -> separate, in the list of changes Config.in.legacy seperate -> separate, in option name and help texts package/leafnode2/leafnode2.mk seperate -> separate, in a comment system/Config.in seperated -> separated, in a help text Cc: Bernd Kuhls Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- CHANGES | 4 ++-- Config.in.legacy | 6 +++--- package/leafnode2/leafnode2.mk | 2 +- system/Config.in | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index dbf62e5a63..9fd8b31350 100644 --- a/CHANGES +++ b/CHANGES @@ -7737,7 +7737,7 @@ Architecture: Default to bf532 CPU variant for blackfin, Fix flat one memory region support for m68k and disable flat - seperate data support because of compatibility issues. + separate data support because of compatibility issues. Defconfigs: Minnowboard and Raspberrypi: Fix errors with post-build scripts when systemd is used. @@ -8273,7 +8273,7 @@ Minor fixes. - Merged/seperate /usr handling is now also performed for + Merged/separate /usr handling is now also performed for staging so cross-gdb / gdbserver can find the libraries. Updated/fixed packages: autossh, conntrack-tools, dcron, diff --git a/Config.in.legacy b/Config.in.legacy index 1c5af2652a..e95460f82b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -3346,7 +3346,7 @@ config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND select BR2_PACKAGE_RESTORECOND help The policycoreutils package no longer offers restorecond - as a option. This package has been moved into a seperate + as a option. This package has been moved into a separate package maintained by the SELinux maintainers. config BR2_PACKAGE_SEPOLGEN @@ -3940,7 +3940,7 @@ config BR2_GDB_VERSION_7_9 comment "Legacy options removed in 2016.11" config BR2_PACKAGE_PHP_SAPI_CLI_CGI - bool "PHP CGI and CLI options are now seperate" + bool "PHP CGI and CLI options are now separate" select BR2_PACKAGE_PHP_SAPI_CLI select BR2_PACKAGE_PHP_SAPI_CGI select BR2_LEGACY @@ -4970,7 +4970,7 @@ config BR2_PACKAGE_KODI_PVR_ADDONS select BR2_PACKAGE_KODI_PVR_VUPLUS select BR2_PACKAGE_KODI_PVR_WMC help - Kodi PVR addon was split into seperate modules + Kodi PVR addon was split into separate modules config BR2_BINUTILS_VERSION_2_23_2 bool "binutils 2.23 option renamed" diff --git a/package/leafnode2/leafnode2.mk b/package/leafnode2/leafnode2.mk index a02aad4302..e82ca2e1ee 100644 --- a/package/leafnode2/leafnode2.mk +++ b/package/leafnode2/leafnode2.mk @@ -23,7 +23,7 @@ LEAFNODE2_CONF_OPTS = \ --enable-runas-user=root # Leafnode2 needs the host version of b_sortnl during -# compilation. Instead of creating a seperate host package and +# compilation. Instead of creating a separate host package and # installing b_sortnl to $(HOST_DIR) this binary is compiled # on-the-fly, host-pcre is needed for this define LEAFNODE2_BUILD_SORTNL_TOOL diff --git a/system/Config.in b/system/Config.in index 806a747315..731dceaa17 100644 --- a/system/Config.in +++ b/system/Config.in @@ -483,7 +483,7 @@ config BR2_ENABLE_LOCALE_WHITELIST default "C en_US" depends on BR2_ENABLE_LOCALE_PURGE help - Whitespace seperated list of locales to allow on target. + Whitespace separated list of locales to allow on target. Locales not listed here will be removed from the target. See 'locale -a' on your host for a list of locales available on your build host, or have a look in /usr/share/locale in From peter at korsgaard.com Mon Feb 6 10:24:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:24:31 +0100 Subject: [Buildroot] [git commit] Config.in.legacy: fix typo on BR2_PACKAGE_MEDIAART_BACKEND_QT Message-ID: <20230206105450.4BD4D83530@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=316e149611a761db04171ee6141048d9057183c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently using this minimal .config: BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF=y triggers: *** Legacy options removed in 2018.05 *** [ ] libmediaart none backend option renamed (NEW) [*] libmediaart gdk-pixbuf backend option renamed [*] libmediaart qt backend option renamed Commit "8553b39887 libmediaart: rename options to have proper prefix", part of the 2018.05 release had a copy&paste error. As stated in the beginning of the file: The oldest symbols will be removed again after about two years. But while we carry these legacy symbols, let's fix the typo. Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 4d82a54208..e5cfcea8fa 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2700,7 +2700,7 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF +config BR2_PACKAGE_MEDIAART_BACKEND_QT bool "libmediaart qt backend option renamed" select BR2_LEGACY help From peter at korsgaard.com Mon Feb 6 10:23:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:23:43 +0100 Subject: [Buildroot] [git commit] package, legacy: fix typo for "daemon" on help text Message-ID: <20230206105450.3F1918347B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a9feaabbce4f21dd2a688d35a5027cb0e2a7a22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master deamon -> daemon At same time, in Config.in.legacy fix other typos in the same help text: spae -> space monolitic -> monolithic Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 4 ++-- package/ngircd/Config.in | 2 +- package/rp-pppoe/Config.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e95460f82b..4d82a54208 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4430,8 +4430,8 @@ config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - - a monolitic user space library - - a user spae deamon driver + - a monolithic user space library + - a user space daemon driver config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" diff --git a/package/ngircd/Config.in b/package/ngircd/Config.in index 9b3d430922..1e93a5702c 100644 --- a/package/ngircd/Config.in +++ b/package/ngircd/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_NGIRCD bool "ngircd" depends on BR2_USE_MMU # fork() help - Next Generation IRC server deamon. + Next Generation IRC server daemon. http://ngircd.barton.de diff --git a/package/rp-pppoe/Config.in b/package/rp-pppoe/Config.in index 2ac81cbb2d..6ff005a1e1 100644 --- a/package/rp-pppoe/Config.in +++ b/package/rp-pppoe/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_RP_PPPOE select BR2_PACKAGE_PPPD help An implementation of the Point-to-point protocol over - Ethernet. Has userspace client and server deamons. You + Ethernet. Has userspace client and server daemons. You likely only need this package if you are implementing the pppoe server that will service other pppoe client devices. Otherwise the normal client functionality already From peter at korsgaard.com Mon Feb 6 10:26:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:26:41 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib: warn about redefined config Message-ID: <20230206105450.57344835C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bbda72743d39df29dfc91e0f52be02b2d465f6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Warn the developer in the case the same config is declared more than once in the same Config.in file. But take into account the conditional code that lets the config be visible and warn only when it is declared more than once in the same conditions. For instance, do not warn for: if BR2_PACKAGE_BUSYBOX config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_config.py | 38 ++++++++++++++++ utils/checkpackagelib/test_lib_config.py | 78 ++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index b05831f2c3..f26ca0d898 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -233,3 +233,41 @@ class Indent(_CheckFunction): return ["{}:{}: should not be indented" .format(self.filename, lineno), text] + + +class RedefinedConfig(_CheckFunction): + CONFIG = re.compile(r"^\s*(menu|)config\s+(BR2_\w+)\b") + IF = re.compile(r"^\s*if\s+([^#]*)\b") + ENDIF = re.compile(r"^\s*endif\b") + + def before(self): + self.configs = {} + self.conditional = [] + + def check_line(self, lineno, text): + if _empty_or_comment(text) or _part_of_help_text(text): + return + + m = self.IF.search(text) + if m is not None: + condition = m.group(1) + self.conditional.append(condition) + return + + m = self.ENDIF.search(text) + if m is not None: + self.conditional.pop() + return + + m = self.CONFIG.search(text) + if m is None: + return + config = m.group(2) + + key = (config, ' AND '.join(self.conditional)) + if key in self.configs.keys(): + previous_line = self.configs[key] + return ["{}:{}: config {} redeclared (previous line: {})" + .format(self.filename, lineno, config, previous_line), + text] + self.configs[key] = lineno diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py index 91a549adf2..474d17105e 100644 --- a/utils/checkpackagelib/test_lib_config.py +++ b/utils/checkpackagelib/test_lib_config.py @@ -385,3 +385,81 @@ Indent = [ def test_Indent(testname, filename, string, expected): warnings = util.check_file(m.Indent, filename, string) assert warnings == expected + + +RedefinedConfig = [ + ('no redefinition', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO_BAR\n' + 'bool "foo"\n', + []), + ('no conditional', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('three times', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:3: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n'], + ['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('same conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:6: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:8: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('not equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if !BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', RedefinedConfig) +def test_RedefinedConfig(testname, filename, string, expected): + warnings = util.check_file(m.RedefinedConfig, filename, string) + assert warnings == expected From yann.morin.1998 at free.fr Mon Feb 6 10:56:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 11:56:49 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-iniparse: add host-python-iniparse In-Reply-To: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> References: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> Message-ID: <20230206105649.GA3565@scaer> Konstantin, All, On 2022-09-21 02:21 +0300, KAMenyaev at sberdevices.ru spake thusly: > From: Konstantin Menyaev > > Make the host variant of python-iniparse > as host-crudini dependency. I added a note why we need a Config.in.host entry (usually, for libs, we do not add one, but here we must slect pythn-six, which has one). > Signed-off-by: Konstantin Menyaev > --- [--SNIP--] > diff --git a/package/Config.in.host b/package/Config.in.host > index f437ef680c..fb805577d1 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -72,6 +72,7 @@ menu "Host utilities" > source "package/pkgconf/Config.in.host" > source "package/pru-software-support/Config.in.host" > source "package/pwgen/Config.in.host" > + source "package/python-iniparse/Config.in.host I reordered this in alphabetical order. Applied to master, thanks. Regards, Yann E. MORIN. > source "package/python-cython/Config.in.host" > source "package/python-greenlet/Config.in.host" > source "package/python-kflash/Config.in.host" > diff --git a/package/python-iniparse/Config.in.host b/package/python-iniparse/Config.in.host > new file mode 100644 > index 0000000000..e93022e815 > --- /dev/null > +++ b/package/python-iniparse/Config.in.host > @@ -0,0 +1,11 @@ > +config BR2_PACKAGE_HOST_PYTHON_INIPARSE > + bool "host python-iniparse" > + select BR2_PACKAGE_HOST_PYTHON_SIX # runtime > + help > + iniparse is an INI parser for Python which is API compatible > + with the standard library's ConfigParser, preserves > + structure of INI files (order of sections & options, > + indentation, comments, and blank lines are preserved when > + data is updated), and is more convenient to use. > + > + https://pypi.python.org/pypi/iniparse > diff --git a/package/python-iniparse/python-iniparse.mk b/package/python-iniparse/python-iniparse.mk > index d31a490bd8..e76987d1e9 100644 > --- a/package/python-iniparse/python-iniparse.mk > +++ b/package/python-iniparse/python-iniparse.mk > @@ -12,3 +12,4 @@ PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE > PYTHON_INIPARSE_SETUP_TYPE = setuptools > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.37.3 > > _______________________________________________ > 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 sebastian.weyer at smile.fr Mon Feb 6 10:57:11 2023 From: sebastian.weyer at smile.fr (Sebastian WEYER) Date: Mon, 6 Feb 2023 11:57:11 +0100 Subject: [Buildroot] [PATCH] Makefile: fix build when $(O) ends in _defconfig In-Reply-To: <20230122090947.1369673-1-yann.morin.1998@free.fr> References: <20230122090947.1369673-1-yann.morin.1998@free.fr> Message-ID: <038b530f-18f1-fd5e-f926-32e73d434a63@smile.fr> Hi all, On 22/01/2023 10:09, Yann E. MORIN wrote: > Commit e6195c53041f (Makefile: fix use of many br2-external trees) fixed > a slowdown with many br2-external trees. In doing so, it changed the > type of the %_defconfig rule: the stem is no longer present in the > prerequisites, so it changes from a pattern rule to an implicit pattern > rule [0]. > > It is not unusual to name the build directory after the defconfig that > is being built, so we may end up with a build directory named > meh_defconfig. Before e6195c53041f, the pattern rule would not match > [1], but now it does, which causes somewhat-cryptic build failures: > > Makefile:1015: *** "Can't find /some/path/meh_defconfig". Stop. > > The issue is that we have this set of rules and assignments (elided and > reordered for legibility): > > all: world > world: target-post-image > target-post-image: staging-finalize > staging-finalize: $(STAGING_DIR_SYMLINK) > $(STAGING_DIR_SYMLINK): | $(BASE_DIR) > BASE_DIR := $(CANONICAL_O) > CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) > > So, there is a rule that (eventually) has a dependency on $(O), but we > have no rule that provides it explicitly, so the %_defconfig rule kicks > in, with the stem as "/some/path/meh". When the loop searches all the > ".../configs/" directories for a file named ".../configs/%_defconfig", > it actually lookes for a file named ".../configs//some/path/meh_defconfig" > and that indeed never matches anything. > > The solution is to provide an actual rule for $(BASE_DIR), so that the > implicit rule does not kick in. > > [0] Terminology and behaviour in make is hard, so the terms we used here > may be wrong or incorrectly used, and/or the explanations for the > behavious be wrong or incomplete... Still, the reasoning stands, and > the root cause is the removal of the stem in the RHS of the rule > (adding one back does fix the issue). > > [1] not sure how the prerequisite was solved before e6195c53041f, > though... > > Fixes: e6195c53041f > > Reported-by: Romain Naour > Signed-off-by: Yann E. MORIN > Cc: Nevo Hed > Cc: Peter Korsgaard > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 8517d563d5..f39af5eae9 100644 > --- a/Makefile > +++ b/Makefile > @@ -1042,7 +1042,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile > > # staging and target directories do NOT list these as > # dependencies anywhere else > -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): > +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): > @mkdir -p $@ > > # outputmakefile generates a Makefile in the output directory, if using a I first verified that the build fails when the output folder's name ends in "_defconfig" with "make O=./test/second_defconfig qemu_aarch64_virt_defconfig" followed by "make O=./test/second_defconfig". I then applied the patch and redid "make O=./test/second_defconfig" and verified that the build succeeded. Tested-by: Sebastian Weyer Best regards, Sebastian From thomas.petazzoni at bootlin.com Mon Feb 6 10:57:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:57:08 +0100 Subject: [Buildroot] [git commit] boot/barebox: use $$ instead of $ where needed Message-ID: <20230206105723.71FF4838DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75c313816eb526fe09a6baab8b327279e01be5ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") caused the build to generate a spurious error message due to the $(shell ... date -d @$(SOURCE_DATE_EPOCH)) command being executed even when BR2_REPRODUCIBLE was disabled. This is due to the fact that variable references must be done using $$ within macros. This commit fixes that for the two variables that we are referencing in the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601. Signed-off-by: Thomas Petazzoni --- boot/barebox/barebox.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 90be8c1ecc..a0cfaffe09 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -74,11 +74,11 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) -ifeq ($(BR2_REPRODUCIBLE),y) +ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From thomas.petazzoni at bootlin.com Mon Feb 6 10:57:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:57:08 +0100 Subject: [Buildroot] [git commit] package/libunibreak: new package Message-ID: <20230206105723.6847E838DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=014180011d4333a73857bbd327c5c2aef7f4b43e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Introduced as optional dependency with libass 0.17.0. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libunibreak/Config.in | 8 ++++++++ package/libunibreak/libunibreak.hash | 3 +++ package/libunibreak/libunibreak.mk | 13 +++++++++++++ 5 files changed, 26 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3eb7fba339..97c28fbdd8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -395,6 +395,7 @@ F: package/libsndfile/ F: package/libsoundtouch/ F: package/libsquish/ F: package/libudfread/ +F: package/libunibreak/ F: package/liburiparser/ F: package/libutp/ F: package/libva/ diff --git a/package/Config.in b/package/Config.in index f32209db95..7817b51fc2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2157,6 +2157,7 @@ menu "Text and terminal handling" source "package/libestr/Config.in" source "package/libfribidi/Config.in" source "package/libiconv/Config.in" + source "package/libunibreak/Config.in" source "package/libunistring/Config.in" source "package/linenoise/Config.in" source "package/ncurses/Config.in" diff --git a/package/libunibreak/Config.in b/package/libunibreak/Config.in new file mode 100644 index 0000000000..101d621fd6 --- /dev/null +++ b/package/libunibreak/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBUNIBREAK + bool "libunibreak" + help + libunibreak is an implementation of the line breaking and word + breaking algorithms as described in Unicode Standard Annex 14 + and Unicode Standard Annex 29. + + https://github.com/adah1972/libunibreak diff --git a/package/libunibreak/libunibreak.hash b/package/libunibreak/libunibreak.hash new file mode 100644 index 0000000000..bb85f21cdc --- /dev/null +++ b/package/libunibreak/libunibreak.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 dd1a92d4c5646aa0e457ff41d89812ec5243863be6c20bbcb5ee380f3dd78377 libunibreak-5.1.tar.gz +sha256 0c57e2ec42ece17791a75d2f9b2f8e0663181be008667a507f765b3ef22522db LICENCE diff --git a/package/libunibreak/libunibreak.mk b/package/libunibreak/libunibreak.mk new file mode 100644 index 0000000000..fa52116c1f --- /dev/null +++ b/package/libunibreak/libunibreak.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# libunibreak +# +################################################################################ + +LIBUNIBREAK_VERSION = 5.1 +LIBUNIBREAK_SITE = https://github.com/adah1972/libunibreak/releases/download/libunibreak_$(subst .,_,$(LIBUNIBREAK_VERSION)) +LIBUNIBREAK_INSTALL_STAGING = YES +LIBUNIBREAK_LICENSE = Zlib +LIBUNIBREAK_LICENSE_FILES = LICENCE + +$(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 6 10:57:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:57:08 +0100 Subject: [Buildroot] [git commit] boot/barebox: explicitly set the timezone for the kbuild timestamp Message-ID: <20230206105723.7A6F7838E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11e75ecbf092420f00f0fc88a7183d5d99887ff1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This adjusts the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") to explicitly set the timezone when calculating KBUILD_BUILD_TIMESTAMP, like is already done in linux/linux.mk. Signed-off-by: Thomas Petazzoni --- boot/barebox/barebox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index a0cfaffe09..d7bcafe436 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -78,7 +78,7 @@ ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C TZ='UTC' date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From thomas.petazzoni at bootlin.com Mon Feb 6 10:57:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:57:29 +0100 Subject: [Buildroot] [git commit] package/libass: bump version to 0.17.0 Message-ID: <20230206105838.BA67783967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06646238303b974e4bce81143a6c022fdf790568 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/libass/libass/releases/tag/0.17.0 Added new optional dependency to libunibreak introduced by this bump. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libass/libass.hash | 2 +- package/libass/libass.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/libass/libass.hash b/package/libass/libass.hash index b8952a4730..beb7639b1f 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5dbde9e22339119cf8eed59eea6c623a0746ef5a90b689e68a090109078e3c08 libass-0.16.0.tar.xz +sha256 971e2e1db59d440f88516dcd1187108419a370e64863f70687da599fdf66cc1a libass-0.17.0.tar.xz sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING diff --git a/package/libass/libass.mk b/package/libass/libass.mk index 4ba812e3fc..1cc8310312 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.16.0 +LIBASS_VERSION = 0.17.0 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. @@ -33,4 +33,11 @@ else LIBASS_CONF_OPTS += --disable-fontconfig --disable-require-system-font-provider endif +ifeq ($(BR2_PACKAGE_LIBUNIBREAK),y) +LIBASS_DEPENDENCIES += libunibreak +LIBASS_CONF_OPTS += --enable-libunibreak +else +LIBASS_CONF_OPTS += --disable-libunibreak +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 6 10:59:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:59:22 +0100 Subject: [Buildroot] [PATCH 1/2] package/libunibreak: new package In-Reply-To: <20221212202728.1531746-1-bernd.kuhls@t-online.de> References: <20221212202728.1531746-1-bernd.kuhls@t-online.de> Message-ID: <20230206115922.5aaad8c4@windsurf> On Mon, 12 Dec 2022 21:27:27 +0100 Bernd Kuhls wrote: > Introduced as optional dependency with libass 0.17.0. > > Signed-off-by: Bernd Kuhls > --- > Build-tested using this defconfig Both patches applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 10:59:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:59:31 +0100 Subject: [Buildroot] [PATCH] docs/website: better recent commits/discussions output In-Reply-To: <20230206104559.86803-1-angelo@amarulasolutions.com> References: <20230206104559.86803-1-angelo@amarulasolutions.com> Message-ID: <20230206115931.1d15fc7e@windsurf> On Mon, 6 Feb 2023 11:45:59 +0100 Angelo Compagnucci wrote: > Removing the "[Buildroot]" and the "Re:" from messages title to have a > cleaner look on the "news" boxes. > > Signed-off-by: Angelo Compagnucci > --- > docs/website/js/buildroot.js | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 10:59:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:59:03 +0100 Subject: [Buildroot] [git commit] docs/website: better recent commits/discussions output Message-ID: <20230206110019.9F06883987@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=101b05a37479c31e397cdabad06e346665c93eba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removing the "[Buildroot]" and the "Re:" from messages title to have a cleaner look on the "news" boxes. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- docs/website/js/buildroot.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/website/js/buildroot.js b/docs/website/js/buildroot.js index 288e3e745c..b2975fb609 100644 --- a/docs/website/js/buildroot.js +++ b/docs/website/js/buildroot.js @@ -19,6 +19,8 @@ function display_activity(result, activity) { let link = document.createElement("a"); let d = new Date(entry.updated); let data = '[' + d.toLocaleDateString() + '] ' + entry.title; + data = data.replace("Re: ",""); + data = data.replace("[Buildroot] ",""); let text = document.createTextNode(data); link.appendChild(text); link.title = entry.title; From yann.morin.1998 at free.fr Mon Feb 6 11:01:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:01:10 +0100 Subject: [Buildroot] [PATCH 2/2] package/crudini: add host-crudini In-Reply-To: <20220920232154.1219792-2-KAMenyaev@sberdevices.ru> References: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> <20220920232154.1219792-2-KAMenyaev@sberdevices.ru> Message-ID: <20230206110110.GB3565@scaer> Konstantin, All, On 2022-09-21 02:21 +0300, Konstantin Menyaev via buildroot spake thusly: > From: Konstantin Menyaev > > Make the host variant of crudini package. This can be useful in > post-{build,image} scripts. > > Signed-off-by: Konstantin Menyaev > --- [--SNIP--] > diff --git a/package/crudini/Config.in.host b/package/crudini/Config.in.host > new file mode 100644 > index 0000000000..5e0040883f > --- /dev/null > +++ b/package/crudini/Config.in.host > @@ -0,0 +1,9 @@ > +config BR2_PACKAGE_HOST_CRUDINI > + bool "host crudini" > + depends on BR2_PACKAGE_HOST_PYTHON3 I've changed that to a select, like allthe other host packages that need host python3, and applied to master, thanks. Regards, Yann E. MORIN. > + select BR2_PACKAGE_HOST_PYTHON_INIPARSE # runtime > + help > + A utility for handling ini files from the command line and > + shell scripts > + > + https://pypi.python.org/pypi/crudini > diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk > index 7141e2b2a0..c376c5f777 100644 > --- a/package/crudini/crudini.mk > +++ b/package/crudini/crudini.mk > @@ -11,3 +11,4 @@ CRUDINI_LICENSE = GPL-2.0 > CRUDINI_LICENSE_FILES = COPYING > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.37.3 > > _______________________________________________ > 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 Mon Feb 6 11:00:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:00:14 +0100 Subject: [Buildroot] [git commit] package/python-iniparse: add host-python-iniparse Message-ID: <20230206110133.7C8DA83A8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87af250c0e136bf8751e1fc8a6196f9b25a0b64e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Make the host variant of python-iniparse as host-crudini dependency. Note: usually, we would not have needed to add a Config.in.host, because it is jsut a library, but since there is an Config.in.host for python-six, we need to select it, so we need an host entry. Signed-off-by: Konstantin Menyaev Reviewed-by: Heiko Thiery [yann.morin.1998 at free.fr: - add the note - reorder alphabetically ] Signed-off-by: Yann E. MORIN --- package/Config.in.host | 1 + package/python-iniparse/Config.in.host | 11 +++++++++++ package/python-iniparse/python-iniparse.mk | 1 + 3 files changed, 13 insertions(+) diff --git a/package/Config.in.host b/package/Config.in.host index b76bea60d0..0f612d7872 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -77,6 +77,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python-cython/Config.in.host" source "package/python-greenlet/Config.in.host" + source "package/python-iniparse/Config.in.host source "package/python-kflash/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-pyyaml/Config.in.host" diff --git a/package/python-iniparse/Config.in.host b/package/python-iniparse/Config.in.host new file mode 100644 index 0000000000..e93022e815 --- /dev/null +++ b/package/python-iniparse/Config.in.host @@ -0,0 +1,11 @@ +config BR2_PACKAGE_HOST_PYTHON_INIPARSE + bool "host python-iniparse" + select BR2_PACKAGE_HOST_PYTHON_SIX # runtime + help + iniparse is an INI parser for Python which is API compatible + with the standard library's ConfigParser, preserves + structure of INI files (order of sections & options, + indentation, comments, and blank lines are preserved when + data is updated), and is more convenient to use. + + https://pypi.python.org/pypi/iniparse diff --git a/package/python-iniparse/python-iniparse.mk b/package/python-iniparse/python-iniparse.mk index d31a490bd8..e76987d1e9 100644 --- a/package/python-iniparse/python-iniparse.mk +++ b/package/python-iniparse/python-iniparse.mk @@ -12,3 +12,4 @@ PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE PYTHON_INIPARSE_SETUP_TYPE = setuptools $(eval $(python-package)) +$(eval $(host-python-package)) From yann.morin.1998 at free.fr Mon Feb 6 11:00:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:00:14 +0100 Subject: [Buildroot] [git commit] package/crudini: add host-crudini Message-ID: <20230206110133.8ABC883A90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c96b2b21f7aedd78094fd009f03d8f82361e5105 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Make the host variant of crudini package. This can be useful in post-{build,image} scripts. Signed-off-by: Konstantin Menyaev Reviewed-by: Heiko Thiery [yann.morin.1998 at free.fr: select python3, don't depend on it] Signed-off-by: Yann E. MORIN --- package/Config.in.host | 1 + package/crudini/Config.in.host | 9 +++++++++ package/crudini/crudini.mk | 1 + 3 files changed, 11 insertions(+) diff --git a/package/Config.in.host b/package/Config.in.host index 0f612d7872..8d28f426d1 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -14,6 +14,7 @@ menu "Host utilities" source "package/checksec/Config.in.host" source "package/cmake/Config.in.host" source "package/cramfs/Config.in.host" + source "package/crudini/Config.in.host" source "package/cryptsetup/Config.in.host" source "package/dbus-python/Config.in.host" source "package/delve/Config.in.host" diff --git a/package/crudini/Config.in.host b/package/crudini/Config.in.host new file mode 100644 index 0000000000..4e77095627 --- /dev/null +++ b/package/crudini/Config.in.host @@ -0,0 +1,9 @@ +config BR2_PACKAGE_HOST_CRUDINI + bool "host crudini" + select BR2_PACKAGE_HOST_PYTHON3 + select BR2_PACKAGE_HOST_PYTHON_INIPARSE # runtime + help + A utility for handling ini files from the command line and + shell scripts + + https://pypi.python.org/pypi/crudini diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk index 7141e2b2a0..c376c5f777 100644 --- a/package/crudini/crudini.mk +++ b/package/crudini/crudini.mk @@ -11,3 +11,4 @@ CRUDINI_LICENSE = GPL-2.0 CRUDINI_LICENSE_FILES = COPYING $(eval $(python-package)) +$(eval $(host-python-package)) From peter at korsgaard.com Mon Feb 6 11:03:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:03:21 +0100 Subject: [Buildroot] [next 04/25] utils/checkpackagelib: warn about redefined config In-Reply-To: <20221127130739.1862398-5-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:18 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-5-ricardo.martincoski@gmail.com> Message-ID: <87ilgfcayu.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Warn the developer in the case the same config is declared more than > once in the same Config.in file. > But take into account the conditional code that lets the config be > visible and warn only when it is declared more than once in the same > conditions. > For instance, do not warn for: > if BR2_PACKAGE_BUSYBOX > config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > endif > if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else > config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > endif > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:04:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:04:28 +0100 Subject: [Buildroot] [next 05/25] support/scripts/generate-gitlab-ci-yml: improve test-pkg support In-Reply-To: <20221127130739.1862398-6-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:19 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-6-ricardo.martincoski@gmail.com> Message-ID: <87edr3cawz.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Following the example of test-pkg config described in commit > "12c7a05da1 utils/test-pkg: add gitlab-ci support" to test a defconfig > fragment that contains a disabled option is currently possible, but > it do requires one to change the git config core.commentChart so the > lines starting with "#" are not discarded by git when creating/editing > the commit message. > For instance, without the indentation the 3rd line below would be > excluded from the commit message when the editor is closed: > test-pkg config: > SOME_OPTION=y > # OTHER_OPTION is not set > SOME_VARIABLE="some value" > Requiring to change git configs is not very nice. > So make the developer's life easier by changing the sed expression to > remove indentation with spaces from a defconfig fragment found on a > commit message. > For instance these lines become valid and generate a defconfig fragment > without the indentation of one space to be tested in GitLab CI: > test-pkg config: > SOME_OPTION=y > # OTHER_OPTION is not set > SOME_VARIABLE="some value" > Signed-off-by: Ricardo Martincoski > --- > Example usage: > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704846763 Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:04:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:04:51 +0100 Subject: [Buildroot] [next 06/25] package/fwts: use ifeq instead of ifdef In-Reply-To: <20221127130739.1862398-7-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:20 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-7-ricardo.martincoski@gmail.com> Message-ID: <87a61rcawc.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The conditional code using ifdef was added in 2018 and works as > expected. > But there is no reason to use ifdef instead of ifeq. > For consistence, switch to use ifeq like almost all packages already do. > Cc: Arnout Vandecappelle > Cc: Erico Nunes > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:06:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:06:08 +0100 Subject: [Buildroot] [next 07/25] package/live555: fix build config with locale In-Reply-To: <20221127130739.1862398-8-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:21 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-8-ricardo.martincoski@gmail.com> Message-ID: <875ycfcau7.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Using current conditional code, added in 2014: > ifndef ($(BR2_ENABLE_LOCALE),y) > LIVE555_CFLAGS += -DLOCALE_NOT_USED > endif > the define LOCALE_NOT_USED is always passed on CFLAGS, because there is > no symbol with following names defined: > "(y,y)" -> not defined when BR2_ENABLE_LOCALE=y > "(,y)" -> not defined when BR2_ENABLE_LOCALE is not set > So fix the typo, switching ifndef to ifneq. > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 6 11:07:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 12:07:12 +0100 Subject: [Buildroot] [git commit] boot/optee-os: add out-of-source OPTEE-OS device tree support Message-ID: <20230206110722.81C6B83A9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46306d135e5aab14073eece713d38e8c827c58ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Similarly to U-Boot, this patch adds the ability to copy in and build out-of-source device tree sources during an OPTEE-OS build. To build the external device tree source file, the OP-TEE OS configuration must refer to it with the CFG_EMBED_DTB_SOURCE_FILE option and no platform flavor needs to be specified. Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- boot/optee-os/Config.in | 11 +++++++++++ boot/optee-os/optee-os.mk | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 8bcce22306..617ff93c44 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -130,6 +130,17 @@ config BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR Value for the optional PLATFORM_FLAVOR build directive provided to OP-TEE OS. +config BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH + string "Device Tree Source file paths" + help + Space-separated list of paths to device tree source files + that will be copied to core/arch/arm/dts/ before starting the + build. + + To use this device tree source file, the OP-TEE OS configuration + must refer to it with the CFG_EMBED_DTB_SOURCE_FILE option and + no platform flavor needs to be specified. + config BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES string "Additional build variables" help diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 38b0d367ef..33b4e2e1ab 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -84,6 +84,8 @@ endif OPTEE_OS_IMAGE_FILES = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CORE_IMAGES)) +OPTEE_OS_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH)) + ifeq ($(BR2_TARGET_OPTEE_OS_CORE),y) define OPTEE_OS_BUILD_CORE $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) O=$(OPTEE_OS_BUILDDIR_OUT) \ @@ -120,6 +122,9 @@ endef endif # BR2_TARGET_OPTEE_OS_SDK define OPTEE_OS_BUILD_CMDS + $(if $(OPTEE_OS_CUSTOM_DTS_PATH), + cp -f $(OPTEE_OS_CUSTOM_DTS_PATH) $(@D)/core/arch/arm/dts/ + ) $(OPTEE_OS_BUILD_CORE) $(OPTEE_OS_BUILD_SDK) endef From peter at korsgaard.com Mon Feb 6 11:07:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:07:44 +0100 Subject: [Buildroot] [next 08/25] package/pugixml: unconditionally set BUILD_DEFINES In-Reply-To: <20221127130739.1862398-9-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:22 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-9-ricardo.martincoski@gmail.com> Message-ID: <871qn3carj.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The ifdef construct intended to avoid passing -DBUILD_DEFINES="" was > never needed, because even upstream version v1.9 used in 2019 when the > configuration options were added, can handle an empty string for > BUILD_DEFINES. > In fact an empty string is the default for v1.9 if it is not passed > during configure. > Also, the host variant already sets BUILD_DEFINES unconditionally. > So remove the unneeded conditional. > Cc: Arnout Vandecappelle > Cc: Theo Debrouwere > Signed-off-by: Ricardo Martincoski > --- > NOTE 1: > For versions starting from v1.11 this flag BUILD_DEFINES is ignored, but > it will be fixed in the next patch. > I had split into 2 patches because this first one applies to old > versions of the package too. Someone could theoretically decide to > backport to a local copy of buildroot 2020.05.x for instance. > NOTE 2: > It doesn't test much, since BUILD_DEFINES is ignored, but anyway: > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704554673 > 44 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > test-pkg config: > BR2_PACKAGE_PUGIXML=y Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:09:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:09:30 +0100 Subject: [Buildroot] [next 09/25] package/pugixml: fix configuration options In-Reply-To: <20221127130739.1862398-10-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:23 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-10-ricardo.martincoski@gmail.com> Message-ID: <87wn4vaw45.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit upstream 1c5a0bb32583fd294022e68e66b541bf6ff71a67 > ":sparkles: Update CMake to modern approach" removed all feature > toogles, so starting from release v1.11 any flag passed in BUILD_DEFINES > was completely ignored during the build. > Version 1.11.4 was in use in buildroot since February 2021. > Commit upstream 0f1e75a902ef1751dd63a67fe223b5e8daf4c7f1 > "Re-introduced the custom build defines" added PUGIXML_BUILD_DEFINES to > release v1.12, but BUILD_DEFINES is still completely ignored during the > build. > Version 1.12.1 is in use in buildroot since March 2022. > So switch the config options to use PUGIXML_BUILD_DEFINES instead of > BUILD_DEFINES. > Cc: Arnout Vandecappelle > Cc: Theo Debrouwere > Signed-off-by: Ricardo Martincoski > --- > NOTE 1: > The code below can be useful to verify the statements above, after > commenting some lines: > |PUGIXML_VERSION = 1.11.4 > |PUGIXML_VERSION = 1.10 > |PUGIXML_VERSION = 1.9 > |define PUGIXML_FORCE_BUILD_ERROR > | echo '#ifdef PUGIXML_COMPACT' >> $(@D)/src/pugixml.cpp > | echo '#error 111' >> $(@D)/src/pugixml.cpp > | echo '#else' >> $(@D)/src/pugixml.cpp > | echo '#error 222' >> $(@D)/src/pugixml.cpp > | echo '#endif' >> $(@D)/src/pugixml.cpp > |endef > |PUGIXML_POST_PATCH_HOOKS += PUGIXML_FORCE_BUILD_ERROR > |PUGIXML_BUILD_DEFINES += PUGIXML_COMPACT > |PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" > |PUGIXML_CONF_OPTS += -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" > |PUGIXML_CONF_OPTS += -DPUGIXML_COMPACT=ON > NOTE 2: > Current version for each branch: > $ git grep ^PUGIXML_VERSION \ > origin/next origin/master $(git branch -a | grep origin/202) \ > | sed -e 's,^remotes/,,g' -e 's,^origin/,,g' | sort > 2020.02.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2020.05.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.10 > 2020.08.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.10 > 2020.11.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2021.02.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2021.05.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2021.08.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2021.11.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2022.02.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2022.05.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.12.1 > 2022.08.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.12.1 > master:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.12.1 > next:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.12.1 > NOTE 3: > local build tests to check size: > pugixml-compact/graphs/package-size-stats.csv:pugixml,165216,1.9q > pugixml-default/graphs/package-size-stats.csv:pugixml,152928,1.8q > pugixml-header-only/graphs/package-size-stats.csv:pugixml,13660,0.2 > pugixml-noxpath/graphs/package-size-stats.csv:pugixml,95532,1.1 > pugixml-compact/defconfig:BR2_x86_i686=y > pugixml-compact/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-compact/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-compact/defconfig:BR2_PACKAGE_PUGIXML_COMPACT=y > pugixml-default/defconfig:BR2_x86_i686=y > pugixml-default/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-default/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-header-only/defconfig:BR2_x86_i686=y > pugixml-header-only/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-header-only/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-header-only/defconfig:BR2_PACKAGE_PUGIXML_HEADER_ONLY=y > pugixml-noxpath/defconfig:BR2_x86_i686=y > pugixml-noxpath/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-noxpath/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-noxpath/defconfig:# BR2_PACKAGE_PUGIXML_XPATH_SUPPORT is not set > NOTE 4: > build tests on GitLab CI > test-pkg config 1: > BR2_PACKAGE_PUGIXML=y > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704564417 > 44 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > test-pkg config 2: > BR2_PACKAGE_PUGIXML=y > BR2_PACKAGE_PUGIXML_COMPACT=y > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704755515 > 44 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > test-pkg config 3: > BR2_PACKAGE_PUGIXML=y > # BR2_PACKAGE_PUGIXML_XPATH_SUPPORT is not set > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704849811 > 44 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > test-pkg config 4: > BR2_PACKAGE_PUGIXML=y > BR2_PACKAGE_PUGIXML_HEADER_ONLY=y > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704851087 > 44 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Committed, thanks. It's great with all these details! -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:12:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:12:04 +0100 Subject: [Buildroot] [next 10/25] package/pugixml: use explicit build options In-Reply-To: <20221127130739.1862398-11-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:24 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-11-ricardo.martincoski@gmail.com> Message-ID: <87sffjavzv.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit upstream 986b7ffd01aedcd4f2aa16e78e4cad9313b6d7b2 > "Add Cmake options for pugiconfig.hpp" added feature toogles to release > v1.12, including PUGIXML_NO_XPATH and PUGIXML_COMPACT. > Commit upstream 5f49f2c6575cc2b7d343f8d41581fe92d69d7b52 > "Mark advanced options and removed redundant ones" removed CMake > specific support for PUGIXML_HEADER_ONLY and PUGIXML_HAS_LONG_LONG, but > they can still be provided using PUGIXML_BUILD_DEFINES, starting from > release v1.12. > So use the explicit build options PUGIXML_NO_XPATH and PUGIXML_COMPACT, > but keep using PUGIXML_BUILD_DEFINES to set PUGIXML_HEADER_ONLY and > PUGIXML_HAS_LONG_LONG. > Cc: Arnout Vandecappelle > Cc: Theo Debrouwere > Signed-off-by: Ricardo Martincoski > --- > local build tests to check size: > pugixml-compact/graphs/package-size-stats.csv:pugixml,165216,1.9q > pugixml-default/graphs/package-size-stats.csv:pugixml,152928,1.8q > pugixml-header-only/graphs/package-size-stats.csv:pugixml,13660,0.2 > pugixml-noxpath/graphs/package-size-stats.csv:pugixml,95532,1.1 > pugixml-compact/defconfig:BR2_x86_i686=y > pugixml-compact/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-compact/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-compact/defconfig:BR2_PACKAGE_PUGIXML_COMPACT=y > pugixml-default/defconfig:BR2_x86_i686=y > pugixml-default/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-default/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-header-only/defconfig:BR2_x86_i686=y > pugixml-header-only/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-header-only/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-header-only/defconfig:BR2_PACKAGE_PUGIXML_HEADER_ONLY=y > pugixml-noxpath/defconfig:BR2_x86_i686=y > pugixml-noxpath/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-noxpath/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-noxpath/defconfig:# BR2_PACKAGE_PUGIXML_XPATH_SUPPORT is not set Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:13:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:13:10 +0100 Subject: [Buildroot] [next 11/25] package/busybox: add comment about variable override In-Reply-To: <20221127130739.1862398-12-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:25 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-12-ricardo.martincoski@gmail.com> Message-ID: <87o7q7avy1.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The same comment already exists for UCLIBC_CONFIG_FILE. > Both variables can be override from command-line, as described in the > manual, at section 'Environment variables'. > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 6 11:13:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 12:13:36 +0100 Subject: [Buildroot] [git commit] package/postgresql: work around gcc bug 43744 Message-ID: <20230206111414.3E8FD83AAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3def0679e3a424983354346eb517bbaa07b905df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Package postgresql suffers from gcc bug 43744 other than 85180, so let's work around disabling compiler optimization for this gcc bug too. Fixes: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 5313e03b12..2ffcac6595 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -101,7 +101,7 @@ endif POSTGRESQL_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_43744)$(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),) POSTGRESQL_CFLAGS += -O0 endif From peter at korsgaard.com Mon Feb 6 11:15:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:15:03 +0100 Subject: [Buildroot] [next 12/25] utils/checkpackagelib: warn about ifdef on .mk In-Reply-To: <20221127130739.1862398-13-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:26 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-13-ricardo.martincoski@gmail.com> Message-ID: <87k00vavuw.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > There are two legitimate cases to prefer ifdef over ifeq in package > recipes: command-line overrides are allowed for busybox and uclibc > configs. > Except for that, all package in tree already use ifeq, so warn the > developer adding/changing a package to use ifeq instead of ifdef, in > order to keep consistence across packages. > file.mk:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL > file.mk:5: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL > The difference between ifeq and ifdef is that ifdef doesn't expand > recursively. > Add comments to busybox and uclibc packages to avoid a warning in such > special cases. > Cc: Arnout Vandecappelle > Signed-off-by: Ricardo Martincoski > --- > NOTE 1: > I only state "all package in tree already use ifeq" because earlier in > the series other 3 (2 ifdef and 1 ifndef) uses were removed. Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 6 11:21:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 12:21:30 +0100 Subject: [Buildroot] [PATCH 2/2] package/postgresql: work around gcc bug 43744 In-Reply-To: <20230202154239.325711-2-giulio.benetti@benettiengineering.com> References: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> <20230202154239.325711-2-giulio.benetti@benettiengineering.com> Message-ID: <20230206122130.25893d8a@windsurf> Hello Giulio, On Thu, 2 Feb 2023 16:42:39 +0100 Giulio Benetti wrote: > Package postgresql suffers from gcc bug 43744 other than 85180, so let's > work around disabling compiler optimization for this gcc bug too. > > Fixes: > http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a > > Signed-off-by: Giulio Benetti > --- > package/postgresql/postgresql.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. However, you should have resent a v2 of this patch together with the v2 of the first patch. Never resend partial series, but instead always, always, always, always, always, always, always, always, always, always, always, always, always resend a full series, even if only one patch changed. Sending partial series is extremely confusing for the people reviewing/applying the patches. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 6 11:20:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:20:17 +0100 Subject: [Buildroot] [git commit] package/iputils: bump version to 20221126 Message-ID: <20230206112141.56B1983AC8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b89eff429d4e8ad447addd53fde629676e19b76c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This release removed: ninfod, rarpd, rdisc => add entries to Config.in.legacy. LICENSE file got updated (just to use SPDX) => update checksum. Signed-off-by: Petr Vorel Reviewed-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- Config.in.legacy | 24 ++++++++++++++++++++++++ package/iputils/Config.in | 25 ------------------------- package/iputils/iputils.hash | 6 +++--- package/iputils/iputils.mk | 9 ++------- 4 files changed, 29 insertions(+), 35 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e5cfcea8fa..94d6ce19f5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,30 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_IPUTILS_NINFOD + bool "iputils 20221126 removed ninfod" + select BR2_LEGACY + help + iputils 20221126 removed ninfod. + +config BR2_PACKAGE_IPUTILS_RARPD + bool "iputils 20221126 removed rarpd" + select BR2_LEGACY + help + iputils 20221126 removed rarpd. + +config BR2_PACKAGE_IPUTILS_RDISC + bool "iputils 20221126 removed rdisc" + select BR2_LEGACY + help + iputils 20221126 removed rdisc. + +config BR2_PACKAGE_IPUTILS_RDISC_SERVER + bool "iputils 20221126 removed rdisc" + select BR2_LEGACY + help + iputils 20221126 removed rdisc. + config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX bool "xingmux moved" select BR2_LEGACY diff --git a/package/iputils/Config.in b/package/iputils/Config.in index 1a8b555570..ec7bc5418d 100644 --- a/package/iputils/Config.in +++ b/package/iputils/Config.in @@ -28,37 +28,12 @@ config BR2_PACKAGE_IPUTILS_PING help Installs ping. -config BR2_PACKAGE_IPUTILS_RARPD - bool "rarpd" - help - Installs rarpd. - -config BR2_PACKAGE_IPUTILS_RDISC - bool "rdisc" - default y - help - Installs rdisc. - -config BR2_PACKAGE_IPUTILS_RDISC_SERVER - bool "rdisc (server code)" - default y - depends on BR2_PACKAGE_IPUTILS_RDISC - help - Builds rdisc with server code. - config BR2_PACKAGE_IPUTILS_TRACEPATH bool "tracepath" default y help Installs tracepath. -config BR2_PACKAGE_IPUTILS_NINFOD - bool "ninfod" - default y - depends on BR2_TOOLCHAIN_HAS_THREADS # ninfod requires - help - Installs ninfod. - comment "ninfod needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash index db52d990f2..ea23f27f3c 100644 --- a/package/iputils/iputils.hash +++ b/package/iputils/iputils.hash @@ -1,6 +1,6 @@ -# https://github.com/iputils/iputils/releases/download/20211215/sha256sum.asc -sha256 b6f67fc705490673ff4471d006221b4a2f1b1180b929d9fefd771352621ccedf iputils-20211215.tar.gz +# https://github.com/iputils/iputils/releases/download/20221126/sha256sum.asc +sha256 745ea711fe06d5c57d470d21acce3c3ab866eb6afb69379a16c6d60b89bd4311 iputils-20221126.tar.gz # Locally computed -sha256 973281334c2da6364fa6bdc44c1f0f8d60d80d73c782982ffc5d53b0a31aa042 LICENSE +sha256 2c9f29d982c48665c30b3adaf400c048988fd256eb91c691e351eb3b6a8b2036 LICENSE sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/LICENSE.GPL2 diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 84059de330..fe4468ec19 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -11,7 +11,7 @@ # and IPv6 updates. # http://www.spinics.net/lists/netdev/msg279881.html -IPUTILS_VERSION = 20211215 +IPUTILS_VERSION = 20221126 IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 @@ -21,19 +21,14 @@ IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # Selectively build binaries IPUTILS_CONF_OPTS += \ -DBUILD_CLOCKDIFF=$(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),true,false) \ - -DBUILD_RARPD=$(if $(BR2_PACKAGE_IPUTILS_RARPD),true,false) \ - -DBUILD_RDISC=$(if $(BR2_PACKAGE_IPUTILS_RDISC),true,false) \ - -DENABLE_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \ -DBUILD_TRACEPATH=$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),true,false) \ - -DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) \ -DSKIP_TESTS=true # Selectively select the appropriate SELinux refpolicy modules IPUTILS_SELINUX_MODULES = \ $(if $(BR2_PACKAGE_IPUTILS_ARPING),netutils) \ $(if $(BR2_PACKAGE_IPUTILS_PING),netutils) \ - $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) \ - $(if $(BR2_PACKAGE_IPUTILS_RDISC),rdisc) + $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) # # arping From yann.morin.1998 at free.fr Mon Feb 6 11:21:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:21:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/iputils: bump version to 20221126 In-Reply-To: <20221126003807.462157-1-pevik@seznam.cz> References: <20221126003807.462157-1-pevik@seznam.cz> Message-ID: <20230206112156.GC3565@scaer> Petr, All, On 2022-11-26 01:38 +0100, Petr Vorel spake thusly: > From: Petr Vorel > > This release removed: ninfod, rarpd, rdisc > => add entries to Config.in.legacy. > > LICENSE file got updated (just to use SPDX) > => update checksum. > > Signed-off-by: Petr Vorel Applied to master, thanks. Regards, Yann E. MORIN. > --- > Config.in.legacy | 24 ++++++++++++++++++++++++ > package/iputils/Config.in | 25 ------------------------- > package/iputils/iputils.hash | 6 +++--- > package/iputils/iputils.mk | 9 ++------- > 4 files changed, 29 insertions(+), 35 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index b3c35d6b07..6d20092ca4 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,30 @@ endif > > comment "Legacy options removed in 2022.11" > > +config BR2_PACKAGE_IPUTILS_NINFOD > + bool "iputils 20221126 removed ninfod" > + select BR2_LEGACY > + help > + iputils 20221126 removed ninfod. > + > +config BR2_PACKAGE_IPUTILS_RARPD > + bool "iputils 20221126 removed rarpd" > + select BR2_LEGACY > + help > + iputils 20221126 removed rarpd. > + > +config BR2_PACKAGE_IPUTILS_RDISC > + bool "iputils 20221126 removed rdisc" > + select BR2_LEGACY > + help > + iputils 20221126 removed rdisc. > + > +config BR2_PACKAGE_IPUTILS_RDISC_SERVER > + bool "iputils 20221126 removed rdisc" > + select BR2_LEGACY > + help > + iputils 20221126 removed rdisc. > + > config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 > bool "libopenssl rc5 was never enabled" > select BR2_LEGACY > diff --git a/package/iputils/Config.in b/package/iputils/Config.in > index 1a8b555570..ec7bc5418d 100644 > --- a/package/iputils/Config.in > +++ b/package/iputils/Config.in > @@ -28,37 +28,12 @@ config BR2_PACKAGE_IPUTILS_PING > help > Installs ping. > > -config BR2_PACKAGE_IPUTILS_RARPD > - bool "rarpd" > - help > - Installs rarpd. > - > -config BR2_PACKAGE_IPUTILS_RDISC > - bool "rdisc" > - default y > - help > - Installs rdisc. > - > -config BR2_PACKAGE_IPUTILS_RDISC_SERVER > - bool "rdisc (server code)" > - default y > - depends on BR2_PACKAGE_IPUTILS_RDISC > - help > - Builds rdisc with server code. > - > config BR2_PACKAGE_IPUTILS_TRACEPATH > bool "tracepath" > default y > help > Installs tracepath. > > -config BR2_PACKAGE_IPUTILS_NINFOD > - bool "ninfod" > - default y > - depends on BR2_TOOLCHAIN_HAS_THREADS # ninfod requires > - help > - Installs ninfod. > - > comment "ninfod needs a toolchain w/ threads" > depends on !BR2_TOOLCHAIN_HAS_THREADS > > diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash > index db52d990f2..ea23f27f3c 100644 > --- a/package/iputils/iputils.hash > +++ b/package/iputils/iputils.hash > @@ -1,6 +1,6 @@ > -# https://github.com/iputils/iputils/releases/download/20211215/sha256sum.asc > -sha256 b6f67fc705490673ff4471d006221b4a2f1b1180b929d9fefd771352621ccedf iputils-20211215.tar.gz > +# https://github.com/iputils/iputils/releases/download/20221126/sha256sum.asc > +sha256 745ea711fe06d5c57d470d21acce3c3ab866eb6afb69379a16c6d60b89bd4311 iputils-20221126.tar.gz > # Locally computed > -sha256 973281334c2da6364fa6bdc44c1f0f8d60d80d73c782982ffc5d53b0a31aa042 LICENSE > +sha256 2c9f29d982c48665c30b3adaf400c048988fd256eb91c691e351eb3b6a8b2036 LICENSE > sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/LICENSE.GPL2 > diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk > index 84059de330..fe4468ec19 100644 > --- a/package/iputils/iputils.mk > +++ b/package/iputils/iputils.mk > @@ -11,7 +11,7 @@ > # and IPv6 updates. > # http://www.spinics.net/lists/netdev/msg279881.html > > -IPUTILS_VERSION = 20211215 > +IPUTILS_VERSION = 20221126 > IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) > IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause > IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 > @@ -21,19 +21,14 @@ IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) > # Selectively build binaries > IPUTILS_CONF_OPTS += \ > -DBUILD_CLOCKDIFF=$(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),true,false) \ > - -DBUILD_RARPD=$(if $(BR2_PACKAGE_IPUTILS_RARPD),true,false) \ > - -DBUILD_RDISC=$(if $(BR2_PACKAGE_IPUTILS_RDISC),true,false) \ > - -DENABLE_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \ > -DBUILD_TRACEPATH=$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),true,false) \ > - -DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) \ > -DSKIP_TESTS=true > > # Selectively select the appropriate SELinux refpolicy modules > IPUTILS_SELINUX_MODULES = \ > $(if $(BR2_PACKAGE_IPUTILS_ARPING),netutils) \ > $(if $(BR2_PACKAGE_IPUTILS_PING),netutils) \ > - $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) \ > - $(if $(BR2_PACKAGE_IPUTILS_RDISC),rdisc) > + $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) > > # > # arping > -- > 2.38.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 Mon Feb 6 11:24:46 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 12:24:46 +0100 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: <2bdc57cb-e5c9-127d-dd3e-da4bb35f89f1@mind.be> Hi Alsey, Sorry for the extremely late feedback on this. There were a few issues with your contribution and I wasn't able to fix them up myself, so I marked the series as Changes Requested. See below for my comments. On 29/03/2022 23:54, 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 Please add an explanation in the commit log about where this range of supported architectures comes from. Also, I expect that on ARM and possibly powerpc there are tighter constraints than this. > +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 We also have armv7m and armv4 which are not covered here. > + 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 You can simplify BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS like this: config BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS bool default y depends on BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH != "" > + > +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 Again, please explain in the commit message where the glibc dependency comes from. > + select BR2_PACKAGE_LIBBSD Please include the libbsd dependencies (as far as they're not covered by the libdispatch dependencies themselves): depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd depends on BR2_USE_WCHAR # libbsd > + > + help > + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. Please wrap at 72 columns (where the tab counts as 8 spaces). utils/check-package will warn about this. > + > + http://swift.org Is there no URL specific to libdispatch? > + > +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 \ There is no C++ dependency in the package itself... > + || BR2_STATIC_LIBS || !BR2_USE_WCHAR > \ No newline at end of file Please add a newline at the end of the 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 Please add a hash for the license files. > 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) I guess this is a swift-specific fork of libdispatch? If yes, then the swift bit should probably still be in _VERSION, i.e. LIBDISPATH_VERSION = swift-5.6 Alternatively, the package should be named something like libdispatch-swift. > +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 clang and lld (if they're supposed to build for the target) need a dependency on BR2_PACKAGE_LLVM_ARCH_SUPPORTS and BR2_HOST_GCC_AT_LEAST_5 Also you should select BR2_PACKAGE_HOST_LLD in Config.in. > + > +LIBDISPATCH_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH)) > +LIBDISPATCH_CLANG_PATH = $(HOST_DIR)/bin It's not worth adding a variable for this, just use $(HOST_DIR)/bin directly below. > + > +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 Instead of defining this here, define it like that in LIBDISPATCH_TARGET_ARCH directly, i.e. include the unknown-linux-gnu* in BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH. > +endif > + > +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) > +LIBDISPATCH_EXTRA_FLAGS = -march=armv5te Not all our armv5 variants are armv5te I believe... > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),riscv64) > +LIBDISPATCH_EXTRA_FLAGS = -mno-relax -mabi=lp64 -march=rv64imac -mfloat-abi=soft Having to specify all of this sounds very very wrong. We define the ABI and arch elsewhere depending on config options, if you're overriding here it's not going to be compatible with libc. I'm not sure about the -mno-relax, that might be needed. But please document in the commit message why. > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mipsel) > +LIBDISPATCH_EXTRA_FLAGS = -msoft-float > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mips64el) > +LIBDISPATCH_EXTRA_FLAGS = -msoft-float Again, floating point ABI should be defined in our ABI definition or it's not going to be compatible. If it requires soft float, we need to depend on BR2_MIPS_SOFT_FLOAT in Config.in. -msoft-float and other ABI options are passed along by the toolchain wrapper, so if these are somehow needed in EXTRA_FLAGS after all, something somewhere is really broken. This needs to be analyzed and explained in detail. > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),powerpc) > +LIBDISPATCH_EXTRA_FLAGS = -mcpu=7400 We support many, many other powerpc CPUs, so please explain why this is needed and why it works on all other CPUs. > +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))" \ Please wrap this extremely long line. Also, since it's reused for CXX flags, it probably makes sense to define a variable for this. -fuse-ld should probably be given a full path to $(HOST_DIR)/bin/lld instead of relying on $PATH. --sysroot, -I, -B, -L options shouldn't be needed, they should already be part of the toolchain wrapper. However, the toolchain wrapper for clang is fairly recent and doesn't see that much use, so something may be missing there. Still, if there is a problem, it should probably be handled in the toolchain wrapper an not here. > + -DCMAKE_C_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ Again, --sysrot should already be handled by the toolchain wrapper. > + -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/ \ Doesn't the CMakeLists.txt have proper install commands? If not, please document in the commit message. Also, no need to cd, just do cp $(LIBDISPATCH_BUILDDIR)/*.so $(TARGET_DIR)/usr/lib/ Regards, Arnout > + ) > +endef > + > +$(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 6 11:26:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:26:29 +0100 Subject: [Buildroot] [next 13/25] toolchain/toolchain-buildroot: add comment about using virtual package infra In-Reply-To: <20221127130739.1862398-14-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:27 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-14-ricardo.martincoski@gmail.com> Message-ID: <87fsbjavbu.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "9a8ec9195c toolchain/toolchain-buildroot: migrate to virtual > package infrastructure" made the packages toolchain and > toolchain-buildroot to use the virtual package infra even they being > generic packages. > This works because on package/pkg-virtual.mk when a package do not > define neither _PROVIDES_ or _HAS_ symbols, only _IS_VIRTUAL is set to > YES and _VERSION and _SOURCE are set to empty before relaying the call > to inner-generic-package. > Add a comment explaining why the virtual package infra is used in these > cases. > Cc: Giulio Benetti > Cc: Romain Naour > Cc: Thomas De Schampheleire > Cc: Thomas Petazzoni > Cc: Yann E. MORIN > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 6 11:26:36 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 12:26:36 +0100 Subject: [Buildroot] [PATCH 3/4] package/libdispatch: add fix for 32-bit arm In-Reply-To: <20220329185059.943889-3-alseycmiller@gmail.com> References: <20220329185059.943889-1-alseycmiller@gmail.com> <20220329185059.943889-3-alseycmiller@gmail.com> Message-ID: Hi Alsey, This patch should be included in the first one. On 29/03/2022 20:50, Alsey Coleman Miller wrote: > 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 @@ Patches should be git formatted. They should have a full commit message that explains the issue, and a Signed-off-by. There should also be an upstream reference, or something like "Not applicable" and an explaantion why it's not applicable for upstream. Regards, Arnout > +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)) { From peter at korsgaard.com Mon Feb 6 11:26:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:26:59 +0100 Subject: [Buildroot] [next 14/25] boot/uboot: remove use of legacy xloader symbol In-Reply-To: <20221127130739.1862398-15-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:28 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-15-ricardo.martincoski@gmail.com> Message-ID: <87bkm7avb0.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "070b183d0c boot/xloader: remove package", from release 2018.11, > removed the package, but the symbol is still referenced. > Remove the reference to it. > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:27:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:27:39 +0100 Subject: [Buildroot] [next 15/25] system: remove use of legacy md5 option In-Reply-To: <20221127130739.1862398-16-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:29 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-16-ricardo.martincoski@gmail.com> Message-ID: <877cwvav9w.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "bf3626002f system cfg: remove mkpasswd MD5 format option", from > release 2019.02, moved the symbol to legacy handling, but the symbol is > still referenced. > Remove the reference to it. > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:29:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:29:34 +0100 Subject: [Buildroot] [next 16/25] package/linux-headers: remove bogus symbol BR2_PACKAGE_HOST_LINUX_HEADERS In-Reply-To: <20221127130739.1862398-17-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:30 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-17-ricardo.martincoski@gmail.com> Message-ID: <87zg9r9gm9.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The package host-linux-headers does not exist and there were never > references to this symbol in the tree, do drop it. > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Mon Feb 6 11:32:59 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 04:32:59 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-iniparse: add host-python-iniparse In-Reply-To: References: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> Message-ID: On Mon, Feb 6, 2023 at 3:12 AM Heiko Thiery wrote: > > Hi, > > Am Mi., 21. Sept. 2022 um 01:24 Uhr schrieb : > > > > From: Konstantin Menyaev > > > > Make the host variant of python-iniparse > > as host-crudini dependency. > > > > Signed-off-by: Konstantin Menyaev > > Reviewed-by: Heiko Thiery > > > --- > > package/Config.in.host | 1 + > > package/python-iniparse/Config.in.host | 11 +++++++++++ > > package/python-iniparse/python-iniparse.mk | 1 + > > 3 files changed, 13 insertions(+) > > create mode 100644 package/python-iniparse/Config.in.host > > > > diff --git a/package/Config.in.host b/package/Config.in.host > > index f437ef680c..fb805577d1 100644 > > --- a/package/Config.in.host > > +++ b/package/Config.in.host > > @@ -72,6 +72,7 @@ menu "Host utilities" > > source "package/pkgconf/Config.in.host" > > source "package/pru-software-support/Config.in.host" > > source "package/pwgen/Config.in.host" > > + source "package/python-iniparse/Config.in.host Missing a trailing quote: package/Config.in.host:81:warning: multi-line strings not supported > > source "package/python-cython/Config.in.host" > > source "package/python-greenlet/Config.in.host" > > source "package/python-kflash/Config.in.host" > > diff --git a/package/python-iniparse/Config.in.host b/package/python-iniparse/Config.in.host > > new file mode 100644 > > index 0000000000..e93022e815 > > --- /dev/null > > +++ b/package/python-iniparse/Config.in.host > > @@ -0,0 +1,11 @@ > > +config BR2_PACKAGE_HOST_PYTHON_INIPARSE > > + bool "host python-iniparse" > > + select BR2_PACKAGE_HOST_PYTHON_SIX # runtime > > + help > > + iniparse is an INI parser for Python which is API compatible > > + with the standard library's ConfigParser, preserves > > + structure of INI files (order of sections & options, > > + indentation, comments, and blank lines are preserved when > > + data is updated), and is more convenient to use. > > + > > + https://pypi.python.org/pypi/iniparse > > diff --git a/package/python-iniparse/python-iniparse.mk b/package/python-iniparse/python-iniparse.mk > > index d31a490bd8..e76987d1e9 100644 > > --- a/package/python-iniparse/python-iniparse.mk > > +++ b/package/python-iniparse/python-iniparse.mk > > @@ -12,3 +12,4 @@ PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE > > PYTHON_INIPARSE_SETUP_TYPE = setuptools > > > > $(eval $(python-package)) > > +$(eval $(host-python-package)) > > -- > > 2.37.3 > > > > _______________________________________________ > > 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 yann.morin.1998 at free.fr Mon Feb 6 11:34:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:34:35 +0100 Subject: [Buildroot] [git commit] package/netopeer2: fix sysv init script, does not start Message-ID: <20230206113452.65F3283AFC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ddc29708d3c82f2f6055b596e484a6d963a6eae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - The netopeer server forks to background by default, no need for '-b' - The path to the daemon is /usr/sbin, not /usr/bin Signed-off-by: Joachim Wiberg Acked-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- package/netopeer2/S52netopeer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netopeer2/S52netopeer2 b/package/netopeer2/S52netopeer2 index cf53a8f109..cadd6b9feb 100644 --- a/package/netopeer2/S52netopeer2 +++ b/package/netopeer2/S52netopeer2 @@ -8,7 +8,7 @@ NETOPEER2_SERVER_ARGS="" start() { printf 'Starting %s: ' "$DAEMON" - start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -p $PIDFILE -x "/usr/sbin/$DAEMON" \ -- $NETOPEER2_SERVER_ARGS status=$? if [ "$status" -eq 0 ]; then From yann.morin.1998 at free.fr Mon Feb 6 11:35:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:35:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/netopeer2: fix sysv init script, does not start In-Reply-To: <20230131142003.1354787-1-troglobit@gmail.com> References: <20230131142003.1354787-1-troglobit@gmail.com> Message-ID: <20230206113501.GD3565@scaer> Joachim, All, On 2023-01-31 15:20 +0100, Joachim Wiberg spake thusly: > - The netopeer server forks to background by default, no need for '-b' > - The path to the daemon is /usr/sbin, not /usr/bin > > Signed-off-by: Joachim Wiberg Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/netopeer2/S52netopeer2 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/netopeer2/S52netopeer2 b/package/netopeer2/S52netopeer2 > index cf53a8f109..cadd6b9feb 100644 > --- a/package/netopeer2/S52netopeer2 > +++ b/package/netopeer2/S52netopeer2 > @@ -8,7 +8,7 @@ NETOPEER2_SERVER_ARGS="" > start() { > printf 'Starting %s: ' "$DAEMON" > > - start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ > + start-stop-daemon -S -q -p $PIDFILE -x "/usr/sbin/$DAEMON" \ > -- $NETOPEER2_SERVER_ARGS > status=$? > if [ "$status" -eq 0 ]; then > -- > 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 Mon Feb 6 11:37:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:37:10 +0100 Subject: [Buildroot] [next 17/25] package/gitlab-runner: ensure use of LIBCURL_OPENSSL In-Reply-To: <20221127130739.1862398-18-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:31 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-18-ricardo.martincoski@gmail.com> Message-ID: <87v8kf9g9l.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Currently this minimal config is accepted while it shouldn't: > BR2_x86_i686=y > BR2_PACKAGE_BEARSSL=y > BR2_PACKAGE_LIBCURL_BEARSSL=y > BR2_PACKAGE_GITLAB_RUNNER=y > BR2_PACKAGE_GITLAB_RUNNER selects BR2_PACKAGE_LIBCURL_OPENSSL. > Kconfig does not enforce a select when the symbol selected is part of a > choice. See similar explanation on [1] and [2]. > Doing something similar to [3] and depending on the choice option > instead of selecting it would create a Kconfig recursive dependency. > Just dropping the ineffective select would keep the above defconfig > snippet as an accepted one. > Adding a comment to the menu, i.e.: > comment "gitlab-runner must use BR2_PACKAGE_LIBCURL_OPENSSL" > depends on BR2_PACKAGE_GITLAB_RUNNER > depends on !BR2_PACKAGE_LIBCURL_OPENSSL > could improve user experience but it also keeps the above defconfig > snippet as an accepted one. > So bail out the build when gitlab-runner is enabled and libcurl-openssl > is not selected, similar to what is done in [4]. > [1] "a44b1c1405 legacy: update the BR2_PREFER_STATIC_LIB option" > [2] "b1d5aa1bc2 package/qwt: Fix selecting OpenGL support in qt4" > [3] "9fc652a373 package/libmodsecurity: needs dynamic library with > libcurl and mbedtls" > [4] "fda53f0791 package/Makefile.in: add detection for the lack of C > library" > Cc: Marcin Niestroj > Cc: Romain Naour > Signed-off-by: Ricardo Martincoski The change as such is fine, but why does gitlab-runner really need the curl binary to use the openssl backend? Perhaps it is just about curl having HTTPS support? > --- > package/gitlab-runner/Config.in | 1 - > package/gitlab-runner/gitlab-runner.mk | 4 ++++ > 2 files changed, 4 insertions(+), 1 deletion(-) > diff --git a/package/gitlab-runner/Config.in b/package/gitlab-runner/Config.in > index 89e3e87b5c..5b8a6cacbe 100644 > --- a/package/gitlab-runner/Config.in > +++ b/package/gitlab-runner/Config.in > @@ -11,7 +11,6 @@ config BR2_PACKAGE_GITLAB_RUNNER > select BR2_PACKAGE_GIT # runtime > select BR2_PACKAGE_LIBCURL # runtime > select BR2_PACKAGE_LIBCURL_CURL # runtime > - select BR2_PACKAGE_LIBCURL_OPENSSL # runtime, for ca-certificates. > select BR2_PACKAGE_OPENSSL # runtime > select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL # runtime > select BR2_PACKAGE_LIBOPENSSL_BIN # runtime > diff --git a/package/gitlab-runner/gitlab-runner.mk b/package/gitlab-runner/gitlab-runner.mk > index c7c2da2fe1..c997785d90 100644 > --- a/package/gitlab-runner/gitlab-runner.mk > +++ b/package/gitlab-runner/gitlab-runner.mk > @@ -12,6 +12,10 @@ GITLAB_RUNNER_LICENSE_FILES = LICENSE > GITLAB_RUNNER_LDFLAGS = \ > -X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=$(GITLAB_RUNNER_VERSION) > +ifeq ($(BR2_PACKAGE_GITLAB_RUNNER):$(BR2_PACKAGE_LIBCURL_OPENSSL):$(BR_BUILDING),y::y) > +$(error gitlab-runner must use BR2_PACKAGE_LIBCURL_OPENSSL for ca-certificates at runtime) > +endif > + > # Don't run gitlab runner as root. > define GITLAB_RUNNER_USERS > gitlab-runner -1 gitlab-runner -1 * /var/run/dbus /bin/false - Gitlab Runner > -- > 2.34.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Mon Feb 6 11:36:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:36:56 +0100 Subject: [Buildroot] [git commit] package/Config.in.host: fix missing double-quote Message-ID: <20230206113824.B01DC83B1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3cab8f29eb9c7e573099a4a0e45f251e4f15f97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c96b2b21f7ae (package/python-iniparse: add host-python-iniparse) missed that. Reported-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in.host b/package/Config.in.host index 8d28f426d1..dcadbfdfc1 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -78,7 +78,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python-cython/Config.in.host" source "package/python-greenlet/Config.in.host" - source "package/python-iniparse/Config.in.host + source "package/python-iniparse/Config.in.host" source "package/python-kflash/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-pyyaml/Config.in.host" From yann.morin.1998 at free.fr Mon Feb 6 11:38:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:38:53 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-iniparse: add host-python-iniparse In-Reply-To: References: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> Message-ID: <20230206113853.GE3565@scaer> James, All, On 2023-02-06 04:32 -0700, James Hilliard spake thusly: > On Mon, Feb 6, 2023 at 3:12 AM Heiko Thiery wrote: > > Am Mi., 21. Sept. 2022 um 01:24 Uhr schrieb : [--SNIP--] > > > diff --git a/package/Config.in.host b/package/Config.in.host > > > index f437ef680c..fb805577d1 100644 > > > --- a/package/Config.in.host > > > +++ b/package/Config.in.host > > > @@ -72,6 +72,7 @@ menu "Host utilities" > > > source "package/pkgconf/Config.in.host" > > > source "package/pru-software-support/Config.in.host" > > > source "package/pwgen/Config.in.host" > > > + source "package/python-iniparse/Config.in.host > Missing a trailing quote: > package/Config.in.host:81:warning: multi-line strings not supported Fixed, 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 peter at korsgaard.com Mon Feb 6 11:45:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:45:58 +0100 Subject: [Buildroot] [next 18/25] package/openpowerlink: properly handle legacy options In-Reply-To: <20221127130739.1862398-19-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:32 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-19-ricardo.martincoski@gmail.com> Message-ID: <87r0v39fux.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "b1063a0136 package/openpowerlink: bump to v2.2.2" tried to add > legacy handling but the new symbols are part of a choice, and Kconfig > does not enforce the select of a option from a choice. > Update the legacy entry for 2016.02, following the example described in > the beginning of the file. > Cc: Romain Naour > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:48:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:48:08 +0100 Subject: [Buildroot] [next 19/25] package/gcc: properly handle legacy for renamed ARC option In-Reply-To: <20221127130739.1862398-20-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:33 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-20-ricardo.martincoski@gmail.com> Message-ID: <87mt5r9frb.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "50332a530b gcc: rename option for ARC gcc" tried to add legacy > handling but the new symbol is part of a choice, and Kconfig does not > enforce the select of a option from a choice. > Update the legacy entry for 2016.11, following the example described in > the beginning of the file. > Cc: Giulio Benetti > Cc: Romain Naour > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Mon Feb 6 12:03:59 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 05:03:59 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-pyproject-hooks: new package Message-ID: <20230206120400.3188421-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- .../python-pyproject-hooks.hash | 5 +++++ .../python-pyproject-hooks.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-pyproject-hooks/python-pyproject-hooks.hash create mode 100644 package/python-pyproject-hooks/python-pyproject-hooks.mk diff --git a/package/python-pyproject-hooks/python-pyproject-hooks.hash b/package/python-pyproject-hooks/python-pyproject-hooks.hash new file mode 100644 index 0000000000..9fdcd33596 --- /dev/null +++ b/package/python-pyproject-hooks/python-pyproject-hooks.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pyproject_hooks/json +md5 69b0b6de189bc04c3f9e304281765741 pyproject_hooks-1.0.0.tar.gz +sha256 f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5 pyproject_hooks-1.0.0.tar.gz +# Locally computed sha256 checksums +sha256 1b22b049b5267d6dfc23a67bf4a84d8ec04b9fdfb1a51d360e42b4342c8b4154 LICENSE diff --git a/package/python-pyproject-hooks/python-pyproject-hooks.mk b/package/python-pyproject-hooks/python-pyproject-hooks.mk new file mode 100644 index 0000000000..a42dbb0ab1 --- /dev/null +++ b/package/python-pyproject-hooks/python-pyproject-hooks.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyproject-hooks +# +################################################################################ + +PYTHON_PYPROJECT_HOOKS_VERSION = 1.0.0 +PYTHON_PYPROJECT_HOOKS_SOURCE = pyproject_hooks-$(PYTHON_PYPROJECT_HOOKS_VERSION).tar.gz +PYTHON_PYPROJECT_HOOKS_SITE = https://files.pythonhosted.org/packages/25/c1/374304b8407d3818f7025457b7366c8e07768377ce12edfe2aa58aa0f64c +PYTHON_PYPROJECT_HOOKS_SETUP_TYPE = flit-bootstrap +PYTHON_PYPROJECT_HOOKS_LICENSE = MIT +PYTHON_PYPROJECT_HOOKS_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 6 12:04:00 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 05:04:00 -0700 Subject: [Buildroot] [PATCH 2/2] package/python-pypa-build: bump to version 0.10.0 In-Reply-To: <20230206120400.3188421-1-james.hilliard1@gmail.com> References: <20230206120400.3188421-1-james.hilliard1@gmail.com> Message-ID: <20230206120400.3188421-2-james.hilliard1@gmail.com> Migrate to flit-bootstrap build backend. Remove no longer needed host-python-pep517 dependency. Add new host-python-pyproject-hooks dependency. Signed-off-by: James Hilliard --- package/python-pypa-build/python-pypa-build.hash | 4 ++-- package/python-pypa-build/python-pypa-build.mk | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pypa-build/python-pypa-build.hash b/package/python-pypa-build/python-pypa-build.hash index 4c02ee1dce..9da56f9f68 100644 --- a/package/python-pypa-build/python-pypa-build.hash +++ b/package/python-pypa-build/python-pypa-build.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/build/json -md5 f2dc1823b0eff7037e19be18e354b2f1 build-0.9.0.tar.gz -sha256 1a07724e891cbd898923145eb7752ee7653674c511378eb9c7691aab1612bc3c build-0.9.0.tar.gz +md5 742e7cd0a67455c1df90061b42088bd2 build-0.10.0.tar.gz +sha256 d5b71264afdb5951d6704482aac78de887c80691c52b88a9ad195983ca2c9269 build-0.10.0.tar.gz # Locally computed sha256 checksums sha256 aaf9a29ca5907971ccf07de025375db34539a8d5eeebce20b46099805722106f LICENSE diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk index adc124b074..d7c03323b7 100644 --- a/package/python-pypa-build/python-pypa-build.mk +++ b/package/python-pypa-build/python-pypa-build.mk @@ -4,14 +4,14 @@ # ################################################################################ -PYTHON_PYPA_BUILD_VERSION = 0.9.0 +PYTHON_PYPA_BUILD_VERSION = 0.10.0 PYTHON_PYPA_BUILD_SOURCE = build-$(PYTHON_PYPA_BUILD_VERSION).tar.gz -PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/0f/61/aaf43fbb36cc4308be8ac8088f52db9622b0dbf1f0880c1016ae6aa03f46 +PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/de/1c/fb62f81952f0e74c3fbf411261d1adbdd2d615c89a24b42d0fe44eb4bcf3 PYTHON_PYPA_BUILD_LICENSE = MIT PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE -PYTHON_PYPA_BUILD_SETUP_TYPE = setuptools +PYTHON_PYPA_BUILD_SETUP_TYPE = flit-bootstrap HOST_PYTHON_PYPA_BUILD_DEPENDENCIES = \ host-python-packaging \ - host-python-pep517 + host-python-pyproject-hooks $(eval $(host-python-package)) -- 2.34.1 From angelo at amarulasolutions.com Mon Feb 6 13:00:57 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 14:00:57 +0100 Subject: [Buildroot] [PATCH] package/qt6/qt6serialbus: new package Message-ID: <20230206130057.352443-1-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- v1->v2: * LICENSE/LICENSE_FILES: one per line * Selecting BR2_PACKAGE_QT6BASE_NETWORK to make the package compile, fixes "Failed to find required Qt component "Network"." package/qt6/Config.in | 1 + package/qt6/qt6serialbus/Config.in | 15 ++++++++ package/qt6/qt6serialbus/qt6serialbus.hash | 11 ++++++ package/qt6/qt6serialbus/qt6serialbus.mk | 45 ++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 package/qt6/qt6serialbus/Config.in create mode 100644 package/qt6/qt6serialbus/qt6serialbus.hash create mode 100644 package/qt6/qt6serialbus/qt6serialbus.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 4b2b9a1174..b0cc008df5 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -39,6 +39,7 @@ menuconfig BR2_PACKAGE_QT6 if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" endif diff --git a/package/qt6/qt6serialbus/Config.in b/package/qt6/qt6serialbus/Config.in new file mode 100644 index 0000000000..1f24310e61 --- /dev/null +++ b/package/qt6/qt6serialbus/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_QT6SERIALBUS + bool "qt6serialbus" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD + select BR2_PACKAGE_QT6SERIALPORT + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6serialbus module. + + https://doc.qt.io/qt-6/qtserialbus-index.html + +comment "qt6serialbus needs headers >= 3.6" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash new file mode 100644 index 0000000000..57b68f47e8 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -0,0 +1,11 @@ +# Downloaded from https://download.qt.io/archive/qt/6.4/6.4.0/submodules/qtserialbus-everywhere-src-6.4.0.tar.xz.sha256 +sha256 efca55677c12085a85b6c0e0f401332922ebc8226b18b7fc9bb9c0d48549ea91 qtserialbus-everywhere-src-6.4.0.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.mk b/package/qt6/qt6serialbus/qt6serialbus.mk new file mode 100644 index 0000000000..fe69119a58 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qt6serialbus +# +################################################################################ + +QT6SERIALBUS_VERSION = $(QT6_VERSION) +QT6SERIALBUS_SITE = $(QT6_SITE) +QT6SERIALBUS_SOURCE = qtserialbus-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALBUS_VERSION).tar.xz +QT6SERIALBUS_INSTALL_STAGING = YES +QT6SERIALBUS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SERIALBUS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6SERIALBUS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6SERIALBUS_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SERIALBUS_DEPENDENCIES = \ + qt6serialport + +define QT6SERIALBUS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) --prefix $(STAGING_DIR)/usr +endef + +define QT6SERIALBUS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) --prefix $(TARGET_DIR)/usr +endef + +$(eval $(cmake-package)) -- 2.25.1 From angelo at amarulasolutions.com Mon Feb 6 13:07:14 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 14:07:14 +0100 Subject: [Buildroot] [PATCH v2] package/qt6/qt6serialbus: new package Message-ID: <20230206130714.359599-1-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- v1->v2: * LICENSE/LICENSE_FILES: one per line * Selecting BR2_PACKAGE_QT6BASE_NETWORK to make the package compile, fixes "Failed to find required Qt component "Network"." package/qt6/Config.in | 1 + package/qt6/qt6serialbus/Config.in | 15 ++++++++ package/qt6/qt6serialbus/qt6serialbus.hash | 11 ++++++ package/qt6/qt6serialbus/qt6serialbus.mk | 45 ++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 package/qt6/qt6serialbus/Config.in create mode 100644 package/qt6/qt6serialbus/qt6serialbus.hash create mode 100644 package/qt6/qt6serialbus/qt6serialbus.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 4b2b9a1174..b0cc008df5 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -39,6 +39,7 @@ menuconfig BR2_PACKAGE_QT6 if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" endif diff --git a/package/qt6/qt6serialbus/Config.in b/package/qt6/qt6serialbus/Config.in new file mode 100644 index 0000000000..1f24310e61 --- /dev/null +++ b/package/qt6/qt6serialbus/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_QT6SERIALBUS + bool "qt6serialbus" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD + select BR2_PACKAGE_QT6SERIALPORT + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6serialbus module. + + https://doc.qt.io/qt-6/qtserialbus-index.html + +comment "qt6serialbus needs headers >= 3.6" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash new file mode 100644 index 0000000000..57b68f47e8 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -0,0 +1,11 @@ +# Downloaded from https://download.qt.io/archive/qt/6.4/6.4.0/submodules/qtserialbus-everywhere-src-6.4.0.tar.xz.sha256 +sha256 efca55677c12085a85b6c0e0f401332922ebc8226b18b7fc9bb9c0d48549ea91 qtserialbus-everywhere-src-6.4.0.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.mk b/package/qt6/qt6serialbus/qt6serialbus.mk new file mode 100644 index 0000000000..fe69119a58 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qt6serialbus +# +################################################################################ + +QT6SERIALBUS_VERSION = $(QT6_VERSION) +QT6SERIALBUS_SITE = $(QT6_SITE) +QT6SERIALBUS_SOURCE = qtserialbus-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALBUS_VERSION).tar.xz +QT6SERIALBUS_INSTALL_STAGING = YES +QT6SERIALBUS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SERIALBUS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6SERIALBUS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6SERIALBUS_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SERIALBUS_DEPENDENCIES = \ + qt6serialport + +define QT6SERIALBUS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) --prefix $(STAGING_DIR)/usr +endef + +define QT6SERIALBUS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) --prefix $(TARGET_DIR)/usr +endef + +$(eval $(cmake-package)) -- 2.25.1 From thomas.petazzoni at bootlin.com Mon Feb 6 13:19:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 14:19:30 +0100 Subject: [Buildroot] [git commit] boot/optee-os: rewrap Config.in help text to fix check-package warning Message-ID: <20230206131937.BD10883B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b42512f2f6c3957637d698de20c3930dfcd85e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: boot/optee-os/Config.in:140: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) which is a warning that was introduced by commit 46306d135e5aab14073eece713d38e8c827c58ae ("boot/optee-os: add out-of-source OPTEE-OS device tree support"). Signed-off-by: Thomas Petazzoni --- boot/optee-os/Config.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 617ff93c44..a3cb8390b4 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -134,12 +134,13 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH string "Device Tree Source file paths" help Space-separated list of paths to device tree source files - that will be copied to core/arch/arm/dts/ before starting the - build. + that will be copied to core/arch/arm/dts/ before starting + the build. - To use this device tree source file, the OP-TEE OS configuration - must refer to it with the CFG_EMBED_DTB_SOURCE_FILE option and - no platform flavor needs to be specified. + To use this device tree source file, the OP-TEE OS + configuration must refer to it with the + CFG_EMBED_DTB_SOURCE_FILE option and no platform flavor + needs to be specified. config BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES string "Additional build variables" From yann.morin.1998 at free.fr Mon Feb 6 13:21:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 14:21:42 +0100 Subject: [Buildroot] [git commit] Makefile: fix build when $(O) ends in _defconfig Message-ID: <20230206132157.2C13883B4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5bd2cafc326141eede4f917069ed21b6d38f88c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit e6195c53041f (Makefile: fix use of many br2-external trees) fixed a slowdown with many br2-external trees. In doing so, it changed the type of the %_defconfig rule: the stem is no longer present in the prerequisites, so it changes from a pattern rule to an implicit pattern rule [0]. It is not unusual to name the build directory after the defconfig that is being built, so we may end up with a build directory named meh_defconfig. Before e6195c53041f, the pattern rule would not match [1], but now it does, which causes somewhat-cryptic build failures: Makefile:1015: *** "Can't find /some/path/meh_defconfig". Stop. The issue is that we have this set of rules and assignments (elided and reordered for legibility): all: world world: target-post-image target-post-image: staging-finalize staging-finalize: $(STAGING_DIR_SYMLINK) $(STAGING_DIR_SYMLINK): | $(BASE_DIR) BASE_DIR := $(CANONICAL_O) CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) So, there is a rule that (eventually) has a dependency on $(O), but we have no rule that provides it explicitly, so the %_defconfig rule kicks in, with the stem as "/some/path/meh". When the loop searches all the ".../configs/" directories for a file named ".../configs/%_defconfig", it actually looks for a file named ".../configs//some/path/meh_defconfig" and that indeed never matches anything. The solution is to provide an actual rule for $(BASE_DIR), so that the implicit rule does not kick in. [0] Terminology and behaviour in make is hard, so the terms we used here may be wrong or incorrectly used, and/or the explanations for the behaviour be wrong or incomplete... Still, the reasoning stands, and the root cause is the removal of the stem in the RHS of the rule (adding one back does fix the issue). [1] not sure how the prerequisite was solved before e6195c53041f, though... Fixes: e6195c53041f Reported-by: Romain Naour Signed-off-by: Yann E. MORIN Cc: Nevo Hed Cc: Peter Korsgaard Tested-by: Sebastian Weyer Signed-off-by: Yann E. MORIN --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8517d563d5..f39af5eae9 100644 --- a/Makefile +++ b/Makefile @@ -1042,7 +1042,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile # staging and target directories do NOT list these as # dependencies anywhere else -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): @mkdir -p $@ # outputmakefile generates a Makefile in the output directory, if using a From peter at korsgaard.com Mon Feb 6 13:22:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 14:22:45 +0100 Subject: [Buildroot] [next 20/25] package/lua: properly handle legacy for removed version In-Reply-To: <20221127130739.1862398-21-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:34 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-21-ricardo.martincoski@gmail.com> Message-ID: <87ilgf9bdm.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "297613f1c7 package/lua: remove 5.2.x version" tried to add > legacy handling but the new symbols are part of a choice, and Kconfig > does not enforce the select of a option from a choice. > Update the legacy entry for 2019.02, following the example described in > the beginning of the file. > Cc: Francois Perrad > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 13:22:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:37 +0100 Subject: [Buildroot] [git commit] package/live555: fix build config with locale Message-ID: <20230206132305.0B35483C25@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=04a4b86a982e307268d660a38d231315134572fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Using current conditional code, added in 2014: ifndef ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif the define LOCALE_NOT_USED is always passed on CFLAGS, because there is no symbol with following names defined: "(y,y)" -> not defined when BR2_ENABLE_LOCALE=y "(,y)" -> not defined when BR2_ENABLE_LOCALE is not set So fix the typo, switching ifndef to ifneq. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/live555/live555.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/live555/live555.mk b/package/live555/live555.mk index effd4517cf..56ed705783 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -39,7 +39,7 @@ else LIVE555_CFLAGS += -DNO_OPENSSL endif -ifndef ($(BR2_ENABLE_LOCALE),y) +ifneq ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif From peter at korsgaard.com Mon Feb 6 13:22:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:37 +0100 Subject: [Buildroot] [git commit] package/pugixml: unconditionally set BUILD_DEFINES Message-ID: <20230206132305.14C1583C26@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01cb02cfaecb34fd7d413775673e78272c68f85f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The ifdef construct intended to avoid passing -DBUILD_DEFINES="" was never needed, because even upstream version v1.9 used in 2019 when the configuration options were added, can handle an empty string for BUILD_DEFINES. In fact an empty string is the default for v1.9 if it is not passed during configure. Also, the host variant already sets BUILD_DEFINES unconditionally. So remove the unneeded conditional. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index c796186827..7d4f47c6fa 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -29,9 +29,7 @@ ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif -ifdef PUGIXML_BUILD_DEFINES PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" -endif HOST_PUGIXML_CONF_OPTS += \ -DBUILD_PKGCONFIG=ON \ From peter at korsgaard.com Mon Feb 6 13:22:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:37 +0100 Subject: [Buildroot] [git commit] package/fwts: use ifeq instead of ifdef Message-ID: <20230206132305.01E5483C24@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6ae82531928662764536cadbe2d6f3c558e7de2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The conditional code using ifdef was added in 2018 and works as expected. But there is no reason to use ifdef instead of ifeq. For consistence, switch to use ifeq like almost all packages already do. Cc: Arnout Vandecappelle Cc: Erico Nunes Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/fwts/fwts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index b208aa0c14..f04c7a848f 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -15,7 +15,7 @@ FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) -ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE +ifeq ($(BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE),y) FWTS_MODULE_SUBDIRS = efi_runtime $(eval $(kernel-module)) endif From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/pugixml: fix configuration options Message-ID: <20230206132305.1FEBD83C23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc3a4a7b1de7b158354c650d234339e8a969a730 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit upstream 1c5a0bb32583fd294022e68e66b541bf6ff71a67 ":sparkles: Update CMake to modern approach" removed all feature toogles, so starting from release v1.11 any flag passed in BUILD_DEFINES was completely ignored during the build. Version 1.11.4 was in use in buildroot since February 2021. Commit upstream 0f1e75a902ef1751dd63a67fe223b5e8daf4c7f1 "Re-introduced the custom build defines" added PUGIXML_BUILD_DEFINES to release v1.12, but BUILD_DEFINES is still completely ignored during the build. Version 1.12.1 is in use in buildroot since March 2022. So switch the config options to use PUGIXML_BUILD_DEFINES instead of BUILD_DEFINES. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 7d4f47c6fa..1a915980a5 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -29,11 +29,11 @@ ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif -PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" +PUGIXML_CONF_OPTS += -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" HOST_PUGIXML_CONF_OPTS += \ -DBUILD_PKGCONFIG=ON \ - -DBUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" + -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" $(eval $(cmake-package)) $(eval $(host-cmake-package)) From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/busybox: add comment about variable override Message-ID: <20230206132305.3320283C24@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01c0fb3862bce6605881d9e32c29b5f7373bb2f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The same comment already exists for UCLIBC_CONFIG_FILE. Both variables can be override from command-line, as described in the manual, at section 'Environment variables'. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index ef628e90e9..0f14bf999d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -108,6 +108,8 @@ BUSYBOX_MAKE_OPTS = \ CONFIG_PREFIX="$(TARGET_DIR)" \ SKIP_STRIP=y +# specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config +# setting. ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/pugixml: use explicit build options Message-ID: <20230206132305.296DA83C28@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f043f928674e94687d1d3173394142271ca3d397 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit upstream 986b7ffd01aedcd4f2aa16e78e4cad9313b6d7b2 "Add Cmake options for pugiconfig.hpp" added feature toogles to release v1.12, including PUGIXML_NO_XPATH and PUGIXML_COMPACT. Commit upstream 5f49f2c6575cc2b7d343f8d41581fe92d69d7b52 "Mark advanced options and removed redundant ones" removed CMake specific support for PUGIXML_HEADER_ONLY and PUGIXML_HAS_LONG_LONG, but they can still be provided using PUGIXML_BUILD_DEFINES, starting from release v1.12. So use the explicit build options PUGIXML_NO_XPATH and PUGIXML_COMPACT, but keep using PUGIXML_BUILD_DEFINES to set PUGIXML_HEADER_ONLY and PUGIXML_HAS_LONG_LONG. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 1a915980a5..c8d59f0864 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -12,6 +12,18 @@ PUGIXML_CPE_ID_VENDOR = pugixml_project PUGIXML_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),y) +PUGIXML_CONF_OPTS += -DPUGIXML_NO_XPATH=OFF +else +PUGIXML_CONF_OPTS += -DPUGIXML_NO_XPATH=ON +endif + +ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y) +PUGIXML_CONF_OPTS += -DPUGIXML_COMPACT=ON +else +PUGIXML_CONF_OPTS += -DPUGIXML_COMPACT=OFF +endif + # Pugixml will automatically enable 'long long' support on C++11 compilers, # which means gcc 4.8+. As gcc always supports the 'long long' type, # force-enable this option to support older gcc versions. See also: @@ -19,12 +31,6 @@ PUGIXML_INSTALL_STAGING = YES PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG HOST_PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG -ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),) -PUGIXML_BUILD_DEFINES += PUGIXML_NO_XPATH -endif -ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y) -PUGIXML_BUILD_DEFINES += PUGIXML_COMPACT -endif ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-buildroot: add comment about using virtual package infra Message-ID: <20230206132305.4803983C23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abcecd737b198e8a1a48bf4533e5c2b8de8b8cf4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "9a8ec9195c toolchain/toolchain-buildroot: migrate to virtual package infrastructure" made the packages toolchain and toolchain-buildroot to use the virtual package infra even they being generic packages. This works because on package/pkg-virtual.mk when a package do not define neither _PROVIDES_ or _HAS_ symbols, only _IS_VIRTUAL is set to YES and _VERSION and _SOURCE are set to empty before relaying the call to inner-generic-package. Add a comment explaining why the virtual package infra is used in these cases. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Yann E. MORIN Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- toolchain/toolchain-buildroot/toolchain-buildroot.mk | 3 +++ toolchain/toolchain/toolchain.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk index b30cc332d2..6da64b7c77 100644 --- a/toolchain/toolchain-buildroot/toolchain-buildroot.mk +++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk @@ -14,4 +14,7 @@ TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-buildroot-virtual +# instead of toolchain-buildroot-undefined) $(eval $(virtual-package)) diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index 18f1dbea1a..ac60a7b248 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -47,4 +47,7 @@ endef TOOLCHAIN_POST_INSTALL_TARGET_HOOKS += TOOLCHAIN_GLIBC_COPY_NSSWITCH_FILE endif +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-virtual instead +# of toolchain-undefined) $(eval $(virtual-package)) From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib: warn about ifdef on .mk Message-ID: <20230206132305.3F27283C25@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29c9b4435503d1b3130ce37dcab88c89156b1481 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master There are two legitimate cases to prefer ifdef over ifeq in package recipes: command-line overrides are allowed for busybox and uclibc configs. Except for that, all package in tree already use ifeq, so warn the developer adding/changing a package to use ifeq instead of ifdef, in order to keep consistence across packages. file.mk:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL file.mk:5: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL The difference between ifeq and ifdef is that ifdef doesn't expand recursively. Add comments to busybox and uclibc packages to avoid a warning in such special cases. Cc: Arnout Vandecappelle Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 1 + package/uclibc/uclibc.mk | 1 + utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++ utils/checkpackagelib/test_lib_mk.py | 48 ++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 0f14bf999d..f8f9cb5616 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -110,6 +110,7 @@ BUSYBOX_MAKE_OPTS = \ # specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config # setting. +# check-package disable Ifdef ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 0ddf7dfa6d..125aa4cdcf 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -22,6 +22,7 @@ UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting. +# check-package disable Ifdef ifndef UCLIBC_CONFIG_FILE UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG)) endif diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index b50a19ac62..8adf844e9a 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -21,6 +21,24 @@ continue_conditional = ["elif", "else"] end_conditional = ["endif"] +class Ifdef(_CheckFunction): + IFDEF = re.compile(r"^\s*(else\s+|)(ifdef|ifndef)\s") + + def check_line(self, lineno, text): + m = self.IFDEF.search(text) + if m is None: + return + word = m.group(2) + if word == 'ifdef': + return ["{}:{}: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL" + .format(self.filename, lineno), + text] + else: + return ["{}:{}: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL" + .format(self.filename, lineno), + text] + + class Indent(_CheckFunction): COMMENT = re.compile(r"^\s*#") CONDITIONAL = re.compile(r"^\s*({})\s".format("|".join(start_conditional + end_conditional + continue_conditional))) diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 49fa216fcd..80a1736b4e 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -3,6 +3,54 @@ import checkpackagelib.test_util as util import checkpackagelib.lib_mk as m +Ifdef = [ + ('ignore commented line', + 'any', + '# ifdef\n', + []), + ('simple', + 'any', + '\n' + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n' + 'endif\n', + [['any:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n']]), + ('ignore indentation', + 'any', + ' ifdef FOO\n' + ' endif\n' + '\tifdef BAR\n' + 'endif\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + ' ifdef FOO\n'], + ['any:3: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + '\tifdef BAR\n']]), + ('typo', + 'any', + '\n' + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n' + 'endif\n', + [['any:2: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n']]), + ('else ifdef', + 'any', + 'else ifdef SYMBOL # comment\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'else ifdef SYMBOL # comment\n']]), + ('else ifndef', + 'any', + '\t else ifndef\t($(SYMBOL),y) # comment\n', + [['any:1: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + '\t else ifndef\t($(SYMBOL),y) # comment\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Ifdef) +def test_Ifdef(testname, filename, string, expected): + warnings = util.check_file(m.Ifdef, filename, string) + assert warnings == expected + + Indent = [ ('ignore comment at beginning of line', 'any', From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/linux-headers: remove bogus symbol BR2_PACKAGE_HOST_LINUX_HEADERS Message-ID: <20230206132305.6950B83C24@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=367bd65f3c216426e2fc21742dbff11ea8d896d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The package host-linux-headers does not exist and there were never references to this symbol in the tree, do drop it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3a5207e0b6..1146231e41 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -1,8 +1,5 @@ comment "Kernel Header Options" -config BR2_PACKAGE_HOST_LINUX_HEADERS - bool - choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL From peter at korsgaard.com Mon Feb 6 13:22:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:37 +0100 Subject: [Buildroot] [git commit] support/scripts/generate-gitlab-ci-yml: improve test-pkg support Message-ID: <20230206132304.ECBBF83C23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ad3ae14c52ed0aac872875ca7f87cdcf6942128 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Following the example of test-pkg config described in commit "12c7a05da1 utils/test-pkg: add gitlab-ci support" to test a defconfig fragment that contains a disabled option is currently possible, but it do requires one to change the git config core.commentChart so the lines starting with "#" are not discarded by git when creating/editing the commit message. For instance, without the indentation the 3rd line below would be excluded from the commit message when the editor is closed: test-pkg config: SOME_OPTION=y # OTHER_OPTION is not set SOME_VARIABLE="some value" Requiring to change git configs is not very nice. So make the developer's life easier by changing the sed expression to remove indentation with spaces from a defconfig fragment found on a commit message. For instance these lines become valid and generate a defconfig fragment without the indentation of one space to be tested in GitLab CI: test-pkg config: SOME_OPTION=y # OTHER_OPTION is not set SOME_VARIABLE="some value" Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- support/scripts/generate-gitlab-ci-yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index aa43aac019..27f586f1b6 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -91,7 +91,7 @@ gen_tests() { # Retrieve defconfig for test-pkg from the git commit message (if any) if grep -q -E '^test-pkg config:$' <<<"${CI_COMMIT_DESCRIPTION}"; then - sed -r -n -e '/^test-pkg config:$/{:a;n;p;ba;}' \ + sed -r -n -e '/^test-pkg config:$/{:a;n;s/^ +//;p;ba;}' \ <<<"${CI_COMMIT_DESCRIPTION}" \ >defconfig.frag if [ ! -s defconfig.frag ]; then From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/gcc: properly handle legacy for renamed ARC option Message-ID: <20230206132305.845AC83C23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb8f38891b16e5fb0f010c658b271e22670a1633 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "50332a530b gcc: rename option for ARC gcc" tried to add legacy handling but the new symbol is part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2016.11, following the example described in the beginning of the file. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 3 ++- package/gcc/Config.in.host | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 1a325f8139..73d8ab4ca7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4100,10 +4100,11 @@ config BR2_LINUX_KERNEL_TOOL_SELFTESTS config BR2_GCC_VERSION_4_8_ARC bool "gcc arc option renamed" select BR2_LEGACY - select BR2_GCC_VERSION_ARC help The option that selects the gcc version for the ARC architecture has been renamed to BR2_GCC_VERSION_ARC. +# Note: BR2_GCC_VERSION_4_8_ARC is still referenced from +# package/gcc/Config.in.host config BR2_KERNEL_HEADERS_4_0 bool "kernel headers version 4.0.x are no longer supported" diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index d7fedc9591..cd1b9fa46d 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -2,6 +2,7 @@ comment "GCC Options" choice prompt "GCC compiler Version" + default BR2_GCC_VERSION_ARC if BR2_GCC_VERSION_4_8_ARC # legacy default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_POWERPC_SPE if BR2_powerpc_SPE default BR2_GCC_VERSION_11_X From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/openpowerlink: properly handle legacy options Message-ID: <20230206132305.7620483C25@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1e4f3950719dd92a2456e2c45856f8cf5dc587e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "b1063a0136 package/openpowerlink: bump to v2.2.2" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2016.02, following the example described in the beginning of the file. Cc: Romain Naour Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/openpowerlink/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 94d6ce19f5..1a325f8139 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4443,19 +4443,21 @@ config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB help openpowerlink kernel modules are built if the kernel stack library is selected. +# Note: BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE is still referenced from +# package/openpowerlink/Config.in config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - a monolithic user space library - a user space daemon driver +# Note: BR2_PACKAGE_OPENPOWERLINK_LIBPCAP is still referenced from +# package/openpowerlink/Config.in config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in index 1a3dd62acd..ef59a04baf 100644 --- a/package/openpowerlink/Config.in +++ b/package/openpowerlink/Config.in @@ -38,6 +38,8 @@ endchoice choice prompt "stack type" + default BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB if BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE # legacy + default BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB if BR2_PACKAGE_OPENPOWERLINK_LIBPCAP # legacy config BR2_PACKAGE_OPENPOWERLINK_STACK_MONOLITHIC_USER_STACK_LIB bool "linked into application" From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] boot/uboot: remove use of legacy xloader symbol Message-ID: <20230206132305.51D8283C26@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b1b1763b754f8a25cf0f2a7fe05e53d256fe675 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "070b183d0c boot/xloader: remove package", from release 2018.11, removed the package, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 282418c3ed..f5c20f5168 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -450,7 +450,6 @@ endif config BR2_TARGET_UBOOT_SPL bool "Install U-Boot SPL binary image" - depends on !BR2_TARGET_XLOADER help Install the U-Boot SPL binary image to the images directory. From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] system: remove use of legacy md5 option Message-ID: <20230206132305.5DF9483C28@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=032cfbc716749869b185f83dab450ec47f969765 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "bf3626002f system cfg: remove mkpasswd MD5 format option", from release 2019.02, moved the symbol to legacy handling, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- system/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/system/Config.in b/system/Config.in index 731dceaa17..deb464f4d0 100644 --- a/system/Config.in +++ b/system/Config.in @@ -78,7 +78,6 @@ endchoice # Passwd encoding config BR2_TARGET_GENERIC_PASSWD_METHOD string - default "md5" if BR2_TARGET_GENERIC_PASSWD_MD5 default "sha-256" if BR2_TARGET_GENERIC_PASSWD_SHA256 default "sha-512" if BR2_TARGET_GENERIC_PASSWD_SHA512 From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/lua: properly handle legacy for removed version Message-ID: <20230206132305.927F783C24@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f461543d9c0f8ea1586004e51561ba0a37b8aecf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "297613f1c7 package/lua: remove 5.2.x version" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2019.02, following the example described in the beginning of the file. Cc: Francois Perrad Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- package/lua/Config.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 73d8ab4ca7..22d7fbe4be 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2224,9 +2224,9 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD config BR2_PACKAGE_LUA_5_2 bool "Lua 5.2.x version removed" select BR2_LEGACY - select BR2_PACKAGE_LUA_5_3 help The Lua 5.2.x version was removed. +# Note: BR2_PACKAGE_LUA_5_2 is still referenced from package/lua/Config.in config BR2_TARGET_GENERIC_PASSWD_MD5 bool "target passwd md5 format support has been removed" diff --git a/package/lua/Config.in b/package/lua/Config.in index 456f3b8c12..888c34b21d 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER choice prompt "Lua Version" + default BR2_PACKAGE_LUA_5_3 if BR2_PACKAGE_LUA_5_2 # legacy default BR2_PACKAGE_LUA_5_4 help Select the version of Lua API/ABI you wish to use. From peter at korsgaard.com Mon Feb 6 13:25:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 14:25:08 +0100 Subject: [Buildroot] [next 21/25] package/ti-sgx-km: properly handle legacy for removed options In-Reply-To: <20221127130739.1862398-22-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:35 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-22-ricardo.martincoski@gmail.com> Message-ID: <87edr39b9n.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "c38b5566fe package/ti-sgx-{km, um, demos}: bump to latest TI > version", added in release 2020.02, removed some options that were > previously renamed in release 2018.05. > Update the legacy entry for 2018.05 and add the corresponding legacy > entries for 2020.02. > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 13:27:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 14:27:56 +0100 Subject: [Buildroot] [next 22/25] package/openjdk: properly handle legacy for renamed options In-Reply-To: <20221127130739.1862398-23-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:36 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-23-ricardo.martincoski@gmail.com> Message-ID: <87a61qappf.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "a610bf9967 package/openjdk{-bin}: bump version to 17.0.1+12" > tried to add legacy handling but the new symbols are part of a choice, > and Kconfig does not enforce the select of a option from a choice. > Update the legacy entry for 2021.11, following the example described in > the beginning of the file. > Cc: Tudor Holton > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 13:28:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 14:28:21 +0100 Subject: [Buildroot] [next 23/25] package/sunxi-mali-utgard: properly handle legacy for renamed options In-Reply-To: <20221127130739.1862398-24-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:37 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-24-ricardo.martincoski@gmail.com> Message-ID: <875yceapoq.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "6a7a652b14 package/sunxi-mali-utgard: rename from > sunxi-mali-mainline" tried to add legacy handling but the new symbols > are part of a choice, and Kconfig does not enforce the select of a > option from a choice. > Update the legacy entry for 2022.02, following the example described in > the beginning of the file. > Cc: Giulio Benetti > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 13:28:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 14:28:40 +0100 Subject: [Buildroot] [next 24/25] package/rpi-userland: fix typo for BR2_aarch64 In-Reply-To: <20221127130739.1862398-25-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:38 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-25-ricardo.martincoski@gmail.com> Message-ID: <871qn2apo7.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "59adb53c4c package/rpi-userland: add support for aarch64" > introduced a typo in the condition that shows a comment in menuconfig. > Fix the typo: BR2_arch64 -> BR2_aarch64 > Cc: Mahyar Koshkouei > Cc: Tim Gover > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 13:24:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:24:36 +0100 Subject: [Buildroot] [git commit] package/ti-sgx-km: properly handle legacy for removed options Message-ID: <20230206133023.7A68283C4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2661fe63990386cf2626ce1dd26919346ca86c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "c38b5566fe package/ti-sgx-{km, um, demos}: bump to latest TI version", added in release 2020.02, removed some options that were previously renamed in release 2018.05. Update the legacy entry for 2018.05 and add the corresponding legacy entries for 2020.02. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 66 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 22d7fbe4be..42dbe6ef5a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -1759,6 +1759,35 @@ config BR2_PACKAGE_RPI_USERLAND_START_VCFILED help The vcfiled support was removed upstream. +config BR2_PACKAGE_TI_SGX_KM_AM335X + bool "ti-sgx-km AM335X option removed" + select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM437X + bool "ti-sgx-km AM437X option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM4430 + bool "ti-sgx-km AM4430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM5430 + bool "ti-sgx-km AM5430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + comment "Legacy options removed in 2019.11" config BR2_PACKAGE_OPENVMTOOLS_PROCPS @@ -2732,45 +2761,34 @@ config BR2_PACKAGE_MEDIAART_BACKEND_QT BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_QT -# Note: BR2_PACKAGE_TI_SGX_AM335X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM335X - bool "ti-sgx-km AM335X option renamed" + bool "ti-sgx-km AM335X option removed" select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM335X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM335X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM437X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM437X - bool "ti-sgx-km AM437X option renamed" + bool "ti-sgx-km AM437X option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM437X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM437X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM4430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM4430 - bool "ti-sgx-km AM4430 option renamed" + bool "ti-sgx-km AM4430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM4430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM4430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM5430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM5430 - bool "ti-sgx-km AM5430 option renamed" + bool "ti-sgx-km AM5430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM5430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM5430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. config BR2_PACKAGE_JANUS_AUDIO_BRIDGE bool "janus-gateway audio-bridge option renamed" From peter at korsgaard.com Mon Feb 6 13:27:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:27:07 +0100 Subject: [Buildroot] [git commit] package/openjdk: properly handle legacy for renamed options Message-ID: <20230206133023.8A2E683C4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a97a4a74aa993b09b958639e2276e7f5cf7a75d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "a610bf9967 package/openjdk{-bin}: bump version to 17.0.1+12" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2021.11, following the example described in the beginning of the file. Cc: Tudor Holton Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/openjdk/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 42dbe6ef5a..53fe2f0b97 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -832,18 +832,20 @@ comment "Legacy options removed in 2021.11" config BR2_OPENJDK_VERSION_LTS bool "OpenJDK LTS version was renamed to OpenJDK 11" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_11 help The LTS version option was renamed to OpenJDK 11 to make it clear what LTS version is. +# Note: BR2_OPENJDK_VERSION_LTS is still referenced from +# package/openjdk/Config.in config BR2_OPENJDK_VERSION_LATEST bool "OpenJDK latest version (16.x) was removed" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_17 help OpenJDK 16.x is no longer mainted, so the option has been removed. Use OpenJDK 17.x instead. +# Note: BR2_OPENJDK_VERSION_LATEST is still referenced from +# package/openjdk/Config.in config BR2_PACKAGE_MPD_TIDAL bool "mpd tidal option removed" diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 8fbe51a27f..24a56e6b84 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -57,6 +57,8 @@ if BR2_PACKAGE_OPENJDK choice prompt "openjdk version" + default BR2_PACKAGE_OPENJDK_VERSION_11 if BR2_OPENJDK_VERSION_LTS # legacy + default BR2_PACKAGE_OPENJDK_VERSION_17 if BR2_OPENJDK_VERSION_LATEST # legacy default BR2_PACKAGE_OPENJDK_VERSION_17 help Select the version of OpenJDK you wish to use. From peter at korsgaard.com Mon Feb 6 13:28:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:28:08 +0100 Subject: [Buildroot] [git commit] package/sunxi-mali-utgard: properly handle legacy for renamed options Message-ID: <20230206133023.9A8CB83C4D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efc223abd4fe764f8af8238aec67e8cb700db45e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "6a7a652b14 package/sunxi-mali-utgard: rename from sunxi-mali-mainline" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2022.02, following the example described in the beginning of the file. Cc: Giulio Benetti Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/sunxi-mali-utgard/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 53fe2f0b97..4bfebe3f89 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -761,20 +761,22 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 bool "sunxi-mali-mainline-r6p2 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 bool "sunxi-mali-mainline-r8p1 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_QT5WEBKIT_EXAMPLES bool "qt5webkit-examples removed" diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in index ff49ea03f1..59ac21f5ab 100644 --- a/package/sunxi-mali-utgard/Config.in +++ b/package/sunxi-mali-utgard/Config.in @@ -20,6 +20,8 @@ config BR2_PACKAGE_PROVIDES_LIBGLES choice prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 # legacy + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 # legacy default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help Select the version of the userspace module. From peter at korsgaard.com Mon Feb 6 13:28:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:28:33 +0100 Subject: [Buildroot] [git commit] package/rpi-userland: fix typo for BR2_aarch64 Message-ID: <20230206133023.A7E1B83C4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3727229222f23d151a4991ef3db451df6362ce83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "59adb53c4c package/rpi-userland: add support for aarch64" introduced a typo in the condition that shows a comment in menuconfig. Fix the typo: BR2_arch64 -> BR2_aarch64 Cc: Mahyar Koshkouei Cc: Tim Gover Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/rpi-userland/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in index cfb472808b..4219bdb9c4 100644 --- a/package/rpi-userland/Config.in +++ b/package/rpi-userland/Config.in @@ -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 || BR2_arch64 + depends on BR2_arm || BR2_aarch64 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS From peter at korsgaard.com Mon Feb 6 13:34:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 14:34:56 +0100 Subject: [Buildroot] [PATCH v2 5/7] package/python-wsproto: new package In-Reply-To: <20230129035232.2480871-5-james.hilliard1@gmail.com> (James Hilliard's message of "Sat, 28 Jan 2023 20:52:30 -0700") References: <20230129035232.2480871-1-james.hilliard1@gmail.com> <20230129035232.2480871-5-james.hilliard1@gmail.com> Message-ID: <87wn4u9atb.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: Hi, > +++ b/package/python-wsproto/Config.in > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_PYTHON_WSPROTO > + bool "python-wsproto" > + select BR2_PACKAGE_PYTHON_H11 # runtime Something missing - We do not have a python-h11 package? -- Bye, Peter Korsgaard From angelo at amarulasolutions.com Mon Feb 6 13:34:44 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 14:34:44 +0100 Subject: [Buildroot] [PATCH v1] package/qt6: bump version to 6.4.2 In-Reply-To: <20230107153156.26347-1-ps.report@gmx.net> References: <20230107153156.26347-1-ps.report@gmx.net> Message-ID: On Sat, Jan 7, 2023 at 4:32 PM Peter Seiderer wrote: > For details see [1] and [2]. > > [1] > https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.1/release-note.md > [2] > https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.2/release-note.md > > Signed-off-by: Peter Seiderer > Tested-by: Angelo Compagnucci > --- > package/qt6/qt6.mk | 2 +- > package/qt6/qt6base/qt6base.hash | 4 ++-- > package/qt6/qt6serialport/qt6serialport.hash | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk > index 575b2f826c..431bb8c9d3 100644 > --- a/package/qt6/qt6.mk > +++ b/package/qt6/qt6.mk > @@ -5,7 +5,7 @@ > > ################################################################################ > > QT6_VERSION_MAJOR = 6.4 > -QT6_VERSION = $(QT6_VERSION_MAJOR).0 > +QT6_VERSION = $(QT6_VERSION_MAJOR).2 > QT6_SOURCE_TARBALL_PREFIX = everywhere-src > QT6_SITE = > https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules > > diff --git a/package/qt6/qt6base/qt6base.hash > b/package/qt6/qt6base/qt6base.hash > index 6544a371c6..0c722ccded 100644 > --- a/package/qt6/qt6base/qt6base.hash > +++ b/package/qt6/qt6base/qt6base.hash > @@ -1,5 +1,5 @@ > -# Hash from: > https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtbase-everywhere-src-6.4.0.tar.xz.sha256 > -sha256 > > cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d > qtbase-everywhere-src-6.4.0.tar.xz > +# Hash from: > https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 > +sha256 > > a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d > qtbase-everywhere-src-6.4.2.tar.xz > > # Hashes for license files > sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb > LICENSES/Apache-2.0.txt > diff --git a/package/qt6/qt6serialport/qt6serialport.hash > b/package/qt6/qt6serialport/qt6serialport.hash > index 54a45681fa..1eaa3d6150 100644 > --- a/package/qt6/qt6serialport/qt6serialport.hash > +++ b/package/qt6/qt6serialport/qt6serialport.hash > @@ -1,5 +1,5 @@ > -# Hash from: > https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtserialport-everywhere-src-6.4.0.tar.xz.sha256 > -sha256 > > f148cc9e87ce2228e82bff7a64d9521339ece66c4c66aa43b91bac614f4a4483 > qtserialport-everywhere-src-6.4.0.tar.xz > +# Hash from: > https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialport-everywhere-src-6.4.2.tar.xz.sha256 > +sha256 > > 336d95919037800184b3c3de8ccb6f62954b20f3756c05adce8d5010504340fa > qtserialport-everywhere-src-6.4.2.tar.xz > > # Hashes for license files: > sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce > LICENSES/BSD-3-Clause.txt > -- > 2.39.0 > > _______________________________________________ > 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 giulio.benetti at benettiengineering.com Mon Feb 6 13:26:49 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 6 Feb 2023 14:26:49 +0100 Subject: [Buildroot] [PATCH 2/2] package/postgresql: work around gcc bug 43744 In-Reply-To: <20230206122130.25893d8a@windsurf> References: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> <20230202154239.325711-2-giulio.benetti@benettiengineering.com> <20230206122130.25893d8a@windsurf> Message-ID: <01702fdc-51b5-dcca-d822-e04d326dbd17@benettiengineering.com> Hello Thomas, On 06/02/23 12:21, Thomas Petazzoni via buildroot wrote: > Hello Giulio, > > On Thu, 2 Feb 2023 16:42:39 +0100 > Giulio Benetti wrote: > >> Package postgresql suffers from gcc bug 43744 other than 85180, so let's >> work around disabling compiler optimization for this gcc bug too. >> >> Fixes: >> http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a >> >> Signed-off-by: Giulio Benetti >> --- >> package/postgresql/postgresql.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Applied to master, thanks. However, you should have resent a v2 of this > patch together with the v2 of the first patch. Never resend partial > series, but instead always, always, always, always, always, always, > always, always, always, always, always, always, always resend a full > series, even if only one patch changed. Sending partial series is > extremely confusing for the people reviewing/applying the patches. You've pointed me this recently too :-/ Sorry! -- Giulio Benetti Benetti Engineering sas From angelo at amarulasolutions.com Mon Feb 6 13:38:36 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 14:38:36 +0100 Subject: [Buildroot] [PATCH v3] package/qt6/qt6serialbus: new package Message-ID: <20230206133836.412572-1-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- v2: * LICENSE/LICENSE_FILES: one per line * Selecting BR2_PACKAGE_QT6BASE_NETWORK to make the package compile, fixes: "Failed to find required Qt component "Network". v3: * Bumped to version 6.4.2 --- package/qt6/Config.in | 1 + package/qt6/qt6serialbus/Config.in | 15 ++++++++ package/qt6/qt6serialbus/qt6serialbus.hash | 11 ++++++ package/qt6/qt6serialbus/qt6serialbus.mk | 45 ++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 package/qt6/qt6serialbus/Config.in create mode 100644 package/qt6/qt6serialbus/qt6serialbus.hash create mode 100644 package/qt6/qt6serialbus/qt6serialbus.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 4b2b9a1174..b0cc008df5 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -39,6 +39,7 @@ menuconfig BR2_PACKAGE_QT6 if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" endif diff --git a/package/qt6/qt6serialbus/Config.in b/package/qt6/qt6serialbus/Config.in new file mode 100644 index 0000000000..1f24310e61 --- /dev/null +++ b/package/qt6/qt6serialbus/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_QT6SERIALBUS + bool "qt6serialbus" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD + select BR2_PACKAGE_QT6SERIALPORT + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6serialbus module. + + https://doc.qt.io/qt-6/qtserialbus-index.html + +comment "qt6serialbus needs headers >= 3.6" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash new file mode 100644 index 0000000000..be01f13363 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialbus-everywhere-src-6.4.2.tar.xz.sha256 +sha256 604013657c7327899aa50748deb4bcb5e545ab37ff4964795b9e6f617d48bf1b qtserialbus-everywhere-src-6.4.2.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.mk b/package/qt6/qt6serialbus/qt6serialbus.mk new file mode 100644 index 0000000000..fe69119a58 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qt6serialbus +# +################################################################################ + +QT6SERIALBUS_VERSION = $(QT6_VERSION) +QT6SERIALBUS_SITE = $(QT6_SITE) +QT6SERIALBUS_SOURCE = qtserialbus-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALBUS_VERSION).tar.xz +QT6SERIALBUS_INSTALL_STAGING = YES +QT6SERIALBUS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SERIALBUS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6SERIALBUS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6SERIALBUS_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SERIALBUS_DEPENDENCIES = \ + qt6serialport + +define QT6SERIALBUS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) --prefix $(STAGING_DIR)/usr +endef + +define QT6SERIALBUS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) --prefix $(TARGET_DIR)/usr +endef + +$(eval $(cmake-package)) -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Feb 6 13:31:49 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 6 Feb 2023 14:31:49 +0100 Subject: [Buildroot] [PATCH] package/rtl8192eu: disable package for s390x architecture Message-ID: <20230206133149.910237-1-giulio.benetti@benettiengineering.com> s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this package for this architecture. Fixes: http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2/ Signed-off-by: Giulio Benetti --- package/rtl8192eu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rtl8192eu/Config.in b/package/rtl8192eu/Config.in index 4d71b711c3..969ba090ce 100644 --- a/package/rtl8192eu/Config.in +++ b/package/rtl8192eu/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTL8192EU bool "rtl8192eu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help A standalone driver for the RTL8192EU USB Wi-Fi adapter. @@ -10,4 +11,5 @@ config BR2_PACKAGE_RTL8192EU https://github.com/clnhub/rtl8192eu-linux comment "rtl8192eu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL -- 2.34.1 From peter at korsgaard.com Mon Feb 6 13:40:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:40:32 +0100 Subject: [Buildroot] [git commit] Config.in.legacy: select BR2_LEGACY from _XF86_INPUT_KEYBOARD Message-ID: <20230206134318.D4F4483C4D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00410ab668833d822f645fffd782ce11253457b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 1100ead7b318 (package/x11r7/xdriver_xf86-input-keyboard: remove package) added a legacy symbol for BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD, but forgot to select BR2_LEGACY. Fix that. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 1 + 1 file changed, 1 insertion(+) diff --git a/Config.in.legacy b/Config.in.legacy index 4bfebe3f89..191a209eeb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -210,6 +210,7 @@ config BR2_PACKAGE_QEMU_CUSTOM_TARGETS_WRAP config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD bool "xf86-input-keyboard removed" + select BR2_LEGACY help The X.org keyboard input driver no longer support Linux. From james.hilliard1 at gmail.com Mon Feb 6 13:48:38 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 06:48:38 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-h11: new package Message-ID: <20230206134838.3397457-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-h11/Config.in | 7 +++++++ package/python-h11/python-h11.hash | 5 +++++ package/python-h11/python-h11.mk | 14 ++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/python-h11/Config.in create mode 100644 package/python-h11/python-h11.hash create mode 100644 package/python-h11/python-h11.mk diff --git a/DEVELOPERS b/DEVELOPERS index 97c28fbdd8..5d788ecebf 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1381,6 +1381,7 @@ F: package/python-flatbuffers/ F: package/python-fonttools/ F: package/python-frozenlist/ F: package/python-greenlet/ +F: package/python-h11/ F: package/python-hatchling/ F: package/python-hatch-fancy-pypi-readme/ F: package/python-hatch-vcs/ diff --git a/package/Config.in b/package/Config.in index 7817b51fc2..b6211f1102 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1071,6 +1071,7 @@ menu "External python modules" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" source "package/python-gunicorn/Config.in" + source "package/python-h11/Config.in" source "package/python-h2/Config.in" source "package/python-hiredis/Config.in" source "package/python-hpack/Config.in" diff --git a/package/python-h11/Config.in b/package/python-h11/Config.in new file mode 100644 index 0000000000..736620d782 --- /dev/null +++ b/package/python-h11/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_H11 + bool "python-h11" + help + A pure-Python, bring-your-own-I/O implementation of + HTTP/1.1. + + https://github.com/python-hyper/h11 diff --git a/package/python-h11/python-h11.hash b/package/python-h11/python-h11.hash new file mode 100644 index 0000000000..0c65a11d00 --- /dev/null +++ b/package/python-h11/python-h11.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/h11/json +md5 84c33fc0aa1f868928114c4d02c43dc2 h11-0.14.0.tar.gz +sha256 8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d h11-0.14.0.tar.gz +# Locally computed sha256 checksums +sha256 37db5bb85926db28a427a25867f10b1232003aea1be69ccb851138adb8e6f361 LICENSE.txt diff --git a/package/python-h11/python-h11.mk b/package/python-h11/python-h11.mk new file mode 100644 index 0000000000..d7dca5244b --- /dev/null +++ b/package/python-h11/python-h11.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-h11 +# +################################################################################ + +PYTHON_H11_VERSION = 0.14.0 +PYTHON_H11_SOURCE = h11-$(PYTHON_H11_VERSION).tar.gz +PYTHON_H11_SITE = https://files.pythonhosted.org/packages/f5/38/3af3d3633a34a3316095b39c8e8fb4853a28a536e55d347bd8d8e9a14b03 +PYTHON_H11_SETUP_TYPE = setuptools +PYTHON_H11_LICENSE = MIT +PYTHON_H11_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 6 13:49:29 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 06:49:29 -0700 Subject: [Buildroot] [PATCH v2 5/7] package/python-wsproto: new package In-Reply-To: <87wn4u9atb.fsf@dell.be.48ers.dk> References: <20230129035232.2480871-1-james.hilliard1@gmail.com> <20230129035232.2480871-5-james.hilliard1@gmail.com> <87wn4u9atb.fsf@dell.be.48ers.dk> Message-ID: On Mon, Feb 6, 2023 at 6:34 AM Peter Korsgaard wrote: > > >>>>> "James" == James Hilliard writes: > > Hi, > > > +++ b/package/python-wsproto/Config.in > > @@ -0,0 +1,7 @@ > > +config BR2_PACKAGE_PYTHON_WSPROTO > > + bool "python-wsproto" > > + select BR2_PACKAGE_PYTHON_H11 # runtime > > Something missing - We do not have a python-h11 package? Hmm, yeah, not sure why that didn't get sent before: https://patchwork.ozlabs.org/project/buildroot/patch/20230206134838.3397457-1-james.hilliard1 at gmail.com/ > > -- > Bye, Peter Korsgaard From angelo at amarulasolutions.com Mon Feb 6 14:21:41 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 15:21:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt6: Add qmake functionality In-Reply-To: <20221103190446.3574423-1-jesseevg@gmail.com> References: <20221103190446.3574423-1-jesseevg@gmail.com> Message-ID: On Thu, Nov 3, 2022 at 8:05 PM Jesse Van Gavere wrote: > The qmake functionality had been missing due to the new host/target > build requirement, to get it working the main parts of the qt5 qmake > has been kept, we're still making our own device spec which we use to > run qmake with along with passing some additional device options for our > flags/cross-compiler the biggest difference is that where previously > qt.conf was used to fixup per-paths builds, this is now always > created with changed contents so qmake looks at the correct target > directories. > > A big thanks to Angelo Compagnucci for the encouragement and testing. > > Signed-off-by: Jesse Van Gavere > Tested-by: Angelo Compagnucci > --- > package/qt6/qt6.mk | 12 ++++++++++ > package/qt6/qt6base/qmake.conf.in | 36 +++++++++++++++++++++++++++++ > package/qt6/qt6base/qplatformdefs.h | 1 + > package/qt6/qt6base/qt.conf.in | 7 ++++++ > package/qt6/qt6base/qt6base.mk | 18 +++++++++++++++ > 5 files changed, 74 insertions(+) > create mode 100644 package/qt6/qt6base/qmake.conf.in > create mode 100644 package/qt6/qt6base/qplatformdefs.h > create mode 100644 package/qt6/qt6base/qt.conf.in > > diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk > index 575b2f826c..bd8fb0ab51 100644 > --- a/package/qt6/qt6.mk > +++ b/package/qt6/qt6.mk > @@ -10,3 +10,15 @@ QT6_SOURCE_TARBALL_PREFIX = everywhere-src > QT6_SITE = > https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules > > include $(sort $(wildcard package/qt6/*/*.mk)) > + > +# The file "qt.conf" can be used to override the hard-coded paths that are > +# compiled into the Qt library. We need it to make "qmake" relocatable due > +# to the host/target build and tweak the per-package install pathes > +define QT6_INSTALL_QT_CONF > + rm -f $(HOST_DIR)/bin/qt.conf > + sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" > \ > + $(QT6BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf > +endef > + > +# Variable for other Qt applications to use > +QT6_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ > diff --git a/package/qt6/qt6base/qmake.conf.in b/package/qt6/qt6base/ > qmake.conf.in > new file mode 100644 > index 0000000000..ebb8497d2d > --- /dev/null > +++ b/package/qt6/qt6base/qmake.conf.in > @@ -0,0 +1,36 @@ > +# Qt6 has a mechanism to support "device" profiles, so that people can > +# specify the compiler, compiler flags and so on for a specific device. > + > +# We leverage this mechanism in the Buildroot packaging of qt6 to > +# simplify cross-compilation: we have our own "device" definition, which > +# allows us to easily pass the cross-compiler paths and flags from our > +# qt6.mk. > + > +include(../common/linux_device_pre.conf) > + > +# modifications to g++-unix.conf > +QMAKE_CC = $${CROSS_COMPILE}gcc > +QMAKE_CXX = $${CROSS_COMPILE}g++ > +QMAKE_LINK = $${CROSS_COMPILE}g++ > + > +# modifications to gcc-base.conf > +QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} > +QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} > +# Remove all optimisation flags, we really only want our own. > +QMAKE_CFLAGS_OPTIMIZE = > +QMAKE_CFLAGS_OPTIMIZE_DEBUG = > +QMAKE_CFLAGS_OPTIMIZE_FULL = > +QMAKE_CFLAGS_OPTIMIZE_SIZE = > +QMAKE_CFLAGS_DEBUG = > +QMAKE_CXXFLAGS_DEBUG = > +QMAKE_CFLAGS_RELEASE = > +QMAKE_CXXFLAGS_RELEASE = > +CONFIG += nostrip > + > +QMAKE_LIBS += -lrt -lpthread -ldl > +QMAKE_CFLAGS_ISYSTEM = > + > + at EGLFS_DEVICE@ > + > +include(../common/linux_device_post.conf) > +load(qt_config) > diff --git a/package/qt6/qt6base/qplatformdefs.h > b/package/qt6/qt6base/qplatformdefs.h > new file mode 100644 > index 0000000000..99e9a27923 > --- /dev/null > +++ b/package/qt6/qt6base/qplatformdefs.h > @@ -0,0 +1 @@ > +#include "../../linux-g++/qplatformdefs.h" > diff --git a/package/qt6/qt6base/qt.conf.in b/package/qt6/qt6base/ > qt.conf.in > new file mode 100644 > index 0000000000..4842bcb462 > --- /dev/null > +++ b/package/qt6/qt6base/qt.conf.in > @@ -0,0 +1,7 @@ > +[Paths] > +Prefix=/usr > +HostPrefix=@@HOST_DIR@@ > +HostData=../target/usr > +Sysroot=@@STAGING_DIR@@ > +SysrootifyPrefix=true > +TargetSpec=devices/linux-buildroot-g++ > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/ > qt6base.mk > index b7ee6037f3..9e2f884e94 100644 > --- a/package/qt6/qt6base/qt6base.mk > +++ b/package/qt6/qt6base/qt6base.mk > @@ -35,6 +35,9 @@ QT6BASE_CONF_OPTS = \ > -DFEATURE_system_zlib=ON \ > -DFEATURE_system_libb2=ON > > +QT6BASE_CFLAGS = $(TARGET_CFLAGS) > +QT6BASE_CXXFLAGS = $(TARGET_CXXFLAGS) > + > # x86 optimization options. While we have a BR2_X86_CPU_HAS_AVX512, it > # is not clear yet how it maps to all the avx512* options of Qt, so we > # for now keeps them disabled. > @@ -215,5 +218,20 @@ else > QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF > endif > > +define QT6BASE_MAKE_BR_SPEC > + mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/ > + sed 's/@EGLFS_DEVICE@/$(QT6BASE_EGLFS_DEVICE)/g' \ > + $(QT6BASE_PKGDIR)/qmake.conf.in > \ > + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf > + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ > + $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h > +endef > + > +QT6BASE_CONF_OPTS += > -DQT_QMAKE_DEVICE_OPTIONS=CROSS_COMPILE="$(TARGET_CROSS)";BR_COMPILER_CFLAGS="$(QT6BASE_CFLAGS)";BR_COMPILER_CXXFLAGS="$(QT6BASE_CXX_FLAGS)" > + > +QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC > + > +QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF > + > $(eval $(cmake-package)) > $(eval $(host-cmake-package)) > -- > 2.34.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 peter at korsgaard.com Mon Feb 6 14:37:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 15:37:43 +0100 Subject: [Buildroot] [PATCH 1/3] package/freescale-imx/imx-gpu-viv: drop X11 output In-Reply-To: <20230114230028.46833cae@windsurf> (Thomas Petazzoni via buildroot's message of "Sat, 14 Jan 2023 23:00:28 +0100") References: <20230114230028.46833cae@windsurf> Message-ID: <87sffi97wo.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: Hi, >> It contains libraries and headers for GLES, OpenCL, and >> - OpenVG. It also contains a DRI plugin for X11. It also >> - contains a plugin for DirectFB-1.4.0, but that doesn't work >> + OpenVG. It also contains a plugin for DirectFB-1.4.0, >> + but that doesn't work >> together with buildroot's DirectFB version. > This paragraph should have been rewrapped after your change. > Other than that, looks good so I've applied. Of course, it might be > surprising for people who might be using X11 with OpenGL support on > i.MX platforms... but we're simply following the choice made by > upstream. I see we still have xf86-video-imx-viv which depends on the now removed BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 symbol, so I guess we should remove that package as well. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 6 14:54:38 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 15:54:38 +0100 Subject: [Buildroot] [git commit] utils/genrandconfig: migrate to asyncio subprocess calls Message-ID: <20230206145510.8122883C54@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=579b65b55234d298570e5191efb509905933eef5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since genrandconfig no longer appears to support python2 we can migrate the subprocess calls to use asyncio variants. This has the advantage of allowing for runners like autobuild-run to integrate directly into genrandconfig by calling the asyncio gen_config using importlib instead of having to run genrandconfig as a subprocess. Using asyncio is advantageous here as it eliminates the requirement for the runner to deal with blocking subprocess calls(by having to use threading for example). Also cleanup some unused functions/python2 compatibility shims. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- utils/genrandconfig | 85 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 29 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index b4ebb9a9be..b3576f8a51 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -19,24 +19,19 @@ # This script generates a random configuration for testing Buildroot. from binascii import hexlify -import contextlib +import asyncio import csv import os from random import randint -import subprocess import sys import traceback from distutils.version import StrictVersion import platform -if sys.hexversion >= 0x3000000: - import urllib.request as _urllib +if sys.version_info < (3, 8): + from asyncio import coroutine else: - import urllib2 as _urllib - - -def urlopen_closing(uri): - return contextlib.closing(_urllib.urlopen(uri)) + from types import coroutine class SystemInfo: @@ -65,6 +60,7 @@ class SystemInfo: # -- return None + @coroutine def has(self, prog): """Checks whether a program is available. Lazily evaluates missing entries. @@ -80,11 +76,13 @@ class SystemInfo: have_it = self.find_prog(prog) # java[c] needs special care if have_it and prog in ('java', 'javac'): - with open(os.devnull, "w") as devnull: - if subprocess.call("%s -version | grep gcj" % prog, - shell=True, - stdout=devnull, stderr=devnull) != 1: - have_it = False + proc = yield from asyncio.create_subprocess_shell( + "%s -version | grep gcj" % prog, + stdout=asyncio.subprocess.DEVNULL, + stderr=asyncio.subprocess.DEVNULL) + ret = yield from proc.wait() + if ret != 1: + have_it = False # -- self.progs[prog] = have_it return have_it @@ -161,6 +159,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): return configs + at coroutine def is_toolchain_usable(configfile, config): """Check if the toolchain is actually usable.""" @@ -181,7 +180,11 @@ def is_toolchain_usable(configfile, config): 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: - ldd_version_output = subprocess.check_output(['ldd', '--version']) + proc = yield from asyncio.create_subprocess_exec( + 'ldd', '--version', stdout=asyncio.subprocess.PIPE) + ldd_version_output, _ = yield from proc.communicate() + if proc.returncode: + return False glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] if StrictVersion('2.14') > StrictVersion(glibc_version): print("WARN: ignoring the Linaro ARM toolchains because too old host glibc", file=sys.stderr) @@ -190,6 +193,7 @@ def is_toolchain_usable(configfile, config): return True + at coroutine def fixup_config(sysinfo, configfile): """Finalize the configuration and reject any problematic combinations @@ -206,7 +210,8 @@ def fixup_config(sysinfo, configfile): BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not sysinfo.has("java"): + has_java = yield from sysinfo.has("java") + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: return False # The ctng toolchain is affected by PR58854 if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ @@ -649,6 +654,7 @@ def fixup_config(sysinfo, configfile): return True + at coroutine def gen_config(args): """Generate a new random configuration @@ -707,7 +713,8 @@ def gen_config(args): # Randomly enable BR2_REPRODUCIBLE 10% of times # also enable tar filesystem images for testing - if sysinfo.has("diffoscope") and randint(0, 10) == 0: + has_diffoscope = yield from sysinfo.has("diffoscope") + if has_diffoscope and randint(0, 10) == 0: configlines.append("BR2_REPRODUCIBLE=y\n") configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") @@ -721,10 +728,14 @@ def gen_config(args): with open(configfile, "w+") as configf: configf.writelines(configlines) - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "olddefconfig"]) + proc = yield from asyncio.create_subprocess_exec( + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") + ret = yield from proc.wait() + if ret: + return ret - if not is_toolchain_usable(configfile, toolchainconfig): + toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) + if not toolchain_usable: return 2 # Now, generate the random selection of packages, and fixup @@ -744,19 +755,31 @@ def gen_config(args): "KCONFIG_PROBABILITY=%d" % randint(1, 20), "randpackageconfig" if args.toolchains_csv else "randconfig" ] - subprocess.check_call(make_rand) + proc = yield from asyncio.create_subprocess_exec(*make_rand) + ret = yield from proc.wait() + if ret: + return ret - if fixup_config(sysinfo, configfile): + ret = yield from fixup_config(sysinfo, configfile) + if ret: break - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "olddefconfig"]) + proc = yield from asyncio.create_subprocess_exec( + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") + ret = yield from proc.wait() + if ret: + return ret - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "savedefconfig"]) + proc = yield from asyncio.create_subprocess_exec( + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") + ret = yield from proc.wait() + if ret: + return ret - return subprocess.call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "dependencies"]) + proc = yield from asyncio.create_subprocess_exec( + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") + ret = yield from proc.wait() + return ret if __name__ == '__main__': @@ -788,7 +811,11 @@ if __name__ == '__main__': args.outputdir = os.path.abspath(args.outputdir) try: - ret = gen_config(args) + if sys.version_info < (3, 7): + loop = asyncio.get_event_loop() + ret = loop.run_until_complete(gen_config(args)) + else: + ret = asyncio.run(gen_config(args)) except Exception: traceback.print_exc() parser.exit(1) From peter at korsgaard.com Mon Feb 6 14:56:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 15:56:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-h11: new package In-Reply-To: <20230206134838.3397457-1-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 6 Feb 2023 06:48:38 -0700") References: <20230206134838.3397457-1-james.hilliard1@gmail.com> Message-ID: <87o7q69723.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 6 14:56:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 15:56:50 +0100 Subject: [Buildroot] [PATCH 1/3] package/freescale-imx/imx-gpu-viv: drop X11 output In-Reply-To: <87sffi97wo.fsf@dell.be.48ers.dk> References: <20230114230028.46833cae@windsurf> <87sffi97wo.fsf@dell.be.48ers.dk> Message-ID: <20230206155650.79bafe2c@windsurf> On Mon, 06 Feb 2023 15:37:43 +0100 Peter Korsgaard wrote: > I see we still have xf86-video-imx-viv which depends on the now removed > BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 symbol, so I guess we should remove > that package as well. Gah, I did not notice that: indeed it should be removed as well. Daniel, will you cook some patch doing that? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Mon Feb 6 15:05:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 16:05:17 +0100 Subject: [Buildroot] [next 17/25] package/gitlab-runner: ensure use of LIBCURL_OPENSSL In-Reply-To: <87v8kf9g9l.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Mon, 06 Feb 2023 12:37:10 +0100") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-18-ricardo.martincoski@gmail.com> <87v8kf9g9l.fsf@dell.be.48ers.dk> Message-ID: <87k00u96mq.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Ricardo" == Ricardo Martincoski writes: >> Currently this minimal config is accepted while it shouldn't: >> BR2_x86_i686=y >> BR2_PACKAGE_BEARSSL=y >> BR2_PACKAGE_LIBCURL_BEARSSL=y >> BR2_PACKAGE_GITLAB_RUNNER=y >> BR2_PACKAGE_GITLAB_RUNNER selects BR2_PACKAGE_LIBCURL_OPENSSL. >> Kconfig does not enforce a select when the symbol selected is part of a >> choice. See similar explanation on [1] and [2]. >> Doing something similar to [3] and depending on the choice option >> instead of selecting it would create a Kconfig recursive dependency. >> Just dropping the ineffective select would keep the above defconfig >> snippet as an accepted one. >> Adding a comment to the menu, i.e.: >> comment "gitlab-runner must use BR2_PACKAGE_LIBCURL_OPENSSL" >> depends on BR2_PACKAGE_GITLAB_RUNNER >> depends on !BR2_PACKAGE_LIBCURL_OPENSSL >> could improve user experience but it also keeps the above defconfig >> snippet as an accepted one. >> So bail out the build when gitlab-runner is enabled and libcurl-openssl >> is not selected, similar to what is done in [4]. >> [1] "a44b1c1405 legacy: update the BR2_PREFER_STATIC_LIB option" >> [2] "b1d5aa1bc2 package/qwt: Fix selecting OpenGL support in qt4" >> [3] "9fc652a373 package/libmodsecurity: needs dynamic library with >> libcurl and mbedtls" >> [4] "fda53f0791 package/Makefile.in: add detection for the lack of C >> library" >> Cc: Marcin Niestroj >> Cc: Romain Naour >> Signed-off-by: Ricardo Martincoski > The change as such is fine, but why does gitlab-runner really need the > curl binary to use the openssl backend? Perhaps it is just about curl > having HTTPS support? A that is presumably what was meant I have instead changed it to use the BR2_PACKAGE_LIBCURL_FORCE_TLS option. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Mon Feb 6 15:08:47 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 08:08:47 -0700 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: switch to async/await format Message-ID: <20230206150847.3621475-1-james.hilliard1@gmail.com> This requires python 3.6 or newer but is a bit cleaner. Signed-off-by: James Hilliard --- utils/genrandconfig | 62 +++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index b3576f8a51..8947898d88 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -28,11 +28,6 @@ import traceback from distutils.version import StrictVersion import platform -if sys.version_info < (3, 8): - from asyncio import coroutine -else: - from types import coroutine - class SystemInfo: DEFAULT_NEEDED_PROGS = ["make", "git", "gcc", "timeout"] @@ -60,8 +55,7 @@ class SystemInfo: # -- return None - @coroutine - def has(self, prog): + async def has(self, prog): """Checks whether a program is available. Lazily evaluates missing entries. @@ -76,11 +70,11 @@ class SystemInfo: have_it = self.find_prog(prog) # java[c] needs special care if have_it and prog in ('java', 'javac'): - proc = yield from asyncio.create_subprocess_shell( + proc = await asyncio.create_subprocess_shell( "%s -version | grep gcj" % prog, stdout=asyncio.subprocess.DEVNULL, stderr=asyncio.subprocess.DEVNULL) - ret = yield from proc.wait() + ret = await proc.wait() if ret != 1: have_it = False # -- @@ -159,8 +153,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): return configs - at coroutine -def is_toolchain_usable(configfile, config): +async def is_toolchain_usable(configfile, config): """Check if the toolchain is actually usable.""" with open(configfile) as configf: @@ -180,9 +173,9 @@ def is_toolchain_usable(configfile, config): 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( 'ldd', '--version', stdout=asyncio.subprocess.PIPE) - ldd_version_output, _ = yield from proc.communicate() + ldd_version_output, _ = await proc.communicate() if proc.returncode: return False glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] @@ -193,8 +186,7 @@ def is_toolchain_usable(configfile, config): return True - at coroutine -def fixup_config(sysinfo, configfile): +async def fixup_config(sysinfo, configfile): """Finalize the configuration and reject any problematic combinations This function returns 'True' when the configuration has been @@ -210,8 +202,7 @@ def fixup_config(sysinfo, configfile): BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' - has_java = yield from sysinfo.has("java") - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not await sysinfo.has("java"): return False # The ctng toolchain is affected by PR58854 if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ @@ -654,8 +645,7 @@ def fixup_config(sysinfo, configfile): return True - at coroutine -def gen_config(args): +async def gen_config(args): """Generate a new random configuration This function generates the configuration, by choosing a random @@ -713,8 +703,7 @@ def gen_config(args): # Randomly enable BR2_REPRODUCIBLE 10% of times # also enable tar filesystem images for testing - has_diffoscope = yield from sysinfo.has("diffoscope") - if has_diffoscope and randint(0, 10) == 0: + if await sysinfo.has("diffoscope") and randint(0, 10) == 0: configlines.append("BR2_REPRODUCIBLE=y\n") configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") @@ -728,14 +717,13 @@ def gen_config(args): with open(configfile, "w+") as configf: configf.writelines(configlines) - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") - ret = yield from proc.wait() + ret = await proc.wait() if ret: return ret - toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) - if not toolchain_usable: + if not await is_toolchain_usable(configfile, toolchainconfig): return 2 # Now, generate the random selection of packages, and fixup @@ -749,37 +737,33 @@ def gen_config(args): file=sys.stderr) return 1 bounded_loop -= 1 - make_rand = [ + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), "KCONFIG_PROBABILITY=%d" % randint(1, 20), - "randpackageconfig" if args.toolchains_csv else "randconfig" - ] - proc = yield from asyncio.create_subprocess_exec(*make_rand) - ret = yield from proc.wait() + "randpackageconfig" if args.toolchains_csv else "randconfig") + ret = await proc.wait() if ret: return ret - ret = yield from fixup_config(sysinfo, configfile) - if ret: + if await fixup_config(sysinfo, configfile): break - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") - ret = yield from proc.wait() + ret = await proc.wait() if ret: return ret - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") - ret = yield from proc.wait() + ret = await proc.wait() if ret: return ret - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") - ret = yield from proc.wait() - return ret + return await proc.wait() if __name__ == '__main__': -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 6 15:12:53 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 08:12:53 -0700 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: allow overriding KCONFIG_PROBABILITY Message-ID: <20230206151253.3629954-1-james.hilliard1@gmail.com> Tweaking this variable should allow us to get better coverage of packages with larger dependency trees. Signed-off-by: James Hilliard --- Changes v1 -> v2: - rebase --- utils/genrandconfig | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index b3576f8a51..830b85e5c8 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -752,7 +752,7 @@ def gen_config(args): make_rand = [ "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), - "KCONFIG_PROBABILITY=%d" % randint(1, 20), + "KCONFIG_PROBABILITY=%d" % args.probability, "randpackageconfig" if args.toolchains_csv else "randconfig" ] proc = yield from asyncio.create_subprocess_exec(*make_rand) @@ -784,6 +784,21 @@ def gen_config(args): if __name__ == '__main__': import argparse + + class Range(argparse.Action): + def __init__(self, minimum=None, maximum=None, *args, **kwargs): + self.min = minimum + self.max = maximum + kwargs["metavar"] = "[%d-%d]" % (self.min, self.max) + super(Range, self).__init__(*args, **kwargs) + + def __call__(self, parser, namespace, value, option_string=None): + if not (self.min <= value <= self.max): + msg = 'invalid choice: %r (choose from [%d-%d])' % \ + (value, self.min, self.max) + raise argparse.ArgumentError(self, msg) + setattr(namespace, self.dest, value) + parser = argparse.ArgumentParser(description="Generate a random configuration") parser.add_argument("--outputdir", "-o", help="Output directory (relative to current directory)", @@ -791,6 +806,10 @@ if __name__ == '__main__': parser.add_argument("--buildrootdir", "-b", help="Buildroot directory (relative to current directory)", type=str, default='.') + parser.add_argument("--probability", "-p", + help="Override the KCONFIG_PROBABILITY value", + type=int, action=Range, minimum=0, maximum=100, + default=randint(1, 20)) toolchains_csv = parser.add_mutually_exclusive_group(required=False) toolchains_csv.add_argument("--toolchains-csv", -- 2.34.1 From marcus.folkesson at gmail.com Mon Feb 6 15:15:14 2023 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Mon, 6 Feb 2023 16:15:14 +0100 Subject: [Buildroot] [PATCH] package/libcamera: bump to version 0.0.4 Message-ID: <20230206151514.1579632-1-marcus.folkesson@gmail.com> Signed-off-by: Marcus Folkesson --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 033e318910..ea204aee98 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 d7100286616550aca487b46ae9de2a70bb471352a332b8214901b4148739990f libcamera-v0.0.3-br1.tar.gz +sha256 13e53b33652b16454264b6eff0a6f032aa9331f919b07b6d0e622917ed7f7dd8 libcamera-v0.0.4-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 8979a43aca..01c4cb2ff2 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = v0.0.3 +LIBCAMERA_VERSION = v0.0.4 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ -- 2.38.1 From quentin.schulz at theobroma-systems.com Mon Feb 6 15:18:33 2023 From: quentin.schulz at theobroma-systems.com (Quentin Schulz) Date: Mon, 6 Feb 2023 16:18:33 +0100 Subject: [Buildroot] [PATCH] package/libcamera: bump to version 0.0.4 In-Reply-To: <20230206151514.1579632-1-marcus.folkesson@gmail.com> References: <20230206151514.1579632-1-marcus.folkesson@gmail.com> Message-ID: Hi Marcus, On 2/6/23 16:15, Marcus Folkesson wrote: > Signed-off-by: Marcus Folkesson You beat me to it by like 5min.. I was just writing the commit log :) Reviewed-by: Quentin Schulz Thanks, Quentin From peter at korsgaard.com Mon Feb 6 15:30:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 16:30:10 +0100 Subject: [Buildroot] [next 25/25] utils/check-symbols: new script In-Reply-To: <20221127130739.1862398-26-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:39 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-26-ricardo.martincoski@gmail.com> Message-ID: <87fsbi95h9.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: Hi, > This script checks for inconsistencies on symbols declared in Config.in > and used in .mk files. > Currently it checks only symbols following the pattern BR2_\w+ . > The script first gets the list of all files in the repository (using git > ls-files like 'make check-flake8' already do). > Then it parses all relevant files, searching for symbol definitions and > usages, and add entries into a database. > At the end, the database is searched for inconsistencies: > - symbol that is part of "choice" and is referenced with "select"; > - legacy symbol being referenced in packages; > - legacy symbol being redefined in packages; > - symbol referenced but not defined; > - symbol defined but not referenced; > - legacy symbol that has a Note stating it is referenced by a package > (for legacy handling) but is referenced in the package without a > comment "# legacy"; > - legacy symbol that has a Note stating it is referenced by a package > but it is not actually referenced. > There is also a debug parameter --search that dumps any filename or > symbol entries from the database that matches a regexp. > Sample usages: > $ utils/check-symbols > $ utils/docker-run utils/check-symbols > $ utils/check-symbols --search 'GETTEXT\b|\/openssl' > At same time the script is created: > - add unit tests for it, they can be run using: > utils/docker-run python3 -m pytest -v utils/checksymbolslib/ > - add two more GitLab CI jobs: check-symbols (to check current tree > using the script) and check-check-symbols (to check the script against > its unit tests) Cool! It is somewhat annoying that it is separate from check-package, but given that it needs to work on all files and check-package doesn't, I indeed also cannot see a good way to fix that. We should probably add a small notice about it in the manual, E.G. in adding-packages-tips.txt. Care to send a patch for that? > +++ b/utils/check-symbols > @@ -0,0 +1,78 @@ > +#!/usr/bin/env python3 > + > +import argparse > +import os > +import sys > + > +import checksymbolslib.file as file > +from checksymbolslib.db import DB > + > + > +def parse_args(): > + parser = argparse.ArgumentParser() > + parser.add_argument('--search', action='store', default=None, > + help='print all symbols matching a given regular expression') > + return parser.parse_args() > + > + > +def change_current_dir(): > + base_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) > + os.chdir(base_dir) change_current_dir() is IMHO not a very clear name, so I've changed it to change_to_top_dir() instead. > + > + warnings = [] > + warnings += db.get_warnings_for_choices_selected() > + warnings += db.get_warnings_for_legacy_symbols_being_defined() > + warnings += db.get_warnings_for_legacy_symbols_being_used() > + warnings += db.get_warnings_for_symbols_with_legacy_note_and_no_comment_on_usage() > + warnings += db.get_warnings_for_symbols_with_legacy_note_and_no_usage() > + warnings += db.get_warnings_for_symbols_without_definition() > + warnings += db.get_warnings_for_symbols_without_usage() > + > + for filename, lineno, msg in sorted(warnings): > + print('{}:{}: {}'.format(filename, lineno, msg)) Warnings typically go to stderr, so I changed this to print to stderr. Committed with the above changes, thanks. Arnout/Thomas/Yann, please update your post-applypatch script to also run check-symbols. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 15:30:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:19 +0100 Subject: [Buildroot] [git commit] package/libvirt: drop reference to legacy BR2_PACKAGE_QEMU_CUSTOM_TARGETS Message-ID: <20230206153039.F112683C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01ce9e95eb4f7fb731b20f3973edd582d4640084 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 44be514b21fd9409 (package/qemu: refactor target emulator selection) dropped BR2_PACKAGE_QEMU_CUSTOM_TARGETS, but didn't remove the reference from libvirt. Fix that. Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index f0687cd5db..3f4fc70e62 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -73,7 +73,7 @@ config BR2_PACKAGE_LIBVIRT_QEMU select BR2_PACKAGE_HWDATA_PCI_IDS # libpciaccess select BR2_PACKAGE_LIBSECCOMP select BR2_PACKAGE_QEMU - select BR2_PACKAGE_QEMU_SYSTEM if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = "" + select BR2_PACKAGE_QEMU_SYSTEM select BR2_PACKAGE_YAJL help QEMU/KVM support From peter at korsgaard.com Mon Feb 6 15:30:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:20 +0100 Subject: [Buildroot] [git commit] package/gitlab-runner: use LIBCURL_FORCE_TLS to enforce TLS support in curl Message-ID: <20230206153040.1FC2B83CA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b95f7591bd83a0e483d2b6db49258d2ea8b44f3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master BR2_PACKAGE_LIBCURL_OPENSSL is part of a "choice" option so it cannot be selected. What seems to be really be needed is HTTPS support in curl, so use the blind LIBCURL_FORCE_TLS option instead (openssl is already selected). Signed-off-by: Peter Korsgaard --- package/gitlab-runner/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gitlab-runner/Config.in b/package/gitlab-runner/Config.in index 89e3e87b5c..4289613ab9 100644 --- a/package/gitlab-runner/Config.in +++ b/package/gitlab-runner/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_GITLAB_RUNNER select BR2_PACKAGE_GIT # runtime select BR2_PACKAGE_LIBCURL # runtime select BR2_PACKAGE_LIBCURL_CURL # runtime - select BR2_PACKAGE_LIBCURL_OPENSSL # runtime, for ca-certificates. + select BR2_PACKAGE_LIBCURL_FORCE_TLS # runtime select BR2_PACKAGE_OPENSSL # runtime select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL # runtime select BR2_PACKAGE_LIBOPENSSL_BIN # runtime From peter at korsgaard.com Mon Feb 6 15:30:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:20 +0100 Subject: [Buildroot] [git commit] package/python-h11: new package Message-ID: <20230206153040.1600183CA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71c132494062055bf07c23617a56f0b705dbe93b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-h11/Config.in | 7 +++++++ package/python-h11/python-h11.hash | 5 +++++ package/python-h11/python-h11.mk | 14 ++++++++++++++ 5 files changed, 28 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 6597225ac3..4c2352b617 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1380,6 +1380,7 @@ F: package/python-flatbuffers/ F: package/python-fonttools/ F: package/python-frozenlist/ F: package/python-greenlet/ +F: package/python-h11/ F: package/python-hatchling/ F: package/python-hatch-fancy-pypi-readme/ F: package/python-hatch-vcs/ diff --git a/package/Config.in b/package/Config.in index 7817b51fc2..b6211f1102 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1071,6 +1071,7 @@ menu "External python modules" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" source "package/python-gunicorn/Config.in" + source "package/python-h11/Config.in" source "package/python-h2/Config.in" source "package/python-hiredis/Config.in" source "package/python-hpack/Config.in" diff --git a/package/python-h11/Config.in b/package/python-h11/Config.in new file mode 100644 index 0000000000..736620d782 --- /dev/null +++ b/package/python-h11/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_H11 + bool "python-h11" + help + A pure-Python, bring-your-own-I/O implementation of + HTTP/1.1. + + https://github.com/python-hyper/h11 diff --git a/package/python-h11/python-h11.hash b/package/python-h11/python-h11.hash new file mode 100644 index 0000000000..0c65a11d00 --- /dev/null +++ b/package/python-h11/python-h11.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/h11/json +md5 84c33fc0aa1f868928114c4d02c43dc2 h11-0.14.0.tar.gz +sha256 8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d h11-0.14.0.tar.gz +# Locally computed sha256 checksums +sha256 37db5bb85926db28a427a25867f10b1232003aea1be69ccb851138adb8e6f361 LICENSE.txt diff --git a/package/python-h11/python-h11.mk b/package/python-h11/python-h11.mk new file mode 100644 index 0000000000..d7dca5244b --- /dev/null +++ b/package/python-h11/python-h11.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-h11 +# +################################################################################ + +PYTHON_H11_VERSION = 0.14.0 +PYTHON_H11_SOURCE = h11-$(PYTHON_H11_VERSION).tar.gz +PYTHON_H11_SITE = https://files.pythonhosted.org/packages/f5/38/3af3d3633a34a3316095b39c8e8fb4853a28a536e55d347bd8d8e9a14b03 +PYTHON_H11_SETUP_TYPE = setuptools +PYTHON_H11_LICENSE = MIT +PYTHON_H11_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From peter at korsgaard.com Mon Feb 6 15:30:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:20 +0100 Subject: [Buildroot] [git commit] utils/check-symbols: new script Message-ID: <20230206153040.300A183C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c5472ace2490b2db7f26a79d12b01a8bb5a42dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This script checks for inconsistencies on symbols declared in Config.in and used in .mk files. Currently it checks only symbols following the pattern BR2_\w+ . The script first gets the list of all files in the repository (using git ls-files like 'make check-flake8' already do). Then it parses all relevant files, searching for symbol definitions and usages, and add entries into a database. At the end, the database is searched for inconsistencies: - symbol that is part of "choice" and is referenced with "select"; - legacy symbol being referenced in packages; - legacy symbol being redefined in packages; - symbol referenced but not defined; - symbol defined but not referenced; - legacy symbol that has a Note stating it is referenced by a package (for legacy handling) but is referenced in the package without a comment "# legacy"; - legacy symbol that has a Note stating it is referenced by a package but it is not actually referenced. There is also a debug parameter --search that dumps any filename or symbol entries from the database that matches a regexp. Sample usages: $ utils/check-symbols $ utils/docker-run utils/check-symbols $ utils/check-symbols --search 'GETTEXT\b|\/openssl' At same time the script is created: - add unit tests for it, they can be run using: utils/docker-run python3 -m pytest -v utils/checksymbolslib/ - add two more GitLab CI jobs: check-symbols (to check current tree using the script) and check-check-symbols (to check the script against its unit tests) Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski [Peter: print warnings to stderr, rename change_current_dir() to change_to_top_dir()] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/misc/gitlab-ci.yml.in | 8 + support/scripts/generate-gitlab-ci-yml | 2 +- utils/check-symbols | 78 ++++++ utils/checksymbolslib/__init__.py | 0 utils/checksymbolslib/br.py | 140 +++++++++++ utils/checksymbolslib/db.py | 205 +++++++++++++++ utils/checksymbolslib/file.py | 83 +++++++ utils/checksymbolslib/kconfig.py | 139 +++++++++++ utils/checksymbolslib/makefile.py | 100 ++++++++ utils/checksymbolslib/test_db.py | 286 +++++++++++++++++++++ utils/checksymbolslib/test_file.py | 152 ++++++++++++ utils/checksymbolslib/test_kconfig.py | 438 +++++++++++++++++++++++++++++++++ utils/checksymbolslib/test_makefile.py | 304 +++++++++++++++++++++++ utils/checksymbolslib/test_util.py | 15 ++ 15 files changed, 1951 insertions(+), 1 deletion(-) Patch is too large, so refusing to show it From peter at korsgaard.com Mon Feb 6 15:30:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:20 +0100 Subject: [Buildroot] [git commit] package/xdriver_xf86-video-imx-viv: drop package Message-ID: <20230206153040.0A2CB83CA1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa7d11a2ad984930eb8e8830c44cbabebdcf8568 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 424f53ac0730 (package/freescale-imx/imx-gpu-viv: drop X11 output) dropped BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 which xdriver_xf86-video-imx-viv depends on, so the package is no longer selectable. So drop the package and add a legacy symbol for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 +++ DEVELOPERS | 2 - package/x11r7/Config.in | 1 - package/x11r7/xdriver_xf86-video-imx-viv/Config.in | 44 ---------------------- .../xdriver_xf86-video-imx-viv.hash | 3 -- .../xdriver_xf86-video-imx-viv.mk | 34 ----------------- 6 files changed, 6 insertions(+), 84 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 191a209eeb..8b7ecd840b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -197,6 +197,12 @@ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 help The X11 output was dropped by NXP. +config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV + bool "xf86-video-imx-viv has been removed" + select BR2_LEGACY + help + The X11 output was dropped by NXP. + config BR2_PACKAGE_QEMU_CUSTOM_TARGETS string "the QEMU specific targets option has been removed" help diff --git a/DEVELOPERS b/DEVELOPERS index 97c28fbdd8..6597225ac3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1106,7 +1106,6 @@ F: package/gstreamer1/gst1-imx/ F: package/libimxvpuapi/ F: package/mfgtools/ F: package/sshpass/ -F: package/x11r7/xdriver_xf86-video-imx-viv/ N: Geoff Levand F: package/flannel/ @@ -1487,7 +1486,6 @@ F: package/lxc/ F: package/strongswan/ F: package/wmctrl/ F: package/x11r7/xdriver_xf86-video-imx/ -F: package/x11r7/xdriver_xf86-video-imx-viv/ N: Jesse Van Gavere F: package/qt6/ diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 4d3613cf4d..365de34c98 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -165,7 +165,6 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdriver_xf86-video-geode/Config.in source package/x11r7/xdriver_xf86-video-i128/Config.in source package/x11r7/xdriver_xf86-video-imx/Config.in - source package/x11r7/xdriver_xf86-video-imx-viv/Config.in source package/x11r7/xdriver_xf86-video-intel/Config.in source package/x11r7/xdriver_xf86-video-mach64/Config.in source package/x11r7/xdriver_xf86-video-mga/Config.in diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in deleted file mode 100644 index 984f63d6d3..0000000000 --- a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in +++ /dev/null @@ -1,44 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV - bool "xf86-video-imx-viv" - depends on BR2_PACKAGE_HAS_LIBGL - depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - depends on BR2_PACKAGE_IMX_GPU_G2D - depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XORGPROTO - help - X.Org driver for iMX6 GPU (Vivante) - - Notice EGL and GLes2 APIs are correctly supported. This - driver should also be able to provide Desktop OpenGL - implementation but, this feature seems broken since quite - some time. - - To use this driver, add correct configuration to your - /etc/X11/xorg.conf: - - Section "Device" - [...] - Driver "vivante" - Option "vivante_fbdev" "/dev/fbX" - EndSection - - Don't forget to load galcore.ko and create /dev/galcore - before using this driver (else, Xorg will exit with an - obscure message like "Segmentation fault at address 0xc"). - -comment "xf86-video-imx-viv needs an OpenGL backend" - depends on BR2_arm - depends on !BR2_PACKAGE_HAS_LIBGL - depends on BR2_TOOLCHAIN_HAS_SYNC_1 - -comment "xf86-video-imx-viv depends on imx-gpu-viv with X11 output" - depends on BR2_arm - depends on !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - depends on BR2_TOOLCHAIN_HAS_SYNC_1 - -comment "xf86-video-imx-viv depends on imx-gpu-g2d" - depends on BR2_arm - depends on !BR2_PACKAGE_IMX_GPU_G2D - depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - depends on BR2_TOOLCHAIN_HAS_SYNC_1 diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash deleted file mode 100644 index b79c236478..0000000000 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 8fe1f57334b22926d4ff3b0b9fdf50af835a99cdfd0ad3ba6a604b226b723e89 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga.tar.gz -sha256 9d3e373f0440cc0c58853e963636a7c1ffda9308ec5f30ebe9adfb9c16a8a1e4 COPYING-MIT diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk deleted file mode 100644 index 3b346f323a..0000000000 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-imx-viv -# -################################################################################ - -XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = rel_imx_4.9.x_1.0.0_ga -XDRIVER_XF86_VIDEO_IMX_VIV_SITE = $(call github,nxp-imx,xf86-video-imx-vivante,$(XDRIVER_XF86_VIDEO_IMX_VIV_VERSION)) -XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv imx-gpu-g2d xserver_xorg-server \ - xorgproto libdrm -XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE = MIT -XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE_FILES = COPYING-MIT -XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING = YES -XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD = $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/EXA/src -f makefile.linux - -define XDRIVER_XF86_VIDEO_IMX_VIV_BUILD_CMDS - $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) sysroot=$(STAGING_DIR) \ - BUSID_HAS_NUMBER=1 BUILD_IN_YOCTO=1 XSERVER_GREATER_THAN_13=1 \ - CFLAGS="$(TARGET_CFLAGS)" -endef - -define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING_CMDS - $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) prefix=$(STAGING_DIR)/usr install - $(INSTALL) -D -m 644 $(@D)/EXA/src/vivante_gal/vivante_priv.h \ - $(STAGING_DIR)/usr/include/vivante_priv.h - $(INSTALL) -D -m 644 $(@D)/EXA/src/vivante_gal/vivante_gal.h \ - $(STAGING_DIR)/usr/include/vivante_gal.h -endef - -define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_TARGET_CMDS - $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) prefix=$(TARGET_DIR)/usr install -endef - -$(eval $(generic-package)) From romain.naour at smile.fr Mon Feb 6 15:53:58 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 16:53:58 +0100 Subject: [Buildroot] [PATCH v5 01/10] package/cpuinfo: new package In-Reply-To: <20230130002854.2300661-1-james.hilliard1@gmail.com> References: <20230130002854.2300661-1-james.hilliard1@gmail.com> Message-ID: <301bf244-5eb8-3903-3371-80de9a6810aa@smile.fr> Hello James, Le 30/01/2023 ? 01:28, James Hilliard a ?crit?: > From: Stefan Hager > > This package is required by tensorflow-lite. > > Add a patch removing cpp requirement when not building tests. > > Tested-by: Stefan Hager > Signed-off-by: Stefan Hager > Signed-off-by: James Hilliard > --- > Changes v4 -> v5: > - don't require cpp > Changes v2 -> v3: > - move to libraries->hardware handling > --- > DEVELOPERS | 3 ++ > package/Config.in | 1 + > ...nable-CXX-only-when-needed-for-tests.patch | 36 +++++++++++++++++++ > package/cpuinfo/Config.in | 8 +++++ > package/cpuinfo/cpuinfo.hash | 4 +++ > package/cpuinfo/cpuinfo.mk | 17 +++++++++ > 6 files changed, 69 insertions(+) > create mode 100644 package/cpuinfo/0001-Enable-CXX-only-when-needed-for-tests.patch > create mode 100644 package/cpuinfo/Config.in > create mode 100644 package/cpuinfo/cpuinfo.hash > create mode 100644 package/cpuinfo/cpuinfo.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 706ee80ece..53f1052b07 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2723,6 +2723,9 @@ F: package/libvpx/ > F: package/mesa3d-demos/ > F: package/ti-gfx/ > > +N: Stefan Hager > +F: package/cpuinfo/ > + > N: Stefan Ott > F: package/unbound/ > > diff --git a/package/Config.in b/package/Config.in > index 83fddf316f..3a07074b10 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1645,6 +1645,7 @@ menu "Hardware handling" > source "package/bcm2835/Config.in" > source "package/c-periphery/Config.in" > source "package/ccid/Config.in" > + source "package/cpuinfo/Config.in" > source "package/dtc/Config.in" > source "package/gnu-efi/Config.in" > source "package/hackrf/Config.in" > diff --git a/package/cpuinfo/0001-Enable-CXX-only-when-needed-for-tests.patch b/package/cpuinfo/0001-Enable-CXX-only-when-needed-for-tests.patch > new file mode 100644 > index 0000000000..ebd6ed36cd > --- /dev/null > +++ b/package/cpuinfo/0001-Enable-CXX-only-when-needed-for-tests.patch > @@ -0,0 +1,36 @@ > +From b1261baefd2bb9095af56859c1cac6b1166fb13f Mon Sep 17 00:00:00 2001 > +From: James Hilliard > +Date: Sun, 29 Jan 2023 16:55:08 -0700 > +Subject: [PATCH] Enable CXX only when needed for tests > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/pytorch/cpuinfo/pull/133] > +--- > + CMakeLists.txt | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index b2f9434..879c9fa 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR) > + # ---[ Setup project > + PROJECT( > + cpuinfo > +- LANGUAGES C CXX > ++ LANGUAGES C > + ) > + > + # ---[ Options. > +@@ -763,6 +763,7 @@ ENDIF() > + > + # ---[ cpuinfo unit tests > + IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_UNIT_TESTS) > ++ ENABLE_LANGUAGE(CXX) > + ADD_EXECUTABLE(init-test test/init.cc) > + CPUINFO_TARGET_ENABLE_CXX11(init-test) > + CPUINFO_TARGET_RUNTIME_LIBRARY(init-test) > +-- > +2.34.1 > + > diff --git a/package/cpuinfo/Config.in b/package/cpuinfo/Config.in > new file mode 100644 > index 0000000000..d3c3b08400 > --- /dev/null > +++ b/package/cpuinfo/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_CPUINFO > + bool "cpuinfo" Have you checked cpuinfo dependencies ? It seems XNNPack used by cpuinfo is 64bits architectures only: CMake Warning at CMakeLists.txt:69 (MESSAGE): Target processor architecture "l" is not supported in cpuinfo. cpuinfo will compile, but cpuinfo_initialize() will always fail. hint: https://github.com/NobuoTsukamoto/meta-tensorflow-lite/blob/main/recipes-tools/tensorflow-lite/tensorflow-lite-benchmark_2.11.0.bb#L33 And trigger a build issue on uClibc-ng due to missing header: cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:19:11: fatal error: sys/auxv.h: No such file or directory 19 | #include Also static build is not likely supported: cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:8:10: fatal error: dlfcn.h: No such file or directory 8 | #include Best regards, Romain > + help > + CPU INFOrmation library, cpuinfo is a library to detect > + essential for performance optimization information about > + host CPU. > + > + https://github.com/pytorch/cpuinfo > diff --git a/package/cpuinfo/cpuinfo.hash b/package/cpuinfo/cpuinfo.hash > new file mode 100644 > index 0000000000..c3f70fa90f > --- /dev/null > +++ b/package/cpuinfo/cpuinfo.hash > @@ -0,0 +1,4 @@ > +# Locally calculated > +sha256 0936848904943381b2c01321101614776e43d583840ee0f3ceeea1e3fb7405f7 cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57.tar.gz > +# License files, locally calculated > +sha256 8e7e60636c3aa0cb03571a1a841ce5697f9551ff92b3c426c2561613d15ade70 LICENSE > diff --git a/package/cpuinfo/cpuinfo.mk b/package/cpuinfo/cpuinfo.mk > new file mode 100644 > index 0000000000..ab6a0269ec > --- /dev/null > +++ b/package/cpuinfo/cpuinfo.mk > @@ -0,0 +1,17 @@ > +################################################################################ > +# > +# cpuinfo > +# > +################################################################################ > + > +CPUINFO_VERSION = de2fa78ebb431db98489e78603e4f77c1f6c5c57 > +CPUINFO_SITE = $(call github,pytorch,cpuinfo,$(CPUINFO_VERSION)) > +CPUINFO_LICENSE = BSD-2-Clause > +CPUINFO_LICENSE_FILES = LICENSE > +CPUINFO_INSTALL_STAGING = YES > +CPUINFO_CONF_OPTS = \ > + -DCPUINFO_BUILD_UNIT_TESTS=OFF \ > + -DCPUINFO_BUILD_MOCK_TESTS=OFF \ > + -DCPUINFO_BUILD_BENCHMARKS=OFF > + > +$(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 6 16:09:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 17:09:15 +0100 Subject: [Buildroot] [PATCH 1/3] package/freescale-imx/imx-gpu-viv: drop X11 output In-Reply-To: <20230206155650.79bafe2c@windsurf> (Thomas Petazzoni's message of "Mon, 6 Feb 2023 15:56:50 +0100") References: <20230114230028.46833cae@windsurf> <87sffi97wo.fsf@dell.be.48ers.dk> <20230206155650.79bafe2c@windsurf> Message-ID: <87bkm693o4.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > On Mon, 06 Feb 2023 15:37:43 +0100 > Peter Korsgaard wrote: >> I see we still have xf86-video-imx-viv which depends on the now removed >> BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 symbol, so I guess we should remove >> that package as well. > Gah, I did not notice that: indeed it should be removed as well. > Daniel, will you cook some patch doing that? I've already pushed a commit dropping the package. -- Bye, Peter Korsgaard From romain.naour at smile.fr Mon Feb 6 16:24:11 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 17:24:11 +0100 Subject: [Buildroot] [PATCH v5 01/10] package/cpuinfo: new package In-Reply-To: <301bf244-5eb8-3903-3371-80de9a6810aa@smile.fr> References: <20230130002854.2300661-1-james.hilliard1@gmail.com> <301bf244-5eb8-3903-3371-80de9a6810aa@smile.fr> Message-ID: <282c5a46-37ed-6c07-9b72-86133a71750a@smile.fr> Hello James, Le 06/02/2023 ? 16:53, Romain Naour a ?crit?: > Hello James, > > Le 30/01/2023 ? 01:28, James Hilliard a ?crit?: >> From: Stefan Hager >> >> This package is required by tensorflow-lite. >> >> Add a patch removing cpp requirement when not building tests. >> >> Tested-by: Stefan Hager >> Signed-off-by: Stefan Hager >> Signed-off-by: James Hilliard >> --- >> Changes v4 -> v5: >> - don't require cpp >> Changes v2 -> v3: >> - move to libraries->hardware handling >> --- [...] >> diff --git a/package/cpuinfo/Config.in b/package/cpuinfo/Config.in >> new file mode 100644 >> index 0000000000..d3c3b08400 >> --- /dev/null >> +++ b/package/cpuinfo/Config.in >> @@ -0,0 +1,8 @@ >> +config BR2_PACKAGE_CPUINFO >> + bool "cpuinfo" > > Have you checked cpuinfo dependencies ? > > It seems XNNPack used by cpuinfo is 64bits architectures only: > > CMake Warning at CMakeLists.txt:69 (MESSAGE): > Target processor architecture "l" is not supported in cpuinfo. cpuinfo > will compile, but cpuinfo_initialize() will always fail. > > hint: > https://github.com/NobuoTsukamoto/meta-tensorflow-lite/blob/main/recipes-tools/tensorflow-lite/tensorflow-lite-benchmark_2.11.0.bb#L33 > > And trigger a build issue on uClibc-ng due to missing header: > > cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:19:11: > fatal error: sys/auxv.h: No such file or directory > 19 | #include > > Also static build is not likely supported: > > cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:8:10: > fatal error: dlfcn.h: No such file or directory > 8 | #include Actually there is an architecture dependency: x86, x86_64, arm, aarch64. Also it requires threads support: https://github.com/pytorch/cpuinfo/blob/main/src/init.c#L24 Best regards, Romain > > Best regards, > Romain > From sebastian.weyer at smile.fr Mon Feb 6 16:30:05 2023 From: sebastian.weyer at smile.fr (Sebastian WEYER) Date: Mon, 6 Feb 2023 17:30:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.67.0 In-Reply-To: <20230131050319.2821287-1-james.hilliard1@gmail.com> References: <20230131050319.2821287-1-james.hilliard1@gmail.com> Message-ID: Hi all, On 31/01/2023 06:03, James Hilliard wrote: > Link to Rust 1.67.0 announcement: https://blog.rust-lang.org/2023/01/26/Rust-1.67.0.html > > Signed-off-by: James Hilliard > --- > package/rust-bin/rust-bin.hash | 252 ++++++++++++++++----------------- > package/rust-bin/rust-bin.mk | 2 +- > package/rust/rust.hash | 6 +- > package/rust/rust.mk | 2 +- > 4 files changed, 131 insertions(+), 131 deletions(-) > > diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash > index adf1799ad7..d00e6342e8 100644 > --- a/package/rust-bin/rust-bin.hash > +++ b/package/rust-bin/rust-bin.hash > @@ -1,129 +1,129 @@ > -# From https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc > -sha256 a1279760f91b3571733e0b0268128d143be2734916753900b5fe7b8ecc3c0900 rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc > -sha256 835b4e1b4d396674f7866a83b9a4f44db16fd12f01a7eaed527282b3700a9b92 rust-1.66.1-i686-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc > -sha256 c7349617c42274bf50f6e3662dfb4f6832a93780099c3bb510be1a5b93d04c37 rust-1.66.1-mips-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc > -sha256 fc38663870f0af47a27241d980ca886c3f7d432267920deb412ac8576bef68f0 rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc > -sha256 2b1a6c54db49a9e62d60cc96c1768f405e0f4c59d698186bf3a28a1bb017b6b5 rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc > -sha256 777d3a650448c15048710282388e90d10740540f570f5d17ed4a2dbdabb89552 rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc > -sha256 875bb310bae7c8c1d2d228a49aa4b547608b6c807ddc9ec44bc87272c77d869b rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc > -sha256 89164ccf75909b3d02bdcb787e33876cad87e55ab0e6239b030b4b6631ed356a rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc > -sha256 e83f9fc473072db23376783595a008cdd9b2f2e9b3be109e55939392864840eb rust-1.66.1-s390x-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc > -sha256 a201aa4595ec8015662b7103b1409a4787c6d1f1d540bb68746633527d855858 rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc > -sha256 9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24 rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc > -sha256 520ac446f20490685cc4d73192cfbb4c9b9e55c884aa4ae2b098e3a54d891de8 rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc > -sha256 42afd189ef64988f64976f767a734734bccd7c71e578780e902148c98226fa29 rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc > -sha256 506126773af9c3dacc506776a0b2e12fe6fa0c95eaf4f4ebb5cdbd335feb83fa rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.asc > -sha256 3d21b478fbf07bd27902bdd189e6988341f0c2c0108b538f926cea3031bc8ea6 rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.asc > -sha256 5282fc97111a7eafbead3463ed7bc0f3065332f21aec6a39a740157fe42f943a rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.asc > -sha256 0ebf0178bbe9c5572d1db89e190dee23aef0e2f667995abedbd66e33d0bd73ab rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.asc > -sha256 938e7442c21ea0895c44ec78fa718ea1d3abe32ed0425ed328c905e188af250e rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc > -sha256 bdc491f4c05669e7a3382b6bfdaeaa20e2cfa5ef553305df0e0d73729a45e6e4 rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.asc > -sha256 d75c6dc3c00d662b0d3f6ce7fde0f76057542edfbc97a20b29247842c8a711d2 rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.asc > -sha256 830285e5388081c68fac9dc955aa824a4d919b0e24eadc6e0b95b30103d79db9 rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.asc > -sha256 d720bd1e493f53797f90d83dbe6d52ecbe1ff3cae282f4b2e18c37fe92c9adf6 rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.asc > -sha256 90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17 rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.asc > -sha256 c4bab2d63223d0c6e63806082e30d8c38b37eefc10ee2e7380971e3012c00bca rust-std-1.66.1-i586-unknown-linux-musl.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.asc > -sha256 b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.asc > -sha256 52013329eb6697d94f5dce01dd509b4b93b473c18a3a2c05d0230b9dfeab14d1 rust-std-1.66.1-i686-unknown-linux-musl.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.asc > -sha256 e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568 rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.asc > -sha256 23f917eccaca59d4c911eb96d8ffefe86834dbcdf902c9ab6dad8558c31c4575 rust-std-1.66.1-mips-unknown-linux-musl.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc > -sha256 70d1406e0981d5d31c1d3f85c848bba0476e0ff6203e7706f66b4d2212f01b66 rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.asc > -sha256 0fd221d4b4205ce548e83f0e7416c8332eb12b64d5a43c0b3ed61e9f7d6edf13 rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc > -sha256 132d6d5750a877972ebc6f23e831f2ef3077465b2ab24ca645d32ea83c496fe3 rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.asc > -sha256 533f370368ac8b6192e1450289c64544ebf9cacc38c3a52ef6c0ecded7ee6fa5 rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc > -sha256 8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.asc > -sha256 d7028820888d0decde047a6e77b866e690532aa09522c9a23a3fbf8780a72257 rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc > -sha256 417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1 rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc > -sha256 7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35 rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc > -sha256 4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770 rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc > -sha256 776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc > -sha256 51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062 rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.asc > -sha256 3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927 rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc > -sha256 c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377 rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc > -sha256 a9710727ba28955deb7fbec799faed19486c9af3c7e3088ec6659a257515ffca rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc > +sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc > +sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc > +sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc > +sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc > +sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc > +sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc > +sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc > +sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc > +sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc > +sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc > +sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc > +sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc > +sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc > +sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc > +sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc > +sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc > +sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc > +sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc > +sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc > +sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc > +sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc > +sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc > +sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc > +sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc > +sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc > +sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc > +sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc > +sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc > +sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc > +sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc > +sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc > +sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc > +sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc > +sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc > +sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc > +sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc > +sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc > +sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc > +sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc > +sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc > +sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc > +sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz > # Locally generated > sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE > sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT > diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk > index 89009288f4..d62ce39cfc 100644 > --- a/package/rust-bin/rust-bin.mk > +++ b/package/rust-bin/rust-bin.mk > @@ -6,7 +6,7 @@ > > # When updating this version, check whether support/download/cargo-post-process > # still generates the same archives. > -RUST_BIN_VERSION = 1.66.1 > +RUST_BIN_VERSION = 1.67.0 > RUST_BIN_SITE = https://static.rust-lang.org/dist > RUST_BIN_LICENSE = Apache-2.0 or MIT > RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT > diff --git a/package/rust/rust.hash b/package/rust/rust.hash > index 545a452bf0..2a260ca64f 100644 > --- a/package/rust/rust.hash > +++ b/package/rust/rust.hash > @@ -1,6 +1,6 @@ > -# From https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc > -sha256 07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe rustc-1.66.1-src.tar.xz > +# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc > +sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz > # Locally generated > sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE > sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT > diff --git a/package/rust/rust.mk b/package/rust/rust.mk > index 691683b492..d14ad3a3e7 100644 > --- a/package/rust/rust.mk > +++ b/package/rust/rust.mk > @@ -6,7 +6,7 @@ > > # When updating this version, check whether support/download/cargo-post-process > # still generates the same archives. > -RUST_VERSION = 1.66.1 > +RUST_VERSION = 1.67.0 > RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz > RUST_SITE = https://static.rust-lang.org/dist > RUST_LICENSE = Apache-2.0 or MIT I just tested rust-bin with the following command: ./support/testing/run-tests -o test-output -d test-dl/ -k tests.package.test_rust.TestRustBin and verified that it passes with the message "OK". Tested-by: Sebastian Weyer Best regards, Sebastian From james.hilliard1 at gmail.com Mon Feb 6 16:33:33 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 09:33:33 -0700 Subject: [Buildroot] [PATCH v5 01/10] package/cpuinfo: new package In-Reply-To: <282c5a46-37ed-6c07-9b72-86133a71750a@smile.fr> References: <20230130002854.2300661-1-james.hilliard1@gmail.com> <301bf244-5eb8-3903-3371-80de9a6810aa@smile.fr> <282c5a46-37ed-6c07-9b72-86133a71750a@smile.fr> Message-ID: On Mon, Feb 6, 2023 at 9:24 AM Romain Naour wrote: > > Hello James, > > Le 06/02/2023 ? 16:53, Romain Naour a ?crit : > > Hello James, > > > > Le 30/01/2023 ? 01:28, James Hilliard a ?crit : > >> From: Stefan Hager > >> > >> This package is required by tensorflow-lite. > >> > >> Add a patch removing cpp requirement when not building tests. > >> > >> Tested-by: Stefan Hager > >> Signed-off-by: Stefan Hager > >> Signed-off-by: James Hilliard > >> --- > >> Changes v4 -> v5: > >> - don't require cpp > >> Changes v2 -> v3: > >> - move to libraries->hardware handling > >> --- > > [...] > > >> diff --git a/package/cpuinfo/Config.in b/package/cpuinfo/Config.in > >> new file mode 100644 > >> index 0000000000..d3c3b08400 > >> --- /dev/null > >> +++ b/package/cpuinfo/Config.in > >> @@ -0,0 +1,8 @@ > >> +config BR2_PACKAGE_CPUINFO > >> + bool "cpuinfo" > > > > Have you checked cpuinfo dependencies ? > > > > It seems XNNPack used by cpuinfo is 64bits architectures only: > > > > CMake Warning at CMakeLists.txt:69 (MESSAGE): > > Target processor architecture "l" is not supported in cpuinfo. cpuinfo > > will compile, but cpuinfo_initialize() will always fail. > > > > hint: > > https://github.com/NobuoTsukamoto/meta-tensorflow-lite/blob/main/recipes-tools/tensorflow-lite/tensorflow-lite-benchmark_2.11.0.bb#L33 > > > > And trigger a build issue on uClibc-ng due to missing header: > > > > cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:19:11: > > fatal error: sys/auxv.h: No such file or directory > > 19 | #include > > > > Also static build is not likely supported: > > > > cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:8:10: > > fatal error: dlfcn.h: No such file or directory > > 8 | #include > > Actually there is an architecture dependency: x86, x86_64, arm, aarch64. > Also it requires threads support: > > https://github.com/pytorch/cpuinfo/blob/main/src/init.c#L24 Well...those architecture dependencies kinda look like runtime deps to me...a consuming application could call cpuinfo_initialize() with error handling and fallback to some other codepath automatically on failure. So probably we don't want to apply an architecture restriction unless there's an actual build failure. > > Best regards, > Romain > > > > > Best regards, > > Romain > > From arnout at mind.be Mon Feb 6 16:39:36 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 17:39:36 +0100 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: migrate to asyncio subprocess calls In-Reply-To: <20220413224004.1225568-1-james.hilliard1@gmail.com> References: <20220413224004.1225568-1-james.hilliard1@gmail.com> Message-ID: <50d6810c-888f-940e-50ac-13e4a8a1aa3c@mind.be> Hi James, On 14/04/2022 00:40, James Hilliard wrote: > Since genrandconfig no longer appears to support python2 we can > migrate the subprocess calls to use asyncio variants. > > This has the advantage of allowing for runners like autobuild-run to > integrate directly into genrandconfig by calling the asyncio > gen_config using importlib instead of having to run genrandconfig as > a subprocess. > > Using asyncio is advantageous here as it eliminates the requirement > for the runner to deal with blocking subprocess calls(by having to > use threading for example). > > Also cleanup some unused functions/python2 compatibility shims. > > Signed-off-by: James Hilliard I finally applied to master. Needed to resolve some conflicts, but otherwise no changes. I still do have a few comments though. > --- > Changes v1 -> v2: > - compatibility shims for python 3.4 and newer > --- > utils/genrandconfig | 94 +++++++++++++++++++++++++++++---------------- > 1 file changed, 61 insertions(+), 33 deletions(-) > > diff --git a/utils/genrandconfig b/utils/genrandconfig > index 59fe34e58d..aa82a41d5c 100755 > --- a/utils/genrandconfig > +++ b/utils/genrandconfig > @@ -18,23 +18,18 @@ > > # This script generates a random configuration for testing Buildroot. > > -import contextlib > +import asyncio > import csv > import os > from random import randint > -import subprocess > import sys > from distutils.version import StrictVersion > import platform > > -if sys.hexversion >= 0x3000000: > - import urllib.request as _urllib > +if sys.version_info < (3, 8): > + from asyncio import coroutine > else: > - import urllib2 as _urllib > - > - > -def urlopen_closing(uri): > - return contextlib.closing(_urllib.urlopen(uri)) > + from types import coroutine > > > class SystemInfo: > @@ -63,6 +58,7 @@ class SystemInfo: > # -- > return None > > + @coroutine > def has(self, prog): Isn't the usual way to use async def has(self, prog): ? Or does that mean something different? > """Checks whether a program is available. > Lazily evaluates missing entries. > @@ -78,11 +74,13 @@ class SystemInfo: > have_it = self.find_prog(prog) > # java[c] needs special care > if have_it and prog in ('java', 'javac'): > - with open(os.devnull, "w") as devnull: > - if subprocess.call("%s -version | grep gcj" % prog, > - shell=True, > - stdout=devnull, stderr=devnull) != 1: > - have_it = False > + proc = yield from asyncio.create_subprocess_shell( > + "%s -version | grep gcj" % prog, Perhaps we should also start using f-strings. That bumps the requirement to python 3.6 but I don't think it's unreasonable for genrandconfig. > + stdout=asyncio.subprocess.DEVNULL, > + stderr=asyncio.subprocess.DEVNULL) > + ret = yield from proc.wait() > + if ret != 1: > + have_it = False > # -- > self.progs[prog] = have_it > return have_it > @@ -159,6 +157,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): > return configs > > > + at coroutine > def is_toolchain_usable(configfile, config): > """Check if the toolchain is actually usable.""" > > @@ -179,8 +178,12 @@ def is_toolchain_usable(configfile, config): > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: > - ldd_version_output = subprocess.check_output(['ldd', '--version']) > - glibc_version = ldd_version_output.splitlines()[0].split()[-1] > + proc = yield from asyncio.create_subprocess_exec( > + 'ldd', '--version', stdout=asyncio.subprocess.PIPE) > + ldd_version_output, _ = yield from proc.communicate() > + if proc.returncode: > + return False > + glibc_version = ldd_version_output.splitlines()[0].split()[-1].decode('utf-8') The decode was already added in commit 12e4f7c5c43fb7b4db6d6548b9dbabb9c1b5f875 so I didn't modify this line. > if StrictVersion('2.14') > StrictVersion(glibc_version): > print("WARN: ignoring the Linaro ARM toolchains because too old host glibc", file=sys.stderr) > return False > @@ -188,6 +191,7 @@ def is_toolchain_usable(configfile, config): > return True > > > + at coroutine > def fixup_config(sysinfo, configfile): > """Finalize the configuration and reject any problematic combinations > > @@ -202,7 +206,8 @@ def fixup_config(sysinfo, configfile): > > BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' > > - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not sysinfo.has("java"): > + has_java = yield from sysinfo.has("java") > + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: > return False > # The ctng toolchain is affected by PR58854 > if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ > @@ -507,6 +512,7 @@ def fixup_config(sysinfo, configfile): > return True > > > + at coroutine > def gen_config(args): > """Generate a new random configuration > > @@ -565,7 +571,8 @@ def gen_config(args): > > # Randomly enable BR2_REPRODUCIBLE 10% of times > # also enable tar filesystem images for testing > - if sysinfo.has("diffoscope") and randint(0, 10) == 0: > + has_diffoscope = yield from sysinfo.has("diffoscope") > + if has_diffoscope and randint(0, 10) == 0: > configlines.append("BR2_REPRODUCIBLE=y\n") > configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") > > @@ -579,10 +586,14 @@ def gen_config(args): > with open(configfile, "w+") as configf: > configf.writelines(configlines) > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > - "olddefconfig"]) > + proc = yield from asyncio.create_subprocess_exec( > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > + ret = yield from proc.wait() > + if ret: > + return ret > > - if not is_toolchain_usable(configfile, toolchainconfig): > + toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) > + if not toolchain_usable: > return 2 > > # Now, generate the random selection of packages, and fixup > @@ -596,21 +607,34 @@ def gen_config(args): > file=sys.stderr) > return 1 > bounded_loop -= 1 > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > - "KCONFIG_PROBABILITY=%d" % randint(1, 20), > - "randpackageconfig" if args.toolchains_csv else "randconfig"]) > - > - if fixup_config(sysinfo, configfile): > + proc = yield from asyncio.create_subprocess_exec( > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > + "KCONFIG_PROBABILITY=%d" % randint(1, 20), > + "randpackageconfig" if args.toolchains_csv else "randconfig") This was refactored a bit, can you check if I fixed it up correctly? Regards, Arnout > + ret = yield from proc.wait() > + if ret: > + return ret > + > + ret = yield from fixup_config(sysinfo, configfile) > + if ret: > break > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > - "olddefconfig"]) > + proc = yield from asyncio.create_subprocess_exec( > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > + ret = yield from proc.wait() > + if ret: > + return ret > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > - "savedefconfig"]) > + proc = yield from asyncio.create_subprocess_exec( > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") > + ret = yield from proc.wait() > + if ret: > + return ret > > - return subprocess.call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > - "dependencies"]) > + proc = yield from asyncio.create_subprocess_exec( > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") > + ret = yield from proc.wait() > + return ret > > > if __name__ == '__main__': > @@ -642,7 +666,11 @@ if __name__ == '__main__': > args.outputdir = os.path.abspath(args.outputdir) > > try: > - ret = gen_config(args) > + if sys.version_info < (3, 7): > + loop = asyncio.get_event_loop() > + ret = loop.run_until_complete(gen_config(args)) > + else: > + ret = asyncio.run(gen_config(args)) > except Exception as e: > print(str(e), file=sys.stderr) > parser.exit(1) From james.hilliard1 at gmail.com Mon Feb 6 16:45:47 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 09:45:47 -0700 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: migrate to asyncio subprocess calls In-Reply-To: <50d6810c-888f-940e-50ac-13e4a8a1aa3c@mind.be> References: <20220413224004.1225568-1-james.hilliard1@gmail.com> <50d6810c-888f-940e-50ac-13e4a8a1aa3c@mind.be> Message-ID: On Mon, Feb 6, 2023 at 9:39 AM Arnout Vandecappelle wrote: > > Hi James, > > On 14/04/2022 00:40, James Hilliard wrote: > > Since genrandconfig no longer appears to support python2 we can > > migrate the subprocess calls to use asyncio variants. > > > > This has the advantage of allowing for runners like autobuild-run to > > integrate directly into genrandconfig by calling the asyncio > > gen_config using importlib instead of having to run genrandconfig as > > a subprocess. > > > > Using asyncio is advantageous here as it eliminates the requirement > > for the runner to deal with blocking subprocess calls(by having to > > use threading for example). > > > > Also cleanup some unused functions/python2 compatibility shims. > > > > Signed-off-by: James Hilliard > > I finally applied to master. Needed to resolve some conflicts, but otherwise > no changes. I still do have a few comments though. > > > --- > > Changes v1 -> v2: > > - compatibility shims for python 3.4 and newer > > --- > > utils/genrandconfig | 94 +++++++++++++++++++++++++++++---------------- > > 1 file changed, 61 insertions(+), 33 deletions(-) > > > > diff --git a/utils/genrandconfig b/utils/genrandconfig > > index 59fe34e58d..aa82a41d5c 100755 > > --- a/utils/genrandconfig > > +++ b/utils/genrandconfig > > @@ -18,23 +18,18 @@ > > > > # This script generates a random configuration for testing Buildroot. > > > > -import contextlib > > +import asyncio > > import csv > > import os > > from random import randint > > -import subprocess > > import sys > > from distutils.version import StrictVersion > > import platform > > > > -if sys.hexversion >= 0x3000000: > > - import urllib.request as _urllib > > +if sys.version_info < (3, 8): > > + from asyncio import coroutine > > else: > > - import urllib2 as _urllib > > - > > - > > -def urlopen_closing(uri): > > - return contextlib.closing(_urllib.urlopen(uri)) > > + from types import coroutine > > > > > > class SystemInfo: > > @@ -63,6 +58,7 @@ class SystemInfo: > > # -- > > return None > > > > + @coroutine > > def has(self, prog): > > Isn't the usual way to use > > async def has(self, prog): > > ? Or does that mean something different? Yeah, the weird style here was for python 3.4 compat, but if 3.6 is fine this should work: https://patchwork.ozlabs.org/project/buildroot/patch/20230206150847.3621475-1-james.hilliard1 at gmail.com/ > > > > """Checks whether a program is available. > > Lazily evaluates missing entries. > > @@ -78,11 +74,13 @@ class SystemInfo: > > have_it = self.find_prog(prog) > > # java[c] needs special care > > if have_it and prog in ('java', 'javac'): > > - with open(os.devnull, "w") as devnull: > > - if subprocess.call("%s -version | grep gcj" % prog, > > - shell=True, > > - stdout=devnull, stderr=devnull) != 1: > > - have_it = False > > + proc = yield from asyncio.create_subprocess_shell( > > + "%s -version | grep gcj" % prog, > > Perhaps we should also start using f-strings. That bumps the requirement to > python 3.6 but I don't think it's unreasonable for genrandconfig. Yeah, older than 3.6 starts getting pretty annoying. > > > + stdout=asyncio.subprocess.DEVNULL, > > + stderr=asyncio.subprocess.DEVNULL) > > + ret = yield from proc.wait() > > + if ret != 1: > > + have_it = False > > # -- > > self.progs[prog] = have_it > > return have_it > > @@ -159,6 +157,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): > > return configs > > > > > > + at coroutine > > def is_toolchain_usable(configfile, config): > > """Check if the toolchain is actually usable.""" > > > > @@ -179,8 +178,12 @@ def is_toolchain_usable(configfile, config): > > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ > > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ > > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: > > - ldd_version_output = subprocess.check_output(['ldd', '--version']) > > - glibc_version = ldd_version_output.splitlines()[0].split()[-1] > > + proc = yield from asyncio.create_subprocess_exec( > > + 'ldd', '--version', stdout=asyncio.subprocess.PIPE) > > + ldd_version_output, _ = yield from proc.communicate() > > + if proc.returncode: > > + return False > > + glibc_version = ldd_version_output.splitlines()[0].split()[-1].decode('utf-8') > > The decode was already added in commit > 12e4f7c5c43fb7b4db6d6548b9dbabb9c1b5f875 so I didn't modify this line. > > > if StrictVersion('2.14') > StrictVersion(glibc_version): > > print("WARN: ignoring the Linaro ARM toolchains because too old host glibc", file=sys.stderr) > > return False > > @@ -188,6 +191,7 @@ def is_toolchain_usable(configfile, config): > > return True > > > > > > + at coroutine > > def fixup_config(sysinfo, configfile): > > """Finalize the configuration and reject any problematic combinations > > > > @@ -202,7 +206,8 @@ def fixup_config(sysinfo, configfile): > > > > BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' > > > > - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not sysinfo.has("java"): > > + has_java = yield from sysinfo.has("java") > > + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: > > return False > > # The ctng toolchain is affected by PR58854 > > if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ > > @@ -507,6 +512,7 @@ def fixup_config(sysinfo, configfile): > > return True > > > > > > + at coroutine > > def gen_config(args): > > """Generate a new random configuration > > > > @@ -565,7 +571,8 @@ def gen_config(args): > > > > # Randomly enable BR2_REPRODUCIBLE 10% of times > > # also enable tar filesystem images for testing > > - if sysinfo.has("diffoscope") and randint(0, 10) == 0: > > + has_diffoscope = yield from sysinfo.has("diffoscope") > > + if has_diffoscope and randint(0, 10) == 0: > > configlines.append("BR2_REPRODUCIBLE=y\n") > > configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") > > > > @@ -579,10 +586,14 @@ def gen_config(args): > > with open(configfile, "w+") as configf: > > configf.writelines(configlines) > > > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > - "olddefconfig"]) > > + proc = yield from asyncio.create_subprocess_exec( > > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > > + ret = yield from proc.wait() > > + if ret: > > + return ret > > > > - if not is_toolchain_usable(configfile, toolchainconfig): > > + toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) > > + if not toolchain_usable: > > return 2 > > > > # Now, generate the random selection of packages, and fixup > > @@ -596,21 +607,34 @@ def gen_config(args): > > file=sys.stderr) > > return 1 > > bounded_loop -= 1 > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > - "KCONFIG_PROBABILITY=%d" % randint(1, 20), > > - "randpackageconfig" if args.toolchains_csv else "randconfig"]) > > - > > - if fixup_config(sysinfo, configfile): > > + proc = yield from asyncio.create_subprocess_exec( > > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > + "KCONFIG_PROBABILITY=%d" % randint(1, 20), > > + "randpackageconfig" if args.toolchains_csv else "randconfig") > > This was refactored a bit, can you check if I fixed it up correctly? Yeah, looks good from what I can tell. > > Regards, > Arnout > > > + ret = yield from proc.wait() > > + if ret: > > + return ret > > + > > + ret = yield from fixup_config(sysinfo, configfile) > > + if ret: > > break > > > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > - "olddefconfig"]) > > + proc = yield from asyncio.create_subprocess_exec( > > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > > + ret = yield from proc.wait() > > + if ret: > > + return ret > > > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > - "savedefconfig"]) > > + proc = yield from asyncio.create_subprocess_exec( > > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") > > + ret = yield from proc.wait() > > + if ret: > > + return ret > > > > - return subprocess.call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > - "dependencies"]) > > + proc = yield from asyncio.create_subprocess_exec( > > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") > > + ret = yield from proc.wait() > > + return ret > > > > > > if __name__ == '__main__': > > @@ -642,7 +666,11 @@ if __name__ == '__main__': > > args.outputdir = os.path.abspath(args.outputdir) > > > > try: > > - ret = gen_config(args) > > + if sys.version_info < (3, 7): > > + loop = asyncio.get_event_loop() > > + ret = loop.run_until_complete(gen_config(args)) > > + else: > > + ret = asyncio.run(gen_config(args)) > > except Exception as e: > > print(str(e), file=sys.stderr) > > parser.exit(1) From john at metanate.com Mon Feb 6 16:26:17 2023 From: john at metanate.com (John Keeping) Date: Mon, 6 Feb 2023 16:26:17 +0000 Subject: [Buildroot] [PATCH] package/gcc/gcc-final: map debug prefix when reproducible Message-ID: <20230206162617.1907911-1-john@metanate.com> When building with BR2_REPRODUCIBLE the toolchain wrapper passes -fdebug-prefix-map for all packages that are built. But this doesn't affect the target libraries (like libgcc) built by GCC's build system. GCC 4.3 added a configure option to set the debug prefix map for these libraries, which is used here to avoid encoding potentially non-reproducible build paths into the debug data. Signed-off-by: John Keeping --- package/gcc/gcc-final/gcc-final.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index aa883beb7b..5f222a324c 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -108,6 +108,10 @@ else HOST_GCC_FINAL_CONF_OPTS += --disable-libgomp endif +ifeq ($(BR2_REPRODUCIBLE),y) +HOST_GCC_FINAL_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot +endif + # End with user-provided options, so that they can override previously # defined options. HOST_GCC_FINAL_CONF_OPTS += \ -- 2.39.1 From arnout at mind.be Mon Feb 6 16:50:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 17:50:31 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: switch to async/await format In-Reply-To: <20230206150847.3621475-1-james.hilliard1@gmail.com> References: <20230206150847.3621475-1-james.hilliard1@gmail.com> Message-ID: <3edf52e1-0ba5-c8d0-8501-079a6e21abfe@mind.be> On 06/02/2023 16:08, James Hilliard wrote: > This requires python 3.6 or newer but is a bit cleaner. Does it? According to [1] "The async def type of coroutine was added in Python 3.5" Regards, Arnout [1] https://docs.python.org/3.5/library/asyncio-task.html#coroutines > > Signed-off-by: James Hilliard > --- > utils/genrandconfig | 62 +++++++++++++++++---------------------------- > 1 file changed, 23 insertions(+), 39 deletions(-) > > diff --git a/utils/genrandconfig b/utils/genrandconfig > index b3576f8a51..8947898d88 100755 > --- a/utils/genrandconfig > +++ b/utils/genrandconfig > @@ -28,11 +28,6 @@ import traceback > from distutils.version import StrictVersion > import platform > > -if sys.version_info < (3, 8): > - from asyncio import coroutine > -else: > - from types import coroutine > - > > class SystemInfo: > DEFAULT_NEEDED_PROGS = ["make", "git", "gcc", "timeout"] > @@ -60,8 +55,7 @@ class SystemInfo: > # -- > return None > > - @coroutine > - def has(self, prog): > + async def has(self, prog): > """Checks whether a program is available. > Lazily evaluates missing entries. > > @@ -76,11 +70,11 @@ class SystemInfo: > have_it = self.find_prog(prog) > # java[c] needs special care > if have_it and prog in ('java', 'javac'): > - proc = yield from asyncio.create_subprocess_shell( > + proc = await asyncio.create_subprocess_shell( > "%s -version | grep gcj" % prog, > stdout=asyncio.subprocess.DEVNULL, > stderr=asyncio.subprocess.DEVNULL) > - ret = yield from proc.wait() > + ret = await proc.wait() > if ret != 1: > have_it = False > # -- > @@ -159,8 +153,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): > return configs > > > - at coroutine > -def is_toolchain_usable(configfile, config): > +async def is_toolchain_usable(configfile, config): > """Check if the toolchain is actually usable.""" > > with open(configfile) as configf: > @@ -180,9 +173,9 @@ def is_toolchain_usable(configfile, config): > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: > - proc = yield from asyncio.create_subprocess_exec( > + proc = await asyncio.create_subprocess_exec( > 'ldd', '--version', stdout=asyncio.subprocess.PIPE) > - ldd_version_output, _ = yield from proc.communicate() > + ldd_version_output, _ = await proc.communicate() > if proc.returncode: > return False > glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] > @@ -193,8 +186,7 @@ def is_toolchain_usable(configfile, config): > return True > > > - at coroutine > -def fixup_config(sysinfo, configfile): > +async def fixup_config(sysinfo, configfile): > """Finalize the configuration and reject any problematic combinations > > This function returns 'True' when the configuration has been > @@ -210,8 +202,7 @@ def fixup_config(sysinfo, configfile): > > BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' > > - has_java = yield from sysinfo.has("java") > - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: > + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not await sysinfo.has("java"): > return False > # The ctng toolchain is affected by PR58854 > if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ > @@ -654,8 +645,7 @@ def fixup_config(sysinfo, configfile): > return True > > > - at coroutine > -def gen_config(args): > +async def gen_config(args): > """Generate a new random configuration > > This function generates the configuration, by choosing a random > @@ -713,8 +703,7 @@ def gen_config(args): > > # Randomly enable BR2_REPRODUCIBLE 10% of times > # also enable tar filesystem images for testing > - has_diffoscope = yield from sysinfo.has("diffoscope") > - if has_diffoscope and randint(0, 10) == 0: > + if await sysinfo.has("diffoscope") and randint(0, 10) == 0: > configlines.append("BR2_REPRODUCIBLE=y\n") > configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") > > @@ -728,14 +717,13 @@ def gen_config(args): > with open(configfile, "w+") as configf: > configf.writelines(configlines) > > - proc = yield from asyncio.create_subprocess_exec( > + proc = await asyncio.create_subprocess_exec( > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > - ret = yield from proc.wait() > + ret = await proc.wait() > if ret: > return ret > > - toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) > - if not toolchain_usable: > + if not await is_toolchain_usable(configfile, toolchainconfig): > return 2 > > # Now, generate the random selection of packages, and fixup > @@ -749,37 +737,33 @@ def gen_config(args): > file=sys.stderr) > return 1 > bounded_loop -= 1 > - make_rand = [ > + proc = await asyncio.create_subprocess_exec( > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), > "KCONFIG_PROBABILITY=%d" % randint(1, 20), > - "randpackageconfig" if args.toolchains_csv else "randconfig" > - ] > - proc = yield from asyncio.create_subprocess_exec(*make_rand) > - ret = yield from proc.wait() > + "randpackageconfig" if args.toolchains_csv else "randconfig") > + ret = await proc.wait() > if ret: > return ret > > - ret = yield from fixup_config(sysinfo, configfile) > - if ret: > + if await fixup_config(sysinfo, configfile): > break > > - proc = yield from asyncio.create_subprocess_exec( > + proc = await asyncio.create_subprocess_exec( > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > - ret = yield from proc.wait() > + ret = await proc.wait() > if ret: > return ret > > - proc = yield from asyncio.create_subprocess_exec( > + proc = await asyncio.create_subprocess_exec( > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") > - ret = yield from proc.wait() > + ret = await proc.wait() > if ret: > return ret > > - proc = yield from asyncio.create_subprocess_exec( > + proc = await asyncio.create_subprocess_exec( > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") > - ret = yield from proc.wait() > - return ret > + return await proc.wait() > > > if __name__ == '__main__': From peter at korsgaard.com Mon Feb 6 16:51:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 17:51:26 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.162-cip24 In-Reply-To: <20230206102235.63667-1-angelo@amarulasolutions.com> (Angelo Compagnucci's message of "Mon, 6 Feb 2023 11:22:35 +0100") References: <20230206102235.63667-1-angelo@amarulasolutions.com> Message-ID: <877cwu91pt.fsf@dell.be.48ers.dk> >>>>> "Angelo" == Angelo Compagnucci writes: > Signed-off-by: Angelo Compagnucci Committed, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Mon Feb 6 16:52:09 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 09:52:09 -0700 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: switch to async/await format In-Reply-To: <3edf52e1-0ba5-c8d0-8501-079a6e21abfe@mind.be> References: <20230206150847.3621475-1-james.hilliard1@gmail.com> <3edf52e1-0ba5-c8d0-8501-079a6e21abfe@mind.be> Message-ID: On Mon, Feb 6, 2023 at 9:50 AM Arnout Vandecappelle wrote: > > > > On 06/02/2023 16:08, James Hilliard wrote: > > This requires python 3.6 or newer but is a bit cleaner. > > Does it? According to [1] > > "The async def type of coroutine was added in Python 3.5" Hmm, yeah, must have mixed that up with something else that needed 3.6. > > > Regards, > Arnout > > [1] https://docs.python.org/3.5/library/asyncio-task.html#coroutines > > > > > > Signed-off-by: James Hilliard > > --- > > utils/genrandconfig | 62 +++++++++++++++++---------------------------- > > 1 file changed, 23 insertions(+), 39 deletions(-) > > > > diff --git a/utils/genrandconfig b/utils/genrandconfig > > index b3576f8a51..8947898d88 100755 > > --- a/utils/genrandconfig > > +++ b/utils/genrandconfig > > @@ -28,11 +28,6 @@ import traceback > > from distutils.version import StrictVersion > > import platform > > > > -if sys.version_info < (3, 8): > > - from asyncio import coroutine > > -else: > > - from types import coroutine > > - > > > > class SystemInfo: > > DEFAULT_NEEDED_PROGS = ["make", "git", "gcc", "timeout"] > > @@ -60,8 +55,7 @@ class SystemInfo: > > # -- > > return None > > > > - @coroutine > > - def has(self, prog): > > + async def has(self, prog): > > """Checks whether a program is available. > > Lazily evaluates missing entries. > > > > @@ -76,11 +70,11 @@ class SystemInfo: > > have_it = self.find_prog(prog) > > # java[c] needs special care > > if have_it and prog in ('java', 'javac'): > > - proc = yield from asyncio.create_subprocess_shell( > > + proc = await asyncio.create_subprocess_shell( > > "%s -version | grep gcj" % prog, > > stdout=asyncio.subprocess.DEVNULL, > > stderr=asyncio.subprocess.DEVNULL) > > - ret = yield from proc.wait() > > + ret = await proc.wait() > > if ret != 1: > > have_it = False > > # -- > > @@ -159,8 +153,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): > > return configs > > > > > > - at coroutine > > -def is_toolchain_usable(configfile, config): > > +async def is_toolchain_usable(configfile, config): > > """Check if the toolchain is actually usable.""" > > > > with open(configfile) as configf: > > @@ -180,9 +173,9 @@ def is_toolchain_usable(configfile, config): > > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ > > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ > > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: > > - proc = yield from asyncio.create_subprocess_exec( > > + proc = await asyncio.create_subprocess_exec( > > 'ldd', '--version', stdout=asyncio.subprocess.PIPE) > > - ldd_version_output, _ = yield from proc.communicate() > > + ldd_version_output, _ = await proc.communicate() > > if proc.returncode: > > return False > > glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] > > @@ -193,8 +186,7 @@ def is_toolchain_usable(configfile, config): > > return True > > > > > > - at coroutine > > -def fixup_config(sysinfo, configfile): > > +async def fixup_config(sysinfo, configfile): > > """Finalize the configuration and reject any problematic combinations > > > > This function returns 'True' when the configuration has been > > @@ -210,8 +202,7 @@ def fixup_config(sysinfo, configfile): > > > > BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' > > > > - has_java = yield from sysinfo.has("java") > > - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: > > + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not await sysinfo.has("java"): > > return False > > # The ctng toolchain is affected by PR58854 > > if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ > > @@ -654,8 +645,7 @@ def fixup_config(sysinfo, configfile): > > return True > > > > > > - at coroutine > > -def gen_config(args): > > +async def gen_config(args): > > """Generate a new random configuration > > > > This function generates the configuration, by choosing a random > > @@ -713,8 +703,7 @@ def gen_config(args): > > > > # Randomly enable BR2_REPRODUCIBLE 10% of times > > # also enable tar filesystem images for testing > > - has_diffoscope = yield from sysinfo.has("diffoscope") > > - if has_diffoscope and randint(0, 10) == 0: > > + if await sysinfo.has("diffoscope") and randint(0, 10) == 0: > > configlines.append("BR2_REPRODUCIBLE=y\n") > > configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") > > > > @@ -728,14 +717,13 @@ def gen_config(args): > > with open(configfile, "w+") as configf: > > configf.writelines(configlines) > > > > - proc = yield from asyncio.create_subprocess_exec( > > + proc = await asyncio.create_subprocess_exec( > > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > > - ret = yield from proc.wait() > > + ret = await proc.wait() > > if ret: > > return ret > > > > - toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) > > - if not toolchain_usable: > > + if not await is_toolchain_usable(configfile, toolchainconfig): > > return 2 > > > > # Now, generate the random selection of packages, and fixup > > @@ -749,37 +737,33 @@ def gen_config(args): > > file=sys.stderr) > > return 1 > > bounded_loop -= 1 > > - make_rand = [ > > + proc = await asyncio.create_subprocess_exec( > > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), > > "KCONFIG_PROBABILITY=%d" % randint(1, 20), > > - "randpackageconfig" if args.toolchains_csv else "randconfig" > > - ] > > - proc = yield from asyncio.create_subprocess_exec(*make_rand) > > - ret = yield from proc.wait() > > + "randpackageconfig" if args.toolchains_csv else "randconfig") > > + ret = await proc.wait() > > if ret: > > return ret > > > > - ret = yield from fixup_config(sysinfo, configfile) > > - if ret: > > + if await fixup_config(sysinfo, configfile): > > break > > > > - proc = yield from asyncio.create_subprocess_exec( > > + proc = await asyncio.create_subprocess_exec( > > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > > - ret = yield from proc.wait() > > + ret = await proc.wait() > > if ret: > > return ret > > > > - proc = yield from asyncio.create_subprocess_exec( > > + proc = await asyncio.create_subprocess_exec( > > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") > > - ret = yield from proc.wait() > > + ret = await proc.wait() > > if ret: > > return ret > > > > - proc = yield from asyncio.create_subprocess_exec( > > + proc = await asyncio.create_subprocess_exec( > > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") > > - ret = yield from proc.wait() > > - return ret > > + return await proc.wait() > > > > > > if __name__ == '__main__': From peter at korsgaard.com Mon Feb 6 16:42:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 17:42:59 +0100 Subject: [Buildroot] [git commit] linux: bump CIP kernel to version 5.10.162-cip24 Message-ID: <20230206165239.1482B83CB4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3274404b361b8d243fa593391dc6a7c9c47b9961 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- linux/Config.in | 8 ++++---- linux/linux.hash | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index a0e9286bd3..774f1e0975 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -32,7 +32,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.145-cip17)" + bool "Latest CIP SLTS version (5.10.162-cip24)" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL help CIP launched in the spring of 2016 to address the needs of @@ -52,7 +52,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.145-cip17-rt7)" + bool "Latest CIP RT SLTS version (5.10.162-cip24-rt10)" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL help Same as the CIP version, but this is the PREEMPT_RT realtime @@ -129,8 +129,8 @@ endif config BR2_LINUX_KERNEL_VERSION string default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION - default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.145-cip17-rt7" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "5.10.162-cip24-rt10" 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 927172e8fa..e88abe5bb8 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,8 +10,8 @@ sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux- sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed -sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz -sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz +sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz +sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING From vfazio at xes-inc.com Mon Feb 6 13:36:09 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Mon, 6 Feb 2023 13:36:09 +0000 Subject: [Buildroot] [External] - [PATCH v2] boot/arm-trusted-firmware: Barebox available as BL33 In-Reply-To: <20230119185041.3430421-1-casey@xogium.me> References: <20230119183026.3428277-1-casey@xogium.me> <20230119185041.3430421-1-casey@xogium.me> Message-ID: Casey, > -----Original Message----- > From: buildroot On Behalf Of Casey > Reeves > Sent: Thursday, January 19, 2023 12:51 PM > To: buildroot at buildroot.org > Cc: Sergey Matyukevich > Subject: [External] - [Buildroot] [PATCH v2] boot/arm-trusted-firmware: > Barebox available as BL33 > > Since version 2022.04.0, Barebox now support a generic image built for > platforms, to be used as BL33 to generate FIP images. This patch makes it > available as choice of BL33 to be used with ATF and is based on the similar > work put into U-Boot as BL33. > > Signed-off-by: Casey Reeves > > --- > Changes v1 -> v2: > - fixed quoting issue in the default image name > --- > boot/arm-trusted-firmware/Config.in | 21 +++++++++++++++++++ > .../arm-trusted-firmware.mk | 6 ++++++ > 2 files changed, 27 insertions(+) > > diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted- > firmware/Config.in > index a9b9bbcc5a..cb54c6c9d8 100644 > --- a/boot/arm-trusted-firmware/Config.in > +++ b/boot/arm-trusted-firmware/Config.in > @@ -129,6 +129,27 @@ config > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE > > endchoice > > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 > + bool "Use Barebox as BL33" > + depends on BR2_TARGET_BAREBOX Does TFA allow multiple BL33 images to be defined? I don't see a guard if some other package such as U-Boot or EDK2 has been enabled as well. If only one image is supported but multiple images are supplied via BL33 on the make command line, is it last declared wins? > + help > + This option allows to embed the Barebox generic BL33 image in > + the ARM Trusted Firmware. It ensures that the Barebox package > + gets built before ATF, and that the appropriate BL33 > + variable pointing to the generic bl33 image is passed > + when building ATF. > + > +if BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 > + > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE > + string "Barebox BL33 image name" > + default "*-generic-bl33.img" > + help > + Name of the Barebox BL33 image to include in ATF, it must > + have been installed to BINARIES_DIR by the Barebox package. > + > +endif > + > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 > bool "Use U-Boot as BL33" > depends on BR2_TARGET_UBOOT > diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk > b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > index 1164c81410..648f62ed85 100644 > --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk > +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > @@ -105,6 +105,12 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += > AARCH32_SP=optee endif endif # > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE > > +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33),y) > +ARM_TRUSTED_FIRMWARE_BAREBOX_BIN = $(call > +qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE > )) > +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += > +BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_BAREBOX_BIN) > +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += barebox endif > + > ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33),y) > ARM_TRUSTED_FIRMWARE_DEPENDENCIES += edk2 # Since the flash > device name vary between platforms, we use the variable > -- > 2.39.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > CAUTION: This email originated from outside of the organization. Do not click > links or open attachments unless you recognize the sender and know the > content is safe. From fontaine.fabrice at gmail.com Mon Feb 6 17:15:44 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 6 Feb 2023 18:15:44 +0100 Subject: [Buildroot] [PATCH 2020.02.x] package/lxc: fix CVE-2022-47952 Message-ID: <20230206171544.35665-1-fontaine.fabrice@gmail.com> lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may allow local users to infer whether any file exists, even within a protected directory tree, because "Failed to open" often indicates that a file does not exist, whereas "does not refer to a network namespace path" often indicates that a file exists. NOTE: this is different from CVE-2018-6556 because the CVE-2018-6556 fix design was based on the premise that "we will report back to the user that the open() failed but the user has no way of knowing why it failed"; however, in many realistic cases, there are no plausible reasons for failing except that the file does not exist. Signed-off-by: Fabrice Fontaine --- ...ching-an-incoming-CVE-CVE-2022-47952.patch | 73 +++++++++++++++++++ package/lxc/lxc.mk | 3 + 2 files changed, 76 insertions(+) create mode 100644 package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch diff --git a/package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch b/package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch new file mode 100644 index 0000000000..071734848a --- /dev/null +++ b/package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch @@ -0,0 +1,73 @@ +From 1b0469530d7a38b8f8990e114b52530d1bf7f3b8 Mon Sep 17 00:00:00 2001 +From: Maher Azzouzi +Date: Sun, 25 Dec 2022 13:50:25 +0100 +Subject: [PATCH] Patching an incoming CVE (CVE-2022-47952) + +lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may +allow local users to infer whether any file exists, even within a +protected directory tree, because "Failed to open" often indicates +that a file does not exist, whereas "does not refer to a network +namespace path" often indicates that a file exists. NOTE: this is +different from CVE-2018-6556 because the CVE-2018-6556 fix design was +based on the premise that "we will report back to the user that the +open() failed but the user has no way of knowing why it failed"; +however, in many realistic cases, there are no plausible reasons for +failing except that the file does not exist. + +PoC: +> % ls /l +> ls: cannot open directory '/l': Permission denied +> % /usr/lib/x86_64-linux-gnu/lxc/lxc-user-nic delete lol lol /l/h/tt h h +> cmd/lxc_user_nic.c: 1096: main: Failed to open "/l/h/tt" <----- file does not exist. +> % /usr/lib/x86_64-linux-gnu/lxc/lxc-user-nic delete lol lol /l/h/t h h +> cmd/lxc_user_nic.c: 1101: main: Path "/l/h/t" does not refer to a network namespace path <---- file exist! + +Signed-off-by: MaherAzzouzi +Acked-by: Serge Hallyn + +[Retrieved from: +https://github.com/lxc/lxc/commit/1b0469530d7a38b8f8990e114b52530d1bf7f3b8] +Signed-off-by: Fabrice Fontaine +--- + src/lxc/cmd/lxc_user_nic.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +diff --git a/src/lxc/cmd/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c +index a91e2259d5..69bc6f17d1 100644 +--- a/src/lxc/cmd/lxc_user_nic.c ++++ b/src/lxc/cmd/lxc_user_nic.c +@@ -1085,20 +1085,17 @@ int main(int argc, char *argv[]) + } else if (request == LXC_USERNIC_DELETE) { + char opath[LXC_PROC_PID_FD_LEN]; + +- /* Open the path with O_PATH which will not trigger an actual +- * open(). Don't report an errno to the caller to not leak +- * information whether the path exists or not. +- * When stracing setuid is stripped so this is not a concern +- * either. +- */ ++ // Keep in mind CVE-2022-47952: It's crucial not to leak any ++ // information whether open() succeeded of failed. ++ + netns_fd = open(args.pid, O_PATH | O_CLOEXEC); + if (netns_fd < 0) { +- usernic_error("Failed to open \"%s\"\n", args.pid); ++ usernic_error("Failed while opening netns file for \"%s\"\n", args.pid); + _exit(EXIT_FAILURE); + } + + if (!fhas_fs_type(netns_fd, NSFS_MAGIC)) { +- usernic_error("Path \"%s\" does not refer to a network namespace path\n", args.pid); ++ usernic_error("Failed while opening netns file for \"%s\"\n", args.pid); + close(netns_fd); + _exit(EXIT_FAILURE); + } +@@ -1112,7 +1109,7 @@ int main(int argc, char *argv[]) + /* Now get an fd that we can use in setns() calls. */ + ret = open(opath, O_RDONLY | O_CLOEXEC); + if (ret < 0) { +- CMD_SYSERROR("Failed to open \"%s\"\n", args.pid); ++ CMD_SYSERROR("Failed while opening netns file for \"%s\"\n", args.pid); + close(netns_fd); + _exit(EXIT_FAILURE); + } diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 7994dffcf5..881869969d 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -13,6 +13,9 @@ LXC_INSTALL_STAGING = YES # We're patching configure.ac LXC_AUTORECONF = YES +# 0005-Patching-an-incoming-CVE-CVE-2022-47952.patch +LXC_IGNORE_CVES += CVE-2022-47952 + LXC_CONF_OPTS = \ --disable-apparmor \ --disable-examples \ -- 2.39.0 From romain.naour at smile.fr Mon Feb 6 18:13:54 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 19:13:54 +0100 Subject: [Buildroot] [PATCH v5 01/10] package/cpuinfo: new package In-Reply-To: References: <20230130002854.2300661-1-james.hilliard1@gmail.com> <301bf244-5eb8-3903-3371-80de9a6810aa@smile.fr> <282c5a46-37ed-6c07-9b72-86133a71750a@smile.fr> Message-ID: <1f8f6719-f816-b7a4-6837-840db623461a@smile.fr> Le 06/02/2023 ? 17:33, James Hilliard a ?crit?: > On Mon, Feb 6, 2023 at 9:24 AM Romain Naour wrote: >> >> Hello James, >> >> Le 06/02/2023 ? 16:53, Romain Naour a ?crit : >>> Hello James, >>> >>> Le 30/01/2023 ? 01:28, James Hilliard a ?crit : >>>> From: Stefan Hager >>>> >>>> This package is required by tensorflow-lite. >>>> >>>> Add a patch removing cpp requirement when not building tests. >>>> >>>> Tested-by: Stefan Hager >>>> Signed-off-by: Stefan Hager >>>> Signed-off-by: James Hilliard >>>> --- >>>> Changes v4 -> v5: >>>> - don't require cpp >>>> Changes v2 -> v3: >>>> - move to libraries->hardware handling >>>> --- >> >> [...] >> >>>> diff --git a/package/cpuinfo/Config.in b/package/cpuinfo/Config.in >>>> new file mode 100644 >>>> index 0000000000..d3c3b08400 >>>> --- /dev/null >>>> +++ b/package/cpuinfo/Config.in >>>> @@ -0,0 +1,8 @@ >>>> +config BR2_PACKAGE_CPUINFO >>>> + bool "cpuinfo" >>> >>> Have you checked cpuinfo dependencies ? >>> >>> It seems XNNPack used by cpuinfo is 64bits architectures only: >>> >>> CMake Warning at CMakeLists.txt:69 (MESSAGE): >>> Target processor architecture "l" is not supported in cpuinfo. cpuinfo >>> will compile, but cpuinfo_initialize() will always fail. >>> >>> hint: >>> https://github.com/NobuoTsukamoto/meta-tensorflow-lite/blob/main/recipes-tools/tensorflow-lite/tensorflow-lite-benchmark_2.11.0.bb#L33 >>> >>> And trigger a build issue on uClibc-ng due to missing header: >>> >>> cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:19:11: >>> fatal error: sys/auxv.h: No such file or directory >>> 19 | #include >>> >>> Also static build is not likely supported: >>> >>> cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:8:10: >>> fatal error: dlfcn.h: No such file or directory >>> 8 | #include >> >> Actually there is an architecture dependency: x86, x86_64, arm, aarch64. >> Also it requires threads support: >> >> https://github.com/pytorch/cpuinfo/blob/main/src/init.c#L24 > > Well...those architecture dependencies kinda look like runtime deps > to me...a consuming application could call cpuinfo_initialize() with > error handling and fallback to some other codepath automatically on > failure. > > So probably we don't want to apply an architecture restriction unless > there's an actual build failure. With the sourcery-arm-armv4t cpuinfo build will fail: CMake Warning at CMakeLists.txt:69 (MESSAGE): Target processor architecture "armv4l" is not supported in cpuinfo. cpuinfo will compile, but cpuinfo_initialize() will always fail. libcpuinfo.so: hidden symbol `cpuinfo_arm_linux_init' isn't defined The architecture support other than announced (arm,aarch64, x86 and x86_64) seems uncertain. In doubt, it seems to be legit to add architecture dependencies. Best regards, Romain > >> >> Best regards, >> Romain >> >>> >>> Best regards, >>> Romain >>> From romain.naour at smile.fr Mon Feb 6 18:38:20 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 19:38:20 +0100 Subject: [Buildroot] [PATCH v5 03/10] package/gemmlowp: new package In-Reply-To: <20230130002854.2300661-3-james.hilliard1@gmail.com> References: <20230130002854.2300661-1-james.hilliard1@gmail.com> <20230130002854.2300661-3-james.hilliard1@gmail.com> Message-ID: Hello James, Le 30/01/2023 ? 01:28, James Hilliard a ?crit?: > From: Stefan Hager > > This package is required by tensorflow-lite. > > Tested-by: Stefan Hager > Signed-off-by: Stefan Hager > Signed-off-by: James Hilliard > --- > Changes v4 -> v5: > - add comment indicating library is header only > Changes v2 -> v3: > - add C++11 dependency > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/gemmlowp/Config.in | 12 ++++++++++++ > package/gemmlowp/gemmlowp.hash | 4 ++++ > package/gemmlowp/gemmlowp.mk | 16 ++++++++++++++++ > 5 files changed, 34 insertions(+) > create mode 100644 package/gemmlowp/Config.in > create mode 100644 package/gemmlowp/gemmlowp.hash > create mode 100644 package/gemmlowp/gemmlowp.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 57d364012c..01e64e5fc5 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2725,6 +2725,7 @@ F: package/ti-gfx/ > > N: Stefan Hager > F: package/cpuinfo/ > +F: package/gemmlowp/ > F: package/ruy/ > > N: Stefan Ott > diff --git a/package/Config.in b/package/Config.in > index 0d3fd37796..8fd8f05bd6 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2018,6 +2018,7 @@ menu "Other" > source "package/fxdiv/Config.in" > source "package/gconf/Config.in" > source "package/gdal/Config.in" > + source "package/gemmlowp/Config.in" > source "package/gflags/Config.in" > source "package/gli/Config.in" > source "package/glibmm/Config.in" > diff --git a/package/gemmlowp/Config.in b/package/gemmlowp/Config.in > new file mode 100644 > index 0000000000..379450d1b0 > --- /dev/null > +++ b/package/gemmlowp/Config.in > @@ -0,0 +1,12 @@ > +config BR2_PACKAGE_GEMMLOWP > + bool "gemmlowp" > + depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 > + help > + Low-precision matrix multiplication. > + > + https://github.com/google/gemmlowp > + > +comment "gemmlowp needs a toolchain w/ C++11" > + depends on !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > diff --git a/package/gemmlowp/gemmlowp.hash b/package/gemmlowp/gemmlowp.hash > new file mode 100644 > index 0000000000..7c56a18bb6 > --- /dev/null > +++ b/package/gemmlowp/gemmlowp.hash > @@ -0,0 +1,4 @@ > +# Locally calculated > +sha256 cc8a22b6f071c3781e6b4b72654c89b1cdc198e72ebadebb17638eac205344c1 gemmlowp-08e4bb339e34017a0835269d4a37c4ea04d15a69.tar.gz > +# License files, locally calculated > +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/gemmlowp/gemmlowp.mk b/package/gemmlowp/gemmlowp.mk > new file mode 100644 > index 0000000000..9489dccbe5 > --- /dev/null > +++ b/package/gemmlowp/gemmlowp.mk > @@ -0,0 +1,16 @@ > +################################################################################ > +# > +# gemmlowp > +# > +################################################################################ > + > +GEMMLOWP_VERSION = 08e4bb339e34017a0835269d4a37c4ea04d15a69 > +GEMMLOWP_SITE = $(call github,google,gemmlowp,$(GEMMLOWP_VERSION)) > +GEMMLOWP_LICENSE = Apache-2.0 > +GEMMLOWP_LICENSE_FILES = LICENSE > +GEMMLOWP_INSTALL_STAGING = YES > +# Only installs a header > +GEMMLOWP_INSTALL_TARGET = NO Ok but libeight_bit_int_gemm.so is installed in staging. What can go wrong if something is linking against it ? Best regards, Romain > +GEMMLOWP_SUBDIR = contrib > + > +$(eval $(cmake-package)) From romain.naour at smile.fr Mon Feb 6 19:04:14 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 20:04:14 +0100 Subject: [Buildroot] [PATCH v5 04/10] package/pthreadpool: new package In-Reply-To: <20230130002854.2300661-4-james.hilliard1@gmail.com> References: <20230130002854.2300661-1-james.hilliard1@gmail.com> <20230130002854.2300661-4-james.hilliard1@gmail.com> Message-ID: <1232ab4c-793d-7777-4a55-1f6fa45fcf8b@smile.fr> Le 30/01/2023 ? 01:28, James Hilliard a ?crit?: > This package is required by tensorflow-lite. > > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/pthreadpool/Config.in | 8 +++++++ > package/pthreadpool/pthreadpool.hash | 4 ++++ > package/pthreadpool/pthreadpool.mk | 33 ++++++++++++++++++++++++++++ > 5 files changed, 47 insertions(+) > create mode 100644 package/pthreadpool/Config.in > create mode 100644 package/pthreadpool/pthreadpool.hash > create mode 100644 package/pthreadpool/pthreadpool.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 01e64e5fc5..6d25f44dcd 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2726,6 +2726,7 @@ F: package/ti-gfx/ > N: Stefan Hager > F: package/cpuinfo/ > F: package/gemmlowp/ > +F: package/pthreadpool/ > F: package/ruy/ > > N: Stefan Ott > diff --git a/package/Config.in b/package/Config.in > index 8fd8f05bd6..873aade1a6 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2118,6 +2118,7 @@ endif > source "package/protobuf/Config.in" > source "package/protobuf-c/Config.in" > source "package/protozero/Config.in" > + source "package/pthreadpool/Config.in" > source "package/qhull/Config.in" > source "package/qlibc/Config.in" > source "package/riemann-c-client/Config.in" > diff --git a/package/pthreadpool/Config.in b/package/pthreadpool/Config.in > new file mode 100644 > index 0000000000..194ae33f85 > --- /dev/null > +++ b/package/pthreadpool/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_PTHREADPOOL > + bool "pthreadpool" The CMakelists.txt requires C++ support: PROJECT(pthreadpool C CXX) Toolchain with threads support seems to be required: src/pthreads.c:#include src/threadpool-object.h:#include Best regards, Romain > + select BR2_PACKAGE_FXDIV > + help > + Pthreadpool is a portable and efficient thread pool > + implementation. > + > + https://github.com/Maratyszcza/pthreadpool > diff --git a/package/pthreadpool/pthreadpool.hash b/package/pthreadpool/pthreadpool.hash > new file mode 100644 > index 0000000000..164ac55390 > --- /dev/null > +++ b/package/pthreadpool/pthreadpool.hash > @@ -0,0 +1,4 @@ > +# Locally calculated > +sha256 ae75adb19807ea28582683b38dd4e79a6b287751452564b42e214bb21216ef14 pthreadpool-43edadc654d6283b4b6e45ba09a853181ae8e850.tar.gz > +# License files, locally calculated > +sha256 57814a606b4d0fb087d9a534919084b6c11b58a4174cb5a4aef200187780dc3a LICENSE > diff --git a/package/pthreadpool/pthreadpool.mk b/package/pthreadpool/pthreadpool.mk > new file mode 100644 > index 0000000000..4ef7949da2 > --- /dev/null > +++ b/package/pthreadpool/pthreadpool.mk > @@ -0,0 +1,33 @@ > +################################################################################ > +# > +# pthreadpool > +# > +################################################################################ > + > +PTHREADPOOL_VERSION = 43edadc654d6283b4b6e45ba09a853181ae8e850 > +PTHREADPOOL_SITE = $(call github,Maratyszcza,pthreadpool,$(PTHREADPOOL_VERSION)) > +PTHREADPOOL_LICENSE = BSD-2-Clause > +PTHREADPOOL_LICENSE_FILES = LICENSE > +PTHREADPOOL_INSTALL_STAGING = YES > +PTHREADPOOL_DEPENDENCIES = fxdiv > + > +PTHREADPOOL_CFLAGS = $(TARGET_CFLAGS) > +PTHREADPOOL_CXXFLAGS = $(TARGET_CXXFLAGS) > + > +ifeq ($(BR2_PACKAGE_CPUINFO),y) > +PTHREADPOOL_DEPENDENCIES += cpuinfo > +PTHREADPOOL_CFLAGS += -DPTHREADPOOL_USE_CPUINFO=1 > +PTHREADPOOL_CXXFLAGS += -DPTHREADPOOL_USE_CPUINFO=1 > +else > +PTHREADPOOL_CFLAGS += -DPTHREADPOOL_USE_CPUINFO=0 > +PTHREADPOOL_CXXFLAGS += -DPTHREADPOOL_USE_CPUINFO=0 > +endif > + > +PTHREADPOOL_CONF_OPTS = \ > + -DCMAKE_C_FLAGS="$(PTHREADPOOL_CFLAGS)" \ > + -DCMAKE_CXX_FLAGS="$(PTHREADPOOL_CXXFLAGS)" \ > + -DFXDIV_SOURCE_DIR="$(FXDIV_DIR)" \ > + -DPTHREADPOOL_BUILD_TESTS=OFF \ > + -DPTHREADPOOL_BUILD_BENCHMARKS=OFF > + > +$(eval $(cmake-package)) From romain.naour at smile.fr Mon Feb 6 20:25:03 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 21:25:03 +0100 Subject: [Buildroot] [PATCH] Config.in: introduce BR2_TIME_BITS_64 option for Y2038 compatibility In-Reply-To: <20221013163910.3c6d9c8f@windsurf> References: <20221012215008.2918444-1-thomas.petazzoni@bootlin.com> <5eebf7dee2a585f50a4e986c214677a157bfd22c.camel@calian.com> <20221013163910.3c6d9c8f@windsurf> Message-ID: <5d683c3c-1229-70e6-1736-ca01dd1a7159@smile.fr> Hello Thomas, Le 13/10/2022 ? 16:39, Thomas Petazzoni via buildroot a ?crit?: > On Wed, 12 Oct 2022 23:49:37 +0000 > Robert Hancock wrote: > >> There's some chance of software being broken by enabling this, with >> either a compile or runtime failure. For example, applications that >> assume sizeof(time_t) == sizeof(long) would work on 32-bit platforms >> with a 32-bit time and 64-bit platforms with a 64-bit time, but fail >> with a 64-bit time on 32-bit. I believe I've seen this when trying to >> build software with that option, so turning this on unconditionally >> might be unwise, unless some build tests of the supported packages >> have been done.. > > There will definitely be build testing: our autobuilders are testing > 24/7 random configurations of Buildroot. So as soon as we introduce > this option, there would be builds with BR2_TIME_BITS_64=y enabled, > which would raise build issues if there's any. > > Of course, the more tricky part are runtime issues, which are > essentially impossible to detect until someone runs into the problem. We already tried to enable BR2_TIME_BITS_64 back in March 2022 but we had to revert it due to build issues with packages like glibc: See: http://lists.busybox.net/pipermail/buildroot/2022-March/638105.html https://git.buildroot.net/buildroot/commit/?id=dd170f0cbad729dba4193b2b20e3de0a7010d485 I'll try to look again. Best regards, Romain > > Best regards, > > Thomas From petr.vorel at gmail.com Mon Feb 6 20:58:54 2023 From: petr.vorel at gmail.com (Petr Vorel) Date: Mon, 6 Feb 2023 21:58:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/iputils: bump version to 20221126 In-Reply-To: <20230206112156.GC3565@scaer> References: <20221126003807.462157-1-pevik@seznam.cz> <20230206112156.GC3565@scaer> Message-ID: Hi Yann, thanks a lot for merging. I completely forgot on this patch, I'm glad it was not lost in the queue. Kind regards, Petr From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit] Makefile: add target to update .checkpackageignore Message-ID: <20230206210854.71BC983CFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd28acc1e8085c15d12e233090550580dafe1f96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When a developer fixes an ignored warning from check-package, he/she needs to update .checkpackageignore By running './utils/docker-run make check-package' the developer receives a warning about this. Make that change easier to make, by adding a helper target on Makefile. Add an option --failed-only to check-package that generates output in the format: [ ...] This is the very same format used by check-package ignore file. Add the phony target .checkpackageignore So one can update the ignore file using: $ ./utils/docker-run make .checkpackageignore Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- Makefile | 5 +++++ utils/check-package | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f39af5eae9..817cfed13c 100644 --- a/Makefile +++ b/Makefile @@ -1261,6 +1261,11 @@ check-package: -a -not -name '*.orig' -a -not -name '*.rej' \ -exec ./utils/check-package --exclude=Sob {} + +.PHONY: .checkpackageignore +.checkpackageignore: + find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ + -exec ./utils/check-package --exclude=Sob --failed-only {} > .checkpackageignore + + include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) diff --git a/utils/check-package b/utils/check-package index f08e76b374..848311bac8 100755 --- a/utils/check-package +++ b/utils/check-package @@ -63,11 +63,17 @@ def parse_args(): help="do not run the specified functions (debug)") parser.add_argument("--dry-run", action="store_true", help="print the " "functions that would be called for each file (debug)") + parser.add_argument("--failed-only", action="store_true", help="print only" + " the name of the functions that failed (debug)") flags = parser.parse_args() flags.ignore_list = get_ignored_parsers_per_file(flags.intree_only, flags.ignore_filename) + if flags.failed_only: + flags.dry_run = False + flags.verbose = -1 + return flags @@ -221,6 +227,11 @@ def check_file_using_lib(fname): .format(fname, should_fail, flags.ignore_filename)) nwarnings += 1 + if flags.failed_only: + if len(failed) > 0: + f = " ".join(sorted(failed)) + print("{} {}".format(fname, f)) + return nwarnings, nlines @@ -259,7 +270,7 @@ def __main__(): print("{} lines processed".format(total_lines), file=sys.stderr) print("{} warnings generated".format(total_warnings), file=sys.stderr) - if total_warnings > 0: + if total_warnings > 0 and not flags.failed_only: sys.exit(1) From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit] docs/manual: check-package before submitting patch Message-ID: <20230206210854.8A21F83CFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efccb2a7dd909f8f9b316d809859b9434a2737b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add 'utils/docker-run make check-package' to the default workflow of submitting patches, just after the rebase and before using format-patch. Cc: Thomas De Schampheleire Cc: Romain Naour Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- docs/manual/contribute.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index e588c69be6..94f1c64496 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -294,6 +294,12 @@ $ git fetch --all --tags $ git rebase origin/master --------------------- +Now check the coding style for the changes you committed: + +--------------------- +$ utils/docker-run make check-package +--------------------- + Now, you are ready to generate then submit your patch set. To generate it, run: From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit] support/docker: add python3-magic Message-ID: <20230206210854.962E583CFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcd15aa08aab1e8292b93995c44dc765a9801632 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It will be needed by check-package to run checks according to the file type (the same determined by the command 'file'). Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index f54c31b54a..d775ae23e1 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -39,6 +39,7 @@ RUN apt-get install -y --no-install-recommends \ openssh-server \ python3 \ python3-flake8 \ + python3-magic \ python3-nose2 \ python3-pexpect \ python3-pytest \ From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit] Makefile: make check-package assume a git tree Message-ID: <20230206210854.7DF4D83D00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aeec8faf3189b5dde90c465a9b14897406b1fc08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ... just like check-flake8 already does. When a new check_function is added to check-package, often there are files in the tree that would generate warnings. An example is the Sob check_function for patch files: | $ ./utils/check-package --i Sob $(git ls-files) >/dev/null | 369301 lines processed | 46 warnings generated Currently these warnings are listed when calling check-package directly, and also at the output of pkg-stats, but the check_function does not run on 'make check-package' (that is used to catch regressions on GitLab CI 'check-package' job) until all warnings in the tree are fixed. This (theoretically) allows new .patch files be added without SoB, without the GitLab CI catching it. Since now check-package has an ignore file to list all warnings in the tree, that will eventually be fixed, there is no need to filter the files passed to check-package. So test all files in the tree when 'make check-package' is called. It brings following advantages; - any new check_function added to check-package takes place immediately for new files; - adding new check_functions is less traumatic to the developer doing this, since he/she does not need anymore to fix all warnings in the tree before the new check_function takes effect; - prevent regressions, e.g. ANY new .patch file must have SoB; - as a side-effect, print a single statistics line as output of 'make ckeck-package'. But just enabling the check would generate many warnings when 'make check-package' is called, so update the ignore file by using: $ ./utils/docker-run make .checkpackageignore Notice: in order to ensure reproducible results, one should run 'make check-package' and 'make .checkpackageignore' inside the docker image, otherwise a variation in shellcheck version (installed in the host) can produce different results. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 8 +-- 2 files changed, 183 insertions(+), 5 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index e69de29bb2..b1f2d99b99 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -0,0 +1,180 @@ +package/alsamixergui/0001-misc-fixes.patch Sob +package/am33x-cm3/S93-am335x-pm-firmware-load Variables +package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch Sob +package/apache/S50apache Indent Shellcheck Variables +package/at/S99at Indent Variables +package/audit/S02auditd Shellcheck Variables +package/avahi/S05avahi-setup.sh Indent Variables +package/avahi/S50avahi-daemon Indent Variables +package/babeld/S50babeld Indent Shellcheck Variables +package/bind/S81named Indent Shellcheck Variables +package/bluez5_utils/S40bluetooth NotExecutable Variables +package/boinc/S99boinc-client Indent Shellcheck Variables +package/brickd/S70brickd Indent Shellcheck Variables +package/brltty/S10brltty Indent Shellcheck Variables +package/busybox/S02sysctl Variables +package/busybox/S10mdev ConsecutiveEmptyLines Indent Shellcheck +package/busybox/S15watchdog Indent Variables +package/busybox/S50telnet Indent Shellcheck Variables +package/c-icap/S96cicap Indent Shellcheck Variables +package/cfm/S65cfm Indent Variables +package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables +package/chrony/S49chrony Indent Shellcheck Variables +package/connman/S45connman Variables +package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob +package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob +package/curlftpfs/0003-nocache-memleak-fix.patch Sob +package/dante/S50dante Indent Shellcheck Variables +package/darkhttpd/S50darkhttpd Indent Shellcheck Variables +package/dbus/S30dbus Indent Shellcheck TrailingSpace Variables +package/dcron/S90dcron Variables +package/dhcp/S80dhcp-relay Shellcheck Variables +package/dhcp/S80dhcp-server Shellcheck Variables +package/dhcpcd/S41dhcpcd Indent Variables +package/dhrystone/0001-cmdline-nruns.patch Sob +package/dhrystone/0002-HZ.patch Sob +package/dhrystone/0003-exit.patch Sob +package/dhrystone/0004-headers.patch Sob +package/dhrystone/0005-prototypes.patch Sob +package/directfb-examples/0001-remove-bzero.patch Sob +package/dmraid/S20dmraid Variables +package/dnsmasq/S80dnsmasq Shellcheck Variables +package/docker-engine/S60dockerd Indent Shellcheck Variables +package/domoticz/S99domoticz Shellcheck +package/dropbear/S50dropbear Indent Shellcheck Variables +package/earlyoom/S02earlyoom Indent Shellcheck +package/ejabberd/S50ejabberd Indent Shellcheck Variables +package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables +package/exim/S86exim Indent Variables +package/fail2ban/S60fail2ban Shellcheck Variables +package/fbv/0001-cross.patch Sob +package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob +package/fbv/0005-include.patch Sob +package/freescale-imx/imx-uuc/S80imx-uuc Indent Shellcheck Variables +package/frr/S50frr Shellcheck +package/gamin/0002-no-const-return.patch Sob +package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch Sob +package/genromfs/0001-build-system.patch Sob +package/gerbera/S99gerbera Indent +package/gpsd/S50gpsd Indent Shellcheck Variables +package/haveged/S21haveged Shellcheck Variables +package/htpdate/S43htpdate Shellcheck +package/i2pd/S99i2pd Indent Shellcheck Variables +package/ifplugd/0001-cross.patch Sob +package/ifplugd/0002-fix-headers.patch Sob +package/ifupdown-scripts/S40network EmptyLastLine Indent Shellcheck Variables +package/igd2-for-linux/S99upnpd Indent Shellcheck Variables +package/inadyn/S70inadyn Indent NotExecutable +package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Variables +package/iptables/S35iptables Shellcheck +package/irda-utils/0001-daemon.patch Sob +package/irda-utils/0002-nommu.patch Sob +package/irda-utils/0003-subdir.patch Sob +package/irqbalance/S13irqbalance Indent Shellcheck Variables +package/iucode-tool/S00iucode-tool Variables +package/iwd/S40iwd Shellcheck Variables +package/keyutils/0002-cifs.patch Sob +package/kodi/S50kodi Shellcheck Variables +package/libart/0001-art-config-cross.patch Sob +package/libcgicc/0001-disable-documentation-option.patch Sob +package/libfcgi/0002-disable-examples.patch Sob +package/libftdi/0001-pkgconfig_libusb.patch Sob +package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch Sob +package/libiio/S99iiod Shellcheck Variables +package/libmad/0001-mips-h-constraint-removal.patch Sob +package/lighttpd/S50lighttpd EmptyLastLine Indent Shellcheck Variables +package/linux-tools/S10hyperv Indent Variables +package/linuxptp/S65ptp4l Indent Shellcheck +package/linuxptp/S66phc2sys Indent Shellcheck +package/lirc-tools/S25lircd Indent Variables +package/lite/0001-dfbspy-stat.patch Sob +package/lite/0002-no-tests.patch Sob +package/lite/0003-pkg-config.patch Sob +package/lldpd/S60lldpd Indent Shellcheck Variables +package/lockfile-progs/0001-sus3v-legacy.patch Sob +package/madplay/0001-switch-to-new-alsa-api.patch Sob +package/mariadb/S97mysqld Indent Shellcheck Variables +package/mender-connect/S43mender-connect Shellcheck +package/mii-diag/0001-strchr.patch Sob +package/minidlna/S60minidlnad Indent Shellcheck Variables +package/minissdpd/S50minissdpd Indent Shellcheck Variables +package/modem-manager/S44modem-manager Shellcheck Variables +package/mosquitto/S50mosquitto Indent Shellcheck Variables +package/motion/S99motion Indent Shellcheck Variables +package/mpd/S95mpd Variables +package/mrouted/S41mrouted NotExecutable +package/mrp/S65mrp Indent Variables +package/multipath-tools/S60multipathd Shellcheck +package/neard/S53neard Indent Shellcheck Variables +package/netatalk/S50netatalk EmptyLastLine Indent Variables +package/netcat/0001-signed-bit-counting.patch Sob +package/netopeer2/S52netopeer2 Shellcheck Variables +package/netplug/0001-makefile-flags.patch Sob +package/netplug/S29netplug Indent Shellcheck Variables +package/netsnmp/S59snmpd Indent Shellcheck Variables +package/network-manager/S45network-manager ConsecutiveEmptyLines EmptyLastLine Shellcheck Variables +package/nfs-utils/S60nfs ConsecutiveEmptyLines Shellcheck Variables +package/nginx/S50nginx Indent Variables +package/nodm/S90nodm Indent Shellcheck Variables +package/nss-pam-ldapd/S45nslcd EmptyLastLine Indent Shellcheck Variables +package/ntp/S49ntp.in Variables +package/ofono/S46ofono Variables +package/olsr/S50olsr Indent Shellcheck Variables +package/openntpd/S49ntp Shellcheck Variables +package/openssh/S50sshd EmptyLastLine Indent Variables +package/openvpn/S60openvpn Indent Shellcheck Variables +package/oracle-mysql/S97mysqld Shellcheck Variables +package/owfs/S55owserver Shellcheck Variables +package/owfs/S60owfs Shellcheck Variables +package/pigpio/S50pigpio Shellcheck Variables +package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob +package/postgresql/S50postgresql Variables +package/procps-ng/S02sysctl Variables +package/proftpd/S50proftpd Indent Shellcheck Variables +package/prosody/S50prosody Indent Shellcheck Variables +package/ptpd/S65ptpd Indent Shellcheck Variables +package/ptpd2/S65ptpd2 Indent Shellcheck Variables +package/pulseaudio/S50pulseaudio ConsecutiveEmptyLines EmptyLastLine Indent Variables +package/python-web2py/S51web2py Shellcheck Variables +package/rdesktop/0001-8bit-colors.patch Sob +package/redis/S50redis Shellcheck Variables +package/restorecond/S02restorecond Shellcheck +package/rng-tools/S21rngd Shellcheck Variables +package/rpcbind/S30rpcbind EmptyLastLine Indent Variables +package/rubix/0002-misc-fixes.patch Sob +package/rygel/S99rygel Indent Shellcheck Variables +package/samba4/S91smb Indent Shellcheck Variables +package/seatd/S70seatd NotExecutable Variables +package/ser2net/S50ser2net Indent Shellcheck Variables +package/shairport-sync/S99shairport-sync Indent Shellcheck Variables +package/smcroute/S41smcroute Indent NotExecutable Variables +package/smstools3/S50smsd Shellcheck Variables +package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch Sob +package/squid/S97squid Indent Shellcheck Variables +package/sshguard/S49sshguard Indent +package/sslh/S35sslh Indent Shellcheck Variables +package/stunnel/S50stunnel Indent Shellcheck Variables +package/supervisor/S99supervisord Variables +package/suricata/S99suricata Shellcheck +package/sysrepo/S51sysrepo-plugind Indent Shellcheck +package/targetcli-fb/S50target Shellcheck Variables +package/tcf-agent/S55tcf-agent Shellcheck Variables +package/tftpd/S80tftpd-hpa Indent Shellcheck Variables +package/ti-gfx/S80ti-gfx Shellcheck Variables +package/ti-sgx-um/S80ti-sgx Variables +package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables +package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables +package/triggerhappy/S10triggerhappy Indent Shellcheck Variables +package/tvheadend/S99tvheadend Indent Shellcheck Variables +package/unbound/S70unbound Shellcheck +package/unscd/S46unscd Indent Shellcheck Variables +package/upmpdcli/S99upmpdcli Indent Shellcheck Variables +package/urandom-scripts/S20urandom Variables +package/usbguard/S20usbguard Indent Shellcheck Variables +package/vsftpd/S70vsftpd Indent Shellcheck Variables +package/watchdogd/S01watchdogd Indent NotExecutable +package/x11r7/xapp_xdm/S99xdm Indent Variables +package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob +package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob +package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob +package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables diff --git a/Makefile b/Makefile index 817cfed13c..49ee4ff119 100644 --- a/Makefile +++ b/Makefile @@ -1257,14 +1257,12 @@ check-flake8: | xargs -- python3 -m flake8 --statistics check-package: - find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ - -a -not -name '*.orig' -a -not -name '*.rej' \ - -exec ./utils/check-package --exclude=Sob {} + + $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` .PHONY: .checkpackageignore .checkpackageignore: - find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ - -exec ./utils/check-package --exclude=Sob --failed-only {} > .checkpackageignore + + $(Q)./utils/check-package --failed-only `git ls-tree -r --name-only HEAD` \ + > .checkpackageignore include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit] utils/check-package: decouple adding rules from fixing all intree files Message-ID: <20230206210854.598AC83CFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ddf4586b00a97c41c4ad4d50da4282c62940c05b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When a new check_function is added to check-package, often there are files in the tree that would generate warnings. An example is the Sob check_function for patch files: | $ ./utils/check-package --i Sob $(git ls-files) >/dev/null | 369301 lines processed | 46 warnings generated Currently these warnings are listed when calling check-package directly, and also at the output of pkg-stats, but the check_function does not run on 'make check-package' (that is used to catch regressions on GitLab CI 'check-package' job) until all warnings in the tree are fixed. This (theoretically) allows new .patch files be added without SoB, without the GitLab CI catching it. So add a way to check-package itself ignore current warnings, while still catching new files that do not follow that new check_function. Add a file named .checkpackageignore to the buildroot topdir. It contains the list of check_functions that are expected to fail for each given intree file tested by check-package. Each entries is in the format: [ ...] These are 2 examples of possible entries: package/initscripts/init.d/rcK ConsecutiveEmptyLines EmptyLastLine Shellcheck utils/test-pkg Shellcheck Keeping such a list allows us to have fine-grained control over which warning to ignore. In order to avoid this list to grow indefinitely, containing entries for files that are already fixed, make each entry an 'expected to fail' instead of just an 'ignore', and generate a warning if a check_function that was expect to fail for a given files does not generate that warning. Unfortunately one case that do not generate warning is an entry for a file that is deleted in a later commit. By default, all checks are applied. The --ignore-list option allows to specify a file that contains the list of warnings that should be ignored. The paths in the ignore file must be relative to the location of the ignore file itself, which means: - in the main Buildroot tree, the paths in the ignore file are relative to the root of the main Buildroot tree - in a BR2_EXTERNAL tree, if the ignore file is at the root of the BR2_EXTERNAL, the paths it contains must be relative to that root of the BR2_EXTERNAL This is one more step towards standardizing the use of just 'make check-package' before submitting patches to the list. Cc: Sen Hastings Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 0 utils/check-package | 78 ++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 62 insertions(+), 16 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/utils/check-package b/utils/check-package index f64daed84c..f08e76b374 100755 --- a/utils/check-package +++ b/utils/check-package @@ -19,6 +19,24 @@ VERBOSE_LEVEL_TO_SHOW_IGNORED_FILES = 3 flags = None # Command line arguments. +def get_ignored_parsers_per_file(intree_only, ignore_filename): + ignored = dict() + entry_base_dir = '' + + if not ignore_filename: + return ignored + + filename = os.path.abspath(ignore_filename) + entry_base_dir = os.path.join(os.path.dirname(filename)) + + with open(filename, "r") as f: + for line in f.readlines(): + filename, warnings_str = line.split(' ', 1) + warnings = warnings_str.split() + ignored[os.path.join(entry_base_dir, filename)] = warnings + return ignored + + def parse_args(): parser = argparse.ArgumentParser() @@ -29,6 +47,8 @@ def parse_args(): parser.add_argument("--br2-external", "-b", dest='intree_only', action="store_false", help="do not apply the pathname filters used for intree files") + parser.add_argument("--ignore-list", dest='ignore_filename', action="store", + help='override the default list of ignored warnings') parser.add_argument("--manual-url", action="store", default="http://nightly.buildroot.org/", @@ -44,7 +64,11 @@ def parse_args(): parser.add_argument("--dry-run", action="store_true", help="print the " "functions that would be called for each file (debug)") - return parser.parse_args() + flags = parser.parse_args() + + flags.ignore_list = get_ignored_parsers_per_file(flags.intree_only, flags.ignore_filename) + + return flags CONFIG_IN_FILENAME = re.compile(r"Config\.\S*$") @@ -120,21 +144,25 @@ def is_external_tool(m): return common_inspect_rules(m) -def print_warnings(warnings): +def print_warnings(warnings, xfail): # Avoid the need to use 'return []' at the end of every check function. if warnings is None: - return 0 # No warning generated. + return 0, 0 # No warning generated. + if xfail: + return 0, 1 # Warning not generated, fail expected for this file. for level, message in enumerate(warnings): if flags.verbose >= level: print(message.replace("\t", "< tab >").rstrip()) - return 1 # One more warning to count. + return 1, 1 # One more warning to count. def check_file_using_lib(fname): # Count number of warnings generated and lines processed. nwarnings = 0 nlines = 0 + xfail = flags.ignore_list.get(os.path.abspath(fname), []) + failed = set() lib = get_lib_from_filename(fname) if not lib: @@ -150,10 +178,13 @@ def check_file_using_lib(fname): print("{}: would run: {}".format(fname, functions_to_run)) return nwarnings, nlines - objects = [c[1](fname, flags.manual_url) for c in internal_functions] + objects = [[c[0], c[1](fname, flags.manual_url)] for c in internal_functions] - for cf in objects: - nwarnings += print_warnings(cf.before()) + for name, cf in objects: + warn, fail = print_warnings(cf.before(), name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn if six.PY3: f = open(fname, "r", errors="surrogateescape") else: @@ -161,19 +192,34 @@ def check_file_using_lib(fname): lastline = "" for lineno, text in enumerate(f.readlines()): nlines += 1 - for cf in objects: + for name, cf in objects: if cf.disable.search(lastline): continue - nwarnings += print_warnings(cf.check_line(lineno + 1, text)) + warn, fail = print_warnings(cf.check_line(lineno + 1, text), name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn lastline = text f.close() - for cf in objects: - nwarnings += print_warnings(cf.after()) - - tools = [c[1](fname) for c in external_tools] - - for tool in tools: - nwarnings += print_warnings(tool.run()) + for name, cf in objects: + warn, fail = print_warnings(cf.after(), name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn + + tools = [[c[0], c[1](fname)] for c in external_tools] + + for name, tool in tools: + warn, fail = print_warnings(tool.run(), name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn + + for should_fail in xfail: + if should_fail not in failed: + print("{}:0: {} was expected to fail, did you fixed the file and forgot to update {}?" + .format(fname, should_fail, flags.ignore_filename)) + nwarnings += 1 return nwarnings, nlines From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit] support/testing: test check-package ignore list Message-ID: <20230206210854.65D4F83CFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d631615eb1b833977003039626a0194589334f45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Extend test_check_package to also check the ignore list functionality. Check: - the entries in the ignore list use relative path; - an entry in the ignore list actually ignores the warning; - an outdated entry in the ignore list generates a warning by its own, preventing the ignoring list to grow indefinitely. For this to work, add 3 test fixtures, listing entries for an pre-existing file in the br2-external used in the test. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .../tests/utils/br2-external/.checkpackageignore | 1 + .../utils/br2-external/package/.checkpackageignore | 1 + .../package/.checkpackageignore_outdated | 1 + support/testing/tests/utils/test_check_package.py | 31 ++++++++++++++++++++++ 4 files changed, 34 insertions(+) diff --git a/support/testing/tests/utils/br2-external/.checkpackageignore b/support/testing/tests/utils/br2-external/.checkpackageignore new file mode 100644 index 0000000000..efb7680173 --- /dev/null +++ b/support/testing/tests/utils/br2-external/.checkpackageignore @@ -0,0 +1 @@ +package/external/external.mk PackageHeader diff --git a/support/testing/tests/utils/br2-external/package/.checkpackageignore b/support/testing/tests/utils/br2-external/package/.checkpackageignore new file mode 100644 index 0000000000..5f4a5e1187 --- /dev/null +++ b/support/testing/tests/utils/br2-external/package/.checkpackageignore @@ -0,0 +1 @@ +external/external.mk PackageHeader diff --git a/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated b/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated new file mode 100644 index 0000000000..1df59f3bed --- /dev/null +++ b/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated @@ -0,0 +1 @@ +external/external.mk Indent NewlineAtEof PackageHeader diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index c70ba02324..ce1998753c 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -75,6 +75,12 @@ class TestCheckPackage(unittest.TestCase): generated = int(stderr[1].split()[0]) self.assertGreater(generated, 0) + def assert_no_warnings_generated_for_file(self, stderr): + """Infer from check-package stderr if no warning was generated and fail otherwise.""" + self.assertIn("warnings generated", stderr[1], stderr) + generated = int(stderr[1].split()[0]) + self.assertEqual(generated, 0) + def test_run(self): """Test the various ways the script can be called in a simple top to bottom sequence.""" @@ -201,3 +207,28 @@ class TestCheckPackage(unittest.TestCase): self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) + + # br2-external with ignore list + topdir_path = infra.filepath("tests/utils/br2-external") + topdir_file = os.path.join(topdir_path, "package/external/external.mk") + subdir_path = infra.filepath("tests/utils/br2-external/package") + subdir_file = os.path.join(subdir_path, "external/external.mk") + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore", "-b", topdir_file], + self.WITH_UTILS_IN_PATH, topdir_path) + self.assert_file_was_processed(m) + self.assert_no_warnings_generated_for_file(m) + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore", "-b", subdir_file], + self.WITH_UTILS_IN_PATH, subdir_path) + self.assert_file_was_processed(m) + self.assert_no_warnings_generated_for_file(m) + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore_outdated", "-b", subdir_file], + self.WITH_UTILS_IN_PATH, subdir_path) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: Indent was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + .format(subdir_file), w) + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + .format(subdir_file), w) From thomas.petazzoni at bootlin.com Mon Feb 6 21:10:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:10:57 +0100 Subject: [Buildroot] [git commit] Makefile: check-package should use the ignore list Message-ID: <20230206211127.5B49983D02@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=394afb3c3b97ec4db28b19c27539c4d653f22e5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For now, we need to ignore a number of check-package warning checks. Signed-off-by: Thomas Petazzoni --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 49ee4ff119..4880b426b5 100644 --- a/Makefile +++ b/Makefile @@ -1257,7 +1257,8 @@ check-flake8: | xargs -- python3 -m flake8 --statistics check-package: - $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` + $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` \ + --ignore-list=$(TOPDIR)/.checkpackageignore .PHONY: .checkpackageignore .checkpackageignore: From thomas.petazzoni at bootlin.com Mon Feb 6 21:22:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:22:23 +0100 Subject: [Buildroot] [PATCH v2 01/14] utils/check-package: decouple adding rules from fixing all intree files In-Reply-To: <20220731193521.1217825-2-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-2-ricardo.martincoski@gmail.com> Message-ID: <20230206222223.7e0425d2@windsurf> On Sun, 31 Jul 2022 16:35:08 -0300 Ricardo Martincoski wrote: > When a new check_function is added to check-package, often there are > files in the tree that would generate warnings. > > An example is the Sob check_function for patch files: > | $ ./utils/check-package --i Sob $(git ls-files) >/dev/null > | 369301 lines processed > | 46 warnings generated > Currently these warnings are listed when calling check-package directly, > and also at the output of pkg-stats, but the check_function does not run > on 'make check-package' (that is used to catch regressions on GitLab CI > 'check-package' job) until all warnings in the tree are fixed. > This (theoretically) allows new .patch files be added without SoB, > without the GitLab CI catching it. > > So add a way to check-package itself ignore current warnings, while > still catching new files that do not follow that new check_function. > > Add a file named .checkpackageignore to the buildroot topdir. > It contains the list of check_functions that are expected to fail for > each given intree file tested by check-package. > Each entries is in the format: > [ ...] > > These are 2 examples of possible entries: > package/initscripts/init.d/rcK ConsecutiveEmptyLines EmptyLastLine Shellcheck > utils/test-pkg Shellcheck > > Keeping such a list allows us to have fine-grained control over which > warning to ignore. > > In order to avoid this list to grow indefinitely, containing entries for > files that are already fixed, make each entry an 'expected to fail' > instead of just an 'ignore', and generate a warning if a check_function > that was expect to fail for a given files does not generate that > warning. > Unfortunately one case that do not generate warning is an entry for a > file that is deleted in a later commit. > > Add also a new option --ignore-list that can be used: > - by pkg-stats > - by developers willing to reduce the intree ignore list > - by developers of br2-external trees that want its own ignore list > - for debug and tests purposes > > When using for a br2-external each entry in the ignore file is relative > to the directory that contains the ignore file. Since calling > check-package -b already uses relative paths to the directory it was > called from, when a developer wants a ignore file for a br2-external > he/she must call check-package from the directory that contains it. > For instance, with these files: > /path/to/br2-external/.checkpackageignore > /path/to/br2-external/package/mypackage/mypackage.mk > The file .checkpackageignore must contain entries in the format: > package/mypackage/mypackage.mk EmptyLastLine > and the developer must call check-package this way: > $ cd /path/to/br2-external/ && \ > /otherpath/to/check-package \ > --ignore-list=.checkpackageignore \ > -b package/mypackage/mypackage.mk > > This is one more step towards standardizing the use of just > 'make check-package' before submitting patches to the list. > > Cc: Sen Hastings > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - rename the patch We finally applied this, but we did one change: now by default check-package does not ignore any error. You have to explicitly pass it an ignore list for it to ignore some errors. This way by default check-package is noisy, and you need to do some action to silence some of the warnings. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:23:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:23:01 +0100 Subject: [Buildroot] [PATCH v2 02/14] support/testing: test check-package ignore list In-Reply-To: <20220731193521.1217825-3-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-3-ricardo.martincoski@gmail.com> Message-ID: <20230206222301.16570876@windsurf> On Sun, 31 Jul 2022 16:35:09 -0300 Ricardo Martincoski wrote: > Extend test_check_package to also check the ignore list functionality. > Check: > - the entries in the ignore list use relative path; > - an entry in the ignore list actually ignores the warning; > - an outdated entry in the ignore list generates a warning by its own, > preventing the ignoring list to grow indefinitely. > > For this to work, add 3 test fixtures, listing entries for an > pre-existing file in the br2-external used in the test. > > Signed-off-by: Ricardo Martincoski We adjusted the test cases to the changes we did on PATCH 01/14, and applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:23:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:23:07 +0100 Subject: [Buildroot] [PATCH v2 03/14] Makefile: add target to update .checkpackageignore In-Reply-To: <20220731193521.1217825-4-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-4-ricardo.martincoski@gmail.com> Message-ID: <20230206222307.74337e30@windsurf> On Sun, 31 Jul 2022 16:35:10 -0300 Ricardo Martincoski wrote: > When a developer fixes an ignored warning from check-package, he/she > needs to update .checkpackageignore > By running './utils/docker-run make check-package' the developer > receives a warning about this. > Make that change easier to make, by adding a helper target on Makefile. > > Add an option --failed-only to check-package that generates output in > the format: > [ ...] > This is the very same format used by check-package ignore file. > > Add the phony target .checkpackageignore > > So one can update the ignore file using: > $ ./utils/docker-run make .checkpackageignore > > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - on check-package, do not return error code when --failed-only is > used > - add a target to the makefile > - completely rewrite commit message, in order to clarify why it is > needed > --- > Makefile | 5 +++++ > utils/check-package | 13 ++++++++++++- > 2 files changed, 17 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:23:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:23:25 +0100 Subject: [Buildroot] [PATCH v2 04/14] Makefile: make check-package assume a git tree In-Reply-To: <20220731193521.1217825-5-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-5-ricardo.martincoski@gmail.com> Message-ID: <20230206222325.09201d23@windsurf> On Sun, 31 Jul 2022 16:35:11 -0300 Ricardo Martincoski wrote: > ... just like check-flake8 already does. > > When a new check_function is added to check-package, often there are > files in the tree that would generate warnings. > > An example is the Sob check_function for patch files: > | $ ./utils/check-package --i Sob $(git ls-files) >/dev/null > | 369301 lines processed > | 46 warnings generated > Currently these warnings are listed when calling check-package directly, > and also at the output of pkg-stats, but the check_function does not run > on 'make check-package' (that is used to catch regressions on GitLab CI > 'check-package' job) until all warnings in the tree are fixed. > This (theoretically) allows new .patch files be added without SoB, > without the GitLab CI catching it. > > Since now check-package has an ignore file to list all warnings in the > tree, that will eventually be fixed, there is no need to filter the > files passed to check-package. > So test all files in the tree when 'make check-package' is called. > It brings following advantages; > - any new check_function added to check-package takes place immediately > for new files; > - adding new check_functions is less traumatic to the developer doing > this, since he/she does not need anymore to fix all warnings in the > tree before the new check_function takes effect; > - prevent regressions, e.g. ANY new .patch file must have SoB; > - as a side-effect, print a single statistics line as output of > 'make ckeck-package'. > > But just enabling the check would generate many warnings when > 'make check-package' is called, so update the ignore file by using: > $ ./utils/docker-run make .checkpackageignore > > Notice: in order to ensure reproducible results, one should run 'make > check-package' and 'make .checkpackageignore' inside the docker image, > otherwise a variation in shellcheck version (installed in the host) can > produce different results. > > Signed-off-by: Ricardo Martincoski Applied to master after regenerating the ignore file, as requested, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:23:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:23:28 +0100 Subject: [Buildroot] [PATCH v2 05/14] docs/manual: check-package before submitting patch In-Reply-To: <20220731193521.1217825-6-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-6-ricardo.martincoski@gmail.com> Message-ID: <20230206222328.5b601f6d@windsurf> On Sun, 31 Jul 2022 16:35:12 -0300 Ricardo Martincoski wrote: > Add 'utils/docker-run make check-package' to the default workflow of > submitting patches, just after the rebase and before using format-patch. > > Cc: Thomas De Schampheleire > Cc: Romain Naour > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - since the automatic run inside docker was removed from the series, > use a 'good default' to newcomers, that ensures repdroducible > results, by mentioning to use docker-run > - add a small description of what check-package really does (Romain) > --- > docs/manual/contribute.txt | 6 ++++++ > 1 file changed, 6 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:24:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:24:08 +0100 Subject: [Buildroot] [PATCH v2 06/14] support/docker: add python3-magic In-Reply-To: <20220731193521.1217825-7-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-7-ricardo.martincoski@gmail.com> Message-ID: <20230206222408.7b238961@windsurf> On Sun, 31 Jul 2022 16:35:13 -0300 Ricardo Martincoski wrote: > It will be needed by check-package to run checks according to the file > type (the same determined by the command 'file'). > > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - none Applied to master, thanks. I stopped applying there, because we now need to regenerate the Docker container image, push it on the Gitlab CI registry, and update .gitlab-ci.yml. And I must say I have no idea how to do this :-) Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:26:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:26:24 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-bootlin: update to 2022.08 Message-ID: <20230206212649.6B32483D19@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=452365a385ef35e808eb2eb669d1e3227c7399dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit is the result of running support/scripts/gen-bootlin-toolchains now that 2022.08 toolchains have been made available. Signed-off-by: Thomas Petazzoni --- .../tests/toolchain/test_external_bootlin.py | 163 +++ .../toolchain-external-bootlin/Config.in.options | 1098 +++++++++++++------- .../toolchain-external-bootlin.hash | 798 +++++++------- .../toolchain-external-bootlin.mk | 454 ++++---- 4 files changed, 1547 insertions(+), 966 deletions(-) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Mon Feb 6 21:28:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:28:02 +0100 Subject: [Buildroot] [PATCH] toolchain/toolchain-external/toolchain-external-bootlin: update to 2022.08 In-Reply-To: <20220924205358.1489231-1-thomas.petazzoni@bootlin.com> References: <20220924205358.1489231-1-thomas.petazzoni@bootlin.com> Message-ID: <20230206222802.4e235104@windsurf> On Sat, 24 Sep 2022 22:53:58 +0200 Thomas Petazzoni wrote: > This commit is the result of running > support/scripts/gen-bootlin-toolchains now that 2022.08 toolchains > have been made available. > > Signed-off-by: Thomas Petazzoni > --- > .../tests/toolchain/test_external_bootlin.py | 163 +++ > .../Config.in.options | 1098 +++++++++++------ > .../toolchain-external-bootlin.hash | 798 ++++++------ > .../toolchain-external-bootlin.mk | 454 ++++--- > 4 files changed, 1547 insertions(+), 966 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:30:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:30:00 +0100 Subject: [Buildroot] [git commit] package/gdal: bump version to 3.5.2 Message-ID: <20230206213335.36B0E83D2D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f20611347fcce58f89f1fedf2cebaf8b2e077f67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Dominik Michael Rauh Signed-off-by: Thomas Petazzoni --- package/gdal/gdal.hash | 6 +++--- package/gdal/gdal.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gdal/gdal.hash b/package/gdal/gdal.hash index 826a7f0b45..ab77d7840d 100644 --- a/package/gdal/gdal.hash +++ b/package/gdal/gdal.hash @@ -1,6 +1,6 @@ -# md5 from: https://download.osgeo.org/gdal/3.5.1/gdal-3.5.1.tar.xz.md5, sha256 locally computed: -md5 4b7981efbeed69c06c79fb65d0a60d83 gdal-3.5.1.tar.xz -sha256 d12c30a9eacdeaab493c0d1c9f88eb337c9cbb5bb40744c751bdd5a5af166ab6 gdal-3.5.1.tar.xz +# md5 from: https://download.osgeo.org/gdal/3.5.2/gdal-3.5.2.tar.xz.md5, sha256 locally computed: +md5 821b3b0637ebada5d20dbefb2e3ec964 gdal-3.5.2.tar.xz +sha256 0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2 gdal-3.5.2.tar.xz # Hashes of license files: sha256 fac0116e799ca4de79b076ee04863b5e2b69541ea3664b9bb108c81a5355f16a LICENSE.TXT diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 2d6dff1a93..a3b11c53af 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -4,7 +4,7 @@ # ################################################################################ -GDAL_VERSION = 3.5.1 +GDAL_VERSION = 3.5.2 GDAL_SITE = https://download.osgeo.org/gdal/$(GDAL_VERSION) GDAL_SOURCE = gdal-$(GDAL_VERSION).tar.xz GDAL_LICENSE = MIT, many others From thomas.petazzoni at bootlin.com Mon Feb 6 21:34:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:34:05 +0100 Subject: [Buildroot] [PATCH v2] package/gdal: bump version to 3.5.2 In-Reply-To: <20220926185047.301080-1-dmrauh@posteo.de> References: <20220926185047.301080-1-dmrauh@posteo.de> Message-ID: <20230206223405.67ec0a5a@windsurf> On Mon, 26 Sep 2022 18:50:47 +0000 Dominik Michael Rauh wrote: > Signed-off-by: Dominik Michael Rauh > --- > Changes v1 -> v2: > - Fix commmit message Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:39:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:39:33 +0100 Subject: [Buildroot] [PATCH 0/2] dracut: extend support and tests (branch yem/dracut) In-Reply-To: References: Message-ID: <20230206223933.63f0a397@windsurf> On Tue, 20 Sep 2022 20:37:09 +0200 "Yann E. MORIN" wrote: > Yann E. MORIN (2): > fs/cpio: allow users to provide their own dracut modules > support/tests/cpio: extend runtime tests for extra dract modules Both finally applied. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Mon Feb 6 21:39:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 22:39:15 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require FindBin perl package for libopenssl Message-ID: <20230206213956.B167A83D34@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5aab8c59d5b310540105166e7b48faf3d5bd200b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/5d1/5d10f4f545dccf126e3f5b5efce777a393c5e7bc/ http://autobuild.buildroot.net/results/7c2/7c2df31c6eb34b68e460e092d8c262bdc6c8f25a/ The configure script of (host-)libopenssl needs the FindBin perl module on the host: Can't locate FindBin.pm in @INC (you may need to install the FindBin module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./Configure line 15. BEGIN failed--compilation aborted at ./Configure line 15. As this is needed for both libopenssl and host-libopenssl (which does not have a corresponding config symbol in the .config), we have to require it unconditionally. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 4b5012b807..afd30008e8 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -268,6 +268,7 @@ fi required_perl_modules="Data::Dumper" # Needed to build host-autoconf required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake +required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" From yann.morin.1998 at free.fr Mon Feb 6 21:40:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 22:40:10 +0100 Subject: [Buildroot] [git commit] boot/gummiboot: remove package Message-ID: <20230206214131.16EAC83D46@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=488a87514e21877d25d4f0a31bbb9f71bd839aab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The gummiboot package currently fails to build due to incompatibilies with recent versions of the gnu-efi code. It turns out that gummiboot has been marked deprecated/obsolete by its maintainer since July 2015: https://cgit.freedesktop.org/gummiboot/commit/?id=55df1539c9d330732e88bd196afee386db6e4a1d&utm_source=anzwix Indeed, gummiboot ended up being integrated as part of systemd as systemd-boot. While it made sense for a while to keep it as a separate standalone package, it is not possible to maintain it in Buildroot without an active upstream, and there are other options for simple EFI bootloaders these days. Therefore, let's retire this package. Fixes: http://autobuild.buildroot.net/results/5929104a868d2f69ec1b71e5e897b6d1ebf347cf/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- Config.in.legacy | 8 ++++ DEVELOPERS | 2 - boot/Config.in | 1 - ...-Allow-building-with-newer-glibc-versions.patch | 31 ------------- ...x-linking-for-non-host-compatible-targets.patch | 54 ---------------------- boot/gummiboot/Config.in | 24 ---------- boot/gummiboot/buildroot.conf | 4 -- boot/gummiboot/gummiboot.mk | 41 ---------------- boot/gummiboot/loader.conf | 2 - 9 files changed, 8 insertions(+), 159 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 8b7ecd840b..61686fdd11 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2023.02" +config BR2_TARGET_GUMMIBOOT + bool "gummiboot removed" + select BR2_LEGACY + help + gummiboot has been deprecated since 2015, with no further + updates. It became integrated into the systemd project as + systemd-boot. + config BR2_PACKAGE_IPUTILS_NINFOD bool "iputils 20221126 removed ninfod" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 50c681df2c..f8acf8776c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -845,7 +845,6 @@ N: Ernesto L. Williams Jr F: package/szip/ N: Esben Haabendal -F: boot/gummiboot/ F: package/python-kiwisolver/ N: Etienne Carriere @@ -2865,7 +2864,6 @@ F: boot/beaglev-ddrinit/ F: boot/beaglev-secondboot/ F: boot/boot-wrapper-aarch64/ F: boot/grub2/ -F: boot/gummiboot/ F: configs/beaglev_defconfig F: configs/stm32mp157c_dk2_defconfig F: package/android-tools/ diff --git a/boot/Config.in b/boot/Config.in index 2d4d077632..58366e035e 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -12,7 +12,6 @@ source "boot/binaries-marvell/Config.in" source "boot/boot-wrapper-aarch64/Config.in" source "boot/edk2/Config.in" source "boot/grub2/Config.in" -source "boot/gummiboot/Config.in" source "boot/lpc32xxcdl/Config.in" source "boot/mv-ddr-marvell/Config.in" source "boot/mxs-bootlets/Config.in" diff --git a/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch b/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch deleted file mode 100644 index b35cd499bc..0000000000 --- a/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 40ab4167b5a45c772304a879c71b47d54de3b0e3 Mon Sep 17 00:00:00 2001 -From: Esben Haabendal -Date: Wed, 20 Mar 2019 14:19:40 +0100 -Subject: [PATCH] Allow building with newer glibc versions - -Newer glibc versions does not include sys/sysmacros.h from sys/types.h -anymore. Including it unconditionally should be safe. - -See https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html for why -this was done. - -Signed-off-by: Esben Haabendal ---- - src/setup/setup.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/setup/setup.c b/src/setup/setup.c -index 6a4275a2ae36..53429375a146 100644 ---- a/src/setup/setup.c -+++ b/src/setup/setup.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #include "efivars.h" - --- -2.21.0 - diff --git a/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch b/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch deleted file mode 100644 index 7104a581e2..0000000000 --- a/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch +++ /dev/null @@ -1,54 +0,0 @@ -From fc05ced797b87286b8ec7303fe32bf200a072972 Mon Sep 17 00:00:00 2001 -From: Esben Haabendal -Date: Mon, 18 Mar 2019 11:14:31 +0100 -Subject: [PATCH] Fix linking for non-host compatible targets - -Without this, gummiboot build system will use host 'ld' when linking -target binary, which is obviously not a good idea. - -Signed-off-by: Esben Haabendal ---- - Makefile.am | 4 ++-- - configure.ac | 4 ++++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6568a355ed74..9051dd44edd9 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -142,7 +142,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) - $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ - - $(gummiboot_solib): $(gummiboot_objects) -- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(gummiboot_objects) \ -+ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(gummiboot_objects) \ - -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ - nm -D -u $@ | grep ' U ' && exit 1 || : - .DELETE_ON_ERROR: $(gummboot_solib) -@@ -177,7 +177,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) - $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ - - $(stub_solib): $(stub_objects) -- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(stub_objects) \ -+ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(stub_objects) \ - -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ - nm -D -u $@ | grep ' U ' && exit 1 || : - .DELETE_ON_ERROR: $(gummboot_solib) -diff --git a/configure.ac b/configure.ac -index 27bbe1d73396..b948696c220b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,6 +40,10 @@ dnl Don't try to use things like -std=c99 for efi compilation - EFI_CC=$CC - AC_SUBST([EFI_CC]) - -+dnl Allow specifying linker compatible with the compiler -+EFI_LD=$LD -+AC_SUBST([EFI_LD]) -+ - AC_PROG_CC_C99 - AM_PROG_CC_C_O - AC_PROG_GCC_TRADITIONAL --- -2.21.0 - diff --git a/boot/gummiboot/Config.in b/boot/gummiboot/Config.in deleted file mode 100644 index 1b5c4279f7..0000000000 --- a/boot/gummiboot/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_TARGET_GUMMIBOOT - bool "gummiboot" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS - select BR2_PACKAGE_GNU_EFI - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - help - gummiboot is a simple UEFI boot manager which executes - configured EFI images. The default entry is selected by a - configured pattern (glob) or an on-screen menu. - - gummiboot operates on the EFI System Partition (ESP) - only. Configuration file fragments, kernels, initrds, other - EFI images need to reside on the ESP. Linux kernels need to - be built with CONFIG_EFI_STUB to be able to be directly - executed as an EFI image. - - See the Grub2 help text for details on preparing an EFI - capable disk image using Gummiboot: the instructions are - exactly the same, except that the Gummiboot configuration - files will be located in /loader/ inside the EFI partition. - - http://freedesktop.org/wiki/Software/gummiboot/ diff --git a/boot/gummiboot/buildroot.conf b/boot/gummiboot/buildroot.conf deleted file mode 100644 index 8a6f02e56a..0000000000 --- a/boot/gummiboot/buildroot.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Buildroot -version 1 -linux /bzImage -options console=ttyS0 root=/dev/sda2 diff --git a/boot/gummiboot/gummiboot.mk b/boot/gummiboot/gummiboot.mk deleted file mode 100644 index eb1f3da78c..0000000000 --- a/boot/gummiboot/gummiboot.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# gummiboot -# -################################################################################ - -GUMMIBOOT_SITE = https://gitlab.freedesktop.org/archived-projects/gummiboot.git -GUMMIBOOT_SITE_METHOD = git -GUMMIBOOT_VERSION = 2bcd919c681c952eb867ef1bdb458f1bc49c2d55 -GUMMIBOOT_LICENSE = LGPL-2.1+ -GUMMIBOOT_LICENSE_FILES = LICENSE - -# The git archive does not have the autoconf/automake stuff generated. -GUMMIBOOT_AUTORECONF = YES -GUMMIBOOT_DEPENDENCIES = gnu-efi host-pkgconf util-linux -GUMMIBOOT_INSTALL_TARGET = NO -GUMMIBOOT_INSTALL_IMAGES = YES - -ifeq ($(BR2_i386),y) -GUMMIBOOT_IMGARCH = ia32 -else ifeq ($(BR2_x86_64),y) -GUMMIBOOT_IMGARCH = x64 -endif - -GUMMIBOOT_CONF_OPTS = \ - --host=$(BR2_ARCH) \ - --with-efi-libdir=$(STAGING_DIR)/usr/lib \ - --with-efi-ldsdir=$(STAGING_DIR)/usr/lib \ - --with-efi-includedir=$(STAGING_DIR)/usr/include \ - --disable-manpages - -define GUMMIBOOT_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/gummiboot$(GUMMIBOOT_IMGARCH).efi \ - $(BINARIES_DIR)/efi-part/EFI/BOOT/boot$(GUMMIBOOT_IMGARCH).efi - $(INSTALL) -D -m 0644 boot/gummiboot/loader.conf \ - $(BINARIES_DIR)/efi-part/loader/loader.conf - $(INSTALL) -D -m 0644 boot/gummiboot/buildroot.conf \ - $(BINARIES_DIR)/efi-part/loader/entries/buildroot.conf -endef - -$(eval $(autotools-package)) diff --git a/boot/gummiboot/loader.conf b/boot/gummiboot/loader.conf deleted file mode 100644 index 93b77b8f93..0000000000 --- a/boot/gummiboot/loader.conf +++ /dev/null @@ -1,2 +0,0 @@ -timeout 3 -default buildroot From thomas.petazzoni at bootlin.com Mon Feb 6 21:46:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:46:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/mesa3d-demos: bump version to 8.5.0 In-Reply-To: <20220920200521.18064-1-ju.o@free.fr> References: <20220920200521.18064-1-ju.o@free.fr> Message-ID: <20230206224630.72b8c2cc@windsurf> On Tue, 20 Sep 2022 22:05:21 +0200 Julien Olivain wrote: > The package build system changed from autotools to meson. Autotools > was deprecated in commit [1], which is included in this 8.5.0 > version. It was definitevely removed soon after, in commit [2]. > > The package patch file making libgl optional was fully rewritten > for meson. > > This patch also updates the old ftp _SITE url to the new https one, > published in the project README.rst file. See [3]. > > This patch also removes openvg and freetype2 dependencies, as their > support was removed in commit [4]. The 'gbm' option is removed, and > the option 'libdrm' is added. > > The md5 and sha1 entries in hash files are also removed, to keep only > sha256 and sha512 from the release announce email [5]. > > For change log, see the release announce [5]. > > [1] https://gitlab.freedesktop.org/mesa/demos/-/commit/2df8e9710834c3b42ce5cfb67b7662c110ab904e > [2] https://gitlab.freedesktop.org/mesa/demos/-/commit/abfead37587f1f2e124bdfcde755b6e90421b538 > [3] https://gitlab.freedesktop.org/mesa/demos/-/blob/mesa-demos-8.5.0/README.rst > [4] https://gitlab.freedesktop.org/mesa/demos/-/commit/e6d0d9a8682c544870fd41983ea2e0484b9767b1 > [5] https://lists.freedesktop.org/archives/mesa-announce/2022-May/000677.html > > Signed-off-by: Julien Olivain > --- > ...s-makes-opengl-an-optional-component.patch | 157 ++++++++++-------- > package/mesa3d-demos/mesa3d-demos.hash | 8 +- > package/mesa3d-demos/mesa3d-demos.mk | 56 +++---- > 3 files changed, 112 insertions(+), 109 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit] fs/cpio: allow users to provide their own dracut modules Message-ID: <20230206214646.576DE83DAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb6e466c102306cfcb1b459d91aa5440f6b8a621 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Dracut modules can only be looked for in HOST_DIR/lib/dracut/modules.d/ as dracut does not offer the possibility to look elsewhere. Installing files in HOST_DIR/ can do done either from a host-package, or via a post-built script; there is no overlay like there is for target/. This is a bit cumbersome. Additional modules are most probably developped in a relatively tight loop with the configuration files, so it makes sense to expose both close together. Add an option to the fs/cpio filesystem, so users can point to a list of modules to install. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Thierry Bultel Cc: Adam Duskett Signed-off-by: Thomas Petazzoni --- fs/cpio/Config.in | 5 +++++ fs/cpio/cpio.mk | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in index bec2d9dca2..4d38276c88 100644 --- a/fs/cpio/Config.in +++ b/fs/cpio/Config.in @@ -29,6 +29,11 @@ endchoice if BR2_TARGET_ROOTFS_CPIO_DRACUT +config BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES + string "extra dracut modules" + help + Space-separated list of directories containing dracut modules. + config BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES string "dracut configuration files" default "fs/cpio/dracut.conf" diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk index 061f4a18f1..00ab6a8f82 100644 --- a/fs/cpio/cpio.mk +++ b/fs/cpio/cpio.mk @@ -50,6 +50,13 @@ else ifeq ($(BR2_TARGET_ROOTFS_CPIO_DRACUT),y) ROOTFS_CPIO_DEPENDENCIES += host-dracut +ROOTFS_CPIO_DRACUT_MODULES = $(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES)) +ifeq ($(BR_BUILDING),y) +ifneq ($(words $(ROOTFS_CPIO_DRACUT_MODULES)),$(words $(sort $(notdir $(ROOTFS_CPIO_DRACUT_MODULES))))) +$(error No two dracut modules can have the same basename, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES setting) +endif +endif + ROOTFS_CPIO_DRACUT_CONF_FILES = $(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES)) ifeq ($(BR_BUILDING),y) ifeq ($(ROOTFS_CPIO_DRACUT_CONF_FILES),) @@ -68,11 +75,14 @@ ROOTFS_CPIO_OPTS += --no-kernel endif define ROOTFS_CPIO_CMD - mkdir -p $(ROOTFS_CPIO_DIR)/tmp $(ROOTFS_CPIO_DIR)/confdir + mkdir -p $(ROOTFS_CPIO_DIR)/tmp $(ROOTFS_CPIO_DIR)/confdir $(HOST_DIR)/lib/dracut/modules.d touch $(ROOTFS_CPIO_DIR)/empty-config $(foreach cfg,$(ROOTFS_CPIO_DRACUT_CONF_FILES), \ cp $(cfg) $(ROOTFS_CPIO_DIR)/confdir/$(notdir $(cfg)) ) + $(foreach m,$(ROOTFS_CPIO_DRACUT_MODULES), \ + cp -a $(m)/* $(HOST_DIR)/lib/dracut/modules.d/ + ) $(HOST_DIR)/bin/dracut \ $(ROOTFS_CPIO_OPTS) \ -c $(ROOTFS_CPIO_DIR)/empty-config \ From thomas.petazzoni at bootlin.com Mon Feb 6 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit] support/tests/cpio: extend runtime tests for extra dract modules Message-ID: <20230206214646.6272D83DAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=557c68fbd29551f4db6215ab03abfaaa54c6f78f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a basic module that installs a single file, to check that it is properly accounted for. Reported-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN Cc: Thierry Bultel Cc: Adam Duskett Signed-off-by: Thomas Petazzoni --- support/testing/tests/fs/test_cpio.py | 5 ++++- .../tests/fs/test_cpio/modules/99cramfs/module-setup.sh | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/fs/test_cpio.py b/support/testing/tests/fs/test_cpio.py index 8c0d357994..172af579bb 100644 --- a/support/testing/tests/fs/test_cpio.py +++ b/support/testing/tests/fs/test_cpio.py @@ -41,9 +41,11 @@ class TestCpioDracutBase(infra.basetest.BRTest): BR2_PACKAGE_PV=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_DRACUT=y + BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES="{}" BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES="{}" # BR2_TARGET_ROOTFS_TAR is not set - """.format(" ".join(["fs/cpio/dracut.conf", + """.format("support/testing/tests/fs/test_cpio/modules", + " ".join(["fs/cpio/dracut.conf", "support/testing/tests/fs/test_cpio/dracut-cramfs.conf"])) def check_dracut(self): @@ -57,6 +59,7 @@ class TestCpioDracutBase(infra.basetest.BRTest): self.assertEqual(out.find("bin/pv"), -1) # libz should be, because of cramfs self.assertNotEqual(out.find("usr/bin/mkcramfs"), -1) + self.assertNotEqual(out.find("usr/bin/cramfsck"), -1) self.assertNotEqual(out.find("usr/lib/libz.so"), -1) exit_code = boot_img(self.emulator, diff --git a/support/testing/tests/fs/test_cpio/modules/99cramfs/module-setup.sh b/support/testing/tests/fs/test_cpio/modules/99cramfs/module-setup.sh new file mode 100755 index 0000000000..60706c8bd9 --- /dev/null +++ b/support/testing/tests/fs/test_cpio/modules/99cramfs/module-setup.sh @@ -0,0 +1,11 @@ +check() { + return 0 +} + +depends() { + return 0 +} + +install() { + inst_multiple /usr/bin/cramfsck +} From thomas.petazzoni at bootlin.com Mon Feb 6 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit] package/mesa3d-demos: bump version to 8.5.0 Message-ID: <20230206214646.6C84983DB0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa75c4a3054e0cd3457f9e50deb1b9c06325c242 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The package build system changed from autotools to meson. Autotools was deprecated in commit [1], which is included in this 8.5.0 version. It was definitevely removed soon after, in commit [2]. The package patch file making libgl optional was fully rewritten for meson. This patch also updates the old ftp _SITE url to the new https one, published in the project README.rst file. See [3]. This patch also removes openvg and freetype2 dependencies, as their support was removed in commit [4]. The 'gbm' option is removed, and the option 'libdrm' is added. The md5 and sha1 entries in hash files are also removed, to keep only sha256 and sha512 from the release announce email [5]. For change log, see the release announce [5]. [1] https://gitlab.freedesktop.org/mesa/demos/-/commit/2df8e9710834c3b42ce5cfb67b7662c110ab904e [2] https://gitlab.freedesktop.org/mesa/demos/-/commit/abfead37587f1f2e124bdfcde755b6e90421b538 [3] https://gitlab.freedesktop.org/mesa/demos/-/blob/mesa-demos-8.5.0/README.rst [4] https://gitlab.freedesktop.org/mesa/demos/-/commit/e6d0d9a8682c544870fd41983ea2e0484b9767b1 [5] https://lists.freedesktop.org/archives/mesa-announce/2022-May/000677.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...-demos-makes-opengl-an-optional-component.patch | 157 +++++++++++---------- package/mesa3d-demos/mesa3d-demos.hash | 8 +- package/mesa3d-demos/mesa3d-demos.mk | 56 ++++---- 3 files changed, 112 insertions(+), 109 deletions(-) diff --git a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch index b328fca810..e51b6f1a2a 100644 --- a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch +++ b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch @@ -1,88 +1,101 @@ -From bb0ffae7164d296d32da24fa5499534de259169a Mon Sep 17 00:00:00 2001 -From: Spenser Gilliland -Date: Sat, 24 Feb 2018 11:36:17 +0100 +From 9ec9f7b4d0ef5e799ca4cc5103163e4630d184d8 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 16 Sep 2022 22:30:59 +0200 Subject: [PATCH] demos: makes opengl an optional component -Signed-off-by: Spenser Gilliland -[Romain: convert to git patch, rebase on 8.4.0] -Signed-off-by: Romain Naour +This patch is a port of [1] for the new meson build system. + +[1]. +https://git.busybox.net/buildroot/tree/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch?h=2022.08 + +Signed-off-by: Julien Olivain --- - configure.ac | 12 +++++++++++- - src/egl/opengl/Makefile.am | 2 ++ - src/util/Makefile.am | 2 ++ - 3 files changed, 15 insertions(+), 1 deletion(-) + meson.build | 19 ++++++++++++------- + meson_options.txt | 1 + + src/egl/meson.build | 5 ++++- + src/meson.build | 4 +++- + 4 files changed, 20 insertions(+), 9 deletions(-) -diff --git a/configure.ac b/configure.ac -index 0b5e9a76..24298c44 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -51,6 +51,14 @@ m4_ifndef([PKG_PROG_PKG_CONFIG], - ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])]) - PKG_PROG_PKG_CONFIG() +diff --git a/meson.build b/meson.build +index e1968fab..a15699d6 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,7 +38,10 @@ add_project_arguments( + dep_m = cc.find_library('m', required : false) + dep_winmm = cc.find_library('winmm', required : false) -+AC_ARG_ENABLE([gl], -+ [AS_HELP_STRING([--enable-gl], -+ [enable GL library @<:@default=no@:>@])], -+ [gl_enabled="$enableval"], -+ [gl_enabled=auto]) -+ -+if test "x$gl_enabled" != "xno"; then -+ - dnl Get the pkg-config definitions for libGL. We include a fallback - dnl path for GL implementation that don't provide a .pc file - PKG_CHECK_MODULES(GL, [gl], [], [ -@@ -112,6 +120,8 @@ PKG_CHECK_MODULES(GLU, [glu], [], - DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" - DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" +-dep_gl = dependency('gl') ++dep_gl = dependency('gl', required : get_option('gl')) ++if not dep_gl.found() ++ add_project_arguments('-DEGL_NO_X11=1', language: 'c') ++endif -+fi -+ - AC_ARG_ENABLE([egl], - [AS_HELP_STRING([--enable-egl], - [enable EGL library @<:@default=auto@:>@])], -@@ -302,7 +312,7 @@ AC_SUBST([MESA_GLAPI]) - AC_SUBST([WAYLAND_CFLAGS]) - AC_SUBST([WAYLAND_LIBS]) + dep_gles1 = dependency('glesv1_cm', required : get_option('gles1')) + dep_gles2 = dependency('glesv2', required : get_option('gles2')) +@@ -75,13 +78,15 @@ endif -- -+AM_CONDITIONAL(HAVE_GL, test "x$gl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") -diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am -index 6d184ff6..219ab850 100644 ---- a/src/egl/opengl/Makefile.am -+++ b/src/egl/opengl/Makefile.am -@@ -56,6 +56,7 @@ endif - endif + dep_threads = dependency('threads') - if HAVE_EGL -+if HAVE_GL - bin_PROGRAMS = \ - eglinfo - noinst_PROGRAMS = \ -@@ -64,6 +65,7 @@ noinst_PROGRAMS = \ - $(EGL_X11_DEMOS) \ - $(EGL_WL_DEMOS) +-dep_glu = dependency('glu', required : dep_x11.found()) +-if not dep_glu.found() +- _glu_name = 'GLU' +- if host_machine.system() == 'windows' +- _glu_name = 'glu32' ++if dep_gl.found() ++ dep_glu = dependency('glu', required : dep_x11.found()) ++ if not dep_glu.found() ++ _glu_name = 'GLU' ++ if host_machine.system() == 'windows' ++ _glu_name = 'glu32' ++ endif ++ dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h') + endif +- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h') endif + + # GBM is needed for EGL on KMS +diff --git a/meson_options.txt b/meson_options.txt +index ddadd2e3..f5405698 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,5 +1,6 @@ + option('with-glut', type : 'string') + option('egl', type : 'feature') ++option('gl', type : 'feature') + option('gles1', type : 'feature') + option('gles2', type : 'feature') + option('osmesa', type : 'feature') +diff --git a/src/egl/meson.build b/src/egl/meson.build +index d1846921..42bf8ecd 100644 +--- a/src/egl/meson.build ++++ b/src/egl/meson.build +@@ -19,7 +19,10 @@ + # SOFTWARE. + + subdir('eglut') +-subdir('opengl') ++ ++if dep_gl.found() ++ subdir('opengl') +endif - egltri_x11_SOURCES = egltri.c - eglgears_x11_SOURCES = eglgears.c -diff --git a/src/util/Makefile.am b/src/util/Makefile.am -index 759a293a..012b9c75 100644 ---- a/src/util/Makefile.am -+++ b/src/util/Makefile.am -@@ -27,7 +27,9 @@ AM_CFLAGS = \ - AM_LDFLAGS = \ - $(DEMO_LIBS) + if dep_gles1.found() + subdir('opengles1') +diff --git a/src/meson.build b/src/meson.build +index 39cac78d..7607c6de 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -20,7 +20,9 @@ + + subdir('glad') -+if HAVE_GL - noinst_LTLIBRARIES = libutil.la +-subdir('util') ++if dep_gl.found() ++ subdir('util') +endif - if HAVE_GLUT - AM_CFLAGS += \ + if dep_glut.found() + subdir('demos') -- -2.14.3 +2.37.3 diff --git a/package/mesa3d-demos/mesa3d-demos.hash b/package/mesa3d-demos/mesa3d-demos.hash index 8a4955f120..b0cfb88816 100644 --- a/package/mesa3d-demos/mesa3d-demos.hash +++ b/package/mesa3d-demos/mesa3d-demos.hash @@ -1,5 +1,3 @@ -# From https://lists.freedesktop.org/archives/mesa-dev/2018-February/186542.html -md5 6b65a02622765522176d00f553086fa3 mesa-demos-8.4.0.tar.bz2 -sha1 57ba892e919fa22ce3db9f25e7331a6fa33c652c mesa-demos-8.4.0.tar.bz2 -sha256 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d mesa-demos-8.4.0.tar.bz2 -sha512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957 mesa-demos-8.4.0.tar.bz2 +# From https://lists.freedesktop.org/archives/mesa-announce/2022-May/000677.html +sha256 cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1 mesa-demos-8.5.0.tar.bz2 +sha512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8 mesa-demos-8.5.0.tar.bz2 diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index 6b5262a2e9..5f7fe8e24d 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -4,77 +4,69 @@ # ################################################################################ -MESA3D_DEMOS_VERSION = 8.4.0 +MESA3D_DEMOS_VERSION = 8.5.0 MESA3D_DEMOS_SOURCE = mesa-demos-$(MESA3D_DEMOS_VERSION).tar.bz2 -MESA3D_DEMOS_SITE = ftp://ftp.freedesktop.org/pub/mesa/demos -# 0001-demos-makes-opengl-an-optional-component.patch -MESA3D_DEMOS_AUTORECONF = YES +MESA3D_DEMOS_SITE = https://archive.mesa3d.org/demos/$(MESA3D_DEMOS_VERSION) MESA3D_DEMOS_DEPENDENCIES = host-pkgconf MESA3D_DEMOS_LICENSE = MIT MESA3D_DEMOS_CONF_OPTS += \ - --disable-gles1 + -Dgles1=disabled ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy) MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext -MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11 +MESA3D_DEMOS_CONF_OPTS += -Dgl=enabled -Dx11=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-gl --disable-x11 +MESA3D_DEMOS_CONF_OPTS += -Dgl=disabled -Dx11=disabled endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) MESA3D_DEMOS_DEPENDENCIES += libegl -MESA3D_DEMOS_CONF_OPTS += --enable-egl +MESA3D_DEMOS_CONF_OPTS += -Degl=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-egl +MESA3D_DEMOS_CONF_OPTS += -Degl=disabled endif ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) MESA3D_DEMOS_DEPENDENCIES += libgles -MESA3D_DEMOS_CONF_OPTS += --enable-gles2 +MESA3D_DEMOS_CONF_OPTS += -Dgles2=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-gles2 +MESA3D_DEMOS_CONF_OPTS += -Dgles2=disabled endif -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -MESA3D_DEMOS_DEPENDENCIES += libopenvg -MESA3D_DEMOS_CONF_OPTS += --enable-vg +ifeq ($(BR2_PACKAGE_LIBDRM),y) +MESA3D_DEMOS_DEPENDENCIES += libdrm +MESA3D_DEMOS_CONF_OPTS += -Dlibdrm=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-vg +MESA3D_DEMOS_CONF_OPTS += -Dlibdrm=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) +# Meson search for gbm, but has no option to enable/disable it. See: +# https://gitlab.freedesktop.org/mesa/demos/-/blob/mesa-demos-8.5.0/meson.build#L88 +# We still add the dependency, if needed, to make sure it will always +# be detected. MESA3D_DEMOS_DEPENDENCIES += mesa3d -MESA3D_DEMOS_CONF_OPTS += --enable-gbm -else -MESA3D_DEMOS_CONF_OPTS += --disable-gbm -endif - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -MESA3D_DEMOS_DEPENDENCIES += freetype -MESA3D_DEMOS_CONF_OPTS += --enable-freetype2 -else -MESA3D_DEMOS_CONF_OPTS += --disable-freetype2 endif ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MESA3D_DEMOS_DEPENDENCIES += libfreeglut -MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr +MESA3D_DEMOS_CONF_OPTS += -Dwith-glut=$(STAGING_DIR)/usr # osmesa support depends on glut ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) -MESA3D_DEMOS_CONF_OPTS += --enable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif else -MESA3D_DEMOS_CONF_OPTS += --without-glut --disable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif ifeq ($(BR2_PACKAGE_WAYLAND),y) MESA3D_DEMOS_DEPENDENCIES += wayland -MESA3D_DEMOS_CONF_OPTS += --enable-wayland +MESA3D_DEMOS_CONF_OPTS += -Dwayland=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-wayland +MESA3D_DEMOS_CONF_OPTS += -Dwayland=disabled endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From yann.morin.1998 at free.fr Mon Feb 6 21:48:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 22:48:24 +0100 Subject: [Buildroot] [PATCH] boot/gummiboot: remove package In-Reply-To: <20220920064420.520074-1-thomas.petazzoni@bootlin.com> References: <20220920064420.520074-1-thomas.petazzoni@bootlin.com> Message-ID: <20230206214824.GA5062@scaer> Thomas, All, On 2022-09-20 08:44 +0200, Thomas Petazzoni spake thusly: > The gummiboot package currently fails to build due to incompatibilies > with recent versions of the gnu-efi code. > > It turns out that gummiboot has been marked deprecated/obsolete by its > maintainer since July 2015: > > https://cgit.freedesktop.org/gummiboot/commit/?id=55df1539c9d330732e88bd196afee386db6e4a1d&utm_source=anzwix > > Indeed, gummiboot ended up being integrated as part of systemd as > systemd-boot. While it made sense for a while to keep it as a separate > standalone package, it is not possible to maintain it in Buildroot > without an active upstream, and there are other options for simple EFI > bootloaders these days. > > Therefore, let's retire this package. > > Fixes: > > http://autobuild.buildroot.net/results/5929104a868d2f69ec1b71e5e897b6d1ebf347cf/ > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > Config.in.legacy | 8 +++ > DEVELOPERS | 2 - > boot/Config.in | 1 - > ...w-building-with-newer-glibc-versions.patch | 31 ----------- > ...king-for-non-host-compatible-targets.patch | 54 ------------------- > boot/gummiboot/Config.in | 24 --------- > boot/gummiboot/buildroot.conf | 4 -- > boot/gummiboot/gummiboot.mk | 41 -------------- > boot/gummiboot/loader.conf | 2 - > 9 files changed, 8 insertions(+), 159 deletions(-) > delete mode 100644 boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch > delete mode 100644 boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch > delete mode 100644 boot/gummiboot/Config.in > delete mode 100644 boot/gummiboot/buildroot.conf > delete mode 100644 boot/gummiboot/gummiboot.mk > delete mode 100644 boot/gummiboot/loader.conf > > diff --git a/Config.in.legacy b/Config.in.legacy > index 5f7274e84b..0114236841 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,14 @@ endif > > comment "Legacy options removed in 2022.11" > > +config BR2_TARGET_GUMMIBOOT > + bool "gummiboot removed" > + select BR2_LEGACY > + help > + gummiboot has been deprecated since 2015, with no further > + updates. It became integrated into the systemd project as > + systemd-boot. > + > config BR2_PACKAGE_GPSD_OLDSTYLE > bool "gpsd oldstyle removed" > select BR2_LEGACY > diff --git a/DEVELOPERS b/DEVELOPERS > index 14b91fca8d..b9005e6ef7 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -835,7 +835,6 @@ N: Ernesto L. Williams Jr > F: package/szip/ > > N: Esben Haabendal > -F: boot/gummiboot/ > F: package/python-kiwisolver/ > > N: Etienne Carriere > @@ -2884,7 +2883,6 @@ F: boot/beaglev-ddrinit/ > F: boot/beaglev-secondboot/ > F: boot/boot-wrapper-aarch64/ > F: boot/grub2/ > -F: boot/gummiboot/ > F: configs/beaglev_defconfig > F: configs/stm32mp157c_dk2_defconfig > F: package/android-tools/ > diff --git a/boot/Config.in b/boot/Config.in > index 40472ae07d..f53c8cd7d7 100644 > --- a/boot/Config.in > +++ b/boot/Config.in > @@ -12,7 +12,6 @@ source "boot/binaries-marvell/Config.in" > source "boot/boot-wrapper-aarch64/Config.in" > source "boot/edk2/Config.in" > source "boot/grub2/Config.in" > -source "boot/gummiboot/Config.in" > source "boot/lpc32xxcdl/Config.in" > source "boot/mv-ddr-marvell/Config.in" > source "boot/mxs-bootlets/Config.in" > diff --git a/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch b/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch > deleted file mode 100644 > index b35cd499bc..0000000000 > --- a/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From 40ab4167b5a45c772304a879c71b47d54de3b0e3 Mon Sep 17 00:00:00 2001 > -From: Esben Haabendal > -Date: Wed, 20 Mar 2019 14:19:40 +0100 > -Subject: [PATCH] Allow building with newer glibc versions > - > -Newer glibc versions does not include sys/sysmacros.h from sys/types.h > -anymore. Including it unconditionally should be safe. > - > -See https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html for why > -this was done. > - > -Signed-off-by: Esben Haabendal > ---- > - src/setup/setup.c | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/src/setup/setup.c b/src/setup/setup.c > -index 6a4275a2ae36..53429375a146 100644 > ---- a/src/setup/setup.c > -+++ b/src/setup/setup.c > -@@ -37,6 +37,7 @@ > - #include > - #include > - #include > -+#include > - > - #include "efivars.h" > - > --- > -2.21.0 > - > diff --git a/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch b/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch > deleted file mode 100644 > index 7104a581e2..0000000000 > --- a/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch > +++ /dev/null > @@ -1,54 +0,0 @@ > -From fc05ced797b87286b8ec7303fe32bf200a072972 Mon Sep 17 00:00:00 2001 > -From: Esben Haabendal > -Date: Mon, 18 Mar 2019 11:14:31 +0100 > -Subject: [PATCH] Fix linking for non-host compatible targets > - > -Without this, gummiboot build system will use host 'ld' when linking > -target binary, which is obviously not a good idea. > - > -Signed-off-by: Esben Haabendal > ---- > - Makefile.am | 4 ++-- > - configure.ac | 4 ++++ > - 2 files changed, 6 insertions(+), 2 deletions(-) > - > -diff --git a/Makefile.am b/Makefile.am > -index 6568a355ed74..9051dd44edd9 100644 > ---- a/Makefile.am > -+++ b/Makefile.am > -@@ -142,7 +142,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) > - $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ > - > - $(gummiboot_solib): $(gummiboot_objects) > -- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(gummiboot_objects) \ > -+ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(gummiboot_objects) \ > - -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ > - nm -D -u $@ | grep ' U ' && exit 1 || : > - .DELETE_ON_ERROR: $(gummboot_solib) > -@@ -177,7 +177,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) > - $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ > - > - $(stub_solib): $(stub_objects) > -- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(stub_objects) \ > -+ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(stub_objects) \ > - -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ > - nm -D -u $@ | grep ' U ' && exit 1 || : > - .DELETE_ON_ERROR: $(gummboot_solib) > -diff --git a/configure.ac b/configure.ac > -index 27bbe1d73396..b948696c220b 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -40,6 +40,10 @@ dnl Don't try to use things like -std=c99 for efi compilation > - EFI_CC=$CC > - AC_SUBST([EFI_CC]) > - > -+dnl Allow specifying linker compatible with the compiler > -+EFI_LD=$LD > -+AC_SUBST([EFI_LD]) > -+ > - AC_PROG_CC_C99 > - AM_PROG_CC_C_O > - AC_PROG_GCC_TRADITIONAL > --- > -2.21.0 > - > diff --git a/boot/gummiboot/Config.in b/boot/gummiboot/Config.in > deleted file mode 100644 > index 1b5c4279f7..0000000000 > --- a/boot/gummiboot/Config.in > +++ /dev/null > @@ -1,24 +0,0 @@ > -config BR2_TARGET_GUMMIBOOT > - bool "gummiboot" > - depends on BR2_i386 || BR2_x86_64 > - depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS > - select BR2_PACKAGE_GNU_EFI > - select BR2_PACKAGE_UTIL_LINUX > - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID > - help > - gummiboot is a simple UEFI boot manager which executes > - configured EFI images. The default entry is selected by a > - configured pattern (glob) or an on-screen menu. > - > - gummiboot operates on the EFI System Partition (ESP) > - only. Configuration file fragments, kernels, initrds, other > - EFI images need to reside on the ESP. Linux kernels need to > - be built with CONFIG_EFI_STUB to be able to be directly > - executed as an EFI image. > - > - See the Grub2 help text for details on preparing an EFI > - capable disk image using Gummiboot: the instructions are > - exactly the same, except that the Gummiboot configuration > - files will be located in /loader/ inside the EFI partition. > - > - http://freedesktop.org/wiki/Software/gummiboot/ > diff --git a/boot/gummiboot/buildroot.conf b/boot/gummiboot/buildroot.conf > deleted file mode 100644 > index 8a6f02e56a..0000000000 > --- a/boot/gummiboot/buildroot.conf > +++ /dev/null > @@ -1,4 +0,0 @@ > -title Buildroot > -version 1 > -linux /bzImage > -options console=ttyS0 root=/dev/sda2 > diff --git a/boot/gummiboot/gummiboot.mk b/boot/gummiboot/gummiboot.mk > deleted file mode 100644 > index eb1f3da78c..0000000000 > --- a/boot/gummiboot/gummiboot.mk > +++ /dev/null > @@ -1,41 +0,0 @@ > -################################################################################ > -# > -# gummiboot > -# > -################################################################################ > - > -GUMMIBOOT_SITE = https://gitlab.freedesktop.org/archived-projects/gummiboot.git > -GUMMIBOOT_SITE_METHOD = git > -GUMMIBOOT_VERSION = 2bcd919c681c952eb867ef1bdb458f1bc49c2d55 > -GUMMIBOOT_LICENSE = LGPL-2.1+ > -GUMMIBOOT_LICENSE_FILES = LICENSE > - > -# The git archive does not have the autoconf/automake stuff generated. > -GUMMIBOOT_AUTORECONF = YES > -GUMMIBOOT_DEPENDENCIES = gnu-efi host-pkgconf util-linux > -GUMMIBOOT_INSTALL_TARGET = NO > -GUMMIBOOT_INSTALL_IMAGES = YES > - > -ifeq ($(BR2_i386),y) > -GUMMIBOOT_IMGARCH = ia32 > -else ifeq ($(BR2_x86_64),y) > -GUMMIBOOT_IMGARCH = x64 > -endif > - > -GUMMIBOOT_CONF_OPTS = \ > - --host=$(BR2_ARCH) \ > - --with-efi-libdir=$(STAGING_DIR)/usr/lib \ > - --with-efi-ldsdir=$(STAGING_DIR)/usr/lib \ > - --with-efi-includedir=$(STAGING_DIR)/usr/include \ > - --disable-manpages > - > -define GUMMIBOOT_INSTALL_IMAGES_CMDS > - $(INSTALL) -D -m 0644 $(@D)/gummiboot$(GUMMIBOOT_IMGARCH).efi \ > - $(BINARIES_DIR)/efi-part/EFI/BOOT/boot$(GUMMIBOOT_IMGARCH).efi > - $(INSTALL) -D -m 0644 boot/gummiboot/loader.conf \ > - $(BINARIES_DIR)/efi-part/loader/loader.conf > - $(INSTALL) -D -m 0644 boot/gummiboot/buildroot.conf \ > - $(BINARIES_DIR)/efi-part/loader/entries/buildroot.conf > -endef > - > -$(eval $(autotools-package)) > diff --git a/boot/gummiboot/loader.conf b/boot/gummiboot/loader.conf > deleted file mode 100644 > index 93b77b8f93..0000000000 > --- a/boot/gummiboot/loader.conf > +++ /dev/null > @@ -1,2 +0,0 @@ > -timeout 3 > -default buildroot > -- > 2.37.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 thomas.petazzoni at bootlin.com Mon Feb 6 22:02:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 23:02:03 +0100 Subject: [Buildroot] [PATCH] configs/stm32f746g-disco: new defconfig In-Reply-To: References: Message-ID: <20230206230203.70e2dbd8@windsurf> On Thu, 22 Sep 2022 09:42:51 +0200 Waldemar Brodkorb wrote: > Add support for ST Microsystems STM32F746G-DISCO board. > See here for hardware details: > https://www.st.com/en/evaluation-tools/32f746gdiscovery.html > > The LCD and Ethernet are _not_ yet supported by Linux upstream. > The RAM is very limited, so the init script is stolen from the > RISCV noMMU systems to support booting to a shell without crashing. > > Signed-off-by: Waldemar Brodkorb Sorry for the very very slow feedback. It mostly looks good of course, but there are two things that bother me. One very small and easy to address, another not so difficult, but I'm not entirely sure how to address it. See below. > diff --git a/board/stmicroelectronics/stm32f746g-disco/rootfs_overlay/sbin/init b/board/stmicroelectronics/stm32f746g-disco/rootfs_overlay/sbin/init > new file mode 100755 > index 0000000000..1285fd4420 > --- /dev/null > +++ b/board/stmicroelectronics/stm32f746g-disco/rootfs_overlay/sbin/init > @@ -0,0 +1,41 @@ > +#!/bin/sh > + > +# This script replaces the default busybox init process to avoid having that > +# process staying alive and sleeping in the background, (uselessly) consuming > +# precious memory. [...] What bothers me is that board/canaan/k210-soc/rootfs_overlay/sbin/init is exactly the same script, so we're duplicating it. Can we do something about it? I'm not exactly sure. A minimal "init" package for noMMU systems maybe? Also, do you really need this minimal init? stm32f469_disco_sd_defconfig doesn't need it apparently. > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10-rc5" Can we switch to a non-rc version? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Mon Feb 6 22:05:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 23:05:46 +0100 Subject: [Buildroot] [PATCH 2020.02.x] package/lxc: fix CVE-2022-47952 In-Reply-To: <20230206171544.35665-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 6 Feb 2023 18:15:44 +0100") References: <20230206171544.35665-1-fontaine.fabrice@gmail.com> Message-ID: <87357i8n5x.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may > allow local users to infer whether any file exists, even within a > protected directory tree, because "Failed to open" often indicates that > a file does not exist, whereas "does not refer to a network namespace > path" often indicates that a file exists. NOTE: this is different from > CVE-2018-6556 because the CVE-2018-6556 fix design was based on the > premise that "we will report back to the user that the open() failed but > the user has no way of knowing why it failed"; however, in many > realistic cases, there are no plausible reasons for failing except that > the file does not exist. > Signed-off-by: Fabrice Fontaine It is 2022.02.x, not 2020.02.x ;) Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From romain.naour at smile.fr Mon Feb 6 22:06:01 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 23:06:01 +0100 Subject: [Buildroot] [PATCH] Config.in: introduce BR2_TIME_BITS_64 option for Y2038 compatibility In-Reply-To: <5d683c3c-1229-70e6-1736-ca01dd1a7159@smile.fr> References: <20221012215008.2918444-1-thomas.petazzoni@bootlin.com> <5eebf7dee2a585f50a4e986c214677a157bfd22c.camel@calian.com> <20221013163910.3c6d9c8f@windsurf> <5d683c3c-1229-70e6-1736-ca01dd1a7159@smile.fr> Message-ID: Le 06/02/2023 ? 21:25, Romain Naour a ?crit?: > Hello Thomas, > > Le 13/10/2022 ? 16:39, Thomas Petazzoni via buildroot a ?crit?: >> On Wed, 12 Oct 2022 23:49:37 +0000 >> Robert Hancock wrote: >> >>> There's some chance of software being broken by enabling this, with >>> either a compile or runtime failure. For example, applications that >>> assume sizeof(time_t) == sizeof(long) would work on 32-bit platforms >>> with a 32-bit time and 64-bit platforms with a 64-bit time, but fail >>> with a 64-bit time on 32-bit. I believe I've seen this when trying to >>> build software with that option, so turning this on unconditionally >>> might be unwise, unless some build tests of the supported packages >>> have been done.. >> >> There will definitely be build testing: our autobuilders are testing >> 24/7 random configurations of Buildroot. So as soon as we introduce >> this option, there would be builds with BR2_TIME_BITS_64=y enabled, >> which would raise build issues if there's any. >> >> Of course, the more tricky part are runtime issues, which are >> essentially impossible to detect until someone runs into the problem. > > We already tried to enable BR2_TIME_BITS_64 back in March 2022 but we had to > revert it due to build issues with packages like glibc: > > See: > http://lists.busybox.net/pipermail/buildroot/2022-March/638105.html > > https://git.buildroot.net/buildroot/commit/?id=dd170f0cbad729dba4193b2b20e3de0a7010d485 > > I'll try to look again. The issue has been reported to zlib upstream project back in 2019 [1] and a pull request has been sent by Khem Raj on 2 Jan 2023 [2]. Reading one of the comment about libreELEC project "2038 proof" [3] we can notice it requires a lot of patches in several packages: glibc: dont build target with _TIME_BITS or _FILE_OFFSET_BITS for arm? eventlircd: support -D_TIME_BITS=64 for 64-bit time lirc: support -D_TIME_BITS=64 for 64-bit time zlib: support -D_TIME_BITS=64 for 64-bit time dvb-apps: support-time-bits-64.patch tslib: support -D_TIME_BITS=64 for 64-bit time libretro-fbneo: dont build target with _TIME_BITS or _FILE_OFFSET_BIT? mariadb: dont build target with _TIME_BITS or _FILE_OFFSET_BITS for a? In the end, enabling -D_FILE_OFFSET_BITS=64 and -D_TIME_BITS=64" onto all packages has been reverted [4] since it introduced several regression. After making a lot of effort and spending a lot of time, the libreELEC maintainer just give up: "TBH I tink we should not pursue the 32bit userland Y2038 issue further until glibc comes up with a better solution that doesn't break ABIs. Moving to 64bit (rather realistic within the next 10 years) or to another libc (not so much realistic) are all better options than the mess glibc created - it purely worked for them but pretty much no one else and almost every distribution abandoned the glibc approach so I think we should do the same." Thoughts? [1] https://github.com/madler/zlib/issues/447 [2] https://github.com/madler/zlib/pull/764 [3] https://github.com/LibreELEC/LibreELEC.tv/pull/6727 [4] https://github.com/LibreELEC/LibreELEC.tv/pull/7173 Best regards, Romain > > Best regards, > Romain > > >> >> Best regards, >> >> Thomas > From thomas.petazzoni at bootlin.com Mon Feb 6 22:23:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 23:23:54 +0100 Subject: [Buildroot] [git commit] package/qt5: fix build failure due to libressl use Message-ID: <20230206222423.8231B83DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a94d39d693d84f96f996a6a3decfecc60a9625bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Qt5 only supports openssl, check [0] and [1]. So in qt5base.mk let's check if BR2_PACKAGE_LIBOPENSSL is enabled instead of BR2_PACKAGE_OPENSSL(that could be openssl or libressl) and for qt5enginio and qt5webkit let's select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of only BR2_PACKAGE_OPENSSL. This way we make sure that only openssl is selected and not libressl or other future openssl-like implementations. Fixes: http://autobuild.buildroot.net/results/a956b48b782dbaa055d7146360465e2493a809d9/ [0]: https://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support [1]: https://bugreports.qt.io/browse/QTBUG-68374 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base.mk | 4 ++-- package/qt5/qt5enginio/Config.in | 2 ++ package/qt5/qt5webkit/Config.in | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index a81892422c..efa0e16e9a 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -229,8 +229,8 @@ else QT5BASE_CONFIGURE_OPTS += -no-eglfs endif -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBOPENSSL),-openssl,-no-openssl) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBOPENSSL),openssl) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig) diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in index b738f0db7c..a1ac6f8ca0 100644 --- a/package/qt5/qt5enginio/Config.in +++ b/package/qt5/qt5enginio/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_QT5ENGINIO bool "qt5enginio" select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_NETWORK help diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 26c3897d1d..9b84ac5f96 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -16,6 +16,8 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS From peter at korsgaard.com Mon Feb 6 21:42:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 22:42:59 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/lxc: fix CVE-2022-47952 Message-ID: <20230206222423.03E0083DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=399ca20e6b73eaab94ce7ae1c8a4cde96e2c7b2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may allow local users to infer whether any file exists, even within a protected directory tree, because "Failed to open" often indicates that a file does not exist, whereas "does not refer to a network namespace path" often indicates that a file exists. NOTE: this is different from CVE-2018-6556 because the CVE-2018-6556 fix design was based on the premise that "we will report back to the user that the open() failed but the user has no way of knowing why it failed"; however, in many realistic cases, there are no plausible reasons for failing except that the file does not exist. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...5-Patching-an-incoming-CVE-CVE-2022-47952.patch | 73 ++++++++++++++++++++++ package/lxc/lxc.mk | 3 + 2 files changed, 76 insertions(+) diff --git a/package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch b/package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch new file mode 100644 index 0000000000..071734848a --- /dev/null +++ b/package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch @@ -0,0 +1,73 @@ +From 1b0469530d7a38b8f8990e114b52530d1bf7f3b8 Mon Sep 17 00:00:00 2001 +From: Maher Azzouzi +Date: Sun, 25 Dec 2022 13:50:25 +0100 +Subject: [PATCH] Patching an incoming CVE (CVE-2022-47952) + +lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may +allow local users to infer whether any file exists, even within a +protected directory tree, because "Failed to open" often indicates +that a file does not exist, whereas "does not refer to a network +namespace path" often indicates that a file exists. NOTE: this is +different from CVE-2018-6556 because the CVE-2018-6556 fix design was +based on the premise that "we will report back to the user that the +open() failed but the user has no way of knowing why it failed"; +however, in many realistic cases, there are no plausible reasons for +failing except that the file does not exist. + +PoC: +> % ls /l +> ls: cannot open directory '/l': Permission denied +> % /usr/lib/x86_64-linux-gnu/lxc/lxc-user-nic delete lol lol /l/h/tt h h +> cmd/lxc_user_nic.c: 1096: main: Failed to open "/l/h/tt" <----- file does not exist. +> % /usr/lib/x86_64-linux-gnu/lxc/lxc-user-nic delete lol lol /l/h/t h h +> cmd/lxc_user_nic.c: 1101: main: Path "/l/h/t" does not refer to a network namespace path <---- file exist! + +Signed-off-by: MaherAzzouzi +Acked-by: Serge Hallyn + +[Retrieved from: +https://github.com/lxc/lxc/commit/1b0469530d7a38b8f8990e114b52530d1bf7f3b8] +Signed-off-by: Fabrice Fontaine +--- + src/lxc/cmd/lxc_user_nic.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +diff --git a/src/lxc/cmd/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c +index a91e2259d5..69bc6f17d1 100644 +--- a/src/lxc/cmd/lxc_user_nic.c ++++ b/src/lxc/cmd/lxc_user_nic.c +@@ -1085,20 +1085,17 @@ int main(int argc, char *argv[]) + } else if (request == LXC_USERNIC_DELETE) { + char opath[LXC_PROC_PID_FD_LEN]; + +- /* Open the path with O_PATH which will not trigger an actual +- * open(). Don't report an errno to the caller to not leak +- * information whether the path exists or not. +- * When stracing setuid is stripped so this is not a concern +- * either. +- */ ++ // Keep in mind CVE-2022-47952: It's crucial not to leak any ++ // information whether open() succeeded of failed. ++ + netns_fd = open(args.pid, O_PATH | O_CLOEXEC); + if (netns_fd < 0) { +- usernic_error("Failed to open \"%s\"\n", args.pid); ++ usernic_error("Failed while opening netns file for \"%s\"\n", args.pid); + _exit(EXIT_FAILURE); + } + + if (!fhas_fs_type(netns_fd, NSFS_MAGIC)) { +- usernic_error("Path \"%s\" does not refer to a network namespace path\n", args.pid); ++ usernic_error("Failed while opening netns file for \"%s\"\n", args.pid); + close(netns_fd); + _exit(EXIT_FAILURE); + } +@@ -1112,7 +1109,7 @@ int main(int argc, char *argv[]) + /* Now get an fd that we can use in setns() calls. */ + ret = open(opath, O_RDONLY | O_CLOEXEC); + if (ret < 0) { +- CMD_SYSERROR("Failed to open \"%s\"\n", args.pid); ++ CMD_SYSERROR("Failed while opening netns file for \"%s\"\n", args.pid); + close(netns_fd); + _exit(EXIT_FAILURE); + } diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index cece27411e..8fdb6855d1 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -12,6 +12,9 @@ LXC_CPE_ID_VENDOR = linuxcontainers LXC_DEPENDENCIES = host-pkgconf LXC_INSTALL_STAGING = YES +# 0005-Patching-an-incoming-CVE-CVE-2022-47952.patch +LXC_IGNORE_CVES += CVE-2022-47952 + LXC_CONF_OPTS = \ --disable-apparmor \ --disable-examples \ From peter at korsgaard.com Mon Feb 6 22:32:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 23:32:08 +0100 Subject: [Buildroot] [PATCH] package/libcamera: bump to version 0.0.4 In-Reply-To: <20230206151514.1579632-1-marcus.folkesson@gmail.com> (Marcus Folkesson's message of "Mon, 6 Feb 2023 16:15:14 +0100") References: <20230206151514.1579632-1-marcus.folkesson@gmail.com> Message-ID: <87y1pa77dj.fsf@dell.be.48ers.dk> >>>>> "Marcus" == Marcus Folkesson writes: > Signed-off-by: Marcus Folkesson Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 22:32:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 23:32:13 +0100 Subject: [Buildroot] [git commit] package/libcamera: bump to version 0.0.4 Message-ID: <20230206223222.2760883DF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce3d349384f4d80ed8fc50a82ff864bd5bcf6375 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Folkesson Reviewed-by: Quentin Schulz Signed-off-by: Peter Korsgaard --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 033e318910..ea204aee98 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 d7100286616550aca487b46ae9de2a70bb471352a332b8214901b4148739990f libcamera-v0.0.3-br1.tar.gz +sha256 13e53b33652b16454264b6eff0a6f032aa9331f919b07b6d0e622917ed7f7dd8 libcamera-v0.0.4-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 8979a43aca..01c4cb2ff2 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = v0.0.3 +LIBCAMERA_VERSION = v0.0.4 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ From thomas.petazzoni at bootlin.com Mon Feb 6 22:45:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 23:45:20 +0100 Subject: [Buildroot] [PATCH v2] package/qt5: fix build failure due to libressl use In-Reply-To: <20220929104648.324977-1-giulio.benetti@benettiengineering.com> References: <20220928205527.GH1419013@scaer> <20220929104648.324977-1-giulio.benetti@benettiengineering.com> Message-ID: <20230206234520.4a140264@windsurf> On Thu, 29 Sep 2022 12:46:48 +0200 Giulio Benetti wrote: > Qt5 only supports openssl, check [0] and [1]. So in qt5base.mk let's check > if BR2_PACKAGE_LIBOPENSSL is enabled instead of BR2_PACKAGE_OPENSSL(that > could be openssl or libressl) and for qt5enginio and qt5webkit let's select > BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of only BR2_PACKAGE_OPENSSL. > This way we make sure that only openssl is selected and not libressl or > other future openssl-like implementations. > > Fixes: > http://autobuild.buildroot.net/results/a956b48b782dbaa055d7146360465e2493a809d9/ > > [0]: https://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support > [1]: https://bugreports.qt.io/browse/QTBUG-68374 > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of BR2_PACKAGE_LIBOPENSSL > --- > package/qt5/qt5base/qt5base.mk | 4 ++-- > package/qt5/qt5enginio/Config.in | 1 + > package/qt5/qt5webkit/Config.in | 1 + > 3 files changed, 4 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Mon Feb 6 22:48:12 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 23:48:12 +0100 Subject: [Buildroot] [PATCH] package/pkg-generic: ignore error when chmod'ing extracted source In-Reply-To: <20220616020353.497241-1-uwu@icenowy.me> References: <20220616020353.497241-1-uwu@icenowy.me> Message-ID: <350106ad-b8a0-9fbf-5fc2-cf41bd32a93b@smile.fr> Hello, Le 16/06/2022 ? 04:03, Icenowy Zheng a ?crit?: > The chmod command included in GNU coreutils 9.0 will exit with 1 when in > a recursive a symlink is met and the mode of both itself and its target > is retained; however this situation is usually expected (such kind of > symlink exists in, e.g., a newly extracted tarball of Linux kernel), > thus not a failure. > > Considering this chmod call is only kind of vanishing, ignore error for > it. Thanks for the report, it seems that GNU coreutils chmod 9.0 had a regression [1] that has been fixed in GNU coreutils 9.1. I'm not sure if we should apply this workaround now that coreutils is fixed. [1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=50784 Best regards, Romain > > Signed-off-by: Icenowy Zheng > --- > package/pkg-generic.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index b233b07548..03e4b029b3 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -216,7 +216,7 @@ $(BUILD_DIR)/%/.stamp_extracted: > $(Q)mkdir -p $(@D) > $($(PKG)_EXTRACT_CMDS) > # some packages have messed up permissions inside > - $(Q)chmod -R +rw $(@D) > + -$(Q)chmod -R +rw $(@D) > $(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep)) > @$(call step_end,extract) > $(Q)touch $@ From rcrichlow9000 at gmail.com Mon Feb 6 23:57:00 2023 From: rcrichlow9000 at gmail.com (Ramon Crichlow) Date: Mon, 6 Feb 2023 17:57:00 -0600 Subject: [Buildroot] lsblk not getting built Message-ID: I modified package/util-linux/util-linux.mk and Config.in to match the changes here : https://patchwork.ozlabs.org/project/buildroot/patch/20160225171433.7e200dfc at free-electrons.com/ Then I ran make menuconfig and enabled BR2_PACKAGE_UTIL_LINUX_LSBLK. No lsblk gets built or iinstalled. --enable-lsblk does appear in the build log so the flag is being set correctly. I am using the stm32mp157-dk1 configuration. #uname -a Linux buildroot 5.13.0 #1 SMP PREEMPT Sun Feb 5 19:20:00 CST 2023 armv7l GNU/Linux Regards, Ramon -------------- next part -------------- An HTML attachment was scrubbed... URL: From rcrichlow9000 at gmail.com Tue Feb 7 01:07:12 2023 From: rcrichlow9000 at gmail.com (Ramon Crichlow) Date: Mon, 6 Feb 2023 19:07:12 -0600 Subject: [Buildroot] lsblk not getting built In-Reply-To: References: Message-ID: I didn't have BR2_PACKAGE_UTIL_LINUX_BINARIES selected. On Mon, Feb 6, 2023 at 5:57 PM Ramon Crichlow wrote: > I modified package/util-linux/util-linux.mk and Config.in to match the > changes here : > https://patchwork.ozlabs.org/project/buildroot/patch/20160225171433.7e200dfc at free-electrons.com/ > Then I ran make menuconfig and enabled BR2_PACKAGE_UTIL_LINUX_LSBLK. > > No lsblk gets built or iinstalled. > > --enable-lsblk does appear in the build log so the flag is being set > correctly. > > I am using the stm32mp157-dk1 configuration. > > #uname -a > Linux buildroot 5.13.0 #1 SMP PREEMPT Sun Feb 5 19:20:00 CST 2023 armv7l > GNU/Linux > > Regards, > Ramon > -------------- next part -------------- An HTML attachment was scrubbed... URL: From christian at paral.in Tue Feb 7 04:30:08 2023 From: christian at paral.in (Christian Stewart) Date: Mon, 6 Feb 2023 20:30:08 -0800 Subject: [Buildroot] [PATCH v3 1/3] package/docker-engine: bump version to v23.0.0 Message-ID: <20230207043010.85696-1-christian@paral.in> docker-engine does not ship a go.mod file in the tarball: create one to tell the Go compiler the root import path prefix for the module and the language version. Note that the language version in go.mod is not required to be equal the version of the Go compiler. This update requires a workaround for the non-standard vendor/ structure in the docker-engine repository, which has an invalid vendor/modules.txt file. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 Note that as of v23.0.0 docker-engine expects containerd to be started by systemd if --containerd= flag is set in dockerd.service, whereas in previous versions containerd was started by the docker daemon as a sub-process. There is no sysv unit for containerd, but this is OK: in the Docker sysv init file S60dockerd, we do not set the --containerd flag. The docker daemon will start containerd as a sub-process automatically due to the absence of this flag. Signed-off-by: Christian Stewart --- v1 -> v2: - clarify commit message about containerd.service and sysv compat - fix formatting in S60dockerd - bundle commit into a series with required containerd changes v2 -> v3: - remove whitespace changes (as per Yann review) - use rm -f instead of checking for file existence - add the go.mod file in the CONFIGURE step Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d15b1359cb..670cbd414b 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 2a9b72ca78..229e199aa2 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.22 +DOCKER_ENGINE_VERSION = 23.0.0 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -62,6 +62,14 @@ else DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_ENGINE_CONFIGURE_CMDS + printf "module $(DOCKER_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef + DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD -- 2.39.1 From christian at paral.in Tue Feb 7 04:30:09 2023 From: christian at paral.in (Christian Stewart) Date: Mon, 6 Feb 2023 20:30:09 -0800 Subject: [Buildroot] [PATCH v3 2/3] package/docker-proxy: drop package In-Reply-To: <20230207043010.85696-1-christian@paral.in> References: <20230207043010.85696-1-christian@paral.in> Message-ID: <20230207043010.85696-2-christian@paral.in> The docker-proxy binary (libnetwork) has been merged into the docker-engine source (moby). Drop the docker-proxy package and add cmd/docker-proxy as a build target of docker-engine instead. https://github.com/moby/libnetwork/commit/563fe8e248f3afac75a270f693f38bdc3eea7bf3 Signed-off-by: Christian Stewart --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/docker-engine/Config.in | 1 - package/docker-engine/docker-engine.mk | 2 +- package/docker-proxy/Config.in | 19 ------------------- package/docker-proxy/docker-proxy.hash | 3 --- package/docker-proxy/docker-proxy.mk | 21 --------------------- 8 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 package/docker-proxy/Config.in delete mode 100644 package/docker-proxy/docker-proxy.hash delete mode 100644 package/docker-proxy/docker-proxy.mk diff --git a/Config.in.legacy b/Config.in.legacy index 61686fdd11..c9d5c635cd 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy removed" + select BR2_LEGACY + select BR2_PACKAGE_DOCKER_ENGINE + help + docker-proxy has been dropped by upstream since version + 563fe8. it has been merged into docker-engine (moby). + config BR2_TARGET_GUMMIBOOT bool "gummiboot removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f8acf8776c..2559b8c227 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -545,7 +545,6 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-compose/ F: package/docker-engine/ -F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ diff --git a/package/Config.in b/package/Config.in index b6211f1102..45c803ea6c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2619,7 +2619,6 @@ menu "System tools" source "package/docker-cli/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" - source "package/docker-proxy/Config.in" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 1f0efb8fcc..b5a356eab9 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_USE_MMU # containerd select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency - select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency help Docker is a platform to build, ship, diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 229e199aa2..d769e367fa 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -24,7 +24,7 @@ DOCKER_ENGINE_LDFLAGS = \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs -DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_ENGINE_DEPENDENCIES += libapparmor diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in deleted file mode 100644 index 7e40536537..0000000000 --- a/package/docker-proxy/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_DOCKER_PROXY - bool "docker-proxy" - 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 - help - Libnetwork is a Container Network Model that provides a - consistent programming interface and the required network - abstractions for applications. - - This package provides docker-proxy, a run-time dependency of - Docker. - - https://github.com/docker/libnetwork - -comment "docker-proxy needs a 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_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash deleted file mode 100644 index 63296f14c1..0000000000 --- a/package/docker-proxy/docker-proxy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 05bf95637bae134d12d02bd7a7854cd0c768e6fccb662c2c64523f05b997b204 docker-proxy-f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk deleted file mode 100644 index fe7982e8f6..0000000000 --- a/package/docker-proxy/docker-proxy.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# docker-proxy -# -################################################################################ - -DOCKER_PROXY_VERSION = f6ccccb1c082a432c2a5814aaedaca56af33d9ea -DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) - -DOCKER_PROXY_LICENSE = Apache-2.0 -DOCKER_PROXY_LICENSE_FILES = LICENSE - -DOCKER_PROXY_DEPENDENCIES = host-pkgconf - -DOCKER_PROXY_BUILD_TARGETS = cmd/proxy - -define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy -endef - -$(eval $(golang-package)) -- 2.39.1 From christian at paral.in Tue Feb 7 04:30:10 2023 From: christian at paral.in (Christian Stewart) Date: Mon, 6 Feb 2023 20:30:10 -0800 Subject: [Buildroot] [PATCH v3 3/3] package/docker-cli: bump version to v23.0.0 In-Reply-To: <20230207043010.85696-1-christian@paral.in> References: <20230207043010.85696-1-christian@paral.in> Message-ID: <20230207043010.85696-3-christian@paral.in> docker-cli does not ship a go.mod file in the tarball: create one to tell the Go compiler the root import path prefix for the module and the language version. Note that the language version in go.mod is not required to be equal the version of the Go compiler. This update requires a workaround for the non-standard vendor/ structure in the docker-engine repository, which has an invalid vendor/modules.txt file. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 Signed-off-by: Christian Stewart --- v2 -> v3: - create go.mod file in the CONFIGURE step - update comments regarding adjusting language version - use rm -f instead of checking for file existence Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index c6db95f9b3..ff981be963 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz +sha256 3379d06cd6177832b91f4796c680b6bf15c7895773448716b4c3c5253f611d1b docker-cli-23.0.0.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index cb44c68c1b..4b0c9dcc89 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.22 +DOCKER_CLI_VERSION = 23.0.0 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 @@ -29,6 +29,14 @@ DOCKER_CLI_TAGS += osusergo netgo DOCKER_CLI_GO_ENV = CGO_ENABLED=no endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_CONFIGURE_CMDS + printf "module $(DOCKER_CLI_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef + DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) $(eval $(golang-package)) -- 2.39.1 From christian at paral.in Tue Feb 7 04:31:21 2023 From: christian at paral.in (Christian Stewart) Date: Mon, 6 Feb 2023 20:31:21 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/balena-engine: bump to version 20.10.26 Message-ID: <20230207043121.86027-1-christian@paral.in> balena-engine does not ship a go.mod file in the tarball: create one to tell the Go compiler the root import path prefix for the module and the language version. Note that the language version in go.mod is not required to be equal the version of the Go compiler. This update requires a workaround for the non-standard vendor/ structure in the balena-engine repository, which has an invalid vendor/modules.txt file. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 Remove the vendor/archive sub-tree (fixes a build error) because Go no longer allows having duplicate packages in GOPATH and GOROOT. vendor/archive/tar cannot be in vendor/ because it exists in the standard library. Remove it from vendor/. https://github.com/balena-os/balena-engine/releases/tag/v20.10.26 Signed-off-by: Christian Stewart --- v2 -> v3: - add missing go.mod file in CONFIGURE step - use rm -f instead of checking for file existence - update comment about language version Signed-off-by: Christian Stewart --- package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 4adb8ce561..6a92a40cc8 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz +sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index ecfb62bfbf..89a572cf8e 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 20.10.21 +BALENA_ENGINE_VERSION = 20.10.26 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 @@ -34,6 +34,16 @@ BALENA_ENGINE_TAGS = \ BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# remove the conflicting vendor/archive (not allowed in go1.20) +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define BALENA_ENGINE_CONFIGURE_CMDS + printf "module $(BALENA_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt + rm -rf $(@D)/vendor/archive +endef + ifeq ($(BR2_INIT_SYSTEMD),y) BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald -- 2.39.1 From christian at paral.in Tue Feb 7 04:32:23 2023 From: christian at paral.in (Christian Stewart) Date: Mon, 6 Feb 2023 20:32:23 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/rtl8812au-aircrack-ng: bump to 2022-12-22 version of v5.6.4.2 branch In-Reply-To: <20221230025221.1051537-1-christian@paral.in> References: <20221230025221.1051537-1-christian@paral.in> Message-ID: Hi all, On Thu, Dec 29, 2022 at 6:52 PM Christian Stewart wrote: > > Fixes: > http://autobuild.buildroot.net/results/4f6/4f65b521d5c6cffdf5f6294ce0257b9a19e441fc/ > > Reviewed-by: Giulio Benetti > Signed-off-by: Christian Stewart Is there anything further needs to be done to merge this? It fixes an autobuild issue. Thanks, Christian Stewart From thomas.petazzoni at bootlin.com Tue Feb 7 06:47:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 07 Feb 2023 06:47:14 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-06 Message-ID: <20230207064720.D0DFC403E9@smtp2.osuosl.org> Hello, Autobuild statistics for 2023-02-06 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 2 | 0 | 0 | 2 | 2022.11.x | 10 | 16 | 0 | 26 | master | 158 | 202 | 0 | 360 | Classification of failures by reason for master ----------------------------------------------- bash-5.2.15 | 15 xz-5.2.10 | 12 unknown | 10 host-pahole-1.24 | 9 gobject-introspection-1.72.0 | 7 python-bcrypt-4.0.1 | 7 gerbera-1.10.0 | 5 libopenssl-1.1.1q | 5 python-bunch-1.0.1 | 5 host-binutils-2.38 | 4 host-go-1.19.5 | 4 jack2-1.9.21 | 4 libgcrypt-1.10.1 | 4 libglib2-2.72.3 | 4 perl-5.36.0 | 4 xxhash-0.8.1 | 4 ulog-0389d243352255f6182326... | 3 wolfssl-5.5.3 | 3 dmalloc-5.6.5 | 2 elfutils-0.186 | 2 fontconfig-2.13.1 | 2 glibc-2.36-81-g4f4d7a13edfd... | 2 host-binutils-2.37 | 2 host-libarchive-3.6.2 | 2 host-libxml-parser-perl-2.46 | 2 host-sentry-cli-2.8.0 | 2 libgpg-error-1.46 | 2 linux-6.1.9 | 2 lirc-tools-0.10.2 | 2 mutt-2.2.9 | 2 netsurf-3.10 | 2 norm-1.5.8 | 2 ocf-linux-20171122 | 2 openssh-9.1p1 | 2 ripgrep-af6b6c543b224d348a8... | 2 zabbix-5.4.9 | 2 acpid-2.0.34 | 1 bat-0.19.0 | 1 berkeleydb-5.3.28 | 1 cairo-1.16.0 | 1 collectd-5.12.0 | 1 dahdi-linux-3.2.0 | 1 efivar-38 | 1 exim-4.96 | 1 ffmpeg-4.4.3 | 1 flann-1.9.2 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/romfs/romfs.mk:32: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gmp-6.2.1 | 1 google-breakpad-c85eb4a59b6... | 1 gummiboot-2bcd919c681c952eb... | 1 heirloom-mailx-12.5 | 1 host-binutils-2.39 | 1 host-delve-1.20.0 | 1 host-gcc-final-10.4.0 | 1 host-gcc-initial-10.4.0 | 1 host-gcc-initial-12.2.0 | 1 host-libopenssl-1.1.1q | 1 host-python-maturin-0.14.9 | 1 host-rust-1.66.1 | 1 hyperfine-1.14.0 | 1 kmod-30 | 1 leptonica-1.82.0 | 1 libcamera-apps-1.1.1 | 1 libcap-ng-0.8.3 | 1 libdrm-2.4.114 | 1 libglvnd-1.4.0 | 1 libxml2-2.10.3 | 1 lightning-2.2.0 | 1 lttng-modules-2.13.7 | 1 mariadb-10.3.36 | 1 memcached-1.6.17 | 1 mxs-bootlets-10.12.01 | 1 netsniff-ng-0.6.8 | 1 nmap-7.92 | 1 optee-client-3.19.0 | 1 pcre2-10.42 | 1 poco-1.12.2 | 1 proxychains-ng-4.16 | 1 python-cryptography-39.0.0 | 1 python-numpy-1.23.5 | 1 python-rtoml-0.8.0 | 1 rtl8812au-aircrack-ng-e7a4a... | 1 s6-portable-utils-2.2.5.0 | 1 sdl-1.2.15 | 1 ssdp-responder-1.9 | 1 uccp420wlan-6.9.1 | 1 uqmi-0a19b5b77140465c29e2af... | 1 valgrind-3.19.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/b74bbbbeb49ad30b6e95c0ab756ad325988366b6 | ORPH sh4 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/55dda2420fc19b1c341730ea0cfdb45c2b9b58c9 | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/4d7277cb359a569a99a25784d8769a2bed06c75d | ORPH arc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/57d1ca6d1e8603e901dc7046046c38e4be3ade7b | ORPH mips64 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/23e41be303910c917051eceacd6a3941d24772e6 | ORPH xtensa | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/d7f7d084f8ec2f22ce488c4f0f58619258732e53 | ORPH mips64el | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/5a1a7706511681114af754c5849adf24bb577d66 | ORPH i686 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/91e44276ebbf74a016e4add6e3c10ee6b90b36a8 | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/dceb497b7641a272123296f2c62626e0dbd3dcbf | ORPH xtensa | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/5765a6eb9d6687649cbd40b4d66fb74f9f8b06ca | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/a1f7eced04717a34a12e40f4694ea4c926a4f0d2 | ORPH xtensa | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/1c0450396fc493e781ec4cc985ce3ed5c123faac | ORPH sh4eb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/4c78fd0efaeb7f3c500bca6af4f0f0342246257f | ORPH arm | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/bd70b232ab83b6f920b1de589b0516854d23c076 | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/37593a293c4f83fea95880e182d21bf24511528d | ORPH or1k | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/7acc584407d3a503e8d39031565a78eb605273d4 | ORPH mipsel | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/e13b49a5939757c797d1f1ba1a94989ec285063a | sh4 | berkeleydb-5.3.28 | NOK | http://autobuild.buildroot.net/results/25dec4e4087903dea9123c72e13679488c9c2480 | ORPH xtensa | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/8c8e1588a049559fd0cb3d8111a171b72ae17158 | or1k | collectd-5.12.0 | NOK | http://autobuild.buildroot.net/results/681dab40f502d66643f4fb93614547823accd961 | s390x | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/24c6f398f175437a7efa98eb4c6b97d16d12c57e | i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/103d33e62c4ba7f03a62aa1190a920bb689a5e52 | ORPH powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/fce96f2a17bae1026eb6dc3df0d81aebd26848be | ORPH arm | efivar-38 | NOK | http://autobuild.buildroot.net/results/a00179e157ff2dbdec28c7a58e3ba5a68a7d6890 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/9933b690c4c79d28175b8ee0658de30a9d374245 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/aeb2692f361e4eabe1c6b71edf73689365600f08 | ORPH armeb | exim-4.96 | NOK | http://autobuild.buildroot.net/results/a068fadd96de2a4cb0c917d6717ec63b715393bd | aarch64 | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/da7deef89d97ff7372d93cce1bde39340f952768 | mips64el | flann-1.9.2 | NOK | http://autobuild.buildroot.net/results/79d2ceb0683d3b8c60fd6ccc67fbc51ca0de4e8a | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/5807a23709117a9c8f1ebd5e707eba68e1ae97c1 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/cfbdb6bd54c8a713f5392474391e5ff969419fd6 | ORPH aarch64_be | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/6c2d5e137dc95f42012d86ad38ff275634f02485 | arm | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/85fb59aa2016082d681105f17ac2ca3edcbbc967 | sparc64 | fs/romfs/romfs.mk:32: /tmp/... | NOK | http://autobuild.buildroot.net/results/54f5b8b25d0144fa9e85e422df276d229e7b5367 | x86_64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/543b91d6a5c928d02d5edcf02d0f655f5b406e7a | arm | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/586d8a5539e10674ef58cf2405c3b82108a4f54f | aarch64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/261a65bb920208367b2b8af260a70e9b720da583 | mips64el | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/2835c27354ee19a20f3947547986d30cf8863b5d | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/d4010bb3b895bc049f4685cc2455848b075467ec | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/c832064a8a486236a4676e55a48a9ff64207856b | microblazeel | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/c7f6d6aca7a2c69207a0f9cbe1163ac5a2d5566e | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/18b2b025e2d24ee393f843ee5ab5085a1c532f1b | powerpc64 | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/4f89977cc44d8cf8ec9e53d47cbe9df1af0a1f18 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/05d50dac0f8ba2fec33fd910d02a5ebe345037b3 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/eb036a2d1ad6c2b15b7b1ae8462d01a77792a067 | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/fad110fc8175e61ffb8e0864c1ce9cd3ff9cc18a | ORPH mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/87c24b45e74e8436dcb383c684802d7dfeb57be9 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/65337aa9be06ee5f6e66d09c57d6839dc6e3603e | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/dd2402f9e89436727203f9292d9885773bc5b877 | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8ac47a9ad3d7c1e5a1b414d4c814a1b4b3cf17cd | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8bb67fdb4c6b78ad22e73818aec76fc6329f855d | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/a4869c93557923f8d553fc4db01e61659cd721a3 | ORPH x86_64 | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/eb573954ba2a541602b6ace2e2311e94bfcf7af3 | i686 | gummiboot-2bcd919c681c952eb... | NOK | http://autobuild.buildroot.net/results/128c43d5da1fba639f8c251528d8c5a640538b9f | sh4aeb | heirloom-mailx-12.5 | NOK | http://autobuild.buildroot.net/results/b51c164de0c53f212e23565a246817862498593b | microblaze | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/c617ffd996845189faae25cf2f1626febd07d009 | sparc64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/113aad35efa553a8e15dc146c83bb9f5cd036c73 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1ba457cba994d896eb92c60d29eabb734519e68d | mips64el | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/69b2e3a743e0a9f0b6148c214a9d06c99e7bf87c | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/5344a4d30ce46c729483cf08d62d99eebc4beafa | i686 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/077f122c55f0abecb1d93544a0264d587dcd5609 | mips64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/cff1bf08af9c9cfa5c7331197af4c5447a9a0d70 | riscv64 | host-delve-1.20.0 | NOK | http://autobuild.buildroot.net/results/a4c78f97b84b81039d397340cb6f36a4fd941145 | microblaze | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/d37ebb30f5796b763fc85f5c95d0ec69e0e13223 | arm | host-gcc-initial-10.4.0 | NOK | http://autobuild.buildroot.net/results/ee25f7aff8e6d09ef891f8c9e0566acd16e81dfc | riscv64 | host-gcc-initial-12.2.0 | NOK | http://autobuild.buildroot.net/results/b0dd81a653663f494247474aa2190984363b3b42 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/99fd66268a07208cc57db1015372de4351268d88 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/a37b8db79bbd440e5223add4077b53481275a44f | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/4ffafc5d1be2524647517feabaeb9a025261f90e | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/71fa90a3058eda7077bc3878419618b79d69cc09 | arc | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/0c09618b568ccfd550771066d9ce13b87feec4a7 | s390x | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/cf928e2fc1021953c46b5b79ba9c32e14c934cbe | i686 | host-libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/7c2df31c6eb34b68e460e092d8c262bdc6c8f25a | microblazeel | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/ee09d52e50a04194c80aa1338f0a6e98c1323cc8 | s390x | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/38d1112965817a5db7e2c4d1089cf5e074873932 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/16710de50934f698a17e25c8672168b6f40500c2 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/20b445379f6bac25f43230db3ba4f7174a952435 | arc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/f61c19c80c4408ef4b31bab8e2cdacf9b7423706 | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/4381f9dae08b0d47525bf291c9ed698036db1ef2 | sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/14e253dd717802bb616264f888d17eaed8e375b4 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d1b116896bc2adc10f32e89ab99242484109549e | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/a1045a9cf65862fa84418f4ea5e69c9f330ddcec | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/3e1f4cb67a54177b169337ea1cf6717f224c850e | powerpc64le | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/08b3dd92cba069fcefd4e789ef31cb9ad3258ece | arm | host-python-maturin-0.14.9 | NOK | http://autobuild.buildroot.net/results/f810653285451492d42c7bcc490d4ec93fa9f2ca | mipsel | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/a6200194c12acb4ada8c8d5d54708ebb4494ea54 | aarch64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/987d34125356d2973e04725a1443121805b24469 | i686 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/5b1fd258ea724448be14771b37986801bc3da3ec | mips64el | hyperfine-1.14.0 | NOK | http://autobuild.buildroot.net/results/e681089d03a7088d000003f0e7e7eb809b08cb68 | ORPH m68k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/6ddecbe0634495d01d213c158c67c99e7d1b9356 | x86_64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/096e0b529ea78c6d1431fcae2ad5522d20421ce9 | riscv32 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/42fc0add46defee30d71fbd8dbabe5abd9f1dbed | mipsel | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/9966289cb8d07a461c14ce0eb5e36607b28aab94 | arm | kmod-30 | NOK | http://autobuild.buildroot.net/results/0a8a97b196e3bb49cd17cb45c587b5de520761c3 | sh4 | leptonica-1.82.0 | NOK | http://autobuild.buildroot.net/results/ca5c7b26c4d84845f733d61e2215aa589f88451c | riscv64 | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/678942304ace22adbc17b70ed5c97da83ed988b4 | arm | libdrm-2.4.114 | NOK | http://autobuild.buildroot.net/results/219ecdf1ead704aef6c0629770b4df895381538e | i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/42bec9e563e1e09ac04818960f483356c9e8e189 | ORPH armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/b6aed2e1691c3ec7dc36fc514efd20c4367ff7d1 | ORPH i486 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/52ef7bdc086ce73a71b559dfffbc1bad5565fa35 | ORPH i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/8e3731ec6162c8977f23d48a117a18d5c29591e5 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/2eadf8d0482fa02d23e8872afde209d732825007 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/fc5fffbbb2a96ae0a6ba11b7dbeae6190b0b5b5c | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/aeeaba1d5f7b4f4821f12360e63d8ca30b67353f | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/68e6bd6fb816e4efdf8b83a7d93d0791fccd5f64 | m68k | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/673ebc10d597c3a7cacab0bfcf18d7373c1f5c5e | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/af4e9d3ece173cdef34097ee2360a073fe41d789 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/625413ba762aae479c3f251e772b58ae3065ded9 | ORPH microblazeel | libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/065f3def24ef868424446d53d0f5f897303070a5 | arm | libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/d677be7289fe1bdc8fc62081a44b98d9eb9ef6d9 | microblaze | libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/129132a33b9cdb779d50033f316e84ec64f1c02c | mips64 | libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/5af699583279ccab96cc8d36af36e76da9683741 | arm | libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/5d10f4f545dccf126e3f5b5efce777a393c5e7bc | x86_64 | libxml2-2.10.3 | NOK | http://autobuild.buildroot.net/results/b0951dee3e361f7c2fddf7eeee4f8af777927b4b | arm | lightning-2.2.0 | NOK | http://autobuild.buildroot.net/results/0aa8287d5532e22dfea6ab5eec4a2aa62d8d0164 | powerpc | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/11775ee613a16a43bc36be0bbed756d9a90bf2f2 | ORPH sparc64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/534eb3040b441ed38f4f82b70bb1e87549ebca8f | ORPH s390x | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/5f5a916926b48c86930f11a242e1cbf3db534a07 | ORPH s390x | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/d7765d9ad1464219a8b70320a7dc57138e0095da | ORPH or1k | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/aac3bfda6f66138f323aa12cff7255b574b09401 | sparc | mariadb-10.3.36 | NOK | http://autobuild.buildroot.net/results/4319f76904a16c1f582b2e70a3c474751c8d0b7a | ORPH nios2 | memcached-1.6.17 | NOK | http://autobuild.buildroot.net/results/3d815f9b5aa0e16e236a9ccc7aa499972898d0f3 | ORPH aarch64_be | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/36ee198d52b0d2a8bb312dbe1c380c68fc1747fb | mipsel | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/5c2c0cc1f05b78711f9e1302e53006877472b0b9 | arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/55fcaec0c76803ea6dff8837759fbc9d7ef6546b | ORPH powerpc64le | netsniff-ng-0.6.8 | NOK | http://autobuild.buildroot.net/results/46247fa9bb7d2c4c892108ee592799fcfc9973d5 | i586 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/7053ad04604025705c600e4e3b2e942685525067 | sparc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/fd3de7e92aa720b23b9c63c10cf1697c3fb20eec | microblaze | nmap-7.92 | NOK | http://autobuild.buildroot.net/results/277445f4d853fa7722825606b1d39955ae5a2af8 | ORPH mips64el | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/2fc49abf94b0839b404bd8f9e836ef8c8f190f7d | ORPH m68k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/197fa060a37fdccc7d9d0fce118241d1521a9134 | ORPH microblaze | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/b05428a2ad37209fc7d5f7fa454e855377f9c205 | ORPH arc | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/b6fc49fa6b4b4871a81927e0d1c14217975b7153 | ORPH m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/d3f52736036da8479e68eb103a06736fb6c02401 | ORPH m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/58d5d48ce3c0b757bf279c49f07abbc3e9249ae1 | ORPH mips | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/041a6155e19821f1854a236ed02eeba9508b0ce7 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/b39433c8b79a1558012e70bbe945fa964cd60d3a | ORPH arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/976c58e57ae7b62a75e2e1a4ca416ee62981583f | powerpc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/5d79c8eafa27da6f9a7d859aec4fd3f44be0b082 | x86_64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/8a9b18c294f8a9746ba3607fa80819e38e00e108 | arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/9804902e4be6c88b31f6a59f64cd4d7a3252f44d | sparc | poco-1.12.2 | NOK | http://autobuild.buildroot.net/results/9c38d7ce68cf3c0b9bb9ef9d127077455e749d73 | mipsel | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/672901916e4995e193e297d03424864a095c52d8 | ORPH powerpc64le | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/036f2127fa64e77744be477d1827e1c9d7dbe6db | powerpc64le | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/3d574b2309e9c7981db96f0818174532eec2a90a | sparc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/b7bf6fb3151aff80de8de25a21f20261a3e5256c | powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/533be5ad4fab94f521429049e786c81a83a8b572 | powerpc64le | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/65c3f73afbffac3ae16acba68c8df1c5d693cc7b | sparc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/b3a46f9ffc713de4a677000c5f7c0ebcd19a736e | x86_64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/b6806b1c39884694061890bc7f8cc79b14d85c32 | powerpc64le | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/9f800ad388fdd0a7ec0b0b653cae52bc5c4dae64 | aarch64 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/e568f377fdffb251b897d4dc3fa70a024db2427e | or1k | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/229fa204bcb8027967b16bd29ecff5490b3f3db1 | nios2 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/a58694b07fae29e1ebcddd35a399b088380b91f1 | sh4aeb | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/0a396a4a14ba94554c820b26d94cf61dfdbd26f9 | powerpc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/83cc6929c4cb1fded11080ef8562b13cdae1af7a | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/2acefb965595b9d6d723d526fecc6d190486aee6 | mipsel | python-rtoml-0.8.0 | NOK | http://autobuild.buildroot.net/results/d89fd438bc2e4470625dd91b8f6ed293a54b70c8 | aarch64 | ripgrep-af6b6c543b224d348a8... | NOK | http://autobuild.buildroot.net/results/fd94875341f303d1866c94f81f12bee389082f42 | sparc64 | ripgrep-af6b6c543b224d348a8... | NOK | http://autobuild.buildroot.net/results/527a425d59bc6dff8e6fdde19b462391adf2730f | x86_64 | rtl8812au-aircrack-ng-e7a4a... | NOK | http://autobuild.buildroot.net/results/97048c28cc552dec8998bb0c01e3cab3385a2c92 | microblaze | s6-portable-utils-2.2.5.0 | NOK | http://autobuild.buildroot.net/results/9df28c07baa1aa765d4a6ef653eaff697e8d3e07 | sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/5c6707457d37cd6c577e8023bfe03d114a7b459c | ORPH sparc64 | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 | sparc64 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/f89989e5c9efd14485b91bcf155f2e3239e0284c | ORPH arc | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/847c87574326c483be5188cefb9c67162ccbf5b6 | sparc | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/59b42564f8667709a51977e94431116a3bfc706d | aarch64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/1d3f689619b16847dba347c28ad3200857da243c | arc | unknown | NOK | http://autobuild.buildroot.net/results/c98a2274329195f774e0144cd8dd40b81deb8ba0 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/9acac14d1d43dbbc9501b2e7bf4324fca548843a | sh4aeb | unknown | NOK | http://autobuild.buildroot.net/results/9287ba8b025305e42bcb2692ac5fb59068f8ee18 | arceb | unknown | NOK | http://autobuild.buildroot.net/results/ab391e9b79ea2baeafeef6e5262b9b214a21800c | or1k | unknown | NOK | http://autobuild.buildroot.net/results/22e7fd4d4098c0c63aac3b92c1461cb62c65ed78 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/57d8f365629e62d39ed8b1764090dce66d1eb9df | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/e02a11a1e713afd11eae5276eb546471803201a7 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/2982e751d5d2d9c93b2f4cddea1c575251531ef3 | arm | unknown | NOK | http://autobuild.buildroot.net/results/2d728342ca41acb4d743ce17486c4f9af3d32402 | sparc | unknown | NOK | http://autobuild.buildroot.net/results/6f05fbd6f0cb200d32ef5763494139c97a9f7652 | mips64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/54648c2bcc26f718718e7e20636bb548acbbf494 | ORPH mipsel | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/c7304dd6eb59109f8f41c9b606fcc3b8b8f6fc2c | ORPH riscv32 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/f056ebe7749a69994afba39a9d4967e2774c45ea | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/502a2b217845eb290c1961d4740b032462f8ae53 | armeb | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/ee6c07791e5d3b4c57ca95f80955230acee9c28f | microblaze | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/f998d56bb2d53485a42e6057c12269db66e64ba5 | ORPH aarch64_be | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/6e01e37b119a4f3028f30cf272396a990f708e29 | ORPH or1k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/69782b4ea44d07f609eebc2c06722af6eb14875a | ORPH mips64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/21f72b10b6f73c61b21893ef70e57c5620517413 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/40c2a03577a636eaee88bc83f2bbd4aa51df30f5 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/cd0e0437687df3e85406f4a50920255fa455de16 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/e5e25a80af3bc3379b2b5617f8d30809c04dbed9 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/24ede07b2b76ec410577fb3283a43047249e4b01 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/a10f968a008db7e418ea69e88340b7e4553c231c | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/cc05989189df98062c9a85b27908b350046bbfee | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/6db78e1e6f11009aec56f1a8a0322fccced63d12 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/9f4bc1004300719f70b86b97050cd125ec2337c1 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/38cacd3dab56c2a592b6d7a549bf3fad50a30f8f | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/d148aaec2a524293804e5b6efd6ad871e8c7ba10 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/b79b12de21b0a210477aa0eb89cbffd436418c0e | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/6a974ddc6a7c7d51d0e129da0e54dcc594fbb471 | ORPH aarch64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/8d7b5dad6cd6fdc47f5f069e18e5d7b61f9eb354 | mips64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/09060bb361fe1fcb1d6c7bfabc33eeb9fa919815 | Classification of failures by reason for 2022.11.x -------------------------------------------------- unknown | 2 frr-8.3.1 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 host-binutils-2.39 | 1 host-gcc-initial-12.2.0 | 1 libgcrypt-1.10.1 | 1 libnss-3.84 | 1 libopenssl-1.1.1q | 1 linux-6.0.19 | 1 lirc-tools-0.10.2 | 1 musl-1.2.3 | 1 pv-1.6.20 | 1 python-numpy-1.23.4 | 1 xxhash-0.8.1 | 1 xz-5.2.7 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- xtensa | frr-8.3.1 | NOK | http://autobuild.buildroot.net/results/9c9b65fb8c632fbae9e5ce1b34ace456d109497a | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/6b0d121aaae138ff12408befa1bd0c5a7e9776bc | mipsel | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/93fd9ddf666c4ef310504298c42396457c7a2760 | arm | host-gcc-initial-12.2.0 | NOK | http://autobuild.buildroot.net/results/32690752960ca774bed32eaf3ed18d442a05e589 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/760fc6371456dc3a7f3566ca182144e5bda6c26e | ORPH sh4a | libnss-3.84 | NOK | http://autobuild.buildroot.net/results/43fad5f946728c4fe04a35bcc639390f20fc5ed6 | s390x | libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/77fc3cedeefa47c0ef29a45dee89c6ba0fad282d | mips | linux-6.0.19 | NOK | http://autobuild.buildroot.net/results/822c8c731770d8e02f2ebfaed10b57166e72a0fe | ORPH mips | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/56bfa82a80b92ea293ea33bf109ac7e58bb4599d | ORPH powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/e7adb7e9f40befb38878e3dff4226f13101a30e5 | armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/998e74b401ae0ad369eb1e951ff083a8d5a3fcb3 | ORPH armeb | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/55ea4b3bedabd0565f458e55710fea1e551eb36f | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/12867e5d4afb9e978908a2085219eb712e95db8d | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/a41fd4768291465566fa6a0be3a356815f7649fc | arm | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/7b439ce04b31781892688ab13eb642f0e94944dc | ORPH microblazeel | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/749e3053478c1b7ff18f536deb368cf920c58736 | ORPH -- http://autobuild.buildroot.net From dario.binacchi at amarulasolutions.com Tue Feb 7 08:21:36 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 7 Feb 2023 09:21:36 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/beaglebone: bump Linux version to 5.10.162-ti-r56 Message-ID: <20230207082136.90164-1-dario.binacchi@amarulasolutions.com> The previous version failed to boot from sd card with a log reported by the document [1]. In my case it always failed, a 100% failure against 75% reported by the document. Instead of adding the patch to fix the problem, I preferred to update the kernel version. Tested on beaglebone black. [1] https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 Signed-off-by: Dario Binacchi --- Changes in v2: - bump version to 5.10.162-ti-r56. Signed-off-by: Dario Binacchi --- configs/beaglebone_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 639b491e9746..3ce5721265c3 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.162-ti-r56)/linux-5.10.162-ti-r56.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" -- 2.32.0 From thomas.petazzoni at bootlin.com Tue Feb 7 08:24:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:24:16 +0100 Subject: [Buildroot] [git commit] utils/get-developers: bail out on parsing errors Message-ID: <20230207082427.4F2D983EAF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ee1dd85a34b6228c634a66450deefadbb2c9b50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently 4 types of parsing errors/warnings can be found: - entry for a file that is not in the tree anymore (warning) - developer entry with no file entry (error) - file entry with no developer (error) - entry that is not a developer, a file or a comment (hard error) Currently only the last one ends the script with -v with error code. Make all 3 error types into hard errors and bail out at the first error found, because the rest of the state machine is not designed to handle malformed input. Suggested-by: Thomas Petazzoni Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/testing/tests/utils/test_get_developers.py | 9 ++++----- utils/getdeveloperlib.py | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/testing/tests/utils/test_get_developers.py b/support/testing/tests/utils/test_get_developers.py index 12710fe8d3..0b313c7c59 100644 --- a/support/testing/tests/utils/test_get_developers.py +++ b/support/testing/tests/utils/test_get_developers.py @@ -70,11 +70,11 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) self.assertIn("Syntax error in DEVELOPERS file, line 1", err) - self.assertEqual(rc, 0) + self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) - # -v generating error for developer entry with no file entries + # -v generating error for developer entry with no file entries, stopping on first error developers = b'# comment\n' \ b'# comment\n' \ b'\n' \ @@ -84,10 +84,9 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) self.assertIn("Syntax error in DEVELOPERS file, line 1", err) - self.assertIn("Syntax error in DEVELOPERS file, line 2", err) - self.assertEqual(rc, 0) + self.assertEqual(rc, 1) self.assertEqual(len(out), 0) - self.assertEqual(len(err), 2) + self.assertEqual(len(err), 1) # -v not generating error for developer entry with empty list of file entries developers = b'# comment\n' \ diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index 2a8d5c213c..dbd21af443 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -243,6 +243,7 @@ def parse_developers(filename=None): if name is not None or len(files) != 0: print("Syntax error in DEVELOPERS file, line %d" % linen, file=sys.stderr) + return None name = line[2:].strip() elif line.startswith("F:"): fname = line[2:].strip() From thomas.petazzoni at bootlin.com Tue Feb 7 08:24:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:24:16 +0100 Subject: [Buildroot] [git commit] utils/get-developers: print error for correct line Message-ID: <20230207082427.5C7BB83EB2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de03312db0190adc5b7dfa5b7658b2275801c933 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Start counting the line numbers in 1 instead of 0, in case an error must be printed. Both the error about a developer entry with no file entry and the error about a file entry with no developer entry actually belong to the non-empty line previous the one being analysed, so in these cases print the line number from the line before. Also count empty and comment lines, so a developer fixing the file can jump to the correct line (or the nearest one). At same time standardize the messages, printing the line number also in the case of a warning for a file that is not in the tree anymore. Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/testing/tests/utils/test_get_developers.py | 16 ++++++++-------- utils/getdeveloperlib.py | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/support/testing/tests/utils/test_get_developers.py b/support/testing/tests/utils/test_get_developers.py index 0b313c7c59..ffc01f6ce7 100644 --- a/support/testing/tests/utils/test_get_developers.py +++ b/support/testing/tests/utils/test_get_developers.py @@ -48,7 +48,7 @@ class TestGetDevelopers(unittest.TestCase): # -v generating error, called from the main dir developers = b'text1\n' out, err, rc = call_get_developers("./utils/get-developers", ["-v"], self.WITH_EMPTY_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 0: 'text1'", err) + self.assertIn("Syntax error in DEVELOPERS file, line 1: 'text1'", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -56,7 +56,7 @@ class TestGetDevelopers(unittest.TestCase): # -v generating error, called from path developers = b'text2\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 0: 'text2'", err) + self.assertIn("Syntax error in DEVELOPERS file, line 1: 'text2'", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -69,7 +69,7 @@ class TestGetDevelopers(unittest.TestCase): b'N:\tAuthor2 \n' \ b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 1", err) + self.assertIn("Syntax error in DEVELOPERS file, line 4", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -83,7 +83,7 @@ class TestGetDevelopers(unittest.TestCase): b'N:\tAuthor3 \n' \ b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 1", err) + self.assertIn("Syntax error in DEVELOPERS file, line 4", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -108,8 +108,8 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tpath/that/does/not/exists/1\n' \ b'F:\tpath/that/does/not/exists/2\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file", err) - self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file", err) + self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file, line 2", err) + self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file, line 3", err) self.assertEqual(rc, 0) self.assertEqual(len(out), 0) self.assertEqual(len(err), 2) @@ -119,8 +119,8 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tpath/that/does/not/exists/1\n' \ b'F:\tpath/that/does/not/exists/2\n' out, err, rc = call_get_developers("./utils/get-developers", ["-c"], self.WITH_EMPTY_PATH, topdir, developers) - self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file", err) - self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file", err) + self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file, line 2", err) + self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file, line 3", err) self.assertEqual(rc, 0) self.assertGreater(len(out), 1000) self.assertEqual(len(err), 2) diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index dbd21af443..e7d0d23e49 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -236,12 +236,13 @@ def parse_developers(filename=None): files = [] name = None for line in f: + linen += 1 line = line.strip() if line.startswith("#"): continue elif line.startswith("N:"): if name is not None or len(files) != 0: - print("Syntax error in DEVELOPERS file, line %d" % linen, + print("Syntax error in DEVELOPERS file, line %d" % (linen - 1), file=sys.stderr) return None name = line[2:].strip() @@ -249,7 +250,7 @@ def parse_developers(filename=None): fname = line[2:].strip() dev_files = glob.glob(os.path.join(brpath, fname)) if len(dev_files) == 0: - print("WARNING: '%s' doesn't match any file" % fname, + print("WARNING: '%s' doesn't match any file, line %d" % (fname, linen), file=sys.stderr) for f in dev_files: dev_file = os.path.relpath(f, brpath) @@ -267,7 +268,6 @@ def parse_developers(filename=None): print("Syntax error in DEVELOPERS file, line %d: '%s'" % (linen, line), file=sys.stderr) return None - linen += 1 # handle last developer if name is not None: developers.append(Developer(name, files)) From thomas.petazzoni at bootlin.com Tue Feb 7 08:24:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:24:47 +0100 Subject: [Buildroot] [next, v2 1/2] utils/get-developers: bail out on parsing errors In-Reply-To: <20221127144819.2022348-1-ricardo.martincoski@gmail.com> References: <20221127144819.2022348-1-ricardo.martincoski@gmail.com> Message-ID: <20230207092447.563f22a5@windsurf> On Sun, 27 Nov 2022 11:48:18 -0300 Ricardo Martincoski wrote: > Currently 4 types of parsing errors/warnings can be found: > - entry for a file that is not in the tree anymore (warning) > - developer entry with no file entry (error) > - file entry with no developer (error) > - entry that is not a developer, a file or a comment (hard error) > > Currently only the last one ends the script with -v with error code. > > Make all 3 error types into hard errors and bail out at the first error > found, because the rest of the state machine is not designed to handle > malformed input. > Suggested-by: Thomas Petazzoni > > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - do not change warning to error, an entry for a file that is not in > the tree anymore is not a syntax error (Thomas) > - add the lineno on the warning messages in the next patch instead of > this patch Both applied to master! Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 08:34:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:34:08 +0100 Subject: [Buildroot] [git commit] support/tests: enable PPD, and thus TLPB, for systemd tests Message-ID: <20230207083424.6B2B183F27@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82f84b4cfbe7d7631b34b67f10e9709772dd1165 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/testing/tests/init/test_systemd.py | 1 + 1 file changed, 1 insertion(+) diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index 06c42736ae..ddc32b0838 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -13,6 +13,7 @@ class InitSystemSystemdBase(InitSystemBase): BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # BR2_TARGET_ROOTFS_TAR is not set + BR2_PER_PACKAGE_DIRECTORIES=y """ def check_systemd(self, fs): From thomas.petazzoni at bootlin.com Tue Feb 7 08:31:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:31:41 +0100 Subject: [Buildroot] [git commit] support/tests: allow top-level parallel builds Message-ID: <20230207083424.5FCA883F26@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c41fb6225632ecea0b7008969bb70cf8e2636ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Running tests with top-level parallel builds can speed up running some tests, expecially those that have a lot of packages like the systemd init tests. Trigger TLPB when the configuration enables per-package directories. We're using the jlevel argument, which normally is used for BR2_JLEVEL as the value for calling make -j at the top-level. In fact, BR2_JLEVEL is "unused" when using TLPB, because the top-level make acts as the job server that distributes tokens to sub-makes (except for the few build systems like waf or scons that don't support this), so it's really the top-level make -j that determines the level of parallelism, and BR2_JLEVEL doesn't really have an effect. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni [Thomas: extend explanation a bit] Signed-off-by: Thomas Petazzoni --- support/testing/infra/basetest.py | 2 +- support/testing/infra/builder.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 45bcd4c2e2..670c7213d6 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -52,7 +52,7 @@ class BRConfigTest(unittest.TestCase): def setUp(self): self.show_msg("Starting") - self.b = Builder(self.config, self.builddir, self.logtofile) + self.b = Builder(self.config, self.builddir, self.logtofile, self.jlevel) if not self.keepbuilds: self.b.delete() diff --git a/support/testing/infra/builder.py b/support/testing/infra/builder.py index 922a707220..a2abb9ed89 100644 --- a/support/testing/infra/builder.py +++ b/support/testing/infra/builder.py @@ -6,11 +6,12 @@ import infra class Builder(object): - def __init__(self, config, builddir, logtofile): + def __init__(self, config, builddir, logtofile, jlevel=None): self.config = '\n'.join([line.lstrip() for line in config.splitlines()]) + '\n' self.builddir = builddir self.logfile = infra.open_log_file(builddir, "build", logtofile) + self.jlevel = jlevel def is_defconfig_valid(self, configfile, defconfig): """Check if the .config is contains all lines present in the defconfig.""" @@ -87,6 +88,8 @@ class Builder(object): env.update(make_extra_env) cmd = ["make", "-C", self.builddir] + if "BR2_PER_PACKAGE_DIRECTORIES=y" in self.config.splitlines() and self.jlevel: + cmd.append(f"-j{self.jlevel}") cmd += make_extra_opts ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, From thomas.petazzoni at bootlin.com Tue Feb 7 08:39:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:39:25 +0100 Subject: [Buildroot] [PATCH 2/3] support/tests: allow top-level parallel builds In-Reply-To: References: Message-ID: <20230207093925.6cd7a7c9@windsurf> On Sat, 24 Dec 2022 10:18:12 +0100 "Yann E. MORIN" wrote: > Running tests with top-level parallel builds can speed up running some > tests, expecially those that have a lot of packages like the systemd > init tests. > > Trigger TLPB when the configuration enables per-package directories. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > --- > support/testing/infra/basetest.py | 2 +- > support/testing/infra/builder.py | 5 ++++- > 2 files changed, 5 insertions(+), 2 deletions(-) Thanks to the additional explanation you provided, I understood better the idea, and therefore applied the patch. I updated the commit log a little bit to summarize the explanation you gave, and applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 08:39:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:39:32 +0100 Subject: [Buildroot] [PATCH 3/3] support/tests: enable PPD, and thus TLPB, for systemd tests In-Reply-To: <9b491a410b4067fb2107567b79329ec541f8b241.1671873478.git.yann.morin.1998@free.fr> References: <9b491a410b4067fb2107567b79329ec541f8b241.1671873478.git.yann.morin.1998@free.fr> Message-ID: <20230207093932.5f0ace73@windsurf> On Sat, 24 Dec 2022 10:18:13 +0100 "Yann E. MORIN" wrote: > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > --- > support/testing/tests/init/test_systemd.py | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Tue Feb 7 08:39:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 09:39:29 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require English perl package for host-libxml-parser-perl Message-ID: <20230207083951.455AD83F4E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f8085e63a4a755d587a25a73dbaafe33b23f867 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes http://autobuild.buildroot.net/results/166/1667b4ebd8e16e7d8b47bc3ca128a76daf27b4d9/ The configure script of host-libxml-parser-perl needs the English perl module on the host: ERROR from evaluation of /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/Expat/Makefile.PL: Can't locate English.pm in @INC (you may need to install the English module) (@INC contains: /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/inc /home/buildroot/autobuild/instance-1/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at ./Makefile.PL line 3. So add a check for it in dependencies.sh similar to the existing check for ExtUtils::MakeMaker. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index afd30008e8..ea16a21e20 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -266,6 +266,7 @@ fi # Check that the Perl installation is complete enough for Buildroot. required_perl_modules="Data::Dumper" # Needed to build host-autoconf +required_perl_modules="$required_perl_modules English" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl From marcus.folkesson at gmail.com Tue Feb 7 08:54:45 2023 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Tue, 7 Feb 2023 09:54:45 +0100 Subject: [Buildroot] [PATCH] package/libcamera-apps: enable LIBAV only if libdrm is present Message-ID: <20230207085445.1651226-1-marcus.folkesson@gmail.com> Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps does enable LIBAV by default which depends on libdrm. Fixes: - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 13 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Marcus Folkesson --- package/libcamera-apps/libcamera-apps.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 290ee9a026..385c65136e 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -25,8 +25,10 @@ LIBCAMERA_APPS_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_LIBDRM),y) LIBCAMERA_APPS_DEPENDENCIES += libdrm LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 endif ifeq ($(BR2_PACKAGE_XORG7),y) -- 2.38.1 From yann.morin.1998 at free.fr Tue Feb 7 09:03:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 10:03:25 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/cni-plugins: new package In-Reply-To: <20220904125359.18844-1-raphael.pavlidis@gmail.com> References: <20220616163309.5271-1-raphael.pavlidis@gmail.com> <20220904125359.18844-1-raphael.pavlidis@gmail.com> Message-ID: <20230207090325.GA4124@scaer> Raphael, All, On 2022-09-04 14:53 +0200, Raphael Pavlidis spake thusly: > cni-plugins contains some reference networking plugins, maintained by > the CNI team. > > Signed-off-by: Raphael Pavlidis We had cni-plugins added by Christian, and we're now at version 1.2.0. I'm not sure whether it makes sense to have a selection for each and individual plugins, but if you think that does, then feel free to respin an update. Thanks! Regards, Yann E. MORIN. > --- > Changes v2 -> v3: > - DEVELOPERS: add Raphael Pavlids for cni-plugins > > Changes v1 -> v2: > - change BR2_PACKAGE_CNI_PLUGINS from config to menuconfig > - turn on all plugins by default > > DEVELOPERS | 3 + > package/Config.in | 1 + > package/cni-plugins/Config.in | 108 +++++++++++++++++++++++++++ > package/cni-plugins/cni-plugins.hash | 3 + > package/cni-plugins/cni-plugins.mk | 77 +++++++++++++++++++ > 5 files changed, 192 insertions(+) > create mode 100644 package/cni-plugins/Config.in > create mode 100644 package/cni-plugins/cni-plugins.hash > create mode 100644 package/cni-plugins/cni-plugins.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index d2bd0d809a..208330881c 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2506,6 +2506,9 @@ F: support/testing/tests/package/test_python_jmespath.py > F: support/testing/tests/package/test_python_rsa.py > F: support/testing/tests/package/test_python_s3transfer.py > > +N: Raphael Pavlidis > +F: package/cni-plugins/ > + > N: Refik Tuzakli > F: package/freescale-imx/ > F: package/paho-mqtt-cpp/ > diff --git a/package/Config.in b/package/Config.in > index d1c098c48f..00e9a5a99f 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1812,6 +1812,7 @@ menu "Networking" > source "package/bluez5_utils-headers/Config.in" > source "package/c-ares/Config.in" > source "package/cgic/Config.in" > + source "package/cni-plugins/Config.in" > source "package/cppzmq/Config.in" > source "package/curlpp/Config.in" > source "package/czmq/Config.in" > diff --git a/package/cni-plugins/Config.in b/package/cni-plugins/Config.in > new file mode 100644 > index 0000000000..9ce13f4bbe > --- /dev/null > +++ b/package/cni-plugins/Config.in > @@ -0,0 +1,108 @@ > +menuconfig BR2_PACKAGE_CNI_PLUGINS > + bool "cni-plugins" > + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS > + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS > + help > + Some reference and example networking plugins, maintained by the CNI team. > + > + https://github.com/containernetworking/plugins > + > +if BR2_PACKAGE_CNI_PLUGINS > + > +config BR2_PACKAGE_CNI_PLUGINS_BRIDGE > + bool "bridge" > + default y > + help > + Creates a bridge, adds the host and the container to it. > + > +config BR2_PACKAGE_CNI_PLUGINS_IPVLAN > + bool "ipvlan" > + default y > + help > + Adds an ipvlan interface in the container. > + > +config BR2_PACKAGE_CNI_PLUGINS_LOOPBACK > + bool "loopback" > + default y > + help > + Set the state of loopback interface to up. > + > +config BR2_PACKAGE_CNI_PLUGINS_MACVLAN > + bool "macvlan" > + default y > + help > + Creates a new MAC address, forwards all traffic to that to the container. > + > +config BR2_PACKAGE_CNI_PLUGINS_PTP > + bool "ptp" > + default y > + help > + Creates a veth pair. > + > +config BR2_PACKAGE_CNI_PLUGINS_VLAN > + bool "vlan" > + default y > + help > + Creates a veth pair. > + > +config BR2_PACKAGE_CNI_PLUGINS_HOST_DEVICE > + bool "host-device" > + default y > + help > + Move an already-existing device into a container. > + > +config BR2_PACKAGE_CNI_PLUGINS_DHCP > + bool "dhcp" > + default y > + help > + Runs a daemon on the host to make DHCP requests on behalf of the > + container. > + > +config BR2_PACKAGE_CNI_PLUGINS_HOST_LOCAL > + bool "host-local" > + default y > + help > + Maintains a local database of allocated IPs. > + > +config BR2_PACKAGE_CNI_PLUGINS_STATIC > + bool "static" > + default y > + help > + Allocate a single static IPv4/IPv6 address to container. It's useful in > + debugging purpose. > + > +config BR2_PACKAGE_CNI_PLUGINS_TUNING > + bool "tuning" > + default y > + help > + Tweaks sysctl parameters of an existing interface. > + > +config BR2_PACKAGE_CNI_PLUGINS_PORTMAP > + bool "portmap" > + default y > + help > + An iptables-based portmapping plugin. Maps ports from the host's address > + space to the container. > + > +config BR2_PACKAGE_CNI_PLUGINS_BANDWIDTH > + bool "bandwidth" > + default y > + help > + Allows bandwidth-limiting through use of traffic control tbf > + (ingress/egress). > + > +config BR2_PACKAGE_CNI_PLUGINS_SBR > + bool "sbr" > + default y > + help > + A plugin that configures source based routing for an interface (from which > + it is chained). > + > +config BR2_PACKAGE_CNI_PLUGINS_FIREWALL > + bool "firewall" > + default y > + help > + A firewall plugin which uses iptables or firewalld to add rules to allow > + traffic to/from the container. > + > +endif # BR2_PACKAGE_CNI_PLUGINS > diff --git a/package/cni-plugins/cni-plugins.hash b/package/cni-plugins/cni-plugins.hash > new file mode 100644 > index 0000000000..c987e1ff45 > --- /dev/null > +++ b/package/cni-plugins/cni-plugins.hash > @@ -0,0 +1,3 @@ > +# Locally computed: > +sha256 c86c44877c47f69cd23611e22029ab26b613f620195b76b3ec20f589367a7962 cni-plugins-1.1.1.tar.gz > +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE > diff --git a/package/cni-plugins/cni-plugins.mk b/package/cni-plugins/cni-plugins.mk > new file mode 100644 > index 0000000000..02abcd283c > --- /dev/null > +++ b/package/cni-plugins/cni-plugins.mk > @@ -0,0 +1,77 @@ > +################################################################################ > +# > +# cni-plugins > +# > +################################################################################ > + > +CNI_PLUGINS_VERSION = 1.1.1 > +CNI_PLUGINS_SITE = $(call github,containernetworking,plugins,v$(CNI_PLUGINS_VERSION)) > +CNI_PLUGINS_LICENSE = Apache-2.0 > +CNI_PLUGINS_LICENSE_FILES = LICENSE > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_BRIDGE),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/bridge > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_IPVLAN),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/ipvlan > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_LOOPBACK),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/loopback > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_MACVLAN),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/macvlan > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_PTP),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/ptp > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_VLAN),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/vlan > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_HOST_DEVICE),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/host-device > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_DHCP),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/ipam/dhcp > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_HOST_LOCAL),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/ipam/host-local > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_STATIC),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/ipam/static > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_TUNING),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/meta/tuning > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_PORTMAP),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/meta/portmap > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_BANDWIDTH),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/meta/bandwidth > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_SBR),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/meta/sbr > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_FIREWALL),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/meta/firewall > +endif > + > +define CNI_PLUGINS_INSTALL_TARGET_CMDS > + $(INSTALL) -d $(TARGET_DIR)/usr/libexec/cni > + $(INSTALL) -D -m 0755 $(@D)/bin/* $(TARGET_DIR)/usr/libexec/cni/ > +endef > + > +$(eval $(golang-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 thomas.petazzoni at bootlin.com Tue Feb 7 09:03:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:03:57 +0100 Subject: [Buildroot] [PATCH 2/2] configs/beaglebone: bump U-Boot version to 2022.10 In-Reply-To: <20230205214132.6941-2-dario.binacchi@amarulasolutions.com> References: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> <20230205214132.6941-2-dario.binacchi@amarulasolutions.com> Message-ID: <20230207100357.5503a9f5@windsurf> On Sun, 5 Feb 2023 22:41:32 +0100 Dario Binacchi wrote: > Starting from version 2021.10 only distro booting is supported, as > reported by commit ff8f277e9121 ("ti: am335x_evm: Switch to DISTRO_BOOT only"). > The patch allows to update U-Boot to versions later than 2021.10. > > Tested on beaglebone black. > > Signed-off-by: Dario Binacchi > --- > board/beaglebone/extlinux.conf | 4 ++++ > board/beaglebone/genimage.cfg | 1 + > board/beaglebone/post-build.sh | 2 ++ > configs/beaglebone_defconfig | 2 +- > 4 files changed, 8 insertions(+), 1 deletion(-) > create mode 100644 board/beaglebone/extlinux.conf Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 09:04:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:04:22 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/beaglebone: bump Linux version to 5.10.162-ti-r56 In-Reply-To: <20230207082136.90164-1-dario.binacchi@amarulasolutions.com> References: <20230207082136.90164-1-dario.binacchi@amarulasolutions.com> Message-ID: <20230207100422.5fbd4d71@windsurf> On Tue, 7 Feb 2023 09:21:36 +0100 Dario Binacchi wrote: > The previous version failed to boot from sd card with a log reported by > the document [1]. In my case it always failed, a 100% failure against > 75% reported by the document. > > Instead of adding the patch to fix the problem, I preferred to update > the kernel version. > > Tested on beaglebone black. > > [1] https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 > Signed-off-by: Dario Binacchi > > --- Applied to master, thanks. However, when you send a v2, please always resend the full series, otherwise it's very confusing for us on the maintainer side to figure out where are the other patches of the same series. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 09:05:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:05:19 +0100 Subject: [Buildroot] [git commit] configs/beaglebone: bump U-Boot version to 2022.10 Message-ID: <20230207090529.373EE83F69@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=588ccf38618e1d9401f6636c7565424d438a51b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Starting from version 2021.10 only distro booting is supported, as reported by commit ff8f277e9121 ("ti: am335x_evm: Switch to DISTRO_BOOT only"). The patch allows to update U-Boot to versions later than 2021.10. Tested on beaglebone black. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- board/beaglebone/extlinux.conf | 4 ++++ board/beaglebone/genimage.cfg | 1 + board/beaglebone/post-build.sh | 2 ++ configs/beaglebone_defconfig | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/board/beaglebone/extlinux.conf b/board/beaglebone/extlinux.conf new file mode 100644 index 0000000000..13affcabd4 --- /dev/null +++ b/board/beaglebone/extlinux.conf @@ -0,0 +1,4 @@ +label beaglebone-buildroot + kernel /zImage + fdtdir / + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index 987d205075..4b026fda84 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -12,6 +12,7 @@ image boot.vfat { "am335x-bonegreen.dtb", "am335x-boneblack-wireless.dtb", "am335x-bonegreen-wireless.dtb", + "extlinux" } } diff --git a/board/beaglebone/post-build.sh b/board/beaglebone/post-build.sh index ffdd19138c..b7afd92ffe 100755 --- a/board/beaglebone/post-build.sh +++ b/board/beaglebone/post-build.sh @@ -2,3 +2,5 @@ BOARD_DIR="$(dirname $0)" cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 3ce5721265..d0aa5ad860 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -34,7 +34,7 @@ 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="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set From thomas.petazzoni at bootlin.com Tue Feb 7 09:05:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:05:19 +0100 Subject: [Buildroot] [git commit] configs/beaglebone: bump Linux version to 5.10.162-ti-r56 Message-ID: <20230207090529.2C8CF83F68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=010de6d5c7e2ebafe08234e32818bc0db2ebc569 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The previous version failed to boot from sd card with a log reported by the document [1]. In my case it always failed, a 100% failure against 75% reported by the document. Instead of adding the patch to fix the problem, I preferred to update the kernel version. Tested on beaglebone black. [1] https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- configs/beaglebone_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 639b491e97..3ce5721265 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.162-ti-r56)/linux-5.10.162-ti-r56.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" From peter at korsgaard.com Tue Feb 7 09:06:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 10:06:28 +0100 Subject: [Buildroot] [git commit] support/testing: test_check_package.py: fix flake8 line length error Message-ID: <20230207090641.4CCCF83F78@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63da115085ca0cb369ab3c644200ba4b025da48b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit d631615eb1b8 (support/testing: test check-package ignore list) added a too long line causing the check-flake8 target to fail: support/testing/tests/utils/test_check_package.py:233:133: E501 line too long (138 > 132 characters) https://gitlab.com/buildroot.org/buildroot/-/jobs/3726245521 Signed-off-by: Peter Korsgaard --- support/testing/tests/utils/test_check_package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index ce1998753c..580ad56d42 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -230,5 +230,6 @@ class TestCheckPackage(unittest.TestCase): self.assert_warnings_generated_for_file(m) self.assertIn("{}:0: Indent was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" .format(subdir_file), w) - self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update " + ".checkpackageignore_outdated?" .format(subdir_file), w) From thomas.petazzoni at bootlin.com Tue Feb 7 09:21:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:21:48 +0100 Subject: [Buildroot] [PATCH] toolchain-external: handle case of dangling symlink In-Reply-To: <20220624221901.514921-1-mmayer@broadcom.com> References: <20220624221901.514921-1-mmayer@broadcom.com> Message-ID: <20230207102148.28d2ed73@windsurf> On Fri, 24 Jun 2022 15:19:01 -0700 Markus Mayer via buildroot wrote: > copy_toolchain_lib_root was not handling the case of "readlink" > returning nothing, which will happen if the symlink it is trying to > resolve does not point to a valid file on the build host. This > shouldn't happen, but it can. > > The end result of this situation would be an endless loop of error > messages that would only end if aborted manually. > > [...] > cp: missing destination file operand after > '/local/users/mmayer/buildroot/output/arm64/target//' > Try 'cp --help' for more information. > readlink: missing operand > Try 'readlink --help' for more information. > basename: missing operand > Try 'basename --help' for more information. > dirname: missing operand > Try 'dirname --help' for more information. > ^C > make[1]: *** [package/pkg-generic.mk:384: > > Instead of looping endlessly without explanation, let's abort and > inform the user that something seems amiss with their setup. > > Signed-off-by: Markus Mayer > --- > toolchain/helpers.mk | 5 +++++ > 1 file changed, 5 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 09:23:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:23:26 +0100 Subject: [Buildroot] [PATCH] toolchain-external: handle case of dangling symlink In-Reply-To: References: <20220624221901.514921-1-mmayer@broadcom.com> Message-ID: <20230207102326.6d541a84@windsurf> Hello Romain, On Wed, 11 Jan 2023 15:47:50 +0100 Romain Naour wrote: > > + if [ "$${LIBPATH}" = "" ]; then \ > > + echo "LIBPATH empty after trying to resolve symlink $${OLD_LIBPATH}" 1>&2; \ > > + exit 1; \ > > + fi; \ > > I'm not sure it's ok to fail here on a dangling symlink. > Maybe add a check and ignore such dangling symlink with a warning for the user. > > It's unlikely that such dangling symlink provided by the toolchain will be useful. I hesitated a bit on this. But for now, I believe a toolchain with a dangling symlink is badly broken, and we should not work with it. A warning message with a build continuing will never be noticed by the user, so if we don't abort with hard error, nobody will notice. So I applied the patch of Markus as is for now. We will see if people complain that this breaks with their toolchain, and if it does, we will change the exit to a break to simply move on to handle the next library. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Tue Feb 7 09:33:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 10:33:33 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require open perl package for libxcrypt Message-ID: <20230207093548.1B15A83F98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4cdd99190e89d538c25a8fc701372775fbde3b97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/16c/16cba783be11cc5024f9c56bb0a7abb0acf13ef8/ The configure script of libxcrypt needs the open perl module on the host: Can't locate open.pm in @INC (you may need to install the open module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./build-aux/scripts/expand-selected-hashes line 20. So add a check for it in dependencies.sh similar to how it is done for mpv. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index ea16a21e20..353817f8fb 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -271,6 +271,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules open" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From dario.binacchi at amarulasolutions.com Tue Feb 7 09:49:13 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 7 Feb 2023 10:49:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/uuu: bump to version 1.5.21 Message-ID: <20230207094913.603489-1-dario.binacchi@amarulasolutions.com> - Fixed android super.img loop download 52byte after some block - Use login header as in curl - Skip sleep in usb_add - Add empty line after input password - linux prompt ask user name and password for http(s) download - fix linux build failure Signed-off-by: Dario Binacchi --- package/uuu/uuu.hash | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index cc1cd8326672..a5b665620c64 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 932c0a4acde0f52b907f5693c6d133c83142c4ca6e9df05a38b3ac1e50628883 uuu_source-1.5.11.tar.gz +sha256 e89d3665af499ab71360d948176cf64619b082f8272a994d1fbfc000e67c0f14 uuu_source-1.5.21.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE sha256 584bfbb18b4c08b872d48b80419dd453307212a144134fb516bd6ddc0700c2e8 README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 647015e2dd85..1a5f84ce4d7d 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.11 +UUU_VERSION = 1.5.21 UUU_SOURCE = uuu_source-$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License -- 2.32.0 From peter at korsgaard.com Tue Feb 7 09:51:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 07 Feb 2023 10:51:26 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-bunch: remove package In-Reply-To: <20221212154111.2865211-1-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 12 Dec 2022 08:41:11 -0700") References: <20221212154111.2865211-1-james.hilliard1@gmail.com> Message-ID: <87sffh7qht.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Since the python3 bump to version 3.11 in commit > 738500c296c8b1206f20e94ca3e7c5932a6a0486 python-bunch has failed > to build. > This is due to open() which no longer accepts 'U' (?universal > newline?) in the file mode. > Remove this package as it has not had a release since 2011 and > is unmaintained upstream. > Details: > https://docs.python.org/3.11/whatsnew/3.11.html#porting-to-python-3-11 > Fixes: > - http://autobuild.buildroot.net/results/2ba/2ba72fc9837605a36ea63bbd3e6e181a40cdf360 > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - add comment about python-munch replacement Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 7 09:50:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 10:50:36 +0100 Subject: [Buildroot] [git commit] package/python-bunch: remove package Message-ID: <20230207095148.98DB483FBA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29fd8481e22fd7e8ac00e0bc47614ff06be33706 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since the python3 bump to version 3.11 in commit 738500c296c8b1206f20e94ca3e7c5932a6a0486 python-bunch has failed to build. This is due to open() which no longer accepts 'U' (???universal newline???) in the file mode. Remove this package as it has not had a release since 2011 and is unmaintained upstream. Details: https://docs.python.org/3.11/whatsnew/3.11.html#porting-to-python-3-11 Fixes: - http://autobuild.buildroot.net/results/2ba/2ba72fc9837605a36ea63bbd3e6e181a40cdf360 Signed-off-by: James Hilliard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-bunch/Config.in | 6 ------ package/python-bunch/python-bunch.hash | 5 ----- package/python-bunch/python-bunch.mk | 14 -------------- 6 files changed, 7 insertions(+), 27 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 61686fdd11..ad80522451 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_PYTHON_BUNCH + bool "python-bunch removed" + select BR2_LEGACY + help + The python-bunch package is unmaintained and is replaced + by the python-munch package. + config BR2_TARGET_GUMMIBOOT bool "gummiboot removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f8acf8776c..cad8d6affa 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2040,7 +2040,6 @@ F: package/policycoreutils/ F: package/proftpd/ F: package/protobuf-c/ F: package/protobuf/ -F: package/python-bunch/ F: package/python-colorama/ F: package/python-filelock/ F: package/python-flask-cors/ diff --git a/package/Config.in b/package/Config.in index b6211f1102..8b9570c447 100644 --- a/package/Config.in +++ b/package/Config.in @@ -985,7 +985,6 @@ menu "External python modules" source "package/python-bottle/Config.in" source "package/python-brotli/Config.in" source "package/python-bsdiff4/Config.in" - source "package/python-bunch/Config.in" source "package/python-cached-property/Config.in" source "package/python-can/Config.in" source "package/python-canopen/Config.in" diff --git a/package/python-bunch/Config.in b/package/python-bunch/Config.in deleted file mode 100644 index 89eae742b8..0000000000 --- a/package/python-bunch/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_BUNCH - bool "python-bunch" - help - A dot-accessible dictionary (a la JavaScript objects). - - http://github.com/dsc/bunch diff --git a/package/python-bunch/python-bunch.hash b/package/python-bunch/python-bunch.hash deleted file mode 100644 index cfde2db603..0000000000 --- a/package/python-bunch/python-bunch.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/bunch/json -md5 0a829d64e95ed96defbcae2bf9061bb0 bunch-1.0.1.tar.gz -sha256 50c77a0fc0cb372dfe48b5e11937d5f70e743adbf42683f3a6d2857645a76aaa bunch-1.0.1.tar.gz -# Locally computed sha256 checksums -sha256 57ca95c92059c8380625192462979bd32994aae3fcdf902ff6eb1e467eeb0469 LICENSE.txt diff --git a/package/python-bunch/python-bunch.mk b/package/python-bunch/python-bunch.mk deleted file mode 100644 index 18fdc223bb..0000000000 --- a/package/python-bunch/python-bunch.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-bunch -# -################################################################################ - -PYTHON_BUNCH_VERSION = 1.0.1 -PYTHON_BUNCH_SOURCE = bunch-$(PYTHON_BUNCH_VERSION).tar.gz -PYTHON_BUNCH_SITE = https://files.pythonhosted.org/packages/ef/bf/a4cf1779a4ffb4f610903fa08e15d1f4a8a2f4e3353a02afbe097c5bf4a8 -PYTHON_BUNCH_SETUP_TYPE = setuptools -PYTHON_BUNCH_LICENSE = MIT -PYTHON_BUNCH_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) From jordan at jspeicher.com Tue Feb 7 10:02:15 2023 From: jordan at jspeicher.com (Jordan Speicher) Date: Tue, 7 Feb 2023 11:02:15 +0100 Subject: [Buildroot] [PATCH] package/mcelog: bump to version 191 Message-ID: <20230207100216.889464-1-jordan@jspeicher.com> Create .os_version to specify the version since there is no git checkout available. https://github.com/andikleen/mcelog/releases/tag/v191 https://github.com/andikleen/mcelog/releases/tag/v190 Signed-off-by: Jordan Speicher --- package/mcelog/mcelog.hash | 2 +- package/mcelog/mcelog.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash index e0350b085d..23fd4e50f3 100644 --- a/package/mcelog/mcelog.hash +++ b/package/mcelog/mcelog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 30364d134ff416f3f9469720add84bdccea226268d334f06022110f484550cd9 mcelog-189.tar.gz +sha256 b3b2616acde7afba4752d4dc447a2c2ad5a75da65e7496e0da30f8f8d2015cfa mcelog-191.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk index 8b5876d32e..9f7194e376 100644 --- a/package/mcelog/mcelog.mk +++ b/package/mcelog/mcelog.mk @@ -4,13 +4,14 @@ # ################################################################################ -MCELOG_VERSION = 189 +MCELOG_VERSION = 191 MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION)) MCELOG_LICENSE = GPL-2.0 MCELOG_LICENSE_FILES = LICENSE MCELOG_SELINUX_MODULES = mcelog define MCELOG_BUILD_CMDS + echo "$(MCELOG_VERSION)" > $(@D)/.os_version $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all endef -- 2.34.1 From yann.morin.1998 at free.fr Tue Feb 7 10:06:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:06:53 +0100 Subject: [Buildroot] [git commit] package/docker-proxy: drop package Message-ID: <20230207102011.A621783FFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ae48b70aedf38bf6e90a7bbea5bf28a7c55bdbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The docker-proxy binary (libnetwork) has been merged into the docker-engine source (moby). Drop the docker-proxy package and add cmd/docker-proxy as a build target of docker-engine instead. https://github.com/moby/libnetwork/commit/563fe8e248f3afac75a270f693f38bdc3eea7bf3 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/docker-engine/Config.in | 1 - package/docker-engine/docker-engine.mk | 2 +- package/docker-proxy/Config.in | 19 ------------------- package/docker-proxy/docker-proxy.hash | 3 --- package/docker-proxy/docker-proxy.mk | 21 --------------------- 8 files changed, 9 insertions(+), 47 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index ad80522451..72deb03c35 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy removed" + select BR2_LEGACY + select BR2_PACKAGE_DOCKER_ENGINE + help + docker-proxy has been dropped by upstream since version + 563fe8. it has been merged into docker-engine (moby). + config BR2_PACKAGE_PYTHON_BUNCH bool "python-bunch removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index cad8d6affa..f10036f7f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -545,7 +545,6 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-compose/ F: package/docker-engine/ -F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ diff --git a/package/Config.in b/package/Config.in index 8b9570c447..aa87f1305d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2618,7 +2618,6 @@ menu "System tools" source "package/docker-cli/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" - source "package/docker-proxy/Config.in" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 1f0efb8fcc..b5a356eab9 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_USE_MMU # containerd select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency - select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency help Docker is a platform to build, ship, diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index c50f08245d..ca1aa27b0a 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -24,7 +24,7 @@ DOCKER_ENGINE_LDFLAGS = \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs -DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_ENGINE_DEPENDENCIES += libapparmor diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in deleted file mode 100644 index 7e40536537..0000000000 --- a/package/docker-proxy/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_DOCKER_PROXY - bool "docker-proxy" - 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 - help - Libnetwork is a Container Network Model that provides a - consistent programming interface and the required network - abstractions for applications. - - This package provides docker-proxy, a run-time dependency of - Docker. - - https://github.com/docker/libnetwork - -comment "docker-proxy needs a 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_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash deleted file mode 100644 index 63296f14c1..0000000000 --- a/package/docker-proxy/docker-proxy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 05bf95637bae134d12d02bd7a7854cd0c768e6fccb662c2c64523f05b997b204 docker-proxy-f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk deleted file mode 100644 index fe7982e8f6..0000000000 --- a/package/docker-proxy/docker-proxy.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# docker-proxy -# -################################################################################ - -DOCKER_PROXY_VERSION = f6ccccb1c082a432c2a5814aaedaca56af33d9ea -DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) - -DOCKER_PROXY_LICENSE = Apache-2.0 -DOCKER_PROXY_LICENSE_FILES = LICENSE - -DOCKER_PROXY_DEPENDENCIES = host-pkgconf - -DOCKER_PROXY_BUILD_TARGETS = cmd/proxy - -define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy -endef - -$(eval $(golang-package)) From yann.morin.1998 at free.fr Tue Feb 7 10:06:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:06:55 +0100 Subject: [Buildroot] [git commit] package/docker-cli: bump version to v23.0.0 Message-ID: <20230207102011.B0C0C84000@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5599cb1b41289adcff86ecf91ee6c069fefa9c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Like docker-engine, docker-cli uses a non-standard vendor/ directory structure, so we use the same fixes as we introduced for docker-engine (see commit: package/docker-engine: bump version to v23.0.0): - remove the problematic vendor/modules.txt - create a go.mod Signed-off-by: Christian Stewart [yann.morin.1998 at free.fr: - use post-extract hook - simplify commit message to refer to docker-engine ] Signed-off-by: Yann E. MORIN --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index c6db95f9b3..ff981be963 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz +sha256 3379d06cd6177832b91f4796c680b6bf15c7895773448716b4c3c5253f611d1b docker-cli-23.0.0.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index cb44c68c1b..d61f47e46e 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.22 +DOCKER_CLI_VERSION = 23.0.0 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 @@ -29,6 +29,15 @@ DOCKER_CLI_TAGS += osusergo netgo DOCKER_CLI_GO_ENV = CGO_ENABLED=no endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_FIX_VENDORING + printf "module $(DOCKER_CLI_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef +DOCKER_CLI_POST_EXTRACT_HOOKS += DOCKER_CLI_FIX_VENDORING + DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) $(eval $(golang-package)) From yann.morin.1998 at free.fr Tue Feb 7 10:05:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:05:45 +0100 Subject: [Buildroot] [git commit] package/docker-engine: bump version to v23.0.0 Message-ID: <20230207102011.9634283FFC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=485b47e025541a58358d8852c600b8e7644b4ec6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This update requires a few workaround for the non-standard vendor/ structure in the docker-engine repository. First, as the vendor/ directory exists, our go-post-process script does not do the vendoring, and exits early, which is exactly what we need. Second, docker-engine does not use the "new" go.mod mechanism, so it does not ship any go.mod file, so our go-post-proces, exiting early, does not check that the go.mod file exists, and thus does not fail, which is again exactly what we need. Third, docker-engine has an invalid vendor/modules.txt file that we need to remove or go would fail to build. Since our go-post-process exits early, there is no vendoring, and thus it does not break at download, which once more is exactly what we need. However, the missing go.mod and the problematic vendor/modules.txt cause go to fail at build time, which this time is not really, even really not, what we want... So, we fix it up in two ways. First, the easy part: we just remove the problematic vendor/modules.txt file. Second, we create a go.mod to tell the Go compiler the root import path prefix for the module and the language version. Note that the language version in go.mod is not required to be equal the version of the Go compiler. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 Note that as of v23.0.0 docker-engine expects containerd to be started by systemd if --containerd= flag is set in dockerd.service, whereas in previous versions containerd was started by the docker daemon as a sub-process. There is no sysv unit for containerd, but this is OK: in the Docker sysv init file S60dockerd, we do not set the --containerd flag. The docker daemon will start containerd as a sub-process automatically due to the absence of this flag. Signed-off-by: Christian Stewart [yann.morin.1998 at free.fr: - run fixups in post-extract hook - rework commit log for (hopefully) better explanations ] Signed-off-by: Yann E. MORIN --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d15b1359cb..670cbd414b 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 2a9b72ca78..c50f08245d 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.22 +DOCKER_ENGINE_VERSION = 23.0.0 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -62,6 +62,15 @@ else DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_ENGINE_FIX_VENDORING + printf "module $(DOCKER_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef +DOCKER_ENGINE_POST_EXTRACT_HOOKS += DOCKER_ENGINE_FIX_VENDORING + DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD From yann.morin.1998 at free.fr Tue Feb 7 10:22:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:22:51 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/docker-engine: bump version to v23.0.0 In-Reply-To: <20230207043010.85696-1-christian@paral.in> References: <20230207043010.85696-1-christian@paral.in> Message-ID: <20230207102251.GB4124@scaer> Christian, All, On 2023-02-06 20:30 -0800, Christian Stewart via buildroot spake thusly: > docker-engine does not ship a go.mod file in the tarball: create one to tell the > Go compiler the root import path prefix for the module and the language version. > Note that the language version in go.mod is not required to be equal the version > of the Go compiler. > > This update requires a workaround for the non-standard vendor/ structure in the > docker-engine repository, which has an invalid vendor/modules.txt file. > > Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > > Note that as of v23.0.0 docker-engine expects containerd to be started by > systemd if --containerd= flag is set in dockerd.service, whereas in previous > versions containerd was started by the docker daemon as a sub-process. > > There is no sysv unit for containerd, but this is OK: in the Docker sysv init > file S60dockerd, we do not set the --containerd flag. The docker daemon will > start containerd as a sub-process automatically due to the absence of this flag. > > Signed-off-by: Christian Stewart I've applied to master, after a substantial rewording of the commit log (which already pretty good, thanks!). I also chaged to using a post-extract hook instead of using the configure_cmds. Indeed, currently, the golang infra does not use the configure step, but if we need it in the future, that woudl break here. So I've made that post-extract hooks, because that's what they are in practice (I hesitated with post-patch hooks, though, and I just arbitrarily settled for post-extract). I did the same for docker-cli. Series of three patches applied to master, thanks. Regards, Yann E. MORIN. > --- > > v1 -> v2: > > - clarify commit message about containerd.service and sysv compat > - fix formatting in S60dockerd > - bundle commit into a series with required containerd changes > > v2 -> v3: > > - remove whitespace changes (as per Yann review) > - use rm -f instead of checking for file existence > - add the go.mod file in the CONFIGURE step > > Signed-off-by: Christian Stewart > --- > package/docker-engine/docker-engine.hash | 2 +- > package/docker-engine/docker-engine.mk | 10 +++++++++- > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash > index d15b1359cb..670cbd414b 100644 > --- a/package/docker-engine/docker-engine.hash > +++ b/package/docker-engine/docker-engine.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz > +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk > index 2a9b72ca78..229e199aa2 100644 > --- a/package/docker-engine/docker-engine.mk > +++ b/package/docker-engine/docker-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DOCKER_ENGINE_VERSION = 20.10.22 > +DOCKER_ENGINE_VERSION = 23.0.0 > DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) > > DOCKER_ENGINE_LICENSE = Apache-2.0 > @@ -62,6 +62,14 @@ else > DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs > endif > > +# create the go.mod file with language version go1.19 > +# remove the conflicting vendor/modules.txt > +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > +define DOCKER_ENGINE_CONFIGURE_CMDS > + printf "module $(DOCKER_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod > + rm -f $(@D)/vendor/modules.txt > +endef > + > DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) > > define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD > -- > 2.39.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 thomas.petazzoni at bootlin.com Tue Feb 7 10:30:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:30:47 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external: handle case of dangling symlink Message-ID: <20230207103057.9AA90837D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b11ed25c4a0a6a4f7b9ee38390578d724caa081d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master copy_toolchain_lib_root was not handling the case of "readlink" returning nothing, which will happen if the symlink it is trying to resolve does not point to a valid file on the build host. This shouldn't happen, but it can. The end result of this situation would be an endless loop of error messages that would only end if aborted manually. [...] cp: missing destination file operand after '/local/users/mmayer/buildroot/output/arm64/target//' Try 'cp --help' for more information. readlink: missing operand Try 'readlink --help' for more information. basename: missing operand Try 'basename --help' for more information. dirname: missing operand Try 'dirname --help' for more information. ^C make[1]: *** [package/pkg-generic.mk:384: Instead of looping endlessly without explanation, let's abort and inform the user that something seems amiss with their setup. Signed-off-by: Markus Mayer Signed-off-by: Thomas Petazzoni --- toolchain/helpers.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index eec46d44c6..1cd7494fdb 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -19,7 +19,12 @@ copy_toolchain_lib_root = \ rm -fr $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ if test -h $${LIBPATH} ; then \ cp -d $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ + OLD_LIBPATH="$${LIBPATH}"; \ LIBPATH="`readlink -f $${LIBPATH}`"; \ + if [ "$${LIBPATH}" = "" ]; then \ + echo "LIBPATH empty after trying to resolve symlink $${OLD_LIBPATH}" 1>&2; \ + exit 1; \ + fi; \ elif test -f $${LIBPATH}; then \ $(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ break ; \ From thomas.petazzoni at bootlin.com Tue Feb 7 10:30:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:30:53 +0100 Subject: [Buildroot] [git commit] package/rtl8192eu: disable package for s390x architecture Message-ID: <20230207103205.47FFD84003@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26893ab1c67d7df8c1b71269051ad41b5ea03e5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this package for this architecture. Fixes: http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8192eu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rtl8192eu/Config.in b/package/rtl8192eu/Config.in index 4d71b711c3..969ba090ce 100644 --- a/package/rtl8192eu/Config.in +++ b/package/rtl8192eu/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTL8192EU bool "rtl8192eu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help A standalone driver for the RTL8192EU USB Wi-Fi adapter. @@ -10,4 +11,5 @@ config BR2_PACKAGE_RTL8192EU https://github.com/clnhub/rtl8192eu-linux comment "rtl8192eu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL From thomas.petazzoni at bootlin.com Tue Feb 7 10:38:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:38:37 +0100 Subject: [Buildroot] [PATCH] package/rtl8192eu: disable package for s390x architecture In-Reply-To: <20230206133149.910237-1-giulio.benetti@benettiengineering.com> References: <20230206133149.910237-1-giulio.benetti@benettiengineering.com> Message-ID: <20230207113837.64b654d1@windsurf> On Mon, 6 Feb 2023 14:31:49 +0100 Giulio Benetti wrote: > s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this > package for this architecture. > > Fixes: > http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2/ > > Signed-off-by: Giulio Benetti > --- > package/rtl8192eu/Config.in | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 10:39:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:39:38 +0100 Subject: [Buildroot] [git commit] package/uuu: bump to version 1.5.21 Message-ID: <20230207103959.B682384033@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ff52ac09b1c21fdce65deae39127b31d47858e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fixed android super.img loop download 52byte after some block - Use login header as in curl - Skip sleep in usb_add - Add empty line after input password - linux prompt ask user name and password for http(s) download - fix linux build failure Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/uuu/uuu.hash | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index cc1cd83266..a5b665620c 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 932c0a4acde0f52b907f5693c6d133c83142c4ca6e9df05a38b3ac1e50628883 uuu_source-1.5.11.tar.gz +sha256 e89d3665af499ab71360d948176cf64619b082f8272a994d1fbfc000e67c0f14 uuu_source-1.5.21.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE sha256 584bfbb18b4c08b872d48b80419dd453307212a144134fb516bd6ddc0700c2e8 README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 647015e2dd..1a5f84ce4d 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.11 +UUU_VERSION = 1.5.21 UUU_SOURCE = uuu_source-$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License From thomas.petazzoni at bootlin.com Tue Feb 7 10:39:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:39:41 +0100 Subject: [Buildroot] [git commit] package/mcelog: bump to version 191 Message-ID: <20230207103959.C1F0C84034@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=537daa143b237e88f2e272056bb05771db7f48d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Create .os_version to specify the version since there is no git checkout available. https://github.com/andikleen/mcelog/releases/tag/v191 https://github.com/andikleen/mcelog/releases/tag/v190 Signed-off-by: Jordan Speicher Signed-off-by: Thomas Petazzoni --- package/mcelog/mcelog.hash | 2 +- package/mcelog/mcelog.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash index e0350b085d..23fd4e50f3 100644 --- a/package/mcelog/mcelog.hash +++ b/package/mcelog/mcelog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 30364d134ff416f3f9469720add84bdccea226268d334f06022110f484550cd9 mcelog-189.tar.gz +sha256 b3b2616acde7afba4752d4dc447a2c2ad5a75da65e7496e0da30f8f8d2015cfa mcelog-191.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk index 8b5876d32e..9f7194e376 100644 --- a/package/mcelog/mcelog.mk +++ b/package/mcelog/mcelog.mk @@ -4,13 +4,14 @@ # ################################################################################ -MCELOG_VERSION = 189 +MCELOG_VERSION = 191 MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION)) MCELOG_LICENSE = GPL-2.0 MCELOG_LICENSE_FILES = LICENSE MCELOG_SELINUX_MODULES = mcelog define MCELOG_BUILD_CMDS + echo "$(MCELOG_VERSION)" > $(@D)/.os_version $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all endef From thomas.petazzoni at bootlin.com Tue Feb 7 10:40:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:40:06 +0100 Subject: [Buildroot] [PATCH] package/mcelog: bump to version 191 In-Reply-To: <20230207100216.889464-1-jordan@jspeicher.com> References: <20230207100216.889464-1-jordan@jspeicher.com> Message-ID: <20230207114006.3005f244@windsurf> On Tue, 7 Feb 2023 11:02:15 +0100 Jordan Speicher wrote: > Create .os_version to specify the version since there is no git > checkout available. > > https://github.com/andikleen/mcelog/releases/tag/v191 > https://github.com/andikleen/mcelog/releases/tag/v190 > > Signed-off-by: Jordan Speicher > --- > package/mcelog/mcelog.hash | 2 +- > package/mcelog/mcelog.mk | 3 ++- > 2 files changed, 3 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 Tue Feb 7 10:40:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:40:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/uuu: bump to version 1.5.21 In-Reply-To: <20230207094913.603489-1-dario.binacchi@amarulasolutions.com> References: <20230207094913.603489-1-dario.binacchi@amarulasolutions.com> Message-ID: <20230207114011.7fd5008f@windsurf> On Tue, 7 Feb 2023 10:49:13 +0100 Dario Binacchi wrote: > - Fixed android super.img loop download 52byte after some block > - Use login header as in curl > - Skip sleep in usb_add > - Add empty line after input password > - linux prompt ask user name and password for http(s) download > - fix linux build failure > > Signed-off-by: Dario Binacchi > --- > package/uuu/uuu.hash | 2 +- > package/uuu/uuu.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 Tue Feb 7 10:41:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:41:37 +0100 Subject: [Buildroot] [git commit] package/versal-firmware: use Xilinx github for versal-firmware Message-ID: <20230207104220.E9CC484047@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0781f44c0a9b46d9119557708918948a769e6881 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate versal-firmware package from nealfrager github to Xilinx github. The images are identical, so this patch has zero impact on functionality. Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- configs/versal_vck190_defconfig | 2 +- package/versal-firmware/Config.in | 2 +- package/versal-firmware/versal-firmware.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index fcda6eb431..2808fa522b 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_PACKAGE_VERSAL_FIRMWARE=y -BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="v2022.2" +BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="2022.2_br_1" BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/package/versal-firmware/Config.in b/package/versal-firmware/Config.in index 8d13816149..b4b63282d8 100644 --- a/package/versal-firmware/Config.in +++ b/package/versal-firmware/Config.in @@ -10,7 +10,7 @@ if BR2_PACKAGE_VERSAL_FIRMWARE config BR2_PACKAGE_VERSAL_FIRMWARE_VERSION string "firmware version" - default "v2022.2" + default "2022.2_br_1" help Release version of Versal firmware. diff --git a/package/versal-firmware/versal-firmware.mk b/package/versal-firmware/versal-firmware.mk index 3e4b9e558d..0bc5a00bc6 100644 --- a/package/versal-firmware/versal-firmware.mk +++ b/package/versal-firmware/versal-firmware.mk @@ -5,7 +5,7 @@ ################################################################################ VERSAL_FIRMWARE_VERSION = $(call qstrip,$(BR2_PACKAGE_VERSAL_FIRMWARE_VERSION)) -VERSAL_FIRMWARE_SITE = $(call github,nealfrager,buildroot-firmware,$(VERSAL_FIRMWARE_VERSION)) +VERSAL_FIRMWARE_SITE = $(call github,Xilinx,ubuntu-firmware,$(VERSAL_FIRMWARE_VERSION)) VERSAL_FIRMWARE_LICENSE = Xilinx-Binary-Only VERSAL_FIRMWARE_LICENSE_FILES = LICENSE VERSAL_FIRMWARE_INSTALL_TARGET = NO From thomas.petazzoni at bootlin.com Tue Feb 7 10:43:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:43:21 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/versal_vck190_defconfig: use Xilinx github for versal-firmware In-Reply-To: <20230127105305.25877-1-neal.frager@amd.com> References: <20230127105305.25877-1-neal.frager@amd.com> Message-ID: <20230207114321.2b5c2df6@windsurf> On Fri, 27 Jan 2023 10:53:05 +0000 Neal Frager via buildroot wrote: > Migrate versal-firmware package from nealfrager github to Xilinx github. > The images are identical, so this patch has zero impact on functionality. > > Signed-off-by: Neal Frager > --- > configs/versal_vck190_defconfig | 2 +- > package/versal-firmware/Config.in | 2 +- > package/versal-firmware/versal-firmware.mk | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) I've applied, but to be honest, it still looks a bit weird. The branch on the repo is special for Buildroot, and its contents are completely different than the master branch of the ubuntu-firmware repository. Why are those firmware files specific to Ubuntu, or specific to Buildroot? They should normally be distro/build-system agnostic. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From neal.frager at amd.com Tue Feb 7 10:48:53 2023 From: neal.frager at amd.com (Frager, Neal) Date: Tue, 7 Feb 2023 10:48:53 +0000 Subject: [Buildroot] [PATCH v1 1/1] configs/versal_vck190_defconfig: use Xilinx github for versal-firmware In-Reply-To: <20230207114321.2b5c2df6@windsurf> References: <20230127105305.25877-1-neal.frager@amd.com> <20230207114321.2b5c2df6@windsurf> Message-ID: Hi Thomas, > Migrate versal-firmware package from nealfrager github to Xilinx github. > The images are identical, so this patch has zero impact on functionality. > > Signed-off-by: Neal Frager > --- > configs/versal_vck190_defconfig | 2 +- > package/versal-firmware/Config.in | 2 +- > package/versal-firmware/versal-firmware.mk | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > I've applied, but to be honest, it still looks a bit weird. The branch on the repo is special for Buildroot, and its contents are completely different than the master branch of the ubuntu-firmware repository. Why are those firmware files specific to Ubuntu, or specific to Buildroot? > They should normally be distro/build-system agnostic. Yes, I fully agree with you. We will have a proper firmware repo agnostic to ubuntu starting with our 2023.1 release. In the meantime, Terry O'Neal implemented this solution as a temporary one for 2022.2, so that we could get off of using my private github. I am confident that our 2023.1 solution will clean this up. Best regards, Neal Frager AMD From arnout at mind.be Tue Feb 7 10:55:28 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 11:55:28 +0100 Subject: [Buildroot] [PATCH v2 1/1] add package/python-pyqtchart In-Reply-To: <20220518213933.2475-1-adamg@esdemc.com> References: <20220518213933.2475-1-adamg@esdemc.com> Message-ID: <11b5699c-ebc7-7a6c-e8f8-c3824fe166d3@mind.be> Hi Adam, Sorry for the very late reply to your contribution. Unfortunately, there are some issues still that I can't easily resolve by myself, see below. Therefore, the patch has been marked as Changes Requested in patchwork. Small nitpick: the subject line should be package/python-pyqtchart: new package On 18/05/2022 23:39, Adam Gausmann via buildroot wrote: > Signed-off-by: Adam Gausmann [snip] > diff --git a/package/python-pyqt5/0005-configure-emit-sip-flags.patch b/package/python-pyqt5/0005-configure-emit-sip-flags.patch > new file mode 100644 > index 0000000000..ad524f1e53 > --- /dev/null > +++ b/package/python-pyqt5/0005-configure-emit-sip-flags.patch > @@ -0,0 +1,25 @@ > +configure.py: emit sip_flags > + > +Other PyQt packages (e.g. PyQtChart) obtain their sip_flags from PyQt5. The > +default mechanism is for PyQt5 to embed it in the QtCore package and the other > +packages will try to import PyQt5.QtCore and read it; however, because this is > +not a host package, it cannot be imported during configuration. > + > +Another option is to provide those flags as a command-line option to the other > +packages' configure.py scripts. So, this patch emits the sip_flags generated by > +PyQt5 to a file which will be installed in staging dir for the other packages > +to read. > + > +Signed-off-by: Adam Gausmann Please also send this patch upstream (to the PyQt5 mailing list), and add a reference to the upstream submission here: Upstream: https://www.riverbankcomputing.com/pipermail/pyqt/... Also, this should probably be added to Buildroot as a separate commit, because it affects python-pyqt, not python-pyqtchart. > + > +--- a/configure.py 2022-05-12 14:45:48.624851781 -0500 > ++++ b/configure.py 2022-05-12 14:44:24.704852510 -0500 > +@@ -1450,6 +1450,8 @@ def generate_makefiles(target_config, ve > + > + # Set the SIP platform, version and feature flags. > + sip_flags = get_sip_flags(target_config) > ++ with open('sip_flags', 'w+') as f: > ++ f.write(sip_flags) > + > + # Go through the modules. > + pyqt_modules = list(target_config.pyqt_modules) > diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk > index af32f63796..2698a1e0ad 100644 > --- a/package/python-pyqt5/python-pyqt5.mk > +++ b/package/python-pyqt5/python-pyqt5.mk > @@ -157,7 +157,6 @@ PYTHON_PYQT5_CONF_OPTS = \ > -w --confirm-license \ > --no-designer-plugin \ > --no-docstrings \ > - --no-sip-files \ > $(foreach module,$(PYTHON_PYQT5_MODULES),--enable=$(module)) > > define PYTHON_PYQT5_CONFIGURE_CMDS > @@ -180,6 +179,7 @@ define PYTHON_PYQT5_INSTALL_TARGET_CMDS > $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install > touch $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/__init__.py > $(RM) -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/uic/port_v2 > + install -D $(@D)/sip_flags $(STAGING_DIR)/usr/share/PyQt5/sip_flags > endef > > $(eval $(generic-package)) > diff --git a/package/python-pyqtchart/Config.in b/package/python-pyqtchart/Config.in > new file mode 100644 > index 0000000000..a985927db7 > --- /dev/null > +++ b/package/python-pyqtchart/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_PYTHON_PYQTCHART > + bool "python-pyqtchart" > + depends on BR2_PACKAGE_PYTHON_PYQT5 Instead of depending on pyqt5, it would be beter to depend on qt5 and select pyqt5. > + select BR2_PACKAGE_QT5CHARTS > + help > + Python bindings for Qt Charts. > + > + http://www.riverbankcomputing.com/software/pyqt/ The actual upstream is https://www.riverbankcomputing.com/software/pyqtchart/ > diff --git a/package/python-pyqtchart/python-pyqtchart.hash b/package/python-pyqtchart/python-pyqtchart.hash > new file mode 100644 > index 0000000000..79852741da > --- /dev/null > +++ b/package/python-pyqtchart/python-pyqtchart.hash > @@ -0,0 +1,5 @@ > +# Locally-computed: You should probably download from pypi and get the hash from there: https://pypi.org/project/PyQtChart/#copy-hash-modal-8c261058-8981-4409-8b07-6610f35ddd52 > +sha256 91c9c6857e8c8891faa3875e3714392150016f365a63cdff8bfd40b6c33ea277 PyQtChart_gpl-5.7.tar.gz > + > +# Hash for license file > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE > diff --git a/package/python-pyqtchart/python-pyqtchart.mk b/package/python-pyqtchart/python-pyqtchart.mk > new file mode 100644 > index 0000000000..56bbc5d643 > --- /dev/null > +++ b/package/python-pyqtchart/python-pyqtchart.mk > @@ -0,0 +1,40 @@ > +################################################################################ > +# > +# python-pyqtchart Wouldn't it make more sense to call this python-pyqt5chart, given that there's python-pyqt5, and that there's PyQt6-Charts? Normally we prefer to use the upstream name, which is pyqtchart (or PyQt-Charts or PyQtChart, depending on where you look), but in this case I feel OK calling it python-pyqt5chart. > +# > +################################################################################ > + > +PYTHON_PYQTCHART_VERSION = 5.7 Why this ancient version released 7 years ago? There's a 5.15.6... I'm surprised this ancient version even works with our current Qt version! > +PYTHON_PYQTCHART_SOURCE = PyQtChart_gpl-$(PYTHON_PYQTCHART_VERSION).tar.gz > +PYTHON_PYQTCHART_SITE = http://downloads.sourceforge.net/project/pyqt/PyQtChart/PyQtChart-$(PYTHON_PYQTCHART_VERSION) As mentioned earlier, better download from pypi > +PYTHON_PYQTCHART_LICENSE = GPL-3.0 > + > +PYTHON_PYQTCHART_DEPENDENCIES = python-pyqt5 qt5charts > + > +PYTHON_PYQTCHART_CONF_OPTS = \ > + --destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5 \ > + --qmake $(HOST_DIR)/bin/qmake \ > + --sysroot $(STAGING_DIR)/usr \ > + --no-docstrings \ > + --no-sip-files \ > + --pyqt-sip-flags "$(file <$(STAGING_DIR)/usr/share/PyQt5/sip_flags)" \ > + --qtchart-version=2.0.1 \ Where does this version number come from? Please explain in the commit message. Regards, Arnout > + > +define PYTHON_PYQTCHART_CONFIGURE_CMDS > + (cd $(@D); \ > + $(TARGET_MAKE_ENV) \ > + $(TARGET_CONFIGURE_OPTS) \ > + $(HOST_DIR)/bin/python configure.py \ > + $(PYTHON_PYQTCHART_CONF_OPTS) \ > + ) > +endef > + > +define PYTHON_PYQTCHART_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) > +endef > + > +define PYTHON_PYQTCHART_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install > +endef > + > +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 11:07:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 12:07:57 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/versal_vck190_defconfig: use Xilinx github for versal-firmware In-Reply-To: References: <20230127105305.25877-1-neal.frager@amd.com> <20230207114321.2b5c2df6@windsurf> Message-ID: <20230207120757.21504741@windsurf> Hello, On Tue, 7 Feb 2023 10:48:53 +0000 "Frager, Neal" wrote: > Yes, I fully agree with you. We will have a proper firmware repo > agnostic to ubuntu starting with our 2023.1 release. > > In the meantime, Terry O'Neal implemented this solution as a > temporary one for 2022.2, so that we could get off of using my > private github. > > I am confident that our 2023.1 solution will clean this up. Sounds like a good plan, thanks for the details! Best regards, 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 Tue Feb 7 11:10:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:10:46 +0100 Subject: [Buildroot] [git commit] package/balena-engine: bump to version 20.10.26 Message-ID: <20230207111108.868A984051@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a1081dcbf8d706b08df53fe2ff2d652caf889ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Like docker-engine and docker-cli, balena-engine uses a non-standard vendor/ directory structure, so we use the same fixes as we introduced for docker-engine ((see commit: package/docker-engine: bump version to v23.0.0): - remove the problematic vendor/modules.txt - create a go.mod Also remove the vendor/archive/ sub-tree (fixes a build error) because Go no longer allows having duplicate packages in GOPATH and GOROOT. vendor/archive/tar cannot be in vendor/ because it exists in the standard library. Since we remove the full vendor/archive/, that is also fixed. https://github.com/balena-os/balena-engine/releases/tag/v20.10.26 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 4adb8ce561..6a92a40cc8 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz +sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index ecfb62bfbf..49d526a465 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 20.10.21 +BALENA_ENGINE_VERSION = 20.10.26 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 @@ -34,6 +34,17 @@ BALENA_ENGINE_TAGS = \ BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# remove the conflicting vendor/archive (not allowed in go1.20) +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define BALENA_ENGINE_FIX_VENDORING + printf "module $(BALENA_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt + rm -rf $(@D)/vendor/archive +endef +BALENA_ENGINE_POST_EXTRACT_HOOKS += BALENA_ENGINE_FIX_VENDORING + ifeq ($(BR2_INIT_SYSTEMD),y) BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald From yann.morin.1998 at free.fr Tue Feb 7 11:12:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:12:02 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/balena-engine: bump to version 20.10.26 In-Reply-To: <20230207043121.86027-1-christian@paral.in> References: <20230207043121.86027-1-christian@paral.in> Message-ID: <20230207111202.GC4124@scaer> Christian, All, On 2023-02-06 20:31 -0800, Christian Stewart via buildroot spake thusly: > balena-engine does not ship a go.mod file in the tarball: create one to tell the > Go compiler the root import path prefix for the module and the language version. > Note that the language version in go.mod is not required to be equal the version > of the Go compiler. > > This update requires a workaround for the non-standard vendor/ structure in the > balena-engine repository, which has an invalid vendor/modules.txt file. > > Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > > Remove the vendor/archive sub-tree (fixes a build error) because Go no longer > allows having duplicate packages in GOPATH and GOROOT. vendor/archive/tar cannot > be in vendor/ because it exists in the standard library. Remove it from vendor/. > > https://github.com/balena-os/balena-engine/releases/tag/v20.10.26 > > Signed-off-by: Christian Stewart I've done the samechanges as in docker-engine and docker-cli, and applied to master, thanks. Regards, Yann E. MORIN. > --- > > v2 -> v3: > > - add missing go.mod file in CONFIGURE step > - use rm -f instead of checking for file existence > - update comment about language version > > Signed-off-by: Christian Stewart > --- > package/balena-engine/balena-engine.hash | 2 +- > package/balena-engine/balena-engine.mk | 12 +++++++++++- > 2 files changed, 12 insertions(+), 2 deletions(-) > > diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash > index 4adb8ce561..6a92a40cc8 100644 > --- a/package/balena-engine/balena-engine.hash > +++ b/package/balena-engine/balena-engine.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz > +sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk > index ecfb62bfbf..89a572cf8e 100644 > --- a/package/balena-engine/balena-engine.mk > +++ b/package/balena-engine/balena-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BALENA_ENGINE_VERSION = 20.10.21 > +BALENA_ENGINE_VERSION = 20.10.26 > BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) > > BALENA_ENGINE_LICENSE = Apache-2.0 > @@ -34,6 +34,16 @@ BALENA_ENGINE_TAGS = \ > > BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine > > +# create the go.mod file with language version go1.19 > +# remove the conflicting vendor/modules.txt > +# remove the conflicting vendor/archive (not allowed in go1.20) > +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > +define BALENA_ENGINE_CONFIGURE_CMDS > + printf "module $(BALENA_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod > + rm -f $(@D)/vendor/modules.txt > + rm -rf $(@D)/vendor/archive > +endef > + > ifeq ($(BR2_INIT_SYSTEMD),y) > BALENA_ENGINE_DEPENDENCIES += systemd > BALENA_ENGINE_TAGS += journald > -- > 2.39.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 vfazio at xes-inc.com Tue Feb 7 11:26:44 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 7 Feb 2023 05:26:44 -0600 Subject: [Buildroot] [PATCH 1/1] package/bash: fix strtoimax builtin inclusion logic Message-ID: <20230207112644.2467564-1-vfazio@xes-inc.com> From: Vincent Fazio Backport fixes from upstream to fix an issue where the strtoimax builtin got built when not necessary. This resolves bash static builds issues when using musl and uClibc. Fixes: http://autobuild.buildroot.org/results/f8c/f8cb91f7f9ac6a46bb2ecfc22c1e42cf699f28d3// http://autobuild.buildroot.org/results/b0e/b0e5fcab9eeb799e31bca27fcb7280b728349bc6// Upstream: https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 Signed-off-by: Vincent Fazio --- ...vert-condition-for-strtoimax-builtin.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch diff --git a/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch new file mode 100644 index 0000000000..2ee9e1ad5a --- /dev/null +++ b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch @@ -0,0 +1,60 @@ +From 754e0d1edc1c01b18f4890de7c58f7610e589d76 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 03:55:28 -0600 +Subject: [PATCH] configure: invert condition for strtoimax builtin + +Previously, bash would attempt to build a replacement for strtoimax if +it found that the C library had the function already declared. + +This caused build errors when linking against static libraries that did +not define the function as a weak alias but, in reality, was a logic +error since bash should only provide it's own implementation if one is +not provided by the C library. + +Now, fix this by inverting the logic. + +Upstream: + https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 + +Signed-off-by: Vincent Fazio +--- + configure | 6 +++++- + m4/strtoimax.m4 | 5 ++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 47313753..6039cee7 100755 +--- a/configure ++++ b/configure +@@ -20443,7 +20443,11 @@ fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bash_cv_func_strtoimax" >&5 + printf "%s\n" "$bash_cv_func_strtoimax" >&6; } +-if test $bash_cv_func_strtoimax = yes; then ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then ++printf "%s\n" "#define HAVE_DECL_STRTOIMAX 1" >>confdefs.h ++ ++fi ++if test $bash_cv_func_strtoimax = no; then + case " $LIBOBJS " in + *" strtoimax.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strtoimax.$ac_objext" +diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 +index 30985723..fa43ac7b 100644 +--- a/m4/strtoimax.m4 ++++ b/m4/strtoimax.m4 +@@ -29,7 +29,10 @@ AC_CACHE_VAL(bash_cv_func_strtoimax, + fi + ]) + AC_MSG_RESULT($bash_cv_func_strtoimax) +-if test $bash_cv_func_strtoimax = yes; then ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then ++AC_DEFINE([HAVE_DECL_STRTOIMAX], [1]) ++fi ++if test $bash_cv_func_strtoimax = no; then + AC_LIBOBJ(strtoimax) + fi + ]) +-- +2.25.1 + -- 2.25.1 From yann.morin.1998 at free.fr Tue Feb 7 11:28:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:28:32 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-wrapper.c: set CCACHE env variables only when ccache is enabled Message-ID: <20230207112855.9D59E84057@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=231d00e63ac08c98d7e823c3bd60a618ff322577 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit modifies the toolchain-wrapper to make sure that the CCACHE_COMPILERCHECK and CCACHE_BASEDIR are only set if ccache support is enabled. Indeed, when BR2_USE_CCACHE is not set (or to a value different than 1), we don't call the compiler with ccache, so there is no reason to set those ccache environment variables, and they could potentially conflict with a separate usage of ccache, outside of Buildroot, for example when using the Buildroot SDK. In particular, the value of CCACHE_BASEDIR doesn't not make any sense when the Buildroot toolchain is not used during the Buildroot build, as it points to the output directory $(BASE_DIR). We pay attention to also not show those variables as being set in the BR2_DEBUG_WRAPPER dump. To help a little bit with this, a ccache_enabled boolean is introduced to indicate when ccache is being used. There is still quite a bit of #ifdef-ery involved, but it's not easy to find a simpler way to organize the code. Signed-off-by: Thomas Petazzoni Tested-By: Vincent Fazio Signed-off-by: Yann E. MORIN --- toolchain/toolchain-wrapper.c | 49 ++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 4c08e97237..f66e588bfd 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -494,10 +494,28 @@ int main(int argc, char **argv) exec_args = args; #ifdef BR_CCACHE - /* If BR2_USE_CCACHE is not defined, or its value is not 1, - * skip the ccache call */ + /* If BR2_USE_CCACHE is set and its value is 1, enable ccache + * usage */ char *br_use_ccache = getenv("BR2_USE_CCACHE"); - if (!br_use_ccache || strncmp(br_use_ccache, "1", strlen("1"))) + bool ccache_enabled = br_use_ccache && !strncmp(br_use_ccache, "1", strlen("1")); + + if (ccache_enabled) { +#ifdef BR_CCACHE_HASH + /* Allow compilercheck to be overridden through the environment */ + if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { + perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); + return 3; + } +#endif +#ifdef BR_CCACHE_BASEDIR + /* Allow compilercheck to be overridden through the environment */ + if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { + perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); + return 3; + } +#endif + } else + /* ccache is disabled, skip it */ exec_args++; #endif @@ -505,12 +523,14 @@ int main(int argc, char **argv) if (debug > 0) { fprintf(stderr, "Toolchain wrapper executing:"); #ifdef BR_CCACHE_HASH - fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", - (debug == 2) ? "\n " : " "); + if (ccache_enabled) + fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", + (debug == 2) ? "\n " : " "); #endif #ifdef BR_CCACHE_BASEDIR - fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", - (debug == 2) ? "\n " : " "); + if (ccache_enabled) + fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", + (debug == 2) ? "\n " : " "); #endif for (i = 0; exec_args[i]; i++) fprintf(stderr, "%s'%s'", @@ -518,21 +538,6 @@ int main(int argc, char **argv) fprintf(stderr, "\n"); } -#ifdef BR_CCACHE_HASH - /* Allow compilercheck to be overridden through the environment */ - if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { - perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); - return 3; - } -#endif -#ifdef BR_CCACHE_BASEDIR - /* Allow compilercheck to be overridden through the environment */ - if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { - perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); - return 3; - } -#endif - if (execv(exec_args[0], exec_args)) perror(path); From yann.morin.1998 at free.fr Tue Feb 7 11:29:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:29:53 +0100 Subject: [Buildroot] [PATCH] toolchain/toolchain-wrapper.c: set CCACHE env variables only when ccache is enabled In-Reply-To: <20220806195802.451076-1-thomas.petazzoni@bootlin.com> References: <20220806195802.451076-1-thomas.petazzoni@bootlin.com> Message-ID: <20230207112953.GD4124@scaer> Thomas, All, On 2022-08-06 21:58 +0200, Thomas Petazzoni via buildroot spake thusly: > This commit modifies the toolchain-wrapper to make sure that the > CCACHE_COMPILERCHECK and CCACHE_BASEDIR are only set if ccache support > is enabled. Indeed, when BR2_USE_CCACHE is not set (or to a value > different than 1), we don't call the compiler with ccache, so there is > no reason to set those ccache environment variables, and they could > potentially conflict with a separate usage of ccache, outside of > Buildroot, for example when using the Buildroot SDK. > > In particular, the value of CCACHE_BASEDIR doesn't not make any sense > when the Buildroot toolchain is not used during the Buildroot build, > as it points to the output directory $(BASE_DIR). > > We pay attention to also not show those variables as being set in the > BR2_DEBUG_WRAPPER dump. > > To help a little bit with this, a ccache_enabled boolean is introduced > to indicate when ccache is being used. > > There is still quite a bit of #ifdef-ery involved, but it's not easy > to find a simpler way to organize the code. > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > toolchain/toolchain-wrapper.c | 49 +++++++++++++++++++---------------- > 1 file changed, 27 insertions(+), 22 deletions(-) > > diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c > index 37b24dd24a..ee1fdf3c71 100644 > --- a/toolchain/toolchain-wrapper.c > +++ b/toolchain/toolchain-wrapper.c > @@ -507,10 +507,28 @@ int main(int argc, char **argv) > > exec_args = args; > #ifdef BR_CCACHE > - /* If BR2_USE_CCACHE is not defined, or its value is not 1, > - * skip the ccache call */ > + /* If BR2_USE_CCACHE is set and its value is 1, enable ccache > + * usage */ > char *br_use_ccache = getenv("BR2_USE_CCACHE"); > - if (!br_use_ccache || strncmp(br_use_ccache, "1", strlen("1"))) > + bool ccache_enabled = br_use_ccache && !strncmp(br_use_ccache, "1", strlen("1")); > + > + if (ccache_enabled) { > +#ifdef BR_CCACHE_HASH > + /* Allow compilercheck to be overridden through the environment */ > + if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { > + perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); > + return 3; > + } > +#endif > +#ifdef BR_CCACHE_BASEDIR > + /* Allow compilercheck to be overridden through the environment */ > + if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { > + perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); > + return 3; > + } > +#endif > + } else > + /* ccache is disabled, skip it */ > exec_args++; > #endif > > @@ -518,12 +536,14 @@ int main(int argc, char **argv) > if (debug > 0) { > fprintf(stderr, "Toolchain wrapper executing:"); > #ifdef BR_CCACHE_HASH > - fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", > - (debug == 2) ? "\n " : " "); > + if (ccache_enabled) > + fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", > + (debug == 2) ? "\n " : " "); > #endif > #ifdef BR_CCACHE_BASEDIR > - fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", > - (debug == 2) ? "\n " : " "); > + if (ccache_enabled) > + fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", > + (debug == 2) ? "\n " : " "); > #endif > for (i = 0; exec_args[i]; i++) > fprintf(stderr, "%s'%s'", > @@ -531,21 +551,6 @@ int main(int argc, char **argv) > fprintf(stderr, "\n"); > } > > -#ifdef BR_CCACHE_HASH > - /* Allow compilercheck to be overridden through the environment */ > - if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { > - perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); > - return 3; > - } > -#endif > -#ifdef BR_CCACHE_BASEDIR > - /* Allow compilercheck to be overridden through the environment */ > - if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { > - perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); > - return 3; > - } > -#endif > - > if (execv(exec_args[0], exec_args)) > perror(path); > > -- > 2.37.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 thomas.petazzoni at bootlin.com Tue Feb 7 11:32:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 12:32:35 +0100 Subject: [Buildroot] [git commit] package/python-idna: set _SETUP_TYPE = flit Message-ID: <20230207113249.D09B184074@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a9da9a8cad5f77902547fab3b24d04175749a7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Python idna package switched to pyproject.toml in commit: https://github.com/kjd/idna/commit/2a00e518efe55d2eeb62cd3f88ace7db41338603 which is included in idna v3.4. When using the old setuptools infra, the package is incorrectly installed as v0.0, which is then incorrectly detected by other packages when using setuptools pkg_resources. The issue can be reproduced with the command: python3 <= 2.5"] import pkg_resources EOF which will fail with output: pkg_resources.ContextualVersionConflict: (idna 0.0.0 (/usr/lib/python3.11/site-packages), Requirement.parse('idna>=2.5'), {'hyperlink'}) pkg_resources.DistributionNotFound: The 'idna>=2.5' distribution was not found and is required by hyperlink This commit changes _SETUP_TYPE to "flit" to fix this issue. Signed-off-by: Julien Olivain Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-idna/python-idna.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 4d9994a9c7..3976cb1518 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -9,7 +9,7 @@ PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/8b/e1/43beb3d38dba6cb420cefa297822eac205a277ab43e5ba5d5c46faf96438 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md -PYTHON_IDNA_SETUP_TYPE = setuptools +PYTHON_IDNA_SETUP_TYPE = flit $(eval $(python-package)) $(eval $(host-python-package)) From peter at korsgaard.com Tue Feb 7 11:35:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 12:35:46 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: correct check for open perl module Message-ID: <20230207113647.F360184086@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b63e155e5fb7104e6660aa0570befa9498259cd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 4cdd99190e89 (support/dependencies/dependencies.sh: require open perl package for libxcrypt) added a check for the "open" perl module for libxcrypt, but it does not work as "open" cannot be directly used with "require" as an argument is needed: perl -e "require open" Not enough arguments for open at -e line 1, at EOF Execution of -e aborted due to compilation errors. So special case the check to instead check with "use open ':std'". Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 353817f8fb..88eabe921d 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -271,10 +271,6 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl -if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then - required_perl_modules="$required_perl_modules open" -fi - if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" @@ -291,6 +287,13 @@ fi # This variable will keep the modules that are missing in your system. missing_perl_modules="" +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + # open cannot be used with require + if ! perl -e "use open ':std'" > /dev/null 2>&1 ; then + missing_perl_modules="$missing_perl_modules open" + fi +fi + for pm in $required_perl_modules ; do if ! perl -e "require $pm" > /dev/null 2>&1 ; then missing_perl_modules="$missing_perl_modules $pm" From yann.morin.1998 at free.fr Tue Feb 7 11:47:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:47:08 +0100 Subject: [Buildroot] [git commit] package/bash: fix strtoimax builtin inclusion logic Message-ID: <20230207114725.BF4E18408C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12d85e9646ed89552c732775de000ad0b436a139 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Backport fixes from upstream to fix an issue where the strtoimax builtin got built when not necessary. This resolves bash static builds issues when using musl and uClibc. We fix both the m4 file and configure in that order, to be safe andnot trigger an automatic autoreconf (even though bash does not have a rule to automatically regenerate configure if an m4 file changes). Fixes: http://autobuild.buildroot.org/results/f8c/f8cb91f7f9ac6a46bb2ecfc22c1e42cf699f28d3// http://autobuild.buildroot.org/results/b0e/b0e5fcab9eeb799e31bca27fcb7280b728349bc6// Upstream: https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 Signed-off-by: Vincent Fazio [yann.morin.1998 at free.fr: - patch configure after the m4 file - add blurb in commit log to explain that ] Signed-off-by: Yann E. MORIN --- ...re-invert-condition-for-strtoimax-builtin.patch | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch new file mode 100644 index 0000000000..c412dcfce2 --- /dev/null +++ b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch @@ -0,0 +1,62 @@ +From 754e0d1edc1c01b18f4890de7c58f7610e589d76 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 03:55:28 -0600 +Subject: [PATCH] configure: invert condition for strtoimax builtin + +Previously, bash would attempt to build a replacement for strtoimax if +it found that the C library had the function already declared. + +This caused build errors when linking against static libraries that did +not define the function as a weak alias but, in reality, was a logic +error since bash should only provide it's own implementation if one is +not provided by the C library. + +Now, fix this by inverting the logic. + +Upstream: + https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 + +Signed-off-by: Vincent Fazio +[yann.morin.1998 at free.fr: patch configure after the m file] +Signed-off-by: Yann E. MORIN +--- + configure | 6 +++++- + m4/strtoimax.m4 | 5 ++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 +index 30985723..fa43ac7b 100644 +--- a/m4/strtoimax.m4 ++++ b/m4/strtoimax.m4 +@@ -29,7 +29,10 @@ AC_CACHE_VAL(bash_cv_func_strtoimax, + fi + ]) + AC_MSG_RESULT($bash_cv_func_strtoimax) +-if test $bash_cv_func_strtoimax = yes; then ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then ++AC_DEFINE([HAVE_DECL_STRTOIMAX], [1]) ++fi ++if test $bash_cv_func_strtoimax = no; then + AC_LIBOBJ(strtoimax) + fi + ]) +diff --git a/configure b/configure +index 47313753..6039cee7 100755 +--- a/configure ++++ b/configure +@@ -20443,7 +20443,11 @@ fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bash_cv_func_strtoimax" >&5 + printf "%s\n" "$bash_cv_func_strtoimax" >&6; } +-if test $bash_cv_func_strtoimax = yes; then ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then ++printf "%s\n" "#define HAVE_DECL_STRTOIMAX 1" >>confdefs.h ++ ++fi ++if test $bash_cv_func_strtoimax = no; then + case " $LIBOBJS " in + *" strtoimax.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strtoimax.$ac_objext" +-- +2.25.1 + From yann.morin.1998 at free.fr Tue Feb 7 11:48:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:48:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/bash: fix strtoimax builtin inclusion logic In-Reply-To: <20230207112644.2467564-1-vfazio@xes-inc.com> References: <20230207112644.2467564-1-vfazio@xes-inc.com> Message-ID: <20230207114842.GE4124@scaer> Vincent, All, On 2023-02-07 05:26 -0600, Vincent Fazio spake thusly: > From: Vincent Fazio > > Backport fixes from upstream to fix an issue where the strtoimax builtin > got built when not necessary. > > This resolves bash static builds issues when using musl and uClibc. > > Fixes: > http://autobuild.buildroot.org/results/f8c/f8cb91f7f9ac6a46bb2ecfc22c1e42cf699f28d3// > http://autobuild.buildroot.org/results/b0e/b0e5fcab9eeb799e31bca27fcb7280b728349bc6// > > Upstream: > https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 > > Signed-off-by: Vincent Fazio As seen IRL, I've done some small changes: - patch configure after the m4 file - add blurb in commit log to explain that Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...vert-condition-for-strtoimax-builtin.patch | 60 +++++++++++++++++++ > 1 file changed, 60 insertions(+) > create mode 100644 package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch > > diff --git a/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch > new file mode 100644 > index 0000000000..2ee9e1ad5a > --- /dev/null > +++ b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch > @@ -0,0 +1,60 @@ > +From 754e0d1edc1c01b18f4890de7c58f7610e589d76 Mon Sep 17 00:00:00 2001 > +From: Vincent Fazio > +Date: Tue, 7 Feb 2023 03:55:28 -0600 > +Subject: [PATCH] configure: invert condition for strtoimax builtin > + > +Previously, bash would attempt to build a replacement for strtoimax if > +it found that the C library had the function already declared. > + > +This caused build errors when linking against static libraries that did > +not define the function as a weak alias but, in reality, was a logic > +error since bash should only provide it's own implementation if one is > +not provided by the C library. > + > +Now, fix this by inverting the logic. > + > +Upstream: > + https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 > + > +Signed-off-by: Vincent Fazio > +--- > + configure | 6 +++++- > + m4/strtoimax.m4 | 5 ++++- > + 2 files changed, 9 insertions(+), 2 deletions(-) > + > +diff --git a/configure b/configure > +index 47313753..6039cee7 100755 > +--- a/configure > ++++ b/configure > +@@ -20443,7 +20443,11 @@ fi > + > + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bash_cv_func_strtoimax" >&5 > + printf "%s\n" "$bash_cv_func_strtoimax" >&6; } > +-if test $bash_cv_func_strtoimax = yes; then > ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then > ++printf "%s\n" "#define HAVE_DECL_STRTOIMAX 1" >>confdefs.h > ++ > ++fi > ++if test $bash_cv_func_strtoimax = no; then > + case " $LIBOBJS " in > + *" strtoimax.$ac_objext "* ) ;; > + *) LIBOBJS="$LIBOBJS strtoimax.$ac_objext" > +diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 > +index 30985723..fa43ac7b 100644 > +--- a/m4/strtoimax.m4 > ++++ b/m4/strtoimax.m4 > +@@ -29,7 +29,10 @@ AC_CACHE_VAL(bash_cv_func_strtoimax, > + fi > + ]) > + AC_MSG_RESULT($bash_cv_func_strtoimax) > +-if test $bash_cv_func_strtoimax = yes; then > ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then > ++AC_DEFINE([HAVE_DECL_STRTOIMAX], [1]) > ++fi > ++if test $bash_cv_func_strtoimax = no; then > + AC_LIBOBJ(strtoimax) > + fi > + ]) > +-- > +2.25.1 > + > -- > 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 thomas.petazzoni at bootlin.com Tue Feb 7 11:50:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 12:50:27 +0100 Subject: [Buildroot] [git commit] package/python-hkdf: new package Message-ID: <20230207115045.1C17C840AE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=433ce2966f787248d5b8a62c46634e2f86250f8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master HMAC-based Extract-and-Expand Key Derivation Function (HKDF). https://github.com/casebeer/python-hkdf Signed-off-by: Julien Olivain [Thomas: justify the license.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/python-hkdf/Config.in | 7 +++++++ package/python-hkdf/python-hkdf.hash | 3 +++ package/python-hkdf/python-hkdf.mk | 17 +++++++++++++++++ .../testing/tests/package/sample_python_hkdf.py | 22 ++++++++++++++++++++++ support/testing/tests/package/test_python_hkdf.py | 11 +++++++++++ 7 files changed, 63 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f10036f7f2..69e73636be 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1693,6 +1693,7 @@ F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ +F: package/python-hkdf/ F: package/python-pyalsa/ F: package/rdma-core/ F: package/riscv-isa-sim/ @@ -1709,6 +1710,7 @@ F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py +F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_rdma_core.py diff --git a/package/Config.in b/package/Config.in index aa87f1305d..b28949500e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1073,6 +1073,7 @@ menu "External python modules" source "package/python-h11/Config.in" source "package/python-h2/Config.in" source "package/python-hiredis/Config.in" + source "package/python-hkdf/Config.in" source "package/python-hpack/Config.in" source "package/python-html5lib/Config.in" source "package/python-httplib2/Config.in" diff --git a/package/python-hkdf/Config.in b/package/python-hkdf/Config.in new file mode 100644 index 0000000000..2add348ca2 --- /dev/null +++ b/package/python-hkdf/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_HKDF + bool "python-hkdf" + help + HMAC-based Extract-and-Expand Key Derivation Function + (HKDF). + + https://github.com/casebeer/python-hkdf diff --git a/package/python-hkdf/python-hkdf.hash b/package/python-hkdf/python-hkdf.hash new file mode 100644 index 0000000000..87702b4582 --- /dev/null +++ b/package/python-hkdf/python-hkdf.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/hkdf/json +md5 d10471ad0ec891cdbe165d78282c943e hkdf-0.0.3.tar.gz +sha256 622a31c634bc185581530a4b44ffb731ed208acf4614f9c795bdd70e77991dca hkdf-0.0.3.tar.gz diff --git a/package/python-hkdf/python-hkdf.mk b/package/python-hkdf/python-hkdf.mk new file mode 100644 index 0000000000..8b68c5cc9f --- /dev/null +++ b/package/python-hkdf/python-hkdf.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-hkdf +# +################################################################################ + +PYTHON_HKDF_VERSION = 0.0.3 +PYTHON_HKDF_SOURCE = hkdf-$(PYTHON_HKDF_VERSION).tar.gz +PYTHON_HKDF_SITE = https://files.pythonhosted.org/packages/c3/be/327e072850db181ce56afd51e26ec7aa5659b18466c709fa5ea2548c935f +PYTHON_HKDF_SETUP_TYPE = setuptools +# No license file in the tree, but +# https://github.com/casebeer/python-hkdf/blob/master/LICENSE shows +# it's BSD-2-Clause. Issue already reported upstream: +# https://github.com/casebeer/python-hkdf/issues/6 +PYTHON_HKDF_LICENSE = BSD-2-Clause + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_hkdf.py b/support/testing/tests/package/sample_python_hkdf.py new file mode 100644 index 0000000000..a730c633e1 --- /dev/null +++ b/support/testing/tests/package/sample_python_hkdf.py @@ -0,0 +1,22 @@ +import hashlib +from binascii import hexlify, unhexlify + +from hkdf import Hkdf, hkdf_expand, hkdf_extract + +salt = b"ThisIsTheSalt." +key_in = b"ThisIsTheSecretKey" +key_info = b"KeyInfo1" +key_len = 16 +expected_key = unhexlify(b"b49d6cc9065b72f3a0859377d8bb7299") + +prk = hkdf_extract(salt, input_key_material=key_in, hash=hashlib.sha512) +key1 = hkdf_expand(prk, info=key_info, length=key_len) + +print("key1:", hexlify(key1)) +assert key1 == expected_key + +kdf = Hkdf(salt, input_key_material=key_in, hash=hashlib.sha512) +key2 = kdf.expand(info=key_info, length=key_len) + +print("key2:", hexlify(key2)) +assert key2 == expected_key diff --git a/support/testing/tests/package/test_python_hkdf.py b/support/testing/tests/package/test_python_hkdf.py new file mode 100644 index 0000000000..e93c24ff60 --- /dev/null +++ b/support/testing/tests/package/test_python_hkdf.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Hkdf(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_HKDF=y + """ + sample_scripts = ["tests/package/sample_python_hkdf.py"] From arnout at mind.be Tue Feb 7 11:53:44 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 12:53:44 +0100 Subject: [Buildroot] [PATCH] package/busybox: update to 1.36.0 Message-ID: <20230207115344.440172-1-arnout@mind.be> Remove upstream patch 0003-awk-fix-use-after-free-CVE-2022-30065.patch and update _IGNORE_CVES accordingly. The two other CVE fixes are still needed. Refresh busybox.config. All configs are set to the new defaults, except for CONFIG_UDHCPC_DEFAULT_SCRIPT: for this one, reuse the script we also use for DHCPv4. This is matches the behaviour previous to the bump, where we had a single script handling both. Signed-off-by: Arnout Vandecappelle --- ...wk-fix-use-after-free-CVE-2022-30065.patch | 52 ------------------- package/busybox/busybox.config | 23 +++++--- package/busybox/busybox.hash | 2 +- package/busybox/busybox.mk | 4 +- 4 files changed, 19 insertions(+), 62 deletions(-) delete mode 100644 package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch diff --git a/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch b/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch deleted file mode 100644 index f9bfee328e..0000000000 --- a/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e06b1f0839972cc3f5b432849d574d14a8f17613 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Fri, 17 Jun 2022 17:45:34 +0200 -Subject: [PATCH] awk: fix use after free (CVE-2022-30065) - -fixes https://bugs.busybox.net/show_bug.cgi?id=14781 - -function old new delta -evaluate 3343 3357 +14 - -Signed-off-by: Natanael Copa -Signed-off-by: Denys Vlasenko -Backport: https://git.busybox.net/busybox/commit/?id=e63d7cdfdac78c6fd27e9e63150335767592b85e -[straightforward conflict resolution in testsuite/awk.tests] -Signed-off-by: Quentin Schulz ---- - editors/awk.c | 3 +++ - testsuite/awk.tests | 6 ++++++ - 2 files changed, 9 insertions(+) - -diff --git a/editors/awk.c b/editors/awk.c -index f6314ac72..654cbac33 100644 ---- a/editors/awk.c -+++ b/editors/awk.c -@@ -3114,6 +3114,9 @@ static var *evaluate(node *op, var *res) - - case XC( OC_MOVE ): - debug_printf_eval("MOVE\n"); -+ /* make sure that we never return a temp var */ -+ if (L.v == TMPVAR0) -+ L.v = res; - /* if source is a temporary string, jusk relink it to dest */ - if (R.v == TMPVAR1 - && !(R.v->type & VF_NUMBER) -diff --git a/testsuite/awk.tests b/testsuite/awk.tests -index bcaafe8fd..156aa65eb 100755 ---- a/testsuite/awk.tests -+++ b/testsuite/awk.tests -@@ -469,4 +469,10 @@ testing 'awk printf %% prints one %' \ - "%\n" \ - '' '' - -+testing 'awk assign while test' \ -+ "awk '\$1==\$1=\"foo\" {print \$1}'" \ -+ "foo\n" \ -+ "" \ -+ "foo" -+ - exit $FAILCOUNT --- -2.37.3 - diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index e7f628ca6d..4826fb8242 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.35.0 -# Thu Jan 27 10:16:54 2022 +# Busybox version: 1.36.0 +# Tue Feb 7 12:34:02 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA1_SMALL=3 +CONFIG_SHA1_HWACCEL=y +CONFIG_SHA256_HWACCEL=y CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_NON_POSIX_CP=y # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set @@ -123,6 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=0 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets @@ -338,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y CONFIG_TRUNCATE=y +CONFIG_TSORT=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux" @@ -520,7 +527,7 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y -# CONFIG_USE_BB_CRYPT_SHA is not set +CONFIG_USE_BB_CRYPT_SHA=y # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set CONFIG_ADDGROUP=y @@ -811,10 +818,10 @@ CONFIG_FEATURE_LESS_TRUNCATE=y CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_FEATURE_LESS_WINCH is not set # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set +CONFIG_FEATURE_LESS_DASHCMD=y # CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_FEATURE_LESS_RAW is not set -# CONFIG_FEATURE_LESS_ENV is not set +CONFIG_FEATURE_LESS_RAW=y +CONFIG_FEATURE_LESS_ENV=y CONFIG_LSSCSI=y CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set @@ -831,10 +838,12 @@ CONFIG_PARTPROBE=y # CONFIG_RFKILL is not set CONFIG_RUNLEVEL=y # CONFIG_RX is not set +CONFIG_SEEDRNG=y CONFIG_SETFATTR=y CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y +CONFIG_TREE=y CONFIG_TS=y # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set @@ -1007,6 +1016,7 @@ CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC6_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" # CONFIG_UDHCPC6 is not set # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set @@ -1141,6 +1151,7 @@ CONFIG_ASH_IDLE_TIMEOUT=y CONFIG_ASH_ECHO=y CONFIG_ASH_PRINTF=y CONFIG_ASH_TEST=y +CONFIG_ASH_SLEEP=y CONFIG_ASH_HELP=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 2091cdaf65..6d1c36906d 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ # From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 -sha256 faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 busybox-1.35.0.tar.bz2 +sha256 542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5 busybox-1.36.0.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index f8f9cb5616..3026823063 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,15 +4,13 @@ # ################################################################################ -BUSYBOX_VERSION = 1.35.0 +BUSYBOX_VERSION = 1.36.0 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 BUSYBOX_LICENSE_FILES = LICENSE archival/libarchive/bz/LICENSE BUSYBOX_CPE_ID_VENDOR = busybox -# 0003-awk-fix-use-after-free-CVE-2022-30065.patch -BUSYBOX_IGNORE_CVES += CVE-2022-30065 # 0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch # 0005-nslookup-sanitize-all-printed-strings-with-printable.patch BUSYBOX_IGNORE_CVES += CVE-2022-28391 -- 2.39.1 From arnout at mind.be Tue Feb 7 13:09:46 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 14:09:46 +0100 Subject: [Buildroot] [PATCH] package/pkg-generic: ignore error when chmod'ing extracted source In-Reply-To: <20220616020353.497241-1-uwu@icenowy.me> References: <20220616020353.497241-1-uwu@icenowy.me> Message-ID: Hi Icenswy, On 16/06/2022 04:03, Icenowy Zheng wrote: > The chmod command included in GNU coreutils 9.0 will exit with 1 when in As mentioned by Romain, this is really a bug in coreutils which was fixed in coreutils 9.1. Since I assume all distros will have updated their coreutils, I see little value in carrying a fix in Buildroot. On the other hand, there is some value in seeing a failure of the chmod. Therefore, I've marked this patch as Rejected in patchwork. Regardless, thank you for your contribution! Regards, Arnout > a recursive a symlink is met and the mode of both itself and its target > is retained; however this situation is usually expected (such kind of > symlink exists in, e.g., a newly extracted tarball of Linux kernel), > thus not a failure. > > Considering this chmod call is only kind of vanishing, ignore error for > it. > > Signed-off-by: Icenowy Zheng > --- > package/pkg-generic.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index b233b07548..03e4b029b3 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -216,7 +216,7 @@ $(BUILD_DIR)/%/.stamp_extracted: > $(Q)mkdir -p $(@D) > $($(PKG)_EXTRACT_CMDS) > # some packages have messed up permissions inside > - $(Q)chmod -R +rw $(@D) > + -$(Q)chmod -R +rw $(@D) > $(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep)) > @$(call step_end,extract) > $(Q)touch $@ From thomas.petazzoni at bootlin.com Tue Feb 7 12:41:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:41:48 +0100 Subject: [Buildroot] [git commit] package/python-spake2: new package Message-ID: <20230207132558.94BFC84150@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9aaef2a07780a200512ccadb2381c559c4ffd8e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master SPAKE2 password-authenticated key exchange (in pure python). This library implements the SPAKE2 password-authenticated key exchange ("PAKE") algorithm. This allows two parties, who share a weak password, to safely derive a strong shared secret (and therefore build an encrypted+authenticated channel). https://github.com/warner/python-spake2 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-spake2/Config.in | 13 +++++++++++++ package/python-spake2/python-spake2.hash | 5 +++++ package/python-spake2/python-spake2.mk | 14 ++++++++++++++ .../testing/tests/package/sample_python_spake2.py | 22 ++++++++++++++++++++++ .../testing/tests/package/test_python_spake2.py | 11 +++++++++++ 7 files changed, 69 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 69e73636be..a631c32405 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1695,6 +1695,7 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-hkdf/ F: package/python-pyalsa/ +F: package/python-spake2/ F: package/rdma-core/ F: package/riscv-isa-sim/ F: package/tinycompress/ @@ -1703,6 +1704,7 @@ 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/sample_python_pyalsa.py +F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py @@ -1713,6 +1715,7 @@ F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py diff --git a/package/Config.in b/package/Config.in index b28949500e..ec7a6483f6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1290,6 +1290,7 @@ menu "External python modules" source "package/python-sockjs/Config.in" source "package/python-sortedcontainers/Config.in" source "package/python-soupsieve/Config.in" + source "package/python-spake2/Config.in" source "package/python-spidev/Config.in" source "package/python-sqlalchemy/Config.in" source "package/python-sqliteschema/Config.in" diff --git a/package/python-spake2/Config.in b/package/python-spake2/Config.in new file mode 100644 index 0000000000..1c2e3a49af --- /dev/null +++ b/package/python-spake2/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_SPAKE2 + bool "python-spake2" + select BR2_PACKAGE_PYTHON_HKDF # runtime + help + SPAKE2 password-authenticated key exchange (in pure python). + + This library implements the SPAKE2 password-authenticated + key exchange ("PAKE") algorithm. This allows two parties, + who share a weak password, to safely derive a strong shared + secret (and therefore build an encrypted+authenticated + channel). + + https://github.com/warner/python-spake2 diff --git a/package/python-spake2/python-spake2.hash b/package/python-spake2/python-spake2.hash new file mode 100644 index 0000000000..30052b1b36 --- /dev/null +++ b/package/python-spake2/python-spake2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/spake2/json +md5 0155bad518bb49c39994fe0b7d9fb32c spake2-0.8.tar.gz +sha256 c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4 spake2-0.8.tar.gz +# Locally computed sha256 checksums +sha256 2a8a1200c3a2769d1815727f3b4439bd800f3bc88163118a36ff30b007d30031 LICENSE diff --git a/package/python-spake2/python-spake2.mk b/package/python-spake2/python-spake2.mk new file mode 100644 index 0000000000..99ce7dae13 --- /dev/null +++ b/package/python-spake2/python-spake2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-spake2 +# +################################################################################ + +PYTHON_SPAKE2_VERSION = 0.8 +PYTHON_SPAKE2_SOURCE = spake2-$(PYTHON_SPAKE2_VERSION).tar.gz +PYTHON_SPAKE2_SITE = https://files.pythonhosted.org/packages/60/0b/bb5eca8e18c38a10b1c207bbe6103df091e5cf7b3e5fdc0efbcad7b85b60 +PYTHON_SPAKE2_SETUP_TYPE = setuptools +PYTHON_SPAKE2_LICENSE = MIT +PYTHON_SPAKE2_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_spake2.py b/support/testing/tests/package/sample_python_spake2.py new file mode 100644 index 0000000000..49dd914ca8 --- /dev/null +++ b/support/testing/tests/package/sample_python_spake2.py @@ -0,0 +1,22 @@ +from binascii import hexlify + +from spake2 import SPAKE2_A, SPAKE2_B + + +shared_password = b"This Is The Password!" + +alice = SPAKE2_A(shared_password) +alice_msg = alice.start() + +bob = SPAKE2_B(shared_password) +bob_msg = bob.start() + +# Alice and Bob exchange their messages... + +alice_key = alice.finish(bob_msg) +bob_key = bob.finish(alice_msg) + +print("alice_key:", hexlify(alice_key)) +print(" bob_key:", hexlify(bob_key)) + +assert alice_key == bob_key diff --git a/support/testing/tests/package/test_python_spake2.py b/support/testing/tests/package/test_python_spake2.py new file mode 100644 index 0000000000..fb47a0802c --- /dev/null +++ b/support/testing/tests/package/test_python_spake2.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Spake2(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_SPAKE2=y + """ + sample_scripts = ["tests/package/sample_python_spake2.py"] From thomas.petazzoni at bootlin.com Tue Feb 7 13:01:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:01:05 +0100 Subject: [Buildroot] [git commit] support/testing/tests/package/test_python_magic_wormhole.py: new runtime test Message-ID: <20230207132558.CA9AB84151@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e23807372370974a307b3c70ef9d77964a149ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../tests/package/test_python_magic_wormhole.py | 62 ++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5776d6d7a5..8dde37bd67 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1717,6 +1717,7 @@ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py +F: support/testing/tests/package/test_python_magic_wormhole.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py diff --git a/support/testing/tests/package/test_python_magic_wormhole.py b/support/testing/tests/package/test_python_magic_wormhole.py new file mode 100644 index 0000000000..d6541a2480 --- /dev/null +++ b/support/testing/tests/package/test_python_magic_wormhole.py @@ -0,0 +1,62 @@ +import os + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3MagicWormhole(TestPythonPackageBase): + __test__ = True + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE=y + BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER=y + BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + timeout = 60 + + def twistd_cmd(self, command): + s = "twistd" + s += " --pidfile=/tmp/{}.pid".format(command) + s += " --logfile=/tmp/{}.log".format(command) + s += " {}".format(command) + + return s + + def test_run(self): + code = "123-hello-buildroot" + text = "Hello Buildroot!" + + relay_url = "ws://localhost:4000/v1" + transit_helper = "tcp:localhost:4001" + + img = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", kernel="builtin", + options=["-initrd", img]) + + self.emulator.login() + + cmd = self.twistd_cmd("wormhole-mailbox") + self.assertRunOk(cmd, timeout=30) + + cmd = self.twistd_cmd("transitrelay") + self.assertRunOk(cmd, timeout=30) + + wormhole_cmd = "wormhole --relay-url={} --transit-helper={}".format( + relay_url, transit_helper) + + cmd = wormhole_cmd + " send --code={} --text=\"{}\" & ".format(code, text) + cmd += "sleep 25" + self.assertRunOk(cmd, timeout=30) + + cmd = wormhole_cmd + " receive {}".format(code) + output, exit_code = self.emulator.run(cmd, timeout=35) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], text) From thomas.petazzoni at bootlin.com Tue Feb 7 12:47:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:47:55 +0100 Subject: [Buildroot] [git commit] package/python-magic-wormhole: new package Message-ID: <20230207132558.A176384151@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb013c3757548f3153a9da59906c388d32a376fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Securely transfer data between computers. This package provides a library and a command-line tool named "wormhole", which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. The two endpoints are identified by using identical "wormhole codes": in general, the sending machine generates and displays the code, which must then be typed into the receiving machine. https://github.com/magic-wormhole/magic-wormhole Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-magic-wormhole/Config.in | 27 ++++++++++++++++++++++ .../python-magic-wormhole.hash | 5 ++++ .../python-magic-wormhole/python-magic-wormhole.mk | 14 +++++++++++ 5 files changed, 48 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a631c32405..8d1d9340bb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1694,6 +1694,7 @@ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ F: package/python-hkdf/ +F: package/python-magic-wormhole/ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ diff --git a/package/Config.in b/package/Config.in index ec7a6483f6..cb9a2b829f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1120,6 +1120,7 @@ menu "External python modules" source "package/python-logstash/Config.in" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" + source "package/python-magic-wormhole/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-magic-wormhole/Config.in b/package/python-magic-wormhole/Config.in new file mode 100644 index 0000000000..e8429d203b --- /dev/null +++ b/package/python-magic-wormhole/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE + bool "python-magic-wormhole" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime + select BR2_PACKAGE_PYTHON_AUTOMAT # runtime + select BR2_PACKAGE_PYTHON_CLICK # runtime + select BR2_PACKAGE_PYTHON_HKDF # runtime + select BR2_PACKAGE_PYTHON_HUMANIZE # runtime + select BR2_PACKAGE_PYTHON_PYNACL # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_SPAKE2 # runtime + select BR2_PACKAGE_PYTHON_TQDM # runtime + select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_TXTORCON # runtime + help + Securely transfer data between computers. + + This package provides a library and a command-line tool + named "wormhole", which makes it possible to get + arbitrary-sized files and directories (or short pieces of + text) from one computer to another. The two endpoints are + identified by using identical "wormhole codes": in general, + the sending machine generates and displays the code, which + must then be typed into the receiving machine. + + https://github.com/magic-wormhole/magic-wormhole diff --git a/package/python-magic-wormhole/python-magic-wormhole.hash b/package/python-magic-wormhole/python-magic-wormhole.hash new file mode 100644 index 0000000000..5e880d5427 --- /dev/null +++ b/package/python-magic-wormhole/python-magic-wormhole.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole/json +md5 ca190d92f56fe32ec8dfd4fc5aab8337 magic-wormhole-0.12.0.tar.gz +sha256 1b0fd8a334da978f3dd96b620fa9b9348cabedf26a87f74baac7a37052928160 magic-wormhole-0.12.0.tar.gz +# Locally computed sha256 checksums +sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE diff --git a/package/python-magic-wormhole/python-magic-wormhole.mk b/package/python-magic-wormhole/python-magic-wormhole.mk new file mode 100644 index 0000000000..91f0f826d5 --- /dev/null +++ b/package/python-magic-wormhole/python-magic-wormhole.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_VERSION = 0.12.0 +PYTHON_MAGIC_WORMHOLE_SOURCE = magic-wormhole-$(PYTHON_MAGIC_WORMHOLE_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_SITE = https://files.pythonhosted.org/packages/d4/62/5e4a86f7c4b111e016577f1b304063ebe604f430db15465ac58b13993608 +PYTHON_MAGIC_WORMHOLE_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 12:56:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:56:25 +0100 Subject: [Buildroot] [git commit] package/python-magic-wormhole-transit-relay: new package Message-ID: <20230207132558.BD9E984150@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=037dbe64d861e3d5580ecac608bd278afc9bbcc6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Transit Relay server for Magic-Wormhole. This repository implements the Magic-Wormhole "Transit Relay", a server that helps clients establish bulk-data transit connections even when both are behind NAT boxes. Each side makes a TCP connection to this server and presents a handshake. Two connections with identical handshakes are glued together, allowing them to pretend they have a direct connection. https://github.com/magic-wormhole/magic-wormhole-transit-relay Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-magic-wormhole-transit-relay/Config.in | 15 +++++++++++++++ .../python-magic-wormhole-transit-relay.hash | 5 +++++ .../python-magic-wormhole-transit-relay.mk | 14 ++++++++++++++ 5 files changed, 36 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index afc079a609..5776d6d7a5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1696,6 +1696,7 @@ F: package/python-gnupg/ F: package/python-hkdf/ F: package/python-magic-wormhole/ F: package/python-magic-wormhole-mailbox-server/ +F: package/python-magic-wormhole-transit-relay/ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ diff --git a/package/Config.in b/package/Config.in index 2ef403168a..b5418c56f6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1122,6 +1122,7 @@ menu "External python modules" source "package/python-m2crypto/Config.in" source "package/python-magic-wormhole/Config.in" source "package/python-magic-wormhole-mailbox-server/Config.in" + source "package/python-magic-wormhole-transit-relay/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-magic-wormhole-transit-relay/Config.in b/package/python-magic-wormhole-transit-relay/Config.in new file mode 100644 index 0000000000..1a743c10fe --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY + bool "python-magic-wormhole-transit-relay" + select BR2_PACKAGE_PYTHON_TWISTED # runtime + help + Transit Relay server for Magic-Wormhole. + + This repository implements the Magic-Wormhole "Transit + Relay", a server that helps clients establish bulk-data + transit connections even when both are behind NAT + boxes. Each side makes a TCP connection to this server and + presents a handshake. Two connections with identical + handshakes are glued together, allowing them to pretend they + have a direct connection. + + https://github.com/magic-wormhole/magic-wormhole-transit-relay diff --git a/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash new file mode 100644 index 0000000000..f131477a40 --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole-transit-relay/json +md5 aa575a4e22b3d5099674ba88b136a9a2 magic-wormhole-transit-relay-0.2.1.tar.gz +sha256 cb4801b46890eaff97286e0e3fec62d1d52ffe317d140083b6336a1fb4e8fa5e magic-wormhole-transit-relay-0.2.1.tar.gz +# Locally computed sha256 checksums +sha256 d70f6469bb210c2aa4c0dfd74f498ef5f0467a137d8296479088e7243c5884eb LICENSE diff --git a/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk new file mode 100644 index 0000000000..e4ffe6e7a6 --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole-transit-relay +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_VERSION = 0.2.1 +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SOURCE = magic-wormhole-transit-relay-$(PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SITE = https://files.pythonhosted.org/packages/21/c9/be25bb30e327037e009657960fc594d089b118c0d81cc6a200cad1bb3852 +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 12:54:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:54:07 +0100 Subject: [Buildroot] [git commit] package/python-magic-wormhole-mailbox-server: new package Message-ID: <20230207132558.AF82B84153@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9244052f28d87d6d85b73402e7d15f730eb66c4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package is the main server that Magic-Wormhole clients connect to. The server performs store-and-forward delivery for small key-exchange and control messages. Bulk data is sent over a direct TCP connection, or through a transit-relay. https://github.com/magic-wormhole/magic-wormhole-mailbox-server Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...move-the-U-open-mode-removed-in-Python-3..patch | 39 ++++++++++++++++++++++ .../python-magic-wormhole-mailbox-server/Config.in | 15 +++++++++ .../python-magic-wormhole-mailbox-server.hash | 5 +++ .../python-magic-wormhole-mailbox-server.mk | 14 ++++++++ 6 files changed, 75 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8d1d9340bb..afc079a609 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1695,6 +1695,7 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-hkdf/ F: package/python-magic-wormhole/ +F: package/python-magic-wormhole-mailbox-server/ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ diff --git a/package/Config.in b/package/Config.in index cb9a2b829f..2ef403168a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1121,6 +1121,7 @@ menu "External python modules" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" source "package/python-magic-wormhole/Config.in" + source "package/python-magic-wormhole-mailbox-server/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch b/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch new file mode 100644 index 0000000000..8afe7c9546 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch @@ -0,0 +1,39 @@ +From df6126ee86c1f84c7e0c25fcf69543b83b1b32c6 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 5 Nov 2022 13:06:07 +0100 +Subject: [PATCH] setup.py: remove the 'U' open mode removed in Python 3.11 + +The 'U' open mode was removed in Python 3.11. See: +https://docs.python.org/3.11/library/functions.html#open + +Installing with Python 3.11 fails with: + + /path/to/python-magic-wormhole-mailbox-server-0.4.1/setup.py", line 20, in + long_description=open('README.md', 'rU').read(), + ^^^^^^^^^^^^^^^^^^^^^^^ + ValueError: invalid mode: 'rU' + +This patch removes the 'U' open mode. + +Upstream: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/commit/df6126ee86c1f84c7e0c25fcf69543b83b1b32c6 +Signed-off-by: Julien Olivain +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 6ef292f..ad9ff5a 100644 +--- a/setup.py ++++ b/setup.py +@@ -17,7 +17,7 @@ trove_classifiers = [ + setup(name="magic-wormhole-mailbox-server", + version=versioneer.get_version(), + description="Securely transfer data between computers", +- long_description=open('README.md', 'rU').read(), ++ long_description=open('README.md', 'r').read(), + long_description_content_type='text/markdown', + author="Brian Warner", + author_email="warner-magic-wormhole at lothar.com", +-- +2.38.1 + diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in new file mode 100644 index 0000000000..db20d3e7b6 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER + bool "python-magic-wormhole-mailbox-server" + select BR2_PACKAGE_PYTHON3_SQLITE # runtime + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_TWISTED # runtime + help + This package is the main server that Magic-Wormhole clients + connect to. The server performs store-and-forward delivery + for small key-exchange and control messages. Bulk data is + sent over a direct TCP connection, or through a + transit-relay. + + https://github.com/magic-wormhole/magic-wormhole-mailbox-server diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash new file mode 100644 index 0000000000..c714712641 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole-mailbox-server/json +md5 3da441df1f354a8399a728da3421ac8f magic-wormhole-mailbox-server-0.4.1.tar.gz +sha256 1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb magic-wormhole-mailbox-server-0.4.1.tar.gz +# Locally computed sha256 checksums +sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk new file mode 100644 index 0000000000..a3394c7dcd --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole-mailbox-server +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION = 0.4.1 +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SOURCE = magic-wormhole-mailbox-server-$(PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SITE = https://files.pythonhosted.org/packages/5b/ba/cbb211bc8f8bfdf7fb620d33331f07bcd889c7a28e7fd8a0de9029bb5a2f +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 13:31:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:31:16 +0100 Subject: [Buildroot] [PATCH next v2 1/7] package/python-idna: set _SETUP_TYPE = flit In-Reply-To: <20221122203130.184496-1-ju.o@free.fr> References: <20221122203130.184496-1-ju.o@free.fr> Message-ID: <20230207143116.40b1f42b@windsurf> On Tue, 22 Nov 2022 21:31:24 +0100 Julien Olivain wrote: > Python idna package switched to pyproject.toml in commit: > https://github.com/kjd/idna/commit/2a00e518efe55d2eeb62cd3f88ace7db41338603 > which is included in idna v3.4. > > When using the old setuptools infra, the package is incorrectly > installed as v0.0, which is then incorrectly detected by other > packages when using setuptools pkg_resources. > > The issue can be reproduced with the command: > > python3 < __requires__ = ["idna >= 2.5"] > import pkg_resources > EOF > > which will fail with output: > > pkg_resources.ContextualVersionConflict: (idna 0.0.0 (/usr/lib/python3.11/site-packages), Requirement.parse('idna>=2.5'), {'hyperlink'}) > pkg_resources.DistributionNotFound: The 'idna>=2.5' distribution was not found and is required by hyperlink > > This commit changes _SETUP_TYPE to "flit" to fix this issue. > > Signed-off-by: Julien Olivain > --- > Changes v1 -> v2: > - Included James' review comment: > - _SETUP_TYPE changed from pep517 to flit > --- > package/python-idna/python-idna.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks, entire series applied! There was really not much to fix. In one commit, the runtime test file was forgotten in DEVELOPERS, and in another, I've added a reference to the upstream commit for the open(..., "rU") thing. Thanks a lot for having added relevant runtime tests for all of this, this is really good! Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Tue Feb 7 13:30:56 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 14:30:56 +0100 Subject: [Buildroot] [git commit] package/busybox: update to 1.36.0 Message-ID: <20230207133203.3C44D8417C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d68b617993bd2f5c82a4936ed1e24e4fec6b94a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove upstream patch 0003-awk-fix-use-after-free-CVE-2022-30065.patch and update _IGNORE_CVES accordingly. The two other CVE fixes are still not applied upstream. Renumber the patches and update the comment in the .mk file. Refresh busybox.config. All configs are set to the new defaults, except for CONFIG_UDHCPC_DEFAULT_SCRIPT: for this one, reuse the script we also use for DHCPv4. This is matches the behaviour previous to the bump, where we had a single script handling both. Signed-off-by: Arnout Vandecappelle --- ...003-awk-fix-use-after-free-CVE-2022-30065.patch | 52 ---------------------- ...dr2str-ensure-only-printable-characters-.patch} | 0 ...itize-all-printed-strings-with-printable.patch} | 0 package/busybox/busybox.config | 23 +++++++--- package/busybox/busybox.hash | 2 +- package/busybox/busybox.mk | 8 ++-- 6 files changed, 21 insertions(+), 64 deletions(-) diff --git a/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch b/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch deleted file mode 100644 index f9bfee328e..0000000000 --- a/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e06b1f0839972cc3f5b432849d574d14a8f17613 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Fri, 17 Jun 2022 17:45:34 +0200 -Subject: [PATCH] awk: fix use after free (CVE-2022-30065) - -fixes https://bugs.busybox.net/show_bug.cgi?id=14781 - -function old new delta -evaluate 3343 3357 +14 - -Signed-off-by: Natanael Copa -Signed-off-by: Denys Vlasenko -Backport: https://git.busybox.net/busybox/commit/?id=e63d7cdfdac78c6fd27e9e63150335767592b85e -[straightforward conflict resolution in testsuite/awk.tests] -Signed-off-by: Quentin Schulz ---- - editors/awk.c | 3 +++ - testsuite/awk.tests | 6 ++++++ - 2 files changed, 9 insertions(+) - -diff --git a/editors/awk.c b/editors/awk.c -index f6314ac72..654cbac33 100644 ---- a/editors/awk.c -+++ b/editors/awk.c -@@ -3114,6 +3114,9 @@ static var *evaluate(node *op, var *res) - - case XC( OC_MOVE ): - debug_printf_eval("MOVE\n"); -+ /* make sure that we never return a temp var */ -+ if (L.v == TMPVAR0) -+ L.v = res; - /* if source is a temporary string, jusk relink it to dest */ - if (R.v == TMPVAR1 - && !(R.v->type & VF_NUMBER) -diff --git a/testsuite/awk.tests b/testsuite/awk.tests -index bcaafe8fd..156aa65eb 100755 ---- a/testsuite/awk.tests -+++ b/testsuite/awk.tests -@@ -469,4 +469,10 @@ testing 'awk printf %% prints one %' \ - "%\n" \ - '' '' - -+testing 'awk assign while test' \ -+ "awk '\$1==\$1=\"foo\" {print \$1}'" \ -+ "foo\n" \ -+ "" \ -+ "foo" -+ - exit $FAILCOUNT --- -2.37.3 - diff --git a/package/busybox/0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch b/package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch similarity index 100% rename from package/busybox/0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch rename to package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch diff --git a/package/busybox/0005-nslookup-sanitize-all-printed-strings-with-printable.patch b/package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch similarity index 100% rename from package/busybox/0005-nslookup-sanitize-all-printed-strings-with-printable.patch rename to package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index e7f628ca6d..4826fb8242 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.35.0 -# Thu Jan 27 10:16:54 2022 +# Busybox version: 1.36.0 +# Tue Feb 7 12:34:02 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA1_SMALL=3 +CONFIG_SHA1_HWACCEL=y +CONFIG_SHA256_HWACCEL=y CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_NON_POSIX_CP=y # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set @@ -123,6 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=0 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets @@ -338,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y CONFIG_TRUNCATE=y +CONFIG_TSORT=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux" @@ -520,7 +527,7 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y -# CONFIG_USE_BB_CRYPT_SHA is not set +CONFIG_USE_BB_CRYPT_SHA=y # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set CONFIG_ADDGROUP=y @@ -811,10 +818,10 @@ CONFIG_FEATURE_LESS_TRUNCATE=y CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_FEATURE_LESS_WINCH is not set # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set +CONFIG_FEATURE_LESS_DASHCMD=y # CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_FEATURE_LESS_RAW is not set -# CONFIG_FEATURE_LESS_ENV is not set +CONFIG_FEATURE_LESS_RAW=y +CONFIG_FEATURE_LESS_ENV=y CONFIG_LSSCSI=y CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set @@ -831,10 +838,12 @@ CONFIG_PARTPROBE=y # CONFIG_RFKILL is not set CONFIG_RUNLEVEL=y # CONFIG_RX is not set +CONFIG_SEEDRNG=y CONFIG_SETFATTR=y CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y +CONFIG_TREE=y CONFIG_TS=y # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set @@ -1007,6 +1016,7 @@ CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC6_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" # CONFIG_UDHCPC6 is not set # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set @@ -1141,6 +1151,7 @@ CONFIG_ASH_IDLE_TIMEOUT=y CONFIG_ASH_ECHO=y CONFIG_ASH_PRINTF=y CONFIG_ASH_TEST=y +CONFIG_ASH_SLEEP=y CONFIG_ASH_HELP=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 2091cdaf65..6d1c36906d 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ # From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 -sha256 faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 busybox-1.35.0.tar.bz2 +sha256 542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5 busybox-1.36.0.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index f8f9cb5616..1633ca525d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,17 +4,15 @@ # ################################################################################ -BUSYBOX_VERSION = 1.35.0 +BUSYBOX_VERSION = 1.36.0 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 BUSYBOX_LICENSE_FILES = LICENSE archival/libarchive/bz/LICENSE BUSYBOX_CPE_ID_VENDOR = busybox -# 0003-awk-fix-use-after-free-CVE-2022-30065.patch -BUSYBOX_IGNORE_CVES += CVE-2022-30065 -# 0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch -# 0005-nslookup-sanitize-all-printed-strings-with-printable.patch +# 0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch +# 0004-nslookup-sanitize-all-printed-strings-with-printable.patch BUSYBOX_IGNORE_CVES += CVE-2022-28391 BUSYBOX_CFLAGS = \ From arnout at mind.be Tue Feb 7 13:33:10 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 14:33:10 +0100 Subject: [Buildroot] [PATCH] package/busybox: update to 1.36.0 In-Reply-To: <20230207115344.440172-1-arnout@mind.be> References: <20230207115344.440172-1-arnout@mind.be> Message-ID: <5b84c64e-bfb9-cd95-63fa-8571cd430e5e@mind.be> On 07/02/2023 12:53, Arnout Vandecappelle wrote: > Remove upstream patch 0003-awk-fix-use-after-free-CVE-2022-30065.patch > and update _IGNORE_CVES accordingly. > > The two other CVE fixes are still needed. > > Refresh busybox.config. All configs are set to the new defaults, except > for CONFIG_UDHCPC_DEFAULT_SCRIPT: for this one, reuse the script we also > use for DHCPv4. This is matches the behaviour previous to the bump, > where we had a single script handling both. > > Signed-off-by: Arnout Vandecappelle Applied to master after a quick review by Thomas, thanks. Regards, Arnout > --- > ...wk-fix-use-after-free-CVE-2022-30065.patch | 52 ------------------- > package/busybox/busybox.config | 23 +++++--- > package/busybox/busybox.hash | 2 +- > package/busybox/busybox.mk | 4 +- > 4 files changed, 19 insertions(+), 62 deletions(-) > delete mode 100644 package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch [snip] From romain.naour at smile.fr Tue Feb 7 13:40:00 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 14:40:00 +0100 Subject: [Buildroot] [PATCH] toolchain/toolchain-wrapper: make gcc --help -v work correctly In-Reply-To: <5DD722F6-F9EE-4517-9E55-5A61BB01F196@gmail.com> References: <5DD722F6-F9EE-4517-9E55-5A61BB01F196@gmail.com> Message-ID: Hello Sagi, Le 07/01/2023 ? 19:09, Sagi Mor a ?crit?: > make "gcc --help -v" display all the options, some packages depend on this > https://bugs.busybox.net/show_bug.cgi?id=15231 > Thanks for the report. Actually it's surprising that --help -v options are really used together by a build system to check gcc support. Is something to fix in the python build system instead [1]? As noticed by the GCC maintainer, the -fwrapv option is available since gcc-3.4.5 [2], so it's unlikely someone still trying to build python with gcc 3. Is any other package using "gcc --help -v"? [1] https://github.com/python/cpython/blob/v3.11.1/configure.ac#L2062 [2] https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=4fa26a60791ec314128a9683fd4d657b251d0268 Best regards, Romain > > Signed-off-by: Sagi Mor > --- > ?toolchain/toolchain-wrapper.c | 11 +++++++++++ > ?1 file changed, 11 insertions(+) > > diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c > index 37b24dd24a..85d592ad2d 100644 > --- a/toolchain/toolchain-wrapper.c > +++ b/toolchain/toolchain-wrapper.c > @@ -498,6 +498,17 @@ int main(int argc, char **argv) > ?} > ?} > ? > +/* drop all non forwards args if --help is specified */ > +for (i = 1; i < argc; i++) { > +if (!strcmp(argv[i], "--help")) { > +cur = args + 1; > +#ifdef BR_CCACHE > +cur++; > +#endif > +break; > +} > +} > + > ?/* append forward args */ > ?memcpy(cur, &argv[1], sizeof(char *) * (argc - 1)); > ?cur += argc - 1; > --? > 2.34.1 > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Tue Feb 7 13:44:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:44:02 +0100 Subject: [Buildroot] [git commit] package/dahdi-linux: fix build with kernel >= 6.1 Message-ID: <20230207134415.6378E8418E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33bdf7bb037c05863aa69bbe219e1cb78d596a3a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with kernel >= 6.1 In file included from ./include/linux/string.h:20, from ./include/linux/bitmap.h:11, from ./include/linux/cpumask.h:12, from ./include/linux/mm_types_task.h:14, from ./include/linux/mm_types.h:5, from ./include/linux/buildid.h:5, from ./include/linux/module.h:14, from /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:24: ./arch/powerpc/include/asm/string.h:27:22: note: expected ???void *??? but argument is of type ???const unsigned char *??? 27 | extern void * memcpy(void *,const void *,__kernel_size_t); | ^~~~~~ /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:661:9: error: too many arguments to function ???netif_napi_add??? 661 | netif_napi_add(netdev, &wc->napi, &wctc4xxp_poll, 64); | ^~~~~~~~~~~~~~ In file included from ./include/net/inet_sock.h:19, from ./include/linux/udp.h:16, from /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:38: ./include/linux/netdevice.h:2562:1: note: declared here 2562 | netif_napi_add(struct net_device *dev, struct napi_struct *napi, | ^~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/d7ce103a886329c68c04ebe05571be8f95a873ce Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0004-next-fix-kernel-6-1-build.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch b/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch new file mode 100644 index 0000000000..b910c4b775 --- /dev/null +++ b/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch @@ -0,0 +1,32 @@ +From a759a578277bde98eba7ef4bf86bdf819a900de9 Mon Sep 17 00:00:00 2001 +From: John Thomson +Date: Sun, 23 Oct 2022 13:42:52 +1000 +Subject: [PATCH] fix kernel 6.1 build + +kernel 6.1 includes b48b89f9c189 ("net: drop the weight argument from netif_napi_add") [0] + +[0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b48b89f9c189d24eb5e2b4a0ac067da5a24ee86d + +Signed-off-by: John Thomson +[Retrieved from: +https://github.com/asterisk/dahdi-linux/pull/14/commits/a759a578277bde98eba7ef4bf86bdf819a900de9] +Signed-off-by: Fabrice Fontaine +--- + include/dahdi/kernel.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h +index 35e93bc4..fd64a15e 100644 +--- a/include/dahdi/kernel.h ++++ b/include/dahdi/kernel.h +@@ -58,6 +58,10 @@ + + #include + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++#define netif_napi_add netif_napi_add_weight ++#endif ++ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) + #include + #include From thomas.petazzoni at bootlin.com Tue Feb 7 13:44:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:44:02 +0100 Subject: [Buildroot] [git commit] package/dahdi-linux: update URL in Config.in help text Message-ID: <20230207134415.6E95E84194@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e06975b38047fe1ef47650248f154ecf88fe09b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master http://www.asterisk.org/downloads/dahdi no longer works, use the Github page instead. Signed-off-by: Thomas Petazzoni --- package/dahdi-linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dahdi-linux/Config.in b/package/dahdi-linux/Config.in index 7b6ce79422..b6086fdc6c 100644 --- a/package/dahdi-linux/Config.in +++ b/package/dahdi-linux/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_DAHDI_LINUX DAHDI Linux is the open source device driver framework used to interface Asterisk with telephony hardware. - http://www.asterisk.org/downloads/dahdi + https://github.com/asterisk/dahdi-linux comment "dahdi-linux needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL From thomas.petazzoni at bootlin.com Tue Feb 7 13:44:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:44:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/dahdi-linux: fix build with kernel >= 6.1 In-Reply-To: <20221229164315.424657-1-fontaine.fabrice@gmail.com> References: <20221229164315.424657-1-fontaine.fabrice@gmail.com> Message-ID: <20230207144425.7a9e03fd@windsurf> On Thu, 29 Dec 2022 17:43:15 +0100 Fabrice Fontaine wrote: > Fix the following build failure with kernel >= 6.1 > > In file included from ./include/linux/string.h:20, > from ./include/linux/bitmap.h:11, > from ./include/linux/cpumask.h:12, > from ./include/linux/mm_types_task.h:14, > from ./include/linux/mm_types.h:5, > from ./include/linux/buildid.h:5, > from ./include/linux/module.h:14, > from /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:24: > ./arch/powerpc/include/asm/string.h:27:22: note: expected ?void *? but argument is of type ?const unsigned char *? > 27 | extern void * memcpy(void *,const void *,__kernel_size_t); > | ^~~~~~ > /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:661:9: error: too many arguments to function ?netif_napi_add? > 661 | netif_napi_add(netdev, &wc->napi, &wctc4xxp_poll, 64); > | ^~~~~~~~~~~~~~ > In file included from ./include/net/inet_sock.h:19, > from ./include/linux/udp.h:16, > from /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:38: > ./include/linux/netdevice.h:2562:1: note: declared here > 2562 | netif_napi_add(struct net_device *dev, struct napi_struct *napi, > | ^~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/d7ce103a886329c68c04ebe05571be8f95a873ce > > Signed-off-by: Fabrice Fontaine > --- > .../0004-next-fix-kernel-6-1-build.patch | 32 +++++++++++++++++++ > 1 file changed, 32 insertions(+) > create mode 100644 package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Tue Feb 7 13:52:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 14:52:27 +0100 Subject: [Buildroot] [git commit] package/pkg-generic.mk: only check for virtual package conflicts when building Message-ID: <20230207135235.D0949841B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7231701a290ba447fde9807ba9d260022ddfc8e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 2f8ba39edf..5d618c6b39 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1182,10 +1182,12 @@ ifeq ($$($$($(2)_KCONFIG_VAR)),y) # Ensure the calling package is the declared provider for all the virtual # packages it claims to be an implementation of. +ifeq ($(BR_BUILDING),y) ifneq ($$($(2)_PROVIDES),) $$(foreach pkg,$$($(2)_PROVIDES),\ $$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep))) endif +endif # Register package as a reverse-dependencies of all its dependencies $$(eval $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),\ From peter at korsgaard.com Tue Feb 7 13:52:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 14:52:26 +0100 Subject: [Buildroot] [git commit] package/mesa3d-headers: only check for conflicts when building Message-ID: <20230207135235.C34CC841B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=509956da4cdba6a76214322b1ace979bbe6cd6a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 03bf635816..9177adceda 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -6,7 +6,7 @@ # mesa3d-headers is inherently incompatible with mesa3d, so error out # if both are enabled. -ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yy) +ifeq ($(BR_BUILDING)$(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yyy) $(error mesa3d-headers enabled, but mesa3d enabled too) endif From yann.morin.1998 at free.fr Tue Feb 7 13:55:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 14:55:03 +0100 Subject: [Buildroot] [PATCH] package/gcc/gcc-final: map debug prefix when reproducible In-Reply-To: <20230206162617.1907911-1-john@metanate.com> References: <20230206162617.1907911-1-john@metanate.com> Message-ID: <20230207135503.GF4124@scaer> John, All, On 2023-02-06 16:26 +0000, John Keeping spake thusly: > When building with BR2_REPRODUCIBLE the toolchain wrapper passes > -fdebug-prefix-map for all packages that are built. But this doesn't > affect the target libraries (like libgcc) built by GCC's build system. > > GCC 4.3 added a configure option to set the debug prefix map for these > libraries, which is used here to avoid encoding potentially > non-reproducible build paths into the debug data. Thanks, this is indeed very interesting. We (briefly) discussed this at the developers day minutes ago, and the question that was brought up was: why is not needed for the first-stage compiler? Indeed, the first-stage compiler builds objects files that are then used by the C library, we would expect the debug symbols for those to also need prefix mapping. Could you look into that, and either pass the option to both the initial and final gcc if needed, or explain in the commit log why it is not needed for the initial gcc, please? In the meantime, I've marked this patch as changes-requested in patchwork. Regards, Yann E. MORIN. > Signed-off-by: John Keeping > --- > package/gcc/gcc-final/gcc-final.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk > index aa883beb7b..5f222a324c 100644 > --- a/package/gcc/gcc-final/gcc-final.mk > +++ b/package/gcc/gcc-final/gcc-final.mk > @@ -108,6 +108,10 @@ else > HOST_GCC_FINAL_CONF_OPTS += --disable-libgomp > endif > > +ifeq ($(BR2_REPRODUCIBLE),y) > +HOST_GCC_FINAL_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot > +endif > + > # End with user-provided options, so that they can override previously > # defined options. > HOST_GCC_FINAL_CONF_OPTS += \ > -- > 2.39.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 vfazio at xes-inc.com Tue Feb 7 14:01:12 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 7 Feb 2023 14:01:12 +0000 Subject: [Buildroot] [External] - [PATCH 1/1] linux: fix LINUX_VERSION_PROBED content In-Reply-To: <20230104020558.1436469-2-giulio.benetti@benettiengineering.com> References: <20230104020558.1436469-1-giulio.benetti@benettiengineering.com> <20230104020558.1436469-2-giulio.benetti@benettiengineering.com> Message-ID: > -----Original Message----- > From: buildroot On Behalf Of Giulio > Benetti > Sent: Tuesday, January 3, 2023 8:06 PM > To: buildroot at buildroot.org > Cc: Giulio Benetti > Subject: [External] - [Buildroot] [PATCH 1/1] linux: fix > LINUX_VERSION_PROBED content > > Actually LINUX_VERSION_PROBED is set with the string sorrounded by the > backquotes including them. So when we evaluate > $(LINUX_VERSION_PROBED) we end up having the command itself and > instead we only need the Linux version probed in the style x.y.z. > > Verifying it turns out that: > 1) --no-print-directory and -s make flags must be passed before -C flag, The > error was not visible because errors were suppressed with '2>/dev/null' > 2) backquotes don't evaluate the expression they sorround but become part > of the string they sorround and get assigned to the variable > > To fix this let's move --no-print-directory right after $(MAKE) and use $(shell ) > instead of backquotes. > > Signed-off-by: Giulio Benetti Tested-by: Vincent Fazio > --- > linux/linux.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..23c169995a > 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -183,7 +183,7 @@ endif > # Get the real Linux version, which tells us where kernel modules are # > going to be installed in the target filesystem. > # Filter out 'w' from MAKEFLAGS, to workaround a bug in make 4.1 (#13141) > -LINUX_VERSION_PROBED = `MAKEFLAGS='$(filter-out w,$(MAKEFLAGS))' > $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s > kernelrelease 2>/dev/null` > +LINUX_VERSION_PROBED = $(shell MAKEFLAGS='$(filter-out > w,$(MAKEFLAGS))' > +$(MAKE) --no-print-directory -s $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) > +kernelrelease 2>/dev/null) > > LINUX_DTS_NAME += $(call > qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > CAUTION: This email originated from outside of the organization. Do not click > links or open attachments unless you recognize the sender and know the > content is safe. From thomas.petazzoni at bootlin.com Tue Feb 7 14:16:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 15:16:46 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix LINUX_VERSION_PROBED content In-Reply-To: <20230104020558.1436469-2-giulio.benetti@benettiengineering.com> References: <20230104020558.1436469-1-giulio.benetti@benettiengineering.com> <20230104020558.1436469-2-giulio.benetti@benettiengineering.com> Message-ID: <20230207151646.09c9df79@windsurf> Hello Giulio, On Wed, 4 Jan 2023 03:05:58 +0100 Giulio Benetti wrote: > Actually LINUX_VERSION_PROBED is set with the string sorrounded by the > backquotes including them. So when we evaluate $(LINUX_VERSION_PROBED) we > end up having the command itself and instead we only need the Linux version > probed in the style x.y.z. > > Verifying it turns out that: > 1) --no-print-directory and -s make flags must be passed before -C flag, > The error was not visible because errors were suppressed with > '2>/dev/null' > 2) backquotes don't evaluate the expression they sorround but become part > of the string they sorround and get assigned to the variable > > To fix this let's move --no-print-directory right after $(MAKE) and > use $(shell ) instead of backquotes. > > Signed-off-by: Giulio Benetti What is this fixing exactly? Do you have a specific problem that this fixes? Or is this just fixing the fact that LINUX_VERSION_PROBED contains `a very long command` instead of the result of the command itself? Indeed, switching back to $(shell ...) like you're proposing would result in basically backporting: commit 28f57bb863ba48df054cec0057c844bf23d5969f Author: Arnout Vandecappelle Date: Sun Jul 12 16:35:27 2015 +0200 linux: use backtick instead of $(shell ...) make function Verified that LINUX_VERSION_PROBED is only used in "-quoted commands (actually, usually it's not quoted). Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni which is not desirable, especially if you don't have a good justification of why the current situation doesn't work. So for now, I'll mark as Rejected, but if you have a good justification, you can resend with a better commit log with this justification. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From angelo at amarulasolutions.com Tue Feb 7 14:29:54 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:29:54 +0100 Subject: [Buildroot] [PATCH v5 00/12] Extend Qt6 configuration Message-ID: <20230207143006.2681335-1-angelo@amarulasolutions.com> This series is an attempt to revamp the QT6 series from Jesse Van Gavere to be included mainline. It reworks a bit of things we discussed during the developer days in Bruxelles. Angelo Compagnucci (4): package/qt6/qt6base: add support for widgets package/qt6/qt6base: add support for widgets gtk backend package/qt6/qt6base: add opengl support package/qt6/qt6base: add QPA backend selection Jesse Van Gavere (8): package/qt6/qt6base: add support for gui module package/qt6/qt6base: add support for gui module fontconfig/harfbuzz package/qt6/qt6base: Add support for gui module jpeg/png/gif image format package/qt6/qt6base: add support for gui module tslib package/qt6/qt6base: add support for gui module libinput package/qt6/qt6base: add support for gui module kms package/qt6/qt6base: add support for gui module printsupport/cups package/qt6/qt6base: add support for building examples package/qt6/Config.in | 5 + package/qt6/qt6base/Config.in | 161 +++++++++++++++++++++++++++++++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 150 ++++++++++++++++++++++++++++ 4 files changed, 317 insertions(+) -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:29:55 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:29:55 +0100 Subject: [Buildroot] [PATCH v5 01/12] package/qt6/qt6base: add support for gui module In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-2-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index e8357a675c..03e138b8e1 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,12 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_GUI + bool "gui module" + select BR2_PACKAGE_FREETYPE + help + This option enables the Qt6Gui library. + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 43ab642b6c..38479dc106 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -144,6 +144,14 @@ else QT6BASE_CONF_OPTS += -DFEATURE_glib=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) +QT6BASE_CONF_OPTS += -DFEATURE_gui=ON -DFEATURE_freetype=ON -DINPUT_opengl=no -DFEATURE_vulkan=OFF +QT6BASE_DEPENDENCIES += freetype + +else +QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:29:56 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:29:56 +0100 Subject: [Buildroot] [PATCH v5 02/12] package/qt6/qt6base: add support for fontconfig/harfbuzz In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-3-angelo@amarulasolutions.com> From: Jesse Van Gavere Additionally the harfbuzz license file is added and the hash for this is also added to the hash file. Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 21 +++++++++++++++++++++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 03e138b8e1..df9266ba31 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -36,6 +36,27 @@ config BR2_PACKAGE_QT6BASE_GUI help This option enables the Qt6Gui library. +if BR2_PACKAGE_QT6BASE_GUI + +config BR2_PACKAGE_QT6BASE_FONTCONFIG + bool "fontconfig support" + select BR2_PACKAGE_FONTCONFIG + help + This option enables Fontconfig and Freetype support using + the system fontconfig and freetype2 libraries. + +config BR2_PACKAGE_QT6BASE_HARFBUZZ + bool "harfbuzz support" + select BR2_PACKAGE_HARFBUZZ if \ + BR2_TOOLCHAIN_HAS_SYNC_4 && \ + BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + This option enables HarfBuzz support (either system harfbuzz + if the toolchain supports __sync for 4 bytes, or the qt + provided one which avoids this dependency by using QAtomic). + +endif + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 0c722ccded..dda7ff61c8 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,6 @@ # Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 sha256 a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d qtbase-everywhere-src-6.4.2.tar.xz +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 38479dc106..d1e409f35c 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -148,6 +148,29 @@ ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) QT6BASE_CONF_OPTS += -DFEATURE_gui=ON -DFEATURE_freetype=ON -DINPUT_opengl=no -DFEATURE_vulkan=OFF QT6BASE_DEPENDENCIES += freetype +ifeq ($(BR2_PACKAGE_QT6BASE_HARFBUZZ),y) +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=ON +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y) +# system harfbuzz in case __sync for 4 bytes is supported +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=OFF +QT6BASE_DEPENDENCIES += harfbuzz +else #BR2_TOOLCHAIN_HAS_SYNC_4 +# qt harfbuzz otherwise (using QAtomic instead) +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=ON +QT6BASE_LICENSE += , MIT (harfbuzz) +QT6BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON +QT6BASE_DEPENDENCIES += fontconfig +else +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:29:57 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:29:57 +0100 Subject: [Buildroot] [PATCH v5 03/12] package/qt6/qt6base: Add support for jpeg/png/gif image format In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-4-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 19 +++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index df9266ba31..aec9e6d00a 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -55,6 +55,25 @@ config BR2_PACKAGE_QT6BASE_HARFBUZZ if the toolchain supports __sync for 4 bytes, or the qt provided one which avoids this dependency by using QAtomic). +config BR2_PACKAGE_QT6BASE_GIF + bool "GIF support" + help + This compiles and installs the plugin for GIF reading support. + +config BR2_PACKAGE_QT6BASE_JPEG + bool "JPEG support" + select BR2_PACKAGE_JPEG + help + This option enables JPEG support using the system libjpeg + library. + +config BR2_PACKAGE_QT6BASE_PNG + bool "PNG support" + select BR2_PACKAGE_LIBPNG + help + This option enables PNG support using the system libpng + library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index d1e409f35c..0060a4a3fe 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -164,6 +164,26 @@ else QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PNG),y) +QT6BASE_CONF_OPTS += -DFEATURE_png=ON -DFEATURE_system_png=ON +QT6BASE_DEPENDENCIES += libpng +else +QT6BASE_CONF_OPTS += -DFEATURE_png=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_GIF),y) +QT6BASE_CONF_OPTS += -DFEATURE_gif=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_gif=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_JPEG),y) +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=ON +QT6BASE_DEPENDENCIES += jpeg +else +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:29:59 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:29:59 +0100 Subject: [Buildroot] [PATCH v5 05/12] package/qt6/qt6base: add support for widgets gtk backend In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-6-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 9a1c3b4b43..bc2202fb2d 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -219,6 +219,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF endif +# only enable gtk support if libgtk3 X11 backend is enabled +ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy) +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=ON +QT6BASE_DEPENDENCIES += libgtk3 +else +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:29:58 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:29:58 +0100 Subject: [Buildroot] [PATCH v5 04/12] package/qt6/qt6base: add support for widgets In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-5-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 23 +++++++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 28 ++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index aec9e6d00a..0332783500 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -38,6 +38,29 @@ config BR2_PACKAGE_QT6BASE_GUI if BR2_PACKAGE_QT6BASE_GUI +config BR2_PACKAGE_QT6BASE_WIDGETS + bool "widgets module" + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT6BASE_XCB + help + This option enables the Qt6Widgets library. + +config BR2_PACKAGE_QT6BASE_LINUXFB + bool "linuxfb support" + +config BR2_PACKAGE_QT6BASE_XCB + bool "X.org XCB support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_IMAGE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_LIBXKBCOMMON + +comment "X.org XCB backend available if X.org is enabled" + depends on !BR2_PACKAGE_XORG7 + config BR2_PACKAGE_QT6BASE_FONTCONFIG bool "fontconfig support" select BR2_PACKAGE_FONTCONFIG diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 0060a4a3fe..9a1c3b4b43 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -191,6 +191,34 @@ else QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON + +ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_xcb=ON \ + -DFEATURE_xcb_xlib=ON \ + -DFEATURE_xkbcommon=ON \ + -DFEATURE_xkbcommon_x11=ON +QT6BASE_DEPENDENCIES += \ + libxcb \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xlib_libX11 \ + libxkbcommon +QT6BASE_DEPENDENCIES += xlib_libXext +else +QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:00 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:00 +0100 Subject: [Buildroot] [PATCH v5 06/12] package/qt6/qt6base: add opengl support In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-7-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/qt6/Config.in | 5 ++++ package/qt6/qt6base/Config.in | 46 ++++++++++++++++++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 17 +++++++++++++ 3 files changed, 68 insertions(+) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index b0cc008df5..655fa8392a 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -12,6 +12,11 @@ config BR2_PACKAGE_QT6_ARCH_SUPPORTS default y if BR2_sparc64 depends on BR2_USE_MMU +config BR2_PACKAGE_QT6_GL_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + comment "qt6 needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, host gcc >= 8" depends on !BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT6_ARCH_SUPPORTS diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 0332783500..732b81abe3 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -61,6 +61,52 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_OPENGL + bool "OpenGL support" + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + help + This option enables OpenGL support. + +comment "OpenGL support needs an OpenGL-capable backend" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS + +if BR2_PACKAGE_QT6BASE_OPENGL + +choice + prompt "OpenGL API" + help + Select OpenGL API. + +config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP + bool "Desktop OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL + help + Use desktop OpenGL. + +config BR2_PACKAGE_QT6BASE_OPENGL_ES2 + bool "OpenGL ES 2.0+" + depends on BR2_PACKAGE_HAS_LIBGLES + help + Use OpenGL ES 2.0 and later versions. + +endchoice + +config BR2_PACKAGE_QT6BASE_OPENGL_LIB + bool "opengl module" + select BR2_PACKAGE_QT6BASE_WIDGETS + help + This option enables the Qt6OpenGL library. This library + includes OpenGL support classes provided to ease porting + from Qt 4.x. + +config BR2_PACKAGE_QT6BASE_EGLFS + bool "eglfs support" + default y + depends on BR2_PACKAGE_HAS_LIBGBM + select BR2_PACKAGE_QT6BASE_OPENGL + +endif + config BR2_PACKAGE_QT6BASE_FONTCONFIG bool "fontconfig support" select BR2_PACKAGE_FONTCONFIG diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index bc2202fb2d..bfa44ae74c 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -231,6 +231,23 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) +QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON +QT6BASE_DEPENDENCIES += libegl +else +QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON +QT6BASE_DEPENDENCIES += libgl +else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON +QT6BASE_DEPENDENCIES += libgles +else +QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:01 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:01 +0100 Subject: [Buildroot] [PATCH v5 07/12] package/qt6/qt6base: add QPA backend selection In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-8-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 18 ++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 3 +++ 2 files changed, 21 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 732b81abe3..0f1c9fccd2 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -33,6 +33,11 @@ config BR2_PACKAGE_QT6BASE_DBUS config BR2_PACKAGE_QT6BASE_GUI bool "gui module" select BR2_PACKAGE_FREETYPE + # At least one graphic backend must be enabled, so enable + # linuxfb if nothing is enabled. + select BR2_PACKAGE_QT6BASE_LINUXFB if \ + !BR2_PACKAGE_QT6BASE_XCB && \ + !BR2_PACKAGE_QT6BASE_EGLFS help This option enables the Qt6Gui library. @@ -61,6 +66,19 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_DEFAULT_QPA + string "Default graphical platform" + help + Choose the default platform abstraction to use for graphical + applications (e.g xcb, linuxfb, eglfs, ...). If this is + empty, the default for your architecture will be used + (usually this is eglfs). + + You can get a list of supported platforms by running a Qt + application with the option "-platform help" on your + target. You can choose a different platform at runtime with + the -platform option. + config BR2_PACKAGE_QT6BASE_OPENGL bool "OpenGL support" depends on BR2_PACKAGE_QT6_GL_SUPPORTS diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index bfa44ae74c..41c7a8b350 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -252,6 +252,9 @@ else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif +QT6BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT6BASE_DEFAULT_QPA)) +QT6BASE_CONF_OPTS += $(if $(QT6BASE_DEFAULT_QPA),-DQT_QPA_DEFAULT_PLATFORM=$(QT6BASE_DEFAULT_QPA)) + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:03 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:03 +0100 Subject: [Buildroot] [PATCH v5 09/12] package/qt6/qt6base: add support for libinput In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-10-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index c878a2e2b6..be17b63c6a 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -231,6 +231,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_LIBINPUT),y) +QT6BASE_CONF_OPTS += -DFEATURE_libinput=ON +QT6BASE_DEPENDENCIES += libinput +else +QT6BASE_CONF_OPTS += -DFEATURE_libinput=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON QT6BASE_DEPENDENCIES += tslib -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:02 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:02 +0100 Subject: [Buildroot] [PATCH v5 08/12] package/qt6/qt6base: add support for tslib In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-9-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 0f1c9fccd2..dbf9c93123 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -224,6 +224,12 @@ config BR2_PACKAGE_QT6BASE_TEST help This options enables the Qt6Test library. +config BR2_PACKAGE_QT6BASE_TSLIB + bool "Enable Tslib support" + select BR2_PACKAGE_TSLIB + help + This options enables the Tslib plugin + config BR2_PACKAGE_QT6BASE_XML bool "XML module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 41c7a8b350..c878a2e2b6 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -231,6 +231,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) +QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON +QT6BASE_DEPENDENCIES += tslib +else +QT6BASE_CONF_OPTS += -DFEATURE_tslib=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON QT6BASE_DEPENDENCIES += libegl -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:04 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:04 +0100 Subject: [Buildroot] [PATCH v5 10/12] package/qt6/qt6base: add support for kms In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-11-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index be17b63c6a..8830e15388 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -184,6 +184,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT6BASE_CONF_OPTS += -DFEATURE_kms=ON +QT6BASE_DEPENDENCIES += libdrm +else +QT6BASE_CONF_OPTS += -DFEATURE_kms=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:05 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:05 +0100 Subject: [Buildroot] [PATCH v5 11/12] package/qt6/qt6base: add support for printsupport/cups In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-12-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 4 ++++ package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index dbf9c93123..cb2d7d34c2 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -168,6 +168,10 @@ config BR2_PACKAGE_QT6BASE_NETWORK help This options enables the Qt6Network library. +config BR2_PACKAGE_QT6BASE_PRINTSUPPORT + depends on BR2_PACKAGE_QT6BASE_WIDGETS + def_bool y + config BR2_PACKAGE_QT6BASE_SQL bool "sql module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 8830e15388..9f82cfc276 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -184,6 +184,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT), y) +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON +ifeq ($(BR2_PACKAGE_CUPS), y) +QT6BASE_CONF_OPTS += -DFEATURE_cups=ON +QT6BASE_DEPENDENCIES += cups +else +QT6BASE_CONF_OPTS += -DFEATURE_cups=OFF +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF +endif + ifeq ($(BR2_PACKAGE_LIBDRM),y) QT6BASE_CONF_OPTS += -DFEATURE_kms=ON QT6BASE_DEPENDENCIES += libdrm -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:06 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:06 +0100 Subject: [Buildroot] [PATCH v5 12/12] package/qt6/qt6base: add support for building examples In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-13-angelo@amarulasolutions.com> From: Jesse Van Gavere The select option makes the default examples set to actually compile. Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 18 ++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index cb2d7d34c2..365a8cca82 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,24 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_EXAMPLES + bool "Compile and install examples " + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_QT6BASE_DBUS + select BR2_PACKAGE_QT6BASE_NETWORK + select BR2_PACKAGE_QT6BASE_XML + select BR2_PACKAGE_QT6BASE_DBUS + select BR2_PACKAGE_QT6BASE_GUI + select BR2_PACKAGE_QT6BASE_WIDGETS + select BR2_PACKAGE_QT6BASE_OPENGL + select BR2_PACKAGE_QT6BASE_OPENGL_LIB + select BR2_PACKAGE_QT6BASE_CONCURRENT + help + If unsure, say N. + +comment "Building examples needs OpenGL/DBus support" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS || !BR2_PACKAGE_DBUS + config BR2_PACKAGE_QT6BASE_GUI bool "gui module" select BR2_PACKAGE_FREETYPE diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 9f82cfc276..0e72485d88 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -313,6 +313,12 @@ QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EXAMPLES),y) +QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=ON +else +QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_NETWORK),y) QT6BASE_CONF_OPTS += -DFEATURE_network=ON else -- 2.25.1 From arnout at mind.be Tue Feb 7 15:03:27 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 16:03:27 +0100 Subject: [Buildroot] [git commit] package/urandom-scripts: actually credit seed files via seedrng Message-ID: <20230207150345.493D3841CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a6f9d2516820c296a8af788b259ca96926cd60d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, Busybox 1.36.0 contains SeedRNG, a tiny program meant to be called at startup and shutdown (and at arbitrary other points in between if desired). Note that initially, the way seedrng was included in busybox broke things quite severely, but now it's been reverted to a reasonably acceptable version. This is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. Because seedrng is part of busybox, urandom-scripts now depends on BR2_PACKAGE_BUSYBOX. This can be removed again if later we add a standalone seedrng package. Add a decent explanation to the init script about the need for a persistent directory to make this actually work. Signed-off-by: Jason A. Donenfeld [Arnout: - Remove busybox patch, it's now part of busybox 1.36.0. - Depend on busybox. - Fix shellcheck errors. - Use DAEMON and SEEDRNG_ARGS. - Don't bother with "seed_dir" and "skip_credit" variables. - Rename to S20seedrng. ] Signed-off-by: Arnout Vandecappelle --- package/urandom-scripts/Config.in | 5 +-- package/urandom-scripts/S20seedrng | 40 +++++++++++++++++ package/urandom-scripts/S20urandom | 70 ------------------------------ package/urandom-scripts/urandom-scripts.mk | 4 +- 4 files changed, 43 insertions(+), 76 deletions(-) diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in index 987e442e22..6b4a609f95 100644 --- a/package/urandom-scripts/Config.in +++ b/package/urandom-scripts/Config.in @@ -1,10 +1,7 @@ config BR2_PACKAGE_URANDOM_SCRIPTS bool "urandom-initscripts" default y if BR2_PACKAGE_INITSCRIPTS + depends on BR2_PACKAGE_BUSYBOX 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/S20seedrng b/package/urandom-scripts/S20seedrng new file mode 100644 index 0000000000..0fea0bea83 --- /dev/null +++ b/package/urandom-scripts/S20seedrng @@ -0,0 +1,40 @@ +#! /bin/sh +# +# Preserve the random seed between reboots. See urandom(4). +# +# This script can be called multiple times during operation (e.g. with +# "reload" argument) to refresh the seed. + +# The following arguments can be added to SEEDRNG_ARGS in +# /etc/default/seedrng: +# --seed-dir=/path/to/seed/directory +# Path to the directory where the seed and the lock files are stored. +# for optimal operation, this should be a persistent, writeable +# location. Default is /var/lib/seedrng +# +# --skip-credit +# 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. +# +# Example: +# SEEDRNG_ARGS="--seed-dir=/data/seedrng --skip-credit" +# + +DAEMON="seedrng" +SEEDRNG_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +case "$1" in + start|stop|restart|reload) + # Never fail, as this isn't worth making a fuss + # over if it doesn't go as planned. + # shellcheck disable=SC2086 # we need the word splitting + seedrng $SEEDRNG_ARGS || true;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom deleted file mode 100644 index 6c6aea9eee..0000000000 --- a/package/urandom-scripts/S20urandom +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/sh -# -# 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" - -# 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() { - [ -f "$URANDOM_SEED" ] || return 0 - 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;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 2c09728c46..32f3e09343 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -5,8 +5,8 @@ ################################################################################ define URANDOM_SCRIPTS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ - $(TARGET_DIR)/etc/init.d/S20urandom + $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20seedrng \ + $(TARGET_DIR)/etc/init.d/S20seedrng endef $(eval $(generic-package)) From arnout at mind.be Tue Feb 7 15:06:16 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 16:06:16 +0100 Subject: [Buildroot] [PATCH v5] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220420170326.1901572-1-Jason@zx2c4.com> References: <20220420170326.1901572-1-Jason@zx2c4.com> Message-ID: On 20/04/2022 19:03, Jason A. Donenfeld wrote: > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, Busybox now contains SeedRNG, a > tiny program meant to be called at startup and shutdown (and at > arbitrary other points in between if desired). > > Since this is currently in Busybox's git tree, this commit adds it as a > patch to the Busybox package. Then, it wires the init script up to call > it. > > This is a significant improvement over the current init script, which > doesn't credit entropy and whose hashing in shell scripts is sort of > fragile. > > NOTE NOTE NOTE: While I've added the patch to the Busybox package > directory, I don't really know how to wire this up and what to do about > the various config entries. I was hoping that a Buildroot maintainer > might have a better idea of the best way to do this, and could just take > this patch as a starting point for whatever the real commit winds up > being. > > Signed-off-by: Jason A. Donenfeld Applied to master, after some reworking and heavily rewriting the commit message, thanks. package/urandom-scripts: actually credit seed files via seedrng The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, Busybox 1.36.0 contains SeedRNG, a tiny program meant to be called at startup and shutdown (and at arbitrary other points in between if desired). Note that initially, the way seedrng was included in busybox broke things quite severely, but now it's been reverted to a reasonably acceptable version. This is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. Because seedrng is part of busybox, urandom-scripts now depends on BR2_PACKAGE_BUSYBOX. This can be removed again if later we add a standalone seedrng package. Add a decent explanation to the init script about the need for a persistent directory to make this actually work. Signed-off-by: Jason A. Donenfeld [Arnout: - Remove busybox patch, it's now part of busybox 1.36.0. - Depend on busybox. - Fix shellcheck errors. - Use DAEMON and SEEDRNG_ARGS. - Don't bother with "seed_dir" and "skip_credit" variables. - Rename to S20seedrng. ] Signed-off-by: Arnout Vandecappelle Regards, Arnout > --- > Changes v4->v5: > - SeedRNG is now part of Busybox, so we don't need to carry the source > in-tree here, which was the primary objection to earlier versions. > > ...eedRNG-utility-for-kernel-RNG-seed-f.patch | 309 ++++++++++++++++++ > package/urandom-scripts/Config.in | 4 - > package/urandom-scripts/S20urandom | 78 ++--- > 3 files changed, 330 insertions(+), 61 deletions(-) > create mode 100644 package/busybox/0003-seedrng-import-SeedRNG-utility-for-kernel-RNG-seed-f.patch > [snip] From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit] package/tl-expected: new package Message-ID: <20230207151850.16E9384254@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ffbc3a9cb9d4386f6ae171207f7b85ef182e8a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/tl-expected/Config.in | 12 ++++++++++++ package/tl-expected/tl-expected.hash | 3 +++ package/tl-expected/tl-expected.mk | 20 ++++++++++++++++++++ 5 files changed, 37 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 9cc080f7a4..220a326adc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2790,6 +2790,7 @@ N: TIAN Yuanhao F: package/cli11/ F: package/open-isns/ F: package/termcolor/ +F: package/tl-expected/ N: Tan En De F: package/libkcapi/ diff --git a/package/Config.in b/package/Config.in index e1a1b153b1..fa0713c311 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2132,6 +2132,7 @@ endif source "package/startup-notification/Config.in" source "package/tbb/Config.in" source "package/tinycbor/Config.in" + source "package/tl-expected/Config.in" source "package/tz/Config.in" source "package/tzdata/Config.in" source "package/uvw/Config.in" diff --git a/package/tl-expected/Config.in b/package/tl-expected/Config.in new file mode 100644 index 0000000000..92758ffee5 --- /dev/null +++ b/package/tl-expected/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TL_EXPECTED + bool "tl-expected" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + C++11/14/17 std::expected with functional-style extensions and + reference support. + + https://github.com/TartanLlama/expected + +comment "tl-expected needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/tl-expected/tl-expected.hash b/package/tl-expected/tl-expected.hash new file mode 100644 index 0000000000..e5c9cc2a3e --- /dev/null +++ b/package/tl-expected/tl-expected.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 2611769546cedcaef233ef587e71420d1f079a794eb7bb19b888dedf991ace7c tl-expected-v1.0.0-br1.tar.gz +sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 COPYING diff --git a/package/tl-expected/tl-expected.mk b/package/tl-expected/tl-expected.mk new file mode 100644 index 0000000000..8d62c75fea --- /dev/null +++ b/package/tl-expected/tl-expected.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# tl-expected +# +################################################################################ + +TL_EXPECTED_VERSION = v1.0.0 +TL_EXPECTED_SITE = https://github.com/TartanLlama/expected +TL_EXPECTED_SITE_METHOD = git +TL_EXPECTED_GIT_SUBMODULES = YES +TL_EXPECTED_LICENSE = CC0-1.0 +TL_EXPECTED_LICENSE_FILES = COPYING +TL_EXPECTED_INSTALL_STAGING = YES +TL_EXPECTED_INSTALL_TARGET = NO +TL_EXPECTED_CONF_OPTS = \ + -DCMAKE_MODULE_PATH=$(TL_EXPECTED_DIR)/cmake/tl-cmake \ + -DEXPECTED_ENABLE_TESTS=OFF \ + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit] package/termcolor: new package Message-ID: <20230207151850.0951F841CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e4402d4efb86256a3cff9c17c03f7300e427e1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/termcolor/Config.in | 12 ++++++++++++ package/termcolor/termcolor.hash | 3 +++ package/termcolor/termcolor.mk | 14 ++++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 830dab56f0..9cc080f7a4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2789,6 +2789,7 @@ F: package/most/ N: TIAN Yuanhao F: package/cli11/ F: package/open-isns/ +F: package/termcolor/ N: Tan En De F: package/libkcapi/ diff --git a/package/Config.in b/package/Config.in index 3773901552..e1a1b153b1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2176,6 +2176,7 @@ menu "Text and terminal handling" source "package/readline/Config.in" source "package/slang/Config.in" source "package/tclap/Config.in" + source "package/termcolor/Config.in" source "package/utf8proc/Config.in" endmenu diff --git a/package/termcolor/Config.in b/package/termcolor/Config.in new file mode 100644 index 0000000000..979ad61d81 --- /dev/null +++ b/package/termcolor/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TERMCOLOR + bool "termcolor" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + Termcolor is a header-only C++ library for printing colored + messages to the terminal. + + https://github.com/ikalnytskyi/termcolor + +comment "termcolor needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/termcolor/termcolor.hash b/package/termcolor/termcolor.hash new file mode 100644 index 0000000000..dede06c9b0 --- /dev/null +++ b/package/termcolor/termcolor.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 435994c32557674469404cb1527c283fdcf45746f7df75fd2996bb200d6a759f termcolor-2.1.0.tar.gz +sha256 bab0f53c36b248df22e2298ddf9eeea14b28783f187fcbff6a38f2c47b3a3a7d LICENSE diff --git a/package/termcolor/termcolor.mk b/package/termcolor/termcolor.mk new file mode 100644 index 0000000000..0374ce8b73 --- /dev/null +++ b/package/termcolor/termcolor.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# termcolor +# +################################################################################ + +TERMCOLOR_VERSION = 2.1.0 +TERMCOLOR_SITE = $(call github,ikalnytskyi,termcolor,v$(TERMCOLOR_VERSION)) +TERMCOLOR_LICENSE = BSD-3-Clause +TERMCOLOR_LICENSE_FILES = LICENSE +TERMCOLOR_INSTALL_STAGING = YES +TERMCOLOR_INSTALL_TARGET = NO + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit] package/cli11: new package Message-ID: <20230207151849.EFEFD84252@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f25b760186b72d2224d7087324ca5f2baeafb8b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/cli11/Config.in | 13 +++++++++++++ package/cli11/cli11.hash | 3 +++ package/cli11/cli11.mk | 15 +++++++++++++++ 5 files changed, 33 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8dde37bd67..830dab56f0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2787,6 +2787,7 @@ N: Sven Oliver Moll F: package/most/ N: TIAN Yuanhao +F: package/cli11/ F: package/open-isns/ N: Tan En De diff --git a/package/Config.in b/package/Config.in index b5418c56f6..3773901552 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2150,6 +2150,7 @@ endmenu menu "Text and terminal handling" source "package/augeas/Config.in" + source "package/cli11/Config.in" source "package/docopt-cpp/Config.in" source "package/enchant/Config.in" source "package/fmt/Config.in" diff --git a/package/cli11/Config.in b/package/cli11/Config.in new file mode 100644 index 0000000000..87db9ac8f7 --- /dev/null +++ b/package/cli11/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_CLI11 + bool "cli11" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + CLI11 is a command line parser for C++11 and beyond that + provides a rich feature set with a simple and intuitive + interface. + + https://github.com/CLIUtils/CLI11 + +comment "cli11 needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/cli11/cli11.hash b/package/cli11/cli11.hash new file mode 100644 index 0000000000..12e5b4fb55 --- /dev/null +++ b/package/cli11/cli11.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 378da73d2d1d9a7b82ad6ed2b5bda3e7bc7093c4034a1d680a2e009eb067e7b2 cli11-2.3.1.tar.gz +sha256 89022151dbf5827a22430557ef2f8a75808dd25fa1e9a12709ef5421d363e66d LICENSE diff --git a/package/cli11/cli11.mk b/package/cli11/cli11.mk new file mode 100644 index 0000000000..b02bd4478f --- /dev/null +++ b/package/cli11/cli11.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# cli11 +# +################################################################################ + +CLI11_VERSION = 2.3.1 +CLI11_SITE = $(call github,CLIUtils,CLI11,v$(CLI11_VERSION)) +CLI11_LICENSE = BSD-3-Clause +CLI11_LICENSE_FILES = LICENSE +CLI11_INSTALL_STAGING = YES +CLI11_INSTALL_TARGET = NO +CLI11_CONF_OPTS = -DCLI11_BUILD_DOCS=OFF -DCLI11_BUILD_EXAMPLES=OFF + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit] package/reproc: new package Message-ID: <20230207151850.339DA841CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26dd70e954a7c9142b078837ab1bbfad54d0e5cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/reproc/Config.in | 14 ++++++++++++++ package/reproc/reproc.hash | 3 +++ package/reproc/reproc.mk | 17 +++++++++++++++++ 5 files changed, 36 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e8ddad71cd..d7c4d03c4c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2790,6 +2790,7 @@ N: TIAN Yuanhao F: package/cli11/ F: package/libsolv/ F: package/open-isns/ +F: package/reproc/ F: package/termcolor/ F: package/tl-expected/ diff --git a/package/Config.in b/package/Config.in index 6ca4c61959..06d0a05854 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2126,6 +2126,7 @@ endif source "package/protozero/Config.in" source "package/qhull/Config.in" source "package/qlibc/Config.in" + source "package/reproc/Config.in" source "package/riemann-c-client/Config.in" source "package/shapelib/Config.in" source "package/skalibs/Config.in" diff --git a/package/reproc/Config.in b/package/reproc/Config.in new file mode 100644 index 0000000000..a4e9c893b1 --- /dev/null +++ b/package/reproc/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_REPROC + bool "reproc" + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # uses wchar_t + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + help + reproc is a cross-platform C/C++ library that simplifies + starting, stopping and communicating with external programs. + + https://github.com/DaanDeMeyer/reproc + +comment "reproc needs a toolchain w/ threads, wchar" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/reproc/reproc.hash b/package/reproc/reproc.hash new file mode 100644 index 0000000000..6da6d0a0bb --- /dev/null +++ b/package/reproc/reproc.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 55c780f7faa5c8cabd83ebbb84b68e5e0e09732de70a129f6b3c801e905415dd reproc-14.2.4.tar.gz +sha256 8f91afbe266bebac2cf1b220e0e67ace4cb9a97d2b21940abef20eb6691cfa91 LICENSE diff --git a/package/reproc/reproc.mk b/package/reproc/reproc.mk new file mode 100644 index 0000000000..3167911c4d --- /dev/null +++ b/package/reproc/reproc.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# reproc +# +################################################################################ + +REPROC_VERSION = 14.2.4 +REPROC_SITE = $(call github,DaanDeMeyer,reproc,v$(REPROC_VERSION)) +REPROC_LICENSE = MIT +REPROC_LICENSE_FILES = LICENSE +REPROC_INSTALL_STAGING = YES + +ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),yy) # C++11 +REPROC_CONF_OPTS += -DREPROC++=ON +endif + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit] package/libsolv: new package Message-ID: <20230207151850.2491784255@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93ce3c1be0753189d6af3ee9968b935037519c25 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Required by micromamba. Signed-off-by: TIAN Yuanhao [Thomas: - rework shared/static lib handling - don't pass ENABLE_CONDA=ON based on BR2_PACKAGE_MICROMAMBA=y as it's weird that a dependency does something different depending on which of its reverse dependencies is enabled] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libsolv/Config.in | 9 +++++++++ package/libsolv/libsolv.hash | 3 +++ package/libsolv/libsolv.mk | 27 +++++++++++++++++++++++++++ 5 files changed, 41 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 220a326adc..e8ddad71cd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2788,6 +2788,7 @@ F: package/most/ N: TIAN Yuanhao F: package/cli11/ +F: package/libsolv/ F: package/open-isns/ F: package/termcolor/ F: package/tl-expected/ diff --git a/package/Config.in b/package/Config.in index fa0713c311..6ca4c61959 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2085,6 +2085,7 @@ menu "Other" source "package/libshdata/Config.in" source "package/libsigc/Config.in" source "package/libsigsegv/Config.in" + source "package/libsolv/Config.in" source "package/libspatialindex/Config.in" source "package/libtalloc/Config.in" source "package/libtasn1/Config.in" diff --git a/package/libsolv/Config.in b/package/libsolv/Config.in new file mode 100644 index 0000000000..1415d2bc2b --- /dev/null +++ b/package/libsolv/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBSOLV + bool "libsolv" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_ZLIB + help + A free package dependency solver using a satisfiability + algorithm. + + https://github.com/openSUSE/libsolv diff --git a/package/libsolv/libsolv.hash b/package/libsolv/libsolv.hash new file mode 100644 index 0000000000..162e46e54d --- /dev/null +++ b/package/libsolv/libsolv.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 968aef452b5493751fa0168cd58745a77c755e202a43fe8d549d791eb16034d5 libsolv-0.7.22.tar.gz +sha256 57f15acfb29fbef7749779e096a5885c60b716633e34484a21bb717554c0198f LICENSE.BSD diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk new file mode 100644 index 0000000000..144ce68a83 --- /dev/null +++ b/package/libsolv/libsolv.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# libsolv +# +################################################################################ + +LIBSOLV_VERSION = 0.7.22 +LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) +LIBSOLV_LICENSE = BSD-3-Clause +LIBSOLV_LICENSE_FILES = LICENSE.BSD +LIBSOLV_INSTALL_STAGING = YES +LIBSOLV_DEPENDENCIES = zlib +LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON +else +LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON +endif + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON +else +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON +endif + +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Tue Feb 7 15:22:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 16:22:46 +0100 Subject: [Buildroot] [PATCH] package/libcamera-apps: enable LIBAV only if libdrm is present In-Reply-To: <20230207085445.1651226-1-marcus.folkesson@gmail.com> References: <20230207085445.1651226-1-marcus.folkesson@gmail.com> Message-ID: <20230207152246.GG4124@scaer> Marcus, All, On 2023-02-07 09:54 +0100, Marcus Folkesson spake thusly: > Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps > does enable LIBAV by default which depends on libdrm. > > Fixes: > - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ > > /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory > 13 | #include > | ^~~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: Marcus Folkesson > --- > package/libcamera-apps/libcamera-apps.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk > index 290ee9a026..385c65136e 100644 > --- a/package/libcamera-apps/libcamera-apps.mk > +++ b/package/libcamera-apps/libcamera-apps.mk > @@ -25,8 +25,10 @@ LIBCAMERA_APPS_CONF_OPTS = \ > ifeq ($(BR2_PACKAGE_LIBDRM),y) > LIBCAMERA_APPS_DEPENDENCIES += libdrm > LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 But doesn't ENABLE_LIBAV also need a few libraries? From libcamera-apps' encoder/CMakeLists.txt: 13 if (ENABLE_LIBAV) 14 message(STATUS "Checking for libavcodec") 15 pkg_check_modules(LIBAV QUIET IMPORTED_TARGET 16 libavcodec 17 libavdevice 18 libavformat 19 libswresample 20 ) libavcodec, libavdevice, libavformat, and libswresample come with ffmpeg, so this should be added to dependencies too. Note: in fact, if the libs are not found, the feature will be silently disabled: 21 if (LIBAV_FOUND) 22 include_directories(${LIBAV_INCLUDE_DIRS}) 23 set(SRC ${SRC} libav_encoder.cpp) 24 set(TARGET_LIBS ${TARGET_LIBS} ${LIBAV_LIBRARIES}) 25 set(LIBAV_PRESENT 1) 26 message(STATUS "libavcodec found:") 27 message(STATUS " libraries: ${LIBAV_LIBRARIES}") 28 endif() 29 else() 30 message(STATUS "Omitting libavcodec") 31 endif() However, this is not clean, because we explicitly asked for a feature (enable libav suport) but it gets disabled because of missing dependencies. So, either we explicitly and unconditionally disable it, or we add the necessary dependencies. Regards, Yann E. MORIN. > else > LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 > endif > > ifeq ($(BR2_PACKAGE_XORG7),y) > -- > 2.38.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 Tue Feb 7 15:24:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 16:24:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/spirv-llvm-translator: set CMP0077 policy In-Reply-To: <20220621225209.2899559-1-james.hilliard1@gmail.com> References: <20220621225209.2899559-1-james.hilliard1@gmail.com> Message-ID: <9a3a9627-d917-1e31-9ad0-f56487187865@mind.be> On 22/06/2022 00:52, James Hilliard wrote: > Set this to the new behavior for consistency. > > Fixes: > CMake Warning (dev) at /home/buildroot/buildroot/output/per-package/host-spirv-llvm-translator/host/lib/cmake/llvm/HandleLLVMOptions.cmake:852 (option): > Policy CMP0077 is not set: option() honors normal variables. Run "cmake > --help-policy CMP0077" for policy details. Use the cmake_policy command to > set the policy and suppress this warning. > > For compatibility with older versions of CMake, option is clearing the > normal variable 'LLVM_ENABLE_EH'. > Call Stack (most recent call first): > CMakeLists.txt:53 (include) > > Signed-off-by: James Hilliard AFAIU, this change has become irrelevant with one of the two updates to spirv-llvm-translator that have been committed since this patch was sent. Therefore, I marked it as Superseded. Regards, Arnout > --- > package/spirv-llvm-translator/spirv-llvm-translator.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk > index 22f8765582..46704b3f8d 100644 > --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk > +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk > @@ -10,6 +10,7 @@ SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA > SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT > HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm > HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ > + -DCMAKE_POLICY_DEFAULT_CMP0077=NEW \ > -DLLVM_BUILD_TOOLS=ON \ > -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ > -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ From foss+buildroot at 0leil.net Tue Feb 7 15:36:20 2023 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Tue, 7 Feb 2023 16:36:20 +0100 Subject: [Buildroot] [PATCH] package/python3: use pure python UUID backend for host variant Message-ID: <20230207-host-python-libuuid-v1-1-de34da87efd8@theobroma-systems.com> From: Quentin Schulz host-python3 currently does not build if util-linux-uuid option is not enabled, failing with the following error messages: """ /usr/lib64/ccache/gcc -fPIC -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -O2 -I/home/qschulz/work/upstream/buildroot/output/host/include -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I./Include -I. -I/home/qschulz/work/upstream/buildroot/output/host/include -I/usr/local/include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1 -c /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c -o build/temp.linux-x86_64-3.11/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.o /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c: In function ?py_uuid_generate_time_safe?: /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: error: storage size of ?uui ? isn?t known 27 | uuid_t uuid; | ^~~~ /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:31:11: error: implicit declaration of function ?uuid_generate_time_safe?; did you mean ?py_uuid_generate_time_safe?? [-Werror=implicit-function-declaration] 31 | res = uuid_generate_time_safe(uuid); | ^~~~~~~~~~~~~~~~~~~~~~~ | py_uuid_generate_time_safe /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: warning: unused variable ?uuid? [-Wunused-variable] 27 | uuid_t uuid; | ^~~~ /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:47:1: warning: control reaches end of non-void function [-Wreturn-type] 47 | } | ^ cc1: some warnings being treated as errors The necessary bits to build these optional modules were not found: _dbm _gdbm _tkinter nis readline To find the necessary bits, look in setup.py in detect_modules() for the module's name. The following modules found by detect_modules() in setup.py have not been built, they are *disabled* by configure: _ctypes_test _sqlite3 _testbuffer _testcapi _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz Failed to build these modules: _uuid """ Therefore, let's disable building the _uuid extension the same way it's done for the target package since commit 0b68713aae28 ("python3: use pure python UUID backend"). Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- Only build tested with make host-python3 with raspberrypi4_defconfig configuration. --- package/python3/python3.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 219d135b3f..fb6dbf2e64 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -31,6 +31,7 @@ HOST_PYTHON3_CONF_OPTS += \ --enable-unicodedata \ --disable-test-modules \ --disable-idle3 \ + --disable-uuid \ --disable-ossaudiodev # Make sure that LD_LIBRARY_PATH overrides -rpath. --- base-commit: 26dd70e954a7c9142b078837ab1bbfad54d0e5cb change-id: 20230207-host-python-libuuid-d600d32f70ae Best regards, -- Quentin Schulz From yann.morin.1998 at free.fr Tue Feb 7 15:48:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 16:48:49 +0100 Subject: [Buildroot] [git commit] package/python3: use pure python UUID backend for host variant Message-ID: <20230207154903.D0ED584291@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b635bda5bc5ea9db15cb83390d8e3908b85c2629 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-python3 currently does not build if util-linux-uuid option is not enabled, failing with the following error messages: """ /usr/lib64/ccache/gcc -fPIC -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -O2 -I/home/qschulz/work/upstream/buildroot/output/host/include -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I./Include -I. -I/home/qschulz/work/upstream/buildroot/output/host/include -I/usr/local/include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1 -c /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c -o build/temp.linux-x86_64-3.11/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.o /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c: In function ???py_uuid_generate_time_safe???: /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: error: storage size of ???uui ??? isn???t known 27 | uuid_t uuid; | ^~~~ /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:31:11: error: implicit declaration of function ???uuid_generate_time_safe???; did you mean ???py_uuid_generate_time_safe???? [-Werror=implicit-function-declaration] 31 | res = uuid_generate_time_safe(uuid); | ^~~~~~~~~~~~~~~~~~~~~~~ | py_uuid_generate_time_safe /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: warning: unused variable ???uuid??? [-Wunused-variable] 27 | uuid_t uuid; | ^~~~ /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:47:1: warning: control reaches end of non-void function [-Wreturn-type] 47 | } | ^ cc1: some warnings being treated as errors The necessary bits to build these optional modules were not found: _dbm _gdbm _tkinter nis readline To find the necessary bits, look in setup.py in detect_modules() for the module's name. The following modules found by detect_modules() in setup.py have not been built, they are *disabled* by configure: _ctypes_test _sqlite3 _testbuffer _testcapi _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz Failed to build these modules: _uuid """ Therefore, let's disable building the _uuid extension the same way it's done for the target package since commit 0b68713aae28 ("python3: use pure python UUID backend"). Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Yann E. MORIN --- package/python3/python3.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 219d135b3f..fb6dbf2e64 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -31,6 +31,7 @@ HOST_PYTHON3_CONF_OPTS += \ --enable-unicodedata \ --disable-test-modules \ --disable-idle3 \ + --disable-uuid \ --disable-ossaudiodev # Make sure that LD_LIBRARY_PATH overrides -rpath. From yann.morin.1998 at free.fr Tue Feb 7 15:49:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 16:49:15 +0100 Subject: [Buildroot] [PATCH] package/python3: use pure python UUID backend for host variant In-Reply-To: <20230207-host-python-libuuid-v1-1-de34da87efd8@theobroma-systems.com> References: <20230207-host-python-libuuid-v1-1-de34da87efd8@theobroma-systems.com> Message-ID: <20230207154915.GH4124@scaer> Quentin, All, On 2023-02-07 16:36 +0100, Quentin Schulz spake thusly: > From: Quentin Schulz > > host-python3 currently does not build if util-linux-uuid option is not > enabled, failing with the following error messages: > """ > /usr/lib64/ccache/gcc -fPIC -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -O2 -I/home/qschulz/work/upstream/buildroot/output/host/include -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I./Include -I. -I/home/qschulz/work/upstream/buildroot/output/host/include -I/usr/local/include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1 -c /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c -o build/temp.linux-x86_64-3.11/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.o > /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c: In function ?py_uuid_generate_time_safe?: > /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: error: storage size of ?uui ? isn?t known > 27 | uuid_t uuid; > | ^~~~ > /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:31:11: error: implicit declaration of function ?uuid_generate_time_safe?; did you mean ?py_uuid_generate_time_safe?? [-Werror=implicit-function-declaration] > 31 | res = uuid_generate_time_safe(uuid); > | ^~~~~~~~~~~~~~~~~~~~~~~ > | py_uuid_generate_time_safe > /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: warning: unused variable ?uuid? [-Wunused-variable] > 27 | uuid_t uuid; > | ^~~~ > /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:47:1: warning: control reaches end of non-void function [-Wreturn-type] > 47 | } > | ^ > cc1: some warnings being treated as errors > > The necessary bits to build these optional modules were not found: > _dbm _gdbm _tkinter > nis readline > To find the necessary bits, look in setup.py in detect_modules() for the module's name. > > The following modules found by detect_modules() in setup.py have not > been built, they are *disabled* by configure: > _ctypes_test _sqlite3 _testbuffer > _testcapi _testimportmultiple _testinternalcapi > _testmultiphase _xxtestfuzz > > Failed to build these modules: > _uuid > """ > > Therefore, let's disable building the _uuid extension the same way it's > done for the target package since commit 0b68713aae28 ("python3: use > pure python UUID backend"). > > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Applied to master, thanks. Regards, Yann E. MORIN. > --- > Only build tested with make host-python3 with raspberrypi4_defconfig configuration. > --- > package/python3/python3.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python3/python3.mk b/package/python3/python3.mk > index 219d135b3f..fb6dbf2e64 100644 > --- a/package/python3/python3.mk > +++ b/package/python3/python3.mk > @@ -31,6 +31,7 @@ HOST_PYTHON3_CONF_OPTS += \ > --enable-unicodedata \ > --disable-test-modules \ > --disable-idle3 \ > + --disable-uuid \ > --disable-ossaudiodev > > # Make sure that LD_LIBRARY_PATH overrides -rpath. > > --- > base-commit: 26dd70e954a7c9142b078837ab1bbfad54d0e5cb > change-id: 20230207-host-python-libuuid-d600d32f70ae > > Best regards, > -- > Quentin Schulz > _______________________________________________ > 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 thomas.petazzoni at bootlin.com Tue Feb 7 16:03:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:03:53 +0100 Subject: [Buildroot] [PATCH/next 1/6] package/cli11: new package In-Reply-To: <20221128123418.2197-1-tianyuanhao3@163.com> References: <20221128123418.2197-1-tianyuanhao3@163.com> Message-ID: <20230207170353.1caa0546@windsurf> On Mon, 28 Nov 2022 12:34:13 +0000 TIAN Yuanhao wrote: > Required by micromamba. > > Signed-off-by: TIAN Yuanhao > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/cli11/Config.in | 13 +++++++++++++ > package/cli11/cli11.hash | 3 +++ > package/cli11/cli11.mk | 15 +++++++++++++++ > 5 files changed, 33 insertions(+) > create mode 100644 package/cli11/Config.in > create mode 100644 package/cli11/cli11.hash > create mode 100644 package/cli11/cli11.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 16:04:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:04:08 +0100 Subject: [Buildroot] [PATCH/next 2/6] package/termcolor: new package In-Reply-To: <20221128123418.2197-2-tianyuanhao3@163.com> References: <20221128123418.2197-1-tianyuanhao3@163.com> <20221128123418.2197-2-tianyuanhao3@163.com> Message-ID: <20230207170408.143c2e5c@windsurf> On Mon, 28 Nov 2022 12:34:14 +0000 TIAN Yuanhao wrote: > Required by micromamba. > > Signed-off-by: TIAN Yuanhao > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/termcolor/Config.in | 12 ++++++++++++ > package/termcolor/termcolor.hash | 3 +++ > package/termcolor/termcolor.mk | 14 ++++++++++++++ > 5 files changed, 31 insertions(+) > create mode 100644 package/termcolor/Config.in > create mode 100644 package/termcolor/termcolor.hash > create mode 100644 package/termcolor/termcolor.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 16:04:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:04:15 +0100 Subject: [Buildroot] [PATCH/next 3/6] package/tl-expected: new package In-Reply-To: <20221128123418.2197-3-tianyuanhao3@163.com> References: <20221128123418.2197-1-tianyuanhao3@163.com> <20221128123418.2197-3-tianyuanhao3@163.com> Message-ID: <20230207170415.7e528735@windsurf> On Mon, 28 Nov 2022 12:34:15 +0000 TIAN Yuanhao wrote: > Required by micromamba. > > Signed-off-by: TIAN Yuanhao > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/tl-expected/Config.in | 12 ++++++++++++ > package/tl-expected/tl-expected.hash | 3 +++ > package/tl-expected/tl-expected.mk | 20 ++++++++++++++++++++ > 5 files changed, 37 insertions(+) > create mode 100644 package/tl-expected/Config.in > create mode 100644 package/tl-expected/tl-expected.hash > create mode 100644 package/tl-expected/tl-expected.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 16:14:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:14:01 +0100 Subject: [Buildroot] [PATCH/next 4/6] package/libsolv: new package In-Reply-To: <20221128123418.2197-4-tianyuanhao3@163.com> References: <20221128123418.2197-1-tianyuanhao3@163.com> <20221128123418.2197-4-tianyuanhao3@163.com> Message-ID: <20230207171401.54d75d16@windsurf> Hello, On Mon, 28 Nov 2022 12:34:16 +0000 TIAN Yuanhao wrote: > +ifeq ($(BR2_STATIC_LIBS),y) > +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON > +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) > +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON > +endif Changed to: ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON else LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON endif ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON else LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON endif To explicitly handle all cases. > +ifeq ($(BR2_PACKAGE_MICROMAMBA),y) > +LIBSOLV_CONF_OPTS += -DENABLE_CONDA=ON > +endif This isn't really nice, as we generally don't want packages to look at their reverse dependencies to decide which features should be enabled or not. So here, I would prefer to have a BR2_PACKAGE_LIBSOLV_CONDA option, which the micromamba package can select if it needs this feature from libsolv. For now, I've dropped this part, so if we need it for micromamba, could you send a patch just adding this new option, together with the new iteration of the micromamba package? Best regards, 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 Feb 7 16:14:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:14:06 +0100 Subject: [Buildroot] [PATCH/next 5/6] package/reproc: new package In-Reply-To: <20221128123418.2197-5-tianyuanhao3@163.com> References: <20221128123418.2197-1-tianyuanhao3@163.com> <20221128123418.2197-5-tianyuanhao3@163.com> Message-ID: <20230207171406.2c0cba33@windsurf> On Mon, 28 Nov 2022 12:34:17 +0000 TIAN Yuanhao wrote: > Required by micromamba. > > Signed-off-by: TIAN Yuanhao > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/reproc/Config.in | 14 ++++++++++++++ > package/reproc/reproc.hash | 3 +++ > package/reproc/reproc.mk | 17 +++++++++++++++++ > 5 files changed, 36 insertions(+) > create mode 100644 package/reproc/Config.in > create mode 100644 package/reproc/reproc.hash > create mode 100644 package/reproc/reproc.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Tue Feb 7 16:26:05 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 17:26:05 +0100 Subject: [Buildroot] [PATCH] board/qemu: add echo for errors In-Reply-To: <20230122123645.2903470-1-cherniaev.andrei@kairo.space> References: <20230122123645.2903470-1-cherniaev.andrei@kairo.space> Message-ID: Hello Andrei, Le 22/01/2023 ? 13:36, AndreiCherniaev a ?crit?: > From: AndreiCherniaev > Your Signed-off-by is missing, so we can't apply the patch as is [1]. I'm making it as "Changes requested". Maybe a small comment explaining why you want to change the script would be great. [1] https://nightly.buildroot.org/manual.html#submitting-patches > --- > board/qemu/post-image.sh | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/board/qemu/post-image.sh b/board/qemu/post-image.sh > index 88f0413496..91d5b88b03 100755 > --- a/board/qemu/post-image.sh > +++ b/board/qemu/post-image.sh > @@ -6,8 +6,8 @@ README_FILES="${QEMU_BOARD_DIR}/*/readme.txt" > START_QEMU_SCRIPT="${BINARIES_DIR}/start-qemu.sh" > > if [[ "${DEFCONFIG_NAME}" =~ ^"qemu_*" ]]; then > - # Not a Qemu defconfig, can't test. > - exit 0 > + echo "Not a Qemu defconfig, can't test" > + exit 1 Initially exit 0 was intended to not fail the build for non qemu defconfig in gitlab-ci. But board/qemu/post-image.sh in only used by qemu defconfig so even the test doesn't seems not required anymore. > fi > > # Search for "# qemu_*_defconfig" tag in all readme.txt files. > @@ -15,8 +15,8 @@ fi > QEMU_CMD_LINE=$(sed -r ':a; /\\$/N; s/\\\n//; s/\t/ /; ta; /# '${DEFCONFIG_NAME}'$/!d; s/#.*//' ${README_FILES}) > > if [ -z "${QEMU_CMD_LINE}" ]; then > - # No Qemu cmd line found, can't test. > - exit 0 > + echo "No Qemu cmd line found, can't test" > + exit 1 > fi IIRC, some qemu defconfig was not gitlab-ready so exit 0 was here to not fail the gitlab-ci job if no qemu command line was provided. Only a build test is done in this case. Best regards, Romain > > # Remove output/images path since the script will be in From thomas.petazzoni at bootlin.com Tue Feb 7 16:26:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:26:15 +0100 Subject: [Buildroot] [PATCH/next 6/6] package/micromamba: new package In-Reply-To: <20221128123418.2197-6-tianyuanhao3@163.com> References: <20221128123418.2197-1-tianyuanhao3@163.com> <20221128123418.2197-6-tianyuanhao3@163.com> Message-ID: <20230207172615.48ac9871@windsurf> Hello, On Mon, 28 Nov 2022 12:34:18 +0000 TIAN Yuanhao wrote: > Signed-off-by: TIAN Yuanhao Thanks for this submission. Could you clarify what is the motivation for this package? Indeed having a package manager on the target feels a bit strange in the context of Buildroot. Buildroot is normally there precisely to generate a ready-to-use rootfs, not a rootfs which then downloads random stuff from the Internet. Of course, we do have npm or pip, but really their usage is not recommended. > diff --git a/package/micromamba/Config.in b/package/micromamba/Config.in > new file mode 100644 > index 0000000000..998809f452 > --- /dev/null > +++ b/package/micromamba/Config.in > @@ -0,0 +1,43 @@ > +config BR2_PACKAGE_MICROMAMBA_ARCH_SUPPORTS > + bool > + # See libmamba/include/mamba/core/context.hpp > + default y if BR2_arm && (BR2_ARM_CPU_ARMV6 || BR2_ARM_CPU_ARMV7A) > + default y if BR2_aarch64 > + default y if BR2_i386 > + default y if BR2_powerpc64 > + default y if BR2_powerpc64le > + default y if BR2_s390x > + default y if BR2_x86_64 > + depends on BR2_USE_MMU # fork() Always a bit annoying to have architecture-specific things in something that isn't hardware-related in the first place, but OK. > +config BR2_PACKAGE_MICROMAMBA > + bool "micromamba" > + depends on BR2_PACKAGE_MICROMAMBA_ARCH_SUPPORTS > + depends on BR2_USE_WCHAR # fmt, reproc libarchive also needs wchar, spdlog as well (through fmt, admittedly) > + depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem > + select BR2_PACKAGE_LIBARCHIVE > + select BR2_PACKAGE_OPENSSL > + select BR2_PACKAGE_JSON_FOR_MODERN_CPP > + select BR2_PACKAGE_YAML_CPP > + select BR2_PACKAGE_SPDLOG > + select BR2_PACKAGE_LIBCURL > + select BR2_PACKAGE_LIBSOLV > + select BR2_PACKAGE_REPROC > + select BR2_PACKAGE_TL_EXPECTED > + select BR2_PACKAGE_CLI11 > + select BR2_PACKAGE_FMT > + select BR2_PACKAGE_TERMCOLOR These select should be sorted alphabetically to look a bit nicer. > + help > + micromamba is a small, pure-C++ reimplementation of > + mamba/conda. It strives to be a full replacement for mamba and > + conda. > + > + https://github.com/mamba-org/mamba > + > +comment "micromamba needs a toolchain w/ wchar, threads, C++, gcc >= 8" > + depends on BR2_PACKAGE_MICROMAMBA_ARCH_SUPPORTS > + depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 > diff --git a/package/micromamba/micromamba.hash b/package/micromamba/micromamba.hash > new file mode 100644 > index 0000000000..e584c3bd28 > --- /dev/null > +++ b/package/micromamba/micromamba.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 7303d983b49a1a52b302ceae355af1c05afef3a07aa3ad6dd27c36d64c43f991 micromamba-1.0.0.tar.gz > +sha256 41fd98a468e39d319911bd94f4e65d6ad6a7ea66559dd5aa4112f138ff9b629a LICENSE > diff --git a/package/micromamba/micromamba.mk b/package/micromamba/micromamba.mk > new file mode 100644 > index 0000000000..188864444c > --- /dev/null > +++ b/package/micromamba/micromamba.mk > @@ -0,0 +1,43 @@ > +################################################################################ > +# > +# micromamba > +# > +################################################################################ > + > +MICROMAMBA_VERSION = 1.0.0 > +MICROMAMBA_SITE = $(call github,mamba-org,mamba,micromamba-$(MICROMAMBA_VERSION)) > +MICROMAMBA_LICENSE = BSD-3-Clause > +MICROMAMBA_LICENSE_FILES = LICENSE > +MICROMAMBA_DEPENDENCIES = \ > + $(BR2_PYTHON3_HOST_DEPENDENCY) \ > + cli11 \ > + fmt \ > + json-for-modern-cpp \ > + libarchive \ > + libcurl \ > + libsolv \ > + openssl \ > + reproc \ > + spdlog \ > + termcolor \ > + tl-expected \ > + yaml-cpp > + > +MICROMAMBA_CONF_OPTS = -DBUILD_LIBMAMBA=ON -DBUILD_MICROMAMBA=ON > + > +# See libmamba/include/mamba/core/context.hpp > +ifeq ($(BR2_ARM_CPU_ARMV6),y) > +MICROMAMBA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -D___ARM_ARCH_6__" > +else ifeq ($(BR2_ARM_CPU_ARMV7A),y) > +MICROMAMBA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -D__ARM_ARCH_7__" > +endif This is really a bug in the mamba code, because these defines are normally provided by the compiler. For example, an ARMv7 compiler defines: #define __ARM_ARCH 7 #define __ARM_ARCH_7A__ 1 So mamba could use that instead. But one could even wonder why it really matters to define a different MAMBA_PLATFORM name: #ifdef ___ARM_ARCH_6__ static const char MAMBA_PLATFORM[] = "linux-armv6l"; #elif __ARM_ARCH_7__ static const char MAMBA_PLATFORM[] = "linux-armv7l"; #else It is really crazy that this is the *only* thing that causes mamba to have an architecture dependency. Why is that even needed in the first place? > + > +ifeq ($(BR2_STATIC_LIBS),y) > +MICROMAMBA_CONF_OPTS += -DBUILD_STATIC=ON -DMICROMAMBA_LINKAGE=FULL_STATIC > +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) > +MICROMAMBA_CONF_OPTS += -DBUILD_SHARED=ON -DBUILD_STATIC=ON > +else # BR2_SHARED_LIBS > +MICROMAMBA_CONF_OPTS += -DBUILD_SHARED=ON > +endif Please pass BUILD_STATIC=OFF and BUILD_SHARED=OFF explicitly in the appropriate cases. Thanks a lot! Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Tue Feb 7 16:26:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 17:26:31 +0100 Subject: [Buildroot] [git commit] package/{rust, rust-bin}: bump to version 1.67.0 Message-ID: <20230207162647.A6C64842A1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cffe45f91bc5aed2a2a56f84e3a34b6385f70ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Link to Rust 1.67.0 announcement: https://blog.rust-lang.org/2023/01/26/Rust-1.67.0.html Signed-off-by: James Hilliard Tested-by: Sebastian Weyer Signed-off-by: Arnout Vandecappelle --- package/rust-bin/rust-bin.hash | 252 ++++++++++++++++++++--------------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index adf1799ad7..d00e6342e8 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 a1279760f91b3571733e0b0268128d143be2734916753900b5fe7b8ecc3c0900 rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 835b4e1b4d396674f7866a83b9a4f44db16fd12f01a7eaed527282b3700a9b92 rust-1.66.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc -sha256 c7349617c42274bf50f6e3662dfb4f6832a93780099c3bb510be1a5b93d04c37 rust-1.66.1-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 fc38663870f0af47a27241d980ca886c3f7d432267920deb412ac8576bef68f0 rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 2b1a6c54db49a9e62d60cc96c1768f405e0f4c59d698186bf3a28a1bb017b6b5 rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 777d3a650448c15048710282388e90d10740540f570f5d17ed4a2dbdabb89552 rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 875bb310bae7c8c1d2d228a49aa4b547608b6c807ddc9ec44bc87272c77d869b rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 89164ccf75909b3d02bdcb787e33876cad87e55ab0e6239b030b4b6631ed356a rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 e83f9fc473072db23376783595a008cdd9b2f2e9b3be109e55939392864840eb rust-1.66.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 a201aa4595ec8015662b7103b1409a4787c6d1f1d540bb68746633527d855858 rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24 rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc -sha256 520ac446f20490685cc4d73192cfbb4c9b9e55c884aa4ae2b098e3a54d891de8 rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 42afd189ef64988f64976f767a734734bccd7c71e578780e902148c98226fa29 rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 506126773af9c3dacc506776a0b2e12fe6fa0c95eaf4f4ebb5cdbd335feb83fa rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 3d21b478fbf07bd27902bdd189e6988341f0c2c0108b538f926cea3031bc8ea6 rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.asc -sha256 5282fc97111a7eafbead3463ed7bc0f3065332f21aec6a39a740157fe42f943a rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 0ebf0178bbe9c5572d1db89e190dee23aef0e2f667995abedbd66e33d0bd73ab rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 938e7442c21ea0895c44ec78fa718ea1d3abe32ed0425ed328c905e188af250e rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 bdc491f4c05669e7a3382b6bfdaeaa20e2cfa5ef553305df0e0d73729a45e6e4 rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 d75c6dc3c00d662b0d3f6ce7fde0f76057542edfbc97a20b29247842c8a711d2 rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 830285e5388081c68fac9dc955aa824a4d919b0e24eadc6e0b95b30103d79db9 rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 d720bd1e493f53797f90d83dbe6d52ecbe1ff3cae282f4b2e18c37fe92c9adf6 rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.asc -sha256 90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17 rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.asc -sha256 c4bab2d63223d0c6e63806082e30d8c38b37eefc10ee2e7380971e3012c00bca rust-std-1.66.1-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.asc -sha256 52013329eb6697d94f5dce01dd509b4b93b473c18a3a2c05d0230b9dfeab14d1 rust-std-1.66.1-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.asc -sha256 e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568 rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.asc -sha256 23f917eccaca59d4c911eb96d8ffefe86834dbcdf902c9ab6dad8558c31c4575 rust-std-1.66.1-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 70d1406e0981d5d31c1d3f85c848bba0476e0ff6203e7706f66b4d2212f01b66 rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 0fd221d4b4205ce548e83f0e7416c8332eb12b64d5a43c0b3ed61e9f7d6edf13 rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 132d6d5750a877972ebc6f23e831f2ef3077465b2ab24ca645d32ea83c496fe3 rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 533f370368ac8b6192e1450289c64544ebf9cacc38c3a52ef6c0ecded7ee6fa5 rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.asc -sha256 d7028820888d0decde047a6e77b866e690532aa09522c9a23a3fbf8780a72257 rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1 rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35 rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770 rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062 rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927 rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377 rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc -sha256 a9710727ba28955deb7fbec799faed19486c9af3c7e3088ec6659a257515ffca rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc +sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc +sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc +sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc +sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index 89009288f4..d62ce39cfc 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.66.1 +RUST_BIN_VERSION = 1.67.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 545a452bf0..2a260ca64f 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc -sha256 07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe rustc-1.66.1-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc +sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 691683b492..d14ad3a3e7 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.66.1 +RUST_VERSION = 1.67.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From arnout at mind.be Tue Feb 7 16:27:35 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 17:27:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.67.0 In-Reply-To: <20230131050319.2821287-1-james.hilliard1@gmail.com> References: <20230131050319.2821287-1-james.hilliard1@gmail.com> Message-ID: <2d7b1709-7fd8-292d-8fc8-871bcb3c2047@mind.be> On 31/01/2023 06:03, James Hilliard wrote: > Link to Rust 1.67.0 announcement: https://blog.rust-lang.org/2023/01/26/Rust-1.67.0.html > > Signed-off-by: James Hilliard Applied to master, thanks. Thank you Sebastian for testing! Regards, Arnout > --- > package/rust-bin/rust-bin.hash | 252 ++++++++++++++++----------------- > package/rust-bin/rust-bin.mk | 2 +- > package/rust/rust.hash | 6 +- > package/rust/rust.mk | 2 +- > 4 files changed, 131 insertions(+), 131 deletions(-) > [snip] From thomas.petazzoni at bootlin.com Tue Feb 7 16:31:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:31:17 +0100 Subject: [Buildroot] [PATCH 2/3] support/docker: use APT::Retries in apt-get calls to retry In-Reply-To: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> References: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> Message-ID: <20230207163119.292389-2-thomas.petazzoni@bootlin.com> snapshot.debian.org is notoriously slow, and quite often leads to timeouts when downloading packages. To give us a better chance of succeeding, let's retry 3 times before failing. Signed-off-by: Thomas Petazzoni --- support/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index de1534e77a..a16c1e3849 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -20,8 +20,8 @@ COPY apt-sources.list /etc/apt/sources.list # The container has no package lists, so need to update first RUN dpkg --add-architecture i386 && \ - apt-get update -y -RUN apt-get install -y --no-install-recommends \ + apt-get -o APT::Retries=3 update -y +RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ bc \ build-essential \ bzr \ -- 2.38.1 From thomas.petazzoni at bootlin.com Tue Feb 7 16:31:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:31:16 +0100 Subject: [Buildroot] [PATCH 1/3] support/docker: update Debian distro to a newer tag/date Message-ID: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> Signed-off-by: Thomas Petazzoni --- support/docker/Dockerfile | 2 +- support/docker/apt-sources.list | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index d775ae23e1..de1534e77a 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -6,7 +6,7 @@ # We use a specific tag for the base image *and* the corresponding date # for the repository., so do not forget to update the apt-sources.list # file that is shipped next to this Dockerfile. -FROM debian:bullseye-20210902 +FROM debian:bullseye-20230202 LABEL maintainer="Buildroot mailing list " \ vendor="Buildroot" \ diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list index 0f872fd398..849996d9f7 100644 --- a/support/docker/apt-sources.list +++ b/support/docker/apt-sources.list @@ -1,4 +1,4 @@ -# Latest just before 20210817T000000Z: -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20210902T193650Z/ bullseye-security main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main +# Latest just before 20230207T102800Z: +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20230206T092119Z/ bullseye-security main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye-updates main -- 2.38.1 From thomas.petazzoni at bootlin.com Tue Feb 7 16:31:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:31:18 +0100 Subject: [Buildroot] [PATCH 3/3] .gitlab-ci.yml: update Docker image to use In-Reply-To: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> References: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> Message-ID: <20230207163119.292389-3-thomas.petazzoni@bootlin.com> We have a new Docker image, updated with the new requirements from bcd15aa08aab1e8292b93995c44dc765a9801632 ("support/docker: add python3-magic"), but also with an updated Debian Bullseye installation. Let's use it. Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cad35c96bc..ed17bb14b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # Configuration for Gitlab-CI. # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines -image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1756 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123 stages: - generate-gitlab-ci -- 2.38.1 From yann.morin.1998 at free.fr Tue Feb 7 16:38:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 17:38:03 +0100 Subject: [Buildroot] [PATCH v2] package/python-orjson: disallow build when using musl. In-Reply-To: <20220519160214.214701-1-gsmecher@threespeedlogic.com> References: <20220509190650.1348657-2-gsmecher@threespeedlogic.com> <20220519160214.214701-1-gsmecher@threespeedlogic.com> Message-ID: <20230207163803.GI4124@scaer> Graeme, All, On 2022-05-19 09:02 -0700, Graeme Smecher spake thusly: > The python-orjson build bails as follows when using musl libc: > > error: cannot produce cdylib for `orjson v3.6.7 (...)` as the > target `i586-unknown-linux-musl` does not support these crate types I could not reproduce such an error wit the following defconfig: BR2_TOOLCHAIN_BUILDROOT_MUSL=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PER_PACKAGE_DIRECTORIES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_ORJSON=y Since you submitted this patch, pythn-orjson was bumped multiple times, and we've also bumped rust to 1.66.1, so maybe that was fixed now. Could you have a further look into this, please? Regards, Yann E. MORIN. > It's not machine-specific (it occurs on i586, s389x, and arm platforms), > and is tied to what appears to be relatively arcane details for > rust/musl: > > https://github.com/rust-lang/rust/issues/59302 > > At some point, it will be possible to remove this restriction - but not > yet. > > Signed-off-by: Graeme Smecher > --- > package/python-orjson/Config.in | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/python-orjson/Config.in b/package/python-orjson/Config.in > index 420e023b0a..b2ad9062cc 100644 > --- a/package/python-orjson/Config.in > +++ b/package/python-orjson/Config.in > @@ -1,6 +1,8 @@ > config BR2_PACKAGE_PYTHON_ORJSON > bool "python-orjson" > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > + # doesn't build with musl until rust's cdylib targets work with it > + depends on !BR2_TOOLCHAIN_USES_MUSL > select BR2_PACKAGE_PYTHON_CFFI # runtime > help > orjson is a fast, correct JSON library for Python. It > @@ -10,3 +12,6 @@ config BR2_PACKAGE_PYTHON_ORJSON > instances natively. > > https://github.com/ijl/orjson > + > +comment "python-orjson requires rust cdylib support, which musl doesn't have yet" > + depends on BR2_TOOLCHAIN_USES_MUSL > -- > 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 romain.naour at smile.fr Tue Feb 7 16:39:32 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 17:39:32 +0100 Subject: [Buildroot] [PATCH 1/1] utils/test-pkg: proper output on host without jq installed In-Reply-To: <20221012164831.10476-1-sebastien.szymanski@armadeus.com> References: <20221012164831.10476-1-sebastien.szymanski@armadeus.com> Message-ID: <75cb042c-7a23-2685-1835-089218d3321f@smile.fr> Hello Sebastien, Adding Yann in Cc. Le 12/10/2022 ? 18:48, S?bastien Szymanski a ?crit?: > On host without jq installed, test-pkg's output is as following: Is jq is listed as optional dependencies of Buildroot? > > $ ./utils/test-pkg -p mmc-utils > bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) > JQ IS > OK > bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) > JQ IS > OK > bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) > ... > > Since test-pkg handles this case we can hide this error message and have > proper output: > > $ ./utils/test-pkg -p mmc-utils > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: OK Indeed, jq was introduced in test-pkg by [1] [1] https://git.buildroot.net/buildroot/commit/?id=f29239cf9bc21d9632031077354b6ba5c868cc1f Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: S?bastien Szymanski > --- > utils/test-pkg | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/utils/test-pkg b/utils/test-pkg > index 4ebfd9af66..e7f5464817 100755 > --- a/utils/test-pkg > +++ b/utils/test-pkg > @@ -201,7 +201,7 @@ build_one() { > > # Validate that we generate proper json as show-info > { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; > - JQ="$(which jq)" > + JQ="$(which jq 2> /dev/null)" > if [ -z "${JQ}" ]; then > make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 > JQ="${dir}/host/bin/jq" From arnout at mind.be Tue Feb 7 16:41:45 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 17:41:45 +0100 Subject: [Buildroot] [PATCH v8 1/4] package/systemd: bump to version 252.4 In-Reply-To: <20230115114840.9027-1-nolange79@gmail.com> References: <20230115114840.9027-1-nolange79@gmail.com> Message-ID: <6490dfd6-5f3b-3801-6955-7fa655f2a82b@mind.be> On 15/01/2023 12:48, Norbert Lange wrote: > Following files changed *license* from CC0-1.0 to MIT-0: > > - src/systemctl/systemd-sysv-install.SKELETON > - config files > - examples under /network > > The file LICENSES/MIT-0.txt has been added for this reason, > hashes added, corrected for LICENSES/README.md. > > Kernel version 3.15 is now the bare minimum, but only > version 4.15 and higher are fully supported and tested: > > - bump kernel header dependencies > - correct kconfig description > - improvements to make the kconfig description better reflect > the information from the README > > Remove upstreamed patch. This is not actually done in this v8, probably left over from some earlier version. > > Set new options to their default, remove -Defi-cc option. > > Set -Ddbus=false to ensure dbus dependency is runtime only. > > Set -Ddbus-interfaces-dir=no as interface XML file generation is > not supported when cross compiling. I guess we could set this to yes for host-systemd, then copy the XML files to target. But they probably depend to some extent on the configuration, and it adds a lot to build time, and I doubt it is very useful to begin with... > > Set -Ddefault-user-shell=/bin/sh to the always available shell. > > Signed-off-by: Norbert Lange > Reviewed-by: James Hilliard [snip] > --- > > License diff for illustration > > --- systemd-stable-250.4/LICENSES/README.md > +++ systemd-stable-252.1/LICENSES/README.md > @@ -45,9 +45,11 @@ > * the following sources are licensed under the **CC0-1.0** license: > - src/basic/siphash24.c > - src/basic/siphash24.h > - - src/systemctl/systemd-sysv-install.SKELETON > - tools/check-includes.pl > + * the following sources are licensed under the **MIT-0** license: > - all examples under man/ > + - src/systemctl/systemd-sysv-install.SKELETON > + - config files and examples under /network > * the following sources are under **Public Domain** (LicenseRef-murmurhash2-public-domain): > - src/basic/MurmurHash2.c > - src/basic/MurmurHash2.h Very nice that you include this! However, git-am (and patchwork) interpret this as a hunk of the overall patch, so it fails and I had to manually adapt. In the future, please prefix with a space or something to avoid that. Applied to master, thanks. (Not pushed yet, I may make more changes while reviewing the rest of the series.) Regards, Arnout > > package/systemd: 252.4 > --- > package/systemd/Config.in | 12 +++++++++--- > package/systemd/systemd.hash | 5 +++-- > package/systemd/systemd.mk | 16 ++++++++++++++-- > system/Config.in | 6 +++--- > 4 files changed, 29 insertions(+), 10 deletions(-) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index 45a9e2d644..f35305c0be 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > depends on !BR2_STATIC_LIBS # kmod > depends on BR2_TOOLCHAIN_USES_GLIBC > depends on BR2_TOOLCHAIN_HAS_SSP > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd > select BR2_PACKAGE_HAS_UDEV > @@ -51,7 +51,11 @@ menuconfig BR2_PACKAGE_SYSTEMD > an elaborate transactional dependency-based service control > logic. It can work as a drop-in replacement for sysvinit. > > - Systemd requires a Linux kernel >= 3.13 with the following > + Kernel versions below 4.15 ("recommended baseline") have > + significant gaps in functionality and are not recommended > + for use with this version of systemd. > + > + Systemd requires a Linux kernel >= 3.15 with the following > options enabled: > > - CONFIG_DEVTMPFS > @@ -66,9 +70,11 @@ menuconfig BR2_PACKAGE_SYSTEMD > - CONFIG_PROC_FS > - CONFIG_FHANDLE (libudev, mount and bind mount handling) > > - - CONFIG_NET_NS (needed by PrivateNetwork=, used in some > + - CONFIG_NET_NS (Required for PrivateNetwork=, used in some > systemd units) > > + - CONFIG_USER_NS (Required for PrivateUsers=) > + > - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS > - CONFIG_TMPFS_POSIX_ACL > - CONFIG_TMPFS_XATTR > diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash > index 3b98566f32..00c08edcd9 100644 > --- a/package/systemd/systemd.hash > +++ b/package/systemd/systemd.hash > @@ -1,5 +1,5 @@ > # sha256 locally computed > -sha256 638a2fc78828765fc97bc73f428205b6dc1d359149b6c6bfe4d2a649cba2cca8 systemd-250.8.tar.gz > +sha256 cf2d27e67663d599a045101c7178cf0ec63d9df2962a54adf7de0d0357724f00 systemd-252.4.tar.gz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 > sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt > @@ -8,7 +8,8 @@ sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENS > sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 LICENSES/LGPL-2.0-or-later.txt > sha256 5bcef4fedbfc08776630e65d5d0d074dd31208037eddb167ca46a9ec4f737764 LICENSES/Linux-syscall-note.txt > sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENSES/lookup3-public-domain.txt > +sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENSES/MIT-0.txt > sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt > sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt > sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt > -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md > +sha256 da9b2c7b8cd10516fd2c4279b82496ea61787148f13e899c62fc8988c5fac34f LICENSES/README.md > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index b96873b73f..b0597f9bb4 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.8 > +SYSTEMD_VERSION = 252.4 > SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) > SYSTEMD_LICENSE = \ > LGPL-2.1+, \ > @@ -29,6 +29,7 @@ SYSTEMD_LICENSE = \ > BSD-3-Clause (tools/chromiumos), \ > CC0-1.0 (few source files, see LICENSES/README.md), \ > GPL-2.0 with Linux-syscall-note (linux kernel headers), \ > + MIT-0 (few source files, see LICENSES/README.md), \ > MIT (few source files, see LICENSES/README.md), \ > OFL-1.1 (Heebo fonts) > SYSTEMD_LICENSE_FILES = \ > @@ -40,6 +41,7 @@ SYSTEMD_LICENSE_FILES = \ > LICENSES/LGPL-2.0-or-later.txt \ > LICENSES/Linux-syscall-note.txt \ > LICENSES/lookup3-public-domain.txt \ > + LICENSES/MIT-0.txt \ > LICENSES/MIT.txt \ > LICENSES/murmurhash2-public-domain.txt \ > LICENSES/OFL-1.1.txt \ > @@ -61,7 +63,13 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg > SYSTEMD_PROVIDES = udev > > SYSTEMD_CONF_OPTS += \ > + -Ddbus=false \ > + -Ddbus-interfaces-dir=no \ > + -Ddefault-compression='auto' \ > -Ddefault-hierarchy=unified \ > + -Ddefault-locale='C.UTF-8' \ > + -Ddefault-user-shell=/bin/sh \ > + -Dfirst-boot-full-preset=false \ > -Didn=true \ > -Dima=false \ > -Dkexec-path=/usr/sbin/kexec \ > @@ -72,6 +80,7 @@ SYSTEMD_CONF_OPTS += \ > -Dman=false \ > -Dmount-path=/usr/bin/mount \ > -Dmode=release \ > + -Dnspawn-locale='C.UTF-8' \ > -Dnss-systemd=true \ > -Dquotacheck-path=/usr/sbin/quotacheck \ > -Dquotaon-path=/usr/sbin/quotaon \ > @@ -82,6 +91,7 @@ SYSTEMD_CONF_OPTS += \ > -Dsulogin-path=/usr/sbin/sulogin \ > -Dsystem-gid-max=999 \ > -Dsystem-uid-max=999 \ > + -Dsysupdate=false \ > -Dsysvinit-path= \ > -Dsysvrcnd-path= \ > -Dtelinit-path= \ > @@ -553,7 +563,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi > SYSTEMD_CONF_OPTS += \ > -Defi=true \ > -Dgnu-efi=true \ > - -Defi-cc=$(TARGET_CC) \ > -Defi-ld=bfd \ > -Defi-libdir=$(STAGING_DIR)/usr/lib \ > -Defi-includedir=$(STAGING_DIR)/usr/include/efi > @@ -793,6 +802,8 @@ HOST_SYSTEMD_CONF_OPTS = \ > -Dbinfmt=false \ > -Drepart=false \ > -Dcoredump=false \ > + -Ddbus=false \ > + -Ddbus-interfaces-dir=no \ > -Dpstore=false \ > -Doomd=false \ > -Dlogind=false \ > @@ -801,6 +812,7 @@ HOST_SYSTEMD_CONF_OPTS = \ > -Dmachined=false \ > -Dportabled=false \ > -Dsysext=false \ > + -Dsysupdate=false \ > -Duserdb=false \ > -Dhomed=false \ > -Dnetworkd=false \ > diff --git a/system/Config.in b/system/Config.in > index 806a747315..232bdfe763 100644 > --- a/system/Config.in > +++ b/system/Config.in > @@ -125,19 +125,19 @@ config BR2_INIT_SYSTEMD > depends on BR2_TOOLCHAIN_USES_GLIBC > depends on BR2_TOOLCHAIN_HAS_SSP > depends on BR2_TOOLCHAIN_HAS_THREADS > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > depends on BR2_HOST_GCC_AT_LEAST_5 > select BR2_ROOTFS_MERGED_USR > select BR2_PACKAGE_SYSTEMD > select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT > > -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5" > +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" > depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS > depends on BR2_USE_MMU > depends on !BR2_TOOLCHAIN_USES_GLIBC || \ > !BR2_TOOLCHAIN_HAS_SSP || \ > - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || \ > + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ > !BR2_HOST_GCC_AT_LEAST_5 > From sebastian.weyer at smile.fr Tue Feb 7 16:50:31 2023 From: sebastian.weyer at smile.fr (Sebastian Weyer) Date: Tue, 7 Feb 2023 17:50:31 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: test_rust.py: Add test to check correct vendoring Message-ID: <20230207165031.17188-1-sebastian.weyer@smile.fr> Currently the tests TestRust and TestRustBin do check for vendoring by requiring package ripgrep to be built but only if the download directory is already empty, otherwise the existing contents of the download directory will be reused and therefore not be redownloaded. This new test will only verify that the required packages are downloaded and vendored correctly without doing a runtime test. It does so by setting a path to a folder "dl" inside the build directory (output-directory/testname/) and then setting the environment variable BR2_DL_DIR to this path before the build starts. This code was essentially copied from the file test_gitforge.py which was added in commit 1ca6ab6ace3c1f9edfbfd16b57d1280b3ea2c6f5 We want the package ripgrep to be built since it requires vendoring directly. Additionally we want the package python-cryptography to be built because it has rust dependencies and therefore indirectly also requires vendoring. Signed-off-by: Sebastian Weyer --- support/testing/tests/package/test_rust.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index fb9dd2d916..763125ca20 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -1,4 +1,5 @@ import os +import shutil import infra.basetest @@ -54,3 +55,44 @@ class TestRust(TestRustBase): def test_run(self): self.login() self.assertRunOk("rg Buildroot /etc/issue") + + +class TestRustVendoring(infra.basetest.BRConfigTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_HOST_RUSTC=y + BR2_PACKAGE_RIPGREP=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y + BR2_BACKUP_SITE="" + """ + + def setUp(self): + super(TestRustVendoring, self).setUp() + + def tearDown(self): + self.show_msg("Cleaning up") + if self.b and not self.keepbuilds: + self.b.delete() + + def check_download(self, package): + # store downloaded tarball inside the output dir so the test infra + # cleans it up at the end + dl_dir = os.path.join(self.builddir, "dl") + # enforce we test the download + if os.path.exists(dl_dir): + shutil.rmtree(dl_dir) + env = {"BR2_DL_DIR": dl_dir} + self.b.build(["{}-dirclean".format(package), + "{}-legal-info".format(package)], + env) + + def test_run(self): + self.check_download("ripgrep") + self.check_download("python-cryptography") -- 2.25.1 From yann.morin.1998 at free.fr Tue Feb 7 16:48:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 17:48:42 +0100 Subject: [Buildroot] [git commit] utils/test-pkg: proper output on host without jq installed Message-ID: <20230207165050.89F57842B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09ac5a9e18e96ba6d3cd13e5e8d34aeccfcb603d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master On host without jq installed, test-pkg's output is as following: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) ... Since test-pkg handles this case we can hide this error message and have proper output: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK Signed-off-by: S??bastien Szymanski Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN --- utils/test-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test-pkg b/utils/test-pkg index 4ebfd9af66..e7f5464817 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -201,7 +201,7 @@ build_one() { # Validate that we generate proper json as show-info { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; - JQ="$(which jq)" + JQ="$(which jq 2> /dev/null)" if [ -z "${JQ}" ]; then make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 JQ="${dir}/host/bin/jq" From yann.morin.1998 at free.fr Tue Feb 7 16:51:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 17:51:09 +0100 Subject: [Buildroot] [PATCH 1/1] utils/test-pkg: proper output on host without jq installed In-Reply-To: <20221012164831.10476-1-sebastien.szymanski@armadeus.com> References: <20221012164831.10476-1-sebastien.szymanski@armadeus.com> Message-ID: <20230207165109.GJ4124@scaer> S?bastien, All, On 2022-10-12 18:48 +0200, S?bastien Szymanski spake thusly: > On host without jq installed, test-pkg's output is as following: > > $ ./utils/test-pkg -p mmc-utils > bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) > JQ IS > OK > bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) > JQ IS > OK > bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) > ... > > Since test-pkg handles this case we can hide this error message and have > proper output: > > $ ./utils/test-pkg -p mmc-utils > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: OK > > Signed-off-by: S?bastien Szymanski Applied to master, thanks. Regards, Yann E. MORIN. > --- > utils/test-pkg | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/utils/test-pkg b/utils/test-pkg > index 4ebfd9af66..e7f5464817 100755 > --- a/utils/test-pkg > +++ b/utils/test-pkg > @@ -201,7 +201,7 @@ build_one() { > > # Validate that we generate proper json as show-info > { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; > - JQ="$(which jq)" > + JQ="$(which jq 2> /dev/null)" > if [ -z "${JQ}" ]; then > make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 > JQ="${dir}/host/bin/jq" > -- > 2.37.3 > > _______________________________________________ > 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 giulio.benetti at benettiengineering.com Tue Feb 7 16:53:07 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 7 Feb 2023 17:53:07 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix LINUX_VERSION_PROBED content In-Reply-To: <20230207151646.09c9df79@windsurf> References: <20230104020558.1436469-1-giulio.benetti@benettiengineering.com> <20230104020558.1436469-2-giulio.benetti@benettiengineering.com> <20230207151646.09c9df79@windsurf> Message-ID: Hello Thomas, Vincent, On 07/02/23 15:16, Thomas Petazzoni via buildroot wrote: > Hello Giulio, > > On Wed, 4 Jan 2023 03:05:58 +0100 > Giulio Benetti wrote: > >> Actually LINUX_VERSION_PROBED is set with the string sorrounded by the >> backquotes including them. So when we evaluate $(LINUX_VERSION_PROBED) we >> end up having the command itself and instead we only need the Linux version >> probed in the style x.y.z. >> >> Verifying it turns out that: >> 1) --no-print-directory and -s make flags must be passed before -C flag, >> The error was not visible because errors were suppressed with >> '2>/dev/null' >> 2) backquotes don't evaluate the expression they sorround but become part >> of the string they sorround and get assigned to the variable >> >> To fix this let's move --no-print-directory right after $(MAKE) and >> use $(shell ) instead of backquotes. >> >> Signed-off-by: Giulio Benetti > > What is this fixing exactly? Do you have a specific problem that this > fixes? Or is this just fixing the fact that LINUX_VERSION_PROBED > contains `a very long command` instead of the result of the command > itself? While building the various rtl* wifi drivers I've noticed KVER='a very long command` but it gets evaluated correctly, indeed the .ko module is installed in the correct "lib/modules/$(LINUX_VERSION_PROBED)" path. > Indeed, switching back to $(shell ...) like you're proposing would > result in basically backporting: > > commit 28f57bb863ba48df054cec0057c844bf23d5969f > Author: Arnout Vandecappelle > Date: Sun Jul 12 16:35:27 2015 +0200 > > linux: use backtick instead of $(shell ...) make function > > Verified that LINUX_VERSION_PROBED is only used in "-quoted commands > (actually, usually it's not quoted). > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > Signed-off-by: Thomas Petazzoni > > which is not desirable, especially if you don't have a good > justification of why the current situation doesn't work. > > So for now, I'll mark as Rejected, but if you have a good > justification, you can resend with a better commit log with this > justification. Let's keep it as rejected, sorry for the noise! Best regards -- Giulio Benetti Benetti Engineering sas From peter at korsgaard.com Tue Feb 7 17:00:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 18:00:40 +0100 Subject: [Buildroot] [PATCH 2/2] support/dependencies/dependencies.sh: ensure git is >= 2.0.0 for vendoring In-Reply-To: <20230207170040.3503236-1-peter@korsgaard.com> References: <20230207170040.3503236-1-peter@korsgaard.com> Message-ID: <20230207170040.3503236-2-peter@korsgaard.com> The go vendoring fails on CentOS 7 (which uses git 1.8.3.1) with errors related to shallow clones: make docker-compose-source .. go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 github.com/docker/compose/v2/pkg/mocks imports github.com/theupdateframework/notary/client imports github.com/docker/go/canonical/json: github.com/docker/go at v1.5.1-1.0.20160303222718-d30aec9fd63c: invalid pseudo-version: git fetch --unshallow -f origin in /home/jacmet/source/buildroot-mirror/output/host/share/go-path/pkg/mod/cache/vcs/48fbd2dfabec81f4c93170677bfc89087d4bec07a2d08f6ca5ce3d17962677ee: exit status 128: fatal: git fetch-pack: expected shallow list make[1]: *** [/home/jacmet/source/buildroot-mirror/output/build/docker-compose-2.15.1/.stamp_downloaded] Error 1 It works with git 2.0.0 (released May 2014, included in Debian 8), so check for >= 2.0.0 with logic similar to the GNU patch version check. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 88eabe921d..9193b3ee12 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -174,6 +174,16 @@ for prog in perl tar wget cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do echo " xargs is usually part of the findutils package in your distribution" fi fi + + # we need git >= 2.0.0 for shallow clones / vendoring + if test $prog = "git" ; then + GIT_VERSION="$(git --version | sed -n 's/^git version \(.*\)/\1/p')" + GIT_MAJOR="$(echo "${GIT_VERSION}" | cut -d . -f 1)" + if [ "${GIT_MAJOR}" -lt 2 ]; then + echo "You have git '${GIT_VERSION}' installed. Git >= 2.0.0 is required" + exit 1 + fi + fi done if test "${missing_progs}" = "yes" ; then -- 2.30.2 From yann.morin.1998 at free.fr Tue Feb 7 17:03:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:03:01 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: test_rust.py: Add test to check correct vendoring In-Reply-To: <20230207165031.17188-1-sebastian.weyer@smile.fr> References: <20230207165031.17188-1-sebastian.weyer@smile.fr> Message-ID: <20230207170301.GK4124@scaer> Sebastian, All, On 2023-02-07 17:50 +0100, Sebastian Weyer spake thusly: > Currently the tests TestRust and TestRustBin do check for vendoring by > requiring package ripgrep to be built but only if the download > directory is already empty, otherwise the existing contents of the download > directory will be reused and therefore not be redownloaded. > > This new test will only verify that the required packages are downloaded > and vendored correctly without doing a runtime test. It does so by setting a > path to a folder "dl" inside the build directory (output-directory/testname/) > and then setting the environment variable BR2_DL_DIR to this path before the > build starts. This code was essentially copied from the file > test_gitforge.py which was added in commit > 1ca6ab6ace3c1f9edfbfd16b57d1280b3ea2c6f5 There is a missing piece in this otherwise detailed commit log: why set BR2_DL_DIR in the environment, rather than set it in the config options? The reason is that a user may already have BR2_DL_DIR set in their own envronment, and that would override the dl dir we set in the config options. No need to respin, that can be fixed when applying. Regards, Yann E. MORIN. > We want the package ripgrep to be built since it requires vendoring > directly. Additionally we want the package python-cryptography to be > built because it has rust dependencies and therefore indirectly also requires > vendoring. > > Signed-off-by: Sebastian Weyer > --- > support/testing/tests/package/test_rust.py | 42 ++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py > index fb9dd2d916..763125ca20 100644 > --- a/support/testing/tests/package/test_rust.py > +++ b/support/testing/tests/package/test_rust.py > @@ -1,4 +1,5 @@ > import os > +import shutil > > import infra.basetest > > @@ -54,3 +55,44 @@ class TestRust(TestRustBase): > def test_run(self): > self.login() > self.assertRunOk("rg Buildroot /etc/issue") > + > + > +class TestRustVendoring(infra.basetest.BRConfigTest): > + config = \ > + """ > + BR2_arm=y > + BR2_cortex_a9=y > + BR2_ARM_ENABLE_NEON=y > + BR2_ARM_ENABLE_VFP=y > + BR2_TOOLCHAIN_EXTERNAL=y > + # BR2_TARGET_ROOTFS_TAR is not set > + BR2_PACKAGE_HOST_RUSTC=y > + BR2_PACKAGE_RIPGREP=y > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y > + BR2_BACKUP_SITE="" > + """ > + > + def setUp(self): > + super(TestRustVendoring, self).setUp() > + > + def tearDown(self): > + self.show_msg("Cleaning up") > + if self.b and not self.keepbuilds: > + self.b.delete() > + > + def check_download(self, package): > + # store downloaded tarball inside the output dir so the test infra > + # cleans it up at the end > + dl_dir = os.path.join(self.builddir, "dl") > + # enforce we test the download > + if os.path.exists(dl_dir): > + shutil.rmtree(dl_dir) > + env = {"BR2_DL_DIR": dl_dir} > + self.b.build(["{}-dirclean".format(package), > + "{}-legal-info".format(package)], > + env) > + > + def test_run(self): > + self.check_download("ripgrep") > + self.check_download("python-cryptography") > -- > 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 vfazio at xes-inc.com Tue Feb 7 17:03:03 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 7 Feb 2023 11:03:03 -0600 Subject: [Buildroot] [PATCH 1/1] package/xz: fix microblaze compiles Message-ID: <20230207170303.2508780-1-vfazio@xes-inc.com> From: Vincent Fazio Patch xz to check if __attribute__((symver ..)) is supported via a compile check during configure. Fixes: http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// Signed-off-by: Vincent Fazio --- ...0001-Detect-symver-attribute-support.patch | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 package/xz/0001-Detect-symver-attribute-support.patch diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch new file mode 100644 index 0000000000..9ec43ea7a0 --- /dev/null +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -0,0 +1,61 @@ +From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 08:51:24 -0600 +Subject: [PATCH] Detect symver attribute support + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://github.com/tukaani-project/xz/pull/32 +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vincent Fazio +--- + configure.ac | 9 +++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5ad5589..08c623a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -791,6 +791,15 @@ else + time with Libtool if neither --with-pic nor + --without-pic is used). This define must be + used together with liblzma_linux.map.]) ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE( ++ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ])], ++ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], ++ [Define to 1 if GCC supports the symver attribute])], ++ []) ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic +diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h +index 11fec52..1d2ef9c 100644 +--- a/src/liblzma/common/common.h ++++ b/src/liblzma/common/common.h +@@ -76,7 +76,7 @@ + // too (which doesn't support __symver__) so use it to detect if __symver__ + // is available. This should be far more reliable than looking at compiler + // version macros as nowadays especially __GNUC__ is defined by many compilers. +-# if lzma_has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define LZMA_SYMVER_API(extnamever, type, intname) \ + extern __attribute__((__symver__(extnamever))) \ + LZMA_API(type) intname +-- +2.25.1 + -- 2.25.1 From thomas.petazzoni at bootlin.com Tue Feb 7 17:10:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:10:35 +0100 Subject: [Buildroot] [git commit] package/uclibc: pass $(TARGET_DEBUGGING) flags Message-ID: <20230207171058.34CDD842D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17481bd0bf6abff260ccc579974b813050f91d4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In order to have debugging symbols in uClibc, let's pass $(TARGET_DEBUGGING) in UCLIBC_EXTRA_CFLAGS. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index d2baffc95e..342d841087 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -375,7 +375,7 @@ endif # Commands # -UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) +UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) $(TARGET_DEBUGGING) # uClibc-ng does not build with LTO, so explicitly disable it # when using a compiler that may have support for LTO From thomas.petazzoni at bootlin.com Tue Feb 7 17:10:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:10:35 +0100 Subject: [Buildroot] [git commit] package/uclibc: enable DODEBUG when BR2_ENABLE_RUNTIME_DEBUG Message-ID: <20230207171058.41479842DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9867a725c12975af52dda9dffbdc33c3b0312db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The DODEBUG=y option of uClibc causes uClibc to be built with -O0 and -DDEBUG, which has a significant runtime performance impact. Currently, DODEBUG=y is passed when BR2_ENABLE_DEBUG=y, but BR2_ENABLE_DEBUG is only about enabling debugging symbols, not about runtime debugging additions. The more recently added BR2_ENABLE_RUNTIME_DEBUG option is precisely designed for that, so we changed the logic to pass DODEBUG=y when BR2_ENABLE_RUNTIME_DEBUG=y, and not BR2_ENABLE_DEBUG=y. This allows to build uClibc with debugging symbols when BR2_ENABLE_DEBUG=y, without disabling optimizations and adding more debugging features that have a runtime performance impact. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 342d841087..4c05d36ab3 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -217,7 +217,7 @@ endif # # Debug # -ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) define UCLIBC_DEBUG_CONFIG $(call KCONFIG_ENABLE_OPT,DODEBUG) endef From thomas.petazzoni at bootlin.com Tue Feb 7 17:10:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:10:35 +0100 Subject: [Buildroot] [git commit] package/uclibc: don't let uClibc build system strip uClibc Message-ID: <20230207171058.29B82842D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf92dcfaa92f6564830d10d4e18ae00fd8102ab2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Let Buildroot handle this, so we can have an unstripped uClibc if needed. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 125aa4cdcf..d2baffc95e 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -397,6 +397,7 @@ define UCLIBC_KCONFIG_FIXUP_CMDS $(call KCONFIG_SET_OPT,RUNTIME_PREFIX,"/") $(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr") $(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib") + $(call KCONFIG_DISABLE_OPT,DOSTRIP) $(UCLIBC_MMU_CONFIG) $(UCLIBC_BINFMT_CONFIG) $(UCLIBC_AARCH64_PAGE_SIZE_CONFIG) From peter at korsgaard.com Tue Feb 7 17:00:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 18:00:39 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring Message-ID: <20230207170040.3503236-1-peter@korsgaard.com> The vendoring done for cargo / go packages (may) need git, so ensure we check for it in dependencies, similar to how it is done for packages directly using git. Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5d618c6b39..82187d7db9 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1250,6 +1250,13 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD +# cargo/go vendoring (may) need git +ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),cargo) +DL_TOOLS_DEPENDENCIES += git +else ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),go) +DL_TOOLS_DEPENDENCIES += git +endif + DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. -- 2.30.2 From thomas.petazzoni at bootlin.com Tue Feb 7 17:12:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:12:09 +0100 Subject: [Buildroot] [PATCH v2] package/uclibc: fix usage of DODEBUG option In-Reply-To: <20220803200629.3172370-1-Ben.Wolsieffer@hefring.com> References: <20220803200629.3172370-1-Ben.Wolsieffer@hefring.com> Message-ID: <20230207181209.6e69b852@windsurf> Hello Ben, On Wed, 3 Aug 2022 16:06:29 -0400 Ben Wolsieffer wrote: > The DODEBUG option passes -O0 and -DDEBUG to the compiler, which has a > significant impact on runtime behavior and performance. Currently, > DODEBUG is enabled by BR2_ENABLE_DEBUG, but it makes more sense for it > to be enabled by BR_ENABLE_RUNTIME_DEBUG. > > This patch implements the above change, and also disables the DOSTRIP > option, allowing Builroot to decide whether binaries should be stripped. > > Lastly, this patch adds $(TARGET_DEBUGGING) to the compiler flags, to > enable debug symbols when appropriate. > > Signed-off-by: Ben Wolsieffer > --- > Changes in v2: > - Always disable DOSTRIP. > - Only add $(TARGET_DEBUGGING) to CFLAGS, to avoid any unintended side > effects. So after quite some time, I finally took care of your patch (sorry for the delay!). I ended up splitting it into 3 separate commits, because even though they are related, the 3 aspects are distinct. So here you are: commit f9867a725c12975af52dda9dffbdc33c3b0312db Author: Ben Wolsieffer Date: Tue Feb 7 17:53:37 2023 +0100 package/uclibc: enable DODEBUG when BR2_ENABLE_RUNTIME_DEBUG The DODEBUG=y option of uClibc causes uClibc to be built with -O0 and -DDEBUG, which has a significant runtime performance impact. Currently, DODEBUG=y is passed when BR2_ENABLE_DEBUG=y, but BR2_ENABLE_DEBUG is only about enabling debugging symbols, not about runtime debugging additions. The more recently added BR2_ENABLE_RUNTIME_DEBUG option is precisely designed for that, so we changed the logic to pass DODEBUG=y when BR2_ENABLE_RUNTIME_DEBUG=y, and not BR2_ENABLE_DEBUG=y. This allows to build uClibc with debugging symbols when BR2_ENABLE_DEBUG=y, without disabling optimizations and adding more debugging features that have a runtime performance impact. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni commit 17481bd0bf6abff260ccc579974b813050f91d4e Author: Ben Wolsieffer Date: Tue Feb 7 17:52:21 2023 +0100 package/uclibc: pass $(TARGET_DEBUGGING) flags In order to have debugging symbols in uClibc, let's pass $(TARGET_DEBUGGING) in UCLIBC_EXTRA_CFLAGS. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni commit cf92dcfaa92f6564830d10d4e18ae00fd8102ab2 Author: Ben Wolsieffer Date: Tue Feb 7 17:50:59 2023 +0100 package/uclibc: don't let uClibc build system strip uClibc Let Buildroot handle this, so we can have an unstripped uClibc if needed. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From gsmecher at threespeedlogic.com Tue Feb 7 17:14:00 2023 From: gsmecher at threespeedlogic.com (Graeme Smecher) Date: Tue, 7 Feb 2023 09:14:00 -0800 Subject: [Buildroot] [PATCH v2] package/python-orjson: disallow build when using musl. In-Reply-To: <20230207163803.GI4124@scaer> References: <20220509190650.1348657-2-gsmecher@threespeedlogic.com> <20220519160214.214701-1-gsmecher@threespeedlogic.com> <20230207163803.GI4124@scaer> Message-ID: Hi Yann, On 2023-02-07 08:38, Yann E. MORIN wrote: > Graeme, All, > > On 2022-05-19 09:02 -0700, Graeme Smecher spake thusly: >> The python-orjson build bails as follows when using musl libc: >> >> error: cannot produce cdylib for `orjson v3.6.7 (...)` as the >> target `i586-unknown-linux-musl` does not support these crate types > > I could not reproduce such an error wit the following defconfig: > > BR2_TOOLCHAIN_BUILDROOT_MUSL=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_PER_PACKAGE_DIRECTORIES=y > BR2_PACKAGE_PYTHON3=y > BR2_PACKAGE_PYTHON_ORJSON=y > > Since you submitted this patch, pythn-orjson was bumped multiple times, > and we've also bumped rust to 1.66.1, so maybe that was fixed now. > > Could you have a further look into this, please? This patch is obsolete. I used to receive orjson build failures associated with musl on a regular basis - they have tapered off since mid-2022. Over the past ~6 months or so, only the mips autobuilds have failed with the following message: - maturin failed Caused by: The architecture mips is not supported http://autobuild.buildroot.net/results/7291d123479411e632b8380f0045a18814dc23ae I am happy to drop the patch. best, Graeme > > Regards, > Yann E. MORIN. > >> It's not machine-specific (it occurs on i586, s389x, and arm platforms), >> and is tied to what appears to be relatively arcane details for >> rust/musl: >> >> https://github.com/rust-lang/rust/issues/59302 >> >> At some point, it will be possible to remove this restriction - but not >> yet. >> >> Signed-off-by: Graeme Smecher >> --- >> package/python-orjson/Config.in | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> diff --git a/package/python-orjson/Config.in b/package/python-orjson/Config.in >> index 420e023b0a..b2ad9062cc 100644 >> --- a/package/python-orjson/Config.in >> +++ b/package/python-orjson/Config.in >> @@ -1,6 +1,8 @@ >> config BR2_PACKAGE_PYTHON_ORJSON >> bool "python-orjson" >> depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS >> + # doesn't build with musl until rust's cdylib targets work with it >> + depends on !BR2_TOOLCHAIN_USES_MUSL >> select BR2_PACKAGE_PYTHON_CFFI # runtime >> help >> orjson is a fast, correct JSON library for Python. It >> @@ -10,3 +12,6 @@ config BR2_PACKAGE_PYTHON_ORJSON >> instances natively. >> >> https://github.com/ijl/orjson >> + >> +comment "python-orjson requires rust cdylib support, which musl doesn't have yet" >> + depends on BR2_TOOLCHAIN_USES_MUSL >> -- >> 2.35.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Tue Feb 7 17:16:42 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 18:16:42 +0100 Subject: [Buildroot] [PATCH v8 2/4] package/systemd: Add config option for sysupdate feature In-Reply-To: <20230115114840.9027-2-nolange79@gmail.com> References: <20230115114840.9027-1-nolange79@gmail.com> <20230115114840.9027-2-nolange79@gmail.com> Message-ID: <65c21c58-0a25-50b0-0e35-f8b4da7abac3@mind.be> On 15/01/2023 12:48, Norbert Lange wrote: > Support the new feature added with v251, > requires openssl. > > Signed-off-by: Norbert Lange > Reviewed-by: James Hilliard > --- > package/systemd/Config.in | 12 ++++++++++++ > package/systemd/systemd.mk | 7 ++++++- > 2 files changed, 18 insertions(+), 1 deletion(-) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index f35305c0be..9278772951 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -481,6 +481,18 @@ config BR2_PACKAGE_SYSTEMD_SYSEXT > > https://www.freedesktop.org/software/systemd/man/systemd-sysext.html > > +config BR2_PACKAGE_SYSTEMD_SYSUPDATE > + bool "enable sysupdate support" > + select BR2_PACKAGE_OPENSSL > + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL > + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK AFAIU, sysupdate uses its own particular way of doing A/B updates (by updating the GPT partition table) which is only supported by systemd-boot. Although I suppose it's possible to write a U-Boot script that does the same thing... So I added a note here to that effect. I don't suppose you actually used this option? Applied to master, thanks. Regards, Arnout > + help > + systemd-sysupdate atomically updates the host OS, container > + images, portable service images or other sources, based on > + the transfer configuration files described in sysupdate.d. > + > + https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html > + > config BR2_PACKAGE_SYSTEMD_SYSUSERS > bool "enable sysusers support" > help > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index b0597f9bb4..f49d34d32f 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -91,7 +91,6 @@ SYSTEMD_CONF_OPTS += \ > -Dsulogin-path=/usr/sbin/sulogin \ > -Dsystem-gid-max=999 \ > -Dsystem-uid-max=999 \ > - -Dsysupdate=false \ > -Dsysvinit-path= \ > -Dsysvrcnd-path= \ > -Dtelinit-path= \ > @@ -489,6 +488,12 @@ else > SYSTEMD_CONF_OPTS += -Dsysext=false > endif > > +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) > +SYSTEMD_CONF_OPTS += -Dsysupdate=true > +else > +SYSTEMD_CONF_OPTS += -Dsysupdate=false > +endif > + > ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) > SYSTEMD_CONF_OPTS += -Dnetworkd=true > SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management From angelo at amarulasolutions.com Tue Feb 7 17:17:08 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:08 +0100 Subject: [Buildroot] [PATCH v6 00/13] Extend Qt6 configuration Message-ID: <20230207171721.2973997-1-angelo@amarulasolutions.com> This series is an attempt to revamp the QT6 series from Jesse Van Gavere to be included mainline. It reworks a bit of things we discussed during the developer days in Bruxelles. Angelo Compagnucci (4): package/qt6/qt6base: add support for widgets package/qt6/qt6base: add support for widgets gtk backend package/qt6/qt6base: add opengl support package/qt6/qt6base: add QPA backend selection Jesse Van Gavere (9): package/qt6/qt6base: add support for gui module package/qt6/qt6base: add support for fontconfig/harfbuzz package/qt6/qt6base: Add support for jpeg/png/gif image format package/qt6/qt6base: add support for tslib package/qt6/qt6base: add support for libinput package/qt6/qt6base: add support for kms package/qt6/qt6base: add support for printsupport/cups package/qt6/qt6base: add support for building examples package/qt6: Add qmake functionality package/qt6/Config.in | 5 + package/qt6/qt6.mk | 12 ++ package/qt6/qt6base/Config.in | 161 +++++++++++++++++++++++++++ package/qt6/qt6base/qmake.conf.in | 34 ++++++ package/qt6/qt6base/qplatformdefs.h | 1 + package/qt6/qt6base/qt.conf.in | 7 ++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 166 ++++++++++++++++++++++++++++ 8 files changed, 387 insertions(+) create mode 100644 package/qt6/qt6base/qmake.conf.in create mode 100644 package/qt6/qt6base/qplatformdefs.h create mode 100644 package/qt6/qt6base/qt.conf.in -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:09 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:09 +0100 Subject: [Buildroot] [PATCH v6 01/13] package/qt6/qt6base: add support for gui module In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-2-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- v6: * Moved the basic linuxfb, xcb backend support here (Thomas P.) package/qt6/qt6base/Config.in | 31 +++++++++++++++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index e8357a675c..1810b1586d 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,37 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_GUI + bool "gui module" + select BR2_PACKAGE_FREETYPE + # At least one graphic backend must be enabled, so enable + # linuxfb if nothing is enabled. + select BR2_PACKAGE_QT6BASE_LINUXFB if \ + !BR2_PACKAGE_QT6BASE_XCB + help + This option enables the Qt6Gui library. + +if BR2_PACKAGE_QT6BASE_GUI + +config BR2_PACKAGE_QT6BASE_LINUXFB + bool "linuxfb support" + +config BR2_PACKAGE_QT6BASE_XCB + bool "X.org XCB support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_IMAGE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_LIBXKBCOMMON + +comment "X.org XCB backend available if X.org is enabled" + depends on !BR2_PACKAGE_XORG7 + +endif + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2f159f380b..9bfb2a8420 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -141,6 +141,39 @@ else QT6BASE_CONF_OPTS += -DFEATURE_glib=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) +QT6BASE_CONF_OPTS += -DFEATURE_gui=ON -DFEATURE_freetype=ON -DINPUT_opengl=no -DFEATURE_vulkan=OFF +QT6BASE_DEPENDENCIES += freetype + +ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_xcb=ON \ + -DFEATURE_xcb_xlib=ON \ + -DFEATURE_xkbcommon=ON \ + -DFEATURE_xkbcommon_x11=ON +QT6BASE_DEPENDENCIES += \ + libxcb \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xlib_libX11 \ + libxkbcommon +QT6BASE_DEPENDENCIES += xlib_libXext +else +QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:10 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:10 +0100 Subject: [Buildroot] [PATCH v6 02/13] package/qt6/qt6base: add support for fontconfig/harfbuzz In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-3-angelo@amarulasolutions.com> From: Jesse Van Gavere Additionally the harfbuzz license file is added and the hash for this is also added to the hash file Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 17 +++++++++++++++++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 1810b1586d..594221b792 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -59,6 +59,23 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_FONTCONFIG + bool "fontconfig support" + select BR2_PACKAGE_FONTCONFIG + help + This option enables Fontconfig and Freetype support using + the system fontconfig and freetype2 libraries. + +config BR2_PACKAGE_QT6BASE_HARFBUZZ + bool "harfbuzz support" + select BR2_PACKAGE_HARFBUZZ if \ + BR2_TOOLCHAIN_HAS_SYNC_4 && \ + BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + This option enables HarfBuzz support (either system harfbuzz + if the toolchain supports __sync for 4 bytes, or the qt + provided one which avoids this dependency by using QAtomic). + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 0c722ccded..dda7ff61c8 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,6 @@ # Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 sha256 a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d qtbase-everywhere-src-6.4.2.tar.xz +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 9bfb2a8420..da67b12c99 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -170,6 +170,29 @@ else QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_HARFBUZZ),y) +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=ON +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y) +# system harfbuzz in case __sync for 4 bytes is supported +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=OFF +QT6BASE_DEPENDENCIES += harfbuzz +else #BR2_TOOLCHAIN_HAS_SYNC_4 +# qt harfbuzz otherwise (using QAtomic instead) +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=ON +QT6BASE_LICENSE += , MIT (harfbuzz) +QT6BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON +QT6BASE_DEPENDENCIES += fontconfig +else +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:12 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:12 +0100 Subject: [Buildroot] [PATCH v6 04/13] package/qt6/qt6base: add support for widgets In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-5-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- v6: * Removed backend configuration options (Thomas P.) package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 6c5c60fa30..0f7e936162 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -95,6 +95,12 @@ config BR2_PACKAGE_QT6BASE_PNG This option enables PNG support using the system libpng library. +config BR2_PACKAGE_QT6BASE_WIDGETS + bool "widgets module" + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT6BASE_XCB + help + This option enables the Qt6Widgets library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 06ebbab8e7..cf3c7b1ad1 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -213,6 +213,10 @@ else QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:11 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:11 +0100 Subject: [Buildroot] [PATCH v6 03/13] package/qt6/qt6base: Add support for jpeg/png/gif image format In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-4-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 19 +++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 594221b792..6c5c60fa30 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -76,6 +76,25 @@ config BR2_PACKAGE_QT6BASE_HARFBUZZ if the toolchain supports __sync for 4 bytes, or the qt provided one which avoids this dependency by using QAtomic). +config BR2_PACKAGE_QT6BASE_GIF + bool "GIF support" + help + This compiles and installs the plugin for GIF reading support. + +config BR2_PACKAGE_QT6BASE_JPEG + bool "JPEG support" + select BR2_PACKAGE_JPEG + help + This option enables JPEG support using the system libjpeg + library. + +config BR2_PACKAGE_QT6BASE_PNG + bool "PNG support" + select BR2_PACKAGE_LIBPNG + help + This option enables PNG support using the system libpng + library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index da67b12c99..06ebbab8e7 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -186,6 +186,26 @@ else QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PNG),y) +QT6BASE_CONF_OPTS += -DFEATURE_png=ON -DFEATURE_system_png=ON +QT6BASE_DEPENDENCIES += libpng +else +QT6BASE_CONF_OPTS += -DFEATURE_png=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_GIF),y) +QT6BASE_CONF_OPTS += -DFEATURE_gif=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_gif=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_JPEG),y) +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=ON +QT6BASE_DEPENDENCIES += jpeg +else +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:13 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:13 +0100 Subject: [Buildroot] [PATCH v6 05/13] package/qt6/qt6base: add support for widgets gtk backend In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-6-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index cf3c7b1ad1..f936d19c68 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -215,6 +215,17 @@ endif ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON + +# only enable gtk support if libgtk3 X11 backend is enabled +ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy) +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=ON +QT6BASE_DEPENDENCIES += libgtk3 +else +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif else -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:14 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:14 +0100 Subject: [Buildroot] [PATCH v6 06/13] package/qt6/qt6base: add opengl support In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-7-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- v6: * Moving eglfs backend selection here (Thomas P.) package/qt6/Config.in | 5 ++++ package/qt6/qt6base/Config.in | 49 +++++++++++++++++++++++++++++++++- package/qt6/qt6base/qt6base.mk | 17 ++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index b0cc008df5..655fa8392a 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -12,6 +12,11 @@ config BR2_PACKAGE_QT6_ARCH_SUPPORTS default y if BR2_sparc64 depends on BR2_USE_MMU +config BR2_PACKAGE_QT6_GL_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + comment "qt6 needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, host gcc >= 8" depends on !BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT6_ARCH_SUPPORTS diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 0f7e936162..a33ffcd511 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -36,7 +36,8 @@ config BR2_PACKAGE_QT6BASE_GUI # At least one graphic backend must be enabled, so enable # linuxfb if nothing is enabled. select BR2_PACKAGE_QT6BASE_LINUXFB if \ - !BR2_PACKAGE_QT6BASE_XCB + !BR2_PACKAGE_QT6BASE_XCB && \ + !BR2_PACKAGE_QT6BASE_EGLFS help This option enables the Qt6Gui library. @@ -59,6 +60,52 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_OPENGL + bool "OpenGL support" + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + help + This option enables OpenGL support. + +comment "OpenGL support needs an OpenGL-capable backend" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS + +if BR2_PACKAGE_QT6BASE_OPENGL + +choice + prompt "OpenGL API" + help + Select OpenGL API. + +config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP + bool "Desktop OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL + help + Use desktop OpenGL. + +config BR2_PACKAGE_QT6BASE_OPENGL_ES2 + bool "OpenGL ES 2.0+" + depends on BR2_PACKAGE_HAS_LIBGLES + help + Use OpenGL ES 2.0 and later versions. + +endchoice + +config BR2_PACKAGE_QT6BASE_OPENGL_LIB + bool "opengl module" + select BR2_PACKAGE_QT6BASE_WIDGETS + help + This option enables the Qt6OpenGL library. This library + includes OpenGL support classes provided to ease porting + from Qt 4.x. + +config BR2_PACKAGE_QT6BASE_EGLFS + bool "eglfs support" + default y + depends on BR2_PACKAGE_HAS_LIBGBM + select BR2_PACKAGE_QT6BASE_OPENGL + +endif + config BR2_PACKAGE_QT6BASE_FONTCONFIG bool "fontconfig support" select BR2_PACKAGE_FONTCONFIG diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index f936d19c68..e9a3396fb6 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -228,6 +228,23 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) +QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON +QT6BASE_DEPENDENCIES += libegl +else +QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON +QT6BASE_DEPENDENCIES += libgl +else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON +QT6BASE_DEPENDENCIES += libgles +else +QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:15 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:15 +0100 Subject: [Buildroot] [PATCH v6 07/13] package/qt6/qt6base: add QPA backend selection In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-8-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 13 +++++++++++++ package/qt6/qt6base/qt6base.mk | 3 +++ 2 files changed, 16 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index a33ffcd511..065725049d 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -60,6 +60,19 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_DEFAULT_QPA + string "Default graphical platform" + help + Choose the default platform abstraction to use for graphical + applications (e.g xcb, linuxfb, eglfs, ...). If this is + empty, the default for your architecture will be used + (usually this is eglfs). + + You can get a list of supported platforms by running a Qt + application with the option "-platform help" on your + target. You can choose a different platform at runtime with + the -platform option. + config BR2_PACKAGE_QT6BASE_OPENGL bool "OpenGL support" depends on BR2_PACKAGE_QT6_GL_SUPPORTS diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index e9a3396fb6..a3c0c20d6e 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -249,6 +249,9 @@ else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif +QT6BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT6BASE_DEFAULT_QPA)) +QT6BASE_CONF_OPTS += $(if $(QT6BASE_DEFAULT_QPA),-DQT_QPA_DEFAULT_PLATFORM=$(QT6BASE_DEFAULT_QPA)) + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:17 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:17 +0100 Subject: [Buildroot] [PATCH v6 09/13] package/qt6/qt6base: add support for libinput In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-10-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 3942af6758..fb452b0b7d 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -228,6 +228,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_LIBINPUT),y) +QT6BASE_CONF_OPTS += -DFEATURE_libinput=ON +QT6BASE_DEPENDENCIES += libinput +else +QT6BASE_CONF_OPTS += -DFEATURE_libinput=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON QT6BASE_DEPENDENCIES += tslib -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:16 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:16 +0100 Subject: [Buildroot] [PATCH v6 08/13] package/qt6/qt6base: add support for tslib In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-9-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 065725049d..d5d6d3569d 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -224,6 +224,12 @@ config BR2_PACKAGE_QT6BASE_TEST help This options enables the Qt6Test library. +config BR2_PACKAGE_QT6BASE_TSLIB + bool "Enable Tslib support" + select BR2_PACKAGE_TSLIB + help + This options enables the Tslib plugin + config BR2_PACKAGE_QT6BASE_XML bool "XML module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index a3c0c20d6e..3942af6758 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -228,6 +228,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) +QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON +QT6BASE_DEPENDENCIES += tslib +else +QT6BASE_CONF_OPTS += -DFEATURE_tslib=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON QT6BASE_DEPENDENCIES += libegl -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:18 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:18 +0100 Subject: [Buildroot] [PATCH v6 10/13] package/qt6/qt6base: add support for kms In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-11-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index fb452b0b7d..4a64886a3f 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -206,6 +206,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT6BASE_CONF_OPTS += -DFEATURE_kms=ON +QT6BASE_DEPENDENCIES += libdrm +else +QT6BASE_CONF_OPTS += -DFEATURE_kms=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:19 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:19 +0100 Subject: [Buildroot] [PATCH v6 11/13] package/qt6/qt6base: add support for printsupport/cups In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-12-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 4 ++++ package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index d5d6d3569d..4d13128661 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -168,6 +168,10 @@ config BR2_PACKAGE_QT6BASE_NETWORK help This options enables the Qt6Network library. +config BR2_PACKAGE_QT6BASE_PRINTSUPPORT + depends on BR2_PACKAGE_QT6BASE_WIDGETS + def_bool y + config BR2_PACKAGE_QT6BASE_SQL bool "sql module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 4a64886a3f..97986a3c2b 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -206,6 +206,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT), y) +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON +ifeq ($(BR2_PACKAGE_CUPS), y) +QT6BASE_CONF_OPTS += -DFEATURE_cups=ON +QT6BASE_DEPENDENCIES += cups +else +QT6BASE_CONF_OPTS += -DFEATURE_cups=OFF +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF +endif + ifeq ($(BR2_PACKAGE_LIBDRM),y) QT6BASE_CONF_OPTS += -DFEATURE_kms=ON QT6BASE_DEPENDENCIES += libdrm -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:21 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:21 +0100 Subject: [Buildroot] [PATCH v6 13/13] package/qt6: Add qmake functionality In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-14-angelo@amarulasolutions.com> From: Jesse Van Gavere The qmake functionality had been missing due to the new host/target build requirement, to get it working the main parts of the qt5 qmake has been kept, we're still making our own device spec which we use to run qmake with along with passing some additional device options for our flags/cross-compiler the biggest difference is that where previously qt.conf was used to fixup per-paths builds, this is now always created with changed contents so qmake looks at the correct target directories. Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- v6: * Removing EGLFS_DEVICE mangling because is not working right now and should be added later. package/qt6/qt6.mk | 12 ++++++++++ package/qt6/qt6base/qmake.conf.in | 34 +++++++++++++++++++++++++++++ package/qt6/qt6base/qplatformdefs.h | 1 + package/qt6/qt6base/qt.conf.in | 7 ++++++ package/qt6/qt6base/qt6base.mk | 16 ++++++++++++++ 5 files changed, 70 insertions(+) create mode 100644 package/qt6/qt6base/qmake.conf.in create mode 100644 package/qt6/qt6base/qplatformdefs.h create mode 100644 package/qt6/qt6base/qt.conf.in diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 431bb8c9d3..847286a3fc 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -10,3 +10,15 @@ QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules include $(sort $(wildcard package/qt6/*/*.mk)) + +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable due +# to the host/target build and tweak the per-package install pathes +define QT6_INSTALL_QT_CONF + rm -f $(HOST_DIR)/bin/qt.conf + sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ + $(QT6BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf +endef + +# Variable for other Qt applications to use +QT6_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ diff --git a/package/qt6/qt6base/qmake.conf.in b/package/qt6/qt6base/qmake.conf.in new file mode 100644 index 0000000000..e0d53d755d --- /dev/null +++ b/package/qt6/qt6base/qmake.conf.in @@ -0,0 +1,34 @@ +# Qt6 has a mechanism to support "device" profiles, so that people can +# specify the compiler, compiler flags and so on for a specific device. + +# We leverage this mechanism in the Buildroot packaging of qt6 to +# simplify cross-compilation: we have our own "device" definition, which +# allows us to easily pass the cross-compiler paths and flags from our +# qt6.mk. + +include(../common/linux_device_pre.conf) + +# modifications to g++-unix.conf +QMAKE_CC = $${CROSS_COMPILE}gcc +QMAKE_CXX = $${CROSS_COMPILE}g++ +QMAKE_LINK = $${CROSS_COMPILE}g++ + +# modifications to gcc-base.conf +QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} +QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} +# Remove all optimisation flags, we really only want our own. +QMAKE_CFLAGS_OPTIMIZE = +QMAKE_CFLAGS_OPTIMIZE_DEBUG = +QMAKE_CFLAGS_OPTIMIZE_FULL = +QMAKE_CFLAGS_OPTIMIZE_SIZE = +QMAKE_CFLAGS_DEBUG = +QMAKE_CXXFLAGS_DEBUG = +QMAKE_CFLAGS_RELEASE = +QMAKE_CXXFLAGS_RELEASE = +CONFIG += nostrip + +QMAKE_LIBS += -lrt -lpthread -ldl +QMAKE_CFLAGS_ISYSTEM = + +include(../common/linux_device_post.conf) +load(qt_config) diff --git a/package/qt6/qt6base/qplatformdefs.h b/package/qt6/qt6base/qplatformdefs.h new file mode 100644 index 0000000000..99e9a27923 --- /dev/null +++ b/package/qt6/qt6base/qplatformdefs.h @@ -0,0 +1 @@ +#include "../../linux-g++/qplatformdefs.h" diff --git a/package/qt6/qt6base/qt.conf.in b/package/qt6/qt6base/qt.conf.in new file mode 100644 index 0000000000..4842bcb462 --- /dev/null +++ b/package/qt6/qt6base/qt.conf.in @@ -0,0 +1,7 @@ +[Paths] +Prefix=/usr +HostPrefix=@@HOST_DIR@@ +HostData=../target/usr +Sysroot=@@STAGING_DIR@@ +SysrootifyPrefix=true +TargetSpec=devices/linux-buildroot-g++ diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index ec1c65f827..f37b2bafce 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -54,6 +54,9 @@ QT6BASE_CONF_OPTS = \ -DFEATURE_system_zlib=ON \ -DFEATURE_system_libb2=ON +QT6BASE_CFLAGS = $(TARGET_CFLAGS) +QT6BASE_CXXFLAGS = $(TARGET_CXXFLAGS) + # x86 optimization options. While we have a BR2_X86_CPU_HAS_AVX512, it # is not clear yet how it maps to all the avx512* options of Qt, so we # for now keeps them disabled. @@ -384,5 +387,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF endif +define QT6BASE_MAKE_BR_SPEC + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qmake.conf.in \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h +endef + +QT6BASE_CONF_OPTS += -DQT_QMAKE_DEVICE_OPTIONS=CROSS_COMPILE="$(TARGET_CROSS)";BR_COMPILER_CFLAGS="$(QT6BASE_CFLAGS)";BR_COMPILER_CXXFLAGS="$(QT6BASE_CXX_FLAGS)" + +QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC + +QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF + $(eval $(cmake-package)) $(eval $(host-cmake-package)) -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:20 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:20 +0100 Subject: [Buildroot] [PATCH v6 12/13] package/qt6/qt6base: add support for building examples In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-13-angelo@amarulasolutions.com> From: Jesse Van Gavere The selected options make the default examples set to actually compile. Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 18 ++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 4d13128661..4ae5e96ef0 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,24 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_EXAMPLES + bool "Compile and install examples " + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_QT6BASE_DBUS + select BR2_PACKAGE_QT6BASE_NETWORK + select BR2_PACKAGE_QT6BASE_XML + select BR2_PACKAGE_QT6BASE_DBUS + select BR2_PACKAGE_QT6BASE_GUI + select BR2_PACKAGE_QT6BASE_WIDGETS + select BR2_PACKAGE_QT6BASE_OPENGL + select BR2_PACKAGE_QT6BASE_OPENGL_LIB + select BR2_PACKAGE_QT6BASE_CONCURRENT + help + If unsure, say N. + +comment "Building examples needs OpenGL/DBus support" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS || !BR2_PACKAGE_DBUS + config BR2_PACKAGE_QT6BASE_GUI bool "gui module" select BR2_PACKAGE_FREETYPE diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 97986a3c2b..ec1c65f827 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -310,6 +310,12 @@ QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EXAMPLES),y) +QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=ON +else +QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_NETWORK),y) QT6BASE_CONF_OPTS += -DFEATURE_network=ON else -- 2.25.1 From yann.morin.1998 at free.fr Tue Feb 7 17:15:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:15:00 +0100 Subject: [Buildroot] [git commit] .gitlab-ci.yml: update Docker image to use Message-ID: <20230207171938.920A58430C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bde165f7ad4922e218cabdb6eb7c40e1661179f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We have a new Docker image, updated with the new requirements from bcd15aa08aab1e8292b93995c44dc765a9801632 ("support/docker: add python3-magic"), but also with an updated Debian Bullseye installation. Let's use it. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cad35c96bc..ed17bb14b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # Configuration for Gitlab-CI. # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines -image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1756 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123 stages: - generate-gitlab-ci From yann.morin.1998 at free.fr Tue Feb 7 17:14:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:14:59 +0100 Subject: [Buildroot] [git commit] support/docker: update Debian distro to a newer tag/date Message-ID: <20230207171938.7E5E48430A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d24c6f4b15f4794046e8e1ee220298c90ddecd19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/docker/Dockerfile | 2 +- support/docker/apt-sources.list | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index d775ae23e1..de1534e77a 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -6,7 +6,7 @@ # We use a specific tag for the base image *and* the corresponding date # for the repository., so do not forget to update the apt-sources.list # file that is shipped next to this Dockerfile. -FROM debian:bullseye-20210902 +FROM debian:bullseye-20230202 LABEL maintainer="Buildroot mailing list " \ vendor="Buildroot" \ diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list index 0f872fd398..849996d9f7 100644 --- a/support/docker/apt-sources.list +++ b/support/docker/apt-sources.list @@ -1,4 +1,4 @@ -# Latest just before 20210817T000000Z: -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20210902T193650Z/ bullseye-security main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main +# Latest just before 20230207T102800Z: +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20230206T092119Z/ bullseye-security main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye-updates main From yann.morin.1998 at free.fr Tue Feb 7 17:14:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:14:59 +0100 Subject: [Buildroot] [git commit] support/docker: use APT::Retries in apt-get calls to retry Message-ID: <20230207171938.885B08430B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a7c6725f6ca5c1108e6fb76fad414132555b373 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master snapshot.debian.org is notoriously slow, and quite often leads to timeouts when downloading packages. To give us a better chance of succeeding, let's retry 3 times before failing. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index de1534e77a..a16c1e3849 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -20,8 +20,8 @@ COPY apt-sources.list /etc/apt/sources.list # The container has no package lists, so need to update first RUN dpkg --add-architecture i386 && \ - apt-get update -y -RUN apt-get install -y --no-install-recommends \ + apt-get -o APT::Retries=3 update -y +RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ bc \ build-essential \ bzr \ From yann.morin.1998 at free.fr Tue Feb 7 17:22:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:22:08 +0100 Subject: [Buildroot] [PATCH 1/3] support/docker: update Debian distro to a newer tag/date In-Reply-To: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> References: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> Message-ID: <20230207172208.GL4124@scaer> Thomas, All, On 2023-02-07 17:31 +0100, Thomas Petazzoni via buildroot spake thusly: > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/docker/Dockerfile | 2 +- > support/docker/apt-sources.list | 8 ++++---- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile > index d775ae23e1..de1534e77a 100644 > --- a/support/docker/Dockerfile > +++ b/support/docker/Dockerfile > @@ -6,7 +6,7 @@ > # We use a specific tag for the base image *and* the corresponding date > # for the repository., so do not forget to update the apt-sources.list > # file that is shipped next to this Dockerfile. > -FROM debian:bullseye-20210902 > +FROM debian:bullseye-20230202 > > LABEL maintainer="Buildroot mailing list " \ > vendor="Buildroot" \ > diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list > index 0f872fd398..849996d9f7 100644 > --- a/support/docker/apt-sources.list > +++ b/support/docker/apt-sources.list > @@ -1,4 +1,4 @@ > -# Latest just before 20210817T000000Z: > -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main > -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20210902T193650Z/ bullseye-security main > -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main > +# Latest just before 20230207T102800Z: > +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye main > +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20230206T092119Z/ bullseye-security main > +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye-updates main > -- > 2.38.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 Tue Feb 7 17:23:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:23:15 +0100 Subject: [Buildroot] [PATCH 2/3] support/docker: use APT::Retries in apt-get calls to retry In-Reply-To: <20230207163119.292389-2-thomas.petazzoni@bootlin.com> References: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> <20230207163119.292389-2-thomas.petazzoni@bootlin.com> Message-ID: <20230207172315.GM4124@scaer> Thomas, All, On 2023-02-07 17:31 +0100, Thomas Petazzoni via buildroot spake thusly: > snapshot.debian.org is notoriously slow, and quite often leads to > timeouts when downloading packages. To give us a better chance of > succeeding, let's retry 3 times before failing. > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/docker/Dockerfile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile > index de1534e77a..a16c1e3849 100644 > --- a/support/docker/Dockerfile > +++ b/support/docker/Dockerfile > @@ -20,8 +20,8 @@ COPY apt-sources.list /etc/apt/sources.list > > # The container has no package lists, so need to update first > RUN dpkg --add-architecture i386 && \ > - apt-get update -y > -RUN apt-get install -y --no-install-recommends \ > + apt-get -o APT::Retries=3 update -y > +RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ > bc \ > build-essential \ > bzr \ > -- > 2.38.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 Tue Feb 7 17:23:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:23:42 +0100 Subject: [Buildroot] [PATCH 3/3] .gitlab-ci.yml: update Docker image to use In-Reply-To: <20230207163119.292389-3-thomas.petazzoni@bootlin.com> References: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> <20230207163119.292389-3-thomas.petazzoni@bootlin.com> Message-ID: <20230207172342.GN4124@scaer> Thomas, All, On 2023-02-07 17:31 +0100, Thomas Petazzoni via buildroot spake thusly: > We have a new Docker image, updated with the new requirements from > bcd15aa08aab1e8292b93995c44dc765a9801632 ("support/docker: add > python3-magic"), but also with an updated Debian Bullseye > installation. Let's use it. > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > .gitlab-ci.yml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index cad35c96bc..ed17bb14b9 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -1,7 +1,7 @@ > # Configuration for Gitlab-CI. > # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines > > -image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1756 > +image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123 > > stages: > - generate-gitlab-ci > -- > 2.38.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 Jason at zx2c4.com Tue Feb 7 17:23:45 2023 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Tue, 7 Feb 2023 18:23:45 +0100 Subject: [Buildroot] [PATCH v5] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220420170326.1901572-1-Jason@zx2c4.com> Message-ID: On Tue, Feb 07, 2023 at 04:06:16PM +0100, Arnout Vandecappelle wrote: > > > On 20/04/2022 19:03, Jason A. Donenfeld wrote: > > The RNG can't actually be seeded from a shell script, due to the > > reliance on ioctls. For this reason, Busybox now contains SeedRNG, a > > tiny program meant to be called at startup and shutdown (and at > > arbitrary other points in between if desired). > > > > Since this is currently in Busybox's git tree, this commit adds it as a > > patch to the Busybox package. Then, it wires the init script up to call > > it. > > > > This is a significant improvement over the current init script, which > > doesn't credit entropy and whose hashing in shell scripts is sort of > > fragile. > > > > NOTE NOTE NOTE: While I've added the patch to the Busybox package > > directory, I don't really know how to wire this up and what to do about > > the various config entries. I was hoping that a Buildroot maintainer > > might have a better idea of the best way to do this, and could just take > > this patch as a starting point for whatever the real commit winds up > > being. > > > > Signed-off-by: Jason A. Donenfeld > > Applied to master, after some reworking and heavily rewriting the commit > message, thanks. > > package/urandom-scripts: actually credit seed files via seedrng > > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, Busybox 1.36.0 contains SeedRNG, a > tiny program meant to be called at startup and shutdown (and at > arbitrary other points in between if desired). Note that initially, > the way seedrng was included in busybox broke things quite severely, but > now it's been reverted to a reasonably acceptable version. > > This is a significant improvement over the current init script, which > doesn't credit entropy and whose hashing in shell scripts is sort of > fragile. > > Because seedrng is part of busybox, urandom-scripts now depends on > BR2_PACKAGE_BUSYBOX. This can be removed again if later we add a > standalone seedrng package. > > Add a decent explanation to the init script about the need for a > persistent directory to make this actually work. > > Signed-off-by: Jason A. Donenfeld > [Arnout: > - Remove busybox patch, it's now part of busybox 1.36.0. > - Depend on busybox. > - Fix shellcheck errors. > - Use DAEMON and SEEDRNG_ARGS. > - Don't bother with "seed_dir" and "skip_credit" variables. > - Rename to S20seedrng. > ] > Signed-off-by: Arnout Vandecappelle Looks good. Thank you very much for following up and bringing this across the finish line! Jason From peter at korsgaard.com Tue Feb 7 17:24:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 18:24:10 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: silence gcc plugin test Message-ID: <20230207172450.921B78430F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fbd2f6d2cf26225f73f584c3a0cacb1b2476f5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The gcc plugin test was not using the -q option to grep causing it to print the line to stdout, so fix that. While we're at it, adjust the locale check to use grep -q instead of redirecting to /dev/null for consistency with the other checks. Signed-off-by: Peter Korsgaard --- 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 88eabe921d..0aa5e59274 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -194,7 +194,7 @@ if [ "${PATCH_MAJOR}" -lt 2 ] || [ "${PATCH_MAJOR}" -eq 2 -a "${PATCH_MINOR}" -l exit 1; fi -if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then +if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then if ! which locale > /dev/null ; then echo echo "You need locale support on your build machine to build a toolchain supporting locales" @@ -254,7 +254,7 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then fi fi -if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then +if grep -q ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then if ! echo "#include " | $HOSTCXX_NOCCACHE -I$($HOSTCXX_NOCCACHE -print-file-name=plugin)/include -x c++ -c - -o /dev/null ; then echo echo "Your Buildroot configuration needs a host compiler capable of building gcc plugins." From james.kent at orchestrated-technology.com Tue Feb 7 17:10:20 2023 From: james.kent at orchestrated-technology.com (James Kent) Date: Tue, 7 Feb 2023 17:10:20 +0000 Subject: [Buildroot] [PATCH] package/chrony: add default unprivileged user option Message-ID: <20230207171020.20194-1-james.kent@orchestrated-technology.com> Configurable option to define and enable by default an unprivileged user which the Chrony daemon will assume once initialised. Where libcap is not enabled a comment indicates the dependency requirement to make the option available. This option supports the good security practice of dropping elevated privileges for daemon runtime. Signed-off-by: James Kent --- package/chrony/Config.in | 10 ++++++++++ package/chrony/chrony.mk | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/package/chrony/Config.in b/package/chrony/Config.in index 158dc20530..8b053ed7e2 100644 --- a/package/chrony/Config.in +++ b/package/chrony/Config.in @@ -14,3 +14,13 @@ config BR2_PACKAGE_CHRONY_DEBUG_LOGGING Enable support for debug logging output from Chrony when enabled at runtime. If disabled, code for debug logging will not be compiled in. + +config BR2_PACKAGE_CHRONY_USER + bool "chrony default unprivileged user" + depends on BR2_PACKAGE_CHRONY && BR2_PACKAGE_LIBCAP + help + Define and enable default unprivileged user for the Chrony + daemon to run as. + +comment "chrony default unprivileged user requires libcap" + depends on BR2_PACKAGE_CHRONY && !BR2_PACKAGE_LIBCAP diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 379e95a778..16f8f082a3 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -21,6 +21,14 @@ CHRONY_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_LIBCAP),y) CHRONY_DEPENDENCIES += libcap + +ifeq ($(BR2_PACKAGE_CHRONY_USER),y) +CHRONY_CONF_OPTS += --with-user=chrony +define CHRONY_USERS + chrony -1 chrony -1 * /run/chrony - - Time daemon +endef +endif + else CHRONY_CONF_OPTS += --without-libcap endif -- 2.35.3 From yann.morin.1998 at free.fr Tue Feb 7 17:29:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:29:02 +0100 Subject: [Buildroot] [PATCH v2] package/python-orjson: disallow build when using musl. In-Reply-To: References: <20220509190650.1348657-2-gsmecher@threespeedlogic.com> <20220519160214.214701-1-gsmecher@threespeedlogic.com> <20230207163803.GI4124@scaer> Message-ID: <20230207172902.GO4124@scaer> Graeme, All, On 2023-02-07 09:14 -0800, Graeme Smecher spake thusly: > On 2023-02-07 08:38, Yann E. MORIN wrote: > >On 2022-05-19 09:02 -0700, Graeme Smecher spake thusly: > >>The python-orjson build bails as follows when using musl libc: > >I could not reproduce such an error wit the following defconfig: [--SNIP--] > This patch is obsolete. I used to receive orjson build failures > associated with musl on a regular basis - they have tapered off since > mid-2022. In the meantime, Thomas has bisected the resolution to that commit from James: 2cbf1e4d3a1a package/python-orjson: convert to use the python-package infrastructure The commit before, it fails to build; with that commit, the build succeeds. 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 thomas.petazzoni at bootlin.com Tue Feb 7 17:38:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:38:53 +0100 Subject: [Buildroot] [git commit] package/nfs-utils: handle pkg-config in the Autotools standard way for nfsrahead Message-ID: <20230207174831.EAF2D84323@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=700fc2d7bdb53d33368046840ea91c6c4e6b12b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master While using the correct PKG_CHECK_MODULES() approach for libmount we end up having host-nfs-utils needing libmount. But libmount is only needed by nfsrahead that we don't need in host-nfs-utils. But we need host-nfs-utils itself(rpcgen tool specifically) to build nfs-utils. To solve this recursive situation: 1) Update the first patch with the upstreamed one that handles libmount using PKG_CHECK_MODULES(). 2) Add another patch to allow to disable nfsrahead during building for host since this tool is not needed and requires libmount. This way the first patch approach can be correctly used. 3) Add --disable-nfsrahead to HOST_NFS_UTILS_CONF_OPTS 4) Remove en/disable-uuid since now it's required by default: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=c5528f40f9db5061e06dcf1f9b7fce5185b376c6 Both patches have been committed: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=627c95b2b853161b359095e7fdf05d3b07d51379 https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=844d3ad5376603bc9c205a6084d38a2d25146179 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...fsrahead-fix-linking-while-static-linking.patch | 41 ++++++++----- ...figure.ac-allow-to-disable-nfsrahead-tool.patch | 68 ++++++++++++++++++++++ package/nfs-utils/nfs-utils.mk | 7 +-- 3 files changed, 97 insertions(+), 19 deletions(-) diff --git a/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch b/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch index b8dcea63f7..e1d57f30cf 100644 --- a/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch +++ b/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch @@ -1,31 +1,46 @@ -From a69014a1b4e5b8068630abe3109f31eb64b6a076 Mon Sep 17 00:00:00 2001 +From d9abb221cea81dee5956bd987c6efa680c03571a Mon Sep 17 00:00:00 2001 From: Giulio Benetti -Date: Wed, 10 Aug 2022 00:10:51 +0200 +Date: Wed, 10 Aug 2022 23:38:17 +0200 Subject: [PATCH] nfsrahead: fix linking while static linking --lmount must preceed -lblkid and to obtain this let's add: -`pkg-config --libs mount` -in place of: -`-lmount` -This ways the library order will always be correct. +-lmount must preceed -lblkid and to obtain this let's add in configure.ac: +PKG_CHECK_MODULES([LIBMOUNT], [mount]) +and in tools/nfsrahead/Makefile.am let's substitute explicit `-lmount` +with: +$(LIBMOUNT_LIBS) +This way all the required libraries will be present and in the right order +when static linking. Signed-off-by: Giulio Benetti +[Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=627c95b2b853161b359095e7fdf05d3b07d51379] --- -Pending Upstream: -https://patchwork.kernel.org/project/linux-nfs/patch/20220809223308.1421081-1-giulio.benetti at benettiengineering.com/ ---- + configure.ac | 3 +++ tools/nfsrahead/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 2 files changed, 4 insertions(+), 1 deletion(-) +diff --git a/configure.ac b/configure.ac +index f1c46c5c..ff85200b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -273,6 +273,9 @@ AC_LIBCAP + dnl Check for -lxml2 + AC_LIBXML2 + ++dnl Check for -lmount ++PKG_CHECK_MODULES([LIBMOUNT], [mount]) ++ + # Check whether user wants TCP wrappers support + AC_TCP_WRAPPERS + diff --git a/tools/nfsrahead/Makefile.am b/tools/nfsrahead/Makefile.am -index 845ea0d5..280a2eb4 100644 +index 845ea0d5..7e08233a 100644 --- a/tools/nfsrahead/Makefile.am +++ b/tools/nfsrahead/Makefile.am @@ -1,6 +1,6 @@ libexec_PROGRAMS = nfsrahead nfsrahead_SOURCES = main.c -nfsrahead_LDFLAGS= -lmount -+nfsrahead_LDFLAGS= `pkg-config --libs mount` ++nfsrahead_LDFLAGS= $(LIBMOUNT_LIBS) nfsrahead_LDADD = ../../support/nfs/libnfsconf.la man5_MANS = nfsrahead.man diff --git a/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch b/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch new file mode 100644 index 0000000000..ee5e3fa251 --- /dev/null +++ b/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch @@ -0,0 +1,68 @@ +From 9a0002978eb32b78d22f053302e012a4255dc4ef Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 19 Sep 2022 23:43:28 +0200 +Subject: [PATCH] configure.ac: allow to disable nfsrahead tool + +This allows to make libmount not mandatory but depending on nfsrahead +since it only requires it. This is useful when cross-compiling because +in that case we need rpcgen only built for host but not nfsrahead that +also require libmount. So this reduces the dependencies for host +building. + +Signed-off-by: Giulio Benetti +[Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=844d3ad5376603bc9c205a6084d38a2d25146179] +--- + configure.ac | 13 ++++++++++--- + tools/Makefile.am | 6 +++++- + 2 files changed, 15 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ff85200b..5d9cbf31 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -249,6 +249,16 @@ AC_ARG_ENABLE(nfsdcld, + enable_nfsdcld=$enableval, + enable_nfsdcld="yes") + ++AC_ARG_ENABLE(nfsrahead, ++ [AS_HELP_STRING([--disable-nfsrahead],[disable nfsrahead command @<:@default=no@:>@])], ++ enable_nfsrahead=$enableval, ++ enable_nfsrahead="yes") ++ AM_CONDITIONAL(CONFIG_NFSRAHEAD, [test "$enable_nfsrahead" = "yes" ]) ++ if test "$enable_nfsrahead" = yes; then ++ dnl Check for -lmount ++ PKG_CHECK_MODULES([LIBMOUNT], [mount]) ++ fi ++ + AC_ARG_ENABLE(nfsdcltrack, + [AS_HELP_STRING([--disable-nfsdcltrack],[disable NFSv4 clientid tracking programs @<:@default=no@:>@])], + enable_nfsdcltrack=$enableval, +@@ -273,9 +283,6 @@ AC_LIBCAP + dnl Check for -lxml2 + AC_LIBXML2 + +-dnl Check for -lmount +-PKG_CHECK_MODULES([LIBMOUNT], [mount]) +- + # Check whether user wants TCP wrappers support + AC_TCP_WRAPPERS + +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 40c17c37..48fd0cdf 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -12,6 +12,10 @@ if CONFIG_NFSDCLD + OPTDIRS += nfsdclddb + endif + +-SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcctl nfsdclnts nfsrahead $(OPTDIRS) ++if CONFIG_NFSRAHEAD ++OPTDIRS += nfsrahead ++endif ++ ++SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcctl nfsdclnts $(OPTDIRS) + + MAINTAINERCLEANFILES = Makefile.in +-- +2.34.1 + diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index ed205a26b1..1a4a99f566 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -34,6 +34,7 @@ HOST_NFS_UTILS_CONF_OPTS = \ --without-tcp-wrappers \ --with-statedir=/run/nfs \ --disable-caps \ + --disable-nfsrahead \ --without-systemd \ --with-rpcgen=internal \ --with-tirpcinclude=$(HOST_DIR)/include/tirpc @@ -68,12 +69,6 @@ else NFS_UTILS_CONF_OPTS += --disable-caps endif -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) -NFS_UTILS_CONF_OPTS += --enable-uuid -else -NFS_UTILS_CONF_OPTS += --disable-uuid -endif - define NFS_UTILS_INSTALL_FIXUP cd $(TARGET_DIR) && rm -f $(NFS_UTILS_TARGETS_) touch $(TARGET_DIR)/etc/exports From thomas.petazzoni at bootlin.com Tue Feb 7 17:48:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:48:44 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: handle pkg-config in the Autotools standard way for nfsrahead In-Reply-To: <20220919224740.2365011-1-giulio.benetti@benettiengineering.com> References: <20220811224752.1a1e53b7@windsurf> <20220919224740.2365011-1-giulio.benetti@benettiengineering.com> Message-ID: <20230207184844.7a8dfa82@windsurf> On Tue, 20 Sep 2022 00:47:40 +0200 Giulio Benetti wrote: > While using the correct PKG_CHECK_MODULES() approach for libmount we end up > having host-nfs-utils needing libmount. But libmount is only needed by > nfsrahead that we don't need in host-nfs-utils. But we need host-nfs-utils > itself(rpcgen tool specifically) to build nfs-utils. To solve this > recursive situation: > 1) Update the first patch with the upstreamed one that handles libmount > using PKG_CHECK_MODULES(). > 2) Add another patch to allow to disable nfsrahead during building for host > since this tool is not needed and requires libmount. This way the first > patch approach can be correctly used. > 3) Add --disable-nfsrahead to HOST_NFS_UTILS_CONF_OPTS > 4) Remove en/disable-uuid since now it's required by default: > http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=c5528f40f9db5061e06dcf1f9b7fce5185b376c6 > > First patch has been committed: > https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=627c95b2b853161b359095e7fdf05d3b07d51379 > While the second one is pending: > https://lore.kernel.org/linux-nfs/20220919221832.2234294-1-giulio.benetti at benettiengineering.com/ > > Signed-off-by: Giulio Benetti > --- > ...ead-fix-linking-while-static-linking.patch | 39 ++++++++--- > ...e.ac-allow-to-disable-nfsrahead-tool.patch | 68 +++++++++++++++++++ > package/nfs-utils/nfs-utils.mk | 7 +- > 3 files changed, 97 insertions(+), 17 deletions(-) > create mode 100644 package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From angelo at amarulasolutions.com Tue Feb 7 17:51:16 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:51:16 +0100 Subject: [Buildroot] [PATCH v4] package/gtkiostream: new package Message-ID: <20230207175116.3043006-1-angelo@amarulasolutions.com> From: Matt Flax This package provides many useful software engineering and signal processing libraries. Signed-off-by: Matt Flax [Angelo: * Bumped to 1.8.0 * Added myself to DEVELOPERS * Added dependency on octave when enable instead of use --disable-octave configure option * Fixes from check-package] Signed-off-by: Angelo Compagnucci --- DEVELOPERS | 4 ++++ package/Config.in | 1 + package/gtkiostream/Config.in | 15 +++++++++++++++ package/gtkiostream/gtkiostream.hash | 3 +++ package/gtkiostream/gtkiostream.mk | 23 +++++++++++++++++++++++ 5 files changed, 46 insertions(+) create mode 100644 package/gtkiostream/Config.in create mode 100644 package/gtkiostream/gtkiostream.hash create mode 100644 package/gtkiostream/gtkiostream.mk diff --git a/DEVELOPERS b/DEVELOPERS index d7c4d03c4c..5355d6d5ac 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -165,6 +165,7 @@ F: package/cups/ F: package/cups-filters/ F: package/fail2ban/ F: package/grep/ +F: package/gtkiostream/ F: package/htpdate/ F: package/i2c-tools/ F: package/jq/ @@ -1978,6 +1979,9 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ +N: Matt Flax +F: package/gtkiostream/ + N: Matt Weber F: board/freescale/p* F: board/freescale/t* diff --git a/package/Config.in b/package/Config.in index 06d0a05854..70e446be47 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1389,6 +1389,7 @@ menu "Audio/Sound" source "package/bcg729/Config.in" source "package/caps/Config.in" source "package/fdk-aac/Config.in" + source "package/gtkiostream/Config.in" source "package/libao/Config.in" source "package/libasplib/Config.in" source "package/libbroadvoice/Config.in" diff --git a/package/gtkiostream/Config.in b/package/gtkiostream/Config.in new file mode 100644 index 0000000000..bb97961587 --- /dev/null +++ b/package/gtkiostream/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_GTKIOSTREAM + bool "gtkiostream" + depends on BR2_INSTALL_LIBSTDCPP # eigen + select BR2_PACKAGE_EIGEN + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_DOUBLE + select BR2_PACKAGE_FFTW_SINGLE + help + This package provides many useful software engineering and + signal processing includes and linkable library. + + https://github.com/flatmax/gtkiostream + +comment "gtkiostream needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/gtkiostream/gtkiostream.hash b/package/gtkiostream/gtkiostream.hash new file mode 100644 index 0000000000..90c754f48c --- /dev/null +++ b/package/gtkiostream/gtkiostream.hash @@ -0,0 +1,3 @@ +# locally computed hash +sha256 44e8d921d462005cd330a1c24e5bd8061175b90ae53f537dbf73f59b74f6e01b gtkiostream-v1.8.0.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 gpl.txt diff --git a/package/gtkiostream/gtkiostream.mk b/package/gtkiostream/gtkiostream.mk new file mode 100644 index 0000000000..3988ae5888 --- /dev/null +++ b/package/gtkiostream/gtkiostream.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# GTKIOSTREAM +# +################################################################################ + +GTKIOSTREAM_VERSION = v1.8.0 +GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,$(GTKIOSTREAM_VERSION)) +GTKIOSTREAM_LICENSE = GPL-2.0+ +GTKIOSTREAM_LICENSE_FILES = gpl.txt +GTKIOSTREAM_DEPENDENCIES = eigen fftw-double fftw-single host-pkgconf + +ifeq ($(BR2_PACKAGE_OCTAVE),y) +GTKIOSTREAM_DEPENDENCIES += octave +GTKIOSTREAM_CONF_OPTS = --enable-octave +else +GTKIOSTREAM_CONF_OPTS = --disable-octave +endif + +# configure script not available +GTKIOSTREAM_AUTORECONF = YES + +$(eval $(autotools-package)) -- 2.25.1 From gsmecher at threespeedlogic.com Tue Feb 7 17:56:54 2023 From: gsmecher at threespeedlogic.com (Graeme Smecher) Date: Tue, 7 Feb 2023 09:56:54 -0800 Subject: [Buildroot] [PATCH v2] package/python-orjson: disallow build when using musl. In-Reply-To: <20230207172902.GO4124@scaer> References: <20220509190650.1348657-2-gsmecher@threespeedlogic.com> <20220519160214.214701-1-gsmecher@threespeedlogic.com> <20230207163803.GI4124@scaer> <20230207172902.GO4124@scaer> Message-ID: Hi Yann, On 2023-02-07 09:29, Yann E. MORIN wrote: > Graeme, All, > > On 2023-02-07 09:14 -0800, Graeme Smecher spake thusly: >> On 2023-02-07 08:38, Yann E. MORIN wrote: >>> On 2022-05-19 09:02 -0700, Graeme Smecher spake thusly: >>>> The python-orjson build bails as follows when using musl libc: >>> I could not reproduce such an error wit the following defconfig: > [--SNIP--] >> This patch is obsolete. I used to receive orjson build failures >> associated with musl on a regular basis - they have tapered off since >> mid-2022. > > In the meantime, Thomas has bisected the resolution to that commit from > James: > > 2cbf1e4d3a1a package/python-orjson: convert to use the python-package infrastructure > > The commit before, it fails to build; with that commit, the build > succeeds. Excellent - two birds, one stone. Thanks again for all your work. best, Graeme From arnout at mind.be Tue Feb 7 17:58:01 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 18:58:01 +0100 Subject: [Buildroot] [PATCH v8 3/4] package/systemd: support dnssec if openssl is available In-Reply-To: <20230115114840.9027-3-nolange79@gmail.com> References: <20230115114840.9027-1-nolange79@gmail.com> <20230115114840.9027-3-nolange79@gmail.com> Message-ID: <06c65863-83a5-6002-5a06-56c41611699d@mind.be> On 15/01/2023 12:48, Norbert Lange wrote: > Set -Ddefault-dnssec=allow-downgrade if openssl is available as both > openssl and gcrypt are now supported for dnssec. > > Signed-off-by: Norbert Lange > Reviewed-by: James Hilliard Applied to master, thanks. (Still not pushed - systemd runtime tests are failing locally, I'm trying to see if this was already the case before the version bump.) Regards, Arnout > > --- > v6->v7: > > * split off as its own patch > * seems that the change was done at v250 or earlier > --- > package/systemd/systemd.mk | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index f49d34d32f..297cc400ee 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -246,9 +246,9 @@ endif > > ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > SYSTEMD_DEPENDENCIES += libgcrypt > -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade -Dgcrypt=true > +SYSTEMD_CONF_OPTS += -Dgcrypt=true > else > -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no -Dgcrypt=false > +SYSTEMD_CONF_OPTS += -Dgcrypt=false > endif > > ifeq ($(BR2_PACKAGE_P11_KIT),y) > @@ -318,6 +318,12 @@ else > SYSTEMD_CONF_OPTS += -Dselinux=false > endif > > +ifneq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_LIBOPENSSL),) > +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade > +else > +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no > +endif > + > ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) > SYSTEMD_CONF_OPTS += -Dhwdb=true > define SYSTEMD_BUILD_HWDB From romain.naour at smile.fr Tue Feb 7 18:04:23 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 19:04:23 +0100 Subject: [Buildroot] [PATCH v4] package/gtkiostream: new package In-Reply-To: <20230207175116.3043006-1-angelo@amarulasolutions.com> References: <20230207175116.3043006-1-angelo@amarulasolutions.com> Message-ID: <51fbd11a-26ef-78fa-3ced-61648adc5a9f@smile.fr> Hello Angelo, Le 07/02/2023 ? 18:51, Angelo Compagnucci a ?crit?: > From: Matt Flax > > This package provides many useful software engineering and signal > processing libraries. > > Signed-off-by: Matt Flax > [Angelo: > * Bumped to 1.8.0 > * Added myself to DEVELOPERS > * Added dependency on octave when enable instead of use > --disable-octave configure option > * Fixes from check-package] > Signed-off-by: Angelo Compagnucci > --- > DEVELOPERS | 4 ++++ > package/Config.in | 1 + > package/gtkiostream/Config.in | 15 +++++++++++++++ > package/gtkiostream/gtkiostream.hash | 3 +++ > package/gtkiostream/gtkiostream.mk | 23 +++++++++++++++++++++++ > 5 files changed, 46 insertions(+) > create mode 100644 package/gtkiostream/Config.in > create mode 100644 package/gtkiostream/gtkiostream.hash > create mode 100644 package/gtkiostream/gtkiostream.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index d7c4d03c4c..5355d6d5ac 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -165,6 +165,7 @@ F: package/cups/ > F: package/cups-filters/ > F: package/fail2ban/ > F: package/grep/ > +F: package/gtkiostream/ > F: package/htpdate/ > F: package/i2c-tools/ > F: package/jq/ > @@ -1978,6 +1979,9 @@ F: board/technologic/ts4900/ > F: configs/ts4900_defconfig > F: package/ts4900-fpga/ > > +N: Matt Flax > +F: package/gtkiostream/ > + > N: Matt Weber > F: board/freescale/p* > F: board/freescale/t* > diff --git a/package/Config.in b/package/Config.in > index 06d0a05854..70e446be47 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1389,6 +1389,7 @@ menu "Audio/Sound" > source "package/bcg729/Config.in" > source "package/caps/Config.in" > source "package/fdk-aac/Config.in" > + source "package/gtkiostream/Config.in" > source "package/libao/Config.in" > source "package/libasplib/Config.in" > source "package/libbroadvoice/Config.in" > diff --git a/package/gtkiostream/Config.in b/package/gtkiostream/Config.in > new file mode 100644 > index 0000000000..bb97961587 > --- /dev/null > +++ b/package/gtkiostream/Config.in > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_GTKIOSTREAM > + bool "gtkiostream" > + depends on BR2_INSTALL_LIBSTDCPP # eigen > + select BR2_PACKAGE_EIGEN > + select BR2_PACKAGE_FFTW > + select BR2_PACKAGE_FFTW_DOUBLE > + select BR2_PACKAGE_FFTW_SINGLE > + help > + This package provides many useful software engineering and > + signal processing includes and linkable library. > + > + https://github.com/flatmax/gtkiostream > + > +comment "gtkiostream needs a toolchain w/ C++" > + depends on !BR2_INSTALL_LIBSTDCPP > diff --git a/package/gtkiostream/gtkiostream.hash b/package/gtkiostream/gtkiostream.hash > new file mode 100644 > index 0000000000..90c754f48c > --- /dev/null > +++ b/package/gtkiostream/gtkiostream.hash > @@ -0,0 +1,3 @@ > +# locally computed hash > +sha256 44e8d921d462005cd330a1c24e5bd8061175b90ae53f537dbf73f59b74f6e01b gtkiostream-v1.8.0.tar.gz > +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 gpl.txt > diff --git a/package/gtkiostream/gtkiostream.mk b/package/gtkiostream/gtkiostream.mk > new file mode 100644 > index 0000000000..3988ae5888 > --- /dev/null > +++ b/package/gtkiostream/gtkiostream.mk > @@ -0,0 +1,23 @@ > +################################################################################ > +# > +# GTKIOSTREAM > +# > +################################################################################ > + > +GTKIOSTREAM_VERSION = v1.8.0 > +GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,$(GTKIOSTREAM_VERSION)) > +GTKIOSTREAM_LICENSE = GPL-2.0+ > +GTKIOSTREAM_LICENSE_FILES = gpl.txt > +GTKIOSTREAM_DEPENDENCIES = eigen fftw-double fftw-single host-pkgconf > + It always useful to use distribution packaging to find any missing dependencies (mentatory or optional) like gtk2 (hence the package name :) ) https://github.com/flatmax/gtkiostream/blob/master/debian/control#L14 Can you double check ? > +ifeq ($(BR2_PACKAGE_OCTAVE),y) > +GTKIOSTREAM_DEPENDENCIES += octave > +GTKIOSTREAM_CONF_OPTS = --enable-octave This trigger a checkpackage warning: package/gtkiostream/gtkiostream.mk:15: conditional override of variable GTKIOSTREAM_CONF_OPTS Best regards, Romain > +else > +GTKIOSTREAM_CONF_OPTS = --disable-octave > +endif > + > +# configure script not available > +GTKIOSTREAM_AUTORECONF = YES > + > +$(eval $(autotools-package)) From nolange79 at gmail.com Tue Feb 7 18:38:15 2023 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 7 Feb 2023 19:38:15 +0100 Subject: [Buildroot] [PATCH v8 1/4] package/systemd: bump to version 252.4 In-Reply-To: <6490dfd6-5f3b-3801-6955-7fa655f2a82b@mind.be> References: <20230115114840.9027-1-nolange79@gmail.com> <6490dfd6-5f3b-3801-6955-7fa655f2a82b@mind.be> Message-ID: Am Di., 7. Feb. 2023 um 17:41 Uhr schrieb Arnout Vandecappelle : > > > > On 15/01/2023 12:48, Norbert Lange wrote: > > Following files changed *license* from CC0-1.0 to MIT-0: > > > > - src/systemctl/systemd-sysv-install.SKELETON > > - config files > > - examples under /network > > > > The file LICENSES/MIT-0.txt has been added for this reason, > > hashes added, corrected for LICENSES/README.md. > > > > Kernel version 3.15 is now the bare minimum, but only > > version 4.15 and higher are fully supported and tested: > > > > - bump kernel header dependencies > > - correct kconfig description > > - improvements to make the kconfig description better reflect > > the information from the README > > > > Remove upstreamed patch. > > This is not actually done in this v8, probably left over from some earlier > version. possibly lost when rebasing > > > > > Set new options to their default, remove -Defi-cc option. > > > > Set -Ddbus=false to ensure dbus dependency is runtime only. > > > > Set -Ddbus-interfaces-dir=no as interface XML file generation is > > not supported when cross compiling. > > I guess we could set this to yes for host-systemd, then copy the XML files to > target. But they probably depend to some extent on the configuration, and it > adds a lot to build time, and I doubt it is very useful to begin with... Dont know what they are used for, outside of dev tools > > > > > Set -Ddefault-user-shell=/bin/sh to the always available shell. > > > > Signed-off-by: Norbert Lange > > Reviewed-by: James Hilliard > > [snip] > > --- > > > > License diff for illustration > > > > --- systemd-stable-250.4/LICENSES/README.md > > +++ systemd-stable-252.1/LICENSES/README.md > > @@ -45,9 +45,11 @@ > > * the following sources are licensed under the **CC0-1.0** license: > > - src/basic/siphash24.c > > - src/basic/siphash24.h > > - - src/systemctl/systemd-sysv-install.SKELETON > > - tools/check-includes.pl > > + * the following sources are licensed under the **MIT-0** license: > > - all examples under man/ > > + - src/systemctl/systemd-sysv-install.SKELETON > > + - config files and examples under /network > > * the following sources are under **Public Domain** (LicenseRef-murmurhash2-public-domain): > > - src/basic/MurmurHash2.c > > - src/basic/MurmurHash2.h > > Very nice that you include this! However, git-am (and patchwork) interpret > this as a hunk of the overall patch, so it fails and I had to manually adapt. In > the future, please prefix with a space or something to avoid that. Ok, but I probably forget it till I the next time, my git commit message scheme is a fuzzy copy of stuff I seen. > > Applied to master, thanks. (Not pushed yet, I may make more changes while > reviewing the rest of the series.) Wouldnt mind if you do a stealthy bump to 254.5 before going through all testing trouble ;) Regards, Norbert > > Regards, > Arnout > > > > > package/systemd: 252.4 > > --- > > package/systemd/Config.in | 12 +++++++++--- > > package/systemd/systemd.hash | 5 +++-- > > package/systemd/systemd.mk | 16 ++++++++++++++-- > > system/Config.in | 6 +++--- > > 4 files changed, 29 insertions(+), 10 deletions(-) > > > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > > index 45a9e2d644..f35305c0be 100644 > > --- a/package/systemd/Config.in > > +++ b/package/systemd/Config.in > > @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > > depends on !BR2_STATIC_LIBS # kmod > > depends on BR2_TOOLCHAIN_USES_GLIBC > > depends on BR2_TOOLCHAIN_HAS_SSP > > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 > > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 > > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > > depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd > > select BR2_PACKAGE_HAS_UDEV > > @@ -51,7 +51,11 @@ menuconfig BR2_PACKAGE_SYSTEMD > > an elaborate transactional dependency-based service control > > logic. It can work as a drop-in replacement for sysvinit. > > > > - Systemd requires a Linux kernel >= 3.13 with the following > > + Kernel versions below 4.15 ("recommended baseline") have > > + significant gaps in functionality and are not recommended > > + for use with this version of systemd. > > + > > + Systemd requires a Linux kernel >= 3.15 with the following > > options enabled: > > > > - CONFIG_DEVTMPFS > > @@ -66,9 +70,11 @@ menuconfig BR2_PACKAGE_SYSTEMD > > - CONFIG_PROC_FS > > - CONFIG_FHANDLE (libudev, mount and bind mount handling) > > > > - - CONFIG_NET_NS (needed by PrivateNetwork=, used in some > > + - CONFIG_NET_NS (Required for PrivateNetwork=, used in some > > systemd units) > > > > + - CONFIG_USER_NS (Required for PrivateUsers=) > > + > > - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS > > - CONFIG_TMPFS_POSIX_ACL > > - CONFIG_TMPFS_XATTR > > diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash > > index 3b98566f32..00c08edcd9 100644 > > --- a/package/systemd/systemd.hash > > +++ b/package/systemd/systemd.hash > > @@ -1,5 +1,5 @@ > > # sha256 locally computed > > -sha256 638a2fc78828765fc97bc73f428205b6dc1d359149b6c6bfe4d2a649cba2cca8 systemd-250.8.tar.gz > > +sha256 cf2d27e67663d599a045101c7178cf0ec63d9df2962a54adf7de0d0357724f00 systemd-252.4.tar.gz > > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 > > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 > > sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt > > @@ -8,7 +8,8 @@ sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENS > > sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 LICENSES/LGPL-2.0-or-later.txt > > sha256 5bcef4fedbfc08776630e65d5d0d074dd31208037eddb167ca46a9ec4f737764 LICENSES/Linux-syscall-note.txt > > sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENSES/lookup3-public-domain.txt > > +sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENSES/MIT-0.txt > > sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt > > sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt > > sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt > > -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md > > +sha256 da9b2c7b8cd10516fd2c4279b82496ea61787148f13e899c62fc8988c5fac34f LICENSES/README.md > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index b96873b73f..b0597f9bb4 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.8 > > +SYSTEMD_VERSION = 252.4 > > SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) > > SYSTEMD_LICENSE = \ > > LGPL-2.1+, \ > > @@ -29,6 +29,7 @@ SYSTEMD_LICENSE = \ > > BSD-3-Clause (tools/chromiumos), \ > > CC0-1.0 (few source files, see LICENSES/README.md), \ > > GPL-2.0 with Linux-syscall-note (linux kernel headers), \ > > + MIT-0 (few source files, see LICENSES/README.md), \ > > MIT (few source files, see LICENSES/README.md), \ > > OFL-1.1 (Heebo fonts) > > SYSTEMD_LICENSE_FILES = \ > > @@ -40,6 +41,7 @@ SYSTEMD_LICENSE_FILES = \ > > LICENSES/LGPL-2.0-or-later.txt \ > > LICENSES/Linux-syscall-note.txt \ > > LICENSES/lookup3-public-domain.txt \ > > + LICENSES/MIT-0.txt \ > > LICENSES/MIT.txt \ > > LICENSES/murmurhash2-public-domain.txt \ > > LICENSES/OFL-1.1.txt \ > > @@ -61,7 +63,13 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg > > SYSTEMD_PROVIDES = udev > > > > SYSTEMD_CONF_OPTS += \ > > + -Ddbus=false \ > > + -Ddbus-interfaces-dir=no \ > > + -Ddefault-compression='auto' \ > > -Ddefault-hierarchy=unified \ > > + -Ddefault-locale='C.UTF-8' \ > > + -Ddefault-user-shell=/bin/sh \ > > + -Dfirst-boot-full-preset=false \ > > -Didn=true \ > > -Dima=false \ > > -Dkexec-path=/usr/sbin/kexec \ > > @@ -72,6 +80,7 @@ SYSTEMD_CONF_OPTS += \ > > -Dman=false \ > > -Dmount-path=/usr/bin/mount \ > > -Dmode=release \ > > + -Dnspawn-locale='C.UTF-8' \ > > -Dnss-systemd=true \ > > -Dquotacheck-path=/usr/sbin/quotacheck \ > > -Dquotaon-path=/usr/sbin/quotaon \ > > @@ -82,6 +91,7 @@ SYSTEMD_CONF_OPTS += \ > > -Dsulogin-path=/usr/sbin/sulogin \ > > -Dsystem-gid-max=999 \ > > -Dsystem-uid-max=999 \ > > + -Dsysupdate=false \ > > -Dsysvinit-path= \ > > -Dsysvrcnd-path= \ > > -Dtelinit-path= \ > > @@ -553,7 +563,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi > > SYSTEMD_CONF_OPTS += \ > > -Defi=true \ > > -Dgnu-efi=true \ > > - -Defi-cc=$(TARGET_CC) \ > > -Defi-ld=bfd \ > > -Defi-libdir=$(STAGING_DIR)/usr/lib \ > > -Defi-includedir=$(STAGING_DIR)/usr/include/efi > > @@ -793,6 +802,8 @@ HOST_SYSTEMD_CONF_OPTS = \ > > -Dbinfmt=false \ > > -Drepart=false \ > > -Dcoredump=false \ > > + -Ddbus=false \ > > + -Ddbus-interfaces-dir=no \ > > -Dpstore=false \ > > -Doomd=false \ > > -Dlogind=false \ > > @@ -801,6 +812,7 @@ HOST_SYSTEMD_CONF_OPTS = \ > > -Dmachined=false \ > > -Dportabled=false \ > > -Dsysext=false \ > > + -Dsysupdate=false \ > > -Duserdb=false \ > > -Dhomed=false \ > > -Dnetworkd=false \ > > diff --git a/system/Config.in b/system/Config.in > > index 806a747315..232bdfe763 100644 > > --- a/system/Config.in > > +++ b/system/Config.in > > @@ -125,19 +125,19 @@ config BR2_INIT_SYSTEMD > > depends on BR2_TOOLCHAIN_USES_GLIBC > > depends on BR2_TOOLCHAIN_HAS_SSP > > depends on BR2_TOOLCHAIN_HAS_THREADS > > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 > > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 > > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > > depends on BR2_HOST_GCC_AT_LEAST_5 > > select BR2_ROOTFS_MERGED_USR > > select BR2_PACKAGE_SYSTEMD > > select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT > > > > -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5" > > +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" > > depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS > > depends on BR2_USE_MMU > > depends on !BR2_TOOLCHAIN_USES_GLIBC || \ > > !BR2_TOOLCHAIN_HAS_SSP || \ > > - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || \ > > + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ > > !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ > > !BR2_HOST_GCC_AT_LEAST_5 > > From nolange79 at gmail.com Tue Feb 7 18:42:23 2023 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 7 Feb 2023 19:42:23 +0100 Subject: [Buildroot] [PATCH v8 2/4] package/systemd: Add config option for sysupdate feature In-Reply-To: <65c21c58-0a25-50b0-0e35-f8b4da7abac3@mind.be> References: <20230115114840.9027-1-nolange79@gmail.com> <20230115114840.9027-2-nolange79@gmail.com> <65c21c58-0a25-50b0-0e35-f8b4da7abac3@mind.be> Message-ID: Am Di., 7. Feb. 2023 um 18:16 Uhr schrieb Arnout Vandecappelle : > > > > On 15/01/2023 12:48, Norbert Lange wrote: > > Support the new feature added with v251, > > requires openssl. > > > > Signed-off-by: Norbert Lange > > Reviewed-by: James Hilliard > > --- > > package/systemd/Config.in | 12 ++++++++++++ > > package/systemd/systemd.mk | 7 ++++++- > > 2 files changed, 18 insertions(+), 1 deletion(-) > > > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > > index f35305c0be..9278772951 100644 > > --- a/package/systemd/Config.in > > +++ b/package/systemd/Config.in > > @@ -481,6 +481,18 @@ config BR2_PACKAGE_SYSTEMD_SYSEXT > > > > https://www.freedesktop.org/software/systemd/man/systemd-sysext.html > > > > +config BR2_PACKAGE_SYSTEMD_SYSUPDATE > > + bool "enable sysupdate support" > > + select BR2_PACKAGE_OPENSSL > > + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL > > + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK > > AFAIU, sysupdate uses its own particular way of doing A/B updates (by updating > the GPT partition table) which is only supported by systemd-boot. Although I > suppose it's possible to write a U-Boot script that does the same thing... So I > added a note here to that effect. I don't suppose you actually used this option? I dont think thats the case, there is only some way of measuring successfull boots, sysupdate is just a part of the puzzle, you will have to do some additional work for sure. No, I havent used it. > > > Applied to master, thanks. > > Regards, > Arnout Regards, Norbert > > > > + help > > + systemd-sysupdate atomically updates the host OS, container > > + images, portable service images or other sources, based on > > + the transfer configuration files described in sysupdate.d. > > + > > + https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html > > + > > config BR2_PACKAGE_SYSTEMD_SYSUSERS > > bool "enable sysusers support" > > help > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index b0597f9bb4..f49d34d32f 100644 > > --- a/package/systemd/systemd.mk > > +++ b/package/systemd/systemd.mk > > @@ -91,7 +91,6 @@ SYSTEMD_CONF_OPTS += \ > > -Dsulogin-path=/usr/sbin/sulogin \ > > -Dsystem-gid-max=999 \ > > -Dsystem-uid-max=999 \ > > - -Dsysupdate=false \ > > -Dsysvinit-path= \ > > -Dsysvrcnd-path= \ > > -Dtelinit-path= \ > > @@ -489,6 +488,12 @@ else > > SYSTEMD_CONF_OPTS += -Dsysext=false > > endif > > > > +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) > > +SYSTEMD_CONF_OPTS += -Dsysupdate=true > > +else > > +SYSTEMD_CONF_OPTS += -Dsysupdate=false > > +endif > > + > > ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) > > SYSTEMD_CONF_OPTS += -Dnetworkd=true > > SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management From john at metanate.com Tue Feb 7 19:58:10 2023 From: john at metanate.com (John Keeping) Date: Tue, 7 Feb 2023 19:58:10 +0000 Subject: [Buildroot] [PATCH v2] package/gcc: map debug prefix when reproducible Message-ID: <20230207195810.2016594-1-john@metanate.com> When building with BR2_REPRODUCIBLE the toolchain wrapper passes -fdebug-prefix-map for all packages that are built. But this doesn't affect the target libraries (like libgcc) built by GCC's build system. GCC 4.3 added a configure option to set the debug prefix map for these libraries, which is used here to avoid encoding potentially non-reproducible build paths into the debug data. Signed-off-by: John Keeping --- Changes since v1: - Add the option to GCC common config, not just gcc-final package/gcc/gcc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index ec6f3b550a..6dfd93f2a4 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -84,6 +84,10 @@ HOST_GCC_COMMON_CONF_OPTS = \ --with-bugurl="http://bugs.buildroot.net/" \ --without-zstd +ifeq ($(BR2_REPRODUCIBLE),y) +HOST_GCC_COMMON_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot +endif + # Don't build documentation. It takes up extra space / build time, # and sometimes needs specific makeinfo versions to work HOST_GCC_COMMON_CONF_ENV = \ -- 2.39.1 From john at metanate.com Tue Feb 7 20:05:17 2023 From: john at metanate.com (John Keeping) Date: Tue, 7 Feb 2023 20:05:17 +0000 Subject: [Buildroot] [PATCH] package/gcc/gcc-final: map debug prefix when reproducible In-Reply-To: <20230207135503.GF4124@scaer> References: <20230206162617.1907911-1-john@metanate.com> <20230207135503.GF4124@scaer> Message-ID: Hi Yann, On Tue, Feb 07, 2023 at 02:55:03PM +0100, Yann E. MORIN wrote: > On 2023-02-06 16:26 +0000, John Keeping spake thusly: > > When building with BR2_REPRODUCIBLE the toolchain wrapper passes > > -fdebug-prefix-map for all packages that are built. But this doesn't > > affect the target libraries (like libgcc) built by GCC's build system. > > > > GCC 4.3 added a configure option to set the debug prefix map for these > > libraries, which is used here to avoid encoding potentially > > non-reproducible build paths into the debug data. > > Thanks, this is indeed very interesting. We (briefly) discussed this at > the developers day minutes ago, and the question that was brought up > was: why is not needed for the first-stage compiler? > > Indeed, the first-stage compiler builds objects files that are then used > by the C library, we would expect the debug symbols for those to also > need prefix mapping. > > Could you look into that, and either pass the option to both the initial > and final gcc if needed, or explain in the commit log why it is not > needed for the initial gcc, please? I've just sent v2 which moves this to HOST_GCC_COMMON_CONF_OPTS. You're right that some files are affected by the initial compiler - I missed it by focusing on executables (nearly all of which link libgcc.a) when the initial compiler only affects some of glibc's shared objects. I've been testing this with --enable-linker-build-id in the configure options as well to see whether it's possible to enable build IDs for reproducible builds and this change gets a lot closer - the differences are now a handful of files that embed an RPATH pointing to .libs during the build. John From flaniel at linux.microsoft.com Tue Feb 7 20:10:08 2023 From: flaniel at linux.microsoft.com (Francis Laniel) Date: Tue, 07 Feb 2023 21:10:08 +0100 Subject: [Buildroot] [PATCH] package/libbpf: Don't remove bpf.h on host In-Reply-To: References: Message-ID: <12146851.O9o76ZdvQC@pwmachine> Hi. Le lundi 28 novembre 2022, 16:06:20 CET Lang Daniel a ?crit : > libbpf >1.0.0 defines libbpf_bpf_link_type_str(enum bpf_link_type) in > src/libbpf.h, which is included by host-pahole. > bpf_link_type is defined in linux/bpf.h, therefore the comment stating > that pahole doesn't need bpf.h is no longer valid. > > Fixes: > - > http://autobuild.buildroot.net/results/d126a4b6eca786402dc362c86f8df3addec3 > d217/ > > Signed-off-by: Daniel Lang > --- > I wasn't able to reproduce the mentioned compile error in the kernel. > The mentioned file (tools/lib/bpf/strset.c) shouldn't be compiled when > compiling the kernel as it would recompile libbpf. > --- > package/libbpf/libbpf.mk | 17 +---------------- > 1 file changed, 1 insertion(+), 16 deletions(-) > > diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk > index 820f1dc4bf..0381fd833a 100644 > --- a/package/libbpf/libbpf.mk > +++ b/package/libbpf/libbpf.mk > @@ -39,26 +39,11 @@ define LIBBPF_INSTALL_TARGET_CMDS > -C $(@D)/src install DESTDIR=$(TARGET_DIR) > endef > > -# We need to install_uapi_headers so we have btf.h to compile > -# host-pahole. > -# Nonetheless, this target adds bpf.h which generates a conflict when > -# building the kernel: > -# In file included from libbpf_internal.h:17:0, from strset.c:9: > -# relo_core.h:10:6: error: nested redefinition of 'enum bpf_core_relo_kind' > -# enum bpf_core_relo_kind { > -# ^~~~~~~~~~~~~~~~~~ > -# relo_core.h:10:6: error: redeclaration of 'enum bpf_core_relo_kind' > -# In file included from libbpf_legacy.h:13:0, > -# from libbpf_internal.h:16, > -# from strset.c:9: > -# /home/francis/buildroot/output/host/include/linux/bpf.h:6497:6: note: > originally defined here -# enum bpf_core_relo_kind { > -# So, better to remove remove it now since we do not need it to build > +# We need to install_uapi_headers so we have bpf.h and btf.h to compile > # host-pahole, the only user of host-libbpf. > define HOST_LIBBPF_INSTALL_CMDS > $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ > -C $(@D)/src install install_uapi_headers DESTDIR=$(HOST_DIR) > - rm $(HOST_DIR)/include/linux/bpf.h > endef > > $(eval $(generic-package)) Thank you for this patch and sorry for my very late reply. Sadly, I do not think the patch addresses the underlying issue. Indeed, this is not pahole which does not need this file, as pahole relies on to be built. So, the whole point of this comment and the rm is to avoid a problem when building the kernel when pahole was built before. Sadly, I tested your patch and I hit the problem described in the comment regarding redefinition of bpf_core_relo_kind. Did you also hit it or you were able to build the kernel with BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE? Best regards and thank you in advance. From angelo at amarulasolutions.com Tue Feb 7 20:50:41 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 21:50:41 +0100 Subject: [Buildroot] [PATCH v4] package/gtkiostream: new package In-Reply-To: <46eeb5ff-ea1e-acdd-3ab8-3dc945c9fa40@flatmax.com> References: <20230207175116.3043006-1-angelo@amarulasolutions.com> <51fbd11a-26ef-78fa-3ced-61648adc5a9f@smile.fr> <46eeb5ff-ea1e-acdd-3ab8-3dc945c9fa40@flatmax.com> Message-ID: On Tue, Feb 7, 2023 at 9:47 PM Matt Flax wrote: > > On 8/2/23 05:04, Romain Naour wrote: > > Hello Angelo, > > > > Le 07/02/2023 ? 18:51, Angelo Compagnucci a ?crit : > > It always useful to use distribution packaging to find any missing > dependencies > > (mentatory or optional) like gtk2 (hence the package name :) ) > > > > https://github.com/flatmax/gtkiostream/blob/master/debian/control#L14 > > > > Can you double check ? > > > Hey all, great to see my original patch revitalised after many many > months - I am keen for gtkiostream to be absorbed into buildroot. > > gtk2 and gtk3 are optional with this library - despite its name - it is > really now focused on signal processing, ALSA C++, neural networks, > software engineering, etc.. The gtk side of things works nicely with > gtk2 but requires attention for gtk3 - I originally opted to leave > gtk2/3 out entirely in buildroot - I think it is the best solution for now. > Thanks Matt for the very clear explanation, I was about to reply gtk is optional. Even more because it requires the addition of libgtkdatabox which is actually not present in buildroot. Looking at the code, It's not clear if opencv or sox are really that necessary without a gui, but I think we could leave them out. -- 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 Tue Feb 7 21:09:34 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 22:09:34 +0100 Subject: [Buildroot] [PATCH v5] package/gtkiostream: new package Message-ID: <20230207210934.3132539-1-angelo@amarulasolutions.com> From: Matt Flax This package provides many useful software engineering and signal processing libraries. The package offer also a GUI written in GTK which requires several missing packages and therefore is left disabled. Signed-off-by: Matt Flax Signed-off-by: Angelo Compagnucci --- v4: * Bumped to 1.8.0 * Added myself to DEVELOPERS * Added dependency on octave when enable instead of use --disable-octave configure option * Fixes from check-package v5: * Fixed wrong syntax (Romain) * Added optional dependency on sox (Matt) DEVELOPERS | 4 ++++ package/Config.in | 1 + package/gtkiostream/Config.in | 15 +++++++++++++++ package/gtkiostream/gtkiostream.hash | 3 +++ package/gtkiostream/gtkiostream.mk | 25 +++++++++++++++++++++++++ 5 files changed, 48 insertions(+) create mode 100644 package/gtkiostream/Config.in create mode 100644 package/gtkiostream/gtkiostream.hash create mode 100644 package/gtkiostream/gtkiostream.mk diff --git a/DEVELOPERS b/DEVELOPERS index d7c4d03c4c..5355d6d5ac 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -165,6 +165,7 @@ F: package/cups/ F: package/cups-filters/ F: package/fail2ban/ F: package/grep/ +F: package/gtkiostream/ F: package/htpdate/ F: package/i2c-tools/ F: package/jq/ @@ -1978,6 +1979,9 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ +N: Matt Flax +F: package/gtkiostream/ + N: Matt Weber F: board/freescale/p* F: board/freescale/t* diff --git a/package/Config.in b/package/Config.in index 06d0a05854..70e446be47 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1389,6 +1389,7 @@ menu "Audio/Sound" source "package/bcg729/Config.in" source "package/caps/Config.in" source "package/fdk-aac/Config.in" + source "package/gtkiostream/Config.in" source "package/libao/Config.in" source "package/libasplib/Config.in" source "package/libbroadvoice/Config.in" diff --git a/package/gtkiostream/Config.in b/package/gtkiostream/Config.in new file mode 100644 index 0000000000..bb97961587 --- /dev/null +++ b/package/gtkiostream/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_GTKIOSTREAM + bool "gtkiostream" + depends on BR2_INSTALL_LIBSTDCPP # eigen + select BR2_PACKAGE_EIGEN + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_DOUBLE + select BR2_PACKAGE_FFTW_SINGLE + help + This package provides many useful software engineering and + signal processing includes and linkable library. + + https://github.com/flatmax/gtkiostream + +comment "gtkiostream needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/gtkiostream/gtkiostream.hash b/package/gtkiostream/gtkiostream.hash new file mode 100644 index 0000000000..90c754f48c --- /dev/null +++ b/package/gtkiostream/gtkiostream.hash @@ -0,0 +1,3 @@ +# locally computed hash +sha256 44e8d921d462005cd330a1c24e5bd8061175b90ae53f537dbf73f59b74f6e01b gtkiostream-v1.8.0.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 gpl.txt diff --git a/package/gtkiostream/gtkiostream.mk b/package/gtkiostream/gtkiostream.mk new file mode 100644 index 0000000000..f110e6c149 --- /dev/null +++ b/package/gtkiostream/gtkiostream.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# GTKIOSTREAM +# +################################################################################ + +GTKIOSTREAM_VERSION = v1.8.0 +GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,$(GTKIOSTREAM_VERSION)) +GTKIOSTREAM_LICENSE = GPL-2.0+ +GTKIOSTREAM_LICENSE_FILES = gpl.txt +GTKIOSTREAM_DEPENDENCIES = eigen fftw-double fftw-single host-pkgconf + +GTKIOSTREAM_DEPENDENCIES += $(if $(BR2_PACKAGE_SOX),sox) + +ifeq ($(BR2_PACKAGE_OCTAVE),y) +GTKIOSTREAM_DEPENDENCIES += octave +GTKIOSTREAM_CONF_OPTS += --enable-octave +else +GTKIOSTREAM_CONF_OPTS += --disable-octave +endif + +# configure script not available +GTKIOSTREAM_AUTORECONF = YES + +$(eval $(autotools-package)) -- 2.25.1 From thomas.petazzoni at bootlin.com Tue Feb 7 21:20:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:20:54 +0100 Subject: [Buildroot] [PATCH 1/2] package/skeleton-init-openrc: prepare runlevels from make over skeleton In-Reply-To: <20220622212045.573-1-james.knight@collins.com> References: <20220622212045.573-1-james.knight@collins.com> Message-ID: <20230207222054.39573a80@windsurf> Hello James, On Wed, 22 Jun 2022 17:20:44 -0400 James Knight via buildroot wrote: > The following commit changes the creation of an OpenRC environment's > `/etc/runlevels/default/sysv-rcs` symbolic link from the skeleton to > inside the package's Makefile (triggered from the > `SKELETON_INIT_OPENRC_INSTALL_TARGET_CMDS` call). The original symlink > to a `/etc/init.d/sysv-rcs` path may not gracefully work for all > developer environments. For example, on a fresh checkout in a Windows > environment, the symbolic link may be automatically updated to > include a drive specification. For example: > > $ git diff > diff --git a/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs b/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs > index ef5e00823c..e417b4bb44 120000 > --- a/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs > +++ b/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs > @@ -1 +1 @@ > -/etc/init.d/sysv-rcs > \ No newline at end of file > +G:/etc/init.d/sysv-rcs > \ No newline at end of file > > If a developer built with fresh checkout using an example > `qemu_x86_defconfig` tailored to target an OpenRC init system, an > improper symlink can be observed in the target system: > > ... > Welcome to Buildroot > buildroot login: root > Jun 22 20:42:34 login[971]: root login on 'console' > # /etc/runlevels/default/sysv-rcs --version > -sh: /etc/runlevels/default/sysv-rcs: not found > # readlink /etc/runlevels/default/sysv-rcs > /??/G:/etc/init.d/sysv-rcs > # /etc/init.d/sysv-rcs --version > sysv-rcs (OpenRC) 0.43.3 (Buildroot 2022.05-225-g64390b6c42-dirty) > > By switching from having the symbolic link in the skeleton file to > building it during the package's install stage, this (1) prevents > oddities with a Git working environment on environments like Windows, > as well as (2) ensures a proper symlink is created in a Windows > environment. For example: > > # readlink /etc/runlevels/default/sysv-rcs > /etc/init.d/sysv-rcs > # /etc/runlevels/default/sysv-rcs --version > sysv-rcs (OpenRC) 0.43.3 (Buildroot 2022.05-225-g64390b6c42-dirty) > > Signed-off-by: James Knight Thanks for the patch, but the proposed solution is not really desirable, and in fact is probably not the full explanation. Indeed, the OpenRC skeleton in package/skeleton-init-openrc/skeleton/ has plenty of other symlinks, and you didn't complain about them. However, one key difference between the symlinks in package/skeleton-init-openrc/skeleton/ and the sysv-rcs symlink your patch is fixing is that the former symlinks have a relative path to the target, while the latter have a relative path to the target. Could you try instead to change this symlink to use a relative path to its target? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Tue Feb 7 21:23:22 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 22:23:22 +0100 Subject: [Buildroot] [PATCH v4] package/gtkiostream: new package In-Reply-To: References: <20230207175116.3043006-1-angelo@amarulasolutions.com> <51fbd11a-26ef-78fa-3ced-61648adc5a9f@smile.fr> <46eeb5ff-ea1e-acdd-3ab8-3dc945c9fa40@flatmax.com> Message-ID: Hello, Le 07/02/2023 ? 21:59, Matt Flax a ?crit?: > > On 8/2/23 07:50, Angelo Compagnucci wrote: >> >> >> On Tue, Feb 7, 2023 at 9:47 PM Matt Flax wrote: >> >> >> ??? On 8/2/23 05:04, Romain Naour wrote: >> ??? > Hello Angelo, >> ??? > >> ??? > Le 07/02/2023 ? 18:51, Angelo Compagnucci a ?crit?: >> ??? > It always useful to use distribution packaging to find any >> ??? missing dependencies >> ??? > (mentatory or optional) like gtk2 (hence the package name :) ) >> ??? > >> ??? > >> ??? https://github.com/flatmax/gtkiostream/blob/master/debian/control#L14 >> ??? > >> ??? > Can you double check ? >> >> >> ??? Hey all, great to see my original patch revitalised after many many >> ??? months - I am keen for gtkiostream to be absorbed into buildroot. >> >> ??? gtk2 and gtk3 are optional with this library - despite its name - >> ??? it is >> ??? really now focused on signal processing, ALSA C++, neural networks, >> ??? software engineering, etc.. The gtk side of things works nicely with >> ??? gtk2 but requires attention for gtk3 - I originally opted to leave >> ??? gtk2/3 out entirely in buildroot - I think it is the best solution >> ??? for now. >> >> >> Thanks Matt for the very clear explanation, I was about to reply gtk is optional. >> >> Even more because it requires the addition of libgtkdatabox which is actually >> not present in buildroot. >> >> Looking at the code, It's not clear if opencv or sox are really that necessary >> without a gui, but I think we could leave them out. >> > > Indeed. opencv is an image processing thing. Sox the audio processing library on > the other hand is great to have in, but not strictly necessary. > > Thanks for revitalising this patch. Thanks for explanations! Best regards, Romain > > Matt > From yann.morin.1998 at free.fr Tue Feb 7 21:33:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 22:33:07 +0100 Subject: [Buildroot] [PATCH 0/2] gitlab-ci: fix pipelines with the newer docker image (branch yem/pipelines) Message-ID: Hello All! TL;DR: the newer docker image we use in our pipelines uses a newer git version that is more strict with the ownership of the files in the git repository checkout, which makes our check jobs fail. Long story: see the individual commits. ;-) Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (2): gitlab-ci: don't use before_script in job templates gitlab-ci: fix pipelines support/misc/gitlab-ci.yml.in | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | 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 Tue Feb 7 21:33:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 22:33:11 +0100 Subject: [Buildroot] [PATCH 1/2] gitlab-ci: don't use before_script in job templates In-Reply-To: References: Message-ID: <3c87e90584519c73eeb1ae2dd5c52fe60d1572a2.1675805584.git.yann.morin.1998@free.fr> When gitlab prepares a job to run, it checks out the repository with a non-root user, and spawns a container that runs as root, with some UID mapping that makes the files be owned by root in the container. However, our pipelines run as a nont-root user. Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated the docker image that is used to run in our pipelines. That new image includes a git version that is stricter about the ownership of the git tree it is acting in: git aborts in error when the user running it does not own the repository. We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} rules, so they all fail (in various ways). To fix this, we either need to fix the ownership or tell git to ignore the situation. In either case, we'll need to run a scriptlet before all our jobs. Gitlab-ci allows to provide a global before_script, that is inherited by all jobs. However, some of our jobs already declare a before_script, and that would shadow the global before_Scrikpt. There is no technical reason to do our before_script separately from the actual script, so we move the code from the before_scripts to the corresponding scripts. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Thomas Petazzoni --- support/misc/gitlab-ci.yml.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 0ccf36665e..9c1faf0d5f 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -23,9 +23,8 @@ - utils/check-symbols .defconfig_check: - before_script: + script: - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') - script: - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - support/scripts/check-dotconfig.py .config configs/${DEFCONFIG_NAME} @@ -44,10 +43,9 @@ } .defconfig_base: - before_script: + script: - DEFCONFIG_NAME=${CI_JOB_NAME} - OUTPUT_DIR=output - script: - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} @@ -72,13 +70,12 @@ - runtime-test.log .runtime_test_base: - before_script: - - TEST_CASE_NAME=${CI_JOB_NAME} # Keep build directories so the rootfs can be an artifact of the job. The # runner will clean up those files for us. # Multiply every emulator timeout by 10 to avoid sporadic failures in # elastic runners. script: + - TEST_CASE_NAME=${CI_JOB_NAME} - echo "Starting runtime test ${TEST_CASE_NAME}" - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} artifacts: @@ -91,9 +88,8 @@ .test_pkg: stage: build - before_script: + script: - OUTPUT_DIR=${CI_JOB_NAME} - script: - echo "Configure Buildroot for ${OUTPUT_DIR}" - make O=${OUTPUT_DIR} syncconfig - make O=${OUTPUT_DIR} savedefconfig -- 2.25.1 From yann.morin.1998 at free.fr Tue Feb 7 21:33:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 22:33:12 +0100 Subject: [Buildroot] [PATCH 2/2] gitlab-ci: fix pipelines In-Reply-To: References: Message-ID: <393e263cc9e0f72b237b6bf5cda86101ded50101.1675805584.git.yann.morin.1998@free.fr> When gitlab prepares a job to run, it checks out the repository with a non-root user, and spawns a container that runs as root, with some UID mapping that makes the files be owned by root in the container. However, our pipelines run as a nont-root user. Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated the docker image that is used to run in our pipelines. That new image includes a git version that is stricter about the ownership of the git tree it is acting in: git aborts in error when the user running it does not own the repository. We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} rules, so they all fail (in various ways). To fix this, we either need to fix the ownership or tell git to ignore the situation. It is most probably impossible to change the ownership of the files: we run as non-root,and the files belong to root (in the container). So we're stuck. The alternative, is to do as git suggest, and tell it to ignore the situation. In a local setup, this woujld be very insecure, but in the pipelines, this is in a throw-away container, wehre a single user exists and is running, so we don't care much (if at all). Add a global before_script that registers the git config to ignore ownership issues in the buildroot repository; see [0] for the definition of the CI_PROJECT_DIR variable. Note: unlike what is said in there, and in [1], the value actually seen in CI_PROJECT_DIR is already prefixed with CI_BUILDS_DIR (the documentation is unclear about that point). [0] https://docs.gitlab.com/ee/ci/variables/predefined_variables.html [1] https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Thomas Petazzoni --- support/misc/gitlab-ci.yml.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 9c1faf0d5f..38aca31fb5 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -1,3 +1,6 @@ +before_script: + - git config --global --add safe.directory ${CI_PROJECT_DIR} + .check-check-package_base: script: - python3 -m pytest -v utils/checkpackagelib/ -- 2.25.1 From peter at korsgaard.com Tue Feb 7 21:36:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 07 Feb 2023 22:36:21 +0100 Subject: [Buildroot] [PATCH] package/libgtk3: bump to version 3.24.36 In-Reply-To: <20221228071734.737602-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 28 Dec 2022 08:17:34 +0100") References: <20221228071734.737602-1-francois.perrad@gadz.org> Message-ID: <87ilgd6tuy.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > switch to meson infra > remove autotools specific patches > host-libgtk3 is a hack which build only gtk-update-icon-cache > host-libgtk3 is used by libgtk3 & adwaita-icon-theme > Signed-off-by: Francois Perrad Committed after extending the commit message to explain why we're changing to meson and mentioning that it fixes the autobuilder issues caused by the missing file in the 3.24.35 tarball, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 7 21:26:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 22:26:57 +0100 Subject: [Buildroot] [git commit] package/libgtk3: bump to version 3.24.36 Message-ID: <20230207213641.664E584349@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40866ae0ce6e71d01a132dfb7694daa2ec559184 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/37c/37c7db88622c93f1c58aff7431b638143ae741d3/ As the 3.24.5 release tarball was missing a file: https://gitlab.gnome.org/GNOME/gtk/-/issues/5355 Switch to meson infra and remove autotools specific patches as the autotools support has been dropped: https://download.gnome.org/sources/gtk+/3.24/gtk%2B-3.24.36.news host-libgtk3 is a hack which builds only gtk-update-icon-cache host-libgtk3 is used by libgtk3 & adwaita-icon-theme Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- ...-bridge.patch => 0001-disable-atk-bridge.patch} | 28 +++---- package/libgtk3/0001-no-gtk-doc.patch | 25 ------- ...-dependency-from-gtk-encode-symbolic-svg.patch} | 0 package/libgtk3/0002-fix-introspection-check.patch | 28 ------- package/libgtk3/Config.in | 1 + package/libgtk3/libgtk3.hash | 4 +- package/libgtk3/libgtk3.mk | 87 +++++----------------- 7 files changed, 35 insertions(+), 138 deletions(-) diff --git a/package/libgtk3/0003-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch similarity index 62% rename from package/libgtk3/0003-disable-atk-bridge.patch rename to package/libgtk3/0001-disable-atk-bridge.patch index 390fc012fa..f3e9bff2ba 100644 --- a/package/libgtk3/0003-disable-atk-bridge.patch +++ b/package/libgtk3/0001-disable-atk-bridge.patch @@ -5,21 +5,6 @@ add two new packages just for it: at-spi2-core and at-spi2-atk. Signed-off-by: Hadrien Boutteville ---- a/configure.ac -+++ b/configure.ac -@@ -1386,11 +1386,7 @@ - # Check for Accessibility Toolkit flags - ######################################## - --if test x$enable_x11_backend = xyes; then -- ATK_PACKAGES="atk atk-bridge-2.0" --else -- ATK_PACKAGES="atk" --fi -+ATK_PACKAGES="atk" - - PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) - --- a/gtk/a11y/gtkaccessibility.c +++ b/gtk/a11y/gtkaccessibility.c @@ -37,10 +37,6 @@ @@ -33,7 +18,7 @@ Signed-off-by: Hadrien Boutteville static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, -@@ -988,9 +984,5 @@ +@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) _gtk_accessibility_override_atk_util (); do_window_event_initialization (); @@ -43,3 +28,14 @@ Signed-off-by: Hadrien Boutteville - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); } +--- a/meson.build ++++ b/meson.build +@@ -564,7 +564,7 @@ if x11_enabled + xfixes_dep = dependency('xfixes', required: false) + xcomposite_dep = dependency('xcomposite', required: false) + fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) +- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) ++ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) + + backend_immodules += ['xim'] + diff --git a/package/libgtk3/0001-no-gtk-doc.patch b/package/libgtk3/0001-no-gtk-doc.patch deleted file mode 100644 index e1d3208022..0000000000 --- a/package/libgtk3/0001-no-gtk-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -Same patch as for systemd in commit -http://git.buildroot.net/buildroot/commit/?id=7144f2f04b70553 - -Fix deactivation of gtk-doc - -The tarball contains the Makefile for building documentation with gtk-doc, -Unfortunately the AM_CONDITIONAL variable is not the correct one, which -results in an error when running autoreconf. - -This patch fixes this issue. - -Signed-off-by: Eric Le Bihan -Signed-off-by: Hadrien Boutteville - ---- a/gtk-doc.make -+++ b/gtk-doc.make -@@ -300,7 +300,7 @@ - # - # Require gtk-doc when making dist - # --if HAVE_GTK_DOC -+if ENABLE_GTK_DOC - dist-check-gtkdoc: docs - else - dist-check-gtkdoc: diff --git a/package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch b/package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch similarity index 100% rename from package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch rename to package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch diff --git a/package/libgtk3/0002-fix-introspection-check.patch b/package/libgtk3/0002-fix-introspection-check.patch deleted file mode 100644 index 7edf7db71f..0000000000 --- a/package/libgtk3/0002-fix-introspection-check.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix HAVE_INTROSPECTION does not appear in AM_CONDITIONAL - -During autoreconf GOBJECT_INTROSPECTION_CHECK could not be resolved because we -don't have introspection which provides its custom m4 macro. Reconfigure fails -with: - -gdk/Makefile.am:196: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL -gtk/Makefile.am:1347: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL - -We avoid to add a copy of introspection.m4 in the m4 directory of libgtk3 by -adding a check, as performed in Systemd. - -Signed-off-by: Hadrien Boutteville - ---- a/configure.ac -+++ b/configure.ac -@@ -1690,7 +1690,10 @@ - # GObject introspection - ################################################## - --GOBJECT_INTROSPECTION_CHECK(introspection_required_version) -+m4_ifdef([GOBJECT_INTROSPECTION_CHECK], -+ [GOBJECT_INTROSPECTION_CHECK(introspection_required_version)], -+ [AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) -+ enable_introspection=no]) - - ################################################## - # colord module diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index bc8cacd9f5..82ca68d2da 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -88,6 +88,7 @@ config BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXI help diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 1715b94e73..9fed2c9df2 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.35.sha256sum -sha256 ec10fe6d712ef0b3c63b5f932639c9d1ae99fce94f500f6f06965629fef60bd1 gtk+-3.24.35.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.36.sha256sum +sha256 27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691 gtk+-3.24.36.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 4c93413fb2..283c129cef 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).35 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).36 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ @@ -13,69 +13,42 @@ LIBGTK3_LICENSE_FILES = COPYING LIBGTK3_CPE_ID_VENDOR = gnome LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_AUTORECONF = YES - -LIBGTK3_CONF_ENV = \ - ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/bin/gtk-update-icon-cache \ - ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/bin/gdk-pixbuf-csource \ - PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf - -LIBGTK3_CONF_OPTS = \ - --disable-glibtest \ - --enable-explicit-deps=no -HOST_LIBGTK3_CONF_OPTS = --disable-introspection - -# Override pkg-config pkgdatadir variable, it needs the prefix -LIBGTK3_MAKE_OPTS = \ - WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols \ - LIBS=$(TARGET_NLS_LIBS) LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \ gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrender xlib_libXi - -LIBGTK3_CONF_OPTS += \ - --enable-x11-backend \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib +LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrandr xlib_libXrender xlib_libXi +LIBGTK3_CONF_OPTS += -Dx11_backend=true else -LIBGTK3_CONF_OPTS += --disable-x11-backend +LIBGTK3_CONF_OPTS += -Dx11_backend=false endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBGTK3_CONF_OPTS += --enable-introspection +LIBGTK3_CONF_OPTS += -Dintrospection=true LIBGTK3_DEPENDENCIES += gobject-introspection else -LIBGTK3_CONF_OPTS += --disable-introspection +LIBGTK3_CONF_OPTS += -Dintrospection=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) LIBGTK3_DEPENDENCIES += wayland wayland-protocols libxkbcommon -LIBGTK3_CONF_OPTS += --enable-wayland-backend +LIBGTK3_CONF_OPTS += -Dwayland_backend=true else -LIBGTK3_CONF_OPTS += --disable-wayland-backend +LIBGTK3_CONF_OPTS += -Dwayland_backend=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_BROADWAY),y) -LIBGTK3_CONF_OPTS += --enable-broadway-backend +LIBGTK3_CONF_OPTS += -Dbroadway_backend=true else -LIBGTK3_CONF_OPTS += --disable-broadway-backend +LIBGTK3_CONF_OPTS += -Dbroadway_backend=false endif ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -LIBGTK3_CONF_OPTS += --enable-xinerama +LIBGTK3_CONF_OPTS += -Dxinerama=yes LIBGTK3_DEPENDENCIES += xlib_libXinerama else -LIBGTK3_CONF_OPTS += --disable-xinerama -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -LIBGTK3_CONF_OPTS += --enable-xrandr -LIBGTK3_DEPENDENCIES += xlib_libXrandr -else -LIBGTK3_CONF_OPTS += --disable-xrandr +LIBGTK3_CONF_OPTS += -Dxinerama=no endif ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) @@ -83,55 +56,35 @@ LIBGTK3_DEPENDENCIES += xlib_libXcursor endif ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) -LIBGTK3_CONF_OPTS += --enable-xfixes LIBGTK3_DEPENDENCIES += xlib_libXfixes -else -LIBGTK3_CONF_OPTS += --disable-xfixes endif ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) -LIBGTK3_CONF_OPTS += --enable-xcomposite LIBGTK3_DEPENDENCIES += xlib_libXcomposite -else -LIBGTK3_CONF_OPTS += --disable-xcomposite endif ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y) -LIBGTK3_CONF_OPTS += --enable-xdamage LIBGTK3_DEPENDENCIES += xlib_libXdamage -else -LIBGTK3_CONF_OPTS += --disable-xdamage -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y) -LIBGTK3_CONF_OPTS += --enable-xkb -LIBGTK3_DEPENDENCIES += xlib_libxkbfile -else -LIBGTK3_CONF_OPTS += --disable-xkb endif ifeq ($(BR2_PACKAGE_CUPS),y) -LIBGTK3_CONF_OPTS += --enable-cups -LIBGTK3_CONF_ENV += ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config +LIBGTK3_CONF_OPTS += -Dprint_backends=cups LIBGTK3_DEPENDENCIES += cups else -LIBGTK3_CONF_OPTS += --disable-cups +LIBGTK3_CONF_OPTS += -Dprint_backends=auto endif ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y) +LIBGTK3_CONF_OPTS += -Ddemos=true -Dexamples=true LIBGTK3_DEPENDENCIES += hicolor-icon-theme shared-mime-info else -define LIBGTK3_REMOVE_DEMOS - $(RM) $(TARGET_DIR)/usr/bin/gtk3-demo \ - $(TARGET_DIR)/usr/bin/gtk3-demo-application -endef -LIBGTK3_POST_INSTALL_TARGET_HOOKS += LIBGTK3_REMOVE_DEMOS +LIBGTK3_CONF_OPTS += -Ddemos=false -Dexamples=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_TESTS),y) -LIBGTK3_CONF_OPTS += --enable-installed-tests +LIBGTK3_CONF_OPTS += -Dtests=true -Dinstalled_tests=true else -LIBGTK3_CONF_OPTS += --disable-installed-tests +LIBGTK3_CONF_OPTS += -Dtests=false -Dinstalled_tests=false endif define LIBGTK3_COMPILE_GLIB_SCHEMAS @@ -198,5 +151,5 @@ define LIBGTK3_UPDATE_ICON_CACHE endef LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-generic-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 21:37:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:37:15 +0100 Subject: [Buildroot] [git commit] package/wolfssl: handle ARM Thumb situation Message-ID: <20230207213844.CF1F684377@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f79a9c775ff0a59027f274a237d98b5f8d31c022 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master By default on ARM32, wolfssl uses assembly instructions that are not supported on Thumb (original Thumb, not Thumb 2), causing a build failure: /tmp/ccgn33X7.s:299: Error: selected processor does not support `umlal r4,r5,r10,ip' in Thumb mode /tmp/ccgn33X7.s:386: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' /tmp/ccgn33X7.s:387: Error: unshifted register required -- `adc r3,r3,#0' /tmp/ccgn33X7.s:395: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' Fix that by passing --with-arm-target=thumb, which tells wolfssl to use a different set of assembly routines. Fixes: http://autobuild.buildroot.net/results/907/907a5967439c3157c426023b0be1e613092d7bfe/ Signed-off-by: Thomas Petazzoni --- package/wolfssl/wolfssl.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index f415e11bb5..8f6cba56ec 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -43,4 +43,8 @@ else WOLFSSL_CONF_OPTS += --disable-armasm endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +WOLFSSL_CONF_OPTS += --with-arm-target=thumb +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 21:37:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:37:15 +0100 Subject: [Buildroot] [git commit] package/wolfssl: disable broken asm implementations on 32-bit Arm Message-ID: <20230207213844.C537584375@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36b8c9494b56b877fea62f17926f747c7c7bfb8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master wolfSSL has ARMv8-A assembly implementations of some functions for both A64 and A32 ISAs. However, some of the A32 versions use r11, which is usually not allowed: wolfcrypt/src/port/arm/armv8-aes.c: In function 'wc_AesCbcEncrypt': wolfcrypt/src/port/arm/armv8-aes.c:3303:5: error: fp cannot be used in 'asm' here 3303 | } | ^ That can be fixed by adding the compiler flag -fomit-frame-pointer, but then there is another failure: /tmp/ccV19DQV.s: Assembler messages: /tmp/ccV19DQV.s:248: Error: first transfer register must be even -- `ldrd r11,r10,[r14,#4*14]' make[3]: *** [Makefile:5858: wolfcrypt/src/port/arm/src_libwolfssl_la-armv8-chacha.lo] Error 1 This is definitely not a valid instruction in A32, which suggests that this code isn't being tested at all upstream. So disable it here. Fixes: http://autobuild.buildroot.net/results/502/502a2b217845eb290c1961d4740b032462f8ae53/ Signed-off-by: Ben Hutchings Signed-off-by: Thomas Petazzoni --- package/wolfssl/wolfssl.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index cd3acd9411..f415e11bb5 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -33,14 +33,12 @@ WOLFSSL_CONF_OPTS += --disable-sslv3 endif # enable ARMv8 hardware acceleration -ifeq ($(BR2_ARM_CPU_ARMV8A),y) +ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm # the flag -mstrict-align is needed to prevent build errors caused by # some inline assembly in parts of the AES structure using the "m" # constraint -ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -mstrict-align" -endif else WOLFSSL_CONF_OPTS += --disable-armasm endif From thomas.petazzoni at bootlin.com Tue Feb 7 21:37:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:37:15 +0100 Subject: [Buildroot] [git commit] package/wolfssl: disable assembly when not supported Message-ID: <20230207213844.DCD8484378@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8dc5315eb712eca0a5cbf793a6714a47ab6e57e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master wolfssl contains some assembly code and its configure.ac script enables the assembly code depending on the CPU architecture. However, the detection logic is not sufficient and leads to using the assembly code in situation where it should not. Here are two examples: - As soon as the architecture is mips64/mips64el, it uses assembly code, but that assembly code is not mips64r6 compatible. - As soon as the architecture is RISC-V, it uses assembly code, but that assembly code uses multiplication instructions, without paying attention that the "M" extension may not be available in the RISC-V CPU instruction set. In order to avoid this, we introduce a BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS hidden boolean to decide when to enable/disable assembly code. We set an initial value with the supported CPU architectures, with the exclusion of the problematic cases described above. It is pretty likely that this variable will need tuning progressively, as it is difficult to determine which CPU variants exactly are supported by the assembly code in wolfssl. Fixes: - MIPS64 case: http://autobuild.buildroot.net/results/43e/43ee1a457cbeb986d958c9a70cac0676377661c0/ - RISC-V case: http://autobuild.buildroot.net/results/f05/f056ebe7749a69994afba39a9d4967e2774c45ea/ Signed-off-by: Thomas Petazzoni --- package/wolfssl/Config.in | 12 ++++++++++++ package/wolfssl/wolfssl.mk | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/package/wolfssl/Config.in b/package/wolfssl/Config.in index 3a97125e8d..c41bdb6888 100644 --- a/package/wolfssl/Config.in +++ b/package/wolfssl/Config.in @@ -1,3 +1,15 @@ +config BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm || BR2_armeb + default y if BR2_powerpc + default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_mips64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64el && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips || BR2_mipsel + default y if BR2_riscv && BR2_RISCV_ISA_RVM + default y if BR2_s390x + config BR2_PACKAGE_WOLFSSL bool "wolfssl" depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 8f6cba56ec..9f06bb1b4b 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -32,6 +32,12 @@ else WOLFSSL_CONF_OPTS += --disable-sslv3 endif +ifeq ($(BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS),y) +WOLFSSL_CONF_OPTS += --enable-asm +else +WOLFSSL_CONF_OPTS += --disable-asm +endif + # enable ARMv8 hardware acceleration ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm From thomas.petazzoni at bootlin.com Tue Feb 7 21:39:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:39:32 +0100 Subject: [Buildroot] [PATCH] package/wolfssl: Disable broken asm implementations on 32-bit Arm In-Reply-To: <20220614192445.2390329-1-ben.hutchings@mind.be> References: <20220614192445.2390329-1-ben.hutchings@mind.be> Message-ID: <20230207223932.696d9190@windsurf> Hello Ben, On Tue, 14 Jun 2022 21:24:45 +0200 Ben Hutchings wrote: > wolfSSL has ARMv8-A assembly implementations of some functions for > both A64 and A32 ISAs. However, some of the A32 versions use r11, > which is usually not allowed: > > wolfcrypt/src/port/arm/armv8-aes.c: In function 'wc_AesCbcEncrypt': > wolfcrypt/src/port/arm/armv8-aes.c:3303:5: error: fp cannot be used in 'asm' here > 3303 | } > | ^ > > That can be fixed by adding the compiler flag -fomit-frame-pointer, > but then there is another failure: > > /tmp/ccV19DQV.s: Assembler messages: > /tmp/ccV19DQV.s:248: Error: first transfer register must be even -- `ldrd r11,r10,[r14,#4*14]' > make[3]: *** [Makefile:5858: wolfcrypt/src/port/arm/src_libwolfssl_la-armv8-chacha.lo] Error 1 > > This is definitely not a valid instruction in A32, which suggests that > this code isn't being tested at all upstream. So disable it here. > > Signed-off-by: Ben Hutchings > --- > package/wolfssl/wolfssl.mk | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) Thanks, I finally applied your patch, after adding a reference to the autobuilder failure it is fixing. I also pushed two other patches to fix other wolfssl build failures: https://gitlab.com/buildroot.org/buildroot/-/commit/36b8c9494b56b877fea62f17926f747c7c7bfb8d https://gitlab.com/buildroot.org/buildroot/-/commit/f79a9c775ff0a59027f274a237d98b5f8d31c022 https://gitlab.com/buildroot.org/buildroot/-/commit/d8dc5315eb712eca0a5cbf793a6714a47ab6e57e Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Tue Feb 7 21:47:12 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 22:47:12 +0100 Subject: [Buildroot] [PATCH 1/2] gitlab-ci: don't use before_script in job templates In-Reply-To: <3c87e90584519c73eeb1ae2dd5c52fe60d1572a2.1675805584.git.yann.morin.1998@free.fr> References: <3c87e90584519c73eeb1ae2dd5c52fe60d1572a2.1675805584.git.yann.morin.1998@free.fr> Message-ID: <5160d115-3650-23a2-bad5-2887ba763957@smile.fr> Hello Yann, Le 07/02/2023 ? 22:33, Yann E. MORIN a ?crit?: > When gitlab prepares a job to run, it checks out the repository with a > non-root user, and spawns a container that runs as root, with some UID > mapping that makes the files be owned by root in the container. However, > our pipelines run as a nont-root user. > > Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated > the docker image that is used to run in our pipelines. > > That new image includes a git version that is stricter about the > ownership of the git tree it is acting in: git aborts in error when the > user running it does not own the repository. > > We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} > rules, so they all fail (in various ways). is flake8 has been updated too? flake8 may trigger new check-package warning now. > > To fix this, we either need to fix the ownership or tell git to ignore > the situation. In either case, we'll need to run a scriptlet before all > our jobs. > > Gitlab-ci allows to provide a global before_script, that is inherited by > all jobs. However, some of our jobs already declare a before_script, and > that would shadow the global before_Scrikpt. before_Scrikpt/before_scripts > > There is no technical reason to do our before_script separately from > the actual script, so we move the code from the before_scripts to the > corresponding scripts. > Reviewed-by: Romain Naour Best regards, Romain > Signed-off-by: Yann E. MORIN > Cc: Arnout Vandecappelle (Essensium/Mind) > Cc: Romain Naour > Cc: Thomas Petazzoni > --- > support/misc/gitlab-ci.yml.in | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in > index 0ccf36665e..9c1faf0d5f 100644 > --- a/support/misc/gitlab-ci.yml.in > +++ b/support/misc/gitlab-ci.yml.in > @@ -23,9 +23,8 @@ > - utils/check-symbols > > .defconfig_check: > - before_script: > + script: > - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') > - script: > - echo "Configure Buildroot for ${DEFCONFIG_NAME}" > - make ${DEFCONFIG_NAME} > - support/scripts/check-dotconfig.py .config configs/${DEFCONFIG_NAME} > @@ -44,10 +43,9 @@ > } > > .defconfig_base: > - before_script: > + script: > - DEFCONFIG_NAME=${CI_JOB_NAME} > - OUTPUT_DIR=output > - script: > - echo "Configure Buildroot for ${DEFCONFIG_NAME}" > - make ${DEFCONFIG_NAME} > - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} > @@ -72,13 +70,12 @@ > - runtime-test.log > > .runtime_test_base: > - before_script: > - - TEST_CASE_NAME=${CI_JOB_NAME} > # Keep build directories so the rootfs can be an artifact of the job. The > # runner will clean up those files for us. > # Multiply every emulator timeout by 10 to avoid sporadic failures in > # elastic runners. > script: > + - TEST_CASE_NAME=${CI_JOB_NAME} > - echo "Starting runtime test ${TEST_CASE_NAME}" > - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} > artifacts: > @@ -91,9 +88,8 @@ > > .test_pkg: > stage: build > - before_script: > + script: > - OUTPUT_DIR=${CI_JOB_NAME} > - script: > - echo "Configure Buildroot for ${OUTPUT_DIR}" > - make O=${OUTPUT_DIR} syncconfig > - make O=${OUTPUT_DIR} savedefconfig From thomas.petazzoni at bootlin.com Tue Feb 7 21:50:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:50:24 +0100 Subject: [Buildroot] [PATCH v5] package/gtkiostream: new package In-Reply-To: <20230207210934.3132539-1-angelo@amarulasolutions.com> References: <20230207210934.3132539-1-angelo@amarulasolutions.com> Message-ID: <20230207225024.768b301d@windsurf> On Tue, 7 Feb 2023 22:09:34 +0100 Angelo Compagnucci wrote: > From: Matt Flax > > This package provides many useful software engineering and signal > processing libraries. > The package offer also a GUI written in GTK which requires several > missing packages and therefore is left disabled. > > Signed-off-by: Matt Flax > Signed-off-by: Angelo Compagnucci > --- > v4: > * Bumped to 1.8.0 > * Added myself to DEVELOPERS > * Added dependency on octave when enable instead of use > --disable-octave configure option > * Fixes from check-package > v5: > * Fixed wrong syntax (Romain) > * Added optional dependency on sox (Matt) I wanted to apply, but a quick test build with: BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_GTKIOSTREAM=y # BR2_TARGET_ROOTFS_TAR is not set ends up with: /home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find -lfftw3_threads: No such file or directory So, I will hold off for now :) Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Tue Feb 7 21:50:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 22:50:52 +0100 Subject: [Buildroot] [PATCH] package/chrony: add default unprivileged user option In-Reply-To: <20230207171020.20194-1-james.kent@orchestrated-technology.com> References: <20230207171020.20194-1-james.kent@orchestrated-technology.com> Message-ID: <20230207215052.GA2817@scaer> James, All, On 2023-02-07 17:10 +0000, James Kent spake thusly: > Configurable option to define and enable by default an unprivileged > user which the Chrony daemon will assume once initialised. Where libcap > is not enabled a comment indicates the dependency requirement to make > the option available. > > This option supports the good security practice of dropping elevated > privileges for daemon runtime. Thanks, thjis is=ndeed makes sense. See below for some comments... > Signed-off-by: James Kent > --- > package/chrony/Config.in | 10 ++++++++++ > package/chrony/chrony.mk | 8 ++++++++ > 2 files changed, 18 insertions(+) > > diff --git a/package/chrony/Config.in b/package/chrony/Config.in > index 158dc20530..8b053ed7e2 100644 > --- a/package/chrony/Config.in > +++ b/package/chrony/Config.in > @@ -14,3 +14,13 @@ config BR2_PACKAGE_CHRONY_DEBUG_LOGGING > Enable support for debug logging output from Chrony when > enabled at runtime. If disabled, code for debug logging will > not be compiled in. > + > +config BR2_PACKAGE_CHRONY_USER > + bool "chrony default unprivileged user" > + depends on BR2_PACKAGE_CHRONY && BR2_PACKAGE_LIBCAP First, we now try to enclose package sub-options in an if-endif block, rather than have each option depend on the package. I.e.: config BR2_PACKAGE_CHRONY bool "chrony" if BR2_PACKAGE_CHRONY config BR2_PACKAGE_CHRONY_FOO bool "foo" config BR2_PACKAGE_CHRONY_BAR bool "bar" endif Yes, the existing option doesnot follow that coding style, so just fix it up while at it. Second, chrony and libcap both need an MMU, so jut select libcap when BR2_PACKAGE_CHRONY_USER is enabled. > + help > + Define and enable default unprivileged user for the Chrony > + daemon to run as. > + > +comment "chrony default unprivileged user requires libcap" > + depends on BR2_PACKAGE_CHRONY && !BR2_PACKAGE_LIBCAP And thus, that comment is no longer needed. > diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk > index 379e95a778..16f8f082a3 100644 > --- a/package/chrony/chrony.mk > +++ b/package/chrony/chrony.mk > @@ -21,6 +21,14 @@ CHRONY_CONF_OPTS = \ > > ifeq ($(BR2_PACKAGE_LIBCAP),y) > CHRONY_DEPENDENCIES += libcap > + > +ifeq ($(BR2_PACKAGE_CHRONY_USER),y) > +CHRONY_CONF_OPTS += --with-user=chrony > +define CHRONY_USERS > + chrony -1 chrony -1 * /run/chrony - - Time daemon > +endef > +endif This part is correct. Can you fix and respin, please? Regards, Yann E. MORIN. > else > CHRONY_CONF_OPTS += --without-libcap > endif > -- > 2.35.3 > > _______________________________________________ > 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 thomas.petazzoni at bootlin.com Tue Feb 7 21:51:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:51:44 +0100 Subject: [Buildroot] [PATCH v5] package/gtkiostream: new package In-Reply-To: <20230207210934.3132539-1-angelo@amarulasolutions.com> References: <20230207210934.3132539-1-angelo@amarulasolutions.com> Message-ID: <20230207225144.16424f58@windsurf> On Tue, 7 Feb 2023 22:09:34 +0100 Angelo Compagnucci wrote: > +GTKIOSTREAM_VERSION = v1.8.0 > +GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,$(GTKIOSTREAM_VERSION)) > +GTKIOSTREAM_LICENSE = GPL-2.0+ > +GTKIOSTREAM_LICENSE_FILES = gpl.txt > +GTKIOSTREAM_DEPENDENCIES = eigen fftw-double fftw-single host-pkgconf > + > +GTKIOSTREAM_DEPENDENCIES += $(if $(BR2_PACKAGE_SOX),sox) Better written as: GTKIOSTREAM_DEPENDENCIES = \ eigen \ fftw-double \ ... host-pkgconf \ $(if $(BR2_PACKAGE_SOX),sox) > + > +ifeq ($(BR2_PACKAGE_OCTAVE),y) > +GTKIOSTREAM_DEPENDENCIES += octave > +GTKIOSTREAM_CONF_OPTS += --enable-octave > +else > +GTKIOSTREAM_CONF_OPTS += --disable-octave > +endif > + > +# configure script not available > +GTKIOSTREAM_AUTORECONF = YES This normally goes earlier in the makefile, like before the dependencies/conf_opts. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Tue Feb 7 21:51:26 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:26 +0100 Subject: [Buildroot] [git commit] system: Warn if systemd is used with kernel < 4.15 Message-ID: <20230207215154.8BEB2843AC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a095643b4dd34eb7acb69662aa64fa945f4b542 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master To quote the README: > Kernel versions below 4.15 have significant gaps in functionality and > are not recommended for use with this version of systemd. Taint flag > 'old-kernel' will be set. Systemd will most likely still function, but > upstream support and testing are limited. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- system/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/Config.in b/system/Config.in index 6100d965e7..1ca7690ea3 100644 --- a/system/Config.in +++ b/system/Config.in @@ -140,6 +140,10 @@ comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and targe !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 +comment "systemd highly recommends Linux >= 4.15" + depends on BR2_INIT_SYSTEMD + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + config BR2_INIT_NONE bool "None" select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT From arnout at mind.be Tue Feb 7 21:51:25 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:25 +0100 Subject: [Buildroot] [git commit] package/systemd: support dnssec if openssl is available Message-ID: <20230207215154.8326C843AB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b16ae93c85355aad3440737bc4ef7c3ec2d534f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set -Ddefault-dnssec=allow-downgrade if openssl is available as both openssl and gcrypt are now supported for dnssec. Move this out of the gcrypt condition into a joint openssl/gcrypt condition. So the dependency and the openssl/gcrypt config is set in the individual openssl and gcrypt conditions, while the default-dnssec option is set in a joint openssl or gcrypt condition. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/systemd/systemd.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 6536a2740d..cce9162f6d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -245,9 +245,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) SYSTEMD_DEPENDENCIES += libgcrypt -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade -Dgcrypt=true +SYSTEMD_CONF_OPTS += -Dgcrypt=true else -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no -Dgcrypt=false +SYSTEMD_CONF_OPTS += -Dgcrypt=false endif ifeq ($(BR2_PACKAGE_P11_KIT),y) @@ -317,6 +317,12 @@ else SYSTEMD_CONF_OPTS += -Dselinux=false endif +ifneq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_LIBOPENSSL),) +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade +else +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true define SYSTEMD_BUILD_HWDB From arnout at mind.be Tue Feb 7 21:51:23 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:23 +0100 Subject: [Buildroot] [git commit] package/systemd: Add config option for sysupdate feature Message-ID: <20230207215154.76969843AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=545f8c4b5a4f95e204f31ecb496ae93aa91fcd86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Support the new feature added with v251, requires openssl. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/systemd/Config.in | 16 ++++++++++++++++ package/systemd/systemd.mk | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 0d4147840d..9f4d933779 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -481,6 +481,22 @@ config BR2_PACKAGE_SYSTEMD_SYSEXT https://www.freedesktop.org/software/systemd/man/systemd-sysext.html +config BR2_PACKAGE_SYSTEMD_SYSUPDATE + bool "enable sysupdate support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + systemd-sysupdate atomically updates the host OS, container + images, portable service images or other sources, based on + the transfer configuration files described in sysupdate.d. + + Note that the bootloader must be configured specifically to + support the A/B update mechanism defined by sysupdate. Only + systemd-boot does this out of the box. + + https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html + config BR2_PACKAGE_SYSTEMD_SYSUSERS bool "enable sysusers support" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index a38eeba1a8..6536a2740d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -91,7 +91,6 @@ SYSTEMD_CONF_OPTS += \ -Dsulogin-path=/usr/sbin/sulogin \ -Dsystem-gid-max=999 \ -Dsystem-uid-max=999 \ - -Dsysupdate=false \ -Dsysvinit-path= \ -Dsysvrcnd-path= \ -Dtelinit-path= \ @@ -494,6 +493,12 @@ else SYSTEMD_CONF_OPTS += -Dsysext=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) +SYSTEMD_CONF_OPTS += -Dsysupdate=true +else +SYSTEMD_CONF_OPTS += -Dsysupdate=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management From arnout at mind.be Tue Feb 7 21:51:22 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:22 +0100 Subject: [Buildroot] [git commit] package/systemd: bump to version 252.4 Message-ID: <20230207215154.6B8AE843A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2c823d1f548d5a0120d27d6c000603192360f7b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Following files changed *license* from CC0-1.0 to MIT-0: - src/systemctl/systemd-sysv-install.SKELETON - config files - examples under /network The file LICENSES/MIT-0.txt has been added for this reason, hashes added, corrected for LICENSES/README.md. Kernel version 3.15 is now the bare minimum, but only version 4.15 and higher are fully supported and tested: - bump kernel header dependencies - correct kconfig description - improvements to make the kconfig description better reflect the information from the README Set new options to their default, remove -Defi-cc option. Set -Ddbus=false to ensure dbus dependency is runtime only. Set -Ddbus-interfaces-dir=no as interface XML file generation is not supported when cross compiling. Set -Ddefault-user-shell=/bin/sh to the always available shell. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/systemd/Config.in | 12 +++++++++--- package/systemd/systemd.hash | 5 +++-- package/systemd/systemd.mk | 16 ++++++++++++++-- system/Config.in | 6 +++--- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 33ac03e584..0d4147840d 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on !BR2_STATIC_LIBS # kmod depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV @@ -51,7 +51,11 @@ menuconfig BR2_PACKAGE_SYSTEMD an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. - Systemd requires a Linux kernel >= 3.13 with the following + Kernel versions below 4.15 ("recommended baseline") have + significant gaps in functionality and are not recommended + for use with this version of systemd. + + Systemd requires a Linux kernel >= 3.15 with the following options enabled: - CONFIG_DEVTMPFS @@ -66,9 +70,11 @@ menuconfig BR2_PACKAGE_SYSTEMD - CONFIG_PROC_FS - CONFIG_FHANDLE (libudev, mount and bind mount handling) - - CONFIG_NET_NS (needed by PrivateNetwork=, used in some + - CONFIG_NET_NS (Required for PrivateNetwork=, used in some systemd units) + - CONFIG_USER_NS (Required for PrivateUsers=) + - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS - CONFIG_TMPFS_POSIX_ACL - CONFIG_TMPFS_XATTR diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 3b98566f32..00c08edcd9 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 638a2fc78828765fc97bc73f428205b6dc1d359149b6c6bfe4d2a649cba2cca8 systemd-250.8.tar.gz +sha256 cf2d27e67663d599a045101c7178cf0ec63d9df2962a54adf7de0d0357724f00 systemd-252.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt @@ -8,7 +8,8 @@ sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENS sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 LICENSES/LGPL-2.0-or-later.txt sha256 5bcef4fedbfc08776630e65d5d0d074dd31208037eddb167ca46a9ec4f737764 LICENSES/Linux-syscall-note.txt sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENSES/lookup3-public-domain.txt +sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENSES/MIT-0.txt sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md +sha256 da9b2c7b8cd10516fd2c4279b82496ea61787148f13e899c62fc8988c5fac34f LICENSES/README.md diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index f191542866..a38eeba1a8 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.8 +SYSTEMD_VERSION = 252.4 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ @@ -29,6 +29,7 @@ SYSTEMD_LICENSE = \ BSD-3-Clause (tools/chromiumos), \ CC0-1.0 (few source files, see LICENSES/README.md), \ GPL-2.0 with Linux-syscall-note (linux kernel headers), \ + MIT-0 (few source files, see LICENSES/README.md), \ MIT (few source files, see LICENSES/README.md), \ OFL-1.1 (Heebo fonts) SYSTEMD_LICENSE_FILES = \ @@ -40,6 +41,7 @@ SYSTEMD_LICENSE_FILES = \ LICENSES/LGPL-2.0-or-later.txt \ LICENSES/Linux-syscall-note.txt \ LICENSES/lookup3-public-domain.txt \ + LICENSES/MIT-0.txt \ LICENSES/MIT.txt \ LICENSES/murmurhash2-public-domain.txt \ LICENSES/OFL-1.1.txt \ @@ -61,7 +63,13 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ + -Ddbus=false \ + -Ddbus-interfaces-dir=no \ + -Ddefault-compression='auto' \ -Ddefault-hierarchy=unified \ + -Ddefault-locale='C.UTF-8' \ + -Ddefault-user-shell=/bin/sh \ + -Dfirst-boot-full-preset=false \ -Didn=true \ -Dima=false \ -Dkexec-path=/usr/sbin/kexec \ @@ -72,6 +80,7 @@ SYSTEMD_CONF_OPTS += \ -Dman=false \ -Dmount-path=/usr/bin/mount \ -Dmode=release \ + -Dnspawn-locale='C.UTF-8' \ -Dnss-systemd=true \ -Dquotacheck-path=/usr/sbin/quotacheck \ -Dquotaon-path=/usr/sbin/quotaon \ @@ -82,6 +91,7 @@ SYSTEMD_CONF_OPTS += \ -Dsulogin-path=/usr/sbin/sulogin \ -Dsystem-gid-max=999 \ -Dsystem-uid-max=999 \ + -Dsysupdate=false \ -Dsysvinit-path= \ -Dsysvrcnd-path= \ -Dtelinit-path= \ @@ -558,7 +568,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi SYSTEMD_CONF_OPTS += \ -Defi=true \ -Dgnu-efi=true \ - -Defi-cc=$(TARGET_CC) \ -Defi-ld=bfd \ -Defi-libdir=$(STAGING_DIR)/usr/lib \ -Defi-includedir=$(STAGING_DIR)/usr/include/efi @@ -798,6 +807,8 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dbinfmt=false \ -Drepart=false \ -Dcoredump=false \ + -Ddbus=false \ + -Ddbus-interfaces-dir=no \ -Dpstore=false \ -Doomd=false \ -Dlogind=false \ @@ -806,6 +817,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dmachined=false \ -Dportabled=false \ -Dsysext=false \ + -Dsysupdate=false \ -Duserdb=false \ -Dhomed=false \ -Dnetworkd=false \ diff --git a/system/Config.in b/system/Config.in index deb464f4d0..6100d965e7 100644 --- a/system/Config.in +++ b/system/Config.in @@ -124,19 +124,19 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5" +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_HAS_SSP || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 From yann.morin.1998 at free.fr Tue Feb 7 21:55:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 22:55:20 +0100 Subject: [Buildroot] [PATCH 1/2] gitlab-ci: don't use before_script in job templates In-Reply-To: <5160d115-3650-23a2-bad5-2887ba763957@smile.fr> References: <3c87e90584519c73eeb1ae2dd5c52fe60d1572a2.1675805584.git.yann.morin.1998@free.fr> <5160d115-3650-23a2-bad5-2887ba763957@smile.fr> Message-ID: <20230207215520.GB2817@scaer> Romain, All, On 2023-02-07 22:47 +0100, Romain Naour spake thusly: > Le 07/02/2023 ? 22:33, Yann E. MORIN a ?crit?: > > When gitlab prepares a job to run, it checks out the repository with a > > non-root user, and spawns a container that runs as root, with some UID > > mapping that makes the files be owned by root in the container. However, > > our pipelines run as a nont-root user. > > > > Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated > > the docker image that is used to run in our pipelines. > > > > That new image includes a git version that is stricter about the > > ownership of the git tree it is acting in: git aborts in error when the > > user running it does not own the repository. > > > > We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} > > rules, so they all fail (in various ways). > > is flake8 has been updated too? flake8 may trigger new check-package warning now. Yes, there is a newer flake8 too, but there is no new error detected: https://gitlab.com/ymorin/buildroot/-/pipelines/770406457 > > > > To fix this, we either need to fix the ownership or tell git to ignore > > the situation. In either case, we'll need to run a scriptlet before all > > our jobs. > > > > Gitlab-ci allows to provide a global before_script, that is inherited by > > all jobs. However, some of our jobs already declare a before_script, and > > that would shadow the global before_Scrikpt. > before_Scrikpt/before_scripts Thanks Thomas said he'd fix that when applying. ;-] > > There is no technical reason to do our before_script separately from > > the actual script, so we move the code from the before_scripts to the > > corresponding scripts. > Reviewed-by: Romain Naour Thanks! Regards, Yann E. MORIN. > Best regards, > Romain > > > > Signed-off-by: Yann E. MORIN > > Cc: Arnout Vandecappelle (Essensium/Mind) > > Cc: Romain Naour > > Cc: Thomas Petazzoni > > --- > > support/misc/gitlab-ci.yml.in | 12 ++++-------- > > 1 file changed, 4 insertions(+), 8 deletions(-) > > > > diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in > > index 0ccf36665e..9c1faf0d5f 100644 > > --- a/support/misc/gitlab-ci.yml.in > > +++ b/support/misc/gitlab-ci.yml.in > > @@ -23,9 +23,8 @@ > > - utils/check-symbols > > > > .defconfig_check: > > - before_script: > > + script: > > - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') > > - script: > > - echo "Configure Buildroot for ${DEFCONFIG_NAME}" > > - make ${DEFCONFIG_NAME} > > - support/scripts/check-dotconfig.py .config configs/${DEFCONFIG_NAME} > > @@ -44,10 +43,9 @@ > > } > > > > .defconfig_base: > > - before_script: > > + script: > > - DEFCONFIG_NAME=${CI_JOB_NAME} > > - OUTPUT_DIR=output > > - script: > > - echo "Configure Buildroot for ${DEFCONFIG_NAME}" > > - make ${DEFCONFIG_NAME} > > - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} > > @@ -72,13 +70,12 @@ > > - runtime-test.log > > > > .runtime_test_base: > > - before_script: > > - - TEST_CASE_NAME=${CI_JOB_NAME} > > # Keep build directories so the rootfs can be an artifact of the job. The > > # runner will clean up those files for us. > > # Multiply every emulator timeout by 10 to avoid sporadic failures in > > # elastic runners. > > script: > > + - TEST_CASE_NAME=${CI_JOB_NAME} > > - echo "Starting runtime test ${TEST_CASE_NAME}" > > - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} > > artifacts: > > @@ -91,9 +88,8 @@ > > > > .test_pkg: > > stage: build > > - before_script: > > + script: > > - OUTPUT_DIR=${CI_JOB_NAME} > > - script: > > - echo "Configure Buildroot for ${OUTPUT_DIR}" > > - make O=${OUTPUT_DIR} syncconfig > > - make O=${OUTPUT_DIR} savedefconfig > > _______________________________________________ > 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 romain.naour at smile.fr Tue Feb 7 21:57:03 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 22:57:03 +0100 Subject: [Buildroot] [PATCH 2/2] gitlab-ci: fix pipelines In-Reply-To: <393e263cc9e0f72b237b6bf5cda86101ded50101.1675805584.git.yann.morin.1998@free.fr> References: <393e263cc9e0f72b237b6bf5cda86101ded50101.1675805584.git.yann.morin.1998@free.fr> Message-ID: Hello Yann, Is "fix pipelines" your WIP patch subject ? "gitlab-ci: ignore ownership of the git tree" seems better? Le 07/02/2023 ? 22:33, Yann E. MORIN a ?crit?: > When gitlab prepares a job to run, it checks out the repository with a > non-root user, and spawns a container that runs as root, with some UID > mapping that makes the files be owned by root in the container. However, > our pipelines run as a nont-root user. > > Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated > the docker image that is used to run in our pipelines. > > That new image includes a git version that is stricter about the > ownership of the git tree it is acting in: git aborts in error when the > user running it does not own the repository. > > We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} > rules, so they all fail (in various ways). > > To fix this, we either need to fix the ownership or tell git to ignore > the situation. > > It is most probably impossible to change the ownership of the files: we > run as non-root,and the files belong to root (in the container). So > we're stuck. > > The alternative, is to do as git suggest, and tell it to ignore the > situation. In a local setup, this woujld be very insecure, but in the > pipelines, this is in a throw-away container, wehre a single user exists > and is running, so we don't care much (if at all). > > Add a global before_script that registers the git config to ignore > ownership issues in the buildroot repository; see [0] for the definition > of the CI_PROJECT_DIR variable. Note: unlike what is said in there, and > in [1], the value actually seen in CI_PROJECT_DIR is already prefixed > with CI_BUILDS_DIR (the documentation is unclear about that point). > > [0] https://docs.gitlab.com/ee/ci/variables/predefined_variables.html > [1] https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section Reviewed-by: Romain Naour > > Signed-off-by: Yann E. MORIN > Cc: Arnout Vandecappelle (Essensium/Mind) > Cc: Romain Naour > Cc: Thomas Petazzoni > --- > support/misc/gitlab-ci.yml.in | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in > index 9c1faf0d5f..38aca31fb5 100644 > --- a/support/misc/gitlab-ci.yml.in > +++ b/support/misc/gitlab-ci.yml.in > @@ -1,3 +1,6 @@ > +before_script: > + - git config --global --add safe.directory ${CI_PROJECT_DIR} Note: I checked if we have the issue using the utils/docker-run directly, enabling safe.directory is not necessary. Best regards, Romain > + > .check-check-package_base: > script: > - python3 -m pytest -v utils/checkpackagelib/ From arnout at mind.be Tue Feb 7 21:57:11 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:57:11 +0100 Subject: [Buildroot] [PATCH v8 1/4] package/systemd: bump to version 252.4 In-Reply-To: References: <20230115114840.9027-1-nolange79@gmail.com> <6490dfd6-5f3b-3801-6955-7fa655f2a82b@mind.be> Message-ID: <1fcf8ae7-38a5-a634-8354-cb11788de6ac@mind.be> On 07/02/2023 19:38, Norbert Lange wrote: > Am Di., 7. Feb. 2023 um 17:41 Uhr schrieb Arnout Vandecappelle : >> >> >> >> On 15/01/2023 12:48, Norbert Lange wrote: [snip] >> Applied to master, thanks. (Not pushed yet, I may make more changes while >> reviewing the rest of the series.) > > Wouldnt mind if you do a stealthy bump to 254.5 before going through > all testing trouble ;) I'm afraid I already pushed now... Regards, Arnout > > Regards, Norbert >> >> Regards, >> Arnout >> >>> >>> package/systemd: 252.4 >>> --- >>> package/systemd/Config.in | 12 +++++++++--- >>> package/systemd/systemd.hash | 5 +++-- >>> package/systemd/systemd.mk | 16 ++++++++++++++-- >>> system/Config.in | 6 +++--- >>> 4 files changed, 29 insertions(+), 10 deletions(-) >>> >>> diff --git a/package/systemd/Config.in b/package/systemd/Config.in >>> index 45a9e2d644..f35305c0be 100644 >>> --- a/package/systemd/Config.in >>> +++ b/package/systemd/Config.in >>> @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD >>> depends on !BR2_STATIC_LIBS # kmod >>> depends on BR2_TOOLCHAIN_USES_GLIBC >>> depends on BR2_TOOLCHAIN_HAS_SSP >>> - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 >>> + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 >>> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 >>> depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd >>> select BR2_PACKAGE_HAS_UDEV >>> @@ -51,7 +51,11 @@ menuconfig BR2_PACKAGE_SYSTEMD >>> an elaborate transactional dependency-based service control >>> logic. It can work as a drop-in replacement for sysvinit. >>> >>> - Systemd requires a Linux kernel >= 3.13 with the following >>> + Kernel versions below 4.15 ("recommended baseline") have >>> + significant gaps in functionality and are not recommended >>> + for use with this version of systemd. >>> + >>> + Systemd requires a Linux kernel >= 3.15 with the following >>> options enabled: >>> >>> - CONFIG_DEVTMPFS >>> @@ -66,9 +70,11 @@ menuconfig BR2_PACKAGE_SYSTEMD >>> - CONFIG_PROC_FS >>> - CONFIG_FHANDLE (libudev, mount and bind mount handling) >>> >>> - - CONFIG_NET_NS (needed by PrivateNetwork=, used in some >>> + - CONFIG_NET_NS (Required for PrivateNetwork=, used in some >>> systemd units) >>> >>> + - CONFIG_USER_NS (Required for PrivateUsers=) >>> + >>> - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS >>> - CONFIG_TMPFS_POSIX_ACL >>> - CONFIG_TMPFS_XATTR >>> diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash >>> index 3b98566f32..00c08edcd9 100644 >>> --- a/package/systemd/systemd.hash >>> +++ b/package/systemd/systemd.hash >>> @@ -1,5 +1,5 @@ >>> # sha256 locally computed >>> -sha256 638a2fc78828765fc97bc73f428205b6dc1d359149b6c6bfe4d2a649cba2cca8 systemd-250.8.tar.gz >>> +sha256 cf2d27e67663d599a045101c7178cf0ec63d9df2962a54adf7de0d0357724f00 systemd-252.4.tar.gz >>> sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 >>> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 >>> sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt >>> @@ -8,7 +8,8 @@ sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENS >>> sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 LICENSES/LGPL-2.0-or-later.txt >>> sha256 5bcef4fedbfc08776630e65d5d0d074dd31208037eddb167ca46a9ec4f737764 LICENSES/Linux-syscall-note.txt >>> sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENSES/lookup3-public-domain.txt >>> +sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENSES/MIT-0.txt >>> sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt >>> sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt >>> sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt >>> -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md >>> +sha256 da9b2c7b8cd10516fd2c4279b82496ea61787148f13e899c62fc8988c5fac34f LICENSES/README.md >>> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk >>> index b96873b73f..b0597f9bb4 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.8 >>> +SYSTEMD_VERSION = 252.4 >>> SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) >>> SYSTEMD_LICENSE = \ >>> LGPL-2.1+, \ >>> @@ -29,6 +29,7 @@ SYSTEMD_LICENSE = \ >>> BSD-3-Clause (tools/chromiumos), \ >>> CC0-1.0 (few source files, see LICENSES/README.md), \ >>> GPL-2.0 with Linux-syscall-note (linux kernel headers), \ >>> + MIT-0 (few source files, see LICENSES/README.md), \ >>> MIT (few source files, see LICENSES/README.md), \ >>> OFL-1.1 (Heebo fonts) >>> SYSTEMD_LICENSE_FILES = \ >>> @@ -40,6 +41,7 @@ SYSTEMD_LICENSE_FILES = \ >>> LICENSES/LGPL-2.0-or-later.txt \ >>> LICENSES/Linux-syscall-note.txt \ >>> LICENSES/lookup3-public-domain.txt \ >>> + LICENSES/MIT-0.txt \ >>> LICENSES/MIT.txt \ >>> LICENSES/murmurhash2-public-domain.txt \ >>> LICENSES/OFL-1.1.txt \ >>> @@ -61,7 +63,13 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg >>> SYSTEMD_PROVIDES = udev >>> >>> SYSTEMD_CONF_OPTS += \ >>> + -Ddbus=false \ >>> + -Ddbus-interfaces-dir=no \ >>> + -Ddefault-compression='auto' \ >>> -Ddefault-hierarchy=unified \ >>> + -Ddefault-locale='C.UTF-8' \ >>> + -Ddefault-user-shell=/bin/sh \ >>> + -Dfirst-boot-full-preset=false \ >>> -Didn=true \ >>> -Dima=false \ >>> -Dkexec-path=/usr/sbin/kexec \ >>> @@ -72,6 +80,7 @@ SYSTEMD_CONF_OPTS += \ >>> -Dman=false \ >>> -Dmount-path=/usr/bin/mount \ >>> -Dmode=release \ >>> + -Dnspawn-locale='C.UTF-8' \ >>> -Dnss-systemd=true \ >>> -Dquotacheck-path=/usr/sbin/quotacheck \ >>> -Dquotaon-path=/usr/sbin/quotaon \ >>> @@ -82,6 +91,7 @@ SYSTEMD_CONF_OPTS += \ >>> -Dsulogin-path=/usr/sbin/sulogin \ >>> -Dsystem-gid-max=999 \ >>> -Dsystem-uid-max=999 \ >>> + -Dsysupdate=false \ >>> -Dsysvinit-path= \ >>> -Dsysvrcnd-path= \ >>> -Dtelinit-path= \ >>> @@ -553,7 +563,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi >>> SYSTEMD_CONF_OPTS += \ >>> -Defi=true \ >>> -Dgnu-efi=true \ >>> - -Defi-cc=$(TARGET_CC) \ >>> -Defi-ld=bfd \ >>> -Defi-libdir=$(STAGING_DIR)/usr/lib \ >>> -Defi-includedir=$(STAGING_DIR)/usr/include/efi >>> @@ -793,6 +802,8 @@ HOST_SYSTEMD_CONF_OPTS = \ >>> -Dbinfmt=false \ >>> -Drepart=false \ >>> -Dcoredump=false \ >>> + -Ddbus=false \ >>> + -Ddbus-interfaces-dir=no \ >>> -Dpstore=false \ >>> -Doomd=false \ >>> -Dlogind=false \ >>> @@ -801,6 +812,7 @@ HOST_SYSTEMD_CONF_OPTS = \ >>> -Dmachined=false \ >>> -Dportabled=false \ >>> -Dsysext=false \ >>> + -Dsysupdate=false \ >>> -Duserdb=false \ >>> -Dhomed=false \ >>> -Dnetworkd=false \ >>> diff --git a/system/Config.in b/system/Config.in >>> index 806a747315..232bdfe763 100644 >>> --- a/system/Config.in >>> +++ b/system/Config.in >>> @@ -125,19 +125,19 @@ config BR2_INIT_SYSTEMD >>> depends on BR2_TOOLCHAIN_USES_GLIBC >>> depends on BR2_TOOLCHAIN_HAS_SSP >>> depends on BR2_TOOLCHAIN_HAS_THREADS >>> - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 >>> + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 >>> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 >>> depends on BR2_HOST_GCC_AT_LEAST_5 >>> select BR2_ROOTFS_MERGED_USR >>> select BR2_PACKAGE_SYSTEMD >>> select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT >>> >>> -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5" >>> +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" >>> depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS >>> depends on BR2_USE_MMU >>> depends on !BR2_TOOLCHAIN_USES_GLIBC || \ >>> !BR2_TOOLCHAIN_HAS_SSP || \ >>> - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || \ >>> + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ >>> !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ >>> !BR2_HOST_GCC_AT_LEAST_5 >>> From arnout at mind.be Tue Feb 7 21:57:27 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:57:27 +0100 Subject: [Buildroot] [PATCH v8 4/4] system: Warn if systemd is used with kernel < 4.15 In-Reply-To: <20230115114840.9027-4-nolange79@gmail.com> References: <20230115114840.9027-1-nolange79@gmail.com> <20230115114840.9027-4-nolange79@gmail.com> Message-ID: On 15/01/2023 12:48, Norbert Lange wrote: > To quote the README: > >> Kernel versions below 4.15 have significant gaps in functionality and >> are not recommended for use with this version of systemd. Taint flag >> 'old-kernel' will be set. Systemd will most likely still function, but >> upstream support and testing are limited. > > Signed-off-by: Norbert Lange > Reviewed-by: James Hilliard Finally applied to master and pushed. Regards, Arnout > --- > system/Config.in | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/system/Config.in b/system/Config.in > index 232bdfe763..70ddf8df3c 100644 > --- a/system/Config.in > +++ b/system/Config.in > @@ -141,6 +141,15 @@ comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and targe > !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ > !BR2_HOST_GCC_AT_LEAST_5 > > +comment "systemd highly recommends headers >= 4.15" > + depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS > + depends on BR2_USE_MMU > + depends on BR2_TOOLCHAIN_USES_GLIBC > + depends on BR2_TOOLCHAIN_HAS_SSP > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > + depends on BR2_HOST_GCC_AT_LEAST_5 > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 > + > config BR2_INIT_NONE > bool "None" > select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT From thomas.petazzoni at bootlin.com Tue Feb 7 21:55:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:55:49 +0100 Subject: [Buildroot] [git commit] gitlab-ci: fix pipelines Message-ID: <20230207215916.6C638843C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a016b693f7830f3c8ae815851d3204b8b6e99821 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When gitlab prepares a job to run, it checks out the repository with a non-root user, and spawns a container that runs as root, with some UID mapping that makes the files be owned by root in the container. However, our pipelines run as a nont-root user. Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated the docker image that is used to run in our pipelines. That new image includes a git version that is stricter about the ownership of the git tree it is acting in: git aborts in error when the user running it does not own the repository. We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} rules, so they all fail (in various ways). To fix this, we either need to fix the ownership or tell git to ignore the situation. It is most probably impossible to change the ownership of the files: we run as non-root,and the files belong to root (in the container). So we're stuck. The alternative, is to do as git suggest, and tell it to ignore the situation. In a local setup, this would be very insecure, but in the pipelines, this is in a throw-away container, where a single user exists and is running, so we don't care much (if at all). Add a global before_script that registers the git config to ignore ownership issues in the buildroot repository; see [0] for the definition of the CI_PROJECT_DIR variable. Note: unlike what is said in there, and in [1], the value actually seen in CI_PROJECT_DIR is already prefixed with CI_BUILDS_DIR (the documentation is unclear about that point). [0] https://docs.gitlab.com/ee/ci/variables/predefined_variables.html [1] https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/misc/gitlab-ci.yml.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 9c1faf0d5f..38aca31fb5 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -1,3 +1,6 @@ +before_script: + - git config --global --add safe.directory ${CI_PROJECT_DIR} + .check-check-package_base: script: - python3 -m pytest -v utils/checkpackagelib/ From thomas.petazzoni at bootlin.com Tue Feb 7 21:57:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:57:06 +0100 Subject: [Buildroot] [git commit] package/xz: fix microblaze compiles Message-ID: <20230207215916.76BF5843A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bed21bb9b462bece7cd1b9741643aa553ced4d35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Patch xz to check if __attribute__((symver ..)) is supported via a compile check during configure. Fixes: http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni --- .../xz/0001-Detect-symver-attribute-support.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch new file mode 100644 index 0000000000..9ec43ea7a0 --- /dev/null +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -0,0 +1,61 @@ +From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 08:51:24 -0600 +Subject: [PATCH] Detect symver attribute support + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://github.com/tukaani-project/xz/pull/32 +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vincent Fazio +--- + configure.ac | 9 +++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5ad5589..08c623a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -791,6 +791,15 @@ else + time with Libtool if neither --with-pic nor + --without-pic is used). This define must be + used together with liblzma_linux.map.]) ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE( ++ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ])], ++ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], ++ [Define to 1 if GCC supports the symver attribute])], ++ []) ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic +diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h +index 11fec52..1d2ef9c 100644 +--- a/src/liblzma/common/common.h ++++ b/src/liblzma/common/common.h +@@ -76,7 +76,7 @@ + // too (which doesn't support __symver__) so use it to detect if __symver__ + // is available. This should be far more reliable than looking at compiler + // version macros as nowadays especially __GNUC__ is defined by many compilers. +-# if lzma_has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define LZMA_SYMVER_API(extnamever, type, intname) \ + extern __attribute__((__symver__(extnamever))) \ + LZMA_API(type) intname +-- +2.25.1 + From thomas.petazzoni at bootlin.com Tue Feb 7 21:55:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:55:49 +0100 Subject: [Buildroot] [git commit] gitlab-ci: don't use before_script in job templates Message-ID: <20230207215916.5D8E3843C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e92bb8f1c9523227413500380df16bfc64053fad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When gitlab prepares a job to run, it checks out the repository with a non-root user, and spawns a container that runs as root, with some UID mapping that makes the files be owned by root in the container. However, our pipelines run as a nont-root user. Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated the docker image that is used to run in our pipelines. That new image includes a git version that is stricter about the ownership of the git tree it is acting in: git aborts in error when the user running it does not own the repository. We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} rules, so they all fail (in various ways). To fix this, we either need to fix the ownership or tell git to ignore the situation. In either case, we'll need to run a scriptlet before all our jobs. Gitlab-ci allows to provide a global before_script, that is inherited by all jobs. However, some of our jobs already declare a before_script, and that would shadow the global before_script. There is no technical reason to do our before_script separately from the actual script, so we move the code from the before_scripts to the corresponding scripts. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/misc/gitlab-ci.yml.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 0ccf36665e..9c1faf0d5f 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -23,9 +23,8 @@ - utils/check-symbols .defconfig_check: - before_script: - - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') script: + - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - support/scripts/check-dotconfig.py .config configs/${DEFCONFIG_NAME} @@ -44,10 +43,9 @@ } .defconfig_base: - before_script: + script: - DEFCONFIG_NAME=${CI_JOB_NAME} - OUTPUT_DIR=output - script: - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} @@ -72,13 +70,12 @@ - runtime-test.log .runtime_test_base: - before_script: - - TEST_CASE_NAME=${CI_JOB_NAME} # Keep build directories so the rootfs can be an artifact of the job. The # runner will clean up those files for us. # Multiply every emulator timeout by 10 to avoid sporadic failures in # elastic runners. script: + - TEST_CASE_NAME=${CI_JOB_NAME} - echo "Starting runtime test ${TEST_CASE_NAME}" - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} artifacts: @@ -91,9 +88,8 @@ .test_pkg: stage: build - before_script: - - OUTPUT_DIR=${CI_JOB_NAME} script: + - OUTPUT_DIR=${CI_JOB_NAME} - echo "Configure Buildroot for ${OUTPUT_DIR}" - make O=${OUTPUT_DIR} syncconfig - make O=${OUTPUT_DIR} savedefconfig From thomas.petazzoni at bootlin.com Tue Feb 7 22:03:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:03:03 +0100 Subject: [Buildroot] [git commit] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring Message-ID: <20230207220358.796F7843E5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c8ee42bbe6ebb7f20978b06a581c42733197ae2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The vendoring done for cargo / go packages (may) need git, so ensure we check for it in dependencies, similar to how it is done for packages directly using git. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5d618c6b39..82187d7db9 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1250,6 +1250,13 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD +# cargo/go vendoring (may) need git +ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),cargo) +DL_TOOLS_DEPENDENCIES += git +else ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),go) +DL_TOOLS_DEPENDENCIES += git +endif + DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. From thomas.petazzoni at bootlin.com Tue Feb 7 22:03:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:03:10 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: ensure git is >= 2.0.0 for vendoring Message-ID: <20230207220358.83F32843E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f229564c36ec64c1f1292b7281ae0bd33840d7a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The go vendoring fails on CentOS 7 (which uses git 1.8.3.1) with errors related to shallow clones: make docker-compose-source .. go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 github.com/docker/compose/v2/pkg/mocks imports github.com/theupdateframework/notary/client imports github.com/docker/go/canonical/json: github.com/docker/go at v1.5.1-1.0.20160303222718-d30aec9fd63c: invalid pseudo-version: git fetch --unshallow -f origin in /home/jacmet/source/buildroot-mirror/output/host/share/go-path/pkg/mod/cache/vcs/48fbd2dfabec81f4c93170677bfc89087d4bec07a2d08f6ca5ce3d17962677ee: exit status 128: fatal: git fetch-pack: expected shallow list make[1]: *** [/home/jacmet/source/buildroot-mirror/output/build/docker-compose-2.15.1/.stamp_downloaded] Error 1 It works with git 2.0.0 (released May 2014, included in Debian 8), so check for >= 2.0.0 with logic similar to the GNU patch version check. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 0aa5e59274..cf6635bff6 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -174,6 +174,16 @@ for prog in perl tar wget cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do echo " xargs is usually part of the findutils package in your distribution" fi fi + + # we need git >= 2.0.0 for shallow clones / vendoring + if test $prog = "git" ; then + GIT_VERSION="$(git --version | sed -n 's/^git version \(.*\)/\1/p')" + GIT_MAJOR="$(echo "${GIT_VERSION}" | cut -d . -f 1)" + if [ "${GIT_MAJOR}" -lt 2 ]; then + echo "You have git '${GIT_VERSION}' installed. Git >= 2.0.0 is required" + exit 1 + fi + fi done if test "${missing_progs}" = "yes" ; then From thomas.petazzoni at bootlin.com Tue Feb 7 22:06:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:06:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/xz: fix microblaze compiles In-Reply-To: <20230207170303.2508780-1-vfazio@xes-inc.com> References: <20230207170303.2508780-1-vfazio@xes-inc.com> Message-ID: <20230207230623.022d91da@windsurf> On Tue, 7 Feb 2023 11:03:03 -0600 Vincent Fazio wrote: > From: Vincent Fazio > > Patch xz to check if __attribute__((symver ..)) is supported via a > compile check during configure. > > Fixes: > http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// > > Signed-off-by: Vincent Fazio > --- > ...0001-Detect-symver-attribute-support.patch | 61 +++++++++++++++++++ > 1 file changed, 61 insertions(+) > create mode 100644 package/xz/0001-Detect-symver-attribute-support.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 22:06:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:06:48 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring In-Reply-To: <20230207170040.3503236-1-peter@korsgaard.com> References: <20230207170040.3503236-1-peter@korsgaard.com> Message-ID: <20230207230648.7f2efda5@windsurf> On Tue, 7 Feb 2023 18:00:39 +0100 Peter Korsgaard wrote: > The vendoring done for cargo / go packages (may) need git, so ensure we > check for it in dependencies, similar to how it is done for packages > directly using git. > > Signed-off-by: Peter Korsgaard > --- > package/pkg-generic.mk | 7 +++++++ > 1 file changed, 7 insertions(+) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From ju.o at free.fr Tue Feb 7 22:09:37 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 7 Feb 2023 23:09:37 +0100 Subject: [Buildroot] [PATCH 1/5] DEVELOPERS: add Julien Olivain for package/openmpi Message-ID: <20230207220941.58066-1-ju.o@free.fr> The package has been orphan since commit ee58353 (2018-12-22). Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index d7c4d03c4c..156c5dac13 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1689,6 +1689,7 @@ F: package/gnupg2/ F: package/glslsandbox-player/ F: package/octave/ F: package/ola/ +F: package/openmpi/ F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ -- 2.39.1 From ju.o at free.fr Tue Feb 7 22:09:38 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 7 Feb 2023 23:09:38 +0100 Subject: [Buildroot] [PATCH 2/5] package/openmpi: bump to version 4.1.4 In-Reply-To: <20230207220941.58066-1-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> Message-ID: <20230207220941.58066-2-ju.o@free.fr> Notable changes in this commit: - change from v4.0.x to v4.1.x "current" version series, - move the sha256 hash out of the "Locally computed" section, as the value comes from the download page, - the LICENSE file hash changed, as the file was updated (copyright years updated and new contributors added), - the IME (Infinite Memory Engine), introduced in v4.1.x, is disabled to workaround a failure when cross-compiled, - the package now requires a toolchain with atomic support, and needs to link against libatomic when needed. For change log since v4.0.0, see: - https://github.com/open-mpi/ompi/blob/v4.1.4/NEWS#L61 Signed-off-by: Julien Olivain --- Tested on branch master at commit 4fbd2f6 with commands: make check-package ... 0 warnings generated ./utils/test-pkg -a -p openmpi arm-aarch64 [ 1/44]: OK bootlin-aarch64-glibc [ 2/44]: OK bootlin-arcle-hs38-uclibc [ 3/44]: OK bootlin-armv5-uclibc [ 4/44]: OK bootlin-armv7-glibc [ 5/44]: OK bootlin-armv7m-uclibc [ 6/44]: SKIPPED bootlin-armv7-musl [ 7/44]: OK bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED bootlin-m68k-68040-uclibc [ 9/44]: OK bootlin-microblazeel-uclibc [10/44]: OK bootlin-mipsel32r6-glibc [11/44]: OK bootlin-mipsel-uclibc [12/44]: OK bootlin-nios2-glibc [13/44]: OK bootlin-openrisc-uclibc [14/44]: OK bootlin-powerpc64le-power8-glibc [15/44]: OK bootlin-powerpc-e500mc-uclibc [16/44]: OK bootlin-riscv32-glibc [17/44]: OK bootlin-riscv64-glibc [18/44]: OK bootlin-riscv64-musl [19/44]: OK bootlin-sh4-uclibc [20/44]: OK bootlin-sparc64-glibc [21/44]: OK bootlin-sparc-uclibc [22/44]: SKIPPED bootlin-x86-64-glibc [23/44]: OK bootlin-x86-64-musl [24/44]: OK bootlin-x86-64-uclibc [25/44]: OK bootlin-xtensa-uclibc [26/44]: OK br-arm-basic [27/44]: SKIPPED br-arm-full-nothread [28/44]: SKIPPED br-arm-full-static [29/44]: SKIPPED br-i386-pentium4-full [30/44]: OK br-i386-pentium-mmx-musl [31/44]: OK br-mips64-n64-full [32/44]: OK br-mips64r6-el-hf-glibc [33/44]: OK br-powerpc-603e-basic-cpp [34/44]: SKIPPED br-powerpc64-power7-glibc [35/44]: OK linaro-aarch64-be [36/44]: OK linaro-aarch64 [37/44]: OK linaro-arm [38/44]: OK sourcery-arm-armv4t [39/44]: OK sourcery-arm [40/44]: OK sourcery-arm-thumb2 [41/44]: OK sourcery-mips64 [42/44]: OK sourcery-mips [43/44]: OK sourcery-nios2 [44/44]: OK 44 builds, 7 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/openmpi/Config.in | 1 + package/openmpi/openmpi.hash | 10 +++++----- package/openmpi/openmpi.mk | 17 ++++++++++++++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/package/openmpi/Config.in b/package/openmpi/Config.in index 4413c55f9c..80b01a26e1 100644 --- a/package/openmpi/Config.in +++ b/package/openmpi/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_OPENMPI bool "openmpi" depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # dlfcn.h diff --git a/package/openmpi/openmpi.hash b/package/openmpi/openmpi.hash index a399adc758..745ed7c580 100644 --- a/package/openmpi/openmpi.hash +++ b/package/openmpi/openmpi.hash @@ -1,6 +1,6 @@ -# From: https://www.open-mpi.org/software/ompi/v4.0/ -md5 e3da67df1e968c8798827e0e5fe9a510 openmpi-4.0.0.tar.bz2 -sha1 fee1d0287abfb150bae16957de342752c9bdd4e8 openmpi-4.0.0.tar.bz2 +# From: https://www.open-mpi.org/software/ompi/v4.1/ +md5 f057e12aabaf7dd5a6a658180fca404e openmpi-4.1.4.tar.bz2 +sha1 357c61a8e06e103d987c0e4a054e8780a034c8b1 openmpi-4.1.4.tar.bz2 +sha256 92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d openmpi-4.1.4.tar.bz2 # Locally computed -sha256 2f0b8a36cfeb7354b45dda3c5425ef8393c9b04115570b615213faaa3f97366b openmpi-4.0.0.tar.bz2 -sha256 8298a80ed5f09cfd007bae1c0e7d67d1c2810c6389876778dad070c31a691dac LICENSE +sha256 2db71de9577ebfe15c186605844c470dcecd3717f4ef0118c9440d801c0f58f8 LICENSE diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index 8bdc3fa188..f14b55ced5 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -4,14 +4,21 @@ # ################################################################################ -OPENMPI_VERSION_MAJOR = 4.0 -OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).0 +OPENMPI_VERSION_MAJOR = 4.1 +OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).4 OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2 OPENMPI_LICENSE = BSD-3-Clause OPENMPI_LICENSE_FILES = LICENSE OPENMPI_INSTALL_STAGING = YES +# The macro searching for IME (Infinite Memory Engine) filesystem +# brings "-I/usr/local/include" in the CPPFLAGS, even if not +# found. This makes the configuration fail. See: +# https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 +# Disable explicitly to avoid the issue. +OPENMPI_CONF_OPTS = --without-ime + # Enabling Fortran support requires pre-seeding the configure script # with various values that cannot be guessed, so we provide cache # files for various architectures. @@ -43,6 +50,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) OPENMPI_CFLAGS += -O0 endif -OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +OPENMPI_LIBS += -latomic +endif + +OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" LIBS="$(OPENMPI_LIBS)" $(eval $(autotools-package)) -- 2.39.1 From ju.o at free.fr Tue Feb 7 22:09:39 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 7 Feb 2023 23:09:39 +0100 Subject: [Buildroot] [PATCH 3/5] package/openmpi: enable mpi compiler wrapper scripts In-Reply-To: <20230207220941.58066-1-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> Message-ID: <20230207220941.58066-3-ju.o@free.fr> openmpi normally includes compiler wrapper binary programs (e.g. mpicc, mpicxx, etc...). Those programs are inconvenient when cross compiling. Those target binary wrappers are useless in Buildroot, as the target root filesystem does not include compilers. For cross compilation, openmpi also ships Perl scripts providing a subset of those functions. With those compiler wrappers, openmpi programs can now be cross compiled properly in Buildroot. This patch enables those wrappers. Signed-off-by: Julien Olivain --- package/openmpi/openmpi.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index f14b55ced5..e6f5cd0250 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -17,7 +17,9 @@ OPENMPI_INSTALL_STAGING = YES # found. This makes the configuration fail. See: # https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 # Disable explicitly to avoid the issue. -OPENMPI_CONF_OPTS = --without-ime +OPENMPI_CONF_OPTS = \ + --enable-script-wrapper-compilers \ + --without-ime # Enabling Fortran support requires pre-seeding the configure script # with various values that cannot be guessed, so we provide cache -- 2.39.1 From ju.o at free.fr Tue Feb 7 22:09:40 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 7 Feb 2023 23:09:40 +0100 Subject: [Buildroot] [PATCH 4/5] package/openmpi-examples: new package In-Reply-To: <20230207220941.58066-1-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> Message-ID: <20230207220941.58066-4-ju.o@free.fr> This is a "meta" package reusing definitions and files from openmpi. Openmpi examples are shipped in the main library sources, including build wrappers. The library and the wrappers need to be built and installed in staging prior trying to compile an example. This purpose if this package is to handle cleanly those dependencies. Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + package/Config.in | 1 + package/openmpi-examples/Config.in | 8 +++++ .../openmpi-examples/openmpi-examples.hash | 1 + package/openmpi-examples/openmpi-examples.mk | 29 +++++++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 package/openmpi-examples/Config.in create mode 120000 package/openmpi-examples/openmpi-examples.hash create mode 100644 package/openmpi-examples/openmpi-examples.mk diff --git a/DEVELOPERS b/DEVELOPERS index 156c5dac13..3d1c3a2a83 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1690,6 +1690,7 @@ F: package/glslsandbox-player/ F: package/octave/ F: package/ola/ F: package/openmpi/ +F: package/openmpi-examples/ F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ diff --git a/package/Config.in b/package/Config.in index 06d0a05854..e08511fd9a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1961,6 +1961,7 @@ menu "Networking" source "package/open62541/Config.in" source "package/openldap/Config.in" source "package/openmpi/Config.in" + source "package/openmpi-examples/Config.in" source "package/openpgm/Config.in" source "package/openzwave/Config.in" source "package/ortp/Config.in" diff --git a/package/openmpi-examples/Config.in b/package/openmpi-examples/Config.in new file mode 100644 index 0000000000..caaa02d802 --- /dev/null +++ b/package/openmpi-examples/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_OPENMPI_EXAMPLES + bool "openmpi-examples" + select BR2_PACKAGE_OPENMPI + help + This package includes the hello_c example from openmpi. It + is mainly used as a simple openmpi program to test the + libraries. It is also a recipe example for cross compiling + an openmpi program with the mpicc wrappers. diff --git a/package/openmpi-examples/openmpi-examples.hash b/package/openmpi-examples/openmpi-examples.hash new file mode 120000 index 0000000000..b8afe5e2d9 --- /dev/null +++ b/package/openmpi-examples/openmpi-examples.hash @@ -0,0 +1 @@ +../openmpi/openmpi.hash \ No newline at end of file diff --git a/package/openmpi-examples/openmpi-examples.mk b/package/openmpi-examples/openmpi-examples.mk new file mode 100644 index 0000000000..be679333c7 --- /dev/null +++ b/package/openmpi-examples/openmpi-examples.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# openmpi-examples +# +################################################################################ + +OPENMPI_EXAMPLES_VERSION = $(OPENMPI_VERSION) +OPENMPI_EXAMPLES_SOURCE = $(OPENMPI_SOURCE) +OPENMPI_EXAMPLES_DL_SUBDIR = openmpi +OPENMPI_EXAMPLES_SITE = $(OPENMPI_SITE) +OPENMPI_EXAMPLES_LICENSE = $(OPENMPI_LINCENSE) +OPENMPI_EXAMPLES_LICENSE_FILES = $(OPENMPI_LICENSE_FILES) + +OPENMPI_EXAMPLES_DEPENDENCIES = openmpi + +define OPENMPI_EXAMPLES_BUILD_CMDS + $(TARGET_MAKE_ENV) PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) OPAL_DESTDIR=$(STAGING_DIR)/usr \ + mpicc \ + $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + -o $(@D)/examples/hello_c \ + $(@D)/examples/hello_c.c +endef + +define OPENMPI_EXAMPLES_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/examples/hello_c \ + $(TARGET_DIR)/usr/bin/ompi_hello_c +endef + +$(eval $(generic-package)) -- 2.39.1 From ju.o at free.fr Tue Feb 7 22:09:41 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 7 Feb 2023 23:09:41 +0100 Subject: [Buildroot] [PATCH 5/5] support/testing: add test for openmpi In-Reply-To: <20230207220941.58066-1-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> Message-ID: <20230207220941.58066-5-ju.o@free.fr> This openmpi runtime test attempt to run the "hello_c" example program on a 8 cpu Aarch64 system. It expects the same amount of "Hello, world" messages. Signed-off-by: Julien Olivain --- Tested on branch master at commit 4fbd2f6 with commands: make check-package ... 0 warnings generated python3 -m flake8 support/testing/tests/package/test_openmpi.py [no-output] support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_openmpi ... OK --- DEVELOPERS | 1 + support/testing/tests/package/test_openmpi.py | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 support/testing/tests/package/test_openmpi.py diff --git a/DEVELOPERS b/DEVELOPERS index 3d1c3a2a83..c6587b10e1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1715,6 +1715,7 @@ F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ +F: support/testing/tests/package/test_openmpi.py F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_hkdf.py diff --git a/support/testing/tests/package/test_openmpi.py b/support/testing/tests/package/test_openmpi.py new file mode 100644 index 0000000000..86a42a0145 --- /dev/null +++ b/support/testing/tests/package/test_openmpi.py @@ -0,0 +1,53 @@ +import os + +import infra.basetest + + +class TestOpenMPI(infra.basetest.BRTest): + # We use a "virt" Aarch64 machine to have smp and 512M of memory + 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.92" + 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_OPENMPI_EXAMPLES=y + """ + + def test_run(self): + num_cpu = 8 + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern_file = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern_file, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-smp", str(num_cpu), "-cpu", "cortex-a57", "-m", "512M", "-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("ompi_info --all") + + # "--allow-run-as-root" option is needed because mpirun + # normally refuse to start as root, as a security mechanism. + # "--mca plm_rsh_agent /bin/true" is needed because openmpi + # silently fails if the "rsh" binary is not present in the + # system, even if it's not used. We define it as "/bin/true", + # as a workaround. + # The hello_c example will spawn one job per cpu. We expect + # the same number of "Hello, world," output as the number of + # cpus. + cmd = "mpirun" \ + " --allow-run-as-root" \ + " --mca plm_rsh_agent /bin/true" \ + " /usr/bin/ompi_hello_c" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + all_output = ''.join(output) + self.assertEqual(all_output.count('Hello, world,'), num_cpu) -- 2.39.1 From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:16 +0100 Subject: [Buildroot] [PATCH v2] package/rtl8821cu: fix build failure due to missing Linux options In-Reply-To: <20230114003122.1475047-1-giulio.benetti@benettiengineering.com> References: <20230114003122.1475047-1-giulio.benetti@benettiengineering.com> Message-ID: <20230207231316.0cb2528e@windsurf> On Sat, 14 Jan 2023 01:31:22 +0100 Giulio Benetti wrote: > Fixes: > http://autobuild.buildroot.net/results/aea/aea6bc1e4f89bd1010dfdc9caa54c37edb567d5f/ > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * drop CONFIG_PLATFORM_ change > --- > package/rtl8821cu/rtl8821cu.mk | 8 ++++++++ > 1 file changed, 8 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:42 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add Giulio Benetti to package rtl8821cu In-Reply-To: <20230114002552.1427592-1-giulio.benetti@benettiengineering.com> References: <20230114002552.1427592-1-giulio.benetti@benettiengineering.com> Message-ID: <20230207231342.3a0663c0@windsurf> On Sat, 14 Jan 2023 01:25:52 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti > --- > DEVELOPERS | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:07 +0100 Subject: [Buildroot] [git commit] package/rtl8821cu: fix build failure due to missing Linux options Message-ID: <20230207221510.3543D84406@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=737964e2f12057a0d968a2f10197e80e91ba65eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/aea/aea6bc1e4f89bd1010dfdc9caa54c37edb567d5f/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8821cu/rtl8821cu.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk index 18222e0014..97f50d9633 100644 --- a/package/rtl8821cu/rtl8821cu.mk +++ b/package/rtl8821cu/rtl8821cu.mk @@ -9,6 +9,14 @@ RTL8821CU_SITE = $(call github,morrownr,8821cu-20210118,$(RTL8821CU_VERSION)) RTL8821CU_LICENSE = GPL-2.0 RTL8821CU_LICENSE_FILES = LICENSE +define RTL8821CU_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB) +endef + RTL8821CU_USER_EXTRA_CFLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ -DCONFIG_IOCTL_CFG80211 \ From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:33 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Giulio Benetti to package rtl8821cu Message-ID: <20230207221510.4115884426@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfad9bef35e984f00ae70f1cd51cc75b89ff5efc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index d7c4d03c4c..2cb3361c83 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1163,6 +1163,7 @@ F: package/rtl8723bu/ F: package/rtl8723ds/ F: package/rtl8812au-aircrack-ng/ F: package/rtl8821au/ +F: package/rtl8821cu/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ F: package/sunxi-tools/ From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:52 +0100 Subject: [Buildroot] [git commit] package/perl-mail-dkim: bump version to 1.20220520 Message-ID: <20230207221510.4EF638442A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57a64a702a1c162a33097db7ee7e069fb64b39df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-mail-dkim/perl-mail-dkim.hash | 4 ++-- package/perl-mail-dkim/perl-mail-dkim.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-mail-dkim/perl-mail-dkim.hash b/package/perl-mail-dkim/perl-mail-dkim.hash index e94adfc6ed..6edeaa9d8b 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.hash +++ b/package/perl-mail-dkim/perl-mail-dkim.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9de35f8aa77a85dc17423cbcce2bf46d Mail-DKIM-1.20200824.tar.gz -sha256 871d329830acb4840423aa59036622fb2ee394efc1d09316dcc32ae94454e916 Mail-DKIM-1.20200824.tar.gz +md5 5a0dec58f0c2526521b2952a3c126906 Mail-DKIM-1.20220520.tar.gz +sha256 8ac4b8c84bbfad00a3d24bf676493d207dd3cd4a735efabb9e17181534f23646 Mail-DKIM-1.20220520.tar.gz # computed by scancpan sha256 ffaa40feb768566e52d93879fedd2c5483828b6de483874f30a0a4425351555f LICENSE diff --git a/package/perl-mail-dkim/perl-mail-dkim.mk b/package/perl-mail-dkim/perl-mail-dkim.mk index e67bf5ee18..f3383a02bf 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.mk +++ b/package/perl-mail-dkim/perl-mail-dkim.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MAIL_DKIM_VERSION = 1.20200824 +PERL_MAIL_DKIM_VERSION = 1.20220520 PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MB/MBRADSHAW PERL_MAIL_DKIM_LICENSE = Artistic or GPL-1.0+ From thomas.petazzoni at bootlin.com Tue Feb 7 22:15:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:15:16 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/perl-mail-dkim: bump version to 1.20220520 In-Reply-To: <20230113210753.23966-1-bernd.kuhls@t-online.de> References: <20230113210753.23966-1-bernd.kuhls@t-online.de> Message-ID: <20230207231516.2a8c962e@windsurf> On Fri, 13 Jan 2023 22:07:53 +0100 Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls > --- > v2: fixed hash file (Peter) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Tue Feb 7 22:15:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 23:15:17 +0100 Subject: [Buildroot] [PATCH 2/2] gitlab-ci: fix pipelines In-Reply-To: References: <393e263cc9e0f72b237b6bf5cda86101ded50101.1675805584.git.yann.morin.1998@free.fr> Message-ID: <20230207221517.GC2817@scaer> Romain, All, On 2023-02-07 22:57 +0100, Romain Naour spake thusly: > Is "fix pipelines" your WIP patch subject ? > "gitlab-ci: ignore ownership of the git tree" seems better? No, I really intended to write "fix pipeline". Indeed, the subject of a commit log should be a summary of the semantic change, not of how it is done. Thanks for the review! :-) Regards, Yann E. MORIN. > Le 07/02/2023 ? 22:33, Yann E. MORIN a ?crit?: > > When gitlab prepares a job to run, it checks out the repository with a > > non-root user, and spawns a container that runs as root, with some UID > > mapping that makes the files be owned by root in the container. However, > > our pipelines run as a nont-root user. > > > > Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated > > the docker image that is used to run in our pipelines. > > > > That new image includes a git version that is stricter about the > > ownership of the git tree it is acting in: git aborts in error when the > > user running it does not own the repository. > > > > We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} > > rules, so they all fail (in various ways). > > > > To fix this, we either need to fix the ownership or tell git to ignore > > the situation. > > > > It is most probably impossible to change the ownership of the files: we > > run as non-root,and the files belong to root (in the container). So > > we're stuck. > > > > The alternative, is to do as git suggest, and tell it to ignore the > > situation. In a local setup, this woujld be very insecure, but in the > > pipelines, this is in a throw-away container, wehre a single user exists > > and is running, so we don't care much (if at all). > > > > Add a global before_script that registers the git config to ignore > > ownership issues in the buildroot repository; see [0] for the definition > > of the CI_PROJECT_DIR variable. Note: unlike what is said in there, and > > in [1], the value actually seen in CI_PROJECT_DIR is already prefixed > > with CI_BUILDS_DIR (the documentation is unclear about that point). > > > > [0] https://docs.gitlab.com/ee/ci/variables/predefined_variables.html > > [1] https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section > > Reviewed-by: Romain Naour > > > > > > Signed-off-by: Yann E. MORIN > > Cc: Arnout Vandecappelle (Essensium/Mind) > > Cc: Romain Naour > > Cc: Thomas Petazzoni > > --- > > support/misc/gitlab-ci.yml.in | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in > > index 9c1faf0d5f..38aca31fb5 100644 > > --- a/support/misc/gitlab-ci.yml.in > > +++ b/support/misc/gitlab-ci.yml.in > > @@ -1,3 +1,6 @@ > > +before_script: > > + - git config --global --add safe.directory ${CI_PROJECT_DIR} > > Note: I checked if we have the issue using the utils/docker-run directly, > enabling safe.directory is not necessary. > > Best regards, > Romain > > > > + > > .check-check-package_base: > > script: > > - python3 -m pytest -v utils/checkpackagelib/ > > _______________________________________________ > 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 thomas.petazzoni at bootlin.com Tue Feb 7 22:17:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:17:46 +0100 Subject: [Buildroot] [git commit] package/php: bump version to 8.2.1 Message-ID: <20230207222121.8497284440@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90ab065162a35b8aa2c429903e3d59d4ad2c0d7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_2 Updated license hash due to copyright year bump: https://github.com/php/php-src/commit/bf2867bc7235dfb65675ff4e9c21c8bc537726e2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/php/php.hash | 4 ++-- package/php/php.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 23ec84f19f..a9c3b7640b 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 e16e47a872d58685913ac848ce92ec49f42c1828110c98c65fb6265a08724a1a php-8.1.14.tar.xz +sha256 650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af php-8.2.1.tar.xz # License file -sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE +sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 23dd4ba96f..372d55f68a 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.1.14 +PHP_VERSION = 8.2.1 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Tue Feb 7 22:22:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:22:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.2.1 In-Reply-To: <20230112115802.3374366-1-bernd.kuhls@t-online.de> References: <20230112115802.3374366-1-bernd.kuhls@t-online.de> Message-ID: <20230207232200.7de2a1c3@windsurf> On Thu, 12 Jan 2023 12:58:02 +0100 Bernd Kuhls wrote: > Changelog: > https://www.php.net/ChangeLog-8.php#PHP_8_2 > > Updated license hash due to copyright year bump: > https://github.com/php/php-src/commit/bf2867bc7235dfb65675ff4e9c21c8bc537726e2 > > Signed-off-by: Bernd Kuhls > --- > package/php/php.hash | 4 ++-- > package/php/php.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 yann.morin.1998 at free.fr Tue Feb 7 22:23:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 23:23:19 +0100 Subject: [Buildroot] [git commit] package/gcc: map debug prefix when reproducible Message-ID: <20230207224638.41D4084453@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9a92ea1cb1dd2aa9b3f9c83c04d7d01c1f6e148 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When building with BR2_REPRODUCIBLE the toolchain wrapper passes -fdebug-prefix-map for all packages that are built. But this doesn't affect the target libraries (like libgcc) built by GCC's build system. GCC 4.3 added a configure option to set the debug prefix map for these libraries, which is used here to avoid encoding potentially non-reproducible build paths into the debug data. Signed-off-by: John Keeping Signed-off-by: Yann E. MORIN --- package/gcc/gcc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index ec6f3b550a..6dfd93f2a4 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -84,6 +84,10 @@ HOST_GCC_COMMON_CONF_OPTS = \ --with-bugurl="http://bugs.buildroot.net/" \ --without-zstd +ifeq ($(BR2_REPRODUCIBLE),y) +HOST_GCC_COMMON_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot +endif + # Don't build documentation. It takes up extra space / build time, # and sometimes needs specific makeinfo versions to work HOST_GCC_COMMON_CONF_ENV = \ From yann.morin.1998 at free.fr Tue Feb 7 22:47:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 23:47:54 +0100 Subject: [Buildroot] [PATCH v2] package/gcc: map debug prefix when reproducible In-Reply-To: <20230207195810.2016594-1-john@metanate.com> References: <20230207195810.2016594-1-john@metanate.com> Message-ID: <20230207224754.GD2817@scaer> John, All, On 2023-02-07 19:58 +0000, John Keeping spake thusly: > When building with BR2_REPRODUCIBLE the toolchain wrapper passes > -fdebug-prefix-map for all packages that are built. But this doesn't > affect the target libraries (like libgcc) built by GCC's build system. > > GCC 4.3 added a configure option to set the debug prefix map for these > libraries, which is used here to avoid encoding potentially > non-reproducible build paths into the debug data. > > Signed-off-by: John Keeping After burnng through ~80% of my battery testing this: applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes since v1: > - Add the option to GCC common config, not just gcc-final > > package/gcc/gcc.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk > index ec6f3b550a..6dfd93f2a4 100644 > --- a/package/gcc/gcc.mk > +++ b/package/gcc/gcc.mk > @@ -84,6 +84,10 @@ HOST_GCC_COMMON_CONF_OPTS = \ > --with-bugurl="http://bugs.buildroot.net/" \ > --without-zstd > > +ifeq ($(BR2_REPRODUCIBLE),y) > +HOST_GCC_COMMON_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot > +endif > + > # Don't build documentation. It takes up extra space / build time, > # and sometimes needs specific makeinfo versions to work > HOST_GCC_COMMON_CONF_ENV = \ > -- > 2.39.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 Tue Feb 7 22:53:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 23:53:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix BR2_SHARED_STATIC_LIBS In-Reply-To: <20220531190702.107175-1-fontaine.fabrice@gmail.com> References: <20220531190702.107175-1-fontaine.fabrice@gmail.com> Message-ID: <20230207225340.GE2817@scaer> Fabrice, All, This patch has now reached the infamous status of being the oldest patch in our backlog... Sorry for that. :-( On 2022-05-31 21:07 +0200, Fabrice Fontaine spake thusly: > --static is added to pkg-config call with BR2_SHARED_STATIC_LIBS As already noticed by Thomas, this is not correct. In fact, zabix uses custom --enable-{stati,shared} options, instead of usingthe standard libtool directives: 1276 AC_ARG_ENABLE(static,[ --enable-static Build statically linked binaries], 1277 [case "${enableval}" in 1278 yes) 1279 LDFLAGS="${LDFLAGS} -static" 1280 AC_MSG_CHECKING(if static linking is possible) This is where your -static is coming from, and is causing those issues. So, your fix is technically correct (but see below), but for the wrong reasons. > Signed-off-by: Fabrice Fontaine > --- > package/zabbix/zabbix.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk > index adc54028ad..85fd193b4d 100644 > --- a/package/zabbix/zabbix.mk > +++ b/package/zabbix/zabbix.mk > @@ -125,6 +125,13 @@ endif > > endif # BR2_PACKAGE_ZABBIX_SERVER > > +# With BR2_SHARED_STATIC_LIBS=y, the generic infrastructure adds > +# --static when calling pkg-config resulting in a build failure with You'll also need to update that comment, of course. Can you fix the commit log and the comment, and respin, please? Again, sorry for the ong delay... Regards, Yann E. MORIN. > +# libcurl or openssl. Adding --disable-static reverts this > +ifeq ($(BR2_SHARED_STATIC_LIBS),y) > +ZABBIX_CONF_OPTS += --disable-static > +endif > + > define ZABBIX_INSTALL_INIT_SYSTEMD > $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ > $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ > -- > 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 romain.naour at smile.fr Tue Feb 7 22:57:03 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 23:57:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.67.0 In-Reply-To: References: <20230131050319.2821287-1-james.hilliard1@gmail.com> Message-ID: <085ae495-8020-d57c-fa8c-71e6f800f84b@smile.fr> Hello Sebastian, Le 06/02/2023 ? 17:30, Sebastian WEYER a ?crit?: > Hi all, > > On 31/01/2023 06:03, James Hilliard wrote: >> Link to Rust 1.67.0 announcement: https://blog.rust-lang.org/2023/01/26/Rust-1.67.0.html >> >> Signed-off-by: James Hilliard >> --- >> package/rust-bin/rust-bin.hash | 252 ++++++++++++++++----------------- >> package/rust-bin/rust-bin.mk | 2 +- >> package/rust/rust.hash | 6 +- >> package/rust/rust.mk | 2 +- >> 4 files changed, 131 insertions(+), 131 deletions(-) >> >> diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash >> index adf1799ad7..d00e6342e8 100644 >> --- a/package/rust-bin/rust-bin.hash >> +++ b/package/rust-bin/rust-bin.hash >> @@ -1,129 +1,129 @@ >> -# From https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc >> -sha256 a1279760f91b3571733e0b0268128d143be2734916753900b5fe7b8ecc3c0900 rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc >> -sha256 835b4e1b4d396674f7866a83b9a4f44db16fd12f01a7eaed527282b3700a9b92 rust-1.66.1-i686-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc >> -sha256 c7349617c42274bf50f6e3662dfb4f6832a93780099c3bb510be1a5b93d04c37 rust-1.66.1-mips-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc >> -sha256 fc38663870f0af47a27241d980ca886c3f7d432267920deb412ac8576bef68f0 rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc >> -sha256 2b1a6c54db49a9e62d60cc96c1768f405e0f4c59d698186bf3a28a1bb017b6b5 rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc >> -sha256 777d3a650448c15048710282388e90d10740540f570f5d17ed4a2dbdabb89552 rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc >> -sha256 875bb310bae7c8c1d2d228a49aa4b547608b6c807ddc9ec44bc87272c77d869b rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc >> -sha256 89164ccf75909b3d02bdcb787e33876cad87e55ab0e6239b030b4b6631ed356a rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc >> -sha256 e83f9fc473072db23376783595a008cdd9b2f2e9b3be109e55939392864840eb rust-1.66.1-s390x-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc >> -sha256 a201aa4595ec8015662b7103b1409a4787c6d1f1d540bb68746633527d855858 rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc >> -sha256 9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24 rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc >> -sha256 520ac446f20490685cc4d73192cfbb4c9b9e55c884aa4ae2b098e3a54d891de8 rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc >> -sha256 42afd189ef64988f64976f767a734734bccd7c71e578780e902148c98226fa29 rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc >> -sha256 506126773af9c3dacc506776a0b2e12fe6fa0c95eaf4f4ebb5cdbd335feb83fa rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.asc >> -sha256 3d21b478fbf07bd27902bdd189e6988341f0c2c0108b538f926cea3031bc8ea6 rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.asc >> -sha256 5282fc97111a7eafbead3463ed7bc0f3065332f21aec6a39a740157fe42f943a rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.asc >> -sha256 0ebf0178bbe9c5572d1db89e190dee23aef0e2f667995abedbd66e33d0bd73ab rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.asc >> -sha256 938e7442c21ea0895c44ec78fa718ea1d3abe32ed0425ed328c905e188af250e rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc >> -sha256 bdc491f4c05669e7a3382b6bfdaeaa20e2cfa5ef553305df0e0d73729a45e6e4 rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.asc >> -sha256 d75c6dc3c00d662b0d3f6ce7fde0f76057542edfbc97a20b29247842c8a711d2 rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.asc >> -sha256 830285e5388081c68fac9dc955aa824a4d919b0e24eadc6e0b95b30103d79db9 rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.asc >> -sha256 d720bd1e493f53797f90d83dbe6d52ecbe1ff3cae282f4b2e18c37fe92c9adf6 rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.asc >> -sha256 90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17 rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.asc >> -sha256 c4bab2d63223d0c6e63806082e30d8c38b37eefc10ee2e7380971e3012c00bca rust-std-1.66.1-i586-unknown-linux-musl.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.asc >> -sha256 b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.asc >> -sha256 52013329eb6697d94f5dce01dd509b4b93b473c18a3a2c05d0230b9dfeab14d1 rust-std-1.66.1-i686-unknown-linux-musl.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.asc >> -sha256 e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568 rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.asc >> -sha256 23f917eccaca59d4c911eb96d8ffefe86834dbcdf902c9ab6dad8558c31c4575 rust-std-1.66.1-mips-unknown-linux-musl.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc >> -sha256 70d1406e0981d5d31c1d3f85c848bba0476e0ff6203e7706f66b4d2212f01b66 rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.asc >> -sha256 0fd221d4b4205ce548e83f0e7416c8332eb12b64d5a43c0b3ed61e9f7d6edf13 rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc >> -sha256 132d6d5750a877972ebc6f23e831f2ef3077465b2ab24ca645d32ea83c496fe3 rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.asc >> -sha256 533f370368ac8b6192e1450289c64544ebf9cacc38c3a52ef6c0ecded7ee6fa5 rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc >> -sha256 8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.asc >> -sha256 d7028820888d0decde047a6e77b866e690532aa09522c9a23a3fbf8780a72257 rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc >> -sha256 417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1 rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc >> -sha256 7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35 rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc >> -sha256 4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770 rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc >> -sha256 776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc >> -sha256 51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062 rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.asc >> -sha256 3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927 rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc >> -sha256 c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377 rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc >> -sha256 a9710727ba28955deb7fbec799faed19486c9af3c7e3088ec6659a257515ffca rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc >> +sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc >> +sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc >> +sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc >> +sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc >> +sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc >> +sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc >> +sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc >> +sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc >> +sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc >> +sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc >> +sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc >> +sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc >> +sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc >> +sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc >> +sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc >> +sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc >> +sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc >> +sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc >> +sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc >> +sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc >> +sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc >> +sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc >> +sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc >> +sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc >> +sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc >> +sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc >> +sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc >> +sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc >> +sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc >> +sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc >> +sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc >> +sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc >> +sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc >> +sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc >> +sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc >> +sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc >> +sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc >> +sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc >> +sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc >> +sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc >> +sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc >> +sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz >> # Locally generated >> sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE >> sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT >> diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk >> index 89009288f4..d62ce39cfc 100644 >> --- a/package/rust-bin/rust-bin.mk >> +++ b/package/rust-bin/rust-bin.mk >> @@ -6,7 +6,7 @@ >> >> # When updating this version, check whether support/download/cargo-post-process >> # still generates the same archives. >> -RUST_BIN_VERSION = 1.66.1 >> +RUST_BIN_VERSION = 1.67.0 >> RUST_BIN_SITE = https://static.rust-lang.org/dist >> RUST_BIN_LICENSE = Apache-2.0 or MIT >> RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT >> diff --git a/package/rust/rust.hash b/package/rust/rust.hash >> index 545a452bf0..2a260ca64f 100644 >> --- a/package/rust/rust.hash >> +++ b/package/rust/rust.hash >> @@ -1,6 +1,6 @@ >> -# From https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc >> -sha256 07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe rustc-1.66.1-src.tar.xz >> +# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc >> +sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz >> # Locally generated >> sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE >> sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT >> diff --git a/package/rust/rust.mk b/package/rust/rust.mk >> index 691683b492..d14ad3a3e7 100644 >> --- a/package/rust/rust.mk >> +++ b/package/rust/rust.mk >> @@ -6,7 +6,7 @@ >> >> # When updating this version, check whether support/download/cargo-post-process >> # still generates the same archives. >> -RUST_VERSION = 1.66.1 >> +RUST_VERSION = 1.67.0 >> RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz >> RUST_SITE = https://static.rust-lang.org/dist >> RUST_LICENSE = Apache-2.0 or MIT > > I just tested rust-bin with the following command: > > ./support/testing/run-tests -o test-output -d test-dl/ -k > tests.package.test_rust.TestRustBin > > and verified that it passes with the message "OK". > > Tested-by: Sebastian Weyer Sadly the host-rust package fail to build. Indeed the bootstrap code is broken We have to backport this patch from upstream: https://github.com/rust-lang/rust/commit/3fe64ebbce21e79adb64099984e96dfb79bdd0f9 I know tests.package.test_rust.TestRust takes ages to build :) Best regards, Romain > > Best regards, > Sebastian > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Wed Feb 8 00:53:43 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 7 Feb 2023 17:53:43 -0700 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: fix relative toolchain_csv paths Message-ID: <20230208005343.2544457-1-james.hilliard1@gmail.com> The default toolchain_csv path is a relative path to the buildroot directory. If we run genrandconfig with a cwd that is not the buildroot directory the default toolchain_csv path will be wrong. To fix this prepend the buildroot directory path to the toolchain_csv path whenever the toolchain_csv path is not absolute. Fixes: FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' Signed-off-by: James Hilliard --- utils/genrandconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index b3576f8a51..b96f2ee6de 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -115,6 +115,9 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): toolchain configuration is itself an array of lines of the defconfig. """ + if not os.path.isabs(toolchains_csv): + toolchains_csv = os.path.join(buildrootdir, toolchains_csv) + with open(toolchains_csv) as r: # filter empty lines and comments lines = [t for t in r.readlines() if len(t.strip()) > 0 and t[0] != '#'] -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 8 07:10:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 08 Feb 2023 07:10:52 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-07 Message-ID: <20230208071058.ABFF681EBE@smtp1.osuosl.org> Hello, Autobuild statistics for 2023-02-07 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 4 | 2 | 0 | 6 | 2022.11.x | 22 | 23 | 0 | 45 | master | 154 | 189 | 0 | 343 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 10 linux-6.1.9 | 8 xz-5.2.10 | 8 elfutils-0.186 | 7 host-pahole-1.24 | 7 jack2-1.9.21 | 7 libgpg-error-1.46 | 7 unknown | 7 norm-1.5.8 | 6 host-binutils-2.38 | 4 host-libxml-parser-perl-2.46 | 4 host-rust-1.67.0 | 4 host-sentry-cli-2.8.0 | 4 libgcrypt-1.10.1 | 4 libglib2-2.72.3 | 4 ntp-4.2.8p15 | 3 ocf-linux-20171122 | 3 python-bcrypt-4.0.1 | 3 python-bunch-1.0.1 | 3 python-cryptography-39.0.0 | 3 bash-5.2.15 | 2 cairo-1.16.0 | 2 freeradius-client-1.1.7 | 2 host-binutils-2.39 | 2 host-gcc-initial-10.4.0 | 2 host-go-1.19.5 | 2 host-libarchive-3.6.2 | 2 host-runc-1.1.4 | 2 libnss-3.87 | 2 libsolv-0.7.22 | 2 perl-5.36.0 | 2 quickjs-2021-03-27 | 2 sudo-1.9.12p2 | 2 zabbix-5.4.9 | 2 assimp-5.2.5 | 1 bat-0.19.0 | 1 binutils-arc-2020.09-release | 1 brltty-6.5 | 1 busybox-1.36.0 | 1 coreutils-9.1 | 1 dmalloc-5.6.5 | 1 dust-0.8.1 | 1 efivar-38 | 1 ffmpeg-4.4.3 | 1 fluent-bit-2.0.8 | 1 fontconfig-2.13.1 | 1 frr-8.4.2 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gerbera-1.10.0 | 1 glibc-2.36-81-g4f4d7a13edfd... | 1 google-breakpad-c85eb4a59b6... | 1 gpm-1.20.7 | 1 host-binutils-2.37 | 1 host-delve-1.20.0 | 1 host-gcc-final-11.3.0 | 1 host-gdb-arc-2020.09-releas... | 1 host-moby-buildkit-0.11.2 | 1 host-rust-1.66.1 | 1 hyperfine-1.14.0 | 1 jemalloc-5.3.0 | 1 libabseil-cpp-20220623.1 | 1 libdeflate-1.15 | 1 libxcrypt-4.4.29 | 1 lightning-2.2.0 | 1 linux-5.10.162-cip24-rt10 | 1 lirc-tools-0.10.2 | 1 ltp-testsuite-20220930 | 1 mender-3.4.0 | 1 mosh-1.4.0 | 1 mosquitto-2.0.15 | 1 openblas-0.3.21 | 1 opencv3-3.4.17 | 1 openssh-9.1p1 | 1 opkg-0.4.5 | 1 optee-client-3.19.0 | 1 ply-2.3.0 | 1 python-numpy-1.23.5 | 1 qpdf-10.5.0 | 1 rtl_433-22.11 | 1 ruby-3.1.3 | 1 sdl-1.2.15 | 1 tcf-agent-1.7.0 | 1 toolchain-external-codescap... | 1 uboot-tools-2021.07 | 1 uclibc-1.0.42 | 1 valgrind-3.19.0 | 1 wolfssl-5.5.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/369364fb03677d36f9f0895b64dbbdc9b4840905 | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/a5eec813d00c88b8418b7ed8f3ae0d32cc4f42d2 | ORPH sh4 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/7387e42f025e1d40c062d519a5e82e7ec2100bbe | ORPH s390x | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/87ff6f6f5b92254ba7a119b7220d8b452a75031c | arceb | binutils-arc-2020.09-release | NOK | http://autobuild.buildroot.net/results/2c24bc780bf45e6c2d2ebbabc216a0144ed5605f | microblazeel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/ddff46b136f7a06a3cd17b7bd2035ea818279c77 | mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/39259b5d19570cf5320bff34deaae4bdcbd94218 | ORPH arm | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/25500de8b56a736ef6882cd6024dc6e47fbfae24 | arm | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/ead46ad592b9464fb8528e226a08a72eb54f8b1f | sh4aeb | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/17881a17e2a62f3f0756dabb4e645d4a8d029b72 | ORPH powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/22fefed9ac5f097929a4e1c2c08e240a6ceb1d2f | ORPH powerpc64 | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/c480f50fdb370f75d8114c04525f8038cf7209d1 | ORPH arm | efivar-38 | NOK | http://autobuild.buildroot.net/results/b6caf7157cc030575d1b88715dffa3fe9135045d | arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/77f78162b7120d3d81c57233d67c66f2b7dae079 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/9bf79715f52b96d09b10c151568652579e4b91b4 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/4dbfdf37f37c065a064e29d3a0266851165b0d76 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/9c345a5d3762715866b38b7542d196110b029c63 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/da326dbf644fcc47fb9b9f625e2ed284b4682786 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3cb1f817f94ae29b962cd0020f608cfe139d15e5 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/6fe4cf52ff89da6df7edff12c4bb92efe2ecb783 | ORPH arm | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/6e577ef6458cf752ddf8c1e4e2e28145a36a365e | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/8a1e017f57a3a1da0e692995ffe2974a6aae3154 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/0ba6e1419700f7f2e14c91ed8c75f156d3c02972 | ORPH riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/a67b10eb688689b4ee7c42af0e1f53a36ea14b09 | riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/443502c7c4134eb942e790c94ff2265af455b3da | xtensa | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/63f8a5b01522c3674798103ced95e0a7b5aa62f3 | m68k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/6d1b4495b4a48337a3948f58b294a36472848b8b | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/c45b87281222bcdc4b802de4f457e3955eb466c9 | arc | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/e81c9a1567d9933672e478acfd23ef16405c73b9 | arm | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/a3c51db5e8d45b0aa668688747a147988019bad2 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/ea241163e72a5e35e265633598e48667eea670f8 | powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0e8a955d91c155598c6bb39b3cee37461800eceb | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5822f300f70ff0c54ef6703204d3b8600dd25623 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/31ae7237bca0b133cb6fe0867917523eafe281d7 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/aed8a025eebf8806379c342a6c5d88fb427af532 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f134044e45fbf8fca658cd5e74596570e239494c | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1a8b36cce91302c6c10bbe81dd9cf86ad747eb21 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5e8aa41a618a512a6ee3c9732b24c6336dffa6e7 | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7306353b97e5601d9c41369c0965038bd99b27ab | ORPH powerpc | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5d334e95e9967e489b16ffd7d8ccb1d65326c1b5 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5dd22984664f63f3f3d85afb4be26ffc50ce6bb7 | ORPH arm | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/c932b37dcc5009f6eff130145640bc8f97942fd1 | mips64 | gpm-1.20.7 | NOK | http://autobuild.buildroot.net/results/f184254ffaeb9ac220080182388df86c74811f91 | aarch64_be | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/4a19d203cbae166b127e427b6ff9dc5987be4a99 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e63033b9fbc27fa2d86819cea1a854a1484f88ee | aarch64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/5e7a9a0c401b300064a03404250e6c82c0dad47c | or1k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/739be78400db2f4053cc42163caf2f34f9102296 | powerpc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e7db68f3921c7ecca96aad878836fe541d05a35b | nios2 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/68a9d2e5281d33870fd1a58e4afb7555ae5f2cc1 | nios2 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/63921029c9d2302eef577cd7ba97f7e2dae16fe3 | riscv64 | host-delve-1.20.0 | NOK | http://autobuild.buildroot.net/results/482d53008d13fcce7727e80dcb4cac558c247892 | arceb | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/28417f0d08aa2476dcc32b0ac5f400d852b7eac6 | sparc | host-gcc-initial-10.4.0 | NOK | http://autobuild.buildroot.net/results/43d0d72c5512f5c47ae03064df9d928e2e7fa3aa | mipsel | host-gcc-initial-10.4.0 | NOK | http://autobuild.buildroot.net/results/0d6d8071b576f39c023e08202f2cc5834a6e0124 | arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/cef1626e6a176abc1515ae6623e7c1e74799fcff | ORPH powerpc64le | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/34c4169c8bdcc76631a0802b8192c3f5101b9d40 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/402b7df63416e399bd82afd2acc85e1081e3cb18 | m68k | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/5bbc80c994f6e374c99ec9893c4f2b5e99d8c9fd | s390x | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/656789900210563458db18e85e2c4822c9cc568d | sh4eb | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/b159a497f159764e481abc7270b49991776bbc29 | powerpc64le | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/509c057bc68c9f88eca61aa4329d2053bb07cc6f | powerpc64 | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/8941db077afdd3e2ce5f19b367770d290f53463c | i586 | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/1667b4ebd8e16e7d8b47bc3ca128a76daf27b4d9 | arm | host-moby-buildkit-0.11.2 | NOK | http://autobuild.buildroot.net/results/1c99bee6ca50a616a9d051680f2a5e2b2a8bc5c6 | microblaze | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/072a93370150c48c7b9e217a88d679607e8aa8ba | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/acdc8a14ef350aab3f7bac1751447e6f16032392 | arc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/9a680f7f0e6a6b816965ee87b9a05b56f5aeedf2 | s390x | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/84325744ad149e89e03e7c5bfa0b226d35cb2df2 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/e5b52367fd30545bca59d9d7432117dd0f5d5427 | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c131098c4e6565d1057d4496f0bd6c62601e0586 | riscv32 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/db092d2d68bfd38045f585a282a0f87704a995d6 | microblaze | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/a4b8651fd53839b44015c6e31d491dd24125f65b | riscv64 | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/3633cfbd6b9c61a78a085695a6ab481691241acd | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/35d10808c36ec5819b000e0714961d46e3661913 | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/214fcbb3458893784b7f85b60f7ee1edb428c77f | s390x | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/94d9916d5aa662e6f600699cab3bc02ff718247b | s390x | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/081c59f8586dc35cb5482848e304be473c4b1c35 | i686 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/133a60a9ea8ea72298f259da47b54575d81f8ab3 | mips64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/7e214009f2464e379ef8e466dac792d212d89723 | arc | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/4a344740169f7877e57c1f3d2571680033406de6 | powerpc64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/c06d0065340d94f3fea14b7d19512c2e95277d4c | aarch64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/914dc3fdfc32cb34265e4cd5cc63e48a4a3e2f9e | i686 | hyperfine-1.14.0 | NOK | http://autobuild.buildroot.net/results/fa32372398ddd3c5dcc7311a571ec3b2e3328a23 | ORPH aarch64_be | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/ca97bf61bea150fbd9e5085382ff7eff16645d3c | or1k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/c5a51ae1ffca857372825a044b9f7183483c8656 | i586 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/a9a99e0ef6754e3a9cbb6a87ddc072de5ad2c0b0 | x86_64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/5f9f0591e99357d199b2e654c945416e631eba36 | x86_64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/4bed6de09e27729a1f9190bc5d334f876b58e86a | microblaze | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/28f2b6f360179d46bcfd23b85d6ec216a3ab865d | microblazeel | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/aa049eb39eb52d8dceafd3694648045a6acd85ee | sh4aeb | jemalloc-5.3.0 | NOK | http://autobuild.buildroot.net/results/294c639cafd67f12151932cc0ab3d0d44230f4c1 | mips64el | libabseil-cpp-20220623.1 | NOK | http://autobuild.buildroot.net/results/783f33881f2d83f3b3578acf159b7914c4bca757 | arm | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/83e68fae08c2391f8fb4b41b76fcdcbc6efaea80 | arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/edcbecc775dc1ca57aa5768736d31101b123d86f | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/a1b02acc4ea7f7c5c21e4553f51ce9c70202fc87 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/735b12bf38b1b03aef910bc93211f05200cc06a0 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/7a97dc5d8158fc5197865747c69bc8481916c048 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/b04bfc92e7423bf4df640424833f5b52775c491f | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/7dd51dab00ec4d2648b735b56bf38c08603ceaba | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/e9358d8b0cb2c2ee2c8998cadbc7cebe8c07fdf6 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/7da758345002eb670853646bcdf0e5359efb047e | aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/b89852411d06e0bb79fd18e0c91a247421ddb48c | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/149d316b80613f97746ff0a1fdbdf4cf4ed2406c | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/ec803460a63594843a6d8d2b91c8edb58538f00a | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/a0c6b5a6e202e59c7f40c97d838b0ed4ffd02594 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/6b8093a3cb26cbea5089765380efe2e39315b191 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/faf7be9344a95baa6e73415ffd67016454ee2cbe | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/1a26f3d5e449ef5ddb546e0bb754f9918828455e | ORPH microblaze | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/eb99f24f00a578c270a76f4142f1f692f3ee3f6a | i486 | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/3c8d15a0498a1c2ef1aa9e4fd8dfd330f07c2808 | nios2 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/f90ae4c6fd523e1df79ab89522b8dc74e2e3df8a | arm | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/2adb760067bf333cf079494e8fa17688aa4b537e | nios2 | libxcrypt-4.4.29 | NOK | http://autobuild.buildroot.net/results/0d44b92ba0320da923e665cda9d5d6739a3f5409 | sparc | lightning-2.2.0 | NOK | http://autobuild.buildroot.net/results/35025cb5ad509770a7198d9b6b1b25a375ddde05 | riscv32 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/ede8bd2897e5b387a560e33e5cbf765bdb687e3b | ORPH powerpc | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/9a4232a6e0d1960ddba9aed9e778a60d813d25ba | ORPH mips64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/c74b1040e5a0d2f2619ee81ef9f2d925862d6f7b | ORPH mips64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/766a85c985c894753d2fb39555b7861a9cc5ffd2 | ORPH sh4a | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/1f7afb73947794da50f336f272790dc7b426923b | ORPH sparc64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/a90cf3cdd92c41eba1c5598abcbd6763af95b91d | ORPH mips64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/8ef5a507978b1d9476609021dd7d873b0122e344 | ORPH mips64el | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/e05e46b38334c537c3ee9e78ae69008d8529305f | ORPH powerpc64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/a85a388e79457e59b96d8c1e1cdc711b8d301801 | ORPH powerpc | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/1e8d4c44bbb041706c1b53b0fe3db341b14af529 | ORPH arm | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/54da73c9bc2303885dc76861c818c3dbda39a9b6 | x86_64 | mender-3.4.0 | NOK | http://autobuild.buildroot.net/results/2bd80939b54f3e562af649f7a19a9d4148c8b91a | s390x | mosh-1.4.0 | NOK | http://autobuild.buildroot.net/results/820e98b1c126469b1f180f078d102ded43b9c40e | or1k | mosquitto-2.0.15 | NOK | http://autobuild.buildroot.net/results/e41611fb58a74a148294b17825555e314031cbc4 | mips | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/c2855d4a9465c29dd4a3e59d4f512a6fe462358b | ORPH arm | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/14d1c8a46c0dfba1dfa666f0659808028929f9d1 | ORPH mipsel | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/83644d2e049c767b4b517e77e20f9b921e264fd9 | ORPH aarch64_be | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/90bc9c9df8d2646d8e68329710f3e36ae1697c97 | ORPH sh4a | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/7dd9bf42c85f962638d0db641602243458243059 | ORPH powerpc64le | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/5960316e2be97b2aa047654f17364e8a4a120feb | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/459addd7bb5bd17ee2e11e24c3029c5ee3733460 | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/b61802195164e0ad34cbf97b21564b6177f26b0d | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/ea863135e793e5c72042a759f28be58fbf84ee01 | ORPH microblazeel | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/13b89b2bd548576bd4f666fff7e8c9a4a06edfab | ORPH microblaze | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/b80a3096303aac250f1be85a97a71bfdb0496230 | ORPH aarch64 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/ef326909228e905ff482410785646eeadb27568c | ORPH mips64el | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/8e1dfc1326aa047ecf070e8ff59566a77bde5fa2 | ORPH mips64 | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/88b4081bb9a4d4b088cbf55ef444a2b374db5622 | m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/21d61e81c940c75f8f474fd4270c389d791f0b36 | ORPH or1k | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/4fedaa7352154064f4a7b7e301faf87976956c52 | ORPH powerpc64 | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/d48aa36a8c1447f07053402eb39eaeb86be5a870 | arm | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/32e304a37e8e4d0e962ad898d7ed9b3de4ab4eb1 | powerpc64le | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/a2cf6b20fc746a07738b00876f05c33a29422a19 | x86_64 | ply-2.3.0 | NOK | http://autobuild.buildroot.net/results/8210bd2b9c67d6d7616ada525019b2658195416a | sparc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/79236e3f9a58493561d50dec3187902262294346 | i686 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/e676d3e3db2deb33b984cd39f02766a7c410449d | aarch64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/7c16e5c8548041682dc8fc4521e7e989133d9938 | mips64 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/c9d2e9830bd25d2f95c67fb7ea5cfda95a57414f | powerpc64le | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/c51deff4d3e536819085dc2ad127cd311eb2e9de | mips | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/bce4082fc07ec53dbe54e8591254ece9b973131f | arm | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/463ebd0c5c7f4518cec4afdaaef57052e7a63686 | arm | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/0ca9825b909d59cebcd6c562ab20ec61c556605a | sparc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/db4adf7e9665995cf900c44e3dd6920e10dc97d9 | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/dfe6b1a0096a5701b06274df2ae755ed8232d5da | xtensa | qpdf-10.5.0 | NOK | http://autobuild.buildroot.net/results/d2b12640a2c545a31bf025e574f12fa215a90c07 | mips64 | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/f83677ea7206a28fa8558d4e7edd6b19314f90ea | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/6e491927e2dad71fbf98414140404f8a569bde3e | xtensa | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/2be7e78d1832a32a0e731e988d2a10de2a93edd0 | nios2 | ruby-3.1.3 | NOK | http://autobuild.buildroot.net/results/a3801b2526046eb440815afd014ec1b603828b0c | sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/ad135b1dc023a21d6d86b5e8ac746e3f7f08a0f0 | ORPH sparc | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/5467e94e7043fd0ecaf61d99e48e0b4dc0ce191c | ORPH armeb | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/f3c8d1e85dee16b557fada7bdb096574fa6c9181 | ORPH microblaze | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/4d4580e0b42a6fb877b91266ac89bc01d8d76fcc | mips | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/171f7286faf7cb1bbe72c77e8477cb524e50698c | ORPH arc | uboot-tools-2021.07 | NOK | http://autobuild.buildroot.net/results/cdbd6586286b3a3c148020eb71b855008c2be5ee | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/3bfbe9c4f6b10eb3ce4b79ee7cd3b44f2e3cd25d | mips | unknown | NOK | http://autobuild.buildroot.net/results/99a6b116cc342ca1dd2394f6c958d4886f0fd135 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/c804cddacd0d0dc73e7211f6da3bd10cd74907ae | mips | unknown | NOK | http://autobuild.buildroot.net/results/773c90606ad4decb55088f6f1f47ca0ac69d41fb | mips | unknown | NOK | http://autobuild.buildroot.net/results/a6398300c17e99dd4bbd40c4d333867a729bec91 | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/95ceef539d2f058e2b6b4fdd7538d9e62f75f554 | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/054a5c9e6e1703ac8ccdfa15cb0d2af050f827ae | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/d0b516068c3618377bb264e647841227220eb339 | powerpc | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/1ecbd6075bde3a1afb4ef4ef11213153a436e02f | ORPH mips64el | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/43ee1a457cbeb986d958c9a70cac0676377661c0 | microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/73ae9a2505372a4405f5ce8092a5acbe9004e0d5 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/86dbc2665f3f92a8372ce50ad93bb8879489de35 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/8ded9c328f42d6af686444ba3de5d4199ac86ae8 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/96fb86d82ddbeedcdb693b9e761854a4098c3ccf | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/93de09856d236d72f2c8970881f6bdc734aa38a1 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/e8ed8cbd3b7c1ca75c48577f62434f2baa6dc548 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/4dc0c88c1ed250dd5e1be492138bd6e1781128b4 | ORPH mips | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/1dbbefa655380f5ea562067fda897e792de649a3 | microblazeel | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/1240c47fb2b6ecd84a27938683194821164cc351 | Classification of failures by reason for 2022.02.x -------------------------------------------------- grpc-1.43.0 | 1 janus-gateway-0.11.6 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/9cf27ab26ef49aea17f91bf98024d60441436ce9 | nios2 | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/bb10b19e645ac889c9695b41bf69d24c36fd8021 | Classification of failures by reason for 2022.11.x -------------------------------------------------- host-go-1.19.5 | 2 janus-gateway-1.0.3 | 2 python-numpy-1.23.4 | 2 bzip2-1.0.8 | 1 dmalloc-5.6.5 | 1 efivar-38 | 1 fdk-aac-2.0.2 | 1 gerbera-1.10.0 | 1 gobject-introspection-1.72.0 | 1 host-binutils-2.37 | 1 host-binutils-2.39 | 1 host-libxml-parser-perl-2.46 | 1 host-pahole-1.24 | 1 libuhttpd-3.14.1 | 1 libxcrypt-4.4.29 | 1 nvme-1.12 | 1 uclibc-1.0.42 | 1 unknown | 1 xenomai-3.0.10 | 1 xz-5.2.7 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | bzip2-1.0.8 | NOK | http://autobuild.buildroot.net/results/aea930ea6ec35aa7f8023f50cdbf7e2e3f4388c3 | ORPH i586 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/f88af75188a69ddd956877e92e866e6a0a7169cf | ORPH mips64el | efivar-38 | NOK | http://autobuild.buildroot.net/results/170af89c5452290d927778538edea61bbdf0cbea | arm | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/43c3d7029f17b501077f347d0f9ffbe0b53d5c98 | mips64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/830e55d1f147a7226959afe656932fe6354c020a | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7d36c2e4f17d64c961b65825b5594cae7fc331d8 | ORPH powerpc | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/d1ab68d939acda7d2d5163586f78b3f5e105bc45 | microblazeel | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/70fd251d76e2f4d473f5ad3a0fda0e652b79d8fc | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f5bb3d5e9af58d5bd326cb8d11ba6f50823163ba | aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/1714553b7b9e12a1ef65f230be1cdbfc57721ad1 | powerpc64 | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/4a3b1f009e5e5a89f4a7a97576745a7b079d4092 | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/7c66c76666552cc4da121eedb0dbf273c6413062 | powerpc64le | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/e5d42082390bd044d4d2abb1260d559a1b4d214a | mips | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/6e1e24b83c42726f85033c2e67522a954ade3312 | mips64 | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/7ff2ca83c35540f693de777f2198e821053b8c3a | aarch64_be | libxcrypt-4.4.29 | NOK | http://autobuild.buildroot.net/results/16cba783be11cc5024f9c56bb0a7abb0acf13ef8 | mips | nvme-1.12 | NOK | http://autobuild.buildroot.net/results/faef1e36adbfb5a6098e1565c7512030c14d8fc5 | ORPH mips | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/e021295697946b8b3c9bb886df0c245d39686148 | x86_64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/c636f6876bf24b64b41864e3a130d1a3d222ca49 | powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/ed2c0a136242d6e195397c1392e9969db4f59d9c | arc | unknown | NOK | http://autobuild.buildroot.net/results/2b8723054580995da0b514a0a9d2ba7423514b30 | i686 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/9ccbb93fa06ed78983b33e5965f8e9d301aaed4a | microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/66c88d611e91d7df549c400259d2cac864eda3c1 | ORPH Gitlab CI results for 2023-02-07 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestAarch64Pages64kGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449186 | ORPH TestAarch64Pages64kMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449187 | ORPH TestAarch64Pages64kuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449189 | ORPH TestCheckPackage | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449530 | TestClangCompilerRT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448892 | ORPH TestCrudiniPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448894 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448896 | ORPH TestDropbear | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448898 | ORPH TestDtbocfg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448899 | ORPH TestExecline | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448900 | ORPH TestExt2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448844 | ORPH ...rch64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449203 | ORPH ...tlinAarch64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449205 | ORPH ...arch64MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449206 | ORPH ...otlinAarch64MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449208 | ORPH ...ch64UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449209 | ORPH ...linAarch64UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449212 | ORPH ...h64beGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449214 | ORPH ...inAarch64beGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449215 | ORPH ...64beUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449216 | ORPH ...nAarch64beUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449219 | ORPH ...750dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449220 | ORPH ...nArcle750dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449221 | ORPH ...ehs38GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449222 | ORPH ...inArclehs38GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449224 | ORPH ...hs38UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449225 | ORPH ...nArclehs38UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449227 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449228 | ORPH ...mebv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449229 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449232 | ORPH ...rmebv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449234 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449235 | ORPH ...ebv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449238 | ORPH ...5eabiGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449241 | ORPH ...inArmv5eabiGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449242 | ORPH ...v5eabiMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449247 | ORPH ...linArmv5eabiMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449250 | ORPH ...eabiUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449252 | ORPH ...nArmv5eabiUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449254 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449256 | ORPH ...Armv6eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449259 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449260 | ORPH ...nArmv6eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449261 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449262 | ORPH ...rmv6eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449264 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449265 | ORPH ...Armv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449267 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449268 | ORPH ...nArmv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449269 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449270 | ORPH ...rmv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449271 | ORPH ...mv7mUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449272 | ORPH ...tlinArmv7mUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449273 | ORPH ...8xxxUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449274 | ORPH ...nM68k68xxxUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449278 | ORPH ...fireUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449279 | ORPH ...8kcoldfireUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449283 | ORPH ...azebeGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449284 | ORPH ...icroblazebeGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449285 | ORPH ...lazebeMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449286 | ORPH ...MicroblazebeMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449287 | ORPH ...zebeUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449290 | ORPH ...croblazebeUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449291 | ORPH ...azeelGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449292 | ORPH ...icroblazeelGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449294 | ORPH ...lazeelMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449296 | ORPH ...MicroblazeelMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449299 | ORPH ...zeelUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449301 | ORPH ...croblazeelUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449303 | ORPH ...ips32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449304 | ORPH ...otlinMips32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449305 | ORPH ...Mips32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449306 | ORPH ...ootlinMips32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449307 | ORPH ...ps32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449309 | ORPH ...tlinMips32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449312 | ORPH ...s32elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449313 | ORPH ...linMips32elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449314 | ORPH ...ps32elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449316 | ORPH ...tlinMips32elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449317 | ORPH ...32elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449318 | ORPH ...inMips32elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449320 | ORPH ...2r5elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449321 | ORPH ...nMips32r5elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449323 | ORPH ...32r5elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449326 | ORPH ...inMips32r5elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449327 | ORPH ...r5elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449329 | ORPH ...Mips32r5elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449331 | ORPH ...2r6elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449332 | ORPH ...nMips32r6elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449333 | ORPH ...32r6elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449335 | ORPH ...inMips32r6elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449337 | ORPH ...r6elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449338 | ORPH ...Mips32r6elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449339 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449341 | ORPH ...Mips64eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449342 | ORPH ...4eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449344 | ORPH ...nMips64eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449346 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449348 | ORPH ...ips64eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449350 | ORPH ...64n32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449351 | ORPH ...inMips64n32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449354 | ORPH ...s64n32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449356 | ORPH ...linMips64n32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449358 | ORPH ...4n32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449361 | ORPH ...nMips64n32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449363 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449364 | ORPH ...ps64r6eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449367 | ORPH ...6eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449370 | ORPH ...ips64r6eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449371 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449374 | ORPH ...s64r6eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449375 | ORPH ...Nios2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449376 | ORPH ...ootlinNios2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449379 | ORPH ...enriscMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449380 | ORPH ...tlinOpenriscMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449381 | ORPH ...riscUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449382 | ORPH ...inOpenriscUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449384 | ORPH ...440fpGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449385 | ORPH ...owerpc440fpGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449386 | ORPH ...c440fpMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449388 | ORPH ...Powerpc440fpMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449389 | ORPH ...40fpUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449390 | ORPH ...werpc440fpUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449391 | ORPH ...e5500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449392 | ORPH ...erpc64e5500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449394 | ORPH ...e6500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449396 | ORPH ...erpc64e6500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449398 | ORPH ...4e6500MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449399 | ORPH ...werpc64e6500MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449401 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449402 | ORPH ...c64lepower8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449404 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449405 | ORPH ...pc64lepower8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449406 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449407 | ORPH ...rpc64power8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449408 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449409 | ORPH ...erpc64power8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449410 | ORPH ...300c3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449411 | ORPH ...werpce300c3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449413 | ORPH ...e300c3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449414 | ORPH ...owerpce300c3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449416 | ORPH ...00c3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449419 | ORPH ...erpce300c3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449421 | ORPH ...500mcGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449423 | ORPH ...werpce500mcGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449425 | ORPH ...e500mcMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449428 | ORPH ...owerpce500mcMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449429 | ORPH ...00mcUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449431 | ORPH ...erpce500mcUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449434 | ORPH ...lp32dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449437 | ORPH ...lp64dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449441 | ORPH ...iscv64lp64dGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449443 | ORPH ...4lp64dMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449446 | ORPH ...Riscv64lp64dMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449448 | ORPH ...p64dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449449 | ORPH ...scv64lp64dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449450 | ORPH ...0xz13GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449452 | ORPH ...linS390xz13GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449454 | ORPH ...Shsh4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449456 | ORPH ...ootlinShsh4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449458 | ORPH ...nShsh4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449460 | ORPH ...BootlinShsh4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449463 | ORPH ...hsh4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449465 | ORPH ...otlinShsh4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449469 | ORPH ...h4aebGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449474 | ORPH ...linShsh4aebGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449475 | ORPH ...sh4aebMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449476 | ORPH ...tlinShsh4aebMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449477 | ORPH ...arc64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449478 | ORPH ...tlinSparc64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449479 | ORPH ...rcv8UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449481 | ORPH ...linSparcv8UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449482 | ORPH ...X8664GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449483 | ORPH ...ootlinX8664GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449485 | ORPH ...nX8664MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449486 | ORPH ...BootlinX8664MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449487 | ORPH ...8664UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449489 | ORPH ...otlinX8664UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449490 | ORPH ...orei7GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449492 | ORPH ...X8664corei7GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449493 | ORPH ...corei7MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449494 | ORPH ...nX8664corei7MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449495 | ORPH ...rei7UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449497 | ORPH ...8664corei7UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449498 | ORPH ...664v2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449499 | ORPH ...8664v2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449500 | ORPH ...64v2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449501 | ORPH ...664v3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449502 | ORPH ...8664v3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449504 | ORPH ...64v3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449505 | ORPH ...664v4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449506 | ORPH ...8664v4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449507 | ORPH ...64v4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449509 | ORPH ...core2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449511 | ORPH ...linX86core2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449513 | ORPH ...6core2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449515 | ORPH ...tlinX86core2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449518 | ORPH ...ore2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449519 | ORPH ...inX86core2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449520 | ORPH ...6i686GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449521 | ORPH ...tlinX86i686GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449522 | ORPH ...86i686MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449524 | ORPH ...otlinX86i686MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449525 | ORPH ...i686UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449526 | ORPH ...linX86i686UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449527 | ORPH ...lx60UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449528 | ORPH ...Xtensalx60UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449529 | ORPH ...ToolchainBuildrootMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449191 | ORPH ...olchainBuildrootuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449192 | ORPH ...xternalToolchainCCache | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449193 | ORPH ...ernalToolchainCtngMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449195 | ORPH ...rnalToolchainLinaroArm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449197 | ORPH ...ToolchainSourceryArmv4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449198 | ORPH ...ToolchainSourceryArmv5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449201 | ORPH ...ToolchainSourceryArmv7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449202 | ORPH TestGdbArc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448901 | ORPH TestGdbFullTarget | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448903 | ORPH ...GdbHostOnlyAllFeatures | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448904 | ORPH TestGdbHostOnlyDefault | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448905 | ORPH TestGdbserverOnly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448906 | ORPH TestGetDevelopers | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449531 | ORPH TestGlibcAllTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448819 | ORPH TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448907 | ORPH TestGst1Python | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448908 | ORPH TestHWLoc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448909 | ORPH TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448910 | ORPH ...ystemSystemdRoIfupdown | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448873 | ORPH TestLibshdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448913 | ORPH TestLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448919 | ORPH TestLuaHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448935 | ORPH TestLuaInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448937 | ORPH TestLuaLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448915 | ORPH TestLuaLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448917 | ORPH TestLuaLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448921 | ORPH TestLuaLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448923 | ORPH TestLuaLuaCffi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448926 | ORPH TestLuaLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448927 | ORPH TestLuaLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448953 | ORPH TestLuaLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448957 | ORPH TestLuaLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448933 | ORPH TestLuaLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448960 | ORPH TestLuaLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448943 | ORPH TestLuaLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448964 | ORPH TestLuaLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448946 | ORPH TestLuaLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448968 | ORPH TestLuaLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448970 | ORPH TestLuaLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448929 | ORPH TestLuaLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448962 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448972 | ORPH TestLuaLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448951 | ORPH TestLuaLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448939 | ORPH TestLuaLzlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448978 | ORPH TestLuaRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449159 | ORPH TestLuaUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448949 | ORPH TestLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448920 | ORPH TestLuajitHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448936 | ORPH TestLuajitInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448938 | ORPH TestLuajitLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448916 | ORPH TestLuajitLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448918 | ORPH TestLuajitLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448922 | ORPH TestLuajitLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448924 | ORPH TestLuajitLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448928 | ORPH TestLuajitLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448954 | ORPH TestLuajitLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448959 | ORPH TestLuajitLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448934 | ORPH TestLuajitLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448961 | ORPH TestLuajitLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448944 | ORPH TestLuajitLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448967 | ORPH TestLuajitLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448947 | ORPH TestLuajitLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448969 | ORPH TestLuajitLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448971 | ORPH TestLuajitLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448931 | ORPH TestLuajitLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448963 | ORPH TestLuajitLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448974 | ORPH TestLuajitLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448952 | ORPH TestLuajitLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448940 | ORPH TestLuajitRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449161 | ORPH TestLuajitTurbolua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449176 | ORPH TestLuajitUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448950 | ORPH TestLuvi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448975 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448976 | ORPH TestMender | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448979 | ORPH TestMsrTools | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448980 | ORPH TestNcdu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448981 | ORPH TestNetdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448983 | ORPH TestOctave | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448984 | ORPH TestOla | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448985 | ORPH TestOpenJdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448988 | ORPH TestOpenSshGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448990 | ORPH TestOpenSshuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448992 | ORPH TestOpkg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448994 | ORPH TestPerftest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448997 | ORPH TestPerl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449000 | ORPH TestPerlClassLoad | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449002 | ORPH TestPerlDBDmysql | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449004 | ORPH TestPerlEncodeDetect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449007 | ORPH TestPerlGDGraph | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449009 | ORPH TestPerlHTMLParser | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449011 | ORPH TestPerlIOSocketMulticast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449014 | ORPH TestPerlIOSocketSSL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449015 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449018 | ORPH TestPerlMailDKIM | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449019 | ORPH TestPerlX10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449021 | ORPH TestPerlXMLLibXML | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449023 | ORPH TestPerllibwwwperl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449016 | ORPH TestPhpApcu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449024 | ORPH TestPhpLuaLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449025 | ORPH TestPhpLuaLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449026 | ORPH TestPhpPam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449029 | ORPH TestPhpPeclDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449030 | ORPH TestPixz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449031 | ORPH TestPolkitInitd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449033 | ORPH TestPolkitSystemd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449034 | ORPH TestProsodyLua51 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449036 | ORPH TestProsodyLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449037 | ORPH TestPyNdiff | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449127 | ORPH TestPython3Py | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449038 | ORPH TestPython3PyPyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449039 | ORPH TestPython3Pyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449040 | ORPH TestPythonAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449047 | ORPH TestPythonAvro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449052 | ORPH TestPythonPahoMQTT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449112 | ORPH TestPythonPy3Aexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449042 | ORPH TestPythonPy3Argh | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449045 | ORPH TestPythonPy3Attrs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449046 | ORPH TestPythonPy3Autobahn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449048 | ORPH TestPythonPy3Automat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449050 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449055 | ORPH TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449059 | ORPH TestPythonPy3Botocore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449060 | ORPH TestPythonPy3Can | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449061 | ORPH TestPythonPy3Cbor | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449062 | ORPH TestPythonPy3Click | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449065 | ORPH TestPythonPy3Colorzero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449067 | ORPH TestPythonPy3Constantly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449069 | ORPH TestPythonPy3Construct | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449070 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449072 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449074 | ORPH TestPythonPy3DBusFast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449075 | ORPH TestPythonPy3DBusNext | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449077 | ORPH TestPythonPy3Dicttoxml2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449078 | ORPH TestPythonPy3Distro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449081 | ORPH TestPythonPy3Django | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449083 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449086 | ORPH TestPythonPy3Flask | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449089 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449092 | ORPH TestPythonPy3Git | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449094 | ORPH TestPythonPy3Gitdb2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449096 | ORPH TestPythonPy3GnuPG | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449099 | ORPH TestPythonPy3Gobject | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449102 | ORPH TestPythonPy3Gpiozero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449105 | ORPH TestPythonPy3Incremental | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449107 | ORPH TestPythonPy3Iptables | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449108 | ORPH TestPythonPy3Jmespath | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449110 | ORPH TestPythonPy3Libftdi1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448912 | ORPH TestPythonPy3Munch | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449111 | ORPH TestPythonPy3Passlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449114 | ORPH TestPythonPy3Pexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449116 | ORPH TestPythonPy3PyAlsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449118 | ORPH TestPythonPy3Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449123 | ORPH TestPythonPy3Pytest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449128 | ORPH ...PythonPy3PytestAsyncio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449131 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449132 | ORPH TestPythonPy3Qrcode | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449136 | ORPH TestPythonPy3RSA | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449140 | ORPH TestPythonPy3RpiGpio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449139 | ORPH TestPythonPy3S3transfer | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449144 | ORPH TestPythonPy3SciPy | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449146 | ORPH ...thonPy3ServiceIdentity | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449147 | ORPH TestPythonPy3Smmap2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449148 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449150 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449151 | ORPH TestPythonPy3Txaio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449152 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449153 | ORPH TestPythonPy3Ubjson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449154 | ORPH ...y3UnitTestXmlReporting | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449155 | ORPH TestPythonPy3rtoml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449143 | ORPH TestPythonPybind | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449120 | ORPH TestRdmaCore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449156 | ORPH TestRedis | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449158 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449162 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449163 | ORPH TestS6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449166 | ORPH TestS6Networking | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449167 | ORPH TestS6PortableUtils | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449168 | ORPH TestS6Rc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449171 | ORPH ...ELinuxExtraModulesDirs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448816 | ORPH TestSudo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449172 | ORPH TestSyslogNg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449173 | ORPH TestTmux | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449175 | ORPH TestUbootOpensslPkgConfig | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449177 | ORPH TestZ3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449178 | ORPH TestZerofree | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449180 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449182 | ORPH TestZfsMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449183 | ORPH TestZfsUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449185 | ORPH -- http://autobuild.buildroot.net From fido_max at inbox.ru Wed Feb 8 07:12:26 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Wed, 8 Feb 2023 10:12:26 +0300 Subject: [Buildroot] [PATCH v2 1/1] package/postgresql: add lz4 and zstd support Message-ID: <20230208071226.33697-1-fido_max@inbox.ru> PostgreSQL has optional compression support (LZ4 and Zstandard). So enable it if libraries are available. Signed-off-by: Maxim Kochetkov --- package/postgresql/postgresql.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 2ffcac6595..0fb0e01153 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -91,6 +91,20 @@ else POSTGRESQL_CONF_OPTS += --without-libxml endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +POSTGRESQL_DEPENDENCIES += zstd +POSTGRESQL_CONF_OPTS += --with-zstd +else +POSTGRESQL_CONF_OPTS += --without-zstd +endif + +ifeq ($(BR2_PACKAGE_LZ4),y) +POSTGRESQL_DEPENDENCIES += lz4 +POSTGRESQL_CONF_OPTS += --with-lz4 +else +POSTGRESQL_CONF_OPTS += --without-lz4 +endif + # required for postgresql.service Type=notify ifeq ($(BR2_PACKAGE_SYSTEMD),y) POSTGRESQL_DEPENDENCIES += systemd -- 2.38.1 From fido_max at inbox.ru Wed Feb 8 07:18:15 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Wed, 8 Feb 2023 10:18:15 +0300 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: bump version to 1.8.0 Message-ID: <20230208071815.36221-1-fido_max@inbox.ru> Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.8.0 Signed-off-by: Maxim Kochetkov --- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index 505a4496c8..b5b76c15c6 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94c72ceb3c401c816499339f8765c62efbf40685a798dcdf9a4bf7dbedf6c7a5 osm2pgsql-1.7.2.tar.gz +sha256 b266b50f46fe4d1caddab61d26b39f10ea33b896ec23b8b3e294be4666e7b927 osm2pgsql-1.8.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 2bc8d41e6e..9cdfb44ce0 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.7.2 +OSM2PGSQL_VERSION = 1.8.0 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING -- 2.38.1 From fido_max at inbox.ru Wed Feb 8 07:25:16 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Wed, 8 Feb 2023 10:25:16 +0300 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: bump version to 2.9.3 Message-ID: <20230208072516.42067-1-fido_max@inbox.ru> Release notes: https://github.com/timescale/timescaledb/releases/tag/2.9.3 Signed-off-by: Maxim Kochetkov --- 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 a6560eb326..2fd14e6c1a 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 883638f2e79d25ec88ee58f603f3c81c999b6364cb4c799919d363f04089b47b timescaledb-2.9.1.tar.gz +sha256 ff0820891646a772aceab19ee0f7da0a5343dc53b9a72c965ab70f723d231d5c timescaledb-2.9.3.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 44e365285b..e3c94ed2fe 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.9.1 +TIMESCALEDB_VERSION = 2.9.3 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE -- 2.38.1 From fperrad at gmail.com Wed Feb 8 07:53:00 2023 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 8 Feb 2023 08:53:00 +0100 Subject: [Buildroot] [PATCH] package/libressl: security bump to version 3.6.2 Message-ID: <20230208075300.15464-1-francois.perrad@gadz.org> security fix: A malicious certificate revocation list or timestamp response token would allow an attacker to read arbitrary memory. 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 0988e6a36..907b9cdd0 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 acfac61316e93b919c28d62d53037ca734de85c46b4d703f19fd8395cf006774 libressl-3.6.1.tar.gz +sha256 4be80fff073746cf50b4a8e5babe2795acae98c6b132a9e02519b445dfbfd033 libressl-3.6.2.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 8fd7bccbc..b5fae7e26 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.6.1 +LIBRESSL_VERSION = 3.6.2 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.37.2 From arnout at mind.be Wed Feb 8 08:05:01 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 09:05:01 +0100 Subject: [Buildroot] [PATCH] package/gcc/gcc-final: map debug prefix when reproducible In-Reply-To: References: <20230206162617.1907911-1-john@metanate.com> <20230207135503.GF4124@scaer> Message-ID: <6fb44e39-92ac-60d3-2c87-8c156ac850dc@mind.be> On 07/02/2023 21:05, John Keeping wrote: [snip] > I've been testing this with --enable-linker-build-id in the configure > options as well to see whether it's possible to enable build IDs for > reproducible builds and this change gets a lot closer - the differences > are now a handful of files that embed an RPATH pointing to .libs during > the build. Just so I understand things correctly: those .libs RPATH entries get removed by Buildroot's patchelf run at the end of the build, but they still end up affecting the build-id, correct? And these RPATH entries are of course not affected by file-prefix-map, because that would break them entirely... Regards, Arnout From ak at it-klinger.de Wed Feb 8 08:45:08 2023 From: ak at it-klinger.de (Andreas Klinger) Date: Wed, 8 Feb 2023 09:45:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/ply: add dependency on Linux headers >= 5.5 Message-ID: Version 2.3.0 of ply now requires Linux headers >= 5.5 This was missing in commit b9612601b037e6deb79af300e64e0557dda1be5c ("package/ply: bump to version 2.3.0") Fixes: http://autobuild.buildroot.net/results/ce37039991cb0fb02b97d341d78327e54d0e1d26 http://autobuild.buildroot.net/results/c00714847ae92dd609bc8990df318bee58be38b8 http://autobuild.buildroot.net/results/8210bd2b9c67d6d7616ada525019b2658195416a This is a resend, because there are still the same autobuild failures. Signed-off-by: Andreas Klinger --- package/ply/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ply/Config.in b/package/ply/Config.in index 0500e7883f..f7507095c1 100644 --- a/package/ply/Config.in +++ b/package/ply/Config.in @@ -5,16 +5,16 @@ config BR2_PACKAGE_PLY_ARCH_SUPPORTS default y if BR2_powerpc default y if BR2_x86_64 -comment "ply needs a toolchain w/ dynamic library, headers >= 4.14" +comment "ply needs a toolchain w/ dynamic library, headers >= 5.5" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 || BR2_STATIC_LIBS config BR2_PACKAGE_PLY bool "ply" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # BPF_JLT + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 # BPF_JLT depends on !BR2_STATIC_LIBS help ply is a light-weight dynamic tracer for Linux. By means of -- 2.30.2 -- Andreas Klinger Grabenreith 27 84508 Burgkirchen +49 8623 919966 ak at it-klinger.de www.it-klinger.de www.grabenreith.de From thomas.petazzoni at bootlin.com Wed Feb 8 08:54:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:54:35 +0100 Subject: [Buildroot] [git commit] package/libva-utils: bump version to 2.17.1 Message-ID: <20230208085654.0AE6A844B4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9231fe0d6eeb6cdf373715d35b2203d34fd9e859 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/intel/libva-utils/blob/v2.17-branch/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libva-utils/libva-utils.hash | 2 +- package/libva-utils/libva-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 95bcee782b..41374a2ff6 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 646c9bfff6a83504c48de2c786c9514ca30c5e916127faf00f143ef8147ee950 libva-utils-2.16.0.tar.gz +sha256 6ea5993c3eba230a979fa9d35b4cad8df06d4474a773dc0918033bf50353f966 libva-utils-2.17.1.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index 5feaa36995..3dc8cdacde 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.16.0 +LIBVA_UTILS_VERSION = 2.17.1 LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Wed Feb 8 08:54:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:54:49 +0100 Subject: [Buildroot] [git commit] package/intel-mediadriver: bump version to 23.1.0 Message-ID: <20230208085654.16E75844B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19447f02f729ff373e138a74f3c2477739f425df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 a5e9c64e97..e4e41e4ad3 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b553290e829dfd824eb62295c9f07dbe8062ce7998f7c527cc92856d0792562d intel-media-22.6.6.tar.gz +sha256 edae1bdc07b694bd6e42099feddcf875e3b5d7254894f4b3fb292128577baf82 intel-media-23.1.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 8fa93218fa..6cc862dce4 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.6.6 +INTEL_MEDIADRIVER_VERSION = 23.1.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 thomas.petazzoni at bootlin.com Wed Feb 8 08:54:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:54:14 +0100 Subject: [Buildroot] [git commit] package/libva: switch to meson Message-ID: <20230208085654.005D7844B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17be7d028c193dc1160a4cb9313efe37326e7aa9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The time between version 2.17.0 being tagged and the release of its tarball version containing autoconf scripts was three weeks now. With the switch to meson we can directly use the github-generated tarball while not needing to run autoreconf. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libva/libva.hash | 4 +--- package/libva/libva.mk | 19 +++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 700ace0378..780c186069 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,5 +1,3 @@ -# From https://github.com/intel/libva/releases/download/2.17.0/libva-2.17.0.tar.bz2.sha1sum -sha1 997f7b3111bc5a4d32ec72e9d7f9fcfca41e4923 libva-2.17.0.tar.bz2 # Locally computed -sha256 f3e5eb27c305e05a9bb62703d1915a127301cc0c4f9f209025767432230c4eac libva-2.17.0.tar.bz2 +sha256 8940541980ef998a36cd8f6ad905e81838ea4ddf56dc479ed2bebd12711e6001 libva-2.17.0.tar.gz sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index c6b9f63b10..f50010d9fc 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -5,8 +5,7 @@ ################################################################################ LIBVA_VERSION = 2.17.0 -LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 -LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) +LIBVA_SITE = $(call github,intel,libva,$(LIBVA_VERSION)) LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING LIBVA_INSTALL_STAGING = YES @@ -14,25 +13,25 @@ LIBVA_DEPENDENCIES = host-pkgconf libdrm # libdrm is a hard-dependency LIBVA_CONF_OPTS = \ - --enable-drm \ - --with-drivers-path="/usr/lib/va" + -Ddisable_drm=false \ + -Ddriverdir="/usr/lib/va" ifeq ($(BR2_PACKAGE_XORG7),y) LIBVA_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes -LIBVA_CONF_OPTS += --enable-x11 +LIBVA_CONF_OPTS += -Dwith_x11=yes ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) LIBVA_DEPENDENCIES += libgl -LIBVA_CONF_OPTS += --enable-glx +LIBVA_CONF_OPTS += -Dwith_glx=yes endif else -LIBVA_CONF_OPTS += --disable-glx --disable-x11 +LIBVA_CONF_OPTS += -Dwith_glx=no -Dwith_x11=no endif ifeq ($(BR2_PACKAGE_WAYLAND),y) LIBVA_DEPENDENCIES += wayland -LIBVA_CONF_OPTS += --enable-wayland +LIBVA_CONF_OPTS += -Dwith_wayland=yes else -LIBVA_CONF_OPTS += --disable-wayland +LIBVA_CONF_OPTS += -Dwith_wayland=no endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From thomas.petazzoni at bootlin.com Wed Feb 8 08:55:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:55:42 +0100 Subject: [Buildroot] [git commit] package/intel-mediasdk: bump version to 23.1.0 Message-ID: <20230208085654.255FB844B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5997d0d63557488f2cbd06d4425fa3410adf336b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 903b6f3394..a2c4243790 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3a671cc692da5111c041088f5e32528b4346e122e8a134fad71310c572705106 intel-mediasdk-22.6.5.tar.gz +sha256 9208c35641ba995760d662689426a6c433973cf5283b8510f9cfb774e4b9cb38 intel-mediasdk-23.1.0.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index f7bce30c74..462d487ebe 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.6.5 +INTEL_MEDIASDK_VERSION = 23.1.0 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 8 08:57:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:57:17 +0100 Subject: [Buildroot] [PATCH 2/5] package/libva: switch to meson In-Reply-To: <20230130174339.36794-2-bernd.kuhls@t-online.de> References: <20230130174339.36794-1-bernd.kuhls@t-online.de> <20230130174339.36794-2-bernd.kuhls@t-online.de> Message-ID: <20230208095717.66678de3@windsurf> On Mon, 30 Jan 2023 18:43:36 +0100 Bernd Kuhls wrote: > The time between version 2.17.0 being tagged and the release of its > tarball version containing autoconf scripts was three weeks now. > With the switch to meson we can directly use the github-generated > tarball while not needing to run autoreconf. > > Signed-off-by: Bernd Kuhls > --- > package/libva/libva.hash | 4 +--- > package/libva/libva.mk | 19 +++++++++---------- > 2 files changed, 10 insertions(+), 13 deletions(-) Github has fixed their tarball generation logic so that the hashes are now correct again, so I've applied! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 08:57:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:57:24 +0100 Subject: [Buildroot] [PATCH 3/5] package/libva-utils: bump version to 2.17.1 In-Reply-To: <20230130174339.36794-3-bernd.kuhls@t-online.de> References: <20230130174339.36794-1-bernd.kuhls@t-online.de> <20230130174339.36794-3-bernd.kuhls@t-online.de> Message-ID: <20230208095724.437f75a8@windsurf> On Mon, 30 Jan 2023 18:43:37 +0100 Bernd Kuhls wrote: > Release notes: > https://github.com/intel/libva-utils/blob/v2.17-branch/NEWS > > Signed-off-by: Bernd Kuhls > --- > package/libva-utils/libva-utils.hash | 2 +- > package/libva-utils/libva-utils.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Github has fixed their tarball generation logic so that the hashes are now correct again, so I've applied! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 08:58:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:58:08 +0100 Subject: [Buildroot] [PATCH 4/5] package/intel-mediadriver: bump version to 23.1.0 In-Reply-To: <20230130174339.36794-4-bernd.kuhls@t-online.de> References: <20230130174339.36794-1-bernd.kuhls@t-online.de> <20230130174339.36794-4-bernd.kuhls@t-online.de> Message-ID: <20230208095808.5d229bc0@windsurf> On Mon, 30 Jan 2023 18:43:38 +0100 Bernd Kuhls wrote: > 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(-) Github has fixed their tarball generation logic so that the hashes are now correct again, so I've applied! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 08:58:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:58:18 +0100 Subject: [Buildroot] [PATCH 5/5] package/intel-mediasdk: bump version to 23.1.0 In-Reply-To: <20230130174339.36794-5-bernd.kuhls@t-online.de> References: <20230130174339.36794-1-bernd.kuhls@t-online.de> <20230130174339.36794-5-bernd.kuhls@t-online.de> Message-ID: <20230208095818.7917593e@windsurf> On Mon, 30 Jan 2023 18:43:39 +0100 Bernd Kuhls wrote: > 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(-) Github has fixed their tarball generation logic so that the hashes are now correct again, so I've applied! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From john at metanate.com Wed Feb 8 09:34:01 2023 From: john at metanate.com (John Keeping) Date: Wed, 8 Feb 2023 09:34:01 +0000 Subject: [Buildroot] [PATCH] package/gcc/gcc-final: map debug prefix when reproducible In-Reply-To: <6fb44e39-92ac-60d3-2c87-8c156ac850dc@mind.be> References: <20230206162617.1907911-1-john@metanate.com> <20230207135503.GF4124@scaer> <6fb44e39-92ac-60d3-2c87-8c156ac850dc@mind.be> Message-ID: On Wed, Feb 08, 2023 at 09:05:01AM +0100, Arnout Vandecappelle wrote: > On 07/02/2023 21:05, John Keeping wrote: > [snip] > > I've been testing this with --enable-linker-build-id in the configure > > options as well to see whether it's possible to enable build IDs for > > reproducible builds and this change gets a lot closer - the differences > > are now a handful of files that embed an RPATH pointing to .libs during > > the build. > > Just so I understand things correctly: those .libs RPATH entries get > removed by Buildroot's patchelf run at the end of the build, but they still > end up affecting the build-id, correct? And these RPATH entries are of > course not affected by file-prefix-map, because that would break them > entirely... Yes, that's largely correct - the RPATH entries are removed and are not present in the target. The files are still slightly different as a follow-on effect since the path is included in the string table. (Note that the two build directories I'm using for testing have different *length* names.) $ diff -u <(readelf -hlS build-1/target/bin/mount) <(readelf -hlS build-1abc/target/bin/mount) --- /dev/fd/63 2023-02-08 09:26:16.879386009 +0000 +++ /dev/fd/62 2023-02-08 09:26:16.882719365 +0000 @@ -8,7 +8,7 @@ Type: DYN (Position-Independent Executable file) Machine: ARM Version: 0x1 - Entry point address: 0x44ac + Entry point address: 0x44b0 Start of program headers: 52 (bytes into file) Start of section headers: 41268 (bytes into file) Flags: 0x5000200, Version5 EABI, soft-float ABI @@ -28,18 +28,18 @@ [ 4] .hash HASH 000001ac 0001ac 0004a0 04 A 6 0 4 [ 5] .gnu.hash GNU_HASH 0000064c 00064c 000018 04 A 6 0 4 [ 6] .dynsym DYNSYM 00000664 000664 000a30 10 A 7 3 4 - [ 7] .dynstr STRTAB 00001094 001094 000a69 00 A 0 0 1 - [ 8] .gnu.version VERSYM 00001afe 001afe 000146 02 A 6 0 2 - [ 9] .gnu.version_r VERNEED 00001c44 001c44 000130 00 A 7 3 4 - [10] .rel.dyn REL 00001d74 001d74 000260 08 A 6 0 4 - [11] .rel.plt REL 00001fd4 001fd4 0004a8 08 AI 6 23 4 - [12] .init PROGBITS 0000247c 00247c 00000c 00 AX 0 0 4 - [13] .plt PROGBITS 00002488 002488 000710 04 AX 0 0 4 - [14] .text PROGBITS 00002b98 002b98 0057d4 00 AX 0 0 4 - [15] .fini PROGBITS 0000836c 00836c 000008 00 AX 0 0 4 - [16] .rodata PROGBITS 00008374 008374 00151c 00 A 0 0 4 - [17] .ARM.exidx ARM_EXIDX 00009890 009890 000008 00 AL 14 0 4 - [18] .eh_frame PROGBITS 00009898 009898 000004 00 A 0 0 4 + [ 7] .dynstr STRTAB 00001094 001094 000a6c 00 A 0 0 1 + [ 8] .gnu.version VERSYM 00001b00 001b00 000146 02 A 6 0 2 + [ 9] .gnu.version_r VERNEED 00001c48 001c48 000130 00 A 7 3 4 + [10] .rel.dyn REL 00001d78 001d78 000260 08 A 6 0 4 + [11] .rel.plt REL 00001fd8 001fd8 0004a8 08 AI 6 23 4 + [12] .init PROGBITS 00002480 002480 00000c 00 AX 0 0 4 + [13] .plt PROGBITS 0000248c 00248c 000710 04 AX 0 0 4 + [14] .text PROGBITS 00002b9c 002b9c 0057d4 00 AX 0 0 4 + [15] .fini PROGBITS 00008370 008370 000008 00 AX 0 0 4 + [16] .rodata PROGBITS 00008378 008378 00151c 00 A 0 0 4 + [17] .ARM.exidx ARM_EXIDX 00009894 009894 000008 00 AL 14 0 4 + [18] .eh_frame PROGBITS 0000989c 00989c 000004 00 A 0 0 4 [19] .init_array INIT_ARRAY 0001994c 00994c 000004 04 WA 0 0 4 [20] .fini_array FINI_ARRAY 00019950 009950 000004 04 WA 0 0 4 [21] .data.rel.ro PROGBITS 00019954 009954 0002fc 00 WA 0 0 4 @@ -57,11 +57,11 @@ Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align - EXIDX 0x009890 0x00009890 0x00009890 0x00008 0x00008 R 0x4 + EXIDX 0x009894 0x00009894 0x00009894 0x00008 0x00008 R 0x4 PHDR 0x000034 0x00000034 0x00000034 0x00120 0x00120 R 0x4 INTERP 0x000154 0x00000154 0x00000154 0x00013 0x00013 R 0x1 [Requesting program interpreter: /lib/ld-linux.so.3] - LOAD 0x000000 0x00000000 0x00000000 0x0989c 0x0989c R E 0x10000 + LOAD 0x000000 0x00000000 0x00000000 0x098a0 0x098a0 R E 0x10000 LOAD 0x00994c 0x0001994c 0x0001994c 0x006c0 0x006cc RW 0x10000 DYNAMIC 0x009c50 0x00019c50 0x00019c50 0x00120 0x00120 RW 0x4 NOTE 0x000168 0x00000168 0x00000168 0x00044 0x00044 R 0x4 $ diff -u <(readelf -p 7 build-1/target/bin/mount) <(readelf -p 7 build-1abc/target/bin/mount) --- /dev/fd/63 2023-02-08 09:26:28.439469928 +0000 +++ /dev/fd/62 2023-02-08 09:26:28.439469928 +0000 @@ -171,5 +171,5 @@ [ a0b] MOUNT_2.21 [ a16] MOUNT_2.24 [ a21] MOUNT_2.19 - [ a2d] XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + [ a2d] XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX From fido_max at inbox.ru Wed Feb 8 09:45:43 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Wed, 8 Feb 2023 12:45:43 +0300 Subject: [Buildroot] [PATCH 1/1] lksctp-tools: bump to version 1.0.19 Message-ID: <20230208094543.474237-1-fido_max@inbox.ru> Release notes: https://github.com/sctp/lksctp-tools/blob/v1.0.19/ChangeLog Signed-off-by: Maxim Kochetkov --- package/lksctp-tools/lksctp-tools.hash | 4 ++-- package/lksctp-tools/lksctp-tools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lksctp-tools/lksctp-tools.hash b/package/lksctp-tools/lksctp-tools.hash index fb892fdc3b..b3a1f59d86 100644 --- a/package/lksctp-tools/lksctp-tools.hash +++ b/package/lksctp-tools/lksctp-tools.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ -md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz -sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz +md5 0fbb288c9f9625b88d3ab21c9ed9f011 lksctp-tools-1.0.19.tar.gz +sha1 d410a596485c38464177a38ae7c7081444e6589e lksctp-tools-1.0.19.tar.gz # Locally computed sha256 dee5f35e583183abb9212938643ecb2d858fd89e2e286f4b1d903f65d49d6c76 COPYING.lib sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk index 5ac794e842..af86a28516 100644 --- a/package/lksctp-tools/lksctp-tools.mk +++ b/package/lksctp-tools/lksctp-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -LKSCTP_TOOLS_VERSION = 1.0.17 -LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools +LKSCTP_TOOLS_VERSION = 1.0.19 +LKSCTP_TOOLS_SITE = $(call github,sctp,lksctp-tools,v$(LKSCTP_TOOLS_VERSION)) LKSCTP_TOOLS_INSTALL_STAGING = YES # configure not shipped LKSCTP_TOOLS_AUTORECONF = YES -- 2.38.1 From angelo at amarulasolutions.com Wed Feb 8 10:07:04 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Wed, 8 Feb 2023 11:07:04 +0100 Subject: [Buildroot] [PATCH v6] package/gtkiostream: new package Message-ID: <20230208100704.68093-1-angelo@amarulasolutions.com> From: Matt Flax This package provides many useful software engineering and signal processing libraries. Signed-off-by: Matt Flax Signed-off-by: Angelo Compagnucci --- v4: * Bumped to 1.8.0 * Added myself to DEVELOPERS * Added dependency on octave when enable instead of use --disable-octave configure option * Fixes from check-package v5: * Fixed wrong syntax (Romain) * Added optional dependency on sox (Matt) v6: * Fixing fomatting (Thmos P.) * Adding optional flag for openmp * Adding patch to disable testing compilation: build wasfailing for some incompatible linking option in one of the tests. Tests are not useful for the buildroot usecase therefore they are disabled. DEVELOPERS | 4 +++ package/Config.in | 1 + .../0001-Makefile.am-disable-tests.patch | 29 +++++++++++++++++ package/gtkiostream/Config.in | 16 ++++++++++ package/gtkiostream/gtkiostream.hash | 3 ++ package/gtkiostream/gtkiostream.mk | 31 +++++++++++++++++++ 6 files changed, 84 insertions(+) create mode 100644 package/gtkiostream/0001-Makefile.am-disable-tests.patch create mode 100644 package/gtkiostream/Config.in create mode 100644 package/gtkiostream/gtkiostream.hash create mode 100644 package/gtkiostream/gtkiostream.mk diff --git a/DEVELOPERS b/DEVELOPERS index d7c4d03c4c..5355d6d5ac 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -165,6 +165,7 @@ F: package/cups/ F: package/cups-filters/ F: package/fail2ban/ F: package/grep/ +F: package/gtkiostream/ F: package/htpdate/ F: package/i2c-tools/ F: package/jq/ @@ -1978,6 +1979,9 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ +N: Matt Flax +F: package/gtkiostream/ + N: Matt Weber F: board/freescale/p* F: board/freescale/t* diff --git a/package/Config.in b/package/Config.in index 06d0a05854..70e446be47 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1389,6 +1389,7 @@ menu "Audio/Sound" source "package/bcg729/Config.in" source "package/caps/Config.in" source "package/fdk-aac/Config.in" + source "package/gtkiostream/Config.in" source "package/libao/Config.in" source "package/libasplib/Config.in" source "package/libbroadvoice/Config.in" diff --git a/package/gtkiostream/0001-Makefile.am-disable-tests.patch b/package/gtkiostream/0001-Makefile.am-disable-tests.patch new file mode 100644 index 0000000000..26e229a58e --- /dev/null +++ b/package/gtkiostream/0001-Makefile.am-disable-tests.patch @@ -0,0 +1,29 @@ +From b242a56ddaefdcf356cffdfb45f6518c9ce0809e Mon Sep 17 00:00:00 2001 +From: Angelo Compagnucci +Date: Wed, 8 Feb 2023 10:58:20 +0100 +Subject: [PATCH] Makefile.am: disable tests + +Tests are not interesting for buildroot use case, thus disabling +entirely. + +Signed-off-by: Angelo Compagnucci +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 3cc0944..4f12708 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects + SUBDIRS = src api include + + if !HAVE_EMSCRIPTEN +-SUBDIRS += applications test ++SUBDIRS += applications + endif + + ACLOCAL_AMFLAGS = -I m4 +-- +2.25.1 + diff --git a/package/gtkiostream/Config.in b/package/gtkiostream/Config.in new file mode 100644 index 0000000000..58c22ecbcb --- /dev/null +++ b/package/gtkiostream/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_GTKIOSTREAM + bool "gtkiostream" + depends on BR2_INSTALL_LIBSTDCPP # eigen + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_EIGEN + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_DOUBLE + select BR2_PACKAGE_FFTW_SINGLE + help + This package provides many useful software engineering and + signal processing includes and linkable library. + + https://github.com/flatmax/gtkiostream + +comment "gtkiostream needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/gtkiostream/gtkiostream.hash b/package/gtkiostream/gtkiostream.hash new file mode 100644 index 0000000000..90c754f48c --- /dev/null +++ b/package/gtkiostream/gtkiostream.hash @@ -0,0 +1,3 @@ +# locally computed hash +sha256 44e8d921d462005cd330a1c24e5bd8061175b90ae53f537dbf73f59b74f6e01b gtkiostream-v1.8.0.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 gpl.txt diff --git a/package/gtkiostream/gtkiostream.mk b/package/gtkiostream/gtkiostream.mk new file mode 100644 index 0000000000..e178bb668b --- /dev/null +++ b/package/gtkiostream/gtkiostream.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# GTKIOSTREAM +# +################################################################################ + +GTKIOSTREAM_VERSION = v1.8.0 +GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,$(GTKIOSTREAM_VERSION)) +GTKIOSTREAM_LICENSE = GPL-2.0+ +GTKIOSTREAM_LICENSE_FILES = gpl.txt + +# configure script not available +GTKIOSTREAM_AUTORECONF = YES + +GTKIOSTREAM_DEPENDENCIES = \ + eigen \ + fftw-double \ + fftw-single \ + host-pkgconf \ + $(if $(BR2_PACKAGE_SOX),sox) + +ifeq ($(BR2_PACKAGE_OCTAVE),y) +GTKIOSTREAM_DEPENDENCIES += octave +GTKIOSTREAM_CONF_OPTS += --enable-octave +else +GTKIOSTREAM_CONF_OPTS += --disable-octave +endif + +GTKIOSTREAM_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_OPENMP),--disable,--enable)-openmp + +$(eval $(autotools-package)) -- 2.25.1 From peter at korsgaard.com Wed Feb 8 10:47:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 11:47:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: bump version to 2.9.3 In-Reply-To: <20230208072516.42067-1-fido_max@inbox.ru> (Maxim Kochetkov's message of "Wed, 8 Feb 2023 10:25:16 +0300") References: <20230208072516.42067-1-fido_max@inbox.ru> Message-ID: <87cz6k77t2.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov writes: > Release notes: https://github.com/timescale/timescaledb/releases/tag/2.9.3 > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 10:47:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 11:47:30 +0100 Subject: [Buildroot] [PATCH] package/libressl: security bump to version 3.6.2 In-Reply-To: <20230208075300.15464-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 8 Feb 2023 08:53:00 +0100") References: <20230208075300.15464-1-francois.perrad@gadz.org> Message-ID: <878rh877st.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > security fix: > A malicious certificate revocation list or timestamp response token > would allow an attacker to read arbitrary memory. > Signed-off-by: Francois Perrad Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 10:47:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:47:01 +0100 Subject: [Buildroot] [git commit] package/timescaledb: bump version to 2.9.3 Message-ID: <20230208104748.6A6F3844CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35423540c4eb0155f73b898539e00b72ed5f2b32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/timescale/timescaledb/releases/tag/2.9.3 Signed-off-by: Maxim Kochetkov 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 a6560eb326..2fd14e6c1a 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 883638f2e79d25ec88ee58f603f3c81c999b6364cb4c799919d363f04089b47b timescaledb-2.9.1.tar.gz +sha256 ff0820891646a772aceab19ee0f7da0a5343dc53b9a72c965ab70f723d231d5c timescaledb-2.9.3.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 44e365285b..e3c94ed2fe 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.9.1 +TIMESCALEDB_VERSION = 2.9.3 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 8 10:47:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:47:10 +0100 Subject: [Buildroot] [git commit] package/libressl: security bump to version 3.6.2 Message-ID: <20230208104748.781FE844CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02f80f5c224a1d8830fab48ae0c19a9e28f2c082 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master security fix: A malicious certificate revocation list or timestamp response token would allow an attacker to read arbitrary memory. Signed-off-by: Francois Perrad 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 0988e6a36d..907b9cdd06 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 acfac61316e93b919c28d62d53037ca734de85c46b4d703f19fd8395cf006774 libressl-3.6.1.tar.gz +sha256 4be80fff073746cf50b4a8e5babe2795acae98c6b132a9e02519b445dfbfd033 libressl-3.6.2.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 8fd7bccbc4..b5fae7e26e 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.6.1 +LIBRESSL_VERSION = 3.6.2 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 Wed Feb 8 10:49:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 11:49:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: bump version to 1.8.0 In-Reply-To: <20230208071815.36221-1-fido_max@inbox.ru> (Maxim Kochetkov's message of "Wed, 8 Feb 2023 10:18:15 +0300") References: <20230208071815.36221-1-fido_max@inbox.ru> Message-ID: <874jrw77pz.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov writes: > Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.8.0 > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 10:48:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:48:59 +0100 Subject: [Buildroot] [git commit] package/osm2pgsql: bump version to 1.8.0 Message-ID: <20230208104919.2B760844D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d27f4c311c19f5ae130ec1941e964976d3a4f2b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.8.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index 505a4496c8..b5b76c15c6 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94c72ceb3c401c816499339f8765c62efbf40685a798dcdf9a4bf7dbedf6c7a5 osm2pgsql-1.7.2.tar.gz +sha256 b266b50f46fe4d1caddab61d26b39f10ea33b896ec23b8b3e294be4666e7b927 osm2pgsql-1.8.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 2bc8d41e6e..9cdfb44ce0 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.7.2 +OSM2PGSQL_VERSION = 1.8.0 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for widgets Message-ID: <20230208105136.3124C845D0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05e4ad9c7e64e85d56126db8396dcf98138e84ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 5 +++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 394b2d8745..973fb2f11c 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -95,6 +95,11 @@ config BR2_PACKAGE_QT6BASE_PNG This option enables PNG support using the system libpng library. +config BR2_PACKAGE_QT6BASE_WIDGETS + bool "widgets module" + help + This option enables the Qt6Widgets library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index b368cd6dca..2a0afa6d27 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -215,6 +215,12 @@ else QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for widgets gtk backend Message-ID: <20230208105136.3B7CB845C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=889f451caf22f5b36ff8430d7927e8cb3a56681e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2a0afa6d27..911375aa6d 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -217,6 +217,15 @@ endif ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON + +# only enable gtk support if libgtk3 X11 backend is enabled +ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy) +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=ON +QT6BASE_DEPENDENCIES += libgtk3 +else +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:17 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for jpeg/png/gif image format Message-ID: <20230208105136.24C38845CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6d91bc90afab2d601f55990e94c4cef9f0317ce6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 19 +++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index ac2058c901..394b2d8745 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -76,6 +76,25 @@ config BR2_PACKAGE_QT6BASE_HARFBUZZ if the toolchain supports __sync for 4 bytes, or the qt provided one which avoids this dependency by using QAtomic). +config BR2_PACKAGE_QT6BASE_GIF + bool "GIF support" + help + This compiles and installs the plugin for GIF reading support. + +config BR2_PACKAGE_QT6BASE_JPEG + bool "JPEG support" + select BR2_PACKAGE_JPEG + help + This option enables JPEG support using the system libjpeg + library. + +config BR2_PACKAGE_QT6BASE_PNG + bool "PNG support" + select BR2_PACKAGE_LIBPNG + help + This option enables PNG support using the system libpng + library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 6c155a4abb..b368cd6dca 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -188,6 +188,26 @@ else QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PNG),y) +QT6BASE_CONF_OPTS += -DFEATURE_png=ON -DFEATURE_system_png=ON +QT6BASE_DEPENDENCIES += libpng +else +QT6BASE_CONF_OPTS += -DFEATURE_png=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_GIF),y) +QT6BASE_CONF_OPTS += -DFEATURE_gif=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_gif=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_JPEG),y) +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=ON +QT6BASE_DEPENDENCIES += jpeg +else +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add QPA backend selection Message-ID: <20230208105136.547DE845CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bd9a456b2e2c818f35d22a212812087c3f28e4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 13 +++++++++++++ package/qt6/qt6base/qt6base.mk | 3 +++ 2 files changed, 16 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 131dfadc1b..3af6fd9f72 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -67,6 +67,19 @@ config BR2_PACKAGE_QT6BASE_EGLFS depends on BR2_PACKAGE_QT6_GL_SUPPORTS select BR2_PACKAGE_QT6BASE_OPENGL +config BR2_PACKAGE_QT6BASE_DEFAULT_QPA + string "Default graphical platform" + help + Choose the default platform abstraction to use for graphical + applications (e.g xcb, linuxfb, eglfs, ...). If this is + empty, the default for your architecture will be used + (usually this is eglfs). + + You can get a list of supported platforms by running a Qt + application with the option "-platform help" on your + target. You can choose a different platform at runtime with + the -platform option. + config BR2_PACKAGE_QT6BASE_OPENGL bool "OpenGL support" depends on BR2_PACKAGE_QT6_GL_SUPPORTS diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2540fbb59c..828fe57d0b 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -250,6 +250,9 @@ else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif +QT6BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT6BASE_DEFAULT_QPA)) +QT6BASE_CONF_OPTS += $(if $(QT6BASE_DEFAULT_QPA),-DQT_QPA_DEFAULT_PLATFORM=$(QT6BASE_DEFAULT_QPA)) + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for libinput Message-ID: <20230208105136.72758845A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2db19af40179d6c2dfd78e08c005e67b01cdc01e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 8db59bbc31..49a61e4d25 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -229,6 +229,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_LIBINPUT),y) +QT6BASE_CONF_OPTS += -DFEATURE_libinput=ON +QT6BASE_DEPENDENCIES += libinput +else +QT6BASE_CONF_OPTS += -DFEATURE_libinput=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON QT6BASE_DEPENDENCIES += tslib From thomas.petazzoni at bootlin.com Wed Feb 8 10:50:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:50:37 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for gui module Message-ID: <20230208105136.0BF2D845A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c189e7462103591eb17d34a6e33430ddc636c84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 31 +++++++++++++++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index e8357a675c..1810b1586d 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,37 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_GUI + bool "gui module" + select BR2_PACKAGE_FREETYPE + # At least one graphic backend must be enabled, so enable + # linuxfb if nothing is enabled. + select BR2_PACKAGE_QT6BASE_LINUXFB if \ + !BR2_PACKAGE_QT6BASE_XCB + help + This option enables the Qt6Gui library. + +if BR2_PACKAGE_QT6BASE_GUI + +config BR2_PACKAGE_QT6BASE_LINUXFB + bool "linuxfb support" + +config BR2_PACKAGE_QT6BASE_XCB + bool "X.org XCB support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_IMAGE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_LIBXKBCOMMON + +comment "X.org XCB backend available if X.org is enabled" + depends on !BR2_PACKAGE_XORG7 + +endif + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2f159f380b..bcf2464590 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -40,7 +40,6 @@ QT6BASE_INSTALL_STAGING = YES QT6BASE_CONF_OPTS = \ -GNinja \ -DQT_HOST_PATH=$(HOST_DIR) \ - -DFEATURE_gui=OFF \ -DFEATURE_concurrent=OFF \ -DFEATURE_xml=OFF \ -DFEATURE_sql=OFF \ @@ -141,6 +140,42 @@ else QT6BASE_CONF_OPTS += -DFEATURE_glib=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_gui=ON \ + -DFEATURE_freetype=ON \ + -DINPUT_opengl=no \ + -DFEATURE_vulkan=OFF +QT6BASE_DEPENDENCIES += freetype + +ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_xcb=ON \ + -DFEATURE_xcb_xlib=ON \ + -DFEATURE_xkbcommon=ON \ + -DFEATURE_xkbcommon_x11=ON +QT6BASE_DEPENDENCIES += \ + libxcb \ + libxkbcommon \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xlib_libX11 +else +QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for printsupport/cups Message-ID: <20230208105136.86E41845D0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d195622f2388edd021c6f71ba78eb3d2f9539f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 8 ++++++++ package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index da42b2ae0c..7927975bff 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -153,6 +153,14 @@ config BR2_PACKAGE_QT6BASE_WIDGETS help This option enables the Qt6Widgets library. +config BR2_PACKAGE_QT6BASE_PRINTSUPPORT + bool "printing support" + # yes, print support needs widgets + depends on BR2_PACKAGE_QT6BASE_WIDGETS + help + This option enables printing support, optionally using CUPS + if available. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index f4e63ab8d9..7b57eba4ab 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -207,6 +207,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT),y) +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON +ifeq ($(BR2_PACKAGE_CUPS),y) +QT6BASE_CONF_OPTS += -DFEATURE_cups=ON +QT6BASE_DEPENDENCIES += cups +else +QT6BASE_CONF_OPTS += -DFEATURE_cups=OFF +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF +endif + ifeq ($(BR2_PACKAGE_LIBDRM),y) QT6BASE_CONF_OPTS += -DFEATURE_kms=ON QT6BASE_DEPENDENCIES += libdrm From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for kms Message-ID: <20230208105136.7BF49845CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=653e573436398ed58e0d4323d684c237b55f9378 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 49a61e4d25..f4e63ab8d9 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -207,6 +207,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT6BASE_CONF_OPTS += -DFEATURE_kms=ON +QT6BASE_DEPENDENCIES += libdrm +else +QT6BASE_CONF_OPTS += -DFEATURE_kms=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add opengl support Message-ID: <20230208105136.475CF845A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=beeae174f9fffe6ea9c50a717a9b45c71ed45ea9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 5 +++++ package/qt6/qt6base/Config.in | 42 +++++++++++++++++++++++++++++++++++++++++- package/qt6/qt6base/qt6base.mk | 18 +++++++++++++++++- 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 4b2b9a1174..831ae72c3c 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -12,6 +12,11 @@ config BR2_PACKAGE_QT6_ARCH_SUPPORTS default y if BR2_sparc64 depends on BR2_USE_MMU +config BR2_PACKAGE_QT6_GL_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + comment "qt6 needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, host gcc >= 8" depends on !BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT6_ARCH_SUPPORTS diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 973fb2f11c..131dfadc1b 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -36,7 +36,8 @@ config BR2_PACKAGE_QT6BASE_GUI # At least one graphic backend must be enabled, so enable # linuxfb if nothing is enabled. select BR2_PACKAGE_QT6BASE_LINUXFB if \ - !BR2_PACKAGE_QT6BASE_XCB + !BR2_PACKAGE_QT6BASE_XCB && \ + !BR2_PACKAGE_QT6BASE_EGLFS help This option enables the Qt6Gui library. @@ -59,6 +60,45 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_EGLFS + bool "eglfs support" + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGBM + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_QT6BASE_OPENGL + +config BR2_PACKAGE_QT6BASE_OPENGL + bool "OpenGL support" + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + help + This option enables OpenGL support. + +comment "OpenGL support needs an OpenGL-capable backend" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS + +if BR2_PACKAGE_QT6BASE_OPENGL + +choice + prompt "OpenGL API" + help + Select OpenGL API. + +config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP + bool "Desktop OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL + help + Use desktop OpenGL. + +config BR2_PACKAGE_QT6BASE_OPENGL_ES2 + bool "OpenGL ES 2.0+" + depends on BR2_PACKAGE_HAS_LIBGLES + help + Use OpenGL ES 2.0 and later versions. + +endchoice + +endif + config BR2_PACKAGE_QT6BASE_FONTCONFIG bool "fontconfig support" select BR2_PACKAGE_FONTCONFIG diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 911375aa6d..2540fbb59c 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -144,7 +144,6 @@ ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) QT6BASE_CONF_OPTS += \ -DFEATURE_gui=ON \ -DFEATURE_freetype=ON \ - -DINPUT_opengl=no \ -DFEATURE_vulkan=OFF QT6BASE_DEPENDENCIES += freetype @@ -230,6 +229,23 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) +QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON +QT6BASE_DEPENDENCIES += libegl libgbm +else +QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON +QT6BASE_DEPENDENCIES += libgl +else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON +QT6BASE_DEPENDENCIES += libgles +else +QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 8 10:50:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:50:37 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for fontconfig/harfbuzz Message-ID: <20230208105136.18597844D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf5c0db35a06455182f6568ab2cfa69346f8b3a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Additionally the harfbuzz license file is added and the hash for this is also added to the hash file Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 17 +++++++++++++++++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 1810b1586d..ac2058c901 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -59,6 +59,23 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_FONTCONFIG + bool "fontconfig support" + select BR2_PACKAGE_FONTCONFIG + help + This option enables Fontconfig support using the system + fontconfig library. + +config BR2_PACKAGE_QT6BASE_HARFBUZZ + bool "harfbuzz support" + select BR2_PACKAGE_HARFBUZZ if \ + BR2_TOOLCHAIN_HAS_SYNC_4 && \ + BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + This option enables HarfBuzz support (either system harfbuzz + if the toolchain supports __sync for 4 bytes, or the qt + provided one which avoids this dependency by using QAtomic). + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 6544a371c6..fedbbba79f 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -11,3 +11,4 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt sha256 d040359701c01996a017d5c515678929cd1b0625e64cb86db44025fbb6cdf1fc LICENSES/MIT.txt sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index bcf2464590..6c155a4abb 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -172,6 +172,29 @@ else QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_HARFBUZZ),y) +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=ON +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y) +# system harfbuzz in case __sync for 4 bytes is supported +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=OFF +QT6BASE_DEPENDENCIES += harfbuzz +else #BR2_TOOLCHAIN_HAS_SYNC_4 +# qt harfbuzz otherwise (using QAtomic instead) +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=ON +QT6BASE_LICENSE += , MIT (harfbuzz) +QT6BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON +QT6BASE_DEPENDENCIES += fontconfig +else +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for tslib Message-ID: <20230208105136.626F0844D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73d6df812d9eaccfad9cf4b5cb4fc53d30205e20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 3af6fd9f72..da42b2ae0c 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -216,6 +216,12 @@ config BR2_PACKAGE_QT6BASE_TEST help This options enables the Qt6Test library. +config BR2_PACKAGE_QT6BASE_TSLIB + bool "Enable Tslib support" + select BR2_PACKAGE_TSLIB + help + This options enables the Tslib plugin + config BR2_PACKAGE_QT6BASE_XML bool "XML module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 828fe57d0b..8db59bbc31 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -229,6 +229,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) +QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON +QT6BASE_DEPENDENCIES += tslib +else +QT6BASE_CONF_OPTS += -DFEATURE_tslib=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON QT6BASE_DEPENDENCIES += libegl libgbm From james.kent at orchestrated-technology.com Wed Feb 8 10:52:09 2023 From: james.kent at orchestrated-technology.com (James Kent) Date: Wed, 8 Feb 2023 10:52:09 +0000 Subject: [Buildroot] [PATCH] package/chrony: add default unprivileged user option In-Reply-To: <20230207215052.GA2817@scaer> References: <20230207171020.20194-1-james.kent@orchestrated-technology.com> <20230207215052.GA2817@scaer> Message-ID: <8d4f6069-8fd9-e94d-177f-3f4153afb647@orchestrated-technology.com> Yann, thanks for the feedback.? Yes I'll rework the change with your input and submit a revised patch. Regards, James On 07/02/2023 21:50, Yann E. MORIN wrote: > James, All, > > On 2023-02-07 17:10 +0000, James Kent spake thusly: >> Configurable option to define and enable by default an unprivileged >> user which the Chrony daemon will assume once initialised. Where libcap >> is not enabled a comment indicates the dependency requirement to make >> the option available. >> >> This option supports the good security practice of dropping elevated >> privileges for daemon runtime. > Thanks, thjis is=ndeed makes sense. See below for some comments... > >> Signed-off-by: James Kent >> --- >> package/chrony/Config.in | 10 ++++++++++ >> package/chrony/chrony.mk | 8 ++++++++ >> 2 files changed, 18 insertions(+) >> >> diff --git a/package/chrony/Config.in b/package/chrony/Config.in >> index 158dc20530..8b053ed7e2 100644 >> --- a/package/chrony/Config.in >> +++ b/package/chrony/Config.in >> @@ -14,3 +14,13 @@ config BR2_PACKAGE_CHRONY_DEBUG_LOGGING >> Enable support for debug logging output from Chrony when >> enabled at runtime. If disabled, code for debug logging will >> not be compiled in. >> + >> +config BR2_PACKAGE_CHRONY_USER >> + bool "chrony default unprivileged user" >> + depends on BR2_PACKAGE_CHRONY && BR2_PACKAGE_LIBCAP > First, we now try to enclose package sub-options in an if-endif block, > rather than have each option depend on the package. I.e.: > > config BR2_PACKAGE_CHRONY > bool "chrony" > > if BR2_PACKAGE_CHRONY > > config BR2_PACKAGE_CHRONY_FOO > bool "foo" > > config BR2_PACKAGE_CHRONY_BAR > bool "bar" > > endif > > Yes, the existing option doesnot follow that coding style, so just fix > it up while at it. > > Second, chrony and libcap both need an MMU, so jut select libcap when > BR2_PACKAGE_CHRONY_USER is enabled. > >> + help >> + Define and enable default unprivileged user for the Chrony >> + daemon to run as. >> + >> +comment "chrony default unprivileged user requires libcap" >> + depends on BR2_PACKAGE_CHRONY && !BR2_PACKAGE_LIBCAP > And thus, that comment is no longer needed. > >> diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk >> index 379e95a778..16f8f082a3 100644 >> --- a/package/chrony/chrony.mk >> +++ b/package/chrony/chrony.mk >> @@ -21,6 +21,14 @@ CHRONY_CONF_OPTS = \ >> >> ifeq ($(BR2_PACKAGE_LIBCAP),y) >> CHRONY_DEPENDENCIES += libcap >> + >> +ifeq ($(BR2_PACKAGE_CHRONY_USER),y) >> +CHRONY_CONF_OPTS += --with-user=chrony >> +define CHRONY_USERS >> + chrony -1 chrony -1 * /run/chrony - - Time daemon >> +endef >> +endif > This part is correct. > > Can you fix and respin, please? > > Regards, > Yann E. MORIN. > >> else >> CHRONY_CONF_OPTS += --without-libcap >> endif >> -- >> 2.35.3 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Wed Feb 8 10:53:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:53:54 +0100 Subject: [Buildroot] [PATCH v6] package/gtkiostream: new package In-Reply-To: <20230208100704.68093-1-angelo@amarulasolutions.com> References: <20230208100704.68093-1-angelo@amarulasolutions.com> Message-ID: <20230208115354.7437af06@windsurf> On Wed, 8 Feb 2023 11:07:04 +0100 Angelo Compagnucci wrote: > diff --git a/package/gtkiostream/Config.in b/package/gtkiostream/Config.in > new file mode 100644 > index 0000000000..58c22ecbcb > --- /dev/null > +++ b/package/gtkiostream/Config.in > @@ -0,0 +1,16 @@ > +config BR2_PACKAGE_GTKIOSTREAM > + bool "gtkiostream" > + depends on BR2_INSTALL_LIBSTDCPP # eigen > + depends on BR2_TOOLCHAIN_HAS_THREADS > + select BR2_PACKAGE_EIGEN > + select BR2_PACKAGE_FFTW > + select BR2_PACKAGE_FFTW_DOUBLE > + select BR2_PACKAGE_FFTW_SINGLE > + help > + This package provides many useful software engineering and > + signal processing includes and linkable library. > + > + https://github.com/flatmax/gtkiostream > + > +comment "gtkiostream needs a toolchain w/ C++" and threads. > +GTKIOSTREAM_VERSION = v1.8.0 Should be 1.8.0 > +GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,$(GTKIOSTREAM_VERSION)) And should be: GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,v$(GTKIOSTREAM_VERSION)) These issues can be fixed when applying, just noting them here as I noticed them. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Wed Feb 8 10:56:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 11:56:04 +0100 Subject: [Buildroot] [PATCH 1/2] package/tinycompress: install to staging In-Reply-To: <20230131064545.3266194-1-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 30 Jan 2023 23:45:44 -0700") References: <20230131064545.3266194-1-james.hilliard1@gmail.com> Message-ID: <87zg9o5su3.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > This will be needed for upcoming pipewire compress offload support. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 10:56:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 11:56:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/pipewire: bump to version 0.3.65 In-Reply-To: <20230131064545.3266194-2-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 30 Jan 2023 23:45:45 -0700") References: <20230131064545.3266194-1-james.hilliard1@gmail.com> <20230131064545.3266194-2-james.hilliard1@gmail.com> Message-ID: <87v8kc5stz.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Add support for new compress-offload and pw-cat-ffmpeg features. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 10:52:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:52:45 +0100 Subject: [Buildroot] [git commit] package/tinycompress: install to staging Message-ID: <20230208105749.37455845F2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ee78c0a8b7854b4e8b260e1791909b8591ae5ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will be needed for upcoming pipewire compress offload support. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/tinycompress/tinycompress.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinycompress/tinycompress.mk b/package/tinycompress/tinycompress.mk index 062233ec80..c9cfbb574b 100644 --- a/package/tinycompress/tinycompress.mk +++ b/package/tinycompress/tinycompress.mk @@ -9,5 +9,6 @@ TINYCOMPRESS_SOURCE = tinycompress-$(TINYCOMPRESS_VERSION).tar.bz2 TINYCOMPRESS_SITE = https://www.alsa-project.org/files/pub/tinycompress TINYCOMPRESS_LICENSE = BSD-3-Clause and LGPL-2.1 TINYCOMPRESS_LICENSE_FILES = COPYING +TINYCOMPRESS_INSTALL_STAGING = YES $(eval $(autotools-package)) From peter at korsgaard.com Wed Feb 8 10:55:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:55:07 +0100 Subject: [Buildroot] [git commit] package/pipewire: bump to version 0.3.65 Message-ID: <20230208105749.43575845F3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=247e2d0eb1e60f483044d58bed58c5ed321528f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add support for new compress-offload and pw-cat-ffmpeg features. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index d8b5b0cc86..0e027aaa55 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 24b218cf3bb1fb279c8c489c14cc9ae483e1da7b4c8215b2ee5a5ee831bae94f pipewire-0.3.62.tar.bz2 +sha256 c78c95cdff2774418f0a9468e94a1b2800761d322f13104df6501e1a0dc92558 pipewire-0.3.65.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 6bcda0a93d..976d7783b9 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.62 +PIPEWIRE_VERSION = 0.3.65 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) @@ -122,10 +122,10 @@ PIPEWIRE_CONF_OPTS += -Dbluez5=disabled -Dbluez5-codec-opus=disabled endif ifeq ($(BR2_PACKAGE_FFMPEG),y) -PIPEWIRE_CONF_OPTS += -Dffmpeg=enabled +PIPEWIRE_CONF_OPTS += -Dffmpeg=enabled -Dpw-cat-ffmpeg=enabled PIPEWIRE_DEPENDENCIES += ffmpeg else -PIPEWIRE_CONF_OPTS += -Dffmpeg=disabled +PIPEWIRE_CONF_OPTS += -Dffmpeg=disabled -Dpw-cat-ffmpeg=disabled endif ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) @@ -215,6 +215,13 @@ else PIPEWIRE_CONF_OPTS += -Dsdl2=disabled endif +ifeq ($(BR2_PACKAGE_TINYCOMPRESS),y) +PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled +PIPEWIRE_DEPENDENCIES += tinycompress +else +PIPEWIRE_CONF_OPTS += -Dcompress-offload=disabled +endif + ifeq ($(WEBRTC_AUDIO_PROCESSING),y) PIPEWIRE_CONF_OPTS += -Decho-cancel-webrtc=enabled PIPEWIRE_DEPENDENCIES += webrtc-audio-processing From peter at korsgaard.com Wed Feb 8 11:00:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 12:00:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/neon-2-sse: bump to version 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f In-Reply-To: <20230201000248.1104432-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 17:02:48 -0700") References: <20230201000248.1104432-1-james.hilliard1@gmail.com> Message-ID: <87r0v05smo.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Drop patch which is now upstream. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 10:57:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:57:26 +0100 Subject: [Buildroot] [git commit] package/neon-2-sse: bump to version 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f Message-ID: <20230208110047.8620F845F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c419ef62d84b5be65599452ab84f7ed719bbe470 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/neon-2-sse/0001-Fix-cmake-languages.patch | 40 ----------------------- package/neon-2-sse/neon-2-sse.hash | 2 +- package/neon-2-sse/neon-2-sse.mk | 2 +- 3 files changed, 2 insertions(+), 42 deletions(-) diff --git a/package/neon-2-sse/0001-Fix-cmake-languages.patch b/package/neon-2-sse/0001-Fix-cmake-languages.patch deleted file mode 100644 index e0becb1ffa..0000000000 --- a/package/neon-2-sse/0001-Fix-cmake-languages.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 186ec82e033d8c718d760d14945535a9d7e160fd Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sun, 29 Jan 2023 21:00:27 -0700 -Subject: [PATCH] Fix cmake languages - -When no language is set cmake defaults to C and CXX, since we support -C by itself we should set the project language to C so that we don't -get a compiler error when building without a CXX toolchain. - -Fixes: -CMake Error at CMakeLists.txt:5 (project): - No CMAKE_CXX_COMPILER could be found. - - Tell CMake where to find the compiler by setting either the environment - variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path - to the compiler, or to the compiler name if it is in the PATH. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/intel/ARM_NEON_2_x86_SSE/pull/62] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e4b8980..8f58e79 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,7 +2,7 @@ - # Modification: Copyright (C) 2017 David Hirvonen - - cmake_minimum_required(VERSION 3.0) --project(NEON_2_SSE VERSION 1.0.0) -+project(NEON_2_SSE VERSION 1.0.0 LANGUAGES C) - - add_library(${PROJECT_NAME} INTERFACE) - --- -2.34.1 - diff --git a/package/neon-2-sse/neon-2-sse.hash b/package/neon-2-sse/neon-2-sse.hash index ded20d58f5..f964d2fa61 100644 --- a/package/neon-2-sse/neon-2-sse.hash +++ b/package/neon-2-sse/neon-2-sse.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 019fbc7ec25860070a1d90e12686fc160cfb33e22aa063c80f52b363f1361e9d neon-2-sse-a15b489e1222b2087007546b4912e21293ea86ff.tar.gz +sha256 4567ca8c8cbc8ce0ea3ddb9dc0f158707eb85c631cb400fd7010cd299cdc5377 neon-2-sse-097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f.tar.gz # License files, locally calculated sha256 7022f51b439a5915e933ecc270c83e24ca0cb2cceeb08b0132dcd4dbb03ed2dc LICENSE diff --git a/package/neon-2-sse/neon-2-sse.mk b/package/neon-2-sse/neon-2-sse.mk index 3e87c62e21..ee6f5446b6 100644 --- a/package/neon-2-sse/neon-2-sse.mk +++ b/package/neon-2-sse/neon-2-sse.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEON_2_SSE_VERSION = a15b489e1222b2087007546b4912e21293ea86ff +NEON_2_SSE_VERSION = 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f NEON_2_SSE_SITE = $(call github,intel,ARM_NEON_2_x86_SSE,$(NEON_2_SSE_VERSION)) NEON_2_SSE_LICENSE = BSD-2-Clause NEON_2_SSE_LICENSE_FILES = LICENSE From sebastian.weyer at smile.fr Wed Feb 8 11:05:51 2023 From: sebastian.weyer at smile.fr (Sebastian Weyer) Date: Wed, 8 Feb 2023 12:05:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/rust: fix boostrap build Message-ID: <20230208110551.187828-1-sebastian.weyer@smile.fr> The update to v1.67.0 of rust broke the boostrap build. This patch applies an upstream patch to fix this: https://github.com/rust-lang/rust/commit/3fe64ebbce21e79adb64099984e96dfb79bdd0f9 Fixes: http://autobuild.buildroot.org/results/214/214fcbb3458893784b7f85b60f7ee1edb428c77f/build-end.log Signed-off-by: Sebastian Weyer Cc: Eric Le Bihan Cc: James Hilliard --- I previously just tested TestRustBin since TestRust takes forever. This time I ran TestRust and it builds fine :) --- ...-unsoundness-in-bootstrap-cache-code.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch new file mode 100644 index 0000000000..3eae34642f --- /dev/null +++ b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch @@ -0,0 +1,43 @@ +From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 +From: Michael Goulet +Date: Mon, 12 Dec 2022 18:29:33 +0000 +Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= + =?UTF-8?q?ap=20cache=20code?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) +Signed-off-by: Sebastian Weyer +--- + src/bootstrap/cache.rs | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs +index be5c9bb0788..05f25af68ea 100644 +--- a/src/bootstrap/cache.rs ++++ b/src/bootstrap/cache.rs +@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { + + impl Deref for Interned { + type Target = T::Target; +- fn deref(&self) -> &'static Self::Target { ++ fn deref(&self) -> &Self::Target { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } ++ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } + } + } + + impl, U: ?Sized> AsRef for Interned { +- fn as_ref(&self) -> &'static U { ++ fn as_ref(&self) -> &U { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } ++ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } + } + } + +-- +2.25.1 + -- 2.25.1 From thomas.petazzoni at bootlin.com Wed Feb 8 11:07:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:07:52 +0100 Subject: [Buildroot] [PATCH v6 01/13] package/qt6/qt6base: add support for gui module In-Reply-To: <20230207171721.2973997-2-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-2-angelo@amarulasolutions.com> Message-ID: <20230208120752.7f49ad05@windsurf> Hello, On Tue, 7 Feb 2023 18:17:09 +0100 Angelo Compagnucci wrote: > +ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) > +QT6BASE_CONF_OPTS += -DFEATURE_gui=ON -DFEATURE_freetype=ON -DINPUT_opengl=no -DFEATURE_vulkan=OFF Split with one option per line. > +QT6BASE_DEPENDENCIES += freetype > + > +ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) > +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON > +else > +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) > +QT6BASE_CONF_OPTS += \ > + -DFEATURE_xcb=ON \ > + -DFEATURE_xcb_xlib=ON \ > + -DFEATURE_xkbcommon=ON \ > + -DFEATURE_xkbcommon_x11=ON > +QT6BASE_DEPENDENCIES += \ > + libxcb \ > + xcb-util-wm \ > + xcb-util-image \ > + xcb-util-keysyms \ > + xcb-util-renderutil \ > + xlib_libX11 \ > + libxkbcommon > +QT6BASE_DEPENDENCIES += xlib_libXext This line was not correct: (1) this package is not needed and (2) it was not selected in Config.in, causing a build failure because we don't allow depending on a package that isn't selected in Config.in. I fixed that up when applying. 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 Wed Feb 8 11:08:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:08:32 +0100 Subject: [Buildroot] [PATCH v6 02/13] package/qt6/qt6base: add support for fontconfig/harfbuzz In-Reply-To: <20230207171721.2973997-3-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-3-angelo@amarulasolutions.com> Message-ID: <20230208120832.16e3a7c4@windsurf> On Tue, 7 Feb 2023 18:17:10 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Additionally the harfbuzz license file is added and the hash for this is > also added to the hash file > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/Config.in | 17 +++++++++++++++++ > package/qt6/qt6base/qt6base.hash | 1 + > package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++++ > 3 files changed, 41 insertions(+) > > diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in > index 1810b1586d..594221b792 100644 > --- a/package/qt6/qt6base/Config.in > +++ b/package/qt6/qt6base/Config.in > @@ -59,6 +59,23 @@ config BR2_PACKAGE_QT6BASE_XCB > comment "X.org XCB backend available if X.org is enabled" > depends on !BR2_PACKAGE_XORG7 > > +config BR2_PACKAGE_QT6BASE_FONTCONFIG > + bool "fontconfig support" > + select BR2_PACKAGE_FONTCONFIG > + help > + This option enables Fontconfig and Freetype support using > + the system fontconfig and freetype2 libraries. It doesn't enable fontconfig and freetype, but only fontconfig. Freetype is unconditionally enabled for the GUI module. I fixed that up when applying. 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 Wed Feb 8 11:08:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:08:43 +0100 Subject: [Buildroot] [PATCH v6 03/13] package/qt6/qt6base: Add support for jpeg/png/gif image format In-Reply-To: <20230207171721.2973997-4-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-4-angelo@amarulasolutions.com> Message-ID: <20230208120843.420c8ed3@windsurf> On Tue, 7 Feb 2023 18:17:11 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/Config.in | 19 +++++++++++++++++++ > package/qt6/qt6base/qt6base.mk | 20 ++++++++++++++++++++ > 2 files changed, 39 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:09:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:09:19 +0100 Subject: [Buildroot] [PATCH v6 04/13] package/qt6/qt6base: add support for widgets In-Reply-To: <20230207171721.2973997-5-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-5-angelo@amarulasolutions.com> Message-ID: <20230208120919.54ed260e@windsurf> On Tue, 7 Feb 2023 18:17:12 +0100 Angelo Compagnucci wrote: > +config BR2_PACKAGE_QT6BASE_WIDGETS > + bool "widgets module" > + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT6BASE_XCB According to my build testing, this dependency is not needed, so I dropped it. > + help > + This option enables the Qt6Widgets library. > + > endif > > config BR2_PACKAGE_QT6BASE_NETWORK > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk > index 06ebbab8e7..cf3c7b1ad1 100644 > --- a/package/qt6/qt6base/qt6base.mk > +++ b/package/qt6/qt6base/qt6base.mk > @@ -213,6 +213,10 @@ else > QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF > endif > > +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) > +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON Missing else clause to explicitly disable widgets. Applied with these two things fixed. 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 Wed Feb 8 11:09:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:09:26 +0100 Subject: [Buildroot] [PATCH v6 05/13] package/qt6/qt6base: add support for widgets gtk backend In-Reply-To: <20230207171721.2973997-6-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-6-angelo@amarulasolutions.com> Message-ID: <20230208120926.2e878f52@windsurf> On Tue, 7 Feb 2023 18:17:13 +0100 Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/qt6base.mk | 11 +++++++++++ > 1 file changed, 11 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:11:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:11:36 +0100 Subject: [Buildroot] [PATCH v6 06/13] package/qt6/qt6base: add opengl support In-Reply-To: <20230207171721.2973997-7-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-7-angelo@amarulasolutions.com> Message-ID: <20230208121136.74cfe8e6@windsurf> On Tue, 7 Feb 2023 18:17:14 +0100 Angelo Compagnucci wrote: > +if BR2_PACKAGE_QT6BASE_OPENGL > + > +choice > + prompt "OpenGL API" > + help > + Select OpenGL API. > + > +config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP > + bool "Desktop OpenGL" > + depends on BR2_PACKAGE_HAS_LIBGL > + help > + Use desktop OpenGL. > + > +config BR2_PACKAGE_QT6BASE_OPENGL_ES2 > + bool "OpenGL ES 2.0+" > + depends on BR2_PACKAGE_HAS_LIBGLES > + help > + Use OpenGL ES 2.0 and later versions. > + > +endchoice > + > +config BR2_PACKAGE_QT6BASE_OPENGL_LIB > + bool "opengl module" > + select BR2_PACKAGE_QT6BASE_WIDGETS > + help > + This option enables the Qt6OpenGL library. This library > + includes OpenGL support classes provided to ease porting > + from Qt 4.x. This option didn't do anything: there is nothing in the .mk file that did something about this option, so I dropped it. > + > +config BR2_PACKAGE_QT6BASE_EGLFS > + bool "eglfs support" > + default y I dropped the "default y", there is no need for that. > + depends on BR2_PACKAGE_HAS_LIBGBM It also needs EGL. > + select BR2_PACKAGE_QT6BASE_OPENGL I also moved this option closer to the other graphics backends (linuxfb, xcb). > config BR2_PACKAGE_QT6BASE_FONTCONFIG > bool "fontconfig support" > select BR2_PACKAGE_FONTCONFIG > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk > index f936d19c68..e9a3396fb6 100644 > --- a/package/qt6/qt6base/qt6base.mk > +++ b/package/qt6/qt6base/qt6base.mk > @@ -228,6 +228,23 @@ else > QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF > endif > > +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) > +QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON > +QT6BASE_DEPENDENCIES += libegl libgbm added here, since according to Config.in we need it. Applied with those fixes, 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 Wed Feb 8 11:11:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:11:46 +0100 Subject: [Buildroot] [PATCH v6 07/13] package/qt6/qt6base: add QPA backend selection In-Reply-To: <20230207171721.2973997-8-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-8-angelo@amarulasolutions.com> Message-ID: <20230208121146.60983a2c@windsurf> On Tue, 7 Feb 2023 18:17:15 +0100 Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/Config.in | 13 +++++++++++++ > package/qt6/qt6base/qt6base.mk | 3 +++ > 2 files changed, 16 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:13:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:13:46 +0100 Subject: [Buildroot] [PATCH v6 08/13] package/qt6/qt6base: add support for tslib In-Reply-To: <20230207171721.2973997-9-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-9-angelo@amarulasolutions.com> Message-ID: <20230208121346.1d1318b0@windsurf> On Tue, 7 Feb 2023 18:17:16 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/Config.in | 6 ++++++ > package/qt6/qt6base/qt6base.mk | 7 +++++++ > 2 files changed, 13 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:13:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:13:50 +0100 Subject: [Buildroot] [PATCH v6 09/13] package/qt6/qt6base: add support for libinput In-Reply-To: <20230207171721.2973997-10-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-10-angelo@amarulasolutions.com> Message-ID: <20230208121350.514b08e0@windsurf> On Tue, 7 Feb 2023 18:17:17 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/qt6base.mk | 7 +++++++ > 1 file changed, 7 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:13:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:13:55 +0100 Subject: [Buildroot] [PATCH v6 10/13] package/qt6/qt6base: add support for kms In-Reply-To: <20230207171721.2973997-11-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-11-angelo@amarulasolutions.com> Message-ID: <20230208121355.07893b6d@windsurf> On Tue, 7 Feb 2023 18:17:18 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/qt6base.mk | 7 +++++++ > 1 file changed, 7 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:15:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:15:01 +0100 Subject: [Buildroot] [PATCH v6 11/13] package/qt6/qt6base: add support for printsupport/cups In-Reply-To: <20230207171721.2973997-12-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-12-angelo@amarulasolutions.com> Message-ID: <20230208121501.7fc4267d@windsurf> On Tue, 7 Feb 2023 18:17:19 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/Config.in | 4 ++++ > package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ > 2 files changed, 16 insertions(+) > > diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in > index d5d6d3569d..4d13128661 100644 > --- a/package/qt6/qt6base/Config.in > +++ b/package/qt6/qt6base/Config.in > @@ -168,6 +168,10 @@ config BR2_PACKAGE_QT6BASE_NETWORK > help > This options enables the Qt6Network library. > > +config BR2_PACKAGE_QT6BASE_PRINTSUPPORT > + depends on BR2_PACKAGE_QT6BASE_WIDGETS > + def_bool y Why is that a def_bool y? I see it's like that in qt5base, but I'm not sure why. I changed it to be a normal option: config BR2_PACKAGE_QT6BASE_PRINTSUPPORT bool "printing support" # yes, print support needs widgets depends on BR2_PACKAGE_QT6BASE_WIDGETS help This option enables printing support, optionally using CUPS if available. > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk > index 4a64886a3f..97986a3c2b 100644 > --- a/package/qt6/qt6base/qt6base.mk > +++ b/package/qt6/qt6base/qt6base.mk > @@ -206,6 +206,18 @@ else > QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF > endif > > +ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT), y) Spurious space before y > +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON > +ifeq ($(BR2_PACKAGE_CUPS), y) Same. Applied with those fixes. 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 Wed Feb 8 11:16:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:16:29 +0100 Subject: [Buildroot] [PATCH v6 12/13] package/qt6/qt6base: add support for building examples In-Reply-To: <20230207171721.2973997-13-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-13-angelo@amarulasolutions.com> Message-ID: <20230208121629.756b938e@windsurf> On Tue, 7 Feb 2023 18:17:20 +0100 Angelo Compagnucci wrote: > +config BR2_PACKAGE_QT6BASE_EXAMPLES > + bool "Compile and install examples " > + depends on BR2_PACKAGE_QT6_GL_SUPPORTS > + select BR2_PACKAGE_QT6BASE_DBUS > + select BR2_PACKAGE_QT6BASE_NETWORK > + select BR2_PACKAGE_QT6BASE_XML > + select BR2_PACKAGE_QT6BASE_DBUS > + select BR2_PACKAGE_QT6BASE_GUI > + select BR2_PACKAGE_QT6BASE_WIDGETS > + select BR2_PACKAGE_QT6BASE_OPENGL > + select BR2_PACKAGE_QT6BASE_OPENGL_LIB Due to comments/issues on previous patches, this option does not exist, so I'm not able to apply this patch right now. Could you resend as part of a new series after checking this BR2_PACKAGE_QT6BASE_OPENGL_LIB thing? Also, are all those options needed to have the examples? I believe with Qt5, when you enable the examples, it builds only the examples that it can build based on the features enabled in Qt. This was very handy. The same is not possible here? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Wed Feb 8 11:16:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 12:16:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gstd: bump to version 0.15.0 In-Reply-To: <20230102042130.2962255-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sun, 1 Jan 2023 21:21:30 -0700") References: <20230102042130.2962255-1-james.hilliard1@gmail.com> Message-ID: <87mt5o5rvo.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Drop patches which are now upstream. > Add new libedit dependency. > License hash changed due to LGPL-2.1+ relicense: > https://github.com/RidgeRun/gstd-1.x/commit/76d9fb61a05973b30220fcae5ff87de9d618ea49 I was a bit confused about this, as that commmit is about going from BSD-3-Claus to LGPL-2.1+, but it was marked as GPL-2.0+ for 0.14.0. It turns out that it was first relicensed to BSD, so I've extended the commit message with a link to: https://github.com/RidgeRun/gstd-1.x/commit/2cb6bb8b6c3bba24098a83557c5fa58a8a15ff58 And committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 11:13:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 12:13:44 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gstd: bump to version 0.15.0 Message-ID: <20230208111700.869F384609@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbd06adac50e304f413689febf676911ae29d967 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches which are now upstream. Add new libedit dependency. License hash changed due to LGPL-2.1+ relicense: https://github.com/RidgeRun/gstd-1.x/commit/2cb6bb8b6c3bba24098a83557c5fa58a8a15ff58 https://github.com/RidgeRun/gstd-1.x/commit/76d9fb61a05973b30220fcae5ff87de9d618ea49 Signed-off-by: James Hilliard [Peter: add BSD-3-Clause license change commit for clarity] Signed-off-by: Peter Korsgaard --- ...e-gstd-check-user-xenv.sh-for-systemd-se.patch} | 0 .../gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch | 27 -------- ...ve-meson-python-module-for-python-install.patch | 78 ---------------------- .../0004-meson.build-add-missing-init-subdir.patch | 28 -------- ...uild-use-dependency-function-for-readline.patch | 51 -------------- package/gstreamer1/gstd/Config.in | 5 +- package/gstreamer1/gstd/gstd.hash | 4 +- package/gstreamer1/gstd/gstd.mk | 5 +- 8 files changed, 8 insertions(+), 190 deletions(-) diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch b/package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch similarity index 100% rename from package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch rename to package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch diff --git a/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch b/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch deleted file mode 100644 index 79a65ffbdc..0000000000 --- a/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f1c953b9077619a83ab21c24dc343c7e21cd220d Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 01:46:25 -0600 -Subject: [PATCH] Fix gstd_chmod.sh DESTDIR path. - -This should fix the chmod path when cross compiling. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/247] ---- - gstd/gstd_chmod.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gstd/gstd_chmod.sh b/gstd/gstd_chmod.sh -index 8e58bce..fa7fa80 100755 ---- a/gstd/gstd_chmod.sh -+++ b/gstd/gstd_chmod.sh -@@ -3,4 +3,4 @@ - # $1 mode - # $2 file - --chmod $1 $2 -+chmod $1 ${DESTDIR}/$2 --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch b/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch deleted file mode 100644 index a27d79a0e9..0000000000 --- a/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1067f6138e947d18fd835e4a39f229ae2293f864 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 23:37:03 -0600 -Subject: [PATCH] Use native meson python module for python install. - -Signed-off-by: James Hilliard -[upstreeam: https://github.com/RidgeRun/gstd-1.x/pull/253] -Signed-off-by: Yann E. MORIN ---- - libgstc/meson.build | 4 +++- - libgstc/python/meson.build | 26 +++++++++++++++++++++++++- - meson_options.txt | 2 ++ - 3 files changed, 30 insertions(+), 2 deletions(-) - -diff --git a/libgstc/meson.build b/libgstc/meson.build -index e94dcd1..582cbb8 100644 ---- a/libgstc/meson.build -+++ b/libgstc/meson.build -@@ -1,2 +1,4 @@ - subdir('c') --subdir('python') -+if not get_option('enable-python').disabled() -+ subdir('python') -+endif -diff --git a/libgstc/python/meson.build b/libgstc/python/meson.build -index 057114b..24e3242 100644 ---- a/libgstc/python/meson.build -+++ b/libgstc/python/meson.build -@@ -1 +1,25 @@ --run_command('pip3', 'install', '.') -+pymod = import('python') -+python = pymod.find_installation( -+ get_option('with-python-version'), -+ required : get_option('enable-python').enabled(), -+ disabler : true -+) -+ -+pythonver = python.language_version() -+if pythonver.version_compare('<3.7') -+ error('Python @0@ is not supported anymore, please port your code to python3.7 or newer.'.format(python.language_version())) -+endif -+ -+pygstc_src_files = [ -+ 'pygstc/__init__.py', -+ 'pygstc/gstc.py', -+ 'pygstc/gstcerror.py', -+ 'pygstc/logger.py', -+ 'pygstc/tcp.py' -+] -+ -+python.install_sources( -+ pygstc_src_files, -+ subdir : 'pygstc', -+ pure : true -+) -diff --git a/meson_options.txt b/meson_options.txt -index f50e540..25292e6 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,6 +4,7 @@ option('enable-examples', type : 'feature', value : 'auto', yield : true, descri - option('enable-gtk-doc', type : 'boolean', value : false, description : 'Use gtk-doc to build documentation') - option('enable-systemd', type : 'feature', value : 'auto', description : 'Enable systemd gstd.service install') - option('enable-initd', type : 'feature', value : 'disabled', description : 'Enable init script install') -+option('enable-python', type : 'feature', value : 'auto', description : 'Install the pygstc library') - - # String options - option('with-gstd-runstatedir', type : 'string', value : '${prefix}/var/run/gstd', description : 'Specify the location of the gstd\'s PID file') -@@ -11,6 +12,7 @@ option('with-gstd-logstatedir', type : 'string', value : '${prefix}/var/log/gstd - option('with-gstd-systemddir', type : 'string', value : 'Systemd default systemduserunitdir', description : 'Specify the location of gstd.service file') - option('with-gstd-initddir', type : 'string', value : '${sysconfdir}/init.d', description : 'Specify the location of gstd init script') - option('with-statedir-owner', type : 'string', value : 'root', description : 'Specify the owner of gstd\'s run and log dirs created by the initd script') -+option('with-python-version', type : 'string', value : 'python3', description : 'Specify the python version for pygstc installation') - - # Common options - option('package-name', type : 'string', yield : true, --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0004-meson.build-add-missing-init-subdir.patch b/package/gstreamer1/gstd/0004-meson.build-add-missing-init-subdir.patch deleted file mode 100644 index ed3738e3d4..0000000000 --- a/package/gstreamer1/gstd/0004-meson.build-add-missing-init-subdir.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 689265cd522c770ad3e0391cae80ee884a8c475c Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 21 Apr 2022 01:14:52 -0500 -Subject: [PATCH] meson.build: add missing init subdir - -Seems this got accidentially removed in: -9f4490138c8892b1c86008134438b2ab405c9b0f - -Restore it so that init files are properly installed. - -Signed-off-by: James Hilliard -[upstreeam: https://github.com/RidgeRun/gstd-1.x/pull/291] ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index a30f776..7a8690a 100644 ---- a/meson.build -+++ b/meson.build -@@ -300,3 +300,4 @@ subdir('gst_client') - subdir('tests') - subdir('examples') - subdir('docs') -+subdir('init') --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0005-meson.build-use-dependency-function-for-readline.patch b/package/gstreamer1/gstd/0005-meson.build-use-dependency-function-for-readline.patch deleted file mode 100644 index 51422e56d6..0000000000 --- a/package/gstreamer1/gstd/0005-meson.build-use-dependency-function-for-readline.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3ef45c41105e61efe84c9be3a9a22988dfe10db8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 22 Oct 2021 07:33:04 +0200 -Subject: [PATCH] meson.build: use dependency function for readline - -Use meson dependency function to find readline instead of -cc.find_library. This function will retrieve readline pkg-config file -which is available since version 7 (released 5 years ago) and -https://git.savannah.gnu.org/cgit/readline.git/commit/readline.pc.in?id=d49a9082c0e15bba8cd3d8cc0a994409cf823cac. -readline.pc sets tinfo in Requires.Private which will avoid the -following static build failure: - -/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/lib/libreadline.a(display.o): in function `_rl_move_cursor_relative': -display.c:(.text+0xbb5): undefined reference to `tputs' - -Fixes: - - http://autobuild.buildroot.org/results/77c10947ddc749c54c7c233e3143f5cdf1edc73d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/RidgeRun/gstd-1.x/pull/261] ---- - meson.build | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index 7a8690a..44ed5c2 100644 ---- a/meson.build -+++ b/meson.build -@@ -32,8 +32,8 @@ systemd_required = get_option('enable-systemd').enabled() - systemd_dep = dependency('systemd', required : systemd_required, version : '>=232') - - cc = meson.get_compiler('c') --readline = cc.find_library('readline', required: true) --if readline.found() -+readline_dep = dependency('readline') -+if readline_dep.found() - add_project_arguments('-DHAVE_LIBREADLINE', language: 'c') - add_project_arguments('-DHAVE_READLINE_HISTORY', language: 'c') - # Add arguments to the compiler command line. -@@ -48,8 +48,6 @@ if readline.found() - else - add_project_arguments('-DHAVE_HISTORY_H', language: 'c') - endif -- -- readline_dep = readline - endif - - ## Dependencies --- -2.37.1 - diff --git a/package/gstreamer1/gstd/Config.in b/package/gstreamer1/gstd/Config.in index f36d25f11f..df1d2f59c3 100644 --- a/package/gstreamer1/gstd/Config.in +++ b/package/gstreamer1/gstd/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_GSTD bool "gstd" - depends on BR2_USE_WCHAR # libglib2 -> gettext, libsoup + depends on BR2_USE_WCHAR # libglib2 -> gettext, libedit, libsoup depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libsoup - depends on BR2_USE_MMU # libdaemon, libglib2 + depends on BR2_USE_MMU # libdaemon, libedit, libglib2 select BR2_PACKAGE_GSTREAMER1_GST_DEBUG # gst_debug_bin_to_dot_data select BR2_PACKAGE_JANSSON select BR2_PACKAGE_JSON_GLIB select BR2_PACKAGE_LIBDAEMON + select BR2_PACKAGE_LIBEDIT select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_READLINE diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash index 20c821a27f..632f83f8e8 100644 --- a/package/gstreamer1/gstd/gstd.hash +++ b/package/gstreamer1/gstd/gstd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 56afd58530b63d0d88dd818fd4e6c9230861819b3e131c6a87a46084c3f3fa96 gstd-0.14.0.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 f4a83765d2cf2948c38abc5107ab07d49a01b4101047f188fed7204f1d4e49c7 gstd-0.15.0.tar.gz +sha256 10162be9f7ddb9e98c22c3edd0f78d62ab88f0ca8b1cc968bd85d5d665489d90 COPYING diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk index 817e9143ae..ccb3b3e1bc 100644 --- a/package/gstreamer1/gstd/gstd.mk +++ b/package/gstreamer1/gstd/gstd.mk @@ -4,10 +4,10 @@ # ################################################################################ -GSTD_VERSION = 0.14.0 +GSTD_VERSION = 0.15.0 GSTD_SITE = $(call github,RidgeRun,gstd-1.x,v$(GSTD_VERSION)) GSTD_LICENSE_FILES = COPYING -GSTD_LICENSE = GPL-2.0+ +GSTD_LICENSE = LGPL-2.1+ GSTD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ @@ -15,6 +15,7 @@ GSTD_DEPENDENCIES = \ jansson \ json-glib \ libdaemon \ + libedit \ libglib2 \ libsoup \ readline From thomas.petazzoni at bootlin.com Wed Feb 8 11:18:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:18:29 +0100 Subject: [Buildroot] [PATCH v6 13/13] package/qt6: Add qmake functionality In-Reply-To: <20230207171721.2973997-14-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-14-angelo@amarulasolutions.com> Message-ID: <20230208121829.126bc242@windsurf> Hello, On Tue, 7 Feb 2023 18:17:21 +0100 Angelo Compagnucci wrote: > diff --git a/package/qt6/qt6base/qt.conf.in b/package/qt6/qt6base/qt.conf.in > new file mode 100644 > index 0000000000..4842bcb462 > --- /dev/null > +++ b/package/qt6/qt6base/qt.conf.in > @@ -0,0 +1,7 @@ > +[Paths] > +Prefix=/usr > +HostPrefix=@@HOST_DIR@@ > +HostData=../target/usr This looks very very odd, and most likely doesn't work. If I understand correctly, this is a path that will be interpreted relatively to $(HOST_DIR), so this value assumes that host/ and target/ are side by side, but that's not true in the general case. Indeed, BR2_HOST_DIR allows to customize where $(HOST_DIR) is located, and it can be elsewhere than side by side to target/. What is this trying to do exactly? > +Sysroot=@@STAGING_DIR@@ > +SysrootifyPrefix=true > +TargetSpec=devices/linux-buildroot-g++ > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk > index ec1c65f827..f37b2bafce 100644 > --- a/package/qt6/qt6base/qt6base.mk > +++ b/package/qt6/qt6base/qt6base.mk > @@ -54,6 +54,9 @@ QT6BASE_CONF_OPTS = \ > -DFEATURE_system_zlib=ON \ > -DFEATURE_system_libb2=ON > > +QT6BASE_CFLAGS = $(TARGET_CFLAGS) > +QT6BASE_CXXFLAGS = $(TARGET_CXXFLAGS) > + > # x86 optimization options. While we have a BR2_X86_CPU_HAS_AVX512, it > # is not clear yet how it maps to all the avx512* options of Qt, so we > # for now keeps them disabled. > @@ -384,5 +387,18 @@ else > QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF > endif > > +define QT6BASE_MAKE_BR_SPEC > + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qmake.conf.in \ > + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf > + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ > + $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h > +endef > + > +QT6BASE_CONF_OPTS += -DQT_QMAKE_DEVICE_OPTIONS=CROSS_COMPILE="$(TARGET_CROSS)";BR_COMPILER_CFLAGS="$(QT6BASE_CFLAGS)";BR_COMPILER_CXXFLAGS="$(QT6BASE_CXX_FLAGS)" > + > +QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC > + > +QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF Where is QT6_INSTALL_QT_CONF implemented ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:19:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:19:56 +0100 Subject: [Buildroot] [git commit] configs/olimex_stmp157: bump Linux and U-Boot Message-ID: <20230208112006.267418461D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=019bf138eaf634ba1781037755c6cc594371ada0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_stmp157_olinuxino_lime_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index a63394fa0b..49670dbe4f 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -16,8 +16,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/stmp1_olinuxino/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/OLIMEX/linux-olimex.git" -# branch release-20220413-v5.10.105 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="d417808c240d55576ee76e5cbb40413ad444ecfd" +# branch release-20221011-v5.10.105 +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1b955f3ee7ef3234f290f65dbea108063996aea0" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olimex/stmp1_olinuxino/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -34,8 +34,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/OLIMEX/u-boot-olinuxino.git" -# release-20220413, based on 2021.04 -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="b39c5a7c93a2d8efaecc9cad4284378af857c3f7" +# release-20220927, based on 2021.04 +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="98ab5ecb0a16eeb426f34b2a1a28e56658c1a59c" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y From thomas.petazzoni at bootlin.com Wed Feb 8 11:19:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:19:56 +0100 Subject: [Buildroot] [git commit] configs/olimex_stmp157: configure eth0 with DHCP Message-ID: <20230208112006.3148C8461F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4ad6d332b9e47e432f9934405946621b2e0c09a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_stmp157_olinuxino_lime_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index 49670dbe4f..60c34d7fa1 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -8,6 +8,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="stmp1-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/stmp1_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/stmp1_olinuxino/genimage.cfg" From thomas.petazzoni at bootlin.com Wed Feb 8 11:24:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:24:10 +0100 Subject: [Buildroot] [PATCH 1/2] configs/olimex_stmp157: bump Linux and U-Boot In-Reply-To: <20221126180016.280061-1-francois.perrad@gadz.org> References: <20221126180016.280061-1-francois.perrad@gadz.org> Message-ID: <20230208122410.51ea30e5@windsurf> On Sat, 26 Nov 2022 19:00:15 +0100 Francois Perrad wrote: > Signed-off-by: Francois Perrad > --- > configs/olimex_stmp157_olinuxino_lime_defconfig | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Both patches applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 12:24:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:24:16 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gst1-plugins-bad: add zxing plugin support Message-ID: <20230208122444.29C4484639@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11b2ab5ee261e8af1065f15e2e69290e15e9e4ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/Config.in | 9 +++++++++ package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 1e89cd124f..d477924eec 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -738,6 +738,15 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 +config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING + bool "zxing" + depends on !BR2_STATIC_LIBS # zxing-cpp + depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp + select BR2_PACKAGE_ZXING_CPP + +comment "zxing plugin needs a toolchain w/ C++, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP + endif comment "gst1-plugins-bad needs a toolchain w/ C++" diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index dfe1f1c9eb..edac818985 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -70,7 +70,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dsvthevcenc=disabled \ -Dtranscode=disabled \ -Dwasapi2=disabled \ - -Dzxing=disabled \ -Dmagicleap=disabled \ -Disac=disabled \ -Diqa=disabled \ @@ -812,6 +811,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dzbar=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += zxing-cpp +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=disabled +endif + # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dgpl=enabled From thomas.petazzoni at bootlin.com Wed Feb 8 12:23:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:23:49 +0100 Subject: [Buildroot] [git commit] package/zxing-cpp: bump to version 1.4.0 Message-ID: <20230208122444.1E74484636@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=456a7398316655ad0b669635f580e4887c24a700 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches which are no longer required. Verified license remains Apache-2.0 after hash change. Rework config options for 1.4.0. Add new host-pkgconf and stb build dependency. Drop optional libiconv dependency which is no longer used. Add optional python module support. Add optional qt5 support. Add optional opencv4 support. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...ke-libs-private-not-exported-to-the-users.patch | 43 ------------------- ...02-CMakeLists-txt-add-BUILD_OPENCV-option.patch | 39 ------------------ package/zxing-cpp/Config.in | 2 + package/zxing-cpp/zxing-cpp.hash | 4 +- package/zxing-cpp/zxing-cpp.mk | 48 +++++++++++++++++----- 5 files changed, 42 insertions(+), 94 deletions(-) diff --git a/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch b/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch deleted file mode 100644 index 90b2320384..0000000000 --- a/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9e5dfa57f3b998bc3049bfa893b20e81dea656df Mon Sep 17 00:00:00 2001 -From: Yuri -Date: Sat, 20 Apr 2019 07:28:26 -0700 -Subject: [PATCH] Link library with OpenCV, not only the executable, make libs - PRIVATE. - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/86] ---- - CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 738f4e1..efe3aee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,10 +60,12 @@ include_directories(core/src) - add_library(libzxing ${LIBZXING_FILES}) - set_target_properties(libzxing PROPERTIES PREFIX "") - -+set(libzxing_LIBS "") -+ - find_package(Iconv) - if(ICONV_FOUND) - include_directories(${ICONV_INCLUDE_DIR}) -- target_link_libraries(libzxing ${ICONV_LIBRARIES}) -+ set(libzxing_LIBS ${libzxing_LIBS} ${ICONV_LIBRARIES}) - else() - add_definitions(-DNO_ICONV=1) - endif() -@@ -75,9 +77,12 @@ if(OpenCV_FOUND) - "./opencv-cli/src/*.h" - ) - add_executable(zxing-cv ${OPENCV_ZXING_FILES}) -+ set(libzxing_LIBS ${libzxing_LIBS} ${OpenCV_LIBRARIES}) - target_link_libraries(zxing-cv libzxing ${OpenCV_LIBRARIES}) - endif() - -+target_link_libraries(libzxing PRIVATE ${libzxing_LIBS}) -+ - # Add cli executable. - file(GLOB_RECURSE ZXING_FILES - "./cli/src/*.cpp" diff --git a/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch b/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch deleted file mode 100644 index 31753d7c24..0000000000 --- a/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fe740316af970f57ec511cdeafb512510e4842a9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 9 Nov 2019 17:21:13 +0100 -Subject: [PATCH] CMakeLists.txt: add BUILD_OPENCV option - -Add BUILD_OPENCV option to allow the user to disable OpenCV. It is -especially useful as opencv library can be built without highgui support - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/90] ---- - CMakeLists.txt | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 738f4e1..12913cd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.0) - project(zxing) - - option(BUILD_TESTING "Enable generation of test targets" OFF) -+option(BUILD_OPENCV "Enable OpenCV classes and OpenCV cli executable" ON) - - set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH}) - -@@ -44,8 +45,10 @@ else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - --# OpenCV classes --find_package(OpenCV) -+if (BUILD_OPENCV) -+ # OpenCV classes -+ find_package(OpenCV) -+endif() - if(OpenCV_FOUND) - list(APPEND LIBZXING_FILES - opencv/src/zxing/MatSource.cpp diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index c1109219a0..6c17565d2a 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_ZXING_CPP bool "zxing-cpp" depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_STB + select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 help ZXing-cpp (pronounced "zebra crossing") is an open-source, multi-format 1D/2D barcode image processing library diff --git a/package/zxing-cpp/zxing-cpp.hash b/package/zxing-cpp/zxing-cpp.hash index cabe3e70d4..5457ede44a 100644 --- a/package/zxing-cpp/zxing-cpp.hash +++ b/package/zxing-cpp/zxing-cpp.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4c2b8601d0e3377143c1a0bbab220146af9fa5a5e29e8fbef42862fe3d38f8e6 zxing-cpp-e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10.tar.gz +sha256 126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862 zxing-cpp-1.4.0.tar.gz # License files -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 COPYING +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index e9c80b4453..1051376808 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -4,23 +4,51 @@ # ################################################################################ -ZXING_CPP_VERSION = e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10 -ZXING_CPP_SITE = $(call github,glassechidna,zxing-cpp,$(ZXING_CPP_VERSION)) +ZXING_CPP_VERSION = 1.4.0 +ZXING_CPP_SITE = $(call github,zxing-cpp,zxing-cpp,v$(ZXING_CPP_VERSION)) ZXING_CPP_LICENSE = Apache-2.0 -ZXING_CPP_LICENSE_FILES = COPYING +ZXING_CPP_LICENSE_FILES = LICENSE ZXING_CPP_INSTALL_STAGING = YES ZXING_CPP_SUPPORTS_IN_SOURCE_BUILD = NO -ZXING_CPP_CONF_OPTS = -DBUILD_TESTING=OFF +ZXING_CPP_DEPENDENCIES = host-pkgconf stb +ZXING_CPP_CONF_OPTS = \ + -DBUILD_READERS=ON \ + -DBUILD_WRITERS=ON \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_BLACKBOX_TESTS=OFF \ + -DBUILD_UNIT_TESTS=OFF \ + -DBUILD_DEPENDENCIES=LOCAL -ifeq ($(BR2_PACKAGE_LIBICONV),y) -ZXING_CPP_DEPENDENCIES += libiconv +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV4_LIB_HIGHGUI),y) +ifeq ($(BR2_PACKAGE_OPENCV3),y) +ZXING_CPP_DEPENDENCIES += opencv3 +endif +ifeq ($(BR2_PACKAGE_OPENCV4),y) +ZXING_CPP_DEPENDENCIES += opencv4 +endif +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_OpenCV=TRUE +else +ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV=TRUE endif -ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y) -ZXING_CPP_DEPENDENCIES += opencv3 -ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON +ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy) +ZXING_CPP_DEPENDENCIES += python3 python-pybind +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=ON +else +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF +endif + +ifeq ($(BR2_PACKAGE_QT5BASE),y) +ZXING_CPP_DEPENDENCIES += qt5base +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yy) +ZXING_CPP_DEPENDENCIES += qt5declarative qt5multimedia +endif +# Only set qt5 as required when all optional qt5 dependencies are present +ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yyy) +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_Qt5=TRUE +endif else -ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFF +ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE endif $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Wed Feb 8 12:27:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:27:53 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/zxing-cpp: bump to version 1.4.0 In-Reply-To: <20221114232254.3970611-1-james.hilliard1@gmail.com> References: <20221114232254.3970611-1-james.hilliard1@gmail.com> Message-ID: <20230208132753.7895f68f@windsurf> On Mon, 14 Nov 2022 16:22:53 -0700 James Hilliard wrote: > Drop patches which are no longer required. > > Verified license remains Apache-2.0 after hash change. > > Rework config options for 1.4.0. > > Add new host-pkgconf and stb build dependency. > > Drop optional libiconv dependency which is no longer used. > > Add optional python module support. > > Add optional qt5 support. > > Add optional opencv4 support. > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - fix makefile pybind check > - add comment for qt5 required config > --- > ...bs-private-not-exported-to-the-users.patch | 43 ----------------- > ...akeLists-txt-add-BUILD_OPENCV-option.patch | 39 --------------- > package/zxing-cpp/Config.in | 2 + > package/zxing-cpp/zxing-cpp.hash | 4 +- > package/zxing-cpp/zxing-cpp.mk | 48 +++++++++++++++---- > 5 files changed, 42 insertions(+), 94 deletions(-) > delete mode 100644 package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch > delete mode 100644 package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch Both applied to master, thanks! On the first patch, I have changed to disable building the examples, it doesn't seem to make much sense to enable examples by default. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 8 12:30:59 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 13:30:59 +0100 Subject: [Buildroot] [PATCH v2 07/14] utils/check-package: check all shell scripts In-Reply-To: <20220731193521.1217825-8-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-8-ricardo.martincoski@gmail.com> Message-ID: <76f90a9f-9899-fd78-3ae4-add859507b2c@mind.be> On 31/07/2022 21:35, Ricardo Martincoski wrote: > Currently only SysV init scripts are checked using shellcheck and a few > other rules (e.g. variable naming, file naming). > > Extend the check using shellcheck to all shell scripts in the tree. > This is actually limited to the list of directories that check-package > knows that can check, but that list can be expanded later. > > In order to apply the check to all shell scripts, use python3-magic to > determine the file type. Turns out there are (at least) two Python modules called "magic", and I happened to have the other one installed... So I adapted the code to support both. > Keep testing first for name pattern, and only in the case there is no > match, check the file type. This ensures, for instance, that SysV > init scripts follow specific rules. > > Apply these checks for shell scripts: > - shellcheck; > - trailing space; > - consecutive empty lines; > - empty last line on file; > - newline at end of file. > > Update the list of ignored warnings. > > Do not add unit tests since no function was added, they were just > reused. > But expand the runtime test for check-package using as fixture a file > that generates a shellcheck warning. > > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - do not mention docker image in the commit message > > NOTE to the maintainer applying this patch: please re-generate the list > of ignored warnings while applying: > $ utils/docker-run make .checkpackageignore Only one exception more than originally, so that's good I guess. Applied to master, thanks. Regards, Arnout > --- > .checkpackageignore | 20 +++++++++++++++++++ > .../utils/br2-external/utils/x-shellscript | 2 ++ > .../testing/tests/utils/test_check_package.py | 17 ++++++++++++++++ > utils/check-package | 13 +++++++++++- > utils/checkpackagelib/lib_shellscript.py | 5 +++++ > 5 files changed, 56 insertions(+), 1 deletion(-) > create mode 100755 support/testing/tests/utils/br2-external/utils/x-shellscript > create mode 100644 utils/checkpackagelib/lib_shellscript.py > > diff --git a/.checkpackageignore b/.checkpackageignore > index d8947e89fc..a527254464 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -16,11 +16,13 @@ package/busybox/S02sysctl Variables > package/busybox/S10mdev ConsecutiveEmptyLines Indent Shellcheck > package/busybox/S15watchdog Indent Variables > package/busybox/S50telnet Indent Shellcheck Variables > +package/busybox/udhcpc.script Shellcheck > package/c-icap/S96cicap Indent Shellcheck Variables > package/cfm/S65cfm Indent Variables > package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables > package/chrony/S49chrony Indent Shellcheck Variables > package/connman/S45connman Variables > +package/coremark-pro/coremark-pro.sh.in Shellcheck > package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob > package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob > package/curlftpfs/0003-nocache-memleak-fix.patch Sob > @@ -30,6 +32,7 @@ package/dbus/S30dbus Indent Shellcheck TrailingSpace Variables > package/dcron/S90dcron Variables > package/dhcp/S80dhcp-relay Shellcheck Variables > package/dhcp/S80dhcp-server Shellcheck Variables > +package/dhcp/dhclient-script Shellcheck TrailingSpace > package/dhcpcd/S41dhcpcd Indent Variables > package/dhrystone/0001-cmdline-nruns.patch Sob > package/dhrystone/0002-HZ.patch Sob > @@ -44,9 +47,11 @@ package/domoticz/S99domoticz Shellcheck > package/dropbear/S50dropbear Indent Shellcheck Variables > package/earlyoom/S02earlyoom Indent Shellcheck > package/ejabberd/S50ejabberd Indent Shellcheck Variables > +package/ejabberd/check-erlang-lib Shellcheck > package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables > package/exim/S86exim Indent Variables > package/fail2ban/S60fail2ban Shellcheck Variables > +package/fakedate/fakedate Shellcheck > package/fbv/0001-cross.patch Sob > package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob > package/fbv/0005-include.patch Sob > @@ -57,6 +62,7 @@ package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsaniti > package/genromfs/0001-build-system.patch Sob > package/gerbera/S99gerbera Indent > package/go/0002-cmd-dist-use-gohostarch-for-ssa-rewrite-check.patch Sob > +package/google-breakpad/gen-syms.sh Shellcheck > package/gpsd/S50gpsd Indent Shellcheck Variables > package/haveged/S21haveged Shellcheck Variables > package/htpdate/S43htpdate Shellcheck > @@ -64,8 +70,12 @@ package/i2pd/S99i2pd Indent Shellcheck Variables > package/ifplugd/0001-cross.patch Sob > package/ifplugd/0002-fix-headers.patch Sob > package/ifupdown-scripts/S40network EmptyLastLine Indent Shellcheck Variables > +package/ifupdown-scripts/network/if-pre-up.d/wait_iface EmptyLastLine Shellcheck > +package/ifupdown-scripts/nfs_check Shellcheck > package/igd2-for-linux/S99upnpd Indent Shellcheck Variables > package/inadyn/S70inadyn Indent NotExecutable > +package/initscripts/init.d/rcK ConsecutiveEmptyLines EmptyLastLine Shellcheck > +package/initscripts/init.d/rcS ConsecutiveEmptyLines EmptyLastLine Shellcheck > package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Variables > package/iptables/S35iptables Shellcheck > package/irda-utils/0001-daemon.patch Sob > @@ -95,6 +105,7 @@ package/lldpd/S60lldpd Indent Shellcheck Variables > package/lockfile-progs/0001-sus3v-legacy.patch Sob > package/madplay/0001-switch-to-new-alsa-api.patch Sob > package/mariadb/S97mysqld Indent Shellcheck Variables > +package/matchbox-keyboard/mb-applet-kbd-wrapper.sh Shellcheck TrailingSpace > package/mender-connect/S43mender-connect Shellcheck > package/mii-diag/0001-strchr.patch Sob > package/minidlna/S60minidlnad Indent Shellcheck Variables > @@ -112,6 +123,7 @@ package/netcat/0001-signed-bit-counting.patch Sob > package/netopeer2/S52netopeer2 Shellcheck Variables > package/netplug/0001-makefile-flags.patch Sob > package/netplug/S29netplug Indent Shellcheck Variables > +package/netplug/netplug-script ConsecutiveEmptyLines Shellcheck > package/netsnmp/S59snmpd Indent Shellcheck Variables > package/network-manager/S45network-manager ConsecutiveEmptyLines EmptyLastLine Shellcheck Variables > package/nfs-utils/S60nfs ConsecutiveEmptyLines Shellcheck Variables > @@ -123,12 +135,14 @@ package/ofono/S46ofono Variables > package/olsr/S50olsr Indent Shellcheck Variables > package/openntpd/S49ntp Shellcheck Variables > package/openssh/S50sshd EmptyLastLine Indent Variables > +package/openvmtools/shutdown Shellcheck > package/openvpn/S60openvpn Indent Shellcheck Variables > package/optee-client/S30optee Indent Shellcheck Variables > package/oracle-mysql/S97mysqld Shellcheck Variables > package/owfs/S55owserver Shellcheck Variables > package/owfs/S60owfs Shellcheck Variables > package/pigpio/S50pigpio Shellcheck Variables > +package/pkgconf/pkg-config.in Shellcheck > package/polkit/S50polkit NotExecutable Shellcheck Variables > package/postgresql/S50postgresql Variables > package/procps-ng/S02sysctl Variables > @@ -161,11 +175,14 @@ package/sslh/S35sslh Indent Shellcheck Variables > package/stunnel/S50stunnel Indent Shellcheck Variables > package/supervisor/S99supervisord Variables > package/suricata/S99suricata Shellcheck > +package/swupdate/swupdate.sh Shellcheck > package/sysrepo/S51sysrepo-plugind Indent Shellcheck > +package/systemd/fakeroot_tmpfiles.sh Shellcheck > package/targetcli-fb/S50target Shellcheck Variables > package/tcf-agent/S55tcf-agent Shellcheck Variables > package/tftpd/S80tftpd-hpa Indent Shellcheck Variables > package/ti-gfx/S80ti-gfx Shellcheck Variables > +package/ti-gfx/esrev.sh Shellcheck > package/ti-sgx-um/S80ti-sgx Variables > package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables > package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables > @@ -176,10 +193,13 @@ package/unscd/S46unscd Indent Shellcheck Variables > package/upmpdcli/S99upmpdcli Indent Shellcheck Variables > package/urandom-scripts/S20urandom Variables > package/usbguard/S20usbguard Indent Shellcheck Variables > +package/vala/vala-wrapper Shellcheck > package/vsftpd/S70vsftpd Indent Shellcheck Variables > package/watchdogd/S01watchdogd Indent NotExecutable > +package/wpa_supplicant/ifupdown.sh Shellcheck > package/x11r7/xapp_xdm/S99xdm Indent Variables > package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob > package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob > package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob > package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables > +package/xl2tp/xl2tpd TrailingSpace > diff --git a/support/testing/tests/utils/br2-external/utils/x-shellscript b/support/testing/tests/utils/br2-external/utils/x-shellscript > new file mode 100755 > index 0000000000..a7de4124bd > --- /dev/null > +++ b/support/testing/tests/utils/br2-external/utils/x-shellscript > @@ -0,0 +1,2 @@ > +#!/bin/bash > +unused="text" > diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py > index f21b9e939f..aeda0857e3 100644 > --- a/support/testing/tests/utils/test_check_package.py > +++ b/support/testing/tests/utils/test_check_package.py > @@ -232,3 +232,20 @@ class TestCheckPackage(unittest.TestCase): > .format(subdir_file), w) > self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update .checkpackageignore?" > .format(subdir_file), w) > + > + # shell scripts are tested using shellcheck > + rel_file = "utils/x-shellscript" > + abs_path = infra.filepath("tests/utils/br2-external") > + abs_file = os.path.join(abs_path, rel_file) > + > + w, m = call_script(["check-package", "-b", rel_file], > + self.WITH_UTILS_IN_PATH, abs_path) > + self.assert_file_was_processed(m) > + self.assert_warnings_generated_for_file(m) > + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(rel_file), w) > + > + w, m = call_script(["check-package", "-b", abs_file], > + self.WITH_UTILS_IN_PATH, infra.basepath()) > + self.assert_file_was_processed(m) > + self.assert_warnings_generated_for_file(m) > + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(abs_file), w) > diff --git a/utils/check-package b/utils/check-package > index d896e8b117..732f1cf112 100755 > --- a/utils/check-package > +++ b/utils/check-package > @@ -3,6 +3,7 @@ > > import argparse > import inspect > +import magic > import os > import re > import six > @@ -13,6 +14,7 @@ import checkpackagelib.lib_config > import checkpackagelib.lib_hash > import checkpackagelib.lib_mk > import checkpackagelib.lib_patch > +import checkpackagelib.lib_shellscript > import checkpackagelib.lib_sysv > > IGNORE_FILENAME = ".checkpackageignore" > @@ -86,6 +88,15 @@ def parse_args(): > return flags > > > +def get_lib_from_filetype(fname): > + if not os.path.isfile(fname): > + return None > + filetype = magic.from_file(fname, mime=True) > + if filetype == "text/x-shellscript": > + return checkpackagelib.lib_shellscript > + return None > + > + > CONFIG_IN_FILENAME = re.compile(r"Config\.\S*$") > DO_CHECK_INTREE = re.compile(r"|".join([ > r"Config.in", > @@ -129,7 +140,7 @@ def get_lib_from_filename(fname): > return checkpackagelib.lib_patch > if SYSV_INIT_SCRIPT_FILENAME.search(fname): > return checkpackagelib.lib_sysv > - return None > + return get_lib_from_filetype(fname) > > > def common_inspect_rules(m): > diff --git a/utils/checkpackagelib/lib_shellscript.py b/utils/checkpackagelib/lib_shellscript.py > new file mode 100644 > index 0000000000..9b4f4aed58 > --- /dev/null > +++ b/utils/checkpackagelib/lib_shellscript.py > @@ -0,0 +1,5 @@ > +from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 > +from checkpackagelib.lib import EmptyLastLine # noqa: F401 > +from checkpackagelib.lib import NewlineAtEof # noqa: F401 > +from checkpackagelib.lib import TrailingSpace # noqa: F401 > +from checkpackagelib.tool import Shellcheck # noqa: F401 From arnout at mind.be Wed Feb 8 12:31:04 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 13:31:04 +0100 Subject: [Buildroot] [git commit] .checkpackageignore: remove package/urandom-scripts/S20urandom Message-ID: <20230208123124.47B868465B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30624cf777b84ead9c788cee911fb1c387d358fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 4a6f9d2516820c296a8af788b259ca96926cd60d removed package/urandom-scripts/S20urandom but didn't remove it from .checkpackageignore. Do so now. The commit actually renamed it to S20seedrng, but it also fixed the Variables errors so it no longer needs to be ignored. Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index b1f2d99b99..c4d07c1d7d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -169,7 +169,6 @@ package/tvheadend/S99tvheadend Indent Shellcheck Variables package/unbound/S70unbound Shellcheck package/unscd/S46unscd Indent Shellcheck Variables package/upmpdcli/S99upmpdcli Indent Shellcheck Variables -package/urandom-scripts/S20urandom Variables package/usbguard/S20usbguard Indent Shellcheck Variables package/vsftpd/S70vsftpd Indent Shellcheck Variables package/watchdogd/S01watchdogd Indent NotExecutable From arnout at mind.be Wed Feb 8 12:31:06 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 13:31:06 +0100 Subject: [Buildroot] [git commit] utils/check-package: check all shell scripts Message-ID: <20230208123124.54BB28465D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5a3dfb9a4a6550b9097b22b1c96a99f90880a64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently only SysV init scripts are checked using shellcheck and a few other rules (e.g. variable naming, file naming). Extend the check using shellcheck to all shell scripts in the tree. This is actually limited to the list of directories that check-package knows that can check, but that list can be expanded later. In order to apply the check to all shell scripts, use python3-magic to determine the file type. Unfortunately, there are two different python modules called "magic". Support both by detecting which one is installed and defining get_filetype accordingly. Keep testing first for name pattern, and only in the case there is no match, check the file type. This ensures, for instance, that SysV init scripts follow specific rules. Apply these checks for shell scripts: - shellcheck; - trailing space; - consecutive empty lines; - empty last line on file; - newline at end of file. Update the list of ignored warnings. Do not add unit tests since no function was added, they were just reused. But expand the runtime test for check-package using as fixture a file that generates a shellcheck warning. Signed-off-by: Ricardo Martincoski [Arnout: support both variants of the "magic" module] Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 21 ++++++++++++++++ .../tests/utils/br2-external/utils/x-shellscript | 2 ++ support/testing/tests/utils/test_check_package.py | 17 +++++++++++++ utils/check-package | 28 +++++++++++++++++++++- utils/checkpackagelib/lib_shellscript.py | 5 ++++ 5 files changed, 72 insertions(+), 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index c4d07c1d7d..405e1c5677 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -16,11 +16,13 @@ package/busybox/S02sysctl Variables package/busybox/S10mdev ConsecutiveEmptyLines Indent Shellcheck package/busybox/S15watchdog Indent Variables package/busybox/S50telnet Indent Shellcheck Variables +package/busybox/udhcpc.script Shellcheck package/c-icap/S96cicap Indent Shellcheck Variables package/cfm/S65cfm Indent Variables package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables package/chrony/S49chrony Indent Shellcheck Variables package/connman/S45connman Variables +package/coremark-pro/coremark-pro.sh.in Shellcheck package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob package/curlftpfs/0003-nocache-memleak-fix.patch Sob @@ -30,6 +32,7 @@ package/dbus/S30dbus Indent Shellcheck TrailingSpace Variables package/dcron/S90dcron Variables package/dhcp/S80dhcp-relay Shellcheck Variables package/dhcp/S80dhcp-server Shellcheck Variables +package/dhcp/dhclient-script Shellcheck TrailingSpace package/dhcpcd/S41dhcpcd Indent Variables package/dhrystone/0001-cmdline-nruns.patch Sob package/dhrystone/0002-HZ.patch Sob @@ -41,12 +44,15 @@ package/dmraid/S20dmraid Variables package/dnsmasq/S80dnsmasq Shellcheck Variables package/docker-engine/S60dockerd Indent Shellcheck Variables package/domoticz/S99domoticz Shellcheck +package/dracut/merged-usr-module-setup.sh Shellcheck package/dropbear/S50dropbear Indent Shellcheck Variables package/earlyoom/S02earlyoom Indent Shellcheck package/ejabberd/S50ejabberd Indent Shellcheck Variables +package/ejabberd/check-erlang-lib Shellcheck package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables package/exim/S86exim Indent Variables package/fail2ban/S60fail2ban Shellcheck Variables +package/fakedate/fakedate Shellcheck package/fbv/0001-cross.patch Sob package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob package/fbv/0005-include.patch Sob @@ -56,6 +62,7 @@ package/gamin/0002-no-const-return.patch Sob package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch Sob package/genromfs/0001-build-system.patch Sob package/gerbera/S99gerbera Indent +package/google-breakpad/gen-syms.sh Shellcheck package/gpsd/S50gpsd Indent Shellcheck Variables package/haveged/S21haveged Shellcheck Variables package/htpdate/S43htpdate Shellcheck @@ -63,8 +70,12 @@ package/i2pd/S99i2pd Indent Shellcheck Variables package/ifplugd/0001-cross.patch Sob package/ifplugd/0002-fix-headers.patch Sob package/ifupdown-scripts/S40network EmptyLastLine Indent Shellcheck Variables +package/ifupdown-scripts/network/if-pre-up.d/wait_iface EmptyLastLine Shellcheck +package/ifupdown-scripts/nfs_check Shellcheck package/igd2-for-linux/S99upnpd Indent Shellcheck Variables package/inadyn/S70inadyn Indent NotExecutable +package/initscripts/init.d/rcK ConsecutiveEmptyLines EmptyLastLine Shellcheck +package/initscripts/init.d/rcS ConsecutiveEmptyLines EmptyLastLine Shellcheck package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Variables package/iptables/S35iptables Shellcheck package/irda-utils/0001-daemon.patch Sob @@ -94,6 +105,7 @@ package/lldpd/S60lldpd Indent Shellcheck Variables package/lockfile-progs/0001-sus3v-legacy.patch Sob package/madplay/0001-switch-to-new-alsa-api.patch Sob package/mariadb/S97mysqld Indent Shellcheck Variables +package/matchbox-keyboard/mb-applet-kbd-wrapper.sh Shellcheck TrailingSpace package/mender-connect/S43mender-connect Shellcheck package/mii-diag/0001-strchr.patch Sob package/minidlna/S60minidlnad Indent Shellcheck Variables @@ -111,6 +123,7 @@ package/netcat/0001-signed-bit-counting.patch Sob package/netopeer2/S52netopeer2 Shellcheck Variables package/netplug/0001-makefile-flags.patch Sob package/netplug/S29netplug Indent Shellcheck Variables +package/netplug/netplug-script ConsecutiveEmptyLines Shellcheck package/netsnmp/S59snmpd Indent Shellcheck Variables package/network-manager/S45network-manager ConsecutiveEmptyLines EmptyLastLine Shellcheck Variables package/nfs-utils/S60nfs ConsecutiveEmptyLines Shellcheck Variables @@ -122,11 +135,13 @@ package/ofono/S46ofono Variables package/olsr/S50olsr Indent Shellcheck Variables package/openntpd/S49ntp Shellcheck Variables package/openssh/S50sshd EmptyLastLine Indent Variables +package/openvmtools/shutdown Shellcheck package/openvpn/S60openvpn Indent Shellcheck Variables package/oracle-mysql/S97mysqld Shellcheck Variables package/owfs/S55owserver Shellcheck Variables package/owfs/S60owfs Shellcheck Variables package/pigpio/S50pigpio Shellcheck Variables +package/pkgconf/pkg-config.in Shellcheck package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob package/postgresql/S50postgresql Variables package/procps-ng/S02sysctl Variables @@ -147,6 +162,7 @@ package/samba4/S91smb Indent Shellcheck Variables package/seatd/S70seatd NotExecutable Variables package/ser2net/S50ser2net Indent Shellcheck Variables package/shairport-sync/S99shairport-sync Indent Shellcheck Variables +package/skeleton-init-systemd/fakeroot_tmpfiles.sh Shellcheck package/smcroute/S41smcroute Indent NotExecutable Variables package/smstools3/S50smsd Shellcheck Variables package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch Sob @@ -156,11 +172,13 @@ package/sslh/S35sslh Indent Shellcheck Variables package/stunnel/S50stunnel Indent Shellcheck Variables package/supervisor/S99supervisord Variables package/suricata/S99suricata Shellcheck +package/swupdate/swupdate.sh Shellcheck package/sysrepo/S51sysrepo-plugind Indent Shellcheck package/targetcli-fb/S50target Shellcheck Variables package/tcf-agent/S55tcf-agent Shellcheck Variables package/tftpd/S80tftpd-hpa Indent Shellcheck Variables package/ti-gfx/S80ti-gfx Shellcheck Variables +package/ti-gfx/esrev.sh Shellcheck package/ti-sgx-um/S80ti-sgx Variables package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables @@ -170,10 +188,13 @@ package/unbound/S70unbound Shellcheck package/unscd/S46unscd Indent Shellcheck Variables package/upmpdcli/S99upmpdcli Indent Shellcheck Variables package/usbguard/S20usbguard Indent Shellcheck Variables +package/vala/vala-wrapper Shellcheck package/vsftpd/S70vsftpd Indent Shellcheck Variables package/watchdogd/S01watchdogd Indent NotExecutable +package/wpa_supplicant/ifupdown.sh Shellcheck package/x11r7/xapp_xdm/S99xdm Indent Variables package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables +package/xl2tp/xl2tpd TrailingSpace diff --git a/support/testing/tests/utils/br2-external/utils/x-shellscript b/support/testing/tests/utils/br2-external/utils/x-shellscript new file mode 100755 index 0000000000..a7de4124bd --- /dev/null +++ b/support/testing/tests/utils/br2-external/utils/x-shellscript @@ -0,0 +1,2 @@ +#!/bin/bash +unused="text" diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index 580ad56d42..d2c1556845 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -233,3 +233,20 @@ class TestCheckPackage(unittest.TestCase): self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update " ".checkpackageignore_outdated?" .format(subdir_file), w) + + # shell scripts are tested using shellcheck + rel_file = "utils/x-shellscript" + abs_path = infra.filepath("tests/utils/br2-external") + abs_file = os.path.join(abs_path, rel_file) + + w, m = call_script(["check-package", "-b", rel_file], + self.WITH_UTILS_IN_PATH, abs_path) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(rel_file), w) + + w, m = call_script(["check-package", "-b", abs_file], + self.WITH_UTILS_IN_PATH, infra.basepath()) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(abs_file), w) diff --git a/utils/check-package b/utils/check-package index 848311bac8..12009b2476 100755 --- a/utils/check-package +++ b/utils/check-package @@ -3,6 +3,7 @@ import argparse import inspect +import magic import os import re import six @@ -13,11 +14,27 @@ import checkpackagelib.lib_config import checkpackagelib.lib_hash import checkpackagelib.lib_mk import checkpackagelib.lib_patch +import checkpackagelib.lib_shellscript import checkpackagelib.lib_sysv VERBOSE_LEVEL_TO_SHOW_IGNORED_FILES = 3 flags = None # Command line arguments. +# There are two Python packages called 'magic': +# https://pypi.org/project/file-magic/ +# https://pypi.org/project/python-magic/ +# Both allow to return a MIME file type, but with a slightly different +# interface. Detect which one of the two we have based on one of the +# attributes. +if hasattr(magic, 'FileMagic'): + # https://pypi.org/project/file-magic/ + def get_filetype(fname): + return magic.detect_from_filename(fname).mime_type +else: + # https://pypi.org/project/python-magic/ + def get_filetype(fname): + return magic.from_file(fname, mime=True) + def get_ignored_parsers_per_file(intree_only, ignore_filename): ignored = dict() @@ -77,6 +94,15 @@ def parse_args(): return flags +def get_lib_from_filetype(fname): + if not os.path.isfile(fname): + return None + filetype = get_filetype(fname) + if filetype == "text/x-shellscript": + return checkpackagelib.lib_shellscript + return None + + CONFIG_IN_FILENAME = re.compile(r"Config\.\S*$") DO_CHECK_INTREE = re.compile(r"|".join([ r"Config.in", @@ -120,7 +146,7 @@ def get_lib_from_filename(fname): return checkpackagelib.lib_patch if SYSV_INIT_SCRIPT_FILENAME.search(fname): return checkpackagelib.lib_sysv - return None + return get_lib_from_filetype(fname) def common_inspect_rules(m): diff --git a/utils/checkpackagelib/lib_shellscript.py b/utils/checkpackagelib/lib_shellscript.py new file mode 100644 index 0000000000..9b4f4aed58 --- /dev/null +++ b/utils/checkpackagelib/lib_shellscript.py @@ -0,0 +1,5 @@ +from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 +from checkpackagelib.lib import EmptyLastLine # noqa: F401 +from checkpackagelib.lib import NewlineAtEof # noqa: F401 +from checkpackagelib.lib import TrailingSpace # noqa: F401 +from checkpackagelib.tool import Shellcheck # noqa: F401 From thomas.petazzoni at bootlin.com Wed Feb 8 12:43:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:43:19 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: use DESTDIR instead of --prefix for installation Message-ID: <20230208124458.AD52884680@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfb5035c6fae1285ff0100275083fabc2b9816c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Even though it works, overriding --prefix at installation time is a bit weird. In order to be more consistent with what is done with other build systems, use DESTDIR instead at installation time. Note that $(DESTDIR) comes in addition to the -DCMAKE_INSTALL_PREFIX=/usr that is passed at configure time, so with this commit, the files continue to be installed in $(STAGING_DIR)/usr and $(TARGET_DIR)/usr as they should be. Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 7b57eba4ab..212b2d689e 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -79,11 +79,11 @@ define QT6BASE_BUILD_CMDS endef define QT6BASE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) --prefix $(STAGING_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) endef define QT6BASE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) --prefix $(TARGET_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) endef HOST_QT6BASE_DEPENDENCIES = \ From thomas.petazzoni at bootlin.com Wed Feb 8 12:52:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:52:39 +0100 Subject: [Buildroot] [git commit] package/qt6: bump version to 6.4.2 Message-ID: <20230208125347.33FBA84689@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74686296a4a20438f1e94e22a5a3372df2e830cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1] and [2]. [1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.1/release-note.md [2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.2/release-note.md Signed-off-by: Peter Seiderer Tested-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6.mk | 2 +- package/qt6/qt6base/qt6base.hash | 4 ++-- package/qt6/qt6serialport/qt6serialport.hash | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 575b2f826c..431bb8c9d3 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -5,7 +5,7 @@ ################################################################################ QT6_VERSION_MAJOR = 6.4 -QT6_VERSION = $(QT6_VERSION_MAJOR).0 +QT6_VERSION = $(QT6_VERSION_MAJOR).2 QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index fedbbba79f..63af373836 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtbase-everywhere-src-6.4.0.tar.xz.sha256 -sha256 cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d qtbase-everywhere-src-6.4.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 +sha256 a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d qtbase-everywhere-src-6.4.2.tar.xz # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash index 54a45681fa..1eaa3d6150 100644 --- a/package/qt6/qt6serialport/qt6serialport.hash +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtserialport-everywhere-src-6.4.0.tar.xz.sha256 -sha256 f148cc9e87ce2228e82bff7a64d9521339ece66c4c66aa43b91bac614f4a4483 qtserialport-everywhere-src-6.4.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialport-everywhere-src-6.4.2.tar.xz.sha256 +sha256 336d95919037800184b3c3de8ccb6f62954b20f3756c05adce8d5010504340fa qtserialport-everywhere-src-6.4.2.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt From thomas.petazzoni at bootlin.com Wed Feb 8 12:54:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:54:03 +0100 Subject: [Buildroot] [PATCH v1] package/qt6: bump version to 6.4.2 In-Reply-To: <20230107153156.26347-1-ps.report@gmx.net> References: <20230107153156.26347-1-ps.report@gmx.net> Message-ID: <20230208135403.1a419032@windsurf> On Sat, 7 Jan 2023 16:31:56 +0100 Peter Seiderer wrote: > For details see [1] and [2]. > > [1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.1/release-note.md > [2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.2/release-note.md > > Signed-off-by: Peter Seiderer > --- > package/qt6/qt6.mk | 2 +- > package/qt6/qt6base/qt6base.hash | 4 ++-- > package/qt6/qt6serialport/qt6serialport.hash | 4 ++-- > 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 Wed Feb 8 13:00:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 14:00:10 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6serialbus: new package Message-ID: <20230208133422.256088469A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e447f56408f9308cc0e527f97dcc1844f2d6c850 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 1 + package/qt6/qt6serialbus/Config.in | 15 ++++++++++ package/qt6/qt6serialbus/qt6serialbus.hash | 11 ++++++++ package/qt6/qt6serialbus/qt6serialbus.mk | 45 ++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 831ae72c3c..655fa8392a 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -44,6 +44,7 @@ menuconfig BR2_PACKAGE_QT6 if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" endif diff --git a/package/qt6/qt6serialbus/Config.in b/package/qt6/qt6serialbus/Config.in new file mode 100644 index 0000000000..1f24310e61 --- /dev/null +++ b/package/qt6/qt6serialbus/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_QT6SERIALBUS + bool "qt6serialbus" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD + select BR2_PACKAGE_QT6SERIALPORT + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6serialbus module. + + https://doc.qt.io/qt-6/qtserialbus-index.html + +comment "qt6serialbus needs headers >= 3.6" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash new file mode 100644 index 0000000000..be01f13363 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialbus-everywhere-src-6.4.2.tar.xz.sha256 +sha256 604013657c7327899aa50748deb4bcb5e545ab37ff4964795b9e6f617d48bf1b qtserialbus-everywhere-src-6.4.2.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.mk b/package/qt6/qt6serialbus/qt6serialbus.mk new file mode 100644 index 0000000000..0717736387 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qt6serialbus +# +################################################################################ + +QT6SERIALBUS_VERSION = $(QT6_VERSION) +QT6SERIALBUS_SITE = $(QT6_SITE) +QT6SERIALBUS_SOURCE = qtserialbus-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALBUS_VERSION).tar.xz +QT6SERIALBUS_INSTALL_STAGING = YES +QT6SERIALBUS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SERIALBUS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6SERIALBUS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6SERIALBUS_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SERIALBUS_DEPENDENCIES = \ + qt6serialport + +define QT6SERIALBUS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) +endef + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Wed Feb 8 13:34:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 14:34:51 +0100 Subject: [Buildroot] [PATCH v3] package/qt6/qt6serialbus: new package In-Reply-To: <20230206133836.412572-1-angelo@amarulasolutions.com> References: <20230206133836.412572-1-angelo@amarulasolutions.com> Message-ID: <20230208143451.5700d209@windsurf> On Mon, 6 Feb 2023 14:38:36 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > v2: > * LICENSE/LICENSE_FILES: one per line > * Selecting BR2_PACKAGE_QT6BASE_NETWORK to make the package compile, > fixes: "Failed to find required Qt component "Network". > v3: > * Bumped to version 6.4.2 I changed the installation commands to use DESTDIR= instead of --prefix, like has been done for qt6base, and applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 13:35:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 14:35:21 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6serialport: use DESTDIR instead of --prefix for installation Message-ID: <20230208133555.1DABF846A1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d8e207e7aaf035f48252e19013b610893d2fce0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Even though it works, overriding --prefix at installation time is a bit weird. In order to be more consistent with what is done with other build systems, use DESTDIR instead at installation time. Note that $(DESTDIR) comes in addition to the -DCMAKE_INSTALL_PREFIX=/usr that is passed at configure time, so with this commit, the files continue to be installed in $(STAGING_DIR)/usr and $(TARGET_DIR)/usr as they should be. Signed-off-by: Thomas Petazzoni --- package/qt6/qt6serialport/qt6serialport.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt6/qt6serialport/qt6serialport.mk b/package/qt6/qt6serialport/qt6serialport.mk index 9656e97c96..497719d4ec 100644 --- a/package/qt6/qt6serialport/qt6serialport.mk +++ b/package/qt6/qt6serialport/qt6serialport.mk @@ -41,11 +41,11 @@ define QT6SERIALPORT_BUILD_CMDS endef define QT6SERIALPORT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) --prefix $(STAGING_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) endef define QT6SERIALPORT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) --prefix $(TARGET_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) endef $(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 8 13:43:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 14:43:40 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/sway: new package In-Reply-To: <20221031124625.21172-1-raphael.pavlidis@gmail.com> (Raphael Pavlidis's message of "Mon, 31 Oct 2022 13:46:25 +0100") References: <20221031124625.21172-1-raphael.pavlidis@gmail.com> Message-ID: <87h6vw5l2r.fsf@dell.be.48ers.dk> >>>>> "Raphael" == Raphael Pavlidis writes: > i3-compatible Wayland compositor > This Wayland compositor can be used as a kiosk compositor like cage, but > with the advantage of better configuration of multiple monitor and > windows. For example, move a window by title to the output X or set the > resolution of Y to Z. > Signed-off-by: Raphael Pavlidis > --- > DEVELOPERS | 3 ++- > package/Config.in | 1 + > package/sway/Config.in | 42 ++++++++++++++++++++++++++++++++++++++++++ > package/sway/sway.hash | 3 +++ > package/sway/sway.mk | 36 ++++++++++++++++++++++++++++++++++++ > 5 files changed, 84 insertions(+), 1 deletion(-) > create mode 100644 package/sway/Config.in > create mode 100644 package/sway/sway.hash > create mode 100644 package/sway/sway.mk > +++ b/package/sway/Config.in > @@ -0,0 +1,42 @@ > +config BR2_PACKAGE_SWAY > + bool "sway" > + depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider > + depends on !BR2_STATIC_LIBS # wlroots > + depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots > + depends on BR2_PACKAGE_HAS_LIBEGL # wlroots > + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots > + depends on BR2_PACKAGE_HAS_LIBGLES # wlroots > + depends on BR2_PACKAGE_HAS_UDEV # wlroots > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c > + depends on BR2_USE_WCHAR # pango > + depends on BR2_TOOLCHAIN_HAS_THREADS # pango > + depends on BR2_USE_MMU # pango > + depends on BR2_INSTALL_LIBSTDCPP # pango > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango > + select BR2_PACKAGE_WLROOTS > + select BR2_PACKAGE_JSON_C > + select BR2_PACKAGE_PCRE > + select BR2_PACKAGE_CAIRO > + select BR2_PACKAGE_CAIRO_PNG > + select BR2_PACKAGE_PANGO > + help > + i3-compatible Wayland compositor > + > + https://github.com/swaywm/sway > + > +comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" > + depends on !BR2_PACKAGE_SYSTEMD || \ > + !BR2_PACKAGE_HAS_UDEV || \ > + !BR2_PACKAGE_HAS_LIBEGL || \ > + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ > + !BR2_PACKAGE_HAS_LIBGLES NIT: You have a number of trailing spaces here. > +++ b/package/sway/sway.mk > @@ -0,0 +1,36 @@ > +################################################################################ > +# > +# sway > +# > +################################################################################ > + > +SWAY_VERSION = 1.7 > +SWAY_SITE = $(call github,swaywm,sway,v$(SWAY_VERSION)) > +SWAY_LICENSE = MIT > +SWAY_LICENSE_FILES = LICENSE > +SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango > +SWAY_CONF_OPTS = \ > + -Dwerror=false \ > + -Ddefault-wallpaper=false \ > + -Dzsh-completions=false \ > + -Dbash-completions=false \ > + -Dfish-completions=false \ > + -Dswaybar=false \ > + -Dswaynag=false \ > + -Dtray=disabled \ > + -Dman-pages=disabled \ > + -Dsd-bus-provider=libsystemd > + > +ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) > +SWAY_CONF_OPTS += -Dxwayland=enabled How did you test this? Here wlroots with x11 support doesn't build as we don't have an Xwayland .pc file or binary in Buildroot. > +else > +SWAY_CONF_OPTS += -Dxwayland=disabled > +endif > + > +ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y) > +SWAY_CONF_OPTS += -Dgdk-pixbuf=enabled You also need to ensure that sway is built after gdk-pixbuf with: SWAY_DEPENDENCIES += gdk-pixbuf Committed with that fixed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Wed Feb 8 13:46:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 14:46:39 +0100 Subject: [Buildroot] [PATCH 1/1] board/raspberrypi4: bump kernel version to 5.15.68 In-Reply-To: <20220926051956.3272067-1-buildroot@athaariq.my.id> References: <20220926051956.3272067-1-buildroot@athaariq.my.id> Message-ID: <20230208144639.764af681@windsurf> Hello Athaariq, On Mon, 26 Sep 2022 05:20:15 +0000 (UTC) Athaariq Ardhiansyah wrote: > First of all, kernel support for Raspberry Pi is way too old relative to stable version. Second, we actually have several bug fixes regarding the kernel including HDMI hotplug and more problems on graphic stacks. However, I only have Raspberry Pi 4B so I cannot test the changes for other Raspberry Pi models. For anyone who has those boards, please help us to bump and test the kernel. > > Signed-off-by: Athaariq Ardhiansyah Thanks for your patch. It would indeed be nice to update our RaspberryPi defconfigs, but there are a number of questions which need to be answered before we can apply your patch. First of all, a small detail: your commit log must be wrapped at ~80 columns. Also, it shouldn't use 1st person sentence "I only have". > diff --git a/board/raspberrypi/linux.fragment b/board/raspberrypi/linux.fragment > new file mode 100644 > index 0000000000..798b2e91da > --- /dev/null > +++ b/board/raspberrypi/linux.fragment > @@ -0,0 +1,7 @@ > +# Dynamic CPU Clock > +CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=n > +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > + > +# Fix Kernel Module won't Load > +CONFIG_MODULE_COMPRESS_XZ=n > +CONFIG_MODULE_COMPRESS_NONE=y Why is this Linux kernel configuration fragment needed? There is no explanation in your commit log. Changing the default CPU governor should not be needed, and the second chunk about kernel module compression is a bit strange and deserves some explanation. > diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig > index 5942f7c4e1..6d90a8f004 100644 > --- a/configs/raspberrypi4_64_defconfig > +++ b/configs/raspberrypi4_64_defconfig > @@ -6,13 +6,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_SYSTEM_DHCP="eth0" > > -# Linux headers same as kernel, a 5.10 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +# Linux headers same as kernel, a 5.15 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,155b736f0ff883415d374ba743473f5ef146814b)/linux-155b736f0ff883415d374ba743473f5ef146814b.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi4-64/linux.fragment" > > # Build the DTB from the kernel sources > BR2_LINUX_KERNEL_DTS_SUPPORT=y > @@ -23,6 +24,9 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4-64/config_4_64bit.txt" > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y Why is this being added? > # Required tools to create the SD image > BR2_PACKAGE_HOST_DOSFSTOOLS=y > diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig > index 4e5580c140..f0947c329c 100644 > --- a/configs/raspberrypi4_defconfig > +++ b/configs/raspberrypi4_defconfig > @@ -6,13 +6,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_SYSTEM_DHCP="eth0" > > -# Linux headers same as kernel, a 5.10 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +# Linux headers same as kernel, a 5.15 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,155b736f0ff883415d374ba743473f5ef146814b)/linux-155b736f0ff883415d374ba743473f5ef146814b.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi4/linux.fragment" > > # Build the DTB from the kernel sources > BR2_LINUX_KERNEL_DTS_SUPPORT=y > @@ -23,6 +24,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4/config_4.txt" > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y > +BR2_PACKAGE_RPI_USERLAND=y Why is rpi-userland being added here, and not to the other defconfig above? Also, you're updating rpi-firmware, rpi-userland and RaspberryPi defconfigs in the same commit. Is this because they need to be updated in sync? If that's the case, is there a potential problem if we update rpi-firmware/rpi-userland, but not the defconfigs for RaspberryPi 1/2/3 ? Thanks a lot for your feedback! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Wed Feb 8 13:51:20 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 14:51:20 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/nodejs: add patch to adjust default NodeJS search path In-Reply-To: <20220925192030.1648496-1-thomas.petazzoni@bootlin.com> References: <20220925192030.1648496-1-thomas.petazzoni@bootlin.com> Message-ID: Hello Thomas, Le 25/09/2022 ? 21:20, Thomas Petazzoni a ?crit?: > By default, NodeJS searches global modules in /usr/lib/node, but NPM > installs them in /usr/lib/node_modules/. Therefore by default, if one > installs modules with BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL, they are > not accessible by NodeJS, unless by passing a > NODE_PATH=/usr/lib/node_modules/ variable. Since this is not obvious, > and it's nicer when things work out of the box, we simply patch NodeJS > to look for modules at the right place. > > See > https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package > for some discussions on this topic. Note: The nodejs package has been update to 16.18.1 since your v2 of nodejs series. Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: Thomas Petazzoni > --- > Changes since v1: > - Search for both /usr/lib/node and /usr/lib/node_modules as suggested > by Yann > --- > ...ules-cjs-loader.js-adjust-default-pa.patch | 36 +++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch > > diff --git a/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch > new file mode 100644 > index 0000000000..5b93998e5e > --- /dev/null > +++ b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch > @@ -0,0 +1,36 @@ > +From a31425bdfcb5d695ab25c3d295898326784cffec Mon Sep 17 00:00:00 2001 > +From: Thomas Petazzoni > +Date: Sun, 25 Sep 2022 11:10:06 +0200 > +Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to > + search modules > + > +NPM installs modules in /usr/lib/node_modules/, but by default NodeJS > +searches for them only in /usr/lib/node/. We could also set the > +NODE_PATH environment variable, but it is more convienient to have > +NodeJS configured by default to find modules where they are installed. > + > +This issue is discussed at > +https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package. > + > +Signed-off-by: Thomas Petazzoni > +--- > + lib/internal/modules/cjs/loader.js | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js > +index f1971c40a4..5fe3884156 100644 > +--- a/lib/internal/modules/cjs/loader.js > ++++ b/lib/internal/modules/cjs/loader.js > +@@ -1261,7 +1261,8 @@ Module._initPaths = function() { > + path.resolve(process.execPath, '..') : > + path.resolve(process.execPath, '..', '..'); > + > +- const paths = [path.resolve(prefixDir, 'lib', 'node')]; > ++ const paths = [path.resolve(prefixDir, 'lib', 'node'), > ++ path.resolve(prefixDir, 'lib', 'node_modules')]; > + > + if (homeDir) { > + ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); > +-- > +2.37.3 > + From peter at korsgaard.com Wed Feb 8 13:54:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 14:54:06 +0100 Subject: [Buildroot] [PATCH 1/3] package/wlroots: bump to version 0.15.1 In-Reply-To: <20220422214919.367067-2-aperez@igalia.com> (Adrian Perez de Castro's message of "Sat, 23 Apr 2022 00:49:17 +0300") References: <20220422214919.367067-1-aperez@igalia.com> <20220422214919.367067-2-aperez@igalia.com> Message-ID: <877cws5kld.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > Update to version 0.15.1, and adapt to upstream changes: > - Adapted from the old -Dfoo-backend Meson option to the new -Dbackends > one, which is an array. The set of always enabled backends matches the > previous selection: drm+libinput always enabled, x11 only if selected. > - Removed the libpng and ffmpeg dependency, which are no longer needed > with examples disabled (which is always the case for Buildroot). > - Changed homepage and download site URLs to the FreeDesktop.org GitLab. > This release changes the API/ABI, and applications which use wlroots > must be adapted and rebuilt. Currently in Buildroot we have only the > cage compositor, to be updated in a follow-up patch. > Signed-off-by: Adrian Perez de Castro Old patch, but while testing the recently added sway package I notice that wlroots fails to build with X11 support: Found CMake: /usr/bin/cmake (3.18.4) Run-time dependency xwayland found: NO (tried pkgconfig and cmake) Program Xwayland found: NO How is this supposed to work? We don't have a Xwayland package in Buildroot, so no pkgconfig file. I see there is some fallback logic in wlroots to look for an Xwayland binary (on the host presumably), but that doesn't work for hosts without it and will again fail at runtime. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 13:55:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 14:55:31 +0100 Subject: [Buildroot] [git commit] package/sway: new package Message-ID: <20230208135551.450D1846C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b739d6bd98e8ee12ec2150563ef9cdef35d2ea35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master i3-compatible Wayland compositor This Wayland compositor can be used as a kiosk compositor like cage, but with the advantage of better configuration of multiple monitor and windows. For example, move a window by title to the output X or set the resolution of Y to Z. Signed-off-by: Raphael Pavlidis [Peter: Fix white space, add gdk-pixbuf to _DEPENDENCIES] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 ++- package/Config.in | 1 + package/sway/Config.in | 42 ++++++++++++++++++++++++++++++++++++++++++ package/sway/sway.hash | 3 +++ package/sway/sway.mk | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 2cb3361c83..0bb4db81bb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2507,8 +2507,9 @@ F: support/testing/tests/package/test_python_jmespath.py F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py -N: Raphael Pavlidis +N: Raphael Pavlidis F: package/slirp4netns/ +F: package/sway/ N: Refik Tuzakli F: package/freescale-imx/ diff --git a/package/Config.in b/package/Config.in index 06d0a05854..2adfcdbb1d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -327,6 +327,7 @@ comment "Graphic applications" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in" source "package/stellarium/Config.in" + source "package/sway/Config.in" source "package/tesseract-ocr/Config.in" source "package/tinifier/Config.in" diff --git a/package/sway/Config.in b/package/sway/Config.in new file mode 100644 index 0000000000..f8d073520f --- /dev/null +++ b/package/sway/Config.in @@ -0,0 +1,42 @@ +config BR2_PACKAGE_SWAY + bool "sway" + depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider + depends on !BR2_STATIC_LIBS # wlroots + depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots + depends on BR2_PACKAGE_HAS_LIBGLES # wlroots + depends on BR2_PACKAGE_HAS_UDEV # wlroots + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_USE_WCHAR # pango + depends on BR2_TOOLCHAIN_HAS_THREADS # pango + depends on BR2_USE_MMU # pango + depends on BR2_INSTALL_LIBSTDCPP # pango + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango + select BR2_PACKAGE_WLROOTS + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_PANGO + help + i3-compatible Wayland compositor + + https://github.com/swaywm/sway + +comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" + depends on !BR2_PACKAGE_SYSTEMD || \ + !BR2_PACKAGE_HAS_UDEV || \ + !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + !BR2_PACKAGE_HAS_LIBGLES + +comment "sway needs a toolchain w/ wchar, threads, C++, dynamic library, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_INSTALL_LIBSTDCPP || \ + BR2_STATIC_LIBS diff --git a/package/sway/sway.hash b/package/sway/sway.hash new file mode 100644 index 0000000000..6dfa71730f --- /dev/null +++ b/package/sway/sway.hash @@ -0,0 +1,3 @@ +# Locally computed, tarball verified with GPG signature +sha256 0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84 sway-1.7.tar.gz +sha256 bd35722bff46327f5eded1d211207277bbe043d2a22048b282c42ef801593b8b LICENSE diff --git a/package/sway/sway.mk b/package/sway/sway.mk new file mode 100644 index 0000000000..802371c827 --- /dev/null +++ b/package/sway/sway.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# sway +# +################################################################################ + +SWAY_VERSION = 1.7 +SWAY_SITE = $(call github,swaywm,sway,v$(SWAY_VERSION)) +SWAY_LICENSE = MIT +SWAY_LICENSE_FILES = LICENSE +SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango +SWAY_CONF_OPTS = \ + -Dwerror=false \ + -Ddefault-wallpaper=false \ + -Dzsh-completions=false \ + -Dbash-completions=false \ + -Dfish-completions=false \ + -Dswaybar=false \ + -Dswaynag=false \ + -Dtray=disabled \ + -Dman-pages=disabled \ + -Dsd-bus-provider=libsystemd + +ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) +SWAY_CONF_OPTS += -Dxwayland=enabled +else +SWAY_CONF_OPTS += -Dxwayland=disabled +endif + +ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y) +SWAY_CONF_OPTS += -Dgdk-pixbuf=enabled +SWAY_DEPENDENCIES += gdk-pixbuf +else +SWAY_CONF_OPTS += -Dgdk-pixbuf=disabled +endif + +$(eval $(meson-package)) From romain.naour at smile.fr Wed Feb 8 14:09:26 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 15:09:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/rust: fix boostrap build In-Reply-To: <20230208110551.187828-1-sebastian.weyer@smile.fr> References: <20230208110551.187828-1-sebastian.weyer@smile.fr> Message-ID: <08db6cfd-03eb-9515-87ea-17a114805fe2@smile.fr> Hello Sebastian, Le 08/02/2023 ? 12:05, Sebastian Weyer a ?crit?: > The update to v1.67.0 of rust broke the boostrap build. This patch > applies an upstream patch to fix this: > https://github.com/rust-lang/rust/commit/3fe64ebbce21e79adb64099984e96dfb79bdd0f9 > > Fixes: > http://autobuild.buildroot.org/results/214/214fcbb3458893784b7f85b60f7ee1edb428c77f/build-end.log Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: Sebastian Weyer > Cc: Eric Le Bihan > Cc: James Hilliard > --- > I previously just tested TestRustBin since TestRust takes forever. This > time I ran TestRust and it builds fine :) > --- > ...-unsoundness-in-bootstrap-cache-code.patch | 43 +++++++++++++++++++ > 1 file changed, 43 insertions(+) > create mode 100644 package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch > > diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch > new file mode 100644 > index 0000000000..3eae34642f > --- /dev/null > +++ b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch > @@ -0,0 +1,43 @@ > +From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 > +From: Michael Goulet > +Date: Mon, 12 Dec 2022 18:29:33 +0000 > +Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= > + =?UTF-8?q?ap=20cache=20code?= > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) > +Signed-off-by: Sebastian Weyer > +--- > + src/bootstrap/cache.rs | 8 ++++---- > + 1 file changed, 4 insertions(+), 4 deletions(-) > + > +diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs > +index be5c9bb0788..05f25af68ea 100644 > +--- a/src/bootstrap/cache.rs > ++++ b/src/bootstrap/cache.rs > +@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { > + > + impl Deref for Interned { > + type Target = T::Target; > +- fn deref(&self) -> &'static Self::Target { > ++ fn deref(&self) -> &Self::Target { > + let l = T::intern_cache().lock().unwrap(); > +- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } > ++ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } > + } > + } > + > + impl, U: ?Sized> AsRef for Interned { > +- fn as_ref(&self) -> &'static U { > ++ fn as_ref(&self) -> &U { > + let l = T::intern_cache().lock().unwrap(); > +- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } > ++ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } > + } > + } > + > +-- > +2.25.1 > + From thomas.petazzoni at bootlin.com Wed Feb 8 14:23:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 15:23:43 +0100 Subject: [Buildroot] Remove cairo dependency from gobject-introspection Message-ID: <20230208152343.20d46c7d@windsurf> Hello James, Here at the Buildroot Developers Meeting, we ended up looking at where util-linux-libs gets used, and we found out it's used in fontconfig. Since util-linux-libs was originally introduced to break a circular dependency involving systemd and util-linux, we found it strange that fontconfig was involved in that. Turns out that there is a possible circular dependency like this: util-linux -> udev -> systemd -> polkit -> gobject-introspection -> cairo -> fontconfig -> util-linux What is obviously strange in there is the dependency of gobject-introspection on cairo, which comes from: ifeq ($(BR2_PACKAGE_CAIRO),y) GOBJECT_INTROSPECTION_DEPENDENCIES += cairo GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=enabled else GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=disabled endif However, according to gobject-introspection's meson_options.txt: option('cairo', type: 'feature', value : 'auto', description: 'Use cairo for tests' ) it seems like cairo is only used for tests, which we really don't care about. If that's indeed true, do you think you could drop that optional dependency in gobject-instrospection, pass -Dcairo=disabled unconditionally, and cleanup fontconfig to not need util-linux-libs (see commit eb058222596d83bbdc96c80c5d0cdecb572a4ac3) ? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From vfazio at xes-inc.com Wed Feb 8 14:23:58 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Wed, 8 Feb 2023 08:23:58 -0600 Subject: [Buildroot] [PATCH 1/1] package/xz: patch configure due to microblaze patch Message-ID: <20230208142358.2721276-1-vfazio@xes-inc.com> Commit bed21bb9b added a patch to change configure.ac but failed to update configure which caused build failures due to the timestamp difference between configure and configure.ac and the makefile attempting to run aclocal. XZ_AUTORECONF = YES creates a circular dependency where the host autotools need host-xz which also gets patched. Because of this, we need to patch xz's configure script manually. While we're doing this, correct the language in the commit body of the patch, remove a stray whitespace, and fix the offset for configure.ac Fixes: bed21bb9b ("package/xz: fix microblaze compiles") Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685// Signed-off-by: Vincent Fazio --- ...0001-Detect-symver-attribute-support.patch | 54 ++++++++++++++----- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch index 9ec43ea7a0..8016de83ab 100644 --- a/package/xz/0001-Detect-symver-attribute-support.patch +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -1,11 +1,11 @@ -From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From f0e0e8bd08b4d4e7c89a5a3b7d9a3c083f7e5432 Mon Sep 17 00:00:00 2001 From: Vincent Fazio -Date: Tue, 7 Feb 2023 08:51:24 -0600 +Date: Wed, 8 Feb 2023 12:58:37 +0000 Subject: [PATCH] Detect symver attribute support -On non-ELF platforms, such as microblaze, builds will fail when trying -to add symver information because __attribute__((symver ..)) is not -supported even though __has_attribute(__symver__) returns true. +On Microblaze, builds will fail when trying to add symver information +because __attribute__((symver ..)) is not supported even though +__has_attribute(__symver__) returns true. Support for symver needs to be detected via a compile test since __has_attribute can report false positives [0]. @@ -19,15 +19,17 @@ Upstream: https://github.com/tukaani-project/xz/pull/32 Signed-off-by: Thomas Petazzoni Signed-off-by: Vincent Fazio --- - configure.ac | 9 +++++++++ - src/liblzma/common/common.h | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) +--- + configure | 15 +++++++++++++++ + configure.ac | 9 +++++++++ + src/liblzma/common/common.h | 2 +- + 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 5ad5589..08c623a 100644 +index dfec76c..7b01f2e 100644 --- a/configure.ac +++ b/configure.ac -@@ -791,6 +791,15 @@ else +@@ -697,6 +697,15 @@ else time with Libtool if neither --with-pic nor --without-pic is used). This define must be used together with liblzma_linux.map.]) @@ -44,7 +46,7 @@ index 5ad5589..08c623a 100644 *) enable_symbol_versions=generic diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h -index 11fec52..1d2ef9c 100644 +index 671d3bc..27b56ee 100644 --- a/src/liblzma/common/common.h +++ b/src/liblzma/common/common.h @@ -76,7 +76,7 @@ @@ -52,10 +54,36 @@ index 11fec52..1d2ef9c 100644 // is available. This should be far more reliable than looking at compiler // version macros as nowadays especially __GNUC__ is defined by many compilers. -# if lzma_has_attribute(__symver__) -+# if defined(HAVE_SYMVER_ATTRIBUTE) ++# if defined(HAVE_SYMVER_ATTRIBUTE) # define LZMA_SYMVER_API(extnamever, type, intname) \ extern __attribute__((__symver__(extnamever))) \ LZMA_API(type) intname +diff --git a/configure b/configure +index ff0eed5..e685b30 100755 +--- a/configure ++++ b/configure +@@ -16687,6 +16687,21 @@ printf "%s\n" "" >&6; } + + printf "%s\n" "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h + ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO" ++then : ++ ++printf "%s\n" "#define HAVE_SYMVER_ATTRIBUTE 1" >>confdefs.h ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic -- -2.25.1 +2.34.1 -- 2.25.1 From arnout at mind.be Wed Feb 8 14:28:33 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:33 +0100 Subject: [Buildroot] [git commit] utils/check-package: check files in utils/ Message-ID: <20230208142852.07D2E846E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b021bc1d77ce485ac46114482024d12339d6b5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master All the errors in existing scripts in utils/ have been fixed, so nothing needs to be added to .checkpackageignore. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle --- utils/check-package | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/check-package b/utils/check-package index 12009b2476..98a25bd0b2 100755 --- a/utils/check-package +++ b/utils/check-package @@ -113,6 +113,7 @@ DO_CHECK_INTREE = re.compile(r"|".join([ r"package/", r"system/", r"toolchain/", + r"utils/", ])) DO_NOT_CHECK_INTREE = re.compile(r"|".join([ r"boot/barebox/barebox\.mk$", From arnout at mind.be Wed Feb 8 14:28:30 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:30 +0100 Subject: [Buildroot] [git commit] utils/config: fix shellcheck errors Message-ID: <20230208142851.DB595846BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7150edc790cda61270eb0ec1af7ab78255c90003 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In utils/config line 54: ARG="`echo $ARG | tr a-z- A-Z_`" ^------------------------^ SC2006: Use $(...) notation instead of legacy backticked `...`. ^--^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: ARG="$(echo "$ARG" | tr a-z- A-Z_)" In utils/config line 87: local tmpfile="$infile.swp" ^-----^ SC2034: tmpfile appears unused. Verify use (or export if used externally). In utils/config line 182: if [ $? != 0 ] ; then ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. For more information: https://www.shellcheck.net/wiki/SC2034 -- tmpfile appears unused. Verify us... https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ... https://www.shellcheck.net/wiki/SC2006 -- Use $(...) notation instead of le... The suggestions from shellcheck can be applied. The unused variable tmpfile in fact occurs in several functions, all of them can be removed. For the check exit code, the condition is swapped to avoid negative logic. Signed-off-by: Arnout Vandecappelle --- utils/config | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/utils/config b/utils/config index c5e2d723ea..5f5e4362e5 100755 --- a/utils/config +++ b/utils/config @@ -51,7 +51,7 @@ checkarg() { usage fi if [ "$MUNGE_CASE" = "yes" ] ; then - ARG="`echo $ARG | tr a-z- A-Z_`" + ARG="$(echo "$ARG" | tr a-z- A-Z_)" fi case "$ARG" in ${BR2_PREFIX}*) @@ -64,7 +64,6 @@ txt_append() { local anchor="$1" local insert="$2" local infile="$3" - local tmpfile="$infile.swp" # sed append cmd: 'a\' + newline + text + newline cmd="$(printf "a\\%b$insert" "\n")" @@ -76,7 +75,6 @@ txt_subst() { local before="$1" local after="$2" local infile="$3" - local tmpfile="$infile.swp" sed -i -e "s:$before:$after:" "$infile" } @@ -84,7 +82,6 @@ txt_subst() { txt_delete() { local text="$1" local infile="$2" - local tmpfile="$infile.swp" sed -i -e "/$text/d" "$infile" } @@ -178,15 +175,14 @@ while [ "$1" != "" ] ; do if grep -q "# ${BR2_PREFIX}$ARG is not set" $FN ; then echo n else - V="$(grep "^${BR2_PREFIX}$ARG=" $FN)" - if [ $? != 0 ] ; then - echo undef - else + if V="$(grep "^${BR2_PREFIX}$ARG=" $FN)"; then V="${V/#${BR2_PREFIX}$ARG=/}" V="${V/#\"/}" V="${V/%\"/}" V="${V//\\\"/\"}" echo "${V}" + else + echo undef fi fi ;; From arnout at mind.be Wed Feb 8 14:28:32 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:32 +0100 Subject: [Buildroot] [git commit] utils/docker-run: fix shellcheck errors Message-ID: <20230208142851.F0F74846E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dab7a877148adad499a07c5ed785c42707593175 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In utils/test-pkg line 8: if [ ! -z "${TEMP_CONF}" ]; then ^-- SC2236: Use -n instead of ! -z. In utils/test-pkg line 75: TEMP_CONF=$(mktemp /tmp/test-${pkg}-config.XXXXXX) ^----^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: TEMP_CONF=$(mktemp /tmp/test-"${pkg}"-config.XXXXXX) In utils/test-pkg line 76: echo "${pkg_br_name}=y" > ${TEMP_CONF} ^----------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: echo "${pkg_br_name}=y" > "${TEMP_CONF}" In utils/test-pkg line 86: if [ ${random} -gt 0 ]; then ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${random}" -gt 0 ]; then In utils/test-pkg line 90: if [ ${number} -gt 0 ]; then ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${number}" -gt 0 ]; then In utils/test-pkg line 109: toolchains=($(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ ^-- SC2207: Prefer mapfile or read -a to split command output (or quote to avoid splitting). In utils/test-pkg line 110: |if [ ${random} -gt 0 ]; then \ ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: |if [ "${random}" -gt 0 ]; then \ In utils/test-pkg line 111: sort -R |head -n ${random} ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: sort -R |head -n "${random}" In utils/test-pkg line 121: if [ ${nb_tc} -eq 0 ]; then ^------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${nb_tc}" -eq 0 ]; then In utils/test-pkg line 134: printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} ${nb} ${nb_tc} ^---^ SC2086: Double quote to prevent globbing and word splitting. ^------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} "${nb}" "${nb_tc}" In utils/test-pkg line 146: ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} ^---^ SC2086: Double quote to prevent globbing and word splitting. ^--------^ SC2086: Double quote to prevent globbing and word splitting. ^--------^ SC2086: Double quote to prevent globbing and word splitting. ^---------^ SC2086: Double quote to prevent globbing and word splitting. ^--------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: "${nb}" "${nb_skip}" "${nb_fail}" "${nb_legal}" "${nb_show}" In utils/test-pkg line 160: CONFIG_= support/kconfig/merge_config.sh -O "${dir}" \ ^-- SC1007: Remove space after = if trying to assign a value (for empty string, use var='' ... ). In utils/test-pkg line 181: if [ ${prepare_only} -eq 1 ]; then ^-------------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${prepare_only}" -eq 1 ]; then For more information: https://www.shellcheck.net/wiki/SC1007 -- Remove space after = if trying to... https://www.shellcheck.net/wiki/SC2207 -- Prefer mapfile or read -a to spli... https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ... The suggestions from shellcheck can be applied. This script already uses bash so we can rely on mapfile. The warning about CONFIG_= assignment misinterpreted the intention: we don't want to assign to CONFIG_, we want to clear it from the environment. Spell this as CONFIG_="". Signed-off-by: Arnout Vandecappelle --- utils/test-pkg | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/utils/test-pkg b/utils/test-pkg index e7f5464817..19d8713d6a 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -5,7 +5,7 @@ TOOLCHAINS_CSV='support/config-fragments/autobuild/toolchain-configs.csv' TEMP_CONF="" do_clean() { - if [ ! -z "${TEMP_CONF}" ]; then + if [ -n "${TEMP_CONF}" ]; then rm -f "${TEMP_CONF}" fi } @@ -72,8 +72,8 @@ main() { if [ -z "${cfg}" ]; then pkg_br_name="${pkg//-/_}" pkg_br_name="BR2_PACKAGE_${pkg_br_name^^}" - TEMP_CONF=$(mktemp /tmp/test-${pkg}-config.XXXXXX) - echo "${pkg_br_name}=y" > ${TEMP_CONF} + TEMP_CONF="$(mktemp /tmp/test-"${pkg}"-config.XXXXXX)" + echo "${pkg_br_name}=y" > "${TEMP_CONF}" cfg="${TEMP_CONF}" fi if [ ! -e "${cfg}" ]; then @@ -83,15 +83,15 @@ main() { dir="${HOME}/br-test-pkg" fi - if [ ${random} -gt 0 ]; then + if [ "${random}" -gt 0 ]; then mode=$((mode+1)) fi - if [ ${number} -gt 0 ]; then + if [ "${number}" -gt 0 ]; then mode=$((mode+1)) fi - if [ ${all} -eq 1 ]; then + if [ "${all}" -eq 1 ]; then mode=$((mode+1)) fi @@ -106,19 +106,18 @@ main() { # Extract the URLs of the toolchains; drop internal toolchains # E.g.: http://server/path/to/name.config,arch,libc # --> http://server/path/to/name.config - toolchains=($(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ - |if [ ${random} -gt 0 ]; then \ - sort -R |head -n ${random} - elif [ ${number} -gt 0 ]; then \ - head -n ${number} - else - sort - fi - ) - ) + mapfile -t toolchains < <(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ + | if [ "${random}" -gt 0 ]; then \ + sort -R | head -n "${random}" + elif [ "${number}" -gt 0 ]; then \ + head -n "${number}" + else + sort + fi + ) nb_tc="${#toolchains[@]}" - if [ ${nb_tc} -eq 0 ]; then + if [ "${nb_tc}" -eq 0 ]; then printf "error: no toolchain found (networking issue?)\n" >&2; exit 1 fi @@ -131,7 +130,7 @@ main() { : $((nb++)) toolchain="$(basename "${toolchainconfig}" .config)" build_dir="${dir}/${toolchain}" - printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} ${nb} ${nb_tc} + printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} "${nb}" "${nb_tc}" build_one "${build_dir}" "${toolchainconfig}" "${cfg}" "${pkg}" "${prepare_only}" && ret=0 || ret=${?} case ${ret} in (0) printf "OK\n";; @@ -143,7 +142,7 @@ main() { done printf "%d builds, %d skipped, %d build failed, %d legal-info failed, %d show-info failed\n" \ - ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} + "${nb}" "${nb_skip}" "${nb_fail}" "${nb_legal}" "${nb_show}" return $((nb_fail + nb_legal)) } @@ -157,7 +156,7 @@ build_one() { mkdir -p "${dir}" - CONFIG_= support/kconfig/merge_config.sh -O "${dir}" \ + CONFIG_="" support/kconfig/merge_config.sh -O "${dir}" \ "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" \ >> "${dir}/logfile" 2>&1 # We want all the options from the snippet to be present as-is (set @@ -178,7 +177,7 @@ build_one() { rm -f "${dir}/missing.config" # Defer building the job to the caller (e.g. a gitlab pipeline) - if [ ${prepare_only} -eq 1 ]; then + if [ "${prepare_only}" -eq 1 ]; then return 0 fi From arnout at mind.be Wed Feb 8 14:28:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:31 +0100 Subject: [Buildroot] [git commit] utils/docker-run: fix shellcheck errors Message-ID: <20230208142851.E6006846E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c3466bbeeedad1cfc8fda5120d452fd786d68e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In utils/docker-run line 10: --user $(id -u):$(id -g) \ ^------^ SC2046: Quote this to prevent word splitting. ^------^ SC2046: Quote this to prevent word splitting. The suggestions from shellcheck can be applied. Signed-off-by: Arnout Vandecappelle --- utils/docker-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 5653764254..164e11c0e6 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -7,7 +7,7 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') exec docker run -it --rm \ - --user $(id -u):$(id -g) \ + --user "$(id -u):$(id -g)" \ --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ --workdir "${MAIN_DIR}" \ "${IMAGE}" "${@}" From arnout at mind.be Wed Feb 8 14:28:28 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:28 +0100 Subject: [Buildroot] [git commit] utils/brmake: fix shellcheck errors Message-ID: <20230208142851.D0048846E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc364c6ae65d3167409380b8883123a55270b18d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In utils/brmake line 6: local found ret start d h m mf ^---^ SC2034: found appears unused. Verify use (or export if used externally). In utils/brmake line 16: > >( while read line; do ^--^ SC2162: read without -r will mangle backslashes. For both, the suggestions from shellcheck can be applied. Signed-off-by: Arnout Vandecappelle --- utils/brmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/brmake b/utils/brmake index e30119dd10..70dfb6cdc8 100755 --- a/utils/brmake +++ b/utils/brmake @@ -3,7 +3,7 @@ # License: WTFPL, https://spdx.org/licenses/WTFPL.html main() { - local found ret start d h m mf + local ret start d h m mf if ! which unbuffer >/dev/null 2>&1; then printf "you need to install 'unbuffer' (from package expect or expect-dev)\n" >&2 @@ -13,7 +13,7 @@ main() { start=${SECONDS} ( exec 2>&1; unbuffer make "${@}"; ) \ - > >( while read line; do + > >( while read -r line; do printf "%(%Y-%m-%dT%H:%M:%S)T %s\n" -1 "${line}" done \ |tee -a br.log \ From arnout at mind.be Wed Feb 8 14:29:34 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:29:34 +0100 Subject: [Buildroot] [PATCH v2 08/14] utils/check-package: check files in utils/ In-Reply-To: <20220731193521.1217825-9-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-9-ricardo.martincoski@gmail.com> Message-ID: <3b1ff0f1-076f-5f6f-1c2b-ac4bdf9951c7@mind.be> On 31/07/2022 21:35, Ricardo Martincoski wrote: > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - none > > NOTE to the maintainer applying this patch: please re-generate the list > of ignored warnings while applying: > $ utils/docker-run make .checkpackageignore Instead, I pushed 4 other commits that fix the shellcheck issues. Applied to master, thanks. Regards, Arnout > --- > .checkpackageignore | 4 ++++ > utils/check-package | 1 + > 2 files changed, 5 insertions(+) > > diff --git a/.checkpackageignore b/.checkpackageignore > index a527254464..615fe22e52 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -203,3 +203,7 @@ package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob > package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob > package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables > package/xl2tp/xl2tpd TrailingSpace > +utils/brmake Shellcheck > +utils/config Shellcheck > +utils/docker-run Shellcheck > +utils/test-pkg Shellcheck > diff --git a/utils/check-package b/utils/check-package > index 732f1cf112..094b7b9c07 100755 > --- a/utils/check-package > +++ b/utils/check-package > @@ -107,6 +107,7 @@ DO_CHECK_INTREE = re.compile(r"|".join([ > r"package/", > r"system/", > r"toolchain/", > + r"utils/", > ])) > DO_NOT_CHECK_INTREE = re.compile(r"|".join([ > r"boot/barebox/barebox\.mk$", From romain.naour at smile.fr Wed Feb 8 14:46:20 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 15:46:20 +0100 Subject: [Buildroot] [PATCH v2 01/11] package/llvm-project: new group for llvm packages In-Reply-To: References: Message-ID: <0b07f7e5-f76c-bbdb-ec81-703dd7fbb273@smile.fr> Hello, Le 25/10/2022 ? 08:02, Lang Daniel via buildroot a ?crit?: > To make updating easier in the future, group all llvm projects in > one subfolder and define some variables for all of them. Agree, especially since it's nowaday released from the same git repository (llvm-project). Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - No changes > --- > package/llvm-project/llvm-project.mk | 10 ++++++++++ > 1 file changed, 10 insertions(+) > create mode 100644 package/llvm-project/llvm-project.mk > > diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk > new file mode 100644 > index 0000000000..7ba89bb605 > --- /dev/null > +++ b/package/llvm-project/llvm-project.mk > @@ -0,0 +1,10 @@ > +################################################################################ > +# > +# llvm-project > +# > +################################################################################ > + > +LLVM_PROJECT_VERSION = 11.1.0 > +LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) > + > +include $(sort $(wildcard package/llvm-project/*/*.mk)) From peter at korsgaard.com Wed Feb 8 14:47:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 15:47:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/rust: fix boostrap build In-Reply-To: <20230208110551.187828-1-sebastian.weyer@smile.fr> (Sebastian Weyer's message of "Wed, 8 Feb 2023 12:05:51 +0100") References: <20230208110551.187828-1-sebastian.weyer@smile.fr> Message-ID: <871qn05i40.fsf@dell.be.48ers.dk> >>>>> "Sebastian" == Sebastian Weyer writes: > The update to v1.67.0 of rust broke the boostrap build. This patch s/boostrap/bootstrap/ ;) > applies an upstream patch to fix this: > https://github.com/rust-lang/rust/commit/3fe64ebbce21e79adb64099984e96dfb79bdd0f9 > Fixes: > http://autobuild.buildroot.org/results/214/214fcbb3458893784b7f85b60f7ee1edb428c77f/build-end.log > Signed-off-by: Sebastian Weyer > Cc: Eric Le Bihan > Cc: James Hilliard Committed with that fixed, thanks. -- Bye, Peter Korsgaard From romain.naour at smile.fr Wed Feb 8 14:48:17 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 15:48:17 +0100 Subject: [Buildroot] [PATCH v2 02/11] package/llvm: move to llvm-project folder In-Reply-To: References: Message-ID: <63707e9a-16fd-b81d-c582-fe1b5f67d92e@smile.fr> Hello, Le 25/10/2022 ? 08:04, Lang Daniel via buildroot a ?crit?: > To make updating easier, move llvm into the llvm-project folder > and use the defined information. > Reviewed-by: Romain Naour > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - No changes > --- > DEVELOPERS | 6 +++--- > package/Config.in | 2 +- > .../llvm/0001-nfc-Fix-missing-include.patch | 0 > package/{ => llvm-project}/llvm/Config.in | 0 > package/{ => llvm-project}/llvm/llvm.hash | 0 > package/{ => llvm-project}/llvm/llvm.mk | 5 ++--- > 6 files changed, 6 insertions(+), 7 deletions(-) > rename package/{ => llvm-project}/llvm/0001-nfc-Fix-missing-include.patch (100%) > rename package/{ => llvm-project}/llvm/Config.in (100%) > rename package/{ => llvm-project}/llvm/llvm.hash (100%) > rename package/{ => llvm-project}/llvm/llvm.mk (98%) > > diff --git a/DEVELOPERS b/DEVELOPERS > index c8183b2290..8763fde182 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1610,7 +1610,7 @@ F: package/earlyoom/ > F: package/gconf/ > F: package/libnss/ > F: package/lld/ > -F: package/llvm/ > +F: package/llvm-project/llvm/ > F: package/python-cython/ > F: package/python-pycups/ > F: package/python-raven/ > @@ -2544,7 +2544,7 @@ F: package/libgta/ > F: package/libiec61850/ > F: package/libspatialindex/ > F: package/linux-syscall-support/ > -F: package/llvm/ > +F: package/llvm-project/llvm/ > F: package/lugaru/ > F: package/mcelog/ > F: package/mesa3d/ > @@ -2956,7 +2956,7 @@ N: Valentin Korenblit > F: package/clang/ > F: package/clinfo/ > F: package/libclc/ > -F: package/llvm/ > +F: package/llvm-project/llvm/ > > N: Vanya Sergeev > F: package/lua-periphery/ > diff --git a/package/Config.in b/package/Config.in > index e3a34d6e97..3b7d4a9448 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2069,7 +2069,7 @@ comment "linux-pam plugins" > source "package/libpam-tacplus/Config.in" > endif > source "package/liquid-dsp/Config.in" > - source "package/llvm/Config.in" > + source "package/llvm-project/llvm/Config.in" > source "package/lttng-libust/Config.in" > source "package/matio/Config.in" > source "package/mpc/Config.in" > diff --git a/package/llvm/0001-nfc-Fix-missing-include.patch b/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch > similarity index 100% > rename from package/llvm/0001-nfc-Fix-missing-include.patch > rename to package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch > diff --git a/package/llvm/Config.in b/package/llvm-project/llvm/Config.in > similarity index 100% > rename from package/llvm/Config.in > rename to package/llvm-project/llvm/Config.in > diff --git a/package/llvm/llvm.hash b/package/llvm-project/llvm/llvm.hash > similarity index 100% > rename from package/llvm/llvm.hash > rename to package/llvm-project/llvm/llvm.hash > diff --git a/package/llvm/llvm.mk b/package/llvm-project/llvm/llvm.mk > similarity index 98% > rename from package/llvm/llvm.mk > rename to package/llvm-project/llvm/llvm.mk > index 977c0a08c2..1adad17b16 100644 > --- a/package/llvm/llvm.mk > +++ b/package/llvm-project/llvm/llvm.mk > @@ -4,9 +4,8 @@ > # > ################################################################################ > > -# LLVM, Clang and lld should be version bumped together > -LLVM_VERSION = 11.1.0 > -LLVM_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VERSION) > +LLVM_VERSION = $(LLVM_PROJECT_VERSION) > +LLVM_SITE = $(LLVM_PROJECT_SITE) > LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz > LLVM_LICENSE = Apache-2.0 with exceptions > LLVM_LICENSE_FILES = LICENSE.TXT From peter at korsgaard.com Wed Feb 8 14:34:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 15:34:42 +0100 Subject: [Buildroot] [git commit] package/rust: fix bootstrap build Message-ID: <20230208144829.C272E846F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7df32882203fdd525156ddb785d171b193e5b282 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The update to v1.67.0 of rust broke the bootstrap build. This patch applies an upstream patch to fix this: https://github.com/rust-lang/rust/commit/3fe64ebbce21e79adb64099984e96dfb79bdd0f9 Fixes: http://autobuild.buildroot.org/results/214/214fcbb3458893784b7f85b60f7ee1edb428c77f/build-end.log Signed-off-by: Sebastian Weyer Cc: Eric Le Bihan Cc: James Hilliard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...1-fix-unsoundness-in-bootstrap-cache-code.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch new file mode 100644 index 0000000000..3eae34642f --- /dev/null +++ b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch @@ -0,0 +1,43 @@ +From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 +From: Michael Goulet +Date: Mon, 12 Dec 2022 18:29:33 +0000 +Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= + =?UTF-8?q?ap=20cache=20code?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) +Signed-off-by: Sebastian Weyer +--- + src/bootstrap/cache.rs | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs +index be5c9bb0788..05f25af68ea 100644 +--- a/src/bootstrap/cache.rs ++++ b/src/bootstrap/cache.rs +@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { + + impl Deref for Interned { + type Target = T::Target; +- fn deref(&self) -> &'static Self::Target { ++ fn deref(&self) -> &Self::Target { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } ++ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } + } + } + + impl, U: ?Sized> AsRef for Interned { +- fn as_ref(&self) -> &'static U { ++ fn as_ref(&self) -> &U { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } ++ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } + } + } + +-- +2.25.1 + From romain.naour at smile.fr Wed Feb 8 14:49:10 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 15:49:10 +0100 Subject: [Buildroot] [PATCH v2 03/11] package/lld: move to llvm-project subfolder In-Reply-To: References: Message-ID: <800ca93a-4af6-7192-5796-65802eb73275@smile.fr> Le 25/10/2022 ? 08:07, Lang Daniel via buildroot a ?crit?: > To make version bumping easier, move llvm to a new llvm-project subfolder > and specify site and version for the project. Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - No changes > --- > DEVELOPERS | 2 +- > package/Config.in.host | 2 +- > package/{ => llvm-project}/lld/Config.in.host | 0 > package/{ => llvm-project}/lld/lld.hash | 0 > package/{ => llvm-project}/lld/lld.mk | 5 ++--- > 5 files changed, 4 insertions(+), 5 deletions(-) > rename package/{ => llvm-project}/lld/Config.in.host (100%) > rename package/{ => llvm-project}/lld/lld.hash (100%) > rename package/{ => llvm-project}/lld/lld.mk (87%) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 8763fde182..d4bab1aa36 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1609,7 +1609,7 @@ F: package/clang/ > F: package/earlyoom/ > F: package/gconf/ > F: package/libnss/ > -F: package/lld/ > +F: package/llvm-project/lld/ > F: package/llvm-project/llvm/ > F: package/python-cython/ > F: package/python-pycups/ > diff --git a/package/Config.in.host b/package/Config.in.host > index 8ccbf40a84..60ec97a39c 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -50,7 +50,7 @@ menu "Host utilities" > source "package/jsmin/Config.in.host" > source "package/kmod/Config.in.host" > source "package/libp11/Config.in.host" > - source "package/lld/Config.in.host" > + source "package/llvm-project/lld/Config.in.host" > source "package/lpc3250loader/Config.in.host" > source "package/lttng-babeltrace/Config.in.host" > source "package/lzma-alone/Config.in.host" > diff --git a/package/lld/Config.in.host b/package/llvm-project/lld/Config.in.host > similarity index 100% > rename from package/lld/Config.in.host > rename to package/llvm-project/lld/Config.in.host > diff --git a/package/lld/lld.hash b/package/llvm-project/lld/lld.hash > similarity index 100% > rename from package/lld/lld.hash > rename to package/llvm-project/lld/lld.hash > diff --git a/package/lld/lld.mk b/package/llvm-project/lld/lld.mk > similarity index 87% > rename from package/lld/lld.mk > rename to package/llvm-project/lld/lld.mk > index 4bf903cda0..46ec3b13ff 100644 > --- a/package/lld/lld.mk > +++ b/package/llvm-project/lld/lld.mk > @@ -4,9 +4,8 @@ > # > ################################################################################ > > -# LLVM, Clang and lld should be version bumped together > -LLD_VERSION = 11.1.0 > -LLD_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLD_VERSION) > +LLD_VERSION = $(LLVM_PROJECT_VERSION) > +LLD_SITE = $(LLVM_PROJECT_SITE) > LLD_SOURCE = lld-$(LLD_VERSION).src.tar.xz > LLD_LICENSE = Apache-2.0 with exceptions > LLD_LICENSE_FILES = LICENSE.TXT From romain.naour at smile.fr Wed Feb 8 14:52:32 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 15:52:32 +0100 Subject: [Buildroot] [PATCH v2 04/11] package/clang: move to llvm-project subfolder In-Reply-To: References: Message-ID: <7ecbf4e7-c57d-8486-7336-63f089720b6a@smile.fr> Hello, Le 25/10/2022 ? 08:07, Lang Daniel via buildroot a ?crit?: > To make version bumping easier, move llvm to a new llvm-project subfolder > and specify site and version for the project. > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - No changes > --- > DEVELOPERS | 6 +++--- > package/Config.in | 2 +- > ...-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 0 > package/{ => llvm-project}/clang/Config.in | 0 > package/{ => llvm-project}/clang/clang.hash | 0 > package/{ => llvm-project}/clang/clang.mk | 7 +++---- > package/llvm-project/llvm-project.mk | 3 ++- > 7 files changed, 9 insertions(+), 9 deletions(-) > rename package/{ => llvm-project}/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch (100%) > rename package/{ => llvm-project}/clang/Config.in (100%) > rename package/{ => llvm-project}/clang/clang.hash (100%) > rename package/{ => llvm-project}/clang/clang.mk (96%) > > diff --git a/DEVELOPERS b/DEVELOPERS > index d4bab1aa36..d516f585d8 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1605,10 +1605,10 @@ F: support/testing/tests/package/test_python_aexpect.py > N: Joseph Kogut > F: package/at-spi2-atk/ > F: package/at-spi2-core/ > -F: package/clang/ > F: package/earlyoom/ > F: package/gconf/ > F: package/libnss/ > +F: package/llvm-project/clang/ > F: package/llvm-project/lld/ > F: package/llvm-project/llvm/ > F: package/python-cython/ > @@ -2525,7 +2525,6 @@ F: package/alure/ > F: package/aubio/ > F: package/binutils/ > F: package/bullet/ > -F: package/clang/ > F: package/clinfo/ > F: package/efl/ > F: package/enet/ > @@ -2544,6 +2543,7 @@ F: package/libgta/ > F: package/libiec61850/ > F: package/libspatialindex/ > F: package/linux-syscall-support/ > +F: package/llvm-project/clang/ > F: package/llvm-project/llvm/ > F: package/lugaru/ > F: package/mcelog/ > @@ -2953,9 +2953,9 @@ F: package/gettext-tiny/ > F: package/tinyssh/ > > N: Valentin Korenblit > -F: package/clang/ > F: package/clinfo/ > F: package/libclc/ > +F: package/llvm-project/clang/ > F: package/llvm-project/llvm/ > > N: Vanya Sergeev > diff --git a/package/Config.in b/package/Config.in > index 3b7d4a9448..15dd27796f 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1970,7 +1970,7 @@ menu "Other" > source "package/capnproto/Config.in" > source "package/cctz/Config.in" > source "package/cereal/Config.in" > - source "package/clang/Config.in" > + source "package/llvm-project/clang/Config.in" > source "package/cmocka/Config.in" > source "package/compiler-rt/Config.in" > source "package/cppcms/Config.in" > diff --git a/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > similarity index 100% > rename from package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > rename to package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > diff --git a/package/clang/Config.in b/package/llvm-project/clang/Config.in > similarity index 100% > rename from package/clang/Config.in > rename to package/llvm-project/clang/Config.in > diff --git a/package/clang/clang.hash b/package/llvm-project/clang/clang.hash > similarity index 100% > rename from package/clang/clang.hash > rename to package/llvm-project/clang/clang.hash > diff --git a/package/clang/clang.mk b/package/llvm-project/clang/clang.mk > similarity index 96% > rename from package/clang/clang.mk > rename to package/llvm-project/clang/clang.mk > index 3c75f8d6b1..0943e21a8c 100644 > --- a/package/clang/clang.mk > +++ b/package/llvm-project/clang/clang.mk > @@ -4,10 +4,9 @@ > # > ################################################################################ > > -# LLVM, Clang and lld should be version bumped together > -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_VERSION_MAJOR = $(LLVM_PROJECT_VERSION_MAJOR) > +CLANG_VERSION = $(LLVM_PROJECT_VERSION) > +CLANG_SITE = $(LLVM_PROJECT_SITE) > CLANG_SOURCE = clang-$(CLANG_VERSION).src.tar.xz > CLANG_LICENSE = Apache-2.0 with exceptions > CLANG_LICENSE_FILES = LICENSE.TXT > diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk > index 7ba89bb605..747a6f5647 100644 > --- a/package/llvm-project/llvm-project.mk > +++ b/package/llvm-project/llvm-project.mk > @@ -4,7 +4,8 @@ > # > ################################################################################ > > -LLVM_PROJECT_VERSION = 11.1.0 > +LLVM_PROJECT_VERSION_MAJOR = 11 > +LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.0 It seems not related to the clang move to llvm-project subfolder. (maybe a rebase + squash issue) It should be done at the begening of this series. Best regards, Romain > LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) > > include $(sort $(wildcard package/llvm-project/*/*.mk)) From romain.naour at smile.fr Wed Feb 8 14:53:41 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 15:53:41 +0100 Subject: [Buildroot] [PATCH v2 05/11] package/compiler-rt: move to llvm-project subfolder In-Reply-To: References: Message-ID: Hello, Le 25/10/2022 ? 08:08, Lang Daniel via buildroot a ?crit?: > To make version bumping easier, move llvm to a new llvm-project subfolder > and specify site and version for the project. Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - No changes > --- > DEVELOPERS | 2 +- > package/Config.in | 2 +- > package/{ => llvm-project}/compiler-rt/Config.in | 0 > package/{ => llvm-project}/compiler-rt/compiler-rt.hash | 0 > package/{ => llvm-project}/compiler-rt/compiler-rt.mk | 6 ++---- > 5 files changed, 4 insertions(+), 6 deletions(-) > rename package/{ => llvm-project}/compiler-rt/Config.in (100%) > rename package/{ => llvm-project}/compiler-rt/compiler-rt.hash (100%) > rename package/{ => llvm-project}/compiler-rt/compiler-rt.mk (85%) > > diff --git a/DEVELOPERS b/DEVELOPERS > index d516f585d8..e6606408c0 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1966,7 +1966,6 @@ 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/ > @@ -2004,6 +2003,7 @@ F: package/libssh2/ > F: package/libtalloc/ > F: package/libqmi/ > F: package/lighttpd/ > +F: package/llvm-project/compiler-rt/ > F: package/logrotate/ > F: package/makedevs/ > F: package/memtester/ > diff --git a/package/Config.in b/package/Config.in > index 15dd27796f..1d48b1448b 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1972,7 +1972,7 @@ menu "Other" > source "package/cereal/Config.in" > source "package/llvm-project/clang/Config.in" > source "package/cmocka/Config.in" > - source "package/compiler-rt/Config.in" > + source "package/llvm-project/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/llvm-project/compiler-rt/Config.in > similarity index 100% > rename from package/compiler-rt/Config.in > rename to package/llvm-project/compiler-rt/Config.in > diff --git a/package/compiler-rt/compiler-rt.hash b/package/llvm-project/compiler-rt/compiler-rt.hash > similarity index 100% > rename from package/compiler-rt/compiler-rt.hash > rename to package/llvm-project/compiler-rt/compiler-rt.hash > diff --git a/package/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk > similarity index 85% > rename from package/compiler-rt/compiler-rt.mk > rename to package/llvm-project/compiler-rt/compiler-rt.mk > index c8ea86e899..84add60801 100644 > --- a/package/compiler-rt/compiler-rt.mk > +++ b/package/llvm-project/compiler-rt/compiler-rt.mk > @@ -4,11 +4,9 @@ > # > ################################################################################ > > -# 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_VERSION = $(LLVM_PROJECT_VERSION) > 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_SITE = $(LLVM_PROJECT_SITE) > COMPILER_RT_LICENSE = NCSA MIT > COMPILER_RT_LICENSE_FILES = LICENSE.TXT > COMPILER_RT_DEPENDENCIES = host-clang llvm From romain.naour at smile.fr Wed Feb 8 15:02:08 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:02:08 +0100 Subject: [Buildroot] [PATCH v2 06/11] package/llvm-project/llvm-cmake: new package In-Reply-To: References: Message-ID: Hello, Le 25/10/2022 ? 08:09, Lang Daniel via buildroot a ?crit?: > This is a small host package containing shared cmake modules > that are needed by various projects during configuration. > For example llvm 15 needs it. > > Signed-off-by: Daniel Lang > --- > package/llvm-project/llvm-cmake/llvm-cmake.hash | 2 ++ > package/llvm-project/llvm-cmake/llvm-cmake.mk | 16 ++++++++++++++++ > 2 files changed, 18 insertions(+) > create mode 100644 package/llvm-project/llvm-cmake/llvm-cmake.hash > create mode 100644 package/llvm-project/llvm-cmake/llvm-cmake.mk > > diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.hash b/package/llvm-project/llvm-cmake/llvm-cmake.hash > new file mode 100644 > index 0000000000..b76013e810 > --- /dev/null > +++ b/package/llvm-project/llvm-cmake/llvm-cmake.hash > @@ -0,0 +1,2 @@ > +# locally calculated > +sha256 21cf3f52c53dc8b8972122ae35a5c18de09c7df693b48b5cd8553c3e3fed090d cmake-15.0.3.src.tar.xz This can't work since LLVM_PROJECT_VERSION is still at 11.1.0. > diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.mk b/package/llvm-project/llvm-cmake/llvm-cmake.mk > new file mode 100644 > index 0000000000..2527b95063 > --- /dev/null > +++ b/package/llvm-project/llvm-cmake/llvm-cmake.mk > @@ -0,0 +1,16 @@ > +################################################################################ > +# > +# llvm-cmake > +# > +################################################################################ > + > +LLVM_CMAKE_VERSION = $(LLVM_PROJECT_VERSION) > +LLVM_CMAKE_SITE = $(LLVM_PROJECT_SITE) Maybe force it to 15.0.3 here and revert to LLVM_PROJECT_VERSION when doing the llvm-project version bump to 15.0.3. > +LLVM_CMAKE_SOURCE = cmake-$(LLVM_CMAKE_VERSION).src.tar.xz > + > +define HOST_LLVM_CMAKE_INSTALL_CMDS > + mkdir -p $(HOST_DIR)/lib/cmake/llvm > + cp -Rv $(@D)/Modules/* $(HOST_DIR)/lib/cmake/llvm > +endef There is really no install target in this package ? Best regards, Romain > + > +$(eval $(host-generic-package)) From peter at korsgaard.com Wed Feb 8 15:04:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 16:04:15 +0100 Subject: [Buildroot] Multiple BR2_BACKUP_SITE In-Reply-To: (Christian Stewart via buildroot's message of "Mon, 30 Jan 2023 15:19:29 -0800") References: Message-ID: <87wn4s42s0.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart via buildroot writes: > Hi all, > Would it be possible to adjust Buildroot so that multiple > BR2_BACKUP_SITE can be specified in a list? This way there could be > multiple mirrors with some mirrors having some things that others do > not. In concept that shouldn't be hard to do, E.G. basically stick a foreach loop in the code that calculates DOWNLOAD_URIS in package/pkg-download.mk. Care to give that a try and send a patch? -- Bye, Peter Korsgaard From romain.naour at smile.fr Wed Feb 8 15:10:44 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:10:44 +0100 Subject: [Buildroot] [PATCH v2 07/11] package/llvm-project/llvm-libunwind: new package In-Reply-To: References: Message-ID: Hello, Le 25/10/2022 ? 08:10, Lang Daniel via buildroot a ?crit?: > Starting with version 15, lld needs the llvm implementation > of libunwind, therefore it is added as a host package. > > Signed-off-by: Daniel Lang > --- > .../llvm-libunwind/llvm-libunwind.hash | 3 +++ > .../llvm-libunwind/llvm-libunwind.mk | 18 ++++++++++++++++++ > 2 files changed, 21 insertions(+) > create mode 100644 package/llvm-project/llvm-libunwind/llvm-libunwind.hash > create mode 100644 package/llvm-project/llvm-libunwind/llvm-libunwind.mk > > diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.hash b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash > new file mode 100644 > index 0000000000..2d6286a40e > --- /dev/null > +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash > @@ -0,0 +1,3 @@ > +# locally computed > +sha256 0ab6e07bf05359e242e9ea80e4089b819914867fa997a715e324e584bcfdf114 libunwind-15.0.3.src.tar.xz Same issue than for llvm-cmake package. > +sha256 b5efebcaca80879234098e52d1725e6d9eb8fb96a19fce625d39184b705f7b6d LICENSE.TXT > diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.mk b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk > new file mode 100644 > index 0000000000..be9965a49a > --- /dev/null > +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk > @@ -0,0 +1,18 @@ > +################################################################################ > +# > +# llvm-libunwind > +# > +################################################################################ > + > +LLVM_LIBUNWIND_VERSION = $(LLVM_PROJECT_VERSION) > +LLVM_LIBUNWIND_SITE = $(LLVM_PROJECT_SITE) > +LLVM_LIBUNWIND_SOURCE = libunwind-$(LLVM_LIBUNWIND_VERSION).src.tar.xz > +LLVM_LIBUNWIND_LICENSE = Apache-2.0 with exceptions > +LLVM_LIBUNWIND_LICENSE_FILES = LICENSE.TXT > +LLVM_LIBUNWIND_SUPPORTS_IN_SOURCE_BUILD = NO > + > +HOST_LLVM_LIBUNWIND_CONF_OPTS += \ > + -DCMAKE_MODULE_PATH="$(HOST_DIR)/lib/cmake/llvm" \ > + -DLIBUNWIND_INSTALL_HEADERS=ON > + > +$(eval $(host-cmake-package)) It's a host only package here, is llvm-libunwind may be useful on the target? If yes, we should take care of libunwind package. Best regards, Romain From thomas.petazzoni at bootlin.com Wed Feb 8 15:15:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:15:27 +0100 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: <20220607231211.533086-1-james.hilliard1@gmail.com> References: <20220607231211.533086-1-james.hilliard1@gmail.com> Message-ID: <20230208161527.31a28b3b@windsurf> On Tue, 7 Jun 2022 17:12:11 -0600 James Hilliard wrote: > In some cases it only makes sense to run tests against a specific > branch, such as when testing new genrandconfig flags. > > Add a config option to override the branch selection. > > Signed-off-by: James Hilliard > --- > scripts/autobuild-run | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) We looked at this with Arnout, and we don't really see what this would be needed, and actually it could be annoying to have people test "random" branches. If you need extensions to genrandconfig, then the autobuild-run script should be backward compatible with older versions of genrandconfig to be able to support older branches for a certain while. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Wed Feb 8 15:16:37 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:16:37 +0100 Subject: [Buildroot] [PATCH v2 08/11] package/llvm-project: bump to version 15.0.3 In-Reply-To: References: Message-ID: Hello, Le 25/10/2022 ? 08:12, Lang Daniel via buildroot a ?crit?: > - Add new build dependencies to lld and llvm > - Drop old config options > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - Bump to 15.0.3 instead of 15.0.1 > - llvm: use CMAKE_HOST_C_COMPILER instead of HOSTCC > --- > package/llvm-project/clang/clang.hash | 2 +- > package/llvm-project/clang/clang.mk | 8 +------ > .../llvm-project/compiler-rt/compiler-rt.hash | 2 +- > .../llvm-project/compiler-rt/compiler-rt.mk | 3 ++- > package/llvm-project/lld/lld.hash | 2 +- > package/llvm-project/lld/lld.mk | 8 +------ > .../llvm-project/llvm-cmake/llvm-cmake.hash | 2 +- > .../llvm-libunwind/llvm-libunwind.hash | 2 +- > package/llvm-project/llvm-project.mk | 4 ++-- > .../llvm/0001-nfc-Fix-missing-include.patch | 24 ------------------- > package/llvm-project/llvm/llvm.hash | 2 +- > package/llvm-project/llvm/llvm.mk | 21 +++++++++------- > 12 files changed, 24 insertions(+), 56 deletions(-) > delete mode 100644 package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch > > diff --git a/package/llvm-project/clang/clang.hash b/package/llvm-project/clang/clang.hash > index 0136b80664..52c755cfb3 100644 > --- a/package/llvm-project/clang/clang.hash > +++ b/package/llvm-project/clang/clang.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 0a8288f065d1f57cb6d96da4d2965cbea32edc572aa972e466e954d17148558b clang-11.1.0.src.tar.xz > +sha256 96036052694e703d159c995bda203b59d1ff185c6879189b9eba837726e1738c clang-15.0.3.src.tar.xz > sha256 ebcd9bbf783a73d05c53ba4d586b8d5813dcdf3bbec50265860ccc885e606f47 LICENSE.TXT > diff --git a/package/llvm-project/clang/clang.mk b/package/llvm-project/clang/clang.mk > index 0943e21a8c..0bafd6461b 100644 > --- a/package/llvm-project/clang/clang.mk > +++ b/package/llvm-project/clang/clang.mk > @@ -17,13 +17,6 @@ CLANG_INSTALL_STAGING = YES > HOST_CLANG_DEPENDENCIES = host-llvm host-libxml2 > CLANG_DEPENDENCIES = llvm host-clang > > -# LLVM >= 9.0 will soon require C++14 support, building llvm 8.x using a > -# toolchain using gcc < 5.1 gives an error but actually still works. Setting > -# this option makes it still build with gcc >= 4.8. > -# https://reviews.llvm.org/D57264 > -HOST_CLANG_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON > -CLANG_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON This option was needed on host with an old gcc version. If you remove this option, you have to add an host gcc dependency on llvm-project (depends on BR2_HOST_GCC_AT_LEAST_X) > - > # This option is needed, otherwise multiple shared libs > # (libclangAST.so, libclangBasic.so, libclangFrontend.so, etc.) will > # be generated. As a final shared lib containing all these components > @@ -62,6 +55,7 @@ CLANG_CONF_OPTS += \ > HOST_CLANG_CONF_OPTS += -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ > -DCLANG_DEFAULT_LINKER=$(TARGET_LD) > CLANG_CONF_OPTS += -DLLVM_DIR=$(STAGING_DIR)/usr/lib/cmake/llvm \ > + -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm \ > -DCLANG_TABLEGEN:FILEPATH=$(HOST_DIR)/bin/clang-tblgen \ > -DLLVM_TABLEGEN_EXE:FILEPATH=$(HOST_DIR)/bin/llvm-tblgen > > diff --git a/package/llvm-project/compiler-rt/compiler-rt.hash b/package/llvm-project/compiler-rt/compiler-rt.hash > index 8ee010ac5a..fe4e98164b 100644 > --- a/package/llvm-project/compiler-rt/compiler-rt.hash > +++ b/package/llvm-project/compiler-rt/compiler-rt.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274 compiler-rt-11.1.0.src.tar.xz > +sha256 db958eee92d1571d8b7f76c1be8513817f1a888dcf6ced88aca871acfb0eeddd compiler-rt-15.0.3.src.tar.xz > sha256 1a8f1058753f1ba890de984e48f0242a3a5c29a6a8f2ed9fd813f36985387e8d LICENSE.TXT > diff --git a/package/llvm-project/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk > index 84add60801..026650c7c8 100644 > --- a/package/llvm-project/compiler-rt/compiler-rt.mk > +++ b/package/llvm-project/compiler-rt/compiler-rt.mk > @@ -17,7 +17,8 @@ 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)/bin/llvm-config > + -DLLVM_CONFIG_PATH=$(HOST_DIR)/bin/llvm-config \ > + -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm > > # The installation of the target runtime libraries defaults to DESTDIR, however > # host-clang resources directory needs a link so Clang can find the runtime > diff --git a/package/llvm-project/lld/lld.hash b/package/llvm-project/lld/lld.hash > index 6d56ffcaab..2d2598dbeb 100644 > --- a/package/llvm-project/lld/lld.hash > +++ b/package/llvm-project/lld/lld.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 017a788cbe1ecc4a949abf10755870519086d058a2e99f438829aef24f0c66ce lld-11.1.0.src.tar.xz > +sha256 cd5d0894a74b957ce78d62212c1df0b3876a7297593aaece6b0512285e3b8732 lld-15.0.3.src.tar.xz > sha256 f7891568956e34643eb6a0db1462db30820d40d7266e2a78063f2fe233ece5a0 LICENSE.TXT > diff --git a/package/llvm-project/lld/lld.mk b/package/llvm-project/lld/lld.mk > index 46ec3b13ff..539dd0bd71 100644 > --- a/package/llvm-project/lld/lld.mk > +++ b/package/llvm-project/lld/lld.mk > @@ -10,13 +10,7 @@ LLD_SOURCE = lld-$(LLD_VERSION).src.tar.xz > LLD_LICENSE = Apache-2.0 with exceptions > LLD_LICENSE_FILES = LICENSE.TXT > LLD_SUPPORTS_IN_SOURCE_BUILD = NO > -HOST_LLD_DEPENDENCIES = host-llvm > - > -# LLVM > 9.0 will soon require C++14 support, building llvm <= 9.0 using a > -# toolchain using gcc < 5.1 gives an error but actually still works. Setting > -# this option makes it still build with gcc >= 4.8. > -# https://reviews.llvm.org/D57264 > -HOST_LLD_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON > +HOST_LLD_DEPENDENCIES = host-llvm host-llvm-libunwind > > # build as static libs as is done in llvm & clang > HOST_LLD_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF > diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.hash b/package/llvm-project/llvm-cmake/llvm-cmake.hash > index b76013e810..862c5d92e8 100644 > --- a/package/llvm-project/llvm-cmake/llvm-cmake.hash > +++ b/package/llvm-project/llvm-cmake/llvm-cmake.hash > @@ -1,2 +1,2 @@ > # locally calculated > -sha256 a660d1b7d4d2ef9759de6ad360d5fa9eed3625a6548068a97df2dd706edf2dd0 cmake-15.0.1.src.tar.xz > +sha256 21cf3f52c53dc8b8972122ae35a5c18de09c7df693b48b5cd8553c3e3fed090d cmake-15.0.3.src.tar.xz > diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.hash b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash > index 2d6286a40e..86775f5dba 100644 > --- a/package/llvm-project/llvm-libunwind/llvm-libunwind.hash > +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash > @@ -1,3 +1,3 @@ > # locally computed > -sha256 65af59d7cd4672e2c1793402968f803beb3f91a92ad95f8702610a9a07a5ca10 libunwind-15.0.1.src.tar.xz > +sha256 0ab6e07bf05359e242e9ea80e4089b819914867fa997a715e324e584bcfdf114 libunwind-15.0.3.src.tar.xz > sha256 b5efebcaca80879234098e52d1725e6d9eb8fb96a19fce625d39184b705f7b6d LICENSE.TXT > diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk > index 747a6f5647..5859ff7cfc 100644 > --- a/package/llvm-project/llvm-project.mk > +++ b/package/llvm-project/llvm-project.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LLVM_PROJECT_VERSION_MAJOR = 11 > -LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.0 > +LLVM_PROJECT_VERSION_MAJOR = 15 > +LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).0.3 > LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) > > include $(sort $(wildcard package/llvm-project/*/*.mk)) > diff --git a/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch b/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch > deleted file mode 100644 > index 62111ca138..0000000000 > --- a/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch > +++ /dev/null > @@ -1,24 +0,0 @@ > -From b498303066a63a203d24f739b2d2e0e56dca70d1 Mon Sep 17 00:00:00 2001 > -From: serge-sans-paille > -Date: Tue, 10 Nov 2020 14:55:25 +0100 > -Subject: [PATCH] [nfc] Fix missing include > - > -[Retrieved (and backported) from: > -https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1] > -Signed-off-by: Fabrice Fontaine > ---- > - llvm/utils/benchmark/src/benchmark_register.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/utils/benchmark/src/benchmark_register.h b/utils/benchmark/src/benchmark_register.h > -index 0705e219f2fa2..4caa5ad4da079 100644 > ---- a/utils/benchmark/src/benchmark_register.h > -+++ b/utils/benchmark/src/benchmark_register.h > -@@ -1,6 +1,7 @@ > - #ifndef BENCHMARK_REGISTER_H > - #define BENCHMARK_REGISTER_H > - > -+#include > - #include > - > - #include "check.h" > diff --git a/package/llvm-project/llvm/llvm.hash b/package/llvm-project/llvm/llvm.hash > index e7f79492de..df9aa88411 100644 > --- a/package/llvm-project/llvm/llvm.hash > +++ b/package/llvm-project/llvm/llvm.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 ce8508e318a01a63d4e8b3090ab2ded3c598a50258cc49e2625b9120d4c03ea5 llvm-11.1.0.src.tar.xz > +sha256 c39aec729662416dcbf0bfe53a9786b34e7d93d02908a0779a2f6d83ad0a4a27 llvm-15.0.3.src.tar.xz > sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT > diff --git a/package/llvm-project/llvm/llvm.mk b/package/llvm-project/llvm/llvm.mk > index 1adad17b16..5751ba4f7f 100644 > --- a/package/llvm-project/llvm/llvm.mk > +++ b/package/llvm-project/llvm/llvm.mk > @@ -14,15 +14,16 @@ LLVM_SUPPORTS_IN_SOURCE_BUILD = NO > LLVM_INSTALL_STAGING = YES > > # LLVM >= 9.0 can use python3 to build. maybe remove this old comment ? host-python (python2) has been removed. Best regards, Romain > -HOST_LLVM_DEPENDENCIES = host-python3 > +HOST_LLVM_DEPENDENCIES = host-python3 host-llvm-cmake > LLVM_DEPENDENCIES = host-llvm > > -# LLVM >= 9.0 will soon require C++14 support, building llvm 8.x using a > -# toolchain using gcc < 5.1 gives an error but actually still works. Setting > -# this option makes it still build with gcc >= 4.8. > -# https://reviews.llvm.org/D57264 > -HOST_LLVM_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON > -LLVM_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON > +# Path to cmake modules from host-llvm-cmake > +HOST_LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm > +LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm > + > +# Assembly files for x64 in lib/Support/BLAKE3 need to be compiled > +# by a C compiler > +HOST_LLVM_CONF_OPTS += -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" > > # Don't build clang libcxx libcxxabi lldb compiler-rt lld polly as llvm subprojects > # This flag assumes that projects are checked out side-by-side and not nested > @@ -259,7 +260,8 @@ HOST_LLVM_CONF_OPTS += \ > -DLLVM_INCLUDE_EXAMPLES=OFF \ > -DLLVM_INCLUDE_DOCS=OFF \ > -DLLVM_INCLUDE_GO_TESTS=OFF \ > - -DLLVM_INCLUDE_TESTS=OFF > + -DLLVM_INCLUDE_TESTS=OFF \ > + -DLLVM_INCLUDE_BENCHMARKS=OFF > LLVM_CONF_OPTS += \ > -DLLVM_BUILD_EXAMPLES=OFF \ > -DLLVM_BUILD_DOCS=OFF \ > @@ -270,7 +272,8 @@ LLVM_CONF_OPTS += \ > -DLLVM_INCLUDE_EXAMPLES=OFF \ > -DLLVM_INCLUDE_DOCS=OFF \ > -DLLVM_INCLUDE_GO_TESTS=OFF \ > - -DLLVM_INCLUDE_TESTS=OFF > + -DLLVM_INCLUDE_TESTS=OFF \ > + -DLLVM_INCLUDE_BENCHMARKS=OFF > > # Copy llvm-config (host variant) to STAGING_DIR > # llvm-config (host variant) returns include and lib directories From romain.naour at smile.fr Wed Feb 8 15:18:26 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:18:26 +0100 Subject: [Buildroot] [PATCH v2 09/11] package/spirv-llvm-translator: bump to version 15.0.0-2 In-Reply-To: References: Message-ID: <89073a3f-f951-d3cc-36c9-4d405dd92919@smile.fr> Hello, Le 25/10/2022 ? 08:13, Lang Daniel via buildroot a ?crit?: Reviewed-by: Romain Naour Best regards, Romain > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - Bump to latest commit that supports llvm15 > --- > package/spirv-llvm-translator/spirv-llvm-translator.hash | 2 +- > package/spirv-llvm-translator/spirv-llvm-translator.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.hash b/package/spirv-llvm-translator/spirv-llvm-translator.hash > index edfca1ea02..0e06d36de1 100644 > --- a/package/spirv-llvm-translator/spirv-llvm-translator.hash > +++ b/package/spirv-llvm-translator/spirv-llvm-translator.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 bdd7cb677b9fcaaff1cce2153de9d69298f136edecaef3631915614bb5db09a1 spirv-llvm-translator-v11.0.0-297-ga619b34bce55360d79fea9058a93ded04919f2b2.tar.gz > +sha256 c2b29bc495fe14a21e871481b5a25d7abed93df8fa3fc22e996e39d9c1373280 spirv-llvm-translator-v15.0.0-2-g2478920a91bff5c59ca65ea9bce8ffaa5af8fa88.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 > index 159f7d3b52..d920999b28 100644 > --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk > +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk > @@ -5,8 +5,8 @@ > ################################################################################ > > # Generate version string using: > -# git describe --tags --match 'v11*' --abbrev=40 origin/llvm_release_110 > -SPIRV_LLVM_TRANSLATOR_VERSION = v11.0.0-297-ga619b34bce55360d79fea9058a93ded04919f2b2 > +# git describe --tags --match 'v15*' --abbrev=40 origin/llvm_release_150 > +SPIRV_LLVM_TRANSLATOR_VERSION = v15.0.0-2-g2478920a91bff5c59ca65ea9bce8ffaa5af8fa88 > SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION)) > SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA > SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT From romain.naour at smile.fr Wed Feb 8 15:22:31 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:22:31 +0100 Subject: [Buildroot] [PATCH v2 10/11] package/libclc: move to llvm-project subfolder and bump to 15.0.3 In-Reply-To: References: Message-ID: Hello, Le 25/10/2022 ? 08:13, Lang Daniel via buildroot a ?crit?: > To make version bumping easier, move llvm to a new llvm-project subfolder > and specify site and version for the project. This patch should go before llvm-cmake (and before llvm-project version bump) without the version bump. Include the libclc version bump with the llvm-project version bump. Best regards, Romain > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - libclc: Add missing change to package/Config.in > - Bump to 15.0.3 instead of 15.0.1 > --- > DEVELOPERS | 4 ++-- > package/Config.in | 2 +- > .../libclc/0001-support-out-of-tree-build.patch | 0 > package/{ => llvm-project}/libclc/Config.in | 0 > package/{ => llvm-project}/libclc/libclc.hash | 2 +- > package/{ => llvm-project}/libclc/libclc.mk | 4 ++-- > 6 files changed, 6 insertions(+), 6 deletions(-) > rename package/{ => llvm-project}/libclc/0001-support-out-of-tree-build.patch (100%) > rename package/{ => llvm-project}/libclc/Config.in (100%) > rename package/{ => llvm-project}/libclc/libclc.hash (51%) > rename package/{ => llvm-project}/libclc/libclc.mk (92%) > > diff --git a/DEVELOPERS b/DEVELOPERS > index e6606408c0..6dbf4fe7a5 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2538,12 +2538,12 @@ F: package/irrlicht/ > F: package/liblinear/ > F: package/lensfun/ > F: package/libbpf/ > -F: package/libclc/ > F: package/libgta/ > F: package/libiec61850/ > F: package/libspatialindex/ > F: package/linux-syscall-support/ > F: package/llvm-project/clang/ > +F: package/llvm-project/libclc/ > F: package/llvm-project/llvm/ > F: package/lugaru/ > F: package/mcelog/ > @@ -2954,8 +2954,8 @@ F: package/tinyssh/ > > N: Valentin Korenblit > F: package/clinfo/ > -F: package/libclc/ > F: package/llvm-project/clang/ > +F: package/llvm-project/libclc/ > F: package/llvm-project/llvm/ > > N: Vanya Sergeev > diff --git a/package/Config.in b/package/Config.in > index 1d48b1448b..882e296533 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2010,7 +2010,7 @@ menu "Other" > source "package/libcap/Config.in" > source "package/libcap-ng/Config.in" > source "package/libcgroup/Config.in" > - source "package/libclc/Config.in" > + source "package/llvm-project/libclc/Config.in" > source "package/libcofi/Config.in" > source "package/libcorrect/Config.in" > source "package/libcrossguid/Config.in" > diff --git a/package/libclc/0001-support-out-of-tree-build.patch b/package/llvm-project/libclc/0001-support-out-of-tree-build.patch > similarity index 100% > rename from package/libclc/0001-support-out-of-tree-build.patch > rename to package/llvm-project/libclc/0001-support-out-of-tree-build.patch > diff --git a/package/libclc/Config.in b/package/llvm-project/libclc/Config.in > similarity index 100% > rename from package/libclc/Config.in > rename to package/llvm-project/libclc/Config.in > diff --git a/package/libclc/libclc.hash b/package/llvm-project/libclc/libclc.hash > similarity index 51% > rename from package/libclc/libclc.hash > rename to package/llvm-project/libclc/libclc.hash > index c496291d81..7140884f6c 100644 > --- a/package/libclc/libclc.hash > +++ b/package/llvm-project/libclc/libclc.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 8f0213e52e2fcaca3dfcc438f05d0e15e9b3c96fd6b0994a802b267dc1047a1d libclc-13.0.1.src.tar.xz > +sha256 07e8a2b31e07a8cc8a976a6bfd87797d2543d5a9530f449755bf5119acbdbe8e libclc-15.0.3.src.tar.xz > sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT > diff --git a/package/libclc/libclc.mk b/package/llvm-project/libclc/libclc.mk > similarity index 92% > rename from package/libclc/libclc.mk > rename to package/llvm-project/libclc/libclc.mk > index 5d246cf4f8..9f303d6d2f 100644 > --- a/package/libclc/libclc.mk > +++ b/package/llvm-project/libclc/libclc.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LIBCLC_VERSION = 13.0.1 > -LIBCLC_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCLC_VERSION) > +LIBCLC_VERSION = $(LLVM_PROJECT_VERSION) > +LIBCLC_SITE = $(LLVM_PROJECT_SITE) > LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz > LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT > LIBCLC_LICENSE_FILES = LICENSE.TXT From peter at korsgaard.com Wed Feb 8 15:25:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 16:25:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/xz: patch configure due to microblaze patch In-Reply-To: <20230208142358.2721276-1-vfazio@xes-inc.com> (Vincent Fazio's message of "Wed, 8 Feb 2023 08:23:58 -0600") References: <20230208142358.2721276-1-vfazio@xes-inc.com> Message-ID: <87sffg41s5.fsf@dell.be.48ers.dk> >>>>> "Vincent" == Vincent Fazio writes: > Commit bed21bb9b added a patch to change configure.ac but failed to > update configure which caused build failures due to the timestamp > difference between configure and configure.ac and the makefile attempting > to run aclocal. > XZ_AUTORECONF = YES creates a circular dependency where the host > autotools need host-xz which also gets patched. Because of this, we need > to patch xz's configure script manually. > While we're doing this, correct the language in the commit body of the > patch, remove a stray whitespace, and fix the offset for configure.ac > Fixes: bed21bb9b ("package/xz: fix microblaze compiles") > Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685// > Signed-off-by: Vincent Fazio This unfortunately still doesn't work as autoreconf is also triggered if configure.ac is newer than Makefile.in, so I dropped the patching of configure.ac which isn't strictly needed and committed, thanks. -- Bye, Peter Korsgaard From romain.naour at smile.fr Wed Feb 8 15:26:16 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:26:16 +0100 Subject: [Buildroot] [PATCH v2 11/11] DEVELOPERS: add Daniel Lang for llvm-project In-Reply-To: References: Message-ID: <7979c25c-5cdc-2335-81dd-26b27ced5a5a@smile.fr> Hello, Le 25/10/2022 ? 08:14, Lang Daniel via buildroot a ?crit?: > From 709898d42f115a5403f54d3fb0dd04e1d5ee087d Mon Sep 17 00:00:00 2001 > From: Daniel Lang > Date: Wed, 28 Sep 2022 16:02:38 +0200 > Subject: [PATCH v2 11/11] DEVELOPERS: add Daniel Lang for llvm-project Thanks for this version bump. Did you know there is a Clang + compilerRT test in the Buildroot testsuite? Have you check if the test succeed with your series applied? ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_clang.TestClangCompilerRT Acked-by: Romain Naour Best regards, Romain > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - No changes > --- > DEVELOPERS | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 6dbf4fe7a5..19d584015f 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -633,6 +633,7 @@ F: package/dacapo/ > N: Daniel Lang > F: package/dbus-cxx/ > F: package/paho-mqtt-cpp/ > +F: package/llvm-project/ > > N: Damien Lanson > F: package/libvdpau/ From peter at korsgaard.com Wed Feb 8 15:24:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 16:24:25 +0100 Subject: [Buildroot] [git commit] package/xz: patch configure due to microblaze patch Message-ID: <20230208152805.5317F846FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5a83df8da04f5854c2e248e23dea3af620954cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit bed21bb9b added a patch to change configure.ac but failed to update configure which caused build failures due to the timestamp difference between configure and configure.ac and the makefile attempting to run aclocal. XZ_AUTORECONF = YES creates a circular dependency where the host autotools need host-xz which also gets patched. Because of this, we need to patch xz's configure script manually and NOT patch configure.ac so its timestamp stays older than Makefile.in. While we're doing this, correct the language in the commit body of the patch, remove a stray whitespace, and fix the offset for configure.ac Fixes: bed21bb9b ("package/xz: fix microblaze compiles") Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685/ Signed-off-by: Vincent Fazio [Peter: Only patch configure] Signed-off-by: Peter Korsgaard --- .../xz/0001-Detect-symver-attribute-support.patch | 71 ++++++++++++---------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch index 9ec43ea7a0..462fa9d86b 100644 --- a/package/xz/0001-Detect-symver-attribute-support.patch +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -1,11 +1,11 @@ -From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From f0e0e8bd08b4d4e7c89a5a3b7d9a3c083f7e5432 Mon Sep 17 00:00:00 2001 From: Vincent Fazio -Date: Tue, 7 Feb 2023 08:51:24 -0600 +Date: Wed, 8 Feb 2023 12:58:37 +0000 Subject: [PATCH] Detect symver attribute support -On non-ELF platforms, such as microblaze, builds will fail when trying -to add symver information because __attribute__((symver ..)) is not -supported even though __has_attribute(__symver__) returns true. +On Microblaze, builds will fail when trying to add symver information +because __attribute__((symver ..)) is not supported even though +__has_attribute(__symver__) returns true. Support for symver needs to be detected via a compile test since __has_attribute can report false positives [0]. @@ -18,33 +18,16 @@ it is supported and define a variable to advertise support. Upstream: https://github.com/tukaani-project/xz/pull/32 Signed-off-by: Thomas Petazzoni Signed-off-by: Vincent Fazio +[Peter: patch configure instead of configure.ac so autoreconf isn't +triggered at build time] +Signed-off-by: Peter Korsgaard --- - configure.ac | 9 +++++++++ - src/liblzma/common/common.h | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) + configure | 15 +++++++++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 5ad5589..08c623a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -791,6 +791,15 @@ else - time with Libtool if neither --with-pic nor - --without-pic is used). This define must be - used together with liblzma_linux.map.]) -+ OLD_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE( -+ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } -+ ])], -+ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], -+ [Define to 1 if GCC supports the symver attribute])], -+ []) -+ CFLAGS="$OLD_CFLAGS" - ;; - *) - enable_symbol_versions=generic diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h -index 11fec52..1d2ef9c 100644 +index 671d3bc..27b56ee 100644 --- a/src/liblzma/common/common.h +++ b/src/liblzma/common/common.h @@ -76,7 +76,7 @@ @@ -52,10 +35,36 @@ index 11fec52..1d2ef9c 100644 // is available. This should be far more reliable than looking at compiler // version macros as nowadays especially __GNUC__ is defined by many compilers. -# if lzma_has_attribute(__symver__) -+# if defined(HAVE_SYMVER_ATTRIBUTE) ++# if defined(HAVE_SYMVER_ATTRIBUTE) # define LZMA_SYMVER_API(extnamever, type, intname) \ extern __attribute__((__symver__(extnamever))) \ LZMA_API(type) intname +diff --git a/configure b/configure +index ff0eed5..e685b30 100755 +--- a/configure ++++ b/configure +@@ -16687,6 +16687,21 @@ printf "%s\n" "" >&6; } + + printf "%s\n" "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h + ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO" ++then : ++ ++printf "%s\n" "#define HAVE_SYMVER_ATTRIBUTE 1" >>confdefs.h ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic -- -2.25.1 +2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 8 15:34:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:34:15 +0100 Subject: [Buildroot] [git commit] package/open-iscsi: new package Message-ID: <20230208153425.DB28F8470E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a571acddd0badaf9636649d98fd095757878348 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: TIAN Yuanhao Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/open-iscsi/Config.in | 18 ++++++++++++++++++ package/open-iscsi/open-iscsi.hash | 3 +++ package/open-iscsi/open-iscsi.mk | 29 +++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0bb4db81bb..0e116e92a3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2791,6 +2791,7 @@ F: package/most/ N: TIAN Yuanhao F: package/cli11/ F: package/libsolv/ +F: package/open-iscsi/ F: package/open-isns/ F: package/reproc/ F: package/termcolor/ diff --git a/package/Config.in b/package/Config.in index 2adfcdbb1d..511e691ed3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2408,6 +2408,7 @@ endif source "package/odhcp6c/Config.in" source "package/odhcploc/Config.in" source "package/olsr/Config.in" + source "package/open-iscsi/Config.in" source "package/open-lldp/Config.in" source "package/open-plc-utils/Config.in" source "package/openntpd/Config.in" diff --git a/package/open-iscsi/Config.in b/package/open-iscsi/Config.in new file mode 100644 index 0000000000..e55bbfd867 --- /dev/null +++ b/package/open-iscsi/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_OPEN_ISCSI + bool "open-iscsi" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + depends on !BR2_STATIC_LIBS # kmod + select BR2_PACKAGE_KMOD + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPEN_ISNS + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + help + iSCSI tools for Linux. + + https://www.open-iscsi.com + +comment "open-iscsi needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/open-iscsi/open-iscsi.hash b/package/open-iscsi/open-iscsi.hash new file mode 100644 index 0000000000..9fd651cae8 --- /dev/null +++ b/package/open-iscsi/open-iscsi.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2 open-iscsi-2.1.8.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk new file mode 100644 index 0000000000..249253c64f --- /dev/null +++ b/package/open-iscsi/open-iscsi.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# open-iscsi +# +################################################################################ + +OPEN_ISCSI_VERSION = 2.1.8 +OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) +# The COPYING file says GPL-2.0, but there is some GPL-3.0+ code as +# well. See https://github.com/open-iscsi/open-iscsi/issues/379 +OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ +OPEN_ISCSI_LICENSE_FILES = COPYING +OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux + +OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +OPEN_ISCSI_DEPENDENCIES += systemd +OPEN_ISCSI_CONF_OPTS += -Dno_systemd=false +else +OPEN_ISCSI_CONF_OPTS += -Dno_systemd=true +endif + +define OPEN_ISCSI_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_SCSI_LOWLEVEL) + $(call KCONFIG_ENABLE_OPT,CONFIG_ISCSI_TCP) +endef + +$(eval $(meson-package)) From thomas.petazzoni at bootlin.com Wed Feb 8 15:39:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:39:19 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/open-iscsi: new package In-Reply-To: <20221009111423.7654-1-tianyuanhao3@163.com> References: <20220926154320.35494-1-tianyuanhao3@163.com> <20221009111423.7654-1-tianyuanhao3@163.com> Message-ID: <20230208163919.49c6eb38@windsurf> Hello, On Sun, 9 Oct 2022 04:14:23 -0700 TIAN Yuanhao wrote: > Signed-off-by: TIAN Yuanhao > Cc: Thomas Petazzoni I have applied the patch, with some changes. See below. > diff --git a/package/open-iscsi/Config.in b/package/open-iscsi/Config.in > new file mode 100644 > index 0000000000..04ec120e9a > --- /dev/null > +++ b/package/open-iscsi/Config.in > @@ -0,0 +1,19 @@ > +config BR2_PACKAGE_OPEN_ISCSI > + bool "open-iscsi" > + depends on BR2_USE_MMU # fork() > + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread > + depends on !BR2_STATIC_LIBS # kmod > + select BR2_PACKAGE_OPENSSL > + select BR2_PACKAGE_OPEN_ISNS > + select BR2_PACKAGE_KMOD > + select BR2_PACKAGE_UTIL_LINUX > + select BR2_PACKAGE_UTIL_LINUX_LIBS This BR2_PACKAGE_UTIL_LINUX_LIBS symbol is only for packages that cannot use util-linux because they would otherwise create a circular dependency. This is not the case of open-iscsi, so we can use util-linux directly. > + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT > + help > + iSCSI tools for Linux. > + > + https://www.open-iscsi.com > + > +comment "open-iscsi needs a toolchain w/ threads, dynamic library" > + depends on BR2_USE_MMU > + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS > diff --git a/package/open-iscsi/open-iscsi.hash b/package/open-iscsi/open-iscsi.hash > new file mode 100644 > index 0000000000..9fd651cae8 > --- /dev/null > +++ b/package/open-iscsi/open-iscsi.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2 open-iscsi-2.1.8.tar.gz > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk > new file mode 100644 > index 0000000000..4bbd96f591 > --- /dev/null > +++ b/package/open-iscsi/open-iscsi.mk > @@ -0,0 +1,27 @@ > +################################################################################ > +# > +# open-iscsi > +# > +################################################################################ > + > +OPEN_ISCSI_VERSION = 2.1.8 > +OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) > +OPEN_ISCSI_LICENSE = GPL-2.0+ Actually, there is some GPLv3+ code, see https://github.com/open-iscsi/open-iscsi/issues/379, so I changed this to GPL-2.0+, GPL-3.0+ and added a comment to explain what's going on. > +OPEN_ISCSI_LICENSE_FILES = COPYING > +OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux-libs Changed util-linux-libs to util-linux. And applied! Thanks a lot for your contribution! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Wed Feb 8 15:43:40 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:43:40 +0100 Subject: [Buildroot] [PATCH v2 2/2] support/testing/tests: add NodeJS tests In-Reply-To: <20220925192030.1648496-2-thomas.petazzoni@bootlin.com> References: <20220925192030.1648496-1-thomas.petazzoni@bootlin.com> <20220925192030.1648496-2-thomas.petazzoni@bootlin.com> Message-ID: Hello, Le 25/09/2022 ? 21:20, Thomas Petazzoni a ?crit?: > This commit adds two new test cases: > > - TestNodeJSBasic which builds a target configuration with just > NodeJS enabled, and which runs a very simple NodeJS script on the > target. > > - TestNodeJSModule, which builds a target configuration with NodeJS > enabled + the installation of one extra module, which means npm on > the host (from host-nodejs) is used, and which runs a very simple > NodeJS script on the target that uses this extra module. > > Having both tests separately allows to validate that both nodejs-only > and nodejs+host-nodejs configurations behave correctly, at least in > minimal scenarios. NodeJS takes ages to build Tested-by: Romain Naour Best regards, Romain > > Signed-off-by: Thomas Petazzoni > --- > DEVELOPERS | 3 ++ > .../tests/package/sample_nodejs_basic.js | 3 ++ > .../tests/package/sample_nodejs_module.js | 7 +++ > support/testing/tests/package/test_nodejs.py | 52 +++++++++++++++++++ > 4 files changed, 65 insertions(+) > create mode 100644 support/testing/tests/package/sample_nodejs_basic.js > create mode 100644 support/testing/tests/package/sample_nodejs_module.js > create mode 100644 support/testing/tests/package/test_nodejs.py > > diff --git a/DEVELOPERS b/DEVELOPERS > index 51d025173a..564149de0f 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2927,11 +2927,14 @@ F: package/weston/ > F: support/testing/tests/boot/test_grub.py > F: support/testing/tests/boot/test_grub/ > F: support/testing/tests/boot/test_syslinux.py > +F: support/testing/tests/package/sample_nodejs_basic.js > +F: support/testing/tests/package/sample_nodejs_module.js > F: support/testing/tests/package/sample_python_augeas.py > F: support/testing/tests/package/sample_python_flask.py > F: support/testing/tests/package/sample_python_flask_expects_json.py > F: support/testing/tests/package/sample_python_git.py > F: support/testing/tests/package/sample_python_unittest_xml_reporting.py > +F: support/testing/tests/package/test_nodejs.py > F: support/testing/tests/package/test_python_augeas.py > F: support/testing/tests/package/test_python_flask.py > F: support/testing/tests/package/test_python_flask_expects_json.py > diff --git a/support/testing/tests/package/sample_nodejs_basic.js b/support/testing/tests/package/sample_nodejs_basic.js > new file mode 100644 > index 0000000000..7633173c64 > --- /dev/null > +++ b/support/testing/tests/package/sample_nodejs_basic.js > @@ -0,0 +1,3 @@ > +var assert = require('assert'); > +assert.strictEqual(1, 1); > +console.log("Hello World"); > diff --git a/support/testing/tests/package/sample_nodejs_module.js b/support/testing/tests/package/sample_nodejs_module.js > new file mode 100644 > index 0000000000..57aee73408 > --- /dev/null > +++ b/support/testing/tests/package/sample_nodejs_module.js > @@ -0,0 +1,7 @@ > +var assert = require('assert'); > +var lodash = require('lodash'); > +result = lodash.chunk(['a', 'b', 'c', 'd'], 2); > +expected = [ [ 'a', 'b' ], [ 'c', 'd' ] ]; > +assert.deepStrictEqual(result, expected) > + > + > diff --git a/support/testing/tests/package/test_nodejs.py b/support/testing/tests/package/test_nodejs.py > new file mode 100644 > index 0000000000..9463c76b72 > --- /dev/null > +++ b/support/testing/tests/package/test_nodejs.py > @@ -0,0 +1,52 @@ > +import os > + > +import infra.basetest > + > + > +class TestNodeJSBasic(infra.basetest.BRTest): > + config = \ > + """ > + BR2_arm=y > + BR2_cortex_a9=y > + BR2_ARM_ENABLE_VFP=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_PACKAGE_NODEJS=y > + BR2_TARGET_ROOTFS_CPIO=y > + # BR2_TARGET_ROOTFS_TAR is not set > + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" > + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" > + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), > + infra.filepath("tests/package/sample_nodejs_basic.js")) > + > + def test_run(self): > + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") > + self.emulator.boot(arch="armv7", > + kernel="builtin", > + options=["-initrd", cpio_file]) > + self.emulator.login() > + self.assertRunOk("node sample_nodejs_basic.js") > + > + > +class TestNodeJSModule(infra.basetest.BRTest): > + config = \ > + """ > + BR2_arm=y > + BR2_cortex_a9=y > + BR2_ARM_ENABLE_VFP=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_PACKAGE_NODEJS=y > + BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="lodash" > + BR2_TARGET_ROOTFS_CPIO=y > + # BR2_TARGET_ROOTFS_TAR is not set > + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" > + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" > + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), > + infra.filepath("tests/package/sample_nodejs_module.js")) > + > + def test_run(self): > + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") > + self.emulator.boot(arch="armv7", > + kernel="builtin", > + options=["-initrd", cpio_file]) > + self.emulator.login() > + self.assertRunOk("node sample_nodejs_module.js") From arnout at mind.be Wed Feb 8 15:47:58 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 16:47:58 +0100 Subject: [Buildroot] [PATCH] package/libbpf: Don't remove bpf.h on host In-Reply-To: <12146851.O9o76ZdvQC@pwmachine> References: <12146851.O9o76ZdvQC@pwmachine> Message-ID: <17501a13-8018-656f-5f4d-b1cf6c1ecd5c@mind.be> Hi Daniel, Francis, On 07/02/2023 21:10, Francis Laniel wrote: > Hi. > > Le lundi 28 novembre 2022, 16:06:20 CET Lang Daniel a ?crit : >> libbpf >1.0.0 defines libbpf_bpf_link_type_str(enum bpf_link_type) in >> src/libbpf.h, which is included by host-pahole. >> bpf_link_type is defined in linux/bpf.h, therefore the comment stating >> that pahole doesn't need bpf.h is no longer valid. >> >> Fixes: >> - >> http://autobuild.buildroot.net/results/d126a4b6eca786402dc362c86f8df3addec3 >> d217/ >> >> Signed-off-by: Daniel Lang >> --- >> I wasn't able to reproduce the mentioned compile error in the kernel. >> The mentioned file (tools/lib/bpf/strset.c) shouldn't be compiled when >> compiling the kernel as it would recompile libbpf. >> --- >> package/libbpf/libbpf.mk | 17 +---------------- >> 1 file changed, 1 insertion(+), 16 deletions(-) >> >> diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk >> index 820f1dc4bf..0381fd833a 100644 >> --- a/package/libbpf/libbpf.mk >> +++ b/package/libbpf/libbpf.mk >> @@ -39,26 +39,11 @@ define LIBBPF_INSTALL_TARGET_CMDS >> -C $(@D)/src install DESTDIR=$(TARGET_DIR) >> endef >> >> -# We need to install_uapi_headers so we have btf.h to compile >> -# host-pahole. >> -# Nonetheless, this target adds bpf.h which generates a conflict when >> -# building the kernel: >> -# In file included from libbpf_internal.h:17:0, from strset.c:9: >> -# relo_core.h:10:6: error: nested redefinition of 'enum bpf_core_relo_kind' >> -# enum bpf_core_relo_kind { >> -# ^~~~~~~~~~~~~~~~~~ >> -# relo_core.h:10:6: error: redeclaration of 'enum bpf_core_relo_kind' >> -# In file included from libbpf_legacy.h:13:0, >> -# from libbpf_internal.h:16, >> -# from strset.c:9: >> -# /home/francis/buildroot/output/host/include/linux/bpf.h:6497:6: note: >> originally defined here -# enum bpf_core_relo_kind { >> -# So, better to remove remove it now since we do not need it to build >> +# We need to install_uapi_headers so we have bpf.h and btf.h to compile >> # host-pahole, the only user of host-libbpf. >> define HOST_LIBBPF_INSTALL_CMDS >> $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ >> -C $(@D)/src install install_uapi_headers DESTDIR=$(HOST_DIR) >> - rm $(HOST_DIR)/include/linux/bpf.h >> endef >> >> $(eval $(generic-package)) > > Thank you for this patch and sorry for my very late reply. > Sadly, I do not think the patch addresses the underlying issue. > Indeed, this is not pahole which does not need this file, as pahole relies on > to be built. > So, the whole point of this comment and the rm is to avoid a problem when > building the kernel when pahole was built before. The current solution, however, also doesn't work, which is why Franci's patch [1] is needed to fix it again. However, we believe this is not the proper fix. The real issue is the following: - libbpf installs headers which are possibly incompatible with the kernel's headers. Normally this is not a problem, because you have either the kernel's or libbpf's headers installed, not both. - However, when we install libbpf headers in $(HOST_DIR)/include, the kernel build itself picks up those headers instead of its own internal headers. That is why bpf.h is removed here to begin with. If bpf.h is not removed (and the kernel headers are indeed incompatible with the libbpf ones), then the kernel build will fail. - There is however no reason why the kernel should pick up $(HOST_DIR)/include instead of its own internal headers. Normally it doesn't do that, because it supplies -I options to its own headers, and these have precedence over the system included /usr/include etc. However, we force HOSTCC="$(HOSTCC) $(HOST_CFLAGS)" and HOST_CFLAGS has -I$(HOST_DIR)/include. This one will come before all of the ones that the kernel adds and will have precedence. Therefore, we believe that the solution is to use -isystem instead of -I in the HOSTCC setting of the kernel. This is indeed what is already done for uboot: HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ Note that there is a risk that this by itself goes wrong as well. We tried at some point to use -isystem instead of -I in HOST_CFLAGS: commit 6f8162cf8c1abef7e0a4771fe0d6b26a28f5c2b6 Author: David Raeman Date: Mon Jul 25 21:52:26 2016 package/Makefile.in should grab HOST_DIR headers using -isystem instead of -I. but this was reverted a copule of days later: commit 255b6f80d395ef048f46cfcf75dba690c56af657 Author: Thomas Petazzoni Date: Sat Jul 30 18:10:18 2016 Revert "package/Makefile.in should grab HOST_DIR headers using -isystem instead of -I." (Unfortunately, the commit has no further explanation of what went wrong). So, could you (Daniel and Francis) try to apply this patch and replace -I with -isystem like is done for U-Boot, and do a bunch of kernel builds to see if it breaks anything? For now, I've marked this patch as Changes Requested (it can only be applied if the bpf.h problem is solved in some other way), and marked Francis's patch [1] as Superseded. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220610165441.84812-2-flaniel at linux.microsoft.com/ > > Sadly, I tested your patch and I hit the problem described in the comment > regarding redefinition of bpf_core_relo_kind. > > Did you also hit it or you were able to build the kernel with > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE? > > > Best regards and thank you in advance. > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Wed Feb 8 15:53:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:53:30 +0100 Subject: [Buildroot] outdated libiberty and prelink-cross support In-Reply-To: <3f3d266c-2f21-197c-29b7-fff3e230e97a@smile.fr> References: <3f3d266c-2f21-197c-29b7-fff3e230e97a@smile.fr> Message-ID: <20230208165330.43c145f3@windsurf> Hello, +Yann and Adam, with questions/help needed below :) On Wed, 2 Nov 2022 14:05:26 +0100 Romain Naour wrote: > I was looking at host-binutils-2.38 issue in the autobuilder [1]. > The issue appear only when host-libiberty is built before host-binutils > (Binutils 2.38 only). > > It seems that libiberty package is still based on binutils 2.32 release and > seems to be updated. > > host-libiberty is currently used by host-gdb and host-prelink-cross packages. > > About the prelink-cross package, it come from the Yocto project [2] but the > support seems halted. Also the Glibc project will remove prelink support for the > upcoming 2.37 release [3]. > > The annoying part is "Prelink-cross emulates a runtime linker for a given > sysroot. This is necessary to allow gobject-introspection to build its typelib > files during cross-compiling." [4] > > host-prelink-cross is currently used by dracut and gobject-introspection packages. I had a look, and there are things at two different levels that can be done. First, we need to remove the package/libiberty/ package. libiberty is currently used by host-gdb and host-prelink-cross: * For host-gdb, the commit log says that the host libiberty might be picked up so we need to build our own. This is weird because libiberty is shipped in the gdb tarball. Yann, when you applied f0a583ddc4c2cab121330284e316f54229dee492, do you remember if you looked at why GDB wasn't picking up its own libiberty? Also, there is no autobuilder failure, so we don't really know under what conditions the problem can be reproduced. * For host-prelink-cross, it in fact doesn't need host-libiberty. It links against it, but apparently, the only functions it uses from libiberty are htab_find_slot() and htab_try_create(), and both are provided by src/hashtab.c in prelink-cross, which was copy/pasted from libiberty, most likely to avoid the dependency. So with a bit of effort in host-prelink-cross, the dependency on host-libiberty could be removed. Then, the second level is about host-prelink-cross itself. It is used by only two packages, so let's have a look: * For gobject-instrospection, it is no longer needed: openembedded-core stopped using it in https://github.com/openembedded/openembedded-core/commit/767e0880d4d729e659e859dd99c1cdb084b8ba51. It simply uses "objdump -p" instead. It also allows to remove a patch from gobject-introspection, so overall it seems like a good thing. * For dracut, the usage is pretty much the same, and a small wrapper around objdump -p would most likely be able to emulate the behavior lf prelink-rtld to list the libraries that a binary depends on. So there's a bit of work for sure, but this work would allow to remove both host-libiberty and host-prelink-cross, which are both weird packages that will inevitably cause problems. My main concerns are: (1) How to reproduce the host-gdb issue that caused the addition of the host-liberty dependency (2) How to test gobject-introspection in a simple way. There is no runtime test for it, I have no idea what is the simplest test that one can do to verify the proper functionality of gobject-introspection after we do the above changes. Best regards, Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 15:54:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:54:35 +0100 Subject: [Buildroot] [git commit] boot/afboot-stm32: disable stack-protector Message-ID: <20230208155557.B0DA584714@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c33a133704166d602090b0b0d394aa9428e6acd4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable stack-protector to avoid the following build failure: /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0003-Makefile-disable-stack-protector.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch new file mode 100644 index 0000000000..27a81b45d5 --- /dev/null +++ b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch @@ -0,0 +1,36 @@ +From d65b07d6fe438e760fdbc33a8e42650a27d5b417 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 11:09:38 +0100 +Subject: [PATCH] Makefile: disable stack-protector + +Disable stack-protector to avoid the following build failure: + +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': +stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 8f42be1..8da7a25 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ CFLAGS := -mthumb -mcpu=cortex-m4 + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Os -std=gnu99 -Wall + CFLAGS += -fno-builtin ++CFLAGS += -fno-stack-protector + LINKERFLAGS := --gc-sections + + obj-y += gpio.o mpu.o qspi.o start_kernel.o +-- +2.35.1 + From thomas.petazzoni at bootlin.com Wed Feb 8 15:56:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:56:05 +0100 Subject: [Buildroot] [PATCH 1/1] boot/afboot-stm32: disable stack-protector In-Reply-To: <20221231101451.521367-1-fontaine.fabrice@gmail.com> References: <20221231101451.521367-1-fontaine.fabrice@gmail.com> Message-ID: <20230208165605.73b2b986@windsurf> On Sat, 31 Dec 2022 11:14:51 +0100 Fabrice Fontaine wrote: > Disable stack-protector to avoid the following build failure: > > /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o > /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': > stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' > /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' > /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' > > Fixes: > - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 > > Signed-off-by: Fabrice Fontaine > --- > ...003-Makefile-disable-stack-protector.patch | 36 +++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From frank.vanbever at mind.be Wed Feb 8 15:57:51 2023 From: frank.vanbever at mind.be (Frank Vanbever) Date: Wed, 8 Feb 2023 16:57:51 +0100 Subject: [Buildroot] [PATCH 1/2] package/nginx-modsecurity: bump to version 1.0.3 Message-ID: <20230208155752.73981-1-frank.vanbever@mind.be> Signed-off-by: Frank Vanbever --- package/nginx-modsecurity/nginx-modsecurity.hash | 4 ++-- package/nginx-modsecurity/nginx-modsecurity.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nginx-modsecurity/nginx-modsecurity.hash b/package/nginx-modsecurity/nginx-modsecurity.hash index fbaf1ca239..0cd2ee07cd 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.hash +++ b/package/nginx-modsecurity/nginx-modsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.2/modsecurity-nginx-v1.0.2.tar.gz.sha256 -sha256 41a6660c50508c60df59f8f09c444d18ef8112a4c118cdc791a3992390b78c32 modsecurity-nginx-v1.0.2.tar.gz +# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.3/modsecurity-nginx-v1.0.3.tar.gz.sha256 +sha256 ae811c7208ac029cb7a99d6f63e03d3971797607517187f47620df39c1f78add modsecurity-nginx-v1.0.3.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/nginx-modsecurity/nginx-modsecurity.mk b/package/nginx-modsecurity/nginx-modsecurity.mk index 90ef8ecd51..a00c200469 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.mk +++ b/package/nginx-modsecurity/nginx-modsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_MODSECURITY_VERSION = 1.0.2 +NGINX_MODSECURITY_VERSION = 1.0.3 NGINX_MODSECURITY_SOURCE = modsecurity-nginx-v$(NGINX_MODSECURITY_VERSION).tar.gz NGINX_MODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v$(NGINX_MODSECURITY_VERSION) NGINX_MODSECURITY_LICENSE = Apache-2.0 -- 2.37.2 From thomas.petazzoni at bootlin.com Wed Feb 8 15:57:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:57:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.20.1 In-Reply-To: <20221127002135.12134-1-peter.macleod.thompson@gmail.com> References: <20221127002135.12134-1-peter.macleod.thompson@gmail.com> Message-ID: <20230208165756.5d8dd14f@windsurf> Hello Peter On Sat, 26 Nov 2022 17:21:35 -0700 Peter Thompson wrote: > LICENSE_FILES changed to LICENSE.txt for version 2.20.1. > Previous versions used COPYING.txt. > > Signed-off-by: Peter Thompson > --- > package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- > package/sdl2_ttf/sdl2_ttf.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Sorry for the long delay, but you had already sent this patch on November 19, 2022 and it was applied on November 21, 2022, so it was too late for a new version. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From frank.vanbever at mind.be Wed Feb 8 15:57:52 2023 From: frank.vanbever at mind.be (Frank Vanbever) Date: Wed, 8 Feb 2023 16:57:52 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: update e-mail for Frank Vanbever In-Reply-To: <20230208155752.73981-1-frank.vanbever@mind.be> References: <20230208155752.73981-1-frank.vanbever@mind.be> Message-ID: <20230208155752.73981-2-frank.vanbever@mind.be> Signed-off-by: Frank Vanbever --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0e116e92a3..32c6e54919 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1088,7 +1088,7 @@ F: package/sane-backends/ F: package/upx/ F: package/zxing-cpp/ -N: Frank Vanbever +N: Frank Vanbever F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ -- 2.37.2 From hrsourabh011 at gmail.com Wed Feb 8 16:07:17 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Wed, 8 Feb 2023 17:07:17 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? Message-ID: Hello All, I want to install a sdk on my Buildroot based Linux machine. SDK location https://github.com/aws/aws-iot-device-sdk-python-v2 . They don't have any packages which I can add in Buildroot. On a native Linux machine, it can be done via pip. But how to do this in Buildroot? Thanks in advance -------------- next part -------------- An HTML attachment was scrubbed... URL: From romain.naour at smile.fr Wed Feb 8 16:10:51 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 17:10:51 +0100 Subject: [Buildroot] outdated libiberty and prelink-cross support In-Reply-To: <20230208165330.43c145f3@windsurf> References: <3f3d266c-2f21-197c-29b7-fff3e230e97a@smile.fr> <20230208165330.43c145f3@windsurf> Message-ID: <5d87a68a-3489-2848-a841-8690bd59c5b6@smile.fr> Hello, Le 08/02/2023 ? 16:53, Thomas Petazzoni a ?crit?: > Hello, > > +Yann and Adam, with questions/help needed below :) > > On Wed, 2 Nov 2022 14:05:26 +0100 > Romain Naour wrote: > >> I was looking at host-binutils-2.38 issue in the autobuilder [1]. >> The issue appear only when host-libiberty is built before host-binutils >> (Binutils 2.38 only). >> >> It seems that libiberty package is still based on binutils 2.32 release and >> seems to be updated. >> >> host-libiberty is currently used by host-gdb and host-prelink-cross packages. >> >> About the prelink-cross package, it come from the Yocto project [2] but the >> support seems halted. Also the Glibc project will remove prelink support for the >> upcoming 2.37 release [3]. >> >> The annoying part is "Prelink-cross emulates a runtime linker for a given >> sysroot. This is necessary to allow gobject-introspection to build its typelib >> files during cross-compiling." [4] >> >> host-prelink-cross is currently used by dracut and gobject-introspection packages. > > I had a look, and there are things at two different levels that can be > done. Thanks! > > First, we need to remove the package/libiberty/ package. libiberty is > currently used by host-gdb and host-prelink-cross: > > * For host-gdb, the commit log says that the host libiberty might be > picked up so we need to build our own. This is weird because > libiberty is shipped in the gdb tarball. Yann, when you applied > f0a583ddc4c2cab121330284e316f54229dee492, do you remember if you > looked at why GDB wasn't picking up its own libiberty? Also, there is > no autobuilder failure, so we don't really know under what conditions > the problem can be reproduced. I had a look before writing this email and I was not sure about libiberty dependency. For me gdb build its own version. I wasn't able to prove that it can use libiberty from the host if available. > > * For host-prelink-cross, it in fact doesn't need host-libiberty. It > links against it, but apparently, the only functions it uses from > libiberty are htab_find_slot() and htab_try_create(), and both are > provided by src/hashtab.c in prelink-cross, which was copy/pasted > from libiberty, most likely to avoid the dependency. So with a bit of > effort in host-prelink-cross, the dependency on host-libiberty could > be removed. > > Then, the second level is about host-prelink-cross itself. It is used > by only two packages, so let's have a look: > > * For gobject-instrospection, it is no longer needed: openembedded-core > stopped using it in > https://github.com/openembedded/openembedded-core/commit/767e0880d4d729e659e859dd99c1cdb084b8ba51. > It simply uses "objdump -p" instead. It also allows to remove a patch > from gobject-introspection, so overall it seems like a good thing. > > * For dracut, the usage is pretty much the same, and a small wrapper > around objdump -p would most likely be able to emulate the behavior > lf prelink-rtld to list the libraries that a binary depends on. > > So there's a bit of work for sure, but this work would allow to remove > both host-libiberty and host-prelink-cross, which are both weird > packages that will inevitably cause problems. > > My main concerns are: > > (1) How to reproduce the host-gdb issue that caused the addition of the > host-liberty dependency Looking at distribution packaging, the gdb package use a bundled libiberty library: https://src.fedoraproject.org/rpms/gdb/blob/rawhide/f/gdb.spec#_122 > > (2) How to test gobject-introspection in a simple way. There is no > runtime test for it, I have no idea what is the simplest test that one > can do to verify the proper functionality of gobject-introspection > after we do the above changes. Sorry I don't know. Best regards, Romain > > Best regards, > > Thomas Petazzoni From rcrichlow9000 at gmail.com Wed Feb 8 16:14:56 2023 From: rcrichlow9000 at gmail.com (Ramon Crichlow) Date: Wed, 8 Feb 2023 10:14:56 -0600 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: Message-ID: You can build an external toolchain with buildroot using make sdk (See Section 6.1.3 in buildroot manual ) Also from the manual (Section 11.2) It has been decided that support for the native compiler on the target would be stopped from the Buildroot-2012.11 release because: this feature was neither maintained nor tested, and often broken; this feature was only available for Buildroot toolchains; Buildroot mostly targets small or very small target hardware with limited resource onboard (CPU, ram, mass-storage), for which compiling on the target does not make much sense; Buildroot aims at easing the cross-compilation, making native compilation on the target unnecessary. On Wed, Feb 8, 2023 at 10:07 AM Sourabh Hegde wrote: > Hello All, > > I want to install a sdk on my Buildroot based Linux machine. SDK location > https://github.com/aws/aws-iot-device-sdk-python-v2 . They don't have any > packages which I can add in Buildroot. > > On a native Linux machine, it can be done via pip. But how to do this in > Buildroot? > > Thanks in advance > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Wed Feb 8 16:20:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 17:20:14 +0100 Subject: [Buildroot] [PATCH 0/3] package/dmalloc: cleanups and ssp workaround (branch yem/dmalloc) Message-ID: Hello All! This short series cleans up (a bit) our dmalloc package, and disables SSP altogether to avoid build failures due to limitations in the dmalloc build system. Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (3): package/dmalloc: convert existing patch to git format package/dmalloc: use actual patches rather than sed-ing package/dmalloc: don't use SSP .../dmalloc/0001-configure-fix-build-on-mips.patch | 87 ++++++++++++++++++++++ package/dmalloc/0001-mips.patch | 45 ----------- ...003-configure-allow-overriding-some-tests.patch | 80 ++++++++++++++++++++ ...e-the-configure-detected-or-user-supplied.patch | 50 +++++++++++++ ...onfigure-use-LD-instead-of-hard-coding-ld.patch | 67 +++++++++++++++++ package/dmalloc/dmalloc.mk | 24 +++--- 6 files changed, 296 insertions(+), 57 deletions(-) create mode 100644 package/dmalloc/0001-configure-fix-build-on-mips.patch delete mode 100644 package/dmalloc/0001-mips.patch create mode 100644 package/dmalloc/0003-configure-allow-overriding-some-tests.patch create mode 100644 package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch create mode 100644 package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch -- .-----------------.--------------------.------------------.--------------------. | 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 Feb 8 16:20:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 17:20:15 +0100 Subject: [Buildroot] [PATCH 2/3] package/dmalloc: use actual patches rather than sed-ing In-Reply-To: References: Message-ID: Our dmalloc packaging is very old and carries historical baggage and idiosyncracies that we have long stopped doing in the rest ofthe code base. Drop our post-patch hooks that seds the configure and Makefile.in files, and add patches (that could be upstreamed one day). We provide the results in the environment, like would be done with actual autoconf cache variables (ac_cv_*). Note: those are the result of cleaning up for further patches that did not manifest because it was too complex to add proper SSP support to dmalloc (instead, we're going to forcibly disable it in the following commit). Note-2: those patches have not been submitted upstream, as it's mostly dead: even though there's een some commit activities recently-ish, there has been no review or comments or the many PR pending for many years now. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- ...onfigure-allow-overriding-some-tests.patch | 80 +++++++++++++++++++ ...-configure-detected-or-user-supplied.patch | 50 ++++++++++++ ...ure-use-LD-instead-of-hard-coding-ld.patch | 67 ++++++++++++++++ package/dmalloc/dmalloc.mk | 17 ++-- 4 files changed, 202 insertions(+), 12 deletions(-) create mode 100644 package/dmalloc/0003-configure-allow-overriding-some-tests.patch create mode 100644 package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch create mode 100644 package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch diff --git a/package/dmalloc/0003-configure-allow-overriding-some-tests.patch b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch new file mode 100644 index 0000000000..3003e8cbe4 --- /dev/null +++ b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch @@ -0,0 +1,80 @@ +From 9d57d4353c82110c609f36f91986277343d4ee45 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:26:56 +0100 +Subject: [PATCH] configure: allow overriding some tests + +Some tests use AC_RUN_IFELSE, so they do not work for cross-compilation. + +Allow the user to provide these results from the environment. + +Signed-off-by: Yann E. MORIN +--- + configure | 6 +++--- + configure.ac | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index c18dfb2..d165962 100755 +--- a/configure ++++ b/configure +@@ -4540,7 +4540,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strdup macro" >&5 + $as_echo_n "checking strdup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strdup_macro=no ++ ac_cv_strdup_macro="${ac_cv_strdup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4578,7 +4578,7 @@ $as_echo "$ac_cv_strdup_macro" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strndup macro" >&5 + $as_echo_n "checking strndup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strndup_macro=no ++ ac_cv_strndup_macro="${ac_cv_strndup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4753,7 +4753,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking basic-block size" >&5 + $as_echo_n "checking basic-block size... " >&6; } +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + if test "$cross_compiling" = yes; then : + ac_cv_page_size=0 +diff --git a/configure.ac b/configure.ac +index 9740fdc..51bdf4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -292,7 +292,7 @@ int main() { return 1; } + ]])], + [ac_cv_strdup_macro=yes], + [ac_cv_strdup_macro=no], +-[ac_cv_strdup_macro=no] ++[ac_cv_strdup_macro="${ac_cv_strdup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strdup_macro]) + +@@ -316,7 +316,7 @@ int main() { return 1; } + ]])], + [ac_cv_strndup_macro=yes], + [ac_cv_strndup_macro=no], +-[ac_cv_strndup_macro=no] ++[ac_cv_strndup_macro="${ac_cv_strndup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strndup_macro]) + +@@ -390,7 +390,7 @@ AC_MSG_RESULT([$ac_cv_use_mmap]) + # + AC_CHECK_FUNCS(getpagesize) + AC_MSG_CHECKING([basic-block size]) +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + AC_RUN_IFELSE([AC_LANG_SOURCE([ + #if HAVE_UNISTD_H +-- +2.25.1 + diff --git a/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch new file mode 100644 index 0000000000..394e7ca34e --- /dev/null +++ b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch @@ -0,0 +1,50 @@ +From c958fd5cd7d5ff03c0a023608b53b74997c514b3 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:43:55 +0100 +Subject: [PATCH] Makefile: use the configure-detected or user-supplied ar + program + +Signed-off-by: Yann E. MORIN +--- + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 86d3cca..089ac99 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -303,11 +303,11 @@ $(LIB_SL) : $(LIBRARY) + mv $@.t $@ + + $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH) : $(OBJS) $(THREAD_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_SL) : $(LIB_TH) +@@ -316,7 +316,7 @@ $(LIB_TH_SL) : $(LIB_TH) + mv $@.t $@ + + $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_CXX_SL) : $(LIB_CXX) +@@ -325,7 +325,7 @@ $(LIB_CXX_SL) : $(LIB_CXX) + mv $@.t $@ + + $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) +-- +2.25.1 + diff --git a/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch new file mode 100644 index 0000000000..3ba6ee3dc7 --- /dev/null +++ b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch @@ -0,0 +1,67 @@ +From d77e5f3d45b0cbae850e3a6e23d52edc137be803 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:52:05 +0100 +Subject: [PATCH] configure: use ${LD} instead of hard-coding 'ld' + +When doing cross-compilation, we do not want to use the native tools to +test, but the target tools. + +Note that the weird quoting is inherited from a legacy patch in +Buildroot, which dates back ages (at least 2006), and as it has not been +identified as breaking things, we keep it as-is... Meh... + +Signed-off-by: Yann E. MORIN +--- + configure | 12 ++++++------ + configure.ac | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/configure b/configure +index 810636e..30a7ea3 100755 +--- a/configure ++++ b/configure +@@ -4377,12 +4377,12 @@ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +diff --git a/configure.ac b/configure.ac +index 51bdf4d..0d80a78 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,12 +169,12 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int foo(int val) { return val + 1; } ])],[ + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +-- +2.25.1 + diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 81ac467277..6b90f810b2 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -44,18 +44,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_63261),y) DMALLOC_CFLAGS += -O0 endif -DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)" - -define DMALLOC_POST_PATCH - $(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure - $(SED) 's/ac_cv_strdup_macro=no$$/ac_cv_strdup_macro=yes/' $(@D)/configure - $(SED) 's/ac_cv_strndup_macro=no$$/ac_cv_strndup_macro=yes/' $(@D)/configure - $(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure - $(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure - $(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in -endef - -DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH +DMALLOC_CONF_ENV = \ + CFLAGS="$(DMALLOC_CFLAGS)" \ + ac_cv_page_size=12 \ + ac_cv_strdup_macro=yes \ + ac_cv_strndup_macro=yes # both DESTDIR and PREFIX are ignored.. define DMALLOC_INSTALL_STAGING_CMDS -- 2.25.1 From yann.morin.1998 at free.fr Wed Feb 8 16:20:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 17:20:16 +0100 Subject: [Buildroot] [PATCH 3/3] package/dmalloc: don't use SSP In-Reply-To: References: Message-ID: <6ab1ebdce8bb87f50f68bf1c57ecf988345c2330.1675873210.git.yann.morin.1998@free.fr> dmalloc directly calls into $(LD) to generate a shared library our of the static one. To detet what command it should run, ./configure tries various incantations of ld with various command line options until one does not fail. One of those is (basically): $(LD) --whole-archive -o contest.o.t contest.a This makes ./configure conclude what the command to link a shared library in the Makefile should be, and thus stores that in a variable: shlinkargs='$(LD) --whole-archive -o $@' ... which is then AC_SUBST()ed into Makefile.in with a rule like: $(SHLIB): $(LIBRARY) @shlinkargs@ $(LIRARY) which once substiuted, gives: $(SHLIB): $(LIBRARY) $(LD) --whole-archive -o $@ $(LIRARY) However, when SSP is enabled, the __stack_chk_fail_local and co symbols are provided by additional libraries or object files, and that is the responsibility of gcc to pass those when linking. But as dmalloc directly calls ld, it misses those. Changing dmalloc to use $(CC) is not trivial, however. First, we can't pass LD=$(TARGET_CC), otherwise the whole package explodes [0]: indeed --whole-archive is unknown to gcc, so it must be passed as -Wl,--whole archive instead. So we'd need to add a new test that uses $(CC), like so: $(CC) -Wl,--whole-archive -o contest.o.t contest.a However, in that case, gcc does pass additional libs/objs (like, for eample, the SSP ones) to the linker. But then those are also inc;luded in the whole-archive section. This causes the linker to add all the symbols form those libs/objs, even those not needed for SSP; on some archs, like PPC, that may require floating point symbols (__muldiv3 et al.) which are in another library, and thus the linked can't find them. The proper solution wouild be to add -Wl,--no-whole-archive, but that would have to be added _after_ the library we want to link, i.e.e we should be able to evntually run: $(CC) -Wl,--whole-archive -o $@ $(LIRARY) -Wl,--no-whole-archive That would require that we introduce a new variable that is added _afgter_ the $(LIBRARY), e.g. @shlinkargs_post@ or so... This is a bigger endeavour than we want to pursue... Since dmalloc is a debugging utility, it is not supposed to go into production builds, and during debugging, it would not be surprising that it needs to poke around arrays to debug them. So, we go the easier route: disable SSP altogether. [0] with lots of nce colors, but that's not the point, is it? Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- package/dmalloc/dmalloc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 6b90f810b2..5bd6691725 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -14,6 +14,13 @@ DMALLOC_LICENSE_FILES = LICENSE.txt DMALLOC_INSTALL_STAGING = YES DMALLOC_CFLAGS = $(TARGET_CFLAGS) +# dmalloc uses $(LD) to link, and thus misses the object files or libs that +# are needed to provide the __stack_chk_fail_local and co. symbols. Changing +# to use $(CC) is really more complex that we'd like. Since dmalloc is +# involved in debugging memory allocation, it is not expected to be a +# production library, so we do not care that much that it has SSP. +DMALLOC_CFLAGS += -fno-stack-protector + ifeq ($(BR2_STATIC_LIBS),y) DMALLOC_CONF_OPTS += --disable-shlib else -- 2.25.1 From yann.morin.1998 at free.fr Wed Feb 8 16:20:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 17:20:14 +0100 Subject: [Buildroot] [PATCH 1/3] package/dmalloc: convert existing patch to git format In-Reply-To: References: Message-ID: We're going to add more patches, so let's cleanup our historical baggage... Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- .../0001-configure-fix-build-on-mips.patch | 87 +++++++++++++++++++ package/dmalloc/0001-mips.patch | 45 ---------- 2 files changed, 87 insertions(+), 45 deletions(-) create mode 100644 package/dmalloc/0001-configure-fix-build-on-mips.patch delete mode 100644 package/dmalloc/0001-mips.patch diff --git a/package/dmalloc/0001-configure-fix-build-on-mips.patch b/package/dmalloc/0001-configure-fix-build-on-mips.patch new file mode 100644 index 0000000000..90a6ad7f54 --- /dev/null +++ b/package/dmalloc/0001-configure-fix-build-on-mips.patch @@ -0,0 +1,87 @@ +From af6adb3f5f05be4faa88a5aa83296c388c8085e7 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 12:30:10 +0100 +Subject: [PATCH] configure: fix build on mips + +This patch is a historical baggage that Buildroot has carried for ages +(since 2006), and the reason for it are notentirely clear. + +Since dmalloc is pretty tricky, and as this patch has not been +identified as causing issues, we keep it; we just add the configure.ac +patchlet to match the one in configure. + +As for the title, the original patch was named dmalloc-mips.patch, so +presumably it fixes some mips issue; let's title the commit that way. + +Signed-off-by: Yann E. MORIN +--- + configure | 4 ++-- + configure.ac | 2 +- + return.h | 16 +++------------- + 3 files changed, 6 insertions(+), 16 deletions(-) + +diff --git a/configure b/configure +index d52a1e8..c18dfb2 100755 +--- a/configure ++++ b/configure +@@ -5413,8 +5413,8 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 + $as_echo_n "checking return.h macros work... " >&6; } + if test "$cross_compiling" = yes; then : +- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assume yes (cross-compiling)" >&5 + $as_echo "no" >&6; } + + else +diff --git a/configure.ac b/configure.ac +index a5295f1..9740fdc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -705,7 +705,7 @@ int main() + ])], + [ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([yes]) ], + [ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ], +-[ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ] ++[ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([assume yes (cross-compiling)]) ] + ) + + ############################################################################## +diff --git a/return.h b/return.h +index 9d3f5f1..d916c7a 100644 +--- a/return.h ++++ b/return.h +@@ -117,26 +117,16 @@ + /*************************************/ + + /* +- * For DEC Mips machines running Ultrix ++ * For Mips machines running Linux + */ + #if __mips + +-/* +- * I have no idea how to get inline assembly with the default cc. +- * Anyone know how? +- */ +- +-#if 0 +- + /* + * NOTE: we assume here that file is global. + * +- * $31 is the frame pointer. $2 looks to be the return address but maybe +- * not consistently. ++ * $31 is the return address. + */ +-#define GET_RET_ADDR(file) asm("sw $2, file") +- +-#endif ++#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) + + #endif /* __mips */ + +-- +2.25.1 + diff --git a/package/dmalloc/0001-mips.patch b/package/dmalloc/0001-mips.patch deleted file mode 100644 index 3150d030ec..0000000000 --- a/package/dmalloc/0001-mips.patch +++ /dev/null @@ -1,45 +0,0 @@ -[Fabrice: Updated for 5.6.5] -Signed-off-by: Fabrice Fontaine ---- a/configure -+++ b/configure -@@ -7107,7 +7107,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 - $as_echo_n "checking return.h macros work... " >&6; } - if test "$cross_compiling" = yes; then : -- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h -+ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - ---- a/return.h -+++ b/return.h -@@ -106,26 +106,16 @@ - /*************************************/ - - /* -- * For DEC Mips machines running Ultrix -+ * For Mips machines running Linux - */ - #if __mips - - /* -- * I have no idea how to get inline assembly with the default cc. -- * Anyone know how? -- */ -- --#if 0 -- --/* - * NOTE: we assume here that file is global. - * -- * $31 is the frame pointer. $2 looks to be the return address but maybe -- * not consistently. -+ * $31 is the return address. - */ --#define GET_RET_ADDR(file) asm("sw $2, file") -- --#endif -+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) - - #endif /* __mips */ - -- 2.25.1 From ps.report at gmx.net Wed Feb 8 16:25:34 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 8 Feb 2023 17:25:34 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: security bump to version 1.1.1t Message-ID: <20230208162534.28581-1-ps.report@gmx.net> Changelog (for details see [1] and [2]): Changes between 1.1.1s and 1.1.1t [7 Feb 2023] *) Fixed X.400 address type confusion in X.509 GeneralName. There is a type confusion vulnerability relating to X.400 address processing inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This vulnerability may allow an attacker who can provide a certificate chain and CRL (neither of which need have a valid signature) to pass arbitrary pointers to a memcmp call, creating a possible read primitive, subject to some constraints. Refer to the advisory for more information. Thanks to David Benjamin for discovering this issue. (CVE-2023-0286) This issue has been fixed by changing the public header file definition of GENERAL_NAME so that x400Address reflects the implementation. It was not possible for any existing application to successfully use the existing definition; however, if any application references the x400Address field (e.g. in dead code), note that the type of this field has changed. There is no ABI change. [Hugo Landau] *) Fixed Use-after-free following BIO_new_NDEF. The public API function BIO_new_NDEF is a helper function used for streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL to support the SMIME, CMS and PKCS7 streaming capabilities, but may also be called directly by end user applications. The function receives a BIO from the caller, prepends a new BIO_f_asn1 filter BIO onto the front of it to form a BIO chain, and then returns the new head of the BIO chain to the caller. Under certain conditions, for example if a CMS recipient public key is invalid, the new filter BIO is freed and the function returns a NULL result indicating a failure. However, in this case, the BIO chain is not properly cleaned up and the BIO passed by the caller still retains internal pointers to the previously freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO then a use-after-free will occur. This will most likely result in a crash. (CVE-2023-0215) [Viktor Dukhovni, Matt Caswell] *) Fixed Double free after calling PEM_read_bio_ex. The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload data. If the function succeeds then the "name_out", "header" and "data" arguments are populated with pointers to buffers containing the relevant decoded data. The caller is responsible for freeing those buffers. It is possible to construct a PEM file that results in 0 bytes of payload data. In this case PEM_read_bio_ex() will return a failure code but will populate the header argument with a pointer to a buffer that has already been freed. If the caller also frees this buffer then a double free will occur. This will most likely lead to a crash. The functions PEM_read_bio() and PEM_read() are simple wrappers around PEM_read_bio_ex() and therefore these functions are also directly affected. These functions are also called indirectly by a number of other OpenSSL functions including PEM_X509_INFO_read_bio_ex() and SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL internal uses of these functions are not vulnerable because the caller does not free the header argument if PEM_read_bio_ex() returns a failure code. (CVE-2022-4450) [Kurt Roeckx, Matt Caswell] *) Fixed Timing Oracle in RSA Decryption. A timing based side channel exists in the OpenSSL RSA Decryption implementation which could be sufficient to recover a plaintext across a network in a Bleichenbacher style attack. To achieve a successful decryption an attacker would have to be able to send a very large number of trial messages for decryption. The vulnerability affects all RSA padding modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. (CVE-2022-4304) [Dmitry Belyavsky, Hubert Kario] Changes between 1.1.1r and 1.1.1s [1 Nov 2022] *) Fixed a regression introduced in 1.1.1r version not refreshing the certificate data to be signed before signing the certificate. [Gibeom Gwon] Changes between 1.1.1q and 1.1.1r [11 Oct 2022] *) Fixed the linux-mips64 Configure target which was missing the SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that platform. [Adam Joseph] *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was causing incorrect results in some cases as a result. [Paul Dale] *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to report correct results in some cases [Matt Caswell] *) Fixed a regression introduced in 1.1.1o for re-signing certificates with different key sizes [Todd Short] *) Added the loongarch64 target [Shi Pujin] *) Fixed a DRBG seed propagation thread safety issue [Bernd Edlinger] *) Fixed a memory leak in tls13_generate_secret [Bernd Edlinger] *) Fixed reported performance degradation on aarch64. Restored the implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid 32-bit lane assignment in CTR mode") for 64bit targets only, since it is reportedly 2-17% slower and the silicon errata only affects 32bit targets. The new algorithm is still used for 32 bit targets. [Bernd Edlinger] *) Added a missing header for memcmp that caused compilation failure on some platforms [Gregor Jasny] [1] https://www.openssl.org/news/cl111.txt [2] https://www.openssl.org/news/vulnerabilities.html 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 8457df6c0a..ebc56b11dd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1q.tar.gz.sha256 -sha256 d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca openssl-1.1.1q.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 +sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index fc22c20467..6e84f06175 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1q +LIBOPENSSL_VERSION = 1.1.1t LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay -- 2.39.1 From ps.report at gmx.net Wed Feb 8 16:27:26 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 8 Feb 2023 17:27:26 +0100 Subject: [Buildroot] [PATCH v1] package/qt6base: additional disable FEATURE_avx512vbmi2 and FEATURE_vaes Message-ID: <20230208162726.28775-1-ps.report@gmx.net> - additional disable new FEATURE_avx512vbmi2/FEATURE_vaes (added with upstream commit [1]) [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=38e6b637b71fae274caedc1d326f641b904e00a4 Signed-off-by: Peter Seiderer --- package/qt6/qt6base/qt6base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 212b2d689e..e6cf4f14bb 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -72,7 +72,9 @@ QT6BASE_CONF_OPTS += \ -DFEATURE_avx512ifma=OFF \ -DFEATURE_avx512pf=OFF \ -DFEATURE_avx512vbmi=OFF \ - -DFEATURE_avx512vl=OFF + -DFEATURE_avx512vbmi2=OFF \ + -DFEATURE_avx512vl=OFF \ + -DFEATURE_vaes=OFF define QT6BASE_BUILD_CMDS $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6BASE_BUILDDIR) -- 2.39.1 From yann.morin.1998 at free.fr Wed Feb 8 16:28:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 17:28:19 +0100 Subject: [Buildroot] [PATCH 2/2] package/dmalloc: disable stack-protector In-Reply-To: <20220612203729.GM427639@scaer> References: <20220610210541.3643416-1-fontaine.fabrice@gmail.com> <20220610210541.3643416-2-fontaine.fabrice@gmail.com> <20220612203729.GM427639@scaer> Message-ID: <20230208162819.GA3386@scaer> Fabrice, All, On 2022-06-12 22:37 +0200, Yann E. MORIN spake thusly: > On 2022-06-10 23:05 +0200, Fabrice Fontaine spake thusly: > > Fix the following build failure with stack-protector: > > /home/autobuild/autobuild/instance-1/output-1/per-package/dmalloc/host/bin/i686-buildroot-linux-gnu-ld -shared --whole-archive -soname libdmallocth.so -o libdmallocth.so.t libdmallocth.a > > /home/autobuild/autobuild/instance-1/output-1/per-package/dmalloc/host/bin/i686-buildroot-linux-gnu-ld: libdmallocth.a(append.o): in function `append_long': > > append.c:(.text+0x115): undefined reference to `__stack_chk_fail_local' [--SNIP--] > > +DMALLOC_CFLAGS = $(TARGET_CFLAGS) -fno-stack-protector > > At the risk of more goofiness, but the reference build issue had me > notice that dmalloc uses ld to do the link phase, while it should really > call gcc. [--SNIP--] > So, thisis a bit of a bigger change, but I otherwise fdo not think that > disabling SSP is a good idea, especially for a library that deals with > allocating memory... So, I eventually took the day to look at this during the dev-days. I've sent an updated series now: https://patchwork.ozlabs.org/project/buildroot/list/?series=340858 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 rcrichlow9000 at gmail.com Wed Feb 8 16:30:53 2023 From: rcrichlow9000 at gmail.com (Ramon Crichlow) Date: Wed, 8 Feb 2023 10:30:53 -0600 Subject: [Buildroot] stm32mp1 kernel won't boot on custom board In-Reply-To: <1349e0d6ec9b6276a76371b29260432890ad680e.camel@dopsi.ch> References: <1349e0d6ec9b6276a76371b29260432890ad680e.camel@dopsi.ch> Message-ID: The cd-gpios property of sdmmc at 58005000 was different in the custom board dts and the dk1 dts. Modifying the dk1 uboot dts and the kernel dts (stm32mp15xx-dkx.dtsi) allowed me to boot the custom board with the latest kernel. The kernel wasn't getting the card detect signal so wasn't able to mount the sd card. Regards, Ramon On Mon, Jan 30, 2023 at 8:54 AM Simon Doppler wrote: > Hello Ramon, > > On Sat, 2023-01-28 at 14:52 -0600, Ra C wrote: > > I have a custom stm32mp157a board which runs OK with a modified 5.4 > kernel. > > I want to migrate to the latest stm supported kernel. > > I built a stm32mp157a_dk1 target using the BR2_EXTERNAL feature > described here: > > https://github.com/bootlin/buildroot-external-st which builds a 5.15 > kernel. > > > > Using the same dtb , the 5.15 kernel fails to mount the root device (a > micro sd card on SDMMC1) > > and gets stuck in a loop looking for a device matching the PARTUUID > in class_find_device(). The > > only devices listed are loop and ram. > > > > The probe function in drivers/mmc/host/mmci.c, which gets called in the > working kernel prior to > > mounting the root device does not get called with the 5.15 kernel. > > > > I don't understand why this is happening given that the same device tree > is used in both cases and > > not sure where next to look. > > Since the DTB is the same, are all the required drivers present (not as > modules)? I didn't check > which drivers exactly are built in with the configs ST provides. I would > especially check for the > CONFIG_MMC* values and whether the required filesystem support is built in. > > Best, > > Simon > -------------- next part -------------- An HTML attachment was scrubbed... URL: From arnout at mind.be Wed Feb 8 16:36:41 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 17:36:41 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: revert bpf_cookie patch to allow building In-Reply-To: <29d2a8c7-44cd-da42-5fed-f17ec0f8ccf2@synopsys.com> References: <97ea44bb-58fe-d6cb-6c79-9be0b245f2c6@synopsys.com> <29d2a8c7-44cd-da42-5fed-f17ec0f8ccf2@synopsys.com> Message-ID: Hi Shahab, On 15/06/2022 12:57, Shahab Vahedi wrote: > Building bpftool on Debian 11 (bullseye) with kernel v5.10 fails: > > -----------------------------------8<----------------------------------- > $ make > . > . > . > CLANG pid_iter.bpf.o > skeleton/pid_iter.bpf.c:47:14: error: incomplete definition of type > 'struct bpf_perf_link' > perf_link = container_of(link, struct bpf_perf_link, link); > . > . > . > skeleton/pid_iter.bpf.c:49:30: error: no member named 'bpf_cookie' in > 'struct perf_event' > return BPF_CORE_READ(event, bpf_cookie); > . > . > . > 10 errors generated. > make: *** [Makefile:176: pid_iter.bpf.o] Error 1 > ----------------------------------->8----------------------------------- > > To be clearer about the setup, there is a clang (11) installed on this > system. bpftool's build process enables "co-re" feature (Compile-Once, > Run-Everywhere) if the clang compiler is new enough to support > BTF_KIND_VAR [1]. When that happens, bpftool will bootstrap itself: > build/bootstrap/libbpf.a. This bootstrap part is about those *.bpf.c > programs and are only built by invoking clang [2], irrespective of the > compiler used to build the rest of the bpftool. To sum it up, to > reproduce the issue, all you need is having the "co-re" feature > enabled and a kernel that does not provide all the data structures > expected. > > There are changes in bpftool v6.8.0 that assumes the existence of > particular data structures in generated vmlinux.h that is obtained > from the host machine. See [3] for further details. This commit adds > a patch to revert that additional change in v6.8.0. > > There's a patch series pending to be submitted upstream [4]. Hopefully, > those will take care of the problem if they land in the next release. Unfortunately, bpftool has been bumped two times since then and it looks like those patches are still not included... > > [1] Checking for the clang support > https://github.com/libbpf/bpftool/blob/d4469819d1d639ae2354f3d2ddd10377f081a576/src/Makefile.feature#L12 > > [2] Using clang to bootstrap > https://github.com/libbpf/bpftool/blob/d4469819d1d639ae2354f3d2ddd10377f081a576/src/Makefile#L175 > > [3] Question about the problem > https://lore.kernel.org/bpf/c47f732d-dba8-2c13-7c72-3a651bf72353 at synopsys.com/t/#u > > [4] Pending patch series > https://lore.kernel.org/bpf/20220421003152.339542-1-alobakin at pm.me/ It's not clear to me why you did a revert of the cookie feature rather than using those patches. I think the first two or three should be sufficient to fix your issue? For the time being, I marked this as Changes Requested. If the upstream patches are not sufficient, please send a mail upstream (as a reply to that series) explaining the problem (again), and re-send this patch to Buildroot. If it does fix things, please send a mail upstream to ask to move the series forward (explaining the issue you have), and send a patch to Buildroot that adds the needed patches. Thanks! Regards, Arnout > > Signed-off-by: Shahab Vahedi > --- > > Changelog: > v1: Initial submission > v2: Use a full fledged git patch for bpftool > v3: Fix the snafu that resulted in malformed patch file > v4: Reword the commit message to make it clearer > > .../0002-revert-bpf_cookie-change.patch | 129 ++++++++++++++++++ > 1 file changed, 129 insertions(+) > create mode 100644 package/bpftool/0002-revert-bpf_cookie-change.patch > > diff --git a/package/bpftool/0002-revert-bpf_cookie-change.patch b/package/bpftool/0002-revert-bpf_cookie-change.patch > new file mode 100644 > index 0000000000..6f9579bd23 > --- /dev/null > +++ b/package/bpftool/0002-revert-bpf_cookie-change.patch > @@ -0,0 +1,129 @@ > +From d7c78d1e38cde73c85b491a833f0e6e3f0d62654 Mon Sep 17 00:00:00 2001 > +From: Shahab Vahedi > +Date: Tue, 14 Jun 2022 10:12:21 +0200 > +Subject: [PATCH] Revert commit "bpftool: Add bpf_cookie to link output" > + > +Building bpftool on a Debian bullseye with clang-11 fails [1]. > +This patch reverts the offending commit [2]. If clang-11 is not > +installed, then the "co-re" feature of bpf will not be enabled > +and the issue remains dormant. > + > +[1] Building release 6.8.0 on Debian 11 > +https://lore.kernel.org/bpf/c47f732d-dba8-2c13-7c72-3a651bf72353 at synopsys.com/t/#u > + > +[2] bpftool: Add bpf_cookie to link output > +https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/commit/?id=cbdaf71f > + > +Signed-off-by: Shahab Vahedi > +--- > + src/main.h | 2 -- > + src/pids.c | 8 -------- > + src/skeleton/pid_iter.bpf.c | 22 ---------------------- > + src/skeleton/pid_iter.h | 2 -- > + 4 files changed, 34 deletions(-) > + > +diff --git a/src/main.h b/src/main.h > +index aa99ffa..2f2b638 100644 > +--- a/src/main.h > ++++ b/src/main.h > +@@ -111,9 +111,7 @@ struct obj_ref { > + > + struct obj_refs { > + int ref_cnt; > +- bool has_bpf_cookie; > + struct obj_ref *refs; > +- __u64 bpf_cookie; > + }; > + > + struct btf; > +diff --git a/src/pids.c b/src/pids.c > +index e2d00d3..57f0d1b 100644 > +--- a/src/pids.c > ++++ b/src/pids.c > +@@ -78,8 +78,6 @@ static void add_ref(struct hashmap *map, struct pid_iter_entry *e) > + ref->pid = e->pid; > + memcpy(ref->comm, e->comm, sizeof(ref->comm)); > + refs->ref_cnt = 1; > +- refs->has_bpf_cookie = e->has_bpf_cookie; > +- refs->bpf_cookie = e->bpf_cookie; > + > + err = hashmap__append(map, u32_as_hash_field(e->id), refs); > + if (err) > +@@ -206,9 +204,6 @@ void emit_obj_refs_json(struct hashmap *map, __u32 id, > + if (refs->ref_cnt == 0) > + break; > + > +- if (refs->has_bpf_cookie) > +- jsonw_lluint_field(json_writer, "bpf_cookie", refs->bpf_cookie); > +- > + jsonw_name(json_writer, "pids"); > + jsonw_start_array(json_writer); > + for (i = 0; i < refs->ref_cnt; i++) { > +@@ -238,9 +233,6 @@ void emit_obj_refs_plain(struct hashmap *map, __u32 id, const char *prefix) > + if (refs->ref_cnt == 0) > + break; > + > +- if (refs->has_bpf_cookie) > +- printf("\n\tbpf_cookie %llu", (unsigned long long) refs->bpf_cookie); > +- > + printf("%s", prefix); > + for (i = 0; i < refs->ref_cnt; i++) { > + struct obj_ref *ref = &refs->refs[i]; > +diff --git a/src/skeleton/pid_iter.bpf.c b/src/skeleton/pid_iter.bpf.c > +index eb05ea5..f70702f 100644 > +--- a/src/skeleton/pid_iter.bpf.c > ++++ b/src/skeleton/pid_iter.bpf.c > +@@ -38,17 +38,6 @@ static __always_inline __u32 get_obj_id(void *ent, enum bpf_obj_type type) > + } > + } > + > +-/* could be used only with BPF_LINK_TYPE_PERF_EVENT links */ > +-static __u64 get_bpf_cookie(struct bpf_link *link) > +-{ > +- struct bpf_perf_link *perf_link; > +- struct perf_event *event; > +- > +- perf_link = container_of(link, struct bpf_perf_link, link); > +- event = BPF_CORE_READ(perf_link, perf_file, private_data); > +- return BPF_CORE_READ(event, bpf_cookie); > +-} > +- > + SEC("iter/task_file") > + int iter(struct bpf_iter__task_file *ctx) > + { > +@@ -80,19 +69,8 @@ int iter(struct bpf_iter__task_file *ctx) > + if (file->f_op != fops) > + return 0; > + > +- __builtin_memset(&e, 0, sizeof(e)); > + e.pid = task->tgid; > + e.id = get_obj_id(file->private_data, obj_type); > +- > +- if (obj_type == BPF_OBJ_LINK) { > +- struct bpf_link *link = (struct bpf_link *) file->private_data; > +- > +- if (BPF_CORE_READ(link, type) == BPF_LINK_TYPE_PERF_EVENT) { > +- e.has_bpf_cookie = true; > +- e.bpf_cookie = get_bpf_cookie(link); > +- } > +- } > +- > + bpf_probe_read_kernel_str(&e.comm, sizeof(e.comm), > + task->group_leader->comm); > + bpf_seq_write(ctx->meta->seq, &e, sizeof(e)); > +diff --git a/src/skeleton/pid_iter.h b/src/skeleton/pid_iter.h > +index bbb570d..5692cf2 100644 > +--- a/src/skeleton/pid_iter.h > ++++ b/src/skeleton/pid_iter.h > +@@ -6,8 +6,6 @@ > + struct pid_iter_entry { > + __u32 id; > + int pid; > +- __u64 bpf_cookie; > +- bool has_bpf_cookie; > + char comm[16]; > + }; > + > +-- > +2.30.2 > + From thomas.petazzoni at bootlin.com Wed Feb 8 16:41:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:41:33 +0100 Subject: [Buildroot] [git commit] package/qt6base: additional disable FEATURE_avx512vbmi2 and FEATURE_vaes Message-ID: <20230208164146.0224A8139E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ff07d3e60d23816a958aae413d4dc7e2dd17003 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - additional disable new FEATURE_avx512vbmi2/FEATURE_vaes (added with upstream commit [1]) [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=38e6b637b71fae274caedc1d326f641b904e00a4 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 212b2d689e..e6cf4f14bb 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -72,7 +72,9 @@ QT6BASE_CONF_OPTS += \ -DFEATURE_avx512ifma=OFF \ -DFEATURE_avx512pf=OFF \ -DFEATURE_avx512vbmi=OFF \ - -DFEATURE_avx512vl=OFF + -DFEATURE_avx512vbmi2=OFF \ + -DFEATURE_avx512vl=OFF \ + -DFEATURE_vaes=OFF define QT6BASE_BUILD_CMDS $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6BASE_BUILDDIR) From thomas.petazzoni at bootlin.com Wed Feb 8 16:41:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:41:47 +0100 Subject: [Buildroot] [PATCH v1] package/qt6base: additional disable FEATURE_avx512vbmi2 and FEATURE_vaes In-Reply-To: <20230208162726.28775-1-ps.report@gmx.net> References: <20230208162726.28775-1-ps.report@gmx.net> Message-ID: <20230208174147.04b62979@windsurf> On Wed, 8 Feb 2023 17:27:26 +0100 Peter Seiderer wrote: > - additional disable new FEATURE_avx512vbmi2/FEATURE_vaes (added with > upstream commit [1]) > > [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=38e6b637b71fae274caedc1d326f641b904e00a4 > > Signed-off-by: Peter Seiderer > --- > package/qt6/qt6base/qt6base.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 16:42:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:42:32 +0100 Subject: [Buildroot] [git commit] package/libopenssl: security bump to version 1.1.1t Message-ID: <20230208164252.5683C84758@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=040896bd4338f7ca419766578db49af154b762c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog (for details see [1] and [2]): Changes between 1.1.1s and 1.1.1t [7 Feb 2023] *) Fixed X.400 address type confusion in X.509 GeneralName. There is a type confusion vulnerability relating to X.400 address processing inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This vulnerability may allow an attacker who can provide a certificate chain and CRL (neither of which need have a valid signature) to pass arbitrary pointers to a memcmp call, creating a possible read primitive, subject to some constraints. Refer to the advisory for more information. Thanks to David Benjamin for discovering this issue. (CVE-2023-0286) This issue has been fixed by changing the public header file definition of GENERAL_NAME so that x400Address reflects the implementation. It was not possible for any existing application to successfully use the existing definition; however, if any application references the x400Address field (e.g. in dead code), note that the type of this field has changed. There is no ABI change. [Hugo Landau] *) Fixed Use-after-free following BIO_new_NDEF. The public API function BIO_new_NDEF is a helper function used for streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL to support the SMIME, CMS and PKCS7 streaming capabilities, but may also be called directly by end user applications. The function receives a BIO from the caller, prepends a new BIO_f_asn1 filter BIO onto the front of it to form a BIO chain, and then returns the new head of the BIO chain to the caller. Under certain conditions, for example if a CMS recipient public key is invalid, the new filter BIO is freed and the function returns a NULL result indicating a failure. However, in this case, the BIO chain is not properly cleaned up and the BIO passed by the caller still retains internal pointers to the previously freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO then a use-after-free will occur. This will most likely result in a crash. (CVE-2023-0215) [Viktor Dukhovni, Matt Caswell] *) Fixed Double free after calling PEM_read_bio_ex. The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload data. If the function succeeds then the "name_out", "header" and "data" arguments are populated with pointers to buffers containing the relevant decoded data. The caller is responsible for freeing those buffers. It is possible to construct a PEM file that results in 0 bytes of payload data. In this case PEM_read_bio_ex() will return a failure code but will populate the header argument with a pointer to a buffer that has already been freed. If the caller also frees this buffer then a double free will occur. This will most likely lead to a crash. The functions PEM_read_bio() and PEM_read() are simple wrappers around PEM_read_bio_ex() and therefore these functions are also directly affected. These functions are also called indirectly by a number of other OpenSSL functions including PEM_X509_INFO_read_bio_ex() and SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL internal uses of these functions are not vulnerable because the caller does not free the header argument if PEM_read_bio_ex() returns a failure code. (CVE-2022-4450) [Kurt Roeckx, Matt Caswell] *) Fixed Timing Oracle in RSA Decryption. A timing based side channel exists in the OpenSSL RSA Decryption implementation which could be sufficient to recover a plaintext across a network in a Bleichenbacher style attack. To achieve a successful decryption an attacker would have to be able to send a very large number of trial messages for decryption. The vulnerability affects all RSA padding modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. (CVE-2022-4304) [Dmitry Belyavsky, Hubert Kario] Changes between 1.1.1r and 1.1.1s [1 Nov 2022] *) Fixed a regression introduced in 1.1.1r version not refreshing the certificate data to be signed before signing the certificate. [Gibeom Gwon] Changes between 1.1.1q and 1.1.1r [11 Oct 2022] *) Fixed the linux-mips64 Configure target which was missing the SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that platform. [Adam Joseph] *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was causing incorrect results in some cases as a result. [Paul Dale] *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to report correct results in some cases [Matt Caswell] *) Fixed a regression introduced in 1.1.1o for re-signing certificates with different key sizes [Todd Short] *) Added the loongarch64 target [Shi Pujin] *) Fixed a DRBG seed propagation thread safety issue [Bernd Edlinger] *) Fixed a memory leak in tls13_generate_secret [Bernd Edlinger] *) Fixed reported performance degradation on aarch64. Restored the implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid 32-bit lane assignment in CTR mode") for 64bit targets only, since it is reportedly 2-17% slower and the silicon errata only affects 32bit targets. The new algorithm is still used for 32 bit targets. [Bernd Edlinger] *) Added a missing header for memcmp that caused compilation failure on some platforms [Gregor Jasny] [1] https://www.openssl.org/news/cl111.txt [2] https://www.openssl.org/news/vulnerabilities.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- 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 8457df6c0a..ebc56b11dd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1q.tar.gz.sha256 -sha256 d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca openssl-1.1.1q.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 +sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index fc22c20467..6e84f06175 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1q +LIBOPENSSL_VERSION = 1.1.1t LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From thomas.petazzoni at bootlin.com Wed Feb 8 16:43:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:43:05 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: security bump to version 1.1.1t In-Reply-To: <20230208162534.28581-1-ps.report@gmx.net> References: <20230208162534.28581-1-ps.report@gmx.net> Message-ID: <20230208174305.1af25bae@windsurf> On Wed, 8 Feb 2023 17:25:34 +0100 Peter Seiderer wrote: > Changelog (for details see [1] and [2]): > > Changes between 1.1.1s and 1.1.1t [7 Feb 2023] > > *) Fixed X.400 address type confusion in X.509 GeneralName. > > There is a type confusion vulnerability relating to X.400 address processing > inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING > but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This > vulnerability may allow an attacker who can provide a certificate chain and > CRL (neither of which need have a valid signature) to pass arbitrary > pointers to a memcmp call, creating a possible read primitive, subject to > some constraints. Refer to the advisory for more information. Thanks to > David Benjamin for discovering this issue. (CVE-2023-0286) > > This issue has been fixed by changing the public header file definition of > GENERAL_NAME so that x400Address reflects the implementation. It was not > possible for any existing application to successfully use the existing > definition; however, if any application references the x400Address field > (e.g. in dead code), note that the type of this field has changed. There is > no ABI change. > [Hugo Landau] > > *) Fixed Use-after-free following BIO_new_NDEF. > > The public API function BIO_new_NDEF is a helper function used for > streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL > to support the SMIME, CMS and PKCS7 streaming capabilities, but may also > be called directly by end user applications. > > The function receives a BIO from the caller, prepends a new BIO_f_asn1 > filter BIO onto the front of it to form a BIO chain, and then returns > the new head of the BIO chain to the caller. Under certain conditions, > for example if a CMS recipient public key is invalid, the new filter BIO > is freed and the function returns a NULL result indicating a failure. > However, in this case, the BIO chain is not properly cleaned up and the > BIO passed by the caller still retains internal pointers to the previously > freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO > then a use-after-free will occur. This will most likely result in a crash. > (CVE-2023-0215) > [Viktor Dukhovni, Matt Caswell] > > *) Fixed Double free after calling PEM_read_bio_ex. > > The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and > decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload > data. If the function succeeds then the "name_out", "header" and "data" > arguments are populated with pointers to buffers containing the relevant > decoded data. The caller is responsible for freeing those buffers. It is > possible to construct a PEM file that results in 0 bytes of payload data. > In this case PEM_read_bio_ex() will return a failure code but will populate > the header argument with a pointer to a buffer that has already been freed. > If the caller also frees this buffer then a double free will occur. This > will most likely lead to a crash. > > The functions PEM_read_bio() and PEM_read() are simple wrappers around > PEM_read_bio_ex() and therefore these functions are also directly affected. > > These functions are also called indirectly by a number of other OpenSSL > functions including PEM_X509_INFO_read_bio_ex() and > SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL > internal uses of these functions are not vulnerable because the caller does > not free the header argument if PEM_read_bio_ex() returns a failure code. > (CVE-2022-4450) > [Kurt Roeckx, Matt Caswell] > > *) Fixed Timing Oracle in RSA Decryption. > > A timing based side channel exists in the OpenSSL RSA Decryption > implementation which could be sufficient to recover a plaintext across > a network in a Bleichenbacher style attack. To achieve a successful > decryption an attacker would have to be able to send a very large number > of trial messages for decryption. The vulnerability affects all RSA padding > modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. > (CVE-2022-4304) > [Dmitry Belyavsky, Hubert Kario] > > Changes between 1.1.1r and 1.1.1s [1 Nov 2022] > > *) Fixed a regression introduced in 1.1.1r version not refreshing the > certificate data to be signed before signing the certificate. > [Gibeom Gwon] > > Changes between 1.1.1q and 1.1.1r [11 Oct 2022] > > *) Fixed the linux-mips64 Configure target which was missing the > SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that > platform. > [Adam Joseph] > > *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was > causing incorrect results in some cases as a result. > [Paul Dale] > > *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to > report correct results in some cases > [Matt Caswell] > > *) Fixed a regression introduced in 1.1.1o for re-signing certificates with > different key sizes > [Todd Short] > > *) Added the loongarch64 target > [Shi Pujin] > > *) Fixed a DRBG seed propagation thread safety issue > [Bernd Edlinger] > > *) Fixed a memory leak in tls13_generate_secret > [Bernd Edlinger] > > *) Fixed reported performance degradation on aarch64. Restored the > implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid > 32-bit lane assignment in CTR mode") for 64bit targets only, since it is > reportedly 2-17% slower and the silicon errata only affects 32bit targets. > The new algorithm is still used for 32 bit targets. > [Bernd Edlinger] > > *) Added a missing header for memcmp that caused compilation failure on some > platforms > [Gregor Jasny] > > [1] https://www.openssl.org/news/cl111.txt > [2] https://www.openssl.org/news/vulnerabilities.html > > Signed-off-by: Peter Seiderer > --- > package/libopenssl/libopenssl.hash | 4 ++-- > package/libopenssl/libopenssl.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 Wed Feb 8 16:44:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:44:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/nginx-modsecurity: bump to version 1.0.3 In-Reply-To: <20230208155752.73981-1-frank.vanbever@mind.be> References: <20230208155752.73981-1-frank.vanbever@mind.be> Message-ID: <20230208174419.3374a888@windsurf> On Wed, 8 Feb 2023 16:57:51 +0100 Frank Vanbever wrote: > Signed-off-by: Frank Vanbever > --- > package/nginx-modsecurity/nginx-modsecurity.hash | 4 ++-- > package/nginx-modsecurity/nginx-modsecurity.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Series of two patches applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 16:43:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:43:26 +0100 Subject: [Buildroot] [git commit] package/nginx-modsecurity: bump to version 1.0.3 Message-ID: <20230208164447.962B584777@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41671deec7b00de10dcc372cdeee4400df1d76ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni --- package/nginx-modsecurity/nginx-modsecurity.hash | 4 ++-- package/nginx-modsecurity/nginx-modsecurity.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nginx-modsecurity/nginx-modsecurity.hash b/package/nginx-modsecurity/nginx-modsecurity.hash index fbaf1ca239..0cd2ee07cd 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.hash +++ b/package/nginx-modsecurity/nginx-modsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.2/modsecurity-nginx-v1.0.2.tar.gz.sha256 -sha256 41a6660c50508c60df59f8f09c444d18ef8112a4c118cdc791a3992390b78c32 modsecurity-nginx-v1.0.2.tar.gz +# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.3/modsecurity-nginx-v1.0.3.tar.gz.sha256 +sha256 ae811c7208ac029cb7a99d6f63e03d3971797607517187f47620df39c1f78add modsecurity-nginx-v1.0.3.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/nginx-modsecurity/nginx-modsecurity.mk b/package/nginx-modsecurity/nginx-modsecurity.mk index 90ef8ecd51..a00c200469 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.mk +++ b/package/nginx-modsecurity/nginx-modsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_MODSECURITY_VERSION = 1.0.2 +NGINX_MODSECURITY_VERSION = 1.0.3 NGINX_MODSECURITY_SOURCE = modsecurity-nginx-v$(NGINX_MODSECURITY_VERSION).tar.gz NGINX_MODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v$(NGINX_MODSECURITY_VERSION) NGINX_MODSECURITY_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Wed Feb 8 16:43:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:43:31 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: update e-mail for Frank Vanbever Message-ID: <20230208164447.A0B178477B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=416213be39c6adb860a9d3e85f0a634139c27cac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0e116e92a3..32c6e54919 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1088,7 +1088,7 @@ F: package/sane-backends/ F: package/upx/ F: package/zxing-cpp/ -N: Frank Vanbever +N: Frank Vanbever F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ From james.hilliard1 at gmail.com Wed Feb 8 16:46:19 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 8 Feb 2023 09:46:19 -0700 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: <20230208161527.31a28b3b@windsurf> References: <20220607231211.533086-1-james.hilliard1@gmail.com> <20230208161527.31a28b3b@windsurf> Message-ID: On Wed, Feb 8, 2023 at 8:15 AM Thomas Petazzoni wrote: > > On Tue, 7 Jun 2022 17:12:11 -0600 > James Hilliard wrote: > > > In some cases it only makes sense to run tests against a specific > > branch, such as when testing new genrandconfig flags. > > > > Add a config option to override the branch selection. > > > > Signed-off-by: James Hilliard > > --- > > scripts/autobuild-run | 11 ++++++++++- > > 1 file changed, 10 insertions(+), 1 deletion(-) > > We looked at this with Arnout, and we don't really see what this would > be needed, and actually it could be annoying to have people test > "random" branches. If you need extensions to genrandconfig, then the > autobuild-run script should be backward compatible with older versions > of genrandconfig to be able to support older branches for a certain > while. There are a number of other reasons this is useful, for example some build hosts(for example my asahi-linux build host) have compatibility issues in older branches so it doesn't make sense to run autobuilders on anything other than say master. To prevent testing of unwanted branches I could modify this to restrict the branch override to only allow selecting the branches listed in: http://autobuild.buildroot.org/branches > > Thanks! > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From james.hilliard1 at gmail.com Wed Feb 8 17:30:58 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 8 Feb 2023 10:30:58 -0700 Subject: [Buildroot] [buildroot-test 1/1] scripts/autobuild-run: migrate to asyncio subprocess calls Message-ID: <20230208173058.2118889-1-james.hilliard1@gmail.com> Since python2 is no longer supported we can migrate to asyncio for subprocess handling. This allows us to replace most multiprocessing and threading with asyncio tasks. Also cleanup some unused functions/python2 compatibility shims. Signed-off-by: James Hilliard --- scripts/autobuild-run | 379 +++++++++++++++++++++--------------------- 1 file changed, 191 insertions(+), 188 deletions(-) diff --git a/scripts/autobuild-run b/scripts/autobuild-run index 4987c61..4bed6fc 100755 --- a/scripts/autobuild-run +++ b/scripts/autobuild-run @@ -52,8 +52,6 @@ # message 'directory not empty' which suggests that someone is writing to the # directory at the time of removal. -from __future__ import print_function - epilog = """ Format of the configuration file: @@ -71,55 +69,33 @@ Format of the configuration file: no-toolchains-csv """ +import asyncio import contextlib import csv import argparse -import errno import hashlib +from importlib.machinery import SourceFileLoader +from importlib.util import module_from_spec, spec_from_loader +import inspect import mmap -import multiprocessing import os import pathlib from random import randint import re import shutil import signal -import subprocess import stat import sys -from time import localtime, strftime, sleep -from distutils.version import StrictVersion -import platform -from threading import Thread, Event +from time import localtime, strftime import datetime - -if sys.hexversion >= 0x3000000: - import configparser - import urllib.request as _urllib - import urllib.parse as urlparse - from urllib.error import URLError -else: - import ConfigParser as configparser - import urllib2 as _urllib - import urlparse - from urllib2 import URLError +import configparser +import urllib.request as _urllib +import urllib.parse as urlparse +from urllib.error import URLError urlopen = _urllib.urlopen urlopen_closing = lambda uri: contextlib.closing(urlopen(uri)) -if sys.hexversion >= 0x3000000: - def decode_bytes(b): - return b.decode() - - def encode_str(s): - return s.encode() -else: - def _identity(e): - return e - - decode_bytes = _identity - encode_str = _identity - # A number of packages can take > 60mins of build time (e.g # gst-ffmpeg, qt5webkit, mimic) HUNG_BUILD_TIMEOUT = 120 # mins @@ -161,7 +137,7 @@ class SystemInfo: # -- return None - def has(self, prog): + async def has(self, prog): """Checks whether a program is available. Lazily evaluates missing entries. @@ -176,15 +152,19 @@ class SystemInfo: have_it = self.find_prog(prog) # java[c] needs special care if have_it and prog in ('java', 'javac'): - with open(os.devnull, "w") as devnull: - if subprocess.call("%s -version | grep gcj" % prog, shell=True, - stdout=devnull, stderr=devnull) != 1: - have_it = False + proc = await asyncio.create_subprocess_shell( + "%s -version | grep gcj" % prog, + stdout=asyncio.subprocess.DEVNULL, + stderr=asyncio.subprocess.DEVNULL + ) + ret = await proc.wait() + if ret != 1: + have_it = False # -- self.progs[prog] = have_it return have_it - def check_requirements(self): + async def check_requirements(self): """Checks program dependencies. Returns: True if all mandatory programs are present, else False. @@ -193,14 +173,14 @@ class SystemInfo: missing_requirements = False for prog in self.needed_progs: - if not do_check_has_prog(prog): + if not await do_check_has_prog(prog): print("ERROR: your system lacks the '%s' program" % prog) missing_requirements = True # check optional programs here, # else they'd get checked by each worker instance for prog in self.optional_progs: - do_check_has_prog(prog) + await do_check_has_prog(prog) return not missing_requirements @@ -208,7 +188,7 @@ class Builder: def __init__(self, instance, njobs, sysinfo, http_url, http_login, http_password, submitter, make_opts, nice, toolchains_csv, - repo, upload, buildpid, debug): + repo, upload, debug): self.instance = instance self.njobs = njobs self.sysinfo = sysinfo @@ -221,7 +201,6 @@ class Builder: self.toolchains_csv = toolchains_csv self.repo = repo self.upload = upload - self.buildpid = buildpid self.debug = debug self.build_parallel = False @@ -250,10 +229,10 @@ class Builder: def check_version(self): with urlopen_closing(urlparse.urljoin(self.http_url, 'version')) as r: - version = int(decode_bytes(r.readline()).strip()) + version = int(r.readline().decode().strip()) if version > VERSION: - print("ERROR: script version too old, please upgrade.") - sys.exit(1) + return False + return True def get_branch(self): """Returns the branch that should be built. It fetches a CSV file from @@ -267,14 +246,14 @@ class Builder: csv_branches = [] with urlopen_closing(urlparse.urljoin(self.http_url, 'branches')) as r: for l in r.readlines(): - csv_branches.append(decode_bytes(l)) + csv_branches.append(l.decode()) branches = [] for branch in csv.reader(csv_branches): branches += [branch[0]] * int(branch[1]) return branches[randint(0, len(branches) - 1)] - def prepare_build(self): + async def prepare_build(self): """Prepare for the next build of the specified instance This function prepares the build by making sure all the needed @@ -314,26 +293,35 @@ class Builder: os.path.relpath(f, self.dldir)) os.remove(f) - branch = self.get_branch() + loop = asyncio.get_event_loop() + branch = await loop.run_in_executor(None, self.get_branch) log_write(self.log, "INFO: testing branch '%s'" % branch) # Clone Buildroot. This only happens if the source directory # didn't exist already. if not os.path.exists(self.srcdir): - ret = subprocess.call(["git", "clone", self.repo, self.srcdir], - stdout=self.log, stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "git", "clone", self.repo, self.srcdir, + stdout=self.log, stderr=self.log) + ret = await proc.wait() if ret != 0: log_write(self.log, "ERROR: could not clone Buildroot sources") return -1 # Update the Buildroot sources. abssrcdir = os.path.abspath(self.srcdir) - ret = subprocess.call(["git", "fetch", "-t", self.repo, branch], cwd=abssrcdir, stdout=self.log, stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "git", "fetch", "-t", self.repo, branch, + cwd=abssrcdir, stdout=self.log, stderr=self.log) + ret = await proc.wait() if ret != 0: log_write(self.log, "ERROR: could not fetch Buildroot sources") return -1 - ret = subprocess.call(["git", "checkout", "FETCH_HEAD"], cwd=abssrcdir, stdout=self.log, stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "git", "checkout", "-f", "FETCH_HEAD", + cwd=abssrcdir, stdout=self.log, stderr=self.log) + ret = await proc.wait() if ret != 0: log_write(self.log, "ERROR: could not check out Buildroot sources") return -1 @@ -351,18 +339,21 @@ class Builder: return 0 - def gen_config(self): + def load_gen_config(self, genrandconfig): + spec = spec_from_loader("genrandconfig", SourceFileLoader("genrandconfig", genrandconfig)) + mod = module_from_spec(spec) + spec.loader.exec_module(mod) + return mod.gen_config + + async def gen_config(self): """Generate a new random configuration.""" log_write(self.log, "INFO: generate the configuration") - if self.debug: - devnull = self.log - else: - devnull = open(os.devnull, "w") - - args = [os.path.join(self.srcdir, "utils/genrandconfig"), - "-o", self.outputdir, "-b", self.srcdir] + args = { + 'outputdir': os.path.abspath(self.outputdir), + 'buildrootdir': os.path.abspath(self.srcdir), + } with open(os.path.join(self.outputdir, "branch"), "r") as branchf: branch = branchf.read().strip() @@ -371,32 +362,40 @@ class Builder: if toolchains_csv: if not os.path.isabs(toolchains_csv): toolchains_csv = os.path.join(self.srcdir, toolchains_csv) - args.extend(["--toolchains-csv", toolchains_csv]) - elif branch != "2022.02.x": - args.extend(["--no-toolchains-csv"]) + args['toolchains_csv'] = toolchains_csv + elif branch == "2022.02.x": + toolchains_csv = os.path.join( + self.srcdir, + 'support/config-fragments/autobuild/toolchain-configs.csv' + ) + args['toolchains_csv'] = toolchains_csv + else: + args['toolchains_csv'] = False + + gen_config = self.load_gen_config(os.path.join(self.srcdir, "utils/genrandconfig")) + + if inspect.iscoroutinefunction(gen_config): + ret = await gen_config(argparse.Namespace(**args)) + else: + loop = asyncio.get_event_loop() + ret = await loop.run_in_executor(None, gen_config, argparse.Namespace(**args)) - ret = subprocess.call(args, stdout=devnull, stderr=self.log) return ret - def stop_on_build_hang(self, monitor_thread_hung_build_flag, - monitor_thread_stop_flag, sub_proc, - outputdir): + async def stop_on_build_hang(self, sub_proc, outputdir): build_time_logfile = os.path.join(outputdir, "build/build-time.log") while True: - if monitor_thread_stop_flag.is_set(): - return if os.path.exists(build_time_logfile): mtime = datetime.datetime.fromtimestamp(os.stat(build_time_logfile).st_mtime) if mtime < datetime.datetime.now() - datetime.timedelta(minutes=HUNG_BUILD_TIMEOUT): - if sub_proc.poll() is None: - monitor_thread_hung_build_flag.set() # Used by do_build() to determine build hang + if sub_proc.returncode is None: log_write(self.log, "INFO: build hung") sub_proc.kill() break - monitor_thread_stop_flag.wait(30) + await asyncio.sleep(30) - def check_reproducibility(self): + async def check_reproducibility(self): """Check reproducibility of builds Use diffoscope on the built images, if diffoscope is not @@ -412,18 +411,32 @@ class Builder: with open(reproducible_results, 'w') as diff: if self.sysinfo.has("diffoscope"): # Prefix to point diffoscope towards cross-tools - prefix = subprocess.check_output(["make", "--no-print-directory", "O=%s" % self.outputdir, - "-C", self.srcdir, "printvars", "VARS=TARGET_CROSS"]) + proc = await asyncio.create_subprocess_exec( + "make", "--no-print-directory", "O=%s" % self.outputdir, + "-C", self.srcdir, "printvars", "VARS=TARGET_CROSS", + stdout=asyncio.subprocess.PIPE) + prefix, _ = await proc.communicate() + if proc.returncode: + return -1 # Remove TARGET_CROSS= and \n from the string prefix = prefix[13:-1] log_write(self.log, "INFO: running diffoscope on images") - subprocess.call(["diffoscope", build_1_image, build_2_image, - "--tool-prefix-binutils", prefix, "--json", reproducible_results, - "--text", reproducible_results_txt, "--max-text-report-size", "40000"], - stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "diffoscope", build_1_image, build_2_image, + "--tool-prefix-binutils", prefix, + "--json", reproducible_results, + "--text", reproducible_results_txt, + "--max-text-report-size", "40000", + stderr=self.log + ) + await proc.wait() else: log_write(self.log, "INFO: diffoscope not installed, falling back to cmp") - subprocess.call(["cmp", "-b", build_1_image, build_2_image], stdout=diff, stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "cmp", "-b", build_1_image, build_2_image, + stdout=diff, stderr=self.log + ) + await proc.wait() if os.stat(reproducible_results).st_size > 0: log_write(self.log, "INFO: Build is non-reproducible.") @@ -433,11 +446,11 @@ class Builder: log_write(self.log, "INFO: Build is reproducible!") return 0 - def do_build(self, outputdir): + async def do_build(self, outputdir): """Run the build itself""" f = open(os.path.join(outputdir, "logfile"), "w+") - log_write(self.log, "INFO: build started") + log_write(self.log, "INFO: %d build started" % self.instance) cmd = ["nice", "-n", str(self.nice), "make", "O=%s" % outputdir, @@ -451,30 +464,22 @@ class Builder: if self.build_parallel: cmd.append("-j%s" % self.njobs) - sub = subprocess.Popen(cmd, stdout=f, stderr=f) + sub = await asyncio.create_subprocess_exec(*cmd, stdout=f, stderr=f) - # Setup hung build monitoring thread - monitor_thread_hung_build_flag = Event() - monitor_thread_stop_flag = Event() - build_monitor = Thread(target=self.stop_on_build_hang, - args=(monitor_thread_hung_build_flag, - monitor_thread_stop_flag, - sub, outputdir)) - build_monitor.daemon = True - build_monitor.start() + # Setup hung build monitoring task + build_monitor = asyncio.create_task( + self.stop_on_build_hang(sub, outputdir)) - self.buildpid[self.instance] = sub.pid - ret = sub.wait() - self.buildpid[self.instance] = 0 + ret = await sub.wait() - # If build failed, monitor thread would have exited at this point - if monitor_thread_hung_build_flag.is_set(): + # If build failed, monitor task would have exited at this point + if build_monitor.done(): log_write(self.log, "INFO: build timed out [%d]" % ret) return -2 else: - # Stop monitor thread as this build didn't timeout - monitor_thread_stop_flag.set() - # Monitor thread should be exiting around this point + # Stop monitor task as this build didn't timeout + build_monitor.cancel() + # Monitor task should be exiting around this point if ret != 0: log_write(self.log, "INFO: build failed [%d]" % ret) @@ -483,14 +488,15 @@ class Builder: cmd = ["make", "O=%s" % outputdir, "-C", self.srcdir, "BR2_DL_DIR=%s" % self.dldir, "legal-info"] \ + self.make_opts.split() - ret = subprocess.call(cmd, stdout=f, stderr=f) + proc = await asyncio.create_subprocess_exec(*cmd, stdout=f, stderr=f) + ret = await proc.wait() if ret != 0: log_write(self.log, "INFO: build failed during legal-info") return -1 log_write(self.log, "INFO: build successful") return 0 - def do_reproducible_build(self): + async def do_reproducible_build(self): """Run the builds for reproducibility testing Build twice with the same configuration. Calls do_build() to @@ -499,7 +505,7 @@ class Builder: # Start the first build log_write(self.log, "INFO: Reproducible Build Test, starting build 1") - ret = self.do_build(self.outputdir) + ret = await self.do_build(self.outputdir) if ret != 0: log_write(self.log, "INFO: build 1 failed, skipping build 2") return ret @@ -514,16 +520,16 @@ class Builder: # Start the second build log_write(self.log, "INFO: Reproducible Build Test, starting build 2") - ret = self.do_build(self.outputdir_2) + ret = await self.do_build(self.outputdir_2) if ret != 0: log_write(self.log, "INFO: build 2 failed") return ret # Assuming both have built successfully - ret = self.check_reproducibility() + ret = await self.check_reproducibility() return ret - def send_results(self, result): + async def send_results(self, result): """Prepare and store/send tarball with results This function prepares the tarball with the results, and either @@ -549,15 +555,19 @@ class Builder: copy_if_exists("build", "packages-file-list-staging.txt") copy_if_exists("legal-info", "manifest.csv", "licenses-manifest.csv") - subprocess.call(["git log -n 1 --pretty=format:%%H > %s" % \ - os.path.join(self.resultdir, "gitid")], - shell=True, cwd=self.srcdir) + proc = await asyncio.create_subprocess_shell( + "git log -n 1 --pretty=format:%%H > %s" % + os.path.join(self.resultdir, "gitid"), + cwd=self.srcdir) + await proc.wait() # Return True if the result should be rejected, False otherwise - def reject_results(): - lastlines = decode_bytes(subprocess.Popen( - ["tail", "-n", "3", os.path.join(self.outputdir, "logfile")], - stdout=subprocess.PIPE).communicate()[0]).splitlines() + async def reject_results(): + proc = await asyncio.create_subprocess_exec( + "tail", "-n", "3", os.path.join(self.outputdir, "logfile"), + stdout=asyncio.subprocess.PIPE) + stdout, _ = await proc.communicate() + lastlines = stdout.decode().splitlines() # Reject results where qemu-user refused to build regexp = re.compile(r'^package/qemu/qemu.mk:.*Refusing to build qemu-user') @@ -567,14 +577,16 @@ class Builder: return False - if reject_results(): + if await reject_results(): return - def get_failure_reason(): + async def get_failure_reason(): # Output is a tuple (package, version), or None. - lastlines = decode_bytes(subprocess.Popen( - ["tail", "-n", "3", os.path.join(self.outputdir, "logfile")], - stdout=subprocess.PIPE).communicate()[0]).splitlines() + proc = await asyncio.create_subprocess_exec( + "tail", "-n", "3", os.path.join(self.outputdir, "logfile"), + stdout=asyncio.subprocess.PIPE) + stdout, _ = await proc.communicate() + lastlines = stdout.decode().splitlines() regexp = re.compile(r'make: \*\*\* .*/(?:build|toolchain)/([^/]*)/') for line in lastlines: @@ -585,38 +597,39 @@ class Builder: # not found return None - reason = get_failure_reason() + reason = await get_failure_reason() if reason: with open(os.path.join(self.resultdir, "reason"), "w+") as reasonf: reasonf.write("-".join(reason)) - def extract_end_log(resultfile): + async def extract_end_log(resultfile): """Save the last part of the build log, starting from the failed package""" - def extract_last_500_lines(): - subprocess.call(["tail -500 %s > %s" % \ - (os.path.join(self.outputdir, "logfile"), resultfile)], - shell=True) + async def extract_last_500_lines(): + proc = await asyncio.create_subprocess_shell( + "tail -500 %s > %s" % + (os.path.join(self.outputdir, "logfile"), resultfile)) + await proc.wait() if not reason: - extract_last_500_lines() + await extract_last_500_lines() else: f = open(os.path.join(self.outputdir, "logfile"), 'r') mf = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ) mf.seek(0) # Search for first action on the failed package - offset = mf.find(encode_str('>>> %s' % ' '.join(reason))) + offset = mf.find('>>> %s' % ' '.join(reason).encode()) if offset != -1: with open(resultfile, "w") as endlog: - endlog.write(decode_bytes(mf[offset:])) + endlog.write(mf[offset:].decode()) else: # not found, use last 500 lines as fallback - extract_last_500_lines() + await extract_last_500_lines() mf.close() f.close() - extract_end_log(os.path.join(self.resultdir, "build-end.log")) + await extract_end_log(os.path.join(self.resultdir, "build-end.log")) def copy_config_log_files(): """Recursively copy any config.log files from the failing package""" @@ -671,8 +684,11 @@ class Builder: # Yes, shutil.make_archive() would be nice, but it doesn't exist # in Python 2.6. - ret = subprocess.call(["tar", "cjf", "results.tar.bz2", "results"], - cwd=self.outputdir, stdout=self.log, stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "tar", "cjf", "results.tar.bz2", "results", + cwd=self.outputdir, stdout=self.log, stderr=self.log + ) + ret = await proc.wait() if ret != 0: log_write(self.log, "ERROR: could not make results tarball") sys.exit(1) @@ -681,13 +697,14 @@ class Builder: # Submit results. Yes, Python has some HTTP libraries, but # none of the ones that are part of the standard library can # upload a file without writing dozens of lines of code. - ret = subprocess.call(["curl", "-u", - "%s:%s" % (self.http_login, self.http_password), - "-H", "Expect:", - "-F", "uploadedfile=@%s" % os.path.join(self.outputdir, "results.tar.bz2"), - "-F", "uploadsubmit=1", - urlparse.urljoin(self.http_url, 'submit/')], - stdout=self.log, stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "curl", "-u", "%s:%s" % (self.http_login, self.http_password), + "-H", "Expect:", + "-F", "uploadedfile=@%s" % os.path.join(self.outputdir, "results.tar.bz2"), + "-F", "uploadsubmit=1", + urlparse.urljoin(self.http_url, 'submit/'), + stdout=self.log, stderr=self.log) + ret = await proc.wait() if ret != 0: log_write(self.log, "INFO: results could not be submitted, %d" % ret) else: @@ -704,16 +721,20 @@ class Builder: log_write(self.log, "INFO: results saved as %s" % resultfilename) - def run_one_build(self): - self.check_version() + async def run_one_build(self): + loop = asyncio.get_event_loop() + ret = await loop.run_in_executor(None, self.check_version) + if not ret: + print("ERROR: script version too old, please upgrade.") + sys.exit(1) - ret = self.prepare_build() + ret = await self.prepare_build() if ret != 0: return os.mkdir(self.resultdir) - ret = self.gen_config() + ret = await self.gen_config() if ret != 0: log_write(self.log, "WARN: failed to generate configuration") return @@ -727,13 +748,13 @@ class Builder: self.build_parallel = per_package and randint(0, 1) == 0 if reproducible: - ret = self.do_reproducible_build() + ret = await self.do_reproducible_build() else: - ret = self.do_build(self.outputdir) + ret = await self.do_build(self.outputdir) - self.send_results(ret) + await self.send_results(ret) - def run_instance(self): + async def run_instance(self): """Main per-instance loop Prepare the build, generate a configuration, run the build, and submit the @@ -744,9 +765,9 @@ class Builder: while True: try: - self.run_one_build() - except URLError as e: - sleep(30) + await self.run_one_build() + except URLError: + await asyncio.sleep(30) class Formatter(argparse.ArgumentDefaultsHelpFormatter, argparse.RawDescriptionHelpFormatter): pass @@ -763,7 +784,7 @@ class LoadConfigFile(argparse.Action): value = False setattr(namespace, key, value) -def main(): +async def main(): # Avoid locale settings of autobuilder machine leaking in, for example # showing error messages in another language. @@ -843,7 +864,7 @@ def main(): print("WARN: due to the lack of http login/password details, results will not be submitted") print("WARN: tarballs of results will be kept locally only") - if not sysinfo.check_requirements(): + if not await sysinfo.check_requirements(): sys.exit(1) # Enforce the sanest umask here, to avoid buildroot doing it on its @@ -851,35 +872,7 @@ def main(): # in case of failures. os.umask(0o022) - def sigterm_handler(signum, frame): - """Kill all children""" - - # uninstall signal handler to prevent being called for all subprocesses - signal.signal(signal.SIGINT, signal.SIG_IGN) - signal.signal(signal.SIGTERM, signal.SIG_DFL) - - # stop all instances to prevent new children to be spawned - for p in processes: - p.terminate() - - # kill build processes started with timeout (that puts its children - # explicitly in a separate process group) - for pid in buildpid: - if pid == 0: - continue - try: - os.kill(pid, signal.SIGTERM) - except OSError as e: - if e.errno != errno.ESRCH: # No such process, ignore - raise - - # kill any remaining children in our process group - os.killpg(os.getpgid(os.getpid()), signal.SIGTERM) - - sys.exit(1) - - buildpid = multiprocessing.Array('i', int(args.ninstances)) - processes = [] + tasks = [] for i in range(0, int(args.ninstances)): builder = Builder( instance = i, @@ -894,17 +887,27 @@ def main(): toolchains_csv = args.toolchains_csv, repo = args.repo, upload = upload, - buildpid = buildpid, debug = args.debug) - p = multiprocessing.Process(target=builder.run_instance) - p.start() - processes.append(p) + t = asyncio.create_task(builder.run_instance()) + tasks.append(t) + + buildtasks = asyncio.gather(*tasks, return_exceptions=False) + + def sigterm_handler(signum, frame): + """Kill all children""" + buildtasks.cancel() signal.signal(signal.SIGINT, sigterm_handler) signal.signal(signal.SIGTERM, sigterm_handler) - for p in processes: - p.join() + try: + await buildtasks + except asyncio.CancelledError: + pass if __name__ == '__main__': - main() + if sys.version_info < (3, 7): + loop = asyncio.get_event_loop() + loop.run_until_complete(main()) + else: + asyncio.run(main()) -- 2.34.1 From ps.report at gmx.net Wed Feb 8 17:43:23 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 8 Feb 2023 18:43:23 +0100 Subject: [Buildroot] [PATCH 1/1] board/raspberrypi4: bump kernel version to 5.15.68 In-Reply-To: <20230208144639.764af681@windsurf> References: <20220926051956.3272067-1-buildroot@athaariq.my.id> <20230208144639.764af681@windsurf> Message-ID: <20230208184323.34219f84@gmx.net> On Wed, 8 Feb 2023 14:46:39 +0100, Thomas Petazzoni via buildroot wrote: > Hello Athaariq, > > On Mon, 26 Sep 2022 05:20:15 +0000 (UTC) > Athaariq Ardhiansyah wrote: > > > First of all, kernel support for Raspberry Pi is way too old relative to stable version. Second, we actually have several bug fixes regarding the kernel including HDMI hotplug and more problems on graphic stacks. However, I only have Raspberry Pi 4B so I cannot test the changes for other Raspberry Pi models. For anyone who has those boards, please help us to bump and test the kernel. > > > > Signed-off-by: Athaariq Ardhiansyah > > Thanks for your patch. It would indeed be nice to update our > RaspberryPi defconfigs, but there are a number of questions which need > to be answered before we can apply your patch. > > First of all, a small detail: your commit log must be wrapped at ~80 > columns. Also, it shouldn't use 1st person sentence "I only have". > > > diff --git a/board/raspberrypi/linux.fragment b/board/raspberrypi/linux.fragment > > new file mode 100644 > > index 0000000000..798b2e91da > > --- /dev/null > > +++ b/board/raspberrypi/linux.fragment > > @@ -0,0 +1,7 @@ > > +# Dynamic CPU Clock > > +CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=n > > +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > > + > > +# Fix Kernel Module won't Load > > +CONFIG_MODULE_COMPRESS_XZ=n > > +CONFIG_MODULE_COMPRESS_NONE=y > > Why is this Linux kernel configuration fragment needed? There is no > explanation in your commit log. Changing the default CPU governor > should not be needed, and the second chunk about kernel module > compression is a bit strange and deserves some explanation. > Upstream defconfigs changed to CONFIG_MODULE_COMPRESS_XZ (see [1] and [2]), alternative would be to enable the following in the buildroot raspberry*_defconfigs: BR2_PACKAGE_BUSYBOX_SHOW_OTHERS BR2_PACKAGE_XZ BR2_PACKAGE_KMOD BR2_PACKAGE_KMOD_TOOLS BR2_PACKAGE_HOST_KMOD_XZ Regards, Peter > > diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig > > index 5942f7c4e1..6d90a8f004 100644 > > --- a/configs/raspberrypi4_64_defconfig > > +++ b/configs/raspberrypi4_64_defconfig > > @@ -6,13 +6,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > > > BR2_SYSTEM_DHCP="eth0" > > > > -# Linux headers same as kernel, a 5.10 series > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > +# Linux headers same as kernel, a 5.15 series > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,155b736f0ff883415d374ba743473f5ef146814b)/linux-155b736f0ff883415d374ba743473f5ef146814b.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi4-64/linux.fragment" > > > > # Build the DTB from the kernel sources > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > @@ -23,6 +24,9 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > BR2_PACKAGE_RPI_FIRMWARE=y > > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > > BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4-64/config_4_64bit.txt" > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y > > Why is this being added? > > > # Required tools to create the SD image > > BR2_PACKAGE_HOST_DOSFSTOOLS=y > > diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig > > index 4e5580c140..f0947c329c 100644 > > --- a/configs/raspberrypi4_defconfig > > +++ b/configs/raspberrypi4_defconfig > > @@ -6,13 +6,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > > > BR2_SYSTEM_DHCP="eth0" > > > > -# Linux headers same as kernel, a 5.10 series > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > +# Linux headers same as kernel, a 5.15 series > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,155b736f0ff883415d374ba743473f5ef146814b)/linux-155b736f0ff883415d374ba743473f5ef146814b.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi4/linux.fragment" > > > > # Build the DTB from the kernel sources > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > @@ -23,6 +24,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > BR2_PACKAGE_RPI_FIRMWARE=y > > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > > BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4/config_4.txt" > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y > > +BR2_PACKAGE_RPI_USERLAND=y > > Why is rpi-userland being added here, and not to the other defconfig above? > > Also, you're updating rpi-firmware, rpi-userland and RaspberryPi > defconfigs in the same commit. Is this because they need to be updated > in sync? If that's the case, is there a potential problem if we update > rpi-firmware/rpi-userland, but not the defconfigs for RaspberryPi 1/2/3 ? > > Thanks a lot for your feedback! > > Thomas From fontaine.fabrice at gmail.com Wed Feb 8 17:44:31 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 8 Feb 2023 18:44:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/open-iscsi: add OPEN_ISCSI_CPE_ID_VENDOR Message-ID: <20230208174431.85800-1-fontaine.fabrice@gmail.com> cpe:2.3:a:open-iscsi_project:open-iscsi is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen-iscsi_project%3Aopen-iscsi Signed-off-by: Fabrice Fontaine --- package/open-iscsi/open-iscsi.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk index 249253c64f..e5b965b80d 100644 --- a/package/open-iscsi/open-iscsi.mk +++ b/package/open-iscsi/open-iscsi.mk @@ -10,6 +10,7 @@ OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) # well. See https://github.com/open-iscsi/open-iscsi/issues/379 OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ OPEN_ISCSI_LICENSE_FILES = COPYING +OPEN_ISCSI_CPE_ID_VENDOR = open-iscsi_project OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 8 17:50:08 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 8 Feb 2023 18:50:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsolv: add LIBSOLV_CPE_ID_VENDOR Message-ID: <20230208175008.88846-1-fontaine.fabrice@gmail.com> cpe:2.3:a:opensuse:libsolv is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopensuse%3Alibsolv Signed-off-by: Fabrice Fontaine --- package/libsolv/libsolv.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 144ce68a83..29f8a6a3d2 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -8,6 +8,7 @@ LIBSOLV_VERSION = 0.7.22 LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) LIBSOLV_LICENSE = BSD-3-Clause LIBSOLV_LICENSE_FILES = LICENSE.BSD +LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON -- 2.39.0 From hrsourabh011 at gmail.com Wed Feb 8 18:19:20 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Wed, 8 Feb 2023 19:19:20 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: Message-ID: Hello Ramon, I don't want an external toolchain. Maybe I was not clear. My goal is to use the program/sdk from here https://github.com/aws/aws-iot-device-sdk-python-v2 , this is a python based project. And no package is available for this. Can I use python-pip to install it? On Wed, 8 Feb 2023 at 17:15, Ramon Crichlow wrote: > You can build an external toolchain with buildroot using make sdk (See > Section 6.1.3 in buildroot manual > ) > > Also from the manual (Section 11.2) > It has been decided that support for the native compiler on the target > would be stopped from the Buildroot-2012.11 release because: > > this feature was neither maintained nor tested, and often broken; > this feature was only available for Buildroot toolchains; > Buildroot mostly targets small or very small target hardware with limited > resource onboard (CPU, ram, mass-storage), for which compiling on the > target does not make much sense; > Buildroot aims at easing the cross-compilation, making native compilation > on the target unnecessary. > > > On Wed, Feb 8, 2023 at 10:07 AM Sourabh Hegde > wrote: > >> Hello All, >> >> I want to install a sdk on my Buildroot based Linux machine. SDK location >> https://github.com/aws/aws-iot-device-sdk-python-v2 . They don't have >> any packages which I can add in Buildroot. >> >> On a native Linux machine, it can be done via pip. But how to do this in >> Buildroot? >> >> Thanks in advance >> _______________________________________________ >> 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 Wed Feb 8 18:19:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 19:19:29 +0100 Subject: [Buildroot] [PATCH 2/5] package/aubio: drop AUBIO_REMOVE_OLD_WAF hook In-Reply-To: <20230208181933.3925279-1-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> Message-ID: <20230208181933.3925279-2-peter@korsgaard.com> As that is now handled by the waf-package infrastructure. Signed-off-by: Peter Korsgaard --- package/aubio/aubio.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index c995fdfac7..64174a113d 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -21,12 +21,6 @@ AUBIO_CONF_OPTS = \ # https://github.com/jackaudio/jack2/issues/898 AUBIO_NEEDS_EXTERNAL_WAF = YES -# The old waf script bundled in aubio 0.4.9 need to be removed first. -define AUBIO_REMOVE_OLD_WAF - $(RM) -fr $(@D)/waf $(@D)/waflib -endef -AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF - # Add --notests for each build step to avoid running unit tests on the # build machine. AUBIO_WAF_OPTS = --notests -- 2.30.2 From peter at korsgaard.com Wed Feb 8 18:19:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 19:19:28 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used Message-ID: <20230208181933.3925279-1-peter@korsgaard.com> Waf requires that the version of the waf script matches the version of waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as otherwise waf errors out with errors like: Waf script '2.0.24' and library '1.9.3' do not match Signed-off-by: Peter Korsgaard --- package/pkg-waf.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index e090afa9e6..a067e69c9b 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) define inner-waf-package +# The version of waflib has to match with the version of waf, +# otherwise waf errors out with: +# Waf script 'X' and library 'Y' do not match +define WAF_PACKAGE_REMOVE_WAF_LIB + $(RM) -fr $(@D)/waf $(@D)/waflib +endef + # We need host-python3 to run waf $(2)_DEPENDENCIES += host-python3 @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) $(2)_DEPENDENCIES += host-waf $(2)_WAF = $$(HOST_DIR)/bin/waf +$(2)_PRE_CONFIGURE_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB else $(2)_WAF ?= ./waf endif -- 2.30.2 From peter at korsgaard.com Wed Feb 8 18:19:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 19:19:30 +0100 Subject: [Buildroot] [PATCH 3/5] package/glmark2: use external waf In-Reply-To: <20230208181933.3925279-1-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> Message-ID: <20230208181933.3925279-3-peter@korsgaard.com> Fixes: http://autobuild.buildroot.net/results/bbd/bbd90f11975b691f694412a6fc3446f37dd7c0aa/ The bundled waf script is too old (1.9.3) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/glmark2/glmark2.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index e8d6f71dad..bac9d9ff6f 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -10,6 +10,9 @@ GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng +# The bundled waf script is too old for >= python3.11 +GLMARK2_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y) GLMARK2_DEPENDENCIES += libdrm libgbm libgles udev GLMARK2_FLAVORS += drm-glesv2 -- 2.30.2 From peter at korsgaard.com Wed Feb 8 18:19:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 19:19:31 +0100 Subject: [Buildroot] [PATCH 4/5] package/jack2: fix build with python >= 3.11 In-Reply-To: <20230208181933.3925279-1-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> Message-ID: <20230208181933.3925279-4-peter@korsgaard.com> Fixes: http://autobuild.buildroot.net/results/5ce/5ce5ebd20e0e509b31b51d2ec1aed56fdb8f45aa/ The bundled waf script is too old (2.0.12) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Jack unfortunately uses a modified waf, so we cannot just set JACK2_NEEDS_EXTERNAL_WAF, so instead backport an upstream patch fixing the compatibility issue: https://github.com/jackaudio/jack2/pull/884 Signed-off-by: Peter Korsgaard --- ...U-mode-bit-for-opening-files-in-pyth.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch diff --git a/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch new file mode 100644 index 0000000000..9ee5a43e18 --- /dev/null +++ b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch @@ -0,0 +1,55 @@ +From 328c58967dce8be426f9208ba7717ab5afc2c4f3 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Mon, 11 Jul 2022 00:56:28 +0200 +Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python + +The 'U' mode bit is removed in python 3.11. It has been +deprecated for a long time. The 'U' mode bit has no effect +so this change doesn't change any behavior. + +See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api + +Signed-off-by: Peter Korsgaard +--- + waflib/ConfigSet.py | 2 +- + waflib/Context.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index b300bb56..84736c9c 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -312,7 +312,7 @@ class ConfigSet(object): + :type filename: string + """ + tbl = self.table +- code = Utils.readf(filename, m='rU') ++ code = Utils.readf(filename, m='r') + for m in re_imp.finditer(code): + g = m.group + tbl[g(2)] = eval(g(3)) +diff --git a/waflib/Context.py b/waflib/Context.py +index 9fee3fa1..761b521f 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -266,7 +266,7 @@ class Context(ctx): + cache[node] = True + self.pre_recurse(node) + try: +- function_code = node.read('rU', encoding) ++ function_code = node.read('r', encoding) + exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict) + finally: + self.post_recurse(node) +@@ -662,7 +662,7 @@ def load_module(path, encoding=None): + + module = imp.new_module(WSCRIPT_FILE) + try: +- code = Utils.readf(path, m='rU', encoding=encoding) ++ code = Utils.readf(path, m='r', encoding=encoding) + except EnvironmentError: + raise Errors.WafError('Could not read the file %r' % path) + +-- +2.30.2 + -- 2.30.2 From peter at korsgaard.com Wed Feb 8 18:19:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 19:19:32 +0100 Subject: [Buildroot] [PATCH 5/5] package/norm: use external waf In-Reply-To: <20230208181933.3925279-1-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> Message-ID: <20230208181933.3925279-5-peter@korsgaard.com> Fixes: http://autobuild.buildroot.net/results/ee1/ee15cadf8af10dee6c83b9726a034367e8ae81a7/ The bundled waf script is too old (2.0.7) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/norm/norm.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/norm/norm.mk b/package/norm/norm.mk index 2f9fc7b657..a3fa1b4f80 100644 --- a/package/norm/norm.mk +++ b/package/norm/norm.mk @@ -11,6 +11,9 @@ NORM_INSTALL_STAGING = YES NORM_LICENSE = NRL License NORM_LICENSE_FILES = LICENSE.TXT +# The bundled waf script is too old for >= python3.11 +NORM_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y) NORM_DEPENDENCIES += libnetfilter_queue endif -- 2.30.2 From james.kent at orchestrated-technology.com Wed Feb 8 18:27:31 2023 From: james.kent at orchestrated-technology.com (James Kent) Date: Wed, 8 Feb 2023 18:27:31 +0000 Subject: [Buildroot] [PATCH v2] package/chrony: add default unprivileged user option Message-ID: <20230208182731.15752-1-james.kent@orchestrated-technology.com> Configurable option to define and enable by default an unprivileged user which the Chrony daemon will assume once initialised. The functionality requires libcap which is selected as necessary. This option supports the good security practice of dropping elevated privileges for daemon runtime. The package configuration layout has been updated to current working practice. Signed-off-by: James Kent --- package/chrony/Config.in | 12 +++++++++++- package/chrony/chrony.mk | 8 ++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package/chrony/Config.in b/package/chrony/Config.in index 158dc20530..0ba14c6aef 100644 --- a/package/chrony/Config.in +++ b/package/chrony/Config.in @@ -7,10 +7,20 @@ config BR2_PACKAGE_CHRONY http://chrony.tuxfamily.org/ +if BR2_PACKAGE_CHRONY + config BR2_PACKAGE_CHRONY_DEBUG_LOGGING bool "enable debug logging support" - depends on BR2_PACKAGE_CHRONY help Enable support for debug logging output from Chrony when enabled at runtime. If disabled, code for debug logging will not be compiled in. + +config BR2_PACKAGE_CHRONY_USER + bool "chrony default unprivileged user" + select BR2_PACKAGE_LIBCAP + help + Define and enable default unprivileged user for the Chrony + daemon to run as. + +endif diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 379e95a778..16f8f082a3 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -21,6 +21,14 @@ CHRONY_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_LIBCAP),y) CHRONY_DEPENDENCIES += libcap + +ifeq ($(BR2_PACKAGE_CHRONY_USER),y) +CHRONY_CONF_OPTS += --with-user=chrony +define CHRONY_USERS + chrony -1 chrony -1 * /run/chrony - - Time daemon +endef +endif + else CHRONY_CONF_OPTS += --without-libcap endif -- 2.35.3 From colin.foster at in-advantage.com Wed Feb 8 18:55:16 2023 From: colin.foster at in-advantage.com (Colin Foster) Date: Wed, 8 Feb 2023 10:55:16 -0800 Subject: [Buildroot] [PATCH] package/rauc-hawkbit-updater: new package Message-ID: <20230208185516.858096-1-colin.foster@in-advantage.com> Add useful tool for bridging RAUC with the Hawkbit API. Signed-off-by: Colin Foster --- package/Config.in | 1 + package/rauc-hawkbit-updater/Config.in | 14 ++++++++++++++ .../rauc-hawkbit-updater.hash | 3 +++ .../rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 15 +++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 package/rauc-hawkbit-updater/Config.in create mode 100644 package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash create mode 100644 package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk diff --git a/package/Config.in b/package/Config.in index 511e691ed3..84e5efa856 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2677,6 +2677,7 @@ menu "System tools" source "package/quota/Config.in" source "package/quotatool/Config.in" source "package/rauc/Config.in" + source "package/rauc-hawkbit-updater/Config.in" source "package/rsyslog/Config.in" source "package/runc/Config.in" source "package/s390-tools/Config.in" diff --git a/package/rauc-hawkbit-updater/Config.in b/package/rauc-hawkbit-updater/Config.in new file mode 100644 index 0000000000..bd7b8d7cf5 --- /dev/null +++ b/package/rauc-hawkbit-updater/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_RAUC_HAWKBIT_UPDATER + bool "rauc-hawkbit-updater" + depends on BR2_PACKAGE_RAUC + depends on BR2_PACKAGE_JSON_GLIB + help + rauc-hawkbit-updater is a link between Pengutronix + RAUC and the Eclipse Hawkbit API. Hawkbit can + communicate to remote update servers, and use the + d-bus interface to trigger updates from RAUC. + + http://rauc.io/ + +comment "rauc-hawkbit-updater needs rauc and json-glib" + depends on !BR2_PACKAGE_RAUC || !BR2_PACKAGE_JSON_GLIB diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash new file mode 100644 index 0000000000..c65ead3784 --- /dev/null +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 42318e96a464e6c716edb45c48bd3ec3b874462973db902fbe099a395e4acb4b rauc-hawkbit-updater-1.3.tar.xz +sha256 041234c81fd6fe6c531ea1a886b9e740b9ee06759d1a910a14edbd06f4aa62c7 LICENSE diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk new file mode 100644 index 0000000000..5a74181361 --- /dev/null +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk @@ -0,0 +1,15 @@ +############################################################################### +# +# rauc-hawkbit-updater +# +############################################################################### + +RAUC_HAWKBIT_UPDATER_VERSION = 1.3 +RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/releases/download/v$(RAUC_HAWKBIT_UPDATER_VERSION) +RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz +RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 +RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE +RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix +RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib + +$(eval $(meson-package)) -- 2.25.1 From thomas.petazzoni at bootlin.com Wed Feb 8 19:23:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:23:13 +0100 Subject: [Buildroot] [git commit] package/xr819-xradio: bump to 2022-12-30 version on branch master Message-ID: <20230208192410.C1E44847A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd2e9a2a0d7fd4e407e831503979cc00aa2c4858 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This version allows to build with Linux 6.1 Fixes: Still not reported Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/xr819-xradio/xr819-xradio.hash | 2 +- package/xr819-xradio/xr819-xradio.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index 08a3b6e8cc..60185db736 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 839fdae93eba29121d4116de335b00a026ef63874caf516747dbdf24c17f208b xr819-xradio-58d597bcf081e44904335916e6033bc8ef28b043.tar.gz +sha256 2b297fbcc9b5ed190bcfff9f6f808c170632ac3d69dbd92156a7f4f57142dec9 xr819-xradio-005f28cfe9e20b7f2dfd9d32d38ee97060dc707f.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index 8c1cb1587f..e5daaa6051 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 58d597bcf081e44904335916e6033bc8ef28b043 +XR819_XRADIO_VERSION = 005f28cfe9e20b7f2dfd9d32d38ee97060dc707f XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Feb 8 19:24:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 20:24:25 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used In-Reply-To: <20230208181933.3925279-1-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> Message-ID: <20230208192425.GA2677@scaer> Peter, All, On 2023-02-08 19:19 +0100, Peter Korsgaard spake thusly: > Waf requires that the version of the waf script matches the version of > waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as > otherwise waf errors out with errors like: > > Waf script '2.0.24' and library '1.9.3' do not match > > Signed-off-by: Peter Korsgaard > --- > package/pkg-waf.mk | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk > index e090afa9e6..a067e69c9b 100644 > --- a/package/pkg-waf.mk > +++ b/package/pkg-waf.mk > @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) > > define inner-waf-package > > +# The version of waflib has to match with the version of waf, > +# otherwise waf errors out with: > +# Waf script 'X' and library 'Y' do not match > +define WAF_PACKAGE_REMOVE_WAF_LIB > + $(RM) -fr $(@D)/waf $(@D)/waflib > +endef > + > # We need host-python3 to run waf > $(2)_DEPENDENCIES += host-python3 > > @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO > ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) > $(2)_DEPENDENCIES += host-waf > $(2)_WAF = $$(HOST_DIR)/bin/waf > +$(2)_PRE_CONFIGURE_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB It would make more sense to make that either a post-extract or a post-patch hook. Regards, Yann E. MORIN. > else > $(2)_WAF ?= ./waf > endif > -- > 2.30.2 > -- .-----------------.--------------------.------------------.--------------------. | 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 thomas.petazzoni at bootlin.com Wed Feb 8 19:24:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:24:29 +0100 Subject: [Buildroot] [PATCH] package/xr819-xradio: bump to 2022-12-30 version on branch master In-Reply-To: <20221230054005.1281050-1-giulio.benetti@benettiengineering.com> References: <20221230054005.1281050-1-giulio.benetti@benettiengineering.com> Message-ID: <20230208202429.03b41674@windsurf> On Fri, 30 Dec 2022 06:40:05 +0100 Giulio Benetti wrote: > This version allows to build with Linux 6.1 > > Fixes: > Still not reported > > Signed-off-by: Giulio Benetti > --- > package/xr819-xradio/xr819-xradio.hash | 2 +- > package/xr819-xradio/xr819-xradio.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 Wed Feb 8 19:27:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:27:34 +0100 Subject: [Buildroot] [git commit] package/rtl8723ds: change CFLAGS approach Message-ID: <20230208192809.8B204847AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=672544148b3cafa1cda47cd6e4b88210fc693e14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Instead of undefining endiannes CFLAGS let's change the approach. Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default involving the endianness to be set to little. This way we can set the CFLAGS according to architecture with some default define like: -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -Wno-error Suggested-by: Arnout Vandecappelle Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8723ds/rtl8723ds.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 7e27fa75ea..f303a24041 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -8,12 +8,14 @@ RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 -# Undefine the hardcoded CONFIG_LITTLE_ENDIAN -RTL8723DS_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN -# Set endianness -RTL8723DS_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN +RTL8723DS_USER_EXTRA_CLAGS = \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error RTL8723DS_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_I386_PC=n \ CONFIG_RTL8723DS=m \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) \ From thomas.petazzoni at bootlin.com Wed Feb 8 19:28:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:28:16 +0100 Subject: [Buildroot] [PATCH] package/rtl8723ds: change CFLAGS approach In-Reply-To: <20221213211313.735422-1-giulio.benetti@benettiengineering.com> References: <20221213211313.735422-1-giulio.benetti@benettiengineering.com> Message-ID: <20230208202816.3089d72d@windsurf> On Tue, 13 Dec 2022 22:13:13 +0100 Giulio Benetti wrote: > Instead of undefine endiannes CFLAGS let's change approach. > Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default > involving the endianness to be set to little. This way we can set the > CFLAGS according to architecture with some default define like: > -DCONFIG_IOCTL_CFG80211 > -DRTW_USE_CFG80211_STA_EVENT > -Wno-error > > Suggested-by: Arnout Vandecappelle > Signed-off-by: Giulio Benetti > --- > package/rtl8723ds/rtl8723ds.mk | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 8 19:31:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 20:31:31 +0100 Subject: [Buildroot] [PATCH 0/3 v2] package/dmalloc: cleanups and ssp workaround (branch yem/dmalloc) Message-ID: Hello All! This short series cleans up (a bit) our dmalloc package, and disables SSP altogether to avoid build failures due to limitations in the dmalloc build system. Changes v1 > v2: - explain why we patch both configure and configure.ac Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (3): package/dmalloc: convert existing patch to git format package/dmalloc: use actual patches rather than sed-ing package/dmalloc: don't use SSP .../dmalloc/0001-configure-fix-build-on-mips.patch | 90 ++++++++++++++++++++++ package/dmalloc/0001-mips.patch | 45 ----------- ...003-configure-allow-overriding-some-tests.patch | 80 +++++++++++++++++++ ...e-the-configure-detected-or-user-supplied.patch | 50 ++++++++++++ ...onfigure-use-LD-instead-of-hard-coding-ld.patch | 67 ++++++++++++++++ package/dmalloc/dmalloc.mk | 24 +++--- 6 files changed, 299 insertions(+), 57 deletions(-) create mode 100644 package/dmalloc/0001-configure-fix-build-on-mips.patch delete mode 100644 package/dmalloc/0001-mips.patch create mode 100644 package/dmalloc/0003-configure-allow-overriding-some-tests.patch create mode 100644 package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch create mode 100644 package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch -- .-----------------.--------------------.------------------.--------------------. | 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 Feb 8 19:31:33 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 20:31:33 +0100 Subject: [Buildroot] [PATCH 1/3 v2] package/dmalloc: convert existing patch to git format In-Reply-To: References: Message-ID: <510d3c4ff7dfdb844f62433de885fc9caa9f140e.1675884676.git.yann.morin.1998@free.fr> We're going to add more patches, so let's cleanup our historical baggage... Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- .../0001-configure-fix-build-on-mips.patch | 90 +++++++++++++++++++ package/dmalloc/0001-mips.patch | 45 ---------- 2 files changed, 90 insertions(+), 45 deletions(-) create mode 100644 package/dmalloc/0001-configure-fix-build-on-mips.patch delete mode 100644 package/dmalloc/0001-mips.patch diff --git a/package/dmalloc/0001-configure-fix-build-on-mips.patch b/package/dmalloc/0001-configure-fix-build-on-mips.patch new file mode 100644 index 0000000000..9b1525d0d1 --- /dev/null +++ b/package/dmalloc/0001-configure-fix-build-on-mips.patch @@ -0,0 +1,90 @@ +From af6adb3f5f05be4faa88a5aa83296c388c8085e7 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 12:30:10 +0100 +Subject: [PATCH] configure: fix build on mips + +This patch is a historical baggage that Buildroot has carried for ages +(since 2006), and the reason for it are notentirely clear. + +Since dmalloc is pretty tricky, and as this patch has not been +identified as causing issues, we keep it; we just add the configure.ac +patchlet to match the one in configure. + +As for the title, the original patch was named dmalloc-mips.patch, so +presumably it fixes some mips issue; let's title the commit that way. + +[Fabrice: Updated for 5.6.5] +Signed-off-by: Fabrice Fontaine +[yann.morin.1998 at free.fr: make it a git-formatted patch] +Signed-off-by: Yann E. MORIN +--- + configure | 4 ++-- + configure.ac | 2 +- + return.h | 16 +++------------- + 3 files changed, 6 insertions(+), 16 deletions(-) + +diff --git a/configure b/configure +index d52a1e8..c18dfb2 100755 +--- a/configure ++++ b/configure +@@ -5413,8 +5413,8 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 + $as_echo_n "checking return.h macros work... " >&6; } + if test "$cross_compiling" = yes; then : +- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assume yes (cross-compiling)" >&5 + $as_echo "no" >&6; } + + else +diff --git a/configure.ac b/configure.ac +index a5295f1..9740fdc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -705,7 +705,7 @@ int main() + ])], + [ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([yes]) ], + [ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ], +-[ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ] ++[ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([assume yes (cross-compiling)]) ] + ) + + ############################################################################## +diff --git a/return.h b/return.h +index 9d3f5f1..d916c7a 100644 +--- a/return.h ++++ b/return.h +@@ -117,26 +117,16 @@ + /*************************************/ + + /* +- * For DEC Mips machines running Ultrix ++ * For Mips machines running Linux + */ + #if __mips + +-/* +- * I have no idea how to get inline assembly with the default cc. +- * Anyone know how? +- */ +- +-#if 0 +- + /* + * NOTE: we assume here that file is global. + * +- * $31 is the frame pointer. $2 looks to be the return address but maybe +- * not consistently. ++ * $31 is the return address. + */ +-#define GET_RET_ADDR(file) asm("sw $2, file") +- +-#endif ++#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) + + #endif /* __mips */ + +-- +2.25.1 + diff --git a/package/dmalloc/0001-mips.patch b/package/dmalloc/0001-mips.patch deleted file mode 100644 index 3150d030ec..0000000000 --- a/package/dmalloc/0001-mips.patch +++ /dev/null @@ -1,45 +0,0 @@ -[Fabrice: Updated for 5.6.5] -Signed-off-by: Fabrice Fontaine ---- a/configure -+++ b/configure -@@ -7107,7 +7107,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 - $as_echo_n "checking return.h macros work... " >&6; } - if test "$cross_compiling" = yes; then : -- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h -+ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - ---- a/return.h -+++ b/return.h -@@ -106,26 +106,16 @@ - /*************************************/ - - /* -- * For DEC Mips machines running Ultrix -+ * For Mips machines running Linux - */ - #if __mips - - /* -- * I have no idea how to get inline assembly with the default cc. -- * Anyone know how? -- */ -- --#if 0 -- --/* - * NOTE: we assume here that file is global. - * -- * $31 is the frame pointer. $2 looks to be the return address but maybe -- * not consistently. -+ * $31 is the return address. - */ --#define GET_RET_ADDR(file) asm("sw $2, file") -- --#endif -+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) - - #endif /* __mips */ - -- 2.25.1 From yann.morin.1998 at free.fr Wed Feb 8 19:31:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 20:31:34 +0100 Subject: [Buildroot] [PATCH 2/3 v2] package/dmalloc: use actual patches rather than sed-ing In-Reply-To: References: Message-ID: <366bd1a37592003291a726b260031925652b9b29.1675884676.git.yann.morin.1998@free.fr> Our dmalloc packaging is very old and carries historical baggage and idiosyncracies that we have long stopped doing in the rest ofthe code base. Drop our post-patch hooks that seds the configure and Makefile.in files, and add patches (that could be upstreamed one day). We provide the results in the environment, like would be done with actual autoconf cache variables (ac_cv_*). Note: those are the result of cleaning up for further patches that did not manifest because it was too complex to add proper SSP support to dmalloc (instead, we're going to forcibly disable it in the following commit). Note-2: those patches have not been submitted upstream, as it's mostly dead: even though there's een some commit activities recently-ish, there has been no review or comments or the many PR pending for many years now. Note-3: we patch both configure and configure.ac, rather than autoreconf, for two reasons: 1. the both are in the upstream git tree, so submitting these patches would require patching both, and 2. dmalloc does not autoreconf nicely out of the box, and it was deemed too much hassle to fix that in addition. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- Changes v1 -> v2: - explain why we patch both configure and configure.ac --- ...onfigure-allow-overriding-some-tests.patch | 80 +++++++++++++++++++ ...-configure-detected-or-user-supplied.patch | 50 ++++++++++++ ...ure-use-LD-instead-of-hard-coding-ld.patch | 67 ++++++++++++++++ package/dmalloc/dmalloc.mk | 17 ++-- 4 files changed, 202 insertions(+), 12 deletions(-) create mode 100644 package/dmalloc/0003-configure-allow-overriding-some-tests.patch create mode 100644 package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch create mode 100644 package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch diff --git a/package/dmalloc/0003-configure-allow-overriding-some-tests.patch b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch new file mode 100644 index 0000000000..3003e8cbe4 --- /dev/null +++ b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch @@ -0,0 +1,80 @@ +From 9d57d4353c82110c609f36f91986277343d4ee45 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:26:56 +0100 +Subject: [PATCH] configure: allow overriding some tests + +Some tests use AC_RUN_IFELSE, so they do not work for cross-compilation. + +Allow the user to provide these results from the environment. + +Signed-off-by: Yann E. MORIN +--- + configure | 6 +++--- + configure.ac | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index c18dfb2..d165962 100755 +--- a/configure ++++ b/configure +@@ -4540,7 +4540,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strdup macro" >&5 + $as_echo_n "checking strdup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strdup_macro=no ++ ac_cv_strdup_macro="${ac_cv_strdup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4578,7 +4578,7 @@ $as_echo "$ac_cv_strdup_macro" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strndup macro" >&5 + $as_echo_n "checking strndup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strndup_macro=no ++ ac_cv_strndup_macro="${ac_cv_strndup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4753,7 +4753,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking basic-block size" >&5 + $as_echo_n "checking basic-block size... " >&6; } +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + if test "$cross_compiling" = yes; then : + ac_cv_page_size=0 +diff --git a/configure.ac b/configure.ac +index 9740fdc..51bdf4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -292,7 +292,7 @@ int main() { return 1; } + ]])], + [ac_cv_strdup_macro=yes], + [ac_cv_strdup_macro=no], +-[ac_cv_strdup_macro=no] ++[ac_cv_strdup_macro="${ac_cv_strdup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strdup_macro]) + +@@ -316,7 +316,7 @@ int main() { return 1; } + ]])], + [ac_cv_strndup_macro=yes], + [ac_cv_strndup_macro=no], +-[ac_cv_strndup_macro=no] ++[ac_cv_strndup_macro="${ac_cv_strndup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strndup_macro]) + +@@ -390,7 +390,7 @@ AC_MSG_RESULT([$ac_cv_use_mmap]) + # + AC_CHECK_FUNCS(getpagesize) + AC_MSG_CHECKING([basic-block size]) +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + AC_RUN_IFELSE([AC_LANG_SOURCE([ + #if HAVE_UNISTD_H +-- +2.25.1 + diff --git a/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch new file mode 100644 index 0000000000..394e7ca34e --- /dev/null +++ b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch @@ -0,0 +1,50 @@ +From c958fd5cd7d5ff03c0a023608b53b74997c514b3 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:43:55 +0100 +Subject: [PATCH] Makefile: use the configure-detected or user-supplied ar + program + +Signed-off-by: Yann E. MORIN +--- + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 86d3cca..089ac99 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -303,11 +303,11 @@ $(LIB_SL) : $(LIBRARY) + mv $@.t $@ + + $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH) : $(OBJS) $(THREAD_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_SL) : $(LIB_TH) +@@ -316,7 +316,7 @@ $(LIB_TH_SL) : $(LIB_TH) + mv $@.t $@ + + $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_CXX_SL) : $(LIB_CXX) +@@ -325,7 +325,7 @@ $(LIB_CXX_SL) : $(LIB_CXX) + mv $@.t $@ + + $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) +-- +2.25.1 + diff --git a/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch new file mode 100644 index 0000000000..3ba6ee3dc7 --- /dev/null +++ b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch @@ -0,0 +1,67 @@ +From d77e5f3d45b0cbae850e3a6e23d52edc137be803 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:52:05 +0100 +Subject: [PATCH] configure: use ${LD} instead of hard-coding 'ld' + +When doing cross-compilation, we do not want to use the native tools to +test, but the target tools. + +Note that the weird quoting is inherited from a legacy patch in +Buildroot, which dates back ages (at least 2006), and as it has not been +identified as breaking things, we keep it as-is... Meh... + +Signed-off-by: Yann E. MORIN +--- + configure | 12 ++++++------ + configure.ac | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/configure b/configure +index 810636e..30a7ea3 100755 +--- a/configure ++++ b/configure +@@ -4377,12 +4377,12 @@ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +diff --git a/configure.ac b/configure.ac +index 51bdf4d..0d80a78 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,12 +169,12 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int foo(int val) { return val + 1; } ])],[ + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +-- +2.25.1 + diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 81ac467277..6b90f810b2 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -44,18 +44,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_63261),y) DMALLOC_CFLAGS += -O0 endif -DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)" - -define DMALLOC_POST_PATCH - $(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure - $(SED) 's/ac_cv_strdup_macro=no$$/ac_cv_strdup_macro=yes/' $(@D)/configure - $(SED) 's/ac_cv_strndup_macro=no$$/ac_cv_strndup_macro=yes/' $(@D)/configure - $(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure - $(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure - $(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in -endef - -DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH +DMALLOC_CONF_ENV = \ + CFLAGS="$(DMALLOC_CFLAGS)" \ + ac_cv_page_size=12 \ + ac_cv_strdup_macro=yes \ + ac_cv_strndup_macro=yes # both DESTDIR and PREFIX are ignored.. define DMALLOC_INSTALL_STAGING_CMDS -- 2.25.1 From yann.morin.1998 at free.fr Wed Feb 8 19:31:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 20:31:35 +0100 Subject: [Buildroot] [PATCH 3/3 v2] package/dmalloc: don't use SSP In-Reply-To: References: Message-ID: dmalloc directly calls into $(LD) to generate a shared library our of the static one. To detet what command it should run, ./configure tries various incantations of ld with various command line options until one does not fail. One of those is (basically): $(LD) --whole-archive -o contest.o.t contest.a This makes ./configure conclude what the command to link a shared library in the Makefile should be, and thus stores that in a variable: shlinkargs='$(LD) --whole-archive -o $@' ... which is then AC_SUBST()ed into Makefile.in with a rule like: $(SHLIB): $(LIBRARY) @shlinkargs@ $(LIRARY) which once substiuted, gives: $(SHLIB): $(LIBRARY) $(LD) --whole-archive -o $@ $(LIRARY) However, when SSP is enabled, the __stack_chk_fail_local and co symbols are provided by additional libraries or object files, and that is the responsibility of gcc to pass those when linking. But as dmalloc directly calls ld, it misses those. Changing dmalloc to use $(CC) is not trivial, however. First, we can't pass LD=$(TARGET_CC), otherwise the whole package explodes [0]: indeed --whole-archive is unknown to gcc, so it must be passed as -Wl,--whole archive instead. So we'd need to add a new test that uses $(CC), like so: $(CC) -Wl,--whole-archive -o contest.o.t contest.a However, in that case, gcc does pass additional libs/objs (like, for eample, the SSP ones) to the linker. But then those are also inc;luded in the whole-archive section. This causes the linker to add all the symbols form those libs/objs, even those not needed for SSP; on some archs, like PPC, that may require floating point symbols (__muldiv3 et al.) which are in another library, and thus the linked can't find them. The proper solution wouild be to add -Wl,--no-whole-archive, but that would have to be added _after_ the library we want to link, i.e.e we should be able to evntually run: $(CC) -Wl,--whole-archive -o $@ $(LIRARY) -Wl,--no-whole-archive That would require that we introduce a new variable that is added _afgter_ the $(LIBRARY), e.g. @shlinkargs_post@ or so... This is a bigger endeavour than we want to pursue... Since dmalloc is a debugging utility, it is not supposed to go into production builds, and during debugging, it would not be surprising that it needs to poke around arrays to debug them. So, we go the easier route: disable SSP altogether. [0] with lots of nce colors, but that's not the point, is it? Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- package/dmalloc/dmalloc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 6b90f810b2..5bd6691725 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -14,6 +14,13 @@ DMALLOC_LICENSE_FILES = LICENSE.txt DMALLOC_INSTALL_STAGING = YES DMALLOC_CFLAGS = $(TARGET_CFLAGS) +# dmalloc uses $(LD) to link, and thus misses the object files or libs that +# are needed to provide the __stack_chk_fail_local and co. symbols. Changing +# to use $(CC) is really more complex that we'd like. Since dmalloc is +# involved in debugging memory allocation, it is not expected to be a +# production library, so we do not care that much that it has SSP. +DMALLOC_CFLAGS += -fno-stack-protector + ifeq ($(BR2_STATIC_LIBS),y) DMALLOC_CONF_OPTS += --disable-shlib else -- 2.25.1 From thomas.petazzoni at bootlin.com Wed Feb 8 19:33:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:33:24 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/weston: bump to version 11.0.1 In-Reply-To: <20221214151958.3419333-1-james.hilliard1@gmail.com> References: <20221214151958.3419333-1-james.hilliard1@gmail.com> Message-ID: <20230208203324.4ccd9dba@windsurf> Hello, Thanks for the patch. It overall looks good, but I have one question/comment. On Wed, 14 Dec 2022 08:19:58 -0700 James Hilliard wrote: > @@ -73,7 +84,9 @@ config BR2_PACKAGE_WESTON_RDP > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on BR2_USE_WCHAR # freerdp > depends on BR2_INSTALL_LIBSTDCPP # freerdp > + depends on BR2_PACKAGE_XORG7 # freerdp-server It feels really odd that we need to build half of the X.org planet to have RDP support in Weston. Is this dependency really needed? Isn't that something "wrong" in the freerdp package that should be fixed? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From Afshin.Pir at gallagher.com Wed Feb 8 19:44:51 2023 From: Afshin.Pir at gallagher.com (Afshin Pir) Date: Wed, 8 Feb 2023 19:44:51 +0000 Subject: [Buildroot] OpenSSL v3.0 Message-ID: Hi I wonder whether buildroot currently working on OpenSSL v3.0 package def or not. If not, what are the challenges for building this package? Because I need to migrate to OpenSSL v3.0 in my buildroot and I like to know how I can do it. Best Regards, Afshin ________________________________ This email is confidential and may contain information subject to legal privilege. If you are not the intended recipient please advise us of our error by return e-mail then delete this email and any attached files. You may not copy, disclose or use the contents in any way. The views expressed in this email may not be those of Gallagher Group Ltd or subsidiary companies thereof. ________________________________ -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Wed Feb 8 20:05:30 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 8 Feb 2023 13:05:30 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/weston: bump to version 11.0.1 In-Reply-To: <20230208203324.4ccd9dba@windsurf> References: <20221214151958.3419333-1-james.hilliard1@gmail.com> <20230208203324.4ccd9dba@windsurf> Message-ID: On Wed, Feb 8, 2023 at 12:33 PM Thomas Petazzoni wrote: > > Hello, > > Thanks for the patch. It overall looks good, but I have one > question/comment. > > On Wed, 14 Dec 2022 08:19:58 -0700 > James Hilliard wrote: > > > @@ -73,7 +84,9 @@ config BR2_PACKAGE_WESTON_RDP > > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > > depends on BR2_USE_WCHAR # freerdp > > depends on BR2_INSTALL_LIBSTDCPP # freerdp > > + depends on BR2_PACKAGE_XORG7 # freerdp-server > > It feels really odd that we need to build half of the X.org planet to > have RDP support in Weston. Is this dependency really needed? Isn't > that something "wrong" in the freerdp package that should be fixed? Well there's a long comment in freerdp regarding this issue: https://github.com/buildroot/buildroot/blob/d0603d853b78c3029cad4150389f8786b5f3e7c2/package/freerdp/freerdp.mk#L100-L121 Anyways for weston I'm just propagating the dependency for now, if something changes with freerdp regarding the dependency we can drop the xorg requirement from weston later on. > > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From fido_max at inbox.ru Wed Feb 8 20:07:52 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Wed, 8 Feb 2023 23:07:52 +0300 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: Message-ID: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> On 08.02.2023 21:19, Sourabh Hegde wrote: > Hello Ramon, > > I don't want an external toolchain. Maybe I was not clear. My goal is to > use the program/sdk from here > https://github.com/aws/aws-iot-device-sdk-python-v2 > ?, this is a python > based project. And no package is available for this. Can I use > python-pip to install it? Try to add your own package. https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages You can use any python package as a reference. For example: https://git.buildroot.net/buildroot/commit/package?id=037dbe64d861e3d5580ecac608bd278afc9bbcc6 From romain.naour at smile.fr Wed Feb 8 21:05:54 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 22:05:54 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used In-Reply-To: <20230208181933.3925279-1-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> Message-ID: Hello Peter, Le 08/02/2023 ? 19:19, Peter Korsgaard a ?crit?: > Waf requires that the version of the waf script matches the version of > waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as > otherwise waf errors out with errors like: > > Waf script '2.0.24' and library '1.9.3' do not match > > Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour Best regards, Romain > --- > package/pkg-waf.mk | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk > index e090afa9e6..a067e69c9b 100644 > --- a/package/pkg-waf.mk > +++ b/package/pkg-waf.mk > @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) > > define inner-waf-package > > +# The version of waflib has to match with the version of waf, > +# otherwise waf errors out with: > +# Waf script 'X' and library 'Y' do not match > +define WAF_PACKAGE_REMOVE_WAF_LIB > + $(RM) -fr $(@D)/waf $(@D)/waflib > +endef > + > # We need host-python3 to run waf > $(2)_DEPENDENCIES += host-python3 > > @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO > ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) > $(2)_DEPENDENCIES += host-waf > $(2)_WAF = $$(HOST_DIR)/bin/waf > +$(2)_PRE_CONFIGURE_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB > else > $(2)_WAF ?= ./waf > endif From romain.naour at smile.fr Wed Feb 8 21:08:08 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 22:08:08 +0100 Subject: [Buildroot] [PATCH 2/5] package/aubio: drop AUBIO_REMOVE_OLD_WAF hook In-Reply-To: <20230208181933.3925279-2-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208181933.3925279-2-peter@korsgaard.com> Message-ID: Le 08/02/2023 ? 19:19, Peter Korsgaard a ?crit?: > As that is now handled by the waf-package infrastructure. > > Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour > --- > package/aubio/aubio.mk | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk > index c995fdfac7..64174a113d 100644 > --- a/package/aubio/aubio.mk > +++ b/package/aubio/aubio.mk > @@ -21,12 +21,6 @@ AUBIO_CONF_OPTS = \ > # https://github.com/jackaudio/jack2/issues/898 > AUBIO_NEEDS_EXTERNAL_WAF = YES > > -# The old waf script bundled in aubio 0.4.9 need to be removed first. > -define AUBIO_REMOVE_OLD_WAF > - $(RM) -fr $(@D)/waf $(@D)/waflib > -endef > -AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF Note: the pkg-wag use a PRE_CONFIGURE_HOOKS instead of POST_EXTRACT_HOOKS. Best regards, Romain > - > # Add --notests for each build step to avoid running unit tests on the > # build machine. > AUBIO_WAF_OPTS = --notests From hrsourabh011 at gmail.com Wed Feb 8 21:28:35 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Wed, 8 Feb 2023 22:28:35 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> Message-ID: Hello Maxim, Thanks for the update. I think for me, the option "18.9.3. Generating a python-package from a PyPI repository" https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages is suited. I want to install this package https://pypi.org/project/awsiotsdk/. And this package requires https://pypi.org/project/awscrt/ as dependency. Should I create both Buildroot packages from python packages? In the Buildroot manual, it's mentioned "Find the external python modules menu and insert your package inside.", what should I insert here? source code? On Wed, 8 Feb 2023 at 21:07, Maxim Kochetkov wrote: > > > On 08.02.2023 21:19, Sourabh Hegde wrote: > > Hello Ramon, > > > > I don't want an external toolchain. Maybe I was not clear. My goal is to > > use the program/sdk from here > > https://github.com/aws/aws-iot-device-sdk-python-v2 > > , this is a > python > > based project. And no package is available for this. Can I use > > python-pip to install it? > > Try to add your own package. > > > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages > > You can use any python package as a reference. > For example: > > https://git.buildroot.net/buildroot/commit/package?id=037dbe64d861e3d5580ecac608bd278afc9bbcc6 > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bigunclemax at gmail.com Wed Feb 8 22:21:47 2023 From: bigunclemax at gmail.com (Maxim Kiselev) Date: Thu, 9 Feb 2023 01:21:47 +0300 Subject: [Buildroot] [PATCH 1/1] lksctp-tools: bump to version 1.0.19 In-Reply-To: <20230208094543.474237-1-fido_max@inbox.ru> References: <20230208094543.474237-1-fido_max@inbox.ru> Message-ID: ??, 8 ????. 2023 ?. ? 12:45, Maxim Kochetkov : > > Release notes: https://github.com/sctp/lksctp-tools/blob/v1.0.19/ChangeLog > > Signed-off-by: Maxim Kochetkov > --- > package/lksctp-tools/lksctp-tools.hash | 4 ++-- > package/lksctp-tools/lksctp-tools.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/lksctp-tools/lksctp-tools.hash b/package/lksctp-tools/lksctp-tools.hash > index fb892fdc3b..b3a1f59d86 100644 > --- a/package/lksctp-tools/lksctp-tools.hash > +++ b/package/lksctp-tools/lksctp-tools.hash > @@ -1,6 +1,6 @@ > # From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ > -md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz > -sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz > +md5 0fbb288c9f9625b88d3ab21c9ed9f011 lksctp-tools-1.0.19.tar.gz > +sha1 d410a596485c38464177a38ae7c7081444e6589e lksctp-tools-1.0.19.tar.gz > # Locally computed > sha256 dee5f35e583183abb9212938643ecb2d858fd89e2e286f4b1d903f65d49d6c76 COPYING.lib > sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING > diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk > index 5ac794e842..af86a28516 100644 > --- a/package/lksctp-tools/lksctp-tools.mk > +++ b/package/lksctp-tools/lksctp-tools.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LKSCTP_TOOLS_VERSION = 1.0.17 > -LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools > +LKSCTP_TOOLS_VERSION = 1.0.19 > +LKSCTP_TOOLS_SITE = $(call github,sctp,lksctp-tools,v$(LKSCTP_TOOLS_VERSION)) > LKSCTP_TOOLS_INSTALL_STAGING = YES > # configure not shipped > LKSCTP_TOOLS_AUTORECONF = YES > -- > 2.38.1 > > Signed-off-by: Maxim Kochetkov Tested-by: Maksim Kiselev From flaniel at linux.microsoft.com Wed Feb 8 22:22:16 2023 From: flaniel at linux.microsoft.com (Francis Laniel) Date: Wed, 08 Feb 2023 23:22:16 +0100 Subject: [Buildroot] [PATCH] package/libbpf: Don't remove bpf.h on host In-Reply-To: <17501a13-8018-656f-5f4d-b1cf6c1ecd5c@mind.be> References: <12146851.O9o76ZdvQC@pwmachine> <17501a13-8018-656f-5f4d-b1cf6c1ecd5c@mind.be> Message-ID: <2667723.mvXUDI8C0e@pwmachine> Hi. Le mercredi 8 f?vrier 2023, 16:47:58 CET Arnout Vandecappelle a ?crit : > Hi Daniel, Francis, > > On 07/02/2023 21:10, Francis Laniel wrote: > > Hi. > > > > Le lundi 28 novembre 2022, 16:06:20 CET Lang Daniel a ?crit : > >> libbpf >1.0.0 defines libbpf_bpf_link_type_str(enum bpf_link_type) in > >> src/libbpf.h, which is included by host-pahole. > >> bpf_link_type is defined in linux/bpf.h, therefore the comment stating > >> that pahole doesn't need bpf.h is no longer valid. > >> > >> Fixes: > >> - > >> http://autobuild.buildroot.net/results/d126a4b6eca786402dc362c86f8df3adde > >> c3 > >> d217/ > >> > >> Signed-off-by: Daniel Lang > >> --- > >> I wasn't able to reproduce the mentioned compile error in the kernel. > >> The mentioned file (tools/lib/bpf/strset.c) shouldn't be compiled when > >> compiling the kernel as it would recompile libbpf. > >> --- > >> > >> package/libbpf/libbpf.mk | 17 +---------------- > >> 1 file changed, 1 insertion(+), 16 deletions(-) > >> > >> diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk > >> index 820f1dc4bf..0381fd833a 100644 > >> --- a/package/libbpf/libbpf.mk > >> +++ b/package/libbpf/libbpf.mk > >> @@ -39,26 +39,11 @@ define LIBBPF_INSTALL_TARGET_CMDS > >> > >> -C $(@D)/src install DESTDIR=$(TARGET_DIR) > >> > >> endef > >> > >> -# We need to install_uapi_headers so we have btf.h to compile > >> -# host-pahole. > >> -# Nonetheless, this target adds bpf.h which generates a conflict when > >> -# building the kernel: > >> -# In file included from libbpf_internal.h:17:0, from strset.c:9: > >> -# relo_core.h:10:6: error: nested redefinition of 'enum > >> bpf_core_relo_kind' -# enum bpf_core_relo_kind { > >> -# ^~~~~~~~~~~~~~~~~~ > >> -# relo_core.h:10:6: error: redeclaration of 'enum bpf_core_relo_kind' > >> -# In file included from libbpf_legacy.h:13:0, > >> -# from libbpf_internal.h:16, > >> -# from strset.c:9: > >> -# /home/francis/buildroot/output/host/include/linux/bpf.h:6497:6: note: > >> originally defined here -# enum bpf_core_relo_kind { > >> -# So, better to remove remove it now since we do not need it to build > >> +# We need to install_uapi_headers so we have bpf.h and btf.h to compile > >> > >> # host-pahole, the only user of host-libbpf. > >> define HOST_LIBBPF_INSTALL_CMDS > >> > >> $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ > >> > >> -C $(@D)/src install install_uapi_headers DESTDIR=$(HOST_DIR) > >> > >> - rm $(HOST_DIR)/include/linux/bpf.h > >> > >> endef > >> > >> $(eval $(generic-package)) > > > > Thank you for this patch and sorry for my very late reply. > > Sadly, I do not think the patch addresses the underlying issue. > > Indeed, this is not pahole which does not need this file, as pahole relies > > on to be built. > > So, the whole point of this comment and the rm is to avoid a problem when > > building the kernel when pahole was built before. > > The current solution, however, also doesn't work, which is why Franci's > patch [1] is needed to fix it again. > > However, we believe this is not the proper fix. The real issue is the > following: > > - libbpf installs headers which are possibly incompatible with the kernel's > headers. Normally this is not a problem, because you have either the > kernel's or libbpf's headers installed, not both. > > - However, when we install libbpf headers in $(HOST_DIR)/include, the kernel > build itself picks up those headers instead of its own internal headers. > That is why bpf.h is removed here to begin with. If bpf.h is not removed > (and the kernel headers are indeed incompatible with the libbpf ones), then > the kernel build will fail. > > - There is however no reason why the kernel should pick up > $(HOST_DIR)/include instead of its own internal headers. Normally it > doesn't do that, because it supplies -I options to its own headers, and > these have precedence over the system included /usr/include etc. However, > we force HOSTCC="$(HOSTCC) $(HOST_CFLAGS)" and HOST_CFLAGS has > -I$(HOST_DIR)/include. This one will come before all of the ones that the > kernel adds and will have precedence. > > Therefore, we believe that the solution is to use -isystem instead of -I in > the HOSTCC setting of the kernel. This is indeed what is already done for > uboot: > > HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem > /,$(HOST_CFLAGS)))" \ Thank you for all the details! Using -isystem sounds like a really good idea! > Note that there is a risk that this by itself goes wrong as well. We tried > at some point to use -isystem instead of -I in HOST_CFLAGS: > > commit 6f8162cf8c1abef7e0a4771fe0d6b26a28f5c2b6 > Author: David Raeman > Date: Mon Jul 25 21:52:26 2016 > > package/Makefile.in should grab HOST_DIR headers using -isystem instead > of -I. > > > but this was reverted a copule of days later: > > commit 255b6f80d395ef048f46cfcf75dba690c56af657 > Author: Thomas Petazzoni > Date: Sat Jul 30 18:10:18 2016 > > Revert "package/Makefile.in should grab HOST_DIR headers using -isystem > instead of -I." > > (Unfortunately, the commit has no further explanation of what went wrong). > > So, could you (Daniel and Francis) try to apply this patch and replace -I > with -isystem like is done for U-Boot, and do a bunch of kernel builds to > see if it breaks anything? I will sure take a look and will come back here with my findings! > For now, I've marked this patch as Changes Requested (it can only be > applied if the bpf.h problem is solved in some other way), and marked > Francis's patch [1] as Superseded. > > Regards, > Arnout > > > [1] > https://patchwork.ozlabs.org/project/buildroot/patch/20220610165441.84812-2-> flaniel at linux.microsoft.com/ > > Sadly, I tested your patch and I hit the problem described in the comment > > regarding redefinition of bpf_core_relo_kind. > > > > Did you also hit it or you were able to build the kernel with > > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE? > > > > > > Best regards and thank you in advance. > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot Best regards. From giulio.benetti at benettiengineering.com Wed Feb 8 23:07:19 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 00:07:19 +0100 Subject: [Buildroot] [PATCH 0/2] Bump Harfbuzz to version 6.0.0 Message-ID: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> While building all packages that depend on Harfbuzz(listed in harfbuzz patch) I've found that libgtk3 has a bug that shows up while building libinput because of a bug of a local patch of libgtk3. Best regards Giulio Benetti Giulio Benetti (2): package/libgtk3: fix build failure on libinput due to the presence of atk-bridge-2.0 in gtk+-3.0.pc package/harfbuzz: bump to version 6.0.0 package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- ...h => 0001-Remove-atk-bridge-support.patch} | 31 +++++++++++++++++-- 3 files changed, 30 insertions(+), 5 deletions(-) rename package/libgtk3/{0001-disable-atk-bridge.patch => 0001-Remove-atk-bridge-support.patch} (59%) -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 8 23:07:20 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 00:07:20 +0100 Subject: [Buildroot] [PATCH 1/2] package/libgtk3: fix build failure on libinput due to the presence of atk-bridge-2.0 in gtk+-3.0.pc In-Reply-To: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> Message-ID: <20230208230721.3269610-2-giulio.benetti@benettiengineering.com> Patch 0001-disable-atk-bridge.patch misses to remove: atk_pkgs += ['atk-bridge-2.0'] that is not affected by any meson variable, this results in having libgtk3 to have atk-bridge-2.0 in its gtk+-3.0.pc and so other libraries(i.e. libinput) tries to {pkgconf}find it failing. So let's convert the patch to git format and add the removal of such line. Fixes: still not found Signed-off-by: Giulio Benetti --- ...h => 0001-Remove-atk-bridge-support.patch} | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) rename package/libgtk3/{0001-disable-atk-bridge.patch => 0001-Remove-atk-bridge-support.patch} (59%) diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-Remove-atk-bridge-support.patch similarity index 59% rename from package/libgtk3/0001-disable-atk-bridge.patch rename to package/libgtk3/0001-Remove-atk-bridge-support.patch index f3e9bff2ba..b52c9be650 100644 --- a/package/libgtk3/0001-disable-atk-bridge.patch +++ b/package/libgtk3/0001-Remove-atk-bridge-support.patch @@ -1,16 +1,27 @@ -Remove atk-bridge support. +From 923ba2a1653b942093e9d25f8f4d2e7c09a66328 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 8 Feb 2023 23:50:56 +0100 +Subject: [PATCH] Remove atk-bridge support. atk-bridge doesn't seem useful for now in Buildroot and requires to add two new packages just for it: at-spi2-core and at-spi2-atk. Signed-off-by: Hadrien Boutteville +[Giulio: remove 'atk-bridge-2.0' too] +Signed-off-by: Giulio Benetti +--- + gtk/a11y/gtkaccessibility.c | 8 -------- + meson.build | 4 +--- + 2 files changed, 1 insertion(+), 11 deletions(-) +diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c +index 7f0e5207d9..14da1e80e2 100644 --- a/gtk/a11y/gtkaccessibility.c +++ b/gtk/a11y/gtkaccessibility.c @@ -37,10 +37,6 @@ #include #include - + -#ifdef GDK_WINDOWING_X11 -#include -#endif @@ -21,13 +32,15 @@ Signed-off-by: Hadrien Boutteville @@ -988,9 +984,5 @@ _gtk_accessibility_init (void) _gtk_accessibility_override_atk_util (); do_window_event_initialization (); - + -#ifdef GDK_WINDOWING_X11 - atk_bridge_adaptor_init (NULL, NULL); -#endif - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); } +diff --git a/meson.build b/meson.build +index aed48fc3f6..370bf1cce1 100644 --- a/meson.build +++ b/meson.build @@ -564,7 +564,7 @@ if x11_enabled @@ -39,3 +52,15 @@ Signed-off-by: Hadrien Boutteville backend_immodules += ['xim'] +@@ -583,8 +583,6 @@ if x11_enabled + x11_pkgs += ['xdamage'] + endif + +- atk_pkgs += ['atk-bridge-2.0'] +- + cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false) + cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false) + cdata.set('HAVE_XCOMPOSITE', xcomposite_dep.found() ? 1 : false) +-- +2.34.1 + -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 8 23:07:21 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 00:07:21 +0100 Subject: [Buildroot] [PATCH 2/2] package/harfbuzz: bump to version 6.0.0 In-Reply-To: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> Message-ID: <20230208230721.3269610-3-giulio.benetti@benettiengineering.com> Since the major release changed all the packages that have direct dependency to harfbuzz has been succesfully built: - efl - libass - mupdf - pango - qt5base - qt5webengine - qt6base - sdl2_ttf - supertuxkart - vlc - webkitgtk - wpewebkit Signed-off-by: Giulio Benetti --- 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 9489f25c6a..faae7b91e3 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d harfbuzz-5.3.1.tar.xz +sha256 1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4 harfbuzz-6.0.0.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index b0112168e1..02fe4ecec3 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 5.3.1 +HARFBUZZ_VERSION = 6.0.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) -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 9 00:48:23 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 01:48:23 +0100 Subject: [Buildroot] [PATCH] arch: move global and rename variable BR2_PACKAGE_Z3_ARCH_SUPPORTS Message-ID: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> Package quickjs fails to build on architectures that don't support full float rounding. To support all kind of float rounding FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD must be defined in fenv.h. Since package z3 locally implements this check let's make it global, rename it to be generic and use it for both package quickjs and z3. Fixes: http://autobuild.buildroot.net/results/0b6/0b67381e3643c134c92cbcd1c5dc258fd760cd7e/ http://autobuild.buildroot.net/results/cf2/cf249a82c83d3c8503205f4c3c5859dd9d52afdf/ http://autobuild.buildroot.net/results/9b3/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2/ http://autobuild.buildroot.net/results/4f1/4f13cf7d353260c6b8934dbdcf267bea884b356b/ Signed-off-by: Giulio Benetti --- arch/Config.in | 24 ++++++++++++++++++++++++ package/quickjs/Config.in | 4 ++-- package/z3/Config.in | 25 +------------------------ 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/arch/Config.in b/arch/Config.in index 1c0c400a98..90846861ca 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -253,6 +253,30 @@ config BR2_xtensa endchoice +# Not all architectures support float rounding. This can be found while +# checking if fenv.h provides all four macros: +# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD +# See for example in glibc https://sourceware.org/git/glibc.git +# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ +config BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arceb || BR2_arcle + default y if BR2_arm || BR2_armeb + default y if BR2_i386 + default y if BR2_m68k + # BR2_microblaze has only FE_TONEAREST + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + # BR2_nios2 has only FE_TONEAREST + default y if BR2_or1k + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_s390x + # BR2_sh has only FE_{TONEAREST,TOWARDZERO} + default y if BR2_sparc || BR2_sparc64 + default y if BR2_x86_64 + # BR2_xtensa supports only uclibc which does not have fenv.h + # For some architectures or specific cores, our internal toolchain # backend is not suitable (like, missing support in upstream gcc, or # no ChipCo fork exists...) diff --git a/package/quickjs/Config.in b/package/quickjs/Config.in index dc466241ba..6f24787333 100644 --- a/package/quickjs/Config.in +++ b/package/quickjs/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_QUICKJS bool "quickjs" - depends on !BR2_nios2 # fenv.h lacks FE_{DOWN,UP}WARD on nios2 + depends on BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING # fenv.h lacks FE_{DOWN,UP}WARD depends on !BR2_STATIC_LIBS # No way to check for fenv support. depends on !BR2_TOOLCHAIN_USES_UCLIBC @@ -15,7 +15,7 @@ config BR2_PACKAGE_QUICKJS https://bellard.org/quickjs/ comment "quickjs needs a glibc or musl toolchain w/ gcc >= 4.9, host gcc >= 4.9, dynamic library" - depends on !BR2_nios2 + depends on BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/z3/Config.in b/package/z3/Config.in index 8cd3128687..5ceca5dbe2 100644 --- a/package/z3/Config.in +++ b/package/z3/Config.in @@ -1,33 +1,10 @@ -# z3 supports arch for which libc fenv.h provides all four macros: -# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD -# See for example in glibc https://sourceware.org/git/glibc.git -# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ -config BR2_PACKAGE_Z3_ARCH_SUPPORTS - bool - default y if BR2_aarch64 || BR2_aarch64_be - default y if BR2_arceb || BR2_arcle - default y if BR2_arm || BR2_armeb - default y if BR2_i386 - default y if BR2_m68k - # BR2_microblaze has only FE_TONEAREST - default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - # BR2_nios2 has only FE_TONEAREST - default y if BR2_or1k - default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le - default y if BR2_riscv - default y if BR2_s390x - # BR2_sh has only FE_{TONEAREST,TOWARDZERO} - default y if BR2_sparc || BR2_sparc64 - default y if BR2_x86_64 - # BR2_xtensa supports only uclibc which does not have fenv.h - config BR2_PACKAGE_Z3 bool "z3" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # c++17 # z3 needs fenv.h which is not provided by uclibc depends on !BR2_TOOLCHAIN_USES_UCLIBC - depends on BR2_PACKAGE_Z3_ARCH_SUPPORTS + depends on BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING help Z3, also known as the Z3 Theorem Prover, is a cross-platform satisfiability modulo theories (SMT) solver. -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 9 00:56:18 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 01:56:18 +0100 Subject: [Buildroot] [PATCH] arch: move global and rename variable BR2_PACKAGE_Z3_ARCH_SUPPORTS In-Reply-To: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> References: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> Message-ID: Pardon, this had to be a RFC, I've forgotten to add it. Some architecture still lacks some float rounding but is listed. Let me know if it's possible to apply this patch and catch the other architecture failures on Autobuilder rather than check all the architectures' FPU implementation by hand(I can do it anyway if requested). Best regards -- Giulio Benetti CEO/CTO at Benetti Engineering sas On 09/02/23 01:48, Giulio Benetti wrote: > Package quickjs fails to build on architectures that don't support full > float rounding. To support all kind of float rounding FE_DOWNWARD, > FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD must be defined in fenv.h. > Since package z3 locally implements this check let's make it global, > rename it to be generic and use it for both package quickjs and z3. > > Fixes: > http://autobuild.buildroot.net/results/0b6/0b67381e3643c134c92cbcd1c5dc258fd760cd7e/ > http://autobuild.buildroot.net/results/cf2/cf249a82c83d3c8503205f4c3c5859dd9d52afdf/ > http://autobuild.buildroot.net/results/9b3/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2/ > http://autobuild.buildroot.net/results/4f1/4f13cf7d353260c6b8934dbdcf267bea884b356b/ > > Signed-off-by: Giulio Benetti > --- > arch/Config.in | 24 ++++++++++++++++++++++++ > package/quickjs/Config.in | 4 ++-- > package/z3/Config.in | 25 +------------------------ > 3 files changed, 27 insertions(+), 26 deletions(-) > > diff --git a/arch/Config.in b/arch/Config.in > index 1c0c400a98..90846861ca 100644 > --- a/arch/Config.in > +++ b/arch/Config.in > @@ -253,6 +253,30 @@ config BR2_xtensa > > endchoice > > +# Not all architectures support float rounding. This can be found while > +# checking if fenv.h provides all four macros: > +# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD > +# See for example in glibc https://sourceware.org/git/glibc.git > +# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ > +config BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING > + bool > + default y if BR2_aarch64 || BR2_aarch64_be > + default y if BR2_arceb || BR2_arcle > + default y if BR2_arm || BR2_armeb > + default y if BR2_i386 > + default y if BR2_m68k > + # BR2_microblaze has only FE_TONEAREST > + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el > + # BR2_nios2 has only FE_TONEAREST > + default y if BR2_or1k > + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le > + default y if BR2_riscv > + default y if BR2_s390x > + # BR2_sh has only FE_{TONEAREST,TOWARDZERO} > + default y if BR2_sparc || BR2_sparc64 > + default y if BR2_x86_64 > + # BR2_xtensa supports only uclibc which does not have fenv.h > + > # For some architectures or specific cores, our internal toolchain > # backend is not suitable (like, missing support in upstream gcc, or > # no ChipCo fork exists...) > diff --git a/package/quickjs/Config.in b/package/quickjs/Config.in > index dc466241ba..6f24787333 100644 > --- a/package/quickjs/Config.in > +++ b/package/quickjs/Config.in > @@ -1,6 +1,6 @@ > config BR2_PACKAGE_QUICKJS > bool "quickjs" > - depends on !BR2_nios2 # fenv.h lacks FE_{DOWN,UP}WARD on nios2 > + depends on BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING # fenv.h lacks FE_{DOWN,UP}WARD > depends on !BR2_STATIC_LIBS > # No way to check for fenv support. > depends on !BR2_TOOLCHAIN_USES_UCLIBC > @@ -15,7 +15,7 @@ config BR2_PACKAGE_QUICKJS > https://bellard.org/quickjs/ > > comment "quickjs needs a glibc or musl toolchain w/ gcc >= 4.9, host gcc >= 4.9, dynamic library" > - depends on !BR2_nios2 > + depends on BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING > depends on BR2_USE_MMU > depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_HOST_GCC_AT_LEAST_4_9 > diff --git a/package/z3/Config.in b/package/z3/Config.in > index 8cd3128687..5ceca5dbe2 100644 > --- a/package/z3/Config.in > +++ b/package/z3/Config.in > @@ -1,33 +1,10 @@ > -# z3 supports arch for which libc fenv.h provides all four macros: > -# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD > -# See for example in glibc https://sourceware.org/git/glibc.git > -# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ > -config BR2_PACKAGE_Z3_ARCH_SUPPORTS > - bool > - default y if BR2_aarch64 || BR2_aarch64_be > - default y if BR2_arceb || BR2_arcle > - default y if BR2_arm || BR2_armeb > - default y if BR2_i386 > - default y if BR2_m68k > - # BR2_microblaze has only FE_TONEAREST > - default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el > - # BR2_nios2 has only FE_TONEAREST > - default y if BR2_or1k > - default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le > - default y if BR2_riscv > - default y if BR2_s390x > - # BR2_sh has only FE_{TONEAREST,TOWARDZERO} > - default y if BR2_sparc || BR2_sparc64 > - default y if BR2_x86_64 > - # BR2_xtensa supports only uclibc which does not have fenv.h > - > config BR2_PACKAGE_Z3 > bool "z3" > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # c++17 > # z3 needs fenv.h which is not provided by uclibc > depends on !BR2_TOOLCHAIN_USES_UCLIBC > - depends on BR2_PACKAGE_Z3_ARCH_SUPPORTS > + depends on BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING > help > Z3, also known as the Z3 Theorem Prover, is a cross-platform > satisfiability modulo theories (SMT) solver. From ckhardin at gmail.com Thu Feb 9 01:53:18 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 17:53:18 -0800 Subject: [Buildroot] [PATCH 1/2] boot/uboot: add a setlocalversion rsync hook when overriding srcdir Message-ID: <20230209015319.28176-1-charles.hardin@chargepoint.com> From: Charles Hardin During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define PLAIN_VERSION "2018.03-01358-gbda75d6a8b" #define U_BOOT_VERSION "U-Boot " PLAIN_VERSION Signed-off-by: Charles Hardin Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..e340d2cf11 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -40,6 +40,18 @@ UBOOT_SITE = https://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 endif +ifneq ($(UBOOT_OVERRIDE_SRCDIR),) +define UBOOT_OVERRIDE_SRCDIR_SETLOCALVERSION + (cd $(@D); \ + if [ -x ./scripts/setlocalversion ]; then \ + ./scripts/setlocalversion --save-scmversion \ + $(abspath $(UBOOT_OVERRIDE_SRCDIR)) ||:; \ + fi) +endef + +UBOOT_POST_RSYNC_HOOKS += UBOOT_OVERRIDE_SRCDIR_SETLOCALVERSION +endif + ifeq ($(BR2_TARGET_UBOOT)$(BR2_TARGET_UBOOT_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) endif -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 01:53:19 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 17:53:19 -0800 Subject: [Buildroot] [PATCH 2/2] linux: add a setlocalversion rsync hook when overriding srcdir In-Reply-To: <20230209015319.28176-1-charles.hardin@chargepoint.com> References: <20230209015319.28176-1-charles.hardin@chargepoint.com> Message-ID: <20230209015319.28176-2-charles.hardin@chargepoint.com> From: Charles Hardin During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define UTS_RELEASE "5.4.70-00031-g92c23d10d003" Signed-off-by: Charles Hardin Signed-off-by: Charles Hardin --- linux/linux.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..e88856d71e 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -46,6 +46,18 @@ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_ endif endif +ifneq ($(LINUX_OVERRIDE_SRCDIR),) +define LINUX_OVERRIDE_SRCDIR_SETLOCALVERSION + (cd $(@D); \ + if [ -x ./scripts/setlocalversion ]; then \ + ./scripts/setlocalversion --save-scmversion \ + $(abspath $(LINUX_OVERRIDE_SRCDIR)) ||:; \ + fi) +endef + +LINUX_POST_RSYNC_HOOKS += LINUX_OVERRIDE_SRCDIR_SETLOCALVERSION +endif + ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) endif -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 03:04:02 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 19:04:02 -0800 Subject: [Buildroot] [PATCH 1/2] boot/uboot: add a setlocalversion rsync hook when overriding srcdir Message-ID: <20230209030405.33574-1-charles.hardin@chargepoint.com> From: Charles Hardin During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define PLAIN_VERSION "2018.03-01358-gbda75d6a8b" #define U_BOOT_VERSION "U-Boot " PLAIN_VERSION Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..e340d2cf11 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -40,6 +40,18 @@ UBOOT_SITE = https://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 endif +ifneq ($(UBOOT_OVERRIDE_SRCDIR),) +define UBOOT_OVERRIDE_SRCDIR_SETLOCALVERSION + (cd $(@D); \ + if [ -x ./scripts/setlocalversion ]; then \ + ./scripts/setlocalversion --save-scmversion \ + $(abspath $(UBOOT_OVERRIDE_SRCDIR)) ||:; \ + fi) +endef + +UBOOT_POST_RSYNC_HOOKS += UBOOT_OVERRIDE_SRCDIR_SETLOCALVERSION +endif + ifeq ($(BR2_TARGET_UBOOT)$(BR2_TARGET_UBOOT_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) endif -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 03:04:03 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 19:04:03 -0800 Subject: [Buildroot] [PATCH 1/2] linux: create a scmversion file based on the custom repo variables In-Reply-To: <20230209030405.33574-1-charles.hardin@chargepoint.com> References: <20230209030405.33574-1-charles.hardin@chargepoint.com> Message-ID: <20230209030405.33574-2-charles.hardin@chargepoint.com> From: Charles Hardin When using the custom repositories, the archive creation will omit the source history to get reproducible hashes. This has the side effect of making the setlocalversion scripts within the builds to not create the tracking information as expected. So, just generate a .scmversion so that kernels will be labelled with where buildroot referenced them. For example (line wrapped) #define UTS_RELEASE "5.4.70-repo-version-" \ "92c23d10d0031e0a13244a1a97e7530d3b53fc6e" Signed-off-by: Charles Hardin --- linux/linux.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..0b27c8dee2 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -596,6 +596,20 @@ endif ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)),) $(error No custom repo URL set. Check your BR2_LINUX_KERNEL_CUSTOM_REPO_URL setting) endif + +# Create a custom scm version file to reflect the source version since the +# archive will omit source directories like .git to maintain reproducible +# hashes for the archives +LINUX_CUSTOM_REPO_SCMVERSION = \ + "-repo-version-$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION))" +define LINUX_CUSTOM_REPO_SCMVERSION_HOOK + (cd $(@D); \ + if [ ! -f .scmversion ]; then \ + echo $(LINUX_CUSTOM_REPO_SCMVERSION) > .scmversion; \ + fi) +endef + +LINUX_POST_EXTRACT_HOOKS += LINUX_CUSTOM_REPO_SCMVERSION_HOOK endif ifeq ($(BR_BUILDING),y) -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 03:04:04 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 19:04:04 -0800 Subject: [Buildroot] [PATCH 2/2] boot/uboot: create a scmversion file based on the custom repo variables In-Reply-To: <20230209030405.33574-1-charles.hardin@chargepoint.com> References: <20230209030405.33574-1-charles.hardin@chargepoint.com> Message-ID: <20230209030405.33574-3-charles.hardin@chargepoint.com> From: Charles Hardin When using the custom repositories, the archive creation will omit the source history to get reproducible hashes. This has the side effect of making the setlocalversion scripts within the builds to not create the tracking information as expected. So, just generate a .scmversion so that kernels will be labelled with where buildroot referenced them. Example (line wrapped) #define PLAIN_VERSION "2018.03-repo-version-" \ "d72b9d0908364a64718b652b75e4cac9b85cf0c3" Signed-off-by: Charles Hardin Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..65bb7669c8 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -526,12 +526,25 @@ endif # BR2_TARGET_UBOOT_CUSTOM_TARBALL ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT)$(BR2_TARGET_UBOOT_CUSTOM_HG),y) ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),) $(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting) -endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_URL +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_REPO_URL ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION)),) $(error No custom U-Boot repository version specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting) -endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_VERSION +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION endif # BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG +# Create a custom scm version file to reflect the source version since the +# archive will omit source directories like .git to maintain reproducible +# hashes for the archives +UBOOT_CUSTOM_REPO_SCMVERSION = \ + "-repo-version-$(call qstrip,$(BR2_UBOOT_CUSTOM_REPO_VERSION))" +define UBOOT_CUSTOM_REPO_SCMVERSION_HOOK + (cd $(@D); \ + if [ ! -f .scmversion ]; then \ + echo $(UBOOT_CUSTOM_REPO_SCMVERSION) > .scmversion; \ + fi) +endef + +UBOOT_POST_EXTRACT_HOOKS += UBOOT_CUSTOM_REPO_SCMVERSION_HOOK endif # BR2_TARGET_UBOOT && BR_BUILDING ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 03:04:05 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 19:04:05 -0800 Subject: [Buildroot] [PATCH 2/2] linux: add a setlocalversion rsync hook when overriding srcdir In-Reply-To: <20230209030405.33574-1-charles.hardin@chargepoint.com> References: <20230209030405.33574-1-charles.hardin@chargepoint.com> Message-ID: <20230209030405.33574-4-charles.hardin@chargepoint.com> From: Charles Hardin During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define UTS_RELEASE "5.4.70-00031-g92c23d10d003" Signed-off-by: Charles Hardin Signed-off-by: Charles Hardin --- linux/linux.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..e88856d71e 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -46,6 +46,18 @@ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_ endif endif +ifneq ($(LINUX_OVERRIDE_SRCDIR),) +define LINUX_OVERRIDE_SRCDIR_SETLOCALVERSION + (cd $(@D); \ + if [ -x ./scripts/setlocalversion ]; then \ + ./scripts/setlocalversion --save-scmversion \ + $(abspath $(LINUX_OVERRIDE_SRCDIR)) ||:; \ + fi) +endef + +LINUX_POST_RSYNC_HOOKS += LINUX_OVERRIDE_SRCDIR_SETLOCALVERSION +endif + ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) endif -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 03:07:05 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 19:07:05 -0800 Subject: [Buildroot] [PATCH 1/2] linux: create a scmversion file based on the custom repo variables Message-ID: <20230209030706.33870-1-charles.hardin@chargepoint.com> From: Charles Hardin When using the custom repositories, the archive creation will omit the source history to get reproducible hashes. This has the side effect of making the setlocalversion scripts within the builds to not create the tracking information as expected. So, just generate a .scmversion so that kernels will be labelled with where buildroot referenced them. For example (line wrapped) #define UTS_RELEASE "5.4.70-repo-version-" \ "92c23d10d0031e0a13244a1a97e7530d3b53fc6e" Signed-off-by: Charles Hardin Signed-off-by: Charles Hardin --- linux/linux.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..0b27c8dee2 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -596,6 +596,20 @@ endif ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)),) $(error No custom repo URL set. Check your BR2_LINUX_KERNEL_CUSTOM_REPO_URL setting) endif + +# Create a custom scm version file to reflect the source version since the +# archive will omit source directories like .git to maintain reproducible +# hashes for the archives +LINUX_CUSTOM_REPO_SCMVERSION = \ + "-repo-version-$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION))" +define LINUX_CUSTOM_REPO_SCMVERSION_HOOK + (cd $(@D); \ + if [ ! -f .scmversion ]; then \ + echo $(LINUX_CUSTOM_REPO_SCMVERSION) > .scmversion; \ + fi) +endef + +LINUX_POST_EXTRACT_HOOKS += LINUX_CUSTOM_REPO_SCMVERSION_HOOK endif ifeq ($(BR_BUILDING),y) -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 03:07:06 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 19:07:06 -0800 Subject: [Buildroot] [PATCH 2/2] boot/uboot: create a scmversion file based on the custom repo variables In-Reply-To: <20230209030706.33870-1-charles.hardin@chargepoint.com> References: <20230209030706.33870-1-charles.hardin@chargepoint.com> Message-ID: <20230209030706.33870-2-charles.hardin@chargepoint.com> From: Charles Hardin When using the custom repositories, the archive creation will omit the source history to get reproducible hashes. This has the side effect of making the setlocalversion scripts within the builds to not create the tracking information as expected. So, just generate a .scmversion so that kernels will be labelled with where buildroot referenced them. Example (line wrapped) #define PLAIN_VERSION "2018.03-repo-version-" \ "d72b9d0908364a64718b652b75e4cac9b85cf0c3" Signed-off-by: Charles Hardin Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..65bb7669c8 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -526,12 +526,25 @@ endif # BR2_TARGET_UBOOT_CUSTOM_TARBALL ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT)$(BR2_TARGET_UBOOT_CUSTOM_HG),y) ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),) $(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting) -endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_URL +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_REPO_URL ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION)),) $(error No custom U-Boot repository version specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting) -endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_VERSION +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION endif # BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG +# Create a custom scm version file to reflect the source version since the +# archive will omit source directories like .git to maintain reproducible +# hashes for the archives +UBOOT_CUSTOM_REPO_SCMVERSION = \ + "-repo-version-$(call qstrip,$(BR2_UBOOT_CUSTOM_REPO_VERSION))" +define UBOOT_CUSTOM_REPO_SCMVERSION_HOOK + (cd $(@D); \ + if [ ! -f .scmversion ]; then \ + echo $(UBOOT_CUSTOM_REPO_SCMVERSION) > .scmversion; \ + fi) +endef + +UBOOT_POST_EXTRACT_HOOKS += UBOOT_CUSTOM_REPO_SCMVERSION_HOOK endif # BR2_TARGET_UBOOT && BR_BUILDING ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) -- 2.37.1 (Apple Git-137.1) From peter.macleod.thompson at gmail.com Thu Feb 9 03:30:38 2023 From: peter.macleod.thompson at gmail.com (Peter Thompson) Date: Wed, 8 Feb 2023 20:30:38 -0700 Subject: [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.20.1 In-Reply-To: <20230208165756.5d8dd14f@windsurf> References: <20221127002135.12134-1-peter.macleod.thompson@gmail.com> <20230208165756.5d8dd14f@windsurf> Message-ID: Hi Thomas, Apologies. I had thought there was a problem with the LICENSE_FILES in my update. Hence my subsequent change. Glad everything is now ok. Peter On Wed, Feb 8, 2023 at 8:57 AM Thomas Petazzoni < thomas.petazzoni at bootlin.com> wrote: > Hello Peter > > On Sat, 26 Nov 2022 17:21:35 -0700 > Peter Thompson wrote: > > > LICENSE_FILES changed to LICENSE.txt for version 2.20.1. > > Previous versions used COPYING.txt. > > > > Signed-off-by: Peter Thompson > > --- > > package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- > > package/sdl2_ttf/sdl2_ttf.mk | 4 ++-- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > Sorry for the long delay, but you had already sent this patch on > November 19, 2022 and it was applied on November 21, 2022, so it was > too late for a new version. > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From francois.perrad at gadz.org Thu Feb 9 04:13:31 2023 From: francois.perrad at gadz.org (=?UTF-8?Q?Fran=C3=A7ois_Perrad?=) Date: Thu, 9 Feb 2023 05:13:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/libgtk3: fix build failure on libinput due to the presence of atk-bridge-2.0 in gtk+-3.0.pc In-Reply-To: <20230208230721.3269610-2-giulio.benetti@benettiengineering.com> References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> <20230208230721.3269610-2-giulio.benetti@benettiengineering.com> Message-ID: Le jeu. 9 f?vr. 2023 ? 00:07, Giulio Benetti < giulio.benetti at benettiengineering.com> a ?crit : > Patch 0001-disable-atk-bridge.patch misses to remove: > atk_pkgs += ['atk-bridge-2.0'] > that is not affected by any meson variable, this results in having libgtk3 > to have atk-bridge-2.0 in its gtk+-3.0.pc and so other libraries(i.e. > libinput) tries to {pkgconf}find it failing. So let's convert the patch to > git format and add the removal of such line. > > Fixes: > still not found > this patch (disable-atk-bridge) will be removed soon, see https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 (package/atk: remove package) Fran?ois > Signed-off-by: Giulio Benetti > --- > ...h => 0001-Remove-atk-bridge-support.patch} | 31 +++++++++++++++++-- > 1 file changed, 28 insertions(+), 3 deletions(-) > rename package/libgtk3/{0001-disable-atk-bridge.patch => > 0001-Remove-atk-bridge-support.patch} (59%) > > diff --git a/package/libgtk3/0001-disable-atk-bridge.patch > b/package/libgtk3/0001-Remove-atk-bridge-support.patch > similarity index 59% > rename from package/libgtk3/0001-disable-atk-bridge.patch > rename to package/libgtk3/0001-Remove-atk-bridge-support.patch > index f3e9bff2ba..b52c9be650 100644 > --- a/package/libgtk3/0001-disable-atk-bridge.patch > +++ b/package/libgtk3/0001-Remove-atk-bridge-support.patch > @@ -1,16 +1,27 @@ > -Remove atk-bridge support. > +From 923ba2a1653b942093e9d25f8f4d2e7c09a66328 Mon Sep 17 00:00:00 2001 > +From: Giulio Benetti > +Date: Wed, 8 Feb 2023 23:50:56 +0100 > +Subject: [PATCH] Remove atk-bridge support. > > atk-bridge doesn't seem useful for now in Buildroot and requires to > add two new packages just for it: at-spi2-core and at-spi2-atk. > > Signed-off-by: Hadrien Boutteville > +[Giulio: remove 'atk-bridge-2.0' too] > +Signed-off-by: Giulio Benetti > +--- > + gtk/a11y/gtkaccessibility.c | 8 -------- > + meson.build | 4 +--- > + 2 files changed, 1 insertion(+), 11 deletions(-) > > +diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c > +index 7f0e5207d9..14da1e80e2 100644 > --- a/gtk/a11y/gtkaccessibility.c > +++ b/gtk/a11y/gtkaccessibility.c > @@ -37,10 +37,6 @@ > #include > #include > - > + > -#ifdef GDK_WINDOWING_X11 > -#include > -#endif > @@ -21,13 +32,15 @@ Signed-off-by: Hadrien Boutteville < > hadrien.boutteville at gmail.com> > @@ -988,9 +984,5 @@ _gtk_accessibility_init (void) > _gtk_accessibility_override_atk_util (); > do_window_event_initialization (); > - > + > -#ifdef GDK_WINDOWING_X11 > - atk_bridge_adaptor_init (NULL, NULL); > -#endif > - > atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); > } > +diff --git a/meson.build b/meson.build > +index aed48fc3f6..370bf1cce1 100644 > --- a/meson.build > +++ b/meson.build > @@ -564,7 +564,7 @@ if x11_enabled > @@ -39,3 +52,15 @@ Signed-off-by: Hadrien Boutteville < > hadrien.boutteville at gmail.com> > > backend_immodules += ['xim'] > > +@@ -583,8 +583,6 @@ if x11_enabled > + x11_pkgs += ['xdamage'] > + endif > + > +- atk_pkgs += ['atk-bridge-2.0'] > +- > + cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false) > + cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false) > + cdata.set('HAVE_XCOMPOSITE', xcomposite_dep.found() ? 1 : false) > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Thu Feb 9 05:35:03 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Thu, 9 Feb 2023 08:35:03 +0300 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> Message-ID: <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> On 09.02.2023 00:28, Sourabh Hegde wrote: > Hello Maxim, > > Thanks for the update. > > I think for me, the option "18.9.3. Generating a python-package from a > PyPI repository" > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages ?is suited. > I want to install this package https://pypi.org/project/awsiotsdk/ > . And this package requires > https://pypi.org/project/awscrt/ ?as > dependency. Should I create both Buildroot packages from python packages? Sure. > In the Buildroot manual, it's mentioned "Find the external python > modules menu and insert your package inside.", what should I insert > here? source code? The output from scanpypi util. "This will generate packages python-foo and python-bar in the package folder if they exist on https://pypi.python.org." "external python modules" is located at package/Config.in: ... if BR2_PACKAGE_PYTHON3 menu "External python modules" source "package/python-aenum/Config.in" source "package/python-aexpect/Config.in" ... Try this sequence: utils/scanpypi awscrt awsiotsdk -o package then add source "package/python-awscrt/Config.in" source "package/python-awsiotsdk/Config.in" to the package/Config.in From peter at korsgaard.com Thu Feb 9 06:48:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 09 Feb 2023 07:48:30 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used In-Reply-To: <20230208192425.GA2677@scaer> (Yann E. MORIN's message of "Wed, 8 Feb 2023 20:24:25 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208192425.GA2677@scaer> Message-ID: <87r0uzfi69.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > On 2023-02-08 19:19 +0100, Peter Korsgaard spake thusly: >> Waf requires that the version of the waf script matches the version of >> waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as >> otherwise waf errors out with errors like: >> >> Waf script '2.0.24' and library '1.9.3' do not match >> >> Signed-off-by: Peter Korsgaard >> --- >> package/pkg-waf.mk | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk >> index e090afa9e6..a067e69c9b 100644 >> --- a/package/pkg-waf.mk >> +++ b/package/pkg-waf.mk >> @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) >> >> define inner-waf-package >> >> +# The version of waflib has to match with the version of waf, >> +# otherwise waf errors out with: >> +# Waf script 'X' and library 'Y' do not match >> +define WAF_PACKAGE_REMOVE_WAF_LIB >> + $(RM) -fr $(@D)/waf $(@D)/waflib >> +endef >> + >> # We need host-python3 to run waf >> $(2)_DEPENDENCIES += host-python3 >> >> @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO >> ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) >> $(2)_DEPENDENCIES += host-waf >> $(2)_WAF = $$(HOST_DIR)/bin/waf >> +$(2)_PRE_CONFIGURE_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB > It would make more sense to make that either a post-extract or a > post-patch hook. I hesitated between post-patch and pre-configure, but went with pre-configure as this is closely related to the configure step - But I'm fine with making it a post-patch hook instead. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Thu Feb 9 06:49:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 09 Feb 2023 06:49:16 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-08 Message-ID: <20230209064923.EAB9F405E7@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-08 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 0 | 4 | 0 | 4 | 2022.11.x | 22 | 17 | 0 | 39 | master | 171 | 226 | 2 | 399 | Classification of failures by reason for master ----------------------------------------------- host-rust-1.67.0 | 13 host-go-1.19.5 | 10 host-pahole-1.24 | 10 host-binutils-2.38 | 9 unknown | 8 gobject-introspection-1.72.0 | 7 host-xz-5.2.10 | 7 libsolv-0.7.22 | 7 elfutils-0.186 | 6 perl-5.36.0 | 6 jack2-1.9.21 | 5 norm-1.5.8 | 5 busybox-1.36.0 | 4 host-binutils-2.37 | 4 ocf-linux-20171122 | 4 zabbix-5.4.9 | 4 host-libarchive-3.6.2 | 3 host-sentry-cli-2.8.0 | 3 linux-6.1.9 | 3 netsurf-3.10 | 3 python-cryptography-39.0.0 | 3 efivar-38 | 2 fwup-1.9.1 | 2 gerbera-1.10.0 | 2 glibc-2.36-81-g4f4d7a13edfd... | 2 gobject-introspection | 2 kexec-2.0.25 | 2 libcamera-apps-1.1.1 | 2 libgpg-error-1.46 | 2 linux-5.10.162-cip24-rt10 | 2 lirc-tools-0.10.2 | 2 lttng-modules-2.13.7 | 2 mutt-2.2.9 | 2 opencv3-3.4.17 | 2 php-xdebug-3.0.4 | 2 proxychains-ng-4.16 | 2 python-bcrypt-4.0.1 | 2 python-numpy-1.23.5 | 2 quickjs-2021-03-27 | 2 systemd-252.4 | 2 uclibc-1.0.42 | 2 wolfssl-5.5.3 | 2 xz-5.2.10 | 2 ace-7.0.6 | 1 android-tools-4.2.2+git2013... | 1 apg-2.3.0b | 1 assimp-5.2.5 | 1 avro-c-1.11.1 | 1 batman-adv-2022.3 | 1 bullet-3.21 | 1 containerd-1.6.16 | 1 dmalloc-5.6.5 | 1 edk2-edk2-stable202208 | 1 eigen-3.4.0 | 1 ffmpeg-4.4.3 | 1 fftw-quad-3.3.8 | 1 flac-1.4.2 | 1 fontconfig-2.13.1 | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubi/ubi.mk:51: /tmp/inst... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gdal-3.5.2 | 1 gmp-6.2.1 | 1 host-binutils-2.39 | 1 host-gcc-final-12.2.0 | 1 host-python-maturin-0.14.9 | 1 hyperfine-1.14.0 | 1 kvmtool-f77d646ba01d04be5aa... | 1 lapack-3.10.1 | 1 libabseil-cpp-20220623.1 | 1 libconfig-1.7.3 | 1 libfreeimage-3.18.0 | 1 libglib2-2.72.3 | 1 libsigsegv-2.14 | 1 libvorbis-1.3.7 | 1 linux-5.10.162-cip24 | 1 ltp-testsuite-20220930 | 1 lttng-babeltrace-1.5.7 | 1 mpv-0.33.1 | 1 ntpsec-1_2_2 | 1 nut-2.8.0 | 1 open-iscsi-2.1.8 | 1 optee-client-3.19.0 | 1 package/multipath-tools/mul... | 1 pcm-tools-202110 | 1 pcre2-10.42 | 1 pixz-1.0.7 | 1 pv-1.6.20 | 1 rdma-core-44.0 | 1 s6-linux-utils-2.6.0.0 | 1 sdl-1.2.15 | 1 toolchain-external-codescap... | 1 uccp420wlan-6.9.1 | 1 v4l2loopback-0.12.7 | 1 wireguard-linux-compat-1.0.... | 1 wtfutil-0.41.0 | 1 xenomai-3.0.10 | 1 zeek-4.1.1 | 1 znc-1.8.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- s390x | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/115534e17b6ababe63a68cd65762f992c0677113 | powerpc64le | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/ebc5cb47021a01fa4a51ebc650fc78d6901fcd4f | powerpc64le | apg-2.3.0b | NOK | http://autobuild.buildroot.net/results/8dd83a9bc0f73c998f8741730b3e6633cb44bcad | mips | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/48c1a821b00df3e048085aa01917cf0fda0ae261 | ORPH arm | avro-c-1.11.1 | NOK | http://autobuild.buildroot.net/results/d07d867d88096c25bb8eae0dfbc1c1544613252f | mips | batman-adv-2022.3 | NOK | http://autobuild.buildroot.net/results/b3ac57369e265d62b17ef68db9623b4a6f8ea157 | or1k | bullet-3.21 | NOK | http://autobuild.buildroot.net/results/d670ad272a702ff2f6aef0c19498f88ad41851f0 | mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/9a4b4df9b486e296366e56c81dc24c4101fea66b | ORPH mipsel | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/16bd8e98ed270c3389f3ebded4d0c9c80b11dfb6 | ORPH mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/754fe2560baf18ef5aaf4a184c7ea9b8d09403bb | ORPH mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/e12609ddf5a179c0f0d95797fbb7ba9dff260b4d | ORPH aarch64 | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/172606f296f79c26737b686339ab459d4fc4b362 | powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/b3795ccfb9d39bb64d09d27d7bcd6ba897cb7d3c | ORPH x86_64 | edk2-edk2-stable202208 | NOK | http://autobuild.buildroot.net/results/edf0e7b166060449d8abe945ba0cd5b6d2a0aa7d | aarch64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/da1b5fb23977ca409ffbea2608fd07ddab6e0353 | mips64el | efivar-38 | NOK | http://autobuild.buildroot.net/results/b763ee1ce4377daa024c23aaca1952e319ef3d96 | riscv64 | eigen-3.4.0 | NOK | http://autobuild.buildroot.net/results/c9ca19c3b8aee9b039e033295f4c0f0ef717b85c | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/942cee41a1b13734e4ca02332e3a1e0922142619 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3a93149edbfa250fcf161cb322c50b1fc3d8adf4 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/d087b29237c66142285af7b6bcbcb9b27d6751db | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/538888f10abc0e24103016abda1c4556af2c28f6 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/ec38bf0683539ef156a5e6bb7b456696e47de86f | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/6e4ca63d463524e4bee3b465dcd00131fbfdf42d | ORPH aarch64 | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/59d05def41be11712a9a27ebac6dda90d5b62399 | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/c4e89efd985e286e028da0d93aed42e363394663 | ORPH sh4a | flac-1.4.2 | NOK | http://autobuild.buildroot.net/results/11731c86f662ce90672952d72ba7a4c1b23bf3b0 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/ff2afe511e3634af640f60943ec2c6c12f2e98e9 | ORPH mips64 | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/124381bbfd9d56a8282b8f603ec501112d5440d9 | mips | fs/ubi/ubi.mk:51: /tmp/inst... | NOK | http://autobuild.buildroot.net/results/5c59e1bff6bbcb27a1a50ec1cc0b05112de70825 | mips64el | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/c39563c8a949a1ec925736ecaa34ab9cb340b1ec | or1k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/e4e7c0464ac4ef6e37ce880b01d8912200ead2b5 | aarch64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/60ae0f1f9e33705ab641ed8debfd848889dba86f | aarch64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/e3385a4342a1ef829ef103b223495b7b2eca5e3d | aarch64_be | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/5298740069e92fd98b8508d5eeab9dcbf7c2764c | powerpc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/5f6f3eb7c087075fd09580831f1a116664f01d00 | aarch64_be | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8e80a732002901a868ec1915a3ba801b9ba232f4 | x86_64 | gdal-3.5.2 | NOK | http://autobuild.buildroot.net/results/14eef25f68603969dff16244fc3a20750a52ef30 | nios2 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/23cd783d7e1cf5e05b6b896408f770d43df58532 | i686 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/ffbcb61326e615bd5cbaebfe8d3de71d1492980d | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b03d48761de9da8f8a4c1f5c41e1fd489fc15a44 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/d8868160b9322c7321f65ead3cca63ab31dacb9c | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/baffc108c1f0a0167ad2cfa4f553e94035daf0ec | ORPH microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/1f0d05d7ab57824400d0bf1bb29c63219826bc38 | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/a1553e62e49a80390a062e3cdce5a6c6615a8e1e | mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d0e46772ec92359fd932cde5bfda6c7bb9982b42 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f9b5c4c981bc8b3863e41b2377fd8794687abd3a | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7502209c0ea41714bb6933d5f04f99ab49ec4562 | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0d6eb7f9131dde44a1babbdcae31b23416aaabe9 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/fe4683b0572bc001b2ea1e7a0d05e855f15501fc | ORPH mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3f30617092fe60927413b93c6fe988d76df6fe39 | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1c9acaadfe8d885d787726fe49ba95b4dfb1dd9f | ORPH microblaze | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/f3054d433f2bf9376b618997599b94722dfeb94f | powerpc64le | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/39a869ec937107ec6a32926a718c5d35cd5e126b | x86_64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/acb1c370cb661926923d5b424ca5d04327ed851a | mips64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/7a76d7604d48851a69d7f48d02e5a1ba88bec245 | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/7f27a9b822d04a43aff7c9f11b7cd9f7c3d5ab18 | nios2 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1f675b401d5d1b76c74a29c24a380e837dca609c | aarch64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e9c23cff9bf40dba76df6d31ae67ed4ae65b1cb4 | arm | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/8be8c5ab0c68adf91b4f9220849c99c0a4180d7b | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/156fb37611979aa184a6a3d5fbfd0c792687f142 | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/a1c380d45509336ced3c15c0377456b252ec4244 | riscv64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/844fb8fe2538a80417085a8850fccf8b0fb34044 | mips64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/c4d3527b280fab85cd92a63cf70dddcbb6d97eaa | powerpc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/87652f980f69e231da76788dd5cb2a9974f1b2d5 | i686 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/bd20420c7e7b5f4dc767b0bb5ccc08d3840f7e8c | arceb | host-gcc-final-12.2.0 | NOK | http://autobuild.buildroot.net/results/2b51ccf15b1d51f88e12efecfaa482fcb09d1cbe | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/1a62d20f0c67a02a050351f44425d457c46731a0 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/34f5f7775bf2d9cd7354d7366b8da27e9dcec5a1 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/ecb886c2829701b8b2d378ba3f6c6b6e0a344c30 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/5ab746c4a008d66bc51065eddb8d30d54b13784c | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/b01e3dfd9a4c02f4973e12a27c1e0204977a1971 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/3ff250a13176c7c71b3bbc5b04f3c2b83c94b994 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/021867e859c96ec18c5b36d196220eb9425e1035 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/baf5d3f2f0e99208711a87afb97107014558367a | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/df31e672725c84b0ff10e299b5e4ab86f049d742 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/4bf00e5c3062d93ed6e5004b097c026989e5bf3c | m68k | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/0d6c1af08d4de23190fccd10af5a613ca4206266 | powerpc | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/2a7650b7101f3877fe22e1e8cc5fa2b842496d83 | microblaze | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/a63669ded597a295bdf280f5f1b3b59be52c0ba9 | microblaze | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/09f3d36a6cd5fe3bb586d1c3a76edc83b809f106 | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ad2aeffbe05cb16249b01497fb727bbf46cb8158 | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/b6d96201b373b857c7569aaf6e9c75dd828bc608 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d09e26a615cf4a0f9bb18070142bac21aa740445 | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/acb30087c50fb57a8d00f2ced3dba3cfc660758f | mipsel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/918940d33ee7ef3a53f722244618b0332958c330 | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/54994490bfc14e75db5de7edeb2239e4976d9698 | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c19eaed88525e9122abb4ba76c7fb14f825b7a69 | riscv64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/3941c1dcd72abacd79728595c6acdf88f74989b5 | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/a43255e51d924b448fb9ac1d86fa7cf51960533c | arm | host-python-maturin-0.14.9 | NOK | http://autobuild.buildroot.net/results/f2c92faf8b12b430494859cb4d8519336041de7b | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/843d256564385f4f520e467c33629dd64834fa00 | sparc64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/6d92a7c79ade920ed1867c6d7eefb7be407d5921 | mipsel | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/607bc384a53035eb0331e56a84be1173e886be96 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/47f3655e937652698fe46c2cdb48c2ba2b085c90 | mips | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/cafa320ec4d2f80d18fadfdba5905d4d71353317 | powerpc | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/4a1d2c6f272405bcc1fe9cd00241dee212c61bc4 | armeb | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/f2d7f4f077933f9c0d0bfe5a3e37ed2447633fd4 | mips | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/d96702761c41d07fd472cd5c547fd08fc922a297 | mipsel | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/c53a81757ac737aa1032824ce9c9cbe78ae02968 | s390x | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/18a924bf03c77af740b16bd760a6785a18a71a27 | i586 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/47441bb8b682d0ae165d505c996c9b049ebdcde2 | sparc64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/4983653dbe15daa1a744a9abd688d23916ed2726 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/3e04f588da055230cbb0552a31029d7ac3f81a80 | i686 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/675ae2d9e96aac3e455628ca9e96e0507020eab0 | microblazeel | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/00c45d36ed3b957e16ac86cb0fdfb5213dabbf50 | powerpc64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/12a63ae177fe3ed0c9a1ef2fa01870f334f36b0f | riscv32 | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/2669c0eec24e00dc1b5916d403f33dfc6933464e | ORPH or1k | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/76bcbd5a779cb80da6b259b3c61e10d68d761f1d | ORPH x86_64 | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/be1770c8e5d731b39ebedecaf3eb00922a2de9b1 | ORPH riscv64 | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/ea61713f5eb6abe08bb209b144fb8317dabda81c | ORPH microblazeel | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/9586f21e447ef9923606b1385ff333138406b685 | ORPH sh4a | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/0b01487d1fa8ccc51d01b3e016cf61e3fd5758f2 | ORPH powerpc64 | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/1cefaabd9dcbeab708fb8393a729d742aadd97aa | ORPH i686 | hyperfine-1.14.0 | NOK | http://autobuild.buildroot.net/results/1de699415cc297c05677bc348208ec0f883e78fd | ORPH powerpc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/38e0a4cadca15ed52868f00af61f91e925c6b7c7 | microblazeel | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/e59369649bde549f408f41529cf565e25d6200bd | powerpc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/a94c1acc82f8bcf3756d8aeb9c59826a5756ee99 | arm | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/5ce5ebd20e0e509b31b51d2ec1aed56fdb8f45aa | riscv32 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/63d6be1feecf2c847e7008c32e8d2a765f63e9f9 | sh4a | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/bb07359b3516235db6d5ce67e8379da84e9f726c | ORPH sh4 | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/eba37e83f302d30ababf0949b8da51ac60058d13 | ORPH x86_64 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/f65044e76e812654bf067bf2c8b28f8240263b9b | sh4aeb | lapack-3.10.1 | NOK | http://autobuild.buildroot.net/results/e0cbb723eb99a5999d6260497ea5ea029d61af33 | mips64el | libabseil-cpp-20220623.1 | NOK | http://autobuild.buildroot.net/results/3ac532aecb1106ede29d5f99c9afd6107504cdb6 | sh4a | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/62aeed8c8c7c9611bf5b409d20455c2ba596aeb3 | sh4 | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/cf225eb28aa9580e35bc86f0b87a4caab435fcef | aarch64 | libconfig-1.7.3 | NOK | http://autobuild.buildroot.net/results/aabf785da6db207343766a777c488c758df41356 | or1k | libfreeimage-3.18.0 | NOK | http://autobuild.buildroot.net/results/a75cb339d92a7482165dd97827f02e1662f083da | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/ffabea099d81543c8a04d0201341b243389d5de5 | aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/7d0574d43a513b01ac256eee150f793ed6bff25c | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/eccb35faa8f9f84d87219ee8add23d16bd3a5692 | ORPH powerpc | libsigsegv-2.14 | NOK | http://autobuild.buildroot.net/results/2e2e8b523d17ec7e89f4bb9115f1c7260d8b7809 | mipsel | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/94009bd18c71b86468e031063c2b195ec2f37031 | microblaze | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/60b92b55a5ac5e2d726f66d97792c5f62527ec47 | xtensa | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/ce9015a905f2860e088c989be76fd878238b5082 | or1k | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/589e3f217ede6cb5c224c1467fbb0c8f3a009df7 | powerpc64 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/1888befd0c4867ccd4249b901c027c925fc5bb49 | powerpc64le | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/2627551872a0afb33ee6d97903e07684cf9d7149 | powerpc64 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/403cf28ce2039ba51c604bad23e18ad1e6ad21e5 | powerpc | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/0528038e9c4fca29cfa0731996d25aa135966d71 | powerpc64 | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/98fba34626ad02ed98f71cd73a7da941e34052bc | ORPH m68k | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/5511e3e0c0029b988f903ef9e0aa03e91f88f79c | ORPH m68k | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/c592c8ddc5ad24c9d9c09dcdf8c7268ce9ccb089 | ORPH microblazeel | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/cf0b78363cf6d3fdf49cf8a30ec3ab649f0b48d6 | ORPH m68k | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/dba18a1b2f3f560a47f89f988d1e5b7c9de2b546 | ORPH arceb | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/668e9b3020a1a253226cbee0ea1f9cd4bc1ee681 | ORPH mipsel | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/2a492d98ed7ebec57f12ab5588478b25dec163ba | ORPH s390x | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/273607113f8a8afd1b1fb695c3552a54c4771691 | ORPH i686 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/56e3aa46772567a035ca09d859d3c2938a1f4189 | arc | lttng-babeltrace-1.5.7 | NOK | http://autobuild.buildroot.net/results/536d10efb3b8913298786b2ddfde26f11a59d51f | aarch64_be | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/29be208f6cacc7920867d0d76574b8d45c0f083e | i686 | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/5dbfa36db747ba0ea876926cdc7de8e0fc5f31c2 | arm | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/98cde5cbb0844c6ef483a75cf9a6f3fd3a46c693 | mips64el | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/fa9e1f49bf69f03ce20f6fa336feb324256f6315 | mips | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/21600e7c4cb5af878fc043b10e0dcd6d7ff5f22a | microblazeel | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/e623d598bdf893993ea3a680a95a3877e7add9aa | arc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/370d32f544f3719e41e19d79899fc96f225d6cac | mips64el | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/9531ce11da24aeaf5c3a8298ef6d2c80ea813802 | or1k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/530adc2f3189befb6e1b5ba9db85a44f8a1a9021 | ORPH s390x | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/77a8e92cd95f8929504ae7897f625adbf9742024 | ORPH nios2 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/ee15cadf8af10dee6c83b9726a034367e8ae81a7 | ORPH xtensa | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/535a9be77ccc7f768f1616188305604d9b25f24a | ORPH or1k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/b15b57cd23888479cd7c2f479dc427b69901a3ee | ORPH i686 | ntpsec-1_2_2 | NOK | http://autobuild.buildroot.net/results/ded9ad5badbcfa6552443d3ce0866722becfefbd | ORPH aarch64_be | nut-2.8.0 | NOK | http://autobuild.buildroot.net/results/0767d9ddaac0f9adeeaf51ab224581db4af82205 | aarch64_be | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/9af794e5edb25c412d42a8391c8dd848cc9904ca | ORPH microblaze | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/e172b3a52a07e952b36a65badfc644e21beb3edd | ORPH armeb | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/25991d47ce351dca226ad7790ce0bb9a2caf374c | ORPH powerpc64 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/d01a159fdac9b440fb8246db3b393a537bf38d52 | ORPH powerpc64 | open-iscsi-2.1.8 | NOK | http://autobuild.buildroot.net/results/708a4865127056edbbd0d9aa36b82a7a5536a295 | mips | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/6093ba0d71d0968364f7889643f601862a19b393 | nios2 | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/427df6254c2cabb6d6f6dd31260ef24ac86d92dc | m68k | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/bfb49061e2fdf7fcb105c1b8a1421d9bb819702a | mips64 | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/a0189b45f2213784649a231eb7998fd4db71bf9a | x86_64 | pcm-tools-202110 | NOK | http://autobuild.buildroot.net/results/4c7fc3436a61d1f0c831d613c92168b801190cdd | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/761f4ef258a3c14cc48a2ed2aaadda15df30ee71 | ORPH microblazeel | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/8f856a13d9d78d3e2a8d339cb52f51bb0124615c | arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/7a89f9a069b2a256f73e9ee53a1cd4f0797d0d9a | sparc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/5826e6679c33c0a84edbd9e4e7dc55a384ec749c | m68k | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/d6feb5bd3acadeb0164141b05ef6c97f9642f680 | arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/2b3d90f3e950fc637310e5c21785d91413eeeba0 | arm | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/577c67286726586352746175e86104ff540bd479 | powerpc64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/c69630c492d8a6aeafd959dace8fc7041100aece | mips64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/cf389d379aef4d28d04178f82f0503b72cc24f79 | mips | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/c7c5a40afeba25f05007759d84ea7850b36af1aa | aarch64_be | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/87b8ec115e8afdf76e45c950d0355b596b60d89a | ORPH aarch64 | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/7e944e85dbeac9c52d70908ce2e45f7fbb73f71b | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/203ad24296055a8afd21898a8e48f6f7fac15d40 | ORPH powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/4a54d6e9626822594c29977d7cf6d2a8acc1f3f5 | mips | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/804670356082aee41b38c1872af5b0323495257d | powerpc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/d2d59f11ac6dc62b2163f291f0c8353b04b341e9 | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/c926e1c1358cf9650230839e115b8ec363ff4b0a | sparc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/b40e3253606dda61de72fab1a0321f5889924cb0 | mips | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/99d250ef86ed66df7f64050dd20165021c08b74c | mips | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/59aa7537ac4e60d98415ccbdc0eec7445d94767b | mips64el | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/cf249a82c83d3c8503205f4c3c5859dd9d52afdf | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/0b67381e3643c134c92cbcd1c5dc258fd760cd7e | m68k | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/d901e81395103b1d784dd3398d64f71809db7586 | mips | s6-linux-utils-2.6.0.0 | NOK | http://autobuild.buildroot.net/results/31b42e8d1765e7512ba190c1d043c459fc11f99d | sh4aeb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/38c0a387b500b395042e6ed3a93f5357b12bc040 | ORPH aarch64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/81b931be9cba5e69cf28e13cb8a0fee7f099a641 | mipsel | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/fcbcffa45ef26e17f11072a48b53f5369ffec420 | mips64el | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/2062df87a28a3214c13179672e7abfeac4191bc1 | ORPH xtensa | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/7ae064051f12059deed6dcb64f5a096608242c32 | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/b76278723569a04a0189d03cc7169ed646216b13 | powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/7de65b7c3731a5f8ea51023506b7227d8080f4f1 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/8914fd4bf23dae086c42dda9aa2140c9958c60eb | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/0a7868c0ebcecb2ea81e7c7355822b42bfdc66ad | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/700c4cd88ab2a3ad5ef75adde1433511d20e3164 | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/0aa80f89474705de174b15c7bd5ca6006c39870d | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/a35bac666a24946f823791121765f8fb4940a665 | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/d3e5ca15a2d61df801e8e2695631f1ad0560167b | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/f4e9722b48fad831d44f30838b65421ea1807dde | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/4443c29facfa10970d333e2b9332efec46c6c6e9 | i586 | v4l2loopback-0.12.7 | NOK | http://autobuild.buildroot.net/results/f12168f8734c95322bdbedaa4dc54b80435cb97e | sparc | wireguard-linux-compat-1.0.... | NOK | http://autobuild.buildroot.net/results/759a968f720280939121141a00ecaf2d349ca658 | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/8d714da87c984c426c5125d6def7db8b08adbfb5 | mips64el | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/6a782b69f7ed8d37a728c850d52454fb565ff48e | x86_64 | wtfutil-0.41.0 | NOK | http://autobuild.buildroot.net/results/bc40c07bfa6776a64a084ab629dd0464b65ca226 | m68k | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/4dc049b1efe2bb7b43927c3240a64bd68f2e7d64 | mips64el | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/ceba9f5f343e43cb96c06b1020f3688df464174a | ORPH sparc | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/2edc321b6997f8201508700268d502ed309d165f | ORPH powerpc64le | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/303072f15f6fcd64f38833cb3ebda93b0286af69 | mips | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/01e2f4e5a3cc428ae55d8cc3752576639b59dc2c | or1k | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/865837a9dbb6ad33499fb77e9af4a8a2ed6da02a | aarch64_be | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/4e1a75ba8aee66bd6b004056c875f17379d39add | x86_64 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/0375da69ecc7922d7c73b4ade9d1b64a7e305ea2 | m68k | znc-1.8.2 | NOK | http://autobuild.buildroot.net/results/26de9b6fd9d56f754595c0c743aaa471694cd62d | Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 2 frr-8.1 | 1 mongodb-4.2.18 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/5d79860cb6217f401463dc5fbb2634b91a8bf382 | arm | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/e113d9faf7dc13b0571faca4da90a35fda38afa6 | mipsel | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/e75d8ef60bc7a55b7601b928c2eda720e918758c | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/2066a3ac5da2f84576984cf773437f08c80fe575 | Classification of failures by reason for 2022.11.x -------------------------------------------------- gobject-introspection-1.72.0 | 2 janus-gateway-1.0.3 | 2 unknown | 2 dhcp-4.4.3-P1 | 1 host-go-1.19.5 | 1 host-pahole-1.24 | 1 lirc-tools-0.10.2 | 1 live555-2021.05.03 | 1 mutt-2.2.9 | 1 perl-5.34.1 | 1 xxhash-0.8.1 | 1 xz-5.2.7 | 1 zabbix-5.4.9 | 1 zeek-4.1.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4a | dhcp-4.4.3-P1 | NOK | http://autobuild.buildroot.net/results/94dbe4b9285cfe63d60e524f5de53754d5a8fdc2 | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8067785e2f84506206bef68e977bc84d8a8ff718 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7d6e0d65c9435492fb8b204d784afe9cf2124ff2 | ORPH mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/b23516c8f334f6492655a21a34ba33606db57b3c | arceb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/4bdf87664897da259f8196696e74be7967d12e51 | mipsel | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/e195dedcba11c3c577714ff5f1caaa0675a619aa | powerpc64 | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/57e7ba20af262705e1a974422361d97b6fa7750f | mips64el | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/063eba26bd4bfd3ed18974085cc7571cb388b8f2 | ORPH riscv64 | live555-2021.05.03 | NOK | http://autobuild.buildroot.net/results/5c5a1434f1b38dca9d87186faaf10dbce569bfd1 | ORPH sparc64 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/11aaec164eeac132c0da152fed335d1fd86360fb | arc | perl-5.34.1 | NOK | http://autobuild.buildroot.net/results/969ab380b5522025b8f36c6bc60afd9c11c566ce | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/d5fbcc0b014c534c9ce2a3b34fa6830ab1604579 | arc | unknown | NOK | http://autobuild.buildroot.net/results/57e88b808b62b66a2205aa3186c3df2327435dcf | mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/36d675dfd4416a47483308ca15f9242cd6a4ab2f | ORPH microblazeel | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/03c5f0c63a9bf36dcd8d40d4edc8a54b00d07d93 | ORPH nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/ff5916b936f5418c568c2fb6476673db8c9ccffc | m68k | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/6b39e96ae2daf0b0c7f8b62b6be6aeed4402c757 | Gitlab CI results for 2023-02-08 ================================ -- http://autobuild.buildroot.net From peter at korsgaard.com Thu Feb 9 06:54:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 09 Feb 2023 07:54:52 +0100 Subject: [Buildroot] OpenSSL v3.0 In-Reply-To: (Afshin Pir's message of "Wed, 8 Feb 2023 19:44:51 +0000") References: Message-ID: <87mt5nfhvn.fsf@dell.be.48ers.dk> >>>>> "Afshin" == Afshin Pir writes: > Hi > I wonder whether buildroot currently working on OpenSSL v3.0 package > def or not. If not, what are the challenges for building this package? > Because I need to migrate to OpenSSL v3.0 in my buildroot and I like > to know how I can do it. There has been various discussions but currently no concrete patches for openssl 3.0 support. Most likely not all packages will work with openssl 3.0, so we might need to keep the current openssl 1.1 package for a bit and offer openssl 3.0 as a separate package. Openssl 1.1.x indeed goes EOL in September, so it would be great if someone could work on it soon! -- Bye, Peter Korsgaard From ps.report at gmx.net Thu Feb 9 07:19:22 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 9 Feb 2023 08:19:22 +0100 Subject: [Buildroot] [PATCH 1/1] board/raspberrypi4: bump kernel version to 5.15.68 In-Reply-To: <20230208184323.34219f84@gmx.net> References: <20220926051956.3272067-1-buildroot@athaariq.my.id> <20230208144639.764af681@windsurf> <20230208184323.34219f84@gmx.net> Message-ID: <20230209081922.054039f1@gmx.net> On Wed, 8 Feb 2023 18:43:23 +0100, Peter Seiderer wrote: > On Wed, 8 Feb 2023 14:46:39 +0100, Thomas Petazzoni via buildroot wrote: > > > Hello Athaariq, > > > > On Mon, 26 Sep 2022 05:20:15 +0000 (UTC) > > Athaariq Ardhiansyah wrote: > > > > > First of all, kernel support for Raspberry Pi is way too old relative to stable version. Second, we actually have several bug fixes regarding the kernel including HDMI hotplug and more problems on graphic stacks. However, I only have Raspberry Pi 4B so I cannot test the changes for other Raspberry Pi models. For anyone who has those boards, please help us to bump and test the kernel. > > > > > > Signed-off-by: Athaariq Ardhiansyah > > > > Thanks for your patch. It would indeed be nice to update our > > RaspberryPi defconfigs, but there are a number of questions which need > > to be answered before we can apply your patch. > > > > First of all, a small detail: your commit log must be wrapped at ~80 > > columns. Also, it shouldn't use 1st person sentence "I only have". > > > > > diff --git a/board/raspberrypi/linux.fragment b/board/raspberrypi/linux.fragment > > > new file mode 100644 > > > index 0000000000..798b2e91da > > > --- /dev/null > > > +++ b/board/raspberrypi/linux.fragment > > > @@ -0,0 +1,7 @@ > > > +# Dynamic CPU Clock > > > +CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=n > > > +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > > > + > > > +# Fix Kernel Module won't Load > > > +CONFIG_MODULE_COMPRESS_XZ=n > > > +CONFIG_MODULE_COMPRESS_NONE=y > > > > Why is this Linux kernel configuration fragment needed? There is no > > explanation in your commit log. Changing the default CPU governor > > should not be needed, and the second chunk about kernel module > > compression is a bit strange and deserves some explanation. > > > > Upstream defconfigs changed to CONFIG_MODULE_COMPRESS_XZ (see [1] and [2]), > alternative would be to enable the following in the buildroot > raspberry*_defconfigs: > > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > BR2_PACKAGE_XZ > BR2_PACKAGE_KMOD > BR2_PACKAGE_KMOD_TOOLS > BR2_PACKAGE_HOST_KMOD_XZ > > Regards, > Peter ...ups, and the missing links: [1] https://github.com/raspberrypi/linux/commit/c45b4223a4e4a8cfe39edbb4949329ea478fa4e2 [2] https://github.com/raspberrypi/linux/issues/4966 Regards, Peter > > > > > diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig > > > index 5942f7c4e1..6d90a8f004 100644 > > > --- a/configs/raspberrypi4_64_defconfig > > > +++ b/configs/raspberrypi4_64_defconfig > > > @@ -6,13 +6,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > > > > > BR2_SYSTEM_DHCP="eth0" > > > > > > -# Linux headers same as kernel, a 5.10 series > > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > > +# Linux headers same as kernel, a 5.15 series > > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > > > > > BR2_LINUX_KERNEL=y > > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,155b736f0ff883415d374ba743473f5ef146814b)/linux-155b736f0ff883415d374ba743473f5ef146814b.tar.gz" > > > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi4-64/linux.fragment" > > > > > > # Build the DTB from the kernel sources > > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > > @@ -23,6 +24,9 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > > BR2_PACKAGE_RPI_FIRMWARE=y > > > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > > > BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4-64/config_4_64bit.txt" > > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y > > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y > > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y > > > > Why is this being added? > > > > > # Required tools to create the SD image > > > BR2_PACKAGE_HOST_DOSFSTOOLS=y > > > diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig > > > index 4e5580c140..f0947c329c 100644 > > > --- a/configs/raspberrypi4_defconfig > > > +++ b/configs/raspberrypi4_defconfig > > > @@ -6,13 +6,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > > > > > BR2_SYSTEM_DHCP="eth0" > > > > > > -# Linux headers same as kernel, a 5.10 series > > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > > +# Linux headers same as kernel, a 5.15 series > > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > > > > > BR2_LINUX_KERNEL=y > > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,155b736f0ff883415d374ba743473f5ef146814b)/linux-155b736f0ff883415d374ba743473f5ef146814b.tar.gz" > > > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi4/linux.fragment" > > > > > > # Build the DTB from the kernel sources > > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > > @@ -23,6 +24,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > > BR2_PACKAGE_RPI_FIRMWARE=y > > > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > > > BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4/config_4.txt" > > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y > > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y > > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y > > > +BR2_PACKAGE_RPI_USERLAND=y > > > > Why is rpi-userland being added here, and not to the other defconfig above? > > > > Also, you're updating rpi-firmware, rpi-userland and RaspberryPi > > defconfigs in the same commit. Is this because they need to be updated > > in sync? If that's the case, is there a potential problem if we update > > rpi-firmware/rpi-userland, but not the defconfigs for RaspberryPi 1/2/3 ? > > > > Thanks a lot for your feedback! > > > > Thomas > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Thu Feb 9 07:51:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 9 Feb 2023 08:51:04 +0100 Subject: [Buildroot] [PATCH 1/1] board/raspberrypi4: bump kernel version to 5.15.68 In-Reply-To: <20230209081922.054039f1@gmx.net> References: <20220926051956.3272067-1-buildroot@athaariq.my.id> <20230208144639.764af681@windsurf> <20230208184323.34219f84@gmx.net> <20230209081922.054039f1@gmx.net> Message-ID: <20230209085104.3a41b07b@windsurf> On Thu, 9 Feb 2023 08:19:22 +0100 Peter Seiderer wrote: > > Upstream defconfigs changed to CONFIG_MODULE_COMPRESS_XZ (see [1] and [2]), > > alternative would be to enable the following in the buildroot > > raspberry*_defconfigs: > > > > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > > BR2_PACKAGE_XZ > > BR2_PACKAGE_KMOD > > BR2_PACKAGE_KMOD_TOOLS > > BR2_PACKAGE_HOST_KMOD_XZ > > > > Regards, > > Peter > > ...ups, and the missing links: > > [1] https://github.com/raspberrypi/linux/commit/c45b4223a4e4a8cfe39edbb4949329ea478fa4e2 > [2] https://github.com/raspberrypi/linux/issues/4966 Thanks for the extra info! Peter, in the past I believe you have been maintaining those raspberrypi defconfigs. Any chance that you send an update for all raspberrypi defconfigs again? :-) Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 9 07:54:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 9 Feb 2023 08:54:19 +0100 Subject: [Buildroot] [PATCH] arch: move global and rename variable BR2_PACKAGE_Z3_ARCH_SUPPORTS In-Reply-To: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> References: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> Message-ID: <20230209085419.29494fbb@windsurf> On Thu, 9 Feb 2023 01:48:23 +0100 Giulio Benetti wrote: > Package quickjs fails to build on architectures that don't support full > float rounding. To support all kind of float rounding FE_DOWNWARD, > FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD must be defined in fenv.h. > Since package z3 locally implements this check let's make it global, > rename it to be generic and use it for both package quickjs and z3. > > Fixes: > http://autobuild.buildroot.net/results/0b6/0b67381e3643c134c92cbcd1c5dc258fd760cd7e/ > http://autobuild.buildroot.net/results/cf2/cf249a82c83d3c8503205f4c3c5859dd9d52afdf/ > http://autobuild.buildroot.net/results/9b3/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2/ > http://autobuild.buildroot.net/results/4f1/4f13cf7d353260c6b8934dbdcf267bea884b356b/ > > Signed-off-by: Giulio Benetti Apparently https://patchwork.ozlabs.org/project/buildroot/patch/20221216221934.465323-1-ju.o at free.fr/ would also need the same thing. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From hrsourabh011 at gmail.com Thu Feb 9 08:14:09 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 9 Feb 2023 09:14:09 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: Hello Maxim, Thanks for the explanation. When I tried this : utils/scanpypi awscrt awsiotsdk -o package , I am getting below error: utils/scanpypi:21: DeprecationWarning: the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses import imp Traceback (most recent call last): File "utils/scanpypi", line 23, in import six.moves.urllib.request ModuleNotFoundError: No module named 'six' Any idea what this is about? On Thu, 9 Feb 2023 at 06:35, Maxim Kochetkov wrote: > > > On 09.02.2023 00:28, Sourabh Hegde wrote: > > Hello Maxim, > > > > Thanks for the update. > > > > I think for me, the option "18.9.3. Generating a python-package from a > > PyPI repository" > > > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages > < > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages> is > suited. > > I want to install this package https://pypi.org/project/awsiotsdk/ > > . And this package requires > > https://pypi.org/project/awscrt/ as > > dependency. Should I create both Buildroot packages from python packages? > > Sure. > > > In the Buildroot manual, it's mentioned "Find the external python > > modules menu and insert your package inside.", what should I insert > > here? source code? > > The output from scanpypi util. "This will generate packages python-foo > and python-bar in the package folder if they exist on > https://pypi.python.org." > > "external python modules" is located at package/Config.in: > > ... > if BR2_PACKAGE_PYTHON3 > menu "External python modules" > source "package/python-aenum/Config.in" > source "package/python-aexpect/Config.in" > ... > > Try this sequence: > > utils/scanpypi awscrt awsiotsdk -o package > > then add > source "package/python-awscrt/Config.in" > source "package/python-awsiotsdk/Config.in" > to the package/Config.in > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Thu Feb 9 08:58:50 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Thu, 9 Feb 2023 11:58:50 +0300 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: On 09.02.2023 11:14, Sourabh Hegde wrote: > Hello Maxim, > > Thanks for the explanation. > > When I tried this :?utils/scanpypi awscrt awsiotsdk -o package ,? I am > getting below error: > > utils/scanpypi:21: DeprecationWarning: the imp module is deprecated in > favour of importlib; see the module's documentation for alternative uses > ? import imp > Traceback (most recent call last): > ? File "utils/scanpypi", line 23, in > ? ? import six.moves.urllib.request > ModuleNotFoundError: No module named 'six' You have no "six" module installed for python. I have to install it first. For ubuntu: sudo apt install python3-six From hrsourabh011 at gmail.com Thu Feb 9 09:03:09 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 9 Feb 2023 10:03:09 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: Hello Maxim, Update: The above issue resolved by itself! Now when I do: utils/scanpypi awscrt -o package , it says spdx_lookup module is not installed. This can lead to an inaccurate licence detection. Please install it via pip install spdx_lookup buildroot package name for awscrt: python-awscrt Package: python-awscrt Fetching package awscrt ERROR: Could not find package awscrt. Check syntax inside the python package index: https://pypi.python.org/pypi/ But the package is available at https://pypi.org/project/awscrt/ On Thu, 9 Feb 2023 at 09:58, Maxim Kochetkov wrote: > > > On 09.02.2023 11:14, Sourabh Hegde wrote: > > Hello Maxim, > > > > Thanks for the explanation. > > > > When I tried this : utils/scanpypi awscrt awsiotsdk -o package , I am > > getting below error: > > > > utils/scanpypi:21: DeprecationWarning: the imp module is deprecated in > > favour of importlib; see the module's documentation for alternative uses > > import imp > > Traceback (most recent call last): > > File "utils/scanpypi", line 23, in > > import six.moves.urllib.request > > ModuleNotFoundError: No module named 'six' > > You have no "six" module installed for python. I have to install it > first. For ubuntu: sudo apt install python3-six > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Thu Feb 9 09:10:37 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Thu, 9 Feb 2023 12:10:37 +0300 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: On 09.02.2023 12:03, Sourabh Hegde wrote: > Hello Maxim, > > Update: > > The above issue resolved by itself! > > Now when I do:?utils/scanpypi awscrt -o package , it says > > spdx_lookup module is not installed. This can lead to an inaccurate > licence detection. Please install it via > pip install spdx_lookup > buildroot package name for awscrt: python-awscrt > Package: python-awscrt > Fetching package awscrt > ERROR: Could not find package awscrt. > Check syntax inside the python package index: > https://pypi.python.org/pypi/ > > But the package is available?at https://pypi.org/project/awscrt/ > It works fine for me: buildroot package name for awscrt: python-awscrt Package: python-awscrt Fetching package awscrt Downloading package awscrt from https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz... Checking if package package/python-awscrt already exists... Creating package/python-awscrt/python-awscrt.mk... More than one file found for license: LICENSE, crt/aws-c-common/LICENSE, crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, crt/aws-c-cal/LICENSE, crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE Creating package/python-awscrt/python-awscrt.hash... Creating package/python-awscrt/Config.in... NOTE: Remember to also make an update to the DEVELOPERS file and include an entry for the pkg in packages/Config.in From hrsourabh011 at gmail.com Thu Feb 9 09:28:47 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 9 Feb 2023 10:28:47 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: Hi Maxim, I was missing python setuptools on my host. After installing it, I can add the package. Also, the added package is available in menuconfig Thank you for the support! On Thu, 9 Feb 2023 at 10:10, Maxim Kochetkov wrote: > > > On 09.02.2023 12:03, Sourabh Hegde wrote: > > Hello Maxim, > > > > Update: > > > > The above issue resolved by itself! > > > > Now when I do: utils/scanpypi awscrt -o package , it says > > > > spdx_lookup module is not installed. This can lead to an inaccurate > > licence detection. Please install it via > > pip install spdx_lookup > > buildroot package name for awscrt: python-awscrt > > Package: python-awscrt > > Fetching package awscrt > > ERROR: Could not find package awscrt. > > Check syntax inside the python package index: > > https://pypi.python.org/pypi/ > > > > But the package is available at https://pypi.org/project/awscrt/ > > > > It works fine for me: > > buildroot package name for awscrt: python-awscrt > Package: python-awscrt > Fetching package awscrt > Downloading package awscrt from > > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz. > .. > Checking if package package/python-awscrt already exists... > Creating package/python-awscrt/python-awscrt.mk... > More than one file found for license: LICENSE, crt/aws-c-common/LICENSE, > crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, > crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, > crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, > crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, > crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, crt/aws-c-cal/LICENSE, > crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE > Creating package/python-awscrt/python-awscrt.hash... > Creating package/python-awscrt/Config.in... > NOTE: Remember to also make an update to the DEVELOPERS file > and include an entry for the pkg in packages/Config.in > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From hrsourabh011 at gmail.com Thu Feb 9 12:09:37 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 9 Feb 2023 13:09:37 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: Hello Maxim, While doing make with new Buildroot-packages I getting: [ 51%] Building ASM object aws-lc/crypto/CMakeFiles/crypto_objects.dir/hrss/asm/poly_rq_mul.S.o /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S: Assembler messages: /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:304: Error: unknown pseudo-op: `.att_syntax' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:307: Error: unknown mnemonic `push' -- `push %rbp' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:309: Error: bad register expression /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:310: Error: unknown mnemonic `movq' -- `movq %rsp,%rbp' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:311: Error: bad register expression /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:312: Error: unknown mnemonic `push' -- `push %r12' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:313: Error: bad register expression /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:321: Error: operand 1 must be an integer register -- `mov %rcx,%r8' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:322: Error: unknown mnemonic `addq' -- `addq $6144+12288+512+9408+32,%r8' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:323: Error: operand 1 must be an integer register -- `mov %r8,%rax' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:324: Error: unknown mnemonic `subq' -- `subq $6144,%r8' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:325: Error: operand 1 must be an integer register -- `mov %r8,%r11' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:326: Error: unknown mnemonic `subq' -- `subq $12288,%r8' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:327: Error: operand 1 must be an integer register -- `mov %r8,%r12' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:328: Error: unknown mnemonic `subq' -- `subq $512,%r8' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:329: Error: unknown mnemonic `vmovdqa' -- `vmovdqa const3(%rip),%ymm3' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:330: Error: unknown mnemonic `vmovdqu' -- `vmovdqu 0(%rsi),%ymm0' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:331: Error: unknown mnemonic `vmovdqu' -- `vmovdqu 88(%rsi),%ymm1' . . . Any idea what it is complaining about? Thanks in advance On Thu, 9 Feb 2023 at 10:28, Sourabh Hegde wrote: > Hi Maxim, > > I was missing python setuptools on my host. After installing it, I can add > the package. Also, the added package is available in menuconfig > > Thank you for the support! > > On Thu, 9 Feb 2023 at 10:10, Maxim Kochetkov wrote: > >> >> >> On 09.02.2023 12:03, Sourabh Hegde wrote: >> > Hello Maxim, >> > >> > Update: >> > >> > The above issue resolved by itself! >> > >> > Now when I do: utils/scanpypi awscrt -o package , it says >> > >> > spdx_lookup module is not installed. This can lead to an inaccurate >> > licence detection. Please install it via >> > pip install spdx_lookup >> > buildroot package name for awscrt: python-awscrt >> > Package: python-awscrt >> > Fetching package awscrt >> > ERROR: Could not find package awscrt. >> > Check syntax inside the python package index: >> > https://pypi.python.org/pypi/ >> > >> > But the package is available at https://pypi.org/project/awscrt/ >> > >> >> It works fine for me: >> >> buildroot package name for awscrt: python-awscrt >> Package: python-awscrt >> Fetching package awscrt >> Downloading package awscrt from >> >> https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz. >> .. >> Checking if package package/python-awscrt already exists... >> Creating package/python-awscrt/python-awscrt.mk... >> More than one file found for license: LICENSE, crt/aws-c-common/LICENSE, >> crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, >> crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, >> crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, >> crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, >> crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, crt/aws-c-cal/LICENSE, >> crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE >> Creating package/python-awscrt/python-awscrt.hash... >> Creating package/python-awscrt/Config.in... >> NOTE: Remember to also make an update to the DEVELOPERS file >> and include an entry for the pkg in packages/Config.in >> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: From Shahab.Vahedi at synopsys.com Thu Feb 9 12:23:57 2023 From: Shahab.Vahedi at synopsys.com (Shahab Vahedi) Date: Thu, 9 Feb 2023 12:23:57 +0000 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: revert bpf_cookie patch to allow building In-Reply-To: References: <97ea44bb-58fe-d6cb-6c79-9be0b245f2c6@synopsys.com> <29d2a8c7-44cd-da42-5fed-f17ec0f8ccf2@synopsys.com> Message-ID: Hi Arnout, On 2/8/23 17:36, Arnout Vandecappelle wrote: > > It's not clear to me why you did a revert of the cookie feature rather than > using those patches. I think the first two or three should be sufficient to > fix your issue? Ideally, the correct way would be applying that pending series. But since there were comments that some of the patches might need reworking [1], I did not feel confident to add them. Therefore, I tried to keep my solution minimal and solve it by eliminating the problem. I know, it is not appealing. > For the time being, I marked this as Changes Requested. If the upstream > patches are not sufficient, please send a mail upstream (as a reply to that > series) explaining the problem (again), and re-send this patch to > Buildroot. If it does fix things, please send a mail upstream to ask to > move the series forward (explaining the issue you have), and send a patch > to Buildroot that adds the needed patches. They (re)confirmed the issue to me in the past [2] and are aware that its solution is missing from all the releases onward (see the first point of "Known bugs" in the release page [3]). [1] https://lore.kernel.org/bpf/20220421003152.339542-3-alobakin at pm.me/T/#rb9ce86e9f25b2d097b88d87af8ffdfa401d63c68 [2] https://lore.kernel.org/bpf/b1a604e1-be09-ac0b-ff22-b194ae9ce886 at isovalent.com/ [3] https://github.com/libbpf/bpftool/releases -- Shahab From bugzilla at busybox.net Thu Feb 9 13:20:03 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 09 Feb 2023 13:20:03 +0000 Subject: [Buildroot] [Bug 15321] New: docker-engine now requires libseccomp by default Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15321 Bug ID: 15321 Summary: docker-engine now requires libseccomp by default Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: dominique.tronche at atos.net CC: buildroot at uclibc.org Target Milestone: --- While trying to build our project which uses docker-engine on the master branch of buildroot which has integrated the major release 23.0.0, the following error message is diplayed when starting the docker containers: Error response from daemon: failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: seccomp: config provided but seccomp not supported: unknown Error: failed to start containers >From docker release note (https://docs.docker.com/engine/release-notes/23.0/) in section security, it seems docker is now always built with seccomp support I think the libseccomp package is therefore now necessary and a select on that package should be added in a Config.in file. It seems to be runc which is linked to the library -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Thu Feb 9 14:45:44 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 15:45:44 +0100 Subject: [Buildroot] [PATCH] arch: move global and rename variable BR2_PACKAGE_Z3_ARCH_SUPPORTS In-Reply-To: <20230209085419.29494fbb@windsurf> References: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> <20230209085419.29494fbb@windsurf> Message-ID: <548774bf-1542-e749-4c0b-200041d0a6b3@benettiengineering.com> On 09/02/23 08:54, Thomas Petazzoni via buildroot wrote: > Subject: > Re: [Buildroot] [PATCH] arch: move global and rename variable > BR2_PACKAGE_Z3_ARCH_SUPPORTS > From: > Thomas Petazzoni via buildroot > Date: > 09/02/23, 08:54 > > To: > Giulio Benetti > CC: > Julien Olivain , buildroot at buildroot.org > > > On Thu, 9 Feb 2023 01:48:23 +0100 > Giulio Benetti wrote: > >> Package quickjs fails to build on architectures that don't support full >> float rounding. To support all kind of float rounding FE_DOWNWARD, >> FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD must be defined in fenv.h. >> Since package z3 locally implements this check let's make it global, >> rename it to be generic and use it for both package quickjs and z3. >> >> Fixes: >> http://autobuild.buildroot.net/results/0b6/0b67381e3643c134c92cbcd1c5dc258fd760cd7e/ >> http://autobuild.buildroot.net/results/cf2/cf249a82c83d3c8503205f4c3c5859dd9d52afdf/ >> http://autobuild.buildroot.net/results/9b3/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2/ >> http://autobuild.buildroot.net/results/4f1/4f13cf7d353260c6b8934dbdcf267bea884b356b/ >> >> Signed-off-by: Giulio Benetti > Apparently > https://patchwork.ozlabs.org/project/buildroot/patch/20221216221934.465323-1-ju.o at free.fr/ > would also need the same thing. Yes, it requires it too once it is applied. I can modify my patch if you apply the swipl one before. No problem. Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 9 17:05:15 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 18:05:15 +0100 Subject: [Buildroot] [PATCH 1/2] package/libgtk3: fix build failure on libinput due to the presence of atk-bridge-2.0 in gtk+-3.0.pc In-Reply-To: References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> <20230208230721.3269610-2-giulio.benetti@benettiengineering.com> Message-ID: <56b9f619-6c20-7d96-9544-c91488a7c974@benettiengineering.com> Hi Fran?ois, On 09/02/23 05:13, Fran?ois Perrad wrote: > > > Le?jeu. 9 f?vr. 2023 ??00:07, Giulio Benetti > > a ?crit?: > > Patch 0001-disable-atk-bridge.patch misses to remove: > atk_pkgs += ['atk-bridge-2.0'] > that is not affected by any meson variable, this results in having > libgtk3 > to have atk-bridge-2.0 in its gtk+-3.0.pc and so other libraries(i.e. > libinput) tries to {pkgconf}find it failing. So let's convert the > patch to > git format and add the removal of such line. > > Fixes: > still not found > > > this patch (disable-atk-bridge) will be removed soon, see > https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 > > (package/atk: remove package) thanks for pointing, I've tested with that patch and yes that patch and the modify I've proposed is not needed. Let's see what is committed first. Best regards -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Giulio Benetti > > --- > ?...h => 0001-Remove-atk-bridge-support.patch} | 31 +++++++++++++++++-- > ?1 file changed, 28 insertions(+), 3 deletions(-) > ?rename package/libgtk3/{0001-disable-atk-bridge.patch => > 0001-Remove-atk-bridge-support.patch} (59%) > > diff --git a/package/libgtk3/0001-disable-atk-bridge.patch > b/package/libgtk3/0001-Remove-atk-bridge-support.patch > similarity index 59% > rename from package/libgtk3/0001-disable-atk-bridge.patch > rename to package/libgtk3/0001-Remove-atk-bridge-support.patch > index f3e9bff2ba..b52c9be650 100644 > --- a/package/libgtk3/0001-disable-atk-bridge.patch > +++ b/package/libgtk3/0001-Remove-atk-bridge-support.patch > @@ -1,16 +1,27 @@ > -Remove atk-bridge support. > +From 923ba2a1653b942093e9d25f8f4d2e7c09a66328 Mon Sep 17 00:00:00 2001 > +From: Giulio Benetti > > +Date: Wed, 8 Feb 2023 23:50:56 +0100 > +Subject: [PATCH] Remove atk-bridge support. > > ?atk-bridge doesn't seem useful for now in Buildroot and requires to > ?add two new packages just for it: at-spi2-core and at-spi2-atk. > > ?Signed-off-by: Hadrien Boutteville > > +[Giulio: remove 'atk-bridge-2.0' too] > +Signed-off-by: Giulio Benetti > > > +--- > + gtk/a11y/gtkaccessibility.c | 8 -------- > + meson.build? ? ? ? ? ? ? ? ?| 4 +--- > + 2 files changed, 1 insertion(+), 11 deletions(-) > > +diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c > +index 7f0e5207d9..14da1e80e2 100644 > ?--- a/gtk/a11y/gtkaccessibility.c > ?+++ b/gtk/a11y/gtkaccessibility.c > ?@@ -37,10 +37,6 @@ > ? #include > ? #include > - > + > ?-#ifdef GDK_WINDOWING_X11 > ?-#include > ?-#endif > @@ -21,13 +32,15 @@ Signed-off-by: Hadrien Boutteville > > > ?@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) > ? ? _gtk_accessibility_override_atk_util (); > ? ? do_window_event_initialization (); > - > + > ?-#ifdef GDK_WINDOWING_X11 > ?-? atk_bridge_adaptor_init (NULL, NULL); > ?-#endif > ?- > ? ? atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); > ? } > +diff --git a/meson.build b/meson.build > +index aed48fc3f6..370bf1cce1 100644 > ?--- a/meson.build > ?+++ b/meson.build > ?@@ -564,7 +564,7 @@ if x11_enabled > @@ -39,3 +52,15 @@ Signed-off-by: Hadrien Boutteville > > > > ? ? backend_immodules += ['xim'] > > +@@ -583,8 +583,6 @@ if x11_enabled > +? ? ?x11_pkgs += ['xdamage'] > +? ?endif > + > +-? atk_pkgs += ['atk-bridge-2.0'] > +- > +? ?cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false) > +? ?cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false) > +? ?cdata.set('HAVE_XCOMPOSITE', xcomposite_dep.found() ? 1 : false) > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > > From peter at korsgaard.com Thu Feb 9 17:07:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 9 Feb 2023 18:07:05 +0100 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: Build with ninja Message-ID: <20230209170707.4066903-1-peter@korsgaard.com> Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b42ac3b644..a6974db926 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -139,4 +139,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# webkitgtk needs cmake >= 3.20 when not building with ninja, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WEBKITGTK_CONF_OPTS += -GNinja +WEBKITGTK_DEPENDENCIES += host-ninja + +define WEBKITGTK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + $(eval $(cmake-package)) -- 2.30.2 From peter at korsgaard.com Thu Feb 9 17:07:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 9 Feb 2023 18:07:06 +0100 Subject: [Buildroot] [PATCH 2/2] package/wpewebkit: Build with ninja In-Reply-To: <20230209170707.4066903-1-peter@korsgaard.com> References: <20230209170707.4066903-1-peter@korsgaard.com> Message-ID: <20230209170707.4066903-2-peter@korsgaard.com> Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 54f37fd702..b9c2fef395 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -103,4 +103,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# wpewebkit needs cmake >= 3.20 when building with the make backend, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WPEWEBKIT_CONF_OPTS += -GNinja +WPEWEBKIT_DEPENDENCIES += host-ninja + +define WPEWEBKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + $(eval $(cmake-package)) -- 2.30.2 From bmeng.cn at gmail.com Thu Feb 9 17:20:02 2023 From: bmeng.cn at gmail.com (Bin Meng) Date: Fri, 10 Feb 2023 01:20:02 +0800 Subject: [Buildroot] [PATCH] board/intel: galileo: Enable Linux kernel root file system on NFS Message-ID: <20230209172002.1442869-1-bmeng.cn@gmail.com> From: Bin Meng Update linux-3.14.config for Galileo to enable Linux kernel root file system on NFS. Signed-off-by: Bin Meng --- board/intel/galileo/linux-3.14.config | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/board/intel/galileo/linux-3.14.config b/board/intel/galileo/linux-3.14.config index e7aa9cf232..c658afb88e 100644 --- a/board/intel/galileo/linux-3.14.config +++ b/board/intel/galileo/linux-3.14.config @@ -154,9 +154,9 @@ CONFIG_TUN=y # CONFIG_NET_VENDOR_SILAN is not set # CONFIG_NET_VENDOR_SIS is not set # CONFIG_NET_VENDOR_SMSC is not set -CONFIG_STMMAC_ETH=m +CONFIG_STMMAC_ETH=y # CONFIG_STMMAC_PLATFORM is not set -CONFIG_STMMAC_PCI=m +CONFIG_STMMAC_PCI=y # CONFIG_NET_VENDOR_SUN is not set # CONFIG_NET_VENDOR_TEHUTI is not set # CONFIG_NET_VENDOR_TI is not set @@ -306,3 +306,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y # CONFIG_VIRTUALIZATION is not set CONFIG_CRC_T10DIF=y +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y +CONFIG_IP_PNP=y -- 2.25.1 From james.hilliard1 at gmail.com Thu Feb 9 18:52:03 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 9 Feb 2023 11:52:03 -0700 Subject: [Buildroot] [PATCH 1/1] package/pipewire-media-session: bump to version 0.4.2 Message-ID: <20230209185203.262016-1-james.hilliard1@gmail.com> Explicitly set installed_tests to disabled. Drop patch which is now upstream. Signed-off-by: James Hilliard --- ...remove-session-managers-option-check.patch | 36 ------------------- .../pipewire-media-session.hash | 2 +- .../pipewire-media-session.mk | 7 ++-- 3 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch diff --git a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch b/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch deleted file mode 100644 index fc1d25edb3..0000000000 --- a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1923c97fbd0b3d8cacdb72386886f860c818bccf Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Wed, 10 Nov 2021 08:54:06 -0700 -Subject: [PATCH] meson: remove session-managers option check. - -This option no longer exists and causes a build failure if building -with the systemd system service enabled. - -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/pipewire/media-session/-/merge_requests/24] ---- - systemd/system/meson.build | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/systemd/system/meson.build b/systemd/system/meson.build -index ab0d49064..0e9885b0f 100644 ---- a/systemd/system/meson.build -+++ b/systemd/system/meson.build -@@ -4,9 +4,7 @@ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunit - systemd_config = configuration_data() - systemd_config.set('PW_MEDIA_SESSION_BINARY', media_session_bindir / 'pipewire-media-session') - --if get_option('session-managers').contains('media-session') -- configure_file(input : 'pipewire-media-session.service.in', -- output : 'pipewire-media-session.service', -- configuration : systemd_config, -- install_dir : systemd_system_services_dir) --endif -+configure_file(input : 'pipewire-media-session.service.in', -+ output : 'pipewire-media-session.service', -+ configuration : systemd_config, -+ install_dir : systemd_system_services_dir) --- -2.25.1 - diff --git a/package/pipewire-media-session/pipewire-media-session.hash b/package/pipewire-media-session/pipewire-media-session.hash index e335fd8913..e6b176eea2 100644 --- a/package/pipewire-media-session/pipewire-media-session.hash +++ b/package/pipewire-media-session/pipewire-media-session.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ebdf9f8e389896fdc4b58da5f909afce18441b4b53d5b4f2104dd53586ea8681 media-session-0.4.1.tar.bz2 +sha256 26e21852e0834a4418b40eae342ac5178dfe40342b9c5afe204d43ef8aafa14e media-session-0.4.2.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 77b9c867237ef919e33c0fdbcf22ab84b1cf24a63f9431ec68759026b658c994 LICENSE diff --git a/package/pipewire-media-session/pipewire-media-session.mk b/package/pipewire-media-session/pipewire-media-session.mk index d349fd7454..cc7317f925 100644 --- a/package/pipewire-media-session/pipewire-media-session.mk +++ b/package/pipewire-media-session/pipewire-media-session.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.1 +PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.2 PIPEWIRE_MEDIA_SESSION_SOURCE = media-session-$(PIPEWIRE_MEDIA_SESSION_VERSION).tar.bz2 PIPEWIRE_MEDIA_SESSION_SITE = https://gitlab.freedesktop.org/pipewire/media-session/-/archive/$(PIPEWIRE_MEDIA_SESSION_VERSION) PIPEWIRE_MEDIA_SESSION_LICENSE = MIT @@ -17,7 +17,10 @@ PIPEWIRE_MEDIA_SESSION_DEPENDENCIES = \ pipewire \ $(TARGET_NLS_DEPENDENCIES) -PIPEWIRE_MEDIA_SESSION_CONF_OPTS = -Ddocs=disabled -Dtests=disabled +PIPEWIRE_MEDIA_SESSION_CONF_OPTS = \ + -Ddocs=disabled \ + -Dtests=disabled \ + -Dinstalled_tests=disabled PIPEWIRE_MEDIA_SESSION_MODULE_SETS_LIST = alsa -- 2.34.1 From ju.o at free.fr Thu Feb 9 19:36:07 2023 From: ju.o at free.fr (Julien Olivain) Date: Thu, 09 Feb 2023 20:36:07 +0100 Subject: [Buildroot] [PATCH] arch: move global and rename variable BR2_PACKAGE_Z3_ARCH_SUPPORTS In-Reply-To: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> References: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> Message-ID: <4acd3e35f6bce28f5f2e6cca8e57789c@free.fr> Hi Giulio, On 09/02/2023 01:48, Giulio Benetti wrote: > Package quickjs fails to build on architectures that don't support full > float rounding. To support all kind of float rounding FE_DOWNWARD, > FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD must be defined in fenv.h. > Since package z3 locally implements this check let's make it global, > rename it to be generic and use it for both package quickjs and z3. > > Fixes: > http://autobuild.buildroot.net/results/0b6/0b67381e3643c134c92cbcd1c5dc258fd760cd7e/ > http://autobuild.buildroot.net/results/cf2/cf249a82c83d3c8503205f4c3c5859dd9d52afdf/ > http://autobuild.buildroot.net/results/9b3/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2/ > http://autobuild.buildroot.net/results/4f1/4f13cf7d353260c6b8934dbdcf267bea884b356b/ > > Signed-off-by: Giulio Benetti To comment a bit on that, the complete condition is a bit more tricky: - the CPU arch FPU HW must have all 4 rounding modes, - the libc must expose a fenv.h header, - the libc must also expose all 4 rouding modes. glibc generally exposes all the HW supported rounding modes. I initially excluded uclibc-ng, because in its Buildroot default configuration, fenv.h is not enabled [1]. I believe it's possible to have some uclibc-ng configuration that are enable and exposing those rounding modes. See [2]. So this proposal is correct but possibly discard the case in which libc is uclibc-ng and its (custom) configuration exposes all FE rounding modes. I am not sure if it's really an issue, as packages with such requirements are mostly tested with glibc anyway... Best regards, Julien. [1] https://git.busybox.net/buildroot/tree/package/uclibc/uClibc-ng.config [2] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/extra/Configs/Config.in.arch?h=v1.0.42#n180 From james.hilliard1 at gmail.com Thu Feb 9 20:12:37 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 9 Feb 2023 13:12:37 -0700 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: On Thu, Feb 9, 2023 at 5:10 AM Sourabh Hegde wrote: > > Hello Maxim, > > While doing make with new Buildroot-packages I getting: > > [ 51%] Building ASM object aws-lc/crypto/CMakeFiles/crypto_objects.dir/hrss/asm/poly_rq_mul.S.o > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S: Assembler messages: > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:304: Error: unknown pseudo-op: `.att_syntax' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:307: Error: unknown mnemonic `push' -- `push %rbp' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:309: Error: bad register expression > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:310: Error: unknown mnemonic `movq' -- `movq %rsp,%rbp' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:311: Error: bad register expression > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:312: Error: unknown mnemonic `push' -- `push %r12' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:313: Error: bad register expression > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:321: Error: operand 1 must be an integer register -- `mov %rcx,%r8' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:322: Error: unknown mnemonic `addq' -- `addq $6144+12288+512+9408+32,%r8' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:323: Error: operand 1 must be an integer register -- `mov %r8,%rax' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:324: Error: unknown mnemonic `subq' -- `subq $6144,%r8' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:325: Error: operand 1 must be an integer register -- `mov %r8,%r11' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:326: Error: unknown mnemonic `subq' -- `subq $12288,%r8' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:327: Error: operand 1 must be an integer register -- `mov %r8,%r12' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:328: Error: unknown mnemonic `subq' -- `subq $512,%r8' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:329: Error: unknown mnemonic `vmovdqa' -- `vmovdqa const3(%rip),%ymm3' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:330: Error: unknown mnemonic `vmovdqu' -- `vmovdqu 0(%rsi),%ymm0' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:331: Error: unknown mnemonic `vmovdqu' -- `vmovdqu 88(%rsi),%ymm1' > . > . > . > Any idea what it is complaining about? The problem here is that while the python awscrt package uses setuptools it's not a normal python setuptools package, the setup.py installs both a normal setuptools package and a vendored cmake package(meta package really). See cmake build wrapper functionality here in the setuptools setup.py file: https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py#L156-L272 This is the cmake meta project root which is vendored inside of awscrt: https://github.com/awslabs/aws-crt-python/tree/v0.16.10/crt See meta cmakelists build: https://github.com/awslabs/aws-crt-python/blob/v0.16.10/crt/CMakeLists.txt This meta project is made up of multiple subprojects: aws-c-auth aws-c-cal aws-c-common aws-c-compression aws-c-event-stream aws-checksums aws-c-http aws-c-io aws-c-mqtt aws-c-s3 aws-c-sdkutils aws-lc s2n In buildroot we expect cmake packages to use our cmake infrastructure as it will set up the cross compilation environment correctly while the awscrt setuptools cmake wrapper does not. I confirmed that the cmake packages build correctly when using our cmake infrastructure: ################################################################################ # # python-awscrt # ################################################################################ PYTHON_AWSCRT_VERSION = 0.16.10 PYTHON_AWSCRT_SOURCE = awscrt-$(PYTHON_AWSCRT_VERSION).tar.gz PYTHON_AWSCRT_SITE = https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2 PYTHON_AWSCRT_SUBDIR = crt $(eval $(cmake-package)) See: https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_cmake_based_packages So what I think you need to do is create buildroot cmake packages for all these subprojects using buildroot's cmake infrastructure: https://github.com/awslabs/aws-c-auth https://github.com/awslabs/aws-c-cal https://github.com/awslabs/aws-c-common https://github.com/awslabs/aws-c-compression https://github.com/awslabs/aws-c-event-stream https://github.com/awslabs/aws-checksums https://github.com/awslabs/aws-c-http https://github.com/awslabs/aws-c-io https://github.com/awslabs/aws-c-mqtt https://github.com/awslabs/aws-c-s3 https://github.com/awslabs/aws-c-sdkutils https://github.com/awslabs/aws-lc https://github.com/aws/s2n-tls You will then probably need to modify the setup.py file (https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py) so that instead of using the cmake build functions have it use the system versions of these libraries pre-installed via the buildroot cmake infrastructure. You can probably use and check for an env variable such as this in the setup.py: PYTHON_AWSCRT_USE_SYSTEM_CRT=1 When present have it disable building the cmake libraries itself and search for the installed system crt libraries instead of using the vendored cmake build. You should upstream this setup.py functionality to the aws-crt-project as well so that we don't need to carry a patch in buildroot for python-awscrt to use the system crt libraries. Then from the python-awscrt buildroot package you would set that env variable and add all the cmake subprojects as buildroot package dependencies. First thing you should start with is adding the cmake buildroot packages for the crt subprojects to buildroot then work on modifying aws-crt-python to work correctly with them instead of trying to use its broken cmake setuptools wrapper. > > Thanks in advance > > On Thu, 9 Feb 2023 at 10:28, Sourabh Hegde wrote: >> >> Hi Maxim, >> >> I was missing python setuptools on my host. After installing it, I can add the package. Also, the added package is available in menuconfig >> >> Thank you for the support! >> >> On Thu, 9 Feb 2023 at 10:10, Maxim Kochetkov wrote: >>> >>> >>> >>> On 09.02.2023 12:03, Sourabh Hegde wrote: >>> > Hello Maxim, >>> > >>> > Update: >>> > >>> > The above issue resolved by itself! >>> > >>> > Now when I do: utils/scanpypi awscrt -o package , it says >>> > >>> > spdx_lookup module is not installed. This can lead to an inaccurate >>> > licence detection. Please install it via >>> > pip install spdx_lookup >>> > buildroot package name for awscrt: python-awscrt >>> > Package: python-awscrt >>> > Fetching package awscrt >>> > ERROR: Could not find package awscrt. >>> > Check syntax inside the python package index: >>> > https://pypi.python.org/pypi/ >>> > >>> > But the package is available at https://pypi.org/project/awscrt/ >>> > >>> >>> It works fine for me: >>> >>> buildroot package name for awscrt: python-awscrt >>> Package: python-awscrt >>> Fetching package awscrt >>> Downloading package awscrt from >>> https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz... >>> Checking if package package/python-awscrt already exists... >>> Creating package/python-awscrt/python-awscrt.mk... >>> More than one file found for license: LICENSE, crt/aws-c-common/LICENSE, >>> crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, >>> crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, >>> crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, >>> crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, >>> crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, crt/aws-c-cal/LICENSE, >>> crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE >>> Creating package/python-awscrt/python-awscrt.hash... >>> Creating package/python-awscrt/Config.in... >>> NOTE: Remember to also make an update to the DEVELOPERS file >>> and include an entry for the pkg in packages/Config.in >>> > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Feb 9 20:19:40 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:19:40 +0100 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: References: <20220607231211.533086-1-james.hilliard1@gmail.com> <20230208161527.31a28b3b@windsurf> Message-ID: On 08/02/2023 17:46, James Hilliard wrote: > On Wed, Feb 8, 2023 at 8:15 AM Thomas Petazzoni > wrote: >> >> On Tue, 7 Jun 2022 17:12:11 -0600 >> James Hilliard wrote: >> >>> In some cases it only makes sense to run tests against a specific >>> branch, such as when testing new genrandconfig flags. >>> >>> Add a config option to override the branch selection. >>> >>> Signed-off-by: James Hilliard >>> --- >>> scripts/autobuild-run | 11 ++++++++++- >>> 1 file changed, 10 insertions(+), 1 deletion(-) >> >> We looked at this with Arnout, and we don't really see what this would >> be needed, and actually it could be annoying to have people test >> "random" branches. If you need extensions to genrandconfig, then the >> autobuild-run script should be backward compatible with older versions >> of genrandconfig to be able to support older branches for a certain >> while. > > There are a number of other reasons this is useful, for example some > build hosts(for example my asahi-linux build host) have compatibility > issues in older branches so it doesn't make sense to run autobuilders If there are compatibility issues, the fixes should be backported to the stable branches... Regards, Arnout > on anything other than say master. > > To prevent testing of unwanted branches I could modify this to restrict > the branch override to only allow selecting the branches listed in: > http://autobuild.buildroot.org/branches > >> >> Thanks! >> >> Thomas >> -- >> Thomas Petazzoni, CTO, Bootlin >> Embedded Linux and Kernel engineering >> https://bootlin.com From arnout at mind.be Thu Feb 9 20:22:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:22:31 +0100 Subject: [Buildroot] [PATCH v2] package/chrony: add default unprivileged user option In-Reply-To: <20230208182731.15752-1-james.kent@orchestrated-technology.com> References: <20230208182731.15752-1-james.kent@orchestrated-technology.com> Message-ID: <8fe20693-4bf1-4378-d7c4-d81bcd9cf7ed@mind.be> Hi James, On 08/02/2023 19:27, James Kent wrote: > Configurable option to define and enable by default an unprivileged > user which the Chrony daemon will assume once initialised. The > functionality requires libcap which is selected as necessary. > > This option supports the good security practice of dropping elevated > privileges for daemon runtime. > > The package configuration layout has been updated to current working > practice. > > Signed-off-by: James Kent > --- > package/chrony/Config.in | 12 +++++++++++- > package/chrony/chrony.mk | 8 ++++++++ > 2 files changed, 19 insertions(+), 1 deletion(-) > > diff --git a/package/chrony/Config.in b/package/chrony/Config.in > index 158dc20530..0ba14c6aef 100644 > --- a/package/chrony/Config.in > +++ b/package/chrony/Config.in > @@ -7,10 +7,20 @@ config BR2_PACKAGE_CHRONY > > http://chrony.tuxfamily.org/ > > +if BR2_PACKAGE_CHRONY > + > config BR2_PACKAGE_CHRONY_DEBUG_LOGGING > bool "enable debug logging support" > - depends on BR2_PACKAGE_CHRONY > help > Enable support for debug logging output from Chrony when > enabled at runtime. If disabled, code for debug logging will > not be compiled in. > + > +config BR2_PACKAGE_CHRONY_USER > + bool "chrony default unprivileged user" Is there any reason to do this conditionally? For all other packages, we do it unconditionally. Regards, Arnout > + select BR2_PACKAGE_LIBCAP > + help > + Define and enable default unprivileged user for the Chrony > + daemon to run as. > + > +endif > diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk > index 379e95a778..16f8f082a3 100644 > --- a/package/chrony/chrony.mk > +++ b/package/chrony/chrony.mk > @@ -21,6 +21,14 @@ CHRONY_CONF_OPTS = \ > > ifeq ($(BR2_PACKAGE_LIBCAP),y) > CHRONY_DEPENDENCIES += libcap > + > +ifeq ($(BR2_PACKAGE_CHRONY_USER),y) > +CHRONY_CONF_OPTS += --with-user=chrony > +define CHRONY_USERS > + chrony -1 chrony -1 * /run/chrony - - Time daemon > +endef > +endif > + > else > CHRONY_CONF_OPTS += --without-libcap > endif From arnout at mind.be Thu Feb 9 20:27:11 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:27:11 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: revert bpf_cookie patch to allow building In-Reply-To: References: <97ea44bb-58fe-d6cb-6c79-9be0b245f2c6@synopsys.com> <29d2a8c7-44cd-da42-5fed-f17ec0f8ccf2@synopsys.com> Message-ID: <1750a14f-36a1-fe51-1452-3a72b84979c5@mind.be> On 09/02/2023 13:23, Shahab Vahedi wrote: > Hi Arnout, > > On 2/8/23 17:36, Arnout Vandecappelle wrote: >> >> It's not clear to me why you did a revert of the cookie feature rather than >> using those patches. I think the first two or three should be sufficient to >> fix your issue? > > Ideally, the correct way would be applying that pending series. But since > there were comments that some of the patches might need reworking [1], I did I don't see anything in that thread about rework being needed, only some complaints about some mail gateway encrypting messages so they can't be read by some recipients... > not feel confident to add them. Therefore, I tried to keep my solution minimal > and solve it by eliminating the problem. I know, it is not appealing. The problem with your patch is that it is very difficult to decide if it should be kept or not when bumping the version. Plus, some people (or other packages) may rely on the feature that you remove. Regards, Arnout > >> For the time being, I marked this as Changes Requested. If the upstream >> patches are not sufficient, please send a mail upstream (as a reply to that >> series) explaining the problem (again), and re-send this patch to >> Buildroot. If it does fix things, please send a mail upstream to ask to >> move the series forward (explaining the issue you have), and send a patch >> to Buildroot that adds the needed patches. > > They (re)confirmed the issue to me in the past [2] and are aware that its > solution is missing from all the releases onward (see the first point of > "Known bugs" in the release page [3]). > > [1] > https://lore.kernel.org/bpf/20220421003152.339542-3-alobakin at pm.me/T/#rb9ce86e9f25b2d097b88d87af8ffdfa401d63c68 > > [2] > https://lore.kernel.org/bpf/b1a604e1-be09-ac0b-ff22-b194ae9ce886 at isovalent.com/ > > [3] > https://github.com/libbpf/bpftool/releases > > -- > Shahab > > From arnout at mind.be Thu Feb 9 20:30:39 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:30:39 +0100 Subject: [Buildroot] [PATCH 1/1] lksctp-tools: bump to version 1.0.19 In-Reply-To: <20230208094543.474237-1-fido_max@inbox.ru> References: <20230208094543.474237-1-fido_max@inbox.ru> Message-ID: <6a74619e-1750-d295-c6bc-ca93a5b47473@mind.be> On 08/02/2023 10:45, Maxim Kochetkov via buildroot wrote: > Release notes: https://github.com/sctp/lksctp-tools/blob/v1.0.19/ChangeLog > > Signed-off-by: Maxim Kochetkov Applied to master, thanks. Thank for testing, Maksim. Regards, Arnout > --- > package/lksctp-tools/lksctp-tools.hash | 4 ++-- > package/lksctp-tools/lksctp-tools.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/lksctp-tools/lksctp-tools.hash b/package/lksctp-tools/lksctp-tools.hash > index fb892fdc3b..b3a1f59d86 100644 > --- a/package/lksctp-tools/lksctp-tools.hash > +++ b/package/lksctp-tools/lksctp-tools.hash > @@ -1,6 +1,6 @@ > # From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ > -md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz > -sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz > +md5 0fbb288c9f9625b88d3ab21c9ed9f011 lksctp-tools-1.0.19.tar.gz > +sha1 d410a596485c38464177a38ae7c7081444e6589e lksctp-tools-1.0.19.tar.gz > # Locally computed > sha256 dee5f35e583183abb9212938643ecb2d858fd89e2e286f4b1d903f65d49d6c76 COPYING.lib > sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING > diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk > index 5ac794e842..af86a28516 100644 > --- a/package/lksctp-tools/lksctp-tools.mk > +++ b/package/lksctp-tools/lksctp-tools.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LKSCTP_TOOLS_VERSION = 1.0.17 > -LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools > +LKSCTP_TOOLS_VERSION = 1.0.19 > +LKSCTP_TOOLS_SITE = $(call github,sctp,lksctp-tools,v$(LKSCTP_TOOLS_VERSION)) > LKSCTP_TOOLS_INSTALL_STAGING = YES > # configure not shipped > LKSCTP_TOOLS_AUTORECONF = YES From james.hilliard1 at gmail.com Thu Feb 9 20:32:05 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 9 Feb 2023 13:32:05 -0700 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: References: <20220607231211.533086-1-james.hilliard1@gmail.com> <20230208161527.31a28b3b@windsurf> Message-ID: On Thu, Feb 9, 2023 at 1:19 PM Arnout Vandecappelle wrote: > > > > On 08/02/2023 17:46, James Hilliard wrote: > > On Wed, Feb 8, 2023 at 8:15 AM Thomas Petazzoni > > wrote: > >> > >> On Tue, 7 Jun 2022 17:12:11 -0600 > >> James Hilliard wrote: > >> > >>> In some cases it only makes sense to run tests against a specific > >>> branch, such as when testing new genrandconfig flags. > >>> > >>> Add a config option to override the branch selection. > >>> > >>> Signed-off-by: James Hilliard > >>> --- > >>> scripts/autobuild-run | 11 ++++++++++- > >>> 1 file changed, 10 insertions(+), 1 deletion(-) > >> > >> We looked at this with Arnout, and we don't really see what this would > >> be needed, and actually it could be annoying to have people test > >> "random" branches. If you need extensions to genrandconfig, then the > >> autobuild-run script should be backward compatible with older versions > >> of genrandconfig to be able to support older branches for a certain > >> while. > > > > There are a number of other reasons this is useful, for example some > > build hosts(for example my asahi-linux build host) have compatibility > > issues in older branches so it doesn't make sense to run autobuilders > > If there are compatibility issues, the fixes should be backported to the > stable branches... Some of the changes would be rather difficult to backport, for example the 2022.02.x branch doesn't have support for --no-toolchains-csv which is effectively required for supporting non-x86_64 autobuilders as we obviously can't use prebuilt toolchains that only run on x86_64 hosts on an aarch64 host. There are many fixes related to various --no-toolchains-csv build failures that would also need to be backported as well if even feasible. > > Regards, > Arnout > > > on anything other than say master. > > > > To prevent testing of unwanted branches I could modify this to restrict > > the branch override to only allow selecting the branches listed in: > > http://autobuild.buildroot.org/branches > > > >> > >> Thanks! > >> > >> Thomas > >> -- > >> Thomas Petazzoni, CTO, Bootlin > >> Embedded Linux and Kernel engineering > >> https://bootlin.com From arnout at mind.be Thu Feb 9 20:28:47 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:28:47 +0100 Subject: [Buildroot] [git commit] lksctp-tools: bump to version 1.0.19 Message-ID: <20230209203249.54DB5847E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=554d79f5cc01c20d886cbe9c676195159947f066 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/sctp/lksctp-tools/blob/v1.0.19/ChangeLog Signed-off-by: Maxim Kochetkov Tested-by: Maksim Kiselev Signed-off-by: Arnout Vandecappelle --- package/lksctp-tools/lksctp-tools.hash | 4 ++-- package/lksctp-tools/lksctp-tools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lksctp-tools/lksctp-tools.hash b/package/lksctp-tools/lksctp-tools.hash index fb892fdc3b..b3a1f59d86 100644 --- a/package/lksctp-tools/lksctp-tools.hash +++ b/package/lksctp-tools/lksctp-tools.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ -md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz -sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz +md5 0fbb288c9f9625b88d3ab21c9ed9f011 lksctp-tools-1.0.19.tar.gz +sha1 d410a596485c38464177a38ae7c7081444e6589e lksctp-tools-1.0.19.tar.gz # Locally computed sha256 dee5f35e583183abb9212938643ecb2d858fd89e2e286f4b1d903f65d49d6c76 COPYING.lib sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk index 5ac794e842..af86a28516 100644 --- a/package/lksctp-tools/lksctp-tools.mk +++ b/package/lksctp-tools/lksctp-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -LKSCTP_TOOLS_VERSION = 1.0.17 -LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools +LKSCTP_TOOLS_VERSION = 1.0.19 +LKSCTP_TOOLS_SITE = $(call github,sctp,lksctp-tools,v$(LKSCTP_TOOLS_VERSION)) LKSCTP_TOOLS_INSTALL_STAGING = YES # configure not shipped LKSCTP_TOOLS_AUTORECONF = YES From arnout at mind.be Thu Feb 9 20:33:40 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:33:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire-media-session: bump to version 0.4.2 In-Reply-To: <20230209185203.262016-1-james.hilliard1@gmail.com> References: <20230209185203.262016-1-james.hilliard1@gmail.com> Message-ID: <5e0e6c1d-7eed-4fe8-8a33-c59e04d84254@mind.be> On 09/02/2023 19:52, James Hilliard wrote: > Explicitly set installed_tests to disabled. > > Drop patch which is now upstream. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > ...remove-session-managers-option-check.patch | 36 ------------------- > .../pipewire-media-session.hash | 2 +- > .../pipewire-media-session.mk | 7 ++-- > 3 files changed, 6 insertions(+), 39 deletions(-) > delete mode 100644 package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch [snip] From arnout at mind.be Thu Feb 9 20:32:43 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:32:43 +0100 Subject: [Buildroot] [git commit] package/pipewire-media-session: bump to version 0.4.2 Message-ID: <20230209203358.6A350848D5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1bceb4b51581e0c7b3953181ee3a2c31f0094f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Explicitly set installed_tests to disabled. Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- ...eson-remove-session-managers-option-check.patch | 36 ---------------------- .../pipewire-media-session.hash | 2 +- .../pipewire-media-session.mk | 7 +++-- 3 files changed, 6 insertions(+), 39 deletions(-) diff --git a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch b/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch deleted file mode 100644 index fc1d25edb3..0000000000 --- a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1923c97fbd0b3d8cacdb72386886f860c818bccf Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Wed, 10 Nov 2021 08:54:06 -0700 -Subject: [PATCH] meson: remove session-managers option check. - -This option no longer exists and causes a build failure if building -with the systemd system service enabled. - -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/pipewire/media-session/-/merge_requests/24] ---- - systemd/system/meson.build | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/systemd/system/meson.build b/systemd/system/meson.build -index ab0d49064..0e9885b0f 100644 ---- a/systemd/system/meson.build -+++ b/systemd/system/meson.build -@@ -4,9 +4,7 @@ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunit - systemd_config = configuration_data() - systemd_config.set('PW_MEDIA_SESSION_BINARY', media_session_bindir / 'pipewire-media-session') - --if get_option('session-managers').contains('media-session') -- configure_file(input : 'pipewire-media-session.service.in', -- output : 'pipewire-media-session.service', -- configuration : systemd_config, -- install_dir : systemd_system_services_dir) --endif -+configure_file(input : 'pipewire-media-session.service.in', -+ output : 'pipewire-media-session.service', -+ configuration : systemd_config, -+ install_dir : systemd_system_services_dir) --- -2.25.1 - diff --git a/package/pipewire-media-session/pipewire-media-session.hash b/package/pipewire-media-session/pipewire-media-session.hash index e335fd8913..e6b176eea2 100644 --- a/package/pipewire-media-session/pipewire-media-session.hash +++ b/package/pipewire-media-session/pipewire-media-session.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ebdf9f8e389896fdc4b58da5f909afce18441b4b53d5b4f2104dd53586ea8681 media-session-0.4.1.tar.bz2 +sha256 26e21852e0834a4418b40eae342ac5178dfe40342b9c5afe204d43ef8aafa14e media-session-0.4.2.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 77b9c867237ef919e33c0fdbcf22ab84b1cf24a63f9431ec68759026b658c994 LICENSE diff --git a/package/pipewire-media-session/pipewire-media-session.mk b/package/pipewire-media-session/pipewire-media-session.mk index d349fd7454..cc7317f925 100644 --- a/package/pipewire-media-session/pipewire-media-session.mk +++ b/package/pipewire-media-session/pipewire-media-session.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.1 +PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.2 PIPEWIRE_MEDIA_SESSION_SOURCE = media-session-$(PIPEWIRE_MEDIA_SESSION_VERSION).tar.bz2 PIPEWIRE_MEDIA_SESSION_SITE = https://gitlab.freedesktop.org/pipewire/media-session/-/archive/$(PIPEWIRE_MEDIA_SESSION_VERSION) PIPEWIRE_MEDIA_SESSION_LICENSE = MIT @@ -17,7 +17,10 @@ PIPEWIRE_MEDIA_SESSION_DEPENDENCIES = \ pipewire \ $(TARGET_NLS_DEPENDENCIES) -PIPEWIRE_MEDIA_SESSION_CONF_OPTS = -Ddocs=disabled -Dtests=disabled +PIPEWIRE_MEDIA_SESSION_CONF_OPTS = \ + -Ddocs=disabled \ + -Dtests=disabled \ + -Dinstalled_tests=disabled PIPEWIRE_MEDIA_SESSION_MODULE_SETS_LIST = alsa From arnout at mind.be Thu Feb 9 20:44:04 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:44:04 +0100 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: References: <20220607231211.533086-1-james.hilliard1@gmail.com> <20230208161527.31a28b3b@windsurf> Message-ID: On 09/02/2023 21:32, James Hilliard wrote: > On Thu, Feb 9, 2023 at 1:19 PM Arnout Vandecappelle wrote: >> >> >> >> On 08/02/2023 17:46, James Hilliard wrote: >>> On Wed, Feb 8, 2023 at 8:15 AM Thomas Petazzoni >>> wrote: >>>> >>>> On Tue, 7 Jun 2022 17:12:11 -0600 >>>> James Hilliard wrote: >>>> >>>>> In some cases it only makes sense to run tests against a specific >>>>> branch, such as when testing new genrandconfig flags. >>>>> >>>>> Add a config option to override the branch selection. >>>>> >>>>> Signed-off-by: James Hilliard >>>>> --- >>>>> scripts/autobuild-run | 11 ++++++++++- >>>>> 1 file changed, 10 insertions(+), 1 deletion(-) >>>> >>>> We looked at this with Arnout, and we don't really see what this would >>>> be needed, and actually it could be annoying to have people test >>>> "random" branches. If you need extensions to genrandconfig, then the >>>> autobuild-run script should be backward compatible with older versions >>>> of genrandconfig to be able to support older branches for a certain >>>> while. >>> >>> There are a number of other reasons this is useful, for example some >>> build hosts(for example my asahi-linux build host) have compatibility >>> issues in older branches so it doesn't make sense to run autobuilders >> >> If there are compatibility issues, the fixes should be backported to the >> stable branches... > > Some of the changes would be rather difficult to backport, for example > the 2022.02.x branch doesn't have support for --no-toolchains-csv which > is effectively required for supporting non-x86_64 autobuilders as we > obviously can't use prebuilt toolchains that only run on x86_64 hosts on > an aarch64 host. > > There are many fixes related to various --no-toolchains-csv build failures > that would also need to be backported as well if even feasible. Even so, I'm much more inclined to rewrite the autobuild-run logic to dynamically test which options genrandconfig can take and adapt accordingly. That way you don't have to manually maintain those branches and update them on each autobuilder instance. Regards, Arnout > >> >> Regards, >> Arnout >> >>> on anything other than say master. >>> >>> To prevent testing of unwanted branches I could modify this to restrict >>> the branch override to only allow selecting the branches listed in: >>> http://autobuild.buildroot.org/branches >>> >>>> >>>> Thanks! >>>> >>>> Thomas >>>> -- >>>> Thomas Petazzoni, CTO, Bootlin >>>> Embedded Linux and Kernel engineering >>>> https://bootlin.com From arnout at mind.be Thu Feb 9 20:47:16 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:47:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/open-iscsi: add OPEN_ISCSI_CPE_ID_VENDOR In-Reply-To: <20230208174431.85800-1-fontaine.fabrice@gmail.com> References: <20230208174431.85800-1-fontaine.fabrice@gmail.com> Message-ID: <4ca77dcb-789c-2f5c-e4b3-a5c509165859@mind.be> On 08/02/2023 18:44, Fabrice Fontaine wrote: > cpe:2.3:a:open-iscsi_project:open-iscsi is a valid CPE identifier for > this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen-iscsi_project%3Aopen-iscsi > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/open-iscsi/open-iscsi.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk > index 249253c64f..e5b965b80d 100644 > --- a/package/open-iscsi/open-iscsi.mk > +++ b/package/open-iscsi/open-iscsi.mk > @@ -10,6 +10,7 @@ OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) > # well. See https://github.com/open-iscsi/open-iscsi/issues/379 > OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ > OPEN_ISCSI_LICENSE_FILES = COPYING > +OPEN_ISCSI_CPE_ID_VENDOR = open-iscsi_project > OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux > > OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi From arnout at mind.be Thu Feb 9 20:47:23 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:47:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsolv: add LIBSOLV_CPE_ID_VENDOR In-Reply-To: <20230208175008.88846-1-fontaine.fabrice@gmail.com> References: <20230208175008.88846-1-fontaine.fabrice@gmail.com> Message-ID: <543e5bca-a555-395e-7b37-d0a6c166b878@mind.be> On 08/02/2023 18:50, Fabrice Fontaine wrote: > cpe:2.3:a:opensuse:libsolv is a valid CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopensuse%3Alibsolv > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libsolv/libsolv.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk > index 144ce68a83..29f8a6a3d2 100644 > --- a/package/libsolv/libsolv.mk > +++ b/package/libsolv/libsolv.mk > @@ -8,6 +8,7 @@ LIBSOLV_VERSION = 0.7.22 > LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) > LIBSOLV_LICENSE = BSD-3-Clause > LIBSOLV_LICENSE_FILES = LICENSE.BSD > +LIBSOLV_CPE_ID_VENDOR = opensuse > LIBSOLV_INSTALL_STAGING = YES > LIBSOLV_DEPENDENCIES = zlib > LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON From arnout at mind.be Thu Feb 9 20:44:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:44:31 +0100 Subject: [Buildroot] [git commit] package/open-iscsi: add OPEN_ISCSI_CPE_ID_VENDOR Message-ID: <20230209204741.155B884924@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4856c75b2fe0cbab36fcae7f5f223026b24e884f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:open-iscsi_project:open-iscsi is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen-iscsi_project%3Aopen-iscsi Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/open-iscsi/open-iscsi.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk index 249253c64f..e5b965b80d 100644 --- a/package/open-iscsi/open-iscsi.mk +++ b/package/open-iscsi/open-iscsi.mk @@ -10,6 +10,7 @@ OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) # well. See https://github.com/open-iscsi/open-iscsi/issues/379 OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ OPEN_ISCSI_LICENSE_FILES = COPYING +OPEN_ISCSI_CPE_ID_VENDOR = open-iscsi_project OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi From arnout at mind.be Thu Feb 9 20:46:10 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:46:10 +0100 Subject: [Buildroot] [git commit] package/libsolv: add LIBSOLV_CPE_ID_VENDOR Message-ID: <20230209204741.1F82E84925@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8cee8fb37c6ad0164d3f7bad8cfd0f812592ad6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:opensuse:libsolv is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopensuse%3Alibsolv Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libsolv/libsolv.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 144ce68a83..29f8a6a3d2 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -8,6 +8,7 @@ LIBSOLV_VERSION = 0.7.22 LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) LIBSOLV_LICENSE = BSD-3-Clause LIBSOLV_LICENSE_FILES = LICENSE.BSD +LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON From buildroot at heine.tech Thu Feb 9 20:53:01 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Thu, 9 Feb 2023 21:53:01 +0100 Subject: [Buildroot] [PATCH] package/re2: bump to version 2023-02-01 Message-ID: <20230209205309.2464796-1-buildroot@heine.tech> Signed-off-by: Michael Nosthoff --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 9019867db4..a39dece7a9 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 665b65b6668156db2b46dddd33405cd422bd611352c5052ab3dae6a5fbac5506 re2-2022-12-01.tar.gz +sha256 cbce8b7803e856827201a132862e41af386e7afd9cc6d9a9bc7a4fa4d8ddbdde re2-2023-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 07bb9378de..5587366b1f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2022-12-01 +RE2_VERSION = 2023-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE -- 2.34.1 From arnout at mind.be Thu Feb 9 20:53:13 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:53:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/ply: add dependency on Linux headers >= 5.5 In-Reply-To: References: Message-ID: On 08/02/2023 09:45, Andreas Klinger wrote: > Version 2.3.0 of ply now requires Linux headers >= 5.5 > > This was missing in commit b9612601b037e6deb79af300e64e0557dda1be5c > ("package/ply: bump to version 2.3.0") > > Fixes: > > http://autobuild.buildroot.net/results/ce37039991cb0fb02b97d341d78327e54d0e1d26 > http://autobuild.buildroot.net/results/c00714847ae92dd609bc8990df318bee58be38b8 > http://autobuild.buildroot.net/results/8210bd2b9c67d6d7616ada525019b2658195416a Applied to master, thanks. Sorry it took so long. > This is a resend, because there are still the same autobuild failures. A comment like this shouldn't be saved for eternity in the commit history, so it's better put under --- after your Signed-off-by. Regards, Arnout > > Signed-off-by: Andreas Klinger > --- > package/ply/Config.in | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/ply/Config.in b/package/ply/Config.in > index 0500e7883f..f7507095c1 100644 > --- a/package/ply/Config.in > +++ b/package/ply/Config.in > @@ -5,16 +5,16 @@ config BR2_PACKAGE_PLY_ARCH_SUPPORTS > default y if BR2_powerpc > default y if BR2_x86_64 > > -comment "ply needs a toolchain w/ dynamic library, headers >= 4.14" > +comment "ply needs a toolchain w/ dynamic library, headers >= 5.5" > depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS > depends on BR2_USE_MMU > - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 || BR2_STATIC_LIBS > > config BR2_PACKAGE_PLY > bool "ply" > depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS > depends on BR2_USE_MMU # fork() > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # BPF_JLT > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 # BPF_JLT > depends on !BR2_STATIC_LIBS > help > ply is a light-weight dynamic tracer for Linux. By means of From arnout at mind.be Thu Feb 9 20:51:47 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:51:47 +0100 Subject: [Buildroot] [git commit] package/ply: add dependency on Linux headers >= 5.5 Message-ID: <20230209205333.A365684986@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2fd606b91784ced64c7312e02fcbf95f3e736d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Version 2.3.0 of ply now requires Linux headers >= 5.5 This was missing in commit b9612601b037e6deb79af300e64e0557dda1be5c ("package/ply: bump to version 2.3.0") Fixes: http://autobuild.buildroot.net/results/ce37039991cb0fb02b97d341d78327e54d0e1d26 http://autobuild.buildroot.net/results/c00714847ae92dd609bc8990df318bee58be38b8 http://autobuild.buildroot.net/results/8210bd2b9c67d6d7616ada525019b2658195416a Signed-off-by: Andreas Klinger Signed-off-by: Arnout Vandecappelle --- package/ply/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ply/Config.in b/package/ply/Config.in index 0500e7883f..f7507095c1 100644 --- a/package/ply/Config.in +++ b/package/ply/Config.in @@ -5,16 +5,16 @@ config BR2_PACKAGE_PLY_ARCH_SUPPORTS default y if BR2_powerpc default y if BR2_x86_64 -comment "ply needs a toolchain w/ dynamic library, headers >= 4.14" +comment "ply needs a toolchain w/ dynamic library, headers >= 5.5" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 || BR2_STATIC_LIBS config BR2_PACKAGE_PLY bool "ply" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # BPF_JLT + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 # BPF_JLT depends on !BR2_STATIC_LIBS help ply is a light-weight dynamic tracer for Linux. By means of From giulio.benetti at benettiengineering.com Thu Feb 9 20:54:41 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 21:54:41 +0100 Subject: [Buildroot] [PATCH] arch: move global and rename variable BR2_PACKAGE_Z3_ARCH_SUPPORTS In-Reply-To: <4acd3e35f6bce28f5f2e6cca8e57789c@free.fr> References: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> <4acd3e35f6bce28f5f2e6cca8e57789c@free.fr> Message-ID: <46cf956e-29d9-c0ce-5963-f3fc3543a476@benettiengineering.com> Hi Julien, On 09/02/23 20:36, Julien Olivain wrote: > > ? Hi Giulio, > > On 09/02/2023 01:48, Giulio Benetti wrote: >> Package quickjs fails to build on architectures that don't support full >> float rounding. To support all kind of float rounding FE_DOWNWARD, >> FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD must be defined in fenv.h. >> Since package z3 locally implements this check let's make it global, >> rename it to be generic and use it for both package quickjs and z3. >> >> Fixes: >> http://autobuild.buildroot.net/results/0b6/0b67381e3643c134c92cbcd1c5dc258fd760cd7e/ >> http://autobuild.buildroot.net/results/cf2/cf249a82c83d3c8503205f4c3c5859dd9d52afdf/ >> http://autobuild.buildroot.net/results/9b3/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2/ >> http://autobuild.buildroot.net/results/4f1/4f13cf7d353260c6b8934dbdcf267bea884b356b/ >> >> Signed-off-by: Giulio Benetti > > To comment a bit on that, the complete condition is a bit more tricky: > - the CPU arch FPU HW must have all 4 rounding modes, > - the libc must expose a fenv.h header, > - the libc must also expose all 4 rouding modes. thank you for the more precise explanation, everything is more clear now > glibc generally exposes all the HW supported rounding modes.? I > initially excluded uclibc-ng, because in its Buildroot default > configuration, fenv.h is not enabled [1]. I believe it's possible to > have some uclibc-ng configuration that are enable and exposing those > rounding modes. See [2]. > > So this proposal is correct but possibly discard the case in which libc is > uclibc-ng and its (custom) configuration exposes all FE rounding modes. Maybe we can enable UCLIBC_HAS_FENV on uclibc-ng by default, so all architectures that UCLIBC_HAS_FLOAT they have it. Otherwise that UCLIBC_HAS_FENV gets discarded if I'm correct. > I am not sure if it's really an issue, as packages with such > requirements are mostly tested with glibc anyway... Same here for the architecture. So we'd need a valid condition that is true for the 3 points you've listed above exactly in the order you've listed them if I'm correct. Maybe we can do an intermediate step with this patch and later deal with this matrix validity check Best regards -- Giulio Benetti Benetti Engineering sas > Best regards, > > Julien. > > [1] https://git.busybox.net/buildroot/tree/package/uclibc/uClibc-ng.config > [2] > https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/extra/Configs/Config.in.arch?h=v1.0.42#n180 From james.hilliard1 at gmail.com Thu Feb 9 21:42:21 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 9 Feb 2023 14:42:21 -0700 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: References: <20220607231211.533086-1-james.hilliard1@gmail.com> <20230208161527.31a28b3b@windsurf> Message-ID: On Thu, Feb 9, 2023 at 1:44 PM Arnout Vandecappelle wrote: > > > > On 09/02/2023 21:32, James Hilliard wrote: > > On Thu, Feb 9, 2023 at 1:19 PM Arnout Vandecappelle wrote: > >> > >> > >> > >> On 08/02/2023 17:46, James Hilliard wrote: > >>> On Wed, Feb 8, 2023 at 8:15 AM Thomas Petazzoni > >>> wrote: > >>>> > >>>> On Tue, 7 Jun 2022 17:12:11 -0600 > >>>> James Hilliard wrote: > >>>> > >>>>> In some cases it only makes sense to run tests against a specific > >>>>> branch, such as when testing new genrandconfig flags. > >>>>> > >>>>> Add a config option to override the branch selection. > >>>>> > >>>>> Signed-off-by: James Hilliard > >>>>> --- > >>>>> scripts/autobuild-run | 11 ++++++++++- > >>>>> 1 file changed, 10 insertions(+), 1 deletion(-) > >>>> > >>>> We looked at this with Arnout, and we don't really see what this would > >>>> be needed, and actually it could be annoying to have people test > >>>> "random" branches. If you need extensions to genrandconfig, then the > >>>> autobuild-run script should be backward compatible with older versions > >>>> of genrandconfig to be able to support older branches for a certain > >>>> while. > >>> > >>> There are a number of other reasons this is useful, for example some > >>> build hosts(for example my asahi-linux build host) have compatibility > >>> issues in older branches so it doesn't make sense to run autobuilders > >> > >> If there are compatibility issues, the fixes should be backported to the > >> stable branches... > > > > Some of the changes would be rather difficult to backport, for example > > the 2022.02.x branch doesn't have support for --no-toolchains-csv which > > is effectively required for supporting non-x86_64 autobuilders as we > > obviously can't use prebuilt toolchains that only run on x86_64 hosts on > > an aarch64 host. > > > > There are many fixes related to various --no-toolchains-csv build failures > > that would also need to be backported as well if even feasible. > > Even so, I'm much more inclined to rewrite the autobuild-run logic to > dynamically test which options genrandconfig can take and adapt accordingly. The genrandconfig issue is only one of a number of issues that I've seen come up, there's been a rather long tail of lingering aarch64 compatibility issues that sometimes require major package updates. For example some systemd fixes for aarch64 build hosts aren't really feasible to backport due to requiring major refactoring. What we probably eventually want is the ability to identify issues as build host environment specific by rerunning failed builds on different hosts automatically, but that would probably require some infrastructure changes. > That way you don't have to manually maintain those branches and update them on > each autobuilder instance. I'm pretty much just using this to restrict my autobuilders to master branch when there are known compatibility issues with older branches for a particular host configuration. > > Regards, > Arnout > > > > >> > >> Regards, > >> Arnout > >> > >>> on anything other than say master. > >>> > >>> To prevent testing of unwanted branches I could modify this to restrict > >>> the branch override to only allow selecting the branches listed in: > >>> http://autobuild.buildroot.org/branches > >>> > >>>> > >>>> Thanks! > >>>> > >>>> Thomas > >>>> -- > >>>> Thomas Petazzoni, CTO, Bootlin > >>>> Embedded Linux and Kernel engineering > >>>> https://bootlin.com From ckhardin at gmail.com Thu Feb 9 23:15:15 2023 From: ckhardin at gmail.com (ckhardin at gmail.com) Date: Thu, 9 Feb 2023 15:15:15 -0800 Subject: [Buildroot] [PATCH 1/4] linux: create a scmversion file based on the custom repo variables Message-ID: <20230209231518.9458-1-ckhardin@gmail.com> From: Charles Hardin When using the custom repositories, the archive creation will omit the source history to get reproducible hashes. This has the side effect of making the setlocalversion scripts within the builds to not create the tracking information as expected. So, just generate a .scmversion so that kernels will be labelled with where buildroot referenced them. For example (line wrapped) #define UTS_RELEASE "5.4.70-repo-version-" \ "92c23d10d0031e0a13244a1a97e7530d3b53fc6e" Signed-off-by: Charles Hardin --- linux/linux.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..0b27c8dee2 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -596,6 +596,20 @@ endif ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)),) $(error No custom repo URL set. Check your BR2_LINUX_KERNEL_CUSTOM_REPO_URL setting) endif + +# Create a custom scm version file to reflect the source version since the +# archive will omit source directories like .git to maintain reproducible +# hashes for the archives +LINUX_CUSTOM_REPO_SCMVERSION = \ + "-repo-version-$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION))" +define LINUX_CUSTOM_REPO_SCMVERSION_HOOK + (cd $(@D); \ + if [ ! -f .scmversion ]; then \ + echo $(LINUX_CUSTOM_REPO_SCMVERSION) > .scmversion; \ + fi) +endef + +LINUX_POST_EXTRACT_HOOKS += LINUX_CUSTOM_REPO_SCMVERSION_HOOK endif ifeq ($(BR_BUILDING),y) -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 23:15:16 2023 From: ckhardin at gmail.com (ckhardin at gmail.com) Date: Thu, 9 Feb 2023 15:15:16 -0800 Subject: [Buildroot] [PATCH 2/4] boot/uboot: create a scmversion file based on the custom repo variables In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230209231518.9458-2-ckhardin@gmail.com> From: Charles Hardin When using the custom repositories, the archive creation will omit the source history to get reproducible hashes. This has the side effect of making the setlocalversion scripts within the builds to not create the tracking information as expected. So, just generate a .scmversion so that kernels will be labelled with where buildroot referenced them. Example (line wrapped) #define PLAIN_VERSION "2018.03-repo-version-" \ "d72b9d0908364a64718b652b75e4cac9b85cf0c3" Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..d735b47326 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -526,12 +526,25 @@ endif # BR2_TARGET_UBOOT_CUSTOM_TARBALL ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT)$(BR2_TARGET_UBOOT_CUSTOM_HG),y) ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),) $(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting) -endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_URL +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_REPO_URL ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION)),) $(error No custom U-Boot repository version specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting) -endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_VERSION +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION endif # BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG +# Create a custom scm version file to reflect the source version since the +# archive will omit source directories like .git to maintain reproducible +# hashes for the archives +UBOOT_CUSTOM_REPO_SCMVERSION = \ + "-repo-version-$(call qstrip,$(BR2_UBOOT_TARGET_CUSTOM_REPO_VERSION))" +define UBOOT_CUSTOM_REPO_SCMVERSION_HOOK + (cd $(@D); \ + if [ ! -f .scmversion ]; then \ + echo $(UBOOT_CUSTOM_REPO_SCMVERSION) > .scmversion; \ + fi) +endef + +UBOOT_POST_EXTRACT_HOOKS += UBOOT_CUSTOM_REPO_SCMVERSION_HOOK endif # BR2_TARGET_UBOOT && BR_BUILDING ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 23:15:17 2023 From: ckhardin at gmail.com (ckhardin at gmail.com) Date: Thu, 9 Feb 2023 15:15:17 -0800 Subject: [Buildroot] [PATCH 3/4] boot/uboot: add a setlocalversion rsync hook when overriding srcdir In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230209231518.9458-3-ckhardin@gmail.com> From: Charles Hardin During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define PLAIN_VERSION "2018.03-01358-gbda75d6a8b" #define U_BOOT_VERSION "U-Boot " PLAIN_VERSION Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index d735b47326..3f8479e623 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -40,6 +40,18 @@ UBOOT_SITE = https://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 endif +ifneq ($(UBOOT_OVERRIDE_SRCDIR),) +define UBOOT_OVERRIDE_SRCDIR_SETLOCALVERSION + (cd $(@D); \ + if [ -x ./scripts/setlocalversion ]; then \ + ./scripts/setlocalversion --save-scmversion \ + $(abspath $(UBOOT_OVERRIDE_SRCDIR)) ||:; \ + fi) +endef + +UBOOT_POST_RSYNC_HOOKS += UBOOT_OVERRIDE_SRCDIR_SETLOCALVERSION +endif + ifeq ($(BR2_TARGET_UBOOT)$(BR2_TARGET_UBOOT_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) endif -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 23:15:18 2023 From: ckhardin at gmail.com (ckhardin at gmail.com) Date: Thu, 9 Feb 2023 15:15:18 -0800 Subject: [Buildroot] [PATCH 4/4] linux: add a setlocalversion rsync hook when overriding srcdir In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230209231518.9458-4-ckhardin@gmail.com> From: Charles Hardin During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define UTS_RELEASE "5.4.70-00031-g92c23d10d003" Signed-off-by: Charles Hardin --- linux/linux.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 0b27c8dee2..3ef8e555c5 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -46,6 +46,18 @@ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_ endif endif +ifneq ($(LINUX_OVERRIDE_SRCDIR),) +define LINUX_OVERRIDE_SRCDIR_SETLOCALVERSION + (cd $(@D); \ + if [ -x ./scripts/setlocalversion ]; then \ + ./scripts/setlocalversion --save-scmversion \ + $(abspath $(LINUX_OVERRIDE_SRCDIR)) ||:; \ + fi) +endef + +LINUX_POST_RSYNC_HOOKS += LINUX_OVERRIDE_SRCDIR_SETLOCALVERSION +endif + ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) endif -- 2.37.1 (Apple Git-137.1) From cherniaev.andrei at kairo.space Fri Feb 10 05:57:53 2023 From: cherniaev.andrei at kairo.space (Andrei Cherniaev) Date: Fri, 10 Feb 2023 14:57:53 +0900 Subject: [Buildroot] [RE]Re: [PATCH] board/qemu: add echo for errors Message-ID: <167600867506.1345656.7844136709572400573@wmail10.mailplug.com> See my case here https://bugs.busybox.net/show_bug.cgi?id=15271#c1Sorry, I forgot Signed-off-by because buildroot uses a very un-user-friendly old-school contrib system. I suggest using GitHub. Also I want to say. I try to send this mail twice. In first time I got "The mailing lists on this server only accept email from mailing list subscribers. You are not subscribed to this mailing list". Very-very un-user-friendly...----- Original Message -----From : Romain Naour To : "AndreiCherniaev" , Cc : "AndreiCherniaev" , "Romain Naour" Sent : 2023-02-08 01:26:14Subject : Re: [Buildroot] [PATCH] board/qemu: add echo for errorsHello Andrei,Le 22/01/2023 ? 13:36, AndreiCherniaev a ?crit:> From: AndreiCherniaev > Your Signed-off-by is missing, so we can't apply the patch as is [1].I'm making it as "Changes requested".Maybe a small comment explaining why you want to change the script would be great.[1] https://nightly.buildroot.org/manual.html#submitting-patches> ---> board/qemu/post-image.sh | 8 ++++----> 1 file changed, 4 insertions(+), 4 deletions(-)> > diff --git a/board/qemu/post-image.sh b/board/qemu/post-image.sh> index 88f0413496..91d5b88b03 100755> --- a/board/qemu/post-image.sh> +++ b/board/qemu/post-image.sh> @@ -6,8 +6,8 @@ README_FILES="$/*/readme.txt"> START_QEMU_SCRIPT="$/start-qemu.sh"> > if [[ "$" =~ ^"qemu_*" ]]; then> - # Not a Qemu defconfig, can't test.> - exit 0> + echo "Not a Qemu defconfig, can't test"> + exit 1Initially exit 0 was intended to not fail the build for non qemu defconfig ingitlab-ci. But board/qemu/post-image.sh in only used by qemu defconfig so eventhe test doesn't seems not required anymore.> fi> > # Search for "# qemu_*_defconfig" tag in all readme.txt files.> @@ -15,8 +15,8 @@ fi> QEMU_CMD_LINE=$(sed -r ':a; /\\$/N; s/\\\n//; s/\t/ /; ta; /# '$'$/!d; s/#.*//' $)> > if [ -z "$" ]; then> - # No Qemu cmd line found, can't test.> - exit 0> + echo "No Qemu cmd line found, can't test"> + exit 1> fiIIRC, some qemu defconfig was not gitlab-ready so exit 0 was here to not failthe gitlab-ci job if no qemu command line was provided. Only a build test isdone in this case.Best regards,Romain> > # Remove output/images path since the script will be in -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Fri Feb 10 06:37:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 06:37:13 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-09 Message-ID: <20230210063719.5AA4482232@smtp1.osuosl.org> Hello, Autobuild statistics for 2023-02-09 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 4 | 2 | 1 | 7 | 2022.11.x | 14 | 20 | 0 | 34 | master | 171 | 165 | 2 | 338 | Classification of failures by reason for master ----------------------------------------------- unknown | 7 elfutils-0.186 | 6 host-pahole-1.24 | 6 jack2-1.9.21 | 6 libsolv-0.7.22 | 6 python-cryptography-39.0.0 | 6 host-binutils-2.38 | 5 host-go-1.19.5 | 5 linux-6.1.9 | 5 norm-1.5.8 | 5 glibc-2.36-81-g4f4d7a13edfd... | 4 gobject-introspection-1.72.0 | 4 host-rust-1.67.0 | 4 gerbera-1.10.0 | 3 host-binutils-2.37 | 3 ffmpeg-4.4.3 | 2 fluent-bit-2.0.8 | 2 gobject-introspection | 2 host-libarchive-3.6.2 | 2 libglib2-2.72.3 | 2 libgpg-error-1.46 | 2 linux-5.10.162-cip24 | 2 lirc-tools-0.10.2 | 2 lttng-modules-2.13.7 | 2 netsurf-3.10 | 2 php-8.2.1 | 2 python-bcrypt-4.0.1 | 2 python-numpy-1.23.5 | 2 sdl-1.2.15 | 2 sigrok-cli-0.7.2 | 2 systemd-252.4 | 2 xenomai-3.0.10 | 2 zabbix-5.4.9 | 2 ace-7.0.6 | 1 asterisk-16.29.1 | 1 batman-adv-2022.3 | 1 bind-9.16.33 | 1 bluez5_utils-5.65 | 1 brltty-6.5 | 1 coreutils-9.1 | 1 crucible-2022.05.25 | 1 dahdi-linux-3.2.0 | 1 dfu-util-0.11 | 1 dmalloc-5.6.5 | 1 dust-0.8.1 | 1 edk2-edk2-stable202208 | 1 faad2-2.10.1 | 1 fftw-quad-3.3.8 | 1 file-5.43 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fwup-1.9.1 | 1 hawktracer-2ec19d7192334414... | 1 igh-ethercat-2e2cef61318953... | 1 json-c-0.16 | 1 libblockdev-2.26 | 1 libgcrypt-1.10.1 | 1 libnss-3.87 | 1 libsigsegv-2.14 | 1 libzlib-1.2.13 | 1 linux-5.10.162-cip24-rt10 | 1 linux-fusion-9.0.3 | 1 linux-tools | 1 lua-cffi-0.2.3 | 1 modem-manager-1.20.4 | 1 modsecurity2-2.9.7 | 1 mosh-1.4.0 | 1 mutt-2.2.9 | 1 nginx-1.22.1 | 1 ocf-linux-20171122 | 1 opencv3-3.4.17 | 1 openvmtools-11.3.5-18557794 | 1 opkg-0.4.5 | 1 optee-client-3.19.0 | 1 opus-1.3.1 | 1 perl-5.36.0 | 1 pixman-0.42.2 | 1 quickjs-2021-03-27 | 1 reaver-1.6.6 | 1 rsync-3.2.7 | 1 ssdp-responder-1.9 | 1 uclibc-1.0.42 | 1 uclibc-ng-test-6790eafe897b... | 1 wavemon-0.9.4 | 1 xlib_libX11-1.8.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/9b8e7f486eada7c4b28d081886b862ae6fcfaac1 | mips | asterisk-16.29.1 | NOK | http://autobuild.buildroot.net/results/c3952d85c634802e941777e040df977251b05047 | mips64el | batman-adv-2022.3 | NOK | http://autobuild.buildroot.net/results/a751028b46bca05fc149621ec723d144f51724aa | sh4eb | bind-9.16.33 | NOK | http://autobuild.buildroot.net/results/4119b0d9e84e3adf3ffcfc8e2058b1b130d7f959 | ORPH sh4a | bluez5_utils-5.65 | NOK | http://autobuild.buildroot.net/results/941ab94c5cdaaeaa0af3e02f10f683ae7eb48b5f | mipsel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/f138c1d9bb2d32592631d53e594a136bb15242b1 | sh4aeb | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/78ba29070a08165e5cd3b3f0db632583c79b7ce9 | ORPH x86_64 | crucible-2022.05.25 | NOK | http://autobuild.buildroot.net/results/1bf180ff682b73028dc1cfb6f78e5f4ff09c2c68 | i586 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/afefc1310dcdc41779a4488ceda5fbaa47a20961 | or1k | dfu-util-0.11 | NOK | http://autobuild.buildroot.net/results/d875a150ef19af56f9c7b87595a7c325db61a51d | ORPH i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/43bb254e064ccfd813247c6aef7953437fd1d0dc | ORPH powerpc64le | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/07c34d52b08611496ae862aa670ed81776df9d28 | ORPH x86_64 | edk2-edk2-stable202208 | NOK | http://autobuild.buildroot.net/results/ad9a144d92d624c151d890944ffc612a220ec130 | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/e32e53535e5c1c96f59efde5ed1d6a6289e109fb | ORPH arc | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/5fd51cedbae5ddfd16e3bf9dbb48aaa9c1a71309 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/bfb7c87e3c4ee3594e9e97e8ed772370ac1aebcc | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/2d27e7133a82889782bfe14514b9323afeb30644 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/93e3e26f30dfbe3c7f0576e43d2446d95bb483c8 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/2a94467eddc71f877ac6e123e039a69567bec6e1 | ORPH sh4a | faad2-2.10.1 | NOK | http://autobuild.buildroot.net/results/e975b9c2eeac954547cd6d79912c7044a4c2888e | arceb | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/88c78ea274e22e406bc0b82d000bd17914256f40 | aarch64 | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/dca3bc3e306da1f7ddfe3bda1a0747ec14a51bbc | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/9bc9c00f9d65bc7bb838577544b6242019d135dc | ORPH xtensa | file-5.43 | NOK | http://autobuild.buildroot.net/results/541d5cb89a597b43f260552ad584fad084c73d00 | ORPH s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/856fd250f75a696694c70e3208ffcef7470a7082 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/dceb413fb5d459338417d8dd5a42d95aa23e849b | mips64 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/6211045f9699ec4bcc6acd8ff02f2f4729f2c41e | powerpc64 | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/12a24742dfbd5253b12104b962261da2489e003a | aarch64_be | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/1171505712b18f850bc15fd7f5b93500dcea3508 | microblazeel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/1f941d6fc4e1e291fca87ebd86d42bb20bb56785 | mips | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/1bdf804eec3211b652b7df781c49b3eb7478f0ad | powerpc64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/1e23138b42ce8a7746429cec10659f96f2ea856c | mips64el | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/67de65c34f2948dc63008d604b243c180609cb23 | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/ea8ef0aefd1e0893a3ba38370d8b4a5ac4107d7f | mips | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/70a9c3e3fb1d7480bf31619bbd9c9f73d8ad177e | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/13d7d395f220b537fa77d1e6e72c9c3d6a1f6911 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/0614dccce55f6fe4b91d1493781c18ebe0b8ed0c | powerpc64le | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/32e36e46f31bab5382d9bb8e30f260a682698655 | powerpc64le | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/2ecb54e2b6f0329b9b43527030ebcc82c561ab72 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/f7f2662137fa1a1789d929fda36730204dcd1cc0 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/d126b44ac7de8121d53d47ae49b7d5b416e12a8b | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/8cdfa96470f57aa87c502f68091f6c7da610cce2 | nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5d29e38ee3898db338a01f068df33e17a650a7ff | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2a8bcae935d17816a3c629fc63b0fe5db3e6849d | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/313d8c3e4d3de8af5a8ccbc577e34876d2e1bc02 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/34683eafa5ff63c3f16d14331283afd672ce3a76 | ORPH riscv32 | hawktracer-2ec19d7192334414... | NOK | http://autobuild.buildroot.net/results/b4705910778ae1069476b61bb4ce6a5bd4a20889 | or1k | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/aab380e73b5be544fc14a4a0cf9332005233752d | or1k | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/79b01d7b38d887929ca1522c390cd098db916a0a | arceb | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/dec43e3c2ff1a1f9da02dba6554d95b4d2ab7bd3 | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/213cdb606f08d99d6936fa0fb1917857cfddd310 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/0e3565f93db4d7d111b8d3561437d5d274851d2d | aarch64_be | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/20ecb3d5f62818cdf880f8483ccec08324b0e51a | powerpc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/98f7fa79d81d14c448b1b63a6b8d43625771fc46 | mips64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/3f9a88ad7b13552a7ac7d859ee274beba22f2661 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/86559cc399271ef1268cc5e5f9e203b246ae3012 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/1805868dfbdac9f192a96b970847e165847e571a | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f1f7ae30fe97387130a5a048999da42a82ae57ec | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/20e2f1b14e3d4a1302794e54fa7d42ca4f9394b5 | aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/9b60ca3a000307a8df594c6632b7c28c8d9ff793 | aarch64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/34312c9886cd81a683543753039ae41a086c0a2f | mips64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/a23946dbc6925331787bce11ff843de0992b7e1c | m68k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c50ddd652f8d30bb25e64be52099e37e2d6c8977 | sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c0dc715f90f9f96b32ad4add69bb1741d969f38a | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/bd577399d3a86cf91e0e392deb882bc34ddcbd6d | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/33d583f6c8df7bba4e883619489eaa8b03d34ce0 | powerpc64le | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/010eb2f682e24a1419a4690c2235b447ca5d6107 | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/5c5e939f2ac2713240705a4e977b1ee0e1fa2086 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/1a9c904e5238a628d9dd38e86d7af2da4d0f36b8 | armeb | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/bd8614c7c8ff5ef1ae370b470ec3f1e46322169e | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/f0a0305d3a268cb228a5d8afee929bf225dc2fb7 | armeb | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/26352a0ff6b3e77f7023735c05fc9e0f124f9450 | x86_64 | igh-ethercat-2e2cef61318953... | NOK | http://autobuild.buildroot.net/results/c8720b48898585be5ec6cf2ff0c80a48ada331d5 | s390x | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/ca5385968711dffbd1b182eebcc647c97b74c874 | powerpc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/5f9f6e1d4aca0a268cf062d44186661f2305731c | m68k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/2223ca0a19fb617b03defe1a5ea99e05ccb1c3c2 | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/752faa2561cd67d590174ad801a540dbc0c57ce0 | riscv64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/1c7482e12331cbe0f8cfcc89a72ed2fc3ef317c1 | microblaze | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/885cb119e88f2342e747d41d24fe32d0148a4659 | or1k | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/0ce61e355ac495129fa90a2f9288da6bfb3dafd4 | or1k | libblockdev-2.26 | NOK | http://autobuild.buildroot.net/results/a2b824716e48b75e03dd012f8428a0a0d500896a | ORPH arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/36046efdec33e21376d34d2dbb202982aff7243b | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/a8af30ea6070450ba5ce4d3ed628f42bd7a8171b | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/1e270da549afb18348f131a3f21680946c51a6b2 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/ab7262e0850a00c91bbf153ec25154133b4dac04 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/e3de2419d82e91a595b4812312d39f39e9c2d7a6 | ORPH sh4eb | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/dfd980121fd3f1ff22fff7b5cd34e3d3680282a3 | arceb | libsigsegv-2.14 | NOK | http://autobuild.buildroot.net/results/dd8ecf20660ba37b5bbcb59d9deabfb69da77677 | arceb | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/bc3c2659de674c7cadeec9e45f992cfbf8fe68dc | mips | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/dfb84c469a27bd285fa73baac927e4bc1014d037 | aarch64 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/30cdbd6d4b2ebdc5901a86eb40cfe3821585d429 | or1k | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/662242fd32e20c2e33308f517e58aa3b25c5075d | powerpc64 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/3099b142a44116041fd369dc0a2a3fca2d42fbc5 | mips64el | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/1deddeeb0ffdf4dfaaef139bed4e5f8986b31c8c | mips64el | libzlib-1.2.13 | NOK | http://autobuild.buildroot.net/results/f2f9492dfd087b8bbc5c788d87193d185e2ee12c | ORPH mipsel | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/010c7650d8156b890a86921200db35bd30fe18ab | ORPH nios2 | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/9744212f354abc5ac4832585f80e1dcdc636beed | ORPH arceb | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/e3f7be013b6b2ab6f44800606780807b1fe5a115 | ORPH mips64el | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/d32294c96049410c764e8330f4c2ef8ce54b2d9c | ORPH mips64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/6ea3c1ce875b608fd47840aede09238033664824 | ORPH mipsel | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/5a399b6280f5796035c67713a66b356bd2187de9 | ORPH riscv32 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/7cd3c5ea56ba1c0cab7e2d9f9698194beced6d92 | ORPH mipsel | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/c42a001c013cad006d89ec07373846073d0ec204 | ORPH sparc64 | linux-fusion-9.0.3 | NOK | http://autobuild.buildroot.net/results/4a9b8de2e7500db213d8d578164fdcc3ebfebb5e | ORPH mips64 | linux-tools | NOK | http://autobuild.buildroot.net/results/9777eebc395ed3715e974b2f1475396986432fa3 | ORPH microblaze | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/8b9bd67edb7ae89a1fcfe33749bb0b8235e68163 | ORPH mips | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/0ba50382ea2c4e00d5d98be34c0bd8615268c563 | ORPH powerpc64 | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/9e274cceb07e27e5566365320446fecadb20a729 | sparc | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/37f2d1dd48a5ae25b646f4852f6fc807181d999c | or1k | lua-cffi-0.2.3 | NOK | http://autobuild.buildroot.net/results/b441dcbea8723e57084d52339aa7f3592c3e4db3 | armeb | modem-manager-1.20.4 | NOK | http://autobuild.buildroot.net/results/2bdf3b7822a64f625c3bb87f0ad6d334595a763d | sh4a | modsecurity2-2.9.7 | NOK | http://autobuild.buildroot.net/results/fa370b0476c3eaaf48c615e7358c5fd2eae5badd | mips | mosh-1.4.0 | NOK | http://autobuild.buildroot.net/results/9ee6f66248121adcf485266eea3e4f5510fbcab1 | sparc64 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/53ae7495c5d1cfec86a93be4c1b747ea4a311ee3 | powerpc64le | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/7e0466dfe8088620e12df970461c9b5f00ceafc0 | sparc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/6f16aeabf9b728d331ea1e65d7518d569cef717f | sparc64 | nginx-1.22.1 | NOK | http://autobuild.buildroot.net/results/078adb11db6dde9914aacd8906b7c01b03ebebf7 | sparc64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/fee1ba15e78d6ca236eb3bbeda565172578bfcfc | ORPH microblaze | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/82662e270cdb40deaf8a9c5a558628996453de1c | ORPH microblazeel | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/46f4e06bb00f3d0126e31d0a558497af5bae7cc0 | ORPH aarch64_be | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/3617d3beb1d669097f8257ad23f2d06b32fe101c | ORPH m68k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/92ad4eb2e57e74c036e655ae269f44e162b92e21 | ORPH arm | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/d6930dfcdae163553dc9ba55dfefc1585797c35a | ORPH x86_64 | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/3a5cc40a4d0b15ccced46701baed3bfa811c05e7 | aarch64 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/ea0d5440dda349a77315bed2b69e117ab0ed5476 | or1k | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/2932dcd2ecab732369d8139aae046e3d908f8bc5 | ORPH i686 | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/4de54f6ec94a65c751b79eab0e61ff804495c726 | arm | opus-1.3.1 | NOK | http://autobuild.buildroot.net/results/0d56a6bf110e060a3e3aa97b70565a93946a8584 | ORPH aarch64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/7923cbc90f6ce3e9583a975b0bbc13bd60a81918 | armeb | php-8.2.1 | NOK | http://autobuild.buildroot.net/results/0309ab52eedecb686e2487533f351e3b0ef3ed84 | armeb | php-8.2.1 | NOK | http://autobuild.buildroot.net/results/4d49a5f2b2ee33502502265e86aebeb190b20f7c | arm | pixman-0.42.2 | NOK | http://autobuild.buildroot.net/results/79c493df47871e78308b987fa921870b9ae1b43f | powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/dc4485436c58ec2b625038b9dbc02216c9e20362 | aarch64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/69c09b40436b7a4080bd68abfb805907ebf2d949 | arm | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/60300a50f6218acced5159e8893b337c6de6fb75 | sparc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/ad57ba835b1342a7903b2bfe7dfc6c3d1868d238 | sparc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/9c6d4505517ad97f1024c7305e4e0ffe2f5fa213 | powerpc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/42bd3c91b1b3124f79c490144d930da18e47f94d | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/076fd5476bd74223b87044ed98cdbaf10dc7daa0 | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/169abf05619832c54fc9fbd716741c0455bce92b | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/9c81d6a957db0733b4ce7137545ada762e619d64 | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/0f251f2eeb7b63efa439cae252bfc244376c56be | or1k | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/5e8c1e69479c838094ef5fba19a21a84a86cc8ad | arc | reaver-1.6.6 | NOK | http://autobuild.buildroot.net/results/fefda6008e2eec8850e532f9916ff567f93e086e | sparc | rsync-3.2.7 | NOK | http://autobuild.buildroot.net/results/1f0c4b6b7fdfded982e311b3bf58640dd405d97d | sh4aeb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/5aea3e90a9ba89e4b3af4fc63db335083b7a91fb | ORPH sh4eb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/3979f16d6f26357fad9334e7ac4f8d22f287ed21 | ORPH aarch64_be | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/7f86445785952b24aaab8d12c37b7873371ab712 | ORPH nios2 | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/9eaca61628c14afe95dd2c32cc6b877cbc3af5d1 | ORPH aarch64 | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 | aarch64_be | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/1233de5599a264832162b156678cfda1bafd5a84 | mipsel | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/5c41408a1dfb8375466189eb8616a4dca1fda727 | powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/4b5be17326bdea6e020957e8c74d1241f1efcca9 | mipsel | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/d307b26fd6673ed724ace500b62a4b3298281750 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/ff415d035818b8ba1c81a6ac810499a88daba86d | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/a1e317a66ea875e30544beef5076a4ae5c035de1 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/c13231dc943fb027355fd2c46db677783bdf654b | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/08f95c6ccfc009842f8e424e685ab9fad93d2703 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/17eeb1e9499abbfde2ed5d62230a1dc51aa8bb96 | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/c2fd411f5b7fe349fa912a20813a6eb0ebecf4e8 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/90c4e3ad87a17de20dd54151583c2b9abaf639b0 | aarch64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/f85ac475b83127a78885196642e84711a20d555f | ORPH s390x | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/29f42c0faebcb1c2534609f5344c2ba68e21c03e | s390x | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/7fc478d5cbd2bd526b732a5aa0e824f0654d00bb | arm | xlib_libX11-1.8.3 | NOK | http://autobuild.buildroot.net/results/c922be5e389a1e71b19c7293fea4ad3580e828c9 | sparc64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/f8221a6e257156903cc77a65d91c189c1656f74d | mips64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/02e6ca13cf64724e3d100f4f3b5472ca6810faac | Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 1 libuwsc | 1 wavemon-0.9.4 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/8f909088906b3bb9f6b3a0dc3f21d4c6521d9374 | mipsel | libuwsc | TIM | http://autobuild.buildroot.net/results/750ca64679192946dc137237cd4e09b66dece792 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/26e9efb7be515cc7e467a57cf58a79fa4ab4f317 | ORPH Classification of failures by reason for 2022.11.x -------------------------------------------------- janus-gateway-1.0.3 | 5 gerbera-1.10.0 | 1 google-breakpad-c85eb4a59b6... | 1 host-binutils-2.38 | 1 host-pahole-1.24 | 1 ipmiutil-3.1.8 | 1 libglib2-2.72.3 | 1 libvorbis-1.3.7 | 1 mariadb-10.3.36 | 1 mutt-2.2.9 | 1 openssh-9.1p1 | 1 proftpd-1.3.8 | 1 pv-1.6.20 | 1 unknown | 1 xenomai-3.0.10 | 1 xxhash-0.8.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/65e77993f5f9eda19f92c99a6da34f2652914275 | mipsel | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/5d2238f2b586a6580c66bfe7d3ccfae026a17c87 | powerpc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/a1e8e36afded3d63796ef60b235ed04a6d398cb4 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/4b60dcd170a4f8cf6b3fb9bcb7c2ad1e2c7f0357 | x86_64 | ipmiutil-3.1.8 | NOK | http://autobuild.buildroot.net/results/6761a25db610e61308e5020a82320c6d4d39a02c | aarch64_be | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/b3fc4e884b861ee742a83484d78f6a61dc8d64da | aarch64_be | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/53a5498f49fa1fa7f939a23d238c6220f6e32fac | x86_64 | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/d054ed4178e089e85e4305605aa1c2e0be85a501 | sparc64 | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/868c1eea7b1ccf599388b8ef42c49b6044ecf8db | mips64 | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/17a00303aa900deb3eeb3d6c5b6e5bac45f63034 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/ffeee758cc9ad36ed05915eda2016b1201826bb6 | powerpc | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/807c94da984b9334a605cf064ccb7aad14080108 | sparc | mariadb-10.3.36 | NOK | http://autobuild.buildroot.net/results/ed08125cfaf43a22d17aa460269ac7123444c848 | ORPH or1k | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/e45feb1781eb044652086f6a668c89eb3701bde2 | or1k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/2638d2db23a96cf624a58b23320ff7429cf9252b | ORPH sparc | proftpd-1.3.8 | NOK | http://autobuild.buildroot.net/results/a3309ec92a143ac96f46d70c0bc9bfa0235c4e03 | armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/14d3075a4d658c646cddea05042d157b82d76edf | ORPH riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/15d34c999cc8bb16d76fc71a38511d6ed645960f | i686 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/9f44186ba196ea94847f7af3e494c753df2de6d1 | aarch64_be | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/034a4f715b257fce05850802a0dc9edc5dfd5c1d | ORPH -- http://autobuild.buildroot.net From fido_max at inbox.ru Fri Feb 10 07:22:28 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 10 Feb 2023 10:22:28 +0300 Subject: [Buildroot] [PATCH 1/1] package/postgresql: bump version to 15.2 Message-ID: <20230210072228.68137-1-fido_max@inbox.ru> Release notes: https://www.postgresql.org/docs/release/15.2/ Signed-off-by: Maxim Kochetkov --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index ef2806c2dd..e6a9bd6658 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v14.6/postgresql-15.1.tar.bz2.sha256 -sha256 64fdf23d734afad0dfe4077daca96ac51dcd697e68ae2d3d4ca6c45cb14e21ae postgresql-15.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 +sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 2ffcac6595..e90aa794b0 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 15.1 +POSTGRESQL_VERSION = 15.2 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL -- 2.38.1 From fido_max at inbox.ru Fri Feb 10 07:37:31 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 10 Feb 2023 10:37:31 +0300 Subject: [Buildroot] [PATCH 1/1] package/gdal: bump version to 3.6.2 Message-ID: <20230210073731.152068-1-fido_max@inbox.ru> Release notes: https://github.com/OSGeo/gdal/blob/v3.6.2/NEWS.md Signed-off-by: Maxim Kochetkov --- package/gdal/gdal.hash | 6 +++--- package/gdal/gdal.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gdal/gdal.hash b/package/gdal/gdal.hash index ab77d7840d..6cf3336644 100644 --- a/package/gdal/gdal.hash +++ b/package/gdal/gdal.hash @@ -1,6 +1,6 @@ -# md5 from: https://download.osgeo.org/gdal/3.5.2/gdal-3.5.2.tar.xz.md5, sha256 locally computed: -md5 821b3b0637ebada5d20dbefb2e3ec964 gdal-3.5.2.tar.xz -sha256 0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2 gdal-3.5.2.tar.xz +# md5 from: https://download.osgeo.org/gdal/3.6.2/gdal-3.6.2.tar.gz.md5, sha256 locally computed: +md5 6f22ffdbd8e00059ddb2b825c5920c4c gdal-3.6.2.tar.xz +sha256 35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681 gdal-3.6.2.tar.xz # Hashes of license files: sha256 fac0116e799ca4de79b076ee04863b5e2b69541ea3664b9bb108c81a5355f16a LICENSE.TXT diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index a3b11c53af..ba9ba71b3b 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -4,7 +4,7 @@ # ################################################################################ -GDAL_VERSION = 3.5.2 +GDAL_VERSION = 3.6.2 GDAL_SITE = https://download.osgeo.org/gdal/$(GDAL_VERSION) GDAL_SOURCE = gdal-$(GDAL_VERSION).tar.xz GDAL_LICENSE = MIT, many others -- 2.38.1 From Shahab.Vahedi at synopsys.com Fri Feb 10 09:17:40 2023 From: Shahab.Vahedi at synopsys.com (Shahab Vahedi) Date: Fri, 10 Feb 2023 09:17:40 +0000 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: revert bpf_cookie patch to allow building In-Reply-To: <1750a14f-36a1-fe51-1452-3a72b84979c5@mind.be> References: <97ea44bb-58fe-d6cb-6c79-9be0b245f2c6@synopsys.com> <29d2a8c7-44cd-da42-5fed-f17ec0f8ccf2@synopsys.com> <1750a14f-36a1-fe51-1452-3a72b84979c5@mind.be> Message-ID: <9a8b4ac5-6ffb-e8d8-3587-2768e004780e@synopsys.com> On 2/9/23 21:27, Arnout Vandecappelle wrote: > > On 09/02/2023 13:23, Shahab Vahedi wrote: >> >> On 2/8/23 17:36, Arnout Vandecappelle wrote: >>> >>> It's not clear to me why you did a revert of the cookie feature rather than >>> using those patches. I think the first two or three should be sufficient to >>> fix your issue? >> >> Ideally, the correct way would be applying that pending series. But since >> there were comments that some of the patches might need reworking [1], I did > > I don't see anything in that thread about rework being needed, only some > complaints about some mail gateway encrypting messages so they can't be > read by some recipients... See this [1] and the response here [2]. Having read it again, apparently it is not such a big deal. Alexander, the author, mentioned that he will redo that part in v3 of the patch the way David suggested. So either, I can make that change when submitting to Buildroot, or take it as it is. Your call. [1] https://lore.kernel.org/bpf/20220421003152.339542-3-alobakin at pm.me/T/#m42db58567febf12040f6ba0478e1a6148c284c55 [2] https://lore.kernel.org/bpf/20220421003152.339542-3-alobakin at pm.me/T/#m293896646128262621c83e8c15c4d977f92ad0d2 >> not feel confident to add them. Therefore, I tried to keep my solution minimal >> and solve it by eliminating the problem. I know, it is not appealing. > > The problem with your patch is that it is very difficult to decide if it > should be kept or not when bumping the version. Plus, some people (or other > packages) may rely on the feature that you remove. I can try to apply that patch series on top of bpftool-v7.1.0-br1.tar.gz in buildroot. If it can be done fairly easily, I will submit it on a different thread. -- Shahab From bugzilla at busybox.net Fri Feb 10 10:13:15 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 10 Feb 2023 10:13:15 +0000 Subject: [Buildroot] [Bug 15331] New: Warning on python-flit-core license when generating legal info Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15331 Bug ID: 15331 Summary: Warning on python-flit-core license when generating legal info Product: buildroot Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: trivial Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: alexis.lothore at bootlin.com CC: buildroot at uclibc.org Target Milestone: --- Created attachment 9506 --> https://bugs.busybox.net/attachment.cgi?id=9506&action=edit Modified defconfig to reproduce the issue The legal-info target emits a warning on python-flit-core: WARNING: python-flit-core-3.8.0: cannot save license (HOST_PYTHON_FLIT_CORE_LICENSE_FILES not defined) Steps to reproduce: - clone buildroot - make qemu_x86_64_defconfig - in menuconfig, enable python3, a python package having flit as setup type (e.g.: argon2_cffi) - make legal-info Host OS : Archlinux (Linux arch-bootlin-alexis 6.1.9-arch1-2 #1 SMP PREEMPT_DYNAMIC Fri, 03 Feb 2023 18:49:53 +0000 x86_64 GNU/Linux) Buildroot version : master (e2fd606b91784ced64c7312e02fcbf95f3e736d6) -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Fri Feb 10 10:13:39 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 10 Feb 2023 10:13:39 +0000 Subject: [Buildroot] [Bug 15331] Warning on python-flit-core license when generating legal info In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15331 Alexis Lothor? changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|unassigned at buildroot.uclibc |alexis.lothore at bootlin.com |.org | -- You are receiving this mail because: You are on the CC list for the bug. From jesseevg at gmail.com Fri Feb 10 10:14:21 2023 From: jesseevg at gmail.com (Jesse Van Gavere) Date: Fri, 10 Feb 2023 11:14:21 +0100 Subject: [Buildroot] [PATCH v6 13/13] package/qt6: Add qmake functionality In-Reply-To: <20230208121829.126bc242@windsurf> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-14-angelo@amarulasolutions.com> <20230208121829.126bc242@windsurf> Message-ID: Hello Thomas, You're right, this won't work with a relocated HOST_DIR the QT6_INSTALL_QT_CONF seems to have gotten dropped in Angelo his patch series, I'll rebase onto what has been approved and submit a new series for the qmake functionality. Thanks for the reviews! Regards, Jesse Op wo 8 feb. 2023 om 12:18 schreef Thomas Petazzoni : > > Hello, > > On Tue, 7 Feb 2023 18:17:21 +0100 > Angelo Compagnucci wrote: > > > diff --git a/package/qt6/qt6base/qt.conf.in b/package/qt6/qt6base/qt.conf.in > > new file mode 100644 > > index 0000000000..4842bcb462 > > --- /dev/null > > +++ b/package/qt6/qt6base/qt.conf.in > > @@ -0,0 +1,7 @@ > > +[Paths] > > +Prefix=/usr > > +HostPrefix=@@HOST_DIR@@ > > +HostData=../target/usr > > This looks very very odd, and most likely doesn't work. If I understand > correctly, this is a path that will be interpreted relatively to > $(HOST_DIR), so this value assumes that host/ and target/ are side by > side, but that's not true in the general case. Indeed, BR2_HOST_DIR > allows to customize where $(HOST_DIR) is located, and it can be > elsewhere than side by side to target/. > > What is this trying to do exactly? > > > > > +Sysroot=@@STAGING_DIR@@ > > +SysrootifyPrefix=true > > +TargetSpec=devices/linux-buildroot-g++ > > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk > > index ec1c65f827..f37b2bafce 100644 > > --- a/package/qt6/qt6base/qt6base.mk > > +++ b/package/qt6/qt6base/qt6base.mk > > @@ -54,6 +54,9 @@ QT6BASE_CONF_OPTS = \ > > -DFEATURE_system_zlib=ON \ > > -DFEATURE_system_libb2=ON > > > > +QT6BASE_CFLAGS = $(TARGET_CFLAGS) > > +QT6BASE_CXXFLAGS = $(TARGET_CXXFLAGS) > > + > > # x86 optimization options. While we have a BR2_X86_CPU_HAS_AVX512, it > > # is not clear yet how it maps to all the avx512* options of Qt, so we > > # for now keeps them disabled. > > @@ -384,5 +387,18 @@ else > > QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF > > endif > > > > +define QT6BASE_MAKE_BR_SPEC > > + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qmake.conf.in \ > > + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf > > + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ > > + $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h > > +endef > > + > > +QT6BASE_CONF_OPTS += -DQT_QMAKE_DEVICE_OPTIONS=CROSS_COMPILE="$(TARGET_CROSS)";BR_COMPILER_CFLAGS="$(QT6BASE_CFLAGS)";BR_COMPILER_CXXFLAGS="$(QT6BASE_CXX_FLAGS)" > > + > > +QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC > > + > > +QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF > > Where is QT6_INSTALL_QT_CONF implemented ? > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From alexis.lothore at bootlin.com Fri Feb 10 10:26:55 2023 From: alexis.lothore at bootlin.com (=?UTF-8?q?Alexis=20Lothor=C3=A9?=) Date: Fri, 10 Feb 2023 11:26:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-flit-core: set license path Message-ID: <20230210102655.94324-1-alexis.lothore@bootlin.com> When generating legal info with a configuration enabling a package which uses flit as setup type, we get a warning about python-flit-core license: WARNING: python-flit-core-3.8.0: cannot save license (HOST_PYTHON_FLIT_CORE_LICENSE_FILES not defined) Add missing variable to point to python-flit-core license file Signed-off-by: Alexis Lothor? --- package/python-flit-core/python-flit-core.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 4d7bee81da..f96191ade6 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -8,6 +8,7 @@ PYTHON_FLIT_CORE_VERSION = 3.8.0 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/10/e5/be08751d07b30889af130cec20955c987a74380a10058e6e8856e4010afc PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause +PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap # Use flit built in bootstrap_install for installing host-python-flit-core. -- 2.39.1 From bugzilla at busybox.net Fri Feb 10 10:40:46 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 10 Feb 2023 10:40:46 +0000 Subject: [Buildroot] [Bug 15331] Warning on python-flit-core license when generating legal info In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15331 --- Comment #1 from Alexis Lothor? --- Proposed patch: https://lists.buildroot.org/pipermail/buildroot/2023-February/661800.html -- You are receiving this mail because: You are on the CC list for the bug. From frank.vanbever at mind.be Fri Feb 10 11:06:43 2023 From: frank.vanbever at mind.be (Frank Vanbever) Date: Fri, 10 Feb 2023 12:06:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/elixir: drop package Message-ID: <20230210110643.449927-1-frank.vanbever@mind.be> Elixir was a dependency of rabbitmq-server which got dropped in 89815bad0a531d01ee2733dd9c17576a7647e1d9. It is a host package with no other users, hence it is no longer required. Additionally, newer versions require Erlang 23+. Signed-off-by: Frank Vanbever --- DEVELOPERS | 1 - package/elixir/elixir.hash | 3 --- package/elixir/elixir.mk | 21 --------------------- 3 files changed, 25 deletions(-) delete mode 100644 package/elixir/elixir.hash delete mode 100644 package/elixir/elixir.mk diff --git a/DEVELOPERS b/DEVELOPERS index 32c6e54919..e8e0671709 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1089,7 +1089,6 @@ F: package/upx/ F: package/zxing-cpp/ N: Frank Vanbever -F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ diff --git a/package/elixir/elixir.hash b/package/elixir/elixir.hash deleted file mode 100644 index 6d083e72de..0000000000 --- a/package/elixir/elixir.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Computed locally -sha256 f3465d8a8e386f3e74831bf9594ee39e6dfde6aa430fe9260844cfe46aa10139 elixir-1.9.4.tar.gz -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE diff --git a/package/elixir/elixir.mk b/package/elixir/elixir.mk deleted file mode 100644 index 6d935516f4..0000000000 --- a/package/elixir/elixir.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# elixir -# -################################################################################ - -ELIXIR_VERSION = 1.9.4 -ELIXIR_SITE = $(call github,elixir-lang,elixir,v$(ELIXIR_VERSION)) -ELIXIR_LICENSE = Apache-2.0 -ELIXIR_LICENSE_FILES = LICENSE -HOST_ELIXIR_DEPENDENCIES = host-erlang - -define HOST_ELIXIR_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) compile -endef - -define HOST_ELIXIR_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX="$(HOST_DIR)" -C $(@D) install -endef - -$(eval $(host-generic-package)) -- 2.37.2 From Dirk.DeBecker at ebo-enterprises.com Fri Feb 10 11:15:12 2023 From: Dirk.DeBecker at ebo-enterprises.com (Dirk De Becker) Date: Fri, 10 Feb 2023 11:15:12 +0000 Subject: [Buildroot] Dependency problem for gtkmm3 Message-ID: Hi, I am trying to make a buildroot containing libgtkmm3, but I run into problems. I did the following steps: Checkout master from git://git.buildroot.net/buildroot Select the following things: * BR2_x86_64 * BR2_TOOLCHAIN_BUILDROOT_CXX * BR2_PACKAGE_MESA3D * BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 * BR2_PACKAGE_MESA3D_OPENGL_EGL * BR2_PACKAGE_LIBGTK3 * BR2_PACKAGE_GTKMM3 I get the following error in the output of the build attempt for gtkmm3-3.22.0: configure: error: Package requirements (giomm-2.4 >= 2.49.1 pangomm-1.4 >= 2.38.2 gtk+-3.0 >= 3.22.0 cairomm-1.0 >= 1.12.0 gdk-pixbuf-2.0 >= 2.35.5) were not met: Package 'giomm-2.4', required by 'virtual:world', not found Package 'pangomm-1.4', required by 'virtual:world', not found Package 'cairomm-1.0', required by 'virtual:world', not found It seems that gtkmm3 is dependent on versions of some libraries that are not available. The following packages were built, but these do not provide the correct versions of these packages, according to pkg-config: * glibmm-2.68.2 * pangomm-2.48.2 * cairomm-1.16.1 Met vriendelijke groeten, Cordialement, Kind Regards, [https://www.ebo-enterprises.com/static/emailsignatures/img/ebo_logo-transparant.png] Dirk De Becker Squad Leader e-Vision Embedded dirk.debecker at ebo-enterprises.com +32 498 51 19 86 . +32 57 23 02 70 . [https://www.ebo-enterprises.com/static/emailsignatures/img/microsoft_teams_icon.png] Ter Waarde 60 . 8900 Ypres . Belgium Wetenschapspark 2 . 8400 Ostend . Belgium [https://www.ebo-enterprises.com/static/emailsignatures/img/website_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/twitter_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/facebook_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/instagram_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/linkedin_icon.png] [MicrosoftTeams-image.png] -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: C2_signature_microsoftteams-image_b51463d7-6b52-402b-8e2d-555faff69bb4.png Type: image/png Size: 8323 bytes Desc: C2_signature_microsoftteams-image_b51463d7-6b52-402b-8e2d-555faff69bb4.png URL: From john at metanate.com Fri Feb 10 11:17:33 2023 From: john at metanate.com (John Keeping) Date: Fri, 10 Feb 2023 11:17:33 +0000 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: Build with ninja In-Reply-To: <20230209170707.4066903-1-peter@korsgaard.com> References: <20230209170707.4066903-1-peter@korsgaard.com> Message-ID: Hi Peter, On Thu, Feb 09, 2023 at 06:07:05PM +0100, Peter Korsgaard wrote: > +define WEBKITGTK_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) > +endef > + > +define WEBKITGTK_INSTALL_STAGING_CMDS > + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) > +endef > + > +define WEBKITGTK_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) > +endef > + Would it make sense to apply these changes in pkg-cmake.mk? Using `cmake --build` and `cmake --install` works with all generators and it would avoid needing to repeat this block for both of the packages in this series. Regards, John From buildroot at heine.tech Fri Feb 10 11:39:23 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Fri, 10 Feb 2023 12:39:23 +0100 Subject: [Buildroot] [PATCH] package/boost: bump to version 1.81.0 Message-ID: <20230210113931.4055853-1-buildroot@heine.tech> - add option for new library "url" - drop upstreamed patch Signed-off-by: Michael Nosthoff --- compile tested defconfigs: BR2_arm=y BR2_cortex_a15=y BR2_ARM_FPU_NEON=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_PACKAGE_CC_TOOL=y BR2_PACKAGE_LIBUBOOTENV=y BR2_PACKAGE_BOTAN=y BR2_PACKAGE_UHD=y BR2_PACKAGE_LOG4CXX=y BR2_PACKAGE_LIBCPPRESTSDK=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_COROUTINE=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_FIBER=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y BR2_PACKAGE_BITCOIN=y BR2_PACKAGE_I2PD=y BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_QT5=y BR2_PACKAGE_PULSEVIEW=y BR2_PACKAGE_GNURADIO=y BR2_sh=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE=y BR2_PACKAGE_BOOST=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MATH=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y BR2_PACKAGE_BOOST_RANDOM=y BR2_PACKAGE_BOOST_SERIALIZATION=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y BR2_x86_64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_BOOST=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_COROUTINE=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_FIBER=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MATH=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y BR2_PACKAGE_BOOST_RANDOM=y BR2_PACKAGE_BOOST_SERIALIZATION=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y --- .../0001-Improve-modfunc-performance.patch | 551 ------------------ package/boost/Config.in | 13 + package/boost/boost.hash | 4 +- package/boost/boost.mk | 5 +- 4 files changed, 18 insertions(+), 555 deletions(-) delete mode 100644 package/boost/0001-Improve-modfunc-performance.patch diff --git a/package/boost/0001-Improve-modfunc-performance.patch b/package/boost/0001-Improve-modfunc-performance.patch deleted file mode 100644 index a34d6bb4d5..0000000000 --- a/package/boost/0001-Improve-modfunc-performance.patch +++ /dev/null @@ -1,551 +0,0 @@ -From 825aedad557b7e3bb27614335b6ced16887103de Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= -Date: Mon, 7 Nov 2022 00:16:44 +0100 -Subject: [PATCH] Improve "modfunc" performance Fixes #79 - ("boost/intrusive/hashtable.hpp: build failure (undeclared indentifier)") - -Backport from Boost development branch to fix issues with some architectures -(64-bit with 128-bit processing, where size_t != unsigned long). In this case, -code is enabled that causes a build failure. - -Upstream: https://github.com/boostorg/intrusive/commit/825aedad557b7e3bb27614335b6ced16887103de -Issue: https://github.com/boostorg/intrusive/issues/79 -Fixes: http://autobuild.buildroot.net/results/6cb/6cbc0672f3c5046405793d8cdc8f961d2ffb1d3e - -Signed-off-by: Andreas Ziegler ---- - include/boost/intrusive/hashtable.hpp | 235 ++++++++++++++++---------- - 1 file changed, 145 insertions(+), 90 deletions(-) - -diff --git a/include/boost/intrusive/hashtable.hpp b/include/boost/intrusive/hashtable.hpp -index b8bc877..688fb9b 100644 ---- a/boost/intrusive/hashtable.hpp -+++ b/boost/intrusive/hashtable.hpp -@@ -2,6 +2,7 @@ - // - // (C) Copyright Ion Gaztanaga 2006-2022 - // (C) Copyright 2022 Joaquin M Lopez Munoz. -+// (C) Copyright 2022 Christian Mazakas - // - // Distributed under the Boost Software License, Version 1.0. - // (See accompanying file LICENSE_1_0.txt or copy at -@@ -84,11 +85,6 @@ namespace intrusive { - - /// @cond - --#if !defined(BOOST_NO_INT64_T)&&\ -- (defined(BOOST_HAS_INT128) || (defined(_MSC_VER) && defined(_WIN64))) --#define BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT --#endif -- - //We only support LLP64(Win64) or LP64(most Unix) data models - #ifdef _WIN64 //In 64 bit windows sizeof(size_t) == sizeof(unsigned long long) - # define BOOST_INTRUSIVE_SIZE_C(NUMBER) NUMBER##ULL -@@ -98,7 +94,6 @@ namespace intrusive { - # define BOOST_INTRUSIVE_64_BIT_SIZE_T (((((ULONG_MAX>>16)>>16)>>16)>>15) != 0) - #endif - -- - template - struct prime_list_holder - { -@@ -167,11 +162,11 @@ struct prime_list_holder - { return prime_list[std::ptrdiff_t(n)]; } - - template -- BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % prime_list[SizeIndex]; } -+ BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % SizeIndex; } - - static std::size_t(*const positions[])(std::size_t); - -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T - static const uint64_t inv_sizes32[]; - static const std::size_t inv_sizes32_size; - #endif -@@ -185,17 +180,20 @@ struct prime_list_holder - BOOST_INTRUSIVE_FORCEINLINE static std::size_t size(std::size_t size_index) - { return prime_list_holder<>::size_from_index(size_index); } - -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T - // https://github.com/lemire/fastmod - -- - BOOST_INTRUSIVE_FORCEINLINE static uint64_t mul128_u32(uint64_t lowbits, uint32_t d) - { - #if defined(_MSC_VER) -- return __umulh(lowbits, d); -+ return __umulh(lowbits, d); -+ #elif defined(BOOST_HAS_INT128) -+ return static_cast((uint128_type(lowbits) * d) >> 64); - #else -- __extension__ typedef unsigned __int128 ext_uint128_t; -- return (ext_uint128_t(lowbits) * d) >> 64; -+ uint64_t r1 = (lowbits & UINT32_MAX) * d; -+ uint64_t r2 = (lowbits >> 32) * d; -+ r2 += r1 >> 32; -+ return r2 >> 32; - #endif - } - -@@ -204,51 +202,67 @@ struct prime_list_holder - uint64_t lowbits = M * a; - return (uint32_t)(mul128_u32(lowbits, d)); - } -- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - - BOOST_INTRUSIVE_FORCEINLINE static std::size_t position(std::size_t hash,std::size_t size_index) - { -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) && BOOST_INTRUSIVE_64_BIT_SIZE_T -- const std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T -+ BOOST_CONSTEXPR_OR_CONST std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); - if(BOOST_LIKELY(size_index < sizes_under_32bit)){ - return fastmod_u32( uint32_t(hash)+uint32_t(hash>>32) - , inv_sizes32[size_index] - , uint32_t(prime_list[size_index]) ); - } - else{ -- return positions[size_index-sizes_under_32bit](hash); -+ return positions[size_index](hash); - } -- #elif defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -- return fastmod_u32(hash, inv_sizes32[size_index], uint32_t(sizes[size_index])); - #else - return positions[size_index](hash); -- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - } - }; - - template - std::size_t(* const prime_list_holder::positions[])(std::size_t) = - { -- #if !defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -- modfunc< 0>,modfunc< 1>,modfunc< 2>,modfunc< 3>,modfunc< 4>, -- modfunc< 5>,modfunc< 6>,modfunc< 7>,modfunc< 8>,modfunc< 9>, -- modfunc<10>,modfunc<11>,modfunc<12>,modfunc<13>,modfunc<14>, -- modfunc<15>,modfunc<16>,modfunc<17>,modfunc<18>,modfunc<19>, -- modfunc<20>,modfunc<21>,modfunc<22>,modfunc<23>,modfunc<24>, -- modfunc<25>,modfunc<26>,modfunc<27>,modfunc<28>,modfunc<29>, -- modfunc<30>, -- #endif -- # if BOOST_INTRUSIVE_64_BIT_SIZE_T -- modfunc<31>,modfunc<32>,modfunc<33>,modfunc<34>, -- modfunc<35>,modfunc<36>,modfunc<37>,modfunc<38>,modfunc<39>, -- modfunc<40>,modfunc<41>,modfunc<42>,modfunc<43>,modfunc<44>, -- modfunc<45>,modfunc<46>,modfunc<47>,modfunc<48>,modfunc<49>, -- modfunc<50>,modfunc<51>,modfunc<52>,modfunc<53>,modfunc<54>, -- modfunc<55>,modfunc<56>,modfunc<57>,modfunc<58>,modfunc<59>, -- modfunc<60>,modfunc<61>,modfunc<62>,modfunc<63> -- # else -- modfunc<31> -- # endif -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, //0-30 indexes -+#if BOOST_INTRUSIVE_64_BIT_SIZE_T -+ //Taken from Boost.MultiIndex code, thanks to Joaquin M. Lopez Munoz. -+ modfunc, //<- 32 bit values stop here (index 31) -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc //(index 63) -+#else -+ modfunc //<- 32 bit stops here (index 31) as ptrdiff_t is signed -+#endif - }; - - template -@@ -298,7 +312,7 @@ const std::size_t prime_list_holder::prime_list_size - = sizeof(prime_list) / sizeof(std::size_t); - - --#if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+#if BOOST_INTRUSIVE_64_BIT_SIZE_T - - template - const uint64_t prime_list_holder::inv_sizes32[] = { -@@ -340,7 +354,7 @@ template - const std::size_t prime_list_holder::inv_sizes32_size - = sizeof(inv_sizes32) / sizeof(uint64_t); - --#endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+#endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - - struct prime_fmod_size : prime_list_holder<> - { -@@ -785,9 +799,9 @@ BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_va - } - - template //fastmod_buckets --BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t bucket_cnt, std::size_t split, detail::true_) -+BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t , std::size_t split, detail::true_) - { -- return prime_fmod_size::position(hash_value, split); (void)bucket_cnt; -+ return prime_fmod_size::position(hash_value, split); - } - - //!This metafunction will obtain the type of a bucket -@@ -1473,6 +1487,10 @@ struct bucket_hash_t - , bucket_plus_vtraits_t(BOOST_MOVE_BASE(bucket_plus_vtraits_t, other)) - {} - -+ template -+ BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_hash(const K &k) const -+ { return this->base_t::operator()(k); } -+ - BOOST_INTRUSIVE_FORCEINLINE const hasher &priv_hasher() const - { return this->base_t::get(); } - -@@ -1747,8 +1765,17 @@ struct hashtable_size_wrapper - typedef const size_traits & size_traits_const_t; - typedef size_traits & size_traits_t; - -- BOOST_INTRUSIVE_FORCEINLINE size_traits_const_t priv_size_traits() const -- { return size_traits_; } -+ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const -+ { return size_traits_.get_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType s) -+ { size_traits_.set_size(s); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() -+ { size_traits_.increment(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() -+ { size_traits_.decrement(); } - - BOOST_INTRUSIVE_FORCEINLINE size_traits_t priv_size_traits() - { return size_traits_; } -@@ -1780,7 +1807,19 @@ struct hashtable_size_wrapper - typedef size_traits size_traits_const_t; - typedef size_traits size_traits_t; - -- BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() const -+ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const -+ { return 0u; } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType) -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() - { return size_traits(); } - }; - -@@ -1815,14 +1854,14 @@ struct hashdata_internal - public: - static const bool linear_buckets = 0 != (BoolFlags & hash_bool_flags::linear_buckets_pos); - typedef typename get_hashtable_size_wrapper_bucket -- ::type internal_type; -- -- typedef typename internal_type::key_equal key_equal; -- typedef typename internal_type::hasher hasher; -+ ::type split_bucket_hash_equal_t; -+ -+ typedef typename split_bucket_hash_equal_t::key_equal key_equal; -+ typedef typename split_bucket_hash_equal_t::hasher hasher; - typedef bucket_plus_vtraits - bucket_plus_vtraits_t; - typedef SizeType size_type; -- typedef typename internal_type::size_traits split_traits; -+ typedef typename split_bucket_hash_equal_t::size_traits split_traits; - typedef typename bucket_plus_vtraits_t::bucket_ptr bucket_ptr; - typedef typename bucket_plus_vtraits_t::const_value_traits_ptr const_value_traits_ptr; - typedef typename bucket_plus_vtraits_t::siterator siterator; -@@ -1866,23 +1905,20 @@ struct hashdata_internal - - hashdata_internal( const ValueTraits &val_traits, const bucket_traits &b_traits - , const hasher & h, const key_equal &e) -- : internal_type(val_traits, b_traits, h, e) -+ : split_bucket_hash_equal_t(val_traits, b_traits, h, e) - {} - - BOOST_INTRUSIVE_FORCEINLINE hashdata_internal(BOOST_RV_REF(hashdata_internal) other) -- : internal_type(BOOST_MOVE_BASE(internal_type, other)) -+ : split_bucket_hash_equal_t(BOOST_MOVE_BASE(split_bucket_hash_equal_t, other)) - {} - -- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_t priv_split_traits() -- { return this->priv_size_traits(); } -- -- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_const_t priv_split_traits() const -+ BOOST_INTRUSIVE_FORCEINLINE typename split_bucket_hash_equal_t::size_traits_t priv_split_traits() - { return this->priv_size_traits(); } - - ~hashdata_internal() - { this->priv_clear_buckets(); } - -- using internal_type::priv_clear_buckets; -+ using split_bucket_hash_equal_t::priv_clear_buckets; - - void priv_clear_buckets() - { -@@ -1907,7 +1943,17 @@ struct hashdata_internal - - //public functions - BOOST_INTRUSIVE_FORCEINLINE SizeType split_count() const BOOST_NOEXCEPT -- { return this->priv_split_traits().get_size(); } -+ { return this->split_bucket_hash_equal_t::get_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void split_count(SizeType s) BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::set_hashtable_size_wrapper_size(s); } -+ -+ //public functions -+ BOOST_INTRUSIVE_FORCEINLINE void inc_split_count() BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::inc_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_split_count() BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::dec_hashtable_size_wrapper_size(); } - - BOOST_INTRUSIVE_FORCEINLINE static SizeType initial_split_from_bucket_count(SizeType bc) BOOST_NOEXCEPT - { -@@ -1983,10 +2029,7 @@ struct hashdata_internal - { return (priv_hash_to_nbucket)(hash_value, fastmod_buckets_t()); } - - BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::true_) const //fastmod_buckets_t -- { -- return static_cast(hash_to_bucket_split -- (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::true_())); -- } -+ { return static_cast(prime_fmod_size::position(hash_value, this->split_count())); } - - BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::false_) const //!fastmod_buckets_t - { -@@ -1994,7 +2037,6 @@ struct hashdata_internal - (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::false_())); - } - -- - BOOST_INTRUSIVE_FORCEINLINE iterator iterator_to(reference value, detail::false_) BOOST_NOEXCEPT - { - return iterator( siterator(this->priv_value_to_node_ptr(value)) -@@ -2083,8 +2125,8 @@ struct hashdata_internal - , this->priv_value_traits_ptr()); - } - -- using internal_type::end; -- using internal_type::cend; -+ using split_bucket_hash_equal_t::end; -+ using split_bucket_hash_equal_t::cend; - - local_iterator end(size_type n) BOOST_NOEXCEPT - { return local_iterator(this->priv_bucket_lend(n), this->priv_value_traits_ptr()); } -@@ -2322,19 +2364,32 @@ class hashtable_impl - public: - typedef insert_commit_data_impl insert_commit_data; - -+ private: - void default_init_actions() - { - this->priv_set_sentinel_bucket(); - this->priv_init_buckets_and_cache(); -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - size_type bucket_sz = this->bucket_count(); - BOOST_INTRUSIVE_INVARIANT_ASSERT(bucket_sz != 0); - //Check power of two bucket array if the option is activated - BOOST_INTRUSIVE_INVARIANT_ASSERT - (!power_2_buckets || (0 == (bucket_sz & (bucket_sz - 1)))); -- this->priv_split_traits().set_size(this->initial_split_from_bucket_count(bucket_sz)); -+ this->split_count(this->initial_split_from_bucket_count(bucket_sz)); - } - -+ BOOST_INTRUSIVE_FORCEINLINE SizeType priv_size_count() const BOOST_NOEXCEPT -+ { return this->internal_type::get_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_count(SizeType s) BOOST_NOEXCEPT -+ { this->internal_type::set_hashtable_size_wrapper_size(s); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_inc() BOOST_NOEXCEPT -+ { this->internal_type::inc_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_dec() BOOST_NOEXCEPT -+ { this->internal_type::dec_hashtable_size_wrapper_size(); } -+ - public: - - //! Requires: buckets must not be being used by any other resource. -@@ -2403,10 +2458,10 @@ class hashtable_impl - { - this->priv_swap_cache(x); - x.priv_init_cache(); -- this->priv_size_traits().set_size(x.priv_size_traits().get_size()); -- x.priv_size_traits().set_size(size_type(0)); -- this->priv_split_traits().set_size(x.split_count()); -- x.priv_split_traits().set_size(size_type(0)); -+ this->priv_size_count(x.priv_size_count()); -+ x.priv_size_count(size_type(0)); -+ this->split_count(x.split_count()); -+ x.split_count(size_type(0)); - } - - //! Effects: Equivalent to swap. -@@ -2524,7 +2579,7 @@ class hashtable_impl - size_type size() const BOOST_NOEXCEPT - { - BOOST_IF_CONSTEXPR(constant_time_size) -- return this->priv_size_traits().get_size(); -+ return this->priv_size_count(); - else{ - std::size_t len = 0; - std::size_t bucket_cnt = this->bucket_count(); -@@ -2798,7 +2853,7 @@ class hashtable_impl - //! After a successful rehashing insert_commit_data remains valid. - iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT - { -- this->priv_size_traits().increment(); -+ this->priv_size_inc(); - node_ptr const n = this->priv_value_to_node_ptr(value); - BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || slist_node_algorithms::unique(n)); - node_functions_t::store_hash(n, commit_data.get_hash(), store_hash_t()); -@@ -2890,7 +2945,7 @@ class hashtable_impl - //Get the bucket number and local iterator for both iterators - const bucket_ptr bp = this->priv_get_bucket_ptr(i); - this->priv_erase_node(*bp, i.slist_it(), this->make_node_disposer(disposer), optimize_multikey_t()); -- this->priv_size_traits().decrement(); -+ this->priv_size_dec(); - this->priv_erasure_update_cache(bp); - } - -@@ -2931,7 +2986,7 @@ class hashtable_impl - size_type const num_erased = (size_type)this->priv_erase_node_range - ( before_first_local_it, first_bucket_num, last_local_it, last_bucket_num - , this->make_node_disposer(disposer), optimize_multikey_t()); -- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-num_erased)); -+ this->priv_size_count(size_type(this->priv_size_count()-num_erased)); - this->priv_erasure_update_cache_range(first_bucket_num, last_bucket_num); - } - } -@@ -3001,7 +3056,7 @@ class hashtable_impl - (this->priv_value_from_siterator(it), h, key, equal_func, compare_hash_t())); - slist_node_algorithms::unlink_after_and_dispose(prev.pointed_node(), it.pointed_node(), this->make_node_disposer(disposer)); - } -- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-cnt)); -+ this->priv_size_count(size_type(this->priv_size_count()-cnt)); - this->priv_erasure_update_cache(); - } - -@@ -3020,7 +3075,7 @@ class hashtable_impl - void clear() BOOST_NOEXCEPT - { - this->priv_clear_buckets_and_cache(); -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - } - - //! Requires: Disposer::operator()(pointer) shouldn't throw. -@@ -3045,7 +3100,7 @@ class hashtable_impl - --num_buckets; - slist_node_algorithms::detach_and_dispose(b->get_node_ptr(), d); - } -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - } - this->priv_init_cache(); - } -@@ -3339,7 +3394,7 @@ class hashtable_impl - //! - //! Note: the return value is in the range [0, this->bucket_count()). - BOOST_INTRUSIVE_FORCEINLINE size_type bucket(const key_type& k) const -- { return this->bucket(k, this->priv_hasher()); } -+ { return this->priv_hash_to_nbucket(this->priv_hash(k)); } - - //! Requires: "hash_func" must be a hash function that induces - //! the same hash values as the stored hasher. The difference is that -@@ -3520,7 +3575,7 @@ class hashtable_impl - if((ret = split_idx < bucket_cnt)){ - const std::size_t bucket_to_rehash = split_idx - bucket_cnt/2u; - bucket_type &old_bucket = this->priv_bucket(bucket_to_rehash); -- this->priv_split_traits().increment(); -+ this->inc_split_count(); - - //Anti-exception stuff: if an exception is thrown while - //moving elements from old_bucket to the target bucket, all moved -@@ -3553,7 +3608,7 @@ class hashtable_impl - bucket_type &target_bucket = this->priv_bucket(target_bucket_num); - bucket_type &source_bucket = this->priv_bucket(split_idx-1u); - slist_node_algorithms::transfer_after(target_bucket.get_node_ptr(), source_bucket.get_node_ptr()); -- this->priv_split_traits().decrement(); -+ this->dec_split_count(); - this->priv_insertion_update_cache(target_bucket_num); - } - return ret; -@@ -3763,8 +3818,8 @@ class hashtable_impl - ArrayDisposer rollback2(old_buckets[0], nd, old_bucket_count); - - //Put size in a safe value for rollback exception -- size_type const size_backup = this->priv_size_traits().get_size(); -- this->priv_size_traits().set_size(0); -+ size_type const size_backup = this->priv_size_count(); -+ this->priv_size_count(0); - //Put cache to safe position - this->priv_init_cache(); - this->priv_unset_sentinel_bucket(); -@@ -3826,8 +3881,8 @@ class hashtable_impl - } - } - -- this->priv_size_traits().set_size(size_backup); -- this->priv_split_traits().set_size(split); -+ this->priv_size_count(size_backup); -+ this->split_count(split); - if(&new_bucket_traits != &this->priv_bucket_traits()) - this->priv_bucket_traits() = new_bucket_traits; - this->priv_set_sentinel_bucket(); -@@ -3927,8 +3982,8 @@ class hashtable_impl - this->priv_hasher() = src.priv_hasher(); - this->priv_equal() = src.priv_equal(); - rollback.release(); -- this->priv_size_traits().set_size(src.priv_size_traits().get_size()); -- this->priv_split_traits().set_size(dst_bucket_count); -+ this->priv_size_count(src.priv_size_count()); -+ this->split_count(dst_bucket_count); - this->priv_set_cache_bucket_num(0u); - this->priv_erasure_update_cache(); - } -@@ -3946,7 +4001,7 @@ class hashtable_impl - , n, optimize_multikey_t()); - //Update cache and increment size if needed - this->priv_insertion_update_cache(bucket_num); -- this->priv_size_traits().increment(); -+ this->priv_size_inc(); - slist_node_algorithms::link_after(prev.pointed_node(), n); - return this->build_iterator(siterator(n), this->priv_bucket_ptr(bucket_num)); - } --- -2.34.1 - diff --git a/package/boost/Config.in b/package/boost/Config.in index b99b01f22e..614a71abb0 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -341,6 +341,19 @@ config BR2_PACKAGE_BOOST_TYPE_ERASURE comment "boost-type_erasure needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +config BR2_PACKAGE_BOOST_URL + bool "boost-url" + help + Boost.URL is a portable C++ library which provides containers + and algorithms which model a "URL," more formally described + using the Uniform Resource Identifier (URI) specification. + + This library understands the grammars related to URLs and + provides functionality to validate, parse, examine, and + modify urls, and apply normalization or resolution algorithms. + + To use the library "header-only" this option is not needed. + config BR2_PACKAGE_BOOST_WAVE bool "boost-wave" # limitation of assembler for coldfire diff --git a/package/boost/boost.hash b/package/boost/boost.hash index ab54a4b2fc..ebecc7ddc4 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From https://www.boost.org/users/history/version_1_80_0.html -sha256 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 boost_1_80_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_81_0.html +sha256 71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa boost_1_81_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/boost/boost.mk b/package/boost/boost.mk index bd1d329982..b6e09f777d 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.80.0 +BOOST_VERSION = 1.81.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES @@ -18,7 +18,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ contract container coroutine date_time exception fiber filesystem graph \ graph_parallel iostreams json locale log math mpi nowide program_options \ python random serialization stacktrace test thread timer \ - type_erasure wave) + type_erasure url wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) @@ -50,6 +50,7 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,type_erasure) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,url) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave) BOOST_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) -- 2.34.1 From peter at korsgaard.com Fri Feb 10 11:45:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 12:45:24 +0100 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: Build with ninja In-Reply-To: (John Keeping's message of "Fri, 10 Feb 2023 11:17:33 +0000") References: <20230209170707.4066903-1-peter@korsgaard.com> Message-ID: <87fsbdg2wb.fsf@dell.be.48ers.dk> >>>>> "John" == John Keeping writes: > Hi Peter, > On Thu, Feb 09, 2023 at 06:07:05PM +0100, Peter Korsgaard wrote: >> +define WEBKITGTK_BUILD_CMDS >> + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) >> +endef >> + >> +define WEBKITGTK_INSTALL_STAGING_CMDS >> + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) >> +endef >> + >> +define WEBKITGTK_INSTALL_TARGET_CMDS >> + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) >> +endef >> + > Would it make sense to apply these changes in pkg-cmake.mk? > Using `cmake --build` and `cmake --install` works with all generators > and it would avoid needing to repeat this block for both of the packages > in this series. Longer term that is indeed the direction we want to move to (and generally build cmake packages with the ninja backend). This is meant as a minimal patch that is easy to backport to the stable branches. We have a number of cmake packages that use custom FOO_MAKE_OPTS, how are those passed to make when using cmake --build / --install? -- Bye, Peter Korsgaard From d.lang at abatec.at Fri Feb 10 12:28:23 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 10 Feb 2023 12:28:23 +0000 Subject: [Buildroot] [PATCH] package/boost: bump to version 1.81.0 In-Reply-To: <20230210113931.4055853-1-buildroot@heine.tech> References: <20230210113931.4055853-1-buildroot@heine.tech> Message-ID: Hi Michael, I found a typo. > - add option for new library "url" > - drop upstreamed patch > > Signed-off-by: Michael Nosthoff > > --- > > compile tested defconfigs: > > BR2_arm=y > BR2_cortex_a15=y > BR2_ARM_FPU_NEON=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_PACKAGE_CC_TOOL=y > BR2_PACKAGE_LIBUBOOTENV=y > BR2_PACKAGE_BOTAN=y > BR2_PACKAGE_UHD=y > BR2_PACKAGE_LOG4CXX=y > BR2_PACKAGE_LIBCPPRESTSDK=y > BR2_PACKAGE_BOOST_CONTRACT=y > BR2_PACKAGE_BOOST_COROUTINE=y > BR2_PACKAGE_BOOST_EXCEPTION=y > BR2_PACKAGE_BOOST_FIBER=y > BR2_PACKAGE_BOOST_GRAPH=y > BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y > BR2_PACKAGE_BOOST_IOSTREAMS=y > BR2_PACKAGE_BOOST_JSON=y > BR2_PACKAGE_BOOST_LOCALE=y > BR2_PACKAGE_BOOST_LOG=y > BR2_PACKAGE_BOOST_MPI=y > BR2_PACKAGE_BOOST_NOWIDE=y > BR2_PACKAGE_BOOST_STACKTRACE=y > BR2_PACKAGE_BOOST_TEST=y > BR2_PACKAGE_BOOST_TYPE_ERASURE=y > BR2_PACKAGE_BOOST_URL=y > BR2_PACKAGE_BOOST_WAVE=y > BR2_PACKAGE_BITCOIN=y > BR2_PACKAGE_I2PD=y > > BR2_aarch64=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_PACKAGE_QT5=y > BR2_PACKAGE_PULSEVIEW=y > BR2_PACKAGE_GNURADIO=y > > BR2_sh=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE=y > BR2_PACKAGE_BOOST=y > BR2_PACKAGE_BOOST_CONTRACT=y > BR2_PACKAGE_BOOST_EXCEPTION=y > BR2_PACKAGE_BOOST_GRAPH=y > BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y > BR2_PACKAGE_BOOST_IOSTREAMS=y > BR2_PACKAGE_BOOST_JSON=y > BR2_PACKAGE_BOOST_LOCALE=y > BR2_PACKAGE_BOOST_LOG=y > BR2_PACKAGE_BOOST_MATH=y > BR2_PACKAGE_BOOST_MPI=y > BR2_PACKAGE_BOOST_NOWIDE=y > BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y > BR2_PACKAGE_BOOST_RANDOM=y > BR2_PACKAGE_BOOST_SERIALIZATION=y > BR2_PACKAGE_BOOST_STACKTRACE=y > BR2_PACKAGE_BOOST_TEST=y > BR2_PACKAGE_BOOST_TYPE_ERASURE=y > BR2_PACKAGE_BOOST_URL=y > BR2_PACKAGE_BOOST_WAVE=y > > BR2_x86_64=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_PACKAGE_BOOST=y > BR2_PACKAGE_BOOST_CONTRACT=y > BR2_PACKAGE_BOOST_COROUTINE=y > BR2_PACKAGE_BOOST_EXCEPTION=y > BR2_PACKAGE_BOOST_FIBER=y > BR2_PACKAGE_BOOST_GRAPH=y > BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y > BR2_PACKAGE_BOOST_IOSTREAMS=y > BR2_PACKAGE_BOOST_JSON=y > BR2_PACKAGE_BOOST_LOCALE=y > BR2_PACKAGE_BOOST_LOG=y > BR2_PACKAGE_BOOST_MATH=y > BR2_PACKAGE_BOOST_MPI=y > BR2_PACKAGE_BOOST_NOWIDE=y > BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y > BR2_PACKAGE_BOOST_RANDOM=y > BR2_PACKAGE_BOOST_SERIALIZATION=y > BR2_PACKAGE_BOOST_STACKTRACE=y > BR2_PACKAGE_BOOST_TEST=y > BR2_PACKAGE_BOOST_TYPE_ERASURE=y > BR2_PACKAGE_BOOST_URL=y > BR2_PACKAGE_BOOST_WAVE=y > --- > ?.../0001-Improve-modfunc-performance.patch??? | 551 ------------------ > ?package/boost/Config.in?????????????????????? |? 13 + > ?package/boost/boost.hash????????????????????? |?? 4 +- > ?package/boost/boost.mk??????????????????????? |?? 5 +- > ?4 files changed, 18 insertions(+), 555 deletions(-) > ?delete mode 100644 package/boost/0001-Improve-modfunc-performance.patch SNIP] > diff --git a/package/boost/Config.in b/package/boost/Config.in > index b99b01f22e..614a71abb0 100644 > --- a/package/boost/Config.in > +++ b/package/boost/Config.in > @@ -341,6 +341,19 @@ config BR2_PACKAGE_BOOST_TYPE_ERASURE > ?comment "boost-type_erasure needs a toolchain not affected by GCC bug 64735" > ???????? depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 > ? > +config BR2_PACKAGE_BOOST_URL > +?????? bool "boost-url" > +?????? help > +?????????????? Boost.URL is a portable C++ library which provides containers > +?????????????? and algorithms which model a "URL," more formally described > +?????????????? using the Uniform Resource Identifier (URI) specification. > + > +?????????????? This library understands the grammars related to URLs and > +?????????????? provides functionality to validate, parse, examine, and > +?????????????? modify urls, and apply normalization or resolution algorithms. > + > +?????????????? To use the library "header-only" this option is not needed. > + > ?config BR2_PACKAGE_BOOST_WAVE > ???????? bool "boost-wave" > ???????? # limitation of assembler for coldfire > diff --git a/package/boost/boost.hash b/package/boost/boost.hash > index ab54a4b2fc..ebecc7ddc4 100644 > --- a/package/boost/boost.hash > +++ b/package/boost/boost.hash > @@ -1,5 +1,5 @@ > -# From https://eur06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.boost.org%2Fusers%2Fhistory%2Fversion_1_80_0.html&data=05%7C01%7Cd.lang%40abatec.at%7C64e3321b5ea444a92e6808db0b5b9968%7C8814618e1e364349bccb87b9400379c3%7C0%7C0%7C638116260282315654%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=PK9H%2FdA%2Bj%2BvWN%2BZ3uuweEBL1JzHqihlV1rnN%2FfiQtlI%3D&reserved=0 > -sha256? 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0? boost_1_80_0.tar.bz2 > +# From https://eur06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.boost.org%2Fusers%2Fhistory%2Fversion_1_81_0.html&data=05%7C01%7Cd.lang%40abatec.at%7C64e3321b5ea444a92e6808db0b5b9968%7C8814618e1e364349bccb87b9400379c3%7C0%7C0%7C638116260282315654%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=j%2FvZdH%2B6pdOPSFMblgZHiwJ4otDU6EG7EEWkZOiMf6E%3D&reserved=0 > +sha256? 71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa? boost_1_81_0.tar.bz2 > ? > ?# Locally computed > ?sha256? c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566? LICENSE_1_0.txt > diff --git a/package/boost/boost.mk b/package/boost/boost.mk > index bd1d329982..b6e09f777d 100644 > --- a/package/boost/boost.mk > +++ b/package/boost/boost.mk > @@ -4,7 +4,7 @@ > ?# > ?################################################################################ > ? > -BOOST_VERSION = 1.80.0 > +BOOST_VERSION = 1.81.0 > ?BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 > ?BOOST_SITE = https://eur06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fboostorg.jfrog.io%2Fartifactory%2Fmain%2Frelease%2F%24&data=05%7C01%7Cd.lang%40abatec.at%7C64e3321b5ea444a92e6808db0b5b9968%7C8814618e1e364349bccb87b9400379c3%7C0%7C0%7C638116260282315654%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=Q9MAU7nlmViY0%2FbwW5ZMN2rZBOI%2FB29Q74siHQC9Kl4%3D&reserved=0(BOOST_VERSION)/source > ?BOOST_INSTALL_STAGING = YES > @@ -18,7 +18,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ > ???????? contract container coroutine date_time exception fiber filesystem graph \ > ???????? graph_parallel iostreams json locale log math mpi nowide program_options \ > ???????? python random serialization stacktrace test thread timer \ > -?????? type_erasure wave) > +?????? type_erasure url wave) > ? > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) > @@ -50,6 +50,7 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test) > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread) > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer) > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,type_erasure) > +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,url) I think this line is supposed to be BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_URL),,url) > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave) > ? > ?BOOST_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) > -- > 2.34.1 Regards Daniel From buildroot at heine.tech Fri Feb 10 13:01:35 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Fri, 10 Feb 2023 14:01:35 +0100 Subject: [Buildroot] =?utf-8?q?=5BPATCH=5D_package/boost=3A_bump_to_versi?= =?utf-8?b?b24gMS44MS4w?= In-Reply-To: Message-ID: <42-63e64000-3-6e1e6e80@264880303> Hi Daniel, On Friday, February 10, 2023 13:28 CET, Lang Daniel wrote: > Hi Michael, > > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,type_erasure) > > +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,url) > > I think this line is supposed to be > > BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_URL),,url) yikes, you are right. moved this patch from a different system and somehow forgot this string. thanks for finding! I'll resubmit. Regards, Michael From buildroot at heine.tech Fri Feb 10 13:01:45 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Fri, 10 Feb 2023 14:01:45 +0100 Subject: [Buildroot] [PATCH v2] package/boost: bump to version 1.81.0 Message-ID: <20230210130145.4063383-1-buildroot@heine.tech> - add option for new library "url" - drop upstreamed patch Signed-off-by: Michael Nosthoff --- V2: use correct flag for boost-url compile tested defconfigs: BR2_arm=y BR2_cortex_a15=y BR2_ARM_FPU_NEON=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_PACKAGE_CC_TOOL=y BR2_PACKAGE_LIBUBOOTENV=y BR2_PACKAGE_BOTAN=y BR2_PACKAGE_UHD=y BR2_PACKAGE_LOG4CXX=y BR2_PACKAGE_LIBCPPRESTSDK=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_COROUTINE=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_FIBER=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y BR2_PACKAGE_BITCOIN=y BR2_PACKAGE_I2PD=y BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_QT5=y BR2_PACKAGE_PULSEVIEW=y BR2_PACKAGE_GNURADIO=y BR2_sh=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE=y BR2_PACKAGE_BOOST=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MATH=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y BR2_PACKAGE_BOOST_RANDOM=y BR2_PACKAGE_BOOST_SERIALIZATION=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y BR2_x86_64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_BOOST=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_COROUTINE=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_FIBER=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MATH=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y BR2_PACKAGE_BOOST_RANDOM=y BR2_PACKAGE_BOOST_SERIALIZATION=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y --- .../0001-Improve-modfunc-performance.patch | 551 ------------------ package/boost/Config.in | 13 + package/boost/boost.hash | 4 +- package/boost/boost.mk | 5 +- 4 files changed, 18 insertions(+), 555 deletions(-) delete mode 100644 package/boost/0001-Improve-modfunc-performance.patch diff --git a/package/boost/0001-Improve-modfunc-performance.patch b/package/boost/0001-Improve-modfunc-performance.patch deleted file mode 100644 index a34d6bb4d5..0000000000 --- a/package/boost/0001-Improve-modfunc-performance.patch +++ /dev/null @@ -1,551 +0,0 @@ -From 825aedad557b7e3bb27614335b6ced16887103de Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= -Date: Mon, 7 Nov 2022 00:16:44 +0100 -Subject: [PATCH] Improve "modfunc" performance Fixes #79 - ("boost/intrusive/hashtable.hpp: build failure (undeclared indentifier)") - -Backport from Boost development branch to fix issues with some architectures -(64-bit with 128-bit processing, where size_t != unsigned long). In this case, -code is enabled that causes a build failure. - -Upstream: https://github.com/boostorg/intrusive/commit/825aedad557b7e3bb27614335b6ced16887103de -Issue: https://github.com/boostorg/intrusive/issues/79 -Fixes: http://autobuild.buildroot.net/results/6cb/6cbc0672f3c5046405793d8cdc8f961d2ffb1d3e - -Signed-off-by: Andreas Ziegler ---- - include/boost/intrusive/hashtable.hpp | 235 ++++++++++++++++---------- - 1 file changed, 145 insertions(+), 90 deletions(-) - -diff --git a/include/boost/intrusive/hashtable.hpp b/include/boost/intrusive/hashtable.hpp -index b8bc877..688fb9b 100644 ---- a/boost/intrusive/hashtable.hpp -+++ b/boost/intrusive/hashtable.hpp -@@ -2,6 +2,7 @@ - // - // (C) Copyright Ion Gaztanaga 2006-2022 - // (C) Copyright 2022 Joaquin M Lopez Munoz. -+// (C) Copyright 2022 Christian Mazakas - // - // Distributed under the Boost Software License, Version 1.0. - // (See accompanying file LICENSE_1_0.txt or copy at -@@ -84,11 +85,6 @@ namespace intrusive { - - /// @cond - --#if !defined(BOOST_NO_INT64_T)&&\ -- (defined(BOOST_HAS_INT128) || (defined(_MSC_VER) && defined(_WIN64))) --#define BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT --#endif -- - //We only support LLP64(Win64) or LP64(most Unix) data models - #ifdef _WIN64 //In 64 bit windows sizeof(size_t) == sizeof(unsigned long long) - # define BOOST_INTRUSIVE_SIZE_C(NUMBER) NUMBER##ULL -@@ -98,7 +94,6 @@ namespace intrusive { - # define BOOST_INTRUSIVE_64_BIT_SIZE_T (((((ULONG_MAX>>16)>>16)>>16)>>15) != 0) - #endif - -- - template - struct prime_list_holder - { -@@ -167,11 +162,11 @@ struct prime_list_holder - { return prime_list[std::ptrdiff_t(n)]; } - - template -- BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % prime_list[SizeIndex]; } -+ BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % SizeIndex; } - - static std::size_t(*const positions[])(std::size_t); - -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T - static const uint64_t inv_sizes32[]; - static const std::size_t inv_sizes32_size; - #endif -@@ -185,17 +180,20 @@ struct prime_list_holder - BOOST_INTRUSIVE_FORCEINLINE static std::size_t size(std::size_t size_index) - { return prime_list_holder<>::size_from_index(size_index); } - -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T - // https://github.com/lemire/fastmod - -- - BOOST_INTRUSIVE_FORCEINLINE static uint64_t mul128_u32(uint64_t lowbits, uint32_t d) - { - #if defined(_MSC_VER) -- return __umulh(lowbits, d); -+ return __umulh(lowbits, d); -+ #elif defined(BOOST_HAS_INT128) -+ return static_cast((uint128_type(lowbits) * d) >> 64); - #else -- __extension__ typedef unsigned __int128 ext_uint128_t; -- return (ext_uint128_t(lowbits) * d) >> 64; -+ uint64_t r1 = (lowbits & UINT32_MAX) * d; -+ uint64_t r2 = (lowbits >> 32) * d; -+ r2 += r1 >> 32; -+ return r2 >> 32; - #endif - } - -@@ -204,51 +202,67 @@ struct prime_list_holder - uint64_t lowbits = M * a; - return (uint32_t)(mul128_u32(lowbits, d)); - } -- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - - BOOST_INTRUSIVE_FORCEINLINE static std::size_t position(std::size_t hash,std::size_t size_index) - { -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) && BOOST_INTRUSIVE_64_BIT_SIZE_T -- const std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T -+ BOOST_CONSTEXPR_OR_CONST std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); - if(BOOST_LIKELY(size_index < sizes_under_32bit)){ - return fastmod_u32( uint32_t(hash)+uint32_t(hash>>32) - , inv_sizes32[size_index] - , uint32_t(prime_list[size_index]) ); - } - else{ -- return positions[size_index-sizes_under_32bit](hash); -+ return positions[size_index](hash); - } -- #elif defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -- return fastmod_u32(hash, inv_sizes32[size_index], uint32_t(sizes[size_index])); - #else - return positions[size_index](hash); -- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - } - }; - - template - std::size_t(* const prime_list_holder::positions[])(std::size_t) = - { -- #if !defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -- modfunc< 0>,modfunc< 1>,modfunc< 2>,modfunc< 3>,modfunc< 4>, -- modfunc< 5>,modfunc< 6>,modfunc< 7>,modfunc< 8>,modfunc< 9>, -- modfunc<10>,modfunc<11>,modfunc<12>,modfunc<13>,modfunc<14>, -- modfunc<15>,modfunc<16>,modfunc<17>,modfunc<18>,modfunc<19>, -- modfunc<20>,modfunc<21>,modfunc<22>,modfunc<23>,modfunc<24>, -- modfunc<25>,modfunc<26>,modfunc<27>,modfunc<28>,modfunc<29>, -- modfunc<30>, -- #endif -- # if BOOST_INTRUSIVE_64_BIT_SIZE_T -- modfunc<31>,modfunc<32>,modfunc<33>,modfunc<34>, -- modfunc<35>,modfunc<36>,modfunc<37>,modfunc<38>,modfunc<39>, -- modfunc<40>,modfunc<41>,modfunc<42>,modfunc<43>,modfunc<44>, -- modfunc<45>,modfunc<46>,modfunc<47>,modfunc<48>,modfunc<49>, -- modfunc<50>,modfunc<51>,modfunc<52>,modfunc<53>,modfunc<54>, -- modfunc<55>,modfunc<56>,modfunc<57>,modfunc<58>,modfunc<59>, -- modfunc<60>,modfunc<61>,modfunc<62>,modfunc<63> -- # else -- modfunc<31> -- # endif -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, //0-30 indexes -+#if BOOST_INTRUSIVE_64_BIT_SIZE_T -+ //Taken from Boost.MultiIndex code, thanks to Joaquin M. Lopez Munoz. -+ modfunc, //<- 32 bit values stop here (index 31) -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc //(index 63) -+#else -+ modfunc //<- 32 bit stops here (index 31) as ptrdiff_t is signed -+#endif - }; - - template -@@ -298,7 +312,7 @@ const std::size_t prime_list_holder::prime_list_size - = sizeof(prime_list) / sizeof(std::size_t); - - --#if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+#if BOOST_INTRUSIVE_64_BIT_SIZE_T - - template - const uint64_t prime_list_holder::inv_sizes32[] = { -@@ -340,7 +354,7 @@ template - const std::size_t prime_list_holder::inv_sizes32_size - = sizeof(inv_sizes32) / sizeof(uint64_t); - --#endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+#endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - - struct prime_fmod_size : prime_list_holder<> - { -@@ -785,9 +799,9 @@ BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_va - } - - template //fastmod_buckets --BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t bucket_cnt, std::size_t split, detail::true_) -+BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t , std::size_t split, detail::true_) - { -- return prime_fmod_size::position(hash_value, split); (void)bucket_cnt; -+ return prime_fmod_size::position(hash_value, split); - } - - //!This metafunction will obtain the type of a bucket -@@ -1473,6 +1487,10 @@ struct bucket_hash_t - , bucket_plus_vtraits_t(BOOST_MOVE_BASE(bucket_plus_vtraits_t, other)) - {} - -+ template -+ BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_hash(const K &k) const -+ { return this->base_t::operator()(k); } -+ - BOOST_INTRUSIVE_FORCEINLINE const hasher &priv_hasher() const - { return this->base_t::get(); } - -@@ -1747,8 +1765,17 @@ struct hashtable_size_wrapper - typedef const size_traits & size_traits_const_t; - typedef size_traits & size_traits_t; - -- BOOST_INTRUSIVE_FORCEINLINE size_traits_const_t priv_size_traits() const -- { return size_traits_; } -+ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const -+ { return size_traits_.get_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType s) -+ { size_traits_.set_size(s); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() -+ { size_traits_.increment(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() -+ { size_traits_.decrement(); } - - BOOST_INTRUSIVE_FORCEINLINE size_traits_t priv_size_traits() - { return size_traits_; } -@@ -1780,7 +1807,19 @@ struct hashtable_size_wrapper - typedef size_traits size_traits_const_t; - typedef size_traits size_traits_t; - -- BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() const -+ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const -+ { return 0u; } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType) -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() - { return size_traits(); } - }; - -@@ -1815,14 +1854,14 @@ struct hashdata_internal - public: - static const bool linear_buckets = 0 != (BoolFlags & hash_bool_flags::linear_buckets_pos); - typedef typename get_hashtable_size_wrapper_bucket -- ::type internal_type; -- -- typedef typename internal_type::key_equal key_equal; -- typedef typename internal_type::hasher hasher; -+ ::type split_bucket_hash_equal_t; -+ -+ typedef typename split_bucket_hash_equal_t::key_equal key_equal; -+ typedef typename split_bucket_hash_equal_t::hasher hasher; - typedef bucket_plus_vtraits - bucket_plus_vtraits_t; - typedef SizeType size_type; -- typedef typename internal_type::size_traits split_traits; -+ typedef typename split_bucket_hash_equal_t::size_traits split_traits; - typedef typename bucket_plus_vtraits_t::bucket_ptr bucket_ptr; - typedef typename bucket_plus_vtraits_t::const_value_traits_ptr const_value_traits_ptr; - typedef typename bucket_plus_vtraits_t::siterator siterator; -@@ -1866,23 +1905,20 @@ struct hashdata_internal - - hashdata_internal( const ValueTraits &val_traits, const bucket_traits &b_traits - , const hasher & h, const key_equal &e) -- : internal_type(val_traits, b_traits, h, e) -+ : split_bucket_hash_equal_t(val_traits, b_traits, h, e) - {} - - BOOST_INTRUSIVE_FORCEINLINE hashdata_internal(BOOST_RV_REF(hashdata_internal) other) -- : internal_type(BOOST_MOVE_BASE(internal_type, other)) -+ : split_bucket_hash_equal_t(BOOST_MOVE_BASE(split_bucket_hash_equal_t, other)) - {} - -- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_t priv_split_traits() -- { return this->priv_size_traits(); } -- -- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_const_t priv_split_traits() const -+ BOOST_INTRUSIVE_FORCEINLINE typename split_bucket_hash_equal_t::size_traits_t priv_split_traits() - { return this->priv_size_traits(); } - - ~hashdata_internal() - { this->priv_clear_buckets(); } - -- using internal_type::priv_clear_buckets; -+ using split_bucket_hash_equal_t::priv_clear_buckets; - - void priv_clear_buckets() - { -@@ -1907,7 +1943,17 @@ struct hashdata_internal - - //public functions - BOOST_INTRUSIVE_FORCEINLINE SizeType split_count() const BOOST_NOEXCEPT -- { return this->priv_split_traits().get_size(); } -+ { return this->split_bucket_hash_equal_t::get_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void split_count(SizeType s) BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::set_hashtable_size_wrapper_size(s); } -+ -+ //public functions -+ BOOST_INTRUSIVE_FORCEINLINE void inc_split_count() BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::inc_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_split_count() BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::dec_hashtable_size_wrapper_size(); } - - BOOST_INTRUSIVE_FORCEINLINE static SizeType initial_split_from_bucket_count(SizeType bc) BOOST_NOEXCEPT - { -@@ -1983,10 +2029,7 @@ struct hashdata_internal - { return (priv_hash_to_nbucket)(hash_value, fastmod_buckets_t()); } - - BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::true_) const //fastmod_buckets_t -- { -- return static_cast(hash_to_bucket_split -- (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::true_())); -- } -+ { return static_cast(prime_fmod_size::position(hash_value, this->split_count())); } - - BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::false_) const //!fastmod_buckets_t - { -@@ -1994,7 +2037,6 @@ struct hashdata_internal - (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::false_())); - } - -- - BOOST_INTRUSIVE_FORCEINLINE iterator iterator_to(reference value, detail::false_) BOOST_NOEXCEPT - { - return iterator( siterator(this->priv_value_to_node_ptr(value)) -@@ -2083,8 +2125,8 @@ struct hashdata_internal - , this->priv_value_traits_ptr()); - } - -- using internal_type::end; -- using internal_type::cend; -+ using split_bucket_hash_equal_t::end; -+ using split_bucket_hash_equal_t::cend; - - local_iterator end(size_type n) BOOST_NOEXCEPT - { return local_iterator(this->priv_bucket_lend(n), this->priv_value_traits_ptr()); } -@@ -2322,19 +2364,32 @@ class hashtable_impl - public: - typedef insert_commit_data_impl insert_commit_data; - -+ private: - void default_init_actions() - { - this->priv_set_sentinel_bucket(); - this->priv_init_buckets_and_cache(); -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - size_type bucket_sz = this->bucket_count(); - BOOST_INTRUSIVE_INVARIANT_ASSERT(bucket_sz != 0); - //Check power of two bucket array if the option is activated - BOOST_INTRUSIVE_INVARIANT_ASSERT - (!power_2_buckets || (0 == (bucket_sz & (bucket_sz - 1)))); -- this->priv_split_traits().set_size(this->initial_split_from_bucket_count(bucket_sz)); -+ this->split_count(this->initial_split_from_bucket_count(bucket_sz)); - } - -+ BOOST_INTRUSIVE_FORCEINLINE SizeType priv_size_count() const BOOST_NOEXCEPT -+ { return this->internal_type::get_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_count(SizeType s) BOOST_NOEXCEPT -+ { this->internal_type::set_hashtable_size_wrapper_size(s); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_inc() BOOST_NOEXCEPT -+ { this->internal_type::inc_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_dec() BOOST_NOEXCEPT -+ { this->internal_type::dec_hashtable_size_wrapper_size(); } -+ - public: - - //! Requires: buckets must not be being used by any other resource. -@@ -2403,10 +2458,10 @@ class hashtable_impl - { - this->priv_swap_cache(x); - x.priv_init_cache(); -- this->priv_size_traits().set_size(x.priv_size_traits().get_size()); -- x.priv_size_traits().set_size(size_type(0)); -- this->priv_split_traits().set_size(x.split_count()); -- x.priv_split_traits().set_size(size_type(0)); -+ this->priv_size_count(x.priv_size_count()); -+ x.priv_size_count(size_type(0)); -+ this->split_count(x.split_count()); -+ x.split_count(size_type(0)); - } - - //! Effects: Equivalent to swap. -@@ -2524,7 +2579,7 @@ class hashtable_impl - size_type size() const BOOST_NOEXCEPT - { - BOOST_IF_CONSTEXPR(constant_time_size) -- return this->priv_size_traits().get_size(); -+ return this->priv_size_count(); - else{ - std::size_t len = 0; - std::size_t bucket_cnt = this->bucket_count(); -@@ -2798,7 +2853,7 @@ class hashtable_impl - //! After a successful rehashing insert_commit_data remains valid. - iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT - { -- this->priv_size_traits().increment(); -+ this->priv_size_inc(); - node_ptr const n = this->priv_value_to_node_ptr(value); - BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || slist_node_algorithms::unique(n)); - node_functions_t::store_hash(n, commit_data.get_hash(), store_hash_t()); -@@ -2890,7 +2945,7 @@ class hashtable_impl - //Get the bucket number and local iterator for both iterators - const bucket_ptr bp = this->priv_get_bucket_ptr(i); - this->priv_erase_node(*bp, i.slist_it(), this->make_node_disposer(disposer), optimize_multikey_t()); -- this->priv_size_traits().decrement(); -+ this->priv_size_dec(); - this->priv_erasure_update_cache(bp); - } - -@@ -2931,7 +2986,7 @@ class hashtable_impl - size_type const num_erased = (size_type)this->priv_erase_node_range - ( before_first_local_it, first_bucket_num, last_local_it, last_bucket_num - , this->make_node_disposer(disposer), optimize_multikey_t()); -- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-num_erased)); -+ this->priv_size_count(size_type(this->priv_size_count()-num_erased)); - this->priv_erasure_update_cache_range(first_bucket_num, last_bucket_num); - } - } -@@ -3001,7 +3056,7 @@ class hashtable_impl - (this->priv_value_from_siterator(it), h, key, equal_func, compare_hash_t())); - slist_node_algorithms::unlink_after_and_dispose(prev.pointed_node(), it.pointed_node(), this->make_node_disposer(disposer)); - } -- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-cnt)); -+ this->priv_size_count(size_type(this->priv_size_count()-cnt)); - this->priv_erasure_update_cache(); - } - -@@ -3020,7 +3075,7 @@ class hashtable_impl - void clear() BOOST_NOEXCEPT - { - this->priv_clear_buckets_and_cache(); -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - } - - //! Requires: Disposer::operator()(pointer) shouldn't throw. -@@ -3045,7 +3100,7 @@ class hashtable_impl - --num_buckets; - slist_node_algorithms::detach_and_dispose(b->get_node_ptr(), d); - } -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - } - this->priv_init_cache(); - } -@@ -3339,7 +3394,7 @@ class hashtable_impl - //! - //! Note: the return value is in the range [0, this->bucket_count()). - BOOST_INTRUSIVE_FORCEINLINE size_type bucket(const key_type& k) const -- { return this->bucket(k, this->priv_hasher()); } -+ { return this->priv_hash_to_nbucket(this->priv_hash(k)); } - - //! Requires: "hash_func" must be a hash function that induces - //! the same hash values as the stored hasher. The difference is that -@@ -3520,7 +3575,7 @@ class hashtable_impl - if((ret = split_idx < bucket_cnt)){ - const std::size_t bucket_to_rehash = split_idx - bucket_cnt/2u; - bucket_type &old_bucket = this->priv_bucket(bucket_to_rehash); -- this->priv_split_traits().increment(); -+ this->inc_split_count(); - - //Anti-exception stuff: if an exception is thrown while - //moving elements from old_bucket to the target bucket, all moved -@@ -3553,7 +3608,7 @@ class hashtable_impl - bucket_type &target_bucket = this->priv_bucket(target_bucket_num); - bucket_type &source_bucket = this->priv_bucket(split_idx-1u); - slist_node_algorithms::transfer_after(target_bucket.get_node_ptr(), source_bucket.get_node_ptr()); -- this->priv_split_traits().decrement(); -+ this->dec_split_count(); - this->priv_insertion_update_cache(target_bucket_num); - } - return ret; -@@ -3763,8 +3818,8 @@ class hashtable_impl - ArrayDisposer rollback2(old_buckets[0], nd, old_bucket_count); - - //Put size in a safe value for rollback exception -- size_type const size_backup = this->priv_size_traits().get_size(); -- this->priv_size_traits().set_size(0); -+ size_type const size_backup = this->priv_size_count(); -+ this->priv_size_count(0); - //Put cache to safe position - this->priv_init_cache(); - this->priv_unset_sentinel_bucket(); -@@ -3826,8 +3881,8 @@ class hashtable_impl - } - } - -- this->priv_size_traits().set_size(size_backup); -- this->priv_split_traits().set_size(split); -+ this->priv_size_count(size_backup); -+ this->split_count(split); - if(&new_bucket_traits != &this->priv_bucket_traits()) - this->priv_bucket_traits() = new_bucket_traits; - this->priv_set_sentinel_bucket(); -@@ -3927,8 +3982,8 @@ class hashtable_impl - this->priv_hasher() = src.priv_hasher(); - this->priv_equal() = src.priv_equal(); - rollback.release(); -- this->priv_size_traits().set_size(src.priv_size_traits().get_size()); -- this->priv_split_traits().set_size(dst_bucket_count); -+ this->priv_size_count(src.priv_size_count()); -+ this->split_count(dst_bucket_count); - this->priv_set_cache_bucket_num(0u); - this->priv_erasure_update_cache(); - } -@@ -3946,7 +4001,7 @@ class hashtable_impl - , n, optimize_multikey_t()); - //Update cache and increment size if needed - this->priv_insertion_update_cache(bucket_num); -- this->priv_size_traits().increment(); -+ this->priv_size_inc(); - slist_node_algorithms::link_after(prev.pointed_node(), n); - return this->build_iterator(siterator(n), this->priv_bucket_ptr(bucket_num)); - } --- -2.34.1 - diff --git a/package/boost/Config.in b/package/boost/Config.in index b99b01f22e..614a71abb0 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -341,6 +341,19 @@ config BR2_PACKAGE_BOOST_TYPE_ERASURE comment "boost-type_erasure needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +config BR2_PACKAGE_BOOST_URL + bool "boost-url" + help + Boost.URL is a portable C++ library which provides containers + and algorithms which model a "URL," more formally described + using the Uniform Resource Identifier (URI) specification. + + This library understands the grammars related to URLs and + provides functionality to validate, parse, examine, and + modify urls, and apply normalization or resolution algorithms. + + To use the library "header-only" this option is not needed. + config BR2_PACKAGE_BOOST_WAVE bool "boost-wave" # limitation of assembler for coldfire diff --git a/package/boost/boost.hash b/package/boost/boost.hash index ab54a4b2fc..ebecc7ddc4 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From https://www.boost.org/users/history/version_1_80_0.html -sha256 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 boost_1_80_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_81_0.html +sha256 71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa boost_1_81_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/boost/boost.mk b/package/boost/boost.mk index bd1d329982..ddc9283a19 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.80.0 +BOOST_VERSION = 1.81.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES @@ -18,7 +18,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ contract container coroutine date_time exception fiber filesystem graph \ graph_parallel iostreams json locale log math mpi nowide program_options \ python random serialization stacktrace test thread timer \ - type_erasure wave) + type_erasure url wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) @@ -50,6 +50,7 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,type_erasure) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_URL),,url) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave) BOOST_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) -- 2.34.1 From arnout at mind.be Fri Feb 10 13:12:23 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 10 Feb 2023 14:12:23 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: revert bpf_cookie patch to allow building In-Reply-To: <9a8b4ac5-6ffb-e8d8-3587-2768e004780e@synopsys.com> References: <97ea44bb-58fe-d6cb-6c79-9be0b245f2c6@synopsys.com> <29d2a8c7-44cd-da42-5fed-f17ec0f8ccf2@synopsys.com> <1750a14f-36a1-fe51-1452-3a72b84979c5@mind.be> <9a8b4ac5-6ffb-e8d8-3587-2768e004780e@synopsys.com> Message-ID: On 10/02/2023 10:17, Shahab Vahedi wrote: > On 2/9/23 21:27, Arnout Vandecappelle wrote: >> >> On 09/02/2023 13:23, Shahab Vahedi wrote: >>> >>> On 2/8/23 17:36, Arnout Vandecappelle wrote: >>>> >>>> It's not clear to me why you did a revert of the cookie feature rather than >>>> using those patches. I think the first two or three should be sufficient to >>>> fix your issue? >>> >>> Ideally, the correct way would be applying that pending series. But since >>> there were comments that some of the patches might need reworking [1], I did >> >> I don't see anything in that thread about rework being needed, only some >> complaints about some mail gateway encrypting messages so they can't be >> read by some recipients... > See this [1] and the response here [2]. Having read it again, apparently it is Ah, but I guessed that that patch was not relevant for the issue you are facing. I had the impression only the first two or three patches of the series are relevant. > not such a big deal. Alexander, the author, mentioned that he will redo that > part in v3 of the patch the way David suggested. So either, I can make that > change when submitting to Buildroot, or take it as it is. Your call. > > [1] > https://lore.kernel.org/bpf/20220421003152.339542-3-alobakin at pm.me/T/#m42db58567febf12040f6ba0478e1a6148c284c55 > > [2] > https://lore.kernel.org/bpf/20220421003152.339542-3-alobakin at pm.me/T/#m293896646128262621c83e8c15c4d977f92ad0d2 > >>> not feel confident to add them. Therefore, I tried to keep my solution minimal >>> and solve it by eliminating the problem. I know, it is not appealing. >> >> The problem with your patch is that it is very difficult to decide if it >> should be kept or not when bumping the version. Plus, some people (or other >> packages) may rely on the feature that you remove. > > I can try to apply that patch series on top of bpftool-v7.1.0-br1.tar.gz in > buildroot. If it can be done fairly easily, I will submit it on a different > thread. Thanks! Regards, Arnout From sebastian.weyer at smile.fr Fri Feb 10 13:17:28 2023 From: sebastian.weyer at smile.fr (Sebastian Weyer) Date: Fri, 10 Feb 2023 14:17:28 +0100 Subject: [Buildroot] [PATCH 1/1] configs/qemu: update defconfigs to Linux 6.1.11 Message-ID: <20230210131729.2577271-1-sebastian.weyer@smile.fr> Just updating all qemu defconfigs to the latest Kernel version: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=v6.1.11&dt=2 Signed-off-by: Sebastian Weyer --- configs/qemu_aarch64_ebbr_defconfig | 4 ++-- configs/qemu_aarch64_sbsa_defconfig | 4 ++-- configs/qemu_aarch64_virt_defconfig | 4 ++-- configs/qemu_arm_ebbr_defconfig | 4 ++-- configs/qemu_arm_versatile_defconfig | 4 ++-- configs/qemu_arm_vexpress_defconfig | 4 ++-- configs/qemu_arm_vexpress_tz_defconfig | 4 ++-- configs/qemu_m68k_mcf5208_defconfig | 4 ++-- configs/qemu_m68k_q800_defconfig | 4 ++-- configs/qemu_microblazebe_mmu_defconfig | 4 ++-- configs/qemu_microblazeel_mmu_defconfig | 4 ++-- configs/qemu_mips32r2_malta_defconfig | 4 ++-- configs/qemu_mips32r2el_malta_defconfig | 4 ++-- configs/qemu_mips32r6_malta_defconfig | 4 ++-- configs/qemu_mips32r6el_malta_defconfig | 4 ++-- configs/qemu_mips64_malta_defconfig | 4 ++-- configs/qemu_mips64el_malta_defconfig | 4 ++-- configs/qemu_mips64r6_malta_defconfig | 4 ++-- configs/qemu_mips64r6el_malta_defconfig | 4 ++-- configs/qemu_nios2_10m50_defconfig | 4 ++-- configs/qemu_or1k_defconfig | 4 ++-- configs/qemu_ppc64_e5500_defconfig | 4 ++-- configs/qemu_ppc64_pseries_defconfig | 4 ++-- configs/qemu_ppc64le_powernv8_defconfig | 4 ++-- configs/qemu_ppc64le_pseries_defconfig | 4 ++-- configs/qemu_ppc_bamboo_defconfig | 4 ++-- configs/qemu_ppc_e500mc_defconfig | 4 ++-- configs/qemu_ppc_g3beige_defconfig | 4 ++-- configs/qemu_ppc_mac99_defconfig | 4 ++-- configs/qemu_ppc_mpc8544ds_defconfig | 4 ++-- configs/qemu_riscv32_virt_defconfig | 4 ++-- configs/qemu_riscv64_nommu_virt_defconfig | 4 ++-- configs/qemu_riscv64_virt_defconfig | 4 ++-- configs/qemu_s390x_defconfig | 2 +- configs/qemu_sh4_r2d_defconfig | 4 ++-- configs/qemu_sh4eb_r2d_defconfig | 4 ++-- configs/qemu_sparc64_sun4u_defconfig | 4 ++-- configs/qemu_sparc_ss10_defconfig | 4 ++-- configs/qemu_x86_64_defconfig | 4 ++-- configs/qemu_x86_defconfig | 4 ++-- configs/qemu_xtensa_lx60_defconfig | 4 ++-- configs/qemu_xtensa_lx60_nommu_defconfig | 4 ++-- 42 files changed, 83 insertions(+), 83 deletions(-) diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index d293ad0e60..78bab2a933 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 609444e787..9e36b40867 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-sbsa/a BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-sbsa/genimage.cfg" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 03df0ad9e2..9bdf79c4f5 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" 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 diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index f3e2d42a54..53e2d5d1d7 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 4f43273a82..e61665a95e 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index 2c813456f4..b963862e2b 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -20,12 +20,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_TARGET_ROOTFS_EXT2_SIZE="64M" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 576c441154..01dce8f4ca 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -17,12 +17,12 @@ BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index 0490b9e29e..e30bc13ab7 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 30d8982db3..e089ff7864 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index 7bd2ae53b8..f4b53f7556 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index cd8c5a3cb2..8436a8b6f9 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index 49d84c308b..f22f1d168a 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 5363018c47..5b5d5fe44f 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index f77feb9b6d..e8457ab246 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index 575034441a..ad5003c25f 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index e9438fda1e..c201b9da28 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index 4b1c8e22af..f34d8a55b9 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 87ef7902af..500c69b7fb 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 5774207f65..1b0a14b6bf 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index 4b9c53e8de..f88e88f108 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index b3d9d79156..9faf0d174f 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -10,12 +10,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 6ad03c4c87..6ca1321751 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -12,12 +12,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 50844dc93b..a059631adf 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index f6a5c3d409..c380fe5205 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 7ce5a9d310..c3e14958ae 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index f4cc5589e7..6d26cf5105 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index 0a1877c44b..e0f886dda4 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -11,12 +11,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 1c11bcf77d..62e20e8120 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index 2331041c2a..0e8bd6a0c6 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -6,12 +6,12 @@ BR2_powerpc_7400=y BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index b9a0812d52..b54e7b7d81 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index f354e303e5..1a12ed6a65 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.43" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index ee70beb208..2894f1f78a 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -4,7 +4,7 @@ BR2_RISCV_64=y # BR2_RISCV_USE_MMU is not set # Linux headers same as kernel, a 5.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Busybox with hush BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="nommu_virt" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index b3174a152c..d6ab8a33c1 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.43" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 6bbcca0896..cd160d9cf0 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -17,7 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index 0f12b7dfe9..c300490c55 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index d5ee371e79..9e61a6f234 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index 485b497e71..a19e146dfa 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 2ba04c0864..ee2b0a799b 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index cc505a8540..3608178f30 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 34b7e2d292..ac3ba1da12 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index cb78106091..e0ec91d2ac 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index 4be1b66edc..59c383fc40 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -20,12 +20,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -- 2.25.1 From peter at korsgaard.com Fri Feb 10 14:09:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:09:55 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used In-Reply-To: <20230208192425.GA2677@scaer> (Yann E. MORIN's message of "Wed, 8 Feb 2023 20:24:25 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208192425.GA2677@scaer> Message-ID: <87bkm1fw7g.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > On 2023-02-08 19:19 +0100, Peter Korsgaard spake thusly: >> Waf requires that the version of the waf script matches the version of >> waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as >> otherwise waf errors out with errors like: >> >> Waf script '2.0.24' and library '1.9.3' do not match >> >> Signed-off-by: Peter Korsgaard >> --- >> package/pkg-waf.mk | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk >> index e090afa9e6..a067e69c9b 100644 >> --- a/package/pkg-waf.mk >> +++ b/package/pkg-waf.mk >> @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) >> >> define inner-waf-package >> >> +# The version of waflib has to match with the version of waf, >> +# otherwise waf errors out with: >> +# Waf script 'X' and library 'Y' do not match >> +define WAF_PACKAGE_REMOVE_WAF_LIB >> + $(RM) -fr $(@D)/waf $(@D)/waflib >> +endef >> + >> # We need host-python3 to run waf >> $(2)_DEPENDENCIES += host-python3 >> >> @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO >> ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) >> $(2)_DEPENDENCIES += host-waf >> $(2)_WAF = $$(HOST_DIR)/bin/waf >> +$(2)_PRE_CONFIGURE_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB > It would make more sense to make that either a post-extract or a > post-patch hook. Committed after changing it to use a post-patch hook, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:11:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:11:26 +0100 Subject: [Buildroot] [PATCH 2/5] package/aubio: drop AUBIO_REMOVE_OLD_WAF hook In-Reply-To: <20230208181933.3925279-2-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 8 Feb 2023 19:19:29 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208181933.3925279-2-peter@korsgaard.com> Message-ID: <877cwpfw4x.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > As that is now handled by the waf-package infrastructure. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:11:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:11:31 +0100 Subject: [Buildroot] [PATCH 3/5] package/glmark2: use external waf In-Reply-To: <20230208181933.3925279-3-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 8 Feb 2023 19:19:30 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208181933.3925279-3-peter@korsgaard.com> Message-ID: <87357dfw4s.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/bbd/bbd90f11975b691f694412a6fc3446f37dd7c0aa/ > The bundled waf script is too old (1.9.3) for python >= 3.11 as it uses the > 'U' modifier to open (universal newlines), which have been deprecated since > python 3.3 and finally removed in 3.11. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:12:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:12:27 +0100 Subject: [Buildroot] [PATCH 2/5] package/aubio: drop AUBIO_REMOVE_OLD_WAF hook In-Reply-To: (Romain Naour's message of "Wed, 8 Feb 2023 22:08:08 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208181933.3925279-2-peter@korsgaard.com> Message-ID: <87y1p5ehis.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Le 08/02/2023 ? 19:19, Peter Korsgaard a ?crit?: >> As that is now handled by the waf-package infrastructure. >> >> Signed-off-by: Peter Korsgaard > Reviewed-by: Romain Naour >> --- >> package/aubio/aubio.mk | 6 ------ >> 1 file changed, 6 deletions(-) >> >> diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk >> index c995fdfac7..64174a113d 100644 >> --- a/package/aubio/aubio.mk >> +++ b/package/aubio/aubio.mk >> @@ -21,12 +21,6 @@ AUBIO_CONF_OPTS = \ >> # https://github.com/jackaudio/jack2/issues/898 >> AUBIO_NEEDS_EXTERNAL_WAF = YES >> >> -# The old waf script bundled in aubio 0.4.9 need to be removed first. >> -define AUBIO_REMOVE_OLD_WAF >> - $(RM) -fr $(@D)/waf $(@D)/waflib >> -endef >> -AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF > Note: the pkg-wag use a PRE_CONFIGURE_HOOKS instead of POST_EXTRACT_HOOKS. Correct. I don't think that has any functional change, but I did change the waf-package logic to use a post-patch hook as suggested by Yann. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:13:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:13:04 +0100 Subject: [Buildroot] [PATCH 4/5] package/jack2: fix build with python >= 3.11 In-Reply-To: <20230208181933.3925279-4-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 8 Feb 2023 19:19:31 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208181933.3925279-4-peter@korsgaard.com> Message-ID: <87ttztehhr.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/5ce/5ce5ebd20e0e509b31b51d2ec1aed56fdb8f45aa/ > The bundled waf script is too old (2.0.12) for python >= 3.11 as it uses the > 'U' modifier to open (universal newlines), which have been deprecated since > python 3.3 and finally removed in 3.11. > Jack unfortunately uses a modified waf, so we cannot just set > JACK2_NEEDS_EXTERNAL_WAF, so instead backport an upstream patch fixing the > compatibility issue: > https://github.com/jackaudio/jack2/pull/884 > Signed-off-by: Peter Korsgaard I've tweaked the commit message to make it clear that this is about host-python3 and commmitted, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:13:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:13:09 +0100 Subject: [Buildroot] [PATCH 5/5] package/norm: use external waf In-Reply-To: <20230208181933.3925279-5-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 8 Feb 2023 19:19:32 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208181933.3925279-5-peter@korsgaard.com> Message-ID: <87pmahehhm.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/ee1/ee15cadf8af10dee6c83b9726a034367e8ae81a7/ > The bundled waf script is too old (2.0.7) for python >= 3.11 as it uses the > 'U' modifier to open (universal newlines), which have been deprecated since > python 3.3 and finally removed in 3.11. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:14:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:14:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: bump version to 15.2 In-Reply-To: <20230210072228.68137-1-fido_max@inbox.ru> (Maxim Kochetkov via buildroot's message of "Fri, 10 Feb 2023 10:22:28 +0300") References: <20230210072228.68137-1-fido_max@inbox.ru> Message-ID: <87lel5ehfa.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov via buildroot writes: > Release notes: https://www.postgresql.org/docs/release/15.2/ > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:08:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:08:54 +0100 Subject: [Buildroot] [git commit] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used Message-ID: <20230210141450.944E784E82@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b4d7f6e13212b4c65ec2832681719fd960e75e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Waf requires that the version of the waf script matches the version of waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as otherwise waf errors out with errors like: Waf script '2.0.24' and library '1.9.3' do not match Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour [Peter: Run as a post-patch hook as suggested by Yann] Signed-off-by: Peter Korsgaard --- package/pkg-waf.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index e090afa9e6..0e752072c8 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) define inner-waf-package +# The version of waflib has to match with the version of waf, +# otherwise waf errors out with: +# Waf script 'X' and library 'Y' do not match +define WAF_PACKAGE_REMOVE_WAF_LIB + $(RM) -fr $(@D)/waf $(@D)/waflib +endef + # We need host-python3 to run waf $(2)_DEPENDENCIES += host-python3 @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) $(2)_DEPENDENCIES += host-waf $(2)_WAF = $$(HOST_DIR)/bin/waf +$(2)_POST_PATCH_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB else $(2)_WAF ?= ./waf endif From peter at korsgaard.com Fri Feb 10 14:10:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:10:42 +0100 Subject: [Buildroot] [git commit] package/glmark2: use external waf Message-ID: <20230210141450.A8C7284EA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e331da62fb7612b7a52a40e37312753cc1c1eef5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/bbd/bbd90f11975b691f694412a6fc3446f37dd7c0aa/ The bundled waf script is too old (1.9.3) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/glmark2/glmark2.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index e8d6f71dad..bac9d9ff6f 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -10,6 +10,9 @@ GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng +# The bundled waf script is too old for >= python3.11 +GLMARK2_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y) GLMARK2_DEPENDENCIES += libdrm libgbm libgles udev GLMARK2_FLAVORS += drm-glesv2 From peter at korsgaard.com Fri Feb 10 14:10:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:10:35 +0100 Subject: [Buildroot] [git commit] package/aubio: drop AUBIO_REMOVE_OLD_WAF hook Message-ID: <20230210141450.9F5C384E86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4543911494b2a485f159eae21bb703b676ec2c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As that is now handled by the waf-package infrastructure. Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/aubio/aubio.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index c995fdfac7..64174a113d 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -21,12 +21,6 @@ AUBIO_CONF_OPTS = \ # https://github.com/jackaudio/jack2/issues/898 AUBIO_NEEDS_EXTERNAL_WAF = YES -# The old waf script bundled in aubio 0.4.9 need to be removed first. -define AUBIO_REMOVE_OLD_WAF - $(RM) -fr $(@D)/waf $(@D)/waflib -endef -AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF - # Add --notests for each build step to avoid running unit tests on the # build machine. AUBIO_WAF_OPTS = --notests From peter at korsgaard.com Fri Feb 10 14:10:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:10:59 +0100 Subject: [Buildroot] [git commit] package/jack2: fix build with host python >= 3.11 Message-ID: <20230210141450.B31A384EA9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8fe92584446bba2bb81f454c5ebbcb4f80a371b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/5ce/5ce5ebd20e0e509b31b51d2ec1aed56fdb8f45aa/ The bundled waf script is too old (2.0.12) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Jack unfortunately uses a modified waf, so we cannot just set JACK2_NEEDS_EXTERNAL_WAF, so instead backport an upstream patch fixing the compatibility issue: https://github.com/jackaudio/jack2/pull/884 Signed-off-by: Peter Korsgaard --- ...e-of-U-mode-bit-for-opening-files-in-pyth.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch new file mode 100644 index 0000000000..9ee5a43e18 --- /dev/null +++ b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch @@ -0,0 +1,55 @@ +From 328c58967dce8be426f9208ba7717ab5afc2c4f3 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Mon, 11 Jul 2022 00:56:28 +0200 +Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python + +The 'U' mode bit is removed in python 3.11. It has been +deprecated for a long time. The 'U' mode bit has no effect +so this change doesn't change any behavior. + +See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api + +Signed-off-by: Peter Korsgaard +--- + waflib/ConfigSet.py | 2 +- + waflib/Context.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index b300bb56..84736c9c 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -312,7 +312,7 @@ class ConfigSet(object): + :type filename: string + """ + tbl = self.table +- code = Utils.readf(filename, m='rU') ++ code = Utils.readf(filename, m='r') + for m in re_imp.finditer(code): + g = m.group + tbl[g(2)] = eval(g(3)) +diff --git a/waflib/Context.py b/waflib/Context.py +index 9fee3fa1..761b521f 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -266,7 +266,7 @@ class Context(ctx): + cache[node] = True + self.pre_recurse(node) + try: +- function_code = node.read('rU', encoding) ++ function_code = node.read('r', encoding) + exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict) + finally: + self.post_recurse(node) +@@ -662,7 +662,7 @@ def load_module(path, encoding=None): + + module = imp.new_module(WSCRIPT_FILE) + try: +- code = Utils.readf(path, m='rU', encoding=encoding) ++ code = Utils.readf(path, m='r', encoding=encoding) + except EnvironmentError: + raise Errors.WafError('Could not read the file %r' % path) + +-- +2.30.2 + From peter at korsgaard.com Fri Feb 10 14:14:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:14:10 +0100 Subject: [Buildroot] [git commit] package/postgresql: bump version to 15.2 Message-ID: <20230210141450.C805984E82@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57e297a215193c92f6a178139db53616f2ee23b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.postgresql.org/docs/release/15.2/ Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index ef2806c2dd..e6a9bd6658 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v14.6/postgresql-15.1.tar.bz2.sha256 -sha256 64fdf23d734afad0dfe4077daca96ac51dcd697e68ae2d3d4ca6c45cb14e21ae postgresql-15.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 +sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 2ffcac6595..e90aa794b0 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 15.1 +POSTGRESQL_VERSION = 15.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 Fri Feb 10 14:11:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:11:16 +0100 Subject: [Buildroot] [git commit] package/norm: use external waf Message-ID: <20230210141450.BC93984EAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8012a86f5cf751f9c4d5d4a63f6502a6ac60d13a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/ee1/ee15cadf8af10dee6c83b9726a034367e8ae81a7/ The bundled waf script is too old (2.0.7) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/norm/norm.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/norm/norm.mk b/package/norm/norm.mk index 2f9fc7b657..a3fa1b4f80 100644 --- a/package/norm/norm.mk +++ b/package/norm/norm.mk @@ -11,6 +11,9 @@ NORM_INSTALL_STAGING = YES NORM_LICENSE = NRL License NORM_LICENSE_FILES = LICENSE.TXT +# The bundled waf script is too old for >= python3.11 +NORM_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y) NORM_DEPENDENCIES += libnetfilter_queue endif From peter at korsgaard.com Fri Feb 10 15:04:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:04:56 +0100 Subject: [Buildroot] [PATCH] support/dependencies/dependencies.sh: require diagnostics perl package for mosh Message-ID: <20230210150456.4535-1-peter@korsgaard.com> Fixes: http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' perl -Mdiagnostics -c ./mosh.pl Can't locate diagnostics.pm in @INC (you may need to install the diagnostics module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5). BEGIN failed--compilation aborted. So add a check for it in dependencies.sh similar to the other perl modules. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index cf6635bff6..4353e9585e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -281,6 +281,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules diagnostics" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" -- 2.30.2 From peter at korsgaard.com Fri Feb 10 15:27:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:27:32 +0100 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: Build with ninja In-Reply-To: <20230209170707.4066903-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 9 Feb 2023 18:07:05 +0100") References: <20230209170707.4066903-1-peter@korsgaard.com> Message-ID: <87h6vtee1n.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Webkitgtk needs cmake >= 3.20 when building with the make backend since > webkitgtk 3.8.0. > Cmake 3.20 is above our minimal version in > support/dependencies/check-host-cmake.mk, so this breaks builds on hosts > with cmake >= 3.18 < 3.20 - So use the ninja backend instead. > https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 15:27:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:27:36 +0100 Subject: [Buildroot] [PATCH 2/2] package/wpewebkit: Build with ninja In-Reply-To: <20230209170707.4066903-2-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 9 Feb 2023 18:07:06 +0100") References: <20230209170707.4066903-1-peter@korsgaard.com> <20230209170707.4066903-2-peter@korsgaard.com> Message-ID: <87cz6hee1j.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Wpewebkit needs cmake >= 3.20 when building with the make backend since > wpewebkit 3.8.0. > Cmake 3.20 is above our minimal version in > support/dependencies/check-host-cmake.mk, so this breaks builds on hosts > with cmake >= 3.18 < 3.20 - So use the ninja backend instead. > https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 15:30:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:30:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: bump version to 3.6.2 In-Reply-To: <20230210073731.152068-1-fido_max@inbox.ru> (Maxim Kochetkov's message of "Fri, 10 Feb 2023 10:37:31 +0300") References: <20230210073731.152068-1-fido_max@inbox.ru> Message-ID: <878rh5edwk.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov writes: > Release notes: https://github.com/OSGeo/gdal/blob/v3.6.2/NEWS.md > Signed-off-by: Maxim Kochetkov > --- > package/gdal/gdal.hash | 6 +++--- > package/gdal/gdal.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > diff --git a/package/gdal/gdal.hash b/package/gdal/gdal.hash > index ab77d7840d..6cf3336644 100644 > --- a/package/gdal/gdal.hash > +++ b/package/gdal/gdal.hash > @@ -1,6 +1,6 @@ > -# md5 from: https://download.osgeo.org/gdal/3.5.2/gdal-3.5.2.tar.xz.md5, sha256 locally computed: > -md5 821b3b0637ebada5d20dbefb2e3ec964 gdal-3.5.2.tar.xz > -sha256 0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2 gdal-3.5.2.tar.xz > +# md5 from: https://download.osgeo.org/gdal/3.6.2/gdal-3.6.2.tar.gz.md5, sha256 locally computed: > +md5 6f22ffdbd8e00059ddb2b825c5920c4c gdal-3.6.2.tar.xz > +sha256 35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681 gdal-3.6.2.tar.xz > # Hashes of license files: > sha256 fac0116e799ca4de79b076ee04863b5e2b69541ea3664b9bb108c81a5355f16a LICENSE.TXT > diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk > index a3b11c53af..ba9ba71b3b 100644 > --- a/package/gdal/gdal.mk > +++ b/package/gdal/gdal.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -GDAL_VERSION = 3.5.2 > +GDAL_VERSION = 3.6.2 Looks like the license details changed: >>> gdal 3.6.2 Collecting legal info ERROR: LICENSE.TXT has wrong sha256 hash: ERROR: expected: fac0116e799ca4de79b076ee04863b5e2b69541ea3664b9bb108c81a5355f16a ERROR: got : 1dae3468e81d00da56e2936f74d33b8b3ad09d726437f19ce209a5dabea41f77 ERROR: Incomplete download, or man-in-the-middle (MITM) attack Please review the changes, update the commit message to explain this and update hash (and GDAL_LICENSE if needed), thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 15:26:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:26:54 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: Build with ninja Message-ID: <20230210153148.B2E2C84F2F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78d499409f71d8a22b0632c8ebc06f67ee6ae6dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 54f37fd702..b9c2fef395 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -103,4 +103,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# wpewebkit needs cmake >= 3.20 when building with the make backend, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WPEWEBKIT_CONF_OPTS += -GNinja +WPEWEBKIT_DEPENDENCIES += host-ninja + +define WPEWEBKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + $(eval $(cmake-package)) From peter at korsgaard.com Fri Feb 10 15:26:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:26:48 +0100 Subject: [Buildroot] [git commit] package/webkitgtk: Build with ninja Message-ID: <20230210153148.A918184F2D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16e5c92ff5fd2b44a1126bd7d7538c68ce838213 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b42ac3b644..a6974db926 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -139,4 +139,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# webkitgtk needs cmake >= 3.20 when not building with ninja, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WEBKITGTK_CONF_OPTS += -GNinja +WEBKITGTK_DEPENDENCIES += host-ninja + +define WEBKITGTK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + $(eval $(cmake-package)) From peter at korsgaard.com Fri Feb 10 15:36:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:36:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-flit-core: set license path In-Reply-To: <20230210102655.94324-1-alexis.lothore@bootlin.com> ("Alexis =?utf-8?Q?Lothor=C3=A9?= via buildroot"'s message of "Fri, 10 Feb 2023 11:26:55 +0100") References: <20230210102655.94324-1-alexis.lothore@bootlin.com> Message-ID: <874jrtedlz.fsf@dell.be.48ers.dk> >>>>> "Alexis" == Alexis Lothor? via buildroot writes: > When generating legal info with a configuration enabling a package which uses > flit as setup type, we get a warning about python-flit-core license: > WARNING: python-flit-core-3.8.0: cannot save license (HOST_PYTHON_FLIT_CORE_LICENSE_FILES not defined) > Add missing variable to point to python-flit-core license file > Signed-off-by: Alexis Lothor? > --- > package/python-flit-core/python-flit-core.mk | 1 + > 1 file changed, 1 insertion(+) > diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk > index 4d7bee81da..f96191ade6 100644 > --- a/package/python-flit-core/python-flit-core.mk > +++ b/package/python-flit-core/python-flit-core.mk > @@ -8,6 +8,7 @@ PYTHON_FLIT_CORE_VERSION = 3.8.0 > PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz > PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/10/e5/be08751d07b30889af130cec20955c987a74380a10058e6e8856e4010afc > PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause > +PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE You also need to add the sha256 of LICENSE to the .hash file: ake host-python-flit-core-legal-info flit_core-3.8.0.tar.gz: OK (md5: 7c41da13273f7787709a24f74e0f5a99) flit_core-3.8.0.tar.gz: OK (sha256: b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3) >>> host-python-flit-core 3.8.0 Extracting gzip -d -c /var/lib/downloads/python-flit-core/flit_core-3.8.0.tar.gz | tar --strip-components=1 -C /home/peko/source/buildroot/output/build/host-python-flit-core-3.8.0 -xf - >>> host-python-flit-core 3.8.0 Patching >>> host-python-flit-core 3.8.0 Collecting legal info ERROR: No hash found for LICENSE Committed with that fixed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 15:36:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:36:24 +0100 Subject: [Buildroot] [git commit] package/python-flit-core: set license path Message-ID: <20230210153716.1E25A84F54@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1613273542554776b089b3df2b6b71c1af2cc0da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When generating legal info with a configuration enabling a package which uses flit as setup type, we get a warning about python-flit-core license: WARNING: python-flit-core-3.8.0: cannot save license (HOST_PYTHON_FLIT_CORE_LICENSE_FILES not defined) Add missing variable to point to python-flit-core license file Signed-off-by: Alexis Lothor?? [Peter: add sha256sum to .hash file] Signed-off-by: Peter Korsgaard --- package/python-flit-core/python-flit-core.hash | 2 ++ package/python-flit-core/python-flit-core.mk | 1 + 2 files changed, 3 insertions(+) diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash index 9281635f1a..f63a64ed1b 100644 --- a/package/python-flit-core/python-flit-core.hash +++ b/package/python-flit-core/python-flit-core.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flit_core/json md5 7c41da13273f7787709a24f74e0f5a99 flit_core-3.8.0.tar.gz sha256 b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3 flit_core-3.8.0.tar.gz +# Locally computed +sha256 35b4f1dec512e617077fd6980dbb43ef8c2887adc5d0185edb4c04da175dd816 LICENSE diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 4d7bee81da..f96191ade6 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -8,6 +8,7 @@ PYTHON_FLIT_CORE_VERSION = 3.8.0 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/10/e5/be08751d07b30889af130cec20955c987a74380a10058e6e8856e4010afc PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause +PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap # Use flit built in bootstrap_install for installing host-python-flit-core. From bugzilla at busybox.net Fri Feb 10 15:52:36 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 10 Feb 2023 15:52:36 +0000 Subject: [Buildroot] [Bug 15331] Warning on python-flit-core license when generating legal info In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15331 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Peter Korsgaard --- Fixed by https://gitlab.com/buildroot.org/buildroot/-/commit/1613273542554776b089b3df2b6b71c1af2cc0da, thanks -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Fri Feb 10 15:53:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:53:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/elixir: drop package In-Reply-To: <20230210110643.449927-1-frank.vanbever@mind.be> (Frank Vanbever's message of "Fri, 10 Feb 2023 12:06:43 +0100") References: <20230210110643.449927-1-frank.vanbever@mind.be> Message-ID: <87zg9lcy9b.fsf@dell.be.48ers.dk> >>>>> "Frank" == Frank Vanbever writes: > Elixir was a dependency of rabbitmq-server which got dropped in > 89815bad0a531d01ee2733dd9c17576a7647e1d9. It is a host package with no other > users, hence it is no longer required. Additionally, newer versions require > Erlang 23+. > Signed-off-by: Frank Vanbever Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 15:53:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:53:27 +0100 Subject: [Buildroot] [git commit] package/elixir: drop package Message-ID: <20230210155405.E5F0A84F7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=406698de03a9c9e4ded5a50070de2249398380ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Elixir was a dependency of rabbitmq-server which got dropped in 89815bad0a531d01ee2733dd9c17576a7647e1d9. It is a host package with no other users, hence it is no longer required. Additionally, newer versions require Erlang 23+. Signed-off-by: Frank Vanbever Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - package/elixir/elixir.hash | 3 --- package/elixir/elixir.mk | 21 --------------------- 3 files changed, 25 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 32c6e54919..e8e0671709 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1089,7 +1089,6 @@ F: package/upx/ F: package/zxing-cpp/ N: Frank Vanbever -F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ diff --git a/package/elixir/elixir.hash b/package/elixir/elixir.hash deleted file mode 100644 index 6d083e72de..0000000000 --- a/package/elixir/elixir.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Computed locally -sha256 f3465d8a8e386f3e74831bf9594ee39e6dfde6aa430fe9260844cfe46aa10139 elixir-1.9.4.tar.gz -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE diff --git a/package/elixir/elixir.mk b/package/elixir/elixir.mk deleted file mode 100644 index 6d935516f4..0000000000 --- a/package/elixir/elixir.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# elixir -# -################################################################################ - -ELIXIR_VERSION = 1.9.4 -ELIXIR_SITE = $(call github,elixir-lang,elixir,v$(ELIXIR_VERSION)) -ELIXIR_LICENSE = Apache-2.0 -ELIXIR_LICENSE_FILES = LICENSE -HOST_ELIXIR_DEPENDENCIES = host-erlang - -define HOST_ELIXIR_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) compile -endef - -define HOST_ELIXIR_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX="$(HOST_DIR)" -C $(@D) install -endef - -$(eval $(host-generic-package)) From alexis.lothore at bootlin.com Fri Feb 10 15:47:11 2023 From: alexis.lothore at bootlin.com (=?UTF-8?Q?Alexis_Lothor=c3=a9?=) Date: Fri, 10 Feb 2023 16:47:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-flit-core: set license path In-Reply-To: <874jrtedlz.fsf@dell.be.48ers.dk> References: <20230210102655.94324-1-alexis.lothore@bootlin.com> <874jrtedlz.fsf@dell.be.48ers.dk> Message-ID: On 2/10/23 16:36, Peter Korsgaard wrote: >>>>>> "Alexis" == Alexis Lothor? via buildroot writes: > > > diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk > > index 4d7bee81da..f96191ade6 100644 > > --- a/package/python-flit-core/python-flit-core.mk > > +++ b/package/python-flit-core/python-flit-core.mk > > @@ -8,6 +8,7 @@ PYTHON_FLIT_CORE_VERSION = 3.8.0 > > PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz > > PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/10/e5/be08751d07b30889af130cec20955c987a74380a10058e6e8856e4010afc > > PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause > > +PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE > > You also need to add the sha256 of LICENSE to the .hash file: > > Committed with that fixed, thanks. ACK for next time, sorry for omission and thanks for the fix Kind regards, -- Alexis Lothor?, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From nodeax at gmail.com Fri Feb 10 18:02:22 2023 From: nodeax at gmail.com (Akshay Bhat) Date: Fri, 10 Feb 2023 10:02:22 -0800 Subject: [Buildroot] [PATCH 1/1] package/libiberty: bump version to 2.38 Message-ID: <20230210180222.88328-1-nodeax@gmail.com> If the libiberty package is not the same version as the one packaged with binutils AND if libiberty is installed before binutils, then the below error is observed. Hence for now let us keep the versions in sync. /usr/bin/ld: ../libiberty/libiberty.a(hashtab.o):(.data.rel.local+0x0): multiple definition of `htab_eq_pointer' Signed-off-by: Akshay Bhat --- package/libiberty/libiberty.hash | 2 +- package/libiberty/libiberty.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash index 0dafcea520..74b2d89d31 100644 --- a/package/libiberty/libiberty.hash +++ b/package/libiberty/libiberty.hash @@ -1,5 +1,5 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz +sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz # Locally computed, same as binutils.hash sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/package/libiberty/libiberty.mk b/package/libiberty/libiberty.mk index 6235a8b956..e0e6987ad7 100644 --- a/package/libiberty/libiberty.mk +++ b/package/libiberty/libiberty.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIBERTY_VERSION = 2.32 +LIBIBERTY_VERSION = 2.38 LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils HOST_LIBIBERTY_DL_SUBDIR = binutils -- 2.34.1 From john at metanate.com Fri Feb 10 18:46:58 2023 From: john at metanate.com (John Keeping) Date: Fri, 10 Feb 2023 18:46:58 +0000 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: Build with ninja In-Reply-To: <87fsbdg2wb.fsf@dell.be.48ers.dk> References: <20230209170707.4066903-1-peter@korsgaard.com> <87fsbdg2wb.fsf@dell.be.48ers.dk> Message-ID: On Fri, Feb 10, 2023 at 12:45:24PM +0100, Peter Korsgaard wrote: > >>>>> "John" == John Keeping writes: > > > Hi Peter, > > On Thu, Feb 09, 2023 at 06:07:05PM +0100, Peter Korsgaard wrote: > >> +define WEBKITGTK_BUILD_CMDS > >> + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) > >> +endef > >> + > >> +define WEBKITGTK_INSTALL_STAGING_CMDS > >> + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) > >> +endef > >> + > >> +define WEBKITGTK_INSTALL_TARGET_CMDS > >> + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) > >> +endef > >> + > > > Would it make sense to apply these changes in pkg-cmake.mk? > > > Using `cmake --build` and `cmake --install` works with all generators > > and it would avoid needing to repeat this block for both of the packages > > in this series. > > Longer term that is indeed the direction we want to move to (and > generally build cmake packages with the ninja backend). > > This is meant as a minimal patch that is easy to backport to the stable > branches. Makes sense. > We have a number of cmake packages that use custom FOO_MAKE_OPTS, how > are those passed to make when using cmake --build / --install? For building, we have: cmake --build [] [-- ] so it should be easy to pass _MAKE_OPTS through. But I can't see anything similar for --install, although I wonder if anything actually needs to pass _MAKE_OPTS for installation. >From a quick look only 3 CMake packages use _MAKE_OPTS at all: $ git grep -l cmake-package package/ | grep -vF pkg-cmake.mk | xargs grep MAKE_OPTS package/gdal/gdal.mk:GDAL_MAKE_OPTS += -f Makefile package/mariadb/mariadb.mk:HOST_MARIADB_MAKE_OPTS = import_executables package/zeek/zeek.mk:HOST_ZEEK_MAKE_OPTS = binpac bifcl Of those, gdal's use is probably unnecessary when using `cmake --build` and the other two could us a more specific option to set targets and use the --targets option (but should also be okay with passing options after `--`). Regards, John From troglobit at gmail.com Fri Feb 10 18:47:04 2023 From: troglobit at gmail.com (Joachim Wiberg) Date: Fri, 10 Feb 2023 19:47:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/ssdp-responder; drop systemd unit installation, not needed Message-ID: <20230210184704.3381562-1-troglobit@gmail.com> When systemd is enabled the ssdp-responder build system already installs the unit file, with the correct name, so we can safely drop this. This fixes the recurring autobuilder problems that cropped up the last week+ or so after fixing the spelling error in 6e0ba6b. - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 Signed-off-by: Joachim Wiberg --- package/ssdp-responder/ssdp-responder.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index d40f6f8c57..5193966908 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,9 +25,4 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service -endef - $(eval $(autotools-package)) -- 2.34.1 From yann.morin.1998 at free.fr Fri Feb 10 21:55:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 10 Feb 2023 22:55:48 +0100 Subject: [Buildroot] [PATCH] package/erlang: do not hard-code the Erlang Interface Version (EI_VSN) Message-ID: <20230210215548.1050371-1-yann.morin.1998@free.fr> The note above the erlang version instructs to refer to another note further down the file. However, even if it is not too difficult to find, it is still located a bit too far away, and the reference is not very explicit what note we should look at. When we introduced that variable in 6c1d128844c5 (package/erlang: export EI_VSN so other packages can use it), the rationale for hard-coding it was "to avoid spawning a shell every time the variable is dereferenced". However, that can get a bit confusing and hard to follow. Also, that in fact spawns a shell only once for each rebar-packages, so the overhead is far from being too high. The EI_VSN is only used by rebar-package packages, is derefrenced from the rebar-infra and not the packages themselves, and is not needed by erlang itself (it knows its own EI_VSN), so we can de-hard-code it, and rely on build-time detection, by looking in the appropriate file. We have two files where we could look: - lib/erl_interface/vsn.mk in the erlang source tree, but it is not installed, - .../lib/erlang/releases/$(ERLANG_RELASE)/installed_application_versions as installed by erlang. We use the second one, as it is cleaner, for a package, to look into installed files, rather than to look in the source tree of another package. Although both the host and target erlang are the same, we still look into the corresponding file to extract the version. This is so that it would be easier if in the future we ever manage to rely on a system-installed erlang that could have a EI_VSN different from the target one. We can't re-use the variable ERLANG_EI_VSN, because it now needs to be $(call)-ed with a parameter. Hopefully, external packages that use it directly rather than through the rebar infra, are not legion... Signed-off-by: Yann E. MORIN Cc: Will Newton Cc: Johan Oudinet --- package/erlang/erlang.mk | 8 ++++---- package/pkg-rebar.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index ac2c204a49..5d6b69057a 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -4,8 +4,8 @@ # ################################################################################ -# See note below when updating Erlang ERLANG_VERSION = 22.3.4.22 +ERLANG_RELEASE = $(firstword $(subst ., ,$(ERLANG_VERSION))) ERLANG_SITE = \ https://github.com/erlang/otp/releases/download/OTP-$(ERLANG_VERSION) ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz @@ -36,9 +36,9 @@ ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF HOST_ERLANG_DEPENDENCIES += host-autoconf HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF -# Whenever updating Erlang, this value should be updated as well, to the -# value of EI_VSN in the file lib/erl_interface/vsn.mk -ERLANG_EI_VSN = 3.13.2.2 +# Return the EIV (Erlang Interface Version, EI_VSN) +# $(1): base directory, i.e. either $(HOST_DIR) or $(STAGING_DIR)/usr +erlang_ei_vsn = `sed -r -e '/^erl_interface-(.+)/!d; s//\1/' $(1)/lib/erlang/releases/$(ERLANG_RELEASE)/installed_application_versions` # The configure checks for these functions fail incorrectly ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes diff --git a/package/pkg-rebar.mk b/package/pkg-rebar.mk index e4e3f3bb6c..4b993dd970 100644 --- a/package/pkg-rebar.mk +++ b/package/pkg-rebar.mk @@ -32,10 +32,10 @@ REBAR_TARGET_DEPS_DIR = $(STAGING_DIR)/usr/share/rebar/deps # REBAR_HOST_DEPS_ENV = \ ERL_COMPILER_OPTIONS='{i, "$(REBAR_HOST_DEPS_DIR)"}' \ - ERL_EI_LIBDIR=$(HOST_DIR)/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib + ERL_EI_LIBDIR=$(HOST_DIR)/lib/erlang/lib/erl_interface-$(call erlang_ei_vsn,$(HOST_DIR))/lib REBAR_TARGET_DEPS_ENV = \ ERL_COMPILER_OPTIONS='{i, "$(REBAR_TARGET_DEPS_DIR)"}' \ - ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib + ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(call erlang_ei_vsn,$(STAGING_DIR)/usr)/lib ################################################################################ # Helper functions -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Feb 10 22:05:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:05:38 +0100 Subject: [Buildroot] [git commit] package/gnupg2: bump to version 2.4.0 Message-ID: <20230210221004.E0E9D84FC8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f868e97f6b42ccaa0844880775f86002656227d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See announce: https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html This commit also drop a patch which is now included in the new version. See: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7011286ce6e1fb56c2989fdafbd11b931c489faa Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gnupg2/0001-ks_ldap_free_state.patch | 21 --------------------- package/gnupg2/gnupg2.hash | 10 +++++----- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch deleted file mode 100644 index fa55d27c04..0000000000 --- a/package/gnupg2/0001-ks_ldap_free_state.patch +++ /dev/null @@ -1,21 +0,0 @@ - -Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is not -installed - -Backported from: 7011286ce6e1fb56c2989fdafbd11b931c489faa - -Signed-off-by: Michael Fischer - ---- a/dirmngr/server.c -+++ b/dirmngr/server.c -@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) - ctrl->refcount); - else - { -+#if USE_LDAP - ks_ldap_free_state (ctrl->ks_get_state); - ctrl->ks_get_state = NULL; -+#endif - release_ctrl_ocsp_certs (ctrl); - xfree (ctrl->server_local); - dirmngr_deinit_default_ctrl (ctrl); diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index f9c071ad45..c642862fe2 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html -sha1 1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc gnupg-2.3.8.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html +sha1 63dde155a8df0d5e1987efa5fc17438beca83ac1 gnupg-2.4.0.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.8.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA and AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD -sha256 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed gnupg-2.3.8.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2.sig +# using key 6DAA6E64A76D2840571B4902528897B826403ADA +sha256 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 gnupg-2.4.0.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 9dc29ca99e..5935ce6939 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.3.8 +GNUPG2_VERSION = 2.4.0 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From thomas.petazzoni at bootlin.com Fri Feb 10 22:13:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:13:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiberty: bump version to 2.38 In-Reply-To: <20230210180222.88328-1-nodeax@gmail.com> References: <20230210180222.88328-1-nodeax@gmail.com> Message-ID: <20230210231315.17b367e6@windsurf> Hello, On Fri, 10 Feb 2023 10:02:22 -0800 Akshay Bhat wrote: > If the libiberty package is not the same version as the one packaged > with binutils AND if libiberty is installed before binutils, then the > below error is observed. Hence for now let us keep the versions in sync. > > /usr/bin/ld: ../libiberty/libiberty.a(hashtab.o):(.data.rel.local+0x0): multiple definition of `htab_eq_pointer' > > Signed-off-by: Akshay Bhat Thanks a lot for the fix. Is this fixing http://autobuild.buildroot.net/results/eaf/eaf23ea0c8d7803e3768da40b7070d04801cd36f/build-end.log perhaps? One issue that I see is that the binutils version is configurable: we support 2.37, 2.38, 2.39 and the special ARC version. Do we need to make the libiberty version match with that? Also, see the conversation starting at: https://lore.kernel.org/buildroot/3f3d266c-2f21-197c-29b7-fff3e230e97a at smile.fr/ 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 Fri Feb 10 22:14:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:14:54 +0100 Subject: [Buildroot] Dependency problem for gtkmm3 In-Reply-To: References: Message-ID: <20230210231454.4f3aedbd@windsurf> Hello Dirk, On Fri, 10 Feb 2023 11:15:12 +0000 Dirk De Becker wrote: > Hi, > > I am trying to make a buildroot containing libgtkmm3, but I run into problems. > I did the following steps: > Checkout master from git://git.buildroot.net/buildroot > Select the following things: > > * BR2_x86_64 > * BR2_TOOLCHAIN_BUILDROOT_CXX > * BR2_PACKAGE_MESA3D > * BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 > * BR2_PACKAGE_MESA3D_OPENGL_EGL > * BR2_PACKAGE_LIBGTK3 > * BR2_PACKAGE_GTKMM3 > > I get the following error in the output of the build attempt for gtkmm3-3.22.0: > configure: error: Package requirements (giomm-2.4 >= 2.49.1 pangomm-1.4 >= 2.38.2 gtk+-3.0 >= 3.22.0 cairomm-1.0 >= 1.12.0 gdk-pixbuf-2.0 >= 2.35.5) were not met: > > Package 'giomm-2.4', required by 'virtual:world', not found > Package 'pangomm-1.4', required by 'virtual:world', not found > Package 'cairomm-1.0', required by 'virtual:world', not found > > It seems that gtkmm3 is dependent on versions of some libraries that are not available. > > The following packages were built, but these do not provide the correct versions of these packages, according to pkg-config: > > * glibmm-2.68.2 > * pangomm-2.48.2 > * cairomm-1.16.1 I have not looked at the issue, but it seems to match what our autobuilders have reported at: http://autobuild.buildroot.net/results/172/17263ac51f197031106eb7fd595126a2720f0397/build-end.log Best regards, 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 Feb 10 22:16:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:16:59 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/gnupg2: bump to version 2.4.0 In-Reply-To: <20230106111141.325627-1-ju.o@free.fr> References: <20230106111141.325627-1-ju.o@free.fr> Message-ID: <20230210231659.2957f090@windsurf> On Fri, 6 Jan 2023 12:11:41 +0100 Julien Olivain wrote: > See announce: > https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html > > This commit also drop a patch which is now included in the new version. > See: > https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7011286ce6e1fb56c2989fdafbd11b931c489faa > > Signed-off-by: Julien Olivain > --- > Changes v1 -> v2: > - Removed GNUPG2_CONF_ENV, as the better fix is: > https://git.buildroot.org/buildroot/commit/?id=3a22b009992883ad57553ffb3f194303f90ad1a4 > --- > Tested on top of branch master at commit 3a22b00 with commands: Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 10 22:26:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:26:56 +0100 Subject: [Buildroot] [git commit] package/gtest: drop patch adding debug 'd' to library names in pkg-config files Message-ID: <20230210222713.EA62A85015@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f661c00342befb21c0032e593c758dfb2d336007 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - drop patch adding debug 'd' to gmock/gtest library names in pkg-config files (not longer needed since gtest version bump to 1.22 ([1]) and upstream commit 'FIX #2174 -- remove `DEBUG_POSTFIX`' ([2]). Fixes: http://autobuild.buildroot.net/results/5ea8f180e4909f8157565238b25f567fcf1f3beb .../host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/7.3.1/../../../../aarch64-linux-gnu/bin/ld: cannot find -lgtestd [1] https://git.buildroot.net/buildroot/commit/?id=a336b731af5979a25213b33c5840de6d1ed88bdc [2] https://github.com/google/googletest/commit/ca3ffd90f2726f6c0c6e790f05c7c88491a16466 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...fix-gtest.pc-gmock.pc-library-names-for-t.patch | 62 ---------------------- 1 file changed, 62 deletions(-) diff --git a/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch b/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch deleted file mode 100644 index c47e8fc8f8..0000000000 --- a/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cf5a3177159ca832470e7f876cab0a1923fa666f Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 22 Oct 2021 20:17:36 +0200 -Subject: [PATCH] pkg-config: fix gtest.pc/gmock.pc library names for the debug - build - -In case CMAKE_BUILD_TYPE is set to Debug the gtest library is -name libgtestd.a but the link command returned from gtest.pc is -'-lgtest' (without the debug d) and so the linking of dependent -packages fails (see [1] for a buildroot failure example). - -Enhance the gtest.pc ang gmock.pc generation to honour the debug 'd'. - -[1] http://lists.busybox.net/pipermail/buildroot/2021-October/626382.html - -[Upstream: https://github.com/google/googletest/pull/3625] -Signed-off-by: Peter Seiderer ---- - googlemock/cmake/gmock.pc.in | 2 +- - googletest/cmake/gtest.pc.in | 2 +- - googletest/cmake/internal_utils.cmake | 3 +++ - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in -index 23c67b5c..0f469857 100644 ---- a/googlemock/cmake/gmock.pc.in -+++ b/googlemock/cmake/gmock.pc.in -@@ -6,5 +6,5 @@ Description: GoogleMock (without main() function) - Version: @PROJECT_VERSION@ - URL: https://github.com/google/googletest - Requires: gtest = @PROJECT_VERSION@ --Libs: -L${libdir} -lgmock @CMAKE_THREAD_LIBS_INIT@ -+Libs: -L${libdir} -lgmock at DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@ - Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ -diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in -index b4148fae..225bba81 100644 ---- a/googletest/cmake/gtest.pc.in -+++ b/googletest/cmake/gtest.pc.in -@@ -5,5 +5,5 @@ Name: gtest - Description: GoogleTest (without main() function) - Version: @PROJECT_VERSION@ - URL: https://github.com/google/googletest --Libs: -L${libdir} -lgtest @CMAKE_THREAD_LIBS_INIT@ -+Libs: -L${libdir} -lgtest at DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@ - Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ -diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake -index 58fc9bfb..fd81b825 100644 ---- a/googletest/cmake/internal_utils.cmake -+++ b/googletest/cmake/internal_utils.cmake -@@ -335,6 +335,9 @@ function(install_project) - # Configure and install pkgconfig files. - foreach(t ${ARGN}) - set(configured_pc "${generated_dir}/${t}.pc") -+ if(CMAKE_BUILD_TYPE MATCHES Debug) -+ set(DEBUG_POSTFIX "d") -+ endif() - configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in" - "${configured_pc}" @ONLY) - install(FILES "${configured_pc}" --- -2.33.1 - From thomas.petazzoni at bootlin.com Fri Feb 10 22:27:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:27:13 +0100 Subject: [Buildroot] [PATCH v1] package/gtest: drop patch adding debug 'd' to library names in pkg-config files In-Reply-To: <20230106210133.28803-1-ps.report@gmx.net> References: <20230106210133.28803-1-ps.report@gmx.net> Message-ID: <20230210232713.05954d68@windsurf> On Fri, 6 Jan 2023 22:01:33 +0100 Peter Seiderer wrote: > - drop patch adding debug 'd' to gmock/gtest library names in pkg-config files > (not longer needed since gtest version bump to 1.22 ([1]) and upstream > commit 'FIX #2174 -- remove `DEBUG_POSTFIX`' ([2]). > > Fixes: > > http://autobuild.buildroot.net/results/5ea8f180e4909f8157565238b25f567fcf1f3beb > > .../host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/7.3.1/../../../../aarch64-linux-gnu/bin/ld: cannot find -lgtestd > > [1] https://git.buildroot.net/buildroot/commit/?id=a336b731af5979a25213b33c5840de6d1ed88bdc > [2] https://github.com/google/googletest/commit/ca3ffd90f2726f6c0c6e790f05c7c88491a16466 > > Signed-off-by: Peter Seiderer > --- > ...test.pc-gmock.pc-library-names-for-t.patch | 62 ------------------- > 1 file changed, 62 deletions(-) > delete mode 100644 package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 10 22:30:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:30:08 +0100 Subject: [Buildroot] [git commit] board/asus/tinker: rename label linux-next to linux in extlinux.conf Message-ID: <20230210223129.CE5C585178@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4b46bc3c6997e32050b332d7578f0cb289b57be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We're not using next branch so let's rename label linux-next to linux. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf index 136af0debd..bb96ddb893 100644 --- a/board/asus/tinker/extlinux.conf +++ b/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ -label Tinker linux-next +label Tinker linux kernel /boot/uImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait From thomas.petazzoni at bootlin.com Fri Feb 10 22:30:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:30:30 +0100 Subject: [Buildroot] [git commit] configs/asus_tinker_rk3288: bump Linux to 6.1.2 and U-boot to 2022.10 Message-ID: <20230210223129.D905185179@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fdf20249574b64285979f109bef74eb9cdbf0db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/asus_tinker_rk3288_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 02b340a7f1..40f4125880 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" From thomas.petazzoni at bootlin.com Fri Feb 10 22:31:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:31:15 +0100 Subject: [Buildroot] [git commit] board/asus/tinker: add a note to readme.txt for power supply Message-ID: <20230210223129.E363B851A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d87d6281869d4023e0ff888b99cdd5bdf2a0326 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/readme.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/board/asus/tinker/readme.txt b/board/asus/tinker/readme.txt index 7372d29520..110e2168c9 100644 --- a/board/asus/tinker/readme.txt +++ b/board/asus/tinker/readme.txt @@ -35,3 +35,9 @@ You can write this image directly to an SD card device (i.e. /dev/xxx): $ sudo sync Finally, you can insert the SD card to the Tinker RK3288 board and boot it. + +NOTE: +USB power supply requires more than the standard 500mA USB current, so +this board must be supplied from a capable port or from an external +AC/DC adapter. Otherwise it will hang forever while loading the kernel +image. From thomas.petazzoni at bootlin.com Fri Feb 10 22:29:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:29:10 +0100 Subject: [Buildroot] [git commit] configs/asus_tinker_rk3288: fix boot by prepending tpl to spl+u-boot Message-ID: <20230210223129.C431885174@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e738d5b7251918a62922f3f3b6491b642f9ec182 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master During the last U-boot version bump it's not been noted that the TPL was not prepended to SPL anymore preventing the board to boot, so let's copy TPL to the image folder, prepend it to u-boot-spl-dtb.bin and place it at offset 32KB, where RK3288 bootrom expects to find it. Let's also place u-boot-dtb separated from SPL at offset 8M, where the SPL expects it to find it. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/genimage.cfg | 11 +++++++++-- board/asus/tinker/post-build.sh | 4 ++-- configs/asus_tinker_rk3288_defconfig | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/board/asus/tinker/genimage.cfg b/board/asus/tinker/genimage.cfg index a4b1e8d608..fa7fd734f2 100644 --- a/board/asus/tinker/genimage.cfg +++ b/board/asus/tinker/genimage.cfg @@ -2,12 +2,19 @@ image sdcard.img { hdimage { } - partition u-boot-spl-dtb { + partition u-boot-tpl-spl-dtb { in-partition-table = "no" - image = "u-boot-spl-dtb.img" + image = "u-boot-tpl-spl-dtb.img" offset = 32K } + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 8M + size = 30M + } + partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/asus/tinker/post-build.sh b/board/asus/tinker/post-build.sh index 8108ed83ff..ffbbcdeb58 100755 --- a/board/asus/tinker/post-build.sh +++ b/board/asus/tinker/post-build.sh @@ -3,7 +3,7 @@ MKIMAGE=$HOST_DIR/bin/mkimage BOARD_DIR="$(dirname $0)" -$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img -cat $BINARIES_DIR/u-boot-dtb.bin >> $BINARIES_DIR/u-boot-spl-dtb.img +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl-dtb.bin > $BINARIES_DIR/u-boot-tpl-spl-dtb.img install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 6963fa939f..02b340a7f1 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y From yann.morin.1998 at free.fr Fri Feb 10 22:31:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 10 Feb 2023 23:31:42 +0100 Subject: [Buildroot] [PATCH 1/2] support/download: catch post-process errors Message-ID: <20230210223143.1060114-1-yann.morin.1998@free.fr> Currently, when the post-process helper fails while downloading from upstream, there is no fallback to the backup mirror. In case the post-process helper fails, we mut consider that to be a download failure, so we must bail out as if the download backend itself did fail, but we fail to do so. Duplicate the logic we have for the download helper: if the post-process helper fails, remove the downloaded stuff, and continue on to the next URI, which will ultimately hit the backup mirror (if one has been configured). Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- support/download/dl-wrapper | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 09a6ac1f1a..1e8d6058f6 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -138,9 +138,15 @@ main() { fi if [ -n "${post_process}" ] ; then - "${OLDPWD}/support/download/${post_process}-post-process" \ - -o "${tmpf}" \ - -n "${raw_base_name}" + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + then + # cd back to keep path coherence + cd "${OLDPWD}" + rm -rf "${tmpd}" + continue + fi fi # cd back to free the temp-dir, so we can remove it later -- 2.25.1 From yann.morin.1998 at free.fr Fri Feb 10 22:31:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 10 Feb 2023 23:31:43 +0100 Subject: [Buildroot] [PATCH 2/2] support/download: fix the cargo post-process in face of failed vendoring In-Reply-To: <20230210223143.1060114-1-yann.morin.1998@free.fr> References: <20230210223143.1060114-1-yann.morin.1998@free.fr> Message-ID: <20230210223143.1060114-2-yann.morin.1998@free.fr> In commit 04154a651729 (support/download/cargo-post-process: cargo output for vendor config), we switched away from our hand-crafted cargo.toml mangling, to use cargo itself to update that file. In doing so, we enabled the shell pipefail option, so that we could catch cargo failures, while redirecting its output through tee to the cargo.toml. However, pipefail is overzealous, and will hit us even for pipes we do not want to globally fail, like the one that actually checks whether an archive is already vendored or not: if tar tf "${output}" | grep -q "^[^/]*/VENDOR" ; then ... with pipefail, the above may always fail: - if the tarball is already vendored, grep will exit on the first match because of -q (it only needs a single match to decide that its return code will be zero), so the | will get closed, and tar may get -EPIPE before it had a chance to finish listing the archive, and thus would terminate in error; - if the tarball is not vendored, grep will exit in error. It turns out that the tee was only added so that we could see the messages emitted by cargo, and still fill the cargo.tom with the output of cargo. But that's a bit overkill: the cargo messages are going to stderr, and the blurb to add to cargo.toml to stdout, so we just need to redirect stdout. Yes, we do not see what cargo added to cargo.toml, but that is not so interesting. Still, cargo ends its messages with a suggestion for the user to modify cargo.toml, with: To use vendored sources, add this to your .cargo/config.toml for this project: But since we've already redirected that to cargo.toml, there is nothing for the user to edit, so the above can get confusing. Emit a little blurb that states that everything is under control. And then we can drop pipefail. Note: the go-post-process initially had pipefail too, but it was dropped in bfd1a31d0e59 (support/download/go-post-process: drop -o pipefail) as it was causing spurrious breakage when extracting the archive before vendoring, so it is only reasonable that we also remove it from the cargo-post-process. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Simon Richter --- support/download/cargo-post-process | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index aea2d8da7a..3f4666c006 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -e -set -o pipefail . "${0%/*}/helpers" @@ -31,7 +30,13 @@ flock "${CARGO_HOME}"/.br-lock \ cargo vendor \ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ --locked VENDOR \ - | tee .cargo/config + > .cargo/config + +# "cargo vendor' outputs on stderr a message directing to add some data +# to the project's .cargo/config.toml, data that it outputs on stdout. +# Since we redirect stdout to .cargo/config.toml, the message on stderr +# gets confusing, so instruct the user that it's been handled. +printf '(note: .cargo/config.toml automatically updated by Buildroot)\n\n' popd > /dev/null -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Feb 10 22:34:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:34:51 +0100 Subject: [Buildroot] [PATCH 0/4] Tinker board boot fix and Linux/U-Boot update In-Reply-To: <20230104002113.1038775-1-giulio.benetti@benettiengineering.com> References: <20230104002113.1038775-1-giulio.benetti@benettiengineering.com> Message-ID: <20230210233451.3a3a2f9f@windsurf> On Wed, 4 Jan 2023 01:21:09 +0100 Giulio Benetti wrote: > Giulio Benetti (4): > configs/asus_tinker_rk3288_defconfig: fix boot by prepending tpl to > spl+u-boot > board/asus/tinker: rename label linux-next to linux in extlinux.conf > configs/asus_tinker_rk3288_defconfig: bump Linux to 6.1.2 and U-boot > to 2022.10 > board/asus/tinker: add a note to readme.txt for power supply Series applied with minor adjustements here and there, nothing major. Thanks a lot! 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 Feb 10 22:36:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:36:16 +0100 Subject: [Buildroot] [git commit] support/testing/tests/package/test_gnupg2.py: new runtime test Message-ID: <20230210223815.F3C48851BB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a82eec628c25f96a15ed7f1443923ff625e0d2bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_gnupg2.py | 114 +++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e8e0671709..0af1323340 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1708,6 +1708,7 @@ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py diff --git a/support/testing/tests/package/test_gnupg2.py b/support/testing/tests/package/test_gnupg2.py new file mode 100644 index 0000000000..4505e1c339 --- /dev/null +++ b/support/testing/tests/package/test_gnupg2.py @@ -0,0 +1,114 @@ +import os + +import infra.basetest + + +class TestGnupg2(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_GNUPG2=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Some common data for all the tests + plain_data = "Some plain text data" + plain_file = "file.txt" + gpg_file = plain_file + ".gpg" + asc_file = plain_file + ".asc" + sig_file = plain_file + ".sig" + good_passphrase = "Good Passphrase" + gpg_userid = "br-test at buildroot" + + # Test the program can execute + self.assertRunOk("gpg --version") + + # Generate plain text data + cmd = "echo '{}' > {}".format(plain_data, plain_file) + self.assertRunOk(cmd) + + # Test symmetric encrypt + cmd = "gpg --batch --symmetric" + cmd += " --passphrase '{}' {}".format(good_passphrase, plain_file) + self.assertRunOk(cmd) + + # Test symmetric decrypt + cmd = "gpg --batch --decrypt" + cmd += " --passphrase '{}' {}".format(good_passphrase, gpg_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + + # Test a failed decrypt with a bad password + cmd = "gpg --batch --decrypt" + cmd += " --passphrase 'A-Bad-Password' {}".format(gpg_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Test the generation of an asymmetric key + cmd = "gpg --batch --passphrase ''" + cmd += " --quick-generate-key {} default default".format(gpg_userid) + self.assertRunOk(cmd) + + # Test asymmetric encrypt+sign + cmd = "gpg --batch --yes --encrypt --sign" + cmd += " --recipient {} {}".format(gpg_userid, plain_file) + self.assertRunOk(cmd) + + # Test asymmetric decrypt+verify + cmd = "gpg --decrypt {}".format(gpg_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test asymmetric armored encrypt+sign + cmd = "gpg --batch --yes --armor --encrypt --sign" + cmd += " --recipient {} {}".format(gpg_userid, plain_file) + self.assertRunOk(cmd) + + # Test asymmetric armored decrypt+verify + cmd = "gpg --armor --decrypt {}".format(asc_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test detached signature + cmd = "gpg --batch --yes --detach-sign {}".format(plain_file) + self.assertRunOk(cmd) + + # Test detached signature verification + cmd = "gpg --verify {}".format(sig_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test detached armored signature + cmd = "gpg --batch --yes --armor --detach-sign {}".format(plain_file) + self.assertRunOk(cmd) + + # Test detached armored signature verification + cmd = "gpg --armor --verify {}".format(asc_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test the signature verification of a corrupted file actually fails + cmd = "echo 'CORRUPTED' >> {}".format(plain_file) + self.assertRunOk(cmd) + + cmd = "gpg --verify {}".format(sig_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + cmd = "gpg --armor --verify {}".format(asc_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) From thomas.petazzoni at bootlin.com Fri Feb 10 22:38:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:38:24 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing/tests/package/test_gnupg2.py: new runtime test In-Reply-To: <20230104222007.43604-1-ju.o@free.fr> References: <20230104222007.43604-1-ju.o@free.fr> Message-ID: <20230210233824.7b040a31@windsurf> On Wed, 4 Jan 2023 23:20:07 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit 1ad6b4e with commands: Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 10 22:38:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:38:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/ssdp-responder; drop systemd unit installation, not needed In-Reply-To: <20230210184704.3381562-1-troglobit@gmail.com> References: <20230210184704.3381562-1-troglobit@gmail.com> Message-ID: <20230210233857.1d8ba4a5@windsurf> On Fri, 10 Feb 2023 19:47:04 +0100 Joachim Wiberg wrote: > When systemd is enabled the ssdp-responder build system already installs > the unit file, with the correct name, so we can safely drop this. > > This fixes the recurring autobuilder problems that cropped up the last > week+ or so after fixing the spelling error in 6e0ba6b. > > - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 > - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 > - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 > - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 > - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 > > Signed-off-by: Joachim Wiberg > --- > package/ssdp-responder/ssdp-responder.mk | 5 ----- > 1 file changed, 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 Fri Feb 10 22:38:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:38:44 +0100 Subject: [Buildroot] [git commit] package/ssdp-responder; drop systemd unit installation, not needed Message-ID: <20230210223955.C181F85212@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6e3d36a85f19acedd2ed58f5b8616dbf24f57a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When systemd is enabled the ssdp-responder build system already installs the unit file, with the correct name, so we can safely drop this. This fixes the recurring autobuilder problems that cropped up the last week+ or so after fixing the spelling error in 6e0ba6b. - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/ssdp-responder/ssdp-responder.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index d40f6f8c57..5193966908 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,9 +25,4 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service -endef - $(eval $(autotools-package)) From romain.naour at smile.fr Fri Feb 10 22:47:08 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:08 +0100 Subject: [Buildroot] [PATCH v3 01/10] package/llvm-project: new group for llvm packages In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-2-romain.naour@smile.fr> From: Lang Daniel To make updating easier in the future, group all llvm projects in one subfolder and define some variables for all of them. Introduce LLVM_PROJECT_VERSION_MAJOR to be used by the clang package in a followup change. Signed-off-by: Daniel Lang Reviewed-by: Romain Naour Signed-off-by: Romain Naour --- v3: Add LLVM_PROJECT_VERSION_MAJOR --- package/llvm-project/llvm-project.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 package/llvm-project/llvm-project.mk diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk new file mode 100644 index 0000000000..747a6f5647 --- /dev/null +++ b/package/llvm-project/llvm-project.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# llvm-project +# +################################################################################ + +LLVM_PROJECT_VERSION_MAJOR = 11 +LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.0 +LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) + +include $(sort $(wildcard package/llvm-project/*/*.mk)) -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:07 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:07 +0100 Subject: [Buildroot] [PATCH v3 00/10] group llvm projects and bump to version 15.0.3 Message-ID: <20230210224717.3293906-1-romain.naour@smile.fr> This series attempts two things: - Move the different llvm subprojects into one folder and share version and site information. - Bump the version to the latest 15.0.3 Starting with version 12 different subprojects added dependencies or sources that would be available when building from the "monorepo". These have been added as new host packages. v3: - move libclc before llvm 15.0.3 version bump commit - force llvm-cmake and llvm-libunwind version to 15.0.3 since LLVM_PROJECT_VERSION is still at 11.1.0 - Keep cp as install command since there is no CMakefiles.txt - llvm, clang, lld: keep LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN since this option is still used to check C++17 compiler support: llvm/cmake/modules/CheckCompilerVersion.cmake Changes v1 -> v2: - Rebased onto current master - Bump to 15.0.3 instead of 15.0.1 - llvm: use CMAKE_HOST_C_COMPILER instead of HOSTCC - libclc: Add missing change to package/Config.in Lang Daniel (10): package/llvm-project: new group for llvm packages package/llvm: move to llvm-project folder package/lld: move to llvm-project subfolder package/clang: move to llvm-project subfolder package/compiler-rt: move to llvm-project subfolder package/libclc: move to llvm-project subfolder package/llvm-project/llvm-cmake: new package package/llvm-project/llvm-libunwind: new package package/llvm-project: bump to version 15.0.3 DEVELOPERS: add Daniel Lang for llvm-project DEVELOPERS | 21 ++++++------- package/Config.in | 8 ++--- package/Config.in.host | 2 +- ...hains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 0 package/{ => llvm-project}/clang/Config.in | 0 package/{ => llvm-project}/clang/clang.hash | 2 +- package/{ => llvm-project}/clang/clang.mk | 16 +++++----- .../{ => llvm-project}/compiler-rt/Config.in | 0 .../compiler-rt/compiler-rt.hash | 2 +- .../compiler-rt/compiler-rt.mk | 9 +++--- .../0001-support-out-of-tree-build.patch | 0 package/{ => llvm-project}/libclc/Config.in | 0 package/{ => llvm-project}/libclc/libclc.hash | 2 +- package/{ => llvm-project}/libclc/libclc.mk | 4 +-- package/{ => llvm-project}/lld/Config.in.host | 0 package/{ => llvm-project}/lld/lld.hash | 2 +- package/{ => llvm-project}/lld/lld.mk | 15 +++++----- .../llvm-project/llvm-cmake/llvm-cmake.hash | 2 ++ package/llvm-project/llvm-cmake/llvm-cmake.mk | 17 +++++++++++ .../llvm-libunwind/llvm-libunwind.hash | 3 ++ .../llvm-libunwind/llvm-libunwind.mk | 18 +++++++++++ package/llvm-project/llvm-project.mk | 11 +++++++ package/{ => llvm-project}/llvm/Config.in | 0 package/{ => llvm-project}/llvm/llvm.hash | 2 +- package/{ => llvm-project}/llvm/llvm.mk | 30 ++++++++++++------- .../llvm/0001-nfc-Fix-missing-include.patch | 24 --------------- 26 files changed, 112 insertions(+), 78 deletions(-) rename package/{ => llvm-project}/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch (100%) rename package/{ => llvm-project}/clang/Config.in (100%) rename package/{ => llvm-project}/clang/clang.hash (52%) rename package/{ => llvm-project}/clang/clang.mk (92%) rename package/{ => llvm-project}/compiler-rt/Config.in (100%) rename package/{ => llvm-project}/compiler-rt/compiler-rt.hash (50%) rename package/{ => llvm-project}/compiler-rt/compiler-rt.mk (82%) rename package/{ => llvm-project}/libclc/0001-support-out-of-tree-build.patch (100%) rename package/{ => llvm-project}/libclc/Config.in (100%) rename package/{ => llvm-project}/libclc/libclc.hash (51%) rename package/{ => llvm-project}/libclc/libclc.mk (92%) rename package/{ => llvm-project}/lld/Config.in.host (100%) rename package/{ => llvm-project}/lld/lld.hash (52%) rename package/{ => llvm-project}/lld/lld.mk (67%) create mode 100644 package/llvm-project/llvm-cmake/llvm-cmake.hash create mode 100644 package/llvm-project/llvm-cmake/llvm-cmake.mk create mode 100644 package/llvm-project/llvm-libunwind/llvm-libunwind.hash create mode 100644 package/llvm-project/llvm-libunwind/llvm-libunwind.mk create mode 100644 package/llvm-project/llvm-project.mk rename package/{ => llvm-project}/llvm/Config.in (100%) rename package/{ => llvm-project}/llvm/llvm.hash (52%) rename package/{ => llvm-project}/llvm/llvm.mk (93%) delete mode 100644 package/llvm/0001-nfc-Fix-missing-include.patch -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:09 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:09 +0100 Subject: [Buildroot] [PATCH v3 02/10] package/llvm: move to llvm-project folder In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-3-romain.naour@smile.fr> From: Lang Daniel To make updating easier, move llvm into the llvm-project folder and use the defined information. Signed-off-by: Daniel Lang Reviewed-by: Romain Naour Signed-off-by: Romain Naour --- DEVELOPERS | 6 +++--- package/Config.in | 2 +- .../llvm/0001-nfc-Fix-missing-include.patch | 0 package/{ => llvm-project}/llvm/Config.in | 0 package/{ => llvm-project}/llvm/llvm.hash | 0 package/{ => llvm-project}/llvm/llvm.mk | 5 ++--- 6 files changed, 6 insertions(+), 7 deletions(-) rename package/{ => llvm-project}/llvm/0001-nfc-Fix-missing-include.patch (100%) rename package/{ => llvm-project}/llvm/Config.in (100%) rename package/{ => llvm-project}/llvm/llvm.hash (100%) rename package/{ => llvm-project}/llvm/llvm.mk (98%) diff --git a/DEVELOPERS b/DEVELOPERS index 0af1323340..6244b30d0b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1619,7 +1619,7 @@ F: package/earlyoom/ F: package/gconf/ F: package/libnss/ F: package/lld/ -F: package/llvm/ +F: package/llvm-project/llvm/ F: package/python-cython/ F: package/python-pycups/ F: package/python-raven/ @@ -2580,7 +2580,7 @@ F: package/libgta/ F: package/libiec61850/ F: package/libspatialindex/ F: package/linux-syscall-support/ -F: package/llvm/ +F: package/llvm-project/llvm/ F: package/lugaru/ F: package/mcelog/ F: package/mesa3d/ @@ -2991,7 +2991,7 @@ N: Valentin Korenblit F: package/clang/ F: package/clinfo/ F: package/libclc/ -F: package/llvm/ +F: package/llvm-project/llvm/ N: Vanya Sergeev F: package/lua-periphery/ diff --git a/package/Config.in b/package/Config.in index 511e691ed3..629ee8329b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2107,7 +2107,7 @@ comment "linux-pam plugins" source "package/libpam-tacplus/Config.in" endif source "package/liquid-dsp/Config.in" - source "package/llvm/Config.in" + source "package/llvm-project/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" source "package/mpc/Config.in" diff --git a/package/llvm/0001-nfc-Fix-missing-include.patch b/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch similarity index 100% rename from package/llvm/0001-nfc-Fix-missing-include.patch rename to package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch diff --git a/package/llvm/Config.in b/package/llvm-project/llvm/Config.in similarity index 100% rename from package/llvm/Config.in rename to package/llvm-project/llvm/Config.in diff --git a/package/llvm/llvm.hash b/package/llvm-project/llvm/llvm.hash similarity index 100% rename from package/llvm/llvm.hash rename to package/llvm-project/llvm/llvm.hash diff --git a/package/llvm/llvm.mk b/package/llvm-project/llvm/llvm.mk similarity index 98% rename from package/llvm/llvm.mk rename to package/llvm-project/llvm/llvm.mk index 977c0a08c2..1adad17b16 100644 --- a/package/llvm/llvm.mk +++ b/package/llvm-project/llvm/llvm.mk @@ -4,9 +4,8 @@ # ################################################################################ -# LLVM, Clang and lld should be version bumped together -LLVM_VERSION = 11.1.0 -LLVM_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VERSION) +LLVM_VERSION = $(LLVM_PROJECT_VERSION) +LLVM_SITE = $(LLVM_PROJECT_SITE) LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz LLVM_LICENSE = Apache-2.0 with exceptions LLVM_LICENSE_FILES = LICENSE.TXT -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:11 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:11 +0100 Subject: [Buildroot] [PATCH v3 04/10] package/clang: move to llvm-project subfolder In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-5-romain.naour@smile.fr> From: Lang Daniel To make version bumping easier, move llvm to a new llvm-project subfolder and specify site and version for the project. Signed-off-by: Daniel Lang Signed-off-by: Romain Naour --- v3: move "package/llvm-project/clang/Config.in" entry in package/Config.in --- DEVELOPERS | 6 +++--- package/Config.in | 2 +- ...-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 0 package/{ => llvm-project}/clang/Config.in | 0 package/{ => llvm-project}/clang/clang.hash | 0 package/{ => llvm-project}/clang/clang.mk | 7 +++---- 6 files changed, 7 insertions(+), 8 deletions(-) rename package/{ => llvm-project}/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch (100%) rename package/{ => llvm-project}/clang/Config.in (100%) rename package/{ => llvm-project}/clang/clang.hash (100%) rename package/{ => llvm-project}/clang/clang.mk (96%) diff --git a/DEVELOPERS b/DEVELOPERS index bbb7e2c2fe..b5494c7f95 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1614,10 +1614,10 @@ F: support/testing/tests/package/test_python_aexpect.py N: Joseph Kogut F: package/at-spi2-atk/ F: package/at-spi2-core/ -F: package/clang/ F: package/earlyoom/ F: package/gconf/ F: package/libnss/ +F: package/llvm-project/clang/ F: package/llvm-project/lld/ F: package/llvm-project/llvm/ F: package/python-cython/ @@ -2561,7 +2561,6 @@ F: package/alure/ F: package/aubio/ F: package/binutils/ F: package/bullet/ -F: package/clang/ F: package/clinfo/ F: package/efl/ F: package/enet/ @@ -2580,6 +2579,7 @@ F: package/libgta/ F: package/libiec61850/ F: package/libspatialindex/ F: package/linux-syscall-support/ +F: package/llvm-project/clang/ F: package/llvm-project/llvm/ F: package/lugaru/ F: package/mcelog/ @@ -2988,9 +2988,9 @@ F: package/gettext-tiny/ F: package/tinyssh/ N: Valentin Korenblit -F: package/clang/ F: package/clinfo/ F: package/libclc/ +F: package/llvm-project/clang/ F: package/llvm-project/llvm/ N: Vanya Sergeev diff --git a/package/Config.in b/package/Config.in index 629ee8329b..1065196c63 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2006,7 +2006,6 @@ menu "Other" source "package/capnproto/Config.in" source "package/cctz/Config.in" 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" @@ -2107,6 +2106,7 @@ comment "linux-pam plugins" source "package/libpam-tacplus/Config.in" endif source "package/liquid-dsp/Config.in" + source "package/llvm-project/clang/Config.in" source "package/llvm-project/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" diff --git a/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch similarity index 100% rename from package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch rename to package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch diff --git a/package/clang/Config.in b/package/llvm-project/clang/Config.in similarity index 100% rename from package/clang/Config.in rename to package/llvm-project/clang/Config.in diff --git a/package/clang/clang.hash b/package/llvm-project/clang/clang.hash similarity index 100% rename from package/clang/clang.hash rename to package/llvm-project/clang/clang.hash diff --git a/package/clang/clang.mk b/package/llvm-project/clang/clang.mk similarity index 96% rename from package/clang/clang.mk rename to package/llvm-project/clang/clang.mk index 3c75f8d6b1..0943e21a8c 100644 --- a/package/clang/clang.mk +++ b/package/llvm-project/clang/clang.mk @@ -4,10 +4,9 @@ # ################################################################################ -# LLVM, Clang and lld should be version bumped together -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_VERSION_MAJOR = $(LLVM_PROJECT_VERSION_MAJOR) +CLANG_VERSION = $(LLVM_PROJECT_VERSION) +CLANG_SITE = $(LLVM_PROJECT_SITE) CLANG_SOURCE = clang-$(CLANG_VERSION).src.tar.xz CLANG_LICENSE = Apache-2.0 with exceptions CLANG_LICENSE_FILES = LICENSE.TXT -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:10 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:10 +0100 Subject: [Buildroot] [PATCH v3 03/10] package/lld: move to llvm-project subfolder In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-4-romain.naour@smile.fr> From: Lang Daniel To make version bumping easier, move llvm to a new llvm-project subfolder and specify site and version for the project. Signed-off-by: Daniel Lang Reviewed-by: Romain Naour Signed-off-by: Romain Naour --- DEVELOPERS | 2 +- package/Config.in.host | 2 +- package/{ => llvm-project}/lld/Config.in.host | 0 package/{ => llvm-project}/lld/lld.hash | 0 package/{ => llvm-project}/lld/lld.mk | 5 ++--- 5 files changed, 4 insertions(+), 5 deletions(-) rename package/{ => llvm-project}/lld/Config.in.host (100%) rename package/{ => llvm-project}/lld/lld.hash (100%) rename package/{ => llvm-project}/lld/lld.mk (87%) diff --git a/DEVELOPERS b/DEVELOPERS index 6244b30d0b..bbb7e2c2fe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1618,7 +1618,7 @@ F: package/clang/ F: package/earlyoom/ F: package/gconf/ F: package/libnss/ -F: package/lld/ +F: package/llvm-project/lld/ F: package/llvm-project/llvm/ F: package/python-cython/ F: package/python-pycups/ diff --git a/package/Config.in.host b/package/Config.in.host index dcadbfdfc1..9addc88522 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -51,7 +51,7 @@ menu "Host utilities" source "package/jsmin/Config.in.host" source "package/kmod/Config.in.host" source "package/libp11/Config.in.host" - source "package/lld/Config.in.host" + source "package/llvm-project/lld/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/lttng-babeltrace/Config.in.host" source "package/lzma-alone/Config.in.host" diff --git a/package/lld/Config.in.host b/package/llvm-project/lld/Config.in.host similarity index 100% rename from package/lld/Config.in.host rename to package/llvm-project/lld/Config.in.host diff --git a/package/lld/lld.hash b/package/llvm-project/lld/lld.hash similarity index 100% rename from package/lld/lld.hash rename to package/llvm-project/lld/lld.hash diff --git a/package/lld/lld.mk b/package/llvm-project/lld/lld.mk similarity index 87% rename from package/lld/lld.mk rename to package/llvm-project/lld/lld.mk index 4bf903cda0..46ec3b13ff 100644 --- a/package/lld/lld.mk +++ b/package/llvm-project/lld/lld.mk @@ -4,9 +4,8 @@ # ################################################################################ -# LLVM, Clang and lld should be version bumped together -LLD_VERSION = 11.1.0 -LLD_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLD_VERSION) +LLD_VERSION = $(LLVM_PROJECT_VERSION) +LLD_SITE = $(LLVM_PROJECT_SITE) LLD_SOURCE = lld-$(LLD_VERSION).src.tar.xz LLD_LICENSE = Apache-2.0 with exceptions LLD_LICENSE_FILES = LICENSE.TXT -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:12 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:12 +0100 Subject: [Buildroot] [PATCH v3 05/10] package/compiler-rt: move to llvm-project subfolder In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-6-romain.naour@smile.fr> From: Lang Daniel To make version bumping easier, move llvm to a new llvm-project subfolder and specify site and version for the project. Signed-off-by: Daniel Lang Reviewed-by: Romain Naour Signed-off-by: Romain Naour --- v3: move compiler-rt entry in package/Config.in --- DEVELOPERS | 2 +- package/Config.in | 2 +- package/{ => llvm-project}/compiler-rt/Config.in | 0 package/{ => llvm-project}/compiler-rt/compiler-rt.hash | 0 package/{ => llvm-project}/compiler-rt/compiler-rt.mk | 6 ++---- 5 files changed, 4 insertions(+), 6 deletions(-) rename package/{ => llvm-project}/compiler-rt/Config.in (100%) rename package/{ => llvm-project}/compiler-rt/compiler-rt.hash (100%) rename package/{ => llvm-project}/compiler-rt/compiler-rt.mk (85%) diff --git a/DEVELOPERS b/DEVELOPERS index b5494c7f95..188a6b9427 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1995,7 +1995,6 @@ 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/ @@ -2033,6 +2032,7 @@ F: package/libssh2/ F: package/libtalloc/ F: package/libqmi/ F: package/lighttpd/ +F: package/llvm-project/compiler-rt/ F: package/logrotate/ F: package/makedevs/ F: package/memtester/ diff --git a/package/Config.in b/package/Config.in index 1065196c63..61d85d60cb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2007,7 +2007,6 @@ menu "Other" source "package/cctz/Config.in" source "package/cereal/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" @@ -2107,6 +2106,7 @@ comment "linux-pam plugins" endif source "package/liquid-dsp/Config.in" source "package/llvm-project/clang/Config.in" + source "package/llvm-project/compiler-rt/Config.in" source "package/llvm-project/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" diff --git a/package/compiler-rt/Config.in b/package/llvm-project/compiler-rt/Config.in similarity index 100% rename from package/compiler-rt/Config.in rename to package/llvm-project/compiler-rt/Config.in diff --git a/package/compiler-rt/compiler-rt.hash b/package/llvm-project/compiler-rt/compiler-rt.hash similarity index 100% rename from package/compiler-rt/compiler-rt.hash rename to package/llvm-project/compiler-rt/compiler-rt.hash diff --git a/package/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk similarity index 85% rename from package/compiler-rt/compiler-rt.mk rename to package/llvm-project/compiler-rt/compiler-rt.mk index c8ea86e899..84add60801 100644 --- a/package/compiler-rt/compiler-rt.mk +++ b/package/llvm-project/compiler-rt/compiler-rt.mk @@ -4,11 +4,9 @@ # ################################################################################ -# 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_VERSION = $(LLVM_PROJECT_VERSION) 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_SITE = $(LLVM_PROJECT_SITE) COMPILER_RT_LICENSE = NCSA MIT COMPILER_RT_LICENSE_FILES = LICENSE.TXT COMPILER_RT_DEPENDENCIES = host-clang llvm -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:14 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:14 +0100 Subject: [Buildroot] [PATCH v3 07/10] package/llvm-project/llvm-cmake: new package In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-8-romain.naour@smile.fr> From: Lang Daniel This is a small host package containing shared cmake modules that are needed by various projects during configuration. For example llvm 15 needs it. Signed-off-by: Daniel Lang Signed-off-by: Romain Naour --- v3: - force llvm-cmake version to 15.0.3 since LLVM_PROJECT_VERSION is still at 11.1.0 - Keep cp as install command since there is no CMakefiles.txt - Add License information sinec it come from llvm-project --- package/llvm-project/llvm-cmake/llvm-cmake.hash | 2 ++ package/llvm-project/llvm-cmake/llvm-cmake.mk | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/llvm-project/llvm-cmake/llvm-cmake.hash create mode 100644 package/llvm-project/llvm-cmake/llvm-cmake.mk diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.hash b/package/llvm-project/llvm-cmake/llvm-cmake.hash new file mode 100644 index 0000000000..862c5d92e8 --- /dev/null +++ b/package/llvm-project/llvm-cmake/llvm-cmake.hash @@ -0,0 +1,2 @@ +# locally calculated +sha256 21cf3f52c53dc8b8972122ae35a5c18de09c7df693b48b5cd8553c3e3fed090d cmake-15.0.3.src.tar.xz diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.mk b/package/llvm-project/llvm-cmake/llvm-cmake.mk new file mode 100644 index 0000000000..b305797891 --- /dev/null +++ b/package/llvm-project/llvm-cmake/llvm-cmake.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# llvm-cmake +# +################################################################################ + +LLVM_CMAKE_VERSION = 15.0.3 +LLVM_CMAKE_SITE = $(LLVM_PROJECT_SITE) +LLVM_CMAKE_SOURCE = cmake-$(LLVM_CMAKE_VERSION).src.tar.xz +LLVM_CMAKE_LICENSE = Apache-2.0 with exceptions + +define HOST_LLVM_CMAKE_INSTALL_CMDS + mkdir -p $(HOST_DIR)/lib/cmake/llvm + cp -Rv $(@D)/Modules/* $(HOST_DIR)/lib/cmake/llvm +endef + +$(eval $(host-generic-package)) -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:13 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:13 +0100 Subject: [Buildroot] [PATCH v3 06/10] package/libclc: move to llvm-project subfolder In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-7-romain.naour@smile.fr> From: Lang Daniel To make version bumping easier, move llvm to a new llvm-project subfolder and specify site and version for the project. Signed-off-by: Daniel Lang --- v3: move libclc before llvm 15.0.3 version bump commit move libclc entry in package/Config.in --- DEVELOPERS | 4 ++-- package/Config.in | 2 +- .../libclc/0001-support-out-of-tree-build.patch | 0 package/{ => llvm-project}/libclc/Config.in | 0 package/{ => llvm-project}/libclc/libclc.hash | 0 package/{ => llvm-project}/libclc/libclc.mk | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename package/{ => llvm-project}/libclc/0001-support-out-of-tree-build.patch (100%) rename package/{ => llvm-project}/libclc/Config.in (100%) rename package/{ => llvm-project}/libclc/libclc.hash (100%) rename package/{ => llvm-project}/libclc/libclc.mk (93%) diff --git a/DEVELOPERS b/DEVELOPERS index 188a6b9427..203103e108 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2574,12 +2574,12 @@ F: package/irrlicht/ F: package/liblinear/ F: package/lensfun/ F: package/libbpf/ -F: package/libclc/ F: package/libgta/ F: package/libiec61850/ F: package/libspatialindex/ F: package/linux-syscall-support/ F: package/llvm-project/clang/ +F: package/llvm-project/libclc/ F: package/llvm-project/llvm/ F: package/lugaru/ F: package/mcelog/ @@ -2989,8 +2989,8 @@ F: package/tinyssh/ N: Valentin Korenblit F: package/clinfo/ -F: package/libclc/ F: package/llvm-project/clang/ +F: package/llvm-project/libclc/ F: package/llvm-project/llvm/ N: Vanya Sergeev diff --git a/package/Config.in b/package/Config.in index 61d85d60cb..d268a27975 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2045,7 +2045,6 @@ menu "Other" source "package/libcap/Config.in" source "package/libcap-ng/Config.in" source "package/libcgroup/Config.in" - source "package/libclc/Config.in" source "package/libcofi/Config.in" source "package/libcorrect/Config.in" source "package/libcrossguid/Config.in" @@ -2107,6 +2106,7 @@ endif source "package/liquid-dsp/Config.in" source "package/llvm-project/clang/Config.in" source "package/llvm-project/compiler-rt/Config.in" + source "package/llvm-project/libclc/Config.in" source "package/llvm-project/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" diff --git a/package/libclc/0001-support-out-of-tree-build.patch b/package/llvm-project/libclc/0001-support-out-of-tree-build.patch similarity index 100% rename from package/libclc/0001-support-out-of-tree-build.patch rename to package/llvm-project/libclc/0001-support-out-of-tree-build.patch diff --git a/package/libclc/Config.in b/package/llvm-project/libclc/Config.in similarity index 100% rename from package/libclc/Config.in rename to package/llvm-project/libclc/Config.in diff --git a/package/libclc/libclc.hash b/package/llvm-project/libclc/libclc.hash similarity index 100% rename from package/libclc/libclc.hash rename to package/llvm-project/libclc/libclc.hash diff --git a/package/libclc/libclc.mk b/package/llvm-project/libclc/libclc.mk similarity index 93% rename from package/libclc/libclc.mk rename to package/llvm-project/libclc/libclc.mk index 5d246cf4f8..406adfdb53 100644 --- a/package/libclc/libclc.mk +++ b/package/llvm-project/libclc/libclc.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCLC_VERSION = 13.0.1 -LIBCLC_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCLC_VERSION) +LIBCLC_SITE = $(LLVM_PROJECT_SITE) LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT LIBCLC_LICENSE_FILES = LICENSE.TXT -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:15 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:15 +0100 Subject: [Buildroot] [PATCH v3 08/10] package/llvm-project/llvm-libunwind: new package In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-9-romain.naour@smile.fr> From: Lang Daniel Starting with version 15, lld needs the llvm implementation of libunwind, therefore it is added as a host package. Signed-off-by: Daniel Lang Signed-off-by: Romain Naour --- v3: force llvm-libunwind version to 15.0.3 since LLVM_PROJECT_VERSION is still at 11.1.0 --- .../llvm-libunwind/llvm-libunwind.hash | 3 +++ .../llvm-libunwind/llvm-libunwind.mk | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 package/llvm-project/llvm-libunwind/llvm-libunwind.hash create mode 100644 package/llvm-project/llvm-libunwind/llvm-libunwind.mk diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.hash b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash new file mode 100644 index 0000000000..86775f5dba --- /dev/null +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 0ab6e07bf05359e242e9ea80e4089b819914867fa997a715e324e584bcfdf114 libunwind-15.0.3.src.tar.xz +sha256 b5efebcaca80879234098e52d1725e6d9eb8fb96a19fce625d39184b705f7b6d LICENSE.TXT diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.mk b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk new file mode 100644 index 0000000000..825e1beac0 --- /dev/null +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# llvm-libunwind +# +################################################################################ + +LLVM_LIBUNWIND_VERSION = 15.0.3 +LLVM_LIBUNWIND_SITE = $(LLVM_PROJECT_SITE) +LLVM_LIBUNWIND_SOURCE = libunwind-$(LLVM_LIBUNWIND_VERSION).src.tar.xz +LLVM_LIBUNWIND_LICENSE = Apache-2.0 with exceptions +LLVM_LIBUNWIND_LICENSE_FILES = LICENSE.TXT +LLVM_LIBUNWIND_SUPPORTS_IN_SOURCE_BUILD = NO + +HOST_LLVM_LIBUNWIND_CONF_OPTS += \ + -DCMAKE_MODULE_PATH="$(HOST_DIR)/lib/cmake/llvm" \ + -DLIBUNWIND_INSTALL_HEADERS=ON + +$(eval $(host-cmake-package)) -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:17 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:17 +0100 Subject: [Buildroot] [PATCH v3 10/10] DEVELOPERS: add Daniel Lang for llvm-project In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-11-romain.naour@smile.fr> From: Lang Daniel Signed-off-by: Daniel Lang Signed-off-by: Romain Naour --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 203103e108..33a4c1758a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -642,6 +642,7 @@ F: package/dacapo/ N: Daniel Lang F: package/dbus-cxx/ F: package/libsigc/ +F: package/llvm-project/ F: package/paho-mqtt-cpp/ N: Damien Lanson -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:16 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:16 +0100 Subject: [Buildroot] [PATCH v3 09/10] package/llvm-project: bump to version 15.0.3 In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-10-romain.naour@smile.fr> From: Lang Daniel - Add new build dependencies to lld and llvm - Add host-gcc and gcc >= 7.x dependency since clang doesn't build with gcc 6.3 [ 28%] Building CXX object utils/TableGen/CMakeFiles/obj.clang-tblgen.dir/TableGen.cpp.o output/build/host-clang-15.0.3/utils/TableGen/RISCVVEmitter.cpp: In instantiation of ?{anonymous}::SemaSignatureTable::init(llvm::ArrayRef<{anonymous}::SemaRecord>):: [with auto:2 = const llvm::SmallVector]?: /usr/include/c++/6/bits/stl_algo.h:3769:5: required from ?_Funct std::for_each(_IIter, _IIter, _Funct) [with _IIter = std::_Rb_tree_const_iterator >; _Funct = {anonymous}::SemaSignatureTable::init(llvm::ArrayRef<{anonymous}::SemaRecord>)::]? output/host/include/llvm/ADT/STLExtras.h:1611:23: required from ?UnaryFunction llvm::for_each(R&&, UnaryFunction) [with R = std::set, {anonymous}::SemaSignatureTable::init(llvm::ArrayRef<{anonymous}::SemaRecord>)::Compare>&; UnaryFunction = {anonymous}::SemaSignatureTable::init(llvm::ArrayRef<{anonymous}::SemaRecord>)::]? output/build/host-clang-15.0.3/utils/TableGen/RISCVVEmitter.cpp:249:64: required from here output/build/host-clang-15.0.3/utils/TableGen/RISCVVEmitter.cpp:249:50: error: cannot call member function ?void {anonymous}::SemaSignatureTable::insert(llvm::ArrayRef)? without object llvm::for_each(Signatures, [this](auto &Sig) { insert(Sig); }); ^~~~~~ utils/TableGen/CMakeFiles/obj.clang-tblgen.dir/build.make:313: recipe for target 'utils/TableGen/CMakeFiles/obj.clang-tblgen.dir/RISCVVEmitter.cpp.o' failed make[4]: *** [utils/TableGen/CMakeFiles/obj.clang-tblgen.dir/RISCVVEmitter.cpp.o] Error 1 Indeed LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN is OFF, the CheckCompilerVersion.cmake trigger an error if gcc < 7.x. Indded since llvm 15 this option check for C++17 [1] The last gcc 7.x version (7.5) has been released in 2019. Fixing llvm/clang issues for old compiler maybe it's not worth it. [1] https://github.com/llvm/llvm-project/commit/4c72deb613d9d8838785b431facb3eb480fb2f51 - Remove LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN since gcc >= 7 is mendatory. Signed-off-by: Daniel Lang Signed-off-by: Romain Naour --- v3: - add libclc bump - llvm, clang, lld, mesa3d (llvm): add gcc >= 7.x dependency Changes v1 -> v2: - Bump to 15.0.3 instead of 15.0.1 - llvm: use CMAKE_HOST_C_COMPILER instead of HOSTCC --- package/llvm-project/clang/Config.in | 10 ++++---- package/llvm-project/clang/clang.hash | 2 +- package/llvm-project/clang/clang.mk | 8 +------ package/llvm-project/compiler-rt/Config.in | 6 ++--- .../llvm-project/compiler-rt/compiler-rt.hash | 2 +- .../llvm-project/compiler-rt/compiler-rt.mk | 3 ++- package/llvm-project/libclc/Config.in | 6 ++--- package/llvm-project/libclc/libclc.hash | 2 +- package/llvm-project/libclc/libclc.mk | 2 +- package/llvm-project/lld/Config.in.host | 6 ++--- package/llvm-project/lld/lld.hash | 2 +- package/llvm-project/lld/lld.mk | 8 +------ package/llvm-project/llvm-cmake/llvm-cmake.mk | 2 +- .../llvm-libunwind/llvm-libunwind.mk | 2 +- package/llvm-project/llvm-project.mk | 4 ++-- .../llvm/0001-nfc-Fix-missing-include.patch | 24 ------------------- package/llvm-project/llvm/Config.in | 10 ++++---- package/llvm-project/llvm/llvm.hash | 2 +- package/llvm-project/llvm/llvm.mk | 22 +++++++++-------- package/mesa3d/Config.in | 10 ++++---- 20 files changed, 50 insertions(+), 83 deletions(-) delete mode 100644 package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch diff --git a/package/llvm-project/clang/Config.in b/package/llvm-project/clang/Config.in index e4d455781e..2e23888720 100644 --- a/package/llvm-project/clang/Config.in +++ b/package/llvm-project/clang/Config.in @@ -1,13 +1,13 @@ config BR2_PACKAGE_CLANG bool "clang" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring - depends on BR2_HOST_GCC_AT_LEAST_5 + depends on BR2_HOST_GCC_AT_LEAST_7 select BR2_PACKAGE_LLVM help Clang is a C/C++, Objective C/C++ and OpenCL C front-end @@ -15,12 +15,12 @@ config BR2_PACKAGE_CLANG http://clang.llvm.org -comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" +comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 7, dynamic library, host gcc >= 7" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_HOST_GCC_AT_LEAST_5 + || !BR2_HOST_GCC_AT_LEAST_7 comment "clang needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS diff --git a/package/llvm-project/clang/clang.hash b/package/llvm-project/clang/clang.hash index 0136b80664..52c755cfb3 100644 --- a/package/llvm-project/clang/clang.hash +++ b/package/llvm-project/clang/clang.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 0a8288f065d1f57cb6d96da4d2965cbea32edc572aa972e466e954d17148558b clang-11.1.0.src.tar.xz +sha256 96036052694e703d159c995bda203b59d1ff185c6879189b9eba837726e1738c clang-15.0.3.src.tar.xz sha256 ebcd9bbf783a73d05c53ba4d586b8d5813dcdf3bbec50265860ccc885e606f47 LICENSE.TXT diff --git a/package/llvm-project/clang/clang.mk b/package/llvm-project/clang/clang.mk index 0943e21a8c..0bafd6461b 100644 --- a/package/llvm-project/clang/clang.mk +++ b/package/llvm-project/clang/clang.mk @@ -17,13 +17,6 @@ CLANG_INSTALL_STAGING = YES HOST_CLANG_DEPENDENCIES = host-llvm host-libxml2 CLANG_DEPENDENCIES = llvm host-clang -# LLVM >= 9.0 will soon require C++14 support, building llvm 8.x using a -# toolchain using gcc < 5.1 gives an error but actually still works. Setting -# this option makes it still build with gcc >= 4.8. -# https://reviews.llvm.org/D57264 -HOST_CLANG_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -CLANG_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON - # This option is needed, otherwise multiple shared libs # (libclangAST.so, libclangBasic.so, libclangFrontend.so, etc.) will # be generated. As a final shared lib containing all these components @@ -62,6 +55,7 @@ CLANG_CONF_OPTS += \ HOST_CLANG_CONF_OPTS += -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ -DCLANG_DEFAULT_LINKER=$(TARGET_LD) CLANG_CONF_OPTS += -DLLVM_DIR=$(STAGING_DIR)/usr/lib/cmake/llvm \ + -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm \ -DCLANG_TABLEGEN:FILEPATH=$(HOST_DIR)/bin/clang-tblgen \ -DLLVM_TABLEGEN_EXE:FILEPATH=$(HOST_DIR)/bin/llvm-tblgen diff --git a/package/llvm-project/compiler-rt/Config.in b/package/llvm-project/compiler-rt/Config.in index 02169b66c0..e8f2ac4201 100644 --- a/package/llvm-project/compiler-rt/Config.in +++ b/package/llvm-project/compiler-rt/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_COMPILER_RT bool "compiler-rt" depends on BR2_PACKAGE_LLVM depends on BR2_TOOLCHAIN_USES_GLIBC # asan lib requires - depends on BR2_HOST_GCC_AT_LEAST_5 # host-clang + depends on BR2_HOST_GCC_AT_LEAST_7 # host-clang help A collection of runtime libraries primarily used by clang and llvm to provide builtins, sanitizer runtimes, and profiling @@ -10,6 +10,6 @@ config BR2_PACKAGE_COMPILER_RT https://compiler-rt.llvm.org/ -comment "compiler-rt requires llvm to be enabled, a glibc toolchain, host gcc >= 5" +comment "compiler-rt requires llvm to be enabled, a glibc toolchain, host gcc >= 7" depends on !BR2_PACKAGE_LLVM - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_HOST_GCC_AT_LEAST_5 + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/llvm-project/compiler-rt/compiler-rt.hash b/package/llvm-project/compiler-rt/compiler-rt.hash index 8ee010ac5a..fe4e98164b 100644 --- a/package/llvm-project/compiler-rt/compiler-rt.hash +++ b/package/llvm-project/compiler-rt/compiler-rt.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274 compiler-rt-11.1.0.src.tar.xz +sha256 db958eee92d1571d8b7f76c1be8513817f1a888dcf6ced88aca871acfb0eeddd compiler-rt-15.0.3.src.tar.xz sha256 1a8f1058753f1ba890de984e48f0242a3a5c29a6a8f2ed9fd813f36985387e8d LICENSE.TXT diff --git a/package/llvm-project/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk index 84add60801..026650c7c8 100644 --- a/package/llvm-project/compiler-rt/compiler-rt.mk +++ b/package/llvm-project/compiler-rt/compiler-rt.mk @@ -17,7 +17,8 @@ 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)/bin/llvm-config + -DLLVM_CONFIG_PATH=$(HOST_DIR)/bin/llvm-config \ + -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm # The installation of the target runtime libraries defaults to DESTDIR, however # host-clang resources directory needs a link so Clang can find the runtime diff --git a/package/llvm-project/libclc/Config.in b/package/llvm-project/libclc/Config.in index 938933fdd3..85eb888578 100644 --- a/package/llvm-project/libclc/Config.in +++ b/package/llvm-project/libclc/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBCLC bool "libclc" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm + depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm help libclc is an open source, BSD licensed implementation of the library requirements of the OpenCL C programming language, @@ -9,6 +9,6 @@ config BR2_PACKAGE_LIBCLC http://libclc.llvm.org/ -comment "libclc needs host gcc >= 5" +comment "libclc needs host gcc >= 7" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on !BR2_HOST_GCC_AT_LEAST_5 + depends on !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/llvm-project/libclc/libclc.hash b/package/llvm-project/libclc/libclc.hash index c496291d81..7140884f6c 100644 --- a/package/llvm-project/libclc/libclc.hash +++ b/package/llvm-project/libclc/libclc.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 8f0213e52e2fcaca3dfcc438f05d0e15e9b3c96fd6b0994a802b267dc1047a1d libclc-13.0.1.src.tar.xz +sha256 07e8a2b31e07a8cc8a976a6bfd87797d2543d5a9530f449755bf5119acbdbe8e libclc-15.0.3.src.tar.xz sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT diff --git a/package/llvm-project/libclc/libclc.mk b/package/llvm-project/libclc/libclc.mk index 406adfdb53..9f303d6d2f 100644 --- a/package/llvm-project/libclc/libclc.mk +++ b/package/llvm-project/libclc/libclc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCLC_VERSION = 13.0.1 +LIBCLC_VERSION = $(LLVM_PROJECT_VERSION) LIBCLC_SITE = $(LLVM_PROJECT_SITE) LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT diff --git a/package/llvm-project/lld/Config.in.host b/package/llvm-project/lld/Config.in.host index d015fdd520..3bed364a79 100644 --- a/package/llvm-project/lld/Config.in.host +++ b/package/llvm-project/lld/Config.in.host @@ -1,7 +1,7 @@ config BR2_PACKAGE_HOST_LLD bool "host lld" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm - depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm + depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm help LLD is a linker from the LLVM project that is a drop-in replacement for system linkers, and runs much faster than @@ -10,6 +10,6 @@ config BR2_PACKAGE_HOST_LLD https://lld.llvm.org/ -comment "host lld needs host gcc >= 5" +comment "host lld needs host gcc >= 7" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on !BR2_HOST_GCC_AT_LEAST_5 + depends on !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/llvm-project/lld/lld.hash b/package/llvm-project/lld/lld.hash index 6d56ffcaab..2d2598dbeb 100644 --- a/package/llvm-project/lld/lld.hash +++ b/package/llvm-project/lld/lld.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 017a788cbe1ecc4a949abf10755870519086d058a2e99f438829aef24f0c66ce lld-11.1.0.src.tar.xz +sha256 cd5d0894a74b957ce78d62212c1df0b3876a7297593aaece6b0512285e3b8732 lld-15.0.3.src.tar.xz sha256 f7891568956e34643eb6a0db1462db30820d40d7266e2a78063f2fe233ece5a0 LICENSE.TXT diff --git a/package/llvm-project/lld/lld.mk b/package/llvm-project/lld/lld.mk index 46ec3b13ff..539dd0bd71 100644 --- a/package/llvm-project/lld/lld.mk +++ b/package/llvm-project/lld/lld.mk @@ -10,13 +10,7 @@ LLD_SOURCE = lld-$(LLD_VERSION).src.tar.xz LLD_LICENSE = Apache-2.0 with exceptions LLD_LICENSE_FILES = LICENSE.TXT LLD_SUPPORTS_IN_SOURCE_BUILD = NO -HOST_LLD_DEPENDENCIES = host-llvm - -# LLVM > 9.0 will soon require C++14 support, building llvm <= 9.0 using a -# toolchain using gcc < 5.1 gives an error but actually still works. Setting -# this option makes it still build with gcc >= 4.8. -# https://reviews.llvm.org/D57264 -HOST_LLD_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON +HOST_LLD_DEPENDENCIES = host-llvm host-llvm-libunwind # build as static libs as is done in llvm & clang HOST_LLD_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.mk b/package/llvm-project/llvm-cmake/llvm-cmake.mk index b305797891..33b6ba8339 100644 --- a/package/llvm-project/llvm-cmake/llvm-cmake.mk +++ b/package/llvm-project/llvm-cmake/llvm-cmake.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLVM_CMAKE_VERSION = 15.0.3 +LLVM_CMAKE_VERSION = $(LLVM_PROJECT_VERSION) LLVM_CMAKE_SITE = $(LLVM_PROJECT_SITE) LLVM_CMAKE_SOURCE = cmake-$(LLVM_CMAKE_VERSION).src.tar.xz LLVM_CMAKE_LICENSE = Apache-2.0 with exceptions diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.mk b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk index 825e1beac0..be9965a49a 100644 --- a/package/llvm-project/llvm-libunwind/llvm-libunwind.mk +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLVM_LIBUNWIND_VERSION = 15.0.3 +LLVM_LIBUNWIND_VERSION = $(LLVM_PROJECT_VERSION) LLVM_LIBUNWIND_SITE = $(LLVM_PROJECT_SITE) LLVM_LIBUNWIND_SOURCE = libunwind-$(LLVM_LIBUNWIND_VERSION).src.tar.xz LLVM_LIBUNWIND_LICENSE = Apache-2.0 with exceptions diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk index 747a6f5647..5859ff7cfc 100644 --- a/package/llvm-project/llvm-project.mk +++ b/package/llvm-project/llvm-project.mk @@ -4,8 +4,8 @@ # ################################################################################ -LLVM_PROJECT_VERSION_MAJOR = 11 -LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.0 +LLVM_PROJECT_VERSION_MAJOR = 15 +LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).0.3 LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) include $(sort $(wildcard package/llvm-project/*/*.mk)) diff --git a/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch b/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch deleted file mode 100644 index 62111ca138..0000000000 --- a/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b498303066a63a203d24f739b2d2e0e56dca70d1 Mon Sep 17 00:00:00 2001 -From: serge-sans-paille -Date: Tue, 10 Nov 2020 14:55:25 +0100 -Subject: [PATCH] [nfc] Fix missing include - -[Retrieved (and backported) from: -https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1] -Signed-off-by: Fabrice Fontaine ---- - llvm/utils/benchmark/src/benchmark_register.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/benchmark/src/benchmark_register.h b/utils/benchmark/src/benchmark_register.h -index 0705e219f2fa2..4caa5ad4da079 100644 ---- a/utils/benchmark/src/benchmark_register.h -+++ b/utils/benchmark/src/benchmark_register.h -@@ -1,6 +1,7 @@ - #ifndef BENCHMARK_REGISTER_H - #define BENCHMARK_REGISTER_H - -+#include - #include - - #include "check.h" diff --git a/package/llvm-project/llvm/Config.in b/package/llvm-project/llvm/Config.in index d9d30a5ba5..ebb0fca66a 100644 --- a/package/llvm-project/llvm/Config.in +++ b/package/llvm-project/llvm/Config.in @@ -17,13 +17,13 @@ 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_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring - depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm + depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm help The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. @@ -59,12 +59,12 @@ config BR2_PACKAGE_LLVM_BPF endif -comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" +comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 7, dynamic library, host gcc >= 7" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_HOST_GCC_AT_LEAST_5 + || !BR2_HOST_GCC_AT_LEAST_7 comment "llvm needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS diff --git a/package/llvm-project/llvm/llvm.hash b/package/llvm-project/llvm/llvm.hash index e7f79492de..df9aa88411 100644 --- a/package/llvm-project/llvm/llvm.hash +++ b/package/llvm-project/llvm/llvm.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 ce8508e318a01a63d4e8b3090ab2ded3c598a50258cc49e2625b9120d4c03ea5 llvm-11.1.0.src.tar.xz +sha256 c39aec729662416dcbf0bfe53a9786b34e7d93d02908a0779a2f6d83ad0a4a27 llvm-15.0.3.src.tar.xz sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT diff --git a/package/llvm-project/llvm/llvm.mk b/package/llvm-project/llvm/llvm.mk index 1adad17b16..556a2f8c35 100644 --- a/package/llvm-project/llvm/llvm.mk +++ b/package/llvm-project/llvm/llvm.mk @@ -13,16 +13,16 @@ LLVM_CPE_ID_VENDOR = llvm LLVM_SUPPORTS_IN_SOURCE_BUILD = NO LLVM_INSTALL_STAGING = YES -# LLVM >= 9.0 can use python3 to build. -HOST_LLVM_DEPENDENCIES = host-python3 +HOST_LLVM_DEPENDENCIES = host-python3 host-llvm-cmake LLVM_DEPENDENCIES = host-llvm -# LLVM >= 9.0 will soon require C++14 support, building llvm 8.x using a -# toolchain using gcc < 5.1 gives an error but actually still works. Setting -# this option makes it still build with gcc >= 4.8. -# https://reviews.llvm.org/D57264 -HOST_LLVM_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -LLVM_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON +# Path to cmake modules from host-llvm-cmake +HOST_LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm +LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm + +# Assembly files for x64 in lib/Support/BLAKE3 need to be compiled +# by a C compiler +HOST_LLVM_CONF_OPTS += -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" # Don't build clang libcxx libcxxabi lldb compiler-rt lld polly as llvm subprojects # This flag assumes that projects are checked out side-by-side and not nested @@ -259,7 +259,8 @@ HOST_LLVM_CONF_OPTS += \ -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ -DLLVM_INCLUDE_GO_TESTS=OFF \ - -DLLVM_INCLUDE_TESTS=OFF + -DLLVM_INCLUDE_TESTS=OFF \ + -DLLVM_INCLUDE_BENCHMARKS=OFF LLVM_CONF_OPTS += \ -DLLVM_BUILD_EXAMPLES=OFF \ -DLLVM_BUILD_DOCS=OFF \ @@ -270,7 +271,8 @@ LLVM_CONF_OPTS += \ -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ -DLLVM_INCLUDE_GO_TESTS=OFF \ - -DLLVM_INCLUDE_TESTS=OFF + -DLLVM_INCLUDE_TESTS=OFF \ + -DLLVM_INCLUDE_BENCHMARKS=OFF # Copy llvm-config (host variant) to STAGING_DIR # llvm-config (host variant) returns include and lib directories diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index cae2161aa3..78b53fc248 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -24,21 +24,21 @@ 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_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring - depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm + depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm select BR2_PACKAGE_LLVM -comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" +comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 7, dynamic library, host gcc >= 7" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_HOST_GCC_AT_LEAST_5 + || !BR2_HOST_GCC_AT_LEAST_7 comment "llvm support needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS -- 2.34.3 From yann.morin.1998 at free.fr Fri Feb 10 23:11:29 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 00:11:29 +0100 Subject: [Buildroot] [git commit] package/nodejs: add patch to adjust default NodeJS search path Message-ID: <20230210231402.BA856852D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0de216f95fc28c57cc430f39f011d5f88ead083b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master By default, NodeJS searches global modules in /usr/lib/node, but NPM installs them in /usr/lib/node_modules/. Therefore by default, if one installs modules with BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL, they are not accessible by NodeJS, unless by passing a NODE_PATH=/usr/lib/node_modules/ variable. Since this is not obvious, and it's nicer when things work out of the box, we simply patch NodeJS to look for modules at the right place. See https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package for some discussions on this topic. Signed-off-by: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN --- ...l-modules-cjs-loader.js-adjust-default-pa.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch new file mode 100644 index 0000000000..5b93998e5e --- /dev/null +++ b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch @@ -0,0 +1,36 @@ +From a31425bdfcb5d695ab25c3d295898326784cffec Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 25 Sep 2022 11:10:06 +0200 +Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to + search modules + +NPM installs modules in /usr/lib/node_modules/, but by default NodeJS +searches for them only in /usr/lib/node/. We could also set the +NODE_PATH environment variable, but it is more convienient to have +NodeJS configured by default to find modules where they are installed. + +This issue is discussed at +https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package. + +Signed-off-by: Thomas Petazzoni +--- + lib/internal/modules/cjs/loader.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js +index f1971c40a4..5fe3884156 100644 +--- a/lib/internal/modules/cjs/loader.js ++++ b/lib/internal/modules/cjs/loader.js +@@ -1261,7 +1261,8 @@ Module._initPaths = function() { + path.resolve(process.execPath, '..') : + path.resolve(process.execPath, '..', '..'); + +- const paths = [path.resolve(prefixDir, 'lib', 'node')]; ++ const paths = [path.resolve(prefixDir, 'lib', 'node'), ++ path.resolve(prefixDir, 'lib', 'node_modules')]; + + if (homeDir) { + ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); +-- +2.37.3 + From yann.morin.1998 at free.fr Fri Feb 10 23:13:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 00:13:08 +0100 Subject: [Buildroot] [git commit] support/testing/tests: add NodeJS tests Message-ID: <20230210231402.CC01A852E0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f25b0b6d1dcc8580f6b880eb57872b5c4064b89f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit adds two new test cases: - TestNodeJSBasic which builds a target configuration with just NodeJS enabled, and which runs a very simple NodeJS script on the target. - TestNodeJSModule, which builds a target configuration with NodeJS enabled + the installation of one extra module, which means npm on the host (from host-nodejs) is used, and which runs a very simple NodeJS script on the target that uses this extra module. Having both tests separately allows to validate that both nodejs-only and nodejs+host-nodejs configurations behave correctly, at least in minimal scenarios. Signed-off-by: Thomas Petazzoni Tested-by: Romain Naour Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 ++ .../testing/tests/package/sample_nodejs_basic.js | 3 ++ .../testing/tests/package/sample_nodejs_module.js | 7 +++ support/testing/tests/package/test_nodejs.py | 52 ++++++++++++++++++++++ 4 files changed, 65 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0af1323340..ae698f87c5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2944,11 +2944,14 @@ F: package/weston/ F: support/testing/tests/boot/test_grub.py F: support/testing/tests/boot/test_grub/ F: support/testing/tests/boot/test_syslinux.py +F: support/testing/tests/package/sample_nodejs_basic.js +F: support/testing/tests/package/sample_nodejs_module.js F: support/testing/tests/package/sample_python_augeas.py F: support/testing/tests/package/sample_python_flask.py F: support/testing/tests/package/sample_python_flask_expects_json.py F: support/testing/tests/package/sample_python_git.py F: support/testing/tests/package/sample_python_unittest_xml_reporting.py +F: support/testing/tests/package/test_nodejs.py F: support/testing/tests/package/test_python_augeas.py F: support/testing/tests/package/test_python_flask.py F: support/testing/tests/package/test_python_flask_expects_json.py diff --git a/support/testing/tests/package/sample_nodejs_basic.js b/support/testing/tests/package/sample_nodejs_basic.js new file mode 100644 index 0000000000..7633173c64 --- /dev/null +++ b/support/testing/tests/package/sample_nodejs_basic.js @@ -0,0 +1,3 @@ +var assert = require('assert'); +assert.strictEqual(1, 1); +console.log("Hello World"); diff --git a/support/testing/tests/package/sample_nodejs_module.js b/support/testing/tests/package/sample_nodejs_module.js new file mode 100644 index 0000000000..57aee73408 --- /dev/null +++ b/support/testing/tests/package/sample_nodejs_module.js @@ -0,0 +1,7 @@ +var assert = require('assert'); +var lodash = require('lodash'); +result = lodash.chunk(['a', 'b', 'c', 'd'], 2); +expected = [ [ 'a', 'b' ], [ 'c', 'd' ] ]; +assert.deepStrictEqual(result, expected) + + diff --git a/support/testing/tests/package/test_nodejs.py b/support/testing/tests/package/test_nodejs.py new file mode 100644 index 0000000000..9463c76b72 --- /dev/null +++ b/support/testing/tests/package/test_nodejs.py @@ -0,0 +1,52 @@ +import os + +import infra.basetest + + +class TestNodeJSBasic(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_NODEJS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), + infra.filepath("tests/package/sample_nodejs_basic.js")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + self.assertRunOk("node sample_nodejs_basic.js") + + +class TestNodeJSModule(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_NODEJS=y + BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="lodash" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), + infra.filepath("tests/package/sample_nodejs_module.js")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + self.assertRunOk("node sample_nodejs_module.js") From yann.morin.1998 at free.fr Fri Feb 10 23:18:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 00:18:16 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/nodejs: add patch to adjust default NodeJS search path In-Reply-To: References: <20220925192030.1648496-1-thomas.petazzoni@bootlin.com> Message-ID: <20230210231816.GB2796@scaer> Thomas, All, On 2023-02-08 14:51 +0100, Romain Naour spake thusly: > Le 25/09/2022 ? 21:20, Thomas Petazzoni a ?crit?: > > By default, NodeJS searches global modules in /usr/lib/node, but NPM > > installs them in /usr/lib/node_modules/. Therefore by default, if one > > installs modules with BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL, they are > > not accessible by NodeJS, unless by passing a > > NODE_PATH=/usr/lib/node_modules/ variable. Since this is not obvious, > > and it's nicer when things work out of the box, we simply patch NodeJS > > to look for modules at the right place. > > > > See > > https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package > > for some discussions on this topic. > > Note: The nodejs package has been update to 16.18.1 since your v2 of nodejs series. > > Reviewed-by: Romain Naour I could not find the original patch in my mailbox, so I'll reply here: Applied to master, thanks. Regards, Yann E. MORIN. > Best regards, > Romain > > > > > > Signed-off-by: Thomas Petazzoni > > --- > > Changes since v1: > > - Search for both /usr/lib/node and /usr/lib/node_modules as suggested > > by Yann > > --- > > ...ules-cjs-loader.js-adjust-default-pa.patch | 36 +++++++++++++++++++ > > 1 file changed, 36 insertions(+) > > create mode 100644 package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch > > > > diff --git a/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch > > new file mode 100644 > > index 0000000000..5b93998e5e > > --- /dev/null > > +++ b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch > > @@ -0,0 +1,36 @@ > > +From a31425bdfcb5d695ab25c3d295898326784cffec Mon Sep 17 00:00:00 2001 > > +From: Thomas Petazzoni > > +Date: Sun, 25 Sep 2022 11:10:06 +0200 > > +Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to > > + search modules > > + > > +NPM installs modules in /usr/lib/node_modules/, but by default NodeJS > > +searches for them only in /usr/lib/node/. We could also set the > > +NODE_PATH environment variable, but it is more convienient to have > > +NodeJS configured by default to find modules where they are installed. > > + > > +This issue is discussed at > > +https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package. > > + > > +Signed-off-by: Thomas Petazzoni > > +--- > > + lib/internal/modules/cjs/loader.js | 3 ++- > > + 1 file changed, 2 insertions(+), 1 deletion(-) > > + > > +diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js > > +index f1971c40a4..5fe3884156 100644 > > +--- a/lib/internal/modules/cjs/loader.js > > ++++ b/lib/internal/modules/cjs/loader.js > > +@@ -1261,7 +1261,8 @@ Module._initPaths = function() { > > + path.resolve(process.execPath, '..') : > > + path.resolve(process.execPath, '..', '..'); > > + > > +- const paths = [path.resolve(prefixDir, 'lib', 'node')]; > > ++ const paths = [path.resolve(prefixDir, 'lib', 'node'), > > ++ path.resolve(prefixDir, 'lib', 'node_modules')]; > > + > > + if (homeDir) { > > + ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); > > +-- > > +2.37.3 > > + > > _______________________________________________ > 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 Feb 10 23:18:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 00:18:48 +0100 Subject: [Buildroot] [PATCH v2 2/2] support/testing/tests: add NodeJS tests In-Reply-To: References: <20220925192030.1648496-1-thomas.petazzoni@bootlin.com> <20220925192030.1648496-2-thomas.petazzoni@bootlin.com> Message-ID: <20230210231848.GC2796@scaer> Thomas, All, On 2023-02-08 16:43 +0100, Romain Naour spake thusly: > Le 25/09/2022 ? 21:20, Thomas Petazzoni a ?crit?: > > This commit adds two new test cases: > > > > - TestNodeJSBasic which builds a target configuration with just > > NodeJS enabled, and which runs a very simple NodeJS script on the > > target. > > > > - TestNodeJSModule, which builds a target configuration with NodeJS > > enabled + the installation of one extra module, which means npm on > > the host (from host-nodejs) is used, and which runs a very simple > > NodeJS script on the target that uses this extra module. > > > > Having both tests separately allows to validate that both nodejs-only > > and nodejs+host-nodejs configurations behave correctly, at least in > > minimal scenarios. > > NodeJS takes ages to build Muahahaha! :-) > Tested-by: Romain Naour I could not find the original patch in my mailbox, so I'll reply here: Applied to master, thanks. Regards, Yann E. MORIN. > > Best regards, > Romain > > > > > > Signed-off-by: Thomas Petazzoni > > --- > > DEVELOPERS | 3 ++ > > .../tests/package/sample_nodejs_basic.js | 3 ++ > > .../tests/package/sample_nodejs_module.js | 7 +++ > > support/testing/tests/package/test_nodejs.py | 52 +++++++++++++++++++ > > 4 files changed, 65 insertions(+) > > create mode 100644 support/testing/tests/package/sample_nodejs_basic.js > > create mode 100644 support/testing/tests/package/sample_nodejs_module.js > > create mode 100644 support/testing/tests/package/test_nodejs.py > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index 51d025173a..564149de0f 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -2927,11 +2927,14 @@ F: package/weston/ > > F: support/testing/tests/boot/test_grub.py > > F: support/testing/tests/boot/test_grub/ > > F: support/testing/tests/boot/test_syslinux.py > > +F: support/testing/tests/package/sample_nodejs_basic.js > > +F: support/testing/tests/package/sample_nodejs_module.js > > F: support/testing/tests/package/sample_python_augeas.py > > F: support/testing/tests/package/sample_python_flask.py > > F: support/testing/tests/package/sample_python_flask_expects_json.py > > F: support/testing/tests/package/sample_python_git.py > > F: support/testing/tests/package/sample_python_unittest_xml_reporting.py > > +F: support/testing/tests/package/test_nodejs.py > > F: support/testing/tests/package/test_python_augeas.py > > F: support/testing/tests/package/test_python_flask.py > > F: support/testing/tests/package/test_python_flask_expects_json.py > > diff --git a/support/testing/tests/package/sample_nodejs_basic.js b/support/testing/tests/package/sample_nodejs_basic.js > > new file mode 100644 > > index 0000000000..7633173c64 > > --- /dev/null > > +++ b/support/testing/tests/package/sample_nodejs_basic.js > > @@ -0,0 +1,3 @@ > > +var assert = require('assert'); > > +assert.strictEqual(1, 1); > > +console.log("Hello World"); > > diff --git a/support/testing/tests/package/sample_nodejs_module.js b/support/testing/tests/package/sample_nodejs_module.js > > new file mode 100644 > > index 0000000000..57aee73408 > > --- /dev/null > > +++ b/support/testing/tests/package/sample_nodejs_module.js > > @@ -0,0 +1,7 @@ > > +var assert = require('assert'); > > +var lodash = require('lodash'); > > +result = lodash.chunk(['a', 'b', 'c', 'd'], 2); > > +expected = [ [ 'a', 'b' ], [ 'c', 'd' ] ]; > > +assert.deepStrictEqual(result, expected) > > + > > + > > diff --git a/support/testing/tests/package/test_nodejs.py b/support/testing/tests/package/test_nodejs.py > > new file mode 100644 > > index 0000000000..9463c76b72 > > --- /dev/null > > +++ b/support/testing/tests/package/test_nodejs.py > > @@ -0,0 +1,52 @@ > > +import os > > + > > +import infra.basetest > > + > > + > > +class TestNodeJSBasic(infra.basetest.BRTest): > > + config = \ > > + """ > > + BR2_arm=y > > + BR2_cortex_a9=y > > + BR2_ARM_ENABLE_VFP=y > > + BR2_TOOLCHAIN_EXTERNAL=y > > + BR2_PACKAGE_NODEJS=y > > + BR2_TARGET_ROOTFS_CPIO=y > > + # BR2_TARGET_ROOTFS_TAR is not set > > + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" > > + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" > > + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), > > + infra.filepath("tests/package/sample_nodejs_basic.js")) > > + > > + def test_run(self): > > + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") > > + self.emulator.boot(arch="armv7", > > + kernel="builtin", > > + options=["-initrd", cpio_file]) > > + self.emulator.login() > > + self.assertRunOk("node sample_nodejs_basic.js") > > + > > + > > +class TestNodeJSModule(infra.basetest.BRTest): > > + config = \ > > + """ > > + BR2_arm=y > > + BR2_cortex_a9=y > > + BR2_ARM_ENABLE_VFP=y > > + BR2_TOOLCHAIN_EXTERNAL=y > > + BR2_PACKAGE_NODEJS=y > > + BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="lodash" > > + BR2_TARGET_ROOTFS_CPIO=y > > + # BR2_TARGET_ROOTFS_TAR is not set > > + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" > > + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" > > + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), > > + infra.filepath("tests/package/sample_nodejs_module.js")) > > + > > + def test_run(self): > > + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") > > + self.emulator.boot(arch="armv7", > > + kernel="builtin", > > + options=["-initrd", cpio_file]) > > + self.emulator.login() > > + self.assertRunOk("node sample_nodejs_module.js") > > _______________________________________________ > 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 nodeax at gmail.com Fri Feb 10 23:28:16 2023 From: nodeax at gmail.com (Akshay Bhat) Date: Fri, 10 Feb 2023 15:28:16 -0800 Subject: [Buildroot] [PATCH 1/1] package/libiberty: bump version to 2.38 In-Reply-To: <20230210231315.17b367e6@windsurf> References: <20230210180222.88328-1-nodeax@gmail.com> <20230210231315.17b367e6@windsurf> Message-ID: Hi Thomas, On Fri, Feb 10, 2023 at 2:13 PM Thomas Petazzoni wrote: > Thanks a lot for the fix. Is this fixing > http://autobuild.buildroot.net/results/eaf/eaf23ea0c8d7803e3768da40b7070d04801cd36f/build-end.log > perhaps? Yes, that is the issue being fixed! In my case, I enabled the partial initramfs feature. This resulted in the below dependencies: host-dracut -> host-prelink-cross -> host-libiberty If host-libiberty gets built before host-binutils and the versions are different (i.e. functions don't match up) then it results in the above error. > > One issue that I see is that the binutils version is configurable: we > support 2.37, 2.38, 2.39 and the special ARC version. Do we need to > make the libiberty version match with that? > FWIW, the 2.38 version of libiberty does not result in build errors with either 2.37 or 2.39 version of binutils. Happened to get lucky because the libiberty related function defs are largely same-ish between those versions. Obviously this can break with the next version of binutils, so a long term fix is needed. Not sure about the special ARC version, I did not test that case. > Also, see the conversation starting at: > > https://lore.kernel.org/buildroot/3f3d266c-2f21-197c-29b7-fff3e230e97a at smile.fr/ > Thanks, hadn't seen that post before sending the patch and it looks like this package has had some history! I agree, whatever decision comes from that discussion should be the long term fix. Thanks, Akshay From romain.naour at gmail.com Fri Feb 10 23:36:58 2023 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 11 Feb 2023 00:36:58 +0100 Subject: [Buildroot] [PATCH] package/busybox: disable stack optimization for i386 target Message-ID: <20230210233658.3763549-1-romain.naour@gmail.com> The toolchain-builder project reported an issue with Qemu 7.2.0 for x86-core2--glibc--bleeding-edge toolchain [1]: Run /sbin/init as init process random: fast init done EXT4-fs (vda): warning: mounting unchecked fs, running e2fsck is recommended EXT4-fs (vda): re-mounted. Opts: (null). Quota mode: disabled. Starting syslogd: OK traps: syslogd[52] general protection fault ip:b7e21465 sp:bfe59e6c error:0 in libc.so.6[b7d9b000+123000] Starting klogd: OK traps: klogd[56] general protection fault ip:b7e94465 sp:bf8f069c error:0 in libc.so.6[b7e0e000+123000] Running sysctl: traps: logger[62] general protection fault ip:b7e48b6c sp:bfd7d194 error:0 in libc.so.6[b7e05000+123000] Segmentation fault traps: logger[64] general protection fault ip:b7dd3b6c sp:bf9b8604 error:0 in libc.so.6[b7d90000+123000] Segmentation fault (Followed by a kernel panic.) Testing with the pevious Qemu release (7.1.0) allows to boot the system without any problem. Building qemu sources between 7.1.0 and 7.2.0 allows to identify the first "bad" commit [2] and report to the Qemu project [3]. Thanks to Qemu maintainers review, several issues was noticed: "The default i386 busybox build config does not respect glibc's requirements around stack alignment (see [4] for previous discussions and a workaround)." Disabling CONFIG_STACK_OPTIMIZATION_386 option (as suggested in the Gentoo bug report) fixed the issue! This option has been added and enabled by default in buxybox 1_29_0, so it was used since then the for Buildroot's qemu defconfig. Note: The x86-i686--glibc--bleeding-edge (generic x86) doesn't trigger the issue with CONFIG_STACK_OPTIMIZATION_386 enabled. Fixes: https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 [1] https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 [2] https://gitlab.com/qemu-project/qemu/-/commit/958e1dd1300f37f18b2161dfb4eb806fc8c19b44 [3] https://gitlab.com/qemu-project/qemu/-/issues/1478 [4] https://bugs.gentoo.org/725674 Signed-off-by: Romain Naour --- package/busybox/busybox-minimal.config | 2 +- package/busybox/busybox.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 1fb4e39e21..1e7ad1d357 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -53,7 +53,7 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set -CONFIG_STACK_OPTIMIZATION_386=y +# CONFIG_STACK_OPTIMIZATION_386 is not set CONFIG_STATIC_LIBGCC=y # diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 4826fb8242..6e8bd2799d 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -53,7 +53,7 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set -CONFIG_STACK_OPTIMIZATION_386=y +# CONFIG_STACK_OPTIMIZATION_386 is not set CONFIG_STATIC_LIBGCC=y # -- 2.34.3 From thomas.petazzoni at bootlin.com Sat Feb 11 06:39:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 11 Feb 2023 06:39:10 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-10 Message-ID: <20230211063917.ACD0041730@smtp2.osuosl.org> Hello, Autobuild statistics for 2023-02-10 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 1 | 2 | 0 | 3 | 2022.11.x | 21 | 18 | 0 | 39 | master | 169 | 190 | 2 | 361 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 12 elfutils-0.186 | 8 host-go-1.19.5 | 8 unknown | 8 libsolv-0.7.22 | 7 linux-6.1.9 | 7 aubio-0.4.9 | 5 busybox-1.36.0 | 5 host-pahole-1.24 | 5 host-binutils-2.38 | 4 libglib2-2.72.3 | 4 python-bcrypt-4.0.1 | 4 python-cryptography-39.0.0 | 4 fluent-bit-2.0.8 | 3 gerbera-1.10.0 | 3 glibc-2.36-81-g4f4d7a13edfd... | 3 host-binutils-2.39 | 3 ltp-testsuite-20220930 | 3 zabbix-5.4.9 | 3 dropbear-2022.83 | 2 fs/ubifs/ubifs.mk:49: /home... | 2 gobject-introspection | 2 host-rust-1.67.0 | 2 libgcrypt-1.10.1 | 2 libglvnd-1.4.0 | 2 libgpg-error-1.46 | 2 norm-1.5.8 | 2 perl-5.36.0 | 2 php-8.2.1 | 2 ssdp-responder-1.9 | 2 systemd-252.4 | 2 ace-7.0.6 | 1 alsa-lib-1.2.8 | 1 assimp-5.2.5 | 1 binutils-arc-2020.09-release | 1 boost-1.80.0 | 1 boot-wrapper-aarch64-8d5a76... | 1 brltty-6.5 | 1 ctorrent-dnh3.3.2 | 1 dmalloc-5.6.5 | 1 dust-0.8.1 | 1 edk2-edk2-stable202208 | 1 fftw-quad-3.3.8 | 1 fontconfig-2.13.1 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/jffs2/jffs2.mk:71: /home... | 1 fs/romfs/romfs.mk:32: /home... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 glibmm-2.68.2 | 1 gqrx-2.14.4 | 1 host-binutils-2.37 | 1 host-gdb-arc-2020.09-releas... | 1 host-sentry-cli-2.8.0 | 1 jack2-1.9.21 | 1 janet-1.26.0 | 1 json-c-0.16 | 1 kexec-2.0.25 | 1 libcap-ng-0.8.3 | 1 libnetfilter_log-1.0.2 | 1 libnss-3.87 | 1 linux-5.10.162-cip24 | 1 linux-fusion-9.0.3 | 1 modem-manager-1.20.4 | 1 modsecurity2-2.9.7 | 1 musl-1.2.3 | 1 netsurf-3.10 | 1 olsr-0.9.8 | 1 open-iscsi-2.1.8 | 1 openblas-0.3.21 | 1 opencv3-3.4.17 | 1 package/multipath-tools/mul... | 1 pcre2-10.42 | 1 php-xdebug-3.0.4 | 1 proxychains-ng-4.16 | 1 pv-1.6.20 | 1 python-numpy-1.23.5 | 1 python-pyicu-2.10.2 | 1 quickjs-2021-03-27 | 1 ramspeed-2.6.0 | 1 rtl_433-22.11 | 1 ti-k3-r5-loader-2022.10 | 1 toolchain-external-codescap... | 1 uccp420wlan-6.9.1 | 1 uclibc-ng-test-6790eafe897b... | 1 ulog-0389d243352255f6182326... | 1 uqmi-0a19b5b77140465c29e2af... | 1 wolfssl-5.5.3 | 1 wtfutil-0.41.0 | 1 xerces-3.2.4 | 1 zfs-2.1.7 | 1 zxing-cpp-1.4.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblaze | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/69c56f97b60875af15a0f1f3d427fea516d0f0c9 | or1k | alsa-lib-1.2.8 | NOK | http://autobuild.buildroot.net/results/d78262854daf4f9c0ec2a95aa8b51ae3914fa579 | mips | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/2036eb2e2de57685db039f7f15acdf92eaaa0f83 | ORPH x86_64 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/b63aff4f78071417a8e3d0f9521ba0958aceee11 | xtensa | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/d7ce4b18815c29a81d40e9a8db7693b8f2724ece | s390x | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/fcd36dfff65fb4785c371768daa0d1aa7423cb34 | mips64el | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/2960045d52a094678bdde1a5a389d51609d10679 | armeb | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/12155d15370c23478f3e5e92c0858509ab2352d0 | arceb | binutils-arc-2020.09-release | NOK | http://autobuild.buildroot.net/results/20b8153f5bfb82e39452b17ea5ac595bdcfbf295 | arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/23ed4993a7b8e572bf3336baed775812d205b27b | aarch64 | boot-wrapper-aarch64-8d5a76... | NOK | http://autobuild.buildroot.net/results/44287ccc8cc9767704642919e6d928d1f57b436d | microblazeel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/8eeee331a5359e36e0c14708e1471e18a413dfb6 | mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/599e1e07364ff3512f1b0746fc439cf250163933 | ORPH mipsel | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/4653420db351d716b4410fdba3c99ac89bbd395f | ORPH arm | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/4840a3570301d11b9d6f80c18ef94781bca10732 | ORPH mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/1fcaae98548d1d135bfdc240842f9bbe9bb7d9c0 | ORPH mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/32f933867f71aa5ffdb1309ab720f267715e42dd | ORPH riscv64 | ctorrent-dnh3.3.2 | NOK | http://autobuild.buildroot.net/results/d9c568415db17114bcded0c1e866ad2a84a7e619 | i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/b43b535f04ca5c8893e1da6c72acd90dc49d9aa7 | ORPH riscv64 | dropbear-2022.83 | NOK | http://autobuild.buildroot.net/results/9fec37c57abf7e0a1fc55c7bf58f5dc955352b00 | riscv64 | dropbear-2022.83 | NOK | http://autobuild.buildroot.net/results/09cf3927d18ae4fa541977d7754f9685f508dcb4 | sparc64 | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/d0c40c0e65a70b8826e53f39f8881c5bc5521085 | ORPH x86_64 | edk2-edk2-stable202208 | NOK | http://autobuild.buildroot.net/results/e1e255c9f9d030925a3c1f83dcd3f88b83883e31 | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/8831d1e320d42541ae64beb7643b6f4a440333df | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/d89d9141670f07eb2363a5d998ce946b8eda3094 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3e92a1334d195c588c55b0459b5caa65e4087755 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/904e02fb832a10acd14fb502fd087540fd33f39d | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/86fe0f257e4d736f9f8e756ed747c1bce6b56aea | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3f519075d1b56fac11e4f34f298a1bdb045c896f | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/058669a230c550dc3d0332a2535b2163006b22f4 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/7217faa42917b71420a995869dc700498da590c7 | ORPH powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/a7b33d49b83c1fddc7a17d323f4d06a965de1b0d | ORPH s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/ce7302f077d51da25e3df1f02be76ab779c952d8 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/836e46e782eececed72a21235ce1dd7b5183a6f2 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/a15b2515fc8653aca1d8df7a62097fd23128adba | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/17095094df24655f2d427fdfedf2be4aeb449d0b | ORPH mips | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/ca69ce0923a5554fbe694817635f102b819ef57c | arm | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/30c66e57f4fbd1fe426896f4e795402281923106 | powerpc | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/0dc8fd412a2c2e063ff8ecdc310a177eced912a1 | mipsel | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/966b5bf54a62c007d0b58048dcb9580c5e49108a | armeb | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/e09045a05312d6eadfd6f3e589a4096ebb3ece70 | x86_64 | fs/jffs2/jffs2.mk:71: /home... | NOK | http://autobuild.buildroot.net/results/0445b0b159919ddf25ccda2cf04c0aab6033721c | powerpc64le | fs/romfs/romfs.mk:32: /home... | NOK | http://autobuild.buildroot.net/results/ba1c74a76fd0bcca47f46f81951765ea3ddcd92b | aarch64_be | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/0bd3530c1f1eb315493ea56a868e40b7c6506047 | riscv32 | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/ca6b49c6360c8c566b381ac45db72b404cc3faf7 | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/eef3275b37f02b136d9335dba25d4fd0b9707617 | powerpc64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/12408df70811689194d2c7783ed1ede0c8bfd4fd | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/233022227907bfd988312ab968bbfb63d0782b7a | microblaze | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/8763f44444ab4f803bfe7829adf013b62e952c6d | aarch64_be | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/9d22bfc2a116c00a61c9208a9a6fdd2921d841ee | i686 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/3c816d2b7d6d209222ee33fcd546c08a57c6707f | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/f0afd0264318b9b2c97de4b002c2ba6fc10468fe | powerpc64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/67c878dfda4a109acb96daac22086fe451a2a540 | sparc64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/f541f5b859b4744c07373e50f0eb3d60046bdde8 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/432f7113f5695f9cef10301cb8336f761006af70 | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b980b2bfdbb2c07baf9c1a528d6d78193757fb15 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/cfb2ad76dc1c977ad2ce10d310577e149905e5ff | or1k | glibmm-2.68.2 | NOK | http://autobuild.buildroot.net/results/06353e89aff157b86978ff92dee5546b94cca364 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/a4bf6907ce8368fc50d06d6b1bcf1ae372a1ee8e | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/95ac2510e098fcd1b678dc56f955b8cf656ea048 | s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/40b6a3283361171b494a4e61e3575a4981328854 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/dcd2ce692b66ff1b744fdd271e336ddad35f8fe1 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/56de6b95ac1d085c743cac14a714dd308370c897 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5d70bfe310b9980b64687739eae12563d633a690 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/a4b276935182ec3ad5790b8b7bfa1d71d72146b2 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/cd57cadbaffc34552cbe77e3b41b81a577ed5551 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d00fe47cba797af5c772c60cc5a16b9e343f92de | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3a5b8afca39df46f72565fb84614926a091b6050 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5d8eae466f39f77d33f0a893e7b568f434b15148 | ORPH mips | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/82c865bbca8ea6da68bd466d863bff7d46f4b54f | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/e8d93c273779d05954de6a5f4e5a5ac99cae1d9a | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/a264ad20b70c13a3edcfb20da7fe85b1c755640c | ORPH or1k | gqrx-2.14.4 | NOK | http://autobuild.buildroot.net/results/862d1f33c183464ec226994b3754e223f4d89486 | microblaze | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/d5df12a9deb65395b34c242168723e40908984bd | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/21bb5ea5f1b2c83837ecc319bb00dae72a02564b | armeb | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/5258f31067dc891a8d9d9a34893bcb90283b448a | powerpc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/eaf23ea0c8d7803e3768da40b7070d04801cd36f | xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/3994150b82678476b7d7315cc3e069da1c9b1756 | microblazeel | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/def9284e3812a83ff6cc0f8724a6452b77fa1706 | arceb | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/5553103f634e585d8f12d4286731f366fc78db33 | mips | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/4e19b53e181563e8f39ffef24c5dadbbe90b9143 | arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/37593a4d773a2db59b4ad14ff3e5106b01b39bb9 | ORPH aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/c578920d6c707aef6a6ecfc0c0969ab3c0129e45 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/260f4e2579976a05ed6520eb11b9b768dd111995 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/057724d45c5c203b1e1942c0f1bf6f089800dea4 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/60bcb2ef69b3d05a8fdde3d704438a88afad60c3 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/cafbbd095bc4fee66f604de40dfa946a93d05542 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/14d1faa36cb77d16cb62e8f4e11d3d38b7faa828 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/2a433d5c042490c94827e66e7c68e71069248243 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/a2e1b730e9657c9bb00c25b56b0f87d2b37dcb6b | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ca4be5ae25917030e8f9eb2e2d955b822b8eff3e | mipsel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/dfad059935c4fbf9e481213293edb4f4a077c356 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/b5bf0595e4ffe3375c1dfd837febbd4d99052042 | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8dca3dc4a4e7a1242b29f1d9d6761654171c04c7 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/abc6e62836061784014233711ef5770008b03720 | mips | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/219c0f547939f67d8554c3a99b21220572a4f48d | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/6d6bbb624c4f8cb9ef0929254bc4ee81d3d66f99 | arc | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/97568843e87989cca4efbdab157fbc8f6cf95f56 | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/e8af6668a74297049718afc3e9b575828cd22654 | riscv64 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/e16a059a14756b75dcac154976325da8b610e870 | riscv64 | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/f2f45280eb42aad317c5e63c586a0bbbead11509 | arm | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/60c8e0ff1ca3477a404e1bdc56cfdcb40f1f8d94 | ORPH riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/50909cf4ab913d3d388ede498dcedd0f0ba50e17 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/54385117cac35ee4aae677fc4532b6f3512f2239 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/46a879227ecb6ecbe379ede5dce4183522eb004e | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/b06f0c9b042cb3d7c1c06bdf136d600725c6f3e8 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/a96047f0fa2d58d344b27547c769d68b90abed1e | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/8d61a9df582fbf5b81754565788bfc38bdcdecc2 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/fa10a96680ab62ea075e2b92fcc0cb8b7b3c26fd | m68k | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/eb53a7d1664e14ce34ea955c401ff89aabe3a888 | ORPH xtensa | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/beeca8f8ef7c8ffc1f6c52ed61806314450fbc46 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/9c05dc2d09e73f88a05f6e3281bbfd725f4401f7 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/a24feaabeeb1249a48f22212f10b871985c27752 | ORPH powerpc64 | libnetfilter_log-1.0.2 | NOK | http://autobuild.buildroot.net/results/51d4130b121218481a6aa48b121b5ac9d1610514 | ORPH sh4 | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/632833c0adcbd8b478e0488b025a7cb22eb3297e | sparc64 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/66ae215a5c956b75bb8a1a6ecf72a3dde34477bd | aarch64_be | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/0c469d08b4ccfcfff734bc45dfb6bdfcde29f2dd | sparc | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/55f5ba0599d7697655097ddb05d0f1ebdcab1554 | mips | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/e7d017d70b54923cecb991f97d238345e548e4e0 | i686 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/217447a5bd99f6361878830e7a3aae8d6544fd1c | arm | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/b4901401f0c214cae6868536c15933282368b6d8 | mips64el | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/5d853985c2288dee4ae41645302082f12024eb63 | mips | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/a495c8324daeab27811c19ab11cf431e8bf2ae86 | ORPH m68k | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/070a33fe9c1a851e6634bafca3799632b5716af5 | ORPH mips64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/360230507a62193c4baf7aafea97e07fd07ee86a | ORPH mips64el | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/c2cf7b1093cde39c2f2239ef73a2ae22da746a83 | ORPH mips | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/150436670a1c88c5d00a5e7c119721682d558e99 | ORPH armeb | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/35066f883cad10b3eb44c9139ceb067a50366540 | ORPH m68k | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/466586b45f6841b2066a1030f1eaf816f4354f9c | ORPH nios2 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/dd1d827b8e45b7c7be3334b5bd9faa3deb50d212 | ORPH powerpc64 | linux-fusion-9.0.3 | NOK | http://autobuild.buildroot.net/results/00e107f80e4a2f5468e822382ff18635e6f9b795 | ORPH x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/eec2b7f982a1fb3cd286cdad3983b4054b82872d | x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/600a9b5572bd1d76ff5c5870c0217ff80f05fdba | arm | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/5adfde2ca7241595448093a39fd7f20fa7018570 | arc | modem-manager-1.20.4 | NOK | http://autobuild.buildroot.net/results/4cc9b176a69730c4c965cfdcdb8c6ef03b6ecbaa | powerpc | modsecurity2-2.9.7 | NOK | http://autobuild.buildroot.net/results/7db14c4c2b0c1a9fcdf3171c4f4fc7a336517322 | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/711fedf87e68e8c30c3de08b1e97c9dd8bc9678d | armeb | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/a0a27d6a16cc8dbf56137696224ea039c94d28e1 | xtensa | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/9505050131fa3606cbe46db4b59e74a9fea99d36 | ORPH powerpc64le | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/030c479833c078a925bb52cca59b18475679861f | ORPH aarch64_be | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/b9fdbb5b956085151c9138f559640198226368ed | ORPH mips64 | open-iscsi-2.1.8 | NOK | http://autobuild.buildroot.net/results/6383536f7c320f305f8ebc32298e2f4f8651762c | mips64el | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/620df7cbc46fed31dea544be38ec67053803705c | ORPH x86_64 | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/7136c0dbedf4b4d4a1af8ce1b75743f8d5af8120 | aarch64_be | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/34f93139fc5924c42a64c1e65260223ebd0933c4 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/3522b9094096b8f32b81c4129988497183005b6c | ORPH nios2 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/e1099a9662610d935ef75378dfeffdaea4bad666 | arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/00ec006d8c1d7985fad0b3bfb9755c32094fc744 | sh4 | php-8.2.1 | NOK | http://autobuild.buildroot.net/results/aa10c677d366046d2ce2f22cb45288b3cbf73d22 | microblaze | php-8.2.1 | NOK | http://autobuild.buildroot.net/results/50e451ca066583686c39f678d1ceee31b33bb634 | powerpc64le | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/092a6d388fc6801c109eb46635e8df80d06a803e | aarch64_be | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/a5c2955a51b67467e8a2771aa5d1ba64233d9882 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/0301c4e3164961d15d1bd609fff8b81997288d94 | ORPH mips | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/f2a9b1e87fd9368a674ddaeb44549f7629b5911b | arm | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/6d0f8a747b7a4018651862614e761dbc766a0db3 | armeb | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/e0355e37c0e34ba0f7b63d47114b6fdd42f11ad5 | mips | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/349fdbf4517ac64631e01c711d85a794059c2157 | powerpc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/36eef44ae548e537204e180c26b0c83a426809c0 | s390x | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/4ca3a4cd4fcfb5f0bae1260c947c30b41eca92fd | powerpc64le | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/b1cd417f47fe1f194d34536ed502c8973ef5635b | i686 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/1c572bf05388f234bae277d30bb488869b2b2796 | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/1a878752baa7af34c5f8bf782c75989958a3613e | microblaze | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/bf00db2a1c4ce526ec86c18533f5888774ede112 | sh4a | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/80a874b2a663751a8d632e5ef3bb76792d354133 | sh4aeb | ramspeed-2.6.0 | NOK | http://autobuild.buildroot.net/results/861f3e01d053b5eddedfdd31813f99f2a2a0e7d4 | ORPH sparc | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/fbd3e4d4ed6336c381b1491f61ecb7242adabbcf | aarch64_be | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/ea5246533bf010688e22d4fd84ed34d6f5fda499 | aarch64_be | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/00cb736e091c3678d7ea3b94ae6ed65cac216e09 | powerpc64le | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/cc1c91f7e83e9232b54a17bfe667f0a518b1cbec | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/489e65e133e6bcb037b5ddb5c3863bae1811f84a | aarch64 | ti-k3-r5-loader-2022.10 | NOK | http://autobuild.buildroot.net/results/a0ef96a016f0d7c241c27dea4ebfe82fa6537793 | mipsel | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/4136ffe3872a6c5321ae47569d99b6f664636d4c | ORPH aarch64_be | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/470437580a67dca024745569f7dee76e56293b2f | ORPH mips64el | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/70ec03368b30762e2ee99adf96403db8e8646f66 | or1k | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/2d4533b2a72fc8f42768189d1f8a2e35355218ee | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/b770f8d578420684a15bde55a46fb8d12d996917 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/313a804fada71f1a3fff8ef1600791c3a8fec637 | i586 | unknown | NOK | http://autobuild.buildroot.net/results/e6895d64aa8a00b6c1893c3c438a9934be8997a4 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/e1b4efbd1278e4ca2871f4669cea90dbcb29b8eb | sh4a | unknown | NOK | http://autobuild.buildroot.net/results/b8d04d62c97c1bbaadf0d244d0c1627efc3d0db9 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/101b6ed3c8d724066cab1cc961d930aac4c9d787 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/dfd34ac012415dba0d0c3dd1c2d40535324efa65 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/dd6d71cb91df5495b873ceccec43a89977e66291 | nios2 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/65e4b5c6dc028a4ab92d6966bbda3b6d2a164d4c | ORPH mipsel | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/fb69a79d6431282978c1e56da501dce9ffb2b11d | s390x | wtfutil-0.41.0 | NOK | http://autobuild.buildroot.net/results/29bb789c109b4debdf2d585a69ec489132f34d86 | or1k | xerces-3.2.4 | NOK | http://autobuild.buildroot.net/results/c62856a5eeb34714f26235b2d6f8adc4ea612686 | ORPH nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/4da3c4297cacd1d44c20995bcb35d51bb903683c | mipsel | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/8f55506028ca3794a1a8ee1a4b8d2b766b4e5c09 | mipsel | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/1e26212c1b4b4882c30f90c76172688d6c1156f8 | powerpc64le | zfs-2.1.7 | NOK | http://autobuild.buildroot.net/results/979bd7e58f897632707c7b538aa593532b36836e | powerpc | zxing-cpp-1.4.0 | NOK | http://autobuild.buildroot.net/results/f01f4242773258137c129700336fbabef85768d7 | Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 2 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/abfedd152b767ff0067325f9158a618fb464c2a3 | powerpc | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/13da462684437dba39e23cf1452034e4fe9ba1a7 | Classification of failures by reason for 2022.11.x -------------------------------------------------- janus-gateway-1.0.3 | 4 xz-5.2.7 | 2 elfutils-0.186 | 1 freeradius-client-1.1.7 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fwts-22.09.00 | 1 gerbera-1.10.0 | 1 host-binutils-2.38 | 1 host-pahole-1.24 | 1 igh-ethercat-2e2cef61318953... | 1 mutt-2.2.9 | 1 python-numpy-1.23.4 | 1 zabbix-5.4.9 | 1 zeek-4.1.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/60ca7b46b24113adf6a75b0d40a8477a576d9b39 | ORPH or1k | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/8c231a13508cddb6de41c94c00f452b60103a03f | powerpc64le | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/67b1e5c3cf357f12a93d0b89bfce7c0c0481dd2e | arm | fwts-22.09.00 | NOK | http://autobuild.buildroot.net/results/037053b71d9eff48a74974c02a1b3a6b63555c66 | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/a98fe77399518b49f3e5f7fa51a1331b58707347 | mips64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/59739a27a0043911bfd8a801831f9e8397e76052 | xtensa | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2e36dd9d017b3cefca2544a13570ed725327c65f | i686 | igh-ethercat-2e2cef61318953... | NOK | http://autobuild.buildroot.net/results/818cd81d81574c3c7169abc44c803cc69d10b8a7 | microblaze | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/b7488860e6de3e5145665422afac4db1ea27838f | powerpc64le | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/ecd11e31667861211c3bf76f1155ab1653eb9f5c | mips64el | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/9f2d6297851bc892addd4f2114e7a6066b06b20c | powerpc64le | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/bc96238427cba2669ba188014c71470545329824 | mips64 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/f64b8783acdc67e0334a0d26d2720c41326997dd | x86_64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/ae4830b16e033583f2db20a7607bc58ce08bc17a | microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/078362f36e5f3caa76d9a2b2b790cb726afeca4f | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/34689370c80d195efc66a5dce501616a10b4ea04 | ORPH or1k | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/1986532600b8e6b65abef3ca17d2efe88d2bc425 | sh4 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/911955c2e59f81bcf7f923aa91e5c5ac45d929f8 | Gitlab CI results for 2023-02-10 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637586 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637587 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637588 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637589 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637590 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637591 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637592 | avenger96 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637593 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637594 | bananapi_m2_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637595 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637597 | ORPH beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637598 | beaglebone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637599 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637600 | beagleboneai | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637601 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637602 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637603 | broadcom_northstar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637604 | canaan_kd233 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637606 | chromebook_elm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637608 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637609 | ci20 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637611 | cubieboard2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637613 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637615 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637619 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637621 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637623 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637625 | freescale_imx28evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637627 | freescale_imx6dlsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637629 | freescale_imx6dlsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637632 | freescale_imx6qsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637634 | freescale_imx6qsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637636 | freescale_imx6sxsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637637 | freescale_imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637638 | freescale_imx7dsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637639 | freescale_imx8mmevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637640 | freescale_imx8mnevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637641 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637642 | freescale_imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637643 | freescale_imx8qmmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637644 | freescale_imx8qxpmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637645 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637646 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637647 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637648 | friendlyarm_nanopi_r2s | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637649 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637650 | globalscale_espressobin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637651 | grinn_chiliboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637652 | grinn_liteboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637653 | hifive_unleashed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637654 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637655 | imx6-sabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637656 | imx6-sabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637657 | imx6-sabresd_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637658 | imx6slevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637660 | imx6sx-sdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637661 | imx6ulevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637665 | imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637666 | imx6ulpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637667 | imx7d-sdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637670 | imx7dpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637672 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637674 | imx8mn_bsh_smm_s2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637676 | imx8mn_bsh_smm_s2_pro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637677 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637679 | imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637680 | kontron_bl_imx8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637683 | kontron_pitx_imx8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637685 | kontron_smarc_sal28 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637687 | lafrite | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637688 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637689 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637691 | linksprite_pcduino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637692 | ls1028ardb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637695 | mender_x86_64_efi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637696 | ORPH microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637698 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637701 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637702 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637704 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637705 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637707 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637710 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637711 | minnowboard_max | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637713 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637714 | mx51evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637716 | mx53loco | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637717 | mx6cubox | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637718 | mx6sx_udoo_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637719 | mx6udoo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637720 | nexbox_a95x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637723 | nezha | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637725 | nitrogen6sx | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637726 | nitrogen6x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637727 | nitrogen7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637728 | nitrogen8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637729 | nitrogen8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637730 | nitrogen8mn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637731 | nitrogen8mp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637732 | octavo_osd32mp1_brk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637733 | octavo_osd32mp1_red | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637734 | odroidc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637735 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637736 | olimex_a10_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637737 | olimex_a13_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637738 | olimex_a20_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637742 | olimex_a20_olinuxino_lime2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637741 | olimex_a20_olinuxino_micro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637745 | olimex_a33_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637747 | olimex_a64_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637748 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637749 | olimex_stmp157_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637750 | olpc_xo1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637752 | olpc_xo175 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637751 | openblocks_a6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637753 | orangepi_lite | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637755 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637754 | orangepi_one | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637756 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637757 | orangepi_pc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637758 | orangepi_pc_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637759 | orangepi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637760 | orangepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637761 | orangepi_zero_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637763 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637762 | pandaboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637764 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637765 | pc_x86_64_efi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637766 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637767 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637768 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637769 | qemu_aarch64_ebbr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637770 | qemu_aarch64_sbsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637771 | qemu_aarch64_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637772 | qemu_arm_ebbr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637773 | qemu_arm_versatile | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637774 | qemu_arm_vexpress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637775 | qemu_arm_vexpress_tz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637776 | qemu_m68k_mcf5208 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637777 | qemu_m68k_q800 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637778 | qemu_microblazebe_mmu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637779 | qemu_microblazeel_mmu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637780 | qemu_mips32r2_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637781 | qemu_mips32r2el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637782 | qemu_mips32r6_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637785 | qemu_mips32r6el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637786 | qemu_mips64_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637787 | qemu_mips64el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637788 | qemu_mips64r6_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637789 | qemu_mips64r6el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637790 | qemu_nios2_10m50 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637792 | qemu_or1k | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637793 | qemu_ppc64_e5500 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637794 | qemu_ppc64_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637795 | qemu_ppc64le_powernv8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637796 | qemu_ppc64le_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637797 | qemu_ppc_bamboo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637798 | qemu_ppc_e500mc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637799 | qemu_ppc_g3beige | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637800 | qemu_ppc_mac99 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637801 | qemu_ppc_mpc8544ds | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637802 | qemu_riscv32_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637803 | qemu_riscv64_nommu_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637804 | qemu_riscv64_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637805 | qemu_s390x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637806 | qemu_sh4_r2d | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637807 | qemu_sh4eb_r2d | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637808 | qemu_sparc64_sun4u | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637809 | qemu_sparc_ss10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637810 | qemu_x86 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637812 | qemu_x86_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637811 | qemu_xtensa_lx60 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637813 | qemu_xtensa_lx60_nommu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637814 | raspberrypi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637824 | ORPH raspberrypi0 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637815 | ORPH raspberrypi0w | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637816 | ORPH raspberrypi2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637817 | ORPH raspberrypi3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637819 | raspberrypi3_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637818 | ORPH raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637820 | ORPH raspberrypi4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637823 | ORPH raspberrypi4_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637821 | ORPH raspberrypicm4io | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637826 | ORPH raspberrypicm4io_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637825 | ORPH raspberrypizero2w | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637827 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637828 | rock64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637829 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637830 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637831 | roseapplepi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637832 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637833 | sheevaplug | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637834 | sipeed_lichee_rv | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637835 | sipeed_lichee_rv_dock | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637836 | sipeed_maix_bit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637837 | sipeed_maix_bit_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637838 | sipeed_maix_dock | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637840 | sipeed_maix_dock_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637841 | sipeed_maix_go | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637842 | sipeed_maix_go_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637843 | sipeed_maixduino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637844 | sipeed_maixduino_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637845 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637846 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637847 | snps_archs38_haps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637848 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637849 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637850 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637851 | solidrun_clearfog_gt_8k | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637852 | solidrun_macchiatobin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637853 | ORPH spike_riscv64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637855 | stm32f429_disco_xip | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637856 | stm32f469_disco_sd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637858 | stm32f469_disco_xip | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637861 | stm32mp157a_dk1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637862 | stm32mp157c_dk2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637863 | stm32mp157c_odyssey | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637864 | terasic_de10nano_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637865 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637866 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637867 | ts5500 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637868 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637869 | uevm5432 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637870 | versal_vck190 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637871 | visionfive | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637873 | visionfive2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637872 | wandboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637874 | warp7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637875 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637876 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637877 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637878 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637879 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637880 | zynqmp_kria_kv260 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637881 | zynqmp_zcu102 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637882 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637883 | -- http://autobuild.buildroot.net From romain.naour at smile.fr Sat Feb 11 09:33:04 2023 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 11 Feb 2023 10:33:04 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used In-Reply-To: <20230208192425.GA2677@scaer> References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208192425.GA2677@scaer> Message-ID: Hello, Le 08/02/2023 ? 20:24, Yann E. MORIN a ?crit?: > Peter, All, > > On 2023-02-08 19:19 +0100, Peter Korsgaard spake thusly: >> Waf requires that the version of the waf script matches the version of >> waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as >> otherwise waf errors out with errors like: >> >> Waf script '2.0.24' and library '1.9.3' do not match >> >> Signed-off-by: Peter Korsgaard >> --- >> package/pkg-waf.mk | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk >> index e090afa9e6..a067e69c9b 100644 >> --- a/package/pkg-waf.mk >> +++ b/package/pkg-waf.mk >> @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) >> >> define inner-waf-package >> >> +# The version of waflib has to match with the version of waf, >> +# otherwise waf errors out with: >> +# Waf script 'X' and library 'Y' do not match >> +define WAF_PACKAGE_REMOVE_WAF_LIB >> + $(RM) -fr $(@D)/waf $(@D)/waflib We need more $$ here :) Otherwise: >>> aubio 0.4.9 Patching rm -f -fr /waf /waflib Best regards, Romain >> +endef >> + >> # We need host-python3 to run waf >> $(2)_DEPENDENCIES += host-python3 >> >> @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO >> ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) >> $(2)_DEPENDENCIES += host-waf >> $(2)_WAF = $$(HOST_DIR)/bin/waf >> +$(2)_PRE_CONFIGURE_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB > > It would make more sense to make that either a post-extract or a > post-patch hook. > > Regards, > Yann E. MORIN. > >> else >> $(2)_WAF ?= ./waf >> endif >> -- >> 2.30.2 >> > From romain.naour at gmail.com Sat Feb 11 09:42:02 2023 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 11 Feb 2023 10:42:02 +0100 Subject: [Buildroot] [PATCH] package/pkg-waf: add missing $ Message-ID: <20230211094202.3816592-1-romain.naour@gmail.com> We want to have $(@D) expanded at the time the recipe is run, so like all other variables, we need to $$-expand it. Fixes: http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826 Signed-off-by: Romain Naour Cc: Yann E. MORIN Cc: Peter Korsgaard --- package/pkg-waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index 0e752072c8..c3e965bdf3 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -42,7 +42,7 @@ define inner-waf-package # otherwise waf errors out with: # Waf script 'X' and library 'Y' do not match define WAF_PACKAGE_REMOVE_WAF_LIB - $(RM) -fr $(@D)/waf $(@D)/waflib + $(RM) -fr $$(@D)/waf $$(@D)/waflib endef # We need host-python3 to run waf -- 2.34.3 From thomas.petazzoni at bootlin.com Sat Feb 11 09:49:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 11 Feb 2023 10:49:34 +0100 Subject: [Buildroot] [PATCH] package/busybox: disable stack optimization for i386 target In-Reply-To: <20230210233658.3763549-1-romain.naour@gmail.com> References: <20230210233658.3763549-1-romain.naour@gmail.com> Message-ID: <20230211104934.4c34267c@windsurf> On Sat, 11 Feb 2023 00:36:58 +0100 Romain Naour wrote: > The toolchain-builder project reported an issue with Qemu 7.2.0 for > x86-core2--glibc--bleeding-edge toolchain [1]: > > Run /sbin/init as init process > random: fast init done > EXT4-fs (vda): warning: mounting unchecked fs, running e2fsck is recommended > EXT4-fs (vda): re-mounted. Opts: (null). Quota mode: disabled. > Starting syslogd: OK > traps: syslogd[52] general protection fault ip:b7e21465 sp:bfe59e6c error:0 in libc.so.6[b7d9b000+123000] > Starting klogd: OK > traps: klogd[56] general protection fault ip:b7e94465 sp:bf8f069c error:0 in libc.so.6[b7e0e000+123000] > Running sysctl: traps: logger[62] general protection fault ip:b7e48b6c sp:bfd7d194 error:0 in libc.so.6[b7e05000+123000] > Segmentation fault > traps: logger[64] general protection fault ip:b7dd3b6c sp:bf9b8604 error:0 in libc.so.6[b7d90000+123000] > Segmentation fault > > (Followed by a kernel panic.) > > Testing with the pevious Qemu release (7.1.0) allows to boot the system without any problem. > > Building qemu sources between 7.1.0 and 7.2.0 allows to identify the first "bad" commit [2] and > report to the Qemu project [3]. > > Thanks to Qemu maintainers review, several issues was noticed: > > "The default i386 busybox build config does not respect glibc's requirements around stack alignment > (see [4] for previous discussions and a workaround)." > > Disabling CONFIG_STACK_OPTIMIZATION_386 option (as suggested in the Gentoo bug report) fixed the issue! > > This option has been added and enabled by default in buxybox 1_29_0, so it was used since then the for > Buildroot's qemu defconfig. > > Note: The x86-i686--glibc--bleeding-edge (generic x86) doesn't trigger the issue with > CONFIG_STACK_OPTIMIZATION_386 enabled. > > Fixes: > https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 > > [1] https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 > [2] https://gitlab.com/qemu-project/qemu/-/commit/958e1dd1300f37f18b2161dfb4eb806fc8c19b44 > [3] https://gitlab.com/qemu-project/qemu/-/issues/1478 > [4] https://bugs.gentoo.org/725674 Thanks a lo for the great investigation. Do we understand precisely what is happening? The link at [4] does not really have an explanation, it only has experimental observations that lead to the conclusion that disabling CONFIG_STACK_OPTIMIZATION_386 is a work-around, but it does not really explain what is happening. 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 Feb 11 09:51:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 10:51:35 +0100 Subject: [Buildroot] [PATCH] package/pkg-waf: add missing $ In-Reply-To: <20230211094202.3816592-1-romain.naour@gmail.com> References: <20230211094202.3816592-1-romain.naour@gmail.com> Message-ID: <20230211095135.GD2796@scaer> Romain. All, On 2023-02-11 10:42 +0100, Romain Naour spake thusly: > We want to have $(@D) expanded at the time the recipe is run, so like > all other variables, we need to $$-expand it. > > Fixes: > http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826 Thanks for the quick fix, but se below... > Signed-off-by: Romain Naour > Cc: Yann E. MORIN > Cc: Peter Korsgaard > --- > package/pkg-waf.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk > index 0e752072c8..c3e965bdf3 100644 > --- a/package/pkg-waf.mk > +++ b/package/pkg-waf.mk > @@ -42,7 +42,7 @@ define inner-waf-package > # otherwise waf errors out with: > # Waf script 'X' and library 'Y' do not match > define WAF_PACKAGE_REMOVE_WAF_LIB > - $(RM) -fr $(@D)/waf $(@D)/waflib > + $(RM) -fr $$(@D)/waf $$(@D)/waflib Shouldn't we be using $$($$(PKG)_SRCDIR) or $$($(2)_SRCDIR) instead of $$(@D), like is used everywhere else in the file: cd $$($$(PKG)_SRCDIR) && python3 configure [...] cd $$($$(PKG)_SRCDIR) && python3 $$($(2)_WAF) (Note that last one uses a mix of $$(PKG) and $(2)...) Regards, Yann E. MORIN. > endef > > # We need host-python3 to run waf > -- > 2.34.3 > > _______________________________________________ > 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 romain.naour at smile.fr Sat Feb 11 09:57:44 2023 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 11 Feb 2023 10:57:44 +0100 Subject: [Buildroot] [PATCH] package/pkg-waf: add missing $ In-Reply-To: <20230211095135.GD2796@scaer> References: <20230211094202.3816592-1-romain.naour@gmail.com> <20230211095135.GD2796@scaer> Message-ID: Le 11/02/2023 ? 10:51, Yann E. MORIN a ?crit?: > Romain. All, > > On 2023-02-11 10:42 +0100, Romain Naour spake thusly: >> We want to have $(@D) expanded at the time the recipe is run, so like >> all other variables, we need to $$-expand it. >> >> Fixes: >> http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826 > > Thanks for the quick fix, but se below... > >> Signed-off-by: Romain Naour >> Cc: Yann E. MORIN >> Cc: Peter Korsgaard >> --- >> package/pkg-waf.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk >> index 0e752072c8..c3e965bdf3 100644 >> --- a/package/pkg-waf.mk >> +++ b/package/pkg-waf.mk >> @@ -42,7 +42,7 @@ define inner-waf-package >> # otherwise waf errors out with: >> # Waf script 'X' and library 'Y' do not match >> define WAF_PACKAGE_REMOVE_WAF_LIB >> - $(RM) -fr $(@D)/waf $(@D)/waflib >> + $(RM) -fr $$(@D)/waf $$(@D)/waflib > > Shouldn't we be using $$($$(PKG)_SRCDIR) or $$($(2)_SRCDIR) instead of > $$(@D), like is used everywhere else in the file: > > cd $$($$(PKG)_SRCDIR) && python3 configure [...] > > cd $$($$(PKG)_SRCDIR) && python3 $$($(2)_WAF) > > (Note that last one uses a mix of $$(PKG) and $(2)...) I guess @D come from the HOOK from aubio and move to pkg-waf. It seems @D is used at several place in pkg-<*>.mk infra. I'm not sure what we prefer/should use. Best regards, Romain > > Regards, > Yann E. MORIN. > >> endef >> >> # We need host-python3 to run waf >> -- >> 2.34.3 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From yann.morin.1998 at free.fr Sat Feb 11 10:02:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 11:02:49 +0100 Subject: [Buildroot] [git commit] package/pkg-waf: add missing $ Message-ID: <20230211100400.D126684456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d1b223b91b08acdb52611864ae5921b9f3c757b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We want to have $(@D) expanded at the time the recipe is run, so like all other variables, we need to $$-expand it. Fixes: 1b4d7f6e13212b4c65ec2832681719fd960e75e6 Fixes: http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826 Signed-off-by: Romain Naour Cc: Yann E. MORIN Cc: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/pkg-waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index 0e752072c8..c3e965bdf3 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -42,7 +42,7 @@ define inner-waf-package # otherwise waf errors out with: # Waf script 'X' and library 'Y' do not match define WAF_PACKAGE_REMOVE_WAF_LIB - $(RM) -fr $(@D)/waf $(@D)/waflib + $(RM) -fr $$(@D)/waf $$(@D)/waflib endef # We need host-python3 to run waf From yann.morin.1998 at free.fr Sat Feb 11 10:04:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 11:04:28 +0100 Subject: [Buildroot] [PATCH] package/pkg-waf: add missing $ In-Reply-To: <20230211094202.3816592-1-romain.naour@gmail.com> References: <20230211094202.3816592-1-romain.naour@gmail.com> Message-ID: <20230211100428.GE2796@scaer> Romain, All, On 2023-02-11 10:42 +0100, Romain Naour spake thusly: > We want to have $(@D) expanded at the time the recipe is run, so like > all other variables, we need to $$-expand it. > > Fixes: > http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826 > > Signed-off-by: Romain Naour > Cc: Yann E. MORIN > Cc: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pkg-waf.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk > index 0e752072c8..c3e965bdf3 100644 > --- a/package/pkg-waf.mk > +++ b/package/pkg-waf.mk > @@ -42,7 +42,7 @@ define inner-waf-package > # otherwise waf errors out with: > # Waf script 'X' and library 'Y' do not match > define WAF_PACKAGE_REMOVE_WAF_LIB > - $(RM) -fr $(@D)/waf $(@D)/waflib > + $(RM) -fr $$(@D)/waf $$(@D)/waflib > endef > > # We need host-python3 to run waf > -- > 2.34.3 > > _______________________________________________ > 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 romain.naour at smile.fr Sat Feb 11 10:10:43 2023 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 11 Feb 2023 11:10:43 +0100 Subject: [Buildroot] [PATCH] package/busybox: disable stack optimization for i386 target In-Reply-To: <20230211104934.4c34267c@windsurf> References: <20230210233658.3763549-1-romain.naour@gmail.com> <20230211104934.4c34267c@windsurf> Message-ID: <7bbd1030-488a-9876-7c69-0ac6ae15653e@smile.fr> Hello Thomas, Le 11/02/2023 ? 10:49, Thomas Petazzoni via buildroot a ?crit?: > On Sat, 11 Feb 2023 00:36:58 +0100 > Romain Naour wrote: > >> The toolchain-builder project reported an issue with Qemu 7.2.0 for >> x86-core2--glibc--bleeding-edge toolchain [1]: >> >> Run /sbin/init as init process >> random: fast init done >> EXT4-fs (vda): warning: mounting unchecked fs, running e2fsck is recommended >> EXT4-fs (vda): re-mounted. Opts: (null). Quota mode: disabled. >> Starting syslogd: OK >> traps: syslogd[52] general protection fault ip:b7e21465 sp:bfe59e6c error:0 in libc.so.6[b7d9b000+123000] >> Starting klogd: OK >> traps: klogd[56] general protection fault ip:b7e94465 sp:bf8f069c error:0 in libc.so.6[b7e0e000+123000] >> Running sysctl: traps: logger[62] general protection fault ip:b7e48b6c sp:bfd7d194 error:0 in libc.so.6[b7e05000+123000] >> Segmentation fault >> traps: logger[64] general protection fault ip:b7dd3b6c sp:bf9b8604 error:0 in libc.so.6[b7d90000+123000] >> Segmentation fault >> >> (Followed by a kernel panic.) >> >> Testing with the pevious Qemu release (7.1.0) allows to boot the system without any problem. >> >> Building qemu sources between 7.1.0 and 7.2.0 allows to identify the first "bad" commit [2] and >> report to the Qemu project [3]. >> >> Thanks to Qemu maintainers review, several issues was noticed: >> >> "The default i386 busybox build config does not respect glibc's requirements around stack alignment >> (see [4] for previous discussions and a workaround)." >> >> Disabling CONFIG_STACK_OPTIMIZATION_386 option (as suggested in the Gentoo bug report) fixed the issue! >> >> This option has been added and enabled by default in buxybox 1_29_0, so it was used since then the for >> Buildroot's qemu defconfig. >> >> Note: The x86-i686--glibc--bleeding-edge (generic x86) doesn't trigger the issue with >> CONFIG_STACK_OPTIMIZATION_386 enabled. >> >> Fixes: >> https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 >> >> [1] https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 >> [2] https://gitlab.com/qemu-project/qemu/-/commit/958e1dd1300f37f18b2161dfb4eb806fc8c19b44 >> [3] https://gitlab.com/qemu-project/qemu/-/issues/1478 >> [4] https://bugs.gentoo.org/725674 > > Thanks a lo for the great investigation. Do we understand precisely > what is happening? The link at [4] does not really have an explanation, > it only has experimental observations that lead to the conclusion that > disabling CONFIG_STACK_OPTIMIZATION_386 is a work-around, but it does > not really explain what is happening. Actually there are two different issues that contribute to this issue: 1) An existing latent Busybox bug on i386 (busybox compiled with -mpreferred-stack-boundary=2) https://lists.debian.org/debian-boot/2018/01/msg00352.html 2) A Qemu improvement that trigger an exception on unaligned memory accesses that require 16-byte alignment. https://gitlab.com/qemu-project/qemu/-/commit/958e1dd1300f37f18b2161dfb4eb806fc8c19b44 I didn't digging further the root cause of the issue. Best regards, Romain > > Thomas From yann.morin.1998 at free.fr Sat Feb 11 10:52:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 11:52:42 +0100 Subject: [Buildroot] [PATCH 0/2] br2-external: export list and versions of used extrenal trees (branch yem/br2-ext-name-ver) Message-ID: Hello All! This small two-patch series extends the information exported about the br2-external trees in use for the current configuration: the list of br2-external trees names, and the version for each. They are available in Kconfig, and thus in the .config file, as well as make variables that are exported in the environment. Note: we'd have liked to also have the origin of said trees, like the git origin remote or such, but that is far from trivial to extract. Indeed, a br2-external on a git tree may have more than one remote configured, and may get checked-out from a hash that is reachable from branches in more than one remote. Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (2): br2-external: make the list of external trees public br2-external: make version of external trees available support/scripts/br2-external | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | 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 Feb 11 10:52:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 11:52:44 +0100 Subject: [Buildroot] [PATCH 1/2] br2-external: make the list of external trees public In-Reply-To: References: Message-ID: <912929d06f13459e472f6badf7e9251792b272fe.1676112761.git.yann.morin.1998@free.fr> Currently, the list of external trees is a private variable, but for debugging or compliance, one may need to get that list. Add a Kconfig option so that the list appears in the .config file, and export the already existing .mk variable in the environment, so that post-build or post-image scripts can use it. Reported-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- support/scripts/br2-external | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 2c33e6eacc..5815c6ded0 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -126,7 +126,7 @@ do_mk() { done printf '\n' - printf 'BR2_EXTERNAL_NAMES = \n' + printf 'export BR2_EXTERNAL_NAMES = \n' printf 'BR2_EXTERNAL_DIRS = \n' printf 'BR2_EXTERNAL_MKS = \n' @@ -181,6 +181,14 @@ do_kconfig() { printf 'menu "External options"\n\n' >>"${outputdir}/.br2-external.in.menus" + { + printf 'config BR2_EXTERNAL_NAMES\n' + printf '\tstring\n' + # Use star-expansion: we really one a single arg. + printf '\tdefault "%s"\n' "${BR2_EXT_NAMES[*]}" + printf '\n' + } >>"${outputdir}/.br2-external.in.paths" + for br2_name in "${BR2_EXT_NAMES[@]}"; do eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\"" eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" -- 2.25.1 From yann.morin.1998 at free.fr Sat Feb 11 10:52:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 11:52:45 +0100 Subject: [Buildroot] [PATCH 2/2] br2-external: make version of external trees available In-Reply-To: References: Message-ID: For various reasons, like debugging or compliance, it is important to identify what br2-external trees versions were used for a specific build. Add a Kconfig option that contains the version as computed by support/scripts/setlocalversion; this will appear in the .config file (but not in defconfig files, which is what we want). Also generate that variable on the .mk side, so that it gets properly exported in the environment, for post-build of post-iamge scripts to use as they see fit (like, ensuring there is no dirtyness when in a CI for example). Reported-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- support/scripts/br2-external | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 5815c6ded0..8aea479d20 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -66,7 +66,7 @@ do_validate() { do_validate_one() { local br2_ext="${1}" - local br2_name br2_desc n d + local br2_name br2_desc br2_ver n d if [ ! -d "${br2_ext}" ]; then error "'%s': no such file or directory\n" "${br2_ext}" @@ -104,8 +104,10 @@ do_validate_one() { # Register this br2-external tree, use an absolute canonical path br2_ext="$( cd "${br2_ext}"; pwd )" + br2_ver="$( support/scripts/setlocalversion "${br2_ext}" )" BR2_EXT_NAMES+=( "${br2_name}" ) eval BR2_EXT_PATHS_${br2_name}="\"\${br2_ext}\"" + eval BR2_EXT_VERS_${br2_name}="\"\${br2_ver}\"" eval BR2_EXT_DESCS_${br2_name}="\"\${br2_desc:-\${br2_name}}\"" } @@ -113,7 +115,7 @@ do_validate_one() { # for the br2-external tree do_mk() { local outputdir="${1}" - local br2_name br2_desc br2_ext + local br2_name br2_desc br2_ext br2_ver { printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' @@ -139,12 +141,14 @@ do_mk() { for br2_name in "${BR2_EXT_NAMES[@]}"; do eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\"" eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" + eval br2_ver="\"\${BR2_EXT_VERS_${br2_name}}\"" printf '\n' printf 'BR2_EXTERNAL_NAMES += %s\n' "${br2_name}" printf 'BR2_EXTERNAL_DIRS += %s\n' "${br2_ext}" printf 'BR2_EXTERNAL_MKS += %s/external.mk\n' "${br2_ext}" printf 'export BR2_EXTERNAL_%s_PATH = %s\n' "${br2_name}" "${br2_ext}" printf 'export BR2_EXTERNAL_%s_DESC = %s\n' "${br2_name}" "${br2_desc}" + printf 'export BR2_EXTERNAL_%s_VERSION = %s\n' "${br2_name}" "${br2_ver}" done } >"${outputdir}/.br2-external.mk" } @@ -152,7 +156,7 @@ do_mk() { # Generate the kconfig snippets for the br2-external tree. do_kconfig() { local outputdir="${1}" - local br2_name br2_desc br2_ext br2 + local br2_name br2_desc br2_ext br2_ver br2 local -a items items=( @@ -192,11 +196,15 @@ do_kconfig() { for br2_name in "${BR2_EXT_NAMES[@]}"; do eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\"" eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" + eval br2_ver="\"\${BR2_EXT_VERS_${br2_name}}\"" { printf 'config BR2_EXTERNAL_%s_PATH\n' "${br2_name}" printf '\tstring\n' printf '\tdefault "%s"\n' "${br2_ext}" + printf 'config BR2_EXTERNAL_%s_VERSION\n' "${br2_name}" + printf '\tstring\n' + printf '\tdefault "%s"\n' "${br2_ver}" printf '\n' } >>"${outputdir}/.br2-external.in.paths" -- 2.25.1 From yann.morin.1998 at free.fr Sat Feb 11 11:00:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 12:00:55 +0100 Subject: [Buildroot] [git commit] package/pkg-waf: add one more missing $ Message-ID: <20230211110517.F1795846E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33107962eb29d2d33fcf4bed429d5239c1b2d278 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Further fix on top on 9d1b223b91b0 (package/pkg-waf: add missing $). Repeat after me: all variables in an inner-package macro must be expanded, except for: parameters, pkgdir, and pkgname. Signed-off-by: Yann E. MORIN --- package/pkg-waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index c3e965bdf3..0529bb6dda 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -42,7 +42,7 @@ define inner-waf-package # otherwise waf errors out with: # Waf script 'X' and library 'Y' do not match define WAF_PACKAGE_REMOVE_WAF_LIB - $(RM) -fr $$(@D)/waf $$(@D)/waflib + $$(RM) -fr $$(@D)/waf $$(@D)/waflib endef # We need host-python3 to run waf From dario.binacchi at amarulasolutions.com Sat Feb 11 11:41:08 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 11 Feb 2023 12:41:08 +0100 Subject: [Buildroot] [PATCH 1/1] configs/stm32f429_xip_defconfig: bump Linux version to 6.1.10 Message-ID: <20230211114108.353855-1-dario.binacchi@amarulasolutions.com> The size of xipImage has grown by 84KB but there are still 278KB left before running out of 2MB of flash memory. Signed-off-by: Dario Binacchi --- configs/stm32f429_disco_xip_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index f9b3270ecd95..872e4b6a306c 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_m4=y -BR2_KERNEL_HEADERS_5_15=y +BR2_KERNEL_HEADERS_6_1=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f429-disco/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -- 2.32.0 From yann.morin.1998 at free.fr Sat Feb 11 12:12:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 13:12:51 +0100 Subject: [Buildroot] [git commit] configs/stm32f429_xip_defconfig: bump Linux version to 6.1.10 Message-ID: <20230211121845.B8FB684849@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2bf4d02ff35bd8a0d5aace354c987a166437db88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The size of xipImage has grown by 84KB but there are still 278KB left before running out of 2MB of flash memory. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- configs/stm32f429_disco_xip_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index f9b3270ecd..872e4b6a30 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_m4=y -BR2_KERNEL_HEADERS_5_15=y +BR2_KERNEL_HEADERS_6_1=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f429-disco/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From yann.morin.1998 at free.fr Sat Feb 11 12:19:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 13:19:21 +0100 Subject: [Buildroot] [PATCH 1/1] configs/stm32f429_xip_defconfig: bump Linux version to 6.1.10 In-Reply-To: <20230211114108.353855-1-dario.binacchi@amarulasolutions.com> References: <20230211114108.353855-1-dario.binacchi@amarulasolutions.com> Message-ID: <20230211121921.GF2796@scaer> Dario, All, On 2023-02-11 12:41 +0100, Dario Binacchi spake thusly: > The size of xipImage has grown by 84KB but there are still 278KB left > before running out of 2MB of flash memory. > > Signed-off-by: Dario Binacchi Applied to master, thanks. (there's 6.1.11 now, btw! ;-) ) Regards, Yann E. MORIN. > --- > configs/stm32f429_disco_xip_defconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig > index f9b3270ecd95..872e4b6a306c 100644 > --- a/configs/stm32f429_disco_xip_defconfig > +++ b/configs/stm32f429_disco_xip_defconfig > @@ -1,12 +1,12 @@ > BR2_arm=y > BR2_cortex_m4=y > -BR2_KERNEL_HEADERS_5_15=y > +BR2_KERNEL_HEADERS_6_1=y > # BR2_UCLIBC_INSTALL_UTILS is not set > BR2_ENABLE_LTO=y > BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.10" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f429-disco/linux.config" > BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y > -- > 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 peter at korsgaard.com Sat Feb 11 13:17:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 14:17:30 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used In-Reply-To: (Romain Naour's message of "Sat, 11 Feb 2023 10:33:04 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208192425.GA2677@scaer> Message-ID: <87v8k8cped.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: Hi, >>> +# The version of waflib has to match with the version of waf, >>> +# otherwise waf errors out with: >>> +# Waf script 'X' and library 'Y' do not match >>> +define WAF_PACKAGE_REMOVE_WAF_LIB >>> + $(RM) -fr $(@D)/waf $(@D)/waflib > We need more $$ here :) > Otherwise: >>>> aubio 0.4.9 Patching > rm -f -fr /waf /waflib Ahh crap, thanks for pointing it out. -- Bye, Peter Korsgaard From raphael.pavlidis at gmail.com Sat Feb 11 13:53:15 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Sat, 11 Feb 2023 14:53:15 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/sway: new package In-Reply-To: <87h6vw5l2r.fsf@dell.be.48ers.dk> References: <20221031124625.21172-1-raphael.pavlidis@gmail.com> <87h6vw5l2r.fsf@dell.be.48ers.dk> Message-ID: <7f57a607-bf3c-0250-ed23-c6fbf73961a3@gmail.com> Hi Peter, On 08.02.23 14:43, Peter Korsgaard wrote: [--SNIP--] > > How did you test this? Here wlroots with x11 support doesn't build as we > don't have an Xwayland .pc file or binary in Buildroot. > I create a xwayland package, which build the xserver binary, but did not send the patch yet. (This will fix the problems with weston, too) >> +else > > +SWAY_CONF_OPTS += -Dxwayland=disabled > > +endif > > + > > +ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y) > > +SWAY_CONF_OPTS += -Dgdk-pixbuf=enabled > > You also need to ensure that sway is built after gdk-pixbuf with: > > SWAY_DEPENDENCIES += gdk-pixbuf > > Committed with that fixed, thanks. > Thanks, Raphael Pavlidis From dario.binacchi at amarulasolutions.com Sat Feb 11 14:26:55 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 11 Feb 2023 15:26:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/davinci-bootcount: bump to version 2.0.0 Message-ID: <20230211142655.375225-1-dario.binacchi@amarulasolutions.com> - stm32mp1: support for STM32 TAMP_BKP21R bootcount register - tab formatting - gitignore: added autoscan files - updated documentation - i2c_eeprom: bootcount does not use two uint16s - am33xx: declare registers as 'volatile' - src/am33xx: do not close fd, it seems to prevent reliably writing register - configure.ac: update version, homepage - Added EEPROM read/write for non-TI AM335x platforms Signed-off-by: Dario Binacchi --- package/davinci-bootcount/davinci-bootcount.hash | 2 +- package/davinci-bootcount/davinci-bootcount.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/davinci-bootcount/davinci-bootcount.hash index ef4bca2b7dfe..ecbaa51517ab 100644 --- a/package/davinci-bootcount/davinci-bootcount.hash +++ b/package/davinci-bootcount/davinci-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 de7843cf1245a739b6d18d4db478893e50c2de0ee19bbce96dc323065d28c3e4 davinci-bootcount-0973689c7556a953d2b468e4d8d46758c6d467b4.tar.gz +sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e davinci-bootcount-v2.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk index 385d96d5a2c4..71c597f85a39 100644 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ b/package/davinci-bootcount/davinci-bootcount.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAVINCI_BOOTCOUNT_VERSION = 0973689c7556a953d2b468e4d8d46758c6d467b4 +DAVINCI_BOOTCOUNT_VERSION = v2.0.0 DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,$(DAVINCI_BOOTCOUNT_VERSION)) DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING -- 2.32.0 From thomas at devoogdt.com Sat Feb 11 14:33:56 2023 From: thomas at devoogdt.com (thomas at devoogdt.com) Date: Sat, 11 Feb 2023 15:33:56 +0100 Subject: [Buildroot] [PATCH] package/fluent-bit: bump to version 2.0.9 Message-ID: <20230211143356.173296-1-thomas@devoogdt.com> From: Thomas Devoogdt - Release Notes: https://fluentbit.io/announcements/v2.0.9/ - Patch dropped, as it is upstream: https://github.com/fluent/fluent-bit/commit/7bcb502ebdcd647d6b83c972805e734ad522eb1a Signed-off-by: Thomas Devoogdt --- ...eLists.txt-only-require-a-C-compiler.patch | 27 ------------------- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch diff --git a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch b/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch deleted file mode 100644 index e71bcf0c0d..0000000000 --- a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7bcb502ebdcd647d6b83c972805e734ad522eb1a Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 30 Jan 2023 09:10:37 +0100 -Subject: [PATCH] CMakeLists.txt: only require a C compiler - -Fluent-bit is mostly written in C, -so don't require CXX in the top-level project. - -Signed-off-by: Thomas Devoogdt ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7adb02de..3ff7360d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.12) --project(fluent-bit) -+project(fluent-bit C) - - # CMP0069 ensures that LTO is enabled for all compilers - cmake_policy(SET CMP0069 NEW) --- -2.30.2 - diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index ce7cea7b59..0caadcd56f 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8ff5566389033669feabc9c69a5c6f417dad5c8b066454388e6a706507262acf fluent-bit-2.0.8.tar.gz +sha256 393ad4a6ced48c327607653d610ef273843085a17b6e5c8013877abdf31e6945 fluent-bit-2.0.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 13077e53cc..c10ef613d7 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.0.8 +FLUENT_BIT_VERSION = 2.0.9 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE -- 2.34.1 From dario.binacchi at amarulasolutions.com Sat Feb 11 14:46:23 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 11 Feb 2023 15:46:23 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/davinci-bootcount: bump to version 2.0.0 Message-ID: <20230211144623.380475-1-dario.binacchi@amarulasolutions.com> - stm32mp1: support for STM32 TAMP_BKP21R bootcount register - tab formatting - gitignore: added autoscan files - updated documentation - i2c_eeprom: bootcount does not use two uint16s - am33xx: declare registers as 'volatile' - src/am33xx: do not close fd, it seems to prevent reliably writing register - configure.ac: update version, homepage - Added EEPROM read/write for non-TI AM335x platforms Signed-off-by: Dario Binacchi --- Changes in v2: - move 'v' from DAVINCI_BOOTCOUNT_VERSION to DAVINCI_BOOTCOUNT_SITE Signed-off-by: Dario Binacchi --- package/davinci-bootcount/davinci-bootcount.hash | 2 +- package/davinci-bootcount/davinci-bootcount.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/davinci-bootcount/davinci-bootcount.hash index ef4bca2b7dfe..53435b1d1d6d 100644 --- a/package/davinci-bootcount/davinci-bootcount.hash +++ b/package/davinci-bootcount/davinci-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 de7843cf1245a739b6d18d4db478893e50c2de0ee19bbce96dc323065d28c3e4 davinci-bootcount-0973689c7556a953d2b468e4d8d46758c6d467b4.tar.gz +sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e davinci-bootcount-2.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk index 385d96d5a2c4..695d39688ac6 100644 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ b/package/davinci-bootcount/davinci-bootcount.mk @@ -4,8 +4,8 @@ # ################################################################################ -DAVINCI_BOOTCOUNT_VERSION = 0973689c7556a953d2b468e4d8d46758c6d467b4 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,$(DAVINCI_BOOTCOUNT_VERSION)) +DAVINCI_BOOTCOUNT_VERSION = 2.0.0 +DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING -- 2.32.0 From yann.morin.1998 at free.fr Sat Feb 11 14:58:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 15:58:35 +0100 Subject: [Buildroot] [git commit] package/chrony: run as unprivileged user Message-ID: <20230211150203.B8AD184A7C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=451672e890b5f605aa9ad7a386491a31397c737f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master There are three ways to run chronyd: - start as root, and continue running as root; - start as root, then setuid() to a non-root user via either a command line option or a configuration directive; - start as root, and setuid() to a build-time specified non-root user. Currently, the first situation is used by Buildroot, which does not follow security best practices of dropping elevated privileges for daemon at runtime when that is possible. We switch to the third situation, where a compile-time default non-root user is then used at runtime to drop privileges, with libcap used to keep the capabilities required to call the appropriate syscalls to adjust the system time (typically, CAP_SYS_TIME to call adjtimex() or clock_settime() et al.). This means that libcap is now a mandatory dependency. To be noted: users who previously had configured their systems to run chronyd as non root, would have done so with either the command-line option (`-u`), or the configuration directive (`user`). Those take precedence over the compile-time default, so this should not break their systems (presumably, they also run as the `chrony` user). They would also have taken care to run chronyc as the appropriate user to manipulate chronyd at runtime via the UNIX socket. For those who were running chronyd as root, this does not change either: the functionality is unchanged, and they were running chronyc as root, which should still be capable of manipulating chronyd via its UNIX socket. Take that opportunity to brine chrony's Config.in to current coding style: enclose sub-option in an if-endif block. Signed-off-by: James Kent Signed-off-by: Yann E. MORIN --- package/chrony/Config.in | 6 +++++- package/chrony/chrony.mk | 11 +++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/package/chrony/Config.in b/package/chrony/Config.in index 158dc20530..c22b756c11 100644 --- a/package/chrony/Config.in +++ b/package/chrony/Config.in @@ -1,16 +1,20 @@ config BR2_PACKAGE_CHRONY bool "chrony" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBCAP help Chrony is a pair of programs which are used to maintain the accuracy of the system clock. http://chrony.tuxfamily.org/ +if BR2_PACKAGE_CHRONY + config BR2_PACKAGE_CHRONY_DEBUG_LOGGING bool "enable debug logging support" - depends on BR2_PACKAGE_CHRONY help Enable support for debug logging output from Chrony when enabled at runtime. If disabled, code for debug logging will not be compiled in. + +endif diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 379e95a778..86f23d9060 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -10,20 +10,19 @@ CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING CHRONY_CPE_ID_VENDOR = tuxfamily CHRONY_SELINUX_MODULES = chronyd -CHRONY_DEPENDENCIES = host-pkgconf +CHRONY_DEPENDENCIES = host-pkgconf libcap CHRONY_CONF_OPTS = \ --host-system=Linux \ --host-machine=$(BR2_ARCH) \ --prefix=/usr \ --without-tomcrypt \ + --with-user=chrony \ $(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug) -ifeq ($(BR2_PACKAGE_LIBCAP),y) -CHRONY_DEPENDENCIES += libcap -else -CHRONY_CONF_OPTS += --without-libcap -endif +define CHRONY_USERS + chrony -1 chrony -1 * /run/chrony - - Time daemon +endef ifeq ($(BR2_PACKAGE_LIBNSS),y) CHRONY_DEPENDENCIES += libnss From yann.morin.1998 at free.fr Sat Feb 11 15:01:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 16:01:57 +0100 Subject: [Buildroot] [PATCH v2] package/chrony: add default unprivileged user option In-Reply-To: <8fe20693-4bf1-4378-d7c4-d81bcd9cf7ed@mind.be> References: <20230208182731.15752-1-james.kent@orchestrated-technology.com> <8fe20693-4bf1-4378-d7c4-d81bcd9cf7ed@mind.be> Message-ID: <20230211150157.GG2796@scaer> Arnout, James, All, On 2023-02-09 21:22 +0100, Arnout Vandecappelle spake thusly: > On 08/02/2023 19:27, James Kent wrote: > >Configurable option to define and enable by default an unprivileged > >user which the Chrony daemon will assume once initialised. The > >functionality requires libcap which is selected as necessary. > > > >This option supports the good security practice of dropping elevated > >privileges for daemon runtime. > > > >The package configuration layout has been updated to current working > >practice. > > > >Signed-off-by: James Kent > >--- [--SNIP--] > >+config BR2_PACKAGE_CHRONY_USER > >+ bool "chrony default unprivileged user" > Is there any reason to do this conditionally? For all other packages, we do > it unconditionally. >From what I read, there are three situation to run chrony: - start as root and stay running as root; - start as root, setuid to a user either with a commandline option, or a configuration directive; - start as root, and setuid to a user defined at build-time (which can still be overriden on the commandline or a configuration directive). What this patch does, is to allow for the third option. As it was previously already possible to run as non-root, by just enabling libcap in Buildroot's config, and adding the user configuration directive in chrony's config file (or run it with -u), some people may already do that in their setups, and we do not want to break that. So those people do have eithe the config directive or the -u option, which both take precendence over the build-time configuration. As for those that do run as root, switching to a non-root user should not have any impact in functionality. So, we can safely unconditionally default to a compile-time non-root user. Except, a linux kernel may only have the root user, see CONFIG_MULTIUSER. But in that case we'd have tons of other packages that are gonna whine... Applied to master without the condition, thanks. Regards, Yann E. MORIN. > Regards, > Arnout > > >+ select BR2_PACKAGE_LIBCAP > >+ help > >+ Define and enable default unprivileged user for the Chrony > >+ daemon to run as. > >+ > >+endif > >diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk > >index 379e95a778..16f8f082a3 100644 > >--- a/package/chrony/chrony.mk > >+++ b/package/chrony/chrony.mk > >@@ -21,6 +21,14 @@ CHRONY_CONF_OPTS = \ > > ifeq ($(BR2_PACKAGE_LIBCAP),y) > > CHRONY_DEPENDENCIES += libcap > >+ > >+ifeq ($(BR2_PACKAGE_CHRONY_USER),y) > >+CHRONY_CONF_OPTS += --with-user=chrony > >+define CHRONY_USERS > >+ chrony -1 chrony -1 * /run/chrony - - Time daemon > >+endef > >+endif > >+ > > else > > CHRONY_CONF_OPTS += --without-libcap > > endif -- .-----------------.--------------------.------------------.--------------------. | 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 Feb 11 15:10:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 16:10:34 +0100 Subject: [Buildroot] [PATCH next v2 5/7] package/python-magic-wormhole-mailbox-server: new package Message-ID: <20230211151034.GH2796@scaer> Julien, All, On 2022-11-22 21:31 +0100, Julien Olivain spake thusly: > This package is the main server that Magic-Wormhole clients connect to. > The server performs store-and-forward delivery for small key-exchange > and control messages. Bulk data is sent over a direct TCP connection, > or through a transit-relay. > > https://github.com/magic-wormhole/magic-wormhole-mailbox-server > > Signed-off-by: Julien Olivain > --- [--SNIP--] > diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in > new file mode 100644 > index 0000000000..db20d3e7b6 > --- /dev/null > +++ b/package/python-magic-wormhole-mailbox-server/Config.in > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER > + bool "python-magic-wormhole-mailbox-server" > + select BR2_PACKAGE_PYTHON3_SQLITE # runtime > + select BR2_PACKAGE_PYTHON_ATTRS # runtime > + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime python-autobahn depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS, so this should have been propagated. It's relatively easy to reproduce on current master as of commit 451672e890b5: $ KCONFIG_SEED=0x1D15B9D4 make randconfig [...] WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_AUTOBAHN Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER [=y] && BR2_PACKAGE_PYTHON3 [=y] Care to send a fix, and check the other packages that were added in this series, please? Regards, Yann E. MORIN. > + select BR2_PACKAGE_PYTHON_SIX # runtime > + select BR2_PACKAGE_PYTHON_TWISTED # runtime > + help > + This package is the main server that Magic-Wormhole clients > + connect to. The server performs store-and-forward delivery > + for small key-exchange and control messages. Bulk data is > + sent over a direct TCP connection, or through a > + transit-relay. > + > + https://github.com/magic-wormhole/magic-wormhole-mailbox-server > diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash > new file mode 100644 > index 0000000000..c714712641 > --- /dev/null > +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/magic-wormhole-mailbox-server/json > +md5 3da441df1f354a8399a728da3421ac8f magic-wormhole-mailbox-server-0.4.1.tar.gz > +sha256 1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb magic-wormhole-mailbox-server-0.4.1.tar.gz > +# Locally computed sha256 checksums > +sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE > diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk > new file mode 100644 > index 0000000000..a3394c7dcd > --- /dev/null > +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-magic-wormhole-mailbox-server > +# > +################################################################################ > + > +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION = 0.4.1 > +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SOURCE = magic-wormhole-mailbox-server-$(PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION).tar.gz > +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SITE = https://files.pythonhosted.org/packages/5b/ba/cbb211bc8f8bfdf7fb620d33331f07bcd889c7a28e7fd8a0de9029bb5a2f > +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SETUP_TYPE = setuptools > +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE = MIT > +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE_FILES = LICENSE > + > +$(eval $(python-package)) > -- > 2.38.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 Sat Feb 11 15:25:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 16:25:42 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/sway: new package In-Reply-To: <7f57a607-bf3c-0250-ed23-c6fbf73961a3@gmail.com> (Raphael Pavlidis's message of "Sat, 11 Feb 2023 14:53:15 +0100") References: <20221031124625.21172-1-raphael.pavlidis@gmail.com> <87h6vw5l2r.fsf@dell.be.48ers.dk> <7f57a607-bf3c-0250-ed23-c6fbf73961a3@gmail.com> Message-ID: <87r0uwcjgp.fsf@dell.be.48ers.dk> >>>>> "Raphael" == Raphael Pavlidis writes: > Hi Peter, > On 08.02.23 14:43, Peter Korsgaard wrote: > [--SNIP--] >> How did you test this? Here wlroots with x11 support doesn't build >> as we >> don't have an Xwayland .pc file or binary in Buildroot. >> > I create a xwayland package, which build the xserver binary, but did > not send the patch yet. (This will fix the problems with weston, too) Ok, thanks - Will you submit the xwayland package? -- Bye, Peter Korsgaard From thomas at devoogdt.com Sat Feb 11 15:58:26 2023 From: thomas at devoogdt.com (thomas at devoogdt.com) Date: Sat, 11 Feb 2023 16:58:26 +0100 Subject: [Buildroot] [PATCH] support/config-fragments: add a bootlin s390x toolchain Message-ID: <20230211155826.285037-1-thomas@devoogdt.com> From: Thomas Devoogdt I do constantly get mails that fluent-bit fails to build for s390x. So added this to ensure that the s390x architecture is checked as well if I manually do: $ ./utils/test-pkg -p fluent-bit -a Signed-off-by: Thomas Devoogdt --- .../autobuild/bootlin-s390x-z13-glibc.config | 5 +++++ support/config-fragments/autobuild/toolchain-configs.csv | 1 + 2 files changed, 6 insertions(+) create mode 100644 support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config diff --git a/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config new file mode 100644 index 0000000000..fe3f0380c9 --- /dev/null +++ b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config @@ -0,0 +1,5 @@ +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 diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 0b19051543..a65e9bacc3 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -38,6 +38,7 @@ support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv32-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-sh4-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc64-glibc.config,x86_64 -- 2.34.1 From ps.report at gmx.net Sat Feb 11 16:32:02 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 11 Feb 2023 17:32:02 +0100 Subject: [Buildroot] [PATCH v1] package/ntpsec: fix Stack Smashing Protection detection Message-ID: <20230211163202.25627-1-ps.report@gmx.net> Fix SSP missdetection (compiler supports '-fstack-protector-all' command line argument but selected libc/toolchain does not support SSP, e.g. i686-musl. Fixes: - http://autobuild.buildroot.net/results/ded9ad5badbcfa6552443d3ce0866722becfefbd [...] Checking if C compiler supports -fstack-protector-all : yes [...] Checking for type struct timex : no The configuration failed (complete log in .../build/ntpsec-1_2_2/build/config.log) And from build/ntpsec-1_2_2/build/config.log: err: .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: test.c.1.o: in function `main': test.c:(.text.startup+0x2a): undefined reference to `__stack_chk_fail_local' .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: .../build/ntpsec-1_2_2/build/.conf_check_01f3f794d5b6ffb7add7ce130581ae04/testbuild/main/testprog: hidden symbol `__stack_chk_fail_local' isn't defined .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: final link failed: bad value collect2: error: ld returned 1 exit status Signed-off-by: Peter Seiderer --- package/ntpsec/ntpsec.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index c7fa2f85a8..18a8353900 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -30,6 +30,15 @@ NTPSEC_DEPENDENCIES = \ libcap \ openssl +# prevent '-fstack-protector-all' compiler flag detection without +# ssp support (e.g. i686-musl) +ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) +define NTPSEC_FORCE_DISABLE_SSP + $(SED) s/fstack-protector-all/fstack-protector-all-disabled/g $(@D)/wscript +endef +endif +NTPSEC_PRE_CONFIGURE_HOOKS += NTPSEC_FORCE_DISABLE_SSP + # CC="$(HOSTCC)" is strange but needed to build some host tools, the # cross-compiler will properly be used to build target code thanks to # --cross-compiler -- 2.39.1 From ps.report at gmx.net Sat Feb 11 16:34:22 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 11 Feb 2023 17:34:22 +0100 Subject: [Buildroot] [PATCH v1] package/fft_eval: new package Message-ID: <20230211163422.25944-1-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/Config.in | 1 + package/fft_eval/Config.in | 13 ++++++++++++ package/fft_eval/fft_eval.hash | 5 +++++ package/fft_eval/fft_eval.mk | 36 ++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 package/fft_eval/Config.in create mode 100644 package/fft_eval/fft_eval.hash create mode 100644 package/fft_eval/fft_eval.mk diff --git a/package/Config.in b/package/Config.in index 511e691ed3..aa19164802 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2206,6 +2206,7 @@ menu "Miscellaneous" source "package/collectl/Config.in" source "package/domoticz/Config.in" source "package/empty/Config.in" + source "package/fft_eval/Config.in" source "package/gitlab-runner/Config.in" source "package/gnuradio/Config.in" source "package/googlefontdirectory/Config.in" diff --git a/package/fft_eval/Config.in b/package/fft_eval/Config.in new file mode 100644 index 0000000000..4b6aa9b388 --- /dev/null +++ b/package/fft_eval/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_FFT_EVAL + bool "fft_eval" + help + Pogram to aid open source spectrum analyzer development + for Qualcomm/Atheros AR92xx and AR93xx based chipsets. + + It visualizes the FFT data reported by the chips to help + interpreting and understanding the data. + + Enabel sdl2 and sdl2_ttf for the graphic output tool + fft_eval_sdl. + + https://github.com/simonwunderlich/FFT_eval diff --git a/package/fft_eval/fft_eval.hash b/package/fft_eval/fft_eval.hash new file mode 100644 index 0000000000..ab09e916e7 --- /dev/null +++ b/package/fft_eval/fft_eval.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 154f99c3567835bbbbc9ec4c58bc79961f9fa5342effb6f0bc41475fc9a6d11f fft_eval-6a82b383ce79afc4c1ba26ffcf34b15d3e95894b.tar.gz +sha256 6a573fb2f9082662978cf21fb153096df0a1981deaea7dbc10a11046fe005d9f LICENSES/CC0-1.0.txt +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 797832eda5ff4360a10fee3be94a3250995e76423b79675c9c44204c37ca492d LICENSES/OFL-1.1.txt diff --git a/package/fft_eval/fft_eval.mk b/package/fft_eval/fft_eval.mk new file mode 100644 index 0000000000..383b5f9a51 --- /dev/null +++ b/package/fft_eval/fft_eval.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# fft_eval +# +################################################################################ + +FFT_EVAL_VERSION = 6a82b383ce79afc4c1ba26ffcf34b15d3e95894b +FFT_EVAL_SITE = $(call github,simonwunderlich,FFT_eval,$(FFT_EVAL_VERSION)) +FFT_EVAL_LICENSE = CC0-1.0 (doc), GPL-2.0-only, OFL-1.1 (LiberationSans-Regular.ttf) +FFT_EVAL_LICENSE_FILES = \ + LICENSES/CC0-1.0.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/OFL-1.1.txt + +FFT_EVAL_CONV_OPTS = CONFIG_fft_eval_json=y +FFT_EVAL_TARGETS = fft_eval_json + +ifeq ($(BR2_PACKAGE_SDL2)$(BR2_PACKAGE_SDL2_TTF),yy) +FFT_EVAL_CONV_OPTS += CONFIG_fft_eval_sdl=y +FFT_EVAL_DEPENDENCIES += sdl2 sdl2_ttf +FFT_EVAL_TARGETS += fft_eval_sdl +else +FFT_EVAL_CONV_OPTS += CONFIG_fft_eval_sdl=n +endif + +define FFT_EVAL_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) CROSS=$(STAGING_DIR)/usr/bin/ $(FFT_EVAL_CONV_OPTS) -C $(@D) all +endef + +define FFT_EVAL_INSTALL_TARGET_CMDS + for i in $(FFT_EVAL_TARGETS); do \ + $(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/bin || exit 1; \ + done +endef + +$(eval $(generic-package)) -- 2.39.1 From yann.morin.1998 at free.fr Sat Feb 11 16:49:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 17:49:26 +0100 Subject: [Buildroot] [PATCH v1] package/ntpsec: fix Stack Smashing Protection detection In-Reply-To: <20230211163202.25627-1-ps.report@gmx.net> References: <20230211163202.25627-1-ps.report@gmx.net> Message-ID: <20230211164926.GI2796@scaer> Peter, All, On 2023-02-11 17:32 +0100, Peter Seiderer spake thusly: > Fix SSP missdetection (compiler supports '-fstack-protector-all' command > line argument but selected libc/toolchain does not support SSP, > e.g. i686-musl. > > Fixes: > > - http://autobuild.buildroot.net/results/ded9ad5badbcfa6552443d3ce0866722becfefbd > > [...] > Checking if C compiler supports -fstack-protector-all : yes > [...] > Checking for type struct timex : no > The configuration failed > (complete log in .../build/ntpsec-1_2_2/build/config.log) > > And from build/ntpsec-1_2_2/build/config.log: > > err: .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: test.c.1.o: in function `main': > test.c:(.text.startup+0x2a): undefined reference to `__stack_chk_fail_local' > .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: .../build/ntpsec-1_2_2/build/.conf_check_01f3f794d5b6ffb7add7ce130581ae04/testbuild/main/testprog: hidden symbol `__stack_chk_fail_local' isn't defined > .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: final link failed: bad value > collect2: error: ld returned 1 exit status > > Signed-off-by: Peter Seiderer > --- > package/ntpsec/ntpsec.mk | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk > index c7fa2f85a8..18a8353900 100644 > --- a/package/ntpsec/ntpsec.mk > +++ b/package/ntpsec/ntpsec.mk > @@ -30,6 +30,15 @@ NTPSEC_DEPENDENCIES = \ > libcap \ > openssl > > +# prevent '-fstack-protector-all' compiler flag detection without > +# ssp support (e.g. i686-musl) > +ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) > +define NTPSEC_FORCE_DISABLE_SSP > + $(SED) s/fstack-protector-all/fstack-protector-all-disabled/g $(@D)/wscript > +endef > +endif > +NTPSEC_PRE_CONFIGURE_HOOKS += NTPSEC_FORCE_DISABLE_SSP Assigning to hooks should be done in the conditional if-block, not outside. But in Buildroot, the SSP flags are automatically handled by the wrapper, so we should just unconditionally remove said flags as set by the package, like was done in 50cbac5099b1 (package/sysvinit: add patch to fix compile without stack-protector support) for example (and no, that commit was not chosen totally at random ;-) ). Regards, Yann E. MORIN. > # CC="$(HOSTCC)" is strange but needed to build some host tools, the > # cross-compiler will properly be used to build target code thanks to > # --cross-compiler > -- > 2.39.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 thomas at devoogdt.com Sat Feb 11 17:06:13 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Sat, 11 Feb 2023 18:06:13 +0100 Subject: [Buildroot] [PATCH] package/fluent-bit: add support for non glibc toolchain In-Reply-To: <20230202071518.3961314-1-thomas@devoogdt.com> References: <20230202071518.3961314-1-thomas@devoogdt.com> Message-ID: Hi, The patches need to be rebased if https://patchwork.ozlabs.org/project/buildroot/patch/20230211143356.173296-1-thomas at devoogdt.com/ gets to the master first. Kr, Thomas Op do 2 feb. 2023 om 08:15 schreef Thomas Devoogdt : > > From: Thomas Devoogdt > > - require threads and dynamic library support > - require sync_4 support > - provide fts.h trough musl-fts > > 'static_assert()' is not available if no C++ toolchain or no glibc > is used, so add two patches to fix this > > Signed-off-by: Thomas Devoogdt > --- > .../0002-lib-c-ares-fixup-static_assert.patch | 56 +++++++++++++++++++ > .../0003-lib-cfl-fixup-static_assert.patch | 33 +++++++++++ > package/fluent-bit/Config.in | 10 +++- > package/fluent-bit/fluent-bit.mk | 11 +++- > 4 files changed, 105 insertions(+), 5 deletions(-) > create mode 100644 package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch > create mode 100644 package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch > > No idea if there is an interest in uClibc or musl-enabled toolchains regarding buildroot? > I was able to compile fluent-bit for most of the supported platforms with a limited amount > of changes. > > I had to create two patches in two libs. One (cfl) was already upstreamed, > and added the link to it. The other (c-ares) should be fixed by the m4 bump. I guess that > fluent-bit will bump those sub-libs over time, so we can drop these patches. > > arm-aarch64 [ 1/44]: OK > bootlin-aarch64-glibc [ 2/44]: OK > bootlin-arcle-hs38-uclibc [ 3/44]: OK > bootlin-armv5-uclibc [ 4/44]: OK > bootlin-armv7-glibc [ 5/44]: OK > bootlin-armv7m-uclibc [ 6/44]: SKIPPED > bootlin-armv7-musl [ 7/44]: OK > bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED > bootlin-m68k-68040-uclibc [ 9/44]: OK > bootlin-microblazeel-uclibc [10/44]: OK > bootlin-mipsel32r6-glibc [11/44]: OK > bootlin-mipsel-uclibc [12/44]: OK > bootlin-nios2-glibc [13/44]: OK > bootlin-openrisc-uclibc [14/44]: OK > bootlin-powerpc64le-power8-glibc [15/44]: OK > bootlin-powerpc-e500mc-uclibc [16/44]: OK > bootlin-riscv32-glibc [17/44]: OK > bootlin-riscv64-glibc [18/44]: OK > bootlin-riscv64-musl [19/44]: OK > bootlin-sh4-uclibc [20/44]: OK > bootlin-sparc64-glibc [21/44]: OK > bootlin-sparc-uclibc [22/44]: SKIPPED > bootlin-x86-64-glibc [23/44]: OK > bootlin-x86-64-musl [24/44]: OK > bootlin-x86-64-uclibc [25/44]: OK > bootlin-xtensa-uclibc [26/44]: OK > br-arm-basic [27/44]: OK > br-arm-full-nothread [28/44]: SKIPPED > br-arm-full-static [29/44]: SKIPPED > br-i386-pentium4-full [30/44]: OK > br-i386-pentium-mmx-musl [31/44]: OK > br-mips64-n64-full [32/44]: OK > br-mips64r6-el-hf-glibc [33/44]: OK > br-powerpc-603e-basic-cpp [34/44]: OK > br-powerpc64-power7-glibc [35/44]: OK > linaro-aarch64-be [36/44]: OK > linaro-aarch64 [37/44]: OK > linaro-arm [38/44]: OK > sourcery-arm-armv4t [39/44]: OK > sourcery-arm [40/44]: OK > sourcery-arm-thumb2 [41/44]: OK > sourcery-mips64 [42/44]: OK > sourcery-mips [43/44]: OK > sourcery-nios2 [44/44]: OK > 44 builds, 5 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > diff --git a/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch > new file mode 100644 > index 0000000000..de5d0d06a8 > --- /dev/null > +++ b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch > @@ -0,0 +1,56 @@ > +From aca354ae22c55fa6051d04a9f674fe0825443a94 Mon Sep 17 00:00:00 2001 > +From: Thomas Devoogdt > +Date: Wed, 1 Feb 2023 11:26:56 +0100 > +Subject: [PATCH] lib: c-ares: fixup static_assert > + > +"undefined reference to 'static_assert'" > + > +Not defined when using uClibc or if not C++ >= 11. > + > +upstream: https://github.com/c-ares/c-ares/issues/504 > + > +Signed-off-by: Thomas Devoogdt > +--- > + lib/c-ares-1.18.1/configure | 4 ++++ > + lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 | 3 +++ > + 2 files changed, 7 insertions(+) > + > +diff --git a/lib/c-ares-1.18.1/configure b/lib/c-ares-1.18.1/configure > +index 737f0a0dd..b99b7ed49 100755 > +--- a/lib/c-ares-1.18.1/configure > ++++ b/lib/c-ares-1.18.1/configure > +@@ -6316,6 +6316,8 @@ else $as_nop > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext > + /* end confdefs.h. */ > + > ++#define static_assert _Static_assert > ++ > + template > + struct check > + { > +@@ -6393,6 +6395,8 @@ else $as_nop > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext > + /* end confdefs.h. */ > + > ++#define static_assert _Static_assert > ++ > + template > + struct check > + { > +diff --git a/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 b/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 > +index 229de3091..fe4a11c67 100644 > +--- a/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 > ++++ b/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 > +@@ -37,6 +37,9 @@ > + #serial 9 > + > + m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ > ++ > ++#define static_assert _Static_assert > ++ > + template > + struct check > + { > +-- > +2.39.0 > + > diff --git a/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch b/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch > new file mode 100644 > index 0000000000..7b99a8e4de > --- /dev/null > +++ b/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch > @@ -0,0 +1,33 @@ > +From 8d17fc961fef2e88f4c8fa2316af925d5466ca4d Mon Sep 17 00:00:00 2001 > +From: Thomas Devoogdt > +Date: Wed, 1 Feb 2023 11:38:15 +0100 > +Subject: [PATCH] lib: cfl: fixup static_assert > + > +"undefined reference to 'static_assert'" > + > +Not defined when using uClibc or if not C++ >= 11. > + > +upstream: https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 > + > +Signed-off-by: Thomas Devoogdt > +--- > + lib/cfl/lib/xxhash/xxhash.h | 3 +-- > + 1 file changed, 1 insertion(+), 2 deletions(-) > + > +diff --git a/lib/cfl/lib/xxhash/xxhash.h b/lib/cfl/lib/xxhash/xxhash.h > +index 08ab79457..511c4d12b 100644 > +--- a/lib/cfl/lib/xxhash/xxhash.h > ++++ b/lib/cfl/lib/xxhash/xxhash.h > +@@ -1546,8 +1546,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) > + /* note: use after variable declarations */ > + #ifndef XXH_STATIC_ASSERT > + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ > +-# include > +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) > ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) > + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ > + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) > + # else > +-- > +2.39.0 > + > diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in > index 6c2299e695..f53eacb447 100644 > --- a/package/fluent-bit/Config.in > +++ b/package/fluent-bit/Config.in > @@ -1,6 +1,9 @@ > config BR2_PACKAGE_FLUENT_BIT > bool "fluent-bit" > - depends on BR2_TOOLCHAIN_USES_GLIBC > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 > + depends on !BR2_STATIC_LIBS # dlfcn.h > + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_LIBYAML > help > @@ -29,5 +32,6 @@ config BR2_PACKAGE_FLUENT_BIT_WASM > > endif > > -comment "fluent-bit needs a glibc toolchain" > - depends on !BR2_TOOLCHAIN_USES_GLIBC > +comment "fluent-bit needs a toolchain w/ threads, dynamic library" > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 > + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS > diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk > index 6e9a33e02e..151afc34aa 100644 > --- a/package/fluent-bit/fluent-bit.mk > +++ b/package/fluent-bit/fluent-bit.mk > @@ -47,12 +47,19 @@ FLUENT_BIT_CONF_OPTS += \ > -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ > -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" > > +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) > +FLUENT_BIT_DEPENDENCIES += musl-fts > +FLUENT_BIT_LINKER_FLAGS += -lfts > +endif > + > # Uses __atomic_compare_exchange_8 > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > -FLUENT_BIT_CONF_OPTS += \ > - -DCMAKE_EXE_LINKER_FLAGS=-latomic > +FLUENT_BIT_LINKER_FLAGS += -latomic > endif > > +FLUENT_BIT_CONF_OPTS += \ > + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LINKER_FLAGS)" > + > define FLUENT_BIT_INSTALL_INIT_SYSV > $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ > $(TARGET_DIR)/etc/init.d/S99fluent-bit > -- > 2.39.0 > From ps.report at gmx.net Sat Feb 11 17:55:47 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 11 Feb 2023 18:55:47 +0100 Subject: [Buildroot] [PATCH v1] package/ntpsec: fix Stack Smashing Protection detection In-Reply-To: <20230211164926.GI2796@scaer> References: <20230211163202.25627-1-ps.report@gmx.net> <20230211164926.GI2796@scaer> Message-ID: <20230211185547.59a1fa42@gmx.net> Hello Yann, *, On Sat, 11 Feb 2023 17:49:26 +0100, "Yann E. MORIN" wrote: > Peter, All, > > On 2023-02-11 17:32 +0100, Peter Seiderer spake thusly: > > Fix SSP missdetection (compiler supports '-fstack-protector-all' command > > line argument but selected libc/toolchain does not support SSP, > > e.g. i686-musl. > > > > Fixes: > > > > - http://autobuild.buildroot.net/results/ded9ad5badbcfa6552443d3ce0866722becfefbd > > > > [...] > > Checking if C compiler supports -fstack-protector-all : yes > > [...] > > Checking for type struct timex : no > > The configuration failed > > (complete log in .../build/ntpsec-1_2_2/build/config.log) > > > > And from build/ntpsec-1_2_2/build/config.log: > > > > err: .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: test.c.1.o: in function `main': > > test.c:(.text.startup+0x2a): undefined reference to `__stack_chk_fail_local' > > .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: .../build/ntpsec-1_2_2/build/.conf_check_01f3f794d5b6ffb7add7ce130581ae04/testbuild/main/testprog: hidden symbol `__stack_chk_fail_local' isn't defined > > .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: final link failed: bad value > > collect2: error: ld returned 1 exit status > > > > Signed-off-by: Peter Seiderer > > --- > > package/ntpsec/ntpsec.mk | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk > > index c7fa2f85a8..18a8353900 100644 > > --- a/package/ntpsec/ntpsec.mk > > +++ b/package/ntpsec/ntpsec.mk > > @@ -30,6 +30,15 @@ NTPSEC_DEPENDENCIES = \ > > libcap \ > > openssl > > > > +# prevent '-fstack-protector-all' compiler flag detection without > > +# ssp support (e.g. i686-musl) > > +ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) > > +define NTPSEC_FORCE_DISABLE_SSP > > + $(SED) s/fstack-protector-all/fstack-protector-all-disabled/g $(@D)/wscript > > +endef > > +endif > > +NTPSEC_PRE_CONFIGURE_HOOKS += NTPSEC_FORCE_DISABLE_SSP > > Assigning to hooks should be done in the conditional if-block, not > outside. > > But in Buildroot, the SSP flags are automatically handled by the > wrapper, so we should just unconditionally remove said flags as set by > the package, like was done in 50cbac5099b1 (package/sysvinit: add patch > to fix compile without stack-protector support) for example (and no, > that commit was not chosen totally at random ;-) ). Nice reference ;-), do you prefer the above sed hack unconditionally (not sure if the wscript will add additional -lssp/-lssp_nonshared if available) or a patch removing the whole -fstack-protector-all/-lssp/-lssp_nonshared handling? Regards, Peter > > Regards, > Yann E. MORIN. > > > # CC="$(HOSTCC)" is strange but needed to build some host tools, the > > # cross-compiler will properly be used to build target code thanks to > > # --cross-compiler > > -- > > 2.39.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > From ju.o at free.fr Sat Feb 11 18:00:10 2023 From: ju.o at free.fr (Julien Olivain) Date: Sat, 11 Feb 2023 19:00:10 +0100 Subject: [Buildroot] [PATCH next v2 5/7] package/python-magic-wormhole-mailbox-server: new package In-Reply-To: <20230211151034.GH2796@scaer> References: <20230211151034.GH2796@scaer> Message-ID: <789a9e1c7f5e0d253cea4254686c3b63@free.fr> Yann, All, On 11/02/2023 16:10, Yann E. MORIN wrote: > Julien, All, > > On 2022-11-22 21:31 +0100, Julien Olivain spake thusly: >> This package is the main server that Magic-Wormhole clients connect >> to. >> The server performs store-and-forward delivery for small key-exchange >> and control messages. Bulk data is sent over a direct TCP connection, >> or through a transit-relay. >> >> https://github.com/magic-wormhole/magic-wormhole-mailbox-server >> >> Signed-off-by: Julien Olivain >> --- > [--SNIP--] >> diff --git a/package/python-magic-wormhole-mailbox-server/Config.in >> b/package/python-magic-wormhole-mailbox-server/Config.in >> new file mode 100644 >> index 0000000000..db20d3e7b6 >> --- /dev/null >> +++ b/package/python-magic-wormhole-mailbox-server/Config.in >> @@ -0,0 +1,15 @@ >> +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER >> + bool "python-magic-wormhole-mailbox-server" >> + select BR2_PACKAGE_PYTHON3_SQLITE # runtime >> + select BR2_PACKAGE_PYTHON_ATTRS # runtime >> + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime > > python-autobahn depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS, > so this should have been propagated. It's relatively easy to reproduce > on current master as of commit 451672e890b5: > > $ KCONFIG_SEED=0x1D15B9D4 make randconfig > [...] > WARNING: unmet direct dependencies detected for > BR2_PACKAGE_PYTHON_AUTOBAHN > Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] > Selected by [y]: > - BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER [=y] && > BR2_PACKAGE_PYTHON3 [=y] > > Care to send a fix, and check the other packages that were added in > this > series, please? Thank you for reporting this issue! I just checked the series and it is the only patch selecting autobhan with the missing host rustc dependency. I will send a patch right away. Best regards, Julien. From bernd.kuhls at t-online.de Sat Feb 11 18:14:39 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 11 Feb 2023 19:14:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/libdrm: bump version to 2.4.115 Message-ID: <20230211181439.33767-1-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003323.html Signed-off-by: Bernd Kuhls --- 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 387beadc3f..87cc170617 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003250.html -sha256 3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026 libdrm-2.4.114.tar.xz -sha512 8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644 libdrm-2.4.114.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003323.html +sha256 554cfbfe0542bddb391b4e3e05bfbbfc3e282b955bd56218d21c0616481f65eb libdrm-2.4.115.tar.xz +sha512 0c38d3cfd76f627b899f052527c2939d5fc87a417422dceb0761839ba21e69736703a87ba170b5ba7a4aca2506a240760c8c97ca1781a7fb78468225295293bd libdrm-2.4.115.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index cfb0f730fb..f0a6a29636 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.114 +LIBDRM_VERSION = 2.4.115 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT -- 2.39.1 From bernd.kuhls at t-online.de Sat Feb 11 18:22:00 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 11 Feb 2023 19:22:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.2.2 Message-ID: <20230211182200.227946-1-bernd.kuhls@t-online.de> Release notes: https://news-web.php.net/php.announce/345 Changelog: https://www.php.net/ChangeLog-8.php#8.2.2 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 a9c3b7640b..869cb9b94f 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af php-8.2.1.tar.xz +sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 372d55f68a..9ce153f4fa 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.1 +PHP_VERSION = 8.2.2 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES -- 2.39.1 From bernd.kuhls at t-online.de Sat Feb 11 18:25:36 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 11 Feb 2023 19:25:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xlib_libX11: bump version to 1.8.4 Message-ID: <20230211182536.271767-1-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003318.html Signed-off-by: Bernd Kuhls --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 62b67ad544..ed68164d5f 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003305.html -sha256 e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd libX11-1.8.3.tar.xz -sha512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 libX11-1.8.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003318.html +sha256 c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518 libX11-1.8.4.tar.xz +sha512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e libX11-1.8.4.tar.xz # Locally computed sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 3bb3fffce0..add16f49db 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.8.3 +XLIB_LIBX11_VERSION = 1.8.4 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT -- 2.39.1 From thomas at devoogdt.com Sat Feb 11 18:25:43 2023 From: thomas at devoogdt.com (thomas at devoogdt.com) Date: Sat, 11 Feb 2023 19:25:43 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/fluent-bit: bump to version 2.0.9 Message-ID: <20230211182546.633728-1-thomas@devoogdt.com> From: Thomas Devoogdt - Release Notes: https://fluentbit.io/announcements/v2.0.9/ - Patch dropped, as it is upstream: https://github.com/fluent/fluent-bit/commit/7bcb502ebdcd647d6b83c972805e734ad522eb1a Signed-off-by: Thomas Devoogdt --- v2: moved to a serie of patches ...eLists.txt-only-require-a-C-compiler.patch | 27 ------------------- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch diff --git a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch b/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch deleted file mode 100644 index e71bcf0c0d..0000000000 --- a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7bcb502ebdcd647d6b83c972805e734ad522eb1a Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 30 Jan 2023 09:10:37 +0100 -Subject: [PATCH] CMakeLists.txt: only require a C compiler - -Fluent-bit is mostly written in C, -so don't require CXX in the top-level project. - -Signed-off-by: Thomas Devoogdt ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7adb02de..3ff7360d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.12) --project(fluent-bit) -+project(fluent-bit C) - - # CMP0069 ensures that LTO is enabled for all compilers - cmake_policy(SET CMP0069 NEW) --- -2.30.2 - diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index ce7cea7b59..0caadcd56f 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8ff5566389033669feabc9c69a5c6f417dad5c8b066454388e6a706507262acf fluent-bit-2.0.8.tar.gz +sha256 393ad4a6ced48c327607653d610ef273843085a17b6e5c8013877abdf31e6945 fluent-bit-2.0.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 13077e53cc..c10ef613d7 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.0.8 +FLUENT_BIT_VERSION = 2.0.9 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE -- 2.34.1 From thomas at devoogdt.com Sat Feb 11 18:25:44 2023 From: thomas at devoogdt.com (thomas at devoogdt.com) Date: Sat, 11 Feb 2023 19:25:44 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/fluent-bit: add support for non glibc toolchain In-Reply-To: <20230211182546.633728-1-thomas@devoogdt.com> References: <20230211182546.633728-1-thomas@devoogdt.com> Message-ID: <20230211182546.633728-2-thomas@devoogdt.com> From: Thomas Devoogdt - require threads and dynamic library support - require sync_4 support - provide fts.h trough musl-fts static_assert is not available if no C++ toolchain or no glibc is used, so add two patches to fix this Signed-off-by: Thomas Devoogdt --- v2: rebased the c-ares patch .../0001-lib-cfl-fixup-static_assert.patch | 33 +++++++++++ .../0002-lib-c-ares-fixup-static_assert.patch | 56 +++++++++++++++++++ package/fluent-bit/Config.in | 10 +++- package/fluent-bit/fluent-bit.mk | 11 +++- 4 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch create mode 100644 package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch diff --git a/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch b/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch new file mode 100644 index 0000000000..19dab7cac6 --- /dev/null +++ b/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch @@ -0,0 +1,33 @@ +From e4f825dd9e952f4a056bf89342049e67102ae6bb Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:38:15 +0100 +Subject: [PATCH] lib: cfl: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 + +Signed-off-by: Thomas Devoogdt +--- + lib/cfl/lib/xxhash/xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/cfl/lib/xxhash/xxhash.h b/lib/cfl/lib/xxhash/xxhash.h +index 08ab79457..511c4d12b 100644 +--- a/lib/cfl/lib/xxhash/xxhash.h ++++ b/lib/cfl/lib/xxhash/xxhash.h +@@ -1546,8 +1546,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else +-- +2.34.1 + diff --git a/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch new file mode 100644 index 0000000000..d9b918ea8a --- /dev/null +++ b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch @@ -0,0 +1,56 @@ +From f55f9bf6d9201169d2e5d3782068b03ff17dec90 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:26:56 +0100 +Subject: [PATCH] lib: c-ares: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/c-ares/c-ares/issues/504 + +Signed-off-by: Thomas Devoogdt +--- + lib/c-ares-1.19.0/configure | 4 ++++ + lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/lib/c-ares-1.19.0/configure b/lib/c-ares-1.19.0/configure +index 4c5e1a966..58712ec34 100755 +--- a/lib/c-ares-1.19.0/configure ++++ b/lib/c-ares-1.19.0/configure +@@ -6317,6 +6317,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +@@ -6394,6 +6396,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +diff --git a/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 b/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 +index 229de3091..fe4a11c67 100644 +--- a/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 ++++ b/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 +@@ -37,6 +37,9 @@ + #serial 9 + + m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ ++ ++#define static_assert _Static_assert ++ + template + struct check + { +-- +2.34.1 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 6c2299e695..f53eacb447 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_FLUENT_BIT bool "fluent-bit" - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_STATIC_LIBS # dlfcn.h + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBYAML help @@ -29,5 +32,6 @@ config BR2_PACKAGE_FLUENT_BIT_WASM endif -comment "fluent-bit needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC +comment "fluent-bit needs a toolchain w/ threads, dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index c10ef613d7..4ecf813511 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -49,12 +49,19 @@ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +FLUENT_BIT_DEPENDENCIES += musl-fts +FLUENT_BIT_LDFLAGS += -lfts +endif + # Uses __atomic_compare_exchange_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS=-latomic +FLUENT_BIT_LDFLAGS += -latomic endif +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" + define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ $(TARGET_DIR)/etc/init.d/S99fluent-bit -- 2.34.1 From thomas at devoogdt.com Sat Feb 11 18:25:45 2023 From: thomas at devoogdt.com (thomas at devoogdt.com) Date: Sat, 11 Feb 2023 19:25:45 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/fluent-bit: fix builds on s390x architectures In-Reply-To: <20230211182546.633728-1-thomas@devoogdt.com> References: <20230211182546.633728-1-thomas@devoogdt.com> Message-ID: <20230211182546.633728-3-thomas@devoogdt.com> From: Thomas Devoogdt Fixes: - http://autobuild.buildroot.net/results/856fd250f75a696694c70e3208ffcef7470a7082 - http://autobuild.buildroot.net/results/dceb413fb5d459338417d8dd5a42d95aa23e849b Signed-off-by: Thomas Devoogdt --- v2: new patch in this serie package/fluent-bit/fluent-bit.mk | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 4ecf813511..d618fdf1e2 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -12,6 +12,9 @@ FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl +FLUENT_BIT_CFLAGS = $(TARGET_CFLAGS) +FLUENT_BIT_CXXFLAGS = $(TARGET_CXXFLAGS) + FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ -DFLB_RELEASE=Yes \ @@ -42,12 +45,16 @@ FLUENT_BIT_CONF_OPTS += \ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_INSTALL_SYSCONFDIR="/etc/" +# Fix multiple definition of `mk_tls_*'. +# https://github.com/fluent/fluent-bit/issues/5537 +FLUENT_BIT_CFLAGS += -fcommon +FLUENT_BIT_CXXFLAGS += -fcommon + # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h # large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information. -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +# https://bugzilla.redhat.com/show_bug.cgi?id=574992 +FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS +FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) FLUENT_BIT_DEPENDENCIES += musl-fts @@ -60,7 +67,9 @@ FLUENT_BIT_LDFLAGS += -latomic endif FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" \ + -DCMAKE_C_FLAGS="$(FLUENT_BIT_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(FLUENT_BIT_CXXFLAGS)" define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ -- 2.34.1 From bernd.kuhls at t-online.de Sat Feb 11 18:28:38 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 11 Feb 2023 19:28:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xapp_xvidtune: bump version to 1.0.4 Message-ID: <20230211182838.272469-1-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003319.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls --- package/x11r7/xapp_xvidtune/xapp_xvidtune.hash | 5 +++-- package/x11r7/xapp_xvidtune/xapp_xvidtune.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash index ecf7d0330b..0e7e231383 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002129.html -sha256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 xvidtune-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003319.html +sha256 0d4eecd54e440cc11f1bdaaa23180fcf890f003444343f533f639086b05b2cc5 xvidtune-1.0.4.tar.xz +sha512 747d5358f4f7d3d7db508c3f034711ce4b9dd278160d35312e9c4d1604623e84a2438d039b536546fd2df7db8c5ea1907e8a6101985fad2932b6dee5a62c7b80 xvidtune-1.0.4.tar.xz # Locally computed sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk index d7c4d5bf56..cc40d39098 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XVIDTUNE_VERSION = 1.0.3 -XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2 -XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XVIDTUNE_VERSION = 1.0.4 +XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.xz +XAPP_XVIDTUNE_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XVIDTUNE_LICENSE = MIT XAPP_XVIDTUNE_LICENSE_FILES = COPYING XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm -- 2.39.1 From romain.naour at gmail.com Sat Feb 11 18:28:38 2023 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 11 Feb 2023 19:28:38 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain/helper: check the arch sysroot Message-ID: <20230211182839.3841661-1-romain.naour@gmail.com> Since the commit [1], the utils/genrandconfig script improved the configuration randomization used by autobuilders. Since then it can generate a configuration that is not suitable for an external toolchain such the "Codescape IMG GNU Linux Toolchain". Indeed this toolchain can be selected for mips32r5 or mips64r5 while only mips32r2 or mips64r2 are really supported. The toolchain issue will be fixed in a followup change. We want to catch such issue in check_unusable_toolchain function otherwise it is detected late during the sysroot import into staging and trigger a weird error message: ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot/usr//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory This is similar test than for the main sysroot check but this time we have to use the toolchain cflags to check the architecture sysroot. If the architecture sysroot doesn't exist, the toolchain will reply with "libc.a". Either the toolchain is really broken or we used a wrong target architecture variant. In the later case, the toolchain infrastructure will print a meaningful error message. Note: We also may get a similar issue using the toolchain-external-custom package if a toolchain is used with a wrong target architecture variant. Fixes: http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ [1] aeee90ec109b83c42779e6a2617f7d57e25a2b65 Signed-off-by: Romain Naour Cc: Giulio Benetti Cc: Thomas De Schampheleire Cc: Thomas Petazzoni --- Note: We should improve the Buildroot testsuite to test the toolchain wrapper corner cases. --- toolchain/helpers.mk | 11 +++++++++++ .../toolchain-external/pkg-toolchain-external.mk | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 1cd7494fdb..24c482923a 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -422,12 +422,16 @@ check_cross_compiler_exists = \ # the host tuple. # - Exclude distro-class toolchains which are not relocatable. # - Exclude broken toolchains which return "libc.a" with -print-file-name. +# - Exclude toolchains used with wrong toolchain cflags or broken toolchains +# which return "libc.a" with -print-file-name and toolchain cflags. # - Exclude toolchains which doesn't support --sysroot option. # # $1: cross-gcc path +# $1: toolchain cflags # check_unusable_toolchain = \ __CROSS_CC=$(strip $1) ; \ + __TOOLCHAIN_CFLAGS=$(strip $2) ; \ vendor=`$${__CROSS_CC} -dumpmachine | cut -f2 -d'-'` ; \ if test "$${vendor}" = "angstrom" ; then \ echo "Angstrom toolchains are not pure toolchains: they contain" ; \ @@ -449,6 +453,13 @@ check_unusable_toolchain = \ echo "Unable to detect the toolchain sysroot, Buildroot cannot use this toolchain." ; \ exit 1 ; \ fi ; \ + libc_a_archsysroot_path=`$${__CROSS_CC} $${__TOOLCHAIN_CFLAGS} -print-file-name=libc.a` ; \ + if test "$${libc_a_archsysroot_path}" = "libc.a" ; then \ + echo "Unable to detect the toolchain architecture sysroot." ; \ + echo "Please check the Target Architecture Variant selected, the toolchains may not support it." ; \ + echo "Buildroot cannot use this toolchain." ; \ + exit 1 ; \ + fi; \ sysroot_dir="$(call toolchain_find_sysroot,$${__CROSS_CC})" ; \ if test -z "$${sysroot_dir}" ; then \ echo "External toolchain doesn't support --sysroot. Cannot use." ; \ diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 299b6008aa..c37f3500d9 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -563,7 +563,7 @@ endif # kernel headers version, type of C library and all C library features. define $(2)_CONFIGURE_CMDS $$(Q)$$(call check_cross_compiler_exists,$$(TOOLCHAIN_EXTERNAL_CC)) - $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC)) + $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC),"$$(TOOLCHAIN_EXTERNAL_CFLAGS)") $$(Q)SYSROOT_DIR="$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC))" ; \ $$(call check_kernel_headers_version,\ $$(BUILD_DIR),\ -- 2.34.3 From romain.naour at gmail.com Sat Feb 11 18:28:39 2023 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 11 Feb 2023 19:28:39 +0100 Subject: [Buildroot] [PATCH 2/2] toolchain/toolchain-external/toolchain-external-codescape-mti-mips: remove wrong MIPS32r5 and MIPS64r5 support In-Reply-To: <20230211182839.3841661-1-romain.naour@gmail.com> References: <20230211182839.3841661-1-romain.naour@gmail.com> Message-ID: <20230211182839.3841661-2-romain.naour@gmail.com> This toolchain doesn't support MIPS32r5 and MIPS64r5 and the toolchain infrastructure fail to import the sysroot to staging. Fixes: c4a62fa6278058461ff9e501ba6e822486453493 Fixes: http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ Signed-off-by: Romain Naour Cc: Thomas Petazzoni --- .../toolchain-external-codescape-mti-mips/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index c58c55119a..8217ddc38c 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -3,8 +3,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) || \ - BR2_MIPS_CPU_MIPS32R5 || (BR2_MIPS_CPU_MIPS64R5 && !BR2_MIPS_SOFT_FLOAT) + depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 -- 2.34.3 From bernd.kuhls at t-online.de Sat Feb 11 18:31:42 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 11 Feb 2023 19:31:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 Message-ID: <20230211183142.397167-1-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003321.html Fixes CVE-2023-0494: https://lists.x.org/archives/xorg-announce/2023-February/003320.html Signed-off-by: Bernd Kuhls --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 0c3c807ff3..e2a2a251c3 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003310.html -sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz -sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003321.html +sha256 d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb xorg-server-21.1.7.tar.xz +sha512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5 xorg-server-21.1.7.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 04eb5e90b7..33b35b7979 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.6 +XSERVER_XORG_SERVER_VERSION = 21.1.7 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT -- 2.39.1 From bernd.kuhls at t-online.de Sat Feb 11 18:37:15 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 11 Feb 2023 19:37:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xapp_beforelight: bump version to 1.0.6 Message-ID: <20230211183715.432384-1-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003317.html Updated license hash due to upstream commit: https://gitlab.freedesktop.org/xorg/app/beforelight/-/commit/fa1e473dd64673a36a73a01a84a8db61eaa425dc Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls --- package/x11r7/xapp_beforelight/xapp_beforelight.hash | 7 ++++--- package/x11r7/xapp_beforelight/xapp_beforelight.mk | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.hash b/package/x11r7/xapp_beforelight/xapp_beforelight.hash index 00aff75779..f5b0cb21a4 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.hash +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002131.html -sha256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 beforelight-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-January/003317.html +sha256 53f0bf085b7272ebbf626d1b9b0ad320d1a07bc1fe7f3ae260c86a71a857ad28 beforelight-1.0.6.tar.xz +sha512 48a165d151676f6d213883bee98b34007403a77e025253c8649f9a0f5ea258b09381ab523a5e906030ac9fc8245fce2c6beaf9ad0f81116e302d51ad4a0fad5a beforelight-1.0.6.tar.xz # Locally computed -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING +sha256 3909739fae1ee37c3c7167a91f53d29317965aaf932813e16ef733f033619a7b COPYING diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk index 7dcb715ef3..6b753833f7 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_BEFORELIGHT_VERSION = 1.0.5 -XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2 -XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_BEFORELIGHT_VERSION = 1.0.6 +XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.xz +XAPP_BEFORELIGHT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_BEFORELIGHT_LICENSE = MIT XAPP_BEFORELIGHT_LICENSE_FILES = COPYING XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt -- 2.39.1 From james.hilliard1 at gmail.com Sat Feb 11 18:43:46 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 11 Feb 2023 11:43:46 -0700 Subject: [Buildroot] [PATCH 1/1] Makefile: fix rule order for legal-info Message-ID: <20230211184346.1192333-1-james.hilliard1@gmail.com> This command relies on the clean/prepare operations being in a specific order. Currently the execution ordering of the clean/prepare operations may change, for example if --shuffle=reversed is set. To ensure the evaluation order is always correct use double colon rules to make the evaluation order explicit as per make docs: The double-colon rules for a target are executed in the order they appear in the makefile. Signed-off-by: James Hilliard --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4880b426b5..09575a5e3c 100644 --- a/Makefile +++ b/Makefile @@ -839,7 +839,9 @@ legal-info-prepare: $(LEGAL_INFO_DIR) @cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config .PHONY: legal-info -legal-info: legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ +legal-info:: legal-info-clean +legal-info:: legal-info-prepare +legal-info:: $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) @cat support/legal-info/README.header >>$(LEGAL_REPORT) @if [ -r $(LEGAL_WARNINGS) ]; then \ -- 2.34.1 From peter at korsgaard.com Sat Feb 11 22:18:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.2.2 In-Reply-To: <20230211182200.227946-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 11 Feb 2023 19:22:00 +0100") References: <20230211182200.227946-1-bernd.kuhls@t-online.de> Message-ID: <87mt5jdex1.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://news-web.php.net/php.announce/345 > Changelog: https://www.php.net/ChangeLog-8.php#8.2.2 > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 11 22:18:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libdrm: bump version to 2.4.115 In-Reply-To: <20230211181439.33767-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 11 Feb 2023 19:14:39 +0100") References: <20230211181439.33767-1-bernd.kuhls@t-online.de> Message-ID: <87ilg7dewj.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003323.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 11 22:18:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xlib_libX11: bump version to 1.8.4 In-Reply-To: <20230211182536.271767-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 11 Feb 2023 19:25:36 +0100") References: <20230211182536.271767-1-bernd.kuhls@t-online.de> Message-ID: <87edqvdewc.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003318.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 11 22:20:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:20:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 In-Reply-To: <20230211183142.397167-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 11 Feb 2023 19:31:42 +0100") References: <20230211183142.397167-1-bernd.kuhls@t-online.de> Message-ID: <87a61jdetj.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003321.html > Fixes CVE-2023-0494: > https://lists.x.org/archives/xorg-announce/2023-February/003320.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 11 22:18:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:12 +0100 Subject: [Buildroot] [git commit] package/php: bump version to 8.2.2 Message-ID: <20230211222114.6D4F8854A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a54bb2a2d99b835f672ae194dc4934757881e08b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://news-web.php.net/php.announce/345 Changelog: https://www.php.net/ChangeLog-8.php#8.2.2 Signed-off-by: Bernd Kuhls 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 a9c3b7640b..869cb9b94f 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af php-8.2.1.tar.xz +sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 372d55f68a..9ce153f4fa 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.1 +PHP_VERSION = 8.2.2 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 11 22:18:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:26 +0100 Subject: [Buildroot] [git commit] package/x11r7/xlib_libX11: bump version to 1.8.4 Message-ID: <20230211222114.7F2A4854B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b9bea584c2f2c14122395eba7cdbf325ed7256c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003318.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 62b67ad544..ed68164d5f 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003305.html -sha256 e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd libX11-1.8.3.tar.xz -sha512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 libX11-1.8.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003318.html +sha256 c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518 libX11-1.8.4.tar.xz +sha512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e libX11-1.8.4.tar.xz # Locally computed sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 3bb3fffce0..add16f49db 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.8.3 +XLIB_LIBX11_VERSION = 1.8.4 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT From peter at korsgaard.com Sat Feb 11 22:20:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:20:15 +0100 Subject: [Buildroot] [git commit] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 Message-ID: <20230211222114.A07DB854A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8f0c02574b485e3250030d8cbf5c057ced578a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003321.html Fixes CVE-2023-0494: https://lists.x.org/archives/xorg-announce/2023-February/003320.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 0c3c807ff3..e2a2a251c3 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003310.html -sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz -sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003321.html +sha256 d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb xorg-server-21.1.7.tar.xz +sha512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5 xorg-server-21.1.7.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 04eb5e90b7..33b35b7979 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.6 +XSERVER_XORG_SERVER_VERSION = 21.1.7 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From peter at korsgaard.com Sat Feb 11 22:18:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:48 +0100 Subject: [Buildroot] [git commit] package/libdrm: bump version to 2.4.115 Message-ID: <20230211222114.8EB3A854C7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e1fdd144300106704e21176673e465163245669 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003323.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 387beadc3f..87cc170617 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003250.html -sha256 3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026 libdrm-2.4.114.tar.xz -sha512 8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644 libdrm-2.4.114.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003323.html +sha256 554cfbfe0542bddb391b4e3e05bfbbfc3e282b955bd56218d21c0616481f65eb libdrm-2.4.115.tar.xz +sha512 0c38d3cfd76f627b899f052527c2939d5fc87a417422dceb0761839ba21e69736703a87ba170b5ba7a4aca2506a240760c8c97ca1781a7fb78468225295293bd libdrm-2.4.115.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 56366b6c48..52ac13b7d0 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.114 +LIBDRM_VERSION = 2.4.115 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From francois.dugast.foss at gmail.com Sat Feb 11 22:47:55 2023 From: francois.dugast.foss at gmail.com (Francois Dugast) Date: Sat, 11 Feb 2023 23:47:55 +0100 Subject: [Buildroot] [PATCH 1/1] board/visionfive2: add link to documentation Message-ID: <20230211224755.13044-1-francois.dugast.foss@gmail.com> Add a link to RVspace Documentation Center, which did not exist when readme.txt was first submitted. It provides datasheet, quick start, schematics, and so on. Signed-off-by: Francois Dugast --- board/visionfive2/readme.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt index 2da98f3847..1924cbc12b 100644 --- a/board/visionfive2/readme.txt +++ b/board/visionfive2/readme.txt @@ -4,6 +4,8 @@ Starfive VisionFive2 The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a Starfive JH7110 processor. +https://doc-en.rvspace.org/Doc_Center/visionfive_2.html + How to build ============ -- 2.30.2 From christian at paral.in Sun Feb 12 01:42:16 2023 From: christian at paral.in (Christian Stewart) Date: Sat, 11 Feb 2023 17:42:16 -0800 Subject: [Buildroot] [PATCH 1/1] package/rtl8723ds: bump to 2023-02-11 version with new license file Message-ID: <20230212014216.6293-1-christian@paral.in> A COPYING file has been added to rtl8723ds as of the most recent commit. Update the version of the package and add the license file hash. Signed-off-by: Christian Stewart --- package/rtl8723ds/rtl8723ds.hash | 3 ++- package/rtl8723ds/rtl8723ds.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index d5abf9913c..e94a7b40ef 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 97f3ebc5d977ba35d10c9c06e6817e4a00458727b651b56fc00c207c05a61995 rtl8723ds-a638cc8639015b8b9390af3350fab0366b6c87e7.tar.gz +sha256 672787c3f3d1f795b750cd74de8ca34bb661b8ae60f5aa50fb279ec08ff3f05f rtl8723ds-ec85dc6b9f72bfe413bff464ed01a272e29c8dbe.tar.gz +sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 COPYING diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index f303a24041..1bb164fa86 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,9 +4,10 @@ # ################################################################################ -RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 +RTL8723DS_VERSION = ec85dc6b9f72bfe413bff464ed01a272e29c8dbe RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 +RTL8723DS_LICENSE_FILES = COPYING RTL8723DS_USER_EXTRA_CLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ -- 2.39.1 From christian at paral.in Sun Feb 12 01:54:41 2023 From: christian at paral.in (Christian Stewart) Date: Sat, 11 Feb 2023 17:54:41 -0800 Subject: [Buildroot] [PATCH 1/3] package/go-bootstrap: split into two stages: go1.4 and go1.19.5 Message-ID: <20230212015443.7740-1-christian@paral.in> Go 1.20 requires a minimum version of go 1.17.13 to bootstrap. https://go.dev/doc/go1.20#bootstrap As Go 1.4 was the previous version that could be compiled with C, there is now no way to bootstrap go with a C compiler, unless we use a two-stage bootstrap: - build host-go-bootstrap-1.4-20170531 - build host-go-bootstrap-1.19.5 with host-go-bootstrap-1.4-20170531 - build host-go-1.20 with host-go-bootstrap-1.19.5 This is implemented in this commit first, before upgrading host-go to 1.20. Note: the .patch files from package/go version 1.19.x are not necessary for package/go-bootstrap-stage2 and have not been included there. Discussion of possible alternate approaches for future use: https://lore.kernel.org/all/CA+h8R2rtcynkCBsz=_9yANOEguyPCOcQDj8_ns+cv8RS8+8t9A at mail.gmail.com/ https://lore.kernel.org/all/20220525234312.643dfc03 at windsurf/T/ Signed-off-by: Christian Stewart --- v1 -> v2: - fix indentation of GOROOT_BOOTSTRAP in stage2 MAKE_ENV - adjust commit description - remove duplicate MAKE_ENV declaration line - reorder depends on lines in config.in.host Signed-off-by: Christian Stewart --- DEVELOPERS | 2 + package/Config.in.host | 3 +- package/go-bootstrap-stage1/Config.in.host | 6 ++ .../go-bootstrap-stage1.hash} | 0 .../go-bootstrap-stage1.mk | 46 ++++++++++++++++ package/go-bootstrap-stage2/Config.in.host | 4 ++ .../go-bootstrap-stage2.hash | 3 + .../go-bootstrap-stage2.mk | 55 +++++++++++++++++++ package/go-bootstrap/Config.in.host | 7 --- package/go-bootstrap/go-bootstrap.mk | 50 ----------------- package/go/Config.in.host | 6 +- package/go/go.mk | 9 ++- 12 files changed, 126 insertions(+), 65 deletions(-) create mode 100644 package/go-bootstrap-stage1/Config.in.host rename package/{go-bootstrap/go-bootstrap.hash => go-bootstrap-stage1/go-bootstrap-stage1.hash} (100%) create mode 100644 package/go-bootstrap-stage1/go-bootstrap-stage1.mk create mode 100644 package/go-bootstrap-stage2/Config.in.host create mode 100644 package/go-bootstrap-stage2/go-bootstrap-stage2.hash create mode 100644 package/go-bootstrap-stage2/go-bootstrap-stage2.mk delete mode 100644 package/go-bootstrap/Config.in.host delete mode 100644 package/go-bootstrap/go-bootstrap.mk diff --git a/DEVELOPERS b/DEVELOPERS index ae698f87c5..ddfbb12b27 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -548,6 +548,8 @@ F: package/docker-engine/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ +F: package/go-bootstrap-stage1/ +F: package/go-bootstrap-stage2/ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ diff --git a/package/Config.in.host b/package/Config.in.host index dcadbfdfc1..fff75cd165 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -40,7 +40,8 @@ menu "Host utilities" source "package/genpart/Config.in.host" source "package/gnupg/Config.in.host" source "package/go/Config.in.host" - source "package/go-bootstrap/Config.in.host" + source "package/go-bootstrap-stage1/Config.in.host" + source "package/go-bootstrap-stage2/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imagemagick/Config.in.host" diff --git a/package/go-bootstrap-stage1/Config.in.host b/package/go-bootstrap-stage1/Config.in.host new file mode 100644 index 0000000000..56a743caf9 --- /dev/null +++ b/package/go-bootstrap-stage1/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS + bool + # See src/cmd/dist/unix.c for the list of supported architectures + default y if BR2_HOSTARCH = "x86" + default y if BR2_HOSTARCH = "x86_64" + default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.hash b/package/go-bootstrap-stage1/go-bootstrap-stage1.hash similarity index 100% rename from package/go-bootstrap/go-bootstrap.hash rename to package/go-bootstrap-stage1/go-bootstrap-stage1.hash diff --git a/package/go-bootstrap-stage1/go-bootstrap-stage1.mk b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk new file mode 100644 index 0000000000..77e7046cd7 --- /dev/null +++ b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# go-bootstrap-stage1 +# +################################################################################ + +# Use last C-based Go compiler: v1.4.x +# See https://golang.org/doc/install/source#bootstrapFromSource +GO_BOOTSTRAP_STAGE1_VERSION = 1.4-bootstrap-20171003 +GO_BOOTSTRAP_STAGE1_SITE = https://dl.google.com/go +GO_BOOTSTRAP_STAGE1_SOURCE = go$(GO_BOOTSTRAP_STAGE1_VERSION).tar.gz + +GO_BOOTSTRAP_STAGE1_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE1_LICENSE_FILES = LICENSE + +# The toolchain is needed for HOSTCC_NOCACHE used to compile the Go compiler. +HOST_GO_BOOTSTRAP_STAGE1_DEPENDENCIES = toolchain + +HOST_GO_BOOTSTRAP_STAGE1_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE1_VERSION) + +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV = \ + GOOS=linux \ + GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_STAGE1_ROOT)" \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + CC=$(HOSTCC_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE1_BUILD_CMDS + cd $(@D)/src && $(HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV) ./make.bash +endef + +define HOST_GO_BOOTSTRAP_STAGE1_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + + # https://golang.org/issue/2775 + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap-stage2/Config.in.host b/package/go-bootstrap-stage2/Config.in.host new file mode 100644 index 0000000000..967ddaed1d --- /dev/null +++ b/package/go-bootstrap-stage2/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash new file mode 100644 index 0000000000..4c22f0f274 --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash @@ -0,0 +1,3 @@ +# From https://go.dev/dl +sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk new file mode 100644 index 0000000000..b623978500 --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -0,0 +1,55 @@ +################################################################################ +# +# go-bootstrap-stage2 +# +################################################################################ + +GO_BOOTSTRAP_STAGE2_VERSION = 1.19.5 +GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang +GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz + +GO_BOOTSTRAP_STAGE2_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE2_LICENSE_FILES = LICENSE + +# Use go-bootstrap-stage1 to bootstrap. +HOST_GO_BOOTSTRAP_STAGE2_DEPENDENCIES = host-go-bootstrap-stage1 + +HOST_GO_BOOTSTRAP_STAGE2_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE2_VERSION) + +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV = \ + GO111MODULE=off \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE1_ROOT) \ + GOROOT_FINAL=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + GOOS=linux \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE2_BUILD_CMDS + cd $(@D)/src && \ + $(HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) +endef + +define HOST_GO_BOOTSTRAP_STAGE2_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ + + mkdir -p $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg + cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + cp -a $(@D)/pkg/tool $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + + # https://golang.org/issue/2775 + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ + + # Set all file timestamps to prevent the go compiler from rebuilding any + # built in packages when programs are built. + find $(HOST_GO_BOOTSTRAP_STAGE2_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap/Config.in.host b/package/go-bootstrap/Config.in.host deleted file mode 100644 index fab80d24b4..0000000000 --- a/package/go-bootstrap/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS - bool - # See src/cmd/dist/unix.c for the list of support - # architectures - default y if BR2_HOSTARCH = "x86" - default y if BR2_HOSTARCH = "x86_64" - default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.mk b/package/go-bootstrap/go-bootstrap.mk deleted file mode 100644 index 71696a1540..0000000000 --- a/package/go-bootstrap/go-bootstrap.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# go-bootstrap -# -################################################################################ - -# Use last C-based Go compiler: v1.4.x -# See https://golang.org/doc/install/source#bootstrapFromSource -GO_BOOTSTRAP_VERSION = 1.4-bootstrap-20171003 -GO_BOOTSTRAP_SITE = https://dl.google.com/go -GO_BOOTSTRAP_SOURCE = go$(GO_BOOTSTRAP_VERSION).tar.gz - -GO_BOOTSTRAP_LICENSE = BSD-3-Clause -GO_BOOTSTRAP_LICENSE_FILES = LICENSE - -# To build programs that need cgo support the toolchain needs to be -# available, so the toolchain is not needed to build host-go-bootstrap -# itself, but needed by other packages that depend on -# host-go-bootstrap. -HOST_GO_BOOTSTRAP_DEPENDENCIES = toolchain - -HOST_GO_BOOTSTRAP_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_VERSION) - -# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE -# here. See https://github.com/golang/go/issues/11685. -HOST_GO_BOOTSTRAP_MAKE_ENV = \ - GOOS=linux \ - GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_ROOT)" \ - GOROOT="$(@D)" \ - GOBIN="$(@D)/bin" \ - CC=$(HOSTCC_NOCCACHE) \ - CGO_ENABLED=0 - -define HOST_GO_BOOTSTRAP_BUILD_CMDS - cd $(@D)/src && $(HOST_GO_BOOTSTRAP_MAKE_ENV) ./make.bash -endef - -define HOST_GO_BOOTSTRAP_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_ROOT)/bin/go - $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_ROOT)/bin/gofmt - - cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_ROOT)/ - cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_ROOT)/ - - # There is a known issue which requires the go sources to be installed - # https://golang.org/issue/2775 - cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_ROOT)/ -endef - -$(eval $(host-generic-package)) diff --git a/package/go/Config.in.host b/package/go/Config.in.host index ded02d3b3a..b87b862cec 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,7 +2,9 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + # See https://go.dev/doc/install/source#environment + # See src/go/build/syslist.go for the list of supported architectures depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ || BR2_mips64 || BR2_mips64el || BR2_riscv || BR2_s390x @@ -28,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go/go.mk b/package/go/go.mk index c38ae0b99c..b0dd002712 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -12,7 +12,7 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap +HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -121,12 +121,12 @@ HOST_GO_HOST_ENV = \ CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \ CGO_LDFLAGS="$(HOST_LDFLAGS)" -# The go build system is not compatible with ccache, so use -# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_ROOT) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -154,7 +154,6 @@ define HOST_GO_INSTALL_CMDS cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ - # There is a known issue which requires the go sources to be installed # https://golang.org/issue/2775 cp -a $(@D)/src $(HOST_GO_ROOT)/ -- 2.39.1 From christian at paral.in Sun Feb 12 01:54:42 2023 From: christian at paral.in (Christian Stewart) Date: Sat, 11 Feb 2023 17:54:42 -0800 Subject: [Buildroot] [PATCH 2/3] package/go: bump to version 1.20 In-Reply-To: <20230212015443.7740-1-christian@paral.in> References: <20230212015443.7740-1-christian@paral.in> Message-ID: <20230212015443.7740-2-christian@paral.in> The latest Go release, version 1.20, arrives six months after Go 1.19. Most of its changes are in the implementation of the toolchain, runtime, and libraries. https://go.dev/doc/go1.20 Signed-off-by: Christian Stewart --- v1 -> v2: - drop unnecessary change to config.in.host Signed-off-by: Christian Stewart --- ...03-runtime-support-riscv64-SV57-mode.patch | 65 ------------------- package/go/go.hash | 2 +- package/go/go.mk | 4 +- 3 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 package/go/0003-runtime-support-riscv64-SV57-mode.patch diff --git a/package/go/0003-runtime-support-riscv64-SV57-mode.patch b/package/go/0003-runtime-support-riscv64-SV57-mode.patch deleted file mode 100644 index f51c2ca093..0000000000 --- a/package/go/0003-runtime-support-riscv64-SV57-mode.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6618c7af436488fa12018cdcd31eeedb3a698745 Mon Sep 17 00:00:00 2001 -From: Dmitry Vyukov -Date: Fri, 27 May 2022 18:55:35 +0200 -Subject: [PATCH] runtime: support riscv64 SV57 mode - -Riscv64 has SV57 mode when user-space VA is 56 bits. -Linux kernel recently got support for this mode and Go binaries started crashing as: - -runtime: lfstack.push invalid packing: node=0xffffff5908a940 cnt=0x1 -packed=0xffff5908a9400001 -> node=0xffff5908a940 - -Adjust lfstack code to use only 8 top bits of pointers on riscv64. - -For context see: -https://groups.google.com/g/syzkaller-bugs/c/lU0GQTZoNQQ/m/O_c3vmE3AAAJ - -Update #54104 - -Change-Id: Ib5d3d6a79c0c6eddf11618d73fcc8bc1832a9c25 -Signed-off-by: Christian Stewart ---- - -Upstream: https://go-review.googlesource.com/c/go/+/409055/4 ---- - src/runtime/lfstack_64bit.go | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/runtime/lfstack_64bit.go b/src/runtime/lfstack_64bit.go -index 154130cf63..39fa647b9e 100644 ---- a/src/runtime/lfstack_64bit.go -+++ b/src/runtime/lfstack_64bit.go -@@ -36,12 +36,21 @@ const ( - // We use one bit to distinguish between the two ranges. - aixAddrBits = 57 - aixCntBits = 64 - aixAddrBits + 3 -+ -+ // Riscv64 SV57 mode gives 56 bits of userspace VA. -+ // lfstack code supports it, but broader support for SV57 mode is incomplete, -+ // and there may be other issues (see #54104). -+ riscv64AddrBits = 56 -+ riscv64CntBits = 64 - riscv64AddrBits + 3 - ) - - func lfstackPack(node *lfnode, cnt uintptr) uint64 { - if GOARCH == "ppc64" && GOOS == "aix" { - return uint64(uintptr(unsafe.Pointer(node)))<<(64-aixAddrBits) | uint64(cnt&(1<> aixCntBits << 3) | 0xa<<56))) - } -+ if GOARCH == "riscv64" { -+ return (*lfnode)(unsafe.Pointer(uintptr(val >> riscv64CntBits << 3))) -+ } - return (*lfnode)(unsafe.Pointer(uintptr(val >> cntBits << 3))) - } --- -2.35.1 - diff --git a/package/go/go.hash b/package/go/go.hash index 4c22f0f274..204e508fc3 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 3a29ff0421beaf6329292b8a46311c9fbf06c800077ceddef5fb7f8d5b1ace33 go1.20.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index b0dd002712..18d3a80212 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.5 +GO_VERSION = 1.20 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -151,7 +151,7 @@ define HOST_GO_INSTALL_CMDS cp -a $(@D)/lib $(HOST_GO_ROOT)/ mkdir -p $(HOST_GO_ROOT)/pkg - cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ + cp -a $(@D)/pkg/include $(HOST_GO_ROOT)/pkg/ cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ # https://golang.org/issue/2775 -- 2.39.1 From christian at paral.in Sun Feb 12 01:54:43 2023 From: christian at paral.in (Christian Stewart) Date: Sat, 11 Feb 2023 17:54:43 -0800 Subject: [Buildroot] [PATCH 3/3] package/go: use host compiler when go-bootstrap unsupported In-Reply-To: <20230212015443.7740-1-christian@paral.in> References: <20230212015443.7740-1-christian@paral.in> Message-ID: <20230212015443.7740-3-christian@paral.in> All Go compiler versions > 1.4.x (old) are written in Go, and require a existing compiled Go version to use to build from source. https://golang.org/doc/install/source#bootstrapFromSource The process for "bootstrapping" the Go compiler in Buildroot is: 1. Compile a C/C++ cross-compiler (gcc) as the host toolchain. 2. Build go-bootstrap-stage1 (which is Go 1.4.x and written in C) 3. Build go-bootstrap-stage2 (which is Go 1.19.x and written in Go) 3. Build go 1.20 (written in Go) using go-bootstrap-stage2. go-bootstrap-stage1 does not work on 64-bit arm. The Go 1.4.x bootstrap compiler is compatible with x86, x86_64, and arm (32 bit) only. This patch adds a fallback to require a host Go compiler to build host-go when BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS is not set. Signed-off-by: Christian Stewart --- changes prior to inclusion in this series: - thanks Thomas for the review & suggestions - added NEEDS_HOST_GO boolean - added dependency checks to support/dependencies/dependencies.sh - removed unnecessary changes to go-bootstrap package - add dependency on toolchain if Cgo is enabled - updates for go1.20 - updates for go-bootstrap-stage{1,2} changes from v1 -> v2: - remove whitespace fix in bootstrap stage2 Signed-off-by: Christian Stewart --- Config.in | 4 ++++ package/go/Config.in.host | 2 +- package/go/go.mk | 14 ++++++++++++-- support/dependencies/dependencies.sh | 4 ++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Config.in b/Config.in index 0d7641633c..c70ce94d94 100644 --- a/Config.in +++ b/Config.in @@ -58,6 +58,10 @@ config BR2_HOST_GCC_AT_LEAST_9 # When adding new entries above, be sure to update # the HOSTCC_MAX_VERSION variable in the Makefile. +# Hidden boolean selected if bootstrapping Go w/ GCC is not supported. +config BR2_NEEDS_HOST_GO + bool + # Hidden boolean selected by packages in need of Java in order to build # (example: kodi) config BR2_NEEDS_HOST_JAVA diff --git a/package/go/Config.in.host b/package/go/Config.in.host index b87b862cec..7f049ff1ae 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -30,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + select BR2_NEEDS_HOST_GO if !BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go/go.mk b/package/go/go.mk index 18d3a80212..9dcc9321f9 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -12,7 +12,6 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -109,6 +108,11 @@ else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS HOST_GO_CGO_ENABLED = 1 endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +ifeq ($(HOST_GO_CGO_ENABLED),1) +# For cgo support the toolchain needs to be available. +HOST_GO_DEPENDENCIES += toolchain +endif + # For the convenience of host golang packages HOST_GO_HOST_ENV = \ $(HOST_GO_COMMON_ENV) \ @@ -126,7 +130,6 @@ HOST_GO_HOST_ENV = \ HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -136,6 +139,13 @@ HOST_GO_MAKE_ENV = \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ $(HOST_GO_CROSS_ENV) +# Use the Go compiler bootstrapped by Buildroot if available. +# Otherwise, use the host Go compiler. +ifeq ($(BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS),y) +HOST_GO_DEPENDENCIES += host-go-bootstrap-stage2 +HOST_GO_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) +endif + define HOST_GO_BUILD_CMDS cd $(@D)/src && \ $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index cf6635bff6..e2a8db5d9d 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -217,6 +217,10 @@ if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then fi fi +if grep -q ^BR2_NEEDS_HOST_GO=y $BR2_CONFIG ; then + check_prog_host "go" +fi + if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then check_prog_host "java" JAVA_GCJ=$(java -version 2>&1 | grep gcj) -- 2.39.1 From thomas.petazzoni at bootlin.com Sun Feb 12 06:44:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 12 Feb 2023 06:44:48 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-11 Message-ID: <20230212064454.C0648409B2@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-11 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 0 | 1 | 0 | 1 | 2022.11.x | 16 | 23 | 0 | 39 | master | 160 | 217 | 3 | 380 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 18 gobject-introspection-1.72.0 | 17 aubio-0.4.9 | 11 host-pahole-1.24 | 7 host-rust-1.67.0 | 7 host-binutils-2.38 | 6 python-numpy-1.23.5 | 6 unknown | 6 glibc-2.36-81-g4f4d7a13edfd... | 5 linux-6.1.9 | 5 gerbera-1.10.0 | 4 libsolv-0.7.22 | 4 elfutils-0.186 | 3 fluent-bit-2.0.8 | 3 fontconfig-2.13.1 | 3 gobject-introspection | 3 host-binutils-2.37 | 3 host-go-1.19.5 | 3 libglib2-2.72.3 | 3 libgpg-error-1.46 | 3 optee-client-3.19.0 | 3 package/postgresql/postgres... | 3 boost-1.80.0 | 2 dust-0.8.1 | 2 efivar-38 | 2 host-sentry-cli-2.8.0 | 2 janet-1.26.0 | 2 kvmtool-f77d646ba01d04be5aa... | 2 libgcrypt-1.10.1 | 2 linux-5.10.162-cip24-rt10 | 2 lirc-tools-0.10.2 | 2 ocf-linux-20171122 | 2 openblas-0.3.21 | 2 opencv3-3.4.17 | 2 php-8.2.1 | 2 php-xdebug-3.0.4 | 2 python-cryptography-39.0.0 | 2 systemd-252.4 | 2 toolchain-external-codescap... | 2 uqmi-0a19b5b77140465c29e2af... | 2 4th-3.64.1 | 1 acpica-20220331 | 1 bird-2.0.11 | 1 brltty-6.5 | 1 busybox-1.36.0 | 1 cni-plugins-1.2.0 | 1 cppcms-2.0.0-beta2 | 1 dc3dd-7.2.641 | 1 flatbuffers-2.0.8 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/romfs/romfs.mk:32: /home... | 1 fs/tar/tar.mk:38: /home/bui... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fwts-22.09.00 | 1 gmp-6.2.1 | 1 host-binutils-2.39 | 1 host-gcc-final-11.3.0 | 1 host-gdb-arc-2020.09-releas... | 1 host-libarchive-3.6.2 | 1 igh-ethercat-2e2cef61318953... | 1 jack2-1.9.21 | 1 kexec-2.0.25 | 1 libabseil-cpp-20220623.1 | 1 libcamera-apps-1.1.1 | 1 libcap-ng-0.8.3 | 1 libdrm-2.4.114 | 1 libmad-0.15.1b | 1 libnss-3.87 | 1 libsodium-1.0.18 | 1 libvorbis-1.3.7 | 1 linux-5.10.162-cip24 | 1 ltp-testsuite-20220930 | 1 mutt-2.2.9 | 1 netsniff-ng-0.6.8 | 1 netsurf-3.10 | 1 ntp-4.2.8p15 | 1 olsr-0.9.8 | 1 open-iscsi-2.1.8 | 1 openssh-9.1p1 | 1 pcre2-10.42 | 1 perl-5.36.0 | 1 postgresql-legal-info | 1 python-bcrypt-4.0.1 | 1 python-pyicu-2.10.2 | 1 python-pymupdf-1.21.1 | 1 quickjs-2021-03-27 | 1 reaver-1.6.6 | 1 tcf-agent-1.7.0 | 1 tinifier-3.4.0 | 1 tmux-3.3a | 1 traceroute-2.1.0 | 1 valgrind-3.19.0 | 1 xfsprogs-5.14.2 | 1 xlib_libX11-1.8.3 | 1 zabbix-5.4.9 | 1 znc-1.8.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64_be | 4th-3.64.1 | NOK | http://autobuild.buildroot.net/results/f71660c4d4b476ca0c975774b93d25277bd35368 | powerpc64le | acpica-20220331 | NOK | http://autobuild.buildroot.net/results/1496694423b1e08516a0b38dd3945913c10e912b | powerpc64 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/bdf85a975bd5fec92af13fc86aacd1138622ab38 | nios2 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/c6e3393e21de8d94709dc3bee57ffc4315ee4bc2 | i686 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/82ab6b1143f29218189c94b6b9c9bfc0c87d0802 | or1k | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/f2eb9c0291d6dbe48dbfb1bb7548626cc70c8c1f | i686 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/4079951c7c4db612be7c49abb0ed5411a521cce2 | arm | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/5543b848d3d46d69a293e13fdb7ee5aefcde8c9a | sparc | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/230bbd7ed9307751ae2bcb918136eefe57068faf | mips64 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/b6fd3a866af182edc7831492aecc8323f377b826 | arceb | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/26d5083aa5eac332d2db2d03db622f88662e2b2e | or1k | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/fa2ec92405422306b5b070aa8b68ae4ca6f33f1e | nios2 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/6dc2532b798b0c987c19f45be2af0bd55528fd58 | mips64 | bird-2.0.11 | NOK | http://autobuild.buildroot.net/results/fc2f4cb2d09ffb62c92bee1fc588d89fcb7f40a3 | arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/a0266bfbb6e93fac8c59d8c446caad3be51f12c8 | arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/bba03eeff7e2c799543226facb5896d7b87e906c | or1k | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/885b06eaebab89d8c2d488edce5e156875b99e44 | mipsel | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/9b2befe5e5027001b7cbf353dc23b4787720ec33 | ORPH aarch64 | cni-plugins-1.2.0 | NOK | http://autobuild.buildroot.net/results/527a24bdb5eafdf0ae525fb97e46a86076519c11 | nios2 | cppcms-2.0.0-beta2 | NOK | http://autobuild.buildroot.net/results/4a3e6d5eb23a09dfd05735e8982f0b23158759de | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/a29c2c2aa2febd514497b5553157a32537efbade | ORPH x86_64 | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/24289179e5762e0095505444dbc91fc9c97e4512 | ORPH powerpc64le | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/73ba565cb1e5759b7984c378593e46914a7861dd | ORPH x86_64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/2fcdb963a8d33de358144765b59834d2c86db8c1 | i586 | efivar-38 | NOK | http://autobuild.buildroot.net/results/a7671b86e86aefab6b9d6dee4473f923187d9df6 | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/5d30e4a86d3e7adf02a2e02ccc16bbb740991a69 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/afe61caf6bb31f0cfbb14462e06e70348b976c87 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/1da0dd143a4cb5f0032b9195c2908fd713361363 | ORPH m68k | flatbuffers-2.0.8 | NOK | http://autobuild.buildroot.net/results/ee81e3276a56d784c61e8cdbed21e71264995822 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/156b9657bcbdd8643775152ddd86f438361bcc1d | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/854d6217b942c35e11444adf934abf064b916ab6 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/b82a49955a00854816d6c654d61268f4f2b49535 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/034587fcd69e93b43539e404471ae762b47429c0 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/d088fe4fe557ac5494f3bc0b1d4a7ebfd871da60 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/4354008d7227fd6b40b9453e9716b432b078976c | ORPH sh4eb | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/ae7dd6fbb27ceea2aeb960a344885a959058b187 | mips64 | fs/romfs/romfs.mk:32: /home... | NOK | http://autobuild.buildroot.net/results/9409efeecdc5f4b6da58125b46117603612ad98a | x86_64 | fs/tar/tar.mk:38: /home/bui... | NOK | http://autobuild.buildroot.net/results/d5732622c096304755c0172b19ea91485a37a3e7 | sparc | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/01ba26516d4698209fd33001612f142f266292fd | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/776c9bef9a6847c17e327329bfb6a3d43c48f18d | powerpc64le | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/0fb4af5ba536e323536a2922459bfcd4a2bc2bbe | x86_64 | fwts-22.09.00 | NOK | http://autobuild.buildroot.net/results/755c8bf7b13991e78aeed8a973097cc18beec557 | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/a4446448e28d7a5cddeb0efcaca8d5d8613b1318 | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/8256016913018f2ffd555123460a2c6f74972b02 | mips | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/11d7840a1d4ac5d61c8274d41dac7fc761151aba | xtensa | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/ed854fad051d44651777ab316f1e2fa1387b54ff | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/a961b6655fc2f35e381024d90f76e6545456d059 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/7b725674e55cf42c3a2b69a9ccf0298865707b90 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/89d849ddbe667dac0755478487bdada850c62e7d | powerpc64le | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/86931d5d14a01ce682fcd6cb7fc5125bed128e45 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/bb826a87a14760db31865215b60c7f971c5a7f7d | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/2caac63e5f3b8e3b3e220e55bf856bb9ce0340a4 | ORPH nios2 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/4275c68ff5210666c423999a3dd01b7bb9880ff5 | powerpc | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ffa74afd2f2c91ea0a0f9ac74dcef22fcf70e589 | powerpc64le | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/2fe472cb5872b2f4b2bb3a97ae7c75ba8d0afeed | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/b210b40547cc433f74c1691257854e5b9a387099 | powerpc64le | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/636604f8c44bfe83a9640285188e14b256a82742 | mips64el | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/7cb4b3b2f74aaa0f1a4bd7c120ce6fdb30d873d0 | armeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/33496d4995870dd78ce98956349068456898133c | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ff44238599fcaf4f3e4e478e99502072d049f6a6 | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/18afdf2d5c3a17017d7b1a07ff89ec5c023bc65f | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/00a54d9b68040a037049f3c005269e60b4ccab8a | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/4612c8595a5f272d58e7a5b110e8a954550f1f84 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/99dd8445fe43d4a8cb8e82e8b0de8bfeb397b64b | arm | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/47d3ecdde07c7d8c1a38b32e0981332cda15bf56 | riscv32 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6e06939f297f066e2c74d9039b9ff5b582335436 | sh4eb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/29cc2e4b3928af437b758025faa074389e839cd2 | aarch64_be | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/05cae498cb3011e7694bd82e083ed70e83183f0c | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6d88cc2ab92decec032556169e9acff0bf1c6e96 | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/bf437bdce6a47e1058808dd02a0b660c3c33d85a | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/192b2bfaa738ba565c9e28aa79d5b2c9b02da388 | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/ab1ad553aaf0ab9781e125b2a62e80ff656d333c | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/f8a4a22f5647a3b7fd6891f9abec16a16891d16e | or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d717262af52fc79e277d2f6dca3973d4ed9ba3bd | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/dcd3ad1f6df0c95e6a936af4e761b9161a2e3816 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/877ab3fc6a14f9576075194cf340d514fd39fe83 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/48778423d1c0e3e1624f63be976afa6eb70711bc | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2c1ddff75ea4e88b3da84d43909f32184ea886e2 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/81dd2f05a093c8bb6b24206eb0e4288da6e22651 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/eda9bd5f58ecb009ad9209cf827aad6385fc43a1 | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2201c28adb25111bce94ffc33662b49419add7ac | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/b6dd766c2be2e4ecc7d76e917ba413dcb5b6548f | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7026ece6f930bc587f6b4f8118bbec63db4992b9 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/aa5e416dc4d30726a3ef058d18dcd54d8e2571b3 | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3107ccb171aab23ca9d7f0442644ba23579cbfbc | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1b5adfbcddd10300819ba221bc2d6370b9055331 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5e9347c839a0755fb805515a07acd718a8d8482d | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8f075e3c22114615c052430330752db5549d1d0f | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/9880eb9ec39bfdaebbfd0519034d00ead731ba93 | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3980db5e84a5b52f942555620c8f5d7d360e062f | ORPH arm | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/13a71aae02df0440c43e7a9e75efd97c9c8d5866 | riscv64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/9223f78a302a3440985971798d75423b027a2ad5 | i686 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/1a93a2c0f085555bb942911b9f3b90bea08b9e8d | arm | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/919b37bf9386b01fb15be2c8cd5bb281ff00c0b7 | xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1eb4d22cfa973f635199c7249ce2fa5843cdb797 | powerpc64le | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/90922e7f058b26b13e423bd9a00d04eafb15058d | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2a89ab4e2e87f482527d8367e4d363f61ffa834a | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/f21e44ebbeefc7ee0dbec99f58f26810f4ebf210 | sparc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/bc211ed12ae20117ff601fb98fb1f359a2268e73 | powerpc64le | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/12fa4d01a2e6aae462cee6cc93311939c98e1ded | microblaze | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/45146f5bff2286c217d535a0b33980f469a58b75 | arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/290f1d7fa9720667a6c343ea57b31676871cd2c3 | ORPH mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/97b2dcb83f94798ffc2285578c753c8e21ac1bf0 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/cacc9a34920d38d04cb74a04d4ce82fbd08a630a | powerpc64le | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f1d83355bb2209fb274525d3d06f5176f0f9bc70 | mips64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/4728610cb558580614bf5650d3e4fe0d93b60604 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/fa82973d30bd569c6fe58ed57c21d51f9cccd3c8 | s390x | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/b51240b397d33266cef85f978fa5819f11d0070c | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/df0f208fe74fc6d773dc3a5ceebedcdaa5171276 | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/29fdcc8b0a5eecd151e01077d707c13573c771b7 | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/34d922d3b66181e66df1fcea4c4cb15f21f8249e | arceb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c43a15c7a596b454b67716fbe85b4a11652994f0 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2e09d98986abea8728f6dbb54fc2299d2ccbf005 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/72c09448955eef0fdb08f66e7fdd5410855177d5 | armeb | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/0125912d7df0ac6589b298a612f9229332ec1053 | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/92df72cbdbaa957e353204fc93a724b581a720de | armeb | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/614dbdcb98b8da048603b4dc08001c5e698d8c73 | sparc64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/14f876e08b428440be7ce12e8f888a38270a1cb7 | mipsel | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/5668cd1a6256bbc5fc8aa5ea59ed0232a13bd9ab | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/0c69b047e9079741fc8d1d64863bca250d81166f | arceb | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/c9da62eaca2fd5924a67f49e80f99511db9ccef9 | mips64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/470b7e8780183fedba0a8c6033f91e47cd6eea98 | x86_64 | igh-ethercat-2e2cef61318953... | NOK | http://autobuild.buildroot.net/results/a2761f3022c32a6d6a0de3004a29f60bd954cd8a | m68k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/f7e0a450c9b8fb854741132f17a8f12ef7116a29 | aarch64 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/cc175b9d62e0b500b61e7086ac5cff016750e7cb | riscv64 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/543cebf0e7c57746621c6e4161b39a1d479aede1 | arm | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/13c878a41db3ad96233ac3abdbbc917d7600c4db | ORPH i686 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/5fcc48b7e930d9a9f6567240035bb5e33a7b17ed | i686 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/a40c812a8542023f983d72e7822abba291bffdf6 | mips64el | libabseil-cpp-20220623.1 | NOK | http://autobuild.buildroot.net/results/5a8c68191eaedbc7d925c5e66ccaac89412ca0db | arc | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/779f61f032e36fb93bd57dfd5278f8d9970efd31 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/46fc2f7ea1a75ecf7a87eae652cb86c668f84f8f | arm | libdrm-2.4.114 | NOK | http://autobuild.buildroot.net/results/a7b7b140baa269ffafeeaa806f4a3b9520837bf7 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/cc0120608276ac96183ac0fb74a5e7a07ac6143e | ORPH armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/ecd8427b5e2221d2aa985fc4719f2e79f80cddbc | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/023eb79f98856c1ffda364abfab176dc8c08aa5e | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/3177508b94377fd630b9571ff06d89423d73ff9d | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/5a577e6f88d765b9265097ae24c8c45597e4562d | aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/1a335a4dbcfc1f9b53586e15fbe0ae9f5e65a478 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/f5ce6b952fc1e883e66e14c18e3c33607930077d | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/7cbaafc37c631ceee5a7641dd0cc71f6cec8367b | ORPH armeb | libmad-0.15.1b | NOK | http://autobuild.buildroot.net/results/9cd33e547cf10ed01445be3bf2570b039c234c65 | ORPH or1k | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/ecd18a499b065df32de7f77ae6d59bab59b58545 | arceb | libsodium-1.0.18 | NOK | http://autobuild.buildroot.net/results/84a64b76a8ab22c15744bc53c9a192fd5e96f3d9 | microblazeel | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/545e2c31b184219f31853ba9a5917cf09d0adf01 | arm | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/fb0d0b0053a84ae623d19301af1b79c6f1491497 | sh4eb | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/d2fd543e869e106991149a0428341225512f1fa8 | s390x | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/bd897ec8904d99e2ad00169d3a5bc2d60a7a5491 | powerpc | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/f8c17715deafa66a3a1b618b6e84fc1a855c403e | powerpc64le | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/954056512e8520796c34da817d83de1223751637 | ORPH powerpc64le | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/4ea8906998142a5699aac16991223402741cca8d | ORPH mips64 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/7bebee92854654e003d7744c5c67d9008854a91e | ORPH mips64el | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/b0d0346959823ea25cffddaff0dd60fc3a1e77d2 | ORPH powerpc64le | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/15c2a713c64069a7209d5502455c2ae25ca364d7 | ORPH nios2 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/a3019e18bbae0ab29175cf563cdb2625bb448103 | ORPH s390x | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/f02ba9479d1f7a5a8750b04546c4de7c247781c1 | ORPH arm | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/1b976f01d2265a7cc7de2f5154a7a33fe5a68337 | ORPH mips64el | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/d1052215f52a86766ffbd5788fc74c3f5a35e5f7 | ORPH powerpc | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/85e24e24d4cab0f9c3eec86ea4d49b7daa19f924 | ORPH powerpc64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/ea7772d79cead8db50f69b3ed7c2172a0d23c1b1 | powerpc64 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/e9df082789138491b54c5ddbf0c90d1d1cf81f45 | sparc64 | netsniff-ng-0.6.8 | NOK | http://autobuild.buildroot.net/results/8ca4747980c947a9e65517724b9812a04eac5b81 | arm | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/0e53794f0b641a98089cde954dbd1c737481fc4d | riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/45a327dbfef5e1d29dfdbf86ebcc891ab785a908 | ORPH sparc64 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/4bd97c2615e8986b8fb4b9ae96b17c3abb0ed392 | ORPH nios2 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/e182a116ff7d1b4a1bcdfc200869f49433e92ef7 | ORPH x86_64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/96dd3343a69089c4839a630a1bae622293bda0f4 | ORPH nios2 | open-iscsi-2.1.8 | NOK | http://autobuild.buildroot.net/results/f8e398219ca1255cf1c4e332c6655c09d7cb44d4 | i686 | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/4089a78fe14d77775addaa608e001f5d5c836f9f | ORPH mips64el | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/04fac9beba7aeed52a29565388b3a841a7e00f07 | ORPH mipsel | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/f057d8947a7d1e2364fc501a416774cb5d058073 | or1k | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/6df56ed45c247cd825eee2413d118c2c393d3a92 | m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/b9f5372dfc90f62b6c2819c9d1fadd142c3477c8 | ORPH aarch64_be | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/d90461b7d0cefdc3fc6d887732b4a7ebf49143bd | m68k | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/e1c6b5c9e841a003037045b2ff7afd9836e7c640 | mips64 | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/4f63f841ea5f70ac3dbedb7ded2764be01302082 | microblazeel | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/9bb387de5592c007f70c61702d8aaee4927a7494 | mips64el | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/c2f5101c8b6ee22bddf7523c3dc9f281a9ce5fc9 | microblaze | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/ff43dbc86b2251b56c9a4b601386fca32aaba836 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/454ff2f2653d7a422e7d0be779bcd8194718a421 | ORPH mipsel | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/630cf4f5d3309bf602eb1b84be4466c24308484b | microblaze | php-8.2.1 | NOK | http://autobuild.buildroot.net/results/727fda6192a991f3d13bcefdb52b820a2b577996 | microblazeel | php-8.2.1 | NOK | http://autobuild.buildroot.net/results/b7046244c32a6668e7db1707814606b23f5794be | s390x | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/3a0027566058c116dbbda73b4e8e22f884a35c43 | aarch64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/82aaa741020b6351134707c040dd52fe53c961a0 | arc | postgresql-legal-info | NOK | http://autobuild.buildroot.net/results/4cf0ace588acfaa95f852254a00258dd1a1e6440 | i586 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/46015ea4894088cabefcb8123cb454680d0a20e6 | powerpc64le | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/5fd6613b2431977581f8d72236c57814dd58f776 | aarch64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/43c236c2e9afe397a35f2b2e8f77a2eb57cdb2ff | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/23f716d5da90370e030863a992be53a0c6ee4279 | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/7975455b922d2f74aece0014a560eea28c88d905 | arm | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/0cab762be7c0790600772cde2455895feae9d830 | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/13c5105201cb38fa43401edb21c9ab6592eedc50 | sh4eb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/968a69a9c9ea5ab20b78e406be91df0debce3614 | sh4 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/ced0f118567a1e4b960d27c3e9af5bf44cd2d0cb | microblaze | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/88e01ff306c50cc1167c34d4f41e2f977a57ac0e | mips64 | python-pymupdf-1.21.1 | NOK | http://autobuild.buildroot.net/results/28c63f1deec36cbe0568e7f64a198918d8fcc0eb | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/cacc80d52075fbc7713e2ee2a235d2c40c7ca576 | arc | reaver-1.6.6 | NOK | http://autobuild.buildroot.net/results/a1ce811a772350b06431a0db5cac148bae68e533 | mipsel | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/1f04b0be29a694661c8879e404f4a720c19fe3ab | mips | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/0326973e09acd00e261f7d039f3063f9a038aa0c | microblaze | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/b6caf0818d47c91a29c3092092da3f9c1fe59cb2 | x86_64 | tinifier-3.4.0 | NOK | http://autobuild.buildroot.net/results/d6799f39bf91540436a706ff9c12d5ffd6f83114 | powerpc64 | tmux-3.3a | NOK | http://autobuild.buildroot.net/results/cba06f3bb6d9be25e91f56c390a70ddf9904832e | mipsel | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/15257dba2b191ee50dd7efc96ef345b32d826f95 | ORPH mips | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/8320dfaa6e0668d46404cf15c25fe985485cbb1b | ORPH mipsel | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/5e2c8783b9b187b76511581e41a40647af17045c | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/1efc7254fd8cb3f5108a16d0734419f826a41a2c | m68k | unknown | NOK | http://autobuild.buildroot.net/results/ee9cbfe261eb19e9dc97fb1e41d355b6f14e1483 | sparc | unknown | NOK | http://autobuild.buildroot.net/results/78b2ce901b150c648c6062b0966001c70cc797c9 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/21a518dbfd9cca7964bf174596d4831ace422673 | arc | unknown | NOK | http://autobuild.buildroot.net/results/94d1789cde17860a445d5439de53597cc8814bf6 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/2b8e1fdddac0ff8aafb5cf34e76f7ff7833a12b5 | x86_64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/a456f6eb27b910bbd898c2e79c5a21e8d53f72f8 | ORPH s390x | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/69f008db57e7e40a40e61b7a1fd51f89191fcfbb | ORPH mips | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/0faa6029f3489062b131e2e5b880d1497c592e5e | ORPH aarch64_be | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/aaeaf02c0d0ed00c7874c6826f4d52891f2d7e9c | ORPH arm | xlib_libX11-1.8.3 | NOK | http://autobuild.buildroot.net/results/c67086973444535202e7de22f09223a940bc077d | nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/60b26d90a2cc689858d2bcfcc5740003e3d7fe4d | powerpc64le | znc-1.8.2 | NOK | http://autobuild.buildroot.net/results/08a253d46cffed50ad5618c3302657670c75de79 | Classification of failures by reason for 2022.02.x -------------------------------------------------- igd2-for-linux-2.1 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | igd2-for-linux-2.1 | NOK | http://autobuild.buildroot.net/results/7bc4aa0350c208443e1c3bc90ae0fe632e306a15 | Classification of failures by reason for 2022.11.x -------------------------------------------------- python-numpy-1.23.4 | 2 xz-5.2.7 | 2 batman-adv-2022.2 | 1 frr-8.3.1 | 1 fs/romfs/romfs.mk:32: /home... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 gdb-12.1 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 heirloom-mailx-12.5 | 1 host-binutils-2.37 | 1 host-binutils-2.38 | 1 host-go-1.19.5 | 1 host-rust-1.64.0 | 1 kmod-30 | 1 libglib2-2.72.3 | 1 musl-1.2.3 | 1 php-8.1.14 | 1 proftpd-1.3.8 | 1 unknown | 1 valgrind-3.19.0 | 1 zeek-4.1.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | batman-adv-2022.2 | NOK | http://autobuild.buildroot.net/results/f31e00f9d67caf78169496291bafbb3440d824cd | xtensa | frr-8.3.1 | NOK | http://autobuild.buildroot.net/results/0f53ca6c1c76a875f884eefa1bfceb306bc7e908 | mips64el | fs/romfs/romfs.mk:32: /home... | NOK | http://autobuild.buildroot.net/results/59d9d6590460d3f10ed18486bd2a91b6eb4292a1 | powerpc64 | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/0c46bace1c20c6d8a0c73d0a4bd3742a3c28e971 | or1k | gdb-12.1 | NOK | http://autobuild.buildroot.net/results/4bce8066baf2c788a2b1558fe72b59b8e45bc6fb | ORPH powerpc64le | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/26b84f6cdd4472f57259d89098bfa417dfe1b464 | sh4eb | heirloom-mailx-12.5 | NOK | http://autobuild.buildroot.net/results/a5263fcd2967c89ba511ab56635f6c6c9e25b63c | riscv32 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/6f23be3eeaa1fe97373d6234eccf8f757504f889 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/d1cadb0b5e3bf74ce383852f52bf836bf07e6a3e | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/38d27136d8a7ee06c5a51dc0de5ff3f6e934343e | mips | host-rust-1.64.0 | NOK | http://autobuild.buildroot.net/results/7ddbf5f3e4b716daac8547c818ba2e43cb1e8a59 | xtensa | kmod-30 | NOK | http://autobuild.buildroot.net/results/f1f87ddc9437f8c859b32f3f074d5ef0fd3d6f54 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/7f5f32e70b347bfececb3f11752aec31951af7a3 | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/48f1b33b3cd03d827f89d2e0c199c9e82ad32e8f | or1k | php-8.1.14 | NOK | http://autobuild.buildroot.net/results/ca4efdb5c7cee172debee50c103176c0b4a5e583 | sh4aeb | proftpd-1.3.8 | NOK | http://autobuild.buildroot.net/results/69029e7f421b99aafb4db90df9893e5280fbdde2 | aarch64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/3cd0eb1b4a15f3b11902f323cc3b28da83875906 | sh4aeb | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/9d5072983dc6c71de8430af27d832b75d0552c3f | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/48b2b87b02ef2163b07c84977c7922d60330443d | mips64 | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/4f7b9aa4247750e058d461562d8f6e0cbd22f942 | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/6d172a2890c20f0db44204ca671153f695f10694 | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/5c1d483bcfc6de10d720b51eaa4dfc2ad8ecb9eb | ORPH sparc | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/a48722a7a3b0435480d34f3a073460284cea94d4 | -- http://autobuild.buildroot.net From peter at korsgaard.com Sun Feb 12 08:29:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:29:27 +0100 Subject: [Buildroot] [PATCH] support/dependencies/dependencies.sh: require diagnostics perl package for mosh In-Reply-To: <20230210150456.4535-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 10 Feb 2023 16:04:56 +0100") References: <20230210150456.4535-1-peter@korsgaard.com> Message-ID: <875yc7cmmw.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ > scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: > make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' > perl -Mdiagnostics -c ./mosh.pl > Can't locate diagnostics.pm in @INC (you may need to install the > diagnostics module) (@INC contains: > /home/buildroot/autobuild/instance-2/output-1/host/lib/perl > /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 > /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl > /usr/lib64/perl5 /usr/share/perl5). > BEGIN failed--compilation aborted. > So add a check for it in dependencies.sh similar to the other perl modules. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 12 08:29:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:29:45 +0100 Subject: [Buildroot] [PATCH] package/re2: bump to version 2023-02-01 In-Reply-To: <20230209205309.2464796-1-buildroot@heine.tech> (Michael Nosthoff via buildroot's message of "Thu, 9 Feb 2023 21:53:01 +0100") References: <20230209205309.2464796-1-buildroot@heine.tech> Message-ID: <871qmvcmme.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Nosthoff via buildroot writes: > Signed-off-by: Michael Nosthoff Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 12 08:39:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:39:57 +0100 Subject: [Buildroot] [PATCH 1/2] support/download: catch post-process errors In-Reply-To: <20230210223143.1060114-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Fri, 10 Feb 2023 23:31:42 +0100") References: <20230210223143.1060114-1-yann.morin.1998@free.fr> Message-ID: <87wn4nb7ky.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Currently, when the post-process helper fails while downloading from > upstream, there is no fallback to the backup mirror. > In case the post-process helper fails, we mut consider that to be a > download failure, so we must bail out as if the download backend itself > did fail, but we fail to do so. > Duplicate the logic we have for the download helper: if the post-process > helper fails, remove the downloaded stuff, and continue on to the next > URI, which will ultimately hit the backup mirror (if one has been > configured). > Reported-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni Committed after adding a fixes: http://autobuild.buildroot.net/results/12a/12a63ae177fe3ed0c9a1ef2fa01870f334f36b0f/, thanks! > --- > support/download/dl-wrapper | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper > index 09a6ac1f1a..1e8d6058f6 100755 > --- a/support/download/dl-wrapper > +++ b/support/download/dl-wrapper > @@ -138,9 +138,15 @@ main() { > fi > if [ -n "${post_process}" ] ; then > - "${OLDPWD}/support/download/${post_process}-post-process" \ > - -o "${tmpf}" \ > - -n "${raw_base_name}" > + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ > + -o "${tmpf}" \ > + -n "${raw_base_name}" > + then > + # cd back to keep path coherence > + cd "${OLDPWD}" > + rm -rf "${tmpd}" > + continue > + fi > fi > # cd back to free the temp-dir, so we can remove it later > -- > 2.25.1 -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 12 08:45:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:45:04 +0100 Subject: [Buildroot] [PATCH 2/2] support/download: fix the cargo post-process in face of failed vendoring In-Reply-To: <20230210223143.1060114-2-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Fri, 10 Feb 2023 23:31:43 +0100") References: <20230210223143.1060114-1-yann.morin.1998@free.fr> <20230210223143.1060114-2-yann.morin.1998@free.fr> Message-ID: <87sffbb7cf.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > In commit 04154a651729 (support/download/cargo-post-process: cargo > output for vendor config), we switched away from our hand-crafted > cargo.toml mangling, to use cargo itself to update that file. > In doing so, we enabled the shell pipefail option, so that we could > catch cargo failures, while redirecting its output through tee to the > cargo.toml. > However, pipefail is overzealous, and will hit us even for pipes we do > not want to globally fail, like the one that actually checks whether an > archive is already vendored or not: > if tar tf "${output}" | grep -q "^[^/]*/VENDOR" ; then > ... > with pipefail, the above may always fail: > - if the tarball is already vendored, grep will exit on the first > match because of -q (it only needs a single match to decide that its > return code will be zero), so the | will get closed, and tar may > get -EPIPE before it had a chance to finish listing the archive, and > thus would terminate in error; > - if the tarball is not vendored, grep will exit in error. > It turns out that the tee was only added so that we could see the > messages emitted by cargo, and still fill the cargo.tom with the output > of cargo. > But that's a bit overkill: the cargo messages are going to stderr, and > the blurb to add to cargo.toml to stdout, so we just need to redirect > stdout. > Yes, we do not see what cargo added to cargo.toml, but that is not so > interesting. > Still, cargo ends its messages with a suggestion for the user to modify > cargo.toml, with: > To use vendored sources, add this to your .cargo/config.toml for this project: > But since we've already redirected that to cargo.toml, there is nothing > for the user to edit, so the above can get confusing. Emit a little > blurb that states that everything is under control. > And then we can drop pipefail. > Note: the go-post-process initially had pipefail too, but it was dropped > in bfd1a31d0e59 (support/download/go-post-process: drop -o pipefail) as > it was causing spurrious breakage when extracting the archive before > vendoring, so it is only reasonable that we also remove it from the > cargo-post-process. > Reported-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Simon Richter Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 12 08:28:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:28:57 +0100 Subject: [Buildroot] [git commit] package/re2: bump to version 2023-02-01 Message-ID: <20230212084528.A16BD854A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d758b054b496619999e03c60c63b6636d818f3e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 9019867db4..a39dece7a9 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 665b65b6668156db2b46dddd33405cd422bd611352c5052ab3dae6a5fbac5506 re2-2022-12-01.tar.gz +sha256 cbce8b7803e856827201a132862e41af386e7afd9cc6d9a9bc7a4fa4d8ddbdde re2-2023-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 07bb9378de..5587366b1f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2022-12-01 +RE2_VERSION = 2023-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Feb 12 08:28:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:28:45 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require diagnostics perl package for mosh Message-ID: <20230212084528.9526385659@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5be2d9bb621e3f3aa552516c8887a7821ed62788 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' perl -Mdiagnostics -c ./mosh.pl Can't locate diagnostics.pm in @INC (you may need to install the diagnostics module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5). BEGIN failed--compilation aborted. So add a check for it in dependencies.sh similar to the other perl modules. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index cf6635bff6..4353e9585e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -281,6 +281,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules diagnostics" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From peter at korsgaard.com Sun Feb 12 08:39:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:39:19 +0100 Subject: [Buildroot] [git commit] support/download: fix the cargo post-process in face of failed vendoring Message-ID: <20230212084528.BFC3D8567E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59b2e826f2a6c1874c5d032d3a5852326028bc0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In commit 04154a651729 (support/download/cargo-post-process: cargo output for vendor config), we switched away from our hand-crafted cargo.toml mangling, to use cargo itself to update that file. In doing so, we enabled the shell pipefail option, so that we could catch cargo failures, while redirecting its output through tee to the cargo.toml. However, pipefail is overzealous, and will hit us even for pipes we do not want to globally fail, like the one that actually checks whether an archive is already vendored or not: if tar tf "${output}" | grep -q "^[^/]*/VENDOR" ; then ... with pipefail, the above may always fail: - if the tarball is already vendored, grep will exit on the first match because of -q (it only needs a single match to decide that its return code will be zero), so the | will get closed, and tar may get -EPIPE before it had a chance to finish listing the archive, and thus would terminate in error; - if the tarball is not vendored, grep will exit in error. It turns out that the tee was only added so that we could see the messages emitted by cargo, and still fill the cargo.tom with the output of cargo. But that's a bit overkill: the cargo messages are going to stderr, and the blurb to add to cargo.toml to stdout, so we just need to redirect stdout. Yes, we do not see what cargo added to cargo.toml, but that is not so interesting. Still, cargo ends its messages with a suggestion for the user to modify cargo.toml, with: To use vendored sources, add this to your .cargo/config.toml for this project: But since we've already redirected that to cargo.toml, there is nothing for the user to edit, so the above can get confusing. Emit a little blurb that states that everything is under control. And then we can drop pipefail. Note: the go-post-process initially had pipefail too, but it was dropped in bfd1a31d0e59 (support/download/go-post-process: drop -o pipefail) as it was causing spurious breakage when extracting the archive before vendoring, so it is only reasonable that we also remove it from the cargo-post-process. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Simon Richter Signed-off-by: Peter Korsgaard --- support/download/cargo-post-process | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index aea2d8da7a..3f4666c006 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -e -set -o pipefail . "${0%/*}/helpers" @@ -31,7 +30,13 @@ flock "${CARGO_HOME}"/.br-lock \ cargo vendor \ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ --locked VENDOR \ - | tee .cargo/config + > .cargo/config + +# "cargo vendor' outputs on stderr a message directing to add some data +# to the project's .cargo/config.toml, data that it outputs on stdout. +# Since we redirect stdout to .cargo/config.toml, the message on stderr +# gets confusing, so instruct the user that it's been handled. +printf '(note: .cargo/config.toml automatically updated by Buildroot)\n\n' popd > /dev/null From peter at korsgaard.com Sun Feb 12 08:38:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:38:54 +0100 Subject: [Buildroot] [git commit] support/download: catch post-process errors Message-ID: <20230212084528.AF1FC85670@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a39116b5dba6cf0695620e2ba5302f21fa80a4a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/12a/12a63ae177fe3ed0c9a1ef2fa01870f334f36b0f/ Currently, when the post-process helper fails while downloading from upstream, there is no fallback to the backup mirror. In case the post-process helper fails, we must consider that to be a download failure, so we must bail out as if the download backend itself did fail, but we fail to do so. Duplicate the logic we have for the download helper: if the post-process helper fails, remove the downloaded stuff, and continue on to the next URI, which will ultimately hit the backup mirror (if one has been configured). Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/download/dl-wrapper | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 09a6ac1f1a..1e8d6058f6 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -138,9 +138,15 @@ main() { fi if [ -n "${post_process}" ] ; then - "${OLDPWD}/support/download/${post_process}-post-process" \ - -o "${tmpf}" \ - -n "${raw_base_name}" + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + then + # cd back to keep path coherence + cd "${OLDPWD}" + rm -rf "${tmpd}" + continue + fi fi # cd back to free the temp-dir, so we can remove it later From Dirk.DeBecker at ebo-enterprises.com Sun Feb 12 08:51:17 2023 From: Dirk.DeBecker at ebo-enterprises.com (Dirk De Becker) Date: Sun, 12 Feb 2023 08:51:17 +0000 Subject: [Buildroot] Dependency problem for gtkmm3 In-Reply-To: <20230210231454.4f3aedbd@windsurf> References: <20230210231454.4f3aedbd@windsurf> Message-ID: Hi Thomas, Thank you for your quick reply. Will this issue be fixed in the 2023.02 release? Kind regards, Dirk Verzonden vanaf Outlook voor Android Met vriendelijke groeten, Cordialement, Kind Regards, [https://www.ebo-enterprises.com/static/emailsignatures/img/ebo_logo-transparant.png] Dirk De Becker Squad Leader e-Vision Embedded dirk.debecker at ebo-enterprises.com +32 498 51 19 86 . +32 57 23 02 70 . [https://www.ebo-enterprises.com/static/emailsignatures/img/microsoft_teams_icon.png] Ter Waarde 60 . 8900 Ypres . Belgium Wetenschapspark 2 . 8400 Ostend . Belgium [https://www.ebo-enterprises.com/static/emailsignatures/img/website_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/twitter_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/facebook_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/instagram_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/linkedin_icon.png] [cid:microsoftteams-image_b51463d7-6b52-402b-8e2d-555faff69bb4.png] ________________________________ From: Thomas Petazzoni Sent: Friday, February 10, 2023 11:14:54 PM To: Dirk De Becker Cc: buildroot at buildroot.org ; Steven Boucque Subject: Re: [Buildroot] Dependency problem for gtkmm3 CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender and know the content is safe. Hello Dirk, On Fri, 10 Feb 2023 11:15:12 +0000 Dirk De Becker wrote: > Hi, > > I am trying to make a buildroot containing libgtkmm3, but I run into problems. > I did the following steps: > Checkout master from git://git.buildroot.net/buildroot > Select the following things: > > * BR2_x86_64 > * BR2_TOOLCHAIN_BUILDROOT_CXX > * BR2_PACKAGE_MESA3D > * BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 > * BR2_PACKAGE_MESA3D_OPENGL_EGL > * BR2_PACKAGE_LIBGTK3 > * BR2_PACKAGE_GTKMM3 > > I get the following error in the output of the build attempt for gtkmm3-3.22.0: > configure: error: Package requirements (giomm-2.4 >= 2.49.1 pangomm-1.4 >= 2.38.2 gtk+-3.0 >= 3.22.0 cairomm-1.0 >= 1.12.0 gdk-pixbuf-2.0 >= 2.35.5) were not met: > > Package 'giomm-2.4', required by 'virtual:world', not found > Package 'pangomm-1.4', required by 'virtual:world', not found > Package 'cairomm-1.0', required by 'virtual:world', not found > > It seems that gtkmm3 is dependent on versions of some libraries that are not available. > > The following packages were built, but these do not provide the correct versions of these packages, according to pkg-config: > > * glibmm-2.68.2 > * pangomm-2.48.2 > * cairomm-1.16.1 I have not looked at the issue, but it seems to match what our autobuilders have reported at: https://eur06.safelinks.protection.outlook.com/?url=http%3A%2F%2Fautobuild.buildroot.net%2Fresults%2F172%2F17263ac51f197031106eb7fd595126a2720f0397%2Fbuild-end.log&data=05%7C01%7CDirk.DeBecker%40ebo-enterprises.com%7Cf2c82276f6b2448fde9c08db0bb43dbe%7C24133f962b3843609546979fc3caa9d7%7C0%7C0%7C638116640987871529%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=iS%2FzyBdbOpMNuDoIniOElXwANQ%2F6CK3X2cqH25Bwlmw%3D&reserved=0 Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://eur06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbootlin.com%2F&data=05%7C01%7CDirk.DeBecker%40ebo-enterprises.com%7Cf2c82276f6b2448fde9c08db0bb43dbe%7C24133f962b3843609546979fc3caa9d7%7C0%7C0%7C638116640987871529%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=VIGuMURAvlIEalseolNbf05d5BH%2FubIKee%2F01piDErY%3D&reserved=0 -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: microsoftteams-image_b51463d7-6b52-402b-8e2d-555faff69bb4.png Type: image/png Size: 8323 bytes Desc: microsoftteams-image_b51463d7-6b52-402b-8e2d-555faff69bb4.png URL: From yann.morin.1998 at free.fr Sun Feb 12 09:19:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 10:19:14 +0100 Subject: [Buildroot] [PATCH 1/1] Makefile: fix rule order for legal-info In-Reply-To: <20230211184346.1192333-1-james.hilliard1@gmail.com> References: <20230211184346.1192333-1-james.hilliard1@gmail.com> Message-ID: <20230212091914.GJ2796@scaer> James, All, On 2023-02-11 11:43 -0700, James Hilliard spake thusly: > This command relies on the clean/prepare operations being in a > specific order. > > Currently the execution ordering of the clean/prepare operations may > change, for example if --shuffle=reversed is set. > > To ensure the evaluation order is always correct use double colon > rules to make the evaluation order explicit as per make docs: > > The double-colon rules for a target are executed in the order they > appear in the makefile. Thanks for this patch! What bothers me a bit about using double-colon, is that the make manual explicitly state that "[d]ouble-colon rules are somewhat obscure and not often very useful; they provide a mechanism for cases in which the method used to update a target differs depending on which prerequisite files caused the update, and such cases are rare." So, I understand that it does fix the issue, but I'm afraid that it is going to be so easy to forget about that issue, and what I get from the make manual is that we should not use them unless as a last resort in very special corner cases, and the case at hand is not identified by the manual, which somewhat implies that double-colon rules were written specifically to handle the case where "the method used to update a target differs depending on which prerequisite files caused the update", not specifically to ensure that the order is guarantedd. It even goes as far as suggesting that this should not really be relied upon: The double-colon rules for a target are executed in the order they appear in the makefile. However, the cases where double-colon rules really make sense are those where the order of executing the recipes would not matter. So, to me, the ordering is only a side-effect of the original goal, which is to have different commands to generate a target, based on what prerequisite caused the the update... I am also afraid that there are so many other places around where we implicitly rely on the order the prerequisites are listed, and that we can't easily spot (that I spotted the legal-info issue and asked you about it, is pure chance, as I was looking at something completely different). However, in the legal-info case, the rule is definitely not parallel-safe, and we do really want it and its dependencies *not* to execute in parallel in fact. Indeed, all PKG-legal-info rules will emit a little blurb that is appended to the manisfest.csv, with commands like: echo 'PKG,VERSION,blablsablab' >> manifest.csv So, if we run that in parallel, this is going to explode [1]. So, I believe in this case, we do not want to use :: rules, but really ensure that legal-info and all PKG-legal-info rules are never run in parallel, *and* that they are executed in the order they are listed in the prerequisites. We probably want to just add in the top-level Makefile: .NOTPARALLEL: legal-info and in package/pkg-generic.mk, something along the lines of: .NOTPARALLEL: $(2)-legal-info #(2)-all-legal-info Thoughts? [0] https://www.gnu.org/software/make/manual/make.html#Double_002dColon [1] with very nice and bright colors, but a bit too loud still Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > Makefile | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 4880b426b5..09575a5e3c 100644 > --- a/Makefile > +++ b/Makefile > @@ -839,7 +839,9 @@ legal-info-prepare: $(LEGAL_INFO_DIR) > @cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config > > .PHONY: legal-info > -legal-info: legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ > +legal-info:: legal-info-clean > +legal-info:: legal-info-prepare > +legal-info:: $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ > $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) > @cat support/legal-info/README.header >>$(LEGAL_REPORT) > @if [ -r $(LEGAL_WARNINGS) ]; then \ > -- > 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 Feb 12 09:42:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 10:42:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: <20221018034605.800593-1-james.hilliard1@gmail.com> References: <20221018034605.800593-1-james.hilliard1@gmail.com> Message-ID: <20230212094205.GK2796@scaer> James, All, Thanks again for working on such grunt work, it's much appreaciated! On 2022-10-17 21:46 -0600, James Hilliard spake thusly: > These command rely on the clean operations being first so that the > stamp files being deleted will rebuild the targets. > > The execution ordering of the clean and rebuild operations may > change, for example if --shuffle=reversed is set. > > To ensure the evaluation order is always correct use double colon > rules to make the evaluation order explicit as per make docs: > > The double-colon rules for a target are executed in the order they > appear in the makefile. I am not convinced that we should switch over to using double-colons. As I reviewed your other related patch about legal-info [0], the make manual [1] suggests that double-colons are rally intended for cases where "the method used to update a target differs depending on which prerequisite files caused the update" and "double-colon rules really make sense are those where the order of executing the recipes would not matter". So, we'd use a mechanism where order should not matter, to solve an issue with ordering. That'd be weird... Yes, the manual states that "double-colon rules for a target are executed in the order they appear in the makefile", but that really looks like a side-effect of another goal. Also, we'd need to carefully review all our Makefile to ensure that there are no other cases wehre ordering of prerequisites matter. We'd also have to be careful every time we introduce a new rule and remember to check whether it depends on the ordering prereauisites or not, adn worse yet, also whether we can afford the rule to be parallel-safe or not (see the explanation for that in the legal-info review). Having colons and double-colons is going to be quite a headache... We already have issues with remembering that we need to use $$ to expand variables in some places, and the rules there are relatively clean and explicit, but for the :: case, I'm afraid that's going to be a bit more complex. We currently have a single location where we use double-colon: support/kconfig/Makefile.br which is added by our patch against kconfig: support/kconfig/patches/10-br-build-system.patch which dates back to 2010: 7c524dd0b683 Clean up our patches against kconfig which got in three in 2007: a665ed34960b - pull kconfig from linux-2.6.21.5 So, I'd like that we get another way to fix that, if possible... Again, thanks a lot for spending efforts in that area, this is really great! [0] https://lore.kernel.org/buildroot/20230212091914.GJ2796 at scaer/ [1] https://www.gnu.org/software/make/manual/make.html#Double_002dColon Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > package/pkg-generic.mk | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index f24e03a325..6cb461af90 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -1057,17 +1057,20 @@ endif > rm -f $$($(2)_TARGET_INSTALL_IMAGES) > rm -f $$($(2)_TARGET_INSTALL_HOST) > > -$(1)-reinstall: $(1)-clean-for-reinstall $(1) > +$(1)-reinstall:: $(1)-clean-for-reinstall > +$(1)-reinstall:: $(1) > > $(1)-clean-for-rebuild: $(1)-clean-for-reinstall > rm -f $$($(2)_TARGET_BUILD) > > -$(1)-rebuild: $(1)-clean-for-rebuild $(1) > +$(1)-rebuild:: $(1)-clean-for-rebuild > +$(1)-rebuild:: $(1) > > $(1)-clean-for-reconfigure: $(1)-clean-for-rebuild > rm -f $$($(2)_TARGET_CONFIGURE) > > -$(1)-reconfigure: $(1)-clean-for-reconfigure $(1) > +$(1)-reconfigure:: $(1)-clean-for-reconfigure > +$(1)-reconfigure:: $(1) > > # define the PKG variable for all targets, containing the > # uppercase package variable prefix > -- > 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 Feb 12 09:54:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 10:54:24 +0100 Subject: [Buildroot] [PATCH] package/python-magic-wormhole-mailbox-server: add missing reverse dependency on host-rustc Message-ID: <20230212095424.1326531-1-yann.morin.1998@free.fr> From: Julien Olivain As reported by Yann in [1], Kconfig warns about an unmet dependency. The issue can be reproduced on master branch at commit 451672e, with the command: KCONFIG_SEED=0x1D15B9D4 make randconfig The patch adds the missing dependency. Fixes: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_AUTOBAHN Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER [=y] && BR2_PACKAGE_PYTHON3 [=y] [1] https://lists.buildroot.org/pipermail/buildroot/2023-February/661898.html Cc: Yann E. MORIN Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/python-magic-wormhole-mailbox-server/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in index db20d3e7b6..a0721e866f 100644 --- a/package/python-magic-wormhole-mailbox-server/Config.in +++ b/package/python-magic-wormhole-mailbox-server/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER bool "python-magic-wormhole-mailbox-server" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime -- 2.25.1 From james.hilliard1 at gmail.com Sun Feb 12 10:02:03 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 12 Feb 2023 03:02:03 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: <20230212094205.GK2796@scaer> References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> Message-ID: On Sun, Feb 12, 2023 at 2:42 AM Yann E. MORIN wrote: > > James, All, > > Thanks again for working on such grunt work, it's much appreaciated! > > On 2022-10-17 21:46 -0600, James Hilliard spake thusly: > > These command rely on the clean operations being first so that the > > stamp files being deleted will rebuild the targets. > > > > The execution ordering of the clean and rebuild operations may > > change, for example if --shuffle=reversed is set. > > > > To ensure the evaluation order is always correct use double colon > > rules to make the evaluation order explicit as per make docs: > > > > The double-colon rules for a target are executed in the order they > > appear in the makefile. > > I am not convinced that we should switch over to using double-colons. > > As I reviewed your other related patch about legal-info [0], the make > manual [1] suggests that double-colons are rally intended for cases > where "the method used to update a target differs depending on which > prerequisite files caused the update" and "double-colon rules really > make sense are those where the order of executing the recipes would not > matter". This appears to be the only documented method of enforcing execution order without disabling parallel builds...that I've come across at least. > > So, we'd use a mechanism where order should not matter, to solve an > issue with ordering. That'd be weird... > > Yes, the manual states that "double-colon rules for a target are > executed in the order they appear in the makefile", but that really > looks like a side-effect of another goal. Yeah, I agree it's not really the intended use case for double-colon rules, however the ordering behavior is documented so I would not expect it to break. > > Also, we'd need to carefully review all our Makefile to ensure that > there are no other cases wehre ordering of prerequisites matter. We'd > also have to be careful every time we introduce a new rule and remember > to check whether it depends on the ordering prereauisites or not, adn > worse yet, also whether we can afford the rule to be parallel-safe or > not (see the explanation for that in the legal-info review). So unlike the legal-info issue using .NOTPARALLEL would not work here as these make targets do need to work with parallel builds. > > Having colons and double-colons is going to be quite a headache... We > already have issues with remembering that we need to use $$ to expand > variables in some places, and the rules there are relatively clean and > explicit, but for the :: case, I'm afraid that's going to be a bit more > complex. I don't think we have all that many of these issues, but I could be wrong. The clean-for-re{install, build, configure} make targets are a bit hacky to begin with so I don't think make was intended to handle those cases in the first place. We're already in unintended feature use case territory here so this doesn't seem to make things much worse. > > We currently have a single location where we use double-colon: > support/kconfig/Makefile.br > > which is added by our patch against kconfig: > support/kconfig/patches/10-br-build-system.patch > > which dates back to 2010: > 7c524dd0b683 Clean up our patches against kconfig > > which got in three in 2007: > a665ed34960b - pull kconfig from linux-2.6.21.5 > > So, I'd like that we get another way to fix that, if possible... I have unfortunately not found any other method to fix the execution ordering... > > Again, thanks a lot for spending efforts in that area, this is really > great! > > [0] https://lore.kernel.org/buildroot/20230212091914.GJ2796 at scaer/ > [1] https://www.gnu.org/software/make/manual/make.html#Double_002dColon > > Regards, > Yann E. MORIN. > > > Signed-off-by: James Hilliard > > --- > > package/pkg-generic.mk | 9 ++++++--- > > 1 file changed, 6 insertions(+), 3 deletions(-) > > > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > > index f24e03a325..6cb461af90 100644 > > --- a/package/pkg-generic.mk > > +++ b/package/pkg-generic.mk > > @@ -1057,17 +1057,20 @@ endif > > rm -f $$($(2)_TARGET_INSTALL_IMAGES) > > rm -f $$($(2)_TARGET_INSTALL_HOST) > > > > -$(1)-reinstall: $(1)-clean-for-reinstall $(1) > > +$(1)-reinstall:: $(1)-clean-for-reinstall > > +$(1)-reinstall:: $(1) > > > > $(1)-clean-for-rebuild: $(1)-clean-for-reinstall > > rm -f $$($(2)_TARGET_BUILD) > > > > -$(1)-rebuild: $(1)-clean-for-rebuild $(1) > > +$(1)-rebuild:: $(1)-clean-for-rebuild > > +$(1)-rebuild:: $(1) > > > > $(1)-clean-for-reconfigure: $(1)-clean-for-rebuild > > rm -f $$($(2)_TARGET_CONFIGURE) > > > > -$(1)-reconfigure: $(1)-clean-for-reconfigure $(1) > > +$(1)-reconfigure:: $(1)-clean-for-reconfigure > > +$(1)-reconfigure:: $(1) > > > > # define the PKG variable for all targets, containing the > > # uppercase package variable prefix > > -- > > 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 Feb 12 10:11:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 11:11:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> Message-ID: <20230212101112.GL2796@scaer> James, All, On 2023-02-12 03:02 -0700, James Hilliard spake thusly: > On Sun, Feb 12, 2023 at 2:42 AM Yann E. MORIN wrote: > > On 2022-10-17 21:46 -0600, James Hilliard spake thusly: > > > To ensure the evaluation order is always correct use double colon > > > rules to make the evaluation order explicit as per make docs: > > > > > > The double-colon rules for a target are executed in the order they > > > appear in the makefile. [--SNIP--] > > So, I'd like that we get another way to fix that, if possible... > I have unfortunately not found any other method to fix the execution > ordering... What about something along the lines of (untestd!): $(1)-rebuild: $(1): $(1)-clean-for-rebuild $(1)-rebuild: $(1) We already use such a construct in package/pkg-kconfig.mk, but only once, so this is not as if it were widespread either... Still, I think it is more easy to read... 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 james.hilliard1 at gmail.com Sun Feb 12 10:12:41 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 12 Feb 2023 03:12:41 -0700 Subject: [Buildroot] [PATCH 1/1] Makefile: fix rule order for legal-info In-Reply-To: <20230212091914.GJ2796@scaer> References: <20230211184346.1192333-1-james.hilliard1@gmail.com> <20230212091914.GJ2796@scaer> Message-ID: On Sun, Feb 12, 2023 at 2:19 AM Yann E. MORIN wrote: > > James, All, > > On 2023-02-11 11:43 -0700, James Hilliard spake thusly: > > This command relies on the clean/prepare operations being in a > > specific order. > > > > Currently the execution ordering of the clean/prepare operations may > > change, for example if --shuffle=reversed is set. > > > > To ensure the evaluation order is always correct use double colon > > rules to make the evaluation order explicit as per make docs: > > > > The double-colon rules for a target are executed in the order they > > appear in the makefile. > > Thanks for this patch! > > What bothers me a bit about using double-colon, is that the make manual > explicitly state that "[d]ouble-colon rules are somewhat obscure and not > often very useful; they provide a mechanism for cases in which the > method used to update a target differs depending on which prerequisite > files caused the update, and such cases are rare." > > So, I understand that it does fix the issue, but I'm afraid that it is > going to be so easy to forget about that issue, and what I get from the > make manual is that we should not use them unless as a last resort in > very special corner cases, and the case at hand is not identified by the > manual, which somewhat implies that double-colon rules were written > specifically to handle the case where "the method used to update a > target differs depending on which prerequisite files caused the update", > not specifically to ensure that the order is guarantedd. It even goes as > far as suggesting that this should not really be relied upon: > > The double-colon rules for a target are executed in the order they > appear in the makefile. However, the cases where double-colon rules > really make sense are those where the order of executing the recipes > would not matter. > > So, to me, the ordering is only a side-effect of the original goal, > which is to have different commands to generate a target, based on what > prerequisite caused the the update... > > I am also afraid that there are so many other places around where we > implicitly rely on the order the prerequisites are listed, and that we > can't easily spot (that I spotted the legal-info issue and asked you > about it, is pure chance, as I was looking at something completely > different). Well we should be able to flush them out using make shuffle mode. That's how I caught the other issues at least. > > However, in the legal-info case, the rule is definitely not > parallel-safe, and we do really want it and its dependencies *not* to > execute in parallel in fact. > > Indeed, all PKG-legal-info rules will emit a little blurb that is > appended to the manisfest.csv, with commands like: > echo 'PKG,VERSION,blablsablab' >> manifest.csv > > So, if we run that in parallel, this is going to explode [1]. Hmm, might just need a flock operation when doing the manifest.csv file echo append. We do something like that for downloads already: https://github.com/buildroot/buildroot/blob/2022.11.1/package/pkg-download.mk#L113 > > So, I believe in this case, we do not want to use :: rules, but really > ensure that legal-info and all PKG-legal-info rules are never run in > parallel, *and* that they are executed in the order they are listed in > the prerequisites. Well legal-info can take a while to run so it might make sense to make it work in parallel. > > We probably want to just add in the top-level Makefile: > > .NOTPARALLEL: legal-info > > and in package/pkg-generic.mk, something along the lines of: > > .NOTPARALLEL: $(2)-legal-info #(2)-all-legal-info > > Thoughts? Might work...but it seems like using flock may be simpler and faster. > > [0] https://www.gnu.org/software/make/manual/make.html#Double_002dColon > [1] with very nice and bright colors, but a bit too loud still > > Regards, > Yann E. MORIN. > > > Signed-off-by: James Hilliard > > --- > > Makefile | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/Makefile b/Makefile > > index 4880b426b5..09575a5e3c 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -839,7 +839,9 @@ legal-info-prepare: $(LEGAL_INFO_DIR) > > @cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config > > > > .PHONY: legal-info > > -legal-info: legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ > > +legal-info:: legal-info-clean > > +legal-info:: legal-info-prepare > > +legal-info:: $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ > > $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) > > @cat support/legal-info/README.header >>$(LEGAL_REPORT) > > @if [ -r $(LEGAL_WARNINGS) ]; then \ > > -- > > 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 james.hilliard1 at gmail.com Sun Feb 12 10:22:17 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 12 Feb 2023 03:22:17 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: <20230212101112.GL2796@scaer> References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> <20230212101112.GL2796@scaer> Message-ID: On Sun, Feb 12, 2023 at 3:11 AM Yann E. MORIN wrote: > > James, All, > > On 2023-02-12 03:02 -0700, James Hilliard spake thusly: > > On Sun, Feb 12, 2023 at 2:42 AM Yann E. MORIN wrote: > > > On 2022-10-17 21:46 -0600, James Hilliard spake thusly: > > > > To ensure the evaluation order is always correct use double colon > > > > rules to make the evaluation order explicit as per make docs: > > > > > > > > The double-colon rules for a target are executed in the order they > > > > appear in the makefile. > [--SNIP--] > > > So, I'd like that we get another way to fix that, if possible... > > I have unfortunately not found any other method to fix the execution > > ordering... > > What about something along the lines of (untestd!): > > $(1)-rebuild: $(1): $(1)-clean-for-rebuild > $(1)-rebuild: $(1) That would appear to be invalid syntax. > > We already use such a construct in package/pkg-kconfig.mk, but only > once, so this is not as if it were widespread either... I don't see anything like that there, just this which isn't doing anything unusual with multiple prerequisites that require a specific execution order like the re{install,build,configure} rules in pkg-generic.mk: # Force olddefconfig again on -reconfigure $(1)-clean-for-reconfigure: $(1)-clean-kconfig-for-reconfigure $(1)-clean-kconfig-for-reconfigure: rm -f $$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG) > > Still, I think it is more easy to read... > > 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 Sun Feb 12 10:57:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 11:57:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> <20230212101112.GL2796@scaer> Message-ID: <20230212105722.GM2796@scaer> James, All, On 2023-02-12 03:22 -0700, James Hilliard spake thusly: > On Sun, Feb 12, 2023 at 3:11 AM Yann E. MORIN wrote: > > > > James, All, > > > > On 2023-02-12 03:02 -0700, James Hilliard spake thusly: > > > On Sun, Feb 12, 2023 at 2:42 AM Yann E. MORIN wrote: > > > > On 2022-10-17 21:46 -0600, James Hilliard spake thusly: > > > > > To ensure the evaluation order is always correct use double colon > > > > > rules to make the evaluation order explicit as per make docs: > > > > > > > > > > The double-colon rules for a target are executed in the order they > > > > > appear in the makefile. > > [--SNIP--] > > > > So, I'd like that we get another way to fix that, if possible... > > > I have unfortunately not found any other method to fix the execution > > > ordering... > > > > What about something along the lines of (untestd!): > > > > $(1)-rebuild: $(1): $(1)-clean-for-rebuild > > $(1)-rebuild: $(1) > > That would appear to be invalid syntax. > > > > > We already use such a construct in package/pkg-kconfig.mk, but only > > once, so this is not as if it were widespread either... > > I don't see anything like that there, 240: $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $(1)-%: $$($(2)_DIR)/.kconfig_editor_% So, this looks like it is named "target pattern", and it works with a pattern (eh!). $ cat Makefile 1 all: a 2 3 a: 4 @echo a 5 6 a-clean: 7 @sleep 1 8 @echo a-clean 9 10 a-rebuild: %-rebuild: %-clean 11 a-rebuild: a However, that does not work with parallel builds: $ make a $ make a a $ make a-rebuild a-clean a $ make -j a-rebuild a a-clean However, you stated in a previous reply: So unlike the legal-info issue using .NOTPARALLEL would not work here as these make targets do need to work with parallel builds. I don't think that's true. Indeed, foo-rebuild is usually done after a ful build, when iterating over the foo package, iether to test a new source tree (with ocerride-ssrcdir) or to test fixes in foo.mk. In either case, we do not need a top-level parallel build, because only one package, foo, will be built. So, even in this case, we should be able to use .NOTPARALLEL, no? It also means that the kconfig rule I mentionned above, does not work with top-level parallel builds, but that's OK: it's only used to spawn kconfig configurators (menuconfig et al.), so it should not be used with top-level parallel, and thus should require .NOTPARALLEL as well. Meh, TLPB and shuffling are really uncovering issues everywhere... :-( Regards, Yann E. MORIN. > just this which isn't doing anything > unusual with multiple prerequisites that require a specific execution > order like the re{install,build,configure} rules in pkg-generic.mk: > > # Force olddefconfig again on -reconfigure > $(1)-clean-for-reconfigure: $(1)-clean-kconfig-for-reconfigure > > $(1)-clean-kconfig-for-reconfigure: > rm -f $$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG) > > > > > Still, I think it is more easy to read... > > > > 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. | > > '------------------------------^-------^------------------^--------------------' -- .-----------------.--------------------.------------------.--------------------. | 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 Feb 12 11:06:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 12:06:12 +0100 Subject: [Buildroot] [PATCH 1/1] Makefile: fix rule order for legal-info In-Reply-To: References: <20230211184346.1192333-1-james.hilliard1@gmail.com> <20230212091914.GJ2796@scaer> Message-ID: <20230212110612.GN2796@scaer> James, All, On 2023-02-12 03:12 -0700, James Hilliard spake thusly: > On Sun, Feb 12, 2023 at 2:19 AM Yann E. MORIN wrote: > > On 2023-02-11 11:43 -0700, James Hilliard spake thusly: > > > This command relies on the clean/prepare operations being in a > > > specific order. [--SNIP--] > > However, in the legal-info case, the rule is definitely not > > parallel-safe, and we do really want it and its dependencies *not* to > > execute in parallel in fact. > > > > Indeed, all PKG-legal-info rules will emit a little blurb that is > > appended to the manisfest.csv, with commands like: > > echo 'PKG,VERSION,blablsablab' >> manifest.csv > > > > So, if we run that in parallel, this is going to explode [1]. > Hmm, might just need a flock operation when doing the manifest.csv > file echo append. Except we probably want, no, sorry: we do want, that the manifest to be reproducible (and alphabeticaly sorted), which would not be guaranteed with an flock. > We do something like that for downloads already: > https://github.com/buildroot/buildroot/blob/2022.11.1/package/pkg-download.mk#L113 Careful there: the flock is to protect against a concurrent Buildroot build, not an internal protection (although it also serves as an internal protection, when two packages have the same dl dir, like mesa3d and mesa3d-headers). > > So, I believe in this case, we do not want to use :: rules, but really > > ensure that legal-info and all PKG-legal-info rules are never run in > > parallel, *and* that they are executed in the order they are listed in > > the prerequisites. > > Well legal-info can take a while to run so it might make sense to make > it work in parallel. I understand that, but I still think legal-info should produce a reproducible output, and that can't be guaranteed if all we change is using an flock around the manifests. Also, legal-info is probably run after a complete build, so the overhead of downloading, extracting, and patching, ahs already been paid during the build. We talked about legal-info during the dev-days, and one idea that floated was that we need to generate an SBOM of the build, and the closest we have now is legal-info. The SBOM should always be generated, and I believe legal-info should awlays be generated, so the overhead point would be moot (but would be replaced by the overhead of running legal-info for every builds...) More needs to be dug on that topic... 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 james.hilliard1 at gmail.com Sun Feb 12 11:17:39 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 12 Feb 2023 04:17:39 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: <20230212105722.GM2796@scaer> References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> <20230212101112.GL2796@scaer> <20230212105722.GM2796@scaer> Message-ID: On Sun, Feb 12, 2023 at 3:57 AM Yann E. MORIN wrote: > > James, All, > > On 2023-02-12 03:22 -0700, James Hilliard spake thusly: > > On Sun, Feb 12, 2023 at 3:11 AM Yann E. MORIN wrote: > > > > > > James, All, > > > > > > On 2023-02-12 03:02 -0700, James Hilliard spake thusly: > > > > On Sun, Feb 12, 2023 at 2:42 AM Yann E. MORIN wrote: > > > > > On 2022-10-17 21:46 -0600, James Hilliard spake thusly: > > > > > > To ensure the evaluation order is always correct use double colon > > > > > > rules to make the evaluation order explicit as per make docs: > > > > > > > > > > > > The double-colon rules for a target are executed in the order they > > > > > > appear in the makefile. > > > [--SNIP--] > > > > > So, I'd like that we get another way to fix that, if possible... > > > > I have unfortunately not found any other method to fix the execution > > > > ordering... > > > > > > What about something along the lines of (untestd!): > > > > > > $(1)-rebuild: $(1): $(1)-clean-for-rebuild > > > $(1)-rebuild: $(1) > > > > That would appear to be invalid syntax. > > > > > > > > We already use such a construct in package/pkg-kconfig.mk, but only > > > once, so this is not as if it were widespread either... > > > > I don't see anything like that there, > > 240: $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $(1)-%: $$($(2)_DIR)/.kconfig_editor_% > > So, this looks like it is named "target pattern", and it works with a > pattern (eh!). > > $ cat Makefile > 1 all: a > 2 > 3 a: > 4 @echo a > 5 > 6 a-clean: > 7 @sleep 1 > 8 @echo a-clean > 9 > 10 a-rebuild: %-rebuild: %-clean > 11 a-rebuild: a > > However, that does not work with parallel builds: > > $ make > a > > $ make a > a > > $ make a-rebuild > a-clean > a > > $ make -j a-rebuild > a > a-clean > > However, you stated in a previous reply: > > So unlike the legal-info issue using .NOTPARALLEL would not work > here as these make targets do need to work with parallel builds. > > I don't think that's true. Indeed, foo-rebuild is usually done after a > ful build, when iterating over the foo package, iether to test a new > source tree (with ocerride-ssrcdir) or to test fixes in foo.mk. In > either case, we do not need a top-level parallel build, because only one > package, foo, will be built. > > So, even in this case, we should be able to use .NOTPARALLEL, no? Breaking parallel build for foo-rebuild would be rather unexpected behavior as foo-rebuild does work for full builds as well and one may default to using foo-rebuild instead of a foo target for various reasons(to ensure that a package is always rsynced from an overridden source directory for example). I see no good reason to disable parallel build on it when simply ordering the dependency execution order fixes the issue. > > It also means that the kconfig rule I mentionned above, does not work > with top-level parallel builds, but that's OK: it's only used to spawn > kconfig configurators (menuconfig et al.), so it should not be used with > top-level parallel, and thus should require .NOTPARALLEL as well. Might be better to use double colon rules there as well, they are more explicit than using .NOTPARALLEL IMO as .NOTPARALLEL doesn't specify an execution order, also it can potentially introduce accidental performance regressions. > > Meh, TLPB and shuffling are really uncovering issues everywhere... :-( Better to make them very obvious so they can be fixed IMO. Once the known issues are fixed I can run shuffle mode on my autobuilders to uncover remaining issues. > > Regards, > Yann E. MORIN. > > > just this which isn't doing anything > > unusual with multiple prerequisites that require a specific execution > > order like the re{install,build,configure} rules in pkg-generic.mk: > > > > # Force olddefconfig again on -reconfigure > > $(1)-clean-for-reconfigure: $(1)-clean-kconfig-for-reconfigure > > > > $(1)-clean-kconfig-for-reconfigure: > > rm -f $$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG) > > > > > > > > Still, I think it is more easy to read... > > > > > > 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. | > > > '------------------------------^-------^------------------^--------------------' > > -- > .-----------------.--------------------.------------------.--------------------. > | 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 Feb 12 11:25:59 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 12 Feb 2023 04:25:59 -0700 Subject: [Buildroot] [PATCH 1/1] Makefile: fix rule order for legal-info In-Reply-To: <20230212110612.GN2796@scaer> References: <20230211184346.1192333-1-james.hilliard1@gmail.com> <20230212091914.GJ2796@scaer> <20230212110612.GN2796@scaer> Message-ID: On Sun, Feb 12, 2023 at 4:06 AM Yann E. MORIN wrote: > > James, All, > > On 2023-02-12 03:12 -0700, James Hilliard spake thusly: > > On Sun, Feb 12, 2023 at 2:19 AM Yann E. MORIN wrote: > > > On 2023-02-11 11:43 -0700, James Hilliard spake thusly: > > > > This command relies on the clean/prepare operations being in a > > > > specific order. > [--SNIP--] > > > However, in the legal-info case, the rule is definitely not > > > parallel-safe, and we do really want it and its dependencies *not* to > > > execute in parallel in fact. > > > > > > Indeed, all PKG-legal-info rules will emit a little blurb that is > > > appended to the manisfest.csv, with commands like: > > > echo 'PKG,VERSION,blablsablab' >> manifest.csv > > > > > > So, if we run that in parallel, this is going to explode [1]. > > Hmm, might just need a flock operation when doing the manifest.csv > > file echo append. > > Except we probably want, no, sorry: we do want, that the manifest to be > reproducible (and alphabeticaly sorted), which would not be guaranteed > with an flock. Hmm, I thought we were sorting afterwards like this, guess that needs to be checked: https://github.com/buildroot/buildroot/blob/59b2e826f2a6c1874c5d032d3a5852326028bc0e/Makefile#L851 > > > We do something like that for downloads already: > > https://github.com/buildroot/buildroot/blob/2022.11.1/package/pkg-download.mk#L113 > > Careful there: the flock is to protect against a concurrent Buildroot > build, not an internal protection (although it also serves as an > internal protection, when two packages have the same dl dir, like mesa3d > and mesa3d-headers). I assumed it was mostly for packages with the same dl dir, I think it matters more what it can do rather than what it was designed to do ;). > > > > So, I believe in this case, we do not want to use :: rules, but really > > > ensure that legal-info and all PKG-legal-info rules are never run in > > > parallel, *and* that they are executed in the order they are listed in > > > the prerequisites. > > > > Well legal-info can take a while to run so it might make sense to make > > it work in parallel. > > I understand that, but I still think legal-info should produce a > reproducible output, and that can't be guaranteed if all we change is > using an flock around the manifests. It should be reproducible if we run a sort right? > > Also, legal-info is probably run after a complete build, so the overhead > of downloading, extracting, and patching, ahs already been paid during > the build. Doesn't it still take a little while even if that's done? > > We talked about legal-info during the dev-days, and one idea that > floated was that we need to generate an SBOM of the build, and the > closest we have now is legal-info. The SBOM should always be generated, > and I believe legal-info should awlays be generated, so the overhead > point would be moot (but would be replaced by the overhead of running > legal-info for every builds...) More needs to be dug on that topic... Well I think for both cases the faster the generation the better so parallel where possible has advantages there. If something is too slow it's less likely to be used/tested. > > 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 fontaine.fabrice at gmail.com Sun Feb 12 12:44:21 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 13:44:21 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/zabbix: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230212124421.17787-1-fontaine.fabrice@gmail.com> zabbix uses custom --enable-{static,shared} options, instead of standard libtool directives resulting in the following build failure with openssl or libcurl: configure:13132: /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib conftest.c -lssl -lcrypto -lm >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): in function `dlfcn_globallookup': dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): in function `BIO_lookup_ex': b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): in function `BIO_gethostbyname': b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /tmp/cceWHjDi.o: in function `main': conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' [...] configure: error: OpenSSL library libssl or libcrypto not found --- configure:15199: checking for main in -lz configure:15219: /home/autobuild/autobuild/instance-13/output-1/host/bin/s390x-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -I/home/autobuild/autobuild/instance-13/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-13/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib conftest.c -lz -lm >&5 /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/10.3.0/../../../../s390x-buildroot-linux-gnu/bin/ld: cannot find -lz collect2: error: ld returned 1 exit status [...] configure: error: static library z required for linking libcurl not found Fixes: - http://autobuild.buildroot.org/results/c05230d13fa0538323bb77e8f35533e6dd02453f - http://autobuild.buildroot.org/results/cc947038510e16417298b381521f226f7c45f986 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Update commit log and comment package/zabbix/zabbix.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index 23172a358d..06d12dbef4 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -125,6 +125,13 @@ endif endif # BR2_PACKAGE_ZABBIX_SERVER +# zabbix uses custom --enable-{static,shared} options, instead of +# standard libtool directives resulting in a build failure with libcurl +# or openssl. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ZABBIX_CONF_OPTS += --disable-static +endif + define ZABBIX_INSTALL_INIT_SYSTEMD $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 12 12:58:44 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 13:58:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/log4cplus: bump to version 2.1.0 Message-ID: <20230212125844.332225-1-fontaine.fabrice@gmail.com> https://github.com/log4cplus/log4cplus/blob/REL_2_1_0/ChangeLog Signed-off-by: Fabrice Fontaine --- package/log4cplus/log4cplus.hash | 2 +- package/log4cplus/log4cplus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/log4cplus/log4cplus.hash b/package/log4cplus/log4cplus.hash index c4540c9d56..1779b30949 100644 --- a/package/log4cplus/log4cplus.hash +++ b/package/log4cplus/log4cplus.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f5949e713cf8635fc554384ab99b04716e3430f28eed6dd7d71ad03d959b91a0 log4cplus-2.0.8.tar.xz +sha256 d84ac8b1c46645122fbf72691f8eacef68c71b587403ee833bd9a252e06d46cc log4cplus-2.1.0.tar.xz sha256 91d7e42ff80e74c4c94e5ad353375fa0358cd0abbf43f5fe957097cdbd4e2c4d LICENSE diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk index 2dab661654..28eb4ed8f4 100644 --- a/package/log4cplus/log4cplus.mk +++ b/package/log4cplus/log4cplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOG4CPLUS_VERSION = 2.0.8 +LOG4CPLUS_VERSION = 2.1.0 LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION) LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) -- 2.39.0 From giulio.benetti at benettiengineering.com Sun Feb 12 13:00:32 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 12 Feb 2023 14:00:32 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump version to 3.88.1 Message-ID: <20230212130032.724850-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 f847ec4f77..ec3fe0d777 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_87_RTM/src/SHA256SUMS -sha256 68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d nss-3.87.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_88_1_RTM/src/SHA256SUMS +sha256 27d243edf87d1cf1bb9c861f03d387e0e9230ce5017f4308c941f558b54b3496 nss-3.88.1.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index a60e615f9a..3782d239a5 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.87 +LIBNSS_VERSION = 3.88.1 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.34.1 From fontaine.fabrice at gmail.com Sun Feb 12 13:03:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 14:03:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/olsr: fix build with gpsd >= 3.25 Message-ID: <20230212130336.373391-1-fontaine.fabrice@gmail.com> Fix the following build failure with gpsd >= 3.25 raised since commit 3c7fece853f3def9a425eccc384b9dacb1010051: In file included from src/configuration.h:50, from src/configuration.c:46: src/gpsdclient.h:64:8: error: redefinition of 'struct fixsource_t' 64 | struct fixsource_t { | ^~~~~~~~~~~ In file included from src/gpsdclient.h:49, from src/configuration.h:50, from src/configuration.c:46: /tmp/instance-17/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/gps.h:2714:8: note: originally defined here 2714 | struct fixsource_t | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/47a619686bb47debd525c92aa7e14bee5c40ca9e Signed-off-by: Fabrice Fontaine --- .../olsr/0006-build-patch-for-gpsd-3-25.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/olsr/0006-build-patch-for-gpsd-3-25.patch diff --git a/package/olsr/0006-build-patch-for-gpsd-3-25.patch b/package/olsr/0006-build-patch-for-gpsd-3-25.patch new file mode 100644 index 0000000000..c82bc1bb28 --- /dev/null +++ b/package/olsr/0006-build-patch-for-gpsd-3-25.patch @@ -0,0 +1,31 @@ +From 17d583258969c1d182361e0e168b3cad79ef64e6 Mon Sep 17 00:00:00 2001 +From: Rui Chen +Date: Mon, 16 Jan 2023 18:35:32 -0500 +Subject: [PATCH] build: patch for gpsd 3.25 + +Signed-off-by: Rui Chen +[Retrieved from: https://github.com/OLSR/olsrd/pull/119] +Signed-off-by: Fabrice Fontaine +--- + lib/pud/src/gpsdclient.h | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/lib/pud/src/gpsdclient.h b/lib/pud/src/gpsdclient.h +index 061056b12..a51dd2211 100644 +--- a/lib/pud/src/gpsdclient.h ++++ b/lib/pud/src/gpsdclient.h +@@ -60,14 +60,6 @@ struct GpsdConnectionState { + struct devconfig_t dev[MAXUSERDEVS]; + }; + +-/* describe a data source */ +-struct fixsource_t { +- char spec[PATH_MAX]; /* working space, will be modified */ +- char *server; /* pointer into spec field */ +- char *port; /* pointer into spec field */ +- char *device; /* pointer into spec field */ +-}; +- + /** + * The gpsd daemon spec + */ -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 12 14:43:15 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 15:43:15 +0100 Subject: [Buildroot] [PATCH 1/2] package/libsolv: drop unrecognized variables Message-ID: <20230212144316.1181860-1-fontaine.fabrice@gmail.com> Drop unrecognized variables: CMake Warning: Manually-specified variables were not used by the project: BUILD_DOC BUILD_DOCS BUILD_EXAMPLE BUILD_EXAMPLES BUILD_TEST BUILD_TESTING BUILD_TESTS CMAKE_CXX_COMPILER_FORCED DISABLE_STATIC ENABLE_SHARED Signed-off-by: Fabrice Fontaine --- package/libsolv/libsolv.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 29f8a6a3d2..04fdb387fd 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -11,16 +11,15 @@ LIBSOLV_LICENSE_FILES = LICENSE.BSD LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib -LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON else -LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=OFF endif ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=OFF else LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON endif -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 12 14:43:16 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 15:43:16 +0100 Subject: [Buildroot] [PATCH 2/2] package/libsolv: fix build without C++ In-Reply-To: <20230212144316.1181860-1-fontaine.fabrice@gmail.com> References: <20230212144316.1181860-1-fontaine.fabrice@gmail.com> Message-ID: <20230212144316.1181860-2-fontaine.fabrice@gmail.com> Fix the following build failure without C++ raised since the addition ot the package in commit 93ce3c1be0753189d6af3ee9968b935037519c25: CMake Error at CMakeLists.txt:1 (PROJECT): No CMAKE_CXX_COMPILER could be found. Tell CMake where to find the compiler by setting either the environment variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path to the compiler, or to the compiler name if it is in the PATH. Fixes: - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f Signed-off-by: Fabrice Fontaine --- .../libsolv/0001-Fix-build-without-C.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/libsolv/0001-Fix-build-without-C.patch diff --git a/package/libsolv/0001-Fix-build-without-C.patch b/package/libsolv/0001-Fix-build-without-C.patch new file mode 100644 index 0000000000..2389aebcde --- /dev/null +++ b/package/libsolv/0001-Fix-build-without-C.patch @@ -0,0 +1,49 @@ +From 5691f58d1f8ce1332b02536e48f1ac5864629c6c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 12 Feb 2023 15:27:27 +0100 +Subject: [PATCH] Fix build without C++ + +Fix the following build failure without C++: + +CMake Error at CMakeLists.txt:1 (PROJECT): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Fixes: + - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/openSUSE/libsolv/pull/520] +--- + CMakeLists.txt | 2 +- + ext/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3541f496..f899c49a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-PROJECT (libsolv) ++PROJECT (libsolv C) + + CMAKE_MINIMUM_REQUIRED (VERSION 2.8.5) + +diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt +index f01c0238..589fa946 100644 +--- a/ext/CMakeLists.txt ++++ b/ext/CMakeLists.txt +@@ -103,6 +103,7 @@ IF (ENABLE_CUDFREPO) + ENDIF (ENABLE_CUDFREPO) + + IF (ENABLE_HAIKU) ++ enable_language(CXX) + SET (libsolvext_SRCS ${libsolvext_SRCS} + repo_haiku.cpp) + SET (libsolvext_HEADERS ${libsolvext_HEADERS} +-- +2.39.0 + -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 12 14:53:12 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 15:53:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv3: bump to version 3.4.19 Message-ID: <20230212145312.1203134-1-fontaine.fabrice@gmail.com> This bump will fix the following build failure with gcc >= 12: /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp: In function 'bool base64::base64_valid(const uint8_t*, size_t, size_t)': /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp:167:31: error: comparing the result of pointer addition '(src + ((sizetype)off))' and NULL [-Werror=address] 167 | if (src == 0 || src + off == 0) | ~~~~~~~~~~^~~~ cc1plus: some warnings being treated as errors Update hash of LICENSE file (update in year: https://github.com/opencv/opencv/commit/f6fe5c07f61eb0bc934672200b2bfd453f2fc41d) https://github.com/opencv/opencv/wiki/ChangeLog#version3419 Fixes: - http://autobuild.buildroot.org/results/cb9c120c15c8042e6919858d6885c1cc4d996c0c Signed-off-by: Fabrice Fontaine --- package/opencv3/opencv3.hash | 4 ++-- package/opencv3/opencv3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash index 30308188aa..3d6fd2ed8a 100644 --- a/package/opencv3/opencv3.hash +++ b/package/opencv3/opencv3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1353eec67849aadb20df71d8bae18b83708e18fc5da080fe5efeabb1e99b2ee8 opencv3-3.4.17.tar.gz -sha256 9076d3d934839a2f8e7bfe549abda6faea4751f1edd6e9460ff703559890ad5f LICENSE +sha256 9b913e74299ce4416a5c94000da577c592bf670fd53bad16220eb115a0821529 opencv3-3.4.19.tar.gz +sha256 c1fed9cd2f557ba23a1b37a21e2c90629d1a60bdb61e92d0e79369bb6fca3390 LICENSE diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 8e4c90786e..29fb246e65 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV3_VERSION = 3.4.17 +OPENCV3_VERSION = 3.4.19 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 12 15:09:19 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 16:09:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/zxing-cpp: update homepage Message-ID: <20230212150920.1213398-1-fontaine.fabrice@gmail.com> Commit 456a7398316655ad0b669635f580e4887c24a700 decided to switch to an active fork but forgot to update homepage in Config.in Signed-off-by: Fabrice Fontaine --- package/zxing-cpp/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 6c17565d2a..2550dcf023 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_ZXING_CPP implemented in Java, with ports to other languages. This compiles the C++ port. - https://github.com/glassechidna/zxing-cpp + https://github.com/zxing-cpp/zxing-cpp -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 12 15:09:20 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 16:09:20 +0100 Subject: [Buildroot] [PATCH 2/2] package/zxing-cpp: needs wchar In-Reply-To: <20230212150920.1213398-1-fontaine.fabrice@gmail.com> References: <20230212150920.1213398-1-fontaine.fabrice@gmail.com> Message-ID: <20230212150920.1213398-2-fontaine.fabrice@gmail.com> wchar is mandatory since switch to an active fork in commit 456a7398316655ad0b669635f580e4887c24a700: In file included from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Result.h:12, from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/GTIN.cpp:9: /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Content.h:40:14: error: 'wstring' in namespace 'std' does not name a type 40 | std::wstring render(bool withECI) const; | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/4f97f1b291a99218f4706fce8b2934bd845755e1 Signed-off-by: Fabrice Fontaine --- package/gstreamer1/gst1-plugins-bad/Config.in | 6 ++++-- package/zxing-cpp/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index d477924eec..d2ef450d74 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -741,11 +741,13 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING bool "zxing" depends on !BR2_STATIC_LIBS # zxing-cpp + depends on BR2_USE_WCHAR # zxing-cpp depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp select BR2_PACKAGE_ZXING_CPP -comment "zxing plugin needs a toolchain w/ C++, dynamic library" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP +comment "zxing plugin needs a toolchain w/ C++, wchar, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_INSTALL_LIBSTDCPP endif diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 2550dcf023..0d8b79538d 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -1,9 +1,11 @@ -comment "zxing-cpp needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "zxing-cpp needs a toolchain w/ C++, wchar, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + BR2_STATIC_LIBS config BR2_PACKAGE_ZXING_CPP bool "zxing-cpp" depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_STB select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 -- 2.39.0 From ju.o at free.fr Sun Feb 12 16:33:21 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 12 Feb 2023 17:33:21 +0100 Subject: [Buildroot] [PATCH 1/2] DEVELOPERS: reorder entries for Julien Olivain Message-ID: <20230212163322.480467-1-ju.o@free.fr> Entries for "gnupg2" and "test_python_hkdf.py" were not at the right position. Signed-off-by: Julien Olivain --- DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ae698f87c5..ece0d986ae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1685,8 +1685,8 @@ F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ -F: package/gnupg2/ F: package/glslsandbox-player/ +F: package/gnupg2/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1716,8 +1716,8 @@ F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py -F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py +F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_magic_wormhole.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py -- 2.39.1 From ju.o at free.fr Sun Feb 12 16:33:22 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 12 Feb 2023 17:33:22 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Julien Olivain for z3 runtime test files In-Reply-To: <20230212163322.480467-1-ju.o@free.fr> References: <20230212163322.480467-1-ju.o@free.fr> Message-ID: <20230212163322.480467-2-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index ece0d986ae..dcc607ba60 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1724,6 +1724,7 @@ F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py +F: support/testing/tests/package/test_z3/ N: Julien Viard de Galbert F: package/dieharder/ -- 2.39.1 From yann.morin.1998 at free.fr Sun Feb 12 16:49:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 17:49:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/olsr: fix build with gpsd >= 3.25 In-Reply-To: <20230212130336.373391-1-fontaine.fabrice@gmail.com> References: <20230212130336.373391-1-fontaine.fabrice@gmail.com> Message-ID: <20230212164903.GO2796@scaer> Fabrice, All, On 2023-02-12 14:03 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure with gpsd >= 3.25 raised since commit > 3c7fece853f3def9a425eccc384b9dacb1010051: [--SNIP--] > +Signed-off-by: Rui Chen > +[Retrieved from: https://github.com/OLSR/olsrd/pull/119] > +Signed-off-by: Fabrice Fontaine > +--- > + lib/pud/src/gpsdclient.h | 8 -------- > + 1 file changed, 8 deletions(-) > + > +diff --git a/lib/pud/src/gpsdclient.h b/lib/pud/src/gpsdclient.h > +index 061056b12..a51dd2211 100644 > +--- a/lib/pud/src/gpsdclient.h > ++++ b/lib/pud/src/gpsdclient.h > +@@ -60,14 +60,6 @@ struct GpsdConnectionState { > + struct devconfig_t dev[MAXUSERDEVS]; > + }; > + > +-/* describe a data source */ > +-struct fixsource_t { > +- char spec[PATH_MAX]; /* working space, will be modified */ > +- char *server; /* pointer into spec field */ > +- char *port; /* pointer into spec field */ > +- char *device; /* pointer into spec field */ > +-}; Given that this breaks the build with older gpsd versions, I suspect this is not goign to be accepted by upstream. I've sent another proposal to fix that issue in a backward compatible manner: https://github.com/OLSR/olsrd/pull/120 Let's see a bit what upstream decides. Regards, Yann E. MORIN. > + /** > + * The gpsd daemon spec > + */ > -- > 2.39.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 bugzilla at busybox.net Sun Feb 12 18:15:08 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 12 Feb 2023 18:15:08 +0000 Subject: [Buildroot] [Bug 15306] glibc build fails in Docker container In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15306 Russ changed: What |Removed |Added ---------------------------------------------------------------------------- Severity|normal |blocker Priority|P5 |P3 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Sun Feb 12 19:57:07 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 12 Feb 2023 19:57:07 +0000 Subject: [Buildroot] [Bug 15306] glibc build fails in Docker container In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15306 Yann E. MORIN changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |yann.morin.1998 at free.fr --- Comment #1 from Yann E. MORIN --- Russ, All, I have been unable to reproduce such an error with the current master branch, running Ubuntu 22.04 in a docker container, with this defconfig: BR2_aarch64=y Please provide a *minimalist* defconfig that exhibits the issue. Regards, Yann E. MORIN. -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Sun Feb 12 20:02:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 21:02:51 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump version to 3.88.1 In-Reply-To: <20230212130032.724850-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sun, 12 Feb 2023 14:00:32 +0100") References: <20230212130032.724850-1-giulio.benetti@benettiengineering.com> Message-ID: <87o7pybqj8.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Signed-off-by: Giulio Benetti Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 12 20:03:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 21:03:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/log4cplus: bump to version 2.1.0 In-Reply-To: <20230212125844.332225-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 12 Feb 2023 13:58:44 +0100") References: <20230212125844.332225-1-fontaine.fabrice@gmail.com> Message-ID: <87k00mbqim.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/log4cplus/log4cplus/blob/REL_2_1_0/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 12 20:02:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 21:02:14 +0100 Subject: [Buildroot] [git commit] package/libnss: bump version to 3.88.1 Message-ID: <20230212200333.AD49B856EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99024eca8f154062ea88af985ff10e12ae7016b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 f847ec4f77..ec3fe0d777 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_87_RTM/src/SHA256SUMS -sha256 68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d nss-3.87.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_88_1_RTM/src/SHA256SUMS +sha256 27d243edf87d1cf1bb9c861f03d387e0e9230ce5017f4308c941f558b54b3496 nss-3.88.1.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 90fd9259d5..ac342cf3af 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.87 +LIBNSS_VERSION = 3.88.1 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 peter at korsgaard.com Sun Feb 12 20:03:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 21:03:01 +0100 Subject: [Buildroot] [git commit] package/log4cplus: bump to version 2.1.0 Message-ID: <20230212200333.B878585644@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bb77eb8f14585bc79307fd672cab79b7e4e476d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/log4cplus/log4cplus/blob/REL_2_1_0/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/log4cplus/log4cplus.hash | 2 +- package/log4cplus/log4cplus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/log4cplus/log4cplus.hash b/package/log4cplus/log4cplus.hash index c4540c9d56..1779b30949 100644 --- a/package/log4cplus/log4cplus.hash +++ b/package/log4cplus/log4cplus.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f5949e713cf8635fc554384ab99b04716e3430f28eed6dd7d71ad03d959b91a0 log4cplus-2.0.8.tar.xz +sha256 d84ac8b1c46645122fbf72691f8eacef68c71b587403ee833bd9a252e06d46cc log4cplus-2.1.0.tar.xz sha256 91d7e42ff80e74c4c94e5ad353375fa0358cd0abbf43f5fe957097cdbd4e2c4d LICENSE diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk index 2dab661654..28eb4ed8f4 100644 --- a/package/log4cplus/log4cplus.mk +++ b/package/log4cplus/log4cplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOG4CPLUS_VERSION = 2.0.8 +LOG4CPLUS_VERSION = 2.1.0 LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION) LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) From yann.morin.1998 at free.fr Sun Feb 12 20:20:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:20:15 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: reorder entries for Julien Olivain Message-ID: <20230212202118.CD6238572E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f33c8490fe8d110c13a1f28bd5a2063983002fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Entries for "gnupg2" and "test_python_hkdf.py" were not at the right position. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ae698f87c5..ece0d986ae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1685,8 +1685,8 @@ F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ -F: package/gnupg2/ F: package/glslsandbox-player/ +F: package/gnupg2/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1716,8 +1716,8 @@ F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py -F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py +F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_magic_wormhole.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py From yann.morin.1998 at free.fr Sun Feb 12 20:20:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:20:30 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Julien Olivain for z3 runtime test files Message-ID: <20230212202118.D827B85730@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0dc2fa3865b0dbb2a6c103d6bc3bbc294ada604 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index ece0d986ae..dcc607ba60 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1724,6 +1724,7 @@ F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py +F: support/testing/tests/package/test_z3/ N: Julien Viard de Galbert F: package/dieharder/ From yann.morin.1998 at free.fr Sun Feb 12 20:21:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:21:39 +0100 Subject: [Buildroot] [PATCH 1/2] DEVELOPERS: reorder entries for Julien Olivain In-Reply-To: <20230212163322.480467-1-ju.o@free.fr> References: <20230212163322.480467-1-ju.o@free.fr> Message-ID: <20230212202139.GP2796@scaer> Julien, All, On 2023-02-12 17:33 +0100, Julien Olivain spake thusly: > Entries for "gnupg2" and "test_python_hkdf.py" were not at the right > position. > > Signed-off-by: Julien Olivain Both patches applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index ae698f87c5..ece0d986ae 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1685,8 +1685,8 @@ F: configs/spike_riscv64_defconfig > F: configs/zynq_qmtech_defconfig > F: package/fluid-soundfont/ > F: package/fluidsynth/ > -F: package/gnupg2/ > F: package/glslsandbox-player/ > +F: package/gnupg2/ > F: package/octave/ > F: package/ola/ > F: package/perftest/ > @@ -1716,8 +1716,8 @@ F: support/testing/tests/package/test_ola.py > F: support/testing/tests/package/test_ola/ > F: support/testing/tests/package/test_perftest.py > F: support/testing/tests/package/test_python_distro.py > -F: support/testing/tests/package/test_python_hkdf.py > F: support/testing/tests/package/test_python_gnupg.py > +F: support/testing/tests/package/test_python_hkdf.py > F: support/testing/tests/package/test_python_magic_wormhole.py > F: support/testing/tests/package/test_python_pyalsa.py > F: support/testing/tests/package/test_python_spake2.py > -- > 2.39.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 Feb 12 20:27:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:27:47 +0100 Subject: [Buildroot] [git commit] package/zxing-cpp: needs wchar Message-ID: <20230212202900.EC4138578B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=631d0289fe880952d9bedf37cc10b043c70c1482 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master wchar is mandatory since switch to an active fork in commit 456a7398316655ad0b669635f580e4887c24a700: In file included from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Result.h:12, from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/GTIN.cpp:9: /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Content.h:40:14: error: 'wstring' in namespace 'std' does not name a type 40 | std::wstring render(bool withECI) const; | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/4f97f1b291a99218f4706fce8b2934bd845755e1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-bad/Config.in | 6 ++++-- package/zxing-cpp/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index d477924eec..d2ef450d74 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -741,11 +741,13 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING bool "zxing" depends on !BR2_STATIC_LIBS # zxing-cpp + depends on BR2_USE_WCHAR # zxing-cpp depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp select BR2_PACKAGE_ZXING_CPP -comment "zxing plugin needs a toolchain w/ C++, dynamic library" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP +comment "zxing plugin needs a toolchain w/ C++, wchar, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_INSTALL_LIBSTDCPP endif diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 2550dcf023..0d8b79538d 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -1,9 +1,11 @@ -comment "zxing-cpp needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "zxing-cpp needs a toolchain w/ C++, wchar, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + BR2_STATIC_LIBS config BR2_PACKAGE_ZXING_CPP bool "zxing-cpp" depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_STB select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 From yann.morin.1998 at free.fr Sun Feb 12 20:27:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:27:42 +0100 Subject: [Buildroot] [git commit] package/zxing-cpp: update homepage Message-ID: <20230212202900.E190185789@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6dbf3909dd4816230001f0d71dd31d9e96939083 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 456a7398316655ad0b669635f580e4887c24a700 decided to switch to an active fork but forgot to update homepage in Config.in Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zxing-cpp/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 6c17565d2a..2550dcf023 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_ZXING_CPP implemented in Java, with ports to other languages. This compiles the C++ port. - https://github.com/glassechidna/zxing-cpp + https://github.com/zxing-cpp/zxing-cpp From yann.morin.1998 at free.fr Sun Feb 12 20:29:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:29:19 +0100 Subject: [Buildroot] [PATCH 2/2] package/zxing-cpp: needs wchar In-Reply-To: <20230212150920.1213398-2-fontaine.fabrice@gmail.com> References: <20230212150920.1213398-1-fontaine.fabrice@gmail.com> <20230212150920.1213398-2-fontaine.fabrice@gmail.com> Message-ID: <20230212202919.GQ2796@scaer> Fabrice, All, On 2023-02-12 16:09 +0100, Fabrice Fontaine spake thusly: > wchar is mandatory since switch to an active fork in commit > 456a7398316655ad0b669635f580e4887c24a700: > > In file included from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Result.h:12, > from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/GTIN.cpp:9: > /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Content.h:40:14: error: 'wstring' in namespace 'std' does not name a type > 40 | std::wstring render(bool withECI) const; > | ^~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/4f97f1b291a99218f4706fce8b2934bd845755e1 > > Signed-off-by: Fabrice Fontaine Both patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gstreamer1/gst1-plugins-bad/Config.in | 6 ++++-- > package/zxing-cpp/Config.in | 6 ++++-- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in > index d477924eec..d2ef450d74 100644 > --- a/package/gstreamer1/gst1-plugins-bad/Config.in > +++ b/package/gstreamer1/gst1-plugins-bad/Config.in > @@ -741,11 +741,13 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" > config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING > bool "zxing" > depends on !BR2_STATIC_LIBS # zxing-cpp > + depends on BR2_USE_WCHAR # zxing-cpp > depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp > select BR2_PACKAGE_ZXING_CPP > > -comment "zxing plugin needs a toolchain w/ C++, dynamic library" > - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP > +comment "zxing plugin needs a toolchain w/ C++, wchar, dynamic library" > + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ > + !BR2_INSTALL_LIBSTDCPP > > endif > > diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in > index 2550dcf023..0d8b79538d 100644 > --- a/package/zxing-cpp/Config.in > +++ b/package/zxing-cpp/Config.in > @@ -1,9 +1,11 @@ > -comment "zxing-cpp needs a toolchain w/ C++, dynamic library" > - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS > +comment "zxing-cpp needs a toolchain w/ C++, wchar, dynamic library" > + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ > + BR2_STATIC_LIBS > > config BR2_PACKAGE_ZXING_CPP > bool "zxing-cpp" > depends on !BR2_STATIC_LIBS > + depends on BR2_USE_WCHAR > depends on BR2_INSTALL_LIBSTDCPP > select BR2_PACKAGE_STB > select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 > -- > 2.39.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 Feb 12 20:30:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:30:05 +0100 Subject: [Buildroot] [git commit] package/opencv3: bump to version 3.4.19 Message-ID: <20230212203017.B856E857B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d40cab45e21cd1c66bfffa911b1310e29c321486 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure with gcc >= 12: /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp: In function 'bool base64::base64_valid(const uint8_t*, size_t, size_t)': /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp:167:31: error: comparing the result of pointer addition '(src + ((sizetype)off))' and NULL [-Werror=address] 167 | if (src == 0 || src + off == 0) | ~~~~~~~~~~^~~~ cc1plus: some warnings being treated as errors Update hash of LICENSE file (update in year: https://github.com/opencv/opencv/commit/f6fe5c07f61eb0bc934672200b2bfd453f2fc41d) https://github.com/opencv/opencv/wiki/ChangeLog#version3419 Fixes: - http://autobuild.buildroot.org/results/cb9c120c15c8042e6919858d6885c1cc4d996c0c Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/opencv3/opencv3.hash | 4 ++-- package/opencv3/opencv3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash index 30308188aa..3d6fd2ed8a 100644 --- a/package/opencv3/opencv3.hash +++ b/package/opencv3/opencv3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1353eec67849aadb20df71d8bae18b83708e18fc5da080fe5efeabb1e99b2ee8 opencv3-3.4.17.tar.gz -sha256 9076d3d934839a2f8e7bfe549abda6faea4751f1edd6e9460ff703559890ad5f LICENSE +sha256 9b913e74299ce4416a5c94000da577c592bf670fd53bad16220eb115a0821529 opencv3-3.4.19.tar.gz +sha256 c1fed9cd2f557ba23a1b37a21e2c90629d1a60bdb61e92d0e79369bb6fca3390 LICENSE diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 8e4c90786e..29fb246e65 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV3_VERSION = 3.4.17 +OPENCV3_VERSION = 3.4.19 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause From yann.morin.1998 at free.fr Sun Feb 12 20:30:29 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:30:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv3: bump to version 3.4.19 In-Reply-To: <20230212145312.1203134-1-fontaine.fabrice@gmail.com> References: <20230212145312.1203134-1-fontaine.fabrice@gmail.com> Message-ID: <20230212203029.GR2796@scaer> Fabrice, All, On 2023-02-12 15:53 +0100, Fabrice Fontaine spake thusly: > This bump will fix the following build failure with gcc >= 12: > > /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp: In function 'bool base64::base64_valid(const uint8_t*, size_t, size_t)': > /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp:167:31: error: comparing the result of pointer addition '(src + ((sizetype)off))' and NULL [-Werror=address] > 167 | if (src == 0 || src + off == 0) > | ~~~~~~~~~~^~~~ > cc1plus: some warnings being treated as errors > > Update hash of LICENSE file (update in year: > https://github.com/opencv/opencv/commit/f6fe5c07f61eb0bc934672200b2bfd453f2fc41d) > > https://github.com/opencv/opencv/wiki/ChangeLog#version3419 > > Fixes: > - http://autobuild.buildroot.org/results/cb9c120c15c8042e6919858d6885c1cc4d996c0c > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/opencv3/opencv3.hash | 4 ++-- > package/opencv3/opencv3.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash > index 30308188aa..3d6fd2ed8a 100644 > --- a/package/opencv3/opencv3.hash > +++ b/package/opencv3/opencv3.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 1353eec67849aadb20df71d8bae18b83708e18fc5da080fe5efeabb1e99b2ee8 opencv3-3.4.17.tar.gz > -sha256 9076d3d934839a2f8e7bfe549abda6faea4751f1edd6e9460ff703559890ad5f LICENSE > +sha256 9b913e74299ce4416a5c94000da577c592bf670fd53bad16220eb115a0821529 opencv3-3.4.19.tar.gz > +sha256 c1fed9cd2f557ba23a1b37a21e2c90629d1a60bdb61e92d0e79369bb6fca3390 LICENSE > diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk > index 8e4c90786e..29fb246e65 100644 > --- a/package/opencv3/opencv3.mk > +++ b/package/opencv3/opencv3.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -OPENCV3_VERSION = 3.4.17 > +OPENCV3_VERSION = 3.4.19 > OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) > OPENCV3_INSTALL_STAGING = YES > OPENCV3_LICENSE = BSD-3-Clause > -- > 2.39.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 Feb 12 20:34:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:34:09 +0100 Subject: [Buildroot] [git commit] package/libsolv: drop unrecognized variables Message-ID: <20230212203453.3E91185AAB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4706e04e3ca7428c755bffd79ddf8ef8628141e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop unrecognized variables: CMake Warning: Manually-specified variables were not used by the project: BUILD_DOC BUILD_DOCS BUILD_EXAMPLE BUILD_EXAMPLES BUILD_TEST BUILD_TESTING BUILD_TESTS CMAKE_CXX_COMPILER_FORCED DISABLE_STATIC ENABLE_SHARED Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsolv/libsolv.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 29f8a6a3d2..04fdb387fd 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -11,16 +11,15 @@ LIBSOLV_LICENSE_FILES = LICENSE.BSD LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib -LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON else -LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=OFF endif ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=OFF else LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON endif From yann.morin.1998 at free.fr Sun Feb 12 20:34:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:34:14 +0100 Subject: [Buildroot] [git commit] package/libsolv: fix build without C++ Message-ID: <20230212203453.4A88785AAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=add76a41c3c68e649ecae69aa896d5f8b627d1be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without C++ raised since the addition ot the package in commit 93ce3c1be0753189d6af3ee9968b935037519c25: CMake Error at CMakeLists.txt:1 (PROJECT): No CMAKE_CXX_COMPILER could be found. Tell CMake where to find the compiler by setting either the environment variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path to the compiler, or to the compiler name if it is in the PATH. Fixes: - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsolv/0001-Fix-build-without-C.patch | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/package/libsolv/0001-Fix-build-without-C.patch b/package/libsolv/0001-Fix-build-without-C.patch new file mode 100644 index 0000000000..2389aebcde --- /dev/null +++ b/package/libsolv/0001-Fix-build-without-C.patch @@ -0,0 +1,49 @@ +From 5691f58d1f8ce1332b02536e48f1ac5864629c6c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 12 Feb 2023 15:27:27 +0100 +Subject: [PATCH] Fix build without C++ + +Fix the following build failure without C++: + +CMake Error at CMakeLists.txt:1 (PROJECT): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Fixes: + - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/openSUSE/libsolv/pull/520] +--- + CMakeLists.txt | 2 +- + ext/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3541f496..f899c49a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-PROJECT (libsolv) ++PROJECT (libsolv C) + + CMAKE_MINIMUM_REQUIRED (VERSION 2.8.5) + +diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt +index f01c0238..589fa946 100644 +--- a/ext/CMakeLists.txt ++++ b/ext/CMakeLists.txt +@@ -103,6 +103,7 @@ IF (ENABLE_CUDFREPO) + ENDIF (ENABLE_CUDFREPO) + + IF (ENABLE_HAIKU) ++ enable_language(CXX) + SET (libsolvext_SRCS ${libsolvext_SRCS} + repo_haiku.cpp) + SET (libsolvext_HEADERS ${libsolvext_HEADERS} +-- +2.39.0 + From yann.morin.1998 at free.fr Sun Feb 12 20:35:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:35:16 +0100 Subject: [Buildroot] [PATCH 1/2] package/libsolv: drop unrecognized variables In-Reply-To: <20230212144316.1181860-1-fontaine.fabrice@gmail.com> References: <20230212144316.1181860-1-fontaine.fabrice@gmail.com> Message-ID: <20230212203516.GS2796@scaer> Fabrice, All, On 2023-02-12 15:43 +0100, Fabrice Fontaine spake thusly: > Drop unrecognized variables: > > CMake Warning: > Manually-specified variables were not used by the project: > > BUILD_DOC > BUILD_DOCS > BUILD_EXAMPLE > BUILD_EXAMPLES > BUILD_TEST > BUILD_TESTING > BUILD_TESTS > CMAKE_CXX_COMPILER_FORCED > DISABLE_STATIC > ENABLE_SHARED > > Signed-off-by: Fabrice Fontaine Both patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libsolv/libsolv.mk | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk > index 29f8a6a3d2..04fdb387fd 100644 > --- a/package/libsolv/libsolv.mk > +++ b/package/libsolv/libsolv.mk > @@ -11,16 +11,15 @@ LIBSOLV_LICENSE_FILES = LICENSE.BSD > LIBSOLV_CPE_ID_VENDOR = opensuse > LIBSOLV_INSTALL_STAGING = YES > LIBSOLV_DEPENDENCIES = zlib > -LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON > > ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) > LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON > else > -LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON > +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=OFF > endif > > ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) > -LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON > +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=OFF > else > LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON > endif > -- > 2.39.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 Feb 12 20:37:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:37:48 +0100 Subject: [Buildroot] [git commit] package/zabbix: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230212203805.19BAF85AB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=895686180fa73a23f2e4e9ee374618fa259a79ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master zabbix uses custom --enable-{static,shared} options, instead of standard libtool directives resulting in the following build failure with openssl or libcurl: configure:13132: /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib conftest.c -lssl -lcrypto -lm >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): in function `dlfcn_globallookup': dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): in function `BIO_lookup_ex': b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): in function `BIO_gethostbyname': b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /tmp/cceWHjDi.o: in function `main': conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' [...] configure: error: OpenSSL library libssl or libcrypto not found Signed-off-by: Yann E. MORIN --- package/zabbix/zabbix.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index adc54028ad..e00d693ba5 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -125,6 +125,13 @@ endif endif # BR2_PACKAGE_ZABBIX_SERVER +# zabbix uses custom --enable-{static,shared} options, instead of +# standard libtool directives resulting in a build failure with libcurl +# or openssl. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ZABBIX_CONF_OPTS += --disable-static +endif + define ZABBIX_INSTALL_INIT_SYSTEMD $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ From yann.morin.1998 at free.fr Sun Feb 12 20:38:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:38:46 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/zabbix: fix BR2_SHARED_STATIC_LIBS In-Reply-To: <20230212124421.17787-1-fontaine.fabrice@gmail.com> References: <20230212124421.17787-1-fontaine.fabrice@gmail.com> Message-ID: <20230212203846.GT2796@scaer> Fabrice, All, On 2023-02-12 13:44 +0100, Fabrice Fontaine spake thusly: > zabbix uses custom --enable-{static,shared} options, instead of standard > libtool directives resulting in the following build failure with openssl > or libcurl: > > configure:13132: /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib conftest.c -lssl -lcrypto -lm >&5 > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): in function `dlfcn_globallookup': > dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): in function `BIO_lookup_ex': > b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): in function `BIO_gethostbyname': > b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /tmp/cceWHjDi.o: in function `main': > conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' > > [...] > > configure: error: OpenSSL library libssl or libcrypto not found > > --- > > configure:15199: checking for main in -lz > configure:15219: /home/autobuild/autobuild/instance-13/output-1/host/bin/s390x-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -I/home/autobuild/autobuild/instance-13/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-13/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib conftest.c -lz -lm >&5 > /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/10.3.0/../../../../s390x-buildroot-linux-gnu/bin/ld: cannot find -lz > collect2: error: ld returned 1 exit status > > [...] > > configure: error: static library z required for linking libcurl not found > > Fixes: > - http://autobuild.buildroot.org/results/c05230d13fa0538323bb77e8f35533e6dd02453f > - http://autobuild.buildroot.org/results/cc947038510e16417298b381521f226f7c45f986 > > Signed-off-by: Fabrice Fontaine Let's not have a repeat of the previous iteration. So: applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Update commit log and comment > > package/zabbix/zabbix.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk > index 23172a358d..06d12dbef4 100644 > --- a/package/zabbix/zabbix.mk > +++ b/package/zabbix/zabbix.mk > @@ -125,6 +125,13 @@ endif > > endif # BR2_PACKAGE_ZABBIX_SERVER > > +# zabbix uses custom --enable-{static,shared} options, instead of > +# standard libtool directives resulting in a build failure with libcurl > +# or openssl. > +ifeq ($(BR2_SHARED_STATIC_LIBS),y) > +ZABBIX_CONF_OPTS += --disable-static > +endif > + > define ZABBIX_INSTALL_INIT_SYSTEMD > $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ > $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ > -- > 2.39.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 Feb 12 20:46:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:46:22 +0100 Subject: [Buildroot] [git commit] package/python-magic-wormhole-mailbox-server: add missing reverse dependency on host-rustc Message-ID: <20230212204700.B784885AD9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0c933adab99e1767bb673610b69de5eedf42c5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As reported by Yann in [1], Kconfig warns about an unmet dependency. The issue can be reproduced on master branch at commit 451672e, with the command: KCONFIG_SEED=0x1D15B9D4 make randconfig The patch adds the missing dependency. Fixes: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_AUTOBAHN Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER [=y] && BR2_PACKAGE_PYTHON3 [=y] [1] https://lists.buildroot.org/pipermail/buildroot/2023-February/661898.html Cc: Yann E. MORIN Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/python-magic-wormhole-mailbox-server/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in index db20d3e7b6..a0721e866f 100644 --- a/package/python-magic-wormhole-mailbox-server/Config.in +++ b/package/python-magic-wormhole-mailbox-server/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER bool "python-magic-wormhole-mailbox-server" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime From yann.morin.1998 at free.fr Sun Feb 12 20:47:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:47:13 +0100 Subject: [Buildroot] [PATCH] package/python-magic-wormhole-mailbox-server: add missing reverse dependency on host-rustc In-Reply-To: <20230212095424.1326531-1-yann.morin.1998@free.fr> References: <20230212095424.1326531-1-yann.morin.1998@free.fr> Message-ID: <20230212204713.GU2796@scaer> Julien, All, On 2023-02-12 10:54 +0100, Yann E. MORIN spake thusly: > From: Julien Olivain > > As reported by Yann in [1], Kconfig warns about an unmet dependency. > > The issue can be reproduced on master branch at commit 451672e, > with the command: > > KCONFIG_SEED=0x1D15B9D4 make randconfig > > The patch adds the missing dependency. > > Fixes: > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_AUTOBAHN > Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] > Selected by [y]: > - BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER [=y] && BR2_PACKAGE_PYTHON3 [=y] > > [1] https://lists.buildroot.org/pipermail/buildroot/2023-February/661898.html > > Cc: Yann E. MORIN > Signed-off-by: Julien Olivain > Signed-off-by: Yann E. MORIN Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-magic-wormhole-mailbox-server/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in > index db20d3e7b6..a0721e866f 100644 > --- a/package/python-magic-wormhole-mailbox-server/Config.in > +++ b/package/python-magic-wormhole-mailbox-server/Config.in > @@ -1,5 +1,6 @@ > config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER > bool "python-magic-wormhole-mailbox-server" > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography > select BR2_PACKAGE_PYTHON3_SQLITE # runtime > select BR2_PACKAGE_PYTHON_ATTRS # runtime > select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime > -- > 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 Feb 12 20:48:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:48:36 +0100 Subject: [Buildroot] [git commit] package/rtl8723ds: bump to 2023-02-11 version with new license file Message-ID: <20230212204849.EA29D85B02@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27f38e175346c09eed003e95daa0f065b43e27e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A COPYING file has been added to rtl8723ds as of the most recent commit. Update the version of the package and add the license file hash. Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/rtl8723ds/rtl8723ds.hash | 3 ++- package/rtl8723ds/rtl8723ds.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index d5abf9913c..e94a7b40ef 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 97f3ebc5d977ba35d10c9c06e6817e4a00458727b651b56fc00c207c05a61995 rtl8723ds-a638cc8639015b8b9390af3350fab0366b6c87e7.tar.gz +sha256 672787c3f3d1f795b750cd74de8ca34bb661b8ae60f5aa50fb279ec08ff3f05f rtl8723ds-ec85dc6b9f72bfe413bff464ed01a272e29c8dbe.tar.gz +sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 COPYING diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index f303a24041..1bb164fa86 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,9 +4,10 @@ # ################################################################################ -RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 +RTL8723DS_VERSION = ec85dc6b9f72bfe413bff464ed01a272e29c8dbe RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 +RTL8723DS_LICENSE_FILES = COPYING RTL8723DS_USER_EXTRA_CLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ From yann.morin.1998 at free.fr Sun Feb 12 20:49:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:49:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl8723ds: bump to 2023-02-11 version with new license file In-Reply-To: <20230212014216.6293-1-christian@paral.in> References: <20230212014216.6293-1-christian@paral.in> Message-ID: <20230212204900.GV2796@scaer> Christian, All, On 2023-02-11 17:42 -0800, Christian Stewart via buildroot spake thusly: > A COPYING file has been added to rtl8723ds as of the most recent commit. > > Update the version of the package and add the license file hash. > > Signed-off-by: Christian Stewart Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/rtl8723ds/rtl8723ds.hash | 3 ++- > package/rtl8723ds/rtl8723ds.mk | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash > index d5abf9913c..e94a7b40ef 100644 > --- a/package/rtl8723ds/rtl8723ds.hash > +++ b/package/rtl8723ds/rtl8723ds.hash > @@ -1,2 +1,3 @@ > # Locally computed > -sha256 97f3ebc5d977ba35d10c9c06e6817e4a00458727b651b56fc00c207c05a61995 rtl8723ds-a638cc8639015b8b9390af3350fab0366b6c87e7.tar.gz > +sha256 672787c3f3d1f795b750cd74de8ca34bb661b8ae60f5aa50fb279ec08ff3f05f rtl8723ds-ec85dc6b9f72bfe413bff464ed01a272e29c8dbe.tar.gz > +sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 COPYING > diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk > index f303a24041..1bb164fa86 100644 > --- a/package/rtl8723ds/rtl8723ds.mk > +++ b/package/rtl8723ds/rtl8723ds.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 > +RTL8723DS_VERSION = ec85dc6b9f72bfe413bff464ed01a272e29c8dbe > RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) > RTL8723DS_LICENSE = GPL-2.0 > +RTL8723DS_LICENSE_FILES = COPYING > > RTL8723DS_USER_EXTRA_CLAGS = \ > -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ > -- > 2.39.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 Feb 12 20:49:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:49:52 +0100 Subject: [Buildroot] [PATCH 1/1] board/visionfive2: add link to documentation In-Reply-To: <20230211224755.13044-1-francois.dugast.foss@gmail.com> References: <20230211224755.13044-1-francois.dugast.foss@gmail.com> Message-ID: <20230212204952.GW2796@scaer> Fran?ois, All, On 2023-02-11 23:47 +0100, Francois Dugast spake thusly: > Add a link to RVspace Documentation Center, which did not exist > when readme.txt was first submitted. It provides datasheet, quick > start, schematics, and so on. > > Signed-off-by: Francois Dugast Applied to master, thanks. Regards, Yann E. MORIN. > --- > board/visionfive2/readme.txt | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt > index 2da98f3847..1924cbc12b 100644 > --- a/board/visionfive2/readme.txt > +++ b/board/visionfive2/readme.txt > @@ -4,6 +4,8 @@ Starfive VisionFive2 > The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a > Starfive JH7110 processor. > > +https://doc-en.rvspace.org/Doc_Center/visionfive_2.html > + > How to build > ============ > > -- > 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 yann.morin.1998 at free.fr Sun Feb 12 20:49:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:49:09 +0100 Subject: [Buildroot] [git commit] board/visionfive2: add link to documentation Message-ID: <20230212205037.0B3D685B14@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f48b3983cdb32dfcd59e7e549c8eaa1503fe342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a link to RVspace Documentation Center, which did not exist when readme.txt was first submitted. It provides datasheet, quick start, schematics, and so on. Signed-off-by: Francois Dugast Signed-off-by: Yann E. MORIN --- board/visionfive2/readme.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt index 2da98f3847..1924cbc12b 100644 --- a/board/visionfive2/readme.txt +++ b/board/visionfive2/readme.txt @@ -4,6 +4,8 @@ Starfive VisionFive2 The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a Starfive JH7110 processor. +https://doc-en.rvspace.org/Doc_Center/visionfive_2.html + How to build ============ From giulio.benetti at benettiengineering.com Sun Feb 12 20:53:34 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 12 Feb 2023 21:53:34 +0100 Subject: [Buildroot] [PATCH] package/cryptsetup: bump version to 2.6.1 Message-ID: <20230212205334.990478-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 149d1e71f1..87cdf840c3 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc -sha256 44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735 cryptsetup-2.6.0.tar.xz +sha256 410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 cryptsetup-2.6.1.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 659fdfa2a4..3f3034475f 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.6 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ -- 2.34.1 From yann.morin.1998 at free.fr Sun Feb 12 20:53:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:53:55 +0100 Subject: [Buildroot] [git commit] package/x11r7/xapp_beforelight: bump version to 1.0.6 Message-ID: <20230212205429.5EF1785B5E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa93d0cdd7adf1051cdb1643e978c81ae183327c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003317.html The license file was previously a stub, but it now contains the proper license text since upstream commit: https://gitlab.freedesktop.org/xorg/app/beforelight/-/commit/fa1e473dd64673a36a73a01a84a8db61eaa425dc Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls [yann.morin.1998 at free.fr: properly explain the license hash change] Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_beforelight/xapp_beforelight.hash | 7 ++++--- package/x11r7/xapp_beforelight/xapp_beforelight.mk | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.hash b/package/x11r7/xapp_beforelight/xapp_beforelight.hash index 00aff75779..f5b0cb21a4 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.hash +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002131.html -sha256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 beforelight-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-January/003317.html +sha256 53f0bf085b7272ebbf626d1b9b0ad320d1a07bc1fe7f3ae260c86a71a857ad28 beforelight-1.0.6.tar.xz +sha512 48a165d151676f6d213883bee98b34007403a77e025253c8649f9a0f5ea258b09381ab523a5e906030ac9fc8245fce2c6beaf9ad0f81116e302d51ad4a0fad5a beforelight-1.0.6.tar.xz # Locally computed -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING +sha256 3909739fae1ee37c3c7167a91f53d29317965aaf932813e16ef733f033619a7b COPYING diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk index 7dcb715ef3..6b753833f7 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_BEFORELIGHT_VERSION = 1.0.5 -XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2 -XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_BEFORELIGHT_VERSION = 1.0.6 +XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.xz +XAPP_BEFORELIGHT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_BEFORELIGHT_LICENSE = MIT XAPP_BEFORELIGHT_LICENSE_FILES = COPYING XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt From yann.morin.1998 at free.fr Sun Feb 12 20:55:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:55:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xapp_beforelight: bump version to 1.0.6 In-Reply-To: <20230211183715.432384-1-bernd.kuhls@t-online.de> References: <20230211183715.432384-1-bernd.kuhls@t-online.de> Message-ID: <20230212205530.GX2796@scaer> Bernd, All, On 2023-02-11 19:37 +0100, Bernd Kuhls spake thusly: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-January/003317.html > > Updated license hash due to upstream commit: > https://gitlab.freedesktop.org/xorg/app/beforelight/-/commit/fa1e473dd64673a36a73a01a84a8db61eaa425dc This is not enough to assess the change. We need to know what cahnged, so I expanded ojn that: The license file was previously a stub, but it now contains the proper license text since upstream commit: Applied to master, thanks. Regards, Yann E. MORIN. > Switched tarball to xz, updated _SITE. > > Signed-off-by: Bernd Kuhls > --- > package/x11r7/xapp_beforelight/xapp_beforelight.hash | 7 ++++--- > package/x11r7/xapp_beforelight/xapp_beforelight.mk | 6 +++--- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.hash b/package/x11r7/xapp_beforelight/xapp_beforelight.hash > index 00aff75779..f5b0cb21a4 100644 > --- a/package/x11r7/xapp_beforelight/xapp_beforelight.hash > +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.hash > @@ -1,4 +1,5 @@ > -# From http://lists.x.org/archives/xorg-announce/2013-January/002131.html > -sha256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 beforelight-1.0.5.tar.bz2 > +# From https://lists.x.org/archives/xorg-announce/2023-January/003317.html > +sha256 53f0bf085b7272ebbf626d1b9b0ad320d1a07bc1fe7f3ae260c86a71a857ad28 beforelight-1.0.6.tar.xz > +sha512 48a165d151676f6d213883bee98b34007403a77e025253c8649f9a0f5ea258b09381ab523a5e906030ac9fc8245fce2c6beaf9ad0f81116e302d51ad4a0fad5a beforelight-1.0.6.tar.xz > # Locally computed > -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING > +sha256 3909739fae1ee37c3c7167a91f53d29317965aaf932813e16ef733f033619a7b COPYING > diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk > index 7dcb715ef3..6b753833f7 100644 > --- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk > +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -XAPP_BEFORELIGHT_VERSION = 1.0.5 > -XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2 > -XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app > +XAPP_BEFORELIGHT_VERSION = 1.0.6 > +XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.xz > +XAPP_BEFORELIGHT_SITE = https://xorg.freedesktop.org/archive/individual/app > XAPP_BEFORELIGHT_LICENSE = MIT > XAPP_BEFORELIGHT_LICENSE_FILES = COPYING > XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt > -- > 2.39.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 mr.bossman075 at gmail.com Sun Feb 12 20:59:45 2023 From: mr.bossman075 at gmail.com (Jesse Taube) Date: Sun, 12 Feb 2023 15:59:45 -0500 Subject: [Buildroot] [PATCH v2 0/4] Add RISC-V 32 NOMMU support In-Reply-To: <20221217051337.3778405-1-Mr.Bossman075@gmail.com> References: <20221217051337.3778405-1-Mr.Bossman075@gmail.com> Message-ID: Any updates on this set? On 12/17/22 00:13, Jesse Taube wrote: > This patch-set aims to add NOMMU support to RV32. > Many people want to build simple emulators or HDL > models of RISC-V this patch makes it posible to > run linux on them. > > Yimin Gu is the original author of this set. > Submitted here: > https://lists.buildroot.org/pipermail/buildroot/2022-November/656134.html > > Though Jesse T made the configs more concise. > Aswell fixed the 1k line Dconf, > and split into 3 distinct patches. > > A couple things to note: > - UcLibc seems to want __ARCH_WANT_TIME32_SYSCALLS > for adjtimex, but Linux doesnt provide this for RV32. > - Patch 2 adds __ARCH_WANT_STAT64, > but I'm not sure if this is needed. > - Busybox doesnt build umask or unset for NOMMU systems. > I have seen this happen on STM32 aswell as I.MXRT > > [__ARCH_WANT_TIME32_SYSCALLS]: > https://patchwork.kernel.org/project/linux-arm-kernel/patch/20190218210712.3503891-5-arnd at arndb.de/ > > Jesse Taube (1): > configs/qemu_riscv32_nommu_virt_defconfig: New defconfig > > Yimin Gu (3): > package/elf2flt: add RISC-V 32-bits support > package/uclibc: Add RISC-V 32-bit support > arch: Enable support for RISC-V 32-bit NOMMU > > arch/Config.in.riscv | 2 - > board/qemu/riscv32-virt/nommu/defconfig | 16 ++ > .../riscv32-virt/nommu/patches/linux-headers | 1 + > ...nfig-Allow-RV32-to-build-with-no-MMU.patch | 43 ++++++ > ...le-stat64-and-time32-for-RV32-uclibc.patch | 40 +++++ > board/qemu/riscv32-virt/readme.txt | 6 +- > configs/qemu_riscv32_nommu_virt_defconfig | 31 ++++ > package/Makefile.in | 4 +- > .../0007-Added-RISC-V-32-bit-support.patch | 87 +++++++++++ > .../uclibc/0001-RISC-V-32-bit-support.patch | 145 ++++++++++++++++++ > package/uclibc/Config.in | 2 + > 11 files changed, 372 insertions(+), 5 deletions(-) > create mode 100644 board/qemu/riscv32-virt/nommu/defconfig > create mode 120000 board/qemu/riscv32-virt/nommu/patches/linux-headers > create mode 100644 board/qemu/riscv32-virt/nommu/patches/linux/6.0/0001-riscv-Kconfig-Allow-RV32-to-build-with-no-MMU.patch > create mode 100644 board/qemu/riscv32-virt/nommu/patches/linux/6.0/0002-riscv-Enable-stat64-and-time32-for-RV32-uclibc.patch > create mode 100644 configs/qemu_riscv32_nommu_virt_defconfig > create mode 100644 package/elf2flt/0007-Added-RISC-V-32-bit-support.patch > create mode 100644 package/uclibc/0001-RISC-V-32-bit-support.patch > From yann.morin.1998 at free.fr Sun Feb 12 21:06:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 22:06:38 +0100 Subject: [Buildroot] [git commit] package/cryptsetup: bump version to 2.6.1 Message-ID: <20230212210654.0E25F85B9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=888ac96e55c0c53bf5ada2f3f6d58e9e1179d91b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 149d1e71f1..87cdf840c3 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc -sha256 44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735 cryptsetup-2.6.0.tar.xz +sha256 410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 cryptsetup-2.6.1.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 659fdfa2a4..3f3034475f 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.6 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From yann.morin.1998 at free.fr Sun Feb 12 21:07:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 22:07:05 +0100 Subject: [Buildroot] [PATCH] package/cryptsetup: bump version to 2.6.1 In-Reply-To: <20230212205334.990478-1-giulio.benetti@benettiengineering.com> References: <20230212205334.990478-1-giulio.benetti@benettiengineering.com> Message-ID: <20230212210705.GY2796@scaer> Giulio, All, On 2023-02-12 21:53 +0100, Giulio Benetti spake thusly: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/cryptsetup/cryptsetup.hash | 2 +- > package/cryptsetup/cryptsetup.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash > index 149d1e71f1..87cdf840c3 100644 > --- a/package/cryptsetup/cryptsetup.hash > +++ b/package/cryptsetup/cryptsetup.hash > @@ -1,4 +1,4 @@ > # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc > -sha256 44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735 cryptsetup-2.6.0.tar.xz > +sha256 410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 cryptsetup-2.6.1.tar.xz > sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING > sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 659fdfa2a4..3f3034475f 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > CRYPTSETUP_VERSION_MAJOR = 2.6 > -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 > +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 > CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz > CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) > CRYPTSETUP_DEPENDENCIES = \ > -- > 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 Feb 12 21:08:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 22:08:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xapp_xvidtune: bump version to 1.0.4 In-Reply-To: <20230211182838.272469-1-bernd.kuhls@t-online.de> References: <20230211182838.272469-1-bernd.kuhls@t-online.de> Message-ID: <20230212210804.GZ2796@scaer> Bernd, All, On 2023-02-11 19:28 +0100, Bernd Kuhls spake thusly: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003319.html > > Switched tarball to xz, updated _SITE. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/x11r7/xapp_xvidtune/xapp_xvidtune.hash | 5 +++-- > package/x11r7/xapp_xvidtune/xapp_xvidtune.mk | 6 +++--- > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash > index ecf7d0330b..0e7e231383 100644 > --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash > +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash > @@ -1,4 +1,5 @@ > -# From http://lists.x.org/archives/xorg-announce/2013-January/002129.html > -sha256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 xvidtune-1.0.3.tar.bz2 > +# From https://lists.x.org/archives/xorg-announce/2023-February/003319.html > +sha256 0d4eecd54e440cc11f1bdaaa23180fcf890f003444343f533f639086b05b2cc5 xvidtune-1.0.4.tar.xz > +sha512 747d5358f4f7d3d7db508c3f034711ce4b9dd278160d35312e9c4d1604623e84a2438d039b536546fd2df7db8c5ea1907e8a6101985fad2932b6dee5a62c7b80 xvidtune-1.0.4.tar.xz > # Locally computed > sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING > diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk > index d7c4d5bf56..cc40d39098 100644 > --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk > +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -XAPP_XVIDTUNE_VERSION = 1.0.3 > -XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2 > -XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app > +XAPP_XVIDTUNE_VERSION = 1.0.4 > +XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.xz > +XAPP_XVIDTUNE_SITE = https://xorg.freedesktop.org/archive/individual/app > XAPP_XVIDTUNE_LICENSE = MIT > XAPP_XVIDTUNE_LICENSE_FILES = COPYING > XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm > -- > 2.39.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 Feb 12 21:07:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 22:07:18 +0100 Subject: [Buildroot] [git commit] package/x11r7/xapp_xvidtune: bump version to 1.0.4 Message-ID: <20230212210843.C4F5C85C54@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89710c804ede6879db45c8e41aca3607bd2bb051 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003319.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xvidtune/xapp_xvidtune.hash | 5 +++-- package/x11r7/xapp_xvidtune/xapp_xvidtune.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash index ecf7d0330b..0e7e231383 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002129.html -sha256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 xvidtune-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003319.html +sha256 0d4eecd54e440cc11f1bdaaa23180fcf890f003444343f533f639086b05b2cc5 xvidtune-1.0.4.tar.xz +sha512 747d5358f4f7d3d7db508c3f034711ce4b9dd278160d35312e9c4d1604623e84a2438d039b536546fd2df7db8c5ea1907e8a6101985fad2932b6dee5a62c7b80 xvidtune-1.0.4.tar.xz # Locally computed sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk index d7c4d5bf56..cc40d39098 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XVIDTUNE_VERSION = 1.0.3 -XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2 -XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XVIDTUNE_VERSION = 1.0.4 +XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.xz +XAPP_XVIDTUNE_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XVIDTUNE_LICENSE = MIT XAPP_XVIDTUNE_LICENSE_FILES = COPYING XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm From bugzilla at busybox.net Mon Feb 13 00:43:08 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 13 Feb 2023 00:43:08 +0000 Subject: [Buildroot] [Bug 15306] glibc build fails in Docker container In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15306 --- Comment #2 from Russ --- Yann, Can you provide comprehensive instruction on how I can reproduce your success? I'm happy to see if I can reproduce in my environment, and if your setup works for me as well I'll look for what's different when building the reported target. I'm not super familiar with batocera nor buildroot, so it'd be hard for me to pare it down to a minimal example. -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Mon Feb 13 06:37:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 06:37:58 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-12 Message-ID: <20230213063806.4692660E07@smtp3.osuosl.org> Hello, Autobuild statistics for 2023-02-12 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 4 | 1 | 0 | 5 | 2022.11.x | 14 | 19 | 0 | 33 | master | 175 | 210 | 3 | 388 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 17 unknown | 13 gobject-introspection-1.72.0 | 12 host-go-1.19.5 | 8 zabbix-5.4.9 | 7 libsolv-0.7.22 | 6 package/postgresql/postgres... | 6 host-pahole-1.24 | 5 host-binutils-2.38 | 4 systemd-252.4 | 4 boost-1.80.0 | 3 busybox-1.36.0 | 3 elfutils-0.186 | 3 gerbera-1.10.0 | 3 gobject-introspection | 3 perl-5.36.0 | 3 python-numpy-1.23.5 | 3 uclibc-1.0.42 | 3 ace-7.0.6 | 2 ffmpeg-4.4.3 | 2 fontconfig-2.13.1 | 2 fs/ubifs/ubifs.mk:49: /home... | 2 glibc-2.36-81-g4f4d7a13edfd... | 2 google-breakpad-c85eb4a59b6... | 2 host-binutils-2.37 | 2 host-rust-1.67.0 | 2 libglib2-2.72.3 | 2 linux-5.10.162-cip24 | 2 linux-6.1.9 | 2 ntpsec-1_2_2 | 2 olsr-0.9.8 | 2 open-iscsi-2.1.8 | 2 pcre2-10.42 | 2 php-8.2.2 | 2 php-xdebug-3.0.4 | 2 pv-1.6.20 | 2 sdl-1.2.15 | 2 uclibc-ng-test-6790eafe897b... | 2 zxing-cpp-1.4.0 | 2 bat-0.19.0 | 1 bird-2.0.11 | 1 containerd-1.6.16 | 1 cryptopp-8.6.0 | 1 dash-0.5.11.5 | 1 dropbear-2022.83 | 1 dust-0.8.1 | 1 efivar-38 | 1 file-5.43 | 1 fluent-bit-2.0.8 | 1 frr-8.4.2 | 1 fs/axfs/axfs.mk:32: /home/a... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/f2fs/f2fs.mk:64: /home/a... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gdb-11.2 | 1 glibmm-2.68.2 | 1 gnu-efi-3.0.15 | 1 hawktracer-2ec19d7192334414... | 1 host-binutils-2.39 | 1 host-libarchive-3.6.2 | 1 hwloc-2.8.0 | 1 kmod-30 | 1 libcap-ng-0.8.3 | 1 libgcrypt-1.10.1 | 1 libgpg-error-1.46 | 1 libmdbx-0.11.13 | 1 libnss-3.87 | 1 libopenh264-2.3.1 | 1 lirc-tools-0.10.2 | 1 lttng-modules-2.13.7 | 1 micropython-1.19.1 | 1 modem-manager-1.20.4 | 1 mongodb-4.2.18 | 1 mutt-2.2.9 | 1 mxs-bootlets-10.12.01 | 1 ne10-1.2.1 | 1 ntp-4.2.8p15 | 1 opencv3-3.4.17 | 1 optee-client-3.19.0 | 1 package/multipath-tools/mul... | 1 pipewire-0.3.65 | 1 pixz-1.0.7 | 1 poke-2.4 | 1 proxychains-ng-4.16 | 1 python-bcrypt-4.0.1 | 1 python-cryptography-39.0.0 | 1 python-pyicu-2.10.2 | 1 quickjs-2021-03-27 | 1 sconeserver-8d1935919a20133... | 1 sudo-1.9.12p2 | 1 tcf-agent-1.7.0 | 1 traceroute-2.1.0 | 1 valgrind-3.19.0 | 1 vlc-3.0.18 | 1 weston-10.0.1 | 1 wtfutil-0.41.0 | 1 xenomai-3.0.10 | 1 xtables-addons-3.22 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/ed2b55c26ca3dbbff9e32482c82539d5789fd748 | powerpc64 | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/046c4d2ba9d2a87b7846d220cbf1438585315f1f | armeb | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/3f9cc08d7adec2c4200f27de96b3eac13eb1e773 | arm | bird-2.0.11 | NOK | http://autobuild.buildroot.net/results/cb64ad16b47aabd8f100c5cfac5034000a102f10 | arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/8da6765f2c502fe06cf75ae1ce030ac17066d136 | arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/b7080952b100c97f9142e37fa759d171c46c5a35 | arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/6989cbcd24c53dae3bbb806dfb23368f1a49833a | mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/77c4949ce8af0a1f7ab5ca6dec3bca4f56e25748 | ORPH mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/5804ea8a08ff56912aafb0e7bc329974c3394c92 | ORPH mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/befdfce9d795c4a8c91dedccab476f998bad131d | ORPH powerpc64le | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/c0736a85d8b23963e80412796ed2aa55abb481f2 | arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/a50869b6d979d1b9772a1ef6128ab24155920c23 | xtensa | dash-0.5.11.5 | NOK | http://autobuild.buildroot.net/results/cd7a8619859c4cb77180e65d23d9c1889f662377 | ORPH riscv64 | dropbear-2022.83 | NOK | http://autobuild.buildroot.net/results/be854e8af22ad7e16e617525385f069dc35139d9 | mipsel | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/c4d7ba13f45e4573fc7f6f4d9ad841713d0d4bde | ORPH mips64el | efivar-38 | NOK | http://autobuild.buildroot.net/results/d36361eee4a9f4ed0cfbffed8986320cf836f252 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/5172000db3e0bc4e701c8a6fd82486ca58ac6e6a | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/02d9e0f79953b6c7a04696d653de778e9b5b4d48 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/06e99bade389f5c5f4c5ce37a492f1908d3ce03e | ORPH armeb | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/84c78beca0bea9e9515c02737bed7b87986035af | armeb | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/5afe59ea9d1d3372f1aeb43cd4443cc145209fc7 | armeb | file-5.43 | NOK | http://autobuild.buildroot.net/results/b4451a1ed792f35ce3abec93c43acd539534875e | ORPH s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/fc3d42e9c22652ad45bef9134a3af302e38745e9 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/0c94978d08e7b867edc8adbbd7435b51137c6ec5 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/f1fe6ed228f6cb880dc5e0bf7af4050f9e412a25 | ORPH arc | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/bc4e8a8c639bdb5d90840ad758da1f5b2804c38e | powerpc64 | fs/axfs/axfs.mk:32: /home/a... | NOK | http://autobuild.buildroot.net/results/f595d6e38d59e3b3a222b4099b6594c72384c6a7 | powerpc64le | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/55274e1f07cb6bb6137e2a85c9f44741db9f0db1 | microblaze | fs/f2fs/f2fs.mk:64: /home/a... | NOK | http://autobuild.buildroot.net/results/c1ec6ebdf67bd180b8471629dee341374e38b842 | powerpc | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/4cf2247b662acc3d272f92d73f40f4e6cf84beb7 | or1k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/967bbd3504085a431b748e624974aeb76981b35e | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/497c9ba0aa2d68e112fe243994f1341206fa6f5a | x86_64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/db0fc67ae8d382677e681c6f1e0dd25a88cf9790 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/6d2f6d5be68055d42c58d05abd0e90e658d33f11 | x86_64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/4404030bdf30586739dba6a48db7ccbc977eb1e5 | powerpc64le | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/d71155f13cf41c2efa66f7bc27a070d86df8359f | powerpc64le | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/39f7fd1857adc8989f5d2ec49d85f34c39397bad | i586 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/a20848951a94051c353ea1a99c5f96135aa19af4 | m68k | gdb-11.2 | NOK | http://autobuild.buildroot.net/results/91c58b022279f14bc6b5a36cf85356f90f5dbcae | ORPH s390x | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/32cc9ab99206e23beca6723b4d4ff46a9e94d375 | mips | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/7ac99ea51c4fdefe6a401377477ccdb227ccd2a2 | mips | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/c260d76602544d334b6a914941205b55bd741dfa | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/46259b215cd63808823ddcdd0da8a891b1eb586a | powerpc64le | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/457c8594ded04f0141f81671a197078f52e9a62b | or1k | glibmm-2.68.2 | NOK | http://autobuild.buildroot.net/results/bfb2df1d0bb6d31d2c7139440fa7ab77a0784ab3 | mips64el | gnu-efi-3.0.15 | NOK | http://autobuild.buildroot.net/results/e89e622792ae8e283621babae7ec0d6344a06b65 | sh4aeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/aa608e788c318d940501d27d9b76dae04f446a9a | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/25e9759d0d521072bcdda6f58e35e71cd00df98f | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/532f20521c1468df8e65300f3913413b3e01024c | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/1ab9c64f1a21d6e933f4002629ae1829457a0b57 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/c2fc009007f84947dd7a1222cc2bb94d6f12db0f | aarch64_be | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/8054be537e46200baa4134aae76a0d485881a4be | powerpc | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ac9e283cd931b65ccd6e01b5ca3515de0a6f5ca0 | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/2fad86f853bcb5d89922b9156e8e1b375127dc8b | i686 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/be1ad29278707969c6587344158c5cb927318aa5 | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/63ba02214907185212738352cd3c8ab19757429c | arm | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/893e3035336d6551dd56a2f14375cd85224bea83 | or1k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ab066d913718f10b09dfca61d0e0452f7d6169f6 | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/cb07284246317dd8e5670c6280ec47c2d812dbbc | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6a26941cbb3ed4d51034a31a761c4fa07b660ed1 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/b57cc8fbbcd03bf54a17f116b8fbc26ccc92524c | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/3e91604caa35a4326b8a1aa5dd02c212a6348c3a | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/e79ec54e7f491d9a46c733e67e11c6ea7aff379b | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/6cfd3a18c347bba978dd706b042801c8b5d8279b | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/70f179937851cfef1d6fe4422d205f0583ab5b1c | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/b4dc0df0d76f15c055dab99d5c14639835661663 | i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2e8177f81f70141cac0dd8848fed4b79b616407f | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/83ce33a9eddafe33ecf16a5aa263147470e73c7e | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/b45bd4e5c5b9a4803fd19fd1b600944ead71d06f | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2a3dd39bb97ba1f3f17c8bec499f1480abfec691 | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/c9f75afdd60bfb6458d1d334e1ce73bc0f44bcd0 | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7df6bf0f0df223e2c0473be1294fb34c3e70e276 | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/555ecf9ac0f0317f206723e1a31b8820abc1821a | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/80adfb78aac8ad413033149cc08121cea1f4849d | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/6f17f1938d7c77bc65a9a01891a1536d53233d53 | ORPH mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/dbaee863009980833ec275629e7152944bea4909 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f8fe5d316c3c8f14e9caacf978679323d0efee62 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/38d2aa1f953f86289f234f8ce1c1b90cdbb45dee | ORPH mipsel | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/9f4892aabeb473f151d756871ed0a752f0f9be19 | i686 | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/42a8b0d394964b7936bebbd262e4eb10106358be | riscv32 | hawktracer-2ec19d7192334414... | NOK | http://autobuild.buildroot.net/results/c7a39f66713a0b48f447ccfb1a78bc9c4217b3db | i586 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/73e6238e6319242cb2b8ce244c05462681d840c7 | arm | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/2d3a7c99a6f041551bd5725c196e6fe9cb46a648 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/aff01af7c94f9be02a8bd303464a18fd880e98dc | sh4 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/48af4210fdd5a812317fd62e4f92f68352e6f512 | nios2 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6d6fb182e5a941788433383d0919fc23faa7b536 | armeb | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/8726c3be2c8fbb35fd4d4294ab26597987fb7a61 | arm | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/dda7c210fdc98fd50913f492c918003155378e31 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/98969774e1bdad95a7053470291a1720fab90263 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/8c3872b9fc6c865f3f4ea0fcdaac60ad07503945 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/9d4edc0113589987e8a28d6fc063afad2395a500 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/cfe1b18d623324ff43d20768af3a0c4977d7b557 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/3d05960400173a170e711fc9b1eee54754671ce7 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/d9ae290dce54378c8c45257b5e7c28649c8ee87e | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/c621f452f7915370fba07ddc0583f5744110c11a | powerpc64le | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/34ddb049899af197a0285b66703f6e2f93f726c3 | powerpc64le | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/cafe3331f9d67f43abd9b298af1ea1460ef3bf8c | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/e1737b25038a05d9e1e1f1a6c076adfed5f9c107 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/59119579f265fc55c9073c31d97f7ce8d85cf21b | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/88eac71725b21736632e68c05919340a7adefd29 | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/62bfa931076352b10bad12771a1f3ef8fc8db591 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/62172ecf8446347dbadd3d10c494c97958adeb54 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/9e0e773e2b053a392918e2e035e2187a64b0d55e | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/0138dc37f8cc827c88dc77722637634f03b225b6 | x86_64 | hwloc-2.8.0 | NOK | http://autobuild.buildroot.net/results/b0420f11c08bc9f6d6d43d25187e3cdba694b690 | xtensa | kmod-30 | NOK | http://autobuild.buildroot.net/results/9a46d2620453b9054f7af4e6328e67d727100405 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/fb24fd1eaa328804309d2e94b31eedeffa5e91d1 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/58cf10ff0f4c6db76547c10c4afb7c7b18ec6c22 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/2c0c696ce1c417bea1530dffb884c852898840ad | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/0ed8370c738fc93c38173d4ed948eeda75156c92 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/f8d5a62af1d1fea18534b2529075ca2b0746ef75 | ORPH sh4aeb | libmdbx-0.11.13 | NOK | http://autobuild.buildroot.net/results/f804e65712beb15b775f601c7999a90bfe5b4ea9 | i686 | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/8a248bf6d9801e151c6ac830bc51fba1f208d7ec | mipsel | libopenh264-2.3.1 | NOK | http://autobuild.buildroot.net/results/715708ea5a5c61740c40cb2d005a60e0b05a1377 | or1k | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/5e3d201db6ec8fe13724f6ddabd20e2a582fd144 | m68k | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/7bb521af1a9f6f4c5aa360c1345d7b763d59ce2a | mips | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f | mips64 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/840d71597afd165851cbbe12c81ef625d7e163c1 | powerpc64le | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/e6c1053e0823a07b0d0a81655640f1e41f5f60b7 | mips | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/e167b967a08113bc04e1171713c619194383841f | m68k | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/d386d20a7b262511fae3405117cb4219314266d2 | ORPH mipsel | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/7f0ee8a9bd797c33e4e31fdbd9847458e4e31e59 | ORPH arm | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/c276626aa5102e895ab714580febccfa5a4b55f6 | ORPH mipsel | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/60b3348b56be185a9b10ae77a050254704a7066e | ORPH mips | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/66a230b32fa06558987f36d5df5c82cd04d1d0b1 | ORPH sparc | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/e44f023e1c63de23716bb5010b821c58f0a8c243 | aarch64 | micropython-1.19.1 | NOK | http://autobuild.buildroot.net/results/4789282221dcf56db3f9b0bf503883d924f94875 | aarch64_be | modem-manager-1.20.4 | NOK | http://autobuild.buildroot.net/results/2a2b2faa53961eab12747ed7744d8849128d21f7 | aarch64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/4e8562e1b99084c503bcd04dbee4118958922e56 | powerpc | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/5cdcd3e96ba5bbf9724dbba791f50ef338c40d00 | arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/e768cb8bc4fa91e4f2ee1bdc45dbad4080578306 | ORPH aarch64 | ne10-1.2.1 | NOK | http://autobuild.buildroot.net/results/1c64785ff14e5da2ed2bab13fa26d1dd5f83b69c | sh4eb | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/483bab0cbe6d816ab690da9070b244f4878f6f7b | ORPH m68k | ntpsec-1_2_2 | NOK | http://autobuild.buildroot.net/results/c40e053c790351cd1aca8a2fe494af95770dcf06 | ORPH microblazeel | ntpsec-1_2_2 | NOK | http://autobuild.buildroot.net/results/0bc545c83fdc59a955c9072fb58b728386cb7d5b | ORPH aarch64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/47a619686bb47debd525c92aa7e14bee5c40ca9e | ORPH arceb | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/ccabc573046fd85916db92ca2fd98c607a214ef5 | ORPH armeb | open-iscsi-2.1.8 | NOK | http://autobuild.buildroot.net/results/ae3b2c3dd9dd6ad36363fb74654ea32c564e4ec5 | or1k | open-iscsi-2.1.8 | NOK | http://autobuild.buildroot.net/results/48a4bddc355956733d712214797350cca8e111d9 | microblazeel | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/cb9c120c15c8042e6919858d6885c1cc4d996c0c | aarch64_be | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/fde94badff8334e83edf2c31acdfe6ced366c193 | sparc64 | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/e8701d45443382f7a83be6a2fef78b65e166b7f7 | powerpc64 | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/adaf44b74a0b309aa37acaafb9dbf8bdbf34fb95 | microblaze | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/68df3463197969aa9b93f14687cf9442aeb4f104 | aarch64_be | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/7f02e668fd0d80e4adba81adebf323f1e83685c4 | mips | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/72fb419507ac57ca21f228d283b1b44ee4b1f873 | armeb | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/06b778ff39287912fff2b074bd772b083279568a | aarch64_be | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/4b07e04b4cfe7d4b9968acd34793415b507eec44 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/e21818393adecaac8d66dcd37f7b252d3b72ee61 | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/e0f7902a665c89879a338d28e74ce251f4276bca | ORPH arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/a7fc628e0cb9ab4fe75a932201a070bd047a6f03 | arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/c1c60389b1071f92b7e738aa036c5235727a82b0 | sparc64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/d7aeb37eeb75b6c10f8ffa2df07d44e71cdf49fb | microblaze | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/f1899783a0705748305a2889d3c142002d2e8b62 | sh4aeb | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/2562cb6a37f9e2be914c9a463607b650e46ad1f1 | s390x | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/e4141ce40b0cb52c8b23aefad7234bcc6d74632b | x86_64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/3b2204468e0a86a0baa1093d6bb7bd7a524e00e3 | or1k | pipewire-0.3.65 | NOK | http://autobuild.buildroot.net/results/3a5cb6061ed8dbd7e6428d38b636694be74e6b89 | xtensa | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/d89970ddae85009fa8934a3989c477785a69c77e | sparc64 | poke-2.4 | NOK | http://autobuild.buildroot.net/results/ae121a0ea1097216e441d4b917f71087c848d18d | ORPH aarch64 | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/1d9cb59eccca6a8b8ba09ffa3fab86880498fce5 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/13a3174e6723f87fbf9269bc2e7ffa2caf9384a8 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/d0ba87452b90e92dfd8776c60602d36af60ed085 | ORPH powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/85208e4a093f4c1ea3d1d4c96d2495d676e21493 | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/d9b7474cdd2fa4b67b4ccd33b2a68cd4995fad58 | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/2f975cd110b35105aeb9d621589bc7e9a5d885ab | i686 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/8c9b98535c97d28e1e6ce962967b19276da052e1 | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/d2b4e4bd717da16772374d7a5ddc2c896a38dd48 | nios2 | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/a130cbfc1d24848b04864b96ee08fee5fdd37f6f | microblaze | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/10465a11109e1591124679d5c0c5e7dc00cb7c24 | mipsel | sconeserver-8d1935919a20133... | NOK | http://autobuild.buildroot.net/results/dc5af9e47d189be88f2a5c376de8f3ae9fa1bade | sh4a | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/3a3c73c4335916b3103e5262e5de7e1c365ca0eb | ORPH sh4a | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/0bc90b06c29c364679add1734f975e2f3da0809e | ORPH sparc | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/6f7ee2e7ae745e44386d2b9a4c521bacfee66f8d | ORPH aarch64_be | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/2001a2c64550038320432233997342f1848604a1 | mipsel | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/3dd5e2fd3b8420daae02f7b795e9e534e5724dc3 | nios2 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/0f4f31a25468a3f17744341596e23d5cf220d6da | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/861b6f991b69b56cadf9ff8d910c63ee7b1fa217 | microblazeel | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/83a95cb858aa09ea5767f7fb1976f17b40332a2d | arm | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/a1d0563d919b31e4921f007307ce691242fd02da | powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/f00af3a511276621dfe2a64d148bbb32ae08e9b7 | powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/d5bc4f156cb799c7592c1d7c0fc32657a5bd822f | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/80b2f27ed1057a95525508a4ec20a494f1521e19 | mips64el | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/277c81b38c3e5ae04b90c0909aa4400eb1beee1f | mipsel | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/37e91e4ba23f59b706dc184eb53dc25b8debb3e2 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/e9dc76874a7ef703c3ae66e990a84340423fc9f3 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/ae46e7308432916e546882a2901b1f84db78cb44 | arceb | unknown | NOK | http://autobuild.buildroot.net/results/17e679507b6ac7f9d1d97a93d344af02d28378ee | or1k | unknown | NOK | http://autobuild.buildroot.net/results/a3413b882648c26b538150f6797b4366fbebe90a | sparc | unknown | NOK | http://autobuild.buildroot.net/results/b96f40a869b341d7fc1f3b5d6124dba3bd00716d | sh4a | unknown | NOK | http://autobuild.buildroot.net/results/f895d9b3cc0a5e378814196058d47d7a539fc0a4 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/c7ff3183acb358b3e5b663d28096705adb5ac7ce | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/11d6f9b81b65c53e9fe43d365b027972bc936b5a | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/0a4603c55b7e3fcece9dcd9dd745c18b22db2661 | arc | unknown | NOK | http://autobuild.buildroot.net/results/7a2a33c24b37ab61699a757de7dbddd90b4c722f | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/fa42f8d015fa32fe2787660c1a85a1f8a9080287 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/8103d6adc0bfb94a0e40e77cd06ade561ab3d4aa | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/4186e473f0310b249a8173a0f29de05655120ba8 | i686 | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/f29e4f8f25917719b3be17728b4585a3eda0fc90 | ORPH sh4aeb | vlc-3.0.18 | NOK | http://autobuild.buildroot.net/results/da86f6c7639bc332d3861cfa64f8f66b7bdaa6ad | mips64 | weston-10.0.1 | NOK | http://autobuild.buildroot.net/results/534fb5a5f7ab682a29ec4859a9b242207c3c0fbf | x86_64 | wtfutil-0.41.0 | NOK | http://autobuild.buildroot.net/results/9c98acb4e82d55c710abc7a4e0fbfef34a92eef3 | microblazeel | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/eb5102391a42a13903917dcda4edea34013f3968 | microblazeel | xtables-addons-3.22 | NOK | http://autobuild.buildroot.net/results/a6000955ea768274ed55f04bb8bd1fc16a31d93c | ORPH aarch64_be | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/cd904c5a3a3b6b495afc4267c35beb8f96e161a8 | nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/333db4849cc8e8699882662c1839085f5494e40e | mips | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/be14819d94a3e3ac56a5d96201f14be00480b9c7 | mips64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/d897b594573185cd276ed379a29260a56f3582b6 | s390x | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/bae7cfce360723a6329300a2e5e5ad29b858a843 | armeb | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/250bd3f6242e17fe23a4ebb42113ec0bef3688c2 | sparc64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/0fcad1fa660c1523f667864528a1b216f7a6c8db | sparc | zxing-cpp-1.4.0 | NOK | http://autobuild.buildroot.net/results/c44c5c2ad65ffc12353addccda45666f0528d34d | mips64el | zxing-cpp-1.4.0 | NOK | http://autobuild.buildroot.net/results/4f97f1b291a99218f4706fce8b2934bd845755e1 | Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4 | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/e67b97a057f292f1a9d27ef8b7e0fd94441cddc9 | Classification of failures by reason for 2022.11.x -------------------------------------------------- host-pahole-1.24 | 3 alsa-lib-1.2.8 | 1 audit-3.0.7 | 1 dc3dd-7.2.641 | 1 elfutils-0.186 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 janus-gateway-1.0.3 | 1 libuhttpd-3.14.1 | 1 linux-6.0.19 | 1 lirc-tools-0.10.2 | 1 netsurf-3.10 | 1 perl-5.34.1 | 1 uclibc-1.0.42 | 1 x264-baee400fa9ced6f5481a72... | 1 xfsprogs-5.14.2 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | alsa-lib-1.2.8 | NOK | http://autobuild.buildroot.net/results/d09e30ae2412ff07b9462625f986eccfb58036b4 | arm | audit-3.0.7 | NOK | http://autobuild.buildroot.net/results/cc90d10cfbb3eddfea8ac930c14fc6d37c0b2ed3 | or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/23009dd4f194c68b99406560f04371be82f24b63 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/4a0f54d3e02d1f50de59a81d310e3838d267f200 | ORPH aarch64 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/11a5bdad7a59f2aacdc844bb4741bf51072d2f08 | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/15ac6b8ea13682dda77bf2703a4a0bdd1704216f | microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/73b89f70eb0b0789dc739fcfa981d082a2ec1c6f | ORPH sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/447f5706450839fd131a5a0a12955765fca65759 | i686 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/33938700935023015fdfb558df7fc2b1613e6170 | i586 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/550bede827f4d28e1be4af28485ab369d8debd44 | s390x | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/c2b4472b17b4e6fd7970a0093ff96a879644a0b4 | mips64 | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/0c2ca7fd1e5c57713542a1b47cd7a1aa5781a955 | mipsel | linux-6.0.19 | NOK | http://autobuild.buildroot.net/results/75d3c80dafad817bc5aa1633cc14f95e206be25d | ORPH mips | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/410f7676636b0adb1aeb70b6345022df6725316a | ORPH mips | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/5da2eada7d93eeea338c0976af1e785ac0714990 | nios2 | perl-5.34.1 | NOK | http://autobuild.buildroot.net/results/dcdc6b1258740f06d327289c79ab9083db641b26 | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/58e814e6c4e179af49fad5253a6ca12796f0648a | i686 | x264-baee400fa9ced6f5481a72... | NOK | http://autobuild.buildroot.net/results/54c31ac1b0d3ca3dd81b873f54ebd6d827e0c6ce | nios2 | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/acd89a2b1d00f647465b95f51c78ecc15edd6144 | ORPH Gitlab CI results for 2023-02-12 ================================ Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.6 | 7.0.11 | acpica | DISTRO | https://release-monitoring.org/project/00018 | 20220331 | 20222010 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 43 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.5.4 | 4.6.0 | alfred | DISTRO | https://release-monitoring.org/project/241870 | 2022.1 | 2023.0 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 13.0.0_r31 | angularjs | DISTRO | https://release-monitoring.org/project/21321 | 1.8.2 | 1.8.3 | apitrace | DISTRO | https://release-monitoring.org/project/06170 | 10.0 | 11.1 | apr | DISTRO | https://release-monitoring.org/project/00095 | 1.7.0 | 1.7.2 | apr-util | DISTRO | https://release-monitoring.org/project/00096 | 1.6.1 | 1.6.3 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 11.4.4 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.29.1 | 20.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.46.0 | atkmm | DISTRO | https://release-monitoring.org/project/07962 | 2.36.1 | 2.36.2 | atop | DISTRO | https://release-monitoring.org/project/00135 | 2.8.0 | 2.8.1 | audit | DISTRO | https://release-monitoring.org/project/15225 | 3.0.7 | 3.1 | avocado | DISTRO | https://release-monitoring.org/project/13385 | 98.0 | 100.1 | avrdude | DISTRO | https://release-monitoring.org/project/10751 | 6.4 | 7.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_07_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.12.2 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 20.10.26 | 20.10.27 | bat | DISTRO | https://release-monitoring.org/project/241901 | 0.19.0 | 0.22.1 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2023.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2022.3 | 2023.0 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.2.16 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.2.16 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.2.16 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.5 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.38 | 2.40 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.11 | 2.0.12 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 24.0.1 | bluez5_utils | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bluez5_utils-headers | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH boost | DISTRO | https://release-monitoring.org/project/06845 | 1.80.0 | 1.81.0 | bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.2.3 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.16.2 | 6.1.3 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.21 | 3.25 | cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.8 | cairomm | DISTRO | https://release-monitoring.org/project/07959 | 1.16.1 | 1.16.2 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.7.4 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.5.0 | 1.5.2 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 3.9.1 | 4.2.1 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.15 | 7.0 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.18.0 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.7 | 1.0.0 | clang | DISTRO | https://release-monitoring.org/project/11811 | 11.1.0 | 15.0.7 | cli11 | DISTRO | https://release-monitoring.org/project/20578 | 2.3.1 | 2.3.2 | clinfo | DISTRO | https://release-monitoring.org/project/10503 | 3.0.21.02.21 | 3.0.23.01.25 | cloop | DISTRO | https://release-monitoring.org/project/21332 | 3.14.1.3 | 3.14.1.3+... | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.22.3 | 3.25.2 | collectl | DISTRO | https://release-monitoring.org/project/00330 | 4.3.2 | 4.3.8 | compiler-rt | GUESS | https://release-monitoring.org/project/17705 | 11.1.0 | 900 | containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.6.16 | 1.6.17 | crucible | DISTRO | https://release-monitoring.org/project/267616 | 2022.05.25 | 2022.12.06 | crudini | DISTRO | https://release-monitoring.org/project/21669 | 0.9.3 | 0.9.4 | crun | DISTRO | https://release-monitoring.org/project/96792 | 1.7.2 | 1.8 | cryptopp | DISTRO | https://release-monitoring.org/project/14487 | 8.6.0 | 8.7.0 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.16 | 1.28.17 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.7.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | dado | DISTRO | https://release-monitoring.org/project/58442 | 1.8.3-1 | 2.1.0-1 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.9 | 3.0.10 | dash | DISTRO | https://release-monitoring.org/project/00394 | 0.5.11.5 | 0.5.12 | ORPH datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.13.2 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.3.4 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.2.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.4.0 | dbus | DISTRO | https://release-monitoring.org/project/05356 | 1.12.24 | 1.14.6 | ORPH dbus-broker | DISTRO | https://release-monitoring.org/project/271475 | 32 | 33 | dbus-python | DISTRO | https://release-monitoring.org/project/00402 | 1.2.18 | 1.3.2 | ORPH dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH ddrescue | DISTRO | https://release-monitoring.org/project/00410 | 1.26 | 1.27 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.20.0 | 1.20.1 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20220117 | 1.3-20230209 | ORPH diffutils | DISTRO | https://release-monitoring.org/project/00436 | 3.8 | 3.9 | ORPH dnsmasq | DISTRO | https://release-monitoring.org/project/00444 | 2.88 | 2.89 | docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 23.0.0 | 23.0.1 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 2.15.1 | 2.16.0 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 23.0.0 | 23.0.1 | dos2unix | DISTRO | https://release-monitoring.org/project/00453 | 7.4.3 | 7.4.4 | dracut | DISTRO | https://release-monitoring.org/project/10627 | 057 | 059 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.21.4 | 9.23.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH dust | DISTRO | https://release-monitoring.org/project/141344 | 0.8.1 | 0.8.4 | ORPH e2fsprogs | DISTRO | https://release-monitoring.org/project/00646 | 1.46.5 | 1.47.0 | ORPH easy-rsa | DISTRO | https://release-monitoring.org/project/17770 | 3.1.1 | 3.1.2 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.18 | 1.19 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202211 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.1 | 1.26.3 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 21.12 | 23.01 | elfutils | DISTRO | https://release-monitoring.org/project/05679 | 0.186 | 0.188 | ORPH empty | DISTRO | https://release-monitoring.org/project/20564 | 0.6.22b | 0.6.23c | ORPH enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.1 | 0.25.4 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 25.2.2 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.21 | 1.0.22 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.11.1 | 1.11.5 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.9.1 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.16 | 1.0.22 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.29 | 1.0.30 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.14 | 1.0.15 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.10 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.8 | 1.0.9 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.47 | 1.0.49 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.27 | 1.0.29 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.47 | 1.2.7 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.13 | 1.1.16 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.23 | 1.0.25 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.5.6 | 1.6.1 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.32 | 1.0.36 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.12 | 1.0.15 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.10 | 1.0.12 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.9.0.1 | 2.9.1.0 | exiv2 | DISTRO | https://release-monitoring.org/project/00769 | 0.27.5 | 0.27.6 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.30.1 | 1.31 | ORPH feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.9.1 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.35 | 6.4.36 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.3 | 5.1.2 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH file | DISTRO | https://release-monitoring.org/project/00807 | 5.43 | 5.44 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.33 | flashrom | DISTRO | https://release-monitoring.org/project/10202 | 1.2.1 | 1.3.0 | flatbuffers | DISTRO | https://release-monitoring.org/project/16642 | 2.0.8 | 23.1.21 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.4 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fluent-bit | DISTRO | https://release-monitoring.org/project/267335 | 2.0.8 | 2.0.9 | fmc | GUESS | https://release-monitoring.org/project/145761 | LSDK-21.08 | 0.2.0 | font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 6.3.0 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.14.2 | ORPH freeradius-server | DISTRO | https://release-monitoring.org/project/00853 | 3.2.0 | 3.2.1 | freetype | DISTRO | https://release-monitoring.org/project/00854 | 2.12.1 | 2.13.0 | fscryptctl | DISTRO | https://release-monitoring.org/project/270981 | 1.0.0 | 1.1.0 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 22.09.00 | 23.01.00 | gawk | DISTRO | https://release-monitoring.org/project/00868 | 5.2.0 | 5.2.1 | ORPH gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 4.0.0 | ORPH gdal | DISTRO | https://release-monitoring.org/project/00881 | 3.5.2 | 3.6.2 | gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.5.5 | 2.6.2 | gerbera | DISTRO | https://release-monitoring.org/project/18420 | 1.10.0 | 1.12.1 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.56.1 | 10.0.0 | gitlab-runner | DISTRO | https://release-monitoring.org/project/11337 | 15.5.0 | 15.8.2 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.1 | 2.74.0 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.74.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnuplot | DISTRO | https://release-monitoring.org/project/01216 | 5.4.5 | 5.4.6 | gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.10.4.0 | 3.10.5.1 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.8 | 3.8.0 | go | DISTRO | https://release-monitoring.org/project/01227 | 1.19.5 | 1.20 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.72.0 | 1.74.0 | ORPH gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.9 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 7.1.0 | ORPH grantlee | DISTRO | https://release-monitoring.org/project/21448 | 5.2.0 | 5.3.1 | graphicsmagick | DISTRO | https://release-monitoring.org/project/01248 | 1.3.38 | 1.3.40 | grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.51.1 | 1.52.0 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 43.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gssdp | DISTRO | https://release-monitoring.org/project/01262 | 1.4.0.1 | 1.6.2 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.1.0 | gst1-shark | DISTRO | https://release-monitoring.org/project/21854 | v0.7.5 | 0.8.1 | gtest | DISTRO | https://release-monitoring.org/project/18290 | 1.12.1 | 1.13.0 | gtkmm3 | DISTRO | https://release-monitoring.org/project/311572 | 3.22.0 | 3.24.7 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.6.2 | guile | DISTRO | https://release-monitoring.org/project/01277 | 3.0.8 | 3.0.9 | gupnp | DISTRO | https://release-monitoring.org/project/01281 | 1.4.3 | 1.6.3 | gupnp-av | DISTRO | https://release-monitoring.org/project/01282 | 0.14.0 | 0.14.1 | gupnp-tools | DISTRO | https://release-monitoring.org/project/01284 | 0.10.3 | 0.12.0 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.50.3 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2022.09.1 | 2023.01.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.6.5 | 2.7.2 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 5.3.1 | 7.0.0 | heimdal | DISTRO | https://release-monitoring.org/project/01307 | 7.7.1 | 7.8.0 | ORPH hiawatha | DISTRO | https://release-monitoring.org/project/13375 | 11.2 | 11.3 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.13.1 | ORPH hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.22.10 | ORPH htop | DISTRO | https://release-monitoring.org/project/01332 | 3.2.1 | 3.2.2 | ORPH htpdate | DISTRO | https://release-monitoring.org/project/132187 | 1.3.6 | 1.3.7 | hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.365 | 0.367 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.8.0 | 2.9.0 | hyperfine | DISTRO | https://release-monitoring.org/project/18526 | 1.14.0 | 1.15.0 | ORPH i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.43.0 | 2.45.1 | ibm-sw-tpm2 | DISTRO | https://release-monitoring.org/project/18952 | 1661 | 1682 | icu | DISTRO | https://release-monitoring.org/project/16134 | 70-1 | 72-1 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.41 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-51 | 7.1.0-61 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.10.0 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.6.0 | ORPH intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 23.1.0 | 23.1.1 | intel-mediasdk | DISTRO | https://release-monitoring.org/project/21814 | 23.1.0 | 23.1.1 | iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.493 | 3.494 | ipset | DISTRO | https://release-monitoring.org/project/01393 | 7.16 | 7.17 | irqbalance | DISTRO | https://release-monitoring.org/project/01402 | 1.9.0 | 1.9.2 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | irssi | DISTRO | https://release-monitoring.org/project/01404 | 1.4.2 | 1.4.3 | jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.21 | 1.9.22 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 1.1.1 | 1.1.2 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 4.0.0 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.6 | 1.9 | jpeg-turbo | DISTRO | https://release-monitoring.org/project/01648 | 2.1.4 | 2.1.5.1 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.13.1 | 1.13.2 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.2 | jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.10.0 | 3.10.1 | kexec | DISTRO | https://release-monitoring.org/project/12689 | 2.0.25 | 2.0.26 | ORPH kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kodi | DISTRO | https://release-monitoring.org/project/20547 | 19.5-Matrix | 20.0-Nexus | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.7-Ma... | 20.3.3-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.3-Ma... | 20.5.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-jsonschemabuilder | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.4-Ma... | 20.1.5-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.5-Ma... | 20.1.3-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.1-Ma... | 20.5.0-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.6-Ma... | 20.6.0-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.2.2-Ma... | 21.1.0-Omega | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.11-M... | 20.3.1-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.6-Ma... | 20.4.0-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.3.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.4.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.3.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.4-Ma... | 20.3.1-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 21.1.0-Omega | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.5-Ma... | 20.4.0-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.1-Ma... | 21.1.0-Omega | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.3.1-Ma... | 20.6.1-Nexus | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.16-M... | 20.3.4-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-texturepacker | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.2.0-Ma... | 20.3.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.2-Ma... | 20.1.1-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.3-Ma... | 20.2.1-Nexus | ksmbd-tools | DISTRO | https://release-monitoring.org/project/241856 | 3.4.6 | 3.4.7 | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 2.1.0 | 2.2.0 | lapack | DISTRO | https://release-monitoring.org/project/01534 | 3.10.1 | 3.11.0 | leafpad | DISTRO | https://release-monitoring.org/project/01544 | 0.8.18.1 | 0.8.19 | ORPH lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.3 | 0.3.95 | leptonica | DISTRO | https://release-monitoring.org/project/01549 | 1.82.0 | 1.83.0 | less | DISTRO | https://release-monitoring.org/project/01550 | 590 | 608 | ORPH libabseil-cpp | DISTRO | https://release-monitoring.org/project/115295 | 20220623.1 | 20230125.0 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.26 | 2.28-1 | ORPH libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.7 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.65 | 2.67 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 3.0.0 | libdeflate | DISTRO | https://release-monitoring.org/project/242778 | 1.15 | 1.17 | libdnet | DISTRO | https://release-monitoring.org/project/06308 | 1.16.1 | 1.16.3 | ORPH libebml | DISTRO | https://release-monitoring.org/project/07879 | 1.4.2 | 1.4.4 | libedit | DISTRO | https://release-monitoring.org/project/01599 | 20210910-3.1 | 20221030-3.1 | libevdev | DISTRO | https://release-monitoring.org/project/20540 | 1.12.1 | 1.13.0 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.13.1 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.40.0 | ORPH libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.72.3 | 2.74.5 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.4.0 | 1.6.0 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.17.1 | 1.18.0 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.30 | ORPH libgpiod | DISTRO | https://release-monitoring.org/project/20640 | 1.6.3 | 1.6.4 | ORPH libgsasl | DISTRO | https://release-monitoring.org/project/01563 | 1.10.0 | 2.2.0 | ORPH libgsm | DISTRO | https://release-monitoring.org/project/12587 | 1.0.19 | 1.0.22 | libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.8.3 | libhtp | DISTRO | https://release-monitoring.org/project/01632 | 0.5.40 | 0.5.42 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.40 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.16 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.17 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.2 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.20.1 | 1.22.1 | libmatroska | DISTRO | https://release-monitoring.org/project/01657 | 1.6.3 | 1.7.1 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.13 | 0.12.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.8 | 3.1.10 | libmodplug | DISTRO | https://release-monitoring.org/project/05669 | d1b97ed | 0.8.9.0 | ORPH libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.10 | libnetconf2 | DISTRO | https://release-monitoring.org/project/31639 | 2.1.25 | 2.1.28 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.2 | ORPH libnftnl | DISTRO | https://release-monitoring.org/project/01681 | 1.2.3 | 1.2.4 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.2.2 | 5.0.0 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.14 | libpam-tacplus | DISTRO | https://release-monitoring.org/project/20537 | 1.6.1 | 1.7.0 | ORPH libpcap | DISTRO | https://release-monitoring.org/project/01702 | 1.10.2 | 1.10.3 | libpeas | DISTRO | https://release-monitoring.org/project/06871 | 1.32.0 | 1.34.0 | ORPH libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.7.4 | libqrtr-glib | DISTRO | https://release-monitoring.org/project/192056 | 1.0.0 | 1.2.2 | librelp | DISTRO | https://release-monitoring.org/project/01713 | 1.10.0 | 1.11.0 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.54.5 | librtas | DISTRO | https://release-monitoring.org/project/10717 | 2.0.3 | 2.0.4 | ORPH libselinux | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsolv | DISTRO | https://release-monitoring.org/project/07908 | 0.7.22 | 0.7.23 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.2 | 3.2.2 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.2 | 2.5.0 | libtalloc | DISTRO | https://release-monitoring.org/project/01733 | 2.3.4 | 2.4.0 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH libtool | DISTRO | https://release-monitoring.org/project/01741 | 2.4.6 | 2.4.7 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.8 | libucl | DISTRO | https://release-monitoring.org/project/21371 | 0.8.1 | 0.8.2 | libupnp | DISTRO | https://release-monitoring.org/project/21315 | 1.14.13 | 1.14.15 | libupnpp | DISTRO | https://release-monitoring.org/project/15849 | 0.21.0 | 0.22.4 | ORPH liburing | DISTRO | https://release-monitoring.org/project/230185 | 2.2 | 2.3 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.14.1 | libvirt | DISTRO | https://release-monitoring.org/project/13830 | 7.10.0 | 9.0.0 | libvpx | DISTRO | https://release-monitoring.org/project/11083 | 1.12.0 | 1.13.0 | libwpe | DISTRO | https://release-monitoring.org/project/17789 | 1.14.0 | 1.14.1 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.29 | 4.4.33 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.4.0 | 1.5.0 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.54.06 | libyang | DISTRO | https://release-monitoring.org/project/18554 | 2.1.4 | 2.1.30 | lighttpd | DISTRO | https://release-monitoring.org/project/01817 | 1.4.67 | 1.4.69 | lilv | DISTRO | https://release-monitoring.org/project/01818 | 0.24.12 | 0.24.20 | links | DISTRO | https://release-monitoring.org/project/01822 | 2.26 | 2.28 | ORPH linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.10 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20221214 | 20230210 | liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.4.0 | 1.5.0 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2023.01.19 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.15 | 1.0.16 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.13.0 | 1.0.0 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.20.1 | 3.21.0 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | lsof | DISTRO | https://release-monitoring.org/project/01844 | 4.96.5 | 4.98.0 | ORPH ltp-testsuite | DISTRO | https://release-monitoring.org/project/21502 | 20220930 | 20230127 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.6 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.11 | lttng-libust | DISTRO | https://release-monitoring.org/project/07135 | 2.13.1 | 2.13.5 | lttng-modules | DISTRO | https://release-monitoring.org/project/07141 | 2.13.7 | 2.13.8 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.8 | 2.13.9 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luarocks | DISTRO | https://release-monitoring.org/project/01856 | 3.9.1 | 3.9.2 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.43.0-0 | 1.44.2-1 | ORPH luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.13.0 | 2.14.0 | ORPH lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.18 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzma-alone | DISTRO | https://release-monitoring.org/project/242840 | 9.22 | 2201 | ORPH lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.4 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.36 | 10.11.1 | ORPH mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.2 | 3.3.0 | mc | DISTRO | https://release-monitoring.org/project/01954 | 4.8.28 | 4.8.29 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.6.0 | 0.1.6.1 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.2.16 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.17 | 1.6.18 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 6.10 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 22.3.4 | 22.3.5 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 22.3.4 | 22.3.5 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.46.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | minizip | DISTRO | https://release-monitoring.org/project/301509 | 3.0.7 | 3.0.8 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.20.4 | 1.21.2 | modsecurity2 | DISTRO | https://release-monitoring.org/project/68638 | 2.9.7 | 3.0.8 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 6.2.0 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.8 | 7.9 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.33.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.182 | 6.12.0.190 | mp4v2 | DISTRO | https://release-monitoring.org/project/98413 | 2.1.1 | 2.1.2 | ORPH mpc | DISTRO | https://release-monitoring.org/project/01667 | 1.2.1 | 1.3.1 | ORPH mpd | DISTRO | https://release-monitoring.org/project/14864 | 0.23.11 | 0.23.12 | mpfr | DISTRO | https://release-monitoring.org/project/02019 | 4.1.1 | 4.2.0 | ORPH mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.31.2 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.35.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 5.0.0 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.22 | 1.8.23 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.38 | 4.0.42 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.18 | 2.2.2 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.3-20221224 | 6.4-20230211 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.32.4 | 0.32.5 | ORPH netatalk | DISTRO | https://release-monitoring.org/project/02063 | 3.1.13 | 3.1.14 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | 1.218 | 1.219 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.33.1 | 1.38.0 | netopeer2 | DISTRO | https://release-monitoring.org/project/114978 | 2.1.42 | 2.1.49 | network-manager | DISTRO | https://release-monitoring.org/project/21197 | 1.40.10 | 1.42.0 | ORPH networkd-dispatcher | DISTRO | https://release-monitoring.org/project/242008 | 2.2.3 | 2.2.4 | newt | DISTRO | https://release-monitoring.org/project/15129 | 0.52.21 | 0.52.23 | ORPH nftables | DISTRO | https://release-monitoring.org/project/02082 | 1.0.5 | 1.0.6 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.51.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.22.1 | 1.23.3 | ninja | DISTRO | https://release-monitoring.org/project/02089 | 1.11.1.g9... | 1.11.1 | nmap | DISTRO | https://release-monitoring.org/project/02096 | 7.92 | 7.93 | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 16.18.1 | 19.6.0 | noip | DISTRO | https://release-monitoring.org/project/21539 | 2.1.9 | 3.0.0 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.151 | 390.157 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 525.89.02 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 2.3 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.34 | 2.0 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.6.2 | openal | DISTRO | https://release-monitoring.org/project/08172 | 1.22.0 | 1.23.0 | ORPH opencl-clhpp | DISTRO | https://release-monitoring.org/project/271141 | 2.0.16 | 2023.02.06 | opencore-amr | DISTRO | https://release-monitoring.org/project/21548 | 0.1.5 | 0.1.6 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.19 | 4.7.0 | opencv4 | DISTRO | https://release-monitoring.org/project/06615 | 4.6.0 | 4.7.0 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.10.0 | openipmi | DISTRO | https://release-monitoring.org/project/02549 | 2.0.32 | 2.0.33 | ORPH openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.14.1+1 | 21+9 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.4 | ORPH openocd | DISTRO | https://release-monitoring.org/project/02557 | 0.11.0 | 0.12.0 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.46 | opensc | DISTRO | https://release-monitoring.org/project/02559 | 0.22.0 | 0.23.0 | openssh | DISTRO | https://release-monitoring.org/project/02565 | 9.1p1 | 9.2p1 | ORPH openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 11.3.5-18... | 12.1.5 | openvpn | DISTRO | https://release-monitoring.org/project/02567 | 2.5.7 | 2.6.0 | ORPH opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.6.1 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.19.0 | 3.20.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.19.0 | 3.20.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.19.0 | 3.20.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.19.0 | 3.20.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.32 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.2.16 | ORPH paho-mqtt-c | DISTRO | https://release-monitoring.org/project/21375 | 1.3.11 | 1.3.12 | pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.1 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.13 | 0.17.2 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.7 | ORPH pciutils | DISTRO | https://release-monitoring.org/project/02605 | 3.8.0 | 3.9.0 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202212 | ORPH pdbg | DISTRO | https://release-monitoring.org/project/21378 | 3.5 | 3.6 | perl-class-method-modifiers | DISTRO | https://release-monitoring.org/project/06735 | 2.13 | 2.14 | perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.89 | 6.90 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-file-sharedir-install | DISTRO | https://release-monitoring.org/project/11851 | 0.13 | 0.14 | perl-gdgraph | DISTRO | https://release-monitoring.org/project/09187 | 1.54 | 1.56 | perl-html-parser | DISTRO | https://release-monitoring.org/project/02967 | 3.80 | 3.81 | perl-image-exiftool | DISTRO | https://release-monitoring.org/project/06175 | 12.50 | 12.56 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.080 | 2.081 | perl-json-maybexs | DISTRO | https://release-monitoring.org/project/11953 | 1.004003 | 1.004004 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20220520 | 1.20230212 | perl-mime-tools | DISTRO | https://release-monitoring.org/project/11809 | 5.509 | 5.510 | perl-mojolicious-plugin-aut... | DISTRO | https://release-monitoring.org/project/21729 | 1.37 | 1.39 | perl-moo | DISTRO | https://release-monitoring.org/project/03123 | 2.005004 | 2.005005 | perl-net-ssh2 | DISTRO | https://release-monitoring.org/project/03163 | 0.72 | 0.73 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.93_01 | 1.92 | perl-package-stash | DISTRO | https://release-monitoring.org/project/11885 | 0.39 | 0.40 | perl-plack | DISTRO | https://release-monitoring.org/project/06578 | 1.0048 | 1.0050 | perl-sub-install | DISTRO | https://release-monitoring.org/project/03345 | 0.928 | 0.929 | perl-sub-quote | DISTRO | https://release-monitoring.org/project/12678 | 2.006006 | 2.006008 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-type-tiny | DISTRO | https://release-monitoring.org/project/14406 | 1.012004 | 2.002001 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0208 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.22 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-memcached | DISTRO | https://release-monitoring.org/project/17400 | 3.1.5 | 3.2.0 | ORPH php-pam | DISTRO | https://release-monitoring.org/project/241707 | 2.2.3 | 2.2.4 | php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.2.0 | pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.9.4 | ORPH pngquant | DISTRO | https://release-monitoring.org/project/03674 | 2.17.0 | 3.0.1 | poco | DISTRO | https://release-monitoring.org/project/05418 | 1.12.2 | 1.12.4 | poke | DISTRO | https://release-monitoring.org/project/179926 | 2.4 | 3.0 | ORPH policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 22.10.0 | 23.02.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.10 | 1.3.11 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.15 | privoxy | DISTRO | https://release-monitoring.org/project/03712 | 3.0.33 | 3.0.34 | ORPH procps-ng | DISTRO | https://release-monitoring.org/project/03708 | 3.3.17 | 4.0.2 | ORPH proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 9.1.1 | prosody | DISTRO | https://release-monitoring.org/project/03709 | 0.11.14 | 0.12.2 | pru-software-support | DISTRO | https://release-monitoring.org/project/21825 | 6.0.1 | 6.1.0 | psmisc | DISTRO | https://release-monitoring.org/project/03721 | 23.5 | 23.6 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH putty | DISTRO | https://release-monitoring.org/project/05749 | 0.76 | 0.78 | python-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.5.1 | 0.6.0 | python-aiofiles | DISTRO | https://release-monitoring.org/project/12743 | 22.1.0 | 23.1.0 | python-aiohttp | DISTRO | https://release-monitoring.org/project/06713 | 3.8.3 | 3.8.4 | python-aiohttp-jinja2 | DISTRO | https://release-monitoring.org/project/21247 | 1.5 | 1.5.1 | python-alembic | DISTRO | https://release-monitoring.org/project/03766 | 1.9.1 | 1.9.3 | python-argh | DISTRO | https://release-monitoring.org/project/09299 | 0.26.2 | 0.27.2 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 22.12.1 | 23.1.2 | python-beautifulsoup4 | DISTRO | https://release-monitoring.org/project/03779 | 4.11.1 | 4.11.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.26.45 | 1.26.69 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.29.45 | 1.29.69 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.6.1 | python-cryptography | DISTRO | https://release-monitoring.org/project/05532 | 39.0.0 | 39.0.1 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 4.1.5 | 4.1.6 | python-dnspython | DISTRO | https://release-monitoring.org/project/13190 | 2.2.1 | 2.3.0 | python-dtschema | DISTRO | https://release-monitoring.org/project/100908 | 2022.12 | 2023.1 | python-esptool | DISTRO | https://release-monitoring.org/project/11619 | 4.4 | 4.5 | python-flask-babel | DISTRO | https://release-monitoring.org/project/20024 | 2.0.0 | 3.0.1 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 3.0.2 | 3.0.3 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 1.0.1 | 1.1.1 | python-flatbuffers | DISTRO | https://release-monitoring.org/project/85010 | 2.0.7 | 23.1.21 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.30 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.10 | python-hatchling | DISTRO | https://release-monitoring.org/project/185085 | 1.12.2 | 1.13.0 | python-hiredis | DISTRO | https://release-monitoring.org/project/12002 | 2.0.0 | 2.2.1 | python-iptables | DISTRO | https://release-monitoring.org/project/11475 | 1.0.0 | 1.0.1 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 8.8.0 | 8.10.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.6 | 2.4.8 | python-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.1.1 | 2.1.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.6.3 | python-maturin | DISTRO | https://release-monitoring.org/project/42653 | 0.14.9 | 0.14.13 | python-mbstrdecoder | DISTRO | https://release-monitoring.org/project/21702 | 1.1.1 | 1.1.2 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 2.0.4 | 2.0.5 | python-mypy-extensions | DISTRO | https://release-monitoring.org/project/23367 | 0.4.3 | 1.0.0 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.23.5 | 1.24.2 | python-orjson | DISTRO | https://release-monitoring.org/project/31737 | 3.8.4 | 3.8.6 | python-packaging | DISTRO | https://release-monitoring.org/project/11718 | 22.0 | 23.0 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.12.0 | 3.0.0 | python-pathspec | DISTRO | https://release-monitoring.org/project/15607 | 0.10.3 | 0.11.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.11.0 | 5.11.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 22.3.1 | 23.0 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.16.0 | 3.17 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.2 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 3.0.2 | 3.1.3 | python-pypa-build | DISTRO | https://release-monitoring.org/project/132276 | 0.9.0 | 0.10.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.15.6 | 5.15.9 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.7.3 | 0.7.5 | python-pysmb | DISTRO | https://release-monitoring.org/project/21589 | 1.2.9 | 1.2.9.1 | python-pytest | DISTRO | https://release-monitoring.org/project/03765 | 7.2.0 | 7.2.1 | python-pythran | DISTRO | https://release-monitoring.org/project/21140 | 0.12.0 | 0.12.1 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2022.7 | 2022.7.1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 24.0.1 | 25.0.0b1 | python-qrcode | DISTRO | https://release-monitoring.org/project/20011 | 7.3.1 | 7.4.2 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 4.4.0 | 4.5.1 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.28.1 | 2.28.2 | python-rtoml | DISTRO | https://release-monitoring.org/project/62048 | 0.8.0 | 0.9.0 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-scipy | DISTRO | https://release-monitoring.org/project/04768 | 1.8.1 | 1.10.0 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.12.1 | 1.15.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 65.6.3 | 67.2.0 | python-sh | DISTRO | https://release-monitoring.org/project/10429 | 1.14.3 | 2.0.1 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.18.1 | 3.18.3 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.19.25 | 6.7.7 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.4.42 | 2.0.3 | python-systemd | DISTRO | https://release-monitoring.org/project/07314 | 234 | 235 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 5.2.0 | 5.2.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.4 | 1.1.6 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.8.0 | 5.9.0 | python-txaio | DISTRO | https://release-monitoring.org/project/07202 | 22.2.1 | 23.1.1 | python-typeguard | DISTRO | https://release-monitoring.org/project/38819 | 2.13.3 | 3.0.0b2 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.13 | 1.26.14 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.2.5 | 0.2.6 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 57.2 | 58.0b1 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.23.0 | 2.23.1 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 1.4.2 | 1.5.1 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.32 | 0.33 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.6 | 3.0.8 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.39.4 | 0.47.1 | python-zlmdb | DISTRO | https://release-monitoring.org/project/66674 | 22.6.1 | 23.1.1 | python3 | DISTRO | https://release-monitoring.org/project/13254 | 3.11.1 | 3.11.2 | qcom-db410c-firmware | DISTRO | https://release-monitoring.org/project/235382 | 1034.2.1 | 1036.1 | qlibc | DISTRO | https://release-monitoring.org/project/21737 | 2.4.7 | 2.4.8 | ORPH qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 11.2.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.38.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.8 | 6.4.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.3 | 1.4 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-c | DISTRO | https://release-monitoring.org/project/13768 | 0.11.0 | 0.13.0 | ragel | DISTRO | https://release-monitoring.org/project/12105 | 6.10 | 7.0.4 | ORPH ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | raspberrypi-usbboot | DISTRO | https://release-monitoring.org/project/115700 | 2021.07.01 | 20221215-... | ORPH redis | DISTRO | https://release-monitoring.org/project/04181 | 7.0.7 | 7.0.8 | refpolicy | DISTRO | https://release-monitoring.org/project/21663 | 2.20220106 | 2.20221101 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.5 | 2.0.1 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 7.9.2 | rrdtool | DISTRO | https://release-monitoring.org/project/04214 | 1.7.2 | 1.8.0 | ORPH rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2204.1 | 8.2212.0 | rt-tests | DISTRO | https://release-monitoring.org/project/59450 | 2.4 | 2.5 | rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.1.0 | ruby | DISTRO | https://release-monitoring.org/project/04223 | 3.1.3 | 3.2.1 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.67.0 | 1.67.1 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.67.0 | 1.67.1 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.42.1 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.11.1.2 | 2.11.2.0 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.4 | 2.3.5.5 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.8.0 | 1.0.8.1 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.6.0.0 | 2.6.0.1 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.5.1.1 | 2.5.1.2 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.5.0 | 2.2.5.1 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.3.2 | 0.5.3.3 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.12 | 4.17.5 | sane-backends | DISTRO | https://release-monitoring.org/project/04760 | 1.1.1 | 1.2.1 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.4.0 | sdl2 | DISTRO | https://release-monitoring.org/project/04779 | 2.26.2 | 2.26.3 | sdl2_image | DISTRO | https://release-monitoring.org/project/04781 | 2.6.2 | 2.6.3 | sdl2_mixer | DISTRO | https://release-monitoring.org/project/04782 | 2.0.4 | 2.6.3 | ORPH sdl2_net | DISTRO | https://release-monitoring.org/project/04783 | 2.0.1 | 2.2.0 | ORPH sdl2_ttf | DISTRO | https://release-monitoring.org/project/04784 | 2.20.1 | 2.20.2 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdl_sound | DISTRO | https://release-monitoring.org/project/10262 | 1.0.3 | 2.0.1 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | selinux-python | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | semodule-utils | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | ORPH sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 2.8.0 | 2.12.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.5.4 | ser2net | DISTRO | https://release-monitoring.org/project/21655 | 4.3.8 | 4.3.11 | serd | DISTRO | https://release-monitoring.org/project/230531 | 0.30.14 | 0.30.16 | setools | DISTRO | https://release-monitoring.org/project/08951 | 4.4.0 | 4.4.1 | shairport-sync | DISTRO | https://release-monitoring.org/project/21384 | 3.3.9 | 4.1.1 | ORPH shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.2 | ORPH shim | DISTRO | https://release-monitoring.org/project/10719 | 15.4 | 15.7 | signal-estimator | DISTRO | https://release-monitoring.org/project/284559 | v0.0.4 | 0.0.5 | ORPH sispmctl | DISTRO | https://release-monitoring.org/project/21653 | 4.9 | 4.10 | skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.12.0.1 | 2.13.0.0 | snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.10 | 3.5.0 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.40.0 | 3.1.55.0 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.12 | 1.13.13 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sord | DISTRO | https://release-monitoring.org/project/230536 | 0.16.12 | 0.16.14 | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | spawn-fcgi | DISTRO | https://release-monitoring.org/project/05388 | 1.6.4 | 1.6.5 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice | DISTRO | https://release-monitoring.org/project/04871 | 0.15.0 | 0.15.1 | sqlcipher | DISTRO | https://release-monitoring.org/project/11213 | 4.5.1 | 4.5.3 | sshpass | DISTRO | https://release-monitoring.org/project/12961 | 1.09 | 1.10 | start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.20 | ORPH stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.5 | 1.0.7 | stress-ng | DISTRO | https://release-monitoring.org/project/12538 | 0.13.05 | 0.15.03 | strongswan | DISTRO | https://release-monitoring.org/project/04899 | 5.9.8 | 5.9.9 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.65 | 5.68 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.5 | ORPH suricata | DISTRO | https://release-monitoring.org/project/10925 | 6.0.6 | 6.0.10 | sway | DISTRO | https://release-monitoring.org/project/11497 | 1.7 | 1.8 | synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.29.3 | 0.30.2 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.38.1 | 4.0.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.46.0 | sysrepo | DISTRO | https://release-monitoring.org/project/34820 | 2.2.12 | 2.2.36 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.6.1 | 12.6.2 | ORPH system-config-printer | DISTRO | https://release-monitoring.org/project/08855 | 1.5.15 | 1.5.18 | ORPH systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.04 | ORPH tbb | DISTRO | https://release-monitoring.org/project/08217 | 2021.5.0 | 2021.7.0 | tcl | DISTRO | https://release-monitoring.org/project/04941 | 8.6.12 | 8.6.13 | ORPH tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | tcllib | DISTRO | https://release-monitoring.org/project/04943 | 1.20 | 1.21 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.4.2 | 4.4.3 | ORPH terminology | DISTRO | https://release-monitoring.org/project/04951 | 1.12.1 | 1.13.0 | tesseract-ocr | DISTRO | https://release-monitoring.org/project/04954 | 5.0.1 | 5.3.0 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.5.1 | 2.5.2 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.17.0 | ORPH tinifier | DISTRO | https://release-monitoring.org/project/241900 | 3.4.0 | 4.0.1 | tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20220801 | 20230101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tio | DISTRO | https://release-monitoring.org/project/20587 | 1.47 | 2.5 | tk | DISTRO | https://release-monitoring.org/project/11426 | 8.6.12 | 8.6.13 | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 3.0.0 | ORPH tpm2-pkcs11 | DISTRO | https://release-monitoring.org/project/18777 | 1.8.0 | 1.9.0 | tpm2-tools | DISTRO | https://release-monitoring.org/project/12841 | 5.2 | 5.4 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.1.0 | 4.0.1 | ORPH trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | 2.9.7 | 3.1.6 | traceroute | DISTRO | https://release-monitoring.org/project/14877 | 2.1.0 | 2.1.1 | transmission | DISTRO | https://release-monitoring.org/project/05002 | 3.00 | 4.0.0 | tree | DISTRO | https://release-monitoring.org/project/05006 | 2.0.2 | 2.1.0 | tzdata | DISTRO | https://release-monitoring.org/project/05021 | 2022f | 2022g | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2023.01 | uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.12 | 0.13.1 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 4.3.0.0 | 4.4.0.0 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 3.2 | unrar | DISTRO | https://release-monitoring.org/project/13306 | 6.1.7 | 6.2.5 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.7.1 | ORPH upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.19 | 0.99.20 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.56.4 | ORPH valgrind | DISTRO | https://release-monitoring.org/project/13639 | 3.19.0 | 3.20.0 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.7 | 1.0 | vim | DISTRO | https://release-monitoring.org/project/05092 | 9.0.1260 | 9.0.1303 | ORPH vis-network | DISTRO | https://release-monitoring.org/project/270536 | 9.1.0 | 9.1.2 | volk | DISTRO | https://release-monitoring.org/project/147733 | 2.5.2 | 3.0.0 | vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vte | DISTRO | https://release-monitoring.org/project/10895 | 0.66.2 | 0.70.3 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.45 | 3.2.47 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.240 | ORPH waf | DISTRO | https://release-monitoring.org/project/05116 | 2.0.24 | 2.0.25 | wavpack | DISTRO | https://release-monitoring.org/project/05121 | 5.5.0 | 5.6.0 | ORPH waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 1.0.0 | webp | DISTRO | https://release-monitoring.org/project/01761 | 1.2.4 | 1.3.0 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH weston | DISTRO | https://release-monitoring.org/project/13745 | 10.0.1 | 11.0.1 | whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.14 | 5.5.15 | wine | DISTRO | https://release-monitoring.org/project/05134 | 7.0 | 8.1 | wireless-regdb | DISTRO | https://release-monitoring.org/project/15257 | 2022.02.18 | 2022.08.12 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.8 | 0.4.13 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.15.1 | 0.16.2 | wtfutil | DISTRO | https://release-monitoring.org/project/243189 | 0.41.0 | 0.42.0 | xapian | DISTRO | https://release-monitoring.org/project/15919 | 1.4.19 | 1.4.22 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20230201 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.5 | 4.17.0 | xfsprogs | DISTRO | https://release-monitoring.org/project/05188 | 5.14.2 | 6.1.1 | ORPH xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.37 | 2.38 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 6.03 | 6.06.1 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.22 | 3.23 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 376 | 378 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.1 | 0.3.2 | xz | DISTRO | https://release-monitoring.org/project/05277 | 5.2.10 | 5.4.1 | ORPH yad | DISTRO | https://release-monitoring.org/project/05280 | 0.40.0 | 12.3 | zabbix | DISTRO | https://release-monitoring.org/project/05492 | 5.4.9 | 6.2.7 | zchunk | DISTRO | https://release-monitoring.org/project/178035 | 1.2.2 | 1.2.3 | zeek | DISTRO | https://release-monitoring.org/project/267106 | 4.1.1 | 5.1.2 | zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.1.7 | 2.1.9 | zic | DISTRO | https://release-monitoring.org/project/16905 | 2022f | 2022g | zstd | DISTRO | https://release-monitoring.org/project/12083 | 1.5.2 | 1.5.4 | zxing-cpp | DISTRO | https://release-monitoring.org/project/101246 | 1.4.0 | 2.0.0 | Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dropbear | CVE-2021-36369 | https://security-tracker.debian.org/tracker/CVE-2021-36369 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-3998 | https://security-tracker.debian.org/tracker/CVE-2021-3998 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2021-3981 | https://security-tracker.debian.org/tracker/CVE-2021-3981 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2022-0711 | https://security-tracker.debian.org/tracker/CVE-2022-0711 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libbpf | CVE-2021-45940 | https://security-tracker.debian.org/tracker/CVE-2021-45940 libbpf | CVE-2021-45941 | https://security-tracker.debian.org/tracker/CVE-2021-45941 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libxslt | CVE-2022-29824 | https://security-tracker.debian.org/tracker/CVE-2022-29824 lighttpd | CVE-2022-41556 | https://security-tracker.debian.org/tracker/CVE-2022-41556 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mender | CVE-2022-29555 | https://security-tracker.debian.org/tracker/CVE-2022-29555 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 modsecurity2 | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 modsecurity2 | CVE-2023-24021 | https://security-tracker.debian.org/tracker/CVE-2023-24021 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 nodejs | CVE-2022-35256 | https://security-tracker.debian.org/tracker/CVE-2022-35256 nodejs | CVE-2022-43548 | https://security-tracker.debian.org/tracker/CVE-2022-43548 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 opusfile | CVE-2022-47021 | https://security-tracker.debian.org/tracker/CVE-2022-47021 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 patchelf | CVE-2022-44940 | https://security-tracker.debian.org/tracker/CVE-2022-44940 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 proftpd | CVE-2021-46854 | https://security-tracker.debian.org/tracker/CVE-2021-46854 python-aiohttp | CVE-2022-33124 | https://security-tracker.debian.org/tracker/CVE-2022-33124 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-45198 | https://security-tracker.debian.org/tracker/CVE-2022-45198 python-pillow | CVE-2022-45199 | https://security-tracker.debian.org/tracker/CVE-2022-45199 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pyjwt | CVE-2022-29217 | https://security-tracker.debian.org/tracker/CVE-2022-29217 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python-web2py | CVE-2022-33146 | https://security-tracker.debian.org/tracker/CVE-2022-33146 python-werkzeug | CVE-2022-29361 | https://security-tracker.debian.org/tracker/CVE-2022-29361 python3 | CVE-2022-42919 | https://security-tracker.debian.org/tracker/CVE-2022-42919 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3611 | https://security-tracker.debian.org/tracker/CVE-2021-3611 qemu | CVE-2021-3750 | https://security-tracker.debian.org/tracker/CVE-2021-3750 qemu | CVE-2021-3929 | https://security-tracker.debian.org/tracker/CVE-2021-3929 qemu | CVE-2021-3947 | https://security-tracker.debian.org/tracker/CVE-2021-3947 qemu | CVE-2021-4158 | https://security-tracker.debian.org/tracker/CVE-2021-4158 qemu | CVE-2021-4206 | https://security-tracker.debian.org/tracker/CVE-2021-4206 qemu | CVE-2021-4207 | https://security-tracker.debian.org/tracker/CVE-2021-4207 qemu | CVE-2022-0358 | https://security-tracker.debian.org/tracker/CVE-2022-0358 qemu | CVE-2022-26353 | https://security-tracker.debian.org/tracker/CVE-2022-26353 qemu | CVE-2022-26354 | https://security-tracker.debian.org/tracker/CVE-2022-26354 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-35414 | https://security-tracker.debian.org/tracker/CVE-2022-35414 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 rabbitmq-server | CVE-2021-22116 | https://security-tracker.debian.org/tracker/CVE-2021-22116 rabbitmq-server | CVE-2021-22117 | https://security-tracker.debian.org/tracker/CVE-2021-22117 rabbitmq-server | CVE-2021-32718 | https://security-tracker.debian.org/tracker/CVE-2021-32718 rabbitmq-server | CVE-2021-32719 | https://security-tracker.debian.org/tracker/CVE-2021-32719 rabbitmq-server | CVE-2022-31008 | https://security-tracker.debian.org/tracker/CVE-2022-31008 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 rpm | CVE-2021-3521 | https://security-tracker.debian.org/tracker/CVE-2021-3521 rpm | CVE-2021-35937 | https://security-tracker.debian.org/tracker/CVE-2021-35937 rpm | CVE-2021-35938 | https://security-tracker.debian.org/tracker/CVE-2021-35938 rpm | CVE-2021-35939 | https://security-tracker.debian.org/tracker/CVE-2021-35939 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 sdl2 | CVE-2022-4743 | https://security-tracker.debian.org/tracker/CVE-2022-4743 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 sofia-sip | CVE-2023-22741 | https://security-tracker.debian.org/tracker/CVE-2023-22741 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tmux | CVE-2022-47016 | https://security-tracker.debian.org/tracker/CVE-2022-47016 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unbound | CVE-2022-30698 | https://security-tracker.debian.org/tracker/CVE-2022-30698 unbound | CVE-2022-30699 | https://security-tracker.debian.org/tracker/CVE-2022-30699 unbound | CVE-2022-3204 | https://security-tracker.debian.org/tracker/CVE-2022-3204 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 usbguard | CVE-2019-25058 | https://security-tracker.debian.org/tracker/CVE-2019-25058 vim | CVE-2023-0049 | https://security-tracker.debian.org/tracker/CVE-2023-0049 vim | CVE-2023-0051 | https://security-tracker.debian.org/tracker/CVE-2023-0051 vim | CVE-2023-0054 | https://security-tracker.debian.org/tracker/CVE-2023-0054 vim | CVE-2023-0288 | https://security-tracker.debian.org/tracker/CVE-2023-0288 vim | CVE-2023-0433 | https://security-tracker.debian.org/tracker/CVE-2023-0433 vim | CVE-2023-0512 | https://security-tracker.debian.org/tracker/CVE-2023-0512 wavpack | CVE-2022-2476 | https://security-tracker.debian.org/tracker/CVE-2022-2476 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xerces | CVE-2018-1311 | https://security-tracker.debian.org/tracker/CVE-2018-1311 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 modsecurity2 | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 modsecurity2 | CVE-2023-24021 | https://security-tracker.debian.org/tracker/CVE-2023-24021 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 opusfile | CVE-2022-47021 | https://security-tracker.debian.org/tracker/CVE-2022-47021 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python3 | CVE-2022-42919 | https://security-tracker.debian.org/tracker/CVE-2022-42919 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 sdl2 | CVE-2022-4743 | https://security-tracker.debian.org/tracker/CVE-2022-4743 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 sofia-sip | CVE-2023-22741 | https://security-tracker.debian.org/tracker/CVE-2023-22741 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tmux | CVE-2022-47016 | https://security-tracker.debian.org/tracker/CVE-2022-47016 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 vim | CVE-2023-0049 | https://security-tracker.debian.org/tracker/CVE-2023-0049 vim | CVE-2023-0051 | https://security-tracker.debian.org/tracker/CVE-2023-0051 vim | CVE-2023-0054 | https://security-tracker.debian.org/tracker/CVE-2023-0054 vim | CVE-2023-0288 | https://security-tracker.debian.org/tracker/CVE-2023-0288 vim | CVE-2023-0433 | https://security-tracker.debian.org/tracker/CVE-2023-0433 vim | CVE-2023-0512 | https://security-tracker.debian.org/tracker/CVE-2023-0512 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xerces | CVE-2018-1311 | https://security-tracker.debian.org/tracker/CVE-2018-1311 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Mon Feb 13 07:47:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 08:47:35 +0100 Subject: [Buildroot] Dependency problem for gtkmm3 In-Reply-To: References: <20230210231454.4f3aedbd@windsurf> Message-ID: <20230213084735.5318a511@windsurf> Hello Dirk, On Sun, 12 Feb 2023 08:51:17 +0000 Dirk De Becker wrote: > Thank you for your quick reply. > Will this issue be fixed in the 2023.02 release? It all depends on whether someone submits a fix for the issue. Do you think you could have a look? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From br015 at umbiko.net Mon Feb 13 09:26:11 2023 From: br015 at umbiko.net (Andreas Ziegler) Date: Mon, 13 Feb 2023 10:26:11 +0100 Subject: [Buildroot] [PATCH] package/mpd: update to version 0.23.12 Message-ID: <20230213092611.86858-1-br015@umbiko.net> List of changes: decoder::mad: fix integer underflow with very small files input::curl: require CURL 7.55.0 or later output::pipewire: adjust to PipeWire 0.3.64 API change tags:: fix crash bug due to race condition fix build failures with GCC 13 Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.12/NEWS Commit: https://github.com/MusicPlayerDaemon/MPD/commit/b1422fb Tested on: i386 (build) x86_64 (build, run) Aarch64 (build) Signed-off-by: Andreas Ziegler --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 8c488d0357..2521238f64 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 edb4e7a8f9dff238b5610f9e2461940ea98c727a5462fafb1cdf836304dfdca9 mpd-0.23.11.tar.xz +sha256 b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7 mpd-0.23.12.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 449600eda2..6c25c9b46f 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).11 +MPD_VERSION = $(MPD_VERSION_MAJOR).12 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 bugzilla at busybox.net Mon Feb 13 11:44:55 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 13 Feb 2023 11:44:55 +0000 Subject: [Buildroot] [Bug 15306] glibc build fails in Docker container In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15306 --- Comment #3 from Peter Korsgaard --- > I'm not super familiar with batocera nor buildroot, so it'd be hard for me to pare Ahh, so you are not using upstream Buildroot? Possibly your issue is in one of the buildroot modifications done by the batocera project, so perhaps check there? -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Mon Feb 13 11:58:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 12:58:10 +0100 Subject: [Buildroot] [PATCH 2/3] package/linux-headers: drop 4.9.x option In-Reply-To: <20230213115812.582772-1-peter@korsgaard.com> References: <20230213115812.582772-1-peter@korsgaard.com> Message-ID: <20230213115812.582772-2-peter@korsgaard.com> The 4.9.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 72deb03c35..e2dc854c78 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_4_9 + bool "kernel headers version 4.9.x are no longer supported" + select BR2_LEGACY + help + Version 4.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_DOCKER_PROXY bool "docker-proxy removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index f797d5a61a..ae8b5e5f62 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -6,7 +6,6 @@ sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux- sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz # Locally computed diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8a76f93d62..6970090855 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -24,11 +24,6 @@ config BR2_KERNEL_HEADERS_AS_KERNEL depends on BR2_LINUX_KERNEL select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION -config BR2_KERNEL_HEADERS_4_9 - bool "Linux 4.9.x kernel headers" - depends on !BR2_riscv - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 - config BR2_KERNEL_HEADERS_4_14 bool "Linux 4.14.x kernel headers" depends on !BR2_riscv @@ -393,7 +388,6 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.337" if BR2_KERNEL_HEADERS_4_9 default "4.14.305" if BR2_KERNEL_HEADERS_4_14 default "4.19.272" if BR2_KERNEL_HEADERS_4_19 default "5.4.231" if BR2_KERNEL_HEADERS_5_4 -- 2.30.2 From peter at korsgaard.com Mon Feb 13 11:58:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 12:58:11 +0100 Subject: [Buildroot] [PATCH 3/3] package/linux-headers: drop 6.0.x option In-Reply-To: <20230213115812.582772-1-peter@korsgaard.com> References: <20230213115812.582772-1-peter@korsgaard.com> Message-ID: <20230213115812.582772-3-peter@korsgaard.com> The 6.0.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e2dc854c78..7f69462f2e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_6_0 + bool "kernel headers version 6.0.x are no longer supported" + select BR2_LEGACY + help + Version 6.0.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_KERNEL_HEADERS_4_9 bool "kernel headers version 4.9.x are no longer supported" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index ae8b5e5f62..52eb534b40 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz -sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6970090855..18c179ec8d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -45,10 +45,6 @@ config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 -config BR2_KERNEL_HEADERS_6_0 - bool "Linux 6.0.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 - config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 @@ -393,7 +389,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.231" if BR2_KERNEL_HEADERS_5_4 default "5.10.167" if BR2_KERNEL_HEADERS_5_10 default "5.15.93" if BR2_KERNEL_HEADERS_5_15 - default "6.0.19" if BR2_KERNEL_HEADERS_6_0 default "6.1.11" if BR2_KERNEL_HEADERS_6_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL -- 2.30.2 From peter at korsgaard.com Mon Feb 13 11:58:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 12:58:09 +0100 Subject: [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230213115812.582772-1-peter@korsgaard.com> 4.9.x / 6.0.x is now EOL. 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 774f1e0975..11dc5cce07 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.11" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" 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 e88abe5bb8..f797d5a61a 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b linux-6.1.9.tar.xz +sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz -sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz -sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz +sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz +sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz +sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz -sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz +sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz +sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1146231e41..8a76f93d62 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -394,13 +394,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.304" if BR2_KERNEL_HEADERS_4_14 - default "4.19.271" if BR2_KERNEL_HEADERS_4_19 - default "5.4.230" if BR2_KERNEL_HEADERS_5_4 - default "5.10.166" if BR2_KERNEL_HEADERS_5_10 - default "5.15.91" if BR2_KERNEL_HEADERS_5_15 + default "4.14.305" if BR2_KERNEL_HEADERS_4_14 + default "4.19.272" if BR2_KERNEL_HEADERS_4_19 + default "5.4.231" if BR2_KERNEL_HEADERS_5_4 + default "5.10.167" if BR2_KERNEL_HEADERS_5_10 + default "5.15.93" if BR2_KERNEL_HEADERS_5_15 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 - default "6.1.9" if BR2_KERNEL_HEADERS_6_1 + default "6.1.11" if BR2_KERNEL_HEADERS_6_1 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 d.lang at abatec.at Mon Feb 13 12:24:18 2023 From: d.lang at abatec.at (Lang Daniel) Date: Mon, 13 Feb 2023 12:24:18 +0000 Subject: [Buildroot] [PATCH] package/libbpf: Don't remove bpf.h on host In-Reply-To: <2667723.mvXUDI8C0e@pwmachine> References: <12146851.O9o76ZdvQC@pwmachine> <17501a13-8018-656f-5f4d-b1cf6c1ecd5c@mind.be> <2667723.mvXUDI8C0e@pwmachine> Message-ID: Hi Arnout, Francis, > Hi Daniel, Francis, > > On 07/02/2023 21:10, Francis Laniel wrote: >> Hi. >> >> Le lundi 28 novembre 2022, 16:06:20 CET Lang Daniel a ?crit : >>> libbpf >1.0.0 defines libbpf_bpf_link_type_str(enum bpf_link_type) in >>> src/libbpf.h, which is included by host-pahole. >>> bpf_link_type is defined in linux/bpf.h, therefore the comment stating >>> that pahole doesn't need bpf.h is no longer valid. >>> >>> Fixes: >>> - >>> http://autobuild.buildroot.net/results/d126a4b6eca786402dc362c86f8df3addec3 >>> d217/ >>> >>> Signed-off-by: Daniel Lang >>> --- >>> I wasn't able to reproduce the mentioned compile error in the kernel. >>> The mentioned file (tools/lib/bpf/strset.c) shouldn't be compiled when >>> compiling the kernel as it would recompile libbpf. >>> --- >>> package/libbpf/libbpf.mk | 17 +---------------- >>> 1 file changed, 1 insertion(+), 16 deletions(-) >>> >>> diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk >>> index 820f1dc4bf..0381fd833a 100644 >>> --- a/package/libbpf/libbpf.mk >>> +++ b/package/libbpf/libbpf.mk >>> @@ -39,26 +39,11 @@ define LIBBPF_INSTALL_TARGET_CMDS >>> -C $(@D)/src install DESTDIR=$(TARGET_DIR) >>> endef >>> >>> -# We need to install_uapi_headers so we have btf.h to compile >>> -# host-pahole. >>> -# Nonetheless, this target adds bpf.h which generates a conflict when >>> -# building the kernel: >>> -# In file included from libbpf_internal.h:17:0, from strset.c:9: >>> -# relo_core.h:10:6: error: nested redefinition of 'enum bpf_core_relo_kind' >>> -# enum bpf_core_relo_kind { >>> -# ^~~~~~~~~~~~~~~~~~ >>> -# relo_core.h:10:6: error: redeclaration of 'enum bpf_core_relo_kind' >>> -# In file included from libbpf_legacy.h:13:0, >>> -# from libbpf_internal.h:16, >>> -# from strset.c:9: >>> -# /home/francis/buildroot/output/host/include/linux/bpf.h:6497:6: note: >>> originally defined here -# enum bpf_core_relo_kind { >>> -# So, better to remove remove it now since we do not need it to build >>> +# We need to install_uapi_headers so we have bpf.h and btf.h to compile >>> # host-pahole, the only user of host-libbpf. >>> define HOST_LIBBPF_INSTALL_CMDS >>> $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ >>> -C $(@D)/src install install_uapi_headers DESTDIR=$(HOST_DIR) >>> - rm $(HOST_DIR)/include/linux/bpf.h >>> endef >>> >>> $(eval $(generic-package)) >> >> Thank you for this patch and sorry for my very late reply. >> Sadly, I do not think the patch addresses the underlying issue. >> Indeed, this is not pahole which does not need this file, as pahole relies on >> to be built. >> So, the whole point of this comment and the rm is to avoid a problem when >> building the kernel when pahole was built before. > > The current solution, however, also doesn't work, which is why Franci's patch > [1] is needed to fix it again. > > However, we believe this is not the proper fix. The real issue is the following: > > - libbpf installs headers which are possibly incompatible with the kernel's > headers. Normally this is not a problem, because you have either the kernel's or > libbpf's headers installed, not both. > > - However, when we install libbpf headers in $(HOST_DIR)/include, the kernel > build itself picks up those headers instead of its own internal headers. That is > why bpf.h is removed here to begin with. If bpf.h is not removed (and the kernel > headers are indeed incompatible with the libbpf ones), then the kernel build > will fail. > > - There is however no reason why the kernel should pick up $(HOST_DIR)/include > instead of its own internal headers. Normally it doesn't do that, because it > supplies -I options to its own headers, and these have precedence over the > system included /usr/include etc. However, we force HOSTCC="$(HOSTCC) > $(HOST_CFLAGS)" and HOST_CFLAGS has -I$(HOST_DIR)/include. This one will come > before all of the ones that the kernel adds and will have precedence. > > Therefore, we believe that the solution is to use -isystem instead of -I in the > HOSTCC setting of the kernel. This is indeed what is already done for uboot: > > HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem > /,$(HOST_CFLAGS)))" \ > > Note that there is a risk that this by itself goes wrong as well. We tried at > some point to use -isystem instead of -I in HOST_CFLAGS: > > commit 6f8162cf8c1abef7e0a4771fe0d6b26a28f5c2b6 > Author: David Raeman > Date: Mon Jul 25 21:52:26 2016 > > package/Makefile.in should grab HOST_DIR headers using -isystem instead of -I. > > > but this was reverted a copule of days later: > > commit 255b6f80d395ef048f46cfcf75dba690c56af657 > Author: Thomas Petazzoni > Date: Sat Jul 30 18:10:18 2016 > > Revert "package/Makefile.in should grab HOST_DIR headers using -isystem > instead of -I." > > (Unfortunately, the commit has no further explanation of what went wrong). > > So, could you (Daniel and Francis) try to apply this patch and replace -I with > -isystem like is done for U-Boot, and do a bunch of kernel builds to see if it > breaks anything? I didn't apply the patch for package/Makefile.in as that would change the behavour for all packages. I did however copy the logic used in the U-Boot. -HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ +HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ And applied this patch to keep bpf.h I tested the following config: BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="{VERSION}" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="pahole-kernel.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE=y and with a fragment for linux: CONFIG_BPF_SYSCALL=y CONFIG_BPF_UNPRIV_DEFAULT_OFF=n CONFIG_DEBUG_INFO_REDUCED=n CONFIG_DEBUG_INFO_COMPRESSED=n CONFIG_DEBUG_INFO_BTF=y CONFIG_SYSTEM_TRUSTED_KEYRING=y where VERSION is one of: 5.2.21 5.3.18 5.4.231 5.5.19 5.6.19 5.7.19 5.8.18 5.9.16 5.10.167 5.11.22 5.12.19 5.13.19 5.14.21 5.15.93 5.16.20 5.17.15 5.18.19 5.19.17 6.0.19 6.1.11 Version 5.2, as far as I could work it out, is the version that introduced the pahole dependency when CONFIG_DEBUG_INFO_BTF is set. None-LTS versions after 5.10 and before 6.0 fail with: LD vmlinux.o MODPOST vmlinux.symvers MODINFO modules.builtin.modinfo GEN modules.builtin LD .tmp_vmlinux.btf BTF .btf.vmlinux.bin.o LD .tmp_vmlinux.kallsyms1 KSYMS .tmp_vmlinux.kallsyms1.S AS .tmp_vmlinux.kallsyms1.S LD .tmp_vmlinux.kallsyms2 KSYMS .tmp_vmlinux.kallsyms2.S AS .tmp_vmlinux.kallsyms2.S LD vmlinux BTFIDS vmlinux FAILED: load BTF from vmlinux: Invalid argument make[2]: *** [Makefile:1177: vmlinux] Error 255 make[1]: *** [package/pkg-generic.mk:293: /home/d.lang/ws/other/buildroot/output/build/linux-5.11.22/.stamp_built] Error 2 make: *** [Makefile:82: _all] Error 2 But that should be unrelated to the change in package/libbpf and HOSTCC. I will try to work out the reason behind that error. Should I create a patch to change HOSTCC or is additional testing required? > > For now, I've marked this patch as Changes Requested (it can only be applied > if the bpf.h problem is solved in some other way), and marked Francis's patch > [1] as Superseded. > > Regards, > Arnout > > > [1] > https://patchwork.ozlabs.org/project/buildroot/patch/20220610165441.84812-2-flaniel at linux.microsoft.com/ > > >> >> Sadly, I tested your patch and I hit the problem described in the comment >> regarding redefinition of bpf_core_relo_kind. >> >> Did you also hit it or you were able to build the kernel with >> BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE? It seems like I was tested with a too recent kernel and originally preparing this patch and therefore didn't hit this error. >> >> >> Best regards and thank you in advance. >> >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From heiko.thiery at gmail.com Mon Feb 13 12:40:21 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 13 Feb 2023 13:40:21 +0100 Subject: [Buildroot] [PATCH 1/2] package/network-manager: add patch to set mobile-broadband-provider-info-database location Message-ID: <20230213124021.12522-1-heiko.thiery@gmail.com> When building network-manager in cross-compile environment pkg-config returns the wrong path to the mobile-broadband-provider-info database. By adding the option 'mobile_broadband_provider_info_database' to set the correct path to the datafile this can be solved. Signed-off-by: Heiko Thiery --- ...option-to-set-the-mobile-broadband-p.patch | 60 +++++++++++++++++++ package/network-manager/network-manager.mk | 1 + 2 files changed, 61 insertions(+) create mode 100644 package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch diff --git a/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch b/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch new file mode 100644 index 0000000000..4336472e45 --- /dev/null +++ b/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch @@ -0,0 +1,60 @@ +From 03ba04d4784fa4fc7ec31455070fb5ecf25ade23 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Fri, 27 Jan 2023 22:38:42 +0100 +Subject: [PATCH] build: meson: add option to set the + mobile-broadband-provider-info database + +When building network-manager in cross-compile environment meson is not able +to detect the right location of the mobile-broadband-provider-info +database by using the pkg-config module. + +By adding the option 'mobile_broadband_provider_info_database' to set the +correct path to the datafile this can be solved. + +Signed-off-by: Heiko Thiery + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1519 +--- + meson.build | 6 +++++- + meson_options.txt | 1 + + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 0adc42f738..84ce52c736 100644 +--- a/meson.build ++++ b/meson.build +@@ -584,7 +584,10 @@ enable_modem_manager = get_option('modem_manager') + if enable_modem_manager + mm_glib_dep = dependency('mm-glib', version: '>= 0.7.991') + +- mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ mobile_broadband_provider_info_database = get_option('mobile_broadband_provider_info_database') ++ if mobile_broadband_provider_info_database == '' ++ mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ endif + config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_database) + endif + +@@ -1054,6 +1057,7 @@ output += ' jansson: ' + jansson_msg + '\n' + output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n' + output += ' nft: ' + config_h.get('NFT_PATH') + '\n' + output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n' ++output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' + output += ' ofono: ' + enable_ofono.to_string() + '\n' + output += ' concheck: ' + enable_concheck.to_string() + '\n' + output += ' libteamdctl: ' + enable_teamdctl.to_string() + '\n' +diff --git a/meson_options.txt b/meson_options.txt +index 8b1d32e645..4e359f9e92 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -32,6 +32,7 @@ option('ppp', type: 'boolean', value: true, description: 'enable PPP/PPPoE suppo + option('pppd', type: 'string', value: '', description: 'path to pppd binary') + option('pppd_plugin_dir', type: 'string', value: '', description: 'path to the pppd plugins directory') + option('modem_manager', type: 'boolean', value: true, description: 'Enable new ModemManager1 interface support') ++option('mobile_broadband_provider_info_database', type: 'string', value: '', description: 'path to the mobile-broadband-provider-info database') + option('ofono', type: 'boolean', value: false, description: 'Enable oFono support (experimental)') + option('concheck', type: 'boolean', value: true, description: 'enable connectivity checking support') + option('teamdctl', type: 'boolean', value: false, description: 'enable Teamd control support') +-- +2.20.1 + diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 138ff46e4a..87932c75e4 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -96,6 +96,7 @@ endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true +NETWORK_MANAGER_CONF_OPTS += -Dmobile_broadband_provider_info_database=/usr/share/mobile-broadband-provider-info/serviceproviders.xml else NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif -- 2.20.1 From heiko.thiery at gmail.com Mon Feb 13 12:40:23 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 13 Feb 2023 13:40:23 +0100 Subject: [Buildroot] [PATCH 2/2] package/network-manager: bump version to 1.42.0 In-Reply-To: <20230213124021.12522-1-heiko.thiery@gmail.com> References: <20230213124021.12522-1-heiko.thiery@gmail.com> Message-ID: <20230213124021.12522-2-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 3895c1ffc3..270699d63a 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.10.sha256sum -sha256 fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7 NetworkManager-1.40.10.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.42/NetworkManager-1.42.0.sha256sum +sha256 2f6756d507bb6b46716594b67e6fe7491891e1b5b167bbafc5157dfa7753d5b4 NetworkManager-1.42.0.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 87932c75e4..9188af29eb 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.40 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 +NETWORK_MANAGER_VERSION_MAJOR = 1.42 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 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 -- 2.20.1 From stefan at agner.ch Mon Feb 13 14:15:34 2023 From: stefan at agner.ch (Stefan Agner) Date: Mon, 13 Feb 2023 15:15:34 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: disable version control information Message-ID: <12a7772dc9c30d31bc4dd7a4e15ca12425c14834.1676297701.git.stefan@agner.ch> By default go tries to include version control (VCS) information in binaries. Since Buildroot separates version control from the build process it is sensible to disable this behavior. This avoids build errors when building with a git repository higher up in the tree owned by root. In this case the go build system calls `git status --porcelain` which returns with an error: fatal: detected dubious ownership in repository at '/build' Signed-off-by: Stefan Agner --- package/pkg-golang.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index cdc67b32c0..da9c9a21ac 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -45,7 +45,8 @@ $(2)_BUILD_OPTS += \ -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ - -p $$(PARALLEL_JOBS) + -p $$(PARALLEL_JOBS) \ + -buildvcs=false # Target packages need the Go compiler on the host at download time (for # vendoring), and at build and install time. -- 2.39.1 From d.lang at abatec.at Mon Feb 13 14:52:23 2023 From: d.lang at abatec.at (Lang Daniel) Date: Mon, 13 Feb 2023 14:52:23 +0000 Subject: [Buildroot] Dependency problem for gtkmm3 In-Reply-To: <20230213084735.5318a511@windsurf> References: <20230210231454.4f3aedbd@windsurf> <20230213084735.5318a511@windsurf> Message-ID: Hi Thomas, Dirk, > Hello Dirk, > > On Sun, 12 Feb 2023 08:51:17 +0000 > Dirk De Becker wrote: > >> Thank you for your quick reply. >> Will this issue be fixed in the 2023.02 release? > > It all depends on whether someone submits a fix for the issue. Do you > think you could have a look? The problem comes down to an incompatibility that I tried to point out some time ago [0]. Current versions of cairomm, pangomm, glibmm have a different ABI that's not supported in gtkmm 3.x.y. Even the most recent version of gtkmm 3.24.x doesn't support the current version of of the other -mm packages and according to the mailing list of gtkmm [1] there are no plans to support it. The are compatible with gtk4. As it stands gtkmm3 isn't usable and fixing it brings up the same problems of duplicating packages. [0]: https://lists.buildroot.org/pipermail/buildroot/2021-October/625850.html [1]: https://mail.gnome.org/archives/gtkmm-list/2021-May/msg00000.html > > Best regards, > > Thomas Regards Daniel From peter at korsgaard.com Mon Feb 13 14:53:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 15:53:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: switch to cmake build In-Reply-To: <20230124103149.588288-1-fido_max@inbox.ru> (Maxim Kochetkov via buildroot's message of "Tue, 24 Jan 2023 13:31:49 +0300") References: <20230124103149.588288-1-fido_max@inbox.ru> Message-ID: <873579boqu.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov via buildroot writes: > GDAL autoconf has wrong libgeotiff detection. It uses host's > library if installed instead of buildroot one. > Modern versions of gdal have no autoconf build scripts, just cmake only. > So move to cmake build variant. > Fixes: https://bugs.busybox.net/show_bug.cgi?id=15281 > Signed-off-by: Maxim Kochetkov Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 13 14:53:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 15:53:18 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/gdal: switch to cmake build to fix libgeotiff detection Message-ID: <20230213145415.E4FFA85C84@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0664cc9f46eb4ad7116daec6be6639d28d9ab79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x GDAL autoconf has wrong libgeotiff detection. It uses host's library if installed instead of buildroot one. Modern versions of gdal have no autoconf build scripts, just cmake only. So move to cmake build variant. Fixes: https://bugs.busybox.net/show_bug.cgi?id=15281 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 2b43579e9453a4e4f0d25d902634ebd9f1721dfc) Signed-off-by: Peter Korsgaard --- package/gdal/gdal.mk | 168 ++++++++++++++++++++++++++------------------------- 1 file changed, 87 insertions(+), 81 deletions(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 33e7ba724a..2d6dff1a93 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -12,6 +12,15 @@ GDAL_LICENSE_FILES = LICENSE.TXT GDAL_CPE_ID_VENDOR = osgeo GDAL_INSTALL_STAGING = YES GDAL_CONFIG_SCRIPTS = gdal-config +GDAL_SUPPORTS_IN_SOURCE_BUILD = NO + +# Using 'make' with CMake's Makefile generator will not work, as +# 'make' uses GNUmakefile first, but GNUmakefile is provided by +# autotools in gdal. We need to force 'make' to use the Makefile, +# which is generated by CMake. GNUmakefile and autoconf are dropped in +# 3.6 so this can be dropped in future version. +GDAL_MAKE_OPTS += -f Makefile + # gdal at its core only needs host-pkgconf, libgeotiff, proj and tiff # but since by default mrf driver support is enabled, it also needs # jpeg, libpng and zlib. By default there are also many other drivers @@ -20,97 +29,94 @@ GDAL_CONFIG_SCRIPTS = gdal-config # respectively needed dependencies. GDAL_DEPENDENCIES = host-pkgconf jpeg json-c libgeotiff libpng proj tiff zlib -# Yes, even though they have --with options, these few libraries are +# Yes, even though they have -DDGDAL_USE options, a few libraries are # mandatory. If we don't provide them, bundled versions are used. GDAL_CONF_OPTS = \ - --with-geotiff \ - --with-jpeg \ - --with-libjson-c=$(STAGING_DIR)/usr \ - --with-libtool \ - --with-libz \ - --with-png \ - --with-proj \ - --without-armadillo \ - --without-blosc \ - --without-brunsli \ - --without-cfitsio \ - --without-crypto \ - --without-cryptopp \ - --without-curl \ - --without-dds \ - --without-ecw \ - --without-expat \ - --without-exr \ - --without-fgdb \ - --without-freexl \ - --without-geos \ - --without-gnm \ - --without-libkml \ - --without-lz4 \ - --without-gta \ - --without-hdf4 \ - --without-hdf5 \ - --without-hdfs \ - --without-heif \ - --without-idb \ - --without-jp2lura \ - --without-java \ - --without-jpeg12 \ - --without-jxl \ - --without-kakadu \ - --without-kea \ - --without-lerc \ - --without-gif \ - --without-liblzma \ - --without-libdeflate \ - --without-mongocxxv3 \ - --without-mrsid \ - --without-jp2mrsid \ - --without-macosx-framework \ - --without-msg \ - --without-mysql \ - --without-netcdf \ - --without-null \ - --without-oci \ - --without-odbc \ - --without-ogdi \ - --without-opencl \ - --without-openjpeg \ - --without-pam \ - --without-pcidsk \ - --without-pcraster \ - --without-pcre \ - --without-pcre2 \ - --without-pdfium \ - --without-podofo \ - --without-poppler \ - --without-python \ - --without-qhull \ - --without-rasdaman \ - --without-rasterlite2 \ - --without-rdb \ - --without-sfcgal \ - --without-sosi \ - --without-spatialite \ - --without-sqlite3 \ - --without-teigha \ - --without-tiledb \ - --without-webp \ - --without-xerces \ - --without-zstd + -DGDAL_USE_GEOTIFF=ON \ + -DGDAL_USE_JPEG=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_PNG=ON \ + -DGDAL_USE_ARMADILLO=OFF \ + -DGDAL_USE_BLOSC=OFF \ + -DGDAL_USE_BRUNSLI=OFF \ + -DGDAL_USE_CFITSIO=OFF \ + -DGDAL_USE_OPENSSL=OFF \ + -DGDAL_USE_CRYPTOPP=OFF \ + -DGDAL_USE_CRNLIB=OFF \ + -DGDAL_USE_CURL=OFF \ + -DGDAL_USE_ECW=OFF \ + -DGDAL_USE_EXPAT=OFF \ + -DGDAL_USE_FILEGDB=OFF \ + -DGDAL_USE_FREEXL=OFF \ + -DGDAL_USE_GEOS=OFF \ + -DGDAL_USE_LIBKML=OFF \ + -DGDAL_USE_LZ4=OFF \ + -DGDAL_USE_GTA=OFF \ + -DGDAL_USE_HDF4=OFF \ + -DGDAL_USE_HDF5=OFF \ + -DGDAL_USE_HDFS=OFF \ + -DGDAL_USE_HEIF=OFF \ + -DGDAL_USE_IDB=OFF \ + -DGDAL_USE_LURATECH=OFF \ + -DGDAL_USE_JPEG12_INTERNAL=OFF \ + -DGDAL_USE_JXL=OFF \ + -DGDAL_USE_KDU=OFF \ + -DGDAL_USE_KEA=OFF \ + -DGDAL_USE_LERC=OFF \ + -DGDAL_USE_GIF=OFF \ + -DGDAL_USE_LIBLZMA=OFF \ + -DGDAL_USE_DEFLATE=OFF \ + -DGDAL_USE_MONGOCXX=OFF \ + -DGDAL_USE_MRSID=OFF \ + -DGDAL_USE_PUBLICDECOMPWT=OFF \ + -DGDAL_USE_MYSQL=OFF \ + -DGDAL_USE_NETCDF=OFF \ + -DGDAL_USE_ORACLE=OFF \ + -DGDAL_USE_ODBC=OFF \ + -DGDAL_USE_OGDI=OFF \ + -DGDAL_USE_OPENCL=OFF \ + -DGDAL_USE_OPENEXR=OFF \ + -DGDAL_USE_OPENJPEG=OFF \ + -DGDAL_USE_PCRE=OFF \ + -DGDAL_USE_PCRE2=OFF \ + -DGDAL_USE_PDFIUM=OFF \ + -DGDAL_USE_PODOFO=OFF \ + -DGDAL_USE_POPPLER=OFF \ + -DGDAL_USE_QHULL=OFF \ + -DGDAL_USE_RASDAMAN=OFF \ + -DGDAL_USE_RASTERLITE2=OFF \ + -DGDAL_USE_RDB=OFF \ + -DGDAL_USE_SFCGAL=OFF \ + -DGDAL_USE_FYBA=OFF \ + -DGDAL_USE_SPATIALITE=OFF \ + -DGDAL_USE_SQLITE3=OFF \ + -DGDAL_USE_TEIGHA=OFF \ + -DGDAL_USE_TILEDB=OFF \ + -DGDAL_USE_WEBP=OFF \ + -DGDAL_USE_XERCESC=OFF \ + -DGDAL_USE_ZSTD=OFF \ + -DGDAL_ENABLE_DRIVER_PCIDSK=OFF \ + -DGDAL_ENABLE_DRIVER_PCRASTER=OFF \ + -DGDAL_ENABLE_DRIVER_NULL=OFF \ + -DGDAL_ENABLE_MACOSX_FRAMEWORK=OFF \ + -DENABLE_GNM=OFF \ + -DENABLE_PAM=OFF \ + -DBUILD_JAVA_BINDINGS=OFF \ + -DBUILD_PYTHON_BINDINGS=OFF ifeq ($(BR2_PACKAGE_LIBXML2),y) GDAL_DEPENDENCIES += libxml2 -GDAL_CONF_OPTS += --with-xml2 +GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=ON else -GDAL_CONF_OPTS += --without-xml2 +GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=OFF endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql -GDAL_CONF_OPTS += --with-pg +GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON else -GDAL_CONF_OPTS += --without-pg +GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=OFF endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) From stefan at agner.ch Mon Feb 13 14:54:40 2023 From: stefan at agner.ch (Stefan Agner) Date: Mon, 13 Feb 2023 15:54:40 +0100 Subject: [Buildroot] [PATCH] package/dbus-broker: bump to release 33 In-Reply-To: <20230204115212.GC14083@scaer> References: <175cc1e7e72602b9c0e8d6b761cf72b375383189.1675421166.git.stefan@agner.ch> <20230204115212.GC14083@scaer> Message-ID: <4731f67c09026856282903ad811d15ca@agner.ch> On 2023-02-04 12:52, Yann E. MORIN wrote: > Stefan, All, > > On 2023-02-03 11:46 +0100, Stefan Agner spake thusly: >> This release contains mostly a bugfixes, with some improvements around >> error handling for unimplemented functionality and resiliency against >> runtime changes of dbus service-files. >> >> Signed-off-by: Stefan Agner >> --- >> package/dbus-broker/dbus-broker.hash | 2 +- >> package/dbus-broker/dbus-broker.mk | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash >> index f6c2cbe160..89b27ddddc 100644 >> --- a/package/dbus-broker/dbus-broker.hash >> +++ b/package/dbus-broker/dbus-broker.hash >> @@ -1,5 +1,5 @@ >> # Locally calculated >> -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz >> +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz >> sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE >> sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS >> sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md > > Unfortunately, there are issues with licensing info: > > $ make dbus-broker-legal-info > [...] > ERROR: subprojects/libcstdaux-1/AUTHORS has wrong sha256 hash: > ERROR: expected: > 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 > ERROR: got : > e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 > ERROR: Incomplete download, or man-in-the-middle (MITM) attack > make[1]: *** [package/dbus-broker/dbus-broker.mk:71: > dbus-broker-legal-info] Error 1 > make: *** [Makefile:23: _all] Error 2 > > Can you look into that and resubmit the bump, please? Change was due to copyright date bump and additional authors which is maintained in the same file. Will adjust the hash and resend. -- Stefan > > Regards, > Yann E. MORIN. > > >> diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk >> index e82b79220d..c4e3679a2e 100644 >> --- a/package/dbus-broker/dbus-broker.mk >> +++ b/package/dbus-broker/dbus-broker.mk >> @@ -4,7 +4,7 @@ >> # >> ################################################################################ >> >> -DBUS_BROKER_VERSION = 32 >> +DBUS_BROKER_VERSION = 33 >> DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz >> DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) >> >> -- >> 2.39.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Mon Feb 13 14:57:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 15:57:51 +0100 Subject: [Buildroot] [PATCH 1/3] package/kodi: fix armv5 build In-Reply-To: <20230117200821.2882597-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 17 Jan 2023 21:08:19 +0100") References: <20230117200821.2882597-1-bernd.kuhls@t-online.de> Message-ID: <87y1p1a9zk.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Disable neon support when not available. > Fixes build error not yet found by autobuilders > /tmp/cc8LvPwi.s: Assembler messages: > /tmp/cc8LvPwi.s:28: Error: selected processor does not support `vldmia r1,{ q4-q7 }' in ARM mode > /tmp/cc8LvPwi.s:29: Error: selected processor does not support `vldmia r0,{ q8-q11 }' in ARM mode > /tmp/cc8LvPwi.s:30: Error: selected processor does not support `vmul.f32 q0,q8,d8[0]' in ARM mode > /tmp/cc8LvPwi.s:31: Error: selected processor does not support `vmul.f32 q1,q8,d10[0]' in ARM mode > /tmp/cc8LvPwi.s:32: Error: selected processor does not support `vmul.f32 q2,q8,d12[0]' in ARM mode > /tmp/cc8LvPwi.s:33: Error: selected processor does not support `vmul.f32 q3,q8,d14[0]' in ARM mode > /tmp/cc8LvPwi.s:34: Error: selected processor does not support `vmla.f32 q0,q9,d8[1]' in ARM mode > /tmp/cc8LvPwi.s:35: Error: selected processor does not support `vmla.f32 q1,q9,d10[1]' in ARM mode > /tmp/cc8LvPwi.s:36: Error: selected processor does not support `vmla.f32 q2,q9,d12[1]' in ARM mode > /tmp/cc8LvPwi.s:37: Error: selected processor does not support `vmla.f32 q3,q9,d14[1]' in ARM mode > /tmp/cc8LvPwi.s:38: Error: selected processor does not support `vmla.f32 q0,q10,d9[0]' in ARM mode > /tmp/cc8LvPwi.s:39: Error: selected processor does not support `vmla.f32 q1,q10,d11[0]' in ARM mode > /tmp/cc8LvPwi.s:40: Error: selected processor does not support `vmla.f32 q2,q10,d13[0]' in ARM mode > /tmp/cc8LvPwi.s:41: Error: selected processor does not support `vmla.f32 q3,q10,d15[0]' in ARM mode > /tmp/cc8LvPwi.s:42: Error: selected processor does not support `vmla.f32 q0,q11,d9[1]' in ARM mode > /tmp/cc8LvPwi.s:43: Error: selected processor does not support `vmla.f32 q1,q11,d11[1]' in ARM mode > /tmp/cc8LvPwi.s:44: Error: selected processor does not support `vmla.f32 q2,q11,d13[1]' in ARM mode > /tmp/cc8LvPwi.s:45: Error: selected processor does not support `vmla.f32 q3,q11,d15[1]' in ARM mode > /tmp/cc8LvPwi.s:46: Error: selected processor does not support `vstmia r0,{ q0-q3 }' in ARM mode > with this defconfig: > BR2_arm=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_KODI=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > BR2_PACKAGE_MESA3D_OPENGL_ES=y > BR2_PACKAGE_PYTHON3=y > BR2_PACKAGE_PYTHON3_PY_ONLY=y Hi, are these fixed caused by new changes in kodi 19.5, or is 2022.02.x / 2022.11.x also affected? -- Bye, Peter Korsgaard From stefan at agner.ch Mon Feb 13 14:58:57 2023 From: stefan at agner.ch (Stefan Agner) Date: Mon, 13 Feb 2023 15:58:57 +0100 Subject: [Buildroot] [PATCH v2] package/dbus-broker: bump to release 33 Message-ID: <29cebb7af48c3652e440c61cc90fafa4fe3f8046.1676300324.git.stefan@agner.ch> This release contains mostly a bugfixes, with some improvements around error handling for unimplemented functionality and resiliency against runtime changes of dbus service-files. Signed-off-by: Stefan Agner --- package/dbus-broker/dbus-broker.hash | 6 +++--- package/dbus-broker/dbus-broker.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash index f6c2cbe160..06c8f229b7 100644 --- a/package/dbus-broker/dbus-broker.hash +++ b/package/dbus-broker/dbus-broker.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md @@ -11,7 +11,7 @@ sha256 23f24eeaaded5fedd6e7840b6f7b73838f9a4e2112ad6a12fe1ef958f73d0214 subpro sha256 05113a24aca4c537819dd0d91b95b13edb85bea4b6a77a6d9269becb397ed374 subprojects/libcrbtree-3/README.md sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md -sha256 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 subprojects/libcstdaux-1/AUTHORS -sha256 7c4b6c325b0bc02150089112f65132ee999b0f44500b73d1fc06d96c93161037 subprojects/libcstdaux-1/README.md +sha256 e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 subprojects/libcstdaux-1/AUTHORS +sha256 92006886d7f28894fef08bf97e35ef52147067bd3c4d4d6381da7c59f9901dae subprojects/libcstdaux-1/README.md sha256 7e660796fea0400a1a9a539226c345b3c656a745a334e323e33258de7864e985 subprojects/libcutf8-1/AUTHORS sha256 106099cc1c488cbf8911f56da7977a955f6b27a7bb5b815985e59d9fae0e6fe7 subprojects/libcutf8-1/README.md diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index e82b79220d..c4e3679a2e 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_BROKER_VERSION = 32 +DBUS_BROKER_VERSION = 33 DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) -- 2.39.1 From buildroot at heine.tech Mon Feb 13 15:10:39 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 13 Feb 2023 16:10:39 +0100 Subject: [Buildroot] [PATCH] package/networkd-dispatcher: bump to version 2.2.4 Message-ID: <20230213151039.4073397-1-buildroot@heine.tech> Signed-off-by: Michael Nosthoff --- package/networkd-dispatcher/networkd-dispatcher.hash | 2 +- package/networkd-dispatcher/networkd-dispatcher.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash index ffb4fa846a..f50dd75163 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.hash +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 61270b4c2f39c36da4b0a62724a3cc01f6732493fed0f166ee675bafedff11df networkd-dispatcher-2.2.3.tar.bz2 +sha256 993086fa2dab11ba6b54a121adaccbd4c679ce3c8b3193cfa5c00500c28cbdf9 networkd-dispatcher-2.2.4.tar.bz2 sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk index 2b1aa257ce..a3e0319c10 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.mk +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETWORKD_DISPATCHER_VERSION = 2.2.3 +NETWORKD_DISPATCHER_VERSION = 2.2.4 NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) NETWORKD_DISPATCHER_LICENSE = GPL-3.0 -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 13 18:11:20 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 13 Feb 2023 19:11:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: compress-offload needs kernel >= 5.7 Message-ID: <20230213181120.907459-1-fontaine.fabrice@gmail.com> SND_AUDIOCODEC_A{LAC,PE} are only available since kernel 5.7 and https://github.com/torvalds/linux/commit/0f546d6f0292fb624b4cf0cc70096ddb9ea070e6 resulting in the following build failure since bump to version 0.3.65 in commit 247e2d0eb1e60f483044d58bed58c5ed321528f7 and https://git.buildroot.net/buildroot/commit/?id=247e2d0eb1e60f483044d58bed58c5ed321528f7: ../spa/plugins/alsa/alsa-compress-offload-sink.c:183:11: error: 'SND_AUDIOCODEC_ALAC' undeclared here (not in a function); did you mean 'SND_AUDIOCODEC_AAC'? 183 | { SND_AUDIOCODEC_ALAC, }, | ^~~~~~~~~~~~~~~~~~~ | SND_AUDIOCODEC_AAC Moreover, flac_d is also only available since kernel 5.5 and https://github.com/torvalds/linux/commit/d2522335c92c090bf58531a2b696d7fe80ab2a7a Fixes: - http://autobuild.buildroot.org/results/9ecd9aca5edc3756154da59573157954f06e6537 Signed-off-by: Fabrice Fontaine --- package/pipewire/Config.in | 12 ++++++++++++ package/pipewire/pipewire.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/pipewire/Config.in b/package/pipewire/Config.in index f038291e87..4929e5d3d1 100644 --- a/package/pipewire/Config.in +++ b/package/pipewire/Config.in @@ -15,6 +15,18 @@ config BR2_PACKAGE_PIPEWIRE if BR2_PACKAGE_PIPEWIRE +config BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD + bool "pipewire Compress-Offload" + depends on !BR2_STATIC_LIBS # tinycompress + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + select BR2_PACKAGE_TINYCOMPRESS + help + Enable ALSA Compress-Offload support + +comment "pipewire Compress-Offload needs a toolchain w/ dynamic library, headers >= 5.7" + depends on BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + config BR2_PACKAGE_PIPEWIRE_EXAMPLES bool "pipewire examples" help diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 976d7783b9..ecf4a035ec 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -215,7 +215,7 @@ else PIPEWIRE_CONF_OPTS += -Dsdl2=disabled endif -ifeq ($(BR2_PACKAGE_TINYCOMPRESS),y) +ifeq ($(BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD),y) PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled PIPEWIRE_DEPENDENCIES += tinycompress else -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 13 18:12:17 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 13 Feb 2023 19:12:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix legal info Message-ID: <20230213181217.908103-1-fontaine.fabrice@gmail.com> Commit 57e297a215193c92f6a178139db53616f2ee23b5 forgot to update hash of COPYRIGHT file (year updated with https://github.com/postgres/postgres/commit/1fbcb1360bc19b89369209203ea7cc19b8cde224) Fixes: - http://autobuild.buildroot.org/results/93f40dc71619745ddc6741598c9a488c81ea440f Signed-off-by: Fabrice Fontaine --- package/postgresql/postgresql.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index e6a9bd6658..3e89d3ec35 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ # From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated -sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT +sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 13 18:13:32 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 13 Feb 2023 19:13:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/apr-util: security bump to version 1.6.3 Message-ID: <20230213181332.908961-1-fontaine.fabrice@gmail.com> *) SECURITY: CVE-2022-25147 (cve.mitre.org) Integer Overflow or Wraparound vulnerability in apr_base64 functions of Apache Portable Runtime Utility (APR-util) allows an attacker to write beyond bounds of a buffer. https://downloads.apache.org/apr/Announcement-aprutil-1.x.html https://downloads.apache.org/apr/CHANGES-APR-UTIL-1.6 Signed-off-by: Fabrice Fontaine --- package/apr-util/apr-util.hash | 4 ++-- package/apr-util/apr-util.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apr-util/apr-util.hash b/package/apr-util/apr-util.hash index 59ef590109..7e2793cd77 100644 --- a/package/apr-util/apr-util.hash +++ b/package/apr-util/apr-util.hash @@ -1,4 +1,4 @@ -# From http://www.apache.org/dist/apr/apr-util-1.6.1.tar.bz2.sha256 -sha256 d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b apr-util-1.6.1.tar.bz2 +# From http://www.apache.org/dist/apr/apr-util-1.6.3.tar.bz2.sha256 +sha256 a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5 apr-util-1.6.3.tar.bz2 # Locally calculated sha256 ef5609d18601645ad6fe22c6c122094be40e976725c1d0490778abacc836e7a2 LICENSE diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index fb0735f5e7..02b6d5e277 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -4,7 +4,7 @@ # ################################################################################ -APR_UTIL_VERSION = 1.6.1 +APR_UTIL_VERSION = 1.6.3 APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2 APR_UTIL_SITE = https://archive.apache.org/dist/apr APR_UTIL_LICENSE = Apache-2.0 -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 13 18:15:23 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 13 Feb 2023 19:15:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: bump to version 6.2.7 Message-ID: <20230213181523.910359-1-fontaine.fabrice@gmail.com> - host-pkgconf is now mandatory - switch to pcre2 which is supported since version 6.0.0 and https://github.com/zabbix/zabbix/commit/18917f919a68abc863a5c79ba88c0cb156255fdc - Update hash of README (links updated with https://github.com/zabbix/zabbix/commit/067f5f873fb18ae7b22c5eaef40f0898b98edeb5 https://github.com/zabbix/zabbix/commit/499dbc81b987513233d579610335b8938f1ae91d) https://github.com/zabbix/zabbix/blob/6.2.7/ChangeLog Signed-off-by: Fabrice Fontaine --- package/zabbix/Config.in | 2 +- package/zabbix/zabbix.hash | 4 ++-- package/zabbix/zabbix.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index 0f7a0b0003..377c0ff692 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ZABBIX bool "zabbix" depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Zabbix is an enterprise-class open source distributed monitoring solution. Zabbix is free of cost. Zabbix is diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash index 42cc0bda57..bb6127e5ec 100644 --- a/package/zabbix/zabbix.hash +++ b/package/zabbix/zabbix.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 19686628df76e8d5ef7c2ed2975b258c7ca3ec7d151b1bb59d7e132f9fc7c941 zabbix-5.4.9.tar.gz -sha256 10d68ec3abacc29222c07748fc5e5cb9474fd7cd9ccdde1b92ff941ded946b78 README +sha256 6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d zabbix-6.2.7.tar.gz +sha256 f8fc3fd12521b60d53d8c5d48a883eb3c9c5ddec9de986a273e1b77f69d811db README sha256 444fe54aecc95ac0f3314289c300afc73b3946a4dc9fbd7e022709b3e0924dd0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e00d693ba5..db9efed78b 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -4,8 +4,8 @@ # ################################################################################ -ZABBIX_VERSION_MAJOR = 5.4 -ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 +ZABBIX_VERSION_MAJOR = 6.2 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).7 ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING @@ -13,9 +13,8 @@ ZABBIX_CPE_ID_VENDOR = zabbix # We're patching m4/netsnmp.m4 ZABBIX_AUTORECONF = YES -ZABBIX_DEPENDENCIES = pcre +ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ - --with-libpcre=$(STAGING_DIR)/usr/bin/ \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \ -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 13 18:17:54 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 13 Feb 2023 19:17:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/open-iscsi: fix libressl build Message-ID: <20230213181754.913323-1-fontaine.fabrice@gmail.com> Fix the following libressl build failure raised since the addition of the package in commit 2a571acddd0badaf9636649d98fd095757878348: /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' Fixes: - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 Signed-off-by: Fabrice Fontaine --- ...01-SHA3-is-not-supported-by-libressl.patch | 144 ++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch diff --git a/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch new file mode 100644 index 0000000000..0423179d93 --- /dev/null +++ b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch @@ -0,0 +1,144 @@ +From 29a4c3a518d13bfc0a07915e7e87fbec2b66597c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 13 Feb 2023 08:55:11 +0100 +Subject: [PATCH] SHA3 is not supported by libressl + +Disable SHA3 with libressl as it is not supported resulting in the +following build failure: + +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': +auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' + +Fixes: + - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/open-iscsi/open-iscsi/pull/396] +--- + libopeniscsiusr/idbm.h | 2 ++ + usr/auth.c | 13 ++++++++++++- + usr/auth.h | 4 ++++ + usr/idbm.c | 2 ++ + 4 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h +index be5986f..1043b27 100644 +--- a/libopeniscsiusr/idbm.h ++++ b/libopeniscsiusr/idbm.h +@@ -56,7 +56,9 @@ enum iscsi_chap_algs { + ISCSI_AUTH_CHAP_ALG_MD5 = 5, + ISCSI_AUTH_CHAP_ALG_SHA1 = 6, + ISCSI_AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + ISCSI_AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5, + }; + +diff --git a/usr/auth.c b/usr/auth.c +index 46c328e..5f50e26 100644 +--- a/usr/auth.c ++++ b/usr/auth.c +@@ -181,9 +181,11 @@ static int auth_hash_init(EVP_MD_CTX **context, int chap_alg) { + case AUTH_CHAP_ALG_SHA256: + digest = EVP_sha256(); + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + digest = EVP_sha3_256(); + break; ++#endif + } + + if (*context == NULL) +@@ -298,7 +300,9 @@ static int + acl_chk_chap_alg_optn(int chap_algorithm) + { + if (chap_algorithm == AUTH_OPTION_NONE || ++#ifndef LIBRESSL_VERSION_NUMBER + chap_algorithm == AUTH_CHAP_ALG_SHA3_256 || ++#endif + chap_algorithm == AUTH_CHAP_ALG_SHA256 || + chap_algorithm == AUTH_CHAP_ALG_SHA1 || + chap_algorithm == AUTH_CHAP_ALG_MD5) +@@ -711,9 +715,11 @@ acl_chk_chap_alg_key(struct iscsi_acl *client) + case AUTH_CHAP_ALG_SHA256: + client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN; + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN; + break; ++#endif + } + return; + } +@@ -862,7 +868,10 @@ acl_local_auth(struct iscsi_acl *client) + client->local_state = AUTH_LOCAL_STATE_ERROR; + client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT; + break; +- } else if ((client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++ } else if ( ++#ifndef LIBRESSL_VERSION_NUMBER ++ (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++#endif + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) { +@@ -1824,6 +1833,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA256 due to crypto lib configuration"); + } + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) { + value_list[i++] = AUTH_CHAP_ALG_SHA3_256; +@@ -1832,6 +1842,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA3-256 due to crypto lib configuration"); + } + break; ++#endif + case ~0: + /* unset value in array, just ignore */ + break; +diff --git a/usr/auth.h b/usr/auth.h +index 16cdb24..9357772 100644 +--- a/usr/auth.h ++++ b/usr/auth.h +@@ -32,7 +32,9 @@ enum { + AUTH_CHAP_MD5_RSP_LEN = 16, + AUTH_CHAP_SHA1_RSP_LEN = 20, + AUTH_CHAP_SHA256_RSP_LEN = 32, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_SHA3_256_RSP_LEN = 32, ++#endif + AUTH_CHAP_RSP_MAX = 32, + }; + +@@ -67,7 +69,9 @@ enum { + AUTH_CHAP_ALG_MD5 = 5, + AUTH_CHAP_ALG_SHA1 = 6, + AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5 + }; + +diff --git a/usr/idbm.c b/usr/idbm.c +index 90bc142..082e1c6 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -200,7 +200,9 @@ static struct int_list_tbl { + { "MD5", AUTH_CHAP_ALG_MD5 }, + { "SHA1", AUTH_CHAP_ALG_SHA1 }, + { "SHA256", AUTH_CHAP_ALG_SHA256 }, ++#ifndef LIBRESSL_VERSION_NUMBER + { "SHA3-256", AUTH_CHAP_ALG_SHA3_256 }, ++#endif + }; + + static void +-- +2.39.0 + -- 2.39.0 From heiko.thiery at gmail.com Mon Feb 13 18:19:43 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 13 Feb 2023 19:19:43 +0100 Subject: [Buildroot] [PATCH 1/4] package/libyang: bump version to 2.1.30 Message-ID: <20230213181944.10292-1-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- package/libyang/libyang.hash | 2 +- package/libyang/libyang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index da8600351b..26a28d6eed 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f30ee1c3e13f0c5d25c4d2fb628e4b262b483d0a500464a7c12008ccc393a69e libyang-2.1.4.tar.gz +sha256 761cfd959342b147f6a43a84c931c7fde68dd3a1ad540a0e5302288b204f073d libyang-2.1.30.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 6c57a2dd42..f160035c09 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.1.4 +LIBYANG_VERSION = 2.1.30 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE -- 2.20.1 From heiko.thiery at gmail.com Mon Feb 13 18:19:45 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 13 Feb 2023 19:19:45 +0100 Subject: [Buildroot] [PATCH 2/4] package/libnetconf2: bump version to 2.1.28 In-Reply-To: <20230213181944.10292-1-heiko.thiery@gmail.com> References: <20230213181944.10292-1-heiko.thiery@gmail.com> Message-ID: <20230213181944.10292-2-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- package/libnetconf2/libnetconf2.hash | 2 +- package/libnetconf2/libnetconf2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 34e934089e..675c76a500 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2f1a6559e8e43ea18ea337ab5f194f8443695c7ab4dde5d7b2560603f9bf702a libnetconf2-2.1.25.tar.gz +sha256 72e9a6461fadbd22f0cf0d23ba68d62b297c8f564f7f2bee069748fb67fc3a24 libnetconf2-2.1.28.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 0d4294d8d3..e349c1bce4 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 2.1.25 +LIBNETCONF2_VERSION = 2.1.28 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause -- 2.20.1 From heiko.thiery at gmail.com Mon Feb 13 18:19:47 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 13 Feb 2023 19:19:47 +0100 Subject: [Buildroot] [PATCH 3/4] package/sysrepo: bump version to 2.2.36 In-Reply-To: <20230213181944.10292-1-heiko.thiery@gmail.com> References: <20230213181944.10292-1-heiko.thiery@gmail.com> Message-ID: <20230213181944.10292-3-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- package/sysrepo/sysrepo.hash | 2 +- package/sysrepo/sysrepo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index a90d8259bf..6a5e98f41b 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1bc866f13e41ba5e7e4acd52b5c3d42b1a2a1e032775e0a9b094f3265844cd25 sysrepo-2.2.12.tar.gz +sha256 bebb7901682eb23bf4c73d086d0a45c124ec751a67793a66024f1d4203425730 sysrepo-2.2.36.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 9da8c22ca2..6b031ae6f9 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.2.12 +SYSREPO_VERSION = 2.2.36 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause -- 2.20.1 From heiko.thiery at gmail.com Mon Feb 13 18:19:49 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 13 Feb 2023 19:19:49 +0100 Subject: [Buildroot] [PATCH 4/4] package/netopeer2: bump version to 2.1.49 In-Reply-To: <20230213181944.10292-1-heiko.thiery@gmail.com> References: <20230213181944.10292-1-heiko.thiery@gmail.com> Message-ID: <20230213181944.10292-4-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- package/netopeer2/netopeer2.hash | 2 +- package/netopeer2/netopeer2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index cc71a2dab8..6a278fbbaf 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b166fe3425bb55b5f330fb7f53158f613bffc07493925ac437193e4d2defb3e7 netopeer2-2.1.42.tar.gz +sha256 2b1daac037f18c303e0c0dc3318ba30196459472e4c59f2f8547ee74d4cdf31d netopeer2-2.1.49.tar.gz sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 7cb9202575..47fcd31acd 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETOPEER2_VERSION = 2.1.42 +NETOPEER2_VERSION = 2.1.49 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) NETOPEER2_DL_SUBDIR = netopeer2 NETOPEER2_LICENSE = BSD-3-Clause -- 2.20.1 From raphael.pavlidis at gmail.com Mon Feb 13 18:46:55 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Mon, 13 Feb 2023 19:46:55 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/sway: new package In-Reply-To: <87r0uwcjgp.fsf@dell.be.48ers.dk> References: <20221031124625.21172-1-raphael.pavlidis@gmail.com> <87h6vw5l2r.fsf@dell.be.48ers.dk> <7f57a607-bf3c-0250-ed23-c6fbf73961a3@gmail.com> <87r0uwcjgp.fsf@dell.be.48ers.dk> Message-ID: <13e96c75-2880-9631-0ae6-92be1e36c219@gmail.com> On 11.02.23 16:25, Peter Korsgaard wrote: >>>>>> "Raphael" == Raphael Pavlidis writes: > > > Hi Peter, > > On 08.02.23 14:43, Peter Korsgaard wrote: > > [--SNIP--] > >> How did you test this? Here wlroots with x11 support doesn't build > >> as we > >> don't have an Xwayland .pc file or binary in Buildroot. > >> > > I create a xwayland package, which build the xserver binary, but did > > not send the patch yet. (This will fix the problems with weston, too) > > Ok, thanks - Will you submit the xwayland package? > Yes, but I have to do some cleanups. Should I add you to CC then? From peter at korsgaard.com Mon Feb 13 19:26:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 20:26:18 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/sway: new package In-Reply-To: <13e96c75-2880-9631-0ae6-92be1e36c219@gmail.com> (Raphael Pavlidis's message of "Mon, 13 Feb 2023 19:46:55 +0100") References: <20221031124625.21172-1-raphael.pavlidis@gmail.com> <87h6vw5l2r.fsf@dell.be.48ers.dk> <7f57a607-bf3c-0250-ed23-c6fbf73961a3@gmail.com> <87r0uwcjgp.fsf@dell.be.48ers.dk> <13e96c75-2880-9631-0ae6-92be1e36c219@gmail.com> Message-ID: <87pmad9xk5.fsf@dell.be.48ers.dk> >>>>> "Raphael" == Raphael Pavlidis writes: > On 11.02.23 16:25, Peter Korsgaard wrote: >>>>>>> "Raphael" == Raphael Pavlidis writes: >> > Hi Peter, >> > On 08.02.23 14:43, Peter Korsgaard wrote: >> > [--SNIP--] >> >> How did you test this? Here wlroots with x11 support doesn't build >> >> as we >> >> don't have an Xwayland .pc file or binary in Buildroot. >> >> >> > I create a xwayland package, which build the xserver binary, but did >> > not send the patch yet. (This will fix the problems with weston, too) >> Ok, thanks - Will you submit the xwayland package? >> > Yes, but I have to do some cleanups. Should I add you to CC then? Ok, please do. -- Bye, Peter Korsgaard From bernd.kuhls at t-online.de Mon Feb 13 19:31:34 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 13 Feb 2023 20:31:34 +0100 Subject: [Buildroot] [PATCH 1/3] package/kodi: fix armv5 build References: <20230117200821.2882597-1-bernd.kuhls@t-online.de> <87y1p1a9zk.fsf__32646.9581386604$1676300302$gmane$org@dell.be.48ers.dk> Message-ID: Am Mon, 13 Feb 2023 15:57:51 +0100 schrieb Peter Korsgaard: > Hi, are these fixed caused by new changes in kodi 19.5, or is 2022.02.x > / 2022.11.x also affected? Hi, afaics Kodi enables NEON for all arm CPUs since version 17.0: https://github.com/xbmc/xbmc/commit/ 262ebc90ee36054e7eac1baeda7ccbae9995f606#diff-17055ed9d2412a650b2178dd19d3a7ba28bf725b7a2babe2a78ef5037a02b6a9R18 Regards, Bernd From yann.morin.1998 at free.fr Mon Feb 13 20:06:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 13 Feb 2023 21:06:04 +0100 Subject: [Buildroot] [PATCH] package/flannel: use the github helper Message-ID: <20230213200604.2539630-1-yann.morin.1998@free.fr> Currently, flannel uses an ad-hoc github URL and a version-only tarball name, even though we already had the github helper (introduced in 2013) when flannel was introduced (in 2016). Switch to the github helper, which allows us to get a properly named tarball. Signed-off-by: Yann E. MORIN Cc: Geoff Levand --- package/flannel/flannel.hash | 2 +- package/flannel/flannel.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash index 6a0223a20f..bafc453097 100644 --- a/package/flannel/flannel.hash +++ b/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca v0.14.0.tar.gz +sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca flannel-0.14.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index 231cf90dfd..b4e2b2f777 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -5,8 +5,7 @@ ################################################################################ FLANNEL_VERSION = 0.14.0 -FLANNEL_SITE = https://github.com/flannel-io/flannel/archive -FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz +FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) FLANNEL_LICENSE = Apache-2.0 FLANNEL_LICENSE_FILES = LICENSE -- 2.25.1 From romain.naour at smile.fr Mon Feb 13 20:22:17 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 13 Feb 2023 21:22:17 +0100 Subject: [Buildroot] [PATCH 1/1] configs/qemu: update defconfigs to Linux 6.1.11 In-Reply-To: <20230210131729.2577271-1-sebastian.weyer@smile.fr> References: <20230210131729.2577271-1-sebastian.weyer@smile.fr> Message-ID: <75ea1829-e9a5-002d-45b5-ca5d7f3d0f6e@smile.fr> Hello Sebastian, Le 10/02/2023 ? 14:17, Sebastian Weyer a ?crit?: > Just updating all qemu defconfigs to the latest Kernel version: > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=v6.1.11&dt=2 You said you only tested only on qemu aarch64-virt. But without a gitlab-ci access it's really time consuming to do a test for each of them. I tried to a quick test by switching to external toolchain instead https://gitlab.com/kubu93/buildroot/-/pipelines/776319124 No issue reported so far. > > Signed-off-by: Sebastian Weyer > --- > configs/qemu_aarch64_ebbr_defconfig | 4 ++-- > configs/qemu_aarch64_sbsa_defconfig | 4 ++-- > configs/qemu_aarch64_virt_defconfig | 4 ++-- > configs/qemu_arm_ebbr_defconfig | 4 ++-- > configs/qemu_arm_versatile_defconfig | 4 ++-- > configs/qemu_arm_vexpress_defconfig | 4 ++-- > configs/qemu_arm_vexpress_tz_defconfig | 4 ++-- > configs/qemu_m68k_mcf5208_defconfig | 4 ++-- > configs/qemu_m68k_q800_defconfig | 4 ++-- > configs/qemu_microblazebe_mmu_defconfig | 4 ++-- > configs/qemu_microblazeel_mmu_defconfig | 4 ++-- > configs/qemu_mips32r2_malta_defconfig | 4 ++-- > configs/qemu_mips32r2el_malta_defconfig | 4 ++-- > configs/qemu_mips32r6_malta_defconfig | 4 ++-- > configs/qemu_mips32r6el_malta_defconfig | 4 ++-- > configs/qemu_mips64_malta_defconfig | 4 ++-- > configs/qemu_mips64el_malta_defconfig | 4 ++-- > configs/qemu_mips64r6_malta_defconfig | 4 ++-- > configs/qemu_mips64r6el_malta_defconfig | 4 ++-- > configs/qemu_nios2_10m50_defconfig | 4 ++-- > configs/qemu_or1k_defconfig | 4 ++-- > configs/qemu_ppc64_e5500_defconfig | 4 ++-- > configs/qemu_ppc64_pseries_defconfig | 4 ++-- > configs/qemu_ppc64le_powernv8_defconfig | 4 ++-- > configs/qemu_ppc64le_pseries_defconfig | 4 ++-- > configs/qemu_ppc_bamboo_defconfig | 4 ++-- > configs/qemu_ppc_e500mc_defconfig | 4 ++-- > configs/qemu_ppc_g3beige_defconfig | 4 ++-- > configs/qemu_ppc_mac99_defconfig | 4 ++-- > configs/qemu_ppc_mpc8544ds_defconfig | 4 ++-- > configs/qemu_riscv32_virt_defconfig | 4 ++-- > configs/qemu_riscv64_nommu_virt_defconfig | 4 ++-- > configs/qemu_riscv64_virt_defconfig | 4 ++-- > configs/qemu_s390x_defconfig | 2 +- > configs/qemu_sh4_r2d_defconfig | 4 ++-- > configs/qemu_sh4eb_r2d_defconfig | 4 ++-- > configs/qemu_sparc64_sun4u_defconfig | 4 ++-- > configs/qemu_sparc_ss10_defconfig | 4 ++-- > configs/qemu_x86_64_defconfig | 4 ++-- > configs/qemu_x86_defconfig | 4 ++-- > configs/qemu_xtensa_lx60_defconfig | 4 ++-- > configs/qemu_xtensa_lx60_nommu_defconfig | 4 ++-- > 42 files changed, 83 insertions(+), 83 deletions(-) > > diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig > index d293ad0e60..78bab2a933 100644 > --- a/configs/qemu_aarch64_ebbr_defconfig > +++ b/configs/qemu_aarch64_ebbr_defconfig > @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" > > # Linux headers > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig > index 609444e787..9e36b40867 100644 > --- a/configs/qemu_aarch64_sbsa_defconfig > +++ b/configs/qemu_aarch64_sbsa_defconfig > @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-sbsa/a > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-sbsa/genimage.cfg" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig > index 03df0ad9e2..9bdf79c4f5 100644 > --- a/configs/qemu_aarch64_virt_defconfig > +++ b/configs/qemu_aarch64_virt_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > 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 > diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig > index f3e2d42a54..53e2d5d1d7 100644 > --- a/configs/qemu_arm_ebbr_defconfig > +++ b/configs/qemu_arm_ebbr_defconfig > @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" > > # Linux headers > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.9" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" > > diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig > index 4f43273a82..e61665a95e 100644 > --- a/configs/qemu_arm_versatile_defconfig > +++ b/configs/qemu_arm_versatile_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="versatile" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig > index 2c813456f4..b963862e2b 100644 > --- a/configs/qemu_arm_vexpress_defconfig > +++ b/configs/qemu_arm_vexpress_defconfig > @@ -20,12 +20,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > BR2_TARGET_ROOTFS_EXT2_SIZE="64M" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="vexpress" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" > diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig > index 576c441154..01dce8f4ca 100644 > --- a/configs/qemu_arm_vexpress_tz_defconfig > +++ b/configs/qemu_arm_vexpress_tz_defconfig > @@ -17,12 +17,12 @@ BR2_TARGET_ROOTFS_CPIO_UIMAGE=y > # BR2_TARGET_ROOTFS_TAR is not set > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="vexpress" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" > > diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig > index 0490b9e29e..e30bc13ab7 100644 > --- a/configs/qemu_m68k_mcf5208_defconfig > +++ b/configs/qemu_m68k_mcf5208_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig > index 30d8982db3..e089ff7864 100644 > --- a/configs/qemu_m68k_q800_defconfig > +++ b/configs/qemu_m68k_q800_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig > index 7bd2ae53b8..f4b53f7556 100644 > --- a/configs/qemu_microblazebe_mmu_defconfig > +++ b/configs/qemu_microblazebe_mmu_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" > BR2_LINUX_KERNEL_LINUX_BIN=y > diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig > index cd8c5a3cb2..8436a8b6f9 100644 > --- a/configs/qemu_microblazeel_mmu_defconfig > +++ b/configs/qemu_microblazeel_mmu_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" > BR2_LINUX_KERNEL_LINUX_BIN=y > diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig > index 49d84c308b..f22f1d168a 100644 > --- a/configs/qemu_mips32r2_malta_defconfig > +++ b/configs/qemu_mips32r2_malta_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig > index 5363018c47..5b5d5fe44f 100644 > --- a/configs/qemu_mips32r2el_malta_defconfig > +++ b/configs/qemu_mips32r2el_malta_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig > index f77feb9b6d..e8457ab246 100644 > --- a/configs/qemu_mips32r6_malta_defconfig > +++ b/configs/qemu_mips32r6_malta_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig > index 575034441a..ad5003c25f 100644 > --- a/configs/qemu_mips32r6el_malta_defconfig > +++ b/configs/qemu_mips32r6el_malta_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig > index e9438fda1e..c201b9da28 100644 > --- a/configs/qemu_mips64_malta_defconfig > +++ b/configs/qemu_mips64_malta_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig > index 4b1c8e22af..f34d8a55b9 100644 > --- a/configs/qemu_mips64el_malta_defconfig > +++ b/configs/qemu_mips64el_malta_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig > index 87ef7902af..500c69b7fb 100644 > --- a/configs/qemu_mips64r6_malta_defconfig > +++ b/configs/qemu_mips64r6_malta_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig > index 5774207f65..1b0a14b6bf 100644 > --- a/configs/qemu_mips64r6el_malta_defconfig > +++ b/configs/qemu_mips64r6el_malta_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig > index 4b9c53e8de..f88e88f108 100644 > --- a/configs/qemu_nios2_10m50_defconfig > +++ b/configs/qemu_nios2_10m50_defconfig > @@ -1,7 +1,7 @@ > BR2_nios2=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="10m50" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" > BR2_TARGET_ROOTFS_INITRAMFS=y > @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel needs mkimage > BR2_PACKAGE_HOST_UBOOT_TOOLS=y > diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig > index b3d9d79156..9faf0d174f 100644 > --- a/configs/qemu_or1k_defconfig > +++ b/configs/qemu_or1k_defconfig > @@ -10,12 +10,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" > > diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig > index 6ad03c4c87..6ca1321751 100644 > --- a/configs/qemu_ppc64_e5500_defconfig > +++ b/configs/qemu_ppc64_e5500_defconfig > @@ -12,12 +12,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as the kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig > index 50844dc93b..a059631adf 100644 > --- a/configs/qemu_ppc64_pseries_defconfig > +++ b/configs/qemu_ppc64_pseries_defconfig > @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="pseries" > BR2_LINUX_KERNEL_VMLINUX=y > > diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig > index f6a5c3d409..c380fe5205 100644 > --- a/configs/qemu_ppc64le_powernv8_defconfig > +++ b/configs/qemu_ppc64le_powernv8_defconfig > @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="powernv" > BR2_LINUX_KERNEL_VMLINUX=y > > diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig > index 7ce5a9d310..c3e14958ae 100644 > --- a/configs/qemu_ppc64le_pseries_defconfig > +++ b/configs/qemu_ppc64le_pseries_defconfig > @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" > BR2_LINUX_KERNEL_VMLINUX=y > > diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig > index f4cc5589e7..6d26cf5105 100644 > --- a/configs/qemu_ppc_bamboo_defconfig > +++ b/configs/qemu_ppc_bamboo_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig > index 0a1877c44b..e0f886dda4 100644 > --- a/configs/qemu_ppc_e500mc_defconfig > +++ b/configs/qemu_ppc_e500mc_defconfig > @@ -11,12 +11,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as the kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig > index 1c11bcf77d..62e20e8120 100644 > --- a/configs/qemu_ppc_g3beige_defconfig > +++ b/configs/qemu_ppc_g3beige_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig > index 2331041c2a..0e8bd6a0c6 100644 > --- a/configs/qemu_ppc_mac99_defconfig > +++ b/configs/qemu_ppc_mac99_defconfig > @@ -6,12 +6,12 @@ BR2_powerpc_7400=y > BR2_SYSTEM_DHCP="eth0" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="pmac32" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig > index b9a0812d52..b54e7b7d81 100644 > --- a/configs/qemu_ppc_mpc8544ds_defconfig > +++ b/configs/qemu_ppc_mpc8544ds_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig > index f354e303e5..1a12ed6a65 100644 > --- a/configs/qemu_riscv32_virt_defconfig > +++ b/configs/qemu_riscv32_virt_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.43" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="rv32" > BR2_LINUX_KERNEL_IMAGE=y > > diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig > index ee70beb208..2894f1f78a 100644 > --- a/configs/qemu_riscv64_nommu_virt_defconfig > +++ b/configs/qemu_riscv64_nommu_virt_defconfig > @@ -4,7 +4,7 @@ BR2_RISCV_64=y > # BR2_RISCV_USE_MMU is not set > > # Linux headers same as kernel, a 5.19 series To ease updates, such comment has been removed in other defconfigs. > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Busybox with hush > BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" > @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="nommu_virt" > BR2_LINUX_KERNEL_IMAGE=y > > diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig > index b3174a152c..d6ab8a33c1 100644 > --- a/configs/qemu_riscv64_virt_defconfig > +++ b/configs/qemu_riscv64_virt_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.43" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_IMAGE=y > > diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig > index 6bbcca0896..cd160d9cf0 100644 > --- a/configs/qemu_s390x_defconfig > +++ b/configs/qemu_s390x_defconfig > @@ -17,7 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig > index 0f12b7dfe9..c300490c55 100644 > --- a/configs/qemu_sh4_r2d_defconfig > +++ b/configs/qemu_sh4_r2d_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Linux kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" > BR2_LINUX_KERNEL_ZIMAGE=y > diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig > index d5ee371e79..9e61a6f234 100644 > --- a/configs/qemu_sh4eb_r2d_defconfig > +++ b/configs/qemu_sh4eb_r2d_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Linux kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" > BR2_LINUX_KERNEL_ZIMAGE=y > diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig > index 485b497e71..a19e146dfa 100644 > --- a/configs/qemu_sparc64_sun4u_defconfig > +++ b/configs/qemu_sparc64_sun4u_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Linux kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" > > diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig > index 2ba04c0864..ee2b0a799b 100644 > --- a/configs/qemu_sparc_ss10_defconfig > +++ b/configs/qemu_sparc_ss10_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Linux kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" > > diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig > index cc505a8540..3608178f30 100644 > --- a/configs/qemu_x86_64_defconfig > +++ b/configs/qemu_x86_64_defconfig > @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" > BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y > diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig > index 34b7e2d292..ac3ba1da12 100644 > --- a/configs/qemu_x86_defconfig > +++ b/configs/qemu_x86_defconfig > @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" > > diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig > index cb78106091..e0ec91d2ac 100644 > --- a/configs/qemu_xtensa_lx60_defconfig > +++ b/configs/qemu_xtensa_lx60_defconfig > @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" > BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y > diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig > index 4be1b66edc..59c383fc40 100644 > --- a/configs/qemu_xtensa_lx60_nommu_defconfig > +++ b/configs/qemu_xtensa_lx60_nommu_defconfig > @@ -20,12 +20,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" > BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y Reviewed-by: Romain Naour Best regards, Romain From thomas.petazzoni at bootlin.com Mon Feb 13 22:18:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 23:18:05 +0100 Subject: [Buildroot] [git commit] package/libjxl: new package Message-ID: <20230213221841.DB11385CD3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e648d399d8bd609697e78f13f7fa76be06d91a57 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libjxl is the reference implementation of JPEG XL (encoder and decoder). https://github.com/libjxl/libjxl Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/libjxl/Config.in | 25 +++++++++++++ package/libjxl/libjxl.hash | 4 +++ package/libjxl/libjxl.mk | 33 +++++++++++++++++ support/testing/tests/package/test_libjxl.py | 53 ++++++++++++++++++++++++++++ toolchain/Config.in | 5 +++ 7 files changed, 123 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 28cad8f58f..df2b98ad53 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1688,6 +1688,7 @@ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/gnupg2/ F: package/highway/ +F: package/libjxl/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1712,6 +1713,7 @@ F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py diff --git a/package/Config.in b/package/Config.in index d205bcd816..fff2fb7a93 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1603,6 +1603,7 @@ menu "Graphics" source "package/libgta/Config.in" source "package/libgtk2/Config.in" source "package/libgtk3/Config.in" + source "package/libjxl/Config.in" source "package/libmediaart/Config.in" source "package/libmng/Config.in" source "package/libpng/Config.in" diff --git a/package/libjxl/Config.in b/package/libjxl/Config.in new file mode 100644 index 0000000000..da04b89f9b --- /dev/null +++ b/package/libjxl/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_LIBJXL + bool "libjxl" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # highway + depends on BR2_TOOLCHAIN_HAS_ATOMIC # highway + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP # highway + # libjxl fail to link statically due to libatomic issue + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + select BR2_PACKAGE_BROTLI + select BR2_PACKAGE_HIGHWAY + select BR2_PACKAGE_LCMS2 + help + libjxl is the reference implementation of JPEG XL (encoder + and decoder). + + https://github.com/libjxl/libjxl + +comment "libjxl needs a toolchain with C++, threads, gcc >= 7, dynamic library" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash new file mode 100644 index 0000000000..e71d32e61d --- /dev/null +++ b/package/libjxl/libjxl.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e libjxl-0.7.0.tar.gz +sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE +sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk new file mode 100644 index 0000000000..cc24ba258c --- /dev/null +++ b/package/libjxl/libjxl.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# libjxl +# +################################################################################ + +LIBJXL_VERSION = 0.7.0 +LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) +LIBJXL_LICENSE = BSD-3-Clause +LIBJXL_LICENSE_FILES = LICENSE PATENTS +LIBJXL_CPE_ID_VENDOR = libjxl_project +LIBJXL_INSTALL_STAGING = YES + +LIBJXL_DEPENDENCIES = \ + brotli \ + lcms2 \ + highway + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +LIBJXL_DEPENDENCIES += libpng +endif + +LIBJXL_CONF_OPTS = \ + -DJPEGXL_BUNDLE_LIBPNG=OFF \ + -DJPEGXL_BUNDLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_DOXYGEN=OFF \ + -DJPEGXL_ENABLE_JNI=OFF \ + -DJPEGXL_ENABLE_MANPAGES=OFF \ + -DJPEGXL_ENABLE_OPENEXR=OFF \ + -DJPEGXL_ENABLE_SJPEG=OFF \ + -DJPEGXL_ENABLE_SKCMS=OFF + +$(eval $(cmake-package)) diff --git a/support/testing/tests/package/test_libjxl.py b/support/testing/tests/package/test_libjxl.py new file mode 100644 index 0000000000..b6d5ffc9ce --- /dev/null +++ b/support/testing/tests/package/test_libjxl.py @@ -0,0 +1,53 @@ +import os + +import infra.basetest + + +class TestLibJXL(infra.basetest.BRTest): + # infra.basetest.BASIC_TOOLCHAIN_CONFIG is not used as it is armv5 + # and the image encoding would take too long (several minutes). + # We also add GraphicsMagick to generate and compare images for + # the test. + 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.79" + 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_GRAPHICSMAGICK=y + BR2_PACKAGE_LIBJXL=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", "256M", "-initrd", img]) + self.emulator.login() + + ref = "/var/tmp/reference.ppm" + jxl = "/var/tmp/encoded.jxl" + dec = "/var/tmp/decoded.ppm" + + cmd = "gm convert IMAGE:LOGO {}".format(ref) + self.assertRunOk(cmd) + + cmd = "cjxl {} {}".format(ref, jxl) + self.assertRunOk(cmd, timeout=30) + + cmd = "djxl {} {}".format(jxl, dec) + self.assertRunOk(cmd) + + cmd = "gm compare -metric mse -maximum-error 1e-3 {} {}".format( + ref, dec) + self.assertRunOk(cmd) diff --git a/toolchain/Config.in b/toolchain/Config.in index 01215e0e96..08e4ccad9e 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -141,6 +141,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_68485 bool default y if BR2_microblaze +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81426 +config BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + bool + default y if BR2_sh + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83143 # Error: invalid operands (*UND* and .text sections) for `-' on sh4. # This bug no longer exists in gcc 10.x but reappeared on gcc 11.x and From thomas.petazzoni at bootlin.com Mon Feb 13 22:18:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 23:18:03 +0100 Subject: [Buildroot] [git commit] package/highway: new package Message-ID: <20230213221841.CE86A85CD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4733f9bd5774171b8309e5c42e0419a0e8264308 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Highway is a C++ library that provides portable SIMD/vector intrinsics. https://github.com/google/highway Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + package/Config.in | 1 + ...0001-Check-for-the-presence-of-sys-auxv.h.patch | 62 ++++++++++++++++++++++ package/highway/Config.in | 34 ++++++++++++ package/highway/highway.hash | 3 ++ package/highway/highway.mk | 50 +++++++++++++++++ support/testing/tests/package/test_highway.py | 22 ++++++++ 7 files changed, 174 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index dcc607ba60..28cad8f58f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1687,6 +1687,7 @@ F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/gnupg2/ +F: package/highway/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1709,6 +1710,7 @@ F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_gnupg2.py +F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py diff --git a/package/Config.in b/package/Config.in index 511e691ed3..d205bcd816 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2034,6 +2034,7 @@ menu "Other" source "package/gsl/Config.in" source "package/gtest/Config.in" source "package/gumbo-parser/Config.in" + source "package/highway/Config.in" source "package/jemalloc/Config.in" source "package/lapack/Config.in" source "package/libabseil-cpp/Config.in" diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch new file mode 100644 index 0000000000..df86798613 --- /dev/null +++ b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch @@ -0,0 +1,62 @@ +From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Wed, 23 Nov 2022 23:27:11 +0100 +Subject: [PATCH] Check for the presence of + +Not all gcc versions are providing . Checking for +HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not +sufficient and fail to build in some situations (it was observed for +some gcc armv7m toolchains). + +This patch adds a check for and include it only if present. + +Signed-off-by: Julien Olivain +--- + CMakeLists.txt | 3 +++ + hwy/detect_targets.h | 2 +- + hwy/targets.cc | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b6b14ab..df6b5ab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,6 +84,9 @@ check_cxx_source_compiles( + HWY_RISCV + ) + ++include(CheckIncludeFile) ++check_include_file(sys/auxv.h HAVE_SYS_AUXV_H) ++ + if (HWY_ENABLE_CONTRIB) + # Glob all the traits so we don't need to modify this file when adding + # additional special cases. +diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h +index 7f7e179..f0c6f94 100644 +--- a/hwy/detect_targets.h ++++ b/hwy/detect_targets.h +@@ -392,7 +392,7 @@ + #define HWY_HAVE_RUNTIME_DISPATCH 1 + // On Arm, currently only GCC does, and we require Linux to detect CPU + // capabilities. +-#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX ++#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX && HAVE_SYS_AUXV_H + #define HWY_HAVE_RUNTIME_DISPATCH 1 + #else + #define HWY_HAVE_RUNTIME_DISPATCH 0 +diff --git a/hwy/targets.cc b/hwy/targets.cc +index 2fde4db..abd6a94 100644 +--- a/hwy/targets.cc ++++ b/hwy/targets.cc +@@ -42,7 +42,7 @@ + #include + #endif // HWY_COMPILER_MSVC + +-#elif HWY_ARCH_ARM && HWY_OS_LINUX ++#elif HWY_ARCH_ARM && HWY_OS_LINUX && HAVE_SYS_AUXV_H + #include + #include + #endif // HWY_ARCH_* +-- +2.38.1 + diff --git a/package/highway/Config.in b/package/highway/Config.in new file mode 100644 index 0000000000..f4cef30e01 --- /dev/null +++ b/package/highway/Config.in @@ -0,0 +1,34 @@ +config BR2_PACKAGE_HIGHWAY + bool "highway" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_INSTALL_LIBSTDCPP + # For gcc bug 58969, see: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58969 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++11, GCC_BUG_58969 + help + Highway is a C++ library that provides portable SIMD/vector + intrinsics. + + https://github.com/google/highway + +if BR2_PACKAGE_HIGHWAY + +config BR2_PACKAGE_HIGHWAY_CONTRIB + bool "Enable Contrib" + help + Build Highway contrib library which contains extra + SIMD-related utilities: an image class with aligned rows, a + math library (16 functions already implemented, mostly + trigonometry), and functions for computing dot products and + sorting. + +config BR2_PACKAGE_HIGHWAY_EXAMPLES + bool "Enable Examples" + help + Build Highway examples + +endif + +comment "highway needs a toolchain w/ C++, gcc >= 7" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/highway/highway.hash b/package/highway/highway.hash new file mode 100644 index 0000000000..3ff468443e --- /dev/null +++ b/package/highway/highway.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db highway-1.0.2.tar.gz +sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE diff --git a/package/highway/highway.mk b/package/highway/highway.mk new file mode 100644 index 0000000000..ed7f6ca871 --- /dev/null +++ b/package/highway/highway.mk @@ -0,0 +1,50 @@ +################################################################################ +# +# highway +# +################################################################################ + +HIGHWAY_VERSION = 1.0.2 +HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) +HIGHWAY_LICENSE = Apache-2.0 +HIGHWAY_LICENSE_FILES = LICENSE +HIGHWAY_INSTALL_STAGING = YES + +HIGHWAY_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_PACKAGE_HIGHWAY_CONTRIB),y) +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=ON +else +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=OFF +endif + +ifeq ($(BR2_PACKAGE_HIGHWAY_EXAMPLES),y) +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=ON +# Examples are not installed by cmake. This binary can be useful for +# quick testing and debug. +define HIGHWAY_INSTALL_EXAMPLES + $(INSTALL) -m 0755 \ + $(@D)/examples/hwy_benchmark \ + $(TARGET_DIR)/usr/bin/hwy_benchmark +endef +HIGHWAY_POST_INSTALL_TARGET_HOOKS += HIGHWAY_INSTALL_EXAMPLES +else +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=OFF +endif + +ifeq ($(BR2_ARM_FPU_VFPV4),y) +HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=ON +else +HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=OFF +endif + +# Workaround for gcc bug 104028 on m68k. +# See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104028 +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_104028),y) +HIGHWAY_CXXFLAGS += -O0 +endif + +HIGHWAY_CONF_OPTS += \ + -DCMAKE_CXX_FLAGS="$(HIGHWAY_CXXFLAGS)" + +$(eval $(cmake-package)) diff --git a/support/testing/tests/package/test_highway.py b/support/testing/tests/package/test_highway.py new file mode 100644 index 0000000000..f32363e26f --- /dev/null +++ b/support/testing/tests/package/test_highway.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestHighway(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_HIGHWAY=y + BR2_PACKAGE_HIGHWAY_EXAMPLES=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("hwy_benchmark", timeout=20) From thomas.petazzoni at bootlin.com Mon Feb 13 22:20:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 23:20:50 +0100 Subject: [Buildroot] [PATCH next v2 1/2] package/highway: new package In-Reply-To: <20221124220552.2836398-1-ju.o@free.fr> References: <20221124220552.2836398-1-ju.o@free.fr> Message-ID: <20230213232050.5fe67607@windsurf> On Thu, 24 Nov 2022 23:05:51 +0100 Julien Olivain wrote: > Highway is a C++ library that provides portable SIMD/vector intrinsics. > > https://github.com/google/highway > > Signed-off-by: Julien Olivain Thanks! I've applied, with some small changes, see below. > diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch > new file mode 100644 > index 0000000000..df86798613 > --- /dev/null > +++ b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch > @@ -0,0 +1,62 @@ > +From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001 > +From: Julien Olivain > +Date: Wed, 23 Nov 2022 23:27:11 +0100 > +Subject: [PATCH] Check for the presence of > + > +Not all gcc versions are providing . Checking for > +HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not > +sufficient and fail to build in some situations (it was observed for > +some gcc armv7m toolchains). > + > +This patch adds a check for and include it only if present. > + > +Signed-off-by: Julien Olivain Has this patch been submitted upstream? > diff --git a/package/highway/Config.in b/package/highway/Config.in > new file mode 100644 > index 0000000000..23861f0b94 > --- /dev/null > +++ b/package/highway/Config.in > @@ -0,0 +1,30 @@ > +config BR2_PACKAGE_HIGHWAY > + bool "highway" > + depends on BR2_TOOLCHAIN_HAS_ATOMIC > + depends on BR2_INSTALL_LIBSTDCPP > + # For gcc bug 58969, see: > + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58969 > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++11, GCC_BUG_58969 > + help > + Highway is a C++ library that provides portable SIMD/vector > + intrinsics. > + > + https://github.com/google/highway > + > +if BR2_PACKAGE_HIGHWAY > + > +config BR2_PACKAGE_HIGHWAY_CONTRIB > + bool "Enable Contrib" > + help > + Build Highway contrib library which contains extra > + SIMD-related utilities: an image class with aligned rows, a > + math library (16 functions already implemented, mostly > + trigonometry), and functions for computing dot products and > + sorting. > + > +config BR2_PACKAGE_HIGHWAY_EXAMPLES > + bool "Enable Examples" > + help > + Build Highway examples > + > +endif You forgot the Config.in comment matching the "depends on" of the main options: comment "highway needs a toolchain w/ C++, gcc >= 7" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 > +HIGHWAY_CXXFLAGS = $(TARGET_CXXFLAGS) > + > +ifeq ($(BR2_PACKAGE_HIGHWAY_CONTRIB),y) > +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=ON > +else > +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=OFF > +endif > + > +# Examples are not installed by cmake. This binary can be useful for > +# quick testing and debug. > +define HIGHWAY_INSTALL_EXAMPLES > + $(INSTALL) -m 0755 \ > + $(@D)/examples/hwy_benchmark \ > + $(TARGET_DIR)/usr/bin/hwy_benchmark > +endef I've moved this... > + > +ifeq ($(BR2_PACKAGE_HIGHWAY_EXAMPLES),y) > +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=ON ... here, as it is used only within this condition. Applied with those changes, 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 Mon Feb 13 22:22:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 23:22:35 +0100 Subject: [Buildroot] [PATCH next v2 2/2] package/libjxl: new package In-Reply-To: <20221124220552.2836398-2-ju.o@free.fr> References: <20221124220552.2836398-1-ju.o@free.fr> <20221124220552.2836398-2-ju.o@free.fr> Message-ID: <20230213232235.63bbc016@windsurf> Hello Julien, On Thu, 24 Nov 2022 23:05:52 +0100 Julien Olivain wrote: > libjxl is the reference implementation of JPEG XL (encoder and decoder). > > https://github.com/libjxl/libjxl > > Signed-off-by: Julien Olivain Thanks, I've applied with some small changes, see below. > diff --git a/package/libjxl/Config.in b/package/libjxl/Config.in > new file mode 100644 > index 0000000000..6a15bde107 > --- /dev/null > +++ b/package/libjxl/Config.in > @@ -0,0 +1,23 @@ > +config BR2_PACKAGE_LIBJXL > + bool "libjxl" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # highway > + depends on BR2_TOOLCHAIN_HAS_ATOMIC # highway > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_INSTALL_LIBSTDCPP # highway > + # libjxl fail to link statically due to libatomic issue > + depends on !BR2_STATIC_LIBS > + # GCC bug on sh4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81426 > + depends on !BR2_sh4 Changed to use a new BR2_TOOLCHAIN_HAS_GCC_BUG_81426 blind option. > + select BR2_PACKAGE_BROTLI > + select BR2_PACKAGE_HIGHWAY > + select BR2_PACKAGE_LCMS2 > + help > + libjxl is the reference implementation of JPEG XL (encoder > + and decoder). > + > + https://github.com/libjxl/libjxl > + > +comment "libjxl needs a toolchain with C++, threads, gcc >= 7" > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ > + !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_HAS_THREADS This was not complete: you have 6 "depends on" above, so 6 depends on should be handled here one way or another: comment "libjxl needs a toolchain with C++, threads, gcc >= 7, dynamic library" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS Applied with that change. Thanks a lot for the runtime tests, very useful as usual! Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From geoff at infradead.org Tue Feb 14 01:32:23 2023 From: geoff at infradead.org (Geoff Levand) Date: Mon, 13 Feb 2023 17:32:23 -0800 Subject: [Buildroot] [PATCH] package/flannel: use the github helper In-Reply-To: <20230213200604.2539630-1-yann.morin.1998@free.fr> References: <20230213200604.2539630-1-yann.morin.1998@free.fr> Message-ID: <22dce104-b4e5-6e61-7174-28ab0e11b679@infradead.org> On 2/13/23 12:06, Yann E. MORIN wrote: > Currently, flannel uses an ad-hoc github URL and a version-only tarball > name, even though we already had the github helper (introduced in 2013) > when flannel was introduced (in 2016). > > Switch to the github helper, which allows us to get a properly named > tarball. > > Signed-off-by: Yann E. MORIN > Cc: Geoff Levand > --- > package/flannel/flannel.hash | 2 +- > package/flannel/flannel.mk | 3 +-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash > index 6a0223a20f..bafc453097 100644 > --- a/package/flannel/flannel.hash > +++ b/package/flannel/flannel.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca v0.14.0.tar.gz > +sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca flannel-0.14.0.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk > index 231cf90dfd..b4e2b2f777 100644 > --- a/package/flannel/flannel.mk > +++ b/package/flannel/flannel.mk > @@ -5,8 +5,7 @@ > ################################################################################ > > FLANNEL_VERSION = 0.14.0 > -FLANNEL_SITE = https://github.com/flannel-io/flannel/archive > -FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz > +FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) > > FLANNEL_LICENSE = Apache-2.0 > FLANNEL_LICENSE_FILES = LICENSE Looks good. Thanks for working it out. Acked-by: Geoff Levand From fido_max at inbox.ru Tue Feb 14 05:20:37 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Tue, 14 Feb 2023 08:20:37 +0300 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix legal info In-Reply-To: <20230213181217.908103-1-fontaine.fabrice@gmail.com> References: <20230213181217.908103-1-fontaine.fabrice@gmail.com> Message-ID: <1c1cf3a6-fb4a-fa1c-dd09-29c0ac1a23c1@inbox.ru> On 13.02.2023 21:12, Fabrice Fontaine wrote: > Commit 57e297a215193c92f6a178139db53616f2ee23b5 forgot to update hash of > COPYRIGHT file (year updated with > https://github.com/postgres/postgres/commit/1fbcb1360bc19b89369209203ea7cc19b8cde224) > > Fixes: > - http://autobuild.buildroot.org/results/93f40dc71619745ddc6741598c9a488c81ea440f > > Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov > --- > package/postgresql/postgresql.hash | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash > index e6a9bd6658..3e89d3ec35 100644 > --- a/package/postgresql/postgresql.hash > +++ b/package/postgresql/postgresql.hash > @@ -1,4 +1,4 @@ > # From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 > sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 > # License file, Locally calculated > -sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT > +sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT From marcus.folkesson at gmail.com Tue Feb 14 06:38:21 2023 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Tue, 14 Feb 2023 07:38:21 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/pkg-kconfig.mk new -show-fragment target In-Reply-To: <20230130104308.483243-1-marcus.folkesson@gmail.com> References: <20230130104308.483243-1-marcus.folkesson@gmail.com> Message-ID: Ping Den m?n 30 jan. 2023 kl 11:43 skrev Marcus Folkesson < marcus.folkesson at gmail.com>: > This patch introduce the new target to simplify the generation of > configuration fragments as the output could be directly copied into a > fragment file as-is. > > It is *heavily* based on the -diff-config target, but serves a > different purpose. > > Output from linux-diff-config: > -CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK y > -CONFIG_GCC_PLUGIN_CYC_COMPLEXITY n > -CONFIG_GCC_PLUGIN_LATENT_ENTROPY n > -CONFIG_GCC_PLUGIN_RANDSTRUCT n > -CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF n > -CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL n > -CONFIG_GCC_PLUGIN_STRUCTLEAK_USER n > -CONFIG_STACKPROTECTOR_PER_TASK y > CONFIG_CRYPTO_DH n -> y > CONFIG_CRYPTO_KPP m -> y > CONFIG_GCC_PLUGINS y -> n > CONFIG_KEY_DH_OPERATIONS n -> y > CONFIG_PKCS8_PRIVATE_KEY_PARSER n -> y > CONFIG_VIDEO_IMX274 n -> m > > Output from linux-show-fragment: > CONFIG_CRYPTO_DH=y > CONFIG_CRYPTO_KPP=y > CONFIG_KEY_DH_OPERATIONS=y > CONFIG_PKCS8_PRIVATE_KEY_PARSER=y > CONFIG_VIDEO_IMX274=m > > Signed-off-by: Marcus Folkesson > --- > package/pkg-kconfig.mk | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk > index f4f35bf96a..ee96525c47 100644 > --- a/package/pkg-kconfig.mk > +++ b/package/pkg-kconfig.mk > @@ -309,12 +309,26 @@ $(1)-diff-config: $(1)-check-configuration-done > $$(Q)cp -a $$($(2)_DIR)/.config.dc.bak > $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) > $$(Q)rm -f $$($(2)_DIR)/.config.dc.bak > > +# Target to output differences between the configuration obtained via the > +# defconfig + fragments (if any) and the current configuration. > +# Output format is suitable to be used as-is in fragment files. > +# Note: it preserves the timestamp of the current configuration when > moving it > +# around. > +$(1)-show-fragment: $(1)-check-configuration-done > + $$(Q)cp -a $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) > $$($(2)_DIR)/.config.dc.bak > + $$(call > kconfig-package-merge-config,$(2),$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG),\ > + $$($(2)_KCONFIG_FRAGMENT_FILES)) > + $$(Q)utils/diffconfig -m $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) \ > + $$($(2)_DIR)/.config.dc.bak > + $$(Q)cp -a $$($(2)_DIR)/.config.dc.bak > $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) > + $$(Q)rm -f $$($(2)_DIR)/.config.dc.bak > > endif # package enabled > > .PHONY: \ > $(1)-diff-config \ > $(1)-check-configuration-done \ > + $(1)-show-fragment \ > $$($(2)_DIR)/.kconfig_editor_% \ > $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)) > > -- > 2.38.1 > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Tue Feb 14 06:40:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 14 Feb 2023 06:40:28 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-13 Message-ID: <20230214064033.4D0F081DF7@smtp1.osuosl.org> Hello, Autobuild statistics for 2023-02-13 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 1 | 2 | 0 | 3 | 2022.11.x | 18 | 18 | 0 | 36 | master | 135 | 193 | 4 | 332 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 13 host-go-1.19.5 | 8 package/postgresql/postgres... | 8 elfutils-0.186 | 6 host-rust-1.67.0 | 6 unknown | 6 gobject-introspection-1.72.0 | 5 host-binutils-2.38 | 5 libgcrypt-1.10.1 | 5 linux-6.1.9 | 5 gerbera-1.10.0 | 4 glibc-2.36-81-g4f4d7a13edfd... | 4 olsr-0.9.8 | 4 zabbix-5.4.9 | 4 host-libarchive-3.6.2 | 3 host-pahole-1.24 | 3 libgpg-error-1.46 | 3 systemd-252.4 | 3 dmalloc-5.6.5 | 2 erlang-22.3.4.22 | 2 fs/ubifs/ubifs.mk:49: /home... | 2 gobject-introspection | 2 host-binutils-2.39 | 2 libglib2-2.72.3 | 2 linux-5.10.162-cip24 | 2 linux-5.10.162-cip24-rt10 | 2 lirc-tools-0.10.2 | 2 opus-1.3.1 | 2 php-8.2.2 | 2 postgresql-legal-info | 2 rsync-3.2.7 | 2 valgrind-3.19.0 | 2 xenomai-3.0.10 | 2 ace-7.0.6 | 1 assimp-5.2.5 | 1 attr-2.5.1 | 1 audit-3.0.7 | 1 bind-9.16.33 | 1 boost-1.80.0 | 1 brltty-6.5 | 1 containerd-1.6.16 | 1 dc3dd-7.2.641 | 1 ding-libs-0.6.2 | 1 dust-0.8.1 | 1 edid-decode-188950472c19492... | 1 expat-2.5.0 | 1 ffmpeg | 1 fluent-bit-2.0.8 | 1 fontconfig-2.13.1 | 1 freeradius-client-1.1.7 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubi/ubi.mk:51: /tmp/inst... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fwts-22.09.00 | 1 gmp-6.2.1 | 1 gqrx-2.14.4 | 1 host-binutils-2.37 | 1 host-gcc-final-10.4.0 | 1 host-gcc-final-11.3.0 | 1 host-gcc-final-12.2.0 | 1 host-runc-1.1.4 | 1 hyperfine-1.14.0 | 1 jack2-1.9.21 | 1 jailhouse-0.12 | 1 janet-1.26.0 | 1 libcamera-apps-1.1.1 | 1 libcurl-7.87.0 | 1 libdill-32d0e8b733416208e04... | 1 libfreeimage-3.18.0 | 1 libudfread-1.1.2 | 1 libxml2-2.10.3 | 1 ltp-testsuite-20220930 | 1 mawk | 1 mesa3d-demos-8.5.0 | 1 multipath-tools-0.9.4 | 1 netsurf-3.10 | 1 ocf-linux-20171122 | 1 openvmtools-11.3.5-18557794 | 1 optee-client-3.19.0 | 1 perl-5.36.0 | 1 pipewire-0.3.65 | 1 python-numpy-1.23.5 | 1 python-pymupdf-1.21.1 | 1 python-sip-4.19.25 | 1 rdma-core-44.0 | 1 rtl8812au-aircrack-ng-e7a4a... | 1 rtl8821cu-86cc5ceb7c28b9b99... | 1 ruby-3.1.3 | 1 toolchain-external-codescap... | 1 traceroute-2.1.0 | 1 uclibc-1.0.42 | 1 ulog-0389d243352255f6182326... | 1 uqmi-0a19b5b77140465c29e2af... | 1 volk-2.5.2 | 1 wolfssl-5.5.3 | 1 xvisor-0.3.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/a18c9a471786632f1790ecf9d985838722ffbf2d | mips | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/18b9c0e3b877ccf0a2ef004a7e9b1c132b3515f7 | ORPH mips64el | attr-2.5.1 | NOK | http://autobuild.buildroot.net/results/dfae3378d9e93a688d000d0ac88873bc686e29f0 | arm | audit-3.0.7 | NOK | http://autobuild.buildroot.net/results/35e6df7243ab6b4505380eb15fcabb438c673fc0 | sh4 | bind-9.16.33 | NOK | http://autobuild.buildroot.net/results/06d95cca882f6a58a7b89463e6f602d926da1bf9 | ORPH or1k | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/19f36081bcf386911622c48d3ad03f40fddec360 | powerpc64le | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/6aad75e66463045b33cdffcda67e4eaa08ffe80d | aarch64 | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/f0e72626ecaa9d4af1b16464cb921b39510676bb | or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/417bcbd3f5748a98d6af7aa7772c2c6447bb0127 | ORPH arc | ding-libs-0.6.2 | NOK | http://autobuild.buildroot.net/results/f26ceaea1e91af208cb5ca5576bc6346d9244b1c | powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/c9fa0fb349d5b1351bde2362dc26fff2314c26a9 | ORPH powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/091858c740cedf28164dd2d0a891980341b28af4 | ORPH armeb | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/c14f3612891b40c9ac053ccd5b31c35ba4ef1179 | ORPH riscv64 | edid-decode-188950472c19492... | NOK | http://autobuild.buildroot.net/results/dfdd2284b407df880fb83ea2766f5f0c566ef35c | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/ad7342f721a5855011e9e7663999ecf45ef60ddb | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/728a1a9a187b47b80efaec5297246fddd129bf48 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/387aac8443f8098a018623ed62260d7355c3e6ef | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/c65e90ba56d1ae8061eae11014768e6a5f4c4c32 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/50227e3e281a1e28848b2e1ae0dc1123cfca7fc2 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3469a1cfe2868194102376f19188a5d0a48bebf6 | ORPH sparc64 | erlang-22.3.4.22 | NOK | http://autobuild.buildroot.net/results/48527d6610e3afa13841e921acecddf023145268 | x86_64 | erlang-22.3.4.22 | NOK | http://autobuild.buildroot.net/results/ea968af1e2d32b616755fe83d297f72ab009fb0e | mips64el | expat-2.5.0 | NOK | http://autobuild.buildroot.net/results/198c9fed072fbb87bd21beac7fe40104a6ed8176 | i686 | ffmpeg | TIM | http://autobuild.buildroot.net/results/6830f1b80c0b8af0133e2fa5f03cf4700577ac88 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/f7962b003a5391cafd3ba7594e9ab2cf901968d6 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/db3b254dbdd409dec3e70c1b489d7473c0a7b33a | ORPH riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/325ca998c1f70fe28f28ff8ec762ba18c22f99ed | microblazeel | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/7b0c134d1f7a23882c44eb2c2ec779d1265ca5e3 | mips | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/6323d814e7dacbaae8a16217c7c6832b3703950b | armeb | fs/ubi/ubi.mk:51: /tmp/inst... | NOK | http://autobuild.buildroot.net/results/46e91a391913f927429e61f92243afb13bcfebd6 | microblazeel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/0aecfe0c22274d623a78907e32322e700a1f101f | armeb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/ad78cc33806706d4ee72bd521fb66cb2eb2cee6b | powerpc64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/ffc22d8bedc9862c775e221c336515c5218131fd | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/a9db0663e4dbd5096184eb3c4a920add5f224ce2 | xtensa | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/e258dc36ec6d9d3273b485a7ed8a6d00b2624b37 | mips | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/bdd396ef095d8e2c9556d3c398ff263f2e8357f9 | arm | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/02d284654057af08162d0cb9edc3e6bbb2ffba32 | microblaze | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/50391e1463ce25db972b2e202c7cb820826c006d | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/ccaaea6c362d57e2daf0a12621b3004febbcfdf2 | s390x | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/b210a78f2bfb622a6cf488a78908c2647719009d | mips64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/ee1909c631cba531070cd67e6c3546be26773bea | x86_64 | fwts-22.09.00 | NOK | http://autobuild.buildroot.net/results/1c00b8f72b0098974add7b4604fe95f2d4329678 | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/3105d25c30e64eae3dbed5379270e3a7c8696327 | s390x | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/bf6380d241dd2dfd7dc0421ea8c2108351893600 | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/6d5b9c1b0f089aee1cb16327bbee50b5527ad8d1 | m68k | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/081bd5474d574f5f45a158e1829ab0dc628ea2bd | riscv32 | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/32dea54f343ce8543b3e598afa8f0b96841acfae | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/0c8d76de4f495c1d41664dc756b0b3900aebfdf6 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/7c02fcf63db132bed901697042391774d98a60f4 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b124ee2d554c1a28b38420bf9000f6571c689964 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/ab8fae8289e96fca3b4ee948b9076e0425f45ba0 | ORPH aarch64_be | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/8868c105ad5d1c8333b02b03097f9a213b85c4ae | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/b9f7d2edcadd4f785817be502a73f357f4fa480e | aarch64_be | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9bd34162265ad04e8a770634ce143c7387ab4ba2 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6df7bb5f30e1438362877fb8eb92fa0c85e56907 | or1k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a35b27be105388c965ce93203ae80ff0946fc5a3 | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/3a294511b2ccc4c4463aa50c1d7c742205d93f6b | i686 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a90db8e1e310858e6ffbbd4aacd7581107d1926f | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/f2f04c2eb3076c7528dd58dfaf94cc4b44ba6344 | aarch64_be | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a75fd752dbd10da441ead9cda39f206315ae258a | sparc | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/acdfa41e8f7c3f6de2b6cf4fe5b13688c0230b0c | nios2 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/f0f5b4d817d235f65a96529ccce1108c315d6145 | mips64el | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/82cb5f9c6c7bf2d01d73c9ed8fcea669779cf10b | nios2 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/3d735d2258dd872dbd50c5358bc4f7b4b8338a6d | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/a25e7938f9fd6e890ed9a652f9509790686b62ce | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/4e7bc1b18c030937f31fb4b2c563324160b6344f | powerpc | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/61ed6ffcec3d7ed29073ab8bb64782323e1cd01f | ORPH mips | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5d8303851152fb4a44c3e87b5b185dd99afbc686 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0537b05399f9eefc9a77ef195be892e6555ef2e0 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3f89a980cbc32e60a9b55330cbb8aa6f63545024 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7100592c8ced090a50b727f8c58884fc7085ab98 | ORPH aarch64_be | gqrx-2.14.4 | NOK | http://autobuild.buildroot.net/results/42b5ab2e555063273ea55fd1c09a9be6d8b620e2 | or1k | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/5699dcd4a21d137334cc9df0743100301444f499 | riscv32 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/230ac4c60497236eac11b74e45df4ffcaad8933e | aarch64_be | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/72d5e1894242d092f4cdeb4f2bbfdf12614acace | nios2 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/49fac1ff741b7ab06962835bd00e2fe89fd62800 | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2f5be22d5aae3793413fd8566b4d995a19e4f379 | or1k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/892bdddc021451157e46f626264f536938c9cb81 | mips64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/9e32209526d39dad8e1d9f63af036ab9d8f45cc7 | mips | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/90293fa6c6eafb705b9dd5745614047d8c0ca5bd | riscv32 | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/94a0da7f503a2a67a6cf05cb103385a0b35cd724 | arceb | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/21c70302a4bd25c8075650b29ec52a82bb5ddece | microblaze | host-gcc-final-12.2.0 | NOK | http://autobuild.buildroot.net/results/574c9686e4b0f54e38909851abb57c328f266733 | riscv64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/3ede83521a087f11b2463907c5a5e4d69b665f2d | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/c8f69909ddb69f04b9f720d91587276f056d86cb | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/21a3509011770d0f7ce9e593c47e5c3cf7c502f4 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/76a37309b2b8188d592c19a83e71bc160a4f343a | arc | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/19515bf7334c676e4b847938c8de5f973c781d68 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/3e27768aea451b364fd2ccd4ed91ac9f4634acec | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/cf0e13e05b890d0be3822350603e0f118f28a768 | aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/5af0899215a3a41cd67f17e6db4e4d19906cceed | sparc | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/9857bf0454d4684b479b0d710721ab693a38728b | or1k | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/88111f1ef1bde2798611195dbf5c531955d0da23 | m68k | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/9aacc32d35cd23dcad0930f2d1dd089c25cc708a | i686 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/45e1a67e0a1e93419dcdef0446ec14e8daece748 | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/db3d60b0f17713f9b5ac4db53cecfaff07f7c207 | xtensa | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/4b1c251886d06f79a237b2d9abd732b9fd4a84f3 | or1k | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/c3f3de2a7dd1a465c62948ef3a91e28274f8f3e6 | mipsel | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/7ec413f13a56b354a24b7ef69006ecbb49d15df1 | powerpc64le | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/ab42b30ff4a848cddde2610d29ce68c5035d848b | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/94096259ee11bd17ade743aa398733500a25c537 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/d81e1a54b14ab25b4668b0b5c82037f5257f789e | sparc64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/be9c80c8382d272feb65e53dead3a13139e495b3 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/08b93ff45d70d215e2ed0213a2a1cf176651c3ed | armeb | hyperfine-1.14.0 | NOK | http://autobuild.buildroot.net/results/9ea7ba64367c2eaf191c668444bd52642d7ce960 | ORPH m68k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/aae15f54e06bfd5c00aaf38fc78bc65ed98c2575 | x86_64 | jailhouse-0.12 | NOK | http://autobuild.buildroot.net/results/fcd1dc058f6bc9ed8f86c2deb2de5092b86310b9 | xtensa | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/d517f990a730038435323a8c24e752b1fb985e23 | arm | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/391445bfea4ae447622f0a4dd39de3420b6e1398 | arceb | libcurl-7.87.0 | NOK | http://autobuild.buildroot.net/results/3eaa4ee44920285cea2a73f6279bb142f0df9063 | arm | libdill-32d0e8b733416208e04... | NOK | http://autobuild.buildroot.net/results/7b0ec76f05dd978517c1163e0f7521f6e393fe3d | powerpc64le | libfreeimage-3.18.0 | NOK | http://autobuild.buildroot.net/results/a029b31bfa8de58ab5b2665e5e03bcc812d7ff92 | armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/1a27a255ce62ce63a36043cd89d4dc913ab8efb1 | ORPH i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/1ba900ea50270338cda8fe9ffff1a5c637784404 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/60f2d4c98441cbff7c2edf7e73505814a40366b2 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/9da0863e4ce8b3f612f2279a75bb8f9cd22f1806 | ORPH i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/3990f03e4deb21551b320f792647adc067416b74 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/b63e152d47f65476dd3631ae0fa69b45aaf1d651 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/6cc4594437094c3c88898f344ac99c6e60994cd9 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/89910bb1e73fb27a6f85afa41128c74ba78c25bf | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/21997a0a40378cdc00c1420c5748dfcb28dee4e3 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/7478e88bb5511a2087973d3bf2d05bf2422a6ca2 | ORPH arm | libudfread-1.1.2 | NOK | http://autobuild.buildroot.net/results/754596590db80c6250d60b8d3c156ae1ccaf624b | mips64 | libxml2-2.10.3 | NOK | http://autobuild.buildroot.net/results/d1a0f90e0b3f8ead5a3320941f894a635507d0cf | m68k | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/e09104ccffe408a34a124e1fd357d7816591845c | ORPH mipsel | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/83a2bebb7efc709ef662b470df39c65ae1fdebb2 | ORPH sh4a | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/ef1674176eaad3f591ce812be946b38e65f7bd92 | ORPH nios2 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/33520bc829f138035aa6dbdc1718fab12c3c21a9 | ORPH mips | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/423554fcd1721ca8814bade3fec60c69fdbaa146 | ORPH i686 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/2587b82a352798922a864b9b74d5f74d39e98945 | ORPH powerpc | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/4afe577b30023a525fbb2a14fcebbe587ee056f3 | ORPH mips64el | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/f0995716a2a5fada06ec224e4b5f21f26ade6e83 | ORPH arceb | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/4239f11f6864aa3c04e2eca4fcb5712f7e970874 | ORPH aarch64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/038271a34d88abceb81aa941db5c9706f75380d9 | ORPH aarch64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/3ffd1cd536e82e4dae21824976d5d4c5b324c9bc | ORPH powerpc64le | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/b80c992b05541558896d2c53534edba99d24988b | m68k | mawk | TIM | http://autobuild.buildroot.net/results/fcf77717661ec34e57cbd8f0e025f015c53e2aa9 | aarch64 | mesa3d-demos-8.5.0 | NOK | http://autobuild.buildroot.net/results/1f59abec436e5db19a70f58ffdd55891935a9e15 | powerpc64le | multipath-tools-0.9.4 | NOK | http://autobuild.buildroot.net/results/e0f56ef924c13d6b1535fdc350ad8ecc06ea0a58 | mips64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/a739ac11ded2fae7283951def6e247e9fb580892 | sparc64 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/8abb8e97a8fb7a9a216787e368f582ea2a6b2aaf | ORPH powerpc64le | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/b5fa7cf0dde7320b78ca8d95e80bca496cf1a827 | ORPH mips | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/dd888f32dbc1191150acc985daeeee43a6c250ba | ORPH riscv32 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/bff5633edcf2d185659d2cc21ef8560127ee18dc | ORPH sh4a | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/02590a47c1a199e8164032dcf177af8d460aa105 | ORPH x86_64 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/9aedc73aceed5a5cb7987f593846752f70693b29 | mipsel | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/6cc48d9eeb288b1582907d8c5e4f36ae17e64229 | arm | opus-1.3.1 | NOK | http://autobuild.buildroot.net/results/2fbcded586aae03a0c59b050f63def61744735b3 | ORPH arm | opus-1.3.1 | NOK | http://autobuild.buildroot.net/results/356d2b80ea48af07f19368ddfc120550ccf01721 | ORPH sparc64 | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/37290f277a1b7206bd3d347e2451dd02c1929d22 | microblazeel | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/2cfa87cdf0ae5ee1d28143d2904a1040d073d804 | mipsel | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/171cccefebf486900d24a8cf592d641de6be363d | nios2 | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/b5f48a6121ab85c207101fa678838e72539939d0 | microblaze | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/d441c3b8507f5079bbf31b4109062bee61b4c887 | s390x | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/d308cac03f7454a015e6d833ecf125fab6ee02bd | mips64 | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/0fefbf0b3f20aca78838403bcd094869e1ab2b21 | mipsel | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/2957277613e738d24ce1e9b261f22f6f1e0042c8 | mips64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/d652c6b5157181f47d8fdb412cc98f30fb26f8f9 | microblaze | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/94b0d25578498b6296832fb8a174756c4beb7b27 | mips | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/c241d3ef0db29abf4c345d7665aefb2ffbd639f2 | s390x | pipewire-0.3.65 | NOK | http://autobuild.buildroot.net/results/9ecd9aca5edc3756154da59573157954f06e6537 | sh4 | postgresql-legal-info | NOK | http://autobuild.buildroot.net/results/93f40dc71619745ddc6741598c9a488c81ea440f | nios2 | postgresql-legal-info | NOK | http://autobuild.buildroot.net/results/9d2daeb565c9fc4465219474e8c87555d072367f | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/1bfc260aad8f5b24e90d49294ef9e9e427e34990 | powerpc | python-pymupdf-1.21.1 | NOK | http://autobuild.buildroot.net/results/cf268d3631330a8288fb8ad2af009abb7f1ca6b0 | powerpc64le | python-sip-4.19.25 | NOK | http://autobuild.buildroot.net/results/af1cbc00bf2574fba67575e1cab1fa7b1434b746 | m68k | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/b0e8c7f317fbbd798b2833803413fa767e0386e8 | sparc | rsync-3.2.7 | NOK | http://autobuild.buildroot.net/results/3bf75b802d79ee0ba81ead235c4be1a19d282bf6 | sparc | rsync-3.2.7 | NOK | http://autobuild.buildroot.net/results/30f0a53825518e78d3e782efafc741a308fb6ac0 | microblaze | rtl8812au-aircrack-ng-e7a4a... | NOK | http://autobuild.buildroot.net/results/e128298929fce31374687a566e50b00c150131b8 | s390x | rtl8821cu-86cc5ceb7c28b9b99... | NOK | http://autobuild.buildroot.net/results/3a74d393cdbc308eab9ec3f0f9e420947669a0ea | riscv64 | ruby-3.1.3 | NOK | http://autobuild.buildroot.net/results/e0c51820ab371e6ab6fa76654dc94934820ffcb9 | sparc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/84c309aee11570a9e9ca44f0681e06ec719ff11e | powerpc64le | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/4f0df587dd00806169aad68ca645374c5056f540 | nios2 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/1eeb23969ad7bd3896bbb3b0ca6992499b9c5942 | mips | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/ead304285a9cf32bf6b9dcc7fc30acece25ec680 | ORPH or1k | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/1b3c27c1b7f48eb95bb91348ac1801a43a845558 | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/507e0bffe040adcf8ce99f77a2024e2182cb1620 | nios2 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/9b3f74bf8656ddebfdd9609b2165b54e71aa3a94 | sh4aeb | unknown | NOK | http://autobuild.buildroot.net/results/c5127f97baaa2397f4dcb45ca512f3ac9a91d474 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/86b5f2bb0381ce5964ab4d851d2341be383a6a86 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/07d15c087b133509fc4745702f90143fc5d96336 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/5df4884304cd4fe53f9901fc075342825f4a2e76 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/4f49f1ddb5796b0324cfcddc507713f8be13db4c | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/0757e3931203a15313148f70986108cf565a998c | sparc64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/e21535338461b5b085e666a8ad84ceeca8779fe0 | ORPH mips64el | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/c36fb5aed960abe88c6627efdbc5f4b328efe5ac | ORPH mips64 | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/6f7847d66e6bd5f20a4ad311e10455dae28638b9 | ORPH powerpc | volk-2.5.2 | NOK | http://autobuild.buildroot.net/results/5225bda547c110317dd7c5f81ae2af8db81f557e | mips64 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/48a3ec2c75e1d57d63365b2bf47c94b58cadb84b | mips64 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/61a179b8d3cc2cd7e7bf88db4254070c8f3c6f9e | mips64 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/6603637236336336292d872f515eddcb7c666f8c | x86_64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/c5bdf24f6fff972bd8f2725174897df3f5f9a5f3 | x86_64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/617b67d19a1b75489754ba16fd0150ef39d8d045 | powerpc | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/bccb9aa17ebaec6abda88bbc5f3feb2d5b9023fd | mipsel | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/26dc8469f452d0efce9d81f41d5c35577885352e | s390x | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/053a62e9969046a7f8a0e1890c24d2bfb099ae42 | Classification of failures by reason for 2022.02.x -------------------------------------------------- flannel-0.14.0 | 1 mesa3d-21.3.5 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64le | flannel-0.14.0 | NOK | http://autobuild.buildroot.net/results/d8e0f21a0475996dcb9d4a6dcb5343d381fe09a9 | mips | mesa3d-21.3.5 | NOK | http://autobuild.buildroot.net/results/265a441fd4ccc81b0434ef4c7bea8c24e1a15ff3 | Classification of failures by reason for 2022.11.x -------------------------------------------------- host-pahole-1.24 | 5 unknown | 2 augeas-1.12.0 | 1 elfutils-0.186 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 libev-4.33 | 1 libgcrypt-1.10.1 | 1 lightning-2.1.3 | 1 linux-6.0.19 | 1 python-numpy-1.23.4 | 1 xxhash-0.8.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | augeas-1.12.0 | NOK | http://autobuild.buildroot.net/results/b550a6883a0340afff13e755056410647b431bd1 | ORPH arc | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/f69128febbfd4a5363c1d098c756a7b8dace7166 | ORPH powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/9d805ea3a3143a2607739a3de97af3a990d7de4a | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/23148e8ba4134b88728e540c72a823d37e659690 | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/b57643a9098eb08653f40515639ff68e3fb06cf8 | ORPH x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ea2ec269e5fcb0a0fe9aabd63bf86f2c7d2b7b0c | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/722f516a6b0faba0a78fca21a204b788b07fd086 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/713f81903a221158a01eb3869d4bf50ff1950eb6 | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/01332fb48d5aab2bc85bf91d016500fbdea0d102 | riscv32 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8fc883af903ba73caadd887019c0df3545068b7b | arm | libev-4.33 | NOK | http://autobuild.buildroot.net/results/efb35288b235943a20823eda39f93ad5db065445 | ORPH arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/328d3715b86693a6f3824d62f71876d7a9c75a07 | ORPH powerpc | lightning-2.1.3 | NOK | http://autobuild.buildroot.net/results/abdf3e9e1633734e80b017e8444c54e6059495d2 | mipsel | linux-6.0.19 | NOK | http://autobuild.buildroot.net/results/0dab7e93b939cab2e34454cb87ed2236d88adc9e | ORPH mipsel | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/bf06f2181b08a7787343d212914c269ff20d86e2 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/a08adb898323277b323a11303f4a8f3783cef0b2 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/60e92faa766a948cae278c9058ede76bbe4e9629 | mipsel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/4b8f858e717d027c5e152f056a2e8b2fb9ee6ff3 | ORPH -- http://autobuild.buildroot.net From hrsourabh011 at gmail.com Tue Feb 14 07:27:34 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Tue, 14 Feb 2023 08:27:34 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: Hello James, Thanks for the update. awscrt also has precompiled wheels such as awscrt-0.16.10-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl Can Buildroot use them instead of cross compiling? If not, is it possible to extract it and install manually? Thanks in advance On Thu, 9 Feb 2023 at 21:12, James Hilliard wrote: > On Thu, Feb 9, 2023 at 5:10 AM Sourabh Hegde > wrote: > > > > Hello Maxim, > > > > While doing make with new Buildroot-packages I getting: > > > > [ 51%] Building ASM object > aws-lc/crypto/CMakeFiles/crypto_objects.dir/hrss/asm/poly_rq_mul.S.o > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S: > Assembler messages: > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:304: > Error: unknown pseudo-op: `.att_syntax' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:307: > Error: unknown mnemonic `push' -- `push %rbp' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:309: > Error: bad register expression > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:310: > Error: unknown mnemonic `movq' -- `movq %rsp,%rbp' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:311: > Error: bad register expression > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:312: > Error: unknown mnemonic `push' -- `push %r12' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:313: > Error: bad register expression > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:321: > Error: operand 1 must be an integer register -- `mov %rcx,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:322: > Error: unknown mnemonic `addq' -- `addq $6144+12288+512+9408+32,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:323: > Error: operand 1 must be an integer register -- `mov %r8,%rax' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:324: > Error: unknown mnemonic `subq' -- `subq $6144,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:325: > Error: operand 1 must be an integer register -- `mov %r8,%r11' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:326: > Error: unknown mnemonic `subq' -- `subq $12288,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:327: > Error: operand 1 must be an integer register -- `mov %r8,%r12' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:328: > Error: unknown mnemonic `subq' -- `subq $512,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:329: > Error: unknown mnemonic `vmovdqa' -- `vmovdqa const3(%rip),%ymm3' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:330: > Error: unknown mnemonic `vmovdqu' -- `vmovdqu 0(%rsi),%ymm0' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:331: > Error: unknown mnemonic `vmovdqu' -- `vmovdqu 88(%rsi),%ymm1' > > . > > . > > . > > Any idea what it is complaining about? > > The problem here is that while the python awscrt package uses setuptools > it's not a normal python setuptools package, the setup.py installs both a > normal > setuptools package and a vendored cmake package(meta package really). > > See cmake build wrapper functionality here in the setuptools setup.py file: > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py#L156-L272 > > This is the cmake meta project root which is vendored inside of awscrt: > https://github.com/awslabs/aws-crt-python/tree/v0.16.10/crt > > See meta cmakelists build: > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/crt/CMakeLists.txt > > This meta project is made up of multiple subprojects: > aws-c-auth > aws-c-cal > aws-c-common > aws-c-compression > aws-c-event-stream > aws-checksums > aws-c-http > aws-c-io > aws-c-mqtt > aws-c-s3 > aws-c-sdkutils > aws-lc > s2n > > In buildroot we expect cmake packages to use our cmake infrastructure > as it will set up the cross compilation environment correctly while the > awscrt setuptools cmake wrapper does not. > > I confirmed that the cmake packages build correctly when using our > cmake infrastructure: > > ################################################################################ > # > # python-awscrt > # > > ################################################################################ > > PYTHON_AWSCRT_VERSION = 0.16.10 > PYTHON_AWSCRT_SOURCE = awscrt-$(PYTHON_AWSCRT_VERSION).tar.gz > PYTHON_AWSCRT_SITE = > > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2 > PYTHON_AWSCRT_SUBDIR = crt > > $(eval $(cmake-package)) > > See: > > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_cmake_based_packages > > So what I think you need to do is create buildroot cmake packages for all > these subprojects using buildroot's cmake infrastructure: > https://github.com/awslabs/aws-c-auth > https://github.com/awslabs/aws-c-cal > https://github.com/awslabs/aws-c-common > https://github.com/awslabs/aws-c-compression > https://github.com/awslabs/aws-c-event-stream > https://github.com/awslabs/aws-checksums > https://github.com/awslabs/aws-c-http > https://github.com/awslabs/aws-c-io > https://github.com/awslabs/aws-c-mqtt > https://github.com/awslabs/aws-c-s3 > https://github.com/awslabs/aws-c-sdkutils > https://github.com/awslabs/aws-lc > https://github.com/aws/s2n-tls > > You will then probably need to modify the setup.py file > (https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py) so that > instead of using the cmake build functions have it use the system versions > of these libraries pre-installed via the buildroot cmake infrastructure. > > You can probably use and check for an env variable such as this in the > setup.py: > PYTHON_AWSCRT_USE_SYSTEM_CRT=1 > > When present have it disable building the cmake libraries itself and search > for the installed system crt libraries instead of using the vendored > cmake build. > > You should upstream this setup.py functionality to the aws-crt-project as > well > so that we don't need to carry a patch in buildroot for python-awscrt to > use > the system crt libraries. > > Then from the python-awscrt buildroot package you would set that env > variable and add all the cmake subprojects as buildroot package > dependencies. > > First thing you should start with is adding the cmake buildroot packages > for > the crt subprojects to buildroot then work on modifying aws-crt-python to > work correctly with them instead of trying to use its broken cmake > setuptools > wrapper. > > > > > Thanks in advance > > > > On Thu, 9 Feb 2023 at 10:28, Sourabh Hegde > wrote: > >> > >> Hi Maxim, > >> > >> I was missing python setuptools on my host. After installing it, I can > add the package. Also, the added package is available in menuconfig > >> > >> Thank you for the support! > >> > >> On Thu, 9 Feb 2023 at 10:10, Maxim Kochetkov wrote: > >>> > >>> > >>> > >>> On 09.02.2023 12:03, Sourabh Hegde wrote: > >>> > Hello Maxim, > >>> > > >>> > Update: > >>> > > >>> > The above issue resolved by itself! > >>> > > >>> > Now when I do: utils/scanpypi awscrt -o package , it says > >>> > > >>> > spdx_lookup module is not installed. This can lead to an inaccurate > >>> > licence detection. Please install it via > >>> > pip install spdx_lookup > >>> > buildroot package name for awscrt: python-awscrt > >>> > Package: python-awscrt > >>> > Fetching package awscrt > >>> > ERROR: Could not find package awscrt. > >>> > Check syntax inside the python package index: > >>> > https://pypi.python.org/pypi/ > >>> > > >>> > But the package is available at https://pypi.org/project/awscrt/ > >>> > > >>> > >>> It works fine for me: > >>> > >>> buildroot package name for awscrt: python-awscrt > >>> Package: python-awscrt > >>> Fetching package awscrt > >>> Downloading package awscrt from > >>> > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz. > .. > >>> Checking if package package/python-awscrt already exists... > >>> Creating package/python-awscrt/python-awscrt.mk... > >>> More than one file found for license: LICENSE, > crt/aws-c-common/LICENSE, > >>> crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, > >>> crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, > >>> crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, > >>> crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, > >>> crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, crt/aws-c-cal/LICENSE, > >>> crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE > >>> Creating package/python-awscrt/python-awscrt.hash... > >>> Creating package/python-awscrt/Config.in... > >>> NOTE: Remember to also make an update to the DEVELOPERS file > >>> and include an entry for the pkg in packages/Config.in > >>> > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From heiko.thiery at gmail.com Tue Feb 14 09:04:25 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Tue, 14 Feb 2023 10:04:25 +0100 Subject: [Buildroot] [PATCH] package/dnsmasq: bump version to 2.89 Message-ID: <20230214090424.9335-1-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- package/dnsmasq/dnsmasq.hash | 4 ++-- package/dnsmasq/dnsmasq.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index fd015d38ac..02ffb2656b 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.88.tar.xz.asc -sha256 23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3 dnsmasq-2.88.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc +sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 3945e4256a..58c5390433 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.88 +DNSMASQ_VERSION = 2.89 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" -- 2.20.1 From heiko.thiery at gmail.com Tue Feb 14 09:11:42 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Tue, 14 Feb 2023 10:11:42 +0100 Subject: [Buildroot] [PATCH] package/wireless-regdb: bump version to 2023.02.13 Message-ID: <20230214091141.12503-1-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- 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 91fcb320d2..36451f839d 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 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz +sha256 fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73 wireless-regdb-2023.02.13.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 35a8c6686d..68fbe35b8b 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2022.02.18 +WIRELESS_REGDB_VERSION = 2023.02.13 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC -- 2.20.1 From mf at go-sys.de Tue Feb 14 09:05:35 2023 From: mf at go-sys.de (Michael Fischer) Date: Tue, 14 Feb 2023 10:05:35 +0100 Subject: [Buildroot] [PATCH] package/sdl2: bump version to 2.26.3 Message-ID: <20230214090535.9545-1-mf@go-sys.de> Update the license hash because of a change in copyright year: - Copyright (C) 1997-2022 Sam Lantinga + Copyright (C) 1997-2023 Sam Lantinga Signed-off-by: Michael Fischer --- package/sdl2/sdl2.hash | 6 +++--- package/sdl2/sdl2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 86e0d86e7c..e26dcee301 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.2.tar.gz.sig -sha256 95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0 SDL2-2.26.2.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.3.tar.gz.sig +sha256 c661205a553b7d252425f4b751ff13209e5e020b876bbfa1598494af61790057 SDL2-2.26.3.tar.gz # Locally calculated -sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt +sha256 9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 8995178e71..c01f12d12c 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.26.2 +SDL2_VERSION = 2.26.3 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib -- 2.20.1 From mf at go-sys.de Tue Feb 14 09:34:14 2023 From: mf at go-sys.de (Michael Fischer) Date: Tue, 14 Feb 2023 10:34:14 +0100 Subject: [Buildroot] [PATCH] package/gnuplot: bump version to 5.4.6 Message-ID: <20230214093414.5861-1-mf@go-sys.de> Signed-off-by: Michael Fischer --- package/gnuplot/gnuplot.hash | 8 ++++---- package/gnuplot/gnuplot.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index 1ee6b53694..de0741d609 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.5/ -md5 c10cf81faa69d77e255a1dcfc625ba78 gnuplot-5.4.5.tar.gz -sha1 1179a768fd5f585a5dcb6aedea76cfa7a8dd5dfe gnuplot-5.4.5.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.6/ +md5 da719235bb2f46830f9d2101d04b14a5 gnuplot-5.4.6.tar.gz +sha1 31ea0c00af5c156e5d068e3b1cc2fb1847f471ab gnuplot-5.4.6.tar.gz # Locally computed -sha256 66f679115dd30559e110498fc94d926949d4d370b4999a042e724b8e910ee478 gnuplot-5.4.5.tar.gz +sha256 02fc27918200ed64d8f0c3b84fe81b95b59cd47ad99f270939ae497c19f27419 gnuplot-5.4.6.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 1ee49cb6ce..c49fbc497d 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.5 +GNUPLOT_VERSION = 5.4.6 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright -- 2.20.1 From giulio.benetti at benettiengineering.com Tue Feb 14 10:50:33 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 14 Feb 2023 11:50:33 +0100 Subject: [Buildroot] [PATCH] package/rtl8821cu: disable package for s390x architecture Message-ID: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this package for this architecture. Fixes: http://autobuild.buildroot.net/results/3a74d393cdbc308eab9ec3f0f9e420947669a0ea/ Signed-off-by: Giulio Benetti --- package/rtl8821cu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rtl8821cu/Config.in b/package/rtl8821cu/Config.in index a5a7b9d255..00a41b5196 100644 --- a/package/rtl8821cu/Config.in +++ b/package/rtl8821cu/Config.in @@ -1,8 +1,10 @@ comment "rtl8821cu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_RTL8821CU bool "rtl8821cu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help rtl8821cu wifi driver -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 14 11:08:27 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 14 Feb 2023 12:08:27 +0100 Subject: [Buildroot] [PATCH] package/rtl8812au-aircrack-ng: bump to 2023-02-03 version to fix build failure with Linux 6.1 Message-ID: <20230214110827.1281144-1-giulio.benetti@benettiengineering.com> Fixes: http://autobuild.buildroot.net/results/e128298929fce31374687a566e50b00c150131b8/ Signed-off-by: Giulio Benetti --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index bc3a926314..cdf5f3b4e2 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eed4888da9cfdc0f83ad3335beaf73af33ce0796b0a2637aeec102d47e1eb8f0 rtl8812au-aircrack-ng-e7a4a390ccbdd768411e1b2a8922c47837f76b47.tar.gz +sha256 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index 45a6ce5729..ab3ebe2077 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = e7a4a390ccbdd768411e1b2a8922c47837f76b47 +RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE -- 2.34.1 From yann.morin at orange.com Tue Feb 14 11:18:46 2023 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 14 Feb 2023 12:18:46 +0100 Subject: [Buildroot] [PATCH] package/rtl8821cu: disable package for s390x architecture In-Reply-To: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> References: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> Message-ID: <16600_1676373529_63EB6E19_16600_354_5_20230214111846.GB3487@tl-lnx-nyma7486> Giulio, All, On 2023-02-14 11:50 +0100, Giulio Benetti spake thusly: > s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this > package for this architecture. Instead of fixing each and every rtlXXXX packages one by one when there is an autobuild failure, can we just exclude them in bulk, since they are all wireless drivers, and thus will never be available for s390x? Regards, Yann E. MORIN. > Fixes: > http://autobuild.buildroot.net/results/3a74d393cdbc308eab9ec3f0f9e420947669a0ea/ > > Signed-off-by: Giulio Benetti > --- > package/rtl8821cu/Config.in | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/rtl8821cu/Config.in b/package/rtl8821cu/Config.in > index a5a7b9d255..00a41b5196 100644 > --- a/package/rtl8821cu/Config.in > +++ b/package/rtl8821cu/Config.in > @@ -1,8 +1,10 @@ > comment "rtl8821cu needs a Linux kernel to be built" > + depends on !BR2_s390x > depends on !BR2_LINUX_KERNEL > > config BR2_PACKAGE_RTL8821CU > bool "rtl8821cu" > + depends on !BR2_s390x > depends on BR2_LINUX_KERNEL > help > rtl8821cu wifi driver > -- > 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 | | | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ 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 marcus.hoffmann at othermo.de Tue Feb 14 11:39:18 2023 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Tue, 14 Feb 2023 12:39:18 +0100 Subject: [Buildroot] [PATCH] package/dnsmasq: bump version to 2.89 In-Reply-To: <20230214090424.9335-1-heiko.thiery@gmail.com> References: <20230214090424.9335-1-heiko.thiery@gmail.com> Message-ID: <0bd69538-a3fe-2162-03e0-42db7b49766e@othermo.de> On 14.02.23 10:04, Heiko Thiery wrote: > Signed-off-by: Heiko Thiery Tested-by: Marcus Hoffmann > --- > package/dnsmasq/dnsmasq.hash | 4 ++-- > package/dnsmasq/dnsmasq.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash > index fd015d38ac..02ffb2656b 100644 > --- a/package/dnsmasq/dnsmasq.hash > +++ b/package/dnsmasq/dnsmasq.hash > @@ -1,6 +1,6 @@ > # Locally calculated after checking pgp signature > -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.88.tar.xz.asc > -sha256 23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3 dnsmasq-2.88.tar.xz > +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc > +sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz > # Locally calculated > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 > diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk > index 3945e4256a..58c5390433 100644 > --- a/package/dnsmasq/dnsmasq.mk > +++ b/package/dnsmasq/dnsmasq.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DNSMASQ_VERSION = 2.88 > +DNSMASQ_VERSION = 2.89 > DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz > DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq > DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" ________________________________ othermo GmbH | Sitz der Gesellschaft: Alzenau | Amtsgericht Aschaffenburg: HRB 14783 | USt-IdNr.: DE319977978 | Gesch?ftsf?hrung: Dr. Dennis Metz. From giulio.benetti at benettiengineering.com Tue Feb 14 12:08:08 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 14 Feb 2023 13:08:08 +0100 Subject: [Buildroot] [RFC PATCH] package/Config.in: move all Wireless Driver into a separate menu and enable them only if architecture s390x is not used Message-ID: <20230214120808.1282621-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/Config.in | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/package/Config.in b/package/Config.in index e0792bda55..a70a45f50a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -582,16 +582,6 @@ endmenu source "package/rpi-userland/Config.in" source "package/rs485conf/Config.in" source "package/rtc-tools/Config.in" - source "package/rtl8188eu/Config.in" - source "package/rtl8189es/Config.in" - source "package/rtl8189fs/Config.in" - source "package/rtl8192eu/Config.in" - source "package/rtl8723bu/Config.in" - source "package/rtl8723ds/Config.in" - source "package/rtl8723ds-bt/Config.in" - source "package/rtl8812au-aircrack-ng/Config.in" - source "package/rtl8821au/Config.in" - source "package/rtl8821cu/Config.in" source "package/sane-backends/Config.in" source "package/sdparm/Config.in" source "package/sedutil/Config.in" @@ -632,12 +622,26 @@ endmenu source "package/usbguard/Config.in" source "package/usbmount/Config.in" source "package/usbutils/Config.in" +if !BR2_s390x +menu "Wireless Drivers" + source "package/rtl8188eu/Config.in" + source "package/rtl8189es/Config.in" + source "package/rtl8189fs/Config.in" + source "package/rtl8192eu/Config.in" + source "package/rtl8723bu/Config.in" + source "package/rtl8723ds/Config.in" + source "package/rtl8723ds-bt/Config.in" + source "package/rtl8812au-aircrack-ng/Config.in" + source "package/rtl8821au/Config.in" + source "package/rtl8821cu/Config.in" + source "package/wilc-driver/Config.in" + source "package/xr819-xradio/Config.in" +endmenu +endif 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" endmenu menu "Interpreter languages and scripting" -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 14 12:16:40 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 14 Feb 2023 13:16:40 +0100 Subject: [Buildroot] [PATCH] package/rtl8821cu: disable package for s390x architecture In-Reply-To: <16600_1676373529_63EB6E19_16600_354_5_20230214111846.GB3487@tl-lnx-nyma7486> References: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> <16600_1676373529_63EB6E19_16600_354_5_20230214111846.GB3487@tl-lnx-nyma7486> Message-ID: <636d30cd-bb2d-ec64-1b4f-9a1d2c98f2b7@benettiengineering.com> Hi Yann, On 14/02/23 12:18, yann.morin at orange.com wrote: > Giulio, All, > > On 2023-02-14 11:50 +0100, Giulio Benetti spake thusly: >> s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this >> package for this architecture. > > Instead of fixing each and every rtlXXXX packages one by one when there > is an autobuild failure, can we just exclude them in bulk, since they > are all wireless drivers, and thus will never be available for s390x? something like this[0] seems to work, what about it? Of course I need to clean up all the packages that depends on !BR2_s390x but the idea works for me, at least I've tested on my side and it does. If you say it's ok I clean up, check better for other Wireless Drivers, create a good patch and send it while rejecting this one. [0]: https://patchwork.ozlabs.org/project/buildroot/patch/20230214120808.1282621-1-giulio.benetti at benettiengineering.com/ -- Giulio Benetti CEO/CTO at Benetti Engineering sas > Regards, > Yann E. MORIN. > >> Fixes: >> http://autobuild.buildroot.net/results/3a74d393cdbc308eab9ec3f0f9e420947669a0ea/ >> >> Signed-off-by: Giulio Benetti >> --- >> package/rtl8821cu/Config.in | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/package/rtl8821cu/Config.in b/package/rtl8821cu/Config.in >> index a5a7b9d255..00a41b5196 100644 >> --- a/package/rtl8821cu/Config.in >> +++ b/package/rtl8821cu/Config.in >> @@ -1,8 +1,10 @@ >> comment "rtl8821cu needs a Linux kernel to be built" >> + depends on !BR2_s390x >> depends on !BR2_LINUX_KERNEL >> >> config BR2_PACKAGE_RTL8821CU >> bool "rtl8821cu" >> + depends on !BR2_s390x >> depends on BR2_LINUX_KERNEL >> help >> rtl8821cu wifi driver >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From yann.morin at orange.com Tue Feb 14 13:15:26 2023 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 14 Feb 2023 14:15:26 +0100 Subject: [Buildroot] [PATCH] package/rtl8821cu: disable package for s390x architecture In-Reply-To: <636d30cd-bb2d-ec64-1b4f-9a1d2c98f2b7@benettiengineering.com> References: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> <16600_1676373529_63EB6E19_16600_354_5_20230214111846.GB3487@tl-lnx-nyma7486> <636d30cd-bb2d-ec64-1b4f-9a1d2c98f2b7@benettiengineering.com> Message-ID: <15869_1676380529_63EB8971_15869_68_1_20230214131526.GC3487@tl-lnx-nyma7486> Giulio, All, On 2023-02-14 13:16 +0100, Giulio Benetti spake thusly: > On 14/02/23 12:18, yann.morin at orange.com wrote: > >On 2023-02-14 11:50 +0100, Giulio Benetti spake thusly: > >>s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this > >>package for this architecture. > >Instead of fixing each and every rtlXXXX packages one by one when there > >is an autobuild failure, can we just exclude them in bulk, since they > >are all wireless drivers, and thus will never be available for s390x? > something like this[0] seems to work, what about it? > > Of course I need to clean up all the packages that depends on !BR2_s390x > but the idea works for me, at least I've tested on my side and it does. > > If you say it's ok I clean up, check better for other Wireless Drivers, > create a good patch and send it while rejecting this one. > > [0]: https://patchwork.ozlabs.org/project/buildroot/patch/20230214120808.1282621-1-giulio.benetti at benettiengineering.com/ That's not really what I meant... I was mostly thinking of sending a patch series that would add the !s390x dependency to all remaining wifi drivers without waiting for them to fail in an autobuilder... However, moving them all inside a common sub-menu that is itself guarded by !s390x sounds OK. At least, when we add a new wireless driver, we'd know where to add it, and we would not have to care about forgetting the !s390x dependency... (but note that, with this email, I'm no maintainer; let's see what the maintainers think). Regards, Yann E. MORIN. -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ 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 peter at korsgaard.com Tue Feb 14 14:01:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:01:55 +0100 Subject: [Buildroot] [PATCH 1/3] package/kodi: fix armv5 build In-Reply-To: <20230117200821.2882597-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 17 Jan 2023 21:08:19 +0100") References: <20230117200821.2882597-1-bernd.kuhls@t-online.de> Message-ID: <87zg9g8hws.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Disable neon support when not available. > Fixes build error not yet found by autobuilders > /tmp/cc8LvPwi.s: Assembler messages: > /tmp/cc8LvPwi.s:28: Error: selected processor does not support `vldmia r1,{ q4-q7 }' in ARM mode > /tmp/cc8LvPwi.s:29: Error: selected processor does not support `vldmia r0,{ q8-q11 }' in ARM mode > /tmp/cc8LvPwi.s:30: Error: selected processor does not support `vmul.f32 q0,q8,d8[0]' in ARM mode > /tmp/cc8LvPwi.s:31: Error: selected processor does not support `vmul.f32 q1,q8,d10[0]' in ARM mode > /tmp/cc8LvPwi.s:32: Error: selected processor does not support `vmul.f32 q2,q8,d12[0]' in ARM mode > /tmp/cc8LvPwi.s:33: Error: selected processor does not support `vmul.f32 q3,q8,d14[0]' in ARM mode > /tmp/cc8LvPwi.s:34: Error: selected processor does not support `vmla.f32 q0,q9,d8[1]' in ARM mode > /tmp/cc8LvPwi.s:35: Error: selected processor does not support `vmla.f32 q1,q9,d10[1]' in ARM mode > /tmp/cc8LvPwi.s:36: Error: selected processor does not support `vmla.f32 q2,q9,d12[1]' in ARM mode > /tmp/cc8LvPwi.s:37: Error: selected processor does not support `vmla.f32 q3,q9,d14[1]' in ARM mode > /tmp/cc8LvPwi.s:38: Error: selected processor does not support `vmla.f32 q0,q10,d9[0]' in ARM mode > /tmp/cc8LvPwi.s:39: Error: selected processor does not support `vmla.f32 q1,q10,d11[0]' in ARM mode > /tmp/cc8LvPwi.s:40: Error: selected processor does not support `vmla.f32 q2,q10,d13[0]' in ARM mode > /tmp/cc8LvPwi.s:41: Error: selected processor does not support `vmla.f32 q3,q10,d15[0]' in ARM mode > /tmp/cc8LvPwi.s:42: Error: selected processor does not support `vmla.f32 q0,q11,d9[1]' in ARM mode > /tmp/cc8LvPwi.s:43: Error: selected processor does not support `vmla.f32 q1,q11,d11[1]' in ARM mode > /tmp/cc8LvPwi.s:44: Error: selected processor does not support `vmla.f32 q2,q11,d13[1]' in ARM mode > /tmp/cc8LvPwi.s:45: Error: selected processor does not support `vmla.f32 q3,q11,d15[1]' in ARM mode > /tmp/cc8LvPwi.s:46: Error: selected processor does not support `vstmia r0,{ q0-q3 }' in ARM mode > with this defconfig: > BR2_arm=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_KODI=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > BR2_PACKAGE_MESA3D_OPENGL_ES=y > BR2_PACKAGE_PYTHON3=y > BR2_PACKAGE_PYTHON3_PY_ONLY=y > Signed-off-by: Bernd Kuhls Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 14:02:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:02:04 +0100 Subject: [Buildroot] [PATCH 2/3] package/kodi: fix openrisc build In-Reply-To: <20230117200821.2882597-2-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 17 Jan 2023 21:08:20 +0100") References: <20230117200821.2882597-1-bernd.kuhls@t-online.de> <20230117200821.2882597-2-bernd.kuhls@t-online.de> Message-ID: <87v8k48hwj.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Fixes build error not yet found by autobuilders > -- System type: Linux > CMake Error at cmake/scripts/linux/ArchSetup.cmake:42 (message): > Unknown CPU: or1k > with this defconfig: > BR2_or1k=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_KODI=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > BR2_PACKAGE_MESA3D_OPENGL_ES=y > BR2_PACKAGE_PYTHON3=y > BR2_PACKAGE_PYTHON3_PY_ONLY=y > Signed-off-by: Bernd Kuhls Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 14:02:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:02:10 +0100 Subject: [Buildroot] [PATCH 3/3] package/kodi: fix riscv build In-Reply-To: <20230117200821.2882597-3-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 17 Jan 2023 21:08:21 +0100") References: <20230117200821.2882597-1-bernd.kuhls@t-online.de> <20230117200821.2882597-3-bernd.kuhls@t-online.de> Message-ID: <87r0us8hwd.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Fixes build error not yet found by autobuilders > -- System type: Linux > CMake Error at cmake/scripts/linux/ArchSetup.cmake:42 (message): > Unknown CPU: riscv32 > using this defconfig: > BR2_riscv=y > BR2_RISCV_32=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_KODI=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > BR2_PACKAGE_MESA3D_OPENGL_ES=y > BR2_PACKAGE_PYTHON3=y > BR2_PACKAGE_PYTHON3_PY_ONLY=y > Signed-off-by: Bernd Kuhls Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 14:39:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:39:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2: security bump to version 2.26.2 In-Reply-To: <20230127223855.72359-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 27 Jan 2023 23:38:55 +0100") References: <20230127223855.72359-1-fontaine.fabrice@gmail.com> Message-ID: <87mt5g8g5z.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Drop patch (already in version) > - Fix CVE-2022-4743: A potential memory leak issue was discovered in > SDL2 in GLES_CreateTexture() function in SDL_render_gles.c. The > vulnerability allows an attacker to cause a denial of service attack. > https://github.com/libsdl-org/SDL/releases/tag/release-2.26.0 > https://github.com/libsdl-org/SDL/releases/tag/release-2.26.1 > https://github.com/libsdl-org/SDL/releases/tag/release-2.26.2 > Signed-off-by: Fabrice Fontaine I fail to see how a memory leak in sdl2 could lead to a remote exploit, but oh well - Committed to 2022.11.x, thanks. For 2022.02.x I have instead backported the fix. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 14:01:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:01:17 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/kodi: fix riscv build Message-ID: <20230214143955.3166C85D53@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5240ca4999e5643e53bb12f4fba1ef99b70c721 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes build error not yet found by autobuilders -- System type: Linux CMake Error at cmake/scripts/linux/ArchSetup.cmake:42 (message): Unknown CPU: riscv32 using this defconfig: BR2_riscv=y BR2_RISCV_32=y BR2_TOOLCHAIN_EXTERNAL=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 39886a434a121afc89cf741d0f035422a70ba524) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index c2bc18d828..be72c525c6 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -133,7 +133,7 @@ else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y) KODI_CONF_OPTS += \ -DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \ -DWITH_CPU=powerpc$(if $(BR2_ARCH_IS_64),64) -else ifeq ($(BR2_or1k)$(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) +else ifeq ($(BR2_or1k)$(BR2_powerpc64)$(BR2_riscv)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH) else # Kodi auto-detects ARCH, tested: arm, aarch64, i386, x86_64 From peter at korsgaard.com Tue Feb 14 14:01:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:01:04 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/kodi: fix openrisc build Message-ID: <20230214143955.23BAA85D51@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=873c996fc850a325ef248e4adbca7a6a53df20b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes build error not yet found by autobuilders -- System type: Linux CMake Error at cmake/scripts/linux/ArchSetup.cmake:42 (message): Unknown CPU: or1k with this defconfig: BR2_or1k=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 86fac589fbe1ec03ddc2478bff225e369302abfb) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 0906fe1a63..c2bc18d828 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -133,7 +133,7 @@ else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y) KODI_CONF_OPTS += \ -DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \ -DWITH_CPU=powerpc$(if $(BR2_ARCH_IS_64),64) -else ifeq ($(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) +else ifeq ($(BR2_or1k)$(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH) else # Kodi auto-detects ARCH, tested: arm, aarch64, i386, x86_64 From peter at korsgaard.com Tue Feb 14 12:59:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 13:59:49 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/kodi: fix armv5 build Message-ID: <20230214143955.16EDD85D4F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=198e35ddab7b5fab0c7ca21fe85d59b0a4782c15 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Disable neon support when not available. Fixes build error not yet found by autobuilders /tmp/cc8LvPwi.s: Assembler messages: /tmp/cc8LvPwi.s:28: Error: selected processor does not support `vldmia r1,{ q4-q7 }' in ARM mode /tmp/cc8LvPwi.s:29: Error: selected processor does not support `vldmia r0,{ q8-q11 }' in ARM mode /tmp/cc8LvPwi.s:30: Error: selected processor does not support `vmul.f32 q0,q8,d8[0]' in ARM mode /tmp/cc8LvPwi.s:31: Error: selected processor does not support `vmul.f32 q1,q8,d10[0]' in ARM mode /tmp/cc8LvPwi.s:32: Error: selected processor does not support `vmul.f32 q2,q8,d12[0]' in ARM mode /tmp/cc8LvPwi.s:33: Error: selected processor does not support `vmul.f32 q3,q8,d14[0]' in ARM mode /tmp/cc8LvPwi.s:34: Error: selected processor does not support `vmla.f32 q0,q9,d8[1]' in ARM mode /tmp/cc8LvPwi.s:35: Error: selected processor does not support `vmla.f32 q1,q9,d10[1]' in ARM mode /tmp/cc8LvPwi.s:36: Error: selected processor does not support `vmla.f32 q2,q9,d12[1]' in ARM mode /tmp/cc8LvPwi.s:37: Error: selected processor does not support `vmla.f32 q3,q9,d14[1]' in ARM mode /tmp/cc8LvPwi.s:38: Error: selected processor does not support `vmla.f32 q0,q10,d9[0]' in ARM mode /tmp/cc8LvPwi.s:39: Error: selected processor does not support `vmla.f32 q1,q10,d11[0]' in ARM mode /tmp/cc8LvPwi.s:40: Error: selected processor does not support `vmla.f32 q2,q10,d13[0]' in ARM mode /tmp/cc8LvPwi.s:41: Error: selected processor does not support `vmla.f32 q3,q10,d15[0]' in ARM mode /tmp/cc8LvPwi.s:42: Error: selected processor does not support `vmla.f32 q0,q11,d9[1]' in ARM mode /tmp/cc8LvPwi.s:43: Error: selected processor does not support `vmla.f32 q1,q11,d11[1]' in ARM mode /tmp/cc8LvPwi.s:44: Error: selected processor does not support `vmla.f32 q2,q11,d13[1]' in ARM mode /tmp/cc8LvPwi.s:45: Error: selected processor does not support `vmla.f32 q3,q11,d15[1]' in ARM mode /tmp/cc8LvPwi.s:46: Error: selected processor does not support `vstmia r0,{ q0-q3 }' in ARM mode with this defconfig: BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 2952832a40b08e93bb3dc614bb2068b152b1919f) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 58ad115475..0906fe1a63 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -141,6 +141,14 @@ else KODI_CONF_OPTS += -DWITH_CPU=$(BR2_ARCH) endif +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else ifeq ($(BR2_aarch64),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else +KODI_CONF_OPTS += -DENABLE_NEON=OFF +endif + ifeq ($(BR2_X86_CPU_HAS_SSE),y) KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON else From peter at korsgaard.com Tue Feb 14 14:19:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:19:25 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/sdl2: backport upstream security fix for CVE-2022-4743 Message-ID: <20230214143955.3F71C85D56@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a74860f35d9887cdc397659f56f27940bca787d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes the following security vulnerability: CVE-2022-4743: A potential memory leak issue was discovered in SDL2 in GLES_CreateTexture() function in SDL_render_gles.c. The vulnerability allows an attacker to cause a denial of service attack. Signed-off-by: Peter Korsgaard --- ...tential-memory-leak-in-GLES_CreateTexture.patch | 37 ++++++++++++++++++++++ package/sdl2/sdl2.mk | 3 ++ 2 files changed, 40 insertions(+) diff --git a/package/sdl2/0002-Fix-potential-memory-leak-in-GLES_CreateTexture.patch b/package/sdl2/0002-Fix-potential-memory-leak-in-GLES_CreateTexture.patch new file mode 100644 index 0000000000..9488c1006c --- /dev/null +++ b/package/sdl2/0002-Fix-potential-memory-leak-in-GLES_CreateTexture.patch @@ -0,0 +1,37 @@ +From 00b67f55727bc0944c3266e2b875440da132ce4b Mon Sep 17 00:00:00 2001 +From: zhailiangliang +Date: Wed, 21 Sep 2022 10:30:38 +0800 +Subject: [PATCH] Fix potential memory leak in GLES_CreateTexture + +Signed-off-by: Peter Korsgaard +--- + src/render/opengles/SDL_render_gles.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/render/opengles/SDL_render_gles.c b/src/render/opengles/SDL_render_gles.c +index a5fbab309..ba08a46e2 100644 +--- a/src/render/opengles/SDL_render_gles.c ++++ b/src/render/opengles/SDL_render_gles.c +@@ -359,6 +359,9 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) + renderdata->glGenTextures(1, &data->texture); + result = renderdata->glGetError(); + if (result != GL_NO_ERROR) { ++ if (texture->access == SDL_TEXTUREACCESS_STREAMING) { ++ SDL_free(data->pixels); ++ } + SDL_free(data); + return GLES_SetError("glGenTextures()", result); + } +@@ -387,6 +390,9 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) + + result = renderdata->glGetError(); + if (result != GL_NO_ERROR) { ++ if (texture->access == SDL_TEXTUREACCESS_STREAMING) { ++ SDL_free(data->pixels); ++ } + SDL_free(data); + return GLES_SetError("glTexImage2D()", result); + } +-- +2.30.2 + diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 633383b9e1..c807023632 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -22,6 +22,9 @@ SDL2_CONF_OPTS += \ --disable-pulseaudio \ --disable-video-wayland +# 0002-Fix-potential-memory-leak-in-GLES_CreateTexture.patch +SDL2_IGNORE_CVES += CVE-2022-4743 + # We are using autotools build system for sdl2, so the sdl2-config.cmake # include path are not resolved like for sdl2-config script. # Change the absolute /usr path to resolve relatively to the sdl2-config.cmake location. From peter at korsgaard.com Tue Feb 14 14:00:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:00:36 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/kodi: fix openrisc build Message-ID: <20230214144233.3F59A85C83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf37b32e4022dfd8176ad54337e708da67eb7c33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes build error not yet found by autobuilders -- System type: Linux CMake Error at cmake/scripts/linux/ArchSetup.cmake:42 (message): Unknown CPU: or1k with this defconfig: BR2_or1k=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 86fac589fbe1ec03ddc2478bff225e369302abfb) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 74c800e5b4..2d8bcb4e83 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -136,7 +136,7 @@ else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y) KODI_CONF_OPTS += \ -DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \ -DWITH_CPU=powerpc$(if $(BR2_ARCH_IS_64),64) -else ifeq ($(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) +else ifeq ($(BR2_or1k)$(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH) else # Kodi auto-detects ARCH, tested: arm, aarch64, i386, x86_64 From peter at korsgaard.com Tue Feb 14 14:01:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:01:32 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/kodi: fix riscv build Message-ID: <20230214144233.492DE85D72@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db67415513d203d5ad5d84b029878fc519a8ed7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes build error not yet found by autobuilders -- System type: Linux CMake Error at cmake/scripts/linux/ArchSetup.cmake:42 (message): Unknown CPU: riscv32 using this defconfig: BR2_riscv=y BR2_RISCV_32=y BR2_TOOLCHAIN_EXTERNAL=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 39886a434a121afc89cf741d0f035422a70ba524) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 2d8bcb4e83..63b1d292ae 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -136,7 +136,7 @@ else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y) KODI_CONF_OPTS += \ -DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \ -DWITH_CPU=powerpc$(if $(BR2_ARCH_IS_64),64) -else ifeq ($(BR2_or1k)$(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) +else ifeq ($(BR2_or1k)$(BR2_powerpc64)$(BR2_riscv)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH) else # Kodi auto-detects ARCH, tested: arm, aarch64, i386, x86_64 From peter at korsgaard.com Tue Feb 14 14:13:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:13:45 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/sdl2: bump version to 2.24.2 Message-ID: <20230214144233.54CBC85D73@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e9afb26b93bcdeab3115c0f170d73c5368ac36c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Signed-off-by: Michael Fischer Signed-off-by: Thomas Petazzoni (cherry picked from commit 7c0def2452fc919b1eb4f790669f240392cde84f) Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.hash | 4 ++-- package/sdl2/sdl2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 782c552c52..923a900dc0 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.24.1.tar.gz.sig -sha256 bc121588b1105065598ce38078026a414c28ea95e66ed2adab4c44d80b309e1b SDL2-2.24.1.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.24.2.tar.gz.sig +sha256 b35ef0a802b09d90ed3add0dcac0e95820804202914f5bb7b0feb710f1a1329f SDL2-2.24.2.tar.gz # Locally calculated sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 28e2c5cb36..a1dc8b5b73 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.24.1 +SDL2_VERSION = 2.24.2 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From peter at korsgaard.com Tue Feb 14 14:13:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:13:51 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/sdl2: security bump to version 2.26.2 Message-ID: <20230214144233.5E80085D74@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=594acef246416a0b95452db393765ff60e37d662 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x - Drop patch (already in version) - Fix CVE-2022-4743: A potential memory leak issue was discovered in SDL2 in GLES_CreateTexture() function in SDL_render_gles.c. The vulnerability allows an attacker to cause a denial of service attack. https://github.com/libsdl-org/SDL/releases/tag/release-2.26.0 https://github.com/libsdl-org/SDL/releases/tag/release-2.26.1 https://github.com/libsdl-org/SDL/releases/tag/release-2.26.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d33a8417bf1bc5d7276e19da5c37da210d4de31a) Signed-off-by: Peter Korsgaard --- ...oesn-t-have-a-mode-configured-use-the-pre.patch | 76 ---------------------- package/sdl2/sdl2.hash | 4 +- package/sdl2/sdl2.mk | 2 +- 3 files changed, 3 insertions(+), 79 deletions(-) diff --git a/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch b/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch deleted file mode 100644 index c8be280c56..0000000000 --- a/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch +++ /dev/null @@ -1,76 +0,0 @@ -From da9ba3a2a1536017e4ce1ee0f4276578d1ce6e29 Mon Sep 17 00:00:00 2001 -From: Sam Lantinga -Date: Fri, 18 Nov 2022 12:17:27 -0800 -Subject: [PATCH] If a CRTC doesn't have a mode configured, use the preferred - or largest mode as the default mode - -Fixes https://github.com/libsdl-org/SDL/issues/6421 - -[mf at go-sys.de: backport from upstream] -Signed-off-by: Michael Fischer -[yann.morin.1998 at free.fr: do an actual backport] -Signed-off-by: Yann E. MORIN ---- - src/video/kmsdrm/SDL_kmsdrmvideo.c | 35 +++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 6 deletions(-) - -diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c -index eae721455..eeeefef2b 100644 ---- a/src/video/kmsdrm/SDL_kmsdrmvideo.c -+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c -@@ -666,8 +666,8 @@ KMSDRM_CrtcGetVrr(uint32_t drm_fd, uint32_t crtc_id) - /* Gets a DRM connector, builds an SDL_Display with it, and adds it to the - list of SDL Displays in _this->displays[] */ - static void --KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) { -- -+KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) -+{ - SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata); - SDL_DisplayData *dispdata = NULL; - SDL_VideoDisplay display = {0}; -@@ -770,14 +770,37 @@ KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) { - drmModeModeInfo *mode = &connector->modes[i]; - - if (!SDL_memcmp(mode, &crtc->mode, sizeof(crtc->mode))) { -- mode_index = i; -- break; -+ mode_index = i; -+ break; - } - } - - if (mode_index == -1) { -- ret = SDL_SetError("Failed to find index of mode attached to the CRTC."); -- goto cleanup; -+ int current_area, largest_area = 0; -+ -+ /* Find the preferred mode or the highest resolution mode */ -+ for (i = 0; i < connector->count_modes; i++) { -+ drmModeModeInfo *mode = &connector->modes[i]; -+ -+ if (mode->type & DRM_MODE_TYPE_PREFERRED) { -+ mode_index = i; -+ break; -+ } -+ -+ current_area = mode->hdisplay * mode->vdisplay; -+ if (current_area > largest_area) { -+ mode_index = i; -+ largest_area = current_area; -+ } -+ } -+ if (mode_index != -1) { -+ crtc->mode = connector->modes[mode_index]; -+ } -+ } -+ -+ if (mode_index == -1) { -+ ret = SDL_SetError("Failed to find index of mode attached to the CRTC."); -+ goto cleanup; - } - - /*********************************************/ --- -2.25.1 - diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 923a900dc0..86e0d86e7c 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.24.2.tar.gz.sig -sha256 b35ef0a802b09d90ed3add0dcac0e95820804202914f5bb7b0feb710f1a1329f SDL2-2.24.2.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.2.tar.gz.sig +sha256 95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0 SDL2-2.26.2.tar.gz # Locally calculated sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index a1dc8b5b73..8995178e71 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.24.2 +SDL2_VERSION = 2.26.2 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From peter at korsgaard.com Tue Feb 14 13:31:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 14:31:09 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/kodi: fix armv5 build Message-ID: <20230214144233.3471A85D6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dad63d9ec99d676f6d7b90fd17181433d56864d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Disable neon support when not available. Fixes build error not yet found by autobuilders /tmp/cc8LvPwi.s: Assembler messages: /tmp/cc8LvPwi.s:28: Error: selected processor does not support `vldmia r1,{ q4-q7 }' in ARM mode /tmp/cc8LvPwi.s:29: Error: selected processor does not support `vldmia r0,{ q8-q11 }' in ARM mode /tmp/cc8LvPwi.s:30: Error: selected processor does not support `vmul.f32 q0,q8,d8[0]' in ARM mode /tmp/cc8LvPwi.s:31: Error: selected processor does not support `vmul.f32 q1,q8,d10[0]' in ARM mode /tmp/cc8LvPwi.s:32: Error: selected processor does not support `vmul.f32 q2,q8,d12[0]' in ARM mode /tmp/cc8LvPwi.s:33: Error: selected processor does not support `vmul.f32 q3,q8,d14[0]' in ARM mode /tmp/cc8LvPwi.s:34: Error: selected processor does not support `vmla.f32 q0,q9,d8[1]' in ARM mode /tmp/cc8LvPwi.s:35: Error: selected processor does not support `vmla.f32 q1,q9,d10[1]' in ARM mode /tmp/cc8LvPwi.s:36: Error: selected processor does not support `vmla.f32 q2,q9,d12[1]' in ARM mode /tmp/cc8LvPwi.s:37: Error: selected processor does not support `vmla.f32 q3,q9,d14[1]' in ARM mode /tmp/cc8LvPwi.s:38: Error: selected processor does not support `vmla.f32 q0,q10,d9[0]' in ARM mode /tmp/cc8LvPwi.s:39: Error: selected processor does not support `vmla.f32 q1,q10,d11[0]' in ARM mode /tmp/cc8LvPwi.s:40: Error: selected processor does not support `vmla.f32 q2,q10,d13[0]' in ARM mode /tmp/cc8LvPwi.s:41: Error: selected processor does not support `vmla.f32 q3,q10,d15[0]' in ARM mode /tmp/cc8LvPwi.s:42: Error: selected processor does not support `vmla.f32 q0,q11,d9[1]' in ARM mode /tmp/cc8LvPwi.s:43: Error: selected processor does not support `vmla.f32 q1,q11,d11[1]' in ARM mode /tmp/cc8LvPwi.s:44: Error: selected processor does not support `vmla.f32 q2,q11,d13[1]' in ARM mode /tmp/cc8LvPwi.s:45: Error: selected processor does not support `vmla.f32 q3,q11,d15[1]' in ARM mode /tmp/cc8LvPwi.s:46: Error: selected processor does not support `vstmia r0,{ q0-q3 }' in ARM mode with this defconfig: BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 2952832a40b08e93bb3dc614bb2068b152b1919f) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index c41c515d10..74c800e5b4 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -144,6 +144,14 @@ else KODI_CONF_OPTS += -DWITH_CPU=$(BR2_ARCH) endif +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else ifeq ($(BR2_aarch64),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else +KODI_CONF_OPTS += -DENABLE_NEON=OFF +endif + ifeq ($(BR2_X86_CPU_HAS_SSE),y) KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON else From peter at korsgaard.com Tue Feb 14 15:32:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 16:32:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/c-ares: security bump to version 1.19.0 In-Reply-To: <20230129163135.30876-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 29 Jan 2023 17:31:35 +0100") References: <20230129163135.30876-1-fontaine.fabrice@gmail.com> Message-ID: <87h6vo8dpr.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Low. Stack overflow in ares_set_sortlist() which is used during c-ares > initialization and typically provided by an administrator and not an end > user. > https://c-ares.org/changelog.html#1_19_0 > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 15:32:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 16:32:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 9.0.1260 In-Reply-To: <20230129163953.56236-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 29 Jan 2023 17:39:53 +0100") References: <20230129163953.56236-1-fontaine.fabrice@gmail.com> Message-ID: <87cz6c8dpl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2023-0049, CVE-2023-0051, CVE-2023-0054 and CVE-2023-0288 > - Update hash of README.txt: typo fixed by > https://github.com/vim/vim/commit/f1dcd14fc5d4370476cd82895a4479ca2d252e54 > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 15:32:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 16:32:20 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/vim: security bump to version 9.0.1260 Message-ID: <20230214153307.7643885D6E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ef0499c2cd7ddb1611634d8295f7109d9de47a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x - Fix CVE-2023-0049, CVE-2023-0051, CVE-2023-0054 and CVE-2023-0288 - Update hash of README.txt: typo fixed by https://github.com/vim/vim/commit/f1dcd14fc5d4370476cd82895a4479ca2d252e54 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 98f8ddbc74962ab33df5ada2ccb53a27c49e60f1) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 4 ++-- package/vim/vim.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 03ee908db4..4000beedc1 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 c95c9abcf024bd6293ad199e4efa1c09452a9c6456c9cbaf53d896cf7b9f4d08 vim-9.0.0951.tar.gz +sha256 bcaf9b21ab00ab49de4f3bdfda1bcda82533ec16c412824226544a3fce6506ff vim-9.0.1260.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE -sha256 de04910387a62ad4f9b36b91457c8d5ef32733ac5d768a128071b93f4821fcd1 README.txt +sha256 d187aff219161f37138479257f82d687ea10b2cdd17d58b53a3ec9b79d6dc870 README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index d814c68630..e3648bfab9 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.0.0951 +VIM_VERSION = 9.0.1260 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Tue Feb 14 15:31:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 16:31:43 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/c-ares: security bump to version 1.19.0 Message-ID: <20230214153307.6BAEC85D7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01e97d849ead68fbc8521e84499f21b4154681de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Low. Stack overflow in ares_set_sortlist() which is used during c-ares initialization and typically provided by an administrator and not an end user. https://c-ares.org/changelog.html#1_19_0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 121a9d3649498c5f6f3a5ae8a37d6befe2cc8ef8) Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index af1f076aab..edf891674b 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 1a7d52a8a84a9fbffb1be9133c0f6e17217d91ea5a6fa61f6b4729cda78ebbcf c-ares-1.18.1.tar.gz +sha256 bfceba37e23fd531293829002cac0401ef49a6dc55923f7f92236585b7ad1dd3 c-ares-1.19.0.tar.gz # Hash for license file sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 0152759ebc..4332fc6919 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.18.1 +C_ARES_VERSION = 1.19.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From peter at korsgaard.com Tue Feb 14 15:32:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 16:32:10 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/c-ares: security bump to version 1.19.0 Message-ID: <20230214153421.6C24285D87@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=782f193f0fd48a39335ba5321ed76310a7a9a048 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Low. Stack overflow in ares_set_sortlist() which is used during c-ares initialization and typically provided by an administrator and not an end user. https://c-ares.org/changelog.html#1_19_0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 121a9d3649498c5f6f3a5ae8a37d6befe2cc8ef8) Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index af1f076aab..edf891674b 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 1a7d52a8a84a9fbffb1be9133c0f6e17217d91ea5a6fa61f6b4729cda78ebbcf c-ares-1.18.1.tar.gz +sha256 bfceba37e23fd531293829002cac0401ef49a6dc55923f7f92236585b7ad1dd3 c-ares-1.19.0.tar.gz # Hash for license file sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 0152759ebc..4332fc6919 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.18.1 +C_ARES_VERSION = 1.19.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From peter at korsgaard.com Tue Feb 14 15:32:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 16:32:16 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/vim: security bump to version 9.0.1260 Message-ID: <20230214153421.7A7A885D89@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef65baf8e20c3830e632e13fe99f84aeb9d0211e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Fix CVE-2023-0049, CVE-2023-0051, CVE-2023-0054 and CVE-2023-0288 - Update hash of README.txt: typo fixed by https://github.com/vim/vim/commit/f1dcd14fc5d4370476cd82895a4479ca2d252e54 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 98f8ddbc74962ab33df5ada2ccb53a27c49e60f1) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 4 ++-- package/vim/vim.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 03ee908db4..4000beedc1 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 c95c9abcf024bd6293ad199e4efa1c09452a9c6456c9cbaf53d896cf7b9f4d08 vim-9.0.0951.tar.gz +sha256 bcaf9b21ab00ab49de4f3bdfda1bcda82533ec16c412824226544a3fce6506ff vim-9.0.1260.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE -sha256 de04910387a62ad4f9b36b91457c8d5ef32733ac5d768a128071b93f4821fcd1 README.txt +sha256 d187aff219161f37138479257f82d687ea10b2cdd17d58b53a3ec9b79d6dc870 README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index d814c68630..e3648bfab9 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.0.0951 +VIM_VERSION = 9.0.1260 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From leo at yuriev.ru Tue Feb 14 15:51:29 2023 From: leo at yuriev.ru (=?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?=) Date: Tue, 14 Feb 2023 18:51:29 +0300 Subject: [Buildroot] [PATCH] package/libmdbx: bump version to 0.11.14 "Sergey Kapitsa" Message-ID: <20230214155129.679711-1-leo@yuriev.ru> This is stable bugfix release of libmdbx, in memory of Sergey Kapitsa (Russian physicist and demographer) on his 95th birthday. It is reasonable to backport this patch to all applicable releases/branches of Buildroot, at least this release fixes build for sh4 arch. Release notes for v0.11.14 -------------------------- Fixes: - backport: Refined the `__cold`/`__hot` macros to avoid the `error: inlining failed in call to ?always_inline FOO(...)?: target specific option mismatch` issue during build using GCC >10.x for SH4 arch. Actually this is GCC' SH4-backend bug which triggered by the `__attribute__((__optimize__("Os")))` used in conjunction with the `__attribute__((__cold__))`. - backport: Fixed `SIGSEGV` or an erroneous call to `free()` in case where errors occur when reopening by `mdbx_env_open()` of a previously used environment. - backport: Fixed `cursor_put_nochecklen()` internals for case when dupsort'ed named subDb contains a single key with multiple values (aka duplicates), which are replaced with a single value by put-operation with the `MDBX_UPSERT+MDBX_ALLDUPS` flags. In this case, the database becomes completely empty, without any pages. However exactly this condition was not considered and thus wasn't handled correctly. See [issue#8](https://gitflic.ru/project/erthink/libmdbx/issue/8) for more information. - backport: Fixed extra assertion inside `override_meta()`, which could lead to false-positive failing of the assertion in a debug builds during DB recovery and/or auto-rollback. Minors: - backport: Fixed typos. - backport: Refined `const` and `noexcept` for few C++ API methods. - backport: Resolve false-posirive `used uninitialized` warning from GCC >10.x while build for SH4 arch. - backport: Fixed insignificant typo of `||` inside `#if` byte-order condition. The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md Signed-off-by: ?????? ????? (Leonid Yuriev) --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index e3fb309461..b1a2891b91 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 9449fd357119e19902363ab90134d82c9a713b706394c2a1389b5bb4787b5164 libmdbx-amalgamated-0.11.13.tar.xz +sha256 97b03965b5b61727dc4232c50ccb174c632470a3d24438b3c52315bef6fb4033 libmdbx-amalgamated-0.11.14.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index a139e062f6..5e7995f8c8 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.13 +LIBMDBX_VERSION = 0.11.14 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO -- 2.34.1 From peter at korsgaard.com Tue Feb 14 16:05:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:05:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-compose: security bump version to 2.15.1 In-Reply-To: <20230202134149.1864294-1-christian@paral.in> (Christian Stewart's message of "Thu, 2 Feb 2023 05:41:49 -0800") References: <20230202134149.1864294-1-christian@paral.in> Message-ID: <878rh08c7e.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Fix CVE-2022-27664 and CVE-2022-32149 high-risk vulnerability. > Many other bugfixes, enhancements, and improvements. > https://github.com/docker/compose/releases/tag/v2.15.1 > Signed-off-by: Christian Stewart Hmm, those CVE's were for issues in go, not in docker-compose, E.G. only a vulnerability in docker-compose's binary releases. We do not use the binaries, so we shouldn't flag such version bumps as security bumps. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 16:17:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:17:13 +0100 Subject: [Buildroot] [PATCH] package/openvpn: get rid of -e in S60openvpn shebang In-Reply-To: <20230204134709.4160596-1-sorganov@gmail.com> (Sergey Organov's message of "Sat, 4 Feb 2023 16:47:09 +0300") References: <20230204134709.4160596-1-sorganov@gmail.com> Message-ID: <874jro8bna.fsf@dell.be.48ers.dk> >>>>> "Sergey" == Sergey Organov writes: > The -e switch makes the script terminate on error from > start-stop-daemon, rendering unreachable the code that checks the exit > status. > There is no need in the -e switch in the first place either, as the > script takes care of errors handling. > Signed-off-by: Sergey Organov Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:06:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:06:15 +0100 Subject: [Buildroot] [git commit] package/freeswitch: security bump version to 1.10.9 In-Reply-To: <20230205090205.CD8F4836B0@busybox.osuosl.org> (Peter Korsgaard's message of "Sun, 5 Feb 2023 09:53:53 +0100") References: <20230205090205.CD8F4836B0@busybox.osuosl.org> Message-ID: <87zg9g6ut4.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=46683dd4a6e65b5ae3188440e9ae8eaf055d9a85 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Release notes: > https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 > Upstream removed zrtp support: > https://github.com/signalwire/freeswitch/pull/1848 > Signed-off-by: Bernd Kuhls > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:06:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:06:20 +0100 Subject: [Buildroot] [git commit] package/libks: bump version to 1.8.2 In-Reply-To: <20230205101810.8142E836ED@busybox.osuosl.org> (Yann E. MORIN's message of "Sun, 5 Feb 2023 11:16:15 +0100") References: <20230205101810.8142E836ED@busybox.osuosl.org> Message-ID: <87v8k46usz.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=6e09e7987b986d01e86e4ec45319e2dd5945259c > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Needed for upcoming bump of freeswitch to version 1.10.9. > Signed-off-by: Bernd Kuhls > Signed-off-by: Yann E. MORIN Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:06:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:06:28 +0100 Subject: [Buildroot] [git commit] package/sofia-sip: bump version to 1.13.12 In-Reply-To: <20230205101810.8BBE8836EF@busybox.osuosl.org> (Yann E. MORIN's message of "Sun, 5 Feb 2023 11:16:19 +0100") References: <20230205101810.8BBE8836EF@busybox.osuosl.org> Message-ID: <87r0us6usr.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=8bb962724e3a76112b7c374ae6a1c4521f97cc65 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Switch to github helper due to lack of upstream-provided tarball. > Needed for upcoming bump of freeswitch to version 1.10.9. > Signed-off-by: Bernd Kuhls > Signed-off-by: Yann E. MORIN Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:07:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:07:14 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: Remove openal from my list In-Reply-To: <20230201192711.1632095-1-nerv@dawncrow.de> (=?utf-8?Q?=22And?= =?utf-8?Q?r=C3=A9?= Zwing"'s message of "Wed, 1 Feb 2023 20:27:11 +0100") References: <20230201192711.1632095-1-nerv@dawncrow.de> Message-ID: <87mt5g6urh.fsf@dell.be.48ers.dk> >>>>> "Andr?" == Andr? Zwing writes: > Signed-off-by: Andr? Zwing Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 16:16:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:16:28 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/openvpn: get rid of -e in S60openvpn shebang Message-ID: <20230214170733.1155185D7A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd7ca9147a0afc04a6d0d9346141245878b39339 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The -e switch makes the script terminate on error from start-stop-daemon, rendering unreachable the code that checks the exit status. There is no need in the -e switch in the first place either, as the script takes care of errors handling. Signed-off-by: Sergey Organov Signed-off-by: Yann E. MORIN (cherry picked from commit 28ca1da23433d58112304c191c319ac11edc5d77) Signed-off-by: Peter Korsgaard --- package/openvpn/S60openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn index f097cf11ec..00156c80db 100644 --- a/package/openvpn/S60openvpn +++ b/package/openvpn/S60openvpn @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # # Original version by Robert Leslie # , edited by iwj and cs From peter at korsgaard.com Tue Feb 14 16:56:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:56:42 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/freeswitch: security bump version to 1.10.9 Message-ID: <20230214170733.3A55E7FE84@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12003d0146cadea4908ed23a4bcbd5399f79ec8c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 Upstream removed zrtp support: https://github.com/signalwire/freeswitch/pull/1848 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 46683dd4a6e65b5ae3188440e9ae8eaf055d9a85) Signed-off-by: Peter Korsgaard --- package/freeswitch/freeswitch.hash | 5 ++--- package/freeswitch/freeswitch.mk | 11 +---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 18a36ff23c..3497a3283f 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,11 +1,10 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.8.-release.tar.xz.sha256 -sha256 1176b26b2f463de2980e5be953f81ced94d23c784452bd41e086d3933a88be5f freeswitch-1.10.8.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.9.-release.tar.xz.sha256 +sha256 f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 freeswitch-1.10.9.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 6234dd8e97..7497cc4964 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.8 +FREESWITCH_VERSION = 1.10.9 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -81,15 +81,6 @@ FREESWITCH_CONF_OPTS = \ --without-python \ --disable-system-xmlrpc-c -# zrtp supports a limited set of archs, sparc support is also broken due -# to a broken ld call by gcc, see libs/libzrtp/include/zrtp_config.h -ifeq ($(BR2_i386)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le)$(BR2_x86_64),y) -FREESWITCH_LICENSE_FILES += libs/libzrtp/src/zrtp_legal.c -FREESWITCH_CONF_OPTS += --enable-zrtp -else -FREESWITCH_CONF_OPTS += --disable-zrtp -endif - # Enable optional modules FREESWITCH_ENABLED_MODULES += \ applications/mod_avmd \ From peter at korsgaard.com Tue Feb 14 16:15:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:15:17 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230214170733.03DDE85DB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a512389e210629e93f09ab0094c0171aa4af8d7d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x 4.9.x / 6.0.x is now EOL. Signed-off-by: Peter Korsgaard (cherry picked from commit def789059af78cd65294cafa4288cb41691e86c7) [Peter: drop 6.1.x bump] Signed-off-by: Peter Korsgaard --- linux/linux.hash | 10 +++++----- package/linux-headers/Config.in.host | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index ab996a4d81..858b12e0cb 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -2,13 +2,13 @@ sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c93bb384a97ad1f0a4f18e442ce0291242722f78023eca658b22344541f09489 linux-5.19.17.tar.xz -sha256 e7359bd2935b54fe8bb821cf748591c36a95bed019e752d3e4d5803d9da1ccb4 linux-5.15.87.tar.xz -sha256 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 linux-5.10.162.tar.xz -sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz +sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz +sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz +sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz -sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz +sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz +sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 742d13546a..00cc18ea62 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -393,11 +393,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.302" if BR2_KERNEL_HEADERS_4_14 - default "4.19.269" if BR2_KERNEL_HEADERS_4_19 - default "5.4.228" if BR2_KERNEL_HEADERS_5_4 - default "5.10.162" if BR2_KERNEL_HEADERS_5_10 - default "5.15.87" if BR2_KERNEL_HEADERS_5_15 + default "4.14.304" if BR2_KERNEL_HEADERS_4_14 + default "4.19.271" if BR2_KERNEL_HEADERS_4_19 + default "5.4.230" if BR2_KERNEL_HEADERS_5_4 + default "5.10.166" if BR2_KERNEL_HEADERS_5_10 + default "5.15.91" if BR2_KERNEL_HEADERS_5_15 default "5.19.17" if BR2_KERNEL_HEADERS_5_19 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From peter at korsgaard.com Tue Feb 14 16:56:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:56:42 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/libks: bump version to 1.8.2 Message-ID: <20230214170733.1F02B85DB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=121037ce409839af4e0a93a9f5e49a9dc36d8084 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 6e09e7987b986d01e86e4ec45319e2dd5945259c) Signed-off-by: Peter Korsgaard --- 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 d4ad7ebbbc..dba442bdd2 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz +sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index 4aca5c5c4c..c4f0cd5c78 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.8.0 +LIBKS_VERSION = 1.8.2 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright From peter at korsgaard.com Tue Feb 14 17:07:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:07:02 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] DEVELOPERS: Remove openal from my list Message-ID: <20230214170733.46C8A85DB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b24972000a5b8014c5cea119e6f3f834a756ad69 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Signed-off-by: Andr?? Zwing Signed-off-by: Thomas Petazzoni (cherry picked from commit 6c8cda8c94e00dc4571a6ad1b3f9c1c617a63873) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 23bb7031e0..7df31b1fdb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -130,7 +130,6 @@ F: package/python-docopt/ N: Andr?? Zwing F: package/libkrb5/ -F: package/openal/ F: package/p7zip/ F: package/wine/ From peter at korsgaard.com Tue Feb 14 16:56:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:56:42 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/sofia-sip: bump version to 1.13.12 Message-ID: <20230214170733.2B61C85DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01827fbfddf741f8337eef7d1657f027040d2b7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Switch to github helper due to lack of upstream-provided tarball. Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 8bb962724e3a76112b7c374ae6a1c4521f97cc65) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 776136bb15..4617725571 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 daf75c41408c559c2d58a8fd4d39be4a8ff5144bc1db220d4dbc28deeed6670a sofia-sip-1.13.9-f6ee306084.tar.gz +sha256 03dda8653367501b7b1188a6b6513416902372e27475553de9318ee89ac390ff sofia-sip-1.13.12.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 9071d964e4..59c365365b 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,10 +4,11 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.9 -SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-f6ee306084.tar.gz -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip +SOFIA_SIP_VERSION = 1.13.12 +SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION)) SOFIA_SIP_INSTALL_STAGING = YES +# Fetched from github, no pre-generated configure script provided +SOFIA_SIP_AUTORECONF = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS From peter at korsgaard.com Tue Feb 14 16:16:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:16:17 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openvpn: get rid of -e in S60openvpn shebang Message-ID: <20230214170848.31BA785E19@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7d8ba50f6ca38dceb7f57658d302317d81817b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The -e switch makes the script terminate on error from start-stop-daemon, rendering unreachable the code that checks the exit status. There is no need in the -e switch in the first place either, as the script takes care of errors handling. Signed-off-by: Sergey Organov Signed-off-by: Yann E. MORIN (cherry picked from commit 28ca1da23433d58112304c191c319ac11edc5d77) Signed-off-by: Peter Korsgaard --- package/openvpn/S60openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn index f097cf11ec..00156c80db 100644 --- a/package/openvpn/S60openvpn +++ b/package/openvpn/S60openvpn @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # # Original version by Robert Leslie # , edited by iwj and cs From peter at korsgaard.com Tue Feb 14 16:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/sofia-sip: bump version to 1.13.9 Message-ID: <20230214170848.5CA4885E19@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a206365859d6c23ead253b8836f21f3e71318ce9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 6c33056fff080dd1795bcfb543b87e7b70ac455c) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index ae2b3e725c..776136bb15 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 ebd006a98a7dff6e7f4d8357c5ebeee1d3bee3ac29ff213a4909e845f230fcbe sofia-sip-1.13.8-756ab9b5c9.tar.gz +sha256 daf75c41408c559c2d58a8fd4d39be4a8ff5144bc1db220d4dbc28deeed6670a sofia-sip-1.13.9-f6ee306084.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 80e59057c4..9071d964e4 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,8 +4,8 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.8 -SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-756ab9b5c9.tar.gz +SOFIA_SIP_VERSION = 1.13.9 +SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-f6ee306084.tar.gz SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip SOFIA_SIP_INSTALL_STAGING = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Tue Feb 14 17:06:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:06:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] DEVELOPERS: Remove openal from my list Message-ID: <20230214170848.9434985E1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39853c1211f3f7af063be7c6f8ec4423fc49454a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Andr?? Zwing Signed-off-by: Thomas Petazzoni (cherry picked from commit 6c8cda8c94e00dc4571a6ad1b3f9c1c617a63873) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 3e4504d86d..1ff3c6e5dc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -132,7 +132,6 @@ F: package/ktap/ N: Andr?? Zwing F: package/libkrb5/ -F: package/openal/ F: package/p7zip/ F: package/wine/ From peter at korsgaard.com Tue Feb 14 16:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libks: bump version to 1.8.0 Message-ID: <20230214170848.3C59E85E1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1a765f8155c796d655d6f0c28d7bc349bc6e2cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 065750ee0c2a5e0dc217d82d17d7103ab5f22351) Signed-off-by: Peter Korsgaard --- 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 peter at korsgaard.com Tue Feb 14 16:14:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:14:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230214170848.2631F85E16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b712193b425d5bc36b621af43f4c667fdab62004 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x 4.9.x / 6.0.x is now EOL. Signed-off-by: Peter Korsgaard (cherry picked from commit def789059af78cd65294cafa4288cb41691e86c7) [Peter: drop 6.1.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 ed4e305aa7..b8f93f0eaa 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.87" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.91" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.115-cip7" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.109-cip5-rt4" 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 c10164a030..c97e90a43f 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 d8060dc88f862baaae66b42a2dbc12298ed667c698eb5c55617a7786ee47bf25 linux-5.16.20.tar.xz -sha256 e7359bd2935b54fe8bb821cf748591c36a95bed019e752d3e4d5803d9da1ccb4 linux-5.15.87.tar.xz -sha256 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 linux-5.10.162.tar.xz -sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz +sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz +sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz +sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz -sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz +sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz +sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed sha256 f3559be277be9200897022282be18cfc0278d1d8baec8058305b04b9cd72002a linux-cip-5.10.115-cip7.tar.gz sha256 71fba4ed5cb48fa7869e9fe271b68b77fed26775ce5cf2f50891aa8f71c388b3 linux-cip-5.10.109-cip5-rt4.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e082423b86..f6654f8578 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -383,11 +383,11 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "4.4.302" if BR2_KERNEL_HEADERS_4_4 default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.302" if BR2_KERNEL_HEADERS_4_14 - default "4.19.269" if BR2_KERNEL_HEADERS_4_19 - default "5.4.228" if BR2_KERNEL_HEADERS_5_4 - default "5.10.162" if BR2_KERNEL_HEADERS_5_10 - default "5.15.87" if BR2_KERNEL_HEADERS_5_15 + default "4.14.304" if BR2_KERNEL_HEADERS_4_14 + default "4.19.271" if BR2_KERNEL_HEADERS_4_19 + default "5.4.230" if BR2_KERNEL_HEADERS_5_4 + default "5.10.166" if BR2_KERNEL_HEADERS_5_10 + default "5.15.91" if BR2_KERNEL_HEADERS_5_15 default "5.16.20" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From peter at korsgaard.com Tue Feb 14 16:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libks: bump version to 1.8.2 Message-ID: <20230214170848.5163D85E16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3bc915b74ffecb71c53367f7daaec6a573b0417 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 6e09e7987b986d01e86e4ec45319e2dd5945259c) Signed-off-by: Peter Korsgaard --- 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 d4ad7ebbbc..dba442bdd2 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz +sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index 4aca5c5c4c..c4f0cd5c78 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.8.0 +LIBKS_VERSION = 1.8.2 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright From peter at korsgaard.com Tue Feb 14 16:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libks: disable tests Message-ID: <20230214170848.4725685E1B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2461817ad61503646b4c33dcb69822db8781aca5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Disables tests to avoid the following build failure with BR2_SHARED_STATIC_LIBS: [ 42%] Linking C executable teststring ../libks.so.1: undefined reference to `dlsym' Fixes: - http://autobuild.buildroot.org/results/e61a683928795402375165adf686687f3305e0c2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 267e39413ed09876c61eac1c5d7ee3042061b6f7) Signed-off-by: Peter Korsgaard --- .../0001-CMakeLists.txt-honour-BUILD_TESTING.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/package/libks/0001-CMakeLists.txt-honour-BUILD_TESTING.patch b/package/libks/0001-CMakeLists.txt-honour-BUILD_TESTING.patch new file mode 100644 index 0000000000..fbe6cabd86 --- /dev/null +++ b/package/libks/0001-CMakeLists.txt-honour-BUILD_TESTING.patch @@ -0,0 +1,41 @@ +From c850e04898a9498d447b43bf346365646ff1b19c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 13 May 2022 23:12:31 +0200 +Subject: [PATCH] CMakeLists.txt: honour BUILD_TESTING + +Allow the user to disable tests through the standard BUILD_TESTING +option: https://cmake.org/cmake/help/latest/module/CTest.html + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/signalwire/libks/pull/125] +--- + CMakeLists.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5bbac31..37e6bcd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,6 @@ + cmake_minimum_required(VERSION 3.7.2) + ++option(BUILD_TESTING "Build tests" ON) + option(KS_DEBUG_MUTEX "Debug mutexes, only works on linux for now" OFF) + option(KS_DEBUG_SPINLOCK "Debug spinlocks" OFF) + option(KS_DEBUG_POOL "Track pool allocations and provide hooks for rendering them" OFF) +@@ -609,8 +610,10 @@ endif() + #cotire(ks) + + # Add tests +-enable_testing() +-add_subdirectory(tests) ++if (BUILD_TESTING) ++ enable_testing() ++ add_subdirectory(tests) ++endif() + + if (WITH_KS_TEST) + enable_testing() +-- +2.35.1 + From peter at korsgaard.com Tue Feb 14 16:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/sofia-sip: bump version to 1.13.12 Message-ID: <20230214170848.66F3F85E1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab94614e7d5b2076433aef665bc0186e4e477df9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Switch to github helper due to lack of upstream-provided tarball. Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 8bb962724e3a76112b7c374ae6a1c4521f97cc65) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 776136bb15..4617725571 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 daf75c41408c559c2d58a8fd4d39be4a8ff5144bc1db220d4dbc28deeed6670a sofia-sip-1.13.9-f6ee306084.tar.gz +sha256 03dda8653367501b7b1188a6b6513416902372e27475553de9318ee89ac390ff sofia-sip-1.13.12.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 9071d964e4..59c365365b 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,10 +4,11 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.9 -SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-f6ee306084.tar.gz -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip +SOFIA_SIP_VERSION = 1.13.12 +SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION)) SOFIA_SIP_INSTALL_STAGING = YES +# Fetched from github, no pre-generated configure script provided +SOFIA_SIP_AUTORECONF = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS From peter at korsgaard.com Tue Feb 14 16:59:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/freeswitch: security bump version to 1.10.9 Message-ID: <20230214170848.8869B85E19@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f1df54d4d43053354749c3b8fe46c3755c746d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 Upstream removed zrtp support: https://github.com/signalwire/freeswitch/pull/1848 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 46683dd4a6e65b5ae3188440e9ae8eaf055d9a85) Signed-off-by: Peter Korsgaard --- package/freeswitch/freeswitch.hash | 5 ++--- package/freeswitch/freeswitch.mk | 11 +---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 18a36ff23c..3497a3283f 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,11 +1,10 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.8.-release.tar.xz.sha256 -sha256 1176b26b2f463de2980e5be953f81ced94d23c784452bd41e086d3933a88be5f freeswitch-1.10.8.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.9.-release.tar.xz.sha256 +sha256 f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 freeswitch-1.10.9.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 6234dd8e97..7497cc4964 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.8 +FREESWITCH_VERSION = 1.10.9 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -81,15 +81,6 @@ FREESWITCH_CONF_OPTS = \ --without-python \ --disable-system-xmlrpc-c -# zrtp supports a limited set of archs, sparc support is also broken due -# to a broken ld call by gcc, see libs/libzrtp/include/zrtp_config.h -ifeq ($(BR2_i386)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le)$(BR2_x86_64),y) -FREESWITCH_LICENSE_FILES += libs/libzrtp/src/zrtp_legal.c -FREESWITCH_CONF_OPTS += --enable-zrtp -else -FREESWITCH_CONF_OPTS += --disable-zrtp -endif - # Enable optional modules FREESWITCH_ENABLED_MODULES += \ applications/mod_avmd \ From peter at korsgaard.com Tue Feb 14 16:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/freeswitch: fix build with libressl >= 3.5.0 Message-ID: <20230214170848.712EC85E1D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=016b0adec19704b3e28456a3f237c0a20d978fe4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure with libressl raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: crypto/hash/hmac_ossl.c: In function 'srtp_hmac_alloc': crypto/hash/hmac_ossl.c:88:55: error: invalid application of 'sizeof' to incomplete type 'HMAC_CTX' {aka 'struct hmac_ctx_st'} 88 | pointer = (uint8_t *)srtp_crypto_alloc(sizeof(HMAC_CTX) + | ^~~~~~~~ crypto/hash/hmac_ossl.c:97:9: warning: implicit declaration of function 'HMAC_CTX_init'; did you mean 'HMAC_CTX_new'? [-Wimplicit-function-declaration] 97 | HMAC_CTX_init(new_hmac_ctx); | ^~~~~~~~~~~~~ | HMAC_CTX_new crypto/hash/hmac_ossl.c: In function 'srtp_hmac_dealloc': crypto/hash/hmac_ossl.c:130:5: warning: implicit declaration of function 'HMAC_CTX_cleanup' [-Wimplicit-function-declaration] 130 | HMAC_CTX_cleanup(hmac_ctx); | ^~~~~~~~~~~~~~~~ crypto/hash/hmac_ossl.c:133:40: error: invalid application of 'sizeof' to incomplete type 'HMAC_CTX' {aka 'struct hmac_ctx_st'} 133 | octet_string_set_to_zero(a, sizeof(HMAC_CTX) + sizeof(srtp_auth_t)); | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e696ead9ffffa5bb80928d75607bfbb9b263d3c6 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e4a762bf7f1b5753730d73ccac9b059f79c81387) Signed-off-by: Peter Korsgaard --- ...rypto-hash-hmac_ossl.c-fix-build-with-lib.patch | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/package/freeswitch/0003-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch b/package/freeswitch/0003-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch new file mode 100644 index 0000000000..eb717fc26d --- /dev/null +++ b/package/freeswitch/0003-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch @@ -0,0 +1,59 @@ +From c8cc6f1773ff370bb14bb963e2f632eef6d6a3c2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 12 May 2022 23:22:42 +0200 +Subject: [PATCH] libs/srtp/crypto/hash/hmac_ossl.c: fix build with libressl >= + 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +crypto/hash/hmac_ossl.c: In function 'srtp_hmac_alloc': +crypto/hash/hmac_ossl.c:88:55: error: invalid application of 'sizeof' to incomplete type 'HMAC_CTX' {aka 'struct hmac_ctx_st'} + 88 | pointer = (uint8_t *)srtp_crypto_alloc(sizeof(HMAC_CTX) + + | ^~~~~~~~ +crypto/hash/hmac_ossl.c:97:9: warning: implicit declaration of function 'HMAC_CTX_init'; did you mean 'HMAC_CTX_new'? [-Wimplicit-function-declaration] + 97 | HMAC_CTX_init(new_hmac_ctx); + | ^~~~~~~~~~~~~ + | HMAC_CTX_new +crypto/hash/hmac_ossl.c: In function 'srtp_hmac_dealloc': +crypto/hash/hmac_ossl.c:130:5: warning: implicit declaration of function 'HMAC_CTX_cleanup' [-Wimplicit-function-declaration] + 130 | HMAC_CTX_cleanup(hmac_ctx); + | ^~~~~~~~~~~~~~~~ +crypto/hash/hmac_ossl.c:133:40: error: invalid application of 'sizeof' to incomplete type 'HMAC_CTX' {aka 'struct hmac_ctx_st'} + 133 | octet_string_set_to_zero(a, sizeof(HMAC_CTX) + sizeof(srtp_auth_t)); + | ^~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/e696ead9ffffa5bb80928d75607bfbb9b263d3c6 + +Signed-off-by: Fabrice Fontaine +--- + libs/srtp/crypto/hash/hmac_ossl.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libs/srtp/crypto/hash/hmac_ossl.c b/libs/srtp/crypto/hash/hmac_ossl.c +index 8146438b05..6730cbb35c 100644 +--- a/libs/srtp/crypto/hash/hmac_ossl.c ++++ b/libs/srtp/crypto/hash/hmac_ossl.c +@@ -79,7 +79,8 @@ static srtp_err_status_t srtp_hmac_alloc(srtp_auth_t **a, + + /* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated + using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + { + /* allocate memory for auth and HMAC_CTX structures */ + uint8_t *pointer; +@@ -125,7 +126,8 @@ static srtp_err_status_t srtp_hmac_dealloc(srtp_auth_t *a) + + hmac_ctx = (HMAC_CTX *)a->state; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + HMAC_CTX_cleanup(hmac_ctx); + + /* zeroize entire state*/ +-- +2.35.1 + From peter at korsgaard.com Tue Feb 14 16:59:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/freeswitch: bump version to 1.10.8 Message-ID: <20230214170848.7CF8985E16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fdc283c0b121d0d0f66ad927ce69059ef44bf62d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.8 Removed two patches which are included in upstream release, renumbered remaining patch. Removed libs/apr-util/LICENSE due to upstream removal of bundled apr-util package. Added fix to disable pcap detection, otherwise /usr/bin/pcap-config can be picked-up which breaks building freeswitch. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 1b8230ab648ec33b93ff29a6c1ed5b327d36c7dd) Signed-off-by: Peter Korsgaard --- ...-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch | 26 ----- ...ypto-hash-hmac_ossl.c-fix-build-with-lib.patch} | 0 .../freeswitch/0002-core-fix--disable-libyuv.patch | 129 --------------------- package/freeswitch/freeswitch.hash | 5 +- package/freeswitch/freeswitch.mk | 9 +- 5 files changed, 8 insertions(+), 161 deletions(-) diff --git a/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch deleted file mode 100644 index 57f6e660c1..0000000000 --- a/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 68039d344d8e826e8b403c9cd0284fd07b4495ac Mon Sep 17 00:00:00 2001 -From: Dragos Oancea -Date: Tue, 26 Oct 2021 08:42:58 +0000 -Subject: [PATCH] [core] fix build SWITCH_BYTE_ORDER == __BIG_ENDIAN - -Downloaded from upstream commit: -https://github.com/signalwire/freeswitch/commit/68039d344d8e826e8b403c9cd0284fd07b4495ac - -Signed-off-by: Bernd Kuhls ---- - src/switch_rtp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/switch_rtp.c b/src/switch_rtp.c -index 1880bbb19c..843ee81381 100644 ---- a/src/switch_rtp.c -+++ b/src/switch_rtp.c -@@ -2155,7 +2155,7 @@ static void switch_send_rtcp_event(switch_rtp_t *rtp_session ,struct switch_rtcp - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value); - snprintf(header, sizeof(header), "Source-Lost"); - #if SWITCH_BYTE_ORDER == __BIG_ENDIAN -- tmpLost = report->lost; /* signed 24bit will extended signess to int32_t automatically */ -+ tmpLost = rtcp_report_block->lost; /* signed 24bit will extended signess to int32_t automatically */ - #else - tmpLost = ntohl(rtcp_report_block->lost)>>8; - tmpLost = tmpLost | ((tmpLost & 0x00800000) ? 0xff000000 : 0x00000000); /* ...and signess compensation */ diff --git a/package/freeswitch/0003-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch b/package/freeswitch/0001-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch similarity index 100% rename from package/freeswitch/0003-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch rename to package/freeswitch/0001-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch diff --git a/package/freeswitch/0002-core-fix--disable-libyuv.patch b/package/freeswitch/0002-core-fix--disable-libyuv.patch deleted file mode 100644 index 137cb27cf8..0000000000 --- a/package/freeswitch/0002-core-fix--disable-libyuv.patch +++ /dev/null @@ -1,129 +0,0 @@ -From a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 Mon Sep 17 00:00:00 2001 -From: Sebastian Kemper -Date: Mon, 1 Nov 2021 09:59:09 +0100 -Subject: [PATCH] [core] fix "--disable-libyuv" - -Recent changes made it impossible to compile freeswitch without libyuv -support. - -src/switch_core_video.c: In function 'switch_img_read_from_file': -src/switch_core_video.c:3139:4: error: implicit declaration of function 'RAWToI420' [-Werror=implicit-function-declaration] -RAWToI420(data, width * 3, -^ -src/switch_core_video.c:3148:4: error: implicit declaration of function 'ABGRToARGB' [-Werror=implicit-function-declaration] -ABGRToARGB(data, width * 4, img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], width, height); -^ - -Fix this my adding/moving the checks for "SWITCH_HAVE_YUV". - -Downloaded from upstream commit: -https://github.com/signalwire/freeswitch/commit/a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 - -Signed-off-by: Bernd Kuhls -Signed-off-by: Sebastian Kemper ---- - src/switch_core_video.c | 12 ++++++++++++ - tests/unit/switch_core_video.c | 4 ++++ - 2 files changed, 16 insertions(+) - -diff --git a/src/switch_core_video.c b/src/switch_core_video.c -index 7dbd685d6ee..0d377f9c3e4 100644 ---- a/src/switch_core_video.c -+++ b/src/switch_core_video.c -@@ -3116,6 +3116,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url_png(switch_image_t *img, cha - - SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name, switch_img_fmt_t img_fmt) - { -+#ifdef SWITCH_HAVE_YUV - int width = 0, height = 0, channels = 0; - int comp = STBI_rgb; - unsigned char *data = NULL; -@@ -3155,12 +3156,16 @@ SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name - } else if (data) { - stbi_image_free(data); - } -+#endif - - return NULL; - } - - SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, const char* file_name, int quality) - { -+#ifndef SWITCH_HAVE_YUV -+ return SWITCH_STATUS_FALSE; -+#else - int comp = STBI_rgb; - unsigned char *data = NULL; - const char *ext = strrchr(file_name, '.'); -@@ -3217,6 +3222,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, co - free(data); - - return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; -+#endif - } - - typedef struct data_url_context_s { -@@ -3224,14 +3230,19 @@ typedef struct data_url_context_s { - char **urlP; - } data_url_context_t; - -+#ifdef SWITCH_HAVE_YUV - static void data_url_write_func(void *context, void *data, int size) - { - switch_buffer_t *buffer = (switch_buffer_t *)context; - switch_buffer_write(buffer, data, size); - } -+#endif - - SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char **urlP, const char *type, int quality) - { -+#ifndef SWITCH_HAVE_YUV -+ return SWITCH_STATUS_FALSE; -+#else - int comp = STBI_rgb; - unsigned char *data = NULL; - int stride_in_bytes = 0; -@@ -3300,6 +3311,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char ** - switch_buffer_destroy(&buffer); - - return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; -+#endif /* SWITCH_HAVE_YUV */ - } - - -diff --git a/tests/unit/switch_core_video.c b/tests/unit/switch_core_video.c -index 27c96102929..e395db474d5 100644 ---- a/tests/unit/switch_core_video.c -+++ b/tests/unit/switch_core_video.c -@@ -48,6 +48,7 @@ FST_CORE_BEGIN("./conf") - } - FST_TEARDOWN_END() - -+#ifdef SWITCH_HAVE_YUV - FST_TEST_BEGIN(data_url_test) - { - char *data_url = NULL; -@@ -88,6 +89,7 @@ FST_CORE_BEGIN("./conf") - unlink(argb_filename); - } - FST_TEST_END() -+#endif /* SWITCH_HAVE_YUV */ - - FST_TEST_BEGIN(img_patch) - { -@@ -239,6 +241,7 @@ FST_CORE_BEGIN("./conf") - } - FST_TEST_END() - -+#ifdef SWITCH_HAVE_YUV - FST_TEST_BEGIN(stb_data_url) - { - switch_image_t *img = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, 120, 60, 1); -@@ -321,6 +324,7 @@ FST_CORE_BEGIN("./conf") - unlink(jpg_write_filename); - } - FST_TEST_END() -+#endif /* SWITCH_HAVE_YUV */ - } - FST_SUITE_END() - } diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 8066c620c4..18a36ff23c 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,10 +1,9 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.7.-release.tar.xz.sha256 -sha256 0919bddc2ea9cab2e4944314e71637bea9dd4f40d510722a74ea032104594c41 freeswitch-1.10.7.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.8.-release.tar.xz.sha256 +sha256 1176b26b2f463de2980e5be953f81ced94d23c784452bd41e086d3933a88be5f freeswitch-1.10.8.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE -sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a libs/apr-util/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 24c1ee4dd4..6234dd8e97 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,20 +4,19 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.7 +FREESWITCH_VERSION = 1.10.8 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging FREESWITCH_INSTALL_STAGING = YES FREESWITCH_LICENSE = MPL-1.1, \ GPL-3.0+ with font exception (fonts), \ - Apache-2.0 (apr, apr-util), \ + Apache-2.0 (apr), \ BSD-3-Clause (libsrtp) FREESWITCH_LICENSE_FILES = \ COPYING \ libs/apr/LICENSE \ - libs/apr-util/LICENSE \ libs/srtp/LICENSE FREESWITCH_CPE_ID_VENDOR = freeswitch @@ -50,6 +49,10 @@ FREESWITCH_CONF_ENV += \ ac_cv_prog_PHP_CONFIG=false \ ac_cv_have_php_config=no +# disable pcap detection, pcap is an optional dependency for unit tests +FREESWITCH_CONF_ENV += \ + ac_cv_prog_HAVE_PCAP_CONFIG=false + # copied from freeswitch/configure.ac, line 258+ FREESWITCH_CONF_ENV += \ ac_cv_file__dev_ptmx=yes \ From peter at korsgaard.com Tue Feb 14 17:12:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:57 +0100 Subject: [Buildroot] [PATCH] package/mpd: update to version 0.23.12 In-Reply-To: <20230213092611.86858-1-br015@umbiko.net> (Andreas Ziegler's message of "Mon, 13 Feb 2023 10:26:11 +0100") References: <20230213092611.86858-1-br015@umbiko.net> Message-ID: <87ilg46uhy.fsf@dell.be.48ers.dk> >>>>> "Andreas" == Andreas Ziegler writes: > List of changes: > decoder::mad: fix integer underflow with very small files > input::curl: require CURL 7.55.0 or later > output::pipewire: adjust to PipeWire 0.3.64 API change > tags:: fix crash bug due to race condition > fix build failures with GCC 13 > Change log: > https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.12/NEWS > Commit: > https://github.com/MusicPlayerDaemon/MPD/commit/b1422fb > Tested on: > i386 (build) > x86_64 (build, run) > Aarch64 (build) > Signed-off-by: Andreas Ziegler Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:13:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:13:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix legal info In-Reply-To: <20230213181217.908103-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 13 Feb 2023 19:12:17 +0100") References: <20230213181217.908103-1-fontaine.fabrice@gmail.com> Message-ID: <87edqs6ugw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 57e297a215193c92f6a178139db53616f2ee23b5 forgot to update hash of > COPYRIGHT file (year updated with > https://github.com/postgres/postgres/commit/1fbcb1360bc19b89369209203ea7cc19b8cde224) > Fixes: > - http://autobuild.buildroot.org/results/93f40dc71619745ddc6741598c9a488c81ea440f > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:13:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:13:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/apr-util: security bump to version 1.6.3 In-Reply-To: <20230213181332.908961-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 13 Feb 2023 19:13:32 +0100") References: <20230213181332.908961-1-fontaine.fabrice@gmail.com> Message-ID: <87a61g6ugq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > *) SECURITY: CVE-2022-25147 (cve.mitre.org) > Integer Overflow or Wraparound vulnerability in apr_base64 functions > of Apache Portable Runtime Utility (APR-util) allows an attacker to > write beyond bounds of a buffer. > https://downloads.apache.org/apr/Announcement-aprutil-1.x.html > https://downloads.apache.org/apr/CHANGES-APR-UTIL-1.6 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:14:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: bump to version 6.2.7 In-Reply-To: <20230213181523.910359-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 13 Feb 2023 19:15:23 +0100") References: <20230213181523.910359-1-fontaine.fabrice@gmail.com> Message-ID: <875yc46ug6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - host-pkgconf is now mandatory > - switch to pcre2 which is supported since version 6.0.0 and > https://github.com/zabbix/zabbix/commit/18917f919a68abc863a5c79ba88c0cb156255fdc > - Update hash of README (links updated with > https://github.com/zabbix/zabbix/commit/067f5f873fb18ae7b22c5eaef40f0898b98edeb5 > https://github.com/zabbix/zabbix/commit/499dbc81b987513233d579610335b8938f1ae91d) > https://github.com/zabbix/zabbix/blob/6.2.7/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:14:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:28 +0100 Subject: [Buildroot] [PATCH] package/dnsmasq: bump version to 2.89 In-Reply-To: <20230214090424.9335-1-heiko.thiery@gmail.com> (Heiko Thiery's message of "Tue, 14 Feb 2023 10:04:25 +0100") References: <20230214090424.9335-1-heiko.thiery@gmail.com> Message-ID: <871qms6uff.fsf@dell.be.48ers.dk> >>>>> "Heiko" == Heiko Thiery writes: > Signed-off-by: Heiko Thiery Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:14:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:43 +0100 Subject: [Buildroot] [PATCH] package/wireless-regdb: bump version to 2023.02.13 In-Reply-To: <20230214091141.12503-1-heiko.thiery@gmail.com> (Heiko Thiery's message of "Tue, 14 Feb 2023 10:11:42 +0100") References: <20230214091141.12503-1-heiko.thiery@gmail.com> Message-ID: <87wn4k5fuk.fsf@dell.be.48ers.dk> >>>>> "Heiko" == Heiko Thiery writes: > Signed-off-by: Heiko Thiery Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:15:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:01 +0100 Subject: [Buildroot] [PATCH] package/sdl2: bump version to 2.26.3 In-Reply-To: <20230214090535.9545-1-mf@go-sys.de> (Michael Fischer's message of "Tue, 14 Feb 2023 10:05:35 +0100") References: <20230214090535.9545-1-mf@go-sys.de> Message-ID: <87sff85fu2.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Fischer writes: > Update the license hash because of a change in copyright year: > - Copyright (C) 1997-2022 Sam Lantinga > + Copyright (C) 1997-2023 Sam Lantinga > Signed-off-by: Michael Fischer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:15:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:14 +0100 Subject: [Buildroot] [PATCH] package/gnuplot: bump version to 5.4.6 In-Reply-To: <20230214093414.5861-1-mf@go-sys.de> (Michael Fischer's message of "Tue, 14 Feb 2023 10:34:14 +0100") References: <20230214093414.5861-1-mf@go-sys.de> Message-ID: <87o7pw5ftp.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Fischer writes: > Signed-off-by: Michael Fischer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:15:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:45 +0100 Subject: [Buildroot] [PATCH] package/libmdbx: bump version to 0.11.14 "Sergey Kapitsa" In-Reply-To: <20230214155129.679711-1-leo@yuriev.ru> (=?utf-8?B?ItCb0LU=?= =?utf-8?B?0L7QvdC40LQg0K7RgNGM0LXQsg==?= (Leonid Yuriev)"'s message of "Tue, 14 Feb 2023 18:51:29 +0300") References: <20230214155129.679711-1-leo@yuriev.ru> Message-ID: <87k00k5fsu.fsf@dell.be.48ers.dk> >>>>> "??????" == ?????? ????? (Leonid Yuriev) writes: > This is stable bugfix release of libmdbx, > in memory of Sergey Kapitsa (Russian physicist and demographer) on his 95th birthday. > It is reasonable to backport this patch to all applicable releases/branches of Buildroot, > at least this release fixes build for sh4 arch. > Release notes for v0.11.14 > -------------------------- > Fixes: > - backport: Refined the `__cold`/`__hot` macros to avoid the > `error: inlining failed in call to ?always_inline FOO(...)?: target specific option mismatch` > issue during build using GCC >10.x for SH4 arch. > Actually this is GCC' SH4-backend bug which triggered by the `__attribute__((__optimize__("Os")))` > used in conjunction with the `__attribute__((__cold__))`. > - backport: Fixed `SIGSEGV` or an erroneous call to `free()` in case where > errors occur when reopening by `mdbx_env_open()` of a previously used > environment. > - backport: Fixed `cursor_put_nochecklen()` internals for case when dupsort'ed named subDb > contains a single key with multiple values (aka duplicates), which are replaced > with a single value by put-operation with the `MDBX_UPSERT+MDBX_ALLDUPS` flags. > In this case, the database becomes completely empty, without any pages. > However exactly this condition was not considered and thus wasn't handled correctly. > See [issue#8](https://gitflic.ru/project/erthink/libmdbx/issue/8) for more information. > - backport: Fixed extra assertion inside `override_meta()`, which could > lead to false-positive failing of the assertion in a debug builds during > DB recovery and/or auto-rollback. > Minors: > - backport: Fixed typos. > - backport: Refined `const` and `noexcept` for few C++ API methods. > - backport: Resolve false-posirive `used uninitialized` warning from GCC >10.x > while build for SH4 arch. > - backport: Fixed insignificant typo of `||` inside `#if` byte-order condition. > The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md > Signed-off-by: ?????? ????? (Leonid Yuriev) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:16:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:16:13 +0100 Subject: [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series In-Reply-To: <20230213115812.582772-1-peter@korsgaard.com> (Peter Korsgaard's message of "Mon, 13 Feb 2023 12:58:09 +0100") References: <20230213115812.582772-1-peter@korsgaard.com> Message-ID: <87fsb85fs2.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > 4.9.x / 6.0.x is now EOL. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:16:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:16:16 +0100 Subject: [Buildroot] [PATCH 2/3] package/linux-headers: drop 4.9.x option In-Reply-To: <20230213115812.582772-2-peter@korsgaard.com> (Peter Korsgaard's message of "Mon, 13 Feb 2023 12:58:10 +0100") References: <20230213115812.582772-1-peter@korsgaard.com> <20230213115812.582772-2-peter@korsgaard.com> Message-ID: <87bklw5frz.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > The 4.9.x series is now EOL upstream, so drop the linux-headers option and > add legacy handling for it. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:16:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:16:20 +0100 Subject: [Buildroot] [PATCH 3/3] package/linux-headers: drop 6.0.x option In-Reply-To: <20230213115812.582772-3-peter@korsgaard.com> (Peter Korsgaard's message of "Mon, 13 Feb 2023 12:58:11 +0100") References: <20230213115812.582772-1-peter@korsgaard.com> <20230213115812.582772-3-peter@korsgaard.com> Message-ID: <877cwk5frv.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > The 6.0.x series is now EOL upstream, so drop the linux-headers option and > add legacy handling for it. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:11:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:11:38 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230214171654.5C23B85E9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36a8be4770d93c0a4346008c56f6ab6862b9b509 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 4.9.x / 6.0.x is now EOL. 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 774f1e0975..11dc5cce07 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.11" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" 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 e88abe5bb8..f797d5a61a 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b linux-6.1.9.tar.xz +sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz -sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz -sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz +sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz +sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz +sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz -sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz +sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz +sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1146231e41..8a76f93d62 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -394,13 +394,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.304" if BR2_KERNEL_HEADERS_4_14 - default "4.19.271" if BR2_KERNEL_HEADERS_4_19 - default "5.4.230" if BR2_KERNEL_HEADERS_5_4 - default "5.10.166" if BR2_KERNEL_HEADERS_5_10 - default "5.15.91" if BR2_KERNEL_HEADERS_5_15 + default "4.14.305" if BR2_KERNEL_HEADERS_4_14 + default "4.19.272" if BR2_KERNEL_HEADERS_4_19 + default "5.4.231" if BR2_KERNEL_HEADERS_5_4 + default "5.10.167" if BR2_KERNEL_HEADERS_5_10 + default "5.15.93" if BR2_KERNEL_HEADERS_5_15 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 - default "6.1.9" if BR2_KERNEL_HEADERS_6_1 + default "6.1.11" if BR2_KERNEL_HEADERS_6_1 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 Tue Feb 14 17:11:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:11:29 +0100 Subject: [Buildroot] [git commit] package/mpd: update to version 0.23.12 Message-ID: <20230214171654.4A78785E9E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=86a3bd33c2d52b2d3e014913857abaa7f24f428c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master List of changes: decoder::mad: fix integer underflow with very small files input::curl: require CURL 7.55.0 or later output::pipewire: adjust to PipeWire 0.3.64 API change tags:: fix crash bug due to race condition fix build failures with GCC 13 Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.12/NEWS Commit: https://github.com/MusicPlayerDaemon/MPD/commit/b1422fb Tested on: i386 (build) x86_64 (build, run) Aarch64 (build) Signed-off-by: Andreas Ziegler Signed-off-by: Peter Korsgaard --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 8c488d0357..2521238f64 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 edb4e7a8f9dff238b5610f9e2461940ea98c727a5462fafb1cdf836304dfdca9 mpd-0.23.11.tar.xz +sha256 b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7 mpd-0.23.12.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 449600eda2..6c25c9b46f 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).11 +MPD_VERSION = $(MPD_VERSION_MAJOR).12 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 Tue Feb 14 17:12:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:17 +0100 Subject: [Buildroot] [git commit] package/linux-headers: drop 6.0.x option Message-ID: <20230214171654.8E09C85E9E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2b70aa9492517717f948f199e99f055a5c1dde1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The 6.0.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e2dc854c78..7f69462f2e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_6_0 + bool "kernel headers version 6.0.x are no longer supported" + select BR2_LEGACY + help + Version 6.0.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_KERNEL_HEADERS_4_9 bool "kernel headers version 4.9.x are no longer supported" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index ae8b5e5f62..52eb534b40 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz -sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6970090855..18c179ec8d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -45,10 +45,6 @@ config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 -config BR2_KERNEL_HEADERS_6_0 - bool "Linux 6.0.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 - config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 @@ -393,7 +389,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.231" if BR2_KERNEL_HEADERS_5_4 default "5.10.167" if BR2_KERNEL_HEADERS_5_10 default "5.15.93" if BR2_KERNEL_HEADERS_5_15 - default "6.0.19" if BR2_KERNEL_HEADERS_6_0 default "6.1.11" if BR2_KERNEL_HEADERS_6_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From peter at korsgaard.com Tue Feb 14 17:12:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:05 +0100 Subject: [Buildroot] [git commit] package/linux-headers: drop 4.9.x option Message-ID: <20230214171654.75AD885EA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6634710cdb12ec5b972c2c4068636dfd591cae4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The 4.9.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 72deb03c35..e2dc854c78 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_4_9 + bool "kernel headers version 4.9.x are no longer supported" + select BR2_LEGACY + help + Version 4.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_DOCKER_PROXY bool "docker-proxy removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index f797d5a61a..ae8b5e5f62 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -6,7 +6,6 @@ sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux- sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz # Locally computed diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8a76f93d62..6970090855 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -24,11 +24,6 @@ config BR2_KERNEL_HEADERS_AS_KERNEL depends on BR2_LINUX_KERNEL select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION -config BR2_KERNEL_HEADERS_4_9 - bool "Linux 4.9.x kernel headers" - depends on !BR2_riscv - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 - config BR2_KERNEL_HEADERS_4_14 bool "Linux 4.14.x kernel headers" depends on !BR2_riscv @@ -393,7 +388,6 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.337" if BR2_KERNEL_HEADERS_4_9 default "4.14.305" if BR2_KERNEL_HEADERS_4_14 default "4.19.272" if BR2_KERNEL_HEADERS_4_19 default "5.4.231" if BR2_KERNEL_HEADERS_5_4 From peter at korsgaard.com Tue Feb 14 17:12:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:48 +0100 Subject: [Buildroot] [git commit] package/zabbix: bump to version 6.2.7 Message-ID: <20230214171654.B1C7685EA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89fa774a191d41ed5d125d87d812ff3478902251 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - host-pkgconf is now mandatory - switch to pcre2 which is supported since version 6.0.0 and https://github.com/zabbix/zabbix/commit/18917f919a68abc863a5c79ba88c0cb156255fdc - Update hash of README (links updated with https://github.com/zabbix/zabbix/commit/067f5f873fb18ae7b22c5eaef40f0898b98edeb5 https://github.com/zabbix/zabbix/commit/499dbc81b987513233d579610335b8938f1ae91d) https://github.com/zabbix/zabbix/blob/6.2.7/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/zabbix/Config.in | 2 +- package/zabbix/zabbix.hash | 4 ++-- package/zabbix/zabbix.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index 0f7a0b0003..377c0ff692 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ZABBIX bool "zabbix" depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Zabbix is an enterprise-class open source distributed monitoring solution. Zabbix is free of cost. Zabbix is diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash index 42cc0bda57..bb6127e5ec 100644 --- a/package/zabbix/zabbix.hash +++ b/package/zabbix/zabbix.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 19686628df76e8d5ef7c2ed2975b258c7ca3ec7d151b1bb59d7e132f9fc7c941 zabbix-5.4.9.tar.gz -sha256 10d68ec3abacc29222c07748fc5e5cb9474fd7cd9ccdde1b92ff941ded946b78 README +sha256 6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d zabbix-6.2.7.tar.gz +sha256 f8fc3fd12521b60d53d8c5d48a883eb3c9c5ddec9de986a273e1b77f69d811db README sha256 444fe54aecc95ac0f3314289c300afc73b3946a4dc9fbd7e022709b3e0924dd0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e00d693ba5..db9efed78b 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -4,8 +4,8 @@ # ################################################################################ -ZABBIX_VERSION_MAJOR = 5.4 -ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 +ZABBIX_VERSION_MAJOR = 6.2 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).7 ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING @@ -13,9 +13,8 @@ ZABBIX_CPE_ID_VENDOR = zabbix # We're patching m4/netsnmp.m4 ZABBIX_AUTORECONF = YES -ZABBIX_DEPENDENCIES = pcre +ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ - --with-libpcre=$(STAGING_DIR)/usr/bin/ \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \ From peter at korsgaard.com Tue Feb 14 17:12:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:33 +0100 Subject: [Buildroot] [git commit] package/apr-util: security bump to version 1.6.3 Message-ID: <20230214171654.9F07885E9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4231054b05436978795267330202f72be0d3a4d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master *) SECURITY: CVE-2022-25147 (cve.mitre.org) Integer Overflow or Wraparound vulnerability in apr_base64 functions of Apache Portable Runtime Utility (APR-util) allows an attacker to write beyond bounds of a buffer. https://downloads.apache.org/apr/Announcement-aprutil-1.x.html https://downloads.apache.org/apr/CHANGES-APR-UTIL-1.6 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/apr-util/apr-util.hash | 4 ++-- package/apr-util/apr-util.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apr-util/apr-util.hash b/package/apr-util/apr-util.hash index 59ef590109..7e2793cd77 100644 --- a/package/apr-util/apr-util.hash +++ b/package/apr-util/apr-util.hash @@ -1,4 +1,4 @@ -# From http://www.apache.org/dist/apr/apr-util-1.6.1.tar.bz2.sha256 -sha256 d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b apr-util-1.6.1.tar.bz2 +# From http://www.apache.org/dist/apr/apr-util-1.6.3.tar.bz2.sha256 +sha256 a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5 apr-util-1.6.3.tar.bz2 # Locally calculated sha256 ef5609d18601645ad6fe22c6c122094be40e976725c1d0490778abacc836e7a2 LICENSE diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index fb0735f5e7..02b6d5e277 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -4,7 +4,7 @@ # ################################################################################ -APR_UTIL_VERSION = 1.6.1 +APR_UTIL_VERSION = 1.6.3 APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2 APR_UTIL_SITE = https://archive.apache.org/dist/apr APR_UTIL_LICENSE = Apache-2.0 From peter at korsgaard.com Tue Feb 14 17:14:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:21 +0100 Subject: [Buildroot] [git commit] package/dnsmasq: bump version to 2.89 Message-ID: <20230214171654.DDEBA85E9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38101cea6ed695901ec54e52ae3db528f5e19979 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Tested-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/dnsmasq/dnsmasq.hash | 4 ++-- package/dnsmasq/dnsmasq.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index fd015d38ac..02ffb2656b 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.88.tar.xz.asc -sha256 23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3 dnsmasq-2.88.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc +sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 3945e4256a..58c5390433 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.88 +DNSMASQ_VERSION = 2.89 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" From peter at korsgaard.com Tue Feb 14 17:14:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:40 +0100 Subject: [Buildroot] [git commit] package/wireless-regdb: bump version to 2023.02.13 Message-ID: <20230214171654.F2D9385E9E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67eb00b807ddd168a9765e953405d03e18599fb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery 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 91fcb320d2..36451f839d 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 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz +sha256 fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73 wireless-regdb-2023.02.13.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 35a8c6686d..68fbe35b8b 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2022.02.18 +WIRELESS_REGDB_VERSION = 2023.02.13 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 Tue Feb 14 17:13:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:13:18 +0100 Subject: [Buildroot] [git commit] package/postgresql: fix legal info Message-ID: <20230214171654.C89EE85E9E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3cd0132561ecfb471d76409f40aa565612f10208 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 57e297a215193c92f6a178139db53616f2ee23b5 forgot to update hash of COPYRIGHT file (year updated with https://github.com/postgres/postgres/commit/1fbcb1360bc19b89369209203ea7cc19b8cde224) Fixes: - http://autobuild.buildroot.org/results/93f40dc71619745ddc6741598c9a488c81ea440f Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index e6a9bd6658..3e89d3ec35 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ # From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated -sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT +sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT From peter at korsgaard.com Tue Feb 14 17:14:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:57 +0100 Subject: [Buildroot] [git commit] package/sdl2: bump version to 2.26.3 Message-ID: <20230214171655.12FB385E9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=910aae1e23806fff74b16088c8975827e6664c2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update the license hash because of a change in copyright year: - Copyright (C) 1997-2022 Sam Lantinga + Copyright (C) 1997-2023 Sam Lantinga Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.hash | 6 +++--- package/sdl2/sdl2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 86e0d86e7c..e26dcee301 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.2.tar.gz.sig -sha256 95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0 SDL2-2.26.2.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.3.tar.gz.sig +sha256 c661205a553b7d252425f4b751ff13209e5e020b876bbfa1598494af61790057 SDL2-2.26.3.tar.gz # Locally calculated -sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt +sha256 9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 8995178e71..c01f12d12c 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.26.2 +SDL2_VERSION = 2.26.3 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From peter at korsgaard.com Tue Feb 14 17:15:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:11 +0100 Subject: [Buildroot] [git commit] package/gnuplot: bump version to 5.4.6 Message-ID: <20230214171655.25AFB85E9E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df50979e7bf0ff7f0b8a2461ed7ae9dbd103d836 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard --- package/gnuplot/gnuplot.hash | 8 ++++---- package/gnuplot/gnuplot.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index 1ee6b53694..de0741d609 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.5/ -md5 c10cf81faa69d77e255a1dcfc625ba78 gnuplot-5.4.5.tar.gz -sha1 1179a768fd5f585a5dcb6aedea76cfa7a8dd5dfe gnuplot-5.4.5.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.6/ +md5 da719235bb2f46830f9d2101d04b14a5 gnuplot-5.4.6.tar.gz +sha1 31ea0c00af5c156e5d068e3b1cc2fb1847f471ab gnuplot-5.4.6.tar.gz # Locally computed -sha256 66f679115dd30559e110498fc94d926949d4d370b4999a042e724b8e910ee478 gnuplot-5.4.5.tar.gz +sha256 02fc27918200ed64d8f0c3b84fe81b95b59cd47ad99f270939ae497c19f27419 gnuplot-5.4.6.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 1ee49cb6ce..c49fbc497d 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.5 +GNUPLOT_VERSION = 5.4.6 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright From peter at korsgaard.com Tue Feb 14 17:15:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:39 +0100 Subject: [Buildroot] [git commit] package/libmdbx: bump version to 0.11.14 "Sergey Kapitsa" Message-ID: <20230214171655.39BA985E9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efdcc850be902de2596412dbf0f142c3f679ce35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is stable bugfix release of libmdbx, in memory of Sergey Kapitsa (Russian physicist and demographer) on his 95th birthday. It is reasonable to backport this patch to all applicable releases/branches of Buildroot, at least this release fixes build for sh4 arch. Release notes for v0.11.14 -------------------------- Fixes: - backport: Refined the `__cold`/`__hot` macros to avoid the `error: inlining failed in call to ???always_inline FOO(...)???: target specific option mismatch` issue during build using GCC >10.x for SH4 arch. Actually this is GCC' SH4-backend bug which triggered by the `__attribute__((__optimize__("Os")))` used in conjunction with the `__attribute__((__cold__))`. - backport: Fixed `SIGSEGV` or an erroneous call to `free()` in case where errors occur when reopening by `mdbx_env_open()` of a previously used environment. - backport: Fixed `cursor_put_nochecklen()` internals for case when dupsort'ed named subDb contains a single key with multiple values (aka duplicates), which are replaced with a single value by put-operation with the `MDBX_UPSERT+MDBX_ALLDUPS` flags. In this case, the database becomes completely empty, without any pages. However exactly this condition was not considered and thus wasn't handled correctly. See [issue#8](https://gitflic.ru/project/erthink/libmdbx/issue/8) for more information. - backport: Fixed extra assertion inside `override_meta()`, which could lead to false-positive failing of the assertion in a debug builds during DB recovery and/or auto-rollback. Minors: - backport: Fixed typos. - backport: Refined `const` and `noexcept` for few C++ API methods. - backport: Resolve false-posirive `used uninitialized` warning from GCC >10.x while build for SH4 arch. - backport: Fixed insignificant typo of `||` inside `#if` byte-order condition. The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md Signed-off-by: ???????????? ?????????? (Leonid Yuriev) Signed-off-by: Peter Korsgaard --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index e3fb309461..b1a2891b91 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 9449fd357119e19902363ab90134d82c9a713b706394c2a1389b5bb4787b5164 libmdbx-amalgamated-0.11.13.tar.xz +sha256 97b03965b5b61727dc4232c50ccb174c632470a3d24438b3c52315bef6fb4033 libmdbx-amalgamated-0.11.14.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index a139e062f6..5e7995f8c8 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.13 +LIBMDBX_VERSION = 0.11.14 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From matthew.weber at collins.com Tue Feb 14 18:05:05 2023 From: matthew.weber at collins.com (Matthew Weber) Date: Tue, 14 Feb 2023 18:05:05 +0000 Subject: [Buildroot] [PATCH] DEVELOPERS: drop Matt Weber Message-ID: <20230214180505.3691-1-matthew.weber@collins.com> From: Matthew Weber I regret that my work situation doesn't sustain me contributing. Signed-off-by: Matthew Weber --- DEVELOPERS | 105 ----------------------------------------------------- 1 file changed, 105 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index df2b98ad53..72a56deb4c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1984,111 +1984,6 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ -N: Matt Weber -F: board/freescale/p* -F: board/freescale/t* -F: board/qemu/ppc64-e5500/ -F: configs/freescale_p* -F: configs/freescale_t* -F: configs/qemu_ppc64_e5500_defconfig -F: package/ace/ -F: package/argp-standalone/ -F: package/aufs/ -F: package/aufs-util/ -F: package/bc/ -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/ -F: package/davici/ -F: package/dnsmasq/ -F: package/dosfstools/ -F: package/eigen/ -F: package/ethtool/ -F: package/flashbench/ -F: package/fmc/ -F: package/fmlib/ -F: package/freeradius-server/ -F: package/git/ -F: package/gnutls/ -F: package/hostapd/ -F: package/i2c-tools/ -F: package/ifplugd/ -F: package/igmpproxy/ -F: package/iperf/ -F: package/iperf3/ -F: package/iputils/ -F: package/iw/ -F: package/jitterentropy-library/ -F: package/kvm-unit-tests/ -F: package/kvmtool/ -F: package/libcsv/ -F: package/libcurl/ -F: package/libeastl/ -F: package/libfcgi/ -F: package/libopenssl/ -F: package/libselinux/ -F: package/libsemanage/ -F: package/libsepol/ -F: package/libssh2/ -F: package/libtalloc/ -F: package/libqmi/ -F: package/lighttpd/ -F: package/logrotate/ -F: package/makedevs/ -F: package/memtester/ -F: package/mii-diag/ -F: package/mrouted/ -F: package/mtd/ -F: package/mtools/ -F: package/nginx-upload/ -F: package/omniorb/ -F: package/openresolv/ -F: package/paxtest/ -F: package/picocom/ -F: package/policycoreutils/ -F: package/proftpd/ -F: package/protobuf-c/ -F: package/protobuf/ -F: package/python-colorama/ -F: package/python-filelock/ -F: package/python-flask-cors/ -F: package/python-iptables/ -F: package/python-ipy/ -F: package/python-iwlib/ -F: package/python-posix-ipc/ -F: package/python-pycairo/ -F: package/python-pysftp/ -F: package/python-tinyrpc/ -F: package/python-txdbus/ -F: package/qoriq-rcw/ -F: package/raptor/ -F: package/rng-tools/ -F: package/rsyslog/ -F: package/setools/ -F: package/sloci-image/ -F: package/smcroute/ -F: package/tclap/ -F: package/tini/ -F: package/uboot-tools/ -F: package/unionfs/ -F: package/valijson/ -F: package/wpa_supplicant/ -F: package/wireless_tools/ -F: package/xen/ -F: package/xml-security-c/ -F: support/testing/tests/fs/test_oci.py -F: support/testing/tests/package/br2-external/clang-compiler-rt/ -F: support/testing/tests/package/br2-external/openjdk/ -F: support/testing/tests/package/test_clang.py -F: support/testing/tests/package/test_openjdk.py -F: support/testing/tests/package/test_opkg/ -F: support/testing/tests/package/test_opkg.py - N: Mauro Condarelli F: package/mc/ F: package/python-autobahn/ -- 2.25.1 From james.hilliard1 at gmail.com Tue Feb 14 20:25:41 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 14 Feb 2023 13:25:41 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-maturin: bump to version 0.14.13 Message-ID: <20230214202541.2485669-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index b104b1fbbe..d1344f2744 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 59157a06c0a482aec750d64746f2b23e556ce3ec62d9cdce74fcb7b4658b722b maturin-0.14.9.tar.gz +sha256 7ed1234824ef2b0c919c6d24550540bf044fe992612b322a6abda1253f5bb500 maturin-0.14.13.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index 3484e09d22..7781a1070b 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.9 +PYTHON_MATURIN_VERSION = 0.14.13 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/90/f9/f4242c0e8bc5def9a7135c12574449dbb411ecc595cf72202ca97a79c2ad +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/a9/a9/bcff9592d7ad68052432e6369bd310606e2ddeb9bcc0b52d5f69e4140290 PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit -- 2.34.1 From arnout at mind.be Tue Feb 14 20:55:58 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 21:55:58 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: <016a0f72-aa86-dd35-5e6a-100d2564d25a@mind.be> On 14/02/2023 08:27, Sourabh Hegde wrote: > Hello James, > > Thanks for the update. > > awscrt also has precompiled wheels ?such > as awscrt-0.16.10-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl > > Can Buildroot use them instead of cross compiling? If cross-compiling is difficult, it's fairly likely that there are many cases where the binary wheel won't work either. Therefore, no, we (probably) can't use them. > If not, is it possible > to?extract it and install manually? You can do that in a post-build script. It's going to be something that is tested in your specific use case only, so not something that we would support upstream. A wheel file is actually a zip file, so you just need to unzip it in the site_packages directory. And test if it works, of course. Regards, Arnout > > Thanks in advance > > On Thu, 9 Feb 2023 at 21:12, James Hilliard > wrote: > > On Thu, Feb 9, 2023 at 5:10 AM Sourabh Hegde > wrote: > > > > Hello Maxim, > > > > While doing make with new Buildroot-packages I getting: > > > > [ 51%] Building ASM object > aws-lc/crypto/CMakeFiles/crypto_objects.dir/hrss/asm/poly_rq_mul.S.o > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S: Assembler messages: > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:304: Error: unknown pseudo-op: `.att_syntax' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:307: Error: unknown mnemonic `push' -- `push %rbp' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:309: Error: bad register expression > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:310: Error: unknown mnemonic `movq' -- `movq %rsp,%rbp' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:311: Error: bad register expression > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:312: Error: unknown mnemonic `push' -- `push %r12' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:313: Error: bad register expression > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:321: Error: operand 1 must be an integer register -- `mov %rcx,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:322: Error: unknown mnemonic `addq' -- `addq $6144+12288+512+9408+32,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:323: Error: operand 1 must be an integer register -- `mov %r8,%rax' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:324: Error: unknown mnemonic `subq' -- `subq $6144,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:325: Error: operand 1 must be an integer register -- `mov %r8,%r11' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:326: Error: unknown mnemonic `subq' -- `subq $12288,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:327: Error: operand 1 must be an integer register -- `mov %r8,%r12' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:328: Error: unknown mnemonic `subq' -- `subq $512,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:329: Error: unknown mnemonic `vmovdqa' -- `vmovdqa const3(%rip),%ymm3' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:330: Error: unknown mnemonic `vmovdqu' -- `vmovdqu 0(%rsi),%ymm0' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:331: Error: unknown mnemonic `vmovdqu' -- `vmovdqu 88(%rsi),%ymm1' > > . > > . > > . > > Any idea what it is complaining about? > > The problem here is that while the python awscrt package uses setuptools > it's not a normal python setuptools package, the setup.py installs both a normal > setuptools package and a vendored cmake package(meta package really). > > See cmake build wrapper functionality here in the setuptools setup.py file: > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py#L156-L272 > > > This is the cmake meta project root which is vendored inside of awscrt: > https://github.com/awslabs/aws-crt-python/tree/v0.16.10/crt > > > See meta cmakelists build: > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/crt/CMakeLists.txt > > > This meta project is made up of multiple subprojects: > aws-c-auth > aws-c-cal > aws-c-common > aws-c-compression > aws-c-event-stream > aws-checksums > aws-c-http > aws-c-io > aws-c-mqtt > aws-c-s3 > aws-c-sdkutils > aws-lc > s2n > > In buildroot we expect cmake packages to use our cmake infrastructure > as it will set up the cross compilation environment correctly while the > awscrt setuptools cmake wrapper does not. > > I confirmed that the cmake packages build correctly when using our > cmake infrastructure: > ################################################################################ > # > # python-awscrt > # > ################################################################################ > > PYTHON_AWSCRT_VERSION = 0.16.10 > PYTHON_AWSCRT_SOURCE = awscrt-$(PYTHON_AWSCRT_VERSION).tar.gz > PYTHON_AWSCRT_SITE = > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2 > PYTHON_AWSCRT_SUBDIR = crt > > $(eval $(cmake-package)) > > See: > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_cmake_based_packages > > So what I think you need to do is create buildroot cmake packages for all > these subprojects using buildroot's cmake infrastructure: > https://github.com/awslabs/aws-c-auth > https://github.com/awslabs/aws-c-cal > https://github.com/awslabs/aws-c-common > > https://github.com/awslabs/aws-c-compression > > https://github.com/awslabs/aws-c-event-stream > > https://github.com/awslabs/aws-checksums > > https://github.com/awslabs/aws-c-http > https://github.com/awslabs/aws-c-io > https://github.com/awslabs/aws-c-mqtt > https://github.com/awslabs/aws-c-s3 > https://github.com/awslabs/aws-c-sdkutils > > https://github.com/awslabs/aws-lc > https://github.com/aws/s2n-tls > > You will then probably need to modify the setup.py file > (https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py > ) so that > instead of using the cmake build functions have it use the system versions > of these libraries pre-installed via the buildroot cmake infrastructure. > > You can probably use and check for an env variable such as this in the setup.py: > PYTHON_AWSCRT_USE_SYSTEM_CRT=1 > > When present have it disable building the cmake libraries itself and search > for the installed system crt libraries instead of using the vendored > cmake build. > > You should upstream this setup.py functionality to the aws-crt-project as well > so that we don't need to carry a patch in buildroot for python-awscrt to use > the system crt libraries. > > Then from the python-awscrt buildroot package you would set that env > variable and add all the cmake subprojects as buildroot package dependencies. > > First thing you should start with is adding the cmake buildroot packages for > the crt subprojects to buildroot then work on modifying aws-crt-python to > work correctly with them instead of trying to use its broken cmake setuptools > wrapper. > > > > > Thanks in advance > > > > On Thu, 9 Feb 2023 at 10:28, Sourabh Hegde > wrote: > >> > >> Hi Maxim, > >> > >> I was missing python setuptools on my host. After installing it, I can > add the package. Also, the added package is available in menuconfig > >> > >> Thank you for the support! > >> > >> On Thu, 9 Feb 2023 at 10:10, Maxim Kochetkov > wrote: > >>> > >>> > >>> > >>> On 09.02.2023 12:03, Sourabh Hegde wrote: > >>> > Hello Maxim, > >>> > > >>> > Update: > >>> > > >>> > The above issue resolved by itself! > >>> > > >>> > Now when I do: utils/scanpypi awscrt -o package , it says > >>> > > >>> > spdx_lookup module is not installed. This can lead to an inaccurate > >>> > licence detection. Please install it via > >>> > pip install spdx_lookup > >>> > buildroot package name for awscrt: python-awscrt > >>> > Package: python-awscrt > >>> > Fetching package awscrt > >>> > ERROR: Could not find package awscrt. > >>> > Check syntax inside the python package index: > >>> > https://pypi.python.org/pypi/ > > > >>> > > >>> > But the package is available at https://pypi.org/project/awscrt/ > > >>> > > > >>> > >>> It works fine for me: > >>> > >>> buildroot package name for awscrt: python-awscrt > >>> Package: python-awscrt > >>> Fetching package awscrt > >>> Downloading package awscrt from > >>> > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz. .. > >>> Checking if package package/python-awscrt already exists... > >>> Creating package/python-awscrt/python-awscrt.mk... > >>> More than one file found for license: LICENSE, crt/aws-c-common/LICENSE, > >>> crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, > >>> crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, > >>> crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, > >>> crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, > >>> crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, crt/aws-c-cal/LICENSE, > >>> crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE > >>> Creating package/python-awscrt/python-awscrt.hash... > >>> Creating package/python-awscrt/Config.in... > >>> NOTE: Remember to also make an update to the DEVELOPERS file > >>>? ? ? ? and include an entry for the pkg in packages/Config.in > >>> > > _______________________________________________ > > 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 Feb 14 21:03:24 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:03:24 +0100 Subject: [Buildroot] Dependency problem for gtkmm3 In-Reply-To: References: <20230210231454.4f3aedbd@windsurf> <20230213084735.5318a511@windsurf> Message-ID: <87ad276e-999c-2503-4dbb-37f54d2b6e15@mind.be> On 13/02/2023 15:52, Lang Daniel via buildroot wrote: > Hi Thomas, Dirk, > >> Hello Dirk, >> >> On Sun, 12 Feb 2023 08:51:17 +0000 >> Dirk De Becker wrote: >> >>> Thank you for your quick reply. >>> Will this issue be fixed in the 2023.02 release? >> >> It all depends on whether someone submits a fix for the issue. Do you >> think you could have a look? > > The problem comes down to an incompatibility that I tried to point out some > time ago [0]. Current versions of cairomm, pangomm, glibmm have a different > ABI that's not supported in gtkmm 3.x.y. > Even the most recent version of gtkmm 3.24.x doesn't support the current > version of of the other -mm packages and according to the mailing list of > gtkmm [1] there are no plans to support it. The are compatible with gtk4. > > As it stands gtkmm3 isn't usable and fixing it brings up the same problems > of duplicating packages. So we have two options: 1. Drop gtkmm3. It has no internal users. 2. Create cairomm112 etc. packages (or whatever the latest working version was) and live with their unmaintained status. Eventually we'll end up with option 1, of course, since gtkmm3 is EOL itself (they're only working on gtkmm4 AFAIU). @Dirk in conclusion: the best you can expect for 2023.02 is for the package to be dropped, which isn't going to help you, of course. Regards, Arnout > > [0]: https://lists.buildroot.org/pipermail/buildroot/2021-October/625850.html > [1]: https://mail.gnome.org/archives/gtkmm-list/2021-May/msg00000.html > >> >> Best regards, >> >> Thomas > > Regards > Daniel > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From Afshin.Pir at gallagher.com Tue Feb 14 21:13:09 2023 From: Afshin.Pir at gallagher.com (Afshin Pir) Date: Tue, 14 Feb 2023 21:13:09 +0000 Subject: [Buildroot] Define dependency package only in staging Message-ID: Hi All I wonder if it is possible that to force the dependant package to be installed only in staging folder. For example, I have written package A which depend on Package B like this: config BR2_PACKAGE_A bool "my-a-provider" select BR2_PACKAGE_B help Test A Package The problem is that the above configuration installs B in the target, but in reality, it is enough to be installed in staging directory (since it provides a header-only version). In there anyway to define a dependency for staging only? Best Regards, Afshin ________________________________ This email is confidential and may contain information subject to legal privilege. If you are not the intended recipient please advise us of our error by return e-mail then delete this email and any attached files. You may not copy, disclose or use the contents in any way. The views expressed in this email may not be those of Gallagher Group Ltd or subsidiary companies thereof. ________________________________ -------------- next part -------------- An HTML attachment was scrubbed... URL: From arnout at mind.be Tue Feb 14 21:16:07 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:16:07 +0100 Subject: [Buildroot] [PATCH] package/libbpf: Don't remove bpf.h on host In-Reply-To: References: <12146851.O9o76ZdvQC@pwmachine> <17501a13-8018-656f-5f4d-b1cf6c1ecd5c@mind.be> <2667723.mvXUDI8C0e@pwmachine> Message-ID: <8010c40b-1f2b-1351-c59b-fd96b61e9861@mind.be> On 13/02/2023 13:24, Lang Daniel wrote: > Hi Arnout, Francis, [snip] >> Therefore, we believe that the solution is to use -isystem instead of -I in the >> HOSTCC setting of the kernel. This is indeed what is already done for uboot: >> >> HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem >> /,$(HOST_CFLAGS)))" \ >> >> Note that there is a risk that this by itself goes wrong as well. We tried at >> some point to use -isystem instead of -I in HOST_CFLAGS: >> >> commit 6f8162cf8c1abef7e0a4771fe0d6b26a28f5c2b6 >> Author: David Raeman >> Date: Mon Jul 25 21:52:26 2016 >> >> package/Makefile.in should grab HOST_DIR headers using -isystem instead of -I. >> >> >> but this was reverted a copule of days later: >> >> commit 255b6f80d395ef048f46cfcf75dba690c56af657 >> Author: Thomas Petazzoni >> Date: Sat Jul 30 18:10:18 2016 >> >> Revert "package/Makefile.in should grab HOST_DIR headers using -isystem >> instead of -I." >> >> (Unfortunately, the commit has no further explanation of what went wrong). >> >> So, could you (Daniel and Francis) try to apply this patch and replace -I with >> -isystem like is done for U-Boot, and do a bunch of kernel builds to see if it >> breaks anything? > > I didn't apply the patch for package/Makefile.in as that would change the behavour > for all packages. Yeah, that's the thing that turned out not to work before. > I did however copy the logic used in the U-Boot. > > -HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ > +HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ That was indeed what I meant. > > And applied this patch to keep bpf.h > > I tested the following config: > > BR2_aarch64=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="{VERSION}" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="pahole-kernel.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE=y > > and with a fragment for linux: > > CONFIG_BPF_SYSCALL=y > CONFIG_BPF_UNPRIV_DEFAULT_OFF=n > CONFIG_DEBUG_INFO_REDUCED=n > CONFIG_DEBUG_INFO_COMPRESSED=n > CONFIG_DEBUG_INFO_BTF=y > CONFIG_SYSTEM_TRUSTED_KEYRING=y > > where VERSION is one of: > 5.2.21 5.3.18 5.4.231 5.5.19 5.6.19 5.7.19 5.8.18 5.9.16 5.10.167 5.11.22 > 5.12.19 5.13.19 5.14.21 5.15.93 5.16.20 5.17.15 5.18.19 5.19.17 6.0.19 6.1.11 > > Version 5.2, as far as I could work it out, is the version that introduced > the pahole dependency when CONFIG_DEBUG_INFO_BTF is set. > > None-LTS versions after 5.10 and before 6.0 fail with: > > LD vmlinux.o > MODPOST vmlinux.symvers > MODINFO modules.builtin.modinfo > GEN modules.builtin > LD .tmp_vmlinux.btf > BTF .btf.vmlinux.bin.o > LD .tmp_vmlinux.kallsyms1 > KSYMS .tmp_vmlinux.kallsyms1.S > AS .tmp_vmlinux.kallsyms1.S > LD .tmp_vmlinux.kallsyms2 > KSYMS .tmp_vmlinux.kallsyms2.S > AS .tmp_vmlinux.kallsyms2.S > LD vmlinux > BTFIDS vmlinux > FAILED: load BTF from vmlinux: Invalid argument > make[2]: *** [Makefile:1177: vmlinux] Error 255 > make[1]: *** [package/pkg-generic.mk:293: /home/d.lang/ws/other/buildroot/output/build/linux-5.11.22/.stamp_built] Error 2 > make: *** [Makefile:82: _all] Error 2 > > But that should be unrelated to the change in package/libbpf and HOSTCC. > I will try to work out the reason behind that error. Since you said "non-LTS versions", I guess it's an upstream issue that got fixed in 6.1 and applied to 6.0.x and 5.15.x? > Should I create a patch to change HOSTCC or is additional testing required? Yes please! And include your extensive test coverage in the commit message. Regards, Arnout > >> >> For now, I've marked this patch as Changes Requested (it can only be applied >> if the bpf.h problem is solved in some other way), and marked Francis's patch >> [1] as Superseded. >> >> Regards, >> Arnout >> >> >> [1] >> https://patchwork.ozlabs.org/project/buildroot/patch/20220610165441.84812-2-flaniel at linux.microsoft.com/ >> >> >>> >>> Sadly, I tested your patch and I hit the problem described in the comment >>> regarding redefinition of bpf_core_relo_kind. >>> >>> Did you also hit it or you were able to build the kernel with >>> BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE? > > It seems like I was tested with a too recent kernel and originally preparing > this patch and therefore didn't hit this error. > >>> >>> >>> Best regards and thank you in advance. >>> >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot From baruch at tkos.co.il Tue Feb 14 21:20:10 2023 From: baruch at tkos.co.il (Baruch Siach) Date: Tue, 14 Feb 2023 23:20:10 +0200 Subject: [Buildroot] Define dependency package only in staging In-Reply-To: References: Message-ID: <87v8k40wok.fsf@tarshish> Hi Afshin, On Tue, Feb 14 2023, Afshin Pir wrote: > I wonder if it is possible that to force the dependant package to be > installed only in staging folder. For example, I have written package > A which depend on Package B like this: > > config BR2_PACKAGE_A > bool "my-a-provider" > select BR2_PACKAGE_B > help > Test A Package > > The problem is that the above configuration installs B in the target, > but in reality, it is enough to be installed in staging directory > (since it provides a header-only version). In there anyway to define a > dependency for staging only? '_INSTALL_TARGET = NO' might help you. baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From hrsourabh011 at gmail.com Tue Feb 14 21:22:24 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Tue, 14 Feb 2023 22:22:24 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: <016a0f72-aa86-dd35-5e6a-100d2564d25a@mind.be> References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> <016a0f72-aa86-dd35-5e6a-100d2564d25a@mind.be> Message-ID: Hello Arnout, Thanks for the update. On Tue, 14 Feb 2023 at 21:56, Arnout Vandecappelle wrote: > > > On 14/02/2023 08:27, Sourabh Hegde wrote: > > Hello James, > > > > Thanks for the update. > > > > awscrt also has precompiled wheels < > https://pypi.org/project/awscrt/#files> such > > as > awscrt-0.16.10-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl > > > > Can Buildroot use them instead of cross compiling? > > If cross-compiling is difficult, it's fairly likely that there are many > cases > where the binary wheel won't work either. Therefore, no, we (probably) > can't use > them. > > > If not, is it possible > > to extract it and install manually? > > You can do that in a post-build script. It's going to be something that > is > tested in your specific use case only, so not something that we would > support > upstream. > > A wheel file is actually a zip file, so you just need to unzip it in the > site_packages directory. And test if it works, of course. > To understand it correctly, should I unzip the wheel file into "/target/lib/python3.10/site-packages/" after the make? But, this "awscrt" is the dependency for https://pypi.org/project/awsiotsdk/ https://github.com/aws/aws-iot-device-sdk-python-v2#installation-issues And now how can I select this dependency during build? > > Regards, > Arnout > > > > > Thanks in advance > > > > On Thu, 9 Feb 2023 at 21:12, James Hilliard > > wrote: > > > > On Thu, Feb 9, 2023 at 5:10 AM Sourabh Hegde > > wrote: > > > > > > Hello Maxim, > > > > > > While doing make with new Buildroot-packages I getting: > > > > > > [ 51%] Building ASM object > > aws-lc/crypto/CMakeFiles/crypto_objects.dir/hrss/asm/poly_rq_mul.S.o > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S: > Assembler messages: > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:304: > Error: unknown pseudo-op: `.att_syntax' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:307: > Error: unknown mnemonic `push' -- `push %rbp' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:309: > Error: bad register expression > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:310: > Error: unknown mnemonic `movq' -- `movq %rsp,%rbp' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:311: > Error: bad register expression > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:312: > Error: unknown mnemonic `push' -- `push %r12' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:313: > Error: bad register expression > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:321: > Error: operand 1 must be an integer register -- `mov %rcx,%r8' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:322: > Error: unknown mnemonic `addq' -- `addq $6144+12288+512+9408+32,%r8' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:323: > Error: operand 1 must be an integer register -- `mov %r8,%rax' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:324: > Error: unknown mnemonic `subq' -- `subq $6144,%r8' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:325: > Error: operand 1 must be an integer register -- `mov %r8,%r11' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:326: > Error: unknown mnemonic `subq' -- `subq $12288,%r8' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:327: > Error: operand 1 must be an integer register -- `mov %r8,%r12' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:328: > Error: unknown mnemonic `subq' -- `subq $512,%r8' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:329: > Error: unknown mnemonic `vmovdqa' -- `vmovdqa const3(%rip),%ymm3' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:330: > Error: unknown mnemonic `vmovdqu' -- `vmovdqu 0(%rsi),%ymm0' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:331: > Error: unknown mnemonic `vmovdqu' -- `vmovdqu 88(%rsi),%ymm1' > > > . > > > . > > > . > > > Any idea what it is complaining about? > > > > The problem here is that while the python awscrt package uses > setuptools > > it's not a normal python setuptools package, the setup.py installs > both a normal > > setuptools package and a vendored cmake package(meta package really). > > > > See cmake build wrapper functionality here in the setuptools > setup.py file: > > > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py#L156-L272 > > < > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py#L156-L272 > > > > > > This is the cmake meta project root which is vendored inside of > awscrt: > > https://github.com/awslabs/aws-crt-python/tree/v0.16.10/crt > > > > > > See meta cmakelists build: > > > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/crt/CMakeLists.txt > > < > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/crt/CMakeLists.txt > > > > > > This meta project is made up of multiple subprojects: > > aws-c-auth > > aws-c-cal > > aws-c-common > > aws-c-compression > > aws-c-event-stream > > aws-checksums > > aws-c-http > > aws-c-io > > aws-c-mqtt > > aws-c-s3 > > aws-c-sdkutils > > aws-lc > > s2n > > > > In buildroot we expect cmake packages to use our cmake infrastructure > > as it will set up the cross compilation environment correctly while > the > > awscrt setuptools cmake wrapper does not. > > > > I confirmed that the cmake packages build correctly when using our > > cmake infrastructure: > > > ################################################################################ > > # > > # python-awscrt > > # > > > ################################################################################ > > > > PYTHON_AWSCRT_VERSION = 0.16.10 > > PYTHON_AWSCRT_SOURCE = awscrt-$(PYTHON_AWSCRT_VERSION).tar.gz > > PYTHON_AWSCRT_SITE = > > > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2 > < > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2 > > > > PYTHON_AWSCRT_SUBDIR = crt > > > > $(eval $(cmake-package)) > > > > See: > > > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_cmake_based_packages > < > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_cmake_based_packages > > > > > > So what I think you need to do is create buildroot cmake packages > for all > > these subprojects using buildroot's cmake infrastructure: > > https://github.com/awslabs/aws-c-auth < > https://github.com/awslabs/aws-c-auth> > > https://github.com/awslabs/aws-c-cal < > https://github.com/awslabs/aws-c-cal> > > https://github.com/awslabs/aws-c-common > > > > https://github.com/awslabs/aws-c-compression > > > > https://github.com/awslabs/aws-c-event-stream > > > > https://github.com/awslabs/aws-checksums > > > > https://github.com/awslabs/aws-c-http < > https://github.com/awslabs/aws-c-http> > > https://github.com/awslabs/aws-c-io < > https://github.com/awslabs/aws-c-io> > > https://github.com/awslabs/aws-c-mqtt < > https://github.com/awslabs/aws-c-mqtt> > > https://github.com/awslabs/aws-c-s3 < > https://github.com/awslabs/aws-c-s3> > > https://github.com/awslabs/aws-c-sdkutils > > > > https://github.com/awslabs/aws-lc > > > https://github.com/aws/s2n-tls > > > > You will then probably need to modify the setup.py file > > (https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py > > ) > so that > > instead of using the cmake build functions have it use the system > versions > > of these libraries pre-installed via the buildroot cmake > infrastructure. > > > > You can probably use and check for an env variable such as this in > the setup.py: > > PYTHON_AWSCRT_USE_SYSTEM_CRT=1 > > > > When present have it disable building the cmake libraries itself and > search > > for the installed system crt libraries instead of using the vendored > > cmake build. > > > > You should upstream this setup.py functionality to the > aws-crt-project as well > > so that we don't need to carry a patch in buildroot for > python-awscrt to use > > the system crt libraries. > > > > Then from the python-awscrt buildroot package you would set that env > > variable and add all the cmake subprojects as buildroot package > dependencies. > > > > First thing you should start with is adding the cmake buildroot > packages for > > the crt subprojects to buildroot then work on modifying > aws-crt-python to > > work correctly with them instead of trying to use its broken cmake > setuptools > > wrapper. > > > > > > > > Thanks in advance > > > > > > On Thu, 9 Feb 2023 at 10:28, Sourabh Hegde < > hrsourabh011 at gmail.com > > > wrote: > > >> > > >> Hi Maxim, > > >> > > >> I was missing python setuptools on my host. After installing it, > I can > > add the package. Also, the added package is available in menuconfig > > >> > > >> Thank you for the support! > > >> > > >> On Thu, 9 Feb 2023 at 10:10, Maxim Kochetkov > > wrote: > > >>> > > >>> > > >>> > > >>> On 09.02.2023 12:03, Sourabh Hegde wrote: > > >>> > Hello Maxim, > > >>> > > > >>> > Update: > > >>> > > > >>> > The above issue resolved by itself! > > >>> > > > >>> > Now when I do: utils/scanpypi awscrt -o package , it says > > >>> > > > >>> > spdx_lookup module is not installed. This can lead to an > inaccurate > > >>> > licence detection. Please install it via > > >>> > pip install spdx_lookup > > >>> > buildroot package name for awscrt: python-awscrt > > >>> > Package: python-awscrt > > >>> > Fetching package awscrt > > >>> > ERROR: Could not find package awscrt. > > >>> > Check syntax inside the python package index: > > >>> > https://pypi.python.org/pypi/ > > > > > >>> > > > >>> > But the package is available at > https://pypi.org/project/awscrt/ > > > > >>> > https://pypi.org/project/awscrt/>> > > >>> > > >>> It works fine for me: > > >>> > > >>> buildroot package name for awscrt: python-awscrt > > >>> Package: python-awscrt > > >>> Fetching package awscrt > > >>> Downloading package awscrt from > > >>> > > > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz. > < > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz > .>.. > > >>> Checking if package package/python-awscrt already exists... > > >>> Creating package/python-awscrt/python-awscrt.mk... > > >>> More than one file found for license: LICENSE, > crt/aws-c-common/LICENSE, > > >>> crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, > > >>> crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, > > >>> crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, > > >>> crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, > > >>> crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, > crt/aws-c-cal/LICENSE, > > >>> crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE > > >>> Creating package/python-awscrt/python-awscrt.hash... > > >>> Creating package/python-awscrt/Config.in... > > >>> NOTE: Remember to also make an update to the DEVELOPERS file > > >>> and include an entry for the pkg in packages/Config.in > > >>> > > > _______________________________________________ > > > 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 arnout at mind.be Tue Feb 14 21:22:59 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:22:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: <20230212094205.GK2796@scaer> References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> Message-ID: <7d630b5f-69b3-6129-2426-7e9b7499f6d3@mind.be> On 12/02/2023 10:42, Yann E. MORIN wrote: > James, All, > > Thanks again for working on such grunt work, it's much appreaciated! > > On 2022-10-17 21:46 -0600, James Hilliard spake thusly: >> These command rely on the clean operations being first so that the >> stamp files being deleted will rebuild the targets. >> >> The execution ordering of the clean and rebuild operations may >> change, for example if --shuffle=reversed is set. >> >> To ensure the evaluation order is always correct use double colon >> rules to make the evaluation order explicit as per make docs: >> >> The double-colon rules for a target are executed in the order they >> appear in the makefile. > > I am not convinced that we should switch over to using double-colons. Me neither. > As I reviewed your other related patch about legal-info [0], the make > manual [1] suggests that double-colons are rally intended for cases > where "the method used to update a target differs depending on which > prerequisite files caused the update" and "double-colon rules really > make sense are those where the order of executing the recipes would not > matter". > > So, we'd use a mechanism where order should not matter, to solve an > issue with ordering. That'd be weird... > > Yes, the manual states that "double-colon rules for a target are > executed in the order they appear in the makefile", but that really > looks like a side-effect of another goal. > > Also, we'd need to carefully review all our Makefile to ensure that > there are no other cases wehre ordering of prerequisites matter. Well, we need to do that regardless of which solution is found, right? Unless we just disable parallel builds and --shuffle entirely. > We'd > also have to be careful every time we introduce a new rule and remember > to check whether it depends on the ordering prereauisites or not, adn > worse yet, also whether we can afford the rule to be parallel-safe or > not (see the explanation for that in the legal-info review). > > Having colons and double-colons is going to be quite a headache... We > already have issues with remembering that we need to use $$ to expand Yeah, maybe we should have some check-package thing to verify that $$ is used everywhere in a macro definition... > variables in some places, and the rules there are relatively clean and > explicit, but for the :: case, I'm afraid that's going to be a bit more > complex. > > We currently have a single location where we use double-colon: > support/kconfig/Makefile.br > > which is added by our patch against kconfig: > support/kconfig/patches/10-br-build-system.patch > > which dates back to 2010: > 7c524dd0b683 Clean up our patches against kconfig > > which got in three in 2007: > a665ed34960b - pull kconfig from linux-2.6.21.5 > > So, I'd like that we get another way to fix that, if possible... > > Again, thanks a lot for spending efforts in that area, this is really > great! > > [0] https://lore.kernel.org/buildroot/20230212091914.GJ2796 at scaer/ > [1] https://www.gnu.org/software/make/manual/make.html#Double_002dColon > > Regards, > Yann E. MORIN. > >> Signed-off-by: James Hilliard >> --- >> package/pkg-generic.mk | 9 ++++++--- >> 1 file changed, 6 insertions(+), 3 deletions(-) >> >> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk >> index f24e03a325..6cb461af90 100644 >> --- a/package/pkg-generic.mk >> +++ b/package/pkg-generic.mk >> @@ -1057,17 +1057,20 @@ endif >> rm -f $$($(2)_TARGET_INSTALL_IMAGES) >> rm -f $$($(2)_TARGET_INSTALL_HOST) >> >> -$(1)-reinstall: $(1)-clean-for-reinstall $(1) >> +$(1)-reinstall:: $(1)-clean-for-reinstall >> +$(1)-reinstall:: $(1) I may be stupid, but what we want is to have an ordering between clean-for-reinstall and $(1), right? So, let's use an ordering dependency? $(1)-reinstall: $(1)-clean-for-reinstall $(1) $(1): $(1)-clean-for-reinstall Regards, Arnout >> >> $(1)-clean-for-rebuild: $(1)-clean-for-reinstall >> rm -f $$($(2)_TARGET_BUILD) >> >> -$(1)-rebuild: $(1)-clean-for-rebuild $(1) >> +$(1)-rebuild:: $(1)-clean-for-rebuild >> +$(1)-rebuild:: $(1) >> >> $(1)-clean-for-reconfigure: $(1)-clean-for-rebuild >> rm -f $$($(2)_TARGET_CONFIGURE) >> >> -$(1)-reconfigure: $(1)-clean-for-reconfigure $(1) >> +$(1)-reconfigure:: $(1)-clean-for-reconfigure >> +$(1)-reconfigure:: $(1) >> >> # define the PKG variable for all targets, containing the >> # uppercase package variable prefix >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Tue Feb 14 21:24:58 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:24:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: <7d630b5f-69b3-6129-2426-7e9b7499f6d3@mind.be> References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> <7d630b5f-69b3-6129-2426-7e9b7499f6d3@mind.be> Message-ID: On 14/02/2023 22:22, Arnout Vandecappelle wrote: [1] > ?I may be stupid, but what we want is to have an ordering between > clean-for-reinstall and $(1), right? So, let's use an ordering dependency? > > $(1)-reinstall:??????? $(1)-clean-for-reinstall $(1) > $(1):???????????? $(1)-clean-for-reinstall ?Gah, I forgot the actual order-only bit... $(1)-reinstall:?? $(1)-clean-for-reinstall $(1) $(1):?????????? | $(1)-clean-for-reinstall ?Regards, ?Arnout > > > ?Regards, > ?Arnout > >>> ? ? $(1)-clean-for-rebuild: $(1)-clean-for-reinstall >>> ????????????? rm -f $$($(2)_TARGET_BUILD) >>> ? -$(1)-rebuild:??????? $(1)-clean-for-rebuild $(1) >>> +$(1)-rebuild::??????? $(1)-clean-for-rebuild >>> +$(1)-rebuild::??????? $(1) >>> ? ? $(1)-clean-for-reconfigure: $(1)-clean-for-rebuild >>> ????????????? rm -f $$($(2)_TARGET_CONFIGURE) >>> ? -$(1)-reconfigure:??? $(1)-clean-for-reconfigure $(1) >>> +$(1)-reconfigure::??? $(1)-clean-for-reconfigure >>> +$(1)-reconfigure::??? $(1) >>> ? ? # define the PKG variable for all targets, containing the >>> ? # uppercase package variable prefix >>> -- >>> 2.34.1 >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >> From arnout at mind.be Tue Feb 14 21:27:37 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:27:37 +0100 Subject: [Buildroot] [PATCH 1/1] Makefile: fix rule order for legal-info In-Reply-To: <20230211184346.1192333-1-james.hilliard1@gmail.com> References: <20230211184346.1192333-1-james.hilliard1@gmail.com> Message-ID: <91a00522-fc54-e631-5598-158a0aaf7d0c@mind.be> On 11/02/2023 19:43, James Hilliard wrote: > This command relies on the clean/prepare operations being in a > specific order. > > Currently the execution ordering of the clean/prepare operations may > change, for example if --shuffle=reversed is set. > > To ensure the evaluation order is always correct use double colon > rules to make the evaluation order explicit as per make docs: > > The double-colon rules for a target are executed in the order they > appear in the makefile. > > Signed-off-by: James Hilliard > --- > Makefile | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 4880b426b5..09575a5e3c 100644 > --- a/Makefile > +++ b/Makefile > @@ -839,7 +839,9 @@ legal-info-prepare: $(LEGAL_INFO_DIR) > @cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config > > .PHONY: legal-info > -legal-info: legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ > +legal-info:: legal-info-clean > +legal-info:: legal-info-prepare > +legal-info:: $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ > $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) Like for rebuild, reinstall, reconfigure I think the following should work: legal-info-prepare: | legal-info-clean $(1)-all-legal-info: | legal-info-prepare (the last one would be in pkg-generic instead of here, of course). Although in this case I think a full dependency should be even OK, so without the | Regards, Arnout > @cat support/legal-info/README.header >>$(LEGAL_REPORT) > @if [ -r $(LEGAL_WARNINGS) ]; then \ From arnout at mind.be Tue Feb 14 21:30:52 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:30:52 +0100 Subject: [Buildroot] [PATCH] package/erlang: do not hard-code the Erlang Interface Version (EI_VSN) In-Reply-To: <20230210215548.1050371-1-yann.morin.1998@free.fr> References: <20230210215548.1050371-1-yann.morin.1998@free.fr> Message-ID: <4f51a196-e922-1e9e-6fbb-e81b35dc9f73@mind.be> On 10/02/2023 22:55, Yann E. MORIN wrote: > The note above the erlang version instructs to refer to another note > further down the file. However, even if it is not too difficult to find, > it is still located a bit too far away, and the reference is not very > explicit what note we should look at. > > When we introduced that variable in 6c1d128844c5 (package/erlang: export > EI_VSN so other packages can use it), the rationale for hard-coding it > was "to avoid spawning a shell every time the variable is dereferenced". > > However, that can get a bit confusing and hard to follow. Also, that in > fact spawns a shell only once for each rebar-packages, so the overhead > is far from being too high. > > The EI_VSN is only used by rebar-package packages, is derefrenced from > the rebar-infra and not the packages themselves, and is not needed by > erlang itself (it knows its own EI_VSN), so we can de-hard-code it, and > rely on build-time detection, by looking in the appropriate file. > > We have two files where we could look: > - lib/erl_interface/vsn.mk in the erlang source tree, but it is not > installed, > - .../lib/erlang/releases/$(ERLANG_RELASE)/installed_application_versions > as installed by erlang. > > We use the second one, as it is cleaner, for a package, to look into > installed files, rather than to look in the source tree of another > package. > > Although both the host and target erlang are the same, we still look > into the corresponding file to extract the version. This is so that it > would be easier if in the future we ever manage to rely on a > system-installed erlang that could have a EI_VSN different from the > target one. > > We can't re-use the variable ERLANG_EI_VSN, because it now needs to be > $(call)-ed with a parameter. Hopefully, external packages that use it > directly rather than through the rebar infra, are not legion... > > Signed-off-by: Yann E. MORIN > Cc: Will Newton > Cc: Johan Oudinet > --- > package/erlang/erlang.mk | 8 ++++---- > package/pkg-rebar.mk | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk > index ac2c204a49..5d6b69057a 100644 > --- a/package/erlang/erlang.mk > +++ b/package/erlang/erlang.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -# See note below when updating Erlang > ERLANG_VERSION = 22.3.4.22 > +ERLANG_RELEASE = $(firstword $(subst ., ,$(ERLANG_VERSION))) > ERLANG_SITE = \ > https://github.com/erlang/otp/releases/download/OTP-$(ERLANG_VERSION) > ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz > @@ -36,9 +36,9 @@ ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF > HOST_ERLANG_DEPENDENCIES += host-autoconf > HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF > > -# Whenever updating Erlang, this value should be updated as well, to the > -# value of EI_VSN in the file lib/erl_interface/vsn.mk > -ERLANG_EI_VSN = 3.13.2.2 > +# Return the EIV (Erlang Interface Version, EI_VSN) > +# $(1): base directory, i.e. either $(HOST_DIR) or $(STAGING_DIR)/usr > +erlang_ei_vsn = `sed -r -e '/^erl_interface-(.+)/!d; s//\1/' $(1)/lib/erlang/releases/$(ERLANG_RELEASE)/installed_application_versions` Since this is only used by rebar-package, I think it should move to pkg-rebar.mk. > > # The configure checks for these functions fail incorrectly > ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes > diff --git a/package/pkg-rebar.mk b/package/pkg-rebar.mk > index e4e3f3bb6c..4b993dd970 100644 > --- a/package/pkg-rebar.mk > +++ b/package/pkg-rebar.mk > @@ -32,10 +32,10 @@ REBAR_TARGET_DEPS_DIR = $(STAGING_DIR)/usr/share/rebar/deps > # > REBAR_HOST_DEPS_ENV = \ > ERL_COMPILER_OPTIONS='{i, "$(REBAR_HOST_DEPS_DIR)"}' \ > - ERL_EI_LIBDIR=$(HOST_DIR)/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib > + ERL_EI_LIBDIR=$(HOST_DIR)/lib/erlang/lib/erl_interface-$(call erlang_ei_vsn,$(HOST_DIR))/lib Since we support only one erlang version, we could just as well put $(wildcard $(HOST_DIR)/lib/erlang/lib/erl_interface-*/lib) or does that directory not necessarily exist yet after erlang has been installed? Regards, Arnout > REBAR_TARGET_DEPS_ENV = \ > ERL_COMPILER_OPTIONS='{i, "$(REBAR_TARGET_DEPS_DIR)"}' \ > - ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib > + ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(call erlang_ei_vsn,$(STAGING_DIR)/usr)/lib > > ################################################################################ > # Helper functions From arnout at mind.be Tue Feb 14 21:46:33 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:46:33 +0100 Subject: [Buildroot] [PATCH 1/4] linux: create a scmversion file based on the custom repo variables In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <1f6626fc-12c0-d1f0-2a8a-2fa2fd0431b6@mind.be> Hi Charles, First of all, in patchwork [1] there are about twelve patches from you about this subject, but I think all except these four are superseded. Is that correct? Could you update patchwork and mark the old ones as superseded? On 10/02/2023 00:15, ckhardin at gmail.com wrote: > From: Charles Hardin > > When using the custom repositories, the archive creation will > omit the source history to get reproducible hashes. This has > the side effect of making the setlocalversion scripts within the > builds to not create the tracking information as expected. So, > just generate a .scmversion so that kernels will be labelled > with where buildroot referenced them. This is less than ideal because it's completely different than the normal git describe output. In particular, if you first develop something in an OVERRIDE_SRCDIR (after applying patch 4) and then change the config to point to the exact same commit with BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION, it will create a completely different UTS_RELEASE string... I think a better solution would be to extend the git download wrapper with a hook that gets called in the git tree itself. E.g.: LINUX_SCMVERSION_HOOK = ./scripts/setlocalversion --save-scmversion The same hook could then also be used for rsync. And it would be easy to add the same feature to barebox, tf-a, ... Regards, Arnout > > For example (line wrapped) > > #define UTS_RELEASE "5.4.70-repo-version-" \ > "92c23d10d0031e0a13244a1a97e7530d3b53fc6e" > > Signed-off-by: Charles Hardin > --- > linux/linux.mk | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/linux/linux.mk b/linux/linux.mk > index 7645b5f507..0b27c8dee2 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -596,6 +596,20 @@ endif > ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)),) > $(error No custom repo URL set. Check your BR2_LINUX_KERNEL_CUSTOM_REPO_URL setting) > endif > + > +# Create a custom scm version file to reflect the source version since the > +# archive will omit source directories like .git to maintain reproducible > +# hashes for the archives > +LINUX_CUSTOM_REPO_SCMVERSION = \ > + "-repo-version-$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION))" > +define LINUX_CUSTOM_REPO_SCMVERSION_HOOK > + (cd $(@D); \ > + if [ ! -f .scmversion ]; then \ > + echo $(LINUX_CUSTOM_REPO_SCMVERSION) > .scmversion; \ > + fi) > +endef > + > +LINUX_POST_EXTRACT_HOOKS += LINUX_CUSTOM_REPO_SCMVERSION_HOOK > endif > > ifeq ($(BR_BUILDING),y) From ju.o at free.fr Tue Feb 14 23:20:08 2023 From: ju.o at free.fr (Julien Olivain) Date: Wed, 15 Feb 2023 00:20:08 +0100 Subject: [Buildroot] [PATCH next v2 1/2] package/highway: new package In-Reply-To: <20230213232050.5fe67607@windsurf> References: <20221124220552.2836398-1-ju.o@free.fr> <20230213232050.5fe67607@windsurf> Message-ID: Hi Thomas, On 13/02/2023 23:20, Thomas Petazzoni wrote: > On Thu, 24 Nov 2022 23:05:51 +0100 > Julien Olivain wrote: > >> Highway is a C++ library that provides portable SIMD/vector >> intrinsics. >> >> https://github.com/google/highway >> >> Signed-off-by: Julien Olivain > > Thanks! I've applied, with some small changes, see below. Thanks for the improvements! [...] >> +This patch adds a check for and include it only if >> present. >> + >> +Signed-off-by: Julien Olivain > > Has this patch been submitted upstream? Yes! A slightly reworked version was accepted upstream and is already in the latest 1.0.3 version tag. See: https://github.com/google/highway/commit/1cab22047a6ef750ef2bc38ad47d6e765d6d376a I'm currently reworking this 1.0.3 and I'll send a version bump when ready. Best regards, Julien. From cps at microplex.com Wed Feb 15 00:10:28 2023 From: cps at microplex.com (Cem Sezer) Date: Tue, 14 Feb 2023 16:10:28 -0800 Subject: [Buildroot] Having trouble getting a simple cmake based custom package to work Message-ID: Hello, I'm looking to continue this thread as I have the exact same problem. http://lists.busybox.net/pipermail/buildroot/2020-August/591250.html The latest entry in the thread is the following, discussing the error message "*No rule to make target 'install/fast': *is where I'm stuck at the moment: >* However, when it is *>* trying to install my package I have a new error. The system seems to be *>* looking for a install/fast target, which the Makefil does not have. * I have no idea on that problem. Maybe read the CMake docs again? https://cmake.org/cmake/help/latest/command/install.html Greets Alex I am still new to cmake, but I've been having trouble getting a basic helloworld (in C) cmake package to work. I looked at that link above for the cmake docs, but am unfamiliar with what I need to do here. My CMakeLists.txt right now is just the following: cmake_minimum_required(VERSION 3.1.0) project(helloworld_c_cmake LANGUAGES C) set(SOURCES main.c) add_executable(${PROJECT_NAME} ${SOURCES}) Any pointers in the right direction would be appreciated. Perhaps this is more of a cmake question than a buildroot question, but tying the two together has been confusing, and I'm sure it must be something simple. Thanks in advance, Cem -------------- next part -------------- An HTML attachment was scrubbed... URL: From baruch at tkos.co.il Wed Feb 15 05:20:10 2023 From: baruch at tkos.co.il (Baruch Siach) Date: Wed, 15 Feb 2023 07:20:10 +0200 Subject: [Buildroot] Define dependency package only in staging In-Reply-To: References: <87v8k40wok.fsf@tarshish> Message-ID: <87r0ur1ory.fsf@tarshish> Hi Afshin, Please keep the list on Cc. On Tue, Feb 14 2023, Afshin Pir wrote: > You mean will it work if I add that in package "A" configuration like this: > B_INSTALL_TARGE = NO > Because normally each package its own configuration. That should be B_INSTALL_TARGET = NO But now I see that you want B out of target only when A selects B, not for the general case, right? There is no direct support for that in Buildroot. You can always use a post build script to remove whatever you like from your target. Alternatively you can add a blind config symbol to package B Config.in that adds 'B_INSTALL_TARGET = NO', and then select this symbol from package A. baruch > -----Original Message----- > From: Baruch Siach > Sent: Wednesday, 15 February 2023 10:20 am > To: Afshin Pir > Cc: buildroot at buildroot.org > Subject: Re: [Buildroot] Define dependency package only in staging > > Hi Afshin, > > On Tue, Feb 14 2023, Afshin Pir wrote: >> I wonder if it is possible that to force the dependant package to be >> installed only in staging folder. For example, I have written package >> A which depend on Package B like this: >> >> config BR2_PACKAGE_A >> bool "my-a-provider" >> select BR2_PACKAGE_B >> help >> Test A Package >> >> The problem is that the above configuration installs B in the target, >> but in reality, it is enough to be installed in staging directory >> (since it provides a header-only version). In there anyway to define a >> dependency for staging only? > > '_INSTALL_TARGET = NO' might help you. > > baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From yann.morin.1998 at free.fr Wed Feb 15 06:29:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 15 Feb 2023 07:29:56 +0100 Subject: [Buildroot] [PATCH] package/erlang: do not hard-code the Erlang Interface Version (EI_VSN) In-Reply-To: <4f51a196-e922-1e9e-6fbb-e81b35dc9f73@mind.be> References: <20230210215548.1050371-1-yann.morin.1998@free.fr> <4f51a196-e922-1e9e-6fbb-e81b35dc9f73@mind.be> Message-ID: <20230215062956.GA2718518@scaer> Arnout, All, On 2023-02-14 22:30 +0100, Arnout Vandecappelle spake thusly: > On 10/02/2023 22:55, Yann E. MORIN wrote: [--SNIP--] > >Although both the host and target erlang are the same, we still look > >into the corresponding file to extract the version. This is so that it > >would be easier if in the future we ever manage to rely on a > >system-installed erlang that could have a EI_VSN different from the > >target one. This ^^^ [0] ... [--SNIP--] > >@@ -36,9 +36,9 @@ ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF > > HOST_ERLANG_DEPENDENCIES += host-autoconf > > HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF > >-# Whenever updating Erlang, this value should be updated as well, to the > >-# value of EI_VSN in the file lib/erl_interface/vsn.mk > >-ERLANG_EI_VSN = 3.13.2.2 > >+# Return the EIV (Erlang Interface Version, EI_VSN) > >+# $(1): base directory, i.e. either $(HOST_DIR) or $(STAGING_DIR)/usr > >+erlang_ei_vsn = `sed -r -e '/^erl_interface-(.+)/!d; s//\1/' $(1)/lib/erlang/releases/$(ERLANG_RELEASE)/installed_application_versions` > Since this is only used by rebar-package, I think it should move to pkg-rebar.mk. I also thought about that, but the knowledge where the file is installed is in erlang, so it makes sense that erlang exports away its own version, like the variable was set previously. That's also what we do for AUTOCONF, AUTORECONF, AUTOMAKE et al: they are defined in their respective packages, but used in the autotools-package infra. > > # The configure checks for these functions fail incorrectly > > ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes > >diff --git a/package/pkg-rebar.mk b/package/pkg-rebar.mk > >index e4e3f3bb6c..4b993dd970 100644 > >--- a/package/pkg-rebar.mk > >+++ b/package/pkg-rebar.mk > >@@ -32,10 +32,10 @@ REBAR_TARGET_DEPS_DIR = $(STAGING_DIR)/usr/share/rebar/deps > > # > > REBAR_HOST_DEPS_ENV = \ > > ERL_COMPILER_OPTIONS='{i, "$(REBAR_HOST_DEPS_DIR)"}' \ > >- ERL_EI_LIBDIR=$(HOST_DIR)/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib > >+ ERL_EI_LIBDIR=$(HOST_DIR)/lib/erlang/lib/erl_interface-$(call erlang_ei_vsn,$(HOST_DIR))/lib ... [0] explains this ^^^, and ... > Since we support only one erlang version, we could just as well put > $(wildcard $(HOST_DIR)/lib/erlang/lib/erl_interface-*/lib) ... [0] answers that, I believe. ;-) > or does that directory not necessarily exist yet after erlang has been installed? The directory does exist, as erl_interface is installed by erlang (it is kind of part of its stdlib, I'd say), and thus is registered by erlang itself. Regards, Yann E. MORIN. > Regards, > Arnout > > > > REBAR_TARGET_DEPS_ENV = \ > > ERL_COMPILER_OPTIONS='{i, "$(REBAR_TARGET_DEPS_DIR)"}' \ > >- ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib > >+ ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(call erlang_ei_vsn,$(STAGING_DIR)/usr)/lib > > ################################################################################ > > # Helper functions -- .-----------------.--------------------.------------------.--------------------. | 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 Wed Feb 15 07:29:23 2023 From: christian at paral.in (Christian Stewart) Date: Tue, 14 Feb 2023 23:29:23 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/go: security bump to version 1.19.6 Message-ID: <20230215072923.184867-1-christian@paral.in> go1.19.6 (released 2023-02-14) includes security fixes to the crypto/tls, mime/multipart, net/http, and path/filepath packages, as well as bug fixes to the go command, the linker, the runtime, and the crypto/x509, net/http, and time packages. See the Go 1.19.6 milestone on the Go issue tracker for details. CVE-2022-41725: net/http, mime/multipart: denial of service from excessive resource consumption CVE-2022-41724: crypto/tls: large handshake records may cause panics CVE-2022-41723: net/http: avoid quadratic complexity in HPACK decoding https://go.dev/doc/devel/release#go1.19.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 4c22f0f274..8254a91524 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 d7f0013f82e6d7f862cc6cb5c8cdb48eef5f2e239b35baa97e2f1a7466043767 go1.19.6.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index c38ae0b99c..a9056da47b 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.5 +GO_VERSION = 1.19.6 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.39.1 From christian at paral.in Wed Feb 15 07:32:54 2023 From: christian at paral.in (Christian Stewart) Date: Tue, 14 Feb 2023 23:32:54 -0800 Subject: [Buildroot] [PATCH v3 1/3] package/go-bootstrap: split into two stages: go1.4 and go1.19.5 Message-ID: <20230215073256.186476-1-christian@paral.in> Go 1.20 requires a minimum version of go 1.17.13 to bootstrap. https://go.dev/doc/go1.20#bootstrap As Go 1.4 was the previous version that could be compiled with C, there is now no way to bootstrap go with a C compiler, unless we use a two-stage bootstrap: - build host-go-bootstrap-1.4-20170531 - build host-go-bootstrap-1.19.5 with host-go-bootstrap-1.4-20170531 - build host-go-1.20 with host-go-bootstrap-1.19.5 This is implemented in this commit first, before upgrading host-go to 1.20. Note: the .patch files from package/go version 1.19.x are not necessary for package/go-bootstrap-stage2 and have not been included there. Discussion of possible alternate approaches for future use: https://lore.kernel.org/all/CA+h8R2rtcynkCBsz=_9yANOEguyPCOcQDj8_ns+cv8RS8+8t9A at mail.gmail.com/ https://lore.kernel.org/all/20220525234312.643dfc03 at windsurf/T/ Signed-off-by: Christian Stewart --- v1 -> v2: - fix indentation of GOROOT_BOOTSTRAP in stage2 MAKE_ENV - adjust commit description - remove duplicate MAKE_ENV declaration line - reorder depends on lines in config.in.host Signed-off-by: Christian Stewart --- DEVELOPERS | 2 + package/Config.in.host | 3 +- package/go-bootstrap-stage1/Config.in.host | 6 ++ .../go-bootstrap-stage1.hash} | 0 .../go-bootstrap-stage1.mk | 46 ++++++++++++++++ package/go-bootstrap-stage2/Config.in.host | 4 ++ .../go-bootstrap-stage2.hash | 3 + .../go-bootstrap-stage2.mk | 55 +++++++++++++++++++ package/go-bootstrap/Config.in.host | 7 --- package/go-bootstrap/go-bootstrap.mk | 50 ----------------- package/go/Config.in.host | 6 +- package/go/go.mk | 9 ++- 12 files changed, 126 insertions(+), 65 deletions(-) create mode 100644 package/go-bootstrap-stage1/Config.in.host rename package/{go-bootstrap/go-bootstrap.hash => go-bootstrap-stage1/go-bootstrap-stage1.hash} (100%) create mode 100644 package/go-bootstrap-stage1/go-bootstrap-stage1.mk create mode 100644 package/go-bootstrap-stage2/Config.in.host create mode 100644 package/go-bootstrap-stage2/go-bootstrap-stage2.hash create mode 100644 package/go-bootstrap-stage2/go-bootstrap-stage2.mk delete mode 100644 package/go-bootstrap/Config.in.host delete mode 100644 package/go-bootstrap/go-bootstrap.mk diff --git a/DEVELOPERS b/DEVELOPERS index df2b98ad53..80305fdf1e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -548,6 +548,8 @@ F: package/docker-engine/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ +F: package/go-bootstrap-stage1/ +F: package/go-bootstrap-stage2/ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ diff --git a/package/Config.in.host b/package/Config.in.host index dcadbfdfc1..fff75cd165 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -40,7 +40,8 @@ menu "Host utilities" source "package/genpart/Config.in.host" source "package/gnupg/Config.in.host" source "package/go/Config.in.host" - source "package/go-bootstrap/Config.in.host" + source "package/go-bootstrap-stage1/Config.in.host" + source "package/go-bootstrap-stage2/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imagemagick/Config.in.host" diff --git a/package/go-bootstrap-stage1/Config.in.host b/package/go-bootstrap-stage1/Config.in.host new file mode 100644 index 0000000000..56a743caf9 --- /dev/null +++ b/package/go-bootstrap-stage1/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS + bool + # See src/cmd/dist/unix.c for the list of supported architectures + default y if BR2_HOSTARCH = "x86" + default y if BR2_HOSTARCH = "x86_64" + default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.hash b/package/go-bootstrap-stage1/go-bootstrap-stage1.hash similarity index 100% rename from package/go-bootstrap/go-bootstrap.hash rename to package/go-bootstrap-stage1/go-bootstrap-stage1.hash diff --git a/package/go-bootstrap-stage1/go-bootstrap-stage1.mk b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk new file mode 100644 index 0000000000..77e7046cd7 --- /dev/null +++ b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# go-bootstrap-stage1 +# +################################################################################ + +# Use last C-based Go compiler: v1.4.x +# See https://golang.org/doc/install/source#bootstrapFromSource +GO_BOOTSTRAP_STAGE1_VERSION = 1.4-bootstrap-20171003 +GO_BOOTSTRAP_STAGE1_SITE = https://dl.google.com/go +GO_BOOTSTRAP_STAGE1_SOURCE = go$(GO_BOOTSTRAP_STAGE1_VERSION).tar.gz + +GO_BOOTSTRAP_STAGE1_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE1_LICENSE_FILES = LICENSE + +# The toolchain is needed for HOSTCC_NOCACHE used to compile the Go compiler. +HOST_GO_BOOTSTRAP_STAGE1_DEPENDENCIES = toolchain + +HOST_GO_BOOTSTRAP_STAGE1_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE1_VERSION) + +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV = \ + GOOS=linux \ + GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_STAGE1_ROOT)" \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + CC=$(HOSTCC_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE1_BUILD_CMDS + cd $(@D)/src && $(HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV) ./make.bash +endef + +define HOST_GO_BOOTSTRAP_STAGE1_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + + # https://golang.org/issue/2775 + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap-stage2/Config.in.host b/package/go-bootstrap-stage2/Config.in.host new file mode 100644 index 0000000000..967ddaed1d --- /dev/null +++ b/package/go-bootstrap-stage2/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash new file mode 100644 index 0000000000..4c22f0f274 --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash @@ -0,0 +1,3 @@ +# From https://go.dev/dl +sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk new file mode 100644 index 0000000000..b623978500 --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -0,0 +1,55 @@ +################################################################################ +# +# go-bootstrap-stage2 +# +################################################################################ + +GO_BOOTSTRAP_STAGE2_VERSION = 1.19.5 +GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang +GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz + +GO_BOOTSTRAP_STAGE2_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE2_LICENSE_FILES = LICENSE + +# Use go-bootstrap-stage1 to bootstrap. +HOST_GO_BOOTSTRAP_STAGE2_DEPENDENCIES = host-go-bootstrap-stage1 + +HOST_GO_BOOTSTRAP_STAGE2_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE2_VERSION) + +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV = \ + GO111MODULE=off \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE1_ROOT) \ + GOROOT_FINAL=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + GOOS=linux \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE2_BUILD_CMDS + cd $(@D)/src && \ + $(HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) +endef + +define HOST_GO_BOOTSTRAP_STAGE2_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ + + mkdir -p $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg + cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + cp -a $(@D)/pkg/tool $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + + # https://golang.org/issue/2775 + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ + + # Set all file timestamps to prevent the go compiler from rebuilding any + # built in packages when programs are built. + find $(HOST_GO_BOOTSTRAP_STAGE2_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap/Config.in.host b/package/go-bootstrap/Config.in.host deleted file mode 100644 index fab80d24b4..0000000000 --- a/package/go-bootstrap/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS - bool - # See src/cmd/dist/unix.c for the list of support - # architectures - default y if BR2_HOSTARCH = "x86" - default y if BR2_HOSTARCH = "x86_64" - default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.mk b/package/go-bootstrap/go-bootstrap.mk deleted file mode 100644 index 71696a1540..0000000000 --- a/package/go-bootstrap/go-bootstrap.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# go-bootstrap -# -################################################################################ - -# Use last C-based Go compiler: v1.4.x -# See https://golang.org/doc/install/source#bootstrapFromSource -GO_BOOTSTRAP_VERSION = 1.4-bootstrap-20171003 -GO_BOOTSTRAP_SITE = https://dl.google.com/go -GO_BOOTSTRAP_SOURCE = go$(GO_BOOTSTRAP_VERSION).tar.gz - -GO_BOOTSTRAP_LICENSE = BSD-3-Clause -GO_BOOTSTRAP_LICENSE_FILES = LICENSE - -# To build programs that need cgo support the toolchain needs to be -# available, so the toolchain is not needed to build host-go-bootstrap -# itself, but needed by other packages that depend on -# host-go-bootstrap. -HOST_GO_BOOTSTRAP_DEPENDENCIES = toolchain - -HOST_GO_BOOTSTRAP_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_VERSION) - -# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE -# here. See https://github.com/golang/go/issues/11685. -HOST_GO_BOOTSTRAP_MAKE_ENV = \ - GOOS=linux \ - GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_ROOT)" \ - GOROOT="$(@D)" \ - GOBIN="$(@D)/bin" \ - CC=$(HOSTCC_NOCCACHE) \ - CGO_ENABLED=0 - -define HOST_GO_BOOTSTRAP_BUILD_CMDS - cd $(@D)/src && $(HOST_GO_BOOTSTRAP_MAKE_ENV) ./make.bash -endef - -define HOST_GO_BOOTSTRAP_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_ROOT)/bin/go - $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_ROOT)/bin/gofmt - - cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_ROOT)/ - cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_ROOT)/ - - # There is a known issue which requires the go sources to be installed - # https://golang.org/issue/2775 - cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_ROOT)/ -endef - -$(eval $(host-generic-package)) diff --git a/package/go/Config.in.host b/package/go/Config.in.host index ded02d3b3a..b87b862cec 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,7 +2,9 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + # See https://go.dev/doc/install/source#environment + # See src/go/build/syslist.go for the list of supported architectures depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ || BR2_mips64 || BR2_mips64el || BR2_riscv || BR2_s390x @@ -28,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go/go.mk b/package/go/go.mk index c38ae0b99c..b0dd002712 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -12,7 +12,7 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap +HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -121,12 +121,12 @@ HOST_GO_HOST_ENV = \ CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \ CGO_LDFLAGS="$(HOST_LDFLAGS)" -# The go build system is not compatible with ccache, so use -# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_ROOT) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -154,7 +154,6 @@ define HOST_GO_INSTALL_CMDS cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ - # There is a known issue which requires the go sources to be installed # https://golang.org/issue/2775 cp -a $(@D)/src $(HOST_GO_ROOT)/ -- 2.39.1 From christian at paral.in Wed Feb 15 07:32:55 2023 From: christian at paral.in (Christian Stewart) Date: Tue, 14 Feb 2023 23:32:55 -0800 Subject: [Buildroot] [PATCH v3 2/3] package/go: bump to version 1.20.1 In-Reply-To: <20230215073256.186476-1-christian@paral.in> References: <20230215073256.186476-1-christian@paral.in> Message-ID: <20230215073256.186476-2-christian@paral.in> The latest Go release, version 1.20, arrives six months after Go 1.19. Most of its changes are in the implementation of the toolchain, runtime, and libraries. https://go.dev/doc/go1.20 Go 1.20.1 fixes four minor security issues: CVE-2022-41725: net/http, mime/multipart: denial of service from excessive resource consumption. CVE-2022-41724: crypto/tls: large handshake records may cause panics CVE-2022-41723: net/http: avoid quadratic complexity in HPACK decoding Signed-off-by: Christian Stewart --- v1 -> v2: - drop unnecessary change to config.in.host v2 -> v3: - bump to go 1.20.1 - add note about fixed cves package/go: bump to 1.20.1 Signed-off-by: Christian Stewart --- ...03-runtime-support-riscv64-SV57-mode.patch | 65 ------------------- package/go/go.hash | 2 +- package/go/go.mk | 4 +- 3 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 package/go/0003-runtime-support-riscv64-SV57-mode.patch diff --git a/package/go/0003-runtime-support-riscv64-SV57-mode.patch b/package/go/0003-runtime-support-riscv64-SV57-mode.patch deleted file mode 100644 index f51c2ca093..0000000000 --- a/package/go/0003-runtime-support-riscv64-SV57-mode.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6618c7af436488fa12018cdcd31eeedb3a698745 Mon Sep 17 00:00:00 2001 -From: Dmitry Vyukov -Date: Fri, 27 May 2022 18:55:35 +0200 -Subject: [PATCH] runtime: support riscv64 SV57 mode - -Riscv64 has SV57 mode when user-space VA is 56 bits. -Linux kernel recently got support for this mode and Go binaries started crashing as: - -runtime: lfstack.push invalid packing: node=0xffffff5908a940 cnt=0x1 -packed=0xffff5908a9400001 -> node=0xffff5908a940 - -Adjust lfstack code to use only 8 top bits of pointers on riscv64. - -For context see: -https://groups.google.com/g/syzkaller-bugs/c/lU0GQTZoNQQ/m/O_c3vmE3AAAJ - -Update #54104 - -Change-Id: Ib5d3d6a79c0c6eddf11618d73fcc8bc1832a9c25 -Signed-off-by: Christian Stewart ---- - -Upstream: https://go-review.googlesource.com/c/go/+/409055/4 ---- - src/runtime/lfstack_64bit.go | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/runtime/lfstack_64bit.go b/src/runtime/lfstack_64bit.go -index 154130cf63..39fa647b9e 100644 ---- a/src/runtime/lfstack_64bit.go -+++ b/src/runtime/lfstack_64bit.go -@@ -36,12 +36,21 @@ const ( - // We use one bit to distinguish between the two ranges. - aixAddrBits = 57 - aixCntBits = 64 - aixAddrBits + 3 -+ -+ // Riscv64 SV57 mode gives 56 bits of userspace VA. -+ // lfstack code supports it, but broader support for SV57 mode is incomplete, -+ // and there may be other issues (see #54104). -+ riscv64AddrBits = 56 -+ riscv64CntBits = 64 - riscv64AddrBits + 3 - ) - - func lfstackPack(node *lfnode, cnt uintptr) uint64 { - if GOARCH == "ppc64" && GOOS == "aix" { - return uint64(uintptr(unsafe.Pointer(node)))<<(64-aixAddrBits) | uint64(cnt&(1<> aixCntBits << 3) | 0xa<<56))) - } -+ if GOARCH == "riscv64" { -+ return (*lfnode)(unsafe.Pointer(uintptr(val >> riscv64CntBits << 3))) -+ } - return (*lfnode)(unsafe.Pointer(uintptr(val >> cntBits << 3))) - } --- -2.35.1 - diff --git a/package/go/go.hash b/package/go/go.hash index 4c22f0f274..8e5acfe42f 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 b5c1a3af52c385a6d1c76aed5361cf26459023980d0320de7658bae3915831a2 go1.20.1.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index b0dd002712..4db703a301 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.5 +GO_VERSION = 1.20.1 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -151,7 +151,7 @@ define HOST_GO_INSTALL_CMDS cp -a $(@D)/lib $(HOST_GO_ROOT)/ mkdir -p $(HOST_GO_ROOT)/pkg - cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ + cp -a $(@D)/pkg/include $(HOST_GO_ROOT)/pkg/ cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ # https://golang.org/issue/2775 -- 2.39.1 From christian at paral.in Wed Feb 15 07:32:56 2023 From: christian at paral.in (Christian Stewart) Date: Tue, 14 Feb 2023 23:32:56 -0800 Subject: [Buildroot] [PATCH v3 3/3] package/go: use host compiler when go-bootstrap unsupported In-Reply-To: <20230215073256.186476-1-christian@paral.in> References: <20230215073256.186476-1-christian@paral.in> Message-ID: <20230215073256.186476-3-christian@paral.in> All Go compiler versions > 1.4.x (old) are written in Go, and require a existing compiled Go version to use to build from source. https://golang.org/doc/install/source#bootstrapFromSource The process for "bootstrapping" the Go compiler in Buildroot is: 1. Compile a C/C++ cross-compiler (gcc) as the host toolchain. 2. Build go-bootstrap-stage1 (which is Go 1.4.x and written in C) 3. Build go-bootstrap-stage2 (which is Go 1.19.x and written in Go) 3. Build go 1.20 (written in Go) using go-bootstrap-stage2. go-bootstrap-stage1 does not work on 64-bit arm. The Go 1.4.x bootstrap compiler is compatible with x86, x86_64, and arm (32 bit) only. This patch adds a fallback to require a host Go compiler to build host-go when BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS is not set. Signed-off-by: Christian Stewart --- changes prior to inclusion in this series: - thanks Thomas for the review & suggestions - added NEEDS_HOST_GO boolean - added dependency checks to support/dependencies/dependencies.sh - removed unnecessary changes to go-bootstrap package - add dependency on toolchain if Cgo is enabled - updates for go1.20 - updates for go-bootstrap-stage{1,2} changes from v1 -> v2: - remove whitespace fix in bootstrap stage2 Signed-off-by: Christian Stewart --- Config.in | 4 ++++ package/go/Config.in.host | 2 +- package/go/go.mk | 14 ++++++++++++-- support/dependencies/dependencies.sh | 4 ++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Config.in b/Config.in index 0d7641633c..c70ce94d94 100644 --- a/Config.in +++ b/Config.in @@ -58,6 +58,10 @@ config BR2_HOST_GCC_AT_LEAST_9 # When adding new entries above, be sure to update # the HOSTCC_MAX_VERSION variable in the Makefile. +# Hidden boolean selected if bootstrapping Go w/ GCC is not supported. +config BR2_NEEDS_HOST_GO + bool + # Hidden boolean selected by packages in need of Java in order to build # (example: kodi) config BR2_NEEDS_HOST_JAVA diff --git a/package/go/Config.in.host b/package/go/Config.in.host index b87b862cec..7f049ff1ae 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -30,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + select BR2_NEEDS_HOST_GO if !BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go/go.mk b/package/go/go.mk index 4db703a301..68f6d9e36b 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -12,7 +12,6 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -109,6 +108,11 @@ else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS HOST_GO_CGO_ENABLED = 1 endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +ifeq ($(HOST_GO_CGO_ENABLED),1) +# For cgo support the toolchain needs to be available. +HOST_GO_DEPENDENCIES += toolchain +endif + # For the convenience of host golang packages HOST_GO_HOST_ENV = \ $(HOST_GO_COMMON_ENV) \ @@ -126,7 +130,6 @@ HOST_GO_HOST_ENV = \ HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -136,6 +139,13 @@ HOST_GO_MAKE_ENV = \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ $(HOST_GO_CROSS_ENV) +# Use the Go compiler bootstrapped by Buildroot if available. +# Otherwise, use the host Go compiler. +ifeq ($(BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS),y) +HOST_GO_DEPENDENCIES += host-go-bootstrap-stage2 +HOST_GO_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) +endif + define HOST_GO_BUILD_CMDS cd $(@D)/src && \ $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 4353e9585e..943c7d0daf 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -217,6 +217,10 @@ if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then fi fi +if grep -q ^BR2_NEEDS_HOST_GO=y $BR2_CONFIG ; then + check_prog_host "go" +fi + if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then check_prog_host "java" JAVA_GCJ=$(java -version 2>&1 | grep gcj) -- 2.39.1 From peter at korsgaard.com Wed Feb 15 09:14:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:14:12 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/go: security bump to version 1.19.6 In-Reply-To: <20230215072923.184867-1-christian@paral.in> (Christian Stewart's message of "Tue, 14 Feb 2023 23:29:23 -0800") References: <20230215072923.184867-1-christian@paral.in> Message-ID: <8735775lzv.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > go1.19.6 (released 2023-02-14) includes security fixes to the crypto/tls, > mime/multipart, net/http, and path/filepath packages, as well as bug fixes to > the go command, the linker, the runtime, and the crypto/x509, net/http, and time > packages. See the Go 1.19.6 milestone on the Go issue tracker for details. > CVE-2022-41725: net/http, mime/multipart: denial of service from excessive resource consumption > CVE-2022-41724: crypto/tls: large handshake records may cause panics > CVE-2022-41723: net/http: avoid quadratic complexity in HPACK decoding > https://go.dev/doc/devel/release#go1.19.minor > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 15 09:19:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:19:49 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/fluent-bit: bump to version 2.0.9 In-Reply-To: <20230211182546.633728-1-thomas@devoogdt.com> (thomas@devoogdt.com's message of "Sat, 11 Feb 2023 19:25:43 +0100") References: <20230211182546.633728-1-thomas@devoogdt.com> Message-ID: <87y1oz4762.fsf@dell.be.48ers.dk> >>>>> "thomas" == thomas writes: > From: Thomas Devoogdt > - Release Notes: > https://fluentbit.io/announcements/v2.0.9/ > - Patch dropped, as it is upstream: > https://github.com/fluent/fluent-bit/commit/7bcb502ebdcd647d6b83c972805e734ad522eb1a > Signed-off-by: Thomas Devoogdt > --- > v2: moved to a serie of patches Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 15 09:21:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:21:07 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/fluent-bit: add support for non glibc toolchain In-Reply-To: <20230211182546.633728-2-thomas@devoogdt.com> (thomas@devoogdt.com's message of "Sat, 11 Feb 2023 19:25:44 +0100") References: <20230211182546.633728-1-thomas@devoogdt.com> <20230211182546.633728-2-thomas@devoogdt.com> Message-ID: <87ttzn473w.fsf@dell.be.48ers.dk> >>>>> "thomas" == thomas writes: > From: Thomas Devoogdt > - require threads and dynamic library support > - require sync_4 support > - provide fts.h trough musl-fts > static_assert is not available if no C++ toolchain or no glibc > is used, so add two patches to fix this > Signed-off-by: Thomas Devoogdt Committed, thanks. We do have xxhash and c-ares packages in Buildroot, could you have a look at using those instead of these vendored libraries? -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 15 09:22:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:22:22 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/fluent-bit: fix builds on s390x architectures In-Reply-To: <20230211182546.633728-3-thomas@devoogdt.com> (thomas@devoogdt.com's message of "Sat, 11 Feb 2023 19:25:45 +0100") References: <20230211182546.633728-1-thomas@devoogdt.com> <20230211182546.633728-3-thomas@devoogdt.com> Message-ID: <87pmab471t.fsf@dell.be.48ers.dk> >>>>> "thomas" == thomas writes: > From: Thomas Devoogdt > Fixes: > - http://autobuild.buildroot.net/results/856fd250f75a696694c70e3208ffcef7470a7082 > - http://autobuild.buildroot.net/results/dceb413fb5d459338417d8dd5a42d95aa23e849b > Signed-off-by: Thomas Devoogdt > --- > v2: new patch in this serie Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 15 09:23:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:23:45 +0100 Subject: [Buildroot] [PATCH] support/config-fragments: add a bootlin s390x toolchain In-Reply-To: <20230211155826.285037-1-thomas@devoogdt.com> (thomas@devoogdt.com's message of "Sat, 11 Feb 2023 16:58:26 +0100") References: <20230211155826.285037-1-thomas@devoogdt.com> Message-ID: <87lekz46zi.fsf@dell.be.48ers.dk> >>>>> "thomas" == thomas writes: > From: Thomas Devoogdt > I do constantly get mails that fluent-bit fails to build for s390x. > So added this to ensure that the s390x architecture is checked as well > if I manually do: > $ ./utils/test-pkg -p fluent-bit -a > Signed-off-by: Thomas Devoogdt Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 15 09:14:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:14:25 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: bump to version 2.0.9 Message-ID: <20230215092413.E76EA85584@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=656af31891cc68eb8b27866cb9e9a7ca428a2b16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Release Notes: https://fluentbit.io/announcements/v2.0.9/ - Patch dropped, as it is upstream: https://github.com/fluent/fluent-bit/commit/7bcb502ebdcd647d6b83c972805e734ad522eb1a Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...-CMakeLists.txt-only-require-a-C-compiler.patch | 27 ---------------------- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch b/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch deleted file mode 100644 index e71bcf0c0d..0000000000 --- a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7bcb502ebdcd647d6b83c972805e734ad522eb1a Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 30 Jan 2023 09:10:37 +0100 -Subject: [PATCH] CMakeLists.txt: only require a C compiler - -Fluent-bit is mostly written in C, -so don't require CXX in the top-level project. - -Signed-off-by: Thomas Devoogdt ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7adb02de..3ff7360d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.12) --project(fluent-bit) -+project(fluent-bit C) - - # CMP0069 ensures that LTO is enabled for all compilers - cmake_policy(SET CMP0069 NEW) --- -2.30.2 - diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index ce7cea7b59..0caadcd56f 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8ff5566389033669feabc9c69a5c6f417dad5c8b066454388e6a706507262acf fluent-bit-2.0.8.tar.gz +sha256 393ad4a6ced48c327607653d610ef273843085a17b6e5c8013877abdf31e6945 fluent-bit-2.0.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 13077e53cc..c10ef613d7 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.0.8 +FLUENT_BIT_VERSION = 2.0.9 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 15 09:13:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:13:41 +0100 Subject: [Buildroot] [git commit] package/go: security bump to version 1.19.6 Message-ID: <20230215092413.DC00585541@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98e0452ebb7cb25311d4f615e07df89a5776268b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master go1.19.6 (released 2023-02-14) includes security fixes to the crypto/tls, mime/multipart, net/http, and path/filepath packages, as well as bug fixes to the go command, the linker, the runtime, and the crypto/x509, net/http, and time packages. See the Go 1.19.6 milestone on the Go issue tracker for details. CVE-2022-41725: net/http, mime/multipart: denial of service from excessive resource consumption CVE-2022-41724: crypto/tls: large handshake records may cause panics CVE-2022-41723: net/http: avoid quadratic complexity in HPACK decoding https://go.dev/doc/devel/release#go1.19.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 4c22f0f274..8254a91524 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 d7f0013f82e6d7f862cc6cb5c8cdb48eef5f2e239b35baa97e2f1a7466043767 go1.19.6.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index c38ae0b99c..a9056da47b 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.5 +GO_VERSION = 1.19.6 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Wed Feb 15 09:23:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:23:35 +0100 Subject: [Buildroot] [git commit] support/config-fragments: add a bootlin s390x toolchain Message-ID: <20230215092414.15C6B85541@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=740d923423f18d94d62e60d0efe8200c7bd889d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master I do constantly get mails that fluent-bit fails to build for s390x. So added this to ensure that the s390x architecture is checked as well if I manually do: $ ./utils/test-pkg -p fluent-bit -a Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config | 5 +++++ support/config-fragments/autobuild/toolchain-configs.csv | 1 + 2 files changed, 6 insertions(+) diff --git a/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config new file mode 100644 index 0000000000..fe3f0380c9 --- /dev/null +++ b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config @@ -0,0 +1,5 @@ +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 diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 0b19051543..a65e9bacc3 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -38,6 +38,7 @@ support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv32-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-sh4-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc64-glibc.config,x86_64 From peter at korsgaard.com Wed Feb 15 09:23:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:23:16 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: fix builds on s390x architectures Message-ID: <20230215092414.0AFB3855A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5cbb458bd44778376ccdd5ffccc3e5fc5492766a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: - http://autobuild.buildroot.net/results/856fd250f75a696694c70e3208ffcef7470a7082 - http://autobuild.buildroot.net/results/dceb413fb5d459338417d8dd5a42d95aa23e849b Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 4ecf813511..d618fdf1e2 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -12,6 +12,9 @@ FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl +FLUENT_BIT_CFLAGS = $(TARGET_CFLAGS) +FLUENT_BIT_CXXFLAGS = $(TARGET_CXXFLAGS) + FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ -DFLB_RELEASE=Yes \ @@ -42,12 +45,16 @@ FLUENT_BIT_CONF_OPTS += \ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_INSTALL_SYSCONFDIR="/etc/" +# Fix multiple definition of `mk_tls_*'. +# https://github.com/fluent/fluent-bit/issues/5537 +FLUENT_BIT_CFLAGS += -fcommon +FLUENT_BIT_CXXFLAGS += -fcommon + # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h # large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information. -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +# https://bugzilla.redhat.com/show_bug.cgi?id=574992 +FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS +FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) FLUENT_BIT_DEPENDENCIES += musl-fts @@ -60,7 +67,9 @@ FLUENT_BIT_LDFLAGS += -latomic endif FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" \ + -DCMAKE_C_FLAGS="$(FLUENT_BIT_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(FLUENT_BIT_CXXFLAGS)" define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ From peter at korsgaard.com Wed Feb 15 09:16:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:16:17 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: add support for non glibc toolchain Message-ID: <20230215092413.F412B85589@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d649bcd3805a26cedb30120ebbdcf12f8fbf449f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - require threads and dynamic library support - require sync_4 support - provide fts.h through musl-fts static_assert is not available if no C++ toolchain or no glibc is used, so add two patches to fix this Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- .../0001-lib-cfl-fixup-static_assert.patch | 33 +++++++++++++ .../0002-lib-c-ares-fixup-static_assert.patch | 56 ++++++++++++++++++++++ package/fluent-bit/Config.in | 10 ++-- package/fluent-bit/fluent-bit.mk | 11 ++++- 4 files changed, 105 insertions(+), 5 deletions(-) diff --git a/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch b/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch new file mode 100644 index 0000000000..19dab7cac6 --- /dev/null +++ b/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch @@ -0,0 +1,33 @@ +From e4f825dd9e952f4a056bf89342049e67102ae6bb Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:38:15 +0100 +Subject: [PATCH] lib: cfl: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 + +Signed-off-by: Thomas Devoogdt +--- + lib/cfl/lib/xxhash/xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/cfl/lib/xxhash/xxhash.h b/lib/cfl/lib/xxhash/xxhash.h +index 08ab79457..511c4d12b 100644 +--- a/lib/cfl/lib/xxhash/xxhash.h ++++ b/lib/cfl/lib/xxhash/xxhash.h +@@ -1546,8 +1546,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else +-- +2.34.1 + diff --git a/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch new file mode 100644 index 0000000000..d9b918ea8a --- /dev/null +++ b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch @@ -0,0 +1,56 @@ +From f55f9bf6d9201169d2e5d3782068b03ff17dec90 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:26:56 +0100 +Subject: [PATCH] lib: c-ares: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/c-ares/c-ares/issues/504 + +Signed-off-by: Thomas Devoogdt +--- + lib/c-ares-1.19.0/configure | 4 ++++ + lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/lib/c-ares-1.19.0/configure b/lib/c-ares-1.19.0/configure +index 4c5e1a966..58712ec34 100755 +--- a/lib/c-ares-1.19.0/configure ++++ b/lib/c-ares-1.19.0/configure +@@ -6317,6 +6317,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +@@ -6394,6 +6396,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +diff --git a/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 b/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 +index 229de3091..fe4a11c67 100644 +--- a/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 ++++ b/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 +@@ -37,6 +37,9 @@ + #serial 9 + + m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ ++ ++#define static_assert _Static_assert ++ + template + struct check + { +-- +2.34.1 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 6c2299e695..f53eacb447 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_FLUENT_BIT bool "fluent-bit" - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_STATIC_LIBS # dlfcn.h + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBYAML help @@ -29,5 +32,6 @@ config BR2_PACKAGE_FLUENT_BIT_WASM endif -comment "fluent-bit needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC +comment "fluent-bit needs a toolchain w/ threads, dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index c10ef613d7..4ecf813511 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -49,12 +49,19 @@ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +FLUENT_BIT_DEPENDENCIES += musl-fts +FLUENT_BIT_LDFLAGS += -lfts +endif + # Uses __atomic_compare_exchange_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS=-latomic +FLUENT_BIT_LDFLAGS += -latomic endif +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" + define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ $(TARGET_DIR)/etc/init.d/S99fluent-bit From d.lang at abatec.at Wed Feb 15 09:58:39 2023 From: d.lang at abatec.at (Lang Daniel) Date: Wed, 15 Feb 2023 09:58:39 +0000 Subject: [Buildroot] [PATCH v2 1/2] package/libbpf: Don't remove bpf.h Message-ID: libbpf >1.0.0 defines libbpf_bpf_link_type_str(enum bpf_link_type) in src/libbpf.h, which is included by host-pahole. bpf_link_type is defined in linux/bpf.h, therefore the comment stating that pahole doesn't need bpf.h is no longer valid. Fixes: - http://autobuild.buildroot.net/results/d126a4b6eca786402dc362c86f8df3addec3d217/ Signed-off-by: Daniel Lang --- v1 -> v2: no changes. --- package/libbpf/libbpf.mk | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index b498136ace..670dbee87e 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -39,26 +39,9 @@ define LIBBPF_INSTALL_TARGET_CMDS -C $(@D)/src install DESTDIR=$(TARGET_DIR) endef -# We need to install_uapi_headers so we have btf.h to compile -# host-pahole. -# Nonetheless, this target adds bpf.h which generates a conflict when -# building the kernel: -# In file included from libbpf_internal.h:17:0, from strset.c:9: -# relo_core.h:10:6: error: nested redefinition of 'enum bpf_core_relo_kind' -# enum bpf_core_relo_kind { -# ^~~~~~~~~~~~~~~~~~ -# relo_core.h:10:6: error: redeclaration of 'enum bpf_core_relo_kind' -# In file included from libbpf_legacy.h:13:0, -# from libbpf_internal.h:16, -# from strset.c:9: -# /home/francis/buildroot/output/host/include/linux/bpf.h:6497:6: note: originally defined here -# enum bpf_core_relo_kind { -# So, better to remove remove it now since we do not need it to build -# host-pahole, the only user of host-libbpf. define HOST_LIBBPF_INSTALL_CMDS $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ -C $(@D)/src install install_uapi_headers DESTDIR=$(HOST_DIR) - rm $(HOST_DIR)/include/linux/bpf.h endef $(eval $(generic-package)) -- 2.25.1 From d.lang at abatec.at Wed Feb 15 09:58:51 2023 From: d.lang at abatec.at (Lang Daniel) Date: Wed, 15 Feb 2023 09:58:51 +0000 Subject: [Buildroot] [PATCH v2 2/2] linux: use -isystem instead of -I in HOSTCC Message-ID: A package might install headers that are incompatible with the kernel's header. One example is the most recent version of pahole (1.24). HOST_CC includes -I$(HOST_DIR)/include which comes before any include logic the kernel might have thus forcing the kernel to prefer headers in HOST_DIR. The logic to substituting -I with -isystem is taken from boot/uboot/uboot.mk. Signed-off-by: Daniel Lang --- v1 -> v2: - Patch was added to the series Tested with: BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="{VERSION}" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="pahole-kernel.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE=y and with a fragment for linux: CONFIG_BPF_SYSCALL=y CONFIG_BPF_UNPRIV_DEFAULT_OFF=n CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DEBUG_INFO_REDUCED=n CONFIG_DEBUG_INFO_COMPRESSED=n CONFIG_DEBUG_INFO_BTF=y CONFIG_SYSTEM_TRUSTED_KEYRING=y where VERSION is one of: 5.2.21 5.3.18 5.4.231 5.5.19 5.6.19 5.7.19 5.8.18 5.9.16 5.10.167 5.11.22 5.12.19 5.13.19 5.14.21 5.15.93 5.16.20 5.17.15 5.18.19 5.19.17 6.0.19 6.1.11 Version 5.2, as far as I could work it out, is the version that introduced the pahole dependency when CONFIG_DEBUG_INFO_BTF is set. None-LTS versions after 5.10 and before 5.19 fail with: LD vmlinux.o MODPOST vmlinux.symvers MODINFO modules.builtin.modinfo GEN modules.builtin LD .tmp_vmlinux.btf BTF .btf.vmlinux.bin.o LD .tmp_vmlinux.kallsyms1 KSYMS .tmp_vmlinux.kallsyms1.S AS .tmp_vmlinux.kallsyms1.S LD .tmp_vmlinux.kallsyms2 KSYMS .tmp_vmlinux.kallsyms2.S AS .tmp_vmlinux.kallsyms2.S LD vmlinux BTFIDS vmlinux FAILED: load BTF from vmlinux: Invalid argument make[2]: *** [Makefile:1177: vmlinux] Error 255 make[1]: *** [package/pkg-generic.mk:293: /home/d.lang/ws/other/buildroot/output/build/linux-5.11.22/.stamp_built] Error 2 make: *** [Makefile:82: _all] Error 2 These version miss BTF_KIND_ENUM64 support and require a patch [0] that has been added to LTS versions. [0]: https://lore.kernel.org/bpf/20221019085604.1017583-6-jolsa at kernel.org/ Signed-off-by: Daniel Lang --- linux/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..03d89cd204 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -150,7 +150,7 @@ endif # Disable building host tools with -Werror: newer gcc versions can be # extra picky about some code (https://bugs.busybox.net/show_bug.cgi?id=14826) LINUX_MAKE_FLAGS = \ - HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ + HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ ARCH=$(KERNEL_ARCH) \ INSTALL_MOD_PATH=$(TARGET_DIR) \ CROSS_COMPILE="$(TARGET_CROSS)" \ -- 2.25.1 From christian at paral.in Wed Feb 15 10:55:00 2023 From: christian at paral.in (Christian Stewart) Date: Wed, 15 Feb 2023 02:55:00 -0800 Subject: [Buildroot] [PATCH] package/pkg-golang: disable version control information In-Reply-To: <12a7772dc9c30d31bc4dd7a4e15ca12425c14834.1676297701.git.stefan@agner.ch> References: <12a7772dc9c30d31bc4dd7a4e15ca12425c14834.1676297701.git.stefan@agner.ch> Message-ID: Hi Stefan, On Mon, Feb 13, 2023 at 6:16 AM Stefan Agner wrote: > > By default go tries to include version control (VCS) information in > binaries. Since Buildroot separates version control from the build > process it is sensible to disable this behavior. > > This avoids build errors when building with a git repository higher > up in the tree owned by root. In this case the go build system > calls `git status --porcelain` which returns with an error: > fatal: detected dubious ownership in repository at '/build' > > Signed-off-by: Stefan Agner > --- > package/pkg-golang.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk > index cdc67b32c0..da9c9a21ac 100644 > --- a/package/pkg-golang.mk > +++ b/package/pkg-golang.mk > @@ -45,7 +45,8 @@ $(2)_BUILD_OPTS += \ > -modcacherw \ > -tags "$$($(2)_TAGS)" \ > -trimpath \ > - -p $$(PARALLEL_JOBS) > + -p $$(PARALLEL_JOBS) \ > + -buildvcs=false Lgtm & tested Reviewed-by: Christian Stewart From thomas at devoogdt.com Wed Feb 15 11:41:57 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 15 Feb 2023 12:41:57 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/fluent-bit: add support for non glibc toolchain In-Reply-To: <87ttzn473w.fsf@dell.be.48ers.dk> References: <20230211182546.633728-1-thomas@devoogdt.com> <20230211182546.633728-2-thomas@devoogdt.com> <87ttzn473w.fsf@dell.be.48ers.dk> Message-ID: Hi, Peter It would indeed be better to link against those, but this is sadly the nature of how fluent-bit is made. Next to those two libs, there are a dozen of other libs that are also literally copied in their code base. What you are proposing is to adapt their cmakefile and only compile the static libs if no dynamic lib could be found. Or even never compile it and just pass the linker flags. I'm afraid that we could have compatibility problems by that, so I would keep it static for now. Kr Thomas Devoogdt Op wo 15 feb. 2023 10:21 schreef Peter Korsgaard : > >>>>> "thomas" == thomas writes: > > > From: Thomas Devoogdt > > - require threads and dynamic library support > > - require sync_4 support > > - provide fts.h trough musl-fts > > > static_assert is not available if no C++ toolchain or no glibc > > is used, so add two patches to fix this > > > Signed-off-by: Thomas Devoogdt > > Committed, thanks. We do have xxhash and c-ares packages in Buildroot, > could you have a look at using those instead of these vendored > libraries? > > -- > Bye, Peter Korsgaard > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Wed Feb 15 12:52:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 13:52:31 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/fluent-bit: add support for non glibc toolchain In-Reply-To: (Thomas Devoogdt's message of "Wed, 15 Feb 2023 12:41:57 +0100") References: <20230211182546.633728-1-thomas@devoogdt.com> <20230211182546.633728-2-thomas@devoogdt.com> <87ttzn473w.fsf@dell.be.48ers.dk> Message-ID: <87h6vn3xbk.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > Hi, Peter > It would indeed be better to link against those, > but this is sadly the nature of how fluent-bit is made. Do you know why they have made that choice? From a quick look it doesn't seem like the code has been modified. > Next to those two libs, there are a dozen of other libs that are also > literally copied in their code base. What you are proposing is to adapt > their cmakefile and only compile the static libs if no dynamic lib could be > found. Or even never compile it and just pass the linker flags. I'm afraid > that we could have compatibility problems by that, so I would keep it > static for now. If that is the only option supported by upstream, then indeed that is what we will have to do. Will you monitor for security vulnerabilities in the vendored libraries and ensure this is also fixed there? E.G. we recently had a (low risk) vulnerability in c-ares. -- Bye, Peter Korsgaard From raphael.pavlidis at gmail.com Wed Feb 15 14:35:34 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Wed, 15 Feb 2023 15:35:34 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/x11r7/xwayland: new package Message-ID: <20230215143534.19834-1-raphael.pavlidis@gmail.com> XServer to run X clients under wayland This XServer is required to run the X clients under Wayland compositor, for example weston or wlroots based compositors. Signed-off-by: Raphael Pavlidis --- DEVELOPERS | 1 + package/weston/Config.in | 8 +++ package/weston/weston.mk | 2 +- package/wlroots/Config.in | 12 ++++ package/wlroots/wlroots.mk | 6 +- package/x11r7/Config.in | 1 + package/x11r7/xwayland/Config.in | 26 ++++++++ package/x11r7/xwayland/xwayland.hash | 6 ++ package/x11r7/xwayland/xwayland.mk | 94 ++++++++++++++++++++++++++++ 9 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 package/x11r7/xwayland/Config.in create mode 100644 package/x11r7/xwayland/xwayland.hash create mode 100644 package/x11r7/xwayland/xwayland.mk diff --git a/DEVELOPERS b/DEVELOPERS index df2b98ad53..b240b7c92a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2515,6 +2515,7 @@ F: support/testing/tests/package/test_python_s3transfer.py N: Raphael Pavlidis F: package/slirp4netns/ F: package/sway/ +F: package/x11r7/xwayland/ N: Refik Tuzakli F: package/freescale-imx/ diff --git a/package/weston/Config.in b/package/weston/Config.in index 3b4e932b7d..db12afc43a 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -111,14 +111,22 @@ config BR2_PACKAGE_WESTON_XWAYLAND bool "XWayland support" depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_LIBEPOXY + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_XWAYLAND comment "XWayland support needs libepoxy and X.org enabled" depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + # Weston needs at least one shell; this can be one of the bundled ones, # below, of from a third-party package, which should then select this. config BR2_PACKAGE_WESTON_HAS_SHELL diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 5e71473640..01f84178b2 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -123,7 +123,7 @@ WESTON_CONF_OPTS += -Dbackend-default=$(call qstrip,$(BR2_PACKAGE_WESTON_DEFAULT ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) WESTON_CONF_OPTS += -Dxwayland=true -WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor +WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor xwayland else WESTON_CONF_OPTS += -Dxwayland=false endif diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 84a4ef846e..26992ca326 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -41,4 +41,16 @@ config BR2_PACKAGE_WLROOTS_X11 help Support Wayland sessions nested inside a X11 window +config BR2_PACKAGE_WLROOTS_XWAYLAND + bool "XWayland support" + depends on BR2_PACKAGE_XORG7 # libxcb, xcb-util-wm, xwayland + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_XWAYLAND + help + Support for X11 applications + +comment "XWayland support needs X.org enabled" + depends on !BR2_PACKAGE_XORG7 + endif diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 4f14d20b11..5b930a51be 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -30,8 +30,12 @@ WLROOTS_BACKENDS = libinput drm ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) WLROOTS_BACKENDS += x11 -WLROOTS_CONF_OPTS += -Dxwayland=enabled WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 +endif + +ifeq ($(BR2_PACKAGE_WLROOTS_XWAYLAND),y) +WLROOTS_CONF_OPTS += -Dxwayland=enabled +WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xwayland else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 365de34c98..4de8922e0d 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -12,6 +12,7 @@ menuconfig BR2_PACKAGE_XORG7 if BR2_PACKAGE_XORG7 menu "X11R7 Servers" source package/x11r7/xserver_xorg-server/Config.in + source package/x11r7/xwayland/Config.in endmenu menu "X11R7 Libraries" source package/x11r7/libxcb/Config.in diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in new file mode 100644 index 0000000000..4f14f2cc36 --- /dev/null +++ b/package/x11r7/xwayland/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_XWAYLAND + bool "xwayland server" + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland + # We need a SHA1 implementation. If either openssl or + # libgcrypt are already part of the build, we'll use one of + # them, otherwise, use the small libsha1 library. + select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_XLIB_LIBXCVT + select BR2_PACKAGE_XLIB_LIBXFONT2 + select BR2_PACKAGE_XLIB_LIBXKBFILE + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_XTRANS + select BR2_PACKAGE_XORGPROTO + help + X.Org X server to run X clients under wayland + + http://xorg.freedesktop.org + +comment "xwayland needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash new file mode 100644 index 0000000000..0c476f3183 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.hash @@ -0,0 +1,6 @@ +# From https://lists.x.org/archives/xorg-announce/2023-February/003322.html +sha256 d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73 xwayland-22.1.8.tar.xz +sha512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a xwayland-22.1.8.tar.xz + +# Locally calculated +sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk new file mode 100644 index 0000000000..174b440b07 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.mk @@ -0,0 +1,94 @@ +################################################################################ +# +# xwayland +# +################################################################################ + +XWAYLAND_VERSION = 22.1.8 +XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz +XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver +XWAYLAND_LICENSE = MIT +XWAYLAND_LICENSE_FILES = COPYING +XWAYLAND_INSTALL_STAGING = YES +XWAYLAND_DEPENDENCIES = \ + pixman \ + wayland \ + wayland-protocols \ + xlib_libxcvt \ + xlib_libXfont2 \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_xtrans \ + xorgproto +XWAYLAND_CONF_OPTS = \ + -Dxwayland_eglstream=false \ + -Dxvfb=false \ + -Ddefault_font_path=/usr/share/fonts/X11/ \ + -Ddtrace=false \ + -Ddocs=false + +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY),yy) +XWAYLAND_CONF_OPTS += -Dglamor=true +XWAYLAND_DEPENDENCIES += libdrm libepoxy +else +XWAYLAND_CONF_OPTS += -Dglamor=false +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XWAYLAND_CONF_OPTS += -Dglx=true +XWAYLAND_DEPENDENCIES += libgl +else +XWAYLAND_CONF_OPTS += -Dglx=false +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXDMCP),y) +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=true \ + -Dxdm-auth-1=true +XWAYLAND_DEPENDENCIES += xlib_libXdmcp +else +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=false \ + -Dxdm-auth-1=false +endif + +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +XWAYLAND_CONF_OPTS += -Dsecure-rpc=true +XWAYLAND_DEPENDENCIES += libtirpc +else +XWAYLAND_CONF_OPTS += -Dsecure-rpc=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX)$(BR2_PACKAGE_AUDIT),yy) +XWAYLAND_CONF_OPTS += -Dxselinux=true +XWAYLAND_DEPENDENCIES += libselinux audit +else +XWAYLAND_CONF_OPTS += -Dxselinux=false +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +XWAYLAND_CONF_OPTS += -Dsha1=libcrypto +XWAYLAND_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +XWAYLAND_CONF_OPTS += -Dsha1=libgcrypt +XWAYLAND_DEPENDENCIES += libgcrypt +else +XWAYLAND_CONF_OPTS += -Dsha1=libsha1 +XWAYLAND_DEPENDENCIES += libsha1 +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_LIBDRM),yy) +XWAYLAND_CONF_OPTS += -Ddri3=true +XWAYLAND_DEPENDENCIES += xlib_libxshmfence libdrm +else +XWAYLAND_CONF_OPTS += -Ddri3=false +endif + +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +XWAYLAND_CONF_OPTS += -Dlibunwind=true +XWAYLAND_DEPENDENCIES += libunwind +else +XWAYLAND_CONF_OPTS += -Dlibunwind=false +endif + +$(eval $(meson-package)) -- 2.39.1 From nolange79 at gmail.com Wed Feb 15 15:13:01 2023 From: nolange79 at gmail.com (Norbert Lange) Date: Wed, 15 Feb 2023 16:13:01 +0100 Subject: [Buildroot] [PATCH] package/zstd: bump to version 1.5.4 Message-ID: <20230215151302.140387-1-nolange79@gmail.com> The LICENSE text has changed, nominally the copyright owner changed from "Facebook" to "Meta Platforms, Inc. and affiliates", reflecting the name change of that company. Add upstream patch to fix zstd-dll build. Signed-off-by: Norbert Lange --- ...-zstd-dll-build-missing-dependencies.patch | 179 ++++++++++++++++++ package/zstd/zstd.hash | 6 +- package/zstd/zstd.mk | 2 +- 3 files changed, 183 insertions(+), 4 deletions(-) create mode 100644 package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch diff --git a/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch new file mode 100644 index 0000000000..bbb008c3b3 --- /dev/null +++ b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch @@ -0,0 +1,179 @@ +Fix zstd-dll build + +https://github.com/facebook/zstd/commit/c78f434aa4f5f1097c8edb975f4c1635817a5a71 + +Signed-off-by: Norbert Lange + +diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml +index 132dbb9961..9c70dda130 100644 +--- a/.github/workflows/dev-short-tests.yml ++++ b/.github/workflows/dev-short-tests.yml +@@ -55,6 +55,14 @@ jobs: + run: | + make c89build V=1 + ++ zstd-dll-test: ++ runs-on: ubuntu-latest ++ steps: ++ - uses: actions/checkout at ac593985615ec2ede58e132d2e21d2b1cbd6127c # tag=v3 ++ - name: build zstd bin against a dynamic lib (debuglevel for more dependencies) ++ run: | ++ make -C lib lib-mt-release ++ DEBUGLEVEL=2 make -C programs zstd-dll + + gcc-7-libzstd: + runs-on: ubuntu-latest +@@ -328,7 +336,6 @@ jobs: + make -j -C programs allVariants MOREFLAGS=-O0 + ./tests/test-variants.sh + +- + qemu-consistency: + name: QEMU ${{ matrix.name }} + runs-on: ubuntu-20.04 +diff --git a/lib/common/zstd_common.c b/lib/common/zstd_common.c +index 3208552475..3f04c22abf 100644 +--- a/lib/common/zstd_common.c ++++ b/lib/common/zstd_common.c +@@ -14,7 +14,6 @@ + * Dependencies + ***************************************/ + #define ZSTD_DEPS_NEED_MALLOC +-#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ + #include "error_private.h" + #include "zstd_internal.h" + +@@ -47,37 +46,3 @@ ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); } + /*! ZSTD_getErrorString() : + * provides error code string from enum */ + const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); } +- +- +- +-/*=************************************************************** +-* Custom allocator +-****************************************************************/ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) +- return customMem.customAlloc(customMem.opaque, size); +- return ZSTD_malloc(size); +-} +- +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) { +- /* calloc implemented as malloc+memset; +- * not as efficient as calloc, but next best guess for custom malloc */ +- void* const ptr = customMem.customAlloc(customMem.opaque, size); +- ZSTD_memset(ptr, 0, size); +- return ptr; +- } +- return ZSTD_calloc(1, size); +-} +- +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) +-{ +- if (ptr!=NULL) { +- if (customMem.customFree) +- customMem.customFree(customMem.opaque, ptr); +- else +- ZSTD_free(ptr); +- } +-} +diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h +index 37836dc703..2557ac703b 100644 +--- a/lib/common/zstd_internal.h ++++ b/lib/common/zstd_internal.h +@@ -24,6 +24,8 @@ + #include "mem.h" + #include "debug.h" /* assert, DEBUGLOG, RAWLOG, g_debuglevel */ + #include "error_private.h" ++#define ZSTD_DEPS_NEED_MALLOC ++#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ + #define ZSTD_STATIC_LINKING_ONLY + #include "../zstd.h" + #define FSE_STATIC_LINKING_ONLY +@@ -351,9 +353,34 @@ const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx); /* compress & dictBu + int ZSTD_seqToCodes(const seqStore_t* seqStorePtr); /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */ + + /* custom memory allocation functions */ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem); +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem); +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem); ++MEM_STATIC void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) ++ return customMem.customAlloc(customMem.opaque, size); ++ return ZSTD_malloc(size); ++} ++ ++MEM_STATIC void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) { ++ /* calloc implemented as malloc+memset; ++ * not as efficient as calloc, but next best guess for custom malloc */ ++ void* const ptr = customMem.customAlloc(customMem.opaque, size); ++ ZSTD_memset(ptr, 0, size); ++ return ptr; ++ } ++ return ZSTD_calloc(1, size); ++} ++ ++MEM_STATIC void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) ++{ ++ if (ptr!=NULL) { ++ if (customMem.customFree) ++ customMem.customFree(customMem.opaque, ptr); ++ else ++ ZSTD_free(ptr); ++ } ++} + + + /* ZSTD_invalidateRepCodes() : +diff --git a/programs/Makefile b/programs/Makefile +index fcff41dc1b..8507abef3f 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -225,7 +225,7 @@ zstd-noxz : zstd + .PHONY: zstd-dll + zstd-dll : LDFLAGS+= -L$(LIBZSTD) + zstd-dll : LDLIBS += -lzstd +-zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c ++zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c pool.c threading.c + zstd-dll : zstd + + +diff --git a/tests/Makefile b/tests/Makefile +index 3eed19ea80..778c7d6759 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -95,7 +95,7 @@ allnothread: fullbench fuzzer paramgrill datagen decodecorpus + dll: fuzzer-dll zstreamtest-dll + + .PHONY: zstd zstd32 zstd-nolegacy # only external makefile knows how to build or update them +-zstd zstd32 zstd-nolegacy: ++zstd zstd32 zstd-nolegacy zstd-dll: + $(MAKE) -C $(PRGDIR) $@ MOREFLAGS+="$(DEBUGFLAGS)" + + .PHONY: libzstd +@@ -328,13 +328,17 @@ test-all: test test32 test-decodecorpus-cli + test-zstd: ZSTD = $(PRGDIR)/zstd + test-zstd: zstd + ++.PHONY: test-zstd-dll ++test-zstd-dll: ZSTD = $(PRGDIR)/zstd ++test-zstd-dll: zstd-dll ++ + test-zstd32: ZSTD = $(PRGDIR)/zstd32 + test-zstd32: zstd32 + + test-zstd-nolegacy: ZSTD = $(PRGDIR)/zstd-nolegacy + test-zstd-nolegacy: zstd-nolegacy + +-test-zstd test-zstd32 test-zstd-nolegacy: datagen ++test-zstd test-zstd32 test-zstd-nolegacy test-zstd-dll: datagen + file $(ZSTD) + EXE_PREFIX="$(QEMU_SYS)" ZSTD_BIN="$(ZSTD)" DATAGEN_BIN=./datagen ./playTests.sh $(ZSTDRTTEST) + diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index eca44b89f0..ca4e2fa0b9 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,6 +1,6 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 -sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.gz.sha256 +sha256 0f470992aedad543126d06efab344dc5f3e171893810455787d38347343a4424 zstd-1.5.4.tar.gz # License files (locally computed) -sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE +sha256 7055266497633c9025b777c78eb7235af13922117480ed5c674677adc381c9d8 LICENSE sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 73bb97a793..45e8bf1bc2 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.2 +ZSTD_VERSION = 1.5.4 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 -- 2.39.1 From giulio.benetti at benettiengineering.com Wed Feb 15 20:09:01 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 15 Feb 2023 21:09:01 +0100 Subject: [Buildroot] [PATCH 1/2] configs/bananapi_m2_ultra_defconfig: bump Linux to 6.1 and U-Boot to 2023.01 Message-ID: <20230215200902.538238-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/bananapi_m2_ultra_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 2ec0e60e8d..0f267021f8 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Ultra" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-ultra/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-r40-bananapi-m2-ultra" @@ -16,7 +16,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 15 20:09:02 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 15 Feb 2023 21:09:02 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Giulio Benetti as maintainer for board bananapi-m2-ultra In-Reply-To: <20230215200902.538238-1-giulio.benetti@benettiengineering.com> References: <20230215200902.538238-1-giulio.benetti@benettiengineering.com> Message-ID: <20230215200902.538238-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ef00ccef3f..7ab2bb5bff 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1135,10 +1135,12 @@ F: package/webp/ F: package/xapian/ N: Giulio Benetti +F: board/bananapi/bananapi-m2-ultra/ F: board/freescale/imxrt1050evk/* F: board/olimex/a* F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig +F: configs/bananapi_m2_ultra_defconfig F: configs/imxrt1050-evk_defconfig F: configs/olimex_a* F: package/at/ -- 2.34.1 From arnout at mind.be Wed Feb 15 20:19:53 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 21:19:53 +0100 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: References: <20220607231211.533086-1-james.hilliard1@gmail.com> <20230208161527.31a28b3b@windsurf> Message-ID: On 09/02/2023 22:42, James Hilliard wrote: > On Thu, Feb 9, 2023 at 1:44 PM Arnout Vandecappelle wrote: >> >> >> >> On 09/02/2023 21:32, James Hilliard wrote: [snip] >>> There are many fixes related to various --no-toolchains-csv build failures >>> that would also need to be backported as well if even feasible. >> >> Even so, I'm much more inclined to rewrite the autobuild-run logic to >> dynamically test which options genrandconfig can take and adapt accordingly. > > The genrandconfig issue is only one of a number of issues that I've > seen come up, > there's been a rather long tail of lingering aarch64 compatibility > issues that sometimes > require major package updates. For example some systemd fixes for aarch64 build > hosts aren't really feasible to backport due to requiring major refactoring. If aarch64 build hosts are broken on the stable branches, that should be fixed, right? At the very least adding BR2_HOSTARCH dependencies... Anyway, with 2022.02 EOL in a bit more than a month, it probably doesn't matter any more... Regards, Arnout > What we probably eventually want is the ability to identify issues as build host > environment specific by rerunning failed builds on different hosts > automatically, > but that would probably require some infrastructure changes. > >> That way you don't have to manually maintain those branches and update them on >> each autobuilder instance. > > I'm pretty much just using this to restrict my autobuilders to master > branch when there > are known compatibility issues with older branches for a particular > host configuration. > >> >> Regards, >> Arnout >> >>> >>>> >>>> Regards, >>>> Arnout >>>> >>>>> on anything other than say master. >>>>> >>>>> To prevent testing of unwanted branches I could modify this to restrict >>>>> the branch override to only allow selecting the branches listed in: >>>>> http://autobuild.buildroot.org/branches >>>>> >>>>>> >>>>>> Thanks! >>>>>> >>>>>> Thomas >>>>>> -- >>>>>> Thomas Petazzoni, CTO, Bootlin >>>>>> Embedded Linux and Kernel engineering >>>>>> https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 15 20:22:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:22:09 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/x11r7/xwayland: new package In-Reply-To: <20230215143534.19834-1-raphael.pavlidis@gmail.com> References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> Message-ID: <20230215212209.269cd96d@windsurf> Hello On Wed, 15 Feb 2023 15:35:34 +0100 Raphael Pavlidis wrote: > XServer to run X clients under wayland > > This XServer is required to run the X clients under Wayland compositor, > for example weston or wlroots based compositors. > > Signed-off-by: Raphael Pavlidis Thanks for the patch! I have a few questions/suggestions below. > DEVELOPERS | 1 + > package/weston/Config.in | 8 +++ > package/weston/weston.mk | 2 +- > package/wlroots/Config.in | 12 ++++ > package/wlroots/wlroots.mk | 6 +- > package/x11r7/Config.in | 1 + > package/x11r7/xwayland/Config.in | 26 ++++++++ > package/x11r7/xwayland/xwayland.hash | 6 ++ > package/x11r7/xwayland/xwayland.mk | 94 ++++++++++++++++++++++++++++ > 9 files changed, 154 insertions(+), 2 deletions(-) This should probably be split into 3 patches: one adding the xwayland package, one tweaking the existing weston package, and one tweaking the wlroots package. > diff --git a/package/weston/Config.in b/package/weston/Config.in > index 3b4e932b7d..db12afc43a 100644 > --- a/package/weston/Config.in > +++ b/package/weston/Config.in > @@ -111,14 +111,22 @@ config BR2_PACKAGE_WESTON_XWAYLAND > bool "XWayland support" > depends on BR2_PACKAGE_XORG7 > depends on BR2_PACKAGE_LIBEPOXY > + depends on BR2_USE_MMU # xwayland > + depends on !BR2_STATIC_LIBS # xwayland > + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland > select BR2_PACKAGE_CAIRO > select BR2_PACKAGE_LIBXCB > select BR2_PACKAGE_XLIB_LIBX11 > select BR2_PACKAGE_XLIB_LIBXCURSOR > + select BR2_PACKAGE_XWAYLAND So does that means that the current BR2_PACKAGE_WESTON_XWAYLAND option is broken? I am rather confused by how XWayland works. Isn't XWayland a normal Wayland client? Why does Weston or wlroots, as Wayland compositors, need to have some support/knowledge for XWayland? > +config BR2_PACKAGE_WLROOTS_XWAYLAND > + bool "XWayland support" > + depends on BR2_PACKAGE_XORG7 # libxcb, xcb-util-wm, xwayland > + select BR2_PACKAGE_LIBXCB > + select BR2_PACKAGE_XCB_UTIL_WM > + select BR2_PACKAGE_XWAYLAND Since you're selecting BR2_PACKAGE_XWAYLAND, you need to replicate: depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # wayland depends on BR2_TOOLCHAIN_HAS_THREADS # wayland and add the corresponding Config.in comment. > diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk > index 4f14d20b11..5b930a51be 100644 > --- a/package/wlroots/wlroots.mk > +++ b/package/wlroots/wlroots.mk > @@ -30,8 +30,12 @@ WLROOTS_BACKENDS = libinput drm > > ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) > WLROOTS_BACKENDS += x11 > -WLROOTS_CONF_OPTS += -Dxwayland=enabled So this is also a bug in the current package? What is WLROOTS_X11 controlling then? Running wlroots as a X11 client? Otherwise, the xwayland package looks fine from a pure review point of view (I did not do any 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 Wed Feb 15 20:23:11 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 21:23:11 +0100 Subject: [Buildroot] Having trouble getting a simple cmake based custom package to work In-Reply-To: References: Message-ID: <40f6ba58-7cda-d062-960f-17ada0c85b24@mind.be> On 15/02/2023 01:10, Cem Sezer wrote: > Hello, > > I'm looking to continue this thread as I have the exact same problem. > > http://lists.busybox.net/pipermail/buildroot/2020-August/591250.html > > > The latest entry in the thread is the following, discussing the error message > "/No rule to make target 'install/fast': /is where I'm stuck at?the moment: > >>/However, when it is />/trying to install my package I have a new error. The system seems to be />/looking for a install/fast target, which the Makefil does not have. / > I have no idea on that problem. Maybe read the CMake docs again? > > https://cmake.org/cmake/help/latest/command/install.html > > Greets > Alex > > I am still new to cmake, but I've been having trouble getting a basic > helloworld?(in C) cmake package to work. I looked at that link above for the > cmake docs, but am unfamiliar with what I need to do here. My CMakeLists.txt > right now is just the following: > > cmake_minimum_required(VERSION 3.1.0) > > project(helloworld_c_cmake LANGUAGES C) > > set(SOURCES main.c) > > add_executable(${PROJECT_NAME} ${SOURCES}) Since there is no installation rule in the CMakeLists.txt, the install/fast target is not going to be generated. The link above to the cmake documentation explains how to add an installation rule. Regards, Arnout > > > Any pointers in the right direction would be appreciated. Perhaps this is more > of a cmake question than a buildroot question, but tying the two together has > been confusing, and I'm sure it must be something simple.?Thanks in advance, > > Cem > > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Wed Feb 15 20:48:36 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 21:48:36 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: fix relative toolchain_csv paths In-Reply-To: <20230208005343.2544457-1-james.hilliard1@gmail.com> References: <20230208005343.2544457-1-james.hilliard1@gmail.com> Message-ID: On 08/02/2023 01:53, James Hilliard wrote: > The default toolchain_csv path is a relative path to the buildroot > directory. > > If we run genrandconfig with a cwd that is not the buildroot directory > the default toolchain_csv path will be wrong. > > To fix this prepend the buildroot directory path to the toolchain_csv > path whenever the toolchain_csv path is not absolute. Well, a typical use case for running genrandconfig with a cwd that is not the buildroot directory could be from a br2-external, with a custom csv as argument. In that case, we actually *do* want the toolchains_csv to be interpreted relative to cwd rather than buildrootdir... Since people may already be relying on that behaviour, I think it would be better to fix it by just making the default one an absolute path, not anything passed explicitly through the commandline. Regards, Arnout > > Fixes: > FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' > > Signed-off-by: James Hilliard > --- > utils/genrandconfig | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/utils/genrandconfig b/utils/genrandconfig > index b3576f8a51..b96f2ee6de 100755 > --- a/utils/genrandconfig > +++ b/utils/genrandconfig > @@ -115,6 +115,9 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): > toolchain configuration is itself an array of lines of the defconfig. > """ > > + if not os.path.isabs(toolchains_csv): > + toolchains_csv = os.path.join(buildrootdir, toolchains_csv) > + > with open(toolchains_csv) as r: > # filter empty lines and comments > lines = [t for t in r.readlines() if len(t.strip()) > 0 and t[0] != '#'] From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:07 +0100 Subject: [Buildroot] [git commit] package/sysrepo: bump version to 2.2.36 Message-ID: <20230215205629.17ABE85C8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8972b7ec25c0c053eb62ce7ea445830b8aac394f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/sysrepo/sysrepo.hash | 2 +- package/sysrepo/sysrepo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index a90d8259bf..6a5e98f41b 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1bc866f13e41ba5e7e4acd52b5c3d42b1a2a1e032775e0a9b094f3265844cd25 sysrepo-2.2.12.tar.gz +sha256 bebb7901682eb23bf4c73d086d0a45c124ec751a67793a66024f1d4203425730 sysrepo-2.2.36.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 9da8c22ca2..6b031ae6f9 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.2.12 +SYSREPO_VERSION = 2.2.36 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:11 +0100 Subject: [Buildroot] [git commit] package/netopeer2: bump version to 2.1.49 Message-ID: <20230215205629.217B485C90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4cc59b5cb397ee79d1a8152540eec512354b1825 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/netopeer2/netopeer2.hash | 2 +- package/netopeer2/netopeer2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index cc71a2dab8..6a278fbbaf 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b166fe3425bb55b5f330fb7f53158f613bffc07493925ac437193e4d2defb3e7 netopeer2-2.1.42.tar.gz +sha256 2b1daac037f18c303e0c0dc3318ba30196459472e4c59f2f8547ee74d4cdf31d netopeer2-2.1.49.tar.gz sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 7cb9202575..47fcd31acd 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETOPEER2_VERSION = 2.1.42 +NETOPEER2_VERSION = 2.1.49 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) NETOPEER2_DL_SUBDIR = netopeer2 NETOPEER2_LICENSE = BSD-3-Clause From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:03 +0100 Subject: [Buildroot] [git commit] package/libyang: bump version to 2.1.30 Message-ID: <20230215205629.02B6C85C8B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69284602e6b93b069b8c99bd2499aef97bc09d47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libyang/libyang.hash | 2 +- package/libyang/libyang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index da8600351b..26a28d6eed 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f30ee1c3e13f0c5d25c4d2fb628e4b262b483d0a500464a7c12008ccc393a69e libyang-2.1.4.tar.gz +sha256 761cfd959342b147f6a43a84c931c7fde68dd3a1ad540a0e5302288b204f073d libyang-2.1.30.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 6c57a2dd42..f160035c09 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.1.4 +LIBYANG_VERSION = 2.1.30 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:13 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: drop Matt Weber Message-ID: <20230215205629.2BF5885C8B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b5b92019ba30aecdaa7ba34c255d15e0c0489e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master I regret that my work situation doesn't sustain me contributing. Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 105 ------------------------------------------------------------- 1 file changed, 105 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index df2b98ad53..72a56deb4c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1984,111 +1984,6 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ -N: Matt Weber -F: board/freescale/p* -F: board/freescale/t* -F: board/qemu/ppc64-e5500/ -F: configs/freescale_p* -F: configs/freescale_t* -F: configs/qemu_ppc64_e5500_defconfig -F: package/ace/ -F: package/argp-standalone/ -F: package/aufs/ -F: package/aufs-util/ -F: package/bc/ -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/ -F: package/davici/ -F: package/dnsmasq/ -F: package/dosfstools/ -F: package/eigen/ -F: package/ethtool/ -F: package/flashbench/ -F: package/fmc/ -F: package/fmlib/ -F: package/freeradius-server/ -F: package/git/ -F: package/gnutls/ -F: package/hostapd/ -F: package/i2c-tools/ -F: package/ifplugd/ -F: package/igmpproxy/ -F: package/iperf/ -F: package/iperf3/ -F: package/iputils/ -F: package/iw/ -F: package/jitterentropy-library/ -F: package/kvm-unit-tests/ -F: package/kvmtool/ -F: package/libcsv/ -F: package/libcurl/ -F: package/libeastl/ -F: package/libfcgi/ -F: package/libopenssl/ -F: package/libselinux/ -F: package/libsemanage/ -F: package/libsepol/ -F: package/libssh2/ -F: package/libtalloc/ -F: package/libqmi/ -F: package/lighttpd/ -F: package/logrotate/ -F: package/makedevs/ -F: package/memtester/ -F: package/mii-diag/ -F: package/mrouted/ -F: package/mtd/ -F: package/mtools/ -F: package/nginx-upload/ -F: package/omniorb/ -F: package/openresolv/ -F: package/paxtest/ -F: package/picocom/ -F: package/policycoreutils/ -F: package/proftpd/ -F: package/protobuf-c/ -F: package/protobuf/ -F: package/python-colorama/ -F: package/python-filelock/ -F: package/python-flask-cors/ -F: package/python-iptables/ -F: package/python-ipy/ -F: package/python-iwlib/ -F: package/python-posix-ipc/ -F: package/python-pycairo/ -F: package/python-pysftp/ -F: package/python-tinyrpc/ -F: package/python-txdbus/ -F: package/qoriq-rcw/ -F: package/raptor/ -F: package/rng-tools/ -F: package/rsyslog/ -F: package/setools/ -F: package/sloci-image/ -F: package/smcroute/ -F: package/tclap/ -F: package/tini/ -F: package/uboot-tools/ -F: package/unionfs/ -F: package/valijson/ -F: package/wpa_supplicant/ -F: package/wireless_tools/ -F: package/xen/ -F: package/xml-security-c/ -F: support/testing/tests/fs/test_oci.py -F: support/testing/tests/package/br2-external/clang-compiler-rt/ -F: support/testing/tests/package/br2-external/openjdk/ -F: support/testing/tests/package/test_clang.py -F: support/testing/tests/package/test_openjdk.py -F: support/testing/tests/package/test_opkg/ -F: support/testing/tests/package/test_opkg.py - N: Mauro Condarelli F: package/mc/ F: package/python-autobahn/ From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:05 +0100 Subject: [Buildroot] [git commit] package/libnetconf2: bump version to 2.1.28 Message-ID: <20230215205629.0DCE385C8D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d22988bfbdca479b18cce6a60b7d51b59e125a6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libnetconf2/libnetconf2.hash | 2 +- package/libnetconf2/libnetconf2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 34e934089e..675c76a500 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2f1a6559e8e43ea18ea337ab5f194f8443695c7ab4dde5d7b2560603f9bf702a libnetconf2-2.1.25.tar.gz +sha256 72e9a6461fadbd22f0cf0d23ba68d62b297c8f564f7f2bee069748fb67fc3a24 libnetconf2-2.1.28.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 0d4294d8d3..e349c1bce4 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 2.1.25 +LIBNETCONF2_VERSION = 2.1.28 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause From thomas.petazzoni at bootlin.com Wed Feb 15 20:57:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:57:43 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: drop Matt Weber In-Reply-To: <20230214180505.3691-1-matthew.weber@collins.com> References: <20230214180505.3691-1-matthew.weber@collins.com> Message-ID: <20230215215743.0a03d0fc@windsurf> Hello Matt, On Tue, 14 Feb 2023 18:05:05 +0000 Matthew Weber via buildroot wrote: > From: Matthew Weber > > I regret that my work situation doesn't sustain me contributing. > > Signed-off-by: Matthew Weber > --- > DEVELOPERS | 105 ----------------------------------------------------- > 1 file changed, 105 deletions(-) Of course sad to see that you no longer have the opportunity to work on Buildroot, but thanks for all the contributions done in the past, and all the best! Patch applied to master, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 15 20:58:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:58:02 +0100 Subject: [Buildroot] [PATCH 1/4] package/libyang: bump version to 2.1.30 In-Reply-To: <20230213181944.10292-1-heiko.thiery@gmail.com> References: <20230213181944.10292-1-heiko.thiery@gmail.com> Message-ID: <20230215215802.5b07d0f8@windsurf> On Mon, 13 Feb 2023 19:19:43 +0100 Heiko Thiery wrote: > Signed-off-by: Heiko Thiery > --- > package/libyang/libyang.hash | 2 +- > package/libyang/libyang.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Series applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 15 20:59:50 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 21:59:50 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain/helper: check the arch sysroot In-Reply-To: <20230211182839.3841661-1-romain.naour@gmail.com> References: <20230211182839.3841661-1-romain.naour@gmail.com> Message-ID: <0ccfb474-6609-3674-00ab-10aabda9748d@mind.be> On 11/02/2023 19:28, Romain Naour wrote: > Since the commit [1], the utils/genrandconfig script improved the > configuration randomization used by autobuilders. Since then it can > generate a configuration that is not suitable for an external toolchain > such the "Codescape IMG GNU Linux Toolchain". > > Indeed this toolchain can be selected for mips32r5 or mips64r5 while only > mips32r2 or mips64r2 are really supported. The toolchain issue will be > fixed in a followup change. > > We want to catch such issue in check_unusable_toolchain function otherwise > it is detected late during the sysroot import into staging and trigger > a weird error message: > > ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory > ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot/usr//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory > > This is similar test than for the main sysroot check but this time we have > to use the toolchain cflags to check the architecture sysroot. > > If the architecture sysroot doesn't exist, the toolchain will reply with > "libc.a". > > Either the toolchain is really broken or we used a wrong target > architecture variant. In the later case, the toolchain infrastructure will > print a meaningful error message. > > Note: We also may get a similar issue using the toolchain-external-custom package > if a toolchain is used with a wrong target architecture variant. > > Fixes: > http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ > > [1] aeee90ec109b83c42779e6a2617f7d57e25a2b65 > > Signed-off-by: Romain Naour > Cc: Giulio Benetti > Cc: Thomas De Schampheleire > Cc: Thomas Petazzoni Both applied to master, thanks. Regards, Arnout > --- > Note: We should improve the Buildroot testsuite to test the toolchain wrapper > corner cases. > --- > toolchain/helpers.mk | 11 +++++++++++ > .../toolchain-external/pkg-toolchain-external.mk | 2 +- > 2 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk > index 1cd7494fdb..24c482923a 100644 > --- a/toolchain/helpers.mk > +++ b/toolchain/helpers.mk > @@ -422,12 +422,16 @@ check_cross_compiler_exists = \ > # the host tuple. > # - Exclude distro-class toolchains which are not relocatable. > # - Exclude broken toolchains which return "libc.a" with -print-file-name. > +# - Exclude toolchains used with wrong toolchain cflags or broken toolchains > +# which return "libc.a" with -print-file-name and toolchain cflags. > # - Exclude toolchains which doesn't support --sysroot option. > # > # $1: cross-gcc path > +# $1: toolchain cflags > # > check_unusable_toolchain = \ > __CROSS_CC=$(strip $1) ; \ > + __TOOLCHAIN_CFLAGS=$(strip $2) ; \ > vendor=`$${__CROSS_CC} -dumpmachine | cut -f2 -d'-'` ; \ > if test "$${vendor}" = "angstrom" ; then \ > echo "Angstrom toolchains are not pure toolchains: they contain" ; \ > @@ -449,6 +453,13 @@ check_unusable_toolchain = \ > echo "Unable to detect the toolchain sysroot, Buildroot cannot use this toolchain." ; \ > exit 1 ; \ > fi ; \ > + libc_a_archsysroot_path=`$${__CROSS_CC} $${__TOOLCHAIN_CFLAGS} -print-file-name=libc.a` ; \ > + if test "$${libc_a_archsysroot_path}" = "libc.a" ; then \ > + echo "Unable to detect the toolchain architecture sysroot." ; \ > + echo "Please check the Target Architecture Variant selected, the toolchains may not support it." ; \ > + echo "Buildroot cannot use this toolchain." ; \ > + exit 1 ; \ > + fi; \ > sysroot_dir="$(call toolchain_find_sysroot,$${__CROSS_CC})" ; \ > if test -z "$${sysroot_dir}" ; then \ > echo "External toolchain doesn't support --sysroot. Cannot use." ; \ > diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk > index 299b6008aa..c37f3500d9 100644 > --- a/toolchain/toolchain-external/pkg-toolchain-external.mk > +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk > @@ -563,7 +563,7 @@ endif > # kernel headers version, type of C library and all C library features. > define $(2)_CONFIGURE_CMDS > $$(Q)$$(call check_cross_compiler_exists,$$(TOOLCHAIN_EXTERNAL_CC)) > - $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC)) > + $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC),"$$(TOOLCHAIN_EXTERNAL_CFLAGS)") > $$(Q)SYSROOT_DIR="$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC))" ; \ > $$(call check_kernel_headers_version,\ > $$(BUILD_DIR),\ From thomas.petazzoni at bootlin.com Wed Feb 15 21:00:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:00:26 +0100 Subject: [Buildroot] [RFC PATCH] package/Config.in: move all Wireless Driver into a separate menu and enable them only if architecture s390x is not used In-Reply-To: <20230214120808.1282621-1-giulio.benetti@benettiengineering.com> References: <20230214120808.1282621-1-giulio.benetti@benettiengineering.com> Message-ID: <20230215220026.1a771114@windsurf> On Tue, 14 Feb 2023 13:08:08 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti > --- > package/Config.in | 28 ++++++++++++++++------------ > 1 file changed, 16 insertions(+), 12 deletions(-) Why not, but then you need to change all the existing packages that have a !S390 dependency to remove it, as it becomes redundant. However, I feel like the dependency is more "obvious" if it is in each package. I know it's a bit of redundancy, but it is less "strange" than having it in package/Config.in. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 15 21:00:04 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:00:04 +0100 Subject: [Buildroot] [git commit] toolchain/helper: check the arch sysroot Message-ID: <20230215210047.1CEBC85D23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4433ad8f5c88fafe3f0aebbaff1abdae17aadcb7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since the commit [1], the utils/genrandconfig script improved the configuration randomization used by autobuilders. Since then it can generate a configuration that is not suitable for an external toolchain such the "Codescape IMG GNU Linux Toolchain". Indeed this toolchain can be selected for mips32r5 or mips64r5 while only mips32r2 or mips64r2 are really supported. The toolchain issue will be fixed in a followup change. We want to catch such issue in check_unusable_toolchain function otherwise it is detected late during the sysroot import into staging and trigger a weird error message: ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot/usr//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory This is similar test than for the main sysroot check but this time we have to use the toolchain cflags to check the architecture sysroot. If the architecture sysroot doesn't exist, the toolchain will reply with "libc.a". Either the toolchain is really broken or we used a wrong target architecture variant. In the later case, the toolchain infrastructure will print a meaningful error message. Note: We also may get a similar issue using the toolchain-external-custom package if a toolchain is used with a wrong target architecture variant. Fixes: http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ [1] aeee90ec109b83c42779e6a2617f7d57e25a2b65 Signed-off-by: Romain Naour Cc: Giulio Benetti Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- toolchain/helpers.mk | 11 +++++++++++ toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 1cd7494fdb..24c482923a 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -422,12 +422,16 @@ check_cross_compiler_exists = \ # the host tuple. # - Exclude distro-class toolchains which are not relocatable. # - Exclude broken toolchains which return "libc.a" with -print-file-name. +# - Exclude toolchains used with wrong toolchain cflags or broken toolchains +# which return "libc.a" with -print-file-name and toolchain cflags. # - Exclude toolchains which doesn't support --sysroot option. # # $1: cross-gcc path +# $1: toolchain cflags # check_unusable_toolchain = \ __CROSS_CC=$(strip $1) ; \ + __TOOLCHAIN_CFLAGS=$(strip $2) ; \ vendor=`$${__CROSS_CC} -dumpmachine | cut -f2 -d'-'` ; \ if test "$${vendor}" = "angstrom" ; then \ echo "Angstrom toolchains are not pure toolchains: they contain" ; \ @@ -449,6 +453,13 @@ check_unusable_toolchain = \ echo "Unable to detect the toolchain sysroot, Buildroot cannot use this toolchain." ; \ exit 1 ; \ fi ; \ + libc_a_archsysroot_path=`$${__CROSS_CC} $${__TOOLCHAIN_CFLAGS} -print-file-name=libc.a` ; \ + if test "$${libc_a_archsysroot_path}" = "libc.a" ; then \ + echo "Unable to detect the toolchain architecture sysroot." ; \ + echo "Please check the Target Architecture Variant selected, the toolchains may not support it." ; \ + echo "Buildroot cannot use this toolchain." ; \ + exit 1 ; \ + fi; \ sysroot_dir="$(call toolchain_find_sysroot,$${__CROSS_CC})" ; \ if test -z "$${sysroot_dir}" ; then \ echo "External toolchain doesn't support --sysroot. Cannot use." ; \ diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 299b6008aa..c37f3500d9 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -563,7 +563,7 @@ endif # kernel headers version, type of C library and all C library features. define $(2)_CONFIGURE_CMDS $$(Q)$$(call check_cross_compiler_exists,$$(TOOLCHAIN_EXTERNAL_CC)) - $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC)) + $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC),"$$(TOOLCHAIN_EXTERNAL_CFLAGS)") $$(Q)SYSROOT_DIR="$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC))" ; \ $$(call check_kernel_headers_version,\ $$(BUILD_DIR),\ From arnout at mind.be Wed Feb 15 21:00:05 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:00:05 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-codescape-mti-mips: remove wrong MIPS32r5 and MIPS64r5 support Message-ID: <20230215210047.2A1F685D32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8eee178355cafa156d93bdc0cd447618dd1a1abc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This toolchain doesn't support MIPS32r5 and MIPS64r5 and the toolchain infrastructure fail to import the sysroot to staging. Fixes: c4a62fa6278058461ff9e501ba6e822486453493 Fixes: http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- .../toolchain-external/toolchain-external-codescape-mti-mips/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index c58c55119a..8217ddc38c 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -3,8 +3,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) || \ - BR2_MIPS_CPU_MIPS32R5 || (BR2_MIPS_CPU_MIPS64R5 && !BR2_MIPS_SOFT_FLOAT) + depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 From thomas.petazzoni at bootlin.com Wed Feb 15 21:02:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:02:53 +0100 Subject: [Buildroot] [PATCH] package/rtl8821cu: disable package for s390x architecture In-Reply-To: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> References: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> Message-ID: <20230215220253.7f688e55@windsurf> On Tue, 14 Feb 2023 11:50:33 +0100 Giulio Benetti wrote: > s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this > package for this architecture. > > Fixes: > http://autobuild.buildroot.net/results/3a74d393cdbc308eab9ec3f0f9e420947669a0ea/ > > Signed-off-by: Giulio Benetti > --- > package/rtl8821cu/Config.in | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Note: I have seen the discussion that Yann started, and I replied on your other patch proposal. For now I have applied this patch as-is because it fixes an autobuilder issue: it is the most obvious/immediate fix we have. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 15 21:14:20 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:14:20 +0100 Subject: [Buildroot] [git commit] package/pkg-golang: disable version control information Message-ID: <20230215211512.67B3985D35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c3a1f0fe1b912727bb7b5baebe938f75036e566b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master By default go tries to include version control (VCS) information in binaries. Since Buildroot separates version control from the build process it is sensible to disable this behavior. This avoids build errors when building with a git repository higher up in the tree owned by root. In this case the go build system calls `git status --porcelain` which returns with an error: fatal: detected dubious ownership in repository at '/build' Signed-off-by: Stefan Agner Reviewed-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/pkg-golang.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index cdc67b32c0..da9c9a21ac 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -45,7 +45,8 @@ $(2)_BUILD_OPTS += \ -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ - -p $$(PARALLEL_JOBS) + -p $$(PARALLEL_JOBS) \ + -buildvcs=false # Target packages need the Go compiler on the host at download time (for # vendoring), and at build and install time. From arnout at mind.be Wed Feb 15 21:15:17 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:15:17 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: disable version control information In-Reply-To: <12a7772dc9c30d31bc4dd7a4e15ca12425c14834.1676297701.git.stefan@agner.ch> References: <12a7772dc9c30d31bc4dd7a4e15ca12425c14834.1676297701.git.stefan@agner.ch> Message-ID: <3210b93a-49ea-4be4-143c-fd6f578d3435@mind.be> On 13/02/2023 15:15, Stefan Agner wrote: > By default go tries to include version control (VCS) information in > binaries. Since Buildroot separates version control from the build > process it is sensible to disable this behavior. > > This avoids build errors when building with a git repository higher > up in the tree owned by root. In this case the go build system > calls `git status --porcelain` which returns with an error: > fatal: detected dubious ownership in repository at '/build' > > Signed-off-by: Stefan Agner Applied to master, thanks. Regards, Arnout > --- > package/pkg-golang.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk > index cdc67b32c0..da9c9a21ac 100644 > --- a/package/pkg-golang.mk > +++ b/package/pkg-golang.mk > @@ -45,7 +45,8 @@ $(2)_BUILD_OPTS += \ > -modcacherw \ > -tags "$$($(2)_TAGS)" \ > -trimpath \ > - -p $$(PARALLEL_JOBS) > + -p $$(PARALLEL_JOBS) \ > + -buildvcs=false > > # Target packages need the Go compiler on the host at download time (for > # vendoring), and at build and install time. From james.hilliard1 at gmail.com Wed Feb 15 21:15:31 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 15 Feb 2023 14:15:31 -0700 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: make default toolchain_csv path absolute Message-ID: <20230215211531.331246-1-james.hilliard1@gmail.com> The default toolchain_csv path is a relative path to the buildroot directory. If we run genrandconfig with a cwd that is not the buildroot directory the default toolchain_csv path will be wrong. To fix this make the default toolchain_csv path absolute. Fixes: FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' Signed-off-by: James Hilliard --- Changes v1 -> v2: - set default path as absolute --- utils/genrandconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index b3576f8a51..3552b83694 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -801,7 +801,9 @@ if __name__ == '__main__': dest="toolchains_csv", help="Generate random toolchain configuration", action='store_false') - parser.set_defaults(toolchains_csv="support/config-fragments/autobuild/toolchain-configs.csv") + buildroot_abs = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + parser.set_defaults(toolchains_csv=os.path.join(buildroot_abs, + "support/config-fragments/autobuild/toolchain-configs.csv")) args = parser.parse_args() -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 15 21:18:02 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 15 Feb 2023 14:18:02 -0700 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: fix relative toolchain_csv paths In-Reply-To: References: <20230208005343.2544457-1-james.hilliard1@gmail.com> Message-ID: On Wed, Feb 15, 2023 at 1:48 PM Arnout Vandecappelle wrote: > > > > On 08/02/2023 01:53, James Hilliard wrote: > > The default toolchain_csv path is a relative path to the buildroot > > directory. > > > > If we run genrandconfig with a cwd that is not the buildroot directory > > the default toolchain_csv path will be wrong. > > > > To fix this prepend the buildroot directory path to the toolchain_csv > > path whenever the toolchain_csv path is not absolute. > > Well, a typical use case for running genrandconfig with a cwd that is not the > buildroot directory could be from a br2-external, with a custom csv as argument. > In that case, we actually *do* want the toolchains_csv to be interpreted > relative to cwd rather than buildrootdir... > > Since people may already be relying on that behaviour, I think it would be > better to fix it by just making the default one an absolute path, not anything > passed explicitly through the commandline. Changed the default to an absolute path in v2: https://patchwork.ozlabs.org/project/buildroot/patch/20230215211531.331246-1-james.hilliard1 at gmail.com/ > > Regards, > Arnout > > > > > Fixes: > > FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' > > > > Signed-off-by: James Hilliard > > --- > > utils/genrandconfig | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/utils/genrandconfig b/utils/genrandconfig > > index b3576f8a51..b96f2ee6de 100755 > > --- a/utils/genrandconfig > > +++ b/utils/genrandconfig > > @@ -115,6 +115,9 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): > > toolchain configuration is itself an array of lines of the defconfig. > > """ > > > > + if not os.path.isabs(toolchains_csv): > > + toolchains_csv = os.path.join(buildrootdir, toolchains_csv) > > + > > with open(toolchains_csv) as r: > > # filter empty lines and comments > > lines = [t for t in r.readlines() if len(t.strip()) > 0 and t[0] != '#'] From arnout at mind.be Wed Feb 15 21:20:16 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:20:16 +0100 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: make default toolchain_csv path absolute In-Reply-To: <20230215211531.331246-1-james.hilliard1@gmail.com> References: <20230215211531.331246-1-james.hilliard1@gmail.com> Message-ID: On 15/02/2023 22:15, James Hilliard wrote: > The default toolchain_csv path is a relative path to the buildroot > directory. > > If we run genrandconfig with a cwd that is not the buildroot directory > the default toolchain_csv path will be wrong. > > To fix this make the default toolchain_csv path absolute. > > Fixes: > FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - set default path as absolute > --- > utils/genrandconfig | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/utils/genrandconfig b/utils/genrandconfig > index b3576f8a51..3552b83694 100755 > --- a/utils/genrandconfig > +++ b/utils/genrandconfig > @@ -801,7 +801,9 @@ if __name__ == '__main__': > dest="toolchains_csv", > help="Generate random toolchain configuration", > action='store_false') > - parser.set_defaults(toolchains_csv="support/config-fragments/autobuild/toolchain-configs.csv") > + buildroot_abs = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) > + parser.set_defaults(toolchains_csv=os.path.join(buildroot_abs, > + "support/config-fragments/autobuild/toolchain-configs.csv")) Sorry, that's not going to work either (if it was that easy I'd done it myself :-) buildrootdir can be set to something else with the -b argument, and we want it relative to *that* one of course. Regards, Arnout > > args = parser.parse_args() > From giulio.benetti at benettiengineering.com Wed Feb 15 21:24:42 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 15 Feb 2023 22:24:42 +0100 Subject: [Buildroot] [RFC PATCH] package/Config.in: move all Wireless Driver into a separate menu and enable them only if architecture s390x is not used In-Reply-To: <20230215220026.1a771114@windsurf> References: <20230214120808.1282621-1-giulio.benetti@benettiengineering.com> <20230215220026.1a771114@windsurf> Message-ID: <25265a89-2f7a-4db5-0f15-ef66c48b3b63@benettiengineering.com> On 15/02/23 22:00, Thomas Petazzoni via buildroot wrote: > On Tue, 14 Feb 2023 13:08:08 +0100 > Giulio Benetti wrote: > >> Signed-off-by: Giulio Benetti >> --- >> package/Config.in | 28 ++++++++++++++++------------ >> 1 file changed, 16 insertions(+), 12 deletions(-) > > Why not, but then you need to change all the existing packages that > have a !S390 dependency to remove it, as it becomes redundant. yes, that wouldn't be a problem, it would be part of this patch > However, I feel like the dependency is more "obvious" if it is in each > package. I know it's a bit of redundancy, but it is less "strange" than > having it in package/Config.in. But this way we kill two birds with one stone for dependencies and in the future I see more probable having people adding external Wireless Drivers to that menu, so it will inherits the dependency. And in any case there are already some dependencies in package/Config.in like !BR2_STATIC_LIBS and other BR2_PACKAGE_, 18 if statements in total. I'm wondering also if it would make sense to create many Config.in.* for every top-level menu in package/ like: $ ls buildroot/package/Config.in* package/Config.in package/Config.in.audio-video-app package/Config.in.comp-decop package/Config.in.host ... The only con is to check for packages in multiple Config.in.* but it's already like that with Config.in.host. The pro we could have instead is to "hide" the dependency checking on a specific Config.in.X Nothing special on the final result but maybe it would be more user-friendly. Just my 2 cents Best regards -- Giulio Benetti CEO/CTO at Benetti Engineering sas From arnout at mind.be Wed Feb 15 21:24:48 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:24:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: compress-offload needs kernel >= 5.7 In-Reply-To: <20230213181120.907459-1-fontaine.fabrice@gmail.com> References: <20230213181120.907459-1-fontaine.fabrice@gmail.com> Message-ID: <242cceb0-476d-3a5b-5dcf-fc16b2ecf906@mind.be> On 13/02/2023 19:11, Fabrice Fontaine wrote: > SND_AUDIOCODEC_A{LAC,PE} are only available since kernel 5.7 and > https://github.com/torvalds/linux/commit/0f546d6f0292fb624b4cf0cc70096ddb9ea070e6 > resulting in the following build failure since bump to version 0.3.65 > in commit 247e2d0eb1e60f483044d58bed58c5ed321528f7 and > https://git.buildroot.net/buildroot/commit/?id=247e2d0eb1e60f483044d58bed58c5ed321528f7: > > ../spa/plugins/alsa/alsa-compress-offload-sink.c:183:11: error: 'SND_AUDIOCODEC_ALAC' undeclared here (not in a function); did you mean 'SND_AUDIOCODEC_AAC'? > 183 | { SND_AUDIOCODEC_ALAC, }, > | ^~~~~~~~~~~~~~~~~~~ > | SND_AUDIOCODEC_AAC > > Moreover, flac_d is also only available since kernel 5.5 and > https://github.com/torvalds/linux/commit/d2522335c92c090bf58531a2b696d7fe80ab2a7a > > Fixes: > - http://autobuild.buildroot.org/results/9ecd9aca5edc3756154da59573157954f06e6537 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/pipewire/Config.in | 12 ++++++++++++ > package/pipewire/pipewire.mk | 2 +- > 2 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/package/pipewire/Config.in b/package/pipewire/Config.in > index f038291e87..4929e5d3d1 100644 > --- a/package/pipewire/Config.in > +++ b/package/pipewire/Config.in > @@ -15,6 +15,18 @@ config BR2_PACKAGE_PIPEWIRE > > if BR2_PACKAGE_PIPEWIRE > > +config BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD > + bool "pipewire Compress-Offload" > + depends on !BR2_STATIC_LIBS # tinycompress > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 > + select BR2_PACKAGE_TINYCOMPRESS > + help > + Enable ALSA Compress-Offload support > + > +comment "pipewire Compress-Offload needs a toolchain w/ dynamic library, headers >= 5.7" > + depends on BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 > + > config BR2_PACKAGE_PIPEWIRE_EXAMPLES > bool "pipewire examples" > help > diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk > index 976d7783b9..ecf4a035ec 100644 > --- a/package/pipewire/pipewire.mk > +++ b/package/pipewire/pipewire.mk > @@ -215,7 +215,7 @@ else > PIPEWIRE_CONF_OPTS += -Dsdl2=disabled > endif > > -ifeq ($(BR2_PACKAGE_TINYCOMPRESS),y) > +ifeq ($(BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD),y) > PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled > PIPEWIRE_DEPENDENCIES += tinycompress > else From arnout at mind.be Wed Feb 15 21:23:17 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:23:17 +0100 Subject: [Buildroot] [git commit] package/pipewire: compress-offload needs kernel >= 5.7 Message-ID: <20230215212500.F29DD85D87@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=854314d15361dc3b69b97ee29d483ee920b9098f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master SND_AUDIOCODEC_A{LAC,PE} are only available since kernel 5.7 and https://github.com/torvalds/linux/commit/0f546d6f0292fb624b4cf0cc70096ddb9ea070e6 resulting in the following build failure since bump to version 0.3.65 in commit 247e2d0eb1e60f483044d58bed58c5ed321528f7 and https://git.buildroot.net/buildroot/commit/?id=247e2d0eb1e60f483044d58bed58c5ed321528f7: ../spa/plugins/alsa/alsa-compress-offload-sink.c:183:11: error: 'SND_AUDIOCODEC_ALAC' undeclared here (not in a function); did you mean 'SND_AUDIOCODEC_AAC'? 183 | { SND_AUDIOCODEC_ALAC, }, | ^~~~~~~~~~~~~~~~~~~ | SND_AUDIOCODEC_AAC Moreover, flac_d is also only available since kernel 5.5 and https://github.com/torvalds/linux/commit/d2522335c92c090bf58531a2b696d7fe80ab2a7a Take this opportunity to make compress offload an explicit option rather than automatic based on the availability of tinycompress. The relationship between them is not obvious. Fixes: - http://autobuild.buildroot.org/results/9ecd9aca5edc3756154da59573157954f06e6537 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/pipewire/Config.in | 12 ++++++++++++ package/pipewire/pipewire.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/pipewire/Config.in b/package/pipewire/Config.in index f038291e87..4929e5d3d1 100644 --- a/package/pipewire/Config.in +++ b/package/pipewire/Config.in @@ -15,6 +15,18 @@ config BR2_PACKAGE_PIPEWIRE if BR2_PACKAGE_PIPEWIRE +config BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD + bool "pipewire Compress-Offload" + depends on !BR2_STATIC_LIBS # tinycompress + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + select BR2_PACKAGE_TINYCOMPRESS + help + Enable ALSA Compress-Offload support + +comment "pipewire Compress-Offload needs a toolchain w/ dynamic library, headers >= 5.7" + depends on BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + config BR2_PACKAGE_PIPEWIRE_EXAMPLES bool "pipewire examples" help diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 976d7783b9..ecf4a035ec 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -215,7 +215,7 @@ else PIPEWIRE_CONF_OPTS += -Dsdl2=disabled endif -ifeq ($(BR2_PACKAGE_TINYCOMPRESS),y) +ifeq ($(BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD),y) PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled PIPEWIRE_DEPENDENCIES += tinycompress else From james.hilliard1 at gmail.com Wed Feb 15 21:29:08 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 15 Feb 2023 14:29:08 -0700 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: make default toolchain_csv path absolute In-Reply-To: References: <20230215211531.331246-1-james.hilliard1@gmail.com> Message-ID: On Wed, Feb 15, 2023 at 2:20 PM Arnout Vandecappelle wrote: > > > > On 15/02/2023 22:15, James Hilliard wrote: > > The default toolchain_csv path is a relative path to the buildroot > > directory. > > > > If we run genrandconfig with a cwd that is not the buildroot directory > > the default toolchain_csv path will be wrong. > > > > To fix this make the default toolchain_csv path absolute. > > > > Fixes: > > FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' > > > > Signed-off-by: James Hilliard > > --- > > Changes v1 -> v2: > > - set default path as absolute > > --- > > utils/genrandconfig | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/utils/genrandconfig b/utils/genrandconfig > > index b3576f8a51..3552b83694 100755 > > --- a/utils/genrandconfig > > +++ b/utils/genrandconfig > > @@ -801,7 +801,9 @@ if __name__ == '__main__': > > dest="toolchains_csv", > > help="Generate random toolchain configuration", > > action='store_false') > > - parser.set_defaults(toolchains_csv="support/config-fragments/autobuild/toolchain-configs.csv") > > + buildroot_abs = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) > > + parser.set_defaults(toolchains_csv=os.path.join(buildroot_abs, > > + "support/config-fragments/autobuild/toolchain-configs.csv")) > > Sorry, that's not going to work either (if it was that easy I'd done it myself :-) Under what scenario would this break? > > buildrootdir can be set to something else with the -b argument, and we want it > relative to *that* one of course. Using buildrootdir is cwd dependent, the approach I used is not as it uses the absolute path of the genrandconfig file to compute the default toolchain_csv abs path. > > Regards, > Arnout > > > > > args = parser.parse_args() > > From arnout at mind.be Wed Feb 15 21:28:58 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:28:58 +0100 Subject: [Buildroot] [git commit] docs/manual: add 'menuconfig' to out-of-tree examples Message-ID: <20230215213211.C420185EA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c77e31e0b360fffbd893807ccfbc4f35bf2558d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master If the examples given for launching an out-of-tree build are executed as-is, this will result in the error message Please configure Buildroot first (e.g. "make menuconfig") Even if "make menuconfig" was run before, it's still not going to work because the out-of-tree build doesn't use the in-tree .config. Therefore, the example really should start with some config option. Since "make menuconfig" is used in most other examples of creating a config, use that here as well. Extend both examples with "menuconfig". Reported-by: AndreiCherniaev Signed-off-by: Arnout Vandecappelle --- docs/manual/common-usage.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt index 9abd3799dd..bc78f4a871 100644 --- a/docs/manual/common-usage.txt +++ b/docs/manual/common-usage.txt @@ -30,13 +30,13 @@ the Linux kernel. To use it, add +O=+ to the make command line: -------------------- - $ make O=/tmp/build + $ make O=/tmp/build menuconfig -------------------- Or: -------------------- - $ cd /tmp/build; make O=$PWD -C path/to/buildroot + $ cd /tmp/build; make O=$PWD -C path/to/buildroot menuconfig -------------------- All the output files will be located under +/tmp/build+. If the +O+ From arnout at mind.be Wed Feb 15 21:35:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:35:31 +0100 Subject: [Buildroot] [PATCH] Makefile: add good message when user try make O=$PWD -C path/to/buildroot without cd /tmp/build In-Reply-To: <20230109050525.1560963-1-cherniaev.andrei@kairo.space> References: <20230109050525.1560963-1-cherniaev.andrei@kairo.space> Message-ID: <09f2453a-b72a-211b-230e-f09ae0a53385@mind.be> Hi Andrei, On 09/01/2023 06:05, AndreiCherniaev wrote: > From: AndreiCherniaev > > https://buildroot.org/downloads/manual/manual.html > There is "8.5.?Building out-of-tree". There is example of using > $ cd /tmp/build; make O=$PWD -C path/to/buildroot > but when user ignore cd /tmp/build; there is message > "error Please configure Buildroot first (e.g. "make menuconfig")" > but this message is not correct. I suggest a new message in this case. This is message from my PC: > "error Please go to your output directory first (e.g. "cd /home/username/Downloads/myGit/buildroot_O_bug/O_folder; make menuconfig")" That doesn't really address the problem - I think the real problem is that the example doesn't make it clear you need to run menuconfig (or another config) as the first 'make' invocation. So instead, I updated the manual to add "menuconfig" in the two examples given for out-of-tree builds. I believe that with that, the "e.g. make menuconfig" in the error is sufficiently clear. It's obvious that you need to repeat the O=... IMHO. Thank you for the report however! Regards, Arnout > > Signed-off-by: AndreiCherniaev > --- > Makefile | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 88f90cd2fa..176be12ac4 100644 > --- a/Makefile > +++ b/Makefile > @@ -945,7 +945,11 @@ else # ifeq ($(BR2_HAVE_DOT_CONFIG),y) > # Also for 'all' we error out and ask the user to configure first. > .PHONY: linux toolchain > linux toolchain all: outputmakefile > - $(error Please configure Buildroot first (e.g. "make menuconfig")) > + ifeq ($(NEED_WRAPPER),y) # ifeq ("$(origin O)", "command line") # O := $(CURDIR)/output > + $(error Please go to your output directory first (e.g. "cd $(O); make menuconfig")) > + else > + $(error Please configure Buildroot first (e.g. "make menuconfig")) > + endif > @exit 1 > > endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y) From thomas.petazzoni at bootlin.com Wed Feb 15 21:37:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:37:52 +0100 Subject: [Buildroot] [git commit] package/rtl8821cu: disable package for s390x architecture Message-ID: <20230215213813.11A1F85EB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92f545da0b60a0c82f8f0e8b0e69e30268f0e9f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this package for this architecture. Fixes: http://autobuild.buildroot.net/results/3a74d393cdbc308eab9ec3f0f9e420947669a0ea/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8821cu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rtl8821cu/Config.in b/package/rtl8821cu/Config.in index a5a7b9d255..00a41b5196 100644 --- a/package/rtl8821cu/Config.in +++ b/package/rtl8821cu/Config.in @@ -1,8 +1,10 @@ comment "rtl8821cu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_RTL8821CU bool "rtl8821cu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help rtl8821cu wifi driver From thomas.petazzoni at bootlin.com Wed Feb 15 21:37:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:37:52 +0100 Subject: [Buildroot] [git commit] package/rtl8812au-aircrack-ng: bump to 2023-02-03 version to fix build failure with Linux 6.1 Message-ID: <20230215213813.1C30185EB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d69ea9664f067e5660e13ddf65c52df46f2eca07 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/e128298929fce31374687a566e50b00c150131b8/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index bc3a926314..cdf5f3b4e2 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eed4888da9cfdc0f83ad3335beaf73af33ce0796b0a2637aeec102d47e1eb8f0 rtl8812au-aircrack-ng-e7a4a390ccbdd768411e1b2a8922c47837f76b47.tar.gz +sha256 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index 45a6ce5729..ab3ebe2077 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = e7a4a390ccbdd768411e1b2a8922c47837f76b47 +RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 15 21:38:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:38:33 +0100 Subject: [Buildroot] [PATCH] package/flannel: use the github helper In-Reply-To: <20230213200604.2539630-1-yann.morin.1998@free.fr> References: <20230213200604.2539630-1-yann.morin.1998@free.fr> Message-ID: <20230215223833.06e095ef@windsurf> On Mon, 13 Feb 2023 21:06:04 +0100 "Yann E. MORIN" wrote: > Currently, flannel uses an ad-hoc github URL and a version-only tarball > name, even though we already had the github helper (introduced in 2013) > when flannel was introduced (in 2016). > > Switch to the github helper, which allows us to get a properly named > tarball. > > Signed-off-by: Yann E. MORIN > Cc: Geoff Levand > --- > package/flannel/flannel.hash | 2 +- > package/flannel/flannel.mk | 3 +-- > 2 files changed, 2 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 Wed Feb 15 21:38:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:38:41 +0100 Subject: [Buildroot] [PATCH] package/rtl8812au-aircrack-ng: bump to 2023-02-03 version to fix build failure with Linux 6.1 In-Reply-To: <20230214110827.1281144-1-giulio.benetti@benettiengineering.com> References: <20230214110827.1281144-1-giulio.benetti@benettiengineering.com> Message-ID: <20230215223841.3c083b5f@windsurf> On Tue, 14 Feb 2023 12:08:27 +0100 Giulio Benetti wrote: > Fixes: > http://autobuild.buildroot.net/results/e128298929fce31374687a566e50b00c150131b8/ > > Signed-off-by: Giulio Benetti > --- > package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- > package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.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 Wed Feb 15 21:38:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:38:20 +0100 Subject: [Buildroot] [git commit] package/flannel: use the github helper Message-ID: <20230215213927.82A6585ECB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b361028e6302ee0b062674f0483845930e94ba7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, flannel uses an ad-hoc github URL and a version-only tarball name, even though we already had the github helper (introduced in 2013) when flannel was introduced (in 2016). Switch to the github helper, which allows us to get a properly named tarball. Signed-off-by: Yann E. MORIN Cc: Geoff Levand Acked-by: Geoff Levand Signed-off-by: Thomas Petazzoni --- package/flannel/flannel.hash | 2 +- package/flannel/flannel.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash index 6a0223a20f..bafc453097 100644 --- a/package/flannel/flannel.hash +++ b/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca v0.14.0.tar.gz +sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca flannel-0.14.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index 231cf90dfd..b4e2b2f777 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -5,8 +5,7 @@ ################################################################################ FLANNEL_VERSION = 0.14.0 -FLANNEL_SITE = https://github.com/flannel-io/flannel/archive -FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz +FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) FLANNEL_LICENSE = Apache-2.0 FLANNEL_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 15 21:38:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:38:54 +0100 Subject: [Buildroot] [git commit] package/open-iscsi: fix libressl build Message-ID: <20230215213927.9561785ECD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=295baf16a181b110eba09007f6ad7ac384914581 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following libressl build failure raised since the addition of the package in commit 2a571acddd0badaf9636649d98fd095757878348: /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' Fixes: - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-SHA3-is-not-supported-by-libressl.patch | 144 +++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch new file mode 100644 index 0000000000..0423179d93 --- /dev/null +++ b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch @@ -0,0 +1,144 @@ +From 29a4c3a518d13bfc0a07915e7e87fbec2b66597c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 13 Feb 2023 08:55:11 +0100 +Subject: [PATCH] SHA3 is not supported by libressl + +Disable SHA3 with libressl as it is not supported resulting in the +following build failure: + +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': +auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' + +Fixes: + - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/open-iscsi/open-iscsi/pull/396] +--- + libopeniscsiusr/idbm.h | 2 ++ + usr/auth.c | 13 ++++++++++++- + usr/auth.h | 4 ++++ + usr/idbm.c | 2 ++ + 4 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h +index be5986f..1043b27 100644 +--- a/libopeniscsiusr/idbm.h ++++ b/libopeniscsiusr/idbm.h +@@ -56,7 +56,9 @@ enum iscsi_chap_algs { + ISCSI_AUTH_CHAP_ALG_MD5 = 5, + ISCSI_AUTH_CHAP_ALG_SHA1 = 6, + ISCSI_AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + ISCSI_AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5, + }; + +diff --git a/usr/auth.c b/usr/auth.c +index 46c328e..5f50e26 100644 +--- a/usr/auth.c ++++ b/usr/auth.c +@@ -181,9 +181,11 @@ static int auth_hash_init(EVP_MD_CTX **context, int chap_alg) { + case AUTH_CHAP_ALG_SHA256: + digest = EVP_sha256(); + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + digest = EVP_sha3_256(); + break; ++#endif + } + + if (*context == NULL) +@@ -298,7 +300,9 @@ static int + acl_chk_chap_alg_optn(int chap_algorithm) + { + if (chap_algorithm == AUTH_OPTION_NONE || ++#ifndef LIBRESSL_VERSION_NUMBER + chap_algorithm == AUTH_CHAP_ALG_SHA3_256 || ++#endif + chap_algorithm == AUTH_CHAP_ALG_SHA256 || + chap_algorithm == AUTH_CHAP_ALG_SHA1 || + chap_algorithm == AUTH_CHAP_ALG_MD5) +@@ -711,9 +715,11 @@ acl_chk_chap_alg_key(struct iscsi_acl *client) + case AUTH_CHAP_ALG_SHA256: + client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN; + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN; + break; ++#endif + } + return; + } +@@ -862,7 +868,10 @@ acl_local_auth(struct iscsi_acl *client) + client->local_state = AUTH_LOCAL_STATE_ERROR; + client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT; + break; +- } else if ((client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++ } else if ( ++#ifndef LIBRESSL_VERSION_NUMBER ++ (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++#endif + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) { +@@ -1824,6 +1833,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA256 due to crypto lib configuration"); + } + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) { + value_list[i++] = AUTH_CHAP_ALG_SHA3_256; +@@ -1832,6 +1842,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA3-256 due to crypto lib configuration"); + } + break; ++#endif + case ~0: + /* unset value in array, just ignore */ + break; +diff --git a/usr/auth.h b/usr/auth.h +index 16cdb24..9357772 100644 +--- a/usr/auth.h ++++ b/usr/auth.h +@@ -32,7 +32,9 @@ enum { + AUTH_CHAP_MD5_RSP_LEN = 16, + AUTH_CHAP_SHA1_RSP_LEN = 20, + AUTH_CHAP_SHA256_RSP_LEN = 32, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_SHA3_256_RSP_LEN = 32, ++#endif + AUTH_CHAP_RSP_MAX = 32, + }; + +@@ -67,7 +69,9 @@ enum { + AUTH_CHAP_ALG_MD5 = 5, + AUTH_CHAP_ALG_SHA1 = 6, + AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5 + }; + +diff --git a/usr/idbm.c b/usr/idbm.c +index 90bc142..082e1c6 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -200,7 +200,9 @@ static struct int_list_tbl { + { "MD5", AUTH_CHAP_ALG_MD5 }, + { "SHA1", AUTH_CHAP_ALG_SHA1 }, + { "SHA256", AUTH_CHAP_ALG_SHA256 }, ++#ifndef LIBRESSL_VERSION_NUMBER + { "SHA3-256", AUTH_CHAP_ALG_SHA3_256 }, ++#endif + }; + + static void +-- +2.39.0 + From thomas.petazzoni at bootlin.com Wed Feb 15 21:39:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:39:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/open-iscsi: fix libressl build In-Reply-To: <20230213181754.913323-1-fontaine.fabrice@gmail.com> References: <20230213181754.913323-1-fontaine.fabrice@gmail.com> Message-ID: <20230215223934.141b34c3@windsurf> On Mon, 13 Feb 2023 19:17:54 +0100 Fabrice Fontaine wrote: > Fix the following libressl build failure raised since the addition of > the package in commit 2a571acddd0badaf9636649d98fd095757878348: > > /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': > auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' > > Fixes: > - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 > > Signed-off-by: Fabrice Fontaine > --- > ...01-SHA3-is-not-supported-by-libressl.patch | 144 ++++++++++++++++++ > 1 file changed, 144 insertions(+) > create mode 100644 package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 15 21:41:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:41:40 +0100 Subject: [Buildroot] [PATCH] package/zstd: bump to version 1.5.4 In-Reply-To: <20230215151302.140387-1-nolange79@gmail.com> References: <20230215151302.140387-1-nolange79@gmail.com> Message-ID: <20230215224140.212f6e6b@windsurf> Hello Norbert, On Wed, 15 Feb 2023 16:13:01 +0100 Norbert Lange wrote: > The LICENSE text has changed, nominally the copyright owner changed > from "Facebook" to "Meta Platforms, Inc. and affiliates", > reflecting the name change of that company. > > Add upstream patch to fix zstd-dll build. > > Signed-off-by: Norbert Lange > --- > ...-zstd-dll-build-missing-dependencies.patch | 179 ++++++++++++++++++ > package/zstd/zstd.hash | 6 +- > package/zstd/zstd.mk | 2 +- > 3 files changed, 183 insertions(+), 4 deletions(-) > create mode 100644 package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch Thanks for the patch. > > diff --git a/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch > new file mode 100644 > index 0000000000..bbb008c3b3 > --- /dev/null > +++ b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch > @@ -0,0 +1,179 @@ > +Fix zstd-dll build > + > +https://github.com/facebook/zstd/commit/c78f434aa4f5f1097c8edb975f4c1635817a5a71 > + > +Signed-off-by: Norbert Lange Could you use git format-patch to generate this patch, and preserve the authorship of the patch from its original author? Essentially this: - git clone ... - git checkout v1.5.4 - git cherry-pick c78f434aa4f5f1097c8edb975f4c1635817a5a71 - git commit --amend (add your own SoB in the commit log + reference to the upstream commit) - git format-patch HEAD^ Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 15 21:42:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:42:21 +0100 Subject: [Buildroot] [git commit] package/davinci-bootcount: bump to version 2.0.0 Message-ID: <20230215214321.42EAA85ED2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f16b97eab1859395ddd74f557d33ef8a1f2447d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - stm32mp1: support for STM32 TAMP_BKP21R bootcount register - tab formatting - gitignore: added autoscan files - updated documentation - i2c_eeprom: bootcount does not use two uint16s - am33xx: declare registers as 'volatile' - src/am33xx: do not close fd, it seems to prevent reliably writing register - configure.ac: update version, homepage - Added EEPROM read/write for non-TI AM335x platforms Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/davinci-bootcount/davinci-bootcount.hash | 2 +- package/davinci-bootcount/davinci-bootcount.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/davinci-bootcount/davinci-bootcount.hash index ef4bca2b7d..53435b1d1d 100644 --- a/package/davinci-bootcount/davinci-bootcount.hash +++ b/package/davinci-bootcount/davinci-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 de7843cf1245a739b6d18d4db478893e50c2de0ee19bbce96dc323065d28c3e4 davinci-bootcount-0973689c7556a953d2b468e4d8d46758c6d467b4.tar.gz +sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e davinci-bootcount-2.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk index 385d96d5a2..695d39688a 100644 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ b/package/davinci-bootcount/davinci-bootcount.mk @@ -4,8 +4,8 @@ # ################################################################################ -DAVINCI_BOOTCOUNT_VERSION = 0973689c7556a953d2b468e4d8d46758c6d467b4 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,$(DAVINCI_BOOTCOUNT_VERSION)) +DAVINCI_BOOTCOUNT_VERSION = 2.0.0 +DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Wed Feb 15 21:43:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:43:23 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/davinci-bootcount: bump to version 2.0.0 In-Reply-To: <20230211144623.380475-1-dario.binacchi@amarulasolutions.com> References: <20230211144623.380475-1-dario.binacchi@amarulasolutions.com> Message-ID: <20230215224323.620a3462@windsurf> On Sat, 11 Feb 2023 15:46:23 +0100 Dario Binacchi wrote: > - stm32mp1: support for STM32 TAMP_BKP21R bootcount register > - tab formatting > - gitignore: added autoscan files > - updated documentation > - i2c_eeprom: bootcount does not use two uint16s > - am33xx: declare registers as 'volatile' > - src/am33xx: do not close fd, it seems to prevent reliably writing register > - configure.ac: update version, homepage > - Added EEPROM read/write for non-TI AM335x platforms > > Signed-off-by: Dario Binacchi > > --- Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 15 21:46:18 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:46:18 +0100 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: make default toolchain_csv path absolute In-Reply-To: References: <20230215211531.331246-1-james.hilliard1@gmail.com> Message-ID: <5ee9bd2b-3a6e-7de3-9bc8-168e0639c5af@mind.be> On 15/02/2023 22:29, James Hilliard wrote: > On Wed, Feb 15, 2023 at 2:20 PM Arnout Vandecappelle wrote: >> >> >> >> On 15/02/2023 22:15, James Hilliard wrote: >>> The default toolchain_csv path is a relative path to the buildroot >>> directory. >>> >>> If we run genrandconfig with a cwd that is not the buildroot directory >>> the default toolchain_csv path will be wrong. >>> >>> To fix this make the default toolchain_csv path absolute. >>> >>> Fixes: >>> FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' >>> >>> Signed-off-by: James Hilliard >>> --- >>> Changes v1 -> v2: >>> - set default path as absolute >>> --- >>> utils/genrandconfig | 4 +++- >>> 1 file changed, 3 insertions(+), 1 deletion(-) >>> >>> diff --git a/utils/genrandconfig b/utils/genrandconfig >>> index b3576f8a51..3552b83694 100755 >>> --- a/utils/genrandconfig >>> +++ b/utils/genrandconfig >>> @@ -801,7 +801,9 @@ if __name__ == '__main__': >>> dest="toolchains_csv", >>> help="Generate random toolchain configuration", >>> action='store_false') >>> - parser.set_defaults(toolchains_csv="support/config-fragments/autobuild/toolchain-configs.csv") >>> + buildroot_abs = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) >>> + parser.set_defaults(toolchains_csv=os.path.join(buildroot_abs, >>> + "support/config-fragments/autobuild/toolchain-configs.csv")) >> >> Sorry, that's not going to work either (if it was that easy I'd done it myself :-) > > Under what scenario would this break? I have ~/src/buildroot/utils in my PATH, so I just run 'genrandconfig' from path. If I want to run it in a different worktree (e.g. ~/src/buildroot-next which tracks the next branch), I would go to that directory and run "genrandconfig", so it would use the one in ~/src/buildroot, not the one in ~/sr/buildroot-next. In that case, of course, I want to use the toolchain-configs.csv from the next branch, not the one from ~/src/buildroot. >> buildrootdir can be set to something else with the -b argument, and we want it >> relative to *that* one of course. > > Using buildrootdir is cwd dependent, The default value is cwd dependent; the value you give with the -b option can be absolute or relative. > the approach I used is not as it uses the > absolute path of the genrandconfig file to compute the default toolchain_csv > abs path. And my point is that it should be relative to the buildrootdir given with the commandline option, not relative to the place where genrandconfig happens to reside. TBH, I think genrandonfig has too many options :-) Regards, Arnout > >> >> Regards, >> Arnout >> >>> >>> args = parser.parse_args() >>> From thomas.petazzoni at bootlin.com Wed Feb 15 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit] package/dmalloc: don't use SSP Message-ID: <20230215214803.2C20B85EEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3481674ee36fe9fa695e2e6c255bf02b5ab380b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master dmalloc directly calls into $(LD) to generate a shared library our of the static one. To detect what command it should run, ./configure tries various incantations of ld with various command line options until one does not fail. One of those is (basically): $(LD) --whole-archive -o contest.o.t contest.a This makes ./configure conclude what the command to link a shared library in the Makefile should be, and thus stores that in a variable: shlinkargs='$(LD) --whole-archive -o $@' ... which is then AC_SUBST()ed into Makefile.in with a rule like: $(SHLIB): $(LIBRARY) @shlinkargs@ $(LIRARY) which once substiuted, gives: $(SHLIB): $(LIBRARY) $(LD) --whole-archive -o $@ $(LIRARY) However, when SSP is enabled, the __stack_chk_fail_local and co symbols are provided by additional libraries or object files, and that is the responsibility of gcc to pass those when linking. But as dmalloc directly calls ld, it misses those. Changing dmalloc to use $(CC) is not trivial, however. First, we can't pass LD=$(TARGET_CC), otherwise the whole package explodes [0]: indeed --whole-archive is unknown to gcc, so it must be passed as -Wl,--whole archive instead. So we'd need to add a new test that uses $(CC), like so: $(CC) -Wl,--whole-archive -o contest.o.t contest.a However, in that case, gcc does pass additional libs/objs (like, for eample, the SSP ones) to the linker. But then those are also included in the whole-archive section. This causes the linker to add all the symbols form those libs/objs, even those not needed for SSP; on some archs, like PPC, that may require floating point symbols (__muldiv3 et al.) which are in another library, and thus the linker can't find them. The proper solution wouild be to add -Wl,--no-whole-archive, but that would have to be added _after_ the library we want to link, i.e.e we should be able to evntually run: $(CC) -Wl,--whole-archive -o $@ $(LIRARY) -Wl,--no-whole-archive That would require that we introduce a new variable that is added _after_ the $(LIBRARY), e.g. @shlinkargs_post@ or so... This is a bigger endeavour than we want to pursue... Since dmalloc is a debugging utility, it is not supposed to go into production builds, and during debugging, it would not be surprising that it needs to poke around arrays to debug them. So, we go the easier route: disable SSP altogether. [0] with lots of nice colors, but that's not the point, is it? Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dmalloc/dmalloc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 6b90f810b2..5bd6691725 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -14,6 +14,13 @@ DMALLOC_LICENSE_FILES = LICENSE.txt DMALLOC_INSTALL_STAGING = YES DMALLOC_CFLAGS = $(TARGET_CFLAGS) +# dmalloc uses $(LD) to link, and thus misses the object files or libs that +# are needed to provide the __stack_chk_fail_local and co. symbols. Changing +# to use $(CC) is really more complex that we'd like. Since dmalloc is +# involved in debugging memory allocation, it is not expected to be a +# production library, so we do not care that much that it has SSP. +DMALLOC_CFLAGS += -fno-stack-protector + ifeq ($(BR2_STATIC_LIBS),y) DMALLOC_CONF_OPTS += --disable-shlib else From thomas.petazzoni at bootlin.com Wed Feb 15 21:45:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:45:26 +0100 Subject: [Buildroot] [git commit] package/dmalloc: convert existing patch to git format Message-ID: <20230215214803.16B1985EEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7bd0fdb88a15b15d4b41bdc82a37cf35ab2b268 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We're going to add more patches, so let's cleanup our historical baggage... Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../dmalloc/0001-configure-fix-build-on-mips.patch | 90 ++++++++++++++++++++++ package/dmalloc/0001-mips.patch | 45 ----------- 2 files changed, 90 insertions(+), 45 deletions(-) diff --git a/package/dmalloc/0001-configure-fix-build-on-mips.patch b/package/dmalloc/0001-configure-fix-build-on-mips.patch new file mode 100644 index 0000000000..9b1525d0d1 --- /dev/null +++ b/package/dmalloc/0001-configure-fix-build-on-mips.patch @@ -0,0 +1,90 @@ +From af6adb3f5f05be4faa88a5aa83296c388c8085e7 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 12:30:10 +0100 +Subject: [PATCH] configure: fix build on mips + +This patch is a historical baggage that Buildroot has carried for ages +(since 2006), and the reason for it are notentirely clear. + +Since dmalloc is pretty tricky, and as this patch has not been +identified as causing issues, we keep it; we just add the configure.ac +patchlet to match the one in configure. + +As for the title, the original patch was named dmalloc-mips.patch, so +presumably it fixes some mips issue; let's title the commit that way. + +[Fabrice: Updated for 5.6.5] +Signed-off-by: Fabrice Fontaine +[yann.morin.1998 at free.fr: make it a git-formatted patch] +Signed-off-by: Yann E. MORIN +--- + configure | 4 ++-- + configure.ac | 2 +- + return.h | 16 +++------------- + 3 files changed, 6 insertions(+), 16 deletions(-) + +diff --git a/configure b/configure +index d52a1e8..c18dfb2 100755 +--- a/configure ++++ b/configure +@@ -5413,8 +5413,8 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 + $as_echo_n "checking return.h macros work... " >&6; } + if test "$cross_compiling" = yes; then : +- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assume yes (cross-compiling)" >&5 + $as_echo "no" >&6; } + + else +diff --git a/configure.ac b/configure.ac +index a5295f1..9740fdc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -705,7 +705,7 @@ int main() + ])], + [ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([yes]) ], + [ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ], +-[ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ] ++[ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([assume yes (cross-compiling)]) ] + ) + + ############################################################################## +diff --git a/return.h b/return.h +index 9d3f5f1..d916c7a 100644 +--- a/return.h ++++ b/return.h +@@ -117,26 +117,16 @@ + /*************************************/ + + /* +- * For DEC Mips machines running Ultrix ++ * For Mips machines running Linux + */ + #if __mips + +-/* +- * I have no idea how to get inline assembly with the default cc. +- * Anyone know how? +- */ +- +-#if 0 +- + /* + * NOTE: we assume here that file is global. + * +- * $31 is the frame pointer. $2 looks to be the return address but maybe +- * not consistently. ++ * $31 is the return address. + */ +-#define GET_RET_ADDR(file) asm("sw $2, file") +- +-#endif ++#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) + + #endif /* __mips */ + +-- +2.25.1 + diff --git a/package/dmalloc/0001-mips.patch b/package/dmalloc/0001-mips.patch deleted file mode 100644 index 3150d030ec..0000000000 --- a/package/dmalloc/0001-mips.patch +++ /dev/null @@ -1,45 +0,0 @@ -[Fabrice: Updated for 5.6.5] -Signed-off-by: Fabrice Fontaine ---- a/configure -+++ b/configure -@@ -7107,7 +7107,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 - $as_echo_n "checking return.h macros work... " >&6; } - if test "$cross_compiling" = yes; then : -- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h -+ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - ---- a/return.h -+++ b/return.h -@@ -106,26 +106,16 @@ - /*************************************/ - - /* -- * For DEC Mips machines running Ultrix -+ * For Mips machines running Linux - */ - #if __mips - - /* -- * I have no idea how to get inline assembly with the default cc. -- * Anyone know how? -- */ -- --#if 0 -- --/* - * NOTE: we assume here that file is global. - * -- * $31 is the frame pointer. $2 looks to be the return address but maybe -- * not consistently. -+ * $31 is the return address. - */ --#define GET_RET_ADDR(file) asm("sw $2, file") -- --#endif -+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) - - #endif /* __mips */ - From thomas.petazzoni at bootlin.com Wed Feb 15 21:45:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:45:44 +0100 Subject: [Buildroot] [git commit] package/dmalloc: use actual patches rather than sed-ing Message-ID: <20230215214803.219DD85ED1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b259dac22a4179494e9947c485b6b171d8fef52e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Our dmalloc packaging is very old and carries historical baggage and idiosyncracies that we have long stopped doing in the rest ofthe code base. Drop our post-patch hooks that seds the configure and Makefile.in files, and add patches (that could be upstreamed one day). We provide the results in the environment, like would be done with actual autoconf cache variables (ac_cv_*). Note: those are the result of cleaning up for further patches that did not manifest because it was too complex to add proper SSP support to dmalloc (instead, we're going to forcibly disable it in the following commit). Note-2: those patches have not been submitted upstream, as it's mostly dead: even though there's been some commit activities recently-ish, there has been no review or comments or the many PR pending for many years now. Note-3: we patch both configure and configure.ac, rather than autoreconf, for two reasons: 1. the both are in the upstream git tree, so submitting these patches would require patching both, and 2. dmalloc does not autoreconf nicely out of the box, and it was deemed too much hassle to fix that in addition. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...003-configure-allow-overriding-some-tests.patch | 80 ++++++++++++++++++++++ ...e-the-configure-detected-or-user-supplied.patch | 50 ++++++++++++++ ...onfigure-use-LD-instead-of-hard-coding-ld.patch | 67 ++++++++++++++++++ package/dmalloc/dmalloc.mk | 17 ++--- 4 files changed, 202 insertions(+), 12 deletions(-) diff --git a/package/dmalloc/0003-configure-allow-overriding-some-tests.patch b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch new file mode 100644 index 0000000000..3003e8cbe4 --- /dev/null +++ b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch @@ -0,0 +1,80 @@ +From 9d57d4353c82110c609f36f91986277343d4ee45 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:26:56 +0100 +Subject: [PATCH] configure: allow overriding some tests + +Some tests use AC_RUN_IFELSE, so they do not work for cross-compilation. + +Allow the user to provide these results from the environment. + +Signed-off-by: Yann E. MORIN +--- + configure | 6 +++--- + configure.ac | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index c18dfb2..d165962 100755 +--- a/configure ++++ b/configure +@@ -4540,7 +4540,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strdup macro" >&5 + $as_echo_n "checking strdup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strdup_macro=no ++ ac_cv_strdup_macro="${ac_cv_strdup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4578,7 +4578,7 @@ $as_echo "$ac_cv_strdup_macro" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strndup macro" >&5 + $as_echo_n "checking strndup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strndup_macro=no ++ ac_cv_strndup_macro="${ac_cv_strndup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4753,7 +4753,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking basic-block size" >&5 + $as_echo_n "checking basic-block size... " >&6; } +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + if test "$cross_compiling" = yes; then : + ac_cv_page_size=0 +diff --git a/configure.ac b/configure.ac +index 9740fdc..51bdf4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -292,7 +292,7 @@ int main() { return 1; } + ]])], + [ac_cv_strdup_macro=yes], + [ac_cv_strdup_macro=no], +-[ac_cv_strdup_macro=no] ++[ac_cv_strdup_macro="${ac_cv_strdup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strdup_macro]) + +@@ -316,7 +316,7 @@ int main() { return 1; } + ]])], + [ac_cv_strndup_macro=yes], + [ac_cv_strndup_macro=no], +-[ac_cv_strndup_macro=no] ++[ac_cv_strndup_macro="${ac_cv_strndup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strndup_macro]) + +@@ -390,7 +390,7 @@ AC_MSG_RESULT([$ac_cv_use_mmap]) + # + AC_CHECK_FUNCS(getpagesize) + AC_MSG_CHECKING([basic-block size]) +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + AC_RUN_IFELSE([AC_LANG_SOURCE([ + #if HAVE_UNISTD_H +-- +2.25.1 + diff --git a/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch new file mode 100644 index 0000000000..394e7ca34e --- /dev/null +++ b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch @@ -0,0 +1,50 @@ +From c958fd5cd7d5ff03c0a023608b53b74997c514b3 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:43:55 +0100 +Subject: [PATCH] Makefile: use the configure-detected or user-supplied ar + program + +Signed-off-by: Yann E. MORIN +--- + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 86d3cca..089ac99 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -303,11 +303,11 @@ $(LIB_SL) : $(LIBRARY) + mv $@.t $@ + + $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH) : $(OBJS) $(THREAD_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_SL) : $(LIB_TH) +@@ -316,7 +316,7 @@ $(LIB_TH_SL) : $(LIB_TH) + mv $@.t $@ + + $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_CXX_SL) : $(LIB_CXX) +@@ -325,7 +325,7 @@ $(LIB_CXX_SL) : $(LIB_CXX) + mv $@.t $@ + + $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) +-- +2.25.1 + diff --git a/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch new file mode 100644 index 0000000000..3ba6ee3dc7 --- /dev/null +++ b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch @@ -0,0 +1,67 @@ +From d77e5f3d45b0cbae850e3a6e23d52edc137be803 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:52:05 +0100 +Subject: [PATCH] configure: use ${LD} instead of hard-coding 'ld' + +When doing cross-compilation, we do not want to use the native tools to +test, but the target tools. + +Note that the weird quoting is inherited from a legacy patch in +Buildroot, which dates back ages (at least 2006), and as it has not been +identified as breaking things, we keep it as-is... Meh... + +Signed-off-by: Yann E. MORIN +--- + configure | 12 ++++++------ + configure.ac | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/configure b/configure +index 810636e..30a7ea3 100755 +--- a/configure ++++ b/configure +@@ -4377,12 +4377,12 @@ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +diff --git a/configure.ac b/configure.ac +index 51bdf4d..0d80a78 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,12 +169,12 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int foo(int val) { return val + 1; } ])],[ + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +-- +2.25.1 + diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 81ac467277..6b90f810b2 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -44,18 +44,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_63261),y) DMALLOC_CFLAGS += -O0 endif -DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)" - -define DMALLOC_POST_PATCH - $(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure - $(SED) 's/ac_cv_strdup_macro=no$$/ac_cv_strdup_macro=yes/' $(@D)/configure - $(SED) 's/ac_cv_strndup_macro=no$$/ac_cv_strndup_macro=yes/' $(@D)/configure - $(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure - $(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure - $(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in -endef - -DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH +DMALLOC_CONF_ENV = \ + CFLAGS="$(DMALLOC_CFLAGS)" \ + ac_cv_page_size=12 \ + ac_cv_strdup_macro=yes \ + ac_cv_strndup_macro=yes # both DESTDIR and PREFIX are ignored.. define DMALLOC_INSTALL_STAGING_CMDS From james.hilliard1 at gmail.com Wed Feb 15 21:57:50 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 15 Feb 2023 14:57:50 -0700 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: make default toolchain_csv path absolute In-Reply-To: <5ee9bd2b-3a6e-7de3-9bc8-168e0639c5af@mind.be> References: <20230215211531.331246-1-james.hilliard1@gmail.com> <5ee9bd2b-3a6e-7de3-9bc8-168e0639c5af@mind.be> Message-ID: On Wed, Feb 15, 2023 at 2:46 PM Arnout Vandecappelle wrote: > > > > On 15/02/2023 22:29, James Hilliard wrote: > > On Wed, Feb 15, 2023 at 2:20 PM Arnout Vandecappelle wrote: > >> > >> > >> > >> On 15/02/2023 22:15, James Hilliard wrote: > >>> The default toolchain_csv path is a relative path to the buildroot > >>> directory. > >>> > >>> If we run genrandconfig with a cwd that is not the buildroot directory > >>> the default toolchain_csv path will be wrong. > >>> > >>> To fix this make the default toolchain_csv path absolute. > >>> > >>> Fixes: > >>> FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' > >>> > >>> Signed-off-by: James Hilliard > >>> --- > >>> Changes v1 -> v2: > >>> - set default path as absolute > >>> --- > >>> utils/genrandconfig | 4 +++- > >>> 1 file changed, 3 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/utils/genrandconfig b/utils/genrandconfig > >>> index b3576f8a51..3552b83694 100755 > >>> --- a/utils/genrandconfig > >>> +++ b/utils/genrandconfig > >>> @@ -801,7 +801,9 @@ if __name__ == '__main__': > >>> dest="toolchains_csv", > >>> help="Generate random toolchain configuration", > >>> action='store_false') > >>> - parser.set_defaults(toolchains_csv="support/config-fragments/autobuild/toolchain-configs.csv") > >>> + buildroot_abs = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) > >>> + parser.set_defaults(toolchains_csv=os.path.join(buildroot_abs, > >>> + "support/config-fragments/autobuild/toolchain-configs.csv")) > >> > >> Sorry, that's not going to work either (if it was that easy I'd done it myself :-) > > > > Under what scenario would this break? > > I have ~/src/buildroot/utils in my PATH, so I just run 'genrandconfig' from > path. If I want to run it in a different worktree (e.g. ~/src/buildroot-next > which tracks the next branch), I would go to that directory and run > "genrandconfig", so it would use the one in ~/src/buildroot, not the one in > ~/sr/buildroot-next. In that case, of course, I want to use the > toolchain-configs.csv from the next branch, not the one from ~/src/buildroot. Well you can still do that by passing the relative path via --toolchains-csv to override the default abs path. > > > >> buildrootdir can be set to something else with the -b argument, and we want it > >> relative to *that* one of course. > > > > Using buildrootdir is cwd dependent, > > The default value is cwd dependent; the value you give with the -b option can > be absolute or relative. Yeah, but I think making it an abs path relative to the genrandconfig file as the default is less likely to cause unexpected issues. Having it relative to cwd when not passing an option is a bit unexpected IMO. > > > the approach I used is not as it uses the > > absolute path of the genrandconfig file to compute the default toolchain_csv > > abs path. > > And my point is that it should be relative to the buildrootdir given with the > commandline option, not relative to the place where genrandconfig happens to reside. It's still relative to cwd when passing a relative path via --toolchains-csv, just the default is changed to be an abs path. > > TBH, I think genrandonfig has too many options :-) > > Regards, > Arnout > > > > >> > >> Regards, > >> Arnout > >> > >>> > >>> args = parser.parse_args() > >>> From thomas.petazzoni at bootlin.com Wed Feb 15 22:21:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 23:21:19 +0100 Subject: [Buildroot] [git commit] package/python-marshmallow-sqlalchemy: new package Message-ID: <20230215222259.06C4E85F32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e9f0dc59a5c4310139040f88189d10ad0b76906 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Martin Hundeboll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-marshmallow-sqlalchemy/Config.in | 10 ++++++++++ .../python-marshmallow-sqlalchemy.hash | 5 +++++ .../python-marshmallow-sqlalchemy.mk | 14 ++++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2b05714e9c..bcf377d3d4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1968,6 +1968,7 @@ F: package/zic/ N: Martin Hundeb??ll F: package/python-apispec/ F: package/python-marshmallow/ +F: package/python-marshmallow-sqlalchemy/ F: package/python-webargs/ N: Martin Kepplinger diff --git a/package/Config.in b/package/Config.in index ece35f12c8..3807050eeb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1130,6 +1130,7 @@ menu "External python modules" source "package/python-markdown2/Config.in" source "package/python-markupsafe/Config.in" source "package/python-marshmallow/Config.in" + source "package/python-marshmallow-sqlalchemy/Config.in" source "package/python-matplotlib/Config.in" source "package/python-mbstrdecoder/Config.in" source "package/python-memory-profiler/Config.in" diff --git a/package/python-marshmallow-sqlalchemy/Config.in b/package/python-marshmallow-sqlalchemy/Config.in new file mode 100644 index 0000000000..f48d27edd6 --- /dev/null +++ b/package/python-marshmallow-sqlalchemy/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_MARSHMALLOW_SQLALCHEMY + bool "python-marshmallow-sqlalchemy" + select BR2_PACKAGE_PYTHON_MARSHMALLOW # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime + help + SQLAlchemy integration with the marshmallow + (de)serialization library. + + https://github.com/marshmallow-code/marshmallow-sqlalchemy diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash new file mode 100644 index 0000000000..6b847de94d --- /dev/null +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/marshmallow-sqlalchemy/json +md5 5e012b07ccf4ad67dbd3f38cc68cb1f4 marshmallow-sqlalchemy-0.28.1.tar.gz +sha256 aa376747296780a56355e3067b9c8bf43a2a1c44ff985de82b3a5d9e161ca2b8 marshmallow-sqlalchemy-0.28.1.tar.gz +# Locally computed sha256 checksums +sha256 625df8e2758a271b4bc90525c0b6161814e0f72cb3504b03ab5206b7abf50072 LICENSE diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk new file mode 100644 index 0000000000..293ea29be6 --- /dev/null +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-marshmallow-sqlalchemy +# +################################################################################ + +PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 0.28.1 +PYTHON_MARSHMALLOW_SQLALCHEMY_SOURCE = marshmallow-sqlalchemy-$(PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION).tar.gz +PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/eb/96/3895bde2247fa653c36d887ff08e439665668aa7c991a3924ae199be88d6 +PYTHON_MARSHMALLOW_SQLALCHEMY_SETUP_TYPE = setuptools +PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE = MIT +PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 15 22:17:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 23:17:52 +0100 Subject: [Buildroot] [git commit] package/python-marshmallow: new package Message-ID: <20230215222258.EB99285F35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c3e7014105eb69db7d9c9f662ab0a5054f35797 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master marshmallow is a dependency of to-be-added python-flask-smorest. Signed-off-by: Martin Hundeb??ll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-marshmallow/Config.in | 8 ++++++++ package/python-marshmallow/python-marshmallow.hash | 6 ++++++ package/python-marshmallow/python-marshmallow.mk | 14 ++++++++++++++ 5 files changed, 30 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7335e70d15..2b05714e9c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1967,6 +1967,7 @@ F: package/zic/ N: Martin Hundeb??ll F: package/python-apispec/ +F: package/python-marshmallow/ F: package/python-webargs/ N: Martin Kepplinger diff --git a/package/Config.in b/package/Config.in index 747fac54bf..ece35f12c8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1129,6 +1129,7 @@ menu "External python modules" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" source "package/python-markupsafe/Config.in" + source "package/python-marshmallow/Config.in" source "package/python-matplotlib/Config.in" source "package/python-mbstrdecoder/Config.in" source "package/python-memory-profiler/Config.in" diff --git a/package/python-marshmallow/Config.in b/package/python-marshmallow/Config.in new file mode 100644 index 0000000000..cc1b42f465 --- /dev/null +++ b/package/python-marshmallow/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_MARSHMALLOW + bool "python-marshmallow" + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + help + A lightweight library for converting complex datatypes to + and from native Python datatypes. + + https://github.com/marshmallow-code/marshmallow diff --git a/package/python-marshmallow/python-marshmallow.hash b/package/python-marshmallow/python-marshmallow.hash new file mode 100644 index 0000000000..dc277d16e5 --- /dev/null +++ b/package/python-marshmallow/python-marshmallow.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/marshmallow/json +md5 3cf5c42917509a199c3105466435c425 marshmallow-3.19.0.tar.gz +sha256 90032c0fd650ce94b6ec6dc8dfeb0e3ff50c144586462c389b81a07205bedb78 marshmallow-3.19.0.tar.gz +# Locally computed sha256 checksums +sha256 759dc79c383ad79340c6e41f712e80407fe0d2cb3cbaad1ed98aa9c3e28a602c LICENSE +sha256 f982e6fd97ba00973e94605b972ff04894b22c4fa937b868828b32ae8f0a7c2e docs/license.rst diff --git a/package/python-marshmallow/python-marshmallow.mk b/package/python-marshmallow/python-marshmallow.mk new file mode 100644 index 0000000000..6427296508 --- /dev/null +++ b/package/python-marshmallow/python-marshmallow.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-marshmallow +# +################################################################################ + +PYTHON_MARSHMALLOW_VERSION = 3.19.0 +PYTHON_MARSHMALLOW_SOURCE = marshmallow-$(PYTHON_MARSHMALLOW_VERSION).tar.gz +PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/5e/59/dd465e5ab0ccb879c410f88c75189a19fd437b12cd9a03b31579aef58709 +PYTHON_MARSHMALLOW_SETUP_TYPE = setuptools +PYTHON_MARSHMALLOW_LICENSE = MIT +PYTHON_MARSHMALLOW_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 15 22:16:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 23:16:09 +0100 Subject: [Buildroot] [git commit] package/python-apispec: new package Message-ID: <20230215222258.CA7BF85F32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8984b7581a7d534c9170061913b4840ed33d87c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master apispec is a dependency of to-be-added python-flask-smorest. Signed-off-by: Martin Hundeb??ll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-apispec/Config.in | 9 +++++++++ package/python-apispec/python-apispec.hash | 5 +++++ package/python-apispec/python-apispec.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 72a56deb4c..949eef8327 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1965,6 +1965,9 @@ F: package/rpi-firmware/ F: package/tzdata/ F: package/zic/ +N: Martin Hundeb??ll +F: package/python-apispec/ + N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ diff --git a/package/Config.in b/package/Config.in index fff2fb7a93..de40f2d529 100644 --- a/package/Config.in +++ b/package/Config.in @@ -958,6 +958,7 @@ menu "External python modules" source "package/python-alembic/Config.in" source "package/python-alsaaudio/Config.in" source "package/python-ansicolors/Config.in" + source "package/python-apispec/Config.in" source "package/python-appdirs/Config.in" source "package/python-argh/Config.in" source "package/python-argon2-cffi/Config.in" diff --git a/package/python-apispec/Config.in b/package/python-apispec/Config.in new file mode 100644 index 0000000000..7a322c9969 --- /dev/null +++ b/package/python-apispec/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_APISPEC + bool "python-apispec" + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + help + A pluggable API specification generator. Currently supports + the OpenAPI Specification (f.k.a. the Swagger + specification). + + https://github.com/marshmallow-code/apispec diff --git a/package/python-apispec/python-apispec.hash b/package/python-apispec/python-apispec.hash new file mode 100644 index 0000000000..9d653cc8e8 --- /dev/null +++ b/package/python-apispec/python-apispec.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/apispec/json +md5 b4e90006a26215e2e0a6fe2629d12c10 apispec-6.0.2.tar.gz +sha256 e76d80b739edef4be213092a6384ad7fd933ba7d64f6d5a0aff8d4da1bef7887 apispec-6.0.2.tar.gz +# Locally computed sha256 checksums +sha256 a452afcef750956a8396f7e7a6f913a117d28ef99a13170c29dc74c3b7a95f29 LICENSE diff --git a/package/python-apispec/python-apispec.mk b/package/python-apispec/python-apispec.mk new file mode 100644 index 0000000000..4674ce0c3d --- /dev/null +++ b/package/python-apispec/python-apispec.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-apispec +# +################################################################################ + +PYTHON_APISPEC_VERSION = 6.0.2 +PYTHON_APISPEC_SOURCE = apispec-$(PYTHON_APISPEC_VERSION).tar.gz +PYTHON_APISPEC_SITE = https://files.pythonhosted.org/packages/a7/2a/b42c17e0d653341b8f5916999892cd2d8489de127dac6118ae44531674f5 +PYTHON_APISPEC_SETUP_TYPE = setuptools +PYTHON_APISPEC_LICENSE = MIT +PYTHON_APISPEC_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 15 22:22:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 23:22:26 +0100 Subject: [Buildroot] [git commit] package/python-flask-smorest: new package Message-ID: <20230215222259.146D485F33@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d00e437922fb1b611f35c3138b9fbf7bcff62757 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Martin Hundeb??ll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-flask-smorest/Config.in | 11 +++++++++++ package/python-flask-smorest/python-flask-smorest.hash | 5 +++++ package/python-flask-smorest/python-flask-smorest.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index bcf377d3d4..f8451c7fec 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1967,6 +1967,7 @@ F: package/zic/ N: Martin Hundeb??ll F: package/python-apispec/ +F: package/python-flask-smorest/ F: package/python-marshmallow/ F: package/python-marshmallow-sqlalchemy/ F: package/python-webargs/ diff --git a/package/Config.in b/package/Config.in index 3807050eeb..0af4adffa5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1058,6 +1058,7 @@ menu "External python modules" source "package/python-flask-expects-json/Config.in" source "package/python-flask-jsonrpc/Config.in" source "package/python-flask-login/Config.in" + source "package/python-flask-smorest/Config.in" source "package/python-flask-sqlalchemy/Config.in" source "package/python-flask-wtf/Config.in" source "package/python-flatbuffers/Config.in" diff --git a/package/python-flask-smorest/Config.in b/package/python-flask-smorest/Config.in new file mode 100644 index 0000000000..a8ccfbd9f7 --- /dev/null +++ b/package/python-flask-smorest/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_FLASK_SMOREST + bool "python-flask-smorest" + select BR2_PACKAGE_PYTHON_APISPEC # runtime + select BR2_PACKAGE_PYTHON_FLASK # runtime + select BR2_PACKAGE_PYTHON_MARSHMALLOW # runtime + select BR2_PACKAGE_PYTHON_WEBARGS # runtime + select BR2_PACKAGE_PYTHON_WERKZEUG # runtime + help + Flask/Marshmallow-based REST API framework. + + https://github.com/marshmallow-code/flask-smorest diff --git a/package/python-flask-smorest/python-flask-smorest.hash b/package/python-flask-smorest/python-flask-smorest.hash new file mode 100644 index 0000000000..5abe0c5033 --- /dev/null +++ b/package/python-flask-smorest/python-flask-smorest.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/flask-smorest/json +md5 1dad52f26c59ca2dcaf0c5d109879605 flask-smorest-0.40.0.tar.gz +sha256 9b46b4937ccf78702d99fed8cfd1cd5c37608ddefd65ff16a86d1ad5c7f7d8c0 flask-smorest-0.40.0.tar.gz +# Locally computed sha256 checksums +sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE diff --git a/package/python-flask-smorest/python-flask-smorest.mk b/package/python-flask-smorest/python-flask-smorest.mk new file mode 100644 index 0000000000..069d9244dd --- /dev/null +++ b/package/python-flask-smorest/python-flask-smorest.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-flask-smorest +# +################################################################################ + +PYTHON_FLASK_SMOREST_VERSION = 0.40.0 +PYTHON_FLASK_SMOREST_SOURCE = flask-smorest-$(PYTHON_FLASK_SMOREST_VERSION).tar.gz +PYTHON_FLASK_SMOREST_SITE = https://files.pythonhosted.org/packages/e6/b5/1b81ea4f7e377cf8a653aa10c249656a1c73de7a3695b2544d7a713ea3c2 +PYTHON_FLASK_SMOREST_SETUP_TYPE = setuptools +PYTHON_FLASK_SMOREST_LICENSE = MIT +PYTHON_FLASK_SMOREST_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 15 22:16:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 23:16:55 +0100 Subject: [Buildroot] [git commit] package/python-webargs: new package Message-ID: <20230215222258.DDC9B85F33@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c41d4836999fa691c5952bd476182bf93647e7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master webargs is a dependency of to-be-added python-flask-smorest. Signed-off-by: Martin Hundeb??ll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-webargs/Config.in | 11 +++++++++++ package/python-webargs/python-webargs.hash | 5 +++++ package/python-webargs/python-webargs.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 949eef8327..7335e70d15 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1967,6 +1967,7 @@ F: package/zic/ N: Martin Hundeb??ll F: package/python-apispec/ +F: package/python-webargs/ N: Martin Kepplinger F: package/tslib/ diff --git a/package/Config.in b/package/Config.in index de40f2d529..747fac54bf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1341,6 +1341,7 @@ menu "External python modules" source "package/python-wcwidth/Config.in" source "package/python-weasyprint/Config.in" source "package/python-web2py/Config.in" + source "package/python-webargs/Config.in" source "package/python-webencodings/Config.in" source "package/python-webob/Config.in" source "package/python-webpy/Config.in" diff --git a/package/python-webargs/Config.in b/package/python-webargs/Config.in new file mode 100644 index 0000000000..f2332d3b70 --- /dev/null +++ b/package/python-webargs/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_WEBARGS + bool "python-webargs" + select BR2_PACKAGE_PYTHON_MARSHMALLOW # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + help + Declarative parsing and validation of HTTP request objects, + with built-in support for popular web frameworks, including + Flask, Django, Bottle, Tornado, Pyramid, Falcon, and + aiohttp. + + https://github.com/marshmallow-code/webargs diff --git a/package/python-webargs/python-webargs.hash b/package/python-webargs/python-webargs.hash new file mode 100644 index 0000000000..619b584807 --- /dev/null +++ b/package/python-webargs/python-webargs.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/webargs/json +md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz +sha256 99d68940c452e07726485a15fef43f12f8ae6c0c5b391bcba76065d4527fb85d webargs-8.2.0.tar.gz +# Locally computed sha256 checksums +sha256 5973e5dcc20b65e4eb4b4acdf273bb78a18522914ab626f496f1b070f7e6294d LICENSE diff --git a/package/python-webargs/python-webargs.mk b/package/python-webargs/python-webargs.mk new file mode 100644 index 0000000000..e048d8a4ac --- /dev/null +++ b/package/python-webargs/python-webargs.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-webargs +# +################################################################################ + +PYTHON_WEBARGS_VERSION = 8.2.0 +PYTHON_WEBARGS_SOURCE = webargs-$(PYTHON_WEBARGS_VERSION).tar.gz +PYTHON_WEBARGS_SITE = https://files.pythonhosted.org/packages/4b/7d/fece8e6547b3edde8953b1c84a63da02e1a88efcb9d7d485e4d1b25d9c47 +PYTHON_WEBARGS_SETUP_TYPE = setuptools +PYTHON_WEBARGS_LICENSE = MIT +PYTHON_WEBARGS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 15 22:24:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 23:24:23 +0100 Subject: [Buildroot] [PATCH 1/5] package/python-apispec: new package In-Reply-To: <20230105130000.682525-2-martin@geanix.com> References: <20230105130000.682525-1-martin@geanix.com> <20230105130000.682525-2-martin@geanix.com> Message-ID: <20230215232423.0bcc3f62@windsurf> Hello Martin, On Thu, 5 Jan 2023 13:59:56 +0100 Martin Hundeb?ll wrote: > apispec is a dependency of to-be-added python-flask-smorest. > > Signed-off-by: Martin Hundeb?ll > --- > package/Config.in | 1 + > package/python-apispec/Config.in | 9 +++++++++ > package/python-apispec/python-apispec.hash | 5 +++++ > package/python-apispec/python-apispec.mk | 14 ++++++++++++++ > 4 files changed, 29 insertions(+) > create mode 100644 package/python-apispec/Config.in > create mode 100644 package/python-apispec/python-apispec.hash > create mode 100644 package/python-apispec/python-apispec.mk Thanks for your contribution! I have applied all 5 patches. One thing was missing on all patches: adding yourself to the DEVELOPERS file for each package. There was also an issue on PATCH 4/5, on the LICENSE file: the hash you had was not up-to-date. I double checked and the hash you had for the license file was from a previous version of the package. The license file just changed due to copyright years, so I updated the hash file with the correct hash for the LICENSE file when applying. Again, thanks for this contribution! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From aduskett at gmail.com Wed Feb 15 22:43:00 2023 From: aduskett at gmail.com (Adam Duskett) Date: Wed, 15 Feb 2023 14:43:00 -0800 Subject: [Buildroot] [PATCH 1/1] package/openjdk{-bin}: bump versions to 11.0.18+10 and 17.0.6+10 Message-ID: <20230215224300.486258-1-aduskett@gmail.com> Signed-off-by: Adam Duskett --- ...ARCv2-ISA-processors-support-to-Zero.patch | 20 +++++++++---------- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) rename package/openjdk/{17.0.1+12 => 17.0.6+10}/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch (83%) diff --git a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 83% rename from package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index 1ef523a419..dfd3b07bea 100644 --- a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -23,8 +23,8 @@ diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 index 5120918aed2..f7a99955874 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 -@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], - BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread" +@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], + fi fi + # Libatomic library @@ -55,7 +55,7 @@ index c0f2446dbd7..dc416ece885 100644 arm*) VAR_CPU=arm VAR_CPU_ARCH=arm -@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], +@@ -563,6 +569,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], HOTSPOT_$1_CPU_DEFINE=PPC64 # The cpu defines below are for zero, we don't support them directly. @@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c index b08caf4d5d3..2bf084895ba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,12 +95,12 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { - static Elf32_Half running_arch_code=EM_RISCV; +@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { + static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ -- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc -+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc +- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc ++ AARCH64, ALPHA, ARC ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc #endif // Identify compatibility class for VM's architecture and library's architecture diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 293787792d..0a67e7a3ec 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2fdd23261526362d4aaf58323441d4c31d29de2e374ba94bbf2727a00adc0ea7 openjdk-17.0.2+8.tar.gz -sha256 0e859cc03378439023e17ee82aecee5a52265fb38906a8bebf16027aa2b2bcf5 openjdk-11.0.14.1+1.tar.gz +sha256 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472 openjdk-17.0.6+10.tar.gz +sha256 04af71fc7adda41a49861870f9ec0ac0f059c2cf9393ce32995ea8ef4279a1b1 openjdk-11.0.18+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 42d52d57c4..0fe506bbfd 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.2+8 +OPENJDK_VERSION_MINOR = 0.6+10 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.14.1+1 +OPENJDK_VERSION_MINOR = 0.18+10 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) -- 2.39.1 From aduskett at gmail.com Wed Feb 15 22:47:12 2023 From: aduskett at gmail.com (Adam Duskett) Date: Wed, 15 Feb 2023 14:47:12 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/openjdk{-bin}: bump versions to 11.0.18+10 and 17.0.6+10 Message-ID: <20230215224712.487272-1-aduskett@gmail.com> Signed-off-by: Adam Duskett --- v1 -> v2: Add missing openjdk-bin updates package/openjdk-bin/openjdk-bin.hash | 8 ++++---- package/openjdk-bin/openjdk-bin.mk | 4 ++-- ...ARCv2-ISA-processors-support-to-Zero.patch | 20 +++++++++---------- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) rename package/openjdk/{17.0.1+12 => 17.0.6+10}/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch (83%) diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 4d3942125f..241ca34a04 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,10 +1,10 @@ # https://github.com/adoptium/temurin17-binaries/releases -sha256 288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48 OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz -sha256 302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz +sha256 a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289 OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz +sha256 9e0e88bbd9fa662567d0c1e22d469268c68ac078e9e5fe5a7244f56fec71f55f OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz # From https://github.com/adoptium/temurin11-binaries/releases -sha256 43fb84f8063ad9bf6b6d694a67b8f64c8827552b920ec5ce794dfe5602edffe7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz -sha256 79572f5172c6a040591d34632f98a20ed148702bbce2f57649e8ac01c0d2e3db OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14.1_1.tar.gz +sha256 4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz +sha256 04d5eeff6a6449bcdca0f52cd97bafd43ce09d40ef1e73fa0e1add63bea4a9c8 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index 608a0bc3ac..c3eb0b05e6 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_8 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.6_10 else HOST_OPENJDK_BIN_VERSION_MAJOR = 11 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.14.1_1 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.18_10 endif ifeq ($(HOSTARCH),x86_64) diff --git a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 83% rename from package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index 1ef523a419..dfd3b07bea 100644 --- a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -23,8 +23,8 @@ diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 index 5120918aed2..f7a99955874 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 -@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], - BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread" +@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], + fi fi + # Libatomic library @@ -55,7 +55,7 @@ index c0f2446dbd7..dc416ece885 100644 arm*) VAR_CPU=arm VAR_CPU_ARCH=arm -@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], +@@ -563,6 +569,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], HOTSPOT_$1_CPU_DEFINE=PPC64 # The cpu defines below are for zero, we don't support them directly. @@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c index b08caf4d5d3..2bf084895ba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,12 +95,12 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { - static Elf32_Half running_arch_code=EM_RISCV; +@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { + static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ -- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc -+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc +- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc ++ AARCH64, ALPHA, ARC ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc #endif // Identify compatibility class for VM's architecture and library's architecture diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 293787792d..0a67e7a3ec 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2fdd23261526362d4aaf58323441d4c31d29de2e374ba94bbf2727a00adc0ea7 openjdk-17.0.2+8.tar.gz -sha256 0e859cc03378439023e17ee82aecee5a52265fb38906a8bebf16027aa2b2bcf5 openjdk-11.0.14.1+1.tar.gz +sha256 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472 openjdk-17.0.6+10.tar.gz +sha256 04af71fc7adda41a49861870f9ec0ac0f059c2cf9393ce32995ea8ef4279a1b1 openjdk-11.0.18+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 42d52d57c4..0fe506bbfd 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.2+8 +OPENJDK_VERSION_MINOR = 0.6+10 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.14.1+1 +OPENJDK_VERSION_MINOR = 0.18+10 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) -- 2.39.1 From fontaine.fabrice at gmail.com Wed Feb 15 22:49:21 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 15 Feb 2023 23:49:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: libseccomp is mandatory Message-ID: <20230215224921.20138-1-fontaine.fabrice@gmail.com> libseccomp is mandatory since bump to version 23.0.0 in commit 485b47e025541a58358d8852c600b8e7644b4ec6: https://github.com/moby/moby/pull/42501 Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=15321 Signed-off-by: Fabrice Fontaine --- package/docker-engine/Config.in | 10 ++++++++-- package/docker-engine/docker-engine.mk | 7 +------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index b5a356eab9..570b2ff681 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -5,9 +5,12 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # containerd -> runc depends on BR2_USE_MMU # containerd + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # libseccomp select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency + select BR2_PACKAGE_LIBSECCOMP help Docker is a platform to build, ship, and run applications as lightweight containers. @@ -48,8 +51,11 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS endif -comment "docker-engine needs a glibc or musl toolchain w/ threads" +comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 3.17" 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 || BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 depends on BR2_USE_MMU diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 14c6d8d9d6..28ae8365a8 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -10,7 +10,7 @@ DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE -DOCKER_ENGINE_DEPENDENCIES = host-pkgconf +DOCKER_ENGINE_DEPENDENCIES = host-pkgconf libseccomp DOCKER_ENGINE_GOMOD = github.com/docker/docker DOCKER_ENGINE_CPE_ID_VENDOR = mobyproject @@ -31,11 +31,6 @@ DOCKER_ENGINE_DEPENDENCIES += libapparmor DOCKER_ENGINE_TAGS += apparmor endif -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -DOCKER_ENGINE_TAGS += seccomp -DOCKER_ENGINE_DEPENDENCIES += libseccomp -endif - ifeq ($(BR2_INIT_SYSTEMD),y) DOCKER_ENGINE_DEPENDENCIES += systemd DOCKER_ENGINE_TAGS += systemd journald -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 15 22:59:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 15 Feb 2023 23:59:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-marshmallow: add CPE variables Message-ID: <20230215225947.26078-1-fontaine.fabrice@gmail.com> cpe:2.3:a:marshmallow_project:marshmallow is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Amarshmallow_project%3Amarshmallow Signed-off-by: Fabrice Fontaine --- package/python-marshmallow/python-marshmallow.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-marshmallow/python-marshmallow.mk b/package/python-marshmallow/python-marshmallow.mk index 6427296508..ba6da6b29c 100644 --- a/package/python-marshmallow/python-marshmallow.mk +++ b/package/python-marshmallow/python-marshmallow.mk @@ -10,5 +10,7 @@ PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/5e/59/dd465e5a PYTHON_MARSHMALLOW_SETUP_TYPE = setuptools PYTHON_MARSHMALLOW_LICENSE = MIT PYTHON_MARSHMALLOW_LICENSE_FILES = LICENSE +PYTHON_MARSHMALLOW_CPE_ID_VENDOR = marshmallow_project +PYTHON_MARSHMALLOW_CPE_ID_PRODUCT = marshmallow $(eval $(python-package)) -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 15 23:04:13 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 16 Feb 2023 00:04:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-webargs: add CPE variables Message-ID: <20230215230413.28610-1-fontaine.fabrice@gmail.com> cpe:2.3:a:webargs_project:webargs is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Awebargs_project%3Awebargs Signed-off-by: Fabrice Fontaine --- package/python-webargs/python-webargs.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-webargs/python-webargs.mk b/package/python-webargs/python-webargs.mk index e048d8a4ac..ce270842c1 100644 --- a/package/python-webargs/python-webargs.mk +++ b/package/python-webargs/python-webargs.mk @@ -10,5 +10,7 @@ PYTHON_WEBARGS_SITE = https://files.pythonhosted.org/packages/4b/7d/fece8e6547b3 PYTHON_WEBARGS_SETUP_TYPE = setuptools PYTHON_WEBARGS_LICENSE = MIT PYTHON_WEBARGS_LICENSE_FILES = LICENSE +PYTHON_WEBARGS_CPE_ID_VENDOR = webargs_project +PYTHON_WEBARGS_CPE_ID_PRODUCT = webargs $(eval $(python-package)) -- 2.39.0 From cps at microplex.com Thu Feb 16 01:15:23 2023 From: cps at microplex.com (Cem Sezer) Date: Wed, 15 Feb 2023 17:15:23 -0800 Subject: [Buildroot] Having trouble getting a simple cmake based custom package to work In-Reply-To: <40f6ba58-7cda-d062-960f-17ada0c85b24@mind.be> References: <40f6ba58-7cda-d062-960f-17ada0c85b24@mind.be> Message-ID: Hello Arnout, Thank you for your reply. I realize this was a silly question and I did fix it by adding install(TARGETS helloworld_c_cmake DESTINATION bin) to CMakeLists.txt. I appreciate the helpfulness of this community. I have been tinkering with a larger project and am using this one as a reference. Kind regards, Cem On Wed, Feb 15, 2023 at 12:23 PM Arnout Vandecappelle wrote: > > > On 15/02/2023 01:10, Cem Sezer wrote: > > Hello, > > > > I'm looking to continue this thread as I have the exact same problem. > > > > http://lists.busybox.net/pipermail/buildroot/2020-August/591250.html > > > > > > The latest entry in the thread is the following, discussing the error > message > > "/No rule to make target 'install/fast': /is where I'm stuck at the > moment: > > > >>/However, when it is />/trying to install my package I have a new error. > The system seems to be />/looking for a install/fast target, which the > Makefil does not have. / > > I have no idea on that problem. Maybe read the CMake docs again? > > > > https://cmake.org/cmake/help/latest/command/install.html < > https://cmake.org/cmake/help/latest/command/install.html> > > > > Greets > > Alex > > > > I am still new to cmake, but I've been having trouble getting a basic > > helloworld (in C) cmake package to work. I looked at that link above for > the > > cmake docs, but am unfamiliar with what I need to do here. My > CMakeLists.txt > > right now is just the following: > > > > cmake_minimum_required(VERSION 3.1.0) > > > > project(helloworld_c_cmake LANGUAGES C) > > > > set(SOURCES main.c) > > > > add_executable(${PROJECT_NAME} ${SOURCES}) > > Since there is no installation rule in the CMakeLists.txt, the > install/fast > target is not going to be generated. The link above to the cmake > documentation > explains how to add an installation rule. > > Regards, > Arnout > > > > > > > Any pointers in the right direction would be appreciated. Perhaps this > is more > > of a cmake question than a buildroot question, but tying the two > together has > > been confusing, and I'm sure it must be something simple. Thanks in > advance, > > > > Cem > > > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From Afshin.Pir at gallagher.com Thu Feb 16 02:43:30 2023 From: Afshin.Pir at gallagher.com (Afshin Pir) Date: Thu, 16 Feb 2023 02:43:30 +0000 Subject: [Buildroot] Can I enable a config option from command line? Message-ID: Hi When building buildroot, I use a default config file. But there is only 1 option (BR2_ENABLE_RUNTIME_DEBUG=y) which is not in config file by default, and I want to enable it by command line when building buildroot. Is there any way to achieve this? Best Regards, Afshin ________________________________ This email is confidential and may contain information subject to legal privilege. If you are not the intended recipient please advise us of our error by return e-mail then delete this email and any attached files. You may not copy, disclose or use the contents in any way. The views expressed in this email may not be those of Gallagher Group Ltd or subsidiary companies thereof. ________________________________ -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Thu Feb 16 06:46:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 16 Feb 2023 06:46:09 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-15 Message-ID: <20230216064614.ED83E81F8A@smtp1.osuosl.org> Hello, Autobuild statistics for 2023-02-15 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 2 | 2 | 0 | 4 | 2022.11.x | 19 | 21 | 0 | 40 | master | 176 | 172 | 2 | 350 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 14 unknown | 9 gobject-introspection-1.72.0 | 6 host-binutils-2.38 | 6 host-pahole-1.24 | 6 python-numpy-1.23.5 | 5 elfutils-0.186 | 4 gerbera-1.10.0 | 4 host-binutils-2.37 | 4 host-rust-1.67.0 | 4 linux-6.1.11 | 4 olsr-0.9.8 | 4 glibc-2.36-81-g4f4d7a13edfd... | 3 host-go-1.19.6 | 3 libgpg-error-1.46 | 3 pistache-3ec9d7c4f8b828fdd3... | 3 busybox-1.36.0 | 2 containerd-1.6.16 | 2 dmalloc-5.6.5 | 2 fs/ubifs/ubifs.mk:49: /home... | 2 host-binutils-2.39 | 2 host-go-1.19.5 | 2 janet-1.26.0 | 2 libcap-ng-0.8.3 | 2 libglib2-2.72.3 | 2 perl-5.36.0 | 2 php-8.2.2 | 2 quickjs-2021-03-27 | 2 sdl-1.2.15 | 2 systemd-252.4 | 2 uccp420wlan-6.9.1 | 2 ace-7.0.6 | 1 asterisk-16.29.1 | 1 binutils-arc-2020.09-release | 1 docker-cli-23.0.0 | 1 efivar-38 | 1 f2fs-tools-1.15.0 | 1 faad2-2.10.1 | 1 ffmpeg-4.4.3 | 1 fluent-bit-2.0.9 | 1 fontconfig-2.13.1 | 1 fs/romfs/romfs.mk:32: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fwts-22.09.00 | 1 gdal-3.5.2 | 1 gmp-6.2.1 | 1 gobject-introspection | 1 google-breakpad-c85eb4a59b6... | 1 host-gcc-final-12.2.0 | 1 host-gcc-initial-11.3.0 | 1 host-libarchive-3.6.2 | 1 host-runc-1.1.4 | 1 libbytesize-2.7 | 1 libeastl-45469730d641868ce0... | 1 libgcrypt | 1 libgcrypt-1.10.1 | 1 libglvnd-1.4.0 | 1 libgpgme-1.17.1 | 1 libnss-3.88.1 | 1 libtommath-1.2.0 | 1 libuci-4b3db1179747b6a67790... | 1 linux-5.10.162-cip24-rt10 | 1 ltp-testsuite-20220930 | 1 lttng-modules-2.13.7 | 1 luvi-2.13.0 | 1 ne10-1.2.1 | 1 netsniff-ng-0.6.8 | 1 ntp-4.2.8p15 | 1 numactl-2.0.16 | 1 nut-2.8.0 | 1 ocf-linux-20171122 | 1 open-iscsi-2.1.8 | 1 package/multipath-tools/mul... | 1 pcre2-10.42 | 1 php-xdebug-3.0.4 | 1 pv-1.6.20 | 1 ramspeed-2.6.0 | 1 rtl8812au-aircrack-ng-e7a4a... | 1 rtl8821cu-86cc5ceb7c28b9b99... | 1 skalibs-2.12.0.1 | 1 sudo-1.9.12p2 | 1 ti-k3-r5-loader-2022.10 | 1 ulog-0389d243352255f6182326... | 1 valgrind-3.19.0 | 1 wolfssl-5.5.3 | 1 xenomai-3.0.10 | 1 zabbix-6.2.7 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc64 | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/9dee7c09fd7b41d276df0285a0f3dcae1a71f041 | ORPH arc | asterisk-16.29.1 | NOK | http://autobuild.buildroot.net/results/edd90eaf31d82be58f7ed500a85a3ac3f0bdcc26 | arc | binutils-arc-2020.09-release | NOK | http://autobuild.buildroot.net/results/d5095669fca3dab51b6edaa4a637e4ac61fc7f09 | mipsel | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/35c59ac08f0bc6fdc39df8b2a218a51628234641 | ORPH mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/bbc39d279d983d13c17e0c4ea8a3a57190e0f358 | ORPH x86_64 | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/04fb1b05f94f581f5f4b57e360c4980c39bb01d4 | x86_64 | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/ed6b51115da0bab32546a98a0fa0099904c02b57 | powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/ca04d74e204eeeef2032a31d384864130539690b | ORPH i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/564b0c6b7d737cd460f1d807cae2e7715f350164 | ORPH x86_64 | docker-cli-23.0.0 | NOK | http://autobuild.buildroot.net/results/fb892eb343f2912c6bf7e72552eb8c2302fd31c4 | aarch64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/20d5fdce075fe996637a5fac884a62df42cfb7ab | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/28ac1df2acf9fd6d438c67d27e73de29583ba573 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/4cfcaa3245ab76b0680def6cbd736bfea61e82a3 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/5dcbfd961f72f6c0f794c1f6dd6c844526ce09dc | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/43c426b0350561273729c3ddfaedc1ae6fbf4d9b | ORPH or1k | f2fs-tools-1.15.0 | NOK | http://autobuild.buildroot.net/results/395c54dedc7edc97bd866bdff619a01bcd9e74ec | sh4 | faad2-2.10.1 | NOK | http://autobuild.buildroot.net/results/21e55f05bc0b5c0caaa02c86b83cbb52ace570e7 | aarch64 | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/5a8003d832d7797940618038bddee63cda6f4813 | mips | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/f697ada67a6f7f45665f2f9ef938e992cbcb75cc | ORPH sparc64 | fs/romfs/romfs.mk:32: /tmp/... | NOK | http://autobuild.buildroot.net/results/a3f816874bde147c478e89171cc95fca5ea05b62 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/f4ddf4c900d92f88510818092caa1930d550b0b4 | mipsel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/01c7d1dbf2301a5eb270789c9cc4459ed47149e5 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/ab36eac01244c5c23bdaa8aed7e29985082a3caf | sh4eb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/09b849fadab3476b3cce7bcc0139dcff4f544ec7 | arceb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/2a74bbf23ddcae18d160f84c5bacbdfb7ed8e2e2 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/3afbc3deb52c73b110a4d01b048a93b0427612b4 | mips | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/fe79afaa525785565385b1ad553f9059dcfa2d2e | sparc | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/114dc758207d617072b67d7c8432b357ce6dedb4 | x86_64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/6d3873761d80a8cf727231290426cdc165f96964 | aarch64 | fwts-22.09.00 | NOK | http://autobuild.buildroot.net/results/007ed25ac8689801dd95a15ea2a2fdac70f8ec46 | sh4aeb | gdal-3.5.2 | NOK | http://autobuild.buildroot.net/results/2ddcfaf126f86d37b5c343b87173f5759fe68dcf | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/b0c70e27eca65892a5220cfd9ada62c2e4beca1b | microblaze | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/6cbb6a7627d28da11a942076d7372e80e1122388 | powerpc | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/d7933c062904ffac486d7b6fc99845757b193734 | riscv64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/db582b9c53485c665f9f76b9e8103a34afb4e59a | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/7a8fb93a1598c356d5e034a3a504fa2fddbeae73 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/c6d6759e37987ff38659b306b7dada8f063d98da | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e355df7965a7e2ac0a785234c0ac88ecef1a46cc | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/7a025d36a2d80a572ac149997ab2b0f86d95f71c | ORPH aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/71e49ffc3f3bfb61778eb4513fc955bc94e7d003 | mips | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/558ec000cb42b0e01f4c3adb36b5b5a4392547e4 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/d0d3f84f734878799323c2bc5b4f93f2265ba9d2 | powerpc64le | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9c31284d7938120c85331209cd16d4b5b4fd9126 | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/8f86c366c190164241afb633456e44d5fc0edc8d | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/650bb8155b416d7e4fe39d66111db3a3a69828c3 | sh4aeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9ddfdfb65c93c0c294e7f6de92bae33298fad931 | arm | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a5267685e4f59ac91026d855b3659d11dcb97ec5 | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9cc154310710ed0dc617205e25d614542b7bb776 | sparc | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/612d91c134e383ab1fa124fc56561cd5803350b5 | m68k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9a4b09625ec3bac6eb705294b610e06f70df83c2 | i686 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ce63a0fc33c013e2a3fb9324e5d1a60ea1f2fdb0 | mips64el | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/370f2a6f70d934445053d7d6ad310ee89690ef1a | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a729120c817cc3c622c4ffebabc0bce81768c6af | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/3964a399be9c56beca82915e36f5bbcd6332ab2a | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/bb0e1f8db351a97e115705821f17db1ff18be563 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8676a8d36e73a8602543815d7b1bdc70fbe2f12e | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/114c2c647c064edf6494c03f2aa159908dd854d1 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/db3ff08df89f905c17a568eae4318ef061684921 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/053f7b5920992c55692a993fc902cceb53d00d93 | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/348949355ea2921bf1cb20eaa0a6aa769aee275a | ORPH arm | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/9ebc690eb3bed788dc5252639c99c91aad335802 | armeb | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/c2c742ccc125980d88116c0c777fc007aa346fb6 | microblazeel | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/e3c4784a64acdec47c554f779b5e370284b65213 | mips64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/66f3ef307cb08d595213c0e10643f0d1356ad9c1 | mipsel | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/30221c558845fd3eb7a8aa81e064e77bb9edc997 | powerpc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/ed943af65e7b7042baf101f055f122aa4fd993ab | sh4a | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6f40bfc68fc80b8dd1963ecb35499189a5e131da | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/b27edb2fb36cc90c074934bb71e67436c63426f0 | powerpc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1fe1f648fe816cacd7bae26d1a137ceeb486aad9 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/48e8d30ce201499453a715aacfdcc6c58d71ebf6 | mips64el | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/13a81e35b4f6f20e543209685c5a0f19daa9d524 | sparc64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/f6b2611f2a85a2b898776238dc65d8bae64f85e5 | or1k | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/6761c39ed46dbde67a5802d1f6ecc77e35c227fd | armeb | host-gcc-final-12.2.0 | NOK | http://autobuild.buildroot.net/results/c2716aab33032c359066adbfcf4cb43bcfc188c5 | aarch64_be | host-gcc-initial-11.3.0 | NOK | http://autobuild.buildroot.net/results/bc2a4fc35f9046c129ddb466620297a5510b69d2 | aarch64_be | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/fdabf629cc9804a8adce13d224f02c25b929b94a | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/1005227f1187703c6e41347aaf46f9e971fab5bf | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/831b282445ac3a6ea84c9175426afb548265fbed | aarch64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/fde8e1bd837cb7006b6d4652bc45a14f25a2a834 | riscv64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/ffa6f19195a9c4577f40379c457b390d4211ba68 | riscv64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/1348173539dd09d4e4ed4e45f539f3596be1708f | m68k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/0e6181ac6db1d0b9fc5c7c5f145208b8c5e9b1a5 | xtensa | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/dcada09cb1f17294b07d9c5bc215a07613004843 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1263b7d898db47d050ae5fc803b557f462e26749 | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/6354c390fb8ffede7f4f0480bc943f323f1b0bf6 | s390x | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/19d0010080d12aae4eef347ed58513aace5f8951 | sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/fa0b8293b4ac25a0edc7fe941fa4f181801362a0 | microblaze | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/bfa50d8c1bf3adbf8092871f828f9bf77181314b | mips | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/c8f86e360bcfdf801bb1d043b8761c41f65adc39 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/1f38aaaed7b9b0fc72f551d250c1ff68f3a69fe9 | mips | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/5fe1501db6e9cca674d1c02696cd405d10d5f2ce | arm | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/6ab84de8c6aa656136896fee5b2ba9f8d4f56c36 | arm | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/ae9d8d27c76f0e20972c7874ef0246eec0cf5aab | arm | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/a2b40adb93b751221ba2cdf9a705f86c30499021 | arceb | libbytesize-2.7 | NOK | http://autobuild.buildroot.net/results/f8f12e584b01c33e9b28f2ad04bbf980ccaff576 | ORPH riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/ef5c3a28f3b207278b841e57ffc3cc97a1430acb | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/adf960f787d5552cfaa12c577f291bf3169d7b57 | powerpc | libeastl-45469730d641868ce0... | NOK | http://autobuild.buildroot.net/results/10ac7290112bfbf7b5d8da900c297bd65043b6a6 | ORPH arm | libgcrypt | TIM | http://autobuild.buildroot.net/results/7cca6a3d6aa8706d43ab32f1520891e1c0625558 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/b76290dbff3591b66d691da3bed1d6bcc0abe4d8 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/e37b9205ff33b1582aab9ca5e31f9fda30df428d | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/17f95aec4105e85dbd6d1528f6e7aff955d20b12 | microblaze | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/dbf03d1da34bbadab6bc4185e33eeaaf2821697a | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/d9ed87d42ea45a93539990169903d83cb07e7307 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/07c84368de3aca4af2cdc797d8ab24ed5c3d86cb | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/8548fbcb56cc7c94657998565299c89bccc897f9 | ORPH nios2 | libgpgme-1.17.1 | NOK | http://autobuild.buildroot.net/results/23849de6eb48fc48f3ee183392a8769d953309ce | ORPH powerpc | libnss-3.88.1 | NOK | http://autobuild.buildroot.net/results/4e74dffc2c9e99c7afe4fce01f92fa218f787924 | arceb | libtommath-1.2.0 | NOK | http://autobuild.buildroot.net/results/56d68bb58b2b73af8bc684e43d0bb9fb971b23c8 | mipsel | libuci-4b3db1179747b6a67790... | NOK | http://autobuild.buildroot.net/results/1afb8ea81fc2f465b4db48f39ab0cdb346c759fe | nios2 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/b7140d4a80341e61cc8ec02e162cd1664853e210 | ORPH powerpc | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4b4edb08df2f3dc43eddd5c736be3a1d39262fbf | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/71c4623660a7b2870d14a07c373e2da2293a19a9 | ORPH arm | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/8eb868da489b6d2466482ed6835413d660435b55 | ORPH sh4 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/96e2d05665618db9becc1a6e64ce57b12e11b362 | ORPH x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/279978413aaf705449021240d077f728be3b3a42 | sparc64 | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/2079df94060d516eb9f6d2e9c75cc5a82d7bb3fc | aarch64_be | luvi-2.13.0 | NOK | http://autobuild.buildroot.net/results/826aa550f3d4708012a0b3988e2ba7079a6ae67d | ORPH aarch64 | ne10-1.2.1 | NOK | http://autobuild.buildroot.net/results/fb4f8a89be41c63ebfaa3cbb3498be863528277d | s390x | netsniff-ng-0.6.8 | NOK | http://autobuild.buildroot.net/results/5e90a5776ba1e4ab70e426710516024f0adb1be3 | riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/3655f09519fe0b0f568163924654e81c5ff12e82 | ORPH or1k | numactl-2.0.16 | NOK | http://autobuild.buildroot.net/results/f3bf23693ac4bf1e7502d43812fdce7af56e8a7d | armeb | nut-2.8.0 | NOK | http://autobuild.buildroot.net/results/4b47b15f44c8c5c163b0ec5ad23be962126b4195 | arceb | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/45a37b89375253d0bc643107c75a580979f62f82 | ORPH mips | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/0a2e9480512d73a6c7909f4eeda68a1fe5d8fd96 | ORPH arm | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/3fe72e5033b226abebbdb379d4cd0955896ae7e1 | ORPH powerpc64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/8f6995ecd0f6d6fb45ced55a3c5bcd26356ef828 | ORPH sh4 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/aeedbefdd815fdad7984890d2bb30254fc4a4412 | ORPH aarch64_be | open-iscsi-2.1.8 | NOK | http://autobuild.buildroot.net/results/2824c76a36b52eef4db0710e92635b31ddb0ebbc | mipsel | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/ab93da32395b927bd842b719ad420e897c2cae03 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/e209b583b19f7dfc77e369526f17186ea9150881 | ORPH arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/596bb2308a17d81907e25fd8184e38921a977347 | x86_64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/5ec54e6532511d2d7727a1682f057a837d5abb96 | or1k | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/970e569067040816150f532ef73a1716535a746d | microblaze | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/1eef48630c73124fe839630ea76d5834c94a3699 | mips | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/74a70b905738f6c9fb749bc20d638cc56a38ae98 | sparc | pistache-3ec9d7c4f8b828fdd3... | NOK | http://autobuild.buildroot.net/results/2bcf650d5d807b754cb578d11064168475c3ba0e | ORPH powerpc64le | pistache-3ec9d7c4f8b828fdd3... | NOK | http://autobuild.buildroot.net/results/07bc9c3a0534925dfdb69eccdc17e3e248d902c8 | ORPH powerpc64le | pistache-3ec9d7c4f8b828fdd3... | NOK | http://autobuild.buildroot.net/results/9252c91ba8a6a70aa84b8af5b3297e5a949bbd78 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/88a8a4dccafd5423cc8c3240d90f9ae4b412e8f4 | ORPH mips | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/bfcf764b4e7a2de3548358acef05f3ca06b426ee | sh4aeb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/d29b531c6ae27c1fff8199d9cf478d555ffc461d | arm | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/096ce470b745ccebe739d7ddf3374bbf6cc6d432 | armeb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/80f902b9cf65dd9d99e5db4647d6d0284a990e63 | i686 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/76203c0f16442b0e7174dc29b6bf863eecee10fa | microblaze | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/4f82a8fc3e2545198594bc8228c95649bb6cf0c6 | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/3c1a5695721fa86fccc9444d271d3e04df88c7a7 | sh4 | ramspeed-2.6.0 | NOK | http://autobuild.buildroot.net/results/63021e4c7a7e6149fdc8d900bce3e1c9f5fec8c7 | ORPH riscv32 | rtl8812au-aircrack-ng-e7a4a... | NOK | http://autobuild.buildroot.net/results/c68c83efbec390a2f39b7784e99ae300cf568963 | s390x | rtl8821cu-86cc5ceb7c28b9b99... | NOK | http://autobuild.buildroot.net/results/9703c3067acc6de5d5c90e26867c61ef31415b1a | sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/76152e101e5fc47dbce0506dd40cc2d8313f4f82 | ORPH sh4eb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/201453b922cfe2526ce3d0cdcc81bd6041f7f744 | ORPH or1k | skalibs-2.12.0.1 | NOK | http://autobuild.buildroot.net/results/3c1cff653bb292c4b21c09d666dc133362f541ef | sparc | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/df6fb63ed00b8ecba58dd87e5c1f3eb6acd1512a | ORPH sh4aeb | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/2e590d737a6d87af621cb2efbd340a51a084c62a | aarch64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/5aa4e1c4b33c1f7bbc0fc3005a167683ee0b1cf1 | aarch64 | ti-k3-r5-loader-2022.10 | NOK | http://autobuild.buildroot.net/results/5a6fcf5240a480ae95fcc813cf8bbc86ce971bfc | powerpc64le | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/4c3c2e73503e9853a0438152eedba8c2b4e1fb03 | ORPH aarch64_be | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/f5f24537d2eb61c6b6153fb2a7449cc5cc21f397 | ORPH mips | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/50e0a33f098ea65c98166e03ae7a2e54b755bea7 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/752882340cb98262dcb30fe8de44d75d551ae5ab | or1k | unknown | NOK | http://autobuild.buildroot.net/results/9a0a20fb626388cccb0d8d74cc18bb460b020dd6 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/3358fdbf5a3f085c61a5fac3530a1eb319521617 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/00064694f299645b93d9cf32d306902a2629f209 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/da19efbcd7e59fbc2a17fed8eb6844f44f49149d | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/1e57940eb7befbc3e195331de641d8c97683f8b5 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/ed28778ccfdddc3024295b556fd61c4b04cc44ac | m68k | unknown | NOK | http://autobuild.buildroot.net/results/64756b7c39d58970b92699592d00ed7c715c3db6 | sparc | unknown | NOK | http://autobuild.buildroot.net/results/4e717ecc9cf4ec499a38cae02a70fd83e5439747 | powerpc | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/dd12aad7d0fbd1715e99a4947a6ad03943132b1c | ORPH mips | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/2726191bf46eabd7d07f166c5cc3b10ba12958c9 | i686 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/64a1bacec2b269edd7c860bf95ea30ed7a446001 | or1k | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/140700d627d2bd2e434043004245417a2a6ff24d | Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 1 xxhash-0.8.1 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- s390x | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/41c09230991e92b72d253fe367a6f3f7dafcc223 | xtensa | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/88d82df24df5a97786a1660b17b821d94f7d77d5 | ORPH Classification of failures by reason for 2022.11.x -------------------------------------------------- zabbix-5.4.9 | 2 alsa-lib-1.2.8 | 1 bind-9.16.33 | 1 cmocka-1.1.5 | 1 gerbera-1.10.0 | 1 google-breakpad-c85eb4a59b6... | 1 heirloom-mailx-12.5 | 1 host-binutils-2.38 | 1 host-go-1.19.5 | 1 host-pahole-1.24 | 1 jailhouse-0.12 | 1 libglib2-2.72.3 | 1 lirc-tools-0.10.2 | 1 php-8.1.14 | 1 protobuf-21.8 | 1 unknown | 1 wolfssl-5.5.3 | 1 xfsprogs-5.14.2 | 1 xxhash-0.8.1 | 1 zeek-4.1.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64le | alsa-lib-1.2.8 | NOK | http://autobuild.buildroot.net/results/de5d3c180ab51fb0f19b4551b60c6884baaf9192 | sh4a | bind-9.16.33 | NOK | http://autobuild.buildroot.net/results/2be53d1fc13680c7cc31196dbb735034987e8121 | ORPH powerpc64le | cmocka-1.1.5 | NOK | http://autobuild.buildroot.net/results/8326373f22cce83ebcd7aea0a219a45e4645cf7a | s390x | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/faba16c36c273c11a74560919362e5666787d711 | arm | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/5e78ef3d8f127caf3fccf39e593dd1e69e893513 | sh4eb | heirloom-mailx-12.5 | NOK | http://autobuild.buildroot.net/results/864bdaa0b383f9a08f8ae98a8ffe4bc818332302 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/93f87ab4a0fb73fe12a04de2ff929c816c963f93 | aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/bb678da4257cc242a11064ab833f70c41e7bc7f4 | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/146c0f3b2f77433d9fae537b5a58796b46497d9e | x86_64 | jailhouse-0.12 | NOK | http://autobuild.buildroot.net/results/d1214a859b16f20245c1a9233789f6e0288f1327 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/4222a8780f024080418030a42953829feb9f1e7f | mips64el | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/b1c5adf9f0217e103022b8ffbd7eb17f273e43c3 | ORPH microblaze | php-8.1.14 | NOK | http://autobuild.buildroot.net/results/4ceb4260eb65dbd93030b660b95610b5176618a5 | m68k | protobuf-21.8 | NOK | http://autobuild.buildroot.net/results/79def34b9ab4a8ed31fdeeaa7bec01d2463dbe8c | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/d20ef9c42d0947969ce5a26b31d74254fcc7b584 | riscv32 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/c39291824fd024720742331d215b658b6f85bdd4 | mipsel | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/9cbcf60f60fe53708dc903f89281a8a510e77ca4 | ORPH mips64el | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/9270aea763bbddfc85fe9cd9c5e9066ace1ba1ab | ORPH nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/2168e3a8a87f05b7795622b26ede3bb5200846d7 | mips64el | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/1e1aa4d154fb54118a237886a524cb6a5cffa591 | x86_64 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/adfb64477ed6b5a08341f3bbfcbb9d7c16fcd855 | Gitlab CI results for 2023-02-15 ================================ -- http://autobuild.buildroot.net From nolange79 at gmail.com Thu Feb 16 08:47:13 2023 From: nolange79 at gmail.com (Norbert Lange) Date: Thu, 16 Feb 2023 09:47:13 +0100 Subject: [Buildroot] [PATCH v2] package/zstd: bump to version 1.5.4 Message-ID: <20230216084714.85507-1-nolange79@gmail.com> The LICENSE text has changed, nominally the copyright owner changed from "Facebook" to "Meta Platforms, Inc. and affiliates", reflecting the name change of that company. Add upstream patch to fix zstd-dll build. Signed-off-by: Norbert Lange --- v1->v2: recreate upstream patch with git-formatpatch --- ...-dll-build-missing-dependencies-3496.patch | 321 ++++++++++++++++++ package/zstd/zstd.hash | 6 +- package/zstd/zstd.mk | 2 +- 3 files changed, 325 insertions(+), 4 deletions(-) create mode 100644 package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch diff --git a/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch new file mode 100644 index 0000000000..60737159c6 --- /dev/null +++ b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch @@ -0,0 +1,321 @@ +From e47c7c0d5a923dcdc3b302f9944eb4a70b7ee0be Mon Sep 17 00:00:00 2001 +From: Yonatan Komornik <11005061+yoniko at users.noreply.github.com> +Date: Sun, 12 Feb 2023 12:32:31 -0800 +Subject: [PATCH] Fix zstd-dll build missing dependencies (#3496) + +* Fixes zstd-dll build (https://github.com/facebook/zstd/issues/3492): +- Adds pool.o and threading.o dependency to the zstd-dll target +- Moves custom allocation functions into header to avoid needing to add dependency on common.o +- Adds test target for zstd-dll +- Adds github workflow that buildis zstd-dll + +[nolange79: backport from upstream c78f434aa4f5f1097c8edb975f4c1635817a5a71] +Signed-off-by: Norbert Lange +--- + .github/workflows/dev-short-tests.yml | 9 +++- + contrib/linux-kernel/zstd_common_module.c | 3 -- + lib/common/allocations.h | 55 +++++++++++++++++++++++ + lib/common/pool.c | 2 +- + lib/common/zstd_common.c | 35 --------------- + lib/common/zstd_internal.h | 5 --- + lib/compress/zstd_compress.c | 1 + + lib/compress/zstd_cwksp.h | 1 + + lib/compress/zstdmt_compress.c | 1 + + lib/decompress/zstd_ddict.c | 1 + + lib/decompress/zstd_decompress.c | 1 + + programs/Makefile | 2 +- + tests/Makefile | 8 +++- + 13 files changed, 76 insertions(+), 48 deletions(-) + create mode 100644 lib/common/allocations.h + +diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml +index 132dbb99..3ae2e9da 100644 +--- a/.github/workflows/dev-short-tests.yml ++++ b/.github/workflows/dev-short-tests.yml +@@ -55,6 +55,14 @@ jobs: + run: | + make c89build V=1 + ++ build-zstd-dll: ++ runs-on: ubuntu-latest ++ steps: ++ - uses: actions/checkout at ac593985615ec2ede58e132d2e21d2b1cbd6127c # tag=v3 ++ - name: build zstd bin against a dynamic lib (debuglevel for more dependencies) ++ run: | ++ make -C lib lib-mt-release ++ DEBUGLEVEL=2 make -C programs zstd-dll + + gcc-7-libzstd: + runs-on: ubuntu-latest +@@ -328,7 +336,6 @@ jobs: + make -j -C programs allVariants MOREFLAGS=-O0 + ./tests/test-variants.sh + +- + qemu-consistency: + name: QEMU ${{ matrix.name }} + runs-on: ubuntu-20.04 +diff --git a/contrib/linux-kernel/zstd_common_module.c b/contrib/linux-kernel/zstd_common_module.c +index 2fead39e..466828e3 100644 +--- a/contrib/linux-kernel/zstd_common_module.c ++++ b/contrib/linux-kernel/zstd_common_module.c +@@ -24,9 +24,6 @@ EXPORT_SYMBOL_GPL(HUF_readStats_wksp); + EXPORT_SYMBOL_GPL(ZSTD_isError); + EXPORT_SYMBOL_GPL(ZSTD_getErrorName); + EXPORT_SYMBOL_GPL(ZSTD_getErrorCode); +-EXPORT_SYMBOL_GPL(ZSTD_customMalloc); +-EXPORT_SYMBOL_GPL(ZSTD_customCalloc); +-EXPORT_SYMBOL_GPL(ZSTD_customFree); + + MODULE_LICENSE("Dual BSD/GPL"); + MODULE_DESCRIPTION("Zstd Common"); +diff --git a/lib/common/allocations.h b/lib/common/allocations.h +new file mode 100644 +index 00000000..a3153c4b +--- /dev/null ++++ b/lib/common/allocations.h +@@ -0,0 +1,55 @@ ++/* ++ * Copyright (c) Meta Platforms, Inc. and affiliates. ++ * All rights reserved. ++ * ++ * This source code is licensed under both the BSD-style license (found in the ++ * LICENSE file in the root directory of this source tree) and the GPLv2 (found ++ * in the COPYING file in the root directory of this source tree). ++ * You may select, at your option, one of the above-listed licenses. ++ */ ++ ++/* This file provides custom allocation primitives ++ */ ++ ++#define ZSTD_DEPS_NEED_MALLOC ++#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ ++ ++#include "mem.h" /* MEM_STATIC */ ++#define ZSTD_STATIC_LINKING_ONLY ++#include "../zstd.h" /* ZSTD_customMem */ ++ ++#ifndef ZSTD_ALLOCATIONS_H ++#define ZSTD_ALLOCATIONS_H ++ ++/* custom memory allocation functions */ ++ ++MEM_STATIC void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) ++ return customMem.customAlloc(customMem.opaque, size); ++ return ZSTD_malloc(size); ++} ++ ++MEM_STATIC void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) { ++ /* calloc implemented as malloc+memset; ++ * not as efficient as calloc, but next best guess for custom malloc */ ++ void* const ptr = customMem.customAlloc(customMem.opaque, size); ++ ZSTD_memset(ptr, 0, size); ++ return ptr; ++ } ++ return ZSTD_calloc(1, size); ++} ++ ++MEM_STATIC void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) ++{ ++ if (ptr!=NULL) { ++ if (customMem.customFree) ++ customMem.customFree(customMem.opaque, ptr); ++ else ++ ZSTD_free(ptr); ++ } ++} ++ ++#endif /* ZSTD_ALLOCATIONS_H */ +diff --git a/lib/common/pool.c b/lib/common/pool.c +index f3d9d085..d5ca5a78 100644 +--- a/lib/common/pool.c ++++ b/lib/common/pool.c +@@ -10,9 +10,9 @@ + + + /* ====== Dependencies ======= */ ++#include "../common/allocations.h" /* ZSTD_customCalloc, ZSTD_customFree */ + #include "zstd_deps.h" /* size_t */ + #include "debug.h" /* assert */ +-#include "zstd_internal.h" /* ZSTD_customCalloc, ZSTD_customFree */ + #include "pool.h" + + /* ====== Compiler specifics ====== */ +diff --git a/lib/common/zstd_common.c b/lib/common/zstd_common.c +index 32085524..3f04c22a 100644 +--- a/lib/common/zstd_common.c ++++ b/lib/common/zstd_common.c +@@ -14,7 +14,6 @@ + * Dependencies + ***************************************/ + #define ZSTD_DEPS_NEED_MALLOC +-#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ + #include "error_private.h" + #include "zstd_internal.h" + +@@ -47,37 +46,3 @@ ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); } + /*! ZSTD_getErrorString() : + * provides error code string from enum */ + const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); } +- +- +- +-/*=************************************************************** +-* Custom allocator +-****************************************************************/ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) +- return customMem.customAlloc(customMem.opaque, size); +- return ZSTD_malloc(size); +-} +- +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) { +- /* calloc implemented as malloc+memset; +- * not as efficient as calloc, but next best guess for custom malloc */ +- void* const ptr = customMem.customAlloc(customMem.opaque, size); +- ZSTD_memset(ptr, 0, size); +- return ptr; +- } +- return ZSTD_calloc(1, size); +-} +- +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) +-{ +- if (ptr!=NULL) { +- if (customMem.customFree) +- customMem.customFree(customMem.opaque, ptr); +- else +- ZSTD_free(ptr); +- } +-} +diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h +index 37836dc7..1f942f27 100644 +--- a/lib/common/zstd_internal.h ++++ b/lib/common/zstd_internal.h +@@ -350,11 +350,6 @@ typedef struct { + const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx); /* compress & dictBuilder */ + int ZSTD_seqToCodes(const seqStore_t* seqStorePtr); /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */ + +-/* custom memory allocation functions */ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem); +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem); +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem); +- + + /* ZSTD_invalidateRepCodes() : + * ensures next compression will not use repcodes from previous block. +diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c +index b55f684c..173ce242 100644 +--- a/lib/compress/zstd_compress.c ++++ b/lib/compress/zstd_compress.c +@@ -11,6 +11,7 @@ + /*-************************************* + * Dependencies + ***************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* INT_MAX, ZSTD_memset, ZSTD_memcpy */ + #include "../common/mem.h" + #include "hist.h" /* HIST_countFast_wksp */ +diff --git a/lib/compress/zstd_cwksp.h b/lib/compress/zstd_cwksp.h +index 97676693..9113cdbd 100644 +--- a/lib/compress/zstd_cwksp.h ++++ b/lib/compress/zstd_cwksp.h +@@ -14,6 +14,7 @@ + /*-************************************* + * Dependencies + ***************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ + #include "../common/zstd_internal.h" + + #if defined (__cplusplus) +diff --git a/lib/compress/zstdmt_compress.c b/lib/compress/zstdmt_compress.c +index 7a2c7172..bf2de4a7 100644 +--- a/lib/compress/zstdmt_compress.c ++++ b/lib/compress/zstdmt_compress.c +@@ -20,6 +20,7 @@ + + + /* ====== Dependencies ====== */ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memset, INT_MAX, UINT_MAX */ + #include "../common/mem.h" /* MEM_STATIC */ + #include "../common/pool.h" /* threadpool */ +diff --git a/lib/decompress/zstd_ddict.c b/lib/decompress/zstd_ddict.c +index ad5c34a7..309ec0d0 100644 +--- a/lib/decompress/zstd_ddict.c ++++ b/lib/decompress/zstd_ddict.c +@@ -14,6 +14,7 @@ + /*-******************************************************* + * Dependencies + *********************************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ + #include "../common/cpu.h" /* bmi2 */ + #include "../common/mem.h" /* low level memory routines */ +diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c +index d487966c..3f3ca57c 100644 +--- a/lib/decompress/zstd_decompress.c ++++ b/lib/decompress/zstd_decompress.c +@@ -55,6 +55,7 @@ + /*-******************************************************* + * Dependencies + *********************************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ + #include "../common/mem.h" /* low level memory routines */ + #define FSE_STATIC_LINKING_ONLY +diff --git a/programs/Makefile b/programs/Makefile +index fcff41dc..8507abef 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -225,7 +225,7 @@ zstd-noxz : zstd + .PHONY: zstd-dll + zstd-dll : LDFLAGS+= -L$(LIBZSTD) + zstd-dll : LDLIBS += -lzstd +-zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c ++zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c pool.c threading.c + zstd-dll : zstd + + +diff --git a/tests/Makefile b/tests/Makefile +index 3eed19ea..778c7d67 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -95,7 +95,7 @@ allnothread: fullbench fuzzer paramgrill datagen decodecorpus + dll: fuzzer-dll zstreamtest-dll + + .PHONY: zstd zstd32 zstd-nolegacy # only external makefile knows how to build or update them +-zstd zstd32 zstd-nolegacy: ++zstd zstd32 zstd-nolegacy zstd-dll: + $(MAKE) -C $(PRGDIR) $@ MOREFLAGS+="$(DEBUGFLAGS)" + + .PHONY: libzstd +@@ -328,13 +328,17 @@ test-all: test test32 test-decodecorpus-cli + test-zstd: ZSTD = $(PRGDIR)/zstd + test-zstd: zstd + ++.PHONY: test-zstd-dll ++test-zstd-dll: ZSTD = $(PRGDIR)/zstd ++test-zstd-dll: zstd-dll ++ + test-zstd32: ZSTD = $(PRGDIR)/zstd32 + test-zstd32: zstd32 + + test-zstd-nolegacy: ZSTD = $(PRGDIR)/zstd-nolegacy + test-zstd-nolegacy: zstd-nolegacy + +-test-zstd test-zstd32 test-zstd-nolegacy: datagen ++test-zstd test-zstd32 test-zstd-nolegacy test-zstd-dll: datagen + file $(ZSTD) + EXE_PREFIX="$(QEMU_SYS)" ZSTD_BIN="$(ZSTD)" DATAGEN_BIN=./datagen ./playTests.sh $(ZSTDRTTEST) + +-- +2.39.1 + diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index eca44b89f0..ca4e2fa0b9 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,6 +1,6 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 -sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.gz.sha256 +sha256 0f470992aedad543126d06efab344dc5f3e171893810455787d38347343a4424 zstd-1.5.4.tar.gz # License files (locally computed) -sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE +sha256 7055266497633c9025b777c78eb7235af13922117480ed5c674677adc381c9d8 LICENSE sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 73bb97a793..45e8bf1bc2 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.2 +ZSTD_VERSION = 1.5.4 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 -- 2.39.1 From thomas at devoogdt.com Thu Feb 16 09:26:16 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 16 Feb 2023 10:26:16 +0100 Subject: [Buildroot] [PATCH] package/lighttpd: bump to version 1.4.69 Message-ID: <20230216092616.2973294-1-thomas.devoogdt@barco.com> Changelog: - https://www.lighttpd.net/2023/1/3/1.4.68/ - https://www.lighttpd.net/2023/2/10/1.4.69/ In this commit: - rebased patch & dropped server.use-ipv6 option [2] - fix changed meson options [1] [1]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/376d20f1617f2c0202fb415e4cc66d3f780db5ca [2]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/6b31f76cd9b36b6033607181238fbf41c5b81e07 Signed-off-by: Thomas Devoogdt --- ...lt-lighttpd-configuration-file-to-ha.patch | 33 ++++------ package/lighttpd/lighttpd.hash | 4 +- package/lighttpd/lighttpd.mk | 64 +++++++++---------- 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch index 1a887655b8..2eab2a84e5 100644 --- a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +++ b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch @@ -1,11 +1,11 @@ -From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001 +From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Dec 2021 22:07:17 +0100 Subject: [PATCH] Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames - * Disable IPv6 + * Disable IPv6 (Dropped since 1.4.68) * Do not setuid to a user that doesn't exist on the system * Change the network backend to writev since linux-sendfile fails on buildroot @@ -13,13 +13,15 @@ Signed-off-by: Maxime Ripard Signed-off-by: Simon Dawson [Gustavo: update for 1.4.37] Signed-off-by: Gustavo Zacarias +[Thomas: update for 1.4.69 - drop server.use-ipv6] +Signed-off-by: Thomas Devoogdt --- doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) + doc/config/lighttpd.conf | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf -index e685d43..92cff4f 100644 +index e685d437..92cff4f0 100644 --- a/doc/config/conf.d/access_log.conf +++ b/doc/config/conf.d/access_log.conf @@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) @@ -32,7 +34,7 @@ index e685d43..92cff4f 100644 ## ## The default format produces CLF compatible output. diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index 495d2a1..c3e1446 100644 +index d45a284d..4e926d5a 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -13,8 +13,8 @@ @@ -46,16 +48,7 @@ index 495d2a1..c3e1446 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ server.port = 80 - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" +@@ -97,8 +97,8 @@ server.port = 80 ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -66,7 +59,7 @@ index 495d2a1..c3e1446 100644 ## ## Enable lighttpd to serve requests on sockets received from systemd -@@ -118,7 +118,7 @@ server.groupname = "lighttpd" +@@ -114,7 +114,7 @@ server.groupname = "lighttpd" ## ## Document root ## @@ -75,7 +68,7 @@ index 495d2a1..c3e1446 100644 ## ## The value for the "Server:" response field. -@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid" +@@ -140,7 +140,7 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## @@ -84,7 +77,7 @@ index 495d2a1..c3e1446 100644 ## ## If you want to log to syslog you have to unset the -@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf" +@@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf" ## and write(). Every modern OS provides its own syscall to help network ## servers transfer files as fast as possible ## @@ -94,5 +87,5 @@ index 495d2a1..c3e1446 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.34.1 +2.39.0 diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 8353857ad9..29bf5124b6 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.67.sha512sum -sha512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627 lighttpd-1.4.67.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum +sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index d3440040fb..ca2035b6b3 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).67 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -13,49 +13,49 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=false \ - -Dwith_fam=false \ + -Dwith_dbi=disabled \ + -Dwith_fam=disabled \ -Dwith_gnutls=false \ - -Dwith_libev=false \ - -Dwith_libunwind=false \ + -Dwith_libev=disabled \ + -Dwith_libunwind=disabled \ -Dwith_mbedtls=false \ -Dwith_nettle=false \ -Dwith_nss=false \ - -Dwith_pcre=false \ - -Dwith_sasl=false \ + -Dwith_pcre=disabled \ + -Dwith_sasl=disabled \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=true \ + -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli -LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +LIGHTTPD_CONF_OPTS += -Dwith_brotli=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +LIGHTTPD_CONF_OPTS += -Dwith_bzip=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 -LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +LIGHTTPD_CONF_OPTS += -Dwith_krb5=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) LIGHTTPD_DEPENDENCIES += openldap -LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +LIGHTTPD_CONF_OPTS += -Dwith_ldap=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) @@ -67,16 +67,16 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) LIGHTTPD_DEPENDENCIES += libmaxminddb -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mysql -LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) @@ -88,9 +88,9 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += -Dwith_pam=true +LIGHTTPD_CONF_OPTS += -Dwith_pam=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pam=false +LIGHTTPD_CONF_OPTS += -Dwith_pam=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) @@ -102,36 +102,36 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) LIGHTTPD_DEPENDENCIES += postgresql -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=enabled ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=enabled LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=disabled endif else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true +LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) LIGHTTPD_DEPENDENCIES += zstd -LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +LIGHTTPD_CONF_OPTS += -Dwith_zstd=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +LIGHTTPD_CONF_OPTS += -Dwith_zstd=disabled endif define LIGHTTPD_INSTALL_CONFIG -- 2.39.0 From thomas at devoogdt.com Thu Feb 16 09:41:02 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 16 Feb 2023 10:41:02 +0100 Subject: [Buildroot] [PATCH v2] package/lighttpd: bump to version 1.4.69 Message-ID: <20230216094102.2984308-1-thomas.devoogdt@barco.com> Changelog: - https://www.lighttpd.net/2023/1/3/1.4.68/ - https://www.lighttpd.net/2023/2/10/1.4.69/ In this commit: - rebased patch & dropped server.use-ipv6 option [1] - fix changed meson options [2] [1]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/376d20f1617f2c0202fb415e4cc66d3f780db5ca [2]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/6b31f76cd9b36b6033607181238fbf41c5b81e07 Signed-off-by: Thomas Devoogdt --- v2: fix git message url links --- ...lt-lighttpd-configuration-file-to-ha.patch | 33 ++++------ package/lighttpd/lighttpd.hash | 4 +- package/lighttpd/lighttpd.mk | 64 +++++++++---------- 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch index 1a887655b8..2eab2a84e5 100644 --- a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +++ b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch @@ -1,11 +1,11 @@ -From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001 +From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Dec 2021 22:07:17 +0100 Subject: [PATCH] Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames - * Disable IPv6 + * Disable IPv6 (Dropped since 1.4.68) * Do not setuid to a user that doesn't exist on the system * Change the network backend to writev since linux-sendfile fails on buildroot @@ -13,13 +13,15 @@ Signed-off-by: Maxime Ripard Signed-off-by: Simon Dawson [Gustavo: update for 1.4.37] Signed-off-by: Gustavo Zacarias +[Thomas: update for 1.4.69 - drop server.use-ipv6] +Signed-off-by: Thomas Devoogdt --- doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) + doc/config/lighttpd.conf | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf -index e685d43..92cff4f 100644 +index e685d437..92cff4f0 100644 --- a/doc/config/conf.d/access_log.conf +++ b/doc/config/conf.d/access_log.conf @@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) @@ -32,7 +34,7 @@ index e685d43..92cff4f 100644 ## ## The default format produces CLF compatible output. diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index 495d2a1..c3e1446 100644 +index d45a284d..4e926d5a 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -13,8 +13,8 @@ @@ -46,16 +48,7 @@ index 495d2a1..c3e1446 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ server.port = 80 - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" +@@ -97,8 +97,8 @@ server.port = 80 ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -66,7 +59,7 @@ index 495d2a1..c3e1446 100644 ## ## Enable lighttpd to serve requests on sockets received from systemd -@@ -118,7 +118,7 @@ server.groupname = "lighttpd" +@@ -114,7 +114,7 @@ server.groupname = "lighttpd" ## ## Document root ## @@ -75,7 +68,7 @@ index 495d2a1..c3e1446 100644 ## ## The value for the "Server:" response field. -@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid" +@@ -140,7 +140,7 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## @@ -84,7 +77,7 @@ index 495d2a1..c3e1446 100644 ## ## If you want to log to syslog you have to unset the -@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf" +@@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf" ## and write(). Every modern OS provides its own syscall to help network ## servers transfer files as fast as possible ## @@ -94,5 +87,5 @@ index 495d2a1..c3e1446 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.34.1 +2.39.0 diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 8353857ad9..29bf5124b6 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.67.sha512sum -sha512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627 lighttpd-1.4.67.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum +sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index d3440040fb..ca2035b6b3 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).67 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -13,49 +13,49 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=false \ - -Dwith_fam=false \ + -Dwith_dbi=disabled \ + -Dwith_fam=disabled \ -Dwith_gnutls=false \ - -Dwith_libev=false \ - -Dwith_libunwind=false \ + -Dwith_libev=disabled \ + -Dwith_libunwind=disabled \ -Dwith_mbedtls=false \ -Dwith_nettle=false \ -Dwith_nss=false \ - -Dwith_pcre=false \ - -Dwith_sasl=false \ + -Dwith_pcre=disabled \ + -Dwith_sasl=disabled \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=true \ + -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli -LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +LIGHTTPD_CONF_OPTS += -Dwith_brotli=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +LIGHTTPD_CONF_OPTS += -Dwith_bzip=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 -LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +LIGHTTPD_CONF_OPTS += -Dwith_krb5=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) LIGHTTPD_DEPENDENCIES += openldap -LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +LIGHTTPD_CONF_OPTS += -Dwith_ldap=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) @@ -67,16 +67,16 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) LIGHTTPD_DEPENDENCIES += libmaxminddb -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mysql -LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) @@ -88,9 +88,9 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += -Dwith_pam=true +LIGHTTPD_CONF_OPTS += -Dwith_pam=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pam=false +LIGHTTPD_CONF_OPTS += -Dwith_pam=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) @@ -102,36 +102,36 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) LIGHTTPD_DEPENDENCIES += postgresql -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=enabled ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=enabled LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=disabled endif else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true +LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) LIGHTTPD_DEPENDENCIES += zstd -LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +LIGHTTPD_CONF_OPTS += -Dwith_zstd=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +LIGHTTPD_CONF_OPTS += -Dwith_zstd=disabled endif define LIGHTTPD_INSTALL_CONFIG -- 2.39.0 From vincent.stehle at arm.com Thu Feb 16 10:07:50 2023 From: vincent.stehle at arm.com (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Thu, 16 Feb 2023 11:07:50 +0100 Subject: [Buildroot] [PATCH 1/2] configs/qemu_arm_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 Message-ID: <20230216100751.446662-1-vincent.stehle@arm.com> - Bump Linux kernel version to 6.1.12. - Bump U-Boot version to 2023.01 and follow CONFIG_SYS_TEXT_BASE renaming. Signed-off-by: Vincent Stehl? Cc: Romain Naour --- board/qemu/arm-ebbr/u-boot.fragment | 2 +- configs/qemu_arm_ebbr_defconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/qemu/arm-ebbr/u-boot.fragment b/board/qemu/arm-ebbr/u-boot.fragment index bfc382cde9..66fe910f16 100644 --- a/board/qemu/arm-ebbr/u-boot.fragment +++ b/board/qemu/arm-ebbr/u-boot.fragment @@ -31,5 +31,5 @@ CONFIG_PARTITION_TYPE_GUID=y CONFIG_RNG_OPTEE=y CONFIG_RTC_EMULATION=y CONFIG_SCMI_FIRMWARE=y -CONFIG_SYS_TEXT_BASE=0x60000000 CONFIG_TEE=y +CONFIG_TEXT_BASE=0x60000000 diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index f3e2d42a54..8fbb3069bc 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" @@ -42,7 +42,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -- 2.39.1 From vincent.stehle at arm.com Thu Feb 16 10:07:51 2023 From: vincent.stehle at arm.com (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Thu, 16 Feb 2023 11:07:51 +0100 Subject: [Buildroot] [PATCH 2/2] configs/qemu_aarch64_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 In-Reply-To: <20230216100751.446662-1-vincent.stehle@arm.com> References: <20230216100751.446662-1-vincent.stehle@arm.com> Message-ID: <20230216100751.446662-2-vincent.stehle@arm.com> - Bump Linux kernel version to 6.1.12. - Bump U-Boot version to 2023.01 and rename config fragment to make it clearer that it is not a complete config file. Signed-off-by: Vincent Stehl? Cc: Romain Naour --- .../qemu/aarch64-ebbr/{u-boot.config => u-boot.fragment} | 0 configs/qemu_aarch64_ebbr_defconfig | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename board/qemu/aarch64-ebbr/{u-boot.config => u-boot.fragment} (100%) diff --git a/board/qemu/aarch64-ebbr/u-boot.config b/board/qemu/aarch64-ebbr/u-boot.fragment similarity index 100% rename from board/qemu/aarch64-ebbr/u-boot.config rename to board/qemu/aarch64-ebbr/u-boot.fragment diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index d293ad0e60..e3157089a9 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -39,9 +39,9 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.config" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Host tools -- 2.39.1 From thomas at devoogdt.com Thu Feb 16 10:25:56 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 16 Feb 2023 11:25:56 +0100 Subject: [Buildroot] [PATCH v2] package/lighttpd: bump to version 1.4.69 Message-ID: <20230216102556.3047136-1-thomas.devoogdt@barco.com> Changelog: - https://www.lighttpd.net/2023/1/3/1.4.68/ - https://www.lighttpd.net/2023/2/10/1.4.69/ In this commit: - rebased patch & dropped server.use-ipv6 option [1] - fix changed meson options [2] [1]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/376d20f1617f2c0202fb415e4cc66d3f780db5ca [2]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/6b31f76cd9b36b6033607181238fbf41c5b81e07 Signed-off-by: Thomas Devoogdt --- v2: fix git message url links --- ...lt-lighttpd-configuration-file-to-ha.patch | 33 ++++------ package/lighttpd/lighttpd.hash | 4 +- package/lighttpd/lighttpd.mk | 64 +++++++++---------- 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch index 1a887655b8..2eab2a84e5 100644 --- a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +++ b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch @@ -1,11 +1,11 @@ -From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001 +From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Dec 2021 22:07:17 +0100 Subject: [PATCH] Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames - * Disable IPv6 + * Disable IPv6 (Dropped since 1.4.68) * Do not setuid to a user that doesn't exist on the system * Change the network backend to writev since linux-sendfile fails on buildroot @@ -13,13 +13,15 @@ Signed-off-by: Maxime Ripard Signed-off-by: Simon Dawson [Gustavo: update for 1.4.37] Signed-off-by: Gustavo Zacarias +[Thomas: update for 1.4.69 - drop server.use-ipv6] +Signed-off-by: Thomas Devoogdt --- doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) + doc/config/lighttpd.conf | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf -index e685d43..92cff4f 100644 +index e685d437..92cff4f0 100644 --- a/doc/config/conf.d/access_log.conf +++ b/doc/config/conf.d/access_log.conf @@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) @@ -32,7 +34,7 @@ index e685d43..92cff4f 100644 ## ## The default format produces CLF compatible output. diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index 495d2a1..c3e1446 100644 +index d45a284d..4e926d5a 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -13,8 +13,8 @@ @@ -46,16 +48,7 @@ index 495d2a1..c3e1446 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ server.port = 80 - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" +@@ -97,8 +97,8 @@ server.port = 80 ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -66,7 +59,7 @@ index 495d2a1..c3e1446 100644 ## ## Enable lighttpd to serve requests on sockets received from systemd -@@ -118,7 +118,7 @@ server.groupname = "lighttpd" +@@ -114,7 +114,7 @@ server.groupname = "lighttpd" ## ## Document root ## @@ -75,7 +68,7 @@ index 495d2a1..c3e1446 100644 ## ## The value for the "Server:" response field. -@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid" +@@ -140,7 +140,7 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## @@ -84,7 +77,7 @@ index 495d2a1..c3e1446 100644 ## ## If you want to log to syslog you have to unset the -@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf" +@@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf" ## and write(). Every modern OS provides its own syscall to help network ## servers transfer files as fast as possible ## @@ -94,5 +87,5 @@ index 495d2a1..c3e1446 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.34.1 +2.39.0 diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 8353857ad9..29bf5124b6 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.67.sha512sum -sha512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627 lighttpd-1.4.67.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum +sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index d3440040fb..ca2035b6b3 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).67 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -13,49 +13,49 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=false \ - -Dwith_fam=false \ + -Dwith_dbi=disabled \ + -Dwith_fam=disabled \ -Dwith_gnutls=false \ - -Dwith_libev=false \ - -Dwith_libunwind=false \ + -Dwith_libev=disabled \ + -Dwith_libunwind=disabled \ -Dwith_mbedtls=false \ -Dwith_nettle=false \ -Dwith_nss=false \ - -Dwith_pcre=false \ - -Dwith_sasl=false \ + -Dwith_pcre=disabled \ + -Dwith_sasl=disabled \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=true \ + -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli -LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +LIGHTTPD_CONF_OPTS += -Dwith_brotli=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +LIGHTTPD_CONF_OPTS += -Dwith_bzip=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 -LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +LIGHTTPD_CONF_OPTS += -Dwith_krb5=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) LIGHTTPD_DEPENDENCIES += openldap -LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +LIGHTTPD_CONF_OPTS += -Dwith_ldap=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) @@ -67,16 +67,16 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) LIGHTTPD_DEPENDENCIES += libmaxminddb -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mysql -LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) @@ -88,9 +88,9 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += -Dwith_pam=true +LIGHTTPD_CONF_OPTS += -Dwith_pam=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pam=false +LIGHTTPD_CONF_OPTS += -Dwith_pam=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) @@ -102,36 +102,36 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) LIGHTTPD_DEPENDENCIES += postgresql -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=enabled ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=enabled LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=disabled endif else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true +LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) LIGHTTPD_DEPENDENCIES += zstd -LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +LIGHTTPD_CONF_OPTS += -Dwith_zstd=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +LIGHTTPD_CONF_OPTS += -Dwith_zstd=disabled endif define LIGHTTPD_INSTALL_CONFIG -- 2.39.0 From flaniel at linux.microsoft.com Thu Feb 16 14:23:35 2023 From: flaniel at linux.microsoft.com (Francis Laniel) Date: Thu, 16 Feb 2023 15:23:35 +0100 Subject: [Buildroot] [PATCH v2 2/2] linux: use -isystem instead of -I in HOSTCC In-Reply-To: References: Message-ID: <12152275.O9o76ZdvQC@pwmachine> Hi. Le mercredi 15 f?vrier 2023, 10:58:51 CET Lang Daniel a ?crit : > A package might install headers that are incompatible with the kernel's > header. One example is the most recent version of pahole (1.24). > HOST_CC includes -I$(HOST_DIR)/include which comes before any include > logic the kernel might have thus forcing the kernel to prefer headers in > HOST_DIR. > > The logic to substituting -I with -isystem is taken from > boot/uboot/uboot.mk. > > Signed-off-by: Daniel Lang Thank you for this patch! I tested it and got the same error as you: FAILED: load BTF from vmlinux: Invalid argument I tested with qemu_x86_64_defconfig to which I added the same options as you. I will test with a kernel younger than 5.15.18 and I come back here! > --- > v1 -> v2: > - Patch was added to the series > > Tested with: > > BR2_aarch64=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="{VERSION}" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="pahole-kernel.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE=y > > and with a fragment for linux: > > CONFIG_BPF_SYSCALL=y > CONFIG_BPF_UNPRIV_DEFAULT_OFF=n > CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y > CONFIG_DEBUG_INFO_REDUCED=n > CONFIG_DEBUG_INFO_COMPRESSED=n > CONFIG_DEBUG_INFO_BTF=y > CONFIG_SYSTEM_TRUSTED_KEYRING=y > > where VERSION is one of: > 5.2.21 5.3.18 5.4.231 5.5.19 5.6.19 5.7.19 5.8.18 5.9.16 5.10.167 5.11.22 > 5.12.19 5.13.19 5.14.21 5.15.93 5.16.20 5.17.15 5.18.19 5.19.17 6.0.19 > 6.1.11 > > Version 5.2, as far as I could work it out, is the version that introduced > the pahole dependency when CONFIG_DEBUG_INFO_BTF is set. > > None-LTS versions after 5.10 and before 5.19 fail with: > > LD vmlinux.o > MODPOST vmlinux.symvers > MODINFO modules.builtin.modinfo > GEN modules.builtin > LD .tmp_vmlinux.btf > BTF .btf.vmlinux.bin.o > LD .tmp_vmlinux.kallsyms1 > KSYMS .tmp_vmlinux.kallsyms1.S > AS .tmp_vmlinux.kallsyms1.S > LD .tmp_vmlinux.kallsyms2 > KSYMS .tmp_vmlinux.kallsyms2.S > AS .tmp_vmlinux.kallsyms2.S > LD vmlinux > BTFIDS vmlinux > FAILED: load BTF from vmlinux: Invalid argument > make[2]: *** [Makefile:1177: vmlinux] Error 255 > make[1]: *** [package/pkg-generic.mk:293: > /home/d.lang/ws/other/buildroot/output/build/linux-5.11.22/.stamp_built] > Error 2 make: *** [Makefile:82: _all] Error 2 > > These version miss BTF_KIND_ENUM64 support and require a patch [0] that has > been added to LTS versions. > > [0]: https://lore.kernel.org/bpf/20221019085604.1017583-6-jolsa at kernel.org/ > > Signed-off-by: Daniel Lang > --- > linux/linux.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/linux/linux.mk b/linux/linux.mk > index 7645b5f507..03d89cd204 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -150,7 +150,7 @@ endif > # Disable building host tools with -Werror: newer gcc versions can be > # extra picky about some code > (https://bugs.busybox.net/show_bug.cgi?id=14826) LINUX_MAKE_FLAGS = \ > - HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ > + HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem > /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ ARCH=$(KERNEL_ARCH) \ > INSTALL_MOD_PATH=$(TARGET_DIR) \ > CROSS_COMPILE="$(TARGET_CROSS)" \ Best regards. From flaniel at linux.microsoft.com Thu Feb 16 14:48:37 2023 From: flaniel at linux.microsoft.com (Francis Laniel) Date: Thu, 16 Feb 2023 15:48:37 +0100 Subject: [Buildroot] [PATCH v2 2/2] linux: use -isystem instead of -I in HOSTCC In-Reply-To: <12152275.O9o76ZdvQC@pwmachine> References: <12152275.O9o76ZdvQC@pwmachine> Message-ID: <4807202.31r3eYUQgx@pwmachine> Le jeudi 16 f?vrier 2023, 15:23:35 CET Francis Laniel a ?crit : > Hi. > > Le mercredi 15 f?vrier 2023, 10:58:51 CET Lang Daniel a ?crit : > > A package might install headers that are incompatible with the kernel's > > header. One example is the most recent version of pahole (1.24). > > HOST_CC includes -I$(HOST_DIR)/include which comes before any include > > logic the kernel might have thus forcing the kernel to prefer headers in > > HOST_DIR. > > > > The logic to substituting -I with -isystem is taken from > > boot/uboot/uboot.mk. > > > > Signed-off-by: Daniel Lang > > Thank you for this patch! > I tested it and got the same error as you: > FAILED: load BTF from vmlinux: Invalid argument > > I tested with qemu_x86_64_defconfig to which I added the same options as > you. I will test with a kernel younger than 5.15.18 and I come back here! I tested with latest kernel and everything works like a charm: Welcome to Buildroot buildroot login: root # uname -r 6.1.11 # ls /sys/kernel/btf/ vmlinux Thank you for it! Reviewed-by: Francis Laniel Tested-by: Francis Laniel > > --- > > > > v1 -> v2: > > - Patch was added to the series > > > > Tested with: > > > > BR2_aarch64=y > > BR2_TOOLCHAIN_EXTERNAL=y > > BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y > > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="{VERSION}" > > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="pahole-kernel.config" > > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE=y > > > > and with a fragment for linux: > > > > CONFIG_BPF_SYSCALL=y > > CONFIG_BPF_UNPRIV_DEFAULT_OFF=n > > CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y > > CONFIG_DEBUG_INFO_REDUCED=n > > CONFIG_DEBUG_INFO_COMPRESSED=n > > CONFIG_DEBUG_INFO_BTF=y > > CONFIG_SYSTEM_TRUSTED_KEYRING=y > > > > where VERSION is one of: > > 5.2.21 5.3.18 5.4.231 5.5.19 5.6.19 5.7.19 5.8.18 5.9.16 5.10.167 5.11.22 > > 5.12.19 5.13.19 5.14.21 5.15.93 5.16.20 5.17.15 5.18.19 5.19.17 6.0.19 > > 6.1.11 > > > > Version 5.2, as far as I could work it out, is the version that introduced > > the pahole dependency when CONFIG_DEBUG_INFO_BTF is set. > > > > None-LTS versions after 5.10 and before 5.19 fail with: > > LD vmlinux.o > > MODPOST vmlinux.symvers > > MODINFO modules.builtin.modinfo > > GEN modules.builtin > > LD .tmp_vmlinux.btf > > BTF .btf.vmlinux.bin.o > > LD .tmp_vmlinux.kallsyms1 > > KSYMS .tmp_vmlinux.kallsyms1.S > > AS .tmp_vmlinux.kallsyms1.S > > LD .tmp_vmlinux.kallsyms2 > > KSYMS .tmp_vmlinux.kallsyms2.S > > AS .tmp_vmlinux.kallsyms2.S > > LD vmlinux > > BTFIDS vmlinux > > > > FAILED: load BTF from vmlinux: Invalid argument > > make[2]: *** [Makefile:1177: vmlinux] Error 255 > > make[1]: *** [package/pkg-generic.mk:293: > > /home/d.lang/ws/other/buildroot/output/build/linux-5.11.22/.stamp_built] > > Error 2 make: *** [Makefile:82: _all] Error 2 > > > > These version miss BTF_KIND_ENUM64 support and require a patch [0] that > > has > > been added to LTS versions. > > > > [0]: > > https://lore.kernel.org/bpf/20221019085604.1017583-6-jolsa at kernel.org/ > > > > Signed-off-by: Daniel Lang > > --- > > > > linux/linux.mk | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/linux/linux.mk b/linux/linux.mk > > index 7645b5f507..03d89cd204 100644 > > --- a/linux/linux.mk > > +++ b/linux/linux.mk > > @@ -150,7 +150,7 @@ endif > > > > # Disable building host tools with -Werror: newer gcc versions can be > > # extra picky about some code > > > > (https://bugs.busybox.net/show_bug.cgi?id=14826) LINUX_MAKE_FLAGS = \ > > - HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ > > + HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem > > /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ ARCH=$(KERNEL_ARCH) \ > > > > INSTALL_MOD_PATH=$(TARGET_DIR) \ > > CROSS_COMPILE="$(TARGET_CROSS)" \ > > Best regards. From thomas.petazzoni at bootlin.com Thu Feb 16 15:01:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 16 Feb 2023 16:01:08 +0100 Subject: [Buildroot] Can I enable a config option from command line? In-Reply-To: References: Message-ID: <20230216160108.5a8d0c63@windsurf> Hello, On Thu, 16 Feb 2023 02:43:30 +0000 Afshin Pir wrote: > When building buildroot, I use a default config file. But there is > only 1 option (BR2_ENABLE_RUNTIME_DEBUG=y) which is not in config > file by default, and I want to enable it by command line when > building buildroot. Is there any way to achieve this? ./utils/config --enable BR2_ENABLE_RUNTIME_DEBUG have a look at ./utils/config --help Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 16 15:02:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 16 Feb 2023 16:02:39 +0100 Subject: [Buildroot] [PATCH 0/3 v2] package/dmalloc: cleanups and ssp workaround (branch yem/dmalloc) In-Reply-To: References: Message-ID: <20230216160239.3cf956fb@windsurf> On Wed, 8 Feb 2023 20:31:31 +0100 "Yann E. MORIN" wrote: > Yann E. MORIN (3): > package/dmalloc: convert existing patch to git format > package/dmalloc: use actual patches rather than sed-ing > package/dmalloc: don't use SSP Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Thu Feb 16 17:40:18 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 16 Feb 2023 18:40:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: bump to version 2.10.0 Message-ID: <20230216174018.33199-1-fontaine.fabrice@gmail.com> https://github.com/FreeRDP/FreeRDP/releases/tag/2.10.0 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 f6adc05312..55314cfdd3 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.9.0.tar.gz.sha256 -sha256 fcf71cf5b09c5c2636341ba212f34b8fb728246ea28e08caf6cef8b4a96184b7 freerdp-2.9.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.10.0.tar.gz.sha256 +sha256 a673d3fc21911dd9f196834f2f3a23c3ebc7e5e4deab2f7686fcec879279e2c1 freerdp-2.10.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index fb0e6920cf..01c511819d 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.9.0 +FREERDP_VERSION = 2.10.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 -- 2.39.0 From fontaine.fabrice at gmail.com Thu Feb 16 17:41:34 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 16 Feb 2023 18:41:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build with libexecinfo Message-ID: <20230216174134.34179-1-fontaine.fabrice@gmail.com> Fix the following build failure with libexecinfo raised since commit d649bcd3805a26cedb30120ebbdcf12f8fbf449f: /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/10.4.0/../../../../mips-buildroot-linux-musl/bin/ld: ../lib/monkey/library/libmonkey.a(mk_utils.c.o): in function `mk_utils_stacktrace': mk_utils.c:(.text+0x1578): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 Signed-off-by: Fabrice Fontaine --- package/fluent-bit/fluent-bit.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index d618fdf1e2..8ba16399bb 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -56,6 +56,11 @@ FLUENT_BIT_CXXFLAGS += -fcommon FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +FLUENT_BIT_DEPENDENCIES += libexecinfo +FLUENT_BIT_LDFLAGS += -lexecinfo +endif + ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) FLUENT_BIT_DEPENDENCIES += musl-fts FLUENT_BIT_LDFLAGS += -lfts -- 2.39.0 From bernd.kuhls at t-online.de Thu Feb 16 18:20:36 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 16 Feb 2023 19:20:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/python3: bump version to 3.11.2 Message-ID: <20230216182036.40830-1-bernd.kuhls@t-online.de> Changelog: https://docs.python.org/release/3.11.2/whatsnew/changelog.html#python-3-11-2 Updated license hash due to copyright year bump: https://github.com/python/cpython/commit/07d1f99e8faefcf24dab2113fb0df27202fa6f71 Signed-off-by: Bernd Kuhls --- package/python3/python3.hash | 4 ++-- package/python3/python3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 7f079865d9..f235347efb 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f Python-3.11.1.tar.xz -sha256 d4a223f033419313218c9b8444167e91e87a5bebdb43fb8490df441df5220a8b LICENSE +sha256 29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af Python-3.11.2.tar.xz +sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index fb6dbf2e64..56fe95cd07 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others -- 2.39.1 From bernd.kuhls at t-online.de Thu Feb 16 18:24:10 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 16 Feb 2023 19:24:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: security bump version to 8.2.3 Message-ID: <20230216182410.225354-1-bernd.kuhls@t-online.de> Changelog: https://www.php.net/ChangeLog-8.php#8.2.3 Fixes CVE-2023-0567, CVE-2023-0568 & CVE-2023-0662. 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 869cb9b94f..41aa326156 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz +sha256 b9b566686e351125d67568a33291650eb8dfa26614d205d70d82e6e92613d457 php-8.2.3.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 9ce153f4fa..bd7d5a8c3c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.2 +PHP_VERSION = 8.2.3 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES -- 2.39.1 From raphael.pavlidis at gmail.com Thu Feb 16 18:31:27 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Thu, 16 Feb 2023 19:31:27 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/x11r7/xwayland: new package In-Reply-To: <20230215212209.269cd96d@windsurf> References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> <20230215212209.269cd96d@windsurf> Message-ID: <5d06d30a-064e-b8a5-b9b5-3ff0a5941ab3@gmail.com> Hi Thomas, On 15.02.23 21:22, Thomas Petazzoni wrote: [SNIP] > > This should probably be split into 3 patches: one adding the xwayland > package, one tweaking the existing weston package, and one tweaking the > wlroots package. > > Okay, I will split the commit into 3 patches. [SNIP] > > So does that means that the current BR2_PACKAGE_WESTON_XWAYLAND option > is broken? > Yes, it is broken. To use the XWayland support, you need the XWayland binary, which is not build yet by buildroot. > I am rather confused by how XWayland works. Isn't XWayland a normal > Wayland client? Why does Weston or wlroots, as Wayland compositors, > need to have some support/knowledge for XWayland? Yes, as far as I know, it is a Wayland client. It acts as an XServer, which X11 application connects to, and then it forward (lets say) to the Wayland compositor. The Wayland compositor executes the XWayland server. The compositor needs the xwayland as build dependency, because in the .pc file it is written, where the xwayland binary is located and which features are enabled. https://gitlab.freedesktop.org/wlroots/wlroots/-/blob/master/xwayland/meson.build#L65 [SNIP] > > Since you're selecting BR2_PACKAGE_XWAYLAND, you need to replicate: > > depends on BR2_USE_MMU # fork() > depends on !BR2_STATIC_LIBS # wayland > depends on BR2_TOOLCHAIN_HAS_THREADS # wayland > > and add the corresponding Config.in comment. > Good point, I forgot that. [SNIP] > > So this is also a bug in the current package? > > What is WLROOTS_X11 controlling then? Running wlroots as a X11 client? The X11 backend has nothing to do with the XWayland support. X11 backend means that the compositor can run on an XServer. The XWayland support means that X11 application can run on the Wayland compositor. [SNIP] Thanks, Raphael Pavlidis From raphael.pavlidis at gmail.com Thu Feb 16 18:33:20 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Thu, 16 Feb 2023 19:33:20 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/x11r7/xwayland: new package In-Reply-To: <20230215143534.19834-1-raphael.pavlidis@gmail.com> References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> Message-ID: <20230216183322.21622-1-raphael.pavlidis@gmail.com> XServer to run X clients under wayland This XServer is required to run the X clients under Wayland compositor, for example weston or wlroots based compositors. Signed-off-by: Raphael Pavlidis --- Changes v1 -> v2: - split up patches in 3 parts - add missing depends on in wlroots DEVELOPERS | 1 + package/x11r7/Config.in | 1 + package/x11r7/xwayland/Config.in | 26 ++++++++ package/x11r7/xwayland/xwayland.hash | 6 ++ package/x11r7/xwayland/xwayland.mk | 94 ++++++++++++++++++++++++++++ 5 files changed, 128 insertions(+) create mode 100644 package/x11r7/xwayland/Config.in create mode 100644 package/x11r7/xwayland/xwayland.hash create mode 100644 package/x11r7/xwayland/xwayland.mk diff --git a/DEVELOPERS b/DEVELOPERS index f8451c7fec..5374fb2f61 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2417,6 +2417,7 @@ F: support/testing/tests/package/test_python_s3transfer.py N: Raphael Pavlidis F: package/slirp4netns/ F: package/sway/ +F: package/x11r7/xwayland/ N: Refik Tuzakli F: package/freescale-imx/ diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 365de34c98..4de8922e0d 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -12,6 +12,7 @@ menuconfig BR2_PACKAGE_XORG7 if BR2_PACKAGE_XORG7 menu "X11R7 Servers" source package/x11r7/xserver_xorg-server/Config.in + source package/x11r7/xwayland/Config.in endmenu menu "X11R7 Libraries" source package/x11r7/libxcb/Config.in diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in new file mode 100644 index 0000000000..4f14f2cc36 --- /dev/null +++ b/package/x11r7/xwayland/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_XWAYLAND + bool "xwayland server" + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland + # We need a SHA1 implementation. If either openssl or + # libgcrypt are already part of the build, we'll use one of + # them, otherwise, use the small libsha1 library. + select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_XLIB_LIBXCVT + select BR2_PACKAGE_XLIB_LIBXFONT2 + select BR2_PACKAGE_XLIB_LIBXKBFILE + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_XTRANS + select BR2_PACKAGE_XORGPROTO + help + X.Org X server to run X clients under wayland + + http://xorg.freedesktop.org + +comment "xwayland needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash new file mode 100644 index 0000000000..0c476f3183 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.hash @@ -0,0 +1,6 @@ +# From https://lists.x.org/archives/xorg-announce/2023-February/003322.html +sha256 d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73 xwayland-22.1.8.tar.xz +sha512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a xwayland-22.1.8.tar.xz + +# Locally calculated +sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk new file mode 100644 index 0000000000..174b440b07 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.mk @@ -0,0 +1,94 @@ +################################################################################ +# +# xwayland +# +################################################################################ + +XWAYLAND_VERSION = 22.1.8 +XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz +XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver +XWAYLAND_LICENSE = MIT +XWAYLAND_LICENSE_FILES = COPYING +XWAYLAND_INSTALL_STAGING = YES +XWAYLAND_DEPENDENCIES = \ + pixman \ + wayland \ + wayland-protocols \ + xlib_libxcvt \ + xlib_libXfont2 \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_xtrans \ + xorgproto +XWAYLAND_CONF_OPTS = \ + -Dxwayland_eglstream=false \ + -Dxvfb=false \ + -Ddefault_font_path=/usr/share/fonts/X11/ \ + -Ddtrace=false \ + -Ddocs=false + +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY),yy) +XWAYLAND_CONF_OPTS += -Dglamor=true +XWAYLAND_DEPENDENCIES += libdrm libepoxy +else +XWAYLAND_CONF_OPTS += -Dglamor=false +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XWAYLAND_CONF_OPTS += -Dglx=true +XWAYLAND_DEPENDENCIES += libgl +else +XWAYLAND_CONF_OPTS += -Dglx=false +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXDMCP),y) +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=true \ + -Dxdm-auth-1=true +XWAYLAND_DEPENDENCIES += xlib_libXdmcp +else +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=false \ + -Dxdm-auth-1=false +endif + +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +XWAYLAND_CONF_OPTS += -Dsecure-rpc=true +XWAYLAND_DEPENDENCIES += libtirpc +else +XWAYLAND_CONF_OPTS += -Dsecure-rpc=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX)$(BR2_PACKAGE_AUDIT),yy) +XWAYLAND_CONF_OPTS += -Dxselinux=true +XWAYLAND_DEPENDENCIES += libselinux audit +else +XWAYLAND_CONF_OPTS += -Dxselinux=false +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +XWAYLAND_CONF_OPTS += -Dsha1=libcrypto +XWAYLAND_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +XWAYLAND_CONF_OPTS += -Dsha1=libgcrypt +XWAYLAND_DEPENDENCIES += libgcrypt +else +XWAYLAND_CONF_OPTS += -Dsha1=libsha1 +XWAYLAND_DEPENDENCIES += libsha1 +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_LIBDRM),yy) +XWAYLAND_CONF_OPTS += -Ddri3=true +XWAYLAND_DEPENDENCIES += xlib_libxshmfence libdrm +else +XWAYLAND_CONF_OPTS += -Ddri3=false +endif + +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +XWAYLAND_CONF_OPTS += -Dlibunwind=true +XWAYLAND_DEPENDENCIES += libunwind +else +XWAYLAND_CONF_OPTS += -Dlibunwind=false +endif + +$(eval $(meson-package)) -- 2.39.1 From raphael.pavlidis at gmail.com Thu Feb 16 18:33:21 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Thu, 16 Feb 2023 19:33:21 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/weston: add xwayland dependency In-Reply-To: <20230216183322.21622-1-raphael.pavlidis@gmail.com> References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> <20230216183322.21622-1-raphael.pavlidis@gmail.com> Message-ID: <20230216183322.21622-2-raphael.pavlidis@gmail.com> If the XWayland support is enabled then build the corresponding XServer. Signed-off-by: Raphael Pavlidis --- package/weston/Config.in | 10 +++++++++- package/weston/weston.mk | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 3b4e932b7d..09119edaaa 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -109,16 +109,24 @@ comment "X11 (nested) compositor needs X.org enabled" config BR2_PACKAGE_WESTON_XWAYLAND bool "XWayland support" - depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_LIBEPOXY + depends on BR2_PACKAGE_XORG7 # xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_XWAYLAND comment "XWayland support needs libepoxy and X.org enabled" depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + # Weston needs at least one shell; this can be one of the bundled ones, # below, of from a third-party package, which should then select this. config BR2_PACKAGE_WESTON_HAS_SHELL diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 5e71473640..01f84178b2 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -123,7 +123,7 @@ WESTON_CONF_OPTS += -Dbackend-default=$(call qstrip,$(BR2_PACKAGE_WESTON_DEFAULT ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) WESTON_CONF_OPTS += -Dxwayland=true -WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor +WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor xwayland else WESTON_CONF_OPTS += -Dxwayland=false endif -- 2.39.1 From raphael.pavlidis at gmail.com Thu Feb 16 18:33:22 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Thu, 16 Feb 2023 19:33:22 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/wlroots: add XWayland support In-Reply-To: <20230216183322.21622-1-raphael.pavlidis@gmail.com> References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> <20230216183322.21622-1-raphael.pavlidis@gmail.com> Message-ID: <20230216183322.21622-3-raphael.pavlidis@gmail.com> The new option enables the XWayland support, so X11 application can be running on a wlroots based compositor. Also, do not enable the XWayland support if the X11 backend is active. Signed-off-by: Raphael Pavlidis --- package/wlroots/Config.in | 19 +++++++++++++++++++ package/wlroots/wlroots.mk | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 84a4ef846e..fe3080450c 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -41,4 +41,23 @@ config BR2_PACKAGE_WLROOTS_X11 help Support Wayland sessions nested inside a X11 window +config BR2_PACKAGE_WLROOTS_XWAYLAND + bool "XWayland support" + depends on BR2_PACKAGE_XORG7 # libxcb, xcb-util-wm, xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_XWAYLAND + help + Support for X11 applications + +comment "XWayland support needs X.org enabled" + depends on !BR2_PACKAGE_XORG7 + +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + endif diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 4f14d20b11..5b930a51be 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -30,8 +30,12 @@ WLROOTS_BACKENDS = libinput drm ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) WLROOTS_BACKENDS += x11 -WLROOTS_CONF_OPTS += -Dxwayland=enabled WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 +endif + +ifeq ($(BR2_PACKAGE_WLROOTS_XWAYLAND),y) +WLROOTS_CONF_OPTS += -Dxwayland=enabled +WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xwayland else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif -- 2.39.1 From bernd.kuhls at t-online.de Thu Feb 16 18:28:00 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 16 Feb 2023 19:28:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump version to 0.103.8 Message-ID: <20230216182800.254043-1-bernd.kuhls@t-online.de> Release notes: https://blog.clamav.net/2023/02/clamav-01038-01052-and-101-patch.html Fixes CVE-2023-20032 & CVE-2023-20052. Signed-off-by: Bernd Kuhls --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index 60439400ee..27f9b16a39 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1e34c31f600cb3b5bd1bf76690590cdeebe9409b330959b1c0f77d421bb17e50 clamav-0.103.7.tar.gz +sha256 6f49da6ee927936de13d359e559d3944248e3a257d40b80b6c99ebe6fe8c8c3f clamav-0.103.8.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index dfdc416601..0f0491bf0d 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.7 +CLAMAV_VERSION = 0.103.8 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ -- 2.39.1 From bernd.kuhls at t-online.de Thu Feb 16 18:36:54 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 16 Feb 2023 19:36:54 +0100 Subject: [Buildroot] [PATCH 1/2] package/x11r7/xdriver_xf86-video-trident: bump version to 1.4.0 Message-ID: <20230216183655.402798-1-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003326.html Removed patch which was applied upstream. Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls --- .../0001-Remove-ramdac.patch | 56 ------------------- .../xdriver_xf86-video-trident.hash | 5 +- .../xdriver_xf86-video-trident.mk | 6 +- 3 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch diff --git a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch b/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch deleted file mode 100644 index 38ca9afebf..0000000000 --- a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 07a5c4732f1c28ffcb873ee04500e3cb813c50b4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Dec 2021 22:28:04 +0100 -Subject: [PATCH] Remove ramdac - -ramdac drivers have been removed from xserver since version 21.0.99.1 -and -https://gitlab.freedesktop.org/xorg/xserver/-/commit/f0385fb420158ac3bc1c4c325431ffc5c62344bb -resulting in the following build failure: - -In file included from trident_bank.c:37: -trident.h:41:10: fatal error: xf86RamDac.h: No such file or directory - 41 | #include "xf86RamDac.h" - | ^~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/c81ac8075af257e8626d9d097270be7a7b4a1496 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/merge_requests/1] ---- - src/trident.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/trident.h b/src/trident.h -index 5cadf52..c82de4c 100644 ---- a/src/trident.h -+++ b/src/trident.h -@@ -38,7 +38,6 @@ - #include "xaa.h" - #endif - #include "xf86fbman.h" --#include "xf86RamDac.h" - #include "compiler.h" - #include "vgaHW.h" - #include "xf86i2c.h" -@@ -103,7 +102,6 @@ typedef struct { - int useEXA; - int Chipset; - int DACtype; -- int RamDac; - int ChipRev; - int HwBpp; - int BppShift; -@@ -169,7 +167,6 @@ typedef struct { - CARD32 BltScanDirection; - CARD32 DrawFlag; - CARD16 LinePattern; -- RamDacRecPtr RamDacRec; - int CursorOffset; - xf86CursorInfoPtr CursorInfoRec; - xf86Int10InfoPtr Int10; --- -2.33.0 - diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash index 321f35d4f0..2ef664487c 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002762.html -sha256 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f xf86-video-trident-1.3.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003326.html +sha256 7f76219ca7d7dc6061aa3c2aa59bc2a63895b8e6217e413ce315949f57b0189b xf86-video-trident-1.4.0.tar.xz +sha512 86f349ccfcf7c704e77a95882f63ac92f55819a3a00388f294777762fed04dde2197dd6124cded9e787af1982fecc43ad4d0af34307845e616a73d5a2ba750b9 xf86-video-trident-1.4.0.tar.xz # Locally calculated sha256 4f065198c49eac1513b915bc4478152c21119f31a97919a6ea8f3e1d10133d15 COPYING diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk index 20ec4bbc24..53fe150420 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.8 -XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.4.0 +XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.xz +XDRIVER_XF86_VIDEO_TRIDENT_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT XDRIVER_XF86_VIDEO_TRIDENT_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xorgproto -- 2.39.1 From bernd.kuhls at t-online.de Thu Feb 16 18:36:55 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 16 Feb 2023 19:36:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/xutil_util-macros: bump version to 1.20.0 In-Reply-To: <20230216183655.402798-1-bernd.kuhls@t-online.de> References: <20230216183655.402798-1-bernd.kuhls@t-online.de> Message-ID: <20230216183655.402798-2-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003324.html Updated license hash due to copyright year bump: https://gitlab.freedesktop.org/xorg/util/macros/-/commit/cb147377e9341af05232f95814022abdecf14024 Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls --- package/xutil_util-macros/xutil_util-macros.hash | 8 ++++---- package/xutil_util-macros/xutil_util-macros.mk | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/xutil_util-macros/xutil_util-macros.hash b/package/xutil_util-macros/xutil_util-macros.hash index 30c9916dca..4fcddb7a85 100644 --- a/package/xutil_util-macros/xutil_util-macros.hash +++ b/package/xutil_util-macros/xutil_util-macros.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-January/003069.html -sha256 0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971 util-macros-1.19.3.tar.bz2 -sha512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2 util-macros-1.19.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003324.html +sha256 0b86b262dbe971edb4ff233bc370dfad9f241d09f078a3f6d5b7f4b8ea4430db util-macros-1.20.0.tar.xz +sha512 76caefb118bf1675d7b2b96e1bbb04eb9a320b02e120839e55a22ef98538ecf00d0e686a67186fc8fdc8492d277ffe3125ae8b7ac61ce4739edc0de3f468d2eb util-macros-1.20.0.tar.xz # Locally computed -sha256 489b630a75e3255485732eae3d50ff4d29d3feb66760bb3acb04f897e4d9e375 COPYING +sha256 7db0516389152a90c20ea910e8839d10204ebc25ccbc71fc7f5809dfb98e80ac COPYING diff --git a/package/xutil_util-macros/xutil_util-macros.mk b/package/xutil_util-macros/xutil_util-macros.mk index b0ce14ee5a..e2e40eb84e 100644 --- a/package/xutil_util-macros/xutil_util-macros.mk +++ b/package/xutil_util-macros/xutil_util-macros.mk @@ -4,9 +4,9 @@ # ################################################################################ -XUTIL_UTIL_MACROS_VERSION = 1.19.3 -XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2 -XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util +XUTIL_UTIL_MACROS_VERSION = 1.20.0 +XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.xz +XUTIL_UTIL_MACROS_SITE = https://xorg.freedesktop.org/archive/individual/util XUTIL_UTIL_MACROS_LICENSE = MIT XUTIL_UTIL_MACROS_LICENSE_FILES = COPYING -- 2.39.1 From thomas at devoogdt.com Thu Feb 16 19:34:05 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 16 Feb 2023 20:34:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build with libexecinfo In-Reply-To: <20230216174134.34179-1-fontaine.fabrice@gmail.com> References: <20230216174134.34179-1-fontaine.fabrice@gmail.com> Message-ID: Hi, Perhaps I'm missing something, but why is it not needed to select `BR2_PACKAGE_LIBEXECINFO` in the Config.in file? (Similar to `select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC`) The `ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)` can be re-used to add and select execinfo. Kr, Thomas Devoogdt Op do 16 feb. 2023 om 18:41 schreef Fabrice Fontaine : > > Fix the following build failure with libexecinfo raised since commit > d649bcd3805a26cedb30120ebbdcf12f8fbf449f: > > /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/10.4.0/../../../../mips-buildroot-linux-musl/bin/ld: ../lib/monkey/library/libmonkey.a(mk_utils.c.o): in function `mk_utils_stacktrace': > mk_utils.c:(.text+0x1578): undefined reference to `backtrace' > > Fixes: > - http://autobuild.buildroot.org/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 > > Signed-off-by: Fabrice Fontaine > --- > package/fluent-bit/fluent-bit.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk > index d618fdf1e2..8ba16399bb 100644 > --- a/package/fluent-bit/fluent-bit.mk > +++ b/package/fluent-bit/fluent-bit.mk > @@ -56,6 +56,11 @@ FLUENT_BIT_CXXFLAGS += -fcommon > FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS > FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +FLUENT_BIT_DEPENDENCIES += libexecinfo > +FLUENT_BIT_LDFLAGS += -lexecinfo > +endif > + > ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) > FLUENT_BIT_DEPENDENCIES += musl-fts > FLUENT_BIT_LDFLAGS += -lfts > -- > 2.39.0 > > From fontaine.fabrice at gmail.com Thu Feb 16 20:32:17 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 16 Feb 2023 21:32:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build with libexecinfo In-Reply-To: References: <20230216174134.34179-1-fontaine.fabrice@gmail.com> Message-ID: Hi Thomas, Le jeu. 16 f?vr. 2023 ? 20:34, Thomas Devoogdt a ?crit : > Hi, > > Perhaps I'm missing something, but why is it not needed to select > `BR2_PACKAGE_LIBEXECINFO` in the Config.in file? > (Similar to `select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC`) > libexecinfo is not a mandatory dependency, fluent-bit builds perfectly fine without it, that's why a select is not needed. > > The `ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)` can be re-used to add and > select execinfo. > > Kr, > > Thomas Devoogdt > > Op do 16 feb. 2023 om 18:41 schreef Fabrice Fontaine > : > > > > Fix the following build failure with libexecinfo raised since commit > > d649bcd3805a26cedb30120ebbdcf12f8fbf449f: > > > > > /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/10.4.0/../../../../mips-buildroot-linux-musl/bin/ld: > ../lib/monkey/library/libmonkey.a(mk_utils.c.o): in function > `mk_utils_stacktrace': > > mk_utils.c:(.text+0x1578): undefined reference to `backtrace' > > > > Fixes: > > - > http://autobuild.buildroot.org/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/fluent-bit/fluent-bit.mk | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/ > fluent-bit.mk > > index d618fdf1e2..8ba16399bb 100644 > > --- a/package/fluent-bit/fluent-bit.mk > > +++ b/package/fluent-bit/fluent-bit.mk > > @@ -56,6 +56,11 @@ FLUENT_BIT_CXXFLAGS += -fcommon > > FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS > > FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS > > > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > > +FLUENT_BIT_DEPENDENCIES += libexecinfo > > +FLUENT_BIT_LDFLAGS += -lexecinfo > > +endif > > + > > ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) > > FLUENT_BIT_DEPENDENCIES += musl-fts > > FLUENT_BIT_LDFLAGS += -lfts > > -- > > 2.39.0 > > > > > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Thu Feb 16 21:25:53 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 16 Feb 2023 22:25:53 +0100 Subject: [Buildroot] [PATCH 3/3] DEVELOPERS: add Giulio Benetti to board imx6ullevk for both mainline and NXP(Freescale) versions In-Reply-To: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> References: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> Message-ID: <20230216212553.2591068-3-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b1c6f2d447..840455ccea 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1136,11 +1136,14 @@ F: package/xapian/ N: Giulio Benetti F: board/bananapi/bananapi-m2-ultra/ +F: board/freescale/imx6ullevk/ F: board/freescale/imxrt1050evk/* F: board/olimex/a* F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig F: configs/bananapi_m2_ultra_defconfig +F: configs/freescale_imx6ullevk_defconfig +F: configs/imx6ullevk_defconfig F: configs/imxrt1050-evk_defconfig F: configs/olimex_a* F: package/at/ -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 16 21:25:51 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 16 Feb 2023 22:25:51 +0100 Subject: [Buildroot] [PATCH 1/3] configs/imx6ullevk_defconfig: bump Linux to 6.1.12 and U-Boot to 2023.01 Message-ID: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> Let's also reorder BR2_UBOOT_ options by moving BR2_TARGET_UBOOT_FORMAT_DTB_IMX after BR2_TARGET_UBOOT_NEEDS_OPENSSL since this reflects the order in boot/uboot/Config.in file. Signed-off-by: Giulio Benetti --- configs/imx6ullevk_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/imx6ullevk_defconfig b/configs/imx6ullevk_defconfig index c6e2981697..b507d1c0d6 100644 --- a/configs/imx6ullevk_defconfig +++ b/configs/imx6ullevk_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -22,10 +22,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" -BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 16 21:25:52 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 16 Feb 2023 22:25:52 +0100 Subject: [Buildroot] [PATCH 2/3] configs/freescale_imx6ullevk_defconfig: bump Linux and U-Boot to lf-5.15.71-2.2.0 In-Reply-To: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> References: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> Message-ID: <20230216212553.2591068-2-giulio.benetti@benettiengineering.com> Let's also enable BR2_TARGET_UBOOT_NEEDS_OPENSSL required by uboot to build correctly. Signed-off-by: Giulio Benetti --- configs/freescale_imx6ullevk_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index 7a8965be18..db4fa69f71 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -1,11 +1,11 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.15.71-2.2.0)/linux-imx-lf-5.15.71-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -15,8 +15,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.15.71-2.2.0)/uboot-imx-lf-5.15.71-2.2.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -- 2.34.1 From thomas.petazzoni at bootlin.com Fri Feb 17 06:41:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 06:41:16 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-16 Message-ID: <20230217064122.37BCA403BE@smtp2.osuosl.org> Hello, Autobuild statistics for 2023-02-16 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 4 | 1 | 0 | 5 | 2022.11.x | 13 | 18 | 0 | 31 | master | 152 | 186 | 0 | 338 | Classification of failures by reason for master ----------------------------------------------- unknown | 11 gnupg2-2.4.0 | 10 host-go-1.19.6 | 8 host-pahole-1.24 | 7 gerbera-1.10.0 | 6 python-numpy-1.23.5 | 6 zabbix-6.2.7 | 6 gobject-introspection-1.72.0 | 5 host-binutils-2.38 | 5 linux-6.1.11 | 5 perl-5.36.0 | 5 libgcrypt-1.10.1 | 4 elfutils-0.186 | 3 glibc-2.36-81-g4f4d7a13edfd... | 3 host-libarchive-3.6.2 | 3 libglib2-2.72.3 | 3 linux-5.10.162-cip24 | 3 quickjs-2021-03-27 | 3 xenomai-3.0.10 | 3 bird-2.0.11 | 2 dc3dd-7.2.641 | 2 host-binutils-2.37 | 2 ltp-testsuite-20220930 | 2 mongodb-4.2.18 | 2 netsurf-3.10 | 2 ocf-linux-20171122 | 2 php-xdebug-3.0.4 | 2 systemd-252.4 | 2 tcf-agent-1.7.0 | 2 uccp420wlan-6.9.1 | 2 ulog-0389d243352255f6182326... | 2 xtables-addons-3.22 | 2 android-tools-4.2.2+git2013... | 1 bat-0.19.0 | 1 check-0.15.2 | 1 ddrescue-1.26 | 1 docker-cli-23.0.0 | 1 dust-0.8.1 | 1 efivar-38 | 1 f2fs-tools-1.15.0 | 1 ffmpeg-4.4.3 | 1 fftw-quad-3.3.8 | 1 fontconfig-2.13.1 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 gmp-6.2.1 | 1 gnu-efi-3.0.15 | 1 host-delve-1.20.0 | 1 host-gcc-initial-12.2.0 | 1 host-gdb-arc-2020.09-releas... | 1 ibrdtnd-1.0.1 | 1 imagemagick-7.1.0-51 | 1 jack2-1.9.21 | 1 janet-1.26.0 | 1 kexec-2.0.25 | 1 kmod-30 | 1 libcamera-apps-1.1.1 | 1 libcap-ng-0.8.3 | 1 libjxl-0.7.0 | 1 libsigsegv-2.14 | 1 linux-5.10.162-cip24-rt10 | 1 liquid-dsp-1.4.0 | 1 lirc-tools-0.10.2 | 1 luvi-2.13.0 | 1 modem-manager-1.20.4 | 1 musl-1.2.3 | 1 netsniff-ng-0.6.8 | 1 olsr-0.9.8 | 1 owl-linux-1.0.7 | 1 pcre2-10.42 | 1 php-8.2.2 | 1 python-pyicu-2.10.2 | 1 reaver-1.6.6 | 1 s6-linux-utils-2.6.0.0 | 1 sdl-1.2.15 | 1 skalibs-2.12.0.1 | 1 snmppp-3.4.10 | 1 traceroute-2.1.0 | 1 uclibc-1.0.42 | 1 uqmi-0a19b5b77140465c29e2af... | 1 vdr-2.6.3 | 1 wavemon-0.9.4 | 1 wpa_supplicant-2.10 | 1 xfsprogs-5.14.2 | 1 xvisor-0.3.1 | 1 zeek-4.1.1 | 1 zxing-cpp-1.4.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/6de44e79728ef4ebe4aad1087aafb71bc0a28d3f | mips | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/c2dd77d1d8a893e60930a40bc352cb66f01111cf | powerpc64 | bird-2.0.11 | NOK | http://autobuild.buildroot.net/results/9736d87ddabcc78525fe981d830f6e6c0b5fe2f6 | arceb | bird-2.0.11 | NOK | http://autobuild.buildroot.net/results/06d027240756ba3ee058e6d4f68553f4e9843fc4 | mips64 | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/f837cdd02bfd6c4dccb563e00072fe46fa58b8a9 | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/3ca9fc835b196273afef52f13d6fdf51bc2dda2b | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/26af26ee1c5f58ccab024370ed7eb8620570ce95 | ORPH riscv64 | ddrescue-1.26 | NOK | http://autobuild.buildroot.net/results/0e65f79b7547c1cb3d4a56b2ef2e5be90ed23b06 | ORPH i686 | docker-cli-23.0.0 | NOK | http://autobuild.buildroot.net/results/9d2fe18217f9f476c70dca77047c69ffac424f91 | mipsel | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/d0e79f4f848a339eee9ca685a1a0cebe80d0b12a | ORPH arm | efivar-38 | NOK | http://autobuild.buildroot.net/results/f939a267ce864d65459bd5adf8122b4a0a474a20 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/0bde0cf03f46a224a0acab36328f466c899bc1b1 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/11b5aa42a8d6922a6b30c24f71ba2b0109484555 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3993fa82a7d2d6aa24853f38445c30a22224b44c | ORPH or1k | f2fs-tools-1.15.0 | NOK | http://autobuild.buildroot.net/results/0d40f26865d5576efdcee4fee5bd57fa775d352b | mips64 | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/f023d0bbed5455eb6ae26128ef86d136fdf2af88 | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/4fbf24f4cae0307b33b9e155cd483c90e8f7ea12 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/36d3497c5f93e88b47608967b4c5ecfeb0bb720d | ORPH mips64el | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/c4340fc5754e83aa839f45b380ebf36386b7a360 | x86_64 | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/f253c1e0c8c17f3f42e7bef66d2a1769bad5ca35 | arceb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/120b45ceeff0bfd1f2bf8547992e31a747215701 | powerpc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/236f7d56c114cfb3cac9456669e68a07654fce2e | sh4aeb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/f9cfd6d0975855ddcddea01fcf0549904edd06df | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/d73ba965be31f24bb28ddab6f82846375543270e | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/b67c78838fa0bb7a136296e09d8fee44e724382a | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/4cccb4a26df101518191afa7fb5fa719f1ebee2e | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/41721ceb12445888ce9b2084e6ce6922c37a0b4c | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/d43181481da37335fc35b5c29235fcea2a05cff2 | or1k | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/bbc26bdcc7d4a7faaee55dcd728ff0a587576931 | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/bbf59f4325a5fef59c34c95fcade1a7176279275 | mipsel | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/cd72c33c324de08559873995b200d8ef83681a10 | sparc64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/44f1d18337a3987485b9420594f75aff04a9494b | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/8b3262657cd25cdae119e8e00bdf395c1fd3f988 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e46a0a6a00aa4738c69ef2acc5d1cc849e28277a | powerpc64le | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/fbe9012c528dc7cc965de8f3dda69e7b4109bc56 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/8156c5fc7410340650a00a521d27a365177f8477 | ORPH mips64el | gnu-efi-3.0.15 | NOK | http://autobuild.buildroot.net/results/17971e777b2f26a610da8125079cf963c0f49640 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/e54f80b5fa40085173343c70c9ac396684f1def8 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/2fc8acfb2df01e7dfb99f5de25f7621bf6147679 | or1k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/077166eb71e1f124101895b2b3abf9f94d7543d5 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ead3a99a7912a6cfacb70a286811a42da0e2ab7a | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9ddb2288d638d047b248b30c46039da0387dd5e7 | arm | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/84ac9019e2a2b28236c9b38b985296da507a0e87 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ecf420363e14d5d7f3ffca2181053c657701a043 | powerpc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a7fb00ace9954804bacb690f7e91cd0dc3546e2f | aarch64_be | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/0d79bf49f61e5b106375f53600c455561440a64a | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/deaee8a591c84d6d88d85da53bf5992fbe2e42f5 | nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/77ab421e5c3142090274e79092a28e951615b3cf | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5fb2b7c481746137accc8b05f78c9fdfa7decf4d | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/a71093886e7d9f7b6eb7691b91f7082083598cbf | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/97159375d60650e5960ef2a0d3358373e8aa9edb | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d885c583d6052cc9c2d386f79812230fe4202f6e | ORPH i686 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/a32180792367070f7fd87969fa97bb579a0fb06e | sh4eb | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/85e139fd4b77437fa64c4af81e5a077686c38adb | arc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/c0392b321ffcecb82ecf39b90b4b837b1b644630 | xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2226d524a6c91e943432438f4b26d76597b44abe | xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/9ec53c0b08ebe81d24062baf794fba1e5f5f9ad7 | xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/0894997034da9626d6018316e9270818ca81ed7c | mipsel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/665526e1f891f774403fbff223994ceb5a583074 | x86_64 | host-delve-1.20.0 | NOK | http://autobuild.buildroot.net/results/a5298e3133ab1e2555a2dded4f10f54560494d62 | or1k | host-gcc-initial-12.2.0 | NOK | http://autobuild.buildroot.net/results/858e673a04ff766ec312ca09a182f29ad037cfe0 | arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/8c68734dcbcc2512c473cc64785df8634cfc952c | ORPH mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/10fd58a454a3246fd9717999c7a0c29a155dcec6 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e478e04405e2e530b7d986e044b6997d127b2a52 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/d142a6bc8f789c097744e38e52b855af97167f5f | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/d06ac5eb845ccf973d64106cc70931c1ff9689be | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/0c47d0ebd12d8037fb99da5f20cbe46a1a4c37d8 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e0d8c98007152b2a8b22a58a79e1c6754ffa38f3 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e868fe389c8011c61bce7d6f2bb9c2e38a434fc5 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/3b0de7e607b6ab8c7af33bda05122475e7922771 | sparc | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/d7721e21bf4b89674ceec6b5b1485dc8b4fc60cf | sparc64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/a97764c692e2b0159fa5749b610b6889b398eb3b | i686 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/9b2aaa67d01a9dce853409562d385fad397a1a9f | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/6d825e029856a35c2de5e666410d0cf0440d2b5c | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1cba10a7820ba01dbaaa424ce546466cf3bcd55f | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ee268b09b5c3f8e0b25c0f457cf2eb0194900c0d | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c89fb45b52fe872cd4902cfc66f697a11ef1d376 | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/071e7d2b6fb138e9e02d521c14b0077e64909df3 | s390x | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/35b844082a3f0f076156b130cbe7fe32ee2ecf3b | sh4a | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/0b7ab885c27be643ce17c597084b74b600d45ec0 | nios2 | ibrdtnd-1.0.1 | NOK | http://autobuild.buildroot.net/results/e32dd44fd9cf77cd439d2edf1027c90e96d79885 | ORPH sh4a | imagemagick-7.1.0-51 | NOK | http://autobuild.buildroot.net/results/aa46da31950506a6a4d13831b1df34a394b0851b | ORPH m68k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/8fd9f57b33568524d1af4dd0193969fac7a26988 | arceb | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/16ea3613e5ff4a029ea6db14dd689b237b6bdd51 | sh4a | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/27247e94111a8f9170020de273c809cdd9eddd90 | ORPH mips64 | kmod-30 | NOK | http://autobuild.buildroot.net/results/206c1cbd6fea08ed6a114c0d375d816bdc4bdf6f | microblaze | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/7b8e23230602768a5478208d781255a73f8553d5 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/e09a618c7ef907d45cf92b0bc346c68246157b01 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/b1928a808c68fe43b6ebed146e67aebddd1ce8c8 | ORPH armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/01187bcf80903a29ad758e6d0321e09ad7019980 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/cf1db81cb83927305d5a2f59bba7ce36e4a74e52 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/8b6877a37ee854fed2f153b1a1fa6217c78a275b | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/b83e50b96e321a810b9e4a9d075f842c359921ff | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/18a429c1ab8bf1c2c0cad7eefffb462542e4094b | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/baecdb18976e108ca87cb763427e1a25430cd847 | microblazeel | libjxl-0.7.0 | NOK | http://autobuild.buildroot.net/results/505a9767abe7116d70853ca7f5d3564fbf34be78 | powerpc | libsigsegv-2.14 | NOK | http://autobuild.buildroot.net/results/414de566389ecdc67f0d1eaa711eaffc90a2d940 | sh4aeb | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/df4578f77eea4d5589634958626c5dfa05a709d2 | ORPH mips64 | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/5d38cbd2e6e3622f8469c3ef6c124764f07acddb | ORPH m68k | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/cbe88903b2c980845c3a11c25ba8fd77cba929b6 | ORPH powerpc64le | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/ebf8e774af6d7d9e18eaa4da2ab98aaa7df25cdb | ORPH mipsel | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/40cd3c774eecd3744c65af87211e48ed116a41b7 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/bbc9762ee0358e08608132fec7886f47dd4e746b | ORPH mipsel | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/f80cbbb984b3d8c4de325653f131425920fb2ca7 | ORPH mipsel | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/3e2b5c8ea81c56f58374b384de9d6b8cd3708da9 | ORPH sh4aeb | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/60bf39ac97119b60fb675bceede9432fb432106f | ORPH arm | liquid-dsp-1.4.0 | NOK | http://autobuild.buildroot.net/results/0b384930bf48e5578842abffee065825dfc98aa6 | aarch64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/93830d30ec9301fd99f417ee4cca0a93b8020efb | ORPH powerpc64le | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/0790bbc8d99659a801f2eb108ec0dec62199fd3d | s390x | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/ceade8103e84303e205fdad31f9ba46f2617cd34 | aarch64 | luvi-2.13.0 | NOK | http://autobuild.buildroot.net/results/f63633b494b3451732ec765d7b64795a4e410f32 | ORPH aarch64 | modem-manager-1.20.4 | NOK | http://autobuild.buildroot.net/results/270c745b859ec7f7b2ae95a8f22470a966e3dde4 | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/912790f0032a222351b01367fee32e750b172b46 | aarch64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/f3c43532b6bd417abcbac646ced70c297b020a48 | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/f352489b5b0545c7a644eaa7d052b4c4d3f360dd | powerpc64le | netsniff-ng-0.6.8 | NOK | http://autobuild.buildroot.net/results/4b433a2ab36576714559fd8dd97483922f8d2e8b | sparc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/48e16f69249ca38fe2c35fa3c20f500e41058e69 | aarch64_be | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/6b4c873a9c5e32426fc2446b9dce30c5f5280cae | s390x | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/29be45c68be71d78537bd4aa0ffad2e69b0826bf | ORPH sparc | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/625944ad06a22b5de98e927acdf59859638d022d | ORPH or1k | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/7c2fcf32bcf9bf54563338eff54017fcd4ed4b79 | ORPH armeb | owl-linux-1.0.7 | NOK | http://autobuild.buildroot.net/results/45911e8e146a11aa53173a3b954de5c673ef15ac | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/6363c9474fb3485329a6b6630a5c8a1750211acd | ORPH mips64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/042b913f6252b8535fa74751b75ce58a408e2c59 | arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/61fe4b21fb819156ff7bc509b7e2a8f98ab22140 | sh4 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/bf8a14ea16a155a876ab7e302dff1f1a0c66bdc7 | sparc64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/6feda086cc912a10aaf049aa10d7c887b1b74862 | i486 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/e20361eccdd96cfe3d807f85bc680f6be8e8c9c0 | microblaze | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/e816c98d0e705dddb062b19ec39257cf18e515c7 | mips | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/601f28f6324ba7f292d9465296bcf6697ee69795 | s390x | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/1f8ba349162acd80684d05a4eae4b8ef4eec7635 | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/40c09549f7843df8319e4f8f37f914939945741f | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/44cbf26b08fc3eb5097e27077c58d0508bc8ed69 | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/b1b881c7cc99f7355cc49daa00f75b61eaa789eb | sh4 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/db051d1ea131094ebb2c36587c4d98a6c7c76fff | sh4 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/178bb7babdde395df1ed9e4a8dc6de2e13293af2 | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/bea485c7ef84ca01a08526807dd421bb357cb924 | or1k | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/960cb33e35c1e506c1b3bb663122cbf3993234de | mips | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/57e8a455791d47a7ab2d2389bf2ec32ba7e1fb4e | microblaze | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/3d53c943454adf0ac22335bdd017636c9f461ee9 | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/1ed4d2a9a19f77857e05e567b050f763faa37034 | arc | reaver-1.6.6 | NOK | http://autobuild.buildroot.net/results/5f33e33be1bc4b96a0440969140d0af42912a739 | mips | s6-linux-utils-2.6.0.0 | NOK | http://autobuild.buildroot.net/results/e41e3385b5559b59de65437ef3f26c69a5eb9214 | sh4aeb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/c2d2c1b5862a21e9f9b3c982c84551ed38a4fd1c | ORPH or1k | skalibs-2.12.0.1 | NOK | http://autobuild.buildroot.net/results/2d193c40c667ec7ed912b6c3fcbef434c878b2b7 | powerpc64le | snmppp-3.4.10 | NOK | http://autobuild.buildroot.net/results/50b8f92fdbab3e8f0b386ef4cea8884a6b3f19c3 | powerpc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/529052ca41ff9fc4022b50f1beb0967e21058429 | aarch64_be | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/0b1ce5e29326f168b1915f893018ba4d055fd914 | microblazeel | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/a81e5b7c920471d988d04b1431e314345e627f75 | microblazeel | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/576ff8326f907610c42f768acb69815a79740d43 | mips64el | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/fe35d00284ea5d06c51245dd9513cf23c251f724 | arc | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/1a6f78fa36e0fbc4de7942720e010ce04a551b15 | ORPH s390x | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/716386e31412a1c2e3f3acad88e24d3ecef90f3c | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/6964e958c5d5b3c24cd547069b129c7e87108b34 | nios2 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/82d19a0f209253ea0dc27c845932f54166c05afa | powerpc64le | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/b8db315e56ba313d6489036c20aa43609289474e | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/846a9f7bc0f41da2bfd4f18377470f2c329a8ce2 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/fe5fbb92594a62fb30aa6803fbb990aae23c0507 | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/3bb5a72c3b3d58a37ec7a1f406ff2f9c896e25a6 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/79b1637148d7d4fa8215b56eae0969a66d189cb0 | mips | unknown | NOK | http://autobuild.buildroot.net/results/9ad0e1ca793568420420bf7d1e72ae7873b04238 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/ede47e2c46dc7b7d7109b22783938c38d726ef87 | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/5a3b7ac0d425fe82d2fc07aaab36c35c8ccb1c8e | mips | unknown | NOK | http://autobuild.buildroot.net/results/17e51f61405112a7ce7d70e121ce3cda5dea3ff4 | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/65e2288f41ff3dd0c1cecdf0a1b5d2a68eecbedf | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/4f1d0ab3efbd93737be5f8b03ca2e0e548dc3b15 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/e8ba058488bdd7bb3c188c026629e9e08fa42d5d | i686 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/88802c80854626cd34f88d98ead9aec29ab12ceb | ORPH or1k | vdr-2.6.3 | NOK | http://autobuild.buildroot.net/results/7cfd815037e345b2ef9d309bf9d59bc6310e1ebe | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/8acd7f1fe23fcc84b915f53b145905b747f8d185 | ORPH arceb | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/f349130985870f4a781cca56c3f551108f81aa3e | microblaze | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/07b4740f56668c3d9ec5a71f945533e1ceacdae9 | riscv32 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/a5f4acb08892f2dfa3658106a6174eae5638fb5e | nios2 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/dbf2ebd472615b2b652bff7822d1214cf71bb43f | mips64 | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/3b46e7a419df07412601b65a7444d6a4e4405941 | ORPH arc | xtables-addons-3.22 | NOK | http://autobuild.buildroot.net/results/501d47ccc3f1096d159d92f9cf2d98dced0566da | ORPH arc | xtables-addons-3.22 | NOK | http://autobuild.buildroot.net/results/2f204a9c05b5801f251c0c799ee6a8d607ea6efa | ORPH aarch64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/c72e49479e541bde248490173a6a4b76366eb7fd | microblazeel | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/a8aed62e550cf20dc20737e7516a6fa0875a0be0 | nios2 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/4f7406ec4bf7c72dca8b4ba2109977ce1771b90a | aarch64_be | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/712c35d84c03041c81991f07549d09869be1ff15 | nios2 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/9303fc036e98267ea4fda8fde6d89c83f6a15c40 | aarch64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/9b6da726841e8a4281be61442f47165bc77d8884 | mips64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/7a3a0f152bdbc4b7a6a6fc91794bdec17a0c85e5 | powerpc64 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/c7c58429e597c0d496244924aaf5a8aa65d5650f | sparc | zxing-cpp-1.4.0 | NOK | http://autobuild.buildroot.net/results/77002bd19a9b8a089d340f20880144bc8b58745c | Classification of failures by reason for 2022.02.x -------------------------------------------------- zabbix-5.4.9 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- s390x | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/2aabb416e97609e1868056ca7a0bb294fe8f6b20 | Classification of failures by reason for 2022.11.x -------------------------------------------------- xxhash-0.8.1 | 2 zabbix-5.4.9 | 2 audit-3.0.7 | 1 efivar-38 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 gerbera-1.10.0 | 1 gobject-introspection-1.72.0 | 1 host-pahole-1.24 | 1 libglib2-2.72.3 | 1 lirc-tools-0.10.2 | 1 lttng-modules-2.13.1 | 1 netsurf-3.10 | 1 pcsc-lite-1.9.9 | 1 unknown | 1 xenomai-3.0.10 | 1 xz-5.2.7 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | audit-3.0.7 | NOK | http://autobuild.buildroot.net/results/0bd7bcc8e1eb49d6800fe728fb52d84a3575ce81 | mipsel | efivar-38 | NOK | http://autobuild.buildroot.net/results/932e5c9fd97b8a9666e8eb11d5ec5431edc5be39 | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/6dd752c77ed42e9ecce56da8b0907682f82b0b5c | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/1fbda6fb4f804f66094b99b8f99dd94ba80895a8 | x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2d6e5ccd1c48c3269e83fc339abe59fe3efbda5d | ORPH xtensa | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8e60bb21a91c48ca5cd304593f802b55af1810eb | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/26ce3470b5ebf9c951abbc49dd0aaffcf18496a8 | arm | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/dcba3c40836b61f452e190307ea7e10d367d4da7 | ORPH aarch64_be | lttng-modules-2.13.1 | NOK | http://autobuild.buildroot.net/results/12ca286547d078f79316526ebcc095f5ab89076a | sparc64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/9ecd505890cb5927bc45fddde8f2ec9d6c5336cd | or1k | pcsc-lite-1.9.9 | NOK | http://autobuild.buildroot.net/results/32327068d68750e0745c39e2579969d5185db47b | ORPH aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/f244f9aab5c14fcb71ec3cac0adfa516b293a1a8 | m68k | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/bc2a11d3b5128b321e5aec77afc2c4a69498ecfa | or1k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/991ef12aa98d259aa363f7f56e4d393daf60c2e8 | ORPH or1k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/94833d60d5e186466eb11771662f4068378a744b | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/d20cb1891f8ec9d319253d0311cff0d018fb4a09 | ORPH mips | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/d634c8a94e81f911e679cd21bed55c947301f618 | mips64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/781606f1fdf7bad8457fbf24d5f85ede9f29cc83 | -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Fri Feb 17 13:28:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:28:47 +0100 Subject: [Buildroot] [git commit] package/dotconf: new package Message-ID: <20230217133205.0674E85FAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5336566668bd2ac9cd458a051eb6e8105d4b4544 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/dotconf/Config.in | 6 ++++++ package/dotconf/dotconf.hash | 3 +++ package/dotconf/dotconf.mk | 15 +++++++++++++++ 5 files changed, 28 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f8451c7fec..b9d54feb46 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2297,6 +2297,9 @@ F: package/wireguard-linux-compat/ F: package/wireguard-tools/ F: support/testing/tests/package/test_docker_compose.py +N: Peter Seiderer +F: package/dotconf/ + N: Peter Thompson F: package/sdl2_gfx/ F: package/sdl2_image/ diff --git a/package/Config.in b/package/Config.in index 0af4adffa5..b2808cc6f8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2019,6 +2019,7 @@ menu "Other" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" source "package/ding-libs/Config.in" + source "package/dotconf/Config.in" source "package/double-conversion/Config.in" source "package/eigen/Config.in" source "package/elfutils/Config.in" diff --git a/package/dotconf/Config.in b/package/dotconf/Config.in new file mode 100644 index 0000000000..21a74fa065 --- /dev/null +++ b/package/dotconf/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_DOTCONF + bool "dotconf" + help + Configuration file parser. + + https://github.com/williamh/dotconf diff --git a/package/dotconf/dotconf.hash b/package/dotconf/dotconf.hash new file mode 100644 index 0000000000..3233ea62c8 --- /dev/null +++ b/package/dotconf/dotconf.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7f1ecf40de1ad002a065a321582ed34f8c14242309c3547ad59710ae3c805653 dotconf-1.3.tar.gz +sha256 a50cc98d5044a7bbddabe61fc0ec42aa671c73bf414d0c6b50da83ea8ae041c6 COPYING diff --git a/package/dotconf/dotconf.mk b/package/dotconf/dotconf.mk new file mode 100644 index 0000000000..26e78b3c7a --- /dev/null +++ b/package/dotconf/dotconf.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# dotconf +# +################################################################################ + +DOTCONF_VERSION = 1.3 +DOTCONF_SITE = $(call github,williamh,dotconf,v$(DOTCONF_VERSION)) +DOTCONF_LICENSE = LGPL-2.1 +DOTCONF_LICENSE_FILES = COPYING +DOTCONF_INSTALL_STAGING = YES +# dotconf source code is released without configure script +DOTCONF_AUTORECONF = YES + +$(eval $(autotools-package)) From giulio.benetti at benettiengineering.com Fri Feb 17 13:32:41 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 17 Feb 2023 14:32:41 +0100 Subject: [Buildroot] [PATCH] package/libfuse3: bump to version 3.14.0 Message-ID: <20230217133241.533189-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index f697f4ad3f..2d78153c81 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 96399b09b91bc717a9e96ffea660d611e6a342547c1abd4d0e858b3dca9d5a13 libfuse3-3.13.1.tar.gz +sha256 b14f7d97abc11a5a70a37955021a7a1d8eb1d3dd5b6abec66af093eae3168c62 libfuse3-3.14.0.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index a2e9775868..8c306ba187 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.13.1 +LIBFUSE3_VERSION = 3.14.0 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE -- 2.34.1 From thomas.petazzoni at bootlin.com Fri Feb 17 13:32:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:32:58 +0100 Subject: [Buildroot] [PATCH v1] package/dotconf: new package In-Reply-To: <20230106210827.30007-1-ps.report@gmx.net> References: <20230106210827.30007-1-ps.report@gmx.net> Message-ID: <20230217143258.0f756d59@windsurf> Hello Peter, On Fri, 6 Jan 2023 22:08:25 +0100 Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > package/Config.in | 1 + > package/dotconf/Config.in | 6 ++++++ > package/dotconf/dotconf.hash | 3 +++ > package/dotconf/dotconf.mk | 15 +++++++++++++++ > 4 files changed, 25 insertions(+) > create mode 100644 package/dotconf/Config.in > create mode 100644 package/dotconf/dotconf.hash > create mode 100644 package/dotconf/dotconf.mk I've applied after adding an entry in the DEVELOPERS file for this package. I know you dropped yourself from the DEVELOPERS file in September 2022, but apparently you're back, and for new packages, we really want to have someone associated to them in the DEVELOPERS file to take care of build issues. Hopefully you are fine with this. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 17 13:45:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:45:57 +0100 Subject: [Buildroot] [git commit] package/speechd: new package Message-ID: <20230217134632.6C4D385FC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/speechd/Config.in | 20 ++++++++++++++++++++ package/speechd/speechd.hash | 5 +++++ package/speechd/speechd.mk | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b9d54feb46..319ea9f4dc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2299,6 +2299,7 @@ F: support/testing/tests/package/test_docker_compose.py N: Peter Seiderer F: package/dotconf/ +F: package/speechd/ N: Peter Thompson F: package/sdl2_gfx/ diff --git a/package/Config.in b/package/Config.in index b2808cc6f8..e9746862b4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -51,6 +51,7 @@ menu "Audio and video applications" source "package/pipewire-media-session/Config.in" source "package/pulseaudio/Config.in" source "package/sox/Config.in" + source "package/speechd/Config.in" source "package/squeezelite/Config.in" source "package/tinycompress/Config.in" source "package/tovid/Config.in" diff --git a/package/speechd/Config.in b/package/speechd/Config.in new file mode 100644 index 0000000000..8fdc452d19 --- /dev/null +++ b/package/speechd/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_SPEECHD + bool "speechd" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_DOTCONF + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSNDFILE + help + Speech Dispatcher project provides a high-level device + independent layer for access to speech synthesis through + a simple, stable and well documented interface. + + https://freebsoft.org/speechd + +comment "speechd needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/speechd/speechd.hash b/package/speechd/speechd.hash new file mode 100644 index 0000000000..4eb4cd09d2 --- /dev/null +++ b/package/speechd/speechd.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 628d4446894b47f0df099123924c1070180b5b5b09c5b637ebe80d8578fba92f speechd-0.11.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL-2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL-3 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk new file mode 100644 index 0000000000..0d43e4b6fb --- /dev/null +++ b/package/speechd/speechd.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# speechd +# +################################################################################ + +SPEECHD_VERSION = 0.11.4 +SPEECHD_SITE = $(call github,brailcom,speechd,$(SPEECHD_VERSION)) +SPEECHD_LICENSE = GPL-2.0+, GPL-3.0+ (buildsystem), LGPL-2.1+ +SPEECHD_LICENSE_FILES = COPYING.GPL-2 COPYING.GPL-3 COPYING.LGPL +SPEECHD_INSTALL_STAGING = YES +# speechd source code is released without configure script +SPEECHD_AUTORECONF = YES +SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile + +# fix missing config.rpath (needed for autoreconf) in the codebase +define SPEECHD_TOUCH_CONFIG_RPATH + touch $(@D)/config.rpath +endef +SPEECHD_PRE_CONFIGURE_HOOKS += SPEECHD_TOUCH_CONFIG_RPATH + +ifeq ($(BR2_PACKAGE_LIBTOOL),y) +SPEECHD_DEPENDENCIES += libtool +SPEECHD_CONF_OPTS += --with-libltdl +else +SPEECHD_CONF_OPTS += --without-libltdl +endif + +define SPEECHD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/speech-dispatcherd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/speech-dispatcherd.service +endef + +$(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Fri Feb 17 13:46:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:46:45 +0100 Subject: [Buildroot] [PATCH v1] package/speechd: new package In-Reply-To: <20230106210827.30007-2-ps.report@gmx.net> References: <20230106210827.30007-1-ps.report@gmx.net> <20230106210827.30007-2-ps.report@gmx.net> Message-ID: <20230217144645.536cea66@windsurf> On Fri, 6 Jan 2023 22:08:26 +0100 Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Notes/Todo: > - double check license description against > https://github.com/brailcom/speechd#license > - maybe add SYSV init script > --- > package/Config.in | 1 + > package/speechd/Config.in | 20 ++++++++++++++++++++ > package/speechd/speechd.hash | 5 +++++ > package/speechd/speechd.mk | 34 ++++++++++++++++++++++++++++++++++ > 4 files changed, 60 insertions(+) > create mode 100644 package/speechd/Config.in > create mode 100644 package/speechd/speechd.hash > create mode 100644 package/speechd/speechd.mk Applied to master, after adding an entry in the DEVELOPERS file! Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 17 13:47:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:47:44 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5speech: new package Message-ID: <20230217134803.3E53785FCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ced0a528ddbffcc130997aaeee7598c82c6cd49 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/qt5/Config.in | 1 + package/qt5/qt5speech/Config.in | 12 ++++++++++++ package/qt5/qt5speech/qt5speech.hash | 7 +++++++ package/qt5/qt5speech/qt5speech.mk | 23 +++++++++++++++++++++++ 5 files changed, 44 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 319ea9f4dc..a429f81cc9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2299,6 +2299,7 @@ F: support/testing/tests/package/test_docker_compose.py N: Peter Seiderer F: package/dotconf/ +F: package/qt5/qt5speech/ F: package/speechd/ N: Peter Thompson diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 6dc9cfa148..f1b16ff39b 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -59,6 +59,7 @@ source "package/qt5/qt5scxml/Config.in" source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialbus/Config.in" source "package/qt5/qt5serialport/Config.in" +source "package/qt5/qt5speech/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5tools/Config.in" source "package/qt5/qt5virtualkeyboard/Config.in" diff --git a/package/qt5/qt5speech/Config.in b/package/qt5/qt5speech/Config.in new file mode 100644 index 0000000000..cebd06057e --- /dev/null +++ b/package/qt5/qt5speech/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_QT5SPEECH + bool "qt5speech" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qt Speech enables support for accessibility features such as + text-to-speech. + + For output optional enable flite or speechd. + + https://doc.qt.io/qt-5/qtspeech-index.html diff --git a/package/qt5/qt5speech/qt5speech.hash b/package/qt5/qt5speech/qt5speech.hash new file mode 100644 index 0000000000..595aac9f22 --- /dev/null +++ b/package/qt5/qt5speech/qt5speech.hash @@ -0,0 +1,7 @@ +# Locally calculated +sha256 6d0794ab9d5286d04fbac2db44c00ed3306e569c876f84cfd91ac0e79c834b1e qtspeech-d32f4a479d38a11f547598004b975f4356424a16.tar.bz2 + +# Hashes for license files: +sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 +sha256 75d800e60c8d58c2e7f0338e8552ea6123a9ce7e5dd8e1cdf2095e013b737488 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5speech/qt5speech.mk b/package/qt5/qt5speech/qt5speech.mk new file mode 100644 index 0000000000..8cf6fe19c1 --- /dev/null +++ b/package/qt5/qt5speech/qt5speech.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# qt5speech +# +################################################################################ + +QT5SPEECH_VERSION = d32f4a479d38a11f547598004b975f4356424a16 +QT5SPEECH_SITE = $(QT5_SITE)/qtspeech/-/archive/$(QT5SPEECH_VERSION) +QT5SPEECH_SOURCE = qtspeech-$(QT5SPEECH_VERSION).tar.bz2 +QT5SPEECH_INSTALL_STAGING = YES +QT5SPEECH_LICENSE = GPL-2.0+ or LGPL-3.0, GFDL-1.3 (docs) +QT5SPEECH_LICENSE_FILES = LICENSE.GPLv2 LICENSE.LGPLv3 LICENSE.FDL +QT5SPEECH_SYNC_QT_HEADERS = YES + +ifeq ($(BR2_PACKAGE_FLITE),y) +QT5SPEECH_DEPENDENCIES += flite +endif + +ifeq ($(BR2_PACKAGE_SPEECHD),y) +QT5SPEECH_DEPENDENCIES += speechd +endif + +$(eval $(qmake-package)) From thomas.petazzoni at bootlin.com Fri Feb 17 13:48:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:48:14 +0100 Subject: [Buildroot] [PATCH v1] package/qt5speech: new package In-Reply-To: <20230106210827.30007-3-ps.report@gmx.net> References: <20230106210827.30007-1-ps.report@gmx.net> <20230106210827.30007-3-ps.report@gmx.net> Message-ID: <20230217144814.5f8689bb@windsurf> On Fri, 6 Jan 2023 22:08:27 +0100 Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > package/qt5/Config.in | 1 + > package/qt5/qt5speech/Config.in | 12 ++++++++++++ > package/qt5/qt5speech/qt5speech.hash | 7 +++++++ > package/qt5/qt5speech/qt5speech.mk | 23 +++++++++++++++++++++++ > 4 files changed, 43 insertions(+) > create mode 100644 package/qt5/qt5speech/Config.in > create mode 100644 package/qt5/qt5speech/qt5speech.hash > create mode 100644 package/qt5/qt5speech/qt5speech.mk Applied to master after adding an entry to the DEVELOPERS file. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 17 14:10:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 15:10:41 +0100 Subject: [Buildroot] [PATCH] python-wheel: new package In-Reply-To: <20221025065356.1838-1-afshin.nasser@gmail.com> References: <20221025065356.1838-1-afshin.nasser@gmail.com> Message-ID: <20230217151041.5d6ece80@windsurf> Hello Nasser, Thanks for the contribution, and sorry for the very slow feedback :-/ On Tue, 25 Oct 2022 10:23:56 +0330 Nasser Afshin wrote: > Signed-off-by: Nasser Afshin > --- > package/Config.in | 1 + > package/python-wheel/Config.in | 15 +++++++++++++++ > package/python-wheel/python-wheel.hash | 5 +++++ > package/python-wheel/python-wheel.mk | 14 ++++++++++++++ > 4 files changed, 35 insertions(+) > create mode 100644 package/python-wheel/Config.in > create mode 100644 package/python-wheel/python-wheel.hash > create mode 100644 package/python-wheel/python-wheel.mk Could you give some details on the use case for python-wheels on the target? Also, could you add an entry to the DEVELOPERS file? In addition, for Python packages, we really like to have a runtime test in support/testing/. Could you have a look into this? > source "package/python-ws4py/Config.in" > diff --git a/package/python-wheel/Config.in b/package/python-wheel/Config.in > new file mode 100644 > index 0000000000..225d7529a4 > --- /dev/null > +++ b/package/python-wheel/Config.in > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_PYTHON_WHEEL > + bool "python-wheel" > + help > + This library is the reference implementation of the Python wheel > + packaging standard, as defined in PEP 427. > + > + It has two different roles: > + 1. A setuptools extension for building wheels that provides the bdist_wheel > + setuptools command > + 2. A command line tool for working with wheel files > + > + It should be noted that wheel is not intended to be used as a library, and as > + such there is no stable, public API. > + > + https://github.com/pypa/wheel The indentation is not correct. Could you run "make check-package" and make sure there are no warnings? > index 0000000000..d8fab54867 > --- /dev/null > +++ b/package/python-wheel/python-wheel.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-wheel > +# > +################################################################################ > + > +PYTHON_WHEEL_VERSION = 0.37.1 > +PYTHON_WHEEL_SOURCE = wheel-$(PYTHON_WHEEL_VERSION).tar.gz > +PYTHON_WHEEL_SITE = https://files.pythonhosted.org/packages/c0/6c/9f840c2e55b67b90745af06a540964b73589256cb10cc10057c87ac78fc2 > +PYTHON_WHEEL_SETUP_TYPE = distutils Are you sure? It seems to be using setuptools. Could you double check this? Could you fix this and resend, as a new patch sent with "git send-email" (and not in the middle of a reply, like you did for python-pycrate, which was not good)? Thanks a lot! Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 17 14:08:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 15:08:49 +0100 Subject: [Buildroot] [git commit] package/python-pycrate: new package Message-ID: <20230217141250.EF90C85FD9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a850f632b9f76b8526f807468548c570b1dc2bd6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Nasser Afshin Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-pycrate/Config.in | 6 ++++++ package/python-pycrate/python-pycrate.hash | 5 +++++ package/python-pycrate/python-pycrate.mk | 20 ++++++++++++++++++++ 5 files changed, 35 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a429f81cc9..3d9c51a094 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2092,6 +2092,9 @@ N: Murat Demirten F: package/jpeg-turbo/ F: package/libgeotiff/ +N: Nasser Afshin +F: package/python-pycrate/ + N: Nathaniel Roach F: package/bandwidthd/ F: package/libgudev/ diff --git a/package/Config.in b/package/Config.in index e9746862b4..523cf7cbdf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1196,6 +1196,7 @@ menu "External python modules" source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" source "package/python-pycparser/Config.in" + source "package/python-pycrate/Config.in" source "package/python-pycryptodomex/Config.in" source "package/python-pycups/Config.in" source "package/python-pydal/Config.in" diff --git a/package/python-pycrate/Config.in b/package/python-pycrate/Config.in new file mode 100644 index 0000000000..193a973f7e --- /dev/null +++ b/package/python-pycrate/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYCRATE + bool "python-pycrate" + help + A software suite to handle various data formats. + + https://github.com/P1sec/pycrate/ diff --git a/package/python-pycrate/python-pycrate.hash b/package/python-pycrate/python-pycrate.hash new file mode 100644 index 0000000000..e37fd6743a --- /dev/null +++ b/package/python-pycrate/python-pycrate.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pycrate/json +md5 075622d5d573274cd4dbfe268ca52f7f pycrate-0.5.5.tar.gz +sha256 59f09331890a389a6b98412f19f4fb021c5a75a35ab07bf5ba0d1e299a0967af pycrate-0.5.5.tar.gz +# Locally computed +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 license.txt diff --git a/package/python-pycrate/python-pycrate.mk b/package/python-pycrate/python-pycrate.mk new file mode 100644 index 0000000000..6779433556 --- /dev/null +++ b/package/python-pycrate/python-pycrate.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-pycrate +# +################################################################################ + +PYTHON_PYCRATE_VERSION = 0.5.5 +PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz +PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/25/8f/b3d7e0b541aa04b2f0f7aa694a6946b572bfa2e2627cf1f12b5416d633df +PYTHON_PYCRATE_SETUP_TYPE = setuptools +PYTHON_PYCRATE_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/P1sec/pycrate/$(PYTHON_PYCRATE_VERSION)/license.txt +PYTHON_PYCRATE_LICENSE = LGPL-2.1+ +PYTHON_PYCRATE_LICENSE_FILES = license.txt + +define PYTHON_PYCRATE_ADD_LICENSE_FILE + cp $(PYTHON_PYCRATE_DL_DIR)/license.txt $(@D) +endef +PYTHON_PYCRATE_POST_EXTRACT_HOOKS += PYTHON_PYCRATE_ADD_LICENSE_FILE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Fri Feb 17 14:36:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 15:36:24 +0100 Subject: [Buildroot] [PATCH v3 RESEND] python-pycrate: new package In-Reply-To: <20221108084551.GA22961@smart-All-Series> References: <20221025065539.4646-1-afshin.nasser@gmail.com> <20221026102255.GA602@smart-All-Series> <20221029080229.GA24217@smart-All-Series> <20221108084551.GA22961@smart-All-Series> Message-ID: <20230217153624.58898d55@windsurf> Hello, On Tue, 8 Nov 2022 12:15:51 +0330 Nasser Afshin wrote: > > > From de6e28885836a6d9a5347a083a68055098508583 Mon Sep 17 00:00:00 2001 > > > From: Nasser Afshin > > > Date: Tue, 25 Oct 2022 16:06:53 +0330 > > > Subject: [PATCH v3] python-pycrate: new package > > > > > > Signed-off-by: Nasser Afshin Thanks for your contribution. However what you did here when resending a new iteration really wasn't convenient to apply the patch. Next time could you use "git send-email" to send the new iteration as a new-email. Some more comments below. > > > diff --git a/package/python-pycrate/python-pycrate.hash b/package/python-pycrate/python-pycrate.hash > > > new file mode 100644 > > > index 0000000000..8ad33370b4 > > > --- /dev/null > > > +++ b/package/python-pycrate/python-pycrate.hash > > > @@ -0,0 +1,6 @@ > > > +# md5, sha256 from https://pypi.org/pypi/pycrate/json > > > +md5 075622d5d573274cd4dbfe268ca52f7f pycrate-0.5.5.tar.gz > > > +sha256 59f09331890a389a6b98412f19f4fb021c5a75a35ab07bf5ba0d1e299a0967af pycrate-0.5.5.tar.gz > > > +# Locally computed > > > +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 license.txt This did not match the expected formatting. "make check-package" complains about formatting issues in the hash file. > > > diff --git a/package/python-pycrate/python-pycrate.mk b/package/python-pycrate/python-pycrate.mk > > > new file mode 100644 > > > index 0000000000..c0da152656 > > > --- /dev/null > > > +++ b/package/python-pycrate/python-pycrate.mk > > > @@ -0,0 +1,14 @@ > > > +################################################################################ > > > +# > > > +# python-pycrate > > > +# > > > +################################################################################ > > > + > > > +PYTHON_PYCRATE_VERSION = 0.5.5 > > > +PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz > > > +PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/25/8f/b3d7e0b541aa04b2f0f7aa694a6946b572bfa2e2627cf1f12b5416d633df > > > +PYTHON_PYCRATE_SETUP_TYPE = setuptools > > > +PYTHON_PYCRATE_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/P1sec/pycrate/master/license.txt This was not good for three reasons: (1) The license.txt was not listed in PYTHON_PYCRATE_LICENSE_FILES so it was not taken into account (2) The URL from which you download the file does not point to a stable file: it's the file from the master branch, so it can change at any time, breaking the hash check, but also potentially being inconsistent with the license of version 0.5.5 that the package is using (3) The license.txt was not copied into the source directory of the package, making it unaccessible to the legal-info machinery. With these issues fixed, the .mk file looks like this: PYTHON_PYCRATE_VERSION = 0.5.5 PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/25/8f/b3d7e0b541aa04b2f0f7aa694a6946b572bfa2e2627cf1f12b5416d633df PYTHON_PYCRATE_SETUP_TYPE = setuptools PYTHON_PYCRATE_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/P1sec/pycrate/$(PYTHON_PYCRATE_VERSION)/license.txt PYTHON_PYCRATE_LICENSE = LGPL-2.1+ PYTHON_PYCRATE_LICENSE_FILES = license.txt define PYTHON_PYCRATE_ADD_LICENSE_FILE cp $(PYTHON_PYCRATE_DL_DIR)/license.txt $(@D) endef PYTHON_PYCRATE_POST_EXTRACT_HOOKS += PYTHON_PYCRATE_ADD_LICENSE_FILE $(eval $(python-package)) I've applied after fixing the different issues. However, one thing that would be really good to add is a runtime test in support/testing/ to make sure that the package is at least minimally working at runtime. You can take a look at all the support/testing/tests/package/test_python* files for examples. Thanks a lot! 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 Feb 17 14:57:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 15:57:08 +0100 Subject: [Buildroot] [git commit] package/catch2: new package Message-ID: <20230217145951.7793585FED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5b597d5d839486e82a80f1c59c2a91a5af87c06 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Catch2 is a modern C++ unit testing framework which is increasing in popularity. This package is staging only and allows to build tests to be run on the target. - https://github.com/catchorg/Catch2 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/catch2/Config.in | 28 ++++++++++++++++++++++++++++ package/catch2/catch2.hash | 3 +++ package/catch2/catch2.mk | 22 ++++++++++++++++++++++ 5 files changed, 55 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3d9c51a094..7894b10e38 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2035,6 +2035,7 @@ F: package/sdl2/ N: Michael Nosthoff F: package/boost/ +F: package/catch2/ F: package/fmt/ F: package/grpc/ F: package/gtest/ diff --git a/package/Config.in b/package/Config.in index 523cf7cbdf..6c5238a9b0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2012,6 +2012,7 @@ menu "Other" source "package/boost/Config.in" source "package/c-capnproto/Config.in" source "package/capnproto/Config.in" + source "package/catch2/Config.in" source "package/cctz/Config.in" source "package/cereal/Config.in" source "package/clang/Config.in" diff --git a/package/catch2/Config.in b/package/catch2/Config.in new file mode 100644 index 0000000000..2f53d197b2 --- /dev/null +++ b/package/catch2/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_CATCH2 + bool "catch2" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_USE_MMU # fork() + help + Catch2 is mainly a unit testing framework for C++, but it + also provides basic micro-benchmarking features, and simple + BDD macros. + + Catch2's main advantage is that using it is both simple and + natural. Tests autoregister themselves and do not have to + be named with valid identifiers, assertions look like + normal C++ code, and sections provide a nice way to share + set-up and tear-down code in tests. + + This package allows running testsuites on the target which + might be advantageous in certain cases. + + https://github.com/catchorg/Catch2 + +comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash new file mode 100644 index 0000000000..664164fd76 --- /dev/null +++ b/package/catch2/catch2.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 2106bccfec18c8ce673623d56780220e38527dd8f283ccba26aa4b8758737d0e catch2-3.1.1.tar.gz +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk new file mode 100644 index 0000000000..ab62cc943b --- /dev/null +++ b/package/catch2/catch2.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# catch2 +# +################################################################################ + +CATCH2_VERSION = 3.1.1 +CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) +CATCH2_INSTALL_STAGING = YES +CATCH2_INSTALL_TARGET = NO +CATCH2_LICENSE = BSL-1.0 +CATCH2_LICENSE_FILES = LICENSE.txt +CATCH2_SUPPORTS_IN_SOURCE_BUILD = NO + +# We force building a static library only as building a dynamic +# library is not really supported officially: +# https://github.com/catchorg/Catch2/blob/devel/docs/faq.md#can-i-compile-catch2-into-a-dynamic-library +CATCH2_CONF_OPTS = \ + -DCATCH_INSTALL_DOCS=OFF \ + -DBUILD_SHARED_LIBS=OFF + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Fri Feb 17 15:01:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:01:10 +0100 Subject: [Buildroot] [PATCH v3] package/catch2: new package In-Reply-To: <20221025190109.320525-1-buildroot@heine.tech> References: <20221025190109.320525-1-buildroot@heine.tech> Message-ID: <20230217160110.60c3b66d@windsurf> Hello Michael, On Tue, 25 Oct 2022 21:01:09 +0200 Michael Nosthoff via buildroot wrote: > Catch2 is a modern C++ unit testing framework which is > increasing in popularity. > This package is staging only and allows to build tests > to be run on the target. > > - https://github.com/catchorg/Catch2 > > Signed-off-by: Michael Nosthoff Sorry for the huge delay. I have applied your patch to master, with two small changes, see below. > +CATCH2_VERSION = 3.1.1 > +CATCH2_SOURCE = v$(CATCH2_VERSION).tar.gz > +CATCH2_SITE = https://github.com/catchorg/Catch2/archive I've used the github macro instead, because you're anyway downloading the auto-generated tarball from Github here. > +CATCH2_INSTALL_STAGING = YES > +CATCH2_INSTALL_TARGET = NO > +CATCH2_LICENSE = BSL-1.0 > +CATCH2_LICENSE_FILES = LICENSE.txt > +CATCH2_SUPPORTS_IN_SOURCE_BUILD = NO > + > +CATCH2_CONF_OPTS = -DCATCH_INSTALL_DOCS=OFF \ > + -DBUILD_SHARED_LIBS=OFF I fixed up the indentation here, and added a comment to explain why we unconditionally disable shared libraries. 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 Fri Feb 17 15:02:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:02:28 +0100 Subject: [Buildroot] [git commit] package/openipmi: add libexecinfo optional dependency Message-ID: <20230217150858.DA9E286000@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5357f650d7e58043a5b8ab820972984eb07fef4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add libexecinfo optional dependency as upstream rejected the patch to add --with-execinfo=no Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-configure.ac-add-without-execinfo-option.patch | 55 ---------------------- package/openipmi/openipmi.mk | 6 ++- 2 files changed, 5 insertions(+), 56 deletions(-) diff --git a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch deleted file mode 100644 index e1838a06f4..0000000000 --- a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 388033e3d0129510c3884333bc428cefeb75e0b8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 3 Jan 2022 23:27:21 +0100 -Subject: [PATCH] configure.ac: add --without-execinfo option - -Add an option to allow the user to disable execinfo to avoid the -following build failure on musl with -https://github.com/mikroskeem/libexecinfo: - -/home/buildroot/autobuild/instance-3/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-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' - -Fixes: - - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://sourceforge.net/p/openipmi/patches/36] ---- - configure.ac | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 607864b9..f369166f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -77,6 +77,16 @@ AC_ARG_WITH(poptlibs, - POPTLIBS="$withval" - ) - -+tryexecinfo=yes -+AC_ARG_WITH(execinfo, -+[ --with-execinfo[[=yes|no]] Look for execinfo.], -+ if test "x$withval" = "xyes"; then -+ tryexecinfo=yes -+ elif test "x$withval" = "xno"; then -+ tryexecinfo=no -+ fi, -+) -+ - # If UCD SNMP requires OpenSSL, this tells where to find the crypto lib - tryopenssl=yes - AC_ARG_WITH(openssl, -@@ -275,7 +285,9 @@ AM_PROG_CC_C_O - AC_PROG_LIBTOOL - AC_STDC_HEADERS - --AC_CHECK_HEADERS(execinfo.h) -+if test "x$tryexecinfo" != "xno"; then -+ AC_CHECK_HEADERS(execinfo.h) -+fi - AC_CHECK_HEADERS([netinet/ether.h]) - AC_CHECK_HEADERS([sys/ethernet.h]) - --- -2.34.1 - diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index b3a4d90d4b..81492ec131 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -15,7 +15,6 @@ OPENIPMI_INSTALL_STAGING = YES OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" OPENIPMI_CONF_OPTS = \ - --with-execinfo=no \ --with-glib=no \ --with-tcl=no \ --with-perl=no \ @@ -26,6 +25,11 @@ ifeq ($(BR2_PACKAGE_GDBM),y) OPENIPMI_DEPENDENCIES += gdbm endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +OPENIPMI_DEPENDENCIES += libexecinfo +OPENIPMI_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPENIPMI_DEPENDENCIES += openssl OPENIPMI_CONF_OPTS += --with-openssl=yes From thomas.petazzoni at bootlin.com Fri Feb 17 15:02:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:02:38 +0100 Subject: [Buildroot] [git commit] package/openipmi: bump to version 2.0.33 Message-ID: <20230217150858.E63F986002@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c674014c1744dd6db3dd8717efca51fe7ceb1038 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) and so also drop autoreconf Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Avoid-searching-host-library-path.patch | 53 ---------------------- package/openipmi/openipmi.hash | 6 +-- package/openipmi/openipmi.mk | 4 +- 3 files changed, 4 insertions(+), 59 deletions(-) diff --git a/package/openipmi/0001-Avoid-searching-host-library-path.patch b/package/openipmi/0001-Avoid-searching-host-library-path.patch deleted file mode 100644 index 15b4510f67..0000000000 --- a/package/openipmi/0001-Avoid-searching-host-library-path.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Wed, 22 Jul 2015 07:04:33 +0300 -Subject: [PATCH] Avoid searching host library path - -The $(libdir) variable points to the location of the directory on the target -system, /usr/lib by default. When cross compiling this directory contains the -host libraries which may be different than target libraries. Don't use -$(libdir) in the library search path. - -Signed-off-by: Baruch Siach -Signed-off-by: Joel Stanley -[Fabrice: refresh patch for 2.0.32] -Signed-off-by: Fabrice Fontaine -[Upstream status: https://sourceforge.net/p/openipmi/patches/35] ---- - cmdlang/Makefile.am | 3 +-- - unix/Makefile.am | 6 ++---- - 2 files changed, 3 insertions(+), 6 deletions(-) - -diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index 264ee12be79f..0b3843784656 100644 ---- a/cmdlang/Makefile.am -+++ b/cmdlang/Makefile.am -@@ -15,7 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ - $(top_builddir)/utils/libOpenIPMIutils.la \ - $(top_builddir)/lib/libOpenIPMI.la - libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - bin_PROGRAMS = openipmish - -diff --git a/unix/Makefile.am b/unix/Makefile.am -index 5128839dad13..bd0f897ba8d6 100644 ---- a/unix/Makefile.am -+++ b/unix/Makefile.am -@@ -10,12 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la - libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ - $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) - libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c - libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ - $(GDBM_LIB) $(RT_LIB) - libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - noinst_HEADERS = heap.h - diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash index eded076ade..fc3cf1a520 100644 --- a/package/openipmi/openipmi.hash +++ b/package/openipmi/openipmi.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 73d7dce4312b006983b11367e4a43d4ec52cf888 OpenIPMI-2.0.32.tar.gz -md5 532404c9df7d0e8bde975b95b9e6775b OpenIPMI-2.0.32.tar.gz +sha1 4387f227aad92756e296d1c9421e83231d355dbd OpenIPMI-2.0.33.tar.gz +md5 923d2914dbbc3307712f8c58401bab0f OpenIPMI-2.0.33.tar.gz # Locally computed -sha256 f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945 OpenIPMI-2.0.32.tar.gz +sha256 fb53e9ea5e2681cf8af7cda024b1a0044c675f84116ca27ae9616c8b7ad95b49 OpenIPMI-2.0.33.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index 81492ec131..ccf86f93cd 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -4,15 +4,13 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.32 +OPENIPMI_VERSION = 2.0.33 OPENIPMI_SITE = https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD OPENIPMI_DEPENDENCIES = popt ncurses readline host-pkgconf OPENIPMI_INSTALL_STAGING = YES -# Patching Makefile.am -OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" OPENIPMI_CONF_OPTS = \ --with-glib=no \ From thomas.petazzoni at bootlin.com Fri Feb 17 15:09:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:09:58 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/openipmi: add libexecinfo optional dependency In-Reply-To: <20221030175632.4139-1-fontaine.fabrice@gmail.com> References: <20221030175632.4139-1-fontaine.fabrice@gmail.com> Message-ID: <20230217160958.6c761a9d@windsurf> On Sun, 30 Oct 2022 18:56:31 +0100 Fabrice Fontaine wrote: > Add libexecinfo optional dependency as upstream rejected the patch to > add --with-execinfo=no > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Add missing local patch Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 17 15:10:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:10:40 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/openipmi: add libexecinfo optional dependency In-Reply-To: <20221030182041.GX1058960@scaer> References: <20221030175632.4139-1-fontaine.fabrice@gmail.com> <20221030182041.GX1058960@scaer> Message-ID: <20230217161040.42a0c31a@windsurf> Hello Yann, On Sun, 30 Oct 2022 19:20:41 +0100 "Yann E. MORIN" wrote: > Fabrice, All, > > On 2022-10-30 18:56 +0100, Fabrice Fontaine spake thusly: > > Add libexecinfo optional dependency as upstream rejected the patch to > > add --with-execinfo=no > > Indeed, they rejected it, but they suggested an alternate solution: > check for backtrace() and whether it requires -lexecinfo. > > Something like: > > AC_SEARCH_LIBS( > [backtrace], > [execinfo], > , > [AC_MSG_ERROR([backtrace() not found and no library provides it; maybe install libexecinfo])] > ) > > Regards, > Yann E. MORIN. Agreed, but for now, Fabrice's patch was good enough, so I applied as-is. It will certainly be nice if Fabrice has the chance to work on a better solution using AC_SEARCH_LIBS(). Best regards, 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 Feb 17 15:15:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:15:21 +0100 Subject: [Buildroot] [PATCH] board/cubietech/cubieboard1: add Cubieboard 1 In-Reply-To: <20221105194712.541286-1-gero@schwaericke.email> References: <20221105194712.541286-1-gero@schwaericke.email> Message-ID: <20230217161521.01f4f2a7@windsurf> Hello Gero, On Sat, 5 Nov 2022 19:47:12 +0000 Gero Schw?ricke wrote: > Board support for the Cubieboard 1 from Cubietech. Based the config for > Cubieboard 2 and the Olimex A10-OLinuXino-LIME which is also an > Allwinner A10 board (sunxi kernel). > > Signed-off-by: Gero Schw?ricke First of all, thanks a lot for your contribution, and sorry for the very slow feedback. See below some feedback. First of all, the commit title should be: configs/cubieboard1: new defconfig > --- > board/cubietech/cubieboard1/boot.cmd | 7 +++++ > board/cubietech/cubieboard1/genimage.cfg | 36 ++++++++++++++++++++++ > configs/cubieboard1_defconfig | 39 ++++++++++++++++++++++++ > 3 files changed, 82 insertions(+) > create mode 100644 board/cubietech/cubieboard1/boot.cmd > create mode 100644 board/cubietech/cubieboard1/genimage.cfg > create mode 100644 configs/cubieboard1_defconfig Could you add an entry in the DEVELOPERS file, both for the board/cubietech/cubieboard1/ folder and for the configs/cubieboard1_defconfig file? Another thing that is missing is a board/cubietech/cubieboard1/readme.txt that explains how to use this defconfig on this particular board. > diff --git a/board/cubietech/cubieboard1/boot.cmd b/board/cubietech/cubieboard1/boot.cmd > new file mode 100644 > index 0000000000..eefbdc8169 > --- /dev/null > +++ b/board/cubietech/cubieboard1/boot.cmd > @@ -0,0 +1,7 @@ > +# based on board/cubieboard2/boot.cmd > + > +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 sun4i-a10-cubieboard.dtb > +bootz $kernel_addr_r - $fdt_addr_r There's no support for extlinux.conf in the default U-Boot configuration for this board? Otherwise, it all looks good to me. Could you address the minor issues listed here, and send a 2nd version of your patch? Thanks a lot! Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From hrsourabh011 at gmail.com Fri Feb 17 15:52:49 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Fri, 17 Feb 2023 16:52:49 +0100 Subject: [Buildroot] Missing curl binary Message-ID: Hello, I am trying to include curl binary in my image. I have selected BR2_PACKAGE_LIBCURL=y , BR2_PACKAGE_LIBCURL_CURL=y in the Config. But still the curl binary is not installed in the target. Can anyone please let me know what is the issue here and how to resolve it? Thank you, Sourabh -------------- next part -------------- An HTML attachment was scrubbed... URL: From hrsourabh011 at gmail.com Fri Feb 17 16:15:39 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Fri, 17 Feb 2023 17:15:39 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates Message-ID: Hello, I am trying to add a custom CA to the trust store. I have copied the CA file to "/usr/local/share/ca-certificates/" in the rootfs_overlay and also has a .crt extension. Now after executing "make" the CA is not added to the trust store in /etc/ssl/certs/ in the target. Anyways it's installed only in "/usr/local/share/ca-certificates/" in the target. I thought "update-ca-certificates" will add this during image build. Can anyone please let me know what is missing here? Thank you, Sourabh -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Sat Feb 18 06:45:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 06:45:54 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-17 Message-ID: <20230218064600.861BC60BA4@smtp3.osuosl.org> Hello, Autobuild statistics for 2023-02-17 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 20 | 15 | 0 | 35 | master | 153 | 170 | 2 | 325 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 13 elfutils-0.186 | 8 linux-6.1.11 | 8 unknown | 7 gobject-introspection-1.72.0 | 6 host-go-1.19.6 | 5 zabbix-6.2.7 | 5 glibc-2.36-81-g4f4d7a13edfd... | 4 host-binutils-2.38 | 4 netsurf-3.10 | 4 host-gcc-final-11.3.0 | 3 host-libarchive-3.6.2 | 3 libgpg-error-1.46 | 3 mxs-bootlets-10.12.01 | 3 olsr-0.9.8 | 3 python-numpy-1.23.5 | 3 systemd-252.4 | 3 busybox-1.36.0 | 2 freeradius-client-1.1.7 | 2 host-pahole-1.24 | 2 host-rust-1.67.0 | 2 httping-2.5 | 2 libglib2-2.72.3 | 2 ltp-testsuite-20220930 | 2 ocf-linux-20171122 | 2 openvmtools-11.3.5-18557794 | 2 perl-5.36.0 | 2 qemu-7.2.0 | 2 uqmi-0a19b5b77140465c29e2af... | 2 acpid-2.0.34 | 1 asterisk-16.29.1 | 1 at91dataflashboot-1.05 | 1 audit-3.0.7 | 1 bayer2rgb-neon-15feb1115b48... | 1 boost-1.80.0 | 1 coremark-1.01 | 1 crun-1.7.2 | 1 dc3dd-7.2.641 | 1 docker-cli-23.0.0 | 1 dropbear-2022.83 | 1 dtbocfg-0.0.9 | 1 erlang-22.3.4.22 | 1 exim-4.96 | 1 fdk-aac-2.0.2 | 1 ffmpeg | 1 ffmpeg-4.4.3 | 1 fluent-bit-2.0.9 | 1 frr-8.4.2 | 1 fs/btrfs/btrfs.mk:55: /tmp/... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/jffs2/jffs2.mk:71: /home... | 1 fs/romfs/romfs.mk:32: /home... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gerbera-1.10.0 | 1 gnu-efi-3.0.15 | 1 gobject-introspection | 1 gocryptfs-2.3 | 1 highway-1.0.2 | 1 host-gcc-final-10.4.0 | 1 host-python3-3.11.1 | 1 json-c-0.16 | 1 kexec-2.0.25 | 1 libcamera-apps-1.1.1 | 1 libdeflate-1.15 | 1 libgcrypt-1.10.1 | 1 lightning-2.2.0 | 1 linux-5.10.162-cip24 | 1 linux-5.10.162-cip24-rt10 | 1 multipath-tools-0.9.4 | 1 musl-1.2.3 | 1 ncurses-6.3-20221224 | 1 ntp-4.2.8p15 | 1 openblas-0.3.21 | 1 p7zip-17.04 | 1 php-8.2.2 | 1 qt6base-6.4.2 | 1 rdma-core-44.0 | 1 rtl_433-22.11 | 1 speechd-0.11.4 | 1 strongswan-5.9.8 | 1 traceroute-2.1.0 | 1 uclibc-1.0.42 | 1 vdr-2.6.3 | 1 wolfssl-5.5.3 | 1 xenomai-3.0.10 | 1 xerces-3.2.4 | 1 xfont_font-misc-misc-1.1.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/9d4bf10de3807a5323eec4c60a11bc43d3267084 | ORPH powerpc64le | asterisk-16.29.1 | NOK | http://autobuild.buildroot.net/results/5c693aeb90f95ccb533b49166d577a399c3690d2 | arm | at91dataflashboot-1.05 | NOK | http://autobuild.buildroot.net/results/1b614a4d41981b30d9f94f825f4f0bb30fb00b86 | ORPH arm | audit-3.0.7 | NOK | http://autobuild.buildroot.net/results/d332170f58f690df76d5cb8444f5ec2ec144f230 | aarch64 | bayer2rgb-neon-15feb1115b48... | NOK | http://autobuild.buildroot.net/results/07e18d37e72acdaffcc36fc100f3d5275d2fb95a | arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/82425aff829ec7510ba2d7cf8216c8a865bf1d10 | mipsel | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/3c7376c24572431d90de0ac7296e303eb47f05e8 | ORPH mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/1061ff5b2a5b4a688d16be790a508a91600caae2 | ORPH sh4eb | coremark-1.01 | NOK | http://autobuild.buildroot.net/results/f19fe9f2dfef11193e9113453452e58b835b9afd | x86_64 | crun-1.7.2 | NOK | http://autobuild.buildroot.net/results/4472510f03772900b4cce1210c3cb3f127bdf170 | or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/60b54c59ce5a046f88b246abee6c6b46dfa5ec41 | ORPH x86_64 | docker-cli-23.0.0 | NOK | http://autobuild.buildroot.net/results/a456e83eafb08f7bead53948fb6e1ee9baa9b00b | riscv64 | dropbear-2022.83 | NOK | http://autobuild.buildroot.net/results/dd611960536f3d687a09df4a5026f0b297780a2b | mips64 | dtbocfg-0.0.9 | NOK | http://autobuild.buildroot.net/results/100ec330477ec3d5c5e9c513b3027fe8b05510ea | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/fae5fcff55318441ab0ecc38d0b950917a8070ea | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/8af49fa8c9e52e17b92208d0504eafbf95628807 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/50b4479971eb1fedb62719e23e0deb4bfe25b871 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/15dbaa7dd7d8c182cea81fbc8ffe7b8e6dbed62a | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/341b81bafeaf82a45bd2f5cc29a02e7c6182b78c | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/cd4123b6cf875fb799cc6430df916960940ec606 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/4db21cbb4b074ce650a86ecf1716b8c27f0b3608 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/b4e329ba6168f7955040933b22a085b13e61dacc | ORPH x86_64 | erlang-22.3.4.22 | NOK | http://autobuild.buildroot.net/results/90f7365d8477d35fca452b7b3f38babba086375e | armeb | exim-4.96 | NOK | http://autobuild.buildroot.net/results/5878e316b505a986e0c8484df242b932f7340051 | mips64 | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/1e7a20ef7a513ba23ea3d8a856e9d5712265b0e3 | i686 | ffmpeg | TIM | http://autobuild.buildroot.net/results/339ed3f76628df80b471228494f341b363de7c71 | armeb | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/5f3305ac8ec3a42873c6ba8b2e41044f58a768d9 | mips64el | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/f1a078db85941f1702fa7f60b25f83b2d29bd2f1 | riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/3c67f2538493a584797721d842e8f4e4f00dac58 | riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/55916661afeac4dd55604c2b79526d5d5535fdc7 | xtensa | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/a1705af7c1ce496fcb8379a6ce0dac045f37bdad | i686 | fs/btrfs/btrfs.mk:55: /tmp/... | NOK | http://autobuild.buildroot.net/results/46ba9dfa0a8db8007d411a4eb166ab0786343c82 | microblaze | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/c42a4ce76b4c10cef1ae8da639e24d8dbe491ebf | sh4 | fs/jffs2/jffs2.mk:71: /home... | NOK | http://autobuild.buildroot.net/results/68bd8da60bb54efe5d968be06c83ec24a51e0125 | sparc64 | fs/romfs/romfs.mk:32: /home... | NOK | http://autobuild.buildroot.net/results/6f313299170fbf0a327a8f1c66101e64780fd757 | sparc64 | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/b330794dd1ed5e5a7a18ea84feeba74ddced00ab | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/efff5708efefbadaad9b0ccbdfb9457a67d8fc02 | sparc64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/5c7b57ea0ce2cf844c815d25a938c8cc459d149b | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/13502204cdacf3a6de4724f33c2b40c84fc6a622 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/dbf25786616ce1c5e24a619cad37a23654165d66 | s390x | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/c308155617b27c462f2e3d59f5270279ca1caf66 | mipsel | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/28baddd912e6b68bf0ec77d0db5d2d8aac771d85 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/05e67999633be3d32714e2b538edac8539eb60f1 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/3e569e640e5daefb71c0975b69683ea4765a483f | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/50be6cf54bda9324cba68d6e7aaeb7578f27b04a | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/f6186da98a4b1015515f18d9c1c0f983430f1890 | mips64el | gnu-efi-3.0.15 | NOK | http://autobuild.buildroot.net/results/fbf037d44cf66bff44a6784d1d419a399cb44dec | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/5bf00af86da6e41d1a48abc7304bf339908a0150 | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a4e5e3a086895a6a43c7c52cd06d200062190068 | powerpc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/678b45f929de0ac7b284444cf2d49d2beb0bf180 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/fca58256430d6f3397811cf0fcabbd0e47c06163 | armeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/037cff719282e79917ff86576fe201b3682428d1 | powerpc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/19ca2f216b75d07b1aecf124a842cbc71942382e | mips | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a07d70e03628ba1c724d4f7cf9d8b0c96939f8f8 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ec43fa2eca9450f36ec4d84f431d222563a121b1 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/1a57bceade7d3209de32caf0f4793cabd9087dec | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/88a3caa3248768133212e4e560450e7466d11e76 | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/32aa9ab8cfab21f40dfcd18c6351cbb52e881241 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6fc897182479a45ce633f260711b1cc51b337597 | powerpc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/e2077da2a1e8dbd58b2c65d3fa39e0a09c378a58 | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/b16d6ac24f803d61f000adeb55b5fa4da9305e15 | powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/aeba99a319e3612658371e1e47e8bde35622afff | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5a24bd790dcc0e1ec9f6ae4d9c2753d1fc51d247 | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f0609a70930f9601c0c724ce903b7730eb715fa7 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8f4fb319ef756c5e4c63728d3b5c2062489b0650 | ORPH armeb | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/cf2fc1ea9242bdfc945fff76a5a180e8767e31f0 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/9236bc11e47905896aab248a8217ecb6098a5f47 | ORPH s390x | gocryptfs-2.3 | NOK | http://autobuild.buildroot.net/results/8416beaf6dfaab1fcd0d8b1444dcdb2508b21693 | xtensa | highway-1.0.2 | NOK | http://autobuild.buildroot.net/results/f316a7cdf22ce57e386093ab8d4e696d4e708cc7 | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/387a9c49b06b1ed78f246ab804b0b3e94ba621fe | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/195606dad6add19fa9ad9272bb1b92b5f6456c38 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/955c80bca06f2630292b2fde80ebf58b9f397d49 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/32e95db4cbea1c4f7a1757f1c77ec1b9262b267b | sparc | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/b87b9cd13186bc5ebfef4140298d9d67ff9a9dad | microblaze | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/f674b6cdadf788fb07980e6cb69d40d07a01795d | microblaze | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/0954ea533f050bf87cb29f1f25aa5ac161e521fd | arceb | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/13535aba17c4845635319a77d1c2709e2e2454fe | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/9c0cf006333b13fc7c5a6f275567f1818d276cae | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/f8e3b4686e8b811dbce64fae0c6b74f1e0476634 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e4ac2c7828f56b812ec48ebd6f891bc089367c86 | i586 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/37de9ac12d1c4d5a17bb1440bd9423756e8cae43 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e5c3534367d2810dfb062c6779c64a7fa3131b50 | s390x | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/eb93c87cb00be4173973d0961ae24c59bce93687 | x86_64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/b3fd21ab0cbdd1e0d571c24d600d6d1e0d1011a4 | x86_64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/35fe668bd3a9f8bbd1f83951a92a5f1b860b71b3 | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/540cb18b51f225fd7a7d892e16429a92d6c1d58b | m68k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/30e646d5579353a7ee8dc72b9110b7e3ea27e02f | sparc64 | host-python3-3.11.1 | NOK | http://autobuild.buildroot.net/results/c899e7574a2dae61469b1fa87cf82e47187634cd | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/eebd45377cb6a9a35cc30c3a5200d20f421c1e1d | s390x | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/d13f30143077a0c4277d28feae406ddc3ed9f423 | arceb | httping-2.5 | NOK | http://autobuild.buildroot.net/results/e4da8093844459c5d1c74d173505f611367ca9aa | arc | httping-2.5 | NOK | http://autobuild.buildroot.net/results/e2c7bcce38efa0ec62f9a1be32b969fb09d709b4 | or1k | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/86b7d1bafb27b7b6d2606100bf22659285b99db1 | armeb | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/c60fac85048b8b563d80bb0e62c8328564853033 | ORPH i686 | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/4683479f3f560f95d57d849ded3ed7482854231f | armeb | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/c3514908f5c82ea0d7b036196e7611ffd9e13500 | i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/8dadb27cae8507f77418069e42f51c6471b356a1 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/ea5d6cf1c2c02bec62f50d5c445c97bbcbfddd9f | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/8d675e604e8233a21f34b188961b2a4a1caccc79 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/716c02fb9f6daeec51bfce65fd187f01ab94eff5 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/521f8c699371ac77660bd1ec70c1491336921722 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/7da0d654d9f8c88ba8643be9f7433a423b9b5450 | ORPH x86_64 | lightning-2.2.0 | NOK | http://autobuild.buildroot.net/results/6d1a8bc49860f44eb75c9f70c790ea4678f4a111 | mips | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/e94a592bff020ec75e7d4956032ca426bb8a2ac4 | ORPH mips64 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/ee1fd464b836e18f50e3992f434d9bf8079cd80c | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/0825f187d55fb2cb62a5b948ce88449cea72ca62 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/b1425c00309d4d4120644686cff6da9b48bd06b3 | ORPH aarch64_be | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/c358c92c2567d2e8ff2252a9247e3493b428d634 | ORPH powerpc | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/d7c7b86904e422005ad3ae3ac102ff02a8846d8a | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/9e44382b0276e7912791b419523b5152f27a9aa6 | ORPH arc | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/6d307ca4a9e2e660353675799589df9eca509e16 | ORPH aarch64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/3b130b9396876a5c151d9ed57bdc1d4478d8cd69 | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/6fc8885f86becdc95fd01d984536e2f97ba4b9ed | ORPH microblazeel | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/03884badae8913d755fb9eecdfc0e05718ffef46 | s390x | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/a34c0e0f3798e844c94ee40931d7a81a3c35451d | i586 | multipath-tools-0.9.4 | NOK | http://autobuild.buildroot.net/results/2229bb1771200082cfae9a307acf71475946ffcb | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/6ad59299e7d8bb4b71e75c39fcaa6ef90f16ad62 | arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/b4b26f6b02fd1991f46eba5db240e5050b96d333 | ORPH arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/5094d267e015fb549b905d97d5dd713489d040e4 | ORPH arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/22ec0cf206fd188e973a8a5b70e37478bd399b43 | ORPH mips64 | ncurses-6.3-20221224 | NOK | http://autobuild.buildroot.net/results/4c4e5783772eddf6013a99cc55512d37a01ea39f | ORPH sparc64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/82650c75fd79491859473ac1fb65f558873fcdf3 | arc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/e33f2c928e59e806bd460f5c91031a521109ca3d | arc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/4628c578c3d56046be8b5e9a0b455746b14e13db | m68k | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/c8e2ddc3cc441094fab9a57ee32d20fe79586f7a | riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/a3e755bcebff49c9d69c83524712c790dc1bf0c4 | ORPH microblaze | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/60cf8b64d457dbe6d2ef9ac68f689ab0233ac131 | ORPH microblazeel | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/9d6e59b7df2707da567a283374488828f948f96b | ORPH sh4eb | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/1b80258acaffc21ebd6778325d6a069e2f0a29d7 | ORPH or1k | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/1982846c8fd22ebcd955e85ce86cce156a8e6127 | ORPH aarch64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/38aa855cdd88c0100d0b9b6028b3bfd3e0d054fb | ORPH mips64 | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/785d373edd0db83dbc2b49d99e73ef91e3d90c77 | ORPH x86_64 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/08366bb87af75eec33b611f34ba95bbf58317088 | i686 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/d7151646b99e885b0aa18297adaef127f7e939e7 | sparc64 | p7zip-17.04 | NOK | http://autobuild.buildroot.net/results/b837a27d7899e99336db2a6623c04597b8707289 | powerpc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/beb3d9b9ea79f2442e8d36f45ba3533b03084b65 | sparc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/fd627f09816bb71ccf4c8cb1c57eaab827171190 | microblazeel | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/0f5bbe455ef8ac1a3f406930f97a31e728ed2331 | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/199144c6d75a8b8ee0a34fc3d452cd3f353a6cb5 | i686 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/07942f871e078ed2bd1ab60578cf2303e172801a | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/6ab2ead00c27e8f608b31f914fc6d098b2590d95 | powerpc64le | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/f79db75c970898536e19091abe22f79f0db76d22 | mips | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/ad0d6c63d227edfc1f35b5a7d626def331e2625c | mipsel | qt6base-6.4.2 | NOK | http://autobuild.buildroot.net/results/d56284c098fb8c781a4c238df605683c11e06e15 | powerpc | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/c52bcb921cedbfba1c30cf3898dbdea72d2090bb | x86_64 | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/7de9c47145afa8210df51df145f78c5e912d6ff4 | s390x | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/b8592464257474bfb07216484f5ff3e341c24108 | nios2 | strongswan-5.9.8 | NOK | http://autobuild.buildroot.net/results/a924256ae3c68c71bc1e6c7525728861e6cdfc99 | sparc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/6dc3b7024ae64e548ef51e7dcf8c608e81d8e508 | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/801f23b20e017c01c433c26090f5ebf635a4a024 | sh4a | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/dba31fbde3e7f9dbdd187afd2a98f89f4e350411 | armeb | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/998cdb5b8a5e24b34e597e5fec293553d17bce52 | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/5eee39a646b62de2fecf86a300dbebe06dc8b669 | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/d4aaece66b361c972af55e613d540c2640be9d90 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/00909d00e9c1707747a5aad7ccc46946edf8da41 | sh4eb | unknown | NOK | http://autobuild.buildroot.net/results/297cf2bd1141c9e1e60b2e745acd975cf8d9d0d6 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/c1212ce5004aba36e516b7269cff93296feeb391 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/cae5c191a75ebe34c86f07fb1e59126d1a12329c | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/a1fc4542815727aa11d9547bb60a44157ab60087 | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/4dbb63d7be93471be9963a8bc52c409e200d9da9 | powerpc64le | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/bc4873abe8b876a428ebfb8f136eb4d364478127 | ORPH sparc64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/8ede0c711c94102081a61da456e42c6c7a0013e9 | ORPH mipsel | vdr-2.6.3 | NOK | http://autobuild.buildroot.net/results/4e97de65e8d0e7ab7d987014767dc484db4490d1 | mips64 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/19f0a6a13c0451095c0fc332ecfda9fdaa35139b | m68k | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/769d004317a9ef07bee98289a5f9c58c3a5aea4f | nios2 | xerces-3.2.4 | NOK | http://autobuild.buildroot.net/results/5391a9b75383b3c7b66d91ed15a9572564cdbe24 | ORPH microblazeel | xfont_font-misc-misc-1.1.2 | NOK | http://autobuild.buildroot.net/results/04e8959b663d61bbcc3841d33e86f5ebb42a058e | powerpc64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/4e3a6191b2f8065f15c127cf362feb0bd2d78457 | mips64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/0ff479c94ef455625aa498f5e12568d05b6fe736 | or1k | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/b89e8b1ac315824fd361427b8716ffb6957ab2cf | x86_64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/af1e8929f8ee440b9942f1030177b2d06f4d2c7b | powerpc64le | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/752dabae9bbb6d5983e6090524515685b1897ee6 | Classification of failures by reason for 2022.11.x -------------------------------------------------- xxhash-0.8.1 | 2 xz-5.2.7 | 2 crucible-2022.05.25 | 1 elfutils-0.186 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 host-go-1.19.5 | 1 host-pahole-1.24 | 1 janus-gateway-1.0.3 | 1 liblog4c-localtime-1.0 | 1 linux-6.0.19 | 1 ripgrep-af6b6c543b224d348a8... | 1 unknown | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | crucible-2022.05.25 | NOK | http://autobuild.buildroot.net/results/087fbfc2e46d2affb78da61d469d1d31d7711828 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/1ac203eb1fc1fabb8e1f233f22e281036c7949be | ORPH powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/d4f6e70d16ebad0c2fb62a39cd383c814b23dbd0 | mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/017d3764db017fc757760180c5f9244be345882f | ORPH mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/bfa74b85cd24e86ce7c33abf0d738087b922aa61 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d904c1d578411ad72c9eadda2f8011ff968b3399 | aarch64 | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/fc3725daf40c9488e7606240eb613aa8b9430373 | riscv64 | liblog4c-localtime-1.0 | NOK | http://autobuild.buildroot.net/results/5508d99a8d1951adfb1c45e46834eff81586f0de | x86_64 | linux-6.0.19 | NOK | http://autobuild.buildroot.net/results/9c9e4d5913076f83f4deb32febe83b280aba4504 | ORPH mips | ripgrep-af6b6c543b224d348a8... | NOK | http://autobuild.buildroot.net/results/a29ef9cf1a771e74e41ee75c76796c4f8acd9eb7 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/8d54670a8469d36dfe9550f7710c5887ca600022 | microblaze | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/7515284a08f79144003689473e8b8409ff556013 | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/49d2cd50ffe8cab803a538890ff252599f5fbede | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/e9c8352997264b9d815788b5cc49316b72d11376 | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/90ea274b47552e8c2837cbd8625545c4eab217b3 | ORPH Gitlab CI results for 2023-02-17 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758739 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758741 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758743 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758745 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758747 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758748 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758749 | avenger96 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758750 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758751 | bananapi_m2_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758752 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758753 | ORPH beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758754 | beaglebone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758755 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758757 | beagleboneai | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758758 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758759 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758761 | broadcom_northstar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758762 | canaan_kd233 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758763 | chromebook_elm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758764 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758765 | ci20 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758766 | cubieboard2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758768 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758770 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758771 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758773 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758774 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758775 | freescale_imx28evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758776 | freescale_imx6dlsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758777 | freescale_imx6dlsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758778 | freescale_imx6qsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758779 | freescale_imx6qsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758781 | freescale_imx6sxsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758783 | freescale_imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758784 | freescale_imx7dsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758788 | freescale_imx8mmevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758791 | freescale_imx8mnevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758793 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758794 | freescale_imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758796 | freescale_imx8qmmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758797 | freescale_imx8qxpmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758799 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758801 | ORPH freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758802 | ORPH freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758805 | ORPH friendlyarm_nanopi_r2s | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758807 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758810 | globalscale_espressobin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758812 | grinn_chiliboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758814 | grinn_liteboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758815 | hifive_unleashed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758816 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758817 | imx6-sabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758818 | imx6-sabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758819 | imx6-sabresd_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758820 | imx6slevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758821 | imx6sx-sdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758822 | imx6ulevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758823 | imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758824 | imx6ulpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758825 | imx7d-sdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758826 | imx7dpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758827 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758828 | imx8mn_bsh_smm_s2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758829 | imx8mn_bsh_smm_s2_pro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758830 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758831 | imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758832 | kontron_bl_imx8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758834 | kontron_pitx_imx8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758835 | kontron_smarc_sal28 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758836 | lafrite | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758837 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758838 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758839 | linksprite_pcduino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758840 | ls1028ardb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758841 | mender_x86_64_efi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758842 | ORPH microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758843 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758845 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758846 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758848 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758851 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758853 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758856 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758858 | minnowboard_max | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758860 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758861 | mx51evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758863 | mx53loco | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758867 | mx6cubox | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758873 | mx6sx_udoo_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758879 | mx6udoo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758881 | nexbox_a95x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758884 | nezha | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758886 | nitrogen6sx | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758889 | nitrogen6x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758891 | nitrogen7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758893 | nitrogen8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758895 | nitrogen8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758900 | nitrogen8mn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758902 | nitrogen8mp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758904 | octavo_osd32mp1_brk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758907 | octavo_osd32mp1_red | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758912 | odroidc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758915 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758919 | olimex_a10_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758921 | olimex_a13_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758925 | olimex_a20_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758930 | olimex_a20_olinuxino_lime2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758926 | olimex_a20_olinuxino_micro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758932 | olimex_a33_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758934 | olimex_a64_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758938 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758941 | olimex_stmp157_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758942 | olpc_xo1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758954 | olpc_xo175 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758946 | openblocks_a6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758980 | orangepi_lite | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758983 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758982 | orangepi_one | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758984 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758985 | orangepi_pc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758986 | orangepi_pc_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758987 | orangepi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758988 | orangepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758990 | orangepi_zero_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758993 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758991 | pandaboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758995 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758996 | pc_x86_64_efi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758997 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758998 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758999 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759000 | qemu_aarch64_ebbr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759001 | qemu_aarch64_sbsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759002 | qemu_aarch64_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759003 | qemu_arm_ebbr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759004 | qemu_arm_versatile | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759005 | qemu_arm_vexpress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759006 | qemu_arm_vexpress_tz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759008 | qemu_m68k_mcf5208 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759009 | qemu_m68k_q800 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759010 | qemu_microblazebe_mmu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759012 | qemu_microblazeel_mmu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759013 | qemu_mips32r2_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759015 | qemu_mips32r2el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759016 | qemu_mips32r6_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759018 | qemu_mips32r6el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759020 | qemu_mips64_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759021 | qemu_mips64el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759024 | qemu_mips64r6_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759025 | qemu_mips64r6el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759026 | qemu_nios2_10m50 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759027 | qemu_or1k | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759029 | qemu_ppc64_e5500 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759030 | qemu_ppc64_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759031 | qemu_ppc64le_powernv8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759032 | qemu_ppc64le_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759033 | qemu_ppc_bamboo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759034 | qemu_ppc_e500mc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759036 | qemu_ppc_g3beige | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759037 | qemu_ppc_mac99 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759038 | qemu_ppc_mpc8544ds | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759039 | qemu_riscv32_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759041 | qemu_riscv64_nommu_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759042 | qemu_riscv64_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759044 | qemu_s390x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759045 | qemu_sh4_r2d | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759047 | qemu_sh4eb_r2d | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759048 | qemu_sparc64_sun4u | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759049 | qemu_sparc_ss10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759051 | qemu_x86 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759056 | qemu_x86_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759054 | qemu_xtensa_lx60 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759058 | qemu_xtensa_lx60_nommu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759061 | raspberrypi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759080 | ORPH raspberrypi0 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759064 | ORPH raspberrypi0w | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759069 | ORPH raspberrypi2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759070 | ORPH raspberrypi3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759073 | raspberrypi3_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759071 | ORPH raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759074 | ORPH raspberrypi4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759077 | ORPH raspberrypi4_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759075 | ORPH raspberrypicm4io | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759084 | ORPH raspberrypicm4io_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759082 | ORPH raspberrypizero2w | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759085 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759086 | rock64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759087 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759089 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759090 | roseapplepi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759093 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759094 | sheevaplug | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759095 | sipeed_lichee_rv | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759096 | sipeed_lichee_rv_dock | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759098 | sipeed_maix_bit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759103 | sipeed_maix_bit_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759107 | sipeed_maix_dock | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759110 | sipeed_maix_dock_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759113 | sipeed_maix_go | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759116 | sipeed_maix_go_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759119 | sipeed_maixduino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759123 | sipeed_maixduino_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759125 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759129 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759132 | snps_archs38_haps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759134 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759138 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759140 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759142 | solidrun_clearfog_gt_8k | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759144 | solidrun_macchiatobin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759147 | ORPH spike_riscv64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759148 | stm32f429_disco_xip | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759149 | stm32f469_disco_sd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759151 | stm32f469_disco_xip | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759152 | stm32mp157a_dk1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759154 | stm32mp157c_dk2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759155 | stm32mp157c_odyssey | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759156 | terasic_de10nano_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759159 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759161 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759167 | ts5500 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759170 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759172 | uevm5432 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759174 | versal_vck190 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759176 | visionfive | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759181 | visionfive2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759179 | wandboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759184 | warp7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759185 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759187 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759189 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759191 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759192 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759195 | zynqmp_kria_kv260 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759198 | zynqmp_zcu102 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759199 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759202 | -- http://autobuild.buildroot.net From bagasdotme at gmail.com Sat Feb 18 08:58:37 2023 From: bagasdotme at gmail.com (Bagas Sanjaya) Date: Sat, 18 Feb 2023 15:58:37 +0700 Subject: [Buildroot] [PATCH] package/git: security bump to version 2.39.2 Message-ID: <20230218085837.350535-1-bagasdotme@gmail.com> Fix two CVEs (CVE-2023-22490 and CVE-2023-23946). For the full release note, see [1]. While at it, also refresh two Buildroot patches introduced when the package was bumped to 2.39.0. [1]: https://lore.kernel.org/git/xmqqr0us5dio.fsf at gitster.g/ Signed-off-by: Bagas Sanjaya --- ...compat-util-avoid-redefining-system-function-nam.patch | 8 +++++--- ...compat-util-undefine-system-names-before-redecla.patch | 6 +++--- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch index dbde87940a..24100e1f6e 100644 --- a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch +++ b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch @@ -1,4 +1,4 @@ -From 385f67eb2254edb1fb4cf523e5e3d5a8f123d72c Mon Sep 17 00:00:00 2001 +From 86aeac96d04ae5381085c0f93acb12d3bfd06969 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 30 Nov 2022 16:15:14 -0500 Subject: [PATCH] git-compat-util: avoid redefining system function names @@ -64,7 +64,7 @@ Signed-off-by: Bagas Sanjaya 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h -index a76d0526f7..e3456bdd0d 100644 +index af05077560..f6882b9b50 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -341,11 +341,12 @@ struct itimerval { @@ -83,7 +83,7 @@ index a76d0526f7..e3456bdd0d 100644 #endif #ifndef NO_LIBGEN_H -@@ -1471,14 +1472,16 @@ int open_nofollow(const char *path, int flags); +@@ -1479,14 +1480,16 @@ int open_nofollow(const char *path, int flags); #endif #ifndef _POSIX_THREAD_SAFE_FUNCTIONS @@ -102,6 +102,8 @@ index a76d0526f7..e3456bdd0d 100644 #define getc_unlocked(fh) getc(fh) #endif + +base-commit: cbf04937d5b9fcf0a76c28f69e6294e9e3ecd7e6 -- An old man doll... just what I always wanted! - Clara diff --git a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch index 9e3c9b662c..f6207300ee 100644 --- a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch +++ b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch @@ -1,4 +1,4 @@ -From 6d406390b870fdb2cd9d18b12ebfabc12f5096df Mon Sep 17 00:00:00 2001 +From d4a11fd215195cd1ca6a43058ef250b688ade1f4 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 2 Dec 2022 06:05:38 -0500 Subject: [PATCH] git-compat-util: undefine system names before redeclaring @@ -29,7 +29,7 @@ Signed-off-by: Bagas Sanjaya 1 file changed, 4 insertions(+) diff --git a/git-compat-util.h b/git-compat-util.h -index e3456bdd0d..211861da0f 100644 +index f6882b9b50..dadb9e55cb 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -346,6 +346,7 @@ static inline int git_setitimer(int which, @@ -40,7 +40,7 @@ index e3456bdd0d..211861da0f 100644 #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) #endif -@@ -1480,6 +1481,9 @@ static inline void git_funlockfile(FILE *fh) +@@ -1488,6 +1489,9 @@ static inline void git_funlockfile(FILE *fh) { ; /* nothing */ } diff --git a/package/git/git.hash b/package/git/git.hash index 75398896e5..b7840cd1eb 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161 git-2.39.1.tar.xz +sha256 475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 git-2.39.2.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 1d728e1964..206d06ffe7 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.39.1 +GIT_VERSION = 2.39.2 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ base-commit: d00e437922fb1b611f35c3138b9fbf7bcff62757 -- An old man doll... just what I always wanted! - Clara From egorenar-dev at posteo.net Sat Feb 18 09:29:43 2023 From: egorenar-dev at posteo.net (Alexander Egorenkov) Date: Sat, 18 Feb 2023 09:29:43 +0000 Subject: [Buildroot] [PATCH 1/1] package/multipath-tools: fix path to kernel headers Message-ID: <20230218092943.2598-1-egorenar-dev@posteo.net> With change 6b7d47be3b23 ("multipath-tools: Makefiles: simplify code for include dirs") the Makefile variable 'LINUX_HEADERS_INCDIR' has been replaced with 'kernel_incdir'. fpin_handlers.c:355:32: note: each undeclared identifier is reported only once for each function it appears in fpin_handlers.c:360:37: error: ?ELS_DTAG_LNK_INTEGRITY? undeclared (first use in this function) 360 | if (dtag == ELS_DTAG_LNK_INTEGRITY) { | ^~~~~~~~~~~~~~~~~~~~~~ make[2]: *** [../Makefile.inc:116: fpin_handlers.o] Error 1 Fixes: http://autobuild.buildroot.net/results/e0f56ef924c13d6b1535fdc350ad8ecc06ea0a58 Signed-off-by: Alexander Egorenkov --- package/multipath-tools/multipath-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index 90394fae9fde..23b3cc944267 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -22,7 +22,7 @@ MULTIPATH_TOOLS_CPE_ID_VENDOR = opensvc MULTIPATH_TOOLS_DEPENDENCIES = lvm2 json-c readline udev liburcu libaio host-pkgconf MULTIPATH_TOOLS_MAKE_OPTS = \ - LINUX_HEADERS_INCDIR=$(STAGING_DIR)/usr/include \ + kernel_incdir=$(STAGING_DIR)/usr/include \ LIB="lib" \ RUN="run" \ OPTFLAGS="" \ -- 2.39.2 From bagasdotme at gmail.com Sat Feb 18 10:14:26 2023 From: bagasdotme at gmail.com (Bagas Sanjaya) Date: Sat, 18 Feb 2023 17:14:26 +0700 Subject: [Buildroot] [PATCH] Revert "package/gnupg2: bump to version 2.4.0" Message-ID: <20230218101426.630874-1-bagasdotme@gmail.com> Bumping the package version to 2.4.0, it fails to cross-compile with unsafe cross-compile paths (for example recent build log at [1]): make[4]: Entering directory '/home/thomas/autobuild/instance-3/output-1/build/gnupg2-2.4.0/common' /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o t-stringhelp.o t-stringhelp.c /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o libcommon_a-i18n.o `test -f 'i18n.c' || echo './'`i18n.c /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o libcommon_a-mapstrings.o `test -f 'mapstrings.c' || echo './'`mapstrings.c /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o libcommon_a-stringhelp.o `test -f 'stringhelp.c' || echo './'`stringhelp.c aarch64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' make[4]: *** [Makefile:1283: t-stringhelp.o] Error 1 Revert the bump for now until the issue can be fixed upstream. [1]: http://autobuild.buildroot.net/results/5bf00af86da6e41d1a48abc7304bf339908a0150/build-end.log Signed-off-by: Bagas Sanjaya --- package/gnupg2/0001-ks_ldap_free_state.patch | 21 ++++++++++++++++++++ package/gnupg2/gnupg2.hash | 10 +++++----- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 package/gnupg2/0001-ks_ldap_free_state.patch diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch new file mode 100644 index 0000000000..fa55d27c04 --- /dev/null +++ b/package/gnupg2/0001-ks_ldap_free_state.patch @@ -0,0 +1,21 @@ + +Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is not +installed + +Backported from: 7011286ce6e1fb56c2989fdafbd11b931c489faa + +Signed-off-by: Michael Fischer + +--- a/dirmngr/server.c ++++ b/dirmngr/server.c +@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) + ctrl->refcount); + else + { ++#if USE_LDAP + ks_ldap_free_state (ctrl->ks_get_state); + ctrl->ks_get_state = NULL; ++#endif + release_ctrl_ocsp_certs (ctrl); + xfree (ctrl->server_local); + dirmngr_deinit_default_ctrl (ctrl); diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index c642862fe2..f9c071ad45 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html -sha1 63dde155a8df0d5e1987efa5fc17438beca83ac1 gnupg-2.4.0.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html +sha1 1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc gnupg-2.3.8.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 gnupg-2.4.0.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.8.tar.bz2.sig +# using key 6DAA6E64A76D2840571B4902528897B826403ADA and AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD +sha256 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed gnupg-2.3.8.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 5935ce6939..9dc29ca99e 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.0 +GNUPG2_VERSION = 2.3.8 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ base-commit: d00e437922fb1b611f35c3138b9fbf7bcff62757 -- An old man doll... just what I always wanted! - Clara From bagasdotme at gmail.com Sat Feb 18 10:16:27 2023 From: bagasdotme at gmail.com (Bagas Sanjaya) Date: Sat, 18 Feb 2023 17:16:27 +0700 Subject: [Buildroot] (no subject) Message-ID: (resend again with revert patch removed) Hi, I found that package/gnupg2 (version 2.4.0) fails to build, complaining about unsafe search path for cross-compilation. I found this when test-building for my git bump at [1]. The excerpt from the build log was: make[4]: Entering directory '/home/bagas/repo/buildroot/output/build/gnupg2-2.4.0/common' /home/bagas/repo/buildroot/output/host/bin/aarch64-linux-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/bagas/repo/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -c -o t-stringhelp.o t-stringhelp.c /home/bagas/repo/buildroot/output/host/bin/aarch64-linux-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/bagas/repo/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -c -o libcommon_a-i18n.o `test -f 'i18n.c' || echo './'`i18n.c aarch64-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' make[4]: *** [Makefile:1283: t-stringhelp.o] Error 1 Reverting 0f868e97f6b4 ("package/gnupg2: bump to version 2.4.0") made the error above gone, thus the problem was in upstream code. This issue is also confirmed by autobuilder (example log is [2]). The full build log is attached. If the revert is desired, the patch is at [3]. Thanks. [1]: https://lore.kernel.org/buildroot/20230218085837.350535-1-bagasdotme at gmail.com/ [2]: http://autobuild.buildroot.net/results/5bf00af86da6e41d1a48abc7304bf339908a0150/build-end.log [3]: https://lore.kernel.org/buildroot/20230218101426.630874-1-bagasdotme at gmail.com/ -- An old man doll... just what I always wanted! - Clara -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: From bagasdotme at gmail.com Sat Feb 18 10:17:56 2023 From: bagasdotme at gmail.com (Bagas Sanjaya) Date: Sat, 18 Feb 2023 17:17:56 +0700 Subject: [Buildroot] (no subject) In-Reply-To: References: Message-ID: <3692da35-d89d-46a6-524d-590c83f35a0f@gmail.com> On 2/18/23 17:16, Bagas Sanjaya wrote: > (resend again with revert patch removed) > > Hi, > > I found that package/gnupg2 (version 2.4.0) fails to build, complaining > about unsafe search path for cross-compilation. I found this when > test-building for my git bump at [1]. > > The excerpt from the build log was: > > make[4]: Entering directory '/home/bagas/repo/buildroot/output/build/gnupg2-2.4.0/common' > /home/bagas/repo/buildroot/output/host/bin/aarch64-linux-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/bagas/repo/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -c -o t-stringhelp.o t-stringhelp.c > /home/bagas/repo/buildroot/output/host/bin/aarch64-linux-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/bagas/repo/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -c -o libcommon_a-i18n.o `test -f 'i18n.c' || echo './'`i18n.c > aarch64-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' > make[4]: *** [Makefile:1283: t-stringhelp.o] Error 1 > > Reverting 0f868e97f6b4 ("package/gnupg2: bump to version 2.4.0") made the error above > gone, thus the problem was in upstream code. > > This issue is also confirmed by autobuilder (example log is [2]). > > The full build log is attached. > > If the revert is desired, the patch is at [3]. > > Thanks. > > [1]: https://lore.kernel.org/buildroot/20230218085837.350535-1-bagasdotme at gmail.com/ > [2]: http://autobuild.buildroot.net/results/5bf00af86da6e41d1a48abc7304bf339908a0150/build-end.log > [3]: https://lore.kernel.org/buildroot/20230218101426.630874-1-bagasdotme at gmail.com/ > Oops, please ignore (no subject). I will send the report later. -- An old man doll... just what I always wanted! - Clara From hrsourabh011 at gmail.com Sat Feb 18 10:28:33 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sat, 18 Feb 2023 11:28:33 +0100 Subject: [Buildroot] Missing curl binary In-Reply-To: References: Message-ID: Can anyone please let me know how to resolve this? On Fri, Feb 17, 2023, 16:52 Sourabh Hegde wrote: > Hello, > > I am trying to include curl binary in my image. I have > selected BR2_PACKAGE_LIBCURL=y , BR2_PACKAGE_LIBCURL_CURL=y in the Config. > But still the curl binary is not installed in the target. Can anyone please > let me know what is the issue here and how to resolve it? > > Thank you, > Sourabh > -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Sat Feb 18 10:39:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 11:39:39 +0100 Subject: [Buildroot] [PATCH] Revert "package/gnupg2: bump to version 2.4.0" In-Reply-To: <20230218101426.630874-1-bagasdotme@gmail.com> References: <20230218101426.630874-1-bagasdotme@gmail.com> Message-ID: <20230218113939.526f0a76@windsurf> Hello Bagas, Let's add Julien Olivain in Cc, as he did the bump of gnupg2 to version 2.4.0. Julien: could you have a look at the below issue, which is affecting gnupg2 in the autobuilders? Thanks a lot! Thomas On Sat, 18 Feb 2023 17:14:26 +0700 Bagas Sanjaya wrote: > Bumping the package version to 2.4.0, it fails to cross-compile with > unsafe cross-compile paths (for example recent build log at [1]): > > make[4]: Entering directory '/home/thomas/autobuild/instance-3/output-1/build/gnupg2-2.4.0/common' > /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o t-stringhelp.o t-stringhelp.c > /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o libcommon_a-i18n.o `test -f 'i 18 > n.c' || echo './'`i18n.c > /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o libcommon_a-mapstrings.o `test - > f 'mapstrings.c' || echo './'`mapstrings.c > /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o libcommon_a-stringhelp.o `test - > f 'stringhelp.c' || echo './'`stringhelp.c > aarch64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' > make[4]: *** [Makefile:1283: t-stringhelp.o] Error 1 > > Revert the bump for now until the issue can be fixed upstream. > > [1]: http://autobuild.buildroot.net/results/5bf00af86da6e41d1a48abc7304bf339908a0150/build-end.log > > Signed-off-by: Bagas Sanjaya > --- > package/gnupg2/0001-ks_ldap_free_state.patch | 21 ++++++++++++++++++++ > package/gnupg2/gnupg2.hash | 10 +++++----- > package/gnupg2/gnupg2.mk | 2 +- > 3 files changed, 27 insertions(+), 6 deletions(-) > create mode 100644 package/gnupg2/0001-ks_ldap_free_state.patch > > diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch > new file mode 100644 > index 0000000000..fa55d27c04 > --- /dev/null > +++ b/package/gnupg2/0001-ks_ldap_free_state.patch > @@ -0,0 +1,21 @@ > + > +Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is not > +installed > + > +Backported from: 7011286ce6e1fb56c2989fdafbd11b931c489faa > + > +Signed-off-by: Michael Fischer > + > +--- a/dirmngr/server.c > ++++ b/dirmngr/server.c > +@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) > + ctrl->refcount); > + else > + { > ++#if USE_LDAP > + ks_ldap_free_state (ctrl->ks_get_state); > + ctrl->ks_get_state = NULL; > ++#endif > + release_ctrl_ocsp_certs (ctrl); > + xfree (ctrl->server_local); > + dirmngr_deinit_default_ctrl (ctrl); > diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash > index c642862fe2..f9c071ad45 100644 > --- a/package/gnupg2/gnupg2.hash > +++ b/package/gnupg2/gnupg2.hash > @@ -1,7 +1,7 @@ > -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html > -sha1 63dde155a8df0d5e1987efa5fc17438beca83ac1 gnupg-2.4.0.tar.bz2 > +# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html > +sha1 1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc gnupg-2.3.8.tar.bz2 > # Calculated based on the hash above and signature > -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2.sig > -# using key 6DAA6E64A76D2840571B4902528897B826403ADA > -sha256 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 gnupg-2.4.0.tar.bz2 > +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.8.tar.bz2.sig > +# using key 6DAA6E64A76D2840571B4902528897B826403ADA and AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD > +sha256 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed gnupg-2.3.8.tar.bz2 > sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING > diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk > index 5935ce6939..9dc29ca99e 100644 > --- a/package/gnupg2/gnupg2.mk > +++ b/package/gnupg2/gnupg2.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GNUPG2_VERSION = 2.4.0 > +GNUPG2_VERSION = 2.3.8 > GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 > GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg > GNUPG2_LICENSE = GPL-3.0+ > > base-commit: d00e437922fb1b611f35c3138b9fbf7bcff62757 -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From ju.o at free.fr Sat Feb 18 11:13:16 2023 From: ju.o at free.fr (Julien Olivain) Date: Sat, 18 Feb 2023 12:13:16 +0100 Subject: [Buildroot] [PATCH] Revert "package/gnupg2: bump to version 2.4.0" In-Reply-To: <20230218113939.526f0a76@windsurf> References: <20230218101426.630874-1-bagasdotme@gmail.com> <20230218113939.526f0a76@windsurf> Message-ID: <96015d0268df72d3cdd58e7db09c1333@free.fr> Hi Thomas, Bagas, All, On 18/02/2023 11:39, Thomas Petazzoni wrote: > Hello Bagas, > > Let's add Julien Olivain in Cc, as he did the bump of gnupg2 to version > 2.4.0. > > Julien: could you have a look at the below issue, which is affecting > gnupg2 in the autobuilders? I indeed started to receive some autobuild failures. Unfortunately, I cannot reproduce on my system for now: on my side, the build complete successfully. I tried with _and_ without having a /usr/bin/gpgrt-config on host, which I was suspecting to bring some host config. In my first proposal of gnupg2 version 2.4.0 bump [1], I initially proposed to add Buildroot staging bin dir in PATH, to make sure we won't have such host/br-staging confusion: GNUPG2_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) Bagas, could you try on your side if this solve the issue? [1] https://patchwork.ozlabs.org/project/buildroot/patch/20230103193649.7488-5-ju.o at free.fr/ Best regards, Julien. From thomas.petazzoni at bootlin.com Fri Feb 17 15:25:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:25:01 +0100 Subject: [Buildroot] [git commit] package/python-apispec: fix formatting in hash file Message-ID: <20230218111540.98FF68477C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4336a86a0c414db7fbb3ff61d66e38bd916bb04e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: package/python-apispec/python-apispec.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Thomas Petazzoni --- package/python-apispec/python-apispec.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-apispec/python-apispec.hash b/package/python-apispec/python-apispec.hash index 9d653cc8e8..f2861f920a 100644 --- a/package/python-apispec/python-apispec.hash +++ b/package/python-apispec/python-apispec.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/apispec/json -md5 b4e90006a26215e2e0a6fe2629d12c10 apispec-6.0.2.tar.gz +md5 b4e90006a26215e2e0a6fe2629d12c10 apispec-6.0.2.tar.gz sha256 e76d80b739edef4be213092a6384ad7fd933ba7d64f6d5a0aff8d4da1bef7887 apispec-6.0.2.tar.gz # Locally computed sha256 checksums sha256 a452afcef750956a8396f7e7a6f913a117d28ef99a13170c29dc74c3b7a95f29 LICENSE From thomas.petazzoni at bootlin.com Sat Feb 18 11:14:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 12:14:21 +0100 Subject: [Buildroot] [git commit] package/python-flask-smorest: fix formatting in hash file Message-ID: <20230218111540.A2B268479A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41cca5274a8afce269f9b2bdc9e113e073e28abb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: package/python-flask-smorest/python-flask-smorest.hash:5: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Thomas Petazzoni --- package/python-flask-smorest/python-flask-smorest.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-flask-smorest/python-flask-smorest.hash b/package/python-flask-smorest/python-flask-smorest.hash index 5abe0c5033..941535c503 100644 --- a/package/python-flask-smorest/python-flask-smorest.hash +++ b/package/python-flask-smorest/python-flask-smorest.hash @@ -2,4 +2,4 @@ md5 1dad52f26c59ca2dcaf0c5d109879605 flask-smorest-0.40.0.tar.gz sha256 9b46b4937ccf78702d99fed8cfd1cd5c37608ddefd65ff16a86d1ad5c7f7d8c0 flask-smorest-0.40.0.tar.gz # Locally computed sha256 checksums -sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE +sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE From thomas.petazzoni at bootlin.com Sat Feb 18 11:15:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 12:15:05 +0100 Subject: [Buildroot] [git commit] package/python-webargs: fix formatting in hash file Message-ID: <20230218111540.AC8E7847AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6085c00d0feece6f3ba635e7847ea653bc5fac3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: package/python-webargs/python-webargs.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Thomas Petazzoni --- package/python-webargs/python-webargs.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-webargs/python-webargs.hash b/package/python-webargs/python-webargs.hash index 619b584807..10bb3651f0 100644 --- a/package/python-webargs/python-webargs.hash +++ b/package/python-webargs/python-webargs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/webargs/json -md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz +md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz sha256 99d68940c452e07726485a15fef43f12f8ae6c0c5b391bcba76065d4527fb85d webargs-8.2.0.tar.gz # Locally computed sha256 checksums sha256 5973e5dcc20b65e4eb4b4acdf273bb78a18522914ab626f496f1b070f7e6294d LICENSE From thomas.petazzoni at bootlin.com Sat Feb 18 11:18:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 12:18:46 +0100 Subject: [Buildroot] Missing curl binary In-Reply-To: References: Message-ID: <20230218121846.306f95f5@windsurf> On Fri, 17 Feb 2023 16:52:49 +0100 Sourabh Hegde wrote: > I am trying to include curl binary in my image. I have > selected BR2_PACKAGE_LIBCURL=y , BR2_PACKAGE_LIBCURL_CURL=y in the Config. > But still the curl binary is not installed in the target. Can anyone please > let me know what is the issue here and how to resolve it? I suppose you did a build with BR2_PACKAGE_LIBCURL=y, then after the build completed you changed the configuration to enable BR2_PACKAGE_LIBCURL_CURL=y and just ran "make". This doesn't work, as the libcurl package is already built, and Buildroot is not smart enough to detect that you changed something related to the libcurl configuration. Run: "make libcurl-dirclean all" to force rebuilding the libcurl package (or do a full rebuild). See https://buildroot.org/downloads/manual/manual.html#full-rebuild for more details. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 18 11:19:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 12:19:40 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: References: Message-ID: <20230218121940.7442410e@windsurf> On Fri, 17 Feb 2023 17:15:39 +0100 Sourabh Hegde wrote: > I am trying to add a custom CA to the trust store. I have copied the CA > file to "/usr/local/share/ca-certificates/" in the rootfs_overlay and also > has a .crt extension. Now after executing "make" the CA is not added to the > trust store in /etc/ssl/certs/ in the target. Anyways it's installed only > in "/usr/local/share/ca-certificates/" in the target. I thought > "update-ca-certificates" will add this during image build. > Can anyone please let me know what is missing here? What makes you think update-ca-certificates is run during the build? I don't remember Buildroot having anything that does this. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From buildroot at heine.tech Sat Feb 18 11:24:45 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Sat, 18 Feb 2023 12:24:45 +0100 Subject: [Buildroot] [PATCH] package/catch2: bump to version 3.3.1 Message-ID: <20230218112449.1753677-1-buildroot@heine.tech> raise the minimum gcc to 5 as stated in release notes for 3.1.0 [0]. [0] https://github.com/catchorg/Catch2/releases/tag/v3.1.0 --- package/catch2/Config.in | 6 +++--- package/catch2/catch2.hash | 2 +- package/catch2/catch2.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/catch2/Config.in b/package/catch2/Config.in index 2f53d197b2..40d2d12434 100644 --- a/package/catch2/Config.in +++ b/package/catch2/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_CATCH2 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 depends on BR2_USE_MMU # fork() help Catch2 is mainly a unit testing framework for C++, but it @@ -21,8 +21,8 @@ config BR2_PACKAGE_CATCH2 https://github.com/catchorg/Catch2 -comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash index 664164fd76..b533792f8f 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2106bccfec18c8ce673623d56780220e38527dd8f283ccba26aa4b8758737d0e catch2-3.1.1.tar.gz +sha256 d90351cdc55421f640c553cfc0875a8c834428679444e8062e9187d05b18aace catch2-3.3.1.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index ab62cc943b..6e4af3d670 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.1.1 +CATCH2_VERSION = 3.3.1 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO -- 2.34.1 From buildroot at heine.tech Sat Feb 18 11:49:01 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Sat, 18 Feb 2023 12:49:01 +0100 Subject: [Buildroot] =?utf-8?q?=5BPATCH=5D_package/catch2=3A_bump_to_vers?= =?utf-8?b?aW9uIDMuMy4x?= In-Reply-To: <20230218112449.1753677-1-buildroot@heine.tech> Message-ID: <10cdb9-63f0bb00-3-1c95df6@32750985> On Saturday, February 18, 2023 12:24 CET, Michael Nosthoff wrote: > raise the minimum gcc to 5 as stated in release notes for 3.1.0 [0]. > > [0] https://github.com/catchorg/Catch2/releases/tag/v3.1.0 Signed-off-by: Michael Nosthoff From buildroot at heine.tech Sat Feb 18 11:48:37 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Sat, 18 Feb 2023 12:48:37 +0100 Subject: [Buildroot] [PATCH] packge/libabseil-cpp: bump to version 20230125.0 Message-ID: <20230218114837.1761715-1-buildroot@heine.tech> libabseil now depends on c++14 and gcc >= 7.3.1 [0][1] [0] https://github.com/abseil/abseil-cpp/releases/tag/20230125.0 [1] https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md Signed-off-by: Michael Nosthoff --- Note: I'm not sure if the BR2_TOOLCHAIN_GCC_AT_LEAST_7 dependency is sufficient. But I don't think we have a more version specific Flag available? --- package/grpc/Config.in | 6 +++--- package/libabseil-cpp/Config.in | 6 +++--- package/libabseil-cpp/libabseil-cpp.hash | 2 +- package/libabseil-cpp/libabseil-cpp.mk | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/grpc/Config.in b/package/grpc/Config.in index db6425819b..06436fe888 100644 --- a/package/grpc/Config.in +++ b/package/grpc/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_GRPC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libabseil-cpp depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS @@ -19,9 +19,9 @@ config BR2_PACKAGE_GRPC http://github.com/grpc/grpc -comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 5" +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 7" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/package/libabseil-cpp/Config.in b/package/libabseil-cpp/Config.in index 45f339ff26..d4139e8e04 100644 --- a/package/libabseil-cpp/Config.in +++ b/package/libabseil-cpp/Config.in @@ -18,7 +18,7 @@ config BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS config BR2_PACKAGE_LIBABSEIL_CPP bool "libabseil-cpp" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # uses dlfcn.h depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS @@ -31,7 +31,7 @@ config BR2_PACKAGE_LIBABSEIL_CPP https://github.com/abseil/abseil-cpp -comment "libabseil-cpp needs a toolchain w/ gcc >= 4.9, C++, threads, dynamic library" +comment "libabseil-cpp needs a toolchain w/ gcc >= 7.3.1, C++14, threads, dynamic library" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/libabseil-cpp/libabseil-cpp.hash b/package/libabseil-cpp/libabseil-cpp.hash index 808bdbab29..81710f50fb 100644 --- a/package/libabseil-cpp/libabseil-cpp.hash +++ b/package/libabseil-cpp/libabseil-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8 libabseil-cpp-20220623.1.tar.gz +sha256 3ea49a7d97421b88a8c48a0de16c16048e17725c7ec0f1d3ea2683a2a75adc21 libabseil-cpp-20230125.0.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE diff --git a/package/libabseil-cpp/libabseil-cpp.mk b/package/libabseil-cpp/libabseil-cpp.mk index ceda106b7d..4e6ac2ee31 100644 --- a/package/libabseil-cpp/libabseil-cpp.mk +++ b/package/libabseil-cpp/libabseil-cpp.mk @@ -4,19 +4,19 @@ # ################################################################################ -LIBABSEIL_CPP_VERSION = 20220623.1 +LIBABSEIL_CPP_VERSION = 20230125.0 LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION)) LIBABSEIL_CPP_LICENSE = Apache-2.0 LIBABSEIL_CPP_LICENSE_FILES = LICENSE LIBABSEIL_CPP_INSTALL_STAGING = YES LIBABSEIL_CPP_CONF_OPTS = \ - -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD=14 \ -DABSL_ENABLE_INSTALL=ON \ -DABSL_USE_GOOGLETEST_HEAD=OFF HOST_LIBABSEIL_CPP_CONF_OPTS = \ - -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD=14 \ -DABSL_ENABLE_INSTALL=ON \ -DABSL_USE_GOOGLETEST_HEAD=OFF -- 2.34.1 From hrsourabh011 at gmail.com Sat Feb 18 12:54:15 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sat, 18 Feb 2023 13:54:15 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: <20230218121940.7442410e@windsurf> References: <20230218121940.7442410e@windsurf> Message-ID: Hello Thomas, Thanks for the update. I was thinking the ca-certificates package will take care of this. Maybe I was wrong. So, how should we add local CA to the trust store in the target? On Sat, 18 Feb 2023 at 12:19, Thomas Petazzoni wrote: > On Fri, 17 Feb 2023 17:15:39 +0100 > Sourabh Hegde wrote: > > > I am trying to add a custom CA to the trust store. I have copied the CA > > file to "/usr/local/share/ca-certificates/" in the rootfs_overlay and > also > > has a .crt extension. Now after executing "make" the CA is not added to > the > > trust store in /etc/ssl/certs/ in the target. Anyways it's installed only > > in "/usr/local/share/ca-certificates/" in the target. I thought > > "update-ca-certificates" will add this during image build. > > Can anyone please let me know what is missing here? > > What makes you think update-ca-certificates is run during the build? I > don't remember Buildroot having anything that does this. > > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Sat Feb 18 13:19:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 14:19:37 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: References: <20230218121940.7442410e@windsurf> Message-ID: <20230218141937.60c307f7@windsurf> Hello, On Sat, 18 Feb 2023 13:54:15 +0100 Sourabh Hegde wrote: > Thanks for the update. > > I was thinking the ca-certificates package will take care of this. Maybe I > was wrong. > > So, how should we add local CA to the trust store in the target? I am not sure as I'm not super familiar with that aspect. If what you need to do is to call update-ca-certificates during the build, then we could potentially build it for the host, and run it as a post-build script. Of course, this assumes update-ca-certificates is capable of doing its work on a root filesystem that isn't at the root. Do you have more details about what needs to be done? With more details, we could probably give some more useful hints. Best regards, Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 18 13:24:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 14:24:35 +0100 Subject: [Buildroot] [PATCH] Revert "package/gnupg2: bump to version 2.4.0" In-Reply-To: <96015d0268df72d3cdd58e7db09c1333@free.fr> References: <20230218101426.630874-1-bagasdotme@gmail.com> <20230218113939.526f0a76@windsurf> <96015d0268df72d3cdd58e7db09c1333@free.fr> Message-ID: <20230218142435.06cb9c26@windsurf> Hello Julien, On Sat, 18 Feb 2023 12:13:16 +0100 Julien Olivain wrote: > I indeed started to receive some autobuild failures. > Unfortunately, I cannot reproduce on my system for now: > on my side, the build complete successfully. > > I tried with _and_ without having a /usr/bin/gpgrt-config on host, > which I was suspecting to bring some host config. > > In my first proposal of gnupg2 version 2.4.0 bump [1], I initially > proposed > to add Buildroot staging bin dir in PATH, to make sure we won't have > such > host/br-staging confusion: > > GNUPG2_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) This is a really bad idea, and can potentially break. Indeed, STAGING_DIR/usr/bin contains lots of programs that are compiled for the target. So if you do that, the build process on your build machine might try to invoke executables that are compiled for the target. If the issue comes from a -config script, then generally, two things are needed: - Make sure the -config script returns correct values for cross-compilation. If not, use _CONFIG_SCRIPTS in the package installing this -config script - Make sure the package calling the -config script calls the right one. Most autotools-based projects provide some sort of cache variable that allows to tell the configure script that -config in $(STAGING_DIR)/usr/bin/-config should be used Best regards, Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From hrsourabh011 at gmail.com Sat Feb 18 13:39:39 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sat, 18 Feb 2023 14:39:39 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: <20230218141937.60c307f7@windsurf> References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> Message-ID: Hi Thomas, I want to add a local CA to the openssl trust-store in my image. This CA will be used by other applications in the target. As I read in other blogs the local CA needs to be in /usr/local/share/ca-certificates with .crt extension and executing update-ca-certificates will add it to /etc/ssl/certs/. But, what I have noticed is this is always done with "sudo". So, do you think post-build script can handle this? How about post-image script? On Sat, Feb 18, 2023, 14:19 Thomas Petazzoni wrote: > Hello, > > On Sat, 18 Feb 2023 13:54:15 +0100 > Sourabh Hegde wrote: > > > Thanks for the update. > > > > I was thinking the ca-certificates package will take care of this. Maybe > I > > was wrong. > > > > So, how should we add local CA to the trust store in the target? > > I am not sure as I'm not super familiar with that aspect. If what you > need to do is to call update-ca-certificates during the build, then we > could potentially build it for the host, and run it as a post-build > script. Of course, this assumes update-ca-certificates is capable of > doing its work on a root filesystem that isn't at the root. > > Do you have more details about what needs to be done? With more > details, we could probably give some more useful hints. > > Best regards, > > Thomas Petazzoni > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bagasdotme at gmail.com Sat Feb 18 13:45:37 2023 From: bagasdotme at gmail.com (Bagas Sanjaya) Date: Sat, 18 Feb 2023 20:45:37 +0700 Subject: [Buildroot] Debugging gnupg2 unsafe search path error (was Re: [PATCH] Revert "package/gnupg2: bump to version 2.4.0") In-Reply-To: <96015d0268df72d3cdd58e7db09c1333@free.fr> References: <20230218101426.630874-1-bagasdotme@gmail.com> <20230218113939.526f0a76@windsurf> <96015d0268df72d3cdd58e7db09c1333@free.fr> Message-ID: On 2/18/23 18:13, Julien Olivain wrote: > In my first proposal of gnupg2 version 2.4.0 bump [1], I initially proposed > to add Buildroot staging bin dir in PATH, to make sure we won't have such > host/br-staging confusion: > > GNUPG2_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) > > Bagas, could you try on your side if this solve the issue? > > [1] https://patchwork.ozlabs.org/project/buildroot/patch/20230103193649.7488-5-ju.o at free.fr/ > Hi Julien, I applied your suggestion on top of master as: ---- >8 ---- diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 5935ce6939..55917912a8 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -15,6 +15,9 @@ GNUPG2_SELINUX_MODULES = gpg GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf +# Let's see if staging GNUPG2_CONF_ENV here works. +GNUPG2_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) + GNUPG2_CONF_OPTS = \ --disable-rpath \ --with-libgpg-error-prefix=$(STAGING_DIR)/usr \ Unfortunately, the build error still occurs with your suggestion. Thanks. -- An old man doll... just what I always wanted! - Clara From yann.morin.1998 at free.fr Sat Feb 18 14:21:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 18 Feb 2023 15:21:15 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: <20230218141937.60c307f7@windsurf> References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> Message-ID: <20230218142115.GC2718518@scaer> Thomas, All, On 2023-02-18 14:19 +0100, Thomas Petazzoni via buildroot spake thusly: > On Sat, 18 Feb 2023 13:54:15 +0100 > Sourabh Hegde wrote: > > I was thinking the ca-certificates package will take care of this. Maybe I > > was wrong. > > So, how should we add local CA to the trust store in the target? > I am not sure as I'm not super familiar with that aspect. If what you > need to do is to call update-ca-certificates during the build, then we > could potentially build it for the host, and run it as a post-build > script. Of course, this assumes update-ca-certificates is capable of > doing its work on a root filesystem that isn't at the root. > > Do you have more details about what needs to be done? With more > details, we could probably give some more useful hints. I think we just need to split CA_CERTIFICATES_INSTALL_TARGET_CMDS in two: one part to actually instll the certifcates provided by ca-certificates itself, and the rest to update the castore with all certificate, as a target-finalize hook. I.e. all that starts from "Remove any existing certificates under /etc/ssl/certs" should be moved to a target-finalize hook. 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 egorenar at linux.ibm.com Sat Feb 18 13:40:59 2023 From: egorenar at linux.ibm.com (Alexander Egorenkov) Date: Sat, 18 Feb 2023 14:40:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: bump to version 2.26.0 Message-ID: <20230218134059.53863-1-egorenar@linux.ibm.com> Signed-off-by: Alexander Egorenkov --- 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 a0dde477c324..37b67c5cb180 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ccb20954e748309a50fd56edd9abd94c6f897081e9a1a33e9d965a56f650990d s390-tools-2.25.0.tar.gz +sha256 da81c55fb11d84923c0ebaed703f557052eb1a273495f60ebe3d20a74627303e s390-tools-2.26.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index cb6278dfb837..8cd549140547 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.25.0 +S390_TOOLS_VERSION = 2.26.0 S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE -- 2.39.2 From yann.morin.1998 at free.fr Sat Feb 18 15:32:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 18 Feb 2023 16:32:16 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: <20230218142115.GC2718518@scaer> References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> <20230218142115.GC2718518@scaer> Message-ID: <20230218153216.GD2718518@scaer> Thomas, Sourabh, All, On 2023-02-18 15:21 +0100, Yann E. MORIN spake thusly: > On 2023-02-18 14:19 +0100, Thomas Petazzoni via buildroot spake thusly: > > On Sat, 18 Feb 2023 13:54:15 +0100 > > Sourabh Hegde wrote: > > > I was thinking the ca-certificates package will take care of this. Maybe I > > > was wrong. > > > So, how should we add local CA to the trust store in the target? > > I am not sure as I'm not super familiar with that aspect. If what you > > need to do is to call update-ca-certificates during the build, then we > > could potentially build it for the host, and run it as a post-build > > script. Of course, this assumes update-ca-certificates is capable of > > doing its work on a root filesystem that isn't at the root. No, update-ca-certificates does not know how to work out-of-tree, which is the reason why we already need to handle it manually when we install ca-certificates. Also, we do remove update-ca-certificates on purpose from TARGET_DIR, because it is not expected that we need/can regenerate the root bundle on the target. > > Do you have more details about what needs to be done? With more > > details, we could probably give some more useful hints. > > I think we just need to split CA_CERTIFICATES_INSTALL_TARGET_CMDS in two: > one part to actually instll the certifcates provided by ca-certificates > itself, and the rest to update the castore with all certificate, as a > target-finalize hook. > > I.e. all that starts from "Remove any existing certificates under > /etc/ssl/certs" should be moved to a target-finalize hook. Basically, something around those lines (totally untested): diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index 0b6962ab7b..cc55d39957 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -20,7 +20,9 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates +endef +define CA_CERTIFICATES_GEN_BUNDLE # Remove any existing certificates under /etc/ssl/certs rm -f $(TARGET_DIR)/etc/ssl/certs/* @@ -30,14 +32,15 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS for i in `find usr/share/ca-certificates -name "*.crt" | LC_COLLATE=C sort` ; do \ ln -sf ../../../$$i etc/ssl/certs/`basename $${i} .crt`.pem ;\ cat $$i ;\ - done >$(@D)/ca-certificates.crt + done >$(BUILD_DIR)/ca-certificates.crt # Create symlinks to the certificates by their hash values $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs # Install the certificates bundle - $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ + $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt endef +CA_CERTIFICATES_TARGET_FINALIZE_HOOKS += CA_CERTIFICATES_GEN_BUNDLE $(eval $(generic-package)) Sourabh, can you test and adapt that and report, please? 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 hrsourabh011 at gmail.com Sat Feb 18 15:56:49 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sat, 18 Feb 2023 16:56:49 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: <20230218153216.GD2718518@scaer> References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> <20230218142115.GC2718518@scaer> <20230218153216.GD2718518@scaer> Message-ID: Hello Yann, All, Thanks for the update. Yes, I will try this patch and let you know. Also, we do remove update-ca-certificates on purpose from TARGET_DIR, > because it is not expected that we need/can regenerate the root bundle > on the target. > I am not sure if I understood this completely. I have a generic question: What if someone wants to update castore on the target itself. Let's say if the local CA is already available on the target then how can it be added to the trust store with update-ca-certificates? Is it not a good option to include "update-ca-certificates" in TARGET_DIR? On Sat, 18 Feb 2023 at 16:32, Yann E. MORIN wrote: > Thomas, Sourabh, All, > > On 2023-02-18 15:21 +0100, Yann E. MORIN spake thusly: > > On 2023-02-18 14:19 +0100, Thomas Petazzoni via buildroot spake thusly: > > > On Sat, 18 Feb 2023 13:54:15 +0100 > > > Sourabh Hegde wrote: > > > > I was thinking the ca-certificates package will take care of this. > Maybe I > > > > was wrong. > > > > So, how should we add local CA to the trust store in the target? > > > I am not sure as I'm not super familiar with that aspect. If what you > > > need to do is to call update-ca-certificates during the build, then we > > > could potentially build it for the host, and run it as a post-build > > > script. Of course, this assumes update-ca-certificates is capable of > > > doing its work on a root filesystem that isn't at the root. > > No, update-ca-certificates does not know how to work out-of-tree, which > is the reason why we already need to handle it manually when we install > ca-certificates. > > Also, we do remove update-ca-certificates on purpose from TARGET_DIR, > because it is not expected that we need/can regenerate the root bundle > on the target. > > > > Do you have more details about what needs to be done? With more > > > details, we could probably give some more useful hints. > > > > I think we just need to split CA_CERTIFICATES_INSTALL_TARGET_CMDS in two: > > one part to actually instll the certifcates provided by ca-certificates > > itself, and the rest to update the castore with all certificate, as a > > target-finalize hook. > > > > I.e. all that starts from "Remove any existing certificates under > > /etc/ssl/certs" should be moved to a target-finalize hook. > > Basically, something around those lines (totally untested): > > diff --git a/package/ca-certificates/ca-certificates.mk > b/package/ca-certificates/ca-certificates.mk > index 0b6962ab7b..cc55d39957 100644 > --- a/package/ca-certificates/ca-certificates.mk > +++ b/package/ca-certificates/ca-certificates.mk > @@ -20,7 +20,9 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS > $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) > rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates > +endef > > +define CA_CERTIFICATES_GEN_BUNDLE > # Remove any existing certificates under /etc/ssl/certs > rm -f $(TARGET_DIR)/etc/ssl/certs/* > > @@ -30,14 +32,15 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS > for i in `find usr/share/ca-certificates -name "*.crt" | > LC_COLLATE=C sort` ; do \ > ln -sf ../../../$$i etc/ssl/certs/`basename $${i} > .crt`.pem ;\ > cat $$i ;\ > - done >$(@D)/ca-certificates.crt > + done >$(BUILD_DIR)/ca-certificates.crt > > # Create symlinks to the certificates by their hash values > $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs > > # Install the certificates bundle > - $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ > + $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ > $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt > endef > +CA_CERTIFICATES_TARGET_FINALIZE_HOOKS += CA_CERTIFICATES_GEN_BUNDLE > > $(eval $(generic-package)) > > Sourabh, can you test and adapt that and report, please? > > 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. | > > '------------------------------^-------^------------------^--------------------' > -------------- next part -------------- An HTML attachment was scrubbed... URL: From hrsourabh011 at gmail.com Sat Feb 18 17:00:35 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sat, 18 Feb 2023 18:00:35 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> <20230218142115.GC2718518@scaer> <20230218153216.GD2718518@scaer> Message-ID: Hello Yann, I am trying to apply the patch. I am doing below steps: 1. modified the ca-certificates.mk to include changes. Also attached in this mail. Could you please verify the changes? 2. Generated patch file using "diff -u "old_file" "new_file" > file.patch". Placed the patch file in /buildroot/package/ca-certificates/ dir 0002-ca-certificates-add_local_CAs.patch +++ ca-certificates.mk 2023-02-18 14:13:13.181814043 +0000 @@ -20,24 +20,29 @@ $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates +endef +define CA_CERTIFICATES_GEN_BUNDLE # Remove any existing certificates under /etc/ssl/certs rm -f $(TARGET_DIR)/etc/ssl/certs/* +endef # Create symlinks to certificates under /etc/ssl/certs # and generate the bundle cd $(TARGET_DIR) ;\ +define CA_CERTIFICATES_INSTALL_TARGET_CMDS for i in `find usr/share/ca-certificates -name "*.crt" | LC_COLLATE=C sort` ; do \ ln -sf ../../../$$i etc/ssl/certs/`basename $${i} .crt`.pem ;\ cat $$i ;\ - done >$(@D)/ca-certificates.crt + done >$(BUILD_DIR)/ca-certificates.crt # Create symlinks to the certificates by their hash values $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs # Install the certificates bundle - $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ + $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt endef +CA_CERTIFICATES_TARGET_FINALIZE_HOOKS += CA_CERTIFICATES_GEN_BUNDLE $(eval $(generic-package)) 3. Trying to rebuild the package: make ca-certificates-dirclean make But, the patch is not applied. Getting below error: Applying 0002-ca-certificates-add_local_CAs.patch using patch: can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? Can you please let me know what am I doing wrong here? Thank you. On Sat, 18 Feb 2023 at 16:56, Sourabh Hegde wrote: > Hello Yann, All, > > Thanks for the update. > > Yes, I will try this patch and let you know. > > Also, we do remove update-ca-certificates on purpose from TARGET_DIR, >> because it is not expected that we need/can regenerate the root bundle >> on the target. >> > > I am not sure if I understood this completely. I have a generic question: > What if someone wants to update castore on the target itself. Let's say if > the local CA is already available on the target then how can it be added to > the trust store with update-ca-certificates? Is it not a good option to > include "update-ca-certificates" in TARGET_DIR? > > On Sat, 18 Feb 2023 at 16:32, Yann E. MORIN > wrote: > >> Thomas, Sourabh, All, >> >> On 2023-02-18 15:21 +0100, Yann E. MORIN spake thusly: >> > On 2023-02-18 14:19 +0100, Thomas Petazzoni via buildroot spake thusly: >> > > On Sat, 18 Feb 2023 13:54:15 +0100 >> > > Sourabh Hegde wrote: >> > > > I was thinking the ca-certificates package will take care of this. >> Maybe I >> > > > was wrong. >> > > > So, how should we add local CA to the trust store in the target? >> > > I am not sure as I'm not super familiar with that aspect. If what you >> > > need to do is to call update-ca-certificates during the build, then we >> > > could potentially build it for the host, and run it as a post-build >> > > script. Of course, this assumes update-ca-certificates is capable of >> > > doing its work on a root filesystem that isn't at the root. >> >> No, update-ca-certificates does not know how to work out-of-tree, which >> is the reason why we already need to handle it manually when we install >> ca-certificates. >> >> Also, we do remove update-ca-certificates on purpose from TARGET_DIR, >> because it is not expected that we need/can regenerate the root bundle >> on the target. >> >> > > Do you have more details about what needs to be done? With more >> > > details, we could probably give some more useful hints. >> > >> > I think we just need to split CA_CERTIFICATES_INSTALL_TARGET_CMDS in >> two: >> > one part to actually instll the certifcates provided by ca-certificates >> > itself, and the rest to update the castore with all certificate, as a >> > target-finalize hook. >> > >> > I.e. all that starts from "Remove any existing certificates under >> > /etc/ssl/certs" should be moved to a target-finalize hook. >> >> Basically, something around those lines (totally untested): >> >> diff --git a/package/ca-certificates/ca-certificates.mk >> b/package/ca-certificates/ca-certificates.mk >> index 0b6962ab7b..cc55d39957 100644 >> --- a/package/ca-certificates/ca-certificates.mk >> +++ b/package/ca-certificates/ca-certificates.mk >> @@ -20,7 +20,9 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS >> $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs >> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) >> rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates >> +endef >> >> +define CA_CERTIFICATES_GEN_BUNDLE >> # Remove any existing certificates under /etc/ssl/certs >> rm -f $(TARGET_DIR)/etc/ssl/certs/* >> >> @@ -30,14 +32,15 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS >> for i in `find usr/share/ca-certificates -name "*.crt" | >> LC_COLLATE=C sort` ; do \ >> ln -sf ../../../$$i etc/ssl/certs/`basename $${i} >> .crt`.pem ;\ >> cat $$i ;\ >> - done >$(@D)/ca-certificates.crt >> + done >$(BUILD_DIR)/ca-certificates.crt >> >> # Create symlinks to the certificates by their hash values >> $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs >> >> # Install the certificates bundle >> - $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ >> + $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ >> $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt >> endef >> +CA_CERTIFICATES_TARGET_FINALIZE_HOOKS += CA_CERTIFICATES_GEN_BUNDLE >> >> $(eval $(generic-package)) >> >> Sourabh, can you test and adapt that and report, please? >> >> 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. | >> >> '------------------------------^-------^------------------^--------------------' >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: ca-certificates.mk Type: application/octet-stream Size: 1942 bytes Desc: not available URL: From hrsourabh011 at gmail.com Sat Feb 18 17:09:00 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sat, 18 Feb 2023 18:09:00 +0100 Subject: [Buildroot] Missing curl binary In-Reply-To: <20230218121846.306f95f5@windsurf> References: <20230218121846.306f95f5@windsurf> Message-ID: Hi Thomas, Yes, that was the issue. Doing "make libcurl-dirclean all" fixed it. Thanks for the support On Sat, 18 Feb 2023 at 12:18, Thomas Petazzoni wrote: > On Fri, 17 Feb 2023 16:52:49 +0100 > Sourabh Hegde wrote: > > > I am trying to include curl binary in my image. I have > > selected BR2_PACKAGE_LIBCURL=y , BR2_PACKAGE_LIBCURL_CURL=y in the > Config. > > But still the curl binary is not installed in the target. Can anyone > please > > let me know what is the issue here and how to resolve it? > > I suppose you did a build with BR2_PACKAGE_LIBCURL=y, then after the > build completed you changed the configuration to enable > BR2_PACKAGE_LIBCURL_CURL=y and just ran "make". This doesn't work, as > the libcurl package is already built, and Buildroot is not smart enough > to detect that you changed something related to the libcurl > configuration. > > Run: "make libcurl-dirclean all" to force rebuilding the libcurl > package (or do a full rebuild). > > See https://buildroot.org/downloads/manual/manual.html#full-rebuild for > more details. > > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From ju.o at free.fr Sat Feb 18 17:40:35 2023 From: ju.o at free.fr (Julien Olivain) Date: Sat, 18 Feb 2023 18:40:35 +0100 Subject: [Buildroot] Debugging gnupg2 unsafe search path error (was Re: [PATCH] Revert "package/gnupg2: bump to version 2.4.0") In-Reply-To: References: <20230218101426.630874-1-bagasdotme@gmail.com> <20230218113939.526f0a76@windsurf> <96015d0268df72d3cdd58e7db09c1333@free.fr> Message-ID: <1852709c493974b2588cc7c9c28bba7e@free.fr> Hi Bagas, On 18/02/2023 14:45, Bagas Sanjaya wrote: > On 2/18/23 18:13, Julien Olivain wrote: >> In my first proposal of gnupg2 version 2.4.0 bump [1], I initially >> proposed >> to add Buildroot staging bin dir in PATH, to make sure we won't have >> such >> host/br-staging confusion: >> >> GNUPG2_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) >> >> Bagas, could you try on your side if this solve the issue? >> >> [1] >> https://patchwork.ozlabs.org/project/buildroot/patch/20230103193649.7488-5-ju.o at free.fr/ >> > > Hi Julien, > > I applied your suggestion on top of master as: > > ---- >8 ---- > diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk > index 5935ce6939..55917912a8 100644 > --- a/package/gnupg2/gnupg2.mk > +++ b/package/gnupg2/gnupg2.mk > @@ -15,6 +15,9 @@ GNUPG2_SELINUX_MODULES = gpg > GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba > libnpth \ > $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf > > +# Let's see if staging GNUPG2_CONF_ENV here works. > +GNUPG2_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) > + > GNUPG2_CONF_OPTS = \ > --disable-rpath \ > --with-libgpg-error-prefix=$(STAGING_DIR)/usr \ > > > Unfortunately, the build error still occurs with your suggestion. Thank you for testing. I still can't reproduce the issue on my side. Compilation works fine on my system (with and without a /usr/bin/gpgrt-config script), and also in the Buildroot utils/docker-run (which does not include a /usr/bin/gpgrt-config script). My system has the same libgpg-error version 1.46 as Buildroot. Could you tell me what is the distribution of your host system (or what is the version of the libgpg-error on the host)? I'll try the same environment in a docker. Another way to force the gpgrt-config path without putting the full staging usr bin in the PATH (as Thomas recommended not to do) would be to add the following: GNUPG2_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config While compiling gnupg2 in Buildroot, you should see in the configuration log: ... checking for gpg-error-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpg-error-config checking for gpgrt-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpgrt-config ... Without this line, if the host contains a gpgrt-config, you should see: checking for gpg-error-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpg-error-config checking for gpgrt-config... /usr/bin/gpgrt-config and if the host does not not contain a gpgrt-config, you should see: checking for gpg-error-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpg-error-config checking for gpgrt-config... no I still suspect the root cause is the presence of a /usr/bin/gpgrt-config of a specific/older libgpg-error version on the host. Best regards, Julien. From romain.naour at gmail.com Sat Feb 18 18:02:15 2023 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 18 Feb 2023 19:02:15 +0100 Subject: [Buildroot] [PATCH] package/poke: bump to version 3.0 Message-ID: <20230218180215.1077049-1-romain.naour@gmail.com> See: http://www.jemarch.net/poke-3.0-relnotes.html Build tested: https://gitlab.com/kubu93/buildroot/-/pipelines/782116399 Signed-off-by: Romain Naour --- test-pkg config: BR2_PACKAGE_POKE=y --- package/poke/poke.hash | 2 +- package/poke/poke.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poke/poke.hash b/package/poke/poke.hash index 09dc4e8972..e6e436570c 100644 --- a/package/poke/poke.hash +++ b/package/poke/poke.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 841e285917c6738ce982a6930e30ebeadecfb0655a79d9184f16f876a9fe6e47 poke-2.4.tar.gz +sha256 79a9b2f33c9f8c327c499afadaeeabfeecf6ad4988924d2c6c6f317e50317add poke-3.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index d49e628dbf..4a6ff344b2 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 2.4 +POKE_VERSION = 3.0 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) -- 2.34.3 From bagasdotme at gmail.com Sun Feb 19 04:26:26 2023 From: bagasdotme at gmail.com (Bagas Sanjaya) Date: Sun, 19 Feb 2023 11:26:26 +0700 Subject: [Buildroot] Debugging gnupg2 unsafe search path error (was Re: [PATCH] Revert "package/gnupg2: bump to version 2.4.0") In-Reply-To: <1852709c493974b2588cc7c9c28bba7e@free.fr> References: <20230218101426.630874-1-bagasdotme@gmail.com> <20230218113939.526f0a76@windsurf> <96015d0268df72d3cdd58e7db09c1333@free.fr> <1852709c493974b2588cc7c9c28bba7e@free.fr> Message-ID: On Sat, Feb 18, 2023 at 06:40:35PM +0100, Julien Olivain wrote: > Thank you for testing. > > I still can't reproduce the issue on my side. Compilation works fine on my > system > (with and without a /usr/bin/gpgrt-config script), and also in the Buildroot > utils/docker-run (which does not include a /usr/bin/gpgrt-config script). My > system > has the same libgpg-error version 1.46 as Buildroot. > > Could you tell me what is the distribution of your host system (or what is > the version > of the libgpg-error on the host)? I'll try the same environment in a > docker. > > Another way to force the gpgrt-config path without putting the full staging > usr bin > in the PATH (as Thomas recommended not to do) would be to add the following: > > GNUPG2_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config > Hi Julien, My setup is Debian 11. For the host GnuPG, I compiled GnuPG 2.4.0 with libgpg-error 1.46. I source a script (gnupg-setup) to initialize the compiled version into my ~/.bashrc. The script is: ---- >8 ---- if ! (systemctl --user is-active -q dirmngr-local.socket); then systemctl --user start {dirmngr,gpg-agent,gpg-agent-ssh,gpg-agent-browser,gpg-agent-extra}-local.socket fi export PATH=$HOME/.local/gnupg/bin:$PATH The actual .socket unit files are copied from GnuPG sources but I add Conflicts= against corresponding system-provided socket units. For your suggestion above, the build successed only when the initialization script above isn't sourced. However, when the script is sourced, the build search for host version of libraries instead (and thus FTBFS). > While compiling gnupg2 in Buildroot, you should see in the configuration > log: > > ... > checking for gpg-error-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpg-error-config > checking for gpgrt-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpgrt-config > ... > > Without this line, if the host contains a gpgrt-config, you should see: > > checking for gpg-error-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpg-error-config > checking for gpgrt-config... /usr/bin/gpgrt-config > > and if the host does not not contain a gpgrt-config, you should see: > > checking for gpg-error-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpg-error-config > checking for gpgrt-config... no Yes, I see the message above in my build log. Thanks. -- An old man doll... just what I always wanted! - Clara -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: From thomas.petazzoni at bootlin.com Sun Feb 19 06:37:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 06:37:39 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-18 Message-ID: <20230219063745.E110C41800@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-18 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 7 | 9 | 0 | 16 | master | 151 | 166 | 1 | 318 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 22 host-pahole-1.24 | 8 linux-6.1.11 | 8 gobject-introspection-1.72.0 | 7 unknown | 7 host-binutils-2.38 | 5 host-go-1.19.6 | 5 libgcrypt-1.10.1 | 5 speechd-0.11.4 | 5 host-rust-1.67.0 | 4 glibc-2.36-81-g4f4d7a13edfd... | 3 systemd-252.4 | 3 xenomai-3.0.10 | 3 busybox-1.36.0 | 2 cairo-1.16.0 | 2 dash-0.5.11.5 | 2 gerbera-1.10.0 | 2 gmp-6.2.1 | 2 libgpg-error-1.46 | 2 linux-5.10.162-cip24-rt10 | 2 netsurf-3.10 | 2 olsr-0.9.8 | 2 php-8.2.2 | 2 at91dataflashboot-1.05 | 1 audit-3.0.7 | 1 check-0.15.2 | 1 cni-plugins-1.2.0 | 1 duma-2.5.15 | 1 efivar-38 | 1 elfutils-0.186 | 1 ffmpeg-4.4.3 | 1 fftw-quad-3.3.8 | 1 flann-1.9.2 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fstrcmp-0.7.D001 | 1 fwup-1.9.1 | 1 glibmm-2.68.2 | 1 gobject-introspection | 1 host-binutils-2.37 | 1 host-binutils-2.39 | 1 host-gcc-final-12.2.0 | 1 host-gdb-arc-2020.09-releas... | 1 host-libarchive-3.6.2 | 1 janet-1.26.0 | 1 kmod-30 | 1 libglib2-2.72.3 | 1 libglvnd-1.4.0 | 1 libhid-0.2.16 | 1 libjxl-0.7.0 | 1 libnfc-1.8.0 | 1 libressl-3.6.2 | 1 libsigsegv-2.14 | 1 libuci-4b3db1179747b6a67790... | 1 libxml2-2.10.3 | 1 libzlib-1.2.13 | 1 linux-5.10.162-cip24 | 1 linux-fusion-9.0.3 | 1 linux-tools | 1 lirc-tools-0.10.2 | 1 ltp-testsuite-20220930 | 1 lxc-5.0.2 | 1 matio-1.5.23 | 1 multipath-tools-0.9.4 | 1 ocf-linux-20171122 | 1 openal-1.22.0 | 1 openblas-0.3.21 | 1 opus-1.3.1 | 1 pcre2-10.42 | 1 php-xdebug-3.0.4 | 1 proftpd-1.3.8 | 1 python-numpy-1.23.5 | 1 python3-3.11.1 | 1 qemu-7.2.0 | 1 sdl-1.2.15 | 1 sigrok-cli-0.7.2 | 1 snmppp-3.4.10 | 1 uccp420wlan-6.9.1 | 1 valgrind-3.19.0 | 1 xfsprogs-5.14.2 | 1 zabbix-6.2.7 | 1 zxing-cpp-1.4.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | at91dataflashboot-1.05 | NOK | http://autobuild.buildroot.net/results/78e81ddf6fe9aa36cc1777ef2764d0d8627c9d13 | ORPH armeb | audit-3.0.7 | NOK | http://autobuild.buildroot.net/results/9ced9cd83351214ee393a94cf8d296e59a2d7717 | mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/3e13b17cf04fd413a3ad97686b717996c432f90e | ORPH mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/f6d03598201657332c5b70fd85ae6e30dc5870c0 | ORPH aarch64 | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/fa7645feb8b100486ef7317ae01a043cc7e0058b | powerpc | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/107916e6c212095db405d316f4ab57149d301a43 | x86_64 | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/9d61b956022c0233502273a4c183c097a9400749 | ORPH i686 | cni-plugins-1.2.0 | NOK | http://autobuild.buildroot.net/results/c6c9fb8911e0568e260b0a63c30a747d72250269 | or1k | dash-0.5.11.5 | NOK | http://autobuild.buildroot.net/results/1066076138f5a52fdba59260daf44d9d08ecfb02 | ORPH xtensa | dash-0.5.11.5 | NOK | http://autobuild.buildroot.net/results/95bdac3486aceda02531c41f402831a339301317 | ORPH armeb | duma-2.5.15 | NOK | http://autobuild.buildroot.net/results/cf455c210424e720426680a525947c691c51eab9 | ORPH aarch64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/e6e6ceba41c0f7ec135a86bff83d787f070b34d0 | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/9d14343b1798f2bc4410b2e529ab84444bc375db | ORPH i686 | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/f0c75b20eebb079e9733e705b0a59252699860cc | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/abc60144cb5e61ad168ac8c47d6dc6d84bc76a4d | ORPH arm | flann-1.9.2 | NOK | http://autobuild.buildroot.net/results/22a5416d04913dac726284dc44f78cd3a9291cec | microblazeel | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/160a51fac666663d9f8f45d7a82bf9a72bbc9da8 | or1k | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/e723b0b36bb91ce91246ddc7a5e0890b04d3ea10 | aarch64_be | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/2d44113e83497526f6c08bfa8070970b862e4796 | sparc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/403a1be571e63c0ce04acd843e09ba6c9ee9d40c | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/029cef2f885f659d15cb73256620e4db18a58411 | armeb | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/d11c45c153e800a8cc3df1e123a7d8a783cdbaf0 | arceb | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/05a5496495e51da2c9caf7570695cc95e1745e30 | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/2f00f6a1623a31915eccb252d802eb159c72c062 | powerpc64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/a744139da6e35ebc4e43686dd27411c7da2dff72 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/c330fa1fffad9e3116a56553f24dcccca8e77b8a | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/5bd6f4648cdd265e31aa9ec8885a1faa3737d9a8 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/0a19ed9bb2720e7b6949112c977461dce8e1f415 | or1k | glibmm-2.68.2 | NOK | http://autobuild.buildroot.net/results/4962e1ffc531ea51188bba681bd31c7f2e9654d8 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/cf6f748ce250998efed7de540d5082edc891452c | ORPH riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/238f7f0d4fe848395c0c903c3f1f10e942ebcef2 | ORPH powerpc64le | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/d8e26edefea364fc809f45bd04cd80df1e81be57 | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/3b44d03d4e043d6ab067fa700382b6e4ae43910d | armeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/3c27029acf6b3ac6143c3a4f1abd555687f374f7 | nios2 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/84ad3f2c009dfc9a1283bf0e39ce38fb7476548c | i686 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/e869d10ac406980f88cf1623ffe52454517d8de7 | or1k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/796f589ef1100597b0160c5d2413f5a7d67c31fe | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/859bf641d81cd93274655babaa54d926a4cd6f6b | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/7b90d6946193b5b190feeafc0b446c59b1629090 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/65e0663c8f2f0ad4130c75f827fb7dabd0613dc7 | armeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/4cae2ca1016e7c3638fe027796aa8390b78bbcb3 | sh4aeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/4beb3d78b8ae1ba34345406968f958d1b2bd87ed | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9cf43311db661ffc8f4dd772d24a78cbcdc74c8d | arm | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/c1228589072383ed28741ee76a57f9f4d8ea9f72 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/1ae538e5eb074945a99beb1ae289af8e2a1cb6de | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/f17b1c257696f43b00ff196291a8c489add421ed | i586 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6436465cec15394e834ec6c0aa7c9ea0e5c7f08e | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/b970eebd9d0e5fab2387c952c1a959f26a9b6a31 | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6d48bef6174c55201b824ed46f31a16ed9e6d841 | powerpc64le | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/cbe66ca39b678b9a05e700394b1272949ea38a4b | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/fc4960d37ca0a2d2ba257ec846c2c965afb9ec8c | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/423c3ce7317c181e9f2e4a49b76ee9d26167375c | mips | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/dfd2fe3f4b20d68b4de1ef028f7ddca34aee4293 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/73a31f21c8434e9fbecd1bee671aaa119ecf76fc | s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/315c8f61097e5e95c74fa4ac343adedb032864a1 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/45c942f63be141258e3424661d044847dc62cacf | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8e2830acdd33b062bad5b95f68f9fc31299741e6 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8797e00a5a77c4002f4655ff73f9d51f3f72dae9 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0181ede6b23475f3d329964fad0cda9552b837e3 | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/687d3cca0dbe563b18492fb0b1320b316e1647af | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d88e5873c1c2941e99da381e32ef3c4b9c94d1f7 | ORPH powerpc64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/2b965a8f0c745a0c75214270e0376ca70a698115 | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/51f8b51fe1efdbaacae7ae7d6a0b7caa2ca6bc54 | powerpc64le | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/ab738a475197bc1fcff01417b3dbac27361f2eb7 | riscv32 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e37236b2a4cee0c7b516fea268dfa0399e3ce660 | armeb | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/64faa949e7ff158b2933b5821ac69f5c03061f15 | i686 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/baa326b439fd73b93b0ed230fb8ae241ab07fc2f | xtensa | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/ef80c5b74c50f8818593ba2c6c5a7079aaa6f6b1 | microblaze | host-gcc-final-12.2.0 | NOK | http://autobuild.buildroot.net/results/7d3af92ecdd0d2b3368613f0589441e09bd1df0a | arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/4493456d770626e0c25d8c745b6ba4bb8436b505 | ORPH i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/74c9f936abfdeb902c877bc26a0b6708c1c65252 | riscv64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/4692170071917f15705f38626cee110c7080ef22 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/60dcd75ecc6e431866e0f0286a98dd3f73b091a0 | riscv64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/bd13eea42c1f96fda351468c54c9979fd14bd24c | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/ab6a0a608ca1031e6904a26fda045be82317b06e | mips64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/335fa5e50d33abf1a297b358b657330f988097c0 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/f1332647f60c8a9601960a311b8b2946d43b8ab5 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1a73b7f0c727d941a15b531b75a944034cb3136f | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/afaf2bfe881edb4e6ad06b66b14499cdf2f91685 | mipsel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/53c0d407578ea83da7f4eab90a72a5c9185beb21 | arceb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ea7b461d2dec6ea6c15763752c432072c256d5ca | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2541c2063f262ac6a6bf2528534569ef780f62d0 | sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/5f5951fa21b867465408afb93a4dc6f865eaa200 | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/41172aa86d3eaee131386db020d008ddb9869190 | powerpc64le | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/3cdd9861919a19616938b09cd8290627ce79c44a | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/d90faa5e58245a58e18265076884991de0b60428 | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/d7c16bc32dccf66ae634ff7ddeded47dad4dbc73 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/db4c7f2fd90f944e977c7280057c0ac8382fb890 | aarch64_be | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/90ac4467a9eacd28644a6f710d669567af1fa7b6 | x86_64 | kmod-30 | NOK | http://autobuild.buildroot.net/results/b31ae705e641135885c0678746db20185e1b60b3 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/fd5a15ecaffa7664f9dee0258431a50561984565 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/1e9116d09dd96b95d974c8e5819ede33b5299cac | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/8060b102c4e08e61c2739e880bfb588be8ce6813 | ORPH arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/2985be716aaee664970def0d197d2a08fe496fcc | ORPH arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/062fc71dace7710aa494acc91f0332dd5252f6a4 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/91142f574ae5f5dce2e4bc5739c1d7086f04a1a9 | mipsel | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/48f1a59384bf8bffb246667973af8d1bf52376fa | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/6d6061c382efc6e78056a890290330e5fe29bc72 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/fe41886cb54906406b06789579d0256888b684ae | ORPH arceb | libhid-0.2.16 | NOK | http://autobuild.buildroot.net/results/920d45d47decea8f6eb652fa49d0d5be3f01bddc | ORPH i686 | libjxl-0.7.0 | NOK | http://autobuild.buildroot.net/results/f02e042d79342a6744913634368d57db76c9bcdd | or1k | libnfc-1.8.0 | NOK | http://autobuild.buildroot.net/results/7f33b9ce81d6cf9a3747e8d05644120db8ad230d | armeb | libressl-3.6.2 | NOK | http://autobuild.buildroot.net/results/fc2d4e894dde11d674244e1de65658f03072eeb5 | ORPH powerpc | libsigsegv-2.14 | NOK | http://autobuild.buildroot.net/results/13b0a59d8a36ddef725833743b15d7aa02a1f264 | mips64 | libuci-4b3db1179747b6a67790... | NOK | http://autobuild.buildroot.net/results/789e03372b064b8221f614fb27364360fda12e3c | x86_64 | libxml2-2.10.3 | NOK | http://autobuild.buildroot.net/results/985527a0e59f6b4a10faf73c722150dfb0f00f6c | mips64el | libzlib-1.2.13 | NOK | http://autobuild.buildroot.net/results/81941196257cdb218b1123768c33a341a4493861 | ORPH mipsel | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/420a406571a2ce4fd66487c279e8cc4e87a3f0d8 | ORPH mips64 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/fac1943e4046a2fe48d99997ca247bd1d15a9ad9 | ORPH mips64el | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/ee8f3dccfeb35ff375a13c34bb94480529cb61ed | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/c338222a16e9234d376f5c5201e51e8c5faa484f | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/ceb8385819ceb0852734d449c01c7ca0b962a9b1 | ORPH mips64el | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4d29e21605bf51392c224ae08c0c09853754bae3 | ORPH powerpc | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/5ec4068bce62e2fb574a74ea378a5e7b9cfee8cc | ORPH m68k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/b96f0de25f0c80476b2b126da97a2392b3c30cca | ORPH m68k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/37562596eed2062810b17d3acf7df0a7ee155b53 | ORPH powerpc64le | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/67a8445a91e3690928175227e1d02a464912e813 | ORPH arceb | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/47c0dd8d1cad8b8c300a5defedd3cb93228fac84 | ORPH x86_64 | linux-fusion-9.0.3 | NOK | http://autobuild.buildroot.net/results/7b5bbca45822f8cb23cd02861eadf3c37842e2eb | ORPH mips64el | linux-tools | NOK | http://autobuild.buildroot.net/results/5b56a9ad46cd114975a0a2ea3811564dde453bf9 | ORPH sparc64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/0ebe0926d6cb2ee73e01c714c8dceddccb425d8f | ORPH x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/86832d4a359711189a9e648cff3db9a997b68ebd | aarch64_be | lxc-5.0.2 | NOK | http://autobuild.buildroot.net/results/f383cfa5aa32594e01a0b8694bc2532d038c258a | nios2 | matio-1.5.23 | NOK | http://autobuild.buildroot.net/results/7b98c54cc0cbc4e41648b1a9266f5f1d48b3a16a | mips64el | multipath-tools-0.9.4 | NOK | http://autobuild.buildroot.net/results/fe006217b96f544f3bd495db1b842ba7ceb92c94 | powerpc64le | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/44d196af7f55d8b08f56bbc5d0c585a7dba1b8bb | mipsel | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/d6f9379b928846d8d386249467c0ddd7ecdfd80d | i686 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/5acdafd55e06368d2cc9fe628084130516c85e69 | ORPH microblaze | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/6c5a33c16b5a3505887dcebd02f3a93c6d619ada | ORPH x86_64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/6643c7f0130085aee38cf912f504a81161f390d9 | ORPH mipsel | openal-1.22.0 | NOK | http://autobuild.buildroot.net/results/5b18d2c4ec5df4b51827e29239d2bb192a5eefb5 | ORPH mips64el | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/85a743146f1604329aa6326e57e41bcf32aec585 | ORPH armeb | opus-1.3.1 | NOK | http://autobuild.buildroot.net/results/df2741ea654aa5e3165e0617c162acacc76ed12a | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/d8246c9e3e54547cdb7d94dcdbf376d292dfd787 | ORPH armeb | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/20b64a465602070531d114aec41b1a7c940c3a94 | microblaze | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/acdbed0d4a20049edc72d6250e7bedc011daa398 | mipsel | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/d5800324f85d0227e28ebedbd83a24fecb65d580 | arceb | proftpd-1.3.8 | NOK | http://autobuild.buildroot.net/results/2aba5297206e44dc086c3138ace70e85739196f3 | ORPH i686 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/f3db763c41d9abcd7ed35c8aad11d7842c901182 | x86_64 | python3-3.11.1 | NOK | http://autobuild.buildroot.net/results/61d61b1523b1b498b6af5d3088fc348c51421f7a | riscv32 | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/a742f4f67f82650623d3644e963e3df507762251 | sh4a | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/610498fac72a7abd2b48fc4fd6f9698d370b9492 | ORPH armeb | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/e4fb9180c9f4ba2643a3e4a588f37a450b041913 | ORPH powerpc64le | snmppp-3.4.10 | NOK | http://autobuild.buildroot.net/results/82ea09ff86c99a6e603a6d0ff778ee40e008eab7 | arceb | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/5f721b45674f59f00d0e411c679b31af7cc24eaf | arceb | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/b9807d227d15fa5cf25f283cd9244b6384aa97d6 | mips | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/0c2983cb9df393c372755c86a78b6c1c7089d56e | powerpc64le | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/d4f193545eb31864a9bac5a9d05bba39d3c7ff3e | s390x | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/fcd2f54c9240862b9ad38382c9f1d19e0eb6486b | powerpc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/66b0855d63c430d09acd1227ee9446a5ae5f6211 | arm | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/56eb99f0ef56b3d684c0445ebd25ded901e469d0 | sparc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/043ca336d4abb6ae147a0d43a5bd82b847885b2f | powerpc64le | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/062cebb8270da8a5e16159feb842514552de1128 | ORPH microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/834d4b406f8bea568d66621133125180052bc609 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/12a0a903182973ab144780eb80297af03dd5dbc3 | mips | unknown | NOK | http://autobuild.buildroot.net/results/0af8d180dc52c00e6fc27d52c8e2c94d766a7d5d | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/f96e5c09ed4b56b9fa712d7f292af43541c34757 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/8b56820cba16eb235f5d7c16cc16200ceb71049d | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/d86be9c08ce7da8441c6e4c82d25da6910ad26a7 | arceb | unknown | NOK | http://autobuild.buildroot.net/results/9b450c6ba85bb6dfb6380eec96d09992c2759d6e | mips | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/96895ad8942b5ac1932e753fd834feabd714af4d | ORPH powerpc | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/9759584ad48b9681e3454dba90676ffda01801c6 | sh4a | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/dc35a189de39244dc49f5a6f98c1c277fd704b80 | mipsel | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/891319a108654aede38fa5126986d534b2b0fd6e | mipsel | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/794f292edc659d48369412594e4596ef0e6866ac | ORPH powerpc64le | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/e74056c2c6c2f26762b4475f9a42b7807a4143fd | mips64el | zxing-cpp-1.4.0 | NOK | http://autobuild.buildroot.net/results/e62a38b7a477a66708fc2cd2cd9970ae9c20402b | Classification of failures by reason for 2022.11.x -------------------------------------------------- host-pahole-1.24 | 1 libgcrypt-1.10.1 | 1 libnss-3.84 | 1 mutt-2.2.9 | 1 ocf-linux-20171122 | 1 opencv3-3.4.17 | 1 python-numpy-1.23.4 | 1 unknown | 1 xxhash-0.8.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/4ddfb0c52b4efc2d49ca7e7c76bbe7e53cb0089e | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/c801955a73c2c35477dadc2747b072318104434d | ORPH microblazeel | libnss-3.84 | NOK | http://autobuild.buildroot.net/results/203ccf8d98b24b9718c574c58c64730b21b2d848 | powerpc64le | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/a820eb613005019b35c99e39f3aca2a155e26897 | aarch64 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/2b4e3590d3817872b26efa3ec53cd2d3c1e479f9 | ORPH m68k | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/342d7be42ae065ec0c8207b1a13d981ad6eb753b | mipsel | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/dbfcdfb804ff149f2500c20ace66c134e554df36 | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/3ce8a2d5073edddcc51ae5d81ec331be6d883d00 | microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/5226bbbd354ed3865a30df1b395705072c2b68d2 | ORPH -- http://autobuild.buildroot.net From hrsourabh011 at gmail.com Sun Feb 19 12:53:28 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sun, 19 Feb 2023 13:53:28 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> <20230218142115.GC2718518@scaer> <20230218153216.GD2718518@scaer> Message-ID: Hello Yann, All, Applying 0002-ca-certificates-add_local_CAs.patch using patch: > can't find file to patch at input line 3 > I think the issue is during build, the ca-certificates.mk is not available in the output/build/ca-certificates/ dir. Only Makefile and ca-certificates.crt file is present. So how can I patch the makefile? On Sat, 18 Feb 2023 at 18:00, Sourabh Hegde wrote: > Hello Yann, > > I am trying to apply the patch. I am doing below steps: > > 1. modified the ca-certificates.mk to include changes. Also attached in > this mail. Could you please verify the changes? > 2. Generated patch file using "diff -u "old_file" "new_file" > > file.patch". Placed the patch file in /buildroot/package/ca-certificates/ > dir > 0002-ca-certificates-add_local_CAs.patch > +++ ca-certificates.mk 2023-02-18 14:13:13.181814043 +0000 > @@ -20,24 +20,29 @@ > $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install > DESTDIR=$(TARGET_DIR) > rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates > +endef > > +define CA_CERTIFICATES_GEN_BUNDLE > # Remove any existing certificates under /etc/ssl/certs > rm -f $(TARGET_DIR)/etc/ssl/certs/* > +endef > > # Create symlinks to certificates under /etc/ssl/certs > # and generate the bundle > cd $(TARGET_DIR) ;\ > +define CA_CERTIFICATES_INSTALL_TARGET_CMDS > for i in `find usr/share/ca-certificates -name "*.crt" | > LC_COLLATE=C sort` ; do \ > ln -sf ../../../$$i etc/ssl/certs/`basename $${i} > .crt`.pem ;\ > cat $$i ;\ > - done >$(@D)/ca-certificates.crt > + done >$(BUILD_DIR)/ca-certificates.crt > > # Create symlinks to the certificates by their hash values > $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs > > # Install the certificates bundle > - $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ > + $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ > $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt > endef > +CA_CERTIFICATES_TARGET_FINALIZE_HOOKS += CA_CERTIFICATES_GEN_BUNDLE > > $(eval $(generic-package)) > > 3. Trying to rebuild the package: > make ca-certificates-dirclean > make > > But, the patch is not applied. Getting below error: > Applying 0002-ca-certificates-add_local_CAs.patch using patch: > can't find file to patch at input line 3 > Perhaps you used the wrong -p or --strip option? > > Can you please let me know what am I doing wrong here? > > Thank you. > > On Sat, 18 Feb 2023 at 16:56, Sourabh Hegde > wrote: > >> Hello Yann, All, >> >> Thanks for the update. >> >> Yes, I will try this patch and let you know. >> >> Also, we do remove update-ca-certificates on purpose from TARGET_DIR, >>> because it is not expected that we need/can regenerate the root bundle >>> on the target. >>> >> >> I am not sure if I understood this completely. I have a generic question: >> What if someone wants to update castore on the target itself. Let's say if >> the local CA is already available on the target then how can it be added to >> the trust store with update-ca-certificates? Is it not a good option to >> include "update-ca-certificates" in TARGET_DIR? >> >> On Sat, 18 Feb 2023 at 16:32, Yann E. MORIN >> wrote: >> >>> Thomas, Sourabh, All, >>> >>> On 2023-02-18 15:21 +0100, Yann E. MORIN spake thusly: >>> > On 2023-02-18 14:19 +0100, Thomas Petazzoni via buildroot spake thusly: >>> > > On Sat, 18 Feb 2023 13:54:15 +0100 >>> > > Sourabh Hegde wrote: >>> > > > I was thinking the ca-certificates package will take care of this. >>> Maybe I >>> > > > was wrong. >>> > > > So, how should we add local CA to the trust store in the target? >>> > > I am not sure as I'm not super familiar with that aspect. If what you >>> > > need to do is to call update-ca-certificates during the build, then >>> we >>> > > could potentially build it for the host, and run it as a post-build >>> > > script. Of course, this assumes update-ca-certificates is capable of >>> > > doing its work on a root filesystem that isn't at the root. >>> >>> No, update-ca-certificates does not know how to work out-of-tree, which >>> is the reason why we already need to handle it manually when we install >>> ca-certificates. >>> >>> Also, we do remove update-ca-certificates on purpose from TARGET_DIR, >>> because it is not expected that we need/can regenerate the root bundle >>> on the target. >>> >>> > > Do you have more details about what needs to be done? With more >>> > > details, we could probably give some more useful hints. >>> > >>> > I think we just need to split CA_CERTIFICATES_INSTALL_TARGET_CMDS in >>> two: >>> > one part to actually instll the certifcates provided by ca-certificates >>> > itself, and the rest to update the castore with all certificate, as a >>> > target-finalize hook. >>> > >>> > I.e. all that starts from "Remove any existing certificates under >>> > /etc/ssl/certs" should be moved to a target-finalize hook. >>> >>> Basically, something around those lines (totally untested): >>> >>> diff --git a/package/ca-certificates/ca-certificates.mk >>> b/package/ca-certificates/ca-certificates.mk >>> index 0b6962ab7b..cc55d39957 100644 >>> --- a/package/ca-certificates/ca-certificates.mk >>> +++ b/package/ca-certificates/ca-certificates.mk >>> @@ -20,7 +20,9 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS >>> $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs >>> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) >>> rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates >>> +endef >>> >>> +define CA_CERTIFICATES_GEN_BUNDLE >>> # Remove any existing certificates under /etc/ssl/certs >>> rm -f $(TARGET_DIR)/etc/ssl/certs/* >>> >>> @@ -30,14 +32,15 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS >>> for i in `find usr/share/ca-certificates -name "*.crt" | >>> LC_COLLATE=C sort` ; do \ >>> ln -sf ../../../$$i etc/ssl/certs/`basename $${i} >>> .crt`.pem ;\ >>> cat $$i ;\ >>> - done >$(@D)/ca-certificates.crt >>> + done >$(BUILD_DIR)/ca-certificates.crt >>> >>> # Create symlinks to the certificates by their hash values >>> $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs >>> >>> # Install the certificates bundle >>> - $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ >>> + $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ >>> $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt >>> endef >>> +CA_CERTIFICATES_TARGET_FINALIZE_HOOKS += CA_CERTIFICATES_GEN_BUNDLE >>> >>> $(eval $(generic-package)) >>> >>> Sourabh, can you test and adapt that and report, please? >>> >>> 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. | >>> >>> '------------------------------^-------^------------------^--------------------' >>> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Sun Feb 19 13:17:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 19 Feb 2023 14:17:53 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> <20230218142115.GC2718518@scaer> <20230218153216.GD2718518@scaer> Message-ID: <20230219131753.GE2718518@scaer> Sourabh, All, On 2023-02-19 13:53 +0100, Sourabh Hegde spake thusly: > I think the issue is during build, the [1]ca-certificates.mk is not available in the output/build/ca-certificates/ dir. Only > Makefile and ca-certificates.crt file is present. > So how can I patch the makefile?? This is a patch agaisnt Buildroot itself. Apply it to Buildroot. 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 fontaine.fabrice at gmail.com Sun Feb 19 14:00:49 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 15:00:49 +0100 Subject: [Buildroot] [PATCH 1/3] package/libjxl: fix build with libjpeg Message-ID: <20230219140051.80647-1-fontaine.fabrice@gmail.com> Building with libjpeg will raise the following build failure on some architectures since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57: /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In function 'jxl::Status jxl::extras::{anonymous}::EncodeWithLibJpeg(const jxl::extras::PackedImage&, const JxlBasicInfo&, const std::vector&, std::vector, size_t, const string&, std::vector*)': /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] 126 | jpeg_mem_dest(&cinfo, &buffer, &size); | ^~~~~ | | | long unsigned int* Upstream advocates to use jpeg-turbo: https://github.com/libjxl/libjxl/issues/1802 Fixes: - http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 Signed-off-by: Fabrice Fontaine --- package/libjxl/libjxl.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index cc24ba258c..02a93ac5d9 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -30,4 +30,11 @@ LIBJXL_CONF_OPTS = \ -DJPEGXL_ENABLE_SJPEG=OFF \ -DJPEGXL_ENABLE_SKCMS=OFF +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) +LIBJXL_DEPENDENCIES += jpeg-turbo +LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=ON +else +LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=OFF +endif + $(eval $(cmake-package)) -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 14:00:50 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 15:00:50 +0100 Subject: [Buildroot] [PATCH 2/3] package/libjxl: disable benchmark and tests In-Reply-To: <20230219140051.80647-1-fontaine.fabrice@gmail.com> References: <20230219140051.80647-1-fontaine.fabrice@gmail.com> Message-ID: <20230219140051.80647-2-fontaine.fabrice@gmail.com> Disable benchmark and tests which are enabled by default since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57 Signed-off-by: Fabrice Fontaine --- package/libjxl/libjxl.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 02a93ac5d9..77405e4f11 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -23,7 +23,9 @@ endif LIBJXL_CONF_OPTS = \ -DJPEGXL_BUNDLE_LIBPNG=OFF \ -DJPEGXL_BUNDLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_BENCHMARK=OFF \ -DJPEGXL_ENABLE_DOXYGEN=OFF \ + -DJPEGXL_ENABLE_EXAMPLES=OFF \ -DJPEGXL_ENABLE_JNI=OFF \ -DJPEGXL_ENABLE_MANPAGES=OFF \ -DJPEGXL_ENABLE_OPENEXR=OFF \ -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 14:00:51 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 15:00:51 +0100 Subject: [Buildroot] [PATCH 3/3] package/libjxl: security bump to version 0.8.1 In-Reply-To: <20230219140051.80647-1-fontaine.fabrice@gmail.com> References: <20230219140051.80647-1-fontaine.fabrice@gmail.com> Message-ID: <20230219140051.80647-3-fontaine.fabrice@gmail.com> Security: Fix OOB read in exif.h https://github.com/libjxl/libjxl/releases/tag/v0.8.1 https://github.com/libjxl/libjxl/releases/tag/v0.8.0 Signed-off-by: Fabrice Fontaine --- package/libjxl/libjxl.hash | 2 +- package/libjxl/libjxl.mk | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index e71d32e61d..6b4c9d8d0a 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e libjxl-0.7.0.tar.gz +sha256 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 libjxl-0.8.1.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 77405e4f11..095dc06764 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.7.0 +LIBJXL_VERSION = 0.8.1 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS @@ -34,9 +34,13 @@ LIBJXL_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) LIBJXL_DEPENDENCIES += jpeg-turbo -LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=ON +LIBJXL_CONF_OPTS += \ + -DJPEGXL_ENABLE_JPEGLI=ON \ + -DJPEGXL_ENABLE_TOOLS=ON else -LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=OFF +LIBJXL_CONF_OPTS += \ + -DJPEGXL_ENABLE_JPEGLI=OFF \ + -DJPEGXL_ENABLE_TOOLS=OFF endif $(eval $(cmake-package)) -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 14:25:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 15:25:47 +0100 Subject: [Buildroot] [PATCH 1/2] package/speechd: disable kali support Message-ID: <20230219142548.626439-1-fontaine.fabrice@gmail.com> Disable kali support as it is not needed and raises the following build failure without C++ since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: CXX sd_kali-kali.o /bin/sh: line 1: no: command not found Fixes: - http://autobuild.buildroot.org/results/2f6c8b3674753d6a9f165117c70e7dad88505505 Signed-off-by: Fabrice Fontaine --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 0d43e4b6fb..46c0672f59 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,6 +12,7 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile +SPEECHD_CONF_OPTS = --without-kali # fix missing config.rpath (needed for autoreconf) in the codebase define SPEECHD_TOUCH_CONFIG_RPATH -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 14:25:48 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 15:25:48 +0100 Subject: [Buildroot] [PATCH 2/2] package/speechd: fix build without makeinfo In-Reply-To: <20230219142548.626439-1-fontaine.fabrice@gmail.com> References: <20230219142548.626439-1-fontaine.fabrice@gmail.com> Message-ID: <20230219142548.626439-2-fontaine.fabrice@gmail.com> Fix the following build failure without makeinfo raised since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: /home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found Fixes: - http://autobuild.buildroot.org/results/d4f193545eb31864a9bac5a9d05bba39d3c7ff3e Signed-off-by: Fabrice Fontaine --- package/speechd/0001-add-disable-doc.patch | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 package/speechd/0001-add-disable-doc.patch diff --git a/package/speechd/0001-add-disable-doc.patch b/package/speechd/0001-add-disable-doc.patch new file mode 100644 index 0000000000..dd17b10e4f --- /dev/null +++ b/package/speechd/0001-add-disable-doc.patch @@ -0,0 +1,78 @@ +From d88557d3c29c33f76af20cb7a6eb798f6f598c23 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 19 Feb 2023 15:18:35 +0100 +Subject: [PATCH] add --disable-doc + +Allow the user to disable documentation through --disable-doc to avoid +the following build failure without makeinfo: + +make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/doc' + MAKEINFO ssip.info + MAKEINFO spd-say.info +/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found +/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +make[3]: *** [Makefile:492: ssip.info] Error 127 + +Fixes: + - http://autobuild.buildroot.org/results/d4f193545eb31864a9bac5a9d05bba39d3c7ff3e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/brailcom/speechd/pull/810] +--- + Makefile.am | 6 +++++- + configure.ac | 4 ++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 26617c78..480eb50e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,7 +22,11 @@ pkgconfig_DATA = speech-dispatcher.pc + + BUILT_SOURCES = $(top_srcdir)/.version + +-SUBDIRS= include locale src config doc po ++SUBDIRS= include locale src config po ++ ++if ENABLE_DOC ++SUBDIRS += doc ++endif + + EXTRA_DIST= config.rpath COPYING.LGPL COPYING.GPL-2 COPYING.GPL-3 ANNOUNCE BUGS FAQ README.md README.packagers README.translators README.overview.md README.style.md build.sh speech-dispatcherd.service.in speech-dispatcher.socket speech-dispatcher.service.in po/Makevars.in po/README + +diff --git a/configure.ac b/configure.ac +index faaa8629..4f2af908 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -168,6 +168,10 @@ AC_SUBST([EXTRA_SOCKET_LIBS]) + AC_SUBST([ERROR_CFLAGS]) + AC_SUBST([RDYNAMIC]) + ++AC_ARG_ENABLE([doc], ++ [AC_HELP_STRING([--disable-doc], [turn off documentation])]) ++AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no") ++ + # Check for python support. + # Python 3 or greater required + AC_ARG_ENABLE([python], +-- +2.39.0 + -- 2.39.0 From ju.o at free.fr Sun Feb 19 15:00:24 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 16:00:24 +0100 Subject: [Buildroot] Debugging gnupg2 unsafe search path error (was Re: [PATCH] Revert "package/gnupg2: bump to version 2.4.0") In-Reply-To: References: <20230218101426.630874-1-bagasdotme@gmail.com> <20230218113939.526f0a76@windsurf> <96015d0268df72d3cdd58e7db09c1333@free.fr> <1852709c493974b2588cc7c9c28bba7e@free.fr> Message-ID: <5bce31654ac7b25a0be6352770f90553@free.fr> Hi Bagas, On 19/02/2023 05:26, Bagas Sanjaya wrote: > On Sat, Feb 18, 2023 at 06:40:35PM +0100, Julien Olivain wrote: >> Thank you for testing. >> >> I still can't reproduce the issue on my side. Compilation works fine >> on my >> system >> (with and without a /usr/bin/gpgrt-config script), and also in the >> Buildroot >> utils/docker-run (which does not include a /usr/bin/gpgrt-config >> script). My >> system >> has the same libgpg-error version 1.46 as Buildroot. >> >> Could you tell me what is the distribution of your host system (or >> what is >> the version >> of the libgpg-error on the host)? I'll try the same environment in a >> docker. >> >> Another way to force the gpgrt-config path without putting the full >> staging >> usr bin >> in the PATH (as Thomas recommended not to do) would be to add the >> following: >> >> GNUPG2_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config >> > > Hi Julien, > > My setup is Debian 11. > > For the host GnuPG, I compiled GnuPG 2.4.0 with libgpg-error 1.46. I > source a script (gnupg-setup) to initialize the compiled version into > my > ~/.bashrc. > > The script is: > > ---- >8 ---- > if ! (systemctl --user is-active -q dirmngr-local.socket); then > systemctl --user start > {dirmngr,gpg-agent,gpg-agent-ssh,gpg-agent-browser,gpg-agent-extra}-local.socket > fi > > export PATH=$HOME/.local/gnupg/bin:$PATH > > The actual .socket unit files are copied from GnuPG sources but I add > Conflicts= against corresponding system-provided socket units. > > For your suggestion above, the build successed only when the > initialization > script above isn't sourced. However, when the script is sourced, the > build > search for host version of libraries instead (and thus FTBFS). Thanks for the tests and feedback. I am now able to reproduce the issue by installing the libgpg-error-dev package in the Buildroot Docker image (which also happen to be a Debian 11). I'll send my patch proposal to fix autobuild failures. Right now, I don't see why your sourced file would prevent this fix to work. Is it possible the same issue happen in other gnupg2 friend packages? (such as libassuan, libgcrypt, libksba, ...) which I believe are all using the AM_PATH_GPG_ERROR() macro from libgpg-error gpg-error.m4. Best regards, Julien. From ju.o at free.fr Sun Feb 19 15:04:26 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 16:04:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnupg2: fix build failure when host provides an old gpgrt-config Message-ID: <20230219150426.1509780-1-ju.o@free.fr> gnupg2 uses the libgpg-error library. The libgpg-error library has a long plan to be renamed to "gpgrt" (see [1]). For the transition, it provides two configuration scripts "gpg-error-config" (the old, original one, kept for compatibility) and "gpgrt-config" (which is meant to be the replacement). When both are detected, "gpgrt-config" should be preferred. gnupg2 configure script searches for "gpg-error-config" in the path provided to --with-libgpg-error-prefix=PFX (more specifically, in "PFX/bin"). The logic to find "gpgrt-config" is different: it is searched in paths "$prefix/bin:$PATH". See [2]. On Buildroot, autotools target packages are configured with "--prefix=/usr", which makes the configure script to search in the host "/usr/bin". In some host environment providing such a "/usr/bin/gpgrt-config" script of an older version, host compilation flags are incorrectly added for the target, which leads to compilation failures. The issue can be reproduced in a Buildroot Docker image from [3] in which the libgpg-error-dev package is added. When tested, the libgpg-error-dev package was at version 1.38. In that configuration, gnupg2 configure will output the message: checking for gpgrt-config... /usr/bin/gpgrt-config and the compilation fails with a message: aarch64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' Note: it was observed that in some other configurations in which the host /usr/bin/gpgrt-config was from libgpg-error version 1.46, the host script was redirecting correctly in the buildroot sysroot. Since gnupg2 searches for "gpgrt-config" with a "AC_PATH_PROG(GPGRT_CONFIG, ...)" macro, this patch fixes this issue by simply forcing the script path in the GPGRT_CONFIG environment variable. See also [4] which discussed the "gpgrt-config" search logic. Fixes: - http://autobuild.buildroot.net/results/423c3ce7317c181e9f2e4a49b76ee9d26167375c/ (and many others) [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=e0b9f16445a96942af0839bcdb9a0b0f8cf31380;hb=885a287a57cf060b4c5b441822c09d23b8dee2bd#l29 [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=m4/gpg-error.m4;h=a975e53d07d1b743f51d8aa1767cd8e0d71b4071;hb=c0556edb80518720b0d884251685fe008c8f0429#l68 [3] https://git.buildroot.org/buildroot/tree/support/docker/Dockerfile?id=b6085c00d0feece6f3ba635e7847ea653bc5fac3 [4] https://dev.gnupg.org/T5365 Reported-by: Bagas Sanjaya Tested-by: Bagas Sanjaya Signed-off-by: Julien Olivain --- Patch tested on master branch at commit b6085c0 with commands: make check-package ... 0 warnings generated support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_gnupg2 ... OK utils/docker-run support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_gnupg2 ... OK utils/test-pkg -p gnupg2 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]: SKIPPED sourcery-arm [6/6]: OK 6 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/gnupg2/gnupg2.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 5935ce6939..73de185ba7 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -23,6 +23,10 @@ GNUPG2_CONF_OPTS = \ --with-ksba-prefix=$(STAGING_DIR)/usr \ --with-npth-prefix=$(STAGING_DIR)/usr +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +GNUPG2_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config + ifneq ($(BR2_PACKAGE_GNUPG2_GPGV),y) define GNUPG2_REMOVE_GPGV rm -f $(TARGET_DIR)/usr/bin/gpgv -- 2.39.2 From ju.o at free.fr Sun Feb 19 15:30:59 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 16:30:59 +0100 Subject: [Buildroot] [PATCH 1/3] package/libjxl: fix build with libjpeg In-Reply-To: <20230219140051.80647-1-fontaine.fabrice@gmail.com> References: <20230219140051.80647-1-fontaine.fabrice@gmail.com> Message-ID: <334eac4665b498754a5615cdec982341@free.fr> Hi Fabrice, On 19/02/2023 15:00, Fabrice Fontaine wrote: > Building with libjpeg will raise the following build failure on some > architectures since the addition of the package in commit > e648d399d8bd609697e78f13f7fa76be06d91a57: > > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In > function 'jxl::Status > jxl::extras::{anonymous}::EncodeWithLibJpeg(const > jxl::extras::PackedImage&, const JxlBasicInfo&, const > std::vector&, std::vector, size_t, const > string&, std::vector*)': > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: > error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka > 'unsigned int*'} [-fpermissive] > 126 | jpeg_mem_dest(&cinfo, &buffer, &size); > | ^~~~~ > | | > | long unsigned int* > > Upstream advocates to use jpeg-turbo: > https://github.com/libjxl/libjxl/issues/1802 > > Fixes: > - > http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 > > Signed-off-by: Fabrice Fontaine > --- > package/libjxl/libjxl.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk > index cc24ba258c..02a93ac5d9 100644 > --- a/package/libjxl/libjxl.mk > +++ b/package/libjxl/libjxl.mk > @@ -30,4 +30,11 @@ LIBJXL_CONF_OPTS = \ > -DJPEGXL_ENABLE_SJPEG=OFF \ > -DJPEGXL_ENABLE_SKCMS=OFF > > +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) > +LIBJXL_DEPENDENCIES += jpeg-turbo > +LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=ON > +else > +LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=OFF Having JPEGXL_ENABLE_TOOLS=ON without any libjpeg is a valid configuration for libjxl. Is it possible to disable the tools only if BR2_PACKAGE_LIBJPEG=y? The configuration with tools and without any libjpeg is the one used by the package runtime test. Running the test with command: support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_libjxl now fails with output: AssertionError: 127 != 0 : Failed to run: cjxl /var/tmp/reference.ppm /var/tmp/encoded.jxl output was: -sh: cjxl: not found > +endif > + > $(eval $(cmake-package)) Best regards, Julien. From ju.o at free.fr Sun Feb 19 15:37:07 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 16:37:07 +0100 Subject: [Buildroot] [PATCH 3/3] package/libjxl: security bump to version 0.8.1 In-Reply-To: <20230219140051.80647-3-fontaine.fabrice@gmail.com> References: <20230219140051.80647-1-fontaine.fabrice@gmail.com> <20230219140051.80647-3-fontaine.fabrice@gmail.com> Message-ID: <7155523cf22f19d3f27a454d8a8767e2@free.fr> Hi Fabrice, On 19/02/2023 15:00, Fabrice Fontaine wrote: > Security: Fix OOB read in exif.h > > https://github.com/libjxl/libjxl/releases/tag/v0.8.1 > https://github.com/libjxl/libjxl/releases/tag/v0.8.0 > > Signed-off-by: Fabrice Fontaine > --- > package/libjxl/libjxl.hash | 2 +- > package/libjxl/libjxl.mk | 10 +++++++--- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash > index e71d32e61d..6b4c9d8d0a 100644 > --- a/package/libjxl/libjxl.hash > +++ b/package/libjxl/libjxl.hash > @@ -1,4 +1,4 @@ > # Locally computed: > -sha256 > 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e > libjxl-0.7.0.tar.gz > +sha256 > 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 > libjxl-0.8.1.tar.gz > sha256 > 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede > LICENSE > sha256 > 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 > PATENTS > diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk > index 77405e4f11..095dc06764 100644 > --- a/package/libjxl/libjxl.mk > +++ b/package/libjxl/libjxl.mk > @@ -4,7 +4,7 @@ > # > > ################################################################################ > > -LIBJXL_VERSION = 0.7.0 > +LIBJXL_VERSION = 0.8.1 When bumping to version 0.8.1, I observed a segmentation fault crash while running the package runtime test with the command: support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_libjxl The issue happen only when the libjxl tools are enabled AND there is no jpeg support enabled. I have a pull-request upstream which is not merged yet, at: https://github.com/libjxl/libjxl/pull/2178 Maybe this patch could be included, to make sure the runtime test will still work? > LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) > LIBJXL_LICENSE = BSD-3-Clause > LIBJXL_LICENSE_FILES = LICENSE PATENTS > @@ -34,9 +34,13 @@ LIBJXL_CONF_OPTS = \ > > ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) > LIBJXL_DEPENDENCIES += jpeg-turbo > -LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=ON > +LIBJXL_CONF_OPTS += \ > + -DJPEGXL_ENABLE_JPEGLI=ON \ > + -DJPEGXL_ENABLE_TOOLS=ON > else > -LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=OFF > +LIBJXL_CONF_OPTS += \ > + -DJPEGXL_ENABLE_JPEGLI=OFF \ > + -DJPEGXL_ENABLE_TOOLS=OFF > endif > > $(eval $(cmake-package)) Best regards, Julien. From fontaine.fabrice at gmail.com Sun Feb 19 16:14:53 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 17:14:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/ipmiutil: fix uclibc build without wchar Message-ID: <20230219161453.87903-1-fontaine.fabrice@gmail.com> For an unknown reason, wchar_t is incorrectly detected with uclibc resulting in the following build failure: In file included from igetevent.c:136: imb_api.h:150:5: error: unknown type name 'wchar_t' 150 | wchar_t *Buffer; | ^~~~~~~ The build failure can be reproduced even when reverting bump to version 3.1.8. Fixes: - http://autobuild.buildroot.org/results/e9ff3bd08e106dc834968bf5e4296ce8299027f8 Signed-off-by: Fabrice Fontaine --- package/ipmiutil/ipmiutil.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk index ad9fbfc24c..b48eaa7cb2 100644 --- a/package/ipmiutil/ipmiutil.mk +++ b/package/ipmiutil/ipmiutil.mk @@ -10,6 +10,7 @@ IPMIUTIL_LICENSE = BSD-3-Clause IPMIUTIL_LICENSE_FILES = COPYING IPMIUTIL_MAKE = $(MAKE1) +IPMIUTIL_CONF_ENV = ac_cv_type_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) ifeq ($(BR2_PACKAGE_OPENSSL),y) # tests against distro libcrypto so it might get a false positive when -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 16:37:10 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 17:37:10 +0100 Subject: [Buildroot] [PATCH 1/3] package/libjxl: fix build with libjpeg In-Reply-To: <334eac4665b498754a5615cdec982341@free.fr> References: <20230219140051.80647-1-fontaine.fabrice@gmail.com> <334eac4665b498754a5615cdec982341@free.fr> Message-ID: Hi Julien, Le dim. 19 f?vr. 2023 ? 16:31, Julien Olivain a ?crit : > Hi Fabrice, > > On 19/02/2023 15:00, Fabrice Fontaine wrote: > > Building with libjpeg will raise the following build failure on some > > architectures since the addition of the package in commit > > e648d399d8bd609697e78f13f7fa76be06d91a57: > > > > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In > > function 'jxl::Status > > jxl::extras::{anonymous}::EncodeWithLibJpeg(const > > jxl::extras::PackedImage&, const JxlBasicInfo&, const > > std::vector&, std::vector, size_t, const > > string&, std::vector*)': > > > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: > > error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka > > 'unsigned int*'} [-fpermissive] > > 126 | jpeg_mem_dest(&cinfo, &buffer, &size); > > | ^~~~~ > > | | > > | long unsigned int* > > > > Upstream advocates to use jpeg-turbo: > > https://github.com/libjxl/libjxl/issues/1802 > > > > Fixes: > > - > > > http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/libjxl/libjxl.mk | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk > > index cc24ba258c..02a93ac5d9 100644 > > --- a/package/libjxl/libjxl.mk > > +++ b/package/libjxl/libjxl.mk > > @@ -30,4 +30,11 @@ LIBJXL_CONF_OPTS = \ > > -DJPEGXL_ENABLE_SJPEG=OFF \ > > -DJPEGXL_ENABLE_SKCMS=OFF > > > > +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) > > +LIBJXL_DEPENDENCIES += jpeg-turbo > > +LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=ON > > +else > > +LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=OFF > > Having JPEGXL_ENABLE_TOOLS=ON without any libjpeg is a valid > configuration for libjxl. > > Is it possible to disable the tools only if BR2_PACKAGE_LIBJPEG=y? > Thanks for your review, I'll send a v2 which will set CMAKE_DISABLE_FIND_PACKAGE_JPEG. > The configuration with tools and without any libjpeg is the one > used by the package runtime test. > > Running the test with command: > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_libjxl > > now fails with output: > > AssertionError: 127 != 0 : > Failed to run: cjxl /var/tmp/reference.ppm /var/tmp/encoded.jxl > output was: > -sh: cjxl: not found > > > +endif > > + > > $(eval $(cmake-package)) > > Best regards, > > Julien. > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Sun Feb 19 16:48:20 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 17:48:20 +0100 Subject: [Buildroot] [PATCH v2,1/3] package/libjxl: fix build with libjpeg Message-ID: <20230219164822.142283-1-fontaine.fabrice@gmail.com> Building with libjpeg will raise the following build failure on some architectures since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57: /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In function 'jxl::Status jxl::extras::{anonymous}::EncodeWithLibJpeg(const jxl::extras::PackedImage&, const JxlBasicInfo&, const std::vector&, std::vector, size_t, const string&, std::vector*)': /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] 126 | jpeg_mem_dest(&cinfo, &buffer, &size); | ^~~~~ | | | long unsigned int* Upstream advocates to use jpeg-turbo: https://github.com/libjxl/libjxl/issues/1802 Fixes: - http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Julien Olivain: - Keep tools enabled and only disable jpeg subset of tools if jpeg-turbo is not available package/libjxl/libjxl.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index cc24ba258c..1257928efd 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -30,4 +30,11 @@ LIBJXL_CONF_OPTS = \ -DJPEGXL_ENABLE_SJPEG=OFF \ -DJPEGXL_ENABLE_SKCMS=OFF +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) +LIBJXL_DEPENDENCIES += jpeg-turbo +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=OFF +else +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=ON +endif + $(eval $(cmake-package)) -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 16:48:21 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 17:48:21 +0100 Subject: [Buildroot] [PATCH v2, 2/3] package/libjxl: disable benchmark and tests In-Reply-To: <20230219164822.142283-1-fontaine.fabrice@gmail.com> References: <20230219164822.142283-1-fontaine.fabrice@gmail.com> Message-ID: <20230219164822.142283-2-fontaine.fabrice@gmail.com> Disable benchmark and tests which are enabled by default since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57 Signed-off-by: Fabrice Fontaine --- package/libjxl/libjxl.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 1257928efd..b4dfbecf82 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -23,7 +23,9 @@ endif LIBJXL_CONF_OPTS = \ -DJPEGXL_BUNDLE_LIBPNG=OFF \ -DJPEGXL_BUNDLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_BENCHMARK=OFF \ -DJPEGXL_ENABLE_DOXYGEN=OFF \ + -DJPEGXL_ENABLE_EXAMPLES=OFF \ -DJPEGXL_ENABLE_JNI=OFF \ -DJPEGXL_ENABLE_MANPAGES=OFF \ -DJPEGXL_ENABLE_OPENEXR=OFF \ -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 16:48:22 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 17:48:22 +0100 Subject: [Buildroot] [PATCH v2, 3/3] package/libjxl: security bump to version 0.8.1 In-Reply-To: <20230219164822.142283-1-fontaine.fabrice@gmail.com> References: <20230219164822.142283-1-fontaine.fabrice@gmail.com> Message-ID: <20230219164822.142283-3-fontaine.fabrice@gmail.com> Security: Fix OOB read in exif.h https://github.com/libjxl/libjxl/releases/tag/v0.8.1 https://github.com/libjxl/libjxl/releases/tag/v0.8.0 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Julien Olivain): - Add patch to fix crash ...entation-fault-when-JPEG-is-disabled.patch | 44 +++++++++++++++++++ package/libjxl/libjxl.hash | 2 +- package/libjxl/libjxl.mk | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch diff --git a/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch new file mode 100644 index 0000000000..3d709c956b --- /dev/null +++ b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch @@ -0,0 +1,44 @@ +From 504f35c8204248ae6f97278e8b7c6cc5853a1b94 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 10 Feb 2023 21:31:30 +0100 +Subject: [PATCH] djxl: fix segmentation fault when JPEG is disabled + +When libjxl is compiled without JPEG support, by configuring for example +with: + + cmake -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE ... + +djxl crashes with a segmentation fault at: +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L367 + +The crash can be reproduced with the sequence: + + gm convert IMAGE:LOGO ref.ppm + cjxl ref.ppm enc.jxl + djxl enc.jxl dec.ppm + +The crash happen because opt_jpeg_quality_id does not get +initialized at: +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L107 + +This commit fixes the crash by adding a test on opt_jpeg_quality_id. + +Signed-off-by: Julien Olivain +[Retrieved from: +https://github.com/libjxl/libjxl/pull/2178/commits/504f35c8204248ae6f97278e8b7c6cc5853a1b94] +--- + tools/djxl_main.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/djxl_main.cc b/tools/djxl_main.cc +index b755301fcb..42b889e7ce 100644 +--- a/tools/djxl_main.cc ++++ b/tools/djxl_main.cc +@@ -370,6 +370,7 @@ int main(int argc, const char* argv[]) { + args.color_space = force_colorspace; + } + if (codec == jxl::extras::Codec::kPNM && extension != ".pfm" && ++ args.opt_jpeg_quality_id != -1 && + !cmdline.GetOption(args.opt_jpeg_quality_id)->matched()) { + args.bits_per_sample = 0; + } diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index e71d32e61d..6b4c9d8d0a 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e libjxl-0.7.0.tar.gz +sha256 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 libjxl-0.8.1.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index b4dfbecf82..f603327bf6 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.7.0 +LIBJXL_VERSION = 0.8.1 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS -- 2.39.0 From peter at korsgaard.com Sun Feb 19 16:53:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:53:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/python3: bump version to 3.11.2 In-Reply-To: <20230216182036.40830-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 16 Feb 2023 19:20:36 +0100") References: <20230216182036.40830-1-bernd.kuhls@t-online.de> Message-ID: <87ttzh38cn.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: > https://docs.python.org/release/3.11.2/whatsnew/changelog.html#python-3-11-2 > Updated license hash due to copyright year bump: > https://github.com/python/cpython/commit/07d1f99e8faefcf24dab2113fb0df27202fa6f71 > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:53:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:53:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: security bump version to 8.2.3 In-Reply-To: <20230216182410.225354-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 16 Feb 2023 19:24:10 +0100") References: <20230216182410.225354-1-bernd.kuhls@t-online.de> Message-ID: <87pma538ch.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.2.3 > Fixes CVE-2023-0567, CVE-2023-0568 & CVE-2023-0662. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:53:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:53:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump version to 0.103.8 In-Reply-To: <20230216182800.254043-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 16 Feb 2023 19:28:00 +0100") References: <20230216182800.254043-1-bernd.kuhls@t-online.de> Message-ID: <87lekt38c9.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://blog.clamav.net/2023/02/clamav-01038-01052-and-101-patch.html > Fixes CVE-2023-20032 & CVE-2023-20052. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:54:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:54:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/x11r7/xdriver_xf86-video-trident: bump version to 1.4.0 In-Reply-To: <20230216183655.402798-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 16 Feb 2023 19:36:54 +0100") References: <20230216183655.402798-1-bernd.kuhls@t-online.de> Message-ID: <87h6vh38as.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003326.html > Removed patch which was applied upstream. > Switched tarball to xz, updated _SITE. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:54:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:54:25 +0100 Subject: [Buildroot] [PATCH 2/2] package/xutil_util-macros: bump version to 1.20.0 In-Reply-To: <20230216183655.402798-2-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 16 Feb 2023 19:36:55 +0100") References: <20230216183655.402798-1-bernd.kuhls@t-online.de> <20230216183655.402798-2-bernd.kuhls@t-online.de> Message-ID: <87cz6538am.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003324.html > Updated license hash due to copyright year bump: > https://gitlab.freedesktop.org/xorg/util/macros/-/commit/cb147377e9341af05232f95814022abdecf14024 > Switched tarball to xz, updated _SITE. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:54:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:54:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: bump to version 2.10.0 In-Reply-To: <20230216174018.33199-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 16 Feb 2023 18:40:18 +0100") References: <20230216174018.33199-1-fontaine.fabrice@gmail.com> Message-ID: <878rgt389x.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/FreeRDP/FreeRDP/releases/tag/2.10.0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:55:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:55:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build with libexecinfo In-Reply-To: <20230216174134.34179-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 16 Feb 2023 18:41:34 +0100") References: <20230216174134.34179-1-fontaine.fabrice@gmail.com> Message-ID: <874jrh388h.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with libexecinfo raised since commit > d649bcd3805a26cedb30120ebbdcf12f8fbf449f: > /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/10.4.0/../../../../mips-buildroot-linux-musl/bin/ld: > ../lib/monkey/library/libmonkey.a(mk_utils.c.o): in function > `mk_utils_stacktrace': > mk_utils.c:(.text+0x1578): undefined reference to `backtrace' > Fixes: > - http://autobuild.buildroot.org/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:52:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:52:32 +0100 Subject: [Buildroot] [git commit] package/php: security bump version to 8.2.3 Message-ID: <20230219165607.56D9786033@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66b1926764582a628b0b6b68a3aebe4b9790ab12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://www.php.net/ChangeLog-8.php#8.2.3 Fixes CVE-2023-0567, CVE-2023-0568 & CVE-2023-0662. Signed-off-by: Bernd Kuhls 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 869cb9b94f..41aa326156 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz +sha256 b9b566686e351125d67568a33291650eb8dfa26614d205d70d82e6e92613d457 php-8.2.3.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 9ce153f4fa..bd7d5a8c3c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.2 +PHP_VERSION = 8.2.3 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Sun Feb 19 16:53:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:53:44 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-trident: bump version to 1.4.0 Message-ID: <20230219165607.7364E803E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05de8e14ce9bf9ea109aa028b34aba559aa18aad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003326.html Removed patch which was applied upstream. Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-Remove-ramdac.patch | 56 ---------------------- .../xdriver_xf86-video-trident.hash | 5 +- .../xdriver_xf86-video-trident.mk | 6 +-- 3 files changed, 6 insertions(+), 61 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch b/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch deleted file mode 100644 index 38ca9afebf..0000000000 --- a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 07a5c4732f1c28ffcb873ee04500e3cb813c50b4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Dec 2021 22:28:04 +0100 -Subject: [PATCH] Remove ramdac - -ramdac drivers have been removed from xserver since version 21.0.99.1 -and -https://gitlab.freedesktop.org/xorg/xserver/-/commit/f0385fb420158ac3bc1c4c325431ffc5c62344bb -resulting in the following build failure: - -In file included from trident_bank.c:37: -trident.h:41:10: fatal error: xf86RamDac.h: No such file or directory - 41 | #include "xf86RamDac.h" - | ^~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/c81ac8075af257e8626d9d097270be7a7b4a1496 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/merge_requests/1] ---- - src/trident.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/trident.h b/src/trident.h -index 5cadf52..c82de4c 100644 ---- a/src/trident.h -+++ b/src/trident.h -@@ -38,7 +38,6 @@ - #include "xaa.h" - #endif - #include "xf86fbman.h" --#include "xf86RamDac.h" - #include "compiler.h" - #include "vgaHW.h" - #include "xf86i2c.h" -@@ -103,7 +102,6 @@ typedef struct { - int useEXA; - int Chipset; - int DACtype; -- int RamDac; - int ChipRev; - int HwBpp; - int BppShift; -@@ -169,7 +167,6 @@ typedef struct { - CARD32 BltScanDirection; - CARD32 DrawFlag; - CARD16 LinePattern; -- RamDacRecPtr RamDacRec; - int CursorOffset; - xf86CursorInfoPtr CursorInfoRec; - xf86Int10InfoPtr Int10; --- -2.33.0 - diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash index 321f35d4f0..2ef664487c 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002762.html -sha256 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f xf86-video-trident-1.3.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003326.html +sha256 7f76219ca7d7dc6061aa3c2aa59bc2a63895b8e6217e413ce315949f57b0189b xf86-video-trident-1.4.0.tar.xz +sha512 86f349ccfcf7c704e77a95882f63ac92f55819a3a00388f294777762fed04dde2197dd6124cded9e787af1982fecc43ad4d0af34307845e616a73d5a2ba750b9 xf86-video-trident-1.4.0.tar.xz # Locally calculated sha256 4f065198c49eac1513b915bc4478152c21119f31a97919a6ea8f3e1d10133d15 COPYING diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk index 20ec4bbc24..53fe150420 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.8 -XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.4.0 +XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.xz +XDRIVER_XF86_VIDEO_TRIDENT_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT XDRIVER_XF86_VIDEO_TRIDENT_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xorgproto From peter at korsgaard.com Sun Feb 19 16:55:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:55:03 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: fix build with libexecinfo Message-ID: <20230219165607.95F5286034@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=364511933811d76d4b866fe3aa04adff449cf94b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with libexecinfo raised since commit d649bcd3805a26cedb30120ebbdcf12f8fbf449f: /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/10.4.0/../../../../mips-buildroot-linux-musl/bin/ld: ../lib/monkey/library/libmonkey.a(mk_utils.c.o): in function `mk_utils_stacktrace': mk_utils.c:(.text+0x1578): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index d618fdf1e2..8ba16399bb 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -56,6 +56,11 @@ FLUENT_BIT_CXXFLAGS += -fcommon FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +FLUENT_BIT_DEPENDENCIES += libexecinfo +FLUENT_BIT_LDFLAGS += -lexecinfo +endif + ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) FLUENT_BIT_DEPENDENCIES += musl-fts FLUENT_BIT_LDFLAGS += -lfts From peter at korsgaard.com Sun Feb 19 16:52:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:52:09 +0100 Subject: [Buildroot] [git commit] package/python3: bump version to 3.11.2 Message-ID: <20230219165607.49C7D86032@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be235c048f004617851d7ef752ee5f4dc2373e28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://docs.python.org/release/3.11.2/whatsnew/changelog.html#python-3-11-2 Updated license hash due to copyright year bump: https://github.com/python/cpython/commit/07d1f99e8faefcf24dab2113fb0df27202fa6f71 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/python3/python3.hash | 4 ++-- package/python3/python3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 7f079865d9..f235347efb 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f Python-3.11.1.tar.xz -sha256 d4a223f033419313218c9b8444167e91e87a5bebdb43fb8490df441df5220a8b LICENSE +sha256 29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af Python-3.11.2.tar.xz +sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index fb6dbf2e64..56fe95cd07 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From peter at korsgaard.com Sun Feb 19 16:52:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:52:46 +0100 Subject: [Buildroot] [git commit] package/clamav: security bump version to 0.103.8 Message-ID: <20230219165607.643E486034@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9fc69996bcd190e693b1af95cc44fda89028d049 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://blog.clamav.net/2023/02/clamav-01038-01052-and-101-patch.html Fixes CVE-2023-20032 & CVE-2023-20052. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index 60439400ee..27f9b16a39 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1e34c31f600cb3b5bd1bf76690590cdeebe9409b330959b1c0f77d421bb17e50 clamav-0.103.7.tar.gz +sha256 6f49da6ee927936de13d359e559d3944248e3a257d40b80b6c99ebe6fe8c8c3f clamav-0.103.8.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index dfdc416601..0f0491bf0d 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.7 +CLAMAV_VERSION = 0.103.8 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From peter at korsgaard.com Sun Feb 19 16:54:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:54:02 +0100 Subject: [Buildroot] [git commit] package/xutil_util-macros: bump version to 1.20.0 Message-ID: <20230219165607.7E7F486033@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71c51f1920deda32ea63105163fe84b20a0f9109 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003324.html Updated license hash due to copyright year bump: https://gitlab.freedesktop.org/xorg/util/macros/-/commit/cb147377e9341af05232f95814022abdecf14024 Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/xutil_util-macros/xutil_util-macros.hash | 8 ++++---- package/xutil_util-macros/xutil_util-macros.mk | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/xutil_util-macros/xutil_util-macros.hash b/package/xutil_util-macros/xutil_util-macros.hash index 30c9916dca..4fcddb7a85 100644 --- a/package/xutil_util-macros/xutil_util-macros.hash +++ b/package/xutil_util-macros/xutil_util-macros.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-January/003069.html -sha256 0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971 util-macros-1.19.3.tar.bz2 -sha512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2 util-macros-1.19.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003324.html +sha256 0b86b262dbe971edb4ff233bc370dfad9f241d09f078a3f6d5b7f4b8ea4430db util-macros-1.20.0.tar.xz +sha512 76caefb118bf1675d7b2b96e1bbb04eb9a320b02e120839e55a22ef98538ecf00d0e686a67186fc8fdc8492d277ffe3125ae8b7ac61ce4739edc0de3f468d2eb util-macros-1.20.0.tar.xz # Locally computed -sha256 489b630a75e3255485732eae3d50ff4d29d3feb66760bb3acb04f897e4d9e375 COPYING +sha256 7db0516389152a90c20ea910e8839d10204ebc25ccbc71fc7f5809dfb98e80ac COPYING diff --git a/package/xutil_util-macros/xutil_util-macros.mk b/package/xutil_util-macros/xutil_util-macros.mk index b0ce14ee5a..e2e40eb84e 100644 --- a/package/xutil_util-macros/xutil_util-macros.mk +++ b/package/xutil_util-macros/xutil_util-macros.mk @@ -4,9 +4,9 @@ # ################################################################################ -XUTIL_UTIL_MACROS_VERSION = 1.19.3 -XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2 -XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util +XUTIL_UTIL_MACROS_VERSION = 1.20.0 +XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.xz +XUTIL_UTIL_MACROS_SITE = https://xorg.freedesktop.org/archive/individual/util XUTIL_UTIL_MACROS_LICENSE = MIT XUTIL_UTIL_MACROS_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 19 16:54:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:54:46 +0100 Subject: [Buildroot] [git commit] package/freerdp: bump to version 2.10.0 Message-ID: <20230219165607.89E5586035@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=03bab7117d232c9dcd784a74eefc0e48ea51ee53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/FreeRDP/FreeRDP/releases/tag/2.10.0 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 f6adc05312..55314cfdd3 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.9.0.tar.gz.sha256 -sha256 fcf71cf5b09c5c2636341ba212f34b8fb728246ea28e08caf6cef8b4a96184b7 freerdp-2.9.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.10.0.tar.gz.sha256 +sha256 a673d3fc21911dd9f196834f2f3a23c3ebc7e5e4deab2f7686fcec879279e2c1 freerdp-2.10.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index fb0e6920cf..01c511819d 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.9.0 +FREERDP_VERSION = 2.10.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From fontaine.fabrice at gmail.com Sun Feb 19 16:56:38 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 17:56:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/modsecurity2: disable pcre Message-ID: <20230219165638.147772-1-fontaine.fabrice@gmail.com> Disable pcre to avoid the following build failure if pcre-config is found on host raised since bump to version 2.9.7 in commit 42e34cf10f9eb037aa8c48a4fb9e8f521901b983: /home/thomas/autobuild/instance-0/output-1/per-package/modsecurity2/host/bin/../lib/gcc/mips64el-buildroot-linux-gnu/11.3.0/../../../../mips64el-buildroot-linux-gnu/bin/ld: cannot find -lpcre: No such file or directory Fixes: - http://autobuild.buildroot.org/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af Signed-off-by: Fabrice Fontaine --- package/modsecurity2/modsecurity2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index c251291e64..88bbf3bb29 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -21,6 +21,7 @@ MODSECURITY2_CONF_OPTS = \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ --without-curl \ --without-lua \ + --without-pcre \ --without-yajl \ --without-ssdeep -- 2.39.0 From peter at korsgaard.com Sun Feb 19 17:01:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:01:43 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/x11r7/xwayland: new package In-Reply-To: <20230216183322.21622-1-raphael.pavlidis@gmail.com> (Raphael Pavlidis's message of "Thu, 16 Feb 2023 19:33:20 +0100") References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> <20230216183322.21622-1-raphael.pavlidis@gmail.com> Message-ID: <87zg991te0.fsf@dell.be.48ers.dk> >>>>> "Raphael" == Raphael Pavlidis writes: > XServer to run X clients under wayland > This XServer is required to run the X clients under Wayland compositor, > for example weston or wlroots based compositors. > Signed-off-by: Raphael Pavlidis > --- > Changes v1 -> v2: > - split up patches in 3 parts > - add missing depends on in wlroots Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 17:01:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:01:49 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/weston: add xwayland dependency In-Reply-To: <20230216183322.21622-2-raphael.pavlidis@gmail.com> (Raphael Pavlidis's message of "Thu, 16 Feb 2023 19:33:21 +0100") References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> <20230216183322.21622-1-raphael.pavlidis@gmail.com> <20230216183322.21622-2-raphael.pavlidis@gmail.com> Message-ID: <87v8jx1tdu.fsf@dell.be.48ers.dk> >>>>> "Raphael" == Raphael Pavlidis writes: > If the XWayland support is enabled then build the corresponding XServer. > Signed-off-by: Raphael Pavlidis Committed, thanks. -- Bye, Peter Korsgaard From ju.o at free.fr Sun Feb 19 17:04:25 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 18:04:25 +0100 Subject: [Buildroot] [PATCH v2, 1/3] package/libjxl: fix build with libjpeg In-Reply-To: <20230219164822.142283-1-fontaine.fabrice@gmail.com> References: <20230219164822.142283-1-fontaine.fabrice@gmail.com> Message-ID: <6d3f617e396aac69a2d150436eb98741@free.fr> Hi Fabrice, Thanks for the quick update! On 19/02/2023 17:48, Fabrice Fontaine wrote: > Building with libjpeg will raise the following build failure on some > architectures since the addition of the package in commit > e648d399d8bd609697e78f13f7fa76be06d91a57: > > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In > function 'jxl::Status > jxl::extras::{anonymous}::EncodeWithLibJpeg(const > jxl::extras::PackedImage&, const JxlBasicInfo&, const > std::vector&, std::vector, size_t, const > string&, std::vector*)': > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: > error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka > 'unsigned int*'} [-fpermissive] > 126 | jpeg_mem_dest(&cinfo, &buffer, &size); > | ^~~~~ > | | > | long unsigned int* > > Upstream advocates to use jpeg-turbo: > https://github.com/libjxl/libjxl/issues/1802 > > Fixes: > - > http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 > Reviewed-by: Julien Olivain > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Julien Olivain: > - Keep tools enabled and only disable jpeg subset of tools if > jpeg-turbo is not available > > package/libjxl/libjxl.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk > index cc24ba258c..1257928efd 100644 > --- a/package/libjxl/libjxl.mk > +++ b/package/libjxl/libjxl.mk > @@ -30,4 +30,11 @@ LIBJXL_CONF_OPTS = \ > -DJPEGXL_ENABLE_SJPEG=OFF \ > -DJPEGXL_ENABLE_SKCMS=OFF > > +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) > +LIBJXL_DEPENDENCIES += jpeg-turbo > +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=OFF > +else > +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=ON > +endif > + > $(eval $(cmake-package)) Best regards, Julien. From ju.o at free.fr Sun Feb 19 17:05:08 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 18:05:08 +0100 Subject: [Buildroot] [PATCH v2, 2/3] package/libjxl: disable benchmark and tests In-Reply-To: <20230219164822.142283-2-fontaine.fabrice@gmail.com> References: <20230219164822.142283-1-fontaine.fabrice@gmail.com> <20230219164822.142283-2-fontaine.fabrice@gmail.com> Message-ID: <3be3f2958ee3260c0ef88382b92ccd3d@free.fr> Hi Fabrice, On 19/02/2023 17:48, Fabrice Fontaine wrote: > Disable benchmark and tests which are enabled by default since the > addition of the package in commit > e648d399d8bd609697e78f13f7fa76be06d91a57 > Reviewed-by: Julien Olivain > Signed-off-by: Fabrice Fontaine > --- > package/libjxl/libjxl.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk > index 1257928efd..b4dfbecf82 100644 > --- a/package/libjxl/libjxl.mk > +++ b/package/libjxl/libjxl.mk > @@ -23,7 +23,9 @@ endif > LIBJXL_CONF_OPTS = \ > -DJPEGXL_BUNDLE_LIBPNG=OFF \ > -DJPEGXL_BUNDLE_SKCMS=OFF \ > + -DJPEGXL_ENABLE_BENCHMARK=OFF \ > -DJPEGXL_ENABLE_DOXYGEN=OFF \ > + -DJPEGXL_ENABLE_EXAMPLES=OFF \ > -DJPEGXL_ENABLE_JNI=OFF \ > -DJPEGXL_ENABLE_MANPAGES=OFF \ > -DJPEGXL_ENABLE_OPENEXR=OFF \ Best regards, Julien. From ju.o at free.fr Sun Feb 19 17:07:12 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 18:07:12 +0100 Subject: [Buildroot] [PATCH v2, 3/3] package/libjxl: security bump to version 0.8.1 In-Reply-To: <20230219164822.142283-3-fontaine.fabrice@gmail.com> References: <20230219164822.142283-1-fontaine.fabrice@gmail.com> <20230219164822.142283-3-fontaine.fabrice@gmail.com> Message-ID: <701823a1b87f5b99a6bdb21aa8b573d7@free.fr> Hi Fabrice, Thanks for the quick update! I successfully tested with the command: support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_libjxl On 19/02/2023 17:48, Fabrice Fontaine wrote: > Security: Fix OOB read in exif.h > > https://github.com/libjxl/libjxl/releases/tag/v0.8.1 > https://github.com/libjxl/libjxl/releases/tag/v0.8.0 > Tested-by: Julien Olivain Reviewed-by: Julien Olivain > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Julien Olivain): > - Add patch to fix crash > > ...entation-fault-when-JPEG-is-disabled.patch | 44 +++++++++++++++++++ > package/libjxl/libjxl.hash | 2 +- > package/libjxl/libjxl.mk | 2 +- > 3 files changed, 46 insertions(+), 2 deletions(-) > create mode 100644 > package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch > > diff --git > a/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch > b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch > new file mode 100644 > index 0000000000..3d709c956b > --- /dev/null > +++ > b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch > @@ -0,0 +1,44 @@ > +From 504f35c8204248ae6f97278e8b7c6cc5853a1b94 Mon Sep 17 00:00:00 2001 > +From: Julien Olivain > +Date: Fri, 10 Feb 2023 21:31:30 +0100 > +Subject: [PATCH] djxl: fix segmentation fault when JPEG is disabled > + > +When libjxl is compiled without JPEG support, by configuring for > example > +with: > + > + cmake -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE ... > + > +djxl crashes with a segmentation fault at: > +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L367 > + > +The crash can be reproduced with the sequence: > + > + gm convert IMAGE:LOGO ref.ppm > + cjxl ref.ppm enc.jxl > + djxl enc.jxl dec.ppm > + > +The crash happen because opt_jpeg_quality_id does not get > +initialized at: > +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L107 > + > +This commit fixes the crash by adding a test on opt_jpeg_quality_id. > + > +Signed-off-by: Julien Olivain > +[Retrieved from: > +https://github.com/libjxl/libjxl/pull/2178/commits/504f35c8204248ae6f97278e8b7c6cc5853a1b94] > +--- > + tools/djxl_main.cc | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/tools/djxl_main.cc b/tools/djxl_main.cc > +index b755301fcb..42b889e7ce 100644 > +--- a/tools/djxl_main.cc > ++++ b/tools/djxl_main.cc > +@@ -370,6 +370,7 @@ int main(int argc, const char* argv[]) { > + args.color_space = force_colorspace; > + } > + if (codec == jxl::extras::Codec::kPNM && extension != ".pfm" && > ++ args.opt_jpeg_quality_id != -1 && > + !cmdline.GetOption(args.opt_jpeg_quality_id)->matched()) { > + args.bits_per_sample = 0; > + } > diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash > index e71d32e61d..6b4c9d8d0a 100644 > --- a/package/libjxl/libjxl.hash > +++ b/package/libjxl/libjxl.hash > @@ -1,4 +1,4 @@ > # Locally computed: > -sha256 > 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e > libjxl-0.7.0.tar.gz > +sha256 > 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 > libjxl-0.8.1.tar.gz > sha256 > 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede > LICENSE > sha256 > 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 > PATENTS > diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk > index b4dfbecf82..f603327bf6 100644 > --- a/package/libjxl/libjxl.mk > +++ b/package/libjxl/libjxl.mk > @@ -4,7 +4,7 @@ > # > > ################################################################################ > > -LIBJXL_VERSION = 0.7.0 > +LIBJXL_VERSION = 0.8.1 > LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) > LIBJXL_LICENSE = BSD-3-Clause > LIBJXL_LICENSE_FILES = LICENSE PATENTS Best regards, Julien. From peter at korsgaard.com Sun Feb 19 17:10:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:10:39 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/wlroots: add XWayland support In-Reply-To: <20230216183322.21622-3-raphael.pavlidis@gmail.com> (Raphael Pavlidis's message of "Thu, 16 Feb 2023 19:33:22 +0100") References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> <20230216183322.21622-1-raphael.pavlidis@gmail.com> <20230216183322.21622-3-raphael.pavlidis@gmail.com> Message-ID: <87r0ul1sz4.fsf@dell.be.48ers.dk> >>>>> "Raphael" == Raphael Pavlidis writes: > The new option enables the XWayland support, so X11 application can be > running on a wlroots based compositor. Also, do not enable the XWayland > support if the X11 backend is active. > Signed-off-by: Raphael Pavlidis Slightly tweaked the commit message and committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 19 17:16:00 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 18:16:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmodsecurity: needs dynamic library with libcurl, libssh2 and mbedtls Message-ID: <20230219171600.481355-1-fontaine.fabrice@gmail.com> Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as mbedtls can be pulled in libcurl through libssh2 resulting in the following build failure: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init': md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a Signed-off-by: Fabrice Fontaine --- package/libmodsecurity/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index b15d808759..027c62716c 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_LIBMODSECURITY depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity embeds several mbedtls source files - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) + depends on !(BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS))) select BR2_PACKAGE_PCRE2 help Libmodsecurity is one component of the ModSecurity @@ -21,4 +22,5 @@ comment "libmodsecurity needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS comment "libmodsecurity needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS)) -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 17:19:48 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 18:19:48 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/libmodsecurity: needs dynamic library with libcurl, libssh2 and mbedtls Message-ID: <20230219171948.483505-1-fontaine.fabrice@gmail.com> Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as mbedtls can be pulled in libcurl through libssh2 resulting in the following build failure: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init': md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Update nginx-modsecurity package/libmodsecurity/Config.in | 6 ++++-- package/nginx-modsecurity/Config.in | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index b15d808759..027c62716c 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_LIBMODSECURITY depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity embeds several mbedtls source files - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) + depends on !(BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS))) select BR2_PACKAGE_PCRE2 help Libmodsecurity is one component of the ModSecurity @@ -21,4 +22,5 @@ comment "libmodsecurity needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS comment "libmodsecurity needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS)) diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in index 5cbe57a866..f3f883ab5a 100644 --- a/package/nginx-modsecurity/Config.in +++ b/package/nginx-modsecurity/Config.in @@ -3,7 +3,9 @@ config BR2_PACKAGE_NGINX_MODSECURITY depends on BR2_PACKAGE_NGINX_HTTP depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) # libmodsecurity + # libmodsecurity + depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS))) select BR2_PACKAGE_LIBMODSECURITY help The ModSecurity-nginx connector is the connection @@ -18,4 +20,5 @@ comment "nginx-modsecurity needs a toolchain w/ C++, threads" comment "nginx-modsecurity needs a toolchain w/ dynamic library" depends on BR2_PACKAGE_NGINX_HTTP - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS)) -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 17:24:40 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 18:24:40 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/libmodsecurity: needs dynamic library with libcurl, libssh2 and mbedtls Message-ID: <20230219172440.519540-1-fontaine.fabrice@gmail.com> Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as mbedtls can be pulled in libcurl through libssh2 resulting in the following build failure: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init': md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a Signed-off-by: Fabrice Fontaine --- Changes v2 -> v3: - Fix syntax Changes v1 -> v2: - Update nginx-modsecurity package/libmodsecurity/Config.in | 6 ++++-- package/nginx-modsecurity/Config.in | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index b15d808759..027c62716c 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_LIBMODSECURITY depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity embeds several mbedtls source files - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) + depends on !(BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS))) select BR2_PACKAGE_PCRE2 help Libmodsecurity is one component of the ModSecurity @@ -21,4 +22,5 @@ comment "libmodsecurity needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS comment "libmodsecurity needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS)) diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in index 5cbe57a866..96ef7e88d5 100644 --- a/package/nginx-modsecurity/Config.in +++ b/package/nginx-modsecurity/Config.in @@ -3,7 +3,9 @@ config BR2_PACKAGE_NGINX_MODSECURITY depends on BR2_PACKAGE_NGINX_HTTP depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) # libmodsecurity + # libmodsecurity + depends on !(BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS))) select BR2_PACKAGE_LIBMODSECURITY help The ModSecurity-nginx connector is the connection @@ -18,4 +20,5 @@ comment "nginx-modsecurity needs a toolchain w/ C++, threads" comment "nginx-modsecurity needs a toolchain w/ dynamic library" depends on BR2_PACKAGE_NGINX_HTTP - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS)) -- 2.39.0 From peter at korsgaard.com Sun Feb 19 17:30:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:30:27 +0100 Subject: [Buildroot] [PATCH v2] package/lighttpd: bump to version 1.4.69 In-Reply-To: <20230216102556.3047136-1-thomas.devoogdt@barco.com> (Thomas Devoogdt's message of "Thu, 16 Feb 2023 11:25:56 +0100") References: <20230216102556.3047136-1-thomas.devoogdt@barco.com> Message-ID: <87mt591s24.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > Changelog: > - https://www.lighttpd.net/2023/1/3/1.4.68/ > - https://www.lighttpd.net/2023/2/10/1.4.69/ > In this commit: > - rebased patch & dropped server.use-ipv6 option [1] > - fix changed meson options [2] > [1]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/376d20f1617f2c0202fb415e4cc66d3f780db5ca > [2]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/6b31f76cd9b36b6033607181238fbf41c5b81e07 > Signed-off-by: Thomas Devoogdt > --- > v2: fix git message url links Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 19 17:32:08 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 18:32:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/nginx-naxsi: fix build with pcre2 Message-ID: <20230219173208.613324-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of nginx to version 1.22.1 in commit 722b84eafa5e3d9540e0a80bae0c971a3a778358: /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c: In function 'ngx_http_process_basic_rule_buffer': /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c:205:61: error: invalid use of incomplete typedef 'ngx_regex_t' {aka 'struct pcre2_real_code_8'} 205 | (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, | ^~ Fixes: - http://autobuild.buildroot.org/results/7fff888bd36710e2d2f5bb39a38597e8c04305ce Signed-off-by: Fabrice Fontaine --- .../0001-PCRE2-compatibility.patch | 221 ++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 package/nginx-naxsi/0001-PCRE2-compatibility.patch diff --git a/package/nginx-naxsi/0001-PCRE2-compatibility.patch b/package/nginx-naxsi/0001-PCRE2-compatibility.patch new file mode 100644 index 0000000000..aa3df4dff7 --- /dev/null +++ b/package/nginx-naxsi/0001-PCRE2-compatibility.patch @@ -0,0 +1,221 @@ +From 2937c44276cba21601ade4e265d32515f570d68c Mon Sep 17 00:00:00 2001 +From: Danila Vershinin +Date: Thu, 16 Jun 2022 01:22:23 +0300 +Subject: [PATCH] PCRE2 compatibility (#587) + +* Fix: use pcre2 when building with nginx >= 1.21.5 + +I've tried to compile naxsi 1.3 as module for nginx 1.21.6, and got the error: + +error: invalid use of incomplete typedef 'ngx_regex_t' {aka 'struct pcre2_real_code_8'} + 205 | (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, + +I found this issue report: Ref: https://github.com/nbs-system/naxsi/issues/580 +then i tried to solve the pcre2 compatibility issue. + +I've included an helper function that is 'copied' from: https://github.com/nginx/nginx/blob/master/src/core/ngx_regex.c#L393 +that it is called in place of 'pcre_exec' when nginx_version >= 1021005 + +Not sure if this is the best solution, but I managed to build naxsi 1.3 as module for nginx 1.21.6 succesfully, and it seems to work well. + +I'm not used to develop in C anymore (since 25 years ago, at least!), but I hope that this patch I made can help anybody else. + +* Added a check for nginx_version >= 1021005 + +Added a check for nginx_version >= 1021005 to avoid helper function definition on older versions + +* Use NGX_PCRE2 conditional + +Update naxsi.h + +Don't include pcre.h in order for compilation to work both against pcre and pcre2 + +Fix pcre vs pcre2 compilation + +Co-authored-by: laluigino <99279306+laluigino at users.noreply.github.com> +[Retrieved from: +https://github.com/nbs-system/naxsi/commit/2937c44276cba21601ade4e265d32515f570d68c] +Signed-off-by: Fabrice Fontaine +--- + naxsi_src/naxsi.h | 1 - + naxsi_src/naxsi_config.c | 9 ++++- + naxsi_src/naxsi_runtime.c | 82 ++++++++++++++++++++++++++++++++++++++- + naxsi_src/naxsi_utils.c | 8 ++++ + 4 files changed, 96 insertions(+), 4 deletions(-) + +diff --git a/naxsi_src/naxsi.h b/naxsi_src/naxsi.h +index 53df1bd8..b2f5c1a5 100644 +--- a/naxsi_src/naxsi.h ++++ b/naxsi_src/naxsi.h +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + + extern ngx_module_t ngx_http_naxsi_module; + +diff --git a/naxsi_src/naxsi_config.c b/naxsi_src/naxsi_config.c +index 4ea15567..6d2f0e23 100644 +--- a/naxsi_src/naxsi_config.c ++++ b/naxsi_src/naxsi_config.c +@@ -322,8 +322,11 @@ naxsi_zone(ngx_conf_t* r, ngx_str_t* tmp, ngx_http_rule_t* rule) + + custom_rule->target_rx = ngx_pcalloc(r->pool, sizeof(ngx_regex_compile_t)); + return_value_if(!custom_rule->target_rx, NGX_CONF_ERROR); +- ++#if (NGX_PCRE2) ++ custom_rule->target_rx->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + custom_rule->target_rx->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + custom_rule->target_rx->pattern = custom_rule->target; + custom_rule->target_rx->pool = r->pool; + custom_rule->target_rx->err.len = 0; +@@ -442,7 +445,11 @@ naxsi_rx(ngx_conf_t* r, ngx_str_t* tmp, ngx_http_rule_t* rule) + ha.len = tmp->len - strlen(RX_T); + rgc = ngx_pcalloc(r->pool, sizeof(ngx_regex_compile_t)); + return_value_if(!rgc, NGX_CONF_ERROR); ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = ha; + rgc->pool = r->pool; + rgc->err.len = 0; +diff --git a/naxsi_src/naxsi_runtime.c b/naxsi_src/naxsi_runtime.c +index d548ce37..784852b0 100644 +--- a/naxsi_src/naxsi_runtime.c ++++ b/naxsi_src/naxsi_runtime.c +@@ -181,6 +181,75 @@ ngx_http_naxsi_rawbody_parse(ngx_http_request_ctx_t* ctx, + unsigned char* + ngx_utf8_check(ngx_str_t* str); + ++#if defined nginx_version && (nginx_version >= 1021005) ++/* ++ * variables to use pcre2 ++ */ ++static pcre2_match_data *ngx_pcre2_match_data; ++static ngx_uint_t ngx_pcre2_match_data_size; ++ ++/* ++ * helper function to use pcre2 ++ */ ++ngx_int_t ++ngx_pcre2_exec(ngx_regex_t *re, unsigned char* str, unsigned int len, ngx_int_t tmp_idx, int *captures, ngx_uint_t size) ++{ ++ size_t *ov; ++ ngx_int_t rc; ++ ngx_uint_t n, i; ++ ++ /* ++ * The pcre2_match() function might allocate memory for backtracking ++ * frames, typical allocations are from 40k and above. So the allocator ++ * is configured to do direct allocations from heap during matching. ++ */ ++ ++ if (ngx_pcre2_match_data == NULL ++ || size > ngx_pcre2_match_data_size) ++ { ++ /* ++ * Allocate a match data if not yet allocated or smaller than ++ * needed. ++ */ ++ ++ if (ngx_pcre2_match_data) { ++ pcre2_match_data_free(ngx_pcre2_match_data); ++ } ++ ++ ngx_pcre2_match_data_size = size; ++ ngx_pcre2_match_data = pcre2_match_data_create(size / 3, NULL); ++ ++ if (ngx_pcre2_match_data == NULL) { ++ rc = PCRE2_ERROR_NOMEMORY; ++ goto failed; ++ } ++ } ++ ++ rc = pcre2_match(re, str, len, tmp_idx, 0, ngx_pcre2_match_data, NULL); ++ ++ if (rc < 0) { ++ goto failed; ++ } ++ ++ n = pcre2_get_ovector_count(ngx_pcre2_match_data); ++ ov = pcre2_get_ovector_pointer(ngx_pcre2_match_data); ++ ++ if (n > size / 3) { ++ n = size / 3; ++ } ++ ++ for (i = 0; i < n; i++) { ++ captures[i * 2] = ov[i * 2]; ++ captures[i * 2 + 1] = ov[i * 2 + 1]; ++ } ++ ++failed: ++ ++ return rc; ++ ++} ++#endif ++ + /* + ** in : string to inspect, associated rule + ** does : apply the rule on the string, return 1 if matched, +@@ -201,7 +270,14 @@ ngx_http_process_basic_rule_buffer(ngx_str_t* str, ngx_http_rule_t* rl, ngx_int_ + tmp_idx = 0; + len = str->len; + while +-#if defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) ++#if (NGX_PCRE2) ++ (tmp_idx < len && (match = ngx_pcre2_exec(rl->br->rx->regex, ++ str->data, ++ str->len, ++ tmp_idx, ++ captures, ++ 30)) >= 0) ++#elif defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) + (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, + 0, + (const char*)str->data, +@@ -496,7 +572,9 @@ ngx_http_naxsi_pcre_wrapper(ngx_regex_compile_t* rx, unsigned char* str, unsigne + int match; + int captures[30]; + +-#if defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) ++#if (NGX_PCRE2) ++ match = ngx_pcre2_exec(rx->regex, str, len, 0, captures, 1); ++#elif defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) + match = pcre_exec(rx->regex->code, 0, (const char*)str, len, 0, 0, captures, 1); + #elif defined nginx_version && (nginx_version > 1001011) + match = pcre_exec(rx->regex->pcre, 0, (const char*)str, len, 0, 0, captures, 1); +diff --git a/naxsi_src/naxsi_utils.c b/naxsi_src/naxsi_utils.c +index e3d6f185..d2ecedec 100644 +--- a/naxsi_src/naxsi_utils.c ++++ b/naxsi_src/naxsi_utils.c +@@ -800,7 +800,11 @@ ngx_http_naxsi_create_hashtables_n(ngx_http_naxsi_loc_conf_t* dlc, ngx_conf_t* c + ngx_pcalloc(cf->pool, sizeof(ngx_regex_compile_t)); + rgc = custloc_array(curr_r->br->custom_locations->elts)[name_idx].target_rx; + if (rgc) { ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = custloc_array(curr_r->br->custom_locations->elts)[name_idx].target; + rgc->pool = cf->pool; + rgc->err.len = 0; +@@ -816,7 +820,11 @@ ngx_http_naxsi_create_hashtables_n(ngx_http_naxsi_loc_conf_t* dlc, ngx_conf_t* c + ngx_pcalloc(cf->pool, sizeof(ngx_regex_compile_t)); + rgc = custloc_array(curr_r->br->custom_locations->elts)[uri_idx].target_rx; + if (rgc) { ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = custloc_array(curr_r->br->custom_locations->elts)[uri_idx].target; + rgc->pool = cf->pool; + rgc->err.len = 0; -- 2.39.0 From peter at korsgaard.com Sun Feb 19 17:00:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:00:13 +0100 Subject: [Buildroot] [git commit] package/weston: add xwayland dependency Message-ID: <20230219173225.298DC8607D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df4f7f8e85274d5bde29171203c7eb95f4903765 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master If the XWayland support is enabled then build the corresponding XServer. Signed-off-by: Raphael Pavlidis Signed-off-by: Peter Korsgaard --- package/weston/Config.in | 10 +++++++++- package/weston/weston.mk | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 3b4e932b7d..09119edaaa 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -109,16 +109,24 @@ comment "X11 (nested) compositor needs X.org enabled" config BR2_PACKAGE_WESTON_XWAYLAND bool "XWayland support" - depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_LIBEPOXY + depends on BR2_PACKAGE_XORG7 # xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_XWAYLAND comment "XWayland support needs libepoxy and X.org enabled" depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + # Weston needs at least one shell; this can be one of the bundled ones, # below, of from a third-party package, which should then select this. config BR2_PACKAGE_WESTON_HAS_SHELL diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 5e71473640..01f84178b2 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -123,7 +123,7 @@ WESTON_CONF_OPTS += -Dbackend-default=$(call qstrip,$(BR2_PACKAGE_WESTON_DEFAULT ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) WESTON_CONF_OPTS += -Dxwayland=true -WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor +WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor xwayland else WESTON_CONF_OPTS += -Dxwayland=false endif From peter at korsgaard.com Sun Feb 19 17:10:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:10:18 +0100 Subject: [Buildroot] [git commit] package/wlroots: add XWayland support Message-ID: <20230219173225.3E99C8607E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5945a71d87c988cb6b864600dd8dbecae0ef30fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The new option enables the XWayland support, so X11 application can be running on a wlroots based compositor. Also, do not enable the XWayland support if the X11 backend is active, as it is unrelated to it. Signed-off-by: Raphael Pavlidis Signed-off-by: Peter Korsgaard --- package/wlroots/Config.in | 19 +++++++++++++++++++ package/wlroots/wlroots.mk | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 84a4ef846e..b2d3f3c3b1 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -41,4 +41,23 @@ config BR2_PACKAGE_WLROOTS_X11 help Support Wayland sessions nested inside a X11 window +config BR2_PACKAGE_WLROOTS_XWAYLAND + bool "XWayland support" + depends on BR2_PACKAGE_XORG7 # libxcb, xcb-util-wm, xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_XWAYLAND + help + Support for running X11 applications under wayland + +comment "XWayland support needs X.org enabled" + depends on !BR2_PACKAGE_XORG7 + +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + endif diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 4f14d20b11..5b930a51be 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -30,8 +30,12 @@ WLROOTS_BACKENDS = libinput drm ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) WLROOTS_BACKENDS += x11 -WLROOTS_CONF_OPTS += -Dxwayland=enabled WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 +endif + +ifeq ($(BR2_PACKAGE_WLROOTS_XWAYLAND),y) +WLROOTS_CONF_OPTS += -Dxwayland=enabled +WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xwayland else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif From peter at korsgaard.com Sun Feb 19 16:57:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:57:32 +0100 Subject: [Buildroot] [git commit] package/x11r7/xwayland: new package Message-ID: <20230219173225.15D2D8607C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05c3177493aa8447d5cb568c8c13e0c09eded18b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XServer to run X clients under wayland This XServer is required to run the X clients under Wayland compositor, for example weston or wlroots based compositors. Signed-off-by: Raphael Pavlidis Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/x11r7/Config.in | 1 + package/x11r7/xwayland/Config.in | 26 ++++++++++ package/x11r7/xwayland/xwayland.hash | 6 +++ package/x11r7/xwayland/xwayland.mk | 94 ++++++++++++++++++++++++++++++++++++ 5 files changed, 128 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7894b10e38..a7a0bb14d1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2426,6 +2426,7 @@ F: support/testing/tests/package/test_python_s3transfer.py N: Raphael Pavlidis F: package/slirp4netns/ F: package/sway/ +F: package/x11r7/xwayland/ N: Refik Tuzakli F: package/freescale-imx/ diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 365de34c98..4de8922e0d 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -12,6 +12,7 @@ menuconfig BR2_PACKAGE_XORG7 if BR2_PACKAGE_XORG7 menu "X11R7 Servers" source package/x11r7/xserver_xorg-server/Config.in + source package/x11r7/xwayland/Config.in endmenu menu "X11R7 Libraries" source package/x11r7/libxcb/Config.in diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in new file mode 100644 index 0000000000..4f14f2cc36 --- /dev/null +++ b/package/x11r7/xwayland/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_XWAYLAND + bool "xwayland server" + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland + # We need a SHA1 implementation. If either openssl or + # libgcrypt are already part of the build, we'll use one of + # them, otherwise, use the small libsha1 library. + select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_XLIB_LIBXCVT + select BR2_PACKAGE_XLIB_LIBXFONT2 + select BR2_PACKAGE_XLIB_LIBXKBFILE + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_XTRANS + select BR2_PACKAGE_XORGPROTO + help + X.Org X server to run X clients under wayland + + http://xorg.freedesktop.org + +comment "xwayland needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash new file mode 100644 index 0000000000..0c476f3183 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.hash @@ -0,0 +1,6 @@ +# From https://lists.x.org/archives/xorg-announce/2023-February/003322.html +sha256 d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73 xwayland-22.1.8.tar.xz +sha512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a xwayland-22.1.8.tar.xz + +# Locally calculated +sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk new file mode 100644 index 0000000000..174b440b07 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.mk @@ -0,0 +1,94 @@ +################################################################################ +# +# xwayland +# +################################################################################ + +XWAYLAND_VERSION = 22.1.8 +XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz +XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver +XWAYLAND_LICENSE = MIT +XWAYLAND_LICENSE_FILES = COPYING +XWAYLAND_INSTALL_STAGING = YES +XWAYLAND_DEPENDENCIES = \ + pixman \ + wayland \ + wayland-protocols \ + xlib_libxcvt \ + xlib_libXfont2 \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_xtrans \ + xorgproto +XWAYLAND_CONF_OPTS = \ + -Dxwayland_eglstream=false \ + -Dxvfb=false \ + -Ddefault_font_path=/usr/share/fonts/X11/ \ + -Ddtrace=false \ + -Ddocs=false + +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY),yy) +XWAYLAND_CONF_OPTS += -Dglamor=true +XWAYLAND_DEPENDENCIES += libdrm libepoxy +else +XWAYLAND_CONF_OPTS += -Dglamor=false +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XWAYLAND_CONF_OPTS += -Dglx=true +XWAYLAND_DEPENDENCIES += libgl +else +XWAYLAND_CONF_OPTS += -Dglx=false +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXDMCP),y) +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=true \ + -Dxdm-auth-1=true +XWAYLAND_DEPENDENCIES += xlib_libXdmcp +else +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=false \ + -Dxdm-auth-1=false +endif + +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +XWAYLAND_CONF_OPTS += -Dsecure-rpc=true +XWAYLAND_DEPENDENCIES += libtirpc +else +XWAYLAND_CONF_OPTS += -Dsecure-rpc=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX)$(BR2_PACKAGE_AUDIT),yy) +XWAYLAND_CONF_OPTS += -Dxselinux=true +XWAYLAND_DEPENDENCIES += libselinux audit +else +XWAYLAND_CONF_OPTS += -Dxselinux=false +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +XWAYLAND_CONF_OPTS += -Dsha1=libcrypto +XWAYLAND_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +XWAYLAND_CONF_OPTS += -Dsha1=libgcrypt +XWAYLAND_DEPENDENCIES += libgcrypt +else +XWAYLAND_CONF_OPTS += -Dsha1=libsha1 +XWAYLAND_DEPENDENCIES += libsha1 +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_LIBDRM),yy) +XWAYLAND_CONF_OPTS += -Ddri3=true +XWAYLAND_DEPENDENCIES += xlib_libxshmfence libdrm +else +XWAYLAND_CONF_OPTS += -Ddri3=false +endif + +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +XWAYLAND_CONF_OPTS += -Dlibunwind=true +XWAYLAND_DEPENDENCIES += libunwind +else +XWAYLAND_CONF_OPTS += -Dlibunwind=false +endif + +$(eval $(meson-package)) From peter at korsgaard.com Sun Feb 19 17:11:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:11:02 +0100 Subject: [Buildroot] [git commit] package/lighttpd: bump to version 1.4.69 Message-ID: <20230219173225.5277F8607C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c9622ae5084473b9eeb15b04673d081f5c9fa11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: - https://www.lighttpd.net/2023/1/3/1.4.68/ - https://www.lighttpd.net/2023/2/10/1.4.69/ In this commit: - rebased patch & dropped server.use-ipv6 option [1] - fix changed meson options [2] [1]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/376d20f1617f2c0202fb415e4cc66d3f780db5ca [2]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/6b31f76cd9b36b6033607181238fbf41c5b81e07 Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...default-lighttpd-configuration-file-to-ha.patch | 33 +++++------ package/lighttpd/lighttpd.hash | 4 +- package/lighttpd/lighttpd.mk | 64 +++++++++++----------- 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch index 1a887655b8..2eab2a84e5 100644 --- a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +++ b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch @@ -1,11 +1,11 @@ -From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001 +From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Dec 2021 22:07:17 +0100 Subject: [PATCH] Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames - * Disable IPv6 + * Disable IPv6 (Dropped since 1.4.68) * Do not setuid to a user that doesn't exist on the system * Change the network backend to writev since linux-sendfile fails on buildroot @@ -13,13 +13,15 @@ Signed-off-by: Maxime Ripard Signed-off-by: Simon Dawson [Gustavo: update for 1.4.37] Signed-off-by: Gustavo Zacarias +[Thomas: update for 1.4.69 - drop server.use-ipv6] +Signed-off-by: Thomas Devoogdt --- doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) + doc/config/lighttpd.conf | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf -index e685d43..92cff4f 100644 +index e685d437..92cff4f0 100644 --- a/doc/config/conf.d/access_log.conf +++ b/doc/config/conf.d/access_log.conf @@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) @@ -32,7 +34,7 @@ index e685d43..92cff4f 100644 ## ## The default format produces CLF compatible output. diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index 495d2a1..c3e1446 100644 +index d45a284d..4e926d5a 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -13,8 +13,8 @@ @@ -46,16 +48,7 @@ index 495d2a1..c3e1446 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ server.port = 80 - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" +@@ -97,8 +97,8 @@ server.port = 80 ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -66,7 +59,7 @@ index 495d2a1..c3e1446 100644 ## ## Enable lighttpd to serve requests on sockets received from systemd -@@ -118,7 +118,7 @@ server.groupname = "lighttpd" +@@ -114,7 +114,7 @@ server.groupname = "lighttpd" ## ## Document root ## @@ -75,7 +68,7 @@ index 495d2a1..c3e1446 100644 ## ## The value for the "Server:" response field. -@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid" +@@ -140,7 +140,7 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## @@ -84,7 +77,7 @@ index 495d2a1..c3e1446 100644 ## ## If you want to log to syslog you have to unset the -@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf" +@@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf" ## and write(). Every modern OS provides its own syscall to help network ## servers transfer files as fast as possible ## @@ -94,5 +87,5 @@ index 495d2a1..c3e1446 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.34.1 +2.39.0 diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 8353857ad9..29bf5124b6 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.67.sha512sum -sha512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627 lighttpd-1.4.67.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum +sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index d3440040fb..ca2035b6b3 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).67 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -13,49 +13,49 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=false \ - -Dwith_fam=false \ + -Dwith_dbi=disabled \ + -Dwith_fam=disabled \ -Dwith_gnutls=false \ - -Dwith_libev=false \ - -Dwith_libunwind=false \ + -Dwith_libev=disabled \ + -Dwith_libunwind=disabled \ -Dwith_mbedtls=false \ -Dwith_nettle=false \ -Dwith_nss=false \ - -Dwith_pcre=false \ - -Dwith_sasl=false \ + -Dwith_pcre=disabled \ + -Dwith_sasl=disabled \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=true \ + -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli -LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +LIGHTTPD_CONF_OPTS += -Dwith_brotli=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +LIGHTTPD_CONF_OPTS += -Dwith_bzip=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 -LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +LIGHTTPD_CONF_OPTS += -Dwith_krb5=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) LIGHTTPD_DEPENDENCIES += openldap -LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +LIGHTTPD_CONF_OPTS += -Dwith_ldap=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) @@ -67,16 +67,16 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) LIGHTTPD_DEPENDENCIES += libmaxminddb -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mysql -LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) @@ -88,9 +88,9 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += -Dwith_pam=true +LIGHTTPD_CONF_OPTS += -Dwith_pam=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pam=false +LIGHTTPD_CONF_OPTS += -Dwith_pam=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) @@ -102,36 +102,36 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) LIGHTTPD_DEPENDENCIES += postgresql -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=enabled ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=enabled LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=disabled endif else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true +LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) LIGHTTPD_DEPENDENCIES += zstd -LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +LIGHTTPD_CONF_OPTS += -Dwith_zstd=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +LIGHTTPD_CONF_OPTS += -Dwith_zstd=disabled endif define LIGHTTPD_INSTALL_CONFIG From fontaine.fabrice at gmail.com Sun Feb 19 17:35:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 18:35:36 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/nginx-naxsi: fix build with pcre2 Message-ID: <20230219173536.615233-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of nginx to version 1.22.1 in commit 722b84eafa5e3d9540e0a80bae0c971a3a778358: /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c: In function 'ngx_http_process_basic_rule_buffer': /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c:205:61: error: invalid use of incomplete typedef 'ngx_regex_t' {aka 'struct pcre2_real_code_8'} 205 | (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, | ^~ Fixes: - http://autobuild.buildroot.org/results/7fff888bd36710e2d2f5bb39a38597e8c04305ce Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix patch number .../0002-PCRE2-compatibility.patch | 221 ++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 package/nginx-naxsi/0002-PCRE2-compatibility.patch diff --git a/package/nginx-naxsi/0002-PCRE2-compatibility.patch b/package/nginx-naxsi/0002-PCRE2-compatibility.patch new file mode 100644 index 0000000000..aa3df4dff7 --- /dev/null +++ b/package/nginx-naxsi/0002-PCRE2-compatibility.patch @@ -0,0 +1,221 @@ +From 2937c44276cba21601ade4e265d32515f570d68c Mon Sep 17 00:00:00 2001 +From: Danila Vershinin +Date: Thu, 16 Jun 2022 01:22:23 +0300 +Subject: [PATCH] PCRE2 compatibility (#587) + +* Fix: use pcre2 when building with nginx >= 1.21.5 + +I've tried to compile naxsi 1.3 as module for nginx 1.21.6, and got the error: + +error: invalid use of incomplete typedef 'ngx_regex_t' {aka 'struct pcre2_real_code_8'} + 205 | (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, + +I found this issue report: Ref: https://github.com/nbs-system/naxsi/issues/580 +then i tried to solve the pcre2 compatibility issue. + +I've included an helper function that is 'copied' from: https://github.com/nginx/nginx/blob/master/src/core/ngx_regex.c#L393 +that it is called in place of 'pcre_exec' when nginx_version >= 1021005 + +Not sure if this is the best solution, but I managed to build naxsi 1.3 as module for nginx 1.21.6 succesfully, and it seems to work well. + +I'm not used to develop in C anymore (since 25 years ago, at least!), but I hope that this patch I made can help anybody else. + +* Added a check for nginx_version >= 1021005 + +Added a check for nginx_version >= 1021005 to avoid helper function definition on older versions + +* Use NGX_PCRE2 conditional + +Update naxsi.h + +Don't include pcre.h in order for compilation to work both against pcre and pcre2 + +Fix pcre vs pcre2 compilation + +Co-authored-by: laluigino <99279306+laluigino at users.noreply.github.com> +[Retrieved from: +https://github.com/nbs-system/naxsi/commit/2937c44276cba21601ade4e265d32515f570d68c] +Signed-off-by: Fabrice Fontaine +--- + naxsi_src/naxsi.h | 1 - + naxsi_src/naxsi_config.c | 9 ++++- + naxsi_src/naxsi_runtime.c | 82 ++++++++++++++++++++++++++++++++++++++- + naxsi_src/naxsi_utils.c | 8 ++++ + 4 files changed, 96 insertions(+), 4 deletions(-) + +diff --git a/naxsi_src/naxsi.h b/naxsi_src/naxsi.h +index 53df1bd8..b2f5c1a5 100644 +--- a/naxsi_src/naxsi.h ++++ b/naxsi_src/naxsi.h +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + + extern ngx_module_t ngx_http_naxsi_module; + +diff --git a/naxsi_src/naxsi_config.c b/naxsi_src/naxsi_config.c +index 4ea15567..6d2f0e23 100644 +--- a/naxsi_src/naxsi_config.c ++++ b/naxsi_src/naxsi_config.c +@@ -322,8 +322,11 @@ naxsi_zone(ngx_conf_t* r, ngx_str_t* tmp, ngx_http_rule_t* rule) + + custom_rule->target_rx = ngx_pcalloc(r->pool, sizeof(ngx_regex_compile_t)); + return_value_if(!custom_rule->target_rx, NGX_CONF_ERROR); +- ++#if (NGX_PCRE2) ++ custom_rule->target_rx->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + custom_rule->target_rx->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + custom_rule->target_rx->pattern = custom_rule->target; + custom_rule->target_rx->pool = r->pool; + custom_rule->target_rx->err.len = 0; +@@ -442,7 +445,11 @@ naxsi_rx(ngx_conf_t* r, ngx_str_t* tmp, ngx_http_rule_t* rule) + ha.len = tmp->len - strlen(RX_T); + rgc = ngx_pcalloc(r->pool, sizeof(ngx_regex_compile_t)); + return_value_if(!rgc, NGX_CONF_ERROR); ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = ha; + rgc->pool = r->pool; + rgc->err.len = 0; +diff --git a/naxsi_src/naxsi_runtime.c b/naxsi_src/naxsi_runtime.c +index d548ce37..784852b0 100644 +--- a/naxsi_src/naxsi_runtime.c ++++ b/naxsi_src/naxsi_runtime.c +@@ -181,6 +181,75 @@ ngx_http_naxsi_rawbody_parse(ngx_http_request_ctx_t* ctx, + unsigned char* + ngx_utf8_check(ngx_str_t* str); + ++#if defined nginx_version && (nginx_version >= 1021005) ++/* ++ * variables to use pcre2 ++ */ ++static pcre2_match_data *ngx_pcre2_match_data; ++static ngx_uint_t ngx_pcre2_match_data_size; ++ ++/* ++ * helper function to use pcre2 ++ */ ++ngx_int_t ++ngx_pcre2_exec(ngx_regex_t *re, unsigned char* str, unsigned int len, ngx_int_t tmp_idx, int *captures, ngx_uint_t size) ++{ ++ size_t *ov; ++ ngx_int_t rc; ++ ngx_uint_t n, i; ++ ++ /* ++ * The pcre2_match() function might allocate memory for backtracking ++ * frames, typical allocations are from 40k and above. So the allocator ++ * is configured to do direct allocations from heap during matching. ++ */ ++ ++ if (ngx_pcre2_match_data == NULL ++ || size > ngx_pcre2_match_data_size) ++ { ++ /* ++ * Allocate a match data if not yet allocated or smaller than ++ * needed. ++ */ ++ ++ if (ngx_pcre2_match_data) { ++ pcre2_match_data_free(ngx_pcre2_match_data); ++ } ++ ++ ngx_pcre2_match_data_size = size; ++ ngx_pcre2_match_data = pcre2_match_data_create(size / 3, NULL); ++ ++ if (ngx_pcre2_match_data == NULL) { ++ rc = PCRE2_ERROR_NOMEMORY; ++ goto failed; ++ } ++ } ++ ++ rc = pcre2_match(re, str, len, tmp_idx, 0, ngx_pcre2_match_data, NULL); ++ ++ if (rc < 0) { ++ goto failed; ++ } ++ ++ n = pcre2_get_ovector_count(ngx_pcre2_match_data); ++ ov = pcre2_get_ovector_pointer(ngx_pcre2_match_data); ++ ++ if (n > size / 3) { ++ n = size / 3; ++ } ++ ++ for (i = 0; i < n; i++) { ++ captures[i * 2] = ov[i * 2]; ++ captures[i * 2 + 1] = ov[i * 2 + 1]; ++ } ++ ++failed: ++ ++ return rc; ++ ++} ++#endif ++ + /* + ** in : string to inspect, associated rule + ** does : apply the rule on the string, return 1 if matched, +@@ -201,7 +270,14 @@ ngx_http_process_basic_rule_buffer(ngx_str_t* str, ngx_http_rule_t* rl, ngx_int_ + tmp_idx = 0; + len = str->len; + while +-#if defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) ++#if (NGX_PCRE2) ++ (tmp_idx < len && (match = ngx_pcre2_exec(rl->br->rx->regex, ++ str->data, ++ str->len, ++ tmp_idx, ++ captures, ++ 30)) >= 0) ++#elif defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) + (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, + 0, + (const char*)str->data, +@@ -496,7 +572,9 @@ ngx_http_naxsi_pcre_wrapper(ngx_regex_compile_t* rx, unsigned char* str, unsigne + int match; + int captures[30]; + +-#if defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) ++#if (NGX_PCRE2) ++ match = ngx_pcre2_exec(rx->regex, str, len, 0, captures, 1); ++#elif defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) + match = pcre_exec(rx->regex->code, 0, (const char*)str, len, 0, 0, captures, 1); + #elif defined nginx_version && (nginx_version > 1001011) + match = pcre_exec(rx->regex->pcre, 0, (const char*)str, len, 0, 0, captures, 1); +diff --git a/naxsi_src/naxsi_utils.c b/naxsi_src/naxsi_utils.c +index e3d6f185..d2ecedec 100644 +--- a/naxsi_src/naxsi_utils.c ++++ b/naxsi_src/naxsi_utils.c +@@ -800,7 +800,11 @@ ngx_http_naxsi_create_hashtables_n(ngx_http_naxsi_loc_conf_t* dlc, ngx_conf_t* c + ngx_pcalloc(cf->pool, sizeof(ngx_regex_compile_t)); + rgc = custloc_array(curr_r->br->custom_locations->elts)[name_idx].target_rx; + if (rgc) { ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = custloc_array(curr_r->br->custom_locations->elts)[name_idx].target; + rgc->pool = cf->pool; + rgc->err.len = 0; +@@ -816,7 +820,11 @@ ngx_http_naxsi_create_hashtables_n(ngx_http_naxsi_loc_conf_t* dlc, ngx_conf_t* c + ngx_pcalloc(cf->pool, sizeof(ngx_regex_compile_t)); + rgc = custloc_array(curr_r->br->custom_locations->elts)[uri_idx].target_rx; + if (rgc) { ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = custloc_array(curr_r->br->custom_locations->elts)[uri_idx].target; + rgc->pool = cf->pool; + rgc->err.len = 0; -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 17:52:04 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 18:52:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/less: fix CVE-2022-46663 Message-ID: <20230219175204.645686-1-fontaine.fabrice@gmail.com> In GNU Less before 609, crafted data can result in "less -R" not filtering ANSI escape sequences sent to the terminal. Signed-off-by: Fabrice Fontaine --- ...-on-invalid-embedded-escape-sequence.patch | 27 +++++++++++++++++++ package/less/less.mk | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch diff --git a/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch new file mode 100644 index 0000000000..233f949e24 --- /dev/null +++ b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch @@ -0,0 +1,27 @@ +From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 +From: Mark Nudelman +Date: Fri, 7 Oct 2022 19:25:46 -0700 +Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. + +[Retrieved from: +https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c] +Signed-off-by: Fabrice Fontaine +--- + line.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/line.c b/line.c +index 236c49ae..cba7bdd1 100644 +--- a/line.c ++++ b/line.c +@@ -633,8 +633,8 @@ ansi_step(pansi, ch) + /* Hyperlink ends with \7 or ESC-backslash. */ + if (ch == '\7') + return ANSI_END; +- if (pansi->prev_esc && ch == '\\') +- return ANSI_END; ++ if (pansi->prev_esc) ++ return (ch == '\\') ? ANSI_END : ANSI_ERR; + pansi->prev_esc = (ch == ESC); + return ANSI_MID; + } diff --git a/package/less/less.mk b/package/less/less.mk index 7d7a6d5fe5..f01f94d6c8 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -11,6 +11,9 @@ LESS_LICENSE_FILES = COPYING LESS_CPE_ID_VENDOR = gnu LESS_DEPENDENCIES = ncurses +# 0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch +LESS_IGNORE_CVES += CVE-2022-46663 + define LESS_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less endef -- 2.39.0 From peter at korsgaard.com Sun Feb 19 18:44:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 19:44:58 +0100 Subject: [Buildroot] [PATCH] package/git: security bump to version 2.39.2 In-Reply-To: <20230218085837.350535-1-bagasdotme@gmail.com> (Bagas Sanjaya's message of "Sat, 18 Feb 2023 15:58:37 +0700") References: <20230218085837.350535-1-bagasdotme@gmail.com> Message-ID: <87ilfx1olx.fsf@dell.be.48ers.dk> >>>>> "Bagas" == Bagas Sanjaya writes: > Fix two CVEs (CVE-2023-22490 and CVE-2023-23946). For the full release > note, see [1]. > While at it, also refresh two Buildroot patches introduced when the > package was bumped to 2.39.0. > [1]: https://lore.kernel.org/git/xmqqr0us5dio.fsf at gitster.g/ > Signed-off-by: Bagas Sanjaya Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 18:44:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 19:44:33 +0100 Subject: [Buildroot] [git commit] package/git: security bump to version 2.39.2 Message-ID: <20230219184511.0F5FB8608A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5085b61121a55c830b4d1576ab52441dc1491e35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix two CVEs (CVE-2023-22490 and CVE-2023-23946). For the full release note, see [1]. While at it, also refresh two Buildroot patches introduced when the package was bumped to 2.39.0. [1]: https://lore.kernel.org/git/xmqqr0us5dio.fsf at gitster.g/ Signed-off-by: Bagas Sanjaya Signed-off-by: Peter Korsgaard --- ...001-git-compat-util-avoid-redefining-system-function-nam.patch | 8 +++++--- ...002-git-compat-util-undefine-system-names-before-redecla.patch | 6 +++--- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch index dbde87940a..24100e1f6e 100644 --- a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch +++ b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch @@ -1,4 +1,4 @@ -From 385f67eb2254edb1fb4cf523e5e3d5a8f123d72c Mon Sep 17 00:00:00 2001 +From 86aeac96d04ae5381085c0f93acb12d3bfd06969 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 30 Nov 2022 16:15:14 -0500 Subject: [PATCH] git-compat-util: avoid redefining system function names @@ -64,7 +64,7 @@ Signed-off-by: Bagas Sanjaya 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h -index a76d0526f7..e3456bdd0d 100644 +index af05077560..f6882b9b50 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -341,11 +341,12 @@ struct itimerval { @@ -83,7 +83,7 @@ index a76d0526f7..e3456bdd0d 100644 #endif #ifndef NO_LIBGEN_H -@@ -1471,14 +1472,16 @@ int open_nofollow(const char *path, int flags); +@@ -1479,14 +1480,16 @@ int open_nofollow(const char *path, int flags); #endif #ifndef _POSIX_THREAD_SAFE_FUNCTIONS @@ -102,6 +102,8 @@ index a76d0526f7..e3456bdd0d 100644 #define getc_unlocked(fh) getc(fh) #endif + +base-commit: cbf04937d5b9fcf0a76c28f69e6294e9e3ecd7e6 -- An old man doll... just what I always wanted! - Clara diff --git a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch index 9e3c9b662c..f6207300ee 100644 --- a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch +++ b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch @@ -1,4 +1,4 @@ -From 6d406390b870fdb2cd9d18b12ebfabc12f5096df Mon Sep 17 00:00:00 2001 +From d4a11fd215195cd1ca6a43058ef250b688ade1f4 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 2 Dec 2022 06:05:38 -0500 Subject: [PATCH] git-compat-util: undefine system names before redeclaring @@ -29,7 +29,7 @@ Signed-off-by: Bagas Sanjaya 1 file changed, 4 insertions(+) diff --git a/git-compat-util.h b/git-compat-util.h -index e3456bdd0d..211861da0f 100644 +index f6882b9b50..dadb9e55cb 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -346,6 +346,7 @@ static inline int git_setitimer(int which, @@ -40,7 +40,7 @@ index e3456bdd0d..211861da0f 100644 #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) #endif -@@ -1480,6 +1481,9 @@ static inline void git_funlockfile(FILE *fh) +@@ -1488,6 +1489,9 @@ static inline void git_funlockfile(FILE *fh) { ; /* nothing */ } diff --git a/package/git/git.hash b/package/git/git.hash index 75398896e5..b7840cd1eb 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161 git-2.39.1.tar.xz +sha256 475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 git-2.39.2.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 1d728e1964..206d06ffe7 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.39.1 +GIT_VERSION = 2.39.2 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From bernd.kuhls at t-online.de Sun Feb 19 19:07:45 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 19 Feb 2023 20:07:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.88.0 Message-ID: <20230219190745.412680-1-bernd.kuhls@t-online.de> Changelog: https://curl.se/changes.html#7_88_0 Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/2bc1d775f510196154283374284f98d3eae03544#diff-400d38e5cfee181230373a8b02d38f50271a5bf62c62410382efddb8e8b19e22 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 230ec8d704..714b02acb0 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.87.0.tar.xz.asc +# https://curl.se/download/curl-7.88.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff curl-7.87.0.tar.xz -sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING +sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 994b685d34..eb481e4782 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.87.0 +LIBCURL_VERSION = 7.88.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ -- 2.39.1 From ju.o at free.fr Sun Feb 19 19:40:08 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 20:40:08 +0100 Subject: [Buildroot] [PATCH v2, 3/3] package/libjxl: security bump to version 0.8.1 In-Reply-To: <701823a1b87f5b99a6bdb21aa8b573d7@free.fr> References: <20230219164822.142283-1-fontaine.fabrice@gmail.com> <20230219164822.142283-3-fontaine.fabrice@gmail.com> <701823a1b87f5b99a6bdb21aa8b573d7@free.fr> Message-ID: Hi again Fabrice, On 19/02/2023 18:07, Julien Olivain wrote: > Hi Fabrice, > > Thanks for the quick update! > > I successfully tested with the command: > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_libjxl > > On 19/02/2023 17:48, Fabrice Fontaine wrote: >> Security: Fix OOB read in exif.h >> >> https://github.com/libjxl/libjxl/releases/tag/v0.8.1 >> https://github.com/libjxl/libjxl/releases/tag/v0.8.0 >> > > Tested-by: Julien Olivain > Reviewed-by: Julien Olivain > >> Signed-off-by: Fabrice Fontaine >> --- >> Changes v1 -> v2 (after review of Julien Olivain): >> - Add patch to fix crash >> >> ...entation-fault-when-JPEG-is-disabled.patch | 44 >> +++++++++++++++++++ >> package/libjxl/libjxl.hash | 2 +- >> package/libjxl/libjxl.mk | 2 +- >> 3 files changed, 46 insertions(+), 2 deletions(-) >> create mode 100644 >> package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch >> >> diff --git >> a/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch >> b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch >> new file mode 100644 >> index 0000000000..3d709c956b >> --- /dev/null >> +++ >> b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch >> @@ -0,0 +1,44 @@ >> +From 504f35c8204248ae6f97278e8b7c6cc5853a1b94 Mon Sep 17 00:00:00 >> 2001 >> +From: Julien Olivain >> +Date: Fri, 10 Feb 2023 21:31:30 +0100 >> +Subject: [PATCH] djxl: fix segmentation fault when JPEG is disabled >> + >> +When libjxl is compiled without JPEG support, by configuring for >> example >> +with: >> + >> + cmake -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE ... >> + >> +djxl crashes with a segmentation fault at: >> +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L367 >> + >> +The crash can be reproduced with the sequence: >> + >> + gm convert IMAGE:LOGO ref.ppm >> + cjxl ref.ppm enc.jxl >> + djxl enc.jxl dec.ppm >> + >> +The crash happen because opt_jpeg_quality_id does not get >> +initialized at: >> +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L107 >> + >> +This commit fixes the crash by adding a test on opt_jpeg_quality_id. >> + >> +Signed-off-by: Julien Olivain >> +[Retrieved from: >> +https://github.com/libjxl/libjxl/pull/2178/commits/504f35c8204248ae6f97278e8b7c6cc5853a1b94] >> +--- >> + tools/djxl_main.cc | 1 + >> + 1 file changed, 1 insertion(+) >> + >> +diff --git a/tools/djxl_main.cc b/tools/djxl_main.cc >> +index b755301fcb..42b889e7ce 100644 >> +--- a/tools/djxl_main.cc >> ++++ b/tools/djxl_main.cc >> +@@ -370,6 +370,7 @@ int main(int argc, const char* argv[]) { >> + args.color_space = force_colorspace; >> + } >> + if (codec == jxl::extras::Codec::kPNM && extension != ".pfm" && >> ++ args.opt_jpeg_quality_id != -1 && >> + !cmdline.GetOption(args.opt_jpeg_quality_id)->matched()) { >> + args.bits_per_sample = 0; >> + } >> diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash >> index e71d32e61d..6b4c9d8d0a 100644 >> --- a/package/libjxl/libjxl.hash >> +++ b/package/libjxl/libjxl.hash >> @@ -1,4 +1,4 @@ >> # Locally computed: >> -sha256 >> 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e >> libjxl-0.7.0.tar.gz >> +sha256 >> 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 >> libjxl-0.8.1.tar.gz >> sha256 >> 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede >> LICENSE >> sha256 >> 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 >> PATENTS >> diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk >> index b4dfbecf82..f603327bf6 100644 >> --- a/package/libjxl/libjxl.mk >> +++ b/package/libjxl/libjxl.mk >> @@ -4,7 +4,7 @@ >> # >> >> ################################################################################ >> >> -LIBJXL_VERSION = 0.7.0 >> +LIBJXL_VERSION = 0.8.1 Testing a bit more thoroughly on top of branch master a commit 1c9622a, with command: utils/test-pkg -p libjxl -a revealed some new build failures for riscv{32,64}. Output shows: ... bootlin-riscv32-glibc [17/45]: FAILED bootlin-riscv64-glibc [18/45]: FAILED bootlin-riscv64-musl [19/45]: FAILED ... 45 builds, 11 skipped, 3 build failed, 0 legal-info failed, 0 show-info failed They are all failing at the same place, with error in log: /br-test-pkg/bootlin-riscv64-glibc/build/libjxl-0.8.1/lib/jxl/enc_xyb.cc: In function ?jxl::Image3F jxl::N_SCALAR::TransformToLinearRGB(const jxl::Image3F&, const jxl::ColorEncoding&, float, const JxlCmsInterface&, jxl::ThreadPool*)?: /br-test-pkg/bootlin-riscv64-glibc/build/libjxl-0.8.1/lib/jxl/enc_xyb.cc:223:21: error: variable ?std::atomic ok? has initializer but incomplete type 223 | std::atomic ok{true}; | ^~ >> LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) >> LIBJXL_LICENSE = BSD-3-Clause >> LIBJXL_LICENSE_FILES = LICENSE PATENTS Best regards, Julien. From thomas.petazzoni at bootlin.com Sun Feb 19 20:53:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:53:36 +0100 Subject: [Buildroot] [git commit] package/libfuse3: bump to version 3.14.0 Message-ID: <20230219205348.3DD608609A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=273bec97fc34068281d44e57bc60fbcfed5c8342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index f697f4ad3f..2d78153c81 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 96399b09b91bc717a9e96ffea660d611e6a342547c1abd4d0e858b3dca9d5a13 libfuse3-3.13.1.tar.gz +sha256 b14f7d97abc11a5a70a37955021a7a1d8eb1d3dd5b6abec66af093eae3168c62 libfuse3-3.14.0.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index a2e9775868..8c306ba187 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.13.1 +LIBFUSE3_VERSION = 3.14.0 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sun Feb 19 20:54:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:54:31 +0100 Subject: [Buildroot] [PATCH] package/libfuse3: bump to version 3.14.0 In-Reply-To: <20230217133241.533189-1-giulio.benetti@benettiengineering.com> References: <20230217133241.533189-1-giulio.benetti@benettiengineering.com> Message-ID: <20230219215431.2e172a10@windsurf> On Fri, 17 Feb 2023 14:32:41 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti > --- > package/libfuse3/libfuse3.hash | 2 +- > package/libfuse3/libfuse3.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 Feb 19 20:54:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:54:39 +0100 Subject: [Buildroot] [git commit] package/speechd: disable kali support Message-ID: <20230219205533.9F083860A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8797f3fb272e9c1a5fe6a1953cacf6e5065a133a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable kali support as it is not needed and raises the following build failure without C++ since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: CXX sd_kali-kali.o /bin/sh: line 1: no: command not found Fixes: - http://autobuild.buildroot.org/results/2f6c8b3674753d6a9f165117c70e7dad88505505 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 0d43e4b6fb..46c0672f59 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,6 +12,7 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile +SPEECHD_CONF_OPTS = --without-kali # fix missing config.rpath (needed for autoreconf) in the codebase define SPEECHD_TOUCH_CONFIG_RPATH From thomas.petazzoni at bootlin.com Sun Feb 19 20:55:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:55:23 +0100 Subject: [Buildroot] [git commit] package/speechd: fix build without makeinfo Message-ID: <20230219205533.A93F0860C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99d5f1f7d3cd4b1f2041edbddd5d09caacf4848d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without makeinfo raised since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: /home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found Fixes: - http://autobuild.buildroot.org/results/d4f193545eb31864a9bac5a9d05bba39d3c7ff3e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speechd/0001-add-disable-doc.patch | 78 ++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/package/speechd/0001-add-disable-doc.patch b/package/speechd/0001-add-disable-doc.patch new file mode 100644 index 0000000000..dd17b10e4f --- /dev/null +++ b/package/speechd/0001-add-disable-doc.patch @@ -0,0 +1,78 @@ +From d88557d3c29c33f76af20cb7a6eb798f6f598c23 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 19 Feb 2023 15:18:35 +0100 +Subject: [PATCH] add --disable-doc + +Allow the user to disable documentation through --disable-doc to avoid +the following build failure without makeinfo: + +make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/doc' + MAKEINFO ssip.info + MAKEINFO spd-say.info +/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found +/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +make[3]: *** [Makefile:492: ssip.info] Error 127 + +Fixes: + - http://autobuild.buildroot.org/results/d4f193545eb31864a9bac5a9d05bba39d3c7ff3e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/brailcom/speechd/pull/810] +--- + Makefile.am | 6 +++++- + configure.ac | 4 ++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 26617c78..480eb50e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,7 +22,11 @@ pkgconfig_DATA = speech-dispatcher.pc + + BUILT_SOURCES = $(top_srcdir)/.version + +-SUBDIRS= include locale src config doc po ++SUBDIRS= include locale src config po ++ ++if ENABLE_DOC ++SUBDIRS += doc ++endif + + EXTRA_DIST= config.rpath COPYING.LGPL COPYING.GPL-2 COPYING.GPL-3 ANNOUNCE BUGS FAQ README.md README.packagers README.translators README.overview.md README.style.md build.sh speech-dispatcherd.service.in speech-dispatcher.socket speech-dispatcher.service.in po/Makevars.in po/README + +diff --git a/configure.ac b/configure.ac +index faaa8629..4f2af908 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -168,6 +168,10 @@ AC_SUBST([EXTRA_SOCKET_LIBS]) + AC_SUBST([ERROR_CFLAGS]) + AC_SUBST([RDYNAMIC]) + ++AC_ARG_ENABLE([doc], ++ [AC_HELP_STRING([--disable-doc], [turn off documentation])]) ++AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no") ++ + # Check for python support. + # Python 3 or greater required + AC_ARG_ENABLE([python], +-- +2.39.0 + From thomas.petazzoni at bootlin.com Sun Feb 19 20:55:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:55:40 +0100 Subject: [Buildroot] [PATCH 1/2] package/speechd: disable kali support In-Reply-To: <20230219142548.626439-1-fontaine.fabrice@gmail.com> References: <20230219142548.626439-1-fontaine.fabrice@gmail.com> Message-ID: <20230219215540.3968527c@windsurf> On Sun, 19 Feb 2023 15:25:47 +0100 Fabrice Fontaine wrote: > Disable kali support as it is not needed and raises the following build > failure without C++ since the addition of the package in commit > 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: > > CXX sd_kali-kali.o > /bin/sh: line 1: no: command not found > > Fixes: > - http://autobuild.buildroot.org/results/2f6c8b3674753d6a9f165117c70e7dad88505505 > > Signed-off-by: Fabrice Fontaine > --- > package/speechd/speechd.mk | 1 + > 1 file changed, 1 insertion(+) Both applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 19 20:56:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:56:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnupg2: fix build failure when host provides an old gpgrt-config In-Reply-To: <20230219150426.1509780-1-ju.o@free.fr> References: <20230219150426.1509780-1-ju.o@free.fr> Message-ID: <20230219215633.61ffccbe@windsurf> On Sun, 19 Feb 2023 16:04:26 +0100 Julien Olivain wrote: > gnupg2 uses the libgpg-error library. The libgpg-error library has a > long plan to be renamed to "gpgrt" (see [1]). For the transition, it > provides two configuration scripts "gpg-error-config" (the old, > original one, kept for compatibility) and "gpgrt-config" (which is > meant to be the replacement). When both are detected, "gpgrt-config" > should be preferred. > > gnupg2 configure script searches for "gpg-error-config" in the path > provided to --with-libgpg-error-prefix=PFX (more specifically, in > "PFX/bin"). > > The logic to find "gpgrt-config" is different: it is searched in > paths "$prefix/bin:$PATH". See [2]. On Buildroot, autotools target > packages are configured with "--prefix=/usr", which makes the > configure script to search in the host "/usr/bin". > > In some host environment providing such a "/usr/bin/gpgrt-config" > script of an older version, host compilation flags are incorrectly > added for the target, which leads to compilation failures. > > The issue can be reproduced in a Buildroot Docker image from [3] in > which the libgpg-error-dev package is added. When tested, the > libgpg-error-dev package was at version 1.38. > > In that configuration, gnupg2 configure will output the message: > > checking for gpgrt-config... /usr/bin/gpgrt-config > > and the compilation fails with a message: > > aarch64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' > > Note: it was observed that in some other configurations in which the > host /usr/bin/gpgrt-config was from libgpg-error version 1.46, the > host script was redirecting correctly in the buildroot sysroot. > > Since gnupg2 searches for "gpgrt-config" with a > "AC_PATH_PROG(GPGRT_CONFIG, ...)" macro, this patch fixes this > issue by simply forcing the script path in the GPGRT_CONFIG > environment variable. > > See also [4] which discussed the "gpgrt-config" search logic. > > Fixes: > - http://autobuild.buildroot.net/results/423c3ce7317c181e9f2e4a49b76ee9d26167375c/ > (and many others) > > [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=e0b9f16445a96942af0839bcdb9a0b0f8cf31380;hb=885a287a57cf060b4c5b441822c09d23b8dee2bd#l29 > [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=m4/gpg-error.m4;h=a975e53d07d1b743f51d8aa1767cd8e0d71b4071;hb=c0556edb80518720b0d884251685fe008c8f0429#l68 > [3] https://git.buildroot.org/buildroot/tree/support/docker/Dockerfile?id=b6085c00d0feece6f3ba635e7847ea653bc5fac3 > [4] https://dev.gnupg.org/T5365 > > Reported-by: Bagas Sanjaya > Tested-by: Bagas Sanjaya > Signed-off-by: Julien Olivain > --- > Patch tested on master branch at commit b6085c0 with commands: Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 19 20:55:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:55:53 +0100 Subject: [Buildroot] [git commit] package/gnupg2: fix build failure when host provides an old gpgrt-config Message-ID: <20230219205732.85A218611D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gnupg2 uses the libgpg-error library. The libgpg-error library has a long plan to be renamed to "gpgrt" (see [1]). For the transition, it provides two configuration scripts "gpg-error-config" (the old, original one, kept for compatibility) and "gpgrt-config" (which is meant to be the replacement). When both are detected, "gpgrt-config" should be preferred. gnupg2 configure script searches for "gpg-error-config" in the path provided to --with-libgpg-error-prefix=PFX (more specifically, in "PFX/bin"). The logic to find "gpgrt-config" is different: it is searched in paths "$prefix/bin:$PATH". See [2]. On Buildroot, autotools target packages are configured with "--prefix=/usr", which makes the configure script to search in the host "/usr/bin". In some host environment providing such a "/usr/bin/gpgrt-config" script of an older version, host compilation flags are incorrectly added for the target, which leads to compilation failures. The issue can be reproduced in a Buildroot Docker image from [3] in which the libgpg-error-dev package is added. When tested, the libgpg-error-dev package was at version 1.38. In that configuration, gnupg2 configure will output the message: checking for gpgrt-config... /usr/bin/gpgrt-config and the compilation fails with a message: aarch64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' Note: it was observed that in some other configurations in which the host /usr/bin/gpgrt-config was from libgpg-error version 1.46, the host script was redirecting correctly in the buildroot sysroot. Since gnupg2 searches for "gpgrt-config" with a "AC_PATH_PROG(GPGRT_CONFIG, ...)" macro, this patch fixes this issue by simply forcing the script path in the GPGRT_CONFIG environment variable. See also [4] which discussed the "gpgrt-config" search logic. Fixes: - http://autobuild.buildroot.net/results/423c3ce7317c181e9f2e4a49b76ee9d26167375c/ (and many others) [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=e0b9f16445a96942af0839bcdb9a0b0f8cf31380;hb=885a287a57cf060b4c5b441822c09d23b8dee2bd#l29 [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=m4/gpg-error.m4;h=a975e53d07d1b743f51d8aa1767cd8e0d71b4071;hb=c0556edb80518720b0d884251685fe008c8f0429#l68 [3] https://git.buildroot.org/buildroot/tree/support/docker/Dockerfile?id=b6085c00d0feece6f3ba635e7847ea653bc5fac3 [4] https://dev.gnupg.org/T5365 Reported-by: Bagas Sanjaya Tested-by: Bagas Sanjaya Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gnupg2/gnupg2.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 5935ce6939..73de185ba7 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -23,6 +23,10 @@ GNUPG2_CONF_OPTS = \ --with-ksba-prefix=$(STAGING_DIR)/usr \ --with-npth-prefix=$(STAGING_DIR)/usr +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +GNUPG2_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config + ifneq ($(BR2_PACKAGE_GNUPG2_GPGV),y) define GNUPG2_REMOVE_GPGV rm -f $(TARGET_DIR)/usr/bin/gpgv From thomas.petazzoni at bootlin.com Sun Feb 19 20:58:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:58:03 +0100 Subject: [Buildroot] [PATCH] package/catch2: bump to version 3.3.1 In-Reply-To: <20230218112449.1753677-1-buildroot@heine.tech> References: <20230218112449.1753677-1-buildroot@heine.tech> Message-ID: <20230219215803.1ad7ae5b@windsurf> On Sat, 18 Feb 2023 12:24:45 +0100 Michael Nosthoff via buildroot wrote: > raise the minimum gcc to 5 as stated in release notes for 3.1.0 [0]. > > [0] https://github.com/catchorg/Catch2/releases/tag/v3.1.0 > --- > package/catch2/Config.in | 6 +++--- > package/catch2/catch2.hash | 2 +- > package/catch2/catch2.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 Feb 19 20:57:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:57:47 +0100 Subject: [Buildroot] [git commit] package/catch2: bump to version 3.3.1 Message-ID: <20230219205904.B25A38622D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3a462e85a786401964d522124e4f431d79339e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master raise the minimum gcc to 5 as stated in release notes for 3.1.0 [0]. [0] https://github.com/catchorg/Catch2/releases/tag/v3.1.0 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/catch2/Config.in | 6 +++--- package/catch2/catch2.hash | 2 +- package/catch2/catch2.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/catch2/Config.in b/package/catch2/Config.in index 2f53d197b2..40d2d12434 100644 --- a/package/catch2/Config.in +++ b/package/catch2/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_CATCH2 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 depends on BR2_USE_MMU # fork() help Catch2 is mainly a unit testing framework for C++, but it @@ -21,8 +21,8 @@ config BR2_PACKAGE_CATCH2 https://github.com/catchorg/Catch2 -comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash index 664164fd76..b533792f8f 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2106bccfec18c8ce673623d56780220e38527dd8f283ccba26aa4b8758737d0e catch2-3.1.1.tar.gz +sha256 d90351cdc55421f640c553cfc0875a8c834428679444e8062e9187d05b18aace catch2-3.3.1.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index ab62cc943b..6e4af3d670 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.1.1 +CATCH2_VERSION = 3.3.1 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO From thomas.petazzoni at bootlin.com Sun Feb 19 21:02:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 22:02:17 +0100 Subject: [Buildroot] [PATCH] packge/libabseil-cpp: bump to version 20230125.0 In-Reply-To: <20230218114837.1761715-1-buildroot@heine.tech> References: <20230218114837.1761715-1-buildroot@heine.tech> Message-ID: <20230219220217.6b34a65f@windsurf> Hello Michael, On Sat, 18 Feb 2023 12:48:37 +0100 Michael Nosthoff via buildroot wrote: > libabseil now depends on c++14 and gcc >= 7.3.1 [0][1] > > [0] https://github.com/abseil/abseil-cpp/releases/tag/20230125.0 > [1] https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md > > Signed-off-by: Michael Nosthoff > --- > > Note: > I'm not sure if the BR2_TOOLCHAIN_GCC_AT_LEAST_7 dependency is sufficient. > But I don't think we have a more version specific Flag available? We don't have more specific blind options than 7.x, 8.x, etc. to describe a gcc dependency. > package/grpc/Config.in | 6 +++--- > package/libabseil-cpp/Config.in | 6 +++--- > package/libabseil-cpp/libabseil-cpp.hash | 2 +- > package/libabseil-cpp/libabseil-cpp.mk | 6 +++--- > 4 files changed, 10 insertions(+), 10 deletions(-) I'm afraid this is not sufficient. Indeed, you need to look at the reverse dependencies of GRPC for example. So, package/falcosecurity-libs needs to be adjusted, then package/sysdig as well, and also the BR2_PACKAGE_COLLECTD_GRPC option from package/collectd. Could you have a look into this, and submit an updated version? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 19 21:09:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 22:09:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: bump to version 2.26.0 In-Reply-To: <20230218134059.53863-1-egorenar@linux.ibm.com> References: <20230218134059.53863-1-egorenar@linux.ibm.com> Message-ID: <20230219220949.4507fcc8@windsurf> On Sat, 18 Feb 2023 14:40:59 +0100 Alexander Egorenkov wrote: > Signed-off-by: Alexander Egorenkov > --- > package/s390-tools/s390-tools.hash | 2 +- > package/s390-tools/s390-tools.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 Feb 19 21:09:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 22:09:25 +0100 Subject: [Buildroot] [git commit] package/s390-tools: bump to version 2.26.0 Message-ID: <20230219211013.9112386293@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d782c0682f559d407e64698470b511512a5bdc78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- 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 a0dde477c3..37b67c5cb1 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ccb20954e748309a50fd56edd9abd94c6f897081e9a1a33e9d965a56f650990d s390-tools-2.25.0.tar.gz +sha256 da81c55fb11d84923c0ebaed703f557052eb1a273495f60ebe3d20a74627303e s390-tools-2.26.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index cb6278dfb8..8cd5491405 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.25.0 +S390_TOOLS_VERSION = 2.26.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 thomas.petazzoni at bootlin.com Sun Feb 19 21:10:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 22:10:00 +0100 Subject: [Buildroot] [git commit] package/poke: bump to version 3.0 Message-ID: <20230219211013.9B95E86296@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2ecaf26b5e3693cf0145a2d1fcc2e0953884baf4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See: http://www.jemarch.net/poke-3.0-relnotes.html Build tested: https://gitlab.com/kubu93/buildroot/-/pipelines/782116399 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/poke/poke.hash | 2 +- package/poke/poke.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poke/poke.hash b/package/poke/poke.hash index 09dc4e8972..e6e436570c 100644 --- a/package/poke/poke.hash +++ b/package/poke/poke.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 841e285917c6738ce982a6930e30ebeadecfb0655a79d9184f16f876a9fe6e47 poke-2.4.tar.gz +sha256 79a9b2f33c9f8c327c499afadaeeabfeecf6ad4988924d2c6c6f317e50317add poke-3.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index d49e628dbf..4a6ff344b2 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 2.4 +POKE_VERSION = 3.0 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 thomas.petazzoni at bootlin.com Sun Feb 19 21:10:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 22:10:12 +0100 Subject: [Buildroot] [PATCH] package/poke: bump to version 3.0 In-Reply-To: <20230218180215.1077049-1-romain.naour@gmail.com> References: <20230218180215.1077049-1-romain.naour@gmail.com> Message-ID: <20230219221012.31f1977e@windsurf> On Sat, 18 Feb 2023 19:02:15 +0100 Romain Naour wrote: > See: > http://www.jemarch.net/poke-3.0-relnotes.html > > Build tested: > https://gitlab.com/kubu93/buildroot/-/pipelines/782116399 > > Signed-off-by: Romain Naour > --- > test-pkg config: > BR2_PACKAGE_POKE=y > --- > package/poke/poke.hash | 2 +- > package/poke/poke.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 Feb 19 22:05:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 23:05:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/ipmiutil: fix uclibc build without wchar In-Reply-To: <20230219161453.87903-1-fontaine.fabrice@gmail.com> References: <20230219161453.87903-1-fontaine.fabrice@gmail.com> Message-ID: <20230219230510.4b29d5be@windsurf> On Sun, 19 Feb 2023 17:14:53 +0100 Fabrice Fontaine wrote: > For an unknown reason, wchar_t is incorrectly detected with uclibc > resulting in the following build failure: > > In file included from igetevent.c:136: > imb_api.h:150:5: error: unknown type name 'wchar_t' > 150 | wchar_t *Buffer; > | ^~~~~~~ > > The build failure can be reproduced even when reverting bump to version > 3.1.8. > > Fixes: > - http://autobuild.buildroot.org/results/e9ff3bd08e106dc834968bf5e4296ce8299027f8 > > Signed-off-by: Fabrice Fontaine > --- > package/ipmiutil/ipmiutil.mk | 1 + > 1 file changed, 1 insertion(+) I think the problem is that uClibc-ng defines the wchar_t type even if wchar support is disabled. I believe if the AC_CHECK_TYPES() check in ipmiutil ensured that was included, the detection would work correctly, as wchar.h contains a #error when wchar support is disabled. Anyway, in the mean time, what you proposed looks fine to me, so: applied! Thanks, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 19 22:04:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 23:04:04 +0100 Subject: [Buildroot] [git commit] package/ipmiutil: fix uclibc build without wchar Message-ID: <20230219220525.DA3CC86317@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b4937a1709a88f90abbeac48e2e2db33b83d44b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For an unknown reason, wchar_t is incorrectly detected with uclibc resulting in the following build failure: In file included from igetevent.c:136: imb_api.h:150:5: error: unknown type name 'wchar_t' 150 | wchar_t *Buffer; | ^~~~~~~ The build failure can be reproduced even when reverting bump to version 3.1.8. Fixes: - http://autobuild.buildroot.org/results/e9ff3bd08e106dc834968bf5e4296ce8299027f8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipmiutil/ipmiutil.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk index ad9fbfc24c..b48eaa7cb2 100644 --- a/package/ipmiutil/ipmiutil.mk +++ b/package/ipmiutil/ipmiutil.mk @@ -10,6 +10,7 @@ IPMIUTIL_LICENSE = BSD-3-Clause IPMIUTIL_LICENSE_FILES = COPYING IPMIUTIL_MAKE = $(MAKE1) +IPMIUTIL_CONF_ENV = ac_cv_type_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) ifeq ($(BR2_PACKAGE_OPENSSL),y) # tests against distro libcrypto so it might get a false positive when From troglobit at gmail.com Sun Feb 19 22:20:46 2023 From: troglobit at gmail.com (Joachim Wiberg) Date: Sun, 19 Feb 2023 23:20:46 +0100 Subject: [Buildroot] [PATCH 0/1] package/ssdp-responder: bump to v2.0 Message-ID: <20230219222048.22093-1-troglobit@gmail.com> Meta data: $ ./utils/check-package package/ssdp-responder/* 102 lines processed 0 warnings generated $ ./utils/test-pkg -c ssdp-responder.config -p ssdp-responder 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 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Joachim Wiberg (1): package/ssdp-responder: bump to v2.0 package/ssdp-responder/ssdp-responder.hash | 2 +- package/ssdp-responder/ssdp-responder.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.34.1 From troglobit at gmail.com Sun Feb 19 22:20:47 2023 From: troglobit at gmail.com (Joachim Wiberg) Date: Sun, 19 Feb 2023 23:20:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/ssdp-responder: bump to v2.0 In-Reply-To: <20230219222048.22093-1-troglobit@gmail.com> References: <20230219222048.22093-1-troglobit@gmail.com> Message-ID: <20230219222048.22093-2-troglobit@gmail.com> ChangeLog: - https://github.com/troglobit/ssdp-responder/releases/tag/v2.0 - https://github.com/troglobit/ssdp-responder/blob/v2.0/ChangeLog.md Critical Fixes: - Fix periodic busy loop causing intermittent 100% CPU load - Fix invalid uuid:uuid:... in description.xml (dup uuid:) Signed-off-by: Joachim Wiberg --- package/ssdp-responder/ssdp-responder.hash | 2 +- package/ssdp-responder/ssdp-responder.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.hash b/package/ssdp-responder/ssdp-responder.hash index 425ad86e08..8b4f3e4e45 100644 --- a/package/ssdp-responder/ssdp-responder.hash +++ b/package/ssdp-responder/ssdp-responder.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 974c244abd4ba8c87532867a84756182a1460c99072ffb1eb91c5a1f73311d89 ssdp-responder-1.9.tar.gz +sha256 d8888f2ac59febfb3b2473a1402041014052ad4dc1eeb4168c78aeca1692aae3 ssdp-responder-2.0.tar.gz sha256 68d6fdc22e337f725fe719bf9ae6d92b1d8d0ca4cff8219b303ab76706670a8d LICENSE diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index 5193966908..20e7219386 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSDP_RESPONDER_VERSION = 1.9 +SSDP_RESPONDER_VERSION = 2.0 SSDP_RESPONDER_SITE = https://github.com/troglobit/ssdp-responder/releases/download/v$(SSDP_RESPONDER_VERSION) SSDP_RESPONDER_LICENSE = ISC SSDP_RESPONDER_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 19 22:45:46 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 23:45:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/modem-manager: fix static build Message-ID: <20230219224546.1232023-1-fontaine.fabrice@gmail.com> Commit d769cfc13f6c2544f8bc5b6339d23763319a2383 was incomplete as plugins/meson.build still unconditionally calls shared_module. So disable plugins to fix the following static build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: [238/417] Linking target plugins/libmm-shared-telit.so FAILED: plugins/libmm-shared-telit.so Plugins could be enabled back through builtin_plugins as soon as https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/1c4da332ee6e0d948f85a63f74cb27e89075c011 lands in a stable release Fixes: - http://autobuild.buildroot.org/results/deb2a752accb021392bb9dc3d06b2b1bf151535c Signed-off-by: Fabrice Fontaine --- package/modem-manager/modem-manager.mk | 44 ++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 979a80a8e9..824b9eda5a 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -80,6 +80,50 @@ else MODEM_MANAGER_CONF_OPTS += -Dbash_completion=false endif +ifeq ($(BR2_STATIC_LIBS),y) +MODEM_MANAGER_CONF_OPTS += \ + -Dplugin_generic=disabled \ + -Dplugin_altair_lte=disabled \ + -Dplugin_anydata=disabled \ + -Dplugin_broadmobi=disabled \ + -Dplugin_cinterion=disabled \ + -Dplugin_dell=disabled \ + -Dplugin_dlink=disabled \ + -Dplugin_fibocom=disabled \ + -Dplugin_foxconn=disabled \ + -Dplugin_gosuncn=disabled \ + -Dplugin_haier=disabled \ + -Dplugin_huawei=disabled \ + -Dplugin_intel=disabled \ + -Dplugin_iridium=disabled \ + -Dplugin_linktop=disabled \ + -Dplugin_longcheer=disabled \ + -Dplugin_mbm=disabled \ + -Dplugin_motorola=disabled \ + -Dplugin_mtk=disabled \ + -Dplugin_nokia=disabled \ + -Dplugin_nokia_icera=disabled \ + -Dplugin_novatel=disabled \ + -Dplugin_novatel_lte=disabled \ + -Dplugin_option=disabled \ + -Dplugin_option_hso=disabled \ + -Dplugin_pantech=disabled \ + -Dplugin_qcom_soc=disabled \ + -Dplugin_quectel=disabled \ + -Dplugin_samsung=disabled \ + -Dplugin_sierra_legacy=disabled \ + -Dplugin_sierra=disabled \ + -Dplugin_simtech=disabled \ + -Dplugin_telit=disabled \ + -Dplugin_thuraya=disabled \ + -Dplugin_tplink=disabled \ + -Dplugin_ublox=disabled \ + -Dplugin_via=disabled \ + -Dplugin_wavecom=disabled \ + -Dplugin_x22x=disabled \ + -Dplugin_zte=disabled +endif + define MODEM_MANAGER_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/modem-manager/S44modem-manager \ $(TARGET_DIR)/etc/init.d/S44modem-manager -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 23:23:01 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 00:23:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230219232301.1795196-1-fontaine.fabrice@gmail.com> tmux uses custom --enable-static option, instead of standard libtool directive resulting in the following build failure with systemd or utf8proc raised since commits 1f618aa388535181c281c85e2b5264532de4ef0f and e279599d255a79c08ef20b97b96eb248689d52a9: checking for utf8proc.h... yes checking for library containing utf8proc_charwidth... no configure: error: "utf8proc not found" In file included from tmux.h:34, from alerts.c:23: compat.h:379:18: error: conflicting types for 'forkpty'; have 'pid_t(int *, char *, struct termios *, struct winsize *)' {aka 'int(int *, char *, struct termios *, struct winsize *)'} 379 | pid_t forkpty(int *, char *, struct termios *, struct winsize *); | ^~~~~~~ Link to (closed) upstream issue: https://github.com/tmux/tmux/issues/3290 Fixes: - http://autobuild.buildroot.org/results/6e8523d8d514bf6d8fc3377d05e5edbe7fc2d5bb - http://autobuild.buildroot.org/results/cba06f3bb6d9be25e91f56c390a70ddf9904832e Signed-off-by: Fabrice Fontaine --- package/tmux/tmux.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 47ee9b16ca..af06c8570b 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -25,6 +25,12 @@ else TMUX_CONF_OPTS += --disable-utf8proc endif +# tmux uses custom --enable-static option, instead of standard libtool +# directive resulting in a build failure with systemd or utf8proc +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +TMUX_CONF_OPTS += --disable-static +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS -- 2.39.0 From fancp2007 at gmail.com Mon Feb 20 05:20:18 2023 From: fancp2007 at gmail.com (Scott Fan) Date: Mon, 20 Feb 2023 13:20:18 +0800 Subject: [Buildroot] [PATCH v1] package/libopenssl: security bump to version 1.1.1t In-Reply-To: <20230208174305.1af25bae@windsurf> References: <20230208162534.28581-1-ps.report@gmx.net> <20230208174305.1af25bae@windsurf> Message-ID: it should also apply to the 2022.02.x branch. Scott Fan On Thu, Feb 9, 2023 at 12:43 AM Thomas Petazzoni via buildroot < buildroot at buildroot.org> wrote: > On Wed, 8 Feb 2023 17:25:34 +0100 > Peter Seiderer wrote: > > > Changelog (for details see [1] and [2]): > > > > Changes between 1.1.1s and 1.1.1t [7 Feb 2023] > > > > *) Fixed X.400 address type confusion in X.509 GeneralName. > > > > There is a type confusion vulnerability relating to X.400 address > processing > > inside an X.509 GeneralName. X.400 addresses were parsed as an > ASN1_STRING > > but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. > This > > vulnerability may allow an attacker who can provide a certificate > chain and > > CRL (neither of which need have a valid signature) to pass arbitrary > > pointers to a memcmp call, creating a possible read primitive, > subject to > > some constraints. Refer to the advisory for more information. > Thanks to > > David Benjamin for discovering this issue. (CVE-2023-0286) > > > > This issue has been fixed by changing the public header file > definition of > > GENERAL_NAME so that x400Address reflects the implementation. It > was not > > possible for any existing application to successfully use the > existing > > definition; however, if any application references the x400Address > field > > (e.g. in dead code), note that the type of this field has changed. > There is > > no ABI change. > > [Hugo Landau] > > > > *) Fixed Use-after-free following BIO_new_NDEF. > > > > The public API function BIO_new_NDEF is a helper function used for > > streaming ASN.1 data via a BIO. It is primarily used internally to > OpenSSL > > to support the SMIME, CMS and PKCS7 streaming capabilities, but may > also > > be called directly by end user applications. > > > > The function receives a BIO from the caller, prepends a new > BIO_f_asn1 > > filter BIO onto the front of it to form a BIO chain, and then > returns > > the new head of the BIO chain to the caller. Under certain > conditions, > > for example if a CMS recipient public key is invalid, the new > filter BIO > > is freed and the function returns a NULL result indicating a > failure. > > However, in this case, the BIO chain is not properly cleaned up and > the > > BIO passed by the caller still retains internal pointers to the > previously > > freed filter BIO. If the caller then goes on to call BIO_pop() on > the BIO > > then a use-after-free will occur. This will most likely result in a > crash. > > (CVE-2023-0215) > > [Viktor Dukhovni, Matt Caswell] > > > > *) Fixed Double free after calling PEM_read_bio_ex. > > > > The function PEM_read_bio_ex() reads a PEM file from a BIO and > parses and > > decodes the "name" (e.g. "CERTIFICATE"), any header data and the > payload > > data. If the function succeeds then the "name_out", "header" and > "data" > > arguments are populated with pointers to buffers containing the > relevant > > decoded data. The caller is responsible for freeing those buffers. > It is > > possible to construct a PEM file that results in 0 bytes of payload > data. > > In this case PEM_read_bio_ex() will return a failure code but will > populate > > the header argument with a pointer to a buffer that has already > been freed. > > If the caller also frees this buffer then a double free will occur. > This > > will most likely lead to a crash. > > > > The functions PEM_read_bio() and PEM_read() are simple wrappers > around > > PEM_read_bio_ex() and therefore these functions are also directly > affected. > > > > These functions are also called indirectly by a number of other > OpenSSL > > functions including PEM_X509_INFO_read_bio_ex() and > > SSL_CTX_use_serverinfo_file() which are also vulnerable. Some > OpenSSL > > internal uses of these functions are not vulnerable because the > caller does > > not free the header argument if PEM_read_bio_ex() returns a failure > code. > > (CVE-2022-4450) > > [Kurt Roeckx, Matt Caswell] > > > > *) Fixed Timing Oracle in RSA Decryption. > > > > A timing based side channel exists in the OpenSSL RSA Decryption > > implementation which could be sufficient to recover a plaintext > across > > a network in a Bleichenbacher style attack. To achieve a successful > > decryption an attacker would have to be able to send a very large > number > > of trial messages for decryption. The vulnerability affects all RSA > padding > > modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. > > (CVE-2022-4304) > > [Dmitry Belyavsky, Hubert Kario] > > > > Changes between 1.1.1r and 1.1.1s [1 Nov 2022] > > > > *) Fixed a regression introduced in 1.1.1r version not refreshing the > > certificate data to be signed before signing the certificate. > > [Gibeom Gwon] > > > > Changes between 1.1.1q and 1.1.1r [11 Oct 2022] > > > > *) Fixed the linux-mips64 Configure target which was missing the > > SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that > > platform. > > [Adam Joseph] > > > > *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation > was > > causing incorrect results in some cases as a result. > > [Paul Dale] > > > > *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were > failing to > > report correct results in some cases > > [Matt Caswell] > > > > *) Fixed a regression introduced in 1.1.1o for re-signing certificates > with > > different key sizes > > [Todd Short] > > > > *) Added the loongarch64 target > > [Shi Pujin] > > > > *) Fixed a DRBG seed propagation thread safety issue > > [Bernd Edlinger] > > > > *) Fixed a memory leak in tls13_generate_secret > > [Bernd Edlinger] > > > > *) Fixed reported performance degradation on aarch64. Restored the > > implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: > avoid > > 32-bit lane assignment in CTR mode") for 64bit targets only, since > it is > > reportedly 2-17% slower and the silicon errata only affects 32bit > targets. > > The new algorithm is still used for 32 bit targets. > > [Bernd Edlinger] > > > > *) Added a missing header for memcmp that caused compilation failure > on some > > platforms > > [Gregor Jasny] > > > > [1] https://www.openssl.org/news/cl111.txt > > [2] https://www.openssl.org/news/vulnerabilities.html > > > > Signed-off-by: Peter Seiderer > > --- > > package/libopenssl/libopenssl.hash | 4 ++-- > > package/libopenssl/libopenssl.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 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From marcus.folkesson at gmail.com Mon Feb 20 07:18:46 2023 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Mon, 20 Feb 2023 08:18:46 +0100 Subject: [Buildroot] [PATCH v2] package/libcamera-apps: enable LIBAV only if libdrm is present Message-ID: <20230220071846.2334907-1-marcus.folkesson@gmail.com> Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps does enable LIBAV by default which depends on libdrm. Fixes: - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 13 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Marcus Folkesson --- Notes: v2: -Add dependency to ffmpeg package/libcamera-apps/Config.in | 1 + package/libcamera-apps/libcamera-apps.mk | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in index 711fd6de05..d0cc6a4210 100644 --- a/package/libcamera-apps/Config.in +++ b/package/libcamera-apps/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS 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_FFMPEG if BR2_PACKAGE_LIBDRM 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 diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 290ee9a026..1464875298 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -23,10 +23,12 @@ LIBCAMERA_APPS_CONF_OPTS = \ -DENABLE_TFLITE=0 ifeq ($(BR2_PACKAGE_LIBDRM),y) -LIBCAMERA_APPS_DEPENDENCIES += libdrm +LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 endif ifeq ($(BR2_PACKAGE_XORG7),y) -- 2.38.1 From marcus.folkesson at gmail.com Mon Feb 20 07:25:13 2023 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Mon, 20 Feb 2023 08:25:13 +0100 Subject: [Buildroot] [PATCH] package/libostree: bump to version 2023.1 Message-ID: <20230220072513.2336540-1-marcus.folkesson@gmail.com> Signed-off-by: Marcus Folkesson --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index ed31109fdb..3098cdd1fc 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f libostree-2022.7.tar.xz +sha256 dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55 libostree-2023.1.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 8e8ec63213..4b17fcf391 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2022.7 +LIBOSTREE_VERSION = 2023.1 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) -- 2.38.1 From buildroot at heine.tech Mon Feb 20 07:48:06 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 20 Feb 2023 08:48:06 +0100 Subject: [Buildroot] =?utf-8?q?=5BPATCH=5D_packge/libabseil-cpp=3A_bump_t?= =?utf-8?q?o_version_20230125=2E0?= In-Reply-To: <20230219220217.6b34a65f@windsurf> Message-ID: <10dac5-63f32580-3-1c9b7240@22476584> Hi, On Sunday, February 19, 2023 22:02 CET, Thomas Petazzoni wrote: > Hello Michael, > > On Sat, 18 Feb 2023 12:48:37 +0100 > Michael Nosthoff via buildroot wrote: > > > libabseil now depends on c++14 and gcc >= 7.3.1 [0][1] > > > > [0] https://github.com/abseil/abseil-cpp/releases/tag/20230125.0 > > [1] https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md > > > > Signed-off-by: Michael Nosthoff > > --- > > > > Note: > > I'm not sure if the BR2_TOOLCHAIN_GCC_AT_LEAST_7 dependency is sufficient. > > But I don't think we have a more version specific Flag available? > > We don't have more specific blind options than 7.x, 8.x, etc. to > describe a gcc dependency. > > > package/grpc/Config.in | 6 +++--- > > package/libabseil-cpp/Config.in | 6 +++--- > > package/libabseil-cpp/libabseil-cpp.hash | 2 +- > > package/libabseil-cpp/libabseil-cpp.mk | 6 +++--- > > 4 files changed, 10 insertions(+), 10 deletions(-) > > I'm afraid this is not sufficient. Indeed, you need to look at the > reverse dependencies of GRPC for example. > > So, package/falcosecurity-libs needs to be adjusted, then > package/sysdig as well, and also the BR2_PACKAGE_COLLECTD_GRPC option > from package/collectd. > good point. since grpc now also only has "officially support for gcc 7.3+" I would then first bump grpc with all it dependencies and then resubmit this patch. https://github.com/grpc/grpc/blob/master/src/cpp/README.md > Could you have a look into this, and submit an updated version? > > Thanks a lot! > > Thomas Regards, Michael From thomas.petazzoni at bootlin.com Mon Feb 20 08:23:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 09:23:53 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: remove Shyam Saini Message-ID: <20230220082433.172298609A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd351c4e933e48f380cc8924d1659b220d13b70c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Shyam's email address at Savoir Faire Linux is bouncing, so drop they from the DEVELOPERS file. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index a7a0bb14d1..2eff5b23ef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2605,9 +2605,6 @@ F: package/tunctl/ F: package/ubus/ F: package/wolfssl/ -N: Shyam Saini -F: package/cukinia/ - N: Simon Dawson F: boot/at91bootstrap3/ F: package/cppzmq/ From aleksander at aleksander.es Mon Feb 20 08:28:42 2023 From: aleksander at aleksander.es (Aleksander Morgado) Date: Mon, 20 Feb 2023 09:28:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/modem-manager: fix static build In-Reply-To: <20230219224546.1232023-1-fontaine.fabrice@gmail.com> References: <20230219224546.1232023-1-fontaine.fabrice@gmail.com> Message-ID: Hey, On Sun, Feb 19, 2023 at 11:45 PM Fabrice Fontaine wrote: > > Commit d769cfc13f6c2544f8bc5b6339d23763319a2383 was incomplete as > plugins/meson.build still unconditionally calls shared_module. So > disable plugins to fix the following static build failure raised since > bump to version 1.20.2 in commit > b95334b71fbdde0f7621b58ed35fa98df9e0966d: > > [238/417] Linking target plugins/libmm-shared-telit.so > FAILED: plugins/libmm-shared-telit.so > > Plugins could be enabled back through builtin_plugins as soon as > https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/1c4da332ee6e0d948f85a63f74cb27e89075c011 > lands in a stable release > > Fixes: > - http://autobuild.buildroot.org/results/deb2a752accb021392bb9dc3d06b2b1bf151535c > > Signed-off-by: Fabrice Fontaine > --- > package/modem-manager/modem-manager.mk | 44 ++++++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > > diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk > index 979a80a8e9..824b9eda5a 100644 > --- a/package/modem-manager/modem-manager.mk > +++ b/package/modem-manager/modem-manager.mk > @@ -80,6 +80,50 @@ else > MODEM_MANAGER_CONF_OPTS += -Dbash_completion=false > endif > > +ifeq ($(BR2_STATIC_LIBS),y) > +MODEM_MANAGER_CONF_OPTS += \ > + -Dplugin_generic=disabled \ > + -Dplugin_altair_lte=disabled \ > + -Dplugin_anydata=disabled \ > + -Dplugin_broadmobi=disabled \ > + -Dplugin_cinterion=disabled \ > + -Dplugin_dell=disabled \ > + -Dplugin_dlink=disabled \ > + -Dplugin_fibocom=disabled \ > + -Dplugin_foxconn=disabled \ > + -Dplugin_gosuncn=disabled \ > + -Dplugin_haier=disabled \ > + -Dplugin_huawei=disabled \ > + -Dplugin_intel=disabled \ > + -Dplugin_iridium=disabled \ > + -Dplugin_linktop=disabled \ > + -Dplugin_longcheer=disabled \ > + -Dplugin_mbm=disabled \ > + -Dplugin_motorola=disabled \ > + -Dplugin_mtk=disabled \ > + -Dplugin_nokia=disabled \ > + -Dplugin_nokia_icera=disabled \ > + -Dplugin_novatel=disabled \ > + -Dplugin_novatel_lte=disabled \ > + -Dplugin_option=disabled \ > + -Dplugin_option_hso=disabled \ > + -Dplugin_pantech=disabled \ > + -Dplugin_qcom_soc=disabled \ > + -Dplugin_quectel=disabled \ > + -Dplugin_samsung=disabled \ > + -Dplugin_sierra_legacy=disabled \ > + -Dplugin_sierra=disabled \ > + -Dplugin_simtech=disabled \ > + -Dplugin_telit=disabled \ > + -Dplugin_thuraya=disabled \ > + -Dplugin_tplink=disabled \ > + -Dplugin_ublox=disabled \ > + -Dplugin_via=disabled \ > + -Dplugin_wavecom=disabled \ > + -Dplugin_x22x=disabled \ > + -Dplugin_zte=disabled > +endif > + You can disable all plugins altogether with "-Dauto_features=disabled"; it is the recommended way to do so in MM 1.20. But I wonder, is it only to have the build with static libs pass? MM 1.20 without plugins will not be usable at all, at least one plugin is required, so not sure how useful that is. In MM 1.22 (or git main) there is the new "-Dbuiltin_plugins=true" option that will embed all selected plugins within the ModemManager daemon binary itself. Cheers! From aperez at igalia.com Mon Feb 20 08:42:39 2023 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 20 Feb 2023 10:42:39 +0200 Subject: [Buildroot] [PATCH] package/wpewebkit: security bump to version 2.38.5 Message-ID: <20230220084239.3714786-1-aperez@igalia.com> Bugfix release, fixes zero-day CVE-2023-23529 and includes a few build and behaviour patches as well. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.5.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0002.html Signed-off-by: Adrian Perez de Castro --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index dcd082e045..0fa1018721 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums -md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz -sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz -sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.5.tar.xz.sums +md5 73f7abd0c1cc808032869f72602166e3 wpewebkit-2.38.5.tar.xz +sha1 3f10a04758eeb349f63f841aff765dae25bcde1b wpewebkit-2.38.5.tar.xz +sha256 ff00fd3d0a4c6d551850a78a7dfe4883b6b7ebd93c5549e1121b2f43d3ac1661 wpewebkit-2.38.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b9c2fef395..48e5c2f8cd 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.4 +WPEWEBKIT_VERSION = 2.38.5 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES -- 2.39.2 From thomas.petazzoni at bootlin.com Mon Feb 20 06:40:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 06:40:18 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-19 Message-ID: <20230220064026.151B540B90@smtp2.osuosl.org> Hello, Autobuild statistics for 2023-02-19 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 17 | 13 | 0 | 30 | master | 136 | 181 | 2 | 319 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 16 host-go-1.19.6 | 10 gobject-introspection-1.72.0 | 8 elfutils-0.186 | 7 host-binutils-2.38 | 5 libglib2-2.72.3 | 5 linux-6.1.11 | 5 unknown | 5 glibc-2.36-81-g4f4d7a13edfd... | 4 host-binutils-2.39 | 4 linux-5.10.162-cip24-rt10 | 4 perl-5.36.0 | 4 speechd-0.11.4 | 4 zabbix-6.2.7 | 4 busybox-1.36.0 | 3 libgpg-error-1.46 | 3 php-xdebug-3.0.4 | 3 python-numpy-1.23.5 | 3 alsa-lib-1.2.8 | 2 gitlab-runner-15.5.0 | 2 gobject-introspection | 2 host-binutils-2.37 | 2 host-pahole-1.24 | 2 host-rust-1.67.0 | 2 ipmiutil-3.1.8 | 2 ltp-testsuite-20220930 | 2 musl-1.2.3 | 2 olsr-0.9.8 | 2 sdl-1.2.15 | 2 systemd-252.4 | 2 uclibc-1.0.42 | 2 valgrind-3.19.0 | 2 xvisor-0.3.1 | 2 apcupsd-3.14.14 | 1 assimp-5.2.5 | 1 bind-9.16.33 | 1 binutils-arc-2020.09-release | 1 brltty-6.5 | 1 cairo-1.16.0 | 1 check-0.15.2 | 1 cmocka-1.1.5 | 1 cni-plugins-1.2.0 | 1 crucible-2022.05.25 | 1 cups-pk-helper-0.2.7 | 1 dhcp-4.4.3-P1 | 1 flannel-0.14.0 | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fstrcmp-0.7.D001 | 1 gerbera-1.10.0 | 1 heirloom-mailx-12.5 | 1 host-libarchive-3.6.2 | 1 jailhouse-0.12 | 1 libabseil-cpp-20220623.1 | 1 libdeflate-1.15 | 1 libgcrypt-1.10.1 | 1 libjxl-0.7.0 | 1 libmodsecurity-3.0.8 | 1 libnss-3.88.1 | 1 libsigsegv-2.14 | 1 linux-5.10.162-cip24 | 1 lpc32xxcdl-2.11 | 1 lttng-modules-2.13.7 | 1 mariadb-10.3.36 | 1 modem-manager-1.20.4 | 1 modsecurity2-2.9.7 | 1 netsurf-3.10 | 1 nginx-1.22.1 | 1 openblas-0.3.21 | 1 optee-client-3.19.0 | 1 php-8.2.2 | 1 python-orjson-3.8.4 | 1 quickjs-2021-03-27 | 1 rdma-core-44.0 | 1 ruby-3.1.3 | 1 tmux-3.3a | 1 traceroute-2.1.0 | 1 uboot-tools-2021.07 | 1 uqmi-0a19b5b77140465c29e2af... | 1 wireguard-linux-compat-1.0.... | 1 xenomai-3.0.10 | 1 znc-1.8.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | alsa-lib-1.2.8 | NOK | http://autobuild.buildroot.net/results/e77d4f2d89b90513e26f560faf2ae3e0775d9867 | or1k | alsa-lib-1.2.8 | NOK | http://autobuild.buildroot.net/results/17e310b976d3c88cc8485e6387a2ecac5b9d02b9 | arc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/30034a25058a58e4ce976450589f23414d484991 | mipsel | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/f5cc21f4707de9f538deb99462e056bdd41aa71f | ORPH sh4aeb | bind-9.16.33 | NOK | http://autobuild.buildroot.net/results/2fa8d661ce0c9395ed4b16b766c251d052328fd5 | ORPH arc | binutils-arc-2020.09-release | NOK | http://autobuild.buildroot.net/results/e6ef6d73ae4ce2508a21f88399e53ef29f07f953 | microblaze | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/e877c64022814a7e87cc0fb779ac2281daeead44 | arm | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/f71a895c40f684a8665969665ae66d2d436a14b5 | ORPH arm | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/19a2a7f501f08b168edfd698731e98130dcb94ce | ORPH mips64 | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/55ab67f8b605ec4e46ce75ec60f675c57bc059ea | ORPH aarch64 | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/57575c4208d30804ba6708f3c8212538678c9171 | mipsel | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/5e860ecddfa8e80d6baacb029167d9059a6f5ce9 | ORPH armeb | cmocka-1.1.5 | NOK | http://autobuild.buildroot.net/results/d940854294073cf6ff94d35369810731443cdab7 | s390x | cni-plugins-1.2.0 | NOK | http://autobuild.buildroot.net/results/48fdfea7436aa845a778d2b0de98cd1f0145008c | powerpc64le | crucible-2022.05.25 | NOK | http://autobuild.buildroot.net/results/80565f130b0250e13f28df065feed4e0b9fe2f33 | mips | cups-pk-helper-0.2.7 | NOK | http://autobuild.buildroot.net/results/2b0b01b26849427918f88d79858fb28762a409e9 | ORPH xtensa | dhcp-4.4.3-P1 | NOK | http://autobuild.buildroot.net/results/1169ecfc95f46d48ec7f1989a00bdfd7582997fe | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/e7efa8251502d48a04c12631db9f035b5c3902d0 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/6661d823edcd0e110f6088b08f48ceaa97e49aec | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/46396bb7b38ad211db25ff34d486a992e2f82dab | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/0783577b2ee0cb1a4dd4ca34928fbdc6a844e446 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/fe3a619d81b68cf1cbc9002337944f65da97842d | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/c5bd864fdb66d460920cd7a6643fd2979a81ea74 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/9da112fa5e327ceabec0ad54bc74667ff04d3013 | ORPH aarch64 | flannel-0.14.0 | NOK | http://autobuild.buildroot.net/results/7e487d61d5ca2743b6a2fcdbd20e82ca85152e08 | aarch64_be | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/09655c0239db56734d5e02121e4bca6a26d46409 | powerpc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/19135597a2b6e9ba3cf10fff8bbc9652449f75fc | mips | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/0adccc0e9884ef11edd4b1c1e5e03bd25267c3a6 | riscv64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/7d8f464031df91580c080688cdb069661a64ba9d | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/20c7a03966531675e6430e6642ca33e30f9bd009 | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/2f57e98633d0d02d6f9b1a4d111f0a09baf5d41f | aarch64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/52420685f2e7960aa95319a2c8f8b34f9e8315d3 | aarch64_be | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/453b069d076e86cb0f12fd5fdaf1eda7f2df83d9 | armeb | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/d04062bbd577f97d4dd3aaa3ab5f0c69dce42c86 | sh4aeb | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/479511a7ecd7132804d8aff2262b3b96e257c9aa | mipsel | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/a38f62deec8e30802bed40dcc9202cd5124857b2 | i686 | gitlab-runner-15.5.0 | NOK | http://autobuild.buildroot.net/results/e6800fd2ba542593d1dfd7ece64a5ccead33d84c | arm | gitlab-runner-15.5.0 | NOK | http://autobuild.buildroot.net/results/031c5178a46574aaf19bece23fc6c3417e46d448 | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/718dea23b00020806335853f7371fcda69fcf70d | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/040130cb75ee7228582fa15905ee3f8601bc0485 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/1f9e306beb1df5d6b144cc92fc4341e85eb1c586 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/cd6c325a6bc8c20092fd26442e0d6e038dea5b8d | or1k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/bca427c4ac05555314070e90138fa81843247df6 | sh4a | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/14a8163b3d3d7163dd9f07d6dcc73874315203c0 | powerpc | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/1e5faf936c358a1351a029c9c1d59818214fb940 | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/e837c78635cf3f74cadcf6ac647f49df579157a4 | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/81f2489ab125886612b0c7c34dcd0094a94eb336 | riscv32 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/37ca8cff0c90ef1b5ef19552c2937ca72244245f | sh4 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/d2dcb776ab257b72aa630281c2b53be17952dcd7 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/bffeebc83c3f17781b145da91676dd874aca891b | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/41e9e430f980709cfa74eafb9ff1365556d43bf1 | sh4a | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/efcd04496dc54c9db2bccfc264c19a013cf55204 | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ed6adca256fd4d5282f8d5771245e605a017ebb0 | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/79bdab498d611c6990c848ba7b905187901c7a11 | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/4bb28d54a9cc193c755643501d51d0cbe1598ebc | or1k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/cc640b7c2aba872cacf5e866b6d22bd10e045dab | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/45414f1030eafd39a268aabdb84b1ddf5c171161 | sparc | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/b473a55bc76fe9c8d402cc9a21297aef94f96e68 | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/b6b606618d74c0faa1624cd47e548cb1e8ea5cd1 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/cf77a3579a4c18e082d28a6109879aa056bd81f3 | or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/4d9b2450dae4846ad2613cbd81bfead48c50bac3 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/93059a5f66e6b3cf3779dd9345caf3502a53ff6d | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3d4311bb45b68dc009258d316f053828c0e7fb0b | ORPH sh4eb | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/c8693e29e917b47715263868299404012766a897 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7759bbe2d9edf8daa020e4a5d08dff417f41b56d | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/e9377d9950949bb87bbf79af2a297692af8d3ca8 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/152ecd4b7a1b219cb5ad7ce542a021abc534e687 | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/c0292713197e897bdc5ebea7592fa010f494185b | ORPH sh4eb | heirloom-mailx-12.5 | NOK | http://autobuild.buildroot.net/results/d4780c224d1e9ad2506364ecbd9e5c235e7b40a6 | powerpc64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/68533f21e728441a76f58dd14f11f7de250a1f62 | microblazeel | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/862c4edcb240e48c2dbccc14669672c73fc55993 | armeb | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/52523993ca67032051ebc937dbe3b333758b30c5 | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/0f6e55f1eaa17686d4d662aa67b3fff1d2adfe40 | or1k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/bae7c55560c3e108a6c24aa4edc0ab67939d7b2f | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/a647f8b97e98d593a246a0c4a570f97f28aba728 | mips64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/67b0e647156cae8e3e75a11295ac327457b1782b | mips64el | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/857f923a1716ba421d0df65f7ed765891c6b3190 | sh4eb | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/946e04319c6580840cdad1337934e1e82163ca53 | arceb | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/a7ea31fcb6b0b3cdd86fc9433bfbd72c2dc64238 | microblaze | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/7c922f644cbd1681e7b0c4b0d785891696c4694b | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/98e954edc6d27e55591e5a52f6616039ec408f94 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/b6b1bec8bc400f82a94ef546bdd131d138bdd347 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/037a50a07d02a44bde0f693eccb8d4ebb97dd490 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/ee505334ac261d4b7889b9a4efb762ae7df7fca7 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/bc1a8f571f1c88f96e627e269bebc9be07f18cbd | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/dda088eb1f43416e5eba0ddfa0d166193ee8c9ec | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/a486cf06e8786b2e31b49d3aef277d0d98ba1c62 | i586 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/bb5be2862e9c966d7f422d1620698044cadbe5e7 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/a81fbdac9c37ff246917e77879fcd3ea673d5c4b | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/72292f74c48044f3bf8d1df400d3d2988c51816c | sparc64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/452f239a590876c60adcaa6490621c529e66fd3b | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d87367b9a7c9079e87dfb996a16e40ad51a97c94 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/cdf30e4f23c8e74d164dbd823a4e042740a5d036 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/a5581177c35fbfcee41e28e8bbd226cb71d89345 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/2635bde5bd856a69db542fe66713f942c5f9cf9f | x86_64 | ipmiutil-3.1.8 | NOK | http://autobuild.buildroot.net/results/6b6ea2ddc29f112ba1e4a78f36c42b109a10cd3d | i586 | ipmiutil-3.1.8 | NOK | http://autobuild.buildroot.net/results/e9ff3bd08e106dc834968bf5e4296ce8299027f8 | x86_64 | jailhouse-0.12 | NOK | http://autobuild.buildroot.net/results/d62a535681de32882f24a5181a414f687ca052ee | mips64el | libabseil-cpp-20220623.1 | NOK | http://autobuild.buildroot.net/results/25a5bfa2ede8f94f61e9ffc04093ec820e79b289 | armeb | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/45225328f3ebdbf775a3d98c96831f1898de902e | armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/9ae272f6808f1d5524223e3914c902e5dac46e34 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/e25252e6522b254a5db6cc01ba477e1fb50d9933 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/06fad6fe850c77fce6c61d97d79a5efeb495fe5b | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/9cdcd6858395e35edce6ec161277c408a41cf575 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/2f29bc0c16ccdc06b41e05d3147eb09fdde14e2d | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/70b2a198525324277ac239d34d47d158968fb748 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/3400830ff0f2f961f0dd42239a4d3007c6ab7eb2 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/ba5b3384d6f6911c3806409fb080992bc72ef1e0 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/b56e51c23cb733da9ecd97a9205c49863df80bc9 | ORPH sparc | libjxl-0.7.0 | NOK | http://autobuild.buildroot.net/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 | powerpc64le | libmodsecurity-3.0.8 | NOK | http://autobuild.buildroot.net/results/4c235e46188f23d1a48297f4e5942cec7b25959a | powerpc64le | libnss-3.88.1 | NOK | http://autobuild.buildroot.net/results/e8d7b09f5d3ddaa3072f4b7fb9e4e2eb010708ea | arceb | libsigsegv-2.14 | NOK | http://autobuild.buildroot.net/results/a756d96821ca14bc087497ca893c1dc5e8a04f7a | powerpc | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/3f3626738ce82b9ebc63c08405528d7762edaed7 | ORPH sh4a | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/836f57706ff464a20f8e450ff8cc7a7b84358dd6 | ORPH powerpc | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/c71938ce28597ccef5f01add72bb9f1ea95724bd | ORPH mips64 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/7523f4d5e08bea64f30e75265767dbd9399549ad | ORPH nios2 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/61a2d206ac7b5d5a9c1890f532cce49b9f34c236 | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4250abc61638830c17fe1927054a7793ae115c2c | ORPH mips64el | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/cfcbc9b0b69e3151eff2574fe3fe0636f8ef0046 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/fb8416f94e2fd7c73b6c2a83cf4a544854e50a63 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/ffb474c2da32b1185c1e72fb71c5da413f2c44d4 | ORPH aarch64_be | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/f4404c101d790a8ced36f6715482bd90a8af3095 | ORPH arm | lpc32xxcdl-2.11 | NOK | http://autobuild.buildroot.net/results/46cca35e83c21117fa099813353c4369fce4890f | ORPH sparc64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/c2f3f9db51fa36dd7b9ecbd2ed028a1ae103db15 | powerpc64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/cb3adc16eaa4880fd8c34d132896845943e426c1 | arceb | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/b45faebac994378cf1d2ced9c76525225e106731 | sparc | mariadb-10.3.36 | NOK | http://autobuild.buildroot.net/results/97db9b9350d6ae639187b169ae6ce0eefc956203 | ORPH xtensa | modem-manager-1.20.4 | NOK | http://autobuild.buildroot.net/results/deb2a752accb021392bb9dc3d06b2b1bf151535c | mips64el | modsecurity2-2.9.7 | NOK | http://autobuild.buildroot.net/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/bc652c57de1ec51250219d5ccab118bf6eaecd77 | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/381f44e2a611bf0a710e52a080668719ce1e674d | arc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/0bdc44d0ed711438c83dae7e2f9863bc4a1dbfc6 | powerpc | nginx-1.22.1 | NOK | http://autobuild.buildroot.net/results/63c6a553b3223b7c05cb9cb7338d4826836e9987 | aarch64_be | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/1c246a7b6312337cb9a609be2797cb7e4df156ae | ORPH microblaze | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/025ba50e9a70255bca07d43e8402bf26dc23fbb2 | ORPH mips64 | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/c52262f4d8e8f56b3ecce93d91aa07439ae84ea1 | ORPH sparc | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/03a3f2269e403ba7a9d71fc8e82d297b754e1924 | aarch64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/0328c5f741098703ce3c36d0c6ab38a752fb71b3 | or1k | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/442e182c43511dcb026e1c12e456e43671d532b7 | armeb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/97bef2dfdc54036b180e8be82a20dd6607ef4f25 | mips64el | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/6ad13a85ceb32786d1796433ad15dabe0718dee2 | microblaze | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/21eb094f14fc5c1abcf6bfbc285e9dc6c8f4c1ab | x86_64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/dcdebe6b551c03f69e329621aca38a00ce4d9499 | powerpc64le | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/c16325d76b8a253961ee43c9d4fcb4ff5e6f9e7f | mips64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/4a2e41eaca34c784018300d6bfdd0e4544531446 | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/5bb7e57e14ce866044056e398d94664eb6afa16b | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/30a58fe0224888b3ba7513478e58535b5988bec1 | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/3aa43e0c6f785d05485dbdd8112a65f33a2e6c7f | mips | python-orjson-3.8.4 | NOK | http://autobuild.buildroot.net/results/70e373857799260339fcc752216e50d112f53383 | sh4aeb | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/0c0a21f3713aedf6c2779e7ec019a9ce38d02808 | microblazeel | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/18f6efa7f69bb90b4539d86201ca62604bc6da92 | arc | ruby-3.1.3 | NOK | http://autobuild.buildroot.net/results/c71496f9d37d6b2a97309da0b34962dc8a26983c | sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/2fb3246e2bd49e327a066d3811777db04dacdfe1 | ORPH sh4aeb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/64636dbdf44b40a64b998eb4fa7646f6bc92c6fd | ORPH or1k | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/0d18510e728e2e3b42abdc736ac5d2423fed16b2 | aarch64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/2f6c8b3674753d6a9f165117c70e7dad88505505 | armeb | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/69cd1680553f9dfda365eaef770d6d1bd92d137c | nios2 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/317b2a48cf986278fbe498c179afe1b5438ef699 | aarch64_be | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/efbc9d39fe9233b7532e5f43b5f4632b19c4a15c | powerpc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/86dceadac182e6e9f9c2e38ac0b1fe00e9e9b141 | aarch64 | tmux-3.3a | NOK | http://autobuild.buildroot.net/results/6e8523d8d514bf6d8fc3377d05e5edbe7fc2d5bb | powerpc64le | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/5f4d2733c45691b256840384fb16402befd856ef | sparc64 | uboot-tools-2021.07 | NOK | http://autobuild.buildroot.net/results/d86963ce0fa511954c3da23c226a2e46027123cd | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/625fcf01bcf283ae7529f90ad55bc84e75006ec7 | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/6149c8d8641b7a084b5c2f217e38ca592b5160fb | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/9eed5f583131d6b92613548f56e7e785fbe0bc25 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/06737aa4c1f68e5009db72b05a3eef461487f5ec | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/75eb256521c74212101d08cebdba47413ddf7531 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/e436c583ebe0e8d075509f54a1c428ff309952f1 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/1c779abdfb8b62da7f13cdfe5c06fd3530f43f61 | sh4a | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/a0af9d22c4594b9b618c443dc3e390ccb87e134e | ORPH mips64el | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/b44a35fedd5a41f61dfe41851c1eded5e7355f66 | ORPH mips64 | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/e3a35eec1b118ab411b797f91bb1f968d18fdc78 | ORPH aarch64_be | wireguard-linux-compat-1.0.... | NOK | http://autobuild.buildroot.net/results/dfd7d8acc4874e77043b0efcc7088fc8116225fa | nios2 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/f7d6a401eaa179d59843d531f568988cd7802b82 | aarch64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/29cb6ffd0b7e7af068e83d32214277b44266339c | aarch64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/25e7ab1e39b0cc352b472211c9d93301f8ff2de5 | aarch64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/68677fee0e9db08604dd467760675622afc69d57 | nios2 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/17c364d60e87ff13e67c210977455e0d170a58ba | i686 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/701b343b3b0d471c75899b61d02bd9d63a272247 | powerpc64le | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/8a49327e5ac4490e65d7c9f5188834fe241b0e55 | arm | znc-1.8.2 | NOK | http://autobuild.buildroot.net/results/8cc95aa53d2cad108873792ea8abf73cecb90f6b | Classification of failures by reason for 2022.11.x -------------------------------------------------- gobject-introspection-1.72.0 | 2 host-pahole-1.24 | 2 xz-5.2.7 | 2 fstrcmp-0.7.D001 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 host-binutils-2.38 | 1 host-go-1.19.5 | 1 python-numpy-1.23.4 | 1 unknown | 1 zstd-1.5.2 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- armeb | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/3685097c02223cd99520d6ad3154a15e164f41fa | arceb | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/9c3cd71b81f725083f230d4799109395bf988f2e | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/77da8330370d369556f186c476f1560fd8621595 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/74d94d64b1f10fc9d8157ac158390b965b8f15ba | ORPH x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1f871b15fd6cfa8e827bab57b6a152f800eac926 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/402514edb9fd0b4bdb93b7da13d4aa9cda62bd41 | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c2cf853a9bc42721c729e0a7f052988ca9561172 | nios2 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/87cd47f24b4859780bfde0cff937be7fc8e4f32b | arm | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/0f7879ff04e1cb3e6f4510aeb373355c7fdb33e5 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/cfb69b80e5c9add3bd6b1cbe708fdff498ea7088 | microblazeel | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/3142c0a1a5ed851ca7a9a5ba1463619684499b26 | ORPH microblazeel | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/11e98a0e34e965f029a9c9e9cce265fedd2e6d39 | ORPH microblazeel | zstd-1.5.2 | NOK | http://autobuild.buildroot.net/results/cc78293687bf615bb229514bb5e21d9eb8594e0e | Gitlab CI results for 2023-02-19 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestAarch64Pages64kGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542058 | ORPH TestAarch64Pages64kMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542059 | ORPH TestAarch64Pages64kuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542060 | ORPH TestClangCompilerRT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541819 | ORPH TestCrudiniPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541820 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541821 | ORPH ...rch64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542069 | ORPH ...tlinAarch64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542070 | ORPH ...arch64MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542071 | ORPH ...otlinAarch64MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542072 | ORPH ...ch64UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542073 | ORPH ...linAarch64UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542074 | ORPH ...h64beGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542075 | ORPH ...inAarch64beGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542076 | ORPH ...64beUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542077 | ORPH ...nAarch64beUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542078 | ORPH ...750dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542079 | ORPH ...nArcle750dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542080 | ORPH ...ehs38GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542081 | ORPH ...inArclehs38GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542082 | ORPH ...hs38UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542083 | ORPH ...nArclehs38UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542084 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542086 | ORPH ...mebv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542087 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542088 | ORPH ...rmebv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542089 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542090 | ORPH ...ebv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542091 | ORPH ...5eabiGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542092 | ORPH ...inArmv5eabiGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542093 | ORPH ...v5eabiMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542094 | ORPH ...linArmv5eabiMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542095 | ORPH ...eabiUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542096 | ORPH ...nArmv5eabiUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542097 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542098 | ORPH ...Armv6eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542099 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542100 | ORPH ...nArmv6eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542101 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542102 | ORPH ...rmv6eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542103 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542104 | ORPH ...Armv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542105 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542106 | ORPH ...nArmv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542107 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542108 | ORPH ...rmv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542112 | ORPH ...mv7mUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542113 | ORPH ...tlinArmv7mUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542115 | ORPH ...8xxxUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542117 | ORPH ...nM68k68xxxUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542118 | ORPH ...fireUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542119 | ORPH ...8kcoldfireUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542120 | ORPH ...azebeGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542121 | ORPH ...icroblazebeGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542122 | ORPH ...lazebeMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542123 | ORPH ...MicroblazebeMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542124 | ORPH ...zebeUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542125 | ORPH ...croblazebeUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542126 | ORPH ...azeelGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542128 | ORPH ...icroblazeelGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542129 | ORPH ...lazeelMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542130 | ORPH ...MicroblazeelMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542131 | ORPH ...zeelUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542132 | ORPH ...croblazeelUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542133 | ORPH ...ips32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542134 | ORPH ...otlinMips32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542135 | ORPH ...Mips32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542136 | ORPH ...ootlinMips32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542137 | ORPH ...ps32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542138 | ORPH ...tlinMips32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542139 | ORPH ...s32elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542140 | ORPH ...linMips32elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542141 | ORPH ...ps32elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542143 | ORPH ...tlinMips32elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542144 | ORPH ...32elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542145 | ORPH ...inMips32elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542146 | ORPH ...2r5elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542147 | ORPH ...nMips32r5elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542148 | ORPH ...32r5elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542149 | ORPH ...inMips32r5elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542150 | ORPH ...r5elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542151 | ORPH ...Mips32r5elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542152 | ORPH ...2r6elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542153 | ORPH ...nMips32r6elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542155 | ORPH ...32r6elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542156 | ORPH ...inMips32r6elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542157 | ORPH ...r6elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542158 | ORPH ...Mips32r6elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542159 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542160 | ORPH ...Mips64eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542161 | ORPH ...4eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542162 | ORPH ...nMips64eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542163 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542164 | ORPH ...ips64eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542165 | ORPH ...64n32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542166 | ORPH ...inMips64n32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542167 | ORPH ...s64n32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542169 | ORPH ...linMips64n32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542170 | ORPH ...4n32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542172 | ORPH ...nMips64n32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542173 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542174 | ORPH ...ps64r6eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542175 | ORPH ...6eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542176 | ORPH ...ips64r6eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542177 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542178 | ORPH ...s64r6eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542179 | ORPH ...Nios2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542180 | ORPH ...ootlinNios2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542181 | ORPH ...nriscGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542182 | ORPH ...linOpenriscGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542183 | ORPH ...enriscMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542184 | ORPH ...tlinOpenriscMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542185 | ORPH ...riscUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542186 | ORPH ...inOpenriscUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542187 | ORPH ...440fpGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542188 | ORPH ...owerpc440fpGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542189 | ORPH ...c440fpMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542190 | ORPH ...Powerpc440fpMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542191 | ORPH ...40fpUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542192 | ORPH ...werpc440fpUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542193 | ORPH ...e5500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542195 | ORPH ...erpc64e5500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542196 | ORPH ...e6500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542197 | ORPH ...erpc64e6500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542198 | ORPH ...4e6500MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542199 | ORPH ...werpc64e6500MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542200 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542201 | ORPH ...c64lepower8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542202 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542204 | ORPH ...pc64lepower8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542207 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542208 | ORPH ...rpc64power8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542209 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542210 | ORPH ...erpc64power8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542211 | ORPH ...300c3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542212 | ORPH ...werpce300c3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542213 | ORPH ...e300c3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542214 | ORPH ...owerpce300c3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542215 | ORPH ...00c3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542216 | ORPH ...erpce300c3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542217 | ORPH ...500mcGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542218 | ORPH ...werpce500mcGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542219 | ORPH ...e500mcMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542220 | ORPH ...owerpce500mcMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542221 | ORPH ...00mcUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542223 | ORPH ...erpce500mcUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542227 | ORPH ...lp32dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542232 | ORPH ...lp64dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542237 | ORPH ...iscv64lp64dGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542238 | ORPH ...4lp64dMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542239 | ORPH ...Riscv64lp64dMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542240 | ORPH ...p64dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542241 | ORPH ...scv64lp64dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542243 | ORPH ...0xz13GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542244 | ORPH ...linS390xz13GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542245 | ORPH ...Shsh4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542246 | ORPH ...ootlinShsh4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542247 | ORPH ...nShsh4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542248 | ORPH ...BootlinShsh4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542249 | ORPH ...hsh4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542250 | ORPH ...otlinShsh4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542251 | ORPH ...h4aebGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542252 | ORPH ...linShsh4aebGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542253 | ORPH ...sh4aebMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542254 | ORPH ...tlinShsh4aebMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542255 | ORPH ...arc64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542256 | ORPH ...tlinSparc64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542257 | ORPH ...rcv8UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542258 | ORPH ...linSparcv8UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542259 | ORPH ...X8664GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542260 | ORPH ...ootlinX8664GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542261 | ORPH ...nX8664MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542262 | ORPH ...BootlinX8664MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542263 | ORPH ...8664UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542264 | ORPH ...otlinX8664UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542265 | ORPH ...orei7GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542266 | ORPH ...X8664corei7GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542267 | ORPH ...corei7MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542268 | ORPH ...nX8664corei7MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542269 | ORPH ...rei7UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542270 | ORPH ...8664corei7UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542271 | ORPH ...664v2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542272 | ORPH ...tlinX8664v2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542273 | ORPH ...8664v2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542274 | ORPH ...otlinX8664v2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542275 | ORPH ...64v2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542276 | ORPH ...linX8664v2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542277 | ORPH ...664v3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542278 | ORPH ...tlinX8664v3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542279 | ORPH ...8664v3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542280 | ORPH ...otlinX8664v3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542281 | ORPH ...64v3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542283 | ORPH ...linX8664v3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542285 | ORPH ...664v4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542286 | ORPH ...tlinX8664v4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542287 | ORPH ...8664v4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542288 | ORPH ...otlinX8664v4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542289 | ORPH ...64v4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542290 | ORPH ...linX8664v4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542291 | ORPH ...core2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542292 | ORPH ...linX86core2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542293 | ORPH ...ToolchainBuildrootMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542061 | ORPH ...olchainBuildrootuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542062 | ORPH ...xternalToolchainCCache | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542063 | ORPH ...ernalToolchainCtngMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542064 | ORPH ...rnalToolchainLinaroArm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542065 | ORPH ...ToolchainSourceryArmv4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542066 | ORPH ...ToolchainSourceryArmv5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542067 | ORPH ...ToolchainSourceryArmv7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542068 | ORPH TestFileCapabilities | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541783 | ORPH TestGlibcAllTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541792 | ORPH ...DefaultLimitedTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541799 | ORPH TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541825 | ORPH TestInitSystemBusyboxRo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541815 | ORPH TestIso9660Grub2EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541802 | ORPH TestIso9660Grub2External | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541803 | ORPH ...0Grub2ExternalCompress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541804 | ORPH TestIso9660Grub2Hybrid | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541805 | ORPH TestIso9660Grub2Internal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541806 | ORPH ...so9660SyslinuxExternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541807 | ORPH ...slinuxExternalCompress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541808 | ORPH ...so9660SyslinuxInternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541810 | ORPH TestJffs2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541811 | ORPH TestLibshdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541827 | ORPH TestLuaLuaCffi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541844 | ORPH TestLuaLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541872 | ORPH TestLuaLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541864 | ORPH TestLuaLzlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541886 | ORPH TestLuaRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542037 | ORPH TestLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541833 | ORPH TestLuajitLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541846 | ORPH TestLuajitLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541875 | ORPH TestLuajitLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541861 | ORPH TestLuajitRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542038 | ORPH TestLuajitTurbolua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542049 | ORPH TestMender | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541887 | ORPH TestOci | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541813 | ORPH TestOpkg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541898 | ORPH TestPerlGDGraph | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541909 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541914 | ORPH TestPerlX10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541916 | ORPH TestPerllibwwwperl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541913 | ORPH TestPhpApcu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541918 | ORPH TestPhpLuaLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541919 | ORPH TestPhpLuaLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541920 | ORPH TestPhpPam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541921 | ORPH TestPhpPeclDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541922 | ORPH TestPolkitSystemd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541926 | ORPH TestPyNdiff | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541994 | ORPH TestPython3PyPyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541930 | ORPH TestPythonAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541935 | ORPH TestPythonAvro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541938 | ORPH TestPythonPahoMQTT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541978 | ORPH TestPythonPy3Autobahn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541936 | ORPH TestPythonPy3Automat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541937 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541939 | ORPH TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541940 | ORPH TestPythonPy3Botocore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541941 | ORPH TestPythonPy3Can | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541942 | ORPH TestPythonPy3Cbor | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541944 | ORPH TestPythonPy3Click | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541952 | ORPH TestPythonPy3Colorzero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541953 | ORPH TestPythonPy3Constantly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541954 | ORPH TestPythonPy3Construct | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541955 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541956 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541957 | ORPH TestPythonPy3DBusFast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541958 | ORPH TestPythonPy3DBusNext | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541959 | ORPH TestPythonPy3Dicttoxml2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541960 | ORPH TestPythonPy3Distro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541961 | ORPH TestPythonPy3Django | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541962 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541963 | ORPH TestPythonPy3Flask | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541964 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541965 | ORPH TestPythonPy3Git | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541966 | ORPH TestPythonPy3Gitdb2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541967 | ORPH TestPythonPy3GnuPG | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541968 | ORPH TestPythonPy3Gobject | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541969 | ORPH TestPythonPy3Gpiozero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541970 | ORPH TestPythonPy3Hkdf | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541971 | ORPH TestPythonPy3Incremental | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541972 | ORPH TestPythonPy3Iptables | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541973 | ORPH TestPythonPy3Jmespath | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541974 | ORPH ...PythonPy3MagicWormhole | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541975 | ORPH TestPythonPy3Munch | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541977 | ORPH TestPythonPy3Passlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541980 | ORPH TestPythonPy3Pexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541985 | ORPH TestPythonPy3PyAlsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541986 | ORPH TestPythonPy3Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541993 | ORPH TestPythonPy3Pytest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541995 | ORPH ...PythonPy3PytestAsyncio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541996 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541997 | ORPH TestPythonPy3Qrcode | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541998 | ORPH TestPythonPy3RSA | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542000 | ORPH TestPythonPy3RpiGpio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541999 | ORPH TestPythonPy3S3transfer | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542020 | ORPH TestPythonPy3SciPy | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542021 | ORPH ...thonPy3ServiceIdentity | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542022 | ORPH TestPythonPy3Smmap2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542025 | ORPH TestPythonPy3Spake2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542026 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542027 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542028 | ORPH TestPythonPy3Txaio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542029 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542030 | ORPH TestPythonPy3Ubjson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542031 | ORPH ...y3UnitTestXmlReporting | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542032 | ORPH TestPythonPy3rtoml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542006 | ORPH TestPythonPybind | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541992 | ORPH TestRdmaCore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542033 | ORPH TestRedis | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542034 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542039 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542040 | ORPH TestS6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542041 | ORPH TestS6Networking | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542042 | ORPH TestS6PortableUtils | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542043 | ORPH TestS6Rc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542044 | ORPH TestSudo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542045 | ORPH TestSyslogNg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542046 | ORPH TestTmux | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542047 | ORPH TestUbootOpensslPkgConfig | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542050 | ORPH TestZ3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542051 | ORPH TestZerofree | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542052 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542053 | ORPH TestZfsMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542054 | ORPH TestZfsUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542055 | ORPH Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.6 | 7.0.11 | ORPH acpica | DISTRO | https://release-monitoring.org/project/00018 | 20220331 | 20222010 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 43 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.5.4 | 4.6.0 | alfred | DISTRO | https://release-monitoring.org/project/241870 | 2022.1 | 2023.0 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 13.0.0_r31 | angularjs | DISTRO | https://release-monitoring.org/project/21321 | 1.8.2 | 1.8.3 | apitrace | DISTRO | https://release-monitoring.org/project/06170 | 10.0 | 11.1 | apr | DISTRO | https://release-monitoring.org/project/00095 | 1.7.0 | 1.7.2 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 12.0.0 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.29.1 | 20.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.46.0 | atkmm | DISTRO | https://release-monitoring.org/project/07962 | 2.36.1 | 2.36.2 | atop | DISTRO | https://release-monitoring.org/project/00135 | 2.8.0 | 2.8.1 | audit | DISTRO | https://release-monitoring.org/project/15225 | 3.0.7 | 3.1 | avocado | DISTRO | https://release-monitoring.org/project/13385 | 98.0 | 100.1 | avrdude | DISTRO | https://release-monitoring.org/project/10751 | 6.4 | 7.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_07_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.12.2 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 20.10.26 | 20.10.28 | bat | DISTRO | https://release-monitoring.org/project/241901 | 0.19.0 | 0.22.1 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2023.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2022.3 | 2023.0 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.8.2 | 1.9.0 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.2.23 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.2.23 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.2.23 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.5 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.38 | 2.40 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.11 | 2.0.12 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 24.0.1 | bluez5_utils | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bluez5_utils-headers | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH boost | DISTRO | https://release-monitoring.org/project/06845 | 1.80.0 | 1.81.0 | bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.2.3 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.16.2 | 6.1.3 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.21 | 3.25 | cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.8 | cairomm | DISTRO | https://release-monitoring.org/project/07959 | 1.16.1 | 1.16.2 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.7.4 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.5.0 | 1.5.2 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 3.9.1 | 4.2.1 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.15 | 7.0 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.18.0 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.8 | 1.0.1 | clang | DISTRO | https://release-monitoring.org/project/11811 | 11.1.0 | 15.0.7 | cli11 | DISTRO | https://release-monitoring.org/project/20578 | 2.3.1 | 2.3.2 | clinfo | DISTRO | https://release-monitoring.org/project/10503 | 3.0.21.02.21 | 3.0.23.01.25 | cloop | DISTRO | https://release-monitoring.org/project/21332 | 3.14.1.3 | 3.14.1.3+... | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.22.3 | 3.25.2 | collectl | DISTRO | https://release-monitoring.org/project/00330 | 4.3.2 | 4.3.8 | compiler-rt | GUESS | https://release-monitoring.org/project/17705 | 11.1.0 | 900 | ORPH containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.6.16 | 1.6.18 | crucible | DISTRO | https://release-monitoring.org/project/267616 | 2022.05.25 | 2022.12.06 | crudini | DISTRO | https://release-monitoring.org/project/21669 | 0.9.3 | 0.9.4 | crun | DISTRO | https://release-monitoring.org/project/96792 | 1.7.2 | 1.8 | cryptopp | DISTRO | https://release-monitoring.org/project/14487 | 8.6.0 | 8.7.0 | cukinia | DISTRO | https://release-monitoring.org/project/138119 | 0.6.0 | 0.6.1 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.16 | 1.28.17 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.7.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | dado | DISTRO | https://release-monitoring.org/project/58442 | 1.8.3-1 | 2.1.0-1 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.9 | 3.0.10 | dash | DISTRO | https://release-monitoring.org/project/00394 | 0.5.11.5 | 0.5.12 | ORPH datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.13.2 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.3.4 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.2.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.4.0 | dav1d | DISTRO | https://release-monitoring.org/project/18920 | 1.0.0 | 1.1.0 | dbus | DISTRO | https://release-monitoring.org/project/05356 | 1.12.24 | 1.14.6 | ORPH dbus-broker | DISTRO | https://release-monitoring.org/project/271475 | 32 | 33 | dbus-python | DISTRO | https://release-monitoring.org/project/00402 | 1.2.18 | 1.3.2 | ORPH dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH ddrescue | DISTRO | https://release-monitoring.org/project/00410 | 1.26 | 1.27 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.20.0 | 1.20.1 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20220117 | 1.3-20230209 | ORPH diffutils | DISTRO | https://release-monitoring.org/project/00436 | 3.8 | 3.9 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 23.0.0 | 23.0.1 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 2.15.1 | 2.16.0 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 23.0.0 | 23.0.1 | domoticz | DISTRO | https://release-monitoring.org/project/21342 | 2022.2 | 2023.1 | dos2unix | DISTRO | https://release-monitoring.org/project/00453 | 7.4.3 | 7.4.4 | dracut | DISTRO | https://release-monitoring.org/project/10627 | 057 | 059 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.21.4 | 9.23.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH dust | DISTRO | https://release-monitoring.org/project/141344 | 0.8.1 | 0.8.4 | ORPH e2fsprogs | DISTRO | https://release-monitoring.org/project/00646 | 1.46.5 | 1.47.0 | ORPH easy-rsa | DISTRO | https://release-monitoring.org/project/17770 | 3.1.1 | 3.1.2 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.18 | 1.19 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202211 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.1 | 1.26.3 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 21.12 | 23.01 | elfutils | DISTRO | https://release-monitoring.org/project/05679 | 0.186 | 0.188 | ORPH empty | DISTRO | https://release-monitoring.org/project/20564 | 0.6.22b | 0.6.23c | ORPH enchant | DISTRO | https://release-monitoring.org/project/06601 | 2.3.3 | 2.3.4 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.1 | 0.25.4 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 25.2.3 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.21 | 1.0.22 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.11.1 | 1.11.5 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.9.1 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.16 | 1.0.22 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.29 | 1.0.30 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.14 | 1.0.15 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.10 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.8 | 1.0.9 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.47 | 1.0.49 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.27 | 1.0.29 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.47 | 1.2.7 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.13 | 1.1.16 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.23 | 1.0.25 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.5.6 | 1.6.1 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.32 | 1.0.36 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.12 | 1.0.15 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.10 | 1.0.12 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.9.0.1 | 2.9.2.0 | exiv2 | DISTRO | https://release-monitoring.org/project/00769 | 0.27.5 | 0.27.6 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.30.1 | 1.31 | ORPH feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.9.1 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.35 | 6.4.36 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.3 | 5.1.2 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH file | DISTRO | https://release-monitoring.org/project/00807 | 5.43 | 5.44 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.33 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.21.2 | flashrom | DISTRO | https://release-monitoring.org/project/10202 | 1.2.1 | 1.3.0 | flatbuffers | DISTRO | https://release-monitoring.org/project/16642 | 2.0.8 | 23.1.21 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.4 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fmc | GUESS | https://release-monitoring.org/project/145761 | LSDK-21.08 | 0.2.0 | ORPH font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 6.3.0 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.14.2 | ORPH freeradius-server | DISTRO | https://release-monitoring.org/project/00853 | 3.2.0 | 3.2.2 | freetype | DISTRO | https://release-monitoring.org/project/00854 | 2.12.1 | 2.13.0 | fscryptctl | DISTRO | https://release-monitoring.org/project/270981 | 1.0.0 | 1.1.0 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 22.09.00 | 23.01.00 | gawk | DISTRO | https://release-monitoring.org/project/00868 | 5.2.0 | 5.2.1 | ORPH gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 4.0.0 | ORPH gdal | DISTRO | https://release-monitoring.org/project/00881 | 3.5.2 | 3.6.2 | gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.5.5 | 2.6.2 | gerbera | DISTRO | https://release-monitoring.org/project/18420 | 1.10.0 | 1.12.1 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.56.1 | 10.0.0 | gitlab-runner | DISTRO | https://release-monitoring.org/project/11337 | 15.5.0 | 15.9.0 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.1 | 2.74.0 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.74.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.10.4.0 | 3.10.5.1 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.8 | 3.8.0 | ORPH go | DISTRO | https://release-monitoring.org/project/01227 | 1.19.6 | 1.20.1 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.72.0 | 1.74.0 | ORPH gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.9 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 7.1.0 | ORPH grantlee | DISTRO | https://release-monitoring.org/project/21448 | 5.2.0 | 5.3.1 | graphicsmagick | DISTRO | https://release-monitoring.org/project/01248 | 1.3.38 | 1.3.40 | grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.51.1 | 1.52.1 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 43.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gssdp | DISTRO | https://release-monitoring.org/project/01262 | 1.4.0.1 | 1.6.2 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.1.0 | gst1-shark | DISTRO | https://release-monitoring.org/project/21854 | v0.7.5 | 0.8.1 | gtest | DISTRO | https://release-monitoring.org/project/18290 | 1.12.1 | 1.13.0 | gtkmm3 | DISTRO | https://release-monitoring.org/project/311572 | 3.22.0 | 3.24.7 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.6.2 | guile | DISTRO | https://release-monitoring.org/project/01277 | 3.0.8 | 3.0.9 | gupnp | DISTRO | https://release-monitoring.org/project/01281 | 1.4.3 | 1.6.3 | gupnp-av | DISTRO | https://release-monitoring.org/project/01282 | 0.14.0 | 0.14.1 | gupnp-tools | DISTRO | https://release-monitoring.org/project/01284 | 0.10.3 | 0.12.0 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.50.3 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2022.09.1 | 2023.01.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.6.5 | 2.7.3 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 5.3.1 | 7.0.0 | heimdal | DISTRO | https://release-monitoring.org/project/01307 | 7.7.1 | 7.8.0 | ORPH hiawatha | DISTRO | https://release-monitoring.org/project/13375 | 11.2 | 11.3 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.13.1 | ORPH highway | DISTRO | https://release-monitoring.org/project/205809 | 1.0.2 | 1.0.3 | hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.22.10 | ORPH htop | DISTRO | https://release-monitoring.org/project/01332 | 3.2.1 | 3.2.2 | ORPH htpdate | DISTRO | https://release-monitoring.org/project/132187 | 1.3.6 | 1.3.7 | hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.365 | 0.367 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.8.0 | 2.9.0 | hyperfine | DISTRO | https://release-monitoring.org/project/18526 | 1.14.0 | 1.15.0 | ORPH i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.43.0 | 2.46.0 | ibm-sw-tpm2 | DISTRO | https://release-monitoring.org/project/18952 | 1661 | 1682 | icu | DISTRO | https://release-monitoring.org/project/16134 | 70-1 | 72-1 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.41 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-51 | 7.1.0-62 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.10.0 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.6.0 | ORPH intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 23.1.0 | 23.1.1 | intel-mediasdk | DISTRO | https://release-monitoring.org/project/21814 | 23.1.0 | 23.1.1 | intel-microcode | DISTRO | https://release-monitoring.org/project/20614 | 20221108 | 20230214 | iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.493 | 3.494 | iperf3 | DISTRO | https://release-monitoring.org/project/01389 | 3.12 | 3.13 | ORPH ipset | DISTRO | https://release-monitoring.org/project/01393 | 7.16 | 7.17 | irqbalance | DISTRO | https://release-monitoring.org/project/01402 | 1.9.0 | 1.9.2 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | irssi | DISTRO | https://release-monitoring.org/project/01404 | 1.4.2 | 1.4.3 | jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.21 | 1.9.22 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 1.1.1 | 1.1.2 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 4.0.0 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.6 | 1.9 | jpeg-turbo | DISTRO | https://release-monitoring.org/project/01648 | 2.1.4 | 2.1.5.1 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.13.1 | 1.13.2 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.2 | jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.10.0 | 3.10.1 | kexec | DISTRO | https://release-monitoring.org/project/12689 | 2.0.25 | 2.0.26 | ORPH kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kodi | DISTRO | https://release-monitoring.org/project/20547 | 19.5-Matrix | 20.0-Nexus | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.7-Ma... | 20.3.3-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.3-Ma... | 20.5.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-jsonschemabuilder | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.4-Ma... | 20.1.5-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.5-Ma... | 20.1.3-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.1-Ma... | 20.5.0-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.6-Ma... | 20.6.1-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.2.2-Ma... | 21.1.0-Omega | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.11-M... | 20.3.2-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.6-Ma... | 20.4.0-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.3.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.4.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.3.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.4-Ma... | 20.3.1-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 21.1.0-Omega | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.5-Ma... | 20.4.0-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.1-Ma... | 21.1.0-Omega | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.3.1-Ma... | 21.1.0-Omega | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.16-M... | 20.3.5-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-texturepacker | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.2.0-Ma... | 20.3.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.2-Ma... | 20.1.1-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.3-Ma... | 20.2.1-Nexus | ksmbd-tools | DISTRO | https://release-monitoring.org/project/241856 | 3.4.6 | 3.4.7 | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 2.1.0 | 2.2.0 | lapack | DISTRO | https://release-monitoring.org/project/01534 | 3.10.1 | 3.11.0 | leafpad | DISTRO | https://release-monitoring.org/project/01544 | 0.8.18.1 | 0.8.19 | ORPH lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.3 | 0.3.95 | leptonica | DISTRO | https://release-monitoring.org/project/01549 | 1.82.0 | 1.83.0 | less | DISTRO | https://release-monitoring.org/project/01550 | 590 | 627 | ORPH libabseil-cpp | DISTRO | https://release-monitoring.org/project/115295 | 20220623.1 | 20230125.1 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.26 | 2.28-1 | ORPH libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.7 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.65 | 2.67 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 3.0.0 | libcurl | DISTRO | https://release-monitoring.org/project/00381 | 7.87.0 | 7.88.0 | libdeflate | DISTRO | https://release-monitoring.org/project/242778 | 1.15 | 1.17 | libdnet | DISTRO | https://release-monitoring.org/project/06308 | 1.16.1 | 1.16.3 | ORPH libebml | DISTRO | https://release-monitoring.org/project/07879 | 1.4.2 | 1.4.4 | libedit | DISTRO | https://release-monitoring.org/project/01599 | 20210910-3.1 | 20221030-3.1 | libevdev | DISTRO | https://release-monitoring.org/project/20540 | 1.12.1 | 1.13.0 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.14.0 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.40.0 | ORPH libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.72.3 | 2.74.5 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.4.0 | 1.6.0 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.17.1 | 1.18.0 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.30 | ORPH libgpiod | DISTRO | https://release-monitoring.org/project/20640 | 1.6.3 | 1.6.4 | ORPH libgsasl | DISTRO | https://release-monitoring.org/project/01563 | 1.10.0 | 2.2.0 | ORPH libgsm | DISTRO | https://release-monitoring.org/project/12587 | 1.0.19 | 1.0.22 | libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.8.3 | libhtp | DISTRO | https://release-monitoring.org/project/01632 | 0.5.40 | 0.5.42 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.40 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.16 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.17 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.2 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.20.1 | 1.22.1 | libjxl | DISTRO | https://release-monitoring.org/project/232764 | 0.7.0 | 0.8.1 | liblinear | DISTRO | https://release-monitoring.org/project/21363 | 2.45 | 2.46 | libmatroska | DISTRO | https://release-monitoring.org/project/01657 | 1.6.3 | 1.7.1 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.14 | 0.12.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.8 | 3.1.10 | libmodplug | DISTRO | https://release-monitoring.org/project/05669 | d1b97ed | 0.8.9.0 | ORPH libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.10 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.2 | ORPH libnftnl | DISTRO | https://release-monitoring.org/project/01681 | 1.2.3 | 1.2.4 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.2.2 | 5.0.0 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.14 | libostree | DISTRO | https://release-monitoring.org/project/10899 | 2022.7 | 2023.1 | libpam-tacplus | DISTRO | https://release-monitoring.org/project/20537 | 1.6.1 | 1.7.0 | ORPH libpcap | DISTRO | https://release-monitoring.org/project/01702 | 1.10.2 | 1.10.3 | libpeas | DISTRO | https://release-monitoring.org/project/06871 | 1.32.0 | 1.34.0 | ORPH libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.7.4 | libqrtr-glib | DISTRO | https://release-monitoring.org/project/192056 | 1.0.0 | 1.2.2 | librelp | DISTRO | https://release-monitoring.org/project/01713 | 1.10.0 | 1.11.0 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.54.5 | librsync | DISTRO | https://release-monitoring.org/project/06309 | 2.3.2 | 2.3.4 | librtas | DISTRO | https://release-monitoring.org/project/10717 | 2.0.3 | 2.0.4 | ORPH libselinux | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsolv | DISTRO | https://release-monitoring.org/project/07908 | 0.7.22 | 0.7.23 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.2 | 3.2.2 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.2 | 2.5.0 | libtalloc | DISTRO | https://release-monitoring.org/project/01733 | 2.3.4 | 2.4.0 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH libtool | DISTRO | https://release-monitoring.org/project/01741 | 2.4.6 | 2.4.7 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.8 | libucl | DISTRO | https://release-monitoring.org/project/21371 | 0.8.1 | 0.8.2 | libupnp | DISTRO | https://release-monitoring.org/project/21315 | 1.14.13 | 1.14.15 | libupnpp | DISTRO | https://release-monitoring.org/project/15849 | 0.21.0 | 0.22.4 | ORPH liburcu | DISTRO | https://release-monitoring.org/project/07134 | 0.13.2 | 0.14.0 | liburing | DISTRO | https://release-monitoring.org/project/230185 | 2.2 | 2.3 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.14.1 | libvirt | DISTRO | https://release-monitoring.org/project/13830 | 7.10.0 | 9.0.0 | libvpx | DISTRO | https://release-monitoring.org/project/11083 | 1.12.0 | 1.13.0 | libwpe | DISTRO | https://release-monitoring.org/project/17789 | 1.14.0 | 1.14.1 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.29 | 4.4.33 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.4.0 | 1.5.0 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.54.06 | lightning | DISTRO | https://release-monitoring.org/project/01816 | 2.2.0 | 2.2.1 | lilv | DISTRO | https://release-monitoring.org/project/01818 | 0.24.12 | 0.24.20 | links | DISTRO | https://release-monitoring.org/project/01822 | 2.26 | 2.28 | ORPH linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.10 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20221214 | 20230210 | liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.4.0 | 1.5.0 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2023.01.19 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.15 | 1.0.16 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.13.0 | 1.0.0 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.20.1 | 3.21.0 | ORPH lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | lsof | DISTRO | https://release-monitoring.org/project/01844 | 4.96.5 | 4.98.0 | ORPH ltp-testsuite | DISTRO | https://release-monitoring.org/project/21502 | 20220930 | 20230127 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.6 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.11 | lttng-libust | DISTRO | https://release-monitoring.org/project/07135 | 2.13.1 | 2.13.5 | lttng-modules | DISTRO | https://release-monitoring.org/project/07141 | 2.13.7 | 2.13.8 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.8 | 2.13.9 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luarocks | DISTRO | https://release-monitoring.org/project/01856 | 3.9.1 | 3.9.2 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.43.0-0 | 1.44.2-1 | ORPH luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.13.0 | 2.14.0 | ORPH lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.18 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzma-alone | DISTRO | https://release-monitoring.org/project/242840 | 9.22 | 2201 | ORPH lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.4 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.36 | 10.11.2 | ORPH mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.2 | 3.3.0 | mc | DISTRO | https://release-monitoring.org/project/01954 | 4.8.28 | 4.8.29 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.6.0 | 0.1.6.2 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.2.23 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.17 | 1.6.18 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 6.10 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 22.3.4 | 22.3.5 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 22.3.4 | 22.3.5 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.46.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | minizip | DISTRO | https://release-monitoring.org/project/301509 | 3.0.7 | 3.0.8 | moby-buildkit | DISTRO | https://release-monitoring.org/project/20836 | 0.11.2 | 0.11.3 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.20.4 | 1.21.2 | modsecurity2 | DISTRO | https://release-monitoring.org/project/68638 | 2.9.7 | 3.0.8 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 6.2.0 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.8 | 7.9 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.33.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.182 | 6.12.0.190 | mp4v2 | DISTRO | https://release-monitoring.org/project/98413 | 2.1.1 | 2.1.2 | ORPH mpc | DISTRO | https://release-monitoring.org/project/01667 | 1.2.1 | 1.3.1 | ORPH mpfr | DISTRO | https://release-monitoring.org/project/02019 | 4.1.1 | 4.2.0 | ORPH mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.31.2 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.35.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 5.0.0 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.22 | 1.8.23 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.38 | 4.0.42 | ORPH ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.18 | 2.2.2 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.3-20221224 | 6.4-20230218 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.32.4 | 0.32.5 | ORPH netatalk | DISTRO | https://release-monitoring.org/project/02063 | 3.1.13 | 3.1.14 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | 1.218 | 1.219 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.33.1 | 1.38.1 | network-manager | DISTRO | https://release-monitoring.org/project/21197 | 1.40.10 | 1.42.0 | ORPH networkd-dispatcher | DISTRO | https://release-monitoring.org/project/242008 | 2.2.3 | 2.2.4 | newt | DISTRO | https://release-monitoring.org/project/15129 | 0.52.21 | 0.52.23 | ORPH nftables | DISTRO | https://release-monitoring.org/project/02082 | 1.0.5 | 1.0.6 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.52.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.22.1 | 1.23.3 | ninja | DISTRO | https://release-monitoring.org/project/02089 | 1.11.1.g9... | 1.11.1 | nmap | DISTRO | https://release-monitoring.org/project/02096 | 7.92 | 7.93 | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 16.18.1 | 19.6.1 | noip | DISTRO | https://release-monitoring.org/project/21539 | 2.1.9 | 3.0.0 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.151 | 390.157 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 525.89.02 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 2.3 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.34 | 2.0 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.6.2 | openal | DISTRO | https://release-monitoring.org/project/08172 | 1.22.0 | 1.23.0 | ORPH opencl-clhpp | DISTRO | https://release-monitoring.org/project/271141 | 2.0.16 | 2023.02.06 | opencore-amr | DISTRO | https://release-monitoring.org/project/21548 | 0.1.5 | 0.1.6 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.19 | 4.7.0 | opencv4 | DISTRO | https://release-monitoring.org/project/06615 | 4.6.0 | 4.7.0 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.10.0 | openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.14.1+1 | 21+10 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.4 | ORPH openocd | DISTRO | https://release-monitoring.org/project/02557 | 0.11.0 | 0.12.0 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.46 | opensc | DISTRO | https://release-monitoring.org/project/02559 | 0.22.0 | 0.23.0 | openssh | DISTRO | https://release-monitoring.org/project/02565 | 9.1p1 | 9.2p1 | ORPH openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 11.3.5-18... | 12.1.5 | openvpn | DISTRO | https://release-monitoring.org/project/02567 | 2.5.7 | 2.6.0 | ORPH opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.6.1 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.19.0 | 3.20.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.19.0 | 3.20.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.19.0 | 3.20.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.19.0 | 3.20.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.32 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.2.23 | ORPH osm2pgsql | DISTRO | https://release-monitoring.org/project/02575 | 1.8.0 | 1.8.1 | paho-mqtt-c | DISTRO | https://release-monitoring.org/project/21375 | 1.3.11 | 1.3.12 | pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.1 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.13 | 0.17.2 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.7 | ORPH pciutils | DISTRO | https://release-monitoring.org/project/02605 | 3.8.0 | 3.9.0 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202212 | ORPH pdbg | DISTRO | https://release-monitoring.org/project/21378 | 3.5 | 3.6 | perl-class-method-modifiers | DISTRO | https://release-monitoring.org/project/06735 | 2.13 | 2.14 | perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.89 | 6.90 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-file-sharedir-install | DISTRO | https://release-monitoring.org/project/11851 | 0.13 | 0.14 | perl-gdgraph | DISTRO | https://release-monitoring.org/project/09187 | 1.54 | 1.56 | perl-html-parser | DISTRO | https://release-monitoring.org/project/02967 | 3.80 | 3.81 | perl-image-exiftool | DISTRO | https://release-monitoring.org/project/06175 | 12.50 | 12.56 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.080 | 2.081 | perl-json-maybexs | DISTRO | https://release-monitoring.org/project/11953 | 1.004003 | 1.004004 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20220520 | 1.20230212 | perl-mime-tools | DISTRO | https://release-monitoring.org/project/11809 | 5.509 | 5.510 | perl-mojolicious-plugin-aut... | DISTRO | https://release-monitoring.org/project/21729 | 1.37 | 1.39 | perl-moo | DISTRO | https://release-monitoring.org/project/03123 | 2.005004 | 2.005005 | perl-net-ssh2 | DISTRO | https://release-monitoring.org/project/03163 | 0.72 | 0.73 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.93_01 | 1.92 | perl-package-stash | DISTRO | https://release-monitoring.org/project/11885 | 0.39 | 0.40 | perl-plack | DISTRO | https://release-monitoring.org/project/06578 | 1.0048 | 1.0050 | perl-sub-install | DISTRO | https://release-monitoring.org/project/03345 | 0.928 | 0.929 | perl-sub-quote | DISTRO | https://release-monitoring.org/project/12678 | 2.006006 | 2.006008 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-type-tiny | DISTRO | https://release-monitoring.org/project/14406 | 1.012004 | 2.002001 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0208 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.22 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-memcached | DISTRO | https://release-monitoring.org/project/17400 | 3.1.5 | 3.2.0 | ORPH php-pam | DISTRO | https://release-monitoring.org/project/241707 | 2.2.3 | 2.2.4 | php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.2.0 | pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.65 | 0.3.66 | pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.9.4 | ORPH pngquant | DISTRO | https://release-monitoring.org/project/03674 | 2.17.0 | 3.0.1 | poco | DISTRO | https://release-monitoring.org/project/05418 | 1.12.2 | 1.12.4 | policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 22.10.0 | 23.02.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.10 | 1.3.11 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.15 | privoxy | DISTRO | https://release-monitoring.org/project/03712 | 3.0.33 | 3.0.34 | ORPH procps-ng | DISTRO | https://release-monitoring.org/project/03708 | 3.3.17 | 4.0.3 | ORPH proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 9.1.1 | prosody | DISTRO | https://release-monitoring.org/project/03709 | 0.11.14 | 0.12.2 | protobuf | DISTRO | https://release-monitoring.org/project/03715 | 21.12 | 22.0 | pru-software-support | DISTRO | https://release-monitoring.org/project/21825 | 6.0.1 | 6.1.0 | psmisc | DISTRO | https://release-monitoring.org/project/03721 | 23.5 | 23.6 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH putty | DISTRO | https://release-monitoring.org/project/05749 | 0.76 | 0.78 | python-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.5.1 | 0.6.0 | python-aiofiles | DISTRO | https://release-monitoring.org/project/12743 | 22.1.0 | 23.1.0 | python-aiohttp | DISTRO | https://release-monitoring.org/project/06713 | 3.8.3 | 3.8.4 | python-aiohttp-jinja2 | DISTRO | https://release-monitoring.org/project/21247 | 1.5 | 1.5.1 | python-alembic | DISTRO | https://release-monitoring.org/project/03766 | 1.9.1 | 1.9.4 | python-argh | DISTRO | https://release-monitoring.org/project/09299 | 0.26.2 | 0.28.1 | python-async-lru | DISTRO | https://release-monitoring.org/project/56566 | 1.0.3 | 2.0.0 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 22.12.1 | 23.1.2 | python-beautifulsoup4 | DISTRO | https://release-monitoring.org/project/03779 | 4.11.1 | 4.11.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.26.45 | 1.26.74 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.29.45 | 1.29.74 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.6.1 | python-cryptography | DISTRO | https://release-monitoring.org/project/05532 | 39.0.0 | 39.0.1 | python-dbus-fast | DISTRO | https://release-monitoring.org/project/287975 | 1.84.0 | 1.84.1 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 4.1.5 | 4.1.7 | python-dnspython | DISTRO | https://release-monitoring.org/project/13190 | 2.2.1 | 2.3.0 | python-dtschema | DISTRO | https://release-monitoring.org/project/100908 | 2022.12 | 2023.1 | python-esptool | DISTRO | https://release-monitoring.org/project/11619 | 4.4 | 4.5 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 2.2.2 | 2.2.3 | python-flask-babel | DISTRO | https://release-monitoring.org/project/20024 | 2.0.0 | 3.0.1 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 3.0.2 | 3.0.3 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 1.0.1 | 1.1.1 | python-flatbuffers | DISTRO | https://release-monitoring.org/project/85010 | 2.0.7 | 23.1.21 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.31 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.10 | python-hatchling | DISTRO | https://release-monitoring.org/project/185085 | 1.12.2 | 1.13.0 | python-hiredis | DISTRO | https://release-monitoring.org/project/12002 | 2.0.0 | 2.2.2 | python-iptables | DISTRO | https://release-monitoring.org/project/11475 | 1.0.0 | 1.0.1 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 8.8.0 | 8.10.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.6 | 2.4.8 | python-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.1.1 | 2.1.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.7.0 | python-maturin | DISTRO | https://release-monitoring.org/project/42653 | 0.14.9 | 0.14.13 | python-mbstrdecoder | DISTRO | https://release-monitoring.org/project/21702 | 1.1.1 | 1.1.2 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 2.0.4 | 2.0.5 | python-modbus-tk | DISTRO | https://release-monitoring.org/project/22813 | 1.1.2 | 1.1.3 | python-mpd2 | DISTRO | https://release-monitoring.org/project/19721 | 3.0.5 | 3.1.0 | python-mypy-extensions | DISTRO | https://release-monitoring.org/project/23367 | 0.4.3 | 1.0.0 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.23.5 | 1.24.2 | python-orjson | DISTRO | https://release-monitoring.org/project/31737 | 3.8.4 | 3.8.6 | python-packaging | DISTRO | https://release-monitoring.org/project/11718 | 22.0 | 23.0 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.12.0 | 3.0.0 | python-pathspec | DISTRO | https://release-monitoring.org/project/15607 | 0.10.3 | 0.11.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.11.0 | 5.11.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 22.3.1 | 23.0.1 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 21.12 | 22.0 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.16.0 | 3.17 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.10.4 | 1.10.5 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.3 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 3.0.2 | 3.1.3 | python-pypa-build | DISTRO | https://release-monitoring.org/project/132276 | 0.9.0 | 0.10.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.15.6 | 5.15.9 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.7.3 | 0.7.5 | python-pysmb | DISTRO | https://release-monitoring.org/project/21589 | 1.2.9 | 1.2.9.1 | python-pyspnego | DISTRO | https://release-monitoring.org/project/107092 | 0.7.0 | 0.8.0 | python-pytest | DISTRO | https://release-monitoring.org/project/03765 | 7.2.0 | 7.2.1 | python-pythran | DISTRO | https://release-monitoring.org/project/21140 | 0.12.0 | 0.12.1 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2022.7 | 2022.7.1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 24.0.1 | 25.0.0b1 | python-qrcode | DISTRO | https://release-monitoring.org/project/20011 | 7.3.1 | 7.4.2 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 4.4.0 | 4.5.1 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.28.1 | 2.28.2 | python-rtoml | DISTRO | https://release-monitoring.org/project/62048 | 0.8.0 | 0.9.0 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-scipy | DISTRO | https://release-monitoring.org/project/04768 | 1.8.1 | 1.10.0 | python-selenium | DISTRO | https://release-monitoring.org/project/05645 | 4.8.0 | 4.8.2 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.12.1 | 1.15.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 65.6.3 | 67.3.2 | python-sh | DISTRO | https://release-monitoring.org/project/10429 | 1.14.3 | 2.0.2 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.18.1 | 3.18.3 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.19.25 | 6.7.7 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.3.2.post1 | 2.4 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.4.42 | 2.0.4 | python-systemd | DISTRO | https://release-monitoring.org/project/07314 | 234 | 235 | python-tabledata | DISTRO | https://release-monitoring.org/project/21613 | 1.3.0 | 1.3.1 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 5.2.0 | 5.2.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.4 | 1.1.6 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.8.0 | 5.9.0 | python-txaio | DISTRO | https://release-monitoring.org/project/07202 | 22.2.1 | 23.1.1 | python-txtorcon | DISTRO | https://release-monitoring.org/project/19661 | 22.0.0 | 23.0.0 | python-typeguard | DISTRO | https://release-monitoring.org/project/38819 | 2.13.3 | 3.0.0b2 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 4.4.0 | 4.5.0 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.13 | 1.26.14 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.2.5 | 0.2.6 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 57.2 | 58.0b1 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.23.0 | 2.23.1 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 1.4.2 | 1.5.1 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 2.2.2 | 2.2.3 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.32 | 0.33 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.6 | 3.0.8 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.39.4 | 0.47.3 | python-zlmdb | DISTRO | https://release-monitoring.org/project/66674 | 22.6.1 | 23.1.1 | qcom-db410c-firmware | DISTRO | https://release-monitoring.org/project/235382 | 1034.2.1 | 1036.1 | qlibc | DISTRO | https://release-monitoring.org/project/21737 | 2.4.7 | 2.4.8 | ORPH qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 11.2.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.38.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.8 | 6.4.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.3 | 1.4 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-c | DISTRO | https://release-monitoring.org/project/13768 | 0.11.0 | 0.13.0 | ragel | DISTRO | https://release-monitoring.org/project/12105 | 6.10 | 7.0.4 | ORPH ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | raspberrypi-usbboot | DISTRO | https://release-monitoring.org/project/115700 | 2021.07.01 | 20221215-... | ORPH redis | DISTRO | https://release-monitoring.org/project/04181 | 7.0.7 | 7.0.8 | refpolicy | DISTRO | https://release-monitoring.org/project/21663 | 2.20220106 | 2.20221101 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.5 | 2.0.1 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 7.9.2 | rrdtool | DISTRO | https://release-monitoring.org/project/04214 | 1.7.2 | 1.8.0 | ORPH rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2204.1 | 8.2212.0 | ORPH rt-tests | DISTRO | https://release-monitoring.org/project/59450 | 2.4 | 2.5 | rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.1.0 | ruby | DISTRO | https://release-monitoring.org/project/04223 | 3.1.3 | 3.2.1 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.67.0 | 1.67.1 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.67.0 | 1.67.1 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.42.1 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.11.1.2 | 2.11.3.0 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.4 | 2.3.5.5 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.8.0 | 1.1.0.0 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.6.0.0 | 2.6.1.0 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.5.1.1 | 2.5.1.3 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.5.0 | 2.3.0.0 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.3.2 | 0.5.4.0 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.12 | 4.17.5 | sane-backends | DISTRO | https://release-monitoring.org/project/04760 | 1.1.1 | 1.2.1 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.4.0 | sdl2_image | DISTRO | https://release-monitoring.org/project/04781 | 2.6.2 | 2.6.3 | sdl2_mixer | DISTRO | https://release-monitoring.org/project/04782 | 2.0.4 | 2.6.3 | ORPH sdl2_net | DISTRO | https://release-monitoring.org/project/04783 | 2.0.1 | 2.2.0 | ORPH sdl2_ttf | DISTRO | https://release-monitoring.org/project/04784 | 2.20.1 | 2.20.2 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdl_sound | DISTRO | https://release-monitoring.org/project/10262 | 1.0.3 | 2.0.1 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | selinux-python | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | semodule-utils | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | ORPH sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 2.8.0 | 2.13.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.6.0 | ser2net | DISTRO | https://release-monitoring.org/project/21655 | 4.3.8 | 4.3.11 | serd | DISTRO | https://release-monitoring.org/project/230531 | 0.30.14 | 0.30.16 | setools | DISTRO | https://release-monitoring.org/project/08951 | 4.4.0 | 4.4.1 | ORPH shairport-sync | DISTRO | https://release-monitoring.org/project/21384 | 3.3.9 | 4.1.1 | ORPH shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.2 | ORPH shim | DISTRO | https://release-monitoring.org/project/10719 | 15.4 | 15.7 | signal-estimator | DISTRO | https://release-monitoring.org/project/284559 | v0.0.4 | 0.0.5 | ORPH sispmctl | DISTRO | https://release-monitoring.org/project/21653 | 4.9 | 4.10 | skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.12.0.1 | 2.13.1.0 | snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.10 | 3.5.0 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.40.0 | 3.1.55.0 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.12 | 1.13.13 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sord | DISTRO | https://release-monitoring.org/project/230536 | 0.16.12 | 0.16.14 | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | spawn-fcgi | DISTRO | https://release-monitoring.org/project/05388 | 1.6.4 | 1.6.5 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice | DISTRO | https://release-monitoring.org/project/04871 | 0.15.0 | 0.15.1 | sqlcipher | DISTRO | https://release-monitoring.org/project/11213 | 4.5.1 | 4.5.3 | sshpass | DISTRO | https://release-monitoring.org/project/12961 | 1.09 | 1.10 | start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.20 | ORPH stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.5 | 1.0.7 | stress-ng | DISTRO | https://release-monitoring.org/project/12538 | 0.13.05 | 0.15.04 | strongswan | DISTRO | https://release-monitoring.org/project/04899 | 5.9.8 | 5.9.9 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.65 | 5.68 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.5 | ORPH suricata | DISTRO | https://release-monitoring.org/project/10925 | 6.0.6 | 6.0.10 | sway | DISTRO | https://release-monitoring.org/project/11497 | 1.7 | 1.8.1 | synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.29.3 | 0.30.2 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.38.1 | 4.0.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.46.0 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.6.1 | 12.6.2 | ORPH system-config-printer | DISTRO | https://release-monitoring.org/project/08855 | 1.5.15 | 1.5.18 | ORPH systemd | DISTRO | https://release-monitoring.org/project/05440 | 252.4 | 253 | systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.04 | ORPH tbb | DISTRO | https://release-monitoring.org/project/08217 | 2021.5.0 | 2021.8.0 | tcl | DISTRO | https://release-monitoring.org/project/04941 | 8.6.12 | 8.6.13 | ORPH tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | ORPH tcllib | DISTRO | https://release-monitoring.org/project/04943 | 1.20 | 1.21 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.4.2 | 4.4.3 | ORPH terminology | DISTRO | https://release-monitoring.org/project/04951 | 1.12.1 | 1.13.0 | tesseract-ocr | DISTRO | https://release-monitoring.org/project/04954 | 5.0.1 | 5.3.0 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.5.1 | 2.5.2 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.18.0 | ORPH tinifier | DISTRO | https://release-monitoring.org/project/241900 | 3.4.0 | 4.0.1 | tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20220801 | 20230101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tio | DISTRO | https://release-monitoring.org/project/20587 | 1.47 | 2.5 | tk | DISTRO | https://release-monitoring.org/project/11426 | 8.6.12 | 8.6.13 | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 3.0.0 | ORPH tpm2-pkcs11 | DISTRO | https://release-monitoring.org/project/18777 | 1.8.0 | 1.9.0 | tpm2-tools | DISTRO | https://release-monitoring.org/project/12841 | 5.2 | 5.5 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.1.0 | 4.0.1 | ORPH trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | 2.9.7 | 3.1.6 | traceroute | DISTRO | https://release-monitoring.org/project/14877 | 2.1.0 | 2.1.2 | transmission | DISTRO | https://release-monitoring.org/project/05002 | 3.00 | 4.0.0 | tree | DISTRO | https://release-monitoring.org/project/05006 | 2.0.2 | 2.1.0 | tzdata | DISTRO | https://release-monitoring.org/project/05021 | 2022f | 2022g | uacme | DISTRO | https://release-monitoring.org/project/22795 | 1.7.3 | 1.7.4 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2023.01 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.12 | 0.13.1 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 4.3.0.0 | 4.4.0.0 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 3.2 | ORPH unrar | DISTRO | https://release-monitoring.org/project/13306 | 6.1.7 | 6.2.5 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.7.2 | ORPH upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.19 | 1.90.0 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.56.4 | ORPH valgrind | DISTRO | https://release-monitoring.org/project/13639 | 3.19.0 | 3.20.0 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.7 | 1.0 | ORPH vdr | DISTRO | https://release-monitoring.org/project/05069 | 2.6.3 | 2.6.4 | vim | DISTRO | https://release-monitoring.org/project/05092 | 9.0.1260 | 9.0.1327 | ORPH vis-network | DISTRO | https://release-monitoring.org/project/270536 | 9.1.0 | 9.1.2 | volk | DISTRO | https://release-monitoring.org/project/147733 | 2.5.2 | 3.0.0 | vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vte | DISTRO | https://release-monitoring.org/project/10895 | 0.66.2 | 0.70.3 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.45 | 3.2.47 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.241 | ORPH waf | DISTRO | https://release-monitoring.org/project/05116 | 2.0.24 | 2.0.25 | wavpack | DISTRO | https://release-monitoring.org/project/05121 | 5.5.0 | 5.6.0 | ORPH waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 1.0.0 | webp | DISTRO | https://release-monitoring.org/project/01761 | 1.2.4 | 1.3.0 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH weston | DISTRO | https://release-monitoring.org/project/13745 | 10.0.1 | 11.0.1 | whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.14 | 5.5.15 | wine | DISTRO | https://release-monitoring.org/project/05134 | 7.0 | 8.2 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.8 | 0.4.13 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.15.1 | 0.16.2 | wpewebkit | DISTRO | https://release-monitoring.org/project/17557 | 2.38.4 | 2.38.5 | wtfutil | DISTRO | https://release-monitoring.org/project/243189 | 0.41.0 | 0.42.0 | xapian | DISTRO | https://release-monitoring.org/project/15919 | 1.4.19 | 1.4.22 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20230201 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.5 | 4.17.0 | xfsprogs | DISTRO | https://release-monitoring.org/project/05188 | 5.14.2 | 6.1.1 | ORPH xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.37 | 2.38 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 6.03 | 6.06.1 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.22 | 3.23 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 376 | 379 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.1 | 0.3.2 | xz | DISTRO | https://release-monitoring.org/project/05277 | 5.2.10 | 5.4.1 | ORPH yad | DISTRO | https://release-monitoring.org/project/05280 | 0.40.0 | 12.3 | zchunk | DISTRO | https://release-monitoring.org/project/178035 | 1.2.2 | 1.2.4 | zeek | DISTRO | https://release-monitoring.org/project/267106 | 4.1.1 | 5.1.2 | zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.1.7 | 2.1.9 | zic | DISTRO | https://release-monitoring.org/project/16905 | 2022f | 2022g | zstd | DISTRO | https://release-monitoring.org/project/12083 | 1.5.2 | 1.5.4 | zxing-cpp | DISTRO | https://release-monitoring.org/project/101246 | 1.4.0 | 2.0.0 | Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 less | CVE-2022-46663 | https://security-tracker.debian.org/tracker/CVE-2022-46663 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-cryptography | CVE-2023-23931 | https://security-tracker.debian.org/tracker/CVE-2023-23931 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 speechd | CVE-2001-0956 | https://security-tracker.debian.org/tracker/CVE-2001-0956 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dropbear | CVE-2021-36369 | https://security-tracker.debian.org/tracker/CVE-2021-36369 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-3998 | https://security-tracker.debian.org/tracker/CVE-2021-3998 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2021-3981 | https://security-tracker.debian.org/tracker/CVE-2021-3981 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2022-0711 | https://security-tracker.debian.org/tracker/CVE-2022-0711 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 less | CVE-2022-46663 | https://security-tracker.debian.org/tracker/CVE-2022-46663 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libbpf | CVE-2021-45940 | https://security-tracker.debian.org/tracker/CVE-2021-45940 libbpf | CVE-2021-45941 | https://security-tracker.debian.org/tracker/CVE-2021-45941 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libxslt | CVE-2022-29824 | https://security-tracker.debian.org/tracker/CVE-2022-29824 lighttpd | CVE-2022-41556 | https://security-tracker.debian.org/tracker/CVE-2022-41556 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mender | CVE-2022-29555 | https://security-tracker.debian.org/tracker/CVE-2022-29555 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 modsecurity2 | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 modsecurity2 | CVE-2023-24021 | https://security-tracker.debian.org/tracker/CVE-2023-24021 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 nodejs | CVE-2022-35256 | https://security-tracker.debian.org/tracker/CVE-2022-35256 nodejs | CVE-2022-43548 | https://security-tracker.debian.org/tracker/CVE-2022-43548 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 opusfile | CVE-2022-47021 | https://security-tracker.debian.org/tracker/CVE-2022-47021 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 patchelf | CVE-2022-44940 | https://security-tracker.debian.org/tracker/CVE-2022-44940 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 proftpd | CVE-2021-46854 | https://security-tracker.debian.org/tracker/CVE-2021-46854 python-aiohttp | CVE-2022-33124 | https://security-tracker.debian.org/tracker/CVE-2022-33124 python-cryptography | CVE-2023-23931 | https://security-tracker.debian.org/tracker/CVE-2023-23931 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-45198 | https://security-tracker.debian.org/tracker/CVE-2022-45198 python-pillow | CVE-2022-45199 | https://security-tracker.debian.org/tracker/CVE-2022-45199 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pyjwt | CVE-2022-29217 | https://security-tracker.debian.org/tracker/CVE-2022-29217 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python-web2py | CVE-2022-33146 | https://security-tracker.debian.org/tracker/CVE-2022-33146 python-werkzeug | CVE-2022-29361 | https://security-tracker.debian.org/tracker/CVE-2022-29361 python3 | CVE-2022-42919 | https://security-tracker.debian.org/tracker/CVE-2022-42919 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3611 | https://security-tracker.debian.org/tracker/CVE-2021-3611 qemu | CVE-2021-3750 | https://security-tracker.debian.org/tracker/CVE-2021-3750 qemu | CVE-2021-3929 | https://security-tracker.debian.org/tracker/CVE-2021-3929 qemu | CVE-2021-3947 | https://security-tracker.debian.org/tracker/CVE-2021-3947 qemu | CVE-2021-4158 | https://security-tracker.debian.org/tracker/CVE-2021-4158 qemu | CVE-2021-4206 | https://security-tracker.debian.org/tracker/CVE-2021-4206 qemu | CVE-2021-4207 | https://security-tracker.debian.org/tracker/CVE-2021-4207 qemu | CVE-2022-0358 | https://security-tracker.debian.org/tracker/CVE-2022-0358 qemu | CVE-2022-26353 | https://security-tracker.debian.org/tracker/CVE-2022-26353 qemu | CVE-2022-26354 | https://security-tracker.debian.org/tracker/CVE-2022-26354 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-35414 | https://security-tracker.debian.org/tracker/CVE-2022-35414 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 rabbitmq-server | CVE-2021-22116 | https://security-tracker.debian.org/tracker/CVE-2021-22116 rabbitmq-server | CVE-2021-22117 | https://security-tracker.debian.org/tracker/CVE-2021-22117 rabbitmq-server | CVE-2021-32718 | https://security-tracker.debian.org/tracker/CVE-2021-32718 rabbitmq-server | CVE-2021-32719 | https://security-tracker.debian.org/tracker/CVE-2021-32719 rabbitmq-server | CVE-2022-31008 | https://security-tracker.debian.org/tracker/CVE-2022-31008 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 rpm | CVE-2021-3521 | https://security-tracker.debian.org/tracker/CVE-2021-3521 rpm | CVE-2021-35937 | https://security-tracker.debian.org/tracker/CVE-2021-35937 rpm | CVE-2021-35938 | https://security-tracker.debian.org/tracker/CVE-2021-35938 rpm | CVE-2021-35939 | https://security-tracker.debian.org/tracker/CVE-2021-35939 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unbound | CVE-2022-30698 | https://security-tracker.debian.org/tracker/CVE-2022-30698 unbound | CVE-2022-30699 | https://security-tracker.debian.org/tracker/CVE-2022-30699 unbound | CVE-2022-3204 | https://security-tracker.debian.org/tracker/CVE-2022-3204 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 usbguard | CVE-2019-25058 | https://security-tracker.debian.org/tracker/CVE-2019-25058 wavpack | CVE-2022-2476 | https://security-tracker.debian.org/tracker/CVE-2022-2476 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xerces | CVE-2018-1311 | https://security-tracker.debian.org/tracker/CVE-2018-1311 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 less | CVE-2022-46663 | https://security-tracker.debian.org/tracker/CVE-2022-46663 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libopenssl | CVE-2022-4450 | https://security-tracker.debian.org/tracker/CVE-2022-4450 libopenssl | CVE-2023-0215 | https://security-tracker.debian.org/tracker/CVE-2023-0215 libopenssl | CVE-2023-0286 | https://security-tracker.debian.org/tracker/CVE-2023-0286 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 modsecurity2 | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 modsecurity2 | CVE-2023-24021 | https://security-tracker.debian.org/tracker/CVE-2023-24021 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 opusfile | CVE-2022-47021 | https://security-tracker.debian.org/tracker/CVE-2022-47021 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-cryptography | CVE-2023-23931 | https://security-tracker.debian.org/tracker/CVE-2023-23931 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python3 | CVE-2022-42919 | https://security-tracker.debian.org/tracker/CVE-2022-42919 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xerces | CVE-2018-1311 | https://security-tracker.debian.org/tracker/CVE-2018-1311 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From thomas at devoogdt.com Mon Feb 20 09:09:21 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 20 Feb 2023 10:09:21 +0100 Subject: [Buildroot] [PATCH v1 1/3] Revert "xorg-server: not available with musl on ARM" Message-ID: <20230220090923.2155635-1-thomas.devoogdt@barco.com> From: Thomas Devoogdt This reverts commit 9daafbcb75a7ab593ce8a1f21c6149c8437bc0bc. Fixed since https://gitlab.freedesktop.org/xorg/xserver/-/issues/840. Signed-off-by: Thomas Devoogdt --- package/x11r7/xserver_xorg-server/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 865917c4ec..b933bd0285 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -1,11 +1,6 @@ -comment "xorg-server needs a glibc or uClibc toolchain" - depends on BR2_arm && BR2_TOOLCHAIN_USES_MUSL - config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" depends on BR2_USE_MMU # fork() - # xserver uses inb/outb on arm, which aren't available with musl - depends on !(BR2_arm && BR2_TOOLCHAIN_USES_MUSL) # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. -- 2.39.2 From thomas at devoogdt.com Mon Feb 20 09:09:22 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 20 Feb 2023 10:09:22 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: <20230220090923.2155635-1-thomas.devoogdt@barco.com> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> Message-ID: <20230220090923.2155635-2-thomas.devoogdt@barco.com> The reason why it was not used was that at-spi2-core and at-spi2-atk were not available, since then, it is, so drop this patch. This will also avoid warnings in webkitgtk. Signed-off-by: Thomas Devoogdt --- package/libgtk3/0001-disable-atk-bridge.patch | 41 ------------------- package/libgtk3/Config.in | 2 + package/libgtk3/libgtk3.mk | 4 +- 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch deleted file mode 100644 index f3e9bff2ba..0000000000 --- a/package/libgtk3/0001-disable-atk-bridge.patch +++ /dev/null @@ -1,41 +0,0 @@ -Remove atk-bridge support. - -atk-bridge doesn't seem useful for now in Buildroot and requires to -add two new packages just for it: at-spi2-core and at-spi2-atk. - -Signed-off-by: Hadrien Boutteville - ---- a/gtk/a11y/gtkaccessibility.c -+++ b/gtk/a11y/gtkaccessibility.c -@@ -37,10 +37,6 @@ - #include - #include - --#ifdef GDK_WINDOWING_X11 --#include --#endif -- - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, - guint n_param_values, - const GValue *param_values, -@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) - _gtk_accessibility_override_atk_util (); - do_window_event_initialization (); - --#ifdef GDK_WINDOWING_X11 -- atk_bridge_adaptor_init (NULL, NULL); --#endif -- - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); - } ---- a/meson.build -+++ b/meson.build -@@ -564,7 +564,7 @@ if x11_enabled - xfixes_dep = dependency('xfixes', required: false) - xcomposite_dep = dependency('xcomposite', required: false) - fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) -- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) -+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) - - backend_immodules += ['xim'] - diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 82ca68d2da..d921f79226 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -24,6 +24,8 @@ config BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 283c129cef..fc2b501cb8 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -14,8 +14,8 @@ LIBGTK3_CPE_ID_VENDOR = gnome LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \ - gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) +LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk at-spi2-atk at-spi2-core libglib2 \ + cairo pango gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrandr xlib_libXrender xlib_libXi -- 2.39.2 From thomas at devoogdt.com Mon Feb 20 09:09:23 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 20 Feb 2023 10:09:23 +0100 Subject: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5 In-Reply-To: <20230220090923.2155635-1-thomas.devoogdt@barco.com> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> Message-ID: <20230220090923.2155635-3-thomas.devoogdt@barco.com> From: Thomas Devoogdt Bugfix release, with many security fixes, including (but not limited to) a patch for CVE-2023-23529. Release notes: https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0002.html Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, we do check on >= GCC 8, because we can't check on >= GCC 8.3. https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b Signed-off-by: Thomas Devoogdt --- package/webkitgtk/Config.in | 4 ++-- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index dc5d738dae..976341093e 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 34fd19d3de..c771297b5a 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums -md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz -sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz -sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums +md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz +sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz +sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index a6974db926..3263f7fea0 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.4 +WEBKITGTK_VERSION = 2.38.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES -- 2.39.2 From fontaine.fabrice at gmail.com Mon Feb 20 09:17:39 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 10:17:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: set --with-libpcre2 Message-ID: <20230220091739.13107-1-fontaine.fabrice@gmail.com> Set --with-libpcre2 to avoid the following build failure raised since bump to version 6.2.7 in commit 89fa774a191d41ed5d125d87d812ff3478902251: configure: using old pcre library by default checking pkg-config is at least version 0.9.0... yes configure: error: cannot find pkg-config package for libpcre Fixes: - http://autobuild.buildroot.org/results/701b343b3b0d471c75899b61d02bd9d63a272247 Signed-off-by: Fabrice Fontaine --- package/zabbix/zabbix.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index db9efed78b..0d6c579f4c 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -15,6 +15,7 @@ ZABBIX_AUTORECONF = YES ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ + --with-libpcre2 \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \ -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 09:19:33 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 10:19:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/modem-manager: fix static build In-Reply-To: References: <20230219224546.1232023-1-fontaine.fabrice@gmail.com> Message-ID: Hi, Le lun. 20 f?vr. 2023 ? 09:28, Aleksander Morgado a ?crit : > Hey, > > On Sun, Feb 19, 2023 at 11:45 PM Fabrice Fontaine > wrote: > > > > Commit d769cfc13f6c2544f8bc5b6339d23763319a2383 was incomplete as > > plugins/meson.build still unconditionally calls shared_module. So > > disable plugins to fix the following static build failure raised since > > bump to version 1.20.2 in commit > > b95334b71fbdde0f7621b58ed35fa98df9e0966d: > > > > [238/417] Linking target plugins/libmm-shared-telit.so > > FAILED: plugins/libmm-shared-telit.so > > > > Plugins could be enabled back through builtin_plugins as soon as > > > https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/1c4da332ee6e0d948f85a63f74cb27e89075c011 > > lands in a stable release > > > > Fixes: > > - > http://autobuild.buildroot.org/results/deb2a752accb021392bb9dc3d06b2b1bf151535c > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/modem-manager/modem-manager.mk | 44 ++++++++++++++++++++++++++ > > 1 file changed, 44 insertions(+) > > > > diff --git a/package/modem-manager/modem-manager.mk > b/package/modem-manager/modem-manager.mk > > index 979a80a8e9..824b9eda5a 100644 > > --- a/package/modem-manager/modem-manager.mk > > +++ b/package/modem-manager/modem-manager.mk > > @@ -80,6 +80,50 @@ else > > MODEM_MANAGER_CONF_OPTS += -Dbash_completion=false > > endif > > > > +ifeq ($(BR2_STATIC_LIBS),y) > > +MODEM_MANAGER_CONF_OPTS += \ > > + -Dplugin_generic=disabled \ > > + -Dplugin_altair_lte=disabled \ > > + -Dplugin_anydata=disabled \ > > + -Dplugin_broadmobi=disabled \ > > + -Dplugin_cinterion=disabled \ > > + -Dplugin_dell=disabled \ > > + -Dplugin_dlink=disabled \ > > + -Dplugin_fibocom=disabled \ > > + -Dplugin_foxconn=disabled \ > > + -Dplugin_gosuncn=disabled \ > > + -Dplugin_haier=disabled \ > > + -Dplugin_huawei=disabled \ > > + -Dplugin_intel=disabled \ > > + -Dplugin_iridium=disabled \ > > + -Dplugin_linktop=disabled \ > > + -Dplugin_longcheer=disabled \ > > + -Dplugin_mbm=disabled \ > > + -Dplugin_motorola=disabled \ > > + -Dplugin_mtk=disabled \ > > + -Dplugin_nokia=disabled \ > > + -Dplugin_nokia_icera=disabled \ > > + -Dplugin_novatel=disabled \ > > + -Dplugin_novatel_lte=disabled \ > > + -Dplugin_option=disabled \ > > + -Dplugin_option_hso=disabled \ > > + -Dplugin_pantech=disabled \ > > + -Dplugin_qcom_soc=disabled \ > > + -Dplugin_quectel=disabled \ > > + -Dplugin_samsung=disabled \ > > + -Dplugin_sierra_legacy=disabled \ > > + -Dplugin_sierra=disabled \ > > + -Dplugin_simtech=disabled \ > > + -Dplugin_telit=disabled \ > > + -Dplugin_thuraya=disabled \ > > + -Dplugin_tplink=disabled \ > > + -Dplugin_ublox=disabled \ > > + -Dplugin_via=disabled \ > > + -Dplugin_wavecom=disabled \ > > + -Dplugin_x22x=disabled \ > > + -Dplugin_zte=disabled > > +endif > > + > > You can disable all plugins altogether with > "-Dauto_features=disabled"; it is the recommended way to do so in MM > 1.20. > But I wonder, is it only to have the build with static libs pass? MM > 1.20 without plugins will not be usable at all, at least one plugin is > required, so not sure how useful that is. > Thanks for your review, I'll send a v2 that disables building statically modem-manager 1.20. > > In MM 1.22 (or git main) there is the new "-Dbuiltin_plugins=true" > option that will embed all selected plugins within the ModemManager > daemon binary itself. > > Cheers! > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Mon Feb 20 09:25:16 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 10:25:16 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/modem-manager: needs dynamic library Message-ID: <20230220092516.17774-1-fontaine.fabrice@gmail.com> Commit d769cfc13f6c2544f8bc5b6339d23763319a2383 was incomplete as plugins/meson.build still unconditionally calls shared_module. So add a dependency to dynamic library to avoid the following static build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: [238/417] Linking target plugins/libmm-shared-telit.so FAILED: plugins/libmm-shared-telit.so Building statically could be enabled back through builtin_plugins as soon as https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/1c4da332ee6e0d948f85a63f74cb27e89075c011 lands in a stable release Fixes: - http://autobuild.buildroot.org/results/deb2a752accb021392bb9dc3d06b2b1bf151535c Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Aleksander Morgado): - Disable building statically instead of disabling all plugins package/modem-manager/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index 8489e6fc86..6990996a86 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_MODEM_MANAGER depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV @@ -39,6 +40,7 @@ comment "QRTR support needs a toolchain w/ headers >= 4.15" endif -comment "modemmanager needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS +comment "modemmanager needs a toolchain w/ wchar, threads, dynamic library" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS depends on BR2_USE_MMU -- 2.39.0 From aperez at igalia.com Mon Feb 20 09:29:39 2023 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 20 Feb 2023 11:29:39 +0200 Subject: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5 In-Reply-To: <20230220090923.2155635-3-thomas.devoogdt@barco.com> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-3-thomas.devoogdt@barco.com> Message-ID: <20230220112939.GB446957@igalia.com> Hi Thomas, all, On Mon, 20 Feb 2023 10:09:23 +0100 Thomas Devoogdt wrote: > From: Thomas Devoogdt > > Bugfix release, with many security fixes, including (but not limited to) > a patch for CVE-2023-23529. > > Release notes: > > https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html Hehe, I was just about to submit this update myself after smoke-testing a build. Thanks for sending it :-) > Accompanying security advisory: > > https://webkitgtk.org/security/WSA-2023-0002.html > > Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. > Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, > we do check on >= GCC 8, because we can't check on >= GCC 8.3. > > https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b > > Signed-off-by: Thomas Devoogdt Acked-by: Adrian Perez de Castro > --- > package/webkitgtk/Config.in | 4 ++-- > package/webkitgtk/webkitgtk.hash | 8 ++++---- > package/webkitgtk/webkitgtk.mk | 2 +- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in > index dc5d738dae..976341093e 100644 > --- a/package/webkitgtk/Config.in > +++ b/package/webkitgtk/Config.in > @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt > > -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" > +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > depends on !BR2_BINFMT_FLAT > depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ > @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK > depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 > depends on BR2_USE_WCHAR # icu, libsoup > depends on BR2_PACKAGE_LIBGTK3 > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > index 34fd19d3de..c771297b5a 100644 > --- a/package/webkitgtk/webkitgtk.hash > +++ b/package/webkitgtk/webkitgtk.hash > @@ -1,7 +1,7 @@ > -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums > -md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz > -sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz > -sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz > +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums > +md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz > +sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz > +sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz > > # Hashes for license files: > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > index a6974db926..3263f7fea0 100644 > --- a/package/webkitgtk/webkitgtk.mk > +++ b/package/webkitgtk/webkitgtk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WEBKITGTK_VERSION = 2.38.4 > +WEBKITGTK_VERSION = 2.38.5 > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > WEBKITGTK_INSTALL_STAGING = YES > -- > 2.39.2 > > _______________________________________________ > 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 fontaine.fabrice at gmail.com Mon Feb 20 09:33:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 10:33:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix libcurl build Message-ID: <20230220093336.77462-1-fontaine.fabrice@gmail.com> Fix the following libcurl build failure: In file included from /tmp/instance-1/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/include/curl/curl.h:3195, from ../../../../include/sysinc.h:384, from ../../../../include/common.h:23, from simple.c:20: simple.c: In function 'check_https': simple.c:167:65: error: invalid use of void expression 167 | if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_USERAGENT, "Zabbix " ZABBIX_VERSION)) || | ^ Fixes: - http://autobuild.buildroot.org/results/053a62e9969046a7f8a0e1890c24d2bfb099ae42 Signed-off-by: Fabrice Fontaine --- ...se-parentheses-to-ensure-compilation.patch | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 package/zabbix/0002-Use-parentheses-to-ensure-compilation.patch diff --git a/package/zabbix/0002-Use-parentheses-to-ensure-compilation.patch b/package/zabbix/0002-Use-parentheses-to-ensure-compilation.patch new file mode 100644 index 0000000000..482480e5e0 --- /dev/null +++ b/package/zabbix/0002-Use-parentheses-to-ensure-compilation.patch @@ -0,0 +1,65 @@ +From 2fe3c652bd6a6522d5be3fd41c6ed39ddc2d21fa Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 13 Feb 2023 14:32:38 +0100 +Subject: [PATCH] Use parentheses to ensure compilation + +Compiler fails with latest Curl release. Use parenthesis to ensure +compiler evaluates expression correctly: + +In file included from /tmp/instance-1/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/include/curl/curl.h:3195, + from ../../../../include/sysinc.h:384, + from ../../../../include/common.h:23, + from simple.c:20: +simple.c: In function 'check_https': +simple.c:167:65: error: invalid use of void expression + 167 | if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_USERAGENT, "Zabbix " ZABBIX_VERSION)) || + | ^ + +Fixes: + - http://autobuild.buildroot.org/results/053a62e9969046a7f8a0e1890c24d2bfb099ae42 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent (no feedback on first patch)] +--- + src/libs/zbxsysinfo/simple/simple.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/libs/zbxsysinfo/simple/simple.c b/src/libs/zbxsysinfo/simple/simple.c +index fc16a784cf..c3ce974492 100644 +--- a/src/libs/zbxsysinfo/simple/simple.c ++++ b/src/libs/zbxsysinfo/simple/simple.c +@@ -177,14 +177,14 @@ static int check_https(const char *host, unsigned short port, int timeout, int * + else + zbx_snprintf(https_host, sizeof(https_host), "%s%s", (0 == strncmp(host, "https://", 8) ? "" : "https://"), host); + +- if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_USERAGENT, "Zabbix " ZABBIX_VERSION)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_URL, https_host)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_PORT, (long)port)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_NOBODY, 1L)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_SSL_VERIFYPEER, 0L)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_SSL_VERIFYHOST, 0L)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_TIMEOUT, (long)timeout)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = ZBX_CURLOPT_ACCEPT_ENCODING, ""))) ++ if (CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_USERAGENT), "Zabbix " ZABBIX_VERSION)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_URL), https_host)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_PORT), (long)port)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_NOBODY), 1L)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_SSL_VERIFYPEER), 0L)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_SSL_VERIFYHOST), 0L)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_TIMEOUT), (long)timeout)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = ZBX_CURLOPT_ACCEPT_ENCODING), ""))) + { + zabbix_log(LOG_LEVEL_DEBUG, "%s: could not set cURL option [%d]: %s", + __func__, (int)opt, curl_easy_strerror(err)); +@@ -193,7 +193,7 @@ static int check_https(const char *host, unsigned short port, int timeout, int * + + if (NULL != CONFIG_SOURCE_IP) + { +- if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_INTERFACE, CONFIG_SOURCE_IP))) ++ if (CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_INTERFACE), CONFIG_SOURCE_IP))) + { + zabbix_log(LOG_LEVEL_DEBUG, "%s: could not set source interface option [%d]: %s", + __func__, (int)opt, curl_easy_strerror(err)); +-- +2.39.0 + -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 09:46:53 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 10:46:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: fix per-package build Message-ID: <20230220094653.105814-1-fontaine.fabrice@gmail.com> Fix the following per-package build failure raised since commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429: configure.ac:140: error: possibly undefined macro: AC_MSG_FAILURE If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:328: error: possibly undefined macro: AC_CHECK_LIB Fixes: - http://autobuild.buildroot.org/results/11868e9bc4916843a7fc76f7b5e4c251f89e33dc Signed-off-by: Fabrice Fontaine --- package/libarchive/libarchive.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cd7c13fbed..2010b6529f 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -140,6 +140,8 @@ endif # The only user of host-libarchive needs zlib support HOST_LIBARCHIVE_DEPENDENCIES = host-zlib +# needed for autoreconf +HOST_LIBARCHIVE_DEPENDENCIES += host-pkgconf HOST_LIBARCHIVE_CONF_OPTS = \ --disable-bsdtar \ --disable-bsdcpio \ -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 10:03:09 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 11:03:09 +0100 Subject: [Buildroot] [PATCH 1/1] support/dependencies/dependencies.sh: require FileHandle perl package for syslinux Message-ID: <20230220100309.116832-1-fontaine.fabrice@gmail.com> syslinux needs FileHandle module: Can't locate FileHandle.pm in @INC (you may need to install the FileHandle module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. /home/buildroot/autobuild/instance-0/output-1/host/bin/i586-buildroot-linux-gnu-gcc -Wp,-MT,errlist.o,-MD,./.errlist.o.d -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-labels=0 -ffast-math -fomit-frame-pointer -std=gnu99 -m32 -mpreferred-stack-boundary=2 -fno-stack-protector -fwrapv -freg-struct-return -fPIC -fno-exceptions -fno-asynchronous-unwind-tables -fno-strict-aliasing -falign-functions=0 -falign-jumps=0 -falign-labels=0 -falign-loops=0 -g -D__COM32__ -D__FIRMWARE_BIOS__ -nostdinc -iwithprefix include -I. -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/../include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/include/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/core/include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/ -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/sys/module -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/bios/com32/lib//../.. -W -Wall -Wstrict-prototypes -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline -DDYNAMIC_CRC_TABLE -DPNG_NO_CONSOLE_IO -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_MNG_FEATURES -DPNG_NO_READ_tIME -DPNG_NO_WRITE_tIME -mregparm=3 -DREGPARM=3 -c -o errlist.o errlist.c cc1: fatal error: errlist.c: No such file or directory Fixes: - http://autobuild.buildroot.org/results/de88089888b2ca354b28af3550abf846560da7d5 Signed-off-by: Fabrice Fontaine --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 4353e9585e..a692856d31 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -298,6 +298,10 @@ if grep -q -E '^BR2_PACKAGE_(WEBKITGTK|WPEWEBKIT)=y' $BR2_CONFIG ; then required_perl_modules="${required_perl_modules} JSON::PP" fi +if grep -q ^BR2_TARGET_SYSLINUX=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules FileHandle" +fi + # This variable will keep the modules that are missing in your system. missing_perl_modules="" -- 2.39.0 From hrsourabh011 at gmail.com Mon Feb 20 10:10:27 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Mon, 20 Feb 2023 11:10:27 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: <20230219131753.GE2718518@scaer> References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> <20230218142115.GC2718518@scaer> <20230218153216.GD2718518@scaer> <20230219131753.GE2718518@scaer> Message-ID: HI Yann, All, Yes, will do it. I am testing it now New changes: define CA_CERTIFICATES_GEN_BUNDLE # Create symlinks to certificates under /etc/ssl/certs # and generate the bundle cd $(TARGET_DIR) ;\ for i in `find usr/local/share/ca-certificates -name "*.crt" | LC_COLLATE=C sort` ; do \ ln -sf ../../../$$i etc/ssl/certs/`basename $${i} .crt`.pem ;\ cat $$i ;\ done >>$(BUILD_DIR)/ca-certificates.crt # Create symlinks to the certificates by their hash values $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs # Install the certificates bundle $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt endef So, after "make" new local CA is added to trust-store. So far so good. But now I did "make clean" and "make". And no certificates are installed!. Even the default certificates (from mozilla) are not installed. I could't find /usr/share/ca-certificates in the target. Any idea why this is happening? On Sun, 19 Feb 2023 at 14:17, Yann E. MORIN wrote: > Sourabh, All, > > On 2023-02-19 13:53 +0100, Sourabh Hegde spake thusly: > > I think the issue is during build, the [1]ca-certificates.mk is not > available in the output/build/ca-certificates/ dir. Only > > Makefile and ca-certificates.crt file is present. > > So how can I patch the makefile? > > This is a patch agaisnt Buildroot itself. Apply it to Buildroot. > > 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. | > > '------------------------------^-------^------------------^--------------------' > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: ca-certificates.mk Type: application/octet-stream Size: 2620 bytes Desc: not available URL: From br015 at umbiko.net Mon Feb 20 10:11:15 2023 From: br015 at umbiko.net (Andreas Ziegler) Date: Mon, 20 Feb 2023 10:11:15 +0000 Subject: [Buildroot] [PATCH 3/4] package/linux-tools: add rtla In-Reply-To: <20230206083931.759b3ee3@pc-7.home> References: <20230206083931.759b3ee3@pc-7.home> Message-ID: Hi Maxime, * On 2023-02-06 07:39, Maxime Chevallier wrote: > Hello Andreas, > > On Sun, 05 Feb 2023 09:22:56 +0100 > Andreas Ziegler wrote: > >> Hi Maxime, >> >> I was able to build RTLA after some adaptions, see below. > > Thanks for the effort, I appreciate ! You are welcome :-) There is one more thing that might be improved: On an aarch64 build, using an internal musl toolchain, I encountered the following build issue: In file included from src/trace.h:2, from src/osnoise.h:2, from src/rtla.c:11: /home/data/buildroot.rpi64/host/bin/../aarch64-buildroot-linux-musl/sysroot/usr/include/tracefs/tracefs.h:50:35: error: unknown type name ?cpu_set_t? 50 | cpu_set_t *set, size_t set_size); | ^~~~~~~~~ (...) src/osnoise_top.c: In function ?osnoise_top_main?: src/osnoise_top.c:618:26: warning: implicit declaration of function ?tracefs_iterate_raw_events?; did you mean ?tracefs_system_events?? [-Wimplicit-function-declaration] 618 | retval = tracefs_iterate_raw_events(trace->tep, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ | tracefs_system_events (...) It seems that both libraries are compiled with _GNU_SOURCE $ grep _GNU_SOURCE ../libtracefs-1.6.4/Makefile override CFLAGS += -D_GNU_SOURCE $(LIBTRACEEVENT_INCLUDES) $(INCLUDES) $ grep _GNU_SOURCE ../libtraceevent-1.7.1/Makefile override CFLAGS += $(udis86-flags) -D_GNU_SOURCE but rtla defines it inconsistently $ grep _GNU_SOURCE tools/tracing/rtla/Makefile $ grep _GNU_SOURCE tools/tracing/rtla/src/*.[ch] tools/tracing/rtla/src/trace.c:#define _GNU_SOURCE thereby missing some definitions from Proposed fix below. >> > diff --git a/package/linux-tools/linux-tool-rtla.mk.in >> > b/package/linux-tools/linux-tool-rtla.mk.in >> > new file mode 100644 >> > index 0000000000..a736e3b785 >> > --- /dev/null >> > +++ b/package/linux-tools/linux-tool-rtla.mk.in >> > @@ -0,0 +1,32 @@ >> > +################################################################################ >> > +# >> > +# rtla >> > +# >> > +################################################################################ >> > + >> > +LINUX_TOOLS += rtla >> > + >> > +RTLA_DEPENDENCIES = host-pkgconf libtracefs >> >> RTLA needs some kernel features; better to include them here, saves >> time experimenting: >> >> # linux kernel needs FTRACE, TIMERLAT_TRACER, HIST_TRIGGERS for RTLA >> to work >> ifeq ($(BR2_PACKAGE_LINUX_TOOLS_RTLA),y) >> define RTLA_LINUX_CONFIG_FIXUPS >> $(call KCONFIG_ENABLE_OPT,CONFIG_FTRACE) >> $(call KCONFIG_ENABLE_OPT,CONFIG_TIMERLAT_TRACER) >> $(call KCONFIG_ENABLE_OPT,CONFIG_HIST_TRIGGERS) >> endef >> endif > > Oh I wasn't aware that we could enable kernel options that way. I'll > include them in the v2, along with CONFIG_OSNOISE_TRACER that is also > required. > >> > +RTLA_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ >> > + CC=$(TARGET_CC) \ Define _GNU_SOURCE to prevent the musl build error above. This generates a warning due to redefinition of symbol in trace.c, but it is less intrusive than patching the source code: + EXTRA_CFLAGS="-D_GNU_SOURCE" \ >> > + LDFLAGS="$(TARGET_LDFLAGS)" \ >> > + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig >> > + >> >> The RTLA Makefile unconditionally compiles with stack smashing >> protection; linking fails on builds configured without this feature: >> >> # adapted from linux-tool-tmon.mk.in >> ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) >> define RTLA_DISABLE_STACK_PROTECTOR >> $(SED) 's/-fstack-protector.* //' >> $(LINUX_DIR)/tools/tracing/rtla/Makefile >> endef >> endif > > Good catch too, I didn't see that. > >> > +define RTLA_BUILD_CMDS >> > + $(Q)if ! grep install >> > $(LINUX_DIR)/tools/tracing/rtla/Makefile >> > >/dev/null 2>&1 ; then \ >> > + echo "Your kernel version is too old and does not >> > implement the rtla tool." ; \ >> > + echo "At least kernel 5.17 must be used." ; \ >> > + exit 1 ; \ >> > + fi >> > + >> >> $(RTLA_DISABLE_STACK_PROTECTOR) >> >> > + $(TARGET_MAKE_ENV) \ >> > + $(MAKE) $(RTLA_MAKE_OPTS) \ >> > + -C $(LINUX_DIR)/tools/tracing rtla >> > +endef >> > + >> > +define RTLA_INSTALL_TARGET_CMDS >> > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/tracing \ >> > + $(RTLA_MAKE_OPTS) \ >> > + DESTDIR=$(TARGET_DIR) \ >> > + rtla_install >> > +endef >> >> rtla_install fails with: >> Makefile:34: *** NOTICE: rst2man required to generate man pages. >> Stop. because it tries to build and install man pages also. Better to >> use a custom install command: >> >> # The rtla_install target tries to create and install manpages, >> # which terminates with an error and cannot be disabled >> define RTLA_INSTALL_TARGET_CMDS >> $(INSTALL) -m 0755 -D $(LINUX_DIR)/tools/tracing/rtla/rtla \ >> $(TARGET_DIR)/usr/bin/rtla >> endef > > Ok makes sense as well :) > > Thanks a lot for the review, tests and fixes ! > > Maxime > >> Kind regards, >> Andreas >> >> > -- >> > 2.39.1 Kind regards, Andreas From fontaine.fabrice at gmail.com Mon Feb 20 10:30:01 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 11:30:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/glslsandbox-player: add wayland-protocols optional dependency Message-ID: <20230220103001.607877-1-fontaine.fabrice@gmail.com> wayland-protocols is an optional dependency which is enabled by default resulting in the following wayland build failure since the addition of the package in commit f201ca9d0d25b491ec5e1ed4e1d02fd52d027997: checking for wayland_client... yes checking for wayland_egl... yes configure: Wayland EGL support enabled checking for wayland_protocols... no configure: error: Package requirements (wayland-protocols >= 1.12) were not met: Package 'wayland-protocols', required by 'virtual:world', not found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables wayland_protocols_CFLAGS and wayland_protocols_LIBS to avoid the need to call pkg-config. Fixes: - http://autobuild.buildroot.org/results/865af860f9e52fe5311bb0c6a246ff871ae5a989 Signed-off-by: Fabrice Fontaine --- package/glslsandbox-player/Config.in | 5 ++++- package/glslsandbox-player/glslsandbox-player.mk | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 53646cde1f..9b6f8447f9 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -112,8 +112,11 @@ endchoice if BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI bool "Wayland IVI shell support" -endif +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG + bool "Wayland XDG shell support" + select BR2_PACKAGE_WAYLAND_PROTOCOLS +endif endif comment "glslsandbox-player needs openGL ES and EGL driver" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index f0a9475aa6..241f3475d2 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -72,6 +72,12 @@ GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-ivi else GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-ivi endif +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += wayland-protocols +GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-wlxdg +else +GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-wlxdg +endif else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += xlib_libX11 GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=x11 -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 11:21:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 12:21:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/rockchip-mali: needs C++ Message-ID: <20230220112147.952174-1-fontaine.fabrice@gmail.com> rockchip-mali pre-built libraries needs C++ since the addition of the package in commit 97c74a73e5dee17530647f89b2c7d8692781eb14: readelf -a output/build/rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427/lib/aarch64-linux-gnu/libmali-bifrost-g31-rxp0-gbm.so|grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libpthread.so.0] 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] 0x0000000000000001 (NEEDED) Shared library: [librt.so.1] 0x0000000000000001 (NEEDED) Shared library: [libdrm.so.2] 0x0000000000000001 (NEEDED) Shared library: [libm.so.6] 0x0000000000000001 (NEEDED) Shared library: [libstdc++.so.6] 0x0000000000000001 (NEEDED) Shared library: [libgcc_s.so.1] 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] While at it, add a comment when dependencies are not met Fixes: - No autobuilder failures (yet), found when debugging an issue with rockchip-mali and glslsandbox-player Signed-off-by: Fabrice Fontaine --- package/rockchip-mali/Config.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/rockchip-mali/Config.in b/package/rockchip-mali/Config.in index d616284911..5a23954af3 100644 --- a/package/rockchip-mali/Config.in +++ b/package/rockchip-mali/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ROCKCHIP_MALI bool "rockchip-mali" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_ARM_EABIHF || BR2_aarch64 # lidbrm. This would normally need a Config.in comment, but @@ -30,3 +31,8 @@ config BR2_PACKAGE_PROVIDES_LIBGBM default "rockchip-mali" endif + +comment "rockchip-mali needs a glibc toolchain w/ C++, threads" + depends on BR2_ARM_EABIHF || BR2_aarch64 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 11:24:10 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 12:24:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/glslsandbox-player: fix build with rockchip-mali Message-ID: <20230220112410.953669-1-fontaine.fabrice@gmail.com> Fix the following build failure with rockchip-mali raised since commit 97c74a73e5dee17530647f89b2c7d8692781eb14: checking for glesv2... no configure: error: Package requirements (glesv2 >= 1) were not met: Package dependency requirement 'glesv2 >= 1' could not be satisfied. Package 'glesv2' has version '', required version is '>= 1' Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables glesv2_CFLAGS and glesv2_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. Fixes: - http://autobuild.buildroot.org/results/ac765b0ff5f914df4087ae4691fe711dc912f03b Signed-off-by: Fabrice Fontaine --- ...gure.ac-fix-build-with-rockchip-mali.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/glslsandbox-player/0001-configure.ac-fix-build-with-rockchip-mali.patch diff --git a/package/glslsandbox-player/0001-configure.ac-fix-build-with-rockchip-mali.patch b/package/glslsandbox-player/0001-configure.ac-fix-build-with-rockchip-mali.patch new file mode 100644 index 0000000000..97bfe00401 --- /dev/null +++ b/package/glslsandbox-player/0001-configure.ac-fix-build-with-rockchip-mali.patch @@ -0,0 +1,46 @@ +From b811d408fe52fd5ee5a908eb16a2ff2b4217c235 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 20 Feb 2023 11:53:39 +0100 +Subject: [PATCH 1/1] configure.ac: fix build with rockchip-mali + +Don't check glesv2 version in glesv2.pc file to avoid the following +build failure with rockchip-mali: + +checking for glesv2... no +configure: error: Package requirements (glesv2 >= 1) were not met: + +Package dependency requirement 'glesv2 >= 1' could not be satisfied. +Package 'glesv2' has version '', required version is '>= 1' + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables glesv2_CFLAGS +and glesv2_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +Fixes: + - http://autobuild.buildroot.org/results/ac765b0ff5f914df4087ae4691fe711dc912f03b + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/jolivain/glslsandbox-player/pull/5] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1f45b1f..5cb2d4c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -84,7 +84,7 @@ AS_IF([test "x$enable_strict_gles" = "xyes"], [ + ]) + + PKG_CHECK_MODULES([egl], [egl >= 1]) +-PKG_CHECK_MODULES([glesv2], [glesv2 >= 1]) ++PKG_CHECK_MODULES([glesv2], [glesv2]) + + AC_CHECK_HEADERS([EGL/eglext.h], [], [], + [[#include +-- +2.39.0 + -- 2.39.0 From buildroot at heine.tech Mon Feb 20 12:49:45 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 20 Feb 2023 13:49:45 +0100 Subject: [Buildroot] [PATCH] package/grpc: bump to version 1.52.1 Message-ID: <20230220124945.1842532-1-buildroot@heine.tech> - alter patches 0001 and 0003 for changed paths/locations - bump minimum gcc to 7.3, see [0] - alter gcc dependency of dependend packages accordingly [0] https://github.com/grpc/grpc/tree/master/src/cpp Signed-off-by: Michael Nosthoff --- package/collectd/Config.in | 6 +- package/falcosecurity-libs/Config.in | 2 +- ...the-availability-of-pthread_setname_.patch | 32 ++++++---- .../grpc/0003-host-grpc-only-cpp-plugin.patch | 62 ++++++++++--------- package/grpc/Config.in | 6 +- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 2 +- package/sysdig/Config.in | 6 +- 8 files changed, 65 insertions(+), 53 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index a431da79f1..7f87b54645 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -683,15 +683,15 @@ config BR2_PACKAGE_COLLECTD_GRPC depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc depends on BR2_INSTALL_LIBSTDCPP # grpc -> protobuf depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # grpc -> protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # grpc -> libabseil-cpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # grpc depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc select BR2_PACKAGE_GRPC help Send/receive values using the gRPC protocol. -comment "grpc needs a toolchain w/ C++, gcc >= 5" +comment "grpc needs a toolchain w/ C++, gcc >= 7.3" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc diff --git a/package/falcosecurity-libs/Config.in b/package/falcosecurity-libs/Config.in index f101883384..41251fb748 100644 --- a/package/falcosecurity-libs/Config.in +++ b/package/falcosecurity-libs/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_FALCOSECURITY_LIBS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_LINUX_KERNEL depends on BR2_INSTALL_LIBSTDCPP # jsoncpp, protobuf, tbb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # grpc, gtest + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # grpc, gtest depends on BR2_TOOLCHAIN_HAS_THREADS # jq, protobuf, tbb depends on !BR2_STATIC_LIBS # protobuf, tbb depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc diff --git a/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch b/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch index 92dc5a6c45..5abdf6600f 100644 --- a/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch +++ b/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch @@ -1,4 +1,4 @@ -From 0dfb289a3b362b082ac3608d887e42f09dadc0d2 Mon Sep 17 00:00:00 2001 +From 7fddf245b63d723ffa03e9c87366e4a7673121c8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 31 Dec 2018 16:22:07 +0100 Subject: [PATCH] Properly detect the availability of pthread_setname_np() @@ -18,17 +18,23 @@ Signed-off-by: Thomas Petazzoni this with our cmake based workaround. See: https://github.com/grpc/grpc/pull/27540 ] +Signed-off-by: Michael Nosthoff + +[buildroot at heine.tech: + In 1.52.0 the path of port_platform.h changed. Alter patch accordingly. +] + Signed-off-by: Michael Nosthoff --- - CMakeLists.txt | 6 ++++++ - include/grpc/impl/codegen/port_platform.h | 2 ++ + CMakeLists.txt | 6 ++++++ + include/grpc/support/port_platform.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45c2fcb..0b2be4f 100644 +index b0299050c4..5dfc04be90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -208,6 +208,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) +@@ -247,6 +247,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") @@ -41,11 +47,11 @@ index 45c2fcb..0b2be4f 100644 if(MSVC) include(cmake/msvc_static_runtime.cmake) add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) -diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h -index 4f213ff..55ecd9d 100644 ---- a/include/grpc/impl/codegen/port_platform.h -+++ b/include/grpc/impl/codegen/port_platform.h -@@ -186,6 +186,7 @@ +diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h +index 9f9cac0054..29f99db7cf 100644 +--- a/include/grpc/support/port_platform.h ++++ b/include/grpc/support/port_platform.h +@@ -181,6 +181,7 @@ #endif /* _LP64 */ #ifdef __GLIBC__ #define GPR_POSIX_CRASH_HANDLER 1 @@ -53,7 +59,7 @@ index 4f213ff..55ecd9d 100644 #ifdef __GLIBC_PREREQ #if __GLIBC_PREREQ(2, 12) #define GPR_LINUX_PTHREAD_NAME 1 -@@ -194,6 +195,7 @@ +@@ -189,6 +190,7 @@ // musl libc & others #define GPR_LINUX_PTHREAD_NAME 1 #endif @@ -61,6 +67,6 @@ index 4f213ff..55ecd9d 100644 #include #else /* musl libc */ #define GPR_MUSL_LIBC_COMPAT 1 - -- -2.26.63 +2.34.1 + diff --git a/package/grpc/0003-host-grpc-only-cpp-plugin.patch b/package/grpc/0003-host-grpc-only-cpp-plugin.patch index c68b096df6..73cef78fd8 100644 --- a/package/grpc/0003-host-grpc-only-cpp-plugin.patch +++ b/package/grpc/0003-host-grpc-only-cpp-plugin.patch @@ -1,4 +1,4 @@ -From a1922eadfc87da3dd221ff631f94ddd4a8ee7049 Mon Sep 17 00:00:00 2001 +From 7858880865e3a35a3d1d69ea490fb8f390dee12d Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 25 May 2021 14:55:23 +0200 Subject: [PATCH] Add option to restrict building of (host-)grpc to @@ -14,12 +14,15 @@ Signed-off-by: Fabrice Fontaine Updated for 1.48.0: Signed-off-by: Michael Nosthoff + +Updated for 1.52.1: +Signed-off-by: Michael Nosthoff --- - CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++-------- - 1 file changed, 35 insertions(+), 8 deletions(-) + CMakeLists.txt | 39 +++++++++++++++++++++++++++++++++++---- + 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d3963b074b..51cef83141 100644 +index b0299050c4..d6efe523c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,12 +49,16 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) @@ -39,7 +42,7 @@ index d3963b074b..51cef83141 100644 set(gRPC_INSTALL ${gRPC_INSTALL_default} CACHE BOOL "Generate installation target") -@@ -555,6 +559,8 @@ add_custom_target(plugins +@@ -562,6 +566,8 @@ add_custom_target(plugins DEPENDS ${_gRPC_PLUGIN_LIST} ) @@ -48,7 +51,7 @@ index d3963b074b..51cef83141 100644 add_custom_target(tools_c DEPENDS ) -@@ -567,6 +573,8 @@ add_custom_target(tools_cxx +@@ -573,6 +579,8 @@ add_custom_target(tools_cxx add_custom_target(tools DEPENDS tools_c tools_cxx) @@ -57,7 +60,7 @@ index d3963b074b..51cef83141 100644 protobuf_generate_grpc_cpp_with_import_path_correction( src/proto/grpc/channelz/channelz.proto src/proto/grpc/channelz/channelz.proto ) -@@ -1228,6 +1236,7 @@ if(gRPC_BUILD_TESTS) +@@ -1332,6 +1340,7 @@ if(gRPC_BUILD_TESTS) DEPENDS buildtests_c buildtests_cxx) endif() @@ -65,7 +68,7 @@ index d3963b074b..51cef83141 100644 add_library(address_sorting third_party/address_sorting/address_sorting.c -@@ -1280,6 +1289,8 @@ if(gRPC_INSTALL) +@@ -1385,6 +1394,8 @@ if(gRPC_INSTALL) ) endif() @@ -74,16 +77,16 @@ index d3963b074b..51cef83141 100644 if(gRPC_BUILD_TESTS) add_library(end2end_tests -@@ -1451,6 +1462,8 @@ endforeach() +@@ -1538,6 +1549,8 @@ target_link_libraries(end2end_tests endif() +if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + add_library(gpr - src/core/ext/upb-generated/google/protobuf/any.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c -@@ -2373,6 +2386,8 @@ if(gRPC_INSTALL) + src/core/lib/gpr/alloc.cc + src/core/lib/gpr/atm.cc +@@ -2566,6 +2579,8 @@ if(gRPC_INSTALL) ) endif() @@ -92,7 +95,7 @@ index d3963b074b..51cef83141 100644 if(gRPC_BUILD_TESTS) add_library(grpc_test_util -@@ -2511,6 +2526,8 @@ endif() +@@ -2684,6 +2699,8 @@ endif() endif() @@ -101,7 +104,7 @@ index d3963b074b..51cef83141 100644 add_library(grpc_unsecure src/core/ext/filters/census/grpc_context.cc src/core/ext/filters/channel_idle/channel_idle_filter.cc -@@ -2916,6 +2933,8 @@ if(gRPC_INSTALL) +@@ -3177,6 +3194,8 @@ if(gRPC_INSTALL) ) endif() @@ -110,7 +113,7 @@ index d3963b074b..51cef83141 100644 if(gRPC_BUILD_TESTS) if(gRPC_BUILD_CODEGEN) -@@ -2987,6 +3006,8 @@ endif() +@@ -3262,6 +3281,8 @@ endif() endif() @@ -119,7 +122,7 @@ index d3963b074b..51cef83141 100644 add_library(grpc++ src/core/ext/transport/binder/client/binder_connector.cc src/core/ext/transport/binder/client/channel_create.cc -@@ -3463,6 +3484,7 @@ if(gRPC_INSTALL) +@@ -3717,6 +3738,7 @@ if(gRPC_INSTALL) ) endif() @@ -127,7 +130,7 @@ index d3963b074b..51cef83141 100644 if(gRPC_BUILD_CODEGEN) add_library(grpc++_reflection -@@ -3705,6 +3727,8 @@ target_link_libraries(grpc++_test_util +@@ -3979,6 +4001,8 @@ target_link_libraries(grpc++_test_util endif() @@ -136,7 +139,7 @@ index d3963b074b..51cef83141 100644 add_library(grpc++_unsecure src/cpp/client/channel_cc.cc src/cpp/client/client_callback.cc -@@ -4023,6 +4047,7 @@ if(gRPC_INSTALL) +@@ -4644,6 +4668,7 @@ if(gRPC_INSTALL) ) endif() @@ -144,7 +147,7 @@ index d3963b074b..51cef83141 100644 add_library(grpc_plugin_support src/compiler/cpp_generator.cc -@@ -4082,7 +4107,7 @@ foreach(_hdr +@@ -4705,7 +4730,7 @@ foreach(_hdr endforeach() @@ -153,7 +156,7 @@ index d3963b074b..51cef83141 100644 install(TARGETS grpc_plugin_support EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -@@ -4166,6 +4191,8 @@ endif() +@@ -4791,6 +4816,8 @@ endif() endif() @@ -162,16 +165,16 @@ index d3963b074b..51cef83141 100644 add_library(upb third_party/upb/third_party/utf8_range/naive.c third_party/upb/third_party/utf8_range/range2-neon.c -@@ -4256,6 +4283,8 @@ target_link_libraries(gen_hpack_tables - gpr +@@ -4891,6 +4918,8 @@ target_link_libraries(bad_server_response_test + grpc_test_util ) +endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY + + endif() if(gRPC_BUILD_TESTS) - -@@ -11228,7 +11257,7 @@ target_link_libraries(grpc_cli +@@ -12155,7 +12184,7 @@ target_link_libraries(grpc_completion_queue_test endif() @@ -180,16 +183,16 @@ index d3963b074b..51cef83141 100644 add_executable(grpc_cpp_plugin src/compiler/cpp_plugin.cc -@@ -11258,7 +11287,7 @@ target_link_libraries(grpc_cpp_plugin +@@ -12187,7 +12216,7 @@ target_link_libraries(grpc_cpp_plugin -if(gRPC_INSTALL) +if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) - install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets + install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -@@ -19803,7 +19832,7 @@ endif() +@@ -25209,7 +25238,7 @@ endif() @@ -198,9 +201,12 @@ index d3963b074b..51cef83141 100644 if(gRPC_INSTALL) install(EXPORT gRPCTargets -@@ -19900,3 +19929,5 @@ generate_pkgconfig( +@@ -25317,3 +25346,5 @@ generate_pkgconfig( "-lgrpc++_unsecure" "" "grpc++_unsecure.pc") + +endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY +-- +2.34.1 + diff --git a/package/grpc/Config.in b/package/grpc/Config.in index db6425819b..dffe164e3a 100644 --- a/package/grpc/Config.in +++ b/package/grpc/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_GRPC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS @@ -19,9 +19,9 @@ config BR2_PACKAGE_GRPC http://github.com/grpc/grpc -comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 5" +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 7.3" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index e6b76dcb5e..e53c13476f 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229 grpc-1.51.1.tar.gz +sha256 ec125d7fdb77ecc25b01050a0d5d32616594834d3fe163b016768e2ae42a2df6 grpc-1.52.1.tar.gz sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 9125b1f9f6..fd051170fe 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.51.1 +GRPC_VERSION = 1.52.1 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 diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in index c0a631bd49..581d778d54 100644 --- a/package/sysdig/Config.in +++ b/package/sysdig/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_SYSDIG depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # falcosecurity-libs depends on BR2_LINUX_KERNEL # falcosecurity-libs depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # falcosecurity-libs + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # grpc depends on BR2_TOOLCHAIN_HAS_THREADS # falcosecurity-libs depends on !BR2_STATIC_LIBS # falcosecurity-libs depends on BR2_TOOLCHAIN_USES_GLIBC # falcosecurity-libs @@ -23,12 +23,12 @@ config BR2_PACKAGE_SYSDIG https://github.com/draios/sysdig/wiki -comment "sysdig needs a glibc toolchain w/ C++, threads, gcc >= 5, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" +comment "sysdig needs a glibc toolchain w/ C++, threads, gcc >= 7.3, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_USES_GLIBC \ || !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 -- 2.34.1 From thomas at devoogdt.com Mon Feb 20 13:01:24 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 20 Feb 2023 14:01:24 +0100 Subject: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5 In-Reply-To: <20230220112939.GB446957@igalia.com> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-3-thomas.devoogdt@barco.com> <20230220112939.GB446957@igalia.com> Message-ID: Hi, Compiling webkitgtk takes some time, so I won't check all architectures, but at least this small report is ok: $ cat webkitgtk.config BR2_PACKAGE_XORG7=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_LIBGTK3=y BR2_PACKAGE_WEBKITGTK=y $ ./utils/test-pkg -c webkitgtk.config -p webkitgtk 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]: SKIPPED sourcery-arm [6/6]: SKIPPED 6 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed kr, Thomas Devoogdt Op ma 20 feb. 2023 om 10:29 schreef Adrian Perez de Castro : > > Hi Thomas, all, > > On Mon, 20 Feb 2023 10:09:23 +0100 Thomas Devoogdt wrote: > > From: Thomas Devoogdt > > > > Bugfix release, with many security fixes, including (but not limited to) > > a patch for CVE-2023-23529. > > > > Release notes: > > > > https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html > > Hehe, I was just about to submit this update myself after smoke-testing > a build. Thanks for sending it :-) > > > Accompanying security advisory: > > > > https://webkitgtk.org/security/WSA-2023-0002.html > > > > Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. > > Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, > > we do check on >= GCC 8, because we can't check on >= GCC 8.3. > > > > https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b > > > > Signed-off-by: Thomas Devoogdt > > Acked-by: Adrian Perez de Castro > > > --- > > package/webkitgtk/Config.in | 4 ++-- > > package/webkitgtk/webkitgtk.hash | 8 ++++---- > > package/webkitgtk/webkitgtk.mk | 2 +- > > 3 files changed, 7 insertions(+), 7 deletions(-) > > > > diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in > > index dc5d738dae..976341093e 100644 > > --- a/package/webkitgtk/Config.in > > +++ b/package/webkitgtk/Config.in > > @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > > depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt > > > > -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" > > +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" > > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > > depends on !BR2_BINFMT_FLAT > > depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ > > @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK > > depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby > > depends on BR2_INSTALL_LIBSTDCPP > > depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup > > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 > > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 > > depends on BR2_USE_WCHAR # icu, libsoup > > depends on BR2_PACKAGE_LIBGTK3 > > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > > index 34fd19d3de..c771297b5a 100644 > > --- a/package/webkitgtk/webkitgtk.hash > > +++ b/package/webkitgtk/webkitgtk.hash > > @@ -1,7 +1,7 @@ > > -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums > > -md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz > > -sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz > > -sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz > > +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums > > +md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz > > +sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz > > +sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz > > > > # Hashes for license files: > > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > > index a6974db926..3263f7fea0 100644 > > --- a/package/webkitgtk/webkitgtk.mk > > +++ b/package/webkitgtk/webkitgtk.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -WEBKITGTK_VERSION = 2.38.4 > > +WEBKITGTK_VERSION = 2.38.5 > > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > > WEBKITGTK_INSTALL_STAGING = YES > > -- > > 2.39.2 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > Cheers, > ?Adri?n From fontaine.fabrice at gmail.com Mon Feb 20 13:15:25 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 14:15:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: security bump to version 4.1.7 Message-ID: <20230220131525.1783413-1-fontaine.fabrice@gmail.com> Fix CVE-2023-23969 and CVE-2023-24580 https://docs.djangoproject.com/en/dev/releases/4.1.6 https://docs.djangoproject.com/en/dev/releases/4.1.7 Signed-off-by: Fabrice Fontaine --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 1d3035bb98..cb03b33bfe 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 6b6a47d7478ead15b0a0835841c433dc Django-4.1.5.tar.gz -sha256 ff56ebd7ead0fd5dbe06fe157b0024a7aaea2e0593bb3785fb594cf94dad58ef Django-4.1.5.tar.gz +md5 626f96c63ddfab24bab90d80c87a7aad Django-4.1.7.tar.gz +sha256 44f714b81c5f190d9d2ddad01a532fe502fa01c4cb8faf1d081f4264ed15dcd8 Django-4.1.7.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index e08de68954..e8c91cf51f 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.5 +PYTHON_DJANGO_VERSION = 4.1.7 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/41/c8/b3c469353f9d1b7f0e99b45520582b891da02cd87408bc867affa6e039a3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/9f/a7/07939866241b7e8f8d3bf164b7d6ad428163723e29dd472700f8ab0e5fd5 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 13:21:13 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 14:21:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-cryptography: security bump to version 39.0.1 Message-ID: <20230220132113.1814581-1-fontaine.fabrice@gmail.com> Fix CVE-2023-23931: cryptography is a package designed to expose cryptographic primitives and recipes to Python developers. In affected versions `Cipher.update_into` would accept Python objects which implement the buffer protocol, but provide only immutable buffers. This would allow immutable objects (such as `bytes`) to be mutated, thus violating fundamental rules of Python and resulting in corrupted output. This now correctly raises an exception. This issue has been present since `update_into` was originally introduced in cryptography 1.8. https://github.com/pyca/cryptography/security/advisories/GHSA-w7pp-m8wf-vj6r https://cryptography.io/en/latest/changelog/#v39-0-1 Signed-off-by: Fabrice Fontaine --- package/python-cryptography/python-cryptography.hash | 2 +- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 3f2204eeb1..a23944a06f 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 2d00e023261719f85caf360ee061d37ee27654a0344d1376441c8a29ea3bac86 cryptography-39.0.0.tar.gz +sha256 531348679f144d118156be5b17ddac750974cdcd9f44bb0a7cfd7ddcfee79c80 cryptography-39.0.1.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 6868ff4633..a130b2d10d 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 39.0.0 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.1 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/12/e3/c46c274cf466b24e5d44df5d5cd31a31ff23e57f074a2bb30931a8c9b01a +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/6a/f5/a729774d087e50fffd1438b3877a91e9281294f985bda0fd15bf99016c78 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 13:25:51 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 14:25:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/speechd: fix build with help2man Message-ID: <20230220132552.1825946-1-fontaine.fabrice@gmail.com> Fix the following build failure with help2man raised since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: LC_ALL=C help2man -n "speech synthesis daemon" --output=speech-dispatcher.1 ./speech-dispatcher help2man: can't get `--help' info from ./speech-dispatcher Try `--no-discard-stderr' if option outputs to stderr Fixes: - http://autobuild.buildroot.org/results/cc1817efb4a5d54ffd2e7ac2f4fc773535f70972 Signed-off-by: Fabrice Fontaine --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 46c0672f59..dee94a6752 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,6 +12,7 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile +SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" SPEECHD_CONF_OPTS = --without-kali # fix missing config.rpath (needed for autoreconf) in the codebase -- 2.39.0 From aperez at igalia.com Mon Feb 20 13:27:27 2023 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 20 Feb 2023 15:27:27 +0200 Subject: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5 In-Reply-To: References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-3-thomas.devoogdt@barco.com> <20230220112939.GB446957@igalia.com> Message-ID: <20230220152727.GB497036@igalia.com> On Mon, 20 Feb 2023 14:01:24 +0100 Thomas Devoogdt wrote: > Hi, > > Compiling webkitgtk takes some time, so I won't check all > architectures, but at least this small report is ok: > > $ cat webkitgtk.config > BR2_PACKAGE_XORG7=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_OPENGL_GLX=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y > BR2_PACKAGE_LIBGTK3=y > BR2_PACKAGE_WEBKITGTK=y > > $ ./utils/test-pkg -c webkitgtk.config -p webkitgtk > 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]: SKIPPED > sourcery-arm [6/6]: SKIPPED > 6 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed My ARM64 builds (glibc, musl) completed just fine, too :-) > kr, > > Thomas Devoogdt > > Op ma 20 feb. 2023 om 10:29 schreef Adrian Perez de Castro : > > > > Hi Thomas, all, > > > > On Mon, 20 Feb 2023 10:09:23 +0100 Thomas Devoogdt wrote: > > > From: Thomas Devoogdt > > > > > > Bugfix release, with many security fixes, including (but not limited to) > > > a patch for CVE-2023-23529. > > > > > > Release notes: > > > > > > https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html > > > > Hehe, I was just about to submit this update myself after smoke-testing > > a build. Thanks for sending it :-) > > > > > Accompanying security advisory: > > > > > > https://webkitgtk.org/security/WSA-2023-0002.html > > > > > > Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. > > > Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, > > > we do check on >= GCC 8, because we can't check on >= GCC 8.3. > > > > > > https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b > > > > > > Signed-off-by: Thomas Devoogdt > > > > Acked-by: Adrian Perez de Castro > > > > > --- > > > package/webkitgtk/Config.in | 4 ++-- > > > package/webkitgtk/webkitgtk.hash | 8 ++++---- > > > package/webkitgtk/webkitgtk.mk | 2 +- > > > 3 files changed, 7 insertions(+), 7 deletions(-) > > > > > > diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in > > > index dc5d738dae..976341093e 100644 > > > --- a/package/webkitgtk/Config.in > > > +++ b/package/webkitgtk/Config.in > > > @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > > > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > > > depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt > > > > > > -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" > > > +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" > > > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > > > depends on !BR2_BINFMT_FLAT > > > depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ > > > @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK > > > depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby > > > depends on BR2_INSTALL_LIBSTDCPP > > > depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup > > > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 > > > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 > > > depends on BR2_USE_WCHAR # icu, libsoup > > > depends on BR2_PACKAGE_LIBGTK3 > > > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > > > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > > > index 34fd19d3de..c771297b5a 100644 > > > --- a/package/webkitgtk/webkitgtk.hash > > > +++ b/package/webkitgtk/webkitgtk.hash > > > @@ -1,7 +1,7 @@ > > > -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums > > > -md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz > > > -sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz > > > -sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz > > > +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums > > > +md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz > > > +sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz > > > +sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz > > > > > > # Hashes for license files: > > > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > > > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > > > index a6974db926..3263f7fea0 100644 > > > --- a/package/webkitgtk/webkitgtk.mk > > > +++ b/package/webkitgtk/webkitgtk.mk > > > @@ -4,7 +4,7 @@ > > > # > > > ################################################################################ > > > > > > -WEBKITGTK_VERSION = 2.38.4 > > > +WEBKITGTK_VERSION = 2.38.5 > > > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > > > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > > > WEBKITGTK_INSTALL_STAGING = YES > > > -- > > > 2.39.2 > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > > > > Cheers, > > ?Adri?n > _______________________________________________ > 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 thomas.petazzoni at bootlin.com Mon Feb 20 14:06:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 15:06:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: fix per-package build In-Reply-To: <20230220094653.105814-1-fontaine.fabrice@gmail.com> References: <20230220094653.105814-1-fontaine.fabrice@gmail.com> Message-ID: <20230220150625.6a523f4f@windsurf> Hello Fabrice, On Mon, 20 Feb 2023 10:46:53 +0100 Fabrice Fontaine wrote: > Fix the following per-package build failure raised since commit > 9525bc7e64e8f44c31ab9dfd3f516ecb35982429: Thanks for the fix. However, why do you think this is related to per-package? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 14:07:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 15:07:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/glslsandbox-player: fix build with rockchip-mali In-Reply-To: <20230220112410.953669-1-fontaine.fabrice@gmail.com> References: <20230220112410.953669-1-fontaine.fabrice@gmail.com> Message-ID: <20230220150704.7ff37d71@windsurf> On Mon, 20 Feb 2023 12:24:10 +0100 Fabrice Fontaine wrote: > + PKG_CHECK_MODULES([egl], [egl >= 1]) > +-PKG_CHECK_MODULES([glesv2], [glesv2 >= 1]) > ++PKG_CHECK_MODULES([glesv2], [glesv2]) Is this the proper solution, or is the proper solution to patch rockchip-mali's .pc file? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Mon Feb 20 14:23:42 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 15:23:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/glslsandbox-player: fix build with rockchip-mali In-Reply-To: <20230220150704.7ff37d71@windsurf> References: <20230220112410.953669-1-fontaine.fabrice@gmail.com> <20230220150704.7ff37d71@windsurf> Message-ID: Le lun. 20 f?vr. 2023 ? 15:07, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > On Mon, 20 Feb 2023 12:24:10 +0100 > Fabrice Fontaine wrote: > > > + PKG_CHECK_MODULES([egl], [egl >= 1]) > > +-PKG_CHECK_MODULES([glesv2], [glesv2 >= 1]) > > ++PKG_CHECK_MODULES([glesv2], [glesv2]) > > Is this the proper solution, or is the proper solution to patch > rockchip-mali's .pc file? > Patching rockchip-mali is probably better but I don't know what version number should be put inside glesv2.pc. Should I hardcode 2 in the pkgconfig file? Moreover, should I patch the file through a sed in buildroot or send an upstream patch? Upstreaming this change is probably impossible as rockchip-mali uses a commit from October 2018 and the pkgconfig is not available anymore in usptream master. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Mon Feb 20 14:25:50 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 15:25:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: fix per-package build In-Reply-To: <20230220150625.6a523f4f@windsurf> References: <20230220094653.105814-1-fontaine.fabrice@gmail.com> <20230220150625.6a523f4f@windsurf> Message-ID: Hello Thomas, Le lun. 20 f?vr. 2023 ? 15:06, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > Hello Fabrice, > > On Mon, 20 Feb 2023 10:46:53 +0100 > Fabrice Fontaine wrote: > > > Fix the following per-package build failure raised since commit > > 9525bc7e64e8f44c31ab9dfd3f516ecb35982429: > > Thanks for the fix. However, why do you think this is related to > per-package? > Indeed, the build failures are also raised without per-package, I'll send a v2. > > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Mon Feb 20 14:27:46 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 15:27:46 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/libarchive: fix host build Message-ID: <20230220142746.1935069-1-fontaine.fabrice@gmail.com> Fix the following host build failure raised since commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429: configure.ac:140: error: possibly undefined macro: AC_MSG_FAILURE If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:328: error: possibly undefined macro: AC_CHECK_LIB Fixes: - http://autobuild.buildroot.org/results/11868e9bc4916843a7fc76f7b5e4c251f89e33dc Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni): - Drop per-package from commit message package/libarchive/libarchive.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cd7c13fbed..2010b6529f 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -140,6 +140,8 @@ endif # The only user of host-libarchive needs zlib support HOST_LIBARCHIVE_DEPENDENCIES = host-zlib +# needed for autoreconf +HOST_LIBARCHIVE_DEPENDENCIES += host-pkgconf HOST_LIBARCHIVE_CONF_OPTS = \ --disable-bsdtar \ --disable-bsdcpio \ -- 2.39.0 From thomas.petazzoni at bootlin.com Mon Feb 20 14:59:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 15:59:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/glslsandbox-player: fix build with rockchip-mali In-Reply-To: References: <20230220112410.953669-1-fontaine.fabrice@gmail.com> <20230220150704.7ff37d71@windsurf> Message-ID: <20230220155909.634ee802@windsurf> On Mon, 20 Feb 2023 15:23:42 +0100 Fabrice Fontaine wrote: > Patching rockchip-mali is probably better but I don't know what version > number should be put inside glesv2.pc. > Should I hardcode 2 in the pkgconfig file? I guess whatever works for glslsandbox-player. Packages like rockchip-mali are anyway crappy. > Moreover, should I patch the file through a sed in buildroot or send an > upstream patch? > Upstreaming this change is probably impossible as rockchip-mali uses a > commit from October 2018 and the pkgconfig is not available anymore in > usptream master. I suppose a patch is fine, and it won't be upstream. As said above, those OpenGL blobs are anyway crappy :-/ Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Mon Feb 20 17:06:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:06:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/less: fix CVE-2022-46663 In-Reply-To: <20230219175204.645686-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 19 Feb 2023 18:52:04 +0100") References: <20230219175204.645686-1-fontaine.fabrice@gmail.com> Message-ID: <87cz641d2z.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > In GNU Less before 609, crafted data can result in "less -R" not > filtering ANSI escape sequences sent to the terminal. > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:06:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:06:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.88.0 In-Reply-To: <20230219190745.412680-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 19 Feb 2023 20:07:45 +0100") References: <20230219190745.412680-1-bernd.kuhls@t-online.de> Message-ID: <878rgs1d2g.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://curl.se/changes.html#7_88_0 > Updated license hash due to copyright year bump: > https://github.com/curl/curl/commit/2bc1d775f510196154283374284f98d3eae03544#diff-400d38e5cfee181230373a8b02d38f50271a5bf62c62410382efddb8e8b19e22 > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:09:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:09:12 +0100 Subject: [Buildroot] [PATCH] package/libostree: bump to version 2023.1 In-Reply-To: <20230220072513.2336540-1-marcus.folkesson@gmail.com> (Marcus Folkesson's message of "Mon, 20 Feb 2023 08:25:13 +0100") References: <20230220072513.2336540-1-marcus.folkesson@gmail.com> Message-ID: <874jrg1cxz.fsf@dell.be.48ers.dk> >>>>> "Marcus" == Marcus Folkesson writes: > Signed-off-by: Marcus Folkesson > --- > package/libostree/libostree.hash | 2 +- > package/libostree/libostree.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash > index ed31109fdb..3098cdd1fc 100644 > --- a/package/libostree/libostree.hash > +++ b/package/libostree/libostree.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f libostree-2022.7.tar.xz > +sha256 dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55 libostree-2023.1.tar.xz NIT: Syntax is sha256 as pointed out by ./utils/check-package: package/libostree/libostree.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Committed with that fixed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:10:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:10:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: security bump to version 4.1.7 In-Reply-To: <20230220131525.1783413-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 20 Feb 2023 14:15:25 +0100") References: <20230220131525.1783413-1-fontaine.fabrice@gmail.com> Message-ID: <87zg98z2hw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-23969 and CVE-2023-24580 > https://docs.djangoproject.com/en/dev/releases/4.1.6 > https://docs.djangoproject.com/en/dev/releases/4.1.7 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:11:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:11:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-cryptography: security bump to version 39.0.1 In-Reply-To: <20230220132113.1814581-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 20 Feb 2023 14:21:13 +0100") References: <20230220132113.1814581-1-fontaine.fabrice@gmail.com> Message-ID: <87v8jwz2h4.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-23931: cryptography is a package designed to expose > cryptographic primitives and recipes to Python developers. In affected > versions `Cipher.update_into` would accept Python objects which > implement the buffer protocol, but provide only immutable buffers. This > would allow immutable objects (such as `bytes`) to be mutated, thus > violating fundamental rules of Python and resulting in corrupted output. > This now correctly raises an exception. This issue has been present > since `update_into` was originally introduced in cryptography 1.8. > https://github.com/pyca/cryptography/security/advisories/GHSA-w7pp-m8wf-vj6r > https://cryptography.io/en/latest/changelog/#v39-0-1 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:12:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:12:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/glslsandbox-player: add wayland-protocols optional dependency In-Reply-To: <20230220103001.607877-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 20 Feb 2023 11:30:01 +0100") References: <20230220103001.607877-1-fontaine.fabrice@gmail.com> Message-ID: <87r0ukz2ey.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > wayland-protocols is an optional dependency which is enabled by default > resulting in the following wayland build failure since the addition of > the package in commit f201ca9d0d25b491ec5e1ed4e1d02fd52d027997: > checking for wayland_client... yes > checking for wayland_egl... yes > configure: Wayland EGL support enabled > checking for wayland_protocols... no > configure: error: Package requirements (wayland-protocols >= 1.12) were not met: > Package 'wayland-protocols', required by 'virtual:world', not found > Consider adjusting the PKG_CONFIG_PATH environment variable if you > installed software in a non-standard prefix. > Alternatively, you may set the environment variables wayland_protocols_CFLAGS > and wayland_protocols_LIBS to avoid the need to call pkg-config. > Fixes: > - http://autobuild.buildroot.org/results/865af860f9e52fe5311bb0c6a246ff871ae5a989 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:13:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:13:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/rockchip-mali: needs C++ In-Reply-To: <20230220112147.952174-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 20 Feb 2023 12:21:47 +0100") References: <20230220112147.952174-1-fontaine.fabrice@gmail.com> Message-ID: <87mt58z2du.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > rockchip-mali pre-built libraries needs C++ since the addition of the > package in commit 97c74a73e5dee17530647f89b2c7d8692781eb14: > readelf -a output/build/rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427/lib/aarch64-linux-gnu/libmali-bifrost-g31-rxp0-gbm.so|grep NEEDED > 0x0000000000000001 (NEEDED) Shared library: [libpthread.so.0] > 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] > 0x0000000000000001 (NEEDED) Shared library: [librt.so.1] > 0x0000000000000001 (NEEDED) Shared library: [libdrm.so.2] > 0x0000000000000001 (NEEDED) Shared library: [libm.so.6] > 0x0000000000000001 (NEEDED) Shared library: [libstdc++.so.6] > 0x0000000000000001 (NEEDED) Shared library: [libgcc_s.so.1] > 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] > While at it, add a comment when dependencies are not met > Fixes: > - No autobuilder failures (yet), found when debugging an issue with > rockchip-mali and glslsandbox-player > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:05:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:05:06 +0100 Subject: [Buildroot] [git commit] package/less: fix CVE-2022-46663 Message-ID: <20230220171438.89596863E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=924ca9414fa962ce767c39b277489a0bdcbfad79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In GNU Less before 609, crafted data can result in "less -R" not filtering ANSI escape sequences sent to the terminal. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...rlink-on-invalid-embedded-escape-sequence.patch | 27 ++++++++++++++++++++++ package/less/less.mk | 3 +++ 2 files changed, 30 insertions(+) diff --git a/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch new file mode 100644 index 0000000000..233f949e24 --- /dev/null +++ b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch @@ -0,0 +1,27 @@ +From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 +From: Mark Nudelman +Date: Fri, 7 Oct 2022 19:25:46 -0700 +Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. + +[Retrieved from: +https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c] +Signed-off-by: Fabrice Fontaine +--- + line.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/line.c b/line.c +index 236c49ae..cba7bdd1 100644 +--- a/line.c ++++ b/line.c +@@ -633,8 +633,8 @@ ansi_step(pansi, ch) + /* Hyperlink ends with \7 or ESC-backslash. */ + if (ch == '\7') + return ANSI_END; +- if (pansi->prev_esc && ch == '\\') +- return ANSI_END; ++ if (pansi->prev_esc) ++ return (ch == '\\') ? ANSI_END : ANSI_ERR; + pansi->prev_esc = (ch == ESC); + return ANSI_MID; + } diff --git a/package/less/less.mk b/package/less/less.mk index 7d7a6d5fe5..f01f94d6c8 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -11,6 +11,9 @@ LESS_LICENSE_FILES = COPYING LESS_CPE_ID_VENDOR = gnu LESS_DEPENDENCIES = ncurses +# 0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch +LESS_IGNORE_CVES += CVE-2022-46663 + define LESS_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less endef From peter at korsgaard.com Mon Feb 20 17:07:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:07:55 +0100 Subject: [Buildroot] [git commit] package/libostree: bump to version 2023.1 Message-ID: <20230220171438.D94BD863E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d37b3916a1ce75085da8232db95cfd354137e540 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index ed31109fdb..63dfe98d80 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f libostree-2022.7.tar.xz +sha256 dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55 libostree-2023.1.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 8e8ec63213..4b17fcf391 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2022.7 +LIBOSTREE_VERSION = 2023.1 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From peter at korsgaard.com Mon Feb 20 17:06:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:06:49 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: security bump to version 2.38.5 Message-ID: <20230220171438.C09D6863E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7852618c23756d8a79809a4e9e9c331a8fb0cf16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bugfix release, fixes zero-day CVE-2023-23529 and includes a few build and behaviour patches as well. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.5.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0002.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index dcd082e045..0fa1018721 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums -md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz -sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz -sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.5.tar.xz.sums +md5 73f7abd0c1cc808032869f72602166e3 wpewebkit-2.38.5.tar.xz +sha1 3f10a04758eeb349f63f841aff765dae25bcde1b wpewebkit-2.38.5.tar.xz +sha256 ff00fd3d0a4c6d551850a78a7dfe4883b6b7ebd93c5549e1121b2f43d3ac1661 wpewebkit-2.38.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b9c2fef395..48e5c2f8cd 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.4 +WPEWEBKIT_VERSION = 2.38.5 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 17:13:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:13:07 +0100 Subject: [Buildroot] [git commit] package/rockchip-mali: needs C++ Message-ID: <20230220171439.45181863E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f1858e859833da272fce70bf445ca1b53ebffe1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master rockchip-mali pre-built libraries needs C++ since the addition of the package in commit 97c74a73e5dee17530647f89b2c7d8692781eb14: readelf -a output/build/rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427/lib/aarch64-linux-gnu/libmali-bifrost-g31-rxp0-gbm.so|grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libpthread.so.0] 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] 0x0000000000000001 (NEEDED) Shared library: [librt.so.1] 0x0000000000000001 (NEEDED) Shared library: [libdrm.so.2] 0x0000000000000001 (NEEDED) Shared library: [libm.so.6] 0x0000000000000001 (NEEDED) Shared library: [libstdc++.so.6] 0x0000000000000001 (NEEDED) Shared library: [libgcc_s.so.1] 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] While at it, add a comment when dependencies are not met Fixes: - No autobuilder failures (yet), found when debugging an issue with rockchip-mali and glslsandbox-player Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/rockchip-mali/Config.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/rockchip-mali/Config.in b/package/rockchip-mali/Config.in index d616284911..5a23954af3 100644 --- a/package/rockchip-mali/Config.in +++ b/package/rockchip-mali/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ROCKCHIP_MALI bool "rockchip-mali" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_ARM_EABIHF || BR2_aarch64 # lidbrm. This would normally need a Config.in comment, but @@ -30,3 +31,8 @@ config BR2_PACKAGE_PROVIDES_LIBGBM default "rockchip-mali" endif + +comment "rockchip-mali needs a glibc toolchain w/ C++, threads" + depends on BR2_ARM_EABIHF || BR2_aarch64 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS From peter at korsgaard.com Mon Feb 20 17:05:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:05:58 +0100 Subject: [Buildroot] [git commit] package/libcurl: bump version to 7.88.0 Message-ID: <20230220171438.A3DCE863E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14ca6b5fdb6a5e0fa99b04461240772d93076b2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://curl.se/changes.html#7_88_0 Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/2bc1d775f510196154283374284f98d3eae03544#diff-400d38e5cfee181230373a8b02d38f50271a5bf62c62410382efddb8e8b19e22 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 230ec8d704..714b02acb0 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.87.0.tar.xz.asc +# https://curl.se/download/curl-7.88.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff curl-7.87.0.tar.xz -sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING +sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 994b685d34..eb481e4782 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.87.0 +LIBCURL_VERSION = 7.88.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From peter at korsgaard.com Mon Feb 20 17:12:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:12:11 +0100 Subject: [Buildroot] [git commit] package/glslsandbox-player: add wayland-protocols optional dependency Message-ID: <20230220171439.2AD36863E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee13e3fb41dc7c0c001127733b5a599c1e509747 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master wayland-protocols is an optional dependency which is enabled by default resulting in the following wayland build failure since the addition of the package in commit f201ca9d0d25b491ec5e1ed4e1d02fd52d027997: checking for wayland_client... yes checking for wayland_egl... yes configure: Wayland EGL support enabled checking for wayland_protocols... no configure: error: Package requirements (wayland-protocols >= 1.12) were not met: Package 'wayland-protocols', required by 'virtual:world', not found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables wayland_protocols_CFLAGS and wayland_protocols_LIBS to avoid the need to call pkg-config. Fixes: - http://autobuild.buildroot.org/results/865af860f9e52fe5311bb0c6a246ff871ae5a989 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/glslsandbox-player/Config.in | 5 ++++- package/glslsandbox-player/glslsandbox-player.mk | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 132705584e..530c158fc3 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -111,8 +111,11 @@ endchoice if BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI bool "Wayland IVI shell support" -endif +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG + bool "Wayland XDG shell support" + select BR2_PACKAGE_WAYLAND_PROTOCOLS +endif endif comment "glslsandbox-player needs openGL ES and EGL driver" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index f0a9475aa6..241f3475d2 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -72,6 +72,12 @@ GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-ivi else GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-ivi endif +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += wayland-protocols +GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-wlxdg +else +GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-wlxdg +endif else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += xlib_libX11 GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=x11 From peter at korsgaard.com Mon Feb 20 17:10:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:10:37 +0100 Subject: [Buildroot] [git commit] package/python-django: security bump to version 4.1.7 Message-ID: <20230220171438.EFD28863E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a85ed5d21c14cbe3ec2864206fe792152598e4db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2023-23969 and CVE-2023-24580 https://docs.djangoproject.com/en/dev/releases/4.1.6 https://docs.djangoproject.com/en/dev/releases/4.1.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 1d3035bb98..cb03b33bfe 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 6b6a47d7478ead15b0a0835841c433dc Django-4.1.5.tar.gz -sha256 ff56ebd7ead0fd5dbe06fe157b0024a7aaea2e0593bb3785fb594cf94dad58ef Django-4.1.5.tar.gz +md5 626f96c63ddfab24bab90d80c87a7aad Django-4.1.7.tar.gz +sha256 44f714b81c5f190d9d2ddad01a532fe502fa01c4cb8faf1d081f4264ed15dcd8 Django-4.1.7.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index e08de68954..e8c91cf51f 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.5 +PYTHON_DJANGO_VERSION = 4.1.7 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/41/c8/b3c469353f9d1b7f0e99b45520582b891da02cd87408bc867affa6e039a3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/9f/a7/07939866241b7e8f8d3bf164b7d6ad428163723e29dd472700f8ab0e5fd5 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 17:11:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:11:07 +0100 Subject: [Buildroot] [git commit] package/python-cryptography: security bump to version 39.0.1 Message-ID: <20230220171439.123BA863E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67c967c2d16c29f193fde43b3c48edf0911baccd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2023-23931: cryptography is a package designed to expose cryptographic primitives and recipes to Python developers. In affected versions `Cipher.update_into` would accept Python objects which implement the buffer protocol, but provide only immutable buffers. This would allow immutable objects (such as `bytes`) to be mutated, thus violating fundamental rules of Python and resulting in corrupted output. This now correctly raises an exception. This issue has been present since `update_into` was originally introduced in cryptography 1.8. https://github.com/pyca/cryptography/security/advisories/GHSA-w7pp-m8wf-vj6r https://cryptography.io/en/latest/changelog/#v39-0-1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-cryptography/python-cryptography.hash | 2 +- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 3f2204eeb1..a23944a06f 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 2d00e023261719f85caf360ee061d37ee27654a0344d1376441c8a29ea3bac86 cryptography-39.0.0.tar.gz +sha256 531348679f144d118156be5b17ddac750974cdcd9f44bb0a7cfd7ddcfee79c80 cryptography-39.0.1.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 6868ff4633..a130b2d10d 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 39.0.0 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.1 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/12/e3/c46c274cf466b24e5d44df5d5cd31a31ff23e57f074a2bb30931a8c9b01a +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/6a/f5/a729774d087e50fffd1438b3877a91e9281294f985bda0fd15bf99016c78 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From peter at korsgaard.com Mon Feb 20 17:17:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:17:59 +0100 Subject: [Buildroot] [PATCH v1 1/3] Revert "xorg-server: not available with musl on ARM" In-Reply-To: <20230220090923.2155635-1-thomas.devoogdt@barco.com> (Thomas Devoogdt's message of "Mon, 20 Feb 2023 10:09:21 +0100") References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> Message-ID: <87ilfwz260.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > From: Thomas Devoogdt > This reverts commit 9daafbcb75a7ab593ce8a1f21c6149c8437bc0bc. > Fixed since https://gitlab.freedesktop.org/xorg/xserver/-/issues/840. I've added a note that this was included since xserver 1.20.6 and committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:22:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:22:16 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: <20230220090923.2155635-2-thomas.devoogdt@barco.com> (Thomas Devoogdt's message of "Mon, 20 Feb 2023 10:09:22 +0100") References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-2-thomas.devoogdt@barco.com> Message-ID: <87edqkz1yv.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > The reason why it was not used was that at-spi2-core and at-spi2-atk were not available, > since then, it is, so drop this patch. This will also avoid warnings in webkitgtk. > Signed-off-by: Thomas Devoogdt > --- > package/libgtk3/0001-disable-atk-bridge.patch | 41 ------------------- > package/libgtk3/Config.in | 2 + > package/libgtk3/libgtk3.mk | 4 +- > 3 files changed, 4 insertions(+), 43 deletions(-) > delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch > diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch > deleted file mode 100644 > index f3e9bff2ba..0000000000 > --- a/package/libgtk3/0001-disable-atk-bridge.patch > +++ /dev/null > @@ -1,41 +0,0 @@ > -Remove atk-bridge support. > - > -atk-bridge doesn't seem useful for now in Buildroot and requires to > -add two new packages just for it: at-spi2-core and at-spi2-atk. > - > -Signed-off-by: Hadrien Boutteville > - > ---- a/gtk/a11y/gtkaccessibility.c > -+++ b/gtk/a11y/gtkaccessibility.c > -@@ -37,10 +37,6 @@ > - #include > - #include > - > --#ifdef GDK_WINDOWING_X11 > --#include > --#endif > -- > - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, > - guint n_param_values, > - const GValue *param_values, > -@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) > - _gtk_accessibility_override_atk_util (); > - do_window_event_initialization (); > - > --#ifdef GDK_WINDOWING_X11 > -- atk_bridge_adaptor_init (NULL, NULL); > --#endif > -- > - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); > - } > ---- a/meson.build > -+++ b/meson.build > -@@ -564,7 +564,7 @@ if x11_enabled > - xfixes_dep = dependency('xfixes', required: false) > - xcomposite_dep = dependency('xcomposite', required: false) > - fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) > -- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) > -+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) > - > - backend_immodules += ['xim'] > - > diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in > index 82ca68d2da..d921f79226 100644 > --- a/package/libgtk3/Config.in > +++ b/package/libgtk3/Config.in > @@ -24,6 +24,8 @@ config BR2_PACKAGE_LIBGTK3 > depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ > BR2_PACKAGE_HAS_LIBGL > select BR2_PACKAGE_ATK > + select BR2_PACKAGE_AT_SPI2_ATK > + select BR2_PACKAGE_AT_SPI2_CORE at-spi2-core depends on xorg7 / xlib-libXtst, so that would mean that we would pull that in even for libgtk3 builds with the broadway/wayland backends, is that sensible? Maybe it is? Does at-spi2 work under wayland? -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:22:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:22:45 +0100 Subject: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5 In-Reply-To: <20230220090923.2155635-3-thomas.devoogdt@barco.com> (Thomas Devoogdt's message of "Mon, 20 Feb 2023 10:09:23 +0100") References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-3-thomas.devoogdt@barco.com> Message-ID: <87a618z1y2.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > From: Thomas Devoogdt > Bugfix release, with many security fixes, including (but not limited to) > a patch for CVE-2023-23529. > Release notes: > https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html > Accompanying security advisory: > https://webkitgtk.org/security/WSA-2023-0002.html > Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. > Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, > we do check on >= GCC 8, because we can't check on >= GCC 8.3. > https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b > Signed-off-by: Thomas Devoogdt Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:17:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:17:14 +0100 Subject: [Buildroot] [git commit] Revert "xorg-server: not available with musl on ARM" Message-ID: <20230220172325.5381C86400@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b21cd8be3f9469d6bdbbaed951ae7c59efb46a24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 9daafbcb75a7ab593ce8a1f21c6149c8437bc0bc. Fixed since https://gitlab.freedesktop.org/xorg/xserver/-/issues/840 (xserver 1.20.6). Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 865917c4ec..b933bd0285 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -1,11 +1,6 @@ -comment "xorg-server needs a glibc or uClibc toolchain" - depends on BR2_arm && BR2_TOOLCHAIN_USES_MUSL - config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" depends on BR2_USE_MMU # fork() - # xserver uses inb/outb on arm, which aren't available with musl - depends on !(BR2_arm && BR2_TOOLCHAIN_USES_MUSL) # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. From peter at korsgaard.com Mon Feb 20 17:22:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:22:29 +0100 Subject: [Buildroot] [git commit] package/webkitgtk: security bump to version 2.38.5 Message-ID: <20230220172325.5D93F86401@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c7fcbbe75de5c535e8d5dd7182900b6d09e2b03 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bugfix release, with many security fixes, including (but not limited to) a patch for CVE-2023-23529. Release notes: https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0002.html Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, we do check on >= GCC 8, because we can't check on >= GCC 8.3. https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b Signed-off-by: Thomas Devoogdt Acked-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 4 ++-- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index dc5d738dae..976341093e 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 34fd19d3de..c771297b5a 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums -md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz -sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz -sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums +md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz +sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz +sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index a6974db926..3263f7fea0 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.4 +WEBKITGTK_VERSION = 2.38.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From thomas at devoogdt.com Mon Feb 20 18:53:59 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 20 Feb 2023 19:53:59 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: <87edqkz1yv.fsf@dell.be.48ers.dk> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-2-thomas.devoogdt@barco.com> <87edqkz1yv.fsf@dell.be.48ers.dk> Message-ID: Hi, I see that X11 support is optional and is automatically detected: https://github.com/GNOME/at-spi2-core/blob/main/meson_options.txt#L31-L34 So it would be better to append a commit to this one to remove the Xorg dependency on at-spi2-core. Kr, Thomas Devoogdt Op ma 20 feb. 2023 om 18:22 schreef Peter Korsgaard : > > >>>>> "Thomas" == Thomas Devoogdt writes: > > > The reason why it was not used was that at-spi2-core and at-spi2-atk were not available, > > since then, it is, so drop this patch. This will also avoid warnings in webkitgtk. > > > Signed-off-by: Thomas Devoogdt > > --- > > package/libgtk3/0001-disable-atk-bridge.patch | 41 ------------------- > > package/libgtk3/Config.in | 2 + > > package/libgtk3/libgtk3.mk | 4 +- > > 3 files changed, 4 insertions(+), 43 deletions(-) > > delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch > > > diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch > > deleted file mode 100644 > > index f3e9bff2ba..0000000000 > > --- a/package/libgtk3/0001-disable-atk-bridge.patch > > +++ /dev/null > > @@ -1,41 +0,0 @@ > > -Remove atk-bridge support. > > - > > -atk-bridge doesn't seem useful for now in Buildroot and requires to > > -add two new packages just for it: at-spi2-core and at-spi2-atk. > > - > > -Signed-off-by: Hadrien Boutteville > > - > > ---- a/gtk/a11y/gtkaccessibility.c > > -+++ b/gtk/a11y/gtkaccessibility.c > > -@@ -37,10 +37,6 @@ > > - #include > > - #include > > - > > --#ifdef GDK_WINDOWING_X11 > > --#include > > --#endif > > -- > > - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, > > - guint n_param_values, > > - const GValue *param_values, > > -@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) > > - _gtk_accessibility_override_atk_util (); > > - do_window_event_initialization (); > > - > > --#ifdef GDK_WINDOWING_X11 > > -- atk_bridge_adaptor_init (NULL, NULL); > > > --#endif > > -- > > - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); > > - } > > ---- a/meson.build > > -+++ b/meson.build > > -@@ -564,7 +564,7 @@ if x11_enabled > > - xfixes_dep = dependency('xfixes', required: false) > > - xcomposite_dep = dependency('xcomposite', required: false) > > - fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) > > -- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) > > -+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) > > - > > - backend_immodules += ['xim'] > > - > > > diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in > > index 82ca68d2da..d921f79226 100644 > > --- a/package/libgtk3/Config.in > > +++ b/package/libgtk3/Config.in > > @@ -24,6 +24,8 @@ config BR2_PACKAGE_LIBGTK3 > > depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ > > BR2_PACKAGE_HAS_LIBGL > > select BR2_PACKAGE_ATK > > + select BR2_PACKAGE_AT_SPI2_ATK > > + select BR2_PACKAGE_AT_SPI2_CORE > > at-spi2-core depends on xorg7 / xlib-libXtst, so that would mean that we > would pull that in even for libgtk3 builds with the broadway/wayland > backends, is that sensible? > > Maybe it is? Does at-spi2 work under wayland? > > -- > Bye, Peter Korsgaard > From bernd.kuhls at t-online.de Mon Feb 20 19:18:22 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 20 Feb 2023 20:18:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 22.3.5 Message-ID: <20230220191822.99026-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.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 9177adceda..ad1999a30d 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 = 22.3.4 +MESA3D_HEADERS_VERSION = 22.3.5 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 e4de997f0e..50c5bcc7fc 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html -sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz -sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.html +sha256 3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9 mesa-22.3.5.tar.xz +sha512 a4cad9b7e6501678fac279bd88a37e522633c7128afa8df04982f469c930e3557bb1d05b4b0f5ae16704d8d04e50c90a7489943a48861df17dd947704c329b85 mesa-22.3.5.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 36b7151510..a744334c5b 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 = 22.3.4 +MESA3D_VERSION = 22.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.39.1 From fontaine.fabrice at gmail.com Mon Feb 20 19:21:25 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 20:21:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: fix uclibc with libiconv build Message-ID: <20230220192125.555632-1-fontaine.fabrice@gmail.com> Replace patch added by commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429 as current patch is not correct, build failures are still raised by uclibc-ng with libiconv on fwup/gvfs/...: configure: error: Requires libarchive. Libarchive must be built with zlib support. [...] Run-time dependency libarchive found: NO (tried cmake) ../output-1/build/gvfs-1.48.1/meson.build:405:2: ERROR: Dependency lookup for libarchive with method 'pkgconfig' failed: Could not generate cargs for libarchive: Package iconv was not found in the pkg-config search path. Perhaps you should add the directory containing `iconv.pc' to the PKG_CONFIG_PATH environment variable Package 'iconv', required by 'libarchive', not found Fixes: - http://autobuild.buildroot.org/results/05a5496495e51da2c9caf7570695cc95e1745e30 - http://autobuild.buildroot.org/results/98dc4b415115cca65b53e4cd986144ef85bf17ad Signed-off-by: Fabrice Fontaine --- ...y-add-iconv-to-the-pc-file-if-needed.patch | 44 ------------------- ...o-not-add-iconv-for-Requires.private.patch | 28 ++++++++++++ 2 files changed, 28 insertions(+), 44 deletions(-) delete mode 100644 package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch create mode 100644 package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch deleted file mode 100644 index c93944f789..0000000000 --- a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 -From: Peter Pentchev -Date: Thu, 29 Dec 2022 00:04:40 +0200 -Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) - -Hi, - -Thanks for writing and maintaining libarchive! - -What do you think about this trivial change that does not add "iconv" to -the pkg-config file's list of required packages unless it is actually -needed? On at least Debian GNU/Linux systems, the iconv(3) function is -part of the system C library and there is no Debian package that -installs an iconv.pc file, so I had to make this change to the Debian -package of libarchive. - -Thanks again, and keep up the great work! - -G'luck, -Peter - -Downloaded from upstream commit: -https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 99bff20d1..e2715cfde 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then - AC_CHECK_HEADERS([localcharset.h]) - am_save_LIBS="$LIBS" - LIBS="${LIBS} ${LIBICONV}" -- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" -+ if test -n "$LIBICONV"; then -+ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" -+ fi - AC_CHECK_FUNCS([locale_charset]) - LIBS="${am_save_LIBS}" - if test "x$ac_cv_func_locale_charset" != "xyes"; then diff --git a/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch b/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch new file mode 100644 index 0000000000..91903866ef --- /dev/null +++ b/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch @@ -0,0 +1,28 @@ +From 619c1be8d38ff79622db8f66f3b02832795315f9 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Wed, 14 Dec 2022 09:04:39 +0100 +Subject: [PATCH] autotools: do not add iconv for Requires.private + +There is no pkgconfig file for iconv, thus things break with this +change. Let's drop iconv from Requires.private. + +Fixes: a83f3d32 ("autotools: Fix static linking when openssl is enabled in windows") +[Retrieved from: +https://github.com/libarchive/libarchive/pull/1817/commits/619c1be8d38ff79622db8f66f3b02832795315f9] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99bff20d1..f245d0c55 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -378,7 +378,6 @@ if test "x$with_iconv" != "xno"; then + AC_CHECK_HEADERS([localcharset.h]) + am_save_LIBS="$LIBS" + LIBS="${LIBS} ${LIBICONV}" +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" + AC_CHECK_FUNCS([locale_charset]) + LIBS="${am_save_LIBS}" + if test "x$ac_cv_func_locale_charset" != "xyes"; then -- 2.39.0 From bernd.kuhls at t-online.de Mon Feb 20 19:25:34 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 20 Feb 2023 20:25:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-iptvsimple: bump version to 19.3.0-Matrix Message-ID: <20230220192534.103145-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 47dd202258..de71703c53 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 57710d3add72301d47a9eef016916ee5f61b7b8604c73450d67b9ba962eff60c kodi-pvr-iptvsimple-19.2.2-Matrix.tar.gz +sha256 421a883054dd31ad512866236c364e5a564d7db9fa595dadc3e37b9169b7fe79 kodi-pvr-iptvsimple-19.3.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 5b91c35c0c..e5976a7d3a 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 19.2.2-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 19.3.0-Matrix KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md -- 2.39.1 From peter at korsgaard.com Mon Feb 20 20:03:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:03:06 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: (Thomas Devoogdt's message of "Mon, 20 Feb 2023 19:53:59 +0100") References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-2-thomas.devoogdt@barco.com> <87edqkz1yv.fsf@dell.be.48ers.dk> Message-ID: <875ybwyuit.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > Hi, > I see that X11 support is optional and is automatically detected: > https://github.com/GNOME/at-spi2-core/blob/main/meson_options.txt#L31-L34 > So it would be better to append a commit to this one to remove the > Xorg dependency on at-spi2-core. Thanks, care to send a patch for that? -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 20:13:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:13:02 +0100 Subject: [Buildroot] [git commit] Update for 2023.02-rc1 Message-ID: <20230220201541.B9CD18640F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8c4b360fd40e5b266c851588a81aff102afaec7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 85 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 4 +-- docs/website/download.html | 22 ++++++------ docs/website/news.html | 21 ++++++++++++ 4 files changed, 119 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index 9fd8b31350..21e349f3a8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,88 @@ +2023.02-rc1, released February 20th, 2023 + + Numerous package updates and many (62) new packages. + + Toolchain: + + - The check for access to "unsafe" (E.G. from the build host) + header files and libraries by the cross compiler is now + unconditionally enabled. + + - Bootlin external toolchains updated to 2022.08 + + - The handling of the CCACHE_* environment variables by the + toolchain wrapper is now more strict, causing the variables + to only be exported when BR2_CCACHE is enabled. + + Infrastructure: + + - Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + - Legal-info: Stop warning about not saving sources for local + / override packages if _REDISTRIBUTE is set to NO. + + - Go: Ensure our go build and module cache is used, even for the + download step. + + - Cargo: CARGO_HOME (the location where cargo stores it + downloaded artifacts) is now located under DL_DIR rather + than in HOST_DIR/share/cargo, ensuring it is shared between + builds. + + Misc: + + - Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + - Ext2: Year 2038+ compatible inodes are now used by default, + independently of the filesystem size. + + - Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + New defconfigs: i.MX8mn BSH SMM S2 / pro, QEMU ARM EBBR, + Sipeed Lichee rv / rv dock, Starfive Visionfive2, Xilinx Versal + VCK190. + + New packages: catch2, cli11, dotconf, edk2-non-osi, + fluent-bit, fxdiv, hddtemp, highway, imx-vpu-hantro-daemon, + libjxl, libsolv, libunibreak, neon-2-sse, open-iscsi, + opencv4-contrib, perftest, perl-image-exiftool, + python-apispec, python-async-generator, python-cppy, + python-dbus-fast, python-dicttoxml2, python-flask-smorest, + python-h11, python-hkdf, python-magic-wormhole, + python-magic-wormhole-mailbox-server, + python-magic-wormhole-transit-relay, python-marshmallow, + python-munch, python-outcome, python-pycrate, python-pyspnego, + python-reedsolo, python-selenium, python-smbprotocol, + python-sniffio, python-spake2, python-trio, + python-trio-websocket, python-uhid, python-webargs, + python-wsproto, qt5speech, qt6serialbus, rdma-core, reproc, + rtl8723ds-bt, rtl8821cu, sexpect, speechd, sscep, stb, sway, + termcolor, ti-k3-r5-loader, tl-expected, unifdef, + versal-firmware, xwayland, z3 + + Removed packages: docker-proxy, elixir, gummiboot, + python-bunch, python-m2r, sun20i-d1-spl, ucl, + xdriver_xf86-input-keyboard, xdriver_xf86-video-glint, + xdriver_xf86-video-imx-viv, xdriver_xf86-video-tga + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + #15271: no start-qemu.sh + #15281: Error compiling GDAL library for RPi-64 if libgdal-dev install.. + #15291: BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS without location + #15301: Selecting NAND Flash boot media (NAND_BOOT) breaks the uboot.. + #15331: Warning on python-flit-core license when generating legal info + 2022.11.1, released January 18th, 2023 Important / security related fixes. diff --git a/Makefile b/Makefile index 4880b426b5..c97086c09c 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02-git +export BR2_VERSION := 2023.02-rc1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1669308000 +BR2_VERSION_EPOCH = 1676923000 # 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 a7efef1ef3..a6b9a9a7c4 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -75,38 +75,38 @@

PGP signature

- +
Source code
diff --git a/docs/website/news.html b/docs/website/news.html index 687efeb377..8acf454052 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

News

    +
  • +
    +
    +
    +

    2023.02-rc1 released

    +

    20 February 2023

    +
    +
    +

    We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

    + +

    Go to the downloads page to pick up the + 2023.02-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

    +
    +
    +
    • +
  • From thomas.petazzoni at bootlin.com Mon Feb 20 20:36:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:36:12 +0100 Subject: [Buildroot] [git commit] package/speechd: fix build with help2man Message-ID: <20230220203633.CE2A886429@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d77d1c98240bf9c7c9062a67d68b1e548af42e5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with help2man raised since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: LC_ALL=C help2man -n "speech synthesis daemon" --output=speech-dispatcher.1 ./speech-dispatcher help2man: can't get `--help' info from ./speech-dispatcher Try `--no-discard-stderr' if option outputs to stderr Fixes: - http://autobuild.buildroot.org/results/cc1817efb4a5d54ffd2e7ac2f4fc773535f70972 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 46c0672f59..dee94a6752 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,6 +12,7 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile +SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" SPEECHD_CONF_OPTS = --without-kali # fix missing config.rpath (needed for autoreconf) in the codebase From thomas.petazzoni at bootlin.com Mon Feb 20 20:36:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:36:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/speechd: fix build with help2man In-Reply-To: <20230220132552.1825946-1-fontaine.fabrice@gmail.com> References: <20230220132552.1825946-1-fontaine.fabrice@gmail.com> Message-ID: <20230220213640.4a61b2c2@windsurf> On Mon, 20 Feb 2023 14:25:51 +0100 Fabrice Fontaine wrote: > Fix the following build failure with help2man raised since the addition > of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: > > LC_ALL=C help2man -n "speech synthesis daemon" --output=speech-dispatcher.1 ./speech-dispatcher > help2man: can't get `--help' info from ./speech-dispatcher > Try `--no-discard-stderr' if option outputs to stderr > > Fixes: > - http://autobuild.buildroot.org/results/cc1817efb4a5d54ffd2e7ac2f4fc773535f70972 > > Signed-off-by: Fabrice Fontaine > --- > package/speechd/speechd.mk | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:37:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:37:41 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/libarchive: fix host build In-Reply-To: <20230220142746.1935069-1-fontaine.fabrice@gmail.com> References: <20230220142746.1935069-1-fontaine.fabrice@gmail.com> Message-ID: <20230220213741.0f9cf741@windsurf> On Mon, 20 Feb 2023 15:27:46 +0100 Fabrice Fontaine wrote: > Fix the following host build failure raised since commit > 9525bc7e64e8f44c31ab9dfd3f516ecb35982429: > > configure.ac:140: error: possibly undefined macro: AC_MSG_FAILURE > If this token and others are legitimate, please use m4_pattern_allow. > See the Autoconf documentation. > configure.ac:328: error: possibly undefined macro: AC_CHECK_LIB > > Fixes: > - http://autobuild.buildroot.org/results/11868e9bc4916843a7fc76f7b5e4c251f89e33dc > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Thomas Petazzoni): > - Drop per-package from commit message Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:36:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:36:55 +0100 Subject: [Buildroot] [git commit] package/libarchive: fix host build Message-ID: <20230220203832.BD7D18642E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8e461bba5942b4711b94a57799600fb4eb226c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following host build failure raised since commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429: configure.ac:140: error: possibly undefined macro: AC_MSG_FAILURE If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:328: error: possibly undefined macro: AC_CHECK_LIB Fixes: - http://autobuild.buildroot.org/results/11868e9bc4916843a7fc76f7b5e4c251f89e33dc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libarchive/libarchive.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cd7c13fbed..2010b6529f 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -140,6 +140,8 @@ endif # The only user of host-libarchive needs zlib support HOST_LIBARCHIVE_DEPENDENCIES = host-zlib +# needed for autoreconf +HOST_LIBARCHIVE_DEPENDENCIES += host-pkgconf HOST_LIBARCHIVE_CONF_OPTS = \ --disable-bsdtar \ --disable-bsdcpio \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:38:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:38:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: fix uclibc with libiconv build In-Reply-To: <20230220192125.555632-1-fontaine.fabrice@gmail.com> References: <20230220192125.555632-1-fontaine.fabrice@gmail.com> Message-ID: <20230220213858.2104ae5e@windsurf> On Mon, 20 Feb 2023 20:21:25 +0100 Fabrice Fontaine wrote: > Replace patch added by commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429 > as current patch is not correct, build failures are still raised by > uclibc-ng with libiconv on fwup/gvfs/...: > > configure: error: Requires libarchive. Libarchive must be built with zlib support. > > [...] > > Run-time dependency libarchive found: NO (tried cmake) > > ../output-1/build/gvfs-1.48.1/meson.build:405:2: ERROR: Dependency lookup for libarchive with method 'pkgconfig' failed: Could not generate cargs for libarchive: > Package iconv was not found in the pkg-config search path. > Perhaps you should add the directory containing `iconv.pc' > to the PKG_CONFIG_PATH environment variable > Package 'iconv', required by 'libarchive', not found > > Fixes: > - http://autobuild.buildroot.org/results/05a5496495e51da2c9caf7570695cc95e1745e30 > - http://autobuild.buildroot.org/results/98dc4b415115cca65b53e4cd986144ef85bf17ad > > Signed-off-by: Fabrice Fontaine > --- > ...y-add-iconv-to-the-pc-file-if-needed.patch | 44 ------------------- > ...o-not-add-iconv-for-Requires.private.patch | 28 ++++++++++++ > 2 files changed, 28 insertions(+), 44 deletions(-) > delete mode 100644 package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > create mode 100644 package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:39:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:39:47 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require FileHandle perl package for syslinux Message-ID: <20230220203958.774428643D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=474196d6bb410c0a9f5e1c8bb7018594a29a57bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master syslinux needs FileHandle module: Can't locate FileHandle.pm in @INC (you may need to install the FileHandle module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. /home/buildroot/autobuild/instance-0/output-1/host/bin/i586-buildroot-linux-gnu-gcc -Wp,-MT,errlist.o,-MD,./.errlist.o.d -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-labels=0 -ffast-math -fomit-frame-pointer -std=gnu99 -m32 -mpreferred-stack-boundary=2 -fno-stack-protector -fwrapv -freg-struct-return -fPIC -fno-exceptions -fno-asynchronous-unwind-tables -fno-strict-aliasing -falign-functions=0 -falign-jumps=0 -falign-labels=0 -falign-loops=0 -g -D__COM32__ -D__FIRMWARE_BIOS__ -nostdinc -iwithprefix include -I. -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/../include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/include/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/core/include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/ -I/home/buildroot/autobuild/instance-0/output-1/bu ild/syslinux-6.03/com32/lib/sys/module -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/bios/com32/lib//../.. -W -Wall -Wstrict-prototypes -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline -DDYNAMIC_CRC_TABLE -DPNG_NO_CONSOLE_IO -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_MNG_FEATURES -DPNG_NO_READ_tIME -DPNG_NO_WRITE_tIME -mregparm=3 -DREGPARM=3 -c -o errlist.o errlist.c cc1: fatal error: errlist.c: No such file or directory Fixes: - http://autobuild.buildroot.org/results/de88089888b2ca354b28af3550abf846560da7d5 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 4353e9585e..a692856d31 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -298,6 +298,10 @@ if grep -q -E '^BR2_PACKAGE_(WEBKITGTK|WPEWEBKIT)=y' $BR2_CONFIG ; then required_perl_modules="${required_perl_modules} JSON::PP" fi +if grep -q ^BR2_TARGET_SYSLINUX=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules FileHandle" +fi + # This variable will keep the modules that are missing in your system. missing_perl_modules="" From thomas.petazzoni at bootlin.com Mon Feb 20 20:38:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:38:43 +0100 Subject: [Buildroot] [git commit] package/libarchive: fix uclibc with libiconv build Message-ID: <20230220203958.6CA088643C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e8cce6f2b1936dbda9d63ddf4f41acf59a64113 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace patch added by commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429 as current patch is not correct, build failures are still raised by uclibc-ng with libiconv on fwup/gvfs/...: configure: error: Requires libarchive. Libarchive must be built with zlib support. [...] Run-time dependency libarchive found: NO (tried cmake) ../output-1/build/gvfs-1.48.1/meson.build:405:2: ERROR: Dependency lookup for libarchive with method 'pkgconfig' failed: Could not generate cargs for libarchive: Package iconv was not found in the pkg-config search path. Perhaps you should add the directory containing `iconv.pc' to the PKG_CONFIG_PATH environment variable Package 'iconv', required by 'libarchive', not found Fixes: - http://autobuild.buildroot.org/results/05a5496495e51da2c9caf7570695cc95e1745e30 - http://autobuild.buildroot.org/results/98dc4b415115cca65b53e4cd986144ef85bf17ad Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...1-Only-add-iconv-to-the-pc-file-if-needed.patch | 44 ---------------------- ...ols-do-not-add-iconv-for-Requires.private.patch | 28 ++++++++++++++ 2 files changed, 28 insertions(+), 44 deletions(-) diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch deleted file mode 100644 index c93944f789..0000000000 --- a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 -From: Peter Pentchev -Date: Thu, 29 Dec 2022 00:04:40 +0200 -Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) - -Hi, - -Thanks for writing and maintaining libarchive! - -What do you think about this trivial change that does not add "iconv" to -the pkg-config file's list of required packages unless it is actually -needed? On at least Debian GNU/Linux systems, the iconv(3) function is -part of the system C library and there is no Debian package that -installs an iconv.pc file, so I had to make this change to the Debian -package of libarchive. - -Thanks again, and keep up the great work! - -G'luck, -Peter - -Downloaded from upstream commit: -https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 99bff20d1..e2715cfde 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then - AC_CHECK_HEADERS([localcharset.h]) - am_save_LIBS="$LIBS" - LIBS="${LIBS} ${LIBICONV}" -- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" -+ if test -n "$LIBICONV"; then -+ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" -+ fi - AC_CHECK_FUNCS([locale_charset]) - LIBS="${am_save_LIBS}" - if test "x$ac_cv_func_locale_charset" != "xyes"; then diff --git a/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch b/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch new file mode 100644 index 0000000000..91903866ef --- /dev/null +++ b/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch @@ -0,0 +1,28 @@ +From 619c1be8d38ff79622db8f66f3b02832795315f9 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Wed, 14 Dec 2022 09:04:39 +0100 +Subject: [PATCH] autotools: do not add iconv for Requires.private + +There is no pkgconfig file for iconv, thus things break with this +change. Let's drop iconv from Requires.private. + +Fixes: a83f3d32 ("autotools: Fix static linking when openssl is enabled in windows") +[Retrieved from: +https://github.com/libarchive/libarchive/pull/1817/commits/619c1be8d38ff79622db8f66f3b02832795315f9] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99bff20d1..f245d0c55 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -378,7 +378,6 @@ if test "x$with_iconv" != "xno"; then + AC_CHECK_HEADERS([localcharset.h]) + am_save_LIBS="$LIBS" + LIBS="${LIBS} ${LIBICONV}" +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" + AC_CHECK_FUNCS([locale_charset]) + LIBS="${am_save_LIBS}" + if test "x$ac_cv_func_locale_charset" != "xyes"; then From thomas.petazzoni at bootlin.com Mon Feb 20 20:39:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:39:59 +0100 Subject: [Buildroot] [PATCH 1/1] support/dependencies/dependencies.sh: require FileHandle perl package for syslinux In-Reply-To: <20230220100309.116832-1-fontaine.fabrice@gmail.com> References: <20230220100309.116832-1-fontaine.fabrice@gmail.com> Message-ID: <20230220213959.799dfa91@windsurf> On Mon, 20 Feb 2023 11:03:09 +0100 Fabrice Fontaine wrote: > syslinux needs FileHandle module: > > Can't locate FileHandle.pm in @INC (you may need to install the FileHandle module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. > BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. > /home/buildroot/autobuild/instance-0/output-1/host/bin/i586-buildroot-linux-gnu-gcc -Wp,-MT,errlist.o,-MD,./.errlist.o.d -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-labels=0 -ffast-math -fomit-frame-pointer -std=gnu99 -m32 -mpreferred-stack-boundary=2 -fno-stack-protector -fwrapv -freg-struct-return -fPIC -fno-exceptions -fno-asynchronous-unwind-tables -fno-strict-aliasing -falign-functions=0 -falign-jumps=0 -falign-labels=0 -falign-loops=0 -g -D__COM32__ -D__FIRMWARE_BIOS__ -nostdinc -iwithprefix include -I. -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/../include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/include/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/core/include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/ -I/home/buildroot/autobuild/instance-0/output-1/ bu > ild/syslinux-6.03/com32/lib/sys/module -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/bios/com32/lib//../.. -W -Wall -Wstrict-prototypes -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline -DDYNAMIC_CRC_TABLE -DPNG_NO_CONSOLE_IO -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_MNG_FEATURES -DPNG_NO_READ_tIME -DPNG_NO_WRITE_tIME -mregparm=3 -DREGPARM=3 -c -o errlist.o errlist.c > cc1: fatal error: errlist.c: No such file or directory > > Fixes: > - http://autobuild.buildroot.org/results/de88089888b2ca354b28af3550abf846560da7d5 > > Signed-off-by: Fabrice Fontaine > --- > support/dependencies/dependencies.sh | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 20 20:43:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:43:56 +0100 Subject: [Buildroot] Buildroot 2023.02-rc1 released Message-ID: <871qmkysmr.fsf@dell.be.48ers.dk> Hi, Buildroot 2023.02-rc1 is released - Go download it at: http://buildroot.net/downloads/buildroot-2023.02-rc1.tar.gz or http://buildroot.net/downloads/buildroot-2023.02-rc1.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. Once more, a fairly busy cycle with more than 1500 changes from 106 unique contributors! Of noteworthy new features/changes we have: Toolchain: - The check for access to "unsafe" (E.G. from the build host) header files and libraries by the cross compiler is now unconditionally enabled. - Bootlin external toolchains updated to 2022.08 - The handling of the CCACHE_* environment variables by the toolchain wrapper is now more strict, causing the variables to only be exported when BR2_CCACHE is enabled. Infrastructure: - Br2-external: Fix make performance issue when many (> 6) external trees are used together. - Legal-info: Stop warning about not saving sources for local / override packages if _REDISTRIBUTE is set to NO. - Go: Ensure our go build and module cache is used, even for the download step. - Cargo: CARGO_HOME (the location where cargo stores its downloaded artifacts) is now located under DL_DIR rather than in HOST_DIR/share/cargo, ensuring it is shared between builds. Misc: - Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is used. - Ext2: Year 2038+ compatible inodes are now used by default, independently of the filesystem size. - A large number of NXP related packages and defconfigs have been updated as upstream moved the git repositories to Github. - New defconfigs: i.MX8mn BSH SMM S2 / pro, QEMU ARM EBBR, Sipeed Lichee rv / rv dock, Starfive Visionfive2, Xilinx Versal VCK190. - New packages: catch2, cli11, dotconf, edk2-non-osi, fluent-bit, fxdiv, hddtemp, highway, imx-vpu-hantro-daemon, libjxl, libsolv, libunibreak, neon-2-sse, open-iscsi, opencv4-contrib, perftest, perl-image-exiftool, python-apispec, python-async-generator, python-cppy, python-dbus-fast, python-dicttoxml2, python-flask-smorest, python-h11, python-hkdf, python-magic-wormhole, python-magic-wormhole-mailbox-server, python-magic-wormhole-transit-relay, python-marshmallow, python-munch, python-outcome, python-pycrate, python-pyspnego, python-reedsolo, python-selenium, python-smbprotocol, python-sniffio, python-spake2, python-trio, python-trio-websocket, python-uhid, python-webargs, python-wsproto, qt5speech, qt6serialbus, rdma-core, reproc, rtl8723ds-bt, rtl8821cu, sexpect, speechd, sscep, stb, sway, termcolor, ti-k3-r5-loader, tl-expected, unifdef, versal-firmware, xwayland, z3 And the usual package version updates and bug fixes. See the CHANGES file for details: http://git.buildroot.net/buildroot/plain/CHANGES?id=2023.02-rc1 Many thanks to the people contributing to this release: git shortlog -sn 2022.11.. 355 James Hilliard 188 Bernd Kuhls 166 Fabrice Fontaine 69 Julien Olivain 63 Francois Perrad 63 Peter Korsgaard 59 Ricardo Martincoski 53 Lang Daniel 41 Giulio Benetti 34 Thomas Petazzoni 33 Yann E. MORIN 30 Christian Stewart 20 Neal Frager 19 Heiko Thiery 15 Maxim Kochetkov 13 Thomas Devoogdt 12 Angelo Compagnucci 12 Peter Seiderer 11 Marcin Niestroj 11 Romain Naour 10 Adrian Perez de Castro 10 Dario Binacchi 9 Arnout Vandecappelle 9 Chris Dimich 9 Michael Nosthoff 9 Vincent Fazio 8 Jesse Van Gavere 8 Joachim Wiberg 8 TIAN Yuanhao 8 Yegor Yefremov 7 Baruch Siach 7 Marcus Folkesson 6 Martin Hundeb?ll 5 Etienne Carriere 5 Norbert Lange 4 Alexander Egorenkov 4 Dennis Van Hoorick 4 Quentin Schulz 4 Raphael Pavlidis 4 Thomas Claveirole 4 Vincent Stehl? 3 Ben Wolsieffer 3 Casey Reeves 3 Frank Vanbever 3 Gleb Mazovetskiy 3 Michael Fischer 2 Andreas Klinger 2 Andreas Ziegler 2 Bagas Sanjaya 2 Brandon Maier 2 Carlos Santos 2 Florian Fainelli 2 Francois Dugast 2 Gwenhael Goavec-Merou 2 John Keeping 2 Konstantin Menyaev 2 Kory Maincent 2 Nicolas Carrier 2 Nicolas Cavallari 2 Patrick Gerber 2 Stefan Agner 2 Stephan Henningsen 2 Tim Gover 2 Yair Ben-Avraham 2 ?????? ????? (Leonid Yuriev) 1 Alexis Lothor? 1 Andrey Grafin 1 Andr? Zwing 1 Bartosz Golaszewski 1 Ben Hutchings 1 Daniel Semkowicz 1 Danilo Bargen 1 Dimitar Tomov 1 Dominik Michael Rauh 1 Edgar Bonet 1 Gary Bisson 1 Gilles Chanteperdrix 1 Graeme Smecher 1 James Kent 1 Jason A. Donenfeld 1 Jerry Kooyman 1 Joel Carlson 1 Jordan Speicher 1 Jos? Luis Salvador Rufo 1 Kyle Harding 1 Markus Mayer 1 Matthew Weber 1 Michael Trimarchi 1 Nasser Afshin 1 Nevo Hed 1 Niklas Cassel 1 Paul Cercueil 1 Peter Thompson 1 Petr Vorel 1 Ramon Crichlow 1 Robert Marko 1 Sebastian Weyer 1 Sergey Organov 1 S?bastien Szymanski 1 Tan En De 1 Thomas Huth 1 Titouan Christophe 1 Wolfgang Grandegger 1 Woodrow Douglass 1 Xuanhao Shi 1 Yu Chien Peter Lin And a special thanks to our patch reviewers: git log 2022.11.. | grep -Ei '(reviewed|acked)-by:' | \ sed 's/.*by: //' | sort | uniq -c | sort -n -r 12 Luca Ceresoli 8 James Hilliard 7 Romain Naour 5 Marcin Niestroj 5 Heiko Thiery 5 Christian Stewart 4 Giulio Benetti 3 Yegor Yefremov 3 Norbert Lange 3 Julien Olivain 3 Francois Perrad 2 Adrian Perez de Castro 1 Yann E. MORIN 1 Yann E. MORIN 1 Thomas Petazzoni 1 Ryan Barnett 1 Quentin Schulz 1 Petr Vorel 1 Neal Frager 1 Maxim Kochetkov 1 Marcus Hoffmann 1 Marcus Folkesson 1 Joachim Wiberg 1 Indrek Kruusa 1 Geoff Levand 1 Fabio Estevam 1 Dario Binacchi 1 Andrew Davis We will now create a next branch and start merging new features for 2023.05 already in parallel with the 2023.02 stabilization. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 20 20:44:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:44:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix libcurl build In-Reply-To: <20230220093336.77462-1-fontaine.fabrice@gmail.com> References: <20230220093336.77462-1-fontaine.fabrice@gmail.com> Message-ID: <20230220214423.1a42a0e5@windsurf> Hello Fabrice, On Mon, 20 Feb 2023 10:33:36 +0100 Fabrice Fontaine wrote: > Fix the following libcurl build failure: > > In file included from /tmp/instance-1/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/include/curl/curl.h:3195, > from ../../../../include/sysinc.h:384, > from ../../../../include/common.h:23, > from simple.c:20: > simple.c: In function 'check_https': > simple.c:167:65: error: invalid use of void expression > 167 | if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_USERAGENT, "Zabbix " ZABBIX_VERSION)) || > | ^ > > Fixes: > - http://autobuild.buildroot.org/results/053a62e9969046a7f8a0e1890c24d2bfb099ae42 > > Signed-off-by: Fabrice Fontaine > --- > ...se-parentheses-to-ensure-compilation.patch | 65 +++++++++++++++++++ > 1 file changed, 65 insertions(+) > create mode 100644 package/zabbix/0002-Use-parentheses-to-ensure-compilation.patch This was reported to curl upstream in https://github.com/curl/curl/issues/10148, and apparently fixed in curl by https://github.com/curl/curl/commit/e2aed004302e51cfa5b6ce8c8ab65ef92aa83196. So it apparently was considered a bug in curl, so perhaps it should be fixed in curl rather than in zabbix? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:46:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:46:40 +0100 Subject: [Buildroot] [git commit] package/modem-manager: needs dynamic library Message-ID: <20230220204653.000F386442@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d9c146f0a540536c0ad8df7b31a190c117ad1581 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit d769cfc13f6c2544f8bc5b6339d23763319a2383 was incomplete as plugins/meson.build still unconditionally calls shared_module. So add a dependency to dynamic library to avoid the following static build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: [238/417] Linking target plugins/libmm-shared-telit.so FAILED: plugins/libmm-shared-telit.so Building statically could be enabled back through builtin_plugins as soon as https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/1c4da332ee6e0d948f85a63f74cb27e89075c011 lands in a stable release Fixes: - http://autobuild.buildroot.org/results/deb2a752accb021392bb9dc3d06b2b1bf151535c Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/modem-manager/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index 8489e6fc86..6990996a86 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_MODEM_MANAGER depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV @@ -39,6 +40,7 @@ comment "QRTR support needs a toolchain w/ headers >= 4.15" endif -comment "modemmanager needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS +comment "modemmanager needs a toolchain w/ wchar, threads, dynamic library" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS depends on BR2_USE_MMU From thomas.petazzoni at bootlin.com Mon Feb 20 20:46:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:46:52 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/modem-manager: needs dynamic library In-Reply-To: <20230220092516.17774-1-fontaine.fabrice@gmail.com> References: <20230220092516.17774-1-fontaine.fabrice@gmail.com> Message-ID: <20230220214652.029e413b@windsurf> On Mon, 20 Feb 2023 10:25:16 +0100 Fabrice Fontaine wrote: > Commit d769cfc13f6c2544f8bc5b6339d23763319a2383 was incomplete as > plugins/meson.build still unconditionally calls shared_module. So add a > dependency to dynamic library to avoid the following static build > failure raised since bump to version 1.20.2 in commit > b95334b71fbdde0f7621b58ed35fa98df9e0966d: > > [238/417] Linking target plugins/libmm-shared-telit.so > FAILED: plugins/libmm-shared-telit.so > > Building statically could be enabled back through builtin_plugins as > soon as > https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/1c4da332ee6e0d948f85a63f74cb27e89075c011 > lands in a stable release > > Fixes: > - http://autobuild.buildroot.org/results/deb2a752accb021392bb9dc3d06b2b1bf151535c > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Aleksander Morgado): > - Disable building statically instead of disabling all plugins Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:47:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:47:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: set --with-libpcre2 In-Reply-To: <20230220091739.13107-1-fontaine.fabrice@gmail.com> References: <20230220091739.13107-1-fontaine.fabrice@gmail.com> Message-ID: <20230220214718.5880fd4c@windsurf> On Mon, 20 Feb 2023 10:17:39 +0100 Fabrice Fontaine wrote: > Set --with-libpcre2 to avoid the following build failure raised since > bump to version 6.2.7 in > commit 89fa774a191d41ed5d125d87d812ff3478902251: > > configure: using old pcre library by default > checking pkg-config is at least version 0.9.0... yes > configure: error: cannot find pkg-config package for libpcre > > Fixes: > - http://autobuild.buildroot.org/results/701b343b3b0d471c75899b61d02bd9d63a272247 > > Signed-off-by: Fabrice Fontaine > --- > package/zabbix/zabbix.mk | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:47:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:47:09 +0100 Subject: [Buildroot] [git commit] package/zabbix: set --with-libpcre2 Message-ID: <20230220204820.E76CD8644B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d29799914d5df6fb372284d8c3408809e00d0b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set --with-libpcre2 to avoid the following build failure raised since bump to version 6.2.7 in commit 89fa774a191d41ed5d125d87d812ff3478902251: configure: using old pcre library by default checking pkg-config is at least version 0.9.0... yes configure: error: cannot find pkg-config package for libpcre Fixes: - http://autobuild.buildroot.org/results/701b343b3b0d471c75899b61d02bd9d63a272247 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/zabbix/zabbix.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index db9efed78b..0d6c579f4c 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -15,6 +15,7 @@ ZABBIX_AUTORECONF = YES ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ + --with-libpcre2 \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:49:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:49:58 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: <87edqkz1yv.fsf@dell.be.48ers.dk> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-2-thomas.devoogdt@barco.com> <87edqkz1yv.fsf@dell.be.48ers.dk> Message-ID: <20230220214958.19d88af8@windsurf> On Mon, 20 Feb 2023 18:22:16 +0100 Peter Korsgaard wrote: > at-spi2-core depends on xorg7 / xlib-libXtst, so that would mean that we > would pull that in even for libgtk3 builds with the broadway/wayland > backends, is that sensible? > > Maybe it is? Does at-spi2 work under wayland? Please note that we also have a series that removes atk, at-spi2-atk, and bumps at-spi2-core, which now replaces both atk and at-spi2-atk: https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:50:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:50:20 +0100 Subject: [Buildroot] [git commit] package/libjxl: fix build with libjpeg Message-ID: <20230220205040.1212286487@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92c4589b904cfbc4cd633a92729ecd98a50851ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Building with libjpeg will raise the following build failure on some architectures since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57: /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In function 'jxl::Status jxl::extras::{anonymous}::EncodeWithLibJpeg(const jxl::extras::PackedImage&, const JxlBasicInfo&, const std::vector&, std::vector, size_t, const string&, std::vector*)': /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] 126 | jpeg_mem_dest(&cinfo, &buffer, &size); | ^~~~~ | | | long unsigned int* Upstream advocates to use jpeg-turbo: https://github.com/libjxl/libjxl/issues/1802 Fixes: - http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 Signed-off-by: Fabrice Fontaine Reviewed-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libjxl/libjxl.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index cc24ba258c..1257928efd 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -30,4 +30,11 @@ LIBJXL_CONF_OPTS = \ -DJPEGXL_ENABLE_SJPEG=OFF \ -DJPEGXL_ENABLE_SKCMS=OFF +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) +LIBJXL_DEPENDENCIES += jpeg-turbo +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=OFF +else +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=ON +endif + $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:50:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:50:25 +0100 Subject: [Buildroot] [git commit] package/libjxl: disable benchmark and tests Message-ID: <20230220205040.1F02B86489@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13b05a9b00bb1eeacefafe7b2a3537988a53dcea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable benchmark and tests which are enabled by default since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57 Signed-off-by: Fabrice Fontaine Reviewed-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libjxl/libjxl.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 1257928efd..b4dfbecf82 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -23,7 +23,9 @@ endif LIBJXL_CONF_OPTS = \ -DJPEGXL_BUNDLE_LIBPNG=OFF \ -DJPEGXL_BUNDLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_BENCHMARK=OFF \ -DJPEGXL_ENABLE_DOXYGEN=OFF \ + -DJPEGXL_ENABLE_EXAMPLES=OFF \ -DJPEGXL_ENABLE_JNI=OFF \ -DJPEGXL_ENABLE_MANPAGES=OFF \ -DJPEGXL_ENABLE_OPENEXR=OFF \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:50:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:50:31 +0100 Subject: [Buildroot] [git commit] package/libjxl: security bump to version 0.8.1 Message-ID: <20230220205040.2BBF98648A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff7c37e57419aeb2fb63ebc21bad9696aaaba2b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Security: Fix OOB read in exif.h https://github.com/libjxl/libjxl/releases/tag/v0.8.1 https://github.com/libjxl/libjxl/releases/tag/v0.8.0 Signed-off-by: Fabrice Fontaine Tested-by: Julien Olivain Reviewed-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...-segmentation-fault-when-JPEG-is-disabled.patch | 44 ++++++++++++++++++++++ package/libjxl/libjxl.hash | 2 +- package/libjxl/libjxl.mk | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch new file mode 100644 index 0000000000..3d709c956b --- /dev/null +++ b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch @@ -0,0 +1,44 @@ +From 504f35c8204248ae6f97278e8b7c6cc5853a1b94 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 10 Feb 2023 21:31:30 +0100 +Subject: [PATCH] djxl: fix segmentation fault when JPEG is disabled + +When libjxl is compiled without JPEG support, by configuring for example +with: + + cmake -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE ... + +djxl crashes with a segmentation fault at: +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L367 + +The crash can be reproduced with the sequence: + + gm convert IMAGE:LOGO ref.ppm + cjxl ref.ppm enc.jxl + djxl enc.jxl dec.ppm + +The crash happen because opt_jpeg_quality_id does not get +initialized at: +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L107 + +This commit fixes the crash by adding a test on opt_jpeg_quality_id. + +Signed-off-by: Julien Olivain +[Retrieved from: +https://github.com/libjxl/libjxl/pull/2178/commits/504f35c8204248ae6f97278e8b7c6cc5853a1b94] +--- + tools/djxl_main.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/djxl_main.cc b/tools/djxl_main.cc +index b755301fcb..42b889e7ce 100644 +--- a/tools/djxl_main.cc ++++ b/tools/djxl_main.cc +@@ -370,6 +370,7 @@ int main(int argc, const char* argv[]) { + args.color_space = force_colorspace; + } + if (codec == jxl::extras::Codec::kPNM && extension != ".pfm" && ++ args.opt_jpeg_quality_id != -1 && + !cmdline.GetOption(args.opt_jpeg_quality_id)->matched()) { + args.bits_per_sample = 0; + } diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index e71d32e61d..6b4c9d8d0a 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e libjxl-0.7.0.tar.gz +sha256 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 libjxl-0.8.1.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index b4dfbecf82..f603327bf6 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.7.0 +LIBJXL_VERSION = 0.8.1 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:51:11 +0100 Subject: [Buildroot] [PATCH 1/3] package/libjxl: fix build with libjpeg In-Reply-To: <20230219140051.80647-1-fontaine.fabrice@gmail.com> References: <20230219140051.80647-1-fontaine.fabrice@gmail.com> Message-ID: <20230220215111.19dcba5d@windsurf> On Sun, 19 Feb 2023 15:00:49 +0100 Fabrice Fontaine wrote: > Building with libjpeg will raise the following build failure on some > architectures since the addition of the package in commit > e648d399d8bd609697e78f13f7fa76be06d91a57: > > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In function 'jxl::Status jxl::extras::{anonymous}::EncodeWithLibJpeg(const jxl::extras::PackedImage&, const JxlBasicInfo&, const std::vector&, std::vector, size_t, const string&, std::vector*)': > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] > 126 | jpeg_mem_dest(&cinfo, &buffer, &size); > | ^~~~~ > | | > | long unsigned int* > > Upstream advocates to use jpeg-turbo: > https://github.com/libjxl/libjxl/issues/1802 > > Fixes: > - http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 > > Signed-off-by: Fabrice Fontaine > --- > package/libjxl/libjxl.mk | 7 +++++++ > 1 file changed, 7 insertions(+) To be honest, I find quite ugly the fact that only jpeg-turbo is supported, but it indeed seems like libjpeg and jpeg-turbo are not 100% compatible, unfortunately. So: entire series applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:51:34 +0100 Subject: [Buildroot] [git commit] package/modsecurity2: disable pcre Message-ID: <20230220205145.207EA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06af305874abc1eb4bb98dbd8aabe071fa5d77bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable pcre to avoid the following build failure if pcre-config is found on host raised since bump to version 2.9.7 in commit 42e34cf10f9eb037aa8c48a4fb9e8f521901b983: /home/thomas/autobuild/instance-0/output-1/per-package/modsecurity2/host/bin/../lib/gcc/mips64el-buildroot-linux-gnu/11.3.0/../../../../mips64el-buildroot-linux-gnu/bin/ld: cannot find -lpcre: No such file or directory Fixes: - http://autobuild.buildroot.org/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/modsecurity2/modsecurity2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index c251291e64..88bbf3bb29 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -21,6 +21,7 @@ MODSECURITY2_CONF_OPTS = \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ --without-curl \ --without-lua \ + --without-pcre \ --without-yajl \ --without-ssdeep From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:46 -0000 Subject: [Buildroot] [git commit branch/next] package/numactl: link with -latomic if needed Message-ID: <20230220205145.9B43386491@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a353cf87367fa2df22b8f0e55dee4d48a6f91ea8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since bump to version 2.0.16 in commit e9bc980d93a189a16e7320bd254b906c87ca9f87: /nvmedata/autobuild/instance-7/output-1/per-package/numactl/host/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: ./.libs/libnuma.a(libnuma.o): in function `numa_police_memory': libnuma.c:(.text+0xe28): undefined reference to `__atomic_fetch_and_1' Fixes: - http://autobuild.buildroot.org/results/a92c1c60518d3fe08f3f808f9cc812031e85a4e9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-link-with-latomic-if-needed-again.patch | 41 ++++++++++++++++++++++ package/numactl/numactl.mk | 2 ++ 2 files changed, 43 insertions(+) diff --git a/package/numactl/0001-link-with-latomic-if-needed-again.patch b/package/numactl/0001-link-with-latomic-if-needed-again.patch new file mode 100644 index 0000000000..54d55656ec --- /dev/null +++ b/package/numactl/0001-link-with-latomic-if-needed-again.patch @@ -0,0 +1,41 @@ +From 692abb6d751a41c7f0206771ecd454933750256e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 2 Nov 2022 13:28:02 +0100 +Subject: [PATCH] link with -latomic if needed (again ...) + +numactl unconditionally uses __atomic_fetch_and but some architectures +(e.g. sparc) needs to link with -latomic to be able to use it. So check +if -latomic is needed and update numa.pc accordingly. + +This linking was made by e0de0d9e981ddb53bdeb4a4b9dc43046c9ff4ff9 but +wrongly reverted by 10c277c20768be9a563f75265bcd7e73954763ad resulting +in the following build failure on sparc or microblaze: + +/nvmedata/autobuild/instance-7/output-1/per-package/numactl/host/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: ./.libs/libnuma.a(libnuma.o): in function `numa_police_memory': +libnuma.c:(.text+0xe28): undefined reference to `__atomic_fetch_and_1' + +Fixes: + - http://autobuild.buildroot.org/results/54b7567d804d9abff56f47cd26bae774c1e38669 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/numactl/numactl/pull/144] +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 8510fc5..ebf9917 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,6 +27,8 @@ AM_CONDITIONAL([RISCV64], [test x"${target_cpu}" = x"riscv64"]) + + AC_CONFIG_FILES([Makefile]) + ++AC_SEARCH_LIBS([__atomic_fetch_and_1], [atomic]) ++ + # GCC tries to be "helpful" and only issue a warning for unrecognized + # attributes. So we compile the test with Werror, so that if the + # attribute is not recognized the compilation fails +-- +2.35.1 + diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk index b2f349255f..157f953c51 100644 --- a/package/numactl/numactl.mk +++ b/package/numactl/numactl.mk @@ -10,6 +10,8 @@ NUMACTL_SITE = \ NUMACTL_LICENSE = LGPL-2.1 (libnuma), GPL-2.0 (programs) NUMACTL_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 NUMACTL_INSTALL_STAGING = YES +# We're patching configure.ac +NUMACTL_AUTORECONF = YES NUMACTL_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -fPIC" $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:47 -0000 Subject: [Buildroot] [git commit branch/next] package/makedumpfile: fix mips64 build Message-ID: <20230220205145.8EB768648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5adf96d5bd3a580ab47e74ef8988594435a18a20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following mips64 build failure raised since commit 0b389385666687ecfd09cdbce6c6ecfd74ce11ab: makedumpfile.c: In function 'is_kvaddr': makedumpfile.c:1613:39: error: 'KVBASE' undeclared (first use in this function) return (addr >= (unsigned long long)(KVBASE)); ^~~~~~ Fixes: - http://autobuild.buildroot.org/results/94824fa8baa8edb99a5ca245e5561e0c4e430638 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/makedumpfile/0002-Handle-__mips64.patch | 69 +++++++++++++++++++++++++ 1 file changed, 69 insertions(+) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:47 -0000 Subject: [Buildroot] [git commit branch/next] package/ipmitool: drop ncurses dependency Message-ID: <20230220205145.D8D6686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a95fcbebf5955de48dd7f57dfc27708739968da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next ncurses is not a dependency since bump to version 1.8.19 in commit 8317065ecb4979fe43c466f7e5a7f6dc281bd10d and https://github.com/ipmitool/ipmitool/commit/63dd71c39c9bf522ad3a785dd001737a285458eb Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipmitool/Config.in | 1 - package/ipmitool/ipmitool.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/ipmitool/Config.in b/package/ipmitool/Config.in index f5c79c8403..dbd6483110 100644 --- a/package/ipmitool/Config.in +++ b/package/ipmitool/Config.in @@ -32,7 +32,6 @@ config BR2_PACKAGE_IPMITOOL_IPMIEVD config BR2_PACKAGE_IPMITOOL_IPMISHELL bool "ipmishell" - select BR2_PACKAGE_NCURSES select BR2_PACKAGE_READLINE help IPMI shell interface diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index 06d50bb6b9..0b8befffcd 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -34,7 +34,7 @@ IPMITOOL_CONF_OPTS += --disable-intf-usb endif ifeq ($(BR2_PACKAGE_IPMITOOL_IPMISHELL),y) -IPMITOOL_DEPENDENCIES += ncurses readline +IPMITOOL_DEPENDENCIES += readline IPMITOOL_CONF_OPTS += --enable-ipmishell else IPMITOOL_CONF_OPTS += --disable-ipmishell From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:48 -0000 Subject: [Buildroot] [git commit branch/next] configs/qemu_aarch64_ebbr: bump u-boot and linux versions Message-ID: <20230220205145.B1C5D86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=acae82e8a13ca97c354c94cedd2a59f89fba2ee6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Bump U-Boot version to v2022.10. - Bump Linux kernel version to v6.0.0. Signed-off-by: Vincent Stehl?? Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/qemu_aarch64_ebbr_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index 15822e17a3..a0d8105c43 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -39,7 +39,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.config" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:48 -0000 Subject: [Buildroot] [git commit branch/next] package/libidn2: fix build with libunistring Message-ID: <20230220205145.F228486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9e5b0255d47babf45f1f6e13dccf65bbbc9f84c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with libunistring raised since the addition of the package in commit ffb85a4a16df94e4980057a194e5fdc3c8332e32: /home/autobuild/autobuild/instance-2/output-1/per-package/libidn2/host/bin/../lib/gcc/aarch64-buildroot-linux-gnu/11.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: warning: libunistring.so.2, needed by ../lib/.libs/libidn2.so, not found (try using -rpath or -rpath-link) /home/autobuild/autobuild/instance-2/output-1/per-package/libidn2/host/bin/../lib/gcc/aarch64-buildroot-linux-gnu/11.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: ../lib/.libs/libidn2.so: undefined reference to `u8_strconv_to_encoding' [...] aarch64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib' Fixes: - http://autobuild.buildroot.org/results/30ac50512cd4b4cb3ecc97514a72d1f316a1b33a - http://autobuild.buildroot.org/results/c225ff4ef007b9a3ca56e6b601687aaa33699675 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libidn2/libidn2.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libidn2/libidn2.mk b/package/libidn2/libidn2.mk index 9d72998149..9d24e93d27 100644 --- a/package/libidn2/libidn2.mk +++ b/package/libidn2/libidn2.mk @@ -13,10 +13,12 @@ LIBIDN2_DEPENDENCIES = \ host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) +LIBIDN2_CONF_OPTS = --without-included-libunistring LIBIDN2_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBUNISTRING),y) LIBIDN2_DEPENDENCIES += libunistring +LIBIDN2_CONF_OPTS += --with-libunistring-prefix=$(STAGING_DIR)/usr/lib endif ifeq ($(BR2_PACKAGE_LIBIDN2_BINARY),) From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:49 -0000 Subject: [Buildroot] [git commit branch/next] support/testing/tests/package/test_python_crossbar: use ext2 instead of cpio Message-ID: <20230220205146.1EEFE86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7930708a3b1e429ea605f4544564b29313b0a7b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The CPIO filesystem generated by the test_python_crossbar test is too large, and doesn't fit as an initramfs in the 256MB of RAM available in the versatilepb machine. This causes a "Initramfs unpacking failed: write error" when booting, and many files being missing from the root filesystem, ultimately causing the test to fail. It would make sense to switch all test cases to use ext2 + a hard-drive, but for now, let's fix the few test cases that are causing problems. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3249828587 Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_crossbar.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/package/test_python_crossbar.py b/support/testing/tests/package/test_python_crossbar.py index 83649aeec2..178b16be82 100644 --- a/support/testing/tests/package/test_python_crossbar.py +++ b/support/testing/tests/package/test_python_crossbar.py @@ -1,4 +1,5 @@ from tests.package.test_python import TestPythonPackageBase +import os class TestPythonPy3Crossbar(TestPythonPackageBase): @@ -13,8 +14,16 @@ class TestPythonPy3Crossbar(TestPythonPackageBase): BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CROSSBAR=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="120M" """ sample_scripts = ["tests/package/sample_python_crossbar.py"] timeout = 60 + + def login(self): + ext2_file = os.path.join(self.builddir, "images", "rootfs.ext2") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-drive", "file=%s,if=scsi,format=raw" % ext2_file], + kernel_cmdline=["rootwait", "root=/dev/sda"]) + self.emulator.login() From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:49 -0000 Subject: [Buildroot] [git commit branch/next] package/procps-ng: fix build without __NR_pidfd_open Message-ID: <20230220205145.CBB0586491@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c07caa732b5c4ca5836ee81ce90f57f967dcc721 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure without __NR_pidfd_open raised since bump to version 3.3.17 in commit cc28c7aa6df7798ce5ca79d6d1c7c2eb115ba220 and https://gitlab.com/procps-ng/procps/-/commit/c8384e682c1cfb3b2dc797e0f8a3cbaaccf7a3da: pgrep.c: In function 'pidfd_open': pgrep.c:748:17: error: '__NR_pidfd_open' undeclared (first use in this function); did you mean 'pidfd_open'? 748 | return syscall(__NR_pidfd_open, pid, flags); | ^~~~~~~~~~~~~~~ | pidfd_open Fixes: - http://autobuild.buildroot.org/results/f23a5156e641b2ebdd673973dec0f9c87760c688 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/procps-ng/0003-fix-pifd_open-check.patch | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/package/procps-ng/0003-fix-pifd_open-check.patch b/package/procps-ng/0003-fix-pifd_open-check.patch new file mode 100644 index 0000000000..7152901e70 --- /dev/null +++ b/package/procps-ng/0003-fix-pifd_open-check.patch @@ -0,0 +1,59 @@ +From 0cce3e981540c28d2f703b9ab16c04d0df8fa03d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 3 Nov 2022 18:24:53 +0100 +Subject: [PATCH] fix pifd_open check + +Replace AC_CHECK_FUNC by AC_CHECK_FUNCS otherwise HAVE_PIDFD_OPEN will +never be defined resulting in the following build failure if pidfd_open +is available but __NR_pidfd_open is not available: + +pgrep.c: In function 'pidfd_open': +pgrep.c:748:17: error: '__NR_pidfd_open' undeclared (first use in this function); did you mean 'pidfd_open'? + 748 | return syscall(__NR_pidfd_open, pid, flags); + | ^~~~~~~~~~~~~~~ + | pidfd_open + +This build failure is raised since the addition of pwait in version +3.3.17 and +https://gitlab.com/procps-ng/procps/-/commit/c8384e682c1cfb3b2dc797e0f8a3cbaaccf7a3da + +Fixes: + - http://autobuild.buildroot.org/results/f23a5156e641b2ebdd673973dec0f9c87760c688 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.com/procps-ng/procps/-/merge_requests/166] +--- + configure.ac | 2 +- + src/pgrep.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 629881a6..1a3ccdb8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -160,7 +160,7 @@ AC_TRY_COMPILE([#include ], + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + +-AC_CHECK_FUNC([pidfd_open], [enable_pwait=yes], [ ++AC_CHECK_FUNCS([pidfd_open], [enable_pwait=yes], [ + AC_MSG_CHECKING([for __NR_pidfd_open]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include +diff --git a/pgrep.c b/pgrep.c +index c4ad5da3..29cfedf7 100644 +--- a/pgrep.c ++++ b/pgrep.c +@@ -38,7 +38,7 @@ + #include + #include + +-#if defined(ENABLE_PWAIT) && !defined(HAVE_PIDFD_OPEN) ++#if defined(ENABLE_PWAIT) + #include + #include + #endif +-- +2.35.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:50 -0000 Subject: [Buildroot] [git commit branch/next] package/rpi-userland: fix hello_ applications Message-ID: <20230220205145.A782B86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5044928baeaed86cee6f8452dc3850d5d0cb80a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The HELLO_ examples fail to run because the librevision.so library build by the userland package is not included in the image. Include this library if BR2_PACKAGE_RPI_USERLAND_HELLO is selected. Signed-off-by: Tim Gover Signed-off-by: Thomas Petazzoni --- package/rpi-userland/rpi-userland.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 1204196e19..2800b56296 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -25,6 +25,9 @@ define RPI_USERLAND_EXTRA_LIBS_TARGET $(INSTALL) -m 0644 -D \ $(@D)/build/lib/libilclient.so \ $(TARGET_DIR)/usr/lib/libilclient.so + $(INSTALL) -m 0644 -D \ + $(@D)/build/lib/librevision.so \ + $(TARGET_DIR)/usr/lib/librevision.so endef RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_EXTRA_LIBS_TARGET @@ -32,6 +35,9 @@ define RPI_USERLAND_EXTRA_LIBS_STAGING $(INSTALL) -m 0644 -D \ $(@D)/build/lib/libilclient.so \ $(STAGING_DIR)/usr/lib/libilclient.so + $(INSTALL) -m 0644 -D \ + $(@D)/build/lib/librevision.so \ + $(STAGING_DIR)/usr/lib/librevision.so endef RPI_USERLAND_POST_INSTALL_STAGING_HOOKS += RPI_USERLAND_EXTRA_LIBS_STAGING From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:50 -0000 Subject: [Buildroot] [git commit branch/next] package/rsync: force HAVE_C99_VSNPRINTF to "yes" Message-ID: <20230220205146.41EF486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b17cd017e8b946d718c81f0e38fd570e6a6bc0d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We know the system will have a modern-enough C library that implements the required snprintf() functionality. Since the configure stage can't detect the system's capabilities (because it is cross-compiling), let's hard-code the decision. As a result, rsync won't be linking in its own copy of snprintf(). Signed-off-by: Markus Mayer Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 81ad4b9291..7ff7ca6eef 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -11,6 +11,9 @@ RSYNC_LICENSE_FILES = COPYING RSYNC_CPE_ID_VENDOR = samba RSYNC_SELINUX_MODULES = rsync RSYNC_DEPENDENCIES = zlib popt +# We know that our C library is modern enough for C99 vsnprintf(). Since +# configure can't detect this, we tell configure that vsnprintf() is safe. +RSYNC_CONF_ENV = rsync_cv_HAVE_C99_VSNPRINTF=yes RSYNC_CONF_OPTS = \ --with-included-zlib=no \ --with-included-popt=no \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:50 -0000 Subject: [Buildroot] [git commit branch/next] package/lxc: add systemd optional dependency Message-ID: <20230220205149.48F2A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e71ef565e720e56c51eed6933f6d87331193837f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since bump to version 5.0.1 in commit db19998035701d08bf1b5fd366e0b5aa9adb8e57: Run-time dependency systemd found: NO (tried pkgconfig and cmake) ../output-1/build/lxc-5.0.1/config/init/systemd/meson.build:11:4: ERROR: Dependency "systemd" not found, tried pkgconfig and cmake Fixes: - http://autobuild.buildroot.org/results/495175c367084093bc01c40290736c738d876894 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lxc/lxc.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index f0a0e8041a..e1639c5f15 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -63,4 +63,19 @@ else LXC_CONF_OPTS += -Dopenssl=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +LXC_CONF_OPTS += -Dsd-bus=enabled +LXC_DEPENDENCIES += systemd +else +LXC_CONF_OPTS += -Dsd-bus=disabled +endif + +ifeq ($(BR2_INIT_SYSTEMD),y) +LXC_CONF_OPTS += -Dinit-script=systemd +else ifeq ($(BR2_INIT_SYSV),y) +LXC_CONF_OPTS += -Dinit-script=sysvinit +else +LXC_CONF_OPTS += -Dinit-script= +endif + $(eval $(meson-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:51 -0000 Subject: [Buildroot] [git commit branch/next] package/ipmitool: fix static build with readline Message-ID: <20230220205145.E5D058648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82480ee22bdfae6f7d399975722b5c125749d8c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static build failure with readline raised since bump to version 1.8.19 in commit 8317065ecb4979fe43c466f7e5a7f6dc281bd10d and https://github.com/ipmitool/ipmitool/commit/63dd71c39c9bf522ad3a785dd001737a285458eb: configure:15125: /tmp/instance-0/output-1/host/bin/armeb-buildroot-linux-musleabi-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O0 -g0 -static -Wall -Wextra -std=gnu11 -pedantic -Wformat -Wformat-nonliteral -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lreadline -lcrypto >&5 /tmp/instance-0/output-1/host/lib/gcc/armeb-buildroot-linux-musleabi/11.3.0/../../../../armeb-buildroot-linux-musleabi/bin/ld: /tmp/instance-0/output-1/host/armeb-buildroot-linux-musleabi/sysroot/usr/lib/libreadline.a(display.o): in function `_rl_move_cursor_relative': display.c:(.text+0x80fc): undefined reference to `tputs' Fixes: - http://autobuild.buildroot.org/results/dabc6a4f49d464c129ac6bc3710011678142fcbe Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...01-configure.ac-fix-readline-static-build.patch | 49 ++++++++++++++++++++++ package/ipmitool/ipmitool.mk | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/package/ipmitool/0001-configure.ac-fix-readline-static-build.patch b/package/ipmitool/0001-configure.ac-fix-readline-static-build.patch new file mode 100644 index 0000000000..e3d4349502 --- /dev/null +++ b/package/ipmitool/0001-configure.ac-fix-readline-static-build.patch @@ -0,0 +1,49 @@ +From 9836e2211ba8b3035a1d390bbf6a0eebe4c2439d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 3 Nov 2022 17:19:09 +0100 +Subject: [PATCH] configure.ac: fix readline static build + +Use pkg-config to retrieve readline dependencies such as ncurses to +avoid the following static build when readline is built with ncurses +support (which is raised since version 1.8.19 and +https://github.com/ipmitool/ipmitool/commit/63dd71c39c9bf522ad3a785dd001737a285458eb): + +** Unable to build Solaris 9 x86 IPMI interface support! +checking for library containing readline... no +configure: error: ** Unable to find readline required by ipmishell. + +[...] + +configure:15125: /tmp/instance-0/output-1/host/bin/armeb-buildroot-linux-musleabi-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O0 -g0 -static -Wall -Wextra -std=gnu11 -pedantic -Wformat -Wformat-nonliteral -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lreadline -lcrypto >&5 +/tmp/instance-0/output-1/host/lib/gcc/armeb-buildroot-linux-musleabi/11.3.0/../../../../armeb-buildroot-linux-musleabi/bin/ld: /tmp/instance-0/output-1/host/armeb-buildroot-linux-musleabi/sysroot/usr/lib/libreadline.a(display.o): in function `_rl_move_cursor_relative': +display.c:(.text+0x80fc): undefined reference to `tputs' + +Fixes: + - http://autobuild.buildroot.org/results/dabc6a4f49d464c129ac6bc3710011678142fcbe + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ipmitool/ipmitool/pull/374] +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d6ba62b..4ee1be8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -624,7 +624,11 @@ AC_ARG_ENABLE([ipmishell], + + dnl check for readline library to enable ipmi shell + if test "x$xenable_ipmishell" = "xyes"; then +- AC_SEARCH_LIBS([readline], [readline edit], [have_readline=yes]) ++ PKG_PROG_PKG_CONFIG ++ PKG_CHECK_MODULES([READLINE], [readline], ++ [LIBS="$LIBS $READLINE_LIBS" have_readline=yes], ++ [AC_SEARCH_LIBS([readline], [readline edit], [have_readline=yes])] ++ ) + if test "x$have_readline" != "xyes"; then + AC_MSG_ERROR([** Unable to find readline required by ipmishell.]) + xenable_ipmishell=no +-- +2.35.1 + diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index 0b8befffcd..ebd8f9b337 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -34,7 +34,7 @@ IPMITOOL_CONF_OPTS += --disable-intf-usb endif ifeq ($(BR2_PACKAGE_IPMITOOL_IPMISHELL),y) -IPMITOOL_DEPENDENCIES += readline +IPMITOOL_DEPENDENCIES += host-pkgconf readline IPMITOOL_CONF_OPTS += --enable-ipmishell else IPMITOOL_CONF_OPTS += --disable-ipmishell From yann.morin.1998 at free.fr Mon Feb 20 20:51:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:51 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_r1: remove defconfig Message-ID: <20230220205148.AE26786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60361bfabeaead7b262c6b918a5e3962a9e32f31 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499056 Cc: Davide Viti Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 - board/friendlyarm/nanopi-r1/boot.cmd | 8 - board/friendlyarm/nanopi-r1/genimage.cfg | 37 ----- .../nanopi-r1/kernel/linux-extras.config | 2 - .../nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts | 170 --------------------- board/friendlyarm/nanopi-r1/readme.txt | 29 ---- .../nanopi-r1/uboot/nanopi_r1_defconfig | 22 --- .../nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts | 102 ------------- configs/friendlyarm_nanopi_r1_defconfig | 49 ------ 9 files changed, 421 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0c9f885808..45cf302386 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -721,8 +721,6 @@ N: David Pierret F: package/bat/ N: Davide Viti -F: board/friendlyarm/nanopi-r1/ -F: configs/friendlyarm_nanopi_r1_defconfig F: package/flann/ F: package/python-paho-mqtt/ F: package/qhull/ diff --git a/board/friendlyarm/nanopi-r1/boot.cmd b/board/friendlyarm/nanopi-r1/boot.cmd deleted file mode 100644 index 9f0cdbfe51..0000000000 --- a/board/friendlyarm/nanopi-r1/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-nanopi-r1.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-r1/genimage.cfg b/board/friendlyarm/nanopi-r1/genimage.cfg deleted file mode 100644 index a180311cae..0000000000 --- a/board/friendlyarm/nanopi-r1/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the NanoPi M1 -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-r1.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/board/friendlyarm/nanopi-r1/kernel/linux-extras.config b/board/friendlyarm/nanopi-r1/kernel/linux-extras.config deleted file mode 100644 index 206b3810a7..0000000000 --- a/board/friendlyarm/nanopi-r1/kernel/linux-extras.config +++ /dev/null @@ -1,2 +0,0 @@ -# USB ethernet -CONFIG_USB_RTL8152=y diff --git a/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts b/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts deleted file mode 100644 index ca15a57bee..0000000000 --- a/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright (C) 2019 Igor Pecovnik - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file 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 2 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 General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "sun8i-h3-nanopi.dtsi" - -/ { - model = "FriendlyElec NanoPi-R1"; - compatible = "friendlyarm,nanopi-r1", "allwinner,sun8i-h3"; - - aliases { - serial1 = &uart3; - ethernet0 = &emac; - ethernet1 = &emac; - ethernet2 = &sdio_wifi; - }; - - wifi_pwrseq: wifi_pwrseq { - compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; - reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ - }; - - reg_gmac_3v3: gmac-3v3 { - compatible = "regulator-fixed"; - regulator-name = "gmac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <100000>; - enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; - }; - - leds { - /delete-node/ status; - /delete-node/ pwr; - led1 { - label = "LED1"; - gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; - }; - - led2 { - label = "LED2"; - gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; - default-state = "off"; - linux,default-trigger = "netdev"; - }; - - led3 { - label = "LED3"; - gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>; - default-state = "off"; - linux,default-trigger = "netdev"; - }; - }; - - r_gpio_keys { - compatible = "gpio-keys"; - input-name = "k1"; - pinctrl-names = "default"; - pinctrl-0 = <&sw_r_npi>; - - /delete-node/ k1; - reset { - label = "reset"; - linux,code = ; - gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; - }; - }; -}; - -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; - phy-handle = <&ext_rgmii_phy>; - phy-mode = "rgmii"; - - status = "okay"; -}; - -&external_mdio { - ext_rgmii_phy: ethernet-phy at 1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <7>; - }; -}; - -&mmc1 { - vmmc-supply = <®_vcc3v3>; - vqmmc-supply = <®_vcc3v3>; - mmc-pwrseq = <&wifi_pwrseq>; - bus-width = <4>; - non-removable; - status = "okay"; - - sdio_wifi: sdio_wifi at 1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; - interrupt-parent = <&pio>; - interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */ - interrupt-names = "host-wake"; - }; -}; - -&mmc2 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc2_8bit_pins>; - vmmc-supply = <®_vcc3v3>; - vqmmc-supply = <®_vcc3v3>; - bus-width = <8>; - non-removable; - status = "okay"; -}; - -&ohci0 { - status = "okay"; -}; - -&ohci1 { - status = "okay"; -}; - -&usb_otg { - dr_mode = "peripheral"; - status = "okay"; -}; - -&usbphy { - status = "okay"; -}; diff --git a/board/friendlyarm/nanopi-r1/readme.txt b/board/friendlyarm/nanopi-r1/readme.txt deleted file mode 100644 index fa3114fc83..0000000000 --- a/board/friendlyarm/nanopi-r1/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -NanoPi R1 - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the NanoPi R1. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make friendlyarm_nanopi_r1_defconfig - -Compile everything and build the SD card image: - - $ make - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig b/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig deleted file mode 100644 index e028b41a46..0000000000 --- a/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig +++ /dev/null @@ -1,22 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_SUNXI=y -CONFIG_SPL=y -CONFIG_MACH_SUN8I_H3=y -CONFIG_DRAM_CLK=408 -CONFIG_DRAM_ZQ=3881979 -CONFIG_DRAM_ODT_EN=y -CONFIG_MACPWR="PD6" -# CONFIG_VIDEO_DE2 is not set -CONFIG_NR_DRAM_BANKS=1 -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y -CONFIG_SYS_CLK_FREQ=480000000 -# CONFIG_CMD_FLASH is not set -# CONFIG_SPL_DOS_PARTITION is not set -# CONFIG_SPL_EFI_PARTITION is not set -CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-r1" -CONFIG_SUN8I_EMAC=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_OHCI_HCD=y -CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y -CONFIG_MMC_SUNXI_SLOT_EXTRA=2 diff --git a/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts b/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts deleted file mode 100644 index 9c3c574e0f..0000000000 --- a/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2019 Igor Pecovnik - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file 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 2 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 General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "sun8i-h3-nanopi.dtsi" - -/ { - model = "FriendlyARM NanoPi R1"; - compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3"; - - reg_gmac_3v3: gmac-3v3 { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - regulator-name = "gmac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <100000>; - enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; - }; - -}; - -&ehci0 { - status = "okay"; -}; - -&pio { - gmac_power_pin_nanopi: gmac_power_pin at 0 { - pins = "PD6"; - function = "gpio_out"; - }; -}; - -&ohci0 { - status = "okay"; -}; - -&mmc2 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc2_8bit_pins>; - vmmc-supply = <®_vcc3v3>; - bus-width = <8>; - non-removable; - cap-mmc-hw-reset; - status = "okay"; -}; - -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; - phy-handle = <&ext_rgmii_phy>; - phy-mode = "rgmii"; - - status = "okay"; -}; - -&external_mdio { - ext_rgmii_phy: ethernet-phy at 1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <7>; - }; -}; diff --git a/configs/friendlyarm_nanopi_r1_defconfig b/configs/friendlyarm_nanopi_r1_defconfig deleted file mode 100644 index 8b03f6dd00..0000000000 --- a/configs/friendlyarm_nanopi_r1_defconfig +++ /dev/null @@ -1,49 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="nanopi-r1" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi R1" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts" -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_TARGET_UBOOT_USE_CUSTOM_CONFIG=y -BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-r1/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-r1/kernel/linux-extras.config" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts" -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-r1" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r1/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From yann.morin.1998 at free.fr Mon Feb 20 20:51:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:51 -0000 Subject: [Buildroot] [git commit branch/next] package/gawk: renumber remaining patch Message-ID: <20230220205146.4DD6186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4721367debff67d2a4fddb3a5d72796ebbb401f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit aaba432e2cae (package/gawk: drop incorrect patch) was sent on the list before e6942ad11ff0 (package/gawk: fix double free during kernel build) was applied. But when aaba432e2cae was eventually applied, the remaining patch was not renumbered. Fix that now. Signed-off-by: Yann E. MORIN --- ...g-with-Node_elem_new.patch => 0001-Fix-a-bug-with-Node_elem_new.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package/gawk/0002-Fix-a-bug-with-Node_elem_new.patch b/package/gawk/0001-Fix-a-bug-with-Node_elem_new.patch similarity index 100% rename from package/gawk/0002-Fix-a-bug-with-Node_elem_new.patch rename to package/gawk/0001-Fix-a-bug-with-Node_elem_new.patch From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:52 -0000 Subject: [Buildroot] [git commit branch/next] package/multipath-tools: security bump to version 0.9.3 Message-ID: <20230220205146.0AB7E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a7a5641597c5c3d0978906fb8cf93eb153425a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: - CVE-2022-41974: Authorization bypass - CVE-2022-41973: Symlink attack For more details, see the writeup: https://www.qualys.com/2022/10/24/leeloo-multipath/leeloo-multipath.txt Update README.md hash after license-unrelated changes: git shortlog 0.9.0..0.9.3 -- README.md Konstantin Kharlamov (1): README.md: mention libreadline and libedit optional deps Xose Vazquez Perez (4): multipath-tools: update devel repo info in README.md multipath-tools: add ALUA info to README.md multipath-tools: add basic info on how to use multipath-tools with NVMe devices multipath-tools: add more info for NetApp RDAC arrays Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/multipath-tools/multipath-tools.hash | 4 ++-- package/multipath-tools/multipath-tools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index df0d24fb74..6f893d37ce 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,7 +1,7 @@ # Locally computed: -sha256 d6d1d819a53d076a91828ede42d9786451a471c4b71ca3fd25d04ad5413e3f95 multipath-tools-0.9.0.tar.gz +sha256 7d5af5d86e43b757e253d1ba244aa8a9c09bfbb1677a72accb799b1bfcc0a9ac multipath-tools-0.9.3.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1 -sha256 fb0a5d2008c609fec129d2ffd01dd7f65f0e3868bcf465b6fda76e25ff896ce9 README.md +sha256 1e6095ac219062b8ddb2416d2a3cc40560619cd6b3ba609f5602bbd320413be0 README.md diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index f3ce3ca8b8..ec5d853644 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.9.0 +MULTIPATH_TOOLS_VERSION = 0.9.3 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:52 -0000 Subject: [Buildroot] [git commit branch/next] configs/kontron_bl_imx8mm: U-Boot needs util-linux Message-ID: <20230220205149.B5D9A86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=223516b51e1a45fa86dc1ac959aed93c7434afa4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: /usr/bin/ld: cannot find -lgnutls /usr/bin/ld: cannot find -luuid collect2: error: ld returned 1 exit status when building U-Boot. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3301821264 Signed-off-by: Thomas Petazzoni --- configs/kontron_bl_imx8mm_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig index ff376662e9..13ed1a2078 100644 --- a/configs/kontron_bl_imx8mm_defconfig +++ b/configs/kontron_bl_imx8mm_defconfig @@ -48,6 +48,7 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" BR2_TARGET_UBOOT_SPL=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:52 -0000 Subject: [Buildroot] [git commit branch/next] package/botan: add host-python3 dependency Message-ID: <20230220205146.AC99C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ad4301f608a270b6f463ebd91684cde0f584ebd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next add host-python3 dependency to avoid the following build failure raised since the addition of the package in commit e43da7bb32285bbd41b38a379aef77132d149df7: (cd /home/autobuild/autobuild/instance-19/output-1/build/botan-2.19.2; PATH="/home/autobuild/autobuild/instance-19/output-1/host/bin:/home/autobuild/autobuild/instance-19/output-1/host/sbin:/home/autobuild/make:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ./configure.py --cpu="m68k" --disable-cc-tests --os=linux --cc=gcc --cc-bin="/home/autobuild/autobuild/instance-19/output-1/host/bin/m68k-linux-g++" --prefix=/usr --without-documentation --extra-libs=atomic --disable-shared-library --enable-static-library --no-autoload --without-stack-protector --without-os-feature=getauxval --with-boost --with-sqlite --with-zlib --disable-altivec --disable-neon) /usr/bin/env: 'python': No such file or directory Fixes: - http://autobuild.buildroot.org/results/91eb6d03ee899bc1034efc5ac7d1fe78961d37ca Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/botan/botan.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/botan/botan.mk b/package/botan/botan.mk index b26ee4c66e..b0ebe594b1 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -13,6 +13,7 @@ BOTAN_CPE_ID_VENDOR = botan_project BOTAN_INSTALL_STAGING = YES +BOTAN_DEPENDENCIES = host-python3 BOTAN_CONF_OPTS = \ --cpu=$(BR2_ARCH) \ --disable-cc-tests \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:53 -0000 Subject: [Buildroot] [git commit branch/next] support/testing/tests/package/test_python_flask*: increase time after server startup Message-ID: <20230220205146.14D6186491@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3884cfc0571abc19b35b2f161f6c8c009847a0bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next It seems like on Gitlab CI, the runners are quite slow, and the Flask server does not startup in the 15 seconds we give it. So increase this to 30 seconds before trying to contact the Flask server. Hopefully fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3249828594 Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_flask.py | 2 +- support/testing/tests/package/test_python_flask_expects_json.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/package/test_python_flask.py b/support/testing/tests/package/test_python_flask.py index ef5d96bae9..9d8587e918 100644 --- a/support/testing/tests/package/test_python_flask.py +++ b/support/testing/tests/package/test_python_flask.py @@ -21,7 +21,7 @@ class TestPythonPy3Flask(TestPythonPackageBase): _, exit_code = self.emulator.run(cmd, timeout=self.timeout) # Give enough time for the flask server to start up - time.sleep(15) + time.sleep(30) cmd = "wget -q -O - http://127.0.0.1:5000/" output, exit_code = self.emulator.run(cmd, timeout=self.timeout) diff --git a/support/testing/tests/package/test_python_flask_expects_json.py b/support/testing/tests/package/test_python_flask_expects_json.py index 5576cba2b4..91b8bf21b7 100644 --- a/support/testing/tests/package/test_python_flask_expects_json.py +++ b/support/testing/tests/package/test_python_flask_expects_json.py @@ -31,7 +31,7 @@ class TestPythonPy3FlaskExpectsJson(TestPythonPackageBase): _, exit_code = self.emulator.run(cmd, timeout=self.timeout) # Give enough time for the flask server to start up - time.sleep(15) + time.sleep(30) self.try_json("""{"email": "test", "name": "test"}""", 200) self.try_json("""{"email": "test", "name": 2}""", 400) From yann.morin.1998 at free.fr Mon Feb 20 20:51:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:53 -0000 Subject: [Buildroot] [git commit branch/next] packages/sudo: explicitly set with-tzdir Message-ID: <20230220205150.1B5A086496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51d3902af72d74cf5bf7c1246e4bf41cfc5e55f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next sudo's configure script looks up on the host to determine the path to the timezone data location. That fails in cross-compilation. This is used to sanitise the TZ envirnment variable at runtime, and is not used at buildtime (except to be stored as a string in the program). We can tell sudo where the tz data will be, which we do when the tzdata package is enabled, and we can tell it not to use it at all (to not pass TZ down to sudo-ed executions) othwerwise. Signed-off-by: Nuno Gon??alves [yann.morin.1998 at free.fr: rewrite and extend commit log] Signed-off-by: Yann E. MORIN --- package/sudo/sudo.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 1826f72017..28cfcbb1e2 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -16,6 +16,7 @@ SUDO_SELINUX_MODULES = sudo # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \ + --with-tzdir=$(if $(BR2_PACKAGE_TZDATA),/usr/share/zoneinfo,no) \ --without-lecture \ --without-sendmail \ --without-umask \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:54 -0000 Subject: [Buildroot] [git commit branch/next] package/gsl: fix powerpc build Message-ID: <20230220205147.0E98F86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94e47000c27c447de45e7190fbe8d3ef24d7df04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following powerpc build failures on: - musl raised because fpu_control.h is not available: In file included from fp.c:8: fp-gnuppc.c:21:10: fatal error: fpu_control.h: No such file or directory 21 | #include | ^~~~~~~~~~~~~~~ - glibc raised because _FPU_RC_NEAREST is undefined if _SOFT_FLOAT is set: In file included from fp.c:8: fp-gnuppc.c: In function 'gsl_ieee_set_mode': fp-gnuppc.c:53:15: error: '_FPU_RC_NEAREST' undeclared (first use in this function) 53 | mode |= _FPU_RC_NEAREST ; | ^~~~~~~~~~~~~~~ These build failures are raised since the addition of the package in commit 9d9f7feba4ffbfeb54479f1ad90d47acca1a6f0b Fixes: - http://autobuild.buildroot.org/results/d73e116c81bf16d2e55fced215d6bd3b382fef10 - http://autobuild.buildroot.org/results/48403946bb4cda9013e51db59c1b2ffdcf4e2854 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-configure.ac-fix-build-on-powerpc.patch | 53 ++++++++++++++++++++++ package/gsl/gsl.mk | 2 + 2 files changed, 55 insertions(+) diff --git a/package/gsl/0001-configure.ac-fix-build-on-powerpc.patch b/package/gsl/0001-configure.ac-fix-build-on-powerpc.patch new file mode 100644 index 0000000000..13f6da4588 --- /dev/null +++ b/package/gsl/0001-configure.ac-fix-build-on-powerpc.patch @@ -0,0 +1,53 @@ +From 84e62d57b90b41a0c96bb9fb6ec61ecaac76a1ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 5 Nov 2022 21:31:36 +0100 +Subject: [PATCH] configure.ac: fix build on powerpc + +Fix the following powerpc build failures on: + - musl raised because fpu_control.h is not available: + +In file included from fp.c:8: +fp-gnuppc.c:21:10: fatal error: fpu_control.h: No such file or directory + 21 | #include + | ^~~~~~~~~~~~~~~ + + - glibc raised because _FPU_RC_NEAREST is undefined if _SOFT_FLOAT is + set: + + In file included from fp.c:8: +fp-gnuppc.c: In function 'gsl_ieee_set_mode': +fp-gnuppc.c:53:15: error: '_FPU_RC_NEAREST' undeclared (first use in this function) + 53 | mode |= _FPU_RC_NEAREST ; + | ^~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/d73e116c81bf16d2e55fced215d6bd3b382fef10 + - http://autobuild.buildroot.org/results/48403946bb4cda9013e51db59c1b2ffdcf4e2854 + +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/configure.ac b/configure.ac +index bfd9ca30..1ee6dca0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -389,6 +389,14 @@ if test "$ac_cv_c_ieee_interface" = "gnux86" ; then + fi + fi + ++if test "$ac_cv_c_ieee_interface" = "gnuppc" ; then ++ AC_CACHE_CHECK([for _FPU_RC_NEAREST], ac_cv_c__fpu_rc_nearest, ++ [ac_cv_c__fpu_rc_nearest=no ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ++]], [[ unsigned short mode = _FPU_RC_NEAREST ; ]])],[ac_cv_c__fpu_rc_nearest="yes"],[ac_cv_c_ieee_interface=unknown]) ++ ]) ++fi ++ + ac_tr_ieee_interface=HAVE_`echo $ac_cv_c_ieee_interface | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_IEEE_INTERFACE + AC_DEFINE_UNQUOTED($ac_tr_ieee_interface,1,[IEEE Interface Type]) + +-- +2.35.1 + diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk index 416955b72c..3604f9836c 100644 --- a/package/gsl/gsl.mk +++ b/package/gsl/gsl.mk @@ -10,6 +10,8 @@ GSL_INSTALL_STAGING = YES GSL_LICENSE = GPL-3.0 GSL_LICENSE_FILES = COPYING GSL_CONFIG_SCRIPTS = gsl-config +# We're patching configure.ac +GSL_AUTORECONF = YES # uClibc pretends to have fenv support as it installs , but in # practice, it only implements it for i386. Problem reported upstream From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:54 -0000 Subject: [Buildroot] [git commit branch/next] support/testing/tests/package/test_gdb.py: drop version-specific tests Message-ID: <20230220205146.294CF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9dd9ee857ec59e35552efe46a173eebc50659d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Back when support/testing/tests/package/test_gdb was introduced, there was a significant difference in how gdb < 10 and gdb >= 10 were handled in gdb.mk, which explained why we were testing both gdb 9.x and gdb 11.x. However, support for gdb 9.x has now been dropped, and we only support gdb >= 10.x, so testing gdb 9.x and 11.x separately no longer make much sense. In addition: - other GDB tests in the same file already test the default version, which is now 11.x, meaning we in fact have duplicated tests between the ones testing the default version and the ones testing 11.x specifically - GDB 9.x has been removed, which means all the tests testing GDB 9.x are failing, with a Config.in.legacy build error. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3249828456 (TestGdbHostOnly9x) https://gitlab.com/buildroot.org/buildroot/-/jobs/3249828454 (TestGdbHostGdbserver9x) https://gitlab.com/buildroot.org/buildroot/-/jobs/3249828451 (TestGdbHostGdbTarget9x) Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_gdb.py | 108 ------------------------------ 1 file changed, 108 deletions(-) diff --git a/support/testing/tests/package/test_gdb.py b/support/testing/tests/package/test_gdb.py index a7b0870644..4712162349 100644 --- a/support/testing/tests/package/test_gdb.py +++ b/support/testing/tests/package/test_gdb.py @@ -91,114 +91,6 @@ class TestGdbFullTarget(BaseGdb): self.verify_gdb() -class TestGdbHostOnly9x(BaseGdb): - config = \ - infra.basetest.MINIMAL_CONFIG + \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_9_2=y - """ - - def test_run(self): - self.verify_host_gdb() - - -class TestGdbHostGdbserver9x(BaseGdb): - config = \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_9_2=y - BR2_PACKAGE_GDB=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - - def test_run(self): - self.verify_host_gdb() - self.boot() - self.verify_gdbserver() - - -class TestGdbHostGdbTarget9x(BaseGdb): - config = \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_9_2=y - BR2_PACKAGE_GDB=y - BR2_PACKAGE_GDB_DEBUGGER=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - - def test_run(self): - self.verify_host_gdb() - self.boot() - self.verify_gdb() - - -class TestGdbHostOnly11x(BaseGdb): - config = \ - infra.basetest.MINIMAL_CONFIG + \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_11=y - """ - - def test_run(self): - self.verify_host_gdb() - - -class TestGdbHostGdbserver11x(BaseGdb): - config = \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_11=y - BR2_PACKAGE_GDB=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - - def test_run(self): - self.verify_host_gdb() - self.boot() - self.verify_gdbserver() - - -class TestGdbHostGdbTarget11x(BaseGdb): - config = \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_11=y - BR2_PACKAGE_GDB=y - BR2_PACKAGE_GDB_DEBUGGER=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - - def test_run(self): - self.verify_host_gdb() - self.boot() - self.verify_gdb() - - class TestGdbArc(BaseGdb): config = \ """ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:54 -0000 Subject: [Buildroot] [git commit branch/next] package/libvncserver: fix CVE-2020-29260 Message-ID: <20230220205150.DA7DE86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3ab978703e0597b4bdf17d3e32cf0357db8315c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libvncclient v0.9.13 was discovered to contain a memory leak via the function rfbClientCleanup(). Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...nt-free-vncRec-memory-in-rfbClientCleanup.patch | 28 ++++++++++++++++++++++ package/libvncserver/libvncserver.mk | 3 +++ 2 files changed, 31 insertions(+) diff --git a/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch b/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch new file mode 100644 index 0000000000..7658c112f3 --- /dev/null +++ b/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch @@ -0,0 +1,28 @@ +From bef41f6ec4097a8ee094f90a1b34a708fbd757ec Mon Sep 17 00:00:00 2001 +From: Christian Beier +Date: Sat, 21 Nov 2020 12:52:31 +0100 +Subject: [PATCH] libvncclient: free vncRec memory in rfbClientCleanup() + +Otherwise we leak memory. Spotted by Ramin Farajpour Cami +, thanks! + +[Retrieved from: +https://github.com/LibVNC/libvncserver/commit/bef41f6ec4097a8ee094f90a1b34a708fbd757ec] +Signed-off-by: Fabrice Fontaine +--- + libvncclient/vncviewer.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c +index d6b91f02b..0a1bdcf6a 100644 +--- a/libvncclient/vncviewer.c ++++ b/libvncclient/vncviewer.c +@@ -534,6 +534,8 @@ void rfbClientCleanup(rfbClient* client) { + client->clientData = next; + } + ++ free(client->vncRec); ++ + if (client->sock != RFB_INVALID_SOCKET) + rfbCloseSocket(client->sock); + if (client->listenSock != RFB_INVALID_SOCKET) diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk index ead809d19c..8f24e2d098 100644 --- a/package/libvncserver/libvncserver.mk +++ b/package/libvncserver/libvncserver.mk @@ -14,6 +14,9 @@ LIBVNCSERVER_INSTALL_STAGING = YES LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON +# 0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch +LIBVNCSERVER_IGNORE_CVES += CVE-2020-29260 + # only used for examples LIBVNCSERVER_CONF_OPTS += \ -DWITH_FFMPEG=OFF \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:53 -0000 Subject: [Buildroot] [git commit branch/next] package/pixman: security bump version to 0.42.2 Message-ID: <20230220205145.BEFA08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ceeb39303267400d6335e3c687ce1f73d9e6dcc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-October/003228.html https://lists.x.org/archives/xorg-announce/2022-November/003249.html Fixes CVE-2022-44638: https://lists.x.org/archives/xorg-announce/2022-November/003251.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/pixman/pixman.hash | 6 +++--- package/pixman/pixman.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pixman/pixman.hash b/package/pixman/pixman.hash index 1af632a9f4..78407bf048 100644 --- a/package/pixman/pixman.hash +++ b/package/pixman/pixman.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2020-April/003043.html -sha256 da8ed9fe2d1c5ef8ce5d1207992db959226bd4e37e3f88acf908fd9a71e2704e pixman-0.40.0.tar.xz -sha512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270 pixman-0.40.0.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-October/003228.html +sha256 5747d2ec498ad0f1594878cc897ef5eb6c29e91c53b899f7f71b506785fc1376 pixman-0.42.2.tar.xz +sha512 3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8 pixman-0.42.2.tar.xz # Locally computed sha256 fac9270f0987b96ff4533fca3548c633e02083cbba4a0172a3b149b2e4019793 COPYING diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 3f65f0484d..6e6d787d27 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIXMAN_VERSION = 0.40.0 +PIXMAN_VERSION = 0.42.2 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.xz PIXMAN_SITE = https://xorg.freedesktop.org/releases/individual/lib PIXMAN_LICENSE = MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:55 -0000 Subject: [Buildroot] [git commit branch/next] package/gawk: drop incorrect patch Message-ID: <20230220205146.35A0A86491@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aaba432e2cae6ccff2bc6fa30c3ec0cc3c0f3c71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 8cd06967b9be (gawk: bump version and migrate to autotargets) added a patch that purportedly reduced the installation size by not installing the versioned program (gawk-X.Y). However, the versioned program is a hard-link to the unversioned one, so, save for a directory entry, it does not take extra space in the final image. Drop that patch. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/gawk/0001-no-versioned.patch | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/package/gawk/0001-no-versioned.patch b/package/gawk/0001-no-versioned.patch deleted file mode 100644 index c5bbdddeb5..0000000000 --- a/package/gawk/0001-no-versioned.patch +++ /dev/null @@ -1,16 +0,0 @@ -Disabled versioned installation of binaries to save space. - -Signed-off-by: Gustavo Zacarias -[Gustavo: update for 4.1.2] - -diff -Nura gawk-4.1.2.orig/Makefile.in gawk-4.1.2/Makefile.in ---- gawk-4.1.2.orig/Makefile.in 2015-04-29 16:11:09.367925925 -0300 -+++ gawk-4.1.2/Makefile.in 2015-04-29 16:11:25.308466495 -0300 -@@ -1173,6 +1173,7 @@ - # (This is done universally, which may not always be right, but - # there's no easy way to distinguish GNU from non-GNU systems.) - install-exec-hook: -+foo: - (cd $(DESTDIR)$(bindir); \ - $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ - if [ ! -f awk$(EXEEXT) ]; \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:55 -0000 Subject: [Buildroot] [git commit branch/next] Revert "package/ninja: bump to version 1.11.1.g95dee.kitware.jobserver-1" Message-ID: <20230220205147.7A0B086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19bd315208ccdd01d7b8147d43d05799f3deaa1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit 8e2d08c583228e48c622e0adc2ba577cded40ad2. It was meant to be applied to next, not master. Signed-off-by: Thomas Petazzoni --- package/ninja/ninja.hash | 2 +- package/ninja/ninja.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ninja/ninja.hash b/package/ninja/ninja.hash index 57c10bb287..ecde199844 100644 --- a/package/ninja/ninja.hash +++ b/package/ninja/ninja.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 7ba84551f5b315b4270dc7c51adef5dff83a2154a3665a6c9744245c122dd0db ninja-1.11.1.g95dee.kitware.jobserver-1.tar.gz +sha256 549c31ee596566b952c600e23eb9b8d39a4112cd5fdeb2e5a83370669176da40 ninja-1.10.2.g51db2.kitware.jobserver-1.tar.gz sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index b7bc1a4f1c..bc84046414 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -4,8 +4,8 @@ # ################################################################################ -NINJA_VERSION_MAJOR = 1.11.1 -NINJA_VERSION = $(NINJA_VERSION_MAJOR).g95dee.kitware.jobserver-1 +NINJA_VERSION_MAJOR = 1.10.2 +NINJA_VERSION = $(NINJA_VERSION_MAJOR).g51db2.kitware.jobserver-1 NINJA_SITE = $(call github,Kitware,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 20:51:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:51:55 -0000 Subject: [Buildroot] [git commit branch/next] boot/uboot/uboot.mk: fix zynqmp without pmufw Message-ID: <20230220205152.B50EA86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13dc57c94f9f394441b6faeb864aefd2b8ed08ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit d07e6b70 (boot/uboot/uboot.mk: add pmufw.elf support) broke configurations where the UBOOT_ZYNQMP_PMUFW was blank. Previously it would set the U-Boot CONFIG_PMUFW_INIT_FILE to the blank string, but now it will set it to ".bin" which causes U-Boot to fail to build. Signed-off-by: Brandon Maier Reviewed-by: Luca Ceresoli Signed-off-by: Brandon Maier Reviewed-by: Neal Frager Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 0439ec5e4b..9e073daa38 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -395,8 +395,9 @@ UBOOT_ZYNQMP_PMUFW_BASENAME = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH)) define UBOOT_ZYNQMP_KCONFIG_PMUFW $(if $(filter %.elf,$(UBOOT_ZYNQMP_PMUFW_PATH)), - objcopy -O binary -I elf32-little $(UBOOT_ZYNQMP_PMUFW_BASENAME).elf $(UBOOT_ZYNQMP_PMUFW_BASENAME).bin) - $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_BASENAME).bin") + objcopy -O binary -I elf32-little $(UBOOT_ZYNQMP_PMUFW_BASENAME).elf $(UBOOT_ZYNQMP_PMUFW_BASENAME).bin + $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_BASENAME).bin"), + $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)")) endef UBOOT_ZYNQMP_PM_CFG = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PM_CFG)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:56 -0000 Subject: [Buildroot] [git commit branch/next] package/freeipmi: fix build without makeinfo Message-ID: <20230220205147.615018648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbf3253d76399f2b310120e87c29569dd65749cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable documentation to avoid the following build failure without makeinfo raised at least since bump to version 1.6.10 in commit f0faa3b71c585cb70bcd6fa4bafb756b98130bd5 (and probably since the addition of the package in commit 663f39c88c01593855c18355a4decdceeffd884b): /home/buildroot/autobuild/instance-0/output-1/build/freeipmi-1.6.10/config/missing: line 81: makeinfo: command not found WARNING: 'makeinfo' is missing on your system. You should only need it if you modified a '.texi' file, or any other file indirectly affecting the aspect of the manual. You might want to install the Texinfo package: The spurious makeinfo call might also be the consequence of using a buggy 'make' (AIX, DU, IRIX), in which case you might want to install GNU make: Makefile:442: recipe for target 'freeipmi-faq.info' failed Fixes: - http://autobuild.buildroot.org/results/ac6ff1c746a354f885fc1674d10e7bff9e536134 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/freeipmi/0001-add-disable-doc.patch | 72 +++++++++++++++++++++++++++++ package/freeipmi/freeipmi.mk | 2 + 2 files changed, 74 insertions(+) diff --git a/package/freeipmi/0001-add-disable-doc.patch b/package/freeipmi/0001-add-disable-doc.patch new file mode 100644 index 0000000000..e410d2b52f --- /dev/null +++ b/package/freeipmi/0001-add-disable-doc.patch @@ -0,0 +1,72 @@ +From 5324c88632c021a87251370b03067d857e9a9892 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 2 Nov 2022 19:02:42 +0100 +Subject: [PATCH] add --disable-doc + +Allow the user to disable documentation through --disable-doc to avoid +the following build failure without makeinfo: + +/home/buildroot/autobuild/instance-0/output-1/build/freeipmi-1.6.10/config/missing: line 81: makeinfo: command not found +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +Makefile:442: recipe for target 'freeipmi-faq.info' failed + +Fixes: + - http://autobuild.buildroot.org/results/ac6ff1c746a354f885fc1674d10e7bff9e536134 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/61] +--- + Makefile.am | 6 +++++- + configure.ac | 4 ++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index cf757f634..d74952e30 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,6 @@ + ACLOCAL_AMFLAGS = -I config + + SUBDIRS = \ +- doc \ + etc \ + common \ + libfreeipmi \ +@@ -33,6 +32,11 @@ SUBDIRS = \ + rmcpping \ + contrib + ++if ENABLE_DOC ++SUBDIRS += \ ++ doc ++endif ++ + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ + +diff --git a/configure.ac b/configure.ac +index 54fdf6367..7a94b958b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -341,6 +341,10 @@ else + fi + AC_SUBST(WITH_DEBUG) + ++AC_ARG_ENABLE(doc, ++ AC_HELP_STRING([--disable-doc], [turn off documentation])) ++AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no") ++ + dnl Allow advanced developers to compile with raw dumping + AC_ARG_ENABLE(rawdumps, + AC_HELP_STRING([--enable-rawdumps], [output raw packet dumps when debugging])) +-- +2.35.1 + diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk index 916f2eb68a..3e0ac0ffa9 100644 --- a/package/freeipmi/freeipmi.mk +++ b/package/freeipmi/freeipmi.mk @@ -12,6 +12,8 @@ FREEIPMI_LICENSE_FILES = \ COPYING.ipmidetect COPYING.ipmi-fru COPYING.ipmimonitoring \ COPYING.ipmiping COPYING.ipmipower COPYING.ipmiseld COPYING.pstdout \ COPYING.sunbmc COPYING.ZRESEARCH +# We're patching configure.ac +FREEIPMI_AUTORECONF = YES FREEIPMI_DEPENDENCIES = host-pkgconf FREEIPMI_INSTALL_STAGING = YES # Disable checking for /dev/urandom and /dev/random through AC_CHECK_FILE From yann.morin.1998 at free.fr Mon Feb 20 20:51:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:56 -0000 Subject: [Buildroot] [git commit branch/next] package/sudo: fix CVE-2022-43995 Message-ID: <20230220205146.5A1558648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26634490364decc24fa32f175c12c8a2d984f1d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Sudo 1.8.0 through 1.9.12, with the crypt() password backend, contains a plugins/sudoers/auth/passwd.c array-out-of-bounds error that can result in a heap-based buffer over-read. This can be triggered by arbitrary local users with access to Sudo by entering a password of seven characters or fewer. The impact could vary depending on the compiler and processor architecture. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/sudo/0001-Fix-CVE-2022-43995.patch | 53 ++++++++++++++++++++++++++++++ package/sudo/sudo.mk | 3 ++ 2 files changed, 56 insertions(+) diff --git a/package/sudo/0001-Fix-CVE-2022-43995.patch b/package/sudo/0001-Fix-CVE-2022-43995.patch new file mode 100644 index 0000000000..3f544dcf81 --- /dev/null +++ b/package/sudo/0001-Fix-CVE-2022-43995.patch @@ -0,0 +1,53 @@ +From bd209b9f16fcd1270c13db27ae3329c677d48050 Mon Sep 17 00:00:00 2001 +From: "Todd C. Miller" +Date: Fri, 28 Oct 2022 07:29:55 -0600 +Subject: [PATCH] Fix CVE-2022-43995, potential heap overflow for passwords < 8 + characters. Starting with sudo 1.8.0 the plaintext password buffer is + dynamically sized so it is not safe to assume that it is at least 9 bytes in + size. Found by Hugo Lefeuvre (University of Manchester) with ConfFuzz. + +[Retrieved from: +https://github.com/sudo-project/sudo/commit/bd209b9f16fcd1270c13db27ae3329c677d48050] +Signed-off-by: Fabrice Fontaine +--- + plugins/sudoers/auth/passwd.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c +index b2046eca2..0416861e9 100644 +--- a/plugins/sudoers/auth/passwd.c ++++ b/plugins/sudoers/auth/passwd.c +@@ -63,7 +63,7 @@ sudo_passwd_init(struct passwd *pw, sudo_auth *auth) + int + sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_conv_callback *callback) + { +- char sav, *epass; ++ char des_pass[9], *epass; + char *pw_epasswd = auth->data; + size_t pw_len; + int matched = 0; +@@ -75,12 +75,12 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c + + /* + * Truncate to 8 chars if standard DES since not all crypt()'s do this. +- * If this turns out not to be safe we will have to use OS #ifdef's (sigh). + */ +- sav = pass[8]; + pw_len = strlen(pw_epasswd); +- if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) +- pass[8] = '\0'; ++ if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) { ++ strlcpy(des_pass, pass, sizeof(des_pass)); ++ pass = des_pass; ++ } + + /* + * Normal UN*X password check. +@@ -88,7 +88,6 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c + * only compare the first DESLEN characters in that case. + */ + epass = (char *) crypt(pass, pw_epasswd); +- pass[8] = sav; + if (epass != NULL) { + if (HAS_AGEINFO(pw_epasswd, pw_len) && strlen(epass) == DESLEN) + matched = !strncmp(pw_epasswd, epass, DESLEN); diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 4f9fdb4b2c..1826f72017 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -23,6 +23,9 @@ SUDO_CONF_OPTS = \ --without-interfaces \ --with-env-editor +# 0001-Fix-CVE-2022-43995.patch +SUDO_IGNORE_CVES += CVE-2022-43995 + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) define SUDO_INSTALL_PAM_CONF $(INSTALL) -D -m 0644 package/sudo/sudo.pam $(TARGET_DIR)/etc/pam.d/sudo From yann.morin.1998 at free.fr Mon Feb 20 20:51:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:57 -0000 Subject: [Buildroot] [git commit branch/next] package/libopenssl: don't build the afalg engine Message-ID: <20230220205146.72F3F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=adc1c5d8f14f69a62a2a4260465363ab120816ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The openssl configure script disables the afalg engine when it detects cross-compilation, but the detection missfires because it is based on the CROSS_COMPILE environment variable, which we do not set (as we pass fully qualified CC et al.). So, the afalg engine is built, but it is built for the host, not the target, so it does not make sense to build and install it. Besides, it leaks build host info. Signed-off-by: Nuno Gon??alves [yann.morin.1998 at free.fr: extend commit log] Signed-off-by: Yann E. MORIN --- package/libopenssl/libopenssl.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index c7a2d65cc4..50d41a6533 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -83,6 +83,7 @@ define LIBOPENSSL_CONFIGURE_CMDS no-tests \ no-fuzz-libfuzzer \ no-fuzz-afl \ + no-afalgeng \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA),,no-chacha) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5),,no-rc5) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2),,no-rc2) \ From peter at korsgaard.com Mon Feb 20 20:51:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:51:57 -0000 Subject: [Buildroot] [git commit branch/next] Merge branch 'next' Message-ID: <20230220205156.1E345828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ca0edcb5f20c00336e7fb52ffa74cca2c2d5ef6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Patch is too large, so refusing to show it Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:57 -0000 Subject: [Buildroot] [git commit branch/next] package/lxc: bump to version 5.0.1 Message-ID: <20230220205147.39F9886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db19998035701d08bf1b5fd366e0b5aa9adb8e57 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next LXC 5.0 will be supported until June 2027 and our current LTS release, LXC 4.0 will now switch to a slower maintenance pace, only getting critical bugfixes and security updates. We strongly recommend all LXC users to plan an upgrade to the 5.0 branch. - Switch to meson-package - Add an upstream patch to fix the following build failure with glibc 2.36 (unfortunately upstream doesn't plan to fix this for 4.x: https://github.com/lxc/lxc/issues/4183 and patch is only working with meson, not autotools) https://discuss.linuxcontainers.org/t/lxc-5-0-lts-has-been-released https://discuss.linuxcontainers.org/t/lxc-5-0-1-has-been-released Fixes: - http://autobuild.buildroot.org/results/f77e2dc44c9a224f280e08089a890e85c302274f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...etect-where-struct-mount_attr-is-declared.patch | 186 +++++++++++++++++++++ package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 36 ++-- 3 files changed, 204 insertions(+), 20 deletions(-) diff --git a/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch b/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch new file mode 100644 index 0000000000..8de7adcc56 --- /dev/null +++ b/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch @@ -0,0 +1,186 @@ +From c1115e1503bf955c97f4cf3b925a6a9f619764c3 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Tue, 9 Aug 2022 16:14:25 +0200 +Subject: [PATCH] build: detect where struct mount_attr is declared + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) +[Retrieved from: +https://github.com/lxc/lxc/commit/c1115e1503bf955c97f4cf3b925a6a9f619764c3] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 30 ++++++++++++++++++++++++++++-- + src/lxc/conf.c | 6 +++--- + src/lxc/conf.h | 2 +- + src/lxc/mount_utils.c | 6 +++--- + src/lxc/syscall_wrappers.h | 12 ++++++++++-- + 5 files changed, 45 insertions(+), 11 deletions(-) + +diff --git a/meson.build b/meson.build +index a145faf069..f679aabbc8 100644 +--- a/meson.build ++++ b/meson.build +@@ -590,7 +590,6 @@ decl_headers = ''' + foreach decl: [ + '__aligned_u64', + 'struct clone_args', +- 'struct mount_attr', + 'struct open_how', + 'struct rtnl_link_stats64', + ] +@@ -610,7 +609,6 @@ foreach tuple: [ + ['struct seccomp_notif_sizes'], + ['struct clone_args'], + ['__aligned_u64'], +- ['struct mount_attr'], + ['struct open_how'], + ['struct rtnl_link_stats64'], + ] +@@ -630,6 +628,34 @@ foreach tuple: [ + endif + endforeach + ++## Types. ++decl_headers = ''' ++#include ++''' ++ ++# We get -1 if the size cannot be determined ++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 ++ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), true) ++ found_types += 'struct mount_attr (sys/mount.h)' ++else ++ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) ++ missing_types += 'struct mount_attr (sys/mount.h)' ++endif ++ ++## Types. ++decl_headers = ''' ++#include ++''' ++ ++# We get -1 if the size cannot be determined ++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 ++ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), true) ++ found_types += 'struct mount_attr (linux/mount.h)' ++else ++ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), false) ++ missing_types += 'struct mount_attr (linux/mount.h)' ++endif ++ + ## Headers. + foreach ident: [ + ['bpf', '''#include +diff --git a/src/lxc/conf.c b/src/lxc/conf.c +index ffbe74c2f6..4193cd07f5 100644 +--- a/src/lxc/conf.c ++++ b/src/lxc/conf.c +@@ -2885,7 +2885,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) + struct lxc_mount_options opts = {}; + int dfd_from; + const char *source_relative, *target_relative; +- struct lxc_mount_attr attr = {}; ++ struct mount_attr attr = {}; + + ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts); + if (ret < 0) +@@ -3005,7 +3005,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) + + /* Set propagation mount options. */ + if (opts.attr.propagation) { +- attr = (struct lxc_mount_attr) { ++ attr = (struct mount_attr) { + .propagation = opts.attr.propagation, + }; + +@@ -4109,7 +4109,7 @@ int lxc_idmapped_mounts_parent(struct lxc_handler *handler) + + for (;;) { + __do_close int fd_from = -EBADF, fd_userns = -EBADF; +- struct lxc_mount_attr attr = {}; ++ struct mount_attr attr = {}; + struct lxc_mount_options opts = {}; + ssize_t ret; + +diff --git a/src/lxc/conf.h b/src/lxc/conf.h +index 7dc2f15b60..772479f9e1 100644 +--- a/src/lxc/conf.h ++++ b/src/lxc/conf.h +@@ -223,7 +223,7 @@ struct lxc_mount_options { + unsigned long mnt_flags; + unsigned long prop_flags; + char *data; +- struct lxc_mount_attr attr; ++ struct mount_attr attr; + char *raw_options; + }; + +diff --git a/src/lxc/mount_utils.c b/src/lxc/mount_utils.c +index bba75f933c..88dd73ee36 100644 +--- a/src/lxc/mount_utils.c ++++ b/src/lxc/mount_utils.c +@@ -31,7 +31,7 @@ lxc_log_define(mount_utils, lxc); + * setting in @attr_set, but must also specify MOUNT_ATTR__ATIME in the + * @attr_clr field. + */ +-static inline void set_atime(struct lxc_mount_attr *attr) ++static inline void set_atime(struct mount_attr *attr) + { + switch (attr->attr_set & MOUNT_ATTR__ATIME) { + case MOUNT_ATTR_RELATIME: +@@ -272,7 +272,7 @@ int create_detached_idmapped_mount(const char *path, int userns_fd, + { + __do_close int fd_tree_from = -EBADF; + unsigned int open_tree_flags = OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC; +- struct lxc_mount_attr attr = { ++ struct mount_attr attr = { + .attr_set = MOUNT_ATTR_IDMAP | attr_set, + .attr_clr = attr_clr, + .userns_fd = userns_fd, +@@ -335,7 +335,7 @@ int __fd_bind_mount(int dfd_from, const char *path_from, __u64 o_flags_from, + __u64 attr_clr, __u64 propagation, int userns_fd, + bool recursive) + { +- struct lxc_mount_attr attr = { ++ struct mount_attr attr = { + .attr_set = attr_set, + .attr_clr = attr_clr, + .propagation = propagation, +diff --git a/src/lxc/syscall_wrappers.h b/src/lxc/syscall_wrappers.h +index a5e98b565c..c8a7d0c7b7 100644 +--- a/src/lxc/syscall_wrappers.h ++++ b/src/lxc/syscall_wrappers.h +@@ -18,6 +18,12 @@ + #include "macro.h" + #include "syscall_numbers.h" + ++#if HAVE_STRUCT_MOUNT_ATTR ++#include ++#elif HAVE_UAPI_STRUCT_MOUNT_ATTR ++#include ++#endif ++ + #ifdef HAVE_LINUX_MEMFD_H + #include + #endif +@@ -210,16 +216,18 @@ extern int fsmount(int fs_fd, unsigned int flags, unsigned int attr_flags); + /* + * mount_setattr() + */ +-struct lxc_mount_attr { ++#if !HAVE_STRUCT_MOUNT_ATTR && !HAVE_UAPI_STRUCT_MOUNT_ATTR ++struct mount_attr { + __u64 attr_set; + __u64 attr_clr; + __u64 propagation; + __u64 userns_fd; + }; ++#endif + + #if !HAVE_MOUNT_SETATTR + static inline int mount_setattr(int dfd, const char *path, unsigned int flags, +- struct lxc_mount_attr *attr, size_t size) ++ struct mount_attr *attr, size_t size) + { + return syscall(__NR_mount_setattr, dfd, path, flags, attr, size); + } diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index d460bc6a01..c18e062cc1 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz +sha256 d8195423bb1e206f8521d24b6cde4789f043960c7cf065990a9cf741dcfd4222 lxc-5.0.1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index cece27411e..f0a0e8041a 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.12 +LXC_VERSION = 5.0.1 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 @@ -13,56 +13,54 @@ LXC_DEPENDENCIES = host-pkgconf LXC_INSTALL_STAGING = YES LXC_CONF_OPTS = \ - --disable-apparmor \ - --disable-examples \ - --with-distro=buildroot \ - --disable-werror \ - $(if $(BR2_PACKAGE_BASH),,--disable-bash) + -Dapparmor=false \ + -Dexamples=false \ + -Dman=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) LXC_DEPENDENCIES += bash-completion endif ifeq ($(BR2_PACKAGE_LIBCAP),y) -LXC_CONF_OPTS += --enable-capabilities +LXC_CONF_OPTS += -Dcapabilities=true LXC_DEPENDENCIES += libcap else -LXC_CONF_OPTS += --disable-capabilities +LXC_CONF_OPTS += -Dcapabilities=false endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -LXC_CONF_OPTS += --enable-seccomp +LXC_CONF_OPTS += -Dseccomp=true LXC_DEPENDENCIES += libseccomp else -LXC_CONF_OPTS += --disable-seccomp +LXC_CONF_OPTS += -Dseccomp=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -LXC_CONF_OPTS += --enable-selinux +LXC_CONF_OPTS += -Dselinux=true LXC_DEPENDENCIES += libselinux else -LXC_CONF_OPTS += --disable-selinux +LXC_CONF_OPTS += -Dselinux=false endif ifeq ($(BR2_PACKAGE_LIBURING),y) -LXC_CONF_OPTS += --enable-liburing +LXC_CONF_OPTS += -Dio-uring-event-loop=true LXC_DEPENDENCIES += liburing else -LXC_CONF_OPTS += --disable-liburing +LXC_CONF_OPTS += -Dio-uring-event-loop=false endif ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -LXC_CONF_OPTS += --enable-pam +LXC_CONF_OPTS += -Dpam-cgroup=true LXC_DEPENDENCIES += linux-pam else -LXC_CONF_OPTS += --disable-pam +LXC_CONF_OPTS += -Dpam-cgroup=false endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -LXC_CONF_OPTS += --enable-openssl +LXC_CONF_OPTS += -Dopenssl=true LXC_DEPENDENCIES += openssl else -LXC_CONF_OPTS += --disable-openssl +LXC_CONF_OPTS += -Dopenssl=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From peter at korsgaard.com Mon Feb 20 20:51:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:51:58 -0000 Subject: [Buildroot] [git commit branch/next] Revert "package/mupdf: fix CVE-2021-4216" Message-ID: <20230220205156.41C2086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f298729fc3e3d71c01eab9e2939661fb50a7fe5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit 3ddca0ccb90967977c2db8c966c205568cf4cb93. With the merge of next, we are now using mupdf 1.20.3, so this fix is no longer needed. Signed-off-by: Peter Korsgaard --- ...-by-zero-for-zero-width-pages-in-muraster.patch | 29 ---------------------- package/mupdf/mupdf.mk | 3 --- 2 files changed, 32 deletions(-) diff --git a/package/mupdf/0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch b/package/mupdf/0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch deleted file mode 100644 index 099a3fdbab..0000000000 --- a/package/mupdf/0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 22c47acbd52949421f8c7cb46ea1556827d0fcbf Mon Sep 17 00:00:00 2001 -From: Sebastian Rasmussen -Date: Tue, 18 Jan 2022 20:33:10 +0100 -Subject: [PATCH] Bug 704834: Fix division by zero for zero width pages in - muraster. - -[Retrieved from: -https://github.com/ArtifexSoftware/mupdf/commit/22c47acbd52949421f8c7cb46ea1556827d0fcbf] -Signed-off-by: Fabrice Fontaine ---- - source/tools/muraster.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/source/tools/muraster.c b/source/tools/muraster.c -index c2ceb62f2e..97f4ae2633 100644 ---- a/source/tools/muraster.c -+++ b/source/tools/muraster.c -@@ -1003,8 +1003,9 @@ initialise_banding(fz_context *ctx, render_details *render, int color) - - w = render->ibounds.x1 - render->ibounds.x0; - min_band_mem = (size_t)bpp * w * min_band_height; -- reps = (int)(max_band_memory / min_band_mem); -- if (reps < 1) -+ if (min_band_mem > 0) -+ reps = (int)(max_band_memory / min_band_mem); -+ if (min_band_mem == 0 || reps < 1) - reps = 1; - - /* Adjust reps to even out the work between threads */ diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index c333f43957..1fc54b2d35 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -28,9 +28,6 @@ MUPDF_IGNORE_CVES += CVE-2021-3407 # 0003-Bug-703791-Stay-within-hash-table-max-key-size-in-cached-color-converter.patch MUPDF_IGNORE_CVES += CVE-2021-37220 -# 0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch -MUPDF_IGNORE_CVES += CVE-2021-4216 - # The pkg-config name for gumbo-parser is `gumbo`. MUPDF_PKG_CONFIG_PACKAGES = \ freetype2 \ From yann.morin.1998 at free.fr Mon Feb 20 20:51:58 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:58 -0000 Subject: [Buildroot] [git commit branch/next] package/linux: don't leak host timezone into linux version string Message-ID: <20230220205146.65DD486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a848418db4f956486a17dedc08f09803b26c84a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Nuno Gon??alves Signed-off-by: Yann E. MORIN --- linux/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index efdc21eff2..6b547a68ed 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -162,7 +162,7 @@ LINUX_MAKE_ENV += \ KBUILD_BUILD_VERSION=1 \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C TZ='UTC' date -d @$(SOURCE_DATE_EPOCH))" endif # gcc-8 started warning about function aliases that have a From yann.morin.1998 at free.fr Mon Feb 20 20:51:58 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:58 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: fix musl and uclibc-ng builds Message-ID: <20230220205147.B06FB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d9f268424558c37cd9538596358a537cd2f882d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following musl and uclibc-ng build failures raised since the addition of the package in commit 530d6f661e506a4774b7236cb93d65f669adbc92: configure: error: *** argp functions not found - install libargp or argp_standalone Fixes: - http://autobuild.buildroot.org/results/55b283fa46a797253193fb752638ba88597a416b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/crun/Config.in | 1 + package/crun/crun.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/crun/Config.in b/package/crun/Config.in index 5aca10dcdb..5def7001c1 100644 --- a/package/crun/Config.in +++ b/package/crun/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_CRUN bool "crun" + select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_YAJL # libocispec help crun is a fast and low-memory OCI Container Runtime in C. diff --git a/package/crun/crun.mk b/package/crun/crun.mk index 4a0c150594..65f166e657 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -15,6 +15,10 @@ CRUN_CPE_ID_VENDOR = crun_project CRUN_AUTORECONF = YES CRUN_CONF_OPTS = --disable-embedded-yajl +ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) +CRUN_DEPENDENCIES += argp-standalone +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) CRUN_DEPENDENCIES += libcap CRUN_CONF_OPTS += --enable-caps From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:59 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: add missing backslash Message-ID: <20230220205146.BC337828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b21e2f216b08135366c7d9ba1eb087f6bdaba482 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 0b4a9930124f7fb4c7bfae281db900905006a2da ("package/swupdate: specify SWU_VER during build") forgot a backslash. Fixes the following check-package warning: package/swupdate/swupdate.mk:213: unexpected indent with tabs and obviously makes the code correct. Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 2f618b2e79..bfc161d490 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -209,7 +209,7 @@ SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)) SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig SWUPDATE_MAKE_OPTS = \ - SWU_VER="$(SWUPDATE_VERSION) (Buildroot $(BR2_VERSION_FULL))" + SWU_VER="$(SWUPDATE_VERSION) (Buildroot $(BR2_VERSION_FULL))" \ CROSS_COMPILE="$(TARGET_CROSS)" \ CONFIG_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ CONFIG_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:59 -0000 Subject: [Buildroot] [git commit branch/next] package/socat: disable openssl for static build Message-ID: <20230220205147.92FB481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=934ec83e9d005fb21e5813f4480ebd624ee28c6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next socat's configure script does not take the zlib dependency into account when linking with libssl, and therefore fails at detecting libssl in BR2_STATIC_LIBS=y configurations. Since there is no easy way to add the zlib dependency, just disable openssl support for static builds. This is not fixing a build failure: libssl was not detected in BR2_STATIC_LIBS=y configurations, so what this commit does is make it explicit. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/socat/socat.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/socat/socat.mk b/package/socat/socat.mk index c1bf4d260f..bfccd02031 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -39,7 +39,7 @@ SOCAT_DEPENDENCIES = host-autoconf # incompatibile license (GPL-3.0+) SOCAT_CONF_OPTS = --disable-readline -ifeq ($(BR2_PACKAGE_OPENSSL),y) +ifeq ($(BR2_PACKAGE_OPENSSL):$(BR2_STATIC_LIBS),y:) SOCAT_DEPENDENCIES += openssl else SOCAT_CONF_OPTS += --disable-openssl From yann.morin.1998 at free.fr Mon Feb 20 20:52:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:00 -0000 Subject: [Buildroot] [git commit branch/next] configs/kontron_smarc_sal28: add BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20230220205147.E18FD86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6103c844a5a9ec711cb3cc81ae784ec593382e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Uboot host tools require openssl. So enable BR2_TARGET_UBOOT_NEEDS_OPENSSL. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3267233835 Signed-off-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- configs/kontron_smarc_sal28_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/kontron_smarc_sal28_defconfig b/configs/kontron_smarc_sal28_defconfig index 25846c8cbd..f8515f5b76 100644 --- a/configs/kontron_smarc_sal28_defconfig +++ b/configs/kontron_smarc_sal28_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron_sl28" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:00 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: specify SWU_VER during build Message-ID: <20230220205146.8FE3D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b4a9930124f7fb4c7bfae281db900905006a2da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The swupdate build process uses SWU_VER as part of the build commandline for compiling objects to define the value for use in globals.h (see also Makefile.flags). This value is also used to communicate capabilities to lua handlers (see upstream 0f38ff186e76c55c8d00ccb53739a29bcca91445). When swupdate gets built, SWU_VER defaults to using `git describe` to determine the version. This, unfortunately, picks up the version of the Buildroot checkout and not the actual version of swupdate. Now, specify SWU_VER as part of the make options to override the calculated value so the proper version is reported. Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index b2f50d2b71..2f618b2e79 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -209,6 +209,7 @@ SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)) SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig SWUPDATE_MAKE_OPTS = \ + SWU_VER="$(SWUPDATE_VERSION) (Buildroot $(BR2_VERSION_FULL))" CROSS_COMPILE="$(TARGET_CROSS)" \ CONFIG_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ CONFIG_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" From yann.morin.1998 at free.fr Mon Feb 20 20:52:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:01 -0000 Subject: [Buildroot] [git commit branch/next] package/gensio: fix libressl build Message-ID: <20230220205147.BE1718648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de6820ab1bd2a695772adc7df44036baba62913a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following libressl build failure raised since bump to version 2.5.5 in commit 8f67d23af11510b447d9d0e1a71249f97e655305 and https://github.com/cminyard/gensio/commit/12c94a29808e930a660142013c518468ca14ea62: gensio_filter_certauth.c: In function 'v3_certauth_add_challenge_rsp': gensio_filter_certauth.c:735:44: error: 'EVP_PKEY_ED25519' undeclared (first use in this function); did you mean 'EVP_PKEY_DSA1'? 735 | if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) { | ^~~~~~~~~~~~~~~~ | EVP_PKEY_DSA1 Fixes: - http://autobuild.buildroot.org/results/a0348df9bf9c7ccfd576f607abb6b186da384ad9 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-EVP_PKEY_ED25519-build-error-on-libressl.patch | 105 +++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch b/package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch new file mode 100644 index 0000000000..e9087aa3e5 --- /dev/null +++ b/package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch @@ -0,0 +1,105 @@ +From 1e7071684329f23ee3447310d203d193c283979e Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Wed, 5 Oct 2022 15:30:32 -0600 +Subject: [PATCH] Fix missing EVP_PKEY_ED25519 build error on libressl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: +gensio_filter_certauth.c: In function ???v3_certauth_add_challenge_rsp???: +gensio_filter_certauth.c:838:44: error: ???EVP_PKEY_ED25519??? undeclared (first use in this function); did you mean ???EVP_PKEY_DSA1???? + 838 | if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) { + | ^~~~~~~~~~~~~~~~ + | EVP_PKEY_DSA1 +gensio_filter_certauth.c:838:44: note: each undeclared identifier is reported only once for each function it appears in +gensio_filter_certauth.c: In function ???certauth_add_challenge_rsp???: +gensio_filter_certauth.c:901:44: error: ???EVP_PKEY_ED25519??? undeclared (first use in this function); did you mean ???EVP_PKEY_DSA1???? + 901 | if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) + | ^~~~~~~~~~~~~~~~ + | EVP_PKEY_DSA1 +gensio_filter_certauth.c: In function ???certauth_check_challenge???: +gensio_filter_certauth.c:1048:35: error: ???EVP_PKEY_ED25519??? undeclared (first use in this function); did you mean ???EVP_PKEY_DSA1???? + 1048 | if (EVP_PKEY_base_id(pkey) == EVP_PKEY_ED25519) + | ^~~~~~~~~~~~~~~~ + | EVP_PKEY_DSA1 + +Signed-off-by: Corey Minyard +[Retrieved from: +https://github.com/cminyard/gensio/commit/1e7071684329f23ee3447310d203d193c283979e] +Signed-off-by: Fabrice Fontaine +--- + lib/gensio_filter_certauth.c | 6 ++++++ + tools/gtlssh-keygen.c | 11 ++++++++++- + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/lib/gensio_filter_certauth.c b/lib/gensio_filter_certauth.c +index 642379b6..c4552e79 100644 +--- a/lib/gensio_filter_certauth.c ++++ b/lib/gensio_filter_certauth.c +@@ -835,11 +835,13 @@ v3_certauth_add_challenge_rsp(struct certauth_filter *sfilter) + unsigned int lenpos, len; + int rv = 0; + ++#ifdef EVP_PKEY_ED25519 + if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) { + gca_log_err(sfilter, + "Remote end or SSL too old to support ed25519 key"); + return GE_KEYINVALID; + } ++#endif + + certauth_write_byte(sfilter, CERTAUTH_CHALLENGE_RSP); + lenpos = sfilter->write_buf_len; +@@ -898,8 +900,10 @@ certauth_add_challenge_rsp(struct certauth_filter *sfilter) + if (sfilter->version < 4 || sfilter->my_version < 4) + return v3_certauth_add_challenge_rsp(sfilter); + ++#ifdef EVP_PKEY_ED25519 + if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) + digest = NULL; ++#endif + + certauth_write_byte(sfilter, CERTAUTH_CHALLENGE_RSP); + lenpos = sfilter->write_buf_len; +@@ -1045,8 +1049,10 @@ certauth_check_challenge(struct certauth_filter *sfilter) + goto out_nomem; + } + ++#ifdef EVP_PKEY_ED25519 + if (EVP_PKEY_base_id(pkey) == EVP_PKEY_ED25519) + digest = NULL; ++#endif + + if (!EVP_DigestVerifyInit(sign_ctx, NULL, digest, NULL, pkey)) { + gca_logs_err(sfilter, "Digest verify init failed"); +diff --git a/tools/gtlssh-keygen.c b/tools/gtlssh-keygen.c +index c8c28937..0779dd78 100644 +--- a/tools/gtlssh-keygen.c ++++ b/tools/gtlssh-keygen.c +@@ -108,7 +108,12 @@ help(const char *progname) + P(" The default is your username for normal certificates and\n"); + P(" the fully qualified domain name for server certificates.\n"); + P(" --algorithm - Set the algorithm to use for the key,\n"); +- P(" either ed25519, rsa or ec. The default is ed25519.\n"); ++ P(" either ed25519, rsa or ec. "); ++#ifdef EVP_PKEY_ED25519 ++ P("The default is ed25519.\n"); ++#else ++ P("The default is ec.\n"); ++#endif + P(" --force, -f - Don't ask questions, just do the operation. This\n"); + P(" may overwrite data without asking.\n"); + P(" --version - Print the version number and exit.\n"); +@@ -831,7 +836,11 @@ genpkey_ed25519(const char *key) + return rc != 0; + } + ++#ifdef EVP_PKEY_ED25519 + static int (*genpkey)(const char *key) = genpkey_ed25519; ++#else ++static int (*genpkey)(const char *key) = genpkey_ec; ++#endif + + /* + * Create a single key. If name is NULL, it's a server key, otherwise From yann.morin.1998 at free.fr Mon Feb 20 20:52:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:01 -0000 Subject: [Buildroot] [git commit branch/next] package/libdcadec: remove package Message-ID: <20230220205146.833538648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6aed2126b9c4cbae2a3f770e6d9029b44daa957 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Quoting https://github.com/foo86/dcadec "This program is deprecated! This decoder has been fully integrated into FFmpeg master branch and further development will continue there. Using FFmpeg for DTS decoding is now recommended." lbdcadec has had no commit oin the past 7+ years now. Fixes: http://autobuild.buildroot.net/results/1e63586c91a2670ecac2940f6e9840e6801c32f3/ Signed-off-by: Bernd Kuhls [yann.morin.1998 at free.fr: amend commit log with age of last activity] Signed-off-by: Yann E. MORIN --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/libdcadec/Config.in | 7 ------- package/libdcadec/libdcadec.hash | 3 --- package/libdcadec/libdcadec.mk | 33 --------------------------------- 6 files changed, 8 insertions(+), 45 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 0e63d59a98..7458fa331e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.11" +config BR2_PACKAGE_LIBDCADEC + bool "package was deprecated upstream, use ffmpeg instead" + select BR2_LEGACY + help + This decoder has been fully integrated into FFmpeg master + branch and further development will continue there. Using + FFmpeg for DTS decoding is now recommended. + config BR2_KERNEL_HEADERS_5_17 bool "kernel headers version 5.17.x are no longer supported" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7d27936992..2613624f4b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -363,7 +363,6 @@ F: package/libcdio/ F: package/libcec/ F: package/libcodec2/ F: package/libcrossguid/ -F: package/libdcadec/ F: package/libdeflate/ F: package/libdrm/ F: package/libdvbcsa/ diff --git a/package/Config.in b/package/Config.in index 238d7813f0..aef80f9ab0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1785,7 +1785,6 @@ menu "Multimedia" source "package/libbluray/Config.in" source "package/libcamera/Config.in" source "package/libcamera-apps/Config.in" - source "package/libdcadec/Config.in" source "package/libdvbcsa/Config.in" source "package/libdvbpsi/Config.in" source "package/libdvbsi/Config.in" diff --git a/package/libdcadec/Config.in b/package/libdcadec/Config.in deleted file mode 100644 index 2687a18187..0000000000 --- a/package/libdcadec/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBDCADEC - bool "libdcadec" - help - dcadec is a free DTS Coherent Acoustics decoder with support - for HD extensions. - - https://github.com/foo86/dcadec diff --git a/package/libdcadec/libdcadec.hash b/package/libdcadec/libdcadec.hash deleted file mode 100644 index 3c3e80e8a3..0000000000 --- a/package/libdcadec/libdcadec.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44 libdcadec-0.2.0.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/package/libdcadec/libdcadec.mk b/package/libdcadec/libdcadec.mk deleted file mode 100644 index a3579ad632..0000000000 --- a/package/libdcadec/libdcadec.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# libdcadec -# -################################################################################ - -LIBDCADEC_VERSION = 0.2.0 -LIBDCADEC_SITE = $(call github,foo86,dcadec,v$(LIBDCADEC_VERSION)) -LIBDCADEC_LICENSE = LGPL-2.1+ -LIBDCADEC_LICENSE_FILES = COPYING.LGPLv2.1 -LIBDCADEC_INSTALL_STAGING = YES - -ifeq ($(BR2_STATIC_LIBS),) -LIBDCADEC_SHARED = CONFIG_SHARED=1 -endif - -define LIBDCADEC_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ - $(LIBDCADEC_SHARED) -C $(@D) -endef - -define LIBDCADEC_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(LIBDCADEC_SHARED) DESTDIR=$(STAGING_DIR) PREFIX=/usr install -endef - -define LIBDCADEC_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(LIBDCADEC_SHARED) DESTDIR=$(TARGET_DIR) PREFIX=/usr install -endef - -$(eval $(generic-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:52:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:02 -0000 Subject: [Buildroot] [git commit branch/next] configs/bananapi_m64: remove defconfig Message-ID: <20230220205148.4283486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=daf3c6661f823e566b6310042884c36c1d73f1de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499008 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 - board/bananapi/bananapi-m64/boot.cmd | 6 ---- board/bananapi/bananapi-m64/genimage.cfg | 40 ------------------------- board/bananapi/bananapi-m64/readme.txt | 37 ----------------------- configs/bananapi_m64_defconfig | 50 -------------------------------- 5 files changed, 134 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 9e3c919a14..37d2e3854f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1314,7 +1314,6 @@ F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig -F: configs/bananapi_m64_defconfig F: configs/engicam_imx6qdl_icore_defconfig F: configs/engicam_imx6qdl_icore_qt5_defconfig F: configs/engicam_imx6qdl_icore_rqs_defconfig diff --git a/board/bananapi/bananapi-m64/boot.cmd b/board/bananapi/bananapi-m64/boot.cmd deleted file mode 100644 index d35c9b0b2c..0000000000 --- a/board/bananapi/bananapi-m64/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-a64-bananapi-m64.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/bananapi/bananapi-m64/genimage.cfg b/board/bananapi/bananapi-m64/genimage.cfg deleted file mode 100644 index e922c0dba2..0000000000 --- a/board/bananapi/bananapi-m64/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-bananapi-m64.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/bananapi/bananapi-m64/readme.txt b/board/bananapi/bananapi-m64/readme.txt deleted file mode 100644 index 0dec3e52ee..0000000000 --- a/board/bananapi/bananapi-m64/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Bananapi M64. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Bananapi M64 link: -http://www.banana-pi.org/m64.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Bananapi+M64 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make bananapi_m64_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Bananapi M64 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/bananapi_m64_defconfig b/configs/bananapi_m64_defconfig deleted file mode 100644 index b93332ed21..0000000000 --- a/configs/bananapi_m64_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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/bananapi/bananapi-m64/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-bananapi-m64" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M64" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m64/genimage.cfg" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:02 -0000 Subject: [Buildroot] [git commit branch/next] package/docopt-cpp: fix static build Message-ID: <20230220205146.C9E408648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1ebbb919aebdfb1cc984803d2dee554edb4672e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static build failure raised since the addition of the package in commit 43f96ced67c9a1f84d3f0edf5cd632178eb176b8: [ 66%] Linking CXX shared library libdocopt.so ld (ld-elf2flt): -shared used without passing a shared library ID Fixes: - http://autobuild.buildroot.org/results/834a0209c8165b3208ebf8654cb6cf8e3568b671 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...t-use-BUILD_SHARED_LIBS-where-appropriate.patch | 87 ++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch b/package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch new file mode 100644 index 0000000000..77206d5208 --- /dev/null +++ b/package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch @@ -0,0 +1,87 @@ +From 6d3b803d2b0e4bf8703bbfa51a67f378d6bd59f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9o=20DELRIEU?= +Date: Tue, 19 Nov 2019 14:58:59 +0100 +Subject: [PATCH] only build one target, use BUILD_SHARED_LIBS where + appropriate + +[Retrieved from: +https://github.com/docopt/docopt.cpp/commit/6d3b803d2b0e4bf8703bbfa51a67f378d6bd59f6] +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 39 ++++++--------------------------------- + 1 file changed, 6 insertions(+), 33 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index feff32e..14c3420 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,33 +34,15 @@ set(docopt_HEADERS + #============================================================================ + # Compile targets + #============================================================================ +-if(MSVC OR XCODE) +- # MSVC requires __declspec() attributes, which are achieved via the +- # DOCOPT_DLL and DOCOPT_EXPORTS macros below. Since those macros are only +- # defined when building a shared library, we must build the shared and +- # static libraries completely separately. +- # Xcode does not support libraries with only object files as sources. +- # See https://cmake.org/cmake/help/v3.0/command/add_library.html?highlight=add_library +- add_library(docopt SHARED ${docopt_SOURCES} ${docopt_HEADERS}) +- add_library(docopt_s STATIC ${docopt_SOURCES} ${docopt_HEADERS}) +-else() +- # If not using MSVC or Xcode, we will create an intermediate object target +- # to avoid compiling the source code twice. +- add_library(docopt_o OBJECT ${docopt_SOURCES} ${docopt_HEADERS}) +- set_target_properties(docopt_o PROPERTIES POSITION_INDEPENDENT_CODE TRUE) +- +- add_library(docopt SHARED $) +- set_target_properties(docopt PROPERTIES +- VERSION ${PROJECT_VERSION} +- SOVERSION ${PROJECT_VERSION_MAJOR} +- ) +- add_library(docopt_s STATIC $) +-endif() ++add_library(docopt ${docopt_SOURCES} ${docopt_HEADERS}) ++set_target_properties(docopt PROPERTIES ++ VERSION ${PROJECT_VERSION} ++ SOVERSION ${PROJECT_VERSION_MAJOR} ++) + + target_include_directories(docopt PUBLIC $ $) +-target_include_directories(docopt_s PUBLIC $ $) + +-if(MSVC) ++if(MSVC AND BUILD_SHARED_LIBS) + # DOCOPT_DLL: Must be specified when building *and* when using the DLL. + # That's what the "PUBLIC" means. + # DOCOPT_EXPORTS: Must use __declspec(dllexport) when building the DLL. +@@ -69,11 +51,6 @@ if(MSVC) + PRIVATE DOCOPT_EXPORTS) + endif() + +-if(NOT MSVC) +- set_target_properties(docopt PROPERTIES OUTPUT_NAME docopt) +- set_target_properties(docopt_s PROPERTIES OUTPUT_NAME docopt) +-endif() +- + if(USE_BOOST_REGEX) + add_definitions("-DDOCTOPT_USE_BOOST_REGEX") + # This is needed on Linux, where linking a static library into docopt.so +@@ -82,9 +59,6 @@ if(USE_BOOST_REGEX) + find_package(Boost 1.53 REQUIRED COMPONENTS regex) + include_directories(${Boost_INCLUDE_DIRS}) + target_link_libraries(docopt ${Boost_LIBRARIES}) +- if(WITH_STATIC) +- target_link_libraries(docopt_s ${Boost_LIBRARIES}) +- endif() + endif() + + #============================================================================ +@@ -120,7 +94,6 @@ set(export_name "docopt-targets") + install(TARGETS docopt EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + # Development package +-install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES ${docopt_HEADERS} DESTINATION include/docopt) + + # CMake Package From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:03 -0000 Subject: [Buildroot] [git commit branch/next] package/multipath-tools: add MULTIPATH_TOOLS_CPE_ID_VENDOR Message-ID: <20230220205146.D7220828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=adf4d6f7295b08b177a01d177a3f0a54e1f20f4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next cpe:2.3:a:opensvc:multipath-tools is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopensvc%3Amultipath-tools Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/multipath-tools/multipath-tools.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index ec5d853644..df3d5138e8 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -18,6 +18,7 @@ MULTIPATH_TOOLS_LICENSE_FILES = \ LICENSES/LGPL-2.0 \ LICENSES/LGPL-2.1 \ README.md +MULTIPATH_TOOLS_CPE_ID_VENDOR = opensvc MULTIPATH_TOOLS_DEPENDENCIES = lvm2 json-c readline udev liburcu libaio host-pkgconf MULTIPATH_TOOLS_MAKE_OPTS = \ From yann.morin.1998 at free.fr Mon Feb 20 20:52:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:03 -0000 Subject: [Buildroot] [git commit branch/next] configs/bananapi_m1: remove defconfig Message-ID: <20230220205148.1FA7D86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef832cd8551c6bbebe2f56a21a5dd4f1f54aa495 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499003 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 - board/bananapi/bananapi-m1/boot.cmd | 7 ------- board/bananapi/bananapi-m1/genimage.cfg | 34 ------------------------------ board/bananapi/bananapi-m1/readme.txt | 37 --------------------------------- configs/bananapi_m1_defconfig | 29 -------------------------- 5 files changed, 108 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 94d1338880..90c2d2ba21 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1318,7 +1318,6 @@ F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig -F: configs/bananapi_m1_defconfig F: configs/bananapi_m64_defconfig F: configs/engicam_imx6qdl_icore_defconfig F: configs/engicam_imx6qdl_icore_qt5_defconfig diff --git a/board/bananapi/bananapi-m1/boot.cmd b/board/bananapi/bananapi-m1/boot.cmd deleted file mode 100644 index 0cf6f4d63e..0000000000 --- a/board/bananapi/bananapi-m1/boot.cmd +++ /dev/null @@ -1,7 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -mmc dev 0 -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun7i-a20-bananapi.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/bananapi/bananapi-m1/genimage.cfg b/board/bananapi/bananapi-m1/genimage.cfg deleted file mode 100644 index ce62fbf712..0000000000 --- a/board/bananapi/bananapi-m1/genimage.cfg +++ /dev/null @@ -1,34 +0,0 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "sun7i-a20-bananapi.dtb", - "boot.scr" - } - } - - size = 64M -} - -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" - } -} diff --git a/board/bananapi/bananapi-m1/readme.txt b/board/bananapi/bananapi-m1/readme.txt deleted file mode 100644 index 382ba63c49..0000000000 --- a/board/bananapi/bananapi-m1/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Bananapi M1. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Bananapi M1 link: -http://www.banana-pi.org/m1.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Bananapi+M1 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make bananapi_m1_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Bananapi M1 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/bananapi_m1_defconfig b/configs/bananapi_m1_defconfig deleted file mode 100644 index 23da363345..0000000000 --- a/configs/bananapi_m1_defconfig +++ /dev/null @@ -1,29 +0,0 @@ -BR2_arm=y -BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y -BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M1" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m1/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.12" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapi" -BR2_TARGET_ROOTFS_EXT2=y -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="2018.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapi" -BR2_TARGET_UBOOT_NEEDS_DTC=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/bananapi/bananapi-m1/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:04 -0000 Subject: [Buildroot] [git commit branch/next] package/wolfssl: bump to version 5.5.3 Message-ID: <20230220205147.01F0A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34b681cfefe2aee03df290715f3047f624595288 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix for possible buffer zeroization overrun introduced at the end of v5.5.2 release cycle in GitHub pull request 5743 (#5743) and fixed in pull request 5757 (#5757). In the case where a specific memory allocation failed or a hardware fault happened there was the potential for an overrun of 0???s when masking the buffer used for (D)TLS 1.2 and lower operations. (D)TLS 1.3 only and crypto only users are not affected by the issue. This is not related in any way to recent issues reported in OpenSSL. https://github.com/wolfSSL/wolfssl/releases/tag/v5.5.3-stable Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 65d77ca659..08262113a0 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 49c6195462cae034efe6c86268824ba515682508a5f5199358d56a4168a82cf0 wolfssl-5.5.2.tar.gz +sha256 fd3135b8657d09fb96a8aad16585da850b96ea420ae8ce5ac4d5fdfc614c2683 wolfssl-5.5.3.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index d9fa72ccf4..cd3acd9411 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -WOLFSSL_VERSION = 5.5.2 +WOLFSSL_VERSION = 5.5.3 WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:52:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:04 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add myself to configs/kontron_smarc_sal28_defconfig Message-ID: <20230220205147.EDBB68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce38e455bb61ad2f4219a2c7da8b68d07dd0b180 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2613624f4b..9bd98da5ef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1243,8 +1243,10 @@ F: package/volk/ N: Heiko Thiery F: board/kontron/bl-imx8mm/ +F: board/kontron/smarc-sal28/ F: board/kontron/pitx-imx8m/ F: configs/kontron_bl_imx8mm_defconfig +F: configs/kontron_smarc_sal28_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ F: package/ipmitool/ From yann.morin.1998 at free.fr Mon Feb 20 20:52:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:05 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_m1: remove defconfig Message-ID: <20230220205148.667A686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f7b44cfcb10cf2d1c71a35b89d61da04ae32e2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. This defconfig did not even have an entry in the DEVELOPERS file. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499050 Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- board/friendlyarm/nanopi-m1/boot.cmd | 8 ------ board/friendlyarm/nanopi-m1/genimage.cfg | 37 -------------------------- board/friendlyarm/nanopi-m1/readme.txt | 29 -------------------- configs/friendlyarm_nanopi_m1_defconfig | 45 -------------------------------- 4 files changed, 119 deletions(-) diff --git a/board/friendlyarm/nanopi-m1/boot.cmd b/board/friendlyarm/nanopi-m1/boot.cmd deleted file mode 100644 index b4d612ede7..0000000000 --- a/board/friendlyarm/nanopi-m1/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-nanopi-m1.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-m1/genimage.cfg b/board/friendlyarm/nanopi-m1/genimage.cfg deleted file mode 100644 index 3b2b82ce96..0000000000 --- a/board/friendlyarm/nanopi-m1/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the NanoPi M1 -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-m1.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/board/friendlyarm/nanopi-m1/readme.txt b/board/friendlyarm/nanopi-m1/readme.txt deleted file mode 100644 index 6a34c4239d..0000000000 --- a/board/friendlyarm/nanopi-m1/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -NanoPi M1 - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the NanoPi M1. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make friendlyarm_nanopi_m1_defconfig - -Compile everything and build the SD card image: - - $ make - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/friendlyarm_nanopi_m1_defconfig b/configs/friendlyarm_nanopi_m1_defconfig deleted file mode 100644 index 18cfcb261e..0000000000 --- a/configs/friendlyarm_nanopi_m1_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1" -BR2_TARGET_UBOOT_NEEDS_DTC=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=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:07 -0000 Subject: [Buildroot] [git commit branch/next] package/guile: fix Config.in comment dependency Message-ID: <20230220205147.2D469828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3441f3c5d66111af18f83ad585a2f0abb096ee7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The main guile option depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS, but this was not accounted for in the Config.in comment. Signed-off-by: Thomas Petazzoni --- package/guile/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/guile/Config.in b/package/guile/Config.in index 3cf0ec863b..eeeeaf4035 100644 --- a/package/guile/Config.in +++ b/package/guile/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_GUILE http://www.gnu.org/software/guile comment "guile needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library" + depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL From yann.morin.1998 at free.fr Mon Feb 20 20:52:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:07 -0000 Subject: [Buildroot] [git commit branch/next] configs/bananapi_m1_plus: remove defconfig Message-ID: <20230220205148.2B9208648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a086bd267f1b2e5c211e705b977b17df1c20867b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499004 Cc: Filip Skoneczny Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 -- board/sinovoip/m1-plus/boot.cmd | 5 -- board/sinovoip/m1-plus/genimage.cfg | 38 ------------- board/sinovoip/m1-plus/linux-wifi.fragment | 10 ---- ...7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch | 39 ------------- board/sinovoip/m1-plus/post-build.sh | 4 -- board/sinovoip/m1-plus/readme.txt | 64 ---------------------- .../brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt | 1 - .../lib/firmware/brcm/brcmfmac43362-sdio.txt | 56 ------------------- configs/bananapi_m1_plus_defconfig | 45 --------------- 10 files changed, 266 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 90c2d2ba21..b77f4ff68c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1004,10 +1004,6 @@ F: configs/freescale_imx6ullevk_defconfig N: Falco Hyfing F: package/python-pymodbus/ -N: Filip Skoneczny -F: board/sinovoip/m1-plus -F: configs/bananapi_m1_plus_defconfig - N: Florian Fainelli F: package/cpulimit/ diff --git a/board/sinovoip/m1-plus/boot.cmd b/board/sinovoip/m1-plus/boot.cmd deleted file mode 100644 index 4829996474..0000000000 --- a/board/sinovoip/m1-plus/boot.cmd +++ /dev/null @@ -1,5 +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 sun7i-a20-bananapi-m1-plus.dtb -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/sinovoip/m1-plus/genimage.cfg b/board/sinovoip/m1-plus/genimage.cfg deleted file mode 100644 index 18a549e631..0000000000 --- a/board/sinovoip/m1-plus/genimage.cfg +++ /dev/null @@ -1,38 +0,0 @@ -# Minimal SD card image for the Banana Pi M1+ -# Based on the Banana Pro genimage.cfg - -image boot.vfat { - vfat { - files = { - "zImage", - "sun7i-a20-bananapi-m1-plus.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/board/sinovoip/m1-plus/linux-wifi.fragment b/board/sinovoip/m1-plus/linux-wifi.fragment deleted file mode 100644 index 5576d738ad..0000000000 --- a/board/sinovoip/m1-plus/linux-wifi.fragment +++ /dev/null @@ -1,10 +0,0 @@ -# Networking support -CONFIG_WIRELESS=y -CONFIG_CFG80211=y -CONFIG_CFG80211_WEXT=y -CONFIG_RFKILL=y - -# Network device support -CONFIG_WLAN=y -CONFIG_WLAN_VENDOR_BROADCOM=y -CONFIG_BRCMFMAC=m diff --git a/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch b/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch deleted file mode 100644 index b01b6b2829..0000000000 --- a/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 58bae4096a7bf8d5d3bfbddb82cb37dd0561c938 Mon Sep 17 00:00:00 2001 -From: Filip Skoneczny -Date: Sun, 10 Jan 2021 19:07:14 +0100 -Subject: [PATCH] ARM: dts: sun7i: bananapi-m1-plus: Disable OOB IRQ for brcm - wifi module - - Based on 23bc805. - BugLink: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908438 - -Signed-off-by: Filip Skoneczny ---- - arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts -index 32d5d45a35c0..97f9987f51d7 100644 ---- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts -+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts -@@ -193,9 +193,14 @@ &mmc3 { - brcmf: wifi at 1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; -- interrupt-parent = <&pio>; -- interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; -- interrupt-names = "host-wake"; -+ /* -+ * OOB interrupt support is broken ATM, drv probe failing with: -+ * ieee80211 phy0: brcmf_attach: dongle is not responding: err=-110 -+ * -+ * interrupt-parent = <&pio>; -+ * interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; -+ * interrupt-names = "host-wake"; -+ */ - }; - }; - --- -2.25.1 - diff --git a/board/sinovoip/m1-plus/post-build.sh b/board/sinovoip/m1-plus/post-build.sh deleted file mode 100755 index 4ee6fa3bc4..0000000000 --- a/board/sinovoip/m1-plus/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# Remove all but the brcmfmac43362 firmware files -find $TARGET_DIR/lib/firmware/brcm -type f -not -name "brcmfmac43362*" -delete diff --git a/board/sinovoip/m1-plus/readme.txt b/board/sinovoip/m1-plus/readme.txt deleted file mode 100644 index ae647c21a9..0000000000 --- a/board/sinovoip/m1-plus/readme.txt +++ /dev/null @@ -1,64 +0,0 @@ -Banana Pi M1+ - -Intro -===== - -This default configuration will allow you to start experimenting with the -Buildroot environment for the Banana Pi M1+. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make bananapi_m1_plus_defconfig - -Compile everything and build the SD card image: - - $ make - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ dd if=output/images/sdcard.img of=/dev/sdX - -Notes: - - replace 'sdX' with the actual device with your micro SD card - - you may need to be root to do that (use 'sudo') - -Insert the micro SD card in your Banana Pi M1+ and power it up. The console -is on the debug TTL UART, 115200 8N1. - -Ethernet -========== - - # udhcpc -i eth0 - -Wifi -========== - - # wpa_passphrase YOUR_SSID >> /etc/wpa_supplicant.conf - (enter the wifi password and press enter) - # wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf -B - # udhcpc -i wlan0 - -Note: - - replace 'YOUR_SSID' with the actual SSID from your access point - -Audio -========== - -For this example you need package alsa-utils. - -Connect a headphone to the 3.5mm jack (TRRS). Note, that the Banana Pi M1+ -has an on-board microphone, too. - - # amixer cset name='Power Amplifier DAC Playback Switch' on - # amixer cset name='Power Amplifier Mute Switch' on - # amixer cset name='Power Amplifier Volume' 42 diff --git a/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt b/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt deleted file mode 120000 index 93947975ee..0000000000 --- a/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt +++ /dev/null @@ -1 +0,0 @@ -brcmfmac43362-sdio.txt \ No newline at end of file diff --git a/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt b/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt deleted file mode 100644 index 14a554fdd8..0000000000 --- a/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt +++ /dev/null @@ -1,56 +0,0 @@ -#AP6210_NVRAM_V1.2_03192013 -manfid=0x2d0 -prodid=0x492 -vendid=0x14e4 -devid=0x4343 -boardtype=0x0598 - -# Board Revision is P307, same nvram file can be used for P304, P305, P306 and P307 as the tssi pa params used are same -#Please force the automatic RX PER data to the respective board directory if not using P307 board, for e.g. for P305 boards force the data into the following directory /projects/BCM43362/a1_labdata/boardtests/results/sdg_rev0305 -boardrev=0x1307 -boardnum=777 -xtalfreq=26000 -boardflags=0x80201 -boardflags2=0x80 -sromrev=3 -wl0id=0x431b -macaddr=00:90:4c:07:71:12 -aa2g=1 -ag0=2 -maxp2ga0=74 -cck2gpo=0x2222 -ofdm2gpo=0x44444444 -mcs2gpo0=0x6666 -mcs2gpo1=0x6666 -pa0maxpwr=56 - -#P207 PA params -#pa0b0=5447 -#pa0b1=-658 -#pa0b2=-175 - -#Same PA params for P304,P305, P306, P307 - -pa0b0=5447 -pa0b1=-607 -pa0b2=-160 -pa0itssit=62 -pa1itssit=62 - - -cckPwrOffset=5 -ccode=0 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 -triso2g=0 -noise_cal_enable_2g=0 -noise_cal_po_2g=0 -swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x010101,0x1ff -temp_add=29767 -temp_mult=425 - -btc_flags=0x6 -btc_params0=5000 -btc_params1=1000 -btc_params6=63 diff --git a/configs/bananapi_m1_plus_defconfig b/configs/bananapi_m1_plus_defconfig deleted file mode 100644 index 271124f79a..0000000000 --- a/configs/bananapi_m1_plus_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_NEON_VFPV4=y -BR2_GLOBAL_PATCH_DIR="board/sinovoip/m1-plus/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TARGET_GENERIC_HOSTNAME="bananapi" -BR2_TARGET_GENERIC_ISSUE="Welcome to Banana Pi!" -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_OVERLAY="board/sinovoip/m1-plus/rootfs_overlay" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/sinovoip/m1-plus/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sinovoip/m1-plus/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.3" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sinovoip/m1-plus/linux-wifi.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapi-m1-plus" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y -BR2_PACKAGE_IW=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m1_plus" -BR2_TARGET_UBOOT_NEEDS_DTC=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_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sinovoip/m1-plus/boot.cmd" From yann.morin.1998 at free.fr Mon Feb 20 20:52:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:08 -0000 Subject: [Buildroot] [git commit branch/next] package/optee-client: fix util-linux dependency Message-ID: <20230220205206.E05A286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=28f31d4694ad212d9b511c53ba35c6443eeef972 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When applying 917a961d9c77 (package/optee-client: bump to version 3.19.0), a last-minute change was made in Config.in to change the dependency to util-linux instead of util-linux-libs, but the counterpart to that change in the .mk was omitted. Fix that now. Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/optee-client/optee-client.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 3e0c9269b8..311ca191b0 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -27,7 +27,7 @@ OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF endif ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y) -OPTEE_CLIENT_EXT_DEPENDENCIES += host-pkgconf util-linux-libs +OPTEE_CLIENT_EXT_DEPENDENCIES += host-pkgconf util-linux OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=ON else OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=OFF From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:08 -0000 Subject: [Buildroot] [git commit branch/next] package/libmbim: bump version to 1.28.2 Message-ID: <20230220205206.C5C1C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57bea338e95e49bf1f2405908462686306044825 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libmbim/libmbim.hash | 2 +- package/libmbim/libmbim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmbim/libmbim.hash b/package/libmbim/libmbim.hash index e98c53b1c9..2e2b46fcdb 100644 --- a/package/libmbim/libmbim.hash +++ b/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 58cd9ab1a2af9bbf40f9c02d3152a96baaa34a5f66a4289e928c7cf1c9584abb libmbim-1.26.4.tar.gz +sha256 cf74682c56f4c34ca4aee86de3b8c425a89fc2c0782052815295faf6a8e0a9fb libmbim-1.28.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index 1e2b1771eb..1c12b82298 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMBIM_VERSION = 1.26.4 +LIBMBIM_VERSION = 1.28.2 LIBMBIM_SITE = https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION) LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBMBIM_LICENSE_FILES = COPYING COPYING.LIB From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:08 -0000 Subject: [Buildroot] [git commit branch/next] package/ipmitool: fix per-package build Message-ID: <20230220205149.2DE6786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=68c143419336139fcf5dccd8289f410be4285550 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following per-package build failure raised since commit 82480ee22bdfae6f7d399975722b5c125749d8c7: configure.ac:44: error: possibly undefined macro: AC_SEARCH_LIBS If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. Fixes: - http://autobuild.buildroot.org/results/ecf72cd1ebd53f3b3b10f0a24082f9c0ab5d4d12 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipmitool/ipmitool.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index ebd8f9b337..b9f60d8151 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -12,6 +12,7 @@ IPMITOOL_LICENSE_FILES = COPYING IPMITOOL_CPE_ID_VENDOR = ipmitool_project # From git IPMITOOL_AUTORECONF = YES +IPMITOOL_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_FREEIPMI),y) IPMITOOL_DEPENDENCIES += freeipmi @@ -34,7 +35,7 @@ IPMITOOL_CONF_OPTS += --disable-intf-usb endif ifeq ($(BR2_PACKAGE_IPMITOOL_IPMISHELL),y) -IPMITOOL_DEPENDENCIES += host-pkgconf readline +IPMITOOL_DEPENDENCIES += readline IPMITOOL_CONF_OPTS += --enable-ipmishell else IPMITOOL_CONF_OPTS += --disable-ipmishell From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:08 -0000 Subject: [Buildroot] [git commit branch/next] package/ninja: bump to version 1.11.1.g95dee.kitware.jobserver-1 Message-ID: <20230220205147.6DCA886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e2d08c583228e48c622e0adc2ba577cded40ad2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/ninja/ninja.hash | 2 +- package/ninja/ninja.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ninja/ninja.hash b/package/ninja/ninja.hash index ecde199844..57c10bb287 100644 --- a/package/ninja/ninja.hash +++ b/package/ninja/ninja.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 549c31ee596566b952c600e23eb9b8d39a4112cd5fdeb2e5a83370669176da40 ninja-1.10.2.g51db2.kitware.jobserver-1.tar.gz +sha256 7ba84551f5b315b4270dc7c51adef5dff83a2154a3665a6c9744245c122dd0db ninja-1.11.1.g95dee.kitware.jobserver-1.tar.gz sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index bc84046414..b7bc1a4f1c 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -4,8 +4,8 @@ # ################################################################################ -NINJA_VERSION_MAJOR = 1.10.2 -NINJA_VERSION = $(NINJA_VERSION_MAJOR).g51db2.kitware.jobserver-1 +NINJA_VERSION_MAJOR = 1.11.1 +NINJA_VERSION = $(NINJA_VERSION_MAJOR).g95dee.kitware.jobserver-1 NINJA_SITE = $(call github,Kitware,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:09 -0000 Subject: [Buildroot] [git commit branch/next] package/libqmi: bump version to 1.32.2 Message-ID: <20230220205206.D291A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eea24067ad8c27918e30ec91d1d5d2cf0ab13946 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index dee2a94d93..5036c1d3c0 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 b2e0285690f94fe6d0cc3c422514117b187c8ddb90133c2900993e13343f5a5e libqmi-1.30.8.tar.gz +sha256 aec96bf2733a7b5ba27bb52346ce3a1ab54440800843f78001cc2a51213ce1b9 libqmi-1.32.2.tar.gz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index 6b7f45729e..c3db50a92c 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.30.8 +LIBQMI_VERSION = 1.32.2 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 yann.morin.1998 at free.fr Mon Feb 20 20:52:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:09 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_neo2: remove defconfig Message-ID: <20230220205148.893B88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24bb61071269f5446b6a1a5aaa89e5439e51940a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499053 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/friendlyarm/nanopi-neo2/boot.cmd | 6 ---- board/friendlyarm/nanopi-neo2/genimage.cfg | 40 ------------------------ board/friendlyarm/nanopi-neo2/readme.txt | 37 ---------------------- configs/friendlyarm_nanopi_neo2_defconfig | 50 ------------------------------ 5 files changed, 135 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index eca6cccfe8..7442d3a6ee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1301,7 +1301,6 @@ F: board/amarula/ F: board/asus/ F: board/bananapi/ F: board/engicam/ -F: board/friendlyarm/nanopi-neo2/ F: board/olimex/a33_olinuxino/ F: board/olimex/a64-olinuxino/ F: board/orangepi/orangepi-lite2/ @@ -1318,7 +1317,6 @@ F: configs/engicam_imx6qdl_icore_qt5_defconfig F: configs/engicam_imx6qdl_icore_rqs_defconfig F: configs/engicam_imx6ul_geam_defconfig F: configs/engicam_imx6ul_isiot_defconfig -F: configs/friendlyarm_nanopi_neo2_defconfig F: configs/olimex_a33_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig F: configs/orangepi_lite2_defconfig diff --git a/board/friendlyarm/nanopi-neo2/boot.cmd b/board/friendlyarm/nanopi-neo2/boot.cmd deleted file mode 100644 index 9a39f4afc9..0000000000 --- a/board/friendlyarm/nanopi-neo2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-nanopi-neo2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg deleted file mode 100644 index 3163a06592..0000000000 --- a/board/friendlyarm/nanopi-neo2/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-nanopi-neo2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt deleted file mode 100644 index 0f445e2bea..0000000000 --- a/board/friendlyarm/nanopi-neo2/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi NEO2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Nanopi NEO2 link: -http://nanopi.io/nanopi-neo2.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/FriendlyARM+NanoPi+NEO2 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make friendlyarm_nanopi_neo2_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Nanopi NEO2 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig deleted file mode 100644 index 9262737b88..0000000000 --- a/configs/friendlyarm_nanopi_neo2_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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/friendlyarm/nanopi-neo2/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:09 -0000 Subject: [Buildroot] [git commit branch/next] package/libqb: disable tests Message-ID: <20230220205146.E8E458648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c153a318ae203913cb2211964ca35c6880a68552 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable tests to avoid the following build failure when check is enabled: libstat_wrapper.c:11:10: fatal error: gnu/lib-names.h: No such file or directory 11 | #include | ^~~~~~~~~~~~~~~~~ This build failure is raised since bump to version 2.0.6 in commit 2ee1bd7bb2e8d01f4ddca3fb1127ec729be1c9bf and https://github.com/ClusterLabs/libqb/commit/78df90b180740712d0c90b6d982b78241cc99d72 Fixes: - http://autobuild.buildroot.org/results/450cfc36d4fd6dc71c138bec45f05b5a2d92a08d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libqb/0001-Add-disable-tests-option.patch | 62 +++++++++++++++++++++++ package/libqb/libqb.mk | 3 ++ 2 files changed, 65 insertions(+) diff --git a/package/libqb/0001-Add-disable-tests-option.patch b/package/libqb/0001-Add-disable-tests-option.patch new file mode 100644 index 0000000000..1afb05520d --- /dev/null +++ b/package/libqb/0001-Add-disable-tests-option.patch @@ -0,0 +1,62 @@ +From 051d9cfe8f365e30affc6476ed79b9e04a6b15ad Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 4 Nov 2022 00:27:50 +0100 +Subject: [PATCH] Add --disable-tests option + +Add --disable-tests to allow the user to disable tests. As a +side-effect, this will avoid the following build failure when check is +found: + +libstat_wrapper.c:11:10: fatal error: gnu/lib-names.h: No such file or directory + 11 | #include + | ^~~~~~~~~~~~~~~~~ + +This build failure is raised since version 2.0.5 and +https://github.com/ClusterLabs/libqb/commit/78df90b180740712d0c90b6d982b78241cc99d72 + +Fixes: + - http://autobuild.buildroot.org/results/450cfc36d4fd6dc71c138bec45f05b5a2d92a08d + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ClusterLabs/libqb/pull/475] +--- + Makefile.am | 6 +++++- + configure.ac | 5 +++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index a08b1d2..6a710a0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -39,7 +39,11 @@ ACLOCAL_AMFLAGS = -I m4 + + dist_doc_DATA = COPYING INSTALL README.markdown + +-SUBDIRS = include lib doxygen2man docs tools tests examples ++SUBDIRS = include lib doxygen2man docs tools examples ++ ++if ENABLE_TESTS ++SUBDIRS += tests ++endif + + dist-clean-local: + rm -f .snapshot-version autoconf automake autoheader +diff --git a/configure.ac b/configure.ac +index ac44b7e..4946008 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -562,6 +562,11 @@ AC_ARG_WITH([force-sockets-config-file], + [ FORCESOCKETSFILE="$withval" ], + [ FORCESOCKETSFILE="$sysconfdir/libqb/force-filesystem-sockets" ]) + ++AC_ARG_ENABLE([tests], ++ [AS_HELP_STRING([--disable-tests],[disable tests])],, ++ [ enable_tests="yes" ]) ++AM_CONDITIONAL([ENABLE_TESTS], [test x$enable_tests = xyes]) ++ + AC_ARG_ENABLE([install-tests], + [AS_HELP_STRING([--enable-install-tests],[install tests])],, + [ enable_install_tests="no" ]) +-- +2.35.1 + diff --git a/package/libqb/libqb.mk b/package/libqb/libqb.mk index 0f409fd646..65d68181ee 100644 --- a/package/libqb/libqb.mk +++ b/package/libqb/libqb.mk @@ -12,6 +12,9 @@ LIBQB_LICENSE = LGPL-2.1+ LIBQB_LICENSE_FILES = COPYING LIBQB_CPE_ID_VENDOR = clusterlabs LIBQB_INSTALL_STAGING = YES +# We're patching configure.ac +LIBQB_AUTORECONF = YES +LIBQB_CONF_OPTS = --disable-tests LIBQB_DEPENDENCIES = libxml2 # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:10 -0000 Subject: [Buildroot] [git commit branch/next] package/libuhttpd: fix build with wolfssl >= 5.0 Message-ID: <20230220205147.531E4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca6f38a340bf7eaac76aafcdf7dd78f5c61b0ba6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with wolfssl raised since bump to version 5.2.0 in commit 14e0c4de719a0d63192cc5de66a608f75297f37d and https://github.com/wolfSSL/wolfssl/commit/33cb8231481d5beb46b57511c2630aba36028256: /home/buildroot/autobuild/instance-0/output-1/build/libuhttpd-3.14.1/src/ssl/openssl.c: In function 'handle_wolfssl_asn_error': /home/buildroot/autobuild/instance-0/output-1/build/libuhttpd-3.14.1/src/ssl/openssl.c:339:10: error: 'ASN_NTRU_KEY_E' undeclared (first use in this function); did you mean 'ASN_ECC_KEY_E'? 339 | case ASN_NTRU_KEY_E: | ^~~~~~~~~~~~~~ | ASN_ECC_KEY_E Fixes: - http://autobuild.buildroot.org/results/3261b0035c8aadd1b62538b53e03af1cd8a7b312 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-add-compatibility-for-wolfssl-5-0.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch b/package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch new file mode 100644 index 0000000000..7da7199e7e --- /dev/null +++ b/package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch @@ -0,0 +1,30 @@ +From 73aa4ef762b2de67bc8c7c260bd36b34fdb91e63 Mon Sep 17 00:00:00 2001 +From: "Sergey V. Lobanov" +Date: Mon, 3 Jan 2022 19:36:52 +0300 +Subject: [PATCH] add compatibility for wolfssl >= 5.0 + +NTRU support has been removed in wolfssl 5.0 so it is required to +mask NTRU specific code if wolfssl >= 5.0 + +Signed-off-by: Sergey V. Lobanov +[Retrieved from: +https://github.com/zhaojh329/ssl/commit/73aa4ef762b2de67bc8c7c260bd36b34fdb91e63] +Signed-off-by: Fabrice Fontaine +--- + openssl.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/ssl/openssl.c b/src/ssl/openssl.c +index 5a49267..278bab5 100644 +--- a/src/ssl/openssl.c ++++ b/src/ssl/openssl.c +@@ -336,7 +336,9 @@ static bool handle_wolfssl_asn_error(void *ssl, int r, + case ASN_SIG_HASH_E: + case ASN_SIG_KEY_E: + case ASN_DH_KEY_E: ++#if LIBWOLFSSL_VERSION_HEX < 0x05000000 + case ASN_NTRU_KEY_E: ++#endif + case ASN_CRIT_EXT_E: + case ASN_ALT_NAME_E: + case ASN_NO_PEM_HEADER: From yann.morin.1998 at free.fr Mon Feb 20 20:52:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:10 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_neo_plus2: remove defconfig Message-ID: <20230220205148.A18FA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d968cab0bd673311a87a8fc5187b1701200719de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499055 Cc: Louis Aussedat Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 - board/friendlyarm/nanopi-neo-plus2/extlinux.conf | 4 -- board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 40 -------------- .../nanopi-neo-plus2/linux-extras.config | 10 ---- board/friendlyarm/nanopi-neo-plus2/post-build.sh | 4 -- board/friendlyarm/nanopi-neo-plus2/readme.txt | 37 ------------- ...fmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt | 53 ------------------ configs/friendlyarm_nanopi_neo_plus2_defconfig | 62 ---------------------- 8 files changed, 212 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 27482d095a..0c9f885808 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1780,8 +1780,6 @@ F: package/ti-sgx-km/ F: package/ti-sgx-um/ N: Louis Aussedat -F: board/friendlyarm/nanopi-neo-plus2/ -F: configs/friendlyarm_nanopi_neo_plus2_defconfig F: package/mfoc F: package/libpam-nfc F: package/python-dnspython/ diff --git a/board/friendlyarm/nanopi-neo-plus2/extlinux.conf b/board/friendlyarm/nanopi-neo-plus2/extlinux.conf deleted file mode 100644 index fcb6f632c1..0000000000 --- a/board/friendlyarm/nanopi-neo-plus2/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label linux - kernel /Image - devicetree /sun50i-h5-nanopi-neo-plus2.dtb - append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait diff --git a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg b/board/friendlyarm/nanopi-neo-plus2/genimage.cfg deleted file mode 100644 index 9000201399..0000000000 --- a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-nanopi-neo-plus2.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-neo-plus2/linux-extras.config b/board/friendlyarm/nanopi-neo-plus2/linux-extras.config deleted file mode 100644 index 52b4b4b29e..0000000000 --- a/board/friendlyarm/nanopi-neo-plus2/linux-extras.config +++ /dev/null @@ -1,10 +0,0 @@ -# wireless core -CONFIG_WIRELESS=y -CONFIG_CFG80211=y -CONFIG_MAC80211=y -CONFIG_CFG80211_WEXT=y - -# wireless drivers -CONFIG_WLAN=y -CONFIG_WLAN_VENDOR_BROADCOM=y -CONFIG_BRCMFMAC=m diff --git a/board/friendlyarm/nanopi-neo-plus2/post-build.sh b/board/friendlyarm/nanopi-neo-plus2/post-build.sh deleted file mode 100755 index ec20fca7d9..0000000000 --- a/board/friendlyarm/nanopi-neo-plus2/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-neo-plus2/readme.txt b/board/friendlyarm/nanopi-neo-plus2/readme.txt deleted file mode 100644 index ae59952029..0000000000 --- a/board/friendlyarm/nanopi-neo-plus2/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi NEO Plus2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Nanopi NEO2 link: -http://nanopi.io/nanopi-neo-plus2.html - -Wiki link: -http://wiki.friendlyarm.com/wiki/index.php/NanoPi_NEO_Plus2 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make friendlyarm_nanopi_neo_plus2_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Nanopi NEO Plus2 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt b/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt deleted file mode 100644 index 740d172eb5..0000000000 --- a/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt +++ /dev/null @@ -1,53 +0,0 @@ -#AP6212_NVRAM_V1.0.1_20160606 -# 2.4 GHz, 20 MHz BW mode -# The following parameter values are just placeholders, need to be updated. -manfid=0x2d0 -prodid=0x0726 -vendid=0x14e4 -devid=0x43e2 -boardtype=0x0726 -boardrev=0x1101 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -sromrev=11 -boardflags=0x00404201 -xtalfreq=26000 -nocrc=1 -ag0=255 -aa2g=1 -ccode=ALL - -pa0itssit=0x20 -extpagain2g=0 - -#PA parameters for 2.4GHz, measured at CHIP OUTPUT -pa2ga0=-168,7161,-820 -AvVmid_c0=0x0,0xc8 -cckpwroffset0=5 - -# PPR params -maxp2ga0=90 -txpwrbckof=6 -cckbw202gpo=0x5555 -legofdmbw202gpo=0x77777777 -mcsbw202gpo=0xaaaaaaaa - -# OFDM IIR : -ofdmdigfilttype=7 -# PAPD mode: -papdmode=2 - -il0macaddr=00:90:4c:c5:12:38 -wl0id=0x431b - -#OOB parameters -hostwake=0x40 -hostrdy=0x41 -usbrdy=0x03 -usbrdydelay=100 -deadman_to=0xffffffff -# muxenab: 0x1 for UART enable, 0x10 for Host awake -muxenab=0x10 -# CLDO PWM voltage settings - 0x4 - 1.1 volt -#cldo_pwm=0x4 -glitch_based_crsmin=1 diff --git a/configs/friendlyarm_nanopi_neo_plus2_defconfig b/configs/friendlyarm_nanopi_neo_plus2_defconfig deleted file mode 100644 index 461e468cb6..0000000000 --- a/configs/friendlyarm_nanopi_neo_plus2_defconfig +++ /dev/null @@ -1,62 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_ROOTFS_OVERLAY="board/friendlyarm/nanopi-neo-plus2/rootfs_overlay" - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo_plus2" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.4" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo-plus2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo-plus2/linux-extras.config" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO Plus2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo-plus2/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo-plus2/post-build.sh" - -# wireless firmware -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y - -# wireless tools -BR2_PACKAGE_IW=y -BR2_PACKAGE_WIRELESS_TOOLS=y -BR2_PACKAGE_WIRELESS_TOOLS_LIB=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:11 -0000 Subject: [Buildroot] [git commit branch/next] package/strongswan: security bump to version 5.9.8 Message-ID: <20230220205146.9FD678648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b79d735139282ecf052dc89d4c221bbd16447112 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixed a vulnerability related to online certificate revocation checking that was caused because the revocation plugin used potentially untrusted OCSP URIs and CRL distribution points in certificates. This allowed a remote attacker to initiate IKE_SAs and send crafted certificates that contain URIs pointing to servers under their control, which could have lead to a denial-of-service attack. This vulnerability has been registered as CVE-2022-40617. Drop patch (already in version) https://www.strongswan.org/blog/2022/10/03/strongswan-vulnerability-(cve-2022-40617).html https://github.com/strongswan/strongswan/releases/tag/5.9.6 https://github.com/strongswan/strongswan/releases/tag/5.9.7 https://github.com/strongswan/strongswan/releases/tag/5.9.8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...strongswan-plugins-wolfssl-rename-encrypt.patch | 150 --------------------- package/strongswan/strongswan.hash | 6 +- package/strongswan/strongswan.mk | 2 +- 3 files changed, 4 insertions(+), 154 deletions(-) diff --git a/package/strongswan/0001-src-libstrongswan-plugins-wolfssl-rename-encrypt.patch b/package/strongswan/0001-src-libstrongswan-plugins-wolfssl-rename-encrypt.patch deleted file mode 100644 index 7b47b3278b..0000000000 --- a/package/strongswan/0001-src-libstrongswan-plugins-wolfssl-rename-encrypt.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 5900426a710eaa65a27784687775e331bcb0489b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 8 Aug 2022 09:52:19 +0200 -Subject: [PATCH] wolfssl: Rename `encrypt` methods to avoid conflicts with - system headers - -Rename `encrypt` methods to avoid the following build failure when wolfSSL -is built with --enable-opensslextra: - -In file included from ../../../../src/libstrongswan/utils/utils.h:59, - from ../../../../src/libstrongswan/library.h:101, - from wolfssl_common.h:29, - from wolfssl_aead.c:23: -wolfssl_aead.c:90:16: error: conflicting types for 'encrypt'; have '_Bool(union , chunk_t, chunk_t, chunk_t, chunk_t *)' - 90 | METHOD(aead_t, encrypt, bool, - | ^~~~~~~ -../../../../src/libstrongswan/utils/utils/object.h:99:20: note: in definition of macro 'METHOD' - 99 | static ret name(union {iface *_public; this;} \ - | ^~~~ -In file included from /home/autobuild/autobuild/instance-5/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/include/wolfssl/wolfcrypt/wc_port.h:573, - from /home/autobuild/autobuild/instance-5/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/include/wolfssl/wolfcrypt/types.h:35, - from /home/autobuild/autobuild/instance-5/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/include/wolfssl/wolfcrypt/logging.h:33, - from /home/autobuild/autobuild/instance-5/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/include/wolfssl/ssl.h:35, - from wolfssl_common.h:64, - from wolfssl_aead.c:23: -/home/autobuild/autobuild/instance-5/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/include/unistd.h:149:6: note: previous declaration of 'encrypt' with type 'void(char *, int)' - 149 | void encrypt(char *, int); - | ^~~~~~~ - -Closes strongswan/strongswan#1201 -[Retrieved from: -https://github.com/strongswan/strongswan/commit/5900426a710eaa65a27784687775e331bcb0489b] ---- - src/libstrongswan/plugins/wolfssl/wolfssl_aead.c | 4 ++-- - src/libstrongswan/plugins/wolfssl/wolfssl_crypter.c | 4 ++-- - src/libstrongswan/plugins/wolfssl/wolfssl_ec_public_key.c | 4 ++-- - src/libstrongswan/plugins/wolfssl/wolfssl_ed_public_key.c | 4 ++-- - src/libstrongswan/plugins/wolfssl/wolfssl_rsa_public_key.c | 4 ++-- - 5 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_aead.c b/src/libstrongswan/plugins/wolfssl/wolfssl_aead.c -index 2ea7c94cd65..44f054916cf 100644 ---- a/src/libstrongswan/plugins/wolfssl/wolfssl_aead.c -+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_aead.c -@@ -87,7 +87,7 @@ struct private_aead_t { - encryption_algorithm_t alg; - }; - --METHOD(aead_t, encrypt, bool, -+METHOD(aead_t, encrypt_, bool, - private_aead_t *this, chunk_t plain, chunk_t assoc, chunk_t iv, - chunk_t *encrypted) - { -@@ -323,7 +323,7 @@ aead_t *wolfssl_aead_create(encryption_algorithm_t algo, - - INIT(this, - .public = { -- .encrypt = _encrypt, -+ .encrypt = _encrypt_, - .decrypt = _decrypt, - .get_block_size = _get_block_size, - .get_icv_size = _get_icv_size, -diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_crypter.c b/src/libstrongswan/plugins/wolfssl/wolfssl_crypter.c -index cffe7ba2375..085a912404c 100644 ---- a/src/libstrongswan/plugins/wolfssl/wolfssl_crypter.c -+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_crypter.c -@@ -230,7 +230,7 @@ METHOD(crypter_t, decrypt, bool, - return success; - } - --METHOD(crypter_t, encrypt, bool, -+METHOD(crypter_t, encrypt_, bool, - private_wolfssl_crypter_t *this, chunk_t data, chunk_t iv, chunk_t *dst) - { - u_char *out; -@@ -578,7 +578,7 @@ wolfssl_crypter_t *wolfssl_crypter_create(encryption_algorithm_t algo, - INIT(this, - .public = { - .crypter = { -- .encrypt = _encrypt, -+ .encrypt = _encrypt_, - .decrypt = _decrypt, - .get_block_size = _get_block_size, - .get_iv_size = _get_iv_size, -diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_ec_public_key.c b/src/libstrongswan/plugins/wolfssl/wolfssl_ec_public_key.c -index d8a1ededb06..110543762f2 100644 ---- a/src/libstrongswan/plugins/wolfssl/wolfssl_ec_public_key.c -+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_ec_public_key.c -@@ -193,7 +193,7 @@ METHOD(public_key_t, verify, bool, - } - } - --METHOD(public_key_t, encrypt, bool, -+METHOD(public_key_t, encrypt_, bool, - private_wolfssl_ec_public_key_t *this, encryption_scheme_t scheme, - void *params, chunk_t crypto, chunk_t *plain) - { -@@ -324,7 +324,7 @@ static private_wolfssl_ec_public_key_t *create_empty() - .key = { - .get_type = _get_type, - .verify = _verify, -- .encrypt = _encrypt, -+ .encrypt = _encrypt_, - .get_keysize = _get_keysize, - .equals = public_key_equals, - .get_fingerprint = _get_fingerprint, -diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_ed_public_key.c b/src/libstrongswan/plugins/wolfssl/wolfssl_ed_public_key.c -index f423d8d5691..ea0fb3dfc77 100644 ---- a/src/libstrongswan/plugins/wolfssl/wolfssl_ed_public_key.c -+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_ed_public_key.c -@@ -111,7 +111,7 @@ METHOD(public_key_t, verify, bool, - return ret == 0 && res == 1; - } - --METHOD(public_key_t, encrypt, bool, -+METHOD(public_key_t, encrypt_, bool, - private_public_key_t *this, encryption_scheme_t scheme, - void *params, chunk_t crypto, chunk_t *plain) - { -@@ -368,7 +368,7 @@ static private_public_key_t *create_empty(key_type_t type) - .public = { - .get_type = _get_type, - .verify = _verify, -- .encrypt = _encrypt, -+ .encrypt = _encrypt_, - .get_keysize = _get_keysize, - .equals = public_key_equals, - .get_fingerprint = _get_fingerprint, -diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_rsa_public_key.c b/src/libstrongswan/plugins/wolfssl/wolfssl_rsa_public_key.c -index 72df115fe90..da8899c2d8c 100644 ---- a/src/libstrongswan/plugins/wolfssl/wolfssl_rsa_public_key.c -+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_rsa_public_key.c -@@ -216,7 +216,7 @@ METHOD(public_key_t, verify, bool, - } - } - --METHOD(public_key_t, encrypt, bool, -+METHOD(public_key_t, encrypt_, bool, - private_wolfssl_rsa_public_key_t *this, encryption_scheme_t scheme, - void *params, chunk_t plain, chunk_t *crypto) - { -@@ -440,7 +440,7 @@ static private_wolfssl_rsa_public_key_t *create_empty() - .key = { - .get_type = _get_type, - .verify = _verify, -- .encrypt = _encrypt, -+ .encrypt = _encrypt_, - .equals = public_key_equals, - .get_keysize = _get_keysize, - .get_fingerprint = _get_fingerprint, diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index aca7ddf5cd..4822f9152f 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,7 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.9.5.tar.bz2.md5 -md5 53005324e3cba8592f1fb958b1c2d0e5 strongswan-5.9.5.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.8.tar.bz2.md5 +md5 f46b0d3e7aed88824650d0721c887443 strongswan-5.9.8.tar.bz2 # Calculated based on the hash above -sha256 983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd strongswan-5.9.5.tar.bz2 +sha256 d3303a43c0bd7b75a12b64855e8edcb53696f06190364f26d1533bde1f2e453c strongswan-5.9.8.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 44c20f8414..cae1433e39 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.9.5 +STRONGSWAN_VERSION = 5.9.8 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:51:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/modsecurity2: disable pcre In-Reply-To: <20230219165638.147772-1-fontaine.fabrice@gmail.com> References: <20230219165638.147772-1-fontaine.fabrice@gmail.com> Message-ID: <20230220215144.68fff5fe@windsurf> On Sun, 19 Feb 2023 17:56:38 +0100 Fabrice Fontaine wrote: > Disable pcre to avoid the following build failure if pcre-config is > found on host raised since bump to version 2.9.7 in commit > 42e34cf10f9eb037aa8c48a4fb9e8f521901b983: > > /home/thomas/autobuild/instance-0/output-1/per-package/modsecurity2/host/bin/../lib/gcc/mips64el-buildroot-linux-gnu/11.3.0/../../../../mips64el-buildroot-linux-gnu/bin/ld: cannot find -lpcre: No such file or directory > > Fixes: > - http://autobuild.buildroot.org/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af > > Signed-off-by: Fabrice Fontaine > --- > package/modsecurity2/modsecurity2.mk | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:12 -0000 Subject: [Buildroot] [git commit branch/next] package/socat: fix printf feature detection Message-ID: <20230220205147.86B16828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ca100c2d2478cb8ef615edd1ad3cc2e1d90047b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next socal configure uses AC_TRY_RUN to detect printf features. This does not work for cross compilation. All C libraries we use support C99 snprintf. Only glibc and uClibc support the deprecated Z modifier. These issues were noticed by an inspection of configure.ac. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/socat/socat.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/socat/socat.mk b/package/socat/socat.mk index e20577492d..c1bf4d260f 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -11,6 +11,14 @@ SOCAT_LICENSE = GPL-2.0 with OpenSSL exception SOCAT_LICENSE_FILES = README COPYING COPYING.OpenSSL SOCAT_CPE_ID_VENDOR = dest-unreach +SOCAT_CONF_ENV = ac_cv_have_c99_snprintf=yes + +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC)$(BR2_TOOLCHAIN_USES_UCLIBC),y) +SOCAT_CONF_ENV += ac_cv_have_z_modifier=yes +else +SOCAT_CONF_ENV += ac_cv_have_z_modifier=no +endif + ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) SOCAT_CONF_ENV += \ sc_cv_sys_crdly_shift=12 \ From yann.morin.1998 at free.fr Mon Feb 20 20:52:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:12 -0000 Subject: [Buildroot] [git commit branch/next] configs/orangepi_pc2: remove defconfig Message-ID: <20230220205148.BA9E88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eeede611f81d8f83b72e4a6671cd7d1e46b266b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499136 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/orangepi/orangepi-pc2/boot.cmd | 6 ---- board/orangepi/orangepi-pc2/genimage.cfg | 40 ------------------------- board/orangepi/orangepi-pc2/readme.txt | 37 ----------------------- configs/orangepi_pc2_defconfig | 50 -------------------------------- 5 files changed, 135 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 45cf302386..ec8df84fa8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1303,7 +1303,6 @@ F: board/olimex/a33_olinuxino/ F: board/olimex/a64-olinuxino/ F: board/orangepi/orangepi-lite2/ F: board/orangepi/orangepi-one-plus -F: board/orangepi/orangepi-pc2/ F: board/orangepi/orangepi-prime/ F: board/orangepi/orangepi-win/ F: board/orangepi/orangepi-zero-plus2/ @@ -1319,7 +1318,6 @@ F: configs/olimex_a33_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig F: configs/orangepi_lite2_defconfig F: configs/orangepi_one_plus_defconfig -F: configs/orangepi_pc2_defconfig F: configs/orangepi_prime_defconfig F: configs/orangepi_win_defconfig F: configs/orangepi_zero_plus2_defconfig diff --git a/board/orangepi/orangepi-pc2/boot.cmd b/board/orangepi/orangepi-pc2/boot.cmd deleted file mode 100644 index 4d4fc7bf67..0000000000 --- a/board/orangepi/orangepi-pc2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-pc2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc2/genimage.cfg b/board/orangepi/orangepi-pc2/genimage.cfg deleted file mode 100644 index cc8695c9f1..0000000000 --- a/board/orangepi/orangepi-pc2/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-pc2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-pc2/readme.txt b/board/orangepi/orangepi-pc2/readme.txt deleted file mode 100644 index 1200481952..0000000000 --- a/board/orangepi/orangepi-pc2/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Orangepi PC2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Orangepi PC2 link: -http://www.orangepi.org/orangepipc2/ - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+PC2 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make orangepi_pc2_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Orangepi PC2 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig deleted file mode 100644 index c7e17c8eb1..0000000000 --- a/configs/orangepi_pc2_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc2" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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-pc2/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-pc2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi PC2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc2/genimage.cfg" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:13 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-tools: fix static build Message-ID: <20230220205149.2163186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a29e7fb6765c0a08a3276a11a4da54dfdbdca703 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Pass TARGET_LDFLAGS (which contains -static) to fix the following static build failures with gpio, iio and pci: LINK lsgpio /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/arm-buildroot-linux-musleabi/10.4.0/../../../../arm-buildroot-linux-musleabi/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/arm-buildroot-linux-musleabi/10.4.0/libgcc.a(_dvmd_lnx.o): in function `__aeabi_ldiv0': /home/autobuild/autobuild/instance-8/output-1/build/host-gcc-final-10.4.0/build/arm-buildroot-linux-musleabi/libgcc/../../../libgcc/config/arm/lib1funcs.S:1499: undefined reference to `raise' [...] LINK iio_event_monitor /home/thomas/autobuild/instance-2/output-1/host/lib/gcc/microblazeel-buildroot-linux-musl/11.3.0/../../../../microblazeel-buildroot-linux-musl/bin/ld: /home/thomas/autobuild/instance-2/output-1/host/lib/gcc/microblazeel-buildroot-linux-musl/11.3.0/libgcc.a(unwind-dw2.o): in function `size_of_encoded_value': /home/thomas/autobuild/instance-2/output-1/build/host-gcc-final-11.3.0/build/microblazeel-buildroot-linux-musl/libgcc/../../../libgcc/unwind-pe.h:88: undefined reference to `abort' Fixes: - http://autobuild.buildroot.org/results/f202eb843ef331939f5f12325bdbf2d0d664a7ce - http://autobuild.buildroot.org/results/504ec8be1ebd15c5da09f8b90bb723a58d4c58c5 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/linux-tools/linux-tool-gpio.mk.in | 2 +- package/linux-tools/linux-tool-iio.mk.in | 2 +- package/linux-tools/linux-tool-pci.mk.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-tools/linux-tool-gpio.mk.in b/package/linux-tools/linux-tool-gpio.mk.in index d5a0dbda38..e825db1b11 100644 --- a/package/linux-tools/linux-tool-gpio.mk.in +++ b/package/linux-tools/linux-tool-gpio.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += gpio -GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) +GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" define GPIO_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/gpio/Makefile >/dev/null 2>&1 ; then \ diff --git a/package/linux-tools/linux-tool-iio.mk.in b/package/linux-tools/linux-tool-iio.mk.in index a8cc89e830..27ab0ed7ed 100644 --- a/package/linux-tools/linux-tool-iio.mk.in +++ b/package/linux-tools/linux-tool-iio.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += iio -IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) +IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" define IIO_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/iio/Makefile >/dev/null 2>&1 ; then \ diff --git a/package/linux-tools/linux-tool-pci.mk.in b/package/linux-tools/linux-tool-pci.mk.in index 4ef0368a32..17246f5d7e 100644 --- a/package/linux-tools/linux-tool-pci.mk.in +++ b/package/linux-tools/linux-tool-pci.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += pci -PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) +PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" define PCI_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/pci/Makefile >/dev/null 2>&1 ; then \ From yann.morin.1998 at free.fr Mon Feb 20 20:52:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:13 -0000 Subject: [Buildroot] [git commit branch/next] package/ca-certificates: add support for cryptography >= 3.0 Message-ID: <20230220205147.A042286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fc1bf137e44caf44a018cf948d5bd2a10566860 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Building ca-certificates with a newer cryptography is breaking because python-cryptography's x509 API changed to accept only bytes, not str. Carry a patch that has been submitted upstream [0] but has not yet been applied [1]. Minor changes to account for 0001-*.patch. [0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008244 [1] https://salsa.debian.org/debian/ca-certificates Signed-off-by: Justin Wood Signed-off-by: Yann E. MORIN --- ...tdata2pem.py-Fix-compat-with-cryptography.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch b/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch new file mode 100644 index 0000000000..0537da9224 --- /dev/null +++ b/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch @@ -0,0 +1,29 @@ +From 5e493ca307a031e81528ceddb96f3da40bc062cf Mon Sep 17 00:00:00 2001 +From: Wataru Ashihara +Date: Wed, 2 Nov 2022 12:40:05 -0400 +Subject: [PATCH] mozilla/certdata2pem.py: Fix compat with cryptography > 3.0 + +In newer cryptography packages, load_der_x509_certificate is enforced to be 'bytes' rather than currently used 'bytearray'. This fixes that. + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008244 +Signed-off-by: Justin Wood +--- + mozilla/certdata2pem.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py +index a6261f8..c0fa52c 100644 +--- a/mozilla/certdata2pem.py ++++ b/mozilla/certdata2pem.py +@@ -122,7 +122,7 @@ for obj in objects: + try: + from cryptography import x509 + +- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) ++ cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE'])) + if cert.not_valid_after < datetime.datetime.now(): + print('!'*74) + print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) +-- +2.38.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:14 -0000 Subject: [Buildroot] [git commit branch/next] package/boost: fix patch formatting issue Message-ID: <20230220205149.7550F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a0759dd02401e681b008c17b18a9669aba4b8f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit ea38acd17d88b9eaf853313398c772b94338ad47 ("package/boost: backport development branch changes to fix MIPS64 build failure") introduced a patch formatting issue detected by check-package. This commit fixes this issue. Fixes: package/boost/0001-Improve-modfunc-performance.patch:4: generate your patches with 'git format-patch -N' https://gitlab.com/buildroot.org/buildroot/-/jobs/3287511158 Signed-off-by: Thomas Petazzoni --- package/boost/0001-Improve-modfunc-performance.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boost/0001-Improve-modfunc-performance.patch b/package/boost/0001-Improve-modfunc-performance.patch index 9cf5d8387e..a34d6bb4d5 100644 --- a/package/boost/0001-Improve-modfunc-performance.patch +++ b/package/boost/0001-Improve-modfunc-performance.patch @@ -1,7 +1,7 @@ From 825aedad557b7e3bb27614335b6ced16887103de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Mon, 7 Nov 2022 00:16:44 +0100 -Subject: [PATCH 1/1] Improve "modfunc" performance Fixes #79 +Subject: [PATCH] Improve "modfunc" performance Fixes #79 ("boost/intrusive/hashtable.hpp: build failure (undeclared indentifier)") Backport from Boost development branch to fix issues with some architectures From yann.morin.1998 at free.fr Mon Feb 20 20:52:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:14 -0000 Subject: [Buildroot] [git commit branch/next] package/zlib-ng: fix build without neon Message-ID: <20230220205147.CAA7D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88d2135a7ad7ed899ef1f2fec070407810f8055d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure without NEON probably raised since bump to version 1.9.9-b1 in commit 1f7b12a0b4572d7e763c431a63c22cfb912b8b14 and https://github.com/zlib-ng/zlib-ng/commit/ec02ecf104e1d3f1836a908a359f20aa93494df5: In file included from /home/autobuild/autobuild/instance-4/output-1/build/zlib-ng-2.0.6/arch/arm/adler32_neon.c:11: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/include/arm_neon.h:31:2: error: #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" 31 | #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/8260762632cde9eb5bc2154084680b5bec034aa6 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zlib-ng/zlib-ng.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index 938acd4181..aa65d8437d 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -18,9 +18,15 @@ ZLIB_NG_CONF_OPTS += \ -DZLIB_COMPAT=1 \ -DZLIB_ENABLE_TESTS=OFF -# Enable NEON and ACLE on ARM +# Enable ACLE on ARM ifeq ($(BR2_arm),y) -ZLIB_NG_CONF_OPTS += -DWITH_ACLE=1 -DWITH_NEON=1 +ZLIB_NG_CONF_OPTS += -DWITH_ACLE=1 +endif + +ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) +ZLIB_NG_CONF_OPTS += -DWITH_NEON=ON +else +ZLIB_NG_CONF_OPTS += -DWITH_NEON=OFF endif ifeq ($(BR2_powerpc_power8),y) From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:15 -0000 Subject: [Buildroot] [git commit branch/next] package/udisks: fix the tool name in the config help Message-ID: <20230220205149.84E7886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=593c64eaf9d2f03d1a0164c114caffa2f4546f5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The name of the tool in udisks2 is udisksctl. Signed-off-by: Wolfgang Grandegger Signed-off-by: Thomas Petazzoni --- package/udisks/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/udisks/Config.in b/package/udisks/Config.in index a3a0f82144..5d0b96f3c0 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -31,8 +31,8 @@ config BR2_PACKAGE_UDISKS interfaces that can be used to query and manipulate storage devices. - o a command-line tool, udisks(1), that can be used to query - and use the daemon + o a command-line tool, udisksctl(1), that can be used to + query and use the daemon http://www.freedesktop.org/wiki/Software/udisks From yann.morin.1998 at free.fr Mon Feb 20 20:52:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:15 -0000 Subject: [Buildroot] [git commit branch/next] package/mupdf: fix CVE-2021-4216 Message-ID: <20230220205147.D76B2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ddca0ccb90967977c2db8c966c205568cf4cb93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A Floating point exception (division-by-zero) flaw was found in Mupdf for zero width pages in muraster.c. It is fixed in Mupdf-1.20.0-rc1 upstream. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-by-zero-for-zero-width-pages-in-muraster.patch | 29 ++++++++++++++++++++++ package/mupdf/mupdf.mk | 3 +++ 2 files changed, 32 insertions(+) diff --git a/package/mupdf/0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch b/package/mupdf/0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch new file mode 100644 index 0000000000..099a3fdbab --- /dev/null +++ b/package/mupdf/0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch @@ -0,0 +1,29 @@ +From 22c47acbd52949421f8c7cb46ea1556827d0fcbf Mon Sep 17 00:00:00 2001 +From: Sebastian Rasmussen +Date: Tue, 18 Jan 2022 20:33:10 +0100 +Subject: [PATCH] Bug 704834: Fix division by zero for zero width pages in + muraster. + +[Retrieved from: +https://github.com/ArtifexSoftware/mupdf/commit/22c47acbd52949421f8c7cb46ea1556827d0fcbf] +Signed-off-by: Fabrice Fontaine +--- + source/tools/muraster.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/source/tools/muraster.c b/source/tools/muraster.c +index c2ceb62f2e..97f4ae2633 100644 +--- a/source/tools/muraster.c ++++ b/source/tools/muraster.c +@@ -1003,8 +1003,9 @@ initialise_banding(fz_context *ctx, render_details *render, int color) + + w = render->ibounds.x1 - render->ibounds.x0; + min_band_mem = (size_t)bpp * w * min_band_height; +- reps = (int)(max_band_memory / min_band_mem); +- if (reps < 1) ++ if (min_band_mem > 0) ++ reps = (int)(max_band_memory / min_band_mem); ++ if (min_band_mem == 0 || reps < 1) + reps = 1; + + /* Adjust reps to even out the work between threads */ diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 56ea7cc507..e86ba1e73f 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -28,6 +28,9 @@ MUPDF_IGNORE_CVES += CVE-2021-3407 # 0003-Bug-703791-Stay-within-hash-table-max-key-size-in-cached-color-converter.patch MUPDF_IGNORE_CVES += CVE-2021-37220 +# 0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch +MUPDF_IGNORE_CVES += CVE-2021-4216 + # The pkg-config name for gumbo-parser is `gumbo`. MUPDF_PKG_CONFIG_PACKAGES = \ freetype2 \ From yann.morin.1998 at free.fr Mon Feb 20 20:52:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:16 -0000 Subject: [Buildroot] [git commit branch/next] configs/orangepi_rk3399: remove defconfig Message-ID: <20230220205148.E2EEA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08b6ce741a0d5309368e7bb7b41951a27ebe85f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499144 Cc: Suniel Mahesh Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 - board/orangepi/orangepi-rk3399/extlinux.conf | 4 -- board/orangepi/orangepi-rk3399/genimage.cfg | 38 ------------------- board/orangepi/orangepi-rk3399/post-build.sh | 5 --- board/orangepi/orangepi-rk3399/readme.txt | 56 ---------------------------- configs/orangepi_rk3399_defconfig | 53 -------------------------- 6 files changed, 158 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index f366426125..89a72bc923 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2732,12 +2732,10 @@ F: package/powertop/ N: Suniel Mahesh F: board/firefly/ F: board/friendlyarm/nanopi-m4 -F: board/orangepi/orangepi-rk3399 F: board/pine64/rockpro64 F: board/radxa/rockpi-4 F: board/radxa/rockpi-n8 F: board/radxa/rockpi-n10 -F: configs/orangepi_rk3399_defconfig F: configs/roc_pc_rk3399_defconfig F: configs/rock_pi_4_defconfig F: configs/rock_pi_n8_defconfig diff --git a/board/orangepi/orangepi-rk3399/extlinux.conf b/board/orangepi/orangepi-rk3399/extlinux.conf deleted file mode 100644 index 157c6a715e..0000000000 --- a/board/orangepi/orangepi-rk3399/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_ORANGEPI linux - kernel /Image - devicetree /rk3399-orangepi.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg deleted file mode 100644 index a02166172f..0000000000 --- a/board/orangepi/orangepi-rk3399/genimage.cfg +++ /dev/null @@ -1,38 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-orangepi.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = F - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-rk3399/post-build.sh b/board/orangepi/orangepi-rk3399/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/board/orangepi/orangepi-rk3399/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/orangepi/orangepi-rk3399/readme.txt b/board/orangepi/orangepi-rk3399/readme.txt deleted file mode 100644 index 197e1fb448..0000000000 --- a/board/orangepi/orangepi-rk3399/readme.txt +++ /dev/null @@ -1,56 +0,0 @@ -Orangepi Rk3399 -================ -http://www.orangepi.org/Orange%20Pi%20RK3399/ - -Build: -====== - $ make orangepi_rk3399_defconfig - $ make - -Files created in output directory -================================= - -output/images - -????????? bl31.elf -????????? boot.vfat -????????? extlinux -????????? idbloader.img -????????? Image -????????? rk3399-orangepi.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device. - -Booting: -======== -Orangepi-RK3399 by default boots from emmc. For SD card boot to -happen, emmc should be empty. If emmc happens to have any bootable -image then erase emmc so that bootrom will look for a proper image in SD. - -emmc can be erased once after booted into linux as shown in below link. - -https://wiki.amarulasolutions.com/bsp/setup/rockchip/rk3399_emmc.html - -Serial console: ---------------- - -Baudrate for this board is 1500000. - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/orangepi.html diff --git a/configs/orangepi_rk3399_defconfig b/configs/orangepi_rk3399_defconfig deleted file mode 100644 index bcce35febd..0000000000 --- a/configs/orangepi_rk3399_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-orangepi" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="orangepi-rk3399" -BR2_TARGET_GENERIC_ISSUE="Welcome to ORANGEPI-RK3399" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-rk3399/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-rk3399/post-build.sh" From yann.morin.1998 at free.fr Mon Feb 20 20:52:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:16 -0000 Subject: [Buildroot] [git commit branch/next] configs/bananapi_m2_plus: remove defconfig Message-ID: <20230220205148.36D2886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97ee98d157fb244966094f23e9e2b52a33748fb8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499005 Cc: Mike Harmony Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 ---- board/sinovoip/m2-plus/boot.cmd | 7 ------- board/sinovoip/m2-plus/genimage.cfg | 34 ---------------------------------- configs/bananapi_m2_plus_defconfig | 30 ------------------------------ 4 files changed, 75 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index b77f4ff68c..9e3c919a14 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2142,10 +2142,6 @@ F: configs/licheepi_zero_defconfig N: Mike Frampton F: package/qcom-db410c-firmware/ -N: Mike Harmony -F: board/sinovoip/m2-plus/ -F: configs/bananapi_m2_plus_defconfig - N: Mikhail Boiko F: package/libfribidi/ diff --git a/board/sinovoip/m2-plus/boot.cmd b/board/sinovoip/m2-plus/boot.cmd deleted file mode 100644 index d22464a1c1..0000000000 --- a/board/sinovoip/m2-plus/boot.cmd +++ /dev/null @@ -1,7 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -mmc dev 0 -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-bananapi-m2-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/sinovoip/m2-plus/genimage.cfg b/board/sinovoip/m2-plus/genimage.cfg deleted file mode 100644 index 9311e026dd..0000000000 --- a/board/sinovoip/m2-plus/genimage.cfg +++ /dev/null @@ -1,34 +0,0 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-bananapi-m2-plus.dtb", - "boot.scr" - } - } - - size = 64M -} - -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" - } -} diff --git a/configs/bananapi_m2_plus_defconfig b/configs/bananapi_m2_plus_defconfig deleted file mode 100644 index 77a403ce81..0000000000 --- a/configs/bananapi_m2_plus_defconfig +++ /dev/null @@ -1,30 +0,0 @@ -BR2_arm=y -BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y -BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Plus" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sinovoip/m2-plus/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-bananapi-m2-plus" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Sinovoip_BPI_M2_Plus" -BR2_TARGET_UBOOT_NEEDS_DTC=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=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sinovoip/m2-plus/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From yann.morin.1998 at free.fr Mon Feb 20 20:52:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:17 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_m1: remove defconfig Message-ID: <20230220205148.71CCF86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6f323b1ae74e91c6c66b562e99d2c27dcbb5988 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. This defconfig did not even have an entry in the DEVELOPERS file. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499051 Cc: Filip Skoneczny Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- board/friendlyarm/nanopi-m1-plus/boot.cmd | 8 ----- board/friendlyarm/nanopi-m1-plus/genimage.cfg | 36 --------------------- board/friendlyarm/nanopi-m1-plus/readme.txt | 29 ----------------- configs/friendlyarm_nanopi_m1_plus_defconfig | 45 --------------------------- 4 files changed, 118 deletions(-) diff --git a/board/friendlyarm/nanopi-m1-plus/boot.cmd b/board/friendlyarm/nanopi-m1-plus/boot.cmd deleted file mode 100644 index 35a1d65d3d..0000000000 --- a/board/friendlyarm/nanopi-m1-plus/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-nanopi-m1-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-m1-plus/genimage.cfg b/board/friendlyarm/nanopi-m1-plus/genimage.cfg deleted file mode 100644 index 5257cf89c7..0000000000 --- a/board/friendlyarm/nanopi-m1-plus/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the NanoPi M1 Plus -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-m1-plus.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" - } -} diff --git a/board/friendlyarm/nanopi-m1-plus/readme.txt b/board/friendlyarm/nanopi-m1-plus/readme.txt deleted file mode 100644 index 0327dec80e..0000000000 --- a/board/friendlyarm/nanopi-m1-plus/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -NanoPi M1 Plus - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the NanoPi M1 Plus. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make friendlyarm_nanopi_m1_plus_defconfig - -Compile everything and build the SD card image: - - $ make - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/friendlyarm_nanopi_m1_plus_defconfig b/configs/friendlyarm_nanopi_m1_plus_defconfig deleted file mode 100644 index 06adc54b15..0000000000 --- a/configs/friendlyarm_nanopi_m1_plus_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1-plus" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1 Plus" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1_plus" -BR2_TARGET_UBOOT_NEEDS_DTC=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=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1-plus/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1-plus" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1-plus/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:17 -0000 Subject: [Buildroot] [git commit branch/next] package/lxc: fix systemd build Message-ID: <20230220205149.CD37286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a378178cdd93a7b8d2c83d091b61478440f331a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following systemd build failure raised since bump to version 5.0.1 in commit db19998035701d08bf1b5fd366e0b5aa9adb8e57: ../src/lxc/cgroups/cgfsng.c: In function 'unpriv_systemd_create_scope': ../src/lxc/cgroups/cgfsng.c:1234:104: error: incompatible type for argument 10 of 'sd_bus_call_method_asyncv' r = sd_bus_call_method_asyncv(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL, NULL); ^~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261449 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ll_method_async-to-replace-the-asyncv-one.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch b/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch new file mode 100644 index 0000000000..22013cb363 --- /dev/null +++ b/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch @@ -0,0 +1,47 @@ +From b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Thu, 25 Aug 2022 05:45:53 -0700 +Subject: [PATCH] use sd_bus_call_method_async to replace the asyncv one + +The sd_bus_call_method_asyncv's 10th parameter is of type +va_list and supplying NULL when invoking it causes compilation +error. Just replace it with the async one. + +Signed-off-by: Chen Qi +[Retrieved from: +https://github.com/lxc/lxc/commit/b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 4 ++-- + src/lxc/cgroups/cgfsng.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 21955a0504..f8bdcf4e83 100644 +--- a/meson.build ++++ b/meson.build +@@ -295,9 +295,9 @@ if not want_sd_bus.disabled() + has_sd_bus = false + endif + +- if not cc.has_function('sd_bus_call_method_asyncv', prefix: '#include ', dependencies: libsystemd) ++ if not cc.has_function('sd_bus_call_method_async', prefix: '#include ', dependencies: libsystemd) + if not sd_bus_optional +- error('libsystemd misses required sd_bus_call_method_asyncv function') ++ error('libsystemd misses required sd_bus_call_method_async function') + endif + + has_sd_bus = false +diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c +index 8a3615893f..d90e5385e1 100644 +--- a/src/lxc/cgroups/cgfsng.c ++++ b/src/lxc/cgroups/cgfsng.c +@@ -1232,7 +1232,7 @@ static int unpriv_systemd_create_scope(struct cgroup_ops *ops, struct lxc_conf * + if (r < 0) + return log_error(SYSTEMD_SCOPE_FAILED, "Failed to connect to user bus: %s", strerror(-r)); + +- r = sd_bus_call_method_asyncv(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL, NULL); ++ r = sd_bus_call_method_async(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL); + if (r < 0) + return log_error(SYSTEMD_SCOPE_FAILED, "Failed to subscribe to signals: %s", strerror(-r)); + From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:18 -0000 Subject: [Buildroot] [git commit branch/next] package/wavemon: fix kernel header collision Message-ID: <20230220205149.E72EF86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57a1ce00a2c9f4b4b988f41b15ad01c6abc2a99c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since bump to version 0.9.4 in commit 5cae1a0d675eca41125b6430157d3d0d78d1220c: In file included from iw_if.h:26:0, from conf.c:19: /home/buildroot/autobuild/instance-1/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/linux/if.h:71:2: error: redeclaration of enumerator 'IFF_UP' IFF_UP = 1<<0, /* sysfs */ ^ /home/buildroot/autobuild/instance-1/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/net/if.h:44:5: note: previous definition of 'IFF_UP' was here IFF_UP = 0x1, /* Interface is up. */ ^ Fixes: - http://autobuild.buildroot.org/results/cbdf3e0cf0bee8f1b076581768c24155afc320d9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-iw_if.h-don-t-include-linux-if.h.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/package/wavemon/0001-iw_if.h-don-t-include-linux-if.h.patch b/package/wavemon/0001-iw_if.h-don-t-include-linux-if.h.patch new file mode 100644 index 0000000000..95f54e4b7f --- /dev/null +++ b/package/wavemon/0001-iw_if.h-don-t-include-linux-if.h.patch @@ -0,0 +1,41 @@ +From 4ac1482bb40376e47805c3737dfed60abb1dd3b4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 22 Dec 2021 00:39:35 +0100 +Subject: [PATCH] iw_if.h: don't include linux/if.h (#109) + +Don't include linux/if.h to avoid the following build failure: + +In file included from iw_if.h:31:0, + from conf.c:19: +/home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h: At top level: +/home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:143:8: error: redefinition of 'struct ifmap' + struct ifmap { + ^ +In file included from iw_if.h:26:0, + from conf.c:19: +/home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/net/if.h:111:8: note: originally defined here + struct ifmap + ^ + +Fixes: + - http://autobuild.buildroot.org/results/a6ee162cf04b70b144b54e1ca4b7b2421071c50c + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/uoaerg/wavemon/commit/4ac1482bb40376e47805c3737dfed60abb1dd3b4] +--- + iw_if.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/iw_if.h b/iw_if.h +index 9e7fa89..6607e0b 100644 +--- a/iw_if.h ++++ b/iw_if.h +@@ -28,7 +28,6 @@ + #include + #include + #include +-#include + + /* Definitions from linux/ieee80211.h (not necessarily part of distro headers) */ + #define WLAN_CAPABILITY_ESS (1<<0) From yann.morin.1998 at free.fr Mon Feb 20 20:52:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:18 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopc_t4: remove defconfig Message-ID: <20230220205148.4EF41828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa274e01e335c75684425a682b3dd8823d284da9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499048 Cc: Suniel Mahesh Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/friendlyarm/nanopc-t4/extlinux.conf | 4 --- board/friendlyarm/nanopc-t4/genimage.cfg | 39 ----------------------- board/friendlyarm/nanopc-t4/post-build.sh | 5 --- board/friendlyarm/nanopc-t4/readme.txt | 45 -------------------------- configs/friendlyarm_nanopc_t4_defconfig | 53 ------------------------------- 6 files changed, 148 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 37d2e3854f..427fce235d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2745,14 +2745,12 @@ F: package/powertop/ N: Suniel Mahesh F: board/firefly/ -F: board/friendlyarm/nanopc-t4 F: board/friendlyarm/nanopi-m4 F: board/orangepi/orangepi-rk3399 F: board/pine64/rockpro64 F: board/radxa/rockpi-4 F: board/radxa/rockpi-n8 F: board/radxa/rockpi-n10 -F: configs/friendlyarm_nanopc_t4_defconfig F: configs/friendlyarm_nanopi_m4_defconfig F: configs/orangepi_rk3399_defconfig F: configs/roc_pc_rk3399_defconfig diff --git a/board/friendlyarm/nanopc-t4/extlinux.conf b/board/friendlyarm/nanopc-t4/extlinux.conf deleted file mode 100644 index 31c6b30d32..0000000000 --- a/board/friendlyarm/nanopc-t4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_NanoPC_T4 linux - kernel /Image - devicetree /rk3399-nanopc-t4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rootwait diff --git a/board/friendlyarm/nanopc-t4/genimage.cfg b/board/friendlyarm/nanopc-t4/genimage.cfg deleted file mode 100644 index 1787322260..0000000000 --- a/board/friendlyarm/nanopc-t4/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-nanopc-t4.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = F - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopc-t4/post-build.sh b/board/friendlyarm/nanopc-t4/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/board/friendlyarm/nanopc-t4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopc-t4/readme.txt b/board/friendlyarm/nanopc-t4/readme.txt deleted file mode 100644 index 0989c6cc1e..0000000000 --- a/board/friendlyarm/nanopc-t4/readme.txt +++ /dev/null @@ -1,45 +0,0 @@ -FriendlyARM NANOPC-T4 -===================== - -Build: - - $ make friendlyarm_nanopc_t4_defconfig - $ make - -Files created in output directory -================================= - -output/images - -????????? bl31.elf -????????? boot.vfat -????????? extlinux -????????? idbloader.img -????????? Image -????????? rk3399-nanopc-t4.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device - -Serial console --------------- - -Baudrate for this board is 1500000 - -Login: ------- -Apply power and press the PWR button for 3 sec. Enter 'root' as login user, and the prompt is ready. - -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/npc_t4.html diff --git a/configs/friendlyarm_nanopc_t4_defconfig b/configs/friendlyarm_nanopc_t4_defconfig deleted file mode 100644 index 2f7c53904e..0000000000 --- a/configs/friendlyarm_nanopc_t4_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopc-t4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopc-t4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="nanopc-t4" -BR2_TARGET_GENERIC_ISSUE="Welcome to NanoPC-T4" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopc-t4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopc-t4/post-build.sh" From yann.morin.1998 at free.fr Mon Feb 20 20:52:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:19 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_m4: remove defconfig Message-ID: <20230220205148.7D853828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e7dfe20bb8cf0cccfbd177321eff73e82c8d940 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499052 Cc: Suniel Mahesh Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 - board/friendlyarm/nanopi-m4/extlinux.conf | 4 --- board/friendlyarm/nanopi-m4/genimage.cfg | 39 ----------------------- board/friendlyarm/nanopi-m4/post-build.sh | 5 --- board/friendlyarm/nanopi-m4/readme.txt | 45 -------------------------- configs/friendlyarm_nanopi_m4_defconfig | 53 ------------------------------- 6 files changed, 147 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 30582cb648..eca6cccfe8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2749,7 +2749,6 @@ F: board/pine64/rockpro64 F: board/radxa/rockpi-4 F: board/radxa/rockpi-n8 F: board/radxa/rockpi-n10 -F: configs/friendlyarm_nanopi_m4_defconfig F: configs/orangepi_rk3399_defconfig F: configs/roc_pc_rk3399_defconfig F: configs/rock_pi_4_defconfig diff --git a/board/friendlyarm/nanopi-m4/extlinux.conf b/board/friendlyarm/nanopi-m4/extlinux.conf deleted file mode 100644 index fb24f09eb1..0000000000 --- a/board/friendlyarm/nanopi-m4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_NANOPI_M4 linux - kernel /Image - devicetree /rk3399-nanopi-m4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/board/friendlyarm/nanopi-m4/genimage.cfg b/board/friendlyarm/nanopi-m4/genimage.cfg deleted file mode 100644 index 3e6818eab9..0000000000 --- a/board/friendlyarm/nanopi-m4/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-nanopi-m4.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = F - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-m4/post-build.sh b/board/friendlyarm/nanopi-m4/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/board/friendlyarm/nanopi-m4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-m4/readme.txt b/board/friendlyarm/nanopi-m4/readme.txt deleted file mode 100644 index 0553bf8377..0000000000 --- a/board/friendlyarm/nanopi-m4/readme.txt +++ /dev/null @@ -1,45 +0,0 @@ -FriendlyARM NANOPI-M4 -===================== - -Build: - - $ make friendlyarm_nanopi_m4_defconfig - $ make - -Files created in output directory -================================= - -output/images - -????????? bl31.elf -????????? boot.vfat -????????? extlinux -????????? idbloader.img -????????? Image -????????? rk3399-nanopi-m4.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device - -Serial console --------------- - -Baudrate for this board is 1500000 - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/nanopi_m4.html diff --git a/configs/friendlyarm_nanopi_m4_defconfig b/configs/friendlyarm_nanopi_m4_defconfig deleted file mode 100644 index 9c3f58f200..0000000000 --- a/configs/friendlyarm_nanopi_m4_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-m4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopi-m4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="nanopi-m4" -BR2_TARGET_GENERIC_ISSUE="Welcome to NANOPI-M4" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-m4/post-build.sh" From yann.morin.1998 at free.fr Mon Feb 20 20:52:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:19 -0000 Subject: [Buildroot] [git commit branch/next] package/efivar: fix build with musl libc Message-ID: <20230220205150.0506B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf14df13358ddd1b06709924a84f87dfa711cceb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Backport upstream patch to fix build with musl libc. This patch is only a requirement since efivar 38 and was applied upstream shortly after the 38 version tag. Fixes: http://autobuild.buildroot.net/results/c49d894b109d68e2624074eab8b939fefa3b42ef/ Signed-off-by: Erico Nunes Signed-off-by: Yann E. MORIN --- .../0004-efisecdb-fix-build-with-musl-libc.patch | 185 +++++++++++++++++++++ 1 file changed, 185 insertions(+) diff --git a/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch b/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..9815a9d0cf --- /dev/null +++ b/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch @@ -0,0 +1,185 @@ +From cece3ffd5be2f8641eb694513f2b73e5eb97ffd3 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Fri, 28 Jan 2022 12:13:30 +0100 +Subject: [PATCH] efisecdb: fix build with musl libc + +Refactor code to use POSIX atexit(3) instead of the GNU specific +on_exit(3). + +Resolves: #197 +Resolves: #202 +Signed-off-by: Natanael Copa +[Erico: backport from upstream commit +cece3ffd5be2f8641eb694513f2b73e5eb97ffd3] +Signed-off-by: Erico Nunes +--- + src/compiler.h | 2 -- + src/efisecdb.c | 68 +++++++++++++++++++------------------------------- + 2 files changed, 26 insertions(+), 44 deletions(-) + +diff --git a/src/compiler.h b/src/compiler.h +index e2f18f0..d95fb01 100644 +--- a/src/compiler.h ++++ b/src/compiler.h +@@ -7,8 +7,6 @@ + #ifndef COMPILER_H_ + #define COMPILER_H_ + +-#include +- + /* GCC version checking borrowed from glibc. */ + #if defined(__GNUC__) && defined(__GNUC_MINOR__) + # define GNUC_PREREQ(maj,min) \ +diff --git a/src/efisecdb.c b/src/efisecdb.c +index f882373..6bd5ad9 100644 +--- a/src/efisecdb.c ++++ b/src/efisecdb.c +@@ -25,6 +25,10 @@ + extern char *optarg; + extern int optind, opterr, optopt; + ++static efi_secdb_t *secdb = NULL; ++static list_t infiles; ++static list_t actions; ++ + struct hash_param { + char *name; + efi_secdb_type_t algorithm; +@@ -187,12 +191,11 @@ add_action(list_t *list, action_type_t action_type, const efi_guid_t *owner, + } + + static void +-free_actions(int status UNUSED, void *actionsp) ++free_actions(void) + { +- list_t *actions = (list_t *)actionsp; + list_t *pos, *tmp; + +- for_each_action_safe(pos, tmp, actions) { ++ for_each_action_safe(pos, tmp, &actions) { + action_t *action = list_entry(pos, action_t, list); + + list_del(&action->list); +@@ -202,12 +205,11 @@ free_actions(int status UNUSED, void *actionsp) + } + + static void +-free_infiles(int status UNUSED, void *infilesp) ++free_infiles(void) + { +- list_t *infiles = (list_t *)infilesp; + list_t *pos, *tmp; + +- for_each_ptr_safe(pos, tmp, infiles) { ++ for_each_ptr_safe(pos, tmp, &infiles) { + ptrlist_t *entry = list_entry(pos, ptrlist_t, list); + + list_del(&entry->list); +@@ -216,27 +218,12 @@ free_infiles(int status UNUSED, void *infilesp) + } + + static void +-maybe_free_secdb(int status UNUSED, void *voidp) ++maybe_free_secdb(void) + { +- efi_secdb_t **secdbp = (efi_secdb_t **)voidp; +- +- if (secdbp == NULL || *secdbp == NULL) ++ if (secdb == NULL) + return; + +- efi_secdb_free(*secdbp); +-} +- +-static void +-maybe_do_unlink(int status, void *filep) +-{ +- char **file = (char **)filep; +- +- if (status == 0) +- return; +- if (file == NULL || *file == NULL) +- return; +- +- unlink(*file); ++ efi_secdb_free(secdb); + } + + static void +@@ -323,15 +310,6 @@ parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb, + return status; + } + +-/* +- * These need to be static globals so that they're not on main's stack when +- * on_exit() fires. +- */ +-static efi_secdb_t *secdb = NULL; +-static list_t infiles; +-static list_t actions; +-static char *outfile = NULL; +- + int + main(int argc, char *argv[]) + { +@@ -351,6 +329,7 @@ main(int argc, char *argv[]) + bool do_sort_data = false; + bool sort_descending = false; + int status = 0; ++ char *outfile = NULL; + + const char sopts[] = ":aAc:dfg:h:i:Lo:rs:t:v?"; + const struct option lopts[] = { +@@ -376,10 +355,9 @@ main(int argc, char *argv[]) + INIT_LIST_HEAD(&infiles); + INIT_LIST_HEAD(&actions); + +- on_exit(free_actions, &actions); +- on_exit(free_infiles, &infiles); +- on_exit(maybe_free_secdb, &secdb); +- on_exit(maybe_do_unlink, &outfile); ++ atexit(free_actions); ++ atexit(free_infiles); ++ atexit(maybe_free_secdb); + + /* + * parse the command line. +@@ -587,24 +565,30 @@ sort_err: + outfd = open(outfile, flags, 0600); + if (outfd < 0) { + char *tmpoutfile = outfile; +- if (errno == EEXIST) +- outfile = NULL; ++ if (errno != EEXIST) ++ unlink(outfile); + err(1, "could not open \"%s\"", tmpoutfile); + } + + rc = ftruncate(outfd, 0); +- if (rc < 0) ++ if (rc < 0) { ++ unlink(outfile); + err(1, "could not truncate output file \"%s\"", outfile); ++ } + + void *output; + size_t size = 0; + rc = efi_secdb_realize(secdb, &output, &size); +- if (rc < 0) ++ if (rc < 0) { ++ unlink(outfile); + secdb_err(1, "could not realize signature list"); ++ } + + rc = write(outfd, output, size); +- if (rc < 0) ++ if (rc < 0) { ++ unlink(outfile); + err(1, "could not write signature list"); ++ } + + close(outfd); + xfree(output); +-- +2.37.3 + From yann.morin.1998 at free.fr Mon Feb 20 20:52:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:20 -0000 Subject: [Buildroot] [git commit branch/next] configs/arm_juno: remove defconfig Message-ID: <20230220205148.14781828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=347c1087388d7782e6865f112f195e6780d473a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234498972 Cc: Gustavo Pimentel Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 - board/arm/juno/linux-juno-defconfig | 169 ------------------------------------ board/arm/juno/readme.txt | 134 ---------------------------- configs/arm_juno_defconfig | 23 ----- 4 files changed, 330 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index b099ce2f62..94d1338880 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1221,10 +1221,6 @@ F: support/testing/tests/package/test_python_scipy.py N: Gustavo Heinz F: package/python-m2crypto/ -N: Gustavo Pimentel -F: configs/arm_juno_defconfig -F: board/arm/juno/ - N: Gwenhael Goavec-Merou F: board/terasic/de10nano_cyclone5/ F: configs/terasic_de10nano_cyclone5_defconfig diff --git a/board/arm/juno/linux-juno-defconfig b/board/arm/juno/linux-juno-defconfig deleted file mode 100644 index 64598d21a1..0000000000 --- a/board/arm/juno/linux-juno-defconfig +++ /dev/null @@ -1,169 +0,0 @@ -CONFIG_SMP=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_FHANDLE=y -CONFIG_AUDIT=y -CONFIG_NO_HZ_IDLE=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -CONFIG_MEMCG_KMEM=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_SCHED_AUTOGROUP=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_PROFILING=y -CONFIG_JUMP_LABEL=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_ARCH_VEXPRESS=y -CONFIG_PCI=y -CONFIG_PCI_MSI=y -CONFIG_PCI_HOST_GENERIC=y -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=y -CONFIG_HOTPLUG_PCI=y -CONFIG_NR_CPUS=6 -CONFIG_PREEMPT=y -CONFIG_KSM=y -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_CMA=y -CONFIG_CMDLINE="console=ttyAMA0" -CONFIG_COMPAT=y -CONFIG_CPU_IDLE=y -CONFIG_ARM_CPUIDLE=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_INTERACTIVE=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=y -CONFIG_ARM_DT_BL_CPUFREQ=y -CONFIG_ARM_SCPI_CPUFREQ=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_BPF_JIT=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_SD=y -CONFIG_ATA=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_AHCI_PLATFORM=y -CONFIG_AHCI_XGENE=y -CONFIG_PATA_PLATFORM=y -CONFIG_PATA_OF_PLATFORM=y -CONFIG_NETDEVICES=y -CONFIG_TUN=y -CONFIG_SKY2=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -CONFIG_INPUT_EVDEV=y -CONFIG_SERIO_AMBAKMI=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SERIAL_XILINX_PS_UART=y -CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_DESIGNWARE_PLATFORM=y -CONFIG_I2C_SLAVE=y -CONFIG_SPI=y -CONFIG_SPI_PL022=y -CONFIG_PTP_1588_CLOCK=m -CONFIG_GPIO_PL061=y -CONFIG_GPIO_XGENE=y -CONFIG_POWER_RESET_XGENE=y -CONFIG_POWER_RESET_SYSCON=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_VEXPRESS=m -CONFIG_DRM=y -CONFIG_DRM_I2C_NXP_TDA998X=y -CONFIG_DRM_ARM=y -CONFIG_DRM_HDLCD=y -CONFIG_DRM_VIRTUAL_HDLCD=y -CONFIG_FB_ARMCLCD=y -CONFIG_LOGO=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PLATFORM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_ISP1760=y -CONFIG_NOP_USB_XCEIV=y -CONFIG_USB_ULPI=y -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SPI=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_EFI=y -CONFIG_RTC_DRV_PL030=y -CONFIG_RTC_DRV_PL031=y -CONFIG_DMADEVICES=y -CONFIG_PL330_DMA=y -CONFIG_COMMON_CLK_SCPI=y -CONFIG_ARM_TIMER_SP804=y -CONFIG_MAILBOX=y -CONFIG_ARM_MHU=y -CONFIG_PHY_XGENE=y -CONFIG_ARM_SCPI_PROTOCOL=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y -CONFIG_QUOTA=y -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=y -CONFIG_CUSE=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_HUGETLBFS=y -CONFIG_EFIVAR_FS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_FS=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_SECURITY=y -CONFIG_CRYPTO_ANSI_CPRNG=y -CONFIG_ARM64_CRYPTO=y -CONFIG_CRYPTO_SHA1_ARM64_CE=y -CONFIG_CRYPTO_SHA2_ARM64_CE=y -CONFIG_CRYPTO_GHASH_ARM64_CE=y -CONFIG_CRYPTO_AES_ARM64_CE_CCM=y -CONFIG_CRYPTO_AES_ARM64_CE_BLK=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SOC=y -CONFIG_SND_SIMPLE_CARD=y -CONFIG_SND_DESIGNWARE_I2S=y -CONFIG_CMA=y -CONFIG_CMA_SIZE_MBYTES=64 diff --git a/board/arm/juno/readme.txt b/board/arm/juno/readme.txt deleted file mode 100644 index b292d9636d..0000000000 --- a/board/arm/juno/readme.txt +++ /dev/null @@ -1,134 +0,0 @@ -ARM Juno r1/r0 - -Intro -===== - -These instructions apply to all models of the ARM Juno: - - Juno r0 (does not support PCIe) - - Juno r1 (supports PCIe) - - Juno r2 (Big Cluster with A72) - -Buildroot will generate the kernel image, device tree blob, bootloader binaries -and a minimal root filesystem. - -How to build it -=============== - -Configure Buildroot -------------------- - -Configuring Buildroot is pretty simple, just execute: - - $ make arm_juno_defconfig - -Build the rootfs, kernel and DTB --------------------------------- - -Note: you will need to have access to the network, since Buildroot will -download the packages' sources. - -You may now build your rootfs with: - - $ make - -(This may take a while) - -Result of the build -------------------- - -After building, you should obtain this tree: - - output/images/ - +-- rootfs.tar - +-- juno.dtb (if Juno r0 is used) - +-- juno-r1.dtb (if Juno r1 is used) - +-- juno-r2.dtb (if Juno r2 is used) - +-- Image - +-- bl1.bin - +-- bl2.bin - +-- bl2u.bin - +-- bl31.bin - +-- fip.bin - +-- scp-fw.bin - +-- u-boot.bin - -Preparing your rootfs -====================== - -Format your pen drive as a ext3 filesystem by executing: - - $ mkfs.ext3 /dev/ - -Preparing your rootfs -====================== - -Format your pen drive as a ext3 filesystem by executing: - - $ mkfs.ext3 /dev/ - -Installing your rootfs -====================== - -After mounting the pen drive please execute the following: - - $ sudo tar -xvf output/images/rootfs.tar -C - -When completed make sure to unmount the device: - - $ umount - -Insert the pen drive in one of the ARM Juno' USB type A connectors. - -Configure *.dtb in the boot configuration for Juno r0 -===================================================== - -SITE1/HBI0262B/images.txt -..... -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x00C00000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify Image name to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point -...... - -Configure *.dtb in the boot configuration for Juno r1 -===================================================== - -SITE1/HBI0262C/images.txt -...... -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x00C00000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno-r1.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify target filename to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point -...... - -Configure *.dtb in the boot configuration for Juno r2 -===================================================== - -SITE1/HBI0262D/images.txt -...... -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x02000000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno-r2.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify target filename to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point -...... - -Installing kernel image and DTB -=============================== - -1. Connect to the ARM Juno UART0 and execute USB_ON in the terminal -2. Connect a USB cable between your PC and ARM Juno USB type B connector - A mass storage device should appear in your desktop. -3. Open the software/ folder -4. Copy the 'Image' file to software/ -5. Copy the 'juno-r1.dtb' (r1), 'juno.dtb' (r0) or juno-r2.dtb (r2) file to software/ -6. Copy the bootloader binaries (bl1.bin and fip.bin) to software/ -7. Press the red button in the front pannel of ARM Juno - -At this time, the board will erase the Flash entry for each new item and -replace it with the lastest ones. diff --git a/configs/arm_juno_defconfig b/configs/arm_juno_defconfig deleted file mode 100644 index 5832986779..0000000000 --- a/configs/arm_juno_defconfig +++ /dev/null @@ -1,23 +0,0 @@ -BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y -BR2_TARGET_GENERIC_HOSTNAME="juno-buildroot" -BR2_TARGET_GENERIC_ISSUE="Welcome to SNPS Juno by Buildroot" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/arm/juno/linux-juno-defconfig" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/juno arm/juno-r1 arm/juno-r2" -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.4" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="vexpress_aemv8a_juno" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.03" -BR2_TARGET_VEXPRESS_FIRMWARE=y From yann.morin.1998 at free.fr Mon Feb 20 20:52:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:20 -0000 Subject: [Buildroot] [git commit branch/next] package/mdio-tools: needs fork Message-ID: <20230220205150.490E386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0d1c6288a9adfb54dc9d98b8c4f5531eb4c9cba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since the addition of the package in commit 8fdf8731e727dc5c2d4080d7a56e1d71dc25e533: mdio.c: In function 'mdio_modprobe': mdio.c:738:15: error: implicit declaration of function 'fork' [-Werror=implicit-function-declaration] 738 | pid = fork(); | ^~~~ Fixes: - http://autobuild.buildroot.org/results/c53aaeaa34dd4d6d9a57da196687beecaeed9fe2 Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/mdio-tools/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/mdio-tools/Config.in b/package/mdio-tools/Config.in index f24c1a6974..237f4454cc 100644 --- a/package/mdio-tools/Config.in +++ b/package/mdio-tools/Config.in @@ -1,12 +1,15 @@ comment "mdio-tools needs a Linux kernel to be built" + depends on BR2_USE_MMU depends on !BR2_LINUX_KERNEL comment "mdio-tools needs a toolchain w/ headers >= 5.1" + depends on BR2_USE_MMU depends on BR2_LINUX_KERNEL depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 config BR2_PACKAGE_MDIO_TOOLS bool "mdio-tools" + depends on BR2_USE_MMU # fork() depends on BR2_LINUX_KERNEL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 select BR2_PACKAGE_LIBMNL From yann.morin.1998 at free.fr Mon Feb 20 20:52:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:21 -0000 Subject: [Buildroot] [git commit branch/next] configs/orangepi_plus: remove defconfig Message-ID: <20230220205148.CA9ED828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c4828568d6c5e4f1efb5b7d83ec6254d23ccdfa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. This defconfig did not even have an entry in the DEVELOPERS file. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499140 Cc: Shyam Saini Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- board/orangepi/orangepi-plus/boot.cmd | 8 ------ board/orangepi/orangepi-plus/genimage.cfg | 36 ------------------------- board/orangepi/orangepi-plus/readme.txt | 29 -------------------- configs/orangepi_plus_defconfig | 44 ------------------------------- 4 files changed, 117 deletions(-) diff --git a/board/orangepi/orangepi-plus/boot.cmd b/board/orangepi/orangepi-plus/boot.cmd deleted file mode 100644 index 1a378cb918..0000000000 --- a/board/orangepi/orangepi-plus/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-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-plus/genimage.cfg b/board/orangepi/orangepi-plus/genimage.cfg deleted file mode 100644 index 1ca30258dc..0000000000 --- a/board/orangepi/orangepi-plus/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the OrangePi Plus\Plus2 -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-plus.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" - } -} diff --git a/board/orangepi/orangepi-plus/readme.txt b/board/orangepi/orangepi-plus/readme.txt deleted file mode 100644 index 7f871bcfab..0000000000 --- a/board/orangepi/orangepi-plus/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -OrangePi Plus/Plus2 - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the OrangePi Plus/Plus2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make orangepi_plus_defconfig - -Compile everything and build the SD card image: - - $ make - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig deleted file mode 100644 index 11d7486486..0000000000 --- a/configs/orangepi_plus_defconfig +++ /dev/null @@ -1,44 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Plus" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Plus" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_plus" -BR2_TARGET_UBOOT_NEEDS_DTC=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=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-plus/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-plus" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-plus/genimage.cfg" - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:21 -0000 Subject: [Buildroot] [git commit branch/next] boot/arm-trusted-firmware: fix SSP disable in v2.2 Message-ID: <20230220205150.533BB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e330ff030d11193ce716822c932c2a6b0f109c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next ATF version 2.2 and older does not disable SSP when ENABLE_STACK_PROTECTOR is not set. This is because the compiler enables SSP by default, and ATF does not pass -fno-stack-protector to the compiler. Upstream commit 7af195e29a42 ("Disable stack protection explicitly") fixed the issue for v2.3 and newer. Add -fno-stack-protector in CFLAGS when BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP is not set to fix older ATF versions. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3301821171 Cc: Dick Olsson Cc: Sergey Matyukevich Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 34d7d80243..1164c81410 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -67,11 +67,17 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ ENABLE_STACK_PROTECTOR=$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL)) +else +ARM_TRUSTED_FIRMWARE_CFLAGS += -fno-stack-protector +endif + +ifeq ($(BR2_PIC_PIE),y) +ARM_TRUSTED_FIRMWARE_CFLAGS += -fno-PIE endif ARM_TRUSTED_FIRMWARE_MAKE_ENV += \ $(TARGET_MAKE_ENV) \ - $(if $(BR2_PIC_PIE),CFLAGS="-fno-PIE") + CFLAGS="$(ARM_TRUSTED_FIRMWARE_CFLAGS)" ifeq ($(BR2_ARM_CPU_ARMV7A),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARM_ARCH_MAJOR=7 From yann.morin.1998 at free.fr Mon Feb 20 20:52:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:21 -0000 Subject: [Buildroot] [git commit branch/next] package/qoriq-rcw: update codeaurora URLs to github Message-ID: <20230220205220.7EE028648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a019e5e460f0d85b0b44163ba80be7cd6a53738a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Signed-off-by: Julien Olivain Reviewed-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/qoriq-rcw/Config.in.host | 2 +- package/qoriq-rcw/qoriq-rcw.hash | 2 +- package/qoriq-rcw/qoriq-rcw.mk | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/qoriq-rcw/Config.in.host b/package/qoriq-rcw/Config.in.host index 08fc83acd0..58c16d495b 100644 --- a/package/qoriq-rcw/Config.in.host +++ b/package/qoriq-rcw/Config.in.host @@ -9,7 +9,7 @@ config BR2_PACKAGE_HOST_QORIQ_RCW $(HOST_DIR)/share/rcw. Either a SDK or post scripts can then use this toolset and examples. - https://source.codeaurora.org/external/qoriq/qoriq-components/rcw/ + https://github.com/nxp-qoriq/rcw if BR2_PACKAGE_HOST_QORIQ_RCW diff --git a/package/qoriq-rcw/qoriq-rcw.hash b/package/qoriq-rcw/qoriq-rcw.hash index f34c771d11..2a887d57d4 100644 --- a/package/qoriq-rcw/qoriq-rcw.hash +++ b/package/qoriq-rcw/qoriq-rcw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 caa6802f2ba5ea92fd27e7c977749010a91c9091fcc3fe626f96d9cacfba1f0a qoriq-rcw-LSDK-21.08-br1.tar.gz +sha256 f199c10e50bd18d7bed0d60f5b68194240dea4f1aa164cec98332723727a4796 qoriq-rcw-LSDK-21.08.tar.gz sha256 68f4b15ecc085729419bc60ca6eeadca5af0237bbfec791e8a79da9c943d42e9 LICENSE diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index 0501c36f46..8b1ceacfce 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -5,8 +5,7 @@ ################################################################################ QORIQ_RCW_VERSION = LSDK-21.08 -QORIQ_RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw -QORIQ_RCW_SITE_METHOD = git +QORIQ_RCW_SITE = $(call github,nxp-qoriq,rcw,$(QORIQ_RCW_VERSION)) QORIQ_RCW_LICENSE = BSD-3-Clause QORIQ_RCW_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:22 -0000 Subject: [Buildroot] [git commit branch/next] configs/rock_pi_n10: remove defconfig Message-ID: <20230220205149.A991A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66653be5b85f6cbfceac51d95180f785f921b681 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3259671399 Cc: Suniel Mahesh Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 -- board/radxa/rockpi-n10/extlinux.conf | 4 --- board/radxa/rockpi-n10/genimage.cfg | 39 ----------------------- board/radxa/rockpi-n10/post-build.sh | 5 --- board/radxa/rockpi-n10/readme.txt | 61 ------------------------------------ configs/rock_pi_n10_defconfig | 55 -------------------------------- 6 files changed, 166 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ae20554f91..bd76ddca28 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2731,9 +2731,7 @@ N: Suniel Mahesh F: board/friendlyarm/nanopi-m4 F: board/pine64/rockpro64 F: board/radxa/rockpi-n8 -F: board/radxa/rockpi-n10 F: configs/rock_pi_n8_defconfig -F: configs/rock_pi_n10_defconfig F: configs/rockpro64_defconfig F: package/arm-gnu-toolchain/ diff --git a/board/radxa/rockpi-n10/extlinux.conf b/board/radxa/rockpi-n10/extlinux.conf deleted file mode 100644 index b6a4c97cd9..0000000000 --- a/board/radxa/rockpi-n10/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_ROCK_PI_N10 linux - kernel /Image - devicetree /rk3399pro-rock-pi-n10.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p4 rw rootwait diff --git a/board/radxa/rockpi-n10/genimage.cfg b/board/radxa/rockpi-n10/genimage.cfg deleted file mode 100644 index fe6fa3f8f9..0000000000 --- a/board/radxa/rockpi-n10/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399pro-rock-pi-n10.dtb", - "extlinux" - } - } - - size = 112M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = F - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/board/radxa/rockpi-n10/post-build.sh b/board/radxa/rockpi-n10/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/board/radxa/rockpi-n10/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/radxa/rockpi-n10/readme.txt b/board/radxa/rockpi-n10/readme.txt deleted file mode 100644 index 49decbb3d9..0000000000 --- a/board/radxa/rockpi-n10/readme.txt +++ /dev/null @@ -1,61 +0,0 @@ -RADXA ROCKPI-N10 -================ -https://wiki.radxa.com/RockpiN10 - -Build: -====== - $ make rock_pi_n10_defconfig - $ make - -Files created in output directory -================================= - -output/images -. -????????? bl31.elf -????????? boot.vfat -????????? extlinux -????????? idbloader.img -????????? Image -????????? rk3399pro-rock-pi-n10.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device. - -Booting: -======== - -Serial console: ---------------- -RockPi-N10 has a 40-pin GPIO header. The pin layout is as follows: - -pin 6: gnd -pin 8: tx -pin 10: rx - -Baudrate for this board is 1500000. - -The boot order on rockpi-n10 is emmc, sd. If emmc contains a valid Image, the board -always boots from emmc. To boot from SD, erase emmc as per the guide: - -https://wiki.amarulasolutions.com/bsp/setup/rockchip/rk3399_emmc.html - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -wiki link: ----------- -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399pro/rock-pi-n10.html diff --git a/configs/rock_pi_n10_defconfig b/configs/rock_pi_n10_defconfig deleted file mode 100644 index c622839c89..0000000000 --- a/configs/rock_pi_n10_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/amarula/u-boot-amarula.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="cf2747360fdd1eb0d51dd01a984c7c62c7f714fe" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock-pi-n10-rk3399pro" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399pro-rock-pi-n10" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="rockpi-n10" -BR2_TARGET_GENERIC_ISSUE="Welcome to ROCKPI-N10" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="160M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rockpi-n10/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rockpi-n10/post-build.sh" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:22 -0000 Subject: [Buildroot] [git commit branch/next] package/gptfdisk: fix popt static build Message-ID: <20230220205149.14BE08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a38682dd54dde976836c37dcc30ec24baa474690 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static build failure with popt and iconv raised since bump to version 1.0.9 in commit 69015ce94ac3ffe7f349ec37868eea0d0ffec90e and https://sourceforge.net/p/gptfdisk/code/ci/122b58ad82f1a144226d262c87241ee035ed1aff (which added an unified Makefile): /home/autobuild/autobuild/instance-0/output-1/host/bin/mips64el-buildroot-linux-uclibc-g++ crc32.o support.o guid.o gptpart.o mbrpart.o basicmbr.o mbr.o gpt.o bsd.o parttypes.o attributes.o diskio.o diskio-unix.o sgdisk.o gptcl.o -static -liconv -lpopt -o sgdisk /home/autobuild/autobuild/instance-0/output-1/host/lib/gcc/mips64el-buildroot-linux-uclibc/11.3.0/../../../../mips64el-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/lib64/../lib64/libpopt.a(poptint.o): in function `strdup_locale_from_utf8': poptint.c:(.text+0x113c): undefined reference to `libiconv_open' As can be seen above, this build failure is raised because -liconv is added before -lpopt so use pkgconfig and SGDISK_LDLIBS The addition of -liconv in LDLIBS could probably be removed in a follow-up patch for next branch Fixes: - http://autobuild.buildroot.org/results/c9f2c9e737c2dd1cd4c1a08a5e8a48165179282d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gptfdisk/gptfdisk.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index 0df9cda08f..f3fc930202 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -15,7 +15,8 @@ GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_CGDISK) += cgdisk GPTFDISK_DEPENDENCIES += util-linux ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y) -GPTFDISK_DEPENDENCIES += popt +GPTFDISK_DEPENDENCIES += host-pkgconf popt +GPTFDISK_SGDISK_LDLIBS += `$(PKG_CONFIG_HOST_BINARY) --libs popt` endif ifeq ($(BR2_PACKAGE_GPTFDISK_CGDISK),y) GPTFDISK_DEPENDENCIES += ncurses @@ -32,7 +33,8 @@ endif define GPTFDISK_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - LDLIBS='$(GPTFDISK_LDLIBS)' $(GPTFDISK_TARGETS_y) + LDLIBS='$(GPTFDISK_LDLIBS)' \ + SGDISK_LDLIBS='$(GPTFDISK_SGDISK_LDLIBS)' $(GPTFDISK_TARGETS_y) endef define GPTFDISK_INSTALL_TARGET_CMDS From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:23 -0000 Subject: [Buildroot] [git commit branch/next] package/dbus-broker: audit support needs libcap-ng Message-ID: <20230220205150.92F3886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f0e82c4ef8bc02bf8b2ada7bf5daf940d4e4cac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since v14 in 2018, audit support has needed libcap-ng. Fixes: http://autobuild.buildroot.org/results/43abdb85cc2f386d427cec1cfa876e20e3509cb8/ Signed-off-by: Yann E. MORIN Cc: Norbert Lange Signed-off-by: Thomas Petazzoni --- package/dbus-broker/Config.in | 1 + package/dbus-broker/dbus-broker.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/dbus-broker/Config.in b/package/dbus-broker/Config.in index c7206232da..aa6584c392 100644 --- a/package/dbus-broker/Config.in +++ b/package/dbus-broker/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_DBUS_BROKER depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 depends on BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBCAP_NG if BR2_PACKAGE_AUDIT help Linux D-Bus Message Broker. diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index c0a58de9ad..e82b79220d 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -28,7 +28,8 @@ DBUS_BROKER_DEPENDENCIES = expat systemd DBUS_BROKER_CONF_OPTS = -Dlauncher=true ifeq ($(BR2_PACKAGE_AUDIT),y) -DBUS_BROKER_DEPENDENCIES += audit +# libcap-ng selected from Config.in +DBUS_BROKER_DEPENDENCIES += audit libcap-ng DBUS_BROKER_CONF_OPTS += -Daudit=true else DBUS_BROKER_CONF_OPTS += -Daudit=false From yann.morin.1998 at free.fr Mon Feb 20 20:52:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:23 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_neo4: remove defconfig Message-ID: <20230220205148.9573186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f7a517f5c156666cef58dec429bfffd4ae41e81 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499054 Cc: Marek Belisko Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/friendlyarm/nanopi-neo4/extlinux.conf | 4 --- board/friendlyarm/nanopi-neo4/genimage.cfg | 22 ------------ board/friendlyarm/nanopi-neo4/post-build.sh | 5 --- board/friendlyarm/nanopi-neo4/readme.txt | 53 --------------------------- configs/friendlyarm_nanopi_neo4_defconfig | 55 ----------------------------- 6 files changed, 141 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 7442d3a6ee..27482d095a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1896,8 +1896,6 @@ F: utils/config F: utils/diffconfig N: Marek Belisko -F: board/friendlyarm/nanopi-neo4/ -F: configs/friendlyarm_nanopi_neo4_defconfig F: package/libatasmart/ F: package/polkit/ F: package/sg3_utils/ diff --git a/board/friendlyarm/nanopi-neo4/extlinux.conf b/board/friendlyarm/nanopi-neo4/extlinux.conf deleted file mode 100644 index 91eef67fb9..0000000000 --- a/board/friendlyarm/nanopi-neo4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label NanoPi Neo4 linux - kernel /boot/Image - devicetree /boot/rk3399-nanopi-neo4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p1 rootwait diff --git a/board/friendlyarm/nanopi-neo4/genimage.cfg b/board/friendlyarm/nanopi-neo4/genimage.cfg deleted file mode 100644 index 966c869273..0000000000 --- a/board/friendlyarm/nanopi-neo4/genimage.cfg +++ /dev/null @@ -1,22 +0,0 @@ -image sdcard.img { - hdimage { - } - - partition u-boot-tpl-spl-dtb { - in-partition-table = "no" - image = "idbloader.img" - offset = 32K - } - - partition u-boot-dtb { - in-partition-table = "no" - image = "u-boot.itb" - offset = 8M - size = 30M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-neo4/post-build.sh b/board/friendlyarm/nanopi-neo4/post-build.sh deleted file mode 100755 index 1f5ff6a611..0000000000 --- a/board/friendlyarm/nanopi-neo4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-neo4/readme.txt b/board/friendlyarm/nanopi-neo4/readme.txt deleted file mode 100644 index 7c04a52806..0000000000 --- a/board/friendlyarm/nanopi-neo4/readme.txt +++ /dev/null @@ -1,53 +0,0 @@ -Intro -===== - -NanoPi Neo4 is a RK3399 SoC based ARM64 board. - - -Official wiki: http://wiki.friendlyarm.com/wiki/index.php/NanoPi_NEO4 -Mainline wiki: https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/neo4.html - -Build -===== - -Run NanoPi Neo4 configuration - - $ make friendlyarm_nanopi_neo4_defconfig - -To build, run make comamnd. - - $ make - -Files created in output directory -================================= - -output/images - -????????? bl31.bin -????????? bl31.elf -????????? Image -????????? rk3399-nanopi-neo4.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb -????????? u-boot-spl-dtb.bin -????????? u-boot-tpl-dtb.bin -????????? u-boot-tpl-dtb.img -????????? u-boot-tpl-spl-dtb.img - -Creating bootable SD card: -========================= - -Simply invoke (as root) - - # dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device - -Serial console --------------- - -Baudrate for this board is 1500000 diff --git a/configs/friendlyarm_nanopi_neo4_defconfig b/configs/friendlyarm_nanopi_neo4_defconfig deleted file mode 100644 index a11872ef2a..0000000000 --- a/configs/friendlyarm_nanopi_neo4_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-neo4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.18" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopi-neo4" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="NanoPi Neo4" -BR2_TARGET_GENERIC_ISSUE="Welcome to NanoPi Neo4!" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="70M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo4/post-build.sh" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:24 -0000 Subject: [Buildroot] [git commit branch/next] package/boost: backport development branch changes to fix MIPS64 build failure Message-ID: <20230220205149.07AAD86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea38acd17d88b9eaf853313398c772b94338ad47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Backport from Boost/intrusive development branch. Fixes issue introduced with version 1.80. Issue: https://github.com/boostorg/intrusive/issues/79 Fixes: http://autobuild.buildroot.net/results/6cb/6cbc0672f3c5046405793d8cdc8f961d2ffb1d3e Signed-off-by: Andreas Ziegler Signed-off-by: Thomas Petazzoni --- .../boost/0001-Improve-modfunc-performance.patch | 551 +++++++++++++++++++++ 1 file changed, 551 insertions(+) diff --git a/package/boost/0001-Improve-modfunc-performance.patch b/package/boost/0001-Improve-modfunc-performance.patch new file mode 100644 index 0000000000..9cf5d8387e --- /dev/null +++ b/package/boost/0001-Improve-modfunc-performance.patch @@ -0,0 +1,551 @@ +From 825aedad557b7e3bb27614335b6ced16887103de Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= +Date: Mon, 7 Nov 2022 00:16:44 +0100 +Subject: [PATCH 1/1] Improve "modfunc" performance Fixes #79 + ("boost/intrusive/hashtable.hpp: build failure (undeclared indentifier)") + +Backport from Boost development branch to fix issues with some architectures +(64-bit with 128-bit processing, where size_t != unsigned long). In this case, +code is enabled that causes a build failure. + +Upstream: https://github.com/boostorg/intrusive/commit/825aedad557b7e3bb27614335b6ced16887103de +Issue: https://github.com/boostorg/intrusive/issues/79 +Fixes: http://autobuild.buildroot.net/results/6cb/6cbc0672f3c5046405793d8cdc8f961d2ffb1d3e + +Signed-off-by: Andreas Ziegler +--- + include/boost/intrusive/hashtable.hpp | 235 ++++++++++++++++---------- + 1 file changed, 145 insertions(+), 90 deletions(-) + +diff --git a/include/boost/intrusive/hashtable.hpp b/include/boost/intrusive/hashtable.hpp +index b8bc877..688fb9b 100644 +--- a/boost/intrusive/hashtable.hpp ++++ b/boost/intrusive/hashtable.hpp +@@ -2,6 +2,7 @@ + // + // (C) Copyright Ion Gaztanaga 2006-2022 + // (C) Copyright 2022 Joaquin M Lopez Munoz. ++// (C) Copyright 2022 Christian Mazakas + // + // Distributed under the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at +@@ -84,11 +85,6 @@ namespace intrusive { + + /// @cond + +-#if !defined(BOOST_NO_INT64_T)&&\ +- (defined(BOOST_HAS_INT128) || (defined(_MSC_VER) && defined(_WIN64))) +-#define BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT +-#endif +- + //We only support LLP64(Win64) or LP64(most Unix) data models + #ifdef _WIN64 //In 64 bit windows sizeof(size_t) == sizeof(unsigned long long) + # define BOOST_INTRUSIVE_SIZE_C(NUMBER) NUMBER##ULL +@@ -98,7 +94,6 @@ namespace intrusive { + # define BOOST_INTRUSIVE_64_BIT_SIZE_T (((((ULONG_MAX>>16)>>16)>>16)>>15) != 0) + #endif + +- + template + struct prime_list_holder + { +@@ -167,11 +162,11 @@ struct prime_list_holder + { return prime_list[std::ptrdiff_t(n)]; } + + template +- BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % prime_list[SizeIndex]; } ++ BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % SizeIndex; } + + static std::size_t(*const positions[])(std::size_t); + +- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++ #if BOOST_INTRUSIVE_64_BIT_SIZE_T + static const uint64_t inv_sizes32[]; + static const std::size_t inv_sizes32_size; + #endif +@@ -185,17 +180,20 @@ struct prime_list_holder + BOOST_INTRUSIVE_FORCEINLINE static std::size_t size(std::size_t size_index) + { return prime_list_holder<>::size_from_index(size_index); } + +- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++ #if BOOST_INTRUSIVE_64_BIT_SIZE_T + // https://github.com/lemire/fastmod + +- + BOOST_INTRUSIVE_FORCEINLINE static uint64_t mul128_u32(uint64_t lowbits, uint32_t d) + { + #if defined(_MSC_VER) +- return __umulh(lowbits, d); ++ return __umulh(lowbits, d); ++ #elif defined(BOOST_HAS_INT128) ++ return static_cast((uint128_type(lowbits) * d) >> 64); + #else +- __extension__ typedef unsigned __int128 ext_uint128_t; +- return (ext_uint128_t(lowbits) * d) >> 64; ++ uint64_t r1 = (lowbits & UINT32_MAX) * d; ++ uint64_t r2 = (lowbits >> 32) * d; ++ r2 += r1 >> 32; ++ return r2 >> 32; + #endif + } + +@@ -204,51 +202,67 @@ struct prime_list_holder + uint64_t lowbits = M * a; + return (uint32_t)(mul128_u32(lowbits, d)); + } +- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T + + BOOST_INTRUSIVE_FORCEINLINE static std::size_t position(std::size_t hash,std::size_t size_index) + { +- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) && BOOST_INTRUSIVE_64_BIT_SIZE_T +- const std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); ++ #if BOOST_INTRUSIVE_64_BIT_SIZE_T ++ BOOST_CONSTEXPR_OR_CONST std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); + if(BOOST_LIKELY(size_index < sizes_under_32bit)){ + return fastmod_u32( uint32_t(hash)+uint32_t(hash>>32) + , inv_sizes32[size_index] + , uint32_t(prime_list[size_index]) ); + } + else{ +- return positions[size_index-sizes_under_32bit](hash); ++ return positions[size_index](hash); + } +- #elif defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) +- return fastmod_u32(hash, inv_sizes32[size_index], uint32_t(sizes[size_index])); + #else + return positions[size_index](hash); +- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T + } + }; + + template + std::size_t(* const prime_list_holder::positions[])(std::size_t) = + { +- #if !defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) +- modfunc< 0>,modfunc< 1>,modfunc< 2>,modfunc< 3>,modfunc< 4>, +- modfunc< 5>,modfunc< 6>,modfunc< 7>,modfunc< 8>,modfunc< 9>, +- modfunc<10>,modfunc<11>,modfunc<12>,modfunc<13>,modfunc<14>, +- modfunc<15>,modfunc<16>,modfunc<17>,modfunc<18>,modfunc<19>, +- modfunc<20>,modfunc<21>,modfunc<22>,modfunc<23>,modfunc<24>, +- modfunc<25>,modfunc<26>,modfunc<27>,modfunc<28>,modfunc<29>, +- modfunc<30>, +- #endif +- # if BOOST_INTRUSIVE_64_BIT_SIZE_T +- modfunc<31>,modfunc<32>,modfunc<33>,modfunc<34>, +- modfunc<35>,modfunc<36>,modfunc<37>,modfunc<38>,modfunc<39>, +- modfunc<40>,modfunc<41>,modfunc<42>,modfunc<43>,modfunc<44>, +- modfunc<45>,modfunc<46>,modfunc<47>,modfunc<48>,modfunc<49>, +- modfunc<50>,modfunc<51>,modfunc<52>,modfunc<53>,modfunc<54>, +- modfunc<55>,modfunc<56>,modfunc<57>,modfunc<58>,modfunc<59>, +- modfunc<60>,modfunc<61>,modfunc<62>,modfunc<63> +- # else +- modfunc<31> +- # endif ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, //0-30 indexes ++#if BOOST_INTRUSIVE_64_BIT_SIZE_T ++ //Taken from Boost.MultiIndex code, thanks to Joaquin M. Lopez Munoz. ++ modfunc, //<- 32 bit values stop here (index 31) ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc //(index 63) ++#else ++ modfunc //<- 32 bit stops here (index 31) as ptrdiff_t is signed ++#endif + }; + + template +@@ -298,7 +312,7 @@ const std::size_t prime_list_holder::prime_list_size + = sizeof(prime_list) / sizeof(std::size_t); + + +-#if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++#if BOOST_INTRUSIVE_64_BIT_SIZE_T + + template + const uint64_t prime_list_holder::inv_sizes32[] = { +@@ -340,7 +354,7 @@ template + const std::size_t prime_list_holder::inv_sizes32_size + = sizeof(inv_sizes32) / sizeof(uint64_t); + +-#endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++#endif // BOOST_INTRUSIVE_64_BIT_SIZE_T + + struct prime_fmod_size : prime_list_holder<> + { +@@ -785,9 +799,9 @@ BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_va + } + + template //fastmod_buckets +-BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t bucket_cnt, std::size_t split, detail::true_) ++BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t , std::size_t split, detail::true_) + { +- return prime_fmod_size::position(hash_value, split); (void)bucket_cnt; ++ return prime_fmod_size::position(hash_value, split); + } + + //!This metafunction will obtain the type of a bucket +@@ -1473,6 +1487,10 @@ struct bucket_hash_t + , bucket_plus_vtraits_t(BOOST_MOVE_BASE(bucket_plus_vtraits_t, other)) + {} + ++ template ++ BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_hash(const K &k) const ++ { return this->base_t::operator()(k); } ++ + BOOST_INTRUSIVE_FORCEINLINE const hasher &priv_hasher() const + { return this->base_t::get(); } + +@@ -1747,8 +1765,17 @@ struct hashtable_size_wrapper + typedef const size_traits & size_traits_const_t; + typedef size_traits & size_traits_t; + +- BOOST_INTRUSIVE_FORCEINLINE size_traits_const_t priv_size_traits() const +- { return size_traits_; } ++ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const ++ { return size_traits_.get_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType s) ++ { size_traits_.set_size(s); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() ++ { size_traits_.increment(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() ++ { size_traits_.decrement(); } + + BOOST_INTRUSIVE_FORCEINLINE size_traits_t priv_size_traits() + { return size_traits_; } +@@ -1780,7 +1807,19 @@ struct hashtable_size_wrapper + typedef size_traits size_traits_const_t; + typedef size_traits size_traits_t; + +- BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() const ++ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const ++ { return 0u; } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType) ++ {} ++ ++ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() ++ {} ++ ++ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() ++ {} ++ ++ BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() + { return size_traits(); } + }; + +@@ -1815,14 +1854,14 @@ struct hashdata_internal + public: + static const bool linear_buckets = 0 != (BoolFlags & hash_bool_flags::linear_buckets_pos); + typedef typename get_hashtable_size_wrapper_bucket +- ::type internal_type; +- +- typedef typename internal_type::key_equal key_equal; +- typedef typename internal_type::hasher hasher; ++ ::type split_bucket_hash_equal_t; ++ ++ typedef typename split_bucket_hash_equal_t::key_equal key_equal; ++ typedef typename split_bucket_hash_equal_t::hasher hasher; + typedef bucket_plus_vtraits + bucket_plus_vtraits_t; + typedef SizeType size_type; +- typedef typename internal_type::size_traits split_traits; ++ typedef typename split_bucket_hash_equal_t::size_traits split_traits; + typedef typename bucket_plus_vtraits_t::bucket_ptr bucket_ptr; + typedef typename bucket_plus_vtraits_t::const_value_traits_ptr const_value_traits_ptr; + typedef typename bucket_plus_vtraits_t::siterator siterator; +@@ -1866,23 +1905,20 @@ struct hashdata_internal + + hashdata_internal( const ValueTraits &val_traits, const bucket_traits &b_traits + , const hasher & h, const key_equal &e) +- : internal_type(val_traits, b_traits, h, e) ++ : split_bucket_hash_equal_t(val_traits, b_traits, h, e) + {} + + BOOST_INTRUSIVE_FORCEINLINE hashdata_internal(BOOST_RV_REF(hashdata_internal) other) +- : internal_type(BOOST_MOVE_BASE(internal_type, other)) ++ : split_bucket_hash_equal_t(BOOST_MOVE_BASE(split_bucket_hash_equal_t, other)) + {} + +- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_t priv_split_traits() +- { return this->priv_size_traits(); } +- +- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_const_t priv_split_traits() const ++ BOOST_INTRUSIVE_FORCEINLINE typename split_bucket_hash_equal_t::size_traits_t priv_split_traits() + { return this->priv_size_traits(); } + + ~hashdata_internal() + { this->priv_clear_buckets(); } + +- using internal_type::priv_clear_buckets; ++ using split_bucket_hash_equal_t::priv_clear_buckets; + + void priv_clear_buckets() + { +@@ -1907,7 +1943,17 @@ struct hashdata_internal + + //public functions + BOOST_INTRUSIVE_FORCEINLINE SizeType split_count() const BOOST_NOEXCEPT +- { return this->priv_split_traits().get_size(); } ++ { return this->split_bucket_hash_equal_t::get_hashtable_size_wrapper_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void split_count(SizeType s) BOOST_NOEXCEPT ++ { this->split_bucket_hash_equal_t::set_hashtable_size_wrapper_size(s); } ++ ++ //public functions ++ BOOST_INTRUSIVE_FORCEINLINE void inc_split_count() BOOST_NOEXCEPT ++ { this->split_bucket_hash_equal_t::inc_hashtable_size_wrapper_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void dec_split_count() BOOST_NOEXCEPT ++ { this->split_bucket_hash_equal_t::dec_hashtable_size_wrapper_size(); } + + BOOST_INTRUSIVE_FORCEINLINE static SizeType initial_split_from_bucket_count(SizeType bc) BOOST_NOEXCEPT + { +@@ -1983,10 +2029,7 @@ struct hashdata_internal + { return (priv_hash_to_nbucket)(hash_value, fastmod_buckets_t()); } + + BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::true_) const //fastmod_buckets_t +- { +- return static_cast(hash_to_bucket_split +- (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::true_())); +- } ++ { return static_cast(prime_fmod_size::position(hash_value, this->split_count())); } + + BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::false_) const //!fastmod_buckets_t + { +@@ -1994,7 +2037,6 @@ struct hashdata_internal + (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::false_())); + } + +- + BOOST_INTRUSIVE_FORCEINLINE iterator iterator_to(reference value, detail::false_) BOOST_NOEXCEPT + { + return iterator( siterator(this->priv_value_to_node_ptr(value)) +@@ -2083,8 +2125,8 @@ struct hashdata_internal + , this->priv_value_traits_ptr()); + } + +- using internal_type::end; +- using internal_type::cend; ++ using split_bucket_hash_equal_t::end; ++ using split_bucket_hash_equal_t::cend; + + local_iterator end(size_type n) BOOST_NOEXCEPT + { return local_iterator(this->priv_bucket_lend(n), this->priv_value_traits_ptr()); } +@@ -2322,19 +2364,32 @@ class hashtable_impl + public: + typedef insert_commit_data_impl insert_commit_data; + ++ private: + void default_init_actions() + { + this->priv_set_sentinel_bucket(); + this->priv_init_buckets_and_cache(); +- this->priv_size_traits().set_size(size_type(0)); ++ this->priv_size_count(size_type(0)); + size_type bucket_sz = this->bucket_count(); + BOOST_INTRUSIVE_INVARIANT_ASSERT(bucket_sz != 0); + //Check power of two bucket array if the option is activated + BOOST_INTRUSIVE_INVARIANT_ASSERT + (!power_2_buckets || (0 == (bucket_sz & (bucket_sz - 1)))); +- this->priv_split_traits().set_size(this->initial_split_from_bucket_count(bucket_sz)); ++ this->split_count(this->initial_split_from_bucket_count(bucket_sz)); + } + ++ BOOST_INTRUSIVE_FORCEINLINE SizeType priv_size_count() const BOOST_NOEXCEPT ++ { return this->internal_type::get_hashtable_size_wrapper_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void priv_size_count(SizeType s) BOOST_NOEXCEPT ++ { this->internal_type::set_hashtable_size_wrapper_size(s); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void priv_size_inc() BOOST_NOEXCEPT ++ { this->internal_type::inc_hashtable_size_wrapper_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void priv_size_dec() BOOST_NOEXCEPT ++ { this->internal_type::dec_hashtable_size_wrapper_size(); } ++ + public: + + //! Requires: buckets must not be being used by any other resource. +@@ -2403,10 +2458,10 @@ class hashtable_impl + { + this->priv_swap_cache(x); + x.priv_init_cache(); +- this->priv_size_traits().set_size(x.priv_size_traits().get_size()); +- x.priv_size_traits().set_size(size_type(0)); +- this->priv_split_traits().set_size(x.split_count()); +- x.priv_split_traits().set_size(size_type(0)); ++ this->priv_size_count(x.priv_size_count()); ++ x.priv_size_count(size_type(0)); ++ this->split_count(x.split_count()); ++ x.split_count(size_type(0)); + } + + //! Effects: Equivalent to swap. +@@ -2524,7 +2579,7 @@ class hashtable_impl + size_type size() const BOOST_NOEXCEPT + { + BOOST_IF_CONSTEXPR(constant_time_size) +- return this->priv_size_traits().get_size(); ++ return this->priv_size_count(); + else{ + std::size_t len = 0; + std::size_t bucket_cnt = this->bucket_count(); +@@ -2798,7 +2853,7 @@ class hashtable_impl + //! After a successful rehashing insert_commit_data remains valid. + iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT + { +- this->priv_size_traits().increment(); ++ this->priv_size_inc(); + node_ptr const n = this->priv_value_to_node_ptr(value); + BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || slist_node_algorithms::unique(n)); + node_functions_t::store_hash(n, commit_data.get_hash(), store_hash_t()); +@@ -2890,7 +2945,7 @@ class hashtable_impl + //Get the bucket number and local iterator for both iterators + const bucket_ptr bp = this->priv_get_bucket_ptr(i); + this->priv_erase_node(*bp, i.slist_it(), this->make_node_disposer(disposer), optimize_multikey_t()); +- this->priv_size_traits().decrement(); ++ this->priv_size_dec(); + this->priv_erasure_update_cache(bp); + } + +@@ -2931,7 +2986,7 @@ class hashtable_impl + size_type const num_erased = (size_type)this->priv_erase_node_range + ( before_first_local_it, first_bucket_num, last_local_it, last_bucket_num + , this->make_node_disposer(disposer), optimize_multikey_t()); +- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-num_erased)); ++ this->priv_size_count(size_type(this->priv_size_count()-num_erased)); + this->priv_erasure_update_cache_range(first_bucket_num, last_bucket_num); + } + } +@@ -3001,7 +3056,7 @@ class hashtable_impl + (this->priv_value_from_siterator(it), h, key, equal_func, compare_hash_t())); + slist_node_algorithms::unlink_after_and_dispose(prev.pointed_node(), it.pointed_node(), this->make_node_disposer(disposer)); + } +- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-cnt)); ++ this->priv_size_count(size_type(this->priv_size_count()-cnt)); + this->priv_erasure_update_cache(); + } + +@@ -3020,7 +3075,7 @@ class hashtable_impl + void clear() BOOST_NOEXCEPT + { + this->priv_clear_buckets_and_cache(); +- this->priv_size_traits().set_size(size_type(0)); ++ this->priv_size_count(size_type(0)); + } + + //! Requires: Disposer::operator()(pointer) shouldn't throw. +@@ -3045,7 +3100,7 @@ class hashtable_impl + --num_buckets; + slist_node_algorithms::detach_and_dispose(b->get_node_ptr(), d); + } +- this->priv_size_traits().set_size(size_type(0)); ++ this->priv_size_count(size_type(0)); + } + this->priv_init_cache(); + } +@@ -3339,7 +3394,7 @@ class hashtable_impl + //! + //! Note: the return value is in the range [0, this->bucket_count()). + BOOST_INTRUSIVE_FORCEINLINE size_type bucket(const key_type& k) const +- { return this->bucket(k, this->priv_hasher()); } ++ { return this->priv_hash_to_nbucket(this->priv_hash(k)); } + + //! Requires: "hash_func" must be a hash function that induces + //! the same hash values as the stored hasher. The difference is that +@@ -3520,7 +3575,7 @@ class hashtable_impl + if((ret = split_idx < bucket_cnt)){ + const std::size_t bucket_to_rehash = split_idx - bucket_cnt/2u; + bucket_type &old_bucket = this->priv_bucket(bucket_to_rehash); +- this->priv_split_traits().increment(); ++ this->inc_split_count(); + + //Anti-exception stuff: if an exception is thrown while + //moving elements from old_bucket to the target bucket, all moved +@@ -3553,7 +3608,7 @@ class hashtable_impl + bucket_type &target_bucket = this->priv_bucket(target_bucket_num); + bucket_type &source_bucket = this->priv_bucket(split_idx-1u); + slist_node_algorithms::transfer_after(target_bucket.get_node_ptr(), source_bucket.get_node_ptr()); +- this->priv_split_traits().decrement(); ++ this->dec_split_count(); + this->priv_insertion_update_cache(target_bucket_num); + } + return ret; +@@ -3763,8 +3818,8 @@ class hashtable_impl + ArrayDisposer rollback2(old_buckets[0], nd, old_bucket_count); + + //Put size in a safe value for rollback exception +- size_type const size_backup = this->priv_size_traits().get_size(); +- this->priv_size_traits().set_size(0); ++ size_type const size_backup = this->priv_size_count(); ++ this->priv_size_count(0); + //Put cache to safe position + this->priv_init_cache(); + this->priv_unset_sentinel_bucket(); +@@ -3826,8 +3881,8 @@ class hashtable_impl + } + } + +- this->priv_size_traits().set_size(size_backup); +- this->priv_split_traits().set_size(split); ++ this->priv_size_count(size_backup); ++ this->split_count(split); + if(&new_bucket_traits != &this->priv_bucket_traits()) + this->priv_bucket_traits() = new_bucket_traits; + this->priv_set_sentinel_bucket(); +@@ -3927,8 +3982,8 @@ class hashtable_impl + this->priv_hasher() = src.priv_hasher(); + this->priv_equal() = src.priv_equal(); + rollback.release(); +- this->priv_size_traits().set_size(src.priv_size_traits().get_size()); +- this->priv_split_traits().set_size(dst_bucket_count); ++ this->priv_size_count(src.priv_size_count()); ++ this->split_count(dst_bucket_count); + this->priv_set_cache_bucket_num(0u); + this->priv_erasure_update_cache(); + } +@@ -3946,7 +4001,7 @@ class hashtable_impl + , n, optimize_multikey_t()); + //Update cache and increment size if needed + this->priv_insertion_update_cache(bucket_num); +- this->priv_size_traits().increment(); ++ this->priv_size_inc(); + slist_node_algorithms::link_after(prev.pointed_node(), n); + return this->build_iterator(siterator(n), this->priv_bucket_ptr(bucket_num)); + } +-- +2.34.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:26 -0000 Subject: [Buildroot] [git commit branch/next] package/libkcapi: fix uclibc build Message-ID: <20230220205149.3BB3F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21747875f90cb3345b6927ded9fffb7582cf06a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following uclibc build failure raised since bump to version 1.4.0 in commit 06a9dc3528847ec6c12a9b6188d4106e086eabe5 and https://github.com/smuellerDD/libkcapi/commit/12f19b9a1dd308117f83e8cb33e28e3c040710a0: lib/kcapi-kernel-if.c: In function '_kcapi_common_send_meta': lib/kcapi-kernel-if.c:196:26: error: conversion to 'int' from 'size_t' {aka 'unsigned int'} may change the sign of the result [-Werror=sign-conversion] 196 | msg.msg_iovlen = kcapi_downcast_int(iovlen); | ^~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/eccf4b84670b5ef0fdd68b46338edf5043c7cc0d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...01-lib-kcapi-kernel-if.c-fix-uclibc-build.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch b/package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch new file mode 100644 index 0000000000..818150dafb --- /dev/null +++ b/package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch @@ -0,0 +1,55 @@ +From 4d9bbc866682bdf46c78047dca02230372620295 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 6 Nov 2022 17:05:14 +0100 +Subject: [PATCH] lib/kcapi-kernel-if.c: fix uclibc build + +Fix the following uclibc build failure raised since version 1.4.0 and +https://github.com/smuellerDD/libkcapi/commit/12f19b9a1dd308117f83e8cb33e28e3c040710a0: + +lib/kcapi-kernel-if.c: In function '_kcapi_common_send_meta': +lib/kcapi-kernel-if.c:196:26: error: conversion to 'int' from 'size_t' {aka 'unsigned int'} may change the sign of the result [-Werror=sign-conversion] + 196 | msg.msg_iovlen = kcapi_downcast_int(iovlen); + | ^~~~~~~~~~~~~~~~~~ + +Indeed, uclibc has the same behavior than musl when __WORDSIZE != 32 +even if it defines __GLIBC__: +https://github.com/wbx-github/uclibc-ng/blob/ab1dd83bec59c9e65c31efd6e887182948f627be/libc/sysdeps/linux/common/bits/socket.h + +Fixes: + - http://autobuild.buildroot.org/results/eccf4b84670b5ef0fdd68b46338edf5043c7cc0d + +Signed-off-by: Tan En De +Signed-off-by: Fabrice Fontaine +Signed-off-by: Stephan Mueller +[Retrieved from: +https://github.com/smuellerDD/libkcapi/commit/4d9bbc866682bdf46c78047dca02230372620295] +--- + lib/kcapi-kernel-if.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/lib/kcapi-kernel-if.c b/lib/kcapi-kernel-if.c +index d7b10bf..b4d7f74 100644 +--- a/lib/kcapi-kernel-if.c ++++ b/lib/kcapi-kernel-if.c +@@ -119,7 +119,7 @@ int _kcapi_common_accept(struct kcapi_handle *handle) + return 0; + } + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !(defined(__UCLIBC__) && __WORDSIZE == 32) + static inline size_t kcapi_downcast_int(size_t in) + { + return in; +@@ -564,11 +564,7 @@ ssize_t _kcapi_common_recv_data(struct kcapi_handle *handle, + msg.msg_controllen = 0; + msg.msg_flags = 0; + msg.msg_iov = iov; +-#ifdef __GLIBC__ +- msg.msg_iovlen = iovlen; +-#else +- msg.msg_iovlen = (int)iovlen; +-#endif ++ msg.msg_iovlen = kcapi_downcast_int(iovlen); + ret = recvmsg(*_kcapi_get_opfd(handle), &msg, 0); + if (ret < 0) + ret = -errno; From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:26 -0000 Subject: [Buildroot] [git commit branch/next] package/vlc: fix opengl library check Message-ID: <20230220205150.C2B3186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0aad05cbf20c8e09834e9e1d78a3376cb89910b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/9710753984a38b8c6f83a136b39c3bc320ba558b/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../vlc/0012-opengl-missing-library-check.patch | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/package/vlc/0012-opengl-missing-library-check.patch b/package/vlc/0012-opengl-missing-library-check.patch new file mode 100644 index 0000000000..3a28fe34e3 --- /dev/null +++ b/package/vlc/0012-opengl-missing-library-check.patch @@ -0,0 +1,57 @@ +From 4ab41404cb85684125d73977cadebf83bbc246f5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sat, 22 Jan 2022 11:34:38 +0200 +Subject: [PATCH] opengl: missing library check + +Traditionally the presence of the header file was not considered +sufficient, though this was somewhat forgotten with the prevalence of +pkg-config. + +However most libraries have portable headers, while the shared library +is platform-dependent. It is common for the header to be present while +the library is absent with "multilib" installations (i.e. Linux +installation with multiple architectures). + +Downloaded from upstream commit: +https://code.videolan.org/videolan/vlc/-/commit/4ab41404cb85684125d73977cadebf83bbc246f5 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2f50808d597..0d57fadbf8b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3169,7 +3169,6 @@ have_gl="no" + PKG_CHECK_MODULES([GL], [gl], [ + have_gl="yes" + ], [ +- AC_MSG_CHECKING([for OpenGL]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #ifdef _WIN32 + # include +@@ -3179,13 +3178,17 @@ PKG_CHECK_MODULES([GL], [gl], [ + [int t0 = GL_TEXTURE0;]]) + ], [ + GL_CFLAGS="" +- have_gl="yes" + AS_IF([test "${SYS}" != "mingw32"], [ +- GL_LIBS="-lGL" ++ AC_CHECK_LIB([GL], [glTexture2D], [ ++ have_gl="yes" ++ GL_LIBS="-lGL" ++ ]) + ], [ ++ have_gl="yes" + GL_LIBS="-lopengl32" + ]) + ]) ++ AC_MSG_CHECKING([for OpenGL]) + AC_MSG_RESULT([${have_gl}]) + ]) + AM_CONDITIONAL([HAVE_GL], [test "${have_gl}" = "yes"]) +-- +GitLab + From yann.morin.1998 at free.fr Mon Feb 20 20:52:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:27 -0000 Subject: [Buildroot] [git commit branch/next] configs/amarula_a64_relic: remove defconfig Message-ID: <20230220205148.05B7086494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b93307815031399d9178b4a9be8628ed19d2d4b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234498966 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 - board/amarula/a64-relic/extlinux.conf | 4 - board/amarula/a64-relic/genimage.cfg | 11 --- board/amarula/a64-relic/post-build.sh | 4 - board/amarula/a64-relic/readme.txt | 90 ---------------------- .../lib/firmware/brcm/brcmfmac4330-sdio.txt | 83 -------------------- configs/amarula_a64_relic_defconfig | 63 --------------- 7 files changed, 256 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 9bd98da5ef..b099ce2f62 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1320,7 +1320,6 @@ F: board/orangepi/orangepi-prime/ F: board/orangepi/orangepi-win/ F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ -F: configs/amarula_a64_relic_defconfig F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig F: configs/bananapi_m1_defconfig diff --git a/board/amarula/a64-relic/extlinux.conf b/board/amarula/a64-relic/extlinux.conf deleted file mode 100644 index 9f469846bc..0000000000 --- a/board/amarula/a64-relic/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label linux-4.17.0-rc3 - kernel /Image - devicetree /sun50i-a64-amarula-relic.dtb - append console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p4 rootwait diff --git a/board/amarula/a64-relic/genimage.cfg b/board/amarula/a64-relic/genimage.cfg deleted file mode 100644 index 58b607f5fb..0000000000 --- a/board/amarula/a64-relic/genimage.cfg +++ /dev/null @@ -1,11 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-amarula-relic.dtb", - "extlinux" - } - } - - size = 64M -} diff --git a/board/amarula/a64-relic/post-build.sh b/board/amarula/a64-relic/post-build.sh deleted file mode 100755 index ec20fca7d9..0000000000 --- a/board/amarula/a64-relic/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/amarula/a64-relic/readme.txt b/board/amarula/a64-relic/readme.txt deleted file mode 100644 index 77f79e3094..0000000000 --- a/board/amarula/a64-relic/readme.txt +++ /dev/null @@ -1,90 +0,0 @@ -Amarula A64 Relic -================ - -Amarula A64-Relic is an Allwinner A64 based IoT device, which supports: -- Allwinner A64 Cortex-A53 -- Mali-400MP2 GPU -- AXP803 PMIC -- 1GB DDR3 RAM -- 8GB eMMC -- AP6330 Wifi/BLE -- MIPI-DSI -- CSI: OV5640 sensor -- USB OTG -- 12V DC power supply - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Amarual+A64-Relic - -Build -===== - - $ make amarula_a64_relic_defconfig - - $ make - -build files at output/images/: - - sunxi-spl.bin - - u-boot.itb - - Image - - sun50i-a64-amarula-relic.dtb - - boot.vfat - - rootfs.ext4 - -Write eMMC -========= - -The board comes with an operating system preloaded on the eMMC. -To replace it with the Buildroot-built system, take the following -steps - -1. Connect the board UART with host and open minicom(ttyUSBx/115200N8) - -2. Supply 12V DC for power-on the board. - -3. Interrupt U-Boot by pressing enter - -4. Create GPT partitions - => mmc dev 1 - => gpt write mmc 1 $partitions - -5. Connect the board USB-OTG with USB slot on the host. - -6. Initiate fastboot - => fastboot 0 - -7. Write images from host onto eMMC using fastboot - $ cd output/images - $ sudo fastboot -i 0x1f3a flash loader1 sunxi-spl.bin - $ sudo fastboot -i 0x1f3a flash loader2 u-boot.itb - $ sudo fastboot -i 0x1f3a flash esp boot.vfat - $ sudo fastboot -i 0x1f3a flash system rootfs.ext4 - -Update eMMC during Development -============================== - -During development, reflashing the entire filesystem image at every -change is time consuming. A useful alternative is to directly access -over USB the filesystem stored on the eMMC, using the USB Mass Storage -capability of U-Boot. To achieve this: - -1. Build U-Boot by enabling UMS - $ make uboot-menuconfig - (select CONFIG_CMD_USB_MASS_STORAGE=y) - -2. Follow all 6 steps from 'Write eMMC' and mount eMMC on host - => mmc dev 1 - => ums 0 mmc 1 - -WiFi -==== - - # wpa_passphrase ACCESSPOINTNAME >> /etc/wpa_supplicant.conf - (type password and enter) - # wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf -B - # udhcpc -i wlan0 - # ping google.com - --- -Jagan Teki -29-Jun-2018 diff --git a/board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt b/board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt deleted file mode 100644 index d095f24c26..0000000000 --- a/board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt +++ /dev/null @@ -1,83 +0,0 @@ -#AP6330_NVRAM_V1.0_20121130 -#Sample variables file for BCM94330 SD FC AGB board -manfid=0x2d0 -prodid=0x0547 -vendid=0x14e4 -devid=0x4360 -boardtype=0x05e1 -boardrev=0x1202 -boardflags=0x0080200 -nocrc=1 -xtalfreq=26000 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -ag0=254 -aa2g=1 -ccode=ALL -pa0itssit=0x20 -pa0b0=5587 -pa0b1=-633 -pa0b2=-158 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 -#rssi params for 5GHz -rssismf5g=0x4 -rssismc5g=0x3 -rssisav5g=0x7 -#PA parameters for lower a-band -pa1lob0=4748 -pa1lob1=-566 -pa1lob2=-180 -#PA parameters for midband -pa1b0=4762 -pa1b1=-593 -pa1b2=-172 -#PA parameters for high band -#pa1hib0=4596 -pa1hib0=4666 -pa1hib1=-619 -pa1hib2=-163 -rxpo5g=0 -maxp2ga0=74 -maxp5ga0=66 -maxp5gla0=66 -maxp5gha0=66 -# 2.4G Tx Power offsets -cck2gpo=0x2222 -ofdm2gpo=0x44444444 -mcs2gpo0=0x6666 -mcs2gpo1=0x6666 -# 5G Tx Power offsets -ofdm5gpo=0x44444444 -ofdm5glpo=0x44444444 -ofdm5ghpo=0x44444444 -mcs5gpo0=0x6666 -mcs5gpo1=0x6666 -mcs5glpo0=0x6666 -mcs5glpo1=0x6666 -mcs5ghpo0=0x6666 -mcs5ghpo1=0x6666 -sromrev=3 -il0macaddr=00:90:4c:c5:12:38 -wl0id=0x431b -cckPwrOffset=4 -swctrlmap_2g=0x44844484,0x42824282,0x40804484,0x18282,0x1ff -triso5g=0 -swctrlmap_5g=0x00100010,0x20202020,0x20202020,0x14202,0x0f0 -rfreg033=0x19 -rfreg033_cck=0x1f -dacrate2g=160 -dacrate5g=160 -txalpfbyp2g=1 -bphyscale=17 -cckPwrIdxCorr=-15 -pacalidx2g=50 -#pacalidx5g=20 -noise_cal_ref_2g=53 -noise_cal_po_2g=0 -noise_cal_ref_5g=52 -noise_cal_po_5g=5,0,0 -# 4330 OOB parameter: High level trigger -muxenab=0x10 - diff --git a/configs/amarula_a64_relic_defconfig b/configs/amarula_a64_relic_defconfig deleted file mode 100644 index 304a3ef824..0000000000 --- a/configs/amarula_a64_relic_defconfig +++ /dev/null @@ -1,63 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 4.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="amarula_a64_relic" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,v1.0a)/linux-amarula_v1.0a.tar.gz" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-amarula-relic" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Amarula A64-Relic" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_ANDROID_TOOLS=y -BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/amarula/a64-relic/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/amarula/a64-relic/post-build.sh" -BR2_ROOTFS_OVERLAY="board/amarula/a64-relic/rootfs_overlay" - -# wireless firmware -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y - -# wireless tools -BR2_PACKAGE_IW=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:27 -0000 Subject: [Buildroot] [git commit branch/next] package/ntfs-3g: security bump to version 2022.10.3 Message-ID: <20230220205150.9E59486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6facb6fa1022a6bc5aa6fbdbaf20b1a57f420259 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-40284: A buffer overflow was discovered in NTFS-3G before 2022.10.3. Crafted metadata in an NTFS image can cause code execution. A local attacker can exploit this if the ntfs-3g binary is setuid root. A physically proximate attacker can exploit this if NTFS-3G software is configured to execute upon attachment of an external storage device. https://github.com/tuxera/ntfs-3g/security/advisories/GHSA-v4w8-jv3w-7prm https://github.com/tuxera/ntfs-3g/releases/tag/2022.10.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ntfs-3g/ntfs-3g.hash | 2 +- package/ntfs-3g/ntfs-3g.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ntfs-3g/ntfs-3g.hash b/package/ntfs-3g/ntfs-3g.hash index 89bce73559..3fcba6af4d 100644 --- a/package/ntfs-3g/ntfs-3g.hash +++ b/package/ntfs-3g/ntfs-3g.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0489fbb6972581e1b417ab578d543f6ae522e7fa648c3c9b49c789510fd5eb93 ntfs-3g_ntfsprogs-2022.5.17.tgz +sha256 f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c ntfs-3g_ntfsprogs-2022.10.3.tgz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f COPYING.LIB diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk index 64800c5eeb..62c515d50f 100644 --- a/package/ntfs-3g/ntfs-3g.mk +++ b/package/ntfs-3g/ntfs-3g.mk @@ -4,7 +4,7 @@ # ################################################################################ -NTFS_3G_VERSION = 2022.5.17 +NTFS_3G_VERSION = 2022.10.3 NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz NTFS_3G_SITE = http://tuxera.com/opensource NTFS_3G_CONF_OPTS = --disable-ldconfig From yann.morin.1998 at free.fr Mon Feb 20 20:52:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:28 -0000 Subject: [Buildroot] [git commit branch/next] configs/orangepi_win: remove defconfig Message-ID: <20230220205148.EE6BA828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5099a1058d93821399ea758c5227e1fbbe6f76de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499145 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/orangepi/orangepi-win/boot.cmd | 6 ---- board/orangepi/orangepi-win/genimage.cfg | 40 -------------------------- board/orangepi/orangepi-win/readme.txt | 37 ------------------------ configs/orangepi_win_defconfig | 48 -------------------------------- 5 files changed, 133 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 89a72bc923..81e6cd54ab 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1303,7 +1303,6 @@ F: board/olimex/a33_olinuxino/ F: board/olimex/a64-olinuxino/ F: board/orangepi/orangepi-lite2/ F: board/orangepi/orangepi-one-plus -F: board/orangepi/orangepi-win/ F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ F: configs/amarula_vyasa_rk3288_defconfig @@ -1317,7 +1316,6 @@ F: configs/olimex_a33_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig F: configs/orangepi_lite2_defconfig F: configs/orangepi_one_plus_defconfig -F: configs/orangepi_win_defconfig F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig diff --git a/board/orangepi/orangepi-win/boot.cmd b/board/orangepi/orangepi-win/boot.cmd deleted file mode 100644 index 2ddb769d6d..0000000000 --- a/board/orangepi/orangepi-win/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-a64-orangepi-win.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-win/genimage.cfg b/board/orangepi/orangepi-win/genimage.cfg deleted file mode 100644 index 98fd1a033d..0000000000 --- a/board/orangepi/orangepi-win/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-orangepi-win.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-win/readme.txt b/board/orangepi/orangepi-win/readme.txt deleted file mode 100644 index 93adddd86b..0000000000 --- a/board/orangepi/orangepi-win/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Orangepi Win/Win Plus. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Orangepi Win/Win Plus link: -http://www.orangepi.org/OrangePiWin_WinPlus/ - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Win - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make orangepi_win_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Orangepi Win/Win Plus and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/orangepi_win_defconfig b/configs/orangepi_win_defconfig deleted file mode 100644 index 715ff3b711..0000000000 --- a/configs/orangepi_win_defconfig +++ /dev/null @@ -1,48 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_win" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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-win/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-orangepi-win" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Win/Win Plus" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-win/genimage.cfg" From peter at korsgaard.com Mon Feb 20 20:52:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:28 -0000 Subject: [Buildroot] [git commit branch/next] docs/website: update for 2022.08.2 Message-ID: <20230220205151.29D518648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc9b716296f37e0e3e47fd34c8991e92b6baeebd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 9f2a81eb2b..c042f34887 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@
-

Latest stable release: 2022.08.1

+

Latest stable release: 2022.08.2

- +
- +
-

buildroot-2022.08.1.tar.gz

-

PGP signature

+

buildroot-2022.08.2.tar.gz

+

PGP signature

- +
- +
-

buildroot-2022.08.1.tar.xz

-

PGP signature

+

buildroot-2022.08.2.tar.xz

+

PGP signature

diff --git a/docs/website/news.html b/docs/website/news.html index ba6e85f2e3..d8d2a14cd1 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

News

    +
  • +
    +
    +
    +

    2022.08.2 released

    +

    16 November 2022

    +
    +
    +

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

    +
    +
    +
    • +
  • From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:29 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: drop entry related to inexisting directory Message-ID: <20230220205149.C11CD828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dfbdb72103dff293fc7688872de91aaa9469d559 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 4e7dfe20bb8cf0cccfbd177321eff73e82c8d940 ("configs/friendlyarm_nanopi_m4: remove defconfig") forgot to fully reflect the removal of the defconfig in the DEVELOPERS file, causing a get-developers warning: WARNING: 'board/friendlyarm/nanopi-m4' doesn't match any file Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index bd76ddca28..826e04d805 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2728,7 +2728,6 @@ F: package/hwloc/ F: package/powertop/ N: Suniel Mahesh -F: board/friendlyarm/nanopi-m4 F: board/pine64/rockpro64 F: board/radxa/rockpi-n8 F: configs/rock_pi_n8_defconfig From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:29 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-net-ssleay: bump to version 1.93_01 Message-ID: <20230220205150.CEB7581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=191fa1718f7f61ad9846a37c6f0c86a3b713e81c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Refresh patch - Drop -lz from Makefile with libressl as this is the only solution for now: https://github.com/radiator-software/p5-net-ssleay/issues/399 - License has been clarified to be Artistic-2.0 since version 1.86.11: https://github.com/radiator-software/p5-net-ssleay/commit/aa4a0206d6d2a5ac2998dd9d6a8c5b88902c04de - This bump will fix the following build failure with libressl: In file included from /home/autobuild/autobuild/instance-11/output-1/host/armeb-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/perl5/5.34.1/armeb-linux/CORE/perl.h:5748, from SSLeay.xs:141: SSLeay.xs: In function 'XS_Net__SSLeay_SESSION_get_master_key': SSLeay.xs:5569:37: error: invalid use of incomplete typedef 'SSL_SESSION' {aka 'struct ssl_session_st'} 5569 | sv_setpvn(ST(0), (const char*)s->master_key, s->master_key_length); | ^~ https://metacpan.org/release/CHRISN/Net-SSLeay-1.93_01/changes Fixes: - http://autobuild.buildroot.org/results/71337cc496727f2b1173c055d706c5bfc2f5d2bc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../perl-net-ssleay/0001-fix-build-system.patch | 30 +++++++++++----------- package/perl-net-ssleay/perl-net-ssleay.hash | 6 ++--- package/perl-net-ssleay/perl-net-ssleay.mk | 13 +++++++--- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/package/perl-net-ssleay/0001-fix-build-system.patch b/package/perl-net-ssleay/0001-fix-build-system.patch index a6cd0f9ceb..a5ccf464ba 100644 --- a/package/perl-net-ssleay/0001-fix-build-system.patch +++ b/package/perl-net-ssleay/0001-fix-build-system.patch @@ -8,29 +8,29 @@ paths, since they are missing the destdir; Buildroot compilers and linkers already know where to search, anyway. Signed-off-by: "Yann E. MORIN" +[Fabrice: update for 1.93_01] +Signed-off-by: Fabrice Fontaine diff -durN perl-net-ssleay-1.64.orig/inc/Module/Install/PRIVATE/Net/SSLeay.pm perl-net-ssleay-1.64/inc/Module/Install/PRIVATE/Net/SSLeay.pm ---- perl-net-ssleay-1.64.orig/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2014-04-01 08:08:37.000000000 +0200 -+++ perl-net-ssleay-1.64/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2014-07-13 00:38:46.281380282 +0200 -@@ -37,14 +37,18 @@ - exit 0; # according http://wiki.cpantesters.org/wiki/CPANAuthorNotes this is best-practice when "missing library" +--- perl-net-ssleay-1.64.orig/Makefile.PL 2014-04-01 08:08:37.000000000 +0200 ++++ perl-net-ssleay-1.64/Makefile.PL 2014-07-13 00:38:46.281380282 +0200 +@@ -192,12 +192,16 @@ + exit MISSING_PREREQ; } -- $self->check_openssl_version($prefix, $exec); +- check_openssl_version($prefix, $exec); +# Does not work for cross-compilation. +# In Buildroot, we do have a supported version. -+# $self->check_openssl_version($prefix, $exec); - my $opts = $self->ssleay_get_build_opts($prefix, $exec); - - $self->makemaker_args( ++# check_openssl_version($prefix, $exec); + my %args = ( CCCDLFLAGS => $opts->{cccdlflags}, OPTIMIZE => $opts->{optimize}, -- INC => join(' ', map {"-I$_"} @{$opts->{inc_paths}}), -- LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), +- INC => qq{-I"$opts->{inc_path}"}, +- LIBS => join(' ', (map '-L'.maybe_quote($_), @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), +# Buildroot already has the correct include and library search paths. -+# INC => join(' ', map {"-I$_"} @{$opts->{inc_paths}}), -+# LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), ++# INC => qq{-I"$opts->{inc_path}"}, ++# LIBS => join(' ', (map '-L'.maybe_quote($_), @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), + LIBS => join(' ', (map {"-l$_"} @{$opts->{lib_links}})), ); - - if ( $self->prompt( + # From HMBRAND to handle multple version of OPENSSL installed + if (my $lp = join " " => map '-L'.maybe_quote($_), @{$opts->{lib_paths} || []}) diff --git a/package/perl-net-ssleay/perl-net-ssleay.hash b/package/perl-net-ssleay/perl-net-ssleay.hash index 7502a60ad1..9caff68edd 100644 --- a/package/perl-net-ssleay/perl-net-ssleay.hash +++ b/package/perl-net-ssleay/perl-net-ssleay.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d602bdce4e0531c6efc276e3e429ca69 Net-SSLeay-1.85.tar.gz -sha256 9d8188b9fb1cae3bd791979c20554925d5e94a138d00414f1a6814549927b0c8 Net-SSLeay-1.85.tar.gz +md5 c73821e9790b3bdb3471d9b8faf48bbb Net-SSLeay-1.93_01.tar.gz +sha256 876d022fbc719631b11d6bb4b6e78db3c19bbca578093c376c8f9900a4432aa3 Net-SSLeay-1.93_01.tar.gz # computed by scancpan -sha256 b55065185a2172d9f2ea2dd87c18c206ea3dc45a64e5f3deb3eee34d839dc822 LICENSE +sha256 685e534b60d4e2b4fbb1a259a83b5a86e877a919bbb9efc95994276f706a3a71 LICENSE diff --git a/package/perl-net-ssleay/perl-net-ssleay.mk b/package/perl-net-ssleay/perl-net-ssleay.mk index 80ce8b9cc7..8b7b2b973b 100644 --- a/package/perl-net-ssleay/perl-net-ssleay.mk +++ b/package/perl-net-ssleay/perl-net-ssleay.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_NET_SSLEAY_VERSION = 1.85 +PERL_NET_SSLEAY_VERSION = 1.93_01 PERL_NET_SSLEAY_SOURCE = Net-SSLeay-$(PERL_NET_SSLEAY_VERSION).tar.gz -PERL_NET_SSLEAY_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIKEM +PERL_NET_SSLEAY_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CH/CHRISN PERL_NET_SSLEAY_DEPENDENCIES = openssl -PERL_NET_SSLEAY_LICENSE = OpenSSL +PERL_NET_SSLEAY_LICENSE = Artistic-2.0 PERL_NET_SSLEAY_LICENSE_FILES = LICENSE PERL_NET_SSLEAY_DISTNAME = Net-SSLeay @@ -24,4 +24,11 @@ define PERL_NET_SSLEAY_FIX_MAKEFILE endef PERL_NET_SSLEAY_POST_CONFIGURE_HOOKS += PERL_NET_SSLEAY_FIX_MAKEFILE +ifeq ($(BR2_PACKAGE_LIBRESSL),y) +define PERL_NET_SSLEAY_DROP_ZLIB_MAKEFILE + $(SED) "s/-lz//" $(@D)/Makefile +endef +PERL_NET_SSLEAY_POST_CONFIGURE_HOOKS += PERL_NET_SSLEAY_DROP_ZLIB_MAKEFILE +endif + $(eval $(perl-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:30 -0000 Subject: [Buildroot] [git commit branch/next] package/libkcapi: disable -Werror Message-ID: <20230220205149.6780E86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f6c257638cf2598cad123afa8cdbf84437de072 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following musl build failure (disabling -Werror seems to be the only "solution": https://github.com/smuellerDD/libkcapi/issues/136): lib/kcapi-kernel-if.c: In function '_kcapi_common_send_meta': lib/kcapi-kernel-if.c:212:12: error: unsigned conversion from 'long int' to 'long unsigned int' changes value from '-4' to '4294967292' [-Werror=sign-conversion] 212 | header = CMSG_NXTHDR(&msg, header); | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/c789d43e71e6075e297bef58d888228a89055bbc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libkcapi/0002-Add-disable-werror.patch | 46 ++++++++++++++++++++++++++ package/libkcapi/libkcapi.mk | 1 + 2 files changed, 47 insertions(+) diff --git a/package/libkcapi/0002-Add-disable-werror.patch b/package/libkcapi/0002-Add-disable-werror.patch new file mode 100644 index 0000000000..4f2f55f145 --- /dev/null +++ b/package/libkcapi/0002-Add-disable-werror.patch @@ -0,0 +1,46 @@ +From c27b154f03ad7e94447c7114d73aee60f0098093 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 7 Nov 2022 13:38:06 +0100 +Subject: [PATCH] Add --disable-werror + +Allow the user to disable -Werror through --disable-werror + +Signed-off-by: Fabrice Fontaine +Signed-off-by: Stephan Mueller +[Retrieved from: +https://github.com/smuellerDD/libkcapi/commit/c27b154f03ad7e94447c7114d73aee60f0098093] +--- + Makefile.am | 5 ++++- + configure.ac | 3 +++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 1c95d3d..cddedac 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I m4 + AUTOMAKE_OPTIONS = subdir-objects + lib_LTLIBRARIES = libkcapi.la + +-COMMON_CPPFLAGS = -Wextra -Wall -pedantic -fwrapv --param ssp-buffer-size=4 -O2 -Werror -std=gnu99 -Wconversion ++COMMON_CPPFLAGS = -Wextra -Wall -pedantic -fwrapv --param ssp-buffer-size=4 -O2 -std=gnu99 -Wconversion ++if ENABLE_WERROR ++COMMON_CPPFLAGS += -Werror ++endif + COMMON_LDFLAGS = -Wl,-z,relro,-z,now + + libtool: $(LIBTOOL_DEPS) +diff --git a/configure.ac b/configure.ac +index cb910e2..e230577 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,6 +76,9 @@ AX_ADD_FORTIFY_SOURCE + + AC_CHECK_API_VERSION + ++AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror], [Disable -Werror])], [with_werror=$enableval], [with_werror=yes]) ++AM_CONDITIONAL([ENABLE_WERROR], [test "x$with_werror" = "xyes"]) ++ + AC_ARG_ENABLE([kcapi-test], [AS_HELP_STRING([--enable-kcapi-test], [Compile kcapi test program])], [with_kcapi_test=$enableval]) + AM_CONDITIONAL([ENABLE_KCAPI_TEST], [test "x$with_kcapi_test" = "xyes"]) + diff --git a/package/libkcapi/libkcapi.mk b/package/libkcapi/libkcapi.mk index e88928a74d..c6251c286c 100644 --- a/package/libkcapi/libkcapi.mk +++ b/package/libkcapi/libkcapi.mk @@ -15,6 +15,7 @@ LIBKCAPI_CONF_ENV = \ ac_cv_path_DB2PDF="" \ ac_cv_path_DB2PS="" \ ac_cv_path_XMLTO="" +LIBKCAPI_CONF_OPTS = --disable-werror LIBKCAPI_MAKE_OPTS = CPPFLAGS="$(TARGET_CPPFLAGS)" ifeq ($(BR2_PACKAGE_LIBKCAPI_ASYM),y) From peter at korsgaard.com Mon Feb 20 20:52:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:30 -0000 Subject: [Buildroot] [git commit branch/next] package/rsync: fix configure options Message-ID: <20230220205151.5F62D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8b5feee87be5157e93665011b3c350f6996dfcc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Rename configure options to avoid the following build failure raised since bump to version 3.2.5 in commit ae2807821d897c16141d003f646475fee9e77cba: ./simd-checksum-x86_64.cpp: In function 'uint32_t get_checksum1_cpp(char*, int32_t)': ./simd-checksum-x86_64.cpp:89:52: error: multiversioning needs 'ifunc' which is not supported on this target 89 | __attribute__ ((target("default"))) MVSTATIC int32 get_checksum1_avx2_64(schar* buf, int32 len, int32 i, uint32* ps1, uint32* ps2) { return i; } | ^~~~~~~~~~~~~~~~~~~~~ ./simd-checksum-x86_64.cpp:480:1: error: use of multiversioned function without a default 480 | } | ^ If you can't fix the issue, re-run ./configure with --disable-roll-simd. Fixes: - http://autobuild.buildroot.org/results/069da8e585da2e51bfd4f475cc12b9a134954b08 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/rsync/rsync.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 7ff7ca6eef..8c7ad462ac 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -17,12 +17,12 @@ RSYNC_CONF_ENV = rsync_cv_HAVE_C99_VSNPRINTF=yes RSYNC_CONF_OPTS = \ --with-included-zlib=no \ --with-included-popt=no \ - --disable-simd \ + --disable-roll-simd \ --disable-openssl \ --disable-xxhash \ --disable-zstd \ --disable-lz4 \ - --disable-asm + --disable-md5-asm ifeq ($(BR2_PACKAGE_ACL),y) RSYNC_DEPENDENCIES += acl From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:31 -0000 Subject: [Buildroot] [git commit branch/next] configs/rock_pi_4: remove defconfig Message-ID: <20230220205149.9DCD0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=707938d6848ce945e07ca779748b49b27bdaf222 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3259671395 Cc: Suniel Mahesh Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 -- board/radxa/rockpi-4/extlinux.conf | 4 --- board/radxa/rockpi-4/genimage.cfg | 39 ------------------------ board/radxa/rockpi-4/post-build.sh | 5 ---- board/radxa/rockpi-4/readme.txt | 61 -------------------------------------- configs/rock_pi_4_defconfig | 55 ---------------------------------- 6 files changed, 166 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index c282a867ce..ae20554f91 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2730,10 +2730,8 @@ F: package/powertop/ N: Suniel Mahesh F: board/friendlyarm/nanopi-m4 F: board/pine64/rockpro64 -F: board/radxa/rockpi-4 F: board/radxa/rockpi-n8 F: board/radxa/rockpi-n10 -F: configs/rock_pi_4_defconfig F: configs/rock_pi_n8_defconfig F: configs/rock_pi_n10_defconfig F: configs/rockpro64_defconfig diff --git a/board/radxa/rockpi-4/extlinux.conf b/board/radxa/rockpi-4/extlinux.conf deleted file mode 100644 index 83374f174a..0000000000 --- a/board/radxa/rockpi-4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_ROCK_PI_4 linux - kernel /Image - devicetree /rk3399-rock-pi-4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/board/radxa/rockpi-4/genimage.cfg b/board/radxa/rockpi-4/genimage.cfg deleted file mode 100644 index 9f64e96970..0000000000 --- a/board/radxa/rockpi-4/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-rock-pi-4.dtb", - "extlinux" - } - } - - size = 112M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = F - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/board/radxa/rockpi-4/post-build.sh b/board/radxa/rockpi-4/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/board/radxa/rockpi-4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/radxa/rockpi-4/readme.txt b/board/radxa/rockpi-4/readme.txt deleted file mode 100644 index 1db7569ed9..0000000000 --- a/board/radxa/rockpi-4/readme.txt +++ /dev/null @@ -1,61 +0,0 @@ -RADXA ROCK_PI_4 -================ -https://rockpi.org/rockpi4 - -ROCK Pi 4 is a Single Board Computer (SBC) from radxa. This guide is valid -for the below models: -- ROCK PI 4 Model A -- ROCK PI 4 Model B -- ROCK PI 4 Model C - -Build: -====== - $ make rock_pi_4_defconfig - $ make - -Files created in output directory -================================= - -output/images - -????????? bl31.elf -????????? boot.vfat -????????? extlinux -????????? idbloader.img -????????? Image -????????? rk3399-rock-pi-4.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device. - -Booting: -======== - -Serial console: ---------------- -RockPi4 has a 40-pin GPIO header. The pin layout is as follows: - -pin 6: gnd -pin 8: tx -pin 10: rx - -Baudrate for this board is 1500000. - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -Wiki link: -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/rock-pi-4.html diff --git a/configs/rock_pi_4_defconfig b/configs/rock_pi_4_defconfig deleted file mode 100644 index 401a59bac4..0000000000 --- a/configs/rock_pi_4_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/amarula/u-boot-amarula.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="cf2747360fdd1eb0d51dd01a984c7c62c7f714fe" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock-pi-4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.46" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rock-pi-4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="rockpi4" -BR2_TARGET_GENERIC_ISSUE="Welcome to ROCK_PI_4" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="96M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rockpi-4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rockpi-4/post-build.sh" From yann.morin.1998 at free.fr Mon Feb 20 20:52:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:31 -0000 Subject: [Buildroot] [git commit branch/next] package/xterm: security bump to patch 376 Message-ID: <20230220205151.A53CA86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0cc7c63f91ffadb0835bb57cdb7bfffdf7803add branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issue: CVE-2022-45063: xterm before 375 allows code execution via font ops, e.g., because an OSC 50 response may have Ctrl-g and therefore lead to command execution within the vi line-editing mode of Zsh: https://www.openwall.com/lists/oss-security/2022/11/10/1 Additionally, patch 376 fixes a null pointer access issue: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1022942 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/xterm/xterm.hash | 2 +- package/xterm/xterm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index 3f6ec765ce..12cd2e639b 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 32f888277b19e28ebc0a3112bff000607c07bed0679caa0beebb36f9cad484f5 xterm-371.tgz +sha256 1e5bb7aad068fb31d6d3cbb77f80c7ad1526cd4c956a4ddcf2c5cf28af5334e1 xterm-376.tgz # Locally calculated sha256 9521ef761474cd31ea406f56a751646a7b42a9287cdc6f2f8e52ed4c4d2a73e7 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index 95984f1cf9..d01b608d99 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 371 +XTERM_VERSION = 376 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From yann.morin.1998 at free.fr Mon Feb 20 20:52:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:32 -0000 Subject: [Buildroot] [git commit branch/next] package/libksba: security bump to version 1.6.2 Message-ID: <20230220205151.7A4C886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c0311220fb627db8af4a2cd8c3adb067e8a308d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A severe bug has been found in Libksba , the library used by GnuPG for parsing the ASN.1 structures as used by S/MIME. The bug affects all versions of Libksba before 1.6.2 and may be used for remote code execution. Fix CVE-2022-3515 Signed-off-by: Michael Fischer Signed-off-by: Yann E. MORIN --- package/libksba/libksba.hash | 2 +- package/libksba/libksba.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libksba/libksba.hash b/package/libksba/libksba.hash index 422048be5f..77485c0cb6 100644 --- a/package/libksba/libksba.hash +++ b/package/libksba/libksba.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b libksba-1.6.0.tar.bz2 +sha256 fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971 libksba-1.6.2.tar.bz2 # Hash for license files: sha256 8f1b87e551d97b2b23b6d3403a5d598c63ea89824cb8ee351f631f6cab2beaa5 AUTHORS diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index ca5fc1d749..3a8b3fa502 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKSBA_VERSION = 1.6.0 +LIBKSBA_VERSION = 1.6.2 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:32 -0000 Subject: [Buildroot] [git commit branch/next] configs/roc_pc_rk3399: remove defconfig Message-ID: <20230220205149.90AAF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5370ec74516495a4ac6c0bc9780b8e92a2f1e6b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3259671226 Cc: Suniel Mahesh Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 -- board/firefly/roc-rk3399-pc/extlinux.conf | 4 ---- board/firefly/roc-rk3399-pc/genimage.cfg | 22 ----------------- board/firefly/roc-rk3399-pc/post-build.sh | 5 ---- board/firefly/roc-rk3399-pc/readme.txt | 40 ------------------------------- 5 files changed, 73 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 81e6cd54ab..c282a867ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2728,13 +2728,11 @@ F: package/hwloc/ F: package/powertop/ N: Suniel Mahesh -F: board/firefly/ F: board/friendlyarm/nanopi-m4 F: board/pine64/rockpro64 F: board/radxa/rockpi-4 F: board/radxa/rockpi-n8 F: board/radxa/rockpi-n10 -F: configs/roc_pc_rk3399_defconfig F: configs/rock_pi_4_defconfig F: configs/rock_pi_n8_defconfig F: configs/rock_pi_n10_defconfig diff --git a/board/firefly/roc-rk3399-pc/extlinux.conf b/board/firefly/roc-rk3399-pc/extlinux.conf deleted file mode 100644 index 50a358fadc..0000000000 --- a/board/firefly/roc-rk3399-pc/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399RocPC linux - kernel /boot/Image - devicetree /boot/rk3399-roc-pc.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p1 rootwait diff --git a/board/firefly/roc-rk3399-pc/genimage.cfg b/board/firefly/roc-rk3399-pc/genimage.cfg deleted file mode 100644 index 966c869273..0000000000 --- a/board/firefly/roc-rk3399-pc/genimage.cfg +++ /dev/null @@ -1,22 +0,0 @@ -image sdcard.img { - hdimage { - } - - partition u-boot-tpl-spl-dtb { - in-partition-table = "no" - image = "idbloader.img" - offset = 32K - } - - partition u-boot-dtb { - in-partition-table = "no" - image = "u-boot.itb" - offset = 8M - size = 30M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/firefly/roc-rk3399-pc/post-build.sh b/board/firefly/roc-rk3399-pc/post-build.sh deleted file mode 100755 index 1f5ff6a611..0000000000 --- a/board/firefly/roc-rk3399-pc/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/firefly/roc-rk3399-pc/readme.txt b/board/firefly/roc-rk3399-pc/readme.txt deleted file mode 100644 index 8a6f1cdee6..0000000000 --- a/board/firefly/roc-rk3399-pc/readme.txt +++ /dev/null @@ -1,40 +0,0 @@ -Libre Computer Board ROC-RK3399-PC -=================================== - -Build: - - $ make roc_pc_rk3399_defconfig - $ make - -Files created in output directory -================================= - -output/images - -????????? bl31.elf -????????? idbloader.img -????????? Image -????????? rk3399-roc-pc.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device - -Serial console --------------- - -Baudrate for this board is 1500000 - -Wiki link: -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/roc-rk3399-pc.html From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:33 -0000 Subject: [Buildroot] [git commit branch/next] package/alsa-utils: update dependency for topology support Message-ID: <20230220205149.DA3358648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e62cf8d9025506ebcb9c1b1d3bb49523474851eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is a follow-up patch for https://git.busybox.net/buildroot/commit/?id=28497102e1788df3628bd3324a3304a03c7942d0 which created a new option for topology support in alsa-lib, this dependency was not ported over to alsa-utils. Fixes: http://autobuild.buildroot.net/results/a9c9f5157365efe8271bf69dab0d5a5532b196ea/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/alsa-utils/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in index 555f06fd21..3429d0b406 100644 --- a/package/alsa-utils/Config.in +++ b/package/alsa-utils/Config.in @@ -46,6 +46,7 @@ config BR2_PACKAGE_ALSA_UTILS_ALSAUCM config BR2_PACKAGE_ALSA_UTILS_ALSATPLG bool "alsatplg" depends on !BR2_STATIC_LIBS # dlfcn.h + select BR2_PACKAGE_ALSA_LIB_TOPOLOGY comment "alsatplg needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS From yann.morin.1998 at free.fr Mon Feb 20 20:52:33 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:33 -0000 Subject: [Buildroot] [git commit branch/next] package/openpgm: fix build for non-x86 targets Message-ID: <20230220205151.B1F8F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f706ebb2cf325565f12b532c84a9d5ebe14d0d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next openpgm-5-3-128 has assembly code for x86 that is not guarded by architecture defines. A patch to fix that has been merged upstream some time ago, and the next release will have it. This includes that patch for the time being. Fixes: http://autobuild.buildroot.net/results/338291e5bf0671cb7ed7a32cc10e546c7a521acc Fixes: http://autobuild.buildroot.net/results/3ab6d7f9ee841fa18c1c220d722b1c06ca1fff30 Fixes: http://autobuild.buildroot.net/results/68e840b1fec8f14775cef0b6a14d9b847337324b Signed-off-by: Alexander Lukichev Signed-off-by: Yann E. MORIN --- package/openpgm/0003-fix-build-on-macOS-ARM.patch | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/package/openpgm/0003-fix-build-on-macOS-ARM.patch b/package/openpgm/0003-fix-build-on-macOS-ARM.patch new file mode 100644 index 0000000000..5769c5d7f1 --- /dev/null +++ b/package/openpgm/0003-fix-build-on-macOS-ARM.patch @@ -0,0 +1,34 @@ +From 43dfc3e3a66b8e4584eb46219b129197a2428181 Mon Sep 17 00:00:00 2001 +From: Michael Cho +Date: Thu, 10 Mar 2022 22:46:29 -0800 +Subject: [PATCH] fix build on macOS ARM + +[alexander.lukichev at gmail.com: backport from upstream] +Signed-off-by: Alexander Lukichev +--- + openpgm/pgm/cpu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/openpgm/pgm/cpu.c b/openpgm/pgm/cpu.c +index cbcc988..f5da471 100644 +--- a/openpgm/pgm/cpu.c ++++ b/openpgm/pgm/cpu.c +@@ -33,6 +33,7 @@ + //#define CPU_DEBUG + + ++#if defined(__i386__) || defined(__x86_64__) + #ifndef _MSC_VER + static + void +@@ -59,7 +60,6 @@ _xgetbv(uint32_t xcr) { + #endif + + +-#if defined(__i386__) || defined(__x86_64__) + PGM_GNUC_INTERNAL + void + pgm_cpuid (pgm_cpu_t* cpu) +-- +2.37.2 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:34 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx/imx-gpu-viv: drop X11 output Message-ID: <20230220205232.F1954828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=424f53ac0730ea8e8aac4f3341f25a9829582cbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since e8df0f7 (package/freescale-imx/imx-gpu-viv: bump to version 6.4.3.p4.4) the X11 folder is no longer included in the archive. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ++++++ package/freescale-imx/imx-gpu-viv/Config.in | 22 ++++------------------ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 16 +--------------- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6d66f1b958..41c5fdefb3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 + bool "imx-gpu-viv X11 output has been removed" + select BR2_LEGACY + help + The X11 output was dropped by NXP. + config BR2_PACKAGE_QEMU_CUSTOM_TARGETS string "the QEMU specific targets option has been removed" help diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index 9ba3d0428e..9372b6313f 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -27,9 +27,9 @@ config BR2_PACKAGE_IMX_GPU_VIV Userspace libraries for Vivante GPU on i.MX platforms It contains libraries and headers for GLES, OpenCL, and - OpenVG. It also contains a DRI plugin for X11. It also - contains a plugin for DirectFB-1.4.0, but that doesn't work - together with buildroot's DirectFB version. + OpenVG. It also contains a plugin for DirectFB-1.4.0, but + that doesn't work together with buildroot's DirectFB + version. This library is provided by Freescale as-is and doesn't have an upstream. @@ -40,22 +40,9 @@ choice prompt "Output option" help There are two versions of this library: one for - direct framebuffer access, one for X11 rendering. + direct framebuffer access, one for wayland rendering. Choose here which version to install. -config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - bool "X11" - depends on BR2_PACKAGE_XORG7 - # The i.MX8 blob doesn't support X11 output - depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXFIXES - -comment "X11 backend needs Xorg package" - depends on !BR2_PACKAGE_XORG7 - depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M - config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB bool "Framebuffer" # The i.MX8 blob doesn't support FB output @@ -70,7 +57,6 @@ endchoice config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT string - default "x11" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 default "fb" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB default "wayland" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 06fbbc7343..e0e8a31533 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -26,14 +26,6 @@ endif IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT)) -ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -# The libGAL.so library provided by imx-gpu-viv uses X functions. Packages -# may want to link against libGAL.so (QT5 Base with OpenGL and X support -# does so). For this to work we need build dependencies to libXdamage, -# libXext and libXfixes so that X functions used in libGAL.so are referenced. -IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes -endif - # Libraries are linked against libdrm, except framebuffer output on ARM ifneq ($(IMX_GPU_VIV_LIB_TARGET)$(BR2_arm),fby) IMX_GPU_VIV_DEPENDENCIES += libdrm @@ -55,12 +47,6 @@ else ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland) define IMX_GPU_VIV_FIXUP_PKGCONFIG ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc endef -else ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -define IMX_GPU_VIV_FIXUP_PKGCONFIG - $(foreach lib,egl glesv1_cm glesv2 vg, \ - ln -sf $(lib)_x11.pc $(@D)/gpu-core/usr/lib/pkgconfig/$(lib).pc - ) -endef endif # Instead of building, we fix up the inconsistencies that exist @@ -68,7 +54,7 @@ endif # Make sure these commands are idempotent. define IMX_GPU_VIV_BUILD_CMDS cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_LIB_TARGET)/* $(@D)/gpu-core/usr/lib/ - $(foreach backend,fb x11 wayland, \ + $(foreach backend,fb wayland, \ $(RM) -r $(@D)/gpu-core/usr/lib/$(backend) ) $(IMX_GPU_VIV_FIXUP_PKGCONFIG) From yann.morin.1998 at free.fr Mon Feb 20 20:52:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:34 -0000 Subject: [Buildroot] [git commit branch/next] packages/sudo: explicitly set enable-tmpfiles.d Message-ID: <20230220205150.294C98648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c333176a3dae8aa4fa5468e3345d71bc10c44ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next sudo's configure script looks up on the host to determine the path where to install its systemd tmpfiles. That is incorrect in cross-compilation. We can explicitly tell sudo where to install its tmpfiles, which we do when systemd is enabled (in Buildroot, systemd-tmpfiles is always enabled when systemd is), or we can tell it not to install tmpfiles at all, which we do otherwise. Signed-off-by: Nuno Gon??alves [yann.morin.1998 at free.fr: reword and extend commit log] Signed-off-by: Yann E. MORIN --- package/sudo/sudo.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 28cfcbb1e2..8e237bd36a 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -17,6 +17,7 @@ SUDO_SELINUX_MODULES = sudo SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \ --with-tzdir=$(if $(BR2_PACKAGE_TZDATA),/usr/share/zoneinfo,no) \ + --enable-tmpfiles.d=$(if $(BR2_PACKAGE_SYSTEMD),/usr/lib/tmpfiles.d,no) \ --without-lecture \ --without-sendmail \ --without-umask \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:34 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx/imx-gpu-viv: add platform specific drivers Message-ID: <20230220205233.19B2B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=838c9a33be603e59ff7f65041bbcc138e573d13f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since e8df0f7 (package/freescale-imx/imx-gpu-viv: bump to version 6.4.3.p4.4) the archive contains platform specific drivers that need to be copied and included. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-viv/Config.in | 8 ++++++++ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index 9372b6313f..3e095b730c 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -77,6 +77,14 @@ if BR2_aarch64 config BR2_PACKAGE_PROVIDES_LIBGBM default "imx-gpu-viv" +config BR2_PACKAGE_IMX_GPU_VIV_PLATFORM + string + default "mx8mn" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + default "mx8mp" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + default "mx8mq" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + default "mx8qm" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + default "mx8qxp" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + endif config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index e0e8a31533..f72735e093 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -49,6 +49,13 @@ define IMX_GPU_VIV_FIXUP_PKGCONFIG endef endif +IMX_GPU_VIV_PLATFORM_DIR = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_PLATFORM)) +ifneq ($(IMX_GPU_VIV_PLATFORM_DIR),) +define IMX_GPU_VIV_COPY_PLATFORM + cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_PLATFORM_DIR)/* $(@D)/gpu-core/usr/lib/ +endef +endif + # Instead of building, we fix up the inconsistencies that exist # in the upstream archive here. We also remove unused backend files. # Make sure these commands are idempotent. @@ -57,6 +64,10 @@ define IMX_GPU_VIV_BUILD_CMDS $(foreach backend,fb wayland, \ $(RM) -r $(@D)/gpu-core/usr/lib/$(backend) ) + $(IMX_GPU_VIV_COPY_PLATFORM) + $(foreach platform,mx8mn mx8mp mx8mq mx8qm mx8qxp mx8ulp, \ + $(RM) -r $(@D)/gpu-core/usr/lib/$(platform) + ) $(IMX_GPU_VIV_FIXUP_PKGCONFIG) endef From yann.morin.1998 at free.fr Mon Feb 20 20:52:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:34 -0000 Subject: [Buildroot] [git commit branch/next] package/samba4: security bump to version 4.15.12 Message-ID: <20230220205151.E9052828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81a02457b0f161d6a0b7c9f2f916d55983e5cb44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issue: - CVE-2022-42898: Samba buffer overflow vulnerabilities on 32-bit systems https://www.samba.org/samba/security/CVE-2022-42898.html Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 f845a31290..81cbab4552 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.11.tar.asc -sha256 2f305980d49c7723cbef281fff2b81a2eeafae51e58b5172bb43d9693ef8953b samba-4.15.11.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.12.tar.asc +sha256 5889493d69dc7723be6c3154387fbed38c1cddf93a16da8670d99b7cca33b15e samba-4.15.12.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 814bf0bbaa..31f692e03d 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.11 +SAMBA4_VERSION = 4.15.12 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:52:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:35 -0000 Subject: [Buildroot] [git commit branch/next] package/sdl2: fix sdl_init() error with kernel 5.15 Message-ID: <20230220205152.0F2A986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7928c51bf625333102358ed1c9d84efe3e6bdc01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes #6421 Backport from: da9ba3a2a1536017e4ce1ee0f4276578d1ce6e29 Signed-off-by: Michael Fischer [yann.morin.1998 at free.fr: make it an actual backport] Signed-off-by: Yann E. MORIN --- ...oesn-t-have-a-mode-configured-use-the-pre.patch | 76 ++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch b/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch new file mode 100644 index 0000000000..c8be280c56 --- /dev/null +++ b/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch @@ -0,0 +1,76 @@ +From da9ba3a2a1536017e4ce1ee0f4276578d1ce6e29 Mon Sep 17 00:00:00 2001 +From: Sam Lantinga +Date: Fri, 18 Nov 2022 12:17:27 -0800 +Subject: [PATCH] If a CRTC doesn't have a mode configured, use the preferred + or largest mode as the default mode + +Fixes https://github.com/libsdl-org/SDL/issues/6421 + +[mf at go-sys.de: backport from upstream] +Signed-off-by: Michael Fischer +[yann.morin.1998 at free.fr: do an actual backport] +Signed-off-by: Yann E. MORIN +--- + src/video/kmsdrm/SDL_kmsdrmvideo.c | 35 +++++++++++++++++++++++++----- + 1 file changed, 29 insertions(+), 6 deletions(-) + +diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c +index eae721455..eeeefef2b 100644 +--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c ++++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c +@@ -666,8 +666,8 @@ KMSDRM_CrtcGetVrr(uint32_t drm_fd, uint32_t crtc_id) + /* Gets a DRM connector, builds an SDL_Display with it, and adds it to the + list of SDL Displays in _this->displays[] */ + static void +-KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) { +- ++KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) ++{ + SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata); + SDL_DisplayData *dispdata = NULL; + SDL_VideoDisplay display = {0}; +@@ -770,14 +770,37 @@ KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) { + drmModeModeInfo *mode = &connector->modes[i]; + + if (!SDL_memcmp(mode, &crtc->mode, sizeof(crtc->mode))) { +- mode_index = i; +- break; ++ mode_index = i; ++ break; + } + } + + if (mode_index == -1) { +- ret = SDL_SetError("Failed to find index of mode attached to the CRTC."); +- goto cleanup; ++ int current_area, largest_area = 0; ++ ++ /* Find the preferred mode or the highest resolution mode */ ++ for (i = 0; i < connector->count_modes; i++) { ++ drmModeModeInfo *mode = &connector->modes[i]; ++ ++ if (mode->type & DRM_MODE_TYPE_PREFERRED) { ++ mode_index = i; ++ break; ++ } ++ ++ current_area = mode->hdisplay * mode->vdisplay; ++ if (current_area > largest_area) { ++ mode_index = i; ++ largest_area = current_area; ++ } ++ } ++ if (mode_index != -1) { ++ crtc->mode = connector->modes[mode_index]; ++ } ++ } ++ ++ if (mode_index == -1) { ++ ret = SDL_SetError("Failed to find index of mode attached to the CRTC."); ++ goto cleanup; + } + + /*********************************************/ +-- +2.25.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:35 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/kria/kv260/uboot.fragment: remove unnecessary CONFIG_MULTI_DTB_FIT option Message-ID: <20230220205150.5CF58828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=515319b86f17ea5a2ce3e51c9063bac9f9e00a01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch removes the CONFIG_MULTI_DTB_FIT u-boot option for the zynqmp_kria_kv260_defconfig as it is not necessary. The post build kv260.sh creates the proper u-boot.itb without needing this option. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3310463281 Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- board/zynqmp/kria/kv260/uboot.fragment | 1 - 1 file changed, 1 deletion(-) diff --git a/board/zynqmp/kria/kv260/uboot.fragment b/board/zynqmp/kria/kv260/uboot.fragment index 874eb470ac..0ed560c411 100644 --- a/board/zynqmp/kria/kv260/uboot.fragment +++ b/board/zynqmp/kria/kv260/uboot.fragment @@ -1,7 +1,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp-smk-k26-revA" CONFIG_SYS_SPI_U_BOOT_OFFS=0xF80000 CONFIG_DTB_RESELECT=y -CONFIG_MULTI_DTB_FIT=y CONFIG_DMA=y CONFIG_XILINX_DPDMA=y CONFIG_PHY=y From yann.morin.1998 at free.fr Mon Feb 20 20:52:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:35 -0000 Subject: [Buildroot] [git commit branch/next] package/python-alembic: bump to version 1.9.1 Message-ID: <20230220205233.7802D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cde8b664b5fef509df74582097b925b899191543 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-alembic/python-alembic.hash | 4 ++-- package/python-alembic/python-alembic.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-alembic/python-alembic.hash b/package/python-alembic/python-alembic.hash index e256e9dc08..f94f5ab10a 100644 --- a/package/python-alembic/python-alembic.hash +++ b/package/python-alembic/python-alembic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/alembic/json -md5 667a722df7dbef926a4ce760b9917622 alembic-1.8.1.tar.gz -sha256 cd0b5e45b14b706426b833f06369b9a6d5ee03f826ec3238723ce8caaf6e5ffa alembic-1.8.1.tar.gz +md5 999392ffc900da18afbf10d2ac31bdc6 alembic-1.9.1.tar.gz +sha256 f9f76e41061f5ebe27d4fe92600df9dd612521a7683f904dab328ba02cffa5a2 alembic-1.9.1.tar.gz # Locally computed sha256 checksums sha256 f0e3f7a5080879ccae798882d9bee3d48fe335d0bad84ca8eec86fa594375ea0 LICENSE diff --git a/package/python-alembic/python-alembic.mk b/package/python-alembic/python-alembic.mk index 735678b384..64ce85bead 100644 --- a/package/python-alembic/python-alembic.mk +++ b/package/python-alembic/python-alembic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ALEMBIC_VERSION = 1.8.1 +PYTHON_ALEMBIC_VERSION = 1.9.1 PYTHON_ALEMBIC_SOURCE = alembic-$(PYTHON_ALEMBIC_VERSION).tar.gz -PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/37/ab/80e6d86ca81235ea1a7104089dddf74de4b45f8af0a05d4b265be44d6ff9 +PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/81/87/5c531d2923c61e7ae68b23c8660df289ae4241a0d38f3fbcbd8dba64ca6b PYTHON_ALEMBIC_SETUP_TYPE = setuptools PYTHON_ALEMBIC_LICENSE = MIT PYTHON_ALEMBIC_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:52:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:36 -0000 Subject: [Buildroot] [git commit branch/next] package/imagemagick: utilities now need C++ support Message-ID: <20230220205150.3B0BC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0910ada70b7194596c6ace0cb06b303173c13de7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since upstream commit https://github.com/ImageMagick/ImageMagick/commit/07f3b487f9860fd4eb9422f1a906d0fe83b6fd1c (which first appeared in version 7.1.0-47), ImageMagick forces the need of a C++ compiler to build its utilities. Despite the request of Bernd Kuhls to revert this change, upstream declined. Since this change is causing build failures in our autobuilders, our only choice is to follow the choice of upstream, and disable building the utilities when C++ support is not available. Fixes: http://autobuild.buildroot.net/results/4283235d697408cf2e70be5e3769dbe6ebb9ddae/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/imagemagick/imagemagick.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 6bdf24c1e8..8a2ec460d5 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -178,6 +178,12 @@ else IMAGEMAGICK_CONF_OPTS += --without-bzlib endif +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +IMAGEMAGICK_CONF_OPTS += --with-utilities +else +IMAGEMAGICK_CONF_OPTS += --without-utilities +endif + HOST_IMAGEMAGICK_CONF_OPTS = \ --disable-opencl \ --disable-openmp \ From yann.morin.1998 at free.fr Mon Feb 20 20:52:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:36 -0000 Subject: [Buildroot] [git commit branch/next] package/sdl: add upstream security fix for CVE-2022-34568 Message-ID: <20230220205152.1BA81828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7368099ae9767a57ec72fcfbb29a5d85ac7bcf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next SDL v1.2 was discovered to contain a use-after-free via the XFree function at /src/video/x11/SDL_x11yuv.c. https://github.com/advisories/GHSA-wr7h-5wm3-p3h4 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- ...-SDL_x11yuv.c-fix-possible-use-after-free.patch | 28 ++++++++++++++++++++++ package/sdl/sdl.mk | 3 +++ 2 files changed, 31 insertions(+) diff --git a/package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch b/package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch new file mode 100644 index 0000000000..d7858d0f96 --- /dev/null +++ b/package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch @@ -0,0 +1,28 @@ +From d7e00208738a0bc6af302723fe64908ac35b777b Mon Sep 17 00:00:00 2001 +From: Ozkan Sezer +Date: Sat, 18 Jun 2022 14:55:00 +0300 +Subject: [PATCH] SDL_x11yuv.c: fix possible use-after-free + +Fixes: https://github.com/libsdl-org/SDL-1.2/issues/863 +Signed-off-by: Peter Korsgaard +--- + src/video/x11/SDL_x11yuv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/video/x11/SDL_x11yuv.c b/src/video/x11/SDL_x11yuv.c +index 62698dfd..0d5754e3 100644 +--- a/src/video/x11/SDL_x11yuv.c ++++ b/src/video/x11/SDL_x11yuv.c +@@ -374,8 +374,8 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S + #ifdef PITCH_WORKAROUND + if ( hwdata->image != NULL && hwdata->image->pitches[0] != (width*bpp) ) { + /* Ajust overlay width according to pitch */ +- XFree(hwdata->image); + width = hwdata->image->pitches[0] / bpp; ++ XFree(hwdata->image); + hwdata->image = SDL_NAME(XvCreateImage)(GFX_Display, xv_port, format, + 0, width, height); + } +-- +2.30.2 + diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 7389cd3edb..462600debb 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -13,6 +13,9 @@ SDL_CPE_ID_VENDOR = libsdl SDL_CPE_ID_PRODUCT = simple_directmedia_layer SDL_INSTALL_STAGING = YES +# 0003-SDL_x11yuv.c-fix-possible-use-after-free.patch +SDL_IGNORE_CVES += CVE-2022-34568 + # we're patching configure.in, but package cannot autoreconf with our version of # autotools, so we have to do it manually instead of setting SDL_AUTORECONF = YES define SDL_RUN_AUTOGEN From yann.morin.1998 at free.fr Mon Feb 20 20:52:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:37 -0000 Subject: [Buildroot] [git commit branch/next] configs/kontron_bl_imx8mm_defconfig: bump U-boot to 2022.10 Message-ID: <20230220205150.0F308828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e63809d8d7ed873f320c61fc0eb7e0f64250acf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 223516b51e1a (configs/kontron_bl_imx8mm: U-Boot needs util-linux) added the needed dependency against host-util-linux, but missed an earlier comment about u-boot still failing [0] The U-Boot makefile for the host tools does not handle the compiler/linker options properly. There are some patches [1][2] that fixes that issue already applied in the newer U-Boot version 2022.10. So we have to bump U-Boot to fix an autobuilder failure. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3267233833 [0] https://lore.kernel.org/buildroot/CAEyMn7Y3UgT-8dYY5rbnzcPfbGmqRVXG=joWx1fSSCC=WiFzbg at mail.gmail.com/ [1] U-Boot: a638bd349ea43825 (kbuild: add KBUILD_HOSTLDFLAGS to cmd_host-csingle) [2] U-Boot: 31a7688cbe0ed5ed (tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls) Cc: Yann E. MORIN Signed-off-by: Heiko Thiery [yann.morin.1998 at free.fr: - update commit log with reference to [0] - slightly tweak commit log ] Signed-off-by: Yann E. MORIN --- configs/kontron_bl_imx8mm_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig index 13ed1a2078..240cb52245 100644 --- a/configs/kontron_bl_imx8mm_defconfig +++ b/configs/kontron_bl_imx8mm_defconfig @@ -38,7 +38,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880 BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:37 -0000 Subject: [Buildroot] [git commit branch/next] utils/genrandconfig: don't build igh-ethercat drivers Message-ID: <20230220205152.3E0C386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75cb8a490200e2480d1dcc2a2e59de0a575c1531 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next igh-ethercat comes with a small number of patched Linux kernel network drivers, which aim at replacing the ones available in upstream Linux kernel. All those drivers are provided only for specific kernel releases. For example: r8169-2.6.24-ethercat.c r8169-2.6.24-orig.c r8169-2.6.27-ethercat.c r8169-2.6.27-orig.c r8169-2.6.28-ethercat.c r8169-2.6.28-orig.c r8169-2.6.29-ethercat.c r8169-2.6.29-orig.c r8169-2.6.31-ethercat.c r8169-2.6.31-orig.c r8169-2.6.32-ethercat.c r8169-2.6.32-orig.c r8169-2.6.33-ethercat.c r8169-2.6.33-orig.c r8169-2.6.35-ethercat.c r8169-2.6.35-orig.c r8169-2.6.36-ethercat.c r8169-2.6.36-orig.c r8169-2.6.37-ethercat.c r8169-2.6.37-orig.c r8169-3.10-ethercat.c r8169-3.10-orig.c r8169-3.12-ethercat.c r8169-3.12-orig.c r8169-3.14-ethercat.c r8169-3.14-orig.c r8169-3.16-ethercat.c r8169-3.16-orig.c r8169-3.2-ethercat.c r8169-3.2-orig.c r8169-3.4-ethercat.c r8169-3.4-orig.c r8169-3.6-ethercat.c r8169-3.6-orig.c r8169-3.8-ethercat.c r8169-3.8-orig.c r8169-4.4-ethercat.c r8169-4.4-orig.c Obviously, this doesn't play well with the random configuration testing done by utils/genrandconfig. This commit avoids this issue by making sure we never build any of those drivers as part of the genrandconfig generated configurations. Fixes: http://autobuild.buildroot.net/results/07b7475d780c067d99ee5618a5fd2bb024a5b4e7/ Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 9c6c2b359c..eccd3a228e 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -629,6 +629,13 @@ def fixup_config(sysinfo, configfile): configlines.append('BR2_PACKAGE_XVISOR_USE_DEFCONFIG=y\n') configlines.remove('BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE=""\n') + # Don't build igh-ethercat driver as they are highly + # kernel-version specific + for opt in ['8139TOO', 'E100', 'E1000', 'E1000E', 'R8169']: + optstr = 'BR2_PACKAGE_IGH_ETHERCAT_%s=y\n' % opt + if optstr in configlines: + configlines.remove(optstr) + with open(configfile, "w+") as configf: configf.writelines(configlines) From yann.morin.1998 at free.fr Mon Feb 20 20:52:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:38 -0000 Subject: [Buildroot] [git commit branch/next] utils/genrandconfig: disallow configs with BR2_XTENSA_CUSTOM=y Message-ID: <20230220205150.B2EAB828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c81da5e41c8b8863920a1f0416e4f7f4d22788bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When BR2_XTENSA_CUSTOM=y is used with the internal toolchain, an overlay file is mandatory, which genrandconfig can't provide. So we simply disallow such configurations. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index f19a405685..9c6c2b359c 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -304,6 +304,11 @@ def fixup_config(sysinfo, configfile): # No C library for internal toolchain if 'BR2_TOOLCHAIN_BUILDROOT_NONE=y' in configlines: return False + # Xtensa custom cores require an overlay file with internal + # toolchains + if 'BR2_XTENSA_CUSTOM=y' in configlines and \ + 'BR2_TOOLCHAIN_BUILDROOT=y' in configlines: + return False if 'BR2_PACKAGE_AUFS_UTIL=y\n' in configlines and \ 'BR2_PACKAGE_AUFS_UTIL_VERSION=""\n' in configlines: From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:38 -0000 Subject: [Buildroot] [git commit branch/next] package/mesa3d: fix uClibc build Message-ID: <20230220205152.4C71086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ebfe647b6df76016fb8a50b718d60fdff15fe87 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Moved the util/compiler.h include to util/macros.h due to upstream commit which added static_assert() to src/util/macros.h https://cgit.freedesktop.org/mesa/mesa/commit/src/util/macros.h?h=22.2&id=f1023571e8ce7ccb6ec7bc115240cb76aef3e5e5 Please note that this patch can be removed when buildroot toolchains are updated to uClibc 1.0.42: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?h=v1.0.42&id=03fbd941e943976bb92cb392882c2ff7ec218704 Fixes: http://autobuild.buildroot.net/results/a55/a55d6980faad8b5063f8f4f8b89467061d44a2ae/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d/0004-Fix-uClibc-build.patch | 37 +++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/package/mesa3d/0004-Fix-uClibc-build.patch b/package/mesa3d/0004-Fix-uClibc-build.patch index 70ff5e2b4c..c8c82fe0dc 100644 --- a/package/mesa3d/0004-Fix-uClibc-build.patch +++ b/package/mesa3d/0004-Fix-uClibc-build.patch @@ -18,29 +18,22 @@ Fixes build errors with uClibc and gcc-9.3.0: function ???static_assert??? [-Werror=implicit-function-declaration] 101 | static_assert(ARRAY_SIZE(egl_platforms) == _EGL_NUM_PLATFORMS, +../src/util/macros.h:74:4: error: implicit declaration of function + ???static_assert??? [-Werror=implicit-function-declaration] + 74 | static_assert(cond, #cond); \ + | ^~~~~~~~~~~~~ + Patch sent upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13898 Signed-off-by: Bernd Kuhls --- - src/egl/main/egldisplay.c | 1 + - src/util/compiler.h | 10 ++++++++++ + src/util/compiler.h | 10 ++++++++++ + src/util/macros.h | 1 + 2 files changed, 11 insertions(+) -diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c -index 131fc22786f9..d3e2bb96e2f6 100644 ---- a/src/egl/main/egldisplay.c -+++ b/src/egl/main/egldisplay.c -@@ -42,6 +42,7 @@ - #endif - #include - #include "c11/threads.h" -+#include "util/compiler.h" - #include "util/macros.h" - #include "util/os_file.h" - #include "util/u_atomic.h" diff --git a/src/util/compiler.h b/src/util/compiler.h -index d184ad455af9..b5c56807acc6 100644 +index d184ad455af..b5c56807acc 100644 --- a/src/util/compiler.h +++ b/src/util/compiler.h @@ -36,6 +36,16 @@ @@ -60,6 +53,18 @@ index d184ad455af9..b5c56807acc6 100644 #include "util/macros.h" +diff --git a/src/util/macros.h b/src/util/macros.h +index 22b18303826..8f73ee72693 100644 +--- a/src/util/macros.h ++++ b/src/util/macros.h +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include "util/compiler.h" + + /* Compute the size of an array */ + #ifndef ARRAY_SIZE -- -GitLab +2.34.1 From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:39 -0000 Subject: [Buildroot] [git commit branch/next] package/dracut: workaround breakage on non-merged-usr hosts Message-ID: <20230220205150.8594B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4f5ed5a7cf035d448c49edd8d106a09ce945170 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next dracut is not really ready to be installed with a non-/ prefix, and it has a lot of hard-coded assumptions that it is going to run on the host for which it is goign to generate an initramfs; for example, it hard-codes calls to /lib/dracut/some-file in some of its modules. It also uses the host system layout to decide whether it needs a merged-usr or not. Furthermore, dracut populates the temporary directory which content will be used to generate the cpio, with a bunch of files, even before calling any of the dracut modules. The name for that temporary directory is not predictable (looks like the output of 'mktemp -d dracut.XXXXXX', with names like dracut.1Vfn9F seen while debugging). As a consequence, we can't prepare the temporary directory with the proper symlinks beforehand. So, we provide a very-early module of our own, that will (hopefully) run before any other module, to fixup the messed-up layout prepared by dracut. This module moves the content of /lib, /bin, and /sbin, out and into their counterparts in /usr, and creates the usual symlinks. When we do not require a merged-usr, then we have nothing to do, so the module checks for /lib being a symlink, as the hint that we want a merged-usr or not. Note: currently, we've seen nothing that dracut installed in /bin or /sbin, but for trying to be future-proof, we also handle them; this causes a spurious warning: mv: cannot stat '..../build/buildroot-fs/cpio/tmp/dracut.YQnzNP/initramfs/bin/*': No such file or directory Since there are already quite a bunch of similar failures in the official modules bundled in dracut, an extra such issue or two should not be too scary... Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261241 https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261239 https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261236 Signed-off-by: Yann E. MORIN Cc: Thierry Bultel Cc: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/dracut/dracut.mk | 2 ++ package/dracut/merged-usr-module-setup.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk index 742a073a36..597492bc5e 100644 --- a/package/dracut/dracut.mk +++ b/package/dracut/dracut.mk @@ -22,6 +22,8 @@ HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT # "ld-musl-x.so" symlinks, respectively - else the init process cannot # start define HOST_DRACUT_POST_INSTALL_LIBC_LINKS_MODULE + $(INSTALL) -D -m 0755 package/dracut/merged-usr-module-setup.sh \ + $(HOST_DIR)/lib/dracut/modules.d/0000-merged-usr/module-setup.sh $(INSTALL) -D -m 0755 package/dracut/libc-links-module-setup.sh \ $(HOST_DIR)/lib/dracut/modules.d/05libc-links/module-setup.sh endef diff --git a/package/dracut/merged-usr-module-setup.sh b/package/dracut/merged-usr-module-setup.sh new file mode 100644 index 0000000000..6dc0e7ca7b --- /dev/null +++ b/package/dracut/merged-usr-module-setup.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +check() { + [ -L "${dracutsysrootdir?}/lib" ] +} + +depends() { + return 0 +} + +install() { + # dracut pre-installs a set of files before calling any of + # the modules, and dracut also messes up host vs. target + # system, so on a non-merged-usr host, it will prepare a + # non-merged-usr initramfs, even though the current config + # is for a merged-usr system. + # So undo its borkage. + for dir in lib bin sbin; do + mkdir -p "${initdir?}/usr/${dir}" + if [ -d "${initdir?}/${dir}" ]; then + mv "${initdir?}/${dir}/"* "${initdir?}/usr/${dir}" + rm -rf "${initdir?}/${dir}" + ln -s "usr/${dir}" "${initdir?}/${dir}" + fi + done +} From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:39 -0000 Subject: [Buildroot] [git commit branch/next] boot/edk2: fix the build for arm sgi575 Message-ID: <20230220205152.7AC0886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79591b76674a8c0ed150021a27771a73a70d159b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The edk2 package can be configured for platform Arm Sgi575 but this does not build correctly: Usage: build.exe [options] [all|fds|genc|genmake|clean|cleanall|cleanlib|modules|libraries|run] build.exe: error: option -a: invalid choice: '-b' (choose from 'IA32', 'X64', 'EBC', 'ARM', 'AARCH64', 'RISCV64') make[1]: *** [package/pkg-generic.mk:293: /home/thomas/buildroot/buildroot/output/build/edk2-edk2-stable202102/.stamp_built] Error 2 make: *** [Makefile:84: _all] Error 2 Add the necessary definitions to fix the build. Signed-off-by: Vincent Stehl?? Cc: Dick Olsson Signed-off-by: Thomas Petazzoni --- boot/edk2/edk2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index 5cbd9d152e..7d8765c310 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -75,6 +75,12 @@ EDK2_PACKAGE_NAME = ArmVirtPkg EDK2_PLATFORM_NAME = ArmVirtQemuKernel EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) +else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_SGI575),y) +EDK2_ARCH = AARCH64 +EDK2_PACKAGE_NAME = Platform/ARM/SgiPkg/Sgi575 +EDK2_PLATFORM_NAME = Sgi575 +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME) + else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_VEXPRESS_FVP_AARCH64),y) EDK2_ARCH = AARCH64 EDK2_PACKAGE_NAME = Platform/ARM/VExpressPkg From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:40 -0000 Subject: [Buildroot] [git commit branch/next] package/matchbox-starup-monitor: fix build without C++ Message-ID: <20230220205150.6C5E28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b44f6c2f303ef03f563edd159b1c88d1cf118ed5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next matchbox-startup-monitor is an ageing package, and uses an old configure.ac with archaic constructs. This had generated a configure script that incorrectly tries to look for and validate a C++ compiler: checking for powerpc64le-buildroot-linux-gnu-g++... no checking whether we are using the GNU C++ compiler... no checking whether no accepts -g... no checking dependency style of no... none checking how to run the C++ preprocessor... /lib/cpp configure: error: C++ preprocessor "/lib/cpp" fails sanity check Calling autoreconf fixes the issue, as the generated configure no longer tries to look for a C++ compiler at all anymore. Running autoreconf does not add any new dependency, as they are already in the dependency chain via other packages. Fixes: http://autobuild.buildroot.org/results/223/223f43dd76ee907c5f25c4fee94a0f5d75614dd5/ See also similar changes: 9993a36f5e12 package/pamtester: fix build without C++ c05cc5de868c package/madplay: needs autoreconf eae18d01abc7 libmad: needs autoreconf 43274dd3e0da package/libid3tag: needs autoreconf Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/matchbox-startup-monitor/matchbox-startup-monitor.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox-startup-monitor/matchbox-startup-monitor.mk index c80e75332c..cd2ae4162f 100644 --- a/package/matchbox-startup-monitor/matchbox-startup-monitor.mk +++ b/package/matchbox-startup-monitor/matchbox-startup-monitor.mk @@ -11,4 +11,9 @@ MATCHBOX_STARTUP_MONITOR_LICENSE = GPL-2.0+ MATCHBOX_STARTUP_MONITOR_LICENSE_FILES = COPYING MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification +# Obsolete constructs in the archaic configure.ac generated an outworn +# configure script that incorrectly searches a C++ compiler. Regenerate +# the autoconf machinery to avoid failures without a C++ compiler. +MATCHBOX_STARTUP_MONITOR_AUTORECONF = YES + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:40 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8189es: bump to latest version to fix build failure with Linux >= 6.0 Message-ID: <20230220205152.70EC686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08a013d25a09d07a3e7a89b1afbb20da206a383d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop local patch that has been upstreamed[0] and drop the endianness handling too since from this commit[1] on it's handled by using Linux macro __LITTLE_ENDIAN. [0]: https://github.com/jwrdegoede/rtl8189ES_linux/commit/4a555ffb77a5947814b6c7f330968318e265c496 [1]: https://github.com/jwrdegoede/rtl8189ES_linux/commit/b3da33576da5359d85c7cfe82716c9a08a592aff Fixes: http://autobuild.buildroot.net/results/6178fbfbe9fe762645b1907c4ceb032a00e75a89/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...ve-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch | 40 ---------------------- package/rtl8189es/rtl8189es.hash | 2 +- package/rtl8189es/rtl8189es.mk | 10 ++---- 3 files changed, 3 insertions(+), 49 deletions(-) diff --git a/package/rtl8189es/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch b/package/rtl8189es/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch deleted file mode 100644 index dc4deff9f1..0000000000 --- a/package/rtl8189es/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4a555ffb77a5947814b6c7f330968318e265c496 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 28 Sep 2022 21:17:17 +0200 -Subject: [PATCH] Makefile: move 'EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)' at the - end of EXTRA_FLAGS assignment - -At the moment USER_EXTRA_CFLAGS can't override local Makfile EXTRA_CFLAGS -since it's assigned at the beginning of the Makefile. For example it's not -possible to undefine the hardcoded CONFIG_LITTLE_ENDIAN and this doesn't -allow to build these modules for big endian architectures. So let's move -the assignment of USER_EXTRA_CFLAGS to EXTRA_CFLAGS after the last -EXTRA_CFLAGS assignment. - -Signed-off-by: Giulio Benetti -[Upstream status: https://github.com/jwrdegoede/rtl8189ES_linux/pull/83] ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 8fcb7bd..e4664e9 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,3 @@ --EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) - EXTRA_CFLAGS += -O1 - #EXTRA_CFLAGS += -O3 - #EXTRA_CFLAGS += -Wall -@@ -2239,6 +2238,8 @@ ifneq ($(USER_MODULE_NAME),) - MODULE_NAME := $(USER_MODULE_NAME) - endif - -+EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -+ - ifneq ($(KERNELRELEASE),) - - ########### this part for *.mk ############################ --- -2.34.1 - diff --git a/package/rtl8189es/rtl8189es.hash b/package/rtl8189es/rtl8189es.hash index d897e5e6c2..44d73e60f0 100644 --- a/package/rtl8189es/rtl8189es.hash +++ b/package/rtl8189es/rtl8189es.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 74325014c1a8503b3a7e48ad06997baddad8c1dae86bb79f4368532cc3e75fb2 rtl8189es-39c17661136da48f8e9c644194dce6a7f5076896.tar.gz +sha256 96347dbfedd95a217fb89b7b295fe417b711dbad3db896ef0c2fa733c6d150fd rtl8189es-e58bd86c9d9408c648b1246a0dd76b16856ec172.tar.gz diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk index cddcb195f9..6acc409e73 100644 --- a/package/rtl8189es/rtl8189es.mk +++ b/package/rtl8189es/rtl8189es.mk @@ -4,20 +4,14 @@ # ################################################################################ -RTL8189ES_VERSION = 39c17661136da48f8e9c644194dce6a7f5076896 +RTL8189ES_VERSION = e58bd86c9d9408c648b1246a0dd76b16856ec172 RTL8189ES_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189ES_VERSION)) RTL8189ES_LICENSE = GPL-2.0 -# Undefine the hardcoded CONFIG_LITTLE_ENDIAN -RTL8189ES_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN -# Set endianness -RTL8189ES_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN - RTL8189ES_MODULE_MAKE_OPTS = \ CONFIG_RTL8189ES=m \ KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) \ - USER_EXTRA_CFLAGS="$(RTL8189ES_USER_EXTRA_CLAGS)" + KSRC=$(LINUX_DIR) define RTL8189ES_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) From yann.morin.1998 at free.fr Mon Feb 20 20:52:41 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:41 -0000 Subject: [Buildroot] [git commit branch/next] arch/arch.mk.xtensa: relax check on overlay file to apply only to internal toolchains Message-ID: <20230220205150.A940E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6465c79166fed0c9a9b99a15d34c555a3141344f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 4cbf7336914f25478aea943456ba7dc3c892c21a ("arch/xtensa: custom configuration requires an overlay") added a check in arch/arch.mk.xtensa to bail out if a custom Xtensa core is selected but not overlay file is provided. While this is indeed a perfectly valid check to make when building an internal toolchain, with an external toolchain it's entirely possible to build with no overlay file: the toolchain already exists, and there's no overlay to be applied in the context of the Buildroot build. And indeed commit 4cbf7336914f25478aea943456ba7dc3c892c21a broke some of the runtime test cases that use a custom Xtensa core configuration, with no overlay, to test the toolchains.bootlin.com Xtensa external toolchain. By relaxing the check to only apply to internal toolchain configurations, we fix those test cases. It is to be noted that this still allows a configuration where gdb gets built for a custom core, but with no overlay, so basically that means the fsf variant, which can lead to build or run failures that 4cbf7336914f attempted to fix to begin with. This still covers the most common cases. Finally, it also means being able to build a kernel with no overlay, but this is offset by the fact that the kernel may be already patched with an overlay (as it is possible to specify a custom kernel), which is most probably what people using a custom core would have. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261966 https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261963 Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: extend commit log with last two paragraphs] Signed-off-by: Yann E. MORIN --- arch/arch.mk.xtensa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arch.mk.xtensa b/arch/arch.mk.xtensa index 7b6c59cecd..75145e725f 100644 --- a/arch/arch.mk.xtensa +++ b/arch/arch.mk.xtensa @@ -1,6 +1,6 @@ BR_ARCH_XTENSA_OVERLAY_FILE = $(call qstrip,$(BR2_XTENSA_OVERLAY_FILE)) -ifeq ($(BR_BUILDING)$(BR2_XTENSA_CUSTOM):$(BR_ARCH_XTENSA_OVERLAY_FILE),yy:) +ifeq ($(BR_BUILDING)$(BR2_XTENSA_CUSTOM)$(BR2_TOOLCHAIN_BUILDROOT):$(BR_ARCH_XTENSA_OVERLAY_FILE),yyy:) $(error No xtensa overlay file provided. Check your BR2_XTENSA_OVERLAY_FILE setting) endif From peter at korsgaard.com Mon Feb 20 20:52:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:41 -0000 Subject: [Buildroot] [git commit branch/next] package/gnupg2: bump version to 2.3.8 Message-ID: <20230220205152.9D8D386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73f04f7f0cb5ab7b4df0f2e8c706d73e6d12b793 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Brings a number of fixes: https://dev.gnupg.org/T6106 Add patch 0001 to fix undefined reference to `ks_ldap_free_state' backported from commit 7011286ce6e1fb56c2989fdafbd11b931c489faa Signed-off-by: Michael Fischer [Peter: add changelog info] Signed-off-by: Peter Korsgaard --- package/gnupg2/0001-ks_ldap_free_state.patch | 21 +++++++++++++++++++++ package/gnupg2/gnupg2.hash | 10 +++++----- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch new file mode 100644 index 0000000000..fa55d27c04 --- /dev/null +++ b/package/gnupg2/0001-ks_ldap_free_state.patch @@ -0,0 +1,21 @@ + +Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is not +installed + +Backported from: 7011286ce6e1fb56c2989fdafbd11b931c489faa + +Signed-off-by: Michael Fischer + +--- a/dirmngr/server.c ++++ b/dirmngr/server.c +@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) + ctrl->refcount); + else + { ++#if USE_LDAP + ks_ldap_free_state (ctrl->ks_get_state); + ctrl->ks_get_state = NULL; ++#endif + release_ctrl_ocsp_certs (ctrl); + xfree (ctrl->server_local); + dirmngr_deinit_default_ctrl (ctrl); diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index ec2654be7b..f9c071ad45 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q3/000474.html -sha1 9255a70a984bfbfa5312a9a52a1cf47cb0d1fc84 gnupg-2.3.7.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html +sha1 1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc gnupg-2.3.8.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.7.tar.bz2.sig -# using key 02F38DFF731FF97CB039A1DA549E695E905BA208 -sha256 ee163a5fb9ec99ffc1b18e65faef8d086800c5713d15a672ab57d3799da83669 gnupg-2.3.7.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.8.tar.bz2.sig +# using key 6DAA6E64A76D2840571B4902528897B826403ADA and AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD +sha256 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed gnupg-2.3.8.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 7d8424c136..9dc29ca99e 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.3.7 +GNUPG2_VERSION = 2.3.8 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From peter at korsgaard.com Mon Feb 20 20:52:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:41 -0000 Subject: [Buildroot] [git commit branch/next] package/libcamera: bump to version 0.0.3 Message-ID: <20230220205240.7BED086496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2890f308b5e884b2cbf9db3ccfd7ea7e0f4b0ddb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Libcamera recently started to tag releases, so use the version tag instead of raw commit hash. Signed-off-by: Daniel Semkowicz Reviewed-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 68c9c1f005..033e318910 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 59318208a9c1b183cacaf5a7175568d8a9fa094f2dd8c9794269bb6e9636986e libcamera-ba6435930f08e802cffc688d90f156a8959a0f86-br1.tar.gz +sha256 d7100286616550aca487b46ae9de2a70bb471352a332b8214901b4148739990f libcamera-v0.0.3-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 9c03d3a3b3..8979a43aca 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = ba6435930f08e802cffc688d90f156a8959a0f86 +LIBCAMERA_VERSION = v0.0.3 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:42 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/kria/kv260/kv260.sh: fix u-boot.itb without CONFIG_MULTI_DTB_FIT option Message-ID: <20230220205150.E61E0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec9519831ed5d5698c787b48d2ab952525cacb93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch fixes the kv260.sh to generate a working u-boot.itb now that the CONFIG_MULTI_DTB_FIT u-boot option is no longer used. This is a follow-up fix of 515319b86f17ea5a2ce3e51c9063bac9f9e00a01 ("board/zynqmp/kria/kv260/uboot.fragment: remove unnecessary CONFIG_MULTI_DTB_FIT option") to fix the build of: https://gitlab.com/buildroot.org/buildroot/-/jobs/3310463281 Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- board/zynqmp/kria/kv260/kv260.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/zynqmp/kria/kv260/kv260.sh b/board/zynqmp/kria/kv260/kv260.sh index e3467f3068..e891852009 100755 --- a/board/zynqmp/kria/kv260/kv260.sh +++ b/board/zynqmp/kria/kv260/kv260.sh @@ -8,5 +8,5 @@ UBOOT_DIR=$4 -fdtoverlay -o ${UBOOT_DIR}/fit-dtb.blob -i ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb ${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo +fdtoverlay -o ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb -i ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb ${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo ${UBOOT_DIR}/tools/mkimage -E -f ${UBOOT_DIR}/u-boot.its -B 0x8 ${BINARIES_DIR}/u-boot.itb From peter at korsgaard.com Mon Feb 20 20:52:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:42 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 19}.x / 6.0.x series Message-ID: <20230220205152.AA69A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f157a1136220ff0ad88766ebfb9d1ca9b4f59cc2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 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 ee59761f33..3631fcb6d6 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.0.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.0.9" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 c4ee15c37b..0af02e1326 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 8ede745a69351ea0f27fe0c48780d4efa37ff086135e129358ce09694957e8f9 linux-6.0.1.tar.xz +sha256 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7 linux-6.0.9.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 4686e33847db3ec58e1043bc0c806472aae694b2c413bb7d8da91a5c9a55eb1b linux-5.19.15.tar.xz -sha256 a822f09525ae8803453939a91e73f18097a3ba2aec73be4fe9ab314a0131715d linux-5.15.73.tar.xz -sha256 85253abf097eb5013b988a400eb022eed0e0626e7e0a7daa3ab4b6bcabbced9a linux-5.10.147.tar.xz -sha256 2bb826cdf9b2cfce385fb5d51fc8070fe428e467bd3df4ae2a7eb6f0c0cc2e63 linux-5.4.217.tar.xz +sha256 c93bb384a97ad1f0a4f18e442ce0291242722f78023eca658b22344541f09489 linux-5.19.17.tar.xz +sha256 cba39031dbc0eed0785b8afdc8c58cf23df83e47001b2354fa44486ae699c154 linux-5.15.79.tar.xz +sha256 f1b027526c58e7bd127f35b17736e4a6c865866b9048898f05c5358d4d52d4f3 linux-5.10.155.tar.xz +sha256 8b7df25b5560620eb2776d7b7c67569764b3916ff2f596767f72567b38d13d36 linux-5.4.224.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 bf021936a450e9292e10cc7db9909cd0d336406191d22aadd22bdcc51ca2595f linux-4.9.330.tar.xz -sha256 62ccb9ba94a7da5115bc923eebf8dffee9229801da02be87d90ae68ab9a76a6b linux-4.14.295.tar.xz -sha256 bec33298bd0470b5e725c7dc29a2dd4daf02065cb01cd4a54f6adee6ff582cb2 linux-4.19.261.tar.xz +sha256 41bf80c4766ba9915470afe97ead6a16faff484b94590387012ce7f9ce41502b linux-4.9.333.tar.xz +sha256 26233603ae992cd31e9f78066d54475b3e3f878ab0e3fd271e74a795ab60b15c linux-4.14.299.tar.xz +sha256 37406ead61149283973bccdf670a1fd020c2f19722b7176e88ec8567df6dacd0 linux-4.19.265.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8679241a2c..f72e7f408c 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -392,14 +392,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.330" if BR2_KERNEL_HEADERS_4_9 - default "4.14.295" if BR2_KERNEL_HEADERS_4_14 - default "4.19.261" if BR2_KERNEL_HEADERS_4_19 - default "5.4.217" if BR2_KERNEL_HEADERS_5_4 - default "5.10.147" if BR2_KERNEL_HEADERS_5_10 - default "5.15.73" if BR2_KERNEL_HEADERS_5_15 - default "5.19.15" if BR2_KERNEL_HEADERS_5_19 - default "6.0.1" if BR2_KERNEL_HEADERS_6_0 + default "4.9.333" if BR2_KERNEL_HEADERS_4_9 + default "4.14.299" if BR2_KERNEL_HEADERS_4_14 + default "4.19.265" if BR2_KERNEL_HEADERS_4_19 + default "5.4.224" if BR2_KERNEL_HEADERS_5_4 + default "5.10.155" if BR2_KERNEL_HEADERS_5_10 + default "5.15.79" if BR2_KERNEL_HEADERS_5_15 + default "5.19.17" if BR2_KERNEL_HEADERS_5_19 + default "6.0.9" if BR2_KERNEL_HEADERS_6_0 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 thomas.petazzoni at bootlin.com Mon Feb 20 20:52:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:43 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-data-optlist: bump to version 0.113 Message-ID: <20230220205241.C8E1B86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11133fbf22c64906655b7269d247ceeec28d0b41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-data-optlist/perl-data-optlist.hash | 4 ++-- package/perl-data-optlist/perl-data-optlist.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-data-optlist/perl-data-optlist.hash b/package/perl-data-optlist/perl-data-optlist.hash index 1c805acef7..ccc05ae4d6 100644 --- a/package/perl-data-optlist/perl-data-optlist.hash +++ b/package/perl-data-optlist/perl-data-optlist.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 3b2cdb7846391f9acaf4e948a9a6b21b Data-OptList-0.112.tar.gz -sha256 62c60ccaae88d5339ae36bcc8940b03388cf84adbf27828b1f8b300307103bab Data-OptList-0.112.tar.gz +md5 cda08370c4058ba56e40c2f21d94d233 Data-OptList-0.113.tar.gz +sha256 36aebc5817b7d4686b649434c2ee41f45c8bf97d4ca5a99f607cc40f695a4285 Data-OptList-0.113.tar.gz # computed by scancpan sha256 712f3e40537810ba3046533fd71d877f69ab446d5e8e8a1135771804494b8b42 LICENSE diff --git a/package/perl-data-optlist/perl-data-optlist.mk b/package/perl-data-optlist/perl-data-optlist.mk index 8e089245f6..1a9aa05cc9 100644 --- a/package/perl-data-optlist/perl-data-optlist.mk +++ b/package/perl-data-optlist/perl-data-optlist.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATA_OPTLIST_VERSION = 0.112 +PERL_DATA_OPTLIST_VERSION = 0.113 PERL_DATA_OPTLIST_SOURCE = Data-OptList-$(PERL_DATA_OPTLIST_VERSION).tar.gz PERL_DATA_OPTLIST_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RJ/RJBS PERL_DATA_OPTLIST_LICENSE = Artistic or GPL-1.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:43 -0000 Subject: [Buildroot] [git commit branch/next] package/gdal: switch to cmake build to fix libgeotiff detection Message-ID: <20230220205241.7E02786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b43579e9453a4e4f0d25d902634ebd9f1721dfc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next GDAL autoconf has wrong libgeotiff detection. It uses host's library if installed instead of buildroot one. Modern versions of gdal have no autoconf build scripts, just cmake only. So move to cmake build variant. Fixes: https://bugs.busybox.net/show_bug.cgi?id=15281 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/gdal/gdal.mk | 168 ++++++++++++++++++++++++++------------------------- 1 file changed, 87 insertions(+), 81 deletions(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 33e7ba724a..2d6dff1a93 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -12,6 +12,15 @@ GDAL_LICENSE_FILES = LICENSE.TXT GDAL_CPE_ID_VENDOR = osgeo GDAL_INSTALL_STAGING = YES GDAL_CONFIG_SCRIPTS = gdal-config +GDAL_SUPPORTS_IN_SOURCE_BUILD = NO + +# Using 'make' with CMake's Makefile generator will not work, as +# 'make' uses GNUmakefile first, but GNUmakefile is provided by +# autotools in gdal. We need to force 'make' to use the Makefile, +# which is generated by CMake. GNUmakefile and autoconf are dropped in +# 3.6 so this can be dropped in future version. +GDAL_MAKE_OPTS += -f Makefile + # gdal at its core only needs host-pkgconf, libgeotiff, proj and tiff # but since by default mrf driver support is enabled, it also needs # jpeg, libpng and zlib. By default there are also many other drivers @@ -20,97 +29,94 @@ GDAL_CONFIG_SCRIPTS = gdal-config # respectively needed dependencies. GDAL_DEPENDENCIES = host-pkgconf jpeg json-c libgeotiff libpng proj tiff zlib -# Yes, even though they have --with options, these few libraries are +# Yes, even though they have -DDGDAL_USE options, a few libraries are # mandatory. If we don't provide them, bundled versions are used. GDAL_CONF_OPTS = \ - --with-geotiff \ - --with-jpeg \ - --with-libjson-c=$(STAGING_DIR)/usr \ - --with-libtool \ - --with-libz \ - --with-png \ - --with-proj \ - --without-armadillo \ - --without-blosc \ - --without-brunsli \ - --without-cfitsio \ - --without-crypto \ - --without-cryptopp \ - --without-curl \ - --without-dds \ - --without-ecw \ - --without-expat \ - --without-exr \ - --without-fgdb \ - --without-freexl \ - --without-geos \ - --without-gnm \ - --without-libkml \ - --without-lz4 \ - --without-gta \ - --without-hdf4 \ - --without-hdf5 \ - --without-hdfs \ - --without-heif \ - --without-idb \ - --without-jp2lura \ - --without-java \ - --without-jpeg12 \ - --without-jxl \ - --without-kakadu \ - --without-kea \ - --without-lerc \ - --without-gif \ - --without-liblzma \ - --without-libdeflate \ - --without-mongocxxv3 \ - --without-mrsid \ - --without-jp2mrsid \ - --without-macosx-framework \ - --without-msg \ - --without-mysql \ - --without-netcdf \ - --without-null \ - --without-oci \ - --without-odbc \ - --without-ogdi \ - --without-opencl \ - --without-openjpeg \ - --without-pam \ - --without-pcidsk \ - --without-pcraster \ - --without-pcre \ - --without-pcre2 \ - --without-pdfium \ - --without-podofo \ - --without-poppler \ - --without-python \ - --without-qhull \ - --without-rasdaman \ - --without-rasterlite2 \ - --without-rdb \ - --without-sfcgal \ - --without-sosi \ - --without-spatialite \ - --without-sqlite3 \ - --without-teigha \ - --without-tiledb \ - --without-webp \ - --without-xerces \ - --without-zstd + -DGDAL_USE_GEOTIFF=ON \ + -DGDAL_USE_JPEG=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_PNG=ON \ + -DGDAL_USE_ARMADILLO=OFF \ + -DGDAL_USE_BLOSC=OFF \ + -DGDAL_USE_BRUNSLI=OFF \ + -DGDAL_USE_CFITSIO=OFF \ + -DGDAL_USE_OPENSSL=OFF \ + -DGDAL_USE_CRYPTOPP=OFF \ + -DGDAL_USE_CRNLIB=OFF \ + -DGDAL_USE_CURL=OFF \ + -DGDAL_USE_ECW=OFF \ + -DGDAL_USE_EXPAT=OFF \ + -DGDAL_USE_FILEGDB=OFF \ + -DGDAL_USE_FREEXL=OFF \ + -DGDAL_USE_GEOS=OFF \ + -DGDAL_USE_LIBKML=OFF \ + -DGDAL_USE_LZ4=OFF \ + -DGDAL_USE_GTA=OFF \ + -DGDAL_USE_HDF4=OFF \ + -DGDAL_USE_HDF5=OFF \ + -DGDAL_USE_HDFS=OFF \ + -DGDAL_USE_HEIF=OFF \ + -DGDAL_USE_IDB=OFF \ + -DGDAL_USE_LURATECH=OFF \ + -DGDAL_USE_JPEG12_INTERNAL=OFF \ + -DGDAL_USE_JXL=OFF \ + -DGDAL_USE_KDU=OFF \ + -DGDAL_USE_KEA=OFF \ + -DGDAL_USE_LERC=OFF \ + -DGDAL_USE_GIF=OFF \ + -DGDAL_USE_LIBLZMA=OFF \ + -DGDAL_USE_DEFLATE=OFF \ + -DGDAL_USE_MONGOCXX=OFF \ + -DGDAL_USE_MRSID=OFF \ + -DGDAL_USE_PUBLICDECOMPWT=OFF \ + -DGDAL_USE_MYSQL=OFF \ + -DGDAL_USE_NETCDF=OFF \ + -DGDAL_USE_ORACLE=OFF \ + -DGDAL_USE_ODBC=OFF \ + -DGDAL_USE_OGDI=OFF \ + -DGDAL_USE_OPENCL=OFF \ + -DGDAL_USE_OPENEXR=OFF \ + -DGDAL_USE_OPENJPEG=OFF \ + -DGDAL_USE_PCRE=OFF \ + -DGDAL_USE_PCRE2=OFF \ + -DGDAL_USE_PDFIUM=OFF \ + -DGDAL_USE_PODOFO=OFF \ + -DGDAL_USE_POPPLER=OFF \ + -DGDAL_USE_QHULL=OFF \ + -DGDAL_USE_RASDAMAN=OFF \ + -DGDAL_USE_RASTERLITE2=OFF \ + -DGDAL_USE_RDB=OFF \ + -DGDAL_USE_SFCGAL=OFF \ + -DGDAL_USE_FYBA=OFF \ + -DGDAL_USE_SPATIALITE=OFF \ + -DGDAL_USE_SQLITE3=OFF \ + -DGDAL_USE_TEIGHA=OFF \ + -DGDAL_USE_TILEDB=OFF \ + -DGDAL_USE_WEBP=OFF \ + -DGDAL_USE_XERCESC=OFF \ + -DGDAL_USE_ZSTD=OFF \ + -DGDAL_ENABLE_DRIVER_PCIDSK=OFF \ + -DGDAL_ENABLE_DRIVER_PCRASTER=OFF \ + -DGDAL_ENABLE_DRIVER_NULL=OFF \ + -DGDAL_ENABLE_MACOSX_FRAMEWORK=OFF \ + -DENABLE_GNM=OFF \ + -DENABLE_PAM=OFF \ + -DBUILD_JAVA_BINDINGS=OFF \ + -DBUILD_PYTHON_BINDINGS=OFF ifeq ($(BR2_PACKAGE_LIBXML2),y) GDAL_DEPENDENCIES += libxml2 -GDAL_CONF_OPTS += --with-xml2 +GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=ON else -GDAL_CONF_OPTS += --without-xml2 +GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=OFF endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql -GDAL_CONF_OPTS += --with-pg +GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON else -GDAL_CONF_OPTS += --without-pg +GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=OFF endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:43 -0000 Subject: [Buildroot] [git commit branch/next] boot/edk2: refine license Message-ID: <20230220205152.D72AD86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40c05259d89545c40a2ead709be161569db54a05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The edk2 project is licensed under the BSD-2-Clause license with a patent grant, as per commit 304bff7223a8 ("edk2: Change License.txt from 2-Clause BSD to BSD+Patent"). There is a BSD-2-Clause-Patent SPDX license identifier[1] for this case, therefore refine the edk2 package to use this more specific identifier. [1]: https://spdx.org/licenses/BSD-2-Clause-Patent.html Signed-off-by: Vincent Stehl?? Cc: Dick Olsson Signed-off-by: Thomas Petazzoni --- boot/edk2/edk2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index 7d8765c310..953bea6fd3 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -7,7 +7,7 @@ EDK2_VERSION = edk2-stable202102 EDK2_SITE = https://github.com/tianocore/edk2 EDK2_SITE_METHOD = git -EDK2_LICENSE = BSD-2-Clause +EDK2_LICENSE = BSD-2-Clause-Patent EDK2_LICENSE_FILES = License.txt EDK2_CPE_ID_VENDOR = tianocore EDK2_DEPENDENCIES = edk2-platforms host-python3 host-acpica host-util-linux From peter at korsgaard.com Mon Feb 20 20:52:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:43 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.08.2 Message-ID: <20230220205151.1D6A281979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12a33b54b319437a8636825dd80e8fe88d497930 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard (cherry picked from commit 25680e6aa823bdeabb51d0768f12cebcd09c6d68) [Peter: drop Makefile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 40 ++++++++++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index abee6d9fac..b856f16179 100644 --- a/CHANGES +++ b/CHANGES @@ -74,6 +74,46 @@ #15061: Node.js Package fails to build against musl i386 #15071: RTL8723BS library is outdated +2022.08.2, released November 16th, 2022 + + Important / security related fixes. + + Defconfig: Aspeed ast2600evb: Correct FPU config, Kontron bl + imx8mm: Bump U-Boot to fix build issue, Pine64: Change to + mainline ATF to fix build issue, Zynqmp zcu102 / zcu106 / kria + kv260: Fix pmufw reset issue + + Updated/fixed packages: arm-trusted-firmware, bind, botan, + ca-certificates, collectd, darkhttpd, dbus, dbus-broker, dhcp, + dnsmasq, docker-cli, docker-engine, exfatprogs, expat, + f2fs-tools, faad2, ffmpeg, freerdp, gitlab-runner, glibc, + gnutls, go, gpsd, gptfdisk, grub2, gsl, gst-omx, + gst1-devtools, gst1-libav, gst1-plugins-bad, + gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, hdparm, hostapd, imagemagick, + iwd, jack2, libbpf, libcurl, libidn2, libinput, libmdbx, + libopenssl, libosip2, libpng, libtasn1, libtorrent-rasterbar, + libuhttpd, libvncserver, libxml2, linux, linux-tools, lldpd, + lrzip, lz4, matchbox-startup-monitor, meson, msmtp, + multipath-tools, mupdf, musl, mv-ddr-marvell, mxml, nodejs, + ntfs-3g, numactl, openssh, openvmtools, oracle-mysql, + paho-mqtt-c, perl-net-ssleay, php, pixman, poppler, procps-ng, + python-django, python3, qdecoder, redis, rpi-userland, rsync, + rtl8189es, rtl8189fs, rtl8723bu, rtl8723ds, + rtl8812au-aircrack-ng, rtl8821au, rtl_433, samba4, shapelib, + socat, sqlite, squashfs, squid, strongswan, sudo, swupdate, + timescaledb, uclibc-ng-test, udisks, uftp, uhd, umtprd, + usbguard, vim, vlc, volk, wavemon, wilc-driver, + wireguard-linux-compat, wolfssl, wpa_supplicant, wpewebkit, + zlib-ng, zsh + + Issues resolved (http://bugs.uclibc.org): + + #14936: nodejs does not build + #15026: package/udisks: install to staging + #15061: Node.js Package fails to build against musl i386 + 2022.08.1, released October 2nd, 2022 Important / security related fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index f558e52ca6..40c7c4e1ce 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2022.08.1' +RELEASE='2022.08.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Mon Feb 20 20:52:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:44 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.02.7 Message-ID: <20230220205151.3920686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d46f51064e4611142c723ad080d01ed6095af2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard (cherry picked from commit d036dc6ec873f50a24e73d8dbdafecb3b4098909) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/CHANGES b/CHANGES index b856f16179..d08b2500ab 100644 --- a/CHANGES +++ b/CHANGES @@ -479,6 +479,41 @@ #14731: BR2_PACKAGE_IOSTAT #14751: LVM2 Outdated Link +2022.02.7, released November 17th, 2022 + + Important / security related fixes. + + Defconfig: Pine64: Change to mainline ATF to fix build + issue, Zynqmp zcu102 / zcu106: Fix pmufw reset issue + + Updated/fixed packages: arm-trusted-firmware, bind, botan, + collectd, darkhttpd, dbus, dhcp, dnsmasq, docker-cli, + docker-engine, exfatprogs, expat, f2fs-tools, faad2, ffmpeg, + freerdp, gnutls, go, gpsd, grub2, gsl, gst-omx, gst1-devtools, + gst1-libav, gst1-plugins-bad, gst1-plugins-base, + gst1-plugins-good, gst1-plugins-ugly, gst1-python, + gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, hdparm, hostapd, imagemagick, + iwd, jack2, libbpf, libcurl, libfribi, libidn2, libinput, + libmdbx, libopenssl, libosip2, libpng, libtasn1, + libtorrent-rasterbar, libuhttpd, libvncserver, libxml2, linux, + linux-tools, lldpd, lrzip, lz4, matchbox-startup-monitor, + msmtp, multipath-tools, mupdf, musl, mv-ddr-marvell, mxml, + nodejs, ntfs-3g, numactl, openvmtools, oracle-mysql, + paho-mqtt-c, perl-net-ssleay, php, pixman, poppler, procps-ng, + python-django, python3, qdecoder, rpi-userland, rsync, + rtl8189es, rtl8189fs, rtl8723bu, rtl8812au-aircrack-ng, + rtl8821au, rtl_433, samba4, shapelib, socat, squid, sqlite, + squashfs, strongswan, sudo, swupdate, timescaledb, u-boot, + uclibc-ng-test, udisks, uftp, uhd, umtprd, vim, wavemon, + wireguard-linux-compat, wolfssl, wpa_supplicant, wpewebkit, + zlib-ng, zsh + + Issues resolved (http://bugs.uclibc.org): + + #15026: package/udisks: install to staging + #15061: Node.js Package fails to build against musl i386 + 2022.02.6, released October 2nd, 2022 Important / security related fixes. From arnout at mind.be Mon Feb 20 20:52:44 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:52:44 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: add libubootenv as optional dependency Message-ID: <20230220205153.1468A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a11b36089b34dcf0c1b90835a436f50efec3d8fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next If the swupdate configuration contains CONFIG_UBOOT=y it uses libubootenv to access the U-Boot environment. We don't have Buildroot config options for all the different optional dependencies of swupdate, instead we rely on the user to select the appropriate packages and simply add the dependency in the .mk file. Do this for libubootenv as well. swupdate doesn't have anything like HAVE_LIBUBOOTENV, it just assumes libubootenv is available. Fixes: bootloader/uboot.c:23:10: fatal error: libuboot.h: No such file or directory 23 | #include Note that libubootenv is normally built before swupdate (alphabetical ordering), so the error only occrus with BR2_PER_PACKAGE_DIRECTORIES or when building swupdate directly. Note that the autobuilders don't have this error, because they only build swupdate with a default configuration that doesn't have U-Boot support. Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle --- package/swupdate/swupdate.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index bfc161d490..ed0c1e56a8 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -81,6 +81,10 @@ else SWUPDATE_MAKE_ENV += HAVE_LIBGPIOD=n endif +ifeq ($(BR2_PACKAGE_LIBUBOOTENV),y) +SWUPDATE_DEPENDENCIES += libubootenv +endif + ifeq ($(BR2_PACKAGE_LIBURIPARSER),y) SWUPDATE_DEPENDENCIES += liburiparser SWUPDATE_MAKE_ENV += HAVE_URIPARSER=y From peter at korsgaard.com Mon Feb 20 20:52:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:45 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.11-rc2 Message-ID: <20230220205151.0A26C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90f2700c09359b5f7627a1632bdcff911a6c5576 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- CHANGES | 26 ++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 58 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 3090466d2e..abee6d9fac 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,29 @@ +2022.11-rc2, released November 16th, 2022 + + Fixes all over the tree. + + Removed defconfigs: Amarule a64 relic, ARM Juno, Bananapi M1 / + M1 plus / M2 plus / M64, FriendlyARM NanoPC T4 / A64 / M1 / M1 + plus / M4 / Neo2 / Neo4 / Neo plus2 / R1 / Orangepi PC2 / Plus + / Prime / rk3399 / Win, Rock PC rk3399 / PI4 / N10. + + Updated/fixed packages: alsa-utils, arm-trusted-firmware, + bdwgc, boost, botan, ca-certificates, crun, dbus-broker, + docopt-cpp, dracut, efivar, freeipmi, gawk, gensio, gptfdisk, + gsl, guile, imagemagick, ipmitool, libidn2, libkcapi, + libopenssl, libqb, libuhttpd, libvncserver, linux, + linux-tools, lxc, makedumpfile, matchbox-startup-monitor, + mdio-tools, multipath-tools, mupdf, ntfs-3g, numactl, + perl-net-ssleay, pixman, procps-ng, rpi-userland, rsync, + s6-linux-init, socat, strongswan, sudo, swupdate, systemd, + udisks, vlc, wavemon, wolfssl, zlib-ng + + Removed packages: libdcadec + + Issues resolved (http://bugs.uclibc.org): + + #15121: make nconfig failes with nvidia drivers and mesa3d selected + 2022.11-rc1, released November 3rd, 2022 Fixes all over the tree and new features. diff --git a/Makefile b/Makefile index 7c1c07a2e4..b2f342f4a8 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.11-rc1 +export BR2_VERSION := 2022.11-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1667490600 +BR2_VERSION_EPOCH = 1668603000 # 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 98a4d3a28e..9f2a81eb2b 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@
-

Latest release candidate: 2022.11-rc1

+

Latest release candidate: 2022.11-rc2

- +
- +
-

buildroot-2022.11-rc1.tar.gz

-

PGP signature

+

buildroot-2022.11-rc2.tar.gz

+

PGP signature

- +
- +
-

buildroot-2022.11-rc1.tar.xz

-

PGP signature

+

buildroot-2022.11-rc2.tar.xz

+

PGP signature

diff --git a/docs/website/news.html b/docs/website/news.html index c228c1f1e6..ba6e85f2e3 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

News

    +
  • +
    +
    +
    +

    2022.11-rc2 released

    +

    16 November 2022

    +
    +
    +

    2022.11-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

    + +

    Head to the downloads page to pick up the + 2022.11-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

    +
    +
    +
    • +
  • From arnout at mind.be Mon Feb 20 20:52:45 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:52:45 -0000 Subject: [Buildroot] [git commit branch/next] package.libopenssl: fix enabling/disabling mdc2 Message-ID: <20230220205153.2D17486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=45bb69c2bdee44346d6be5b58e46b2278e40a04a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 3dbc86f09897 (openssl: bump version, enable mdc2+camellia+tlsext) form 2010-06-03, forced the build of mdc2. Commit a83d41867c8d (package/libopenssl: add option to enable some features) added an option to explicitly disable mdc2, but forgot to amend the existing enabling option. It appears that, like most (all?) openssl config options, mdc2 ends up enabled unless explicitly disabled. Additionally, mdc2 depends on DES, so without DES, mdc2 gets disabled. So, drop the explicit enabling option, and make mdc2 select DES. Signed-off-by: Yann E. MORIN Cc: "GAUTRON, Erwan" Cc: "Weber, Matthew L Collins" Signed-off-by: Arnout Vandecappelle --- package/libopenssl/Config.in | 1 + package/libopenssl/libopenssl.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in index 00339238fb..7a3f56a512 100644 --- a/package/libopenssl/Config.in +++ b/package/libopenssl/Config.in @@ -63,6 +63,7 @@ config BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 config BR2_PACKAGE_LIBOPENSSL_ENABLE_MDC2 bool "enable MDC2" default y + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES config BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2 bool "enable BLAKE2" diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 3542b89727..fc22c20467 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -79,7 +79,6 @@ define LIBOPENSSL_CONFIGURE_CMDS $(if $(BR2_PACKAGE_HAS_CRYPTODEV),enable-devcryptoeng) \ no-rc5 \ enable-camellia \ - enable-mdc2 \ no-tests \ no-fuzz-libfuzzer \ no-fuzz-afl \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:45 -0000 Subject: [Buildroot] [git commit branch/next] package/luaposix: bump to version 36.0 Message-ID: <20230220205244.3D4CF86497@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c93db6789b1afaba27703baf9d323bcb06e6430e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next diff LICENSE: -Copyright (C) 2006-2021 luaposix authors +Copyright (C) 2006-2023 luaposix authors Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/luaposix/luaposix.hash | 4 ++-- package/luaposix/luaposix.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash index ee76ea103d..fc0b5fa747 100644 --- a/package/luaposix/luaposix.hash +++ b/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1b5c48d2abd59de0738d1fc1e6204e44979ad2a1a26e8e22a2d6215dd502c797 luaposix-35.1.tar.gz -sha256 f50bc0f3197523b1709f31707425f2de95f8a45534b081a6b564179ab059e850 LICENSE +sha256 e0fcb4996f76aa49ae3e5edf69978171091e3d69d5de5589d591d227f8a427c1 luaposix-36.0.tar.gz +sha256 ea0fdaae50b0d31a81c2c99f4354264783c71043fd40522feaa40eecc069599b LICENSE diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index fa26709154..1a537defc4 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 35.1 +LUAPOSIX_VERSION = 36.0 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 20 20:52:46 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:52:46 -0000 Subject: [Buildroot] [git commit branch/next] package/libkrb5: security bump to version 1.20.1 Message-ID: <20230220205153.382D48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f93c47fad847219e2d748570484ca800faa9d4eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issue: CVE-2022-42898: In MIT krb5 releases 1.8 and later, an authenticated attacker may be able to cause a KDC or kadmind process to crash by reading beyond the bounds of allocated memory, creating a denial of service. A privileged attacker may similarly be able to cause a Kerberos or GSS application service to crash. On 32-bit platforms, an attacker can also cause insufficient memory to be allocated for the result, potentially leading to remote code execution in a KDC, kadmind, or GSS or Kerberos application server process. An attacker with the privileges of a cross-realm KDC may be able to extract secrets from a KDC process's memory by having them copied into the PAC of a new ticket. Bugfix tarballs are located in the same directory as the base version, so introduce LIBKRB5_VERSION_MAJOR. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- package/libkrb5/libkrb5.hash | 2 +- package/libkrb5/libkrb5.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libkrb5/libkrb5.hash b/package/libkrb5/libkrb5.hash index 2fce24b45b..94dfa2ed6e 100644 --- a/package/libkrb5/libkrb5.hash +++ b/package/libkrb5/libkrb5.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 7e022bdd3c851830173f9faaa006a230a0e0fdad4c953e85bff4bf0da036e12f krb5-1.20.tar.gz +sha256 704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851 krb5-1.20.1.tar.gz # Hash for license file: sha256 cfadcf7b2ead2f3af793c25c00638c9908ac0023b101695f40cb9a03b16811dc NOTICE diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index 5e547470ed..9bacfaee58 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBKRB5_VERSION = 1.20 -LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION) +LIBKRB5_VERSION_MAJOR = 1.20 +LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).1 +LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION_MAJOR) LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz LIBKRB5_SUBDIR = src LIBKRB5_LICENSE = MIT, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, others From peter at korsgaard.com Mon Feb 20 20:52:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:46 -0000 Subject: [Buildroot] [git commit branch/next] package/freerdp: security bump to version 2.9.0 Message-ID: <20230220205151.53DCB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35c2ee69a51a343f2e5c1f88eeb8c7064922ded4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Backported #8403: Fixed multiple client side input validation issues (CVE-2022-39316, CVE-2022-39317, CVE-2022-39318, CVE-2022-39319, CVE-2022-39320, CVE-2022-41877, CVE-2022-39347) https://github.com/FreeRDP/FreeRDP/releases/tag/2.9.0 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 94d0746d40..f6adc05312 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.8.1.tar.gz.sha256 -sha256 ea8903b29914134202a972c06052432678c89cb5eebcc8f5a41553030c97376b freerdp-2.8.1.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.9.0.tar.gz.sha256 +sha256 fcf71cf5b09c5c2636341ba212f34b8fb728246ea28e08caf6cef8b4a96184b7 freerdp-2.9.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index ae844c589e..fb0e6920cf 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.8.1 +FREERDP_VERSION = 2.9.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From peter at korsgaard.com Mon Feb 20 20:52:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:47 -0000 Subject: [Buildroot] [git commit branch/next] docs/website: update for 2022.02.7 Message-ID: <20230220205151.4801681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd7279973981926f878c8988df8a187a56caff1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index c042f34887..538f2f6042 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
    Download
    -

    Latest long term support release: 2022.02.6

    +

    Latest long term support release: 2022.02.7

    - +
    - +
    -

    buildroot-2022.02.6.tar.gz

    -

    PGP signature

    +

    buildroot-2022.02.7.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2022.02.6.tar.xz

    -

    PGP signature

    +

    buildroot-2022.02.7.tar.xz

    +

    PGP signature

    diff --git a/docs/website/news.html b/docs/website/news.html index d8d2a14cd1..ee7ce344c9 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

    News

      +
    • +
      +
      +
      +

      2022.02.7 released

      +

      17 November 2022

      +
      +
      +

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

      +
      +
      +
      • +
    • From arnout at mind.be Mon Feb 20 20:52:47 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:52:47 -0000 Subject: [Buildroot] [git commit branch/next] package/gcc: ensure __register_frame is optimized out for glibc Message-ID: <20230220205153.77456828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fc5c1ccdb11af5185471272ef5eeece81b5e866 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next On some architectures when building with -O0 the __register_frame symbol fails to get optimized out which can cause linking failures when building glibc. To fix this set -O1 for GCC target libs when building with glibc and BR2_OPTIMIZE_0 on the problematic target architectures. This was reported both to GCC [1] and glibc [2] upstream. It is not entirely clear yet where the bug lies exactly. At the moment the assumption is that it's GCC, so create a symbol BR2_TOOLCHAIN_HAS_GCC_BUG_107728. This issue only seems to occur when linking glibc, not with anything else, so only compile libgcc from host-gcc-initial with -O1. Fixes: - http://autobuild.buildroot.net/results/89b/89b6c6924240b7cf82035a844f3573673e91b364 - http://autobuild.buildroot.net/results/46f/46f4ec99d2b23d354a4bb5e92123d64f0da6ed27 - http://autobuild.buildroot.net/results/839/839f929f700cf181ebdf34389c7806a96f55813e - http://autobuild.buildroot.net/results/0e2/0e202bf53a683930f3cad6edef2a4dea629eaecb - http://autobuild.buildroot.net/results/8a8/8a8c917f597fdcca744e696e19e9300b64004335 - http://autobuild.buildroot.net/results/c05/c058b27ed2834dfa633b63ec6c3639ab1e8bf412 - http://autobuild.buildroot.net/results/8ba/8ba8882a861cf7df359c23969c09b2be0725b2e5 [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107728 [2] https://sourceware.org/bugzilla/show_bug.cgi?id=29621 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/gcc/gcc-initial/gcc-initial.mk | 7 +++++++ toolchain/Config.in | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index f5bc6c5b77..ebd8e8f017 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -43,6 +43,13 @@ HOST_GCC_INITIAL_CONF_OPTS = \ HOST_GCC_INITIAL_CONF_ENV = \ $(HOST_GCC_COMMON_CONF_ENV) +# Enable GCC target libs optimizations to optimize out __register_frame +# when needed for some architectures when building with glibc. +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_107728),y) +HOST_GCC_INITIAL_CONF_ENV += CFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CFLAGS) -O1" +HOST_GCC_INITIAL_CONF_ENV += CXXFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CXXFLAGS) -O1" +endif + HOST_GCC_INITIAL_MAKE_OPTS = $(HOST_GCC_COMMON_MAKE_OPTS) all-gcc all-target-libgcc HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc install-target-libgcc diff --git a/toolchain/Config.in b/toolchain/Config.in index 23596d6c85..e7329c1a1c 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -227,6 +227,18 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_104028 bool default y if BR2_m68k +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107728 +# https://sourceware.org/bugzilla/show_bug.cgi?id=29621 +config BR2_TOOLCHAIN_HAS_GCC_BUG_107728 + bool + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_OPTIMIZE_0 + default y if BR2_microblazebe || BR2_microblazeel \ + || BR2_mips || BR2_mipsel \ + || BR2_nios2 \ + || BR2_or1k \ + || BR2_sh + config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:48 -0000 Subject: [Buildroot] [git commit branch/next] configs/roc_pc_rk3399: remove defconfig Message-ID: <20230220205153.810BC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ade5915c1d65b7653125d1cf6952efdd6113806 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 5370ec74516495a4ac6c0bc9780b8e92a2f1e6b1 was supposed to remove the roc_pc_rk3399 defconfig. It actually removed everything related to this defconfig, but not the defconfig itself. The build failure this commit was supposed to fix is therefore still happening. We fix it up by finally removing the defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3372859807 Signed-off-by: Thomas Petazzoni --- configs/roc_pc_rk3399_defconfig | 55 ----------------------------------------- 1 file changed, 55 deletions(-) diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig deleted file mode 100644 index ae7cf19a80..0000000000 --- a/configs/roc_pc_rk3399_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="roc-pc-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.18" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-roc-pc" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" -BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/firefly/roc-rk3399-pc/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/roc-rk3399-pc/post-build.sh" From yann.morin.1998 at free.fr Mon Feb 20 20:52:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:48 -0000 Subject: [Buildroot] [git commit branch/next] package/xen: security bump to version 4.14.5 Message-ID: <20230220205151.93FC681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f901a90f57927bf09ccac2dc145c77688501cfe2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Includes a number of bugfixes and the security fixes up to xsa-400: https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-5/ Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/xen/xen.hash | 2 +- package/xen/xen.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index a81d05e3f7..5637f0e8d9 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e76d56dfcdabf5d80aa06819f44472de49526a518dbb483eb08e7ff9aec2c669 xen-4.14.4.tar.gz +sha256 a1a24092ad14658eed420b7d56b67d0d9d5b314e96c30a799b45f3a721f98bf0 xen-4.14.5.tar.gz sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING diff --git a/package/xen/xen.mk b/package/xen/xen.mk index 03341d4275..169753e89f 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.14.4 +XEN_VERSION = 4.14.5 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:49 -0000 Subject: [Buildroot] [git commit branch/next] package/dash: fix static with shared build Message-ID: <20230220205153.AC1A586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3c14de0dfc047817917fb4dbc20c211e751bb3f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When BR2_SHARED_STATIC_LIBS is enabled we pass both --enable-static and --enable-shared to configure. dash configure.ac only looks for --enable-static to make the build static. But when linking against libedit pkg-config only returns dynamic linking dependencies, so the indirect ncurses dependency in not mentioned. The end result is that libedit can't find ncurses symbols on link. BR2_SHARED_STATIC_LIBS only makes sense for libraries, not executable binaries. Pass --disable-static unless BR2_STATIC_LIBS is enabled for static only build. Fixes: http://autobuild.buildroot.net/results/137d39cc5ec436759a2fde3f26ce5633e0ad6c2e/ http://autobuild.buildroot.net/results/55a38e0e45212bf7403d9ccb626c9422e3affe72/ http://autobuild.buildroot.net/results/8f109f1a04a6a2ff6d8c4c920e499fbaec3f72b9/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/dash/dash.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/dash/dash.mk b/package/dash/dash.mk index fed3a99551..6efc71e568 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -27,6 +27,10 @@ else DASH_CONF_OPTS += --without-libedit endif +ifeq ($(BR2_STATIC_LIBS),) +DASH_CONF_OPTS += --disable-static +endif + define DASH_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/src/dash $(TARGET_DIR)/bin/dash endef From yann.morin.1998 at free.fr Mon Feb 20 20:52:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:49 -0000 Subject: [Buildroot] [git commit branch/next] package/nodejs: security bump to version 16.18.1 Message-ID: <20230220205151.878678648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58ba17c7849056fbeb3b4d652749af32f81e7360 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issue: DNS rebinding in --inspect via invalid octal IP address (Medium) (CVE-2022-43548) The Node.js rebinding protector for --inspect still allows invalid IP address, specifically, the octal format. An example of an octal IP address is 1.09.0.0, the 09 octet is invalid because 9 is not a number in the base 8 number system. Browsers such as Firefox (tested on latest version m105) will still attempt to resolve this invalid octal address via DNS. When combined with an active --inspect session, such as when using VSCode, an attacker can perform DNS rebinding and execute arbitrary code Update license hash for an update of base64 (MIT license) and a change in copyright year: https://github.com/nodejs/node/commit/8ea9a71b15a953cd0936f7e6aae84c62873a77b5 https://github.com/nodejs/node/commit/9f14dc1a8f43a9f3755c673009378b798cbdd73b Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/nodejs/nodejs.hash | 6 +++--- package/nodejs/nodejs.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 83e4c271ce..4408782248 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v16.17.1/SHASUMS256.txt -sha256 6721feb4152d56d2c6b358ce397abd5a7f1daf09ee2e25c5021b9b4d3f86a330 node-v16.17.1.tar.xz +# From https://nodejs.org/dist/v16.18.1/SHASUMS256.txt +sha256 1f8051a88f86f42064f4415fe7a980e59b0a502ecc8def583f6303bc4d445238 node-v16.18.1.tar.xz # Hash for license file -sha256 69090e865afa7c62715b97f0712632d2923bd7a5faba91f94e4e75a2f9219d5e LICENSE +sha256 0bec08634ba79b5404f6b7f92ea850f3c2a06e27e6f83f2267e4f5e55ae33334 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 29a10b900f..367d5d2058 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 16.17.1 +NODEJS_VERSION = 16.18.1 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = \ From yann.morin.1998 at free.fr Mon Feb 20 20:52:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:50 -0000 Subject: [Buildroot] [git commit branch/next] package/systemd: security bump to version v250.8 Message-ID: <20230220205151.CEF3E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e24033f76ad339b1a66fb5b259b8e28f076de97e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issue: - CVE-2022-3821: An off-by-one Error issue was discovered in Systemd in format_timespan() function of time-util.c. An attacker could supply specific values for time and accuracy that leads to buffer overrun in format_timespan(), leading to a Denial of Service. https://github.com/systemd/systemd/issues/23928 Drop now upstream 0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- ...call-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch | 33 ---------------------- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch b/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch deleted file mode 100644 index 0934886acb..0000000000 --- a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 16c132a6a0389e0eaea70c4ad95dbfd1637ec5ba Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 7 Jan 2022 22:25:23 +0100 -Subject: [PATCH] missing-syscall: define MOVE_MOUNT_T_EMPTY_PATH if missing - -MOVE_MOUNT_T_EMPTY_PATH has been added to systemd 250 by [1] -but it's defined in kernel headers since version 5.2. - -[1] c7bf079bbc19e3b409acc0c7acc3e14749211fe2 - -Signed-off-by: Romain Naour ---- - src/basic/missing_syscall.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 8267b1a90c..793d111c55 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -569,6 +569,10 @@ static inline int missing_open_tree( - #define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ - #endif - -+#ifndef MOVE_MOUNT_T_EMPTY_PATH -+#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ -+#endif -+ - static inline int missing_move_mount( - int from_dfd, - const char *from_pathname, --- -2.31.1 - diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 3572b25965..3b98566f32 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz +sha256 638a2fc78828765fc97bc73f428205b6dc1d359149b6c6bfe4d2a649cba2cca8 systemd-250.8.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 b42f6a502b..30a75b7a40 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.4 +SYSTEMD_VERSION = 250.8 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From arnout at mind.be Mon Feb 20 20:52:50 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:52:50 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Giulio Benetti to rtl8192eu package Message-ID: <20230220205153.CE87486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=059c61a18f6a1fb8f0580c0475983fe37fa69e44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 569d58407a..bfebf8163c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1151,6 +1151,7 @@ F: package/qt5/ F: package/rockchip-mali/ F: package/rtl8188eu/ F: package/rtl8189es/ +F: package/rtl8192eu/ F: package/rtl8723bu/ F: package/rtl8723ds/ F: package/rtl8812au-aircrack-ng/ From yann.morin.1998 at free.fr Mon Feb 20 20:52:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:51 -0000 Subject: [Buildroot] [git commit branch/next] package/nginx: add upstream security fix for CVE-2022-4174{1, 2} Message-ID: <20230220205151.6DEB681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8fa2ff28574cb5ba889cb4fc48240dd4291401a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: - CVE-2022-41741: Memory corruption in the ngx_http_mp4_module - CVE-2022-41742: Memory disclosure in the ngx_http_mp4_module https://mailman.nginx.org/archives/list/nginx-announce at nginx.org/message/RBRRON6PYBJJM2XIAPQBFBVLR4Q6IHRA/ Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- .../nginx/0011-Mp4-disabled-duplicate-atoms.patch | 315 +++++++++++++++++++++ package/nginx/nginx.mk | 3 + 2 files changed, 318 insertions(+) diff --git a/package/nginx/0011-Mp4-disabled-duplicate-atoms.patch b/package/nginx/0011-Mp4-disabled-duplicate-atoms.patch new file mode 100644 index 0000000000..7baa810b56 --- /dev/null +++ b/package/nginx/0011-Mp4-disabled-duplicate-atoms.patch @@ -0,0 +1,315 @@ +From 6b022a5556af22b6e18532e547a6ae46b0d8c6ea Mon Sep 17 00:00:00 2001 +From: Roman Arutyunyan +Date: Wed, 19 Oct 2022 10:53:17 +0300 +Subject: [PATCH] Mp4: disabled duplicate atoms. + +Most atoms should not appear more than once in a container. Previously, +this was not enforced by the module, which could result in worker process +crash, memory corruption and disclosure. + +Signed-off-by: Peter Korsgaard +--- + src/http/modules/ngx_http_mp4_module.c | 147 +++++++++++++++++++++++++ + 1 file changed, 147 insertions(+) + +diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c +index 9c3f627f..4eff01e9 100644 +--- a/src/http/modules/ngx_http_mp4_module.c ++++ b/src/http/modules/ngx_http_mp4_module.c +@@ -1121,6 +1121,12 @@ ngx_http_mp4_read_ftyp_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + return NGX_ERROR; + } + ++ if (mp4->ftyp_atom.buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 ftyp atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; + + ftyp_atom = ngx_palloc(mp4->request->pool, atom_size); +@@ -1179,6 +1185,12 @@ ngx_http_mp4_read_moov_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + return NGX_DECLINED; + } + ++ if (mp4->moov_atom.buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 moov atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + conf = ngx_http_get_module_loc_conf(mp4->request, ngx_http_mp4_module); + + if (atom_data_size > mp4->buffer_size) { +@@ -1246,6 +1258,12 @@ ngx_http_mp4_read_mdat_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mdat atom"); + ++ if (mp4->mdat_atom.buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 mdat atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + data = &mp4->mdat_data_buf; + data->file = &mp4->file; + data->in_file = 1; +@@ -1372,6 +1390,12 @@ ngx_http_mp4_read_mvhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mvhd atom"); + ++ if (mp4->mvhd_atom.buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 mvhd atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom_header = ngx_mp4_atom_header(mp4); + mvhd_atom = (ngx_mp4_mvhd_atom_t *) atom_header; + mvhd64_atom = (ngx_mp4_mvhd64_atom_t *) atom_header; +@@ -1637,6 +1661,13 @@ ngx_http_mp4_read_tkhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_TKHD_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 tkhd atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->tkhd_size = atom_size; + trak->movie_duration = duration; + +@@ -1676,6 +1707,12 @@ ngx_http_mp4_read_mdia_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_MDIA_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 mdia atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->mdia_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -1799,6 +1836,13 @@ ngx_http_mp4_read_mdhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_MDHD_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 mdhd atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->mdhd_size = atom_size; + trak->timescale = timescale; + trak->duration = duration; +@@ -1862,6 +1906,12 @@ ngx_http_mp4_read_hdlr_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_HDLR_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 hdlr atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->hdlr_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -1890,6 +1940,12 @@ ngx_http_mp4_read_minf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_MINF_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 minf atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->minf_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -1933,6 +1989,15 @@ ngx_http_mp4_read_vmhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf ++ || trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf) ++ { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 vmhd/smhd atom in \"%s\"", ++ mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->vmhd_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -1964,6 +2029,15 @@ ngx_http_mp4_read_smhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf ++ || trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf) ++ { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 vmhd/smhd atom in \"%s\"", ++ mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->smhd_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -1995,6 +2069,12 @@ ngx_http_mp4_read_dinf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_DINF_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 dinf atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->dinf_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -2023,6 +2103,12 @@ ngx_http_mp4_read_stbl_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_STBL_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stbl atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->stbl_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -2144,6 +2230,12 @@ ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_STSD_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stsd atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->stsd_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -2212,6 +2304,13 @@ ngx_http_mp4_read_stts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + atom_end = atom_table + entries * sizeof(ngx_mp4_stts_entry_t); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_STTS_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stts atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->time_to_sample_entries = entries; + + atom = &trak->stts_atom_buf; +@@ -2480,6 +2579,13 @@ ngx_http_mp4_read_stss_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + "sync sample entries:%uD", entries); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_STSS_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stss atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->sync_samples_entries = entries; + + atom_table = atom_header + sizeof(ngx_http_mp4_stss_atom_t); +@@ -2678,6 +2784,13 @@ ngx_http_mp4_read_ctts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + "composition offset entries:%uD", entries); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_CTTS_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 ctts atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->composition_offset_entries = entries; + + atom_table = atom_header + sizeof(ngx_mp4_ctts_atom_t); +@@ -2881,6 +2994,13 @@ ngx_http_mp4_read_stsc_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + atom_end = atom_table + entries * sizeof(ngx_mp4_stsc_entry_t); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_STSC_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stsc atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->sample_to_chunk_entries = entries; + + atom = &trak->stsc_atom_buf; +@@ -3213,6 +3333,13 @@ ngx_http_mp4_read_stsz_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + "sample uniform size:%uD, entries:%uD", size, entries); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_STSZ_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stsz atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->sample_sizes_entries = entries; + + atom_table = atom_header + sizeof(ngx_mp4_stsz_atom_t); +@@ -3396,6 +3523,16 @@ ngx_http_mp4_read_stco_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + atom_end = atom_table + entries * sizeof(uint32_t); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_STCO_ATOM].buf ++ || trak->out[NGX_HTTP_MP4_CO64_ATOM].buf) ++ { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stco/co64 atom in \"%s\"", ++ mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->chunks = entries; + + atom = &trak->stco_atom_buf; +@@ -3602,6 +3739,16 @@ ngx_http_mp4_read_co64_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + atom_end = atom_table + entries * sizeof(uint64_t); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_STCO_ATOM].buf ++ || trak->out[NGX_HTTP_MP4_CO64_ATOM].buf) ++ { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stco/co64 atom in \"%s\"", ++ mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->chunks = entries; + + atom = &trak->co64_atom_buf; +-- +2.30.2 + diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index ba01c7e016..62ea379ffc 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -19,6 +19,9 @@ NGINX_CONF_OPTS = \ --with-cpp="$(TARGET_CC)" \ --with-ld-opt="$(TARGET_LDFLAGS)" +# 0011-Mp4-disabled-duplicate-atoms.patch +NGINX_IGNORE_CVES += CVE-2022-41741 CVE-2022-41742 + # www-data user and group are used for nginx. Because these user and group # are already set by buildroot, it is not necessary to redefine them. # See system/skeleton/etc/passwd From peter at korsgaard.com Mon Feb 20 20:52:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:51 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi: add comment to display udev dependency for gbm when wayland/x11 are disabled Message-ID: <20230220205153.F050E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8aa68a529ecdcf6f83d81a71863d59eb2147522b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Without this additional comment only the comment kodi needs an OpenGL EGL backend with OpenGL or GLES support is displayed which is not enough to guide users. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 90710683db..7bd8bc2943 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -27,6 +27,9 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM depends on BR2_PACKAGE_HAS_UDEV # libinput select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS +comment "kodi needs udev support for gbm" + depends on !BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND bool default y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:52 -0000 Subject: [Buildroot] [git commit branch/next] package/netsnmp: security bump to version 5.9.3 Message-ID: <20230220205153.A0D8186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83b4337354014a5425a0ee081b94d4d0991f8d47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: - CVE-2022-24805 A buffer overflow in the handling of the INDEX of NET-SNMP-VACM-MIB can cause an out-of-bounds memory access. - CVE-2022-24809 A malformed OID in a GET-NEXT to the nsVacmAccessTable can cause a NULL pointer dereference. - CVE-2022-24806 Improper Input Validation when SETing malformed OIDs in master agent and subagent simultaneously - CVE-2022-24807 A malformed OID in a SET request to SNMP-VIEW-BASED-ACM-MIB::vacmAccessTable can cause an out-of-bounds memory access. - CVE-2022-24808 A malformed OID in a SET request to NET-SNMP-AGENT-MIB::nsLogTable can cause a NULL pointer dereference - CVE-2022-24810 A malformed OID in a SET to the nsVacmAccessTable can cause a NULL pointer dereference. Drop openssl linking patches as they are merged upstream / upstream changed to use pkg-config for openssl since: https://github.com/net-snmp/net-snmp/commit/8c3a094fbe9ebe38ed762488082d52c6d4e04ddb Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...1-configure-static-linking-Fix-SSL-checks.patch | 146 --------------------- .../0002-configure-Fix-lcrypto-lz-test.patch | 44 ------- ...ix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch | 39 ------ ...ix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch | 39 ------ package/netsnmp/netsnmp.hash | 4 +- package/netsnmp/netsnmp.mk | 2 +- 6 files changed, 3 insertions(+), 271 deletions(-) diff --git a/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch b/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch deleted file mode 100644 index bf61fdfe7a..0000000000 --- a/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch +++ /dev/null @@ -1,146 +0,0 @@ -From bd59be8e4e339870a1400f6866a7b73ca11f6460 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 12 Sep 2018 20:16:39 +0200 -Subject: [PATCH] configure, static linking: Fix SSL checks - -During checking of DTLS_method, the stub program is linked only with -ssl -libssl.a lacks some function from -lcrypto: -RAND_*() -ERR_*() -BUF_MEM_*() -etc. -and -lz: -- inflate() -- deflate() - -Append -lcrypto and -lz to LIBS variable when checking DTLS_method. - -See also https://sourceforge.net/p/net-snmp/patches/1374/. - -Signed-off-by: Giulio Benetti -[bvanassche: Edited subject / rewrote this patch] -[yann.morin.1998 at free.fr: - - use an actual backport of bd59be8e4e339870a1400f6866a7b73ca11f6460 -] -Signed-off-by: Yann E. MORIN ---- - configure | 52 ++++++++++++++++++++++++++++++++++--- - configure.d/config_os_libs2 | 14 +++++++--- - 2 files changed, 58 insertions(+), 8 deletions(-) - -diff --git a/configure b/configure -index 6504a8e58a..1116cecaad 100755 ---- a/configure -+++ b/configure -@@ -23228,16 +23228,60 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_md5" >&5 - $as_echo "$ac_cv_lib_crypto_EVP_md5" >&6; } - if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : -- CRYPTO="crypto" -+ CRYPTO="crypto"; LIBCRYPTO="-lcrypto" -+else -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_md5 in -lcrypto" >&5 -+$as_echo_n "checking for EVP_md5 in -lcrypto... " >&6; } -+if ${ac_cv_lib_crypto_EVP_md5+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lcrypto -lz $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char EVP_md5 (); -+int -+main () -+{ -+return EVP_md5 (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_crypto_EVP_md5=yes -+else -+ ac_cv_lib_crypto_EVP_md5=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_md5" >&5 -+$as_echo "$ac_cv_lib_crypto_EVP_md5" >&6; } -+if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : -+ CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz" -+fi -+ -+ - fi - -- fi -+ else -+ LIBCRYPTO="-l${CRYPTO}" -+ fi - - if test x$CRYPTO != x; then - - $as_echo "#define HAVE_LIBCRYPTO 1" >>confdefs.h - -- LIBCRYPTO="-l${CRYPTO}" - netsnmp_save_LIBS="$LIBS" - LIBS="$LIBCRYPTO" - for ac_func in AES_cfb128_encrypt EVP_sha224 EVP_sha384 EVP_MD_CTX_create EVP_MD_CTX_destroy EVP_MD_CTX_new EVP_MD_CTX_free DH_set0_pqg DH_get0_pqg DH_get0_key ASN1_STRING_get0_data X509_NAME_ENTRY_get_object X509_NAME_ENTRY_get_data X509_get_signature_nid -@@ -23291,7 +23335,7 @@ _ACEOF - LIBS="$netsnmp_save_LIBS" - fi - netsnmp_save_LIBS="$LIBS" -- LIBS="-lssl" -+ LIBS="-lssl $LIBCRYPTO" - for ac_func in TLS_method TLSv1_method DTLS_method DTLSv1_method SSL_library_init SSL_load_error_strings ERR_get_error_all - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 4a1ad1551f..75214cfff3 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -306,13 +306,19 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - LIBS="$netsnmp_save_LIBS" - - if test x$CRYPTO = x; then -- AC_CHECK_LIB([crypto], [EVP_md5], [CRYPTO="crypto"]) -- fi -+ AC_CHECK_LIB([crypto], [EVP_md5], -+ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], [ -+ AC_CHECK_LIB([crypto], [EVP_md5], -+ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], -+ [-lz]) -+ ]) -+ else -+ LIBCRYPTO="-l${CRYPTO}" -+ fi - - if test x$CRYPTO != x; then - AC_DEFINE(HAVE_LIBCRYPTO, 1, - [Define to 1 if you have the OpenSSL library (-lcrypto or -leay32).]) -- LIBCRYPTO="-l${CRYPTO}" - netsnmp_save_LIBS="$LIBS" - LIBS="$LIBCRYPTO" - AC_CHECK_FUNCS([AES_cfb128_encrypt]dnl -@@ -342,7 +348,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - LIBS="$netsnmp_save_LIBS" - fi - netsnmp_save_LIBS="$LIBS" -- LIBS="-lssl" -+ LIBS="-lssl $LIBCRYPTO" - AC_CHECK_FUNCS([TLS_method TLSv1_method DTLS_method DTLSv1_method]dnl - [SSL_library_init SSL_load_error_strings]) - LIBS="$netsnmp_save_LIBS" --- -2.25.1 - diff --git a/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch b/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch deleted file mode 100644 index 50387c8390..0000000000 --- a/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 13da2bcde8e22dd0127a668374fdf79bed04d353 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Mon, 17 Sep 2018 07:33:34 -0700 -Subject: [PATCH] configure: Fix -lcrypto -lz test - -Avoid that the second crypto library test uses the cached result from -the first test by explicitly clearing the cached test result. - -[yann.morin.1998 at free.fr: - - use an actual backport of 13da2bcde8e22dd0127a668374fdf79bed04d353 -] -Signed-off-by: Yann E. MORIN ---- - configure | 1 + - configure.d/config_os_libs2 | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/configure b/configure -index 1116cecaad..33b8c93e57 100755 ---- a/configure -+++ b/configure -@@ -23231,6 +23231,7 @@ if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : - CRYPTO="crypto"; LIBCRYPTO="-lcrypto" - else - -+ unset ac_cv_lib_crypto_EVP_md5 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_md5 in -lcrypto" >&5 - $as_echo_n "checking for EVP_md5 in -lcrypto... " >&6; } - if ${ac_cv_lib_crypto_EVP_md5+:} false; then : -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 75214cfff3..81788a2096 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -308,6 +308,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - if test x$CRYPTO = x; then - AC_CHECK_LIB([crypto], [EVP_md5], - [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], [ -+ unset ac_cv_lib_crypto_EVP_md5 - AC_CHECK_LIB([crypto], [EVP_md5], - [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], - [-lz]) --- -2.25.1 - diff --git a/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch b/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch deleted file mode 100644 index 4293e15d25..0000000000 --- a/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8e273c688aa235ed9c68570a700d31596bac14df Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Mon, 15 Oct 2018 19:07:05 +0200 -Subject: [PATCH] configure: fix AC_CHECK_FUNCS(EVP_sha224 EVP_sha384 ...) - failure on static linking - -If building as static lib, AC_CHECK_FUNCS(EVP_sha224 EVP_sha384 ...) -fails due to missing -lz in $LIBS. -At the moment, $LIBS contains $LIBCRYPTO only discarding previous $LIBS -content. - -Add $LIBS to: -LIBS="$LIBCRYPTO" -as: -LIBS="$LIBCRYPTO $LIBS" -This way $LIBS will contain -lz at the end of linking command that in -static linking build is mandatory. - -Signed-off-by: Giulio Benetti ---- - configure.d/config_os_libs2 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 81788a209..93044000b 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -321,7 +321,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - AC_DEFINE(HAVE_LIBCRYPTO, 1, - [Define to 1 if you have the OpenSSL library (-lcrypto or -leay32).]) - netsnmp_save_LIBS="$LIBS" -- LIBS="$LIBCRYPTO" -+ LIBS="$LIBCRYPTO $LIBS" - AC_CHECK_FUNCS([AES_cfb128_encrypt]dnl - [EVP_sha224 EVP_sha384 ]dnl - [EVP_MD_CTX_create EVP_MD_CTX_destroy]dnl --- -2.17.1 - diff --git a/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch b/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch deleted file mode 100644 index 8fcce2a5c7..0000000000 --- a/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1ab6e3fc3cf61fa5a7b7363e59095e868474524b Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Mon, 15 Oct 2018 19:34:26 +0200 -Subject: [PATCH] configure: fix AC_CHECK_FUNCS(TLS_method TLSv1_method - ...) failure on static linking - -If building as static lib, AC_CHECK_FUNCS(TLS_method TLSv1_method ...) -fails due to missing -lz in $LIBS. -At the moment, $LIBS contains "-lssl $LIBCRYPTO" only discarding -previous $LIBS content. - -Add $LIBS to: -LIBS="-lssl $LIBCRYPTO" -as: -LIBS="-lssl $LIBCRYPTO $LIBS" -This way $LIBS will contain -lz at the end of linking command that in -static linking build is mandatory. - -Signed-off-by: Giulio Benetti ---- - configure.d/config_os_libs2 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 93044000b..c811c63ec 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -349,7 +349,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - LIBS="$netsnmp_save_LIBS" - fi - netsnmp_save_LIBS="$LIBS" -- LIBS="-lssl $LIBCRYPTO" -+ LIBS="-lssl $LIBCRYPTO $LIBS" - AC_CHECK_FUNCS([TLS_method TLSv1_method DTLS_method DTLSv1_method]dnl - [SSL_library_init SSL_load_error_strings]dnl - [ERR_get_error_all]) --- -2.17.1 - diff --git a/package/netsnmp/netsnmp.hash b/package/netsnmp/netsnmp.hash index 9d196c8bee..e1e9d10898 100644 --- a/package/netsnmp/netsnmp.hash +++ b/package/netsnmp/netsnmp.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature at -# https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9/net-snmp-5.9.tar.gz.asc +# https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9.3/net-snmp-5.9.3.tar.gz.asc # using key D0F8F495DA6160C44EFFBF10F07B9D2DACB19FD6 -sha256 04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071 net-snmp-5.9.tar.gz +sha256 2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a net-snmp-5.9.3.tar.gz # Hash for license file sha256 ed869ea395a1f125819a56676385ab0557a21507764bf56f2943302011381e59 COPYING diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 985cfeac72..56a07e2ccd 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETSNMP_VERSION = 5.9 +NETSNMP_VERSION = 5.9.3 NETSNMP_SITE = https://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION) NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz NETSNMP_LICENSE = Various BSD-like From yann.morin.1998 at free.fr Mon Feb 20 20:52:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:52 -0000 Subject: [Buildroot] [git commit branch/next] package/gptfdisk: fix runtime failure with popt 1.19 Message-ID: <20230220205152.01F1B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b91eb32120d5a810a7f5a8bb2ad17baf16eedd6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following runtime failure raised since bump of popt to version 1.19 in commit 895bfba93f6e5535f2132aeea144d2cd87ebc71b: Problem opening for reading! Error is 2. The specified file does not exist! Fixes: - No autobuilder failure Signed-off-by: Fabrice Fontaine Reported-by: Florian Fainelli Tested-by: Florian Fainelli Signed-off-by: Yann E. MORIN --- ...-crash-of-sgdisk-when-compiled-with-lates.patch | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch b/package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch new file mode 100644 index 0000000000..bdeedd95cc --- /dev/null +++ b/package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch @@ -0,0 +1,60 @@ +From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d Mon Sep 17 00:00:00 2001 +From: Rod Smith +Date: Fri, 15 Apr 2022 18:10:14 -0400 +Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest + popt (commit 740; presumably eventually release 1.19) + +[Retrieved from: +https://sourceforge.net/p/gptfdisk/code/ci/5d5e76d369a412bfb3d2cebb5fc0a7509cef878d/] +Signed-off-by: Fabrice Fontaine +--- + NEWS | 8 ++++++++ + gptcl.cc | 2 +- + support.h | 2 +- + 3 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/NEWS b/NEWS +index c7add56..9e153fd 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,11 @@ ++1.0.10 (?/??/2022): ++------------------- ++ ++- Fixed problem that caused sgdisk to crash with errors about being unable ++ to read the disk's partition table when compiled with the latest popt ++ (commit 740, which is pre-release as I type; presumably version 1.19 and ++ later once released). ++ + 1.0.9 (4/14/2022): + ------------------ + +diff --git a/gptcl.cc b/gptcl.cc +index 34c9421..0d578eb 100644 +--- a/gptcl.cc ++++ b/gptcl.cc +@@ -155,7 +155,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + } // while + + // Assume first non-option argument is the device filename.... +- device = (char*) poptGetArg(poptCon); ++ device = strdup((char*) poptGetArg(poptCon)); + poptResetContext(poptCon); + + if (device != NULL) { +diff --git a/support.h b/support.h +index 8ba9ad1..f91f1bc 100644 +--- a/support.h ++++ b/support.h +@@ -8,7 +8,7 @@ + #include + #include + +-#define GPTFDISK_VERSION "1.0.9" ++#define GPTFDISK_VERSION "1.0.9.1" + + #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__) + // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64 +-- +2.35.1 + From peter at korsgaard.com Mon Feb 20 20:52:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:53 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi: fix build with fmt >= 9.x Message-ID: <20230220205154.06E0386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61bdd02e933e194a6f8aa5c1541f675d8ab71d09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For details see https://github.com/xbmc/xbmc/pull/21674 Build-tested using this previously broken defconfig: BR2_x86_64=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...t-as-char-as-formatting-of-non-void-point.patch | 54 ++++++++++++++++++++++ ...1-cast-as-char-as-formatting-of-non-void-.patch | 33 +++++++++++++ 2 files changed, 87 insertions(+) diff --git a/package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch b/package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch new file mode 100644 index 0000000000..af68de220c --- /dev/null +++ b/package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch @@ -0,0 +1,54 @@ +From 44b30c116682968bacf8aec566fc9c193026ecc9 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Wed, 6 Jul 2022 22:48:35 +1000 +Subject: [PATCH] GLUtils: cast as char as formatting of non-void pointers + is disallowed + +Downloaded from upstream commit: +https://github.com/xbmc/xbmc/commit/44b30c116682968bacf8aec566fc9c193026ecc9 + +Signed-off-by: Bernd Kuhls +--- + xbmc/utils/GLUtils.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp +index 1ef804709f..c36dcf6a20 100644 +--- a/xbmc/utils/GLUtils.cpp ++++ b/xbmc/utils/GLUtils.cpp +@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno) + void LogGraphicsInfo() + { + #if defined(HAS_GL) || defined(HAS_GLES) +- const GLubyte *s; ++ const char* s; + +- s = glGetString(GL_VENDOR); ++ s = reinterpret_cast(glGetString(GL_VENDOR)); + if (s) + CLog::Log(LOGINFO, "GL_VENDOR = %s", s); + else + CLog::Log(LOGINFO, "GL_VENDOR = NULL"); + +- s = glGetString(GL_RENDERER); ++ s = reinterpret_cast(glGetString(GL_RENDERER)); + if (s) + CLog::Log(LOGINFO, "GL_RENDERER = %s", s); + else + CLog::Log(LOGINFO, "GL_RENDERER = NULL"); + +- s = glGetString(GL_VERSION); ++ s = reinterpret_cast(glGetString(GL_VERSION)); + if (s) + CLog::Log(LOGINFO, "GL_VERSION = %s", s); + else + CLog::Log(LOGINFO, "GL_VERSION = NULL"); + +- s = glGetString(GL_SHADING_LANGUAGE_VERSION); ++ s = reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION)); + if (s) + CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s); + else +-- +2.30.2 + diff --git a/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch b/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch new file mode 100644 index 0000000000..41dc3356bd --- /dev/null +++ b/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch @@ -0,0 +1,33 @@ +From 651c82853fe69dc5aa3e6a50f2eb2f752caafba0 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Mon, 11 Jul 2022 09:39:02 +0000 +Subject: [PATCH] WinSystemX11: cast as char as formatting of non-void + pointers is disallowed + +Downloaded from upstream commit: +https://github.com/xbmc/xbmc/commit/651c82853fe69dc5aa3e6a50f2eb2f752caafba0 + +Signed-off-by: Bernd Kuhls +--- + xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp +index 8a18288fd8..033c0f77bf 100644 +--- a/xbmc/windowing/X11/WinSystemX11.cpp ++++ b/xbmc/windowing/X11/WinSystemX11.cpp +@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager() + + if(status == Success && items_read) + { +- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data); ++ const char* s; ++ ++ s = reinterpret_cast(data); ++ CLog::Log(LOGDEBUG, "Window Manager Name: {}", s); + } + else + CLog::Log(LOGDEBUG,"Window Manager Name: "); +-- +2.30.2 + From yann.morin.1998 at free.fr Mon Feb 20 20:52:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:53 -0000 Subject: [git commit branch/next] package/mali-driver: remove Miquèl from the DEVELOPERS list Message-ID: <20230220205152.65606828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=124fc473dd9298facc6f9fd58dd59a706550e29b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next I am not really maintaining these packages, I don't follow closely enough nor use them to take the time to make the necessary changes. Giulio has been much more reactive than me to fix issues and he is already listed for them anyway. Cc: Giulio Benetti Signed-off-by: Miquel Raynal Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 826e04d805..2aecdb1c8f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2128,10 +2128,6 @@ F: package/qcom-db410c-firmware/ N: Mikhail Boiko F: package/libfribidi/ -N: Miqu??l Raynal -F: package/mali-driver/ -F: package/rockchip-mali/ - N: Mircea Gliga F: package/mbuffer/ From peter at korsgaard.com Mon Feb 20 20:52:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:54 -0000 Subject: [Buildroot] [git commit branch/next] package/vim: security bump to version 9.0.0951 Message-ID: <20230220205154.3C0C986494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d40c8b31d50c55f6bf2536f2e3ad2af4c6dd5730 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-3705: A vulnerability was found in vim and classified as problematic. Affected by this issue is the function qf_update_buffer of the file quickfix.c of the component autocmd Handler. The manipulation leads to use after free. The attack may be launched remotely. Upgrading to version 9.0.0805 is able to address this issue. The name of the patch is d0fab10ed2a86698937e3c3fed2f10bd9bb5e731. It is recommended to upgrade the affected component. The identifier of this vulnerability is VDB-212324. Signed-off-by: Fabrice Fontaine 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 ef3bc46cdc..03ee908db4 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 f50ab9c023e7c276a61a7076c840d36254ce83691dba28af9ac5c513b6ace3b4 vim-9.0.0709.tar.gz +sha256 c95c9abcf024bd6293ad199e4efa1c09452a9c6456c9cbaf53d896cf7b9f4d08 vim-9.0.0951.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 de04910387a62ad4f9b36b91457c8d5ef32733ac5d768a128071b93f4821fcd1 README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 22c1eb91a8..d814c68630 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.0.0709 +VIM_VERSION = 9.0.0951 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:54 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8723ds: fix build failure due to endianness and Linux version 6.0 Message-ID: <20230220205152.5A3C381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=354f9387f33b5fab023cb98e52d84d58624f0ecf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add local patch pending upstream[0] to override CFLAGS to set endianness according to BR2_ENDIAN. Let's also bump version to latest to support up to Linux 6.1. [0]: https://github.com/lwfinger/rtl8723ds/pull/29 Fixes: http://autobuild.buildroot.net/results/2646ec0512f867e20c25c1d0a6417826218942d6/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...ve-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch | 39 ++++++++++++++++++++++ package/rtl8723ds/rtl8723ds.hash | 2 +- package/rtl8723ds/rtl8723ds.mk | 10 ++++-- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/package/rtl8723ds/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch b/package/rtl8723ds/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch new file mode 100644 index 0000000000..4495817358 --- /dev/null +++ b/package/rtl8723ds/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch @@ -0,0 +1,39 @@ +From 769a1943cb409f89f3c91208294a89b09bf47b86 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 16 Nov 2022 16:08:21 +0100 +Subject: [PATCH] Makefile: move 'EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)' at the + end of EXTRA_FLAGS assignment + +At the moment USER_EXTRA_CFLAGS can't override local Makfile EXTRA_CFLAGS +since it's assigned at the beginning of the Makefile. For example it's not +possible to undefine the hardcoded CONFIG_LITTLE_ENDIAN and this doesn't +allow to build these modules for big endian architectures. So let's move +the assignment of USER_EXTRA_CFLAGS to EXTRA_CFLAGS after the last +EXTRA_CFLAGS assignment. + +Signed-off-by: Giulio Benetti +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index aa57f85..3d91574 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,3 @@ +-EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) + EXTRA_CFLAGS += -O1 + #EXTRA_CFLAGS += -O3 + #EXTRA_CFLAGS += -Wall +@@ -1738,6 +1737,8 @@ ifneq ($(USER_MODULE_NAME),) + MODULE_NAME := $(USER_MODULE_NAME) + endif + ++EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) ++ + ifneq ($(KERNELRELEASE),) + + rtk_core := core/rtw_cmd.o \ +-- +2.34.1 + diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index 440ce75ef4..cbc77e14c1 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 cc5dcf9d17cefabfeba3e68671367c7d69091936e40f71dc5e1165c61195a9fb rtl8723ds-76146e85847beb2427b1d4958fa275822f2b04ab.tar.gz +sha256 691040a85d838f8d8d7da0f2ed460f1ea5f6734c40dc73770ba7e260b6cda9cc rtl8723ds-5ab2d3f3858dc4c833013c47a79faa05b10198f6.tar.gz diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 8598f906a9..0d96e6b03a 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,14 +4,20 @@ # ################################################################################ -RTL8723DS_VERSION = 76146e85847beb2427b1d4958fa275822f2b04ab +RTL8723DS_VERSION = 5ab2d3f3858dc4c833013c47a79faa05b10198f6 RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 +# Undefine the hardcoded CONFIG_LITTLE_ENDIAN +RTL8723DS_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN +# Set endianness +RTL8723DS_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN + RTL8723DS_MODULE_MAKE_OPTS = \ CONFIG_RTL8723DS=m \ KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) + KSRC=$(LINUX_DIR) \ + USER_EXTRA_CFLAGS="$(RTL8723DS_USER_EXTRA_CLAGS)" define RTL8723DS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) From peter at korsgaard.com Mon Feb 20 20:52:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:59 -0000 Subject: [Buildroot] [git commit branch/next] package/git: security bump to version 2.31.5 Message-ID: <20230220205154.47FA886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1d783d4ddcda520fa8bcf4d8cd3f68eaa2188a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: * CVE-2022-39253: When relying on the `--local` clone optimization, Git dereferences symbolic links in the source repository before creating hardlinks (or copies) of the dereferenced link in the destination repository. This can lead to surprising behavior where arbitrary files are present in a repository's `$GIT_DIR` when cloning from a malicious repository. Git will no longer dereference symbolic links via the `--local` clone mechanism, and will instead refuse to clone repositories that have symbolic links present in the `$GIT_DIR/objects` directory. Additionally, the value of `protocol.file.allow` is changed to be "user" by default. * CVE-2022-39260: An overly-long command string given to `git shell` can result in overflow in `split_cmdline()`, leading to arbitrary heap writes and remote code execution when `git shell` is exposed and the directory `$HOME/git-shell-commands` exists. `git shell` is taught to refuse interactive commands that are longer than 4MiB in size. `split_cmdline()` is hardened to reject inputs larger than 2GiB. https://github.com/git/git/blob/v2.31.5/Documentation/RelNotes/2.31.5.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 41afa83f86..af09ea817b 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 84fc20acf8fbea5cad7d5d7be0dfeb32494f1dac8e6c61675c904d1fd3d8c016 git-2.31.4.tar.xz +sha256 dbc80f88d36fcde2c7acaaa9343cfab0f56effe9aee60e5eb00f3f36b8a619b4 git-2.31.5.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index dc587170e8..653b4f46ad 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.31.4 +GIT_VERSION = 2.31.5 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From peter at korsgaard.com Mon Feb 20 20:53:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:00 -0000 Subject: [Buildroot] [git commit branch/next] package/memcached: fix static with shared build Message-ID: <20230220205154.CEB7386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7ca04fcb42051c53ff146cb7566d9ddd95a3a71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When BR2_SHARED_STATIC_LIBS is enabled, both --enable-static and --enable-shared are passed to configure. memcached configure.ac only looks for --enable-static to make the build static. But when linking against openssl pkg-config only returns dynamic linking dependencies, resulting in the following build failure: /home/thomas/autobuild/instance-1/output-1/host/bin/aarch64_be-buildroot-linux-gnu-gcc -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -pthread -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -static -o timedrun timedrun.o -levent -L/home/thomas/autobuild/instance-1/output-1/host/bin/../aarch64_be-buildroot-linux-gnu/sysroot/usr/lib -lssl -lcrypto -ldl /home/thomas/autobuild/instance-1/output-1/host/lib/gcc/aarch64_be-buildroot-linux-gnu/11.3.0/../../../../aarch64_be-buildroot-linux-gnu/bin/ld: memcached-memcached.o: in function `conn_new': memcached.c:(.text+0x1668): undefined reference to `SSL_set_info_callback' BR2_SHARED_STATIC_LIBS only makes sense for libraries, not executable binaries. Pass --disable-static unless BR2_STATIC_LIBS is enabled for static only build. Fixes: - http://autobuild.buildroot.org/results/363c84eaa69350e02bec0b35b88d4bdf4dad804c - http://autobuild.buildroot.org/results/0bde41bb700100d8df5ebdb1b64dfdc76c7af475 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/memcached/memcached.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index c7d89054bd..7b4069e820 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -29,4 +29,8 @@ else MEMCACHED_CONF_OPTS += --disable-tls endif +ifeq ($(BR2_STATIC_LIBS),) +MEMCACHED_CONF_OPTS += --disable-static +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:00 -0000 Subject: [Buildroot] [git commit branch/next] package/edk2-platforms: refine license Message-ID: <20230220205152.CD7C18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9bd126698397eb3105340f48e4f033e09b34aaf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The edk2-platforms project is licensed under the BSD-2-Clause license with a patent grant, as per commit ae604e4ffe8f ("edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent"). There is a BSD-2-Clause-Patent SPDX license identifier[1] for this case, therefore refine the edk2-platforms package to use this more specific identifier. [1]: https://spdx.org/licenses/BSD-2-Clause-Patent.html Signed-off-by: Vincent Stehl?? Cc: Dick Olsson Signed-off-by: Thomas Petazzoni --- package/edk2-platforms/edk2-platforms.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk index 7de59c1afc..6b155bf013 100644 --- a/package/edk2-platforms/edk2-platforms.mk +++ b/package/edk2-platforms/edk2-platforms.mk @@ -7,7 +7,7 @@ # Keep in sync with latest commit as of the release date for boot/edk2 EDK2_PLATFORMS_VERSION = db922e1253cb6f1fc456805bc42fb7d401eed5c2 EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION)) -EDK2_PLATFORMS_LICENSE = BSD-2-Clause +EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent EDK2_PLATFORMS_LICENSE_FILES = License.txt EDK2_PLATFORMS_INSTALL_TARGET = NO EDK2_PLATFORMS_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:01 -0000 Subject: [Buildroot] [git commit branch/next] utils/scanpypi: add LICENCE.TXT to the list of the license files Message-ID: <20230220205152.EEE6786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ecc33ec02a9c137387b9eb820e8e3b55b732d9b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scanpypi b/utils/scanpypi index 452b4a3fc3..3c98bb4bcc 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -487,7 +487,7 @@ class BuildrootPackage(): lines = [] filenames = ['LICENCE', 'LICENSE', 'LICENSE.MD', 'LICENSE.RST', - 'LICENSE.TXT', 'COPYING', 'COPYING.TXT'] + 'LICENCE.TXT', 'LICENSE.TXT', 'COPYING', 'COPYING.TXT'] self.license_files = list(find_file_upper_case(filenames, self.tmp_extract)) lines.append(self.__get_license_names(self.license_files)) From yann.morin.1998 at free.fr Mon Feb 20 20:53:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:01 -0000 Subject: [Buildroot] [git commit branch/next] package/optee-client: rename S30optee Message-ID: <20230220205155.2FB9486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cac489ce1dc9f280a76dce92960ea7807a5e86c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit b1c4c18766e51ee55e8d2e3a7cb12cb2762b12ff forgot to rename S30optee in optee-client.mk resulting in the following build failure: /usr/bin/install -m 0755 -D package/optee-client//S30optee /home/autobuild/autobuild/instance-0/output-1/target/etc/init.d/S30optee /usr/bin/install: cannot stat 'package/optee-client//S30optee': No such file or directory Fixes: - http://autobuild.buildroot.org/results/21fc165933e6d226de277b62d4ce99342cef0ffb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/optee-client/optee-client.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 252841ba10..3fbbe9484c 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -27,8 +27,8 @@ OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF endif define OPTEE_CLIENT_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30optee \ - $(TARGET_DIR)/etc/init.d/S30optee + $(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30tee-supplicant \ + $(TARGET_DIR)/etc/init.d/S30tee-supplicant endef $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:02 -0000 Subject: [Buildroot] [git commit branch/next] package/exim: add upstream security fixes for CVE-2022-3559 Message-ID: <20230220205154.8F1F086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bccc70e07a2a8c093249d6701161791e7ab7b58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes CVE-2022-3559: A vulnerability was found in Exim and classified as problematic. This issue affects some unknown processing of the component Regex Handler. The manipulation leads to use after free. The name of the patch is 4e9ed49f8f12eb331b29bd5b6dc3693c520fddc2. It is recommended to apply a patch to fix this issue. The identifier VDB-211073 was assigned to this vulnerability. The upstream patch does not apply to 4.96, so use the backported patches from Debian. Amazingly, the patch needs 3 additional patches to unbreak builds without "WITH_CONTENT_SCAN" (default in Buildroot), so add those as well. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...0006-Fix-regex-n-use-after-free.-Bug-2915.patch | 173 +++++++++++++++++++++ .../0007-Fix-non-WITH_CONTENT_SCAN-build.patch | 61 ++++++++ .../0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch | 139 +++++++++++++++++ .../0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch | 49 ++++++ package/exim/exim.mk | 3 + 5 files changed, 425 insertions(+) diff --git a/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch b/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch new file mode 100644 index 0000000000..57fa189b04 --- /dev/null +++ b/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch @@ -0,0 +1,173 @@ +From 4e9ed49f8f12eb331b29bd5b6dc3693c520fddc2 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 31 Aug 2022 15:37:40 +0100 +Subject: [PATCH] Fix $regex use-after-free. Bug 2915 + +[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_08-Fix-regex-n-use-after-free.-Bug-2915.patch] +[Peter: drop Changelog hunk] +Signed-off-by: Peter Korsgaard +--- + src/exim.c | 4 +--- + src/expand.c | 2 +- + src/functions.h | 1 + + src/globals.c | 2 +- + src/regex.c | 29 ++++++++++++++++++----------- + src/smtp_in.c | 2 ++ + test/confs/4002 | 10 ++++++++++ + test/mail/4002.userx | 7 +++++++ + test/scripts/4000-scanning/4002 | 7 +++++++ + 9 files changed, 53 insertions(+), 17 deletions(-) + +--- a/src/exim.c ++++ b/src/exim.c +@@ -1999,12 +1999,10 @@ + + regex_whitelisted_macro = + regex_must_compile(US"^[A-Za-z0-9_/.-]*$", FALSE, TRUE); + #endif + +-for (i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; +- + /* If the program is called as "mailq" treat it as equivalent to "exim -bp"; + this seems to be a generally accepted convention, since one finds symbolic + links called "mailq" in standard OS configurations. */ + + if ((namelen == 5 && Ustrcmp(argv[0], "mailq") == 0) || +@@ -6082,11 +6080,11 @@ + callout_address = NULL; + sending_ip_address = NULL; + deliver_localpart_data = deliver_domain_data = + recipient_data = sender_data = NULL; + acl_var_m = NULL; +- for(int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; ++ regex_vars_clear(); + + store_reset(reset_point); + } + + exim_exit(EXIT_SUCCESS); /* Never returns */ +--- a/src/expand.c ++++ b/src/expand.c +@@ -1871,11 +1871,11 @@ + { + tree_node * node = tree_search(router_var, name + 2); + return node ? node->data.ptr : strict_acl_vars ? NULL : US""; + } + +-/* Handle $auth variables. */ ++/* Handle $auth, $regex variables. */ + + if (Ustrncmp(name, "auth", 4) == 0) + { + uschar *endptr; + int n = Ustrtoul(name + 4, &endptr, 10); +--- a/src/functions.h ++++ b/src/functions.h +@@ -436,10 +436,11 @@ + extern int regex(const uschar **); + #endif + extern BOOL regex_match(const pcre2_code *, const uschar *, int, uschar **); + extern BOOL regex_match_and_setup(const pcre2_code *, const uschar *, int, int); + extern const pcre2_code *regex_must_compile(const uschar *, BOOL, BOOL); ++extern void regex_vars_clear(void); + extern void retry_add_item(address_item *, uschar *, int); + extern BOOL retry_check_address(const uschar *, host_item *, uschar *, BOOL, + uschar **, uschar **); + extern retry_config *retry_find_config(const uschar *, const uschar *, int, int); + extern BOOL retry_ultimate_address_timeout(uschar *, const uschar *, +--- a/src/globals.c ++++ b/src/globals.c +@@ -1313,11 +1313,11 @@ + #ifndef DISABLE_PIPE_CONNECT + const pcre2_code *regex_EARLY_PIPE = NULL; + #endif + const pcre2_code *regex_ismsgid = NULL; + const pcre2_code *regex_smtp_code = NULL; +-const uschar *regex_vars[REGEX_VARS]; ++const uschar *regex_vars[REGEX_VARS] = { 0 };; + #ifdef WHITELIST_D_MACROS + const pcre2_code *regex_whitelisted_macro = NULL; + #endif + #ifdef WITH_CONTENT_SCAN + uschar *regex_match_string = NULL; +--- a/src/regex.c ++++ b/src/regex.c +@@ -94,22 +94,32 @@ + } + pcre2_match_data_free(md); + return FAIL; + } + ++ ++/* reset expansion variables */ ++void ++regex_vars_clear(void) ++{ ++regex_match_string = NULL; ++for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; ++} ++ ++ ++ + int +-regex(const uschar **listptr) ++regex(const uschar ** listptr) + { + unsigned long mbox_size; +-FILE *mbox_file; +-pcre_list *re_list_head; +-uschar *linebuffer; ++FILE * mbox_file; ++pcre_list * re_list_head; ++uschar * linebuffer; + long f_pos = 0; + int ret = FAIL; + +-/* reset expansion variable */ +-regex_match_string = NULL; ++regex_vars_clear(); + + if (!mime_stream) /* We are in the DATA ACL */ + { + if (!(mbox_file = spool_mbox(&mbox_size, NULL, NULL))) + { /* error while spooling */ +@@ -167,18 +177,17 @@ + + + int + mime_regex(const uschar **listptr) + { +-pcre_list *re_list_head = NULL; +-FILE *f; +-uschar *mime_subject = NULL; ++pcre_list * re_list_head = NULL; ++FILE * f; ++uschar * mime_subject = NULL; + int mime_subject_len = 0; + int ret; + +-/* reset expansion variable */ +-regex_match_string = NULL; ++regex_vars_clear(); + + /* precompile our regexes */ + if (!(re_list_head = compile(*listptr))) + return FAIL; /* no regexes -> nothing to do */ + +--- a/src/smtp_in.c ++++ b/src/smtp_in.c +@@ -2155,12 +2155,14 @@ + prdr_requested = FALSE; + #endif + #ifdef SUPPORT_I18N + message_smtputf8 = FALSE; + #endif ++regex_vars_clear(); + body_linecount = body_zerocount = 0; + ++lookup_value = NULL; /* Can be set by ACL */ + sender_rate = sender_rate_limit = sender_rate_period = NULL; + ratelimiters_mail = NULL; /* Updated by ratelimit ACL condition */ + /* Note that ratelimiters_conn persists across resets. */ + + /* Reset message ACL variables */ diff --git a/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch b/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch new file mode 100644 index 0000000000..9f87f18e00 --- /dev/null +++ b/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch @@ -0,0 +1,61 @@ +From d8ecc7bf97934a1e2244788c610c958cacd740bd Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 31 Aug 2022 17:03:37 +0100 +Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build. + +Broken-by: 4e9ed49f8f + +[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_09-Fix-non-WITH_CONTENT_SCAN-build.patch] +Signed-off-by: Peter Korsgaard +--- + src/exim.c | 11 +++++++++++ + src/regex.c | 10 ---------- + 2 files changed, 11 insertions(+), 10 deletions(-) + +--- a/src/exim.c ++++ b/src/exim.c +@@ -1677,10 +1677,21 @@ + if ((s = expand_string(big_buffer))) printf("%s\n", CS s); + else printf("Failed: %s\n", expand_string_message); + } + + ++/* reset regex expansion variables */ ++void ++regex_vars_clear(void) ++{ ++regex_match_string = NULL; ++for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; ++} ++ ++ ++ ++ + + /************************************************* + * Entry point and high-level code * + *************************************************/ + +--- a/src/regex.c ++++ b/src/regex.c +@@ -95,20 +95,10 @@ + pcre2_match_data_free(md); + return FAIL; + } + + +-/* reset expansion variables */ +-void +-regex_vars_clear(void) +-{ +-regex_match_string = NULL; +-for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; +-} +- +- +- + int + regex(const uschar ** listptr) + { + unsigned long mbox_size; + FILE * mbox_file; diff --git a/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch b/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch new file mode 100644 index 0000000000..43cc1d79a9 --- /dev/null +++ b/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch @@ -0,0 +1,139 @@ +From 158dff9936e36a2d31d037d3988b9353458d6471 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 31 Aug 2022 17:17:59 +0100 +Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build (2) + +Broken-by: d8ecc7bf97 + +[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_10-Fix-non-WITH_CONTENT_SCAN-build-2.patch] +[Peter: drop Changelog hunk] +Signed-off-by: Peter Korsgaard +--- + src/exim.c | 13 +------------ + src/functions.h | 2 +- + src/globals.h | 2 +- + src/regex.c | 10 ++++++++++ + src/smtp_in.c | 2 ++ + 5 files changed, 15 insertions(+), 14 deletions(-) + +--- a/src/exim.c ++++ b/src/exim.c +@@ -1677,21 +1677,10 @@ + if ((s = expand_string(big_buffer))) printf("%s\n", CS s); + else printf("Failed: %s\n", expand_string_message); + } + + +-/* reset regex expansion variables */ +-void +-regex_vars_clear(void) +-{ +-regex_match_string = NULL; +-for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; +-} +- +- +- +- + + /************************************************* + * Entry point and high-level code * + *************************************************/ + +@@ -6085,17 +6074,17 @@ + deliver_domain_orig = NULL; + deliver_host = deliver_host_address = NULL; + dnslist_domain = dnslist_matched = NULL; + #ifdef WITH_CONTENT_SCAN + malware_name = NULL; ++ regex_vars_clear(); + #endif + callout_address = NULL; + sending_ip_address = NULL; + deliver_localpart_data = deliver_domain_data = + recipient_data = sender_data = NULL; + acl_var_m = NULL; +- regex_vars_clear(); + + store_reset(reset_point); + } + + exim_exit(EXIT_SUCCESS); /* Never returns */ +--- a/src/functions.h ++++ b/src/functions.h +@@ -432,15 +432,15 @@ + extern BOOL receive_msg(BOOL); + extern int_eximarith_t receive_statvfs(BOOL, int *); + extern void receive_swallow_smtp(void); + #ifdef WITH_CONTENT_SCAN + extern int regex(const uschar **); ++extern void regex_vars_clear(void); + #endif + extern BOOL regex_match(const pcre2_code *, const uschar *, int, uschar **); + extern BOOL regex_match_and_setup(const pcre2_code *, const uschar *, int, int); + extern const pcre2_code *regex_must_compile(const uschar *, BOOL, BOOL); +-extern void regex_vars_clear(void); + extern void retry_add_item(address_item *, uschar *, int); + extern BOOL retry_check_address(const uschar *, host_item *, uschar *, BOOL, + uschar **, uschar **); + extern retry_config *retry_find_config(const uschar *, const uschar *, int, int); + extern BOOL retry_ultimate_address_timeout(uschar *, const uschar *, +--- a/src/globals.h ++++ b/src/globals.h +@@ -895,16 +895,16 @@ + #ifndef DISABLE_PIPE_CONNECT + extern const pcre2_code *regex_EARLY_PIPE; /* For recognizing PIPE_CONNCT */ + #endif + extern const pcre2_code *regex_ismsgid; /* Compiled r.e. for message ID */ + extern const pcre2_code *regex_smtp_code; /* For recognizing SMTP codes */ +-extern const uschar *regex_vars[]; /* $regexN variables */ + #ifdef WHITELIST_D_MACROS + extern const pcre2_code *regex_whitelisted_macro; /* For -D macro values */ + #endif + #ifdef WITH_CONTENT_SCAN + extern uschar *regex_match_string; /* regex that matched a line (regex ACL condition) */ ++extern const uschar *regex_vars[]; + #endif + extern int remote_delivery_count; /* Number of remote addresses */ + extern int remote_max_parallel; /* Maximum parallel delivery */ + extern uschar *remote_sort_domains; /* Remote domain sorting order */ + extern retry_config *retries; /* Chain of retry config information */ +--- a/src/regex.c ++++ b/src/regex.c +@@ -95,10 +95,20 @@ + pcre2_match_data_free(md); + return FAIL; + } + + ++/* reset expansion variables */ ++void ++regex_vars_clear(void) ++{ ++regex_match_string = NULL; ++for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; ++} ++ ++ ++ + int + regex(const uschar ** listptr) + { + unsigned long mbox_size; + FILE * mbox_file; +--- a/src/smtp_in.c ++++ b/src/smtp_in.c +@@ -2155,11 +2155,13 @@ + prdr_requested = FALSE; + #endif + #ifdef SUPPORT_I18N + message_smtputf8 = FALSE; + #endif ++#ifdef WITH_CONTENT_SCAN + regex_vars_clear(); ++#endif + body_linecount = body_zerocount = 0; + + lookup_value = NULL; /* Can be set by ACL */ + sender_rate = sender_rate_limit = sender_rate_period = NULL; + ratelimiters_mail = NULL; /* Updated by ratelimit ACL condition */ diff --git a/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch b/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch new file mode 100644 index 0000000000..f9675c80d3 --- /dev/null +++ b/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch @@ -0,0 +1,49 @@ +From 32da6327e434e986a18b75a84f2d8c687ba14619 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Thu, 1 Sep 2022 15:54:35 +0100 +Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build (3) + +Broken-by: d8ecc7bf97 + +[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_11-Fix-non-WITH_CONTENT_SCAN-build-3.patch] +[Peter: drop Changelog hunk] +Signed-off-by: Peter Korsgaard +--- + src/expand.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/expand.c b/src/expand.c +index 89de56255..831ca2b75 100644 +--- a/src/expand.c ++++ b/src/expand.c +@@ -1869,6 +1869,7 @@ if (Ustrncmp(name, "auth", 4) == 0) + if (!*endptr && n != 0 && n <= AUTH_VARS) + return auth_vars[n-1] ? auth_vars[n-1] : US""; + } ++#ifdef WITH_CONTENT_SCAN + else if (Ustrncmp(name, "regex", 5) == 0) + { + uschar *endptr; +@@ -1876,6 +1877,7 @@ else if (Ustrncmp(name, "regex", 5) == 0) + if (!*endptr && n != 0 && n <= REGEX_VARS) + return regex_vars[n-1] ? regex_vars[n-1] : US""; + } ++#endif + + /* For all other variables, search the table */ + +@@ -8715,9 +8717,11 @@ assert_variable_notin() treats as const, so deconst is safe. */ + for (int i = 0; i < AUTH_VARS; i++) if (auth_vars[i]) + assert_variable_notin(US"auth", US auth_vars[i], &e); + ++#ifdef WITH_CONTENT_SCAN + /* check regex variables. assert_variable_notin() treats as const. */ + for (int i = 0; i < REGEX_VARS; i++) if (regex_vars[i]) + assert_variable_notin(US"regex", US regex_vars[i], &e); ++#endif + + /* check known-name variables */ + for (var_entry * v = var_table; v < var_table + var_table_size; v++) +-- +2.35.1 + diff --git a/package/exim/exim.mk b/package/exim/exim.mk index 9c54eeec44..cd2fabeab1 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -13,6 +13,9 @@ EXIM_CPE_ID_VENDOR = exim EXIM_SELINUX_MODULES = exim mta EXIM_DEPENDENCIES = host-berkeleydb host-pcre2 pcre2 berkeleydb host-pkgconf +# 0006-Fix-regex-n-use-after-free.-Bug-2915.patch +EXIM_IGNORE_CVES += CVE-2022-3559 + # Modify a variable value. It must already exist in the file, either # commented or not. define exim-config-change # variable-name, variable-value From peter at korsgaard.com Mon Feb 20 20:53:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:02 -0000 Subject: [Buildroot] [git commit branch/next] package/python3: add upstream security fix for CVE-2022-45061 Message-ID: <20230220205152.C24B2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39a2ff16f92a61a3e8593c394d211c18d01de8d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issue: CVE-2022-45061: An issue was discovered in Python before 3.11.1. An unnecessary quadratic algorithm exists in one path when processing some inputs to the IDNA (RFC 3490) decoder, such that a crafted, unreasonably long name being presented to the decoder could lead to a CPU denial of service. Hostnames are often supplied by remote servers that could be controlled by a malicious actor; in such a scenario, they could trigger excessive CPU consumption on the client attempting to make use of an attacker-supplied supposed hostname. For example, the attack payload could be placed in the Location header of an HTTP response with status code 302. Signed-off-by: Peter Korsgaard --- ...33-Fix-quadratic-time-idna-decoding.-GH-9.patch | 86 ++++++++++++++++++++++ package/python3/python3.mk | 3 + 2 files changed, 89 insertions(+) diff --git a/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch b/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch new file mode 100644 index 0000000000..d281e7261d --- /dev/null +++ b/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch @@ -0,0 +1,86 @@ +From 9bb8e18ca46fe66fa6802602f8a7228a24dd785f Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington at users.noreply.github.com> +Date: Mon, 7 Nov 2022 19:23:16 -0800 +Subject: [PATCH] [3.11] gh-98433: Fix quadratic time idna decoding. (GH-99092) + (GH-99222) + +There was an unnecessary quadratic loop in idna decoding. This restores +the behavior to linear. + +(cherry picked from commit d315722564927c7202dd6e111dc79eaf14240b0d) + +(cherry picked from commit a6f6c3a3d6f2b580f2d87885c9b8a9350ad7bf15) + +Co-authored-by: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> +Co-authored-by: Gregory P. Smith +[Peter: drop NEWS.d/*] +Signed-off-by: Peter Korsgaard +--- + Lib/encodings/idna.py | 32 +++++++++---------- + Lib/test/test_codecs.py | 6 ++++ + 2 files changed, 23 insertions(+), 17 deletions(-) + +diff --git a/Lib/encodings/idna.py b/Lib/encodings/idna.py +index ea4058512f..bf98f51336 100644 +--- a/Lib/encodings/idna.py ++++ b/Lib/encodings/idna.py +@@ -39,23 +39,21 @@ def nameprep(label): + + # Check bidi + RandAL = [stringprep.in_table_d1(x) for x in label] +- for c in RandAL: +- if c: +- # There is a RandAL char in the string. Must perform further +- # tests: +- # 1) The characters in section 5.8 MUST be prohibited. +- # This is table C.8, which was already checked +- # 2) If a string contains any RandALCat character, the string +- # MUST NOT contain any LCat character. +- if any(stringprep.in_table_d2(x) for x in label): +- raise UnicodeError("Violation of BIDI requirement 2") +- +- # 3) If a string contains any RandALCat character, a +- # RandALCat character MUST be the first character of the +- # string, and a RandALCat character MUST be the last +- # character of the string. +- if not RandAL[0] or not RandAL[-1]: +- raise UnicodeError("Violation of BIDI requirement 3") ++ if any(RandAL): ++ # There is a RandAL char in the string. Must perform further ++ # tests: ++ # 1) The characters in section 5.8 MUST be prohibited. ++ # This is table C.8, which was already checked ++ # 2) If a string contains any RandALCat character, the string ++ # MUST NOT contain any LCat character. ++ if any(stringprep.in_table_d2(x) for x in label): ++ raise UnicodeError("Violation of BIDI requirement 2") ++ # 3) If a string contains any RandALCat character, a ++ # RandALCat character MUST be the first character of the ++ # string, and a RandALCat character MUST be the last ++ # character of the string. ++ if not RandAL[0] or not RandAL[-1]: ++ raise UnicodeError("Violation of BIDI requirement 3") + + return label + +diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py +index 8edd5ac063..2407567261 100644 +--- a/Lib/test/test_codecs.py ++++ b/Lib/test/test_codecs.py +@@ -1535,6 +1535,12 @@ def test_builtin_encode(self): + self.assertEqual("pyth\xf6n.org".encode("idna"), b"xn--pythn-mua.org") + self.assertEqual("pyth\xf6n.org.".encode("idna"), b"xn--pythn-mua.org.") + ++ def test_builtin_decode_length_limit(self): ++ with self.assertRaisesRegex(UnicodeError, "too long"): ++ (b"xn--016c"+b"a"*1100).decode("idna") ++ with self.assertRaisesRegex(UnicodeError, "too long"): ++ (b"xn--016c"+b"a"*70).decode("idna") ++ + def test_stream(self): + r = codecs.getreader("idna")(io.BytesIO(b"abc")) + r.read(3) +-- +2.30.2 + diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 4131941e11..2e17104102 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -13,6 +13,9 @@ PYTHON3_LICENSE_FILES = LICENSE PYTHON3_CPE_ID_VENDOR = python PYTHON3_CPE_ID_PRODUCT = python +# 0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch +PYTHON3_IGNORE_CVES += CVE-2022-45061 + # This host Python is installed in $(HOST_DIR), as it is needed when # cross-compiling third-party Python modules. From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:03 -0000 Subject: [Buildroot] [git commit branch/next] package/heimdal: security bump to version 7.7.1 Message-ID: <20230220205153.069FE828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3959a039059d6b3bc95100409975e87e9c14d3b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This release fixes the following Security Vulnerabilities: - CVE-2022-42898 PAC parse integer overflows - CVE-2022-3437 Overflows and non-constant time leaks in DES{,3} and arcfour - CVE-2022-41916 Fix Unicode normalization read of 1 bytes past end of array - CVE-2021-44758 NULL dereference DoS in SPNEGO acceptors - CVE-2021-3671 A null pointer de-reference when handling missing sname in TGS-REQ - CVE-2022-44640 Heimdal KDC: invalid free in ASN.1 codec Note that CVE-2022-44640 is a severe vulnerability, possibly a 10.0 on the Common Vulnerability Scoring System (CVSS) v3, as we believe it should be possible to get an RCE on a KDC, which means that credentials can be compromised that can be used to impersonate anyone in a realm or forest of realms. Heimdal's ASN.1 compiler generates code that allows specially crafted DER encodings of CHOICEs to invoke the wrong free function on the decoded structure upon decode error. This is known to impact the Heimdal KDC, leading to an invalid free() of an address partly or wholly under the control of the attacker, in turn leading to a potential remote code execution (RCE) vulnerability. This error affects the DER codec for all extensible CHOICE types used in Heimdal, though not all cases will be exploitable. We have not completed a thorough analysis of all the Heimdal components affected, thus the Kerberos client, the X.509 library, and other parts, may be affected as well. This bug has been in Heimdal's ASN.1 compiler since 2005, but it may only affect Heimdal 1.6 and up. It was first reported by Douglas Bagnall, though it had been found independently by the Heimdal maintainers via fuzzing a few weeks earlier. While no zero-day exploit is known, such an exploit will likely be available soon after public disclosure. - CVE-2019-14870: Validate client attributes in protocol-transition - CVE-2019-14870: Apply forwardable policy in protocol-transition - CVE-2019-14870: Always lookup impersonate client in DB Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/heimdal/heimdal.hash | 4 ++-- package/heimdal/heimdal.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/heimdal/heimdal.hash b/package/heimdal/heimdal.hash index 005447a43b..cf822340da 100644 --- a/package/heimdal/heimdal.hash +++ b/package/heimdal/heimdal.hash @@ -1,5 +1,5 @@ # From https://github.com/heimdal/heimdal/releases -sha1 5dd16703be7255f66a4d65440f0c622aeeca60d9 heimdal-7.7.0.tar.gz -sha256 f02d3314d634cc55eb9cf04a1eae0d96b293e45a1f837de9d894e800161b7d1b heimdal-7.7.0.tar.gz +sha1 a33fdc957f84ab13f39f164b04fe1deeaab3179e heimdal-7.7.1.tar.gz +sha256 117cb1ede7848db24cf27311c46f7f735a99f9c836c22e80aec92b91efe56644 heimdal-7.7.1.tar.gz # Locally computed sha256 0c4b07bf5b98f7a1d01f8e60722d6c6747ef052c2aa6d2043daf690d4e1b0a7f LICENSE diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index a8d87531ec..21b6c0ccb3 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -4,7 +4,7 @@ # ################################################################################ -HEIMDAL_VERSION = 7.7.0 +HEIMDAL_VERSION = 7.7.1 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 From yann.morin.1998 at free.fr Mon Feb 20 20:53:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:03 -0000 Subject: [Buildroot] [git commit branch/next] package/gdb: zlib is mandatory, not optional Message-ID: <20230220205155.51ECB86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3341ceb1e58536cf43a4c000e4bb3cdbff3f6de5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next zlib is a mandatory dependency of gdb and by default, gdb will use its internal one. Moreover, --with-zlib has been replaced by --with-system-zlib since version 7.10 and https://github.com/bminor/binutils-gdb/commit/fa1f5da0b6ff3622f9bf60e348e149b76920abba Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=15131 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/gdb/Config.in | 1 + package/gdb/gdb.mk | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 273b3072ae..80b1185b5e 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -17,6 +17,7 @@ config BR2_PACKAGE_GDB depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_ZLIB # When the external toolchain gdbserver is copied to the # target, we don't allow building a separate gdbserver. The # one from the external toolchain should be used. diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 45ce126bab..4b9c5c6b70 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -32,7 +32,8 @@ GDB_PRE_CONFIGURE_HOOKS += GDB_CONFIGURE_SYMLINK # also need ncurses. # As for libiberty, gdb may use a system-installed one if present, so # we must ensure ours is installed first. -HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses +GDB_DEPENDENCIES = zlib +HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses host-zlib # Disable building documentation GDB_MAKE_OPTS += MAKEINFO=true @@ -130,6 +131,7 @@ GDB_CONF_OPTS = \ --disable-sim \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) \ --without-included-gettext \ + --with-system-zlib \ --disable-werror \ --enable-static \ --without-mpfr @@ -212,13 +214,6 @@ else GDB_CONF_OPTS += --without-lzma endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -GDB_CONF_OPTS += --with-zlib -GDB_DEPENDENCIES += zlib -else -GDB_CONF_OPTS += --without-zlib -endif - ifeq ($(BR2_PACKAGE_GDB_PYTHON),) # This removes some unneeded Python scripts and XML target description # files that are not useful for a normal usage of the debugger. @@ -256,6 +251,7 @@ HOST_GDB_CONF_OPTS = \ --enable-threads \ --disable-werror \ --without-included-gettext \ + --with-system-zlib \ --with-curses \ --without-mpfr \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) From yann.morin.1998 at free.fr Mon Feb 20 20:53:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:04 -0000 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6serialport: fix license Message-ID: <20230220205155.854E186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc1edd8c065471b5071be7e84a1bff56853a8472 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 343974b99528702842e8c1dad945fcd4f0defd6c forgot to change the licensing information which has been updated with https://code.qt.io/cgit/qt/qtserialport.git/commit/?id=bb05a26d52c834cc7f3c549f3e5d66f76baf42a2 resulting in the following build failure: ERROR: LICENSE.GPL2 has wrong sha256 hash: ERROR: expected: 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 ERROR: got : Fixes: - No autobuilder failures yet Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: one-item per line] Signed-off-by: Yann E. MORIN --- package/qt6/qt6serialport/qt6serialport.hash | 11 ++++++----- package/qt6/qt6serialport/qt6serialport.mk | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash index fb1b3dcf6b..54a45681fa 100644 --- a/package/qt6/qt6serialport/qt6serialport.hash +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -2,8 +2,9 @@ sha256 f148cc9e87ce2228e82bff7a64d9521339ece66c4c66aa43b91bac614f4a4483 qtserialport-everywhere-src-6.4.0.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialport/qt6serialport.mk b/package/qt6/qt6serialport/qt6serialport.mk index 01763657b8..9656e97c96 100644 --- a/package/qt6/qt6serialport/qt6serialport.mk +++ b/package/qt6/qt6serialport/qt6serialport.mk @@ -9,8 +9,21 @@ QT6SERIALPORT_SITE = $(QT6_SITE) QT6SERIALPORT_SOURCE = qtserialport-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALPORT_VERSION).tar.xz QT6SERIALPORT_INSTALL_STAGING = YES QT6SERIALPORT_SUPPORTS_IN_SOURCE_BUILD = NO -QT6SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) -QT6SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL + +QT6SERIALPORT_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0 with exception (tools), \ + GFDL-1.3 (docs), \ + BSD-3-Clause + +QT6SERIALPORT_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/Qt-GPL-exception-1.0.txt + QT6SERIALPORT_CONF_OPTS = \ -GNinja \ -DQT_HOST_PATH=$(HOST_DIR) \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:04 -0000 Subject: [Buildroot] [git commit branch/next] package/iwd: add dbus compile time dependency Message-ID: <20230220205152.86444828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47659b4f342382c764076c0c0dfbee446b090661 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In 5b3b2d80f4cf586d360ff696c3dacbd4cb48fdc4 we dropped dbus as a build dependency, however we still need it when building with systemd so that the service directory is available via pkg-config. In addition we can drop --with-dbus-datadir by unconditionally requiring dbus as the datadir will then be fetched from pkg-config. Fixes: checking D-Bus bus services directory... configure: error: D-Bus bus services directory is required http://autobuild.buildroot.net/results/4a48676460e6ce588897598f0022ec840b4b4b8d/ Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/iwd/iwd.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 002988cf33..5ffbde334e 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -16,9 +16,8 @@ IWD_SELINUX_MODULES = networkmanager IWD_CONF_OPTS = \ --disable-manual-pages \ --enable-external-ell \ - --enable-dbus-policy \ - --with-dbus-datadir=/usr/share -IWD_DEPENDENCIES = ell + --enable-dbus-policy +IWD_DEPENDENCIES = dbus ell ifeq ($(BR2_PACKAGE_READLINE),y) # iwd client depends on readline (GPL-3.0+) From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:05 -0000 Subject: [Buildroot] [git commit branch/next] package/bdwgc: needs MMU Message-ID: <20230220205147.1BAC08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ceb51d1463acb6918fbb825dc56b2a2b48ab8674 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raise since bump to version 8.2.2 in commit d7619682552dd34f499e9f17b0234af53da743ec and https://github.com/ivmai/bdwgc/commit/9d8c196268068bb75f86dee0ba75ccd024531e72: os_dep.c: In function 'block_unmap_inner': os_dep.c:2668:17: warning: implicit declaration of function 'madvise'; did you mean 'raise'? [-Wimplicit-function-declaration] 2668 | if (madvise(start_addr, len, MADV_DONTNEED) == -1) | ^~~~~~~ | raise Fixes: - http://autobuild.buildroot.org/results/2b9924cb8c36a75e1ca7aefe83e95dc11c10ded6 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/bdwgc/Config.in | 1 + package/guile/Config.in | 2 ++ package/poke/Config.in | 2 ++ 3 files changed, 5 insertions(+) diff --git a/package/bdwgc/Config.in b/package/bdwgc/Config.in index aad2bc9ef2..1124ab0f60 100644 --- a/package/bdwgc/Config.in +++ b/package/bdwgc/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_BDWGC bool "bdwgc" + depends on BR2_USE_MMU # madvise() depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS select BR2_PACKAGE_LIBATOMIC_OPS help diff --git a/package/guile/Config.in b/package/guile/Config.in index f70e674018..3cf0ec863b 100644 --- a/package/guile/Config.in +++ b/package/guile/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_GUILE bool "guile" + depends on BR2_USE_MMU # bdwgc depends on !BR2_TOOLCHAIN_USES_MUSL # no strtol_l depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # bdwgc @@ -17,5 +18,6 @@ config BR2_PACKAGE_GUILE http://www.gnu.org/software/guile comment "guile needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/poke/Config.in b/package/poke/Config.in index 40e7a31bab..8bedb12bf8 100644 --- a/package/poke/Config.in +++ b/package/poke/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_POKE depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # bdwgc depends on BR2_USE_WCHAR # needs wctomb depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU # bdwgc select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # less select BR2_PACKAGE_BDWGC select BR2_PACKAGE_LESS # runtime @@ -25,4 +26,5 @@ config BR2_PACKAGE_POKE comment "poke needs a toolchain w/ NPTL, wchar" depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:06 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-tools: perf needs threads Message-ID: <20230220205147.4667186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=958c166837a484e2a9515342c49e93dca734d726 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised (at least) since linux 4.0 and https://github.com/torvalds/linux/commit/459a3df76c99124fd222586be7f10f862547e7a9: CC /home/autobuild/autobuild/instance-2/output-1/build/linux-6.0.1/tools/perf/builtin-bench.o In file included from builtin-bench.c:22: bench/bench.h:66:10: fatal error: pthread.h: No such file or directory 66 | #include | ^~~~~~~~~~~ Fies: - http://autobuild.buildroot.org/results/b6abd641f528101e74f9af33e54ccefe0731148f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/linux-tools/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index 82e62f826e..8a0b6d5802 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -47,14 +47,15 @@ config BR2_PACKAGE_LINUX_TOOLS_PCI These tools are available only from kernel version 4.20. -comment "perf needs a toolchain w/ dynamic library" +comment "perf needs a toolchain w/ dynamic library, threads" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_LINUX_TOOLS_PERF bool "perf" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LINUX_TOOLS help perf (sometimes "Perf Events" or perf tools, originally From yann.morin.1998 at free.fr Mon Feb 20 20:52:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:06 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_a64: remove defconfig Message-ID: <20230220205148.5A04D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c56314f4f9a648148eebc6b86d1c28ff9986dbae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499049 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/friendlyarm/nanopi-a64/boot.cmd | 6 ---- board/friendlyarm/nanopi-a64/genimage.cfg | 40 ------------------------- board/friendlyarm/nanopi-a64/readme.txt | 37 ----------------------- configs/friendlyarm_nanopi_a64_defconfig | 50 ------------------------------- 5 files changed, 135 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 427fce235d..30582cb648 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1301,7 +1301,6 @@ F: board/amarula/ F: board/asus/ F: board/bananapi/ F: board/engicam/ -F: board/friendlyarm/nanopi-a64/ F: board/friendlyarm/nanopi-neo2/ F: board/olimex/a33_olinuxino/ F: board/olimex/a64-olinuxino/ @@ -1319,7 +1318,6 @@ F: configs/engicam_imx6qdl_icore_qt5_defconfig F: configs/engicam_imx6qdl_icore_rqs_defconfig F: configs/engicam_imx6ul_geam_defconfig F: configs/engicam_imx6ul_isiot_defconfig -F: configs/friendlyarm_nanopi_a64_defconfig F: configs/friendlyarm_nanopi_neo2_defconfig F: configs/olimex_a33_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig diff --git a/board/friendlyarm/nanopi-a64/boot.cmd b/board/friendlyarm/nanopi-a64/boot.cmd deleted file mode 100644 index 446bd85672..0000000000 --- a/board/friendlyarm/nanopi-a64/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-a64-nanopi-a64.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-a64/genimage.cfg b/board/friendlyarm/nanopi-a64/genimage.cfg deleted file mode 100644 index 6907314149..0000000000 --- a/board/friendlyarm/nanopi-a64/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-nanopi-a64.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-a64/readme.txt b/board/friendlyarm/nanopi-a64/readme.txt deleted file mode 100644 index 88c4e661cb..0000000000 --- a/board/friendlyarm/nanopi-a64/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi A64. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Nanopi A64 link: -http://nanopi.io/nanopi-a64.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/FriendlyARM+Nanopi+A64 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make friendlyarm_nanopi_a64_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Nanopi A64 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/friendlyarm_nanopi_a64_defconfig b/configs/friendlyarm_nanopi_a64_defconfig deleted file mode 100644 index 4df22b2a2f..0000000000 --- a/configs/friendlyarm_nanopi_a64_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_a64" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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/friendlyarm/nanopi-a64/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-nanopi-a64" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi A64" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-a64/genimage.cfg" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:24 -0000 Subject: [Buildroot] [git commit branch/next] package/s6-linux-init: bump to version 1.0.8.0 Message-ID: <20230220205149.5B45D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d3c06435b24bac849bb31fcd24f56d45b191f47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This bump will fix the following build failure raised since bump of skalibs to version 2.12.0.1 in commit 0f7bfc80814e90918b9527cab4cbf6afedd22195 thanks to https://github.com/skarnet/s6-linux-init/commit/6696cee3bd309f61fc6c945ef747262a845e9267 In file included from src/shutdown/hpr_shutdown.c:8: src/shutdown/hpr.h:20:40: error: unknown type name 'tain_t'; did you mean 'tain'? 20 | extern int hpr_shutdown (unsigned int, tain_t const *, unsigned int) ; | ^~~~~~ | tain Update hash of COPYING (update in year with https://github.com/skarnet/s6-linux-init/commit/42a91a98b780759257862642c764c2102237fea6) https://github.com/skarnet/s6-linux-init/blob/v1.0.8.0/NEWS Fixes: - http://autobuild.buildroot.org/results/4382beeb0f94d583ba605c70a47f34b45c76e311 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/s6-linux-init/s6-linux-init.hash | 4 ++-- package/s6-linux-init/s6-linux-init.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/s6-linux-init/s6-linux-init.hash b/package/s6-linux-init/s6-linux-init.hash index 23f02d5359..f70a4f87b5 100644 --- a/package/s6-linux-init/s6-linux-init.hash +++ b/package/s6-linux-init/s6-linux-init.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 29e368516b1a3c61a6d1f8680645cc122a2e02127debec91738f170a3b93b8c5 s6-linux-init-1.0.6.3.tar.gz -sha256 4a5e44a69d649f0c37b29d7f6e5df1bb292b09898247be07f0c97814dac4b15d COPYING +sha256 92055a7964cf66604066ad964a2c2392ee7c5e64821be03146c1341e0d8c3dc6 s6-linux-init-1.0.8.0.tar.gz +sha256 1898df1e8703bd9c1350d2ec3397880b9b4c1451038a9ce5e1c4b2e58622da39 COPYING diff --git a/package/s6-linux-init/s6-linux-init.mk b/package/s6-linux-init/s6-linux-init.mk index 95595368de..6aec220de4 100644 --- a/package/s6-linux-init/s6-linux-init.mk +++ b/package/s6-linux-init/s6-linux-init.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_LINUX_INIT_VERSION = 1.0.6.3 +S6_LINUX_INIT_VERSION = 1.0.8.0 S6_LINUX_INIT_SITE = http://skarnet.org/software/s6-linux-init S6_LINUX_INIT_LICENSE = ISC S6_LINUX_INIT_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:52:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:25 -0000 Subject: [Buildroot] [git commit branch/next] configs/orangepi_prime: remove defconfig Message-ID: <20230220205148.D71EB86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0763bc283fda0117b920fe8fae29c9e8cc48737 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499141 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/orangepi/orangepi-prime/boot.cmd | 6 ---- board/orangepi/orangepi-prime/genimage.cfg | 40 ------------------------ board/orangepi/orangepi-prime/readme.txt | 37 ---------------------- configs/orangepi_prime_defconfig | 50 ------------------------------ 5 files changed, 135 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ec8df84fa8..f366426125 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1303,7 +1303,6 @@ F: board/olimex/a33_olinuxino/ F: board/olimex/a64-olinuxino/ F: board/orangepi/orangepi-lite2/ F: board/orangepi/orangepi-one-plus -F: board/orangepi/orangepi-prime/ F: board/orangepi/orangepi-win/ F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ @@ -1318,7 +1317,6 @@ F: configs/olimex_a33_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig F: configs/orangepi_lite2_defconfig F: configs/orangepi_one_plus_defconfig -F: configs/orangepi_prime_defconfig F: configs/orangepi_win_defconfig F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig diff --git a/board/orangepi/orangepi-prime/boot.cmd b/board/orangepi/orangepi-prime/boot.cmd deleted file mode 100644 index 34887880d8..0000000000 --- a/board/orangepi/orangepi-prime/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-prime.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-prime/genimage.cfg b/board/orangepi/orangepi-prime/genimage.cfg deleted file mode 100644 index dde9a6485f..0000000000 --- a/board/orangepi/orangepi-prime/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-prime.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-prime/readme.txt b/board/orangepi/orangepi-prime/readme.txt deleted file mode 100644 index 5811884d4d..0000000000 --- a/board/orangepi/orangepi-prime/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Orangepi Prime. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Orangepi Prime link: -http://www.orangepi.org/OrangePiPrime/ - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Prime - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make orangepi_prime_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Orangepi Prime and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig deleted file mode 100644 index f8f958c67b..0000000000 --- a/configs/orangepi_prime_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_prime" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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-prime/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-prime" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Prime" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-prime/genimage.cfg" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:25 -0000 Subject: [Buildroot] [git commit branch/next] package/systemd: fix build with -Ofast Message-ID: <20230220205150.78D9486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9cd084b54e2223e49c37962b0cbefae7bea26ef5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next systemd does not build with -Ofast (at least with gcc-12), leading to build errors like: ../src/shared/condition.c: In function ???condition_dump_list???: ../src/shared/condition.c:1227:33: error: ???%s??? directive argument is null [-Werror=format-overflow=] 1227 | "%s\t%s: %s%s%s %s\n", | ^~ cc1: some warnings being treated as errors It is not really clear what the reason is, but it smells like a compiler error. Indeed, the failing format is passed to an fprintf, and the parameter corresponding to the failing %s directive is a call to a function which prototype is defined but the implementation only comes later in the same compilation unit, but is the result of macro expansion, which yields a function definition like: const char foo_to_string(foo_type i) { if (i < 0 || i >= (foo_type) ELEMENTSOF(foo_table)) return NULL; return foo_table[i] } (where ELEMENTSOF(x) is a macros arounf sizeof(x) to determine the number of elements in the array foo_table). However, in the failing case, foo_table is a static const array indexed with constants from an enum, and foo_to_string() is only ever called with variables that are only ever set to one of those enum values. Since -Ofast is also explicitly documented as breaking otehrwise conformant programs, we're not going to debug further the reason for the build failure. Instead, just revert to the best alternate optimisation level. We chose -O3, as -Ofast is based on -O3 with breaking optimisation flags. With -O3, the build succeeds. Fixes: http://autobuild.buildroot.org/results/3ffaa9b3ecacc6ac326be78196af1ad613f195ed/ (sparc64) http://autobuild.buildroot.org/results/3f6ae2e503dd1539e4240f344865da4881879204/ (arm) http://autobuild.buildroot.org/results/68c17056490d441c7f862349e9c7e471b4570162/ (ppc64) ... Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Sen Hastings Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 1d7452de19..b42f6a502b 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -90,6 +90,11 @@ SYSTEMD_CONF_OPTS += \ -Dumount-path=/usr/bin/umount \ -Dutmp=false +SYSTEMD_CFLAGS = $(TARGET_CFLAGS) +ifeq ($(BR2_OPTIMIZE_FAST),y) +SYSTEMD_CFLAGS += -O3 +endif + ifeq ($(BR2_nios2),y) # Nios2 ld emits warnings, make warnings not to be treated as errors SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings From peter at korsgaard.com Mon Feb 20 20:52:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:55 -0000 Subject: [Buildroot] [git commit branch/next] package/vlc: security bump version to 3.0.18 Message-ID: <20230220205154.118AD86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6866076d79ff2e022762b79421f511a8037fda73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Removed patch 0010, a different fix was applied upstream: https://code.videolan.org/videolan/vlc/-/commit/05445b74a38d045cb28f71f96ccbe882445a031e Removed patch 0011 which was backported from upstream. Renumbered patch 0012 -> 0010. Release notes: http://www.videolan.org/vlc/releases/3.0.18.html Fixes CVE-2022-41325: http://www.videolan.org/security/sb-vlc3018.html Signed-off-by: Bernd Kuhls [Peter: fix sha1 hash entry] Signed-off-by: Peter Korsgaard --- ...ess-live555.cpp-fix-build-with-live555-20.patch | 36 --------- ...tch => 0010-opengl-missing-library-check.patch} | 0 ...dav1d-fix-compilation-with-upcoming-dav1d.patch | 88 ---------------------- package/vlc/vlc.hash | 8 +- package/vlc/vlc.mk | 2 +- 5 files changed, 5 insertions(+), 129 deletions(-) diff --git a/package/vlc/0010-modules-access-live555.cpp-fix-build-with-live555-20.patch b/package/vlc/0010-modules-access-live555.cpp-fix-build-with-live555-20.patch deleted file mode 100644 index 5f046648d4..0000000000 --- a/package/vlc/0010-modules-access-live555.cpp-fix-build-with-live555-20.patch +++ /dev/null @@ -1,36 +0,0 @@ -From eba390d13ec4089cd6b9d8687ab3f8905b9d3ac8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 22 May 2021 22:56:04 +0200 -Subject: [PATCH] modules/access/live555.cpp: fix build with live555 >= - 2020.12.11 - -Since live555-2020.12.11, connectionEndpointAddress() member function -use a "struct sockaddr_storage" in preparation for eventual support of -IPv6: http://www.live555.com/liveMedia/public/changelog.txt - -Fixes: - - http://autobuild.buildroot.org/results/83170984f96238756c45bf1f4e542363afafd45f - -Signed-off-by: Fabrice Fontaine ---- - modules/access/live555.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp -index 9d6e01ae32..32a6c294eb 100644 ---- a/modules/access/live555.cpp -+++ b/modules/access/live555.cpp -@@ -850,7 +850,9 @@ static int SessionsSetup( demux_t *p_demux ) - if( !p_sys->b_multicast ) - { - /* We need different rollover behaviour for multicast */ -- p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() ); -+ struct sockaddr_storage tempAddr; -+ sub->getConnectionEndpointAddress( tempAddr ); -+ p_sys->b_multicast = IsMulticastAddress( tempAddr ); - } - - tk = (live_track_t*)malloc( sizeof( live_track_t ) ); --- -2.30.2 - diff --git a/package/vlc/0012-opengl-missing-library-check.patch b/package/vlc/0010-opengl-missing-library-check.patch similarity index 100% rename from package/vlc/0012-opengl-missing-library-check.patch rename to package/vlc/0010-opengl-missing-library-check.patch diff --git a/package/vlc/0011-dav1d-fix-compilation-with-upcoming-dav1d.patch b/package/vlc/0011-dav1d-fix-compilation-with-upcoming-dav1d.patch deleted file mode 100644 index 74b8645379..0000000000 --- a/package/vlc/0011-dav1d-fix-compilation-with-upcoming-dav1d.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 2202c892c8dc1381b596c53c2ebd3ca680061f95 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Fri, 18 Mar 2022 11:42:49 +0100 -Subject: [PATCH] dav1d: fix compilation with (upcoming) dav1d 1.0 - -(cherry picked from commit dbf45cea2a8abdfbef897b8a71f3eb782bb1b712) (edited) -edited: -- 3.0 has the 128 pixels padding elsewhere -- 3.0 has an extra parameter for add_integer_with_range() -- 3.0 was setting i_extra_picture_buffers further down in the code -- 3.0 uses 16 threads max - -Signed-off-by: Steve Lhomme - -Downloaded from upstream commit -https://code.videolan.org/videolan/vlc/-/commit/2202c892c8dc1381b596c53c2ebd3ca680061f95 - -Signed-off-by: Bernd Kuhls ---- - modules/codec/dav1d.c | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/modules/codec/dav1d.c b/modules/codec/dav1d.c -index 039165f52ec..cfabbc27cb3 100644 ---- a/modules/codec/dav1d.c -+++ b/modules/codec/dav1d.c -@@ -63,10 +63,16 @@ vlc_module_begin () - set_category(CAT_INPUT) - set_subcategory(SUBCAT_INPUT_VCODEC) - -+#if DAV1D_API_VERSION_MAJOR >= 6 -+ add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_THREADS, -+ THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) -+ add_obsolete_string("dav1d-thread-tiles") // unused with dav1d 1.0 -+#else - add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS, - THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) - add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS, - THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false) -+#endif - vlc_module_end () - - /***************************************************************************** -@@ -294,6 +300,11 @@ static int OpenDecoder(vlc_object_t *p_this) - return VLC_ENOMEM; - - dav1d_default_settings(&p_sys->s); -+#if DAV1D_API_VERSION_MAJOR >= 6 -+ p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); -+ if (p_sys->s.n_threads == 0) -+ p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16; -+#else - p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles"); - if (p_sys->s.n_tile_threads == 0) - p_sys->s.n_tile_threads = -@@ -303,6 +314,7 @@ static int OpenDecoder(vlc_object_t *p_this) - p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); - if (p_sys->s.n_frame_threads == 0) - p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16; -+#endif - p_sys->s.allocator.cookie = dec; - p_sys->s.allocator.alloc_picture_callback = NewPicture; - p_sys->s.allocator.release_picture_callback = FreePicture; -@@ -313,12 +325,20 @@ static int OpenDecoder(vlc_object_t *p_this) - return VLC_EGENERIC; - } - -+#if DAV1D_API_VERSION_MAJOR >= 6 -+ msg_Dbg(p_this, "Using dav1d version %s with %d threads", -+ dav1d_version(), p_sys->s.n_threads); -+ -+ dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1); -+#else - msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads", - dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads); - -+ dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); -+#endif -+ - dec->pf_decode = Decode; - dec->pf_flush = FlushDecoder; -- dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); - - dec->fmt_out.video.i_width = dec->fmt_in.video.i_width; - dec->fmt_out.video.i_height = dec->fmt_in.video.i_height; --- -GitLab - diff --git a/package/vlc/vlc.hash b/package/vlc/vlc.hash index 9060097906..4b9940df33 100644 --- a/package/vlc/vlc.hash +++ b/package/vlc/vlc.hash @@ -1,7 +1,7 @@ -# From https://get.videolan.org/vlc/3.0.17.4/vlc-3.0.17.4.tar.xz.sha256 -sha256 8c5a62d88a4fb45c1b095cf10befef217dfa87aedcec5184b9e7d590b6dd4133 vlc-3.0.17.4.tar.xz -# From https://get.videolan.org/vlc/3.0.17.4/vlc-3.0.17.4.tar.xz.sha1 -sha1 ebcd9939103fda141267c5a8f1c603df4533218e vlc-3.0.17.4.tar.xz +# From https://get.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz.sha256 +sha256 57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec vlc-3.0.18.tar.xz +# From https://get.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz.sha1 +sha1 b11ccaa0f5ee15a550564817d60458eb0946f80e vlc-3.0.18.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index aee3b735a9..c6ae46f469 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VLC_VERSION = 3.0.17.4 +VLC_VERSION = 3.0.18 VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPL-2.0+, LGPL-2.1+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:55 -0000 Subject: [Buildroot] [git commit branch/next] package/libnss: fix build failure with make 4.3.91 Message-ID: <20230220205152.278F18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5852fee868c318f0864bed3238b46348156422b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Make 4.3.91 doesn't allow to safely override Simple Expanded Variables, so let's add a patch pending upstream[0] to make those variable Conditional Expanded. [0]: https://bugzilla.mozilla.org/show_bug.cgi?id=1801182 Fixes: http://autobuild.buildroot.net/results/1074143dbea60567cd83be0a23f7c0214d470de9/ Signed-off-by: Giulio Benetti Tested-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch b/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch new file mode 100644 index 0000000000..7b3abea307 --- /dev/null +++ b/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch @@ -0,0 +1,45 @@ +From a1a5f3afea2ee59bdbb7a74eb2d7f82b635dbd1a Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Thu, 17 Nov 2022 20:38:48 +0100 +Subject: [PATCH] Bug 1801182 - Allow overriding OS_ARCH, OS_TEST and + OS_RELEASE in Makefile + +Starting from Make 4.3.91 simple expanded variables can't be safely +overriden via command line anymore, so let's use conditional expanded +variables to override OS_ARCH, OS_TEST and OS_RELEASE. + +Signed-off-by: Giulio Benetti +[Upstream status: https://bugzilla.mozilla.org/show_bug.cgi?id=1801182] +--- + nss/coreconf/arch.mk | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +index 17e9faeac..85aac9341 100644 +--- a/nss/coreconf/arch.mk ++++ b/nss/coreconf/arch.mk +@@ -20,17 +20,17 @@ + # Macros for getting the OS architecture + # + +-OS_ARCH := $(subst /,_,$(shell uname -s)) ++OS_ARCH ?= $(subst /,_,$(shell uname -s)) + + # + # Attempt to differentiate between sparc and x86 Solaris + # + +-OS_TEST := $(shell uname -m) ++OS_TEST ?= $(shell uname -m) + ifeq ($(OS_TEST),i86pc) +- OS_RELEASE := $(shell uname -r)_$(OS_TEST) ++ OS_RELEASE ?= $(shell uname -r)_$(OS_TEST) + else +- OS_RELEASE := $(shell uname -r) ++ OS_RELEASE ?= $(shell uname -r) + endif + + +-- +2.34.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:56 -0000 Subject: [Buildroot] [git commit branch/next] package/exim: mark CVE-2022-3620 as ignored Message-ID: <20230220205154.9B7DF86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43d5ff7ee4c5f012d79ba69ae6c736e3a88d20c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next CVE-2022-3620: A vulnerability was found in Exim and classified as problematic. This issue affects the function dmarc_dns_lookup of the file dmarc.c of the component DMARC Handler. The manipulation leads to use after free. The attack may be initiated remotely. The name of the patch is 12fb3842f81bcbd4a4519d5728f2d7e0e3ca1445. It is recommended to apply a patch to fix this issue. The associated identifier of this vulnerability is VDB-211919. This vulnerability is in the DMARC handling, which is only used if libopendmarc is available AND SUPPORT_DMARC is set to yes, neither of which is true for Buildroot, so ignore the CVE. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/exim/exim.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/exim/exim.mk b/package/exim/exim.mk index cd2fabeab1..b84a51d6de 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -16,6 +16,9 @@ EXIM_DEPENDENCIES = host-berkeleydb host-pcre2 pcre2 berkeleydb host-pkgconf # 0006-Fix-regex-n-use-after-free.-Bug-2915.patch EXIM_IGNORE_CVES += CVE-2022-3559 +# built without dmarc support +EXIM_IGNORE_CVES += CVE-2022-3620 + # Modify a variable value. It must already exist in the file, either # commented or not. define exim-config-change # variable-name, variable-value From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:56 -0000 Subject: [Buildroot] [git commit branch/next] package/igh-ethercat: bump to latest Git commit Message-ID: <20230220205152.3359F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea3e1696776187b55bbcaa49072cda49a43c32f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The current version 1.5.2 dates back from 2013, so it is extremely old. The latest master branch of igh-ethercat contains numerous fixes, including fixes to ensure that it builds with recent Linux kernel releases. Backporting the individual patches fixing those issues on a 9 year old release would be too much effort, so we propose to simply bump the version to the latest available in the Git master branch. Fixes: http://autobuild.buildroot.net/results/4dc9b71c805a8156bcf8f398edd3a30f2b6ac6da/ Signed-off-by: Thomas Petazzoni --- package/igh-ethercat/igh-ethercat.hash | 3 +-- package/igh-ethercat/igh-ethercat.mk | 13 ++++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package/igh-ethercat/igh-ethercat.hash b/package/igh-ethercat/igh-ethercat.hash index c77627ee56..88548bf23e 100644 --- a/package/igh-ethercat/igh-ethercat.hash +++ b/package/igh-ethercat/igh-ethercat.hash @@ -1,5 +1,4 @@ -# From http://etherlab.org/download/ethercat/ethercat-1.5.2.tar.bz2.md5 -md5 6b4001f8d975865d74a0b108b3bdda3d ethercat-1.5.2.tar.bz2 # Locally computed +sha256 eb13a0f7f073ad54589c4f41829d9e995b37b26fbc7fcd05e3adb5e201e6feb4 igh-ethercat-2e2cef6131895336f87c57c18fe78ae01a90d3de.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk index 9fcfb4f6f2..1041ba0758 100644 --- a/package/igh-ethercat/igh-ethercat.mk +++ b/package/igh-ethercat/igh-ethercat.mk @@ -4,11 +4,12 @@ # ################################################################################ -IGH_ETHERCAT_VERSION = 1.5.2 -IGH_ETHERCAT_SITE = http://etherlab.org/download/ethercat -IGH_ETHERCAT_SOURCE = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2 +IGH_ETHERCAT_VERSION = 2e2cef6131895336f87c57c18fe78ae01a90d3de +IGH_ETHERCAT_SITE = $(call gitlab,etherlab.org,ethercat,$(IGH_ETHERCAT_VERSION)) IGH_ETHERCAT_LICENSE = GPL-2.0 (IgH EtherCAT master), LGPL-2.1 (libraries) IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER +# Fetching from Git +IGH_ETHERCAT_AUTORECONF = YES IGH_ETHERCAT_INSTALL_STAGING = YES @@ -21,5 +22,11 @@ IGH_ETHERCAT_CONF_OPTS = \ $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000E),--enable-e1000e,--disable-e1000e) \ $(if $(BR2_PACKAGE_IGH_ETHERCAT_R8169),--enable-r8169,--disable-r8169) +# Needed to make autoreconf happy +define IGH_ETHERCAT_CREATE_CHANGELOG + touch $(@D)/ChangeLog +endef +IGH_ETHERCAT_POST_PATCH_HOOKS += IGH_ETHERCAT_CREATE_CHANGELOG + $(eval $(kernel-module)) $(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:52:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:57 -0000 Subject: [Buildroot] [git commit branch/next] package/asterisk: security bump to version 16.28.0 Message-ID: <20230220205151.DC48886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd42aa1d0a3ed7a5845c7b5e7c8aeb82d899699c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Asterisk 16.26.0 fixed the following security issues: - [ASTERISK-29476] ??? res_stir_shaken: Blind SSRF vulnerabilities https://issues.asterisk.org/jira/browse/ASTERISK-29476 - [ASTERISK-29838] ??? ${SQL_ESC()} not correctly escaping a terminating \ https://issues.asterisk.org/jira/browse/ASTERISK-29838 - [ASTERISK-29872] ??? res_stir_shaken: Resource exhaustion with large files https://issues.asterisk.org/jira/browse/ASTERISK-29872 https://www.asterisk.org/asterisk-news/asterisk-16-26-0-now-available/ It unfortunately also introduced a change to chan_iax2, breaking builds without OpenSSL: https://github.com/asterisk/asterisk/commit/59a8cdaca2dbb5eeb7382dfbe78c0c1cbed8ce6d Which was again fixed in 16.28.0: https://github.com/asterisk/asterisk/commit/f812dfb68c6ed7ae55b4c163716fd1ddc063ff54 So bump to 16.28.0: https://www.asterisk.org/asterisk-news/asterisk-16-28-0-now-available/ The libxml2 support now uses pkg-config, so drop the libxml2-config handling: https://github.com/asterisk/asterisk/commit/bf9dafa7c22302b2f1a12b8216da63102116d9c9 Signed-off-by: Peter Korsgaard [yann.morin.1998 at free.fr: - add host-pkgconf dep, don't rely on implicit dep from host-asterisk ] Signed-off-by: Yann E. MORIN --- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 880d67562d..9792d82ac5 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 0fb817943a276f5e540c2a9432e8841cd3393e7c1bd1250055c620902f6eafc8 asterisk-16.25.2.tar.gz +sha256 6e9c2f350db018df854b1301687ced8993facb2787698336e55cd19e0ae3ebfe asterisk-16.28.0.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 9b59997b80..e0f28ae7ee 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.25.2 +ASTERISK_VERSION = 16.28.0 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) @@ -31,6 +31,7 @@ ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ith ASTERISK_DEPENDENCIES = \ host-asterisk \ + host-pkgconf \ jansson \ libcurl \ libedit \ @@ -115,8 +116,7 @@ ASTERISK_CONF_OPTS += --without-avcodec ASTERISK_CONF_OPTS += --without-spandsp ASTERISK_CONF_ENV = \ - ac_cv_file_bridges_bridge_softmix_include_hrirs_h=true \ - ac_cv_path_CONFIG_LIBXML2=$(STAGING_DIR)/usr/bin/xml2-config + ac_cv_file_bridges_bridge_softmix_include_hrirs_h=true # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) @@ -314,8 +314,6 @@ HOST_ASTERISK_LICENSE_FILES = COPYING # so do not inherit the target setup. HOST_ASTERISK_AUTORECONF = NO -HOST_ASTERISK_CONF_ENV = CONFIG_LIBXML2=$(HOST_DIR)/bin/xml2-config - HOST_ASTERISK_CONF_OPTS = \ --without-newt \ --without-curses \ From peter at korsgaard.com Mon Feb 20 20:52:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:57 -0000 Subject: [Buildroot] [git commit branch/next] package/libmdbx: bump version to 0.11.13 "Swashplate" Message-ID: <20230220205154.1C25B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b71948c32bdc7f849190cb9501f72faa608dc17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is stable bugfix release of libmdbx, in Family Glory and in memory of Boris Yuriev (the inventor of Helicopter and Swashplate in 1911) on his 133rd birthday. It is reasonable to backport this patch to all applicable releases/branches of Buildroot. Release notes for v0.11.13 -------------------------- Fixes: - Fixed builds with older libc versions after using `fcntl64()` (backport). - Fixed builds with older `stdatomic.h` versions, where the `ATOMIC_*_LOCK_FREE` macros mistakenly redefined using functions (backport). - Added workaround for `mremap()` defect to avoid assertion failure (backport). - Workaround for `encryptfs` bug(s) in the `copy_file_range` implementation (backport). - Fixed unexpected `MDBX_BUSY` from `mdbx_env_set_option()`, `mdbx_env_set_syncbytes()` and `mdbx_env_set_syncperiod()` (backport). - CMake requirements lowered to version 3.0.2 (backport). - Added admonition of insecure for RISC-V (backport). Minors: - Minor clarification output of `--help` for `mdbx_test` (backport). - Added admonition of insecure for RISC-V (backport). - Stochastic scripts and CMake files synchronized with the `devel` branch. - Use `--dont-check-ram-size` for small-tests make-targets (backport). The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md Signed-off-by: ???????????? ?????????? (Leonid Yuriev) Signed-off-by: Thomas Petazzoni --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index 79af189633..e3fb309461 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 dde8f3626509bb764b17c93fe0629389625cb50362502eb1c27ca208342f3894 libmdbx-amalgamated-0.11.12.tar.xz +sha256 9449fd357119e19902363ab90134d82c9a713b706394c2a1389b5bb4787b5164 libmdbx-amalgamated-0.11.13.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index ac1a3a0d6f..a139e062f6 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.12 +LIBMDBX_VERSION = 0.11.13 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:58 -0000 Subject: [Buildroot] [git commit branch/next] package/gitlab-runner: fix inconsistency of systemd and sysv daemons Message-ID: <20230220205152.91F748648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef6c9da9d255f04847a89d22b99ab3605102d4cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Copy default $DAEMON_ARGS from systemd service to sysv init script. Make GITLAB_RUNNER_USER home directory the same as default --work-directory (-d) flag. Run sysv daemon process using root user (remove -c option) This is needed to correctly access config files as specified. System access can still be limited with gitlab-runner `--user` flag. Use same $DAEMON_ARGS variable name so it can be overwritten in /etc/default/gitlab-runner environment file in both cases. Signed-off-by: Marek Metelski Reviewed-by: Marcin Niestroj Signed-off-by: Thomas Petazzoni --- package/gitlab-runner/S95gitlab-runner | 6 +++--- package/gitlab-runner/gitlab-runner.mk | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/gitlab-runner/S95gitlab-runner b/package/gitlab-runner/S95gitlab-runner index 2a50e7151a..739adf1783 100644 --- a/package/gitlab-runner/S95gitlab-runner +++ b/package/gitlab-runner/S95gitlab-runner @@ -3,7 +3,7 @@ DAEMON="gitlab-runner" PIDFILE="/var/run/$DAEMON.pid" -GITLAB_RUNNER_ARGS="run" +DAEMON_ARGS="run --syslog --user gitlab-runner -d /var/lib/gitlab-runner -c /etc/gitlab-runner/config.toml" # shellcheck source=/dev/null [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" @@ -11,8 +11,8 @@ GITLAB_RUNNER_ARGS="run" start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -m -b -p "$PIDFILE" -c "$DAEMON:$DAEMON" -x "/usr/bin/$DAEMON" \ - -- $GITLAB_RUNNER_ARGS + start-stop-daemon -S -q -m -b -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ + -- $DAEMON_ARGS status=$? if [ "$status" -eq 0 ]; then echo "OK" diff --git a/package/gitlab-runner/gitlab-runner.mk b/package/gitlab-runner/gitlab-runner.mk index fde776e631..9542275135 100644 --- a/package/gitlab-runner/gitlab-runner.mk +++ b/package/gitlab-runner/gitlab-runner.mk @@ -12,9 +12,8 @@ GITLAB_RUNNER_LICENSE_FILES = LICENSE GITLAB_RUNNER_LDFLAGS = \ -X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=$(GITLAB_RUNNER_VERSION) -# Don't run gitlab runner as root. define GITLAB_RUNNER_USERS - gitlab-runner -1 gitlab-runner -1 * /var/run/dbus /bin/false - Gitlab Runner + gitlab-runner -1 gitlab-runner -1 * /var/lib/gitlab-runner /bin/false - Gitlab Runner endef define GITLAB_RUNNER_INSTALL_INIT_SYSV From peter at korsgaard.com Mon Feb 20 20:52:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:58 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_kria_kv260_defconfig: bump to Xilinx 2022.2 Message-ID: <20230220205154.6773486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5bbc20154e2291b967b7fc66ca4f85a2b47dcfd1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch bumps the zynqmp_kria_kv260_defconfig to Xilinx release 2022.2. Xilinx 2022.2 includes: - U-Boot 2022.01 bug fixes - Linux bump to Linux 5.15.36 with bug fixes - TF-A 2.6 bug fixes - PMUFW bug fixes Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/zynqmp_kria_kv260_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 25bab4cbb4..7afc7748b0 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.1)/xlnx_rebase_v5.15_LTS_2022.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/smk-k26-revA-sck-kv-g-revB" @@ -15,14 +15,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.1)/xlnx_rebase_v2.6_2022.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.1)/xlnx_rebase_v2022.01_2022.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/kv260/uboot.fragment" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -30,7 +30,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.1/kv260/kv260_pmufw.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.2/kv260/kv260_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:59 -0000 Subject: [Buildroot] [git commit branch/next] configs/qemu_aarch64_ebbr: add host-qemu Message-ID: <20230220205152.E1706828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2cda2584fbb566284019f39ca89f44b42dacdb03 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add the host-qemu package to enable testing on gitlab. Signed-off-by: Vincent Stehl?? Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/qemu_aarch64_ebbr_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index a0d8105c43..d293ad0e60 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -48,3 +48,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From arnout at mind.be Mon Feb 20 20:53:05 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:53:05 -0000 Subject: [Buildroot] [git commit branch/next] package/libopenssl: drop useless option for rc5 Message-ID: <20230220205153.21BE286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7178dd432e4905cf96383e5aa316553cf30f178 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit a83d41867c8d (package/libopenssl: add option to enable some features) added an option to enable rc5. However, since commit 1fff94121936 (Fixup non-x86 openssl build), dated 2002-12-30, rc5 has always been forcibly disabled in Buildroot. Given that it was unconditionally disabled all this time, and no one complained, it means there is virtually no-one using rc5, so we can just drop the option. Signed-off-by: Yann E. MORIN Cc: "GAUTRON, Erwan" Cc: "Weber, Matthew L Collins" Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 7 +++++++ package/libopenssl/Config.in | 4 ---- package/libopenssl/libopenssl.mk | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7458fa331e..b3c35d6b07 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.11" +config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 + bool "libopenssl rc5 was never enabled" + select BR2_LEGACY + help + The libopenssl option for rc5 never actually enabled rc5, + which had always been disabled in Buildroot. + config BR2_PACKAGE_LIBDCADEC bool "package was deprecated upstream, use ffmpeg instead" select BR2_LEGACY diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in index fcead4c11a..00339238fb 100644 --- a/package/libopenssl/Config.in +++ b/package/libopenssl/Config.in @@ -44,10 +44,6 @@ config BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA bool "enable CHACHA" default y -config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 - bool "enable RC5" - default y - config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2 bool "enable RC2" default y diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 50d41a6533..3542b89727 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -85,7 +85,6 @@ define LIBOPENSSL_CONFIGURE_CMDS no-fuzz-afl \ no-afalgeng \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA),,no-chacha) \ - $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5),,no-rc5) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2),,no-rc2) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4),,no-rc4) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MD2),,no-md2) \ From peter at korsgaard.com Mon Feb 20 20:53:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:05 -0000 Subject: [Buildroot] [git commit branch/next] package/lxc: fix build with sys/pidfd.h Message-ID: <20230220205155.AA34A86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74b1d385b67dc5933eca3ebeb456d400bd5296d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with sys/pidfd.h raised since bump to version 5.0.1 in commit db19998035701d08bf1b5fd366e0b5aa9adb8e57: In file included from ../src/lxc/utils.h:23, from ../src/lxc/cgroups/cgfsng.c:51: ../src/lxc/process_utils.h:140:17: error: expected identifier before numeric constant 140 | #define P_PIDFD 3 | ^ Fixes: - http://autobuild.buildroot.org/results/c9ff42a921ca47f634f908bab80c80164c227a02 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...003-build-detect-sys-pidfd.h-availability.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch b/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch new file mode 100644 index 0000000000..3aa598407f --- /dev/null +++ b/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch @@ -0,0 +1,55 @@ +From ef1e0607b82e27350c2d677d649c6a0a9693fd40 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Tue, 9 Aug 2022 16:27:40 +0200 +Subject: [PATCH] build: detect sys/pidfd.h availability + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) + +[Retrieved from: +https://github.com/lxc/lxc/commit/ef1e0607b82e27350c2d677d649c6a0a9693fd40] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 1 + + src/lxc/process_utils.h | 6 ++++++ + 2 files changed, 7 insertions(+) + +diff --git a/meson.build b/meson.build +index f679aabbc8..e999542336 100644 +--- a/meson.build ++++ b/meson.build +@@ -735,6 +735,7 @@ foreach tuple: [ + ['sys/resource.h'], + ['sys/memfd.h'], + ['sys/personality.h'], ++ ['sys/pidfd.h'], + ['sys/signalfd.h'], + ['sys/timerfd.h'], + ['pty.h'], +diff --git a/src/lxc/process_utils.h b/src/lxc/process_utils.h +index 9c15b15741..ed84741d0e 100644 +--- a/src/lxc/process_utils.h ++++ b/src/lxc/process_utils.h +@@ -15,6 +15,10 @@ + #include + #include + ++#if HAVE_SYS_PIDFD_H ++#include ++#endif ++ + #include "compiler.h" + #include "syscall_numbers.h" + +@@ -136,9 +140,11 @@ + #endif + + /* waitid */ ++#if !HAVE_SYS_PIDFD_H + #ifndef P_PIDFD + #define P_PIDFD 3 + #endif ++#endif + + #ifndef CLONE_ARGS_SIZE_VER0 + #define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ From peter at korsgaard.com Mon Feb 20 20:53:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:06 -0000 Subject: [Buildroot] [git commit branch/next] Kickoff 2023.02 cycle Message-ID: <20230220205155.D735E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15d3648df93d1113b07a63c1264ea4b5ba9662b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 89f3648bb7..9c1776eb6c 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.11 +export BR2_VERSION := 2023.02-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1669308000 From yann.morin.1998 at free.fr Mon Feb 20 20:53:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:06 -0000 Subject: [Buildroot] [git commit branch/next] package/sysstat: security bump to version 12.6.1 Message-ID: <20230220205151.BEF7481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4ef408e8f738575841c5ffc43504be4c3f6fa56 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-39377: sysstat is a set of system performance tools for the Linux operating system. On 32 bit systems, in versions 9.1.16 and newer but prior to 12.7.1, allocate_structures contains a size_t overflow in sa_common.c. The allocate_structures function insufficiently checks bounds before arithmetic multiplication, allowing for an overflow in the size allocated for the buffer representing system activities. This issue may lead to Remote Code Execution (RCE). Despite what is written above in the CVE announcement, and as written in the Changelog, the fix is also included in version 12.6.1 (12.7.1 is a development version): https://github.com/sysstat/sysstat/commit/c1e631eddc50c04e4dcea169ba396bee2bd6b0ab As a consequence, 12.6.1 is still reported as being affected. Until the NVD is updated appropriately, we mark the CVE as ignored with a comment that explains why. Note: that commit is not reachable from any branch in the sysstat repository, and Github warns about that, but the commit does belong to the upstream repository and is reachable from the 12.6.1 tag (it looks like sysstat only pushes tags-with-history for fix releases). https://github.com/sysstat/sysstat/security/advisories/GHSA-q8r6-g56f-9w7x https://github.com/sysstat/sysstat/blob/v12.6.1/CHANGES Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: - ignore the CVE, explain why - explain why github warns about the fix commit ] Signed-off-by: Yann E. MORIN --- package/sysstat/sysstat.hash | 4 ++-- package/sysstat/sysstat.mk | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash index b573f312c6..b47f000e57 100644 --- a/package/sysstat/sysstat.hash +++ b/package/sysstat/sysstat.hash @@ -1,5 +1,5 @@ # From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 1e38bc029979def730ae1fb1e39f631bd1a3bc73 sysstat-12.4.2.tar.xz +sha1 a730982e0c2d4964a0022c1509f3ea0a345402bc sysstat-12.6.1.tar.xz # Locally calculated -sha256 3701b2c1883d50eb384d7b95ce5b6df0a71fdcb3c23f96cb58098d1bcffa018f sysstat-12.4.2.tar.xz +sha256 18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342 sysstat-12.6.1.tar.xz sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 6948f6b390..eaf505dc49 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSSTAT_VERSION = 12.4.2 +SYSSTAT_VERSION = 12.6.1 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard SYSSTAT_CONF_OPTS = --disable-file-attr @@ -14,6 +14,9 @@ SYSSTAT_LICENSE_FILES = COPYING SYSSTAT_CPE_ID_VENDOR = sysstat_project SYSSTAT_SELINUX_MODULES = sysstat +# NVD is not up-to-date; 12.6.1 includes c1e631eddc50, which fixes the issue +SYSSTAT_IGNORE_CVES += CVE-2022-39377 + ifeq ($(BR2_PACKAGE_LM_SENSORS),y) SYSSTAT_DEPENDENCIES += lm-sensors SYSSTAT_CONF_OPTS += --enable-sensors From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:07 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: remove Derrick Lyndon Pallas Message-ID: <20230220205155.E1AF886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6aca1d4d70bfe0b8a627d9e08692b36dd19a92d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next His e-mail address no longer exists: Your message wasn't delivered to derrick at meter.com because the address couldn't be found, or is unable to receive mail. Learn more here: https://support.google.com/mail/answer/6596 The response was: The email account that you tried to reach does not exist. Please try double-checking the recipient's email address for typos or unnecessary spaces. Learn more at https://support.google.com/mail/answer/6596 Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 4f862befb0..9da61cca13 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -729,9 +729,6 @@ F: package/tcllib/ N: Denis Bodor F: package/libstrophe/ -N: Derrick Lyndon Pallas -F: package/ipcalc/ - N: Dick Olsson F: board/aarch64-efi/ F: board/pc/ From peter at korsgaard.com Mon Feb 20 20:53:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:08 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.11-rc3 Message-ID: <20230220205153.4ECF5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=269c1e9368e5473fa0dc117ff6b020143c014c8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- CHANGES | 15 +++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 47 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index d08b2500ab..79b010a9b8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,18 @@ +2022.11-rc3, released November 24th, 2022 + + Fixes all over the tree. + + Updated/fixed packages: asterisk, edk2, edk2-platforms, + freerdp, gitlab-runner, gnupg2, gptfdisk, heimdal, + igh-ethercat, iwd, libkrb5, libksba, libnss, libopenssl, + mesa3d, nginx, nodejs, openpgm, python3, rsync, rtl8189es, + rtl8723ds, samba4, sdl, sdl2, swupdate, sysstat, systemd, + uboot, xen, xterm + + Issues resolved (http://bugs.uclibc.org): + + #15141: kernel 5.16.2 (realtime patch 19) fails to build + 2022.11-rc2, released November 16th, 2022 Fixes all over the tree. diff --git a/Makefile b/Makefile index b2f342f4a8..827ab230ef 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.11-rc2 +export BR2_VERSION := 2022.11-rc3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1668603000 +BR2_VERSION_EPOCH = 1669308000 # 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 538f2f6042..a92f630611 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@
    -

    Latest release candidate: 2022.11-rc2

    +

    Latest release candidate: 2022.11-rc3

    - +
    - +
    -

    buildroot-2022.11-rc2.tar.gz

    -

    PGP signature

    +

    buildroot-2022.11-rc3.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2022.11-rc2.tar.xz

    -

    PGP signature

    +

    buildroot-2022.11-rc3.tar.xz

    +

    PGP signature

    diff --git a/docs/website/news.html b/docs/website/news.html index ee7ce344c9..1d76cc3cf5 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

    News

      +
    • +
      +
      +
      +

      2022.11-rc3 released

      +

      24 November 2022

      +
      +
      +

      2022.11-rc3 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

      + +

      Head to the downloads page to pick up the + 2022.11-rc3 + release candidate, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • +
    • From peter at korsgaard.com Mon Feb 20 20:53:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:08 -0000 Subject: [Buildroot] [git commit branch/next] package/sdl2_ttf: fix legal-info after bump to 2.20.1 Message-ID: <20230220205156.34EAC86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2313f68e4c56faf9d5366bc3c61d03cf814f5a43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 93d8b71371962 (package/sdl2_ttf: bump version to 2.20.1) dropped the hash for COPYING.txt and added a hash for LICENSE.txt but forgot to adjust SDL2_TTF_LICENSE_FILES, breaking legal-info: >>> sdl2_ttf 2.20.1 Collecting legal info ERROR: No hash found for COPYING.txt cp: cannot stat '/path/to/output/build/sdl2_ttf-2.20.1/COPYING.txt': No such file or directory make[1]: *** [package/sdl2_ttf/sdl2_ttf.mk:38: sdl2_ttf-legal-info] Error 1 Signed-off-by: Peter Korsgaard --- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 4b44b0fc41..f859d097ff 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -8,7 +8,7 @@ SDL2_TTF_VERSION = 2.20.1 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib -SDL2_TTF_LICENSE_FILES = COPYING.txt +SDL2_TTF_LICENSE_FILES = LICENSE.txt SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf SDL2_TTF_CONF_OPTS = --disable-freetype-builtin --disable-harfbuzz-builtin From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:08 -0000 Subject: [Buildroot] [git commit branch/next] package/wilc-driver: fix build failure due to missing Linux options Message-ID: <20230220205153.5A3AA86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9fe82e56d205c1fb3efe4ef6ae5b24d2284f1429 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Enable Linux options depending on the bus has been chosen, so: 1) enable by default common Linux options: CONFIG_NET CONFIG_WIRELESS CONFIG_CFG80211 CONFIG_CRC_ITU_T CONFIG_CRC7 2) enable for SDIO bus: CONFIG_MMC 3) enable for SPI bus: CONFIG_SPI Fixes: http://autobuild.buildroot.net/results/d8c4f0f959dd2ec110db8a75980f13172c3c116c/ Signed-off-by: Giulio Benetti Reviewed-by: Kris Bahnsen Signed-off-by: Thomas Petazzoni --- package/wilc-driver/wilc-driver.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/wilc-driver/wilc-driver.mk b/package/wilc-driver/wilc-driver.mk index a89af30e29..a7a902b6db 100644 --- a/package/wilc-driver/wilc-driver.mk +++ b/package/wilc-driver/wilc-driver.mk @@ -13,11 +13,17 @@ WILC_DRIVER_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_WILC_DRIVER_SPI),y) WILC_DRIVER_MODULE_MAKE_OPTS += \ CONFIG_WILC_SPI=m +define WILC_DRIVER_SPI_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_SPI) +endef endif ifeq ($(BR2_PACKAGE_WILC_DRIVER_SDIO),y) WILC_DRIVER_MODULE_MAKE_OPTS += \ CONFIG_WILC_SDIO=m +define WILC_DRIVER_SDIO_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_MMC) +endef endif ifeq ($(BR2_PACKAGE_WILC_DRIVER_SDIO_OOB),y) @@ -25,5 +31,15 @@ WILC_DRIVER_MODULE_MAKE_OPTS += \ CONFIG_WILC_HW_OOB_INTR=y endif +define WILC_DRIVER_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRC_ITU_T) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRC7) + $(WILC_DRIVER_SPI_LINUX_CONFIG_FIXUPS) + $(WILC_DRIVER_SDIO_LINUX_CONFIG_FIXUPS) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:09 -0000 Subject: [Buildroot] [git commit branch/next] configs/nitrogen8*: extend filesystem size Message-ID: <20230220205153.957C2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=634b55a1c6e5009bfd592bd9c40b99fd14cbf668 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The default ext2 filesystem size of 60 MB is now too small to contain the root filesystem of the Nitrogen i.MX8 configurations. The nitrogen8mp_defconfig configuration for examples generates 55 MB of contents in the rootfs, so an image of 60 MB is slightly too small. This commit extends the filesystem size to 120 MB. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3372859635 (nitrogen8mp) https://gitlab.com/buildroot.org/buildroot/-/jobs/3372859634 (nitrogen8mn) https://gitlab.com/buildroot.org/buildroot/-/jobs/3372859633 (nitrogen8mm) https://gitlab.com/buildroot.org/buildroot/-/jobs/3372859632 (nitrogen8m) Signed-off-by: Thomas Petazzoni --- configs/nitrogen8m_defconfig | 1 + configs/nitrogen8mm_defconfig | 1 + configs/nitrogen8mn_defconfig | 1 + configs/nitrogen8mp_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/nitrogen8m_defconfig b/configs/nitrogen8m_defconfig index a6a9526dee..932ff97ab3 100644 --- a/configs/nitrogen8m_defconfig +++ b/configs/nitrogen8m_defconfig @@ -16,6 +16,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y diff --git a/configs/nitrogen8mm_defconfig b/configs/nitrogen8mm_defconfig index 0130a6a62a..53fbdc3da4 100644 --- a/configs/nitrogen8mm_defconfig +++ b/configs/nitrogen8mm_defconfig @@ -16,6 +16,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y diff --git a/configs/nitrogen8mn_defconfig b/configs/nitrogen8mn_defconfig index 50976959c5..51a0a56140 100644 --- a/configs/nitrogen8mn_defconfig +++ b/configs/nitrogen8mn_defconfig @@ -16,6 +16,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y diff --git a/configs/nitrogen8mp_defconfig b/configs/nitrogen8mp_defconfig index a14a024353..05caae466a 100644 --- a/configs/nitrogen8mp_defconfig +++ b/configs/nitrogen8mp_defconfig @@ -16,6 +16,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y From peter at korsgaard.com Mon Feb 20 20:53:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:10 -0000 Subject: [Buildroot] [git commit branch/next] Revert "package/python3: fix CVE-2022-37454" Message-ID: <20230220205156.29EFA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac96a65a29c73456b7cc8fd707b405e6ca67ac20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/270/2707e4e5545e2cf70ad5dfa36a5c25d3a44916d2/ This reverts commit 92d96e8513c75a8ab496c90841920e896085915f. With the merge of next, we are now using python 3.11.0, so this fix is no longer needed. Signed-off-by: Peter Korsgaard --- ...8517-Fix-buffer-overflows-in-_sha3-module.patch | 101 --------------------- package/python3/python3.mk | 3 - 2 files changed, 104 deletions(-) diff --git a/package/python3/0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch b/package/python3/0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch deleted file mode 100644 index 5c50dd16cb..0000000000 --- a/package/python3/0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 0e4e058602d93b88256ff90bbef501ba20be9dd3 Mon Sep 17 00:00:00 2001 -From: Theo Buehler -Date: Fri, 21 Oct 2022 21:26:01 +0200 -Subject: [PATCH] [3.10] gh-98517: Fix buffer overflows in _sha3 module - (#98519) - -This is a port of the applicable part of XKCP's fix [1] for -CVE-2022-37454 and avoids the segmentation fault and the infinite -loop in the test cases published in [2]. - -[1]: https://github.com/XKCP/XKCP/commit/fdc6fef075f4e81d6b1bc38364248975e08e340a -[2]: https://mouha.be/sha-3-buffer-overflow/ - -Regression test added by: Gregory P. Smith [Google LLC] - -[Retrieved from: -https://github.com/python/cpython/commit/0e4e058602d93b88256ff90bbef501ba20be9dd3] -Signed-off-by: Fabrice Fontaine ---- - Lib/test/test_hashlib.py | 9 +++++++++ - .../2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst | 1 + - Modules/_sha3/kcp/KeccakSponge.inc | 15 ++++++++------- - 3 files changed, 18 insertions(+), 7 deletions(-) - create mode 100644 Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst - -diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py -index 535f4aa3e04c..9aa6c1f0a3b6 100644 ---- a/Lib/test/test_hashlib.py -+++ b/Lib/test/test_hashlib.py -@@ -495,6 +495,15 @@ def test_case_md5_huge(self, size): - def test_case_md5_uintmax(self, size): - self.check('md5', b'A'*size, '28138d306ff1b8281f1a9067e1a1a2b3') - -+ @unittest.skipIf(sys.maxsize < _4G - 1, 'test cannot run on 32-bit systems') -+ @bigmemtest(size=_4G - 1, memuse=1, dry_run=False) -+ def test_sha3_update_overflow(self, size): -+ """Regression test for gh-98517 CVE-2022-37454.""" -+ h = hashlib.sha3_224() -+ h.update(b'\x01') -+ h.update(b'\x01'*0xffff_ffff) -+ self.assertEqual(h.hexdigest(), '80762e8ce6700f114fec0f621fd97c4b9c00147fa052215294cceeed') -+ - # use the three examples from Federal Information Processing Standards - # Publication 180-1, Secure Hash Standard, 1995 April 17 - # http://www.itl.nist.gov/div897/pubs/fip180-1.htm -diff --git a/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst b/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst -new file mode 100644 -index 000000000000..2d23a6ad93c7 ---- /dev/null -+++ b/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst -@@ -0,0 +1 @@ -+Port XKCP's fix for the buffer overflows in SHA-3 (CVE-2022-37454). -diff --git a/Modules/_sha3/kcp/KeccakSponge.inc b/Modules/_sha3/kcp/KeccakSponge.inc -index e10739deafa8..cf92e4db4d36 100644 ---- a/Modules/_sha3/kcp/KeccakSponge.inc -+++ b/Modules/_sha3/kcp/KeccakSponge.inc -@@ -171,7 +171,7 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat - i = 0; - curData = data; - while(i < dataByteLen) { -- if ((instance->byteIOIndex == 0) && (dataByteLen >= (i + rateInBytes))) { -+ if ((instance->byteIOIndex == 0) && (dataByteLen-i >= rateInBytes)) { - #ifdef SnP_FastLoop_Absorb - /* processing full blocks first */ - -@@ -199,10 +199,10 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat - } - else { - /* normal lane: using the message queue */ -- -- partialBlock = (unsigned int)(dataByteLen - i); -- if (partialBlock+instance->byteIOIndex > rateInBytes) -+ if (dataByteLen-i > rateInBytes-instance->byteIOIndex) - partialBlock = rateInBytes-instance->byteIOIndex; -+ else -+ partialBlock = (unsigned int)(dataByteLen - i); - #ifdef KeccakReference - displayBytes(1, "Block to be absorbed (part)", curData, partialBlock); - #endif -@@ -281,7 +281,7 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte - i = 0; - curData = data; - while(i < dataByteLen) { -- if ((instance->byteIOIndex == rateInBytes) && (dataByteLen >= (i + rateInBytes))) { -+ if ((instance->byteIOIndex == rateInBytes) && (dataByteLen-i >= rateInBytes)) { - for(j=dataByteLen-i; j>=rateInBytes; j-=rateInBytes) { - SnP_Permute(instance->state); - SnP_ExtractBytes(instance->state, curData, 0, rateInBytes); -@@ -299,9 +299,10 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte - SnP_Permute(instance->state); - instance->byteIOIndex = 0; - } -- partialBlock = (unsigned int)(dataByteLen - i); -- if (partialBlock+instance->byteIOIndex > rateInBytes) -+ if (dataByteLen-i > rateInBytes-instance->byteIOIndex) - partialBlock = rateInBytes-instance->byteIOIndex; -+ else -+ partialBlock = (unsigned int)(dataByteLen - i); - i += partialBlock; - - SnP_ExtractBytes(instance->state, curData, instance->byteIOIndex, partialBlock); diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 4d94d25ff8..123bc8ef88 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -16,9 +16,6 @@ PYTHON3_CPE_ID_PRODUCT = python # 0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch PYTHON3_IGNORE_CVES += CVE-2022-45061 -# 0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch -PYTHON3_IGNORE_CVES += CVE-2022-37454 - # This host Python is installed in $(HOST_DIR), as it is needed when # cross-compiling third-party Python modules. From arnout at mind.be Mon Feb 20 20:53:10 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:53:10 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8188eu: bump to 2022-11-29 version on v5.2.2.4 branch Message-ID: <20230220205153.B78288648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1fe4f83bf41fd403fde7d0ad23187e0d50aa0bbd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/8bcb4d0adabc141ff8144f9e22bd549e3cd8858a/ Signed-off-by: Giulio Benetti Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle --- package/rtl8188eu/rtl8188eu.hash | 2 +- package/rtl8188eu/rtl8188eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8188eu/rtl8188eu.hash b/package/rtl8188eu/rtl8188eu.hash index 0ad7786328..29ce0e32c2 100644 --- a/package/rtl8188eu/rtl8188eu.hash +++ b/package/rtl8188eu/rtl8188eu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 50529c110e0a45fbe3169d0e237c4d0959300840f5e162c24256452976fb2670 rtl8188eu-c4908ca4caf861d858c4d9e8452a2ad5c88cf2ba.tar.gz +sha256 c573529862861a7a75534a4f2bc34ba7e3b116125298b5bc0d432b3065bd7df6 rtl8188eu-f4af53305cb1e9a0d8d9957a042f7c01b7121bfc.tar.gz sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/package/rtl8188eu/rtl8188eu.mk b/package/rtl8188eu/rtl8188eu.mk index 199362d7ae..3698115d3c 100644 --- a/package/rtl8188eu/rtl8188eu.mk +++ b/package/rtl8188eu/rtl8188eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8188EU_VERSION = c4908ca4caf861d858c4d9e8452a2ad5c88cf2ba +RTL8188EU_VERSION = f4af53305cb1e9a0d8d9957a042f7c01b7121bfc RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION)) RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob) RTL8188EU_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:10 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libxshmfence: bump version to 1.3.2 Message-ID: <20230220205156.5FAC586494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79a72dd0a5c8563533f75914d276022c401b3ffa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003287.html https://lists.x.org/archives/xorg-announce/2022-October/003229.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash | 8 +++----- package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash index 3ec055a792..e8f83d427f 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-February/002840.html -md5 42dda8016943dc12aff2c03a036e0937 libxshmfence-1.3.tar.bz2 -sha1 3472218fc0e8ee8183533d22dbcd4bbe90bf3ab8 libxshmfence-1.3.tar.bz2 -sha256 b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7 libxshmfence-1.3.tar.bz2 -sha512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7 libxshmfence-1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003287.html +sha256 870df257bc40b126d91b5a8f1da6ca8a524555268c50b59c0acd1a27f361606f libxshmfence-1.3.2.tar.xz +sha512 e20a6827e370726cf50489a69f4a52b897f1c44e3eba8c72a4e626b08724e877d090770b8016765736d887d5d5eaba1fda9c29066e62d259b4d1e2064bc1626c libxshmfence-1.3.2.tar.xz # Locally computed sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk index 605408fff7..4241102855 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXSHMFENCE_VERSION = 1.3 -XLIB_LIBXSHMFENCE_SOURCE = libxshmfence-$(XLIB_LIBXSHMFENCE_VERSION).tar.bz2 +XLIB_LIBXSHMFENCE_VERSION = 1.3.2 +XLIB_LIBXSHMFENCE_SOURCE = libxshmfence-$(XLIB_LIBXSHMFENCE_VERSION).tar.xz XLIB_LIBXSHMFENCE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXSHMFENCE_LICENSE = MIT XLIB_LIBXSHMFENCE_LICENSE_FILES = COPYING From arnout at mind.be Mon Feb 20 20:53:11 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:53:11 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8821au: bump to 2022-10-30 version of v5.2.6 branch Message-ID: <20230220205153.C245F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=121184d746bc1a21385e9f20728664b257b52682 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/4526cb70ce91bcd5fce60ebb4f704a63f1ecd249/ Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/rtl8821au/rtl8821au.hash | 2 +- package/rtl8821au/rtl8821au.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8821au/rtl8821au.hash b/package/rtl8821au/rtl8821au.hash index a5d0c2d5d4..b19cb93bf6 100644 --- a/package/rtl8821au/rtl8821au.hash +++ b/package/rtl8821au/rtl8821au.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 302f37098c3ae018eebf8ca80bcd2ec8ffc46755daed811278321d0914758f41 rtl8821au-e0b443940471c166a5cc6280d3608f95228e017f.tar.gz +sha256 9dfb2b12c52fe759e4978cbd7a0fb90f0605ae9146a6d0186f2869bbfb6d13fd rtl8821au-0cab870ff635ba038705ab29363b0cbbedd5c258.tar.gz sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 LICENSE diff --git a/package/rtl8821au/rtl8821au.mk b/package/rtl8821au/rtl8821au.mk index 65c0bc913d..6bb77de81f 100644 --- a/package/rtl8821au/rtl8821au.mk +++ b/package/rtl8821au/rtl8821au.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8821AU_VERSION = e0b443940471c166a5cc6280d3608f95228e017f +RTL8821AU_VERSION = 0cab870ff635ba038705ab29363b0cbbedd5c258 RTL8821AU_SITE = $(call github,lwfinger,rtl8812au,$(RTL8821AU_VERSION)) RTL8821AU_LICENSE = GPL-2.0 RTL8821AU_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:53:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:11 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXau: bump version to 1.0.11 Message-ID: <20230220205156.8008486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7436867eb1d07a1cf0c9c809b6c13c11596a1159 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003284.html https://lists.x.org/archives/xorg-announce/2022-August/003201.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXau/xlib_libXau.hash | 8 +++----- package/x11r7/xlib_libXau/xlib_libXau.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libXau/xlib_libXau.hash b/package/x11r7/xlib_libXau/xlib_libXau.hash index 65ae54ec32..8d2a6ff43c 100644 --- a/package/x11r7/xlib_libXau/xlib_libXau.hash +++ b/package/x11r7/xlib_libXau/xlib_libXau.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002942.html -md5 c5f16288f2da9f071b29111d68797480 libXau-1.0.9.tar.bz2 -sha1 ef9b1ad00f958c8b6e30a1bbc11fdfac311c9733 libXau-1.0.9.tar.bz2 -sha256 ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec libXau-1.0.9.tar.bz2 -sha512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562 libXau-1.0.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003284.html +sha256 f3fa3282f5570c3f6bd620244438dbfbdd580fc80f02f549587a0f8ab329bbeb libXau-1.0.11.tar.xz +sha512 f56abba3bef3fdd4739dfa69367a4251b5fab7c89194c9aece9efa66b9ebbf0736690cc9bd654aab19d9db377e4b9a5268c9c020b3d293bb5351bff5fe75a4dd libXau-1.0.11.tar.xz # Locally computed sha256 56abe29bb1d9806a9e04fa9f80fed2c0f18027594df3f098148d814aef6bddfa COPYING diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk index bac10818f1..0e9f79d38d 100644 --- a/package/x11r7/xlib_libXau/xlib_libXau.mk +++ b/package/x11r7/xlib_libXau/xlib_libXau.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXAU_VERSION = 1.0.9 -XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2 +XLIB_LIBXAU_VERSION = 1.0.11 +XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.xz XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXAU_LICENSE = MIT XLIB_LIBXAU_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:12 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXxf86dga: bump version to 1.1.6 Message-ID: <20230220205156.964AE86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6e3bcfb376b59a2503f111b6339202752b794c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003281.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash | 8 +++----- package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash index 1b05624783..9057d4e8e2 100644 --- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash +++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002982.html -md5 0ddeafc13b33086357cfa96fae41ee8e libXxf86dga-1.1.5.tar.bz2 -sha1 332ba80d1b3d06473f7bbfe1612e7c5b58fbdf69 libXxf86dga-1.1.5.tar.bz2 -sha256 2b98bc5f506c6140d4eddd3990842d30f5dae733b64f198a504f07461bdb7203 libXxf86dga-1.1.5.tar.bz2 -sha512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89 libXxf86dga-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003281.html +sha256 be44427579808fe3a217d59f51cae756a26913eb6e4c8738ccab65ff56d7980f libXxf86dga-1.1.6.tar.xz +sha512 61f7954471df63840ffb5e82347018e285d30d64d4d0a97770ca031c8554a0f52d1b007ab8342a283cd2f0d534f564fb59f57ec92515714f20a7d145912c65d9 libXxf86dga-1.1.6.tar.xz # Locally computed sha256 dd27933ebc5c063128b158b085e4c442a36b0e6f704cf753116da119610191da COPYING diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk index a5173fbc7c..1094e1a1ad 100644 --- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk +++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXXF86DGA_VERSION = 1.1.5 -XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2 +XLIB_LIBXXF86DGA_VERSION = 1.1.6 +XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.xz XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXXF86DGA_LICENSE = MIT XLIB_LIBXXF86DGA_LICENSE_FILES = COPYING From arnout at mind.be Mon Feb 20 20:53:12 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:53:12 -0000 Subject: [Buildroot] [git commit branch/next] board/freescale/imx6ul(l)evk: fix repetition of "to" string Message-ID: <20230220205153.DB9398648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb894b2e98e944e517cb74278df555fa4147d3b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- board/freescale/imx6ulevk/readme.txt | 2 +- board/freescale/imx6ullevk/readme.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/freescale/imx6ulevk/readme.txt b/board/freescale/imx6ulevk/readme.txt index 90355f354f..5bc03771f2 100644 --- a/board/freescale/imx6ulevk/readme.txt +++ b/board/freescale/imx6ulevk/readme.txt @@ -12,7 +12,7 @@ Build First, configure Buildroot for your i.MX6UL EVK board: -In order to to do so there are two supported options: +In order to do so there are two supported options: make freescale_imx6ulevk_defconfig diff --git a/board/freescale/imx6ullevk/readme.txt b/board/freescale/imx6ullevk/readme.txt index 77acec2615..dc7c5f3678 100644 --- a/board/freescale/imx6ullevk/readme.txt +++ b/board/freescale/imx6ullevk/readme.txt @@ -9,7 +9,7 @@ Build First, configure Buildroot for your i.MX6ULL EVK board: -In order to to do so there are two supported options: +In order to do so there are two supported options: make freescale_imx6ullevk_defconfig From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:13 -0000 Subject: [Buildroot] [git commit branch/next] toolchain/Config.in: fix check-package warning Message-ID: <20230220205153.8AB408648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d5d447c5d531479ea5fa60ca3231ec91bde5354 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next toolchain/Config.in:236: attributes order: type, default, depends on, select, help (http://nightly.buildroot.org/#_config_files) Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3381962216 Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index e7329c1a1c..4947ab3aae 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -231,13 +231,13 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_104028 # https://sourceware.org/bugzilla/show_bug.cgi?id=29621 config BR2_TOOLCHAIN_HAS_GCC_BUG_107728 bool - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_OPTIMIZE_0 default y if BR2_microblazebe || BR2_microblazeel \ || BR2_mips || BR2_mipsel \ || BR2_nios2 \ || BR2_or1k \ || BR2_sh + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_OPTIMIZE_0 config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool From yann.morin.1998 at free.fr Mon Feb 20 20:53:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:13 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXcomposite: bump version to 0.4.6 Message-ID: <20230220205156.CC56286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d39f7ecd4938158183adfc13147a9d3b61c85a8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003276.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash | 8 +++----- package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash index 5d4575b5ab..62b5ea9276 100644 --- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash +++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002971.html -md5 3fa0841ea89024719b20cd702a9b54e0 libXcomposite-0.4.5.tar.bz2 -sha1 902631efb55a798c81086e5ff90b60349839db40 libXcomposite-0.4.5.tar.bz2 -sha256 b3218a2c15bab8035d16810df5b8251ffc7132ff3aa70651a1fba0bfe9634e8f libXcomposite-0.4.5.tar.bz2 -sha512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5 libXcomposite-0.4.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003276.html +sha256 fe40bcf0ae1a09070eba24088a5eb9810efe57453779ec1e20a55080c6dc2c87 libXcomposite-0.4.6.tar.xz +sha512 f35a0da8f9f22fd788eee01209557fe3a1b1abdc9744f76330ba42b21b6e3af5464ca4451c33415856417c30da5aa5624e3707980c644327249bfeda5a62a59b libXcomposite-0.4.6.tar.xz # Locally computed sha256 efa0219ed8485ac555c1a3fb82daf34539b2e0dcf4dadc99c01f1e39c69a4a68 COPYING diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk index 80e94fe37c..c296ee6c6c 100644 --- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk +++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXCOMPOSITE_VERSION = 0.4.5 -XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.bz2 -XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXCOMPOSITE_VERSION = 0.4.6 +XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.xz +XLIB_LIBXCOMPOSITE_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXCOMPOSITE_LICENSE = MIT XLIB_LIBXCOMPOSITE_LICENSE_FILES = COPYING XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:53:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:14 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXScrnSaver: bump version to 1.2.4 Message-ID: <20230220205156.ABE8B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8929d19dfba43af98ae1c981131e33d366f45e8a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003279.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash | 8 +++----- package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash index 01f468b77a..a32997e1fe 100644 --- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash +++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-July/002906.html -md5 eeea9d5af3e6c143d0ea1721d27a5e49 libXScrnSaver-1.2.3.tar.bz2 -sha1 70c791c5755a298ecf1a0823e239a24fa4b2b42f libXScrnSaver-1.2.3.tar.bz2 -sha256 f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8 libXScrnSaver-1.2.3.tar.bz2 -sha512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a libXScrnSaver-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003279.html +sha256 75cd2859f38e207a090cac980d76bc71e9da99d48d09703584e00585abc920fe libXScrnSaver-1.2.4.tar.xz +sha512 e4395af85f8496618afb23ffdaca1a75f5e3d213478d8dc73249cbc9840d7b993ba7513dbf6015cb38b48fe3f2223496365158a148dd5e1ac7475c5ee569e28c libXScrnSaver-1.2.4.tar.xz # Locally computed sha256 5cf3e16f5dd753a4c0853e8227134ab65f5562d9ef89b1a2d7681f5c8ac9feb5 COPYING diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk index 92abb902eb..55ae7a6801 100644 --- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk +++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXSCRNSAVER_VERSION = 1.2.3 -XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.bz2 -XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXSCRNSAVER_VERSION = 1.2.4 +XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.xz +XLIB_LIBXSCRNSAVER_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXSCRNSAVER_LICENSE = MIT XLIB_LIBXSCRNSAVER_LICENSE_FILES = COPYING XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:53:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:14 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8723ds: bump to 2022-12-01 version to fix build issue Message-ID: <20230220205154.3110D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c6d4d7be81ac9ea0ed031e5f0796ef2d2a28770 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop local patch that has been upstreamed. Fixes: http://autobuild.buildroot.net/results/fa2/fa2482674d789e7674dc0d83c5f54393beed4d70/ Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...ve-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch | 39 ---------------------- package/rtl8723ds/rtl8723ds.hash | 2 +- package/rtl8723ds/rtl8723ds.mk | 2 +- 3 files changed, 2 insertions(+), 41 deletions(-) diff --git a/package/rtl8723ds/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch b/package/rtl8723ds/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch deleted file mode 100644 index 4495817358..0000000000 --- a/package/rtl8723ds/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 769a1943cb409f89f3c91208294a89b09bf47b86 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 16 Nov 2022 16:08:21 +0100 -Subject: [PATCH] Makefile: move 'EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)' at the - end of EXTRA_FLAGS assignment - -At the moment USER_EXTRA_CFLAGS can't override local Makfile EXTRA_CFLAGS -since it's assigned at the beginning of the Makefile. For example it's not -possible to undefine the hardcoded CONFIG_LITTLE_ENDIAN and this doesn't -allow to build these modules for big endian architectures. So let's move -the assignment of USER_EXTRA_CFLAGS to EXTRA_CFLAGS after the last -EXTRA_CFLAGS assignment. - -Signed-off-by: Giulio Benetti ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index aa57f85..3d91574 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,3 @@ --EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) - EXTRA_CFLAGS += -O1 - #EXTRA_CFLAGS += -O3 - #EXTRA_CFLAGS += -Wall -@@ -1738,6 +1737,8 @@ ifneq ($(USER_MODULE_NAME),) - MODULE_NAME := $(USER_MODULE_NAME) - endif - -+EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -+ - ifneq ($(KERNELRELEASE),) - - rtk_core := core/rtw_cmd.o \ --- -2.34.1 - diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index cbc77e14c1..d5abf9913c 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 691040a85d838f8d8d7da0f2ed460f1ea5f6734c40dc73770ba7e260b6cda9cc rtl8723ds-5ab2d3f3858dc4c833013c47a79faa05b10198f6.tar.gz +sha256 97f3ebc5d977ba35d10c9c06e6817e4a00458727b651b56fc00c207c05a61995 rtl8723ds-a638cc8639015b8b9390af3350fab0366b6c87e7.tar.gz diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 0d96e6b03a..7e27fa75ea 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723DS_VERSION = 5ab2d3f3858dc4c833013c47a79faa05b10198f6 +RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 From peter at korsgaard.com Mon Feb 20 20:53:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:15 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_zcu102_defconfig: bump to Xilinx 2022.2 Message-ID: <20230220205154.51DC9828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=818d0e18a81190b9ca256fa7e465ee37d65820f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch bumps the zynqmp_zcu102_defconfig to Xilinx release 2022.2. Xilinx 2022.2 includes: - U-Boot 2022.01 bug fixes - Linux bump to Linux 5.15.36 with bug fixes - TF-A 2.6 bug fixes - PMUFW bug fixes Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu102_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index e27dfdb6c9..6047d4299c 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.1)/xlnx_rebase_v5.15_LTS_2022.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" @@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.1)/xlnx_rebase_v2.6_2022.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.1)/xlnx_rebase_v2022.01_2022.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -29,7 +29,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/v2022.1_22.04_1/xlnx-firmware/zcu102/zcu102_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.2/zcu102/zcu102_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From yann.morin.1998 at free.fr Mon Feb 20 20:53:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:15 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xvinfo: bump version to 1.1.5 Message-ID: <20230220205156.E338A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f08e0d7def20cc04ad39b952bcfffd91ceda13d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003273.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xvinfo/xapp_xvinfo.hash | 8 +++----- package/x11r7/xapp_xvinfo/xapp_xvinfo.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash b/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash index 3d8ace9ae5..7dd5820c08 100644 --- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash +++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002955.html -md5 b13afec137b9b331814a9824ab03ec80 xvinfo-1.1.4.tar.bz2 -sha1 136a70a72b23c81f4fe8f4c8cb7073316be16b44 xvinfo-1.1.4.tar.bz2 -sha256 0353220d6606077ba42363db65f50410759f9815352f77adc799e2adfa76e73f xvinfo-1.1.4.tar.bz2 -sha512 85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e xvinfo-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003273.html +sha256 3ede71ecb26d9614ccbc6916720285e95a2c7e0c5e19b8570eaaf72ad7c5c404 xvinfo-1.1.5.tar.xz +sha512 18467161b248c68f6bde15e1c1b4b8cf812daf46777602558aee5fb7cb4d2649218de88fa93842fea4f316d954440f03a37d71fa4fda92eda3c7d80970e19cbb xvinfo-1.1.5.tar.xz # Locally computed sha256 7725b0484faa1832534814ecb577f5a86acc74f1bcce25f92c55dfc1b693717d COPYING diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk index 7b3b97f073..6fa392f018 100644 --- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk +++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XVINFO_VERSION = 1.1.4 -XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.bz2 -XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XVINFO_VERSION = 1.1.5 +XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.xz +XAPP_XVINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XVINFO_LICENSE = MIT XAPP_XVINFO_LICENSE_FILES = COPYING XAPP_XVINFO_DEPENDENCIES = xlib_libX11 xlib_libXv From peter at korsgaard.com Mon Feb 20 20:53:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:16 -0000 Subject: [Buildroot] [git commit branch/next] package/dovecot: add upstream security fix for CVE-2022-30550 Message-ID: <20230220205153.E6255828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43899226b25aeb85aeb699f0df0c7ecf8d48616c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next An issue was discovered in the auth component in Dovecot 2.2 and 2.3 before 2.3.20. When two passdb configuration entries exist with the same driver and args settings, incorrect username_filter and mechanism settings can be applied to passdb definitions. These incorrectly applied settings can lead to an unintended security configuration and can permit privilege escalation in certain configurations. The documentation does not advise against the use of passdb definitions that have the same driver and args settings. One such configuration would be where an administrator wishes to use the same PAM configuration or passwd file for both normal and master users but use the username_filter setting to restrict which of the users is able to be a master user. https://dovecot.org/pipermail/dovecot-news/2022-July/000477.html Signed-off-by: Peter Korsgaard --- ...ndling-passdbs-with-identical-driver-args.patch | 136 +++++++++++++++++++++ package/dovecot/dovecot.mk | 3 + 2 files changed, 139 insertions(+) diff --git a/package/dovecot/0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch b/package/dovecot/0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch new file mode 100644 index 0000000000..04b8f5392a --- /dev/null +++ b/package/dovecot/0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch @@ -0,0 +1,136 @@ +From 7bad6a24160e34bce8f10e73dbbf9e5fbbcd1904 Mon Sep 17 00:00:00 2001 +From: Timo Sirainen +Date: Mon, 9 May 2022 15:23:33 +0300 +Subject: [PATCH] auth: Fix handling passdbs with identical driver/args but + different mechanisms/username_filter + +The passdb was wrongly deduplicated in this situation, causing wrong +mechanisms or username_filter setting to be used. This would be a rather +unlikely configuration though. + +Fixed by moving mechanisms and username_filter from struct passdb_module +to struct auth_passdb, which is where they should have been in the first +place. + +Signed-off-by: Peter Korsgaard +--- + src/auth/auth-request.c | 6 +++--- + src/auth/auth.c | 18 ++++++++++++++++++ + src/auth/auth.h | 5 +++++ + src/auth/passdb.c | 15 ++------------- + src/auth/passdb.h | 4 ---- + 5 files changed, 28 insertions(+), 20 deletions(-) + +diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c +index cd08b1fa02..0ca29f3674 100644 +--- a/src/auth/auth-request.c ++++ b/src/auth/auth-request.c +@@ -534,8 +534,8 @@ auth_request_want_skip_passdb(struct auth_request *request, + struct auth_passdb *passdb) + { + /* if mechanism is not supported, skip */ +- const char *const *mechs = passdb->passdb->mechanisms; +- const char *const *username_filter = passdb->passdb->username_filter; ++ const char *const *mechs = passdb->mechanisms; ++ const char *const *username_filter = passdb->username_filter; + const char *username; + + username = request->fields.user; +@@ -548,7 +548,7 @@ auth_request_want_skip_passdb(struct auth_request *request, + return TRUE; + } + +- if (passdb->passdb->username_filter != NULL && ++ if (passdb->username_filter != NULL && + !auth_request_username_accepted(username_filter, username)) { + auth_request_log_debug(request, + request->mech != NULL ? AUTH_SUBSYS_MECH +diff --git a/src/auth/auth.c b/src/auth/auth.c +index f2f3fda20c..9f6c4ba60c 100644 +--- a/src/auth/auth.c ++++ b/src/auth/auth.c +@@ -99,6 +99,24 @@ auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *set, + auth_passdb->override_fields_tmpl = + passdb_template_build(auth->pool, set->override_fields); + ++ if (*set->mechanisms == '\0') { ++ auth_passdb->mechanisms = NULL; ++ } else if (strcasecmp(set->mechanisms, "none") == 0) { ++ auth_passdb->mechanisms = (const char *const[]){ NULL }; ++ } else { ++ auth_passdb->mechanisms = ++ (const char *const *)p_strsplit_spaces(auth->pool, ++ set->mechanisms, " ,"); ++ } ++ ++ if (*set->username_filter == '\0') { ++ auth_passdb->username_filter = NULL; ++ } else { ++ auth_passdb->username_filter = ++ (const char *const *)p_strsplit_spaces(auth->pool, ++ set->username_filter, " ,"); ++ } ++ + /* for backwards compatibility: */ + if (set->pass) + auth_passdb->result_success = AUTH_DB_RULE_CONTINUE; +diff --git a/src/auth/auth.h b/src/auth/auth.h +index f700e29d5c..460a179765 100644 +--- a/src/auth/auth.h ++++ b/src/auth/auth.h +@@ -41,6 +41,11 @@ struct auth_passdb { + struct passdb_template *default_fields_tmpl; + struct passdb_template *override_fields_tmpl; + ++ /* Supported authentication mechanisms, NULL is all, {NULL} is none */ ++ const char *const *mechanisms; ++ /* Username filter, NULL is no filter */ ++ const char *const *username_filter; ++ + enum auth_passdb_skip skip; + enum auth_db_rule result_success; + enum auth_db_rule result_failure; +diff --git a/src/auth/passdb.c b/src/auth/passdb.c +index eb4ac8ae82..f5eed1af4f 100644 +--- a/src/auth/passdb.c ++++ b/src/auth/passdb.c +@@ -224,19 +224,8 @@ passdb_preinit(pool_t pool, const struct auth_passdb_settings *set) + passdb->id = ++auth_passdb_id; + passdb->iface = *iface; + passdb->args = p_strdup(pool, set->args); +- if (*set->mechanisms == '\0') { +- passdb->mechanisms = NULL; +- } else if (strcasecmp(set->mechanisms, "none") == 0) { +- passdb->mechanisms = (const char *const[]){NULL}; +- } else { +- passdb->mechanisms = (const char* const*)p_strsplit_spaces(pool, set->mechanisms, " ,"); +- } +- +- if (*set->username_filter == '\0') { +- passdb->username_filter = NULL; +- } else { +- passdb->username_filter = (const char* const*)p_strsplit_spaces(pool, set->username_filter, " ,"); +- } ++ /* NOTE: if anything else than driver & args are added here, ++ passdb_find() also needs to be updated. */ + array_push_back(&passdb_modules, &passdb); + return passdb; + } +diff --git a/src/auth/passdb.h b/src/auth/passdb.h +index 2e95328e5c..e466a9fdb6 100644 +--- a/src/auth/passdb.h ++++ b/src/auth/passdb.h +@@ -63,10 +63,6 @@ struct passdb_module { + /* Default password scheme for this module. + If default_cache_key is set, must not be NULL. */ + const char *default_pass_scheme; +- /* Supported authentication mechanisms, NULL is all, [NULL] is none*/ +- const char *const *mechanisms; +- /* Username filter, NULL is no filter */ +- const char *const *username_filter; + + /* If blocking is set to TRUE, use child processes to access + this passdb. */ +-- +2.30.2 + diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 7619250985..e28f500b7b 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -21,6 +21,9 @@ DOVECOT_DEPENDENCIES = \ # is part of the Red Hat packaging and not part of upstream dovecot DOVECOT_IGNORE_CVES += CVE-2016-4983 +# 0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch +DOVECOT_IGNORE_CVES += CVE-2022-30550 + DOVECOT_CONF_ENV = \ RPCGEN=__disable_RPCGEN_rquota \ i_cv_epoll_works=yes \ From yann.morin.1998 at free.fr Mon Feb 20 20:53:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:16 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xset: bump version to 1.2.5 Message-ID: <20230220205157.0700186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea7d4fe0df7154b60f563295de0ce362991ff1d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003271.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xset/xapp_xset.hash | 8 +++----- package/x11r7/xapp_xset/xapp_xset.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xset/xapp_xset.hash b/package/x11r7/xapp_xset/xapp_xset.hash index a4f19d0273..dea34a1a13 100644 --- a/package/x11r7/xapp_xset/xapp_xset.hash +++ b/package/x11r7/xapp_xset/xapp_xset.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002873.html -md5 70ea7bc7bacf1a124b1692605883f620 xset-1.2.4.tar.bz2 -sha1 41a857f30ff5bb0dfbda1549bb703984344ea228 xset-1.2.4.tar.bz2 -sha256 e4fd95280df52a88e9b0abc1fee11dcf0f34fc24041b9f45a247e52df941c957 xset-1.2.4.tar.bz2 -sha512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d xset-1.2.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003271.html +sha256 9f692d55635b3862cd63633b1222a87680ec283c7a8e8ed6dd698a3147f75e2f xset-1.2.5.tar.xz +sha512 12b53d7cd6b7ccf6515c03f68151490fce6b2629e99b8d85ac5d760f4ed93394a457213c3947533809fbbb04acd1ed260aeea1256099a10397660eef3088150d xset-1.2.5.tar.xz # Locally computed sha256 6bfc619b6d37dd0e6ca575edcb3a05194136e04d1d9989b8e14e6f7850587382 COPYING diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk index 9ead55a20f..498e6a123c 100644 --- a/package/x11r7/xapp_xset/xapp_xset.mk +++ b/package/x11r7/xapp_xset/xapp_xset.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XSET_VERSION = 1.2.4 -XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2 -XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XSET_VERSION = 1.2.5 +XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.xz +XAPP_XSET_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XSET_LICENSE = MIT XAPP_XSET_LICENSE_FILES = COPYING XAPP_XSET_DEPENDENCIES = xlib_libXmu From yann.morin.1998 at free.fr Mon Feb 20 20:53:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:17 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xprop: bump version to 1.2.6 Message-ID: <20230220205157.1FAEA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3500526b189e4a75f3b969ac54685fc8a4b2e15c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003269.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xprop/xapp_xprop.hash | 6 +++--- package/x11r7/xapp_xprop/xapp_xprop.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_xprop/xapp_xprop.hash b/package/x11r7/xapp_xprop/xapp_xprop.hash index 95e7c4eeed..9db2fb9125 100644 --- a/package/x11r7/xapp_xprop/xapp_xprop.hash +++ b/package/x11r7/xapp_xprop/xapp_xprop.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-November/003064.html -sha256 9b92ed0316bf2486121d8bac88bd1878f16b43bd335f18009b1f941f1eca93a1 xprop-1.2.5.tar.bz2 -sha512 93cfa621fa76ca6e8e780a252c508380b6dc9db39b67bfca16bb9800f0d39110f5d18189409a8577ef79e98bf5eece17f5e23f2218ca72ae8bb04ee7b429d559 xprop-1.2.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003269.html +sha256 580b8525b12ecc0144aa16c88b0aafa76d2e799b44c8c6c50f9ce92788b5586e xprop-1.2.6.tar.xz +sha512 ab25d4b8bf9de8fb37149060ad4870ffed4d6846ac3b31903a42c36301fcb0d50d3ba15949fdd9079507db97d3f05d4bbd11711d825e5470482cc30772cc3f25 xprop-1.2.6.tar.xz # Locally computed sha256 f19ff982936cca133b9593a6561c3817512207e0b4c951d0e4eb5956d30d4415 COPYING diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk index 75f0d37cdc..888e9d3a69 100644 --- a/package/x11r7/xapp_xprop/xapp_xprop.mk +++ b/package/x11r7/xapp_xprop/xapp_xprop.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XPROP_VERSION = 1.2.5 -XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2 -XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XPROP_VERSION = 1.2.6 +XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.xz +XAPP_XPROP_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XPROP_LICENSE = MIT XAPP_XPROP_LICENSE_FILES = COPYING XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu From peter at korsgaard.com Mon Feb 20 20:53:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:18 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_zcu106_defconfig: bump to Xilinx 2022.2 Message-ID: <20230220205154.5BCCD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c997c457a4ee33d81e6b93e4f6f147bb9e861e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch bumps the zynqmp_zcu106_defconfig to Xilinx release 2022.2. Xilinx 2022.2 includes: - U-Boot 2022.01 bug fixes - Linux bump to Linux 5.15.36 with bug fixes - TF-A 2.6 bug fixes - PMUFW bug fixes Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu106_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 4113a9025a..dcbc4319e8 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.1)/xlnx_rebase_v5.15_LTS_2022.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.1)/xlnx_rebase_v2.6_2022.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.1)/xlnx_rebase_v2022.01_2022.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -29,7 +29,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/v2022.1_22.04_1/xlnx-firmware/zcu106/zcu106_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.2/zcu106/zcu106_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From yann.morin.1998 at free.fr Mon Feb 20 20:53:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:18 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xgamma: bump version to 1.0.7 Message-ID: <20230220205157.37B0186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1564c1e6e9e9e72daae419c1a839b986485eff5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003267.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xgamma/xapp_xgamma.hash | 5 +++-- package/x11r7/xapp_xgamma/xapp_xgamma.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.hash b/package/x11r7/xapp_xgamma/xapp_xgamma.hash index 0031450c4d..17efe0a975 100644 --- a/package/x11r7/xapp_xgamma/xapp_xgamma.hash +++ b/package/x11r7/xapp_xgamma/xapp_xgamma.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002574.html -sha256 0ef1c35b5c18b1b22317f455c8df13c0a471a8efad63c89c98ae3ce8c2b222d3 xgamma-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003267.html +sha256 1c79dae85a8953a15f4fe5c2895a033307b43b8613456c87ec47b374b113bc8f xgamma-1.0.7.tar.xz +sha512 9eeee9b537dcae9e4d153774eb632a6a5e8dd32bebadc9bbd897a773e5b56f76848f32a1699b8c921d3094760c42b5083365d853b89ab31fd85c7a0d46feeceb xgamma-1.0.7.tar.xz # Locally computed sha256 78d354d348feaaab8d67a220e84137ec24fece04af4dface2e67132c72e216a2 COPYING diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk index a73a29e5a2..f2e9e91efb 100644 --- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk +++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XGAMMA_VERSION = 1.0.6 -XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.bz2 -XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XGAMMA_VERSION = 1.0.7 +XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.xz +XAPP_XGAMMA_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XGAMMA_LICENSE = MIT XAPP_XGAMMA_LICENSE_FILES = COPYING XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm From peter at korsgaard.com Mon Feb 20 20:53:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:19 -0000 Subject: [Buildroot] [git commit branch/next] package/netsnmp: drop autoreconf Message-ID: <20230220205154.271A4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ad6bc2f587a31c7e1475103a59c93f6a398e8ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 83b4337354014 (package/netsnmp: security bump to version 5.9.3) dropped the patches, but forgot to remove the autoreconf. Do so now. Signed-off-by: Peter Korsgaard --- package/netsnmp/netsnmp.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 56a07e2ccd..15bc318e36 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -40,7 +40,6 @@ NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true inst NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install NETSNMP_MAKE = $(MAKE1) NETSNMP_CONFIG_SCRIPTS = net-snmp-config -NETSNMP_AUTORECONF = YES ifeq ($(BR2_ENDIAN),"BIG") NETSNMP_CONF_OPTS += --with-endianness=big From yann.morin.1998 at free.fr Mon Feb 20 20:53:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:19 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xcursorgen: bump version to 1.0.8 Message-ID: <20230220205157.5826B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9e1546672ce900d82a39f991237246a201874d47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003264.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash | 8 +++----- package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash index 2f64671434..45bff55ed2 100644 --- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash +++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-January/002936.html -md5 25cc7ca1ce5dcbb61c2b471c55e686b5 xcursorgen-1.0.7.tar.bz2 -sha1 109367eb23b0ad52cf5de15f50c02ebe872698ae xcursorgen-1.0.7.tar.bz2 -sha256 35b6f844b24f1776e9006c880a745728800764dbe3b327a128772b4610d8eb3d xcursorgen-1.0.7.tar.bz2 -sha512 bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2 xcursorgen-1.0.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003264.html +sha256 32b33ce27b4e285e64ff375731806bb7988cc626ff10915c65f1dc4da640cc9b xcursorgen-1.0.8.tar.xz +sha512 dede5b9e1e09f9253365bbb83fdab26c681641913f3586cef52d4802db9cecc7e252344911cd969a873c3a5c5ebbd4b862f786de263f92ea1bcb2df90236f9c4 xcursorgen-1.0.8.tar.xz # Locally computed sha256 8c773336b654442ac8018715a52be1a8254895c57c898d5387016e9488cc2009 COPYING diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk index bcc696b01c..318cd562db 100644 --- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk +++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XCURSORGEN_VERSION = 1.0.7 -XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2 -XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XCURSORGEN_VERSION = 1.0.8 +XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.xz +XAPP_XCURSORGEN_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XCURSORGEN_LICENSE = MIT XAPP_XCURSORGEN_LICENSE_FILES = COPYING XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor From yann.morin.1998 at free.fr Mon Feb 20 20:53:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:20 -0000 Subject: [Buildroot] [git commit branch/next] docs/manual: fixed some spelling mistakes Message-ID: <20230220205154.73000828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a34dcba9ebcda5a1dcb95b332486454776cd305b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixed some spelling mistakes of countable nouns. Signed-off-by: Zikui Zhao Reviewed-by: Woodrow Douglass Signed-off-by: Yann E. MORIN --- docs/manual/customize-directory-structure.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/customize-directory-structure.txt b/docs/manual/customize-directory-structure.txt index a3a7ad4cb9..1249421da2 100644 --- a/docs/manual/customize-directory-structure.txt +++ b/docs/manual/customize-directory-structure.txt @@ -27,10 +27,10 @@ to you. | +-- post_image.sh | +-- rootfs_overlay/ | | +-- etc/ -| | +-- +| | +-- | +-- patches/ | +-- foo/ -| | +-- +| | +-- | +-- libbar/ | +-- | From yann.morin.1998 at free.fr Mon Feb 20 20:53:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:20 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXrandr: bump version to 1.5.3 Message-ID: <20230220205157.62C3786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=327d7453ba3d4991c4ddc64a0164ca7f80ea0ef1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003262.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXrandr/xlib_libXrandr.hash | 8 +++----- package/x11r7/xlib_libXrandr/xlib_libXrandr.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash b/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash index 4b12328df0..3d3bb640ed 100644 --- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash +++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002979.html -md5 18f3b20d522f45e4dadd34afb5bea048 libXrandr-1.5.2.tar.bz2 -sha1 7a1f6df239341b76fd59ebbe101d6f180adb43bb libXrandr-1.5.2.tar.bz2 -sha256 8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023 libXrandr-1.5.2.tar.bz2 -sha512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87 libXrandr-1.5.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003262.html +sha256 897639014a78e1497704d669c5dd5682d721931a4452c89a7ba62676064eb428 libXrandr-1.5.3.tar.xz +sha512 0c385fc304a872048ffca5cfb8789dfe3132e3126894d54b2fe642dff19d286e7ade1d2f6da894e03788df9c5cf31427c674e987143037b7d385b19285590edb libXrandr-1.5.3.tar.xz # Locally computed sha256 73777e5be1cef2827d843e4b186803f050c66db472cf8076d88e2b5f71696e67 COPYING diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk index aa2761330a..5e88173ed7 100644 --- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk +++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXRANDR_VERSION = 1.5.2 -XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2 -XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXRANDR_VERSION = 1.5.3 +XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.xz +XLIB_LIBXRANDR_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXRANDR_LICENSE = MIT XLIB_LIBXRANDR_LICENSE_FILES = COPYING XLIB_LIBXRANDR_CPE_ID_VENDOR = x.org From yann.morin.1998 at free.fr Mon Feb 20 20:53:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:21 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xlsclients: bump version to 1.1.5 Message-ID: <20230220205157.8790086494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e20641dcf85dada48621f46e1f30966c90696317 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003259.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xlsclients/xapp_xlsclients.hash | 8 +++----- package/x11r7/xapp_xlsclients/xapp_xlsclients.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash b/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash index b73917cb4a..ac172acceb 100644 --- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash +++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002866.html -md5 4fa92377e0ddc137cd226a7a87b6b29a xlsclients-1.1.4.tar.bz2 -sha1 175af1c216a1db3de5023ecd6cce186e7693c6e4 xlsclients-1.1.4.tar.bz2 -sha256 773f2af49c7ea2c44fba4213bee64325875c1b3c9bc4bbcd8dac9261751809c1 xlsclients-1.1.4.tar.bz2 -sha512 42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4 xlsclients-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003259.html +sha256 68baee57e70250ac4a7759fb78221831f97d88bc8e51dcc2e64eb3f8ca56bae3 xlsclients-1.1.5.tar.xz +sha512 3896643378603876438772475e89ad5c066f98c16593245db5fa066418ff793798247f976d2bf7aa401d2590fc9807b80c9758bcbcc91566f02ceb856d9702bf xlsclients-1.1.5.tar.xz # Locally computed sha256 716d6f1d18cb97cdd4a2ef7b101d944a250ca9de57578a490c038b9aaf950648 COPYING diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk index 167748b338..a179e06713 100644 --- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk +++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XLSCLIENTS_VERSION = 1.1.4 -XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2 -XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XLSCLIENTS_VERSION = 1.1.5 +XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.xz +XAPP_XLSCLIENTS_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XLSCLIENTS_LICENSE = MIT XAPP_XLSCLIENTS_LICENSE_FILES = COPYING XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu libxcb xcb-util From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:21 -0000 Subject: [Buildroot] [git commit branch/next] package/libarchive: fix CVE-2022-36227 Message-ID: <20230220205154.801C08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d74137341d009e9a0dd79bca80015548f5af92ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In libarchive 3.6.1, the software does not check for an error after calling calloc function that can return with a NULL pointer if the function fails, which leads to a resultant NULL pointer dereference. NOTE: the discoverer cites this CWE-476 remark but third parties dispute the code-execution impact: "In rare circumstances, when NULL is equivalent to the 0x0 memory address and privileged code can access it, then writing or reading memory is possible, which may lead to code execution." Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...libarchive-Handle-a-calloc-returning-NULL.patch | 38 ++++++++++++++++++++++ package/libarchive/libarchive.mk | 3 ++ 2 files changed, 41 insertions(+) diff --git a/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch b/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch new file mode 100644 index 0000000000..75ce6112fe --- /dev/null +++ b/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch @@ -0,0 +1,38 @@ +From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001 +From: obiwac +Date: Fri, 22 Jul 2022 22:41:10 +0200 +Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754) + +[Retrieved from: +https://github.com/libarchive/libarchive/commit/bff38efe8c110469c5080d387bec62a6ca15b1a5] +Signed-off-by: Fabrice Fontaine +--- + libarchive/archive_write.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c +index 66592e826..27626b541 100644 +--- a/libarchive/archive_write.c ++++ b/libarchive/archive_write.c +@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a) + struct archive_write_filter *f; + + f = calloc(1, sizeof(*f)); ++ ++ if (f == NULL) ++ return (NULL); ++ + f->archive = _a; + f->state = ARCHIVE_WRITE_FILTER_STATE_NEW; + if (a->filter_first == NULL) +@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data, + a->client_data = client_data; + + client_filter = __archive_write_allocate_filter(_a); ++ ++ if (client_filter == NULL) ++ return (ARCHIVE_FATAL); ++ + client_filter->open = archive_write_client_open; + client_filter->write = archive_write_client_write; + client_filter->close = archive_write_client_close; diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 865f605e2f..649b7dd4dc 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -12,6 +12,9 @@ LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING LIBARCHIVE_CPE_ID_VENDOR = libarchive +# 0001-libarchive-Handle-a-calloc-returning-NULL.patch +LIBARCHIVE_IGNORE_CVES += CVE-2022-36227 + ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) LIBARCHIVE_CONF_OPTS += --enable-bsdtar=static From yann.morin.1998 at free.fr Mon Feb 20 20:53:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:22 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xlogo: bump version to 1.0.6 Message-ID: <20230220205157.A091386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df57bbf7279757a11327361e7cd9a1091b2da40f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003257.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xlogo/xapp_xlogo.hash | 8 +++----- package/x11r7/xapp_xlogo/xapp_xlogo.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.hash b/package/x11r7/xapp_xlogo/xapp_xlogo.hash index c393e7dc33..58f2ac4028 100644 --- a/package/x11r7/xapp_xlogo/xapp_xlogo.hash +++ b/package/x11r7/xapp_xlogo/xapp_xlogo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002963.html -md5 e9d21de1dc8c8b9f854509a26a985cd7 xlogo-1.0.5.tar.bz2 -sha1 f025a0ad30c45cbec1c2f3b1610bff94fb4e9f33 xlogo-1.0.5.tar.bz2 -sha256 633d7a3aa5df61e4e643b740e5799664741ab1a0ba40593e54fcd15dc30f378e xlogo-1.0.5.tar.bz2 -sha512 0d78e269b0be3c5de71de7f362b896bfd9934ecd9d0361b3302399b1269e029c4a9f35418d792121a1edc34405d753f9d69c996cc3a69ac717f2b0d1f736406b xlogo-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003257.html +sha256 c16ae461a7f7ea275f55c82acf3ee86ce0eb5e406f3a91ab2bb4d332693f32a0 xlogo-1.0.6.tar.xz +sha512 f0c921e0e34d2c0959d95ca0fcb7488395043280b8b35bcad4e8a528224f2b38581fbf60e82239d06760ecd637692cb29c3b1c0c46ac7f269f692a139d954ea0 xlogo-1.0.6.tar.xz # Locally computed sha256 972b454b6c0da17cec61225ab9dfd4afc69fd8e7e4c629497197c6f79adc6fb0 COPYING diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk index 455469e160..27d693bec9 100644 --- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk +++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XLOGO_VERSION = 1.0.5 -XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2 -XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XLOGO_VERSION = 1.0.6 +XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.xz +XAPP_XLOGO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XLOGO_LICENSE = MIT XAPP_XLOGO_LICENSE_FILES = COPYING XAPP_XLOGO_DEPENDENCIES = \ From peter at korsgaard.com Mon Feb 20 20:53:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:22 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8723bu: fix build failure due to missing Linux options Message-ID: <20230220205154.DD8DB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1978e9b0219712b2b839d9f44a0b98b2e8280f75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This driver requires: CONFIG_NET CONFIG_WIRELESS CONFIG_CFG80211 CONFIG_USB_SUPPORT CONFIG_USB to build so let's add them to RTL8723BU_LINUX_CONFIG_FIXUPS. Fixes: http://autobuild.buildroot.net/results/7f3637760ad88d314e6812865f3667d1de091957/ Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/rtl8723bu/rtl8723bu.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index 3da8d9cecf..82c487b4e1 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -12,6 +12,14 @@ RTL8723BU_MODULE_MAKE_OPTS = \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) +define RTL8723BU_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB) +endef + define RTL8723BU_INSTALL_TARGET_CMDS $(INSTALL) -D -m 644 $(@D)/rtl8723b_fw.bin $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723b_fw.bin endef From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:23 -0000 Subject: [Buildroot] [git commit branch/next] package/linuxptp: add patch to fix build failures with make 4.4 Message-ID: <20230220205154.C02248648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e87d92966630a6c05857c3e29d1781fce3c16bad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When using make 4.4 the KBOUD_OUTPUT environment variable provided to the linuxptp makefile is not utilized. The added patch will fix that behavior. Fixes: http://autobuild.buildroot.net/results/5294fac7ed04945d47ea4eb2d1448bcbea5352bb/ Cc: James Hilliard Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- ...-conditional-assignment-for-KBUILD_OUTPUT.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch b/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch new file mode 100644 index 0000000000..73cd34f744 --- /dev/null +++ b/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch @@ -0,0 +1,43 @@ +From: Changqing Li +Date: Wed, 23 Nov 2022 08:23:46 +0800 +Subject: [Linuxptp-devel] [PATCH] makefile: use conditional assignment for KBUILD_OUTPUT + +Refer [1],from make 4.4, all variables that are marked as export will +also be passed to the shell started by the shell function. use "=" will +make KBUILD_OUTPUT always empty for shell function, use "?=" to make +"export KBUILD_OUTPUT" in enrironment can work. + +[snip of 4.4 NEWS] +* WARNING: Backward-incompatibility! + Previously makefile variables marked as export were not exported to commands + started by the $(shell ...) function. Now, all exported variables are + exported to $(shell ...). +[snip] + +[1] https://git.savannah.gnu.org/cgit/make.git/tree/NEWS?h=4.4&id=ed493f6c9116cc217b99c2cfa6a95f15803235a2#n74 + +Signed-off-by: Changqing Li + +[Retrieved from mailing list. The patch was not yet accepted and applied: +https://www.mail-archive.com/linuxptp-devel at lists.sourceforge.net/msg06151.html] +Signed-off-by: Heiko Thiery + +--- + makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makefile b/makefile +index 9aed383..ba3fb38 100644 +--- a/makefile ++++ b/makefile +@@ -15,7 +15,7 @@ + # with this program; if not, write to the Free Software Foundation, Inc., + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-KBUILD_OUTPUT = ++KBUILD_OUTPUT ?= + + DEBUG = + CC = $(CROSS_COMPILE)gcc +-- +2.25.1 From yann.morin.1998 at free.fr Mon Feb 20 20:53:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:23 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xcompmgr: bump version to 1.1.9 Message-ID: <20230220205157.C2001828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59d64c57c755338306e9eddc9ff98a948ef79694 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003254.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash | 8 +++----- package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash b/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash index 6f0d755261..b9675a5ecf 100644 --- a/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash +++ b/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002989.html -md5 ef8c7d4140c11efb8de4141b3968208c xcompmgr-1.1.8.tar.bz2 -sha1 7bb28329b4bb687763df2d2c1723cb6ecb20945a xcompmgr-1.1.8.tar.bz2 -sha256 0b89daf4f060fa3fa83cca862c45d531fef7121b5d06552c1d73d396ad9a7243 xcompmgr-1.1.8.tar.bz2 -sha512 ccf29426ffb0797a53653d1ce152de5eee0cec284811fed4b8e634ea0d948180531e4619d96f47e4f9594432c57322624fe0fdaee2c9200efac427fc0904953d xcompmgr-1.1.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003254.html +sha256 4875b6698672d01eb3a5080bde6eac9a989d486a82226a2d5e23624f1527a6f0 xcompmgr-1.1.9.tar.xz +sha512 699117492af7fd84b36d317dcbf422d5ec86a7f21e29370caa737cd940d8ff866a5c8704ba2e7bd17a64e085d77fd23b628263d619813dead85cd669ff5b860e xcompmgr-1.1.9.tar.xz # Locally computed sha256 c843545f72771b3ff95eb88defc2e3ed8f9a1802d9bb6c32c196bb5eec3d3a5d COPYING diff --git a/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk b/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk index 24ebad7bda..c754ea37b3 100644 --- a/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk +++ b/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XCOMPMGR_VERSION = 1.1.8 -XAPP_XCOMPMGR_SOURCE = xcompmgr-$(XAPP_XCOMPMGR_VERSION).tar.bz2 -XAPP_XCOMPMGR_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XCOMPMGR_VERSION = 1.1.9 +XAPP_XCOMPMGR_SOURCE = xcompmgr-$(XAPP_XCOMPMGR_VERSION).tar.xz +XAPP_XCOMPMGR_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XCOMPMGR_LICENSE = MIT XAPP_XCOMPMGR_LICENSE_FILES = COPYING XAPP_XCOMPMGR_DEPENDENCIES = \ From yann.morin.1998 at free.fr Mon Feb 20 20:53:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:24 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_rgb: bump version to 1.1.0 Message-ID: <20230220205157.E37F4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8bf8f441d10848bddd47b9b0c84575177db2b4af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003245.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_rgb/xapp_rgb.hash | 5 +++-- package/x11r7/xapp_rgb/xapp_rgb.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_rgb/xapp_rgb.hash b/package/x11r7/xapp_rgb/xapp_rgb.hash index ce05454ce9..11b2a83905 100644 --- a/package/x11r7/xapp_rgb/xapp_rgb.hash +++ b/package/x11r7/xapp_rgb/xapp_rgb.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-November/002494.html -sha256 bbca7c6aa59939b9f6a0fb9fff15dfd62176420ffd4ae30c8d92a6a125fbe6b0 rgb-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003245.html +sha256 fc03d7f56e5b2a617668167f8927948cce54f93097e7ccd9f056077f479ed37b rgb-1.1.0.tar.xz +sha512 640888d64b2d328fff4a1652ba1299436e348bc3cbc90710d79c635acfa7f2fce0018adb818123b41ca008197ff1cbf87aab60501de36c163bed2d80d8556008 rgb-1.1.0.tar.xz # Locally computed sha256 1d08eb3384f5dedc7735bcfae1aa58cb64643ca9389edce3312b1c3cefbfdaa7 COPYING diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk index b2d5d77744..4b6399fc76 100644 --- a/package/x11r7/xapp_rgb/xapp_rgb.mk +++ b/package/x11r7/xapp_rgb/xapp_rgb.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_RGB_VERSION = 1.0.6 -XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.bz2 -XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_RGB_VERSION = 1.1.0 +XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.xz +XAPP_RGB_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_RGB_LICENSE = MIT XAPP_RGB_LICENSE_FILES = COPYING XAPP_RGB_DEPENDENCIES = xorgproto host-pkgconf From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:25 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8821au: move upstream and fix missing linux options Message-ID: <20230220205153.6BD9D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f324758f670af788df4cfaf235fd2fc5b4f15450 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This package builds to fail with Linux > 5.15 and abperiasamy's rtl8812AU_8821AU_linux repository is not maintained since 2 years and there is now a fork where all pending patches have been upstreamed, so let's switch to lwfinger's rtl8812au repository that is well maintained with Linux up to version 5.18 supported. While switching let's drop all local patches. Also add me as maintainer for this package in DEVELOPERS file. Fixes: http://autobuild.buildroot.net/results/a3db3a6540b67a1f1fe31d61fe1d6824d43f59f0/ Signed-off-by: Giulio Benetti Reviewed-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + ...licit-fallthrough-comments-for-kernel-5.3.patch | 29 -- ...5.3-driver-crashes-from-aircrack-ng-rtl88.patch | 169 ---------- ...printf-for-extending-string-which-causes-.patch | 339 --------------------- ...56_state-to-rtl_sha256_state-to-avoid-nam.patch | 79 ----- ...e-rtw_mgmt_frame_register-on-kernel-5.8.0.patch | 47 --- ...nvert-file_operations-to-proc_ops-for-5.6.patch | 110 ------- package/rtl8821au/rtl8821au.hash | 4 +- package/rtl8821au/rtl8821au.mk | 12 +- 9 files changed, 13 insertions(+), 777 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 2aecdb1c8f..569d58407a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1154,6 +1154,7 @@ F: package/rtl8189es/ F: package/rtl8723bu/ F: package/rtl8723ds/ F: package/rtl8812au-aircrack-ng/ +F: package/rtl8821au/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ F: package/sunxi-tools/ diff --git a/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch b/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch deleted file mode 100644 index 00e801b6b1..0000000000 --- a/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 99f1e8bd7172ddf9613db3531a8b37921ed73351 Mon Sep 17 00:00:00 2001 -From: Jesper Skov -Date: Fri, 25 Oct 2019 10:05:41 +0200 -Subject: [PATCH] Fix implicit fallthrough comments for kernel 5.3 - -[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/commit/e8a30a4c5a80efbbd5b1dbfe11b22916df4492f9.patch] -Signed-off-by: Peter Seiderer -Signed-off-by: Christian Stewart ---- - core/rtw_mlme_ext.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c -index 24565ea..380f507 100644 ---- a/core/rtw_mlme_ext.c -+++ b/core/rtw_mlme_ext.c -@@ -758,7 +758,9 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame) - else - ptable->func = &OnAuthClient; - //pass through -+ //fallthrough - case WIFI_ASSOCREQ: -+ //fallthrough - case WIFI_REASSOCREQ: - _mgt_dispatcher(padapter, ptable, precv_frame); - #ifdef CONFIG_HOSTAPD_MLME --- -2.28.0 - diff --git a/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch b/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch deleted file mode 100644 index 213ea806b0..0000000000 --- a/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch +++ /dev/null @@ -1,169 +0,0 @@ -From cde2dbf6e94e00fcf198422b03de01d3090675d9 Mon Sep 17 00:00:00 2001 -From: Jesper Skov -Date: Fri, 25 Oct 2019 10:10:29 +0200 -Subject: [PATCH] Fix kernel 5.3 driver crashes, from aircrack-ng/rtl8812au#421 - -[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/commit/822b485d36d6f72304a219c3be228f40968b542b.patch] -Signed-off-by: Peter Seiderer -Signed-off-by: Christian Stewart ---- - os_dep/linux/rtw_cfgvendor.c | 45 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 45 insertions(+) - -diff --git a/os_dep/linux/rtw_cfgvendor.c b/os_dep/linux/rtw_cfgvendor.c -index e7ba90a..81fc8af 100644 ---- a/os_dep/linux/rtw_cfgvendor.c -+++ b/os_dep/linux/rtw_cfgvendor.c -@@ -1173,6 +1173,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = BRCM_VENDOR_SCMD_PRIV_STR - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_priv_string_handler - }, - #if defined(GSCAN_SUPPORT) && 0 -@@ -1182,6 +1185,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_GET_CAPABILITIES - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_gscan_get_capabilities - }, - { -@@ -1190,6 +1196,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_SET_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_set_scan_cfg - }, - { -@@ -1198,6 +1207,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_SET_SCAN_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_set_batch_scan_cfg - }, - { -@@ -1206,6 +1218,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_ENABLE_GSCAN - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_initiate_gscan - }, - { -@@ -1214,6 +1229,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_ENABLE_FULL_SCAN_RESULTS - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_enable_full_scan_result - }, - { -@@ -1222,6 +1240,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_SET_HOTLIST - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_hotlist_cfg - }, - { -@@ -1230,6 +1251,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_SET_SIGNIFICANT_CHANGE_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_significant_change_cfg - }, - { -@@ -1238,6 +1262,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_GET_SCAN_RESULTS - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_gscan_get_batch_results - }, - { -@@ -1246,6 +1273,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_GET_CHANNEL_LIST - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_gscan_get_channel_list - }, - #endif /* GSCAN_SUPPORT */ -@@ -1256,6 +1286,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = RTT_SUBCMD_SET_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_rtt_set_config - }, - { -@@ -1264,6 +1297,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = RTT_SUBCMD_CANCEL_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_rtt_cancel_config - }, - { -@@ -1272,6 +1308,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = RTT_SUBCMD_GETCAPABILITY - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_rtt_get_capability - }, - #endif /* RTT_SUPPORT */ -@@ -1281,6 +1320,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = rtw_cfgvendor_get_feature_set - }, - { -@@ -1289,6 +1331,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET_MATRIX - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = rtw_cfgvendor_get_feature_set_matrix - } - }; --- -2.28.0 - diff --git a/package/rtl8821au/0003-Fix-using-sprintf-for-extending-string-which-causes-.patch b/package/rtl8821au/0003-Fix-using-sprintf-for-extending-string-which-causes-.patch deleted file mode 100644 index 2c4b595c37..0000000000 --- a/package/rtl8821au/0003-Fix-using-sprintf-for-extending-string-which-causes-.patch +++ /dev/null @@ -1,339 +0,0 @@ -From 5b6641978e8fa68bca05d224a61f8513b010eda8 Mon Sep 17 00:00:00 2001 -From: Coleman -Date: Fri, 17 Jul 2020 08:53:00 +0800 -Subject: [PATCH] Fix using sprintf for extending string, which causes - undefined behavior - -[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/commit/be57045a0933d64e958878696883e9cf998e1bf3.patch] -Signed-off-by: Coleman -Signed-off-by: Christian Stewart ---- - core/rtw_mp.c | 2 +- - os_dep/linux/ioctl_linux.c | 108 ++++++++++++++++++------------------- - 2 files changed, 55 insertions(+), 55 deletions(-) - -diff --git a/core/rtw_mp.c b/core/rtw_mp.c -index c2e400d..989bb3e 100644 ---- a/core/rtw_mp.c -+++ b/core/rtw_mp.c -@@ -1871,7 +1871,7 @@ u32 mp_query_psd(PADAPTER pAdapter, u8 *data) - } else { - psd_data = rtw_GetPSDData(pAdapter, i); - } -- sprintf(data, "%s%x ", data, psd_data); -+ sprintf(data + strlen(data), "%x ", psd_data); - i++; - } - -diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c -index c74a153..9543fa3 100644 ---- a/os_dep/linux/ioctl_linux.c -+++ b/os_dep/linux/ioctl_linux.c -@@ -9080,19 +9080,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i = 0; i < EFUSE_MAP_SIZE; i += 16) { - // DBG_871X("0x%02x\t", i); -- sprintf(extra, "%s0x%02x\t", extra, i); -+ sprintf(extra + strlen(extra), "0x%02x\t", i); - for (j=0; j<8; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, PROMContent[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", PROMContent[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, PROMContent[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", PROMContent[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra,"%s\n",extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0], "realmap") == 0) { -@@ -9107,19 +9107,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i = 0; i < EFUSE_MAP_SIZE; i += 16) { - // DBG_871X("0x%02x\t", i); -- sprintf(extra, "%s0x%02x\t", extra, i); -+ sprintf(extra + strlen(extra), "0x%02x\t", i); - for (j=0; j<8; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeEfuseInitMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeEfuseInitMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra,"%s\n",extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0], "rmap") == 0) { -@@ -9158,7 +9158,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, - *extra = 0; - for (i=0; iBTEfuseInitMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra,"%s\t",extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", pEfuseHal->BTEfuseInitMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0],"btbmap") == 0) { -@@ -9384,19 +9384,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i=512; i<1024 ; i+=16) { - // DBG_871X("0x%03x\t", i); -- sprintf(extra, "%s0x%03x\t", extra, i); -+ sprintf(extra + strlen(extra), "0x%03x\t", i); - for (j=0; j<8; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra,"%s\t",extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0],"btrmap") == 0) { -@@ -9436,7 +9436,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, - // DBG_871X("%s: bt efuse data={", __FUNCTION__); - for (i=0; ifakeBTEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0],"btbfake") == 0) { -@@ -9465,19 +9465,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i=512; i<1024; i+=16) { - // DBG_871X("0x%03x\t", i); -- sprintf(extra, "%s0x%03x\t", extra, i); -+ sprintf(extra + strlen(extra), "0x%03x\t", i); - for (j=0; j<8; j++) { - // DBG_871X("%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0],"wlrfkmap")== 0) { -@@ -9485,19 +9485,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i=0; ifakeEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeEfuseModifiedMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", pEfuseHal->fakeEfuseModifiedMap[i+j]); -- sprintf(extra, "%s %02X", extra, pEfuseHal->fakeEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), " %02X", pEfuseHal->fakeEfuseModifiedMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - -@@ -9523,7 +9523,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, - *extra = 0; - for (i=0; ifakeEfuseModifiedMap[addr+i]); -- sprintf(extra, "%s0x%02X ", extra, pEfuseHal->fakeEfuseModifiedMap[addr+i]); -+ sprintf(extra + strlen(extra), "0x%02X ", pEfuseHal->fakeEfuseModifiedMap[addr+i]); - } - } else if (strcmp(tmp[0],"btrfkrmap")== 0) { - if ((tmp[1]==NULL) || (tmp[2]==NULL)) { -@@ -9547,7 +9547,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, - *extra = 0; - for (i=0; ifakeBTEfuseModifiedMap[addr+i]); -- sprintf(extra, "%s0x%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[addr+i]); -+ sprintf(extra + strlen(extra), "0x%02X ", pEfuseHal->fakeBTEfuseModifiedMap[addr+i]); - } - } else { - sprintf(extra, "Command not found!"); -@@ -10409,7 +10409,7 @@ static int rtw_mp_read_reg(struct net_device *dev, - pnext++; - if ( *pnext != '\0' ) { - strtout = simple_strtoul (pnext , &ptmp, 16); -- sprintf( extra, "%s %d" ,extra ,strtout ); -+ sprintf(extra + strlen(extra), " %d" ,strtout ); - } else { - break; - } -@@ -10443,7 +10443,7 @@ static int rtw_mp_read_reg(struct net_device *dev, - pnext++; - if ( *pnext != '\0' ) { - strtout = simple_strtoul (pnext , &ptmp, 16); -- sprintf( extra, "%s %d" ,extra ,strtout ); -+ sprintf(extra + strlen(extra), " %d" ,strtout ); - } else { - break; - } -@@ -10566,7 +10566,7 @@ static int rtw_mp_read_rf(struct net_device *dev, - pnext++; - if ( *pnext != '\0' ) { - strtou = simple_strtoul (pnext , &ptmp, 16); -- sprintf( extra, "%s %d" ,extra ,strtou ); -+ sprintf(extra + strlen(extra), " %d" ,strtou ); - } else { - break; - } -@@ -12155,14 +12155,14 @@ todo: - goto exit; - - #ifdef CONFIG_RTL8723A -- sprintf(extra, "%s %d ", extra, (pMptCtx->mptOutBuf[i]& 0x3f)); -+ sprintf(extra + strlen(extra), " %d ", (pMptCtx->mptOutBuf[i]& 0x3f)); - #else -- sprintf(extra, "%s %d ", extra, (pMptCtx->mptOutBuf[i]& 0x1f)); -+ sprintf(extra + strlen(extra), " %d ", (pMptCtx->mptOutBuf[i]& 0x1f)); - #endif - } - } else { - for (i=4; imptOutLen; i++) { -- sprintf(extra, "%s 0x%x ", extra, pMptCtx->mptOutBuf[i]); -+ sprintf(extra + strlen(extra), " 0x%x ", pMptCtx->mptOutBuf[i]); - } - } - --- -2.28.0 - diff --git a/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch b/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch deleted file mode 100644 index 41cee2b247..0000000000 --- a/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 19aee91e45788d594615a9be58fa5d0879ec816a Mon Sep 17 00:00:00 2001 -From: youcai -Date: Tue, 18 Aug 2020 00:43:16 +0800 -Subject: [PATCH] rename sha256_state to rtl_sha256_state to avoid name - conflict with crypto - -[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/pull/338/commits/af6f6c1578f16145478326a939bb7593bbcdb4e7.patch] -Signed-off-by: Coleman -Signed-off-by: Christian Stewart ---- - core/rtw_security.c | 10 +++++----- - include/rtw_security.h | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/core/rtw_security.c b/core/rtw_security.c -index d54e6af..de2d91f 100644 ---- a/core/rtw_security.c -+++ b/core/rtw_security.c -@@ -2200,7 +2200,7 @@ BIP_exit: - - #ifndef PLATFORM_FREEBSD - /* compress 512-bits */ --static int sha256_compress(struct sha256_state *md, unsigned char *buf) -+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf) - { - u32 S[8], W[64], t0, t1; - u32 t; -@@ -2249,7 +2249,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) - } - - /* Initialize the hash state */ --static void sha256_init(struct sha256_state *md) -+static void sha256_init(struct rtl_sha256_state *md) - { - md->curlen = 0; - md->length = 0; -@@ -2270,7 +2270,7 @@ static void sha256_init(struct sha256_state *md) - @param inlen The length of the data (octets) - @return CRYPT_OK if successful - */ --static int sha256_process(struct sha256_state *md, unsigned char *in, -+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in, - unsigned long inlen) - { - unsigned long n; -@@ -2311,7 +2311,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in, - @param out [out] The destination of the hash (32 bytes) - @return CRYPT_OK if successful - */ --static int sha256_done(struct sha256_state *md, unsigned char *out) -+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out) - { - int i; - -@@ -2363,7 +2363,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out) - static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len, - u8 *mac) - { -- struct sha256_state ctx; -+ struct rtl_sha256_state ctx; - size_t i; - - sha256_init(&ctx); -diff --git a/include/rtw_security.h b/include/rtw_security.h -index d41014e..98feb69 100644 ---- a/include/rtw_security.h -+++ b/include/rtw_security.h -@@ -233,7 +233,7 @@ struct security_priv { - #endif /* DBG_SW_SEC_CNT */ - }; - --struct sha256_state { -+struct rtl_sha256_state { - u64 length; - u32 state[8], curlen; - u8 buf[64]; --- -2.28.0 - diff --git a/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch b/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch deleted file mode 100644 index 6d09153b82..0000000000 --- a/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9421b0763e5f20babb2c0fd437979a71fbac1739 Mon Sep 17 00:00:00 2001 -From: Christian Stewart -Date: Tue, 8 Sep 2020 22:46:45 -0700 -Subject: [PATCH] disable rtw_mgmt_frame_register on kernel 5.8.0 - -rtl8812au: fix build for kernel 5.8 - -[Source: https://github.com/lwfinger/rtl8812au/commit/ec1591b90dd323185717fa42887f96444cca5921.patch] -Signed-off-by: Larry Finger -Signed-off-by: Christian Stewart ---- - os_dep/linux/ioctl_cfg80211.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c -index 019daf9..13238cb 100644 ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -5177,6 +5177,7 @@ exit: - return ret; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) - struct wireless_dev *wdev, -@@ -5205,6 +5206,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, - exit: - return; - } -+#endif - - #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) - static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy, -@@ -6021,7 +6023,9 @@ static struct cfg80211_ops rtw_cfg80211_ops = { - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) - .mgmt_tx = cfg80211_rtw_mgmt_tx, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, -+#endif - #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35)) - .action = cfg80211_rtw_mgmt_tx, - #endif --- -2.28.0 - diff --git a/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch b/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch deleted file mode 100644 index 30595ec695..0000000000 --- a/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch +++ /dev/null @@ -1,110 +0,0 @@ -From e0ed05200e6e4b86e26e092dc1f16fc8fc1e2b67 Mon Sep 17 00:00:00 2001 -From: Christian Stewart -Date: Tue, 8 Sep 2020 23:08:39 -0700 -Subject: [PATCH] rtw_proc: convert file_operations to proc_ops for 5.6.x - compat - -Signed-off-by: Christian Stewart -[Fix < 5.6.x compile - missing semicolon] -Signed-off-by: Peter Seiderer ---- - os_dep/linux/rtw_proc.c | 40 ++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 38 insertions(+), 2 deletions(-) - -diff --git a/os_dep/linux/rtw_proc.c b/os_dep/linux/rtw_proc.c -index 048080a..6295f66 100644 ---- a/os_dep/linux/rtw_proc.c -+++ b/os_dep/linux/rtw_proc.c -@@ -65,9 +65,15 @@ inline struct proc_dir_entry *rtw_proc_create_dir(const char *name, struct proc_ - } - - inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent, -- const struct file_operations *fops, void * data) -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) -+ const struct file_operations *fops, -+ #else -+ const struct proc_ops *fops, -+ #endif -+ void * data -+ ) - { -- struct proc_dir_entry *entry; -+ struct proc_dir_entry *entry; - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) - entry = proc_create_data(name, S_IFREG|S_IRUGO|S_IWUGO, parent, fops, data); -@@ -167,6 +173,7 @@ static ssize_t rtw_drv_proc_write(struct file *file, const char __user *buffer, - return -EROFS; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) - static const struct file_operations rtw_drv_proc_fops = { - .owner = THIS_MODULE, - .open = rtw_drv_proc_open, -@@ -175,6 +182,15 @@ static const struct file_operations rtw_drv_proc_fops = { - .release = single_release, - .write = rtw_drv_proc_write, - }; -+#else -+static const struct proc_ops rtw_drv_proc_fops = { -+ .proc_open = rtw_drv_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = seq_release, -+ .proc_write = rtw_drv_proc_write, -+}; -+#endif - - int rtw_drv_proc_init(void) - { -@@ -776,6 +792,7 @@ static ssize_t rtw_adapter_proc_write(struct file *file, const char __user *buff - return -EROFS; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) - static const struct file_operations rtw_adapter_proc_fops = { - .owner = THIS_MODULE, - .open = rtw_adapter_proc_open, -@@ -784,6 +801,15 @@ static const struct file_operations rtw_adapter_proc_fops = { - .release = single_release, - .write = rtw_adapter_proc_write, - }; -+#else -+static const struct proc_ops rtw_adapter_proc_fops = { -+ .proc_open = rtw_adapter_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release, -+ .proc_write = rtw_adapter_proc_write, -+}; -+#endif - - int proc_get_odm_dbg_comp(struct seq_file *m, void *v) - { -@@ -1030,6 +1056,7 @@ static ssize_t rtw_odm_proc_write(struct file *file, const char __user *buffer, - return -EROFS; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) - static const struct file_operations rtw_odm_proc_fops = { - .owner = THIS_MODULE, - .open = rtw_odm_proc_open, -@@ -1038,6 +1065,15 @@ static const struct file_operations rtw_odm_proc_fops = { - .release = single_release, - .write = rtw_odm_proc_write, - }; -+#else -+static const struct proc_ops rtw_odm_proc_fops = { -+ .proc_open = rtw_odm_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release, -+ .proc_write = rtw_odm_proc_write, -+}; -+#endif - - struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev) - { --- -2.29.0 - diff --git a/package/rtl8821au/rtl8821au.hash b/package/rtl8821au/rtl8821au.hash index de84332f72..a5d0c2d5d4 100644 --- a/package/rtl8821au/rtl8821au.hash +++ b/package/rtl8821au/rtl8821au.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9c8e127dcf2b4d87df546f7f51afdbca0a0561cdba9bcc2689722e1090c46204 rtl8821au-4235b0ec7d7220a6364586d8e25b1e8cb99c36f1.tar.gz -sha256 6d66dec8f6c253a1af2ffd858167c722b1ce3218215446172c81355d0a49e7fc LICENSE +sha256 302f37098c3ae018eebf8ca80bcd2ec8ffc46755daed811278321d0914758f41 rtl8821au-e0b443940471c166a5cc6280d3608f95228e017f.tar.gz +sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 LICENSE diff --git a/package/rtl8821au/rtl8821au.mk b/package/rtl8821au/rtl8821au.mk index 5f4ba3eb76..65c0bc913d 100644 --- a/package/rtl8821au/rtl8821au.mk +++ b/package/rtl8821au/rtl8821au.mk @@ -4,11 +4,19 @@ # ################################################################################ -RTL8821AU_VERSION = 4235b0ec7d7220a6364586d8e25b1e8cb99c36f1 -RTL8821AU_SITE = $(call github,abperiasamy,rtl8812AU_8821AU_linux,$(RTL8821AU_VERSION)) +RTL8821AU_VERSION = e0b443940471c166a5cc6280d3608f95228e017f +RTL8821AU_SITE = $(call github,lwfinger,rtl8812au,$(RTL8821AU_VERSION)) RTL8821AU_LICENSE = GPL-2.0 RTL8821AU_LICENSE_FILES = LICENSE +define RTL8821AU_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB) +endef + RTL8821AU_MODULE_MAKE_OPTS = \ CONFIG_RTL8812AU_8821AU=m \ KVER=$(LINUX_VERSION_PROBED) \ From yann.morin.1998 at free.fr Mon Feb 20 20:53:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:25 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXinerama: bump version to 1.1.5 Message-ID: <20230220205157.EE9C086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b97079d921d8e62ce73d08e11069f5c04734e048 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003244.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXinerama/xlib_libXinerama.hash | 8 +++----- package/x11r7/xlib_libXinerama/xlib_libXinerama.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash b/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash index ca4081d375..e3ac880b39 100644 --- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash +++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-July/002905.html -md5 0d5f826a197dae74da67af4a9ef35885 libXinerama-1.1.4.tar.bz2 -sha1 34a1d9908ffbd46805d2357c6b05f5e341a8dc7c libXinerama-1.1.4.tar.bz2 -sha256 0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720 libXinerama-1.1.4.tar.bz2 -sha512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14 libXinerama-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003244.html +sha256 5094d1f0fcc1828cb1696d0d39d9e866ae32520c54d01f618f1a3c1e30c2085c libXinerama-1.1.5.tar.xz +sha512 735b5320de4782005b379e409bf2f976131c17d496b297d33a0e127ca1443034778586b6b25c077b2ad73a4ab34d440d7510475e0041f38202bb40f15fb08ff7 libXinerama-1.1.5.tar.xz # Locally computed sha256 f661fd883b6e980b3b118e0fbe230fbf10eef8d4d4a35931355f29ed647ddbe3 COPYING diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk index 48e32d55e2..67e3398c71 100644 --- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk +++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXINERAMA_VERSION = 1.1.4 -XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2 -XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXINERAMA_VERSION = 1.1.5 +XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.xz +XLIB_LIBXINERAMA_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXINERAMA_LICENSE = MIT XLIB_LIBXINERAMA_LICENSE_FILES = COPYING XLIB_LIBXINERAMA_CPE_ID_VENDOR = x From yann.morin.1998 at free.fr Mon Feb 20 20:53:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:25 -0000 Subject: [Buildroot] [git commit branch/next] package: optee-client: fix identation issues Message-ID: <20230220205154.EED0D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1c4c18766e51ee55e8d2e3a7cb12cb2762b12ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix issues reported by utils/check-package: package/optee-client/S30optee:40: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/optee-client/S30optee:46: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/optee-client/S30optee:47: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/optee-client/S30optee:48: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/optee-client/S30optee:0: filename should be S (http://nightly.buildroot.org/#adding-packages-start-script) package/optee-client/S30tee-supplicant:0: run 'shellcheck' and fix the warnings Signed-off-by: Etienne Carriere [yann.morin.1998 at free.fr: - fix shellcheck SC2086 - rename the file ] Signed-off-by: Yann E. MORIN --- package/optee-client/{S30optee => S30tee-supplicant} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package/optee-client/S30optee b/package/optee-client/S30tee-supplicant similarity index 83% rename from package/optee-client/S30optee rename to package/optee-client/S30tee-supplicant index 17e6d6d2b8..8a605dbe5f 100644 --- a/package/optee-client/S30optee +++ b/package/optee-client/S30tee-supplicant @@ -7,6 +7,7 @@ DAEMON_ARGS="-d /dev/teepriv0" start() { printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ -- $DAEMON_ARGS status=$? @@ -37,13 +38,13 @@ restart() { } case "$1" in - start|stop|restart) + start|stop|restart) "$1";; reload) # Restart, since there is no true "reload" feature (does not # reconfigure/restart on SIGHUP, just closes all open files). restart;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac From yann.morin.1998 at free.fr Mon Feb 20 20:53:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:26 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xutil_makedepend: bump version to 1.0.7 Message-ID: <20230220205158.0588986496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=228780fbde4c2b645ea52a870df5ec020912ddf8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003243.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xutil_makedepend/xutil_makedepend.hash | 8 +++----- package/x11r7/xutil_makedepend/xutil_makedepend.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.hash b/package/x11r7/xutil_makedepend/xutil_makedepend.hash index 079fa9ef8f..3a7496e1a4 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.hash +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002985.html -md5 b2ca7f2f21f1c04a88b6a254c19c9b68 makedepend-1.0.6.tar.bz2 -sha1 3f321f7b570ec98f1fabc441267d29347a2e1456 makedepend-1.0.6.tar.bz2 -sha256 d558a52e8017d984ee59596a9582c8d699a1962391b632bec3bb6804bf4d501c makedepend-1.0.6.tar.bz2 -sha512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42 makedepend-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003243.html +sha256 a729cfd3c0f4e16c0db1da351e7f53335222e058e3434e84f91251fd6d407065 makedepend-1.0.7.tar.xz +sha512 fd575de737aa56ef8e475d1ddb7b2392e730ee1b23c0b853bbb21975b757c3fc56f94d57ecc5a784dceed2be653feb10909e86fd96fdc074b50fbbd0e27a19db makedepend-1.0.7.tar.xz # Locally computed sha256 0530078db78c47ae978dc2bd77f4f427e6cd97df868672c95b1ef284113c8cb7 COPYING diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk index 18f8eb1f6a..b16bbe0978 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk @@ -4,9 +4,9 @@ # ################################################################################ -XUTIL_MAKEDEPEND_VERSION = 1.0.6 -XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.bz2 -XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util +XUTIL_MAKEDEPEND_VERSION = 1.0.7 +XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.xz +XUTIL_MAKEDEPEND_SITE = https://xorg.freedesktop.org/archive/individual/util XUTIL_MAKEDEPEND_LICENSE = MIT XUTIL_MAKEDEPEND_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:26 -0000 Subject: [Buildroot] [git commit branch/next] package/matchbox-keyboard: add libpng dependency Message-ID: <20230220205155.0B9808648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a63fbb0d9762a0e6a454b1bea9ce44d620a6860a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libpng is a mandatory dependency since bump to version 0.1.1 in commit e2511d88e83acae4144be89ce5e258b724067bd5 and https://git.yoctoproject.org/matchbox-keyboard/commit/?id=1d7c5f1e0ad736205151c0df5aa738f942bd3e97: checking for PNG... no configure: error: Package requirements (libpng) were not met: Package 'libpng', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/4495f0720d7053a52ff8fef82d18a70a6f20c66b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/matchbox-keyboard/Config.in | 1 + package/matchbox-keyboard/matchbox-keyboard.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/matchbox-keyboard/Config.in b/package/matchbox-keyboard/Config.in index 260a57c6a4..3d7a9d203c 100644 --- a/package/matchbox-keyboard/Config.in +++ b/package/matchbox-keyboard/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MATCHBOX_KEYBOARD bool "matchbox-keyboard" + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO diff --git a/package/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox-keyboard/matchbox-keyboard.mk index 242c4831d1..a1e3c61543 100644 --- a/package/matchbox-keyboard/matchbox-keyboard.mk +++ b/package/matchbox-keyboard/matchbox-keyboard.mk @@ -11,7 +11,7 @@ MATCHBOX_KEYBOARD_SITE = \ MATCHBOX_KEYBOARD_LICENSE = LGPL-2.1, GPL-2.0+ (applet.c) MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING applet/applet.c MATCHBOX_KEYBOARD_DEPENDENCIES = \ - host-pkgconf matchbox-lib matchbox-fakekey expat xlib_libXrender + host-pkgconf matchbox-lib matchbox-fakekey expat libpng xlib_libXrender # From git MATCHBOX_KEYBOARD_AUTORECONF = YES From yann.morin.1998 at free.fr Mon Feb 20 20:53:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:27 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xcb-util-renderutil: bump version to 0.3.10 Message-ID: <20230220205158.58AD586494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b42c06423c7b31b5fdc8d2d06bdec7cd059eb30 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003234.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash | 5 +++-- package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash b/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash index 19ed9d4640..cb3ed55cea 100644 --- a/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash +++ b/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-June/002446.html -sha256 c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b xcb-util-renderutil-0.3.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003234.html +sha256 3e15d4f0e22d8ddbfbb9f5d77db43eacd7a304029bf25a6166cc63caa96d04ba xcb-util-renderutil-0.3.10.tar.xz +sha512 9cfa9201be2df7c0b832e1e1fe506e7c7a1e0f2b1b1d4a4b58620eadc241190a36478fa3ea27c32047fa79bf199f17dcd0b106853dbf5eda8cd584f3fc2b0c15 xcb-util-renderutil-0.3.10.tar.xz # Locally computed sha256 271169dd66674e9c396697af0b4822d1c59ccd2342b7740864d667a02963068b COPYING diff --git a/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk b/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk index 9e6683bf3a..d15d19f7e2 100644 --- a/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk +++ b/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_RENDERUTIL_VERSION = 0.3.9 -XCB_UTIL_RENDERUTIL_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_RENDERUTIL_SOURCE = xcb-util-renderutil-$(XCB_UTIL_RENDERUTIL_VERSION).tar.bz2 +XCB_UTIL_RENDERUTIL_VERSION = 0.3.10 +XCB_UTIL_RENDERUTIL_SITE = https://xorg.freedesktop.org/archive/individual/lib +XCB_UTIL_RENDERUTIL_SOURCE = xcb-util-renderutil-$(XCB_UTIL_RENDERUTIL_VERSION).tar.xz XCB_UTIL_RENDERUTIL_LICENSE = MIT XCB_UTIL_RENDERUTIL_LICENSE_FILES = COPYING XCB_UTIL_RENDERUTIL_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:53:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:27 -0000 Subject: [Buildroot] [git commit branch/next] package/elf2flt: fix text relocations on xtensa Message-ID: <20230220205155.1F083828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3781e4efc52f542f58147b2de5f599b4e729bcbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next elf2flt 2021.08 has changed endianness swapping logic for relocated entries in the text segment. This broke little-endian xtensa FLAT images which now fail to start with the following message: binfmt_flat: reloc outside program 0x24c80100 (0 - 0x6e430/0x56a20) Fix it by restoring old endianness swapping logic for relocated entries in the text segment when building for xtensa. Reported-by: Niklas Cassel Signed-off-by: Max Filippov Signed-off-by: Yann E. MORIN --- .../0006-elf2flt-xtensa-fix-text-relocations.patch | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch b/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch new file mode 100644 index 0000000000..3664775906 --- /dev/null +++ b/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch @@ -0,0 +1,51 @@ +From e248d9774506fdd8698b14a7edead113f19ecdb0 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Tue, 29 Nov 2022 17:47:54 -0800 +Subject: [PATCH] xtensa: fix text relocations + +The commit 5e08f1968316 ("Don't always update text in !pic_with_got case") +changed good_32bit_resolved_reloc to not do endianness swapping for +relocated entries in the text segment. This broke little-endian xtensa +FLAT images which after this change fail to start with the following +message: + + binfmt_flat: reloc outside program 0x24c80100 (0 - 0x6e430/0x56a20) + +Fix it by preserving 'update_text' when building for xtensa. + +Fixes: 5e08f1968316 ("Don't always update text in !pic_with_got case") +Reported-by: Niklas Cassel +Signed-off-by: Max Filippov +--- + elf2flt.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/elf2flt.c b/elf2flt.c +index b93aecdaced3..cec3f4a22239 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -808,7 +808,20 @@ output_relocs ( + continue; + case R_XTENSA_32: + case R_XTENSA_PLT: +- goto good_32bit_resolved_reloc; ++ if (bfd_big_endian (abs_bfd)) ++ sym_addr = ++ (r_mem[0] << 24) ++ + (r_mem[1] << 16) ++ + (r_mem[2] << 8) ++ + r_mem[3]; ++ else ++ sym_addr = ++ r_mem[0] ++ + (r_mem[1] << 8) ++ + (r_mem[2] << 16) ++ + (r_mem[3] << 24); ++ relocation_needed = 1; ++ break; + default: + goto bad_resolved_reloc; + #else +-- +2.30.2 + From yann.morin.1998 at free.fr Mon Feb 20 20:53:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:28 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xsetroot: bump version to 1.1.3 Message-ID: <20230220205158.2A2C686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51818b18b9a1fe1a5e0b31298f86cb80309ae9ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003240.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xsetroot/xapp_xsetroot.hash | 8 +++----- package/x11r7/xapp_xsetroot/xapp_xsetroot.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash b/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash index 32294c1f3d..43f7cd66d0 100644 --- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash +++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002874.html -md5 5fe769c8777a6e873ed1305e4ce2c353 xsetroot-1.1.2.tar.bz2 -sha1 42ab81761823b44974feab86477007c49dbace50 xsetroot-1.1.2.tar.bz2 -sha256 10c442ba23591fb5470cea477a0aa5f679371f4f879c8387a1d9d05637ae417c xsetroot-1.1.2.tar.bz2 -sha512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b xsetroot-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003240.html +sha256 6081b45a9eb4426e045d259d1e144b32417fb635e5b96aa90647365ac96638d1 xsetroot-1.1.3.tar.xz +sha512 f333d1bfd92bb943044da36331ae2cf68a811c8f3891719d9ebc1749e2dd0c67068f86face0794c3c4ae584c4dd189bad4998dccb38fe1ac37a8921e5713e7c0 xsetroot-1.1.3.tar.xz # Locally computed sha256 48e9c9572e0dc1c14b93b753542f780e7751dd7f035816374d8a8be0211a4520 COPYING diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk index 98ba344cfa..1ffbb2b6b0 100644 --- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk +++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XSETROOT_VERSION = 1.1.2 -XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.bz2 -XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XSETROOT_VERSION = 1.1.3 +XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.xz +XAPP_XSETROOT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XSETROOT_LICENSE = MIT XAPP_XSETROOT_LICENSE_FILES = COPYING XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXcursor xdata_xbitmaps From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:28 -0000 Subject: [Buildroot] [git commit branch/next] package/rabbitmq-server: drop package Message-ID: <20230220205154.B1D39828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89815bad0a531d01ee2733dd9c17576a7647e1d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The packaged version has a number of security issues, newer versions require erlang 23+ and nobody has stepped up to maintain it since the issues were reported: http://lists.busybox.net/pipermail/buildroot/2022-November/656230.html So drop the package and add legacy handling for it. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++ DEVELOPERS | 1 - package/Config.in | 1 - package/rabbitmq-server/Config.in | 14 ----- package/rabbitmq-server/S50rabbitmq-server | 30 ----------- package/rabbitmq-server/rabbitmq-server.hash | 25 --------- package/rabbitmq-server/rabbitmq-server.mk | 69 ------------------------- package/rabbitmq-server/rabbitmq-server.service | 16 ------ 8 files changed, 7 insertions(+), 156 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index b3c35d6b07..49f63fd14c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.11" +config BR2_PACKAGE_RABBITMQ_SERVER + bool "rabbitmq-server removed" + select BR2_LEGACY + help + Package was removed because it was unmaintained and had + known security issues. + config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 bool "libopenssl rc5 was never enabled" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index bfebf8163c..8bcce1fd37 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1074,7 +1074,6 @@ F: package/libdmtx/ F: package/libsodium/ F: package/php-amqp/ F: package/python-cherrypy/ -F: package/rabbitmq-server/ F: package/sane-backends/ F: package/ucl/ F: package/upx/ diff --git a/package/Config.in b/package/Config.in index aef80f9ab0..682faf3697 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2394,7 +2394,6 @@ endif source "package/pure-ftpd/Config.in" source "package/putty/Config.in" source "package/quagga/Config.in" - source "package/rabbitmq-server/Config.in" source "package/radvd/Config.in" source "package/reaver/Config.in" source "package/redir/Config.in" diff --git a/package/rabbitmq-server/Config.in b/package/rabbitmq-server/Config.in deleted file mode 100644 index b3b7639e28..0000000000 --- a/package/rabbitmq-server/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_RABBITMQ_SERVER - bool "rabbitmq-server" - depends on BR2_PACKAGE_ERLANG - select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_OPENSSL # Required to build Erlang's crypto and ssl - # applications - help - High-performance AMQP-compliant message broker written in - Erlang. - - http://www.rabbitmq.com - -comment "rabbitmq-server needs erlang" - depends on !BR2_PACKAGE_ERLANG diff --git a/package/rabbitmq-server/S50rabbitmq-server b/package/rabbitmq-server/S50rabbitmq-server deleted file mode 100644 index 35f7844860..0000000000 --- a/package/rabbitmq-server/S50rabbitmq-server +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Start/stop rabbitmq-server -# - -INSTALLUSER=rabbitmq -RUNDIR=/var/run/rabbitmq -LOGDIR=/var/log/rabbitmq - -case "$1" in - start) - install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" || exit 1 - install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$LOGDIR" || exit 1 - printf "Starting rabbitmq-server: " - su -c "/usr/sbin/rabbitmq-server -detached" - "$INSTALLUSER" 2>/dev/null - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping rabbitmq-server: " - su -c "/usr/sbin/rabbitmqctl stop" - "$INSTALLUSER" - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - "$0" stop || true - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package/rabbitmq-server/rabbitmq-server.hash b/package/rabbitmq-server/rabbitmq-server.hash deleted file mode 100644 index 693ab208ec..0000000000 --- a/package/rabbitmq-server/rabbitmq-server.hash +++ /dev/null @@ -1,25 +0,0 @@ -# Locally computed -sha256 8c6729b985cb21bab13363b1c806cfa15845b046be9e641ab1496bd5a1eaf19d rabbitmq-server-3.8.2.tar.xz -sha256 a96b7ed2e7def9c86d84d9ca0e79e4a55fc8e6e202ac89caa4f9791ccb9cf2a3 LICENSE -sha256 acd82bfce369b066e7e612197206da4fa38b8614486658775d0b6f66ac30114a LICENSE-APACHE2 -sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE-APACHE2-excanvas -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE-APACHE2-ExplorerCanvas -sha256 b04c8850fdf64d17233f0acbe4eb632f03bd663094233c949bdbe788858bb841 LICENSE-APL2-Stomp-Websocket -sha256 3c69f8327beaaa45d2f3d7831edf211d0f37d1d9c7754267478320697e1882e9 LICENSE-BSD-base64js -sha256 af7b5cdf5e16446c64d6e755b2a6386e38c56500ae27587edcd94c96d330ee35 LICENSE-BSD-recon -sha256 7615ea96ccddc822655cb48a9d2a5cac2f176fca7fe28131af934ce21f48cbc8 LICENSE-erlcloud -sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234 LICENSE-httpc_aws -sha256 c0e940d13f488849c27963e7d87f3fc27a2f5843cfd49148029a558251014689 LICENSE-ISC-cowboy -sha256 af399cded8f343407fb68eeb51755676e9700c65c380f073376afd8d20f428a1 LICENSE-MIT-EJS -sha256 b2614726fe57ee8267324ecfdebe6e578e5aaa5a77a7f84b9d26463c058147d1 LICENSE-MIT-EJS10 -sha256 0f26e121a7a1dab675bd8474cdc517428863036a668260033467c7278f488cd4 LICENSE-MIT-Erlware-Commons -sha256 52cb566b16d84314b92b91361ed072eaaf166e8d3dfa3d0fd3577613925f205c LICENSE-MIT-Flot -sha256 8cb9a8ff8cafd6a085fd4f086e797b719c334a621df19354dc286591003da3f5 LICENSE-MIT-jQuery -sha256 44f25d51c90aa55dd4b3ba7f3d6e9a594073fcbefe651e16e74cabd48005b476 LICENSE-MIT-jQuery164 -sha256 fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692 LICENSE-MIT-Mochi -sha256 b80081a5bb527dbe6b79f18a40f44b4ba6303e4856cadd249672c97b90e6dd7c LICENSE-MIT-Sammy -sha256 cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed LICENSE-MIT-Sammy060 -sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd LICENSE-MPL -sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd LICENSE-MPL-RabbitMQ -sha256 66a3107d5ad6a058aab753eaac2047ccb2ed0e39465dd0fe5844da3e300d5172 LICENSE-MPL2 -sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234 LICENSE-rabbitmq_aws diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk deleted file mode 100644 index 969e61e2b5..0000000000 --- a/package/rabbitmq-server/rabbitmq-server.mk +++ /dev/null @@ -1,69 +0,0 @@ -################################################################################ -# -# rabbitmq-server -# -################################################################################ - -RABBITMQ_SERVER_VERSION = 3.8.2 -RABBITMQ_SERVER_SITE = https://github.com/rabbitmq/rabbitmq-server/releases/download/v$(RABBITMQ_SERVER_VERSION) -RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz -RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-3-Clause, BSD-2-Clause, MIT, MPL-2.0, ISC -RABBITMQ_SERVER_LICENSE_FILES = \ - LICENSE \ - LICENSE-APACHE2 \ - LICENSE-APACHE2-excanvas \ - LICENSE-APACHE2-ExplorerCanvas \ - LICENSE-APL2-Stomp-Websocket \ - LICENSE-BSD-base64js \ - LICENSE-BSD-recon \ - LICENSE-erlcloud \ - LICENSE-httpc_aws \ - LICENSE-ISC-cowboy \ - LICENSE-MIT-EJS \ - LICENSE-MIT-EJS10 \ - LICENSE-MIT-Erlware-Commons \ - LICENSE-MIT-Flot \ - LICENSE-MIT-jQuery \ - LICENSE-MIT-jQuery164 \ - LICENSE-MIT-Mochi \ - LICENSE-MIT-Sammy \ - LICENSE-MIT-Sammy060 \ - LICENSE-MPL \ - LICENSE-MPL-RabbitMQ \ - LICENSE-MPL2 \ - LICENSE-rabbitmq_aws -RABBITMQ_SERVER_CPE_ID_VENDOR = vmware -RABBITMQ_SERVER_CPE_ID_PRODUCT = rabbitmq -RABBITMQ_SERVER_SELINUX_MODULES = rabbitmq - -RABBITMQ_SERVER_DEPENDENCIES = host-elixir host-libxslt host-zip erlang libxslt -RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults - -define RABBITMQ_SERVER_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define RABBITMQ_SERVER_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install - - for bin in $(RABBITMQ_SERVER_TARGET_BINS); do \ - ln -sf ../lib/erlang/lib/rabbitmq_server-$(RABBITMQ_SERVER_VERSION)/sbin/$$bin \ - $(TARGET_DIR)/usr/sbin/$$bin; \ - done -endef - -define RABBITMQ_SERVER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/rabbitmq-server/rabbitmq-server.service \ - $(TARGET_DIR)/usr/lib/systemd/system/rabbitmq-server.service -endef - -define RABBITMQ_SERVER_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/rabbitmq-server/S50rabbitmq-server \ - $(TARGET_DIR)/etc/init.d/S50rabbitmq-server -endef - -define RABBITMQ_SERVER_USERS - rabbitmq -1 rabbitmq -1 * /var/lib/rabbitmq /bin/sh - rabbitmq-server daemon -endef - -$(eval $(generic-package)) diff --git a/package/rabbitmq-server/rabbitmq-server.service b/package/rabbitmq-server/rabbitmq-server.service deleted file mode 100644 index f69b33d455..0000000000 --- a/package/rabbitmq-server/rabbitmq-server.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=RabbitMQ Messaging Server -After=syslog.target network.target - -[Service] -Type=simple -User=rabbitmq -Group=rabbitmq -Environment=HOME=/var/lib/rabbitmq -WorkingDirectory=/var/lib/rabbitmq -LogsDirectory=/var/log/rabbitmq -ExecStart=/usr/sbin/rabbitmq-server -ExecStop=/usr/sbin/rabbitmqctl stop - -[Install] -WantedBy=multi-user.target From yann.morin.1998 at free.fr Mon Feb 20 20:53:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:35 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXxf86vm: bump version to 1.1.5 Message-ID: <20230220205158.F1AE886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b8022395d32d8bda95ca084436659a983932c11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-September/003213.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash | 7 +++---- package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash index 0601360c0e..d181310c69 100644 --- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash +++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash @@ -1,6 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-February/002539.html -sha1 78ef18ca2be157131899e01c62679e247409a13f libXxf86vm-1.1.4.tar.bz2 -sha256 afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57 libXxf86vm-1.1.4.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-September/003213.html +sha256 247fef48b3e0e7e67129e41f1e789e8d006ba47dba1c0cdce684b9b703f888e7 libXxf86vm-1.1.5.tar.xz +sha512 68226fcb9773a583ea417ab413146203dd7db6ff8a4d388285da972353355e11e179861a77c9fa284aefac025bb3bbf5a9537fa0bf246c782e0116a667c9d9b6 libXxf86vm-1.1.5.tar.xz # Locally calculated sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk index 8871bd507e..0f3decb04e 100644 --- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk +++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXXF86VM_VERSION = 1.1.4 -XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2 -XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXXF86VM_VERSION = 1.1.5 +XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.xz +XLIB_LIBXXF86VM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXXF86VM_LICENSE = MIT XLIB_LIBXXF86VM_LICENSE_FILES = COPYING XLIB_LIBXXF86VM_CPE_ID_VENDOR = x From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:35 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: remove Sven Haardiek Message-ID: <20230220205155.EDF52828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e40f96af34e3706fff2ebd6e9a6cebd14091d4ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next His e-mail address no longer exists: Your message to sven.haardiek at iotec-gmbh.de couldn't be delivered. sven.haardiek wasn't found at iotec-gmbh.de. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 9da61cca13..7b5eda1615 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2728,10 +2728,6 @@ F: configs/rock_pi_n8_defconfig F: configs/rockpro64_defconfig F: package/arm-gnu-toolchain/ -N: Sven Haardiek -F: package/lcdproc/ -F: package/python-influxdb/ - N: Sven Oliver Moll F: package/most/ From peter at korsgaard.com Mon Feb 20 20:53:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:36 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.11 Message-ID: <20230220205155.BEC7B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40bd4a32aadaa1d041a8525628ecaaf7f5a7fde6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- CHANGES | 20 ++++++++++++++++++++ Makefile | 2 +- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 18 ++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 51 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index 79b010a9b8..f71e53fe4b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,23 @@ +2022.11, released December 5th, 2022 + + Fixes all over the tree. + + Defconfigs: Nitrogen8*: Bump rootfs size, Zynqmp + kv260/zcu102/zcu106: Update to Xilinx 2022.2, + + Updated/fixed packages: dash, dovecot, elf2flt, exim, gcc, + gdb, git, kodi, libarchive, libmdbx, linuxptp, lxc, + matchbox-keyboard, memcached, netsnmp, optee-client, + python-scipy, python3, qt6base, qt6serialport, rtl8188eu, + rtl8723bu, rtl8723ds, rtl8821au, vim, vlc, wilc-driver + + Removed packages: rabbitmq-server + + Issues resolved (http://bugs.uclibc.org): + + #15131: Target GDB uses internal zlib + #15151: Busybox /etc/init.d scripts are not executable + 2022.11-rc3, released November 24th, 2022 Fixes all over the tree. diff --git a/Makefile b/Makefile index 827ab230ef..89f3648bb7 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.11-rc3 +export BR2_VERSION := 2022.11 # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1669308000 diff --git a/docs/website/download.html b/docs/website/download.html index a92f630611..6f7007529c 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,40 +42,40 @@
    -

    Latest stable release: 2022.08.2

    +

    Latest stable release: 2022.11

    - +
    - +
    -

    buildroot-2022.08.2.tar.gz

    -

    PGP signature

    +

    buildroot-2022.11.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2022.08.2.tar.xz

    -

    PGP signature

    +

    buildroot-2022.11.tar.xz

    +

    PGP signature

    - +
    Source code
    diff --git a/docs/website/news.html b/docs/website/news.html index 1d76cc3cf5..9be00982cb 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,24 @@

    News

      +
    • +
      +
      +
      +

      2022.11 released

      +

      5 December 2022

      +
      +
      +

      The stable 2022.11 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.11 release.

      +
      +
      +
      • +
    • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 40c7c4e1ce..02fe6bca67 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2022.08.2' +RELEASE='2022.11' ### Change here for more memory/cores ### VM_MEMORY=2048 From yann.morin.1998 at free.fr Mon Feb 20 20:53:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:36 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXft: bump version to 2.3.6 Message-ID: <20230220205159.134D486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f7d13d9588cf3632a7c73bd81dddb52a4263309 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-September/003211.html https://lists.x.org/archives/xorg-announce/2022-September/003209.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXft/xlib_libXft.hash | 6 +++--- package/x11r7/xlib_libXft/xlib_libXft.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXft/xlib_libXft.hash b/package/x11r7/xlib_libXft/xlib_libXft.hash index 8743a9b7d1..484764be3d 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.hash +++ b/package/x11r7/xlib_libXft/xlib_libXft.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-August/003104.html -sha256 57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd libXft-2.3.4.tar.bz2 -sha512 5bb019750982ed4643880efd7368bc226ad49cfa8c0c8c6d4614dfeed74f588c65e1ba69adcc12284ec07d841e5b58fc1c27f3fddf83fe1a2837b29dd9ecec51 libXft-2.3.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-September/003211.html +sha256 60a6e7319fc938bbb8d098c9bcc86031cc2327b5d086d3335fc5c76323c03022 libXft-2.3.6.tar.xz +sha512 732f8c635fcac6010012ba8c10c23d2dd6ec79b0f096d6bcc9b7e36d2ca0817387faa7ee5bb6f43cff02adc68e4234c1b8f95021ebc548f61c492e0b76836d90 libXft-2.3.6.tar.xz # Locally computed sha256 7cda22286b1379b9b73df695f72cbad36595e65b039a5fbc5c89b69ecc44438c COPYING diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index b1640a6613..a86501900c 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXFT_VERSION = 2.3.4 -XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2 +XLIB_LIBXFT_VERSION = 2.3.6 +XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.xz XLIB_LIBXFT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFT_LICENSE = MIT XLIB_LIBXFT_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:37 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libICE: bump version to 1.1.1 Message-ID: <20230220205156.55F678648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8ae5b86edcf172d824982c0740c5099ea087697 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003288.html https://lists.x.org/archives/xorg-announce/2022-December/003274.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libICE/xlib_libICE.hash | 8 +++----- package/x11r7/xlib_libICE/xlib_libICE.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libICE/xlib_libICE.hash b/package/x11r7/xlib_libICE/xlib_libICE.hash index 2bfbe54788..4a58f97698 100644 --- a/package/x11r7/xlib_libICE/xlib_libICE.hash +++ b/package/x11r7/xlib_libICE/xlib_libICE.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003006.html -md5 76d77499ee7120a56566891ca2c0dbcf libICE-1.0.10.tar.bz2 -sha1 5b5eb125d4f43a3ab8153b0f850963ee6c982c24 libICE-1.0.10.tar.bz2 -sha256 6f86dce12cf4bcaf5c37dddd8b1b64ed2ddf1ef7b218f22b9942595fb747c348 libICE-1.0.10.tar.bz2 -sha512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468 libICE-1.0.10.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003288.html +sha256 03e77afaf72942c7ac02ccebb19034e6e20f456dcf8dddadfeb572aa5ad3e451 libICE-1.1.1.tar.xz +sha512 2f7833a25f31cc743ca95cb88f9a8403b50e19ffb5bf43bfef87ba405857d359789daaa9ec2391351237d958f16d35dbf082adb76d301e46d3a54162a6b452d3 libICE-1.1.1.tar.xz # Locally computed sha256 60105b7ea93cb07a67fee8443b092b727e3db7f0dff4fbe05bc6cd7747fb53c8 COPYING diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk index 2b56aaab98..d92e81c0ab 100644 --- a/package/x11r7/xlib_libICE/xlib_libICE.mk +++ b/package/x11r7/xlib_libICE/xlib_libICE.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBICE_VERSION = 1.0.10 -XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.bz2 +XLIB_LIBICE_VERSION = 1.1.1 +XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.xz XLIB_LIBICE_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBICE_LICENSE = MIT XLIB_LIBICE_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:38 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_showfont: bump version to 1.0.6 Message-ID: <20230220205159.2B56B86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe85dbf818ab4321f3a18f742458f3313ed1b3ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003207.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_showfont/xapp_showfont.hash | 5 +++-- package/x11r7/xapp_showfont/xapp_showfont.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_showfont/xapp_showfont.hash b/package/x11r7/xapp_showfont/xapp_showfont.hash index ff35e9c9eb..7bec4e8728 100644 --- a/package/x11r7/xapp_showfont/xapp_showfont.hash +++ b/package/x11r7/xapp_showfont/xapp_showfont.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002513.html -sha256 e9735c1c530b8a52edfab7415cc0fd7f8d2889095114f4cb689a27476461ac89 showfont-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003207.html +sha256 2b9b9f06e65e095ed76ce560b701b9fc47fa63310ee706b54c8787af061d0e56 showfont-1.0.6.tar.xz +sha512 21a318519492f4ba46a8bcb3590097fc5f96fe01fdb557257ae56bae813671952a2aad6c0df8cd69659e06708571c398e6d97969224cf692e22c8a35c8e6c363 showfont-1.0.6.tar.xz # Locally computed sha256 c32217021e0507207e2ee6da3fcee3d9e32816003a7153b3357c08cdc97934a8 COPYING diff --git a/package/x11r7/xapp_showfont/xapp_showfont.mk b/package/x11r7/xapp_showfont/xapp_showfont.mk index c0b8c9a3a2..a805f35231 100644 --- a/package/x11r7/xapp_showfont/xapp_showfont.mk +++ b/package/x11r7/xapp_showfont/xapp_showfont.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_SHOWFONT_VERSION = 1.0.5 -XAPP_SHOWFONT_SOURCE = showfont-$(XAPP_SHOWFONT_VERSION).tar.bz2 -XAPP_SHOWFONT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_SHOWFONT_VERSION = 1.0.6 +XAPP_SHOWFONT_SOURCE = showfont-$(XAPP_SHOWFONT_VERSION).tar.xz +XAPP_SHOWFONT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SHOWFONT_LICENSE = MIT XAPP_SHOWFONT_LICENSE_FILES = COPYING XAPP_SHOWFONT_DEPENDENCIES = xlib_libFS From yann.morin.1998 at free.fr Mon Feb 20 20:53:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:38 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libxkbfile: bump version to 1.1.2 Message-ID: <20230220205156.6B020828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cfae45da9c35dd5e9a9bd8c42a8fb008d425f35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003286.html https://lists.x.org/archives/xorg-announce/2022-October/003227.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash | 8 +++----- package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash index 3f2ffdf09a..7e6199f16b 100644 --- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash +++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002977.html -md5 dd7e1e946def674e78c0efbc5c7d5b3b libxkbfile-1.1.0.tar.bz2 -sha1 487f314b6dbc17e93d0fe1e3741392156a9ca895 libxkbfile-1.1.0.tar.bz2 -sha256 758dbdaa20add2db4902df0b1b7c936564b7376c02a0acd1f2a331bd334b38c7 libxkbfile-1.1.0.tar.bz2 -sha512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826 libxkbfile-1.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003286.html +sha256 b8a3784fac420b201718047cfb6c2d5ee7e8b9481564c2667b4215f6616644b1 libxkbfile-1.1.2.tar.xz +sha512 0639fad7b64b36a85f8d24cdd40085e0ec18d7a671793b8b5c26449e9cc5a84c37117e7757fb1238ac353044935dd00013e42166de5af9dec428e873a47e598d libxkbfile-1.1.2.tar.xz # Locally computed sha256 e1b3fdad8037ab3f986ef9caaa7c8da47d8d55875e680c7d6011f6c07363ea7c COPYING diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk index 6b68496650..2e7f82922f 100644 --- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk +++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXKBFILE_VERSION = 1.1.0 -XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.bz2 +XLIB_LIBXKBFILE_VERSION = 1.1.2 +XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.xz XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXKBFILE_LICENSE = MIT XLIB_LIBXKBFILE_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:39 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_ico: bump version to 1.0.6 Message-ID: <20230220205159.4202C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74440b3cd2bf5cdaf06753d53a471bb5f2c288c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003205.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_ico/xapp_ico.hash | 8 +++----- package/x11r7/xapp_ico/xapp_ico.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_ico/xapp_ico.hash b/package/x11r7/xapp_ico/xapp_ico.hash index a0970cd507..0258537fd5 100644 --- a/package/x11r7/xapp_ico/xapp_ico.hash +++ b/package/x11r7/xapp_ico/xapp_ico.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002880.html -md5 7895f2d109f4206b6d2db37257e07d12 ico-1.0.5.tar.bz2 -sha1 8759ec954375f3a1b37dc920a12790bfbfb0cad3 ico-1.0.5.tar.bz2 -sha256 d73b62f29eb98d850f16b76d759395180b860b613fbe1686b18eee99a6e3773f ico-1.0.5.tar.bz2 -sha512 93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6 ico-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003205.html +sha256 38f369d431e753280fde70fa489cc94ce204f9f8eabd2f49fc7d32afa69f4405 ico-1.0.6.tar.xz +sha512 0ada451b8026ea10d1a5633f847b7bf833292e4cd01e3f1079d82c91fd142c06c6c4005b7146900ee34ac7acc8fd981db37ada9052dff49c2cfce995b9146c8c ico-1.0.6.tar.xz # Locally computed sha256 97ef3a622f2f385cabfc8ab7aff13dc46468c10a5520670b5edfa33f2c3999eb COPYING diff --git a/package/x11r7/xapp_ico/xapp_ico.mk b/package/x11r7/xapp_ico/xapp_ico.mk index 8b0d4f90f3..56dbd64b38 100644 --- a/package/x11r7/xapp_ico/xapp_ico.mk +++ b/package/x11r7/xapp_ico/xapp_ico.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_ICO_VERSION = 1.0.5 -XAPP_ICO_SOURCE = ico-$(XAPP_ICO_VERSION).tar.bz2 -XAPP_ICO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_ICO_VERSION = 1.0.6 +XAPP_ICO_SOURCE = ico-$(XAPP_ICO_VERSION).tar.xz +XAPP_ICO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_ICO_LICENSE = MIT XAPP_ICO_LICENSE_FILES = COPYING XAPP_ICO_DEPENDENCIES = xlib_libX11 From yann.morin.1998 at free.fr Mon Feb 20 20:53:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:39 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-input-mouse: bump version to 1.9.4 Message-ID: <20230220205156.4B6B8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82abffdbb7784ab30874544f740abf23f6c0c695 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash | 8 +++----- .../x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash index fe83f6920f..adba659aea 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-June/002903.html -md5 a2104693bbcfe1413397f7905eecd3dc xf86-input-mouse-1.9.3.tar.bz2 -sha1 b3982998808ba43117fc066c4ecc94ce67c5818e xf86-input-mouse-1.9.3.tar.bz2 -sha256 93ecb350604d05be98b7d4e5db3b8155a44890069a7d8d6b800c0bea79c85cc5 xf86-input-mouse-1.9.3.tar.bz2 -sha512 d99f5b4b1ef1aa4cbf1a92549e412f54f121bc804e4d6643248ad7ea18081b38b958bd289dc8476ebc0f6ef5f7424c2f2a8abcfaa30cae5378829549af6b148f xf86-input-mouse-1.9.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003247.html +sha256 7f6f8551fc238abdddcf9f38906564c1f8c7dacb0ad947cfc110487aefbd8d4c xf86-input-mouse-1.9.4.tar.xz +sha512 7dfde3b1e0c1291c4d78ee920942771808b007f743bfc6eed20de12579383745858673dd874a4b5cf4ab8d9d15f6f7ca2db81ee831547a488d64848a7fe5e16c xf86-input-mouse-1.9.4.tar.xz # Locally computed sha256 472ff645ead9bf3ffb48d42c596376ffc595897e0c0993a071a7ada0da1f4f10 COPYING diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk index 3886fa7aa1..4a9eb3089f 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.3 -XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.4 +XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.xz +XDRIVER_XF86_INPUT_MOUSE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT XDRIVER_XF86_INPUT_MOUSE_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xorgproto From yann.morin.1998 at free.fr Mon Feb 20 20:53:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:40 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-glint: remove package Message-ID: <20230220205159.766C386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=565f41e27c7a6cfd3b51ddf46071799a40f5eb99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Building this package is broken with X.org xserver 21: https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1 Fixes: http://autobuild.buildroot.net/results/f9d/f9d650ccb4173085cfc8873f1e52ee56caf982fa/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- Config.in.legacy | 7 +++++++ package/x11r7/Config.in | 1 - package/x11r7/xdriver_xf86-video-glint/Config.in | 10 ---------- .../xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash | 4 ---- .../xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk | 14 -------------- 5 files changed, 7 insertions(+), 29 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 522102a0c0..bf3bd55f35 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT + bool "xf86-video-glint removed" + select BR2_LEGACY + help + The X.org xf86-video-glint package no longer builds with + Xserver 21 and is unmaintained. + config BR2_PACKAGE_USBREDIR_SERVER bool "usbredirserver removed" select BR2_LEGACY diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 63259e88da..273db98e89 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -164,7 +164,6 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdriver_xf86-video-fbdev/Config.in source package/x11r7/xdriver_xf86-video-fbturbo/Config.in source package/x11r7/xdriver_xf86-video-geode/Config.in - source package/x11r7/xdriver_xf86-video-glint/Config.in source package/x11r7/xdriver_xf86-video-i128/Config.in source package/x11r7/xdriver_xf86-video-imx/Config.in source package/x11r7/xdriver_xf86-video-imx-viv/Config.in diff --git a/package/x11r7/xdriver_xf86-video-glint/Config.in b/package/x11r7/xdriver_xf86-video-glint/Config.in deleted file mode 100644 index c474f6c912..0000000000 --- a/package/x11r7/xdriver_xf86-video-glint/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT - bool "xf86-video-glint" - depends on BR2_PACKAGE_MESA3D - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XORGPROTO - help - GLINT/Permedia video driver - -comment "xf86-video-glint needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash deleted file mode 100644 index 40474ebc7b..0000000000 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002759.html -sha256 852833ab2ea9ce519195dfd061a6c7aa5945a093cdc19546d1e9e69df7d577d2 xf86-video-glint-1.2.9.tar.bz2 -# Locally calculated -sha256 6ca8e1a7e1d491f3618d3f14df1be64dbc8adefae7bbaf11d4920240dfb12f6e COPYING diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk deleted file mode 100644 index fba0030757..0000000000 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-glint -# -################################################################################ - -XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.9 -XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_GLINT_LICENSE = MIT -XDRIVER_XF86_VIDEO_GLINT_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xorgproto - -$(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:53:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:40 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libfontenc: bump version to 1.1.7 Message-ID: <20230220205156.75BCD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ce4206c9e8871ed02ccb824d584dfff36bbc719 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003285.html https://lists.x.org/archives/xorg-announce/2022-August/003204.html https://lists.x.org/archives/xorg-announce/2022-August/003199.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libfontenc/xlib_libfontenc.hash | 8 +++----- package/x11r7/xlib_libfontenc/xlib_libfontenc.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash b/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash index cf09f61c3e..a061ca4a4b 100644 --- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash +++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002956.html -md5 6447db6a689fb530c218f0f8328c3abc libfontenc-1.1.4.tar.bz2 -sha1 d4f232b0b07487b984e13422ce4130b61a8b9edb libfontenc-1.1.4.tar.bz2 -sha256 2cfcce810ddd48f2e5dc658d28c1808e86dcf303eaff16728b9aa3dbc0092079 libfontenc-1.1.4.tar.bz2 -sha512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582 libfontenc-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003285.html +sha256 c0d36991faee06551ddbaf5d99266e97becdc05edfae87a833c3ff7bf73cfec2 libfontenc-1.1.7.tar.xz +sha512 fd8578a81090fa938dd75ad9081ab62c6c54fa2535d1c6291afd799ac8dc7c344a43f07cea5cd4433af16df0d926c22e7c169877bc8b13d92584e7dec173d701 libfontenc-1.1.7.tar.xz # Locally computed sha256 a4dda7a643b517794bfa23dc9605da030055df38ac8a5b9e1905e690975a59c4 COPYING diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk index a55b90d680..e12086b125 100644 --- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk +++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBFONTENC_VERSION = 1.1.4 -XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.bz2 +XLIB_LIBFONTENC_VERSION = 1.1.7 +XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.xz XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBFONTENC_LICENSE = MIT XLIB_LIBFONTENC_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 20:53:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:41 -0000 Subject: [Buildroot] [git commit branch/next] package/dnsmasq: bump to version 2.88 Message-ID: <20230220205159.B07CD86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c29929c123a2e84e358a08916168d8010fbb3e9d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2022q4/016767.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/dnsmasq/dnsmasq.hash | 4 ++-- package/dnsmasq/dnsmasq.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index 78127ca714..fd015d38ac 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.87.tar.xz.asc -sha256 0228c0364a7f2356fd7e7f1549937cbf3099a78d3b2eb1ba5bb0c31e2b89de7a dnsmasq-2.87.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.88.tar.xz.asc +sha256 23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3 dnsmasq-2.88.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 46a40c4bbb..3945e4256a 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.87 +DNSMASQ_VERSION = 2.88 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" From yann.morin.1998 at free.fr Mon Feb 20 20:53:41 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:41 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xkbcomp: bump version to 1.4.6 Message-ID: <20230220205156.8B649828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38e38370277366777ba850608c38f528f152a1e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003283.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash | 7 +++---- package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash index bccaae6f57..b626e50236 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-March/003075.html -sha256 6851086c4244b6fd0cc562880d8ff193fb2bbf1e141c73632e10731b31d4b05e xkbcomp-1.4.5.tar.bz2 -sha512 2e84f8d6b083e2e818cb95e5d2a184da00e50d71b280e92d1a71465a9a4348f922f4ddccb42cfeee6f76705bbfc8580ef67aedd0d958aaa1ae6bbcc66ccd8154 xkbcomp-1.4.5.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-December/003283.html +sha256 fa50d611ef41e034487af7bd8d8c718df53dd18002f591cca16b0384afc58e98 xkbcomp-1.4.6.tar.xz +sha512 90e69dd1c78c28f77a5acc7821b43afec1b9ac4895bc6f3462b4902baaadc26f3869da69e3bd023b4bc74adb5f1be0c43ca24b3dab37ac9a479c5622684baa81 xkbcomp-1.4.6.tar.xz # Locally computed sha256 6b833fdc05906ce57f016dc791db86830d49ee4da2861ce45806c50b3f4dda9e COPYING diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk index b52f5e6850..61922c7cc9 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XKBCOMP_VERSION = 1.4.5 -XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2 +XAPP_XKBCOMP_VERSION = 1.4.6 +XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.xz XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XKBCOMP_LICENSE = MIT XAPP_XKBCOMP_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 20:53:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:42 -0000 Subject: [Buildroot] [git commit branch/next] package/botan: security bump to version 2.19.3 Message-ID: <20230220205159.9FD8C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f276188ef7967ce8332fb38fdecd98b080b7e3db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-43705: In Botan before 2.19.3, it is possible to forge OCSP responses due to a certificate verification error. This issue was introduced in Botan 1.11.34 (November 2016). https://github.com/randombit/botan/security/advisories/GHSA-4v9w-qvcq-6q7w https://github.com/randombit/botan/blob/2.19.3/news.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/botan/botan.hash | 2 +- package/botan/botan.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/botan/botan.hash b/package/botan/botan.hash index d768c669ea..64da04415e 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 3af5f17615c6b5cd8b832d269fb6cb4d54ec64f9eb09ddbf1add5093941b4d75 Botan-2.19.2.tar.xz +sha256 dae047f399c5a47f087db5d3d9d9e8f11ae4985d14c928d71da1aff801802d55 Botan-2.19.3.tar.xz # Locally computed sha256 472faf6d2231130382779f96de506be19296473750356449fc426ddc9cb03b50 license.txt diff --git a/package/botan/botan.mk b/package/botan/botan.mk index b0ebe594b1..59fbc950b0 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 2.19.2 +BOTAN_VERSION = 2.19.3 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause From yann.morin.1998 at free.fr Mon Feb 20 20:53:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:42 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXv: bump version to 1.0.12 Message-ID: <20230220205156.A17578648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc8b91fdadd8abf22035c127bcd2bbb5961cf43e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003280.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXv/xlib_libXv.hash | 6 +++--- package/x11r7/xlib_libXv/xlib_libXv.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXv/xlib_libXv.hash b/package/x11r7/xlib_libXv/xlib_libXv.hash index a6f7e3d55c..0852f27f8b 100644 --- a/package/x11r7/xlib_libXv/xlib_libXv.hash +++ b/package/x11r7/xlib_libXv/xlib_libXv.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002727.html -sha256 d26c13eac99ac4504c532e8e76a1c8e4bd526471eb8a0a4ff2a88db60cb0b088 libXv-1.0.11.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-December/003280.html +sha256 aaf7fa09f689f7a2000fe493c0d64d1487a1210db154053e9e2336b860c63848 libXv-1.0.12.tar.xz +sha512 bdd00de1ce6a8911056181ab4de32f9e319a68567389162d4bc2e3c9946d5f3c60f87eb6c53f74c9b6a342255e591d5fef4a445a4ac8ca3c1b6fe87d42c51c1e libXv-1.0.12.tar.xz # Locally calculated sha256 4fac4d581d00f11c459d68b7cb970f3d4e5a5bbfb53784d85f59a90076280301 COPYING diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk index 1105b5925d..808b1e6e7b 100644 --- a/package/x11r7/xlib_libXv/xlib_libXv.mk +++ b/package/x11r7/xlib_libXv/xlib_libXv.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXV_VERSION = 1.0.11 -XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2 +XLIB_LIBXV_VERSION = 1.0.12 +XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.xz XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXV_LICENSE = ISC-like XLIB_LIBXV_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:43 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXres: bump version to 1.2.2 Message-ID: <20230220205156.B6B10828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b6ea10c528c1c7b3f6ac7bbba7ba519974b2c3a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003278.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXres/xlib_libXres.hash | 7 +++---- package/x11r7/xlib_libXres/xlib_libXres.mk | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libXres/xlib_libXres.hash b/package/x11r7/xlib_libXres/xlib_libXres.hash index 700590ad8c..2e6d3d5c55 100644 --- a/package/x11r7/xlib_libXres/xlib_libXres.hash +++ b/package/x11r7/xlib_libXres/xlib_libXres.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-March/003078.html -sha256 b6e6fb1ebb61610e56017edd928fb89a5f53b3f4f990078309877468663b2b11 libXres-1.2.1.tar.bz2 -sha512 c17d28406e17e305dc4976f095e88059735f5bd8c600adf2e556523c9e0dd7fa01dcbf7a9d28a642e77e49a5b30f54bb9b2fc34bfbedce467ee2a020bba5cdf1 libXres-1.2.1.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-December/003278.html +sha256 9a7446f3484b9b7538ac5ee30d2c1ce9e5b7fbbaf1440e02f6cca186a1fa745f libXres-1.2.2.tar.xz +sha512 897f2d426ea6f41169a5a52c356d1a1cb2ffb9144ae41b9fedd06455c3d81042930fe55be269ce4b8545ee65fcfe168101192a599053d810e8810f627c94f810 libXres-1.2.2.tar.xz # Locally calculated sha256 0d7300168f85833ea2564835f66a61e036ede90b33e76c06a7b4078096fedbcc COPYING diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk index de3637a04a..25498090fe 100644 --- a/package/x11r7/xlib_libXres/xlib_libXres.mk +++ b/package/x11r7/xlib_libXres/xlib_libXres.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXRES_VERSION = 1.2.1 -XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2 -XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXRES_VERSION = 1.2.2 +XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.xz +XLIB_LIBXRES_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXRES_LICENSE = MIT XLIB_LIBXRES_LICENSE_FILES = COPYING XLIB_LIBXRES_CPE_ID_VENDOR = x From yann.morin.1998 at free.fr Mon Feb 20 20:53:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:43 -0000 Subject: [Buildroot] [git commit branch/next] package/libftdi1: fix static build with libusb and -latomic Message-ID: <20230220205159.E05D486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de82d57b56dd895c7eb56948c631fa30c4935a2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Use pkg-config to retrieve libusb dependencies such as -latomic and avoid the following static build failure raised since bump of libusb to version 1.0.25 in commit aad609936fc83acfe1eac6ffc86d29ac35dcf54e: /nvmedata/autobuild/instance-29/output-1/per-package/libftdi1/host/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /nvmedata/autobuild/instance-29/output-1/per-package/libftdi1/host/sparc-buildroot-linux-uclibc/sysroot/lib/libusb-1.0.a(core.o): in function `libusb_unref_device': /nvmedata/autobuild/instance-29/output-1/build/libusb-1.0.25/libusb/core.c:1186: undefined reference to `__atomic_fetch_add_4' Fixes: - http://autobuild.buildroot.org/results/1ca7cd85ae60ad4797a6d8a83b2fb51d7eab96d9 Signed-off-by: Fabrice Fontaine Reviewed-by: Yegor Yefremov Signed-off-by: Yann E. MORIN --- ...txt-fix-static-build-with-libusb-and-lato.patch | 47 ++++++++++++++++++++++ package/libftdi1/libftdi1.mk | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch b/package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch new file mode 100644 index 0000000000..c818c58d68 --- /dev/null +++ b/package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch @@ -0,0 +1,47 @@ +From b5b8fab6063ad90bb5ef05a72708ecde1796bc81 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 13 May 2022 18:11:50 +0200 +Subject: [PATCH] CMakeLists.txt: fix static build with libusb and -latomic + +Use pkg-config to retrieve libusb dependencies such as -latomic and +avoid the following static build failure: + +/nvmedata/autobuild/instance-29/output-1/per-package/libftdi1/host/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /nvmedata/autobuild/instance-29/output-1/per-package/libftdi1/host/sparc-buildroot-linux-uclibc/sysroot/lib/libusb-1.0.a(core.o): in function `libusb_unref_device': +/nvmedata/autobuild/instance-29/output-1/build/libusb-1.0.25/libusb/core.c:1186: undefined reference to `__atomic_fetch_add_4' + +Fixes: + - http://autobuild.buildroot.org/results/1ca7cd85ae60ad4797a6d8a83b2fb51d7eab96d9 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +http://developer.intra2net.com/git/?p=libftdi;a=commit;h=b5b8fab6063ad90bb5ef05a72708ecde1796bc81] +--- + CMakeLists.txt | 12 ++++++++++-- + 1 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 58f664a..d20aa94 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,8 +25,16 @@ if(${CMAKE_BUILD_TYPE} STREQUAL Debug) + endif(${CMAKE_BUILD_TYPE} STREQUAL Debug) + + # find libusb +-find_package ( USB1 REQUIRED ) +-include_directories ( ${LIBUSB_INCLUDE_DIR} ) ++find_package( PkgConfig ) ++if (PkgConfig_FOUND) ++ pkg_check_modules( LIBUSB libusb-1.0 ) ++ if (LIBUSB_FOUND) ++ include_directories ( ${LIBUSB_INCLUDE_DIRS} ) ++ else() ++ find_package ( USB1 REQUIRED ) ++ include_directories ( ${LIBUSB_INCLUDE_DIR} ) ++ endif() ++endif() + + # Find Boost + if (FTDIPP OR BUILD_TESTS) +-- +1.7.1 + diff --git a/package/libftdi1/libftdi1.mk b/package/libftdi1/libftdi1.mk index d2e3f42e14..66798addc4 100644 --- a/package/libftdi1/libftdi1.mk +++ b/package/libftdi1/libftdi1.mk @@ -8,7 +8,7 @@ LIBFTDI1_VERSION = 1.5 LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2 LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download LIBFTDI1_INSTALL_STAGING = YES -LIBFTDI1_DEPENDENCIES = libusb +LIBFTDI1_DEPENDENCIES = host-pkgconf libusb LIBFTDI1_LICENSE = LGPL-2.1 (libftdi1), MIT (libftdi1) LIBFTDI1_LICENSE_FILES = LICENSE COPYING.LIB LIBFTDI1_CONFIG_SCRIPTS = libftdi1-config From yann.morin.1998 at free.fr Mon Feb 20 20:53:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:44 -0000 Subject: [Buildroot] [git commit branch/next] package/optee-client: bump to version 3.19.0 Message-ID: <20230220205200.1101886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=917a961d9c77d5f1aaa47206add9b9ff80e74a82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bumps OP-TEE client package version to OP-TEE release 3.19.0. This package introduces a mandatory dependency on util-linux and pk-config packages that were made optional in commit [1], following 3.19.0 release tag. The dependency is related to new library teeacl for access control list based login identification. This change picks that commit and defines the dependency only when TEEACL library is to be embedded. The patch will be removed once we dump to the next OP-TEE release tag, as state by new BR2 boolean config switch BR2_PACKAGE_OPTEE_CLIENT_TEEACL. Signed-off-by: Etienne Carriere [yann.morin.1998 at free.fr: - actually backport upstream commit - don't default y for BR2_PACKAGE_OPTEE_CLIENT_TEEACL - select util-linux instead of depending on it - don't select util-linux-libs, there's no circular deps - squash both conditions together in .mk - fix check-package ] Signed-off-by: Yann E. MORIN --- ...eacl-condition-libteeacl-with-WITH_TEEACL.patch | 105 +++++++++++++++++++++ package/optee-client/Config.in | 8 ++ package/optee-client/optee-client.hash | 4 +- package/optee-client/optee-client.mk | 9 +- 4 files changed, 123 insertions(+), 3 deletions(-) diff --git a/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch b/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch new file mode 100644 index 0000000000..4fdf9afc94 --- /dev/null +++ b/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch @@ -0,0 +1,105 @@ +From bbdf665aba39c29a3ce7bd06e4554c62a416ebaa Mon Sep 17 00:00:00 2001 +From: Etienne Carriere +Date: Thu, 10 Nov 2022 12:05:24 +0100 +Subject: [PATCH] libteeacl: condition libteeacl with WITH_TEEACL + +Build and embed libteeacl upon WITH_TEEACL=1 (default configuration). +This configuration switch allows one to build OP-TEE client without +dependencies on pkg-config and libuuid when OP-TEE ACL for +PKCS11 is not needed: + cmake -DWITH_TEEACL=0 ... +or + make WITH_TEEACL=0 ... + +With the comments below addressed, LGTM. + +Acked-by: Jerome Forissier +Acked-by: Jens Wiklander +Reviewed-by: Eero Aaltonen +[etienne.carriere at linaro.org: backport upstream commit] +Signed-off-by: Etienne Carriere +[yann.morin.1998 at free.fr: actually do a backport of bbdf665] +Signed-off-by: Yann E. MORIN +--- + CMakeLists.txt | 9 ++++++--- + Makefile | 15 ++++++++++++--- + 2 files changed, 18 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0786752..9fb5c6a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,7 @@ project (optee_client C) + set (CMAKE_TOOLCHAIN_FILE CMakeToolchain.txt) + + set (CFG_WERROR 1 CACHE BOOL "Build with -Werror") ++option (WITH_TEEACL "Build libteeacl" TRUE) + + include(GNUInstallDirs) + +@@ -37,7 +38,9 @@ add_subdirectory (libteec) + add_subdirectory (tee-supplicant) + add_subdirectory (public) + add_subdirectory (libckteec) +-find_package (PkgConfig REQUIRED) +-pkg_check_modules(uuid REQUIRED IMPORTED_TARGET uuid) +-add_subdirectory (libteeacl) ++if(WITH_TEEACL) ++ find_package (PkgConfig REQUIRED) ++ pkg_check_modules(uuid REQUIRED IMPORTED_TARGET uuid) ++ add_subdirectory (libteeacl) ++endif(WITH_TEEACL) + add_subdirectory (libseteec) +diff --git a/Makefile b/Makefile +index 90b487e..2ee5621 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,6 +16,8 @@ SBINDIR ?= /usr/sbin + LIBDIR ?= /usr/lib + INCLUDEDIR ?= /usr/include + ++WITH_TEEACL ?= 1 ++ + .PHONY: all build build-libteec build-libckteec build-libseteec \ + build-libteeacl check-libuuid install copy_export clean cscope \ + clean-cscope \ +@@ -35,8 +37,10 @@ build-tee-supplicant: build-libteec + @echo "Building tee-supplicant" + $(MAKE) --directory=tee-supplicant --no-print-directory --no-builtin-variables CFG_TEE_SUPP_LOG_LEVEL=$(CFG_TEE_SUPP_LOG_LEVEL) + +-build: build-libteec build-tee-supplicant build-libckteec build-libseteec \ +- build-libteeacl ++build: build-libteec build-tee-supplicant build-libckteec build-libseteec ++ifeq ($(WITH_TEEACL),1) ++build: build-libteeacl ++endif + + build-libckteec: build-libteec + @echo "Building libckteec.so" +@@ -57,7 +61,10 @@ check-libuuid: + install: copy_export + + clean: clean-libteec clean-tee-supplicant clean-cscope clean-libckteec \ +- clean-libseteec clean-libteeacl ++ clean-libseteec ++ifeq ($(WITH_TEEACL),1) ++clean: clean-libteeacl ++endif + + clean-libteec: + @$(MAKE) --directory=libteec --no-print-directory clean +@@ -158,9 +165,11 @@ copy_export: build + cp libckteec/include/*.h $(DESTDIR)$(INCLUDEDIR) + cp -d ${O}/libckteec/libckteec.so* $(DESTDIR)$(LIBDIR) + cp -d ${O}/libckteec/libckteec.a $(DESTDIR)$(LIBDIR) ++ifeq ($(WITH_TEEACL),1) + cp libteeacl/include/*.h $(DESTDIR)$(INCLUDEDIR) + cp -d ${O}/libteeacl/libteeacl.so* $(DESTDIR)$(LIBDIR) + cp -d ${O}/libteeacl/libteeacl.a $(DESTDIR)$(LIBDIR) ++endif + cp libseteec/include/*.h $(DESTDIR)$(INCLUDEDIR) + cp -d ${O}/libseteec/libseteec.so* $(DESTDIR)$(LIBDIR) + cp -d ${O}/libseteec/libseteec.a $(DESTDIR)$(LIBDIR) +-- +2.25.1 + diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in index cc7f176c77..538948b72c 100644 --- a/package/optee-client/Config.in +++ b/package/optee-client/Config.in @@ -37,6 +37,14 @@ config BR2_PACKAGE_OPTEE_CLIENT_SUPP_PLUGINS help Enable TEE supplicant plugin support. +config BR2_PACKAGE_OPTEE_CLIENT_TEEACL + bool "Enable TEE Access Control List login" + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Enable TEE ACL login identification for OP-TEE service that + supports them as OP-TEE PKCS#11 services. + endif comment "optee-client needs a toolchain w/ threads, headers >= 4.3" diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 8e55bf5725..c067e26f4e 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.18.0/optee-client-3.18.0.tar.gz -sha256 ecc0f04fdd5398aa52fea50427fbd624f7f90274aec7bbf2cc8a5bd16758202b optee-client-3.18.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.19.0/optee-client-3.19.0.tar.gz +sha256 5f0d02efa0e496964e86ca9dd2461ada923d1f9e11a4b9cafb5393bd08337644 optee-client-3.19.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 3fbbe9484c..3e0c9269b8 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.18.0 +OPTEE_CLIENT_VERSION = 3.19.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE @@ -26,6 +26,13 @@ else OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF endif +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y) +OPTEE_CLIENT_EXT_DEPENDENCIES += host-pkgconf util-linux-libs +OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=ON +else +OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=OFF +endif + define OPTEE_CLIENT_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30tee-supplicant \ $(TARGET_DIR)/etc/init.d/S30tee-supplicant From yann.morin.1998 at free.fr Mon Feb 20 20:53:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:45 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXdamage: bump version to 1.1.6 Message-ID: <20230220205156.C1BD08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bac3d21a3fb3ef872b538adda01725c2fb77dd75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003277.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXdamage/xlib_libXdamage.hash | 8 +++----- package/x11r7/xlib_libXdamage/xlib_libXdamage.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash b/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash index 9e7cf566a7..41a809ad23 100644 --- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash +++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002973.html -md5 e3f554267a7a04b042dc1f6352bd6d99 libXdamage-1.1.5.tar.bz2 -sha1 719ae6ab8c1b972c6386b654976c479255af5572 libXdamage-1.1.5.tar.bz2 -sha256 b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45 libXdamage-1.1.5.tar.bz2 -sha512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124 libXdamage-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003277.html +sha256 52733c1f5262fca35f64e7d5060c6fcd81a880ba8e1e65c9621cf0727afb5d11 libXdamage-1.1.6.tar.xz +sha512 624dcefa1c79064569df952892f7f1351dc19ad338ce73d1a57041e406cb3e18abe531bab352b93d1f0f5c9b5c6b2652cc84a8f1fbfcbba648343812695a8acb libXdamage-1.1.6.tar.xz # Locally computed sha256 33effe928634be12e668465c3935c5570ff2787b970b15d9243d69df42302c57 COPYING diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk index cc5493ff6c..dba0862211 100644 --- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk +++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXDAMAGE_VERSION = 1.1.5 -XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.bz2 -XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXDAMAGE_VERSION = 1.1.6 +XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.xz +XLIB_LIBXDAMAGE_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXDAMAGE_LICENSE = MIT XLIB_LIBXDAMAGE_LICENSE_FILES = COPYING XLIB_LIBXDAMAGE_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:53:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:45 -0000 Subject: [Buildroot] [git commit branch/next] package/gnuradio: restrict gcc to >= 8 Message-ID: <20230220205200.416BC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34cea39024bf8dedaa071bc5f2d903755501215c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next With gnuradio 3.10 boost/filesystem was replaced by std::filesystem. This feature was introduced with gcc 8 (requirering -lstdc++fs (with gcc 9 explicit -lstdc++fs is no more explicitely required)). With gcc < 8 build fails with error: In file included from /home/br-user/work/instance-0/output-1/host/aarch64_be-buildroot-linux-gnu/sysroot/usr/include/boost/dll/runtime_symbol_info.hpp:11:0, from /home/br-user/work/instance-0/output-1/build/gnuradio-3.10.4.0/buildroot-build/gnuradio-runtime/lib/constants.cc:16: /home/br-user/work/instance-0/output-1/host/aarch64_be-buildroot-linux-gnu/sysroot/usr/include/boost/dll/config.hpp:42:10: fatal error: filesystem: No such file or directory #include ^~~~~~~~~~~~ compilation terminated. Add a dependency to gcc >= 8. BR2_TOOLCHAIN_HAS_GCC_BUG_64735 only affects gcc <7, so we drop it. Adding this restriction on gcc >= 8 also covers the dependency for volk, which requires gcc >= 7, which was not propagated to gnuradio so far. Tested with bootlin toolchain 2020.02-2 (gcc 8.3.0) Fixes: - http://autobuild.buildroot.net/results/6a82605c58f9ef9eb6c14603777dd8523dd00aa5/ - http://autobuild.buildroot.net/results/c7c4ae76954e388ab639b39fd521d90acfe4edc9/ Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Yann E. MORIN --- package/gnuradio/Config.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index de19732cfb..1824589263 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -1,12 +1,12 @@ -comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library" +comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 -comment "gnuradio needs a toolchain not affected by GCC bug 43744 and 64735" +comment "gnuradio needs a toolchain not affected by GCC bug 43744" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 config BR2_PACKAGE_GNURADIO bool "gnuradio" @@ -16,8 +16,8 @@ config BR2_PACKAGE_GNURADIO depends on BR2_USE_MMU # use fork() depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic, boost-thread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744 - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_DATE_TIME From yann.morin.1998 at free.fr Mon Feb 20 20:53:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:46 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-r128: bump version to 6.12.1 Message-ID: <20230220205156.D673086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4df6b365b77c3838858b43c201f0e2af4db7a498 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003275.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash | 8 +++----- package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash index 455c3d4439..cf9b21ebe8 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-October/002926.html -md5 105ebcfe1bac06fe84645ac3def91184 xf86-video-r128-6.12.0.tar.bz2 -sha1 7cfa41d386fa43b5d30299203e4845d8afba4899 xf86-video-r128-6.12.0.tar.bz2 -sha256 801c86882cbd2bbb3084d471dcc5cfee2c1754dcbfb4dc446676d58a6bd9e057 xf86-video-r128-6.12.0.tar.bz2 -sha512 0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38 xf86-video-r128-6.12.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003275.html +sha256 7d023c2b171f1664e43d12a1d21674079d8065536f82bb95b448bfce4981c741 xf86-video-r128-6.12.1.tar.xz +sha512 18b2408fe68161c32f84c7147717f8e6c6377e81e9d59e2f098843c54cd0ae757aab5059568da8c71ef38100807d56ee22447417c236c1b3deea292bb676e700 xf86-video-r128-6.12.1.tar.xz # Locally computed sha256 69f7c71859dc8f51aabdbe7a9ee915a480933eb81658f8af2bf4c918e65afe8b COPYING diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk index 1931dbecd7..49514e3d3a 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_R128_VERSION = 6.12.0 -XDRIVER_XF86_VIDEO_R128_SOURCE = xf86-video-r128-$(XDRIVER_XF86_VIDEO_R128_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_R128_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_R128_VERSION = 6.12.1 +XDRIVER_XF86_VIDEO_R128_SOURCE = xf86-video-r128-$(XDRIVER_XF86_VIDEO_R128_VERSION).tar.xz +XDRIVER_XF86_VIDEO_R128_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_R128_LICENSE = MIT XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xorgproto From yann.morin.1998 at free.fr Mon Feb 20 20:53:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:46 -0000 Subject: [Buildroot] [git commit branch/next] package/optee-test: bump to version 3.19.0 Message-ID: <20230220205200.291E686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4744cfb703908eb027e479633508fc498fda667e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bumps OP-TEE test package version to OP-TEE release 3.19.0. Signed-off-by: Etienne Carriere Signed-off-by: Yann E. MORIN --- 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 2af1768155..4da3807bb5 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.18.0/optee-test-3.18.0.tar.gz -sha256 cc36a9afb99bd299a3d3769ad634ab7d5cb0e27c84ad04e14c0ff593db0f3faf optee-test-3.18.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.19.0/optee-test-3.19.0.tar.gz +sha256 9435901e9329a25ef4de3904e27d80377b8bb4dd6b215e8fb29d66a7b76afa11 optee-test-3.19.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 d522bb3300..7b065b6123 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.18.0 +OPTEE_TEST_VERSION = 3.19.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 Mon Feb 20 20:53:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:46 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xstdcmap: bump version to 1.0.5 Message-ID: <20230220205156.EF8198648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=481860051016bbaab467621e5651500327f4f004 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003272.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash | 8 +++----- package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash index 3f601c7249..028980bdca 100644 --- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash +++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002954.html -md5 da67142c128d18386ff145882e0afc66 xstdcmap-1.0.4.tar.bz2 -sha1 a5eff72ba31625e5b11506add800140019a39636 xstdcmap-1.0.4.tar.bz2 -sha256 06898b3f1eaad0b205ff3c75bdefa3207868b889d4cb37b32b8267b2bbfe6f8b xstdcmap-1.0.4.tar.bz2 -sha512 2adbb0aec1766341e04090efa962241ff6c9e32c612851b7221cec0ee16852107d406a08ec5251070f39df882c13e3c8c9edcd88f278187a9f373e1727643a8f xstdcmap-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003272.html +sha256 365847e379398499ec9ad9a299cc47a0d6e7feba9546dfd4e5b422204b5ac180 xstdcmap-1.0.5.tar.xz +sha512 3f2047af1d328a34d38ededc13de00298db3300eab1d1dbdff7d2aa4a3cd543a79305bfbd2e6424c5e023cf866a4f7a70aa9a3014444d543268d2f812a322a49 xstdcmap-1.0.5.tar.xz # Locally computed sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk index dd5b0ee349..60825556e7 100644 --- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk +++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XSTDCMAP_VERSION = 1.0.4 -XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.bz2 -XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XSTDCMAP_VERSION = 1.0.5 +XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.xz +XAPP_XSTDCMAP_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XSTDCMAP_LICENSE = MIT XAPP_XSTDCMAP_LICENSE_FILES = COPYING XAPP_XSTDCMAP_DEPENDENCIES = xlib_libX11 xlib_libXmu From peter at korsgaard.com Mon Feb 20 20:53:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:47 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.02.8 Message-ID: <20230220205200.7006886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e84a88e8e2ed7873fbf5362d2d8b5bcd75634af7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard (cherry picked from commit ea51485ee9ab44f72f8b1cc019dcb17f276d1def) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGES b/CHANGES index 312e324ef7..6de79c7d35 100644 --- a/CHANGES +++ b/CHANGES @@ -530,6 +530,22 @@ #14731: BR2_PACKAGE_IOSTAT #14751: LVM2 Outdated Link +2022.02.8, released December 10th, 2022 + + Important / security related fixes. + + Updated/fixed packages: asterisk, dash, dovecot, + dovecot-pigeonhole, edk2, edk2-platforms, elf2flt, exim, + freerdp, gcc, gdb, git, gnupg2, heimdal, iwd, kodi, + libarchive, libmdbx, libkrb5, libksba, libopenssl, memcached, + netsnmp, nginx, openpgm, optee-client, python3, rsync, + rtl8723bu, samba4, sdl, sdl2, swupdate, sysstat, systemd, + uboot, vim, vlc, xen, xterm + + Issues resolved (http://bugs.uclibc.org): + + #15131: Target GDB uses internal zlib + 2022.02.7, released November 17th, 2022 Important / security related fixes. From yann.morin.1998 at free.fr Mon Feb 20 20:53:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:47 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xrandr: bump version to 1.5.2 Message-ID: <20230220205157.14F6C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=835918d8e8e34ee298580c4da5e57bf0f925f708 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003270.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xrandr/xapp_xrandr.hash | 8 +++----- package/x11r7/xapp_xrandr/xapp_xrandr.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.hash b/package/x11r7/xapp_xrandr/xapp_xrandr.hash index 4c68dcbb71..a407326bb8 100644 --- a/package/x11r7/xapp_xrandr/xapp_xrandr.hash +++ b/package/x11r7/xapp_xrandr/xapp_xrandr.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-August/003018.html -md5 fe40f7a4fd39dd3a02248d3e0b1972e4 xrandr-1.5.1.tar.xz -sha1 9f72957e0d2a26ece509336ea7e1529cc9ea881e xrandr-1.5.1.tar.xz -sha256 7bc76daf9d72f8aff885efad04ce06b90488a1a169d118dea8a2b661832e8762 xrandr-1.5.1.tar.xz -sha512 3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922 xrandr-1.5.1.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003270.html +sha256 c8bee4790d9058bacc4b6246456c58021db58a87ddda1a9d0139bf5f18f1f240 xrandr-1.5.2.tar.xz +sha512 b536e8f1e04094894aa52ae496725c58691b043860b3327c41d737b07b642a939733321b62f698032b11ba857208a6177600a3ca3295ff1be6ade4341cdc2747 xrandr-1.5.2.tar.xz # Locally computed sha256 0dd9a3d62c48dd7b87790029e39fb5e11756d33fded3bc1644e11585c87b2038 COPYING diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk index 8586c6feb3..d6b39b51d0 100644 --- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk +++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XRANDR_VERSION = 1.5.1 +XAPP_XRANDR_VERSION = 1.5.2 XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.xz -XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XRANDR_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XRANDR_LICENSE = MIT XAPP_XRANDR_LICENSE_FILES = COPYING XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11 From yann.morin.1998 at free.fr Mon Feb 20 20:53:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:50 -0000 Subject: [Buildroot] [git commit branch/next] package/davfs2: bump to version 1.7.0 Message-ID: <20230220205200.CBE2C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76423bd3a657f0ca197e2301bbb21e4fc9eee992 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://savannah.nongnu.org/forum/forum.php?forum_id=10244 https://git.savannah.nongnu.org/cgit/davfs2.git/tree/ChangeLog?h=rel-1-7-0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/davfs2/davfs2.hash | 2 +- package/davfs2/davfs2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/davfs2/davfs2.hash b/package/davfs2/davfs2.hash index a555779dbc..1cbacc388f 100644 --- a/package/davfs2/davfs2.hash +++ b/package/davfs2/davfs2.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ce3eb948ece582a51c934ccb0cc70e659839172717caff173f69a5e2af90c5c0 davfs2-1.6.1.tar.gz +sha256 251db75a27380cca1330b1b971700c5e5dcc0c90e5a47622285f0140edfe3a2f davfs2-1.7.0.tar.gz # License file, locally calculated sha256 0ae0485a5bd37a63e63603596417e4eb0e653334fa6c7f932ca3a0e85d4af227 COPYING diff --git a/package/davfs2/davfs2.mk b/package/davfs2/davfs2.mk index 42192faa59..a67c506250 100644 --- a/package/davfs2/davfs2.mk +++ b/package/davfs2/davfs2.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAVFS2_VERSION = 1.6.1 +DAVFS2_VERSION = 1.7.0 DAVFS2_SITE = http://download.savannah.nongnu.org/releases/davfs2 DAVFS2_LICENSE = GPL-3.0+ DAVFS2_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:50 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xdm: bump version to 1.1.14 Message-ID: <20230220205157.4D2498648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42c8fe191473193c0854bd8a641c046d4f149a97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003265.html xlib_libXinerama is an optional dependency now. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xdm/Config.in | 1 - package/x11r7/xapp_xdm/xapp_xdm.hash | 6 +++--- package/x11r7/xapp_xdm/xapp_xdm.mk | 12 +++++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xapp_xdm/Config.in b/package/x11r7/xapp_xdm/Config.in index af816a1349..1ac15ce368 100644 --- a/package/x11r7/xapp_xdm/Config.in +++ b/package/x11r7/xapp_xdm/Config.in @@ -8,7 +8,6 @@ config BR2_PACKAGE_XAPP_XDM select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAW select BR2_PACKAGE_XLIB_LIBXDMCP - select BR2_PACKAGE_XLIB_LIBXINERAMA select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XORGPROTO help diff --git a/package/x11r7/xapp_xdm/xapp_xdm.hash b/package/x11r7/xapp_xdm/xapp_xdm.hash index 5ba3a3f062..daf1b0852f 100644 --- a/package/x11r7/xapp_xdm/xapp_xdm.hash +++ b/package/x11r7/xapp_xdm/xapp_xdm.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003148.html -sha256 e58267e8f1478f2f5cd57cbcf2367a36973860c3131a450a3e0816585af03264 xdm-1.1.13.tar.xz -sha512 1c7ba51dc8c6989ff6ede3a3abd06e002903609d4ebd31f06ec39fbfee3a80a690c6180f85c3ab135a0de4623261d92a191d1ca5f733cdb3bd2e7e78977b98e5 xdm-1.1.13.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003265.html +sha256 3e9bf25636797ec9e595286dd6820ecc33901439f07705eaf608ecda012c3d5f xdm-1.1.14.tar.xz +sha512 8ed1d2c946916c24cb4b2de9326f65629c97e53b145312c9cb9c6e4308d8b47d67d3981319fbd4feac9b3ed436b9dfb24a1c905d37d7bcf07b49c18a68c7a6e4 xdm-1.1.14.tar.xz # Locally computed sha256 b33b4bebbd6511b3e15315e8e29d67f25334ee45da8b7da6e6e97c53a70c6923 COPYING diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk index 98306f66f5..035f2e9484 100644 --- a/package/x11r7/xapp_xdm/xapp_xdm.mk +++ b/package/x11r7/xapp_xdm/xapp_xdm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDM_VERSION = 1.1.13 +XAPP_XDM_VERSION = 1.1.14 XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.xz -XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDM_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDM_LICENSE = MIT XAPP_XDM_LICENSE_FILES = COPYING XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes @@ -16,7 +16,6 @@ XAPP_XDM_DEPENDENCIES = \ xlib_libX11 \ xlib_libXaw \ xlib_libXdmcp \ - xlib_libXinerama \ xlib_libXt \ xorgproto XAPP_XDM_CONF_OPTS = \ @@ -24,6 +23,13 @@ XAPP_XDM_CONF_OPTS = \ --with-utmp-file=/var/adm/utmpx \ --with-wtmp-file=/var/adm/wtmpx +ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) +XAPP_XDM_CONF_OPTS += --with-xinerama +XAPP_XDM_DEPENDENCIES += xlib_libXinerama +else +XAPP_XDM_CONF_OPTS += --without-xinerama +endif + define XAPP_XDM_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/x11r7/xapp_xdm/S99xdm \ $(TARGET_DIR)/etc/init.d/S99xdm From yann.morin.1998 at free.fr Mon Feb 20 20:53:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:51 -0000 Subject: [Buildroot] [git commit branch/next] package/python-installer: bump to version 0.6.0 Message-ID: <20230220205200.D90E086496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=689649251ff598adb79df393353d7fa1ea14f364 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 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 543bd0fa62..97d455b87c 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 bf17db5e6b58c4cfa33642f5348d3814 installer-0.5.1.tar.gz -sha256 f970995ec2bb815e2fdaf7977b26b2091e1e386f0f42eafd5ac811953dc5d445 installer-0.5.1.tar.gz +md5 ac5fee994b04f228c151306f5ad96b04 installer-0.6.0.tar.gz +sha256 f3bd36cd261b440a88a1190b1becca0578fee90b4b62decc796932fdd5ae8839 installer-0.6.0.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 08f17499dd..3430e46b51 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INSTALLER_VERSION = 0.5.1 +PYTHON_INSTALLER_VERSION = 0.6.0 PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz -PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 +PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/c9/ab/a9141dc175ec7b620fffe7e0295251a7b6a0ffb4325d64aeb128dff8c698 PYTHON_INSTALLER_LICENSE = MIT PYTHON_INSTALLER_LICENSE_FILES = LICENSE PYTHON_INSTALLER_SETUP_TYPE = flit-bootstrap From yann.morin.1998 at free.fr Mon Feb 20 20:53:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:52 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXpm: bump version to 3.5.14 Message-ID: <20230220205157.7148B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d2fff78049392f2dae82f5ea9f5a0dbac225f4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003261.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 8 +++----- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index edfdaab335..9ccfb4c8de 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,8 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-December/003034.html -md5 6f0ecf8d103d528cfc803aa475137afa libXpm-3.5.13.tar.bz2 -sha1 38b1a2728adb49f4e255aba1530f51789815ffc4 libXpm-3.5.13.tar.bz2 -sha256 9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25 libXpm-3.5.13.tar.bz2 -sha512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5 libXpm-3.5.13.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003261.html +sha256 f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2 libXpm-3.5.14.tar.xz +sha512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz # Locally calculated sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 7b645dc9e6..417dcfec38 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.13 -XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2 -XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXPM_VERSION = 3.5.14 +XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz +XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project From yann.morin.1998 at free.fr Mon Feb 20 20:53:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:52 -0000 Subject: [Buildroot] [git commit branch/next] package/ulogd: bump to version 2.0.8 Message-ID: <20230220205200.C0A8286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6fc4b59ffd3007ca9e436d33647acc5dfff62970 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patch (already in version) - Update configure options due to https://git.netfilter.org/ulogd2/commit/?id=794f0385ab60fd8c52ff3ce498c8aac78b58ac20 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-ulogd-fix-build-with-musl-libc.patch | 32 ---------------------- package/ulogd/ulogd.hash | 6 ++-- package/ulogd/ulogd.mk | 26 +++++++++--------- 3 files changed, 15 insertions(+), 49 deletions(-) diff --git a/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch b/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch deleted file mode 100644 index af6e13648c..0000000000 --- a/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 675e762091380590f78ff07a94a25caa459b786b Mon Sep 17 00:00:00 2001 -From: Cameron Norman -Date: Sat, 27 Oct 2018 13:05:45 -0700 -Subject: ulogd: fix build with musl libc - -The attached patch fixes building ulogd2 with musl libc. It is being -used on Void Linux right now. - -Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1278 -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Fabrice Fontaine -[Retrrieved from: -https://git.netfilter.org/ulogd2/commit/?id=675e762091380590f78ff07a94a25caa459b786b] ---- - src/ulogd.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ulogd.c b/src/ulogd.c -index b8bc57c..9cd64e8 100644 ---- a/src/ulogd.c -+++ b/src/ulogd.c -@@ -65,6 +65,7 @@ - #include - #include - #include -+#include - #include - #include - #ifdef DEBUG --- -cgit v1.2.1 - diff --git a/package/ulogd/ulogd.hash b/package/ulogd/ulogd.hash index 0e07a714ee..35b518b9ce 100644 --- a/package/ulogd/ulogd.hash +++ b/package/ulogd/ulogd.hash @@ -1,7 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.7.tar.bz2.{md5sum,sha1sum} -md5 2bb2868cf51acbb90c35763c9f995f31 ulogd-2.0.7.tar.bz2 -sha1 f2d90469e2842e2bfbe19c55cf6d56ac107aa4b9 ulogd-2.0.7.tar.bz2 +# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.8.tar.bz2.sha256sum +sha256 4ead6c3970c3f57fa1e89fe2d7cc483ba6fe2bd1b08701521e0b3afd667df291 ulogd-2.0.8.tar.bz2 # Locally calculated -sha256 990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b ulogd-2.0.7.tar.bz2 sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index c00a53f3d5..65280a2ba6 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -4,10 +4,10 @@ # ################################################################################ -ULOGD_VERSION = 2.0.7 +ULOGD_VERSION = 2.0.8 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files -ULOGD_CONF_OPTS = --without-dbi +ULOGD_CONF_OPTS = --disable-dbi ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ libnfnetlink @@ -18,39 +18,39 @@ ULOGD_SELINUX_MODULES = ulogd # DB backends need threads ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) ifeq ($(BR2_PACKAGE_MYSQL),y) -ULOGD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr +ULOGD_CONF_OPTS += --enable-mysql ULOGD_DEPENDENCIES += mysql else -ULOGD_CONF_OPTS += --without-mysql +ULOGD_CONF_OPTS += --disable-mysql endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) -ULOGD_CONF_OPTS += --with-pgsql +ULOGD_CONF_OPTS += --enable-pgsql ULOGD_DEPENDENCIES += postgresql else -ULOGD_CONF_OPTS += --without-pgsql +ULOGD_CONF_OPTS += --disable-pgsql endif ifeq ($(BR2_PACKAGE_SQLITE),y) -ULOGD_CONF_OPTS += --with-sqlite +ULOGD_CONF_OPTS += --enable-sqlite3 ULOGD_DEPENDENCIES += sqlite else -ULOGD_CONF_OPTS += --without-sqlite +ULOGD_CONF_OPTS += --disable-sqlite3 endif else -ULOGD_CONF_OPTS += --without-mysql --without-pgsql --without-sqlite +ULOGD_CONF_OPTS += --disable-mysql --disable-pgsql --disable-sqlite3 endif ifeq ($(BR2_PACKAGE_LIBPCAP),y) -ULOGD_CONF_OPTS += --with-pcap +ULOGD_CONF_OPTS += --enable-pcap ULOGD_DEPENDENCIES += libpcap else -ULOGD_CONF_OPTS += --without-pcap +ULOGD_CONF_OPTS += --disable-pcap endif ifeq ($(BR2_PACKAGE_JANSSON),y) -ULOGD_CONF_OPTS += --with-jansson +ULOGD_CONF_OPTS += --enable-json ULOGD_DEPENDENCIES += jansson else -ULOGD_CONF_OPTS += --without-jansson +ULOGD_CONF_OPTS += --disable-json endif $(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:53:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:53 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXdmcp: bump version to 1.1.4 Message-ID: <20230220205157.7C82281979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=723eff5808451188ddc097aafc17e6969b849e57 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003260.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash | 8 +++----- package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash index 9f7f968350..83609413fd 100644 --- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash +++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002974.html -md5 115c5c12ecce0e749cd91d999a5fd160 libXdmcp-1.1.3.tar.bz2 -sha1 0a8f8a274f829331efb1e8e2027c38631b204dd0 libXdmcp-1.1.3.tar.bz2 -sha256 20523b44aaa513e17c009e873ad7bbc301507a3224c232610ce2e099011c6529 libXdmcp-1.1.3.tar.bz2 -sha512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec libXdmcp-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003260.html +sha256 2dce5cc317f8f0b484ec347d87d81d552cdbebb178bd13c5d8193b6b7cd6ad00 libXdmcp-1.1.4.tar.xz +sha512 83b384d43bfb034c395f83f97d1c6e73aa3d5faa8f8756b08e697c0b9c3c87189651b51e8213fbd1f5f9cbc2d8136cbf143627481744345d78cfe0ff2ad074a9 libXdmcp-1.1.4.tar.xz # Locally computed sha256 8a3c3f35b0dbcb60a4e242b9e4394a352a65bb27deb2938ea1e2e62a626e16e9 COPYING diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk index 51db9908e5..a79e2615db 100644 --- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk +++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXDMCP_VERSION = 1.1.3 -XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2 -XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXDMCP_VERSION = 1.1.4 +XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.xz +XLIB_LIBXDMCP_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXDMCP_LICENSE = MIT XLIB_LIBXDMCP_LICENSE_FILES = COPYING XLIB_LIBXDMCP_CPE_ID_VENDOR = x.org From yann.morin.1998 at free.fr Mon Feb 20 20:53:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:53 -0000 Subject: [Buildroot] [git commit branch/next] package/python-can: bump to version 4.1.0 Message-ID: <20230220205201.182B4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09c966af735ca53b447f52965d123c21e43ae522 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop spurious setuptools runtime dependency. Add new msgpack runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-can/Config.in | 2 +- package/python-can/python-can.hash | 5 +++-- package/python-can/python-can.mk | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index e92d9668e0..5d21e29d88 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_AENUM # runtime + select BR2_PACKAGE_PYTHON_MSGPACK # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime select BR2_PACKAGE_PYTHON_WRAPT # runtime diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index dd8a9b107d..73be230201 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/python-can -sha256 59d92846ffb981e634e9e0f2d14a6b4967a875e3869bd2ba168c92c4db6b8b5d python-can-4.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/python-can/json +md5 d8365b7a09e49f47dac0da75d8518808 python-can-4.1.0.tar.gz +sha256 3f2b6b0dc5f459591d171ee0c0136dce79acedc2740ce695024aa3444e911bb9 python-can-4.1.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 9284a9cf99..ba98337d5d 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 4.0.0 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/1f/f7/a643cba269d59e108fe4c1854a8e71d5cdadadd4de1b9c8862b190171122 +PYTHON_CAN_VERSION = 4.1.0 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/90/55/898e69e37d5d4692bf21ba8750e095493d2ecbb29be7394d5cb735f0ab0f PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Mon Feb 20 20:53:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:54 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xlsatoms: bump version to 1.1.4 Message-ID: <20230220205157.926BC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b0c8c6aee402bc6e9128bc8bb535ad1ef1f2fc5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003258.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash | 8 +++----- package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash index 21484fdcdf..be9ed6f0b4 100644 --- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash +++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002951.html -md5 61671fee12535347db24ec3a715032a7 xlsatoms-1.1.3.tar.bz2 -sha1 9fdb1e8df6bb08529a812ac90f63d500bf5174cc xlsatoms-1.1.3.tar.bz2 -sha256 57868f958c263976727881f3078e55b86b4a109dc578d2b92f5c6d690850a382 xlsatoms-1.1.3.tar.bz2 -sha512 c267ccfdc5a83e834bfb5c3b144e22642badcadef4eb146eeec2df6fe6f85e9379500ae4219912c70fa2e535036a1a96cf496381f5d814e79af075e03c975f30 xlsatoms-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003258.html +sha256 f4bfa15f56c066d326a5d5b292646708f25b9247506840b9047cd2687dcc71b7 xlsatoms-1.1.4.tar.xz +sha512 82f0d1e17850770537eac82947eff4514639f8122bd864e02685ede49db110a4c90c7782702ffb677a2b581f3eacd10dba80e63e29e7a1ed1c9255ee163fe0c4 xlsatoms-1.1.4.tar.xz # Locally computed sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk index a3230fc2dc..2ef09ef2d5 100644 --- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk +++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XLSATOMS_VERSION = 1.1.3 -XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2 -XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XLSATOMS_VERSION = 1.1.4 +XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.xz +XAPP_XLSATOMS_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XLSATOMS_LICENSE = MIT XAPP_XLSATOMS_LICENSE_FILES = COPYING XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu From yann.morin.1998 at free.fr Mon Feb 20 20:53:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:54 -0000 Subject: [Buildroot] [git commit branch/next] package/python-canopen: bump to version 2.0.0 Message-ID: <20230220205201.22E6381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d068bf4c4fce1eb376711940fb02a017815127e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-canopen/python-canopen.hash | 5 +++-- package/python-canopen/python-canopen.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-canopen/python-canopen.hash b/package/python-canopen/python-canopen.hash index 32bcae18f9..610dca3f34 100644 --- a/package/python-canopen/python-canopen.hash +++ b/package/python-canopen/python-canopen.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/canopen/json -sha256 4394770d528e93a48936138c4a7b37b5dff26d54f82a435ad9790cd1e43f55b9 canopen-1.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/canopen/json +md5 0719b73bd8ccaeaa9fb758c5338fd030 canopen-2.0.0.tar.gz +sha256 bcc8aa9ea83f7ada5da0dade81038977be52a93802c2657649729eb1f82065d9 canopen-2.0.0.tar.gz # Locally computed sha256 checksums sha256 0740d30978affcd91c0fc817b7cf942a332381bf0380fe17e60c6a0b377c6e0d LICENSE.txt diff --git a/package/python-canopen/python-canopen.mk b/package/python-canopen/python-canopen.mk index fc328c698e..bd0a3bfba7 100644 --- a/package/python-canopen/python-canopen.mk +++ b/package/python-canopen/python-canopen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CANOPEN_VERSION = 1.0.0 +PYTHON_CANOPEN_VERSION = 2.0.0 PYTHON_CANOPEN_SOURCE = canopen-$(PYTHON_CANOPEN_VERSION).tar.gz -PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/1f/2b/55b6d82b3dcba184a01c6fe027df239953940e36a463cd24b71e67bd1f37 +PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/9e/d6/6ced4b410b904aeee5f7d0227187eae95a5ad769f01014a74fc0e016845e PYTHON_CANOPEN_SETUP_TYPE = setuptools PYTHON_CANOPEN_LICENSE = MIT PYTHON_CANOPEN_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Mon Feb 20 20:53:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:55 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xkbevd: bump version to 1.1.5 Message-ID: <20230220205157.B6A0386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07f7d434a438421eb382a27349e67cffd97d8a3f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003255.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xkbevd/xapp_xkbevd.hash | 5 +++-- package/x11r7/xapp_xkbevd/xapp_xkbevd.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash b/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash index c3cf2f32b2..40b813fcf2 100644 --- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash +++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002577.html -sha256 2430a2e5302a4cb4a5530c1df8cb3721a149bbf8eb377a2898921a145197f96a xkbevd-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003255.html +sha256 38357b702de9d3457c4ff75053390f457b84c4accc7f088101255c37c684926b xkbevd-1.1.5.tar.xz +sha512 9e4a56484771e5eb5444fbd11e7d0bb952a2746eea79b84298e2000ada96896d501b886727c4ef08c120b5dcce550fca2d3e3dd762f4ca0327c38d9609961c5b xkbevd-1.1.5.tar.xz # Locally computed sha256 38c6dbf8f88b1c920561ff3a4d1ffdb85c069c664f5f8b64a9adb477ef347b7c COPYING diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk index 7a9a8fb18f..5b99e6967f 100644 --- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk +++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XKBEVD_VERSION = 1.1.4 -XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.bz2 -XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XKBEVD_VERSION = 1.1.5 +XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.xz +XAPP_XKBEVD_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XKBEVD_LICENSE = MIT XAPP_XKBEVD_LICENSE_FILES = COPYING XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile From yann.morin.1998 at free.fr Mon Feb 20 20:53:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:55 -0000 Subject: [Buildroot] [git commit branch/next] package/python-chardet: bump to version 5.1.0 Message-ID: <20230220205201.45B1B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=870197baf9c22fe45122b1c2db6bfc19f153c27b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop setuptools runtime dependency. Update description as python 2 is no longer supported. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-chardet/Config.in | 3 +-- package/python-chardet/python-chardet.hash | 4 ++-- package/python-chardet/python-chardet.mk | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-chardet/Config.in b/package/python-chardet/Config.in index 869888cfe0..59e7cbfa2c 100644 --- a/package/python-chardet/Config.in +++ b/package/python-chardet/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_CHARDET bool "python-chardet" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help - Universal encoding detector for Python 2 and 3. + Universal encoding detector for Python 3. https://github.com/chardet/chardet diff --git a/package/python-chardet/python-chardet.hash b/package/python-chardet/python-chardet.hash index 7721814279..7887dd769d 100644 --- a/package/python-chardet/python-chardet.hash +++ b/package/python-chardet/python-chardet.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/chardet/json -md5 8013c248c098e165ac53d900e1a1278a chardet-5.0.0.tar.gz -sha256 0368df2bfd78b5fc20572bb4e9bb7fb53e2c094f60ae9993339e8671d0afb8aa chardet-5.0.0.tar.gz +md5 394bd03d7a258d2771040bfbd5a7bf66 chardet-5.1.0.tar.gz +sha256 0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5 chardet-5.1.0.tar.gz # Locally computed sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE diff --git a/package/python-chardet/python-chardet.mk b/package/python-chardet/python-chardet.mk index 1d737891a0..42646aa513 100644 --- a/package/python-chardet/python-chardet.mk +++ b/package/python-chardet/python-chardet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHARDET_VERSION = 5.0.0 +PYTHON_CHARDET_VERSION = 5.1.0 PYTHON_CHARDET_SOURCE = chardet-$(PYTHON_CHARDET_VERSION).tar.gz -PYTHON_CHARDET_SITE = https://files.pythonhosted.org/packages/31/a2/12c090713b3d0e141f367236d3a8bdc3e5fca0d83ff3647af4892c16c205 +PYTHON_CHARDET_SITE = https://files.pythonhosted.org/packages/41/32/cdc91dcf83849c7385bf8e2a5693d87376536ed000807fa07f5eab33430d PYTHON_CHARDET_SETUP_TYPE = setuptools PYTHON_CHARDET_LICENSE = LGPL-2.1+ PYTHON_CHARDET_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:53:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:56 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xkill: bump version to 1.0.6 Message-ID: <20230220205157.AC3A38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fefd30f06c88f36cc75b52b767293586e1770af1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003256.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xkill/xapp_xkill.hash | 8 +++----- package/x11r7/xapp_xkill/xapp_xkill.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xkill/xapp_xkill.hash b/package/x11r7/xapp_xkill/xapp_xkill.hash index 911a28d0b6..8cee05d871 100644 --- a/package/x11r7/xapp_xkill/xapp_xkill.hash +++ b/package/x11r7/xapp_xkill/xapp_xkill.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002864.html -md5 938177e4472c346cf031c1aefd8934fc xkill-1.0.5.tar.bz2 -sha1 c5ee06b33adb252a41e4f737be6bd47651ff582a xkill-1.0.5.tar.bz2 -sha256 c5f0bb6a95e1ac7c4def8a657496d5d2f21ccd41eb47ef2c9ccb03fb6d6aff6b xkill-1.0.5.tar.bz2 -sha512 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249 xkill-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003256.html +sha256 e5a8aa78c475677b11504646da8d93dacc30744258076a2ca418a24438aeb907 xkill-1.0.6.tar.xz +sha512 a755a8db51d7860b9942161776390007b9b530c2f7fcf8ddb3383311d36d185a6f08a44c5f6f7735576b146902e66aca21cbd7e746c1289d035e79332e8173b6 xkill-1.0.6.tar.xz # Locally computed sha256 13306c3890e4c8710bc468dee0eba7f9677cd94c7a67d2d81fa932d4f635b21f COPYING diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk index 64ddbca694..84dad0b5c7 100644 --- a/package/x11r7/xapp_xkill/xapp_xkill.mk +++ b/package/x11r7/xapp_xkill/xapp_xkill.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XKILL_VERSION = 1.0.5 -XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.bz2 -XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XKILL_VERSION = 1.0.6 +XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.xz +XAPP_XKILL_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XKILL_LICENSE = MIT XAPP_XKILL_LICENSE_FILES = COPYING XAPP_XKILL_DEPENDENCIES = xlib_libX11 xlib_libXmu From yann.morin.1998 at free.fr Mon Feb 20 20:53:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:56 -0000 Subject: [Buildroot] [git commit branch/next] package/python-charset-normalizer: bump to version 3.0.1 Message-ID: <20230220205201.512AD81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c54e8a01b69983fe0b262b564be799397c432f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-charset-normalizer/python-charset-normalizer.hash | 4 ++-- package/python-charset-normalizer/python-charset-normalizer.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-charset-normalizer/python-charset-normalizer.hash b/package/python-charset-normalizer/python-charset-normalizer.hash index 32d8a22e66..a70499917a 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.hash +++ b/package/python-charset-normalizer/python-charset-normalizer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/charset-normalizer/json -md5 169527085be8e6bb7874164c24481eca charset-normalizer-3.0.0.tar.gz -sha256 b27d10ad15740b45fd55f76e6901a4391e6dca3917ef48ecdcf17edf6e00d770 charset-normalizer-3.0.0.tar.gz +md5 12ee1c8bedbfba84e99db46d5d94f411 charset-normalizer-3.0.1.tar.gz +sha256 ebea339af930f8ca5d7a699b921106c6e29c617fe9606fa7baa043c1cdae326f charset-normalizer-3.0.1.tar.gz # Locally computed sha256 checksums sha256 eb31a0c5a4fb09b8a4e32055d25c1e5f9c358a2752fef3cd720213d1ccfee241 LICENSE diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index b2c42a74b8..95c55ffd3c 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHARSET_NORMALIZER_VERSION = 3.0.0 +PYTHON_CHARSET_NORMALIZER_VERSION = 3.0.1 PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/fe/77/6d5d367b7cfee812a88573e80bbe25cea2d015ed2c3490e4464951ff3232 +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/96/d7/1675d9089a1f4677df5eb29c3f8b064aa1e70c1251a0a8a127803158942d PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:53:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:57 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_sessreg: bump version to 1.1.3 Message-ID: <20230220205157.D8AB086494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ded7c84b569bc9b9e8bbbb23c768302098c8cfc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003246.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_sessreg/xapp_sessreg.hash | 8 +++----- package/x11r7/xapp_sessreg/xapp_sessreg.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.hash b/package/x11r7/xapp_sessreg/xapp_sessreg.hash index b8f55b50c5..1f1b54b877 100644 --- a/package/x11r7/xapp_sessreg/xapp_sessreg.hash +++ b/package/x11r7/xapp_sessreg/xapp_sessreg.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-June/002994.html -md5 92be564d4be7d8aa7b5024057b715210 sessreg-1.1.2.tar.bz2 -sha1 169c1ff9fb152b4b4ca0cfbd3e1aee33af042016 sessreg-1.1.2.tar.bz2 -sha256 dfcb9e954273ace63879aec053c7880466f8755752a35aa9ced3fa5f04fd2c33 sessreg-1.1.2.tar.bz2 -sha512 7e3c2bdcadb7133aace463b58d8c6108d315ec95d2a42509073eeddc7f02644092a4b3168bd3b426c041736a016291092e0bf8368acd620dbeff96d53d12f98c sessreg-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003246.html +sha256 022acd5de8077dddc4f919961f79e102ecd5f3228a333681af5cd0e7344facc2 sessreg-1.1.3.tar.xz +sha512 bc1e83afc598ac5b4c6ab0861799b6c8727c123ee662c1fb9cbdd9ee926973b7a00cc62e32f6b4e462c0da3516f8b824337d9cf17587ebabd3f4753502641a60 sessreg-1.1.3.tar.xz # Locally computed sha256 ac8f5cc696e6c473aea4caaf18650316dc8912fcf0f370cae1df5f395cea8631 COPYING diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk index 7f488e2423..b196bb947e 100644 --- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk +++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_SESSREG_VERSION = 1.1.2 -XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2 +XAPP_SESSREG_VERSION = 1.1.3 +XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.xz XAPP_SESSREG_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SESSREG_LICENSE = MIT XAPP_SESSREG_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:57 -0000 Subject: [Buildroot] [git commit branch/next] package/python-dicttoxml: bump to version 1.7.15 Message-ID: <20230220205201.7514C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9eb2d23a260af9594ce80caace01bfa2deac3ff7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-dicttoxml/python-dicttoxml.hash | 8 ++++---- package/python-dicttoxml/python-dicttoxml.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-dicttoxml/python-dicttoxml.hash b/package/python-dicttoxml/python-dicttoxml.hash index d8c43d0144..dcde7cf1b6 100644 --- a/package/python-dicttoxml/python-dicttoxml.hash +++ b/package/python-dicttoxml/python-dicttoxml.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/dicttoxml/json -md5 ec5643a048cf32dad3c28db236b923e4 dicttoxml-1.7.4.tar.gz -# Locally computed -sha256 ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45 dicttoxml-1.7.4.tar.gz +# md5, sha256 from https://pypi.org/pypi/dicttoxml/json +md5 234550e3aa875c6f3520aa9a2dff1ef1 dicttoxml-1.7.15.tar.gz +sha256 5540fe7dfde2d2ed9467e67fcc981cbd2e164dc3120c862bdb7333202ac48838 dicttoxml-1.7.15.tar.gz +# Locally computed sha256 checksums sha256 4514114bd9da0b2fbf8c4fa264c0e6cc80fd41e6ac7f09d7a39a215662951c7c LICENCE.txt diff --git a/package/python-dicttoxml/python-dicttoxml.mk b/package/python-dicttoxml/python-dicttoxml.mk index 537afff601..3e5f90e9de 100644 --- a/package/python-dicttoxml/python-dicttoxml.mk +++ b/package/python-dicttoxml/python-dicttoxml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DICTTOXML_VERSION = 1.7.4 +PYTHON_DICTTOXML_VERSION = 1.7.15 PYTHON_DICTTOXML_SOURCE = dicttoxml-$(PYTHON_DICTTOXML_VERSION).tar.gz -PYTHON_DICTTOXML_SITE = https://pypi.python.org/packages/74/36/534db111db9e7610a41641a1f6669a964aacaf51858f466de264cc8dcdd9 +PYTHON_DICTTOXML_SITE = https://files.pythonhosted.org/packages/45/b5/efa170fd88e8b8bc025c59592eade0fb7de6ae02ed3dd63957956adc1396 PYTHON_DICTTOXML_SETUP_TYPE = distutils PYTHON_DICTTOXML_LICENSE = GPL-2.0 PYTHON_DICTTOXML_LICENSE_FILES = LICENCE.txt From yann.morin.1998 at free.fr Mon Feb 20 20:53:58 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:58 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libX11: bump version to 1.8.2 Message-ID: <20230220205157.CCC1F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=671c130b0cc0eee99665554e52af7fad5f99500e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update license hash due to upstream commits https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/a04b84f0f7bb3a78088756759f4b9b8bb363251e https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/a35d706cd8dc7b498bca2a3fc4a3732047439ed7 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libX11/xlib_libX11.hash | 8 ++++---- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 5a8f639165..4f5027d62d 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-June/003168.html -sha256 1bc41aa1bbe01401f330d76dfa19f386b79c51881c7bbfee9eb4e27f22f2d9f7 libX11-1.8.1.tar.xz -sha512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a libX11-1.8.1.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-November/003253.html +sha256 ed91d573d570db83b8ae546f4890dccfcd0b9dfe1e50a1b401b63a74c152ed04 libX11-1.8.2.tar.xz +sha512 662ee8043d9ba27df82f647515b701d6f302a52715f21afdaba391f3b70691753e3649e7ff8322e07858be4297df9cbb19227958d676ed6dea198cce64330d1d libX11-1.8.2.tar.xz # Locally computed -sha256 2daec087a88e7c9b8082557cdeebad5bbb8155a4137472f0b22e269cd99d0c1e COPYING +sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 9ed9f1ddb3..26d4b4d306 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.8.1 +XLIB_LIBX11_VERSION = 1.8.2 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT From yann.morin.1998 at free.fr Mon Feb 20 20:53:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:59 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_x11perf: bump version to 1.6.2 Message-ID: <20230220205158.105C2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1261e78ee2a7994f0cf764c0a61d457984daf673 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003242.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_x11perf/xapp_x11perf.hash | 8 +++----- package/x11r7/xapp_x11perf/xapp_x11perf.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.hash b/package/x11r7/xapp_x11perf/xapp_x11perf.hash index 673d3602ba..3370d7df53 100644 --- a/package/x11r7/xapp_x11perf/xapp_x11perf.hash +++ b/package/x11r7/xapp_x11perf/xapp_x11perf.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002983.html -md5 e96b56756990c56c24d2d02c2964456b x11perf-1.6.1.tar.bz2 -sha1 c54ebef80b6cb565397fe2e3069e0d7470027e5a x11perf-1.6.1.tar.bz2 -sha256 1c7e0b8ffc2794b4ccf11e04d551823abe0ea47b4f7db0637390db6fbe817c34 x11perf-1.6.1.tar.bz2 -sha512 b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b x11perf-1.6.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003242.html +sha256 5a0e7cea47716ad07ceca38bbd07ae06459ee4d837b9c9dfc21ccb94e3e24fcc x11perf-1.6.2.tar.xz +sha512 5be9e601071a42d103adbab5f30c1900a3779a5b2c06c709df99a85487c9790d36b835d43f5c6d74cc7d950cc3ad06927210d7b1f58939cfd0b4a6f3e5e32112 x11perf-1.6.2.tar.xz # Locally computed sha256 f467ff659142e2eb4cb7275c48c789d249af398b09a405d3e181dcc339b3b922 COPYING diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk index ec10590b73..3a1d579939 100644 --- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk +++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_X11PERF_VERSION = 1.6.1 -XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.bz2 -XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_X11PERF_VERSION = 1.6.2 +XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.xz +XAPP_X11PERF_SITE = https://xorg.freedesktop.org/archive/individual/test XAPP_X11PERF_LICENSE = MIT XAPP_X11PERF_LICENSE_FILES = COPYING XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft From yann.morin.1998 at free.fr Mon Feb 20 20:54:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:00 -0000 Subject: [Buildroot] [git commit branch/next] package/python-dtschema: bump to version 2022.12 Message-ID: <20230220205201.9D2A886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a3fb64466b38f68ed4c49fe3eda86a5094bd411 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-dtschema/python-dtschema.hash | 4 ++-- package/python-dtschema/python-dtschema.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dtschema/python-dtschema.hash b/package/python-dtschema/python-dtschema.hash index 32e6e99fa7..734ff3f681 100644 --- a/package/python-dtschema/python-dtschema.hash +++ b/package/python-dtschema/python-dtschema.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dtschema/json -md5 69f39814b2e90809b32cbeafc3e6aaab dtschema-2022.11.tar.gz -sha256 825e51b8bb82a2d4833d15c25ff2b9a3f5a53b36a490d7c4b6b136037e823320 dtschema-2022.11.tar.gz +md5 3fd3ba2d98ad320c06277274ca40d045 dtschema-2022.12.tar.gz +sha256 f532d433a915e507d4b426b7ef57a6730d23c0938b682fb4866f9dfa80a58ec6 dtschema-2022.12.tar.gz # Locally computed sha256 checksums sha256 ca0d66263406dc684fe9db60577b234f65ffdf620d7e041c708e969447b69111 LICENSE.txt diff --git a/package/python-dtschema/python-dtschema.mk b/package/python-dtschema/python-dtschema.mk index 90fffd4255..dbdf43160c 100644 --- a/package/python-dtschema/python-dtschema.mk +++ b/package/python-dtschema/python-dtschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DTSCHEMA_VERSION = 2022.11 +PYTHON_DTSCHEMA_VERSION = 2022.12 PYTHON_DTSCHEMA_SOURCE = dtschema-$(PYTHON_DTSCHEMA_VERSION).tar.gz -PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/9a/15/41ece48fc9524ad815238cfbd164b8ac9dde889759790afbcc4903564dbd +PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/f2/61/7d7e907ea6eed33708ce07766258b961fe476221fbd2e759a1921487e381 PYTHON_DTSCHEMA_SETUP_TYPE = setuptools PYTHON_DTSCHEMA_LICENSE = BSD-2-Clause PYTHON_DTSCHEMA_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Mon Feb 20 20:54:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:00 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXext: bump version to 1.3.5 Message-ID: <20230220205158.1BF5E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f28be9b1fd93a3852d4db00041588d52e171638f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003241.html Updated license hash due to upstream commits https://gitlab.freedesktop.org/xorg/lib/libxext/-/commit/81a3d082b1c73393a59131aa57fe32bb0d76e149 https://gitlab.freedesktop.org/xorg/lib/libxext/-/commit/b6929c143e8372eb6838a331942d34a8d2b13b7b Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXext/xlib_libXext.hash | 10 ++++------ package/x11r7/xlib_libXext/xlib_libXext.mk | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package/x11r7/xlib_libXext/xlib_libXext.hash b/package/x11r7/xlib_libXext/xlib_libXext.hash index e6b41a3dba..2ab509598b 100644 --- a/package/x11r7/xlib_libXext/xlib_libXext.hash +++ b/package/x11r7/xlib_libXext/xlib_libXext.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002975.html -md5 f5b48bb76ba327cd2a8dc7a383532a95 libXext-1.3.4.tar.bz2 -sha1 14e2451162e8766173b5b14c73e94a22b1fcab55 libXext-1.3.4.tar.bz2 -sha256 59ad6fcce98deaecc14d39a672cf218ca37aba617c9a0f691cac3bcd28edf82b libXext-1.3.4.tar.bz2 -sha512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a libXext-1.3.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003241.html +sha256 db14c0c895c57ea33a8559de8cb2b93dc76c42ea4a39e294d175938a133d7bca libXext-1.3.5.tar.xz +sha512 fd9805982dabfb14b1526c0cb71f94508003fa3fcd60560d387465afd891c1dca61927ae86278436d53f4b840cacd1f412071fdc3dce1d6f730610a9c163d59b libXext-1.3.5.tar.xz # Locally computed -sha256 80767ac915f2f0f94de9efb15f0197a59b6f1e609cae85059f8703272dc3e146 COPYING +sha256 fd62910be4b13829d94e76c1447cf840953f0e225c4dc6c79349c84dd0557f22 COPYING diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk index 6002e59e0d..0bb3efa31f 100644 --- a/package/x11r7/xlib_libXext/xlib_libXext.mk +++ b/package/x11r7/xlib_libXext/xlib_libXext.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXEXT_VERSION = 1.3.4 -XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2 -XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXEXT_VERSION = 1.3.5 +XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.xz +XLIB_LIBXEXT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXEXT_LICENSE = MIT XLIB_LIBXEXT_LICENSE_FILES = COPYING XLIB_LIBXEXT_CPE_ID_VENDOR = x From yann.morin.1998 at free.fr Mon Feb 20 20:54:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:01 -0000 Subject: [Buildroot] [git commit branch/next] package/python-falcon: bump to version 3.1.1 Message-ID: <20230220205201.C124C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ef45500e35fac59e403af4709e16e40d2c9bb4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Always build cython modules as sdist does not contain prebuilt cython sources. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-falcon/python-falcon.hash | 4 ++-- package/python-falcon/python-falcon.mk | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/python-falcon/python-falcon.hash b/package/python-falcon/python-falcon.hash index d4e99a6998..497b5d2b57 100644 --- a/package/python-falcon/python-falcon.hash +++ b/package/python-falcon/python-falcon.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/falcon/json -md5 0172450908573a4449a5937810d512b9 falcon-3.1.0.tar.gz -sha256 f2760bd18c16393a6fb5e55f371f67921edb72febe693a82b3c5e82195d087b7 falcon-3.1.0.tar.gz +md5 383673fc6378428d0db5861a416cad0d falcon-3.1.1.tar.gz +sha256 5dd393dbf01cbaf99493893de4832121bd495dc49a46c571915b79c59aad7ef4 falcon-3.1.1.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-falcon/python-falcon.mk b/package/python-falcon/python-falcon.mk index 01b5eca4a2..b5ebc399dc 100644 --- a/package/python-falcon/python-falcon.mk +++ b/package/python-falcon/python-falcon.mk @@ -4,15 +4,12 @@ # ################################################################################ -PYTHON_FALCON_VERSION = 3.1.0 +PYTHON_FALCON_VERSION = 3.1.1 PYTHON_FALCON_SOURCE = falcon-$(PYTHON_FALCON_VERSION).tar.gz -PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/36/53/4fd90c6c841bc2e4be29ab92c65e5406df9096c421f138bef9d95d43afc9 +PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/29/bc/c11c9a14bb5b4d18a024ee51da15b793d1c869d151bb4101e324e0d055a8 PYTHON_FALCON_SETUP_TYPE = setuptools PYTHON_FALCON_LICENSE = Apache-2.0 PYTHON_FALCON_LICENSE_FILES = LICENSE - -ifeq ($(BR2_PACKAGE_HOST_PYTHON_CYTHON),y) PYTHON_FALCON_DEPENDENCIES += host-python-cython -endif $(eval $(python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:54:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:01 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xfsinfo: bump version to 1.0.7 Message-ID: <20230220205158.3FEDC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c999fb9a0527e371f4d9f433436afcc1dc88d4af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003238.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash | 8 +++----- package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash index dbdf8e0eda..7d5976473d 100644 --- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash +++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002949.html -md5 0060d6151427d9e570e54fc52a88e7d7 xfsinfo-1.0.6.tar.bz2 -sha1 cbfe7470179f1ab5eecf992226dc1b28902c6b4c xfsinfo-1.0.6.tar.bz2 -sha256 8a3e8b9b9ae6ed571989d04e1846d39b9043e28f7623b500ebe1d47762c9b1d6 xfsinfo-1.0.6.tar.bz2 -sha512 901fc3817d7c95f2ba75ed0c51de91abd8efa67bbb93ad6b7d66e56a2f721af9db364e92f9ef2e719835fd48e934a5ea7402e5565c0ccd9b6b82633e869dc57b xfsinfo-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003238.html +sha256 92f3ca451cba7717eed15f80de3c123aa56c82a1ee7d6e9116ba513021b98874 xfsinfo-1.0.7.tar.xz +sha512 1914916bf995c08a520bd009ddfa57c7e4a997a829380232d359f9bf68852c67650efb8f1fe3cc8a11889b2ec067f50ac38df711ffaf4536802a0b530dc1789c xfsinfo-1.0.7.tar.xz # Locally computed sha256 bae01fa08f30f21f9cfb75e8339d081b34e5e03d12677177f85a55b0ca41d0db COPYING diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk index bef9787ffe..29e9fc75c4 100644 --- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk +++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XFSINFO_VERSION = 1.0.6 -XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.bz2 -XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XFSINFO_VERSION = 1.0.7 +XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.xz +XAPP_XFSINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XFSINFO_LICENSE = MIT XAPP_XFSINFO_LICENSE_FILES = COPYING XAPP_XFSINFO_DEPENDENCIES = xlib_libFS xlib_libX11 From yann.morin.1998 at free.fr Mon Feb 20 20:54:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:02 -0000 Subject: [Buildroot] [git commit branch/next] package/python-filelock: bump to version 3.8.2 Message-ID: <20230220205201.CC97686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9268e835d33b188978145b912f9a9d1359da63a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-filelock/python-filelock.hash | 4 ++-- package/python-filelock/python-filelock.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-filelock/python-filelock.hash b/package/python-filelock/python-filelock.hash index e4dd67de07..f9e6bc03e8 100644 --- a/package/python-filelock/python-filelock.hash +++ b/package/python-filelock/python-filelock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/filelock/json -md5 9bd8d33d5d7dc95012981ccbfb2d2a0f filelock-3.8.0.tar.gz -sha256 55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc filelock-3.8.0.tar.gz +md5 d66099b8823ebbdd980cde0dae8f7341 filelock-3.8.2.tar.gz +sha256 7565f628ea56bfcd8e54e42bdc55da899c85c1abfe1b5bcfd147e9188cebb3b2 filelock-3.8.2.tar.gz # Locally computed sha256 checksums sha256 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd LICENSE diff --git a/package/python-filelock/python-filelock.mk b/package/python-filelock/python-filelock.mk index 8d5308ddca..86f1220b54 100644 --- a/package/python-filelock/python-filelock.mk +++ b/package/python-filelock/python-filelock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FILELOCK_VERSION = 3.8.0 +PYTHON_FILELOCK_VERSION = 3.8.2 PYTHON_FILELOCK_SOURCE = filelock-$(PYTHON_FILELOCK_VERSION).tar.gz -PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/95/55/b897882bffb8213456363e646bf9e9fa704ffda5a7d140edf935a9e02c7b +PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/d8/73/292d9ea2370840a163e6dd2d2816a571244e9335e2f6ad957bf0527c492f PYTHON_FILELOCK_SETUP_TYPE = setuptools PYTHON_FILELOCK_LICENSE = Public Domain PYTHON_FILELOCK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:02 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xcb-util-image: bump version to 0.4.1 Message-ID: <20230220205158.6FA0E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7b42852817e93423afeff64e637795d8ba80672 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003231.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xcb-util-image/xcb-util-image.hash | 5 +++-- package/x11r7/xcb-util-image/xcb-util-image.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xcb-util-image/xcb-util-image.hash b/package/x11r7/xcb-util-image/xcb-util-image.hash index b2c42d6899..e200853e47 100644 --- a/package/x11r7/xcb-util-image/xcb-util-image.hash +++ b/package/x11r7/xcb-util-image/xcb-util-image.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-October/002489.html -sha256 2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc xcb-util-image-0.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003231.html +sha256 ccad8ee5dadb1271fd4727ad14d9bd77a64e505608766c4e98267d9aede40d3d xcb-util-image-0.4.1.tar.xz +sha512 9b47ba38b91196d76541b6ccabeaf291d3b91036f15422909cd6a79b3fd1a9786d5b1728e411bc41cfdf3d60a253485f4ef7c65ffa6ae646fa93439ec782746e xcb-util-image-0.4.1.tar.xz # License file, locally calculated sha256 19672c6153d8c4870abe734fa4dd2197481a311f4788d02ad729be07e116b26b COPYING diff --git a/package/x11r7/xcb-util-image/xcb-util-image.mk b/package/x11r7/xcb-util-image/xcb-util-image.mk index 8ddb0be86d..446d545ef2 100644 --- a/package/x11r7/xcb-util-image/xcb-util-image.mk +++ b/package/x11r7/xcb-util-image/xcb-util-image.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_IMAGE_VERSION = 0.4.0 -XCB_UTIL_IMAGE_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_IMAGE_SOURCE = xcb-util-image-$(XCB_UTIL_IMAGE_VERSION).tar.bz2 +XCB_UTIL_IMAGE_VERSION = 0.4.1 +XCB_UTIL_IMAGE_SITE = https://xorg.freedesktop.org/archive/individual/lib +XCB_UTIL_IMAGE_SOURCE = xcb-util-image-$(XCB_UTIL_IMAGE_VERSION).tar.xz XCB_UTIL_IMAGE_INSTALL_STAGING = YES XCB_UTIL_IMAGE_LICENSE = MIT XCB_UTIL_IMAGE_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:54:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:03 -0000 Subject: [Buildroot] [git commit branch/next] package/python-gobject: bump to version 3.42.2 Message-ID: <20230220205201.D9F6786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8144885b83c67b2aba3c06a33126454c8293f96a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-gobject/python-gobject.hash | 4 ++-- package/python-gobject/python-gobject.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-gobject/python-gobject.hash b/package/python-gobject/python-gobject.hash index 0c14efb1d4..4398356006 100644 --- a/package/python-gobject/python-gobject.hash +++ b/package/python-gobject/python-gobject.hash @@ -1,3 +1,3 @@ -# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.42/pygobject-3.42.1.sha256sum -sha256 1f34b5f7624de35e44eb5a7eb428353285bd03004d55131a5f7f7fa9b90f3cc9 pygobject-3.42.1.tar.xz +# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.42/pygobject-3.42.2.sha256sum +sha256 ade8695e2a7073849dd0316d31d8728e15e1e0bc71d9ff6d1c09e86be52bc957 pygobject-3.42.2.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/python-gobject/python-gobject.mk b/package/python-gobject/python-gobject.mk index 2fa7504d51..014090540f 100644 --- a/package/python-gobject/python-gobject.mk +++ b/package/python-gobject/python-gobject.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON_GOBJECT_VERSION_MAJOR = 3.42 -PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).1 +PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).2 PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.xz PYTHON_GOBJECT_SITE = https://ftp.gnome.org/pub/gnome/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR) PYTHON_GOBJECT_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Mon Feb 20 20:54:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:03 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xcb-util-wm: bump version to 0.4.2 Message-ID: <20230220205158.4B77F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7f74ba0b3f8d5dd0dcf5af42e0622749e57a7e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003235.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xcb-util-wm/xcb-util-wm.hash | 5 +++-- package/x11r7/xcb-util-wm/xcb-util-wm.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xcb-util-wm/xcb-util-wm.hash b/package/x11r7/xcb-util-wm/xcb-util-wm.hash index 444212accf..7383f015f2 100644 --- a/package/x11r7/xcb-util-wm/xcb-util-wm.hash +++ b/package/x11r7/xcb-util-wm/xcb-util-wm.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-February/002401.html -sha256 28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f xcb-util-wm-0.4.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003235.html +sha256 62c34e21d06264687faea7edbf63632c9f04d55e72114aa4a57bb95e4f888a0b xcb-util-wm-0.4.2.tar.xz +sha512 eab6588e6a47d28a3b25ecd13b5018529419db6b49c74458c093699b60a194933be1e1f6f7799abf03344f7ebc7af88586ff2935938d53644bdd5c763a7fa9b0 xcb-util-wm-0.4.2.tar.xz # License file, locally calculated sha256 12ab3559977a4b22ae3030b90c64a386e6ec51ab0e4eab1ff530f81a2639400a COPYING diff --git a/package/x11r7/xcb-util-wm/xcb-util-wm.mk b/package/x11r7/xcb-util-wm/xcb-util-wm.mk index 37df3fd92d..0c4f6e86fa 100644 --- a/package/x11r7/xcb-util-wm/xcb-util-wm.mk +++ b/package/x11r7/xcb-util-wm/xcb-util-wm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_WM_VERSION = 0.4.1 -XCB_UTIL_WM_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_WM_SOURCE = xcb-util-wm-$(XCB_UTIL_WM_VERSION).tar.bz2 +XCB_UTIL_WM_VERSION = 0.4.2 +XCB_UTIL_WM_SITE = https://xorg.freedesktop.org/archive/individual/lib +XCB_UTIL_WM_SOURCE = xcb-util-wm-$(XCB_UTIL_WM_VERSION).tar.xz XCB_UTIL_WM_INSTALL_STAGING = YES XCB_UTIL_WM_LICENSE = MIT XCB_UTIL_WM_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:54:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:04 -0000 Subject: [Buildroot] [git commit branch/next] package/python-influxdb: bump to version 5.3.1 Message-ID: <20230220205202.09F6D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=77871541bdeb7c84e0d54b4d4b3f13a83c5cdb6f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-influxdb/python-influxdb.hash | 4 ++-- package/python-influxdb/python-influxdb.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-influxdb/python-influxdb.hash b/package/python-influxdb/python-influxdb.hash index 7b43091eca..e86bd8c2ca 100644 --- a/package/python-influxdb/python-influxdb.hash +++ b/package/python-influxdb/python-influxdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/influxdb/json -md5 d528c8ccd8ab40bc608ad1e507e7788a influxdb-5.3.0.tar.gz -sha256 9bcaafd57ac152b9824ab12ed19f204206ef5df8af68404770554c5b55b475f6 influxdb-5.3.0.tar.gz +md5 e5888a7023e9a49d8a372538b625f908 influxdb-5.3.1.tar.gz +sha256 46f85e7b04ee4b3dee894672be6a295c94709003a7ddea8820deec2ac4d8b27a influxdb-5.3.1.tar.gz # Locally computed sha256 checksums sha256 b654917e2c25a69d2bd56e72dddbc6eb29bf7e40384d7c46bb291d5c5185213b LICENSE diff --git a/package/python-influxdb/python-influxdb.mk b/package/python-influxdb/python-influxdb.mk index e5b1aea70f..d77cb89d2d 100644 --- a/package/python-influxdb/python-influxdb.mk +++ b/package/python-influxdb/python-influxdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INFLUXDB_VERSION = 5.3.0 +PYTHON_INFLUXDB_VERSION = 5.3.1 PYTHON_INFLUXDB_SOURCE = influxdb-$(PYTHON_INFLUXDB_VERSION).tar.gz -PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/be/8d/85ec8f11299a6dfc115244db71fd8f13e9a69f5e9eb77dc3392f4f959e9a +PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/86/4f/a9c524576677c1694b149e09d4fd6342e4a1d9a5f409e437168a14d6d150 PYTHON_INFLUXDB_SETUP_TYPE = setuptools PYTHON_INFLUXDB_LICENSE = MIT PYTHON_INFLUXDB_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:04 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xcb-util-keysyms: bump version to 0.4.1 Message-ID: <20230220205158.6472A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd91f23a6ab9d0bb734fa8084275d81a39d300b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003233.html Added license file. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash | 7 +++++-- package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk | 10 ++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash index 6437d070f4..20a341ca22 100644 --- a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash +++ b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash @@ -1,2 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-October/002485.html -sha256 0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9 xcb-util-keysyms-0.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003233.html +sha256 7c260a5294412aed429df1da2f8afd3bd07b7cba3fec772fba15a613a6d5c638 xcb-util-keysyms-0.4.1.tar.xz +sha512 dd53a36b52647f22bf0da8cded4b2974a51899eaac799797017ed8534f14bc2d2d339a14fa5ef387ae4528b7d9a5d31920bb0c71b09ca34f58e5081e768e2bbf xcb-util-keysyms-0.4.1.tar.xz +# Locally computed +sha256 d499c1bf2c2a5f0a0498e5204d998388e308dcf2273dfbe2250a5b9a73f66537 COPYING diff --git a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk index 9036b06fe8..364dc5b6da 100644 --- a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk +++ b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk @@ -4,13 +4,11 @@ # ################################################################################ -XCB_UTIL_KEYSYMS_VERSION = 0.4.0 -XCB_UTIL_KEYSYMS_SOURCE = xcb-util-keysyms-$(XCB_UTIL_KEYSYMS_VERSION).tar.bz2 -XCB_UTIL_KEYSYMS_SITE = http://xcb.freedesktop.org/dist - -# unfortunately, no license file +XCB_UTIL_KEYSYMS_VERSION = 0.4.1 +XCB_UTIL_KEYSYMS_SOURCE = xcb-util-keysyms-$(XCB_UTIL_KEYSYMS_VERSION).tar.xz +XCB_UTIL_KEYSYMS_SITE = https://xorg.freedesktop.org/archive/individual/lib XCB_UTIL_KEYSYMS_LICENSE = MIT - +XCB_UTIL_KEYSYMS_LICENSE_FILES = COPYING XCB_UTIL_KEYSYMS_INSTALL_STAGING = YES XCB_UTIL_KEYSYMS_DEPENDENCIES = host-pkgconf libxcb From yann.morin.1998 at free.fr Mon Feb 20 20:54:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:05 -0000 Subject: [Buildroot] [git commit branch/next] package/python-jsonschema: bump to version 4.17.3 Message-ID: <20230220205202.304D786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb56da9f18647d3414aa42b4d67133a30a52579f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-jsonschema/python-jsonschema.hash | 4 ++-- package/python-jsonschema/python-jsonschema.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-jsonschema/python-jsonschema.hash b/package/python-jsonschema/python-jsonschema.hash index 19b9659d08..f710576461 100644 --- a/package/python-jsonschema/python-jsonschema.hash +++ b/package/python-jsonschema/python-jsonschema.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/jsonschema/json -md5 e569b6114d575bdb05cb8ce4676fe458 jsonschema-4.17.0.tar.gz -sha256 5bfcf2bca16a087ade17e02b282d34af7ccd749ef76241e7f9bd7c0cb8a9424d jsonschema-4.17.0.tar.gz +md5 7c65ceb8923c83cb1f22c2b5a86d99b0 jsonschema-4.17.3.tar.gz +sha256 0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d jsonschema-4.17.3.tar.gz # Locally computed sha256 checksums sha256 4f92a015a13c4d1a040bef018aa13430b4f1bc73b41b16bb846c346766de7439 COPYING sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a json/LICENSE diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 8cc624886c..16fc660ec9 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JSONSCHEMA_VERSION = 4.17.0 +PYTHON_JSONSCHEMA_VERSION = 4.17.3 PYTHON_JSONSCHEMA_SOURCE = jsonschema-$(PYTHON_JSONSCHEMA_VERSION).tar.gz -PYTHON_JSONSCHEMA_SITE = https://files.pythonhosted.org/packages/3a/3d/0653047b9b2ed03d3e96012bc90cfc96227221193fbedd4dc0cbf5a0e342 +PYTHON_JSONSCHEMA_SITE = https://files.pythonhosted.org/packages/36/3d/ca032d5ac064dff543aa13c984737795ac81abc9fb130cd2fcff17cfabc7 PYTHON_JSONSCHEMA_SETUP_TYPE = pep517 PYTHON_JSONSCHEMA_LICENSE = MIT PYTHON_JSONSCHEMA_LICENSE_FILES = COPYING json/LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:05 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_bdftopcf: bump version to 1.1.1 Message-ID: <20230220205158.9203E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08a0ed4d56c03a431b73a6faa53b0c5b83d7ca04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003223.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash | 9 +++------ package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash index bf806ab0d7..0596b65e49 100644 --- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash +++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash @@ -1,8 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-November/002821.html -md5 2a455d3c02390597feb9cefb3fe97a45 bdftopcf-1.1.tar.bz2 -sha1 48a783337a5aa49ebc102c9788ff0f43ea35c5c4 bdftopcf-1.1.tar.bz2 -sha256 4b4df05fc53f1e98993638d6f7e178d95b31745c4568cee407e167491fd311a2 bdftopcf-1.1.tar.bz2 -sha512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec bdftopcf-1.1.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-October/003223.html +sha256 11c953d53c0f3ed349d0198dfb0a40000b5121df7eef09f2615a262892fed908 bdftopcf-1.1.1.tar.xz +sha512 257dc9ae29f2cf1496aad91ccba534348d87f881d75431aa6611a8154cb817d17588c464ab6c6c6bc51e6060baa8dcfcb9fd8c037cdaea8d18287651fa6b7ea9 bdftopcf-1.1.1.tar.xz # Locally calculated sha256 a437fb5272ba507c2977b2ef623bb391270f521b2a20271ed044785f4eaa5dbc COPYING diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk index 7ee618d641..d47f5c02ce 100644 --- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk +++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_BDFTOPCF_VERSION = 1.1 -XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2 -XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_BDFTOPCF_VERSION = 1.1.1 +XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.xz +XAPP_BDFTOPCF_SITE = https://xorg.freedesktop.org/archive/individual/util XAPP_BDFTOPCF_LICENSE = MIT XAPP_BDFTOPCF_LICENSE_FILES = COPYING XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont From yann.morin.1998 at free.fr Mon Feb 20 20:54:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:06 -0000 Subject: [Buildroot] [git commit branch/next] package/python-m2r: bump to version 0.3.1 Message-ID: <20230220205202.62D6C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fdda5c1a6dea195260fc57cc2940dfed88071468 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-m2r/python-m2r.hash | 4 ++-- package/python-m2r/python-m2r.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-m2r/python-m2r.hash b/package/python-m2r/python-m2r.hash index 0770e0d1b1..4bdd7160d8 100644 --- a/package/python-m2r/python-m2r.hash +++ b/package/python-m2r/python-m2r.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/m2r/json -md5 8bdb45c19e2b59bb5ffb9a0348e81ad8 m2r-0.2.1.tar.gz -sha256 bf90bad66cda1164b17e5ba4a037806d2443f2a4d5ddc9f6a5554a0322aaed99 m2r-0.2.1.tar.gz +md5 255d080f56eb3d3a82d95194850c99c3 m2r-0.3.1.tar.gz +sha256 aafb67fc49cfb1d89e46a3443ac747e15f4bb42df20ed04f067ad9efbee256ab m2r-0.3.1.tar.gz # Locally computed sha256 checksums sha256 28728ec0ecbd8c171ebaeccebf69e3961282fd81f06abc7424c65546b6ae6f27 LICENSE diff --git a/package/python-m2r/python-m2r.mk b/package/python-m2r/python-m2r.mk index 47fb154c68..8a4708f128 100644 --- a/package/python-m2r/python-m2r.mk +++ b/package/python-m2r/python-m2r.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_M2R_VERSION = 0.2.1 +PYTHON_M2R_VERSION = 0.3.1 PYTHON_M2R_SOURCE = m2r-$(PYTHON_M2R_VERSION).tar.gz -PYTHON_M2R_SITE = https://files.pythonhosted.org/packages/39/e7/9fae11a45f5e1a3a21d8a98d02948e597c4afd7848a0dbe1a1ebd235f13e +PYTHON_M2R_SITE = https://files.pythonhosted.org/packages/94/65/fd40fbdc608298e760affb95869c3baed237dfe5649d62da1eaa1deca8f3 PYTHON_M2R_SETUP_TYPE = setuptools PYTHON_M2R_LICENSE = MIT PYTHON_M2R_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:06 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXmu: bump version to 1.1.4 Message-ID: <20230220205158.84786828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0978ae1d5e1acca7f9ab165e4050cfa1c283fed4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003224.html Updated license hash due to upstream commits: https://gitlab.freedesktop.org/xorg/lib/libxmu/-/commit/621f61f7d3f5955a84e6aa8b7458699870fdee45 https://gitlab.freedesktop.org/xorg/lib/libxmu/-/commit/f84dcc7fef5e0842e6408f059c13d73975114ec4 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXmu/xlib_libXmu.hash | 10 ++++------ package/x11r7/xlib_libXmu/xlib_libXmu.mk | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.hash b/package/x11r7/xlib_libXmu/xlib_libXmu.hash index b443419285..58d3545156 100644 --- a/package/x11r7/xlib_libXmu/xlib_libXmu.hash +++ b/package/x11r7/xlib_libXmu/xlib_libXmu.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002978.html -md5 ac774cff8b493f566088a255dbf91201 libXmu-1.1.3.tar.bz2 -sha1 7ff54ce38379fb795aebed38f6be404ee0dfeec6 libXmu-1.1.3.tar.bz2 -sha256 9c343225e7c3dc0904f2122b562278da5fed639b1b5e880d25111561bac5b731 libXmu-1.1.3.tar.bz2 -sha512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762 libXmu-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003224.html +sha256 210de3ab9c3e9382572c25d17c2518a854ce6e2c62c5f8315deac7579e758244 libXmu-1.1.4.tar.xz +sha512 3cf90cb3ff380aafefbb39297bdd95b9e1e6d6618cecb53ff09faf38f9b9c54599d28367f07a9ec77a20214c6c3e661b8d0a12b38082556790a79a59942039c1 libXmu-1.1.4.tar.xz # Locally computed -sha256 e65a4a8bbf8b0dfd2439d6bc6d86df03e2b8e693b757593b25149e099aeb8ec4 COPYING +sha256 8f0f2ca7a05cfd10bf9e307a272182de7cb52d7a603feaf17b9943c2c9a4838e COPYING diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk index 3218e0ec39..051968059b 100644 --- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk +++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXMU_VERSION = 1.1.3 -XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.bz2 -XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXMU_VERSION = 1.1.4 +XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.xz +XLIB_LIBXMU_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXMU_LICENSE = MIT XLIB_LIBXMU_LICENSE_FILES = COPYING XLIB_LIBXMU_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:54:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:07 -0000 Subject: [Buildroot] [git commit branch/next] package/python-lmdb: bump to version 1.4.0 Message-ID: <20230220205202.562A486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec022187abdad4cbf286531b236c460d14b97739 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-lmdb/python-lmdb.hash | 4 ++-- package/python-lmdb/python-lmdb.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-lmdb/python-lmdb.hash b/package/python-lmdb/python-lmdb.hash index e50c35df67..c8137ce4c0 100644 --- a/package/python-lmdb/python-lmdb.hash +++ b/package/python-lmdb/python-lmdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lmdb/json -md5 3c955c49be10a7a07a2fcd54d180c3af lmdb-1.3.0.tar.gz -sha256 60a11efc21aaf009d06518996360eed346f6000bfc9de05114374230879f992e lmdb-1.3.0.tar.gz +md5 230103e2cd8efbca8ee7cf29151afd0d lmdb-1.4.0.tar.gz +sha256 39f6c4ee145d28d17025d350720abb6f95db816514e868db57444fdef51cbb47 lmdb-1.4.0.tar.gz # Locally computed sha256 checksums sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index fba168d340..071106605f 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LMDB_VERSION = 1.3.0 +PYTHON_LMDB_VERSION = 1.4.0 PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz -PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/ed/61/41f3c7cbd8a67202ef24fad3375ed936093a0547dc645581dd11c09581b7 +PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/fd/78/4cdc5927d5f3c3c86c4da0108c2eeba544cd67e773232164d59f3e442ff0 PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE PYTHON_LMDB_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Mon Feb 20 20:54:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:07 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_smproxy: bump version to 1.0.7 Message-ID: <20230220205158.C83388648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=77c048e6297193ba4e116484bd8005fafdc412e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003218.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_smproxy/xapp_smproxy.hash | 5 +++-- package/x11r7/xapp_smproxy/xapp_smproxy.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.hash b/package/x11r7/xapp_smproxy/xapp_smproxy.hash index db9dd27af3..587864baf7 100644 --- a/package/x11r7/xapp_smproxy/xapp_smproxy.hash +++ b/package/x11r7/xapp_smproxy/xapp_smproxy.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002564.html -sha256 6cf19155a2752237f36dbf8bc4184465ea190d2652f887faccb4e2a6ebf77266 smproxy-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003218.html +sha256 4aa99237cc9dab7d87ce9bc7cca4116674a853b5f08dfe3f9db1bb2b2cf9f305 smproxy-1.0.7.tar.xz +sha512 cd6a6933b74f76ae65fb16504e57871724bc1102eae1d02e801e99c3fe73fe44e27f87cef3fbf9f75f369d18197b53bb677d637d94cc8185b55acae0cbd44f21 smproxy-1.0.7.tar.xz # Locally computed sha256 92dce6d8a1fcc0c6b5e56dc44e431e7f73bfa2ed5e83295662aa314067a671d8 COPYING diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk index f51c1ec090..f76752941c 100644 --- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk +++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_SMPROXY_VERSION = 1.0.6 -XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.bz2 -XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_SMPROXY_VERSION = 1.0.7 +XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.xz +XAPP_SMPROXY_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SMPROXY_LICENSE = MIT XAPP_SMPROXY_LICENSE_FILES = COPYING XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt From yann.morin.1998 at free.fr Mon Feb 20 20:54:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:08 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_viewres: bump version to 1.0.7 Message-ID: <20230220205158.BD2B0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52264859725c6af2f88b0df6cf59f70b3b6d106d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003219.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_viewres/xapp_viewres.hash | 8 +++----- package/x11r7/xapp_viewres/xapp_viewres.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_viewres/xapp_viewres.hash b/package/x11r7/xapp_viewres/xapp_viewres.hash index 3e2928dc4e..a662f4ef2e 100644 --- a/package/x11r7/xapp_viewres/xapp_viewres.hash +++ b/package/x11r7/xapp_viewres/xapp_viewres.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-August/003020.html -md5 38e6568271d8098327706c5cf855dbc7 viewres-1.0.6.tar.bz2 -sha1 f1d12e5b4e1180916edb44234599a486b025b480 viewres-1.0.6.tar.bz2 -sha256 11c15db02066c1d5fc3febf9b185d16c1112f87e37c4b101a484dcefffb80934 viewres-1.0.6.tar.bz2 -sha512 3f4cfc61608bc6c9b35ef66ceb473661ca01946d3306d54040d32803e8e0eec506a0ce37ea22bfe514544a6ba9645fd30f39b20c063aff696b3c0fda3fe95dff viewres-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003219.html +sha256 b15a62085b1a10f55ae1cf17b7ded75b72b21be240c68071685db377c4afc628 viewres-1.0.7.tar.xz +sha512 75878faee001163891adf8472c79b31273f794e23dd775c80b33acdd1ce76df708eb27a49c20f79b7101ad676e1d50d9c857c2e2e0930c6209eeb7af8a11397c viewres-1.0.7.tar.xz # Locally computed sha256 aefb540c54bc95c68702cd2ae668c559e63cc1a84f55ae5c0e78547e7d75d2d5 COPYING diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk index 2e05a6e7d9..49933d7af6 100644 --- a/package/x11r7/xapp_viewres/xapp_viewres.mk +++ b/package/x11r7/xapp_viewres/xapp_viewres.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_VIEWRES_VERSION = 1.0.6 -XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.bz2 -XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_VIEWRES_VERSION = 1.0.7 +XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.xz +XAPP_VIEWRES_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_VIEWRES_LICENSE = MIT XAPP_VIEWRES_LICENSE_FILES = COPYING XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw From yann.morin.1998 at free.fr Mon Feb 20 20:54:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:09 -0000 Subject: [Buildroot] [git commit branch/next] package/python-mako: bump to version 1.2.4 Message-ID: <20230220205202.6DD7286496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8954158337c3c15a7b7f184cd78fab9b625df08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-mako/python-mako.hash | 4 ++-- package/python-mako/python-mako.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-mako/python-mako.hash b/package/python-mako/python-mako.hash index 4bacafafde..a010e8d8f6 100644 --- a/package/python-mako/python-mako.hash +++ b/package/python-mako/python-mako.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mako/json -md5 4fa0a489a247c59b36fe3e0de5514fed Mako-1.2.3.tar.gz -sha256 7fde96466fcfeedb0eed94f187f20b23d85e4cb41444be0e542e2c8c65c396cd Mako-1.2.3.tar.gz +md5 651f365616611fcd4f2702a9002e2195 Mako-1.2.4.tar.gz +sha256 d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34 Mako-1.2.4.tar.gz # Locally computed sha256 checksums sha256 760f22b3e9ea4a50eb99201bd8dd118869f28108cfb64ccce6d1b305cf9ae9fa LICENSE diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index a663b7dbda..313fbfcab2 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAKO_VERSION = 1.2.3 +PYTHON_MAKO_VERSION = 1.2.4 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/b9/38/c25f0874ea71802fc6f1e9f0f88a7e9666818121b28991bbc1d8eddbcdb1 +PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6ddc1dddf9958677f76f5f80c236bd65309d280b166d3e PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:09 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_fstobdf: bump version to 1.0.7 Message-ID: <20230220205158.DCDD2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5cd2f31a255b4295d83adaeb8db97150c3f660ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003215.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_fstobdf/xapp_fstobdf.hash | 5 +++-- package/x11r7/xapp_fstobdf/xapp_fstobdf.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash b/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash index a2f1425afb..956c3ef0e3 100644 --- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash +++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002511.html -sha256 66cf550326c993e7043f260a8ec4a533a3bf9d8f0e7397a6fe9cca803732e92e fstobdf-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003215.html +sha256 2624cbf071ccca89c2a6dadd65004784f478b2ba1c62b8209e03909954f36b50 fstobdf-1.0.7.tar.xz +sha512 b303cc2060e8ccaa139e855a7d377d28877158efa1087eeeebf9f30f7c9962764eceab5c4044b4b508890413cf38546da9b26756dd27a142b806dcd6fdb6ba59 fstobdf-1.0.7.tar.xz # Locally computed sha256 b76125d919ac2bfbff96955dec98b90729633b2df5fbfa2ad3f2e4376164febb COPYING diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk index e897514c80..989883d42e 100644 --- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk +++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_FSTOBDF_VERSION = 1.0.6 -XAPP_FSTOBDF_SOURCE = fstobdf-$(XAPP_FSTOBDF_VERSION).tar.bz2 -XAPP_FSTOBDF_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_FSTOBDF_VERSION = 1.0.7 +XAPP_FSTOBDF_SOURCE = fstobdf-$(XAPP_FSTOBDF_VERSION).tar.xz +XAPP_FSTOBDF_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_FSTOBDF_LICENSE = MIT XAPP_FSTOBDF_LICENSE_FILES = COPYING XAPP_FSTOBDF_DEPENDENCIES = xlib_libFS xlib_libX11 From yann.morin.1998 at free.fr Mon Feb 20 20:54:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:10 -0000 Subject: [Buildroot] [git commit branch/next] package/python-numpy: bump to version 1.23.5 Message-ID: <20230220205202.9265B86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c2007f5b632efce3c2776b9d360ad3621694648 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-numpy/python-numpy.hash | 4 ++-- package/python-numpy/python-numpy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash index 2a2dec44da..9ac9280c78 100644 --- a/package/python-numpy/python-numpy.hash +++ b/package/python-numpy/python-numpy.hash @@ -1,5 +1,5 @@ -# Copied from https://github.com/numpy/numpy/releases/tag/v1.23.4 -sha256 ed2cc92af0efad20198638c69bb0fc2870a58dabfba6eb722c933b48556c686c numpy-1.23.4.tar.gz +# Copied from https://github.com/numpy/numpy/releases/tag/v1.23.5 +sha256 1b1766d6f397c18153d40015ddfc79ddb715cabadc04d2d228d4e5a8bc4ded1a numpy-1.23.5.tar.gz # License files, locally calculated sha256 0f88787955e7131224f53a8c3f3e859dc502408e3a539a4dcf61fb7888b5b984 LICENSE.txt sha256 c27d0a8026bdb8876562b720ab24d1688e3827a89f6083cd6e7e8caa9584aba3 numpy/core/src/multiarray/dragon4.c diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 4f4848c4ba..812bfdae4a 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.23.4 +PYTHON_NUMPY_VERSION = 1.23.5 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) PYTHON_NUMPY_LICENSE = BSD-3-Clause, MIT, Zlib From yann.morin.1998 at free.fr Mon Feb 20 20:54:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:10 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXtst: bump version to 1.2.4 Message-ID: <20230220205158.E74358648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e2df02d3109131b72880ebf313088e70366c5da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-September/003214.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXtst/xlib_libXtst.hash | 5 +++-- package/x11r7/xlib_libXtst/xlib_libXtst.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.hash b/package/x11r7/xlib_libXtst/xlib_libXtst.hash index f64a018567..7bdcdb9c17 100644 --- a/package/x11r7/xlib_libXtst/xlib_libXtst.hash +++ b/package/x11r7/xlib_libXtst/xlib_libXtst.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002726.html -sha256 4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204 libXtst-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-September/003214.html +sha256 84f5f30b9254b4ffee14b5b0940e2622153b0d3aed8286a3c5b7eeb340ca33c8 libXtst-1.2.4.tar.xz +sha512 f2f4e01239b892b8e26284cede90feb4fe7738beb243bca0f6adb349029f8bf87b5a482911edcd2401733c92ef78eec07fcd455b92e5b8c4828374769e60098d libXtst-1.2.4.tar.xz # Locally computed sha256 940190489c7a0e5ae3d83fc4fcbd79e0cd1b765bf1a4efd408293c1ee0332ceb COPYING diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk index c79301e064..47103377aa 100644 --- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk +++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXTST_VERSION = 1.2.3 -XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.bz2 -XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXTST_VERSION = 1.2.4 +XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.xz +XLIB_LIBXTST_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXTST_LICENSE = MIT XLIB_LIBXTST_LICENSE_FILES = COPYING XLIB_LIBXTST_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:54:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:11 -0000 Subject: [Buildroot] [git commit branch/next] package/python-posix-ipc: bump to version 1.1.0 Message-ID: <20230220205202.CF1278648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb0fc1d63c96df58782d5473bcca175724924e51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next License hash changed due to date update: https://github.com/osvenskan/posix_ipc/commit/4db678001be2f16175c70cb88d4fb9f9126333f5 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-posix-ipc/python-posix-ipc.hash | 6 +++--- package/python-posix-ipc/python-posix-ipc.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-posix-ipc/python-posix-ipc.hash b/package/python-posix-ipc/python-posix-ipc.hash index 4258af6348..74d2db0f5e 100644 --- a/package/python-posix-ipc/python-posix-ipc.hash +++ b/package/python-posix-ipc/python-posix-ipc.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/posix-ipc/json -md5 8c9443859492ecf3aae9182aa6b5c78c posix_ipc-1.0.5.tar.gz -sha256 6cddb1ce2cf4aae383f2a0079c26c69bee257fe2720f372201ef047f8ceb8b97 posix_ipc-1.0.5.tar.gz +md5 81baeabebd3e4064972ec62fd9eace0b posix_ipc-1.1.0.tar.gz +sha256 f86a15b32b38573c78e305ebd9100d8198a3d9facc03ffafe39edc35833738e3 posix_ipc-1.1.0.tar.gz # Locally computed sha256 checksums -sha256 61f0669e70518e6d32f87e485965fe9309de60e4bef938b29cecd068b3db9a98 LICENSE +sha256 2b58f0bf31a8cbd7e56bfef030e9f7f02758ce8a810d073ccf41753bdc2a0747 LICENSE diff --git a/package/python-posix-ipc/python-posix-ipc.mk b/package/python-posix-ipc/python-posix-ipc.mk index 359dee6d7c..c25af9ecbd 100644 --- a/package/python-posix-ipc/python-posix-ipc.mk +++ b/package/python-posix-ipc/python-posix-ipc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_POSIX_IPC_VERSION = 1.0.5 +PYTHON_POSIX_IPC_VERSION = 1.1.0 PYTHON_POSIX_IPC_SOURCE = posix_ipc-$(PYTHON_POSIX_IPC_VERSION).tar.gz -PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/bc/2f/9a7901aa26fb0e02a671b989ba814d059a0f45af85cea31b9c9eef7e2dda +PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/41/72/90b6702782921c0e3e0b10a66f2a47d8cfaf9c2255d763ab45cc8cea25eb PYTHON_POSIX_IPC_LICENSE = BSD-3-Clause PYTHON_POSIX_IPC_LICENSE_FILES = LICENSE PYTHON_POSIX_IPC_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Mon Feb 20 20:54:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:11 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_fslsfonts: bump version to 1.0.6 Message-ID: <20230220205159.082B8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2745a3b89ccc74f5d15ff812feb0b62da860e12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-September/003210.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash | 5 +++-- package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash index 1a7985f9a5..20573576c9 100644 --- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash +++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002510.html -sha256 f1ed55093356b78daec2678d22f52d42ec11fe88575562d734396962e626d7f6 fslsfonts-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-September/003210.html +sha256 01cb0c5a7dbddadef846ca3b52c2ab9c60f2c32c3f16584cd97a6c7f293341ee fslsfonts-1.0.6.tar.xz +sha512 1181a8e6cc820410d1deac98b3e5097506e4168c6515307b6b9aaf705cb57193a009cb331a51d46ce68e9548712f122b5c942d5a1bc1e01bdd191b7b1beab09e fslsfonts-1.0.6.tar.xz # Locally computed sha256 fbdfcafb5755565ad688bf3f7f808109d358040ec83ed3de496155105451fdf4 COPYING diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk index 27786a55c1..1b8d630124 100644 --- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk +++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_FSLSFONTS_VERSION = 1.0.5 -XAPP_FSLSFONTS_SOURCE = fslsfonts-$(XAPP_FSLSFONTS_VERSION).tar.bz2 -XAPP_FSLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_FSLSFONTS_VERSION = 1.0.6 +XAPP_FSLSFONTS_SOURCE = fslsfonts-$(XAPP_FSLSFONTS_VERSION).tar.xz +XAPP_FSLSFONTS_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_FSLSFONTS_LICENSE = MIT XAPP_FSLSFONTS_LICENSE_FILES = COPYING XAPP_FSLSFONTS_DEPENDENCIES = xlib_libFS xlib_libX11 From yann.morin.1998 at free.fr Mon Feb 20 20:54:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:12 -0000 Subject: [Buildroot] [git commit branch/next] package/python-prompt-toolkit: bump to version 3.0.36 Message-ID: <20230220205202.DC11086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f37cfa7907f8594ce9df3ee7956223b9da26bd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop no longer required six dependency. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-prompt-toolkit/Config.in | 1 - package/python-prompt-toolkit/python-prompt-toolkit.hash | 4 ++-- package/python-prompt-toolkit/python-prompt-toolkit.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-prompt-toolkit/Config.in b/package/python-prompt-toolkit/Config.in index ad4f8162de..81d958884e 100644 --- a/package/python-prompt-toolkit/Config.in +++ b/package/python-prompt-toolkit/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT bool "python-prompt-toolkit" - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_WCWIDTH # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.hash b/package/python-prompt-toolkit/python-prompt-toolkit.hash index 8b91ee767f..62ba0c3cfe 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.hash +++ b/package/python-prompt-toolkit/python-prompt-toolkit.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/prompt-toolkit/json -md5 0cc5e752cb2759e99658e2391644e767 prompt_toolkit-3.0.31.tar.gz -sha256 9ada952c9d1787f52ff6d5f3484d0b4df8952787c087edf6a1f7c2cb1ea88148 prompt_toolkit-3.0.31.tar.gz +md5 5a2bb559c0bcbc617f507a320c64ba03 prompt_toolkit-3.0.36.tar.gz +sha256 3e163f254bef5a03b146397d7c1963bd3e2812f0964bb9a24e6ec761fd28db63 prompt_toolkit-3.0.36.tar.gz # Locally computed sha256 checksums sha256 303574d9bdd85c757d6025017942bf17baeedf2778f62bd7f425d07d880f4c4a LICENSE diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.mk b/package/python-prompt-toolkit/python-prompt-toolkit.mk index bef761e20f..426fa41e0b 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.mk +++ b/package/python-prompt-toolkit/python-prompt-toolkit.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.31 +PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.36 PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz -PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/80/76/c94cf323ca362dd7baca8d8ddf3b5fe1576848bc0156522ad581c04f8446 +PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/fb/93/180be2342f89f16543ec4eb3f25083b5b84eba5378f68efff05409fb39a9 PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3-Clause PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:12 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xmh: bump version to 1.0.4 Message-ID: <20230220205159.1F9C68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a49f6567142eee59817d07afa380337260f81634 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003208.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xmh/xapp_xmh.hash | 5 +++-- package/x11r7/xapp_xmh/xapp_xmh.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xmh/xapp_xmh.hash b/package/x11r7/xapp_xmh/xapp_xmh.hash index 1dadc34586..f0c9fa9567 100644 --- a/package/x11r7/xapp_xmh/xapp_xmh.hash +++ b/package/x11r7/xapp_xmh/xapp_xmh.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002582.html -sha256 b92f4f912a5fb6346d52cc2b639aea087b347f3b2e4e1a4fc7a165b1345f5689 xmh-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003208.html +sha256 e82c425a4c4156eee2e344d2e952f3fd816e03973005cd656ec1e9acf6f329db xmh-1.0.4.tar.xz +sha512 03bba7d3e7c2070b03378335aed0188dd0fd0a488f19dc5ad3f26674a9b38e6599377d082328041dd3ab72123ed60acae32cff19d7149517545b80e1339db26a xmh-1.0.4.tar.xz # Locally computed sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk index c18bbfe5da..db6102eb75 100644 --- a/package/x11r7/xapp_xmh/xapp_xmh.mk +++ b/package/x11r7/xapp_xmh/xapp_xmh.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XMH_VERSION = 1.0.3 -XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.bz2 -XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XMH_VERSION = 1.0.4 +XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.xz +XAPP_XMH_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XMH_LICENSE = MIT XAPP_XMH_LICENSE_FILES = COPYING XAPP_XMH_DEPENDENCIES = xlib_libXaw xdata_xbitmaps From yann.morin.1998 at free.fr Mon Feb 20 20:54:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:13 -0000 Subject: [Buildroot] [git commit branch/next] package/python-psutil: bump to version 5.9.4 Message-ID: <20230220205203.0700386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9371a7994e1099a8681411ddb686a1c2ce53ef10 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-psutil/python-psutil.hash | 4 ++-- package/python-psutil/python-psutil.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index c7b7e46ec1..15927562b1 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json -md5 66b847f94545e96b540518ebe19740b4 psutil-5.9.3.tar.gz -sha256 7ccfcdfea4fc4b0a02ca2c31de7fcd186beb9cff8207800e14ab66f79c773af6 psutil-5.9.3.tar.gz +md5 f72751d05b781757b7cd9bc375d2e351 psutil-5.9.4.tar.gz +sha256 3d7f9739eb435d4b1338944abe23f49584bde5395f27487d2ee25ad9a8774a62 psutil-5.9.4.tar.gz # Locally computed sha256 checksums sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 578f69d3c7..e764d1accc 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 5.9.3 +PYTHON_PSUTIL_VERSION = 5.9.4 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/de/eb/1c01a34c86ee3b058c556e407ce5b07cb7d186ebe47b3e69d6f152ca5cc5 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/3d/7d/d05864a69e452f003c0d77e728e155a89a2a26b09e64860ddd70ad64fb26 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:13 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_oclock: bump version to 1.0.5 Message-ID: <20230220205159.364EA828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=445abe597ccb099660da911fa8fe1ab29b47e986 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003206.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_oclock/xapp_oclock.hash | 8 +++----- package/x11r7/xapp_oclock/xapp_oclock.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_oclock/xapp_oclock.hash b/package/x11r7/xapp_oclock/xapp_oclock.hash index c8893f88b3..20e899b880 100644 --- a/package/x11r7/xapp_oclock/xapp_oclock.hash +++ b/package/x11r7/xapp_oclock/xapp_oclock.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002856.html -md5 973f6d25a6f0990720b98a15c9436b92 oclock-1.0.4.tar.bz2 -sha1 0bc8f3f44290950f60af894e20e0ceb0c5e8e862 oclock-1.0.4.tar.bz2 -sha256 cc20cfc1c0d5128d89e1eecd9ba52e58f111075be163e0aeda5690dbaafbaefe oclock-1.0.4.tar.bz2 -sha512 6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7 oclock-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003206.html +sha256 8f09979655e889d056b7a1e50b57f38b32529453e756b53ec659070fb3c3965c oclock-1.0.5.tar.xz +sha512 a87e89afdb25a91c36077e030b05c3907ddc063c6bdc0715a01bfc16edef8730b3b5a0347399ef4c8b2a13e70e068cba9ec5fe8d411f08548c0aa790a1873aff oclock-1.0.5.tar.xz # Locally computed sha256 f6cae4b0c603ef5bd76da2df96b38aa43aa7547e482adb8cb8b83f09af35e4a2 COPYING diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk index 0f94cf8c13..4f70df4cbf 100644 --- a/package/x11r7/xapp_oclock/xapp_oclock.mk +++ b/package/x11r7/xapp_oclock/xapp_oclock.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_OCLOCK_VERSION = 1.0.4 -XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.bz2 -XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_OCLOCK_VERSION = 1.0.5 +XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.xz +XAPP_OCLOCK_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_OCLOCK_LICENSE = MIT XAPP_OCLOCK_LICENSE_FILES = COPYING XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu From yann.morin.1998 at free.fr Mon Feb 20 20:54:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:14 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pycairo: bump to version 1.23.0 Message-ID: <20230220205203.2C83186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59ae28ac059852c4adb9e5116006f8724bd8578b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycairo/python-pycairo.hash | 4 ++-- package/python-pycairo/python-pycairo.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycairo/python-pycairo.hash b/package/python-pycairo/python-pycairo.hash index f8018e682f..98bb7f2802 100644 --- a/package/python-pycairo/python-pycairo.hash +++ b/package/python-pycairo/python-pycairo.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycairo/json -md5 682238eaa8bd7032e36a20b6f53824d1 pycairo-1.21.0.tar.gz -sha256 251907f18a552df938aa3386657ff4b5a4937dde70e11aa042bc297957f4b74b pycairo-1.21.0.tar.gz +md5 7a3729d21659098e1b9a411b62e88966 pycairo-1.23.0.tar.gz +sha256 9b61ac818723adc04367301317eb2e814a83522f07bbd1f409af0dada463c44c pycairo-1.23.0.tar.gz # Locally computed sha256 checksums sha256 360b9a526d47c51a7cab7f1ec49ca5893050562d639b742d588934ff84823a72 COPYING sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING-LGPL-2.1 diff --git a/package/python-pycairo/python-pycairo.mk b/package/python-pycairo/python-pycairo.mk index 5b231f6b1e..f9933df187 100644 --- a/package/python-pycairo/python-pycairo.mk +++ b/package/python-pycairo/python-pycairo.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCAIRO_VERSION = 1.21.0 +PYTHON_PYCAIRO_VERSION = 1.23.0 PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz -PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/92/a4/506564f574fa74c90b98690e8ecc8dbae1629f31fcfe0be69de45d9e1605 +PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/69/ca/9e9fa2e8be0876a9bbf046a1be7ee33e61d4fdfbd1fd25c76c1bdfddf8c4 PYTHON_PYCAIRO_SETUP_TYPE = setuptools PYTHON_PYCAIRO_DEPENDENCIES = cairo PYTHON_PYCAIRO_LICENSE = LGPL-2.1 or MPL-1.1 From yann.morin.1998 at free.fr Mon Feb 20 20:54:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:14 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXfont2: bump version to 2.0.6 Message-ID: <20230220205159.4E5638648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4649c06bff7e30bdbd7a3ebab59c578f09d67172 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003203.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXfont2/xlib_libXfont2.hash | 6 +++--- package/x11r7/xlib_libXfont2/xlib_libXfont2.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash index 069f2fc616..f2ae5925f8 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-August/003103.html -sha256 aa7c6f211cf7215c0ab4819ed893dc98034363d7b930b844bb43603c2e10b53e libXfont2-2.0.5.tar.bz2 -sha512 64d0635d14676bb645d61932afb177eb3808a46525b26e7ee31abc975eca75207743e85523fdd82b08010ce124eb4802338b508ee7b126875d2a3c12f8ac4faa libXfont2-2.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003203.html +sha256 74ca20017eb0fb3f56d8d5e60685f560fc85e5ff3d84c61c4cb891e40c27aef4 libXfont2-2.0.6.tar.xz +sha512 24d6baeef8dc2ca2730925c6b790a97f4a3f46ea7b4d908555e7df29cee6e27b63d638b50c88dd30c853cecff7d9b079402cb617f4498f96410c5770b8815cbd libXfont2-2.0.6.tar.xz # Locally calculated sha256 97e413bb4962bbb5773085cd5405502bf1d4eadeaf98ff5be015eacacc840462 COPYING diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk index fb0bba879c..7f90f67046 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXFONT2_VERSION = 2.0.5 -XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2 +XLIB_LIBXFONT2_VERSION = 2.0.6 +XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.xz XLIB_LIBXFONT2_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFONT2_LICENSE = MIT XLIB_LIBXFONT2_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:54:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:15 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pymodbus: bump to version 3.0.2 Message-ID: <20230220205203.5292286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90817e547c54a26e6554819a545f6ef059ee479b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pymodbus/python-pymodbus.hash | 4 ++-- package/python-pymodbus/python-pymodbus.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pymodbus/python-pymodbus.hash b/package/python-pymodbus/python-pymodbus.hash index b5243567b7..d9337ffe84 100644 --- a/package/python-pymodbus/python-pymodbus.hash +++ b/package/python-pymodbus/python-pymodbus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymodbus/json -md5 25a8724539d0eac1b09d9b41812d86f9 pymodbus-3.0.0.tar.gz -sha256 37c9b6f3e5c82f39ee42047ca48cbc9fd0c49a6731126789500191e9deea6cbc pymodbus-3.0.0.tar.gz +md5 89da6585b27b8c4b3887eb9f7d1e950b pymodbus-3.0.2.tar.gz +sha256 704cb7fb90631c45f9c3a70b89d0c990fe0e208ac56f14a5c449e21bebd1e201 pymodbus-3.0.2.tar.gz # Locally computed sha256 checksums sha256 796a47993313691ea404d8af7e4c0f9daf1d2760e3900938985b59c9008eee2f LICENSE diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index 2ed7e94afe..54879d38e9 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMODBUS_VERSION = 3.0.0 +PYTHON_PYMODBUS_VERSION = 3.0.2 PYTHON_PYMODBUS_SOURCE = pymodbus-$(PYTHON_PYMODBUS_VERSION).tar.gz -PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/0f/5a/50e9492f98ef911af18c2b603bc003fef726e84d22bac2ce6e651643b29c +PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/94/f7/6149a1b107fa54378a7adec83db7cd3679bf02216a6f5c83b37f55335897 PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:15 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libFS: bump version to 1.0.9 Message-ID: <20230220205159.59D65828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b1ff446fb74b910ff9005b8725e962a626ef11a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003200.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libFS/xlib_libFS.hash | 8 +++----- package/x11r7/xlib_libFS/xlib_libFS.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libFS/xlib_libFS.hash b/package/x11r7/xlib_libFS/xlib_libFS.hash index 50cb94dd3a..6ca152ac4a 100644 --- a/package/x11r7/xlib_libFS/xlib_libFS.hash +++ b/package/x11r7/xlib_libFS/xlib_libFS.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002970.html -md5 4e1196275aa743d6ebd3d3d5ec1dff9c libFS-1.0.8.tar.bz2 -sha1 70173cc15a7a55defb7b22b00a9387901acad634 libFS-1.0.8.tar.bz2 -sha256 c8e13727149b2ddfe40912027459b2522042e3844c5cd228c3300fe5eef6bd0f libFS-1.0.8.tar.bz2 -sha512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f libFS-1.0.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003200.html +sha256 597379438b3242ccc7d7b0fc432dc6c844eca0d4a82a7b82518bfeb203fc208a libFS-1.0.9.tar.xz +sha512 7d012e62736c6d567931bad982eec221199d296f0fe41e1e7fde5575b8b928e9a8c644aa8746242bdfe72393635320b58774d9a519285765bd26d633588092b8 libFS-1.0.9.tar.xz # Locally computed sha256 5386724e7475b89394dd836b954a6688f875efab99e43e8eb7e8775f5b99a341 COPYING diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk index 9d9aecb74f..0fbf453ca4 100644 --- a/package/x11r7/xlib_libFS/xlib_libFS.mk +++ b/package/x11r7/xlib_libFS/xlib_libFS.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBFS_VERSION = 1.0.8 -XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2 -XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBFS_VERSION = 1.0.9 +XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.xz +XLIB_LIBFS_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBFS_LICENSE = MIT XLIB_LIBFS_LICENSE_FILES = COPYING XLIB_LIBFS_CPE_ID_VENDOR = x From yann.morin.1998 at free.fr Mon Feb 20 20:54:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:16 -0000 Subject: [Buildroot] [git commit branch/next] package/python-redis: bump to version 4.4.0 Message-ID: <20230220205203.6A52E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c75ac80eeaa30b3888f20e0c32df7a3e5c9172b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next License hash changed due to syntax update: https://github.com/redis/redis-py/commit/2a0405d07e20ac7f695ff67415ad6c8368fd6066 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-redis/python-redis.hash | 6 +++--- package/python-redis/python-redis.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash index 9465e251f8..209ff35b78 100644 --- a/package/python-redis/python-redis.hash +++ b/package/python-redis/python-redis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/redis/json -md5 15f05dbef3d166c6244f7afa6c3cacf8 redis-4.3.4.tar.gz -sha256 ddf27071df4adf3821c4f2ca59d67525c3a82e5f268bed97b813cb4fabf87880 redis-4.3.4.tar.gz +md5 4ab691af57ac346c2e630ce2787a424f redis-4.4.0.tar.gz +sha256 7b8c87d19c45d3f1271b124858d2a5c13160c4e74d4835e28273400fa34d5228 redis-4.4.0.tar.gz # Locally computed sha256 checksums -sha256 790148d8c12f8a38b2707a74be2343316bad126995ff54801a181b8b231ba124 LICENSE +sha256 7801a39e3a1aec58a7ea7c9f4dc1238cf0922c36a1fc8eff0bb7d684ff6dd354 LICENSE diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk index 7c18f31507..bbbd6f1df2 100644 --- a/package/python-redis/python-redis.mk +++ b/package/python-redis/python-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REDIS_VERSION = 4.3.4 +PYTHON_REDIS_VERSION = 4.4.0 PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/8f/d4/78ef2d3f316041fa6c92daa7ac2c8056c39858c3775fad35fd84b9b3a6fb +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/7a/05/671367bb466b3301bc4543fdad6ac107214ca327c8d97165b30246d87e88 PYTHON_REDIS_SETUP_TYPE = setuptools PYTHON_REDIS_LICENSE = MIT PYTHON_REDIS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:16 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xorgproto: bump version to 2022.2 Message-ID: <20230220205159.67DE58648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d77345d05169d2fe8df1afc3714c2b373e273ef9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003197.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xorgproto/xorgproto.hash | 6 +++--- package/x11r7/xorgproto/xorgproto.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xorgproto/xorgproto.hash b/package/x11r7/xorgproto/xorgproto.hash index bd9cae2510..cc52013e11 100644 --- a/package/x11r7/xorgproto/xorgproto.hash +++ b/package/x11r7/xorgproto/xorgproto.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003160.html -sha256 1d2dcc66963f234d2c1e1f8d98a0d3e8725149cdac0a263df4097593c48bc2a6 xorgproto-2022.1.tar.bz2 -sha512 add275a9c0d005053f31fdca6da009142792a3c7e2cd4b56da93eed3a397adf52d91c441ff6455959b87559f402eb9f46fdd8932e951c7d2d96623975391202a xorgproto-2022.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003197.html +sha256 5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e xorgproto-2022.2.tar.xz +sha512 8e6108110600d076a94cc6d0e465b2e9adfbbe8d7e6b75fae9c5262d99dc6074ab1ed561a74d6d451f00f5b7af9f507a6317be9c0770efeed9e60b64beb7a1c9 xorgproto-2022.2.tar.xz # Locally computed sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto diff --git a/package/x11r7/xorgproto/xorgproto.mk b/package/x11r7/xorgproto/xorgproto.mk index 89cc248386..c707bdafc0 100644 --- a/package/x11r7/xorgproto/xorgproto.mk +++ b/package/x11r7/xorgproto/xorgproto.mk @@ -4,8 +4,8 @@ # ################################################################################ -XORGPROTO_VERSION = 2022.1 -XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.bz2 +XORGPROTO_VERSION = 2022.2 +XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.xz XORGPROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XORGPROTO_LICENSE = MIT XORGPROTO_LICENSE_FILES = \ From yann.morin.1998 at free.fr Mon Feb 20 20:54:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:17 -0000 Subject: [Buildroot] [git commit branch/next] package/python-simplejson: bump to version 3.18.0 Message-ID: <20230220205203.8214F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=225e8745c62c75b20867af928d459abfbb53da94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-simplejson/python-simplejson.hash | 4 ++-- package/python-simplejson/python-simplejson.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-simplejson/python-simplejson.hash b/package/python-simplejson/python-simplejson.hash index 0f56d4c6cc..1c99b87590 100644 --- a/package/python-simplejson/python-simplejson.hash +++ b/package/python-simplejson/python-simplejson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplejson/json -md5 0b8f47c9451bf101a791f8b5bccf1f33 simplejson-3.17.6.tar.gz -sha256 cf98038d2abf63a1ada5730e91e84c642ba6c225b0198c3684151b1f80c5f8a6 simplejson-3.17.6.tar.gz +md5 83e24e662f024e06af2fffe698227da4 simplejson-3.18.0.tar.gz +sha256 58a429d2c2fa80834115b923ff689622de8f214cf0dc4afa9f59e824b444ab31 simplejson-3.18.0.tar.gz # Locally computed sha256 checksums sha256 fcaa1e313a99304322e2e0836ea4ee7d839ce9a480438f3922a853edfdde129f LICENSE.txt diff --git a/package/python-simplejson/python-simplejson.mk b/package/python-simplejson/python-simplejson.mk index 52bff7569c..1607d9c90c 100644 --- a/package/python-simplejson/python-simplejson.mk +++ b/package/python-simplejson/python-simplejson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEJSON_VERSION = 3.17.6 +PYTHON_SIMPLEJSON_VERSION = 3.18.0 PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz -PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/7a/47/c7cc3d4ed15f09917838a2fb4e1759eafb6d2f37ebf7043af984d8b36cf7 +PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/17/3d/b8bfe1f40558f6a16f70c349adf97480dc71a7d11b2b1a5dc0824a87faa0 PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt PYTHON_SIMPLEJSON_CPE_ID_VENDOR = simplejson_project From peter at korsgaard.com Mon Feb 20 20:54:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:18 -0000 Subject: [Buildroot] [git commit branch/next] package/go: security bump to version 1.19.4 Message-ID: <20230220205159.93A0B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=090d126da88c1d529bf073626e423fceeb3cf9d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Includes 2 security fixes following the security policy. - CVE-2022-41720: https://go.dev/issue/56694 - CVE-2022-41717: https://go.dev/issue/56350 https://groups.google.com/g/golang-nuts/c/rQgaDWEvUrE https://github.com/golang/go/issues?q=milestone%3AGo1.19.4+label%3ACherryPickApproved+ 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 866e7e0d59..d35db10213 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 18ac263e39210bcf68d85f4370e97fb1734166995a1f63fb38b4f6e07d90d212 go1.19.3.src.tar.gz +sha256 eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368 go1.19.4.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index fd4caa2e5a..44e0c622c9 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.3 +GO_VERSION = 1.19.4 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From yann.morin.1998 at free.fr Mon Feb 20 20:54:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:18 -0000 Subject: [Buildroot] [git commit branch/next] package/libuwsc: fix wolfssl build Message-ID: <20230220205159.D4E99828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1567fbd72d4b547f70a7509247bf9abb73ab58e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libuwsc needs BR2_PACKAGE_WOLFSSL_ALL (which enables openssl compat layer) to avoid the following wolfssl build failure raised since the addition of the package in commit 120c04775d7ebe5a2cfc14848f5d11f3a333970b: /home/br-user/work/instance-1/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' 62 | SSL_CTX *ctx; | ^~~~~~~ Note that we do not select _ALL when wolfssl is enabled, because wolfssl is neither the only nor the preferred choice, so the condition would have to be a bit more complex: select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL \ && !BR2_STATIC_LIBS && !BR2_PACKAGE_OPENSSL It is not overly complicated, but it is no longer trivial or obvious, and would easily break if the ordering of preferences were to change in the .mk fie in the future. Fixes: - http://autobuild.buildroot.org/results/6c2a6ed6fca1f92aab299f6ed9cd900b20e8d512 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: explain why we don't select _ALL] Signed-off-by: Yann E. MORIN --- package/libuwsc/libuwsc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libuwsc/libuwsc.mk b/package/libuwsc/libuwsc.mk index cad351529d..051ea411fa 100644 --- a/package/libuwsc/libuwsc.mk +++ b/package/libuwsc/libuwsc.mk @@ -18,7 +18,7 @@ LIBUWSC_CONF_OPTS += \ -DUWSC_USE_MBEDTLS=OFF \ -DUWSC_USE_OPENSSL=ON \ -DUWSC_USE_WOLFSSL=OFF -else ifeq ($(BR2_PACKAGE_WOLFSSL),y) +else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) LIBUWSC_DEPENDENCIES += wolfssl LIBUWSC_CONF_OPTS += \ -DUWSC_SSL_SUPPORT=ON \ From yann.morin.1998 at free.fr Mon Feb 20 20:54:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:19 -0000 Subject: [Buildroot] [git commit branch/next] package/python-texttable: bump to version 1.6.7 Message-ID: <20230220205203.A4F8786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9b0bfbdfeb976bf047b9c6e346542159035395c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-texttable/python-texttable.hash | 4 ++-- package/python-texttable/python-texttable.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-texttable/python-texttable.hash b/package/python-texttable/python-texttable.hash index a769e91772..560749b238 100644 --- a/package/python-texttable/python-texttable.hash +++ b/package/python-texttable/python-texttable.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/texttable/json -md5 15faadc07ba44d337cc1675ea6092a02 texttable-1.6.4.tar.gz -sha256 42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9 texttable-1.6.4.tar.gz +md5 83eb15fb541dd857ff051a8d0c979b9c texttable-1.6.7.tar.gz +sha256 290348fb67f7746931bcdfd55ac7584ecd4e5b0846ab164333f0794b121760f2 texttable-1.6.7.tar.gz # Locally computed sha256 checksums sha256 4ba7bdab54504a3bc44eb33ecca873a26a63ab902822101a87bb46235da63594 LICENSE diff --git a/package/python-texttable/python-texttable.mk b/package/python-texttable/python-texttable.mk index 59df5f6ff5..c63fb5786c 100644 --- a/package/python-texttable/python-texttable.mk +++ b/package/python-texttable/python-texttable.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEXTTABLE_VERSION = 1.6.4 +PYTHON_TEXTTABLE_VERSION = 1.6.7 PYTHON_TEXTTABLE_SOURCE = texttable-$(PYTHON_TEXTTABLE_VERSION).tar.gz -PYTHON_TEXTTABLE_SITE = https://files.pythonhosted.org/packages/d5/78/dbc2a5eab57a01fedaf975f2c16f04e76f09336dbeadb9994258aa0a2b1a +PYTHON_TEXTTABLE_SITE = https://files.pythonhosted.org/packages/e4/84/4686ee611bb020038375c5f11fe7b6b3bb94ee78614a1faba45effe51591 PYTHON_TEXTTABLE_SETUP_TYPE = setuptools PYTHON_TEXTTABLE_LICENSE = MIT PYTHON_TEXTTABLE_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:19 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-tga: remove package Message-ID: <20230220205159.83BD7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87a09b105bb9762cee1245856a9b0a27a89887d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Building this package is broken with X.org xserver 21. Fixes: http://autobuild.buildroot.net/results/de5/de5efd922edb9eb7dc9981b5f10ea402487ee431/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 +++ package/x11r7/Config.in | 1 - .../xdriver_xf86-video-tga/0001-mibstore.patch | 47 ---------------------- package/x11r7/xdriver_xf86-video-tga/Config.in | 5 --- .../xdriver_xf86-video-tga.hash | 4 -- .../xdriver_xf86-video-tga.mk | 14 ------- 6 files changed, 6 insertions(+), 71 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index bf3bd55f35..9602a49e3b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA + bool "xf86-video-tga removed" + select BR2_LEGACY + help + The X.org xf86-video-tga package was removed. + config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT bool "xf86-video-glint removed" select BR2_LEGACY diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 273db98e89..da79c4e851 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -180,7 +180,6 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in source package/x11r7/xdriver_xf86-video-sis/Config.in source package/x11r7/xdriver_xf86-video-tdfx/Config.in - source package/x11r7/xdriver_xf86-video-tga/Config.in source package/x11r7/xdriver_xf86-video-trident/Config.in source package/x11r7/xdriver_xf86-video-vesa/Config.in source package/x11r7/xdriver_xf86-video-vmware/Config.in diff --git a/package/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch b/package/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch deleted file mode 100644 index 07bcd04f25..0000000000 --- a/package/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b7022db0559cd1b6cd3eb6b5abf6896a607b478d Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 12:55:00 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-tga/commit/?id=b7022db0559cd1b6cd3eb6b5abf6896a607b478d - -Signed-off-by: Bernd Kuhls - -diff --git a/src/tga_accel.c b/src/tga_accel.c -index 35af1a4..b414df5 100644 ---- a/src/tga_accel.c -+++ b/src/tga_accel.c -@@ -37,7 +37,6 @@ - #include "xf86cmap.h" - #include "mipointer.h" - --#include "mibstore.h" - #include "miline.h" - - #include "tga_regs.h" -diff --git a/src/tga_driver.c b/src/tga_driver.c -index dd4f3e6..90d2660 100644 ---- a/src/tga_driver.c -+++ b/src/tga_driver.c -@@ -46,8 +46,6 @@ - - /* software cursor */ - #include "mipointer.h" --/* backing store */ --#include "mibstore.h" - - /* #include "mibank.h" */ - /* colormap manipulation */ -@@ -1451,7 +1449,6 @@ TGAScreenInit(SCREEN_INIT_ARGS_DECL) - - fbPictureInit (pScreen, 0, 0); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - --- -cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xdriver_xf86-video-tga/Config.in b/package/x11r7/xdriver_xf86-video-tga/Config.in deleted file mode 100644 index 7c75661acc..0000000000 --- a/package/x11r7/xdriver_xf86-video-tga/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA - bool "xf86-video-tga" - select BR2_PACKAGE_XORGPROTO - help - X.Org driver for tga cards diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash deleted file mode 100644 index 4f8c10965c..0000000000 --- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-July/002025.html -sha256 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131 xf86-video-tga-1.2.2.tar.bz2 -# Locally calculated -sha256 92e36c6b7c99c8335e5823d53686e58ebd82ee8051a6360f60c8c0fb05745954 COPYING diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk deleted file mode 100644 index 421b09be22..0000000000 --- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-tga -# -################################################################################ - -XDRIVER_XF86_VIDEO_TGA_VERSION = 1.2.2 -XDRIVER_XF86_VIDEO_TGA_SOURCE = xf86-video-tga-$(XDRIVER_XF86_VIDEO_TGA_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_TGA_LICENSE = MIT -XDRIVER_XF86_VIDEO_TGA_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xorgproto - -$(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:54:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:20 -0000 Subject: [Buildroot] [git commit branch/next] package/python-ujson: bump to version 5.6.0 Message-ID: <20230220205203.CB00386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33f493781cf55c556769024e8058ee223d122507 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-ujson/python-ujson.hash | 4 ++-- package/python-ujson/python-ujson.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-ujson/python-ujson.hash b/package/python-ujson/python-ujson.hash index 27df5aa355..3dfc681167 100644 --- a/package/python-ujson/python-ujson.hash +++ b/package/python-ujson/python-ujson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ujson/json -md5 73b42e3f4bf3130073cfffbd82608275 ujson-5.5.0.tar.gz -sha256 b25077a971c7da47bd6846a912a747f6963776d90720c88603b1b55d81790780 ujson-5.5.0.tar.gz +md5 45a74680e2936470821bf74a8f043a71 ujson-5.6.0.tar.gz +sha256 f881e2d8a022e9285aa2eab6ba8674358dbcb2b57fa68618d88d62937ac3ff04 ujson-5.6.0.tar.gz # Locally computed sha256 checksums sha256 6a00a8f8b4050303368b694147bde1aed9c96bdff869c181dbbf3ccb784a1501 LICENSE.txt diff --git a/package/python-ujson/python-ujson.mk b/package/python-ujson/python-ujson.mk index 95cb0ebad1..24ad4822b8 100644 --- a/package/python-ujson/python-ujson.mk +++ b/package/python-ujson/python-ujson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UJSON_VERSION = 5.5.0 +PYTHON_UJSON_VERSION = 5.6.0 PYTHON_UJSON_SOURCE = ujson-$(PYTHON_UJSON_VERSION).tar.gz -PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/6e/4a/03ddad85a10dd52e209993a14afa0cb0dc5c348e4647329f1c53856ad9e6 +PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/45/48/466d672c53fcb93d64a2817e3a0306214103e3baba109821c88e1150c100 PYTHON_UJSON_SETUP_TYPE = setuptools PYTHON_UJSON_LICENSE = BSD-3-Clause PYTHON_UJSON_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 20 20:54:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:20 -0000 Subject: [Buildroot] [git commit branch/next] package/proftpd: bump to version 1.3.8 Message-ID: <20230220205159.BD207828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=583e06a495e401c564adfd0c13c4ebad33e34e63 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch (already in version) http://proftpd.org/docs/NEWS-1.3.8 http://proftpd.org/docs/RELEASE_NOTES-1.3.8 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...quotatab-fix-build-failure-against-gcc-10.patch | 56 ---------------------- package/proftpd/proftpd.hash | 2 +- package/proftpd/proftpd.mk | 4 +- 3 files changed, 3 insertions(+), 59 deletions(-) diff --git a/package/proftpd/0001-mod_quotatab-fix-build-failure-against-gcc-10.patch b/package/proftpd/0001-mod_quotatab-fix-build-failure-against-gcc-10.patch deleted file mode 100644 index 5f4eb66c71..0000000000 --- a/package/proftpd/0001-mod_quotatab-fix-build-failure-against-gcc-10.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 9c9623c8a47fb5580dfea1a59296c6d224479504 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Mon, 2 Mar 2020 23:45:22 +0000 -Subject: [PATCH] mod_quotatab: fix build failure against gcc-10 - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` -$ ./configure --with-modules=mod_quotatab && make -... -ld: modules/module_glue.o:(.data.rel+0x68): - undefined reference to `quotatab_file_module' -collect2: error: ld returned 1 exit status -make: *** [Makefile:56: proftpd] Error 1 -``` - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Signed-off-by: Sergei Trofimovich - -[Retrieved from: -https://github.com/proftpd/proftpd/commit/9c9623c8a47fb5580dfea1a59296c6d224479504] -Signed-off-by: Fabrice Fontaine ---- - contrib/mod_quotatab.c | 1 + - contrib/mod_quotatab.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/contrib/mod_quotatab.c b/contrib/mod_quotatab.c -index 4fa6c1f44..0ee480163 100644 ---- a/contrib/mod_quotatab.c -+++ b/contrib/mod_quotatab.c -@@ -50,6 +50,7 @@ typedef struct regtab_obj { - module quotatab_module; - - /* Quota objects for the current session */ -+quota_deltas_t quotatab_deltas; - static quota_table_t *limit_tab = NULL; - static quota_limit_t sess_limit; - -diff --git a/contrib/mod_quotatab.h b/contrib/mod_quotatab.h -index ed30333f5..c818395a0 100644 ---- a/contrib/mod_quotatab.h -+++ b/contrib/mod_quotatab.h -@@ -188,7 +188,7 @@ typedef struct table_obj { - #define QUOTATAB_TALLY_SRC 0x0002 - - /* Quota objects for the current session. */ --quota_deltas_t quotatab_deltas; -+extern quota_deltas_t quotatab_deltas; - - /* Function prototypes necessary for quotatab sub-modules */ - int quotatab_log(const char *, ...) diff --git a/package/proftpd/proftpd.hash b/package/proftpd/proftpd.hash index 983500bb8e..f950f26b86 100644 --- a/package/proftpd/proftpd.hash +++ b/package/proftpd/proftpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2dbe684034ab592742ebdb778a8a234b70f959efeb30feedee3ea77f26f74fbb proftpd-1.3.6e.tar.gz +sha256 f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748 proftpd-1.3.8.tar.gz sha256 391a473d755c29b5326fb726326ff3c37e42512f53a8f5789fc310232150bf80 COPYING diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 64c16a84eb..8e7d108c9e 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -4,8 +4,8 @@ # ################################################################################ -PROFTPD_VERSION = 1.3.6e -PROFTPD_SITE = $(call github,proftpd,proftpd,v$(PROFTPD_VERSION)) +PROFTPD_VERSION = 1.3.8 +PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source PROFTPD_LICENSE = GPL-2.0+ PROFTPD_LICENSE_FILES = COPYING PROFTPD_CPE_ID_VENDOR = proftpd From yann.morin.1998 at free.fr Mon Feb 20 20:54:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:21 -0000 Subject: [Buildroot] [git commit branch/next] package/python-websocket-client: bump to version 1.4.2 Message-ID: <20230220205203.EF4458648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6e04028825a8cfdf952553d89363d2c85b69746 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-websocket-client/python-websocket-client.hash | 4 ++-- package/python-websocket-client/python-websocket-client.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash index 08a6c260ca..5da778027b 100644 --- a/package/python-websocket-client/python-websocket-client.hash +++ b/package/python-websocket-client/python-websocket-client.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/websocket-client/json -md5 1e8b6daae0cad86f8cd9210b24bdf95b websocket-client-1.4.1.tar.gz -sha256 f9611eb65c8241a67fb373bef040b3cf8ad377a9f6546a12b620b6511e8ea9ef websocket-client-1.4.1.tar.gz +md5 26d1d8db59c9417570d8ec73ace1687b websocket-client-1.4.2.tar.gz +sha256 d6e8f90ca8e2dd4e8027c4561adeb9456b54044312dba655e7cae652ceb9ae59 websocket-client-1.4.2.tar.gz # Locally computed sha256 checksums sha256 638eb70dcc4af2e6d8388de0636ced399f7c24716e11b8573a6b06f879e80691 LICENSE diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk index 7e21187e22..79cde7e590 100644 --- a/package/python-websocket-client/python-websocket-client.mk +++ b/package/python-websocket-client/python-websocket-client.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKET_CLIENT_VERSION = 1.4.1 +PYTHON_WEBSOCKET_CLIENT_VERSION = 1.4.2 PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket-client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz -PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/99/11/01fe7ebcb7545a1990c53c11f31230afe1388b0b34256e3fd20e49482245 +PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/75/af/1d13b93e7a21aca7f8ab8645fcfcfad21fc39716dc9dce5dc2a97f73ff78 PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools PYTHON_WEBSOCKET_CLIENT_LICENSE = Apache-2.0 PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:21 -0000 Subject: [Buildroot] [git commit branch/next] boot/optee-os: bump to version 3.19.0 Message-ID: <20230220205159.EBACB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f748fc7489882095bdda22ed71b05149474d9b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bumps OP-TEE OS package version to OP-TEE release 3.19.0. Signed-off-by: Etienne Carriere Signed-off-by: Yann E. MORIN --- boot/optee-os/Config.in | 4 ++-- boot/optee-os/optee-os.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 5244700bc2..8bcce22306 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.18.0" + bool "3.19.0" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY help @@ -70,7 +70,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.18.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.19.0" if BR2_TARGET_OPTEE_OS_LATEST default "custom" if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL 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 38f68bec5d..a87f21a9bf 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.18.0/optee-os-3.18.0.tar.gz -sha256 bdd309697745ec4406951652094b50d9adb06c3612f01bd8a3d72682ec8e03e8 optee-os-3.18.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.19.0/optee-os-3.19.0.tar.gz +sha256 5e0c03bbc4d106f262a6bd33333c002c3380205ae6b82334aa7b644721ff7868 optee-os-3.19.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:22 -0000 Subject: [Buildroot] [git commit branch/next] package/python-zopfli: bump to version 0.2.2 Message-ID: <20230220205204.21A6D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc4bed533a6c0166b70aeb03ddde9b021ea4058f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-zopfli/python-zopfli.hash | 4 ++-- package/python-zopfli/python-zopfli.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-zopfli/python-zopfli.hash b/package/python-zopfli/python-zopfli.hash index 969ed97992..29bdfe5e5b 100644 --- a/package/python-zopfli/python-zopfli.hash +++ b/package/python-zopfli/python-zopfli.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zopfli/json -md5 505ea595d86b8a7fec55620c839a4859 zopfli-0.2.1.zip -sha256 e5263d2806e2c1ccb23f52b2972a235d31d42f22f3fa3032cc9aded51e9bf2c6 zopfli-0.2.1.zip +md5 0c1e41e5403524e0180f3ed9aaa356ec zopfli-0.2.2.zip +sha256 2d49db7540d9991976af464ebc1b9ed12988c04d90691bcb51dc4a373a9e2afc zopfli-0.2.2.zip # Locally computed sha256 checksums sha256 018b1cb87efdf7a04c2fcc13d57ed63f62149113fb207b27ea13430d64f13513 COPYING diff --git a/package/python-zopfli/python-zopfli.mk b/package/python-zopfli/python-zopfli.mk index 689634fefa..d6af6e4b5f 100644 --- a/package/python-zopfli/python-zopfli.mk +++ b/package/python-zopfli/python-zopfli.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZOPFLI_VERSION = 0.2.1 +PYTHON_ZOPFLI_VERSION = 0.2.2 PYTHON_ZOPFLI_SOURCE = zopfli-$(PYTHON_ZOPFLI_VERSION).zip -PYTHON_ZOPFLI_SITE = https://files.pythonhosted.org/packages/91/25/ba6f370e18359292f05ca4df93642eb7d1c424721ef61f61b8610a63d0c5 +PYTHON_ZOPFLI_SITE = https://files.pythonhosted.org/packages/9a/ed/d004d5737f9546167eecf0ecd995ee1a796703e512deb2f2ea26cdbe4b3e PYTHON_ZOPFLI_SETUP_TYPE = setuptools PYTHON_ZOPFLI_LICENSE = Apache-2.0 PYTHON_ZOPFLI_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:54:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:22 -0000 Subject: [Buildroot] [git commit branch/next] package/optee-benchmark: bump to version 3.19.0 Message-ID: <20230220205200.03572828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c552f39c98d271002032b0d74f62c9cfe4348dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bumps OP-TEE benchmark package version to OP-TEE release 3.19.0. Signed-off-by: Etienne Carriere Signed-off-by: Yann E. MORIN --- 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 27c91e0fb0..d74a24c8ab 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.18.0/optee-benchmark-3.18.0.tar.gz -sha256 2151aa5da062402518f35823d9c9dffa2e012f924625d2f7123e0d21d350a86b optee-benchmark-3.18.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.19.0/optee-benchmark-3.19.0.tar.gz +sha256 32f41854bf07eb7bb89dfc702da023c3a99518c33fbe7edf0e1f004e29a8c90c optee-benchmark-3.19.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 1071c4bb5c..338a51ada4 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.18.0 +OPTEE_BENCHMARK_VERSION = 3.19.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 Mon Feb 20 20:54:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:23 -0000 Subject: [Buildroot] [git commit branch/next] package/python-bleak: bump version to 0.19.1 Message-ID: <20230220205204.4832B86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e22b84872dbf76e696de1d5c1031af044597343 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Reviewed-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-bleak/Config.in | 3 ++- package/python-bleak/python-bleak.hash | 4 ++-- package/python-bleak/python-bleak.mk | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-bleak/Config.in b/package/python-bleak/Config.in index 085c16fae8..691450f86b 100644 --- a/package/python-bleak/Config.in +++ b/package/python-bleak/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_BLEAK bool "python-bleak" - select BR2_PACKAGE_PYTHON_DBUS_NEXT # runtime + select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime + select BR2_PACKAGE_PYTHON_DBUS_FAST # runtime help Bluetooth Low Energy platform Agnostic Klient. diff --git a/package/python-bleak/python-bleak.hash b/package/python-bleak/python-bleak.hash index 5acac877c9..9a8310b11c 100644 --- a/package/python-bleak/python-bleak.hash +++ b/package/python-bleak/python-bleak.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bleak/json -md5 0c26b270358a782767012220fc595aa5 bleak-0.12.1.tar.gz -sha256 4a80a24cc944e52e856054639f298229c39a2fc720e5f7adbeebb117d10849ed bleak-0.12.1.tar.gz +md5 57564087d6e17ad1853109f530279b27 bleak-0.19.1.tar.gz +sha256 dff7c7f281dcb6629d0d722209c79ec3aa2a6c33867cb5c1ea3d44b72ca155c0 bleak-0.19.1.tar.gz # Locally computed sha256 checksums sha256 c4029a2b63b3824ab68be841f414addbdde20cb79cdbe272fa80c0b2abe65374 LICENSE diff --git a/package/python-bleak/python-bleak.mk b/package/python-bleak/python-bleak.mk index 3ae6d90311..00a4946ef6 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLEAK_VERSION = 0.12.1 +PYTHON_BLEAK_VERSION = 0.19.1 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz -PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/67/4b/ba00c69a24a8d08c86f02caa45727a2ad2844c7bee9630ccb063be226f71 +PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/30/b9/60e1f455365e2340fe076cf7683f4e6d03db0b759d4f93fa45e68dc371e5 PYTHON_BLEAK_SETUP_TYPE = setuptools PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:23 -0000 Subject: [Buildroot] [git commit branch/next] package/polkit: fix file permissions to match upstream Message-ID: <20230220205200.357D1828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=712ee21876562b46947142f35dfe1186d88ad241 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The permissions are now in sync with meson_post_install.py, and debian. Most importantly, polkit-agent-helper-1 is now setuid root, but also the rules.d directories rather than their parents are owned by polkitd. Signed-off-by: Norbert Lange Signed-off-by: Yann E. MORIN --- package/polkit/polkit.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index 205d6aff4c..dab5d542eb 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -52,9 +52,10 @@ define POLKIT_USERS endef define POLKIT_PERMISSIONS - /etc/polkit-1 r 750 root polkitd - - - - - - /usr/share/polkit-1 r 750 root polkitd - - - - - + /etc/polkit-1/rules.d d 700 polkitd root - - - - - + /usr/share/polkit-1/rules.d d 700 polkitd root - - - - - /usr/bin/pkexec f 4755 root root - - - - - + /usr/lib/polkit-1/polkit-agent-helper-1 f 4755 root root - - - - - endef define POLKIT_INSTALL_INIT_SYSTEMD From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:24 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-firmware: bump to 20221109 Message-ID: <20230220205204.62F0D86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bec9e5f7852f6fefb234877dff45916d921c4b18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Stephan Henningsen Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.hash | 4 ++-- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index d81223e311..321436fb61 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 e9d174af729511c8cccb60ec4e0b223b3c44b67d813b42d1ab9813acfa667fa5 linux-firmware-20221012.tar.xz +sha256 c0ddffbbcf30f2e015bddd5c6d3ce1f13976b906aceabda4a57e3c41a3190701 linux-firmware-20221109.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -35,6 +35,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 6857749e23d6a2853e5d33f6d6012a60d5baa2b4d51b5f8c6799d00d68733841 WHENCE +sha256 3461a8c8bddaa7b77f489f339abf90e4930fc0cde27915324781d12bd0828f1c 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 ea97166d93..672a536c4a 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20221012 +LINUX_FIRMWARE_VERSION = 20221109 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 Mon Feb 20 20:54:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:24 -0000 Subject: [Buildroot] [git commit branch/next] package/optee-examples: bump to version 3.19.0 Message-ID: <20230220205200.1D8E28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e86fdfa4d047a2f7f6d8f56b9ea056e65d35ea4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bumps OP-TEE examples package version to OP-TEE release 3.19.0. Signed-off-by: Etienne Carriere Signed-off-by: Yann E. MORIN --- 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 876584c5e9..937dd44c8c 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.18.0/optee-examples-3.18.0.tar.gz -sha256 6c64fbc6c5d1282b6311b4076351abbbfab10ac918c6cfc60e45ec705bb5a9ec optee-examples-3.18.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.19.0/optee-examples-3.19.0.tar.gz +sha256 545f9438885220e890a4f785249a586a957b22dacc31a3cbafa4656f8e9db349 optee-examples-3.19.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 17adce0fe0..bb2b208583 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.18.0 +OPTEE_EXAMPLES_VERSION = 3.19.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 peter at korsgaard.com Mon Feb 20 20:54:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:25 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15}.x / 6.0.x series Message-ID: <20230220205204.7EE6186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6936ec7ec6cb6df0e910f8df92961b79b12ee229 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls 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 3631fcb6d6..c1c690f4cc 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.0.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.0.12" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 0af02e1326..8739da4f75 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7 linux-6.0.9.tar.xz +sha256 89b730edf8942b49e02f9894244205886c9a214d629b35b88c4ff06ee9304f01 linux-6.0.12.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c93bb384a97ad1f0a4f18e442ce0291242722f78023eca658b22344541f09489 linux-5.19.17.tar.xz -sha256 cba39031dbc0eed0785b8afdc8c58cf23df83e47001b2354fa44486ae699c154 linux-5.15.79.tar.xz -sha256 f1b027526c58e7bd127f35b17736e4a6c865866b9048898f05c5358d4d52d4f3 linux-5.10.155.tar.xz -sha256 8b7df25b5560620eb2776d7b7c67569764b3916ff2f596767f72567b38d13d36 linux-5.4.224.tar.xz +sha256 fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65 linux-5.15.82.tar.xz +sha256 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7 linux-5.10.158.tar.xz +sha256 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44 linux-5.4.226.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 41bf80c4766ba9915470afe97ead6a16faff484b94590387012ce7f9ce41502b linux-4.9.333.tar.xz -sha256 26233603ae992cd31e9f78066d54475b3e3f878ab0e3fd271e74a795ab60b15c linux-4.14.299.tar.xz -sha256 37406ead61149283973bccdf670a1fd020c2f19722b7176e88ec8567df6dacd0 linux-4.19.265.tar.xz +sha256 ed4fd861fe9f6cd09f409f00dcccfa691e6d1a61c585723e587575dcb60aeb29 linux-4.9.335.tar.xz +sha256 acd2ee8e03da098fe9f7e52871dd0790850fc32b78657606bdf65bdd94bbf99b linux-4.14.301.tar.xz +sha256 219bce1ac3f542d06fc606ae6bcb10f8ab1940a46c7903113be59afc486c204f linux-4.19.268.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f72e7f408c..24f51418e6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -392,14 +392,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.333" if BR2_KERNEL_HEADERS_4_9 - default "4.14.299" if BR2_KERNEL_HEADERS_4_14 - default "4.19.265" if BR2_KERNEL_HEADERS_4_19 - default "5.4.224" if BR2_KERNEL_HEADERS_5_4 - default "5.10.155" if BR2_KERNEL_HEADERS_5_10 - default "5.15.79" if BR2_KERNEL_HEADERS_5_15 + default "4.9.335" if BR2_KERNEL_HEADERS_4_9 + default "4.14.301" if BR2_KERNEL_HEADERS_4_14 + default "4.19.268" if BR2_KERNEL_HEADERS_4_19 + default "5.4.226" if BR2_KERNEL_HEADERS_5_4 + default "5.10.158" if BR2_KERNEL_HEADERS_5_10 + default "5.15.82" if BR2_KERNEL_HEADERS_5_15 default "5.19.17" if BR2_KERNEL_HEADERS_5_19 - default "6.0.9" if BR2_KERNEL_HEADERS_6_0 + default "6.0.12" if BR2_KERNEL_HEADERS_6_0 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 Mon Feb 20 20:54:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:25 -0000 Subject: [Buildroot] [git commit branch/next] docs/website/news.html: add notice about 2022.08.3 release Message-ID: <20230220205200.5FE68828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21321a983615f8a3ca33c92599c7fc6023711949 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The announcement mail didn't make it to the mailman archive, so use the lore link instead. 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 8f7e22a0b9..74ccd11b08 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

      News

        +
      • +
        +
        +
        +

        2022.08.3 released

        +

        10 December 2022

        +
        +
        +

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

        +
        +
        +
        • +
      • From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:26 -0000 Subject: [Buildroot] [git commit branch/next] package/delve: bump to version 1.20.0 Message-ID: <20230220205204.AEAC386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a49ab07e76216dd9cecd86533e39d1a868102df8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/go-delve/delve/blob/master/CHANGELOG.md#1200-2022-12-07 https://github.com/go-delve/delve/releases/tag/v1.20.0 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/delve/delve.hash | 2 +- package/delve/delve.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/delve/delve.hash b/package/delve/delve.hash index 04ea4954cc..bf730b9047 100644 --- a/package/delve/delve.hash +++ b/package/delve/delve.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 086106a4776fa155bf20c37d27b9caed55255be6359c7f0bda1893d3adbb614e delve-1.8.0.tar.gz +sha256 39d2e3ae965abf5e71f3d8efbef368b1ee1d7154ea6604ec71d508350d419d03 delve-1.20.0.tar.gz sha256 778864b990007e8cef6633f8c372dd05bac1fada6cf67b008afb1483f83b38f5 LICENSE diff --git a/package/delve/delve.mk b/package/delve/delve.mk index 4ca1786ffc..b43d0f03c8 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -4,7 +4,7 @@ # ################################################################################ -DELVE_VERSION = 1.8.0 +DELVE_VERSION = 1.20.0 DELVE_SITE = $(call github,go-delve,delve,v$(DELVE_VERSION)) DELVE_LICENSE = MIT DELVE_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:26 -0000 Subject: [Buildroot] [git commit branch/next] package/connman: fix CVE-2022-3229{2, 3} Message-ID: <20230220205159.C96AD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f2b4c80f44ac0da88fc087017d495e627131350 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-32292: In ConnMan through 1.41, remote attackers able to send HTTP requests to the gweb component are able to exploit a heap-based buffer overflow in received_data to execute code. Fix CVE-2022-32293: In ConnMan through 1.41, a man-in-the-middle attack against a WISPR HTTP query could be used to trigger a use-after-free in WISPR handling, leading to crashes or code execution. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-gweb-Fix-OOB-write-in-received_data.patch | 36 +++++ ...r-Add-reference-counter-to-portal-context.patch | 142 +++++++++++++++++ ...03-wispr-Update-portal-context-references.patch | 175 +++++++++++++++++++++ package/connman/connman.mk | 7 + 4 files changed, 360 insertions(+) diff --git a/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch b/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch new file mode 100644 index 0000000000..d1a9d8f8fe --- /dev/null +++ b/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch @@ -0,0 +1,36 @@ +From d1a5ede5d255bde8ef707f8441b997563b9312bd Mon Sep 17 00:00:00 2001 +From: Nathan Crandall +Date: Tue, 12 Jul 2022 08:56:34 +0200 +Subject: gweb: Fix OOB write in received_data() + +There is a mismatch of handling binary vs. C-string data with memchr +and strlen, resulting in pos, count, and bytes_read to become out of +sync and result in a heap overflow. Instead, do not treat the buffer +as an ASCII C-string. We calculate the count based on the return value +of memchr, instead of strlen. + +Fixes: CVE-2022-32292 + +[Retrieved from: +https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=d1a5ede5d255bde8ef707f8441b997563b9312bd] +Signed-off-by: Fabrice Fontaine +--- + gweb/gweb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gweb/gweb.c b/gweb/gweb.c +index 12fcb1d8..13c6c5f2 100644 +--- a/gweb/gweb.c ++++ b/gweb/gweb.c +@@ -918,7 +918,7 @@ static gboolean received_data(GIOChannel *channel, GIOCondition cond, + } + + *pos = '\0'; +- count = strlen((char *) ptr); ++ count = pos - ptr; + if (count > 0 && ptr[count - 1] == '\r') { + ptr[--count] = '\0'; + bytes_read--; +-- +cgit + diff --git a/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch b/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch new file mode 100644 index 0000000000..c2cebdfdcc --- /dev/null +++ b/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch @@ -0,0 +1,142 @@ +From 72343929836de80727a27d6744c869dff045757c Mon Sep 17 00:00:00 2001 +From: Daniel Wagner +Date: Tue, 5 Jul 2022 08:32:12 +0200 +Subject: wispr: Add reference counter to portal context + +Track the connman_wispr_portal_context live time via a +refcounter. This only adds the infrastructure to do proper reference +counting. + +Fixes: CVE-2022-32293 + +[Retrieved from: +https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=72343929836de80727a27d6744c869dff045757c] +Signed-off-by: Fabrice Fontaine +--- + src/wispr.c | 52 ++++++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 42 insertions(+), 10 deletions(-) + +diff --git a/src/wispr.c b/src/wispr.c +index a07896ca..bde7e63b 100644 +--- a/src/wispr.c ++++ b/src/wispr.c +@@ -56,6 +56,7 @@ struct wispr_route { + }; + + struct connman_wispr_portal_context { ++ int refcount; + struct connman_service *service; + enum connman_ipconfig_type type; + struct connman_wispr_portal *wispr_portal; +@@ -97,6 +98,11 @@ static char *online_check_ipv4_url = NULL; + static char *online_check_ipv6_url = NULL; + static bool enable_online_to_ready_transition = false; + ++#define wispr_portal_context_ref(wp_context) \ ++ wispr_portal_context_ref_debug(wp_context, __FILE__, __LINE__, __func__) ++#define wispr_portal_context_unref(wp_context) \ ++ wispr_portal_context_unref_debug(wp_context, __FILE__, __LINE__, __func__) ++ + static void connman_wispr_message_init(struct connman_wispr_message *msg) + { + DBG(""); +@@ -162,9 +168,6 @@ static void free_connman_wispr_portal_context( + { + DBG("context %p", wp_context); + +- if (!wp_context) +- return; +- + if (wp_context->wispr_portal) { + if (wp_context->wispr_portal->ipv4_context == wp_context) + wp_context->wispr_portal->ipv4_context = NULL; +@@ -201,9 +204,38 @@ static void free_connman_wispr_portal_context( + g_free(wp_context); + } + ++static struct connman_wispr_portal_context * ++wispr_portal_context_ref_debug(struct connman_wispr_portal_context *wp_context, ++ const char *file, int line, const char *caller) ++{ ++ DBG("%p ref %d by %s:%d:%s()", wp_context, ++ wp_context->refcount + 1, file, line, caller); ++ ++ __sync_fetch_and_add(&wp_context->refcount, 1); ++ ++ return wp_context; ++} ++ ++static void wispr_portal_context_unref_debug( ++ struct connman_wispr_portal_context *wp_context, ++ const char *file, int line, const char *caller) ++{ ++ if (!wp_context) ++ return; ++ ++ DBG("%p ref %d by %s:%d:%s()", wp_context, ++ wp_context->refcount - 1, file, line, caller); ++ ++ if (__sync_fetch_and_sub(&wp_context->refcount, 1) != 1) ++ return; ++ ++ free_connman_wispr_portal_context(wp_context); ++} ++ + static struct connman_wispr_portal_context *create_wispr_portal_context(void) + { +- return g_try_new0(struct connman_wispr_portal_context, 1); ++ return wispr_portal_context_ref( ++ g_new0(struct connman_wispr_portal_context, 1)); + } + + static void free_connman_wispr_portal(gpointer data) +@@ -215,8 +247,8 @@ static void free_connman_wispr_portal(gpointer data) + if (!wispr_portal) + return; + +- free_connman_wispr_portal_context(wispr_portal->ipv4_context); +- free_connman_wispr_portal_context(wispr_portal->ipv6_context); ++ wispr_portal_context_unref(wispr_portal->ipv4_context); ++ wispr_portal_context_unref(wispr_portal->ipv6_context); + + g_free(wispr_portal); + } +@@ -452,7 +484,7 @@ static void portal_manage_status(GWebResult *result, + connman_info("Client-Timezone: %s", str); + + if (!enable_online_to_ready_transition) +- free_connman_wispr_portal_context(wp_context); ++ wispr_portal_context_unref(wp_context); + + __connman_service_ipconfig_indicate_state(service, + CONNMAN_SERVICE_STATE_ONLINE, type); +@@ -616,7 +648,7 @@ static void wispr_portal_request_wispr_login(struct connman_service *service, + return; + } + +- free_connman_wispr_portal_context(wp_context); ++ wispr_portal_context_unref(wp_context); + return; + } + +@@ -952,7 +984,7 @@ static int wispr_portal_detect(struct connman_wispr_portal_context *wp_context) + + if (wp_context->token == 0) { + err = -EINVAL; +- free_connman_wispr_portal_context(wp_context); ++ wispr_portal_context_unref(wp_context); + } + } else if (wp_context->timeout == 0) { + wp_context->timeout = g_idle_add(no_proxy_callback, wp_context); +@@ -1001,7 +1033,7 @@ int __connman_wispr_start(struct connman_service *service, + + /* If there is already an existing context, we wipe it */ + if (wp_context) +- free_connman_wispr_portal_context(wp_context); ++ wispr_portal_context_unref(wp_context); + + wp_context = create_wispr_portal_context(); + if (!wp_context) +-- +cgit + diff --git a/package/connman/0003-wispr-Update-portal-context-references.patch b/package/connman/0003-wispr-Update-portal-context-references.patch new file mode 100644 index 0000000000..61c4e21f94 --- /dev/null +++ b/package/connman/0003-wispr-Update-portal-context-references.patch @@ -0,0 +1,175 @@ +From 416bfaff988882c553c672e5bfc2d4f648d29e8a Mon Sep 17 00:00:00 2001 +From: Daniel Wagner +Date: Tue, 5 Jul 2022 09:11:09 +0200 +Subject: wispr: Update portal context references + +Maintain proper portal context references to avoid UAF. + +Fixes: CVE-2022-32293 + +[Retrieved from: +https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=416bfaff988882c553c672e5bfc2d4f648d29e8a] +Signed-off-by: Fabrice Fontaine +--- + src/wispr.c | 34 ++++++++++++++++++++++------------ + 1 file changed, 22 insertions(+), 12 deletions(-) + +diff --git a/src/wispr.c b/src/wispr.c +index bde7e63b..84bed33f 100644 +--- a/src/wispr.c ++++ b/src/wispr.c +@@ -105,8 +105,6 @@ static bool enable_online_to_ready_transition = false; + + static void connman_wispr_message_init(struct connman_wispr_message *msg) + { +- DBG(""); +- + msg->has_error = false; + msg->current_element = NULL; + +@@ -166,8 +164,6 @@ static void free_wispr_routes(struct connman_wispr_portal_context *wp_context) + static void free_connman_wispr_portal_context( + struct connman_wispr_portal_context *wp_context) + { +- DBG("context %p", wp_context); +- + if (wp_context->wispr_portal) { + if (wp_context->wispr_portal->ipv4_context == wp_context) + wp_context->wispr_portal->ipv4_context = NULL; +@@ -483,9 +479,6 @@ static void portal_manage_status(GWebResult *result, + &str)) + connman_info("Client-Timezone: %s", str); + +- if (!enable_online_to_ready_transition) +- wispr_portal_context_unref(wp_context); +- + __connman_service_ipconfig_indicate_state(service, + CONNMAN_SERVICE_STATE_ONLINE, type); + +@@ -546,14 +539,17 @@ static void wispr_portal_request_portal( + { + DBG(""); + ++ wispr_portal_context_ref(wp_context); + wp_context->request_id = g_web_request_get(wp_context->web, + wp_context->status_url, + wispr_portal_web_result, + wispr_route_request, + wp_context); + +- if (wp_context->request_id == 0) ++ if (wp_context->request_id == 0) { + wispr_portal_error(wp_context); ++ wispr_portal_context_unref(wp_context); ++ } + } + + static bool wispr_input(const guint8 **data, gsize *length, +@@ -618,13 +614,15 @@ static void wispr_portal_browser_reply_cb(struct connman_service *service, + return; + + if (!authentication_done) { +- wispr_portal_error(wp_context); + free_wispr_routes(wp_context); ++ wispr_portal_error(wp_context); ++ wispr_portal_context_unref(wp_context); + return; + } + + /* Restarting the test */ + __connman_service_wispr_start(service, wp_context->type); ++ wispr_portal_context_unref(wp_context); + } + + static void wispr_portal_request_wispr_login(struct connman_service *service, +@@ -700,11 +698,13 @@ static bool wispr_manage_message(GWebResult *result, + + wp_context->wispr_result = CONNMAN_WISPR_RESULT_LOGIN; + ++ wispr_portal_context_ref(wp_context); + if (__connman_agent_request_login_input(wp_context->service, + wispr_portal_request_wispr_login, +- wp_context) != -EINPROGRESS) ++ wp_context) != -EINPROGRESS) { + wispr_portal_error(wp_context); +- else ++ wispr_portal_context_unref(wp_context); ++ } else + return true; + + break; +@@ -753,6 +753,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + if (length > 0) { + g_web_parser_feed_data(wp_context->wispr_parser, + chunk, length); ++ wispr_portal_context_unref(wp_context); + return true; + } + +@@ -770,6 +771,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + + switch (status) { + case 000: ++ wispr_portal_context_ref(wp_context); + __connman_agent_request_browser(wp_context->service, + wispr_portal_browser_reply_cb, + wp_context->status_url, wp_context); +@@ -781,11 +783,14 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + if (g_web_result_get_header(result, "X-ConnMan-Status", + &str)) { + portal_manage_status(result, wp_context); ++ wispr_portal_context_unref(wp_context); + return false; +- } else ++ } else { ++ wispr_portal_context_ref(wp_context); + __connman_agent_request_browser(wp_context->service, + wispr_portal_browser_reply_cb, + wp_context->redirect_url, wp_context); ++ } + + break; + case 300: +@@ -798,6 +803,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + !g_web_result_get_header(result, "Location", + &redirect)) { + ++ wispr_portal_context_ref(wp_context); + __connman_agent_request_browser(wp_context->service, + wispr_portal_browser_reply_cb, + wp_context->status_url, wp_context); +@@ -808,6 +814,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + + wp_context->redirect_url = g_strdup(redirect); + ++ wispr_portal_context_ref(wp_context); + wp_context->request_id = g_web_request_get(wp_context->web, + redirect, wispr_portal_web_result, + wispr_route_request, wp_context); +@@ -820,6 +827,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + + break; + case 505: ++ wispr_portal_context_ref(wp_context); + __connman_agent_request_browser(wp_context->service, + wispr_portal_browser_reply_cb, + wp_context->status_url, wp_context); +@@ -832,6 +840,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + wp_context->request_id = 0; + done: + wp_context->wispr_msg.message_type = -1; ++ wispr_portal_context_unref(wp_context); + return false; + } + +@@ -890,6 +899,7 @@ static void proxy_callback(const char *proxy, void *user_data) + xml_wispr_parser_callback, wp_context); + + wispr_portal_request_portal(wp_context); ++ wispr_portal_context_unref(wp_context); + } + + static gboolean no_proxy_callback(gpointer user_data) +-- +cgit + diff --git a/package/connman/connman.mk b/package/connman/connman.mk index a76a339e6f..fbd7318e4e 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -13,6 +13,13 @@ CONNMAN_LICENSE = GPL-2.0 CONNMAN_LICENSE_FILES = COPYING CONNMAN_CPE_ID_VENDOR = intel +# 0001-gweb-Fix-OOB-write-in-received_data.patch +CONNMAN_IGNORE_CVES += CVE-2022-32292 + +# 0002-wispr-Add-reference-counter-to-portal-context.patch +# 0003-wispr-Update-portal-context-references.patch +CONNMAN_IGNORE_CVES += CVE-2022-32293 + CONNMAN_CONF_OPTS = --with-dbusconfdir=/etc ifeq ($(BR2_INIT_SYSTEMD),y) From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:27 -0000 Subject: [Buildroot] [git commit branch/next] package/gocryptfs: bump to version 2.3 Message-ID: <20230220205204.EC82A86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e744cc249030d0ded5c5bb445b9b4ac46e400957 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Rebase the patch for riscv compatibility as well. "go mod tidy" insists on updating x/sys so pin it to the version from upstream release v2.3 using a replace statement. https://github.com/rfjakob/gocryptfs/releases/tag/v2.3 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- ...o.mod-fix-jacobsa-crypto-build-on-riscv64.patch | 84 +++++++++++++++------- package/gocryptfs/gocryptfs.hash | 2 +- package/gocryptfs/gocryptfs.mk | 2 +- 3 files changed, 61 insertions(+), 27 deletions(-) diff --git a/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch b/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch index 90e3cc262d..0074932fba 100644 --- a/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch +++ b/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch @@ -1,4 +1,4 @@ -From e9b64ab75e8539a52d60ecb299fc5425f0d27dc7 Mon Sep 17 00:00:00 2001 +From e72d34ef2c87e5c9ffd49c98b651641f48d89c24 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 25 Jun 2022 14:57:38 -0700 Subject: [PATCH] go.mod: fix jacobsa/crypto build on riscv64 @@ -11,27 +11,31 @@ Upstream PR: https://github.com/jacobsa/crypto/issues/13 Signed-off-by: Christian Stewart --- - go.mod | 9 ++--- - go.sum | 4 +- + go.mod | 15 ++++--- + go.sum | 16 +++----- .../jacobsa/crypto/cmac/hash_generic.go | 40 +++++++++++++++++++ - vendor/modules.txt | 13 +----- - 4 files changed, 48 insertions(+), 18 deletions(-) + vendor/modules.txt | 16 ++------ + 4 files changed, 59 insertions(+), 28 deletions(-) create mode 100644 vendor/github.com/jacobsa/crypto/cmac/hash_generic.go diff --git a/go.mod b/go.mod -index 29f7c2c..533fcdd 100644 +index 754a667..5103029 100644 --- a/go.mod +++ b/go.mod -@@ -2,19 +2,18 @@ module github.com/rfjakob/gocryptfs/v2 +@@ -2,19 +2,22 @@ module github.com/rfjakob/gocryptfs/v2 go 1.16 +// Fixes build against risc-v +// See: https://github.com/jacobsa/crypto/issues/13 -+replace github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607 // xorblock-generic-1 ++replace github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 // buildroot-1 ++ ++// Prevent x/sys version from changing and polluting vendor/ ++// Pin it to the current version in the original go.mod. ++replace golang.org/x/sys => golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 + require ( - github.com/hanwen/go-fuse/v2 v2.1.1-0.20210825171523-3ab5d95a30ae + github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914 github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 - github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd // indirect - github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff // indirect @@ -43,25 +47,52 @@ index 29f7c2c..533fcdd 100644 github.com/spf13/pflag v1.0.5 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 - golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect - golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 - golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b +- golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 ++ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a + golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 ) diff --git a/go.sum b/go.sum -index be0be5f..c26b80e 100644 +index 4167388..71826e9 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,9 @@ -+github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607 h1:N8UVJlxKDhrvHTKXC7oVVfhVvGbgaw2mmlnCgGkfOFc= -+github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607/go.mod h1:Om5VFfyh5VipAEOOVoHAUa4hebUCKxQUjggFPTLeH08= ++github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 h1:awSzmXfGWzvmRmrU1oSHqUdpxNcVPRMqv0rytbSA8kA= ++github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93/go.mod h1:SHG0nzlQikn4UxNIXqEKd2hvJM2tRIrdr1FfOrF+/wY= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/hanwen/go-fuse/v2 v2.1.1-0.20210825171523-3ab5d95a30ae h1:4CB6T4YTUVvnro5ba8ju1QCbOuyGAeF3vvKlo50EJ4k= - github.com/hanwen/go-fuse/v2 v2.1.1-0.20210825171523-3ab5d95a30ae/go.mod h1:B1nGE/6RBFyBRC1RRnf23UpwCdyJ31eukw34oAKukAc= + github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914 h1:hGXMxS1wTE4y+f7iBqFArrJ6X8QozHnEdnVzGZI9Ywc= + github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914/go.mod h1:B1nGE/6RBFyBRC1RRnf23UpwCdyJ31eukw34oAKukAc= -github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 h1:YuDUUFNM21CAbyPOpOP8BicaTD/0klJEKt5p8yuw+uY= -github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115/go.mod h1:LadVJg0XuawGk+8L1rYnIED8451UyNxEMdTWCEt5kmU= github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd h1:9GCSedGjMcLZCrusBZuo4tyKLpKUPenUUqi34AkuFmA= github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M= github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff h1:2xRHTvkpJ5zJmglXLRqHiZQNjUoOkhUyhTAhEQvPAWw= +@@ -30,21 +30,17 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= + golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +-golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c= +-golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= ++golang.org/x/net v0.0.0-20220708220712-1185a9018129 h1:vucSRfWwTsoXro7P+3Cjlr6flUMtzCwzlvkxEQtHHB0= ++golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= + golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo= + golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= ++golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= + golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc= + golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= + golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= ++golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= + golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= diff --git a/vendor/github.com/jacobsa/crypto/cmac/hash_generic.go b/vendor/github.com/jacobsa/crypto/cmac/hash_generic.go new file mode 100644 index 0000000..235e3fc @@ -109,7 +140,7 @@ index 0000000..235e3fc + } +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 662f0c3..9b47daa 100644 +index 0e97e42..634c079 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -5,19 +5,11 @@ github.com/hanwen/go-fuse/v2/fuse @@ -117,7 +148,7 @@ index 662f0c3..9b47daa 100644 github.com/hanwen/go-fuse/v2/internal/utimens github.com/hanwen/go-fuse/v2/splice -# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 -+# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 => github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607 ++# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 => github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 ## explicit github.com/jacobsa/crypto/cmac github.com/jacobsa/crypto/common @@ -133,20 +164,23 @@ index 662f0c3..9b47daa 100644 # github.com/pkg/xattr v0.4.3 ## explicit github.com/pkg/xattr -@@ -40,8 +32,6 @@ golang.org/x/crypto/pbkdf2 +@@ -39,9 +31,7 @@ golang.org/x/crypto/internal/subtle + golang.org/x/crypto/pbkdf2 golang.org/x/crypto/poly1305 golang.org/x/crypto/scrypt - golang.org/x/crypto/ssh/terminal -# golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d -## explicit - # golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 +-# golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 ++# golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a => golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 ## explicit golang.org/x/sys/cpu -@@ -52,3 +42,4 @@ golang.org/x/sys/windows - # golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b + golang.org/x/sys/internal/unsafeheader +@@ -51,3 +41,5 @@ golang.org/x/sys/windows + # golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 ## explicit golang.org/x/term -+# github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607 ++# github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 ++# golang.org/x/sys => golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 -- -2.35.1 +2.38.1 diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash index ae161d1cd8..28965a0648 100644 --- a/package/gocryptfs/gocryptfs.hash +++ b/package/gocryptfs/gocryptfs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 88f32bb8e18fa89e4ab666f7c8ad622281a11e423b4093e50ac260f960bc40b6 gocryptfs-2.2.1.tar.gz +sha256 bfc98c18e44a2ca24a0e1472b6d9bb96e6072d7fb5651616515d2e7117b8fed9 gocryptfs-2.3.tar.gz sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk index 8f70dba7c3..077597e7e8 100644 --- a/package/gocryptfs/gocryptfs.mk +++ b/package/gocryptfs/gocryptfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOCRYPTFS_VERSION = 2.2.1 +GOCRYPTFS_VERSION = 2.3 GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) GOCRYPTFS_LICENSE = MIT GOCRYPTFS_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:54:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:27 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.08.3 Message-ID: <20230220205200.533DD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f9f6180491c697b29aa687f378c2ab58c7f91fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard (cherry picked from commit 1fad7a933d28a17ce4064898e49e2ad4d6ba8bd3) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGES b/CHANGES index f71e53fe4b..312e324ef7 100644 --- a/CHANGES +++ b/CHANGES @@ -109,6 +109,22 @@ #15061: Node.js Package fails to build against musl i386 #15071: RTL8723BS library is outdated +2022.08.3, released December 10th, 2022 + + Important / security related fixes. + + Updated/fixed packages: asterisk, dash, dovecot, edk2, + edk2-platforms, elf2flt, exim, freerdp, gcc, gdb, git, gnupg2, + heimdal, iwd, kodi, libarchive, libkrb5, libksba, libmdbx, + libopenssl, matchbox-keyboard, memcached, netsnmp, nginx, + nodejs, openpgm, optee-client, python-scipy, python3, rsync, + rtl8723bu, samba4, sdl, sdl2, swupdate, sysstat, systemd, + uboot, vim, vlc, wilc-driver, xen, xterm + + Issues resolved (http://bugs.uclibc.org): + + 15131: Target GDB uses internal zlib + 2022.08.2, released November 16th, 2022 Important / security related fixes. From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:28 -0000 Subject: [Buildroot] [git commit branch/next] package/swig: bump to version 4.1.1 Message-ID: <20230220205205.5339586494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=260924e239627cbe1379cfc752939245d53a06e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/swig/Config.in.host | 2 +- package/swig/swig.hash | 2 +- package/swig/swig.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/swig/Config.in.host b/package/swig/Config.in.host index fd2049d30a..4c0deebc58 100644 --- a/package/swig/Config.in.host +++ b/package/swig/Config.in.host @@ -5,4 +5,4 @@ config BR2_PACKAGE_HOST_SWIG written in C and C++ with a variety of high-level programming languages. - http://www.swig.org/ + https://www.swig.org/ diff --git a/package/swig/swig.hash b/package/swig/swig.hash index 64fe4f979e..21590c422a 100644 --- a/package/swig/swig.hash +++ b/package/swig/swig.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc swig-4.0.2.tar.gz +sha256 2af08aced8fcd65cdb5cc62426768914bedc735b1c250325203716f78e39ac9b swig-4.1.1.tar.gz sha256 f53abaeed775018d519a1b9615f0ca17894772bd9ca21c2a156bf340ac41c13e LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-GPL sha256 7f50d942373a871211c5efee03f3db2f9efd1cff1002b0ef8e3748baa611a5c2 LICENSE-UNIVERSITIES diff --git a/package/swig/swig.mk b/package/swig/swig.mk index 437cf448be..d432cab53d 100644 --- a/package/swig/swig.mk +++ b/package/swig/swig.mk @@ -4,8 +4,8 @@ # ################################################################################ -SWIG_VERSION_MAJOR = 4.0 -SWIG_VERSION = $(SWIG_VERSION_MAJOR).2 +SWIG_VERSION_MAJOR = 4.1 +SWIG_VERSION = $(SWIG_VERSION_MAJOR).1 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION) HOST_SWIG_DEPENDENCIES = host-bison host-pcre HOST_SWIG_CONF_OPTS = \ From peter at korsgaard.com Mon Feb 20 20:54:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:28 -0000 Subject: [Buildroot] [git commit branch/next] docs/website: update for 2022.02.8 Message-ID: <20230220205200.7CACB828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8de04b2cb6d4734665c332d8714006ba77e8b962 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The announcement mail didn't make it to the mailman archive, so use the lore link instead. Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 6f7007529c..7fc5d1169b 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
        Download
        -

        Latest long term support release: 2022.02.7

        +

        Latest long term support release: 2022.02.8

        - +
        - +
        -

        buildroot-2022.02.7.tar.gz

        -

        PGP signature

        +

        buildroot-2022.02.8.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2022.02.7.tar.xz

        -

        PGP signature

        +

        buildroot-2022.02.8.tar.xz

        +

        PGP signature

        diff --git a/docs/website/news.html b/docs/website/news.html index 74ccd11b08..75f1cb785d 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

        News

          +
        • +
          +
          +
          +

          2022.02.8 released

          +

          10 December 2022

          +
          +
          +

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

          +
          +
          +
          • +
        • From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:29 -0000 Subject: [Buildroot] [git commit branch/next] support/testing/tests/package/test_ncdu.py: new runtime test Message-ID: <20230220205205.7BFBE86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ad775fc8118927bde9bf442bbb7e8307280e97d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_ncdu.py | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 20677ef8ce..04047d43da 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1683,6 +1683,7 @@ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ diff --git a/support/testing/tests/package/test_ncdu.py b/support/testing/tests/package/test_ncdu.py new file mode 100644 index 0000000000..cbbb27f751 --- /dev/null +++ b/support/testing/tests/package/test_ncdu.py @@ -0,0 +1,23 @@ +import os + +import infra.basetest + + +class TestNcdu(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_NCDU=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("ncdu --version") + self.assertRunOk("ncdu -x -o /tmp/ncdu.list /") + self.assertRunOk("grep -F '\"name\":\"ncdu\"' /tmp/ncdu.list") From yann.morin.1998 at free.fr Mon Feb 20 20:54:29 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:29 -0000 Subject: [Buildroot] [git commit branch/next] package/smcroute: bump to version 2.5.6 Message-ID: <20230220205200.B4FB78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61f03109c7d6b2a66462d920ee5f4b9f7530ca7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/troglobit/smcroute/releases/tag/2.5.6 Most important news from the ChangeLog: - Batch mode supoprt for smcroutectl - Fix strange behavior when joining/leaving the same group - Minor spelling checks of documentation Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg [yann.morin.1998 at free.fr: added news by Joachim] Signed-off-by: Yann E. MORIN --- package/smcroute/smcroute.hash | 4 ++-- package/smcroute/smcroute.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/smcroute/smcroute.hash b/package/smcroute/smcroute.hash index 642a1f62fe..b472dfbc04 100644 --- a/package/smcroute/smcroute.hash +++ b/package/smcroute/smcroute.hash @@ -1,5 +1,5 @@ -# Upstream .sha256 from GitHub -sha256 2569cd97fa2047df14203a7144be53a1b32928cb460421a302bbcce381b42bc3 smcroute-2.5.5.tar.gz +# Hash from https://github.com/troglobit/smcroute/releases/download/2.5.6/smcroute-2.5.6.tar.gz.sha256 +sha256 0be38f617e322daafaa941c02423239f5c117b940cf0f45bacadb6733c4b3916 smcroute-2.5.6.tar.gz # Locally generated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/smcroute/smcroute.mk b/package/smcroute/smcroute.mk index e6114c9a8c..0c4f88ab1b 100644 --- a/package/smcroute/smcroute.mk +++ b/package/smcroute/smcroute.mk @@ -4,7 +4,7 @@ # ################################################################################ -SMCROUTE_VERSION = 2.5.5 +SMCROUTE_VERSION = 2.5.6 SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION) SMCROUTE_LICENSE = GPL-2.0+ SMCROUTE_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:30 -0000 Subject: [Buildroot] [git commit branch/next] package/exempi: bump to version 2.6.3 Message-ID: <20230220205205.AB16E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63b540638c72969bf8c3eb6c06e1c49c4fbcbb9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Samples can be disabled since version 2.6.2 and https://gitlab.freedesktop.org/libopenraw/exempi/-/commit/a8db9f4e7e4156ee7e52def01f1f83ca5fa7de40 This bump will fix the following build failure on arm with gcc 10 raised since bump to version 2.6.0 in commit 55f1d0a3592253df2a356c195e5131a970eade9b and https://gitlab.freedesktop.org/libopenraw/exempi/-/commit/0872e35a30457d2ecf746a1bebdb7d94636d0e2f https://github.com/adobe/XMP-Toolkit-SDK/commit/0872e35a30457d2ecf746a1bebdb7d94636d0e2f thanks to https://gitlab.freedesktop.org/libopenraw/exempi/-/commit/f26d77ba26a7245a95068bca2eea9608f4e79f80: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../XMPFiles/source/.libs/libXMPFiles.a(XMPFiles_Impl.o):(.rodata+0x5c): multiple definition of `typeinfo name for TXMPMeta, std::allocator > >'; XMPFilesCoverage.o:(.rodata+0x0): first defined here https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.3/NEWS Fixes: - http://autobuild.buildroot.org/results/c440719de02a154c6bdae11bda06ea30c131c71d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/exempi/exempi.hash | 2 +- package/exempi/exempi.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/exempi/exempi.hash b/package/exempi/exempi.hash index 5df610de17..772d9130d4 100644 --- a/package/exempi/exempi.hash +++ b/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd exempi-2.6.1.tar.bz2 +sha256 80b3aa0b7f54978c6a49cc5f5f1d3b6e9524b59de74ef92b3bf0abeba4c28fb1 exempi-2.6.3.tar.xz sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index 56fbe20379..f808afd53c 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -4,11 +4,11 @@ # ################################################################################ -EXEMPI_VERSION = 2.6.1 -EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 +EXEMPI_VERSION = 2.6.3 +EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.xz EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES -EXEMPI_CONF_OPTS = --disable-unittest +EXEMPI_CONF_OPTS = --disable-samples --disable-unittest EXEMPI_DEPENDENCIES = host-pkgconf expat zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) EXEMPI_LICENSE = BSD-3-Clause From yann.morin.1998 at free.fr Mon Feb 20 20:54:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:30 -0000 Subject: [Buildroot] [git commit branch/next] package/sed: bump to version 4.9 Message-ID: <20230220205200.A93B9828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0aea5f9d8e63f6146730c39b05ec8cae15dd100 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update hash of COPYING (URL updated: https://git.savannah.gnu.org/cgit/sed.git/commit/?id=5adab913a82ef1b7f844339ab209531ccf198990) https://git.savannah.gnu.org/cgit/sed.git/tree/NEWS?h=v4.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/sed/sed.hash | 6 +++--- package/sed/sed.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sed/sed.hash b/package/sed/sed.hash index bb48128526..10e2c36d8f 100644 --- a/package/sed/sed.hash +++ b/package/sed/sed.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/sed/sed-4.8.tar.xz.sig +# https://ftp.gnu.org/gnu/sed/sed-4.9.tar.xz.sig # with the key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633 sed-4.8.tar.xz +sha256 6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181 sed-4.9.tar.xz # Locally calculated -sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 64fb2035b0..8165083658 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -4,7 +4,7 @@ # ################################################################################ -SED_VERSION = 4.8 +SED_VERSION = 4.9 SED_SOURCE = sed-$(SED_VERSION).tar.xz SED_SITE = $(BR2_GNU_MIRROR)/sed SED_LICENSE = GPL-3.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:31 -0000 Subject: [Buildroot] [git commit branch/next] package/capnproto: security bump to version 0.9.2 Message-ID: <20230220205205.D363786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=040ab175df6337bf39a609adea07a7756c309be8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-46149: Cap'n Proto is a data interchange format and remote procedure call (RPC) system. Cap'n Proro prior to versions 0.7.1, 0.8.1, 0.9.2, and 0.10.3, as well as versions of Cap'n Proto's Rust implementation prior to 0.13.7, 0.14.11, and 0.15.2 are vulnerable to out-of-bounds read due to logic error handling list-of-list. This issue may lead someone to remotely segfault a peer by sending it a malicious message, if the victim performs certain actions on a list-of-pointer type. Exfiltration of memory is possible if the victim performs additional certain actions on a list-of-pointer type. To be vulnerable, an application must perform a specific sequence of actions, described in the GitHub Security Advisory. The bug is present in inlined code, therefore the fix will require rebuilding dependent applications. Cap'n Proto has C++ fixes available in versions 0.7.1, 0.8.1, 0.9.2, and 0.10.3. https://github.com/capnproto/capnproto/security/advisories/GHSA-qqff-4vw4-f6hx https://dwrensha.github.io/capnproto-rust/2022/11/30/out_of_bounds_memory_access_bug.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/capnproto/capnproto.hash | 2 +- package/capnproto/capnproto.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash index 7fd0e6158b..c3233e7c8b 100644 --- a/package/capnproto/capnproto.hash +++ b/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 daf49f794560f715e2f4651c842aaece2d065d4216834c5c3d3254962e35b535 capnproto-0.9.1.tar.gz +sha256 4fe1ca8ab90859f33f08d2c4fcd7099e2983b0b946beecebd2fe051e3a64c67e capnproto-0.9.2.tar.gz sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk index 7fc07043fb..23f128455a 100644 --- a/package/capnproto/capnproto.mk +++ b/package/capnproto/capnproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAPNPROTO_VERSION = 0.9.1 +CAPNPROTO_VERSION = 0.9.2 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:31 -0000 Subject: [Buildroot] [git commit branch/next] package/python-munch: new package Message-ID: <20230220205200.885308648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=002a5f7ced3d148655ee0d58f5dc61a509d9e218 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/python-munch/Config.in | 7 +++++++ package/python-munch/python-munch.hash | 5 +++++ package/python-munch/python-munch.mk | 15 +++++++++++++++ 4 files changed, 28 insertions(+) diff --git a/package/Config.in b/package/Config.in index f4a423c7a6..d5a673295d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1128,6 +1128,7 @@ menu "External python modules" source "package/python-msgfy/Config.in" source "package/python-msgpack/Config.in" source "package/python-multidict/Config.in" + source "package/python-munch/Config.in" source "package/python-mutagen/Config.in" source "package/python-mwclient/Config.in" source "package/python-mwscrape/Config.in" diff --git a/package/python-munch/Config.in b/package/python-munch/Config.in new file mode 100644 index 0000000000..9db2623674 --- /dev/null +++ b/package/python-munch/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_MUNCH + bool "python-munch" + help + Munch is a dictionary that supports attribute-style access, + a la JavaScript. + + https://github.com/Infinidat/munch diff --git a/package/python-munch/python-munch.hash b/package/python-munch/python-munch.hash new file mode 100644 index 0000000000..7e32282833 --- /dev/null +++ b/package/python-munch/python-munch.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/munch/json +md5 ed84c3718416c8d4d03d0a6ef46e8e0c munch-2.5.0.tar.gz +sha256 2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2 munch-2.5.0.tar.gz +# Locally computed sha256 checksums +sha256 57ca95c92059c8380625192462979bd32994aae3fcdf902ff6eb1e467eeb0469 LICENSE.txt diff --git a/package/python-munch/python-munch.mk b/package/python-munch/python-munch.mk new file mode 100644 index 0000000000..85f6803f07 --- /dev/null +++ b/package/python-munch/python-munch.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-munch +# +################################################################################ + +PYTHON_MUNCH_VERSION = 2.5.0 +PYTHON_MUNCH_SOURCE = munch-$(PYTHON_MUNCH_VERSION).tar.gz +PYTHON_MUNCH_SITE = https://files.pythonhosted.org/packages/43/a1/ec48010724eedfe2add68eb7592a0d238590e14e08b95a4ffb3c7b2f0808 +PYTHON_MUNCH_SETUP_TYPE = setuptools +PYTHON_MUNCH_LICENSE = MIT +PYTHON_MUNCH_LICENSE_FILES = LICENSE.txt +PYTHON_MUNCH_DEPENDENCIES = host-python-pbr + +$(eval $(python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:54:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:32 -0000 Subject: [Buildroot] [git commit branch/next] package/python-boto3: bump to version 1.26.27 Message-ID: <20230220205200.F34A88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3277b274ce0a1ae356d07a944c5df6b019d97bef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-boto3/python-boto3.hash | 4 ++-- package/python-boto3/python-boto3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-boto3/python-boto3.hash b/package/python-boto3/python-boto3.hash index 347acde9b2..60fd07681c 100644 --- a/package/python-boto3/python-boto3.hash +++ b/package/python-boto3/python-boto3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/boto3/json -md5 17f5f946d79da139fa9fd9b014fe0d99 boto3-1.26.0.tar.gz -sha256 8f0e4eb5c26f927c09bc03302d38156af578b816f1e4f8ca4f0f734d134b9d4f boto3-1.26.0.tar.gz +md5 9d5447419233a259b3ade6fb86d86cb6 boto3-1.26.27.tar.gz +sha256 255a7565226c21c5d500f69aabb977e1ac07dbaf576f4428d00558e8e508a23b boto3-1.26.27.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/python-boto3/python-boto3.mk b/package/python-boto3/python-boto3.mk index 03dc32a08b..e40ac92f09 100644 --- a/package/python-boto3/python-boto3.mk +++ b/package/python-boto3/python-boto3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTO3_VERSION = 1.26.0 +PYTHON_BOTO3_VERSION = 1.26.27 PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz -PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/77/18/91af4ff58b26d03af8bf8e0759c4087b77032bdc54199d750905080c669a +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/62/7b/7cdcb980d9d90c910a6abec2cdee0ff6aa7a3d8afea4044ffd968d5c107c PYTHON_BOTO3_SETUP_TYPE = setuptools PYTHON_BOTO3_LICENSE = Apache-2.0 PYTHON_BOTO3_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:32 -0000 Subject: [Buildroot] [git commit branch/next] package/hans: bump to version 1.1 Message-ID: <20230220205206.1303786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f8dacd79bb578b61b710d626cfa82ed64d5a2ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/friedrich/hans/blob/v1.1/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hans/hans.hash | 6 +++--- package/hans/hans.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/hans/hans.hash b/package/hans/hans.hash index c555528efb..a1f591eb1c 100644 --- a/package/hans/hans.hash +++ b/package/hans/hans.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/hanstunnel/files/source/ -md5 8628393ec1b61a6c3a47a0a3dcb455b3 hans-1.0.tar.gz -sha1 0bc857df109af222732cb95c861a0f0a6dd53dee hans-1.0.tar.gz +md5 d23fbaeb990ed7d05695fcc8f8ef7847 hans-1.1.tar.gz +sha1 15dd4b717e8808d9279af970d4826aad826bc849 hans-1.1.tar.gz # Locally computed -sha256 f8f70cf22ba14d9223695c9e9a2d75289d8360f61f533b83ee538836f29a458e hans-1.0.tar.gz +sha256 966962d8734ab6b4d871e035d08f45256025a5220216bd48e41fa7fd0ad136c5 hans-1.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/hans/hans.mk b/package/hans/hans.mk index e26c2f37f8..6d2b1dabe5 100644 --- a/package/hans/hans.mk +++ b/package/hans/hans.mk @@ -4,7 +4,7 @@ # ################################################################################ -HANS_VERSION = 1.0 +HANS_VERSION = 1.1 HANS_SITE = http://downloads.sourceforge.net/project/hanstunnel/source HANS_LICENSE = GPL-3.0+ HANS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:33 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:33 -0000 Subject: [Buildroot] [git commit branch/next] package/python-botocore: bump to version 1.29.27 Message-ID: <20230220205201.0B3ED86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1eeac3dbfe32130bd15b9e9675891e68b12c38d0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-botocore/python-botocore.hash | 4 ++-- package/python-botocore/python-botocore.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-botocore/python-botocore.hash b/package/python-botocore/python-botocore.hash index 72e64f521e..8314c534e9 100644 --- a/package/python-botocore/python-botocore.hash +++ b/package/python-botocore/python-botocore.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/botocore/json -md5 fae1e9ad89e12436ef65b8208febdc3e botocore-1.29.0.tar.gz -sha256 f25dc0827005f81abf4b890a20c71f64ee40ea9e9795df38a242fdeed79e0a89 botocore-1.29.0.tar.gz +md5 488df64a4fcd884f9fbcf990bdc8b34c botocore-1.29.27.tar.gz +sha256 0932b22d8737b11037adf7e734f9b90425b575d0757e4c1a035e99f382955221 botocore-1.29.27.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt diff --git a/package/python-botocore/python-botocore.mk b/package/python-botocore/python-botocore.mk index 9d2a94b39b..4b14af4368 100644 --- a/package/python-botocore/python-botocore.mk +++ b/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.29.0 +PYTHON_BOTOCORE_VERSION = 1.29.27 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/0a/95/8f31139077187f2da9132d7547979262376e19056d99c7cf6278431a53de +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/08/3f/e9f97b0700e0be670404a7d4a9ac62fd59495897f15c928dd38874e98ef7 PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:33 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: add staging install Message-ID: <20230220205206.05DA886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb2f2886b2364e5b6a0867f55106bf83acb064e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next SWupdate provides API for external programs, so some headers and libraries must be install to staging. This patch installs headers and libs to STAGING_DIR, to prevent a header name collision a subdirectory /usr/include/swupdate creates. Signed-off-by: Andrey Grafin Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index ed0c1e56a8..54ae03f238 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -17,6 +17,7 @@ SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ LICENSES/LGPL-2.1-or-later.txt \ LICENSES/MIT.txt \ LICENSES/OFL-1.1.txt +SWUPDATE_INSTALL_STAGING = YES # swupdate uses $CROSS-cc instead of $CROSS-gcc, which is not # available in all external toolchains, and use CC for linking. Ensure @@ -228,6 +229,11 @@ define SWUPDATE_BUILD_CMDS $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) $(SWUPDATE_MAKE_OPTS) endef +define SWUPDATE_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ + $(SWUPDATE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) INCLUDEDIR=/usr/include/swupdate install +endef + define SWUPDATE_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ $(SWUPDATE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install From yann.morin.1998 at free.fr Mon Feb 20 20:54:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:34 -0000 Subject: [Buildroot] [git commit branch/next] package/python-bitstring: bump to version 4.0.1 Message-ID: <20230220205200.E6B4D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=332af506d3451c0bfe8e78624b25bf87fcebdddb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-bitstring/python-bitstring.hash | 6 +++--- package/python-bitstring/python-bitstring.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-bitstring/python-bitstring.hash b/package/python-bitstring/python-bitstring.hash index f05619a5d3..f078cc7f14 100644 --- a/package/python-bitstring/python-bitstring.hash +++ b/package/python-bitstring/python-bitstring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bitstring/json -md5 04d24380a0dc491e6bdacd983a90912e bitstring-3.1.9.tar.gz -sha256 a5848a3f63111785224dca8bb4c0a75b62ecdef56a042c8d6be74b16f7e860e7 bitstring-3.1.9.tar.gz +md5 ffd806650062e2fae33ee19b51906924 bitstring-4.0.1.tar.gz +sha256 7719f08f6df89ce28453a5e580d4a8ec1d1bda892dbb033466da0ccd9bdcb706 bitstring-4.0.1.tar.gz # Locally computed sha256 checksums -sha256 a9e9c584106d4f9686c9a6aa036e507b5e7044633b8acb4365bc074d8d004711 LICENSE +sha256 3705eed5a923f35d9bfaca1f10e9136cc84d6e576570aec661bda69991f129ea LICENSE diff --git a/package/python-bitstring/python-bitstring.mk b/package/python-bitstring/python-bitstring.mk index ff59487540..11c9375707 100644 --- a/package/python-bitstring/python-bitstring.mk +++ b/package/python-bitstring/python-bitstring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BITSTRING_VERSION = 3.1.9 +PYTHON_BITSTRING_VERSION = 4.0.1 PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz -PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/4c/b1/80d58eeb21c9d4ca739770558d61f6adacb13aa4908f4f55e0974cbd25ee +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/d2/64/e733b18349be383a4b7859c865d6c9e5ccc5845e9b4258504055607ec1cb PYTHON_BITSTRING_SETUP_TYPE = setuptools PYTHON_BITSTRING_LICENSE = MIT PYTHON_BITSTRING_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:35 -0000 Subject: [Buildroot] [git commit branch/next] package/pugixml: bump to version 1.13 Message-ID: <20230220205206.4E42E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc47afdc57cb7bdff3c4481607b2887f8a9cae94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://pugixml.org/docs/manual.html#v1.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pugixml/pugixml.hash | 2 +- package/pugixml/pugixml.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pugixml/pugixml.hash b/package/pugixml/pugixml.hash index 190dfb6a6e..b828e03561 100644 --- a/package/pugixml/pugixml.hash +++ b/package/pugixml/pugixml.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dcf671a919cc4051210f08ffd3edf9e4247f79ad583c61577a13ee93af33afc7 pugixml-1.12.1.tar.gz +sha256 40c0b3914ec131485640fa57e55bf1136446026b41db91c1bef678186a12abbe pugixml-1.13.tar.gz sha256 206f671b6d342557adcc973088c2c638df0ec0b1dabbcd24e65aadd2191778d2 LICENSE.md diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 9137f04630..c796186827 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PUGIXML_VERSION = 1.12.1 +PUGIXML_VERSION = 1.13 PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Feb 20 20:54:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:35 -0000 Subject: [Buildroot] [git commit branch/next] package/python-cbor2: bump to version 5.4.6 Message-ID: <20230220205201.2E6A786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eff0a0852830e05d2ed79dd8c744afff7d126002 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cbor2/python-cbor2.hash | 4 ++-- package/python-cbor2/python-cbor2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cbor2/python-cbor2.hash b/package/python-cbor2/python-cbor2.hash index 6098273aa1..70c35ca864 100644 --- a/package/python-cbor2/python-cbor2.hash +++ b/package/python-cbor2/python-cbor2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cbor2/json -md5 358b18e2a96ab96945e33417d5c8cb31 cbor2-5.4.3.tar.gz -sha256 62b863c5ee6ced4032afe948f3c1484f375550995d3b8498145237fe28e546c2 cbor2-5.4.3.tar.gz +md5 74512376482be8a6af10596a63b6d254 cbor2-5.4.6.tar.gz +sha256 b893500db0fe033e570c3adc956af6eefc57e280026bd2d86fd53da9f1e594d7 cbor2-5.4.6.tar.gz # Locally computed sha256 checksums sha256 a6afd126d8f545a15166a22f25fadff4b9fb4978bbdd17e97d97d950b66d2fef LICENSE.txt diff --git a/package/python-cbor2/python-cbor2.mk b/package/python-cbor2/python-cbor2.mk index 743ae4ef6f..a2fcd73b74 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.4.3 +PYTHON_CBOR2_VERSION = 5.4.6 PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/9d/c9/cfa5c35a62642a19c14bf9a12dfbf0ee134466be1f062df2258a2ec2f2f7 +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d9/69/de486293f5211d2e8fe1a19854e69f2811a18448162c52b48c67f8fbcac3 PYTHON_CBOR2_SETUP_TYPE = setuptools PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:36 -0000 Subject: [Buildroot] [git commit branch/next] package/docker-cli: security bump to version 20.10.21 Message-ID: <20230220205206.67E4986494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c833234cb4eb46cf95dbc3d4f32e1d2d2dab23b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Partial mitigations for CVE-2022-39253 Git vulnerability and other fixes: https://github.com/moby/moby/releases/tag/v20.10.21 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 153e0e5d00..d9477cf3af 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f4398ad858274605f8e4e55d4618b2f5bdff6969a4afa232842bb2417d8a98db docker-cli-20.10.19.tar.gz +sha256 f0f62ca1c80e8fd5b9e140ca64ef3e75dc7cf7a28040b3d10b260307128946e8 docker-cli-20.10.21.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 1fac21790b..a14edb2c31 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.19 +DOCKER_CLI_VERSION = 20.10.21 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Mon Feb 20 20:54:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:36 -0000 Subject: [Buildroot] [git commit branch/next] package/python-certifi: bump to version 2022.12.7 Message-ID: <20230220205201.39EC186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35db8c433e3a283a7611eca1b7e27e8cee474a4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-certifi/python-certifi.hash | 4 ++-- package/python-certifi/python-certifi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index 0557a5c97c..d3cf24ecfa 100644 --- a/package/python-certifi/python-certifi.hash +++ b/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 ff9c8d5c7e7fb083de6b874609c5ca68 certifi-2022.9.24.tar.gz -sha256 0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 certifi-2022.9.24.tar.gz +md5 d00966473b8ac42c2c033b75f4bed6f4 certifi-2022.12.7.tar.gz +sha256 35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 certifi-2022.12.7.tar.gz # Locally computed sha256 checksums sha256 a02f6c638f9fb84d06f7764c3ab085d8af7eda5b93c166da54312479077c6fb0 LICENSE diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index 8e2435199f..70f9e69d2c 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2022.9.24 +PYTHON_CERTIFI_VERSION = 2022.12.7 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/cb/a4/7de7cd59e429bd0ee6521ba58a75adaec136d32f91a761b28a11d8088d44 +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/37/f7/2b1b0ec44fdc30a3d31dfebe52226be9ddc40cd6c0f34ffc8923ba423b69 PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:37 -0000 Subject: [Buildroot] [git commit branch/next] package/fail2ban: bump to version 1.0.2 Message-ID: <20230220205206.950A886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de7850f9464a686fc7f37a8c1f8880f47ebffb00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/fail2ban/fail2ban/blob/1.0.2/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/fail2ban/fail2ban.hash | 2 +- package/fail2ban/fail2ban.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fail2ban/fail2ban.hash b/package/fail2ban/fail2ban.hash index 4073efe4c7..b40922e70a 100644 --- a/package/fail2ban/fail2ban.hash +++ b/package/fail2ban/fail2ban.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 62b54679ebae81ac57f32c5e27aba9f2494ec5bafd45a0fd68e7a27fd448e5ac fail2ban-1.0.1.tar.gz +sha256 ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23 fail2ban-1.0.2.tar.gz sha256 a75fec0260742fe6275d63ff6a5d97b924b28766558306b3fa4069763096929b COPYING diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk index 288266c2c7..7ad22d02d1 100644 --- a/package/fail2ban/fail2ban.mk +++ b/package/fail2ban/fail2ban.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAIL2BAN_VERSION = 1.0.1 +FAIL2BAN_VERSION = 1.0.2 FAIL2BAN_SITE = $(call github,fail2ban,fail2ban,$(FAIL2BAN_VERSION)) FAIL2BAN_LICENSE = GPL-2.0+ FAIL2BAN_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:54:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:37 -0000 Subject: [Buildroot] [git commit branch/next] package/python-cryptography: bump to version 38.0.4 Message-ID: <20230220205201.695CA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f0ceb49be6a5e3439fa6da226d4e414b5a208ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cryptography/python-cryptography.hash | 2 +- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 40d217f666..a01c8810e3 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 cd0b4536eabc6fcb80aa03430fc2ca485d33249eea0cd23f76c1dd9da410c66c cryptography-38.0.3.tar.gz +sha256 2abbeb6d42e8844de036bf2e0d78a42feeee1d57ebf29a07684490f98bdcab37 cryptography-38.0.4.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 69eb90d795..4254fa3557 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 38.0.3 +PYTHON_CRYPTOGRAPHY_VERSION = 38.0.4 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/13/dd/a9608b7aebe5d2dc0c98a4b2090a6b815628efa46cc1c046b89d8cd25f4c +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/e3/3f/41186b1f2fd86a542d399175f6b8e43f82cd4dfa51235a0b030a042b811a PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From yann.morin.1998 at free.fr Mon Feb 20 20:54:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:38 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-voodoo: bump version to 1.2.6 Message-ID: <20230220205207.4E7EB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5a0c2b779afa886cd1d79dc242f834ed0b87644 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003298.html Added hash file, removed autoreconf. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.hash | 5 +++++ .../x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.hash b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.hash new file mode 100644 index 0000000000..1220ec6c2f --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.hash @@ -0,0 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2022-December/003298.html +sha256 622973f03ac0bd0c854794ebeac268f15f4f831ec0dbe36e6cfa2b65042af602 xf86-video-voodoo-1.2.6.tar.xz +sha512 c889d79044438d6b15efceda07f63874063a2faa24a86d048e62c8ad1364efdfec04ff7ec662ad0749d2a7263abb14edb74e7d5ebf9a1aa880edb2b341a80a31 xf86-video-voodoo-1.2.6.tar.xz +# Locally computed +sha256 59ed98e3f6c6d0358d75183cf18a295d807acf2c3ea489197dd0a287b6e39bf1 COPYING diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk index d6deaa7974..33264a0bb7 100644 --- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk +++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk @@ -4,11 +4,11 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VOODOO_VERSION = 9172ae566a0e85313fc80ab62b4455393eefe593 -XDRIVER_XF86_VIDEO_VOODOO_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-voodoo +XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.2.6 +XDRIVER_XF86_VIDEO_VOODOO_SOURCE = xf86-video-voodoo-$(XDRIVER_XF86_VIDEO_VOODOO_VERSION).tar.xz +XDRIVER_XF86_VIDEO_VOODOO_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_VOODOO_LICENSE = MIT XDRIVER_XF86_VIDEO_VOODOO_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = YES XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xorgproto $(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:54:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:38 -0000 Subject: [Buildroot] [git commit branch/next] package/python-cheroot: bump to version 9.0.0 Message-ID: <20230220205201.5C8C186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25aedae85112ee9225f23863587807bdef67580c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cheroot/python-cheroot.hash | 4 ++-- package/python-cheroot/python-cheroot.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cheroot/python-cheroot.hash b/package/python-cheroot/python-cheroot.hash index e538d1fcdc..c3556109cd 100644 --- a/package/python-cheroot/python-cheroot.hash +++ b/package/python-cheroot/python-cheroot.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cheroot/json -md5 70247d0948899f453b50e6181cddd0d7 cheroot-8.6.0.tar.gz -sha256 366adf6e7cac9555486c2d1be6297993022eff6f8c4655c1443268cca3f08e25 cheroot-8.6.0.tar.gz +md5 1617fdbaba7d6edbe5b0ff48f7563111 cheroot-9.0.0.tar.gz +sha256 3d47ad9ee19ecbec144b4758399036692fdbf67a40b96eef1fb1454367b3d338 cheroot-9.0.0.tar.gz # Locally computed sha256 checksums sha256 e20feeb491a7e98084f15719349e9857aad41c4503c5e479f8815b063dbf7564 LICENSE.md diff --git a/package/python-cheroot/python-cheroot.mk b/package/python-cheroot/python-cheroot.mk index 95f2e39480..f75065c7da 100644 --- a/package/python-cheroot/python-cheroot.mk +++ b/package/python-cheroot/python-cheroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHEROOT_VERSION = 8.6.0 +PYTHON_CHEROOT_VERSION = 9.0.0 PYTHON_CHEROOT_SOURCE = cheroot-$(PYTHON_CHEROOT_VERSION).tar.gz -PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/99/c4/9b5ca09208047f2689c24ee63e195aa01ceffb7857d715cabc046559ddd6 +PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/8c/e7/8e6387d59a352c5799e917a23e7b76771a8bb97322c1ce7e42934d0066c3 PYTHON_CHEROOT_LICENSE = BSD-3-Clause PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md PYTHON_CHEROOT_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:39 -0000 Subject: [Buildroot] [git commit branch/next] package/sscep: requires blowfish support in openssl Message-ID: <20230220205207.A5B6286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4fc5e48521082d1b3cd9d96efc34979969d745b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Enable blowfish in openssl to fix the following build failure raised since the addition of the package in commit 72fa60dc102679f51b228336ec38f5af78ff7646: src/sscep.c: In function 'get_cipher_alg': src/sscep.c:123:24: warning: implicit declaration of function 'EVP_bf_cbc'; did you mean 'EVP_sm4_cbc'? [-Wimplicit-function-declaration] 123 | return EVP_bf_cbc(); | ^~~~~~~~~~ | EVP_sm4_cbc Fixes: - http://autobuild.buildroot.org/results/55d2c481d8c148fb3bb61c1331340bcd71274553 Signed-off-by: Fabrice Fontaine Reviewed-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/sscep/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sscep/Config.in b/package/sscep/Config.in index 4b9039c9b2..2e5e29f7c8 100644 --- a/package/sscep/Config.in +++ b/package/sscep/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SSCEP bool "sscep" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL help SSCEP is a client-only implementation of the SCEP From yann.morin.1998 at free.fr Mon Feb 20 20:54:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:39 -0000 Subject: [Buildroot] [git commit branch/next] package/python-django: bump to version 4.1.4 Message-ID: <20230220205201.84B73828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=045e99044223cfc707f5969791d7db2be8c5aa9b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop no longer required pytz and setuptools runtime dependencies. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-django/Config.in | 3 --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/python-django/Config.in b/package/python-django/Config.in index 8ffceb7275..5830cadc93 100644 --- a/package/python-django/Config.in +++ b/package/python-django/Config.in @@ -3,10 +3,7 @@ config BR2_PACKAGE_PYTHON_DJANGO select BR2_PACKAGE_PYTHON3_UNICODEDATA select BR2_PACKAGE_PYTHON3_PYEXPAT select BR2_PACKAGE_PYTHON_ASGIREF # runtime - select BR2_PACKAGE_PYTHON_PYTZ # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_SQLPARSE # runtime - help Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design. It takes your diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index b9ae8a1da1..40526bc0ff 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 60c54c37ecf9e5e635ee6bb07a13a9fa Django-4.1.3.tar.gz -sha256 678bbfc8604eb246ed54e2063f0765f13b321a50526bdc8cb1f943eda7fa31f1 Django-4.1.3.tar.gz +md5 02e2222d064d800f37c6a0ba78ce87f3 Django-4.1.4.tar.gz +sha256 d38a4e108d2386cb9637da66a82dc8d0733caede4c83c4afdbda78af4214211b Django-4.1.4.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index c90caa9635..96ec53f82c 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.3 +PYTHON_DJANGO_VERSION = 4.1.4 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/d0/ab/33f9c2bd4cf7ff2d319131eca7231247f962f781ebc8a012ebe02582244a +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/de/7d/ca5d224f7d345b0defd0a57c6deb0c6115fbe5304e4d9571f728b617f1a3 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:40 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/zcu106/patches: fix build by dropping U-Boot patch Message-ID: <20230220205207.C218D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca9b63a1e0bfa474a75522e62d671ed8b080f19f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since commit 3c997c457a4ee33d81e6b93e4f6f147bb9e861e9 ("configs/zynqmp_zcu106_defconfig: bump to Xilinx 2022.2"), we're using U-Boot version Xilinx 2022.2, which already carries the psu_init_gpl.c, causing the build to fail as our patch doesn't apply. Fix this by dropping the no longer needed patch. Fixes: 3c997c457a4ee33d81e6b93e4f6f147bb9e861e9 ("configs/zynqmp_zcu106_defconfig: bump to Xilinx 2022.2") Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- ...p-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch | 40 ---------------------- configs/zynqmp_zcu106_defconfig | 1 - 2 files changed, 41 deletions(-) diff --git a/board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch b/board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch deleted file mode 100644 index 4281880da0..0000000000 --- a/board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch +++ /dev/null @@ -1,40 +0,0 @@ -From aaaa10b613165b7790fe1c084de007240b5bd77a Mon Sep 17 00:00:00 2001 -From: Neal Frager -Date: Thu, 5 May 2022 13:34:43 +0100 -Subject: [PATCH 1/1] arm64: zynqmp: zynqmp-zcu102-revA: Fix DP PLL - configuration - -This patch fixes the DP audio and video PLL configurations -for the zynqmp-zcu106-revA evaluation board - -The Linux DP driver expects the DP to be using the following PLL config: - - DP video PLL should use the VPLL (0x0) - - DP audio PLL should use the RPLL (0x3) - -Register 0xFD1A0070 configures the DP video PLL. -Register 0xFD1A0074 configures the DP audio PLL. - -Signed-off-by: Neal Frager -Signed-off-by: Michal Simek ---- - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 15f0be1a43..cbc436289f 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -81,8 +81,8 @@ static unsigned long psu_clock_init_data(void) - psu_mask_write(0xFF5E0104, 0x00000007U, 0x00000000U); - psu_mask_write(0xFF5E0128, 0x01003F07U, 0x01000F00U); - psu_mask_write(0xFD1A00A0, 0x01003F07U, 0x01000200U); -- psu_mask_write(0xFD1A0070, 0x013F3F07U, 0x01010203U); -- psu_mask_write(0xFD1A0074, 0x013F3F07U, 0x01013C00U); -+ psu_mask_write(0xFD1A0070, 0x013F3F07U, 0x01010500U); -+ psu_mask_write(0xFD1A0074, 0x013F3F07U, 0x01013C03U); - psu_mask_write(0xFD1A007C, 0x013F3F07U, 0x01011303U); - psu_mask_write(0xFD1A0060, 0x03003F07U, 0x03000100U); - psu_mask_write(0xFD1A0068, 0x01003F07U, 0x01000200U); --- -2.17.1 - diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index dcbc4319e8..699e528f32 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -36,4 +36,3 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/zcu106/patches" From yann.morin.1998 at free.fr Mon Feb 20 20:54:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:40 -0000 Subject: [Buildroot] [git commit branch/next] package/python-reedsolo: new package Message-ID: <20230220205201.A9B88828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ef0959eabce0cf3f155b8959fdd06e6018c86e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/python-reedsolo/Config.in | 6 ++++++ package/python-reedsolo/python-reedsolo.hash | 5 +++++ package/python-reedsolo/python-reedsolo.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/package/Config.in b/package/Config.in index d5a673295d..6804e1d418 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1231,6 +1231,7 @@ menu "External python modules" source "package/python-qrcode/Config.in" source "package/python-raven/Config.in" source "package/python-redis/Config.in" + source "package/python-reedsolo/Config.in" source "package/python-reentry/Config.in" source "package/python-regex/Config.in" source "package/python-remi/Config.in" diff --git a/package/python-reedsolo/Config.in b/package/python-reedsolo/Config.in new file mode 100644 index 0000000000..6482b1e98c --- /dev/null +++ b/package/python-reedsolo/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_REEDSOLO + bool "python-reedsolo" + help + Pure-Python Reed Solomon encoder/decoder. + + https://github.com/tomerfiliba/reedsolomon diff --git a/package/python-reedsolo/python-reedsolo.hash b/package/python-reedsolo/python-reedsolo.hash new file mode 100644 index 0000000000..fdafc89f49 --- /dev/null +++ b/package/python-reedsolo/python-reedsolo.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/reedsolo/json +md5 b67a04027a1825c63a63b6793ec660a3 reedsolo-1.6.0.tar.gz +sha256 4e290d3b0a7207ac7aac186790766c752b5fcdf5e0b04dfd260349579052bbac reedsolo-1.6.0.tar.gz +# Locally computed sha256 checksums +sha256 0babd7b573efc3dcf5bb3c28b583150726f775d3dd8d54d6cd062834735b3d73 LICENSE diff --git a/package/python-reedsolo/python-reedsolo.mk b/package/python-reedsolo/python-reedsolo.mk new file mode 100644 index 0000000000..2a7fd42a05 --- /dev/null +++ b/package/python-reedsolo/python-reedsolo.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-reedsolo +# +################################################################################ + +PYTHON_REEDSOLO_VERSION = 1.6.0 +PYTHON_REEDSOLO_SOURCE = reedsolo-$(PYTHON_REEDSOLO_VERSION).tar.gz +PYTHON_REEDSOLO_SITE = https://files.pythonhosted.org/packages/9b/10/28d1492cc82a103bc06f18cb9a9dbb3a9168ab2e4068801fa0aa0c76b231 +PYTHON_REEDSOLO_SETUP_TYPE = setuptools +PYTHON_REEDSOLO_LICENSE = Public Domain +PYTHON_REEDSOLO_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:41 -0000 Subject: [Buildroot] [git commit branch/next] configs/versal_vck190_defconfig: use correct u-boot.dtb in boot.bin Message-ID: <20230220205207.DD74386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c19e0bdc5621518986dfa04ced0dadd3c53e193c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch fixes a problem in the vck190 boot.bin generation as it should be using the u-boot.dtb as the u-boot device tree and not the Linux system.dtb. While both dtbs are basically the same, it is better not to mix this up. Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- board/versal/post-image.sh | 2 +- board/versal/uboot.fragment | 1 + configs/versal_vck190_defconfig | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh index 890522c31d..f45f29a155 100755 --- a/board/versal/post-image.sh +++ b/board/versal/post-image.sh @@ -24,7 +24,7 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" } image { id = 0x1c000000, name=apu_subsystem - { type=raw, load=0x00001000, file=${BINARIES_DIR}/system.dtb } + { type=raw, load=0x00001000, file=${BINARIES_DIR}/u-boot.dtb } { core=a72-0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf } { core=a72-0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf } } diff --git a/board/versal/uboot.fragment b/board/versal/uboot.fragment new file mode 100644 index 0000000000..6f71907379 --- /dev/null +++ b/board/versal/uboot.fragment @@ -0,0 +1 @@ +CONFIG_OF_SEPARATE=y diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index d87df221c6..fcda6eb431 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -25,10 +25,12 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/versal/uboot.fragment" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y +BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_PACKAGE_VERSAL_FIRMWARE=y BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="v2022.2" BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" From yann.morin.1998 at free.fr Mon Feb 20 20:54:41 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:41 -0000 Subject: [Buildroot] [git commit branch/next] package/python-dnspython: bump to version 2.2.1 Message-ID: <20230220205201.9203C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7b796406e93b405ad9c276ac96fef7c4007cb15 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Backport patch removing wheel dependency. Add new host-python-setuptools-scm build dependency. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- ...01-Remove-spurious-wheel-build-dependency.patch | 29 ++++++++++++++++++++++ package/python-dnspython/python-dnspython.hash | 4 +-- package/python-dnspython/python-dnspython.mk | 20 ++++----------- 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch b/package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch new file mode 100644 index 0000000000..b43217edad --- /dev/null +++ b/package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch @@ -0,0 +1,29 @@ +From 53b989e4ce32c941d748ad33502600497595914a Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Wed, 2 Nov 2022 14:01:58 -0600 +Subject: [PATCH] Remove spurious wheel build dependency + +Wheel isn't a build dependency so it shouldn't be in setup_requires. +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +53b989e4ce32c941d748ad33502600497595914a] +--- + setup.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.cfg b/setup.cfg +index 0abd270..2cb3e06 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -46,7 +46,7 @@ packages = + dns.rdtypes.CH + python_requires = >=3.7 + test_suite = tests +-setup_requires = setuptools>=44; wheel; setuptools_scm[toml]>=3.4.3 ++setup_requires = setuptools>=44; setuptools_scm[toml]>=3.4.3 + + [options.extras_require] + DOH = httpx>=0.21.1; h2>=4.1.0; requests; requests-toolbelt +-- +2.34.1 + diff --git a/package/python-dnspython/python-dnspython.hash b/package/python-dnspython/python-dnspython.hash index c9c74c8d75..29441b41ea 100644 --- a/package/python-dnspython/python-dnspython.hash +++ b/package/python-dnspython/python-dnspython.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dnspython/json -md5 8a362d7b2358be3117683e2dbf9654fc dnspython-2.1.0.zip -sha256 e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4 dnspython-2.1.0.zip +md5 c7172f4115cd7b60fd5037cfcd8f9408 dnspython-2.2.1.tar.gz +sha256 0f7569a4a6ff151958b64304071d370daa3243d15941a7beedf0c9fe5105603e dnspython-2.2.1.tar.gz # Locally computed sha256 checksums sha256 c3ea3ff5654b329c19d3bc5f7481af623c3dded4a6145585499f843ad3d741cd LICENSE diff --git a/package/python-dnspython/python-dnspython.mk b/package/python-dnspython/python-dnspython.mk index 77e6082807..43030ae476 100644 --- a/package/python-dnspython/python-dnspython.mk +++ b/package/python-dnspython/python-dnspython.mk @@ -4,24 +4,14 @@ # ################################################################################ -PYTHON_DNSPYTHON_VERSION = 2.1.0 -PYTHON_DNSPYTHON_SOURCE = dnspython-$(PYTHON_DNSPYTHON_VERSION).zip -PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/13/27/5277de856f605f3429d752a39af3588e29d10181a3aa2e2ee471d817485a +PYTHON_DNSPYTHON_VERSION = 2.2.1 +PYTHON_DNSPYTHON_SOURCE = dnspython-$(PYTHON_DNSPYTHON_VERSION).tar.gz +PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/99/fb/e7cd35bba24295ad41abfdff30f6b4c271fd6ac70d20132fa503c3e768e0 PYTHON_DNSPYTHON_LICENSE = ISC PYTHON_DNSPYTHON_LICENSE_FILES = LICENSE PYTHON_DNSPYTHON_SETUP_TYPE = setuptools - -define PYTHON_DNSPYTHON_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(PYTHON_DNSPYTHON_DL_DIR)/$(PYTHON_DNSPYTHON_SOURCE) - mv $(@D)/dnspython-$(PYTHON_DNSPYTHON_VERSION)/* $(@D) - $(RM) -r $(@D)/dnspython-$(PYTHON_DNSPYTHON_VERSION) -endef - -define HOST_PYTHON_DNSPYTHON_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(HOST_PYTHON_DNSPYTHON_DL_DIR)/$(HOST_PYTHON_DNSPYTHON_SOURCE) - mv $(@D)/dnspython-$(HOST_PYTHON_DNSPYTHON_VERSION)/* $(@D) - $(RM) -r $(@D)/dnspython-$(HOST_PYTHON_DNSPYTHON_VERSION) -endef +PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm +HOST_PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:42 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-mediasdk: bump version to 22.6.4 Message-ID: <20230220205208.4C19F86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=193ea75cc03fe829aa8a04bc2335f426892998d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 e4fd569830..7cbedb7127 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a47a554cb3055614a8041cf478c4c89e249c2157c7e98389fbaba6144dc18783 intel-mediasdk-22.6.3.tar.gz +sha256 197acd056f81e9ff1c27068d50e8c84c2014d94c7ac17cad69d5c2d61e445fd3 intel-mediasdk-22.6.4.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index f5e39905a1..3bd6197779 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.6.3 +INTEL_MEDIASDK_VERSION = 22.6.4 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:42 -0000 Subject: [Buildroot] [git commit branch/next] package/python-esptool: bump to version 4.4 Message-ID: <20230220205201.B56D48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25b67238f53867f40b485b79eddaa7ef6fad9ca4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop no longer required pyaes runtime dependency. Add new bitstring, cryptography and reedsolo runtime dependencies. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-esptool/Config.in | 5 ++++- package/python-esptool/python-esptool.hash | 4 ++-- package/python-esptool/python-esptool.mk | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/python-esptool/Config.in b/package/python-esptool/Config.in index b21ccd72d5..36243fa89e 100644 --- a/package/python-esptool/Config.in +++ b/package/python-esptool/Config.in @@ -1,7 +1,10 @@ config BR2_PACKAGE_PYTHON_ESPTOOL bool "python-esptool" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + select BR2_PACKAGE_PYTHON_BITSTRING # runtime + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_ECDSA # runtime - select BR2_PACKAGE_PYTHON_PYAES # runtime + select BR2_PACKAGE_PYTHON_REEDSOLO # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime select BR2_PACKAGE_PYTHON3_ZLIB help diff --git a/package/python-esptool/python-esptool.hash b/package/python-esptool/python-esptool.hash index 7e523a7027..b7246f9788 100644 --- a/package/python-esptool/python-esptool.hash +++ b/package/python-esptool/python-esptool.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/esptool/json -md5 973b63eac1391d3491846d8676c783e7 esptool-4.3.tar.gz -sha256 03d00312eef258baf83faefd0b912b2251dd0440242da9dcb1b18fe75ed614c3 esptool-4.3.tar.gz +md5 92c38551bc33bd5271bdea033aa51610 esptool-4.4.tar.gz +sha256 8acd4dfe70819b1302861ae92894380fb4700b377f5a4739479a4ec276e0b256 esptool-4.4.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index 3f33fd7865..0a71e1a78b 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ESPTOOL_VERSION = 4.3 +PYTHON_ESPTOOL_VERSION = 4.4 PYTHON_ESPTOOL_SOURCE = esptool-$(PYTHON_ESPTOOL_VERSION).tar.gz -PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/5b/d7/0dae311a94a490d7b7af2f4fab079b34f6244c6129017997bc994f7b360b +PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/8b/4c/82d7fe5fa0643415bbb90bebff1f861816903c481ee5156fabd6d76dc684 PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:43 -0000 Subject: [Buildroot] [git commit branch/next] package/python-setuptools: bump to version 65.6.3 Message-ID: <20230220205208.84AFA86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bbe96083f035b21be58498d055b83b2f7576ce16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- 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 3e4ae01d92..76ad1ba1ce 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 3f062858ddfb5efa564c9c02a30cb104 setuptools-65.5.1.tar.gz -sha256 e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f setuptools-65.5.1.tar.gz +md5 1fd8bd04b0bed95ad6c81f03b1c080bc setuptools-65.6.3.tar.gz +sha256 a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75 setuptools-65.6.3.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 3b62221e25..226ef2b479 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 65.5.1 +PYTHON_SETUPTOOLS_VERSION = 65.6.3 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/26/f4/ca5cb6df512f453ad50f78900bf7ec6a5491ee44bb49d0f6f76802dbdd43 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b6/21/cb9a8d0b2c8597c83fce8e9c02884bce3d4951e41e807fc35791c6b23d9a PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From yann.morin.1998 at free.fr Mon Feb 20 20:54:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:43 -0000 Subject: [Buildroot] [git commit branch/next] package/python-greenlet: bump to version 2.0.1 Message-ID: <20230220205201.E59CF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b2f08f587a7e779745d0f89ac576ef6026b0b05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-greenlet/python-greenlet.hash | 4 ++-- package/python-greenlet/python-greenlet.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-greenlet/python-greenlet.hash b/package/python-greenlet/python-greenlet.hash index b5fd1fd7b2..4e9e96398a 100644 --- a/package/python-greenlet/python-greenlet.hash +++ b/package/python-greenlet/python-greenlet.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/greenlet/json -md5 1d73a38c1c0b0c7e16ec17d6a19f3652 greenlet-2.0.0.tar.gz -sha256 6c66f0da8049ee3c126b762768179820d4c0ae0ca46ae489039e4da2fae39a52 greenlet-2.0.0.tar.gz +md5 8d0f10b807144a86b54841cfab2620a9 greenlet-2.0.1.tar.gz +sha256 42e602564460da0e8ee67cb6d7236363ee5e131aa15943b6670e44e5c2ed0f67 greenlet-2.0.1.tar.gz # Locally computed sha256 checksums sha256 769831d6e5dfaf2c20802faccff1fafb4c2025dd8f6253dfa47fcad59d4d0979 LICENSE sha256 e5ff3c23c110e494cd7d736c10fd96d462457bafeca310840db6527298c7d46b LICENSE.PSF diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index 42bf7970d8..232e2820f8 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GREENLET_VERSION = 2.0.0 +PYTHON_GREENLET_VERSION = 2.0.1 PYTHON_GREENLET_SOURCE = greenlet-$(PYTHON_GREENLET_VERSION).tar.gz -PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/23/6f/f72865c589d0c79f03b51520a4cdd65647de0513e9ad107a5731df89c235 +PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/fd/6a/f07b0028baff9bca61ecfcd9ee021e7e33369da8094f00eff409f2ff32be PYTHON_GREENLET_SETUP_TYPE = setuptools PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:44 -0000 Subject: [Buildroot] [git commit branch/next] package/python-tomli: drop flit-bootstrap for host package Message-ID: <20230220205208.AF66C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=467d464abe20e7c20ce246b0fee1d12ccc2b2312 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next As tomli is no longer required for bootstrapping our pep517 toolchain we no longer need to use flit-bootstrap for the host package. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-tomli/python-tomli.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk index b803d67466..5d259f71a3 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -10,7 +10,6 @@ PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/c0/3f/d7af728f075fb0 PYTHON_TOMLI_LICENSE = MIT PYTHON_TOMLI_LICENSE_FILES = LICENSE PYTHON_TOMLI_SETUP_TYPE = flit -HOST_PYTHON_TOMLI_SETUP_TYPE = flit-bootstrap $(eval $(python-package)) $(eval $(host-python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:54:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:44 -0000 Subject: [Buildroot] [git commit branch/next] package/python-hatch-vcs: bump to version 0.3.0 Message-ID: <20230220205201.F2CBE8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=027ad7bbd6fd6ab57781f0730e9587acb26efc76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-hatch-vcs/python-hatch-vcs.hash | 4 ++-- package/python-hatch-vcs/python-hatch-vcs.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatch-vcs/python-hatch-vcs.hash b/package/python-hatch-vcs/python-hatch-vcs.hash index e57eeddd2f..6e5fe1de13 100644 --- a/package/python-hatch-vcs/python-hatch-vcs.hash +++ b/package/python-hatch-vcs/python-hatch-vcs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatch_vcs/json -md5 e56b6d0c05cfb9b59d493c67f94d6e48 hatch_vcs-0.2.0.tar.gz -sha256 9913d733b34eec9bb0345d0626ca32165a4ad2de15d1ce643c36d09ca908abff hatch_vcs-0.2.0.tar.gz +md5 c2f2cbe6851b7b2969cb4aa24c4b9b2f hatch_vcs-0.3.0.tar.gz +sha256 cec5107cfce482c67f8bc96f18bbc320c9aa0d068180e14ad317bbee5a153fee hatch_vcs-0.3.0.tar.gz # Locally computed sha256 checksums sha256 117aa5006d8475562f04442ab06dd2a4c501af3a77255eae0deef1f0c2499a1a LICENSE.txt diff --git a/package/python-hatch-vcs/python-hatch-vcs.mk b/package/python-hatch-vcs/python-hatch-vcs.mk index 55c6461751..ef5f6541cd 100644 --- a/package/python-hatch-vcs/python-hatch-vcs.mk +++ b/package/python-hatch-vcs/python-hatch-vcs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCH_VCS_VERSION = 0.2.0 +PYTHON_HATCH_VCS_VERSION = 0.3.0 PYTHON_HATCH_VCS_SOURCE = hatch_vcs-$(PYTHON_HATCH_VCS_VERSION).tar.gz -PYTHON_HATCH_VCS_SITE = https://files.pythonhosted.org/packages/ac/13/b3d83564c0cc0f1d45b4ea2a78b87b383a8165797613fedf11f1a7e49b48 +PYTHON_HATCH_VCS_SITE = https://files.pythonhosted.org/packages/04/33/b68d68e532392d938472d16a03e4ce0ccd749ea31b42d18f8baa6547cbfd PYTHON_HATCH_VCS_LICENSE = MIT PYTHON_HATCH_VCS_LICENSE_FILES = LICENSE.txt PYTHON_HATCH_VCS_SETUP_TYPE = pep517 From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:45 -0000 Subject: [Buildroot] [git commit branch/next] support/testing: add test for python-dicttoxml2 Message-ID: <20230220205208.C75CD86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b54e0dde3009cb859ff93a704a068d4fd162a035 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ support/testing/tests/package/sample_python_dicttoxml2.py | 11 +++++++++++ support/testing/tests/package/test_python_dicttoxml2.py | 12 ++++++++++++ 3 files changed, 25 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8e9a743c70..7f6908d0b4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3117,9 +3117,11 @@ F: package/wpa_supplicant/ F: package/x11r7/xapp_xconsole/ F: package/x11r7/xapp_xinput-calibrator/ F: package/zlog/ +F: support/testing/tests/package/sample_python_dicttoxml2.py F: support/testing/tests/package/sample_python_dtschema.py F: support/testing/tests/package/test_libftdi1.py F: support/testing/tests/package/test_python_can.py +F: support/testing/tests/package/test_python_dicttoxml2.py F: support/testing/tests/package/test_python_dtschema.py F: utils/scanpypi diff --git a/support/testing/tests/package/sample_python_dicttoxml2.py b/support/testing/tests/package/sample_python_dicttoxml2.py new file mode 100644 index 0000000000..788c5e2cd7 --- /dev/null +++ b/support/testing/tests/package/sample_python_dicttoxml2.py @@ -0,0 +1,11 @@ +from dicttoxml2 import dicttoxml + +payload: dict = {'mylist': ['foo', 'bar', 'baz'], 'mydict': {'foo': 'bar', 'baz': 1}, 'ok': True} + +expected: bytes = b'' \ + b'' \ + b'' \ + b'' \ + b'' + +assert dicttoxml(payload, cdata=True) == expected diff --git a/support/testing/tests/package/test_python_dicttoxml2.py b/support/testing/tests/package/test_python_dicttoxml2.py new file mode 100644 index 0000000000..437518db7f --- /dev/null +++ b/support/testing/tests/package/test_python_dicttoxml2.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Dicttoxml2(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DICTTOXML2=y + """ + sample_scripts = ["tests/package/sample_python_dicttoxml2.py"] + timeout = 40 From yann.morin.1998 at free.fr Mon Feb 20 20:54:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:45 -0000 Subject: [Buildroot] [git commit branch/next] package/python-ipython: bump to version 8.7.0 Message-ID: <20230220205202.17AE8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bf1b6f75b8b2e1f1cfaa99aa62f2818b81534d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 e61727e045..aae34f6f9b 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 8c98f6def0622ea32975cb779247c3d7 ipython-8.6.0.tar.gz -sha256 7c959e3dedbf7ed81f9b9d8833df252c430610e2a4a6464ec13cd20975ce20a5 ipython-8.6.0.tar.gz +md5 3adf9fca317512e5b3516a9ac25b3442 ipython-8.7.0.tar.gz +sha256 882899fe78d5417a0aa07f995db298fa28b58faeba2112d2e3a4c95fe14bb738 ipython-8.7.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 f3aac75db1..1af1081741 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 8.6.0 +PYTHON_IPYTHON_VERSION = 8.7.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/7f/59/05e94e067afb61460f0d5229a1edb800e2f65b8436085fad9cd262d80d45 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/82/2b/026af47da09998404f51064d328f5f1f68c78829082d2945be489343fde6 PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From yann.morin.1998 at free.fr Mon Feb 20 20:54:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:46 -0000 Subject: [Buildroot] [git commit branch/next] package/python-jedi: bump to version 0.18.2 Message-ID: <20230220205202.242388648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0cc120f42d8cd84cbd73e1b55a088627fc755537 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-jedi/python-jedi.hash | 4 ++-- package/python-jedi/python-jedi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-jedi/python-jedi.hash b/package/python-jedi/python-jedi.hash index d0f083e942..dee8810e89 100644 --- a/package/python-jedi/python-jedi.hash +++ b/package/python-jedi/python-jedi.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/jedi/json -md5 d8dba4a98a35530f7f5b461c20aff180 jedi-0.18.1.tar.gz -sha256 74137626a64a99c8eb6ae5832d99b3bdd7d29a3850fe2aa80a4126b2a7d949ab jedi-0.18.1.tar.gz +md5 47e89a2b8bedcfeb1527fac37b9ba1b3 jedi-0.18.2.tar.gz +sha256 bae794c30d07f6d910d32a7048af09b5a39ed740918da923c6b780790ebac612 jedi-0.18.2.tar.gz # Locally computed sha256 checksums sha256 78e60cd0b8f28694f30195482c33d76908d846b0d15278deb7332aa22ba8e412 LICENSE.txt sha256 235e993965d399a25e7d493d25c8622f78718510884b9c051f1f1866b6f34e9d jedi/third_party/django-stubs/LICENSE.txt diff --git a/package/python-jedi/python-jedi.mk b/package/python-jedi/python-jedi.mk index b0508de701..40de61f0e8 100644 --- a/package/python-jedi/python-jedi.mk +++ b/package/python-jedi/python-jedi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JEDI_VERSION = 0.18.1 +PYTHON_JEDI_VERSION = 0.18.2 PYTHON_JEDI_SOURCE = jedi-$(PYTHON_JEDI_VERSION).tar.gz -PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/c2/25/273288df952e07e3190446efbbb30b0e4871a0d63b4246475f3019d4f55e +PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/15/02/afd43c5066de05f6b3188f3aa74136a3289e6c30e7a45f351546cab0928c PYTHON_JEDI_SETUP_TYPE = setuptools PYTHON_JEDI_LICENSE = MIT, Apache-2.0 (typeshed) PYTHON_JEDI_LICENSE_FILES = LICENSE.txt jedi/third_party/django-stubs/LICENSE.txt jedi/third_party/typeshed/LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:47 -0000 Subject: [Buildroot] [git commit branch/next] package/mpd: update to version 0.23.11 Message-ID: <20230220205208.E067686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54fc7aa2be7adc170d30f6f0ec64e34951e52ddd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Mostly fixes for build and runtime failures; no new features. Standard directory for default database and cache changed from ~/.cache to ~/.cache/mpd. Full change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.11/NEWS Signed-off-by: Andreas Ziegler Signed-off-by: Thomas Petazzoni --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index fca0ee8539..8c488d0357 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 2becaba980402e8dc7972ccc3476e493b7ae2eeb720d31fa6712472ed48e9f2d mpd-0.23.9.tar.xz +sha256 edb4e7a8f9dff238b5610f9e2461940ea98c727a5462fafb1cdf836304dfdca9 mpd-0.23.11.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 5c15953984..449600eda2 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).9 +MPD_VERSION = $(MPD_VERSION_MAJOR).11 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 yann.morin.1998 at free.fr Mon Feb 20 20:54:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:48 -0000 Subject: [Buildroot] [git commit branch/next] package/python-lark: bump to version 1.1.5 Message-ID: <20230220205202.4972C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44c986b1266d5f1d2527971aadd1d03a2843a4a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-lark/python-lark.hash | 4 ++-- package/python-lark/python-lark.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-lark/python-lark.hash b/package/python-lark/python-lark.hash index abc168e93b..6e192684a8 100644 --- a/package/python-lark/python-lark.hash +++ b/package/python-lark/python-lark.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lark/json -md5 d7368d8f9fd0b844c034f321f5b52fd4 lark-1.1.4.tar.gz -sha256 eee86062b149600ef62de0d8dfd38cf85ffc737e16911e7d8c18880f8c5b1333 lark-1.1.4.tar.gz +md5 b9048974c5ce56997e9e536dda475159 lark-1.1.5.tar.gz +sha256 4b534eae1f9af5b4ea000bea95776350befe1981658eea3820a01c37e504bb4d lark-1.1.5.tar.gz # Locally computed sha256 checksums sha256 8263e5652d07cecb3adadf05140b65e70cfa169ecec5f520fe1671479ce12a83 LICENSE diff --git a/package/python-lark/python-lark.mk b/package/python-lark/python-lark.mk index 548adcd833..c08fc2cabd 100644 --- a/package/python-lark/python-lark.mk +++ b/package/python-lark/python-lark.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LARK_VERSION = 1.1.4 +PYTHON_LARK_VERSION = 1.1.5 PYTHON_LARK_SOURCE = lark-$(PYTHON_LARK_VERSION).tar.gz -PYTHON_LARK_SITE = https://files.pythonhosted.org/packages/1d/08/eb2590d4f824b5a947d866c603799fa70278f1372cbf8d15b7b4823dfb2b +PYTHON_LARK_SITE = https://files.pythonhosted.org/packages/a2/25/8e16de418fc83bb00dabaf8c7110bc45a90bf5481a70aa5f1668fcea73bc PYTHON_LARK_SETUP_TYPE = setuptools PYTHON_LARK_LICENSE = MIT PYTHON_LARK_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:48 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Thomas Claveirole to package vuejs Message-ID: <20230220205209.106C786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba7b0bf52bf3a749fc280d4ad5b743b5ee180828 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7f6908d0b4..7d7d2344a1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2768,6 +2768,7 @@ F: package/x265/ N: Thomas Claveirole F: package/fcgiwrap/ F: package/openlayers/ +F: package/vuejs/ F: package/vuejs-router/ N: Thomas De Schampheleire From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:49 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Christian Stewart to balena-engine package Message-ID: <20230220205209.357F686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc644ed3be1ae52bf883f93083fc96f9fe1f2ee4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7d7d2344a1..f0dcc42de7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -538,6 +538,7 @@ N: Christian Kellermann F: package/python-pylibftdi/ N: Christian Stewart +F: package/balena-engine/ F: package/batman-adv/ F: package/catatonit/ F: package/cni-plugins/ From yann.morin.1998 at free.fr Mon Feb 20 20:54:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:49 -0000 Subject: [Buildroot] [git commit branch/next] package/python-keyring: bump to version 23.11.0 Message-ID: <20230220205202.3D17D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f4c7af8a698646d496df64672bbda01d351180b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-keyring/python-keyring.hash | 4 ++-- package/python-keyring/python-keyring.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-keyring/python-keyring.hash b/package/python-keyring/python-keyring.hash index 45f5bf7c84..791ee6563b 100644 --- a/package/python-keyring/python-keyring.hash +++ b/package/python-keyring/python-keyring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/keyring/json -md5 60219a9a22467e15fcd09515b5b2ef39 keyring-23.9.3.tar.gz -sha256 69b01dd83c42f590250fe7a1f503fc229b14de83857314b1933a3ddbf595c4a5 keyring-23.9.3.tar.gz +md5 edf0645c28f16884e2b121b2c51e0770 keyring-23.11.0.tar.gz +sha256 ad192263e2cdd5f12875dedc2da13534359a7e760e77f8d04b50968a821c2361 keyring-23.11.0.tar.gz # Locally computed sha256 checksums sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-keyring/python-keyring.mk b/package/python-keyring/python-keyring.mk index 8d7833e14f..c1f124cb3e 100644 --- a/package/python-keyring/python-keyring.mk +++ b/package/python-keyring/python-keyring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_KEYRING_VERSION = 23.9.3 +PYTHON_KEYRING_VERSION = 23.11.0 PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz -PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/2a/ef/28d3d5428108111dae4304a2ebec80d113aea9e78c939e25255425d486ff +PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/1c/35/c22960f14f5e17384296b2f09da259f8b5244fb3831eccec71cf948a49c6 PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:50 -0000 Subject: [Buildroot] [git commit branch/next] package/python-memory-profiler: bump to version 0.61.0 Message-ID: <20230220205202.79773828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d08d1f7bca47a5f73422ebd716f30c79cd99124 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-memory-profiler/python-memory-profiler.hash | 4 ++-- package/python-memory-profiler/python-memory-profiler.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-memory-profiler/python-memory-profiler.hash b/package/python-memory-profiler/python-memory-profiler.hash index 9e3aca517b..bab9018331 100644 --- a/package/python-memory-profiler/python-memory-profiler.hash +++ b/package/python-memory-profiler/python-memory-profiler.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/memory-profiler/json -md5 c4d29b47885c32581f5bcefb44d2ca8e memory_profiler-0.60.0.tar.gz -sha256 6a12869511d6cebcb29b71ba26985675a58e16e06b3c523b49f67c5497a33d1c memory_profiler-0.60.0.tar.gz +md5 5fe93d5035288095c4f86ef69ee19f37 memory_profiler-0.61.0.tar.gz +sha256 4e5b73d7864a1d1292fb76a03e82a3e78ef934d06828a698d9dada76da2067b0 memory_profiler-0.61.0.tar.gz # Locally computed sha256 checksums sha256 51926ce91b8283532efa9dfb02518582c15f49c105a3ac18cce1f7a4947e96ae COPYING diff --git a/package/python-memory-profiler/python-memory-profiler.mk b/package/python-memory-profiler/python-memory-profiler.mk index 5e43662e07..c7f84043eb 100644 --- a/package/python-memory-profiler/python-memory-profiler.mk +++ b/package/python-memory-profiler/python-memory-profiler.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MEMORY_PROFILER_VERSION = 0.60.0 +PYTHON_MEMORY_PROFILER_VERSION = 0.61.0 PYTHON_MEMORY_PROFILER_SOURCE = memory_profiler-$(PYTHON_MEMORY_PROFILER_VERSION).tar.gz -PYTHON_MEMORY_PROFILER_SITE = https://files.pythonhosted.org/packages/06/dd/7308a8ef1902db9d81c5bc226befe346a87ed8787caff00b8d91ed9f3b86 +PYTHON_MEMORY_PROFILER_SITE = https://files.pythonhosted.org/packages/b2/88/e1907e1ca3488f2d9507ca8b0ae1add7b1cd5d3ca2bc8e5b329382ea2c7b PYTHON_MEMORY_PROFILER_SETUP_TYPE = setuptools PYTHON_MEMORY_PROFILER_LICENSE = BSD-3-Clause PYTHON_MEMORY_PROFILER_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:50 -0000 Subject: [Buildroot] [git commit branch/next] package/swig: depend on host-pcre2 instead of host-pcre Message-ID: <20230220205209.5002286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d534bb8d93319212b3c083b083189e8e7b414637 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since the bump of swig to version 4.1.1 in commit 260924e239627cbe1379cfc752939245d53a06e0, host-pcre2 is needed instead of host-pcre. Since is change that was introduced in swig 4.1.0, as stated in https://sourceforge.net/p/swig/news/2022/10/swig-410-released/: Update optional SWIG build dependency for regex support from PCRE to PCRE2 Fixes: http://autobuild.buildroot.net/results/3a70042aad7376bcccf56d639ced93f504f47963 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/swig/swig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/swig/swig.mk b/package/swig/swig.mk index d432cab53d..ad585c3f97 100644 --- a/package/swig/swig.mk +++ b/package/swig/swig.mk @@ -7,7 +7,7 @@ SWIG_VERSION_MAJOR = 4.1 SWIG_VERSION = $(SWIG_VERSION_MAJOR).1 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION) -HOST_SWIG_DEPENDENCIES = host-bison host-pcre +HOST_SWIG_DEPENDENCIES = host-bison host-pcre2 HOST_SWIG_CONF_OPTS = \ --with-pcre \ --disable-ccache \ From yann.morin.1998 at free.fr Mon Feb 20 20:54:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:51 -0000 Subject: [Buildroot] [git commit branch/next] package/python-opcua-asyncio: bump to version 1.0.1 Message-ID: <20230220205202.9DEFE828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b9b6541b2d1e06ab14e69c774d6f70e4d96db21 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-opcua-asyncio/python-opcua-asyncio.hash | 4 ++-- package/python-opcua-asyncio/python-opcua-asyncio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.hash b/package/python-opcua-asyncio/python-opcua-asyncio.hash index 36b16a1596..21b5794ebf 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.hash +++ b/package/python-opcua-asyncio/python-opcua-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asyncua/json -md5 a52df0dc0586abd1592c97a0274d1c9d asyncua-1.0.0.tar.gz -sha256 25966e374b0c90da112a96e9dbc5cc36c123b2b60412eac6f26b04a4b0b4d91e asyncua-1.0.0.tar.gz +md5 f67770b896d2ffe975adbaea38c5efc9 asyncua-1.0.1.tar.gz +sha256 515342470022b9c391587dcf526015ff4c7582f566c72406c778c9f9a2757cad asyncua-1.0.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.mk b/package/python-opcua-asyncio/python-opcua-asyncio.mk index 509beda151..52c5d5117e 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.mk +++ b/package/python-opcua-asyncio/python-opcua-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_OPCUA_ASYNCIO_VERSION = 1.0.0 +PYTHON_OPCUA_ASYNCIO_VERSION = 1.0.1 PYTHON_OPCUA_ASYNCIO_SOURCE = asyncua-$(PYTHON_OPCUA_ASYNCIO_VERSION).tar.gz -PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/e7/ea/6fe0799c740b0fc8ffda42fc97bf45204ffe06fe41d505c02654e0d4e379 +PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/9f/88/c32bd5904c92475dd30fa2c3130c4f9170a36343d390e2ce5b002fdf1cee PYTHON_OPCUA_ASYNCIO_SETUP_TYPE = setuptools PYTHON_OPCUA_ASYNCIO_LICENSE = LGPL-3.0+ PYTHON_OPCUA_ASYNCIO_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:51 -0000 Subject: [Buildroot] [git commit branch/next] package/python-automat: drop host-python-m2r build dependency Message-ID: <20230220205209.68CB886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6398d18d50c021992375c4229e3898402c3a1cc8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since version 22.10.0, used since Buildroot commit 12c430f880f9255529d8c53cdb59f4178d2cd8f4, python-automat no longer needs host-python-m2r, so let's drop this dependency. This is needed as host-python-m2r is about to be removed from Buildroot, due to incompatibility with its dependencies. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-automat/python-automat.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-automat/python-automat.mk b/package/python-automat/python-automat.mk index 675fbd2260..101197b15b 100644 --- a/package/python-automat/python-automat.mk +++ b/package/python-automat/python-automat.mk @@ -10,6 +10,6 @@ PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/7a/7b/9c3d26d8a041 PYTHON_AUTOMAT_SETUP_TYPE = setuptools PYTHON_AUTOMAT_LICENSE = MIT PYTHON_AUTOMAT_LICENSE_FILES = LICENSE -PYTHON_AUTOMAT_DEPENDENCIES = host-python-m2r host-python-setuptools-scm +PYTHON_AUTOMAT_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From peter at korsgaard.com Mon Feb 20 20:54:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:52 -0000 Subject: [Buildroot] [git commit branch/next] package/libbluray: bump version to 1.3.4 Message-ID: <20230220205209.A254C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67a6bc3d19afffffe75b1e6ffa1f0e1b89dea39f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://code.videolan.org/videolan/libbluray/-/blob/1.3.4/ChangeLog Added a configure option to build without external libudfread introduced in version 1.3.4: https://code.videolan.org/videolan/libbluray/-/commit/2f10fb73b869337f2a2fb6fc8c8b45ef88383b78 Using --with-external-libudfread is broken so this option was not added. Since the default to build with optional libudfread support was kept upstream there is no change in behaviour. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libbluray/libbluray.hash | 4 ++-- package/libbluray/libbluray.mk | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash index 6e62bb49a1..a631722bb0 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.1/libbluray-1.3.1.tar.bz2.sha512 -sha512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a libbluray-1.3.1.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2.sha512 +sha512 94dbf3b68d1c23fe4648c153cc2f0c251886fac0a6b6bbe3a77caabaa5322682f712afe4a7b6b16ca3f06744fbc0e1ca872209a32898dcf0ae182055d335aec1 libbluray-1.3.4.tar.bz2 # Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index a9eb3c67c6..54f4caa368 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.3.1 +LIBBLURAY_VERSION = 1.3.4 LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES @@ -21,6 +21,8 @@ endif ifeq ($(BR2_PACKAGE_LIBUDFREAD),y) LIBBLURAY_DEPENDENCIES += libudfread +else +LIBBLURAY_CONF_OPTS += --without-external-libudfread endif ifeq ($(BR2_PACKAGE_FREETYPE),y) From peter at korsgaard.com Mon Feb 20 20:54:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:58 -0000 Subject: [Buildroot] [git commit branch/next] fs/ext2: generate Y2K38-resilient filesystems Message-ID: <20230220205210.94CAF86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=319d2735f99e95955c2a75c8fc6282ddf7de232a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When creating a filesystem, mkfs.ext will chose the inode size depending on the size of the filesystem. Small filesystem get 128-bytes inodes, while bigger filesystems use 256-byte inodes (inode must be a power of 2 larger or equal to 128, and smaller or equal to the blocksize). However, 128-byte inodes can't store timestamps past the dreaded 2038-01-19 03:14:07Z deadline, while inodes larger than or equal to 256 do not have the issue. It turns out that the tipping point to decide whether a filesystem is small or big, is about around the size of the filesystems we generate for our runtime tests. This causes the kernel to emit warning like: ext2 filesystem being remounted at / supports timestamps until 2038 (0x7fffffff) We add a new option to our ext2 filesystem, so that user can specify the size of the inode. That new option defaults to 256 to be resilient to the Y2K38 problem. Note: it was already possible for users to explicitly pass the -I option, through BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS. We could have chosen to extend the existing value with a -I 256, but that is not satisfactory. Indeed, we do want to ensure that the default is now Y2K38-OK, even for existing configurations that did not have explicit setting. We also pass that new option before the user-specified arbitrary ones, so that BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS still wins (in case -I was set there). Signed-off-by: Yann E. MORIN [Peter: tweak help text] Signed-off-by: Peter Korsgaard --- fs/ext2/Config.in | 13 +++++++++++++ fs/ext2/ext2.mk | 1 + 2 files changed, 14 insertions(+) diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in index 705446df57..4451d0797f 100644 --- a/fs/ext2/Config.in +++ b/fs/ext2/Config.in @@ -60,6 +60,19 @@ config BR2_TARGET_ROOTFS_EXT2_INODES int "exact number of inodes (leave at 0 for auto calculation)" default 0 +config BR2_TARGET_ROOTFS_EXT2_INODE_SIZE + int "inode size" + default 256 + help + Set the size of inodes, in bytes, as a power of 2 larger or + equal to 128. + + Set to 0 to let the filesystem generator decide based on the + file system size. If unsure, keep the default, 256. + + Note: 128-byte inodes suffer of the Y2K38 problem, and can't + store timestamps beyond 2038-01-19 03:14:07Z. + config BR2_TARGET_ROOTFS_EXT2_RESBLKS int "reserved blocks percentage" default 5 diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk index 5b5393f092..e69e79cd2e 100644 --- a/fs/ext2/ext2.mk +++ b/fs/ext2/ext2.mk @@ -22,6 +22,7 @@ ROOTFS_EXT2_OPTS = \ -N $(BR2_TARGET_ROOTFS_EXT2_INODES) \ -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) \ -L "$(ROOTFS_EXT2_LABEL)" \ + -I $(BR2_TARGET_ROOTFS_EXT2_INODE_SIZE) \ $(ROOTFS_EXT2_MKFS_OPTS) ROOTFS_EXT2_DEPENDENCIES = host-e2fsprogs From yann.morin.1998 at free.fr Mon Feb 20 20:54:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:59 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pycryptodomex: bump to version 3.16.0 Message-ID: <20230220205203.3940A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24d1bfa38d9f10785e8cd366c9680e9ca8905de6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycryptodomex/python-pycryptodomex.hash | 4 ++-- package/python-pycryptodomex/python-pycryptodomex.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 97c5e79024..eb011dddb8 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.hash +++ b/package/python-pycryptodomex/python-pycryptodomex.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json -md5 683580f8f464348397a41ebabb5511a9 pycryptodomex-3.15.0.tar.gz -sha256 7341f1bb2dadb0d1a0047f34c3a58208a92423cdbd3244d998e4b28df5eac0ed pycryptodomex-3.15.0.tar.gz +md5 9d27f03c036c89afd3d66970bb49cd06 pycryptodomex-3.16.0.tar.gz +sha256 e9ba9d8ed638733c9e95664470b71d624a6def149e2db6cc52c1aca5a6a2df1d pycryptodomex-3.16.0.tar.gz # Locally computed sha256 checksums sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index 8f22bf3ef2..b566bdd066 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.15.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.16.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/52/0d/6cc95a83f6961a1ca041798d222240890af79b381e97eda3b9b538dba16f +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/5d/22/575c7dd7c86843e07a791cfa2143e7292d6b380f5a7cce966a49b9d6c9f4 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ From peter at korsgaard.com Mon Feb 20 20:54:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:59 -0000 Subject: [Buildroot] [git commit branch/next] package/sudo: bump to version 1.9.12p1 Message-ID: <20230220205210.BBF8E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f095f5a8bec8352ffa182f606c5c7349ec2d6dca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next remove merged patch diff LICENSE.md - Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler + Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler - Copyright (c) 2008-2018, Dave Benson and the protobuf-c authors. + Copyright (c) 2008-2022, Dave Benson and the protobuf-c authors. Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/sudo/0001-Fix-CVE-2022-43995.patch | 53 ------------------------------ package/sudo/Config.in | 2 +- package/sudo/sudo.hash | 6 ++-- package/sudo/sudo.mk | 7 ++-- 4 files changed, 6 insertions(+), 62 deletions(-) diff --git a/package/sudo/0001-Fix-CVE-2022-43995.patch b/package/sudo/0001-Fix-CVE-2022-43995.patch deleted file mode 100644 index 3f544dcf81..0000000000 --- a/package/sudo/0001-Fix-CVE-2022-43995.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bd209b9f16fcd1270c13db27ae3329c677d48050 Mon Sep 17 00:00:00 2001 -From: "Todd C. Miller" -Date: Fri, 28 Oct 2022 07:29:55 -0600 -Subject: [PATCH] Fix CVE-2022-43995, potential heap overflow for passwords < 8 - characters. Starting with sudo 1.8.0 the plaintext password buffer is - dynamically sized so it is not safe to assume that it is at least 9 bytes in - size. Found by Hugo Lefeuvre (University of Manchester) with ConfFuzz. - -[Retrieved from: -https://github.com/sudo-project/sudo/commit/bd209b9f16fcd1270c13db27ae3329c677d48050] -Signed-off-by: Fabrice Fontaine ---- - plugins/sudoers/auth/passwd.c | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c -index b2046eca2..0416861e9 100644 ---- a/plugins/sudoers/auth/passwd.c -+++ b/plugins/sudoers/auth/passwd.c -@@ -63,7 +63,7 @@ sudo_passwd_init(struct passwd *pw, sudo_auth *auth) - int - sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_conv_callback *callback) - { -- char sav, *epass; -+ char des_pass[9], *epass; - char *pw_epasswd = auth->data; - size_t pw_len; - int matched = 0; -@@ -75,12 +75,12 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c - - /* - * Truncate to 8 chars if standard DES since not all crypt()'s do this. -- * If this turns out not to be safe we will have to use OS #ifdef's (sigh). - */ -- sav = pass[8]; - pw_len = strlen(pw_epasswd); -- if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) -- pass[8] = '\0'; -+ if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) { -+ strlcpy(des_pass, pass, sizeof(des_pass)); -+ pass = des_pass; -+ } - - /* - * Normal UN*X password check. -@@ -88,7 +88,6 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c - * only compare the first DESLEN characters in that case. - */ - epass = (char *) crypt(pass, pw_epasswd); -- pass[8] = sav; - if (epass != NULL) { - if (HAS_AGEINFO(pw_epasswd, pw_len) && strlen(epass) == DESLEN) - matched = !strncmp(pw_epasswd, epass, DESLEN); diff --git a/package/sudo/Config.in b/package/sudo/Config.in index cbef15d67b..ee5ea542ab 100644 --- a/package/sudo/Config.in +++ b/package/sudo/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_SUDO basic philosophy is to give as few privileges as possible but still allow people to get their work done. - http://www.sudo.ws/sudo/ + https://www.sudo.ws/sudo/ diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index 63c98e2c4e..a3476df96b 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,4 +1,4 @@ -# From: http://www.sudo.ws/download.html -sha256 a21918eb9fc0063794f6887464fa2d924ab6d192e19063191a429605c22791d2 sudo-1.9.11p2.tar.gz +# From: https://www.sudo.ws/getting/download/ +sha256 475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8 sudo-1.9.12p1.tar.gz # Locally calculated -sha256 cf3a83366f9aabfd76d693ce03843106fcaaf6c76dfa97610f7c0b719a06e6bb LICENSE.md +sha256 d2f93a3b17ed5586fddd07be33ad767146c1a81a22682baa68bb4360a31d020a LICENSE.md diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 8e237bd36a..a16b6863aa 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,8 +4,8 @@ # ################################################################################ -SUDO_VERSION_MAJOR = 1.9.11 -SUDO_VERSION_MINOR = p2 +SUDO_VERSION_MAJOR = 1.9.12 +SUDO_VERSION_MINOR = p1 SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause @@ -25,9 +25,6 @@ SUDO_CONF_OPTS = \ --without-interfaces \ --with-env-editor -# 0001-Fix-CVE-2022-43995.patch -SUDO_IGNORE_CVES += CVE-2022-43995 - ifeq ($(BR2_PACKAGE_LINUX_PAM),y) define SUDO_INSTALL_PAM_CONF $(INSTALL) -D -m 0644 package/sudo/sudo.pam $(TARGET_DIR)/etc/pam.d/sudo From yann.morin.1998 at free.fr Mon Feb 20 20:55:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:00 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pybind: bump to version 2.10.1 Message-ID: <20230220205203.20D288648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0894b7f78b17a2ddb4e922c5ee63379fe00a7259 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pybind/python-pybind.hash | 2 +- package/python-pybind/python-pybind.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash index b4b3ff94d0..530cbf64af 100644 --- a/package/python-pybind/python-pybind.hash +++ b/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 eacf582fa8f696227988d08cfc46121770823839fe9e301a20fbce67e7cd70ec python-pybind-2.10.0.tar.gz +sha256 111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad python-pybind-2.10.1.tar.gz # License files, locally calculated sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index c5bee3d0a7..e89d77147e 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.10.0 +PYTHON_PYBIND_VERSION = 2.10.1 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:55:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:00 -0000 Subject: [Buildroot] [git commit branch/next] package/libarchive: bump to version 3.6.2 Message-ID: <20230220205210.AFD2686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=380341b249175382691f268de4b41d3843ff0acc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next remove merged patch Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- ...libarchive-Handle-a-calloc-returning-NULL.patch | 38 ---------------------- package/libarchive/Config.in | 2 +- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 5 +-- 4 files changed, 3 insertions(+), 44 deletions(-) diff --git a/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch b/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch deleted file mode 100644 index 75ce6112fe..0000000000 --- a/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001 -From: obiwac -Date: Fri, 22 Jul 2022 22:41:10 +0200 -Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754) - -[Retrieved from: -https://github.com/libarchive/libarchive/commit/bff38efe8c110469c5080d387bec62a6ca15b1a5] -Signed-off-by: Fabrice Fontaine ---- - libarchive/archive_write.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c -index 66592e826..27626b541 100644 ---- a/libarchive/archive_write.c -+++ b/libarchive/archive_write.c -@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a) - struct archive_write_filter *f; - - f = calloc(1, sizeof(*f)); -+ -+ if (f == NULL) -+ return (NULL); -+ - f->archive = _a; - f->state = ARCHIVE_WRITE_FILTER_STATE_NEW; - if (a->filter_first == NULL) -@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data, - a->client_data = client_data; - - client_filter = __archive_write_allocate_filter(_a); -+ -+ if (client_filter == NULL) -+ return (ARCHIVE_FATAL); -+ - client_filter->open = archive_write_client_open; - client_filter->write = archive_write_client_write; - client_filter->close = archive_write_client_close; diff --git a/package/libarchive/Config.in b/package/libarchive/Config.in index fd429acb60..ffa4cff7b3 100644 --- a/package/libarchive/Config.in +++ b/package/libarchive/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBARCHIVE Libarchive is a reusable C library for reading and writing a variety of streaming archive formats. - http://www.libarchive.org/ + https://www.libarchive.org/ if BR2_PACKAGE_LIBARCHIVE diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index ca580b4977..b03bef3de5 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6 libarchive-3.6.1.tar.xz +sha256 9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d libarchive-3.6.2.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 649b7dd4dc..cfc148d01d 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.6.1 +LIBARCHIVE_VERSION = 3.6.2 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES @@ -12,9 +12,6 @@ LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING LIBARCHIVE_CPE_ID_VENDOR = libarchive -# 0001-libarchive-Handle-a-calloc-returning-NULL.patch -LIBARCHIVE_IGNORE_CVES += CVE-2022-36227 - ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) LIBARCHIVE_CONF_OPTS += --enable-bsdtar=static From yann.morin.1998 at free.fr Mon Feb 20 20:55:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:01 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pydal: bump to version 20221110.1 Message-ID: <20230220205203.4688D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7fa52b837cc3a39534ba675e913c9bae583988d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pydal/python-pydal.hash | 6 ++++-- package/python-pydal/python-pydal.mk | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index 852e568ac5..c55a17a545 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,3 +1,5 @@ -# sha256 locally computed -sha256 0a2dbc5d61d37d2b59d441ed0aab48c1ec906ce66088eb5cee021b009601de02 python-pydal-20220916.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/pydal/json +md5 eeaf44cdcdb6bd2040713c710a4a04be pydal-20221110.1.tar.gz +sha256 7c3e891c70f8d8918e36276f210a1959bb7badf3b276f47191986ffcf5b6a390 pydal-20221110.1.tar.gz +# Locally computed sha256 checksums sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index a3df1ccff1..f55c7fc2c5 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20220916.1 -PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) +PYTHON_PYDAL_VERSION = 20221110.1 +PYTHON_PYDAL_SOURCE = pydal-$(PYTHON_PYDAL_VERSION).tar.gz +PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/73/83/b904c464b6ab060e12b3f406f1fab7deb97bcd9d2021d8c87325e6225c2d PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt PYTHON_PYDAL_SETUP_TYPE = setuptools From peter at korsgaard.com Mon Feb 20 20:55:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:01 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xhost: bump version to 1.0.9 Message-ID: <20230220205210.DF57E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f62d409cb8d1bcd015b9ca4aeca31b2d1c8dbf02 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003301.html Updated license hash due to copyright year bump: https://gitlab.freedesktop.org/xorg/app/xhost/-/commit/167ad7fa3a339da96798da49d05c3125045a87c2 Switched tarball to xz, updated _SITE. Added optional support for gettext: https://gitlab.freedesktop.org/xorg/app/xhost/-/commit/167ad7fa3a339da96798da49d05c3125045a87c2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xhost/xapp_xhost.hash | 10 ++++------ package/x11r7/xapp_xhost/xapp_xhost.mk | 9 +++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/package/x11r7/xapp_xhost/xapp_xhost.hash b/package/x11r7/xapp_xhost/xapp_xhost.hash index 71eabccc44..fea2588c6d 100644 --- a/package/x11r7/xapp_xhost/xapp_xhost.hash +++ b/package/x11r7/xapp_xhost/xapp_xhost.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002950.html -md5 a48c72954ae6665e0616f6653636da8c xhost-1.0.8.tar.bz2 -sha1 971670858a464d4f8eeb6f4e182f9fcd94149790 xhost-1.0.8.tar.bz2 -sha256 a2dc3c579e13674947395ef8ccc1b3763f89012a216c2cc6277096489aadc396 xhost-1.0.8.tar.bz2 -sha512 55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b xhost-1.0.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003301.html +sha256 ea86b531462035b19a2e5e01ef3d9a35cca7d984086645e2fc844d8f0e346645 xhost-1.0.9.tar.xz +sha512 d281a0df0a036d693ce7dbe0d1d53839110d203f42454bf4d33a49fbfddec078149969b6ad76641e40e207ddc8317ea563088c59025fc57d8245e5ed27f79818 xhost-1.0.9.tar.xz # Locally computed -sha256 7e69bed6fcfff05ecf454d7e4b29cd265172385833f1978f04b638f92f2cfecf COPYING +sha256 d3106697fb05dea4e9899b9e782ae7c3c17086d5b3dc7966494fc83fda9e468e COPYING diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk index e9fb155216..55f7ca5cc7 100644 --- a/package/x11r7/xapp_xhost/xapp_xhost.mk +++ b/package/x11r7/xapp_xhost/xapp_xhost.mk @@ -4,11 +4,12 @@ # ################################################################################ -XAPP_XHOST_VERSION = 1.0.8 -XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2 -XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XHOST_VERSION = 1.0.9 +XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.xz +XAPP_XHOST_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XHOST_LICENSE = MIT XAPP_XHOST_LICENSE_FILES = COPYING -XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu +XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu $(TARGET_NLS_DEPENDENCIES) +XAPP_XHOST_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) $(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:55:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:02 -0000 Subject: [Buildroot] [git commit branch/next] package/python-sentry-sdk: bump to version 1.11.1 Message-ID: <20230220205203.768018648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2733644c8947f8dafa1559bc12b3e67cee99ae6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-sentry-sdk/python-sentry-sdk.hash | 4 ++-- package/python-sentry-sdk/python-sentry-sdk.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index 729ffe94c4..2aa739f398 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 7f31bd0d6d968c711f8b1d928836eaaa sentry-sdk-1.10.1.tar.gz -sha256 105faf7bd7b7fa25653404619ee261527266b14103fe1389e0ce077bd23a9691 sentry-sdk-1.10.1.tar.gz +md5 4980e01dc73c6bcf794b0b7d3f3e08d7 sentry-sdk-1.11.1.tar.gz +sha256 675f6279b6bb1fea09fd61751061f9a90dca3b5929ef631dd50dc8b3aeb245e9 sentry-sdk-1.11.1.tar.gz # Locally computed sha256 checksums sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index d8e9e8a2c9..056a015952 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 1.10.1 +PYTHON_SENTRY_SDK_VERSION = 1.11.1 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/43/37/89598a56119199b69a3c4b13e2ce1b57ff69f68313ed393016086d6b487b +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/a3/d5/db26377e9817407ae8d7b65e15b3c3b8d817c301633be15bd2aef61f38a3 PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:55:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:02 -0000 Subject: [Buildroot] [git commit branch/next] package/mbedtls: security bump to version 2.28.2 Message-ID: <20230220205211.04BAD828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2baa583c350b9d594e87f9cab1db597789904df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following security issues: - Fix potential heap buffer overread and overwrite in DTLS if MBEDTLS_SSL_DTLS_CONNECTION_ID is enabled and MBEDTLS_SSL_CID_IN_LEN_MAX > 2 * MBEDTLS_SSL_CID_OUT_LEN_MAX. - An adversary with access to precise enough information about memory accesses (typically, an untrusted operating system attacking a secure enclave) could recover an RSA private key after observing the victim performing a single private-key operation if the window size used for the exponentiation was 3 or smaller. Drop patch (already in version: https://github.com/Mbed-TLS/mbedtls/commit/9d9d45c6b2aeaedfdfdadfec3d05d168db685968) https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...x-x86-PIC-inline-ASM-compilation-with-GCC.patch | 74 ---------------------- package/mbedtls/mbedtls.hash | 4 +- package/mbedtls/mbedtls.mk | 2 +- 3 files changed, 3 insertions(+), 77 deletions(-) diff --git a/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch b/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch deleted file mode 100644 index 60bf53f6e4..0000000000 --- a/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch +++ /dev/null @@ -1,74 +0,0 @@ -From a0ae2ba37ca479c6edddec8634b25686be965e0d Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 27 Aug 2018 22:50:57 +0200 -Subject: [PATCH] bn_mul.h: fix x86 PIC inline ASM compilation with GCC < 5 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes #1910 - -With ebx added to the MULADDC_STOP clobber list to fix #1550, the inline -assembly fails to build with GCC < 5 in PIC mode with the following error: - -include/mbedtls/bn_mul.h:46:13: error: PIC register clobbered by ???ebx??? in ???asm??? - -This is because older GCC versions treated the x86 ebx register (which is -used for the GOT) as a fixed reserved register when building as PIC. - -This is fixed by an improved register allocator in GCC 5+. From the release -notes: - -Register allocation improvements: Reuse of the PIC hard register, instead of -using a fixed register, was implemented on x86/x86-64 targets. This -improves generated PIC code performance as more hard registers can be used. - -https://www.gnu.org/software/gcc/gcc-5/changes.html - -As a workaround, detect this situation and disable the inline assembly, -similar to the MULADDC_CANNOT_USE_R7 logic. - -Signed-off-by: Peter Korsgaard -Upstream: https://github.com/ARMmbed/mbedtls/pull/1986 ---- - include/mbedtls/bn_mul.h | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h -index b587317d9..74a2d29be 100644 ---- a/include/mbedtls/bn_mul.h -+++ b/include/mbedtls/bn_mul.h -@@ -50,13 +50,29 @@ - #if defined(__GNUC__) && \ - ( !defined(__ARMCC_VERSION) || __ARMCC_VERSION >= 6000000 ) - -+/* -+ * GCC < 5.0 treated the x86 ebx (which is used for the GOT) as a -+ * fixed reserved register when building as PIC, leading to errors -+ * like: bn_mul.h:46:13: error: PIC register clobbered by ???ebx??? in ???asm??? -+ * -+ * This is fixed by an improved register allocator in GCC 5+. From the -+ * release notes: -+ * Register allocation improvements: Reuse of the PIC hard register, -+ * instead of using a fixed register, was implemented on x86/x86-64 -+ * targets. This improves generated PIC code performance as more hard -+ * registers can be used. -+ */ -+#if defined(__GNUC__) && __GNUC__ < 5 && defined(__PIC__) -+#define MULADDC_CANNOT_USE_EBX -+#endif -+ - /* - * Disable use of the i386 assembly code below if option -O0, to disable all - * compiler optimisations, is passed, detected with __OPTIMIZE__ - * This is done as the number of registers used in the assembly code doesn't - * work with the -O0 option. - */ --#if defined(__i386__) && defined(__OPTIMIZE__) -+#if defined(__i386__) && defined(__OPTIMIZE__) && !defined(MULADDC_CANNOT_USE_EBX) - - #define MULADDC_INIT \ - asm( \ --- -2.11.0 - diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 38182fe119..876cd7b77e 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.1: -sha256 6797a7b6483ef589deeab8d33d401ed235d7be25eeecda1be8ddfed406d40ff4 mbedtls-2.28.1.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.2: +sha256 bc55232bf71fd66045122ba9050a29ea7cb2e8f99b064a9e6334a82f715881a0 mbedtls-2.28.2.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 49ea7886f6..7a605ac5b1 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.1 +MBEDTLS_VERSION = 2.28.2 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ From yann.morin.1998 at free.fr Mon Feb 20 20:55:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:03 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pyphen: bump to version 0.13.2 Message-ID: <20230220205203.5EBA2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8a8ed95901a663fff43217b7c73530eff25d757 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyphen/python-pyphen.hash | 4 ++-- package/python-pyphen/python-pyphen.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyphen/python-pyphen.hash b/package/python-pyphen/python-pyphen.hash index 3a145e0f81..39af62e085 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 a2d6f69468684bbaa88d004b79c02128 pyphen-0.13.0.tar.gz -sha256 06873cebffd65a8fca7c20c0e3dc032655c7ee8de0f552205cad3b574265c293 pyphen-0.13.0.tar.gz +md5 a5039d1a4d8d4bad784cb864927f83f8 pyphen-0.13.2.tar.gz +sha256 847f57a043a58408f24670ae0184ff6edfb5fd5731743208228c028ddc514438 pyphen-0.13.2.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 d83eb79736..9ca064c293 100644 --- a/package/python-pyphen/python-pyphen.mk +++ b/package/python-pyphen/python-pyphen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPHEN_VERSION = 0.13.0 +PYTHON_PYPHEN_VERSION = 0.13.2 PYTHON_PYPHEN_SOURCE = pyphen-$(PYTHON_PYPHEN_VERSION).tar.gz -PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/9a/53/e7f212c87f91aab928bbf0de95ebc319c4d935e59bd5ed868f2c2bfc9465 +PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/46/12/aeb28a1e1a3f3cede967cea98ef3a1da844418ab8296a4bb9513f232736c 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 peter at korsgaard.com Mon Feb 20 20:55:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:03 -0000 Subject: [Buildroot] [git commit branch/next] package/libgeos: bump version to 3.11.1 Message-ID: <20230220205211.3B38181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46686174e55c4f53d4fd680e65371ee8d227fbce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://github.com/libgeos/geos/releases/tag/3.11.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/libgeos/libgeos.hash | 2 +- package/libgeos/libgeos.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index 34b2b855d6..cd0a4e0330 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 79ab8cabf4aa8604d161557b52e3e4d84575acdc0d08cb09ab3f7aaefa4d858a geos-3.11.0.tar.bz2 +sha256 6d0eb3cfa9f92d947731cc75f1750356b3bdfc07ea020553daf6af1c768e0be2 geos-3.11.1.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index 55c975eb4a..c6d470dc97 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.11.0 +LIBGEOS_VERSION = 3.11.1 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 From yann.morin.1998 at free.fr Mon Feb 20 20:55:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:04 -0000 Subject: [Buildroot] [git commit branch/next] package/python-termcolor: bump to version 2.1.1 Message-ID: <20230220205203.996C48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd7d4548cb434c2ed999ed62224d4aaad091c11b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-termcolor/python-termcolor.hash | 4 ++-- package/python-termcolor/python-termcolor.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-termcolor/python-termcolor.hash b/package/python-termcolor/python-termcolor.hash index 9e0324ed64..73fb9129ed 100644 --- a/package/python-termcolor/python-termcolor.hash +++ b/package/python-termcolor/python-termcolor.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/termcolor/json -md5 04e4981838535169d19d26a14a76af17 termcolor-2.1.0.tar.gz -sha256 b80df54667ce4f48c03fe35df194f052dc27a541ebbf2544e4d6b47b5d6949c4 termcolor-2.1.0.tar.gz +md5 f7f59efd147dd1ec2a25e667616e8a52 termcolor-2.1.1.tar.gz +sha256 67cee2009adc6449c650f6bcf3bdeed00c8ba53a8cda5362733c53e0a39fb70b termcolor-2.1.1.tar.gz # Locally computed sha256 checksums sha256 e79b6bd82962c1330caaa7c42278567b08667777673f8e2371a624d5715d4c0e COPYING.txt diff --git a/package/python-termcolor/python-termcolor.mk b/package/python-termcolor/python-termcolor.mk index 8731032fec..d7511d692f 100644 --- a/package/python-termcolor/python-termcolor.mk +++ b/package/python-termcolor/python-termcolor.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TERMCOLOR_VERSION = 2.1.0 +PYTHON_TERMCOLOR_VERSION = 2.1.1 PYTHON_TERMCOLOR_SOURCE = termcolor-$(PYTHON_TERMCOLOR_VERSION).tar.gz -PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/62/1a/e78a930f70dd576f2a7250a98263ac973a80d6f1a395d89328844881a0c0 +PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/19/da/ff1f0906818a5bd2e69e773d88801ca3c9e92d0d7caa99db1665658819ea PYTHON_TERMCOLOR_SETUP_TYPE = pep517 PYTHON_TERMCOLOR_LICENSE = MIT PYTHON_TERMCOLOR_LICENSE_FILES = COPYING.txt From peter at korsgaard.com Mon Feb 20 20:55:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:04 -0000 Subject: [Buildroot] [git commit branch/next] package/python-traitlets: bump to version 5.7.1 Message-ID: <20230220205211.728B086494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ebc1545b2f6f192d5abf2d61d9203c3f2095366 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-traitlets/python-traitlets.hash | 4 ++-- package/python-traitlets/python-traitlets.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-traitlets/python-traitlets.hash b/package/python-traitlets/python-traitlets.hash index 3b48fb6ab8..0c68e04518 100644 --- a/package/python-traitlets/python-traitlets.hash +++ b/package/python-traitlets/python-traitlets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/traitlets/json -md5 bae965c0e6ab468079f233e8a9caf581 traitlets-5.7.0.tar.gz -sha256 bd0fca5c890a09bf66b33cce67ca14156b080429bc39c7ef26b075a4bd4f9fc3 traitlets-5.7.0.tar.gz +md5 74ad03a0c8dd45d5621b12e0be0ab38f traitlets-5.7.1.tar.gz +sha256 fde8f62c05204ead43c2c1b9389cfc85befa7f54acb5da28529d671175bb4108 traitlets-5.7.1.tar.gz # Locally computed sha256 checksums sha256 3dcd47086529bf178cf7d10f35a8c188a1e9710391acecceef700898a4cf099b COPYING.md diff --git a/package/python-traitlets/python-traitlets.mk b/package/python-traitlets/python-traitlets.mk index 71bb775a45..8cda56817f 100644 --- a/package/python-traitlets/python-traitlets.mk +++ b/package/python-traitlets/python-traitlets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TRAITLETS_VERSION = 5.7.0 +PYTHON_TRAITLETS_VERSION = 5.7.1 PYTHON_TRAITLETS_SOURCE = traitlets-$(PYTHON_TRAITLETS_VERSION).tar.gz -PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/a2/88/5b2a191dd0287b45b933405d951ebfc490a9dfee2494442e5977653ec43b +PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/0b/db/9adbbb2bef9a43ecfa4f1cbcec1d662adade10262328a4b7ef65effc6341 PYTHON_TRAITLETS_LICENSE = BSD-3-Clause PYTHON_TRAITLETS_LICENSE_FILES = COPYING.md PYTHON_TRAITLETS_SETUP_TYPE = pep517 From peter at korsgaard.com Mon Feb 20 20:55:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:05 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xkeyboard-config: bump version to 2.37 Message-ID: <20230220205211.DE52C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=10b329956a378f9f3806339355cd6df32133690c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://gitlab.freedesktop.org/xorg/data/xkeyboard-config/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xkeyboard-config/xkeyboard-config.hash | 2 +- package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.hash b/package/x11r7/xkeyboard-config/xkeyboard-config.hash index e7e3765e59..08e36da1d0 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595 xkeyboard-config-2.36.tar.xz +sha256 eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c xkeyboard-config-2.37.tar.xz sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk index 0f45d9f74a..b82c15a23a 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk @@ -4,7 +4,7 @@ # ################################################################################ -XKEYBOARD_CONFIG_VERSION = 2.36 +XKEYBOARD_CONFIG_VERSION = 2.37 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.xz XKEYBOARD_CONFIG_SITE = https://www.x.org/releases/individual/data/xkeyboard-config XKEYBOARD_CONFIG_LICENSE = MIT From yann.morin.1998 at free.fr Mon Feb 20 20:55:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:05 -0000 Subject: [Buildroot] [git commit branch/next] package/python-tempora: bump to version 5.1.0 Message-ID: <20230220205203.8DD6C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55113b2e487b69d6f6c3e703ea9ef9cce1cc0075 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-tempora/python-tempora.hash | 4 ++-- package/python-tempora/python-tempora.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-tempora/python-tempora.hash b/package/python-tempora/python-tempora.hash index d802a63d87..39249eb4fa 100644 --- a/package/python-tempora/python-tempora.hash +++ b/package/python-tempora/python-tempora.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tempora/json -md5 24b77c173a7e89084004a38fe44e3ce3 tempora-5.0.2.tar.gz -sha256 31fa5bb33b2641026211f23e808eb8bd351901988b167d45f323c8f450ecf211 tempora-5.0.2.tar.gz +md5 f9954a8c3b091f9769eb7bbe0faddccf tempora-5.1.0.tar.gz +sha256 3e7c4a5369a1788c88a99b6be3a4c74c0c7728d3b62fd768a7e81bd0be0e88df tempora-5.1.0.tar.gz # Locally computed sha256 checksums sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-tempora/python-tempora.mk b/package/python-tempora/python-tempora.mk index e22ac52472..68516a8388 100644 --- a/package/python-tempora/python-tempora.mk +++ b/package/python-tempora/python-tempora.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEMPORA_VERSION = 5.0.2 +PYTHON_TEMPORA_VERSION = 5.1.0 PYTHON_TEMPORA_SOURCE = tempora-$(PYTHON_TEMPORA_VERSION).tar.gz -PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/72/2c/9aff4204a4ea5172b0cb3508f8a504ab6562ba539825ea2e33a5b4cb629b +PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/a9/4e/41863232e77742b3a5b30a81e1398abd102aa0a67657bc86a53800966b8e PYTHON_TEMPORA_LICENSE = MIT PYTHON_TEMPORA_LICENSE_FILES = LICENSE PYTHON_TEMPORA_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Mon Feb 20 20:55:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:06 -0000 Subject: [Buildroot] [git commit branch/next] package/python-traitlets: bump to version 5.7.0 Message-ID: <20230220205203.B0A8B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b401a65858161cd840378632d934a5fa13120d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-traitlets/python-traitlets.hash | 4 ++-- package/python-traitlets/python-traitlets.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-traitlets/python-traitlets.hash b/package/python-traitlets/python-traitlets.hash index 095e85c155..3b48fb6ab8 100644 --- a/package/python-traitlets/python-traitlets.hash +++ b/package/python-traitlets/python-traitlets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/traitlets/json -md5 d5f87bbea8acf897ac3e435c7b71acdc traitlets-5.5.0.tar.gz -sha256 b122f9ff2f2f6c1709dab289a05555be011c87828e911c0cf4074b85cb780a79 traitlets-5.5.0.tar.gz +md5 bae965c0e6ab468079f233e8a9caf581 traitlets-5.7.0.tar.gz +sha256 bd0fca5c890a09bf66b33cce67ca14156b080429bc39c7ef26b075a4bd4f9fc3 traitlets-5.7.0.tar.gz # Locally computed sha256 checksums sha256 3dcd47086529bf178cf7d10f35a8c188a1e9710391acecceef700898a4cf099b COPYING.md diff --git a/package/python-traitlets/python-traitlets.mk b/package/python-traitlets/python-traitlets.mk index 25ab71047a..71bb775a45 100644 --- a/package/python-traitlets/python-traitlets.mk +++ b/package/python-traitlets/python-traitlets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TRAITLETS_VERSION = 5.5.0 +PYTHON_TRAITLETS_VERSION = 5.7.0 PYTHON_TRAITLETS_SOURCE = traitlets-$(PYTHON_TRAITLETS_VERSION).tar.gz -PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/dd/a8/278742d17c9e95ccb0dcb86ae216df114d2166d88e72f42b60a7b58b600b +PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/a2/88/5b2a191dd0287b45b933405d951ebfc490a9dfee2494442e5977653ec43b PYTHON_TRAITLETS_LICENSE = BSD-3-Clause PYTHON_TRAITLETS_LICENSE_FILES = COPYING.md PYTHON_TRAITLETS_SETUP_TYPE = pep517 From peter at korsgaard.com Mon Feb 20 20:55:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:07 -0000 Subject: [Buildroot] [git commit branch/next] package/python-fire: bump to version 0.5.0 Message-ID: <20230220205211.EC0FB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7963d4a5dd86e2fce9c70371d10509220d3bda2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-fire/python-fire.hash | 4 ++-- package/python-fire/python-fire.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fire/python-fire.hash b/package/python-fire/python-fire.hash index d86376c52b..ce44bef96e 100644 --- a/package/python-fire/python-fire.hash +++ b/package/python-fire/python-fire.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fire/json -md5 799be84cbbd7df2cf159cdcb538ab6f9 fire-0.4.0.tar.gz -sha256 c5e2b8763699d1142393a46d0e3e790c5eb2f0706082df8f647878842c216a62 fire-0.4.0.tar.gz +md5 8b24d579bd2a1b344b4f9670fa49ebc8 fire-0.5.0.tar.gz +sha256 a6b0d49e98c8963910021f92bba66f65ab440da2982b78eb1bbf95a0a34aacc6 fire-0.5.0.tar.gz # Locally computed sha256 checksums sha256 a5de77b62266bca0bb97bf058992f0b0f308a83a8ca55ee10fbf6bd8ed8f7ed0 LICENSE diff --git a/package/python-fire/python-fire.mk b/package/python-fire/python-fire.mk index 40631fce86..7a6c31e8a4 100644 --- a/package/python-fire/python-fire.mk +++ b/package/python-fire/python-fire.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FIRE_VERSION = 0.4.0 +PYTHON_FIRE_VERSION = 0.5.0 PYTHON_FIRE_SOURCE = fire-$(PYTHON_FIRE_VERSION).tar.gz -PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/11/07/a119a1aa04d37bc819940d95ed7e135a7dcca1c098123a3764a6dcace9e7 +PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/94/ed/3b9a10605163f48517931083aee8364d4d6d3bb1aa9b75eb0a4a5e9fbfc1 PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:55:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:07 -0000 Subject: [Buildroot] [git commit branch/next] package/python-u-msgpack: bump to version 2.7.2 Message-ID: <20230220205203.BDB6D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d85a17270de1595d4b63c999e4c76b3bd53eccab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next License hash changed due to year update: https://github.com/vsergeev/u-msgpack-python/commit/8794887e2a71258ddacb7c435ca6f43304c2a21b Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-u-msgpack/python-u-msgpack.hash | 6 +++--- package/python-u-msgpack/python-u-msgpack.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-u-msgpack/python-u-msgpack.hash b/package/python-u-msgpack/python-u-msgpack.hash index 0891783985..0ec2385533 100644 --- a/package/python-u-msgpack/python-u-msgpack.hash +++ b/package/python-u-msgpack/python-u-msgpack.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/u-msgpack-python/json -md5 8691cea6bc7b44bce6e2115260a54323 u-msgpack-python-2.7.1.tar.gz -sha256 b7e7d433cab77171a4c752875d91836f3040306bab5063fb6dbe11f64ea69551 u-msgpack-python-2.7.1.tar.gz +md5 6c4fbe9e1df1c1563ecc9e435b82fdcb u-msgpack-python-2.7.2.tar.gz +sha256 e86f7ac6aa0ef4c6c49f004b4fd435bce99c23e2dd5d73003f3f9816024c2bd8 u-msgpack-python-2.7.2.tar.gz # Locally computed sha256 checksums -sha256 268ae7b7efbf67cd7bc0a9efea844fcf448d03f9cc6b8c79e8fe311815985030 LICENSE +sha256 f938fe2d3b7b329005d4b2851f106fd4351ca55f0836335acbe52386312f7f31 LICENSE diff --git a/package/python-u-msgpack/python-u-msgpack.mk b/package/python-u-msgpack/python-u-msgpack.mk index e0a3b3f297..372c5a8d45 100644 --- a/package/python-u-msgpack/python-u-msgpack.mk +++ b/package/python-u-msgpack/python-u-msgpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_U_MSGPACK_VERSION = 2.7.1 +PYTHON_U_MSGPACK_VERSION = 2.7.2 PYTHON_U_MSGPACK_SOURCE = u-msgpack-python-$(PYTHON_U_MSGPACK_VERSION).tar.gz -PYTHON_U_MSGPACK_SITE = https://files.pythonhosted.org/packages/62/94/a4f485b628310534d377b3e7cb6f85b8066dc823dbff0e4421fb4227fb7e +PYTHON_U_MSGPACK_SITE = https://files.pythonhosted.org/packages/44/a7/1cb4f059bbf72ea24364f9ba3ef682725af09969e29df988aa5437f0044e PYTHON_U_MSGPACK_SETUP_TYPE = setuptools PYTHON_U_MSGPACK_LICENSE = MIT PYTHON_U_MSGPACK_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:55:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:07 -0000 Subject: [Buildroot] [git commit branch/next] package/python-aiocoap: bump to version 0.4.5 Message-ID: <20230220205212.1CDB886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15f7b944df8be0f20e88f1d2b50534700030981e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-aiocoap/python-aiocoap.hash | 4 ++-- package/python-aiocoap/python-aiocoap.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiocoap/python-aiocoap.hash b/package/python-aiocoap/python-aiocoap.hash index 176b3d22c7..ab50ff0958 100644 --- a/package/python-aiocoap/python-aiocoap.hash +++ b/package/python-aiocoap/python-aiocoap.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiocoap/json -md5 218178420e8fc3581001f52eb726b016 aiocoap-0.4.4.tar.gz -sha256 9d7c9626cbc4dc24a91c6b8694cbeb834e376ab7e20e4137609380f726a9540b aiocoap-0.4.4.tar.gz +md5 03ca0411b7401bfd6e9bdaefe09bd88a aiocoap-0.4.5.tar.gz +sha256 906c927822185c8acf04fdcc1dd98fd845f31dabf5d5e395c39137dcbd6ba1e3 aiocoap-0.4.5.tar.gz # Locally computed sha256 checksums sha256 2bb211d412a6bfa4b2a9cf01123c7fe90e5e6185938896e23ab07b84f8494180 LICENSE diff --git a/package/python-aiocoap/python-aiocoap.mk b/package/python-aiocoap/python-aiocoap.mk index 96d8619a84..92f47b7a4f 100644 --- a/package/python-aiocoap/python-aiocoap.mk +++ b/package/python-aiocoap/python-aiocoap.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCOAP_VERSION = 0.4.4 +PYTHON_AIOCOAP_VERSION = 0.4.5 PYTHON_AIOCOAP_SOURCE = aiocoap-$(PYTHON_AIOCOAP_VERSION).tar.gz -PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/6a/7c/139993da8dcdfc86446ee6df65b98c68e40c5fcb0caeff3a6b348d9f7d6f +PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/65/63/9051af6a2fc498f50b71f23bdbde0cc1d1f0a69eb767776dbf6d1411e240 PYTHON_AIOCOAP_SETUP_TYPE = setuptools PYTHON_AIOCOAP_LICENSE = MIT PYTHON_AIOCOAP_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:55:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:08 -0000 Subject: [Buildroot] [git commit branch/next] package/python-watchdog: bump to version 2.2.0 Message-ID: <20230220205203.E397486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=873ea8bd385ef1b89be0f2753f6968aae6022508 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-watchdog/python-watchdog.hash | 4 ++-- package/python-watchdog/python-watchdog.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-watchdog/python-watchdog.hash b/package/python-watchdog/python-watchdog.hash index 59facb8fea..3bacccf2d6 100644 --- a/package/python-watchdog/python-watchdog.hash +++ b/package/python-watchdog/python-watchdog.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/watchdog/json -md5 0e60e0a2d3a8c18ba37105f8b44de810 watchdog-2.1.9.tar.gz -sha256 43ce20ebb36a51f21fa376f76d1d4692452b2527ccd601950d69ed36b9e21609 watchdog-2.1.9.tar.gz +md5 d029b806814bcba26745c26769a847bc watchdog-2.2.0.tar.gz +sha256 83cf8bc60d9c613b66a4c018051873d6273d9e45d040eed06d6a96241bd8ec01 watchdog-2.2.0.tar.gz # Locally computed sha256 checksums sha256 02c8760f988a76e92a9d6cb525456a86f7b0fd1953870dd491de5955cb974d41 COPYING sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-watchdog/python-watchdog.mk b/package/python-watchdog/python-watchdog.mk index 71a3f8a0c2..bb9f145e16 100644 --- a/package/python-watchdog/python-watchdog.mk +++ b/package/python-watchdog/python-watchdog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WATCHDOG_VERSION = 2.1.9 +PYTHON_WATCHDOG_VERSION = 2.2.0 PYTHON_WATCHDOG_SOURCE = watchdog-$(PYTHON_WATCHDOG_VERSION).tar.gz -PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/42/f7/da8e889f8626786eac9454e8d2718fc79359ed517be20cdd50c647167d39 +PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/c3/fb/bd960970258366b0704307ccd12617d64201407bfb6d31ae412d2762ccf1 PYTHON_WATCHDOG_SETUP_TYPE = setuptools PYTHON_WATCHDOG_LICENSE = Apache-2.0 PYTHON_WATCHDOG_LICENSE_FILES = LICENSE COPYING From peter at korsgaard.com Mon Feb 20 20:55:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:08 -0000 Subject: [Buildroot] [git commit branch/next] package/python-maturin: bump to version 0.14.5 Message-ID: <20230220205212.2A85786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63cd5db50914536910b67a0a06e05c22ddcc5a22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index d642119786..9d68751c03 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 dd1ee5cd1bb76c434319f305cd30873be2f8221e310168fc376b53b7d0e166ff maturin-0.14.4.tar.gz +sha256 383f60977a330ec8699a51c37ea9c5175ee7e95fc36b06d9415e0eec1f3acaf0 maturin-0.14.5.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index ea055ffcf6..4570ad4535 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.4 +PYTHON_MATURIN_VERSION = 0.14.5 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/7c/51/36749c1a0881a4292e4f334bd9ddb0865e0991a83070834d1aaa1af7443f +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/36/83/2bdec738921e253d774ab8b9e99f4540a406ad0d8a1442c84575e5506686 PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From yann.morin.1998 at free.fr Mon Feb 20 20:55:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:09 -0000 Subject: [Buildroot] [git commit branch/next] package/python-urllib3: bump to version 1.26.13 Message-ID: <20230220205203.D684F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a265441cf91c8accdf0e2bbdc46171335c357ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-urllib3/python-urllib3.hash | 4 ++-- package/python-urllib3/python-urllib3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash index 8aacf5780a..963967332e 100644 --- a/package/python-urllib3/python-urllib3.hash +++ b/package/python-urllib3/python-urllib3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urllib3/json -md5 ba308b52b9092184cf4905bc59a88fc0 urllib3-1.26.12.tar.gz -sha256 3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e urllib3-1.26.12.tar.gz +md5 38f7d1589aa9720101316d07fcbd05c8 urllib3-1.26.13.tar.gz +sha256 c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8 urllib3-1.26.13.tar.gz # Locally computed sha256 checksums sha256 c37bf186e27cf9dbe9619e55edfe3cea7b30091ceb3da63c7dacbe0e6d77907b LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index 96d3938fd2..5868927440 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.26.12 +PYTHON_URLLIB3_VERSION = 1.26.13 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/b2/56/d87d6d3c4121c0bcec116919350ca05dc3afd2eeb7dc88d07e8083f8ea94 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/c2/51/32da03cf19d17d46cce5c731967bf58de9bd71db3a379932f53b094deda4 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python From peter at korsgaard.com Mon Feb 20 20:55:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:09 -0000 Subject: [Buildroot] [git commit branch/next] package/mtd: add lsmtd option Message-ID: <20230220205212.361A586496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4c41ac00c7d144f8aed1644a1b80eca8470d01d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next lsmtd is a new utility added in v2.1.0[1]. [1] http://git.infradead.org/mtd-utils.git/commit/c26ce774a7209012c0505ee841d54898c6665e20 Signed-off-by: Brandon Maier Signed-off-by: Peter Korsgaard --- package/mtd/Config.in | 3 +++ package/mtd/mtd.mk | 1 + 2 files changed, 4 insertions(+) diff --git a/package/mtd/Config.in b/package/mtd/Config.in index c45dd1e2b7..3ba48da645 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -71,6 +71,9 @@ config BR2_PACKAGE_MTD_JFFS2DUMP bool "jffs2dump" select BR2_PACKAGE_MTD_JFFS_UTILS +config BR2_PACKAGE_MTD_LSMTD + bool "lsmtd" + config BR2_PACKAGE_MTD_MKFSJFFS2 bool "mkfs.jffs2" select BR2_PACKAGE_MTD_JFFS_UTILS diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 6e266a8760..db2b104586 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -94,6 +94,7 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump +MTD_TARGETS_$(BR2_PACKAGE_MTD_LSMTD) += lsmtd MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2 MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug MTD_TARGETS_$(BR2_PACKAGE_MTD_MTDPART) += mtdpart From yann.morin.1998 at free.fr Mon Feb 20 20:55:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:10 -0000 Subject: [Buildroot] [git commit branch/next] package/python-yarl: bump to version 1.8.2 Message-ID: <20230220205204.0AF07828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca8d70086d31d1f54c31dcbc2bab307d97066910 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-yarl/python-yarl.hash | 4 ++-- package/python-yarl/python-yarl.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-yarl/python-yarl.hash b/package/python-yarl/python-yarl.hash index b4e411cbdf..9725e0058b 100644 --- a/package/python-yarl/python-yarl.hash +++ b/package/python-yarl/python-yarl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/yarl/json -md5 ff8f2843481cd11c3c674ce4f6fa167b yarl-1.8.1.tar.gz -sha256 af887845b8c2e060eb5605ff72b6f2dd2aab7a761379373fd89d314f4752abbf yarl-1.8.1.tar.gz +md5 57c82725b9f4895eecee45faf5e61a54 yarl-1.8.2.tar.gz +sha256 49d43402c6e3013ad0978602bf6bf5328535c48d192304b91b97a3c6790b1562 yarl-1.8.2.tar.gz # Locally computed sha256 checksums sha256 56d6ac6c8105c0a51304c21db060e361af9a8ea0af9a75c239c28b5d13693838 LICENSE diff --git a/package/python-yarl/python-yarl.mk b/package/python-yarl/python-yarl.mk index 55bfbab53e..77e0c91383 100644 --- a/package/python-yarl/python-yarl.mk +++ b/package/python-yarl/python-yarl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YARL_VERSION = 1.8.1 +PYTHON_YARL_VERSION = 1.8.2 PYTHON_YARL_SOURCE = yarl-$(PYTHON_YARL_VERSION).tar.gz -PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/d6/04/255c68974ec47fa754564c4abba8f61f9ed68b869bbbb854198d6259c4f7 +PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/c4/1e/1b204050c601d5cd82b45d5c8f439cb6f744a2ce0c0a6f83be0ddf0dc7b2 PYTHON_YARL_LICENSE = Apache-2.0 PYTHON_YARL_LICENSE_FILES = LICENSE PYTHON_YARL_SETUP_TYPE = setuptools From peter at korsgaard.com Mon Feb 20 20:55:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:10 -0000 Subject: [Buildroot] [git commit branch/next] linux: bump _KERNEL_LATEST_VERSION to 6.1 Message-ID: <20230220205212.76B1986494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78504fca92c33cfd23beddd1c9b83fe58b9e0e9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index fba3d90e6b..1bca082cbf 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,8 +28,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.0)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.1)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.145-cip17)" @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.0.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ From peter at korsgaard.com Mon Feb 20 20:55:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:15 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-headers: drop 5.19.x option Message-ID: <20230220205204.90781828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5449ea7d20e76242661434b5324c7474c2c96938 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The 5.19.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 9602a49e3b..cb0176a31c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_5_19 + bool "kernel headers version 5.19.x are no longer supported" + select BR2_LEGACY + help + Version 5.19.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA bool "xf86-video-tga removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 8739da4f75..9976a44489 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 89b730edf8942b49e02f9894244205886c9a214d629b35b88c4ff06ee9304f01 linux-6.0.12.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 c93bb384a97ad1f0a4f18e442ce0291242722f78023eca658b22344541f09489 linux-5.19.17.tar.xz sha256 fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65 linux-5.15.82.tar.xz sha256 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7 linux-5.10.158.tar.xz sha256 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44 linux-5.4.226.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 24f51418e6..4c8b1fca27 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -53,10 +53,6 @@ config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 -config BR2_KERNEL_HEADERS_5_19 - bool "Linux 5.19.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 - config BR2_KERNEL_HEADERS_6_0 bool "Linux 6.0.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 @@ -398,7 +394,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.226" if BR2_KERNEL_HEADERS_5_4 default "5.10.158" if BR2_KERNEL_HEADERS_5_10 default "5.15.82" if BR2_KERNEL_HEADERS_5_15 - default "5.19.17" if BR2_KERNEL_HEADERS_5_19 default "6.0.12" if BR2_KERNEL_HEADERS_6_0 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From peter at korsgaard.com Mon Feb 20 20:55:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:16 -0000 Subject: [Buildroot] [git commit branch/next] package/mpfr: bump to version 4.1.1 Message-ID: <20230220205213.315CB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4386b912db9f9f9a3cf5cbc9165e1609a55309f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://www.mpfr.org/mpfr-4.1.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mpfr/mpfr.hash | 2 +- package/mpfr/mpfr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpfr/mpfr.hash b/package/mpfr/mpfr.hash index 35056f626a..4b0d14c9c2 100644 --- a/package/mpfr/mpfr.hash +++ b/package/mpfr/mpfr.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f mpfr-4.1.0.tar.xz +sha256 ffd195bd567dbaffc3b98b23fd00aad0537680c9896171e44fe3ff79e28ac33d mpfr-4.1.1.tar.xz # Hash for license file sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSER diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index cd558dae0e..8d12c7502b 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPFR_VERSION = 4.1.0 +MPFR_VERSION = 4.1.1 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:16 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: bump to version 1.7.2 Message-ID: <20230220205204.A17F481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6987b92da510a8c8b9534a22506850c163d0f035 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bugfixes: https://github.com/containers/crun/releases/tag/1.7.2 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/crun/crun.hash | 2 +- package/crun/crun.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/crun/crun.hash b/package/crun/crun.hash index de61310e08..2b21800f02 100644 --- a/package/crun/crun.hash +++ b/package/crun/crun.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 acd24012daa951cf1674b20b2d5f87975d5d6c8e8c80bfe12e4cffa3495cae67 crun-1.5.tar.gz +sha256 f669ecd3d1895dcaa8425eabb707c06eb3bdb5ae5201a50a423c3cace36c4a05 crun-1.7.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.libcrun diff --git a/package/crun/crun.mk b/package/crun/crun.mk index 65f166e657..8c9993993c 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRUN_VERSION = 1.5 +CRUN_VERSION = 1.7.2 CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION) CRUN_DEPENDENCIES = host-pkgconf yajl From peter at korsgaard.com Mon Feb 20 20:55:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:17 -0000 Subject: [Buildroot] [git commit branch/next] configs/nezha_defconfig: use 6.1 kernel headers Message-ID: <20230220205213.54FAF86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bed9b6cd02cf26a8d9b26f876f3f46a7352e6542 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The kernel used is based on 6.1-rc3, so use the recently introduced 6.1 kernel headers version to fix a build issue: Incorrect selection of kernel headers: expected 6.0.x, got 6.1.x Signed-off-by: Peter Korsgaard --- configs/nezha_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 2936746c49..854392f929 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:17 -0000 Subject: [Buildroot] [git commit branch/next] package/usbutils: bump to version 015 Message-ID: <20230220205204.BD08F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=994113674adf46a3059d3378708a2aed4cce0c80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/gregkh/usbutils/blob/v015/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/usbutils/usbutils.hash | 2 +- package/usbutils/usbutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/usbutils/usbutils.hash b/package/usbutils/usbutils.hash index f5d55bb4a0..caedf5fd80 100644 --- a/package/usbutils/usbutils.hash +++ b/package/usbutils/usbutils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/usb/usbutils/sha256sums.asc -sha256 3a079cfad60560227b67192482d7813bf96326fcbb66c04254839715f276fc69 usbutils-014.tar.xz +sha256 c3b451bb1f4ff9f6356cac5a6956a9ac8e85d81651af56a29e689f94fa6fda6e usbutils-015.tar.xz # Locally calculated sha256 91412672119c72352b76c1d48fa1a8b7cdc7f70be7929e468c8805db468e23e4 LICENSES/GPL-2.0-only.txt sha256 4631da83311d27f99078d0d102e31bd34a4fcbcc2dae2aa40f1454a5b48125dc LICENSES/GPL-3.0-only.txt diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 50b1a5a0cc..84a6a625cf 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBUTILS_VERSION = 014 +USBUTILS_VERSION = 015 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils USBUTILS_DEPENDENCIES = host-pkgconf libusb udev From peter at korsgaard.com Mon Feb 20 20:55:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:18 -0000 Subject: [Buildroot] [git commit branch/next] configs/lichee_rv: new defconfig Message-ID: <20230220205212.E2DB486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=286628bcc2d1931807c4648ef4359873bb3ee559 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Lichee RV - Nezha CM is a compute module with modular design, equipped with Allwinner D1 chip (based on T-Head XuanTie C906 core), 512MB DDR3 RAM. Board support is based on the nezha defconfig already available in buildroot. https://wiki.sipeed.com/hardware/en/lichee/RV/RV.html https://linux-sunxi.org/Sipeed_Lichee_RV Signed-off-by: Angelo Compagnucci Reviewed-by: Indrek Kruusa Tested-by: Indrek Kruusa Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ board/sipeed/lichee_rv/genimage.cfg | 19 +++++++++++++ .../lichee_rv/overlay/boot/extlinux/extlinux.conf | 4 +++ board/sipeed/lichee_rv/readme.txt | 26 +++++++++++++++++ configs/sipeed_lichee_rv_defconfig | 33 ++++++++++++++++++++++ 5 files changed, 84 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b52a065dbc..2f27ddb110 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -157,6 +157,8 @@ N: Andrey Yurovsky F: package/rauc/ N: Angelo Compagnucci +F: board/sipeed/lichee_rv/ +F: configs/sipeed_lichee_rv* F: package/apparmor/ F: package/corkscrew/ F: package/cups/ diff --git a/board/sipeed/lichee_rv/genimage.cfg b/board/sipeed/lichee_rv/genimage.cfg new file mode 100644 index 0000000000..d5df41203d --- /dev/null +++ b/board/sipeed/lichee_rv/genimage.cfg @@ -0,0 +1,19 @@ +# Minimal SD card image for the sipeed Lichee RV + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + offset = 1M + } +} diff --git a/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf b/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..91b2298628 --- /dev/null +++ b/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + # use devicetree from u-boot + append console=ttyS0,115200 root=/dev/mmcblk0p1 ro rootwait diff --git a/board/sipeed/lichee_rv/readme.txt b/board/sipeed/lichee_rv/readme.txt new file mode 100644 index 0000000000..24e8141851 --- /dev/null +++ b/board/sipeed/lichee_rv/readme.txt @@ -0,0 +1,26 @@ +Lichee RV +=============== + +Lichee RV - Nezha CM is a compute module with modular design, equipped +with Allwinner D1 chip (based on T-Head XuanTie C906 core), 512MB DDR3 RAM. +It can boot from TF card or SD-NAND, uses two sets of M.2 b key 67 pin +connectors to route all IO, making it convient for wide use and easy to replace. + +How to build +============ + +$ make sipeed_lichee_rv_defconfig +$ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Connect a TTL UART to the debug connector, insert the microSD card and +plug in a USB-C cable to the PWR connector to boot the system. diff --git a/configs/sipeed_lichee_rv_defconfig b/configs/sipeed_lichee_rv_defconfig new file mode 100644 index 0000000000..f9782f870b --- /dev/null +++ b/configs/sipeed_lichee_rv_defconfig @@ -0,0 +1,33 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/lichee_rv/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="nezha" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-lichee-rv" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +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_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_PLAT="generic" +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set +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,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="lichee_rv_dock" +BR2_TARGET_UBOOT_NEEDS_DTC=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-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y From yann.morin.1998 at free.fr Mon Feb 20 20:55:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:18 -0000 Subject: [Buildroot] [git commit branch/next] package/python3: bump to version 3.11.1 Message-ID: <20230220205204.2D430828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c38de8139abee58fb8d1cdc83d061c93aee7fd7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update license hash: - http://www.cwi.nl -> https://www.cwi.nl - http://www.cnri.reston.va.us -> https://www.cnri.reston.va.us - http://www.opensource.org -> https://opensource.org Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- ...33-Fix-quadratic-time-idna-decoding.-GH-9.patch | 86 ---------------------- package/python3/python3.hash | 4 +- package/python3/python3.mk | 2 +- 3 files changed, 3 insertions(+), 89 deletions(-) diff --git a/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch b/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch deleted file mode 100644 index d281e7261d..0000000000 --- a/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 9bb8e18ca46fe66fa6802602f8a7228a24dd785f Mon Sep 17 00:00:00 2001 -From: "Miss Islington (bot)" - <31488909+miss-islington at users.noreply.github.com> -Date: Mon, 7 Nov 2022 19:23:16 -0800 -Subject: [PATCH] [3.11] gh-98433: Fix quadratic time idna decoding. (GH-99092) - (GH-99222) - -There was an unnecessary quadratic loop in idna decoding. This restores -the behavior to linear. - -(cherry picked from commit d315722564927c7202dd6e111dc79eaf14240b0d) - -(cherry picked from commit a6f6c3a3d6f2b580f2d87885c9b8a9350ad7bf15) - -Co-authored-by: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> -Co-authored-by: Gregory P. Smith -[Peter: drop NEWS.d/*] -Signed-off-by: Peter Korsgaard ---- - Lib/encodings/idna.py | 32 +++++++++---------- - Lib/test/test_codecs.py | 6 ++++ - 2 files changed, 23 insertions(+), 17 deletions(-) - -diff --git a/Lib/encodings/idna.py b/Lib/encodings/idna.py -index ea4058512f..bf98f51336 100644 ---- a/Lib/encodings/idna.py -+++ b/Lib/encodings/idna.py -@@ -39,23 +39,21 @@ def nameprep(label): - - # Check bidi - RandAL = [stringprep.in_table_d1(x) for x in label] -- for c in RandAL: -- if c: -- # There is a RandAL char in the string. Must perform further -- # tests: -- # 1) The characters in section 5.8 MUST be prohibited. -- # This is table C.8, which was already checked -- # 2) If a string contains any RandALCat character, the string -- # MUST NOT contain any LCat character. -- if any(stringprep.in_table_d2(x) for x in label): -- raise UnicodeError("Violation of BIDI requirement 2") -- -- # 3) If a string contains any RandALCat character, a -- # RandALCat character MUST be the first character of the -- # string, and a RandALCat character MUST be the last -- # character of the string. -- if not RandAL[0] or not RandAL[-1]: -- raise UnicodeError("Violation of BIDI requirement 3") -+ if any(RandAL): -+ # There is a RandAL char in the string. Must perform further -+ # tests: -+ # 1) The characters in section 5.8 MUST be prohibited. -+ # This is table C.8, which was already checked -+ # 2) If a string contains any RandALCat character, the string -+ # MUST NOT contain any LCat character. -+ if any(stringprep.in_table_d2(x) for x in label): -+ raise UnicodeError("Violation of BIDI requirement 2") -+ # 3) If a string contains any RandALCat character, a -+ # RandALCat character MUST be the first character of the -+ # string, and a RandALCat character MUST be the last -+ # character of the string. -+ if not RandAL[0] or not RandAL[-1]: -+ raise UnicodeError("Violation of BIDI requirement 3") - - return label - -diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py -index 8edd5ac063..2407567261 100644 ---- a/Lib/test/test_codecs.py -+++ b/Lib/test/test_codecs.py -@@ -1535,6 +1535,12 @@ def test_builtin_encode(self): - self.assertEqual("pyth\xf6n.org".encode("idna"), b"xn--pythn-mua.org") - self.assertEqual("pyth\xf6n.org.".encode("idna"), b"xn--pythn-mua.org.") - -+ def test_builtin_decode_length_limit(self): -+ with self.assertRaisesRegex(UnicodeError, "too long"): -+ (b"xn--016c"+b"a"*1100).decode("idna") -+ with self.assertRaisesRegex(UnicodeError, "too long"): -+ (b"xn--016c"+b"a"*70).decode("idna") -+ - def test_stream(self): - r = codecs.getreader("idna")(io.BytesIO(b"abc")) - r.read(3) --- -2.30.2 - diff --git a/package/python3/python3.hash b/package/python3/python3.hash index c4ee79305d..7f079865d9 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a57dc82d77358617ba65b9841cee1e3b441f386c3789ddc0676eca077f2951c3 Python-3.11.0.tar.xz -sha256 f03e17cd594c2085f66a454e695c7ebe5b4d3c0eff534f4f194abc2fd164621b LICENSE +sha256 85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f Python-3.11.1.tar.xz +sha256 d4a223f033419313218c9b8444167e91e87a5bebdb43fb8490df441df5220a8b LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 123bc8ef88..219d135b3f 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).0 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From peter at korsgaard.com Mon Feb 20 20:55:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:19 -0000 Subject: [Buildroot] [git commit branch/next] configs/sipeed_lichee_rv_dock_defconfig: use 6.1 kernel headers Message-ID: <20230220205213.5EE7686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dfbe4215cd19cfe95922ba8536b61f44a6ce8140 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The kernel used is based on 6.1-rc3, so use the recently introduced 6.1 kernel headers version to fix a build issue: Incorrect selection of kernel headers: expected 6.0.x, got 6.1.x Signed-off-by: Peter Korsgaard --- configs/sipeed_lichee_rv_dock_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sipeed_lichee_rv_dock_defconfig b/configs/sipeed_lichee_rv_dock_defconfig index 7c8c6788fa..807209eeec 100644 --- a/configs/sipeed_lichee_rv_dock_defconfig +++ b/configs/sipeed_lichee_rv_dock_defconfig @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay board/sipeed/lichee_rv_dock/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:20 -0000 Subject: [Buildroot] [git commit branch/next] package/docker-compose: bump to version 2.14.0 Message-ID: <20230220205204.CAE348648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1576b09b5c52b746256ca5b4b313eab9bf068b09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/docker/compose/releases/tag/v2.14.0 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 39f98523b8..7a7ab5f110 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 69d7d0311ac34ed4543f9a694995fbc4e2b785976a5a710015c20f0d04c204cb docker-compose-2.11.2.tar.gz +sha256 5cbf6cd1dd8ce98c5e2d62ca7f622e96abce444979b8e8852b033213a98e2049 docker-compose-2.14.0.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index bc88d8df88..ef9ee97196 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.11.2 +DOCKER_COMPOSE_VERSION = 2.14.0 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:55:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:20 -0000 Subject: [Buildroot] [git commit branch/next] package/unifdef: add new package Message-ID: <20230220205213.836F086494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7dbe844bae38aba8e6080da3b650b89f702c0f1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A small package that does "Selectively remove C preprocessor conditionals". The package will be needed for the upcoming webkitgtk 2.40.0 release. I personally added it to get started with 2.39.2. See: https://github.com/WebKit/WebKit/commit/f76a7e30e5749af897b83cc75b2534b1afa32552 Signed-off-by: Thomas Devoogdt [Peter: use prefix=] Signed-off-by: Peter Korsgaard --- .../0001-Makefile-fix-error-on-install.patch | 31 ++++++++++++++++++++++ package/unifdef/unifdef.hash | 3 +++ package/unifdef/unifdef.mk | 20 ++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/package/unifdef/0001-Makefile-fix-error-on-install.patch b/package/unifdef/0001-Makefile-fix-error-on-install.patch new file mode 100644 index 0000000000..c959a41c5a --- /dev/null +++ b/package/unifdef/0001-Makefile-fix-error-on-install.patch @@ -0,0 +1,31 @@ +From b5e4229918c13bc0c11a523105cdb3a464337b37 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 12 Dec 2022 12:59:59 +0100 +Subject: [PATCH] Makefile: fix error on install + +ln: failed to create symbolic link '/home/thomas/Documents/buildroot/output/host/share/man/man1/unifdefall.1': File exists + +Seen while trying to add this package to buildroot.org. + +(upstream: https://github.com/fanf2/unifdef/pull/16) +Signed-off-by: Thomas Devoogdt +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 36c7028..485927a 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,7 +28,7 @@ install: unifdef unifdefall.sh unifdef.1 + : manual + install -m 755 -d ${man1dest} + install -m 644 unifdef.1 ${man1dest}/ +- ln -s unifdef.1 ${man1dest}/unifdefall.1 ++ ln -f -s unifdef.1 ${man1dest}/unifdefall.1 + + clean: + rm -f unifdef version.h +-- +2.38.1 + diff --git a/package/unifdef/unifdef.hash b/package/unifdef/unifdef.hash new file mode 100644 index 0000000000..c3a6b7465c --- /dev/null +++ b/package/unifdef/unifdef.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 fba564a24db7b97ebe9329713ac970627b902e5e9e8b14e19e024eb6e278d10b unifdef-2.12.tar.gz +sha256 37ed46a39446b15b08af418fda23b75c27a769d5aad236d817ee7522cc9caeee COPYING diff --git a/package/unifdef/unifdef.mk b/package/unifdef/unifdef.mk new file mode 100644 index 0000000000..7d10595d1b --- /dev/null +++ b/package/unifdef/unifdef.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# unifdef +# +################################################################################ + +UNIFDEF_VERSION = 2.12 +UNIFDEF_SITE = https://dotat.at/prog/unifdef +UNIFDEF_LICENSE = BSD-2-Clause +UNIFDEF_LICENSE_FILES = COPYING + +define HOST_UNIFDEF_BUILD_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + +define HOST_UNIFDEF_INSTALL_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) prefix=$(HOST_DIR) install +endef + +$(eval $(host-generic-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:21 -0000 Subject: [Buildroot] [git commit branch/next] package/fuse-overlayfs: bump to version 1.10 Message-ID: <20230220205204.DA169828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=498b9c294239d4684641df5ee60e169a4ed85383 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Contains various bugfixes. https://github.com/containers/fuse-overlayfs/releases/tag/v1.10 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/fuse-overlayfs/fuse-overlayfs.hash | 2 +- package/fuse-overlayfs/fuse-overlayfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fuse-overlayfs/fuse-overlayfs.hash b/package/fuse-overlayfs/fuse-overlayfs.hash index f9473c154a..aa5438755e 100644 --- a/package/fuse-overlayfs/fuse-overlayfs.hash +++ b/package/fuse-overlayfs/fuse-overlayfs.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 6c81b65b71067b303aaa9871f512c2cabc23e2b793f19c6c854d01a492b5a923 fuse-overlayfs-1.5.0.tar.gz +sha256 4351eaed7cf26a5012c14c6e0fc883ef65a7b5dcc95ba129ce485904106c25a9 fuse-overlayfs-1.10.tar.gz # Locally computed sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/fuse-overlayfs/fuse-overlayfs.mk b/package/fuse-overlayfs/fuse-overlayfs.mk index 0ad7dbc51d..1633d3bd41 100644 --- a/package/fuse-overlayfs/fuse-overlayfs.mk +++ b/package/fuse-overlayfs/fuse-overlayfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -FUSE_OVERLAYFS_VERSION = 1.5.0 +FUSE_OVERLAYFS_VERSION = 1.10 FUSE_OVERLAYFS_SITE = $(call github,containers,fuse-overlayfs,v$(FUSE_OVERLAYFS_VERSION)) FUSE_OVERLAYFS_LICENSE = GPL-3.0 FUSE_OVERLAYFS_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:55:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:21 -0000 Subject: [Buildroot] [git commit branch/next] package/libgpg-error: Disable support for non-C languages Message-ID: <20230220205213.B03EC86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9abb21ab314cb5d5000334fd9399521104d64043 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The only other language supported is CL (Common Lisp) which buildroot does not package yet. This saves 52KB in the final root filesystem. Signed-off-by: Florian Fainelli [yann.morin.1998 at free.fr: reformat for one-option per-line] Signed-off-by: Yann E. MORIN --- package/libgpg-error/libgpg-error.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 86dea6ad2a..252d95ac7f 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -13,8 +13,10 @@ LIBGPG_ERROR_CPE_ID_VENDOR = gnupg LIBGPG_ERROR_INSTALL_STAGING = YES LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -LIBGPG_ERROR_CONF_OPTS = --disable-tests \ - --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) +LIBGPG_ERROR_CONF_OPTS = \ + --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) \ + --disable-tests \ + --disable-languages ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBGPG_ERROR_CONF_OPTS += --enable-threads From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:22 -0000 Subject: [Buildroot] [git commit branch/next] package/moby-buildkit: security bump to version 0.10.6 Message-ID: <20230220205205.06D0181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b69acab54b6b258d83833c8f51b09ee0913e9a4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next CVE-2022-39253: git vulnerability mitigation. ... and other bugfixes. https://github.com/moby/buildkit/releases/tag/v0.10.6 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- 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 cfd1c0c946..43ee1b12c9 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5877faf02cbddfb6c988f44b5b373739fed87f4aeb8802c6777fe7be2f772506 moby-buildkit-0.10.0.tar.gz +sha256 5ffe5a2d11736719649dae962461f66df394ae4cc1e58294e5f2bd4d4632d9d0 moby-buildkit-0.10.6.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 667383bf50..59d68a7dca 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.10.0 +MOBY_BUILDKIT_VERSION = 0.10.6 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:22 -0000 Subject: [Buildroot] [git commit branch/next] package/mosh: bump to version 1.4.0 Message-ID: <20230220205205.142A0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=271ad374ced4bfe325bf0d8ba21adb92793d2ae7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Many new features & bugfixes. https://github.com/mobile-shell/mosh/releases Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/mosh/mosh.hash | 2 +- package/mosh/mosh.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mosh/mosh.hash b/package/mosh/mosh.hash index 3558bf9030..6c1d0e7af3 100644 --- a/package/mosh/mosh.hash +++ b/package/mosh/mosh.hash @@ -1,5 +1,5 @@ # From https://mailman.mit.edu/pipermail/mosh-users/2017-July/000357.html -sha256 da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216 mosh-1.3.2.tar.gz +sha256 872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd mosh-1.4.0.tar.gz # Locally calculcated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8042495ddc8d99b883335d53552554eccf825fc1f0ba487d0f8e6656baaa8199 COPYING.iOS diff --git a/package/mosh/mosh.mk b/package/mosh/mosh.mk index f9e335799d..c938f70719 100644 --- a/package/mosh/mosh.mk +++ b/package/mosh/mosh.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSH_VERSION = 1.3.2 +MOSH_VERSION = 1.4.0 MOSH_SITE = https://mosh.org MOSH_DEPENDENCIES = zlib ncurses protobuf host-pkgconf MOSH_LICENSE = GPL-3.0+ with exception From peter at korsgaard.com Mon Feb 20 20:55:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:25 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-input-keyboard: remove package Message-ID: <20230220205213.9334B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1100ead7b3189761765988504609447c88e22da5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next According to the upstream release notes of version 2.0.0: https://lists.x.org/archives/xorg-announce/2022-July/003180.html "This keyboard driver is primarily used with BSD, GNU Hurd, illumos, & Solaris systems. Linux systems should instead use either xf86-input- libinput or xf86-input-evdev. While versions 1.9.0 and earlier had rudimentary support for Linux as well, that has been removed in this release." Signed-off-by: Bernd Kuhls [Peter: Reword help text] Signed-off-by: Peter Korsgaard --- Config.in.legacy | 5 +++++ package/x11r7/Config.in | 1 - package/x11r7/xdriver_xf86-input-keyboard/Config.in | 5 ----- .../xdriver_xf86-input-keyboard.hash | 4 ---- .../xdriver_xf86-input-keyboard.mk | 15 --------------- 5 files changed, 5 insertions(+), 25 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 852189f0ff..ca25c18b16 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,11 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD + bool "xf86-input-keyboard removed" + help + The X.org keyboard input driver no longer support Linux. + config BR2_TARGET_SUN20I_D1_SPL bool "sun20-d1-spl removed" select BR2_LEGACY diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index da79c4e851..4d3613cf4d 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -149,7 +149,6 @@ if BR2_PACKAGE_XORG7 menu "X11R7 Drivers" source package/x11r7/xdriver_xf86-input-evdev/Config.in source package/x11r7/xdriver_xf86-input-joystick/Config.in - source package/x11r7/xdriver_xf86-input-keyboard/Config.in source package/x11r7/xdriver_xf86-input-libinput/Config.in source package/x11r7/xdriver_xf86-input-mouse/Config.in source package/x11r7/xdriver_xf86-input-synaptics/Config.in diff --git a/package/x11r7/xdriver_xf86-input-keyboard/Config.in b/package/x11r7/xdriver_xf86-input-keyboard/Config.in deleted file mode 100644 index ee23033b97..0000000000 --- a/package/x11r7/xdriver_xf86-input-keyboard/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD - bool "xf86-input-keyboard" - select BR2_PACKAGE_XORGPROTO - help - Keyboard input driver diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash deleted file mode 100644 index 66e2c3ed95..0000000000 --- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002739.html -sha256 f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388 xf86-input-keyboard-1.9.0.tar.bz2 -# Locally calculated -sha256 b91b17c53724c79685e3025a38028b7d48c966fdd239e0efe2d98874d3c139a0 COPYING diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk deleted file mode 100644 index fb1e289643..0000000000 --- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xdriver_xf86-input-keyboard -# -################################################################################ - -XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.9.0 -XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_INPUT_KEYBOARD_LICENSE = MIT -XDRIVER_XF86_INPUT_KEYBOARD_LICENSE_FILES = COPYING -XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xorgproto -XDRIVER_XF86_INPUT_KEYBOARD_CONF_OPTS = --disable-selective-werror - -$(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:55:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:26 -0000 Subject: [Buildroot] [git commit branch/next] Config.in: update default CPAN mirror to https, update mirrors URL Message-ID: <20230220205213.DDAC186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=add21fd600b2db4dbb930e2e62b9fbb1b72cceb9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The http site automatically redirects to the https variant, so let's just use that as the default. The mirror list URL http://search.cpan.org/mirror seems outdated (re-directed to https://metacpan.org/mirrors aka 'Not Found - The resource you requested could not be found.'). The closest matching URLs we found were: https://www.cpan.org/SITES.html http://mirrors.cpan.org/map.html http://mirrors.cpan.org/ That last one has all the list, so we use that; the second is a world map, so we also include it. Sadly, neither of the mirrors list (table or map) are served as https; they are only available as http... Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: - add a little blurb to explain http->https redirect - update the mirror list URL, and... - extend commit message with original explanations from Peter, and.. - notice that they are not served via https... ] Signed-off-by: Yann E. MORIN --- Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Config.in b/Config.in index 3c57c591a8..64604a0aed 100644 --- a/Config.in +++ b/Config.in @@ -287,14 +287,15 @@ config BR2_LUAROCKS_MIRROR config BR2_CPAN_MIRROR string "CPAN mirror (Perl packages)" - default "http://cpan.metacpan.org" + default "https://cpan.metacpan.org" help CPAN (Comprehensive Perl Archive Network) is a repository of Perl packages. It has multiple software mirrors scattered around the world. This option allows you to select a mirror. The list of mirrors is available at: - http://search.cpan.org/mirror + http://mirrors.cpan.org/ (tabular) + http://mirrors.cpan.org/map.html (clickable world map) endif From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:26 -0000 Subject: [Buildroot] [git commit branch/next] package/autoconf-archive: bump to version 2022.09.03 Message-ID: <20230220205205.61C6D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5a009920f0a79ecfcfa2778a61e4a49cdd4d6b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/autoconf-archive/autoconf-archive.hash | 2 +- package/autoconf-archive/autoconf-archive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/autoconf-archive/autoconf-archive.hash b/package/autoconf-archive/autoconf-archive.hash index 79ee5ff68a..ff7710dc2b 100644 --- a/package/autoconf-archive/autoconf-archive.hash +++ b/package/autoconf-archive/autoconf-archive.hash @@ -1,4 +1,4 @@ # Computed locally -sha256 e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd autoconf-archive-2021.02.19.tar.xz +sha256 e07454f00d8cae7907bed42d0747798927809947684d94c37207a4d63a32f423 autoconf-archive-2022.09.03.tar.xz sha256 e6037104443f9a7829b2aa7c5370d0789a7bda3ca65a0b904cdc0c2e285d9195 COPYING sha256 23ed0b84fa023bfa33433b498192cd08a3bfb1f4864a8ed791a84f3eb48b2dd2 COPYING.EXCEPTION diff --git a/package/autoconf-archive/autoconf-archive.mk b/package/autoconf-archive/autoconf-archive.mk index bd4a09d96d..0ffdf61ddf 100644 --- a/package/autoconf-archive/autoconf-archive.mk +++ b/package/autoconf-archive/autoconf-archive.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOCONF_ARCHIVE_VERSION = 2021.02.19 +AUTOCONF_ARCHIVE_VERSION = 2022.09.03 AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive AUTOCONF_ARCHIVE_LICENSE = GPL-3.0+ with exception From yann.morin.1998 at free.fr Mon Feb 20 20:55:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:27 -0000 Subject: [Buildroot] [git commit branch/next] package/skeleton-systemd: systemd-ify mounting /var tmpfs with ro rootfs Message-ID: <20230220205214.0340F86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8cbfbe487ac6fb00c037475ed8aaca3d89899769 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next To mount our /var tmpfs when the rootfs is mounted read-only (really, not remounted read-write), we use an entry in fstab. However, /etc could also be a tmpfs (for full state-less systems, or easy factory-reset, see [0]). It also prevents easily ordering other systemd units until after /var is mounted (not impossible, but less easy). So, we register /var as a systemd mount unit, so that we can also have the /var factory populated and functional even when /etc is empty. The var.mount unit is heavily modelled after systemd's own tmp.mount one, so we carry the same license for that file (in case that may apply). This has two side effects: - as hinted previously, it simplifies writing other systemd units to order them after /var is mounted - user can easily replace it with their own, which mounts an actual filesystem [0] http://0pointer.de/blog/projects/stateless.html Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Romain Naour Cc: Je??re??my Rosen [yann.morin.1998 at free.fr: - split original patch in two - this one only handles converting /var mounting into a systemd unit - adapt commit log accordingly ] Signed-off-by: Yann E. MORIN Reviewed-by: Norbert Lange [yann.morin.1998 at free.fr (as suggested by Norbert): - fix Before= dependencies - drop [Install] section ] Signed-off-by: Yann E. MORIN --- package/skeleton-init-systemd/skeleton-init-systemd.mk | 3 ++- package/skeleton-init-systemd/var.mount | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index ec908b4fac..ff8bc528c0 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -30,7 +30,6 @@ else # back there by the tmpfiles.d mechanism. define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab - echo "tmpfs /var tmpfs mode=1777 0 0" >>$(TARGET_DIR)/etc/fstab endef define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR @@ -52,6 +51,8 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR || exit 1; \ fi; \ done >$(TARGET_DIR)/usr/lib/tmpfiles.d/00-buildroot-var.conf + $(INSTALL) -D -m 0644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/var.mount \ + $(TARGET_DIR)/usr/lib/systemd/system/var.mount endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR diff --git a/package/skeleton-init-systemd/var.mount b/package/skeleton-init-systemd/var.mount new file mode 100644 index 0000000000..e97accef93 --- /dev/null +++ b/package/skeleton-init-systemd/var.mount @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# Modelled after systemd's tmp.mount + +[Unit] +Description=Buildroot /var tmpfs +DefaultDependencies=no +Conflicts=umount.target +Before=local-fs.target umount.target +After=swap.target + +[Mount] +What=tmpfs +Where=/var +Type=tmpfs +Options=mode=1777,strictatime,nosuid,nodev,size=50%%,nr_inodes=1m From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:28 -0000 Subject: [Buildroot] [git commit branch/next] package/freeradius-server: disable with libressl Message-ID: <20230220205205.8D029828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=953e2889734d1ccac609f997e0f3ebdeee20c41b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Building with libressl results in the following build failure since the addition of the package in commit 736c4c1655d93652a9a7e79235bbe726b3d46176: src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c: In function '_session_secret': src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c:228:47: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} 228 | eap_fast_session_ticket(tls_session, s->s3->client_random, s->s3->server_random, secret, secret_len); | ^~ Disable building with libressl following upstream feedback: https://github.com/FreeRADIUS/freeradius-server/pull/4689 Fixes: - http://autobuild.buildroot.org/results/c8df444f4c39f83e254dbb642a5852a1c956f7bb Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/freeradius-server/freeradius-server.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index ebd459341d..af3320eb44 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -178,7 +178,7 @@ else FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_postgresql endif -ifeq ($(BR2_PACKAGE_HAS_OPENSSL),y) +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) FREERADIUS_SERVER_DEPENDENCIES += openssl FREERADIUS_SERVER_CONF_OPTS += \ --with-openssl \ From peter at korsgaard.com Mon Feb 20 20:55:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:28 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: 5.{4, 10, 15}.x / 6.{0, 1}.x series Message-ID: <20230220205214.2A69C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0245d30e569cc88875f7ed5b162029064128e89e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls 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 1bca082cbf..b5c65eded4 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 c7bbb6be99..8d85dc4c6f 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,10 +1,10 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb linux-6.1.tar.xz -sha256 08d3118d6b755769f166de6babed54964393a7c0928029bef11bf55559a72da4 linux-6.0.13.tar.xz +sha256 a3e61377cf4435a9e2966b409a37a1056f6aaa59e561add9125a88e3c0971dfb linux-6.1.1.tar.xz +sha256 d484eb3d4f88be14b42507a85ad4b0932e92e7a742acbce74e8be007124a6820 linux-6.0.15.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3 linux-5.15.83.tar.xz -sha256 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7 linux-5.10.159.tar.xz -sha256 5eefc5037415f31c942d3cfa430b96c2a273246cf7e51db1e51b1d89887f0593 linux-5.4.227.tar.xz +sha256 2c0bae29fac98e0a9408914a4551b2971365ac0000351cb255d6bd9aa0849808 linux-5.15.85.tar.xz +sha256 7aaaf6d0bcd8a2cfa14ad75f02ca62bb2de08aad3bee3eff198de49ea5254079 linux-5.10.161.tar.xz +sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 1f6de11306cc9f82fe1d4dd03565cdf43906fa6f77302913d942fd63b77b500c linux-4.9.336.tar.xz sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index cd36c7c763..60bbe5b768 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -399,11 +399,11 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.9.336" if BR2_KERNEL_HEADERS_4_9 default "4.14.302" if BR2_KERNEL_HEADERS_4_14 default "4.19.269" if BR2_KERNEL_HEADERS_4_19 - default "5.4.227" if BR2_KERNEL_HEADERS_5_4 - default "5.10.159" if BR2_KERNEL_HEADERS_5_10 - default "5.15.83" if BR2_KERNEL_HEADERS_5_15 - default "6.0.13" if BR2_KERNEL_HEADERS_6_0 - default "6.1" if BR2_KERNEL_HEADERS_6_1 + default "5.4.228" if BR2_KERNEL_HEADERS_5_4 + default "5.10.161" if BR2_KERNEL_HEADERS_5_10 + default "5.15.85" if BR2_KERNEL_HEADERS_5_15 + default "6.0.15" if BR2_KERNEL_HEADERS_6_0 + default "6.1.1" if BR2_KERNEL_HEADERS_6_1 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 thomas.petazzoni at bootlin.com Mon Feb 20 20:55:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:29 -0000 Subject: [Buildroot] [git commit branch/next] package/ncdu: bump to version 1.18 Message-ID: <20230220205205.6F5898648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94170d3ecbbf751adfc55c79d6e5619b0a1ce018 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For change log since 1.17, see: - https://dev.yorhel.nl/ncdu/changes This commit also adds md5 and sha1 hashes published on the web site. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/ncdu/ncdu.hash | 4 +++- package/ncdu/ncdu.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/ncdu/ncdu.hash b/package/ncdu/ncdu.hash index c47b4f9bac..1e31eaea8e 100644 --- a/package/ncdu/ncdu.hash +++ b/package/ncdu/ncdu.hash @@ -1,5 +1,7 @@ # From https://dev.yorhel.nl/ncdu -sha256 810745a8ed1ab3788c87d3aea4cc1a14edf6ee226f764bcc383e024ba56adbf1 ncdu-1.17.tar.gz +md5 4186b5be477cc3a0944619ade81f123b ncdu-1.18.tar.gz +sha1 d47ce3cdf317adadc1426817d07899c90b767aba ncdu-1.18.tar.gz +sha256 3c37a1a96580c9c5d2cc352dc3c5eef0d909158c05f1cc29db4712544c8b9f95 ncdu-1.18.tar.gz # computed locally sha256 4590cb935ff8a50cee76ce12c2cb0411c0b06e84c267b478579785dcf328660d COPYING diff --git a/package/ncdu/ncdu.mk b/package/ncdu/ncdu.mk index acfd496ec8..240ef9d8ea 100644 --- a/package/ncdu/ncdu.mk +++ b/package/ncdu/ncdu.mk @@ -4,7 +4,7 @@ # ################################################################################ -NCDU_VERSION = 1.17 +NCDU_VERSION = 1.18 NCDU_SITE = http://dev.yorhel.nl/download NCDU_DEPENDENCIES = ncurses From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:30 -0000 Subject: [Buildroot] [git commit branch/next] package/asterisk: security bump to version 16.29.1 Message-ID: <20230220205205.B83B0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c34e0b1cd5f7e10ce4fc19880e15ba608006ee76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: - CVE-2022-37325: A zero length Called or Calling Party Number can cause a buffer under-run and Asterisk crash. https://downloads.asterisk.org/pub/security/AST-2022-007.html - CVE-2022-42705: Use after free in res_pjsip_pubsub.c may allow a remote authenticated attacker to crash Asterisk (denial of service) by performing activity on a subscription via a reliable transport at the same time Asterisk is also performing activty on that subscription. https://downloads.asterisk.org/pub/security/AST-2022-008.html - CVE-2022-42706: AMI Users with ???config??? permissions may read files outside of Asterisk directory via GetConfig AMI Action even if ???live_dangerously" is set to "no" https://downloads.asterisk.org/pub/security/AST-2022-009.html Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 9792d82ac5..98ee3bdc71 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 6e9c2f350db018df854b1301687ced8993facb2787698336e55cd19e0ae3ebfe asterisk-16.28.0.tar.gz +sha256 9b93006a87be9c29492299118200e4f66c8369851c66a50fdef5b15dfc4eb2c2 asterisk-16.29.1.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index e0f28ae7ee..22ac0334fd 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.28.0 +ASTERISK_VERSION = 16.29.1 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) From peter at korsgaard.com Mon Feb 20 20:55:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:30 -0000 Subject: [Buildroot] [git commit branch/next] package/nasm: bump to version 2.16.01 Message-ID: <20230220205214.68C4286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=728518fa647f9fdac8bdc6935fe49cd8a5d99ce7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://nasm.us/doc/nasmdocc.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/nasm/nasm.hash | 2 +- package/nasm/nasm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nasm/nasm.hash b/package/nasm/nasm.hash index 86c67d6ba5..e9771c1d7f 100644 --- a/package/nasm/nasm.hash +++ b/package/nasm/nasm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f nasm-2.15.05.tar.xz +sha256 c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558 nasm-2.16.01.tar.xz sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 LICENSE diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk index ecb0889363..043a84cf07 100644 --- a/package/nasm/nasm.mk +++ b/package/nasm/nasm.mk @@ -4,7 +4,7 @@ # ################################################################################ -NASM_VERSION = 2.15.05 +NASM_VERSION = 2.16.01 NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz NASM_SITE = https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) NASM_LICENSE = BSD-2-Clause From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:30 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xserver_xorg-server: add upstream security fixes for CVE-2022-355{0, 1} Message-ID: <20230220205205.C63928648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66f3cc0b96baff46d3a136f9d8bf2a3b44037bdc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: - CVE-2022-3550: A vulnerability classified as critical was found in X.org Server. Affected by this vulnerability is the function _GetCountedString of the file xkb/xkb.c. The manipulation leads to buffer overflow. It is recommended to apply a patch to fix this issue. The associated identifier of this vulnerability is VDB-211051. - CVE-2022-3551: A vulnerability, which was classified as problematic, has been found in X.org Server. Affected by this issue is the function ProcXkbGetKbdByName of the file xkb/xkb.c. The manipulation leads to memory leak. It is recommended to apply a patch to fix this issue. The identifier of this vulnerability is VDB-211052. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...etCountedString-against-request-length-at.patch | 35 +++++++++++++ ...some-possible-memleaks-in-XkbGetKbdByName.patch | 60 ++++++++++++++++++++++ .../xserver_xorg-server/xserver_xorg-server.mk | 7 +++ 3 files changed, 102 insertions(+) diff --git a/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch b/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch new file mode 100644 index 0000000000..8c1869504c --- /dev/null +++ b/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch @@ -0,0 +1,35 @@ +From 11beef0b7f1ed290348e45618e5fa0d2bffcb72e Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 5 Jul 2022 12:06:20 +1000 +Subject: [PATCH] xkb: proof GetCountedString against request length attacks + +GetCountedString did a check for the whole string to be within the +request buffer but not for the initial 2 bytes that contain the length +field. A swapped client could send a malformed request to trigger a +swaps() on those bytes, writing into random memory. + +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + xkb/xkb.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index f42f59ef3..1841cff26 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -5137,6 +5137,11 @@ _GetCountedString(char **wire_inout, ClientPtr client, char **str) + CARD16 len; + + wire = *wire_inout; ++ ++ if (client->req_len < ++ bytes_to_int32(wire + 2 - (char *) client->requestBuffer)) ++ return BadValue; ++ + len = *(CARD16 *) wire; + if (client->swapped) { + swaps(&len); +-- +2.30.2 + diff --git a/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch b/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch new file mode 100644 index 0000000000..39afec0988 --- /dev/null +++ b/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch @@ -0,0 +1,60 @@ +From 18f91b950e22c2a342a4fbc55e9ddf7534a707d2 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Wed, 13 Jul 2022 11:23:09 +1000 +Subject: [PATCH] xkb: fix some possible memleaks in XkbGetKbdByName + +GetComponentByName returns an allocated string, so let's free that if we +fail somewhere. + +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + xkb/xkb.c | 26 ++++++++++++++++++++------ + 1 file changed, 20 insertions(+), 6 deletions(-) + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index 4692895db..b79a269e3 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -5935,18 +5935,32 @@ ProcXkbGetKbdByName(ClientPtr client) + xkb = dev->key->xkbInfo->desc; + status = Success; + str = (unsigned char *) &stuff[1]; +- if (GetComponentSpec(&str, TRUE, &status)) /* keymap, unsupported */ +- return BadMatch; ++ { ++ char *keymap = GetComponentSpec(&str, TRUE, &status); /* keymap, unsupported */ ++ if (keymap) { ++ free(keymap); ++ return BadMatch; ++ } ++ } + names.keycodes = GetComponentSpec(&str, TRUE, &status); + names.types = GetComponentSpec(&str, TRUE, &status); + names.compat = GetComponentSpec(&str, TRUE, &status); + names.symbols = GetComponentSpec(&str, TRUE, &status); + names.geometry = GetComponentSpec(&str, TRUE, &status); +- if (status != Success) ++ if (status == Success) { ++ len = str - ((unsigned char *) stuff); ++ if ((XkbPaddedSize(len) / 4) != stuff->length) ++ status = BadLength; ++ } ++ ++ if (status != Success) { ++ free(names.keycodes); ++ free(names.types); ++ free(names.compat); ++ free(names.symbols); ++ free(names.geometry); + return status; +- len = str - ((unsigned char *) stuff); +- if ((XkbPaddedSize(len) / 4) != stuff->length) +- return BadLength; ++ } + + CHK_MASK_LEGAL(0x01, stuff->want, XkbGBN_AllComponentsMask); + CHK_MASK_LEGAL(0x02, stuff->need, XkbGBN_AllComponentsMask); +-- +2.30.2 + diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 18ddd1cb07..8dba9f1ed0 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -11,6 +11,13 @@ XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES + +# 0002-xkb-proof-GetCountedString-against-request-length-at.patch +XSERVER_XORG_SERVER_IGNORE_CVES += CVE-2022-3550 + +# 0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch +XSERVER_XORG_SERVER_IGNORE_CVES += CVE-2022-3551 + XSERVER_XORG_SERVER_DEPENDENCIES = \ xutil_util-macros \ xlib_libX11 \ From peter at korsgaard.com Mon Feb 20 20:55:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:31 -0000 Subject: [Buildroot] [git commit branch/next] package/libraw: bump to version 0.21.0 Message-ID: <20230220205214.4EE4F86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d668cd0b2967346668423b564e4e149f14787def branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patch (already in version) - Drop autoreconf - Update hash of README.md (year updated with https://github.com/LibRaw/LibRaw/commit/4c954948ba2de262b9cb23a1843fb8651aa3dcc1 and licensing terms slightly reworded with https://github.com/LibRaw/LibRaw/commit/2a9a4de21ea7f5d15314da8ee5f27feebf239655) https://www.libraw.org/news/libraw-0-21-release Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-Add-Libs.private-to-libraw.pc.patch | 67 ---------------------- package/libraw/libraw.hash | 4 +- package/libraw/libraw.mk | 4 +- 3 files changed, 3 insertions(+), 72 deletions(-) diff --git a/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch b/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch deleted file mode 100644 index a90af23178..0000000000 --- a/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ad911cbc3c16397cf9d326c30571a4d1edaaa03f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 2 Jun 2021 07:45:40 +0200 -Subject: [PATCH] Add Libs.private to libraw.pc - -Add Libs.private to libraw.pc to avoid the following static build -failure when enabling libraw with jasper support in imagemagick: - -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libjasper.a(jpg_enc.c.o): in function `jpg_encode': -jpg_enc.c:(.text+0x1f4): undefined reference to `jpeg_stdio_dest' - --ljpeg must be added after -ljasper because jasper depends on jpeg - -Fixes: - - http://autobuild.buildroot.org/results/88e43a1ea2059a684e50b0f5f2af407e8c6df2e1 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/LibRaw/LibRaw/pull/406] ---- - configure.ac | 2 ++ - libraw.pc.in | 1 + - libraw_r.pc.in | 1 + - 3 files changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 4ab2f313..7bf5fdfd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,6 +57,7 @@ if test x$jpeg = xtrue; then - AC_CHECK_HEADERS([jpeglib.h], [ - CPPFLAGS="$CPPFLAGS -DUSE_JPEG -DUSE_JPEG8" - LIBS="$LIBS -ljpeg" -+ AC_SUBST([PACKAGE_LIBS_PRIVATE],"-ljpeg $PACKAGE_LIBS_PRIVATE") - ], AC_MSG_WARN([no jpeg headers found])) - ], - AC_MSG_WARN([libjpeg not found]) -@@ -78,6 +79,7 @@ if test x$jasper = xtrue; then - AC_CHECK_HEADERS([jasper/jasper.h], [ - CPPFLAGS="$CPPFLAGS -DUSE_JASPER" - LIBS="$LIBS -ljasper" -+ AC_SUBST([PACKAGE_LIBS_PRIVATE],"-ljasper $PACKAGE_LIBS_PRIVATE") - ], AC_MSG_WARN([no jasper headers found])) - ], - AC_MSG_WARN([libjasper not found]) -diff --git a/libraw.pc.in b/libraw.pc.in -index 1bab18b8..c95fbc48 100644 ---- a/libraw.pc.in -+++ b/libraw.pc.in -@@ -8,4 +8,5 @@ Description: Raw image decoder library (non-thread-safe) - Requires: @PACKAGE_REQUIRES@ - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lraw -lstdc++ at PC_OPENMP@ -+Libs.private: @PACKAGE_LIBS_PRIVATE@ - Cflags: -I${includedir}/libraw -I${includedir} -diff --git a/libraw_r.pc.in b/libraw_r.pc.in -index e8427271..92bbbffa 100644 ---- a/libraw_r.pc.in -+++ b/libraw_r.pc.in -@@ -8,4 +8,5 @@ Description: Raw image decoder library (thread-safe) - Requires: @PACKAGE_REQUIRES@ - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lraw_r -lstdc++ at PC_OPENMP@ -+Libs.private: @PACKAGE_LIBS_PRIVATE@ - Cflags: -I${includedir}/libraw -I${includedir} --- -2.30.2 - diff --git a/package/libraw/libraw.hash b/package/libraw/libraw.hash index f2a01c277b..3076810cca 100644 --- a/package/libraw/libraw.hash +++ b/package/libraw/libraw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6 LibRaw-0.20.2.tar.gz +sha256 8747b34e8534cc2dd7ef8c92c436414b3578904fd4bf9b87ea60f17aa99fb0bd LibRaw-0.21.0.tar.gz sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL -sha256 313415f7f48f6cd3cc78856626aab4bbe97dbb1e9a11db9c25396ca8d0e76cd9 README.md +sha256 7d6650cef6cf892abe95e55a6bda1e1c42f221fd411b807deb2fc0b805b868d4 README.md diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index fc02c7915f..176acf6a44 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRAW_VERSION = 0.20.2 +LIBRAW_VERSION = 0.21.0 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data LIBRAW_INSTALL_STAGING = YES @@ -15,8 +15,6 @@ LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0 LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL README.md LIBRAW_CPE_ID_VENDOR = libraw LIBRAW_DEPENDENCIES = host-pkgconf -# https://github.com/LibRaw/LibRaw/issues/353 -LIBRAW_AUTORECONF = YES LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS) LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)" From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:31 -0000 Subject: [Buildroot] [git commit branch/next] package/lttng-tools: bump to version 2.13.8 Message-ID: <20230220205205.E0877828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d94e7a6214c3bbf9add65e7ab29b530d2d57b70 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This bump will fix the following build failure without NPTL thanks to https://github.com/lttng/lttng-tools/commit/27f2b8400c9db484cd195c4240c379e845b1413d which is raised since bump to version 2.13.2 in commit 8e5f2d0f8e8c04e98f8761f3cba683c56bbefc8c and https://github.com/lttng/lttng-tools/commit/014d7d3b5e9d69989bf776cffb6c21ff7e1d36ff: In file included from thread.c:10: ../../src/common/compat/pthread.h: In function 'lttng_pthread_setname_np': ../../src/common/compat/pthread.h:63:27: error: 'LTTNG_UST_ABI_PROCNAME_LEN' undeclared (first use in this function) 63 | if (strnlen(name, LTTNG_UST_ABI_PROCNAME_LEN) >= LTTNG_UST_ABI_PROCNAME_LEN) { | ^~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/lttng/lttng-tools/blob/v2.13.8/ChangeLog Fixes: - http://autobuild.buildroot.org/results/bbc8d6621822bb5da7513331e69799ca25a03f66 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lttng-tools/lttng-tools.hash | 4 ++-- package/lttng-tools/lttng-tools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lttng-tools/lttng-tools.hash b/package/lttng-tools/lttng-tools.hash index 5b5f55da30..b48904d0b9 100644 --- a/package/lttng-tools/lttng-tools.hash +++ b/package/lttng-tools/lttng-tools.hash @@ -1,5 +1,5 @@ -# From https://lttng.org/files/lttng-tools/lttng-tools-2.13.2.tar.bz2.sha256 -sha256 ced2ba00020da77fd17ac92b5a53825502409a07e3aeca28f9515d4a844fd7bd lttng-tools-2.13.2.tar.bz2 +# From https://lttng.org/files/lttng-tools/lttng-tools-2.13.8.tar.bz2.sha256 +sha256 b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1 lttng-tools-2.13.8.tar.bz2 # Locally computed sha256 068e55c7dbe597400199aee75ac5e71bdb2ca88c4c9a4cfa8e1fbc61f933eda5 LICENSE diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index efa22a52e3..add1f12a8c 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.13.2 +LTTNG_TOOLS_VERSION = 2.13.8 LTTNG_TOOLS_SITE = https://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:55:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:32 -0000 Subject: [Buildroot] [git commit branch/next] package/skeleton-systemd: move var factory comment closer to code Message-ID: <20230220205214.7559186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e02fdfe26b2ad36166379c444e017f832946f30d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 8cbfbe487ac6 (package/skeleton-systemd: systemd-ify mounting /var tmpfs with ro rootfs) removed the fstab handling of /var, and left the macro deal solely about keeping / read-only. However, the code about how the var factory is handled was left above the macro, which is now misleading and confusing. Move the comment closer to the actual rootfs-pre-cmd hook which actually deals with handling the var factory. Signed-off-by: Yann E. MORIN --- package/skeleton-init-systemd/skeleton-init-systemd.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 30783dfd26..fb15552f99 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -23,15 +23,15 @@ endef else +define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW + echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab +endef + # On a R/O rootfs, /var is a tmpfs filesystem. So, at build time, we # redirect /var to the "factory settings" location. Just before the # filesystem gets created, the /var symlink will be replaced with # a real (but empty) directory, and the "factory files" will be copied # back there by the tmpfiles.d mechanism. -define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW - echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab -endef - ifeq ($(BR2_INIT_SYSTEMD_VAR_FACTORY),y) define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR rm -rf $(TARGET_DIR)/usr/share/factory/var From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:32 -0000 Subject: [Buildroot] [git commit branch/next] package/neon: bump to version 0.32.4 Message-ID: <20230220205205.9B9E38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f39ac8336e9cd933de50970a657e32a8d9601c67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/notroj/neon/blob/0.32.4/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/neon/neon.hash | 2 +- package/neon/neon.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/neon/neon.hash b/package/neon/neon.hash index 5a5a77a58b..9bd6195e39 100644 --- a/package/neon/neon.hash +++ b/package/neon/neon.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 986566468c6295fc5d0fb141a5981e31c9f82ee38e938374abed8471ef2fb286 neon-0.32.2.tar.gz +sha256 b1e2120e4ae07df952c4a858731619733115c5f438965de4fab41d6bf7e7a508 neon-0.32.4.tar.gz # Hash for license files sha256 ce2421ee38d6c0e02c85ac076478a0f92da6ef92b92b7a174877cabf01b2e531 README.md sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB diff --git a/package/neon/neon.mk b/package/neon/neon.mk index eae6bfbad6..1ce8f1ff16 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEON_VERSION = 0.32.2 +NEON_VERSION = 0.32.4 NEON_SITE = https://notroj.github.io/neon NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md From peter at korsgaard.com Mon Feb 20 20:55:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:33 -0000 Subject: [Buildroot] [git commit branch/next] package/lualogging: bump to version 1.8.0 Message-ID: <20230220205214.8EB3886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1381a4d2884cd7abdda45253b871cddd995a3e4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/lualogging/lualogging.hash | 2 +- package/lualogging/lualogging.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lualogging/lualogging.hash b/package/lualogging/lualogging.hash index a9eadab4d1..5ed012ea5c 100644 --- a/package/lualogging/lualogging.hash +++ b/package/lualogging/lualogging.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 d4a8791e9b24840c4a4c0366399f55b6deb060fc3947f3a9aae9ced0334160c1 lualogging-1.7.0-1.src.rock +sha256 285edf8abc9844cb37da94888ca01cb26a2ba08411ea13a3ee0f4d029ca512dd lualogging-1.8.0-1.src.rock sha256 d900082cb26f8cf4a491ca51c00241f2c2e9cd9ae3531c62234017a360706adb lualogging/COPYRIGHT diff --git a/package/lualogging/lualogging.mk b/package/lualogging/lualogging.mk index 78197f6be6..96c09c5a49 100644 --- a/package/lualogging/lualogging.mk +++ b/package/lualogging/lualogging.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUALOGGING_VERSION = 1.7.0-1 +LUALOGGING_VERSION = 1.8.0-1 LUALOGGING_SUBDIR = lualogging LUALOGGING_LICENSE = MIT LUALOGGING_LICENSE_FILES = $(LUALOGGING_SUBDIR)/COPYRIGHT From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:33 -0000 Subject: [Buildroot] [git commit branch/next] package/dehydrated: bump to version 0.7.1 Message-ID: <20230220205205.ED5498648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef13132fd390cc25643e78afc692640c86d7aaf2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update hash of LICENSE (update in year: https://github.com/dehydrated-io/dehydrated/commit/dd0bbd2405ecea4820ad2442120d8dc4a37137b6) https://github.com/dehydrated-io/dehydrated/releases/tag/v0.7.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dehydrated/dehydrated.hash | 6 +++--- package/dehydrated/dehydrated.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dehydrated/dehydrated.hash b/package/dehydrated/dehydrated.hash index 0452645256..711e5a6cea 100644 --- a/package/dehydrated/dehydrated.hash +++ b/package/dehydrated/dehydrated.hash @@ -1,6 +1,6 @@ # Locally computed after verifying -# https://github.com/dehydrated-io/dehydrated/releases/download/v0.7.0/dehydrated-0.7.0.tar.gz.asc +# https://github.com/dehydrated-io/dehydrated/releases/download/v0.7.1/dehydrated-0.7.1.tar.gz.asc # with key 3C2F2605E078A1E18F4793909C4DBE6CF438F333 from https://keybase.io/lukas2511 -sha256 1c5f12c2e57e64b1762803f82f0f7e767a72e65a6ce68e4d1ec197e61b9dc4f9 dehydrated-0.7.0.tar.gz +sha256 4d28a0598230b276b316070ce16be7d9ab984f3bdef482acf0bc24fcdcc0d0b0 dehydrated-0.7.1.tar.gz # License, locally computed -sha256 b4583b7dd07e3e2a08906de38e7e329d41f921ed9dcb6310b3886e013a6b8723 LICENSE +sha256 f25ab9c5f13abf15ab097180423ef6b82a89c552e92d49ae627762ee9c04a3a8 LICENSE diff --git a/package/dehydrated/dehydrated.mk b/package/dehydrated/dehydrated.mk index 28fb5a4912..f8909d8abe 100644 --- a/package/dehydrated/dehydrated.mk +++ b/package/dehydrated/dehydrated.mk @@ -4,7 +4,7 @@ # ################################################################################ -DEHYDRATED_VERSION = 0.7.0 +DEHYDRATED_VERSION = 0.7.1 DEHYDRATED_SITE = https://github.com/dehydrated-io/dehydrated/releases/download/v$(DEHYDRATED_VERSION) DEHYDRATED_LICENSE = MIT From peter at korsgaard.com Mon Feb 20 20:55:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:34 -0000 Subject: [Buildroot] [git commit branch/next] package/dovecot-pigeonhole: bump version to 0.5.20 Message-ID: <20230220205214.B5FA286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b30eb2f763ac98b4c44d38097bc6da8d9a9a550b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://dovecot.org/pipermail/dovecot-news/2022-December/000480.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index 635e221481..5c7ba322b2 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 10b923efcc6f3c4d92ecdbb780e12a5c33e6d0fdbe3aba5fcd3ecde4179c730c dovecot-2.3-pigeonhole-0.5.19.tar.gz +sha256 ae32bd4870ea2c1328ae09ba206e9ec12128046d6afca52fbbc9ef7f75617c98 dovecot-2.3-pigeonhole-0.5.20.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index c25cd60b21..0b64cb0d6f 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.19 +DOVECOT_PIGEONHOLE_VERSION = 0.5.20 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:34 -0000 Subject: [Buildroot] [git commit branch/next] package/ipset: bump to version 7.16 Message-ID: <20230220205206.22DAF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84463af7c42bc0d81ea0e03de911f5b1b4ef57c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://ipset.netfilter.org/changelog.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipset/ipset.hash | 4 ++-- package/ipset/ipset.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ipset/ipset.hash b/package/ipset/ipset.hash index 9c251be27e..fb9b8c40d2 100644 --- a/package/ipset/ipset.hash +++ b/package/ipset/ipset.hash @@ -1,4 +1,4 @@ -# From https://ipset.netfilter.org/ipset-7.15.tar.bz2.sha512sum.txt -sha512 0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a ipset-7.15.tar.bz2 +# From https://ipset.netfilter.org/ipset-7.16.tar.bz2.sha512sum.txt +sha512 e69ddee956f0922c8e08e7e5d358d6b5b24178a9f08151b20957cc3465baaba9ecd6aa938ae157f2cd286ccd7f0b7a279cfd89cec2393a00b43e4d945c275307 ipset-7.16.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk index 4eda65e81b..9832d8fd30 100644 --- a/package/ipset/ipset.mk +++ b/package/ipset/ipset.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPSET_VERSION = 7.15 +IPSET_VERSION = 7.16 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf From peter at korsgaard.com Mon Feb 20 20:55:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:35 -0000 Subject: [Buildroot] [git commit branch/next] package/libdeflate: fix static build Message-ID: <20230220205214.DAA1586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08049e9f522c0fee6ff05b7358b1f1689f4e53c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static build failure raised since bump to version 1.15 in commit c31087182fa545784d9a0a01f0b32715d78c3955: [ 79%] Linking C shared library libdeflate.so /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/12.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/12.2.0/crtbeginT.o: relocation R_ARC_32_ME against `__TMC_END__' can not be used when making a shared object; recompile with -fPIC Fixes: - http://autobuild.buildroot.org/results/25489e5c6f0da642136e099ab35b091624f53a2b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libdeflate/libdeflate.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk index 2305af4dc9..67e97c6e5e 100644 --- a/package/libdeflate/libdeflate.mk +++ b/package/libdeflate/libdeflate.mk @@ -12,4 +12,18 @@ LIBDEFLATE_INSTALL_STAGING = YES LIBDEFLATE_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -D_DEFAULT_SOURCE" +ifeq ($(BR2_SHARED_LIBS),y) +LIBDEFLATE_CONF_OPTS += \ + -DLIBDEFLATE_BUILD_SHARED_LIB=ON \ + -DLIBDEFLATE_BUILD_STATIC_LIB=OFF +else ifeq ($(BR2_STATIC_LIBS),y) +LIBDEFLATE_CONF_OPTS += \ + -DLIBDEFLATE_BUILD_SHARED_LIB=OFF \ + -DLIBDEFLATE_BUILD_STATIC_LIB=ON +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +LIBDEFLATE_CONF_OPTS += \ + -DLIBDEFLATE_BUILD_SHARED_LIB=ON \ + -DLIBDEFLATE_BUILD_STATIC_LIB=ON +endif + $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:35 -0000 Subject: [Buildroot] [git commit branch/next] package/psmisc: bump to version 23.5 Message-ID: <20230220205206.304C78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3324161873274b90b0c89e2a5ebb74e915bd6e86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://gitlab.com/psmisc/psmisc/-/blob/v23.5/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/psmisc/psmisc.hash | 6 +++--- package/psmisc/psmisc.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/psmisc/psmisc.hash b/package/psmisc/psmisc.hash index 47e44f6921..fe146f90c9 100644 --- a/package/psmisc/psmisc.hash +++ b/package/psmisc/psmisc.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/psmisc/files/psmisc/ -md5 8114cd4489b95308efe2509c3a406bbf psmisc-23.4.tar.xz -sha1 a4c34111e570c43967efb2bbd8a4f31d94d22e0f psmisc-23.4.tar.xz +md5 014f0b5d5ab32478a2c57812ad01e1fb psmisc-23.5.tar.xz +sha1 a16073f459a19288c1ea2b413a84e1b996cab595 psmisc-23.5.tar.xz # Locally computed: -sha256 7f0cceeace2050c525f3ebb35f3ba01d618b8d690620580bdb8cd8269a0c1679 psmisc-23.4.tar.xz +sha256 dc37ecc2f7e4a90a94956accc6e1c77adb71316b7c9cbd39b26738db0c3ae58b psmisc-23.5.tar.xz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index 8b92be11e8..3229184459 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -4,7 +4,7 @@ # ################################################################################ -PSMISC_VERSION = 23.4 +PSMISC_VERSION = 23.5 PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc PSMISC_SOURCE = psmisc-$(PSMISC_VERSION).tar.xz PSMISC_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:36 -0000 Subject: [Buildroot] [git commit branch/next] package/containerd: security bump to version 1.6.12 Message-ID: <20230220205206.3F223828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4634a22cf70ec957ceabbb0dcd9611c824bc7a60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next CVE-2022-23471: https://github.com/advisories/GHSA-2qjp-425j-52j9 and other bugfixes, see: https://github.com/containerd/containerd/releases/tag/v1.6.12 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 285519441a..04a29949d7 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 f5f938513c28377f64f85e84f2750d39f26b01262f3a062b7e8ce35b560ca407 containerd-1.6.8.tar.gz +sha256 b86e5c42f58b8348422c972513ff49783c0d505ed84e498d0d0245c5992e4320 containerd-1.6.12.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 89bbbf5c03..192175800c 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.8 +CONTAINERD_VERSION = 1.6.12 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:55:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:36 -0000 Subject: [Buildroot] [git commit branch/next] package/bird: bump to version 2.0.11 Message-ID: <20230220205215.00CF286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8024bae870b7ebd9707614343c5dfdc849ea8fdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://bird.network.cz/pipermail/bird-users/2022-December/016431.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/bird/bird.hash | 2 +- package/bird/bird.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bird/bird.hash b/package/bird/bird.hash index 6ccacd8d58..3e00a1993d 100644 --- a/package/bird/bird.hash +++ b/package/bird/bird.hash @@ -1,2 +1,2 @@ -sha256 7ed341ddd8dc87fa9736586b3515447a8436fec442d65f4022155ab9de1ffd5a bird-2.0.10.tar.gz +sha256 60a7b83b67b9d089d2a745a11fddd12461f631abc7b645b6c085adf90b3f55d6 bird-2.0.11.tar.gz sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README diff --git a/package/bird/bird.mk b/package/bird/bird.mk index e1e392168c..1295358fb9 100644 --- a/package/bird/bird.mk +++ b/package/bird/bird.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIRD_VERSION = 2.0.10 +BIRD_VERSION = 2.0.11 BIRD_SITE = https://bird.network.cz/download BIRD_LICENSE = GPL-2.0+ BIRD_LICENSE_FILES = README From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:55:31 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/libmodsecurity: needs dynamic library with libcurl, libssh2 and mbedtls In-Reply-To: <20230219172440.519540-1-fontaine.fabrice@gmail.com> References: <20230219172440.519540-1-fontaine.fabrice@gmail.com> Message-ID: <20230220215531.7b3a1783@windsurf> Hello Fabrice, On Sun, 19 Feb 2023 18:24:40 +0100 Fabrice Fontaine wrote: > Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as > mbedtls can be pulled in libcurl through libssh2 resulting in the > following build failure: > > /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init': > md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here > > Fixes: > - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a > > Signed-off-by: Fabrice Fontaine > --- > Changes v2 -> v3: > - Fix syntax > Changes v1 -> v2: > - Update nginx-modsecurity Isn't that a bit madness? If libmodsecurity has its copy of parts of mbedtls, but didn't take care of renaming the symbols, then ultimately what we should conclude is that using libmodsecurity in a statically linked configuration is not supported. So I would advocate for simplifying the whole thing and just make libmodsecurity and its reverse dependencies depends on !BR2_STATIC_LIBS and be done with it. What do you think? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:37 -0000 Subject: [Buildroot] [git commit branch/next] package/docker-engine: security bump to version 20.10.21 Message-ID: <20230220205206.5B6088648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=309bc5d2d4b0f3ca133b40e36ee949411b3d532d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Partial mitigations for CVE-2022-39253 Git vulnerability and other fixes: https://github.com/moby/moby/releases/tag/v20.10.21 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index dfd4f4e365..10e9727a08 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 228caadac1b37a5ba310eb25418cf1fdd8878336f1d8faf0a2daa87fcc577577 docker-engine-20.10.19.tar.gz +sha256 61f4c3a2d0426e1bbbda1b0e5dd33ec203776f7d99d1a61522c77c04c4ed09fe docker-engine-20.10.21.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index dc45baf055..36c66485ba 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.19 +DOCKER_ENGINE_VERSION = 20.10.21 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From peter at korsgaard.com Mon Feb 20 20:55:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:37 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl_433: drop dynamic library dependency Message-ID: <20230220205215.1BF5586494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7967755fbf25fe4d5860884bedb3e01fcd7e9855 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next rtl_433 can be built statically since its addition in commit 4634e84978a3e64e9050021d209a41cd88a1ad16 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/rtl_433/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/rtl_433/Config.in b/package/rtl_433/Config.in index 5664227c82..a6db00f477 100644 --- a/package/rtl_433/Config.in +++ b/package/rtl_433/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_RTL_433 bool "rtl_433" depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK if BR2_PACKAGE_LIBOPENSSL help @@ -11,6 +10,6 @@ config BR2_PACKAGE_RTL_433 https://github.com/merbanan/rtl_433 -comment "rtl_433 needs a toolchain w/ dynamic library, threads" +comment "rtl_433 needs a toolchain w/ threads" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:38 -0000 Subject: [Buildroot] [git commit branch/next] package/utf8proc: bump to version 2.8.0 Message-ID: <20230220205206.881FD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3046605251d1f946c610faaa5f337d0b3ee7406a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/JuliaStrings/utf8proc/blob/v2.8.0/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/utf8proc/utf8proc.hash | 2 +- package/utf8proc/utf8proc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/utf8proc/utf8proc.hash b/package/utf8proc/utf8proc.hash index acc73903c8..658ffa1f7c 100644 --- a/package/utf8proc/utf8proc.hash +++ b/package/utf8proc/utf8proc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4bb121e297293c0fd55f08f83afab6d35d48f0af4ecc07523ad8ec99aa2b12a1 utf8proc-2.7.0.tar.gz +sha256 a0a60a79fe6f6d54e7d411facbfcc867a6e198608f2cd992490e46f04b1bcecc utf8proc-2.8.0.tar.gz sha256 3b510150d34f248a221bb88e1d811238d6c6c18b51231822c42974c39bb07256 LICENSE.md diff --git a/package/utf8proc/utf8proc.mk b/package/utf8proc/utf8proc.mk index 707e553561..b08c6e7109 100644 --- a/package/utf8proc/utf8proc.mk +++ b/package/utf8proc/utf8proc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UTF8PROC_VERSION = 2.7.0 +UTF8PROC_VERSION = 2.8.0 UTF8PROC_SITE = $(call github,JuliaStrings,utf8proc,v$(UTF8PROC_VERSION)) UTF8PROC_LICENSE = MIT UTF8PROC_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Feb 20 20:55:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:38 -0000 Subject: [Buildroot] [git commit branch/next] package/qemu: fix indentation for host-qemu sub-options in menuconfig Message-ID: <20230220205215.339BA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=037226b33b42fb22234694fe1fcb0b6db624161f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 255acdc14365 (package/qemu: needs gcc >= 8) added a comment that explains that host-qemu would not be available for gcc < 4.8. However, it interspersed that comment between the main symbol and the conditional block with the sub-options. This breaks the indentation of the sub-options in menuconfig, where they appear at the same level as the main symbol, rather than indented below it. Fix that by moving the comment before the main symbol. Signed-off-by: Yann E. MORIN --- package/qemu/Config.in.host | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index f9cdb9b703..8dd0c7d11b 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -34,6 +34,11 @@ config BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS bool default y if BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS +comment "host-qemu needs a host gcc >= 8" + depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || \ + BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORT + depends on !BR2_HOST_GCC_AT_LEAST_8 + config BR2_PACKAGE_HOST_QEMU bool "host qemu" depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS @@ -50,11 +55,6 @@ config BR2_PACKAGE_HOST_QEMU http://www.qemu.org -comment "host-qemu needs a host gcc >= 8" - depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || \ - BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORT - depends on !BR2_HOST_GCC_AT_LEAST_8 - if BR2_PACKAGE_HOST_QEMU comment "Emulators selection" From yann.morin.1998 at free.fr Mon Feb 20 20:55:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:39 -0000 Subject: [Buildroot] [git commit branch/next] package/ncurses: fix legal info Message-ID: <20230220205215.5588786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b0ac1d62bb2b998cba17699216e9fed7caeb976 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit a38a30eb3a46570705642dc37235ddcc1471b434 forgot to update hash of COPYING (update in year) Fixes: - http://autobuild.buildroot.org/results/18ed032d1b7e0492ed90f09873cd260997c1deae Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ncurses/ncurses.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index 1029c1ddcb..c72a2abf46 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -62,4 +62,4 @@ sha256 32dc21b671ead8b199d66111ebd3404e8cd5f8c4ca5587cfeb5c6a4913b2d103 ncurse sha256 8fe3bcacaea784ac7971e102a8eb8ca58c4c2c4c13c1ec33f32334600b9e4f56 ncurses-6.3-20221203.patch.gz # Locally computed -sha256 4d1fde61868c73776a539366dccf5d5a4857e7fd7299efb1f02e07c2afe9ea87 COPYING +sha256 63de87399e9fc8860236082b6b0520e068e9eb1fad0ebd30202aa30bb6f690ac COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:39 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: indent with tabs Message-ID: <20230220205206.A2A7E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65e0351adc5075ac679557d7e41a02815f979e90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit eb2f2886b2364e5b6a0867f55106bf83acb064e7 ("package/swupdate: add staging install") has introduced some commands indented with spaces, which check-package doesn't like. Fix that by using tabs instead, and while we're at it, wrap the line that is a bit too long. Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 54ae03f238..1cd60d1b8f 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -230,8 +230,9 @@ define SWUPDATE_BUILD_CMDS endef define SWUPDATE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ - $(SWUPDATE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) INCLUDEDIR=/usr/include/swupdate install + $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ + $(SWUPDATE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) \ + INCLUDEDIR=/usr/include/swupdate install endef define SWUPDATE_INSTALL_TARGET_CMDS From yann.morin.1998 at free.fr Mon Feb 20 20:55:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:40 -0000 Subject: [Buildroot] [git commit branch/next] package/libdeflate: fix aarch64 build Message-ID: <20230220205215.78DB286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dc7e1fc363b217683f009f6470519b751675083 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following aarch64 build failure raised since the addition of the package in commit 4231e7b10b87de71e33bb9906eede3751bed5dfe: In file included from /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h:256, from /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/crc32.c:227: /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h: In function 'clmul_u32': /home/autobuild/autobuild/instance-22/output-1/host/lib/gcc/aarch64-buildroot-linux-gnu/10.4.0/include/arm_neon.h:26723:1: error: inlining failed in call to 'always_inline' 'vmull_p64': target specific option mismatch 26723 | vmull_p64 (poly64_t __a, poly64_t __b) | ^~~~~~~~~ In file included from /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/crc32.c:227: /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h:262:19: note: called from here 262 | uint64x2_t res = vreinterpretq_u64_p128( | ^~~~~~~~~~~~~~~~~~~~~~~ 263 | compat_vmull_p64((poly64_t)a, (poly64_t)b)); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/9aee8dafea614db77209818b913a571534466506 - http://autobuild.buildroot.org/results/951d5a1a2959a0cc65ca7e52967ec07bc1cc00f1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...rypto-target-when-required-due-to-gcc-bug.patch | 90 ++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch b/package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch new file mode 100644 index 0000000000..8823ec4b39 --- /dev/null +++ b/package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch @@ -0,0 +1,90 @@ +From f8f022e5bc574088ae80327ea5f88a8fe09b48c8 Mon Sep 17 00:00:00 2001 +From: Eric Biggers +Date: Sun, 25 Dec 2022 15:05:52 -0800 +Subject: [PATCH] lib/arm/crc32: use crypto target when required due to gcc bug + +Fixes https://github.com/ebiggers/libdeflate/issues/280 +Fixes: 6db64ab7afd2 ("lib/crc32: CRC-32 optimizations and other improvements") +[Retrieved from: +https://github.com/ebiggers/libdeflate/commit/f8f022e5bc574088ae80327ea5f88a8fe09b48c8] +Signed-off-by: Fabrice Fontaine +--- + lib/arm/cpu_features.h | 23 +++++++++++++++++++++++ + lib/arm/crc32_impl.h | 9 +++++---- + 2 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/lib/arm/cpu_features.h b/lib/arm/cpu_features.h +index 204c0cd5..4092eba8 100644 +--- a/lib/arm/cpu_features.h ++++ b/lib/arm/cpu_features.h +@@ -116,6 +116,29 @@ static inline u32 get_arm_cpu_features(void) { return 0; } + #else + # define HAVE_PMULL_INTRIN 0 + #endif ++/* ++ * Set USE_PMULL_TARGET_EVEN_IF_NATIVE if a workaround for a gcc bug that was ++ * fixed by commit 11a113d501ff ("aarch64: Simplify feature definitions") in gcc ++ * 13 is needed. A minimal program that fails to build due to this bug when ++ * compiled with -mcpu=emag, at least with gcc 10 through 12, is: ++ * ++ * static inline __attribute__((always_inline,target("+crypto"))) void f() {} ++ * void g() { f(); } ++ * ++ * The error is: ++ * ++ * error: inlining failed in call to ???always_inline??? ???f???: target specific option mismatch ++ * ++ * The workaround is to explicitly add the crypto target to the non-inline ++ * function g(), even though this should not be required due to -mcpu=emag ++ * enabling 'crypto' natively and causing __ARM_FEATURE_CRYPTO to be defined. ++ */ ++#if HAVE_PMULL_NATIVE && defined(ARCH_ARM64) && \ ++ GCC_PREREQ(6, 1) && !GCC_PREREQ(13, 1) ++# define USE_PMULL_TARGET_EVEN_IF_NATIVE 1 ++#else ++# define USE_PMULL_TARGET_EVEN_IF_NATIVE 0 ++#endif + + /* CRC32 */ + #ifdef __ARM_FEATURE_CRC32 +diff --git a/lib/arm/crc32_impl.h b/lib/arm/crc32_impl.h +index e426a63d..b9300e4b 100644 +--- a/lib/arm/crc32_impl.h ++++ b/lib/arm/crc32_impl.h +@@ -236,7 +236,7 @@ crc32_arm_crc(u32 crc, const u8 *p, size_t len) + * for implementations that use pmull for folding the data itself. + */ + #if HAVE_CRC32_INTRIN && HAVE_PMULL_INTRIN +-# if HAVE_CRC32_NATIVE && HAVE_PMULL_NATIVE ++# if HAVE_CRC32_NATIVE && HAVE_PMULL_NATIVE && !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef ARCH_ARM32 +@@ -438,7 +438,7 @@ crc32_arm_crc_pmullcombine(u32 crc, const u8 *p, size_t len) + #if HAVE_PMULL_INTRIN + # define crc32_arm_pmullx4 crc32_arm_pmullx4 + # define SUFFIX _pmullx4 +-# if HAVE_PMULL_NATIVE ++# if HAVE_PMULL_NATIVE && !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef ARCH_ARM32 +@@ -558,7 +558,7 @@ crc32_arm_pmullx4(u32 crc, const u8 *p, size_t len) + #if defined(ARCH_ARM64) && HAVE_PMULL_INTRIN && HAVE_CRC32_INTRIN + # define crc32_arm_pmullx12_crc crc32_arm_pmullx12_crc + # define SUFFIX _pmullx12_crc +-# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE ++# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE && !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef __clang__ +@@ -584,7 +584,8 @@ crc32_arm_pmullx4(u32 crc, const u8 *p, size_t len) + (HAVE_SHA3_TARGET || HAVE_SHA3_NATIVE) + # define crc32_arm_pmullx12_crc_eor3 crc32_arm_pmullx12_crc_eor3 + # define SUFFIX _pmullx12_crc_eor3 +-# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE && HAVE_SHA3_NATIVE ++# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE && HAVE_SHA3_NATIVE && \ ++ !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef __clang__ From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:40 -0000 Subject: [Buildroot] [git commit branch/next] package/batman-adv: bump to version 2022.3 Message-ID: <20230220205206.780E4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=155d3ac6e52aa3ecec83780bb72561d6cb6b9626 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bug fixes and code cleanups. https://www.open-mesh.org/news/110 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/batman-adv/batman-adv.hash | 2 +- package/batman-adv/batman-adv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/batman-adv/batman-adv.hash b/package/batman-adv/batman-adv.hash index c5add4cdea..14a92c231a 100644 --- a/package/batman-adv/batman-adv.hash +++ b/package/batman-adv/batman-adv.hash @@ -2,6 +2,6 @@ sha1 e1829e10fc37ea674a20cb9ba1d6c1483042fbfa batman-adv-2022.2.tar.gz # Hash for license files -sha256 8aca27c6f168b137a7ed7031d58169396c1a97f958c2ea95b9c30a9b92576fe0 batman-adv-2022.2.tar.gz +sha256 218ffb534fead1c9b5b0d90ec1b2fba688209cdf00e861bece1cbf469fe69953 batman-adv-2022.3.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk index d279694bf5..75b8292ee1 100644 --- a/package/batman-adv/batman-adv.mk +++ b/package/batman-adv/batman-adv.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATMAN_ADV_VERSION = 2022.2 +BATMAN_ADV_VERSION = 2022.3 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h) BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT From yann.morin.1998 at free.fr Mon Feb 20 20:55:41 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:41 -0000 Subject: [Buildroot] [git commit branch/next] package/lua-datafile: bump to version 0.7 Message-ID: <20230220205215.92F6286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7145d04349fbc92588984a01180fc35f044f879a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-datafile/lua-datafile.hash | 2 +- package/lua-datafile/lua-datafile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lua-datafile/lua-datafile.hash b/package/lua-datafile/lua-datafile.hash index 07a13e7e8a..e3b415ad4d 100644 --- a/package/lua-datafile/lua-datafile.hash +++ b/package/lua-datafile/lua-datafile.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 4f7d58c50267b5ebd2145e52aaa5fb63fbf63a74ae765f08e2d0dddd570b6b6a datafile-0.6-1.src.rock +sha256 b511ce5a4f4072bb6c496bd42760fa92a0576d0c77828b6a2600d68fe9d7e998 datafile-0.7-1.src.rock sha256 0443ddabab14f69d4c5e2641860343784a0ccbe5ae7a3743f20de9a13991da66 datafile/LICENSE diff --git a/package/lua-datafile/lua-datafile.mk b/package/lua-datafile/lua-datafile.mk index 5d30fdcf97..3b4c65d3e3 100644 --- a/package/lua-datafile/lua-datafile.mk +++ b/package/lua-datafile/lua-datafile.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_DATAFILE_VERSION = 0.6-1 +LUA_DATAFILE_VERSION = 0.7-1 LUA_DATAFILE_NAME_UPSTREAM = datafile LUA_DATAFILE_SUBDIR = datafile LUA_DATAFILE_LICENSE = MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:41 -0000 Subject: [Buildroot] [git commit branch/next] package/json-for-modern-cpp: bump to version 3.11.2 Message-ID: <20230220205206.B0D8E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5dc226a41998b7f0f92d4fd1330e1e233310e3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/json-for-modern-cpp/json-for-modern-cpp.hash | 2 +- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index a193fa6d49..7668f67249 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 json-3.10.5.tar.gz +sha256 d69f9deb6a75e2580465c6c4c5111b89c4dc2fa94e3a85fcd2ffcd9a143d9273 json-3.11.2.tar.gz sha256 86b998c792894ccb911a1cb7994f7a9652894e7a094c0b5e45be2f553f45cf14 LICENSE.MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index fd13ce1fd1..435644fd53 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.10.5 +JSON_FOR_MODERN_CPP_VERSION = 3.11.2 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT From yann.morin.1998 at free.fr Mon Feb 20 20:55:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:42 -0000 Subject: [Buildroot] [git commit branch/next] package/open62541: bump to version 1.3.4 Message-ID: <20230220205215.B9E7D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83b2e53dcde56d478928d917604bf3af1f903d9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/open62541/open62541.hash | 2 +- package/open62541/open62541.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/open62541/open62541.hash b/package/open62541/open62541.hash index 22c13851bf..09002436e9 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 283545991c3eb36b18c75a64638c7c2ad8f193654c2403b76aee848abf454e14 open62541-v1.3.3-br1.tar.gz +sha256 9a7955ba01e12dbd327e534c25288f4918d275031394c804943a7e45ba903621 open62541-v1.3.4-br1.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index edc95dcf15..2c0e3b17fe 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN62541_VERSION = v1.3.3 +OPEN62541_VERSION = v1.3.4 OPEN62541_SITE_METHOD = git OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES From yann.morin.1998 at free.fr Mon Feb 20 20:55:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:43 -0000 Subject: [Buildroot] [git commit branch/next] package/pkg-meson.mk: add 'setup' as meson command in config step Message-ID: <20230220205207.07413828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d23d6fde81b3a8bf701d0382d55fe60e2334c934 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When building/configure meson packages the following warning is displayed: WARNING: Running the setup command as meson [options] instead of meson setup [options] is ambiguous and deprecated. This warning was introduced in meson release 0.64.0 [0], which we are using since commit 9afa3e3c7d07 (package/meson: bump to version 0.64.0), and is dpcumented in the manual [1]. Follow the advise and the manual, and add the 'setup' argument as the meson command. [0] https://github.com/mesonbuild/meson/commit/3c7ab542c0c4770241eae149b0d4cd8de329aee0 [1] https://mesonbuild.com/Commands.html#setup Signed-off-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- package/pkg-meson.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index d675f7f733..4aa6e44afa 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -149,7 +149,7 @@ define $(2)_CONFIGURE_CMDS CC_FOR_BUILD="$$(HOSTCC)" \ CXX_FOR_BUILD="$$(HOSTCXX)" \ $$($$(PKG)_CONF_ENV) \ - $$(MESON) \ + $$(MESON) setup \ --prefix=/usr \ --libdir=lib \ --default-library=$(if $(BR2_STATIC_LIBS),static,shared) \ @@ -169,7 +169,7 @@ define $(2)_CONFIGURE_CMDS rm -rf $$($$(PKG)_SRCDIR)/build mkdir -p $$($$(PKG)_SRCDIR)/build $$(HOST_CONFIGURE_OPTS) \ - $$($$(PKG)_CONF_ENV) $$(MESON) \ + $$($$(PKG)_CONF_ENV) $$(MESON) setup \ --prefix=$$(HOST_DIR) \ --libdir=lib \ --sysconfdir=$$(HOST_DIR)/etc \ From yann.morin.1998 at free.fr Mon Feb 20 20:55:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:43 -0000 Subject: [Buildroot] [git commit branch/next] package/lua-cjson: bump to version 2.1.0.10 Message-ID: <20230220205215.870B586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eda08c6b88ca466c27cb02004e92ac5ae6e60998 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-cjson/Config.in | 2 +- package/lua-cjson/lua-cjson.hash | 2 +- package/lua-cjson/lua-cjson.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-cjson/Config.in b/package/lua-cjson/Config.in index 9474b3176c..1c153fa46a 100644 --- a/package/lua-cjson/Config.in +++ b/package/lua-cjson/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_LUA_CJSON (C-module) - http://www.kyne.com.au/~mark/software/lua-cjson.php + https://www.kyne.com.au/~mark/software/lua-cjson.php diff --git a/package/lua-cjson/lua-cjson.hash b/package/lua-cjson/lua-cjson.hash index b052c5199c..5ddc07bcc6 100644 --- a/package/lua-cjson/lua-cjson.hash +++ b/package/lua-cjson/lua-cjson.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 455fa7d07d8ac9d61f68f538958f8e28972256f38b0a1c2740873daf809d1837 lua-cjson-2.1.0.6-1.src.rock +sha256 02dea368d07753647c75bd9e6660dd4d06ff7d09956d90d5afc4c3f5b78ed187 lua-cjson-2.1.0.10-1.src.rock sha256 9576e82ef5013fbe80b3bd446a7d9ddd47328baa2186c31d3d885e2a9a8cd31e lua-cjson/LICENSE diff --git a/package/lua-cjson/lua-cjson.mk b/package/lua-cjson/lua-cjson.mk index e029dab5cb..e08d230060 100644 --- a/package/lua-cjson/lua-cjson.mk +++ b/package/lua-cjson/lua-cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CJSON_VERSION = 2.1.0.6-1 +LUA_CJSON_VERSION = 2.1.0.10-1 LUA_CJSON_SUBDIR = lua-cjson LUA_CJSON_LICENSE = MIT LUA_CJSON_LICENSE_FILES = $(LUA_CJSON_SUBDIR)/LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:55:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:44 -0000 Subject: [Buildroot] [git commit branch/next] package/opensc: propagate dependencies from pcsc-lite Message-ID: <20230220205206.EDE6386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=071fdbf963228590b453e5111eadc8a74b579aa2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit d590003e31dd (package/pcsc-lite: needs gcc >= 4.9) propagated that new dependency to a bunch of packages that select pcsc-lite. Then commit 8aaa7ecbce1d (package/opensc: new package) introduced opensc, which selects pcsc-lite. However, the package was submitted before the dependency to gcc 4.8+ was added to pcsc-lite, and that was missed during the review. Add it now. Signed-off-by: Yann E. MORIN --- package/opensc/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/opensc/Config.in b/package/opensc/Config.in index 2cec096ac2..8c6a95a41d 100644 --- a/package/opensc/Config.in +++ b/package/opensc/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_OPENSC depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pcsc-lite select BR2_PACKAGE_PCSC_LITE select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL @@ -13,6 +14,7 @@ config BR2_PACKAGE_OPENSC https://github.com/OpenSC/OpenSC/wiki -comment "opensc needs a toolchain with dynamic library, threads" +comment "opensc needs a toolchain with dynamic library, threads, gcc >= 4.9" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:45 -0000 Subject: [Buildroot] [git commit branch/next] package/dump1090: bump to version 8.2 Message-ID: <20230220205215.D19D186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99127efe6ec2c8c056e252845326cc374859fa74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/flightaware/dump1090/compare/v7.2...v8.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dump1090/dump1090.hash | 2 +- package/dump1090/dump1090.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dump1090/dump1090.hash b/package/dump1090/dump1090.hash index 23178567ac..8a4c3a4818 100644 --- a/package/dump1090/dump1090.hash +++ b/package/dump1090/dump1090.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dfcf57b19f43e0262b1a03b0dc5069a9ddc48427d85378b7ef52fb4e74911eef dump1090-7.2.tar.gz +sha256 1ab8a5acd891bdbba586e2e9f2d9b056210940bd47b5c1a19d133eb091f31555 dump1090-8.2.tar.gz sha256 804f68c803eb5c127c53ad17c4f4e5033ef158e514bb76950dc7b1773f9ce4b0 LICENSE diff --git a/package/dump1090/dump1090.mk b/package/dump1090/dump1090.mk index 82eaaf2cb8..60ef4a9bcb 100644 --- a/package/dump1090/dump1090.mk +++ b/package/dump1090/dump1090.mk @@ -4,7 +4,7 @@ # ################################################################################ -DUMP1090_VERSION = 7.2 +DUMP1090_VERSION = 8.2 DUMP1090_SITE = $(call github,flightaware,dump1090,v$(DUMP1090_VERSION)) DUMP1090_LICENSE = GPL-2.0+ DUMP1090_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:55:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:45 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-input-joystick: bump version to 1.6.4 Message-ID: <20230220205207.1B0588648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7255c2b31755241d8c4fafc5f733faa68182282d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003290.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash | 5 +++-- .../xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash index d2384d6c15..0d7911bf96 100644 --- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash +++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002742.html -sha256 9e7669ecf0f23b8e5dc39d5397cf28296f692aa4c0e4255f5e02816612c18eab xf86-input-joystick-1.6.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003290.html +sha256 905ec485fabc699b1cb21518cbd152246776fa83570e09c5822ca0973733ccd2 xf86-input-joystick-1.6.4.tar.xz +sha512 4e9127f125543060f9e6bc4b0aa384bc98a92acc52bfb240c9a114c565e0b24d2e9dcbc0e866845abc8aeb1e1a6c78cd5e3f0c0f22007aa93460b6a1910d67ef xf86-input-joystick-1.6.4.tar.xz # Locally calculated sha256 460cf612147407317a3911ce03a215707d8d6d5f3e604a53fefa6e54974ad07e COPYING diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk index 0ec4be5e53..0573f43949 100644 --- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.3 -XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.4 +XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.xz +XDRIVER_XF86_INPUT_JOYSTICK_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT XDRIVER_XF86_INPUT_JOYSTICK_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xorgproto From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:46 -0000 Subject: [Buildroot] [git commit branch/next] package/haveged: bump to version 1.9.18 Message-ID: <20230220205215.DF98F86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b473917001fa1145bec2ab118fac97dab0fc26e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/jirka-h/haveged/blob/v1.9.18/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/haveged/haveged.hash | 2 +- package/haveged/haveged.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/haveged/haveged.hash b/package/haveged/haveged.hash index 8c62ead7c3..61bf6cc9a1 100644 --- a/package/haveged/haveged.hash +++ b/package/haveged/haveged.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f882919ccead07ad6687a4784c0c501e617321e96dd0118403464969359cf6ad haveged-1.9.15.tar.gz +sha256 b835fa02b52ee7d06276e028571cadcb14d08f5e5a4b5767adf81451f70561c7 haveged-1.9.18.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/haveged/haveged.mk b/package/haveged/haveged.mk index 7035142aee..fbf72a96ad 100644 --- a/package/haveged/haveged.mk +++ b/package/haveged/haveged.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAVEGED_VERSION = 1.9.15 +HAVEGED_VERSION = 1.9.18 HAVEGED_SITE = $(call github,jirka-h,haveged,v$(HAVEGED_VERSION)) HAVEGED_LICENSE = GPL-3.0+ HAVEGED_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:55:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:46 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-ast: bump version to 1.1.6 Message-ID: <20230220205207.2C2AF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e242cde92c10e6605de54a489f1aaee3dac3b5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003291.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash | 5 +++-- package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash index 2988db98af..12ad79e4b4 100644 --- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash +++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash @@ -1,4 +1,5 @@ -# Locally computed -sha256 1edbbc55d47d3fd71dec99b15c2483e22738c642623a0fb86ef4a81a9067a2de xf86-video-ast-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003291.html +sha256 75754fa9c7f9a94fcc706d32cc118942d16c71934d88110442443a143b930daf xf86-video-ast-1.1.6.tar.xz +sha512 8482fec8d6be577f293cb820e623544475163f713fd74ec415f899bf5e9cf9453ffe4f96e141da3671437ebf616b47395d30d4b10858053c5893f5f5b7575ef1 xf86-video-ast-1.1.6.tar.xz # Locally calculated sha256 1cdd3d57e2fdcbd21b8a7b788ffbe6f809216a9bdd36b2225cff6c4b4404a170 COPYING diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk index b39bbf9a15..f29dc29f0b 100644 --- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk +++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_AST_VERSION = 1.1.5 -XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_AST_VERSION = 1.1.6 +XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.xz +XDRIVER_XF86_VIDEO_AST_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_AST_LICENSE = MIT XDRIVER_XF86_VIDEO_AST_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_AST_DEPENDENCIES = xorgproto xserver_xorg-server From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:47 -0000 Subject: [Buildroot] [git commit branch/next] package/libdeflate: fix build with arm soft float Message-ID: <20230220205215.C55E886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c181878a84e9531f25d8dd1f5cb10b86f8bf9e51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with arm soft float raised since bump to version 1.15 in commit c31087182fa545784d9a0a01f0b32715d78c3955 and https://github.com/ebiggers/libdeflate/commit/84c76f6f2cf5e5ac4deca0b1c25faebb42469f58: In file included from /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h:256, from /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/crc32.c:227: /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabi/11.3.0/include/arm_neon.h:31:2: error: #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" 31 | #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" | ^~~~~ In file included from /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/crc32.c:227: /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h: In function 'clmul_u32': /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h:262:9: error: unknown type name 'uint64x2_t'; did you mean 'uint16x2_t'? 262 | uint64x2_t res = vreinterpretq_u64_p128( | ^~~~~~~~~~ | uint16x2_t Fixes: - http://autobuild.buildroot.org/results/1445dcbf676893133f311a92ac21b29237fb75df Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...d-error-due-to-PMULL-enabled-without-NEON.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch b/package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch new file mode 100644 index 0000000000..b13cbc48af --- /dev/null +++ b/package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch @@ -0,0 +1,35 @@ +From 079a6dd171583c1953017b703ec63c5367a284b4 Mon Sep 17 00:00:00 2001 +From: Eric Biggers +Date: Mon, 26 Dec 2022 11:32:47 -0800 +Subject: [PATCH] lib/arm/cpu_features: fix build error due to PMULL enabled + without NEON + +When building for soft float arm32, HAVE_PMULL_INTRIN is being set when +it shouldn't be, causing a build error: + + #error "NEON intrinsics not available with the soft-float ABI..." + +Fix this by making HAVE_PMULL_INTRIN depend on HAVE_NEON_INTRIN, as used +to be the case, in order to get the 'defined(__ARM_FP)' dependency, + +Fixes https://github.com/ebiggers/libdeflate/issues/282 +Fixes: 84c76f6f2cf5 ("lib/arm: make crc32 code work with MSVC") +[Retrieved from: +https://github.com/ebiggers/libdeflate/commit/079a6dd171583c1953017b703ec63c5367a284b4] +Signed-off-by: Fabrice Fontaine +--- + lib/arm/cpu_features.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/arm/cpu_features.h b/lib/arm/cpu_features.h +index 4092eba8..edcf7359 100644 +--- a/lib/arm/cpu_features.h ++++ b/lib/arm/cpu_features.h +@@ -97,6 +97,7 @@ static inline u32 get_arm_cpu_features(void) { return 0; } + #endif + #if HAVE_PMULL_NATIVE || \ + (HAVE_DYNAMIC_ARM_CPU_FEATURES && \ ++ HAVE_NEON_INTRIN /* needed to exclude soft float arm32 case */ && \ + (GCC_PREREQ(6, 1) || __has_builtin(__builtin_neon_vmull_p64) || \ + defined(_MSC_VER)) && \ + /* From yann.morin.1998 at free.fr Mon Feb 20 20:55:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:47 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-vesa: bump version to 2.6.0 Message-ID: <20230220205207.3DEE186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f792825039878323d996d973f0bfd588991fc5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003297.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash | 6 +++--- package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash index d179228a74..3e32249f12 100644 --- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash +++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-September/003060.html -sha256 1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659 xf86-video-vesa-2.5.0.tar.bz2 -sha512 36fd921f54f33eb25966b5f9ea1e1b3e9009965c012c8b9c676686b472111719921b80cf62dafc746058878253e21f0ef341a2ff2d650df22ca1e35e81716a8b xf86-video-vesa-2.5.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003297.html +sha256 10082771b1a8f659c60b3d9b70456a4b59948a75b3cade2dfa33b8b05e549bb1 xf86-video-vesa-2.6.0.tar.xz +sha512 494e117c1e6e0ce4c66ac7798de54667862c62605bfd76dd9373447d40dcd0521100810c9285cbe9c159440e217954c0cad6d5219c5894e075509c7c0bc353c7 xf86-video-vesa-2.6.0.tar.xz # Locally computed sha256 bda49ba1e860501c20fd444423bc790f6da4f769561b69acc0cbe5abff9409b6 COPYING diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk index b08bab4ec8..8a5a5ebf58 100644 --- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk +++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VESA_VERSION = 2.5.0 -XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_VESA_VERSION = 2.6.0 +XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.xz +XDRIVER_XF86_VIDEO_VESA_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_VESA_LICENSE = MIT XDRIVER_XF86_VIDEO_VESA_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xorgproto From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:48 -0000 Subject: [Buildroot] [git commit branch/next] package/fmlib: fix build for ppc e500mc Message-ID: <20230220205216.032C286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1df9d42bdd8cc2e594d6337ee62c3f31499baf80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When BR2_powerpc_e500mc=y, fmlib package compilation fails with output: make[2]: *** No rule to make target 'libfm-e500mc.a'. Stop. The fmlib package "make help" command shows: The available make libfm-.a targets are: libfm-ppce500mc.a (P2, P3, P4) ... The package Config.in incorrectly sets BR2_PACKAGE_FMLIB_ARCHTYPE to "e500mc", which is then passed as the package make target. The correct value should be "ppce500mc". The commit fixes this build issue. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/fmlib/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fmlib/Config.in b/package/fmlib/Config.in index df4ae440ea..7bccfd7c83 100644 --- a/package/fmlib/Config.in +++ b/package/fmlib/Config.in @@ -37,7 +37,7 @@ endchoice config BR2_PACKAGE_FMLIB_ARCHTYPE string - default "e500mc" if BR2_powerpc_e500mc + default "ppce500mc" if BR2_powerpc_e500mc default "ppc64e6500" if BR2_powerpc_e6500 && BR2_powerpc64 default "ppc32e6500" if BR2_powerpc_e6500 && BR2_powerpc From yann.morin.1998 at free.fr Mon Feb 20 20:55:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:48 -0000 Subject: [Buildroot] [git commit branch/next] package/xr819-xradio: fix build failure with Linux 6.0 Message-ID: <20230220205207.5D1DC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fbb447cded5120135ce21ce6a5d2936dc79f645 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bump to latest version to fix build failure with Linux 6.0. Fixes: http://autobuild.buildroot.net/results/434c1d2a5104090366519278314bf750324d3710/ Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/xr819-xradio/xr819-xradio.hash | 2 +- package/xr819-xradio/xr819-xradio.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index 89201a8eb7..08a3b6e8cc 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 0d0449a85488b990d10ecdf67ac88bfbd39fa81c2df5dfcfed583975222afd33 xr819-xradio-4f0cfd5e869ca101e7c624d9ce05ba5d2b2a0bc2.tar.gz +sha256 839fdae93eba29121d4116de335b00a026ef63874caf516747dbdf24c17f208b xr819-xradio-58d597bcf081e44904335916e6033bc8ef28b043.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index 835e229347..8c1cb1587f 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 4f0cfd5e869ca101e7c624d9ce05ba5d2b2a0bc2 +XR819_XRADIO_VERSION = 58d597bcf081e44904335916e6033bc8ef28b043 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:55:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:49 -0000 Subject: [Buildroot] [git commit branch/next] package/network-manager: bump to version 1.40.6 Message-ID: <20230220205207.6C188828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7c20ad548818fad6924f19e31ef2defdc418875 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 26bcf843c2..f503665a9a 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.36/NetworkManager-1.36.4.sha256sum -sha256 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59 NetworkManager-1.36.4.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.6.sha256sum +sha256 2f025b2d5af7de593bbf47c17e4d98a2b9608ea90a8260fb08080be97439534e NetworkManager-1.40.6.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index a17c5e1774..847c6a82ba 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.36 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 +NETWORK_MANAGER_VERSION_MAJOR = 1.40 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).6 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 From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:49 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi-pvr-nextpvr: bump version to 19.0.6-Matrix Message-ID: <20230220205216.1883D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82edf126c98bbf652de917892f25ea6d37f99bb9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 2 +- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 79921da503..17d9817053 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 49df97d2e566dc044d3027e4ee6ed8e1ff122f4c38c82325e20ac91e148d5558 kodi-pvr-nextpvr-19.0.5-Matrix.tar.gz +sha256 45ad0def6bbdb50fc42dc0b8a997e0db758fda42421fa7eb7643466ea512134f kodi-pvr-nextpvr-19.0.6-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index dc62040b02..6b3590a6d6 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 19.0.5-Matrix +KODI_PVR_NEXTPVR_VERSION = 19.0.6-Matrix KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:51 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add myself to more packages Message-ID: <20230220205216.2522E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02cc05e757970a23da3c0818f275d465a4c1f280 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5eed4a8455..48e7e08b3a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2105,12 +2105,16 @@ F: package/gnuplot/ F: package/sdl2/ N: Michael Nosthoff +F: package/boost/ +F: package/fmt/ F: package/grpc/ F: package/gtest/ +F: package/json-for-modern-cpp/ F: package/libabseil-cpp/ F: package/networkd-dispatcher/ F: package/protobuf/ F: package/re2/ +F: package/spdlog/ N: Michael Rommel F: package/knock/ From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:51 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/kria/kv260/uboot.fragment: move to board/zynqmp/kria Message-ID: <20230220205207.8C592828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2da02b9e38a72ec3d18171e482a0791b5dd24b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch moves the board/zynqmp/kria/kv260/uboot.fragment file to the board/zynqmp/kria directory. The reason is that this file is the same for any kria starter kit and is not specific to the kv260. By moving the file, it can be logically re-used with the kr260 when support for this starter kit is added to buildroot. KR260 Starter Kit: https://www.xilinx.com/products/som/kria/kr260-robotics-starter-kit.html Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- board/zynqmp/kria/{kv260 => }/uboot.fragment | 0 configs/zynqmp_kria_kv260_defconfig | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/board/zynqmp/kria/kv260/uboot.fragment b/board/zynqmp/kria/uboot.fragment similarity index 100% rename from board/zynqmp/kria/kv260/uboot.fragment rename to board/zynqmp/kria/uboot.fragment diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index df01ad30b8..3214d45fa9 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -24,7 +24,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/kv260/uboot.fragment" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:52 -0000 Subject: [Buildroot] [git commit branch/next] package/stellarium: bump version to 1.2 Message-ID: <20230220205216.2F4C086496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=319c56dfe3309dbf24be01fed3afff6259a2c5dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add patch to fix build error. Removed sha1 hash. Add configure option to disable searching for qt6 as of now due to incomplete implementation of qt6 modules, like gui, in buildroot. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/stellarium/0001-add-missing-include.patch | 32 +++++++++++++++++++++++ package/stellarium/stellarium.hash | 3 +-- package/stellarium/stellarium.mk | 4 ++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/package/stellarium/0001-add-missing-include.patch b/package/stellarium/0001-add-missing-include.patch new file mode 100644 index 0000000000..822fc50367 --- /dev/null +++ b/package/stellarium/0001-add-missing-include.patch @@ -0,0 +1,32 @@ +From f36ce55e7a0fbba11fb7e1d4107ef61a79dc95d3 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 25 Dec 2022 20:38:17 +0100 +Subject: [PATCH] add missing include + +Fixes build error: + +stellarium-1.2/plugins/MeteorShowers/src/MeteorShowersMgr.hpp:331:12: + error: field 'm_lastUpdate' has incomplete type 'QDateTime' + +Patch sent upstream: https://github.com/Stellarium/stellarium/pull/2933 + +Signed-off-by: Bernd Kuhls +--- + plugins/MeteorShowers/src/MeteorShowersMgr.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/MeteorShowers/src/MeteorShowersMgr.hpp b/plugins/MeteorShowers/src/MeteorShowersMgr.hpp +index 8096856b6d..17716a68b0 100644 +--- a/plugins/MeteorShowers/src/MeteorShowersMgr.hpp ++++ b/plugins/MeteorShowers/src/MeteorShowersMgr.hpp +@@ -20,6 +20,7 @@ + #ifndef METEORSHOWERSMGR_HPP + #define METEORSHOWERSMGR_HPP + ++#include + #include + #include + +-- +2.34.1 + diff --git a/package/stellarium/stellarium.hash b/package/stellarium/stellarium.hash index f33dd385ca..2488b611a4 100644 --- a/package/stellarium/stellarium.hash +++ b/package/stellarium/stellarium.hash @@ -1,5 +1,4 @@ # From https://github.com/Stellarium/stellarium/releases -sha1 3661b4e8a94e7a520873fa22ddc79f39904eb1c4 stellarium-0.22.2.tar.gz -sha256 31e965d32cafc0fbad212c7ef4efbeac988f909206013554e1fe35123ebb9376 stellarium-0.22.2.tar.gz +sha256 802a0e8231cae41ec04f697f70105c291d9719aa6e7fd8cbe1f15068c3324e09 stellarium-1.2.tar.xz # Locally computed sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index 769e7049c1..a62488907f 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -4,7 +4,8 @@ # ################################################################################ -STELLARIUM_VERSION = 0.22.2 +STELLARIUM_VERSION = 1.2 +STELLARIUM_SOURCE = stellarium-$(STELLARIUM_VERSION).tar.xz STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION) STELLARIUM_LICENSE = GPL-2.0+ STELLARIUM_LICENSE_FILES = COPYING @@ -18,6 +19,7 @@ STELLARIUM_CONF_OPTS = \ -DENABLE_MEDIA=ON \ -DENABLE_NLS=OFF \ -DENABLE_QTWEBENGINE=OFF \ + -DENABLE_QT6=OFF \ -DUSE_SYSTEM_ZLIB=ON ifeq ($(BR2_PACKAGE_QT5SCRIPT),y) From yann.morin.1998 at free.fr Mon Feb 20 20:55:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:52 -0000 Subject: [Buildroot] [git commit branch/next] package/tealdeer: exclude unsupported targets Message-ID: <20230220205207.7CF378648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=22bdfbdfc72681f552ae346a110d81b98ec477e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Not all target architectures are supported by the "ring" dependency: - mips: https://github.com/briansmith/ring/issues/562 - PowerPC: https://github.com/briansmith/ring/issues/389 - Sparc: https://github.com/briansmith/ring/issues/1512 - s390x: https://github.com/briansmith/ring/commit/4d2e1a8fb80398f7c3c0137ea8fdd512f82d37a0 Signed-off-by: Danilo Bargen Signed-off-by: Yann E. MORIN --- package/tealdeer/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/tealdeer/Config.in b/package/tealdeer/Config.in index 96ed81614b..662a937ce1 100644 --- a/package/tealdeer/Config.in +++ b/package/tealdeer/Config.in @@ -1,6 +1,11 @@ config BR2_PACKAGE_TEALDEER bool "tealdeer" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # Crypto dependency (ring) not available for mips, PowerPC, Sparc, s390x + depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) + depends on !(BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le) + depends on !(BR2_sparc || BR2_sparc64) + depends on !BR2_s390x select BR2_PACKAGE_HOST_RUSTC help A fast and full-featured tldr client. tldr pages are From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:53 -0000 Subject: [Buildroot] [git commit branch/next] package/meson: bump to version 1.0.0 Message-ID: <20230220205216.50F4E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a41f246439c0387f7b028b3f7e40978a2e0f1a50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- 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 1544bb3897..6993b756ae 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.64.1/meson-0.64.1.tar.gz.asc -sha256 3a8e030c2334f782085f81627062cc6d4a6771edf31e055ffe374f9e6b089ab9 meson-0.64.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.0.0/meson-1.0.0.tar.gz.asc +sha256 aa50a4ba4557c25e7d48446abfde857957dcdf58385fffbe670ba0e8efacce05 meson-1.0.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 5aae95973a..e417d8d627 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.64.1 +MESON_VERSION = 1.0.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:53 -0000 Subject: [Buildroot] [git commit branch/next] package/postgresql: bump version to 14.6 Message-ID: <20230220205207.B461E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f8592b686e4aa1085ace7c7f25c7c777a3fd2ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://www.postgresql.org/docs/release/14.6/ Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 8fdaadde99..26bb626943 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v14.5/postgresql-14.5.tar.bz2.sha256 -sha256 d4f72cb5fb857c9a9f75ec8cf091a1771272802f2178f0b2e65b7b6ff64f4a30 postgresql-14.5.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v14.6/postgresql-14.6.tar.bz2.sha256 +sha256 508840fc1809d39ab72274d5f137dabb9fd7fb4f933da4168aeebb20069edf22 postgresql-14.6.tar.bz2 # License file, Locally calculated sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 631a959122..502860bc99 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 14.5 +POSTGRESQL_VERSION = 14.6 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 Mon Feb 20 20:55:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:53 -0000 Subject: [Buildroot] [git commit branch/next] package/gcc: fix gcc12 with uClibc Message-ID: <20230220205216.8618E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=327fab5b9d45891233ff647d5b352cc94b3c27ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next GCC 12 produces broken binaries when used with uClibc. E.g. `gdb` crashes on startup. GCC HEAD fixes this in: https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=ee4af2ed0b7322884ec4ff537564683c3749b813 Adds the commit as patch for GCC 12. Signed-off-by: Gleb Mazovetskiy Signed-off-by: Thomas Petazzoni --- package/gcc/12.2.0/0002-fix-condvar.patch | 82 +++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/package/gcc/12.2.0/0002-fix-condvar.patch b/package/gcc/12.2.0/0002-fix-condvar.patch new file mode 100644 index 0000000000..5044942e9f --- /dev/null +++ b/package/gcc/12.2.0/0002-fix-condvar.patch @@ -0,0 +1,82 @@ +From ee4af2ed0b7322884ec4ff537564683c3749b813 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely +Date: Thu, 22 Dec 2022 09:56:47 +0000 +Subject: [PATCH] libstdc++: Avoid recursion in __nothrow_wait_cv::wait + [PR105730] + +The commit r12-5877-g9e18a25331fa25 removed the incorrect +noexcept-specifier from std::condition_variable::wait and gave the new +symbol version @@GLIBCXX_3.4.30. It also redefined the original symbol +std::condition_variable::wait(unique_lock&)@GLIBCXX_3.4.11 as an +alias for a new symbol, __gnu_cxx::__nothrow_wait_cv::wait, which still +has the incorrect noexcept guarantee. That __nothrow_wait_cv::wait is +just a wrapper around the real condition_variable::wait which adds +noexcept and so terminates on a __forced_unwind exception. + +This doesn't work on uclibc, possibly due to a dynamic linker bug. When +__nothrow_wait_cv::wait calls the condition_variable::wait function it +binds to the alias symbol, which means it just calls itself recursively +until the stack overflows. + +This change avoids the possibility of a recursive call by changing the +__nothrow_wait_cv::wait function so that instead of calling +condition_variable::wait it re-implements it. This requires accessing +the private _M_cond member of condition_variable, so we need to use the +trick of instantiating a template with the member-pointer of the private +member. + +libstdc++-v3/ChangeLog: + + PR libstdc++/105730 + * src/c++11/compatibility-condvar.cc (__nothrow_wait_cv::wait): + Access private data member of base class and call its wait + member. + +Signed-off-by: Gleb Mazovetskiy +--- + .../src/c++11/compatibility-condvar.cc | 22 ++++++++++++++++++- + 1 file changed, 21 insertions(+), 1 deletion(-) + +diff --git a/libstdc++-v3/src/c++11/compatibility-condvar.cc b/libstdc++-v3/src/c++11/compatibility-condvar.cc +index e3a8b8403ca..3cef3bc0714 100644 +--- a/libstdc++-v3/src/c++11/compatibility-condvar.cc ++++ b/libstdc++-v3/src/c++11/compatibility-condvar.cc +@@ -67,6 +67,24 @@ _GLIBCXX_END_NAMESPACE_VERSION + && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT) + namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) + { ++namespace ++{ ++ // Pointer-to-member for private std::condition_variable::_M_cond member. ++ std::__condvar std::condition_variable::* __base_member; ++ ++ template ++ struct cracker ++ { static std::__condvar std::condition_variable::* value; }; ++ ++ // Initializer for this static member also initializes __base_member. ++ template ++ std::__condvar std::condition_variable::* ++ cracker::value = __base_member = X; ++ ++ // Explicit instantiation is allowed to access the private member. ++ template class cracker<&std::condition_variable::_M_cond>; ++} ++ + struct __nothrow_wait_cv : std::condition_variable + { + void wait(std::unique_lock&) noexcept; +@@ -76,7 +94,9 @@ __attribute__((used)) + void + __nothrow_wait_cv::wait(std::unique_lock& lock) noexcept + { +- this->condition_variable::wait(lock); ++ // In theory this could be simply this->std::condition_variable::wait(lock) ++ // but with uclibc that binds to the @GLIBCXX_3.4.11 symbol, see PR 105730. ++ (this->*__base_member).wait(*lock.mutex()); + } + } // namespace __gnu_cxx + +-- +2.31.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:54 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi-pvr-nextpvr: bump version to 19.0.5-Matrix Message-ID: <20230220205207.F090F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dd4caaa011b1efffc522d0d313725a195cfee7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 2 +- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 74f15e6d9b..79921da503 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 278411430d41ac24f28e05f76d2d46a90cb3989202a450399ac0495c264a6846 kodi-pvr-nextpvr-19.0.4-Matrix.tar.gz +sha256 49df97d2e566dc044d3027e4ee6ed8e1ff122f4c38c82325e20ac91e148d5558 kodi-pvr-nextpvr-19.0.5-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index c2f54e0c2c..dc62040b02 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 19.0.4-Matrix +KODI_PVR_NEXTPVR_VERSION = 19.0.5-Matrix KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:54 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl_433: fix static openssl build Message-ID: <20230220205216.AF01786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56763ca01229ead2dba2cfb27025b41c0a5e18ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static openssl build failure raised since commit 7967755fbf25fe4d5860884bedb3e01fcd7e9855: /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-13/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': ssl_cert.c:(.text+0x384): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/417c86963ffe038aa052ea3cf19fd52c3e9b7396 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...txt-use-pkg-config-to-detect-openssl-when.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch b/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch new file mode 100644 index 0000000000..00858c8ff9 --- /dev/null +++ b/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch @@ -0,0 +1,42 @@ +From b860de9e207d8fe2ea37dad28fdd014493d87703 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 27 Dec 2022 16:29:16 +0100 +Subject: [PATCH] build: Fix CMake to use pkg-config openssl when possible + (#2290) + +In order to take into account the libraries used by openssl when +building statically, using pkg-config is recommended. This patch +therefore improves the CMakeLists.txt to use pkg-config to detect +openssl when pkg-config is available. This will avoid +static build failure when openssl needs to link with -latomic. + +Fixes: + - http://autobuild.buildroot.org/results/417c86963ffe038aa052ea3cf19fd52c3e9b7396 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/b860de9e207d8fe2ea37dad28fdd014493d87703] +--- + CMakeLists.txt | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d47a3eda2..cf30d8be2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -175,7 +175,14 @@ set(ENABLE_OPENSSL AUTO CACHE STRING "Enable OpenSSL TLS support") + set_property(CACHE ENABLE_OPENSSL PROPERTY STRINGS AUTO ON OFF) + if(ENABLE_OPENSSL) # AUTO / ON + +-find_package(OpenSSL) ++find_package(PkgConfig) ++if(PKG_CONFIG_FOUND) ++ pkg_check_modules(OPENSSL openssl) ++ set(OPENSSL_LIBRARIES ${OPENSSL_LINK_LIBRARIES}) ++ set(OPENSSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIRS}) ++else() ++ find_package(OpenSSL) ++endif() + if(OPENSSL_FOUND) + message(STATUS "OpenSSL TLS support will be compiled. Found version ${OPENSSL_VERSION}") + include_directories(${OPENSSL_INCLUDE_DIR}) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:55 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pypa-build: drop host-python-tomli dependency Message-ID: <20230220205208.0DDA28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=889c7815ed5fca418ca02dda9a8f5fcf8674fac4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The host-python-tomli dependency is not required on python version 3.11 and newer. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pypa-build/python-pypa-build.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk index b78aefe855..adc124b074 100644 --- a/package/python-pypa-build/python-pypa-build.mk +++ b/package/python-pypa-build/python-pypa-build.mk @@ -12,7 +12,6 @@ PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE PYTHON_PYPA_BUILD_SETUP_TYPE = setuptools HOST_PYTHON_PYPA_BUILD_DEPENDENCIES = \ host-python-packaging \ - host-python-pep517 \ - host-python-tomli + host-python-pep517 $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:56 -0000 Subject: [Buildroot] [git commit branch/next] package/aubio: switch to external waf script Message-ID: <20230220205216.D74AC86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6264dfae49af69d7358f2d6fef21bd720e62440f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since the python 3.11 version bump [1], the waf script bundled in aubio 0.4.9 can't be executed anymore due to a waf bug [2]. Use the waf script provided by the Buildroot waf package infrastructure after removing the old waf script and its libraries. Fixes: http://autobuild.buildroot.org/results/e2b/e2be18415ca794c68e708f2fdfd0a1a1ff5be714 [1] 738500c296c8b1206f20e94ca3e7c5932a6a0486 [2] https://gitlab.com/ita1024/waf/-/commit/68997828c850ce7fb30b73b4adfde35053e539d1 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/aubio/aubio.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index b2eb2b5e6d..c995fdfac7 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -16,6 +16,17 @@ AUBIO_CONF_OPTS = \ --disable-docs \ --disable-atlas +# The waf script bundled in aubio 0.4.9 is too old for python3.11 +# Similar issue with Jack: +# https://github.com/jackaudio/jack2/issues/898 +AUBIO_NEEDS_EXTERNAL_WAF = YES + +# The old waf script bundled in aubio 0.4.9 need to be removed first. +define AUBIO_REMOVE_OLD_WAF + $(RM) -fr $(@D)/waf $(@D)/waflib +endef +AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF + # Add --notests for each build step to avoid running unit tests on the # build machine. AUBIO_WAF_OPTS = --notests From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:56 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/kria/patches: fix build by dropping U-Boot patch Message-ID: <20230220205207.CFE60828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=607665e3cecd967759344d6c702babe82ffa604c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since commit 5bbc20154e2291b967b7fc66ca4f85a2b47dcfd1 ("configs/zynqmp_kria_kv260_defconfig: bump to Xilinx 2022.2"), we're using U-Boot version Xilinx 2022.2, which already carries the psu_init_gpl.c, causing the build to fail as our patch doesn't apply. Fix this by dropping the no longer needed patch. Fixes: 5bbc20154e2291b967b7fc66ca4f85a2b47dcfd1 ("configs/zynqmp_kria_kv260_defconfig: bump to Xilinx 2022.2") Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- ...p-zynqmp-sm-k26-revA-Fix-DP-PLL-configura.patch | 39 ---------------------- configs/zynqmp_kria_kv260_defconfig | 1 - 2 files changed, 40 deletions(-) diff --git a/board/zynqmp/kria/patches/uboot/0001-arm64-zynqmp-zynqmp-sm-k26-revA-Fix-DP-PLL-configura.patch b/board/zynqmp/kria/patches/uboot/0001-arm64-zynqmp-zynqmp-sm-k26-revA-Fix-DP-PLL-configura.patch deleted file mode 100644 index 99dc056115..0000000000 --- a/board/zynqmp/kria/patches/uboot/0001-arm64-zynqmp-zynqmp-sm-k26-revA-Fix-DP-PLL-configura.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c6677ee92c05e3f0f22cc08e3b309a996292562f Mon Sep 17 00:00:00 2001 -From: Neal Frager -Date: Fri, 13 May 2022 14:02:07 +0100 -Subject: [PATCH 1/1] arm64: zynqmp: zynqmp-sm-k26-revA: Fix DP PLL - configuration - -This patch fixes the DP audio and video PLL configurations for the zynqmp-sm-k26-revA som. - -The Linux DP driver expects the DP to be using the following PLL config: - - DP video PLL should use the VPLL (0x0) - - DP audio PLL should use the RPLL (0x3) - - DP system time clock PLL should use RPLL (0x3) - -Register 0xFD1A0070 configures the DP video PLL. -Register 0xFD1A0074 configures the DP audio PLL. -Register 0xFD1A007C configures the DP system time clock PLL. - -Signed-off-by: Neal Frager ---- - board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c -index ed025790bc..e5598807e8 100644 ---- a/board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c -@@ -74,6 +74,9 @@ static unsigned long psu_clock_init_data(void) - psu_mask_write(0xFF5E0128, 0x01003F07U, 0x01000A00U); - psu_mask_write(0xFD1A0060, 0x03003F07U, 0x03000100U); - psu_mask_write(0xFD1A0068, 0x01003F07U, 0x01000200U); -+ psu_mask_write(0xFD1A0070, 0x013F3F07U, 0x01010500U); -+ psu_mask_write(0xFD1A0074, 0x013F3F07U, 0x01013C03U); -+ psu_mask_write(0xFD1A007C, 0x013F3F07U, 0x01013803U); - psu_mask_write(0xFD1A0080, 0x00003F07U, 0x00000200U); - psu_mask_write(0xFD1A0084, 0x07003F07U, 0x07000100U); - psu_mask_write(0xFD1A00B8, 0x01003F07U, 0x01000203U); --- -2.17.1 - diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 3214d45fa9..5c53122b46 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -38,4 +38,3 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/patches" From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:57 -0000 Subject: [Buildroot] [git commit branch/next] package/lua-cqueues: force using libopenssl Message-ID: <20230220205216.E2CA786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=620a77dc9d93365d87c7b18545f091c8e962509e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next As building lua-cqueues fails to build with libressl, we force the use of libopenssl instead. Fixes: http://autobuild.buildroot.net/results/032d6c9bf84b0d4e50d3c27f37b71c0564c52312/ Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-cqueues/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lua-cqueues/Config.in b/package/lua-cqueues/Config.in index 60f022848b..a8c38950cf 100644 --- a/package/lua-cqueues/Config.in +++ b/package/lua-cqueues/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LUA_CQUEUES bool "lua-cqueues" depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix. From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:57 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pep517: drop host-python-tomli dependency Message-ID: <20230220205208.1E03F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0e09a1b0a6a57f3bda48d87f7292af136d59949 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The host-python-tomli dependency is not required on python version 3.11 and newer. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pep517/python-pep517.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk index 1fd294fbb4..c43b09faaa 100644 --- a/package/python-pep517/python-pep517.mk +++ b/package/python-pep517/python-pep517.mk @@ -10,6 +10,5 @@ PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/4d/19/e11fcc88288f6 PYTHON_PEP517_LICENSE = MIT PYTHON_PEP517_LICENSE_FILES = LICENSE PYTHON_PEP517_SETUP_TYPE = flit-bootstrap -HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:58 -0000 Subject: [Buildroot] [git commit branch/next] package/slang: add option to enable/disable slsh Message-ID: <20230220205216.EF51386496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2468404c76e5d56d14f7e2afea8e2641f036e30 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The S-lang shell is currently installed by default but most packages are typically interested in the shared libraries only. Add a configuration option to disable the slsh program and its supporting files. Signed-off-by: Florian Fainelli Signed-off-by: Thomas Petazzoni --- package/slang/Config.in | 9 +++++++++ package/slang/slang.mk | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/package/slang/Config.in b/package/slang/Config.in index a500ff5b7d..0b2c987f73 100644 --- a/package/slang/Config.in +++ b/package/slang/Config.in @@ -5,3 +5,12 @@ config BR2_PACKAGE_SLANG Multi-platform console display library. http://www.jedsoft.org/slang/index.html + +if BR2_PACKAGE_SLANG + +config BR2_PACKAGE_SLANG_SLSH + bool "enable slsh" + help + Enable the S-lang interpreter + +endif diff --git a/package/slang/slang.mk b/package/slang/slang.mk index e0f5968b46..2b3cbdf27a 100644 --- a/package/slang/slang.mk +++ b/package/slang/slang.mk @@ -60,4 +60,13 @@ SLANG_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-static SLANG_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-static endif +ifeq ($(BR2_PACKAGE_SLANG_SLSH),) +define SLANG_REMOVE_SLSH + rm -rf $(TARGET_DIR)/etc/slsh.rc \ + $(TARGET_DIR)/usr/share/slsh \ + $(TARGET_DIR)/usr/bin/slsh +endef +SLANG_POST_INSTALL_TARGET_HOOKS += SLANG_REMOVE_SLSH +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:58 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-mediadriver: bump version to 22.6.4 Message-ID: <20230220205208.3C2FE828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e14c63da95959cbcbbc1cda4bf5e643cb9d17f80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 0a42475400..a9b7c6407d 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f42c41dce7ab4213e21f6599cd0602e5ab40a8182ec286bfc0a16547721dff7a intel-media-22.6.3.tar.gz +sha256 0c04b9d74b92de41fd409b62913ce4afd799236c0b6bc1983a496990764e5d90 intel-media-22.6.4.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 27f3193929..ff97445181 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.6.3 +INTEL_MEDIADRIVER_VERSION = 22.6.4 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 yann.morin.1998 at free.fr Mon Feb 20 20:55:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:59 -0000 Subject: [Buildroot] [git commit branch/next] package/qemu: reorder dependencies alphabetically Message-ID: <20230220205217.224D086494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad71850aa039e344a1c32cd07876c1a83bdf5d5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/qemu/qemu.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index cbcbbc2bc5..be84452862 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -23,10 +23,10 @@ QEMU_CPE_ID_VENDOR = qemu QEMU_DEPENDENCIES = \ host-meson \ host-pkgconf \ + host-python3 \ libglib2 \ - zlib \ pixman \ - host-python3 + zlib # Need the LIBS variable because librt and libm are # not automatically pulled. :-( @@ -253,12 +253,12 @@ $(eval $(generic-package)) # Host-qemu HOST_QEMU_DEPENDENCIES = \ - host-meson \ - host-pkgconf \ - host-zlib \ host-libglib2 \ + host-meson \ host-pixman \ - host-python3 + host-pkgconf \ + host-python3 \ + host-zlib # BR ARCH qemu # ------- ---- From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:59 -0000 Subject: [Buildroot] [git commit branch/next] package/python-maturin: drop host-python-tomli dependency Message-ID: <20230220205208.2CF2C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef708b0c195d168c311b1096c1ab2b7bf6c2aa1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The host-python-tomli dependency is not required on python version 3.11 and newer. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-maturin/python-maturin.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index ab87df3842..3dedfdce11 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -12,7 +12,6 @@ PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit HOST_PYTHON_MATURIN_DEPENDENCIES = \ host-python-setuptools-rust \ - host-python-tomli \ host-rustc HOST_PYTHON_MATURIN_ENV = \ $(HOST_PKG_CARGO_ENV) \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:00 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: drop ucl Message-ID: <20230220205217.5190386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be69066d8fee8b30dad8317bb4aad425bc005623 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 85c5af46ad6c18841576c0f7abe241a617a44cb7 forgot to drop ucl from DEVELOPERS file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 48e7e08b3a..0eea9c33d9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1091,7 +1091,6 @@ F: package/libsodium/ F: package/php-amqp/ F: package/python-cherrypy/ F: package/sane-backends/ -F: package/ucl/ F: package/upx/ F: package/zxing-cpp/ From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:00 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-gmmlib: bump version to 22.3.1 Message-ID: <20230220205208.5B3138648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7402436bebe225ccc758960dfd822e8afcee9e65 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 490ff46dfc..9491f23680 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c1f33e1519edfc527127baeb0436b783430dfd256c643130169a3a71dc86aff9 intel-gmmlib-22.3.0.tar.gz +sha256 4adcd33a07617e1c95c4bc6d85bac2e3a881ba19ffcca2857da765248295fd2c intel-gmmlib-22.3.1.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index ee5b60ab6b..81c455eafd 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.0 +INTEL_GMMLIB_VERSION = 22.3.1 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Feb 20 20:56:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:01 -0000 Subject: [Buildroot] [git commit branch/next] package/qemu: bump to version 7.2.0 Message-ID: <20230220205217.2D91986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a21d2f356fbcb76dd8f96c8c9476401be104e90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changes log: https://wiki.qemu.org/ChangeLog/7.2 Add host-slirp dependency to provide the network backend 'user' that was included in previous Qemu release by a submodule in Qemu sources [1]. This network backend is currently used by several defconfig that would fail to boot with: "-net user: network backend 'user' is not compiled into this binary" board/mender/x86_64/readme.txt board/pc/readme.txt board/pc/readme.txt board/qemu/arm-versatile/readme.txt board/qemu/arm-vexpress/readme.txt board/qemu/mips32r2-malta/readme.txt board/qemu/mips32r2el-malta/readme.txt board/qemu/mips32r6el-malta/readme.txt board/qemu/ppc-bamboo/readme.txt board/qemu/ppc-e500mc/readme.txt board/qemu/ppc-g3beige/readme.txt board/qemu/ppc-mac99/readme.txt board/qemu/ppc-mpc8544ds/readme.txt board/qemu/ppc64-e5500/readme.txt board/qemu/s390x/readme.txt board/qemu/sh4-r2d/readme.txt board/qemu/sh4eb-r2d/readme.txt board/qemu/sparc-ss10/readme.txt board/qemu/sparc64-sun4u/readme.txt board/qemu/x86/readme.txt board/qemu/x86_64/readme.txt Update the slirp configure option following the slirp submodule removal [2]. Runtime tested in gitlab: https://gitlab.com/kubu93/buildroot/-/pipelines/725509959 Add a backport from upstream, to fix sh4 stability [3]. [1] https://wiki.qemu.org/ChangeLog/7.2#Removal_of_the_.22slirp.22_submodule_.28affects_.22-netdev_user.22.29 [2] https://gitlab.com/qemu-project/qemu/-/commit/5890258aeeba303704ec1adca415e46067800777 [3] https://gitlab.com/kubu93/buildroot/-/jobs/3490258272 Signed-off-by: Romain Naour [yann.morin.1998 at free.fr: backport fix rather than revert faulty commit] Signed-off-by: Yann E. MORIN --- ...4-Mask-restore-of-env-flags-from-tb-flags.patch | 36 ++++++++++++++++++++++ package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 6 ++-- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch b/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch new file mode 100644 index 0000000000..8dc2dd8823 --- /dev/null +++ b/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch @@ -0,0 +1,36 @@ +From bc2331635ce18ff068d2bb1e493bc546e1f786e1 Mon Sep 17 00:00:00 2001 +From: Guenter Roeck +Date: Mon, 12 Dec 2022 09:03:17 -0600 +Subject: [PATCH] target/sh4: Mask restore of env->flags from tb->flags + +The values in env->flags are a subset of tb->flags. +Restore only the bits that belong. + +Cc: qemu-stable at nongnu.org +Fixes: ab419fd8a035 ("target/sh4: Fix TB_FLAG_UNALIGN") +Signed-off-by: Guenter Roeck +Message-ID: <20221212011345.GA2235238 at roeck-us.net> +[rth: Reduce to only the the superh_cpu_synchronize_from_tb change] +Signed-off-by: Richard Henderson +[yann.morin.1998 at free.fr: backport from upstream] +Signed-off-by: Yann E. MORIN +--- + target/sh4/cpu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c +index 951eb6b9c8..f0934b20fa 100644 +--- a/target/sh4/cpu.c ++++ b/target/sh4/cpu.c +@@ -47,7 +47,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, + SuperHCPU *cpu = SUPERH_CPU(cs); + + cpu->env.pc = tb_pc(tb); +- cpu->env.flags = tb->flags; ++ cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK; + } + + static void superh_restore_state_to_opc(CPUState *cs, +-- +2.25.1 + diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 06d090bd1d..e671e1d184 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 a0634e536bded57cf38ec8a751adb124b89c776fe0846f21ab6c6728f1cbbbe6 qemu-7.1.0.tar.xz +sha256 5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157 qemu-7.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index be84452862..8725e7c8c4 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 7.1.0 +QEMU_VERSION = 7.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c @@ -69,7 +69,7 @@ QEMU_OPTS += --enable-vhost-user endif ifeq ($(BR2_PACKAGE_QEMU_SLIRP),y) -QEMU_OPTS += --enable-slirp=system +QEMU_OPTS += --enable-slirp QEMU_DEPENDENCIES += slirp else QEMU_OPTS += --disable-slirp @@ -258,6 +258,7 @@ HOST_QEMU_DEPENDENCIES = \ host-pixman \ host-pkgconf \ host-python3 \ + host-slirp \ host-zlib # BR ARCH qemu @@ -402,6 +403,7 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-vnc-jpeg \ --disable-png \ --disable-vnc-sasl \ + --enable-slirp \ --enable-tools \ $(HOST_QEMU_OPTS) endef From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:01 -0000 Subject: [Buildroot] [git commit branch/next] package/python-orjson: bump to version 3.8.3 Message-ID: <20230220205208.7716C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=681ef0b18c27815b85a2ad4b43c02dede8af06bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-orjson/python-orjson.hash | 2 +- package/python-orjson/python-orjson.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-orjson/python-orjson.hash b/package/python-orjson/python-orjson.hash index 8563ed544f..515590795b 100644 --- a/package/python-orjson/python-orjson.hash +++ b/package/python-orjson/python-orjson.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 dc06889b0ce52d5e96253573f6cbdf5939c5902022cbe2538cedc622e9378372 orjson-3.8.2.tar.gz +sha256 0c8d161dfd8b9e4133beabd81e3e1473c246efe55abec571845f72a2ba7b74e4 orjson-3.8.3.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/python-orjson/python-orjson.mk b/package/python-orjson/python-orjson.mk index b18a5cdada..bda0a8ab48 100644 --- a/package/python-orjson/python-orjson.mk +++ b/package/python-orjson/python-orjson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ORJSON_VERSION = 3.8.2 +PYTHON_ORJSON_VERSION = 3.8.3 PYTHON_ORJSON_SOURCE = orjson-$(PYTHON_ORJSON_VERSION).tar.gz -PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/13/08/d476fff015ccc0f043d3df6332c807695ae3d6abc1758b24f3d335750550 +PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/1c/b9/a0b4fb195ded02820e0a933ffe28b782b7e5ef7a4f8c1e1c742d619548e4 PYTHON_ORJSON_SETUP_TYPE = pep517 PYTHON_ORJSON_LICENSE = Apache-2.0 or MIT PYTHON_ORJSON_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:02 -0000 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.0 Message-ID: <20230220205208.6A651828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4a1183d8f7d8422dbc23432248b984745a428b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Removed xmvc support due to upstream removal: https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=22.3&id=8cc766d8f7eac26b7c029a2fac1bdfdba4776c29 Removed comment concerning gallium-xlib due to upstream removal: https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=22.3&id=5bed3d4ad659c30cb0ef4b40172f1aab877ccc98 Rebased patch 0004 due to upstream commit: https://cgit.freedesktop.org/mesa/mesa/commit/src/util/macros.h?h=22.3&id=c0b891ecca2b92c9ef2945440c77f45345df3290 Please note that patch 0004 can be removed when buildroot toolchains are updated to uClibc 1.0.42: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?h=v1.0.42&id=03fbd941e943976bb92cb392882c2ff7ec218704 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ++++++ package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/0004-Fix-uClibc-build.patch | 4 ++-- package/mesa3d/Config.in | 18 ------------------ package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 10 +--------- 6 files changed, 13 insertions(+), 33 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index cb0176a31c..9136ccd0e0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_MESA3D_XVMC + bool "mesa Gallium XvMC state tracker removed" + select BR2_LEGACY + help + The Gallium XvMC state tracker was removed upstream. + config BR2_KERNEL_HEADERS_5_19 bool "kernel headers version 5.19.x are no longer supported" select BR2_LEGACY diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 3712c79db0..d33d492ba7 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 = 22.2.2 +MESA3D_HEADERS_VERSION = 22.3.0 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/0004-Fix-uClibc-build.patch b/package/mesa3d/0004-Fix-uClibc-build.patch index c8c82fe0dc..95ca95fd67 100644 --- a/package/mesa3d/0004-Fix-uClibc-build.patch +++ b/package/mesa3d/0004-Fix-uClibc-build.patch @@ -58,9 +58,9 @@ index 22b18303826..8f73ee72693 100644 --- a/src/util/macros.h +++ b/src/util/macros.h @@ -27,6 +27,7 @@ - #include - #include + #include #include + #include +#include "util/compiler.h" /* Compute the size of an array */ diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 40f7009492..cae2161aa3 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -299,24 +299,6 @@ comment "Gallium VDPAU state tracker needs X.org and gallium drivers r300, r600, || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \ || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) -config BR2_PACKAGE_MESA3D_XVMC - bool "Gallium XvMC state tracker" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ - || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 - select BR2_PACKAGE_MESA3D_NEEDS_X11 - select BR2_PACKAGE_XLIB_LIBXV - select BR2_PACKAGE_XLIB_LIBXVMC - help - XvMC state tracker (needs r600 or nouveau gallium drivers). - -comment "Gallium XvMC state tracker needs X.org and gallium drivers r600 or nouveau" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_PACKAGE_XORG7 || \ - !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ - || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) - comment "Vulkan drivers" config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index f10f8fe112..77223676ea 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-October/000689.html -sha256 2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9 mesa-22.2.2.tar.xz -sha512 a1eb67e1ae4880c79b1fdc570f4389baba0b8ba796da7e695c9af19a7d92b6c06b95570e6c796548b61355989025fb7efbf9acac74cbd695f7e297dc913b933c mesa-22.2.2.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-November/000695.html +sha256 644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746 mesa-22.3.0.tar.xz +sha512 bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da mesa-22.3.0.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index bac071ecb3..c3bd44c2fa 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 = 22.2.2 +MESA3D_VERSION = 22.3.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos @@ -77,7 +77,6 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # glx: # dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi # xlib : xlib conflicts with any dri driver -# gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. # Always enable glx-direct; without it, many GLX applications don't work. MESA3D_CONF_OPTS += \ -Dglx=dri \ @@ -212,13 +211,6 @@ else MESA3D_CONF_OPTS += -Dgles1=disabled -Dgles2=disabled endif -ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) -MESA3D_DEPENDENCIES += xlib_libXv xlib_libXvMC -MESA3D_CONF_OPTS += -Dgallium-xvmc=enabled -else -MESA3D_CONF_OPTS += -Dgallium-xvmc=disabled -endif - ifeq ($(BR2_PACKAGE_VALGRIND),y) MESA3D_CONF_OPTS += -Dvalgrind=enabled MESA3D_DEPENDENCIES += valgrind From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:29 -0000 Subject: [Buildroot] [git commit branch/next] package/python-scipy: fix sh4 build Message-ID: <20230220205155.62B6E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bdc9f8a247309f1bf007a77576480091d20e2d1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following sh4 build failure raised since the addition of the package in commit e10431db29e08c3ae56c145165bf110bd17f2a6c: INFO: sh4aeb-linux-gcc: scipy/special/_test_round.c scipy/special/_test_round.c: In function '__pyx_pf_5scipy_7special_11_test_round_have_fenv': scipy/special/_test_round.c:2353:30: error: 'FE_UPWARD' undeclared (first use in this function) 2353 | __pyx_t_1 = ((fesetround(FE_UPWARD) != 0) != 0); | ^~~~~~~~~ Retrieve debian patch as upstream doesn't want to fix this SH4 specific issue: https://github.com/scipy/scipy/issues/15584 Fixes: - http://autobuild.buildroot.org/results/b82d8ed02ba5d094a0d4054e0de28e95c9d3554d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-scipy/0001-build-sh4-FE.patch | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/python-scipy/0001-build-sh4-FE.patch b/package/python-scipy/0001-build-sh4-FE.patch new file mode 100644 index 0000000000..d50dd84462 --- /dev/null +++ b/package/python-scipy/0001-build-sh4-FE.patch @@ -0,0 +1,36 @@ +From aae8b63ddffe014e9353c3e8d2604628433eb7d7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 4 Dec 2022 14:14:21 +0100 +Subject: [PATCH] build sh4 FE + +ensures FE_UPWARD and FE_DOWNWARD are defined for sh4 architecture. + +Closes: #1007769. + +[Retrieved from: +https://salsa.debian.org/python-team/packages/scipy/-/blob/master/debian/patches/build_sh4_FE.patch] +Signed-off-by: Fabrice Fontaine +--- + scipy/special/_round.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/scipy/special/_round.h b/scipy/special/_round.h +index 013a25620..c321a1939 100644 +--- a/scipy/special/_round.h ++++ b/scipy/special/_round.h +@@ -69,5 +69,12 @@ int fegetround() + + #endif + ++/* SH4 is not C99 compliant, see https://github.com/scipy/scipy/issues/15584 */ ++#ifndef FE_UPWARD ++#define FE_UPWARD -1 ++#endif ++#ifndef FE_DOWNWARD ++#define FE_DOWNWARD -1 ++#endif + + #endif /* _round.h */ +-- +2.38.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:53:29 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:29 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXrender: bump version to 0.9.11 Message-ID: <20230220205158.350BD86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c93b50a34a3f46c27fd21c72332c7fde18e0a3f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003239.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXrender/xlib_libXrender.hash | 6 +++--- package/x11r7/xlib_libXrender/xlib_libXrender.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.hash b/package/x11r7/xlib_libXrender/xlib_libXrender.hash index 680c765237..015fa0af21 100644 --- a/package/x11r7/xlib_libXrender/xlib_libXrender.hash +++ b/package/x11r7/xlib_libXrender/xlib_libXrender.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002725.html -sha256 c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949 libXrender-0.9.10.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-October/003239.html +sha256 bc53759a3a83d1ff702fb59641b3d2f7c56e05051fa0cfa93501166fa782dc24 libXrender-0.9.11.tar.xz +sha512 2327cc1b530382d81df29b8d579f801f1f990202107cc84506986bcf5d15010d414e9418987b200e3f222d188afce46f0d7754febcdca62a5fc1e541b3bb82de libXrender-0.9.11.tar.xz # Locally calculated sha256 bbe1db89c48816c48248796adac91defd8fbde1141b145f01511781ab87f29a1 COPYING diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk index 0ef0ec48d9..fd97c83cf6 100644 --- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk +++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXRENDER_VERSION = 0.9.10 -XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2 -XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXRENDER_VERSION = 0.9.11 +XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.xz +XLIB_LIBXRENDER_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXRENDER_LICENSE = MIT XLIB_LIBXRENDER_LICENSE_FILES = COPYING XLIB_LIBXRENDER_CPE_ID_VENDOR = x.org From yann.morin.1998 at free.fr Mon Feb 20 20:53:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:30 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Jesse for the qt6 package Message-ID: <20230220205155.92A96828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34c7b86224556822ce1003b639f98bf87d7496b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 8bcce1fd37..4f862befb0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1468,7 +1468,7 @@ F: package/x11r7/xdriver_xf86-video-imx/ F: package/x11r7/xdriver_xf86-video-imx-viv/ N: Jesse Van Gavere -F: package/qt6/qt6serialport/ +F: package/qt6/ N: Jianhui Zhao F: package/libuhttpd/ From yann.morin.1998 at free.fr Mon Feb 20 20:53:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:30 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xcb-util-cursor: bump version to 0.1.4 Message-ID: <20230220205158.7A11186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6111bac9e5d2f1cea5db127ad59f2379f86b90fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003230.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xcb-util-cursor/xcb-util-cursor.hash | 5 +++-- package/x11r7/xcb-util-cursor/xcb-util-cursor.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash b/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash index 14cea17138..ca316d3ce8 100644 --- a/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash +++ b/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-May/002691.html -sha1 26562eb6d4151307f7b6a53453d360ecfc0563ac xcb-util-cursor-0.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003230.html +sha256 28dcfe90bcab7b3561abe0dd58eb6832aa9cc77cfe42fcdfa4ebe20d605231fb xcb-util-cursor-0.1.4.tar.xz +sha512 d27dd59a4d7ded9994dca77774421dd9533e3ee823b880af35d3219bd7340c89fbc61d1d0fa10e2991de2cac9e6395e09497769d7b8728eedc691e76649107b1 xcb-util-cursor-0.1.4.tar.xz # Locally computed sha256 0dde91ae1d443105dc9e13cbaed6674c36683b7095836ad9ddfce26be270aad5 COPYING diff --git a/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk b/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk index 07b37c5e47..0fb131693b 100644 --- a/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk +++ b/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_CURSOR_VERSION = 0.1.3 -XCB_UTIL_CURSOR_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_CURSOR_SOURCE = xcb-util-cursor-$(XCB_UTIL_CURSOR_VERSION).tar.bz2 +XCB_UTIL_CURSOR_VERSION = 0.1.4 +XCB_UTIL_CURSOR_SITE = https://xorg.freedesktop.org/archive/individual/lib +XCB_UTIL_CURSOR_SOURCE = xcb-util-cursor-$(XCB_UTIL_CURSOR_VERSION).tar.xz XCB_UTIL_CURSOR_LICENSE = MIT XCB_UTIL_CURSOR_LICENSE_FILES = COPYING XCB_UTIL_CURSOR_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:53:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:31 -0000 Subject: [Buildroot] [git commit branch/next] package/python3: fix CVE-2022-37454 Message-ID: <20230220205155.407C08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92d96e8513c75a8ab496c90841920e896085915f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The Keccak XKCP SHA-3 reference implementation before fdc6fef has an integer overflow and resultant buffer overflow that allows attackers to execute arbitrary code or eliminate expected cryptographic properties. This occurs in the sponge function interface. Python 3.11 and later switched to using tiny_sha3 in GH-32060, so they should not be affected. https://github.com/python/cpython/issues/98517 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...8517-Fix-buffer-overflows-in-_sha3-module.patch | 101 +++++++++++++++++++++ package/python3/python3.mk | 3 + 2 files changed, 104 insertions(+) diff --git a/package/python3/0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch b/package/python3/0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch new file mode 100644 index 0000000000..5c50dd16cb --- /dev/null +++ b/package/python3/0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch @@ -0,0 +1,101 @@ +From 0e4e058602d93b88256ff90bbef501ba20be9dd3 Mon Sep 17 00:00:00 2001 +From: Theo Buehler +Date: Fri, 21 Oct 2022 21:26:01 +0200 +Subject: [PATCH] [3.10] gh-98517: Fix buffer overflows in _sha3 module + (#98519) + +This is a port of the applicable part of XKCP's fix [1] for +CVE-2022-37454 and avoids the segmentation fault and the infinite +loop in the test cases published in [2]. + +[1]: https://github.com/XKCP/XKCP/commit/fdc6fef075f4e81d6b1bc38364248975e08e340a +[2]: https://mouha.be/sha-3-buffer-overflow/ + +Regression test added by: Gregory P. Smith [Google LLC] + +[Retrieved from: +https://github.com/python/cpython/commit/0e4e058602d93b88256ff90bbef501ba20be9dd3] +Signed-off-by: Fabrice Fontaine +--- + Lib/test/test_hashlib.py | 9 +++++++++ + .../2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst | 1 + + Modules/_sha3/kcp/KeccakSponge.inc | 15 ++++++++------- + 3 files changed, 18 insertions(+), 7 deletions(-) + create mode 100644 Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst + +diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py +index 535f4aa3e04c..9aa6c1f0a3b6 100644 +--- a/Lib/test/test_hashlib.py ++++ b/Lib/test/test_hashlib.py +@@ -495,6 +495,15 @@ def test_case_md5_huge(self, size): + def test_case_md5_uintmax(self, size): + self.check('md5', b'A'*size, '28138d306ff1b8281f1a9067e1a1a2b3') + ++ @unittest.skipIf(sys.maxsize < _4G - 1, 'test cannot run on 32-bit systems') ++ @bigmemtest(size=_4G - 1, memuse=1, dry_run=False) ++ def test_sha3_update_overflow(self, size): ++ """Regression test for gh-98517 CVE-2022-37454.""" ++ h = hashlib.sha3_224() ++ h.update(b'\x01') ++ h.update(b'\x01'*0xffff_ffff) ++ self.assertEqual(h.hexdigest(), '80762e8ce6700f114fec0f621fd97c4b9c00147fa052215294cceeed') ++ + # use the three examples from Federal Information Processing Standards + # Publication 180-1, Secure Hash Standard, 1995 April 17 + # http://www.itl.nist.gov/div897/pubs/fip180-1.htm +diff --git a/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst b/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst +new file mode 100644 +index 000000000000..2d23a6ad93c7 +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst +@@ -0,0 +1 @@ ++Port XKCP's fix for the buffer overflows in SHA-3 (CVE-2022-37454). +diff --git a/Modules/_sha3/kcp/KeccakSponge.inc b/Modules/_sha3/kcp/KeccakSponge.inc +index e10739deafa8..cf92e4db4d36 100644 +--- a/Modules/_sha3/kcp/KeccakSponge.inc ++++ b/Modules/_sha3/kcp/KeccakSponge.inc +@@ -171,7 +171,7 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat + i = 0; + curData = data; + while(i < dataByteLen) { +- if ((instance->byteIOIndex == 0) && (dataByteLen >= (i + rateInBytes))) { ++ if ((instance->byteIOIndex == 0) && (dataByteLen-i >= rateInBytes)) { + #ifdef SnP_FastLoop_Absorb + /* processing full blocks first */ + +@@ -199,10 +199,10 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat + } + else { + /* normal lane: using the message queue */ +- +- partialBlock = (unsigned int)(dataByteLen - i); +- if (partialBlock+instance->byteIOIndex > rateInBytes) ++ if (dataByteLen-i > rateInBytes-instance->byteIOIndex) + partialBlock = rateInBytes-instance->byteIOIndex; ++ else ++ partialBlock = (unsigned int)(dataByteLen - i); + #ifdef KeccakReference + displayBytes(1, "Block to be absorbed (part)", curData, partialBlock); + #endif +@@ -281,7 +281,7 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte + i = 0; + curData = data; + while(i < dataByteLen) { +- if ((instance->byteIOIndex == rateInBytes) && (dataByteLen >= (i + rateInBytes))) { ++ if ((instance->byteIOIndex == rateInBytes) && (dataByteLen-i >= rateInBytes)) { + for(j=dataByteLen-i; j>=rateInBytes; j-=rateInBytes) { + SnP_Permute(instance->state); + SnP_ExtractBytes(instance->state, curData, 0, rateInBytes); +@@ -299,9 +299,10 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte + SnP_Permute(instance->state); + instance->byteIOIndex = 0; + } +- partialBlock = (unsigned int)(dataByteLen - i); +- if (partialBlock+instance->byteIOIndex > rateInBytes) ++ if (dataByteLen-i > rateInBytes-instance->byteIOIndex) + partialBlock = rateInBytes-instance->byteIOIndex; ++ else ++ partialBlock = (unsigned int)(dataByteLen - i); + i += partialBlock; + + SnP_ExtractBytes(instance->state, curData, instance->byteIOIndex, partialBlock); diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 2e17104102..b291fcf582 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -16,6 +16,9 @@ PYTHON3_CPE_ID_PRODUCT = python # 0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch PYTHON3_IGNORE_CVES += CVE-2022-45061 +# 0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch +PYTHON3_IGNORE_CVES += CVE-2022-37454 + # This host Python is installed in $(HOST_DIR), as it is needed when # cross-compiling third-party Python modules. From yann.morin.1998 at free.fr Mon Feb 20 20:53:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:31 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xgc: bump version to 1.0.6 Message-ID: <20230220205158.A738586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef8faec32df85cf6172a9e26f68d6c6f704265e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003221.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xgc/xapp_xgc.hash | 5 +++-- package/x11r7/xapp_xgc/xapp_xgc.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xgc/xapp_xgc.hash b/package/x11r7/xapp_xgc/xapp_xgc.hash index 50e1362b64..7664e31186 100644 --- a/package/x11r7/xapp_xgc/xapp_xgc.hash +++ b/package/x11r7/xapp_xgc/xapp_xgc.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002575.html -sha256 14828d9bda358ad57efc0206bc416ee33ba542091edb186485cca5389adc2f5e xgc-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003221.html +sha256 7b87bbdbce4ec858738a3b81b8a3943aff01036001e2a1d00bb5384392a8b240 xgc-1.0.6.tar.xz +sha512 f449b9b2d313aeba1fe9bf33fef90291776403f1fdf4afc507c4b973045c97fc8ded65ddec4f8c58727e7e4c7c4ad6a65ae79581eb4bdfe9c79a5f909dbc0a1f xgc-1.0.6.tar.xz # Locally computed sha256 13ebeb3e59e406064d46e94a707ed5ec5d8d2bf840971265dd46db0850d22d02 COPYING diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk index 41d42c461e..fc055f57dd 100644 --- a/package/x11r7/xapp_xgc/xapp_xgc.mk +++ b/package/x11r7/xapp_xgc/xapp_xgc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XGC_VERSION = 1.0.5 -XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.bz2 -XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XGC_VERSION = 1.0.6 +XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.xz +XAPP_XGC_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XGC_LICENSE = MIT XAPP_XGC_LICENSE_FILES = COPYING XAPP_XGC_DEPENDENCIES = xlib_libXaw From yann.morin.1998 at free.fr Mon Feb 20 20:53:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:32 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xkbprint: bump version to 1.0.6 Message-ID: <20230220205158.9C52686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd1c370ad7567fc38732d28cb52d66bc5dbb22fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003222.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xkbprint/xapp_xkbprint.hash | 8 +++----- package/x11r7/xapp_xkbprint/xapp_xkbprint.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash b/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash index 69a80576c4..8ca7656b5c 100644 --- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash +++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-November/003030.html -md5 9c34da77363dc3d0f616980da87244bf xkbprint-1.0.5.tar.bz2 -sha1 e707caffb3c680b3a869a776aa3f80caeac9e9c3 xkbprint-1.0.5.tar.bz2 -sha256 5b58fe834f0822f06d63d283fac404098c6d3f6acce61888b81016f1c41023fa xkbprint-1.0.5.tar.bz2 -sha512 ac3870352f3a595b5b8a8cb64f39e9bea81b17572c73cfbf72482477a2f576d0ffcdcf735cb3c66b8a88a7fe0f7aece6738cbac87df5641e44fae1ab9b97111f xkbprint-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003222.html +sha256 99cc9404f7b90289ae04944c0d98a208cc8b158492ad6481386e31d4d09aa7b0 xkbprint-1.0.6.tar.xz +sha512 a1c2401b2a2ef4c6bd2efc18923ecb176adcf38b6c5dfdce25f22f1f5ab21e25f494b25dac25b1765fb9a0f6acc24d191cd41b9a098a9e3c6eaf9a9df490be29 xkbprint-1.0.6.tar.xz # Locally computed sha256 79b32f28f7f5063054a564e1fdeee56f82a525b6516303704a1f70e55fe7197e COPYING diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk index 8643cb4276..f374c18dae 100644 --- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk +++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XKBPRINT_VERSION = 1.0.5 -XAPP_XKBPRINT_SOURCE = xkbprint-$(XAPP_XKBPRINT_VERSION).tar.bz2 -XAPP_XKBPRINT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XKBPRINT_VERSION = 1.0.6 +XAPP_XKBPRINT_SOURCE = xkbprint-$(XAPP_XKBPRINT_VERSION).tar.xz +XAPP_XKBPRINT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XKBPRINT_LICENSE = MIT XAPP_XKBPRINT_LICENSE_FILES = COPYING XAPP_XKBPRINT_DEPENDENCIES = xlib_libxkbfile From yann.morin.1998 at free.fr Mon Feb 20 20:53:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:32 -0000 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: fix license Message-ID: <20230220205155.751158648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d37b3f384c3c783dfdd786062847f621e52b069b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 343974b99528702842e8c1dad945fcd4f0defd6c forgot to change the licensing information which has been updated with https://code.qt.io/cgit/qt/qtbase.git/commit/?id=05fc3aef53348fb58be6308076e000825b704e58 resulting in the following build failure: ERROR: LICENSE.GPL2 has wrong sha256 hash: ERROR: expected: 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 ERROR: got : Fixes: - http://autobuild.buildroot.org/results/bf20b7457349f1bb7a82d471ad2c9e4307ac540c Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: - one-item per line, both for _LICENSE and _LICENSE_FILES - fix check-package ] Signed-off-by: Yann E. MORIN --- package/qt6/qt6base/qt6base.hash | 14 +++++++++----- package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++-- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 5dd26973fa..6544a371c6 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -2,8 +2,12 @@ sha256 cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d qtbase-everywhere-src-6.4.0.tar.xz # Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSE.FDL +sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 3abd6471b9a9a08d65ce771143f8e278bb4c1aeb10c1c2d476935a6b049653f5 LICENSES/BSL-1.0.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 d040359701c01996a017d5c515678929cd1b0625e64cb86db44025fbb6cdf1fc LICENSES/MIT.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index b7ee6037f3..2f159f380b 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -7,8 +7,27 @@ QT6BASE_VERSION = $(QT6_VERSION) QT6BASE_SITE = $(QT6_SITE) QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz -QT6BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) -QT6BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL + +QT6BASE_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0 with exception (tools), \ + GFDL-1.3 (docs), \ + Apache-2.0, \ + BSD-3-Clause, \ + BSL-1.0, \ + MIT + +QT6BASE_LICENSE_FILES = \ + LICENSES/Apache-2.0.txt \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/BSL-1.0.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/MIT.txt \ + LICENSES/Qt-GPL-exception-1.0.txt + QT6BASE_DEPENDENCIES = \ host-ninja \ host-qt6base \ From yann.morin.1998 at free.fr Mon Feb 20 20:53:33 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:33 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xditview: bump version to 1.0.6 Message-ID: <20230220205158.B283886496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f18b8dcb4e622f973d73332732d3dd6f548d3a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003220.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xditview/xapp_xditview.hash | 8 +++----- package/x11r7/xapp_xditview/xapp_xditview.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xditview/xapp_xditview.hash b/package/x11r7/xapp_xditview/xapp_xditview.hash index 4586c0b5a4..dbaf5e42b7 100644 --- a/package/x11r7/xapp_xditview/xapp_xditview.hash +++ b/package/x11r7/xapp_xditview/xapp_xditview.hash @@ -1,7 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002570.html -md5 3a909116a3b2abe3845215cf49e09fa5 xditview-1.0.5.tar.bz2 -sha1 f06f65bca31168c86bcebd7f92dbbda08817a5cc xditview-1.0.5.tar.bz2 -sha256 eecb1ed51ab4edc7f454476d1248cfb7799a17c5679b3dd834e8b4658331c04b xditview-1.0.5.tar.bz2 -sha512 e20c903f38394b496111267e142d84d11e69a3b89f91869652d1f2ee5c997a13f90bfa2966651b42cd3979a330b348a6e397cc6a74c45b1f3f91643e7c06765d xditview-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003220.html +sha256 517700df205d4fdf65db182698157c959f1e7c10597670a7f45b1fcb2319819f xditview-1.0.6.tar.xz +sha512 249769d27980e9a69ac8f056f329dfa514f3ab6267d6ed69814c5695f315d2a7021c560a0e26fdd2568290a071793d7f2eafdd92f9981ed556047deb244ebf5a xditview-1.0.6.tar.xz # Locally computed sha256 023d879308a49249181f78bbb567e93c45138ad847fe969d191e4802e7a1a005 COPYING diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk index 388710034c..8655bd3e92 100644 --- a/package/x11r7/xapp_xditview/xapp_xditview.mk +++ b/package/x11r7/xapp_xditview/xapp_xditview.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDITVIEW_VERSION = 1.0.5 -XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.bz2 -XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDITVIEW_VERSION = 1.0.6 +XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.xz +XAPP_XDITVIEW_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDITVIEW_LICENSE = MIT XAPP_XDITVIEW_LICENSE_FILES = COPYING XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw From peter at korsgaard.com Mon Feb 20 20:53:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:33 -0000 Subject: [Buildroot] [git commit branch/next] utils/genrandconfig: add mxs-bootlets board handling Message-ID: <20230220205155.9CCD58648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c1f67428af623b39312270a490dfc9a6d647773 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add a custom case to make sure that a random configuration with an empty board for mxs-bootlets doesn't fail. It reverts to BR2_TARGET_MXS_BOOTLETS_STMP37xx in that case. >>> mxs-bootlets 10.12.01 Building BOARD= CROSS_COMPILE="/home/thomas/autobuild/instance-1/output-1/per-package/mxs-bootlets/host/bin/arm-buildroot-linux-uclibcgnueabi-" /usr/bin/make -j1 -C /home/thomas/autobuild/instance-1/output-1/build/mxs-bootlets-10.12.01 power_prep /home/thomas/autobuild/instance-1/output-1/per-package/xinetd/host/bin/arm-buildroot-linux-uclibcgnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -static -DNO_RPC -I../../include -c -o inet_aton.o inet_aton.c make[1]: Entering directory '/home/thomas/autobuild/instance-1/buildroot' make[1]: warning: -j1 forced in submake: resetting jobserver mode. build power_prep /usr/bin/make -C power_prep ARCH= BOARD= make[2]: Entering directory '/home/thomas/autobuild/instance-1/output-1/build/mxs-bootlets-10.12.01/power_prep' /usr/bin/make -C ./../mach-/hw make[3]: Entering directory '/home/thomas/autobuild/instance-1/output-1/build/mxs-bootlets-10.12.01/power_prep' make[3]: *** ../mach-/hw: No such file or directory. Stop. Fixes: - http://autobuild.buildroot.org/results/44a2efc64b9b8ff4541430d6b649e7a11a4e4873 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index eccd3a228e..b4ebb9a9be 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -559,6 +559,13 @@ def fixup_config(sysinfo, configfile): if 'BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT=y\n' in configlines: return False + if 'BR2_TARGET_MXS_BOOTLETS=y\n' in configlines and \ + 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD=y\n' in configlines and \ + 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD_NAME=""\n' in configlines: + configlines.remove('BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD=y\n') + configlines.append('BR2_TARGET_MXS_BOOTLETS_STMP37xx=y\n') + configlines.remove('BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD_NAME=""\n') + if 'BR2_TARGET_MXS_BOOTLETS=y\n' in configlines and \ 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT=y\n' in configlines and \ 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_URL=""\n' in configlines: From yann.morin.1998 at free.fr Mon Feb 20 20:53:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:34 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-input-vmmouse: bump version to 13.2.0 Message-ID: <20230220205158.D28EC86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e17f3076021efbd9ed699d78dc252aa0bf629922 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003217.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash | 5 +++-- .../x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash index fd6221fa23..2a221a4c12 100644 --- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash +++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-June/002616.html -sha256 0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319 xf86-input-vmmouse-13.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003217.html +sha256 56f077580ab8f02e2f40358c5c46b0ae3e1828fc77744526b24adf1ceea339b8 xf86-input-vmmouse-13.2.0.tar.xz +sha512 26a01347a679db058abdc7cbd9a363bb4fccd1a727dc18e279d15b8a0dce71f67af5ff54df28b908391da8d2fc311d8c1813f26dcded4e9a2668db7b55ca5687 xf86-input-vmmouse-13.2.0.tar.xz # Locally calculated sha256 804737a1582428fdde4e2bfd1e9f3ca07971fc3bdce20ba2d06cc2bba6c84a9e COPYING diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk index b8c77de5f6..178e1344b2 100644 --- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk +++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 13.1.0 -XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 13.2.0 +XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.xz +XDRIVER_XF86_INPUT_VMMOUSE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_VMMOUSE_LICENSE = MIT XDRIVER_XF86_INPUT_VMMOUSE_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xorgproto From peter at korsgaard.com Mon Feb 20 20:53:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:34 -0000 Subject: [Buildroot] [git commit branch/next] docs/website/news.html: add 2022.11 announcement link Message-ID: <20230220205155.CB1F18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=45c6747faed26a92b142b19a00062032c5c0f542 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 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 9be00982cb..8f7e22a0b9 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

          The stable 2022.11 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.11 release.

          From yann.morin.1998 at free.fr Mon Feb 20 20:53:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:48 -0000 Subject: [Buildroot] [git commit branch/next] package/gqrx: fix dependencies Message-ID: <20230220205200.9E3C386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ec2adee4efb96787cf702f418d09b45cb686482 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 34cea39024bf8dedaa071bc5f2d903755501215c forgot to update gnuradio dependencies Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/gqrx/Config.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in index adcdbb0896..442b28e546 100644 --- a/package/gqrx/Config.in +++ b/package/gqrx/Config.in @@ -1,15 +1,16 @@ -comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library" +comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8" depends on BR2_USE_MMU # gnuradio depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || BR2_STATIC_LIBS + !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 comment "gqrx needs qt5" depends on !BR2_PACKAGE_QT5 -comment "gqrx needs a toolchain not affected by GCC bug 43744 and 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 || BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +comment "gqrx needs a toolchain not affected by GCC bug 43744" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 config BR2_PACKAGE_GQRX bool "gqrx" @@ -21,8 +22,8 @@ config BR2_PACKAGE_GQRX depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_QT5 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # gnuradio -> boost-atomic + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # gnuradio depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744 # gnuradio - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # gnuradio select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS select BR2_PACKAGE_BOOST_SYSTEM From yann.morin.1998 at free.fr Mon Feb 20 20:53:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:48 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xinit: bump version to 1.4.2 Message-ID: <20230220205157.2C1628648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f15b22fdd55611f0a1b64cb8a430df3c6385e11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003268.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xinit/xapp_xinit.hash | 8 +++----- package/x11r7/xapp_xinit/xapp_xinit.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xinit/xapp_xinit.hash b/package/x11r7/xapp_xinit/xapp_xinit.hash index 49c8099467..4b7d8feb5d 100644 --- a/package/x11r7/xapp_xinit/xapp_xinit.hash +++ b/package/x11r7/xapp_xinit/xapp_xinit.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002962.html -md5 6d506ab2efc17a08e87778654e099d37 xinit-1.4.1.tar.bz2 -sha1 d874a2eecf2c30291e327851b151fdab8183260c xinit-1.4.1.tar.bz2 -sha256 de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9 xinit-1.4.1.tar.bz2 -sha512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340 xinit-1.4.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003268.html +sha256 b7d8dc8d22ef9f15985a10b606ee4f2aad6828befa437359934647e88d331f23 xinit-1.4.2.tar.xz +sha512 4b62c2edd97b40133577cbba88b3f31b36c5634b4eb667ef0c302e8358dc1c55a255abe42aaadc910d8aa9ea0e3add157a12a301382f1cdbe091df4e1215fae0 xinit-1.4.2.tar.xz # Locally computed sha256 c47001aa217d4ae7787121d80634db4bdba564e49a0ecab8d48b1bdc4edee1c7 COPYING diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk index 86a4d92674..795a1b541b 100644 --- a/package/x11r7/xapp_xinit/xapp_xinit.mk +++ b/package/x11r7/xapp_xinit/xapp_xinit.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XINIT_VERSION = 1.4.1 -XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2 -XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XINIT_VERSION = 1.4.2 +XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.xz +XAPP_XINIT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11 XAPP_XINIT_LICENSE = MIT XAPP_XINIT_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:49 -0000 Subject: [Buildroot] [git commit branch/next] package/{, python-py}mupdf: bump to version 1.21.0 Message-ID: <20230220205200.93D5C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c2033cd2ace077e7dfaf58a2589b2a93a5fd7b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: squash the two bumps together] Signed-off-by: Yann E. MORIN --- package/mupdf/mupdf.hash | 4 ++-- package/mupdf/mupdf.mk | 2 +- package/python-pymupdf/python-pymupdf.hash | 4 ++-- package/python-pymupdf/python-pymupdf.mk | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mupdf/mupdf.hash b/package/mupdf/mupdf.hash index fa24e741c7..6785aa163a 100644 --- a/package/mupdf/mupdf.hash +++ b/package/mupdf/mupdf.hash @@ -1,8 +1,8 @@ # From https://mupdf.com/downloads/index.html: -sha1 f27108668e876b47d7438e2a8b2295654e66f42d mupdf-1.20.3-source.tar.lz +sha1 27d75cae256450abb9f50cd00b3e5a895fc684cf mupdf-1.21.0-source.tar.lz # Locally computed: -sha256 6f73f63ef8aa81991dfd023d4426a548827d1d74e0bfcf2a013acad63b651868 mupdf-1.20.3-source.tar.lz +sha256 f23fc1ad9081375d9c5f2318d6e6e5c5be490ecb70b10ed7167932afbe1ccfb5 mupdf-1.21.0-source.tar.lz # Hash for license files: sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 1fc54b2d35..e93a41bd00 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -5,7 +5,7 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -MUPDF_VERSION = 1.20.3 +MUPDF_VERSION = 1.21.0 MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.lz MUPDF_SITE = https://mupdf.com/downloads/archive MUPDF_LICENSE = AGPL-3.0+ diff --git a/package/python-pymupdf/python-pymupdf.hash b/package/python-pymupdf/python-pymupdf.hash index 21befb3b7c..d930d04335 100644 --- a/package/python-pymupdf/python-pymupdf.hash +++ b/package/python-pymupdf/python-pymupdf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymupdf/json -md5 450f0c613fec4b0d061299d3d935fafa PyMuPDF-1.20.2.tar.gz -sha256 02eedf01f57c6bafb5e8667cea0088a2d2522643c47100f1908bec3a68a84888 PyMuPDF-1.20.2.tar.gz +md5 ae24d77d44369e46bbcd5457fe97d776 PyMuPDF-1.21.0.tar.gz +sha256 a63dfc289e127a16ab60310ee6005fe83121c7a97f7c120db688f9281c9e5d0f PyMuPDF-1.21.0.tar.gz # Locally computed sha256 checksums sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index 238fc4dd47..38212dc44b 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -5,9 +5,9 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -PYTHON_PYMUPDF_VERSION = 1.20.2 +PYTHON_PYMUPDF_VERSION = 1.21.0 PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz -PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/4a/09/6afe87a8ea7acb6e4709223a704270ffe9929497add4d06b12305e229ba8 +PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/61/14/632eefe5568ee7a4ec95aa7fc9c63996ff6a6d2464d4e3a9dc35da11a409 PYTHON_PYMUPDF_SETUP_TYPE = setuptools PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:49 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xfd: bump version to 1.1.4 Message-ID: <20230220205157.4293B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e708680a43bdd4bc6cb5b84544a98bc27ccc8d55 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003266.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xfd/xapp_xfd.hash | 8 +++----- package/x11r7/xapp_xfd/xapp_xfd.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xfd/xapp_xfd.hash b/package/x11r7/xapp_xfd/xapp_xfd.hash index ec85170180..5965958828 100644 --- a/package/x11r7/xapp_xfd/xapp_xfd.hash +++ b/package/x11r7/xapp_xfd/xapp_xfd.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002968.html -md5 f9c9f2b101a96d4b50c2a4ab9b5ab5b1 xfd-1.1.3.tar.bz2 -sha1 ca6dbe2027b205992a52c6bb717a43508f12a8c4 xfd-1.1.3.tar.bz2 -sha256 192f938ba5830e84cc807d8ead2ad9655b43eaed6500c830f3e083aad10ed958 xfd-1.1.3.tar.bz2 -sha512 68e2d4ce5e24215353b6f3231191d69639c4dd90a703e03ccf152bbfe4012da071c387ba289f918fb0336a3be9ee49dc05cbec7273fa85f5e476ead7e10795f0 xfd-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003266.html +sha256 d5470ffb66fd45a1e1b03d6df01f12d4caf0cf675cde0345cda237243e9076fd xfd-1.1.4.tar.xz +sha512 fa1f8a7b5d89be20fb2b1e3e0e8f4d7f9463e91fd385d21e1403a398c2e263112043b568417c420c5ee33bec60e06658498dd55df6d7ac19da3af0844f932209 xfd-1.1.4.tar.xz # Locally computed sha256 57ae10f24fc110dafb3b8d7735cf26b1905ff74e716745b2520e4ccd7751095c COPYING diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk index 149e24b79a..1ef1d69db3 100644 --- a/package/x11r7/xapp_xfd/xapp_xfd.mk +++ b/package/x11r7/xapp_xfd/xapp_xfd.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XFD_VERSION = 1.1.3 -XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2 -XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XFD_VERSION = 1.1.4 +XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.xz +XAPP_XFD_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XFD_LICENSE = MIT XAPP_XFD_LICENSE_FILES = COPYING XAPP_XFD_DEPENDENCIES = \ From yann.morin.1998 at free.fr Mon Feb 20 20:54:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:52 -0000 Subject: [Buildroot] [git commit branch/next] package/python-multidict: bump to version 6.0.3 Message-ID: <20230220205202.85DA98648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff8b3b7413bceba91198376fa056ce0f90571616 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-multidict/python-multidict.hash | 4 ++-- package/python-multidict/python-multidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index 999c8867d0..eae60af37c 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 f8230905ad1f50c87e8d9cc6b0bb7ca2 multidict-6.0.2.tar.gz -sha256 5ff3bd75f38e4c43f1f470f2df7a4d430b821c4ce22be384e1459cb57d6bb013 multidict-6.0.2.tar.gz +md5 b5875cf0a0578956dcfffc123d8344ca multidict-6.0.3.tar.gz +sha256 2523a29006c034687eccd3ee70093a697129a3ffe8732535d3b2df6a4ecc279d multidict-6.0.3.tar.gz # Locally computed sha256 checksums sha256 06a240ea10ba868fda2de58df859886961df873aa74bbab1e0f13eaf99f92b7b LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index 1a9aec7ba7..bfffb84709 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 6.0.2 +PYTHON_MULTIDICT_VERSION = 6.0.3 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/fa/a7/71c253cdb8a1528802bac7503bf82fe674367e4055b09c28846fdfa4ab90 +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/b5/5b/1dd3b9cf73c474ea1d0f0b1f8b7b712b0f13817493fd93101256ec856b59 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:54:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:53 -0000 Subject: [Buildroot] [git commit branch/next] package/sqlite: bump version to 3.40.0 Message-ID: <20230220205209.CB1C286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a182f3a7edcaf771d350604abc132e157b47f7ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://sqlite.org/releaselog/3_40_0.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 936f42e8e9..ea4e30a463 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb sqlite-autoconf-3390400.tar.gz +sha256 0333552076d2700c75352256e91c78bf5cd62491589ba0c69aed0a81868980e7 sqlite-autoconf-3400000.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 4f4164c374..9d0b60ab59 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.39.4 -SQLITE_TAR_VERSION = 3390400 +SQLITE_VERSION = 3.40.0 +SQLITE_TAR_VERSION = 3400000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain From yann.morin.1998 at free.fr Mon Feb 20 20:54:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:53 -0000 Subject: [Buildroot] [git commit branch/next] package/python-packaging: bump to version 22.0 Message-ID: <20230220205202.A999B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85516a05b3bbe41793d431043ab505bb89786d1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate to flit package infrastructure. Drop python-parsing dependency. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-packaging/Config.in | 1 - package/python-packaging/python-packaging.hash | 4 ++-- package/python-packaging/python-packaging.mk | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/python-packaging/Config.in b/package/python-packaging/Config.in index 12170df84e..c09dfffe2c 100644 --- a/package/python-packaging/Config.in +++ b/package/python-packaging/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PACKAGING bool "python-packaging" - select BR2_PACKAGE_PYTHON_PYPARSING # runtime help Core utilities for Python packages. diff --git a/package/python-packaging/python-packaging.hash b/package/python-packaging/python-packaging.hash index 0f353a9e36..e10c11904b 100644 --- a/package/python-packaging/python-packaging.hash +++ b/package/python-packaging/python-packaging.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/packaging/json -md5 e713c1939f294fd729af4a7be40dd141 packaging-21.3.tar.gz -sha256 dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb packaging-21.3.tar.gz +md5 806414ea4c6f17b029a7911b622062e8 packaging-22.0.tar.gz +sha256 2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3 packaging-22.0.tar.gz # Locally computed sha256 checksums sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 LICENSE sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.APACHE diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 74b5803525..c9190ccfee 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -4,13 +4,13 @@ # ################################################################################ -PYTHON_PACKAGING_VERSION = 21.3 +PYTHON_PACKAGING_VERSION = 22.0 PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c -PYTHON_PACKAGING_SETUP_TYPE = setuptools +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/6b/f7/c240d7654ddd2d2f3f328d8468d4f1f876865f6b9038b146bec0a6737c65 +PYTHON_PACKAGING_SETUP_TYPE = flit PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD -HOST_PYTHON_PACKAGING_DEPENDENCIES = host-python-pyparsing +HOST_PYTHON_PACKAGING_SETUP_TYPE = flit-bootstrap $(eval $(python-package)) $(eval $(host-python-package)) From peter at korsgaard.com Mon Feb 20 20:54:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:54 -0000 Subject: [Buildroot] [git commit branch/next] package/tor: bump version to 0.4.7.12 Message-ID: <20230220205209.D771B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b8c1f832b88b10efac754bb3e011a2e929bb5a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://gitlab.torproject.org/tpo/core/tor/-/blob/main/ChangeLog?expanded=true&viewer=simple Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 4 ++-- package/tor/tor.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index dba08f51b5..2a2953dc29 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.7.10.tar.gz.sha256sum -sha256 647e56dfa59ea36dab052027fcfc7663905c826c03509363c456900ecd435a5b tor-0.4.7.10.tar.gz +# From https://dist.torproject.org/tor-0.4.7.12.tar.gz.sha256sum +sha256 3b5d969712c467851bd028f314343ef15a97ea457191e93ffa97310b05b9e395 tor-0.4.7.12.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index ed3714f2db..6812005618 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.7.10 +TOR_VERSION = 0.4.7.12 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:54 -0000 Subject: [Buildroot] [git commit branch/next] package/python-paramiko: bump to version 2.12.0 Message-ID: <20230220205202.B5BA686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=101272d1313827f655e247bab740783a7e6dee0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 f4142b5c33..b327a6b8a9 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 b01682efcd6943936702c497afdd0aed paramiko-2.11.0.tar.gz -sha256 003e6bee7c034c21fbb051bf83dc0a9ee4106204dd3c53054c71452cc4ec3938 paramiko-2.11.0.tar.gz +md5 3f49814473cc153a7189fec31cfacfab paramiko-2.12.0.tar.gz +sha256 376885c05c5d6aa6e1f4608aac2a6b5b0548b1add40274477324605903d9cd49 paramiko-2.12.0.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 a33e11c768..621176ed41 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.11.0 +PYTHON_PARAMIKO_VERSION = 2.12.0 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/1d/08/3b8d8f1b4ec212c17429c2f3ff55b7f2237a1ad0c954972e39c8f0ac394c +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/98/75/e78ddbe671a4a59514b59bc6a321263118e4ac3fe88175dd784d1a47a00f PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:54:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:55 -0000 Subject: [Buildroot] [git commit branch/next] nezha_defconfig: bump u-boot to current top of d1-wip Message-ID: <20230220205210.1550A86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=adc8355150e876b3301b35405d411fd1ea98dff0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is now based on U-Boot 2022.10 and has gained SPL support, so use that instead of sun20-d1-spl. With this we can also drop the u-boot patch and patch directory. Signed-off-by: Peter Korsgaard --- board/nezha/genimage.cfg | 26 ++--------- ...CK-Support-building-u-boot.toc1-for-nezda.patch | 54 ---------------------- configs/nezha_defconfig | 7 +-- 3 files changed, 6 insertions(+), 81 deletions(-) diff --git a/board/nezha/genimage.cfg b/board/nezha/genimage.cfg index 783391fb99..836666ff8e 100644 --- a/board/nezha/genimage.cfg +++ b/board/nezha/genimage.cfg @@ -4,34 +4,16 @@ image sdcard.img { hdimage { } - partition boot0-1 { - in-partition-table = "no" - image = "boot0_sdcard_sun20iw1p1.bin" + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" offset = 8K } - partition boot0-2 { - in-partition-table = "no" - image = "boot0_sdcard_sun20iw1p1.bin" - offset = 128K - } - - partition u-boot-1 { - in-partition-table = "no" - image = "u-boot.toc1" - offset = 12M - } - - partition u-boot-2 { - in-partition-table = "no" - image = "u-boot.toc1" - offset = 16400K - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext4" bootable = "true" - offset = 18M + offset = 1M } } diff --git a/board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch b/board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch deleted file mode 100644 index 6e89a921df..0000000000 --- a/board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 4a923e0e4ef6d2b41cb89d658e269adada847573 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Thu, 4 Nov 2021 22:32:04 +0100 -Subject: [PATCH] Makefile: HACK: Support building u-boot.toc1 for nezda board - -For easier integration into Buildroot. The boot0 / toc1 logic is WIP until -U-Boot gains SPL support for the D1, so add a hack to make it easier to -integrate in Buildroot as-is. - -Signed-off-by: Peter Korsgaard ---- - Makefile | 9 +++++++++ - nezha.cfg | 9 +++++++++ - 2 files changed, 18 insertions(+) - create mode 100644 nezha.cfg - -diff --git a/Makefile b/Makefile -index f911f70344..259d93bf80 100644 ---- a/Makefile -+++ b/Makefile -@@ -1084,6 +1084,15 @@ endif - .binman_stamp: FORCE - @touch $@ - -+fw_dynamic.bin: $(OPENSBI) -+ $(call if_changed,copy) -+ -+MKIMAGEFLAGS_u-boot.toc1 = -T sunxi_toc1 -+u-boot.toc1: nezha.cfg fw_dynamic.bin inputs -+ $(call if_changed,mkimage) -+ -+all: u-boot.toc1 -+ - ifeq ($(CONFIG_DEPRECATED),y) - $(warning "You have deprecated configuration options enabled in your .config! Please check your configuration.") - endif -diff --git a/nezha.cfg b/nezha.cfg -new file mode 100644 -index 0000000000..2d23b9b388 ---- /dev/null -+++ b/nezha.cfg -@@ -0,0 +1,9 @@ -+[opensbi] -+file = fw_dynamic.bin -+addr = 0x40000000 -+[dtb] -+file = arch/riscv/dts/sun20i-d1-nezha.dtb -+addr = 0x44000000 -+[u-boot] -+file = u-boot-nodtb.bin -+addr = 0x4a000000 --- -2.20.1 - diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 5d0948a013..02f351d483 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,5 +1,4 @@ BR2_riscv=y -BR2_GLOBAL_PATCH_DIR="board/nezha/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" @@ -20,18 +19,16 @@ BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,opensbi,e6793dc36a71537023f078034fe795c64a9992a3)/opensbi-e6793dc36a71537023f078034fe795c64a9992a3.tar.gz" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set -BR2_TARGET_SUN20I_D1_SPL=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,smaeul,u-boot,d1-2022-05-26)/uboot-d1-2022-05-26.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nezha" BR2_TARGET_UBOOT_NEEDS_DTC=y -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.toc1" +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y From yann.morin.1998 at free.fr Mon Feb 20 20:54:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:55 -0000 Subject: [Buildroot] [git commit branch/next] package/{python-}protobuf: bump to version 4.21.11 Message-ID: <20230220205202.E953B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e25c2ec47755a27fada8cffc2aa822402bb86b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 2 +- package/python-protobuf/python-protobuf.hash | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index 24dbc0f1a1..f1f5fa77cd 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 f6251f2d00aad41b34c1dfa3d752713cb1bb1b7020108168a4deaa206ba8ed42 protobuf-cpp-3.21.8.tar.gz +sha256 96f0ab99b7414e44e7bf9b218bb59510d61549ca68e648f19e3622f9999bec00 protobuf-cpp-3.21.11.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 88f359f24c..33a7c40f40 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,7 +7,7 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works and to update its hash, # as they share the same version/site variables. -PROTOBUF_VERSION = 21.8 +PROTOBUF_VERSION = 21.11 PROTOBUF_SOURCE = protobuf-cpp-3.$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index a12c199663..c2afc3955a 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d81ebc20030fe8d03bceb38f06aba2797c40852e5aab6819481ce808fb305fae protobuf-python-4.21.8.tar.gz +sha256 ae4ca6e1da635f31019d8911923163f372d9d333e8857510f513acba33172d0c protobuf-python-4.21.11.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE From peter at korsgaard.com Mon Feb 20 20:54:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:56 -0000 Subject: [Buildroot] [git commit branch/next] boot/sun20i-d1-spl: drop package Message-ID: <20230220205210.3702A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a3a7169d66b610c968128688b6475ffc333cc96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next U-Boot has now gained SPL support for D1, so this temporary bootloader is no longer supported. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ DEVELOPERS | 1 - boot/Config.in | 1 - boot/sun20i-d1-spl/Config.in | 8 -------- boot/sun20i-d1-spl/sun20i-d1-spl.hash | 2 -- boot/sun20i-d1-spl/sun20i-d1-spl.mk | 23 ----------------------- 6 files changed, 7 insertions(+), 35 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 28c6822689..852189f0ff 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_TARGET_SUN20I_D1_SPL + bool "sun20-d1-spl removed" + select BR2_LEGACY + help + U-Boot has gained SPL support for D1, so this temporary + bootloader is no longer supported. + config BR2_PACKAGE_PYTHON_M2R bool "python-m2r removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f0dcc42de7..831e60982e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2305,7 +2305,6 @@ F: board/pandaboard/ F: board/roseapplepi/ F: board/visionfive/ F: boot/shim/ -F: boot/sun20i-d1-spl/ F: configs/avenger96_defconfig F: configs/beagleboneai_defconfig F: configs/lafrite_defconfig diff --git a/boot/Config.in b/boot/Config.in index ce17b2df6b..2d4d077632 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -20,7 +20,6 @@ source "boot/optee-os/Config.in" source "boot/opensbi/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" -source "boot/sun20i-d1-spl/Config.in" source "boot/syslinux/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" diff --git a/boot/sun20i-d1-spl/Config.in b/boot/sun20i-d1-spl/Config.in deleted file mode 100644 index 9d94d87b1c..0000000000 --- a/boot/sun20i-d1-spl/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_TARGET_SUN20I_D1_SPL - bool "sun20-d1-spl" - depends on BR2_RISCV_64 - help - Allwinner D1 boot0 code with modifications to use as U-Boot - SPL. - - https://github.com/smaeul/sun20i_d1_spl diff --git a/boot/sun20i-d1-spl/sun20i-d1-spl.hash b/boot/sun20i-d1-spl/sun20i-d1-spl.hash deleted file mode 100644 index 11d17a9a16..0000000000 --- a/boot/sun20i-d1-spl/sun20i-d1-spl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 08e2d0574e58c99734cd1d9ea89b86464242bf2db4f6769b23803bf9dcdac3c4 sun20i-d1-spl-882671fcf53137aaafc3a94fa32e682cb7b921f1.tar.gz diff --git a/boot/sun20i-d1-spl/sun20i-d1-spl.mk b/boot/sun20i-d1-spl/sun20i-d1-spl.mk deleted file mode 100644 index 6bcea0fa96..0000000000 --- a/boot/sun20i-d1-spl/sun20i-d1-spl.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# sun20i-d1-spl -# -################################################################################ - -# Commit on the 'mainline' branch -SUN20I_D1_SPL_VERSION = 882671fcf53137aaafc3a94fa32e682cb7b921f1 -SUN20I_D1_SPL_SITE = $(call github,smaeul,sun20i_d1_spl,$(SUN20I_D1_SPL_VERSION)) -SUN20I_D1_SPL_INSTALL_TARGET = NO -SUN20I_D1_SPL_INSTALL_IMAGES = YES -SUN20I_D1_SPL_LICENSE = GPL-2.0+ - -define SUN20I_D1_SPL_BUILD_CMDS - $(MAKE) -C $(@D) CROSS_COMPILE="$(TARGET_CROSS)" p=sun20iw1p1 mmc -endef - -define SUN20I_D1_SPL_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/nboot/boot0_sdcard_sun20iw1p1.bin \ - $(BINARIES_DIR)/boot0_sdcard_sun20iw1p1.bin -endef - -$(eval $(generic-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:54:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:56 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pathspec: bump to version 0.10.3 Message-ID: <20230220205202.C1676828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9f06cbbbce135bb149681fa708650a140a12271 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pathspec/python-pathspec.hash | 4 ++-- package/python-pathspec/python-pathspec.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pathspec/python-pathspec.hash b/package/python-pathspec/python-pathspec.hash index 91e4fb85b7..5eb76cb5f9 100644 --- a/package/python-pathspec/python-pathspec.hash +++ b/package/python-pathspec/python-pathspec.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathspec/json -md5 6f4fde5e701d328a2846d206edb63aa9 pathspec-0.10.1.tar.gz -sha256 7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d pathspec-0.10.1.tar.gz +md5 d89408b52aff020ac768a14c0ef1c7de pathspec-0.10.3.tar.gz +sha256 56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6 pathspec-0.10.3.tar.gz # Locally computed sha256 checksums sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/python-pathspec/python-pathspec.mk b/package/python-pathspec/python-pathspec.mk index ccb794cce9..e88bce231f 100644 --- a/package/python-pathspec/python-pathspec.mk +++ b/package/python-pathspec/python-pathspec.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHSPEC_VERSION = 0.10.1 +PYTHON_PATHSPEC_VERSION = 0.10.3 PYTHON_PATHSPEC_SOURCE = pathspec-$(PYTHON_PATHSPEC_VERSION).tar.gz -PYTHON_PATHSPEC_SITE = https://files.pythonhosted.org/packages/24/9f/a9ae1e6efa11992dba2c4727d94602bd2f6ee5f0dedc29ee2d5d572c20f7 +PYTHON_PATHSPEC_SITE = https://files.pythonhosted.org/packages/32/1a/6baf904503c3e943cae9605c9c88a43b964dea5b59785cf956091b341b08 PYTHON_PATHSPEC_LICENSE = MPL-2.0 PYTHON_PATHSPEC_LICENSE_FILES = LICENSE PYTHON_PATHSPEC_SETUP_TYPE = setuptools From peter at korsgaard.com Mon Feb 20 20:54:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:57 -0000 Subject: [Buildroot] [git commit branch/next] package/python-lxml: bump to version 4.9.2 Message-ID: <20230220205210.650D386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e38d5190ea16a7fda9f3045ba9ba316e4da53f5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-lxml/python-lxml.hash | 2 +- package/python-lxml/python-lxml.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index cd1943b0b4..72df6d0278 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f lxml-4.9.1.tar.gz +sha256 2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67 lxml-4.9.2.tar.gz sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 050495c3f3..657622a962 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.9.1 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/70/bb/7a2c7b4f8f434aa1ee801704bf08f1e53d7b5feba3d5313ab17003477808 +PYTHON_LXML_VERSION = 4.9.2 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/06/5a/e11cad7b79f2cf3dd2ff8f81fa8ca667e7591d3d8451768589996b65dec1 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. From yann.morin.1998 at free.fr Mon Feb 20 20:54:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:57 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pudb: bump to version 2022.1.3 Message-ID: <20230220205203.145DB828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cfd2cb65f2345aa3cda8926c0ec64537f9e4f27b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pudb/python-pudb.hash | 4 ++-- package/python-pudb/python-pudb.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pudb/python-pudb.hash b/package/python-pudb/python-pudb.hash index d9943a3601..1ae15ad8a6 100644 --- a/package/python-pudb/python-pudb.hash +++ b/package/python-pudb/python-pudb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pudb/json -md5 c2b4275b76068f18d630f7bae889345b pudb-2022.1.2.tar.gz -sha256 6b83ab805bddb53710109690a2237e98bf83c0b3a00033c517cdf5f6a8fa470d pudb-2022.1.2.tar.gz +md5 cda1c28dc52318162e2b131280f09960 pudb-2022.1.3.tar.gz +sha256 58e83ada9e19ffe92c1fdc78ae5458ef91aeb892a5b8f0e7379e6fa61e0e664a pudb-2022.1.3.tar.gz # Locally computed sha256 checksums sha256 a95343fffff49cde3d9bf33cf6bb71cb3bf0ed83f47d98a7ba04b175d29c79ab LICENSE diff --git a/package/python-pudb/python-pudb.mk b/package/python-pudb/python-pudb.mk index 7df38f0f02..a357c34c44 100644 --- a/package/python-pudb/python-pudb.mk +++ b/package/python-pudb/python-pudb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PUDB_VERSION = 2022.1.2 +PYTHON_PUDB_VERSION = 2022.1.3 PYTHON_PUDB_SOURCE = pudb-$(PYTHON_PUDB_VERSION).tar.gz -PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/8b/ef/6dea7c63fdddd7753e2a2930e59799ef32247f2499c0d9bcd233439e7483 +PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/85/a5/f1fd378f56bd8168b5921fd09d4b84fd8101a90e81402a509796caea2094 PYTHON_PUDB_SETUP_TYPE = setuptools PYTHON_PUDB_LICENSE = MIT PYTHON_PUDB_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:55:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:11 -0000 Subject: [Buildroot] [git commit branch/next] package/python-zope-interface: bump to version 5.5.2 Message-ID: <20230220205204.166528648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c330d67dae8ca6eefde2aa076151820d87beebe7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-zope-interface/python-zope-interface.hash | 4 ++-- package/python-zope-interface/python-zope-interface.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-zope-interface/python-zope-interface.hash b/package/python-zope-interface/python-zope-interface.hash index 6bab9d2c1c..7052f77899 100644 --- a/package/python-zope-interface/python-zope-interface.hash +++ b/package/python-zope-interface/python-zope-interface.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zope-interface/json -md5 644f7574b81710a21b1b738d448811e4 zope.interface-5.5.1.tar.gz -sha256 6d678475fdeb11394dc9aaa5c564213a1567cc663082e0ee85d52f78d1fbaab2 zope.interface-5.5.1.tar.gz +md5 5a383d71156ce6f89f59a86d957a8d65 zope.interface-5.5.2.tar.gz +sha256 bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671 zope.interface-5.5.2.tar.gz # Locally computed sha256 checksums sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt diff --git a/package/python-zope-interface/python-zope-interface.mk b/package/python-zope-interface/python-zope-interface.mk index 4f201e5cbf..2bada3a7d4 100644 --- a/package/python-zope-interface/python-zope-interface.mk +++ b/package/python-zope-interface/python-zope-interface.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZOPE_INTERFACE_VERSION = 5.5.1 +PYTHON_ZOPE_INTERFACE_VERSION = 5.5.2 PYTHON_ZOPE_INTERFACE_SOURCE = zope.interface-$(PYTHON_ZOPE_INTERFACE_VERSION).tar.gz -PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/c5/ec/3e116b5c3c54f1fb7296a686c110c14d1242bbea17286c487892075d9858 +PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/38/6f/fbfb7dde38be7e5644bb342c4c7cdc444cd5e2ffbd70d091263b3858a8cb PYTHON_ZOPE_INTERFACE_SETUP_TYPE = setuptools PYTHON_ZOPE_INTERFACE_LICENSE = ZPL-2.1 PYTHON_ZOPE_INTERFACE_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 20 20:55:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:11 -0000 Subject: [Buildroot] [git commit branch/next] package/ply: bump to version 2.3.0 Message-ID: <20230220205212.9E28886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9612601b037e6deb79af300e64e0557dda1be5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Andreas Klinger Signed-off-by: Peter Korsgaard --- package/ply/ply.hash | 2 +- package/ply/ply.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ply/ply.hash b/package/ply/ply.hash index df01ae08e0..b6a56aa909 100644 --- a/package/ply/ply.hash +++ b/package/ply/ply.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8cd92fc8784873fb0507bc11f3f62a31d0345c64914ddaadb958d8b2d6de0100 ply-2.2.0.tar.gz +sha256 99be1ed3942370699cbfc7f493bc3ffd4601312a81471215ac7ccb2e04a0a8b2 ply-2.3.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ply/ply.mk b/package/ply/ply.mk index b3c56bd9a5..dc02fc5472 100644 --- a/package/ply/ply.mk +++ b/package/ply/ply.mk @@ -4,7 +4,7 @@ # ################################################################################ -PLY_VERSION = 2.2.0 +PLY_VERSION = 2.3.0 PLY_SITE = $(call github,wkz,ply,$(PLY_VERSION)) PLY_AUTORECONF = YES PLY_LICENSE = GPL-2.0 From peter at korsgaard.com Mon Feb 20 20:55:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:12 -0000 Subject: [Buildroot] [git commit branch/next] package/domoticz: bump to version 2022.2 Message-ID: <20230220205212.845A986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=384b75098ba936277379fbaf6e9b78ad8e6fa25f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/domoticz/domoticz/blob/2022.2/History.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...rdware-EnOceanRawValue.h-include-stdarg.h.patch | 33 ++++++++++++++++++++++ package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 2 +- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch b/package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch new file mode 100644 index 0000000000..bc3e60023d --- /dev/null +++ b/package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch @@ -0,0 +1,33 @@ +From 6296d7112089a0f3bfb3056f6d9637e13ce4ce83 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 18 Dec 2022 12:27:38 +0100 +Subject: [PATCH] hardware/EnOceanRawValue.h: include stdarg.h + +Include stdarg.h to avoid the following build failure on uclibc: + +In file included from /home/fabrice/buildroot/output/build/domoticz-2022.2/hardware/EnOceanRawValue.cpp:2: +/home/fabrice/buildroot/output/build/domoticz-2022.2/hardware/EnOceanRawValue.h:109:83: error: 'va_list' has not been declared + 109 | uint32_t SetRawValuesNb(uint8_t * data, T_DATAFIELD * OffsetDes, int NbParameter, va_list value); + | ^~~~~~~ + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/domoticz/domoticz/pull/5472] +--- + hardware/EnOceanRawValue.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hardware/EnOceanRawValue.h b/hardware/EnOceanRawValue.h +index 84f38d17a..df858f27d 100644 +--- a/hardware/EnOceanRawValue.h ++++ b/hardware/EnOceanRawValue.h +@@ -1,6 +1,7 @@ + #ifndef _SetGetRawValue + #define _SetGetRawValue + ++#include + #include + #include + #include +-- +2.35.1 + diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index 9de241015c..c439238800 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8282cb71c924b6ef92503976d50f966f2c785eab8f8cffa1136ac133f0241157 domoticz-2022.1.tar.gz +sha256 8f84098bb64bec12ff7aac5f1fb6b6230a88c5781c2b75bc89861caea73cbccf domoticz-2022.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index bc4a2def41..451021150b 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 2022.1 +DOMOTICZ_VERSION = 2022.2 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:13 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8189es: disable -Werror to fix build failure Message-ID: <20230220205204.55442828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abb36a1f5f619991a1a66c1a87b9881294465ab9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/349893c66fcfbbf0e0e10285299581894254c941/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8189es/rtl8189es.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk index 6acc409e73..c2ee77f922 100644 --- a/package/rtl8189es/rtl8189es.mk +++ b/package/rtl8189es/rtl8189es.mk @@ -11,7 +11,8 @@ RTL8189ES_LICENSE = GPL-2.0 RTL8189ES_MODULE_MAKE_OPTS = \ CONFIG_RTL8189ES=m \ KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) + KSRC=$(LINUX_DIR) \ + USER_EXTRA_CFLAGS="-Wno-error" define RTL8189ES_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) From yann.morin.1998 at free.fr Mon Feb 20 20:55:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:13 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pycares: bump to version 4.3.0 Message-ID: <20230220205204.38B518648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ea6eecb734ae04988e0f4d4a7ea0f5fb9420c89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycares/python-pycares.hash | 4 ++-- package/python-pycares/python-pycares.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycares/python-pycares.hash b/package/python-pycares/python-pycares.hash index 13f640b1c1..7cdd93dd93 100644 --- a/package/python-pycares/python-pycares.hash +++ b/package/python-pycares/python-pycares.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycares/json -md5 7706a01fdbfc593564b63ac0d71031d9 pycares-4.2.2.tar.gz -sha256 e1f57a8004370080694bd6fb969a1ffc9171a59c6824d54f791c1b2e4d298385 pycares-4.2.2.tar.gz +md5 d11b196cebb45a38caa56e850f4a60d9 pycares-4.3.0.tar.gz +sha256 c542696f6dac978e9d99192384745a65f80a7d9450501151e4a7563e06010d45 pycares-4.3.0.tar.gz # Locally computed sha256 checksums sha256 427bb3a5372024a26e2c290b24382512bcc7ca123431c4dd178dd613beea7eee LICENSE diff --git a/package/python-pycares/python-pycares.mk b/package/python-pycares/python-pycares.mk index 858adbf33b..b1c7dcef50 100644 --- a/package/python-pycares/python-pycares.mk +++ b/package/python-pycares/python-pycares.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCARES_VERSION = 4.2.2 +PYTHON_PYCARES_VERSION = 4.3.0 PYTHON_PYCARES_SOURCE = pycares-$(PYTHON_PYCARES_VERSION).tar.gz -PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/ac/a3/21594384c2398420dd7f6e8656aeb5a2c15128ddf2b85ef5f4403342e18d +PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/01/50/e3015e6e03a3cf64113f509e8b86b71af37169b59ccedfcb182f3d031329 PYTHON_PYCARES_SETUP_TYPE = setuptools PYTHON_PYCARES_LICENSE = MIT PYTHON_PYCARES_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:55:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:13 -0000 Subject: [Buildroot] [git commit branch/next] package/lightning: bump version to 2.2.0 Message-ID: <20230220205211.9A45B86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af6f7aa76db5aed1eada0b27bd0375610a2fc728 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Notable changes in this new version include support for the Apple Aarch64 ABI, and compare-and-swap atomic instructions. Signed-off-by: Paul Cercueil [Peter: drop _AUTORECONF] Signed-off-by: Peter Korsgaard --- ...kefile.am-don-t-install-lightning.h-twice.patch | 38 ---------------------- package/lightning/lightning.hash | 2 +- package/lightning/lightning.mk | 4 +-- 3 files changed, 2 insertions(+), 42 deletions(-) diff --git a/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch b/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch deleted file mode 100644 index fb5299c25f..0000000000 --- a/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 604c931bc673c507254a84c0f423c9ec8ce6e3a1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 10 Oct 2019 20:36:46 +0200 -Subject: [PATCH] include/Makefile.am: don't install lightning.h twice - -Commit 17164ed32d8f3530153b9cad67a4399c65f24512 added lightning.h to -nodist_include_HEADERS without removing it from include_HEADERS - -This raises the following error on one of the buildroot autobuilders: -/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include' -/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include' -/usr/bin/install: cannot create regular file `/home/test/autobuild/run/instance-3/output-1/target/usr/include/lightning.h': File exists - -Fix this by removing lightning.h from include_HEADERS - -Fixes: - - http://autobuild.buildroot.org/results/05ebc75598627d2a08e08e194f51cb8464f97b95 - -Signed-off-by: Fabrice Fontaine ---- - include/Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/Makefile.am b/include/Makefile.am -index e754dd3..8f91594 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -14,7 +14,6 @@ - # License for more details. - # - --include_HEADERS = lightning.h - SUBDIRS = \ - lightning - --- -2.23.0 - diff --git a/package/lightning/lightning.hash b/package/lightning/lightning.hash index 2840a97f91..998ae3743b 100644 --- a/package/lightning/lightning.hash +++ b/package/lightning/lightning.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed856b866dc6f68678dc1151579118fab1c65fad687cf847fc2d94ca045efdc9 lightning-2.1.3.tar.gz +sha256 4e3984ff1ccf0ba30a985211d40fc5c06b25f014ebdf3d80d0fe3d0c80dd7c0e lightning-2.2.0.tar.gz sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/package/lightning/lightning.mk b/package/lightning/lightning.mk index da8c07e61f..8ab2ca1f9d 100644 --- a/package/lightning/lightning.mk +++ b/package/lightning/lightning.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIGHTNING_VERSION = 2.1.3 +LIGHTNING_VERSION = 2.2.0 LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning LIGHTNING_LICENSE = LGPL-3.0+ LIGHTNING_LICENSE_FILES = COPYING.LESSER LIGHTNING_INSTALL_STAGING = YES LIGHTNING_CPE_ID_VENDOR = gnu -# We're patching include/Makefile.am -LIGHTNING_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIGHTNING_DISASSEMBLER),y) LIGHTNING_DEPENDENCIES += binutils zlib From peter at korsgaard.com Mon Feb 20 20:55:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:14 -0000 Subject: [Buildroot] [git commit branch/next] package/vuejs-router: fix license hash Message-ID: <20230220205213.07A9486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66c2d6d4b43776d4afb62b985a082bf2d75cb708 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 2fce36d928082685d7f77c3587e15b7827ce0b42 forgot to update LICENSE hash (update in year: https://github.com/vuejs/router/commit/ed238db64b2a605f785ee4e2f847a6788c06a2ea) Fixes: - http://autobuild.buildroot.org/results/beac411246342a9445495bc7c8f6a7e7369b9c53 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/vuejs-router/vuejs-router.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/vuejs-router/vuejs-router.hash b/package/vuejs-router/vuejs-router.hash index 147e730f20..b48e59ef48 100644 --- a/package/vuejs-router/vuejs-router.hash +++ b/package/vuejs-router/vuejs-router.hash @@ -1,3 +1,3 @@ # Locally computed sha256 437558a84b99d0d89743d4897ec16a90a96a1d3a6786e697a8808a044bcb9b8f vue-router-4.1.6.tgz -sha256 9c0015250f592a09d7787efc07152afcf661fff6bda2554359f6d00987828c02 LICENSE +sha256 91a2845c4db44e7497b514b98634a674c737986ad0db81599307cf733bf850b2 LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:14 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-firmware: add support for Intel 6/6E WiFi firmware Message-ID: <20230220205204.70FE68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b55dfdb286ddb7fb4f35c20b731a4c93bd3ff201 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Stephan Henningsen Signed-off-by: Thomas Petazzoni --- 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 8ce71140da..4b415a7da2 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -268,6 +268,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX Firmware files for the Intel Wifi 9xxx devices supported by the iwlwifi kernel driver. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6E + bool "Intel iwlwifi 6/6E" + help + Firmware files for the Intel Wi-Fi 6 and Wi-Fi 6E devices + supported by the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8 bool "Libertas SD 8686 v8" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 672a536c4a..200b4ca564 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -514,6 +514,11 @@ LINUX_FIRMWARE_FILES += iwlwifi-9???-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6E),y) +LINUX_FIRMWARE_FILES += iwlwifi-so-a0-gf-a0*.{ucode,pnvm} +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3),y) LINUX_FIRMWARE_FILES += tigon/* # No license file; the license is in the file WHENCE From peter at korsgaard.com Mon Feb 20 20:55:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:15 -0000 Subject: [Buildroot] [git commit branch/next] package/libcoap: bump to version 4.3.1 Message-ID: <20230220205213.24CF786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=163f933692f616c1b73d060aa03bd8323956692f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update hash of LICENSE file (update in year: https://github.com/obgm/libcoap/commit/43bfbea924e0f5220c4121487df980afe7159346) https://github.com/obgm/libcoap/blob/v4.3.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libcoap/libcoap.hash | 4 ++-- package/libcoap/libcoap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcoap/libcoap.hash b/package/libcoap/libcoap.hash index 4a5bcaa7ff..e0006b62af 100644 --- a/package/libcoap/libcoap.hash +++ b/package/libcoap/libcoap.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 1a195adacd6188d3b71c476e7b21706fef7f3663ab1fb138652e8da49a9ec556 libcoap-4.3.0.tar.gz +sha256 074a71deca01e06d3acb00a1416d0fbeb87d130f40a3c0f6fda3a5c711855dca libcoap-4.3.1.tar.gz sha256 09dd86a017bad210527085008cbf706609c58210897b69845af14099577e7eb7 COPYING -sha256 c5625e704d52deade1c9b2d7931ac8593be147ba63af62b53b8c7e309b7eaeb9 LICENSE +sha256 5711e8bf7e94b59fcf0681d0f73752111bc196563b60f8568f19dacd0213192b LICENSE diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index edcc1bbef8..c0a941a0c8 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCOAP_VERSION = 4.3.0 +LIBCOAP_VERSION = 4.3.1 LIBCOAP_SITE = $(call github,obgm,libcoap,v$(LIBCOAP_VERSION)) LIBCOAP_INSTALL_STAGING = YES LIBCOAP_LICENSE = BSD-2-Clause From peter at korsgaard.com Mon Feb 20 20:55:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:22 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8192eu: fix build failure on Big Endian architectures Message-ID: <20230220205213.A09FE86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=447abe169af7e69a82a3e0218670006a42914053 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default involving the endianness to be set to little. This way we can set the CFLAGS according to architecture with some default define like: -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -Wno-error Suggested-by: Arnout Vandecappelle Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/rtl8192eu/rtl8192eu.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index e1688eef1b..d967db90b8 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -7,9 +7,16 @@ RTL8192EU_VERSION = 94bce7798bbb18de6d8b1646dedb2511f24867d3 RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 + +RTL8192EU_USER_EXTRA_CFLAGS = -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error + RTL8192EU_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_I386_PC=n \ CONFIG_RTL8192EU=m \ - USER_EXTRA_CFLAGS="-Wno-error" + USER_EXTRA_CFLAGS="$(RTL8192EU_USER_EXTRA_CFLAGS)" define RTL8192EU_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:23 -0000 Subject: [Buildroot] [git commit branch/next] package/nerdctl: bump to version 1.0.0 Message-ID: <20230220205205.22F3181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=717cf468c4be8669785027f298f077f903214fc7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Nerdctl has reached version 1.0.0. https://github.com/containerd/nerdctl/releases/tag/v1.0.0 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/nerdctl/nerdctl.hash | 2 +- package/nerdctl/nerdctl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash index 22cc97c362..e253fb74b2 100644 --- a/package/nerdctl/nerdctl.hash +++ b/package/nerdctl/nerdctl.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 be41804ef139a3f92b774edc8439678e56b44033d7ab3fcf4389f0865c1fe069 nerdctl-0.17.1.tar.gz +sha256 ae468c65480e9c6679e0dd23d466b723e7f19bff779d4e2e0fa4629be343af2a nerdctl-1.0.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk index 3f3c04aa11..fdf60cb189 100644 --- a/package/nerdctl/nerdctl.mk +++ b/package/nerdctl/nerdctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NERDCTL_VERSION = 0.17.1 +NERDCTL_VERSION = 1.0.0 NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) NERDCTL_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:24 -0000 Subject: [Buildroot] [git commit branch/next] package/pipewire: bump to version 0.3.62 Message-ID: <20230220205205.349EE828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67895bf33c00e07bc0f85311f39eaa237f58bd45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add support for new optional gsettings meson config option. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- 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 4585534569..d8b5b0cc86 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8164eb53c9eafedfa22fe1adc4b8e38f3173c6f33695c735a17ed1a3d43c664e pipewire-0.3.60.tar.bz2 +sha256 24b218cf3bb1fb279c8c489c14cc9ae483e1da7b4c8215b2ee5a5ee831bae94f pipewire-0.3.62.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 9fef605878..6bcda0a93d 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.60 +PIPEWIRE_VERSION = 0.3.62 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) @@ -166,6 +166,13 @@ else PIPEWIRE_CONF_OPTS += -Dx11-xfixes=disabled endif +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +PIPEWIRE_CONF_OPTS += -Dgsettings=enabled +PIPEWIRE_DEPENDENCIES += libglib2 +else +PIPEWIRE_CONF_OPTS += -Dgsettings=disabled +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) PIPEWIRE_CONF_OPTS += -Dlibusb=enabled PIPEWIRE_DEPENDENCIES += libusb From yann.morin.1998 at free.fr Mon Feb 20 20:55:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:24 -0000 Subject: [Buildroot] [git commit branch/next] package/lightning; fix build Message-ID: <20230220205213.D3CCE86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af1f90cc07e1b74cbda92402926bbcb88a722a93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since bump to version 2.2.0 in commit af6f7aa76db5aed1eada0b27bd0375610a2fc728 and http://git.savannah.gnu.org/cgit/lightning.git/commit/?id=837c7a1e8d08fb9294578dc84694077f4d6106f9: jit_disasm.c: In function 'fprintf_styled': jit_disasm.c:57:27: error: parameter name omitted 57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) | ^~~~~~ jit_disasm.c:57:35: error: parameter name omitted 57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) | ^~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e15e01e98e0d8c873efd3f512b671d98e4daf6c0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-lib-jit_disasm.c-fix-build.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/package/lightning/0001-lib-jit_disasm.c-fix-build.patch b/package/lightning/0001-lib-jit_disasm.c-fix-build.patch new file mode 100644 index 0000000000..9e79be91a0 --- /dev/null +++ b/package/lightning/0001-lib-jit_disasm.c-fix-build.patch @@ -0,0 +1,42 @@ +From 0d828c96c373c34b201ca7ea37b61c1e3b0485cd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 19 Dec 2022 23:55:31 +0100 +Subject: [PATCH] lib/jit_disasm.c: fix build + +Fix the following build failure raised since +http://git.savannah.gnu.org/cgit/lightning.git/commit/?id=837c7a1e8d08fb9294578dc84694077f4d6106f9: + +jit_disasm.c: In function 'fprintf_styled': +jit_disasm.c:57:27: error: parameter name omitted + 57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) + | ^~~~~~ +jit_disasm.c:57:35: error: parameter name omitted + 57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) + | ^~~~~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/e15e01e98e0d8c873efd3f512b671d98e4daf6c0 + +Signed-off-by: Fabrice Fontaine +[yann.morin.1998 at free.fr: make it a backport now it's applied upstream] +Signed-off-by: Yann E. MORIN +--- + lib/jit_disasm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/jit_disasm.c b/lib/jit_disasm.c +index 58a269b..68c966d 100644 +--- a/lib/jit_disasm.c ++++ b/lib/jit_disasm.c +@@ -54,7 +54,7 @@ static FILE *disasm_stream; + #endif + + #if BINUTILS_2_38 +-static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) ++static int fprintf_styled(void * stream, enum disassembler_style style, const char* fmt, ...) + { + va_list args; + int r; +-- +2.25.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:25 -0000 Subject: [Buildroot] [git commit branch/next] package/ruby: security bump to version 3.1.3 Message-ID: <20230220205205.44C518648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20f7ed86aa9f2a65af9b44a599f7d1b10075f158 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next fix CVE-2021-33621: HTTP response splitting in CGI see https://www.ruby-lang.org/en/news/2022/11/24/ruby-3-1-3-released/ Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch | 2 +- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch b/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch index 039a6466d6..805dfd2f89 100644 --- a/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch +++ b/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch @@ -14,7 +14,7 @@ diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c index 2a4835a2..24d0da46 100644 --- a/ext/openssl/ossl_pkey.c +++ b/ext/openssl/ossl_pkey.c -@@ -670,7 +670,7 @@ ossl_pkey_export_traditional(int argc, VALUE *argv, VALUE self, int to_der) +@@ -710,7 +710,7 @@ ossl_pkey_export_traditional(int argc, VALUE *argv, VALUE self, int to_der) } } else { diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index da6221ec50..42d8a2497f 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2022/04/12/ruby-3-1-2-released/ -sha512 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21 ruby-3.1.2.tar.xz +# https://www.ruby-lang.org/en/news/2022/11/24/ruby-3-1-3-released/ +sha512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69 ruby-3.1.3.tar.xz # License files, Locally calculated sha256 794c384f94396ab07e3e6f53a9f8be093facb7eb4193266024302b93b29e12dc LEGAL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index cbdfa4b826..28b1ec13ef 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 3.1 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).2 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).3 RUBY_VERSION_EXT = 3.1.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:03 -0000 Subject: [Buildroot] [git commit branch/next] package/hostapd: enable 802.11ax support Message-ID: <20230220205217.7985386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ab2946dba9d71dcce9297efc05348c87f304a22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Hostapd has 802.11ax support, however it is currently disabled by default, so let's enable it as it adds only 2 KB to the overall size of the hostapd package. Signed-off-by: Robert Marko Signed-off-by: Thomas Petazzoni --- package/hostapd/hostapd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 4420142fbd..8981d9247e 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -53,6 +53,7 @@ endif ifeq ($(BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS),y) HOSTAPD_CONFIG_ENABLE += \ CONFIG_HS20 \ + CONFIG_IEEE80211AX \ CONFIG_IEEE80211AC \ CONFIG_IEEE80211N \ CONFIG_IEEE80211R \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:03 -0000 Subject: [Buildroot] [git commit branch/next] package/libdnet: fix python build Message-ID: <20230220205217.B083186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14bb74b4617df6fe511e638147cbde01fd7637a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised with python >= 3.11 by backporting a patch and adding libbsd dependency as suggested by upstream in https://github.com/ofalk/libdnet/issues/74: ./dnet.c: In function '__Pyx_AddTraceback': ./dnet.c:456:62: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 456 | #define __Pyx_PyFrame_SetLineNumber(frame, lineno) (frame)->f_lineno = (lineno) | ^~ ./dnet.c:25190:5: note: in expansion of macro '__Pyx_PyFrame_SetLineNumber' 25190 | __Pyx_PyFrame_SetLineNumber(py_frame, py_line); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/78dff4b514fb7c510f5a745ee6cbbc049ceb2794 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0002-Correct-path-to-string-h-from-bsd.patch | 26 ++++++++++++++++++++++ package/libdnet/Config.in | 11 +++++++++ package/libdnet/libdnet.mk | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch b/package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch new file mode 100644 index 0000000000..2aa4f4516b --- /dev/null +++ b/package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch @@ -0,0 +1,26 @@ +From 347c23da1ec6f19b0b0143d53edcc209e522bbf2 Mon Sep 17 00:00:00 2001 +From: Oliver Falk +Date: Wed, 29 Jun 2022 13:27:45 +0200 +Subject: [PATCH] Correct path to string.h (from bsd); Fixes #74 + +[Retrieved (and backported) from: +https://github.com/ofalk/libdnet/commit/347c23da1ec6f19b0b0143d53edcc209e522bbf2] +Signed-off-by: Fabrice Fontaine +--- + python/dnet.c | 64 +++++++++++++++++++++++-------------------------- + python/dnet.pyx | 2 +- + 2 files changed, 31 insertions(+), 35 deletions(-) + +diff --git a/python/dnet.pyx b/python/dnet.pyx +index d9cbc90..af65a11 100644 +--- a/python/dnet.pyx ++++ b/python/dnet.pyx +@@ -40,7 +40,7 @@ cdef extern from *: + unsigned long htonl(unsigned long n) + unsigned long ntohl(unsigned long n) + +-cdef extern from "string.h": ++cdef extern from "bsd/string.h": + int strlcpy(char *dst, char *src, int size) + + cdef __memcpy(char *dst, object src, int n): diff --git a/package/libdnet/Config.in b/package/libdnet/Config.in index f853e4e12d..473e8aea22 100644 --- a/package/libdnet/Config.in +++ b/package/libdnet/Config.in @@ -10,11 +10,22 @@ if BR2_PACKAGE_LIBDNET config BR2_PACKAGE_LIBDNET_PYTHON bool "libdnet python module" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_STATIC_LIBS # libbsd + depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd + depends on BR2_USE_WCHAR # libbsd + select BR2_PACKAGE_LIBBSD help dnet module for python comment "dnet module for python requires python3 package" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on !BR2_PACKAGE_PYTHON3 +comment "dnet module for python needs a toolchain w/ dynamic library, threads, wchar" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR + endif diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index dc56b892b4..14af07e6d5 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -17,7 +17,7 @@ LIBDNET_CONFIG_SCRIPTS = dnet-config LIBDNET_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) -LIBDNET_DEPENDENCIES += host-python-cython python3 +LIBDNET_DEPENDENCIES += libbsd host-python-cython python3 LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec From yann.morin.1998 at free.fr Mon Feb 20 20:56:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:03 -0000 Subject: [Buildroot] [git commit branch/next] package/hddtemp: new package Message-ID: <20230220205208.97487828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93d982207b43f9e741e190a71317901972175796 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next [Bernd: - switched to actively maintained fork - package/Config.in: moved to "Hardware handling" (Peter) - added toolchain dependencies (Thomas) - added license hash - fixed build errors related to iconv and execinfo (Peter) - removed hook HDDTEMP_REMOVE_MAN (Thomas) - install hddtemp.db to target - added build/install _CMDS due to https://github.com/vitlav/hddtemp/issues/5] Signed-off-by: Bernd Kuhls [yann.morin.1998 at free.fr: - use GETTEXTIZE=YES, drop host-gettext from _DEPENDENCIES - drop custom build and install commands now that we gettextize - explicitly specify the DB path, introduce HDDTEMP_DB_PATH ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/hddtemp/Config.in | 17 +++++++++++++++++ package/hddtemp/hddtemp.hash | 3 +++ package/hddtemp/hddtemp.mk | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 57 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 04047d43da..29dffaadf1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -345,6 +345,7 @@ F: package/glmark2/ F: package/gpsd/ F: package/gptfdisk/ F: package/hdparm/ +F: package/hddtemp/ F: package/inih/ F: package/intel-gmmlib/ F: package/intel-mediadriver/ diff --git a/package/Config.in b/package/Config.in index 6804e1d418..10a0493b8d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -508,6 +508,7 @@ endmenu source "package/gpsd/Config.in" source "package/gptfdisk/Config.in" source "package/gvfs/Config.in" + source "package/hddtemp/Config.in" source "package/hdparm/Config.in" source "package/hwdata/Config.in" source "package/hwloc/Config.in" diff --git a/package/hddtemp/Config.in b/package/hddtemp/Config.in new file mode 100644 index 0000000000..0e02252461 --- /dev/null +++ b/package/hddtemp/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_HDDTEMP + bool "hddtemp" + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + help + hddtemp is a small utility that gives you the temperature of + your hard drive by reading S.M.A.R.T. informations, for drives + that support this feature. + + https://github.com/vitlav/hddtemp + http://www.guzu.net/linux/hddtemp.php + +comment "hddtemp needs dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS diff --git a/package/hddtemp/hddtemp.hash b/package/hddtemp/hddtemp.hash new file mode 100644 index 0000000000..cd82d7f89b --- /dev/null +++ b/package/hddtemp/hddtemp.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 592322c64f0d5f035132249e3d051b752f5d24867514522a17285d5e72d21075 hddtemp-0.4.3.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 GPL-2 diff --git a/package/hddtemp/hddtemp.mk b/package/hddtemp/hddtemp.mk new file mode 100644 index 0000000000..7023e11e59 --- /dev/null +++ b/package/hddtemp/hddtemp.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# hddtemp +# +################################################################################ + +HDDTEMP_VERSION = 0.4.3 +HDDTEMP_SITE = $(call github,vitlav,hddtemp,v$(HDDTEMP_VERSION)) +HDDTEMP_LICENSE = GPLv2 +HDDTEMP_LICENSE_FILES = GPL-2 + +# Fetched from Github with no configure script +HDDTEMP_AUTORECONF = YES +HDDTEMP_GETTEXTIZE = YES + +HDDTEMP_DB_PATH = /usr/share/misc/hddtemp.db +HDDTEMP_CONF_OPTS = --with-db-path=$(HDDTEMP_DB_PATH) +HDDTEMP_CONF_ENV = LIBS="$(HDDTEMP_LIBS)" + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +HDDTEMP_DEPENDENCIES += libexecinfo +HDDTEMP_LIBS += -lexecinfo +endif + +ifeq ($(BR2_PACKAGE_LIBICONV),y) +HDDTEMP_DEPENDENCIES += libiconv +HDDTEMP_LIBS += -liconv +endif + +define HDDTEMP_INSTALL_HDDTEMP_DB + $(INSTALL) -D $(@D)/data/hddtemp.db $(TARGET_DIR)$(HDDTEMP_DB_PATH) +endef +HDDTEMP_POST_INSTALL_TARGET_HOOKS += HDDTEMP_INSTALL_HDDTEMP_DB + +$(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:04 -0000 Subject: [Buildroot] [git commit branch/next] package/gr-osmosdr: bump to version 0.2.4 Message-ID: <20230220205217.E2BF5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cdb77d0b86ca7e62b61d7f7e7947af591fe47e71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This bump will fix the following build failure raised since bump of gnuradio to version 3.10.4.0 in commit e37c110bead8b7b35cd97915673fa785ccb39f2d thanks to https://github.com/osmocom/gr-osmosdr/commit/159885f9e67101834c100ceb7affc122e3f98bac: /home/autobuild/autobuild/instance-20/output-1/build/gr-osmosdr-0.2.3/lib/source_impl.cc: In static member function 'static osmosdr::source::sptr osmosdr::source::make(const string&)': /home/autobuild/autobuild/instance-20/output-1/build/gr-osmosdr-0.2.3/lib/source_impl.cc:105:36: error: could not convert 'gnuradio::get_initial_sptr(T*) [with T = source_impl]()' from 'std::shared_ptr' to 'osmosdr::source::sptr' {aka 'boost::shared_ptr'} 105 | return gnuradio::get_initial_sptr( new source_impl(args) ); | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~ | | | std::shared_ptr https://github.com/osmocom/gr-osmosdr/releases/tag/v0.2.4 Fixes: - http://autobuild.buildroot.org/results/5af61d6fb8f8c5d5f91c74a6ef66800236d7bf12 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gr-osmosdr/gr-osmosdr.hash | 2 +- package/gr-osmosdr/gr-osmosdr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gr-osmosdr/gr-osmosdr.hash b/package/gr-osmosdr/gr-osmosdr.hash index 95f1137e38..b5ac50c4ed 100644 --- a/package/gr-osmosdr/gr-osmosdr.hash +++ b/package/gr-osmosdr/gr-osmosdr.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 11b1eb13725ced5ded9121a10aaf7bccf2430c5c69d020791408219968665b71 gr-osmosdr-0.2.3.tar.gz +sha256 28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63 gr-osmosdr-0.2.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index 870db60c55..89907c1baa 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -GR_OSMOSDR_VERSION = 0.2.3 +GR_OSMOSDR_VERSION = 0.2.4 GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,v$(GR_OSMOSDR_VERSION)) GR_OSMOSDR_LICENSE = GPL-3.0+ GR_OSMOSDR_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:05 -0000 Subject: [Buildroot] [git commit branch/next] package/python-maturin: bump to version 0.14.4 Message-ID: <20230220205208.BC1C6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b119f21867b46184ac6d12ebbcd6f77e5ad84a43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index b9936fe8bf..d642119786 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 54976d46be5d1e0d94ae8fbcfb8e72212b1ec9fe9752e3d14510c17a4000efeb maturin-0.14.1.tar.gz +sha256 dd1ee5cd1bb76c434319f305cd30873be2f8221e310168fc376b53b7d0e166ff maturin-0.14.4.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index 3dedfdce11..ea055ffcf6 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.1 +PYTHON_MATURIN_VERSION = 0.14.4 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/a3/54/6bac789ab775b5ef1f07977e998cf719857e2675c3442f3f24e0399e1483 +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/7c/51/36749c1a0881a4292e4f334bd9ddb0865e0991a83070834d1aaa1af7443f PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:05 -0000 Subject: [Buildroot] [git commit branch/next] package/{rust, rust-bin}: bump to version 1.66.0 Message-ID: <20230220205216.5CBFA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de4cf253752d2225b7d258cbaee0ddebf64901fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Link to Rust 1.66.0 annoucement: https://blog.rust-lang.org/2022/12/15/Rust-1.66.0.html Newest version of the source archives have been retrieved with their hash values, and the signature of the .asc files have been verified as follows: $ curl -fsSL https://static.rust-lang.org/rust-key.gpg.ascii | gpg --import $ gpg --verify There is no typographical error in the packages according to the check-pakage utility: $ ./utils/check-package package/rust-bin/* $ ./utils/check-package package/rust/* The testsuite tool were successfully run for rust and rust-bin packages to test the Rust toolchain under 1.66.0: $ ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_rust.TestRustBin $ ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_rust.TestRust In order to verify the compatibility of packages depending on Rust 1.66.0, tests using `./utils/test-pkg` were run. You may want to execute the test-pkg command after creating a `.config` file enabling the corresponding BR2_PACKAGE, for example: Create a file `buildroot/ripgrep.config` containing "BR2_PACKAGE_RIPGREP=y" Then execute: $ ./utils/test-pkg -d test-pkg -c ripgrep.config -p ripgrep Results: librsvg OK ripgrep OK suricata OK bat OK Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.hash | 252 ++++++++++++++++++++--------------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index af9927a028..7cc1052dd9 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 b3a83a9585b8c4ede4eab2a11b3f96895f676d8b46c9642140c4fefd5c309ed1 rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 50595b96f98e0940bbfe00209d6c233e9158e140ecd6088ad3bd53f89b123e9d rust-1.65.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 afa3af620b3a0bf8a1da33413eace1db681db5f99b2572ac016027b3d71a50b7 rust-1.65.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 c6b48026fb131a404bcdc7a691246c3de716e32805d58d1571e253b9a5b047b5 rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 5601b31290790a7077c342c8731bb1d5de1a89639476e14bc7840aeaa3ab6010 rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 8cf900ac125d6bebc97ebb777761923b2062e4fc36692c1f2d68faa0e70949b2 rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 e0654c20446aa5c66def122617f3ca4be9e9b86e75040327e3d35973b6b88980 rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 f02e1bac01415e101fac58608b070b0f37c7df1a142c8001ddbc489cfb85c232 rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 e7dc9bb42c0e738f68f8ad4b05cf4b7bef8fa490c379e5730c7e282507b305ee rust-1.65.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 9455cab767f7b9f46259aac8d953f15f11b3d65513384e2b0a5e77d0432ae82f rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 735b681c8a6e60925c76d6cc899e78b4cb4562ada24a1f265b2021c1faad78ad rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 9ea488da40c347826cce7e238847c745ee566254bb1d077412673f8243fb1cd2 rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 c8793e77ef43336bc372a7a5b4720d5449e92577c7875471c2bc40ddbfde4811 rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 f7d5eb17dbe46ee9d3c4f9fcffc07b8e3311c747545402c8d3b5c43043f27288 rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 32d7f301196d73027fb9a5ae595dbadacdc234307c36b4a175a132e75318e38c rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 453a1443e4753611dc4e6969e50ad8d7984a31d1a457729a860599ed19b1de7a rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 d079e841be640b4ce26aa821f29bc813243a7c0af7b8aca8ca4acf5c2e5b722f rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 1d11ab1d60070ae30ff87b55dca077f4d532d814a9ab7bc77055b5b429a78c6e rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 fec73401941bffce3b6913d31955f1291119dea119c0051d94f271ae7c959d4c rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 c14268337c69650a2618909d8e691489385d748374d73ab8d6a2f9d6b030d70d rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 9368527053c4bab0fd320209b45f0278d0a1e54a37006a56a6e565404ab73fef rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 0b5bc219333e3e983fb1e7e86a0c268c4a52ccbd6326a16785be9d9017d97e9f rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 533eda439eb5ffec258b8219445742d6d60570040b3ff167291e3d0d985b9d70 rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-musl.tar.xz.asc -sha256 7f5d9ae65827aef1a51676927a4c9533f942021d2fd45fd93b23dfaa738ee205 rust-std-1.65.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 99bd62d593a6ab3205cab7f06b5793a075b9d05d868e927a6948e46269d61e82 rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-musl.tar.xz.asc -sha256 644a4c57c1392f776c5ebb13f9832778b69464391b3766e6bbd18c3aa11787a6 rust-std-1.65.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 50c65a8effc85aa89242ba0a2a2c89bfcc4d0a39dcb42396d10b0036b9a4e90c rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-musl.tar.xz.asc -sha256 3bc5043f4eb7bb6418708792ee8e777197e562d03843a9adf62ce245ba07289a rust-std-1.65.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 338c702b79dac33e32dde097084dd38852487d2976c5eb66b44ba8fc8319342b rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 9450745a5e678c9b7e65ecc7d6a016f92d8d22d8091c4a77431b1e58b99a435f rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 a0a0e60a0e850140194250fbbfb962c322d4f474f4ec22d03b7f537034257c09 rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 0862706d22dcfee39b0d2df874dd6065d8c3020c0b8974f6e7b694edd42413ae rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 79e078420f7c45fd1cf38b70620ced50d35ddb1621736b65be987c20481fe5bc rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 482e9245873338a08f47ea2c29683134b8813deb3e3eafb78b786d34bbecce51 rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 672b9ea8018dcdf7d5f79f5298bacc34e7600a082727b4f1a20c14251752aaa2 rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 8a26e08908156ae5a05c64c2732435ef4efb994a2ac6d0b2e9c93c0dae19d089 rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ce18b44300f7d5d94856cef5b270ba010061fafa411beb9782207e26cbab88a6 rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 fa99f123ce14f1cda245857b50fd4709adee960e7d36ce663b87c13aee18b64b rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 a3f6740be345364f4599ae837d2401e0f31e5d33a4f958852d12a384ee581a83 rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 fc2a8816665f464d3085dcd379c44b9de0ee1f1084fae0a4c32c57754b27992b rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 2b588cd2d49688c0c33b7466614123e8fe4c910f4d802fc0ff0662b1772816a9 rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 55abeb1b55aeebc46a4af2f304271361397df58d12f7eb23fb262bc3132c6056 rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 e8d853383355aa17fd8d7efae740ac0f18b3a5f452c9ac62f5042fc96ebda3e9 rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 c9551f9650fcaf74ea4fb6874b6853f9ffecb6925e7a087afb4f36840e5b7b8d rust-1.66.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 ec49ef94889c88f8fd107e9c263003aa6dcd9fb4d17ba057ffab4e4dc28fefd4 rust-1.66.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 755bcca28ee9d4504b7bd87265dc492a8e39550211f8081740940ada9e48cc7e rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 eaaca0295a75a180082456eb3606e6c3fbc16a4f2b54bd754caab5a69b192f88 rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 a194c1a8f1bd8c450872ad2220bfe74e590c5706d4ec939577c69a013a0bbcff rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 9fa197239eb374e071ef4486939c4713a2d662c5e7ebca0505626a3a53a7ed75 rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 6331e676198af2e75734f6566ca62ae22bb61b1d55e749494c454e777a73f195 rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 8d7053db5ea68f4801c7a808a222473076b8a602af70379975e81eede8a7e0ea rust-1.66.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 a656328e1cd36b253bf39807b5a3eacdf0ce7d982fc9fb51a026f273386de84a rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 b5ac5985a8fefd2a0de67197f7c2549aacee502cc784a3c3c93921b005aa31fa rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 ca62347018d1ace5e13a4a2f898dd2b19d5cb96db41482119418538f6482e2db rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 c8d10c558605673fe975b3b1c8ec8d2a9887f18cb97690bf900c19668b6d05ba rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 70650b3a8c04c183a83a2a4ebee7047d6546e69a81e227c24afa6d34ad54fe9b rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 262a2024250e4aa7865a33d52d9b6826b5f059f0562a73f6067a04020879d4f0 rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 e41c5f840d73ed1073ef3a8abb125e6f41a66008ad7817fb2a1e703cf93f0a8b rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 8b8ab8fe4af3ce9604e264fada7ddaed610d8e517d8425d5d85184ea4f111b52 rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 ec0552562348852c487e401168a0ad5f9e90cfc4cf03f5200f80b6594aa47d6d rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 5d166402813621d8c426bdb7dc857f97c72c921c2f2b52a893639a4c73862838 rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 a7170034ddb9218f4f78d6a1d8f8d7ce8c17419015393a96a24aa13f9c89da2d rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 fbc7e7565196fb7ec18b9b2ef0c8a1267fb4825bf68ff0559c0956841d5ade14 rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 7caecb4b926d78ec879e53eaaa4d8001ef575cd80e6340e0518545fd8500eb8f rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 b22aaa59dee87dfc504f7e37ec1f297bbbe3f9ca5a7e4177d40975f2b4b32570 rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-musl.tar.xz.asc +sha256 b538209ea82733f25d88e3a9dc7d7b00f23f61ede128142412404c37846bad69 rust-std-1.66.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 5c7da9cc8d71e72021bfcc8040a6d2c248127d1fbed12d81e2e4bdf61c70b8d6 rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-musl.tar.xz.asc +sha256 3f14c6381c74b175e32ce0f2e6337811a5ea2cc048239fc55101b6319b0ce7f8 rust-std-1.66.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 8909dff6e3fd2c0a2f7c747d8c31003cf6d4fd2ea877ddb933b3fd7861c1cf87 rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-musl.tar.xz.asc +sha256 e76c5fea6da85b42a6f313cc326d064067314532d6a057cfc95f733c2f019de1 rust-std-1.66.0-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 26e5304dc5d592b2a34933794c4636220ad86d78e9c639e36c18f46d3a8c0235 rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 a621c95eef9b548d59234beeea031cc369d5744312a5ebfe4ac2250cb1b900e8 rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 41b2e528e2b123220b2dbc8b6bf93986c22d86091f7cd653ac55d1b169720e1f rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 28de7df8cead0a09a6c4dbb3be6898f7bb495c803e5d1f15945dd66a60ebb2c4 rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 519403a99b0859f21d4cabd347bada629f24fff913dafc54af255e4776d18f1b rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz.asc +sha256 d1a8d76bd7549b3845dad92cdab45876c987e7ba6a27ea67f39414d498a66761 rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 b68691f94417033b612f0fdb510d385499558ea19dcf2caf02a5c1d7141816fd rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0be870ead23d432b83981a45b37bb173315965485ef9ad6dcee1418702a26a3a rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 ed05f169784776c94c4880281fbabab66b49ed05a221d8e06c6926e1161b8bbe rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 93a8b0514106c8039a8767b961090e8a0f8e4b62d1488e70e93e2e553860f70c rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 304008a504385f91672ab6ddf86b50f05a588432f01537049f4fbe95f8d41402 rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 107045313c7b6678579eba1fb0b96519585a2e282570635c64c02ef4544aacaa rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 c59ca7959a019f3f660c1f46bea3c13e7769b67732731469c0c42d02f28d08e7 rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 b4dbc07eb417f77d9b794546d647f014d1650e1e0c0e76ff3d878dc09479e320 rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index 91ee5a5372..b341bc4b7c 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.65.0 +RUST_BIN_VERSION = 1.66.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 9776f3f84c..35028b304b 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.asc -sha256 2d6aa2ea3fedd55acbbd65f78349385f9daa9c14e25db7a8df5d015588eee1cf rustc-1.65.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.xz.asc +sha256 0dc176e34fae9871f855a6ba4cb30fa19d69c5b4428d29281a07419c4950715c rustc-1.66.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index d501391d77..55fa38df18 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.65.0 +RUST_VERSION = 1.66.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:06 -0000 Subject: [Buildroot] [git commit branch/next] boot/ti-k3-r5-loader: new package Message-ID: <20230220205208.A31498648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0189bcb47c7733c36fcbcb88fbf26f57958db576 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is a separate U-Boot package that allows to build the intermediate SPL binary for the Cortex-R5 core on TI's k3 platforms. Usually, the resulting SPL will be used for k3-image-gen to build the full R5 boot binary tiboot3.bin. Signed-off-by: Xuanhao Shi Signed-off-by: Anand Gadiyar Reviewed-by: Giulio Benetti Acked-by: Andrew Davis Tested-by: Bryan Brattlof Cc: Romain Naour Cc: Francois Perrad Reviewed-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 6 ++++ boot/Config.in | 1 + boot/ti-k3-r5-loader/Config.in | 35 ++++++++++++++++++++++ boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 3 ++ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 49 +++++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 29dffaadf1..8e9a743c70 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -128,6 +128,9 @@ F: package/dcron/ F: package/libxmlrpc/ F: package/python-docopt/ +N: Anand Gadiyar +F: boot/ti-k3-r5-loader/ + N: Andr?? Zwing F: package/libkrb5/ F: package/openal/ @@ -3005,6 +3008,9 @@ F: package/python-pyusb/ N: Wojciech Nizi??ski F: package/fwup/ +N: Xuanhao Shi +F: boot/ti-k3-r5-loader/ + N: Yair Ben Avraham F: package/casync/ F: package/gloox/ diff --git a/boot/Config.in b/boot/Config.in index 40472ae07d..ce17b2df6b 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -22,6 +22,7 @@ source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/sun20i-d1-spl/Config.in" source "boot/syslinux/Config.in" +source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in new file mode 100644 index 0000000000..10602c8df3 --- /dev/null +++ b/boot/ti-k3-r5-loader/Config.in @@ -0,0 +1,35 @@ +config BR2_TARGET_TI_K3_R5_LOADER + bool "ti-k3-r5-loader" + depends on BR2_aarch64 + help + Separate U-Boot build for R5 cores on TI's k3 boards. + Usually used to build tiboot3.bin with k3-image-gen. + +if BR2_TARGET_TI_K3_R5_LOADER + +choice + prompt "Configuration" + default BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG + +config BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG + bool "Using an in-tree board defconfig file" + +config BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG + bool "Using a custom board (def)config file" + +endchoice + +config BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG + string "Board defconfig" + depends on BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG + help + Name of the board for which TI K3 R5 Loader should be + built, without the _defconfig suffix. + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE + string "Configuration file path" + depends on BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG + help + Path to the TI K3 R5 Loader configuration file. + +endif diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 100644 index 0000000000..c5d1cb8e09 --- /dev/null +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk new file mode 100644 index 0000000000..422ab20d71 --- /dev/null +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# ti-k3-r5-loader +# +################################################################################ + +TI_K3_R5_LOADER_VERSION = 2022.10 +TI_K3_R5_LOADER_SITE = https://ftp.denx.de/pub/u-boot +TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.bz2 +TI_K3_R5_LOADER_LICENSE = GPL-2.0+ +TI_K3_R5_LOADER_LICENSE_FILES = Licenses/gpl-2.0.txt +TI_K3_R5_LOADER_CPE_ID_VENDOR = denx +TI_K3_R5_LOADER_CPE_ID_PRODUCT = u-boot +TI_K3_R5_LOADER_INSTALL_IMAGES = YES +TI_K3_R5_LOADER_DEPENDENCIES = \ + host-pkgconf \ + $(BR2_MAKE_HOST_DEPENDENCY) \ + host-arm-gnu-toolchain \ + host-openssl + +TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) +TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) +TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ + host-arm-gnu-toolchain \ + $(BR2_MAKE_HOST_DEPENDENCY) \ + $(BR2_BISON_HOST_DEPENDENCY) \ + $(BR2_FLEX_HOST_DEPENDENCY) + +TI_K3_R5_LOADER_BOARD = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD)) +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) +TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig +else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) +TI_K3_R5_LOADER_KCONFIG_FILE = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE)) +endif # BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG +TI_K3_R5_LOADER_MAKE_OPTS = \ + CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ + ARCH=arm \ + HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ + HOSTLDFLAGS="$(HOST_LDFLAGS)" + +define TI_K3_R5_LOADER_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) +endef + +define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS + cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin +endef + +$(eval $(kconfig-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:06 -0000 Subject: [Buildroot] [git commit branch/next] package/capnproto: bump version to 0.10.3 Message-ID: <20230220205218.0856F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96d3e5fd2f5310e9f626084669a9ddaa55c92eda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The 0.10 line offers minor improvements and bug fixes. The previous security bump from 0.9.1 to 0.9.2 fixed CVE-2022-46149, which was also present in 0.10.2, but is fixed within 0.10.3. Signed-off-by: Joel Carlson Signed-off-by: Thomas Petazzoni --- package/capnproto/capnproto.hash | 2 +- package/capnproto/capnproto.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash index c3233e7c8b..0faf69d069 100644 --- a/package/capnproto/capnproto.hash +++ b/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4fe1ca8ab90859f33f08d2c4fcd7099e2983b0b946beecebd2fe051e3a64c67e capnproto-0.9.2.tar.gz +sha256 e07446f56043c983e009038e69d18ff86a2924909f0b518ccf47eccf5ac03919 capnproto-0.10.3.tar.gz sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk index 23f128455a..84acf5fc65 100644 --- a/package/capnproto/capnproto.mk +++ b/package/capnproto/capnproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAPNPROTO_VERSION = 0.9.2 +CAPNPROTO_VERSION = 0.10.3 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:07 -0000 Subject: [Buildroot] [git commit branch/next] package/zfs: bump version to 2.1.7 Message-ID: <20230220205208.D3D938648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ba57676c52a41f9f2efa311f101eb637c39897b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jos?? Luis Salvador Rufo Signed-off-by: Thomas Petazzoni --- package/zfs/zfs.hash | 4 ++-- package/zfs/zfs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index b73fc3b703..0bce3817fe 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,5 +1,5 @@ -# From https://github.com/openzfs/zfs/releases/download/zfs-2.1.6/zfs-2.1.6.sha256.asc -sha256 15339014f8d2131348eb937bf8893849806b6d2645ea607a18c7f117749dbd7a zfs-2.1.6.tar.gz +# From https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.sha256.asc +sha256 6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b zfs-2.1.7.tar.gz sha256 96a27353fe717ff2c8b95deb8b009c4eb750303c6400e2d8a2582ab1ec12b25a bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch # Hash for license files: diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index f7e673c23f..84e9099ba9 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZFS_VERSION = 2.1.6 +ZFS_VERSION = 2.1.7 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) ZFS_PATCH = https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch ZFS_LICENSE = CDDL From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:07 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-firmware: bump to version 20221214 Message-ID: <20230220205218.30BA386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7854488512a96cbcb2d48313b89c7d085a1c2cfb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update WHENCE file hash due to date/firmware file updates: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=32d8681d21f2eef052cadfdfafc47e02eed6c2b2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.hash | 4 ++-- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 321436fb61..6bbc2f9c77 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 c0ddffbbcf30f2e015bddd5c6d3ce1f13976b906aceabda4a57e3c41a3190701 linux-firmware-20221109.tar.xz +sha256 e793783e92acbde549965521462d1d1327827360664cf242dbda08f075654331 linux-firmware-20221214.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -35,6 +35,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 3461a8c8bddaa7b77f489f339abf90e4930fc0cde27915324781d12bd0828f1c WHENCE +sha256 744babd4eae138ccfb5bd343b1589912b9839274f8a794af0b6c9b451df73579 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 526e8c1c44..6990ef38ad 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20221109 +LINUX_FIRMWARE_VERSION = 20221214 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 thomas.petazzoni at bootlin.com Mon Feb 20 20:56:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:08 -0000 Subject: [Buildroot] [git commit branch/next] package/vuejs: bump version to 3.2.45 Message-ID: <20230220205208.ED223828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85c497c230dbf61bd1acbd3dcf55a93887560775 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/vuejs/vuejs.hash | 2 +- package/vuejs/vuejs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vuejs/vuejs.hash b/package/vuejs/vuejs.hash index c53364e97d..e66bee06d3 100644 --- a/package/vuejs/vuejs.hash +++ b/package/vuejs/vuejs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 042033a2a8e6d45f750924953f03c34058d5afd9cc1571fbaf1827eaf04f6943 vue-3.2.33.tgz +sha256 968e71a707a4a1961faa6e513b6bba162ef04c3413d7edaba0abc1a5996ae71b vue-3.2.45.tgz sha256 1bb85cc9b13b81ef41c81c51866172fc345e0503c86726a6755b796590b70175 LICENSE diff --git a/package/vuejs/vuejs.mk b/package/vuejs/vuejs.mk index d544124bbc..8f7d0cd3d4 100644 --- a/package/vuejs/vuejs.mk +++ b/package/vuejs/vuejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_VERSION = 3.2.33 +VUEJS_VERSION = 3.2.45 VUEJS_SOURCE = vue-$(VUEJS_VERSION).tgz VUEJS_SITE = https://registry.npmjs.org/vue/- VUEJS_LICENSE = MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:09 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-firmware: add RTL8125B NIC firmware Message-ID: <20230220205218.24BBF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=909e10a422df33cd67e6f0fc6ad628ee2c1fb933 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Needed due to kernel commit: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0439297be95111cf9ef5ece2091af16d140ce2ef Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 200b4ca564..526e8c1c44 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -584,6 +584,7 @@ LINUX_FIRMWARE_FILES += \ rtl_nic/rtl8107e-1.fw \ rtl_nic/rtl8107e-2.fw \ rtl_nic/rtl8125a-3.fw \ + rtl_nic/rtl8125b-2.fw \ rtl_nic/rtl8168d-1.fw \ rtl_nic/rtl8168d-2.fw \ rtl_nic/rtl8168e-1.fw \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:09 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8192eu: bump to latest version to support up to Linux 6.1 Message-ID: <20230220205209.1D8B6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cb92ddbb92264bcef1794dd7c28ee76c9353c36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index f616def194..0cb9961345 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 75b523ff1cda54d7cd8734a043b2d145231ab81fcc13d3edcd80e00d59201409 rtl8192eu-1e15b6d451731bc4d3ffd587194dc4bd0f286ac0.tar.gz +sha256 827e9592336744cbcfca5de988d8f4e14a62690302d3cabf72aa4bedebded2b7 rtl8192eu-94bce7798bbb18de6d8b1646dedb2511f24867d3.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index 0e8ffea5cb..e1688eef1b 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = 1e15b6d451731bc4d3ffd587194dc4bd0f286ac0 +RTL8192EU_VERSION = 94bce7798bbb18de6d8b1646dedb2511f24867d3 RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 RTL8192EU_MODULE_MAKE_OPTS = \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:10 -0000 Subject: [Buildroot] [git commit branch/next] package/libmodplug: update to git version Message-ID: <20230220205218.4BBA7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=369ff9a88ff8e88b78287e37fbaf191e57598be2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The libmodplug release has not been updated for over 5 years. The git version contains many bug fixes, including for OOB accesses, unaligned reads and writes, etc. This git repository is the official home of libmodplug (by the original author), however a new release does not seem likely anytime soon: there are multiple open issues in the repository asking the author to tag a release, all without a response. Update buildroot to the current version of libmodplug from the official git repository. The build system changed from autotools to cmake since the last version. We add a _CPE_ID_VERSION variable pointing to the latest stable version, so that we don't get notified about all older CVEs that we are not affected by. Signed-off-by: Gleb Mazovetskiy Signed-off-by: Thomas Petazzoni --- package/libmodplug/libmodplug.hash | 2 +- package/libmodplug/libmodplug.mk | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libmodplug/libmodplug.hash b/package/libmodplug/libmodplug.hash index e75152e27f..01ff71014c 100644 --- a/package/libmodplug/libmodplug.hash +++ b/package/libmodplug/libmodplug.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de libmodplug-0.8.9.0.tar.gz +sha256 d145910ca10c3ecab0019d45be7e31ea6be1d1ee951ef0e1f747c9752d20f043 libmodplug-d1b97ed.tar.gz sha256 49942e7b3b175f549e751feb08b5270ca6f6c5fb7a1be9f9517db275ec32c92e COPYING diff --git a/package/libmodplug/libmodplug.mk b/package/libmodplug/libmodplug.mk index 98c38a3b00..735d0e704d 100644 --- a/package/libmodplug/libmodplug.mk +++ b/package/libmodplug/libmodplug.mk @@ -4,11 +4,14 @@ # ################################################################################ -LIBMODPLUG_VERSION = 0.8.9.0 -LIBMODPLUG_SITE = http://downloads.sourceforge.net/project/modplug-xmms/libmodplug/$(LIBMODPLUG_VERSION) +LIBMODPLUG_VERSION = d1b97ed +LIBMODPLUG_SITE = $(call github,Konstanty,libmodplug,$(LIBMODPLUG_VERSION)) LIBMODPLUG_INSTALL_STAGING = YES LIBMODPLUG_LICENSE = Public Domain LIBMODPLUG_LICENSE_FILES = COPYING LIBMODPLUG_CPE_ID_VENDOR = konstanty_bialkowski +# Our version is actually newer than this, but having this allows to +# not have reports about CVEs for versions older than 0.8.9.0. +LIBMODPLUG_CPE_ID_VERSION = 0.8.9.0 -$(eval $(autotools-package)) +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:10 -0000 Subject: [Buildroot] [git commit branch/next] package/vuejs-router: bump version to 4.1.6 Message-ID: <20230220205209.05C708648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fce36d928082685d7f77c3587e15b7827ce0b42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/vuejs-router/vuejs-router.hash | 2 +- package/vuejs-router/vuejs-router.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vuejs-router/vuejs-router.hash b/package/vuejs-router/vuejs-router.hash index ba8f09b508..147e730f20 100644 --- a/package/vuejs-router/vuejs-router.hash +++ b/package/vuejs-router/vuejs-router.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 59d6f3e237e68953fc4e4e22463b487b9fde5733b3ff3392eec488c0cc84976b vue-router-4.0.15.tgz +sha256 437558a84b99d0d89743d4897ec16a90a96a1d3a6786e697a8808a044bcb9b8f vue-router-4.1.6.tgz sha256 9c0015250f592a09d7787efc07152afcf661fff6bda2554359f6d00987828c02 LICENSE diff --git a/package/vuejs-router/vuejs-router.mk b/package/vuejs-router/vuejs-router.mk index 562c698157..de7e9c30c5 100644 --- a/package/vuejs-router/vuejs-router.mk +++ b/package/vuejs-router/vuejs-router.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_ROUTER_VERSION = 4.0.15 +VUEJS_ROUTER_VERSION = 4.1.6 VUEJS_ROUTER_SOURCE = vue-router-$(VUEJS_ROUTER_VERSION).tgz VUEJS_ROUTER_SITE = https://registry.npmjs.org/vue-router/- VUEJS_ROUTER_LICENSE = MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:11 -0000 Subject: [Buildroot] [git commit branch/next] package/rsync: add zstd support Message-ID: <20230220205218.97F05828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83a3744c73d5630ded3f85dc801fe3827ab82889 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 3cdd820fc0..7a32c4f8b1 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -19,7 +19,6 @@ RSYNC_CONF_OPTS = \ --with-included-popt=no \ --disable-roll-simd \ --disable-openssl \ - --disable-zstd \ --disable-lz4 \ --disable-md5-asm @@ -36,4 +35,11 @@ else RSYNC_CONF_OPTS += --disable-xxhash endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +RSYNC_DEPENDENCIES += zstd +RSYNC_CONF_OPTS += --enable-zstd +else +RSYNC_CONF_OPTS += --disable-zstd +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:11 -0000 Subject: [Buildroot] [git commit branch/next] package/balena-engine: bump to version 20.10.21 Message-ID: <20230220205209.2A46D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5d12e66ca9058b86fe90c8e683a5029b1c8bb37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/balena-os/balena-engine/blob/v20.10.21/CHANGELOG.md Signed-off-by: Christian Stewart Tested-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- 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..4adb8ce561 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 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index 0afcea3d7e..ecfb62bfbf 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.21 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:12 -0000 Subject: [Buildroot] [git commit branch/next] package/rsync: add lz4 support Message-ID: <20230220205218.A521086496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9511fe9b1c8fbb797f50dde708f7aae50e6d6a46 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 7a32c4f8b1..9c7824f575 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -19,7 +19,6 @@ RSYNC_CONF_OPTS = \ --with-included-popt=no \ --disable-roll-simd \ --disable-openssl \ - --disable-lz4 \ --disable-md5-asm ifeq ($(BR2_PACKAGE_ACL),y) @@ -28,6 +27,13 @@ else RSYNC_CONF_OPTS += --disable-acl-support endif +ifeq ($(BR2_PACKAGE_LZ4),y) +RSYNC_DEPENDENCIES += lz4 +RSYNC_CONF_OPTS += --enable-lz4 +else +RSYNC_CONF_OPTS += --disable-lz4 +endif + ifeq ($(BR2_PACKAGE_XXHASH),y) RSYNC_DEPENDENCIES += xxhash RSYNC_CONF_OPTS += --enable-xxhash From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:12 -0000 Subject: [Buildroot] [git commit branch/next] package/mali-driver: bump to latest version to build with Linux version up to 6.0 Message-ID: <20230220205209.42E11828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8405dcae33b47bd5b8cf5ef4faf0db01644a1d4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update to the latest upstream version, to which a few fixes were added to fix build failures with Aarch64 and Linux 5.18/5.19/6.0 Fixes: http://autobuild.buildroot.net/results/6f073fea149533a294dd838ce8373185236fe1d4/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/mali-driver/mali-driver.hash | 2 +- package/mali-driver/mali-driver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mali-driver/mali-driver.hash b/package/mali-driver/mali-driver.hash index d18db55fe0..5d32c1af8a 100644 --- a/package/mali-driver/mali-driver.hash +++ b/package/mali-driver/mali-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 512ca30916fd9b9abec70073fced1c2d33757cddbcb3d0f1d1c4b8c6c318f207 mali-driver-3d697de9bce8bc68bf9408d5407873ce32d0f4fc.tar.gz +sha256 761e3f000b4c546cbd35baf34f5a0d1090f048dd44ee543773674192fd95f6b3 mali-driver-87c13e6994b20b5068e3a5e4f4c1b64db666a4c8.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mali-driver/mali-driver.mk b/package/mali-driver/mali-driver.mk index 515f70c429..bdc9fedeb4 100644 --- a/package/mali-driver/mali-driver.mk +++ b/package/mali-driver/mali-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -MALI_DRIVER_VERSION = 3d697de9bce8bc68bf9408d5407873ce32d0f4fc +MALI_DRIVER_VERSION = 87c13e6994b20b5068e3a5e4f4c1b64db666a4c8 MALI_DRIVER_SITE = $(call github,bootlin,mali-driver,$(MALI_DRIVER_VERSION)) MALI_DRIVER_DEPENDENCIES = linux MALI_DRIVER_LICENSE = GPL-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:13 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: add zstd optional dependency Message-ID: <20230220205218.C4194828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f934a00928b413fb3c190749a5bda578c6c02255 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next zstd is an optional dependency which is enabled by default since version 4.0.10 and https://gitlab.com/libtiff/libtiff/-/commit/62b9df5d2af68262fa6fcfb66086bf128f7d67c3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tiff/Config.in | 4 ++++ package/tiff/tiff.mk | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index cc9aa5cfd0..d1004d6668 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -72,4 +72,8 @@ config BR2_PACKAGE_TIFF_UTILITIES help Install all tiff utilities. +config BR2_PACKAGE_TIFF_ZSTD + bool "ZSTD compression" + select BR2_PACKAGE_ZSTD + endif diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index a753065fde..90b28ff37a 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -100,5 +100,12 @@ else TIFF_CONF_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_TIFF_ZSTD),y) +TIFF_CONF_OPTS += --enable-zstd +TIFF_DEPENDENCIES += zstd +else +TIFF_CONF_OPTS += --disable-zstd +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:13 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-mediadriver: fix build without X11 Message-ID: <20230220205209.5C7778648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16ed6b9a4a689496b69ba7b5daf122a88db40ce9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/52c/52c8f5352b16ced4e85286950f95e1b57c564fa5/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-dont-include-va-dricommon-h.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch b/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch new file mode 100644 index 0000000000..9d512f9c0b --- /dev/null +++ b/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch @@ -0,0 +1,36 @@ +From e0d2caafcd5e583a01f7792eaec5d1f2d540bdf1 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Fri, 18 Nov 2022 22:44:52 +1100 +Subject: [PATCH] [Media Common] [VP] dont include va_dricommon.h + + is not in non-X11 libva 2.16.0 +The header "media_libva_putsurface_linux.h" is included + +Downloaded from upstream commit +https://github.com/intel/media-driver/commit/e0d2caafcd5e583a01f7792eaec5d1f2d540bdf1 + +Signed-off-by: Rudi Heitbaum +Signed-off-by: Bernd Kuhls +--- + media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp +index 8695d6c86..6719c07b3 100644 +--- a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp ++++ b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp +@@ -23,7 +23,6 @@ + //! \file ddi_vp_functions.cpp + //! \brief ddi vp functions implementaion. + //! +-#include + #include "ddi_vp_functions.h" + #include "media_libva_util_next.h" + #include "media_libva_common_next.h" +@@ -4700,4 +4699,4 @@ VAStatus DdiVpFunctions::PutSurfaceLinuxHW( + + return VA_STATUS_SUCCESS; + } +-#endif // !defined(ANDROID) && defined(X11_FOUND) +\ No newline at end of file ++#endif // !defined(ANDROID) && defined(X11_FOUND) From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:14 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: add C++ support Message-ID: <20230220205218.E55FC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db853e24b534d54f281cecbed0eb17412cdfc710 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tiff/tiff.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 6d761ad678..c2a4108f35 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -14,7 +14,6 @@ TIFF_INSTALL_STAGING = YES TIFF_CONF_OPTS = \ --disable-contrib \ - --disable-cxx \ --disable-tests \ --without-x @@ -29,6 +28,12 @@ HOST_TIFF_CONF_OPTS = \ --disable-tests HOST_TIFF_DEPENDENCIES = host-pkgconf +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +TIFF_CONF_OPTS += --enable-cxx +else +TIFF_CONF_OPTS += --disable-cxx +endif + ifneq ($(BR2_PACKAGE_TIFF_CCITT),y) TIFF_CONF_OPTS += --disable-ccitt endif From yann.morin.1998 at free.fr Mon Feb 20 20:56:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:14 -0000 Subject: [Buildroot] [git commit branch/next] package/libmbim: fix license Message-ID: <20230220205209.886958648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3b31a39fdffbf738789885f6e318131055e4b9b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libmbim library is licensed under LGPL-2.1+ since at least version 1.8.0 and https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/25cc3ed88d25b17c18fb32f46f96b560834387d3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libmbim/libmbim.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index 1c12b82298..e728cf58f9 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -6,7 +6,7 @@ LIBMBIM_VERSION = 1.28.2 LIBMBIM_SITE = https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION) -LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) +LIBMBIM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs) LIBMBIM_LICENSE_FILES = COPYING COPYING.LIB LIBMBIM_CPE_ID_VENDOR = freedesktop LIBMBIM_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:15 -0000 Subject: [Buildroot] [git commit branch/next] package/python-m2r: remove package Message-ID: <20230220205209.7869E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=470ce5d85c40a2f3b43dd9efaefac0000b047d23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since the bump of python-mistune to version 2.0.4 in commit ead539c27dd61ba010b3723b26af91da0779eb98, the python-m2r package fails to build: it is no longer maintained and no longer compatible with recent versions of python-mistune. Since the only user of python-m2r, python-automat, no longer needs it, we can safely drop this package. Fixes: http://autobuild.buildroot.net/results/9041acc5be4d2b33dee9ff0ad66dcd41d4dbfba1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-m2r/Config.in | 8 -------- package/python-m2r/python-m2r.hash | 5 ----- package/python-m2r/python-m2r.mk | 16 ---------------- 5 files changed, 6 insertions(+), 30 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 9136ccd0e0..28c6822689 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_PYTHON_M2R + bool "python-m2r removed" + select BR2_LEGACY + help + The python-m2r package is unmaintained. + config BR2_PACKAGE_MESA3D_XVMC bool "mesa Gallium XvMC state tracker removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 10a0493b8d..914c3584e9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1112,7 +1112,6 @@ menu "External python modules" source "package/python-logstash/Config.in" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" - source "package/python-m2r/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-m2r/Config.in b/package/python-m2r/Config.in deleted file mode 100644 index 44dafaa464..0000000000 --- a/package/python-m2r/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_M2R - bool "python-m2r" - select BR2_PACKAGE_PYTHON_MISTUNE # runtime - select BR2_PACKAGE_PYTHON_DOCUTILS # runtime - help - Markdown to reStructuredText converter. - - https://github.com/miyakogi/m2r diff --git a/package/python-m2r/python-m2r.hash b/package/python-m2r/python-m2r.hash deleted file mode 100644 index 4bdd7160d8..0000000000 --- a/package/python-m2r/python-m2r.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/m2r/json -md5 255d080f56eb3d3a82d95194850c99c3 m2r-0.3.1.tar.gz -sha256 aafb67fc49cfb1d89e46a3443ac747e15f4bb42df20ed04f067ad9efbee256ab m2r-0.3.1.tar.gz -# Locally computed sha256 checksums -sha256 28728ec0ecbd8c171ebaeccebf69e3961282fd81f06abc7424c65546b6ae6f27 LICENSE diff --git a/package/python-m2r/python-m2r.mk b/package/python-m2r/python-m2r.mk deleted file mode 100644 index 8a4708f128..0000000000 --- a/package/python-m2r/python-m2r.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-m2r -# -################################################################################ - -PYTHON_M2R_VERSION = 0.3.1 -PYTHON_M2R_SOURCE = m2r-$(PYTHON_M2R_VERSION).tar.gz -PYTHON_M2R_SITE = https://files.pythonhosted.org/packages/94/65/fd40fbdc608298e760affb95869c3baed237dfe5649d62da1eaa1deca8f3 -PYTHON_M2R_SETUP_TYPE = setuptools -PYTHON_M2R_LICENSE = MIT -PYTHON_M2R_LICENSE_FILES = LICENSE -HOST_PYTHON_M2R_DEPENDENCIES = host-python-docutils host-python-mistune - -$(eval $(python-package)) -$(eval $(host-python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:56:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:15 -0000 Subject: [Buildroot] [git commit branch/next] board/freescale/imx28evk/readme.txt: update broken url Message-ID: <20230220205219.759F386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e54522caeeaec2e14065752cb3905d292f374e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next http://freescale.com/ urls are all redirected to the NXP homepage https://www.nxp.com/ Even if the link is not broken in the sense of a 404 http error, the pointed resource is not found. This commit updates the old Freescale link to the correct nxp.com location. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- board/freescale/imx28evk/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/imx28evk/readme.txt b/board/freescale/imx28evk/readme.txt index 2920cb04cd..3b77634fe1 100644 --- a/board/freescale/imx28evk/readme.txt +++ b/board/freescale/imx28evk/readme.txt @@ -54,4 +54,4 @@ Enjoy! References ========== -[1] http://cache.freescale.com/files/32bit/doc/user_guide/EVK_imx28_QuickStart.pdf +[1] https://www.nxp.com/docs/en/user-guide/EVK_imx28_QuickStart.pdf From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:16 -0000 Subject: [Buildroot] [git commit branch/next] package/bearssl: fix build with make shuffle mode Message-ID: <20230220205217.87DB386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1ecfe135747c28bcb3492e60f0d7aea630ead55 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The make targets in bearssl are missing the $(OBJDIR) target which causes build failures when using make with shuffle mode. Add a patch which adds the missing $(OBJDIR) targets. Fixes: Assembler messages: Fatal error: can't create build/obj/x509_minimal_full.o: No such file or directory make[2]: *** [mk/Rules.mk:1190: build/obj/x509_minimal_full.o] Error 1 shuffle=reverse Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../0001-Fix-missing-objdir-dependency.patch | 1252 ++++++++++++++++++++ 1 file changed, 1252 insertions(+) diff --git a/package/bearssl/0001-Fix-missing-objdir-dependency.patch b/package/bearssl/0001-Fix-missing-objdir-dependency.patch new file mode 100644 index 0000000000..4d4d9ee705 --- /dev/null +++ b/package/bearssl/0001-Fix-missing-objdir-dependency.patch @@ -0,0 +1,1252 @@ +From 6fddb4056e0b8f72c2602ef82dcd973704354962 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Mon, 12 Dec 2022 10:12:58 -0700 +Subject: [PATCH] Fix missing objdir dependency. + +Make targets within $(OBJDIR) must depend on the $(OBJDIR) +target. + +Fixes: +Assembler messages: +Fatal error: can't create build/obj/x509_minimal_full.o: No such file or directory +make[2]: *** [mk/Rules.mk:1190: build/obj/x509_minimal_full.o] Error 1 shuffle=reverse + +Signed-off-by: James Hilliard +Cc: Thomas Pornin +Cc: Thomas Pornin +[Upstream status: emailed patch to maintainer] +--- + mk/Rules.mk | 594 +++++++++++++++++++++++++------------------------- + mk/mkrules.sh | 8 +- + 2 files changed, 301 insertions(+), 301 deletions(-) + +diff --git a/mk/Rules.mk b/mk/Rules.mk +index b480bd6..a868977 100644 +--- a/mk/Rules.mk ++++ b/mk/Rules.mk +@@ -358,893 +358,893 @@ $(TESTSPEED): $(BEARSSLLIB) $(OBJTESTSPEED) + $(TESTX509): $(BEARSSLLIB) $(OBJTESTX509) + $(LD) $(LDFLAGS) $(LDOUT)$(TESTX509) $(OBJTESTX509) $(BEARSSLLIB) + +-$(OBJDIR)$Psettings$O: src$Psettings.c $(HEADERSPRIV) ++$(OBJDIR)$Psettings$O: $(OBJDIR) src$Psettings.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psettings$O src$Psettings.c + +-$(OBJDIR)$Pccm$O: src$Paead$Pccm.c $(HEADERSPRIV) ++$(OBJDIR)$Pccm$O: $(OBJDIR) src$Paead$Pccm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pccm$O src$Paead$Pccm.c + +-$(OBJDIR)$Peax$O: src$Paead$Peax.c $(HEADERSPRIV) ++$(OBJDIR)$Peax$O: $(OBJDIR) src$Paead$Peax.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Peax$O src$Paead$Peax.c + +-$(OBJDIR)$Pgcm$O: src$Paead$Pgcm.c $(HEADERSPRIV) ++$(OBJDIR)$Pgcm$O: $(OBJDIR) src$Paead$Pgcm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pgcm$O src$Paead$Pgcm.c + +-$(OBJDIR)$Pccopy$O: src$Pcodec$Pccopy.c $(HEADERSPRIV) ++$(OBJDIR)$Pccopy$O: $(OBJDIR) src$Pcodec$Pccopy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pccopy$O src$Pcodec$Pccopy.c + +-$(OBJDIR)$Pdec16be$O: src$Pcodec$Pdec16be.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec16be$O: $(OBJDIR) src$Pcodec$Pdec16be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec16be$O src$Pcodec$Pdec16be.c + +-$(OBJDIR)$Pdec16le$O: src$Pcodec$Pdec16le.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec16le$O: $(OBJDIR) src$Pcodec$Pdec16le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec16le$O src$Pcodec$Pdec16le.c + +-$(OBJDIR)$Pdec32be$O: src$Pcodec$Pdec32be.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec32be$O: $(OBJDIR) src$Pcodec$Pdec32be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec32be$O src$Pcodec$Pdec32be.c + +-$(OBJDIR)$Pdec32le$O: src$Pcodec$Pdec32le.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec32le$O: $(OBJDIR) src$Pcodec$Pdec32le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec32le$O src$Pcodec$Pdec32le.c + +-$(OBJDIR)$Pdec64be$O: src$Pcodec$Pdec64be.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec64be$O: $(OBJDIR) src$Pcodec$Pdec64be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec64be$O src$Pcodec$Pdec64be.c + +-$(OBJDIR)$Pdec64le$O: src$Pcodec$Pdec64le.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec64le$O: $(OBJDIR) src$Pcodec$Pdec64le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec64le$O src$Pcodec$Pdec64le.c + +-$(OBJDIR)$Penc16be$O: src$Pcodec$Penc16be.c $(HEADERSPRIV) ++$(OBJDIR)$Penc16be$O: $(OBJDIR) src$Pcodec$Penc16be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc16be$O src$Pcodec$Penc16be.c + +-$(OBJDIR)$Penc16le$O: src$Pcodec$Penc16le.c $(HEADERSPRIV) ++$(OBJDIR)$Penc16le$O: $(OBJDIR) src$Pcodec$Penc16le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc16le$O src$Pcodec$Penc16le.c + +-$(OBJDIR)$Penc32be$O: src$Pcodec$Penc32be.c $(HEADERSPRIV) ++$(OBJDIR)$Penc32be$O: $(OBJDIR) src$Pcodec$Penc32be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc32be$O src$Pcodec$Penc32be.c + +-$(OBJDIR)$Penc32le$O: src$Pcodec$Penc32le.c $(HEADERSPRIV) ++$(OBJDIR)$Penc32le$O: $(OBJDIR) src$Pcodec$Penc32le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc32le$O src$Pcodec$Penc32le.c + +-$(OBJDIR)$Penc64be$O: src$Pcodec$Penc64be.c $(HEADERSPRIV) ++$(OBJDIR)$Penc64be$O: $(OBJDIR) src$Pcodec$Penc64be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc64be$O src$Pcodec$Penc64be.c + +-$(OBJDIR)$Penc64le$O: src$Pcodec$Penc64le.c $(HEADERSPRIV) ++$(OBJDIR)$Penc64le$O: $(OBJDIR) src$Pcodec$Penc64le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc64le$O src$Pcodec$Penc64le.c + +-$(OBJDIR)$Ppemdec$O: src$Pcodec$Ppemdec.c $(HEADERSPRIV) ++$(OBJDIR)$Ppemdec$O: $(OBJDIR) src$Pcodec$Ppemdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppemdec$O src$Pcodec$Ppemdec.c + +-$(OBJDIR)$Ppemenc$O: src$Pcodec$Ppemenc.c $(HEADERSPRIV) ++$(OBJDIR)$Ppemenc$O: $(OBJDIR) src$Pcodec$Ppemenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppemenc$O src$Pcodec$Ppemenc.c + +-$(OBJDIR)$Pec_all_m15$O: src$Pec$Pec_all_m15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_all_m15$O: $(OBJDIR) src$Pec$Pec_all_m15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_all_m15$O src$Pec$Pec_all_m15.c + +-$(OBJDIR)$Pec_all_m31$O: src$Pec$Pec_all_m31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_all_m31$O: $(OBJDIR) src$Pec$Pec_all_m31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_all_m31$O src$Pec$Pec_all_m31.c + +-$(OBJDIR)$Pec_c25519_i15$O: src$Pec$Pec_c25519_i15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_i15$O: $(OBJDIR) src$Pec$Pec_c25519_i15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_i15$O src$Pec$Pec_c25519_i15.c + +-$(OBJDIR)$Pec_c25519_i31$O: src$Pec$Pec_c25519_i31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_i31$O: $(OBJDIR) src$Pec$Pec_c25519_i31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_i31$O src$Pec$Pec_c25519_i31.c + +-$(OBJDIR)$Pec_c25519_m15$O: src$Pec$Pec_c25519_m15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_m15$O: $(OBJDIR) src$Pec$Pec_c25519_m15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_m15$O src$Pec$Pec_c25519_m15.c + +-$(OBJDIR)$Pec_c25519_m31$O: src$Pec$Pec_c25519_m31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_m31$O: $(OBJDIR) src$Pec$Pec_c25519_m31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_m31$O src$Pec$Pec_c25519_m31.c + +-$(OBJDIR)$Pec_curve25519$O: src$Pec$Pec_curve25519.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_curve25519$O: $(OBJDIR) src$Pec$Pec_curve25519.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_curve25519$O src$Pec$Pec_curve25519.c + +-$(OBJDIR)$Pec_default$O: src$Pec$Pec_default.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_default$O: $(OBJDIR) src$Pec$Pec_default.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_default$O src$Pec$Pec_default.c + +-$(OBJDIR)$Pec_keygen$O: src$Pec$Pec_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_keygen$O: $(OBJDIR) src$Pec$Pec_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_keygen$O src$Pec$Pec_keygen.c + +-$(OBJDIR)$Pec_p256_m15$O: src$Pec$Pec_p256_m15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_p256_m15$O: $(OBJDIR) src$Pec$Pec_p256_m15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_p256_m15$O src$Pec$Pec_p256_m15.c + +-$(OBJDIR)$Pec_p256_m31$O: src$Pec$Pec_p256_m31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_p256_m31$O: $(OBJDIR) src$Pec$Pec_p256_m31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_p256_m31$O src$Pec$Pec_p256_m31.c + +-$(OBJDIR)$Pec_prime_i15$O: src$Pec$Pec_prime_i15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_prime_i15$O: $(OBJDIR) src$Pec$Pec_prime_i15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_prime_i15$O src$Pec$Pec_prime_i15.c + +-$(OBJDIR)$Pec_prime_i31$O: src$Pec$Pec_prime_i31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_prime_i31$O: $(OBJDIR) src$Pec$Pec_prime_i31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_prime_i31$O src$Pec$Pec_prime_i31.c + +-$(OBJDIR)$Pec_pubkey$O: src$Pec$Pec_pubkey.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_pubkey$O: $(OBJDIR) src$Pec$Pec_pubkey.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_pubkey$O src$Pec$Pec_pubkey.c + +-$(OBJDIR)$Pec_secp256r1$O: src$Pec$Pec_secp256r1.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_secp256r1$O: $(OBJDIR) src$Pec$Pec_secp256r1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_secp256r1$O src$Pec$Pec_secp256r1.c + +-$(OBJDIR)$Pec_secp384r1$O: src$Pec$Pec_secp384r1.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_secp384r1$O: $(OBJDIR) src$Pec$Pec_secp384r1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_secp384r1$O src$Pec$Pec_secp384r1.c + +-$(OBJDIR)$Pec_secp521r1$O: src$Pec$Pec_secp521r1.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_secp521r1$O: $(OBJDIR) src$Pec$Pec_secp521r1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_secp521r1$O src$Pec$Pec_secp521r1.c + +-$(OBJDIR)$Pecdsa_atr$O: src$Pec$Pecdsa_atr.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_atr$O: $(OBJDIR) src$Pec$Pecdsa_atr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_atr$O src$Pec$Pecdsa_atr.c + +-$(OBJDIR)$Pecdsa_default_sign_asn1$O: src$Pec$Pecdsa_default_sign_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_sign_asn1$O: $(OBJDIR) src$Pec$Pecdsa_default_sign_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_sign_asn1$O src$Pec$Pecdsa_default_sign_asn1.c + +-$(OBJDIR)$Pecdsa_default_sign_raw$O: src$Pec$Pecdsa_default_sign_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_sign_raw$O: $(OBJDIR) src$Pec$Pecdsa_default_sign_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_sign_raw$O src$Pec$Pecdsa_default_sign_raw.c + +-$(OBJDIR)$Pecdsa_default_vrfy_asn1$O: src$Pec$Pecdsa_default_vrfy_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_vrfy_asn1$O: $(OBJDIR) src$Pec$Pecdsa_default_vrfy_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_vrfy_asn1$O src$Pec$Pecdsa_default_vrfy_asn1.c + +-$(OBJDIR)$Pecdsa_default_vrfy_raw$O: src$Pec$Pecdsa_default_vrfy_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_vrfy_raw$O: $(OBJDIR) src$Pec$Pecdsa_default_vrfy_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_vrfy_raw$O src$Pec$Pecdsa_default_vrfy_raw.c + +-$(OBJDIR)$Pecdsa_i15_bits$O: src$Pec$Pecdsa_i15_bits.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_bits$O: $(OBJDIR) src$Pec$Pecdsa_i15_bits.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_bits$O src$Pec$Pecdsa_i15_bits.c + +-$(OBJDIR)$Pecdsa_i15_sign_asn1$O: src$Pec$Pecdsa_i15_sign_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_sign_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i15_sign_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_sign_asn1$O src$Pec$Pecdsa_i15_sign_asn1.c + +-$(OBJDIR)$Pecdsa_i15_sign_raw$O: src$Pec$Pecdsa_i15_sign_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_sign_raw$O: $(OBJDIR) src$Pec$Pecdsa_i15_sign_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_sign_raw$O src$Pec$Pecdsa_i15_sign_raw.c + +-$(OBJDIR)$Pecdsa_i15_vrfy_asn1$O: src$Pec$Pecdsa_i15_vrfy_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_vrfy_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i15_vrfy_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_vrfy_asn1$O src$Pec$Pecdsa_i15_vrfy_asn1.c + +-$(OBJDIR)$Pecdsa_i15_vrfy_raw$O: src$Pec$Pecdsa_i15_vrfy_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_vrfy_raw$O: $(OBJDIR) src$Pec$Pecdsa_i15_vrfy_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_vrfy_raw$O src$Pec$Pecdsa_i15_vrfy_raw.c + +-$(OBJDIR)$Pecdsa_i31_bits$O: src$Pec$Pecdsa_i31_bits.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_bits$O: $(OBJDIR) src$Pec$Pecdsa_i31_bits.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_bits$O src$Pec$Pecdsa_i31_bits.c + +-$(OBJDIR)$Pecdsa_i31_sign_asn1$O: src$Pec$Pecdsa_i31_sign_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_sign_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i31_sign_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_sign_asn1$O src$Pec$Pecdsa_i31_sign_asn1.c + +-$(OBJDIR)$Pecdsa_i31_sign_raw$O: src$Pec$Pecdsa_i31_sign_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_sign_raw$O: $(OBJDIR) src$Pec$Pecdsa_i31_sign_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_sign_raw$O src$Pec$Pecdsa_i31_sign_raw.c + +-$(OBJDIR)$Pecdsa_i31_vrfy_asn1$O: src$Pec$Pecdsa_i31_vrfy_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_vrfy_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i31_vrfy_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_vrfy_asn1$O src$Pec$Pecdsa_i31_vrfy_asn1.c + +-$(OBJDIR)$Pecdsa_i31_vrfy_raw$O: src$Pec$Pecdsa_i31_vrfy_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_vrfy_raw$O: $(OBJDIR) src$Pec$Pecdsa_i31_vrfy_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_vrfy_raw$O src$Pec$Pecdsa_i31_vrfy_raw.c + +-$(OBJDIR)$Pecdsa_rta$O: src$Pec$Pecdsa_rta.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_rta$O: $(OBJDIR) src$Pec$Pecdsa_rta.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_rta$O src$Pec$Pecdsa_rta.c + +-$(OBJDIR)$Pdig_oid$O: src$Phash$Pdig_oid.c $(HEADERSPRIV) ++$(OBJDIR)$Pdig_oid$O: $(OBJDIR) src$Phash$Pdig_oid.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdig_oid$O src$Phash$Pdig_oid.c + +-$(OBJDIR)$Pdig_size$O: src$Phash$Pdig_size.c $(HEADERSPRIV) ++$(OBJDIR)$Pdig_size$O: $(OBJDIR) src$Phash$Pdig_size.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdig_size$O src$Phash$Pdig_size.c + +-$(OBJDIR)$Pghash_ctmul$O: src$Phash$Pghash_ctmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_ctmul$O: $(OBJDIR) src$Phash$Pghash_ctmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_ctmul$O src$Phash$Pghash_ctmul.c + +-$(OBJDIR)$Pghash_ctmul32$O: src$Phash$Pghash_ctmul32.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_ctmul32$O: $(OBJDIR) src$Phash$Pghash_ctmul32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_ctmul32$O src$Phash$Pghash_ctmul32.c + +-$(OBJDIR)$Pghash_ctmul64$O: src$Phash$Pghash_ctmul64.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_ctmul64$O: $(OBJDIR) src$Phash$Pghash_ctmul64.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_ctmul64$O src$Phash$Pghash_ctmul64.c + +-$(OBJDIR)$Pghash_pclmul$O: src$Phash$Pghash_pclmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_pclmul$O: $(OBJDIR) src$Phash$Pghash_pclmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_pclmul$O src$Phash$Pghash_pclmul.c + +-$(OBJDIR)$Pghash_pwr8$O: src$Phash$Pghash_pwr8.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_pwr8$O: $(OBJDIR) src$Phash$Pghash_pwr8.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_pwr8$O src$Phash$Pghash_pwr8.c + +-$(OBJDIR)$Pmd5$O: src$Phash$Pmd5.c $(HEADERSPRIV) ++$(OBJDIR)$Pmd5$O: $(OBJDIR) src$Phash$Pmd5.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmd5$O src$Phash$Pmd5.c + +-$(OBJDIR)$Pmd5sha1$O: src$Phash$Pmd5sha1.c $(HEADERSPRIV) ++$(OBJDIR)$Pmd5sha1$O: $(OBJDIR) src$Phash$Pmd5sha1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmd5sha1$O src$Phash$Pmd5sha1.c + +-$(OBJDIR)$Pmgf1$O: src$Phash$Pmgf1.c $(HEADERSPRIV) ++$(OBJDIR)$Pmgf1$O: $(OBJDIR) src$Phash$Pmgf1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmgf1$O src$Phash$Pmgf1.c + +-$(OBJDIR)$Pmultihash$O: src$Phash$Pmultihash.c $(HEADERSPRIV) ++$(OBJDIR)$Pmultihash$O: $(OBJDIR) src$Phash$Pmultihash.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmultihash$O src$Phash$Pmultihash.c + +-$(OBJDIR)$Psha1$O: src$Phash$Psha1.c $(HEADERSPRIV) ++$(OBJDIR)$Psha1$O: $(OBJDIR) src$Phash$Psha1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psha1$O src$Phash$Psha1.c + +-$(OBJDIR)$Psha2big$O: src$Phash$Psha2big.c $(HEADERSPRIV) ++$(OBJDIR)$Psha2big$O: $(OBJDIR) src$Phash$Psha2big.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psha2big$O src$Phash$Psha2big.c + +-$(OBJDIR)$Psha2small$O: src$Phash$Psha2small.c $(HEADERSPRIV) ++$(OBJDIR)$Psha2small$O: $(OBJDIR) src$Phash$Psha2small.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psha2small$O src$Phash$Psha2small.c + +-$(OBJDIR)$Pi15_add$O: src$Pint$Pi15_add.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_add$O: $(OBJDIR) src$Pint$Pi15_add.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_add$O src$Pint$Pi15_add.c + +-$(OBJDIR)$Pi15_bitlen$O: src$Pint$Pi15_bitlen.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_bitlen$O: $(OBJDIR) src$Pint$Pi15_bitlen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_bitlen$O src$Pint$Pi15_bitlen.c + +-$(OBJDIR)$Pi15_decmod$O: src$Pint$Pi15_decmod.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_decmod$O: $(OBJDIR) src$Pint$Pi15_decmod.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_decmod$O src$Pint$Pi15_decmod.c + +-$(OBJDIR)$Pi15_decode$O: src$Pint$Pi15_decode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_decode$O: $(OBJDIR) src$Pint$Pi15_decode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_decode$O src$Pint$Pi15_decode.c + +-$(OBJDIR)$Pi15_decred$O: src$Pint$Pi15_decred.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_decred$O: $(OBJDIR) src$Pint$Pi15_decred.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_decred$O src$Pint$Pi15_decred.c + +-$(OBJDIR)$Pi15_encode$O: src$Pint$Pi15_encode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_encode$O: $(OBJDIR) src$Pint$Pi15_encode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_encode$O src$Pint$Pi15_encode.c + +-$(OBJDIR)$Pi15_fmont$O: src$Pint$Pi15_fmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_fmont$O: $(OBJDIR) src$Pint$Pi15_fmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_fmont$O src$Pint$Pi15_fmont.c + +-$(OBJDIR)$Pi15_iszero$O: src$Pint$Pi15_iszero.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_iszero$O: $(OBJDIR) src$Pint$Pi15_iszero.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_iszero$O src$Pint$Pi15_iszero.c + +-$(OBJDIR)$Pi15_moddiv$O: src$Pint$Pi15_moddiv.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_moddiv$O: $(OBJDIR) src$Pint$Pi15_moddiv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_moddiv$O src$Pint$Pi15_moddiv.c + +-$(OBJDIR)$Pi15_modpow$O: src$Pint$Pi15_modpow.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_modpow$O: $(OBJDIR) src$Pint$Pi15_modpow.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_modpow$O src$Pint$Pi15_modpow.c + +-$(OBJDIR)$Pi15_modpow2$O: src$Pint$Pi15_modpow2.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_modpow2$O: $(OBJDIR) src$Pint$Pi15_modpow2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_modpow2$O src$Pint$Pi15_modpow2.c + +-$(OBJDIR)$Pi15_montmul$O: src$Pint$Pi15_montmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_montmul$O: $(OBJDIR) src$Pint$Pi15_montmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_montmul$O src$Pint$Pi15_montmul.c + +-$(OBJDIR)$Pi15_mulacc$O: src$Pint$Pi15_mulacc.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_mulacc$O: $(OBJDIR) src$Pint$Pi15_mulacc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_mulacc$O src$Pint$Pi15_mulacc.c + +-$(OBJDIR)$Pi15_muladd$O: src$Pint$Pi15_muladd.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_muladd$O: $(OBJDIR) src$Pint$Pi15_muladd.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_muladd$O src$Pint$Pi15_muladd.c + +-$(OBJDIR)$Pi15_ninv15$O: src$Pint$Pi15_ninv15.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_ninv15$O: $(OBJDIR) src$Pint$Pi15_ninv15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_ninv15$O src$Pint$Pi15_ninv15.c + +-$(OBJDIR)$Pi15_reduce$O: src$Pint$Pi15_reduce.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_reduce$O: $(OBJDIR) src$Pint$Pi15_reduce.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_reduce$O src$Pint$Pi15_reduce.c + +-$(OBJDIR)$Pi15_rshift$O: src$Pint$Pi15_rshift.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_rshift$O: $(OBJDIR) src$Pint$Pi15_rshift.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_rshift$O src$Pint$Pi15_rshift.c + +-$(OBJDIR)$Pi15_sub$O: src$Pint$Pi15_sub.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_sub$O: $(OBJDIR) src$Pint$Pi15_sub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_sub$O src$Pint$Pi15_sub.c + +-$(OBJDIR)$Pi15_tmont$O: src$Pint$Pi15_tmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_tmont$O: $(OBJDIR) src$Pint$Pi15_tmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_tmont$O src$Pint$Pi15_tmont.c + +-$(OBJDIR)$Pi31_add$O: src$Pint$Pi31_add.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_add$O: $(OBJDIR) src$Pint$Pi31_add.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_add$O src$Pint$Pi31_add.c + +-$(OBJDIR)$Pi31_bitlen$O: src$Pint$Pi31_bitlen.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_bitlen$O: $(OBJDIR) src$Pint$Pi31_bitlen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_bitlen$O src$Pint$Pi31_bitlen.c + +-$(OBJDIR)$Pi31_decmod$O: src$Pint$Pi31_decmod.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_decmod$O: $(OBJDIR) src$Pint$Pi31_decmod.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_decmod$O src$Pint$Pi31_decmod.c + +-$(OBJDIR)$Pi31_decode$O: src$Pint$Pi31_decode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_decode$O: $(OBJDIR) src$Pint$Pi31_decode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_decode$O src$Pint$Pi31_decode.c + +-$(OBJDIR)$Pi31_decred$O: src$Pint$Pi31_decred.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_decred$O: $(OBJDIR) src$Pint$Pi31_decred.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_decred$O src$Pint$Pi31_decred.c + +-$(OBJDIR)$Pi31_encode$O: src$Pint$Pi31_encode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_encode$O: $(OBJDIR) src$Pint$Pi31_encode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_encode$O src$Pint$Pi31_encode.c + +-$(OBJDIR)$Pi31_fmont$O: src$Pint$Pi31_fmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_fmont$O: $(OBJDIR) src$Pint$Pi31_fmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_fmont$O src$Pint$Pi31_fmont.c + +-$(OBJDIR)$Pi31_iszero$O: src$Pint$Pi31_iszero.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_iszero$O: $(OBJDIR) src$Pint$Pi31_iszero.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_iszero$O src$Pint$Pi31_iszero.c + +-$(OBJDIR)$Pi31_moddiv$O: src$Pint$Pi31_moddiv.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_moddiv$O: $(OBJDIR) src$Pint$Pi31_moddiv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_moddiv$O src$Pint$Pi31_moddiv.c + +-$(OBJDIR)$Pi31_modpow$O: src$Pint$Pi31_modpow.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_modpow$O: $(OBJDIR) src$Pint$Pi31_modpow.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_modpow$O src$Pint$Pi31_modpow.c + +-$(OBJDIR)$Pi31_modpow2$O: src$Pint$Pi31_modpow2.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_modpow2$O: $(OBJDIR) src$Pint$Pi31_modpow2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_modpow2$O src$Pint$Pi31_modpow2.c + +-$(OBJDIR)$Pi31_montmul$O: src$Pint$Pi31_montmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_montmul$O: $(OBJDIR) src$Pint$Pi31_montmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_montmul$O src$Pint$Pi31_montmul.c + +-$(OBJDIR)$Pi31_mulacc$O: src$Pint$Pi31_mulacc.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_mulacc$O: $(OBJDIR) src$Pint$Pi31_mulacc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_mulacc$O src$Pint$Pi31_mulacc.c + +-$(OBJDIR)$Pi31_muladd$O: src$Pint$Pi31_muladd.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_muladd$O: $(OBJDIR) src$Pint$Pi31_muladd.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_muladd$O src$Pint$Pi31_muladd.c + +-$(OBJDIR)$Pi31_ninv31$O: src$Pint$Pi31_ninv31.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_ninv31$O: $(OBJDIR) src$Pint$Pi31_ninv31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_ninv31$O src$Pint$Pi31_ninv31.c + +-$(OBJDIR)$Pi31_reduce$O: src$Pint$Pi31_reduce.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_reduce$O: $(OBJDIR) src$Pint$Pi31_reduce.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_reduce$O src$Pint$Pi31_reduce.c + +-$(OBJDIR)$Pi31_rshift$O: src$Pint$Pi31_rshift.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_rshift$O: $(OBJDIR) src$Pint$Pi31_rshift.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_rshift$O src$Pint$Pi31_rshift.c + +-$(OBJDIR)$Pi31_sub$O: src$Pint$Pi31_sub.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_sub$O: $(OBJDIR) src$Pint$Pi31_sub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_sub$O src$Pint$Pi31_sub.c + +-$(OBJDIR)$Pi31_tmont$O: src$Pint$Pi31_tmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_tmont$O: $(OBJDIR) src$Pint$Pi31_tmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_tmont$O src$Pint$Pi31_tmont.c + +-$(OBJDIR)$Pi32_add$O: src$Pint$Pi32_add.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_add$O: $(OBJDIR) src$Pint$Pi32_add.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_add$O src$Pint$Pi32_add.c + +-$(OBJDIR)$Pi32_bitlen$O: src$Pint$Pi32_bitlen.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_bitlen$O: $(OBJDIR) src$Pint$Pi32_bitlen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_bitlen$O src$Pint$Pi32_bitlen.c + +-$(OBJDIR)$Pi32_decmod$O: src$Pint$Pi32_decmod.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_decmod$O: $(OBJDIR) src$Pint$Pi32_decmod.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_decmod$O src$Pint$Pi32_decmod.c + +-$(OBJDIR)$Pi32_decode$O: src$Pint$Pi32_decode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_decode$O: $(OBJDIR) src$Pint$Pi32_decode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_decode$O src$Pint$Pi32_decode.c + +-$(OBJDIR)$Pi32_decred$O: src$Pint$Pi32_decred.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_decred$O: $(OBJDIR) src$Pint$Pi32_decred.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_decred$O src$Pint$Pi32_decred.c + +-$(OBJDIR)$Pi32_div32$O: src$Pint$Pi32_div32.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_div32$O: $(OBJDIR) src$Pint$Pi32_div32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_div32$O src$Pint$Pi32_div32.c + +-$(OBJDIR)$Pi32_encode$O: src$Pint$Pi32_encode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_encode$O: $(OBJDIR) src$Pint$Pi32_encode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_encode$O src$Pint$Pi32_encode.c + +-$(OBJDIR)$Pi32_fmont$O: src$Pint$Pi32_fmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_fmont$O: $(OBJDIR) src$Pint$Pi32_fmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_fmont$O src$Pint$Pi32_fmont.c + +-$(OBJDIR)$Pi32_iszero$O: src$Pint$Pi32_iszero.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_iszero$O: $(OBJDIR) src$Pint$Pi32_iszero.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_iszero$O src$Pint$Pi32_iszero.c + +-$(OBJDIR)$Pi32_modpow$O: src$Pint$Pi32_modpow.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_modpow$O: $(OBJDIR) src$Pint$Pi32_modpow.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_modpow$O src$Pint$Pi32_modpow.c + +-$(OBJDIR)$Pi32_montmul$O: src$Pint$Pi32_montmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_montmul$O: $(OBJDIR) src$Pint$Pi32_montmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_montmul$O src$Pint$Pi32_montmul.c + +-$(OBJDIR)$Pi32_mulacc$O: src$Pint$Pi32_mulacc.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_mulacc$O: $(OBJDIR) src$Pint$Pi32_mulacc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_mulacc$O src$Pint$Pi32_mulacc.c + +-$(OBJDIR)$Pi32_muladd$O: src$Pint$Pi32_muladd.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_muladd$O: $(OBJDIR) src$Pint$Pi32_muladd.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_muladd$O src$Pint$Pi32_muladd.c + +-$(OBJDIR)$Pi32_ninv32$O: src$Pint$Pi32_ninv32.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_ninv32$O: $(OBJDIR) src$Pint$Pi32_ninv32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_ninv32$O src$Pint$Pi32_ninv32.c + +-$(OBJDIR)$Pi32_reduce$O: src$Pint$Pi32_reduce.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_reduce$O: $(OBJDIR) src$Pint$Pi32_reduce.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_reduce$O src$Pint$Pi32_reduce.c + +-$(OBJDIR)$Pi32_sub$O: src$Pint$Pi32_sub.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_sub$O: $(OBJDIR) src$Pint$Pi32_sub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_sub$O src$Pint$Pi32_sub.c + +-$(OBJDIR)$Pi32_tmont$O: src$Pint$Pi32_tmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_tmont$O: $(OBJDIR) src$Pint$Pi32_tmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_tmont$O src$Pint$Pi32_tmont.c + +-$(OBJDIR)$Pi62_modpow2$O: src$Pint$Pi62_modpow2.c $(HEADERSPRIV) ++$(OBJDIR)$Pi62_modpow2$O: $(OBJDIR) src$Pint$Pi62_modpow2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi62_modpow2$O src$Pint$Pi62_modpow2.c + +-$(OBJDIR)$Phkdf$O: src$Pkdf$Phkdf.c $(HEADERSPRIV) ++$(OBJDIR)$Phkdf$O: $(OBJDIR) src$Pkdf$Phkdf.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phkdf$O src$Pkdf$Phkdf.c + +-$(OBJDIR)$Phmac$O: src$Pmac$Phmac.c $(HEADERSPRIV) ++$(OBJDIR)$Phmac$O: $(OBJDIR) src$Pmac$Phmac.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phmac$O src$Pmac$Phmac.c + +-$(OBJDIR)$Phmac_ct$O: src$Pmac$Phmac_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Phmac_ct$O: $(OBJDIR) src$Pmac$Phmac_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phmac_ct$O src$Pmac$Phmac_ct.c + +-$(OBJDIR)$Paesctr_drbg$O: src$Prand$Paesctr_drbg.c $(HEADERSPRIV) ++$(OBJDIR)$Paesctr_drbg$O: $(OBJDIR) src$Prand$Paesctr_drbg.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paesctr_drbg$O src$Prand$Paesctr_drbg.c + +-$(OBJDIR)$Phmac_drbg$O: src$Prand$Phmac_drbg.c $(HEADERSPRIV) ++$(OBJDIR)$Phmac_drbg$O: $(OBJDIR) src$Prand$Phmac_drbg.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phmac_drbg$O src$Prand$Phmac_drbg.c + +-$(OBJDIR)$Psysrng$O: src$Prand$Psysrng.c $(HEADERSPRIV) ++$(OBJDIR)$Psysrng$O: $(OBJDIR) src$Prand$Psysrng.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psysrng$O src$Prand$Psysrng.c + +-$(OBJDIR)$Prsa_default_keygen$O: src$Prsa$Prsa_default_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_keygen$O: $(OBJDIR) src$Prsa$Prsa_default_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_keygen$O src$Prsa$Prsa_default_keygen.c + +-$(OBJDIR)$Prsa_default_modulus$O: src$Prsa$Prsa_default_modulus.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_modulus$O: $(OBJDIR) src$Prsa$Prsa_default_modulus.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_modulus$O src$Prsa$Prsa_default_modulus.c + +-$(OBJDIR)$Prsa_default_oaep_decrypt$O: src$Prsa$Prsa_default_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_default_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_oaep_decrypt$O src$Prsa$Prsa_default_oaep_decrypt.c + +-$(OBJDIR)$Prsa_default_oaep_encrypt$O: src$Prsa$Prsa_default_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_default_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_oaep_encrypt$O src$Prsa$Prsa_default_oaep_encrypt.c + +-$(OBJDIR)$Prsa_default_pkcs1_sign$O: src$Prsa$Prsa_default_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_default_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pkcs1_sign$O src$Prsa$Prsa_default_pkcs1_sign.c + +-$(OBJDIR)$Prsa_default_pkcs1_vrfy$O: src$Prsa$Prsa_default_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_default_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pkcs1_vrfy$O src$Prsa$Prsa_default_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_default_priv$O: src$Prsa$Prsa_default_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_priv$O: $(OBJDIR) src$Prsa$Prsa_default_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_priv$O src$Prsa$Prsa_default_priv.c + +-$(OBJDIR)$Prsa_default_privexp$O: src$Prsa$Prsa_default_privexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_privexp$O: $(OBJDIR) src$Prsa$Prsa_default_privexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_privexp$O src$Prsa$Prsa_default_privexp.c + +-$(OBJDIR)$Prsa_default_pub$O: src$Prsa$Prsa_default_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pub$O: $(OBJDIR) src$Prsa$Prsa_default_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pub$O src$Prsa$Prsa_default_pub.c + +-$(OBJDIR)$Prsa_default_pubexp$O: src$Prsa$Prsa_default_pubexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pubexp$O: $(OBJDIR) src$Prsa$Prsa_default_pubexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pubexp$O src$Prsa$Prsa_default_pubexp.c + +-$(OBJDIR)$Prsa_i15_keygen$O: src$Prsa$Prsa_i15_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_keygen$O: $(OBJDIR) src$Prsa$Prsa_i15_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_keygen$O src$Prsa$Prsa_i15_keygen.c + +-$(OBJDIR)$Prsa_i15_modulus$O: src$Prsa$Prsa_i15_modulus.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_modulus$O: $(OBJDIR) src$Prsa$Prsa_i15_modulus.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_modulus$O src$Prsa$Prsa_i15_modulus.c + +-$(OBJDIR)$Prsa_i15_oaep_decrypt$O: src$Prsa$Prsa_i15_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i15_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_oaep_decrypt$O src$Prsa$Prsa_i15_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i15_oaep_encrypt$O: src$Prsa$Prsa_i15_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i15_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_oaep_encrypt$O src$Prsa$Prsa_i15_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i15_pkcs1_sign$O: src$Prsa$Prsa_i15_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i15_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pkcs1_sign$O src$Prsa$Prsa_i15_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i15_pkcs1_vrfy$O: src$Prsa$Prsa_i15_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i15_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pkcs1_vrfy$O src$Prsa$Prsa_i15_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i15_priv$O: src$Prsa$Prsa_i15_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_priv$O: $(OBJDIR) src$Prsa$Prsa_i15_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_priv$O src$Prsa$Prsa_i15_priv.c + +-$(OBJDIR)$Prsa_i15_privexp$O: src$Prsa$Prsa_i15_privexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_privexp$O: $(OBJDIR) src$Prsa$Prsa_i15_privexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_privexp$O src$Prsa$Prsa_i15_privexp.c + +-$(OBJDIR)$Prsa_i15_pub$O: src$Prsa$Prsa_i15_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pub$O: $(OBJDIR) src$Prsa$Prsa_i15_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pub$O src$Prsa$Prsa_i15_pub.c + +-$(OBJDIR)$Prsa_i15_pubexp$O: src$Prsa$Prsa_i15_pubexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pubexp$O: $(OBJDIR) src$Prsa$Prsa_i15_pubexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pubexp$O src$Prsa$Prsa_i15_pubexp.c + +-$(OBJDIR)$Prsa_i31_keygen$O: src$Prsa$Prsa_i31_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_keygen$O: $(OBJDIR) src$Prsa$Prsa_i31_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_keygen$O src$Prsa$Prsa_i31_keygen.c + +-$(OBJDIR)$Prsa_i31_keygen_inner$O: src$Prsa$Prsa_i31_keygen_inner.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_keygen_inner$O: $(OBJDIR) src$Prsa$Prsa_i31_keygen_inner.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_keygen_inner$O src$Prsa$Prsa_i31_keygen_inner.c + +-$(OBJDIR)$Prsa_i31_modulus$O: src$Prsa$Prsa_i31_modulus.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_modulus$O: $(OBJDIR) src$Prsa$Prsa_i31_modulus.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_modulus$O src$Prsa$Prsa_i31_modulus.c + +-$(OBJDIR)$Prsa_i31_oaep_decrypt$O: src$Prsa$Prsa_i31_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i31_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_oaep_decrypt$O src$Prsa$Prsa_i31_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i31_oaep_encrypt$O: src$Prsa$Prsa_i31_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i31_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_oaep_encrypt$O src$Prsa$Prsa_i31_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i31_pkcs1_sign$O: src$Prsa$Prsa_i31_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i31_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pkcs1_sign$O src$Prsa$Prsa_i31_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i31_pkcs1_vrfy$O: src$Prsa$Prsa_i31_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i31_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pkcs1_vrfy$O src$Prsa$Prsa_i31_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i31_priv$O: src$Prsa$Prsa_i31_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_priv$O: $(OBJDIR) src$Prsa$Prsa_i31_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_priv$O src$Prsa$Prsa_i31_priv.c + +-$(OBJDIR)$Prsa_i31_privexp$O: src$Prsa$Prsa_i31_privexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_privexp$O: $(OBJDIR) src$Prsa$Prsa_i31_privexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_privexp$O src$Prsa$Prsa_i31_privexp.c + +-$(OBJDIR)$Prsa_i31_pub$O: src$Prsa$Prsa_i31_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pub$O: $(OBJDIR) src$Prsa$Prsa_i31_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pub$O src$Prsa$Prsa_i31_pub.c + +-$(OBJDIR)$Prsa_i31_pubexp$O: src$Prsa$Prsa_i31_pubexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pubexp$O: $(OBJDIR) src$Prsa$Prsa_i31_pubexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pubexp$O src$Prsa$Prsa_i31_pubexp.c + +-$(OBJDIR)$Prsa_i32_oaep_decrypt$O: src$Prsa$Prsa_i32_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i32_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_oaep_decrypt$O src$Prsa$Prsa_i32_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i32_oaep_encrypt$O: src$Prsa$Prsa_i32_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i32_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_oaep_encrypt$O src$Prsa$Prsa_i32_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i32_pkcs1_sign$O: src$Prsa$Prsa_i32_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i32_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_pkcs1_sign$O src$Prsa$Prsa_i32_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i32_pkcs1_vrfy$O: src$Prsa$Prsa_i32_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i32_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_pkcs1_vrfy$O src$Prsa$Prsa_i32_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i32_priv$O: src$Prsa$Prsa_i32_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_priv$O: $(OBJDIR) src$Prsa$Prsa_i32_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_priv$O src$Prsa$Prsa_i32_priv.c + +-$(OBJDIR)$Prsa_i32_pub$O: src$Prsa$Prsa_i32_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_pub$O: $(OBJDIR) src$Prsa$Prsa_i32_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_pub$O src$Prsa$Prsa_i32_pub.c + +-$(OBJDIR)$Prsa_i62_keygen$O: src$Prsa$Prsa_i62_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_keygen$O: $(OBJDIR) src$Prsa$Prsa_i62_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_keygen$O src$Prsa$Prsa_i62_keygen.c + +-$(OBJDIR)$Prsa_i62_oaep_decrypt$O: src$Prsa$Prsa_i62_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i62_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_oaep_decrypt$O src$Prsa$Prsa_i62_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i62_oaep_encrypt$O: src$Prsa$Prsa_i62_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i62_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_oaep_encrypt$O src$Prsa$Prsa_i62_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i62_pkcs1_sign$O: src$Prsa$Prsa_i62_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i62_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_pkcs1_sign$O src$Prsa$Prsa_i62_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i62_pkcs1_vrfy$O: src$Prsa$Prsa_i62_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i62_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_pkcs1_vrfy$O src$Prsa$Prsa_i62_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i62_priv$O: src$Prsa$Prsa_i62_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_priv$O: $(OBJDIR) src$Prsa$Prsa_i62_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_priv$O src$Prsa$Prsa_i62_priv.c + +-$(OBJDIR)$Prsa_i62_pub$O: src$Prsa$Prsa_i62_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_pub$O: $(OBJDIR) src$Prsa$Prsa_i62_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_pub$O src$Prsa$Prsa_i62_pub.c + +-$(OBJDIR)$Prsa_oaep_pad$O: src$Prsa$Prsa_oaep_pad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_oaep_pad$O: $(OBJDIR) src$Prsa$Prsa_oaep_pad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_oaep_pad$O src$Prsa$Prsa_oaep_pad.c + +-$(OBJDIR)$Prsa_oaep_unpad$O: src$Prsa$Prsa_oaep_unpad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_oaep_unpad$O: $(OBJDIR) src$Prsa$Prsa_oaep_unpad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_oaep_unpad$O src$Prsa$Prsa_oaep_unpad.c + +-$(OBJDIR)$Prsa_pkcs1_sig_pad$O: src$Prsa$Prsa_pkcs1_sig_pad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_pkcs1_sig_pad$O: $(OBJDIR) src$Prsa$Prsa_pkcs1_sig_pad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_pkcs1_sig_pad$O src$Prsa$Prsa_pkcs1_sig_pad.c + +-$(OBJDIR)$Prsa_pkcs1_sig_unpad$O: src$Prsa$Prsa_pkcs1_sig_unpad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_pkcs1_sig_unpad$O: $(OBJDIR) src$Prsa$Prsa_pkcs1_sig_unpad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_pkcs1_sig_unpad$O src$Prsa$Prsa_pkcs1_sig_unpad.c + +-$(OBJDIR)$Prsa_ssl_decrypt$O: src$Prsa$Prsa_ssl_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_ssl_decrypt$O: $(OBJDIR) src$Prsa$Prsa_ssl_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_ssl_decrypt$O src$Prsa$Prsa_ssl_decrypt.c + +-$(OBJDIR)$Pprf$O: src$Pssl$Pprf.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf$O: $(OBJDIR) src$Pssl$Pprf.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf$O src$Pssl$Pprf.c + +-$(OBJDIR)$Pprf_md5sha1$O: src$Pssl$Pprf_md5sha1.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf_md5sha1$O: $(OBJDIR) src$Pssl$Pprf_md5sha1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf_md5sha1$O src$Pssl$Pprf_md5sha1.c + +-$(OBJDIR)$Pprf_sha256$O: src$Pssl$Pprf_sha256.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf_sha256$O: $(OBJDIR) src$Pssl$Pprf_sha256.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf_sha256$O src$Pssl$Pprf_sha256.c + +-$(OBJDIR)$Pprf_sha384$O: src$Pssl$Pprf_sha384.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf_sha384$O: $(OBJDIR) src$Pssl$Pprf_sha384.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf_sha384$O src$Pssl$Pprf_sha384.c + +-$(OBJDIR)$Pssl_ccert_single_ec$O: src$Pssl$Pssl_ccert_single_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_ccert_single_ec$O: $(OBJDIR) src$Pssl$Pssl_ccert_single_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_ccert_single_ec$O src$Pssl$Pssl_ccert_single_ec.c + +-$(OBJDIR)$Pssl_ccert_single_rsa$O: src$Pssl$Pssl_ccert_single_rsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_ccert_single_rsa$O: $(OBJDIR) src$Pssl$Pssl_ccert_single_rsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_ccert_single_rsa$O src$Pssl$Pssl_ccert_single_rsa.c + +-$(OBJDIR)$Pssl_client$O: src$Pssl$Pssl_client.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_client$O: $(OBJDIR) src$Pssl$Pssl_client.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_client$O src$Pssl$Pssl_client.c + +-$(OBJDIR)$Pssl_client_default_rsapub$O: src$Pssl$Pssl_client_default_rsapub.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_client_default_rsapub$O: $(OBJDIR) src$Pssl$Pssl_client_default_rsapub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_client_default_rsapub$O src$Pssl$Pssl_client_default_rsapub.c + +-$(OBJDIR)$Pssl_client_full$O: src$Pssl$Pssl_client_full.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_client_full$O: $(OBJDIR) src$Pssl$Pssl_client_full.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_client_full$O src$Pssl$Pssl_client_full.c + +-$(OBJDIR)$Pssl_engine$O: src$Pssl$Pssl_engine.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine$O: $(OBJDIR) src$Pssl$Pssl_engine.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine$O src$Pssl$Pssl_engine.c + +-$(OBJDIR)$Pssl_engine_default_aescbc$O: src$Pssl$Pssl_engine_default_aescbc.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_aescbc$O: $(OBJDIR) src$Pssl$Pssl_engine_default_aescbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_aescbc$O src$Pssl$Pssl_engine_default_aescbc.c + +-$(OBJDIR)$Pssl_engine_default_aesccm$O: src$Pssl$Pssl_engine_default_aesccm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_aesccm$O: $(OBJDIR) src$Pssl$Pssl_engine_default_aesccm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_aesccm$O src$Pssl$Pssl_engine_default_aesccm.c + +-$(OBJDIR)$Pssl_engine_default_aesgcm$O: src$Pssl$Pssl_engine_default_aesgcm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_aesgcm$O: $(OBJDIR) src$Pssl$Pssl_engine_default_aesgcm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_aesgcm$O src$Pssl$Pssl_engine_default_aesgcm.c + +-$(OBJDIR)$Pssl_engine_default_chapol$O: src$Pssl$Pssl_engine_default_chapol.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_chapol$O: $(OBJDIR) src$Pssl$Pssl_engine_default_chapol.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_chapol$O src$Pssl$Pssl_engine_default_chapol.c + +-$(OBJDIR)$Pssl_engine_default_descbc$O: src$Pssl$Pssl_engine_default_descbc.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_descbc$O: $(OBJDIR) src$Pssl$Pssl_engine_default_descbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_descbc$O src$Pssl$Pssl_engine_default_descbc.c + +-$(OBJDIR)$Pssl_engine_default_ec$O: src$Pssl$Pssl_engine_default_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_ec$O: $(OBJDIR) src$Pssl$Pssl_engine_default_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_ec$O src$Pssl$Pssl_engine_default_ec.c + +-$(OBJDIR)$Pssl_engine_default_ecdsa$O: src$Pssl$Pssl_engine_default_ecdsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_ecdsa$O: $(OBJDIR) src$Pssl$Pssl_engine_default_ecdsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_ecdsa$O src$Pssl$Pssl_engine_default_ecdsa.c + +-$(OBJDIR)$Pssl_engine_default_rsavrfy$O: src$Pssl$Pssl_engine_default_rsavrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_rsavrfy$O: $(OBJDIR) src$Pssl$Pssl_engine_default_rsavrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_rsavrfy$O src$Pssl$Pssl_engine_default_rsavrfy.c + +-$(OBJDIR)$Pssl_hashes$O: src$Pssl$Pssl_hashes.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_hashes$O: $(OBJDIR) src$Pssl$Pssl_hashes.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_hashes$O src$Pssl$Pssl_hashes.c + +-$(OBJDIR)$Pssl_hs_client$O: src$Pssl$Pssl_hs_client.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_hs_client$O: $(OBJDIR) src$Pssl$Pssl_hs_client.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_hs_client$O src$Pssl$Pssl_hs_client.c + +-$(OBJDIR)$Pssl_hs_server$O: src$Pssl$Pssl_hs_server.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_hs_server$O: $(OBJDIR) src$Pssl$Pssl_hs_server.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_hs_server$O src$Pssl$Pssl_hs_server.c + +-$(OBJDIR)$Pssl_io$O: src$Pssl$Pssl_io.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_io$O: $(OBJDIR) src$Pssl$Pssl_io.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_io$O src$Pssl$Pssl_io.c + +-$(OBJDIR)$Pssl_keyexport$O: src$Pssl$Pssl_keyexport.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_keyexport$O: $(OBJDIR) src$Pssl$Pssl_keyexport.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_keyexport$O src$Pssl$Pssl_keyexport.c + +-$(OBJDIR)$Pssl_lru$O: src$Pssl$Pssl_lru.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_lru$O: $(OBJDIR) src$Pssl$Pssl_lru.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_lru$O src$Pssl$Pssl_lru.c + +-$(OBJDIR)$Pssl_rec_cbc$O: src$Pssl$Pssl_rec_cbc.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_cbc$O: $(OBJDIR) src$Pssl$Pssl_rec_cbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_cbc$O src$Pssl$Pssl_rec_cbc.c + +-$(OBJDIR)$Pssl_rec_ccm$O: src$Pssl$Pssl_rec_ccm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_ccm$O: $(OBJDIR) src$Pssl$Pssl_rec_ccm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_ccm$O src$Pssl$Pssl_rec_ccm.c + +-$(OBJDIR)$Pssl_rec_chapol$O: src$Pssl$Pssl_rec_chapol.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_chapol$O: $(OBJDIR) src$Pssl$Pssl_rec_chapol.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_chapol$O src$Pssl$Pssl_rec_chapol.c + +-$(OBJDIR)$Pssl_rec_gcm$O: src$Pssl$Pssl_rec_gcm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_gcm$O: $(OBJDIR) src$Pssl$Pssl_rec_gcm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_gcm$O src$Pssl$Pssl_rec_gcm.c + +-$(OBJDIR)$Pssl_scert_single_ec$O: src$Pssl$Pssl_scert_single_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_scert_single_ec$O: $(OBJDIR) src$Pssl$Pssl_scert_single_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_scert_single_ec$O src$Pssl$Pssl_scert_single_ec.c + +-$(OBJDIR)$Pssl_scert_single_rsa$O: src$Pssl$Pssl_scert_single_rsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_scert_single_rsa$O: $(OBJDIR) src$Pssl$Pssl_scert_single_rsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_scert_single_rsa$O src$Pssl$Pssl_scert_single_rsa.c + +-$(OBJDIR)$Pssl_server$O: src$Pssl$Pssl_server.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server$O: $(OBJDIR) src$Pssl$Pssl_server.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server$O src$Pssl$Pssl_server.c + +-$(OBJDIR)$Pssl_server_full_ec$O: src$Pssl$Pssl_server_full_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_full_ec$O: $(OBJDIR) src$Pssl$Pssl_server_full_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_full_ec$O src$Pssl$Pssl_server_full_ec.c + +-$(OBJDIR)$Pssl_server_full_rsa$O: src$Pssl$Pssl_server_full_rsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_full_rsa$O: $(OBJDIR) src$Pssl$Pssl_server_full_rsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_full_rsa$O src$Pssl$Pssl_server_full_rsa.c + +-$(OBJDIR)$Pssl_server_mine2c$O: src$Pssl$Pssl_server_mine2c.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_mine2c$O: $(OBJDIR) src$Pssl$Pssl_server_mine2c.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_mine2c$O src$Pssl$Pssl_server_mine2c.c + +-$(OBJDIR)$Pssl_server_mine2g$O: src$Pssl$Pssl_server_mine2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_mine2g$O: $(OBJDIR) src$Pssl$Pssl_server_mine2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_mine2g$O src$Pssl$Pssl_server_mine2g.c + +-$(OBJDIR)$Pssl_server_minf2c$O: src$Pssl$Pssl_server_minf2c.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minf2c$O: $(OBJDIR) src$Pssl$Pssl_server_minf2c.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minf2c$O src$Pssl$Pssl_server_minf2c.c + +-$(OBJDIR)$Pssl_server_minf2g$O: src$Pssl$Pssl_server_minf2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minf2g$O: $(OBJDIR) src$Pssl$Pssl_server_minf2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minf2g$O src$Pssl$Pssl_server_minf2g.c + +-$(OBJDIR)$Pssl_server_minr2g$O: src$Pssl$Pssl_server_minr2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minr2g$O: $(OBJDIR) src$Pssl$Pssl_server_minr2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minr2g$O src$Pssl$Pssl_server_minr2g.c + +-$(OBJDIR)$Pssl_server_minu2g$O: src$Pssl$Pssl_server_minu2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minu2g$O: $(OBJDIR) src$Pssl$Pssl_server_minu2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minu2g$O src$Pssl$Pssl_server_minu2g.c + +-$(OBJDIR)$Pssl_server_minv2g$O: src$Pssl$Pssl_server_minv2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minv2g$O: $(OBJDIR) src$Pssl$Pssl_server_minv2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minv2g$O src$Pssl$Pssl_server_minv2g.c + +-$(OBJDIR)$Paes_big_cbcdec$O: src$Psymcipher$Paes_big_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_big_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_cbcdec$O src$Psymcipher$Paes_big_cbcdec.c + +-$(OBJDIR)$Paes_big_cbcenc$O: src$Psymcipher$Paes_big_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_big_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_cbcenc$O src$Psymcipher$Paes_big_cbcenc.c + +-$(OBJDIR)$Paes_big_ctr$O: src$Psymcipher$Paes_big_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_ctr$O: $(OBJDIR) src$Psymcipher$Paes_big_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_ctr$O src$Psymcipher$Paes_big_ctr.c + +-$(OBJDIR)$Paes_big_ctrcbc$O: src$Psymcipher$Paes_big_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_big_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_ctrcbc$O src$Psymcipher$Paes_big_ctrcbc.c + +-$(OBJDIR)$Paes_big_dec$O: src$Psymcipher$Paes_big_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_dec$O: $(OBJDIR) src$Psymcipher$Paes_big_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_dec$O src$Psymcipher$Paes_big_dec.c + +-$(OBJDIR)$Paes_big_enc$O: src$Psymcipher$Paes_big_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_enc$O: $(OBJDIR) src$Psymcipher$Paes_big_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_enc$O src$Psymcipher$Paes_big_enc.c + +-$(OBJDIR)$Paes_common$O: src$Psymcipher$Paes_common.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_common$O: $(OBJDIR) src$Psymcipher$Paes_common.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_common$O src$Psymcipher$Paes_common.c + +-$(OBJDIR)$Paes_ct$O: src$Psymcipher$Paes_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct$O: $(OBJDIR) src$Psymcipher$Paes_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct$O src$Psymcipher$Paes_ct.c + +-$(OBJDIR)$Paes_ct64$O: src$Psymcipher$Paes_ct64.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64$O: $(OBJDIR) src$Psymcipher$Paes_ct64.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64$O src$Psymcipher$Paes_ct64.c + +-$(OBJDIR)$Paes_ct64_cbcdec$O: src$Psymcipher$Paes_ct64_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_ct64_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_cbcdec$O src$Psymcipher$Paes_ct64_cbcdec.c + +-$(OBJDIR)$Paes_ct64_cbcenc$O: src$Psymcipher$Paes_ct64_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_ct64_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_cbcenc$O src$Psymcipher$Paes_ct64_cbcenc.c + +-$(OBJDIR)$Paes_ct64_ctr$O: src$Psymcipher$Paes_ct64_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_ctr$O: $(OBJDIR) src$Psymcipher$Paes_ct64_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_ctr$O src$Psymcipher$Paes_ct64_ctr.c + +-$(OBJDIR)$Paes_ct64_ctrcbc$O: src$Psymcipher$Paes_ct64_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_ct64_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_ctrcbc$O src$Psymcipher$Paes_ct64_ctrcbc.c + +-$(OBJDIR)$Paes_ct64_dec$O: src$Psymcipher$Paes_ct64_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_dec$O: $(OBJDIR) src$Psymcipher$Paes_ct64_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_dec$O src$Psymcipher$Paes_ct64_dec.c + +-$(OBJDIR)$Paes_ct64_enc$O: src$Psymcipher$Paes_ct64_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_enc$O: $(OBJDIR) src$Psymcipher$Paes_ct64_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_enc$O src$Psymcipher$Paes_ct64_enc.c + +-$(OBJDIR)$Paes_ct_cbcdec$O: src$Psymcipher$Paes_ct_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_ct_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_cbcdec$O src$Psymcipher$Paes_ct_cbcdec.c + +-$(OBJDIR)$Paes_ct_cbcenc$O: src$Psymcipher$Paes_ct_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_ct_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_cbcenc$O src$Psymcipher$Paes_ct_cbcenc.c + +-$(OBJDIR)$Paes_ct_ctr$O: src$Psymcipher$Paes_ct_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_ctr$O: $(OBJDIR) src$Psymcipher$Paes_ct_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_ctr$O src$Psymcipher$Paes_ct_ctr.c + +-$(OBJDIR)$Paes_ct_ctrcbc$O: src$Psymcipher$Paes_ct_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_ct_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_ctrcbc$O src$Psymcipher$Paes_ct_ctrcbc.c + +-$(OBJDIR)$Paes_ct_dec$O: src$Psymcipher$Paes_ct_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_dec$O: $(OBJDIR) src$Psymcipher$Paes_ct_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_dec$O src$Psymcipher$Paes_ct_dec.c + +-$(OBJDIR)$Paes_ct_enc$O: src$Psymcipher$Paes_ct_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_enc$O: $(OBJDIR) src$Psymcipher$Paes_ct_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_enc$O src$Psymcipher$Paes_ct_enc.c + +-$(OBJDIR)$Paes_pwr8$O: src$Psymcipher$Paes_pwr8.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8$O: $(OBJDIR) src$Psymcipher$Paes_pwr8.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8$O src$Psymcipher$Paes_pwr8.c + +-$(OBJDIR)$Paes_pwr8_cbcdec$O: src$Psymcipher$Paes_pwr8_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_cbcdec$O src$Psymcipher$Paes_pwr8_cbcdec.c + +-$(OBJDIR)$Paes_pwr8_cbcenc$O: src$Psymcipher$Paes_pwr8_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_cbcenc$O src$Psymcipher$Paes_pwr8_cbcenc.c + +-$(OBJDIR)$Paes_pwr8_ctr$O: src$Psymcipher$Paes_pwr8_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_ctr$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_ctr$O src$Psymcipher$Paes_pwr8_ctr.c + +-$(OBJDIR)$Paes_pwr8_ctrcbc$O: src$Psymcipher$Paes_pwr8_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_ctrcbc$O src$Psymcipher$Paes_pwr8_ctrcbc.c + +-$(OBJDIR)$Paes_small_cbcdec$O: src$Psymcipher$Paes_small_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_small_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_cbcdec$O src$Psymcipher$Paes_small_cbcdec.c + +-$(OBJDIR)$Paes_small_cbcenc$O: src$Psymcipher$Paes_small_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_small_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_cbcenc$O src$Psymcipher$Paes_small_cbcenc.c + +-$(OBJDIR)$Paes_small_ctr$O: src$Psymcipher$Paes_small_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_ctr$O: $(OBJDIR) src$Psymcipher$Paes_small_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_ctr$O src$Psymcipher$Paes_small_ctr.c + +-$(OBJDIR)$Paes_small_ctrcbc$O: src$Psymcipher$Paes_small_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_small_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_ctrcbc$O src$Psymcipher$Paes_small_ctrcbc.c + +-$(OBJDIR)$Paes_small_dec$O: src$Psymcipher$Paes_small_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_dec$O: $(OBJDIR) src$Psymcipher$Paes_small_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_dec$O src$Psymcipher$Paes_small_dec.c + +-$(OBJDIR)$Paes_small_enc$O: src$Psymcipher$Paes_small_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_enc$O: $(OBJDIR) src$Psymcipher$Paes_small_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_enc$O src$Psymcipher$Paes_small_enc.c + +-$(OBJDIR)$Paes_x86ni$O: src$Psymcipher$Paes_x86ni.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni$O: $(OBJDIR) src$Psymcipher$Paes_x86ni.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni$O src$Psymcipher$Paes_x86ni.c + +-$(OBJDIR)$Paes_x86ni_cbcdec$O: src$Psymcipher$Paes_x86ni_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_cbcdec$O src$Psymcipher$Paes_x86ni_cbcdec.c + +-$(OBJDIR)$Paes_x86ni_cbcenc$O: src$Psymcipher$Paes_x86ni_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_cbcenc$O src$Psymcipher$Paes_x86ni_cbcenc.c + +-$(OBJDIR)$Paes_x86ni_ctr$O: src$Psymcipher$Paes_x86ni_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_ctr$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_ctr$O src$Psymcipher$Paes_x86ni_ctr.c + +-$(OBJDIR)$Paes_x86ni_ctrcbc$O: src$Psymcipher$Paes_x86ni_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_ctrcbc$O src$Psymcipher$Paes_x86ni_ctrcbc.c + +-$(OBJDIR)$Pchacha20_ct$O: src$Psymcipher$Pchacha20_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Pchacha20_ct$O: $(OBJDIR) src$Psymcipher$Pchacha20_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pchacha20_ct$O src$Psymcipher$Pchacha20_ct.c + +-$(OBJDIR)$Pchacha20_sse2$O: src$Psymcipher$Pchacha20_sse2.c $(HEADERSPRIV) ++$(OBJDIR)$Pchacha20_sse2$O: $(OBJDIR) src$Psymcipher$Pchacha20_sse2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pchacha20_sse2$O src$Psymcipher$Pchacha20_sse2.c + +-$(OBJDIR)$Pdes_ct$O: src$Psymcipher$Pdes_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_ct$O: $(OBJDIR) src$Psymcipher$Pdes_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_ct$O src$Psymcipher$Pdes_ct.c + +-$(OBJDIR)$Pdes_ct_cbcdec$O: src$Psymcipher$Pdes_ct_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_ct_cbcdec$O: $(OBJDIR) src$Psymcipher$Pdes_ct_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_ct_cbcdec$O src$Psymcipher$Pdes_ct_cbcdec.c + +-$(OBJDIR)$Pdes_ct_cbcenc$O: src$Psymcipher$Pdes_ct_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_ct_cbcenc$O: $(OBJDIR) src$Psymcipher$Pdes_ct_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_ct_cbcenc$O src$Psymcipher$Pdes_ct_cbcenc.c + +-$(OBJDIR)$Pdes_support$O: src$Psymcipher$Pdes_support.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_support$O: $(OBJDIR) src$Psymcipher$Pdes_support.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_support$O src$Psymcipher$Pdes_support.c + +-$(OBJDIR)$Pdes_tab$O: src$Psymcipher$Pdes_tab.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_tab$O: $(OBJDIR) src$Psymcipher$Pdes_tab.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_tab$O src$Psymcipher$Pdes_tab.c + +-$(OBJDIR)$Pdes_tab_cbcdec$O: src$Psymcipher$Pdes_tab_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_tab_cbcdec$O: $(OBJDIR) src$Psymcipher$Pdes_tab_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_tab_cbcdec$O src$Psymcipher$Pdes_tab_cbcdec.c + +-$(OBJDIR)$Pdes_tab_cbcenc$O: src$Psymcipher$Pdes_tab_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_tab_cbcenc$O: $(OBJDIR) src$Psymcipher$Pdes_tab_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_tab_cbcenc$O src$Psymcipher$Pdes_tab_cbcenc.c + +-$(OBJDIR)$Ppoly1305_ctmul$O: src$Psymcipher$Ppoly1305_ctmul.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_ctmul$O: $(OBJDIR) src$Psymcipher$Ppoly1305_ctmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_ctmul$O src$Psymcipher$Ppoly1305_ctmul.c + +-$(OBJDIR)$Ppoly1305_ctmul32$O: src$Psymcipher$Ppoly1305_ctmul32.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_ctmul32$O: $(OBJDIR) src$Psymcipher$Ppoly1305_ctmul32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_ctmul32$O src$Psymcipher$Ppoly1305_ctmul32.c + +-$(OBJDIR)$Ppoly1305_ctmulq$O: src$Psymcipher$Ppoly1305_ctmulq.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_ctmulq$O: $(OBJDIR) src$Psymcipher$Ppoly1305_ctmulq.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_ctmulq$O src$Psymcipher$Ppoly1305_ctmulq.c + +-$(OBJDIR)$Ppoly1305_i15$O: src$Psymcipher$Ppoly1305_i15.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_i15$O: $(OBJDIR) src$Psymcipher$Ppoly1305_i15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_i15$O src$Psymcipher$Ppoly1305_i15.c + +-$(OBJDIR)$Pasn1enc$O: src$Px509$Pasn1enc.c $(HEADERSPRIV) ++$(OBJDIR)$Pasn1enc$O: $(OBJDIR) src$Px509$Pasn1enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pasn1enc$O src$Px509$Pasn1enc.c + +-$(OBJDIR)$Pencode_ec_pk8der$O: src$Px509$Pencode_ec_pk8der.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_ec_pk8der$O: $(OBJDIR) src$Px509$Pencode_ec_pk8der.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_ec_pk8der$O src$Px509$Pencode_ec_pk8der.c + +-$(OBJDIR)$Pencode_ec_rawder$O: src$Px509$Pencode_ec_rawder.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_ec_rawder$O: $(OBJDIR) src$Px509$Pencode_ec_rawder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_ec_rawder$O src$Px509$Pencode_ec_rawder.c + +-$(OBJDIR)$Pencode_rsa_pk8der$O: src$Px509$Pencode_rsa_pk8der.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_rsa_pk8der$O: $(OBJDIR) src$Px509$Pencode_rsa_pk8der.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_rsa_pk8der$O src$Px509$Pencode_rsa_pk8der.c + +-$(OBJDIR)$Pencode_rsa_rawder$O: src$Px509$Pencode_rsa_rawder.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_rsa_rawder$O: $(OBJDIR) src$Px509$Pencode_rsa_rawder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_rsa_rawder$O src$Px509$Pencode_rsa_rawder.c + +-$(OBJDIR)$Pskey_decoder$O: src$Px509$Pskey_decoder.c $(HEADERSPRIV) ++$(OBJDIR)$Pskey_decoder$O: $(OBJDIR) src$Px509$Pskey_decoder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pskey_decoder$O src$Px509$Pskey_decoder.c + +-$(OBJDIR)$Px509_decoder$O: src$Px509$Px509_decoder.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_decoder$O: $(OBJDIR) src$Px509$Px509_decoder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_decoder$O src$Px509$Px509_decoder.c + +-$(OBJDIR)$Px509_knownkey$O: src$Px509$Px509_knownkey.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_knownkey$O: $(OBJDIR) src$Px509$Px509_knownkey.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_knownkey$O src$Px509$Px509_knownkey.c + +-$(OBJDIR)$Px509_minimal$O: src$Px509$Px509_minimal.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_minimal$O: $(OBJDIR) src$Px509$Px509_minimal.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_minimal$O src$Px509$Px509_minimal.c + +-$(OBJDIR)$Px509_minimal_full$O: src$Px509$Px509_minimal_full.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_minimal_full$O: $(OBJDIR) src$Px509$Px509_minimal_full.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_minimal_full$O src$Px509$Px509_minimal_full.c + +-$(OBJDIR)$Pbrssl$O: tools$Pbrssl.c $(HEADERSTOOLS) ++$(OBJDIR)$Pbrssl$O: $(OBJDIR) tools$Pbrssl.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pbrssl$O tools$Pbrssl.c + +-$(OBJDIR)$Pcerts$O: tools$Pcerts.c $(HEADERSTOOLS) ++$(OBJDIR)$Pcerts$O: $(OBJDIR) tools$Pcerts.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pcerts$O tools$Pcerts.c + +-$(OBJDIR)$Pchain$O: tools$Pchain.c $(HEADERSTOOLS) ++$(OBJDIR)$Pchain$O: $(OBJDIR) tools$Pchain.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pchain$O tools$Pchain.c + +-$(OBJDIR)$Pclient$O: tools$Pclient.c $(HEADERSTOOLS) ++$(OBJDIR)$Pclient$O: $(OBJDIR) tools$Pclient.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pclient$O tools$Pclient.c + +-$(OBJDIR)$Perrors$O: tools$Perrors.c $(HEADERSTOOLS) ++$(OBJDIR)$Perrors$O: $(OBJDIR) tools$Perrors.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Perrors$O tools$Perrors.c + +-$(OBJDIR)$Pfiles$O: tools$Pfiles.c $(HEADERSTOOLS) ++$(OBJDIR)$Pfiles$O: $(OBJDIR) tools$Pfiles.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pfiles$O tools$Pfiles.c + +-$(OBJDIR)$Pimpl$O: tools$Pimpl.c $(HEADERSTOOLS) ++$(OBJDIR)$Pimpl$O: $(OBJDIR) tools$Pimpl.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pimpl$O tools$Pimpl.c + +-$(OBJDIR)$Pkeys$O: tools$Pkeys.c $(HEADERSTOOLS) ++$(OBJDIR)$Pkeys$O: $(OBJDIR) tools$Pkeys.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pkeys$O tools$Pkeys.c + +-$(OBJDIR)$Pnames$O: tools$Pnames.c $(HEADERSTOOLS) ++$(OBJDIR)$Pnames$O: $(OBJDIR) tools$Pnames.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pnames$O tools$Pnames.c + +-$(OBJDIR)$Pserver$O: tools$Pserver.c $(HEADERSTOOLS) ++$(OBJDIR)$Pserver$O: $(OBJDIR) tools$Pserver.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pserver$O tools$Pserver.c + +-$(OBJDIR)$Pskey$O: tools$Pskey.c $(HEADERSTOOLS) ++$(OBJDIR)$Pskey$O: $(OBJDIR) tools$Pskey.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pskey$O tools$Pskey.c + +-$(OBJDIR)$Psslio$O: tools$Psslio.c $(HEADERSTOOLS) ++$(OBJDIR)$Psslio$O: $(OBJDIR) tools$Psslio.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psslio$O tools$Psslio.c + +-$(OBJDIR)$Pta$O: tools$Pta.c $(HEADERSTOOLS) ++$(OBJDIR)$Pta$O: $(OBJDIR) tools$Pta.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pta$O tools$Pta.c + +-$(OBJDIR)$Ptwrch$O: tools$Ptwrch.c $(HEADERSTOOLS) ++$(OBJDIR)$Ptwrch$O: $(OBJDIR) tools$Ptwrch.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ptwrch$O tools$Ptwrch.c + +-$(OBJDIR)$Pvector$O: tools$Pvector.c $(HEADERSTOOLS) ++$(OBJDIR)$Pvector$O: $(OBJDIR) tools$Pvector.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pvector$O tools$Pvector.c + +-$(OBJDIR)$Pverify$O: tools$Pverify.c $(HEADERSTOOLS) ++$(OBJDIR)$Pverify$O: $(OBJDIR) tools$Pverify.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pverify$O tools$Pverify.c + +-$(OBJDIR)$Pxmem$O: tools$Pxmem.c $(HEADERSTOOLS) ++$(OBJDIR)$Pxmem$O: $(OBJDIR) tools$Pxmem.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pxmem$O tools$Pxmem.c + +-$(OBJDIR)$Ptest_crypto$O: test$Ptest_crypto.c $(HEADERSPRIV) ++$(OBJDIR)$Ptest_crypto$O: $(OBJDIR) test$Ptest_crypto.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ptest_crypto$O test$Ptest_crypto.c + +-$(OBJDIR)$Ptest_speed$O: test$Ptest_speed.c $(HEADERSPRIV) ++$(OBJDIR)$Ptest_speed$O: $(OBJDIR) test$Ptest_speed.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ptest_speed$O test$Ptest_speed.c + +-$(OBJDIR)$Ptest_x509$O: test$Ptest_x509.c $(HEADERSPRIV) ++$(OBJDIR)$Ptest_x509$O: $(OBJDIR) test$Ptest_x509.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) -DSRCDIRNAME=".." $(CCOUT)$(OBJDIR)$Ptest_x509$O test$Ptest_x509.c +diff --git a/mk/mkrules.sh b/mk/mkrules.sh +index eea159b..cce7564 100755 +--- a/mk/mkrules.sh ++++ b/mk/mkrules.sh +@@ -531,23 +531,23 @@ EOF + (for f in $coresrc ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done + + for f in $toolssrc ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSTOOLS)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSTOOLS)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done + + for f in $testcryptosrc $testspeedsrc ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done + + for f in $testx509src ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) -DSRCDIRNAME=".." $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) -DSRCDIRNAME=".." $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done) >> Rules.mk +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:56:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:16 -0000 Subject: [Buildroot] [git commit branch/next] packaeg/libmbim: fix license files Message-ID: <20230220205209.9506C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3d1d5a2dab19a954915c807e90ac74708b7e9ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit i57bea338e95e49bf1f2405908462686306044825 forgot to update license files: https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/bb3091e2c8d44caccfb868505a730a4ac5a48b44 Fixes: - http://autobuild.buildroot.org/results/06cb9426d097657b669b7970994584592bac9868 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libmbim/libmbim.hash | 4 ++-- package/libmbim/libmbim.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libmbim/libmbim.hash b/package/libmbim/libmbim.hash index 2e2b46fcdb..8e7633cb94 100644 --- a/package/libmbim/libmbim.hash +++ b/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed sha256 cf74682c56f4c34ca4aee86de3b8c425a89fc2c0782052815295faf6a8e0a9fb libmbim-1.28.2.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-or-later.txt +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1-or-later.txt diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index e728cf58f9..59f55a57bc 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -7,7 +7,8 @@ LIBMBIM_VERSION = 1.28.2 LIBMBIM_SITE = https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION) LIBMBIM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs) -LIBMBIM_LICENSE_FILES = COPYING COPYING.LIB +LIBMBIM_LICENSE_FILES = \ + LICENSES/GPL-2.0-or-later.txt LICENSES/LGPL-2.1-or-later.txt LIBMBIM_CPE_ID_VENDOR = freedesktop LIBMBIM_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:56:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:17 -0000 Subject: [Buildroot] [git commit branch/next] package/php: bump version to 8.1.13 Message-ID: <20230220205209.BC5C48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=148ae3338c70881cc2caebdd9b45cc6212362a2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://news-web.php.net/php.announce/341 Changelog: https://www.php.net/ChangeLog-8.php#8.1.13 Signed-off-by: Bernd Kuhls 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 bf81ebf3e8..461dc36031 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 08243359e2204d842082269eedc15f08d2eca726d0e65b93fb11f4bfc51bbbab php-8.1.12.tar.xz +sha256 b15ef0ccdd6760825604b3c4e3e73558dcf87c75ef1d68ef4289d8fd261ac856 php-8.1.13.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index a400a38af7..1fdf5c68a2 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.1.12 +PHP_VERSION = 8.1.13 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:56:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:18 -0000 Subject: [Buildroot] [git commit branch/next] board/freescale/imx6ulevk/readme.txt: update broken url Message-ID: <20230220205219.931E386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01a3cb0f6eac48150c4bd246402025c0790e2625 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next http://freescale.com/ urls are all redirected to the NXP homepage https://www.nxp.com/ Even if the link is not broken in the sense of a 404 http error, the pointed resource is not found. This commit updates the old freescale link to the correct nxp.com location. Note: the link now requires a free registration to be accessed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- board/freescale/imx6ulevk/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/imx6ulevk/readme.txt b/board/freescale/imx6ulevk/readme.txt index 5bc03771f2..5a5b4ae5a3 100644 --- a/board/freescale/imx6ulevk/readme.txt +++ b/board/freescale/imx6ulevk/readme.txt @@ -71,4 +71,4 @@ Enjoy! References ========== -[1] http://cache.freescale.com/files/32bit/doc/quick_start_guide/IMX6ULTRALITEQSG.pdf +[1] https://www.nxp.com/webapp/Download?colCode=IMX6ULTRALITEQSG From peter at korsgaard.com Mon Feb 20 20:56:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:18 -0000 Subject: [Buildroot] [git commit branch/next] package/libdeflate: bump version to 1.15 Message-ID: <20230220205209.AFD74828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c31087182fa545784d9a0a01f0b32715d78c3955 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/ebiggers/libdeflate/blob/master/NEWS.md Switch to cmake. Added CFLAGS to fix uClibc build: /home/bernd/buildroot/output/build/libdeflate-1.15/programs/gzip.c:367:10: error: 'const struct stat' has no member named 'st_atim'; did you mean 'st_atime'? /home/bernd/buildroot/output/build/libdeflate-1.15/programs/gzip.c:367:26: error: 'const struct stat' has no member named 'st_mtim'; did you mean 'st_mtime'? Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libdeflate/libdeflate.hash | 2 +- package/libdeflate/libdeflate.mk | 27 ++++----------------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/package/libdeflate/libdeflate.hash b/package/libdeflate/libdeflate.hash index 7dae12921f..79de3439d7 100644 --- a/package/libdeflate/libdeflate.hash +++ b/package/libdeflate/libdeflate.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ba89fb167a5ab6bbdfa6ee3b1a71636e8140fa8471cce8a311697584948e4d06 libdeflate-1.12.tar.gz +sha256 58b95040df7383dc0413defb700d9893c194732474283cc4c8f144b00a68154b libdeflate-1.15.tar.gz sha256 5d246dd2537307b80fed9ba5fdddf5d0fe7a8f023393a071182b9daed56b40fe COPYING diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk index 93ec5909a5..2305af4dc9 100644 --- a/package/libdeflate/libdeflate.mk +++ b/package/libdeflate/libdeflate.mk @@ -4,31 +4,12 @@ # ################################################################################ -LIBDEFLATE_VERSION = 1.12 +LIBDEFLATE_VERSION = 1.15 LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) LIBDEFLATE_LICENSE = MIT LIBDEFLATE_LICENSE_FILES = COPYING LIBDEFLATE_INSTALL_STAGING = YES +LIBDEFLATE_CONF_OPTS = \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -D_DEFAULT_SOURCE" -ifeq ($(BR2_STATIC_LIBS),y) -LIBDEFLATE_MAKE_OPTS += DISABLE_SHARED=yes -endif - -define LIBDEFLATE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(LIBDEFLATE_MAKE_OPTS) -endef - -define LIBDEFLATE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(LIBDEFLATE_MAKE_OPTS) \ - DESTDIR="$(STAGING_DIR)" PREFIX=/usr install -endef - -define LIBDEFLATE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(LIBDEFLATE_MAKE_OPTS) \ - DESTDIR="$(TARGET_DIR)" PREFIX=/usr install -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:56:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:19 -0000 Subject: [Buildroot] [git commit branch/next] package/modem-manager: fix static build Message-ID: <20230220205219.5961686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d769cfc13f6c2544f8bc5b6339d23763319a2383 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: FAILED: src/ModemManager /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/bin/m68k-linux-gcc -o src/ModemManager src/ModemManager.p/meson-generated_.._mm-daemon-enums-types.c.o src/ModemManager.p/main.c.o src/ModemManager.p/mm-auth-provider.c.o src/ModemManager.p/mm-base-bearer.c.o src/ModemManager.p/mm-base-call.c.o src/ModemManager.p/mm-base-manager.c.o src/ModemManager.p/mm-base-modem-at.c.o src/ModemManager.p/mm-base-modem.c.o src/ModemManager.p/mm-base-sim.c.o src/ModemManager.p/mm-base-sms.c.o src/ModemManager.p/mm-bearer-list.c.o src/ModemManager.p/mm-broadband-bearer.c.o src/ModemManager.p/mm-broadband-modem.c.o src/ModemManager.p/mm-call-list.c.o src/ModemManager.p/mm-context.c.o src/ModemManager.p/mm-device.c.o src/ModemManager.p/mm-dispatcher.c.o src/ModemManager.p/mm-dispatcher-connection.c.o src/ModemManager.p/mm-dispatcher-fcc-unlock.c.o src/ModemManager.p/mm-filter.c.o src/ModemManager.p/mm-iface-modem-3gpp.c.o src/ModemManager.p/mm-iface-modem-3gpp-profile-manage r.c.o src/ModemManager.p/mm-iface-modem-3gpp-ussd.c.o src/ModemManager.p/mm-iface-modem.c.o src/ModemManager.p/mm-iface-modem-cdma.c.o src/ModemManager.p/mm-iface-modem-firmware.c.o src/ModemManager.p/mm-iface-modem-location.c.o src/ModemManager.p/mm-iface-modem-messaging.c.o src/ModemManager.p/mm-iface-modem-oma.c.o src/ModemManager.p/mm-iface-modem-sar.c.o src/ModemManager.p/mm-iface-modem-signal.c.o src/ModemManager.p/mm-iface-modem-simple.c.o src/ModemManager.p/mm-iface-modem-time.c.o src/ModemManager.p/mm-iface-modem-voice.c.o src/ModemManager.p/mm-plugin.c.o src/ModemManager.p/mm-plugin-manager.c.o src/ModemManager.p/mm-port-probe.c.o src/ModemManager.p/mm-port-probe-at.c.o src/ModemManager.p/mm-private-boxed-types.c.o src/ModemManager.p/mm-sms-list.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static '-Wl,-rpath,$ORIGIN/../libmm-glib' -Wl,-rpath-link,/home/autobuild/autobuild/instance-11/output-1/build/modem-manager-1.20.2/build/libmm-glib -Wl,--start-group src/libport.a sr c/libkerneldevice.a src/libhelpers.a libmm-glib/libmm-glib.so.0.9.0 libqcdm/src/libqcdm.a libmm-glib/generated/tests/libmm-test-generated.a -Wl,--export-dynamic /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libglib-2.0.a -pthread -lm /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpcre.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libffi.a /home/autob uild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libblkid.a -Wl,--end-group /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/opt/ext-toolchain/bin/../lib/gcc/m68k-buildroot-linux-uclibc/11.2.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `libmm-glib/libmm-glib.so.0.9.0' Fixes: - http://autobuild.buildroot.org/results/9803d593305df36c4a8d67aac2fb4c9a3120a072 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...son-Un-hardcode-building-a-shared-library.patch | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch b/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch new file mode 100644 index 0000000000..e99396d0d1 --- /dev/null +++ b/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch @@ -0,0 +1,54 @@ +From a9651f2390d3691dc74bcdb24b69a043fb0aacae Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 10:18:32 +0100 +Subject: [PATCH] meson: Un-hardcode building a shared library + +Use library() instead of shared_library() to allow specifying which kind +of library to build with "meson setup --default-library ..." + +This will avoid the following static build failure: + +FAILED: src/ModemManager +/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/bin/m68k-linux-gcc -o src/ModemManager src/ModemManager.p/meson-generated_.._mm-daemon-enums-types.c.o src/ModemManager.p/main.c.o src/ModemManager.p/mm-auth-provider.c.o src/ModemManager.p/mm-base-bearer.c.o src/ModemManager.p/mm-base-call.c.o src/ModemManager.p/mm-base-manager.c.o src/ModemManager.p/mm-base-modem-at.c.o src/ModemManager.p/mm-base-modem.c.o src/ModemManager.p/mm-base-sim.c.o src/ModemManager.p/mm-base-sms.c.o src/ModemManager.p/mm-bearer-list.c.o src/ModemManager.p/mm-broadband-bearer.c.o src/ModemManager.p/mm-broadband-modem.c.o src/ModemManager.p/mm-call-list.c.o src/ModemManager.p/mm-context.c.o src/ModemManager.p/mm-device.c.o src/ModemManager.p/mm-dispatcher.c.o src/ModemManager.p/mm-dispatcher-connection.c.o src/ModemManager.p/mm-dispatcher-fcc-unlock.c.o src/ModemManager.p/mm-filter.c.o src/ModemManager.p/mm-iface-modem-3gpp.c.o src/ModemManager.p/mm-iface-modem-3gpp-profile-manag er.c.o src/ModemManager.p/mm-iface-modem-3gpp-ussd.c.o src/ModemManager.p/mm-iface-modem.c.o src/ModemManager.p/mm-iface-modem-cdma.c.o src/ModemManager.p/mm-iface-modem-firmware.c.o src/ModemManager.p/mm-iface-modem-location.c.o src/ModemManager.p/mm-iface-modem-messaging.c.o src/ModemManager.p/mm-iface-modem-oma.c.o src/ModemManager.p/mm-iface-modem-sar.c.o src/ModemManager.p/mm-iface-modem-signal.c.o src/ModemManager.p/mm-iface-modem-simple.c.o src/ModemManager.p/mm-iface-modem-time.c.o src/ModemManager.p/mm-iface-modem-voice.c.o src/ModemManager.p/mm-plugin.c.o src/ModemManager.p/mm-plugin-manager.c.o src/ModemManager.p/mm-port-probe.c.o src/ModemManager.p/mm-port-probe-at.c.o src/ModemManager.p/mm-private-boxed-types.c.o src/ModemManager.p/mm-sms-list.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static '-Wl,-rpath,$ORIGIN/../libmm-glib' -Wl,-rpath-link,/home/autobuild/autobuild/instance-11/output-1/build/modem-manager-1.20.2/build/libmm-glib -Wl,--start-group src/libport.a s rc/libkerneldevice.a src/libhelpers.a libmm-glib/libmm-glib.so.0.9.0 libqcdm/src/libqcdm.a libmm-glib/generated/tests/libmm-test-generated.a -Wl,--export-dynamic /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libglib-2.0.a -pthread -lm /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpcre.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libffi.a /home/auto build/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libblkid.a -Wl,--end-group +/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/opt/ext-toolchain/bin/../lib/gcc/m68k-buildroot-linux-uclibc/11.2.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `libmm-glib/libmm-glib.so.0.9.0' + +Fixes: + - http://autobuild.buildroot.org/results/9803d593305df36c4a8d67aac2fb4c9a3120a072 + +Signed-off-by: Fabrice Fontaine +[yann.morin.1998 at free.fr: actual backport of upstreeam commit] +Signed-off-by: Yann E. MORIN +--- + libmm-glib/meson.build | 2 +- + plugins/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libmm-glib/meson.build b/libmm-glib/meson.build +index 42f8ac61..de668dab 100644 +--- a/libmm-glib/meson.build ++++ b/libmm-glib/meson.build +@@ -129,7 +129,7 @@ deps = [include_dep] + + libname = 'mm-glib' + +-libmm_glib = shared_library( ++libmm_glib = library( + libname, + version: mm_glib_version, + sources: sources, +diff --git a/plugins/meson.build b/plugins/meson.build +index f849bb53..9e081beb 100644 +--- a/plugins/meson.build ++++ b/plugins/meson.build +@@ -18,7 +18,7 @@ if enable_tests + libmm_test_generated_dep + ] + +- libmm_test_common = shared_library( ++ libmm_test_common = library( + 'mm-test-common', + sources: sources, + include_directories: top_inc, +-- +2.25.1 + From peter at korsgaard.com Mon Feb 20 20:56:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:19 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-input-libinput: bump version to 1.2.1 Message-ID: <20230220205209.E4353828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e250593ceabbdbc19365e56c679948f80ed6b9c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-January/003129.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash | 7 +++---- .../xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash index a2f295d6b5..480886b295 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-September/003110.html -sha256 f80da3c514fe1cbf57fa1b1bd6ff97f6b0a1f87466ad89247bac59cd0a5869f6 xf86-input-libinput-1.2.0.tar.bz2 -sha512 ebff9490d33fd7495df2e03203060a76b3274f0e638bc92f3d95257fac57cdb9dac308e90e54006fe9522b6de3b1f1c38fd5f0b0b75b7051e5422290f43de52d xf86-input-libinput-1.2.0.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-January/003129.html +sha256 8151db5b9ddb317c0ce92dcb62da9a8db5079e5b8a95b60abc854da21e7e971b xf86-input-libinput-1.2.1.tar.xz +sha512 3decf694861d1aa3c02d090e66c5ed5513818cb18e9863f1790e0c8122a972230fb903705062b8291e1709db9098623f1205c63ccfb68e552e104813414589c7 xf86-input-libinput-1.2.1.tar.xz # Locally computed sha256 4114220b281561e80f3422f0e7ae8d3e1fc85131ffc2e3b6265119e66f1adb27 COPYING diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk index 21d962aa52..d1f93ffb5b 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.2.0 -XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_LIBINPUT_SITE = https://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.2.1 +XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.xz +XDRIVER_XF86_INPUT_LIBINPUT_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT XDRIVER_XF86_INPUT_LIBINPUT_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_LIBINPUT_DEPENDENCIES = libinput xserver_xorg-server xorgproto From yann.morin.1998 at free.fr Mon Feb 20 20:56:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:20 -0000 Subject: [Buildroot] [git commit branch/next] package/qemu: refactor target emulator selection Message-ID: <20230220205219.27F9E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44be514b21fd94096702b80c62d46c31d72f15a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The current mechanism to select emulation targets works this way: - BR2_PACKAGE_QEMU_SYSTEM selects the "system" (softmmu) targets. It selects FDT and creates a dependency on the "dtc" package but this is not always necessary. Only 14 system targets, out of 31, actually require FDT. - BR2_PACKAGE_QEMU_LINUX_USER selects the "linux-user" targets. It does not select FDT, which is not required by linux-user emulators. - Alternatively, we fill BR2_PACKAGE_QEMU_CUSTOM_TARGETS with a list of emulators (e.g. "x86_64-softmmu x86_64-linux-user"). Then we pass "--enable-system --enable-linux-user --target-list="..." to the configure script, so QEMU builds its list of default targets, from which it checks if the specified subset is valid. Since CUSTOM_TARGETS does not select FDT, we can get build errors like this: ../meson.build:2778:2: ERROR: Problem encountered: fdt not available but required by targets x86_64-softmmu We could select FDT when CUSTOM_TARGETS is set, but this would force an unnecessary dependency on dtc, as BR2_PACKAGE_QEMU_SYSTEM does. In order to fix these problems, refactor the package configuration: - Keep BR2_PACKAGE_QEMU_SYSTEM and BR2_PACKAGE_QEMU_LINUX_USER, which by default build all corresponding target emulators. - Add a BR2_PACKAGE_QEMU_CHOOSE_TARGETS config, to permit choosing the desired emulators. - Add configs for each supported target. They select FDT, when needed. - Move QEMU to a separate menu, since the number of configuration itens became too large. - Select BR2_LEGACY if BR2_PACKAGE_QEMU_CUSTOM_TARGETS is set, because this situation requires user intervention to reconfigure the package. - Reorganize the make file accordingly. Selecting CHOOSE_TARGETS without choosing at least one emulator is considered an error. Notes about the list of enabled targets: - when the user enables both system and user emulation, we provide no way to be able to build all system bt only parts of user (or the other way around), because the qemu build system does not allow that: when a list of target is passed, it applies to both system and user emulation; - as a consequence and in the same spirit, we also do not sanity-check that at least one system, resp. user, target is enabled when system, resp. user, emulation is enabled; we only require that one target is enabled, so that the list is not empty. Signed-off-by: Carlos Santos [yann.morin.1998 at free.fr: - always build at least user or system - add help text to BR2_PACKAGE_QEMU_CHOOSE_TARGETS - simplify prompt for BR2_PACKAGE_QEMU_CHOOSE_TARGETS - simplify list of targets with unique QEMU_TARGET_LIST_y - extend the commit log with "Notes about the list of enabled targets" ] Signed-off-by: Yann E. MORIN --- Config.in.legacy | 11 ++ package/qemu/Config.in | 287 ++++++++++++++++++++++++++++++++++++++++--------- package/qemu/qemu.mk | 91 ++++++++++++++-- 3 files changed, 329 insertions(+), 60 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index ca25c18b16..6d66f1b958 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,17 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_QEMU_CUSTOM_TARGETS + string "the QEMU specific targets option has been removed" + help + This option has been replaced by a list of individual targets + for the many architectures supported by QEMU. + +config BR2_PACKAGE_QEMU_CUSTOM_TARGETS_WRAP + bool + default y if BR2_PACKAGE_QEMU_CUSTOM_TARGETS != "" + select BR2_LEGACY + config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD bool "xf86-input-keyboard removed" help diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 15d6c7d6b5..0f9e353510 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -17,7 +17,7 @@ comment "QEMU requires a toolchain with wchar, threads, gcc >= 8" depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR) || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_8 -config BR2_PACKAGE_QEMU +menuconfig BR2_PACKAGE_QEMU bool "QEMU" depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 @@ -27,6 +27,7 @@ config BR2_PACKAGE_QEMU select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_QEMU_SYSTEM if !BR2_PACKAGE_QEMU_LINUX_USER help QEMU is a generic and open source machine emulator and virtualizer. @@ -49,20 +50,13 @@ if BR2_PACKAGE_QEMU comment "Emulators selection" -config BR2_PACKAGE_QEMU_CUSTOM_TARGETS - string "Enable specific targets" +config BR2_PACKAGE_QEMU_SYSTEM + bool "Enable systems emulation" + depends on !BR2_STATIC_LIBS # dtc help - Enter here the list of QEMU targets you want to build. For - example: + Say 'y' to build system emulators/virtualisers. - System emulation | User-land emulation - ----------------------+----------------------- - i386-softmmu | i386-linux-user - arm-softmmu | ppc-linux-user - x86_64-softmmu | sparc-bsd-user - ... | ... - -comment "Networking options" +if BR2_PACKAGE_QEMU_SYSTEM config BR2_PACKAGE_QEMU_SLIRP bool "Enable user mode networking (SLIRP)" @@ -87,69 +81,264 @@ config BR2_PACKAGE_QEMU_SLIRP Notice that this option does not disable other networking modes. -if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = "" - -comment "... or you can select emulator families to enable, below:" +config BR2_PACKAGE_QEMU_SDL + bool "Enable SDL frontend" + select BR2_PACKAGE_SDL2 + help + Say 'y' to enable the SDL frontend, that is, a graphical + window presenting the VM's display. -config BR2_PACKAGE_QEMU_SYSTEM - bool "Enable all systems emulation" - depends on !BR2_STATIC_LIBS # dtc - select BR2_PACKAGE_QEMU_FDT +config BR2_PACKAGE_QEMU_FDT + bool "Enable FDT" + select BR2_PACKAGE_DTC help - Say 'y' to build all system emulators/virtualisers that QEMU - supports. + Say 'y' here to have QEMU capable of constructing Device + Trees, and passing them to the VMs. + +endif # BR2_PACKAGE_QEMU_SYSTEM comment "systems emulation needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS config BR2_PACKAGE_QEMU_LINUX_USER - bool "Enable all Linux user-land emulation" + bool "Enable Linux user-land emulation" # Incompatible "struct sigevent" definition on musl depends on !BR2_TOOLCHAIN_USES_MUSL help - Say 'y' to build all Linux user-land emulators that QEMU - supports. + Say 'y' to build Linux user-land emulators. # Note: bsd-user can not be build on Linux comment "Linux user-land emulation needs a glibc or uClibc toolchain" depends on BR2_TOOLCHAIN_USES_MUSL -endif # BR2_PACKAGE_QEMU_CUSTOM_TARGETS == "" +config BR2_PACKAGE_QEMU_CHOOSE_TARGETS + bool "Select individual emulator targets" + help + By default, all targets (system and/or user, subject to the + corresponding options, above) are built. If you only need a + subset of the emulated targets, say 'y' here and enable at + least one target, below. -config BR2_PACKAGE_QEMU_HAS_EMULS - def_bool y - depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER || BR2_PACKAGE_QEMU_CUSTOM_TARGETS != "" +if BR2_PACKAGE_QEMU_CHOOSE_TARGETS -if BR2_PACKAGE_QEMU_HAS_EMULS +config BR2_PACKAGE_QEMU_TARGET_AARCH64 + bool "aarch64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + ARM 64-bit architecture. -comment "Frontends" +config BR2_PACKAGE_QEMU_TARGET_AARCH64_BE + bool "aarch64_be (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + ARM 64-bit architecture, big-endian. -config BR2_PACKAGE_QEMU_SDL - bool "Enable SDL frontend" - depends on !BR2_STATIC_LIBS # sdl2 - select BR2_PACKAGE_SDL2 +config BR2_PACKAGE_QEMU_TARGET_ALPHA + bool "alpha" help - Say 'y' to enable the SDL frontend, that is, a graphical - window presenting the VM's display. + DEC Alpha 64-bit RISC architecture. -comment "SDL frontend needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +config BR2_PACKAGE_QEMU_TARGET_ARM + bool "arm" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + ARM EABI architecture, little-endian. -comment "Misc. features" +config BR2_PACKAGE_QEMU_TARGET_ARMEB + bool "armeb (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + ARM EABI architecture, big-endian. -config BR2_PACKAGE_QEMU_FDT - bool "Enable FDT" - depends on !BR2_STATIC_LIBS # dtc - select BR2_PACKAGE_DTC +config BR2_PACKAGE_QEMU_TARGET_AVR + bool "avr (system, only)" + depends on BR2_PACKAGE_QEMU_SYSTEM help - Say 'y' here to have QEMU capable of constructing Device - Trees, and passing them to the VMs. + AVR 8-bit microcontroller architecture. -comment "FDT support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +config BR2_PACKAGE_QEMU_TARGET_CRIS + bool "cris" + help + ETRAX CRIS microcontroller architecture. + +config BR2_PACKAGE_QEMU_TARGET_HEXAGON + bool "hexagon (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + Qualcomm's Hexagon VLSI DSP architecture. + +config BR2_PACKAGE_QEMU_TARGET_HPPA + bool "hppa" + help + HP PA-RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_I386 + bool "i386" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Intel i386 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_LOONGARCH64 + bool "loongarch64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Loongson 64-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_M68K + bool "m68k" + help + Motorola 68000 architecture. + +config BR2_PACKAGE_QEMU_TARGET_MICROBLAZE + bool "microblaze" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Xilinix MicroBlaze soft processor. + +config BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL + bool "microblazeel" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Xilinix MicroBlaze EL soft processor. + +config BR2_PACKAGE_QEMU_TARGET_MIPS + bool "mips" + help + MIPS 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_MIPSEL + bool "mipsel" + help + MIPS 32-bit architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_MIPS64 + bool "mips64" + help + MIPS 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_MIPS64EL + bool "mips64el" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + MIPS 64-bit architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_MIPSN32 + bool "mipsn32 (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + MIPS N32 architecture. + +config BR2_PACKAGE_QEMU_TARGET_MIPSN32EL + bool "mipsn32el (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + MIPS N32 architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_NIOS2 + bool "nios2" + help + Nios II architecture. + +config BR2_PACKAGE_QEMU_TARGET_OR1K + bool "or1k" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + OpenRISC 1000 architecture. + +config BR2_PACKAGE_QEMU_TARGET_PPC + bool "ppc" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + PoewerPC 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_PPC64 + bool "ppc64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + PoewerPC 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_PPC64LE + bool "ppc64le (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + PoewerPC 64-bit architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_RISCV32 + bool "riscv32" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + RISC-V 33-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_RISCV64 + bool "riscv64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + RISC-V 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_RX + bool "rx (system-only)" + depends on BR2_PACKAGE_QEMU_SYSTEM + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Renesas Electronics RX 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_S390X + bool "s390x" + help + IBM z/Architecture 64-bit mainframe (s390x) + +config BR2_PACKAGE_QEMU_TARGET_SH4 + bool "sh4" + help + Super-H 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_SH4EB + bool "sh4eb" + help + Super-H EB 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_SPARC + bool "sparc" + help + SPARC 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_SPARC32PLUS + bool "sparc32plus (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + SPARC 32-bit RISC architecture (Sun's v8plus). + +config BR2_PACKAGE_QEMU_TARGET_SPARC64 + bool "sparc64" + help + SPARC 64-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_TRICORE + bool "tricore (system, only)" + depends on BR2_PACKAGE_QEMU_SYSTEM + help + Infineon TriCore 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_X86_64 + bool "x86_64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Intel x86 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_XTENSA + bool "xtensa" + help + Xtensa 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_XTENSAEB + bool "xtensaeb" + help + Xtensa 32-bit RISC architecture, big-endian. + +endif # BR2_PACKAGE_QEMU_CHOOSE_TARGETS -endif # BR2_PACKAGE_QEMU_HAS_EMULS +comment "Tools selection" config BR2_PACKAGE_QEMU_TOOLS bool "Enable tools" diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 8725e7c8c4..5c7a8d504c 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,6 +4,8 @@ # ################################################################################ +# When updating the version, check whether the list of supported targets +# needs to be updated. QEMU_VERSION = 7.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org @@ -36,30 +38,97 @@ QEMU_OPTS = QEMU_VARS = LIBTOOL=$(HOST_DIR)/bin/libtool -# If we want to specify only a subset of targets, we must still enable all -# of them, so that QEMU properly builds its list of default targets, from -# which it then checks if the specified sub-set is valid. That's what we -# do in the first part of the if-clause. -# Otherwise, if we do not want to pass a sub-set of targets, we then need -# to either enable or disable -user and/or -system emulation appropriately. -# That's what we do in the else-clause. -ifneq ($(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS)),) -QEMU_OPTS += --enable-system --enable-linux-user -QEMU_OPTS += --target-list="$(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS))" -else +# If we want to build all emulation targets, we just need to either enable -user +# and/or -system emulation appropriately. +# Otherwise, if we want only a subset of targets, we must still enable all of +# them, so that QEMU properly builds a list of default targets from which it +# checks if the specified sub-set is valid. ifeq ($(BR2_PACKAGE_QEMU_SYSTEM),y) QEMU_OPTS += --enable-system +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64) += aarch64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ALPHA) += alpha-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARM) += arm-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AVR) += avr-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_CRIS) += cris-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HPPA) += hppa-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_I386) += i386-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_LOONGARCH64) += loongarch64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_M68K) += m68k-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZE) += microblaze-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL) += microblazeel-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS) += mips-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64) += mips64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64EL) += mips64el-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSEL) += mipsel-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_NIOS2) += nios2-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_OR1K) += or1k-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC) += ppc-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC64) += ppc64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV32) += riscv32-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV64) += riscv64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RX) += rx-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_S390X) += s390x-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4) += sh4-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4EB) += sh4eb-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC) += sparc-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC64) += sparc64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_TRICORE) += tricore-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_X86_64) += x86_64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSA) += xtensa-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSAEB) += xtensaeb-softmmu else QEMU_OPTS += --disable-system endif ifeq ($(BR2_PACKAGE_QEMU_LINUX_USER),y) QEMU_OPTS += --enable-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64) += aarch64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64_BE) += aarch64_be-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ALPHA) += alpha-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARM) += arm-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARMEB) += armeb-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_CRIS) += cris-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HEXAGON) += hexagon-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HPPA) += hppa-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_I386) += i386-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_LOONGARCH64) += loongarch64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_M68K) += m68k-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZE) += microblaze-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL) += microblazeel-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS) += mips-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64) += mips64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64EL) += mips64el-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSEL) += mipsel-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSN32) += mipsn32-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSN32EL) += mipsn32el-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_NIOS2) += nios2-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_OR1K) += or1k-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC) += ppc-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC64) += ppc64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC64LE) += ppc64le-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV32) += riscv32-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV64) += riscv64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_S390X) += s390x-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4) += sh4-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4EB) += sh4eb-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC) += sparc-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC32PLUS) += sparc32plus-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC64) += sparc64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_X86_64) += x86_64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSA) += xtensa-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSAEB) += xtensaeb-linux-user else QEMU_OPTS += --disable-linux-user endif +# Build the list of desired targets, if any. +ifeq ($(BR2_PACKAGE_QEMU_CHOOSE_TARGETS),y) +QEMU_TARGET_LIST = $(strip $(QEMU_TARGET_LIST_y)) +ifeq ($(BR_BUILDING).$(QEMU_TARGET_LIST),y.) +$(error "No emulator target has ben chosen") +endif +QEMU_OPTS += --target-list="$(QEMU_TARGET_LIST)" endif ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) From yann.morin.1998 at free.fr Mon Feb 20 20:56:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:20 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx/imx-alsa-plugins: update codeaurora URLs to github Message-ID: <20230220205220.074328648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ed90a96aa1f11fed19045036b4a10d9a8263a98 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Note 3: this commit also adds the github as project homepage in Config.in. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/imx-alsa-plugins/Config.in | 2 ++ package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash | 2 +- package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/freescale-imx/imx-alsa-plugins/Config.in b/package/freescale-imx/imx-alsa-plugins/Config.in index ec9b5b19cf..df47edd16d 100644 --- a/package/freescale-imx/imx-alsa-plugins/Config.in +++ b/package/freescale-imx/imx-alsa-plugins/Config.in @@ -13,6 +13,8 @@ config BR2_PACKAGE_IMX_ALSA_PLUGINS * Rate Converter Plugin Using Freescale ASRC Hardware Resampler (i.MX53 and most i.MX6) + https://github.com/nxp-imx/imx-alsa-plugins + comment "imx-alsa-libs needs an imx-specific Linux kernel to be built" depends on BR2_arm depends on !BR2_LINUX_KERNEL diff --git a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash index bb7beede9d..1ca7697f03 100644 --- a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash +++ b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 a9a5ef408a7329c2c5fa2a084ae7824afbfbebed68612bd72509488ccb0b94b3 imx-alsa-plugins-rel_imx_4.9.x_1.0.0_ga-br1.tar.gz +sha256 089bba009f82bf5e4a1e34b77a7d3badce2948619d92bec7a7ad42e766442d4c imx-alsa-plugins-rel_imx_4.9.x_1.0.0_ga.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL diff --git a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk index 9c81ff0df0..912cc7c68b 100644 --- a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk +++ b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk @@ -5,8 +5,7 @@ ################################################################################ IMX_ALSA_PLUGINS_VERSION = rel_imx_4.9.x_1.0.0_ga -IMX_ALSA_PLUGINS_SITE = https://source.codeaurora.org/external/imx/imx-alsa-plugins -IMX_ALSA_PLUGINS_SITE_METHOD = git +IMX_ALSA_PLUGINS_SITE = $(call github,nxp-imx,imx-alsa-plugins,$(IMX_ALSA_PLUGINS_VERSION)) IMX_ALSA_PLUGINS_LICENSE = GPL-2.0+ IMX_ALSA_PLUGINS_LICENSE_FILES = COPYING.GPL IMX_ALSA_PLUGINS_DEPENDENCIES = host-pkgconf alsa-lib From peter at korsgaard.com Mon Feb 20 20:56:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:21 -0000 Subject: [Buildroot] [git commit branch/next] nezha_defconfig: use upstream OpenSBI 1.1 release Message-ID: <20230220205210.1F34D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=300610e11e76bbd75469243f88ae243f03523ea3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The D1 support is now upstream, so we can use the upstream 1.1 release instead of a custom version. Signed-off-by: Peter Korsgaard --- configs/nezha_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 02f351d483..f845d918d9 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -15,8 +15,8 @@ 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_CUSTOM_TARBALL=y -BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,opensbi,e6793dc36a71537023f078034fe795c64a9992a3)/opensbi-e6793dc36a71537023f078034fe795c64a9992a3.tar.gz" +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y From yann.morin.1998 at free.fr Mon Feb 20 20:56:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:21 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6qsabreauto: update codeaurora URLs to github Message-ID: <20230220205220.D2F04828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67a98cdd94b03404bf91b203a998e37a6d5d4e0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6qsabreauto_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index 58b4a5f92d..72696ab1ad 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto" @@ -38,7 +37,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y From peter at korsgaard.com Mon Feb 20 20:56:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:22 -0000 Subject: [Buildroot] [git commit branch/next] package/libxkbcommon: add LIBXKBCOMMON_CPE_ID_VENDOR Message-ID: <20230220205210.0B382828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=32c0225b7240c24002038779ad2035a5c16c6299 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next cpe:2.3:a:xkbcommon:libxkbcommon is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Axkbcommon%3Alibxkbcommon Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Peter Korsgaard --- package/libxkbcommon/libxkbcommon.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index f2c49cc700..236bf4c5d9 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -9,6 +9,7 @@ LIBXKBCOMMON_SITE = https://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 LIBXKBCOMMON_LICENSE_FILES = LICENSE +LIBXKBCOMMON_CPE_ID_VENDOR = xkbcommon LIBXKBCOMMON_INSTALL_STAGING = YES LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex LIBXKBCOMMON_CONF_OPTS = \ From yann.morin.1998 at free.fr Mon Feb 20 20:56:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:22 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6qsabresd: update codeaurora URLs to github Message-ID: <20230220205220.E775D86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd42b159a5f752921ee602530d289c810ad7ee51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6qsabresd_defconfig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index f2ac993da0..86513d8072 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" @@ -39,6 +38,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y From peter at korsgaard.com Mon Feb 20 20:56:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:23 -0000 Subject: [Buildroot] [git commit branch/next] package/libglfw: bump version to 3.3.8 Message-ID: <20230220205209.F0EF08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=acf4a7d1c72c468e269058ba52df40c9734c8801 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://www.glfw.org/changelog.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libglfw/libglfw.hash | 2 +- package/libglfw/libglfw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libglfw/libglfw.hash b/package/libglfw/libglfw.hash index 5bffc55d26..9d38946f3c 100644 --- a/package/libglfw/libglfw.hash +++ b/package/libglfw/libglfw.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed07b90e334dcd39903e6288d90fa1ae0cf2d2119fec516cf743a0a404527c02 libglfw-3.3.6.tar.gz +sha256 f30f42e05f11e5fc62483e513b0488d5bceeab7d9c5da0ffe2252ad81816c713 libglfw-3.3.8.tar.gz sha256 149704059b5d0bf551637e50042dd4de9c2cae921021f6636298911e3a5f9462 LICENSE.md diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 0a3986f662..eee8e7b298 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGLFW_VERSION = 3.3.6 +LIBGLFW_VERSION = 3.3.8 LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) LIBGLFW_INSTALL_STAGING = YES LIBGLFW_LICENSE = Zlib From yann.morin.1998 at free.fr Mon Feb 20 20:56:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:23 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx8mpevk: update codeaurora URLs to github Message-ID: <20230220205221.4CBC486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5f10b73007487d5d19e34914ee0e1c35a127c4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mpevk_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig index 8d0e6e0f3e..5a72406b67 100644 --- a/configs/freescale_imx8mpevk_defconfig +++ b/configs/freescale_imx8mpevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mp-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-evk" @@ -19,16 +18,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mp_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From peter at korsgaard.com Mon Feb 20 20:56:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:24 -0000 Subject: [Buildroot] [git commit branch/next] nezha_defconfig: bump Linux to current top of d1/wip Message-ID: <20230220205210.2A084828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e8d312418e7eb4b0b2c14fdb17560d185f0ea9b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is now based on Linux 6.1-rc3. We don't have an option for 6.1 yes, so mark it as 6.0 headers. Signed-off-by: Peter Korsgaard --- configs/nezha_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index f845d918d9..2936746c49 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,12 +1,12 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/nezha/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,fe178cf0153d98b71cb01a46c8cc050826a17e77)/linux-fe178cf0153d98b71cb01a46c8cc050826a17e77.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="nezha" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-nezha" From yann.morin.1998 at free.fr Mon Feb 20 20:56:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:24 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx8mnevk: update codeaurora URLs to github Message-ID: <20230220205221.5D10086496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d93fe2f2ac6155db3bb8022a85cf89c9ff57f82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mnevk_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8mnevk_defconfig b/configs/freescale_imx8mnevk_defconfig index b24eb1566b..0653978d91 100644 --- a/configs/freescale_imx8mnevk_defconfig +++ b/configs/freescale_imx8mnevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-ddr4-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-ddr4-evk" @@ -20,16 +19,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_ddr4_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From peter at korsgaard.com Mon Feb 20 20:56:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:25 -0000 Subject: [Buildroot] [git commit branch/next] package/iproute2: bump to version 6.1.0 Message-ID: <20230220205210.55DC781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee8d02ea6d76493324180e0131fea6c227d1d284 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 45af05a200..9e8be43f2b 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 523139e9e72aec996374fa2de74be4c53d2dd05589488934d21ff97bae19580a iproute2-6.0.0.tar.xz +sha256 5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab iproute2-6.1.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 287c6b14e2..9792630f15 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.0.0 +IPROUTE2_VERSION = 6.1.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From yann.morin.1998 at free.fr Mon Feb 20 20:56:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:25 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx8qxpmek: update codeaurora URLs to github Message-ID: <20230220205221.85F5086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9bcc1c0ef7cfc5263925448c2b3c502318b37691 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8qxpmek_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8qxpmek_defconfig b/configs/freescale_imx8qxpmek_defconfig index 1ffbd123e0..ce8f6b7c84 100644 --- a/configs/freescale_imx8qxpmek_defconfig +++ b/configs/freescale_imx8qxpmek_defconfig @@ -6,9 +6,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qxp-mek" @@ -22,16 +21,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qx" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From peter at korsgaard.com Mon Feb 20 20:56:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:26 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xserver_xorg-server: security bump version to 21.1.5 Message-ID: <20230220205210.470668648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8881d4d7e4822337c222fadf4630a49eec1e9ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003303.html Security advisory: https://lists.x.org/archives/xorg-announce/2022-December/003302.html Fixes CVE-2022-46340, CVE-2022-46341, CVE-2022-46342, CVE-2022-46343, CVE-2022-46344 and CVE-2022-4283. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 7 +++---- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 4b2090fa99..654552c8b6 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-July/003193.html -sha256 5cc4be8ee47edb58d4a90e603a59d56b40291ad38371b0bd2471fc3cbee1c587 xorg-server-21.1.4.tar.xz -sha512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f xorg-server-21.1.4.tar.xz - +# From https://lists.x.org/archives/xorg-announce/2022-December/003303.html +sha256 05b0c8301cee7c5a78083df421ba3a071891553541a417b3d85adf5cf20f8720 xorg-server-21.1.5.tar.xz +sha512 a39c6ba36f94241d330b679a9a6fe2c5fda73fc3f5a9308a7a9cfd0d58503e407291759c9e553455c07cf5a3862952ae3904334eeca29c97ff5af7cffd2e6953 xorg-server-21.1.5.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 8dba9f1ed0..16b7438ee6 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.4 +XSERVER_XORG_SERVER_VERSION = 21.1.5 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From yann.morin.1998 at free.fr Mon Feb 20 20:56:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:26 -0000 Subject: [Buildroot] [git commit branch/next] configs/imx8mpico: update codeaurora URLs to github Message-ID: <20230220205221.9E8A8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8fd6036e3b2847f378363b8c0f0ba2cf1a30d1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates only the ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/imx8mpico_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/imx8mpico_defconfig b/configs/imx8mpico_defconfig index 55746fb67e..1df8c104ec 100644 --- a/configs/imx8mpico_defconfig +++ b/configs/imx8mpico_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.72-2.2.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.72-2.2.0)/imx-atf-lf-5.10.72-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y From peter at korsgaard.com Mon Feb 20 20:56:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:27 -0000 Subject: [Buildroot] [git commit branch/next] package/cairo: fix CVE-2019-6462 Message-ID: <20230220205210.7143381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b38286d7e5919693cad2dc5b19024b1c03d29c18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add an upstream patch to fix CVE-2019-6462: An issue was discovered in cairo 1.16.0. There is an infinite loop in the function _arc_error_normalized in the file cairo-arc.c, related to _arc_max_angle_for_tolerance_normalized. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Peter Korsgaard --- ...gle_for_tolerance_normalized-fix-infinite.patch | 39 ++++++++++++++++++++++ package/cairo/cairo.mk | 2 ++ 2 files changed, 41 insertions(+) diff --git a/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch b/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch new file mode 100644 index 0000000000..078e90fa42 --- /dev/null +++ b/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch @@ -0,0 +1,39 @@ +From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 +From: Heiko Lewin +Date: Sun, 1 Aug 2021 11:16:03 +0000 +Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop + +[Retrieved from: +https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0] +Signed-off-by: Quentin Schulz +--- + src/cairo-arc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/cairo-arc.c b/src/cairo-arc.c +index 390397bae..1c891d1a0 100644 +--- a/src/cairo-arc.c ++++ b/src/cairo-arc.c +@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) + { M_PI / 11.0, 9.81410988043554039085e-09 }, + }; + int table_size = ARRAY_LENGTH (table); ++ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ + + for (i = 0; i < table_size; i++) + if (table[i].error < tolerance) + return table[i].angle; + + ++i; ++ + do { + angle = M_PI / i++; + error = _arc_error_normalized (angle); +- } while (error > tolerance); ++ } while (error > tolerance && i < max_segments); + + return angle; + } +-- +2.38.1 + diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index f479aa252a..8bb7ca121d 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -14,6 +14,8 @@ CAIRO_INSTALL_STAGING = YES # 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch CAIRO_IGNORE_CVES += CVE-2018-19876 +# 0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch +CAIRO_IGNORE_CVES += CVE-2019-6462 CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" From yann.morin.1998 at free.fr Mon Feb 20 20:56:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:27 -0000 Subject: [Buildroot] [git commit branch/next] configs/imx8mqevk: update codeaurora URLs to github Message-ID: <20230220205221.A9BC586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e96e3c95452aa69dbaad2597146c6da520299fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/imx8mqevk_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/imx8mqevk_defconfig b/configs/imx8mqevk_defconfig index 73f3f3dcc5..943a479932 100644 --- a/configs/imx8mqevk_defconfig +++ b/configs/imx8mqevk_defconfig @@ -18,16 +18,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,rel_imx_5.4.24_2.1.0)/imx-atf-rel_imx_5.4.24_2.1.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,rel_imx_5.4.24_2.1.0)/uboot-imx-rel_imx_5.4.24_2.1.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From peter at korsgaard.com Mon Feb 20 20:56:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:34 -0000 Subject: [Buildroot] [git commit branch/next] package/libostree: bump to version 2022.7 Message-ID: <20230220205210.EB90C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9febd64bb01f0660a9ac877d2484525438955333 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index 582af4b7b9..ed31109fdb 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 835ef47d9a0b35a10c77ffd7f0fbd2e2b87f7cccb588da27442a05ff71ffad8c libostree-2022.6.tar.xz +sha256 8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f libostree-2022.7.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index e99da9d2cb..8e8ec63213 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2022.6 +LIBOSTREE_VERSION = 2022.7 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From peter at korsgaard.com Mon Feb 20 20:56:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:35 -0000 Subject: [Buildroot] [git commit branch/next] package/tinyxml: fix typo for TINYXML_CPE_ID_VENDOR Message-ID: <20230220205223.513BB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7792f539e440d40566bfab3dd86881a8f8edd7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/tinyxml/tinyxml.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index d173254e31..8e706f1a1e 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,7 +12,7 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README -TINYXML_CPE_ID_VENDOT = tinyxml_project +TINYXML_CPE_ID_VENDOR = tinyxml_project # 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch TINYXML_IGNORE_CVES += CVE-2021-42260 From peter at korsgaard.com Mon Feb 20 20:56:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:35 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libX11: bump version to 1.8.3 Message-ID: <20230220205211.2E8D5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de93736550f8443925dc218b04f82daedfc63c79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003305.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 4f5027d62d..62b67ad544 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003253.html -sha256 ed91d573d570db83b8ae546f4890dccfcd0b9dfe1e50a1b401b63a74c152ed04 libX11-1.8.2.tar.xz -sha512 662ee8043d9ba27df82f647515b701d6f302a52715f21afdaba391f3b70691753e3649e7ff8322e07858be4297df9cbb19227958d676ed6dea198cce64330d1d libX11-1.8.2.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003305.html +sha256 e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd libX11-1.8.3.tar.xz +sha512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 libX11-1.8.3.tar.xz # Locally computed sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 26d4b4d306..3bb3fffce0 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.8.2 +XLIB_LIBX11_VERSION = 1.8.3 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT From peter at korsgaard.com Mon Feb 20 20:56:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:36 -0000 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.1 Message-ID: <20230220205211.1DBCC86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b382fb4a0467a329c22e01a3feafe8029dfe3811 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-December/000697.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 d33d492ba7..e5988cad5e 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 = 22.3.0 +MESA3D_HEADERS_VERSION = 22.3.1 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 77223676ea..613ebce89f 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-November/000695.html -sha256 644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746 mesa-22.3.0.tar.xz -sha512 bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da mesa-22.3.0.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-December/000697.html +sha256 3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb mesa-22.3.1.tar.xz +sha512 8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b mesa-22.3.1.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index c3bd44c2fa..b6f1214102 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 = 22.3.0 +MESA3D_VERSION = 22.3.1 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From peter at korsgaard.com Mon Feb 20 20:56:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:36 -0000 Subject: [Buildroot] [git commit branch/next] package/i2pd: really install configuration files Message-ID: <20230220205223.7ED3E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa581bb3e6b45da2b7a0cfb9e5d6f869a7cd9b05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next While applying [1] the commit "fffbd2c9f7 i2pd: new package" unintentionally removed completely the post-install hooks, so I2PD_INSTALL_CONFIGURATION_FILES is declared but never called. Fix the install of configuration files by adding the defined symbol to the post-install hooks. [1] http://patchwork.ozlabs.org/project/buildroot/patch/20180327212401.5173-1-fontaine.fabrice at gmail.com/ Cc: Fabrice Fontaine Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/i2pd/i2pd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/i2pd/i2pd.mk b/package/i2pd/i2pd.mk index b99212be47..ad268a235c 100644 --- a/package/i2pd/i2pd.mk +++ b/package/i2pd/i2pd.mk @@ -44,6 +44,7 @@ define I2PD_INSTALL_CONFIGURATION_FILES mkdir -p $(TARGET_DIR)/var/lib/i2pd cp -a $(@D)/contrib/certificates $(TARGET_DIR)/var/lib/i2pd endef +I2PD_POST_INSTALL_TARGET_HOOKS += I2PD_INSTALL_CONFIGURATION_FILES define I2PD_USERS i2pd -1 i2pd -1 * /var/lib/i2pd - - I2P Daemon From peter at korsgaard.com Mon Feb 20 20:56:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:37 -0000 Subject: [Buildroot] [git commit branch/next] Revert "package/gperf: add _CPE_ID_VENDOR and _CPE_ID_PRODUCT" Message-ID: <20230220205211.47A3F86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7aeb6c654e16863dc9d7f0d5b92414b52669299f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit 3712e1dee7626b0c3262c054b5b9c2769fd2a61e. gperf -- the GNU perfect hash function generator https://www.gnu.org/software/gperf/ and gperftools -- the Google Performance Tools https://github.com/gperftools/gperftools are two different and unrelated projects. Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/gperf/gperf.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk index c2f042c464..4b928a0ebd 100644 --- a/package/gperf/gperf.mk +++ b/package/gperf/gperf.mk @@ -8,8 +8,6 @@ GPERF_VERSION = 3.1 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf GPERF_LICENSE = GPL-3.0+ GPERF_LICENSE_FILES = COPYING -GPERF_CPE_ID_VENDOR = gperftools_project -GPERF_CPE_ID_PRODUCT = gperftools $(eval $(autotools-package)) $(eval $(host-autotools-package)) From peter at korsgaard.com Mon Feb 20 20:56:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:37 -0000 Subject: [Buildroot] [git commit branch/next] Revert "pptp-linux: fix build with high BR2_JLEVEL settings" Message-ID: <20230220205223.BF0A886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4ce9d01c4244252e18302aa97653e573359dba6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit ffc4afe084a76e7246bd373c73b706f512a86c2b. Commit from 2012 "ffc4afe084 pptp-linux: fix build with high BR2_JLEVEL settings" added _MAKE to a generic package, but the generic infra does not take this symbol into account. The build issue was fixed in 2013 with commit "a5b8081b89 pptp-linux: fix parallel build" by adding a patch file. So drop the bogus PPTP_LINUX_MAKE. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/pptp-linux/pptp-linux.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk index 7fd0733977..b6c740e710 100644 --- a/package/pptp-linux/pptp-linux.mk +++ b/package/pptp-linux/pptp-linux.mk @@ -7,7 +7,6 @@ PPTP_LINUX_VERSION = 1.10.0 PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION) PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz -PPTP_LINUX_MAKE = $(MAKE1) PPTP_LINUX_LICENSE = GPL-2.0+ PPTP_LINUX_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 20:56:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:38 -0000 Subject: [Buildroot] [git commit branch/next] package/timescaledb: bump version to 2.9.0 Message-ID: <20230220205211.5472B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48a3fc3f361f2720007f7fd3851fab0cfa25f092 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/timescale/timescaledb/blob/2.9.0/CHANGELOG.md Signed-off-by: Maxim Kochetkov 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 f546b17d0a..a970ffa1ad 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 22a057c4472d23bf08778932e391f38f350ef0307cf99fb8e279c8245667d3e9 timescaledb-2.8.1.tar.gz +sha256 666f5427cb036500bca731d24d845285299cff82f576ad4474f85da682b2ee78 timescaledb-2.9.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 659d07bd0c..7530368498 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.8.1 +TIMESCALEDB_VERSION = 2.9.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:56:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:38 -0000 Subject: [Buildroot] [git commit branch/next] package/lsof: bump to version 4.96.5 Message-ID: <20230220205224.30F5D86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=848450f32bd3b877a7529f72e23c1d967f717552 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/lsof/lsof.hash | 2 +- package/lsof/lsof.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lsof/lsof.hash b/package/lsof/lsof.hash index 9649e24f7f..29cf443a24 100644 --- a/package/lsof/lsof.hash +++ b/package/lsof/lsof.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c lsof-4.96.3.tar.gz +sha256 e9030af1123ff052ab69e12ef55b8a17dc47ac4bccfba85ee1ca1f31acf29607 lsof-4.96.5.tar.gz sha256 32a728188b19bf86917659d904ab29d0a294b4506e1c98b8b7f1c70ab4975fe1 dialects/linux/dproto.h diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 8c8c46c4ed..fd5887141b 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -4,7 +4,7 @@ # ################################################################################ -LSOF_VERSION = 4.96.3 +LSOF_VERSION = 4.96.5 LSOF_SITE = $(call github,lsof-org,lsof,$(LSOF_VERSION)) LSOF_LICENSE = lsof license # License is repeated in each file, this is a relatively small one. From peter at korsgaard.com Mon Feb 20 20:56:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:39 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pip: bump to version 22.3.1 Message-ID: <20230220205211.7F937828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b869587c6c88a15dc2ecf6c417896de18501a17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-pip/python-pip.hash | 4 ++-- package/python-pip/python-pip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash index d1442ca39d..b41ce47d4c 100644 --- a/package/python-pip/python-pip.hash +++ b/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json -md5 f0dd02265e7ccd2f8758c840fba64810 pip-22.3.tar.gz -sha256 8182aec21dad6c0a49a2a3d121a87cd524b950e0b6092b181625f07ebdde7530 pip-22.3.tar.gz +md5 996f58a94fe0b8b82b6795c42bd171ba pip-22.3.1.tar.gz +sha256 65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38 pip-22.3.1.tar.gz # Locally computed sha256 checksums sha256 634300a669d49aeae65b12c6c48c924c51a4cdf3d1ff086dc3456dc8bcaa2104 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 0f2c5d8e02..8cf3aaa3ec 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 22.3 +PYTHON_PIP_VERSION = 22.3.1 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/f8/08/7f92782ff571c7c7cb6c5eeb8ebbb1f68cb02bdb24e55c5de4dd9ce98bc3 +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/a3/50/c4d2727b99052780aad92c7297465af5fe6eec2dbae490aa9763273ffdc1 PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 20 20:56:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:39 -0000 Subject: [Buildroot] [git commit branch/next] package/readline: bump to version 8.2 Message-ID: <20230220205224.6951986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1f5e9f15063443bae1b80af072c7a5b0ab91d24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/readline/readline.hash | 4 ++-- package/readline/readline.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/readline/readline.hash b/package/readline/readline.hash index b0530a2d72..627746d821 100644 --- a/package/readline/readline.hash +++ b/package/readline/readline.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/readline/readline-8.1.2.tar.gz.sig -sha256 7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6 readline-8.1.2.tar.gz +# https://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz.sig +sha256 3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35 readline-8.2.tar.gz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/readline/readline.mk b/package/readline/readline.mk index b1fd181b78..66812dee77 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -4,7 +4,7 @@ # ################################################################################ -READLINE_VERSION = 8.1.2 +READLINE_VERSION = 8.2 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses host-autoconf From peter at korsgaard.com Mon Feb 20 20:56:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:40 -0000 Subject: [Buildroot] [git commit branch/next] package/python-ipdb: bump to version 0.13.11 Message-ID: <20230220205211.8D81581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7165965fe57725c32ce3a9c69274d1a4c2c54c80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop no longer required setuptools runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-ipdb/Config.in | 1 - package/python-ipdb/python-ipdb.hash | 4 ++-- package/python-ipdb/python-ipdb.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-ipdb/Config.in b/package/python-ipdb/Config.in index a9d6af1684..9259421c6a 100644 --- a/package/python-ipdb/Config.in +++ b/package/python-ipdb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IPDB bool "python-ipdb" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_IPYTHON # runtime help IPython-enabled pdb. diff --git a/package/python-ipdb/python-ipdb.hash b/package/python-ipdb/python-ipdb.hash index 7d483e1777..1e8a45fbd6 100644 --- a/package/python-ipdb/python-ipdb.hash +++ b/package/python-ipdb/python-ipdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ipdb/json -md5 4f5ffb71cd6551319acf8cbceabd8936 ipdb-0.13.9.tar.gz -sha256 951bd9a64731c444fd907a5ce268543020086a697f6be08f7cc2c9a752a278c5 ipdb-0.13.9.tar.gz +md5 e624221cbc9261f68f412b748179d5e2 ipdb-0.13.11.tar.gz +sha256 c23b6736f01fd4586cc2ecbebdf79a5eb454796853e1cd8f2ed3b7b91d4a3e93 ipdb-0.13.11.tar.gz # Locally computed sha256 checksums sha256 4eeb49de04f4894f8ea1f69a04f500799041b750b3d554c06de5ca877258e734 COPYING.txt diff --git a/package/python-ipdb/python-ipdb.mk b/package/python-ipdb/python-ipdb.mk index 7828f83020..151a3d45a4 100644 --- a/package/python-ipdb/python-ipdb.mk +++ b/package/python-ipdb/python-ipdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPDB_VERSION = 0.13.9 +PYTHON_IPDB_VERSION = 0.13.11 PYTHON_IPDB_SOURCE = ipdb-$(PYTHON_IPDB_VERSION).tar.gz -PYTHON_IPDB_SITE = https://files.pythonhosted.org/packages/fc/56/9f67dcd4a4b9960373173a31be1b8c47fe351a1c9385677a7bdd82810e57 +PYTHON_IPDB_SITE = https://files.pythonhosted.org/packages/23/b2/c972cc266b0ba8508b42dab7f5dea1be03ea32213258441bf1b00baca555 PYTHON_IPDB_SETUP_TYPE = setuptools PYTHON_IPDB_LICENSE = BSD-3-Clause PYTHON_IPDB_LICENSE_FILES = COPYING.txt From peter at korsgaard.com Mon Feb 20 20:56:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:40 -0000 Subject: [Buildroot] [git commit branch/next] package/flare-{engine, game}: bump to version 1.14 Message-ID: <20230220205224.A4E1F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34f28a9399477f8fceff54976f838b4d9ff6fb22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next See: https://flarerpg.org/2022/01/31/flare-1-13/ https://flarerpg.org/2022/12/10/flare-1-14/ While at it, change URL to use https. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/flare-engine/Config.in | 2 +- package/flare-engine/flare-engine.hash | 2 +- package/flare-engine/flare-engine.mk | 2 +- package/flare-game/Config.in | 2 +- package/flare-game/flare-game.hash | 2 +- package/flare-game/flare-game.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in index 9c997c2b9a..136cae707e 100644 --- a/package/flare-engine/Config.in +++ b/package/flare-engine/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_FLARE_ENGINE Flare is not a reimplementation of an existing game or engine. It is a tribute to and exploration of the action RPG genre. - http://flarerpg.org + https://flarerpg.org comment "flare-engine needs a toolchain w/ C++, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/package/flare-engine/flare-engine.hash b/package/flare-engine/flare-engine.hash index 7f6169381c..2e1f87b237 100644 --- a/package/flare-engine/flare-engine.hash +++ b/package/flare-engine/flare-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 287a08532972fa3ac56ce7cb213d21be8be35b529339f61d4eeadbd501c78a8e flare-engine-1.12.tar.gz +sha256 2c1bafeaa5ac26c10449bfcb7151b06e8a22547aa7364d2a39bbcb135aa50a09 flare-engine-1.14.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index cbb7add4bb..e5fa947272 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLARE_ENGINE_VERSION = 1.12 +FLARE_ENGINE_VERSION = 1.14 FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION)) FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING diff --git a/package/flare-game/Config.in b/package/flare-game/Config.in index ca68d19a69..535a9b18a2 100644 --- a/package/flare-game/Config.in +++ b/package/flare-game/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_FLARE_GAME game engine itself is part of a separate package, flame-engine. - http://flarerpg.org + https://flarerpg.org diff --git a/package/flare-game/flare-game.hash b/package/flare-game/flare-game.hash index 3d6d678c94..9ae88c6daa 100644 --- a/package/flare-game/flare-game.hash +++ b/package/flare-game/flare-game.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 19a909f2c6e0868baae823bb491e8840d5fb3e0454f00201de8da119772e5160 flare-game-1.12.tar.gz +sha256 65758462070aa88842084f8ee69083d8226e93cfbf83481663276d8307494b8e flare-game-1.14.tar.gz sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f LICENSE.txt diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk index 41f02bec93..a1a0a5944a 100644 --- a/package/flare-game/flare-game.mk +++ b/package/flare-game/flare-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLARE_GAME_VERSION = 1.12 +FLARE_GAME_VERSION = 1.14 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) From peter at korsgaard.com Mon Feb 20 20:56:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:41 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xutil_makedepend: bump version to 1.0.8 Message-ID: <20230220205211.A6C36828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d005917d7256c79b2f50010d48f36846333a457a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003300.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xutil_makedepend/xutil_makedepend.hash | 6 +++--- package/x11r7/xutil_makedepend/xutil_makedepend.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.hash b/package/x11r7/xutil_makedepend/xutil_makedepend.hash index 3a7496e1a4..e2fe117f10 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.hash +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-October/003243.html -sha256 a729cfd3c0f4e16c0db1da351e7f53335222e058e3434e84f91251fd6d407065 makedepend-1.0.7.tar.xz -sha512 fd575de737aa56ef8e475d1ddb7b2392e730ee1b23c0b853bbb21975b757c3fc56f94d57ecc5a784dceed2be653feb10909e86fd96fdc074b50fbbd0e27a19db makedepend-1.0.7.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003300.html +sha256 bfb26f8025189b2a01286ce6daacc2af8fe647440b40bb741dd5c397572cba5b makedepend-1.0.8.tar.xz +sha512 6707b1107c07d4ffbcf008181e877d18a0bcc4aea03860ee1158f5630c7fdce4cf9ad7bee3b38ee420c3a44819ed4b56a6f2428a5b695c0dbd17fb3e60825a6d makedepend-1.0.8.tar.xz # Locally computed sha256 0530078db78c47ae978dc2bd77f4f427e6cd97df868672c95b1ef284113c8cb7 COPYING diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk index b16bbe0978..0c4a32c006 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk @@ -4,7 +4,7 @@ # ################################################################################ -XUTIL_MAKEDEPEND_VERSION = 1.0.7 +XUTIL_MAKEDEPEND_VERSION = 1.0.8 XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.xz XUTIL_MAKEDEPEND_SITE = https://xorg.freedesktop.org/archive/individual/util XUTIL_MAKEDEPEND_LICENSE = MIT From peter at korsgaard.com Mon Feb 20 20:56:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:41 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-mediadriver: bump version to 22.6.5 Message-ID: <20230220205225.10C5786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98613ad592828a3626400f52a1504fe5234fc7f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Removed patch included in upstream release. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-dont-include-va-dricommon-h.patch | 36 ---------------------- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 3 files changed, 2 insertions(+), 38 deletions(-) diff --git a/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch b/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch deleted file mode 100644 index 9d512f9c0b..0000000000 --- a/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e0d2caafcd5e583a01f7792eaec5d1f2d540bdf1 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Fri, 18 Nov 2022 22:44:52 +1100 -Subject: [PATCH] [Media Common] [VP] dont include va_dricommon.h - - is not in non-X11 libva 2.16.0 -The header "media_libva_putsurface_linux.h" is included - -Downloaded from upstream commit -https://github.com/intel/media-driver/commit/e0d2caafcd5e583a01f7792eaec5d1f2d540bdf1 - -Signed-off-by: Rudi Heitbaum -Signed-off-by: Bernd Kuhls ---- - media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp -index 8695d6c86..6719c07b3 100644 ---- a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp -+++ b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp -@@ -23,7 +23,6 @@ - //! \file ddi_vp_functions.cpp - //! \brief ddi vp functions implementaion. - //! --#include - #include "ddi_vp_functions.h" - #include "media_libva_util_next.h" - #include "media_libva_common_next.h" -@@ -4700,4 +4699,4 @@ VAStatus DdiVpFunctions::PutSurfaceLinuxHW( - - return VA_STATUS_SUCCESS; - } --#endif // !defined(ANDROID) && defined(X11_FOUND) -\ No newline at end of file -+#endif // !defined(ANDROID) && defined(X11_FOUND) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index a9b7c6407d..b2c45eb025 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0c04b9d74b92de41fd409b62913ce4afd799236c0b6bc1983a496990764e5d90 intel-media-22.6.4.tar.gz +sha256 cbb6a514564f8c3349b1f78fc0906b636ea2074d7605cb0e820c5b727ce88cdc intel-media-22.6.5.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index ff97445181..8d3fc09260 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.6.4 +INTEL_MEDIADRIVER_VERSION = 22.6.5 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 peter at korsgaard.com Mon Feb 20 20:56:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:42 -0000 Subject: [Buildroot] [git commit branch/next] package/libfreeglut: bump version to 3.4.0 Message-ID: <20230220205211.B495686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b879cfe0e2b03373bdedc7ae97b956aa102e486 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/FreeGLUTProject/freeglut/releases/tag/v3.4.0 Upstream switched to github: https://freeglut.sourceforge.net/news.php https://sourceforge.net/p/freeglut/mailman/message/37622871/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libfreeglut/libfreeglut.hash | 5 +---- package/libfreeglut/libfreeglut.mk | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/libfreeglut/libfreeglut.hash b/package/libfreeglut/libfreeglut.hash index ce9fb9e299..249a780f04 100644 --- a/package/libfreeglut/libfreeglut.hash +++ b/package/libfreeglut/libfreeglut.hash @@ -1,6 +1,3 @@ -# 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 c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50 freeglut-3.2.2.tar.gz +sha256 3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec freeglut-3.4.0.tar.gz sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING diff --git a/package/libfreeglut/libfreeglut.mk b/package/libfreeglut/libfreeglut.mk index 484b0f4b97..09309aeceb 100644 --- a/package/libfreeglut/libfreeglut.mk +++ b/package/libfreeglut/libfreeglut.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBFREEGLUT_VERSION = 3.2.2 +LIBFREEGLUT_VERSION = 3.4.0 LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz -LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut +LIBFREEGLUT_SITE = https://github.com/FreeGLUTProject/freeglut/releases/download/v$(LIBFREEGLUT_VERSION) LIBFREEGLUT_LICENSE = MIT LIBFREEGLUT_LICENSE_FILES = COPYING LIBFREEGLUT_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:56:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:43 -0000 Subject: [Buildroot] [git commit branch/next] package/exfat: drop dangling EXFAT_CFLAGS Message-ID: <20230220205225.3DE8086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbbbe50173ed4b3ef3323cc7df6c90e0d63678d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "98538bb0a2 exfat: bump to version 1.2.1" changed the package infra from generic to autotools, but dropped all usages of EXFAT_CFLAGS. This config is ignored by autotools package infra. So drop the dangling symbol. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/exfat/exfat.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk index 282a30aa5e..c0ef77a113 100644 --- a/package/exfat/exfat.mk +++ b/package/exfat/exfat.mk @@ -11,7 +11,6 @@ EXFAT_DEPENDENCIES = libfuse host-pkgconf EXFAT_LICENSE = GPL-2.0+ EXFAT_LICENSE_FILES = COPYING EXFAT_CPE_ID_VENDOR = exfat_project -EXFAT_CFLAGS = $(TARGET_CFLAGS) -std=c99 EXFAT_CONF_OPTS += --exec-prefix=/ From peter at korsgaard.com Mon Feb 20 20:56:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:44 -0000 Subject: [Buildroot] [git commit branch/next] package/gobject-introspection: drop bogus GOBJECT_INTROSPECTION_AUTORECONF Message-ID: <20230220205225.6E31386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec6e8c632bf372c1fad7889ca6323166b90e1599 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "7687a396e8 package/gobject-introspection: new package" added the package using the meson infra for both target and host variants. Meson infra does not support _AUTORECONF. So drop the bogus symbol. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/gobject-introspection/gobject-introspection.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index c8ad9b3c72..0d8c666ba1 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -9,7 +9,6 @@ GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz GOBJECT_INTROSPECTION_INSTALL_STAGING = YES -GOBJECT_INTROSPECTION_AUTORECONF = YES GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scannerlexer.l From peter at korsgaard.com Mon Feb 20 20:56:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:44 -0000 Subject: [Buildroot] [git commit branch/next] package/inih: bump version to 56 Message-ID: <20230220205211.C3DA8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30bc9e5aef772432a9c2753296d89984e0097159 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/benhoyt/inih/releases/tag/r56 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/inih/inih.hash | 2 +- package/inih/inih.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/inih/inih.hash b/package/inih/inih.hash index af921b294d..e2ed923c7a 100644 --- a/package/inih/inih.hash +++ b/package/inih/inih.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ba55f8ae2a8caf0653f30f48567241e14ea916acfc13481f502d8a9c8f507f68 inih-55.tar.gz +sha256 4f2ba6bd122d30281a8c7a4d5723b7af90b56aa828c0e88256d7fceda03a491a inih-56.tar.gz sha256 9ae3b39e83e9158e44b67733baa3bb2d84e80efdcfb14a5820210a42c7abdf7f LICENSE.txt diff --git a/package/inih/inih.mk b/package/inih/inih.mk index 7f36175576..c43412894a 100644 --- a/package/inih/inih.mk +++ b/package/inih/inih.mk @@ -4,7 +4,7 @@ # ################################################################################ -INIH_VERSION = 55 +INIH_VERSION = 56 INIH_SITE = $(call github,benhoyt,inih,r$(INIH_VERSION)) INIH_INSTALL_STAGING = YES INIH_LICENSE = BSD-3-Clause From peter at korsgaard.com Mon Feb 20 20:56:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:45 -0000 Subject: [Buildroot] [git commit branch/next] package/policycoreutils: drop bogus INSTALL_TARGET_LINUX_PAM_CONFS Message-ID: <20230220205225.9E47C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a4e154c9c583e74846f7ec80ad01d78811722b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "cb328f77f8 policycoreutils: new package" added a define that is never called: POLICYCOREUTILS_INSTALL_TARGET_LINUX_PAM_CONFS. The build system from the package already install these files to target. So just drop the bogus define. Cc: Clayton Shotwell Cc: Matt Weber Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/policycoreutils/policycoreutils.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 60575ac644..8505dbca3f 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -16,10 +16,6 @@ POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LINUX_PAM),y) POLICYCOREUTILS_DEPENDENCIES += linux-pam POLICYCOREUTILS_MAKE_OPTS += NAMESPACE_PRIV=y -define POLICYCOREUTILS_INSTALL_TARGET_LINUX_PAM_CONFS - $(INSTALL) -D -m 0644 $(@D)/newrole/newrole-lspp.pamd $(TARGET_DIR)/etc/pam.d/newrole - $(INSTALL) -D -m 0644 $(@D)/run_init/run_init.pamd $(TARGET_DIR)/etc/pam.d/run_init -endef endif ifeq ($(BR2_PACKAGE_AUDIT),y) From peter at korsgaard.com Mon Feb 20 20:56:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:45 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXft: bump version to 2.3.7 Message-ID: <20230220205211.D19C08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9c948df185f61131133d9d8a8cc39beae0ad299 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg/2022-November/061175.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXft/xlib_libXft.hash | 6 +++--- package/x11r7/xlib_libXft/xlib_libXft.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libXft/xlib_libXft.hash b/package/x11r7/xlib_libXft/xlib_libXft.hash index 484764be3d..5074365aed 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.hash +++ b/package/x11r7/xlib_libXft/xlib_libXft.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-September/003211.html -sha256 60a6e7319fc938bbb8d098c9bcc86031cc2327b5d086d3335fc5c76323c03022 libXft-2.3.6.tar.xz -sha512 732f8c635fcac6010012ba8c10c23d2dd6ec79b0f096d6bcc9b7e36d2ca0817387faa7ee5bb6f43cff02adc68e4234c1b8f95021ebc548f61c492e0b76836d90 libXft-2.3.6.tar.xz +# From https://lists.x.org/archives/xorg/2022-November/061175.html +sha256 79f0b37c45007381c371a790c2754644ad955166dbf2a48e3625032e9bdd4f71 libXft-2.3.7.tar.xz +sha512 9df29d3c7b88a21952df1015604511e5d79856d721b2a61eb2c5a062a9abccf16318132432a7c86c0ef816bf174ae86842fa67dabbaa0b163dfa56d99022de19 libXft-2.3.7.tar.xz # Locally computed sha256 7cda22286b1379b9b73df695f72cbad36595e65b039a5fbc5c89b69ecc44438c COPYING diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index a86501900c..845b612669 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXFT_VERSION = 2.3.6 +XLIB_LIBXFT_VERSION = 2.3.7 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.xz XLIB_LIBXFT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFT_LICENSE = MIT From peter at korsgaard.com Mon Feb 20 20:56:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:46 -0000 Subject: [Buildroot] [git commit branch/next] package/tvheadend: bump version Message-ID: <20230220205226.21D1B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1906e1fb7cb4104aa3e326f09926b2b3f5129991 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 98499eb955..45c8bd62b0 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed32401d1ed85f9e2d28d122a046c3f2c01b6ca5c0da1a7d78fa8f400e858107 tvheadend-fbc94aee8bfdd25baba87ab62a39234da20e8dd2.tar.gz +sha256 06c6d33a8e9d1d645cea9c63a06f6bddb309e5546177966d7b9285f68313bf5b tvheadend-c9a156a25a07f1f84c2f48a1b03b481430c8257d.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 8ceb7493c8..0ca8f46dc5 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = fbc94aee8bfdd25baba87ab62a39234da20e8dd2 +TVHEADEND_VERSION = c9a156a25a07f1f84c2f48a1b03b481430c8257d TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Mon Feb 20 20:56:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:46 -0000 Subject: [Buildroot] [git commit branch/next] package/git: bump to version 2.39.0 Message-ID: <20230220205211.664DC81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a6105112e82e3ca5162a56aa3a47bf6b49af2e0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The git package in Buildroot is quite lagging behind (v2.31.4, released on July 12, 2022 while the baseline v2.31.0 was released on March 15, 2021). Bump the package to v2.39.0 (released December 12, 2022). While at it, also replace patch fixing uclibc no threads build with two patches cherry-picked from upstream next branch, which fixes the same issue by fixing the handling of flockfile(), funlockfile(), and getc_unlocked() declarations. These patches missed the release but planned for next maintenance release (v2.39.1). The reason for replacing the patch is when original fix patch was upstreamed [1], Jeff King noted that the build failure root cause was flockfile() is defined regardless of whether uclibc is configured with threads support or not [2]. Release notes for v2.39.0 is available on release announcement on Git mailing list at [3]. [1]: https://lore.kernel.org/git/20221125092339.29433-1-bagasdotme at gmail.com/ [2]: https://lore.kernel.org/git/Y4RAr04vS%2FTOM5uh at coredump.intra.peff.net/ [3]: https://lore.kernel.org/git/xmqqlencspnl.fsf at gitster.g/ Signed-off-by: Bagas Sanjaya Signed-off-by: Peter Korsgaard --- package/git/0001-Fix-build-without-threads.patch | 100 ------------------- ...util-avoid-redefining-system-function-nam.patch | 107 +++++++++++++++++++++ ...util-undefine-system-names-before-redecla.patch | 55 +++++++++++ package/git/git.hash | 2 +- package/git/git.mk | 4 +- 5 files changed, 164 insertions(+), 104 deletions(-) diff --git a/package/git/0001-Fix-build-without-threads.patch b/package/git/0001-Fix-build-without-threads.patch deleted file mode 100644 index 7ce85ffaf8..0000000000 --- a/package/git/0001-Fix-build-without-threads.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 07d66af3b0800764087c4151d4f6562d4f8cce05 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Dec 2020 23:00:33 +0100 -Subject: [PATCH] Fix build without threads - -Build without threads is broken since version 2.29.0 and -https://github.com/git/git/commit/15b52a44e0c92a0658e891194a5b0610d1f53afc: - -In file included from cache.h:4, - from blame.c:1: -git-compat-util.h:1238:20: error: static declaration of 'flockfile' follows non-static declaration - static inline void flockfile(FILE *fh) - ^~~~~~~~~ -In file included from git-compat-util.h:168, - from cache.h:4, - from blame.c:1: -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/stdio.h:806:13: note: previous declaration of 'flockfile' was here - extern void flockfile (FILE *__stream) __THROW; - ^~~~~~~~~ -In file included from cache.h:4, - from blame.c:1: -git-compat-util.h:1242:20: error: static declaration of 'funlockfile' follows non-static declaration - static inline void funlockfile(FILE *fh) - ^~~~~~~~~~~ -In file included from git-compat-util.h:168, - from cache.h:4, - from blame.c:1: -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/stdio.h:813:13: note: previous declaration of 'funlockfile' was here - extern void funlockfile (FILE *__stream) __THROW; - ^~~~~~~~~~~ - -To avoid this build failure, check if flockfile is available before -defining flockfile, funlockfile and getc_unlocked - -Fixes: - - http://autobuild.buildroot.org/results/d41638d1ad8e78dd6f654367c905996b838ee649 - -Signed-off-by: Fabrice Fontaine ---- - Makefile | 5 +++++ - configure.ac | 6 ++++++ - git-compat-util.h | 2 +- - 3 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 6fb86c5862..58d0893a12 100644 ---- a/Makefile -+++ b/Makefile -@@ -232,6 +232,8 @@ all:: - # Define NO_STRUCT_ITIMERVAL if you don't have struct itimerval - # This also implies NO_SETITIMER - # -+# Define NO_FLOCKFILE if you don't have flockfile() -+# - # Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is - # generally faster on your platform than accessing the working directory. - # -@@ -1638,6 +1640,9 @@ endif - ifdef NO_SETITIMER - COMPAT_CFLAGS += -DNO_SETITIMER - endif -+ifdef NO_FLOCKFILE -+ COMPAT_CFLAGS += -DNO_FLOCKFILE -+endif - ifdef NO_PREAD - COMPAT_CFLAGS += -DNO_PREAD - COMPAT_OBJS += compat/pread.o -diff --git a/configure.ac b/configure.ac -index 66aedb9288..d4295b5c69 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1132,6 +1132,12 @@ GIT_CHECK_FUNC(setitimer, - [NO_SETITIMER=YesPlease]) - GIT_CONF_SUBST([NO_SETITIMER]) - # -+# Define NO_FLOCKFILE if you don't have flockfile. -+GIT_CHECK_FUNC(flockfile, -+[NO_FLOCKFILE=], -+[NO_FLOCKFILE=YesPlease]) -+GIT_CONF_SUBST([NO_FLOCKFILE]) -+# - # Define NO_STRCASESTR if you don't have strcasestr. - GIT_CHECK_FUNC(strcasestr, - [NO_STRCASESTR=], -diff --git a/git-compat-util.h b/git-compat-util.h -index 7d509c5022..279cdd941e 100644 ---- a/git-compat-util.h -+++ b/git-compat-util.h -@@ -1236,7 +1236,7 @@ int warn_on_fopen_errors(const char *path); - # define SHELL_PATH "/bin/sh" - #endif - --#ifndef _POSIX_THREAD_SAFE_FUNCTIONS -+#if !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(NO_FLOCKFILE) - static inline void flockfile(FILE *fh) - { - ; /* nothing */ --- -2.29.2 - diff --git a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch new file mode 100644 index 0000000000..dbde87940a --- /dev/null +++ b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch @@ -0,0 +1,107 @@ +From 385f67eb2254edb1fb4cf523e5e3d5a8f123d72c Mon Sep 17 00:00:00 2001 +From: Jeff King +Date: Wed, 30 Nov 2022 16:15:14 -0500 +Subject: [PATCH] git-compat-util: avoid redefining system function names +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Our git-compat-util header defines a few noop wrappers for system +functions if they are not available. This was originally done with a +macro, but in 15b52a44e0 (compat-util: type-check parameters of no-op +replacement functions, 2020-08-06) we switched to inline functions, +because it gives us basic type-checking. + +This can cause compilation failures when the system _does_ declare those +functions but we choose not to use them, since the compiler will +complain about the redeclaration. This was seen in the real world when +compiling against certain builds of uclibc, which may leave +_POSIX_THREAD_SAFE_FUNCTIONS unset, but still declare flockfile() and +funlockfile(). + +It can also be seen on any platform that has setitimer() if you choose +to compile without it (which plausibly could happen if the system +implementation is buggy). E.g., on Linux: + + $ make NO_SETITIMER=IWouldPreferNotTo git.o + CC git.o + In file included from builtin.h:4, + from git.c:1: + git-compat-util.h:344:19: error: conflicting types for ???setitimer???; have ???int(int, const struct itimerval *, struct itimerval *)??? + 344 | static inline int setitimer(int which UNUSED, + | ^~~~~~~~~ + In file included from git-compat-util.h:234: + /usr/include/x86_64-linux-gnu/sys/time.h:155:12: note: previous declaration of ???setitimer??? with type ???int(__itimer_which_t, const struct itimerval * restrict, struct itimerval * restrict)??? + 155 | extern int setitimer (__itimer_which_t __which, + | ^~~~~~~~~ + make: *** [Makefile:2714: git.o] Error 1 + +Here I think the compiler is complaining about the lack of "restrict" +annotations in our version, but even if we matched it completely (and +there is no way to match all platforms anyway), it would still complain +about a static declaration following a non-static one. Using macros +doesn't have this problem, because the C preprocessor rewrites the name +in our code before we hit this level of compilation. + +One way to fix this would just be to revert most of 15b52a44e0. What we +really cared about there was catching build problems with +precompose_argv(), which most platforms _don't_ build, and which is our +custom function. So we could just switch the system wrappers back to +macros; most people build the real versions anyway, and they don't +change. So the extra type-checking isn't likely to catch bugs. + +But with a little work, we can have our cake and eat it, too. If we +define the type-checking wrappers with a unique name, and then redirect +the system names to them with macros, we still get our type checking, +but without redeclaring the system function names. + +Signed-off-by: Jeff King +Signed-off-by: Junio C Hamano +[Bagas: cherry-picked from e0c08a4f738b3dea7a4e8fe3511c323cf1f41942 on next branch] +Signed-off-by: Bagas Sanjaya +--- + git-compat-util.h | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/git-compat-util.h b/git-compat-util.h +index a76d0526f7..e3456bdd0d 100644 +--- a/git-compat-util.h ++++ b/git-compat-util.h +@@ -341,11 +341,12 @@ struct itimerval { + #endif + + #ifdef NO_SETITIMER +-static inline int setitimer(int which UNUSED, +- const struct itimerval *value UNUSED, +- struct itimerval *newvalue UNUSED) { ++static inline int git_setitimer(int which, ++ const struct itimerval *value, ++ struct itimerval *newvalue) { + return 0; /* pretend success */ + } ++#define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) + #endif + + #ifndef NO_LIBGEN_H +@@ -1471,14 +1472,16 @@ int open_nofollow(const char *path, int flags); + #endif + + #ifndef _POSIX_THREAD_SAFE_FUNCTIONS +-static inline void flockfile(FILE *fh UNUSED) ++static inline void git_flockfile(FILE *fh) + { + ; /* nothing */ + } +-static inline void funlockfile(FILE *fh UNUSED) ++static inline void git_funlockfile(FILE *fh) + { + ; /* nothing */ + } ++#define flockfile(fh) git_flockfile(fh) ++#define funlockfile(fh) git_funlockfile(fh) + #define getc_unlocked(fh) getc(fh) + #endif + +-- +An old man doll... just what I always wanted! - Clara + diff --git a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch new file mode 100644 index 0000000000..9e3c9b662c --- /dev/null +++ b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch @@ -0,0 +1,55 @@ +From 6d406390b870fdb2cd9d18b12ebfabc12f5096df Mon Sep 17 00:00:00 2001 +From: Jeff King +Date: Fri, 2 Dec 2022 06:05:38 -0500 +Subject: [PATCH] git-compat-util: undefine system names before redeclaring + them + +When we define a macro to point a system function (e.g., flockfile) to +our custom wrapper, we should make sure that the system did not already +define it as a macro. This is rarely a problem, but can cause +compilation failures if both of these are true: + + - we decide to define our own wrapper even though the system provides + the function; we know this happens at least with uclibc, which may + declare flockfile, etc, without _POSIX_THREAD_SAFE_FUNCTIONS + + - the system version is declared as a macro; we know this happens at + least with uclibc's version of getc_unlocked() + +So just handling getc_unlocked() would be sufficient to deal with the +real-world case we've seen. But since it's easy to do, we may as well be +defensive about the other macro wrappers added in the previous patch. + +Signed-off-by: Jeff King +Signed-off-by: Junio C Hamano +[Bagas: cherry-picked from e1a95b78d8a26762ea04332de8b7c3878da51522 on next branch] +Signed-off-by: Bagas Sanjaya +--- + git-compat-util.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/git-compat-util.h b/git-compat-util.h +index e3456bdd0d..211861da0f 100644 +--- a/git-compat-util.h ++++ b/git-compat-util.h +@@ -346,6 +346,7 @@ static inline int git_setitimer(int which, + struct itimerval *newvalue) { + return 0; /* pretend success */ + } ++#undef setitimer + #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) + #endif + +@@ -1480,6 +1481,9 @@ static inline void git_funlockfile(FILE *fh) + { + ; /* nothing */ + } ++#undef flockfile ++#undef funlockfile ++#undef getc_unlocked + #define flockfile(fh) git_flockfile(fh) + #define funlockfile(fh) git_funlockfile(fh) + #define getc_unlocked(fh) getc(fh) +-- +An old man doll... just what I always wanted! - Clara + diff --git a/package/git/git.hash b/package/git/git.hash index af09ea817b..57a77b2810 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 dbc80f88d36fcde2c7acaaa9343cfab0f56effe9aee60e5eb00f3f36b8a619b4 git-2.31.5.tar.xz +sha256 ba199b13fb5a99ca3dec917b0bd736bc0eb5a9df87737d435eddfdf10d69265b git-2.39.0.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 653b4f46ad..9918d4c1ef 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.31.5 +GIT_VERSION = 2.39.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ @@ -12,8 +12,6 @@ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_CPE_ID_VENDOR = git-scm GIT_SELINUX_MODULES = apache git xdg GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) -# We're patching configure.ac -GIT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) GIT_DEPENDENCIES += host-pkgconf openssl From peter at korsgaard.com Mon Feb 20 20:56:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:47 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xserver_xorg-server: bump version to 21.1.6 Message-ID: <20230220205226.64B0D86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60b4b04dc23d32641981df984f383c1bb3078f8c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes a regression in XTestSwapFakeInput() introduced in the fix for CVE-2022-46340 in 21.1.5. Removed patches included in upstream release. Signed-off-by: Bernd Kuhls [Peter: mention regression fix] Signed-off-by: Peter Korsgaard --- ...etCountedString-against-request-length-at.patch | 35 ------------- ...some-possible-memleaks-in-XkbGetKbdByName.patch | 60 ---------------------- .../xserver_xorg-server/xserver_xorg-server.hash | 6 +-- .../xserver_xorg-server/xserver_xorg-server.mk | 8 +-- 4 files changed, 4 insertions(+), 105 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch b/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch deleted file mode 100644 index 8c1869504c..0000000000 --- a/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 11beef0b7f1ed290348e45618e5fa0d2bffcb72e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 5 Jul 2022 12:06:20 +1000 -Subject: [PATCH] xkb: proof GetCountedString against request length attacks - -GetCountedString did a check for the whole string to be within the -request buffer but not for the initial 2 bytes that contain the length -field. A swapped client could send a malformed request to trigger a -swaps() on those bytes, writing into random memory. - -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - xkb/xkb.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index f42f59ef3..1841cff26 100644 ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -5137,6 +5137,11 @@ _GetCountedString(char **wire_inout, ClientPtr client, char **str) - CARD16 len; - - wire = *wire_inout; -+ -+ if (client->req_len < -+ bytes_to_int32(wire + 2 - (char *) client->requestBuffer)) -+ return BadValue; -+ - len = *(CARD16 *) wire; - if (client->swapped) { - swaps(&len); --- -2.30.2 - diff --git a/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch b/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch deleted file mode 100644 index 39afec0988..0000000000 --- a/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 18f91b950e22c2a342a4fbc55e9ddf7534a707d2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 13 Jul 2022 11:23:09 +1000 -Subject: [PATCH] xkb: fix some possible memleaks in XkbGetKbdByName - -GetComponentByName returns an allocated string, so let's free that if we -fail somewhere. - -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - xkb/xkb.c | 26 ++++++++++++++++++++------ - 1 file changed, 20 insertions(+), 6 deletions(-) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index 4692895db..b79a269e3 100644 ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -5935,18 +5935,32 @@ ProcXkbGetKbdByName(ClientPtr client) - xkb = dev->key->xkbInfo->desc; - status = Success; - str = (unsigned char *) &stuff[1]; -- if (GetComponentSpec(&str, TRUE, &status)) /* keymap, unsupported */ -- return BadMatch; -+ { -+ char *keymap = GetComponentSpec(&str, TRUE, &status); /* keymap, unsupported */ -+ if (keymap) { -+ free(keymap); -+ return BadMatch; -+ } -+ } - names.keycodes = GetComponentSpec(&str, TRUE, &status); - names.types = GetComponentSpec(&str, TRUE, &status); - names.compat = GetComponentSpec(&str, TRUE, &status); - names.symbols = GetComponentSpec(&str, TRUE, &status); - names.geometry = GetComponentSpec(&str, TRUE, &status); -- if (status != Success) -+ if (status == Success) { -+ len = str - ((unsigned char *) stuff); -+ if ((XkbPaddedSize(len) / 4) != stuff->length) -+ status = BadLength; -+ } -+ -+ if (status != Success) { -+ free(names.keycodes); -+ free(names.types); -+ free(names.compat); -+ free(names.symbols); -+ free(names.geometry); - return status; -- len = str - ((unsigned char *) stuff); -- if ((XkbPaddedSize(len) / 4) != stuff->length) -- return BadLength; -+ } - - CHK_MASK_LEGAL(0x01, stuff->want, XkbGBN_AllComponentsMask); - CHK_MASK_LEGAL(0x02, stuff->need, XkbGBN_AllComponentsMask); --- -2.30.2 - diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 654552c8b6..0c3c807ff3 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003303.html -sha256 05b0c8301cee7c5a78083df421ba3a071891553541a417b3d85adf5cf20f8720 xorg-server-21.1.5.tar.xz -sha512 a39c6ba36f94241d330b679a9a6fe2c5fda73fc3f5a9308a7a9cfd0d58503e407291759c9e553455c07cf5a3862952ae3904334eeca29c97ff5af7cffd2e6953 xorg-server-21.1.5.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003310.html +sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz +sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 16b7438ee6..04eb5e90b7 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.5 +XSERVER_XORG_SERVER_VERSION = 21.1.6 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT @@ -12,12 +12,6 @@ XSERVER_XORG_SERVER_LICENSE_FILES = COPYING XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES -# 0002-xkb-proof-GetCountedString-against-request-length-at.patch -XSERVER_XORG_SERVER_IGNORE_CVES += CVE-2022-3550 - -# 0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch -XSERVER_XORG_SERVER_IGNORE_CVES += CVE-2022-3551 - XSERVER_XORG_SERVER_DEPENDENCIES = \ xutil_util-macros \ xlib_libX11 \ From peter at korsgaard.com Mon Feb 20 20:56:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:47 -0000 Subject: [Buildroot] [git commit branch/next] package/python-bleak: bump to version 0.19.5 Message-ID: <20230220205212.105A98648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8332d747df3dab5fbd038a3adf3726cc6a165c12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- package/python-bleak/python-bleak.hash | 4 ++-- package/python-bleak/python-bleak.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-bleak/python-bleak.hash b/package/python-bleak/python-bleak.hash index 9a8310b11c..001ef65b65 100644 --- a/package/python-bleak/python-bleak.hash +++ b/package/python-bleak/python-bleak.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bleak/json -md5 57564087d6e17ad1853109f530279b27 bleak-0.19.1.tar.gz -sha256 dff7c7f281dcb6629d0d722209c79ec3aa2a6c33867cb5c1ea3d44b72ca155c0 bleak-0.19.1.tar.gz +md5 d038483ec145c3d32c1ef03e04c42621 bleak-0.19.5.tar.gz +sha256 87845a96453c58c19031c735444a7b3156800534bcd3f23ba74e119e9ae3cd88 bleak-0.19.5.tar.gz # Locally computed sha256 checksums sha256 c4029a2b63b3824ab68be841f414addbdde20cb79cdbe272fa80c0b2abe65374 LICENSE diff --git a/package/python-bleak/python-bleak.mk b/package/python-bleak/python-bleak.mk index 00a4946ef6..95ac1d1766 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLEAK_VERSION = 0.19.1 +PYTHON_BLEAK_VERSION = 0.19.5 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz -PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/30/b9/60e1f455365e2340fe076cf7683f4e6d03db0b759d4f93fa45e68dc371e5 +PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/e6/b4/e63829826a157d180831a1c5d3720e75d613c1290cb239510d148b906836 PYTHON_BLEAK_SETUP_TYPE = setuptools PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:56:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:48 -0000 Subject: [Buildroot] [git commit branch/next] package/gobject-introspection: really use host python for host variant Message-ID: <20230220205226.A99D786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80c5be77ceb021e8319b9269b58d6373d378fac5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "abc110e362 package/gobject-introspection: bump to version 1.68.0" renamed the define that makes sure g-ir-tool-template uses the host python, but forgot to update its call on pre-configure hooks. Update it now. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/gobject-introspection/gobject-introspection.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 0d8c666ba1..12e5b81b1b 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -66,7 +66,7 @@ HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ define GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python3%' $(@D)/tools/g-ir-tool-template.in endef -HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH +HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH # Perform the following: # - Just as above, Ensure that g-ir-tool-template.in uses the host python. From peter at korsgaard.com Mon Feb 20 20:56:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:48 -0000 Subject: [Buildroot] [git commit branch/next] package/libnss: bump version to 3.86 Message-ID: <20230220205212.03F60828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08dc145a751aa2d5c13ace718438c8ef084fcc84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 e3c27170e5..50c5e583af 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_85_RTM/src/SHA256SUMS -sha256 afd9d64510b1154debbd6cab3571e9ff64a3373898e03483e4c85cdada13d297 nss-3.85.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_86_RTM/src/SHA256SUMS +sha256 3f385fc686476bbba811035fa6821b542475d55747b18c20c221d4d66573b975 nss-3.86.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 627bea7de8..cee0e596a1 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.85 +LIBNSS_VERSION = 3.86 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 peter at korsgaard.com Mon Feb 20 20:56:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:49 -0000 Subject: [Buildroot] [git commit branch/next] package/motion: bump to version 4.5.1 Message-ID: <20230220205212.51D9C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6081a48f0f6a238236091fb1b302848997e96f72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/Motion-Project/motion/releases/tag/release-4.5.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/motion/motion.hash | 2 +- package/motion/motion.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/motion/motion.hash b/package/motion/motion.hash index 9b99256864..21f74b481f 100644 --- a/package/motion/motion.hash +++ b/package/motion/motion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 42320a1c7b54a3f0b5a49cecf34a5d752760b28383bc573b3ca1240581786fe5 motion-4.5.0.tar.gz +sha256 0c824276bb23565b7cf10409ebdcb46b85fb1f6abca957252e52290bb1fe473e motion-4.5.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 18fe0eb630..4e9ccdc3f7 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOTION_VERSION = 4.5.0 +MOTION_VERSION = 4.5.1 MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 MOTION_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:56:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:50 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: fix host package Message-ID: <20230220205226.D7E7686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84e52a60b4044d3c54d6d4be5729a6d30aaf5aee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable webp and zstd on host package to avoid the following build failure with host-gdk-pixbuf raised since bump to version 4.5.0 in commit 5b62ea01369b11f5a4320bb2c909168b21c2642c: Run-time dependency libtiff-4 found: NO (tried cmake) ../output-1/build/host-gdk-pixbuf-2.42.10/meson.build:330:2: ERROR: Dependency lookup for libtiff-4 with method 'pkgconfig' failed: Could not generate cargs for libtiff-4: Package libwebp was not found in the pkg-config search path. Perhaps you should add the directory containing `libwebp.pc' to the PKG_CONFIG_PATH environment variable Package 'libwebp', required by 'libtiff-4', not found [...] Run-time dependency libtiff-4 found: NO (tried cmake) ../output-1/build/host-gdk-pixbuf-2.42.10/meson.build:330:2: ERROR: Dependency lookup for libtiff-4 with method 'pkgconfig' failed: Could not generate cargs for libtiff-4: Package libzstd was not found in the pkg-config search path. Perhaps you should add the directory containing `libzstd.pc' to the PKG_CONFIG_PATH environment variable Package 'libzstd', required by 'libtiff-4', not found While at it, also disable libdeflate even if no build failures are raised by autobuilders Fixes: - http://autobuild.buildroot.org/results/320083dfec4d126043b036cbaec7c7b85069a50a - http://autobuild.buildroot.org/results/8ff1cfa254920749a43e235c4084b8524d0edf6f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tiff/tiff.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index d3ab50b79e..e7de51ea1e 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -26,9 +26,12 @@ HOST_TIFF_CONF_OPTS = \ --disable-cxx \ --without-x \ --disable-zlib \ + --disable-libdeflate \ --disable-lzma \ --disable-jpeg \ - --disable-tests + --disable-tests \ + --disable-webp \ + --disable-zstd HOST_TIFF_DEPENDENCIES = host-pkgconf ifeq ($(BR2_INSTALL_LIBSTDCPP),y) From peter at korsgaard.com Mon Feb 20 20:56:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:50 -0000 Subject: [Buildroot] [git commit branch/next] package/atop: bump to version 2.8.0 Message-ID: <20230220205227.4053E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1e63188347b1e5bab9d524e2489d4f948ec719e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/atop/atop.hash | 2 +- package/atop/atop.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/atop/atop.hash b/package/atop/atop.hash index 18ba42340c..e42354739a 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 ca48d2f17e071deead5e6e9cc9e388bf6a3270d695e61976b3794d4d927b5c4e atop-2.7.1.tar.gz +sha256 3b002cb9774a7d6b3e820451773ae5e909b5e725738c6f375f14d1c1976d9fba atop-2.8.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index 8a0fcda33b..04a554b474 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATOP_VERSION = 2.7.1 +ATOP_VERSION = 2.8.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 20:56:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:50 -0000 Subject: [Buildroot] [git commit branch/next] package/davfs2: needs glibc Message-ID: <20230220205212.4533186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af9454f8c1ca7f9dd02daaeb81a52690fac79a22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next davfs2 unconditionally uses fstab.h since https://git.savannah.nongnu.org/cgit/davfs2.git/commit/?id=6e2053cd7f44b0ca58af09905c044c178df34497 resulting in the following build failure since bump to version 1.7.0 in commit 76423bd3a657f0ca197e2301bbb21e4fc9eee992: mount_davfs.c:78:10: fatal error: fstab.h: No such file or directory 78 | #include | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/793c71e4f731a18e203d6eaa3ac8b6e2a9620c27 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/davfs2/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/davfs2/Config.in b/package/davfs2/Config.in index 162753be3e..31a680563c 100644 --- a/package/davfs2/Config.in +++ b/package/davfs2/Config.in @@ -1,10 +1,10 @@ -comment "davfs2 needs a glibc or uClibc toolchain" +comment "davfs2 needs a glibc toolchain" depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_DAVFS2 bool "davfs2" - depends on !BR2_TOOLCHAIN_USES_MUSL # error.h + depends on BR2_TOOLCHAIN_USES_GLIBC # fstab.h depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NEON select BR2_PACKAGE_NEON_XML From peter at korsgaard.com Mon Feb 20 20:56:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:51 -0000 Subject: [Buildroot] [git commit branch/next] configs/nezha_defconfig: use OpenSBI 1.2 Message-ID: <20230220205227.9C63C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b39bd50e0a4cfb9cd5bba02c6ae913be72f3771a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- configs/nezha_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 854392f929..dd94707905 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y From peter at korsgaard.com Mon Feb 20 20:56:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:51 -0000 Subject: [Buildroot] [git commit branch/next] package/hddtemp: link to libintl when needed Message-ID: <20230220205212.91E058648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7c99eaa307d1417c8c8e222290df6512ee872ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/e84/e84b7131f996302301dd0a8fd47362c9f2eab0bf/ http://autobuild.buildroot.net/results/524/52428940034d59887e0172fbd8481943d86db13b/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/hddtemp/hddtemp.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/hddtemp/hddtemp.mk b/package/hddtemp/hddtemp.mk index 7023e11e59..4f45647dff 100644 --- a/package/hddtemp/hddtemp.mk +++ b/package/hddtemp/hddtemp.mk @@ -15,7 +15,8 @@ HDDTEMP_GETTEXTIZE = YES HDDTEMP_DB_PATH = /usr/share/misc/hddtemp.db HDDTEMP_CONF_OPTS = --with-db-path=$(HDDTEMP_DB_PATH) -HDDTEMP_CONF_ENV = LIBS="$(HDDTEMP_LIBS)" +HDDTEMP_CONF_ENV = LIBS="$(HDDTEMP_LIBS) $(TARGET_NLS_LIBS)" +HDDTEMP_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) HDDTEMP_DEPENDENCIES += libexecinfo From peter at korsgaard.com Mon Feb 20 20:56:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:52 -0000 Subject: [Buildroot] [git commit branch/next] configs/qemu_riscv32_virt_defconfig: use OpenSBI 1.2 Message-ID: <20230220205227.C3A2B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a564f4da0ffbfd180186a34bdbdccf1cb5f9272f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Rather than the default (currently 0.9). Signed-off-by: Peter Korsgaard --- configs/qemu_riscv32_virt_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index faf4e1e312..f354e303e5 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -25,6 +25,8 @@ BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing From peter at korsgaard.com Mon Feb 20 20:56:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:52 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15}.x / 6.0.x series Message-ID: <20230220205212.5EDF98648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=298bcb0455d0cbf4231f4b87a8e132202120ac79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls 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 c1c690f4cc..fba3d90e6b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.0.12" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.0.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 9976a44489..9684dc5697 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 89b730edf8942b49e02f9894244205886c9a214d629b35b88c4ff06ee9304f01 linux-6.0.12.tar.xz +sha256 08d3118d6b755769f166de6babed54964393a7c0928029bef11bf55559a72da4 linux-6.0.13.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65 linux-5.15.82.tar.xz -sha256 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7 linux-5.10.158.tar.xz -sha256 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44 linux-5.4.226.tar.xz +sha256 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3 linux-5.15.83.tar.xz +sha256 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7 linux-5.10.159.tar.xz +sha256 5eefc5037415f31c942d3cfa430b96c2a273246cf7e51db1e51b1d89887f0593 linux-5.4.227.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 ed4fd861fe9f6cd09f409f00dcccfa691e6d1a61c585723e587575dcb60aeb29 linux-4.9.335.tar.xz -sha256 acd2ee8e03da098fe9f7e52871dd0790850fc32b78657606bdf65bdd94bbf99b linux-4.14.301.tar.xz -sha256 219bce1ac3f542d06fc606ae6bcb10f8ab1940a46c7903113be59afc486c204f linux-4.19.268.tar.xz +sha256 1f6de11306cc9f82fe1d4dd03565cdf43906fa6f77302913d942fd63b77b500c linux-4.9.336.tar.xz +sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz +sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 4c8b1fca27..93f443b78f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -388,13 +388,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.335" if BR2_KERNEL_HEADERS_4_9 - default "4.14.301" if BR2_KERNEL_HEADERS_4_14 - default "4.19.268" if BR2_KERNEL_HEADERS_4_19 - default "5.4.226" if BR2_KERNEL_HEADERS_5_4 - default "5.10.158" if BR2_KERNEL_HEADERS_5_10 - default "5.15.82" if BR2_KERNEL_HEADERS_5_15 - default "6.0.12" if BR2_KERNEL_HEADERS_6_0 + default "4.9.336" if BR2_KERNEL_HEADERS_4_9 + default "4.14.302" if BR2_KERNEL_HEADERS_4_14 + default "4.19.269" if BR2_KERNEL_HEADERS_4_19 + default "5.4.227" if BR2_KERNEL_HEADERS_5_4 + default "5.10.159" if BR2_KERNEL_HEADERS_5_10 + default "5.15.83" if BR2_KERNEL_HEADERS_5_15 + default "6.0.13" if BR2_KERNEL_HEADERS_6_0 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 Mon Feb 20 20:56:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:53 -0000 Subject: [Buildroot] [git commit branch/next] configs/hifive_unleashed_defconfig: explicitly use OpenSBI 0.9 Message-ID: <20230220205227.E84A28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fad36fa91d9a85ce548ea7f3fd42c1c4b31564ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Rather than relying on what is currently the default. Signed-off-by: Peter Korsgaard --- configs/hifive_unleashed_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index 0b87f2588f..2b6ee6c08e 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -37,6 +37,8 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # Bootloader BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="0.9" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y From peter at korsgaard.com Mon Feb 20 20:56:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:53 -0000 Subject: [Buildroot] [git commit branch/next] package/supertuxkart: bump version to 1.4 Message-ID: <20230220205212.C6C97828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f51e1f9522393864ea1543e581e485f2e7c1e683 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://github.com/supertuxkart/stk-code/blob/1.4/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/supertuxkart/supertuxkart.hash | 2 +- package/supertuxkart/supertuxkart.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/supertuxkart/supertuxkart.hash b/package/supertuxkart/supertuxkart.hash index 6ae3fae82b..446a9de8ec 100644 --- a/package/supertuxkart/supertuxkart.hash +++ b/package/supertuxkart/supertuxkart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd SuperTuxKart-1.3-src.tar.xz +sha256 9890392419baf4715313f14d5ad60746f276eed36eb580636caf44e2532c0f03 SuperTuxKart-1.4-src.tar.xz sha256 d27207a5213f746aac53893e9ecc18456e9595d3ffa662bd1ec9eb10787c214a COPYING diff --git a/package/supertuxkart/supertuxkart.mk b/package/supertuxkart/supertuxkart.mk index 8ec366f792..1f9ad4102b 100644 --- a/package/supertuxkart/supertuxkart.mk +++ b/package/supertuxkart/supertuxkart.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUPERTUXKART_VERSION = 1.3 +SUPERTUXKART_VERSION = 1.4 SUPERTUXKART_SOURCE = SuperTuxKart-$(SUPERTUXKART_VERSION)-src.tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. From yann.morin.1998 at free.fr Mon Feb 20 20:56:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:54 -0000 Subject: [Buildroot] [git commit branch/next] package/bustle: fix pcap-config call Message-ID: <20230220205228.379B4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a92e9e5fb87caff46fbbe8f368564eddf4ff389d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since bump of libpcap to version 1.10.2 in commit 6bee8635d90f3f9e3d04e03a9db2f37a387e077 and https://github.com/the-tcpdump-group/libpcap/commit/d0cba780dc2b2bb4f3ca9427d1a0f03479f45707: pcap-config: Invalid command-line option pcap-config specified Usage: pcap-config [ --help ] [ --static | --static-pcap-only ] [ --libs | --additional-libs ] perl -nle 'm/^Version:\s+(.*)$/ and print $1' \ bustle.cabal > dist/build/autogen/version.txt echo '#define BUSTLE_VERSION "'`cat dist/build/autogen/version.txt`'"' > dist/build/autogen/version.h /home/buildroot/autobuild/run/instance-2/output-1/host/bin/arm-linux-gcc -Idist/build/autogen -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ -o dist/build/bustle-pcap c-sources/pcap-reader.c c-sources/pcap-monitor.c c-sources/bustle-pcap.c \ -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0 -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/glib-2.0/include -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libmount -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/blkid -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/gio-unix-2.0 -pthread -L/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 /home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /tmp/cc5SQkTV.o: in function `bustle_pcap_reader_finalize': pcap-reader.c:(.text+0x254): undefined reference to `pcap_close' Fixes: - http://autobuild.buildroot.org/results/f3dcb617488e4172e639e3bd51a93bc9822ea186 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-Makefile-fix-pcap-config-call.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/package/bustle/0001-Makefile-fix-pcap-config-call.patch b/package/bustle/0001-Makefile-fix-pcap-config-call.patch new file mode 100644 index 0000000000..b02bea641b --- /dev/null +++ b/package/bustle/0001-Makefile-fix-pcap-config-call.patch @@ -0,0 +1,45 @@ +From 77e2de892cd359f779c84739682431a66eb8cf31 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 Jan 2023 11:03:52 +0100 +Subject: [PATCH] Makefile: fix pcap-config call + +Fix the following build failure raised since libpcap version 1.10.2 and +https://github.com/the-tcpdump-group/libpcap/commit/d0cba780dc2b2bb4f3ca9427d1a0f03479f45707: + +pcap-config: Invalid command-line option pcap-config specified +Usage: pcap-config [ --help ] [ --static | --static-pcap-only ] [ --libs | --additional-libs ] +perl -nle 'm/^Version:\s+(.*)$/ and print $1' \ + bustle.cabal > dist/build/autogen/version.txt +echo '#define BUSTLE_VERSION "'`cat dist/build/autogen/version.txt`'"' > dist/build/autogen/version.h +/home/buildroot/autobuild/run/instance-2/output-1/host/bin/arm-linux-gcc -Idist/build/autogen -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ + -o dist/build/bustle-pcap c-sources/pcap-reader.c c-sources/pcap-monitor.c c-sources/bustle-pcap.c \ + -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0 -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/glib-2.0/include -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libmount -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/blkid -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/gio-unix-2.0 -pthread -L/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 +/home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /tmp/cc5SQkTV.o: in function `bustle_pcap_reader_finalize': +pcap-reader.c:(.text+0x254): undefined reference to `pcap_close' + +Fixes: + - http://autobuild.buildroot.org/results/f3dcb617488e4172e639e3bd51a93bc9822ea186 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/bustle/bustle/-/merge_requests/21] +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8865819..721e714 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ CFLAGS = -g -O2 -Wall -Wunused -Waddress + DBUS_FLAGS = $(shell pkg-config --cflags --libs dbus-1) + GIO_FLAGS := $(shell pkg-config --cflags --libs 'glib-2.0 >= 2.26' gio-2.0 gio-unix-2.0) + PCAP_CONFIG ?= pcap-config +-PCAP_FLAGS := $(shell $(PCAP_CONFIG) --cflags pcap-config --libs) ++PCAP_FLAGS := $(shell $(PCAP_CONFIG) --cflags --libs) + DESTDIR = + PREFIX = /usr/local + BINDIR = $(DESTDIR)$(PREFIX)/bin +-- +2.39.0 + From peter at korsgaard.com Mon Feb 20 20:56:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:54 -0000 Subject: [Buildroot] [git commit branch/next] {toolchain, linux-headers}: add support for 6.1 headers Message-ID: <20230220205212.6C33A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79bb1ab519448993dbd88e21ddf55b5cfc283115 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 9684dc5697..c7bbb6be99 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb linux-6.1.tar.xz sha256 08d3118d6b755769f166de6babed54964393a7c0928029bef11bf55559a72da4 linux-6.0.13.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3 linux-5.15.83.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 93f443b78f..cd36c7c763 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_0 + default BR2_KERNEL_HEADERS_6_1 help Select the kernel version to get headers from. @@ -56,6 +56,10 @@ config BR2_KERNEL_HEADERS_5_15 config BR2_KERNEL_HEADERS_6_0 bool "Linux 6.0.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + +config BR2_KERNEL_HEADERS_6_1 + bool "Linux 6.1.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -133,8 +137,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1 + bool "6.1.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0 - bool "6.0.x or later" + bool "6.0.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19 @@ -395,6 +403,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.159" if BR2_KERNEL_HEADERS_5_10 default "5.15.83" if BR2_KERNEL_HEADERS_5_15 default "6.0.13" if BR2_KERNEL_HEADERS_6_0 + default "6.1" if BR2_KERNEL_HEADERS_6_1 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 \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 4947ab3aae..544b423001 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -591,6 +591,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -604,6 +608,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 default "6.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 default "5.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 default "5.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index a9cb61365f..1c39334ddd 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -127,8 +127,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_1 + bool "6.1.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_0 - bool "6.0.x or later" + bool "6.0.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_19 From yann.morin.1998 at free.fr Mon Feb 20 20:56:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:55 -0000 Subject: [Buildroot] [git commit branch/next] package/containerd: support crun as runtime Message-ID: <20230220205228.89ED386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0ecb9b2803b5b0b293acd7a5a6bba1ed1e3feab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next crun is a drop-in replacement for runc. If crun is enabled, but runc is not, we already install an impersonation symlink, so we do not need to force runc if crun is enabled. Still, runc is the default if crun is not enabled. Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart [yann.morin.1998 at free.fr: split into its own patch] Signed-off-by: Yann E. MORIN --- package/containerd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/containerd/Config.in b/package/containerd/Config.in index 0e3a55ef39..e69dd6768a 100644 --- a/package/containerd/Config.in +++ b/package/containerd/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_CONTAINERD depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc depends on BR2_USE_MMU # util-linux - select BR2_PACKAGE_RUNC # runtime dependency + select BR2_PACKAGE_RUNC if !BR2_PACKAGE_CRUN # runtime dependency select BR2_PACKAGE_UTIL_LINUX # runtime dependency select BR2_PACKAGE_UTIL_LINUX_BINARIES select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT From peter at korsgaard.com Mon Feb 20 20:56:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:55 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: bump to version 2022.12 Message-ID: <20230220205212.AC911828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ef654997caba04dffecdc4105b214abf7d02ae5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch which is now upstream. Update service files based on latest versions in: https://github.com/sbabic/meta-swupdate/tree/master/recipes-support/swupdate/swupdate Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...otloader.c-fix-build-without-reallocarray.patch | 35 ---------------------- package/swupdate/swupdate-usb at .service | 1 + package/swupdate/swupdate.hash | 2 +- package/swupdate/swupdate.mk | 2 +- package/swupdate/swupdate.service | 1 + 5 files changed, 4 insertions(+), 37 deletions(-) diff --git a/package/swupdate/0001-swupdate-core-bootloader.c-fix-build-without-reallocarray.patch b/package/swupdate/0001-swupdate-core-bootloader.c-fix-build-without-reallocarray.patch deleted file mode 100644 index d90ae7906e..0000000000 --- a/package/swupdate/0001-swupdate-core-bootloader.c-fix-build-without-reallocarray.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f30c4771e93cad7e77d7f2add94327865d226553 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 15 May 2022 14:53:35 +0200 -Subject: [PATCH] core/bootloader.c: fix build without reallocarray - -Use realloc instead of reallocarray to avoid the following build failure -with uclibc raised since version 2022.05 and -https://github.com/sbabic/swupdate/commit/b8897ed695e1cd954859142b14ec8546d2e7994a: - -microblaze-buildroot-linux-uclibc/bin/ld: core/built-in.o: in function `register_bootloader': -(.text.register_bootloader+0x30): undefined reference to `reallocarray' - -Fixes: - - http://autobuild.buildroot.org/results/7208e8189b4a6f35aaa4ed7777ecdd37421a7c7f - -Signed-off-by: Fabrice Fontaine -Backported from: f30c4771e93cad7e77d7f2add94327865d226553 -Signed-off-by: Ben Hutchings ---- - core/bootloader.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/bootloader.c b/core/bootloader.c -index f34cb414..5694d43d 100644 ---- a/core/bootloader.c -+++ b/core/bootloader.c -@@ -25,7 +25,7 @@ static unsigned int num_available = 0; - - int register_bootloader(const char *name, bootloader *bl) - { -- entry *tmp = reallocarray(available, num_available + 1, sizeof(entry)); -+ entry *tmp = realloc(available, (num_available + 1) * sizeof(entry)); - if (!tmp) { - return -ENOMEM; - } diff --git a/package/swupdate/swupdate-usb at .service b/package/swupdate/swupdate-usb at .service index eda9d1539c..df1a408421 100644 --- a/package/swupdate/swupdate-usb at .service +++ b/package/swupdate/swupdate-usb at .service @@ -1,5 +1,6 @@ [Unit] Description=usb media swupdate service +Requires=swupdate.service Requires=swupdate-progress.service [Service] diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index 638b586e8a..1b26f9e5e2 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1e819f71b19626bde1a4906ced39d3406ca240b458d3c4a998bd9c7333eba260 swupdate-2022.05.tar.gz +sha256 e6335e87812a98a87f1c55df03c9f4e4ef042789570002c5db120b09f64b0d86 swupdate-2022.12.tar.gz sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 1cd60d1b8f..8f05b83922 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2022.05 +SWUPDATE_VERSION = 2022.12 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, OFL-1.1 SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ diff --git a/package/swupdate/swupdate.service b/package/swupdate/swupdate.service index a3d8d1939e..94d4526acf 100644 --- a/package/swupdate/swupdate.service +++ b/package/swupdate/swupdate.service @@ -4,6 +4,7 @@ Documentation=https://github.com/sbabic/swupdate Documentation=https://sbabic.github.io/swupdate [Service] +Type=notify ExecStart=/usr/lib/swupdate/swupdate.sh KillMode=mixed From yann.morin.1998 at free.fr Mon Feb 20 20:56:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:56 -0000 Subject: [Buildroot] [git commit branch/next] package/pkgconf: disable ccache for host package Message-ID: <20230220205228.BE2D886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=006ea057e98afddd7d2b92e118ebefa8bdeb9a6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We need to disable ccache when building host-pkgconf as the upcoming ccache update depends on host-pkgconf indirectly due to host-cmake depending on host-pkgconf which will be required due to host-ccache migrating from autotools to cmake package infrastructure. Note: host-pkgconf does not need _AUTORECONF = YES, so it doesnot depend on any of host-gettext, host-automake, host-autoconf, or host-libtool. If it ever nees to in the future, then those should also be made to build without ccache. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: add note] Signed-off-by: Yann E. MORIN --- package/pkgconf/pkgconf.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk index 5d65f69c10..e9587fae6b 100644 --- a/package/pkgconf/pkgconf.mk +++ b/package/pkgconf/pkgconf.mk @@ -11,6 +11,11 @@ PKGCONF_LICENSE = pkgconf license PKGCONF_LICENSE_FILES = COPYING PKGCONF_CPE_ID_VENDOR = pkgconf +# We are a ccache dependency, so we can't use ccache +HOST_PKGCONF_CONF_ENV = \ + CC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" + PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/bin/pkg-config define PKGCONF_LINK_PKGCONFIG From peter at korsgaard.com Mon Feb 20 20:56:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:56 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8189fs: bump to 2022-10-30 version to fix build failure with Linux up to 6.1 Message-ID: <20230220205212.BA2938648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5aceee9b1dc2c1c3e7f22ff2892aa580378d741b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop local patch that has been upstreamed[0] and drop the endianness handling too since from this commit[1] on it's handled by using Linux macro __LITTLE_ENDIAN. [0]: https://github.com/jwrdegoede/rtl8189ES_linux/commit/4a555ffb77a5947814b6c7f330968318e265c496 [1]: https://github.com/jwrdegoede/rtl8189ES_linux/commit/b3da33576da5359d85c7cfe82716c9a08a592aff Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...ve-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch | 40 ---------------------- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 10 ++---- 3 files changed, 3 insertions(+), 49 deletions(-) diff --git a/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch b/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch deleted file mode 100644 index dc4deff9f1..0000000000 --- a/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4a555ffb77a5947814b6c7f330968318e265c496 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 28 Sep 2022 21:17:17 +0200 -Subject: [PATCH] Makefile: move 'EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)' at the - end of EXTRA_FLAGS assignment - -At the moment USER_EXTRA_CFLAGS can't override local Makfile EXTRA_CFLAGS -since it's assigned at the beginning of the Makefile. For example it's not -possible to undefine the hardcoded CONFIG_LITTLE_ENDIAN and this doesn't -allow to build these modules for big endian architectures. So let's move -the assignment of USER_EXTRA_CFLAGS to EXTRA_CFLAGS after the last -EXTRA_CFLAGS assignment. - -Signed-off-by: Giulio Benetti -[Upstream status: https://github.com/jwrdegoede/rtl8189ES_linux/pull/83] ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 8fcb7bd..e4664e9 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,3 @@ --EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) - EXTRA_CFLAGS += -O1 - #EXTRA_CFLAGS += -O3 - #EXTRA_CFLAGS += -Wall -@@ -2239,6 +2238,8 @@ ifneq ($(USER_MODULE_NAME),) - MODULE_NAME := $(USER_MODULE_NAME) - endif - -+EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -+ - ifneq ($(KERNELRELEASE),) - - ########### this part for *.mk ############################ --- -2.34.1 - diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index 1ab41db553..4f117cfd14 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7cc80cb85ed6e7f7d5480e6094c377d3dbcd18a57b58cfba43a7e42ea59fc8d3 rtl8189fs-c93cfd712a3acd2ecdeda19a66d269c20f8803f1.tar.gz +sha256 96347dbfedd95a217fb89b7b295fe417b711dbad3db896ef0c2fa733c6d150fd rtl8189fs-e58bd86c9d9408c648b1246a0dd76b16856ec172.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 8b7618fcc8..15a5329a45 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,20 +4,14 @@ # ################################################################################ -RTL8189FS_VERSION = c93cfd712a3acd2ecdeda19a66d269c20f8803f1 +RTL8189FS_VERSION = e58bd86c9d9408c648b1246a0dd76b16856ec172 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 -# Undefine the hardcoded CONFIG_LITTLE_ENDIAN -RTL8189FS_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN -# Set endianness -RTL8189FS_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN - RTL8189FS_MODULE_MAKE_OPTS = \ CONFIG_RTL8189FS=m \ KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) \ - USER_EXTRA_CFLAGS="$(RTL8189FS_USER_EXTRA_CLAGS)" + KSRC=$(LINUX_DIR) define RTL8189FS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) From yann.morin.1998 at free.fr Mon Feb 20 20:56:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:57 -0000 Subject: [Buildroot] [git commit branch/next] support/download: fix cargo vendoring Message-ID: <20230220205228.DC01686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac2b26fba2ad06fadf14244505319dc5c272906c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit de4cf253752d (package/{rust, rust-bin}: bump to version 1.66.0) forgot, despite the big comment above the version strings, to confirm that the vendoring was still working. Previously, we were adding the vendoring equivalence manually, but in commit 04154a651729 (support/download/cargo-post-process: cargo output for vendor config), we switched to using the output of "cargo vendor" (on stdout) to support cases were the vendoring equivalence would be more complex (e.g. when using crates not hosted on crates.io). With rust until and including 1.65.0, "cargo vendor" would output (for crates.io crates) the same output as our manual fixups, except it was preceded by an empty line. So, to avoid recompting all our hashes, we added a tweak to strip away the leading empty line in 04154a651729. But rust 1.66.0 includes [0] which changes the output (on stdout) of "cargo vendor", where the first empty line is no longer emitted. This means that our tweak for rust 1.65.0 now strips out an important part of the cargo vendor output, which renders the archives invalid, and thus generates different archives, which fail to validate against our hashes. Fix this by doing what the comment in the post-process helper states, and just keep the whole output of "cargo vendor", by just removing the "tail --lines=+2". Since that comment is no longer meaningful, we drop it too. Now, all our 6 cargo-based packages, as well as our 5 python packages that have rust code, can be vendored again, without changing our hashes, but most importantly, with valid archives. Still, we keep the comment above the versions strings, in the hope that a future bumper will notice and be more careful at validating the vendoring. [0] https://github.com/rust-lang/cargo/pull/11273 Fixes: http://autobuild.buildroot.org/results/bea/beac7674bbc9fd2f8777b5861f65afee9c485753/ (bat) http://autobuild.buildroot.org/results/d1e/d1ec1ebbde115628a4b8b9099544347242a97c1c/ (dust) http://autobuild.buildroot.org/results/f96/f968be895be9ca98b314fdd688ef8d3bdf4e5dfb/ (hyerfine) http://autobuild.buildroot.org/results/a0c/a0cdb6cc9493f5248d98f98b13da854e12adc2be/ (ripgrep) ... and so many others... Reported-by: Romain Naour Signed-off-by: Yann E. MORIN Cc: James Hilliard Cc: Simon Richter Reviewed-by: James Hilliard Reviewed-by: Romain Naour Tested-by: Romain Naour Signed-off-by: Yann E. MORIN --- support/download/cargo-post-process | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 186e9eb69b..21a6be8dbe 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -25,25 +25,11 @@ post_process_unpack "${base_name}" "${output}" pushd "${base_name}" > /dev/null # Create the local .cargo/config with vendor info -# -# The first line of the output to stdout is empty. -# So skip it to have the file start with the vendoring -# configuration (`tail --lines=+2`). -# -# NOTE: -# There is a patch for cargo to remove the first empty line: -# See: https://github.com/rust-lang/cargo/pull/11273 -# -# The patch already landed in +nightly and will end up -# in +stable soon. -# -# -> When updating rust/cargo, the call to `tail` must be removed. -# mkdir -p .cargo/ cargo vendor \ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ --locked VENDOR \ - | tail --lines=+2 | tee .cargo/config + | tee .cargo/config popd > /dev/null From peter at korsgaard.com Mon Feb 20 20:56:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:57 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8723ds-bt: new package Message-ID: <20230220205212.D73578648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a2db09451371d317ee119d742a62817d5f41c5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This package install the required firmware for enabling the Bluetooth device embedded in the RTL8723DS chip. The driver is included in Linux main tree and can be enabled with the BT_HCIUART_RTL symbol. Signed-off-by: Angelo Compagnucci Tested-by: Indrek Kruusa [Peter: use install -D] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/rtl8723ds-bt/Config.in | 6 ++++++ package/rtl8723ds-bt/rtl8723ds-bt.hash | 2 ++ package/rtl8723ds-bt/rtl8723ds-bt.mk | 18 ++++++++++++++++++ 5 files changed, 28 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3a0e3c14ab..b52a065dbc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -185,6 +185,7 @@ F: package/qt5/qt5coap/ F: package/qt5/qt5knx/ F: package/qt5/qt5mqtt/ F: package/rtl8723ds/ +F: package/rtl8723ds-bt/ F: package/sam-ba/ F: package/sshguard/ F: package/sunwait/ diff --git a/package/Config.in b/package/Config.in index 914c3584e9..999feae08a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -585,6 +585,7 @@ endmenu source "package/rtl8192eu/Config.in" source "package/rtl8723bu/Config.in" source "package/rtl8723ds/Config.in" + source "package/rtl8723ds-bt/Config.in" source "package/rtl8812au-aircrack-ng/Config.in" source "package/rtl8821au/Config.in" source "package/sane-backends/Config.in" diff --git a/package/rtl8723ds-bt/Config.in b/package/rtl8723ds-bt/Config.in new file mode 100644 index 0000000000..0a604310c0 --- /dev/null +++ b/package/rtl8723ds-bt/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_RTL8723DS_BT + bool "rtl8723ds-bt" + help + rtl8723ds UART attached Bluetooth module firmware. + + https://github.com/wsyco/RTL8723DS_BT_Linux diff --git a/package/rtl8723ds-bt/rtl8723ds-bt.hash b/package/rtl8723ds-bt/rtl8723ds-bt.hash new file mode 100644 index 0000000000..1ec4e350f9 --- /dev/null +++ b/package/rtl8723ds-bt/rtl8723ds-bt.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 9e70a981946abeeb6437d9a27d8437cea15aa4df72f8d56ded0ae28af484d2f4 rtl8723ds-bt-14cedf3a9fec1aa8c500fa52f3e3acc433cbcf08.tar.gz diff --git a/package/rtl8723ds-bt/rtl8723ds-bt.mk b/package/rtl8723ds-bt/rtl8723ds-bt.mk new file mode 100644 index 0000000000..423ad74df5 --- /dev/null +++ b/package/rtl8723ds-bt/rtl8723ds-bt.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# rtl8723ds-bt +# +################################################################################ + +RTL8723DS_BT_VERSION = 14cedf3a9fec1aa8c500fa52f3e3acc433cbcf08 +RTL8723DS_BT_SITE = $(call github,wsyco,RTL8723DS_BT_Linux,$(RTL8723DS_BT_VERSION)) +RTL8723DS_BT_LICENSE = PROPRIETARY + +define RTL8723DS_BT_INSTALL_TARGET_CMDS + $(INSTALL) -m 644 -D $(@D)/8723D/rtl8723d_fw \ + $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723ds_fw.bin + $(INSTALL) -m 644 -D $(@D)/8723D/rtl8723d_config \ + $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723ds_config.bin +endef + +$(eval $(generic-package)) From peter at korsgaard.com Mon Feb 20 20:56:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:58 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-gmmlib: bump version to 22.3.3 Message-ID: <20230220205229.46BFF86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56561f22b5b9971de67118bdb8db7f6b4af1c149 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 d36bd8b9b6..693d9d0905 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f725fbb4291ab67bbc7b31e1a268f523df384667360c931b40144db861be53d7 intel-gmmlib-22.3.2.tar.gz +sha256 86651bd2803c9f0afd82471bec784e65d2b418dee315a053d22215eb2a679be7 intel-gmmlib-22.3.3.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index ffd101808b..3eb3458ee7 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.2 +INTEL_GMMLIB_VERSION = 22.3.3 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Mon Feb 20 20:56:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:58 -0000 Subject: [Buildroot] [git commit branch/next] package/ipcalc: bump to version 1.0.2 Message-ID: <20230220205213.15AF28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d923d5f7e61b36f7deee32e1e09b279efd5dcd3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://gitlab.com/ipcalc/ipcalc/-/blob/1.0.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ipcalc/ipcalc.hash | 2 +- package/ipcalc/ipcalc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ipcalc/ipcalc.hash b/package/ipcalc/ipcalc.hash index bf9b34a610..50d08239fa 100644 --- a/package/ipcalc/ipcalc.hash +++ b/package/ipcalc/ipcalc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dac080c0773cc14c1d6f818899351d2286cace85751dd9dc704944e54c2c3565 ipcalc-1.0.1.tar.bz2 +sha256 47c866941916800270fca23496acc9976ca9488ce9053aeaedc5f47c5929b772 ipcalc-1.0.2.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ipcalc/ipcalc.mk b/package/ipcalc/ipcalc.mk index dfe35e2cdc..e63e174ce2 100644 --- a/package/ipcalc/ipcalc.mk +++ b/package/ipcalc/ipcalc.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPCALC_VERSION = 1.0.1 +IPCALC_VERSION = 1.0.2 IPCALC_SITE = $(call gitlab,ipcalc,ipcalc,$(IPCALC_VERSION)) IPCALC_SOURCE = ipcalc-$(IPCALC_VERSION).tar.bz2 IPCALC_LICENSE = GPL-2.0+ From peter at korsgaard.com Mon Feb 20 20:56:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:59 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_kria_kv260_defconfig: use CONFIG_MULTI_DTB_FIT Message-ID: <20230220205229.7136986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=250d7df53acdccdb3c65c941ad426f6cc0502996 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When using the buildroot compiler, it builds the u-boot.itb immediately after building the fit-dtb.blob. This causes a build failure when using the CONFIG_MULTI_DTB_FIT build configuration. This patch adds the necessary dependency to guarantee that the fit-dtb.blob has finished building before trying to build the u-boot.itb. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3310463281 This patch has been submitted to u-boot mainline: https://lore.kernel.org/all/20221221075446.47141-1-neal.frager at amd.com/ Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- board/zynqmp/kria/kv260/kv260.sh | 2 +- .../v1-0001-makefile-add-multi_dtb_fit-dep.patch | 32 ++++++++++++++++++++++ board/zynqmp/kria/uboot.fragment | 1 + configs/zynqmp_kria_kv260_defconfig | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/board/zynqmp/kria/kv260/kv260.sh b/board/zynqmp/kria/kv260/kv260.sh index e891852009..e3467f3068 100755 --- a/board/zynqmp/kria/kv260/kv260.sh +++ b/board/zynqmp/kria/kv260/kv260.sh @@ -8,5 +8,5 @@ UBOOT_DIR=$4 -fdtoverlay -o ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb -i ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb ${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo +fdtoverlay -o ${UBOOT_DIR}/fit-dtb.blob -i ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb ${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo ${UBOOT_DIR}/tools/mkimage -E -f ${UBOOT_DIR}/u-boot.its -B 0x8 ${BINARIES_DIR}/u-boot.itb diff --git a/board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch b/board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch new file mode 100644 index 0000000000..ddc04cacac --- /dev/null +++ b/board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch @@ -0,0 +1,32 @@ +From 8b181bf582c17cf709a62cf499f9709c94f49d33 Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Wed, 21 Dec 2022 07:51:42 +0000 +Subject: [PATCH v1 1/1] makefile: add multi_dtb_fit dep + +With certain gcc compilers, the u-boot.itb is built immediately after dtb +generation. If CONFIG_MULTI_DTB_FIT is used, it is possible that the +fit-dtb.blob is not finished in time. + +This patch adds a necessary dependency to guarantee that the fit-dtb.blob +is built before attempting to build the u-boot.itb. + +Signed-off-by: Neal Frager +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index b96e2ffa15..682a5d94fd 100644 +--- a/Makefile ++++ b/Makefile +@@ -1425,6 +1425,7 @@ MKIMAGEFLAGS_u-boot.itb += -B 0x8 + ifdef U_BOOT_ITS + u-boot.itb: u-boot-nodtb.bin \ + $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SANDBOX),dts/dt.dtb) \ ++ $(if $(CONFIG_MULTI_DTB_FIT),$(FINAL_DTB_CONTAINER)) \ + $(U_BOOT_ITS) FORCE + $(call if_changed,mkfitimage) + $(BOARD_SIZE_CHECK) +-- +2.17.1 + diff --git a/board/zynqmp/kria/uboot.fragment b/board/zynqmp/kria/uboot.fragment index 9e32edfb36..40709549dc 100644 --- a/board/zynqmp/kria/uboot.fragment +++ b/board/zynqmp/kria/uboot.fragment @@ -1,4 +1,5 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0xF80000 +CONFIG_MULTI_DTB_FIT=y CONFIG_DTB_RESELECT=y CONFIG_DMA=y CONFIG_XILINX_DPDMA=y diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 5c53122b46..3214d45fa9 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -38,3 +38,4 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/patches" From peter at korsgaard.com Mon Feb 20 20:56:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:59 -0000 Subject: [Buildroot] [git commit branch/next] configs/lichee_rv_dock: new defconfig Message-ID: <20230220205212.EE7E2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9ad317507cf8564200b88dda2463406d0171122 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Lichee RV Dock is a RISC-V Linux development kits with high integration, small size and affordable price designed for opensource developer. https://wiki.sipeed.com/hardware/en/lichee/RV/Dock.html Signed-off-by: Angelo Compagnucci Tested-by: Indrek Kruusa Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + board/sipeed/lichee_rv_dock/genimage.cfg | 19 +++++++++ board/sipeed/lichee_rv_dock/linux.fragment | 7 ++++ .../lichee_rv_dock/overlay/etc/network/interfaces | 6 +++ .../lichee_rv_dock/overlay/etc/wpa_supplicant.conf | 8 ++++ board/sipeed/lichee_rv_dock/readme.txt | 45 ++++++++++++++++++++++ configs/sipeed_lichee_rv_dock_defconfig | 41 ++++++++++++++++++++ 7 files changed, 127 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2f27ddb110..b0f10148b5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -158,6 +158,7 @@ F: package/rauc/ N: Angelo Compagnucci F: board/sipeed/lichee_rv/ +F: board/sipeed/lichee_rv_dock/ F: configs/sipeed_lichee_rv* F: package/apparmor/ F: package/corkscrew/ diff --git a/board/sipeed/lichee_rv_dock/genimage.cfg b/board/sipeed/lichee_rv_dock/genimage.cfg new file mode 100644 index 0000000000..38078f0ae3 --- /dev/null +++ b/board/sipeed/lichee_rv_dock/genimage.cfg @@ -0,0 +1,19 @@ +# Minimal SD card image for the sipeed Lichee RV dock + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + offset = 1M + } +} diff --git a/board/sipeed/lichee_rv_dock/linux.fragment b/board/sipeed/lichee_rv_dock/linux.fragment new file mode 100644 index 0000000000..10016889ab --- /dev/null +++ b/board/sipeed/lichee_rv_dock/linux.fragment @@ -0,0 +1,7 @@ +CONFIG_BT=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_SERDEV=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_RTL=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_SERIAL_DEV_CTRL_TTYPORT=y diff --git a/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces b/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces new file mode 100644 index 0000000000..89e7d74aff --- /dev/null +++ b/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces @@ -0,0 +1,6 @@ +auto lo +iface lo inet loopback + +auto wlan0 +iface wlan0 inet dhcp +wpa-conf /etc/wpa_supplicant.conf diff --git a/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf b/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf new file mode 100644 index 0000000000..b43292b0a7 --- /dev/null +++ b/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf @@ -0,0 +1,8 @@ +ap_scan=1 + +network={ + ssid="YOURSSID" + scan_ssid=1 + key_mgmt=WPA-PSK + psk="YOURPASSWD" +} diff --git a/board/sipeed/lichee_rv_dock/readme.txt b/board/sipeed/lichee_rv_dock/readme.txt new file mode 100644 index 0000000000..048ba64d26 --- /dev/null +++ b/board/sipeed/lichee_rv_dock/readme.txt @@ -0,0 +1,45 @@ +Lichee RV dock +=============== + +Lichee RV Dock is a RISC-V Linux development kits with high integration, small +size and affordable price designed for opensource developer. It's equipped with +HDMI interface and it supports many screen by its screen convert board. It's +also equipped with many peripherals, including a UAB-A port, 2.4G Wifi-BT module, +an analog microphone and a speaker jack interface. + +How to build +============ + +$ make sipeed_lichee_rv_dock_defconfig +$ make + +Wifi +========== + +Edit board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf or +/etc/wpa_supplicant.conf once connected to the board: + +* Replace YOURSSID with your AP ssid +* Replace YOURPASSWD with your AP password + +Bluetooth +========== + +To make the device discoverable and pairable, once connected to the board: + +* bluetoothctl power on +* bluetoothctl discoverable yes +* bluetoothctl pairable yes + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Connect a TTL UART to the debug connector, insert the microSD card and +plug in a USB-C cable to the PWR connector to boot the system. diff --git a/configs/sipeed_lichee_rv_dock_defconfig b/configs/sipeed_lichee_rv_dock_defconfig new file mode 100644 index 0000000000..7c8c6788fa --- /dev/null +++ b/configs/sipeed_lichee_rv_dock_defconfig @@ -0,0 +1,41 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay board/sipeed/lichee_rv_dock/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/lichee_rv_dock/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="nezha" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-lichee-rv-dock" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/lichee_rv_dock/linux.fragment" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_PACKAGE_RTL8723DS=y +BR2_PACKAGE_RTL8723DS_BT=y +BR2_PACKAGE_BLUEZ5_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y +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_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_PLAT="generic" +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set +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,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="lichee_rv_dock" +BR2_TARGET_UBOOT_NEEDS_DTC=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-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y From peter at korsgaard.com Mon Feb 20 20:57:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:00 -0000 Subject: [Buildroot] [git commit branch/next] package/gtest: bump to version 1.12.1 Message-ID: <20230220205213.3EA8D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58bb71089e52323aea8696a5de2d7687422bde74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/google/googletest/releases/tag/release-1.12.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gtest/gtest.hash | 2 +- package/gtest/gtest.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gtest/gtest.hash b/package/gtest/gtest.hash index 1a93684aeb..a6dd15a8d2 100644 --- a/package/gtest/gtest.hash +++ b/package/gtest/gtest.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2a4f11dce6188b256f3650061525d0fe352069e5c162452818efbbf8d0b5fe1c gtest-1.12.0.tar.gz +sha256 81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2 gtest-1.12.1.tar.gz sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 LICENSE diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 236c8f3730..a53253228e 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -4,7 +4,7 @@ # ################################################################################ -GTEST_VERSION = 1.12.0 +GTEST_VERSION = 1.12.1 GTEST_SITE = $(call github,google,googletest,release-$(GTEST_VERSION)) GTEST_INSTALL_STAGING = YES GTEST_INSTALL_TARGET = NO From peter at korsgaard.com Mon Feb 20 20:57:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:00 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-http-daemon: bump version to 6.14 Message-ID: <20230220205229.C5EA286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e69d76aae479ab2d5f15baa79f25fd480e12eab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Updated license hash due to typo/whitespace-only fixes in license file: https://github.com/libwww-perl/HTTP-Daemon/commit/605bc6efdabf39d2c9f9c7f613bf88d497454e5a#diff-b4668a52683f65fbc0528f6590ba160c9c64c88c302b6262c506266eb1d35180 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-http-daemon/perl-http-daemon.hash | 6 +++--- package/perl-http-daemon/perl-http-daemon.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-http-daemon/perl-http-daemon.hash b/package/perl-http-daemon/perl-http-daemon.hash index f8272a4fce..c19b3b9558 100644 --- a/package/perl-http-daemon/perl-http-daemon.hash +++ b/package/perl-http-daemon/perl-http-daemon.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 63674e3f81760a29075853413eb157d8 HTTP-Daemon-6.12.tar.gz -sha256 df47bed10c38670c780fd0116867d5fd4693604acde31ba63380dce04c4e1fa6 HTTP-Daemon-6.12.tar.gz +md5 3111b0081d08d8b225f52884033de349 HTTP-Daemon-6.14.tar.gz +sha256 f0767e7f3cbb80b21313c761f07ad8ed253bce9fa2d0ba806b3fb72d309b2e1d HTTP-Daemon-6.14.tar.gz # computed by scancpan -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENCE +sha256 311f168ba9a7819ffab4fea19858f9e880737baf6d112929d11530205035a4cc LICENCE diff --git a/package/perl-http-daemon/perl-http-daemon.mk b/package/perl-http-daemon/perl-http-daemon.mk index e475072628..fe50c768bf 100644 --- a/package/perl-http-daemon/perl-http-daemon.mk +++ b/package/perl-http-daemon/perl-http-daemon.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_DAEMON_VERSION = 6.12 +PERL_HTTP_DAEMON_VERSION = 6.14 PERL_HTTP_DAEMON_SOURCE = HTTP-Daemon-$(PERL_HTTP_DAEMON_VERSION).tar.gz PERL_HTTP_DAEMON_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_DAEMON_DEPENDENCIES = host-perl-module-build-tiny From peter at korsgaard.com Mon Feb 20 20:57:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:01 -0000 Subject: [Buildroot] [git commit branch/next] configs/sipeed_licheee_rv_defconfig: use 6.1 kernel headers Message-ID: <20230220205213.68EAF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73125c7412d4c73eb69d237f059718a1d1ba0bd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The kernel used is based on 6.1-rc3, so use the recently introduced 6.1 kernel headers version to fix a build issue: Incorrect selection of kernel headers: expected 6.0.x, got 6.1.x Signed-off-by: Peter Korsgaard --- configs/sipeed_lichee_rv_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sipeed_lichee_rv_defconfig b/configs/sipeed_lichee_rv_defconfig index f9782f870b..f03a6b4f69 100644 --- a/configs/sipeed_lichee_rv_defconfig +++ b/configs/sipeed_lichee_rv_defconfig @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/lichee_rv/genimage.cfg" From peter at korsgaard.com Mon Feb 20 20:57:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:01 -0000 Subject: [Buildroot] [git commit branch/next] configs/chiliboard: bump u-boot to 2023.01 Message-ID: <20230220205230.2C641828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93d0979fbf063a8b65fd9d4c58891b21805804c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- configs/grinn_chiliboard_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig index df483d991a..e7862d1738 100644 --- a/configs/grinn_chiliboard_defconfig +++ b/configs/grinn_chiliboard_defconfig @@ -16,7 +16,7 @@ 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_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="chiliboard" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From peter at korsgaard.com Mon Feb 20 20:57:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:02 -0000 Subject: [Buildroot] [git commit branch/next] configs/visionfive2_defconfig: new defconfig Message-ID: <20230220205213.4A7478648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=704c62bbc5d30df80002fdd1f6a63bebc0e1842d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add a defconfig for the Starfive VisionFive2 board, a board built around the Starfive JH7110 RISC-V 64bit SoC. This board comes with functional lowlevel and U-Boot bootloaders in SPI flash. The defconfig reuses these and only builds a (5.15 based) kernel and rootfs. The factory shipped U-Boot is hard coded to look at MMC partition 3. Signed-off-by: Francois Dugast [Peter: add to DEVELOPERS] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 +++ board/visionfive2/genimage.cfg | 21 +++++++++++++++ .../overlay/boot/extlinux/extlinux.conf | 4 +++ board/visionfive2/readme.txt | 30 ++++++++++++++++++++++ configs/visionfive2_defconfig | 18 +++++++++++++ 5 files changed, 77 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b0f10148b5..a200edb7f5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1029,6 +1029,10 @@ F: package/tbb/ N: Francisco Gonzalez F: package/ser2net/ +N: Francois Dugast +F: board/visionfive2/ +F: configs/visionfive2_defconfig + N: Francois Perrad F: board/freescale/ls1028ardb/ F: board/olimex/a20_olinuxino diff --git a/board/visionfive2/genimage.cfg b/board/visionfive2/genimage.cfg new file mode 100644 index 0000000000..c221b49c7b --- /dev/null +++ b/board/visionfive2/genimage.cfg @@ -0,0 +1,21 @@ +# Minimal SD card image for the Starfive VisionFive2 board + +image sdcard.img { + hdimage { + } + + # u-boot is hard coded to look at 3rd partition + partition dummy1 { + size = 512 + } + + partition dummy2 { + size = 512 + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + } +} diff --git a/board/visionfive2/overlay/boot/extlinux/extlinux.conf b/board/visionfive2/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..6e2c5660d6 --- /dev/null +++ b/board/visionfive2/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + devicetree /boot/jh7110-visionfive-v2.dtb + append console=ttyS0,115200 root=/dev/mmcblk1p3 diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt new file mode 100644 index 0000000000..2da98f3847 --- /dev/null +++ b/board/visionfive2/readme.txt @@ -0,0 +1,30 @@ +Starfive VisionFive2 +==================== + +The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a +Starfive JH7110 processor. + +How to build +============ + +$ make visionfive2_defconfig +$ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Preparing the board +=================== + +Connect a TTL UART cable to pin 6 (GND), 8 (TX) and 10 (RX). + +Insert your SD card. + +Power-up the board using an USB-C cable. diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig new file mode 100644 index 0000000000..5b07a8efbc --- /dev/null +++ b/configs/visionfive2_defconfig @@ -0,0 +1,18 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,7b7b4eddd8d5ae55f6e0ee09b93e16e23ab4f97b)/linux-7b7b4eddd8d5ae55f6e0ee09b93e16e23ab4f97b.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="starfive_visionfive2" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-visionfive-v2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_GENIMAGE=y From peter at korsgaard.com Mon Feb 20 20:57:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:05 -0000 Subject: [Buildroot] [git commit branch/next] package/python-weasyprint: bump to version 57.2 Message-ID: <20230220205230.C209B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6abb8721dbf0987ec43f248c84ce4f0f4d11b697 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-weasyprint/python-weasyprint.hash | 4 ++-- package/python-weasyprint/python-weasyprint.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash index 4da8ea479a..d6026cf034 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 bab389bdfb25e03d64591c56367fb344 weasyprint-57.1.tar.gz -sha256 397a9d11298f94485ec3b7b68aeef1c6106fb638350126d9d4a64109b73508a0 weasyprint-57.1.tar.gz +md5 497030cecafffca06bae2b161846b461 weasyprint-57.2.tar.gz +sha256 b8e9ef2dcbcfbc82e99215acfd68f947b2b5f1999b5b156db75fabe380ba7e9a weasyprint-57.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 d1e5e7983d..27b07226d9 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 57.1 +PYTHON_WEASYPRINT_VERSION = 57.2 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/32/3f/d305dc714c119e5b11c0ea1ecff9741407b6da90d6b684859d3b3e586692 +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/b1/88/335dd6cb71a9d58584c975bf1db0ab9a3a9f15f9bffef1cbfac0fb1ee72e PYTHON_WEASYPRINT_SETUP_TYPE = flit PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:57:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:05 -0000 Subject: [Buildroot] [git commit branch/next] package/python-web2py: bump to version 2.23.0 Message-ID: <20230220205230.E575C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f675fd79d57fc6c8fe0b15fe1c3e3d5aabcd8bd2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 dbf85437f2..a853497768 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d4a15fc15254d3fa9e9e9b5a726ae51a0989b7d740d53fd7c3d5b81ac6b8274e python-web2py-2.22.5.tar.gz +sha256 356f88b671e2bcdd9c89df526ee063ee9d6f4f57b60182ec2684adddcc426e99 python-web2py-2.23.0.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index b9a4e95609..4425b09d12 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.22.5 +PYTHON_WEB2PY_VERSION = 2.23.0 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:57:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:05 -0000 Subject: [Buildroot] [git commit branch/next] utils/scancpan: bump required perl version Message-ID: <20230220205213.C73CB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4cbef389f3e10d1cbdcd9961fb128dfd9b85debf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next As the comment in package/perl/perl.mk instructs, bumping the perl version must be propagated to utils/scancpan as well. However, commit 7c1ef8129f37 (package/perl: bump to version 5.34.0) forgot to do so. Fixes: 7c1ef8129f37 Signed-off-by: Yann E. MORIN --- utils/scancpan | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/scancpan b/utils/scancpan index 168619164f..48f8bd83b7 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -488,9 +488,9 @@ use Digest::SHA qw(sha256_hex); use Text::Wrap; $Text::Wrap::columns = 62; -# Below, 5.032 should be aligned with the version of perl actually +# Below, 5.034 should be aligned with the version of perl actually # bundled in Buildroot: -die <<"MSG" if $] < 5.032; +die <<"MSG" if $] < 5.034; This script needs a host perl with the same major version as Buildroot target perl. Your current host perl is: @@ -498,7 +498,7 @@ Your current host perl is: version $] You may install a local one by running: - perlbrew install perl-5.32.0 + perlbrew install perl-5.34.0 MSG my ($help, $man, $quiet, $force, $recommend, $test, $host); From peter at korsgaard.com Mon Feb 20 20:57:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:06 -0000 Subject: [Buildroot] [git commit branch/next] package/wireshark: fix legal info Message-ID: <20230220205231.1EAD486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb79d78554632e96df52f41333aa62f928b6817f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 4aca99f51cc97cfc3bcd3affa65f4694004dd444 forgot to update hash of COPYING file and add hash of README.md due to the following commit which moved the introductory note about the GPL from the COPYING license text file to the README: https://github.com/wireshark/wireshark/commit/d2b6b89b94bd3e18520c472affae9cd4a03283e2 Fixes: - http://autobuild.buildroot.org/results/aaed32b55cc56beb32152ed61ac9b7f69d3ebef5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 3 ++- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index ae06ab09b7..e9026b8caa 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -3,4 +3,5 @@ sha1 0127180ff18515b086fe5603f767f53ddaa64c1a wireshark-4.0.2.tar.xz sha256 f35915699f2f9b28ddb211202d40ec8984e5834d3c911483144a4984ba44411d wireshark-4.0.2.tar.xz # Locally calculated -sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 fce67c1558e448fac784ce9a30cb47956488bc3ef6ec16316c38b0668b3cad2e README.md diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index ee3d6b1905..e2a424ef0f 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -8,7 +8,7 @@ WIRESHARK_VERSION = 4.0.2 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license -WIRESHARK_LICENSE_FILES = COPYING +WIRESHARK_LICENSE_FILES = COPYING README.md WIRESHARK_CPE_ID_VENDOR = wireshark WIRESHARK_SELINUX_MODULES = wireshark WIRESHARK_DEPENDENCIES = \ From yann.morin.1998 at free.fr Mon Feb 20 20:57:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:07 -0000 Subject: [Buildroot] [git commit branch/next] utils/scancpan: update cpan.org and spdx.org URLs from http to https Message-ID: <20230220205213.BC86A81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=072df09e2f62e6d797df743b0ebf42a6a5910ff9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- utils/scancpan | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/scancpan b/utils/scancpan index 075f193563..168619164f 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -31,7 +31,7 @@ $fatpacked{"MetaCPAN/API/Tiny.pm"} = <<'METACPAN_API_TINY'; if $params{ua_args} && ref($params{ua_args}) ne 'ARRAY'; my $self = +{ - base_url => $params{base_url} || 'http://api.metacpan.org/v0', + base_url => $params{base_url} || 'https://api.metacpan.org/v0', ua => $params{ua} || HTTP::Tiny->new( $params{ua_args} ? @{$params{ua_args}} @@ -525,8 +525,8 @@ my %deps_build; # name -> list of host dependencies my %deps_runtime; # name -> list of target dependencies my %license_files; # name -> hash of license files my %checksum; # author -> list of checksum -my $mirror = 'http://cpan.metacpan.org'; # a CPAN mirror -my $mcpan = MetaCPAN::API::Tiny->new(base_url => 'http://fastapi.metacpan.org/v1'); +my $mirror = 'https://cpan.metacpan.org'; # a CPAN mirror +my $mcpan = MetaCPAN::API::Tiny->new(base_url => 'https://fastapi.metacpan.org/v1'); my $ua = HTTP::Tiny->new(); my $new_pkgs; @@ -698,7 +698,7 @@ sub brname { return uc $name; } -# Buildroot requires license name as in http://spdx.org/licenses/ +# Buildroot requires license name as in https://spdx.org/licenses/ sub brlicense { my $license = shift; $license =~ s|apache_1_1|Apache-1.1|; From peter at korsgaard.com Mon Feb 20 20:57:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:07 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: needs gcc >= 4.9 Message-ID: <20230220205231.4F50A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=035f18db042d218777394b868beadc575976a5ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next crun unconditionally uses atomic_bool when libgcrypt is found since version 1.7.1 and https://github.com/containers/crun/commit/40f66c0a74b8d918ecc7ae9228dca32a4fd71084 resulting in the following build failure with gcc 4.8 since commit 6987b92da510a8c8b9534a22506850c163d0f035: src/libcrun/seccomp.c: In function 'calculate_seccomp_checksum': src/libcrun/seccomp.c:374:3: error: unknown type name 'atomic_bool' static atomic_bool initialized = false; ^ Fixes: - http://autobuild.buildroot.org/results/924806ffd6d83cd6d8226577c3877b0b8ca2722d Signed-off-by: Fabrice Fontaine Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/crun/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/crun/Config.in b/package/crun/Config.in index fa0894e126..45c86f0655 100644 --- a/package/crun/Config.in +++ b/package/crun/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CRUN bool "crun" depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_YAJL # libocispec help @@ -8,5 +9,6 @@ config BR2_PACKAGE_CRUN https://github.com/containers/crun -comment "crun needs a glibc or musl toolchain" - depends on BR2_TOOLCHAIN_USES_UCLIBC +comment "crun needs a glibc or musl toolchain, gcc >= 4.9" + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From yann.morin.1998 at free.fr Mon Feb 20 20:57:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:08 -0000 Subject: [Buildroot] [git commit branch/next] package/skeleton-systemd: move /var factory tmpfiles out of /etc Message-ID: <20230220205213.EADB781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff0fd90c3e42dd00283a4eb192ce832f7c03ac30 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When the rootfs is not remounted read-write (thus assuming a read-only rootfs like squashfs), we create a tmpfiles.d factory for /var. However, we register those in /etc/tmpfiles.d/, but /etc could also be a tmpfs (for full state-less systems, or easy factory-reset, see [0]). So, we move our var factory to /usr/lib/tmpfiles.d/, which is also the location where systemd itself places its own tmpfiles, and where we already put all our other tmpfiles (see audit, avahi, cryptsetup, dhcp, lighttpd, nfs-utils, quagga, samba4, swupdate) and our handling of systemd's catalog files too. We also rename the file to a better name, so that it is obvious it is generated by us (systemd already installs a var.conf of its own, so we want to avoid name clashing). Last little detail: there is no need or reason to create .../tmpfiles.d/ at install time; it is only needed in the rootfs-pre-cmd hook, so we only create it just before we need it. [0] http://0pointer.de/blog/projects/stateless.html Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Romain Naour Cc: Je??re??my Rosen [yann.morin.1998 at free.fr: - split original patch in two - this one only moves out of /etc and into /usr/lib - adapt commit log accordingly ] Signed-off-by: Yann E. MORIN Acked-by: Norbert Lange [yann.morin.1998 at free.fr: - rename to 00-buildroot-var.conf as suggested by Norbert ] Signed-off-by: Yann E. MORIN --- package/skeleton-init-systemd/skeleton-init-systemd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 795a171809..ec908b4fac 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -29,7 +29,6 @@ else # a real (but empty) directory, and the "factory files" will be copied # back there by the tmpfiles.d mechanism. define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW - mkdir -p $(TARGET_DIR)/etc/systemd/tmpfiles.d echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab echo "tmpfs /var tmpfs mode=1777 0 0" >>$(TARGET_DIR)/etc/fstab endef @@ -38,6 +37,7 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR rm -rf $(TARGET_DIR)/usr/share/factory/var mv $(TARGET_DIR)/var $(TARGET_DIR)/usr/share/factory/var mkdir -p $(TARGET_DIR)/var + mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d for i in $(TARGET_DIR)/usr/share/factory/var/* \ $(TARGET_DIR)/usr/share/factory/var/lib/* \ $(TARGET_DIR)/usr/share/factory/var/lib/systemd/*; do \ @@ -51,7 +51,7 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR printf "C! %s - - - -\n" "$${j}" \ || exit 1; \ fi; \ - done >$(TARGET_DIR)/etc/tmpfiles.d/var-factory.conf + done >$(TARGET_DIR)/usr/lib/tmpfiles.d/00-buildroot-var.conf endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR From peter at korsgaard.com Mon Feb 20 20:57:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:08 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 4.9.x / 5.{10, 15}.x / 6.{0, 1}.x series Message-ID: <20230220205231.5EB3786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=479b042433447214cf318964cc7557b6b5f5d05f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 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 bca1b3fc8b..e18b515311 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.2" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.5" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 8ac04b60f9..157f267a9d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 ee41f3c4f599b2f46f08aae428c9243db403e7292eb2c9f04ee34909b038d1ae linux-6.1.2.tar.xz -sha256 842071bca611c1f080cbc39c7ab3a6b58d7951f4f41e553b3db4fbe3e0705ce4 linux-6.0.16.tar.xz +sha256 bc7f6d9a8a8bbe9a723e82346bba94b58d926f78bfba106b21e041e0290076fc linux-6.1.5.tar.xz +sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 80fcd9efa443502de9e2750f6dfb59e8de43a5d87a6d2be09dca748d79b5f2ee linux-5.15.86.tar.xz -sha256 7aaaf6d0bcd8a2cfa14ad75f02ca62bb2de08aad3bee3eff198de49ea5254079 linux-5.10.161.tar.xz +sha256 e7359bd2935b54fe8bb821cf748591c36a95bed019e752d3e4d5803d9da1ccb4 linux-5.15.87.tar.xz +sha256 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 linux-5.10.162.tar.xz sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 1f6de11306cc9f82fe1d4dd03565cdf43906fa6f77302913d942fd63b77b500c linux-4.9.336.tar.xz +sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz # Locally computed diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 216b496fe4..1ad9fffcd3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -396,14 +396,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.336" if BR2_KERNEL_HEADERS_4_9 + default "4.9.337" if BR2_KERNEL_HEADERS_4_9 default "4.14.302" if BR2_KERNEL_HEADERS_4_14 default "4.19.269" if BR2_KERNEL_HEADERS_4_19 default "5.4.228" if BR2_KERNEL_HEADERS_5_4 - default "5.10.161" if BR2_KERNEL_HEADERS_5_10 - default "5.15.86" if BR2_KERNEL_HEADERS_5_15 - default "6.0.16" if BR2_KERNEL_HEADERS_6_0 - default "6.1.2" if BR2_KERNEL_HEADERS_6_1 + default "5.10.162" if BR2_KERNEL_HEADERS_5_10 + default "5.15.87" if BR2_KERNEL_HEADERS_5_15 + default "6.0.19" if BR2_KERNEL_HEADERS_6_0 + default "6.1.5" if BR2_KERNEL_HEADERS_6_1 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 yann.morin.1998 at free.fr Mon Feb 20 20:57:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:09 -0000 Subject: [Buildroot] [git commit branch/next] package/skeleton-systemd: host the tmpfiles preparation script Message-ID: <20230220205214.109D18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d18176396a4b835615b71f254e1c00add265f4ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 0d9b84b7a83f (package/systemd: invoke systemd-tmpfilesd on final image) forcefully introduced a call to systemd-tmpfiles as a per-rootfs hook, on the premise that would help with read-only rootfs. However, that did not account for the then-pre-existing handling of /var as a factory when the user opted not to remount / read-write (by not setting BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW). This means that, for users who want to use a factory for /var, the generated filesystem contains the factory files twice: once as stored in the factory, and once as populated by systemd-tmpfilesd. In the hope to reconcile the two solutions, we move the handling of calling systemd-tmpfilesd to the skeleton-init-systemd package, where we already handle the /var factory. Having the two in the same package will make it easier, in the future, to provide the user with a choice whether to use one of the other. Note that it is very important to keep the order of the hooks as they are. Indeed, skeleton-init-systemd sorts before systemd, so its hooks were registered before systemd's hooks; now that we move the CREATE_TMPFILES hook, we must ensure it is called after the PRE_ROOTFS_VAR one, so that the behaviour of acting on the var factory remains. As a final note: we chose the move this way, rather than move the var factory into the systemd package, because it is more related to the system integration on the Buildroot side, rather than the integration of the systemd package in Buildroot. Similarly, the other four rootfs hooks, SYSTEMD_LOCALE_PURGE_CATALOGS, SYSTEMD_UPDATE_CATALOGS, SYSTEMD_RM_CATALOG_UPDATE_SERVICE, and specially SYSTEMD_PRESET_ALL, should also be moved out of the systemd package, because they too are more related to the Buildroot system, rather than to the systemd package itself; but the frontier is very porous in either way, for such a package as special as systemd. Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Je??re??my Rosen Cc: Yann E. MORIN Acked-by: Norbert Lange Signed-off-by: Yann E. MORIN --- package/{systemd => skeleton-init-systemd}/fakeroot_tmpfiles.sh | 0 package/skeleton-init-systemd/skeleton-init-systemd.mk | 6 ++++++ package/systemd/systemd.mk | 6 ------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/skeleton-init-systemd/fakeroot_tmpfiles.sh similarity index 100% rename from package/systemd/fakeroot_tmpfiles.sh rename to package/skeleton-init-systemd/fakeroot_tmpfiles.sh diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index ff8bc528c0..559a169aee 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -58,6 +58,12 @@ SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_V endif +define SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ + $(SKELETON_INIT_SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) +endef +SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK + define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/home mkdir -p $(TARGET_DIR)/srv diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 30a75b7a40..b96873b73f 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -744,12 +744,6 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE -define SYSTEMD_CREATE_TMPFILES_HOOK - HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ - $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) -endef -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK - define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef From peter at korsgaard.com Mon Feb 20 20:57:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:09 -0000 Subject: [Buildroot] [git commit branch/next] package/docker-cli: bump version to 20.10.22 Message-ID: <20230220205231.A0375828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e6fcd46fb6c671998c8508743abbc1e3938ce3b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/moby/moby/releases/tag/v20.10.22 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index d9477cf3af..c6db95f9b3 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f0f62ca1c80e8fd5b9e140ca64ef3e75dc7cf7a28040b3d10b260307128946e8 docker-cli-20.10.21.tar.gz +sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index a14edb2c31..cb44c68c1b 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.21 +DOCKER_CLI_VERSION = 20.10.22 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From peter at korsgaard.com Mon Feb 20 20:57:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:10 -0000 Subject: [Buildroot] [git commit branch/next] package/libcurl: security bump version to 7.87.0 Message-ID: <20230220205214.1D44781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b91fd750180dd4689cafc72b28696c239821f9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: - CVE-2022-43551: Another HSTS bypass via IDN https://curl.se/docs/CVE-2022-43551.html - CVE-2022-43552: HTTP Proxy deny use-after-free https://curl.se/docs/CVE-2022-43552.html Changelog: https://curl.se/changes.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index c0e2378cac..230ec8d704 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.84.0.tar.xz.asc +# https://curl.se/download/curl-7.87.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b curl-7.86.0.tar.xz +sha256 ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff curl-7.87.0.tar.xz sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 8de4358107..994b685d34 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.86.0 +LIBCURL_VERSION = 7.87.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From peter at korsgaard.com Mon Feb 20 20:57:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:10 -0000 Subject: [Buildroot] [git commit branch/next] package/network-manager: bump version to 1.40.10 Message-ID: <20230220205231.CDDCC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3587c27c8ef0a24507fa0eaa5602fae80aae45ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Peter Korsgaard --- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index f503665a9a..3895c1ffc3 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.6.sha256sum -sha256 2f025b2d5af7de593bbf47c17e4d98a2b9608ea90a8260fb08080be97439534e NetworkManager-1.40.6.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.10.sha256sum +sha256 fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7 NetworkManager-1.40.10.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 847c6a82ba..138ff46e4a 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -5,7 +5,7 @@ ################################################################################ NETWORK_MANAGER_VERSION_MAJOR = 1.40 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).6 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 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 From yann.morin.1998 at free.fr Mon Feb 20 20:57:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:11 -0000 Subject: [Buildroot] [git commit branch/next] support/testing: remove leftover kernel config fragment Message-ID: <20230220205214.41C348648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0627cb0e8a9e19d1ac19c1a72302b25ab7b938dc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 86d32208b62a (support/testing/tests/init/test_systemd.py: use downloaded kernel) stopped building a custom kernel for the systemd tests, but forgot to drop the associated kernel config fragment. That fragment is now not used in any test case, so we can drop it. Signed-off-by: Yann E. MORIN --- support/testing/conf/binfmt-misc-kernel-fragment.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/support/testing/conf/binfmt-misc-kernel-fragment.config b/support/testing/conf/binfmt-misc-kernel-fragment.config deleted file mode 100644 index 7c992ff71b..0000000000 --- a/support/testing/conf/binfmt-misc-kernel-fragment.config +++ /dev/null @@ -1,2 +0,0 @@ -# Needed for binfmt_misc service: "Arbitrary Executable File Formats File System" -CONFIG_BINFMT_MISC=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:11 -0000 Subject: [Buildroot] [git commit branch/next] package/libyang: bump version to 2.1.4 Message-ID: <20230220205232.16A1386496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3cd1090d9a7fd15eddf4dc843800256d846a9955 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libyang/libyang.hash | 2 +- package/libyang/libyang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index c064c2e69c..da8600351b 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94898ee391c238dcd29ff21092e5dcab4e17b9623e88862a55b72fc6168846f8 libyang-2.0.194.tar.gz +sha256 f30ee1c3e13f0c5d25c4d2fb628e4b262b483d0a500464a7c12008ccc393a69e libyang-2.1.4.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 36f452ca07..6c57a2dd42 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.0.194 +LIBYANG_VERSION = 2.1.4 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:13 -0000 Subject: [Buildroot] [git commit branch/next] support/download: fix concurrent cargo vendor Message-ID: <20230220205232.05A1786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbddd126011611e97cc920e40cd58784e29f242d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 8450b7691870 (package/pkg-cargo: move CARGO_HOME into DL_DIR) allowed for a shared cargo cache of crates. Internally, cargo is supposed to lock themselves when accessing that cache, and that commit even had some research in that area, pointing at [0] for complaints about too-coarse the lock, so it was deemed safe to have a shared cargo home. However, in practice, the locking as implemented by cargo, fails to properly protect the concurrent accesses to the crates cache, with random failures that manifest themselves like so: Blocking waiting for file lock on package cache Blocking waiting for file lock on package cache Downloading crates ... error: failed to sync Caused by: failed to download packages Caused by: failed to download `autocfg v1.1.0` Caused by: unable to get packages from source Caused by: failed to unpack package `autocfg v1.1.0` Caused by: failed to unpack entry at `autocfg-1.1.0/src/tests.rs` Caused by: No such file or directory (os error 2) while canonicalizing [...] with the last few errors sometime being: Caused by: failed to parse manifest at `[...]/aho-corasick-0.7.18/Cargo.toml` Caused by: can't find library `aho_corasick`, rename file to `src/lib.rs` or specify lib.path So, as we do not systematically use our own cargo build (we can use a pre-built one with host-rust-bin), we can't patch cargo (even if we knew what to do!). Instead, we implement a lock ourselves, by wrapping the call to "cargo vendor" with a flock(1) on cargo home. Note: the download wrapper is already flock-ed, but it is a per-package lock, so it does not prevent different packages from being downloaded in parallel; if those packages need cargo vendoring, that will not be protected by the flock on the dl wrapper. So we really do need a flock on cargo home. [0] https://github.com/rust-lang/cargo/issues/6930 Fixes: 8450b769187087751f83cbefcf0a88f70d9da670 Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Moritz Bitsch Signed-off-by: Thomas Petazzoni --- support/download/cargo-post-process | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 21a6be8dbe..aea2d8da7a 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -26,6 +26,8 @@ pushd "${base_name}" > /dev/null # Create the local .cargo/config with vendor info mkdir -p .cargo/ +mkdir -p "${CARGO_HOME}" +flock "${CARGO_HOME}"/.br-lock \ cargo vendor \ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ --locked VENDOR \ From peter at korsgaard.com Mon Feb 20 20:57:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:13 -0000 Subject: [Buildroot] [git commit branch/next] package/luaexpat: bump to version 1.5.1 Message-ID: <20230220205214.823B48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=31b7aecd7ef0b34095e72a1d4fbf41a05d5bd10b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/luaexpat/luaexpat.hash | 2 +- package/luaexpat/luaexpat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luaexpat/luaexpat.hash b/package/luaexpat/luaexpat.hash index be67e9be6f..621293a0b9 100644 --- a/package/luaexpat/luaexpat.hash +++ b/package/luaexpat/luaexpat.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 536a5eda09bb070d2de8ecdd15566d3a55e2afa5ded2ef183cd453bac8c41e98 luaexpat-1.5.0-1.src.rock +sha256 eb7abc4cc39dd50eecb30896686bac84e66fd3c0774d0749b391e7ac5d222f45 luaexpat-1.5.1-1.src.rock sha256 7e6a727e5b57cca713a2f2633f05d7e0cc1e261cc6a7613bbe266e625b2f14da luaexpat/LICENSE diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk index f56bf604b3..73675a8ee6 100644 --- a/package/luaexpat/luaexpat.mk +++ b/package/luaexpat/luaexpat.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAEXPAT_VERSION = 1.5.0-1 +LUAEXPAT_VERSION = 1.5.1-1 LUAEXPAT_SUBDIR = luaexpat LUAEXPAT_LICENSE = MIT LUAEXPAT_LICENSE_FILES = $(LUAEXPAT_SUBDIR)/LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:14 -0000 Subject: [Buildroot] [git commit branch/next] package/netopeer2: bump version to 2.1.42 Message-ID: <20230220205232.47C1C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06aa16e23490d03ef9098e61cdcf698af7317a96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch that is in upstream. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- ...BUGFIX-use-DESTDIR-when-executing-scripts.patch | 47 ---------------------- package/netopeer2/netopeer2.hash | 2 +- package/netopeer2/netopeer2.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) diff --git a/package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch b/package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch deleted file mode 100644 index 99febb56ad..0000000000 --- a/package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 696b6be8a623f4466def2a161baa26094e5592a4 Mon Sep 17 00:00:00 2001 -From: Michal Vasko -Date: Wed, 18 May 2022 09:14:35 +0200 -Subject: [PATCH] build BUGFIX use DESTDIR when executing scripts - -Fixes #1217 - -[Upstream accepted 696b6be8a623f4466def2a161baa26094e5592a4] -Signed-off-by: Heiko Thiery ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index efe922d..60e3150 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -351,7 +351,7 @@ if(INSTALL_MODULES) - set(ENV{NP2_MODULE_GROUP} \"${MODULES_GROUP}\") - set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\") - set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\") -- execute_process(COMMAND \"${SCRIPT_DIR}/setup.sh\" RESULT_VARIABLE SETUP_RES) -+ execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/setup.sh\" RESULT_VARIABLE SETUP_RES) - if(NOT SETUP_RES EQUAL \"0\") - message(FATAL_ERROR \" scripts/setup.sh failed: \${SETUP_RES}\") - endif() -@@ -364,7 +364,7 @@ if(GENERATE_HOSTKEY) - message(STATUS \"Generating a new RSA host key \\\"genkey\\\" if not already added...\") - set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\") - set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\") -- execute_process(COMMAND ${SCRIPT_DIR}/merge_hostkey.sh RESULT_VARIABLE MERGE_HOSTKEY_RES) -+ execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/merge_hostkey.sh\" RESULT_VARIABLE MERGE_HOSTKEY_RES) - if(NOT MERGE_HOSTKEY_RES EQUAL \"0\") - message(FATAL_ERROR \" scripts/merge_hostkey.sh failed: \${MERGE_HOSTKEY_RES}\") - endif() -@@ -375,7 +375,7 @@ if(MERGE_LISTEN_CONFIG) - message(STATUS \"Merging default server listen configuration if there is none...\") - set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\") - set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\") -- execute_process(COMMAND ${SCRIPT_DIR}/merge_config.sh RESULT_VARIABLE MERGE_CONFIG_RES) -+ execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/merge_config.sh\" RESULT_VARIABLE MERGE_CONFIG_RES) - if(NOT MERGE_CONFIG_RES EQUAL \"0\") - message(FATAL_ERROR \" scripts/merge_config.sh failed: \${MERGE_CONFIG_RES}\") - endif() --- -2.30.2 - diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index b352bbb239..cc71a2dab8 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 89f7572d188e7b04be4b10656d7161d65fb557bac222d8c4596a97eaf833b691 netopeer2-2.1.23.tar.gz +sha256 b166fe3425bb55b5f330fb7f53158f613bffc07493925ac437193e4d2defb3e7 netopeer2-2.1.42.tar.gz sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index d9a20d9969..7cb9202575 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETOPEER2_VERSION = 2.1.23 +NETOPEER2_VERSION = 2.1.42 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) NETOPEER2_DL_SUBDIR = netopeer2 NETOPEER2_LICENSE = BSD-3-Clause From yann.morin.1998 at free.fr Mon Feb 20 20:57:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:14 -0000 Subject: [Buildroot] [git commit branch/next] system: add options for /var factory and tmpfiles pre-seed Message-ID: <20230220205214.37D0681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f79611b3037cf505f00cc67011626deb4d8f5b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Currently, when one does not enable remounting the rootfs read-write, i.e. keep it read-only, for example because the filesystem is actually read-only by design, like squashfs, then two things happen: - we create a factory from the content of /var at build time, register tmpfiles entries for it, and mount a tmpfs on /var at runtime, so that systemd-tmpfiles does populate /var from the factory; this is only done when the rootfs is not remounted r/w; - we trigger systemd-tmpfiles at build time, which uses the tmpfiles db, of which our /var entries, to pre-populate the filesystem; this is always done, whether the rootfs is remounted r/w or not. Note that Buildroot mounts a tmpfs on /var, and leaves to the integrator to care for providing an actual filesystem, as there are too many variants and is very specific to each use-case. These two mechanisms are conflicting, semantically, but also technically: the files from the factory will be duplicated, but that may help in some situations when the actual /var filesystem is not mountable. In some cases, it might be preferable to have none, either, or both mechanisms enabled; it highly depends on the ultimate integration scheme chosen for a device. For example, some people will be very happy with a /var that is actually on a tmpfs and that it gets reseeded form scratch at every boot, while others may want to ensure that their system continue to work even when they can't mount something that makes /var writable. YMMV, as they used to say back in the day... So, we introduce two new options, in the system sub-menu, each to drive each mechanism. We default those options to y, to keep the previous behaviour by default, except the var factory is only available when the rootfs is not remounted r/w, as it were so far. We still hint in the help text that there might be some conflict between the two mechanisms, but since it has been that way for some time, it does not look too broken for most people. Since that introduces more options related to systemd being chosen as an init system, we gather those two options and the existing one inside a if-endif block, rather than adding more 'depends on' on each options. Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Je??re??my Rosen Cc: Yann E. MORIN Signed-off-by: Yann E. MORIN --- .../skeleton-init-systemd/skeleton-init-systemd.mk | 7 ++-- system/Config.in | 42 +++++++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 559a169aee..30783dfd26 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -32,6 +32,7 @@ define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab endef +ifeq ($(BR2_INIT_SYSTEMD_VAR_FACTORY),y) define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR rm -rf $(TARGET_DIR)/usr/share/factory/var mv $(TARGET_DIR)/var $(TARGET_DIR)/usr/share/factory/var @@ -55,14 +56,16 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR $(TARGET_DIR)/usr/lib/systemd/system/var.mount endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR +endif # BR2_INIT_SYSTEMD_VAR_FACTORY +endif # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW -endif - +ifeq ($(BR2_INIT_SYSTEMD_POPULATE_TMPFILES),y) define SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ $(SKELETON_INIT_SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK +endif # BR2_INIT_SYSTEMD_POPULATE_TMPFILES define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/home diff --git a/system/Config.in b/system/Config.in index 888c24ce81..806a747315 100644 --- a/system/Config.in +++ b/system/Config.in @@ -154,10 +154,48 @@ source "$BR2_BASE_DIR/.br2-external.in.init" endchoice +if BR2_INIT_SYSTEMD + +config BR2_INIT_SYSTEMD_VAR_FACTORY + bool "build a factory to populate a tmpfs on /var" + default y # legacy + depends on !BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW + help + Build a factory of the content of /var as installed by + packages, mount a tmpfs on /var at runtime, so that + systemd-tmpfiles can populate it from the factory. + + This may help on a read-only rootfs. + + It probably does not play very well with triggering a call + to systemd-tmpfiles at build time (below). + + Note: Buildroot mounts a tmpfs on /var to at least make the + system bootable out of the box; mounting a filesystem from + actual storage is left to the integration, as it is too + specific and may need preparatory work like partitionning a + device and/or formatting a filesystem first, so that falls + out of the scope of Buildroot. + + To use persistent storage, provide a systemd dropin for the + var.mount unit, that overrides the What and Type, and possibly + the Options and After, fields. + +config BR2_INIT_SYSTEMD_POPULATE_TMPFILES + bool "trigger systemd-tmpfiles during build" + default y # legacy + help + Act on the systemd-tmpfiles.d database at build time, when + assembling the root filesystems. + + This may help on a read-only filesystem. + + It probably does not play very well with the /var factory + (above). + config BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET string "The default unit systemd starts at bootup" default "multi-user.target" - depends on BR2_INIT_SYSTEMD help Specify the name of the unit configuration file to be started at bootup by systemd. Should end in ".target". @@ -165,6 +203,8 @@ config BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET https://www.freedesktop.org/software/systemd/man/systemd.special.html#default.target +endif # BR2_INIT_SYSTEMD + choice prompt "/dev management" if !BR2_INIT_SYSTEMD default BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS From yann.morin.1998 at free.fr Mon Feb 20 20:57:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:15 -0000 Subject: [Buildroot] [git commit branch/next] Cleanup/simplify copyright info Message-ID: <20230220205232.7A4A286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1d7155952d9abcad4d5d75b56508114469c2a1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Historically we have been (more-or-less consistently, sometimes forgetting some files) updating the end year of the copyright statements at the beginning of a new year. We're naturally not alone in that. Recently this was discussed in curl, and it turns out that copyright years are not really required: https://daniel.haxx.se/blog/2023/01/08/copyright-without-years/ So drop the years and simplify the copyright statements. While we're at it, also ensure the same syntax (capital C, email address) is used everywhere. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Makefile | 4 +--- docs/manual/manual.txt | 2 +- docs/website/copyright.txt | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index efa0b2a7a0..8517d563d5 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,6 @@ # Makefile for buildroot # -# Copyright (C) 1999-2005 by Erik Andersen -# Copyright (C) 2006-2014 by the Buildroot developers -# Copyright (C) 2014-2020 by the Buildroot developers +# Copyright (C) the Buildroot developers # # 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 diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt index fab66dbda5..d6534ca295 100644 --- a/docs/manual/manual.txt +++ b/docs/manual/manual.txt @@ -12,7 +12,7 @@ It is licensed under the GNU General Public License, version 2. Refer to the http://git.buildroot.org/buildroot/tree/COPYING?id={sys:git rev-parse HEAD}[COPYING] file in the Buildroot sources for the full text of this license. -Copyright (C) 2004-2020 The Buildroot developers +Copyright (C) The Buildroot developers image::logo.png[] diff --git a/docs/website/copyright.txt b/docs/website/copyright.txt index b15ac5f919..3fe19bab8b 100644 --- a/docs/website/copyright.txt +++ b/docs/website/copyright.txt @@ -1,7 +1,7 @@ The code and graphics on this website (and it's mirror sites, if any) are -Copyright (c) 1999-2005 by Erik Andersen, 2006-2020 The Buildroot -developers. All rights reserved. +Copyright (C) The Buildroot developers . All +rights reserved. Documents on this Web site including their graphical elements, design, and layout are protected by trade dress and other laws and MAY BE COPIED OR From peter at korsgaard.com Mon Feb 20 20:57:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:15 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: security bump to version 4.5.0 Message-ID: <20230220205214.5BE2781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b62ea01369b11f5a4320bb2c909168b21c2642c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-2056, CVE-2022-2057, CVE-2022-2058, CVE-2022-2519, CVE-2022-2520, CVE-2022-2521, CVE-2022-2953, CVE-2022-34526, CVE-2022-3570, CVE-2022-3597, CVE-2022-3598, CVE-2022-3599, CVE-2022-3626, CVE-2022-3627 and CVE-2022-3970 - COPYRIGHT renamed to LICENSE.md and year updated with https://gitlab.com/libtiff/libtiff/-/commit/fa1d6d787fc67a1eeb3abccb790b5bee969d424b - Use new --{en,dis}able options added by https://gitlab.com/libtiff/libtiff/-/commit/1ab0e2696a368a556b793a0941b5365e4d9f56ef http://www.simplesystems.org/libtiff/releases/v4.5.0.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tiff/tiff.hash | 4 ++-- package/tiff/tiff.mk | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 6bd28a0f59..73732892a5 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed tiff-4.4.0.tar.gz -sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 COPYRIGHT +sha256 c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464 tiff-4.5.0.tar.gz +sha256 0780558a8bfba0af1160ec1ff11ade4f41c0d7deafd6ecfc796b492a788e380d LICENSE.md diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 525712c9e9..7981bdf2c9 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,16 +4,18 @@ # ################################################################################ -TIFF_VERSION = 4.4.0 +TIFF_VERSION = 4.5.0 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license -TIFF_LICENSE_FILES = COPYRIGHT +TIFF_LICENSE_FILES = LICENSE.md TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES TIFF_CONF_OPTS = \ + --disable-contrib \ --disable-cxx \ + --disable-tests \ --without-x TIFF_DEPENDENCIES = host-pkgconf @@ -23,7 +25,8 @@ HOST_TIFF_CONF_OPTS = \ --without-x \ --disable-zlib \ --disable-lzma \ - --disable-jpeg + --disable-jpeg \ + --disable-tests HOST_TIFF_DEPENDENCIES = host-pkgconf ifneq ($(BR2_PACKAGE_TIFF_CCITT),y) @@ -84,12 +87,11 @@ ifneq ($(BR2_PACKAGE_TIFF_JBIG),y) TIFF_CONF_OPTS += --disable-jbig endif -TIFF_SUBDIRS = port libtiff ifeq ($(BR2_PACKAGE_TIFF_UTILITIES),y) -TIFF_SUBDIRS += tools +TIFF_CONF_OPTS += --enable-tools +else +TIFF_CONF_OPTS += --disable-tools endif -TIFF_MAKE = $(MAKE) SUBDIRS="$(TIFF_SUBDIRS)" - $(eval $(autotools-package)) $(eval $(host-autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:16 -0000 Subject: [Buildroot] [git commit branch/next] package/ipmitool: use the standard github helper Message-ID: <20230220205232.A954986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dce238f045f25d75b31681ea56ea5b9c668912dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Vincent Fazio Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni --- package/ipmitool/ipmitool.hash | 2 +- package/ipmitool/ipmitool.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/ipmitool/ipmitool.hash b/package/ipmitool/ipmitool.hash index bb0b0d80b0..c3b298e3ba 100644 --- a/package/ipmitool/ipmitool.hash +++ b/package/ipmitool/ipmitool.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 48b010e7bcdf93e4e4b6e43c53c7f60aa6873d574cbd45a8d86fa7aaeebaff9c IPMITOOL_1_8_19.tar.gz +sha256 48b010e7bcdf93e4e4b6e43c53c7f60aa6873d574cbd45a8d86fa7aaeebaff9c ipmitool-1_8_19.tar.gz sha256 b7e2382a8be43b5f6cb092f2d2bda163bf1a1938be9300f821a845cbcd535f56 COPYING diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index b9f60d8151..5e34434a03 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -5,8 +5,7 @@ ################################################################################ IPMITOOL_VERSION = 1_8_19 -IPMITOOL_SOURCE = IPMITOOL_$(IPMITOOL_VERSION).tar.gz -IPMITOOL_SITE = https://github.com/ipmitool/ipmitool/archive/refs/tags +IPMITOOL_SITE = $(call github,ipmitool,ipmitool,IPMITOOL_$(IPMITOOL_VERSION)) IPMITOOL_LICENSE = BSD-3-Clause IPMITOOL_LICENSE_FILES = COPYING IPMITOOL_CPE_ID_VENDOR = ipmitool_project From yann.morin.1998 at free.fr Mon Feb 20 20:57:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:17 -0000 Subject: [Buildroot] [git commit branch/next] package/python-cython: bump to version 0.29.33 Message-ID: <20230220205234.312EA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d31937ab88097a9ed3a34bf05fa07278abed77ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cython/python-cython.hash | 4 ++-- package/python-cython/python-cython.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 3ed9fb56a1..e7e86264d2 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 91c36ea86c00adcc5c1c11cf48b733c0 Cython-0.29.32.tar.gz -sha256 8733cf4758b79304f2a4e39ebfac5e92341bce47bcceb26c1254398b2f8c1af7 Cython-0.29.32.tar.gz +md5 bd42c555cb2298b8a94fa8de7ee679ba Cython-0.29.33.tar.gz +sha256 5040764c4a4d2ce964a395da24f0d1ae58144995dab92c6b96f44c3f4d72286a Cython-0.29.33.tar.gz # Locally computed sha256 checksums sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 9a90f6198e..b11d75b33d 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.32 +PYTHON_CYTHON_VERSION = 0.29.33 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0 +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/dc/f6/e8e302f9942cbebede88b1a0c33d0be3a738c3ac37abae87254d58ffc51c PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt From peter at korsgaard.com Mon Feb 20 20:57:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:17 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8821cu: new package Message-ID: <20230220205214.9DB1C81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=183de9155b138497783717383418544da00e0da7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Adds support for USB rtl8821cu wifi cards. Similar to rtl8821au and rtl8812au-aircrack-ng packages. https://github.com/morrownr/8821cu-20210118 Signed-off-by: Christian Stewart Reviewed-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/rtl8821cu/Config.in | 10 ++++++++++ package/rtl8821cu/rtl8821cu.hash | 3 +++ package/rtl8821cu/rtl8821cu.mk | 25 +++++++++++++++++++++++++ 5 files changed, 40 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a200edb7f5..5eed4a8455 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -564,6 +564,7 @@ F: package/mosh/ F: package/nerdctl/ F: package/pkg-golang.mk F: package/rtl8821au/ +F: package/rtl8821cu/ F: package/runc/ F: package/tini/ F: support/testing/tests/package/test_docker_compose.py diff --git a/package/Config.in b/package/Config.in index 999feae08a..0c77f7c022 100644 --- a/package/Config.in +++ b/package/Config.in @@ -588,6 +588,7 @@ endmenu source "package/rtl8723ds-bt/Config.in" source "package/rtl8812au-aircrack-ng/Config.in" source "package/rtl8821au/Config.in" + source "package/rtl8821cu/Config.in" source "package/sane-backends/Config.in" source "package/sdparm/Config.in" source "package/sedutil/Config.in" diff --git a/package/rtl8821cu/Config.in b/package/rtl8821cu/Config.in new file mode 100644 index 0000000000..a5a7b9d255 --- /dev/null +++ b/package/rtl8821cu/Config.in @@ -0,0 +1,10 @@ +comment "rtl8821cu needs a Linux kernel to be built" + depends on !BR2_LINUX_KERNEL + +config BR2_PACKAGE_RTL8821CU + bool "rtl8821cu" + depends on BR2_LINUX_KERNEL + help + rtl8821cu wifi driver + + https://github.com/brektrou/rtl8821CU diff --git a/package/rtl8821cu/rtl8821cu.hash b/package/rtl8821cu/rtl8821cu.hash new file mode 100644 index 0000000000..efb9871472 --- /dev/null +++ b/package/rtl8821cu/rtl8821cu.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 09b9fb4160003502d564d0d0d85d6f19b8b6d1627d1a339b3ddfca6a948d84fb rtl8821cu-86cc5ceb7c28b9b997838e1c796847f6c395c382.tar.gz +sha256 af54d00efc57cfce664171ac8be2a20c0f290b1b5c1a67bb2eba7b6380276c4e LICENSE diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk new file mode 100644 index 0000000000..18222e0014 --- /dev/null +++ b/package/rtl8821cu/rtl8821cu.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# rtl8821cu +# +################################################################################ + +RTL8821CU_VERSION = 86cc5ceb7c28b9b997838e1c796847f6c395c382 +RTL8821CU_SITE = $(call github,morrownr,8821cu-20210118,$(RTL8821CU_VERSION)) +RTL8821CU_LICENSE = GPL-2.0 +RTL8821CU_LICENSE_FILES = LICENSE + +RTL8821CU_USER_EXTRA_CFLAGS = \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error + +RTL8821CU_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_GENERIC=n \ + CONFIG_RTL8821CU=m \ + KVER=$(LINUX_VERSION_PROBED) \ + USER_EXTRA_CFLAGS="$(RTL8821CU_USER_EXTRA_CFLAGS)" + +$(eval $(kernel-module)) +$(eval $(generic-package)) From peter at korsgaard.com Mon Feb 20 20:57:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:17 -0000 Subject: [Buildroot] [git commit branch/next] package/dovecot: bump version to 2.3.20 Message-ID: <20230220205214.A9DB48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de584a78a37b99b99a4011020a17b3ae99f002c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://dovecot.org/pipermail/dovecot-news/2022-December/000479.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 124f834dca..7036df57a8 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 db5abcd87d7309659ea6b45b2cb6ee9c5f97486b2b719a5dd05a759e1f6a5c51 dovecot-2.3.19.1.tar.gz +sha256 caa832eb968148abdf35ee9d0f534b779fa732c0ce4a913d9ab8c3469b218552 dovecot-2.3.20.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 e28f500b7b..4b17784f93 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).19.1 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).20 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 yann.morin.1998 at free.fr Mon Feb 20 20:57:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:18 -0000 Subject: [Buildroot] [git commit branch/next] package/python-django: bump to version 4.1.5 Message-ID: <20230220205234.613E28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=203cf2d8b7e9668ba51dc8a72636896e656e7e1b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 40526bc0ff..1d3035bb98 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 02e2222d064d800f37c6a0ba78ce87f3 Django-4.1.4.tar.gz -sha256 d38a4e108d2386cb9637da66a82dc8d0733caede4c83c4afdbda78af4214211b Django-4.1.4.tar.gz +md5 6b6a47d7478ead15b0a0835841c433dc Django-4.1.5.tar.gz +sha256 ff56ebd7ead0fd5dbe06fe157b0024a7aaea2e0593bb3785fb594cf94dad58ef Django-4.1.5.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 96ec53f82c..e08de68954 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.4 +PYTHON_DJANGO_VERSION = 4.1.5 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/de/7d/ca5d224f7d345b0defd0a57c6deb0c6115fbe5304e4d9571f728b617f1a3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/41/c8/b3c469353f9d1b7f0e99b45520582b891da02cd87408bc867affa6e039a3 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:57:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:18 -0000 Subject: [Buildroot] [git commit branch/next] package/python-keyring: bump to version 23.13.1 Message-ID: <20230220205234.AE83986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c20f5be37a14fb32e4382a37a4cb79eddd0f06e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-keyring/python-keyring.hash | 4 ++-- package/python-keyring/python-keyring.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-keyring/python-keyring.hash b/package/python-keyring/python-keyring.hash index 791ee6563b..837743f5c2 100644 --- a/package/python-keyring/python-keyring.hash +++ b/package/python-keyring/python-keyring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/keyring/json -md5 edf0645c28f16884e2b121b2c51e0770 keyring-23.11.0.tar.gz -sha256 ad192263e2cdd5f12875dedc2da13534359a7e760e77f8d04b50968a821c2361 keyring-23.11.0.tar.gz +md5 a0640ab7525b4fe58061b5999cca5026 keyring-23.13.1.tar.gz +sha256 ba2e15a9b35e21908d0aaf4e0a47acc52d6ae33444df0da2b49d41a46ef6d678 keyring-23.13.1.tar.gz # Locally computed sha256 checksums sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-keyring/python-keyring.mk b/package/python-keyring/python-keyring.mk index c1f124cb3e..766139f525 100644 --- a/package/python-keyring/python-keyring.mk +++ b/package/python-keyring/python-keyring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_KEYRING_VERSION = 23.11.0 +PYTHON_KEYRING_VERSION = 23.13.1 PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz -PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/1c/35/c22960f14f5e17384296b2f09da259f8b5244fb3831eccec71cf948a49c6 +PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/55/fe/282f4c205add8e8bb3a1635cbbac59d6def2e0891b145aa553a0e40dd2d0 PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:57:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:18 -0000 Subject: [Buildroot] [git commit branch/next] package/exfat-utils: add CPE variables Message-ID: <20230220205214.E8E8C81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8036b087489c96dfc4a0baf9fbe284a049a58298 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next cpe:2.3:a:exfat_project:exfat is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aexfat_project%3Aexfat Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/exfat-utils/exfat-utils.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/exfat-utils/exfat-utils.mk b/package/exfat-utils/exfat-utils.mk index d13ec6bab8..fa471952f2 100644 --- a/package/exfat-utils/exfat-utils.mk +++ b/package/exfat-utils/exfat-utils.mk @@ -8,6 +8,8 @@ EXFAT_UTILS_VERSION = 1.3.0 EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION) EXFAT_UTILS_LICENSE = GPL-2.0+ EXFAT_UTILS_LICENSE_FILES = COPYING +EXFAT_UTILS_CPE_ID_VENDOR = exfat_project +EXFAT_UTILS_CPE_ID_PRODUCT = exfat EXFAT_UTILS_CONF_OPTS += --exec-prefix=/ From yann.morin.1998 at free.fr Mon Feb 20 20:57:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:19 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pybind: bump to version 2.10.3 Message-ID: <20230220205235.0251386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4364444cb31f60826e37cf3efa193c78a7c7947f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pybind/python-pybind.hash | 2 +- package/python-pybind/python-pybind.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash index 530cbf64af..971eceaa07 100644 --- a/package/python-pybind/python-pybind.hash +++ b/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad python-pybind-2.10.1.tar.gz +sha256 5d8c4c5dda428d3a944ba3d2a5212cb988c2fae4670d58075a5a49075a6ca315 python-pybind-2.10.3.tar.gz # License files, locally calculated sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index e89d77147e..1fd106b981 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.10.1 +PYTHON_PYBIND_VERSION = 2.10.3 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:57:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:19 -0000 Subject: [Buildroot] [git commit branch/next] package/ncurses: ignore CVE-2022-29458 Message-ID: <20230220205215.49FE281979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a782cfd23109d9e78726bd820cb89c8146f98b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixed in patch 20220416 Signed-off-by: Dennis Van Hoorick Signed-off-by: Yann E. MORIN --- package/ncurses/ncurses.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 79593d8084..4d93a992e4 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -12,6 +12,8 @@ NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING NCURSES_CPE_ID_VENDOR = gnu NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config +# patch 20220416 +NCURSES_IGNORE_CVES += CVE-2022-29458 NCURSES_PATCH = \ $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ ncurses-6.3-20211026.patch.gz \ From yann.morin.1998 at free.fr Mon Feb 20 20:57:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:20 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pydantic: bump to version 1.10.4 Message-ID: <20230220205235.1101A86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7cb432250dafc98b6517cfbe0b7d320426245d0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pydantic/python-pydantic.hash | 4 ++-- package/python-pydantic/python-pydantic.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index a5eb025fcb..e73a3099a8 100644 --- a/package/python-pydantic/python-pydantic.hash +++ b/package/python-pydantic/python-pydantic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic/json -md5 9691f29e97c1280ab56b7d0a2dade9c1 pydantic-1.10.2.tar.gz -sha256 91b8e218852ef6007c2b98cd861601c6a09f1aa32bbbb74fab5b1c33d4a1e410 pydantic-1.10.2.tar.gz +md5 2e036b5f993b93dd83f6a7009252ae78 pydantic-1.10.4.tar.gz +sha256 b9a3859f24eb4e097502a3be1fb4b2abb79b6103dd9e2e0edb70613a4459a648 pydantic-1.10.4.tar.gz # Locally computed sha256 checksums sha256 9e3946690ac88b6b73e8f001a0586af13568be8852fd514e4393f39761764387 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index 04014214e1..a1a4dc9b16 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 1.10.2 +PYTHON_PYDANTIC_VERSION = 1.10.4 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/7d/7d/58dd62f792b002fa28cce4e83cb90f4359809e6d12db86eedf26a752895c +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/53/17/34e54e352f6a3d304044e52d5ddd5cd621a62ec8fb7af08cc73af65dd3e1 PYTHON_PYDANTIC_SETUP_TYPE = setuptools PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:57:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:20 -0000 Subject: [Buildroot] [git commit branch/next] package/hiredis: bump to version 1.1.0 Message-ID: <20230220205214.C3C4C81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd7e90779861bb603fc1cca03f6fad4d951f7bd9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Replace first patch - Drop second and third patches (already in version) https://github.com/redis/hiredis/blob/v1.1.0/CHANGELOG.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-CMakeLists.txt-do-not-force-SHARED.patch | 47 ------ ...-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch | 171 +++++++++++++++++++++ ...s.txt-allow-building-without-a-C-compiler.patch | 57 ------- .../hiredis/0003-Explicitly-set-c99-in-CMake.patch | 28 ---- package/hiredis/hiredis.hash | 2 +- package/hiredis/hiredis.mk | 4 +- 6 files changed, 174 insertions(+), 135 deletions(-) diff --git a/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch b/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch deleted file mode 100644 index b7fdb87910..0000000000 --- a/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0ce382c275b087e866517c003e565f8cc4855bdd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 29 Aug 2020 23:19:26 +0200 -Subject: [PATCH] CMakeLists.txt: do not force SHARED - -Allow the user to build static libraries by removing SHARED from -ADD_LIBRARY calls. - -Here is an extract of -https://cmake.org/cmake/help/latest/command/add_library.html: - -"If no type is given explicitly the type is STATIC or SHARED based on -whether the current value of the variable BUILD_SHARED_LIBS is ON." - -Signed-off-by: Fabrice Fontaine -[Upstream status: probably not upstreamable as is because it will -conflict with https://github.com/redis/hiredis/pull/851. So, this patch -will probably have to be reworked for 1.0.x] ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1beccc6..fed79fd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,7 +40,7 @@ IF(WIN32) - ADD_COMPILE_DEFINITIONS(_CRT_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN) - ENDIF() - --ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) -+ADD_LIBRARY(hiredis ${hiredis_sources}) - - SET_TARGET_PROPERTIES(hiredis - PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE -@@ -97,7 +97,7 @@ IF(ENABLE_SSL) - FIND_PACKAGE(OpenSSL REQUIRED) - SET(hiredis_ssl_sources - ssl.c) -- ADD_LIBRARY(hiredis_ssl SHARED -+ ADD_LIBRARY(hiredis_ssl - ${hiredis_ssl_sources}) - - IF (APPLE) --- -2.28.0 - diff --git a/package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch new file mode 100644 index 0000000000..38e9282041 --- /dev/null +++ b/package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch @@ -0,0 +1,171 @@ +From 286ba29771611abfaf126527141cac1d406c7eaf Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 22 Dec 2022 23:00:56 +0100 +Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS + +To allow building hiredis on toolchain without dynamic library support, +respect standard cmake BUILD_SHARED_LIBS: +https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/redis/hiredis/pull/1147] +--- + CMakeLists.txt | 70 ++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 48 insertions(+), 22 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d52d0c..66a1383 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,6 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0) + ++OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON) + OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF) + OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF) + OPTION(ENABLE_SSL_TESTS "Should we test SSL connections" OFF) +@@ -44,35 +45,49 @@ IF(WIN32) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -DWIN32_LEAN_AND_MEAN) + ENDIF() + +-ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) + ADD_LIBRARY(hiredis_static STATIC ${hiredis_sources}) +-ADD_LIBRARY(hiredis::hiredis ALIAS hiredis) + ADD_LIBRARY(hiredis::hiredis_static ALIAS hiredis_static) ++SET(HIREDIS_DEFAULT_LIBRARY hiredis_static) ++SET(HIREDIS_TARGETS hiredis_static) + + IF(NOT MSVC) + SET_TARGET_PROPERTIES(hiredis_static + PROPERTIES OUTPUT_NAME hiredis) + ENDIF() + +-SET_TARGET_PROPERTIES(hiredis +- PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE +- VERSION "${HIREDIS_SONAME}") ++IF(BUILD_SHARED_LIBS) ++ ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) ++ ADD_LIBRARY(hiredis::hiredis ALIAS hiredis) ++ SET(HIREDIS_DEFAULT_LIBRARY hiredis) ++ SET(HIREDIS_TARGETS ${HIREDIS_TARGETS} hiredis) ++ SET_TARGET_PROPERTIES(hiredis ++ PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE ++ VERSION "${HIREDIS_SONAME}") ++ENDIF() + IF(MSVC) + SET_TARGET_PROPERTIES(hiredis_static + PROPERTIES COMPILE_FLAGS /Z7) + ENDIF() + IF(WIN32 OR MINGW) +- TARGET_LINK_LIBRARIES(hiredis PUBLIC ws2_32 crypt32) ++ IF(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(hiredis PUBLIC ws2_32 crypt32) ++ ENDIF() + TARGET_LINK_LIBRARIES(hiredis_static PUBLIC ws2_32 crypt32) + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +- TARGET_LINK_LIBRARIES(hiredis PUBLIC m) ++ IF(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(hiredis PUBLIC m) ++ ENDIF() + TARGET_LINK_LIBRARIES(hiredis_static PUBLIC m) + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "SunOS") +- TARGET_LINK_LIBRARIES(hiredis PUBLIC socket) ++ IF(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(hiredis PUBLIC socket) ++ ENDIF() + TARGET_LINK_LIBRARIES(hiredis_static PUBLIC socket) + ENDIF() + +-TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $ $) ++IF(BUILD_SHARED_LIBS) ++ TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $ $) ++ENDIF() + TARGET_INCLUDE_DIRECTORIES(hiredis_static PUBLIC $ $) + + CONFIGURE_FILE(hiredis.pc.in hiredis.pc @ONLY) +@@ -103,7 +118,7 @@ set(CPACK_RPM_PACKAGE_AUTOREQPROV ON) + + include(CPack) + +-INSTALL(TARGETS hiredis hiredis_static ++INSTALL(TARGETS ${HIREDIS_TARGETS} + EXPORT hiredis-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -161,39 +176,50 @@ IF(ENABLE_SSL) + FIND_PACKAGE(OpenSSL REQUIRED) + SET(hiredis_ssl_sources + ssl.c) +- ADD_LIBRARY(hiredis_ssl SHARED +- ${hiredis_ssl_sources}) ++ + ADD_LIBRARY(hiredis_ssl_static STATIC + ${hiredis_ssl_sources}) ++ SET(HIREDIS_SSL_DEFAULT_LIBRARY hiredis_ssl_static) ++ SET(HIREDIS_SSL_TARGETS hiredis_ssl_static) ++ IF(BUILD_SHARED_LIBS) ++ ADD_LIBRARY(hiredis_ssl SHARED ++ ${hiredis_ssl_sources}) ++ SET(HIREDIS_SSL_DEFAULT_LIBRARY hiredis_ssl) ++ SET(HIREDIS_SSL_TARGETS ${HIREDIS_SSL_TARGETS} hiredis_ssl) ++ ENDIF() + IF(NOT MSVC) + SET_TARGET_PROPERTIES(hiredis_ssl_static + PROPERTIES OUTPUT_NAME hiredis_ssl) + ENDIF() + +- IF (APPLE) ++ IF (APPLE AND BUILD_SHARED_LIBS) + SET_PROPERTY(TARGET hiredis_ssl PROPERTY LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup") + ENDIF() + +- SET_TARGET_PROPERTIES(hiredis_ssl +- PROPERTIES +- WINDOWS_EXPORT_ALL_SYMBOLS TRUE +- VERSION "${HIREDIS_SONAME}") ++ IF(BUILD_SHARED_LIBS) ++ SET_TARGET_PROPERTIES(hiredis_ssl ++ PROPERTIES ++ WINDOWS_EXPORT_ALL_SYMBOLS TRUE ++ VERSION "${HIREDIS_SONAME}") ++ ENDIF() + IF(MSVC) + SET_TARGET_PROPERTIES(hiredis_ssl_static + PROPERTIES COMPILE_FLAGS /Z7) + ENDIF() + +- TARGET_INCLUDE_DIRECTORIES(hiredis_ssl PRIVATE "${OPENSSL_INCLUDE_DIR}") + TARGET_INCLUDE_DIRECTORIES(hiredis_ssl_static PRIVATE "${OPENSSL_INCLUDE_DIR}") ++ IF(BUILD_SHARED_LIBS) ++ TARGET_INCLUDE_DIRECTORIES(hiredis_ssl PRIVATE "${OPENSSL_INCLUDE_DIR}") ++ TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE ${OPENSSL_LIBRARIES}) ++ ENDIF() + +- TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE ${OPENSSL_LIBRARIES}) + IF (WIN32 OR MINGW) + TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE hiredis) + TARGET_LINK_LIBRARIES(hiredis_ssl_static PUBLIC hiredis_static) + ENDIF() + CONFIGURE_FILE(hiredis_ssl.pc.in hiredis_ssl.pc @ONLY) + +- INSTALL(TARGETS hiredis_ssl hiredis_ssl_static ++ INSTALL(TARGETS ${HIREDIS_SSL_TARGETS} + EXPORT hiredis_ssl-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -236,10 +262,10 @@ ENDIF() + IF(NOT DISABLE_TESTS) + ENABLE_TESTING() + ADD_EXECUTABLE(hiredis-test test.c) +- TARGET_LINK_LIBRARIES(hiredis-test hiredis) ++ TARGET_LINK_LIBRARIES(hiredis-test ${HIREDIS_DEFAULT_LIBRARY}) + IF(ENABLE_SSL_TESTS) + ADD_DEFINITIONS(-DHIREDIS_TEST_SSL=1) +- TARGET_LINK_LIBRARIES(hiredis-test hiredis_ssl) ++ TARGET_LINK_LIBRARIES(hiredis-test ${HIREDIS_SSL_DEFAULT_LIBRARY}) + ENDIF() + IF(ENABLE_ASYNC_TESTS) + ADD_DEFINITIONS(-DHIREDIS_TEST_ASYNC=1) +-- +2.35.1 + diff --git a/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch b/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch deleted file mode 100644 index 08a9ef9854..0000000000 --- a/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch +++ /dev/null @@ -1,57 +0,0 @@ -From bb4a8937411a9e6ac2e5c12c0e7eeaa7dab251ba Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 5 Sep 2020 12:54:21 +0200 -Subject: [PATCH] CMakeLists.txt: allow building without a C++ compiler - -Define hiredis as a C project (and use a single PROJECT statement) to -avoid the following build failure if a C++ compiler is not found: - -CMake Error at CMakeLists.txt:3 (PROJECT): - The CMAKE_CXX_COMPILER: - - /srv/storage/autobuild/run/instance-1/output-1/host/bin/arm-linux-g++ - - is not a full path to an existing compiler tool. - - Tell CMake where to find the compiler by setting either the environment - variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path - to the compiler, or to the compiler name if it is in the PATH. - -The only cpp source file is examples/example-qt.cpp which is never -compiled with cmake buildsystem. This file is compiled only with the -Makefile buildsystem so perhaps it should be removed. If it is added to -the cmake buildsystem, a call to enable_language(CXX) will have to be -added. - -Fixes: - - http://autobuild.buildroot.org/results/830ec3398cd29b9fc5cde06a225ef531d7a9d850 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/redis/hiredis/pull/872] ---- - CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4cbd438..9d65b7f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,5 @@ - CMAKE_MINIMUM_REQUIRED(VERSION 3.4.0) - INCLUDE(GNUInstallDirs) --PROJECT(hiredis) - - OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF) - OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF) -@@ -20,7 +19,7 @@ getVersionBit(HIREDIS_SONAME) - SET(VERSION "${HIREDIS_MAJOR}.${HIREDIS_MINOR}.${HIREDIS_PATCH}") - MESSAGE("Detected version: ${VERSION}") - --PROJECT(hiredis VERSION "${VERSION}") -+PROJECT(hiredis LANGUAGES "C" VERSION "${VERSION}") - - # Hiredis requires C99 - SET(CMAKE_C_STANDARD 99) --- -2.28.0 - diff --git a/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch b/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch deleted file mode 100644 index 7e6ef8bca4..0000000000 --- a/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 13a35bdb64615e381c5e1151cdd4e78bba71a6db Mon Sep 17 00:00:00 2001 -From: michael-grunder -Date: Fri, 28 Aug 2020 12:35:01 -0700 -Subject: [PATCH] Explicitly set c99 in CMake - -See #869 - -[Retrieved from: -https://github.com/redis/hiredis/commit/13a35bdb64615e381c5e1151cdd4e78bba71a6db] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1beccc69a..4cbd438d7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,6 +22,9 @@ MESSAGE("Detected version: ${VERSION}") - - PROJECT(hiredis VERSION "${VERSION}") - -+# Hiredis requires C99 -+SET(CMAKE_C_STANDARD 99) -+ - SET(ENABLE_EXAMPLES OFF CACHE BOOL "Enable building hiredis examples") - - SET(hiredis_sources diff --git a/package/hiredis/hiredis.hash b/package/hiredis/hiredis.hash index a45cf68f99..cdcbef1525 100644 --- a/package/hiredis/hiredis.hash +++ b/package/hiredis/hiredis.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e0ab696e2f07deb4252dda45b703d09854e53b9703c7d52182ce5a22616c3819 hiredis-1.0.2.tar.gz +sha256 fe6d21741ec7f3fc9df409d921f47dfc73a4d8ff64f4ac6f1d95f951bf7f53d6 hiredis-1.1.0.tar.gz sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb COPYING diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index a571951fa3..d59933845c 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -4,8 +4,8 @@ # ################################################################################ -HIREDIS_VERSION_MAJOR = 1.0 -HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).2 +HIREDIS_VERSION_MAJOR = 1.1 +HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).0 HIREDIS_SITE = $(call github,redis,hiredis,v$(HIREDIS_VERSION)) HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:57:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:21 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pyopenssl: bump to version 23.0.0 Message-ID: <20230220205235.3F7C186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=208bf69626d25761f6e502b967b6d8ecf7d5df00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyopenssl/python-pyopenssl.hash | 4 ++-- package/python-pyopenssl/python-pyopenssl.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash index bc65bb5868..f9b1e4a86b 100644 --- a/package/python-pyopenssl/python-pyopenssl.hash +++ b/package/python-pyopenssl/python-pyopenssl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyopenssl/json -md5 6834da75e33d3c8dcd891b723bfcec9e pyOpenSSL-22.1.0.tar.gz -sha256 7a83b7b272dd595222d672f5ce29aa030f1fb837630ef229f62e72e395ce8968 pyOpenSSL-22.1.0.tar.gz +md5 1be2c02bf3c0c4e5e7c51b9ac90ebd72 pyOpenSSL-23.0.0.tar.gz +sha256 c1cc5f86bcacefc84dada7d31175cae1b1518d5f60d3d0bb595a67822a868a6f pyOpenSSL-23.0.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-pyopenssl/python-pyopenssl.mk b/package/python-pyopenssl/python-pyopenssl.mk index 85f856b319..1d89f5b696 100644 --- a/package/python-pyopenssl/python-pyopenssl.mk +++ b/package/python-pyopenssl/python-pyopenssl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYOPENSSL_VERSION = 22.1.0 +PYTHON_PYOPENSSL_VERSION = 23.0.0 PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/e7/2f/c6d89edac75482f11e231b644e365d31d5479b7b727734e6a8f3d00decd5 +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/af/6e/0706d5e0eac08fcff586366f5198c9bf0a8b46f0f45b1858324e0d94c295 PYTHON_PYOPENSSL_LICENSE = Apache-2.0 PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE PYTHON_PYOPENSSL_CPE_ID_VENDOR = pyopenssl From peter at korsgaard.com Mon Feb 20 20:57:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:21 -0000 Subject: [Buildroot] [git commit branch/next] package/xtables-addons: bump to version 3.22 Message-ID: <20230220205214.CFBC38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53f2999edfa5e67923d4d8a102c15fa3200e089c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Support for up to Linux 6.1 by fixing the following build failure: /tmp/instance-5/output-1/build/xtables-addons-3.21/extensions/xt_CHAOS.c: In function ???xt_chaos_total???: /tmp/instance-5/output-1/build/xtables-addons-3.21/extensions/xt_CHAOS.c:70:46: error: implicit declaration of function ???prandom_u32???; did you mean ???prandom_u32_max???? [-Werror=implicit-function-declaration] 70 | if (!ret || hotdrop || (unsigned int)prandom_u32() > delude_percentage) | ^~~~~~~~~~~ | prandom_u32_max https://fossies.org/linux/privat/xtables-addons-3.22.tar.xz/xtables-addons-3.22/doc/changelog.rst Fixes: - http://autobuild.buildroot.org/results/4564ba888156710819f6bd86117e0c0bdd513dba Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/xtables-addons/xtables-addons.hash | 2 +- package/xtables-addons/xtables-addons.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xtables-addons/xtables-addons.hash b/package/xtables-addons/xtables-addons.hash index 0d2434eeb1..840a31f947 100644 --- a/package/xtables-addons/xtables-addons.hash +++ b/package/xtables-addons/xtables-addons.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2e09ac129a14f5e9c23b115ebcdfff4aa84e2aeba1268dbdf39b2d752bd71e19 xtables-addons-3.21.tar.xz +sha256 faa16a27166275afbfe8df605f55c3a81ac693bf19da674d45ceded4137ae217 xtables-addons-3.22.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 83cc3266c4..77dcfd741c 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTABLES_ADDONS_VERSION = 3.21 +XTABLES_ADDONS_VERSION = 3.22 XTABLES_ADDONS_SOURCE = xtables-addons-$(XTABLES_ADDONS_VERSION).tar.xz XTABLES_ADDONS_SITE = https://inai.de/files/xtables-addons XTABLES_ADDONS_DEPENDENCIES = iptables linux host-pkgconf From yann.morin.1998 at free.fr Mon Feb 20 20:57:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:22 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pyrsistent: bump to version 0.19.3 Message-ID: <20230220205235.4D23A86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b6a466ea306d0e760b35fe84330d7f57a3a624b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyrsistent/python-pyrsistent.hash | 4 ++-- package/python-pyrsistent/python-pyrsistent.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyrsistent/python-pyrsistent.hash b/package/python-pyrsistent/python-pyrsistent.hash index bb55c7135d..d5c9a22656 100644 --- a/package/python-pyrsistent/python-pyrsistent.hash +++ b/package/python-pyrsistent/python-pyrsistent.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyrsistent/json -md5 23da81256b8817e123568a858bf78997 pyrsistent-0.19.2.tar.gz -sha256 bfa0351be89c9fcbcb8c9879b826f4353be10f58f8a677efab0c017bf7137ec2 pyrsistent-0.19.2.tar.gz +md5 761266eab1f9dc9280cdb0a6d2dedb08 pyrsistent-0.19.3.tar.gz +sha256 1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440 pyrsistent-0.19.3.tar.gz # Locally computed sha256 checksums sha256 3ea56753cbd0cc897d3f4414a902f5694991db7c1b3abb8230216381185f9112 LICENSE.mit diff --git a/package/python-pyrsistent/python-pyrsistent.mk b/package/python-pyrsistent/python-pyrsistent.mk index 6a5ac30a15..f3457feebe 100644 --- a/package/python-pyrsistent/python-pyrsistent.mk +++ b/package/python-pyrsistent/python-pyrsistent.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYRSISTENT_VERSION = 0.19.2 +PYTHON_PYRSISTENT_VERSION = 0.19.3 PYTHON_PYRSISTENT_SOURCE = pyrsistent-$(PYTHON_PYRSISTENT_VERSION).tar.gz -PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/b8/ef/325da441a385a8a931b3eeb70db23cb52da42799691988d8d943c5237f10 +PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/bf/90/445a7dbd275c654c268f47fa9452152709134f61f09605cf776407055a89 PYTHON_PYRSISTENT_SETUP_TYPE = setuptools PYTHON_PYRSISTENT_LICENSE = MIT PYTHON_PYRSISTENT_LICENSE_FILES = LICENSE.mit From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:31 -0000 Subject: [Buildroot] [git commit branch/next] support/tests: print failed command and output on assertRunOK error Message-ID: <20230220205216.38F11828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44161560dd52ebe9a41ee6e5ec8cacb2a9fe48ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Currently, when asserting that a command succeeded, we just capture the return code of the command. If that is not zero, the assertion fails, but the error message is not very splicit: AssertionError: 1 != 0 Replace the error message with an explicit message that dumps the failed command, the error code, and the resulting output. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/testing/infra/basetest.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 96c6848dfc..45bcd4c2e2 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -88,7 +88,12 @@ class BRTest(BRConfigTest): super(BRTest, self).tearDown() # Run the given 'cmd' with a 'timeout' on the target and - # assert that the command succeeded + # assert that the command succeeded; on error, print the + # faulty command and its output def assertRunOk(self, cmd, timeout=-1): - _, exit_code = self.emulator.run(cmd, timeout) - self.assertEqual(exit_code, 0) + out, exit_code = self.emulator.run(cmd, timeout) + self.assertEqual( + exit_code, + 0, + "\nFailed to run: {}\noutput was:\n{}".format(cmd, ' '+'\n '.join(out)) + ) From peter at korsgaard.com Mon Feb 20 20:57:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:31 -0000 Subject: [Buildroot] [git commit branch/next] package/apache: security bump version to 2.4.55 Message-ID: <20230220205237.204628648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60d8585570c8caf3267c702b902bbe847d713342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.apache.org/thread/xlp3od60fjl8nl44z4f56y0lhs7pglos Fixes CVE-2006-20001, CVE-2022-36760, CVE-2022-37436: https://httpd.apache.org/security/vulnerabilities_24.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 4 ++-- package/apache/apache.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 2c21a5bab8..a1185c5618 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ # From https://downloads.apache.org/httpd/httpd-2.4.54.tar.bz2.{sha256,sha512} -sha256 eb397feeefccaf254f8d45de3768d9d68e8e73851c49afd5b7176d1ecf80c340 httpd-2.4.54.tar.bz2 -sha512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18 httpd-2.4.54.tar.bz2 +sha256 11d6ba19e36c0b93ca62e47e6ffc2d2f2884942694bce0f23f39c71bdc5f69ac httpd-2.4.55.tar.bz2 +sha512 94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb httpd-2.4.55.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 315282baac..13018a9b1f 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.54 +APACHE_VERSION = 2.4.55 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 From peter at korsgaard.com Mon Feb 20 20:57:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:32 -0000 Subject: [Buildroot] [git commit branch/next] package/sudo: security bump to version 1.9.12p2 Message-ID: <20230220205237.2C93886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51e98499ff54496126d89e34751297ea9e1f61bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix https://nvd.nist.gov/vuln/detail/CVE-2023-22809 Signed-off-by: Yair Ben-Avraham Signed-off-by: Peter Korsgaard --- package/sudo/sudo.hash | 2 +- package/sudo/sudo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index a3476df96b..c920b9fe74 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,4 +1,4 @@ # From: https://www.sudo.ws/getting/download/ -sha256 475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8 sudo-1.9.12p1.tar.gz +sha256 b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539 sudo-1.9.12p2.tar.gz # Locally calculated sha256 d2f93a3b17ed5586fddd07be33ad767146c1a81a22682baa68bb4360a31d020a LICENSE.md diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index a16b6863aa..c4eaafa6b1 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -5,7 +5,7 @@ ################################################################################ SUDO_VERSION_MAJOR = 1.9.12 -SUDO_VERSION_MINOR = p1 +SUDO_VERSION_MINOR = p2 SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:32 -0000 Subject: [Buildroot] [git commit branch/next] package/orc: bump to version 0.4.33 Message-ID: <20230220205216.6C0CF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92a4f080b2721cc84248ebc98d41229469787688 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch (already in version) https://gitlab.freedesktop.org/gstreamer/orc/-/blob/0.4.33/RELEASE Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ccpu-powerpc.c-fix-build-with-kernel-4.11.patch | 70 ---------------------- package/orc/orc.hash | 4 +- package/orc/orc.mk | 2 +- 3 files changed, 3 insertions(+), 73 deletions(-) diff --git a/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch b/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch deleted file mode 100644 index 0a4e7010f2..0000000000 --- a/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a45f6d49ec090ad94333c0865c378d2d96ab2af4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 15 Feb 2021 20:17:43 +0100 -Subject: [PATCH] orc/orccpu-powerpc.c: fix build with kernel < 4.11 - -Build with powerpc and kernel < 4.11 is broken since version 0.4.30 and -https://gitlab.freedesktop.org/gstreamer/orc/-/commit/a999325abea6a5549d60d99ddeb0271d2aa00235: - -FAILED: orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/powerpc-linux-gcc -Iorc/liborc-0.4.so.0.32.0.p -Iorc -I../orc -I. -I.. -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -std=gnu99 -O3 -DHAVE_CONFIG_H -fvisibility=hidden -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -fPIC -pthread -DORC_ENABLE_UNSTABLE_API -D_GNU_SOURCE -DBUILDING_ORC -MD -MQ orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -MF orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o.d -o orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -c ../orc/orccpu-powerpc.c -../orc/orccpu-powerpc.c: In function 'orc_check_powerpc_proc_auxv': -../orc/orccpu-powerpc.c:164:21: error: 'AT_L1D_CACHESIZE' undeclared (first use in this function); did you mean 'AT_DCACHEBSIZE'? - 164 | if (buf[i] == AT_L1D_CACHESIZE) { - | ^~~~~~~~~~~~~~~~ - | AT_DCACHEBSIZE -../orc/orccpu-powerpc.c:164:21: note: each undeclared identifier is reported only once for each function it appears in -../orc/orccpu-powerpc.c:168:21: error: 'AT_L2_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'? - 168 | if (buf[i] == AT_L2_CACHESIZE) { - | ^~~~~~~~~~~~~~~ - | AT_ICACHEBSIZE -../orc/orccpu-powerpc.c:172:21: error: 'AT_L3_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'? - 172 | if (buf[i] == AT_L3_CACHESIZE) { - | ^~~~~~~~~~~~~~~ - | AT_ICACHEBSIZE - -Indeed, AT_{L1D,L2,L3}_CACHESIZE is only defined since kernel 4.11 and -https://github.com/torvalds/linux/commit/98a5f361b8625c6f4841d6ba013bbf0e80d08147 - -Fixes: - - http://autobuild.buildroot.org/results/0821e96cba3e455edd47b87485501d892fc7ac6a - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/56] ---- - orc/orccpu-powerpc.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/orc/orccpu-powerpc.c b/orc/orccpu-powerpc.c -index 6796f17..340cf05 100644 ---- a/orc/orccpu-powerpc.c -+++ b/orc/orccpu-powerpc.c -@@ -161,18 +161,24 @@ orc_check_powerpc_proc_auxv (void) - _orc_cpu_name = (char*)buf[i + 1]; - found++; - } -+#ifdef AT_L1D_CACHESIZE - if (buf[i] == AT_L1D_CACHESIZE) { - _orc_data_cache_size_level1 = buf[i + 1]; - found++; - } -+#endif -+#ifdef AT_L2_CACHESIZE - if (buf[i] == AT_L2_CACHESIZE) { - _orc_data_cache_size_level2 = buf[i + 1]; - found++; - } -+#endif -+#ifdef AT_L3_CACHESIZE - if (buf[i] == AT_L3_CACHESIZE) { - _orc_data_cache_size_level3 = buf[i + 1]; - found++; - } -+#endif - if (found == 6) - break; - } --- -2.30.0 - diff --git a/package/orc/orc.hash b/package/orc/orc.hash index f48c2932ab..136fc3ece4 100644 --- a/package/orc/orc.hash +++ b/package/orc/orc.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.32.tar.xz.sha256sum -sha256 a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0 orc-0.4.32.tar.xz +# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.33.tar.xz.sha256sum +sha256 844e6d7db8086f793f57618d3d4b68d29d99b16034e71430df3c21cfd3c3542a orc-0.4.33.tar.xz # Locally calculated sha256 4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf COPYING diff --git a/package/orc/orc.mk b/package/orc/orc.mk index a93a4f875a..be718e6f85 100644 --- a/package/orc/orc.mk +++ b/package/orc/orc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ORC_VERSION = 0.4.32 +ORC_VERSION = 0.4.33 ORC_SOURCE = orc-$(ORC_VERSION).tar.xz ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc ORC_LICENSE = BSD-2-Clause, BSD-3-Clause From peter at korsgaard.com Mon Feb 20 20:57:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:33 -0000 Subject: [Buildroot] [git commit branch/next] package/git: security bump to version 2.39.1 Message-ID: <20230220205237.54F658648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d18ef6a0cbe81c01118f12c72eb99c09fce0994 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - fixes CVE-2022-41903 and CVE-2022-23521 For details see [1]. [1] https://lore.kernel.org/git/xmqq7cxl9h0i.fsf at gitster.g/ Signed-off-by: Peter Seiderer Tested-by: Bagas Sanjaya [Peter: Mark as security bump] Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 57a77b2810..75398896e5 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 ba199b13fb5a99ca3dec917b0bd736bc0eb5a9df87737d435eddfdf10d69265b git-2.39.0.tar.xz +sha256 40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161 git-2.39.1.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 9918d4c1ef..1d728e1964 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.39.0 +GIT_VERSION = 2.39.1 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:33 -0000 Subject: [Buildroot] [git commit branch/next] package/libkcapi: Fix symver build error on non-ELF platforms Message-ID: <20230220205216.433138648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=216e201cd0f14aacac2e9727e8da8f64d734a064 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The following error is observed on Microblaze [1] build: ``` error: symver is only supported on ELF platforms ``` due to using __attribute__((symver)) on non-ELF platform. So, revert to using .symver in such case. Fixes: http://autobuild.buildroot.net/results/4470efb5a078c0e368f6bd4f5ec455eea5eeebb5/ Upstream status: commit f630ed1f807e26de04b3a5dfd7f1b39d1c5cb642 https://github.com/smuellerDD/libkcapi/pull/147 Signed-off-by: Tan En De Signed-off-by: Thomas Petazzoni --- ...x-symver-build-error-on-non-ELF-platforms.patch | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch b/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch new file mode 100644 index 0000000000..206ac7ec4a --- /dev/null +++ b/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch @@ -0,0 +1,84 @@ +From f630ed1f807e26de04b3a5dfd7f1b39d1c5cb642 Mon Sep 17 00:00:00 2001 +From: Tan En De +Date: Sat, 26 Nov 2022 07:47:39 +0800 +Subject: [PATCH] Fix symver build error on non-ELF platforms + +The following error is observed on Microblaze [1] build: +``` +error: symver is only supported on ELF platforms +``` +due to using __attribute__((symver)) on non-ELF platform. +So, revert to using .symver in such case. + +[1]: http://autobuild.buildroot.net/results/447/4470efb5a078c0e368f6bd4f5ec455eea5eeebb5/build-end.log + +Signed-off-by: Tan En De +Signed-off-by: Stephan Mueller +--- +Upstream status: commit f630ed1f807e26de04b3a5dfd7f1b39d1c5cb642 + + configure.ac | 2 ++ + lib/internal.h | 2 +- + m4/ac_check_attribute_symver.m4 | 24 ++++++++++++++++++++++++ + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 m4/ac_check_attribute_symver.m4 + +diff --git a/configure.ac b/configure.ac +index e230577..ba17404 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,6 +76,8 @@ AX_ADD_FORTIFY_SOURCE + + AC_CHECK_API_VERSION + ++AC_CHECK_ATTRIBUTE_SYMVER ++ + AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror], [Disable -Werror])], [with_werror=$enableval], [with_werror=yes]) + AM_CONDITIONAL([ENABLE_WERROR], [test "x$with_werror" = "xyes"]) + +diff --git a/lib/internal.h b/lib/internal.h +index 14844a9..7977b04 100644 +--- a/lib/internal.h ++++ b/lib/internal.h +@@ -352,7 +352,7 @@ static inline int io_getevents(__attribute__((unused)) aio_context_t ctx, + * Auxiliary macros + ************************************************************/ + +-#if __GNUC__ >= 10 ++#if HAVE_ATTRIBUTE_SYMVER && __GNUC__ >= 10 + # define IMPL_SYMVER(name, version) \ + __attribute__((__symver__("kcapi_" #name "@@LIBKCAPI_" version))) + +diff --git a/m4/ac_check_attribute_symver.m4 b/m4/ac_check_attribute_symver.m4 +new file mode 100644 +index 0000000..b484c5e +--- /dev/null ++++ b/m4/ac_check_attribute_symver.m4 +@@ -0,0 +1,24 @@ ++dnl Check compiler support for symver function attribute ++AC_DEFUN([AC_CHECK_ATTRIBUTE_SYMVER], [ ++ saved_CFLAGS=$CFLAGS ++ CFLAGS="-O0 -Werror" ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[ ++ void _test_attribute_symver(void); ++ __attribute__((__symver__("sym at VER_1.2.3"))) void _test_attribute_symver(void) {} ++ ]], ++ [[ ++ _test_attribute_symver() ++ ]] ++ )], ++ [ ++ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 if __attribute__((symver)) is supported]) ++ ], ++ [ ++ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 0, [Define to 0 if __attribute__((symver)) is not supported]) ++ ] ++ ) ++ CFLAGS=$saved_CFLAGS ++]) ++ +-- +2.34.1 + From peter at korsgaard.com Mon Feb 20 20:57:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:34 -0000 Subject: [Buildroot] [git commit branch/next] package/flashrom: bump to version 1.2.1 Message-ID: <20230220205237.6192F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a49f00010da29e904c07debea9fd1ab54f2f6c50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch (already in version) https://github.com/flashrom/flashrom/compare/v1.2...v1.2.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...01-Makefile-Fix-building-on-AArch64-NixOS.patch | 95 ---------------------- package/flashrom/flashrom.hash | 4 +- package/flashrom/flashrom.mk | 2 +- 3 files changed, 3 insertions(+), 98 deletions(-) diff --git a/package/flashrom/0001-Makefile-Fix-building-on-AArch64-NixOS.patch b/package/flashrom/0001-Makefile-Fix-building-on-AArch64-NixOS.patch deleted file mode 100644 index f835172e61..0000000000 --- a/package/flashrom/0001-Makefile-Fix-building-on-AArch64-NixOS.patch +++ /dev/null @@ -1,95 +0,0 @@ -From da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d Mon Sep 17 00:00:00 2001 -From: Pyry Kontio -Date: Mon, 6 Jul 2020 12:57:35 +0900 -Subject: [PATCH] Makefile: Fix building on AArch64 NixOS - -The parsing of the output of archtest.c produced an unexpected -value on AArch64 NixOS. For example, the make variable ARCH was set to: - -``` -bit outside of fd_set selected -arm -``` - -This made the arch and OS checks fail. - -This commit simplifies the parsing, making it more robust. - -The C files archtest.c, endiantest.c and os.h used to set the -TARGET_OS, ARCH and ENDIAN variables, respectively, output -the result of the test as the final line, so just extracting -the final line and removing double quoting is enough. - -This commit also fixes a bug with debug_shell lacking escaping -single quotes, which prevented using the single quote in the -debug_shell calls. It used to work by accident before this fix; -the line in the call happened to contain a balanced pair of double -quotes and lacked other characters that needed escaping, which -didn't break the debug_shell, but this was accidental and very -brittle. - -Signed-off-by: Pyry Kontio -Change-Id: Iaa4477a71e758cf9ecad2c22f3b77bc6508a3510 -Reviewed-on: https://review.coreboot.org/c/flashrom/+/43140 -Tested-by: build bot (Jenkins) -Reviewed-by: Angel Pons - -[Retrieved from: -https://github.com/flashrom/flashrom/commit/da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d] -Signed-off-by: Fabrice Fontaine ---- - Makefile | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index f3f7717e2..e475cbdbd 100644 ---- a/Makefile -+++ b/Makefile -@@ -83,7 +83,8 @@ dummy_for_make_3_80:=$(shell printf "Build started on %s\n\n" "$$(date)" >$(BUIL - - # Provide an easy way to execute a command, print its output to stdout and capture any error message on stderr - # in the build details file together with the original stdout output. --debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(1) ; }' >&2; { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE)) -+debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(subst ','\'',$(1)) ; }' >&2; \ -+ { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE)) - - ############################################################################### - # General OS-specific settings. -@@ -106,7 +107,8 @@ endif - # IMPORTANT: The following line must be placed before TARGET_OS is ever used - # (of course), but should come after any lines setting CC because the line - # below uses CC itself. --override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) -+override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null \ -+ | tail -1 | cut -f 2 -d'"')) - - ifeq ($(TARGET_OS), Darwin) - override CPPFLAGS += -I/opt/local/include -I/usr/local/include -@@ -490,8 +492,10 @@ endif - # IMPORTANT: The following line must be placed before ARCH is ever used - # (of course), but should come after any lines setting CC because the line - # below uses CC itself. --override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) --override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null | grep -v '^\#')) -+override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null \ -+ | tail -1 | cut -f 2 -d'"')) -+override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ -+ | tail -1)) - - # Disable the internal programmer on unsupported architectures (everything but x86 and mipsel) - ifneq ($(ARCH)-little, $(filter $(ARCH),x86 mips)-$(ENDIAN)) -@@ -1299,12 +1303,12 @@ compiler: featuresavailable - @printf "Target arch is " - @# FreeBSD wc will output extraneous whitespace. - @echo $(ARCH)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ -- ( echo "unknown. Aborting."; exit 1) -+ ( echo "unknown (\"$(ARCH)\"). Aborting."; exit 1) - @printf "%s\n" '$(ARCH)' - @printf "Target OS is " - @# FreeBSD wc will output extraneous whitespace. - @echo $(TARGET_OS)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ -- ( echo "unknown. Aborting."; exit 1) -+ ( echo "unknown (\"$(TARGET_OS)\"). Aborting."; exit 1) - @printf "%s\n" '$(TARGET_OS)' - ifeq ($(TARGET_OS), libpayload) - @$(CC) --version 2>&1 | grep -q coreboot || \ diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash index 97df4fe9a4..2ab463d93a 100644 --- a/package/flashrom/flashrom.hash +++ b/package/flashrom/flashrom.hash @@ -1,4 +1,4 @@ # Locally computed after checking pgp signature -# https://download.flashrom.org/releases/flashrom-v1.2.tar.bz2.asc -sha256 e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b flashrom-v1.2.tar.bz2 +# https://download.flashrom.org/releases/flashrom-v1.2.1.tar.bz2.asc +sha256 89a7ff5beb08c89b8795bbd253a51b9453547a864c31793302296b56bbc56d65 flashrom-v1.2.1.tar.bz2 sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 5554082bca..dd505987ed 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLASHROM_VERSION = 1.2 +FLASHROM_VERSION = 1.2.1 FLASHROM_SOURCE = flashrom-v$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = https://download.flashrom.org/releases FLASHROM_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:34 -0000 Subject: [Buildroot] [git commit branch/next] package/jitterentropy-library: bump to version 3.4.1 Message-ID: <20230220205216.795978648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8807ddbe269ef9aeee7b72f6d0a64719f8e6782 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patch (already in version) - Update hash of LICENSE file (year updated with https://github.com/smuellerDD/jitterentropy-library/commit/2e5019cfe63038faaa405ce53715effe4ea580e4) https://github.com/smuellerDD/jitterentropy-library/blob/v3.4.1/CHANGES.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch | 52 ---------------------- .../jitterentropy-library.hash | 4 +- .../jitterentropy-library/jitterentropy-library.mk | 2 +- 3 files changed, 3 insertions(+), 55 deletions(-) diff --git a/package/jitterentropy-library/0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch b/package/jitterentropy-library/0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch deleted file mode 100644 index c4388663b0..0000000000 --- a/package/jitterentropy-library/0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 272ee47892563e849f6b1bf59b0173f8aa33b631 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Dec 2021 11:36:13 +0100 -Subject: [PATCH] Makefile: add ENABLE_STACK_PROTECTOR - -Add ENABLE_STACK_PROTECTOR as build on embedded toolchains without -stack-protector is again broken since -https://github.com/smuellerDD/jitterentropy-library/commit/5b3cb7f35e41ba2f34a75d004cf095c965a1a0c4: - -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: src/jitterentropy-base.o: in function `jent_fips_enabled': -jitterentropy-base.c:(.text+0x131): undefined reference to `__stack_chk_fail_local' - -Fixes: - - http://autobuild.buildroot.org/results/8dee462d16d934dd173d58f17933c6911e4336bf - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Stephan Mueller -[Retrieved from: -https://github.com/smuellerDD/jitterentropy-library/commit/272ee47892563e849f6b1bf59b0173f8aa33b631] ---- - Makefile | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index dfb96a8..c999ef5 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,6 +2,7 @@ - - CC ?= gcc - #Hardening -+ENABLE_STACK_PROTECTOR ?= 1 - CFLAGS ?= -fwrapv --param ssp-buffer-size=4 -fvisibility=hidden -fPIE -Wcast-align -Wmissing-field-initializers -Wshadow -Wswitch-enum - CFLAGS +=-Wextra -Wall -pedantic -fPIC -O0 -fwrapv -Wconversion - LDFLAGS +=-Wl,-z,relro,-z,now -lpthread -@@ -13,10 +14,12 @@ else - GCC_GTEQ_490 := $(shell expr `$(CC) -dumpfullversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40900) - endif - --ifeq "$(GCC_GTEQ_490)" "1" -- CFLAGS += -fstack-protector-strong --else -- CFLAGS += -fstack-protector-all -+ifeq "$(ENABLE_STACK_PROTECTOR)" "1" -+ ifeq "$(GCC_GTEQ_490)" "1" -+ CFLAGS += -fstack-protector-strong -+ else -+ CFLAGS += -fstack-protector-all -+ endif - endif - - # Change as necessary diff --git a/package/jitterentropy-library/jitterentropy-library.hash b/package/jitterentropy-library/jitterentropy-library.hash index 760befab53..c7833f1428 100644 --- a/package/jitterentropy-library/jitterentropy-library.hash +++ b/package/jitterentropy-library/jitterentropy-library.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9fcc954763a1dd4afe614a1b360f53b600d3376bbcc4b19177f27abf191ebad5 jitterentropy-library-3.3.1.tar.xz -sha256 7e06574ff822594269083a796d06fa4e5e78c40efe5ca01a72d2a4662e8206df LICENSE +sha256 802f025f766c38abf663fd5a21482b8313b6d6e2c68c36a4ffd6bc105fe975ab jitterentropy-library-3.4.1.tar.xz +sha256 7a89069066f6c0b8767d3256e5ec5d765b2c7f3354a5a06fc8d5bd7b8103d8a3 LICENSE sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 LICENSE.bsd sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE.gplv2 diff --git a/package/jitterentropy-library/jitterentropy-library.mk b/package/jitterentropy-library/jitterentropy-library.mk index 4cdebf46a3..f405082d08 100644 --- a/package/jitterentropy-library/jitterentropy-library.mk +++ b/package/jitterentropy-library/jitterentropy-library.mk @@ -4,7 +4,7 @@ # ################################################################################ -JITTERENTROPY_LIBRARY_VERSION = 3.3.1 +JITTERENTROPY_LIBRARY_VERSION = 3.4.1 JITTERENTROPY_LIBRARY_SOURCE = \ jitterentropy-library-$(JITTERENTROPY_LIBRARY_VERSION).tar.xz JITTERENTROPY_LIBRARY_SITE = http://www.chronox.de/jent From yann.morin.1998 at free.fr Mon Feb 20 20:57:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:35 -0000 Subject: [Buildroot] [git commit branch/next] package/bitstream-vera: switch to https download Message-ID: <20230220205237.845CF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d3690e8628c29d96993e981a9cc8ef05f22a3cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/bitstream-vera/bitstream-vera.hash | 2 +- package/bitstream-vera/bitstream-vera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bitstream-vera/bitstream-vera.hash b/package/bitstream-vera/bitstream-vera.hash index bb31b17a4a..54deb2661c 100644 --- a/package/bitstream-vera/bitstream-vera.hash +++ b/package/bitstream-vera/bitstream-vera.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2.sha256sum +# From https://download.gnome.org/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2.sha256sum sha256 db5b27df7bbb318036ebdb75acd3e98f1bd6eb6608fb70a67d478cd243d178dc ttf-bitstream-vera-1.10.tar.bz2 # locally computed sha256 3361d054759a2fc686a2c058be82deaf9c2e6fe549be9004d7935a6c1736315d COPYRIGHT.TXT diff --git a/package/bitstream-vera/bitstream-vera.mk b/package/bitstream-vera/bitstream-vera.mk index f487d637c2..2c9dc1a5cb 100644 --- a/package/bitstream-vera/bitstream-vera.mk +++ b/package/bitstream-vera/bitstream-vera.mk @@ -5,7 +5,7 @@ ################################################################################ BITSTREAM_VERA_VERSION = 1.10 -BITSTREAM_VERA_SITE = http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/$(BITSTREAM_VERA_VERSION) +BITSTREAM_VERA_SITE = https://download.gnome.org/sources/ttf-bitstream-vera/$(BITSTREAM_VERA_VERSION) BITSTREAM_VERA_SOURCE = ttf-bitstream-vera-$(BITSTREAM_VERA_VERSION).tar.bz2 BITSTREAM_VERA_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/ttf-bitstream-vera BITSTREAM_VERA_LICENSE = BitstreamVera From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:35 -0000 Subject: [Buildroot] [git commit branch/next] package/upx: bump to version 4.0.1 Message-ID: <20230220205216.93080828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1567516d8984a4bddfbee30ee69c771cf3f8e224 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patch (already in version) - cmake must be used since https://github.com/upx/upx/commit/c7d8b6fed1b551158540e1d2e884dc224fce474c - ucl and zlib are directly included in upx since https://github.com/upx/upx/commit/61e1366122f8d1b9e2434a8103e7af00a35ea902 https://github.com/upx/upx/blob/v4.0.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...1-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch | 80 ---------------------- package/upx/upx.hash | 2 +- package/upx/upx.mk | 22 +----- 3 files changed, 4 insertions(+), 100 deletions(-) diff --git a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch b/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch deleted file mode 100644 index 6fae9cac0e..0000000000 --- a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001 -From: John Reiser -Date: Fri, 11 Dec 2020 13:38:18 -0800 -Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ - -https://github.com/upx/upx/issues/421 - modified: p_lx_elf.cpp - -[Retrieved from: -https://github.com/upx/upx/commit/3781df9da23840e596d5e9e8493f22666802fe6c] -Signed-off-by: Fabrice Fontaine ---- - src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 5 deletions(-) - -diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp -index 182db192f..3a4101cf7 100644 ---- a/src/p_lx_elf.cpp -+++ b/src/p_lx_elf.cpp -@@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack() - int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ]; - if (z_rel && z_rsz) { - unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val); -+ if ((unsigned)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_REL] %#x\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off]; - unsigned relsz = get_te32(&dynseg[-1+ z_rsz].d_val); -+ if ((unsigned)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_RELSZ] %#x\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp); - for (; rp < last; ++rp) { - unsigned r_va = get_te32(&rp->r_offset); -@@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack() - int z_rel = dt_table[Elf64_Dyn::DT_RELA]; - int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ]; - if (z_rel && z_rsz) { -- unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ if ((u64_t)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELA] %#llx\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off]; -- unsigned relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ upx_uint64_t relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ if ((u64_t)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELASZ] %#llx\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp); - for (; rp < last; ++rp) { -- unsigned r_va = get_te64(&rp->r_offset); -+ upx_uint64_t r_va = get_te64(&rp->r_offset); - if (r_va == user_init_ava) { // found the Elf64_Rela -- unsigned r_info = get_te64(&rp->r_info); -+ upx_uint64_t r_info = get_te64(&rp->r_info); - unsigned r_type = ELF64_R_TYPE(r_info); - if (Elf64_Ehdr::EM_AARCH64 == e_machine - && R_AARCH64_RELATIVE == r_type) { -@@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack() - } - else { - char msg[50]; snprintf(msg, sizeof(msg), -- "bad relocation %#x DT_INIT_ARRAY[0]", -+ "bad relocation %#llx DT_INIT_ARRAY[0]", - r_info); - throwCantPack(msg); - } diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 7f3698ca0d..9f7c40c819 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 47774df5c958f2868ef550fb258b97c73272cb1f44fe776b798e393465993714 upx-3.96-src.tar.xz +sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index e693a70db1..ef346b2310 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,28 +4,12 @@ # ################################################################################ -UPX_VERSION = 3.96 +UPX_VERSION = 4.0.1 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING UPX_CPE_ID_VENDOR = upx_project +UPX_SUPPORTS_IN_SOURCE_BUILD = NO -# 0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch -UPX_IGNORE_CVES += CVE-2021-20285 - -HOST_UPX_DEPENDENCIES = host-ucl host-zlib - -# We need to specify all, otherwise the default target only prints a message -# stating to "please choose a target for 'make'"... :-( -define HOST_UPX_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - UPX_UCLDIR=$(HOST_DIR) CXXFLAGS_WERROR= -C $(@D) all -endef - -# UPX has no install procedure, so install it manually. -define HOST_UPX_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/upx.out $(HOST_DIR)/bin/upx -endef - -$(eval $(host-generic-package)) +$(eval $(host-cmake-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:57:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:36 -0000 Subject: [Buildroot] [git commit branch/next] package/gconf: switch to https download Message-ID: <20230220205237.9C49B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=695dd042dbbe3eb3ccffb812b8dc38c2aa7202be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gconf/gconf.hash | 2 +- package/gconf/gconf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gconf/gconf.hash b/package/gconf/gconf.hash index 56d754a69e..ad0064fa99 100644 --- a/package/gconf/gconf.hash +++ b/package/gconf/gconf.hash @@ -1,4 +1,4 @@ -# http://ftp.acc.umu.se/pub/gnome/sources/GConf/3.2/GConf-3.2.6.sha256sum +# From https://download.gnome.org/sources/GConf/3.2/GConf-3.2.6.sha256sum sha256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c GConf-3.2.6.tar.xz # License files, locally calculated sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING diff --git a/package/gconf/gconf.mk b/package/gconf/gconf.mk index c468d1433c..b84fa96082 100644 --- a/package/gconf/gconf.mk +++ b/package/gconf/gconf.mk @@ -6,7 +6,7 @@ GCONF_VERSION = 3.2.6 GCONF_SOURCE = GConf-$(GCONF_VERSION).tar.xz -GCONF_SITE = http://ftp.gnome.org/pub/gnome/sources/GConf/3.2 +GCONF_SITE = https://download.gnome.org/sources/GConf/3.2 GCONF_CONF_OPTS = --disable-orbit GCONF_DEPENDENCIES = dbus dbus-glib libglib2 libxml2 \ host-intltool $(TARGET_NLS_DEPENDENCIES) From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:36 -0000 Subject: [Buildroot] [git commit branch/next] package/ucl: drop package Message-ID: <20230220205216.A2B0C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85c5af46ad6c18841576c0f7abe241a617a44cb7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next ucl is directly vendored in upx since version 3.99 and https://github.com/upx/upx/commit/61e1366122f8d1b9e2434a8103e7af00a35ea902 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ucl/ucl.hash | 3 --- package/ucl/ucl.mk | 15 --------------- 2 files changed, 18 deletions(-) diff --git a/package/ucl/ucl.hash b/package/ucl/ucl.hash deleted file mode 100644 index 0252f69297..0000000000 --- a/package/ucl/ucl.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 ucl-1.03.tar.gz -sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/package/ucl/ucl.mk b/package/ucl/ucl.mk deleted file mode 100644 index aac068ef60..0000000000 --- a/package/ucl/ucl.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# ucl -# -################################################################################ - -UCL_VERSION = 1.03 -UCL_SITE = http://www.oberhumer.com/opensource/ucl/download -UCL_LICENSE = GPL-2.0+ -UCL_LICENSE_FILES = COPYING - -# Fix ACC conformance test failure for host gcc 6.x -HOST_UCL_CONF_ENV += CPPFLAGS="$(HOST_CPPFLAGS) -std=iso9899:1990" - -$(eval $(host-autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:57:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:37 -0000 Subject: [Buildroot] [git commit branch/next] package/glib-networking: switch to https download Message-ID: <20230220205237.BFD208648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bbad80aeb21d9657d85b722b02fdf3e66decfb8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/glib-networking/glib-networking.hash | 2 +- package/glib-networking/glib-networking.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index 347ef6777c..766efd0ced 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.1.sha256sum +# From https://download.gnome.org/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 4adc13d39f..b6d29110ed 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -6,7 +6,7 @@ GLIB_NETWORKING_VERSION_MAJOR = 2.70 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_SITE = https://download.gnome.org/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES GLIB_NETWORKING_DEPENDENCIES = \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:37 -0000 Subject: [Buildroot] [git commit branch/next] package/collectd: add rrdcached support Message-ID: <20230220205216.CA9938648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d77db2df74a3ccb430cbc326edef2c4a588878b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The rrdcached plugin has status "supported": https://collectd.org/wiki/index.php/Plugin:RRDCacheD Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/collectd/Config.in | 9 +++++++++ package/collectd/collectd.mk | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index fb76a105dc..a431da79f1 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -724,6 +724,15 @@ config BR2_PACKAGE_COLLECTD_RRDTOOL comment "rrdtool support needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR +if BR2_PACKAGE_COLLECTD_RRDTOOL + +config BR2_PACKAGE_COLLECTD_RRDCACHED + bool "rrdcached" + help + Use the RRDtool caching daemon. + +endif + config BR2_PACKAGE_COLLECTD_RIEMANN bool "riemann" # riemann-c-client -> protobuf-c diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 5510c265e8..6c993827c4 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -21,7 +21,7 @@ COLLECTD_PLUGINS_DISABLE = \ gmond hddtemp intel_rdt java lpar \ madwifi mbmon mic multimeter netapp notify_desktop numa \ oracle perl pf pinba powerdns python routeros \ - rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ + sigrok tape target_v5upgrade teamspeak2 ted \ tokyotyrant turbostat uuid varnish vserver write_kafka \ write_mongodb xencpu xmms zfs_arc zone @@ -134,6 +134,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_REGEX),--enable-match_regex,--disable-match-regex) \ $(if $(BR2_PACKAGE_COLLECTD_REPLACE),--enable-target_replace,--disable-target_replace) \ $(if $(BR2_PACKAGE_COLLECTD_RIEMANN),--enable-write_riemann,--disable-write_riemann) \ + $(if $(BR2_PACKAGE_COLLECTD_RRDCACHED),--enable-rrdcached,--disable-rrdcached) \ $(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),--enable-rrdtool,--disable-rrdtool) \ $(if $(BR2_PACKAGE_COLLECTD_SCALE),--enable-target_scale,--disable-target_scale) \ $(if $(BR2_PACKAGE_COLLECTD_SENSORS),--enable-sensors,--disable-sensors) \ From yann.morin.1998 at free.fr Mon Feb 20 20:57:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:38 -0000 Subject: [Buildroot] [git commit branch/next] package/glibmm: switch to https download Message-ID: <20230220205237.CB3B886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2334adaa974a7984a4bd3a9cf65e2187d25d8b2d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/glibmm/glibmm.hash | 2 +- package/glibmm/glibmm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/glibmm/glibmm.hash b/package/glibmm/glibmm.hash index f0bc7f4e71..ea256c3add 100644 --- a/package/glibmm/glibmm.hash +++ b/package/glibmm/glibmm.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.68/glibmm-2.68.2.sha256sum +# From https://download.gnome.org/sources/glibmm/2.68/glibmm-2.68.2.sha256sum sha256 91e0a8618f7b82db4aaf2648932ea2bcfe626ad030068c18fa2d106fd838d8ad glibmm-2.68.2.tar.xz # License files, locally calculated sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk index 525da6b618..7f37da8449 100644 --- a/package/glibmm/glibmm.mk +++ b/package/glibmm/glibmm.mk @@ -9,7 +9,7 @@ GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).2 GLIBMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GLIBMM_LICENSE_FILES = COPYING COPYING.tools GLIBMM_SOURCE = glibmm-$(GLIBMM_VERSION).tar.xz -GLIBMM_SITE = http://ftp.gnome.org/pub/gnome/sources/glibmm/$(GLIBMM_VERSION_MAJOR) +GLIBMM_SITE = https://download.gnome.org/sources/glibmm/$(GLIBMM_VERSION_MAJOR) GLIBMM_INSTALL_STAGING = YES GLIBMM_DEPENDENCIES = libglib2 libsigc host-pkgconf GLIBMM_CONF_OPTS = -Dbuild-examples=false From yann.morin.1998 at free.fr Mon Feb 20 20:57:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:38 -0000 Subject: [Buildroot] [git commit branch/next] package/qemu: split long lines Message-ID: <20230220205217.13B7F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a04be749374c99790ee7d185427b352db84fb07a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Split the list of dependencies to ease further addition. Signed-off-by: Romain Naour [yann.morin.1998 at free.fr: move first item also on its own line] Signed-off-by: Yann E. MORIN --- package/qemu/qemu.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index a991d49993..cbcbbc2bc5 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -20,7 +20,13 @@ QEMU_CPE_ID_VENDOR = qemu # However, building is still done with configure and make as in previous versions of QEMU. # Target-qemu -QEMU_DEPENDENCIES = host-meson host-pkgconf libglib2 zlib pixman host-python3 +QEMU_DEPENDENCIES = \ + host-meson \ + host-pkgconf \ + libglib2 \ + zlib \ + pixman \ + host-python3 # Need the LIBS variable because librt and libm are # not automatically pulled. :-( @@ -246,7 +252,13 @@ $(eval $(generic-package)) #------------------------------------------------------------- # Host-qemu -HOST_QEMU_DEPENDENCIES = host-meson host-pkgconf host-zlib host-libglib2 host-pixman host-python3 +HOST_QEMU_DEPENDENCIES = \ + host-meson \ + host-pkgconf \ + host-zlib \ + host-libglib2 \ + host-pixman \ + host-python3 # BR ARCH qemu # ------- ---- From yann.morin.1998 at free.fr Mon Feb 20 20:57:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:39 -0000 Subject: [Buildroot] [git commit branch/next] package/gsettings-desktop-schemas: switch to https download Message-ID: <20230220205237.E2DAB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d7de5b2befe5a1703fbd583514aa46b457246d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash | 2 +- package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash index d530517cd1..bad8eab91d 100644 --- a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash +++ b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/gsettings-desktop-schemas/3.36/gsettings-desktop-schemas-3.36.1.sha256sum +# From https://download.gnome.org/sources/gsettings-desktop-schemas/3.36/gsettings-desktop-schemas-3.36.1.sha256sum sha256 004bdbe43cf8290f2de7d8537e14d8957610ca479a4fa368e34dbd03f03ec9d9 gsettings-desktop-schemas-3.36.1.tar.xz # Hash for license file diff --git a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk index 8573c75fde..b77397d565 100644 --- a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk +++ b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk @@ -7,7 +7,7 @@ GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR = 3.36 GSETTINGS_DESKTOP_SCHEMAS_VERSION = $(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR).1 GSETTINGS_DESKTOP_SCHEMAS_SOURCE = gsettings-desktop-schemas-$(GSETTINGS_DESKTOP_SCHEMAS_VERSION).tar.xz -GSETTINGS_DESKTOP_SCHEMAS_SITE = http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/$(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR) +GSETTINGS_DESKTOP_SCHEMAS_SITE = https://download.gnome.org/sources/gsettings-desktop-schemas/$(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR) GSETTINGS_DESKTOP_SCHEMAS_INSTALL_STAGING = YES GSETTINGS_DESKTOP_SCHEMAS_DEPENDENCIES = host-pkgconf libglib2 GSETTINGS_DESKTOP_SCHEMAS_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Mon Feb 20 20:57:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:40 -0000 Subject: [Buildroot] [git commit branch/next] package/slirp: add host variant for host-qemu Message-ID: <20230220205217.075D3828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f603aa8514279b56f7454726c95601b31e6064dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Qemu 7.2 removed the slirp submodule from their sources [1] so we have to provide slirp library as host package for host-qemu. [1] https://wiki.qemu.org/ChangeLog/7.2#GIT_submodules Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/slirp/slirp.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk index 10d367587d..2ad71f13d9 100644 --- a/package/slirp/slirp.mk +++ b/package/slirp/slirp.mk @@ -14,4 +14,7 @@ SLIRP_CPE_ID_PRODUCT = libslirp SLIRP_INSTALL_STAGING = YES SLIRP_DEPENDENCIES = libglib2 +HOST_SLIRP_DEPENDENCIES = host-libglib2 + $(eval $(meson-package)) +$(eval $(host-meson-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:57:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:40 -0000 Subject: [Buildroot] [git commit branch/next] package/gtk2-engines: switch to https download Message-ID: <20230220205238.05CB486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cb96dcaff49c259ad02fad428ab3ae3d210416e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gtk2-engines/gtk2-engines.hash | 2 +- package/gtk2-engines/gtk2-engines.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gtk2-engines/gtk2-engines.hash b/package/gtk2-engines/gtk2-engines.hash index 20125c706c..71a0ecd213 100644 --- a/package/gtk2-engines/gtk2-engines.hash +++ b/package/gtk2-engines/gtk2-engines.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.sha256sum +# From https://download.gnome.org/sources/gtk-engines/2.20/gtk-engines-2.20.2.sha256sum sha256 15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5 gtk-engines-2.20.2.tar.bz2 # Locally computed sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk index 5f145940b2..ea41bccaea 100644 --- a/package/gtk2-engines/gtk2-engines.mk +++ b/package/gtk2-engines/gtk2-engines.mk @@ -7,7 +7,7 @@ GTK2_ENGINES_VERSION_MAJOR = 2.20 GTK2_ENGINES_VERSION = $(GTK2_ENGINES_VERSION_MAJOR).2 GTK2_ENGINES_SOURCE = gtk-engines-$(GTK2_ENGINES_VERSION).tar.bz2 -GTK2_ENGINES_SITE = http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/$(GTK2_ENGINES_VERSION_MAJOR) +GTK2_ENGINES_SITE = https://download.gnome.org/sources/gtk-engines/$(GTK2_ENGINES_VERSION_MAJOR) GTK2_ENGINES_DEPENDENCIES = libgtk2 host-intltool GTK2_ENGINES_LICENSE = LGPL-2.1+ GTK2_ENGINES_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:41 -0000 Subject: [Buildroot] [git commit branch/next] package/libvncserver: bump to version 0.9.14 Message-ID: <20230220205216.BBCDA828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90a543de880010776b291193eb0d3bc8d27fe3e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patches (already in version) - examples and tests can be disabled since https://github.com/LibVNC/libvncserver/commit/0b8990784a81823eecc9089263ac1966d17bf399 https://github.com/LibVNC/libvncserver/releases/tag/LibVNCServer-0.9.14 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...to_openssl.c-fix-build-with-libressl-3.5..patch | 66 ---------------------- ...nt-free-vncRec-memory-in-rfbClientCleanup.patch | 28 --------- package/libvncserver/libvncserver.hash | 2 +- package/libvncserver/libvncserver.mk | 9 ++- 4 files changed, 5 insertions(+), 100 deletions(-) diff --git a/package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch b/package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch deleted file mode 100644 index 110976c4bb..0000000000 --- a/package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch +++ /dev/null @@ -1,66 +0,0 @@ -From 97fbbd678b2012e64acddd523677bc55a177bc58 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 12 May 2022 20:41:50 +0200 -Subject: [PATCH] common/crypto_openssl.c: fix build with libressl >= 3.5.0 - (#522) - -Fix the following build failure with libressl >= 3.5.0: - -/nvmedata/autobuild/instance-26/output-1/build/libvncserver-0.9.13/common/crypto_openssl.c: In function 'dh_generate_keypair': -/nvmedata/autobuild/instance-26/output-1/build/libvncserver-0.9.13/common/crypto_openssl.c:149:7: error: dereferencing pointer to incomplete type 'DH' {aka 'struct dh_st'} - 149 | dh->p = BN_bin2bn(prime, keylen, NULL); - | ^~ - -Fixes: - - http://autobuild.buildroot.org/results/49b3940b9d0432cb5fb0c5d22dfa017b18c6e233 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/LibVNC/libvncserver/commit/97fbbd678b2012e64acddd523677bc55a177bc58] ---- - common/crypto_openssl.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/common/crypto_openssl.c b/common/crypto_openssl.c -index 60d4bd4df..51d7ec2d9 100644 ---- a/common/crypto_openssl.c -+++ b/common/crypto_openssl.c -@@ -138,14 +138,16 @@ int dh_generate_keypair(uint8_t *priv_out, uint8_t *pub_out, const uint8_t *gen, - { - int result = 0; - DH *dh; --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || \ -+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000) - const BIGNUM *pub_key = NULL; - const BIGNUM *priv_key = NULL; - #endif - - if(!(dh = DH_new())) - goto out; --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000) - dh->p = BN_bin2bn(prime, keylen, NULL); - dh->g = BN_bin2bn(gen, gen_len, NULL); - #else -@@ -154,7 +156,8 @@ int dh_generate_keypair(uint8_t *priv_out, uint8_t *pub_out, const uint8_t *gen, - #endif - if(!DH_generate_key(dh)) - goto out; --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000) - if(BN_bn2bin(dh->priv_key, priv_out) == 0) - goto out; - if(BN_bn2bin(dh->pub_key, pub_out) == 0) -@@ -181,7 +184,8 @@ int dh_compute_shared_key(uint8_t *shared_out, const uint8_t *priv, const uint8_ - - if(!(dh = DH_new())) - goto out; --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER < 0x30500000) - dh->p = BN_bin2bn(prime, keylen, NULL); - dh->priv_key = BN_bin2bn(priv, keylen, NULL); - #else diff --git a/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch b/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch deleted file mode 100644 index 7658c112f3..0000000000 --- a/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bef41f6ec4097a8ee094f90a1b34a708fbd757ec Mon Sep 17 00:00:00 2001 -From: Christian Beier -Date: Sat, 21 Nov 2020 12:52:31 +0100 -Subject: [PATCH] libvncclient: free vncRec memory in rfbClientCleanup() - -Otherwise we leak memory. Spotted by Ramin Farajpour Cami -, thanks! - -[Retrieved from: -https://github.com/LibVNC/libvncserver/commit/bef41f6ec4097a8ee094f90a1b34a708fbd757ec] -Signed-off-by: Fabrice Fontaine ---- - libvncclient/vncviewer.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c -index d6b91f02b..0a1bdcf6a 100644 ---- a/libvncclient/vncviewer.c -+++ b/libvncclient/vncviewer.c -@@ -534,6 +534,8 @@ void rfbClientCleanup(rfbClient* client) { - client->clientData = next; - } - -+ free(client->vncRec); -+ - if (client->sock != RFB_INVALID_SOCKET) - rfbCloseSocket(client->sock); - if (client->listenSock != RFB_INVALID_SOCKET) diff --git a/package/libvncserver/libvncserver.hash b/package/libvncserver/libvncserver.hash index 8e61a3d0ea..225c42e46a 100644 --- a/package/libvncserver/libvncserver.hash +++ b/package/libvncserver/libvncserver.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a LibVNCServer-0.9.13.tar.gz +sha256 83104e4f7e28b02f8bf6b010d69b626fae591f887e949816305daebae527c9a5 LibVNCServer-0.9.14.tar.gz sha256 4d23c8c814e5baf007d854f01d8502e77dc56a41144934e003fb32c4e052d20f COPYING diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk index 8f24e2d098..700e26a8d6 100644 --- a/package/libvncserver/libvncserver.mk +++ b/package/libvncserver/libvncserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVNCSERVER_VERSION = 0.9.13 +LIBVNCSERVER_VERSION = 0.9.14 LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive LIBVNCSERVER_LICENSE = GPL-2.0+ @@ -14,14 +14,13 @@ LIBVNCSERVER_INSTALL_STAGING = YES LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON -# 0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch -LIBVNCSERVER_IGNORE_CVES += CVE-2020-29260 - # only used for examples LIBVNCSERVER_CONF_OPTS += \ + -DWITH_EXAMPLES=OFF \ -DWITH_FFMPEG=OFF \ -DWITH_GTK=OFF \ - -DWITH_SDL=OFF + -DWITH_SDL=OFF \ + -DWITH_TESTS=OFF ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBVNCSERVER_CONF_OPTS += -DWITH_THREADS=ON From peter at korsgaard.com Mon Feb 20 20:57:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:57:35 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: <20230220214958.19d88af8@windsurf> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-2-thomas.devoogdt@barco.com> <87edqkz1yv.fsf@dell.be.48ers.dk> <20230220214958.19d88af8@windsurf> Message-ID: <6d000223-f440-43bb-b9ba-2144375776be@korsgaard.com> On 20/02/2023 21.49, Thomas Petazzoni wrote: >> Maybe it is? Does at-spi2 work under wayland? > > Please note that we also have a series that removes atk, at-spi2-atk, > and bumps at-spi2-core, which now replaces both atk and at-spi2-atk: > > https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 Ahh yes, that is probably the way to go. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Mon Feb 20 20:57:41 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:41 -0000 Subject: [Buildroot] [git commit branch/next] package/gupnp-av: switch to https download Message-ID: <20230220205238.2565E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cfdd3fcd158031dfa2157454b9f5071e801171b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gupnp-av/gupnp-av.hash | 2 +- package/gupnp-av/gupnp-av.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gupnp-av/gupnp-av.hash b/package/gupnp-av/gupnp-av.hash index ceab42ef52..ab1739aaa4 100644 --- a/package/gupnp-av/gupnp-av.hash +++ b/package/gupnp-av/gupnp-av.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.14/gupnp-av-0.14.0.sha256sum: +# Hash from: https://download.gnome.org/sources/gupnp-av/0.14/gupnp-av-0.14.0.sha256sum: sha256 20aed546fc882e78a3f186a0c8bce5c841cc3a44b7ea528298fbdc82596fb156 gupnp-av-0.14.0.tar.xz # Hash for license file: diff --git a/package/gupnp-av/gupnp-av.mk b/package/gupnp-av/gupnp-av.mk index 655de87608..e83aa57bda 100644 --- a/package/gupnp-av/gupnp-av.mk +++ b/package/gupnp-av/gupnp-av.mk @@ -7,7 +7,7 @@ GUPNP_AV_VERSION_MAJOR = 0.14 GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).0 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz -GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) +GUPNP_AV_SITE = https://download.gnome.org/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) GUPNP_AV_LICENSE = LGPL-2.1+ GUPNP_AV_LICENSE_FILES = COPYING GUPNP_AV_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:42 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8192eu: fix build failure due to function and data types name conflict with Linux Message-ID: <20230220205217.46A46828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef3052674a7104990037b7da60cbbcb9d316e764 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add local patch to rename local sha256 data types and functions that conflict with Linux ones. Fixes: http://autobuild.buildroot.net/results/7a85a1e6df55bbb4dc6741821c849ad7ee5059af Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...ailure-due-to-redefition-of-local-sha256-.patch | 108 +++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch b/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch new file mode 100644 index 0000000000..52ef8c9005 --- /dev/null +++ b/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch @@ -0,0 +1,108 @@ +From 1f968bd58656f200347bd398b34aa9f1b6393302 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 18:54:48 +0100 +Subject: [PATCH] Fix build failure due to redefition of local sha256 data + types and functions + +Linux provides sha256_init() and 'struct sha256_state' in file +include/crypto/sha2.h so this leads to a build failure due to redefinition. +To avoid this let's prepend to all local exposed functions and data types +rtl_. sha256_process() and sha256_done() are not required to be renamed but +let's change them for consistency. + +[Upstream status: https://github.com/clnhub/rtl8192eu-linux/pull/69] +Signed-off-by: Giulio Benetti +--- + core/crypto/sha256-internal.c | 16 ++++++++-------- + core/crypto/sha256_i.h | 8 ++++---- + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/core/crypto/sha256-internal.c b/core/crypto/sha256-internal.c +index 4d61cb1..537bb2e 100644 +--- a/core/crypto/sha256-internal.c ++++ b/core/crypto/sha256-internal.c +@@ -26,17 +26,17 @@ + int sha256_vector(size_t num_elem, const u8 *addr[], const size_t *len, + u8 *mac) + { +- struct sha256_state ctx; ++ struct rtl_sha256_state ctx; + size_t i; + + if (TEST_FAIL()) + return -1; + +- sha256_init(&ctx); ++ rtl_sha256_init(&ctx); + for (i = 0; i < num_elem; i++) +- if (sha256_process(&ctx, addr[i], len[i])) ++ if (rtl_sha256_process(&ctx, addr[i], len[i])) + return -1; +- if (sha256_done(&ctx, mac)) ++ if (rtl_sha256_done(&ctx, mac)) + return -1; + return 0; + } +@@ -82,7 +82,7 @@ static const unsigned long K[64] = { + #endif + + /* compress 512-bits */ +-static int sha256_compress(struct sha256_state *md, unsigned char *buf) ++static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf) + { + u32 S[8], W[64], t0, t1; + u32 t; +@@ -125,7 +125,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) + + + /* Initialize the hash state */ +-void sha256_init(struct sha256_state *md) ++void rtl_sha256_init(struct rtl_sha256_state *md) + { + md->curlen = 0; + md->length = 0; +@@ -146,7 +146,7 @@ void sha256_init(struct sha256_state *md) + @param inlen The length of the data (octets) + @return CRYPT_OK if successful + */ +-int sha256_process(struct sha256_state *md, const unsigned char *in, ++int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, + unsigned long inlen) + { + unsigned long n; +@@ -186,7 +186,7 @@ int sha256_process(struct sha256_state *md, const unsigned char *in, + @param out [out] The destination of the hash (32 bytes) + @return CRYPT_OK if successful + */ +-int sha256_done(struct sha256_state *md, unsigned char *out) ++int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out) + { + int i; + +diff --git a/core/crypto/sha256_i.h b/core/crypto/sha256_i.h +index a502d2b..93a8858 100644 +--- a/core/crypto/sha256_i.h ++++ b/core/crypto/sha256_i.h +@@ -11,15 +11,15 @@ + + #define SHA256_BLOCK_SIZE 64 + +-struct sha256_state { ++struct rtl_sha256_state { + u64 length; + u32 state[8], curlen; + u8 buf[SHA256_BLOCK_SIZE]; + }; + +-void sha256_init(struct sha256_state *md); +-int sha256_process(struct sha256_state *md, const unsigned char *in, ++void rtl_sha256_init(struct rtl_sha256_state *md); ++int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, + unsigned long inlen); +-int sha256_done(struct sha256_state *md, unsigned char *out); ++int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out); + + #endif /* SHA256_I_H */ +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:57:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:43 -0000 Subject: [Buildroot] [git commit branch/next] package/gupnp: switch to https download Message-ID: <20230220205238.482137FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be4b3300085d1c2266a18e6615d9288759438d9c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gupnp/gupnp.hash | 2 +- package/gupnp/gupnp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index cc5e2b5775..823dbd7927 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.3.sha256sum: +# Hash from: https://download.gnome.org/sources/gupnp/1.4/gupnp-1.4.3.sha256sum: sha256 14eda777934da2df743d072489933bd9811332b7b5bf41626b8032efb28b33ba gupnp-1.4.3.tar.xz # Hash for license file: diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index dca747f064..f41f26d2dd 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -7,7 +7,7 @@ GUPNP_VERSION_MAJOR = 1.4 GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).3 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz -GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) +GUPNP_SITE = https://download.gnome.org/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+ GUPNP_LICENSE_FILES = COPYING GUPNP_CPE_ID_VENDOR = gnome From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:43 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8723bu: bump to 2022-12-28 version to fix build failure with Linux 6.1 Message-ID: <20230220205217.398448648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=030cbe37033a3c179c5c51dbd0427cc443efb330 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Let's also drop local patch[0] that has been upstreamed. [0]: https://github.com/lwfinger/rtl8723bu/commit/dde7bddfddddb7212f2d9671391e2096d770c449 Fixes: http://autobuild.buildroot.net/results/cc8/cc84b5f62ca59572f0f52086f157acc0409c03f5/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...Fix-build-failure-on-PowerPc-architecture.patch | 47 ---------------------- package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) diff --git a/package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch b/package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch deleted file mode 100644 index 06cf2d64c1..0000000000 --- a/package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch +++ /dev/null @@ -1,47 +0,0 @@ -From dde7bddfddddb7212f2d9671391e2096d770c449 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sun, 23 Oct 2022 22:57:41 +0200 -Subject: [PATCH] Fix build failure on PowerPc architecture - -In PowerPc Linux only get_ra() exists[0] and conflicts with local get_ra() -that has a completely different purpose. So let's rename local get_ra() -to wifi_get_ra() to make it different from Linux's get_ra(). - -[0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/powerpc/include/asm/disassemble.h#n49 - -Upstream: https://github.com/lwfinger/rtl8723bu/pull/192 -Signed-off-by: Giulio Benetti ---- - hal/rtl8723bu_recv.c | 2 +- - include/wifi.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hal/rtl8723bu_recv.c b/hal/rtl8723bu_recv.c -index a2fc82b..39e5044 100644 ---- a/hal/rtl8723bu_recv.c -+++ b/hal/rtl8723bu_recv.c -@@ -288,7 +288,7 @@ void update_recvframe_phyinfo( - !pattrib->icv_err && !pattrib->crc_err && - _rtw_memcmp(get_hdr_bssid(wlanhdr), get_bssid(&padapter->mlmepriv), ETH_ALEN)); - -- pkt_info.bPacketToSelf = pkt_info.bPacketMatchBSSID && (_rtw_memcmp(get_ra(wlanhdr), myid(&padapter->eeprompriv), ETH_ALEN)); -+ pkt_info.bPacketToSelf = pkt_info.bPacketMatchBSSID && (_rtw_memcmp(wifi_get_ra(wlanhdr), myid(&padapter->eeprompriv), ETH_ALEN)); - - pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID && (GetFrameSubType(wlanhdr) == WIFI_BEACON); - sa = get_ta(wlanhdr); -diff --git a/include/wifi.h b/include/wifi.h -index 5dc32eb..23578cc 100644 ---- a/include/wifi.h -+++ b/include/wifi.h -@@ -373,7 +373,7 @@ __inline static int IS_MCAST(unsigned char *da) - return _FALSE; - } - --__inline static unsigned char * get_ra(unsigned char *pframe) -+__inline static unsigned char * wifi_get_ra(unsigned char *pframe) - { - unsigned char *ra; - ra = GetAddr1Ptr(pframe); --- -2.34.1 - diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 9119abad76..6a28c34773 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 07fece152704f4b5dbd0fd3af842816f95824317f3158fea774f15a6eddac009 rtl8723bu-d79a676a8d3f0bb6ac8af126689c6ac6869cb6f2.tar.gz +sha256 21372b654886c6d100f46636d7807428698bd618e00db1b8b49cfc3037e46d10 rtl8723bu-f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index 82c487b4e1..af1ac9454e 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = d79a676a8d3f0bb6ac8af126689c6ac6869cb6f2 +RTL8723BU_VERSION = f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) From yann.morin.1998 at free.fr Mon Feb 20 20:57:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:43 -0000 Subject: [Buildroot] [git commit branch/next] package/gvfs: switch to https download Message-ID: <20230220205238.62D2A7FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65c47725b02d00b6ffa5acf88176b6b1365c3f7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gvfs/gvfs.hash | 2 +- package/gvfs/gvfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index f4a5364f1f..fc068ddb94 100644 --- a/package/gvfs/gvfs.hash +++ b/package/gvfs/gvfs.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.48/gvfs-1.48.1.sha256sum +# From https://download.gnome.org/sources/gvfs/1.48/gvfs-1.48.1.sha256sum sha256 b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2 gvfs-1.48.1.tar.xz # Hash for license file diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index 4174592455..50efed1abb 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -7,7 +7,7 @@ GVFS_VERSION_MAJOR = 1.48 GVFS_VERSION = $(GVFS_VERSION_MAJOR).1 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz -GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) +GVFS_SITE = https://download.gnome.org/sources/gvfs/$(GVFS_VERSION_MAJOR) GVFS_INSTALL_STAGING = YES GVFS_DEPENDENCIES = \ host-pkgconf \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:44 -0000 Subject: [Buildroot] [git commit branch/next] package/rng-tools: fix build with updated jitterentropy-library Message-ID: <20230220205217.6D858828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d47f7279f516ba2bbc6d1fd9dd37636902b9bad3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit a8807ddbe2 bumped package jitterentropy-library to version 3.4.1 which broke building rng-tools. Add two upstream patches which improve jitterentropy-library detection. Fixes: http://autobuild.buildroot.net/results/a6f/a6f1381b3d1aa2a27412286167f5c8be5f6fdaf8/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...erentropy-detection-to-look-for-the-setti.patch | 30 +++++++++++++++++ ...erentropy-library-to-timeout-fail-on-long.patch | 39 ++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch b/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch new file mode 100644 index 0000000000..553842640d --- /dev/null +++ b/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch @@ -0,0 +1,30 @@ +From e2698477e8abf623c18ab28d33cc894ec882a706 Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Fri, 18 Mar 2022 18:59:52 -0400 +Subject: [PATCH] Adjust jitterentropy detection to look for the settick + function + +Theres no great way to detect if jitterentropy has the internal timer +feature enabled so we have to look for a function that is only defined +when it is enabled + +Signed-off-by: Bernd Kuhls +[downloaded from upstream commit + https://github.com/nhorman/rng-tools/commit/e2698477e8abf623c18ab28d33cc894ec882a706] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e16e1a0..0f5a38e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -94,7 +94,7 @@ AS_IF( + AC_SEARCH_LIBS(jent_version,jitterentropy, + [AM_CONDITIONAL([JITTER], [true]) + AC_DEFINE([HAVE_JITTER],1,[Enable JITTER]) +- AC_CHECK_LIB(jitterentropy, jent_entropy_switch_notime_impl, ++ AC_CHECK_LIB(jitterentropy, jent_notime_settick, + [AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])], + [],-lpthread)], + AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread) diff --git a/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch b/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch new file mode 100644 index 0000000000..9d8dbe2d0b --- /dev/null +++ b/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch @@ -0,0 +1,39 @@ +From c29424f10a0dcbd18ac25607fa1c81c18a960e81 Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Mon, 16 May 2022 13:38:54 -0400 +Subject: [PATCH] Adjust jitterentropy library to timeout/fail on long delay + +[Bernd: removed description of unrelated part of the patch] + +Also while we're at it, I might have a build solution for the presence +of internal timers. When jitterentropy is built without internal +timers, jent_notime_init is defined publically, but when it is built +with timers, its declared as a static symbol, preenting resolution, so +we can test to see if the function exists. If it does we _don't_ have +notime support. The logic is a bit backwards, but i think it works + +Signed-off-by: Bernd Kuhls +[downloaded configure.ac patch from upstream commit + https://github.com/nhorman/rng-tools/commit/57be6d4c90e78ea9ad036a3a6e9b09822ed4d219] +--- + configure.ac | 6 ++--- + rngd_jitter.c | 62 ++++++++++++++++++++++++++++++++++++++------------- + 2 files changed, 49 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 52f2bb5..0af64e7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,9 +101,9 @@ AS_IF( + AC_SEARCH_LIBS(jent_version,jitterentropy, + [AM_CONDITIONAL([JITTER], [true]) + AC_DEFINE([HAVE_JITTER],1,[Enable JITTER]) +- AC_CHECK_LIB(jitterentropy, jent_notime_settick, +- [AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])], +- [],-lpthread)], ++ AC_CHECK_LIB(jitterentropy, jent_notime_init, ++ [], ++ [AC_DEFINE([HAVE_JITTER_NOTIME],1, [Enable JITTER_NOTIME])],-lpthread)], + AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread) + ], [AC_MSG_NOTICE([Disabling JITTER entropy source])] + ) From yann.morin.1998 at free.fr Mon Feb 20 20:57:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:44 -0000 Subject: [Buildroot] [git commit branch/next] package/libgee: switch to https download Message-ID: <20230220205238.99BF27FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=500f40bbc7a7657393dd308490afec3effee6dea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/libgee/libgee.hash | 2 +- package/libgee/libgee.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgee/libgee.hash b/package/libgee/libgee.hash index ea723481e4..f733bf34a8 100644 --- a/package/libgee/libgee.hash +++ b/package/libgee/libgee.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.6.sha256sum +# From https://download.gnome.org/sources/libgee/0.20/libgee-0.20.6.sha256sum sha256 1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d libgee-0.20.6.tar.xz # Hash for license file: diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk index 5ce56a2b3b..36eddef171 100644 --- a/package/libgee/libgee.mk +++ b/package/libgee/libgee.mk @@ -6,7 +6,7 @@ LIBGEE_VERSION_MAJOR = 0.20 LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).6 -LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) +LIBGEE_SITE = https://download.gnome.org/sources/libgee/$(LIBGEE_VERSION_MAJOR) LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 LIBGEE_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:45 -0000 Subject: [Buildroot] [git commit branch/next] package/rsync: add xxhash support Message-ID: <20230220205217.CA0428648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a11ca5b218e42c970858ba1ef83ec8572c326c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 8c7ad462ac..3cdd820fc0 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -19,7 +19,6 @@ RSYNC_CONF_OPTS = \ --with-included-popt=no \ --disable-roll-simd \ --disable-openssl \ - --disable-xxhash \ --disable-zstd \ --disable-lz4 \ --disable-md5-asm @@ -30,4 +29,11 @@ else RSYNC_CONF_OPTS += --disable-acl-support endif +ifeq ($(BR2_PACKAGE_XXHASH),y) +RSYNC_DEPENDENCIES += xxhash +RSYNC_CONF_OPTS += --enable-xxhash +else +RSYNC_CONF_OPTS += --disable-xxhash +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:45 -0000 Subject: [Buildroot] [git commit branch/next] package/xxhash: fix static library install Message-ID: <20230220205217.BC96E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0945e4913fba932217278f484de04cc366415bd6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Install headers when building statically Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ile-add-install_libxxhash.includes-target.patch | 39 ++++++++++++++++++++++ package/xxhash/xxhash.mk | 15 +++++++-- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch b/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch new file mode 100644 index 0000000000..22c8cdaadf --- /dev/null +++ b/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch @@ -0,0 +1,39 @@ +From b7c91f761b6d0b79398d0a064d2d6e34de3dfa47 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 27 Dec 2022 23:12:37 +0100 +Subject: [PATCH] Makefile: add install_libxxhash.includes target + +Add install_libxxhash.includes to be able to install headers when +building and installing the static library + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/Cyan4973/xxHash/pull/776] +--- + Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index cfa5779..2276282 100644 +--- a/Makefile ++++ b/Makefile +@@ -557,6 +557,8 @@ install_libxxhash: libxxhash + $(Q)$(INSTALL_PROGRAM) $(LIBXXH) $(DESTDIR)$(LIBDIR) + $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT_MAJOR) + $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT) ++ ++install_libxxhash.includes: + $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR) # includes + $(Q)$(INSTALL_DATA) xxhash.h $(DESTDIR)$(INCLUDEDIR) + $(Q)$(INSTALL_DATA) xxh3.h $(DESTDIR)$(INCLUDEDIR) # for compatibility, will be removed in v0.9.0 +@@ -586,7 +588,7 @@ install_man: + $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 + + .PHONY: install +-install: install_libxxhash.a install_libxxhash install_libxxhash.pc install_xxhsum install_man ## install libraries, CLI, links and man page ++install: install_libxxhash.a install_libxxhash install_libxxhash.includes install_libxxhash.pc install_xxhsum install_man ## install libraries, CLI, links and man page + @echo xxhash installation completed + + .PHONY: uninstall +-- +2.35.1 + diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index a8f8d1d179..6932113f14 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -15,14 +15,23 @@ XXHASH_INSTALL_TARGETS = install_xxhsum ifeq ($(BR2_STATIC_LIBS),y) XXHASH_TARGETS += libxxhash.a libxxhash.pc -XXHASH_INSTALL_TARGETS += install_libxxhash.a install_libxxhash.pc +XXHASH_INSTALL_TARGETS += \ + install_libxxhash.a \ + install_libxxhash.includes \ + install_libxxhash.pc else ifeq ($(BR2_SHARED_LIBS),y) XXHASH_TARGETS += libxxhash libxxhash.pc -XXHASH_INSTALL_TARGETS += install_libxxhash install_libxxhash.pc +XXHASH_INSTALL_TARGETS += \ + install_libxxhash \ + install_libxxhash.includes \ + install_libxxhash.pc else ifeq ($(BR2_SHARED_STATIC_LIBS),y) XXHASH_TARGETS += libxxhash.a libxxhash libxxhash.pc XXHASH_INSTALL_TARGETS += \ - install_libxxhash.a install_libxxhash install_libxxhash.pc + install_libxxhash.a \ + install_libxxhash \ + install_libxxhash.includes \ + install_libxxhash.pc endif define XXHASH_BUILD_CMDS From yann.morin.1998 at free.fr Mon Feb 20 20:57:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:45 -0000 Subject: [Buildroot] [git commit branch/next] package/libgtk2: switch to https download Message-ID: <20230220205238.BBD34828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d7e304648ffa8f4d88bfd540176e492fcafb015 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/libgtk2/libgtk2.hash | 2 +- package/libgtk2/libgtk2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgtk2/libgtk2.hash b/package/libgtk2/libgtk2.hash index 9b10a1f0ce..7b9a46b697 100644 --- a/package/libgtk2/libgtk2.hash +++ b/package/libgtk2/libgtk2.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.33.sha256sum +# From https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.33.sha256sum sha256 ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da gtk+-2.24.33.tar.xz # Hash for license file: diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index d30e1d9d43..859925e8d3 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -7,7 +7,7 @@ LIBGTK2_VERSION_MAJOR = 2.24 LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).33 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz -LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJOR) +LIBGTK2_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK2_VERSION_MAJOR) LIBGTK2_INSTALL_STAGING = YES LIBGTK2_LICENSE = LGPL-2.0+ LIBGTK2_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:57:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:46 -0000 Subject: [Buildroot] [git commit branch/next] package/libgudev: switch to https download Message-ID: <20230220205238.D31BE86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=824c40d39d16191681baa3869e1f6c5588a31d76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/libgudev/libgudev.hash | 2 +- package/libgudev/libgudev.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgudev/libgudev.hash b/package/libgudev/libgudev.hash index 3933e55de4..90f27a02fc 100644 --- a/package/libgudev/libgudev.hash +++ b/package/libgudev/libgudev.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libgudev/237/libgudev-237.sha256sum +# From https://download.gnome.org/sources/libgudev/237/libgudev-237.sha256sum sha256 0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa libgudev-237.tar.xz # Hash for license file: diff --git a/package/libgudev/libgudev.mk b/package/libgudev/libgudev.mk index 27244c3072..ef0bd997fa 100644 --- a/package/libgudev/libgudev.mk +++ b/package/libgudev/libgudev.mk @@ -6,7 +6,7 @@ LIBGUDEV_VERSION = 237 LIBGUDEV_SOURCE = libgudev-$(LIBGUDEV_VERSION).tar.xz -LIBGUDEV_SITE = http://ftp.gnome.org/pub/GNOME/sources/libgudev/$(LIBGUDEV_VERSION) +LIBGUDEV_SITE = https://download.gnome.org/sources/libgudev/$(LIBGUDEV_VERSION) LIBGUDEV_INSTALL_STAGING = YES LIBGUDEV_DEPENDENCIES = host-pkgconf udev libglib2 LIBGUDEV_LICENSE = LGPL-2.1+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:46 -0000 Subject: [Buildroot] [git commit branch/next] package/modem-manager: bump version to 1.20.2 Message-ID: <20230220205217.970C3828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b95334b71fbdde0f7621b58ed35fa98df9e0966d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Switch package type to meson as the primary supported build system from now on is meson and the autotools support as deprecated. The package tarball is no longer supported, thus the MODEM_MANAGER_SOURCE is changed to the gitlab archive URL. All previously supported options are converted to the meson configuraiton options and support for new ones is added. The new options are: bash_completion, polkit, systemd, qrtr. The dbus build dependency is needed since the meson build system uses dbus pkg-config to determine install locations. The 'udevdir' has to be specified also in case dbus is not installed. Modem-manager will use its own built-in udev rule parser to determine modem specific values. For building with libqmi support version 1.32.2 is required and for libmbim version 1.28.2 is required. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/modem-manager/Config.in | 2 +- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 72 ++++++++++++++++++++++++-------- 3 files changed, 56 insertions(+), 20 deletions(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index c4c723776d..d211d68ee1 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_MODEM_MANAGER depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus - select BR2_PACKAGE_DBUS # runtime dependency + select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV help diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 40c8ad703f..e6967f8d62 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ #Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc -sha256 b464e4925d955a6ca86dd08616e763b26ae46d7fd37dbe281678e34065b1e430 ModemManager-1.18.12.tar.xz +sha256 ba56aa764edc148f58348a589743cf1c1e27c55dcd7ebd820dcedd52fb8d7179 ModemManager-1.20.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index d0c9b7377b..8a0dbba3a4 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,42 +4,78 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.18.12 -MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz -MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager +MODEM_MANAGER_VERSION = 1.20.2 +MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.gz +MODEM_MANAGER_SITE = https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEM_MANAGER_VERSION) MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB MODEM_MANAGER_SELINUX_MODULES = modemmanager -MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) +MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIES) host-libxslt MODEM_MANAGER_INSTALL_STAGING = YES -MODEM_MANAGER_CONF_OPTS = --disable-more-warnings +MODEM_MANAGER_CONF_OPTS = \ + -Dpowerd_suspend_resume=false \ + -Dudevdir=/usr/lib/udev -ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y) -MODEM_MANAGER_DEPENDENCIES += libqmi -MODEM_MANAGER_CONF_OPTS += --with-qmi +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) +MODEM_MANAGER_DEPENDENCIES += libgudev +MODEM_MANAGER_CONF_OPTS += -Dudev=true else -MODEM_MANAGER_CONF_OPTS += --without-qmi +MODEM_MANAGER_CONF_OPTS += -Dudev=false endif -ifeq ($(BR2_PACKAGE_LIBGUDEV),y) -MODEM_MANAGER_DEPENDENCIES += libgudev -MODEM_MANAGER_CONF_OPTS += --with-udev +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y) +MODEM_MANAGER_DEPENDENCIES += libqmi +MODEM_MANAGER_CONF_OPTS += -Dqmi=true else -MODEM_MANAGER_CONF_OPTS += --without-udev +MODEM_MANAGER_CONF_OPTS += -Dqmi=false endif ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBMBIM),y) MODEM_MANAGER_DEPENDENCIES += libmbim -MODEM_MANAGER_CONF_OPTS += --with-mbim +MODEM_MANAGER_CONF_OPTS += -Dmbim=true +else +MODEM_MANAGER_CONF_OPTS += -Dmbim=false +endif + +ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y) +MODEM_MANAGER_DEPENDENCIES += libqrtr-glib +MODEM_MANAGER_CONF_OPTS += -Dqrtr=true +else +MODEM_MANAGER_CONF_OPTS += -Dqrtr=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +MODEM_MANAGER_DEPENDENCIES += systemd +MODEM_MANAGER_CONF_OPTS += \ + -Dsystemd_journal=true \ + -Dsystemd_suspend_resume=true \ + -Dsystemdsystemunitdir=/usr/lib/systemd/system +else +MODEM_MANAGER_CONF_OPTS += \ + -Dsystemd_journal=false \ + -Dsystemd_suspend_resume=false \ + -Dsystemdsystemunitdir=no +endif + +ifeq ($(BR2_PACKAGE_POLKIT),y) +MODEM_MANAGER_DEPENDENCIES += polkit +MODEM_MANAGER_CONF_OPTS += -Dpolkit=strict else -MODEM_MANAGER_CONF_OPTS += --without-mbim +MODEM_MANAGER_CONF_OPTS += -Dpolkit=no endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) MODEM_MANAGER_DEPENDENCIES += gobject-introspection -MODEM_MANAGER_CONF_OPTS += --enable-introspection +MODEM_MANAGER_CONF_OPTS += -Dintrospection=true +else +MODEM_MANAGER_CONF_OPTS += -Dintrospection=false +endif + +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +MODEM_MANAGER_DEPENDENCIES += bash-completion +MODEM_MANAGER_CONF_OPTS += -Dbash_completion=true else -MODEM_MANAGER_CONF_OPTS += --disable-introspection +MODEM_MANAGER_CONF_OPTS += -Dbash_completion=false endif define MODEM_MANAGER_INSTALL_INIT_SYSV @@ -47,4 +83,4 @@ define MODEM_MANAGER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S44modem-manager endef -$(eval $(autotools-package)) +$(eval $(meson-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:57:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:47 -0000 Subject: [Buildroot] [git commit branch/next] package/libpeas: switch to https download Message-ID: <20230220205238.E9AB0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abe3c7f81bba9fea46cc9ea379c6dbab624e447e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/libpeas/libpeas.hash | 2 +- package/libpeas/libpeas.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpeas/libpeas.hash b/package/libpeas/libpeas.hash index c503558f85..f69fd2945f 100644 --- a/package/libpeas/libpeas.hash +++ b/package/libpeas/libpeas.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/GNOME/sources/libpeas/1.32/libpeas-1.32.0.sha256sum +# From https://download.gnome.org/sources/libpeas/1.32/libpeas-1.32.0.sha256sum sha256 d625520fa02e8977029b246ae439bc218968965f1e82d612208b713f1dcc3d0e libpeas-1.32.0.tar.xz # Locally calculated sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libpeas/libpeas.mk b/package/libpeas/libpeas.mk index 5550162e04..3d2e79452c 100644 --- a/package/libpeas/libpeas.mk +++ b/package/libpeas/libpeas.mk @@ -7,7 +7,7 @@ LIBPEAS_VERSION_MAJOR = 1.32 LIBPEAS_VERSION = $(LIBPEAS_VERSION_MAJOR).0 LIBPEAS_SOURCE = libpeas-$(LIBPEAS_VERSION).tar.xz -LIBPEAS_SITE = http://ftp.gnome.org/pub/gnome/sources/libpeas/$(LIBPEAS_VERSION_MAJOR) +LIBPEAS_SITE = https://download.gnome.org/sources/libpeas/$(LIBPEAS_VERSION_MAJOR) LIBPEAS_LICENSE = LGPL-2.1+ LIBPEAS_LICENSE_FILES = COPYING LIBPEAS_CPE_ID_VENDOR = gnome From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:47 -0000 Subject: [Buildroot] [git commit branch/next] package/dbus-cxx: bump to version 2.3.1 Message-ID: <20230220205218.3F20181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f99714d90e08994c697576ca2030cb9392d7b63e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/dbus-cxx/dbus-cxx.hash | 2 +- package/dbus-cxx/dbus-cxx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus-cxx/dbus-cxx.hash b/package/dbus-cxx/dbus-cxx.hash index acb059b91d..6a7a634ced 100644 --- a/package/dbus-cxx/dbus-cxx.hash +++ b/package/dbus-cxx/dbus-cxx.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 45663b6dbc289f133dfdcd8b8de771de3a2d54588954c2eec3f97888b03bd8ad dbus-cxx-2.3.0.tar.gz +sha256 88d4bd1d9af8563bda03f24b26ffe4efbc555ca82ac664ced572b053928f739a dbus-cxx-2.3.1.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 43556195c7..554acaa67d 100644 --- a/package/dbus-cxx/dbus-cxx.mk +++ b/package/dbus-cxx/dbus-cxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_CXX_VERSION = 2.3.0 +DBUS_CXX_VERSION = 2.3.1 DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION)) 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 From yann.morin.1998 at free.fr Mon Feb 20 20:57:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:48 -0000 Subject: [Buildroot] [git commit branch/next] package/libxml2: switch to https download Message-ID: <20230220205239.2805A7FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4426874cd337e59db0fed846e625ba45a4fd43fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/libxml2/libxml2.hash | 2 +- package/libxml2/libxml2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 00daa21a83..6957e2ed87 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.10/libxml2-2.10.3.sha256sum +# From https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.3.sha256sum sha256 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c libxml2-2.10.3.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 321e8b756b..7a01dc4259 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -8,7 +8,7 @@ LIBXML2_VERSION_MAJOR = 2.10 LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).3 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/libxml2/$(LIBXML2_VERSION_MAJOR) + https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = Copyright From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:48 -0000 Subject: [Buildroot] [git commit branch/next] package/lcms2: bump to version 2.14 Message-ID: <20230220205217.D5A8A86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7589bafecd9153d2d7d31978b245e184098753d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://littlecms.com/blog/2022/11/02/lcms2-2.14 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lcms2/lcms2.hash | 6 +++--- package/lcms2/lcms2.mk | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/lcms2/lcms2.hash b/package/lcms2/lcms2.hash index d20cf601fb..700b9746f1 100644 --- a/package/lcms2/lcms2.hash +++ b/package/lcms2/lcms2.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.13 -sha1 72d0a0b7fbaeca12eb0186ab5728eb0f26806b22 lcms2-2.13.1.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.14 +sha1 94350a2638fe58da736e8726048c859b46a69e6f lcms2-2.14.tar.gz # Locally computed: -sha256 d473e796e7b27c5af01bd6d1552d42b45b43457e7182ce9903f38bb748203b88 lcms2-2.13.1.tar.gz +sha256 28474ea6f6591c4d4cee972123587001a4e6e353412a41b3e9e82219818d5740 lcms2-2.14.tar.gz sha256 46d4e05af3bce75332a12d01f19bcce7e32b6bac544be28a64043d0231291e31 COPYING diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index 63750c43f2..743b0ec858 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -4,9 +4,8 @@ # ################################################################################ -LCMS2_VERSION_MAJOR = 2.13 -LCMS2_VERSION = $(LCMS2_VERSION_MAJOR).1 -LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION_MAJOR) +LCMS2_VERSION = 2.14 +LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING LCMS2_CPE_ID_VENDOR = littlecms From yann.morin.1998 at free.fr Mon Feb 20 20:57:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:49 -0000 Subject: [Buildroot] [git commit branch/next] package/metacity: switch to https download Message-ID: <20230220205239.3CF0986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=86b0605de12023c930f530ebb32125556d265a0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/metacity/metacity.hash | 2 +- package/metacity/metacity.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/metacity/metacity.hash b/package/metacity/metacity.hash index 583db0f204..2aca099038 100644 --- a/package/metacity/metacity.hash +++ b/package/metacity/metacity.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/metacity/2.25/metacity-2.25.1.sha256sum +# From https://download.gnome.org/sources/metacity/2.25/metacity-2.25.1.sha256sum sha256 fb2ede4ac02d7da08d3c3323fb76afaf945c8cccc07cb2d3a4b7f44fb49f1c47 metacity-2.25.1.tar.bz2 # Locally computed diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk index f5a6d4afd9..5756658300 100644 --- a/package/metacity/metacity.mk +++ b/package/metacity/metacity.mk @@ -8,7 +8,7 @@ METACITY_VERSION_MAJOR = 2.25 METACITY_VERSION = $(METACITY_VERSION_MAJOR).1 METACITY_SOURCE = metacity-$(METACITY_VERSION).tar.bz2 -METACITY_SITE = http://ftp.gnome.org/pub/gnome/sources/metacity/$(METACITY_VERSION_MAJOR) +METACITY_SITE = https://download.gnome.org/sources/metacity/$(METACITY_VERSION_MAJOR) METACITY_LICENSE = GPL-2.0+ METACITY_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:50 -0000 Subject: [Buildroot] [git commit branch/next] package/mutt: bump to version 2.2.9 Message-ID: <20230220205217.F031A81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a2afdb7b1180bed3b6ad92c22c908805467ead3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Mutt 2.2.9 was released on November 12, 2022. This is a bug-fix release, fixing a build issue with recent GPGME releases. Mutt 2.2.8 was released on November 5, 2022. This is a bug-fix release, fixing a possible crash when using GPGME to view an application/pgp key block. It also makes some changes to resizing and window size logic, and enables batch-mode IMAP Fcc'ing. https://gitlab.com/muttmua/mutt/-/blob/mutt-2-2-9-rel/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index 27e439183a..c475641ab5 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eb13858f58bb369f477bf652d90e9b6aaddd0d610acbea3455049e5efad36df1 mutt-2.2.7.tar.gz +sha256 fa531b231d58fe1f30ceda0ed626683ea9ebdfb76ce47ef8bb27c2f77422cffb mutt-2.2.9.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 7a4bc1b10c..0a98396d88 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.2.7 +MUTT_VERSION = 2.2.9 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:50 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: add libdeflate optional dependency Message-ID: <20230220205218.189D38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08ca8ff727c87fce2c6edcb9fc2df0885c22543b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libdeflate is an optional dependency which is enabled by default since version 4.2.0 and https://gitlab.com/libtiff/libtiff/-/commit/3a2de853a932bd0ea79d1677d319841edb736c38 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tiff/Config.in | 5 +++++ package/tiff/tiff.mk | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index f842c2ead8..cc9aa5cfd0 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -11,6 +11,11 @@ config BR2_PACKAGE_TIFF_CCITT bool "CCITT Group 3 & 4 support" default y +config BR2_PACKAGE_TIFF_LIBDEFLATE + bool "Libdeflate usage (still requires Zlib)" + select BR2_PACKAGE_LIBDEFLATE + select BR2_PACKAGE_TIFF_ZLIB + config BR2_PACKAGE_TIFF_PACKBITS bool "Macintosh PackBits algorithm" default y diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 7981bdf2c9..a753065fde 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -33,6 +33,13 @@ ifneq ($(BR2_PACKAGE_TIFF_CCITT),y) TIFF_CONF_OPTS += --disable-ccitt endif +ifeq ($(BR2_PACKAGE_TIFF_LIBDEFLATE),y) +TIFF_CONF_OPTS += --enable-libdeflate +TIFF_DEPENDENCIES += libdeflate +else +TIFF_CONF_OPTS += --disable-libdeflate +endif + ifneq ($(BR2_PACKAGE_TIFF_PACKBITS),y) TIFF_CONF_OPTS += --disable-packbits endif From yann.morin.1998 at free.fr Mon Feb 20 20:57:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:50 -0000 Subject: [Buildroot] [git commit branch/next] package/mono-gtksharp3: switch to https download Message-ID: <20230220205239.52C03828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97ceb937a1f3c359b14b524f636f5fddfa09d48d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/mono-gtksharp3/mono-gtksharp3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mono-gtksharp3/mono-gtksharp3.mk b/package/mono-gtksharp3/mono-gtksharp3.mk index 126aabeda2..27fcda9482 100644 --- a/package/mono-gtksharp3/mono-gtksharp3.mk +++ b/package/mono-gtksharp3/mono-gtksharp3.mk @@ -6,7 +6,7 @@ MONO_GTKSHARP3_VERSION_MAJOR = 2.99 MONO_GTKSHARP3_VERSION = $(MONO_GTKSHARP3_VERSION_MAJOR).3 -MONO_GTKSHARP3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk-sharp/$(MONO_GTKSHARP3_VERSION_MAJOR) +MONO_GTKSHARP3_SITE = https://download.gnome.org/sources/gtk-sharp/$(MONO_GTKSHARP3_VERSION_MAJOR) MONO_GTKSHARP3_SOURCE = gtk-sharp-$(MONO_GTKSHARP3_VERSION).tar.xz MONO_GTKSHARP3_LICENSE = LGPL-2.0, MIT (cairo) MONO_GTKSHARP3_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:51 -0000 Subject: [Buildroot] [git commit branch/next] package/wilc-driver: fix build failure up to Linux 6.1 Message-ID: <20230220205217.A3F428648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=482d18a40d98dcc156437c9a01b869b510e93fc4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add patches pending upstream[0] to handle various data types and api changes up to Linux 6.1. [0]: https://github.com/embeddedTS/wilc3000-external-module/pull/2 Fixes: http://autobuild.buildroot.net/results/6aa7475a21a6060e9fce3552f73e6e7100a8b2aa Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...-fix-missing-prandom_u32-with-Linux-6.1.0.patch | 34 ++++ ...pi.c-fix-build-failure-on-remove-callback.patch | 44 +++++ ...fix-build-failure-with-Linux-5.19-and-6.1.patch | 98 ++++++++++ ...station_parameters-Linux-6.1-build-failur.patch | 216 +++++++++++++++++++++ 4 files changed, 392 insertions(+) diff --git a/package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch b/package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch new file mode 100644 index 0000000000..2f10627301 --- /dev/null +++ b/package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch @@ -0,0 +1,34 @@ +From f80e4343fa0a4d8b22933d1704c85a771fe234a4 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 19:56:46 +0100 +Subject: [PATCH] cfg80211.c: fix missing prandom_u32() with Linux >= 6.1.0 + +prandom_u32() previously was only calling get_random_u32() so it's been +dropped with Linux 6.1.0. So let's directly call get_random_u32() if Linux +version >= 6.1.0. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cfg80211.c b/cfg80211.c +index 016aa06..41edd02 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -1422,7 +1422,11 @@ static int mgmt_tx(struct wiphy *wiphy, + const u8 *vendor_ie; + int ret = 0; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ *cookie = get_random_u32(); ++#else + *cookie = prandom_u32(); ++#endif + priv->tx_cookie = *cookie; + mgmt = (const struct ieee80211_mgmt *)buf; + +-- +2.34.1 + diff --git a/package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch b/package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch new file mode 100644 index 0000000000..87306dfa12 --- /dev/null +++ b/package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch @@ -0,0 +1,44 @@ +From a88819bd63f977b5a33d72a2b9e264ce104726bd Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 21:02:12 +0100 +Subject: [PATCH] spi.c: fix build failure on remove callback + +Starting from Linux 5.18 remove callback returns void, so let's deal with +it depending on Linux version >= 5.18. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + spi.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/spi.c b/spi.c +index 96c51fe..f7b43e2 100644 +--- a/spi.c ++++ b/spi.c +@@ -211,7 +211,11 @@ free: + return ret; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)) ++static void wilc_bus_remove(struct spi_device *spi) ++#else + static int wilc_bus_remove(struct spi_device *spi) ++#endif + { + struct wilc *wilc = spi_get_drvdata(spi); + +@@ -220,7 +224,10 @@ static int wilc_bus_remove(struct spi_device *spi) + + wilc_netdev_cleanup(wilc); + wilc_bt_deinit(); ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)) + return 0; ++#endif + } + + static int wilc_spi_suspend(struct device *dev) +-- +2.34.1 + diff --git a/package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch b/package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch new file mode 100644 index 0000000000..785b8904b2 --- /dev/null +++ b/package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch @@ -0,0 +1,98 @@ +From a608cdd7903505217529317c04b5b58cb7e25081 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 21:06:43 +0100 +Subject: [PATCH] cfg80211.c: fix build failure with Linux 5.19 and 6.1 + +Starting from Linux 5.19 stop_ap() requires unsigned int link_id as +parameter. Then from Linux 6.1 on lot of other cfg80211 APIs require +int link_id to deal with MLO, so let's add that parameter too. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 35 +++++++++++++++++++++++++++++------ + 1 file changed, 29 insertions(+), 6 deletions(-) + +diff --git a/cfg80211.c b/cfg80211.c +index 41edd02..57c777d 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -674,8 +674,12 @@ static int wilc_wfi_cfg_copy_wpa_info(struct wilc_wfi_key *key_info, + return 0; + } + +-static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, +- bool pairwise, const u8 *mac_addr, struct key_params *params) ++static int add_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif ++ u8 key_index, bool pairwise, const u8 *mac_addr, ++ struct key_params *params) + + { + int ret = 0, keylen = params->key_len, seqlen = params->seq_len; +@@ -792,6 +796,9 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, + } + + static int del_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif + u8 key_index, + bool pairwise, + const u8 *mac_addr) +@@ -833,9 +840,13 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev, + return ret; + } + +-static int get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, +- bool pairwise, const u8 *mac_addr, void *cookie, +- void (*callback)(void *cookie, struct key_params *)) ++static int get_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif ++ u8 key_index, bool pairwise, const u8 *mac_addr, ++ void *cookie, void (*callback)(void *cookie, ++ struct key_params *)) + { + struct wilc_vif *vif = netdev_priv(netdev); + struct wilc_priv *priv = &vif->priv; +@@ -877,12 +888,18 @@ static int get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, + + /* wiphy_new() will WARN if not present*/ + static int set_default_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif + u8 key_index, bool unicast, bool multicast) + { + return 0; + } + + static int set_default_mgmt_key (struct wiphy *wiphy,struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif + u8 key_index) + { + return 0; +@@ -1814,7 +1831,13 @@ static int change_beacon(struct wiphy *wiphy, struct net_device *dev, + return wilc_add_beacon(vif, 0, 0, beacon); + } + +-static int stop_ap(struct wiphy *wiphy, struct net_device *dev) ++static int stop_ap(struct wiphy *wiphy, struct net_device *dev ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)) ++ , unsigned int link_id ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ , int link_id ++#endif ++ ) + { + int ret; + struct wilc_vif *vif = netdev_priv(dev); +-- +2.34.1 + diff --git a/package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch b/package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch new file mode 100644 index 0000000000..faee805b5a --- /dev/null +++ b/package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch @@ -0,0 +1,216 @@ +From 5f022c4d3be32493d500be82f51032ef4fb3cdc0 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 21:08:45 +0100 +Subject: [PATCH] Fix struct station_parameters Linux 6.1 build failure + +Starting from Linux 6.1 struct station_parameters has changed by moving +some member to its child struct link_station_parameters. Let's extract the +values of the needed members into local values at the beginning of +functions and substitute the member access with the local variables. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 48 ++++++++++++++++++++++++++++++++---------------- + hif.c | 44 ++++++++++++++++++++++++++++++++------------ + 2 files changed, 64 insertions(+), 28 deletions(-) + +diff --git a/cfg80211.c b/cfg80211.c +index 57c777d..bdd480c 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -1866,6 +1866,14 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev, + struct wilc_vif *vif = netdev_priv(dev); + struct wilc_priv *priv = &vif->priv; + u8 *assoc_bss = priv->assoc_stainfo.sta_associated_bss[params->aid]; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++#endif + + if (vif->iftype == WILC_AP_MODE || vif->iftype == WILC_GO_MODE) { + memcpy(assoc_bss, mac, ETH_ALEN); +@@ -1879,27 +1887,27 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev, + params->aid); + PRINT_INFO(vif->ndev, HOSTAPD_DBG, + "Number of supported rates = %d\n", +- params->supported_rates_len); ++ supported_rates_len); + + PRINT_INFO(vif->ndev, CFG80211_DBG, "IS HT supported = %d\n", +- (!params->ht_capa) ? false : true); ++ (!ht_capa) ? false : true); + +- if (params->ht_capa) { ++ if (ht_capa) { + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Capability Info = %d\n", +- params->ht_capa->cap_info); ++ ht_capa->cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "AMPDU Params = %d\n", +- params->ht_capa->ampdu_params_info); ++ ht_capa->ampdu_params_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "HT Extended params= %d\n", +- params->ht_capa->extended_ht_cap_info); ++ ht_capa->extended_ht_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Tx Beamforming Cap= %d\n", +- params->ht_capa->tx_BF_cap_info); ++ ht_capa->tx_BF_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Antenna selection info = %d\n", +- params->ht_capa->antenna_selection_info); ++ ht_capa->antenna_selection_info); + } + + PRINT_INFO(vif->ndev, CFG80211_DBG, "Flag Mask = %d\n", +@@ -1966,6 +1974,14 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev, + { + int ret = 0; + struct wilc_vif *vif = netdev_priv(dev); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++#endif + + PRINT_D(vif->ndev, CFG80211_DBG, "Change station parameters\n"); + +@@ -1976,25 +1992,25 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev, + params->aid); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Number of supported rates = %d\n", +- params->supported_rates_len); ++ supported_rates_len); + PRINT_INFO(vif->ndev, CFG80211_DBG, "IS HT supported = %d\n", +- (!params->ht_capa) ? false : true); +- if (params->ht_capa) { ++ (!ht_capa) ? false : true); ++ if (ht_capa) { + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Capability Info = %d\n", +- params->ht_capa->cap_info); ++ ht_capa->cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "AMPDU Params = %d\n", +- params->ht_capa->ampdu_params_info); ++ ht_capa->ampdu_params_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "HT Extended params= %d\n", +- params->ht_capa->extended_ht_cap_info); ++ ht_capa->extended_ht_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Tx Beamforming Cap= %d\n", +- params->ht_capa->tx_BF_cap_info); ++ ht_capa->tx_BF_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Antenna selection info = %d\n", +- params->ht_capa->antenna_selection_info); ++ ht_capa->antenna_selection_info); + } + PRINT_INFO(vif->ndev, CFG80211_DBG, "Flag Mask = %d\n", + params->sta_flags_mask); +diff --git a/hif.c b/hif.c +index 3f672a0..1a7365b 100644 +--- a/hif.c ++++ b/hif.c +@@ -2249,6 +2249,16 @@ int wilc_add_station(struct wilc_vif *vif, const u8 *mac, + int result; + struct host_if_msg *msg; + struct add_sta_param *sta_params; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++ const u8 *supported_rates = link_sta_params->supported_rates; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++ const u8 *supported_rates = params->supported_rates; ++#endif + + PRINT_INFO(vif->ndev, HOSTINF_DBG, + "Setting adding station message queue params\n"); +@@ -2260,20 +2270,20 @@ int wilc_add_station(struct wilc_vif *vif, const u8 *mac, + sta_params = &msg->body.add_sta_info; + memcpy(sta_params->bssid, mac, ETH_ALEN); + sta_params->aid = params->aid; +- if (!params->ht_capa) { ++ if (!ht_capa) { + sta_params->ht_supported = false; + } else { + sta_params->ht_supported = true; +- memcpy(&sta_params->ht_capa, params->ht_capa, ++ memcpy(&sta_params->ht_capa, ht_capa, + sizeof(struct ieee80211_ht_cap)); + } + sta_params->flags_mask = params->sta_flags_mask; + sta_params->flags_set = params->sta_flags_set; + +- sta_params->supported_rates_len = params->supported_rates_len; +- if (params->supported_rates_len > 0) { +- sta_params->supported_rates = kmemdup(params->supported_rates, +- params->supported_rates_len, ++ sta_params->supported_rates_len = supported_rates_len; ++ if (supported_rates_len > 0) { ++ sta_params->supported_rates = kmemdup(supported_rates, ++ supported_rates_len, + GFP_KERNEL); + if (!sta_params->supported_rates) { + kfree(msg); +@@ -2397,6 +2407,16 @@ int wilc_edit_station(struct wilc_vif *vif, const u8 *mac, + int result; + struct host_if_msg *msg; + struct add_sta_param *sta_params; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++ const u8 *supported_rates = link_sta_params->supported_rates; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++ const u8 *supported_rates = params->supported_rates; ++#endif + + PRINT_INFO(vif->ndev, HOSTINF_DBG, + "Setting editing station message queue params\n"); +@@ -2408,20 +2428,20 @@ int wilc_edit_station(struct wilc_vif *vif, const u8 *mac, + sta_params = &msg->body.edit_sta_info; + memcpy(sta_params->bssid, mac, ETH_ALEN); + sta_params->aid = params->aid; +- if (!params->ht_capa) { ++ if (!ht_capa) { + sta_params->ht_supported = false; + } else { + sta_params->ht_supported = true; +- memcpy(&sta_params->ht_capa, params->ht_capa, ++ memcpy(&sta_params->ht_capa, ht_capa, + sizeof(struct ieee80211_ht_cap)); + } + sta_params->flags_mask = params->sta_flags_mask; + sta_params->flags_set = params->sta_flags_set; + +- sta_params->supported_rates_len = params->supported_rates_len; +- if (params->supported_rates_len > 0) { +- sta_params->supported_rates = kmemdup(params->supported_rates, +- params->supported_rates_len, ++ sta_params->supported_rates_len = supported_rates_len; ++ if (supported_rates_len > 0) { ++ sta_params->supported_rates = kmemdup(supported_rates, ++ supported_rates_len, + GFP_KERNEL); + if (!sta_params->supported_rates) { + kfree(msg); +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:57:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:51 -0000 Subject: [Buildroot] [git commit branch/next] package/pangomm: switch to https download Message-ID: <20230220205239.68F2786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3ecb398b113439351e8e26122763028efce10cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/pangomm/pangomm.hash | 2 +- package/pangomm/pangomm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pangomm/pangomm.hash b/package/pangomm/pangomm.hash index 3fba695831..0fb40e6568 100644 --- a/package/pangomm/pangomm.hash +++ b/package/pangomm/pangomm.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/pangomm/2.48/pangomm-2.48.2.sha256sum +# From https://download.gnome.org/sources/pangomm/2.48/pangomm-2.48.2.sha256sum sha256 e1d75522c53f462799875cd247f9b49c91ced4b1abe68387ac35b271392d4ea5 pangomm-2.48.2.tar.xz # Locally computed sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/pangomm/pangomm.mk b/package/pangomm/pangomm.mk index af90d69c4e..e5b237197b 100644 --- a/package/pangomm/pangomm.mk +++ b/package/pangomm/pangomm.mk @@ -7,7 +7,7 @@ PANGOMM_VERSION_MAJOR = 2.48 PANGOMM_VERSION = $(PANGOMM_VERSION_MAJOR).2 PANGOMM_SOURCE = pangomm-$(PANGOMM_VERSION).tar.xz -PANGOMM_SITE = http://ftp.gnome.org/pub/gnome/sources/pangomm/$(PANGOMM_VERSION_MAJOR) +PANGOMM_SITE = https://download.gnome.org/sources/pangomm/$(PANGOMM_VERSION_MAJOR) PANGOMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) PANGOMM_LICENSE_FILES = COPYING COPYING.tools PANGOMM_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:52 -0000 Subject: [Buildroot] [git commit branch/next] package/python-aiohttp-remotes: bump to version 1.2.0 Message-ID: <20230220205218.6BBB681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65d14c82db6e6c4555cc83b65ff22578e4525601 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate from distutils to flit package infrastructure. Add a patch fixing incorrect flit requires/build-backend in pyproject.toml. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...0001-Fix-flit_core-build-requires-backend.patch | 32 ++++++++++++++++++++++ .../python-aiohttp-remotes.hash | 4 +-- .../python-aiohttp-remotes.mk | 6 ++-- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch b/package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch new file mode 100644 index 0000000000..cf940eaf87 --- /dev/null +++ b/package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch @@ -0,0 +1,32 @@ +From 3d39ee9a03a1c96b8e798dc6acf98165da31da1f Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 11 Mar 2022 12:59:53 -0700 +Subject: [PATCH] Fix flit_core build requires/backend. + +Only flit_core should be required by pyproject.toml, the regular flit +package is the pep517 frontend which is not what should be set for the +build system. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/aio-libs/aiohttp-remotes/pull/355] +--- + pyproject.toml | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 214d64d..8c6b882 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,6 +1,6 @@ + [build-system] +-requires=["flit"] +-build-backend="flit.buildapi" ++requires=["flit_core"] ++build-backend="flit_core.buildapi" + + [tool.flit.metadata] + module="aiohttp_remotes" +-- +2.38.1 + diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash index 595340d5d8..51c5cf08b4 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-remotes/json -md5 da13880f25ec3b9cf98c7baff92835a2 aiohttp_remotes-1.1.0.tar.gz -sha256 e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174 aiohttp_remotes-1.1.0.tar.gz +md5 c46a71df656e7f1e111684ced68a85d0 aiohttp_remotes-1.2.0.tar.gz +sha256 f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c aiohttp_remotes-1.2.0.tar.gz # Locally computed sha256 checksums sha256 4e7d0edf250abe2a28027788b8c55a53d1b5c9ff961b8a00643c76aed637ba13 LICENSE diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk index e2bc3e1c18..e0ec789f41 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_AIOHTTP_REMOTES_VERSION = 1.1.0 +PYTHON_AIOHTTP_REMOTES_VERSION = 1.2.0 PYTHON_AIOHTTP_REMOTES_SOURCE = aiohttp_remotes-$(PYTHON_AIOHTTP_REMOTES_VERSION).tar.gz -PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/e3/fc/5523010172e2d8685a8934fbb49d564118c9ebc1e4233a62b77310f979db -PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = distutils +PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/54/05/7c4be6171cc78a13171a4f89e5d308c4a636bdd8ee36101367e99e410ed8 +PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = flit PYTHON_AIOHTTP_REMOTES_LICENSE = MIT PYTHON_AIOHTTP_REMOTES_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:57:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:52 -0000 Subject: [Buildroot] [git commit branch/next] package/vte: switch to https download Message-ID: <20230220205239.8CDF48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4befb442e2fe1e5438fa5cee8c8a79ded69c832 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/vte/vte.hash | 2 +- package/vte/vte.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vte/vte.hash b/package/vte/vte.hash index 90818d31f3..8c84dfce1a 100644 --- a/package/vte/vte.hash +++ b/package/vte/vte.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/vte/0.66/vte-0.66.2.sha256sum +# Hash from: https://download.gnome.org/sources/vte/0.66/vte-0.66.2.sha256sum sha256 e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976 vte-0.66.2.tar.xz # Hash for license file: diff --git a/package/vte/vte.mk b/package/vte/vte.mk index ceb2f09d67..a68d96aa12 100644 --- a/package/vte/vte.mk +++ b/package/vte/vte.mk @@ -7,7 +7,7 @@ VTE_VERSION_MAJOR = 0.66 VTE_VERSION = $(VTE_VERSION_MAJOR).2 VTE_SOURCE = vte-$(VTE_VERSION).tar.xz -VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) +VTE_SITE = https://download.gnome.org/sources/vte/$(VTE_VERSION_MAJOR) VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) VTE_LICENSE = LGPL-3.0+ VTE_LICENSE_FILES = COPYING.LGPL3 From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:53 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-image-exiftool: new package Message-ID: <20230220205218.5DB278648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e4b0d8be54ce6dd9c54f1c04eeb752db2f0dcf3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/perl-image-exiftool/Config.in | 8 ++++++++ package/perl-image-exiftool/perl-image-exiftool.hash | 6 ++++++ package/perl-image-exiftool/perl-image-exiftool.mk | 14 ++++++++++++++ 4 files changed, 29 insertions(+) diff --git a/package/Config.in b/package/Config.in index 0c77f7c022..41e15ca77f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -839,6 +839,7 @@ menu "Perl libraries/modules" source "package/perl-http-multipartparser/Config.in" source "package/perl-http-negotiate/Config.in" source "package/perl-i18n/Config.in" + source "package/perl-image-exiftool/Config.in" source "package/perl-io-html/Config.in" source "package/perl-io-interface/Config.in" source "package/perl-io-socket-multicast/Config.in" diff --git a/package/perl-image-exiftool/Config.in b/package/perl-image-exiftool/Config.in new file mode 100644 index 0000000000..3bc72ba634 --- /dev/null +++ b/package/perl-image-exiftool/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PERL_IMAGE_EXIFTOOL + bool "perl-image-exiftool" + help + ExifTool is a customizable set of Perl modules plus a + full-featured command-line application for reading and writing + meta information in a wide variety of image files. + + https://metacpan.org/release/Image-ExifTool diff --git a/package/perl-image-exiftool/perl-image-exiftool.hash b/package/perl-image-exiftool/perl-image-exiftool.hash new file mode 100644 index 0000000000..ac148aa89b --- /dev/null +++ b/package/perl-image-exiftool/perl-image-exiftool.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 75dd9d375c1c4798a082dda79eaf6ba7 Image-ExifTool-12.50.tar.gz +sha256 bce841fc5c10302f0f3ef7678c3bf146953a8c065c0ba18c41f734007e2ec0a8 Image-ExifTool-12.50.tar.gz + +# computed by scancpan +sha256 63502bb7fd68b3b8265304d88932f70f1be82751cbc37936d1d62956582310fe README diff --git a/package/perl-image-exiftool/perl-image-exiftool.mk b/package/perl-image-exiftool/perl-image-exiftool.mk new file mode 100644 index 0000000000..42adb04d3a --- /dev/null +++ b/package/perl-image-exiftool/perl-image-exiftool.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-image-exiftool +# +################################################################################ + +PERL_IMAGE_EXIFTOOL_VERSION = 12.50 +PERL_IMAGE_EXIFTOOL_SOURCE = Image-ExifTool-$(PERL_IMAGE_EXIFTOOL_VERSION).tar.gz +PERL_IMAGE_EXIFTOOL_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/EX/EXIFTOOL +PERL_IMAGE_EXIFTOOL_LICENSE = Artistic or GPL-1.0+ +PERL_IMAGE_EXIFTOOL_LICENSE_FILES = README +PERL_IMAGE_EXIFTOOL_DISTNAME = Image-ExifTool + +$(eval $(perl-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:54 -0000 Subject: [Buildroot] [git commit branch/next] package/rsync: add openssl support Message-ID: <20230220205218.B433D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80fa5672da85a110e60be0d2143e85f9e08a0f4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 9c7824f575..d2fa47d39a 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -18,7 +18,6 @@ RSYNC_CONF_OPTS = \ --with-included-zlib=no \ --with-included-popt=no \ --disable-roll-simd \ - --disable-openssl \ --disable-md5-asm ifeq ($(BR2_PACKAGE_ACL),y) @@ -34,6 +33,13 @@ else RSYNC_CONF_OPTS += --disable-lz4 endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +RSYNC_DEPENDENCIES += openssl +RSYNC_CONF_OPTS += --enable-openssl +else +RSYNC_CONF_OPTS += --disable-openssl +endif + ifeq ($(BR2_PACKAGE_XXHASH),y) RSYNC_DEPENDENCIES += xxhash RSYNC_CONF_OPTS += --enable-xxhash From peter at korsgaard.com Mon Feb 20 20:57:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:54 -0000 Subject: [Buildroot] [git commit branch/next] package/timescaledb: bump version to 2.9.1 Message-ID: <20230220205239.D1ADC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5d73033b8683df83d0ca9eb172b885d33a5ea64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/timescale/timescaledb/releases/tag/2.9.1 Signed-off-by: Maxim Kochetkov 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 a970ffa1ad..a6560eb326 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 666f5427cb036500bca731d24d845285299cff82f576ad4474f85da682b2ee78 timescaledb-2.9.0.tar.gz +sha256 883638f2e79d25ec88ee58f603f3c81c999b6364cb4c799919d363f04089b47b timescaledb-2.9.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 7530368498..44e365285b 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.9.0 +TIMESCALEDB_VERSION = 2.9.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:55 -0000 Subject: [Buildroot] [git commit branch/next] package/python-munch: select missing runtime dependencies Message-ID: <20230220205219.046358648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72576a661faf8e9d8021a8b110ce9318a9bc8f38 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next munch requires python-setuptools and python-six packages at runtime. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-munch/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-munch/Config.in b/package/python-munch/Config.in index 9db2623674..ceb9fbaf32 100644 --- a/package/python-munch/Config.in +++ b/package/python-munch/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_MUNCH bool "python-munch" + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime help Munch is a dictionary that supports attribute-style access, a la JavaScript. From peter at korsgaard.com Mon Feb 20 20:57:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:55 -0000 Subject: [Buildroot] [git commit branch/next] package/tcpdump: bump to version 4.99.3 Message-ID: <20230220205239.EA972828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5bce041aec61ac9925d5059edf13c9499896daac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/tcpdump/tcpdump.hash | 4 ++-- package/tcpdump/tcpdump.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index a950d3fa66..e548e32626 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature at -# https://www.tcpdump.org/release/tcpdump-4.99.2.tar.gz.sig +# https://www.tcpdump.org/release/tcpdump-4.99.3.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 f4304357d34b79d46f4e17e654f1f91f9ce4e3d5608a1badbd53295a26fb44d5 tcpdump-4.99.2.tar.gz +sha256 ad75a6ed3dc0d9732945b2e5483cb41dc8b4b528a169315e499c6861952e73b3 tcpdump-4.99.3.tar.gz sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index c38d46e2cd..7a679ce4bf 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.99.2 +TCPDUMP_VERSION = 4.99.3 TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:56 -0000 Subject: [Buildroot] [git commit branch/next] package/wireshark: security bump to version 3.4.16 Message-ID: <20230220205218.7C3DF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b86de52da2141ed289ad2892c34d3110d02f7b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-3190: Infinite loop in the F5 Ethernet Trailer protocol dissector in Wireshark 3.6.0 to 3.6.7 and 3.4.0 to 3.4.15 allows denial of service via packet injection or crafted capture file https://www.wireshark.org/security/wnpa-sec-2022-06.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- 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 db1f71e9ef..56363e717f 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.12.txt -sha1 91ca69b0029e58b9c824266237ab392a62f0a248 wireshark-3.4.12.tar.xz -sha256 881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca wireshark-3.4.12.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.16.txt +sha1 b0e64d5fdd6701106d94bdc8f59dd40a34c7c807 wireshark-3.4.16.tar.xz +sha256 6acb3155b89b65bcdbcdac7a9e6a59013a6e21d8ae6a8249a9af4fe9ce3d91ba wireshark-3.4.16.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index e5d5e6f677..5da344fc55 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.12 +WIRESHARK_VERSION = 3.4.16 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:57 -0000 Subject: [Buildroot] [git commit branch/next] package/xxhash: optimize XXHASH_{TARGETS, INSTALL_TARGETS} Message-ID: <20230220205218.8A26186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3de4ae012141803bdf8abda12e27d10e55f6953f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Optimize XXHASH_{TARGETS,INSTALL_TARGETS} as suggested by Thomas Petazzoni in https://patchwork.ozlabs.org/project/buildroot/patch/20221228221522.280696-1-fontaine.fabrice at gmail.com/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xxhash/xxhash.mk | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 6932113f14..04bc98690f 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -10,28 +10,20 @@ XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) XXHASH_LICENSE_FILES = LICENSE cli/COPYING XXHASH_INSTALL_STAGING = YES -XXHASH_TARGETS = xxhsum -XXHASH_INSTALL_TARGETS = install_xxhsum - -ifeq ($(BR2_STATIC_LIBS),y) -XXHASH_TARGETS += libxxhash.a libxxhash.pc -XXHASH_INSTALL_TARGETS += \ - install_libxxhash.a \ - install_libxxhash.includes \ - install_libxxhash.pc -else ifeq ($(BR2_SHARED_LIBS),y) -XXHASH_TARGETS += libxxhash libxxhash.pc -XXHASH_INSTALL_TARGETS += \ - install_libxxhash \ - install_libxxhash.includes \ - install_libxxhash.pc -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -XXHASH_TARGETS += libxxhash.a libxxhash libxxhash.pc -XXHASH_INSTALL_TARGETS += \ - install_libxxhash.a \ - install_libxxhash \ +XXHASH_TARGETS = xxhsum libxxhash.pc +XXHASH_INSTALL_TARGETS = \ install_libxxhash.includes \ - install_libxxhash.pc + install_libxxhash.pc \ + install_xxhsum + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +XXHASH_TARGETS += libxxhash.a +XXHASH_INSTALL_TARGETS += install_libxxhash.a +endif + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +XXHASH_TARGETS += libxxhash +XXHASH_INSTALL_TARGETS += install_libxxhash endif define XXHASH_BUILD_CMDS From peter at korsgaard.com Mon Feb 20 20:57:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:58 -0000 Subject: [Buildroot] [git commit branch/next] package/c-icap-modules: bump to version 0.5.5 Message-ID: <20230220205240.4409081979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58cc22a6d095b9b589e5b001e005032589749084 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://sourceforge.net/p/c-icap/news/2021/03/the-c-icap-modules-055-is-released Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/c-icap-modules/c-icap-modules.hash | 6 +++--- package/c-icap-modules/c-icap-modules.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/c-icap-modules/c-icap-modules.hash b/package/c-icap-modules/c-icap-modules.hash index cc7949a092..110ffd4de3 100644 --- a/package/c-icap-modules/c-icap-modules.hash +++ b/package/c-icap-modules/c-icap-modules.hash @@ -1,7 +1,7 @@ # From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.5.x/ -md5 2f8c174f7a5414616f5a0a976ac4a221 c_icap_modules-0.5.4.tar.gz -sha1 ec7bb138d7775895cd8b2e12adc41dbf48eba1b7 c_icap_modules-0.5.4.tar.gz +md5 ca6d5d124a4668d63affcaa5ab083e57 c_icap_modules-0.5.5.tar.gz +sha1 67be484a93fe662a7735ee06e1d34d82b54469a8 c_icap_modules-0.5.5.tar.gz # Locally calculated -sha256 87409920c66027204e9cca5f20e137b63cd12daf6dfcd85c1fa62ab2bd1c57cc c_icap_modules-0.5.4.tar.gz +sha256 6a42f1fdd8c35ad38d29f7d3c10f925471977f217086352e146cf95e45f2b5b5 c_icap_modules-0.5.5.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/c-icap-modules/c-icap-modules.mk b/package/c-icap-modules/c-icap-modules.mk index 2eaa141afe..e9bbbdb284 100644 --- a/package/c-icap-modules/c-icap-modules.mk +++ b/package/c-icap-modules/c-icap-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ICAP_MODULES_VERSION = 0.5.4 +C_ICAP_MODULES_VERSION = 0.5.5 C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_MODULES_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:58 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: add webp optional dependency Message-ID: <20230220205218.D580C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fd6ada8dbca3370b9bb67feb2971e637cb4b11f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next webp is an optional dependency which is enabled by default since version 4.0.10 and https://gitlab.com/libtiff/libtiff/-/commit/9eacd59fecc4ef593ac17689bc530ab451c8ec14 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tiff/Config.in | 4 ++++ package/tiff/tiff.mk | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index d1004d6668..b9e3656e6f 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -72,6 +72,10 @@ config BR2_PACKAGE_TIFF_UTILITIES help Install all tiff utilities. +config BR2_PACKAGE_TIFF_WEBP + bool "WEBP compression" + select BR2_PACKAGE_WEBP + config BR2_PACKAGE_TIFF_ZSTD bool "ZSTD compression" select BR2_PACKAGE_ZSTD diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 90b28ff37a..6d761ad678 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -100,6 +100,13 @@ else TIFF_CONF_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_TIFF_WEBP),y) +TIFF_CONF_OPTS += --enable-webp +TIFF_DEPENDENCIES += webp +else +TIFF_CONF_OPTS += --disable-webp +endif + ifeq ($(BR2_PACKAGE_TIFF_ZSTD),y) TIFF_CONF_OPTS += --enable-zstd TIFF_DEPENDENCIES += zstd From peter at korsgaard.com Mon Feb 20 20:57:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:59 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_kria_kv260_defconfig: use Xilinx github for pmufw.elf Message-ID: <20230220205240.5767C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a200fc4ee34fa82a7f48107e6b76acd0db600c9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate kv260_pmufw.elf location from nealfrager github to Xilinx github. The image is identical, so this patch has zero impact on functionality. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynqmp_kria_kv260_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 94631da034..e180d5e7e7 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -31,7 +31,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.2/kv260/kv260_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/2022.2_br_1/kv260/kv260_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From yann.morin.1998 at free.fr Mon Feb 20 20:57:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:59 -0000 Subject: [Buildroot] [git commit branch/next] package/modem-manager: disable tests Message-ID: <20230220205219.489F28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed631bc7525356c2e086a307e93df7d71d2fdde7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next tests can be disabled since version 1.20.0 and https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/ba96ccc61587b7b6c31b94826ee7a3c44d795364 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modem-manager/modem-manager.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 8ef85b9b1d..5b8b9c5576 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -14,6 +14,7 @@ MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIE MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = \ -Dpowerd_suspend_resume=false \ + -Dtests=false \ -Dudevdir=/usr/lib/udev ifeq ($(BR2_PACKAGE_LIBGUDEV),y) From peter at korsgaard.com Mon Feb 20 20:58:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:00 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_zcu102_defconfig: use Xilinx github for pmufw.elf Message-ID: <20230220205240.618C581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1005feccf52ce260aa794f4bf3fe84aa780b84cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate zcu102_pmufw.elf location from nealfrager github to Xilinx github. The image is identical, so this patch has zero impact on functionality. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu102_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 6047d4299c..00b33261b6 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -29,7 +29,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.2/zcu102/zcu102_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/2022.2_br_1/zcu102/zcu102_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:00 -0000 Subject: [Buildroot] [git commit branch/next] package/modem-manager: qrtr needs qmi Message-ID: <20230220205219.38BF1828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bb4288dd08c688072a25bf60c3a60e0047c1668 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: ../output-1/build/modem-manager-1.20.2/meson.build:262:2: ERROR: Assert failed: QRTR support requires QMI enabled Fixes: - http://autobuild.buildroot.org/results/04b9a41c5edbc492ef640b27d4d3d896d230cf34 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modem-manager/Config.in | 12 ++++++++++++ package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index d211d68ee1..8489e6fc86 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -25,6 +25,18 @@ config BR2_PACKAGE_MODEM_MANAGER_LIBQMI select BR2_PACKAGE_LIBQMI help This option enables support for QMI protocol + +config BR2_PACKAGE_MODEM_MANAGER_LIBQRTR + bool "QRTR support" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 # libqrtr-glib + select BR2_PACKAGE_LIBQRTR_GLIB + select BR2_PACKAGE_MODEM_MANAGER_LIBQMI + help + This option enables support for QRTR protocol + +comment "QRTR support needs a toolchain w/ headers >= 4.15" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + endif comment "modemmanager needs a toolchain w/ wchar, threads" diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 8a0dbba3a4..8ef85b9b1d 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -37,7 +37,7 @@ else MODEM_MANAGER_CONF_OPTS += -Dmbim=false endif -ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y) +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQRTR),y) MODEM_MANAGER_DEPENDENCIES += libqrtr-glib MODEM_MANAGER_CONF_OPTS += -Dqrtr=true else From peter at korsgaard.com Mon Feb 20 20:58:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:01 -0000 Subject: [Buildroot] [git commit branch/next] package/lxc: security bump to version 5.0.2 Message-ID: <20230220205240.1CB647FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd7bfba252095ffaf93d22c7379b409bbdf64d46 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Fix CVE-2022-47952: lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may allow local users to infer whether any file exists, even within a protected directory tree, because "Failed to open" often indicates that a file does not exist, whereas "does not refer to a network namespace path" often indicates that a file exists. NOTE: this is different from CVE-2018-6556 because the CVE-2018-6556 fix design was based on the premise that "we will report back to the user that the open() failed but the user has no way of knowing why it failed"; however, in many realistic cases, there are no plausible reasons for failing except that the file does not exist. - Drop patches (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...etect-where-struct-mount_attr-is-declared.patch | 186 --------------------- ...ll_method_async-to-replace-the-asyncv-one.patch | 47 ------ ...003-build-detect-sys-pidfd.h-availability.patch | 55 ------ package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 5 files changed, 2 insertions(+), 290 deletions(-) diff --git a/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch b/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch deleted file mode 100644 index 8de7adcc56..0000000000 --- a/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch +++ /dev/null @@ -1,186 +0,0 @@ -From c1115e1503bf955c97f4cf3b925a6a9f619764c3 Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Tue, 9 Aug 2022 16:14:25 +0200 -Subject: [PATCH] build: detect where struct mount_attr is declared - -Fixes: #4176 -Signed-off-by: Christian Brauner (Microsoft) -[Retrieved from: -https://github.com/lxc/lxc/commit/c1115e1503bf955c97f4cf3b925a6a9f619764c3] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 30 ++++++++++++++++++++++++++++-- - src/lxc/conf.c | 6 +++--- - src/lxc/conf.h | 2 +- - src/lxc/mount_utils.c | 6 +++--- - src/lxc/syscall_wrappers.h | 12 ++++++++++-- - 5 files changed, 45 insertions(+), 11 deletions(-) - -diff --git a/meson.build b/meson.build -index a145faf069..f679aabbc8 100644 ---- a/meson.build -+++ b/meson.build -@@ -590,7 +590,6 @@ decl_headers = ''' - foreach decl: [ - '__aligned_u64', - 'struct clone_args', -- 'struct mount_attr', - 'struct open_how', - 'struct rtnl_link_stats64', - ] -@@ -610,7 +609,6 @@ foreach tuple: [ - ['struct seccomp_notif_sizes'], - ['struct clone_args'], - ['__aligned_u64'], -- ['struct mount_attr'], - ['struct open_how'], - ['struct rtnl_link_stats64'], - ] -@@ -630,6 +628,34 @@ foreach tuple: [ - endif - endforeach - -+## Types. -+decl_headers = ''' -+#include -+''' -+ -+# We get -1 if the size cannot be determined -+if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 -+ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), true) -+ found_types += 'struct mount_attr (sys/mount.h)' -+else -+ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) -+ missing_types += 'struct mount_attr (sys/mount.h)' -+endif -+ -+## Types. -+decl_headers = ''' -+#include -+''' -+ -+# We get -1 if the size cannot be determined -+if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 -+ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), true) -+ found_types += 'struct mount_attr (linux/mount.h)' -+else -+ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), false) -+ missing_types += 'struct mount_attr (linux/mount.h)' -+endif -+ - ## Headers. - foreach ident: [ - ['bpf', '''#include -diff --git a/src/lxc/conf.c b/src/lxc/conf.c -index ffbe74c2f6..4193cd07f5 100644 ---- a/src/lxc/conf.c -+++ b/src/lxc/conf.c -@@ -2885,7 +2885,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) - struct lxc_mount_options opts = {}; - int dfd_from; - const char *source_relative, *target_relative; -- struct lxc_mount_attr attr = {}; -+ struct mount_attr attr = {}; - - ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts); - if (ret < 0) -@@ -3005,7 +3005,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) - - /* Set propagation mount options. */ - if (opts.attr.propagation) { -- attr = (struct lxc_mount_attr) { -+ attr = (struct mount_attr) { - .propagation = opts.attr.propagation, - }; - -@@ -4109,7 +4109,7 @@ int lxc_idmapped_mounts_parent(struct lxc_handler *handler) - - for (;;) { - __do_close int fd_from = -EBADF, fd_userns = -EBADF; -- struct lxc_mount_attr attr = {}; -+ struct mount_attr attr = {}; - struct lxc_mount_options opts = {}; - ssize_t ret; - -diff --git a/src/lxc/conf.h b/src/lxc/conf.h -index 7dc2f15b60..772479f9e1 100644 ---- a/src/lxc/conf.h -+++ b/src/lxc/conf.h -@@ -223,7 +223,7 @@ struct lxc_mount_options { - unsigned long mnt_flags; - unsigned long prop_flags; - char *data; -- struct lxc_mount_attr attr; -+ struct mount_attr attr; - char *raw_options; - }; - -diff --git a/src/lxc/mount_utils.c b/src/lxc/mount_utils.c -index bba75f933c..88dd73ee36 100644 ---- a/src/lxc/mount_utils.c -+++ b/src/lxc/mount_utils.c -@@ -31,7 +31,7 @@ lxc_log_define(mount_utils, lxc); - * setting in @attr_set, but must also specify MOUNT_ATTR__ATIME in the - * @attr_clr field. - */ --static inline void set_atime(struct lxc_mount_attr *attr) -+static inline void set_atime(struct mount_attr *attr) - { - switch (attr->attr_set & MOUNT_ATTR__ATIME) { - case MOUNT_ATTR_RELATIME: -@@ -272,7 +272,7 @@ int create_detached_idmapped_mount(const char *path, int userns_fd, - { - __do_close int fd_tree_from = -EBADF; - unsigned int open_tree_flags = OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC; -- struct lxc_mount_attr attr = { -+ struct mount_attr attr = { - .attr_set = MOUNT_ATTR_IDMAP | attr_set, - .attr_clr = attr_clr, - .userns_fd = userns_fd, -@@ -335,7 +335,7 @@ int __fd_bind_mount(int dfd_from, const char *path_from, __u64 o_flags_from, - __u64 attr_clr, __u64 propagation, int userns_fd, - bool recursive) - { -- struct lxc_mount_attr attr = { -+ struct mount_attr attr = { - .attr_set = attr_set, - .attr_clr = attr_clr, - .propagation = propagation, -diff --git a/src/lxc/syscall_wrappers.h b/src/lxc/syscall_wrappers.h -index a5e98b565c..c8a7d0c7b7 100644 ---- a/src/lxc/syscall_wrappers.h -+++ b/src/lxc/syscall_wrappers.h -@@ -18,6 +18,12 @@ - #include "macro.h" - #include "syscall_numbers.h" - -+#if HAVE_STRUCT_MOUNT_ATTR -+#include -+#elif HAVE_UAPI_STRUCT_MOUNT_ATTR -+#include -+#endif -+ - #ifdef HAVE_LINUX_MEMFD_H - #include - #endif -@@ -210,16 +216,18 @@ extern int fsmount(int fs_fd, unsigned int flags, unsigned int attr_flags); - /* - * mount_setattr() - */ --struct lxc_mount_attr { -+#if !HAVE_STRUCT_MOUNT_ATTR && !HAVE_UAPI_STRUCT_MOUNT_ATTR -+struct mount_attr { - __u64 attr_set; - __u64 attr_clr; - __u64 propagation; - __u64 userns_fd; - }; -+#endif - - #if !HAVE_MOUNT_SETATTR - static inline int mount_setattr(int dfd, const char *path, unsigned int flags, -- struct lxc_mount_attr *attr, size_t size) -+ struct mount_attr *attr, size_t size) - { - return syscall(__NR_mount_setattr, dfd, path, flags, attr, size); - } diff --git a/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch b/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch deleted file mode 100644 index 22013cb363..0000000000 --- a/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Thu, 25 Aug 2022 05:45:53 -0700 -Subject: [PATCH] use sd_bus_call_method_async to replace the asyncv one - -The sd_bus_call_method_asyncv's 10th parameter is of type -va_list and supplying NULL when invoking it causes compilation -error. Just replace it with the async one. - -Signed-off-by: Chen Qi -[Retrieved from: -https://github.com/lxc/lxc/commit/b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 4 ++-- - src/lxc/cgroups/cgfsng.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 21955a0504..f8bdcf4e83 100644 ---- a/meson.build -+++ b/meson.build -@@ -295,9 +295,9 @@ if not want_sd_bus.disabled() - has_sd_bus = false - endif - -- if not cc.has_function('sd_bus_call_method_asyncv', prefix: '#include ', dependencies: libsystemd) -+ if not cc.has_function('sd_bus_call_method_async', prefix: '#include ', dependencies: libsystemd) - if not sd_bus_optional -- error('libsystemd misses required sd_bus_call_method_asyncv function') -+ error('libsystemd misses required sd_bus_call_method_async function') - endif - - has_sd_bus = false -diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c -index 8a3615893f..d90e5385e1 100644 ---- a/src/lxc/cgroups/cgfsng.c -+++ b/src/lxc/cgroups/cgfsng.c -@@ -1232,7 +1232,7 @@ static int unpriv_systemd_create_scope(struct cgroup_ops *ops, struct lxc_conf * - if (r < 0) - return log_error(SYSTEMD_SCOPE_FAILED, "Failed to connect to user bus: %s", strerror(-r)); - -- r = sd_bus_call_method_asyncv(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL, NULL); -+ r = sd_bus_call_method_async(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL); - if (r < 0) - return log_error(SYSTEMD_SCOPE_FAILED, "Failed to subscribe to signals: %s", strerror(-r)); - diff --git a/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch b/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch deleted file mode 100644 index 3aa598407f..0000000000 --- a/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ef1e0607b82e27350c2d677d649c6a0a9693fd40 Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Tue, 9 Aug 2022 16:27:40 +0200 -Subject: [PATCH] build: detect sys/pidfd.h availability - -Fixes: #4176 -Signed-off-by: Christian Brauner (Microsoft) - -[Retrieved from: -https://github.com/lxc/lxc/commit/ef1e0607b82e27350c2d677d649c6a0a9693fd40] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 1 + - src/lxc/process_utils.h | 6 ++++++ - 2 files changed, 7 insertions(+) - -diff --git a/meson.build b/meson.build -index f679aabbc8..e999542336 100644 ---- a/meson.build -+++ b/meson.build -@@ -735,6 +735,7 @@ foreach tuple: [ - ['sys/resource.h'], - ['sys/memfd.h'], - ['sys/personality.h'], -+ ['sys/pidfd.h'], - ['sys/signalfd.h'], - ['sys/timerfd.h'], - ['pty.h'], -diff --git a/src/lxc/process_utils.h b/src/lxc/process_utils.h -index 9c15b15741..ed84741d0e 100644 ---- a/src/lxc/process_utils.h -+++ b/src/lxc/process_utils.h -@@ -15,6 +15,10 @@ - #include - #include - -+#if HAVE_SYS_PIDFD_H -+#include -+#endif -+ - #include "compiler.h" - #include "syscall_numbers.h" - -@@ -136,9 +140,11 @@ - #endif - - /* waitid */ -+#if !HAVE_SYS_PIDFD_H - #ifndef P_PIDFD - #define P_PIDFD 3 - #endif -+#endif - - #ifndef CLONE_ARGS_SIZE_VER0 - #define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index c18e062cc1..2dd983a361 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d8195423bb1e206f8521d24b6cde4789f043960c7cf065990a9cf741dcfd4222 lxc-5.0.1.tar.gz +sha256 bea08d2e49efcee34fa58acd2bc95c0adc64d291c07f4cfaf4ac1d8ac5a36f45 lxc-5.0.2.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index e1639c5f15..4a4d3a6212 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 5.0.1 +LXC_VERSION = 5.0.2 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 thomas.petazzoni at bootlin.com Mon Feb 20 20:58:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:01 -0000 Subject: [Buildroot] [git commit branch/next] support/testing: add test for python-munch Message-ID: <20230220205219.13889828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f0a2a43bbfcb2aef1569b48277933264ec25feb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ support/testing/tests/package/sample_python_munch.py | 20 ++++++++++++++++++++ support/testing/tests/package/test_python_munch.py | 12 ++++++++++++ 3 files changed, 34 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0eea9c33d9..3217823b6f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3133,10 +3133,12 @@ F: package/x11r7/xapp_xinput-calibrator/ F: package/zlog/ F: support/testing/tests/package/sample_python_dicttoxml2.py F: support/testing/tests/package/sample_python_dtschema.py +F: support/testing/tests/package/sample_python_munch.py F: support/testing/tests/package/test_libftdi1.py F: support/testing/tests/package/test_python_can.py F: support/testing/tests/package/test_python_dicttoxml2.py F: support/testing/tests/package/test_python_dtschema.py +F: support/testing/tests/package/test_python_munch.py F: utils/scanpypi N: Yunhao Tian diff --git a/support/testing/tests/package/sample_python_munch.py b/support/testing/tests/package/sample_python_munch.py new file mode 100644 index 0000000000..b45bec7b7e --- /dev/null +++ b/support/testing/tests/package/sample_python_munch.py @@ -0,0 +1,20 @@ +from munch import Munch + +b = Munch() +b.hello = 'world' +assert b.hello == 'world' +b['hello'] += "!" +assert b.hello == 'world!' +b.foo = Munch(lol=True) +assert b.foo.lol is True +assert b.foo is b['foo'] + +assert sorted(b.keys()) == ['foo', 'hello'] + +b.update({'ponies': 'are pretty!'}, hello=42) +assert b == Munch({'ponies': 'are pretty!', 'foo': Munch({'lol': True}), 'hello': 42}) + +assert sorted([(k, b[k]) for k in b]) == [('foo', Munch({'lol': True})), ('hello', 42), ('ponies', 'are pretty!')] + +format_munch = Munch(knights='lolcats', ni='can haz') +assert "The {knights} who say {ni}!".format(**format_munch) == 'The lolcats who say can haz!' diff --git a/support/testing/tests/package/test_python_munch.py b/support/testing/tests/package/test_python_munch.py new file mode 100644 index 0000000000..6853bbaac7 --- /dev/null +++ b/support/testing/tests/package/test_python_munch.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Munch(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MUNCH=y + """ + sample_scripts = ["tests/package/sample_python_munch.py"] + timeout = 40 From peter at korsgaard.com Mon Feb 20 20:58:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:02 -0000 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: add new package Message-ID: <20230220205240.A7E5A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fluent Bit is a super fast, lightweight, and highly scalable logging and metrics processor and forwarder. Signed-off-by: Thomas Devoogdt [Peter: add DEVELOPERS entry, drop STATIC_LIBS dependency] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/fluent-bit/Config.in | 12 +++++++ package/fluent-bit/S99fluent-bit | 72 ++++++++++++++++++++++++++++++++++++++ package/fluent-bit/fluent-bit.hash | 3 ++ package/fluent-bit/fluent-bit.mk | 49 ++++++++++++++++++++++++++ 6 files changed, 140 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b973c37b82..385a46ccf9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2820,6 +2820,9 @@ F: support/testing/tests/package/test_perl_lwp_protocol_https.py F: utils/size-stats-compare F: toolchain/ +N: Thomas Devoogdt +F: package/fluent-bit/ + N: Thomas Huth F: board/qemu/m68k-mcf5208/ F: configs/qemu_m68k_mcf5208_defconfig diff --git a/package/Config.in b/package/Config.in index 995dae2c57..b281a67157 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2610,6 +2610,7 @@ menu "System tools" source "package/efivar/Config.in" source "package/embiggen-disk/Config.in" source "package/emlog/Config.in" + source "package/fluent-bit/Config.in" source "package/ftop/Config.in" source "package/getent/Config.in" source "package/gkrellm/Config.in" diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in new file mode 100644 index 0000000000..11ceb55d4f --- /dev/null +++ b/package/fluent-bit/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_FLUENT_BIT + bool "fluent-bit" + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBYAML + help + Fast and Lightweight Logs and Metrics processor. + + https://github.com/fluent/fluent-bit + +comment "fluent-bit needs a glibc toolchain" + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/fluent-bit/S99fluent-bit b/package/fluent-bit/S99fluent-bit new file mode 100644 index 0000000000..f4ba0e4448 --- /dev/null +++ b/package/fluent-bit/S99fluent-bit @@ -0,0 +1,72 @@ +#!/bin/sh + +DAEMON="fluent-bit" +PID_FILE="/var/run/$DAEMON.pid" +CONF_FILE="/etc/$DAEMON/$DAEMON.conf" + +FLUENT_BIT_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -b -m -p "$PID_FILE" --exec "/usr/bin/$DAEMON" \ + -- -c "$CONF_FILE" $FLUENT_BIT_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PID_FILE" + status=$? + + if [ -f "$PID_FILE" ]; then + pid=$(cat "$PID_FILE") + rm -f "$PID_FILE" + + # https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/yaml/configuration-file#config_section + # The default grace time is set to 5 seconds, so use 6 seconds to have some margin. + timeout=6 + while kill -0 "$pid" 2>/dev/null; do + [ $timeout -eq 0 ] && status=1 && break + timeout=$((timeout - 1)) + sleep 1 + done + fi + + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + start +} + +case "$1" in +start) + start + ;; +stop) + stop + ;; +restart | reload) + restart + ;; +*) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash new file mode 100644 index 0000000000..ce7cea7b59 --- /dev/null +++ b/package/fluent-bit/fluent-bit.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 8ff5566389033669feabc9c69a5c6f417dad5c8b066454388e6a706507262acf fluent-bit-2.0.8.tar.gz +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk new file mode 100644 index 0000000000..f7727834dd --- /dev/null +++ b/package/fluent-bit/fluent-bit.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# fluent-bit +# +################################################################################ + +FLUENT_BIT_VERSION = 2.0.8 +FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) +FLUENT_BIT_LICENSE = Apache-2.0 +FLUENT_BIT_LICENSE_FILES = LICENSE +FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl + +FLUENT_BIT_CONF_OPTS += \ + -DFLB_DEBUG=No \ + -DFLB_RELEASE=Yes \ + -DFLB_EXAMPLES=No \ + -DFLB_CHUNK_TRACE=No \ + -DFLB_BACKTRACE=No + +ifeq ($(BR2_PACKAGE_LUAJIT),y) +FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=Yes +FLUENT_BIT_DEPENDENCIES += luajit +else +FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=No +endif + +# Force bundled miniz to be linked statically. +# https://github.com/fluent/fluent-bit/issues/6711 +FLUENT_BIT_CONF_OPTS += \ + -DBUILD_SHARED_LIBS=OFF + +# Move the config files from /usr/etc/ to /etc/. +# https://github.com/fluent/fluent-bit/issues/6619 +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_INSTALL_SYSCONFDIR="/etc/" + +# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h +# large file support. +# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information. +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" + +define FLUENT_BIT_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ + $(TARGET_DIR)/etc/init.d/S99fluent-bit +endef + +$(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 20 20:58:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:03 -0000 Subject: [Buildroot] [git commit branch/next] package/libraw: bump to version 0.21.1 Message-ID: <20230220205240.DE8BA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e3d5b7c6d6f7f1be82010c2d18e64f72f950aef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/LibRaw/LibRaw/blob/0.21.1/Changelog.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libraw/libraw.hash | 2 +- package/libraw/libraw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libraw/libraw.hash b/package/libraw/libraw.hash index 3076810cca..58bb1b4753 100644 --- a/package/libraw/libraw.hash +++ b/package/libraw/libraw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8747b34e8534cc2dd7ef8c92c436414b3578904fd4bf9b87ea60f17aa99fb0bd LibRaw-0.21.0.tar.gz +sha256 630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd LibRaw-0.21.1.tar.gz sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL sha256 7d6650cef6cf892abe95e55a6bda1e1c42f221fd411b807deb2fc0b805b868d4 README.md diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index 176acf6a44..b6616f0c10 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRAW_VERSION = 0.21.0 +LIBRAW_VERSION = 0.21.1 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data LIBRAW_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:58:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:03 -0000 Subject: [Buildroot] [git commit branch/next] board/freescale/imx6sabre/readme.txt: update broken urls Message-ID: <20230220205219.82D918648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfbbfd8fecf8623da4772f97ce208b3e4b69de80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next http://freescale.com/ urls are all redirected to the NXP homepage https://www.nxp.com/ Even if the links are not broken in the sense of a 404 http error, the pointed resources are not found. This commit updates the old freescale links to the correct nxp.com locations. Note: the link to the SABRE for Automotive Infotainment Quick Start Guide now requires a free registration to be accessed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- board/freescale/imx6sabre/readme.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/imx6sabre/readme.txt b/board/freescale/imx6sabre/readme.txt index 4b8db5233a..320ee463e2 100644 --- a/board/freescale/imx6sabre/readme.txt +++ b/board/freescale/imx6sabre/readme.txt @@ -8,15 +8,15 @@ as well as the Freescale SABRE Board for Automotive Infotainment. Read the i.MX 6 SABRESD Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/quick_start_guide/SABRESDB_IMX6_QSG.pdf +https://www.nxp.com/files-static/32bit/doc/quick_start_guide/SABRESDB_IMX6_QSG.pdf Read the i.MX 6 SoloX SABRESD Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/user_guide/IMX6SOLOXQSG.pdf +https://www.nxp.com/files-static/32bit/doc/quick_start_guide/IMX6SOLOXQSG.pdf Read the SABRE for Automotive Infotainment Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/user_guide/IMX6SABREINFOQSG.pdf +https://www.nxp.com/webapp/Download?colCode=IMX6SABREINFOQSG Building with NXP kernel and NXP U-Boot ======================================= @@ -166,6 +166,6 @@ Enjoy! References ========== -https://community.freescale.com/docs/DOC-95015 -https://community.freescale.com/docs/DOC-95017 -https://community.freescale.com/docs/DOC-99218 +https://community.nxp.com/docs/DOC-95015 +https://community.nxp.com/docs/DOC-95017 +https://community.nxp.com/docs/DOC-99218 From peter at korsgaard.com Mon Feb 20 20:58:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:04 -0000 Subject: [Buildroot] [git commit branch/next] package/mariadb: fix build with libressl >= 3.5.0 Message-ID: <20230220205241.28B478648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=22e926e9af915303180d35b5c41ea5fbf411d753 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with libressl raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': /tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) | ^~ Fixes: - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...sl_compat.h-fix-build-with-libressl-3.5.0.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch b/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 0000000000..fd3e6e6607 --- /dev/null +++ b/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,39 @@ +From 79ed770a37c8669390a58a4485dd8f5565fe2497 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 15 Jan 2023 19:12:05 +0100 +Subject: [PATCH] include/ssl_compat.h: fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: +/tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': +/tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} + 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/MariaDB/server/pull/2435] +--- + include/ssl_compat.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/ssl_compat.h b/include/ssl_compat.h +index 664f3aac87c..3678e5fa084 100644 +--- a/include/ssl_compat.h ++++ b/include/ssl_compat.h +@@ -19,7 +19,8 @@ + /* OpenSSL version specific definitions */ + #if defined(OPENSSL_VERSION_NUMBER) + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ ++ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + #define HAVE_OPENSSL11 1 + #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) + #define ERR_remove_state(X) ERR_clear_error() +-- +2.39.0 + From yann.morin.1998 at free.fr Mon Feb 20 20:58:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:04 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx: update SITE to directly use https Message-ID: <20230220205219.68DA4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc23c61e4d3fa9557db4977b8d30905a3f55e83d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next http://www.nxp.com/ has a redirect to https://www.nxp.com/ for quite some time now. It is also quite common to directly hit https:// urls now. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/freescale-imx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk index 5f32a098a2..b119d90ec3 100644 --- a/package/freescale-imx/freescale-imx.mk +++ b/package/freescale-imx/freescale-imx.mk @@ -4,6 +4,6 @@ # ################################################################################ -FREESCALE_IMX_SITE = http://www.nxp.com/lgfiles/NMG/MAD/YOCTO +FREESCALE_IMX_SITE = https://www.nxp.com/lgfiles/NMG/MAD/YOCTO include $(sort $(wildcard package/freescale-imx/*/*.mk)) From yann.morin.1998 at free.fr Mon Feb 20 20:58:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:05 -0000 Subject: [Buildroot] [git commit branch/next] package/fluidsynth: bump to version 2.3.1 Message-ID: <20230220205219.A47ED828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=faa8c35d117348f35c129c62a3d02447f47bde88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For change log since v2.3.0, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.3.1 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- 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 fdb0cf4117..3de41b1682 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1df5a1afb91acf3b945b7fdb89ac0d99877622161d9b5155533da59113eaaa20 fluidsynth-2.3.0.tar.gz +sha256 d734e4cf488be763cf123e5976f3154f0094815093eecdf71e0e9ae148431883 fluidsynth-2.3.1.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 20fbb644f5..ad1ed7df11 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.0 +FLUIDSYNTH_VERSION = 2.3.1 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:06 -0000 Subject: [Buildroot] [git commit branch/next] package/moarvm: bump to version 2022.12 Message-ID: <20230220205241.5039F7FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6ec214a09741b2de6e408832d89f4b3c4f93484 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- 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 45e8b56e98..624988215e 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 337ef04d16f826f99465c653b92006028fe220be68d3dcfd0729612f4f6b5b46 MoarVM-2022.07.tar.gz +sha256 51c3e9c9a7a191c148f213b65ae1f4fcfe5d4b7c16c86300e9ee8e18eaa8becb MoarVM-2022.12.tar.gz sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index 9820f318b6..ef9d29d5af 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2022.07 +MOARVM_VERSION = 2022.12 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:06 -0000 Subject: [Buildroot] [git commit branch/next] configs/qemu_s390x: bump kernel version to 6.1.4 Message-ID: <20230220205241.59A6086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea06798871d3a452011a8fa3c879a7a352032ff6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- configs/qemu_s390x_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 346df04ada..6bbcca0896 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -12,12 +12,12 @@ BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:06 -0000 Subject: [Buildroot] [git commit branch/next] package/imx-mkimage: update codeaurora URLs to github Message-ID: <20230220205219.B50548648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=153b91ed13174a9013393a8b8eb907a5ff511e58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/imx-mkimage/Config.in.host | 2 +- package/imx-mkimage/imx-mkimage.hash | 2 +- package/imx-mkimage/imx-mkimage.mk | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/imx-mkimage/Config.in.host b/package/imx-mkimage/Config.in.host index 8d273557a1..09df2a3c29 100644 --- a/package/imx-mkimage/Config.in.host +++ b/package/imx-mkimage/Config.in.host @@ -4,4 +4,4 @@ config BR2_PACKAGE_HOST_IMX_MKIMAGE imx-mkimage is used to combine input images and generate final boot image with appropriate IVT set. - https://source.codeaurora.org/external/imx/imx-mkimage + https://github.com/nxp-imx/imx-mkimage diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash index 81d99a5d1c..8346fd64b1 100644 --- a/package/imx-mkimage/imx-mkimage.hash +++ b/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 769b3d7376a1f7107ce2958a1babe361bfd29e2cbfbe47eeb2911acc460058e5 imx-mkimage-lf-5.10.72_2.2.0-br1.tar.gz +sha256 593bd94aac027844bc58c62aae55557c14e1f8a99e68ba235a46f083759df3d4 imx-mkimage-lf-5.10.72_2.2.0.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk index 0bfca72504..54c948e0d3 100644 --- a/package/imx-mkimage/imx-mkimage.mk +++ b/package/imx-mkimage/imx-mkimage.mk @@ -5,8 +5,7 @@ ################################################################################ IMX_MKIMAGE_VERSION = lf-5.10.72_2.2.0 -IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage -IMX_MKIMAGE_SITE_METHOD = git +IMX_MKIMAGE_SITE = $(call github,nxp-imx,imx-mkimage,$(IMX_MKIMAGE_VERSION)) IMX_MKIMAGE_LICENSE = GPL-2.0+ IMX_MKIMAGE_LICENSE_FILES = COPYING HOST_IMX_MKIMAGE_DEPENDENCIES = host-zlib From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:07 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add myself to postgresql package Message-ID: <20230220205241.71E968648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b7ef8030c829ac04c4e78d3f2c878f5c9483a78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 83fa9e403d..4ead3a71f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2087,6 +2087,7 @@ F: package/libgeos/ F: package/libosmium/ F: package/osm2pgsql/ F: package/postgis/ +F: package/postgresql/ F: package/protozero/ F: package/timescaledb/ From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:07 -0000 Subject: [Buildroot] [git commit branch/next] package/dieharder: bump to version 3.31.1.4 Message-ID: <20230220205217.5F01F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16b27f7cdbc8c203b3b957a33ade03739149021f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Switch to the maintenance "upstream" repo which regroup updates made for the Debian package - Drop all patches (already in version) - Drop DIEHARDER_M4_CLEAN which is not needed since https://github.com/eddelbuettel/dieharder/commit/c875e5d8196c4a79547281ff5f9fb04af734db97 - -fcommon is not needed since https://github.com/eddelbuettel/dieharder/commit/8feba3cc2bf92627f32ac637827ac760d3a17e63 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...includedir-as-include-search-path-for-bui.patch | 62 -- .../dieharder/0002-Fix-missing-type-intptr_t.patch | 27 - ...U_SOURCE-for-uint-and-M_PI-with-musl-libc.patch | 28 - .../0004-Add-static-to-inline-functions.patch | 65 -- .../dieharder/0005-Remove-defunct-rgb_operm.patch | 732 --------------------- package/dieharder/dieharder.hash | 2 +- package/dieharder/dieharder.mk | 25 +- 7 files changed, 4 insertions(+), 937 deletions(-) diff --git a/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch b/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch deleted file mode 100644 index b475e5c470..0000000000 --- a/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fbc9b7c3b83a99ac996c0a268487d1f800630328 Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Wed, 8 Feb 2017 21:26:58 +0100 -Subject: [PATCH] Do not use includedir as include search path for build - ---includedir is not used to specify where a program should -look for headers of libraries, but to tell where it should -install its own headers. - -Signed-off-by: Julien Viard de Galbert ---- - configure.ac | 6 +++--- - dieharder/Makefile.am | 2 +- - libdieharder/Makefile.am | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b336115..91f7c64 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -96,9 +96,9 @@ AC_TYPE_SIZE_T - AC_C_VOLATILE - AC_C_INLINE - --DIEHARDER_CFLAGS="-I$includedir" --dieharder_CFLAGS="-std=c99 -Wall -pedantic -I$includedir" --libdieharder_lo_CFLAGS="-Wall -pedantic -I$includedir" -+DIEHARDER_CFLAGS="" -+dieharder_CFLAGS="-std=c99 -Wall -pedantic" -+libdieharder_lo_CFLAGS="-Wall -pedantic" - DIEHARDER_LIBS="-L$libdir -ldieharder" - ACLOCAL_AMFLAGS="-I m4" - -diff --git a/dieharder/Makefile.am b/dieharder/Makefile.am -index e6fbff2..7bdac5c 100644 ---- a/dieharder/Makefile.am -+++ b/dieharder/Makefile.am -@@ -64,7 +64,7 @@ DEFINES = -DVERSION=$(VERSION) - # CC = gcc - - # Compile flags (use fairly standard -O3 as default) --AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES) -I ${includedir} -+AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES) - AM_CFLAGS = -O3 - - # Load flags (optional) -diff --git a/libdieharder/Makefile.am b/libdieharder/Makefile.am -index 5fd3396..0873f9c 100644 ---- a/libdieharder/Makefile.am -+++ b/libdieharder/Makefile.am -@@ -114,7 +114,7 @@ DEFINES = -DVERSION=$(VERSION) -DLITTLE_ENDIAN=$(LITTLE_ENDIAN) - # CC = gcc - - # Compile flags (use fairly standard -O3 as default) --AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include -I ${includedir} -+AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include - AM_CFLAGS = -O3 -Wall -pedantic -Wno-unused-variable - - #======================================================================== --- -2.1.4 - diff --git a/package/dieharder/0002-Fix-missing-type-intptr_t.patch b/package/dieharder/0002-Fix-missing-type-intptr_t.patch deleted file mode 100644 index 12ea5e7fa0..0000000000 --- a/package/dieharder/0002-Fix-missing-type-intptr_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6f550841943f19612af064b3d3a1db134078e03c Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Sat, 14 Jan 2017 14:18:10 +0100 -Subject: [PATCH] Fix missing type intptr_t - -With glibc-2.23 unistd.h need intptr_t when __USE_MISC is defined. - -Signed-off-by: Julien Viard de Galbert ---- - include/dieharder/libdieharder.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/dieharder/libdieharder.h b/include/dieharder/libdieharder.h -index 2138ebf..d98b758 100644 ---- a/include/dieharder/libdieharder.h -+++ b/include/dieharder/libdieharder.h -@@ -17,6 +17,7 @@ - - /* This turns on uint macro in c99 */ - #define __USE_MISC 1 -+#include - #include - #include - #include --- -2.1.4 - diff --git a/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch b/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch deleted file mode 100644 index d71cd57445..0000000000 --- a/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 526510a27ef47a16699dd34a2373ad9b6bb5e8f3 Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Sat, 14 Jan 2017 14:19:47 +0100 -Subject: [PATCH] Add _GNU_SOURCE for uint and M_PI with musl libc - -When building with musl libc _GNU_SOURCE need to be defined -to provide uint type and M_PI macro - -Signed-off-by: Julien Viard de Galbert ---- - include/dieharder/libdieharder.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/dieharder/libdieharder.h b/include/dieharder/libdieharder.h -index d98b758..c1a5023 100644 ---- a/include/dieharder/libdieharder.h -+++ b/include/dieharder/libdieharder.h -@@ -17,6 +17,7 @@ - - /* This turns on uint macro in c99 */ - #define __USE_MISC 1 -+#define _GNU_SOURCE 1 - #include - #include - #include --- -2.1.4 - diff --git a/package/dieharder/0004-Add-static-to-inline-functions.patch b/package/dieharder/0004-Add-static-to-inline-functions.patch deleted file mode 100644 index 64cde1d21d..0000000000 --- a/package/dieharder/0004-Add-static-to-inline-functions.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 9c71a211dcf20f53f747326f5bc3fee9fabe3f52 Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Tue, 27 Jun 2017 00:16:11 +0200 -Subject: [PATCH] Add static to inline functions - -This is needed to avoid a link error where the inline functions appear -missing at link time. -From c99 standard inline function should either be declared static or -have an extern instance in a c file for linking. -This fix is necessary to build with gcc 7; for some reason it was not -trigerred before. - -Signed-off-by: Julien Viard de Galbert ---- - libdieharder/dab_filltree.c | 4 ++-- - libdieharder/dab_filltree2.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libdieharder/dab_filltree.c b/libdieharder/dab_filltree.c -index 9cc5ce7..a377c3d 100644 ---- a/libdieharder/dab_filltree.c -+++ b/libdieharder/dab_filltree.c -@@ -34,7 +34,7 @@ static double targetData[] = { - 0.0, 0.0, 0.0, 0.0, 0.13333333, 0.20000000, 0.20634921, 0.17857143, 0.13007085, 0.08183633, 0.04338395, 0.01851828, 0.00617270, 0.00151193, 0.00023520, 0.00001680, 0.00000000, 0.00000000, 0.00000000, 0.00000000 - }; - --inline int insert(double x, double *array, unsigned int startVal); -+static inline int insert(double x, double *array, unsigned int startVal); - - int dab_filltree(Test **test,int irun) { - int size = (ntuple == 0) ? 32 : ntuple; -@@ -105,7 +105,7 @@ int dab_filltree(Test **test,int irun) { - } - - --inline int insert(double x, double *array, unsigned int startVal) { -+static inline int insert(double x, double *array, unsigned int startVal) { - uint d = (startVal + 1) / 2; - uint i = startVal; - while (d > 0) { -diff --git a/libdieharder/dab_filltree2.c b/libdieharder/dab_filltree2.c -index 1e33af2..59cbd52 100644 ---- a/libdieharder/dab_filltree2.c -+++ b/libdieharder/dab_filltree2.c -@@ -92,7 +92,7 @@ static double targetData[128] = { // size=128, generated from 6e9 samples - 0.00000000000e+00,0.00000000000e+00,0.00000000000e+00,0.00000000000e+00, - }; - --inline int insertBit(uint x, uchar *array, uint *i, uint *d); -+static inline int insertBit(uint x, uchar *array, uint *i, uint *d); - - int dab_filltree2(Test **test, int irun) { - int size = (ntuple == 0) ? 128 : ntuple; -@@ -181,7 +181,7 @@ int dab_filltree2(Test **test, int irun) { - * The function returns >= 0 if the path went too deep; the - * returned value is the last position of the path. - */ --inline int insertBit(uint x, uchar *array, uint *i, uint *d) { -+static inline int insertBit(uint x, uchar *array, uint *i, uint *d) { - if (x != 0) { - *i += *d; - } else { --- -2.13.2 - diff --git a/package/dieharder/0005-Remove-defunct-rgb_operm.patch b/package/dieharder/0005-Remove-defunct-rgb_operm.patch deleted file mode 100644 index efc311dbaa..0000000000 --- a/package/dieharder/0005-Remove-defunct-rgb_operm.patch +++ /dev/null @@ -1,732 +0,0 @@ -From 40d377b86c856f5a4510a6f5cd56be004873ad77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20M=C3=BCller?= -Date: Mon, 12 Oct 2020 21:30:12 +0200 -Subject: [PATCH] Remove defunct rgb_operm - -[Retrieved from: -https://github.com/eddelbuettel/dieharder/pull/2/commits/40d377b86c856f5a4510a6f5cd56be004873ad77] -Signed-off-by: Fabrice Fontaine ---- - include/Makefile.am | 1 - - include/dieharder/rgb_operm.h | 38 -- - include/dieharder/tests.h | 2 - - libdieharder/rgb_operm.c | 633 ---------------------------------- - 4 files changed, 674 deletions(-) - delete mode 100644 include/dieharder/rgb_operm.h - delete mode 100644 libdieharder/rgb_operm.c - -diff --git a/include/Makefile.am b/include/Makefile.am -index f80b4ff..e4659cd 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -33,7 +33,6 @@ nobase_include_HEADERS = dieharder/copyright.h \ - dieharder/rgb_lagged_sums.h \ - dieharder/rgb_lmn.h \ - dieharder/rgb_minimum_distance.h \ -- dieharder/rgb_operm.h \ - dieharder/rgb_persist.h \ - dieharder/rgb_permutations.h \ - dieharder/rgb_timing.h \ -diff --git a/include/dieharder/rgb_operm.h b/include/dieharder/rgb_operm.h -deleted file mode 100644 -index c48fa37..0000000 ---- a/include/dieharder/rgb_operm.h -+++ /dev/null -@@ -1,38 +0,0 @@ --/* -- * rgb_operm test header. -- */ -- --/* -- * function prototype -- */ --int rgb_operm(Test **test,int irun); -- --static Dtest rgb_operm_dtest __attribute__((unused)) = { -- "RGB Overlapping Permuations Test", -- "rgb_operm", -- "\n\ --#========================================================================\n\ --# RGB Overlapping Permutations Test\n\ --# Forms both the exact (expected) covariance matrix for overlapping\n\ --# permutations of random integer and an empirical covariance matrix\n\ --# formed from a long string of samples. The difference is expected\n\ --# to have a chisq distribution and hence can be transformed into a\n\ --# sample p-value. Note that this is one possible functional replacement\n\ --# for the broken/defunct diehard operm5 test, but one that permits k (the\n\ --# number of numbers in the overlapping permutation window) to be varied\n\ --# from 2 to perhaps 8.\n\ --#\n", -- 100, /* Default psamples */ -- 100000, /* Default tsamples */ -- 1, /* We magically make all the bit tests return a single histogram */ -- rgb_operm, -- 0 --}; -- --/* -- * Global variables. -- * -- * rgb_operm_k is the size of the overlapping window that is slid along -- * a data stream of rands from x_i to x_{i+k} to compute c[][]. -- */ --unsigned int rgb_operm_k; -diff --git a/include/dieharder/tests.h b/include/dieharder/tests.h -index 1674aed..b50dbe3 100644 ---- a/include/dieharder/tests.h -+++ b/include/dieharder/tests.h -@@ -11,7 +11,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -80,7 +79,6 @@ - RGB_PERMUTATIONS, - RGB_LAGGED_SUMS, - RGB_LMN, -- RGB_OPERM, - DAB_BYTEDISTRIB, - DAB_DCT, - DAB_FILLTREE, -diff --git a/libdieharder/rgb_operm.c b/libdieharder/rgb_operm.c -deleted file mode 100644 -index 15f8e9a..0000000 ---- a/libdieharder/rgb_operm.c -+++ /dev/null -@@ -1,633 +0,0 @@ --/* -- * ======================================================================== -- * $Id: rgb_operm.c 252 2006-10-10 13:17:36Z rgb $ -- * -- * See copyright in copyright.h and the accompanying file COPYING -- * ======================================================================== -- */ -- --/* -- * ======================================================================== -- * This is the revised Overlapping Permutations test. It directly -- * simulates the covariance matrix of overlapping permutations. The way -- * this works below (tentatively) is: -- * -- * For a bit ntuple of length N, slide a window of length N to the -- * right one bit at a time. Compute the permutation index of the -- * original ntuple, the permutation index of the window ntuple, and -- * accumulate the covariance matrix of the two positions. This -- * can be directly and precisely computed as well. The simulated -- * result should be distributed according to the chisq distribution, -- * so we subtract the two and feed it into the chisq program as a -- * vector to compute p. -- * -- * This MAY NOT BE RIGHT. I'm working from both Marsaglia's limited -- * documentation (in a program that doesn't do ANYTHING like what the -- * documentation says it does) and from Nilpotent Markov Processes. -- * But I confess to not quite understand how to actually perform the -- * test in the latter -- it is very good at describing the construction -- * of the target matrix, not so good at describing how to transform -- * this into a chisq and p. -- * -- * FWIW, as I get something that actually works here, I'm going to -- * THOROUGHLY document it in the book that will accompany the test. -- *======================================================================== -- */ -- --#include --#define RGB_OPERM_KMAX 10 -- --/* -- * Some globals that will eventually go in the test include where they -- * arguably belong. -- */ --double fpipi(int pi1,int pi2,int nkp); --uint piperm(size_t *data,int len); --void make_cexact(); --void make_cexpt(); --int nperms,noperms; --double **cexact,**ceinv,**cexpt,**idty; --double *cvexact,*cvein,*cvexpt,*vidty; -- --int rgb_operm(Test **test,int irun) --{ -- -- int i,j,n,nb,iv,s; -- uint csamples; /* rgb_operm_k^2 is vector size of cov matrix */ -- uint *count,ctotal; /* counters */ -- uint size; -- double pvalue,ntuple_prob,pbin; /* probabilities */ -- Vtest *vtest; /* Chisq entry vector */ -- -- gsl_matrix_view CEXACT,CEINV,CEXPT,IDTY; -- -- /* -- * For a given n = ntuple size in bits, there are n! bit orderings -- */ -- MYDEBUG(D_RGB_OPERM){ -- printf("#==================================================================\n"); -- printf("# rgb_operm: Running rgb_operm verbosely for k = %d.\n",rgb_operm_k); -- printf("# rgb_operm: Use -v = %d to focus.\n",D_RGB_OPERM); -- printf("# rgb_operm: ======================================================\n"); -- } -- -- /* -- * Sanity check first -- */ -- if((rgb_operm_k < 0) || (rgb_operm_k > RGB_OPERM_KMAX)){ -- printf("\nError: rgb_operm_k must be a positive integer <= %u. Exiting.\n",RGB_OPERM_KMAX); -- exit(0); -- } -- -- nperms = gsl_sf_fact(rgb_operm_k); -- noperms = gsl_sf_fact(3*rgb_operm_k-2); -- csamples = rgb_operm_k*rgb_operm_k; -- gsl_permutation * p = gsl_permutation_alloc(nperms); -- -- /* -- * Allocate memory for value_max vector of Vtest structs and counts, -- * PER TEST. Note that we must free both of these when we are done -- * or leak. -- */ -- vtest = (Vtest *)malloc(csamples*sizeof(Vtest)); -- count = (uint *)malloc(csamples*sizeof(uint)); -- Vtest_create(vtest,csamples+1); -- -- /* -- * We have to allocate and free the cexact and cexpt matrices here -- * or they'll be forgotten when these routines return. -- */ -- MYDEBUG(D_RGB_OPERM){ -- printf("# rgb_operm: Creating and zeroing cexact[][] and cexpt[][].\n"); -- } -- cexact = (double **)malloc(nperms*sizeof(double*)); -- ceinv = (double **)malloc(nperms*sizeof(double*)); -- cexpt = (double **)malloc(nperms*sizeof(double*)); -- idty = (double **)malloc(nperms*sizeof(double*)); -- cvexact = (double *)malloc(nperms*nperms*sizeof(double)); -- cvein = (double *)malloc(nperms*nperms*sizeof(double)); -- cvexpt = (double *)malloc(nperms*nperms*sizeof(double)); -- vidty = (double *)malloc(nperms*nperms*sizeof(double)); -- for(i=0;idata[k]; -- -- /* Not cruft, but quiet... -- MYDEBUG(D_RGB_OPERM){ -- printf("#------------------------------------------------------------------\n"); -- printf("# Generating offset sample permutation pi's\n"); -- } -- */ -- for(k=0;k<2*rgb_operm_k - 1;k++){ -- gsl_sort_index((size_t *) ps,&testv[k],1,rgb_operm_k); -- pi[k] = piperm((size_t *) ps,rgb_operm_k); -- -- /* Not cruft, but quiet... -- MYDEBUG(D_RGB_OPERM){ -- printf("# %u: ",k); -- for(ip=k;ipdata[ip]); -- } -- printf(" = %u\n",pi[k]); -- } -- */ -- } -- -- /* -- * This is the business end of things. The covariance matrix is the -- * the sum of a central function of the permutation indices that yields -- * nperms-1/nperms on diagonal, -1/nperms off diagonal, for all the -- * possible permutations, for the FIRST permutation in a sample (fi) -- * times the sum of the same function over all the overlapping permutations -- * drawn from the same sample. Quite simple, really. -- */ -- for(i=0;idata[rgb_operm_k-j-1] = lookup[i]->data[j]; -- } -- } else { -- gsl_permutation_memcpy(lookup[i],lookup[i-1]); -- gsl_permutation_next(lookup[i]); -- for(j=0;jdata[rgb_operm_k-j-1] = lookup[i]->data[j]; -- } -- } -- } -- */ -- MYDEBUG(D_RGB_OPERM){ -- for(i=0;i ",i); -- gsl_permutation_fprintf(stdout,lookup[i]," %u"); -- printf("\n"); -- } -- } -- -- } -- -- for(i=0;idata,len*sizeof(uint))==0){ -- /* Not cruft, but off: -- MYDEBUG(D_RGB_OPERM){ -- printf("# piperm(): "); -- gsl_permutation_fprintf(stdout,lookup[i]," %u"); -- printf(" = %u\n",i); -- } -- */ -- return(i); -- } -- } -- printf("We'd better not get here...\n"); -- -- return(0); -- --} -- --double fpipi(int pi1,int pi2,int nkp) --{ -- -- int i; -- double fret; -- -- /* -- * compute the k-permutation index from iperm for the window -- * at data[offset] of length len. If it matches pind, return -- * the first quantity, otherwise return the second. -- */ -- if(pi1 == pi2){ -- -- fret = (double) (nkp - 1.0)/nkp; -- if(verbose < 0){ -- printf(" f(%d,%d) = %10.6f\n",pi1,pi2,fret); -- } -- return(fret); -- -- } else { -- -- fret = (double) (-1.0/nkp); -- if(verbose < 0){ -- printf(" f(%d,%d) = %10.6f\n",pi1,pi2,fret); -- } -- return(fret); -- -- } -- -- --} -- -- -- -- diff --git a/package/dieharder/dieharder.hash b/package/dieharder/dieharder.hash index 65b60e7aa7..3d285d03cc 100644 --- a/package/dieharder/dieharder.hash +++ b/package/dieharder/dieharder.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6cff0ff8394c553549ac7433359ccfc955fb26794260314620dfa5e4cd4b727f dieharder-3.31.1.tgz +sha256 0fdd8a66a077e86652a47641589aa4667ae13d322a7214bb555ab37f082002dd dieharder-3.31.1.4.tar.gz sha256 c475bcd1afa6fc15a65174e31c599c0d23706a34e4b9f2fcb03a4dad5438d53f COPYING diff --git a/package/dieharder/dieharder.mk b/package/dieharder/dieharder.mk index cbf28922fd..6fe5b1f743 100644 --- a/package/dieharder/dieharder.mk +++ b/package/dieharder/dieharder.mk @@ -4,28 +4,14 @@ # ################################################################################ -DIEHARDER_VERSION = 3.31.1 -DIEHARDER_SITE = http://www.phy.duke.edu/~rgb/General/dieharder -DIEHARDER_SOURCE = dieharder-$(DIEHARDER_VERSION).tgz -DIEHARDER_STRIP_COMPONENTS = 2 +DIEHARDER_VERSION = 3.31.1.4 +DIEHARDER_SITE = $(call github,eddelbuettel,dieharder,$(DIEHARDER_VERSION)) DIEHARDER_LICENSE = GPL-2.0 with beverage clause DIEHARDER_LICENSE_FILES = COPYING DIEHARDER_DEPENDENCIES = gsl - -# The original configure does not use variables provided in the -# environment so _CONF_ENV does not work. (_CONF_OPTS does). -# -# Finally, we patch configure.ac and some Makefile.am so we need to -# autoreconf anyway +# configure retrieved from git is outdated DIEHARDER_AUTORECONF = YES -# The m4/*.m4 files are symlinks to /usr/share, which clearly doesn't -# work, and doing an autoreconf does not replace them. -define DIEHARDER_M4_CLEAN - rm -f $(@D)/m4/*.m4 -endef -DIEHARDER_POST_PATCH_HOOKS += DIEHARDER_M4_CLEAN - # fix endianness detection ifeq ($(BR2_ENDIAN),"BIG") DIEHARDER_CONF_ENV = ac_cv_c_endian=big @@ -36,9 +22,4 @@ endif # parallel build fail, disable it DIEHARDER_MAKE = $(MAKE1) -# Too many fixes needed to build with -fno-common which is default since gcc 10 -ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10),y) -DIEHARDER_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fcommon" -endif - $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:08 -0000 Subject: [Buildroot] [git commit branch/next] package/mobile-broadband-provider-info: bump version to 20221107 Message-ID: <20230220205241.8A6A886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e75f402ba6dbba26f4f35e0b064b269d75c9f6f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- .../mobile-broadband-provider-info.hash | 4 ++-- .../mobile-broadband-provider-info/mobile-broadband-provider-info.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash index b0c0db1b84..c965f5c783 100644 --- a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash +++ b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/mobile-broadband-provider-info/20190618/mobile-broadband-provider-info-20190618.sha256sum -sha256 c22d64a565d1975b9eecb6ed2eeaef18634bc6f385c8137d05e845d8fb3cce5b mobile-broadband-provider-info-20190618.tar.xz +# https://download.gnome.org/sources/mobile-broadband-provider-info/20221107/mobile-broadband-provider-info-20221107.sha256sum +sha256 d93392566c347a96eed95da8c66a5da0dd94f4115cfb3a305ff2682c64cfd810 mobile-broadband-provider-info-20221107.tar.xz # Locally computed sha256 3d510b215a33087b9ceb9592da21575ea1f9f98bd4d983a38e65fe851a552174 COPYING diff --git a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk index ca6a8387c5..2744844951 100644 --- a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk +++ b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20190618 +MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20221107 MOBILE_BROADBAND_PROVIDER_INFO_SITE = https://download.gnome.org/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION) MOBILE_BROADBAND_PROVIDER_INFO_SOURCE = mobile-broadband-provider-info-$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION).tar.xz MOBILE_BROADBAND_PROVIDER_INFO_LICENSE = Public domain From yann.morin.1998 at free.fr Mon Feb 20 20:58:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:08 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx/imx-kobs: update to NXPmicro github organization Message-ID: <20230220205220.1F81986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cec5a941b0867803045450688fbec8992e48d81d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next imx-kobs was removed from the github codeauroraforum organization. It is now redirecting to NXPmicro. This patch updates the link to directly point to the correct place. The commit also replaces the Config.in comment saying the package does not have an upstream by the github.com project page. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/imx-kobs/Config.in | 3 +-- package/freescale-imx/imx-kobs/imx-kobs.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/freescale-imx/imx-kobs/Config.in b/package/freescale-imx/imx-kobs/Config.in index 61be9f26d4..a81842b9a5 100644 --- a/package/freescale-imx/imx-kobs/Config.in +++ b/package/freescale-imx/imx-kobs/Config.in @@ -5,5 +5,4 @@ config BR2_PACKAGE_IMX_KOBS The imx-kobs tool is used for writing images to NAND on i.MX platforms. - This library is provided by Freescale as-is and doesn't have - an upstream. + https://github.com/NXPmicro/imx-kobs diff --git a/package/freescale-imx/imx-kobs/imx-kobs.mk b/package/freescale-imx/imx-kobs/imx-kobs.mk index d6a250cf72..91b39f6fa4 100644 --- a/package/freescale-imx/imx-kobs/imx-kobs.mk +++ b/package/freescale-imx/imx-kobs/imx-kobs.mk @@ -5,7 +5,7 @@ ################################################################################ IMX_KOBS_VERSION = a0e9adce2fb7fcd57e794d7f9a5deba0f94f521b -IMX_KOBS_SITE = $(call github,codeauroraforum,imx-kobs,$(IMX_KOBS_VERSION)) +IMX_KOBS_SITE = $(call github,NXPmicro,imx-kobs,$(IMX_KOBS_VERSION)) IMX_KOBS_LICENSE = GPL-2.0+ IMX_KOBS_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:09 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-firmware: add rtl8761b/rtl8761bu firmware Message-ID: <20230220205241.A38588648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a8b4185c286fc842ba74d660ab7bfae0a1d648c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Deploy rtl8761b/rtl8761bu firmwares as well. Signed-off-by: Stefan Agner Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 6990ef38ad..9d9d12bd5f 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -71,7 +71,9 @@ LINUX_FIRMWARE_FILES += \ rtl_bt/rtl8723a_fw.bin rtl_bt/rtl8723b_fw.bin \ rtl_bt/rtl8723bs_config-OBDA8723.bin \ rtl_bt/rtl8723bs_fw.bin rtl_bt/rtl8723d_config.bin \ - rtl_bt/rtl8723d_fw.bin rtl_bt/rtl8761a_fw.bin + rtl_bt/rtl8723d_fw.bin rtl_bt/rtl8761a_fw.bin \ + rtl_bt/rtl8761b_fw.bin rtl_bt/rtl8761b_config.bin \ + rtl_bt/rtl8761bu_fw.bin rtl_bt/rtl8761bu_config.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt endif From yann.morin.1998 at free.fr Mon Feb 20 20:58:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:09 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx/imx-lib: update codeaurora URLs to github Message-ID: <20230220205220.34A54828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c74c6472b8caf31b34a5a57654ab0c3d18dad36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. The commit also: - removes the comment in Config.in that the package does not have an upstream, - adds the new github.com url as the package url Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/imx-lib/Config.in | 3 +-- package/freescale-imx/imx-lib/imx-lib.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/freescale-imx/imx-lib/Config.in b/package/freescale-imx/imx-lib/Config.in index 746788e4c5..0a89bf140f 100644 --- a/package/freescale-imx/imx-lib/Config.in +++ b/package/freescale-imx/imx-lib/Config.in @@ -11,5 +11,4 @@ config BR2_PACKAGE_IMX_LIB platform specific drivers. It requires a kernel that includes the i.MX specific headers to be built. - This library is provided by Freescale as-is and doesn't have - an upstream. + https://github.com/nxp-imx/imx-lib diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk index 721c20e5f8..f06453e8a6 100644 --- a/package/freescale-imx/imx-lib/imx-lib.mk +++ b/package/freescale-imx/imx-lib/imx-lib.mk @@ -5,7 +5,7 @@ ################################################################################ IMX_LIB_VERSION = 3f777974c0c146817e2ff5cb0340ca66a1f99e57 -IMX_LIB_SITE = https://source.codeaurora.org/external/imx/imx-lib +IMX_LIB_SITE = https://github.com/nxp-imx/imx-lib.git IMX_LIB_SITE_METHOD = git IMX_LIB_LICENSE = LGPL-2.1+ IMX_LIB_LICENSE_FILES = COPYING-LGPL-2.1 From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:10 -0000 Subject: [Buildroot] [git commit branch/next] package/python-greenlet: add missing C++ dependency Message-ID: <20230220205241.BC56E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3496f300a8ca2bb8b337db5d43be5b3293a4e9e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: - http://autobuild.buildroot.net/results/529/5291fe0fac1d5c7b6587e4a566991a764a2632fb Signed-off-by: James Hilliard Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-greenlet/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-greenlet/Config.in b/package/python-greenlet/Config.in index 9f66ebe119..ae092e3ffe 100644 --- a/package/python-greenlet/Config.in +++ b/package/python-greenlet/Config.in @@ -12,7 +12,12 @@ config BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_GREENLET bool "python-greenlet" depends on BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP help Lightweight in-process concurrent programming. https://github.com/python-greenlet/greenlet + +comment "python-greenlet needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP From yann.morin.1998 at free.fr Mon Feb 20 20:58:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:11 -0000 Subject: [Buildroot] [git commit branch/next] package/fmlib: update codeaurora URLs to github Message-ID: <20230220205219.E69E0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a94678cfd965ed11a4e2d18d840c03a41c148d6b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. The version fsl-sdk-v2.0 is an old tag from 2016. It was not migrated to github. This commit use instead the commit id corresponding to this tag. See: https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmlib/commit/?h=fsl-sdk-v2.0&id=43fa98fdbf0c697167e415c3f060896d5b482791 The commit id exists on github: https://github.com/nxp-qoriq/fmlib/commit/43fa98fdbf0c697167e415c3f060896d5b482791 Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/fmlib/Config.in | 2 +- package/fmlib/fmlib.hash | 2 +- package/fmlib/fmlib.mk | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/fmlib/Config.in b/package/fmlib/Config.in index 7bccfd7c83..97d55d1250 100644 --- a/package/fmlib/Config.in +++ b/package/fmlib/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_FMLIB configure driver parameters and PCD (parse - classify - distribute) rules. - http://git.freescale.com/git/cgit.cgi/ppc/sdk/fmlib.git/tree/README + https://github.com/nxp-qoriq/fmlib if BR2_PACKAGE_FMLIB choice diff --git a/package/fmlib/fmlib.hash b/package/fmlib/fmlib.hash index 47460d091c..d4dcf3be5c 100644 --- a/package/fmlib/fmlib.hash +++ b/package/fmlib/fmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 59415d346af1d22f510f2785be4c7e3606dc3181476a666e832270550f7d44a6 fmlib-fsl-sdk-v2.0-br1.tar.gz +sha256 6e9e6bdb42dc2a6a76cfd756a2d4cdfcc2be90925c1f439e8a11eafa871896a6 fmlib-43fa98fdbf0c697167e415c3f060896d5b482791.tar.gz sha256 837559e20d83910a005e7883b876cc5c42805fe4abcf7e5c5b3c8d036b7f61c8 COPYING diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk index 8cb779201d..9509f3de56 100644 --- a/package/fmlib/fmlib.mk +++ b/package/fmlib/fmlib.mk @@ -4,9 +4,8 @@ # ################################################################################ -FMLIB_VERSION = fsl-sdk-v2.0 -FMLIB_SITE = https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmlib -FMLIB_SITE_METHOD = git +FMLIB_VERSION = 43fa98fdbf0c697167e415c3f060896d5b482791 +FMLIB_SITE = $(call github,nxp-qoriq,fmlib,$(FMLIB_VERSION)) FMLIB_LICENSE = BSD-3-Clause, GPL-2.0+ FMLIB_LICENSE_FILES = COPYING FMLIB_DEPENDENCIES = linux From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:11 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-module-build: bump to version 0.4232 Message-ID: <20230220205241.EE3918648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e235a1daa4e24f1eb9f1d9307003fa29cfeedd88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-module-build/perl-module-build.hash | 4 ++-- package/perl-module-build/perl-module-build.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-module-build/perl-module-build.hash b/package/perl-module-build/perl-module-build.hash index 09bc5f374a..a2181290ee 100644 --- a/package/perl-module-build/perl-module-build.hash +++ b/package/perl-module-build/perl-module-build.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 066b193e461d7dfe1eca17a139353001 Module-Build-0.4231.tar.gz -sha256 7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717 Module-Build-0.4231.tar.gz +md5 144885f1cbaf9420017bbed696ec6b83 Module-Build-0.4232.tar.gz +sha256 67c82ee245d94ba06decfa25572ab75fdcd26a9009094289d8f45bc54041771b Module-Build-0.4232.tar.gz # computed by scancpan sha256 f35ac2cc6b808a38c42c2d230b875217b0a24bb51e5a497ebb630cbb3d806c3e LICENSE diff --git a/package/perl-module-build/perl-module-build.mk b/package/perl-module-build/perl-module-build.mk index f5cab36890..d95a30647a 100644 --- a/package/perl-module-build/perl-module-build.mk +++ b/package/perl-module-build/perl-module-build.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MODULE_BUILD_VERSION = 0.4231 +PERL_MODULE_BUILD_VERSION = 0.4232 PERL_MODULE_BUILD_SOURCE = Module-Build-$(PERL_MODULE_BUILD_VERSION).tar.gz PERL_MODULE_BUILD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT PERL_MODULE_BUILD_LICENSE = Artistic or GPL-1.0+ From yann.morin.1998 at free.fr Mon Feb 20 20:58:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:12 -0000 Subject: [Buildroot] [git commit branch/next] package/fmc: update codeaurora URLs to github Message-ID: <20230220205219.D066486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=774c39caf093943aa9416c636fe3b2ec31a64e21 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. This commit also: - changes the _SITE_METHOD from "git" to the default "wget", - updates an old and broken freescale.com app note link, - adds the github project page as project url. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. The version "fsl-sdk-v2.0" is an old tag from 2015. It was not migrated to github. This commit use instead the commit id corresponding to this tag. See: https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmc/commit/?h=fsl-sdk-v2.0&id=a079d2c844edd85dff85a317a63198e7988bcd09 The commit id exists on github: https://github.com/nxp-qoriq/fmc/commit/a079d2c844edd85dff85a317a63198e7988bcd09 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/fmc/Config.in | 4 +++- package/fmc/fmc.hash | 2 +- package/fmc/fmc.mk | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/fmc/Config.in b/package/fmc/Config.in index 4399aa2cab..c89a87c99e 100644 --- a/package/fmc/Config.in +++ b/package/fmc/Config.in @@ -21,5 +21,7 @@ config BR2_PACKAGE_FMC packets flow into hardware configuration. The tool provides an abstraction layer between the end customer's vision of the PCD task definition and real hardware implementation. + See application note: + https://www.nxp.com/docs/en/application-note/AN4760.pdf - http://cache.freescale.com/files/32bit/doc/app_note/AN4760.pdf + https://github.com/nxp-qoriq/fmc diff --git a/package/fmc/fmc.hash b/package/fmc/fmc.hash index fed33091cd..7309562b09 100644 --- a/package/fmc/fmc.hash +++ b/package/fmc/fmc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cb896ec1fac2fe9a3a9bb8be2221b79acf5f9b75841609a681db0d9e7bec02a0 fmc-fsl-sdk-v2.0-br1.tar.gz +sha256 e8594e37eb81e5b1f492f8494b98086f65180637b1e2e08d8a4475c23653a404 fmc-a079d2c844edd85dff85a317a63198e7988bcd09.tar.gz sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 COPYING diff --git a/package/fmc/fmc.mk b/package/fmc/fmc.mk index b385730138..6ac8c768df 100644 --- a/package/fmc/fmc.mk +++ b/package/fmc/fmc.mk @@ -4,9 +4,8 @@ # ################################################################################ -FMC_VERSION = fsl-sdk-v2.0 -FMC_SITE = https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmc -FMC_SITE_METHOD = git +FMC_VERSION = a079d2c844edd85dff85a317a63198e7988bcd09 +FMC_SITE = $(call github,nxp-qoriq,fmc,$(FMC_VERSION)) FMC_LICENSE = MIT FMC_LICENSE_FILES = COPYING FMC_DEPENDENCIES = libxml2 tclap fmlib From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:12 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-path-tiny: bump to version 0.144 Message-ID: <20230220205242.1D5398648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d263fe0a6e7d572514fb03ec383c4800e54ae31a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-path-tiny/perl-path-tiny.hash | 4 ++-- package/perl-path-tiny/perl-path-tiny.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-path-tiny/perl-path-tiny.hash b/package/perl-path-tiny/perl-path-tiny.hash index c6fe8bf92e..7874846b89 100644 --- a/package/perl-path-tiny/perl-path-tiny.hash +++ b/package/perl-path-tiny/perl-path-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 16dd03cded30d00167a03315d0e11e51 Path-Tiny-0.124.tar.gz -sha256 fa083144781e46817ec39d21962bbbb0533c201f3baf031d2999a785a2a013fd Path-Tiny-0.124.tar.gz +md5 7b2fc4f5edfd29b88d2cc3b96830e7d1 Path-Tiny-0.144.tar.gz +sha256 f6ea094ece845c952a02c2789332579354de8d410a707f9b7045bd241206487d Path-Tiny-0.144.tar.gz # computed by scancpan sha256 c1a19c0d83f668a784640c0b41e024f37b182ad38011b170f9200123e57f6070 LICENSE diff --git a/package/perl-path-tiny/perl-path-tiny.mk b/package/perl-path-tiny/perl-path-tiny.mk index a0575172f0..6d784a0d16 100644 --- a/package/perl-path-tiny/perl-path-tiny.mk +++ b/package/perl-path-tiny/perl-path-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PATH_TINY_VERSION = 0.124 +PERL_PATH_TINY_VERSION = 0.144 PERL_PATH_TINY_SOURCE = Path-Tiny-$(PERL_PATH_TINY_VERSION).tar.gz PERL_PATH_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN PERL_PATH_TINY_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Mon Feb 20 20:58:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:13 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx/imx-m4fwloader: update URLs to NXPmicro github organization Message-ID: <20230220205220.4DA7C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f496b36995c02f81b2404ef1f450ecbfba26aace branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next imx-m4fwloader was removed from the github codeauroraforum organization. It is now redirecting to NXPmicro. This patch updates the link to directly point to the correct place. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/imx-m4fwloader/Config.in | 2 +- package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-m4fwloader/Config.in b/package/freescale-imx/imx-m4fwloader/Config.in index 937f82f916..d75480a708 100644 --- a/package/freescale-imx/imx-m4fwloader/Config.in +++ b/package/freescale-imx/imx-m4fwloader/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_IMX_M4FWLOADER This package provides a tool to load a firmware to the Cortex-M4 core available in some i.MX processors. - https://github.com/codeauroraforum/imx-m4fwloader + https://github.com/NXPmicro/imx-m4fwloader diff --git a/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk b/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk index cc4849330c..320d5dc617 100644 --- a/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk +++ b/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk @@ -5,7 +5,7 @@ ################################################################################ IMX_M4FWLOADER_VERSION = 8cf4d17a09ba23250d43381b49ba00d92406fad9 -IMX_M4FWLOADER_SITE = $(call github,codeauroraforum,imx-m4fwloader,$(IMX_M4FWLOADER_VERSION)) +IMX_M4FWLOADER_SITE = $(call github,NXPmicro,imx-m4fwloader,$(IMX_M4FWLOADER_VERSION)) IMX_M4FWLOADER_LICENSE = GPL-2.0+ IMX_M4FWLOADER_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:13 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi-pvr-vuplus: bump version to 19.0.1-Matrix Message-ID: <20230220205242.289D586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26dabd73b4f75dd3a9e2b48f8e4a4f32d42e05f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash | 2 +- package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash index 92ccd0cbfe..b2a4031bd3 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 59e8b63e3b5a6dd4500fd2c1426e021b5b243909d326e173e84804618a6c2fc6 kodi-pvr-vuplus-19.0.0-Matrix.tar.gz +sha256 cd5658c5e40d42bc02e5c99b47c28cb24bdda4b6dd49029131ff147405d4c8a8 kodi-pvr-vuplus-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk index 6a50ce703a..81159e05f3 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VUPLUS_VERSION = 19.0.0-Matrix +KODI_PVR_VUPLUS_VERSION = 19.0.1-Matrix KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION)) KODI_PVR_VUPLUS_LICENSE = GPL-2.0+ KODI_PVR_VUPLUS_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:14 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi: fix armv5 build Message-ID: <20230220205242.4B22C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2952832a40b08e93bb3dc614bb2068b152b1919f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable neon support when not available. Fixes build error not yet found by autobuilders /tmp/cc8LvPwi.s: Assembler messages: /tmp/cc8LvPwi.s:28: Error: selected processor does not support `vldmia r1,{ q4-q7 }' in ARM mode /tmp/cc8LvPwi.s:29: Error: selected processor does not support `vldmia r0,{ q8-q11 }' in ARM mode /tmp/cc8LvPwi.s:30: Error: selected processor does not support `vmul.f32 q0,q8,d8[0]' in ARM mode /tmp/cc8LvPwi.s:31: Error: selected processor does not support `vmul.f32 q1,q8,d10[0]' in ARM mode /tmp/cc8LvPwi.s:32: Error: selected processor does not support `vmul.f32 q2,q8,d12[0]' in ARM mode /tmp/cc8LvPwi.s:33: Error: selected processor does not support `vmul.f32 q3,q8,d14[0]' in ARM mode /tmp/cc8LvPwi.s:34: Error: selected processor does not support `vmla.f32 q0,q9,d8[1]' in ARM mode /tmp/cc8LvPwi.s:35: Error: selected processor does not support `vmla.f32 q1,q9,d10[1]' in ARM mode /tmp/cc8LvPwi.s:36: Error: selected processor does not support `vmla.f32 q2,q9,d12[1]' in ARM mode /tmp/cc8LvPwi.s:37: Error: selected processor does not support `vmla.f32 q3,q9,d14[1]' in ARM mode /tmp/cc8LvPwi.s:38: Error: selected processor does not support `vmla.f32 q0,q10,d9[0]' in ARM mode /tmp/cc8LvPwi.s:39: Error: selected processor does not support `vmla.f32 q1,q10,d11[0]' in ARM mode /tmp/cc8LvPwi.s:40: Error: selected processor does not support `vmla.f32 q2,q10,d13[0]' in ARM mode /tmp/cc8LvPwi.s:41: Error: selected processor does not support `vmla.f32 q3,q10,d15[0]' in ARM mode /tmp/cc8LvPwi.s:42: Error: selected processor does not support `vmla.f32 q0,q11,d9[1]' in ARM mode /tmp/cc8LvPwi.s:43: Error: selected processor does not support `vmla.f32 q1,q11,d11[1]' in ARM mode /tmp/cc8LvPwi.s:44: Error: selected processor does not support `vmla.f32 q2,q11,d13[1]' in ARM mode /tmp/cc8LvPwi.s:45: Error: selected processor does not support `vmla.f32 q3,q11,d15[1]' in ARM mode /tmp/cc8LvPwi.s:46: Error: selected processor does not support `vstmia r0,{ q0-q3 }' in ARM mode with this defconfig: BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi/kodi.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index dbe6c1e8f6..7d15e992fb 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -144,6 +144,14 @@ else KODI_CONF_OPTS += -DWITH_CPU=$(BR2_ARCH) endif +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else ifeq ($(BR2_aarch64),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else +KODI_CONF_OPTS += -DENABLE_NEON=OFF +endif + ifeq ($(BR2_X86_CPU_HAS_SSE),y) KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON else From yann.morin.1998 at free.fr Mon Feb 20 20:58:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:15 -0000 Subject: [Buildroot] [git commit branch/next] package/mfgtools: update URLs to NXPmicro github organization Message-ID: <20230220205220.66318828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a03e57ccbf432f73275869cf9a3e6a7a234cb5de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next mfgtools was removed from the github codeauroraforum organization. It is now redirecting to NXPmicro. This patch updates the link to directly point to the correct place. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/mfgtools/Config.in.host | 2 +- package/mfgtools/mfgtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mfgtools/Config.in.host b/package/mfgtools/Config.in.host index 2b506c8f67..f1e7ab58e3 100644 --- a/package/mfgtools/Config.in.host +++ b/package/mfgtools/Config.in.host @@ -8,7 +8,7 @@ config BR2_PACKAGE_HOST_MFGTOOLS production. The communication is done over USB using the Freescale UTP protocol. - https://github.com/codeauroraforum/mfgtools + https://github.com/NXPmicro/mfgtools comment "host mfgtools needs a toolchain w/ host gcc >= 4.9" depends on BR2_arm diff --git a/package/mfgtools/mfgtools.mk b/package/mfgtools/mfgtools.mk index 48ce5dda28..3de93936b8 100644 --- a/package/mfgtools/mfgtools.mk +++ b/package/mfgtools/mfgtools.mk @@ -5,7 +5,7 @@ ################################################################################ MFGTOOLS_VERSION = 0.02 -MFGTOOLS_SITE = $(call github,codeauroraforum,mfgtools,v$(MFGTOOLS_VERSION)) +MFGTOOLS_SITE = $(call github,NXPmicro,mfgtools,v$(MFGTOOLS_VERSION)) MFGTOOLS_SUBDIR = MfgToolLib MFGTOOLS_LICENSE = BSD-3-Clause or CPOL MFGTOOLS_LICENSE_FILES = LICENSE README.txt From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:16 -0000 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.4 Message-ID: <20230220205242.72DA9828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08b680f6718746eeabf2b4a18111a0991744cda3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.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 c1765c3eaa..03bf635816 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 = 22.3.3 +MESA3D_HEADERS_VERSION = 22.3.4 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 c2ceaa6ead..e4de997f0e 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000699.html -sha256 bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922 mesa-22.3.3.tar.xz -sha512 dcf166bc7c80e6ad09337e0188219e5ea4bdc558bc4b4ca35ce30d5421568f6b5328e5508b3175a2696521214e466354d8652ade22468ce448d9f61d5709c8a1 mesa-22.3.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html +sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz +sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 9fa2c05230..cf2352a355 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 = 22.3.3 +MESA3D_VERSION = 22.3.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From yann.morin.1998 at free.fr Mon Feb 20 20:58:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:17 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-imx-viv: update codeaurora URLs to github Message-ID: <20230220205220.91425828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5bdaf71c7c53655b5526f1fb6973c8fe98da8db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- .../x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash | 2 +- package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash index 5873b4b11c..b79c236478 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash +++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 638a8aa8b64f860900d003527529689bc342d18ff5e41a9e1750884544898e67 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga-br1.tar.gz +sha256 8fe1f57334b22926d4ff3b0b9fdf50af835a99cdfd0ad3ba6a604b226b723e89 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga.tar.gz sha256 9d3e373f0440cc0c58853e963636a7c1ffda9308ec5f30ebe9adfb9c16a8a1e4 COPYING-MIT diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk index 0913427542..3b346f323a 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk +++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk @@ -5,8 +5,7 @@ ################################################################################ XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = rel_imx_4.9.x_1.0.0_ga -XDRIVER_XF86_VIDEO_IMX_VIV_SITE = https://source.codeaurora.org/external/imx/xf86-video-imx-vivante -XDRIVER_XF86_VIDEO_IMX_VIV_SITE_METHOD = git +XDRIVER_XF86_VIDEO_IMX_VIV_SITE = $(call github,nxp-imx,xf86-video-imx-vivante,$(XDRIVER_XF86_VIDEO_IMX_VIV_VERSION)) XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv imx-gpu-g2d xserver_xorg-server \ xorgproto libdrm XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE = MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:17 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-qxl: bump version to 0.1.6 Message-ID: <20230220205242.7F37086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=760894b72ed465f426cf848f561200a4656eda4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003316.html Removed patch which was applied upstream. Switched tarball to xz and _SITE to https, added sha512 hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-Fix-a-build-error-with-Xorg-master.patch | 106 --------------------- .../xdriver_xf86-video-qxl.hash | 5 +- .../xdriver_xf86-video-qxl.mk | 6 +- 3 files changed, 6 insertions(+), 111 deletions(-) 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 deleted file mode 100644 index d3257fba20..0000000000 --- a/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch +++ /dev/null @@ -1,106 +0,0 @@ -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 - diff --git a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash index fdf0cc434d..2d728a7c03 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash +++ b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-December/002753.html -sha256 b18682e04503c6326f7bf7190f3ee50a3d4d69758a2a3cc9af102a6b3f114c92 xf86-video-qxl-0.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-January/003316.html +sha256 2ad39558db47a8fcc036e290e0b084671e58d43344a57b279abd870c4c67965f xf86-video-qxl-0.1.6.tar.xz +sha512 f6a42355915d2e8f8a842dc24fe6d012d123aa6d23eedea1a4771fb08f88e0298d76741755b88304d76c66b3aae15f9fca74d062be395e499a82ee8f4507c7e0 xf86-video-qxl-0.1.6.tar.xz # Locally calculated sha256 83f3bf7be3fbf5e66174b8184bd837a6b44264f8e340126ea4d9e9ce956a1866 COPYING diff --git a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk index ffbac05ec1..db0bbbaf65 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk +++ b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_QXL_VERSION = 0.1.5 -XDRIVER_XF86_VIDEO_QXL_SOURCE = xf86-video-qxl-$(XDRIVER_XF86_VIDEO_QXL_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_QXL_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_QXL_VERSION = 0.1.6 +XDRIVER_XF86_VIDEO_QXL_SOURCE = xf86-video-qxl-$(XDRIVER_XF86_VIDEO_QXL_VERSION).tar.xz +XDRIVER_XF86_VIDEO_QXL_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_QXL_LICENSE = MIT XDRIVER_XF86_VIDEO_QXL_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:17 -0000 Subject: [Buildroot] [git commit branch/next] package/sdl2: security bump to version 2.26.2 Message-ID: <20230220205242.A57488648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d33a8417bf1bc5d7276e19da5c37da210d4de31a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patch (already in version) - Fix CVE-2022-4743: A potential memory leak issue was discovered in SDL2 in GLES_CreateTexture() function in SDL_render_gles.c. The vulnerability allows an attacker to cause a denial of service attack. https://github.com/libsdl-org/SDL/releases/tag/release-2.26.0 https://github.com/libsdl-org/SDL/releases/tag/release-2.26.1 https://github.com/libsdl-org/SDL/releases/tag/release-2.26.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...oesn-t-have-a-mode-configured-use-the-pre.patch | 76 ---------------------- package/sdl2/sdl2.hash | 4 +- package/sdl2/sdl2.mk | 2 +- 3 files changed, 3 insertions(+), 79 deletions(-) diff --git a/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch b/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch deleted file mode 100644 index c8be280c56..0000000000 --- a/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch +++ /dev/null @@ -1,76 +0,0 @@ -From da9ba3a2a1536017e4ce1ee0f4276578d1ce6e29 Mon Sep 17 00:00:00 2001 -From: Sam Lantinga -Date: Fri, 18 Nov 2022 12:17:27 -0800 -Subject: [PATCH] If a CRTC doesn't have a mode configured, use the preferred - or largest mode as the default mode - -Fixes https://github.com/libsdl-org/SDL/issues/6421 - -[mf at go-sys.de: backport from upstream] -Signed-off-by: Michael Fischer -[yann.morin.1998 at free.fr: do an actual backport] -Signed-off-by: Yann E. MORIN ---- - src/video/kmsdrm/SDL_kmsdrmvideo.c | 35 +++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 6 deletions(-) - -diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c -index eae721455..eeeefef2b 100644 ---- a/src/video/kmsdrm/SDL_kmsdrmvideo.c -+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c -@@ -666,8 +666,8 @@ KMSDRM_CrtcGetVrr(uint32_t drm_fd, uint32_t crtc_id) - /* Gets a DRM connector, builds an SDL_Display with it, and adds it to the - list of SDL Displays in _this->displays[] */ - static void --KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) { -- -+KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) -+{ - SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata); - SDL_DisplayData *dispdata = NULL; - SDL_VideoDisplay display = {0}; -@@ -770,14 +770,37 @@ KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) { - drmModeModeInfo *mode = &connector->modes[i]; - - if (!SDL_memcmp(mode, &crtc->mode, sizeof(crtc->mode))) { -- mode_index = i; -- break; -+ mode_index = i; -+ break; - } - } - - if (mode_index == -1) { -- ret = SDL_SetError("Failed to find index of mode attached to the CRTC."); -- goto cleanup; -+ int current_area, largest_area = 0; -+ -+ /* Find the preferred mode or the highest resolution mode */ -+ for (i = 0; i < connector->count_modes; i++) { -+ drmModeModeInfo *mode = &connector->modes[i]; -+ -+ if (mode->type & DRM_MODE_TYPE_PREFERRED) { -+ mode_index = i; -+ break; -+ } -+ -+ current_area = mode->hdisplay * mode->vdisplay; -+ if (current_area > largest_area) { -+ mode_index = i; -+ largest_area = current_area; -+ } -+ } -+ if (mode_index != -1) { -+ crtc->mode = connector->modes[mode_index]; -+ } -+ } -+ -+ if (mode_index == -1) { -+ ret = SDL_SetError("Failed to find index of mode attached to the CRTC."); -+ goto cleanup; - } - - /*********************************************/ --- -2.25.1 - diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 923a900dc0..86e0d86e7c 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.24.2.tar.gz.sig -sha256 b35ef0a802b09d90ed3add0dcac0e95820804202914f5bb7b0feb710f1a1329f SDL2-2.24.2.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.2.tar.gz.sig +sha256 95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0 SDL2-2.26.2.tar.gz # Locally calculated sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index a1dc8b5b73..8995178e71 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.24.2 +SDL2_VERSION = 2.26.2 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From yann.morin.1998 at free.fr Mon Feb 20 20:58:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:18 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6dlsabresd: update codeaurora URLs to github Message-ID: <20230220205220.BC37F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f84cb1f03fda27df856cc4bfee36b9e5569b3d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6dlsabresd_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index 74debbfd46..976c180d6c 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd" @@ -37,7 +36,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:18 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6dlsabreauto: update codeaurora URLs to github Message-ID: <20230220205220.A76868648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30668cf9187726731611f7f5f6602098866f3286 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6dlsabreauto_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index 8fe10f6275..4081fa74a2 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto" @@ -38,7 +37,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:18 -0000 Subject: [Buildroot] [git commit branch/next] package/kvm-unit-tests: bump to version 2023-01-05 Message-ID: <20230220205242.B11FF86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e43a3c785b9666f3144e7905b27af920fff913e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A new kvm-unit-tests version has recently been tagged, so let's update to that version now. This new version now features a --disable-werror parameter for the configure script, so we can drop the patch for disabling this manually now. Signed-off-by: Thomas Huth Signed-off-by: Thomas Petazzoni --- ...ile-remove-Werror-to-avoid-build-failures.patch | 30 ---------------------- package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- package/kvm-unit-tests/kvm-unit-tests.mk | 3 ++- 3 files changed, 3 insertions(+), 32 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 deleted file mode 100644 index d07b9b6912..0000000000 --- a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 08e14a662b9e75daec29722e49150869952ba1b6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 20 Nov 2017 22:09:39 +0100 -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(-) - -diff --git a/Makefile b/Makefile -index 7231334..d9ad42b 100644 ---- a/Makefile -+++ b/Makefile -@@ -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), "") -- -2.14.2 - diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index 42c3b4a241..3b6d02dd8e 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 c2edf2b188033a5d634150ecc797c797a85e5af8e3ef4ac3e583f60b2ee7bcf3 kvm-unit-tests-v2022-03-08.tar.bz2 +sha256 9c9b093ffe3fa33145a53102de9c3e2d55cd0cdc8a20cf172b726296ffe22f4f kvm-unit-tests-v2023-01-05.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 dd8f153710..956f07b304 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -4,7 +4,7 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = 2022-03-08 +KVM_UNIT_TESTS_VERSION = 2023-01-05 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 = GPL-2.0, LGPL-2.0 @@ -31,6 +31,7 @@ KVM_UNIT_TESTS_ENDIAN = big endif KVM_UNIT_TESTS_CONF_OPTS =\ + --disable-werror \ --arch="$(KVM_UNIT_TESTS_ARCH)" \ --processor="$(GCC_TARGET_CPU)" \ --endian="$(KVM_UNIT_TESTS_ENDIAN)" From yann.morin.1998 at free.fr Mon Feb 20 20:58:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:19 -0000 Subject: [Buildroot] [git commit branch/next] package/multipath-tools: bump to version 0.9.4 Message-ID: <20230220205243.1964586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b535fd2a093eca5e8967a5c8004da55f7295d101 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Alexander Egorenkov Signed-off-by: Yann E. MORIN --- package/multipath-tools/multipath-tools.hash | 2 +- package/multipath-tools/multipath-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index 6f893d37ce..3f01408c76 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 7d5af5d86e43b757e253d1ba244aa8a9c09bfbb1677a72accb799b1bfcc0a9ac multipath-tools-0.9.3.tar.gz +sha256 6ed3cf6e786da20a451d9747cbd4c5817815388b8fc8022d1074b3018479031d multipath-tools-0.9.4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index d6abf68ca0..90394fae9f 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.9.3 +MULTIPATH_TOOLS_VERSION = 0.9.4 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ From yann.morin.1998 at free.fr Mon Feb 20 20:58:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:20 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6ullevk: update codeaurora URLs to github Message-ID: <20230220205221.1490B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=897a75a26679fd68276418ff49b79358b7ca2c7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6ullevk_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index 4c5c3b2524..7a8965be18 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -4,9 +4,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -15,9 +14,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:20 -0000 Subject: [Buildroot] [git commit branch/next] package/ethtool: fix musl-libc builds Message-ID: <20230220205243.3C56A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f97275bc78b717bec0c5d1efaaf73a0e6e36f53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Upstream commit 1fa60003a8b8 made a change to headers that broke compiles for musl-libc based builds. Apply the patch slated to address the issue. Fixes: - http://autobuild.buildroot.net/results/eafd07dddfe7e8b714fc3fcaf77a2d7150694ee2/ Signed-off-by: Vincent Fazio Signed-off-by: Yann E. MORIN --- .../0002-marvell.c-Fix-build-with-musl-libc.patch | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch b/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..f13edbbe50 --- /dev/null +++ b/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch @@ -0,0 +1,71 @@ +From a26296eea68aa6c16b253f34825c9b9007269672 Mon Sep 17 00:00:00 2001 +From: Florian Fainelli +Date: Sat, 14 Jan 2023 08:34:11 -0800 +Subject: [PATCH] marvell.c: Fix build with musl-libc + +After commit 1fa60003a8b8 ("misc: header includes cleanup") we stopped +including net/if.h which resolved the proper defines to pull in +sys/types.h and provide a definition for u_int32_t. With musl-libc we +would need to define _GNU_SOURCE to ensure that sys/types.h does provide a +definition for u_int32_t. + +Rather, just replace u_uint{16,32}_t with the more standard +uint{16,32}_t types from stdint.h + +Fixes: 1fa60003a8b8 ("misc: header includes cleanup") +Signed-off-by: Florian Fainelli + +[Upstream: https://patchwork.kernel.org/project/netdevbpf/patch/20230114163411.3290201-4-f.fainelli at gmail.com/] +Signed-off-by: Vincent Fazio +--- + marvell.c | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/marvell.c b/marvell.c +index d3d570e..3f3aed8 100644 +--- a/marvell.c ++++ b/marvell.c +@@ -31,23 +31,23 @@ static void dump_timer(const char *name, const void *p) + static void dump_queue(const char *name, const void *a, int rx) + { + struct desc { +- u_int32_t ctl; +- u_int32_t next; +- u_int32_t data_lo; +- u_int32_t data_hi; +- u_int32_t status; +- u_int32_t timestamp; +- u_int16_t csum2; +- u_int16_t csum1; +- u_int16_t csum2_start; +- u_int16_t csum1_start; +- u_int32_t addr_lo; +- u_int32_t addr_hi; +- u_int32_t count_lo; +- u_int32_t count_hi; +- u_int32_t byte_count; +- u_int32_t csr; +- u_int32_t flag; ++ uint32_t ctl; ++ uint32_t next; ++ uint32_t data_lo; ++ uint32_t data_hi; ++ uint32_t status; ++ uint32_t timestamp; ++ uint16_t csum2; ++ uint16_t csum1; ++ uint16_t csum2_start; ++ uint16_t csum1_start; ++ uint32_t addr_lo; ++ uint32_t addr_hi; ++ uint32_t count_lo; ++ uint32_t count_hi; ++ uint32_t byte_count; ++ uint32_t csr; ++ uint32_t flag; + }; + const struct desc *d = a; + +-- +2.25.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:58:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:21 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6sxsabresd: update codeaurora URLs to github Message-ID: <20230220205221.04A53828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2262e55b12fa032b5ab319a9e2c19babba6b1dc1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Reviewed-by: Fabio Estevam Signed-off-by: Yann E. MORIN --- configs/freescale_imx6sxsabresd_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index 9f48ef2da5..0c585c97f0 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb" @@ -36,8 +35,7 @@ BR2_PACKAGE_HOST_MTOOLS=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:21 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx7dsabresd: update codeaurora URLs to github Message-ID: <20230220205221.28B3F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=492d471968e83126cb0f10518e2deba3ff835b08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx7dsabresd_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index 5a9cff488d..d337865831 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -10,9 +10,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" @@ -25,9 +24,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:25 -0000 Subject: [Buildroot] [git commit branch/next] package/c-ares: security bump to version 1.19.0 Message-ID: <20230220205243.BE77786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=121a9d3649498c5f6f3a5ae8a37d6befe2cc8ef8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Low. Stack overflow in ares_set_sortlist() which is used during c-ares initialization and typically provided by an administrator and not an end user. https://c-ares.org/changelog.html#1_19_0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index af1f076aab..edf891674b 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 1a7d52a8a84a9fbffb1be9133c0f6e17217d91ea5a6fa61f6b4729cda78ebbcf c-ares-1.18.1.tar.gz +sha256 bfceba37e23fd531293829002cac0401ef49a6dc55923f7f92236585b7ad1dd3 c-ares-1.19.0.tar.gz # Hash for license file sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 0152759ebc..4332fc6919 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.18.1 +C_ARES_VERSION = 1.19.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From yann.morin.1998 at free.fr Mon Feb 20 20:58:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:25 -0000 Subject: [Buildroot] [git commit branch/next] configs/imx8mmpico: update codeaurora URLs to github Message-ID: <20230220205221.927ED86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e840a811e5c21f36524a1e334ba76cc90ae53411 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates only the ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/imx8mmpico_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/imx8mmpico_defconfig b/configs/imx8mmpico_defconfig index 7c19c8c81b..8c34c40fef 100644 --- a/configs/imx8mmpico_defconfig +++ b/configs/imx8mmpico_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.72-2.2.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.72-2.2.0)/imx-atf-lf-5.10.72-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:26 -0000 Subject: [Buildroot] [git commit branch/next] package/python-selenium: new package Message-ID: <20230220205243.B41E286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=352f4418e4ece05fc075f48e4af6f0918bf11873 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-selenium/Config.in | 11 +++++++++++ package/python-selenium/python-selenium.hash | 3 +++ package/python-selenium/python-selenium.mk | 13 +++++++++++++ 5 files changed, 29 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7e9e4df8f1..d0a51086cd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1396,6 +1396,7 @@ F: package/python-pydyf/ F: package/python-pypa-build/ F: package/python-pyphen/ F: package/python-rtoml/ +F: package/python-selenium/ F: package/python-snappy/ F: package/python-sniffio/ F: package/python-sockjs/ diff --git a/package/Config.in b/package/Config.in index 46679095b3..fc468148df 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1260,6 +1260,7 @@ menu "External python modules" source "package/python-sdnotify/Config.in" source "package/python-secretstorage/Config.in" source "package/python-see/Config.in" + source "package/python-selenium/Config.in" source "package/python-semver/Config.in" source "package/python-sentry-sdk/Config.in" source "package/python-serial/Config.in" diff --git a/package/python-selenium/Config.in b/package/python-selenium/Config.in new file mode 100644 index 0000000000..30820f07f8 --- /dev/null +++ b/package/python-selenium/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_SELENIUM + bool "python-selenium" + select BR2_PACKAGE_PYTHON_CERTIFI # runtime + select BR2_PACKAGE_PYTHON_PYSOCKS # runtime + select BR2_PACKAGE_PYTHON_TRIO # runtime + select BR2_PACKAGE_PYTHON_TRIO_WEBSOCKET # runtime + select BR2_PACKAGE_PYTHON_URLLIB3 # runtime + help + Python language bindings for Selenium WebDriver. + + https://www.selenium.dev diff --git a/package/python-selenium/python-selenium.hash b/package/python-selenium/python-selenium.hash new file mode 100644 index 0000000000..d462abc62b --- /dev/null +++ b/package/python-selenium/python-selenium.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/selenium/json +md5 e9054eb95920bb2a1d594090f0773f61 selenium-4.8.0.tar.gz +sha256 fee36724d6cf0b18c73781bb8ec7be4a35ab1e2564e64e64e64da75e50e052af selenium-4.8.0.tar.gz diff --git a/package/python-selenium/python-selenium.mk b/package/python-selenium/python-selenium.mk new file mode 100644 index 0000000000..6dbea6fb7e --- /dev/null +++ b/package/python-selenium/python-selenium.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-selenium +# +################################################################################ + +PYTHON_SELENIUM_VERSION = 4.8.0 +PYTHON_SELENIUM_SOURCE = selenium-$(PYTHON_SELENIUM_VERSION).tar.gz +PYTHON_SELENIUM_SITE = https://files.pythonhosted.org/packages/2e/3d/492cf1a6823c48369328572c6bc63b7a957ba25c0009ee6bdb507cd9a6a4 +PYTHON_SELENIUM_SETUP_TYPE = setuptools +PYTHON_SELENIUM_LICENSE = Apache-2.0 + +$(eval $(python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:58:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:26 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx8mmevk: update codeaurora URLs to github Message-ID: <20230220205221.69B2A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca0d4287185c5f7f7c4fea7b405effdc0d19c93c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mmevk_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8mmevk_defconfig b/configs/freescale_imx8mmevk_defconfig index ae82f29158..dcb4b42540 100644 --- a/configs/freescale_imx8mmevk_defconfig +++ b/configs/freescale_imx8mmevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk freescale/imx8mm-evk-revb-qca-wifi" @@ -19,16 +18,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:27 -0000 Subject: [Buildroot] [git commit branch/next] package/flatbuffers: build position independent code Message-ID: <20230220205243.E98C686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=730e50f520d15c6522153381e8fba57421e78d79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The upcoming tensorflow-lite package requires flatbuffers to be built with position independent code. Fixes: /home/buildroot/buildroot/output/per-package/tensorflow-lite/host/bin/../lib/gcc/aarch64-buildroot-linux-gnu/11.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: /home/buildroot/buildroot/output/per-package/tensorflow-lite/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libflatbuffers.a(util.cpp.o): relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `_ZN11flatbuffers11CharToUpperEc' which may bind externally can not be used when making a shared object; recompile with -fPIC Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/flatbuffers/flatbuffers.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/flatbuffers/flatbuffers.mk b/package/flatbuffers/flatbuffers.mk index 9d286bf9e1..487d85ee1f 100644 --- a/package/flatbuffers/flatbuffers.mk +++ b/package/flatbuffers/flatbuffers.mk @@ -14,6 +14,7 @@ FLATBUFFERS_DEPENDENCIES = host-flatbuffers FLATBUFFERS_CONF_OPTS += \ -DCMAKE_CXX_FLAGS="-std=c++11" \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DFLATBUFFERS_BUILD_TESTS=OFF \ -DFLATBUFFERS_FLATC_EXECUTABLE=$(HOST_DIR)/bin/flatc From yann.morin.1998 at free.fr Mon Feb 20 20:58:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:27 -0000 Subject: [Buildroot] [git commit branch/next] package/z3: introduce _ARCH_SUPPORTS Message-ID: <20230220205221.D73B28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=415c7af0796e1f2212170bcad5a13e9cd16d5d7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next z3 package was initially added with a depends on !BR2_nios2. This was detected by testing with "./utils/test-pkg -a -p z3". It turned out that few other architectures are also not supported. The actual z3 requirement is to have a libc that provides AND also provides all the four macros: FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD. Quoting glibc manual, or "man fenv": https://www.gnu.org/software/libc/manual/html_node/Rounding.html "fenv.h defines constants which you can use to refer to the various rounding modes. Each one will be defined if and only if the FPU supports the corresponding rounding mode." This patch introduces _ARCH_SUPPORTS to limit only to the architectures with a FPU that has those rounding modes. Fixes: - http://autobuild.buildroot.net/results/2809dd1ae2f3ada8ee7b3f3e388341c7cfb633fb Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/z3/Config.in | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/package/z3/Config.in b/package/z3/Config.in index 55b0e8bb3b..8cd3128687 100644 --- a/package/z3/Config.in +++ b/package/z3/Config.in @@ -1,11 +1,33 @@ +# z3 supports arch for which libc fenv.h provides all four macros: +# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD +# See for example in glibc https://sourceware.org/git/glibc.git +# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ +config BR2_PACKAGE_Z3_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arceb || BR2_arcle + default y if BR2_arm || BR2_armeb + default y if BR2_i386 + default y if BR2_m68k + # BR2_microblaze has only FE_TONEAREST + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + # BR2_nios2 has only FE_TONEAREST + default y if BR2_or1k + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_s390x + # BR2_sh has only FE_{TONEAREST,TOWARDZERO} + default y if BR2_sparc || BR2_sparc64 + default y if BR2_x86_64 + # BR2_xtensa supports only uclibc which does not have fenv.h + config BR2_PACKAGE_Z3 bool "z3" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # c++17 # z3 needs fenv.h which is not provided by uclibc depends on !BR2_TOOLCHAIN_USES_UCLIBC - # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 - depends on !BR2_nios2 + depends on BR2_PACKAGE_Z3_ARCH_SUPPORTS help Z3, also known as the Z3 Theorem Prover, is a cross-platform satisfiability modulo theories (SMT) solver. From yann.morin.1998 at free.fr Mon Feb 20 20:58:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:28 -0000 Subject: [Buildroot] [git commit branch/next] package/mono: bump to version 6.12.0.182 Message-ID: <20230220205243.DE7428648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9fb89785b9bbf4a3f7dba9e511332ba9b068146 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Angelo Compagnucci Signed-off-by: Yann E. MORIN --- 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 8b72ae68ed..1010f6d0ab 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23 mono-6.12.0.122.tar.xz +sha256 57366a6ab4f3b5ecf111d48548031615b3a100db87c679fc006e8c8a4efd9424 mono-6.12.0.182.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 219effc5d3..b88f2b379e 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 6.12.0.122 +MONO_VERSION = 6.12.0.182 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 yann.morin.1998 at free.fr Mon Feb 20 20:58:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:28 -0000 Subject: [Buildroot] [git commit branch/next] configs/ls1028ardb: update codeaurora URLs to github Message-ID: <20230220205221.B839D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76e610ef59f2c25577265a103dc37dce79b3e856 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Reviewed-by: Francois Perrad Signed-off-by: Yann E. MORIN --- configs/ls1028ardb_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/ls1028ardb_defconfig b/configs/ls1028ardb_defconfig index 1bc84f7b80..a46b94511a 100644 --- a/configs/ls1028ardb_defconfig +++ b/configs/ls1028ardb_defconfig @@ -17,9 +17,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1028ardb/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/linux" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="LSDK-21.08" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,LSDK-21.08)/linux-LSDK-21.08.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -37,9 +36,8 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="LSDK-21.08" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,LSDK-21.08)/atf-LSDK-21.08.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1028ardb" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW=y @@ -48,9 +46,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BOOT_MODE=sd" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="LSDK-21.08" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,LSDK-21.08)/u-boot-LSDK-21.08.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1028ardb_tfa" BR2_TARGET_UBOOT_NEEDS_DTC=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:29 -0000 Subject: [Buildroot] [git commit branch/next] board/beaglebone/readme.txt: update list of DTB files produced Message-ID: <20230220205244.6750086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=faa299ff8c94bea11345071a3d1d05c2681c2cdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Thomas Petazzoni --- board/beaglebone/readme.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/beaglebone/readme.txt b/board/beaglebone/readme.txt index 231e977a89..a11377eaee 100644 --- a/board/beaglebone/readme.txt +++ b/board/beaglebone/readme.txt @@ -28,6 +28,10 @@ Result of the build =================== output/images/ +-- am335x-boneblack.dtb ++-- am335x-boneblack-wireless.dtb ++-- am335x-boneblue.dtb ++-- am335x-bonegreen.dtb ++-- am335x-bonegreen-wireless.dtb +-- am335x-bone.dtb +-- am335x-evm.dtb +-- am335x-evmsk.dtb From peter at korsgaard.com Mon Feb 20 20:58:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:30 -0000 Subject: [Buildroot] [git commit branch/next] configs/spike_riscv64_defconfig: bump Linux kernel to 5.15.86 Message-ID: <20230220205222.31FB1828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05ebdba1fc3c8393f893dcca325276c21ff79ab9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- configs/spike_riscv64_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index cc145bcd8e..cd8fd8ee04 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -2,7 +2,7 @@ BR2_riscv=y BR2_RISCV_64=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_ROOTFS_CPIO=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:30 -0000 Subject: [Buildroot] [git commit branch/next] package/neon-2-sse: fix build without C++ toolchain Message-ID: <20230220205244.28B2B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36741b9461a629002296e5debae848fc7f6e152f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The cmake project for neon-2-sse doesn't correctly set the project language to C which causes cmake to try and detect a C++ compiler. Add a patch which fixes the project language setting. Fixes: - http://autobuild.buildroot.net/results/0eb/0ebb8c886e0a432b6fb43ab21010f625f6797b9e - http://autobuild.buildroot.net/results/a5d/a5db2f286dbd69e84d518d086df857ef434b936a Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/neon-2-sse/0001-Fix-cmake-languages.patch | 40 +++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/package/neon-2-sse/0001-Fix-cmake-languages.patch b/package/neon-2-sse/0001-Fix-cmake-languages.patch new file mode 100644 index 0000000000..e0becb1ffa --- /dev/null +++ b/package/neon-2-sse/0001-Fix-cmake-languages.patch @@ -0,0 +1,40 @@ +From 186ec82e033d8c718d760d14945535a9d7e160fd Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sun, 29 Jan 2023 21:00:27 -0700 +Subject: [PATCH] Fix cmake languages + +When no language is set cmake defaults to C and CXX, since we support +C by itself we should set the project language to C so that we don't +get a compiler error when building without a CXX toolchain. + +Fixes: +CMake Error at CMakeLists.txt:5 (project): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/intel/ARM_NEON_2_x86_SSE/pull/62] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e4b8980..8f58e79 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,7 +2,7 @@ + # Modification: Copyright (C) 2017 David Hirvonen + + cmake_minimum_required(VERSION 3.0) +-project(NEON_2_SSE VERSION 1.0.0) ++project(NEON_2_SSE VERSION 1.0.0 LANGUAGES C) + + add_library(${PROJECT_NAME} INTERFACE) + +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:58:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:31 -0000 Subject: [Buildroot] [git commit branch/next] security hardening: add support for glibc _FORTIFY_SOURCE=3 Message-ID: <20230220205221.E7E73828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f54c2a841861ba587c9bbdd66d5164b6774d9e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A new _FORTIFY_SOURCE=3 level was introduced in glibc, in commit: https://sourceware.org/git/?p=glibc.git;a=commit;h=c43c5796121bc5bcc0867f02e5536874aa8196c1 This commit was first included glibc 2.33. At that time, it was only supported by llvm/clang 9, and not by any released gcc version. To support _FORTIFY_SOURCE=3, the needed gcc features were introduced in version 12. The gcc 12 support was added in glibc commit: https://sourceware.org/git/?p=glibc.git;a=commit;h=86bf0feb0e3ec8e37872f72499d6ae33406561d7 This commit was first included in glibc 2.35. Buildroot updated to glibc 2.35 in commit: https://git.buildroot.org/buildroot/commit/?id=68d0aede597d32816c5b2ff32de0ce33cc14eb93 Buildroot introduced gcc 12 support in commit: https://git.buildroot.org/buildroot/commit/?id=0f1ad4fc93286adaba852c99d6e1c2565b5c4258 Support for _FORTIFY_SOURCE=3 can now be added. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- Config.in | 9 +++++++++ package/Makefile.in | 2 ++ 2 files changed, 11 insertions(+) diff --git a/Config.in b/Config.in index 64604a0aed..86699f58c6 100644 --- a/Config.in +++ b/Config.in @@ -930,6 +930,15 @@ config BR2_FORTIFY_SOURCE_2 Also adds checks at run-time (detected buffer overflow terminates the program) +config BR2_FORTIFY_SOURCE_3 + bool "Extended" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_12 + help + This option sets _FORTIFY_SOURCES to 3 and even more + checking is added compared to level 2. Extends checks at + run-time that can introduce an additional performance + overhead. + endchoice comment "Fortify Source needs a glibc toolchain and optimization" diff --git a/package/Makefile.in b/package/Makefile.in index 43d214bcbe..7f1b00ba24 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -160,6 +160,8 @@ ifeq ($(BR2_FORTIFY_SOURCE_1),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=1 else ifeq ($(BR2_FORTIFY_SOURCE_2),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=2 +else ifeq ($(BR2_FORTIFY_SOURCE_3),y) +TARGET_HARDENED += -D_FORTIFY_SOURCE=3 endif TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 From yann.morin.1998 at free.fr Mon Feb 20 20:58:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:31 -0000 Subject: [Buildroot] [git commit branch/next] package/fxdiv: new package Message-ID: <20230220205244.1DFAF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed6062efbcda90eee7f523b3d63deb1fc36e4a17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This package is required by tensorflow-lite. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/fxdiv/Config.in | 7 +++++++ package/fxdiv/fxdiv.hash | 4 ++++ package/fxdiv/fxdiv.mk | 19 +++++++++++++++++++ 5 files changed, 32 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8a652c7c12..706ee80ece 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1339,6 +1339,7 @@ N: James Hilliard F: package/apcupsd/ F: package/bpftool/ F: package/exfatprogs/ +F: package/fxdiv/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ diff --git a/package/Config.in b/package/Config.in index 96a44a3623..83fddf316f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2014,6 +2014,7 @@ menu "Other" source "package/flann/Config.in" source "package/flatbuffers/Config.in" source "package/flatcc/Config.in" + source "package/fxdiv/Config.in" source "package/gconf/Config.in" source "package/gdal/Config.in" source "package/gflags/Config.in" diff --git a/package/fxdiv/Config.in b/package/fxdiv/Config.in new file mode 100644 index 0000000000..5aa714e44a --- /dev/null +++ b/package/fxdiv/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FXDIV + bool "fxdiv" + help + Header-only library for division via fixed-point + multiplication by inverse. + + https://github.com/Maratyszcza/FXdiv diff --git a/package/fxdiv/fxdiv.hash b/package/fxdiv/fxdiv.hash new file mode 100644 index 0000000000..2142d84e09 --- /dev/null +++ b/package/fxdiv/fxdiv.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 ec74d882a0a47cfd9c0f95bc4fae9901a4ade802a96a3b76e02671bb7340a4c5 fxdiv-63058eff77e11aa15bf531df5dd34395ec3017c8.tar.gz +# License files, locally calculated +sha256 7cac00006125b1486a27e4801ed66357236e984c540bd323945ab7b66b078ec3 LICENSE diff --git a/package/fxdiv/fxdiv.mk b/package/fxdiv/fxdiv.mk new file mode 100644 index 0000000000..06dbf0648d --- /dev/null +++ b/package/fxdiv/fxdiv.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# fxdiv +# +################################################################################ + +FXDIV_VERSION = 63058eff77e11aa15bf531df5dd34395ec3017c8 +FXDIV_SITE = $(call github,Maratyszcza,FXdiv,$(FXDIV_VERSION)) +FXDIV_LICENSE = MIT +FXDIV_LICENSE_FILES = LICENSE +FXDIV_INSTALL_STAGING = YES +# Only installs a header +FXDIV_INSTALL_TARGET = NO + +FXDIV_CONF_OPTS = \ + -DFXDIV_BUILD_TESTS=OFF \ + -DFXDIV_BUILD_BENCHMARKS=OFF + +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:58:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:32 -0000 Subject: [Buildroot] [git commit branch/next] package/fxdiv: fix build without C++ toolchain Message-ID: <20230220205244.32F2F86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33c89f98377cb968b03eb1428af8a74eba9d13ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The cmake project for fxdiv sets the project language to C and CXX even when only C is required. Add a patch which disables CXX unless required. Fixes: - http://autobuild.buildroot.net/results/b0f/b0f3b6352429a5156a8c3a2b932331753887b65b - http://autobuild.buildroot.net/results/52f/52f634c06bdfe983280a2c01bb9fec4b0e1a4b34 - http://autobuild.buildroot.net/results/181/181b85d9dd505693ed23fab823085b001aa785f4 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- ...-enable-CXX-unless-building-tests-benchma.patch | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch b/package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch new file mode 100644 index 0000000000..0336f5e1cc --- /dev/null +++ b/package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch @@ -0,0 +1,49 @@ +From 8c2d8fc60306a8edd21182a1f5f267a7aca55763 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sun, 29 Jan 2023 21:18:28 -0700 +Subject: [PATCH] CMake: don't enable CXX unless building tests/benchmarks + +We only need CXX support when building tests/benchmarks. + +Fixes: +CMake Error at CMakeLists.txt:4 (PROJECT): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/Maratyszcza/FXdiv/pull/3] +--- + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bcae6b5..c75f558 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR) + + # ---[ Project +-PROJECT(FXdiv C CXX) ++PROJECT(FXdiv C) + + # ---[ Options. + OPTION(FXDIV_USE_INLINE_ASSEMBLY "Allow use of inline assembly in FXdiv" OFF) +@@ -16,6 +16,10 @@ ENDIF() + # ---[ CMake options + INCLUDE(GNUInstallDirs) + ++IF(FXDIV_BUILD_TESTS OR FXDIV_BUILD_BENCHMARKS) ++ ENABLE_LANGUAGE(CXX) ++ENDIF() ++ + IF(FXDIV_BUILD_TESTS) + ENABLE_TESTING() + ENDIF() +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:58:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:32 -0000 Subject: [Buildroot] [git commit branch/next] linux: fix builds for kernels < 5.6 and host-gcc >= 10 Message-ID: <20230220205222.008D286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e75f3962084045cf50f38f0adf8bfaa8da71dfd5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next During a linux-backports update, it was found that kernel v3.10.108 was failing to compile. See: https://lists.buildroot.org/pipermail/buildroot/2022-August/649507.html This issue was introduced by commit 9b41b54be07711c10ad13ce157be272ed1cf402e "linux: fix build with host-gcc 10+", which removes all declarations of "yylloc" symbols in the dtc parser. This symbol is generated by bison, if the "%locations" directive is provided in the parser. See: https://git.savannah.gnu.org/cgit/bison.git/tree/doc/bison.texi?h=v3.8.2#n5984 Kernel versions < 5.6 did not include this directive, so removing all yylloc declararions in the parser also was failing for those version. In the kernel, dtc was updated to v1.5.1-22-gc40aeb60b47a in: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0cec114e36606412908a35695a5db944cec2e3db This commit is included in kernel v5.6. This dtc update include the dtc commit: https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=7150286225476345bd6e7312331e3baf4d621c32 which adds the '%locations' directive. This commit fixes the issue by programmatically adding the '%locations' Bison directive, if it's not found in the parser file. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14971 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- linux/linux.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 6b547a68ed..7645b5f507 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -155,6 +155,7 @@ LINUX_MAKE_FLAGS = \ INSTALL_MOD_PATH=$(TARGET_DIR) \ CROSS_COMPILE="$(TARGET_CROSS)" \ WERROR=0 \ + REGENERATE_PARSERS=1 \ DEPMOD=$(HOST_DIR)/sbin/depmod ifeq ($(BR2_REPRODUCIBLE),y) @@ -286,6 +287,19 @@ define LINUX_DROP_YYLLOC endef LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC +# Kernel version < 5.6 breaks if host-gcc version is >= 10 and +# 'yylloc' symbol is removed in previous hook, due to missing +# '%locations' bison directive in dtc-parser.y. See: +# https://bugs.busybox.net/show_bug.cgi?id=14971 +define LINUX_ADD_DTC_LOCATIONS + $(Q)DTC_PARSER=$(@D)/scripts/dtc/dtc-parser.y; \ + if test -e "$${DTC_PARSER}" \ + && ! grep -Eq '^%locations$$' "$${DTC_PARSER}" ; then \ + $(SED) '/^%{$$/i %locations' "$${DTC_PARSER}"; \ + fi +endef +LINUX_POST_PATCH_HOOKS += LINUX_ADD_DTC_LOCATIONS + # Older linux kernels use deprecated perl constructs in timeconst.pl # that were removed for perl 5.22+ so it breaks on newer distributions # Try a dry-run patch to see if this applies, if it does go ahead From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:33 -0000 Subject: [Buildroot] [git commit branch/next] configs/beaglebone: add support for BeagleBone Green Wireless Message-ID: <20230220205244.5E00D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd1d0a9cbf6de2c30fcfcc181b466a5f2b44dc54 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This commit adds support for the BeagleBone Green Wireless to the existing beaglebone_defconfig, by making sure the relevant Device Tree is built and installed. Signed-off-by: Ramon Crichlow Signed-off-by: Thomas Petazzoni --- board/beaglebone/genimage.cfg | 1 + configs/beaglebone_defconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index 42ca2cf107..987d205075 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -11,6 +11,7 @@ image boot.vfat { "am335x-boneblack.dtb", "am335x-bonegreen.dtb", "am335x-boneblack-wireless.dtb", + "am335x-bonegreen-wireless.dtb", } } diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 06154d98b7..639b491e97 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -23,7 +23,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem From peter at korsgaard.com Mon Feb 20 20:58:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:33 -0000 Subject: [Buildroot] [git commit branch/next] package/libopenh264: bump version to 2.3.1 Message-ID: <20230220205222.5C26D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e59365629f882eb3e4ea012ab2cd396bc3d8a4fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/cisco/openh264/releases/tag/v2.3.1 https://github.com/cisco/openh264/releases/tag/v2.3.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libopenh264/libopenh264.hash | 2 +- package/libopenh264/libopenh264.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash index 712425a024..eecb0b9625 100644 --- a/package/libopenh264/libopenh264.hash +++ b/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e4e5c8ba48e64ba6ce61e8b6e2b76b2d870c74c270147649082feabb40f25905 libopenh264-2.2.0.tar.gz +sha256 453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 libopenh264-2.3.1.tar.gz sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk index ea41f72661..750ec41e4d 100644 --- a/package/libopenh264/libopenh264.mk +++ b/package/libopenh264/libopenh264.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENH264_VERSION = 2.2.0 +LIBOPENH264_VERSION = 2.3.1 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:58:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:34 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: explicitly disable webp Message-ID: <20230220205222.A19BD828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9db9f9b4dc7d7b728bf2ea9e6456a9fcc6d7098c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tiff/tiff.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f0b56150b1..d3ab50b79e 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -12,9 +12,12 @@ TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES +# webp has a (optional) dependency on tiff, so we can't have webp +# support in tiff, or that would create a circular dependency. TIFF_CONF_OPTS = \ --disable-contrib \ --disable-tests \ + --disable-webp \ --without-x TIFF_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Mon Feb 20 20:58:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:34 -0000 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: only require a C compiler Message-ID: <20230220205244.926038648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dedbc69022ba0beaf259463ac8082c86776f7e88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: - http://autobuild.buildroot.net/results/007/007c7c69e54b8ff663891da4535e2e95d40c42a2/build-end.log - http://autobuild.buildroot.net/results/ede/ede6f9fb67c0c26ff02e71a3d20e3d4344ea59f0/build-end.log Signed-off-by: Thomas Devoogdt [Peter: replace by upstream patch] Signed-off-by: Peter Korsgaard --- ...-CMakeLists.txt-only-require-a-C-compiler.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch b/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch new file mode 100644 index 0000000000..e71bcf0c0d --- /dev/null +++ b/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch @@ -0,0 +1,27 @@ +From 7bcb502ebdcd647d6b83c972805e734ad522eb1a Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 30 Jan 2023 09:10:37 +0100 +Subject: [PATCH] CMakeLists.txt: only require a C compiler + +Fluent-bit is mostly written in C, +so don't require CXX in the top-level project. + +Signed-off-by: Thomas Devoogdt +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a7adb02de..3ff7360d8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.12) +-project(fluent-bit) ++project(fluent-bit C) + + # CMP0069 ensures that LTO is enabled for all compilers + cmake_policy(SET CMP0069 NEW) +-- +2.30.2 + From peter at korsgaard.com Mon Feb 20 20:58:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:35 -0000 Subject: [Buildroot] [git commit branch/next] Revert "package/tiff: add webp optional dependency" Message-ID: <20230220205222.8F7A186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5cb87730fdf2eb5a7a5b1302c21afba71aeeb5e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit 3fd6ada8dbca3370b9bb67feb2971e637cb4b11f to fix the following build failure raised because tiff is already an optional dependency of webp: package/tiff/tiff.mk:122: *** Recursive variable 'TIFF_FINAL_RECURSIVE_DEPENDENCIES' references itself (eventually). Stop. Fixes: - http://autobuild.buildroot.org/results/d8486cd1d5e56fb3719dc88b8aebc76c3e23cdc9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tiff/Config.in | 4 ---- package/tiff/tiff.mk | 7 ------- 2 files changed, 11 deletions(-) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index b9e3656e6f..d1004d6668 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -72,10 +72,6 @@ config BR2_PACKAGE_TIFF_UTILITIES help Install all tiff utilities. -config BR2_PACKAGE_TIFF_WEBP - bool "WEBP compression" - select BR2_PACKAGE_WEBP - config BR2_PACKAGE_TIFF_ZSTD bool "ZSTD compression" select BR2_PACKAGE_ZSTD diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index c2a4108f35..f0b56150b1 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -105,13 +105,6 @@ else TIFF_CONF_OPTS += --disable-tools endif -ifeq ($(BR2_PACKAGE_TIFF_WEBP),y) -TIFF_CONF_OPTS += --enable-webp -TIFF_DEPENDENCIES += webp -else -TIFF_CONF_OPTS += --disable-webp -endif - ifeq ($(BR2_PACKAGE_TIFF_ZSTD),y) TIFF_CONF_OPTS += --enable-zstd TIFF_DEPENDENCIES += zstd From peter at korsgaard.com Mon Feb 20 20:58:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:36 -0000 Subject: [Buildroot] [git commit branch/next] package/libksba: update _SITE to https Message-ID: <20230220205222.C3C0F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83c4edf83953bb86257e6b6e3b07f974fc66a37e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Switch to https download for firewall compatibility and security. The https URL is also the one advertised on the package download page: https://gnupg.org/download/index.html Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/libksba/libksba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index 3a8b3fa502..727a836cf4 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -6,7 +6,7 @@ LIBKSBA_VERSION = 1.6.2 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 -LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba +LIBKSBA_SITE = https://gnupg.org/ftp/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3 LIBKSBA_CPE_ID_VENDOR = libksba_project From peter at korsgaard.com Mon Feb 20 20:58:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:36 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230220205244.DE76886496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=def789059af78cd65294cafa4288cb41691e86c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 4.9.x / 6.0.x is now EOL. 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 e18b515311..a0e9286bd3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.5" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 157f267a9d..927172e8fa 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 bc7f6d9a8a8bbe9a723e82346bba94b58d926f78bfba106b21e041e0290076fc linux-6.1.5.tar.xz +sha256 d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b linux-6.1.9.tar.xz sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e7359bd2935b54fe8bb821cf748591c36a95bed019e752d3e4d5803d9da1ccb4 linux-5.15.87.tar.xz -sha256 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 linux-5.10.162.tar.xz -sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz +sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz +sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz +sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz -sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz +sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz +sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1ad9fffcd3..3a5207e0b6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -397,13 +397,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.302" if BR2_KERNEL_HEADERS_4_14 - default "4.19.269" if BR2_KERNEL_HEADERS_4_19 - default "5.4.228" if BR2_KERNEL_HEADERS_5_4 - default "5.10.162" if BR2_KERNEL_HEADERS_5_10 - default "5.15.87" if BR2_KERNEL_HEADERS_5_15 + default "4.14.304" if BR2_KERNEL_HEADERS_4_14 + default "4.19.271" if BR2_KERNEL_HEADERS_4_19 + default "5.4.230" if BR2_KERNEL_HEADERS_5_4 + default "5.10.166" if BR2_KERNEL_HEADERS_5_10 + default "5.15.91" if BR2_KERNEL_HEADERS_5_15 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 - default "6.1.5" if BR2_KERNEL_HEADERS_6_1 + default "6.1.9" if BR2_KERNEL_HEADERS_6_1 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 yann.morin.1998 at free.fr Mon Feb 20 20:58:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:37 -0000 Subject: [Buildroot] [git commit branch/next] package/ncurses: Switch to git repo with snapshots Message-ID: <20230220205222.7C964828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d7c69a0c9e414b7112347c37e1424ec5f2863ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next ncurses does not release dot-versions, but the fixes are released as a set of cumulative patches against the latest version. So far, we carry the list of the patches against 6.3, and this is a tedious task to maintain that list (especially as we have a hash for each of them). Thomas E. Dickey (the ncurses maintainer, so we can trust him) hosts the ncurses snapshots on Github, with patches already applied. So, we switch to using that. This avoids needing to list all incremental patches, and will make future bumping easier. Signed-off-by: Dennis Van Hoorick [yann.morin.1998 at free.fr: - don't use 'v' in filename - rework the version string for when there's no snapshot ] Signed-off-by: Yann E. MORIN --- package/ncurses/ncurses.hash | 65 ++------------------------------------ package/ncurses/ncurses.mk | 75 ++++++-------------------------------------- 2 files changed, 11 insertions(+), 129 deletions(-) diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index c72a2abf46..c96bf77bce 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -1,65 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059 ncurses-6.3.tar.gz -sha256 51bad0e386d06d3a26d7f28087b2072658282452f209e7e5eb7722556b042570 ncurses-6.3-20211026.patch.gz -sha256 4e1b0694a2633cc681987c80091175cb2b17a6c882750a7c6afb0560f5447249 ncurses-6.3-20211030.patch.gz -sha256 de7e0b2c784342188da48147d3fa661be38d5b5d517bb224423f15893e27334f ncurses-6.3-20211106.patch.gz -sha256 df78f157336fce33d96ae1e3c2f7d7b48e9b728409d9a4ab59e77242255b03ab ncurses-6.3-20211113.patch.gz -sha256 b7bf59d9a8e243263b05b166c6fe321bfca8e67eb32ebc26a1c813df42d64fee ncurses-6.3-20211115.patch.gz -sha256 7cb46c897e2e54d5f085cd9edc8d523c13b8f4a13878dd01ce094ec52bd26aec ncurses-6.3-20211120.patch.gz -sha256 ee8cf6ab6db3a01f2533959d14a5e1cc8e1412fbce4b2ab4668c7d1101f71684 ncurses-6.3-20211127.patch.gz -sha256 9d9055badff9e15fc1fbe4f4b2cce7c76384d446ab857573cbb1d645430d8ac7 ncurses-6.3-20211204.patch.gz -sha256 6059625cac99819a3580955db377c0820b6be7ae5da4d8a82e9638948a7b0679 ncurses-6.3-20211211.patch.gz -sha256 acb77a09fe6ab37b96e9f70d9ebfde0aaf7bdee064761c605b47125bd31be2ae ncurses-6.3-20211219.patch.gz -sha256 f2786f19c85258da9e9255459480e5ac2efb61b6ea5d0866b9b8507fa8f5b036 ncurses-6.3-20211225.patch.gz -sha256 ca5736eda90cd7cb597be0fdb0ed10f04deb7304cc7ffb0b166dfa07c39ab1e7 ncurses-6.3-20220101.patch.gz -sha256 7e43911e6baa4a7cfeaad1880777bda352eb7b22493db5bc9f72a52aec8d6d78 ncurses-6.3-20220115.patch.gz -sha256 ecfdd8bed6ff3b1fae5050da555c77dd41035c35bebed30162862e343324443e ncurses-6.3-20220122.patch.gz -sha256 32ec2da0fe48c353489c4018b38f890a59eafeb37ab24b82e32ba553845438a4 ncurses-6.3-20220129.patch.gz -sha256 f74b0d1f7f96bf8609c6a62e268019289e4affec9e02f9182ab14817637180e7 ncurses-6.3-20220205.patch.gz -sha256 6506f709e745375f692d05f53c45b50f1e60d13a3e4346db46d14f69e19adbb1 ncurses-6.3-20220212.patch.gz -sha256 349433e684e96096cbacaa1014d3ccd285c441d1bd99a721ae0b705b02de4145 ncurses-6.3-20220219.patch.gz -sha256 2181cf581fcdabb5b534606ab81c4c625bf819f9d351c670972a7f3a85f36197 ncurses-6.3-20220226.patch.gz -sha256 1acd0f2d18ea7c783286658e550c4f61cbe750a907c9be5fc00e67f2ea8f7eb5 ncurses-6.3-20220305.patch.gz -sha256 ced13543cc19ee341d82eb7fd501e15a2f3d1bc08fbbeb9de7edbd6422ca4799 ncurses-6.3-20220312.patch.gz -sha256 450fce90a10b1ab0b20ba5efc222741fe96f8445d1e4528e2a7b7711c26a5254 ncurses-6.3-20220319.patch.gz -sha256 c97213841e41d33b50a8492ba252dc79a24b38721f7ac0966442b3176f5666c7 ncurses-6.3-20220326.patch.gz -sha256 4c6253ea2c3cf83fbac2fdb5af56914e6bdc5a7c6e6e7532a4f218b7af6d05eb ncurses-6.3-20220402.patch.gz -sha256 5b46bc2bec8f9192c2ed7d25f2080c57b7d7ecbe294d85ab8d3c7d4eb4a678fa ncurses-6.3-20220409.patch.gz -sha256 fddd3b7dea2db1dc70adfa46ccb52301c820854821ce35366056e8e8daba8360 ncurses-6.3-20220416.patch.gz -sha256 1dba62d927affe93face3d55710d8abce7b70a904a0dd0114894efff7ba8ac72 ncurses-6.3-20220423.patch.gz -sha256 f6289906a3be560da9240e0d4a7a1bbd213dd9316f0b395e6852524491ff6322 ncurses-6.3-20220430.patch.gz -sha256 a6f631b9b934d0012617c429834b370732084d6f3c1784d11d8f18f26ea9e0d4 ncurses-6.3-20220501.patch.gz -sha256 79e75286b2a3292058bbe0aa67d8ea49682f7942b108c3ffc725a34765d4fce7 ncurses-6.3-20220507.patch.gz -sha256 1dda27245cbd6634f89766624dc72c156312bf00635214ea7ac299c9330b18f2 ncurses-6.3-20220514.patch.gz -sha256 0a251674845e0669e92c8bee6b6e5bb317439f8707f3316424eae590322f87c6 ncurses-6.3-20220521.patch.gz -sha256 411c4fdfc2ea4f56fdb57ff758a13dffa4b2fff68e71b65cf3248c925f6c30ee ncurses-6.3-20220529.patch.gz -sha256 acc315edb22a04f6476d9cd2a43866d478e0f4b2a555f480c92a18983bec5ee7 ncurses-6.3-20220604.patch.gz -sha256 2dae4db33c73766cd63b2b700e09588750bae44622749ce007404e3e30420ada ncurses-6.3-20220612.patch.gz -sha256 1e4b5c3deaab601a9749da591952b66a53d96017967eeec033f3b4d30e12d2de ncurses-6.3-20220618.patch.gz -sha256 65379719532023cd77c80a495cf31ff773345173e919ec8eef8b3f9517969626 ncurses-6.3-20220625.patch.gz -sha256 028864b31ada91862f0d8f4aa016b62bc3fe7e3981d62e81110d5143e26d0e0d ncurses-6.3-20220703.patch.gz -sha256 06c2f6d967480d0bcf20f301db26c8e5c90caf6d3adf616bc277e21407e9c955 ncurses-6.3-20220709.patch.gz -sha256 66aa8564d09fcc7bbd85bbe79685772330633c14d70af2fef00d10491e6b22fb ncurses-6.3-20220716.patch.gz -sha256 fffcc8ec0eab3dcbb7b8d8a208d880a15fe128f6f2dbc63a87d5640d8ade95cf ncurses-6.3-20220724.patch.gz -sha256 1787619c0b5052121dc5816bdb4cbd9699e1b61ba6c98072a3733b17cc7009f9 ncurses-6.3-20220729.patch.gz -sha256 d7fb1f2e2246079527351c8b7c8847c28751c6a5bb46740681d4b6ba790b22cc ncurses-6.3-20220806.patch.gz -sha256 10a04d3189a34187e691e73435c210af3939025f07ff6c34c1bfc48fda6f5a5d ncurses-6.3-20220813.patch.gz -sha256 b9238267413c2fce5bfe4c029f28dbbbef7230cdf47792ecd4070b857fe1a869 ncurses-6.3-20220820.patch.gz -sha256 7d30766caaac9136ab0ff7164d33761b186b698ec237560cb8fce0eb937f90b8 ncurses-6.3-20220827.patch.gz -sha256 5f04fd2d954b3461671290c766f784a4151091eb4e9197a7745dcdbb9c030483 ncurses-6.3-20220903.patch.gz -sha256 b948a0efe45341ccc913cc67231ee1e6bc737f178bcd758ce9f2e856e575071f ncurses-6.3-20220910.patch.gz -sha256 f9ad5781a72d669bdd06fe075136cc79e6a570960f6f641a9c486fc102a45c3b ncurses-6.3-20220917.patch.gz -sha256 bbb9d5afaec836e66b9f919c97c81c0505fd111b479b59ab6e376822ff6df1d3 ncurses-6.3-20220924.patch.gz -sha256 7ffeae28a0f8416c6ab088a99807d0d1ee5be821828c288f0a572ea769a8e2e5 ncurses-6.3-20221001.patch.gz -sha256 204baff40926d29ec30b1def4d4cc5d7ce074918327d8e271a49c960032b5a49 ncurses-6.3-20221008.patch.gz -sha256 f578dbb3beb1976636c74b33ffe5d300fee5a7653bc4f64bb7870d1b9cf85e7b ncurses-6.3-20221015.patch.gz -sha256 b01fc81093a331d5d645dbcbacebf6e5d459430b38cbdae0db053c6e5dff7d7e ncurses-6.3-20221023.patch.gz -sha256 e6e819c78c78c3a0355e7da4360d084f5d69871fa556b51322980f22da4edcea ncurses-6.3-20221029.patch.gz -sha256 4da9b5bf14a1b7d6d8a4181e79a98b9e5782153bc7db93773ac43e0b758c4da2 ncurses-6.3-20221105.patch.gz -sha256 b3381da6071bbed04e6ddaabbd5375d280e50af429f94522e32e9d0f22766155 ncurses-6.3-20221112.patch.gz -sha256 bf30c435283a4483280e0433f6370d9eea1fb704323bd887e540592eb8203e2f ncurses-6.3-20221119.patch.gz -sha256 32dc21b671ead8b199d66111ebd3404e8cd5f8c4ca5587cfeb5c6a4913b2d103 ncurses-6.3-20221126.patch.gz -sha256 8fe3bcacaea784ac7971e102a8eb8ca58c4c2c4c13c1ec33f32334600b9e4f56 ncurses-6.3-20221203.patch.gz - +# Locally calculated +sha256 4057d800ee96623ae70d06b05b2dadb481a80c030e4968aa5d9bcea4439441da ncurses-6.3-20221224.tar.gz # Locally computed sha256 63de87399e9fc8860236082b6b0520e068e9eb1fad0ebd30202aa30bb6f690ac COPYING diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 4d93a992e4..73e3c3feb8 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -4,79 +4,22 @@ # ################################################################################ -NCURSES_VERSION = 6.3 -NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses +# When there is no snapshost yet for a new version, set it to the empty string +NCURSES_VERSION_MAJOR = 6.3 +NCURSES_SNAPSHOT_DATE = 20221224 +NCURSES_VERSION = $(NCURSES_VERSION_MAJOR)$(if $(NCURSES_SNAPSHOT_DATE),-$(NCURSES_SNAPSHOT_DATE)) +NCURSES_VERSION_GIT = $(subst .,_,$(subst -,_,$(NCURSES_VERSION))) +NCURSES_SITE = $(call github,ThomasDickey,ncurses-snapshots,v$(NCURSES_VERSION_GIT)) NCURSES_INSTALL_STAGING = YES NCURSES_DEPENDENCIES = host-ncurses NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING NCURSES_CPE_ID_VENDOR = gnu +NCURSES_CPE_ID_VERSION = $(NCURSES_VERSION_MAJOR) NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config -# patch 20220416 + +# Fixed since snapshot 20220416 NCURSES_IGNORE_CVES += CVE-2022-29458 -NCURSES_PATCH = \ - $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ - ncurses-6.3-20211026.patch.gz \ - ncurses-6.3-20211030.patch.gz \ - ncurses-6.3-20211106.patch.gz \ - ncurses-6.3-20211113.patch.gz \ - ncurses-6.3-20211115.patch.gz \ - ncurses-6.3-20211120.patch.gz \ - ncurses-6.3-20211127.patch.gz \ - ncurses-6.3-20211204.patch.gz \ - ncurses-6.3-20211211.patch.gz \ - ncurses-6.3-20211219.patch.gz \ - ncurses-6.3-20211225.patch.gz \ - ncurses-6.3-20220101.patch.gz \ - ncurses-6.3-20220115.patch.gz \ - ncurses-6.3-20220122.patch.gz \ - ncurses-6.3-20220129.patch.gz \ - ncurses-6.3-20220205.patch.gz \ - ncurses-6.3-20220212.patch.gz \ - ncurses-6.3-20220219.patch.gz \ - ncurses-6.3-20220226.patch.gz \ - ncurses-6.3-20220305.patch.gz \ - ncurses-6.3-20220312.patch.gz \ - ncurses-6.3-20220319.patch.gz \ - ncurses-6.3-20220326.patch.gz \ - ncurses-6.3-20220402.patch.gz \ - ncurses-6.3-20220409.patch.gz \ - ncurses-6.3-20220416.patch.gz \ - ncurses-6.3-20220423.patch.gz \ - ncurses-6.3-20220430.patch.gz \ - ncurses-6.3-20220501.patch.gz \ - ncurses-6.3-20220507.patch.gz \ - ncurses-6.3-20220514.patch.gz \ - ncurses-6.3-20220521.patch.gz \ - ncurses-6.3-20220529.patch.gz \ - ncurses-6.3-20220604.patch.gz \ - ncurses-6.3-20220612.patch.gz \ - ncurses-6.3-20220618.patch.gz \ - ncurses-6.3-20220625.patch.gz \ - ncurses-6.3-20220703.patch.gz \ - ncurses-6.3-20220709.patch.gz \ - ncurses-6.3-20220716.patch.gz \ - ncurses-6.3-20220724.patch.gz \ - ncurses-6.3-20220729.patch.gz \ - ncurses-6.3-20220806.patch.gz \ - ncurses-6.3-20220813.patch.gz \ - ncurses-6.3-20220820.patch.gz \ - ncurses-6.3-20220827.patch.gz \ - ncurses-6.3-20220903.patch.gz \ - ncurses-6.3-20220910.patch.gz \ - ncurses-6.3-20220917.patch.gz \ - ncurses-6.3-20220924.patch.gz \ - ncurses-6.3-20221001.patch.gz \ - ncurses-6.3-20221008.patch.gz \ - ncurses-6.3-20221015.patch.gz \ - ncurses-6.3-20221023.patch.gz \ - ncurses-6.3-20221029.patch.gz \ - ncurses-6.3-20221105.patch.gz \ - ncurses-6.3-20221112.patch.gz \ - ncurses-6.3-20221119.patch.gz \ - ncurses-6.3-20221126.patch.gz \ - ncurses-6.3-20221203.patch.gz \ - ) NCURSES_CONF_OPTS = \ --without-cxx \ From peter at korsgaard.com Mon Feb 20 20:58:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:37 -0000 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: fix -latomic on various platforms Message-ID: <20230220205244.9C44386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f692c548904c5ae130f6e17e303ff4ad0b482b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next /home/thomas/br-test-pkg/bootlin-nios2-glibc/host/opt/ext-toolchain/bin/../lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: /tmp/fluent-bit.6F9rEA.ltrans28.ltrans.o: undefined reference to symbol '__atomic_compare_exchange_8@@LIBATOMIC_1.0' /home/thomas/br-test-pkg/bootlin-nios2-glibc/host/opt/ext-toolchain/bin/../lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: /home/thomas/br-test-pkg/bootlin-nios2-glibc/host/nios2-buildroot-linux-gnu/sysroot/lib/libatomic.so.1: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index f7727834dd..c84042a0fa 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -41,6 +41,12 @@ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +# Uses __atomic_compare_exchange_8 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ $(TARGET_DIR)/etc/init.d/S99fluent-bit From peter at korsgaard.com Mon Feb 20 20:58:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:38 -0000 Subject: [Buildroot] [git commit branch/next] package/nerdctl: bump version to 1.2.0 Message-ID: <20230220205244.D1BCB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02658dcc01f62aef26045affe37d21e6d3250256 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/containerd/nerdctl/releases/tag/v1.2.0 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/nerdctl/nerdctl.hash | 2 +- package/nerdctl/nerdctl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash index e253fb74b2..8f2c678198 100644 --- a/package/nerdctl/nerdctl.hash +++ b/package/nerdctl/nerdctl.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 ae468c65480e9c6679e0dd23d466b723e7f19bff779d4e2e0fa4629be343af2a nerdctl-1.0.0.tar.gz +sha256 08a84b9481b37dbd8cc6f955dbec0c18a1934bcffeb135fd5d2dc23987152b7c nerdctl-1.2.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk index fdf60cb189..7556bcc391 100644 --- a/package/nerdctl/nerdctl.mk +++ b/package/nerdctl/nerdctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NERDCTL_VERSION = 1.0.0 +NERDCTL_VERSION = 1.2.0 NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) NERDCTL_LICENSE = Apache-2.0 From peter at korsgaard.com Mon Feb 20 20:58:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:46 -0000 Subject: [Buildroot] [git commit branch/next] package/sexpect: requires MMU Message-ID: <20230220205245.559A7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9717b303683ba7ec035de004c6f2ddd195d07808 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable when MMU is not available for target. Fixes: http://autobuild.buildroot.net/results/a2b69fdf67d520aa4d2718bd688d88d102842cdf Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/sexpect/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sexpect/Config.in b/package/sexpect/Config.in index bdf5c3bbf5..e558af26f0 100644 --- a/package/sexpect/Config.in +++ b/package/sexpect/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SEXPECT bool "sexpect" + depends on BR2_USE_MMU # fork() help sexpect is another implementation of Expect which is specifically designed for Shell scripts From peter at korsgaard.com Mon Feb 20 20:58:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:47 -0000 Subject: [Buildroot] [git commit branch/next] package/gst1-rtsp-server: bump version to 1.22.0 Message-ID: <20230220205245.E8B3786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbca109741661d39d7eeaf7ea0e2f25ecbd3bfb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard 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 b6a31f8796..f37e7bb292 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.4.tar.xz.sha256sum -sha256 88d9ef634e59aeb8cc183ad5ae444557c5a88dd49d833b9072bc6e1fae6a3d7d gst-rtsp-server-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.0.tar.xz.sha256sum +sha256 aea24eeb59ee5fadfac355de2f7cecb51966c3e147e5ad7cfb4c314f1a4086ed gst-rtsp-server-1.22.0.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 0b18c1fcf8..6b4bd49fde 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.4 +GST1_RTSP_SERVER_VERSION = 1.22.0 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 Feb 20 20:58:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:47 -0000 Subject: [Buildroot] [git commit branch/next] package/wpewebkit: bump to version 2.38.0 Message-ID: <20230220205223.328A6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=917f05975f9c60eca92988ea9974de55a9e91e44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update to a new major release which brings in improvements and a few new features. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.0.html This release also includes security fixes for CVE-2022-32886, CVE-2022-32891, and CVE-2022-32912. Accompanying security advisory: https://wpewebkit.org/security/WSA-2022-0009.html Both building documentation and support for gobject-introspection have been added in this release. Version 2.38.0 also introduces a new WebRTC implementation based on GstWebRTC. Options for them are explicitly left disabled to keep the configuration as it was, and may be enabled in follow-up patches. Lastly, the SILENCE_CROSS_COMPILATION_NOTICES option removed because it no longer exists. The patch that fixes the build on 32-bit ARM targets is also updated for the 2.38 release series. Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- ...NEON.cpp-fails-to-build-NEON-fast-path-se.patch | 30 ++++++++++++++++------ package/wpewebkit/wpewebkit.hash | 8 +++--- package/wpewebkit/wpewebkit.mk | 8 +++--- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch index b61909b2ac..ea1676abb6 100644 --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch @@ -1,4 +1,4 @@ -From 59c9e3a4aeb4753be97b3817d106816d9a4ebe73 Mon Sep 17 00:00:00 2001 +From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 11:19:06 +0300 Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems @@ -35,15 +35,28 @@ left for a follow-up fix. Signed-off-by: Adrian Perez de Castro [Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182] --- + Source/WebCore/Sources.txt | 1 + .../cpu/arm/filters/FELightingNEON.cpp | 4 +- - .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- + .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- .../graphics/filters/DistantLightSource.h | 4 ++ .../platform/graphics/filters/FELighting.h | 7 --- .../graphics/filters/PointLightSource.h | 4 ++ .../graphics/filters/SpotLightSource.h | 4 ++ .../software/FELightingSoftwareApplier.h | 16 ++++++ - 7 files changed, 56 insertions(+), 35 deletions(-) + 8 files changed, 58 insertions(+), 36 deletions(-) +diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt +index 8ce3510fe1a8..efd56bcb8746 100644 +--- a/Source/WebCore/Sources.txt ++++ b/Source/WebCore/Sources.txt +@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp + platform/graphics/WOFFFileFormat.cpp + platform/graphics/WidthIterator.cpp + platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp ++platform/graphics/cpu/arm/filters/FELightingNEON.cpp + platform/graphics/displaylists/DisplayList.cpp + platform/graphics/displaylists/DisplayListDrawingContext.cpp + platform/graphics/displaylists/DisplayListItems.cpp diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp index f6ff8c20a5a8..42a97ffc5372 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp @@ -67,7 +80,7 @@ index f6ff8c20a5a8..42a97ffc5372 100644 // Calling a powf function from the assembly code would require to save // and reload a lot of NEON registers. Since the base is in range [0..1] diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index b17c603d40d3..e4629cda0b7c 100644 +index b17c603d40d3..c6d17f573eca 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h @@ -24,14 +24,15 @@ @@ -98,9 +111,10 @@ index b17c603d40d3..e4629cda0b7c 100644 { - alignas(16) FELightingFloatArgumentsForNeon floatArguments; - FELightingPaintingDataForNeon neonData = { +- data.pixels->data(), + WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; + WebCore::FELightingPaintingDataForNeon neonData = { - data.pixels->data(), ++ data.pixels->bytes(), 1, - data.widthDecreasedByOne - 1, - data.heightDecreasedByOne - 1, @@ -244,7 +258,7 @@ index 0c073bc13f8c..e0db00545c17 100644 float m_surfaceScale; float m_diffuseConstant; diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h -index 5c9c7fb783e6..e53aa012ac1c 100644 +index 126b3b2350f6..d906db21aa9c 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ @@ -259,7 +273,7 @@ index 5c9c7fb783e6..e53aa012ac1c 100644 class PointLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h -index 04e331ec4ec0..763c8d400b00 100644 +index 641b205f986d..64380d9b6eb8 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ @@ -274,7 +288,7 @@ index 04e331ec4ec0..763c8d400b00 100644 class SpotLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h -index 3875b0a4b5de..6d3864aafb9a 100644 +index c974d92115ff..e2896660cfbd 100644 --- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h @@ -36,6 +36,7 @@ diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 9c8beecf2e..5dd64b34b7 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.36.8.tar.xz.sums -md5 939dc646bb6652fde9a5b6512c17fc58 wpewebkit-2.36.8.tar.xz -sha1 f45936c578f7dcfbb6064e87da6c098efe093e68 wpewebkit-2.36.8.tar.xz -sha256 8d42a349c910b2d0961b8d34fecef29cec3d21e3af5977346c90026692dc75eb wpewebkit-2.36.8.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.0.tar.xz.sums +md5 e0e6b98c86351c39e41da475afc50780 wpewebkit-2.38.0.tar.xz +sha1 66e6dd1c285a21ce50370fb4d60332838d801663 wpewebkit-2.38.0.tar.xz +sha256 e653e12eca63e6371c06d4cd9efcd5492db67f7d9ef324fd5d8668b1151e72b2 wpewebkit-2.38.0.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 0ff8204519..001c701ee9 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.36.8 +WPEWEBKIT_VERSION = 2.38.0 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -22,9 +22,11 @@ WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ -DENABLE_ACCESSIBILITY=OFF \ -DENABLE_API_TESTS=OFF \ + -DENABLE_DOCUMENTATION=OFF \ + -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=OFF \ - -DUSE_SOUP2=ON \ - -DSILENCE_CROSS_COMPILATION_NOTICES=ON + -DENABLE_WEB_RTC=OFF \ + -DUSE_SOUP2=ON ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) WPEWEBKIT_CONF_OPTS += \ From peter at korsgaard.com Mon Feb 20 20:58:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:48 -0000 Subject: [Buildroot] [git commit branch/next] package/gst1-plugins-ugly: bump version to 1.22.0 Message-ID: <20230220205245.BA6C48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f1fef1499427d508363c29920468e8f5a495709 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Remove xingmux config option which has been moved to the gst1-plugins-good package. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ package/gstreamer1/gst1-plugins-ugly/Config.in | 5 ----- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 8 +------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3fff2b1ddd..1c5af2652a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX + bool "xingmux moved" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX + help + The xingmux option has been moved to gst1-plugins-good. + config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE bool "videoscale removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in index ba19989892..54766ffa8c 100644 --- a/package/gstreamer1/gst1-plugins-ugly/Config.in +++ b/package/gstreamer1/gst1-plugins-ugly/Config.in @@ -26,11 +26,6 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB help DVD subtitle parser and decoder -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX - bool "xingmux" - help - Add XING tags to mpeg audio files - config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA bool "realmedia" help diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 4ec29e6894..21579216df 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.4.tar.xz.sha256sum -sha256 5c9ec6bab96517e438b3f9bae0ceb84d3436f3da9bbe180cf4d28e32a7251b59 gst-plugins-ugly-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz.sha256sum +sha256 a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c gst-plugins-ugly-1.22.0.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 20382719c3..9f16fa3da8 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.4 +GST1_PLUGINS_UGLY_VERSION = 1.22.0 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 @@ -51,12 +51,6 @@ else GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=enabled -else -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=enabled else From peter at korsgaard.com Mon Feb 20 20:58:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:48 -0000 Subject: [Buildroot] [git commit branch/next] package/qt5/qt5virtualkeyboard: really configure language layouts Message-ID: <20230220205223.9D17F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92219bdf2ece2a0ddfbc45691879a03acd5c7442 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "170777f342 package/qt5/qt5virtualkeyboard: convert to qmake infrastructure" changed most but not all _QMAKEFLAGS to _CONF_OPTS. As a consequence, BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS is ignored and all layouts are compiled in. Some layouts have different licenses (e.g. pinying), so the license information for a build that is configured to not include such layouts is wrong. Change the remaining _QMAKEFLAGS entry, fixing the config for which language layouts are compiled and installed. Cc: Giulio Benetti Cc: Julien Corjon Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index c31d455c4e..3fefdc874d 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -16,7 +16,7 @@ QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS = $(call qstrip,$(BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)) ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) -QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))" +QT5VIRTUALKEYBOARD_CONF_OPTS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))" ifneq ($(filter ja_JP all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (openwnn) From peter at korsgaard.com Mon Feb 20 20:58:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:49 -0000 Subject: [Buildroot] [git commit branch/next] package/gst1-vaapi: bump version to 1.22.0 Message-ID: <20230220205245.DD3858648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33d4c226e582f6c0086431c4d9154e462cb3cf34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update config option names and dependency requirements. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 37 +++++++++++++++++++++------ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 5baaa4dfb7..6dec625c93 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.4.tar.xz.sha256sum -sha256 ab12596144c05506e9782374c5d2cdfb3069fca89908d6de360d947bb77fd06a gstreamer-vaapi-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.0.tar.xz.sha256sum +sha256 593ccad19f88e5fa29f40f98356c007806bd535828707b1406944d16a90bdff5 gstreamer-vaapi-1.22.0.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 bd6c16be3e..3d9eb91ffb 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.4 +GST1_VAAPI_VERSION = 1.22.0 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+ @@ -18,19 +18,40 @@ GST1_VAAPI_DEPENDENCIES += \ libdrm GST1_VAAPI_CONF_OPTS += \ - -Dwith_drm=yes \ - -Dwith_x11=no \ - -Dwith_glx=no \ - -Dwith_wayland=no \ - -Dwith_egl=no \ + -Ddrm=enabled \ + -Degl=enabled \ -Dexamples=disabled \ -Dtests=disabled \ -Ddoc=disabled ifeq ($(BR2_PACKAGE_GST1_VAAPI_ENCODERS),y) -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=yes +GST1_VAAPI_CONF_OPTS += -Dencoders=enabled else -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=no +GST1_VAAPI_CONF_OPTS += -Dencoders=disabled +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) +GST1_VAAPI_CONF_OPTS += -Degl=enabled +GST1_VAAPI_DEPENDENCIES += libegl +else +GST1_VAAPI_CONF_OPTS += -Degl=disabled +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +GST1_VAAPI_CONF_OPTS += -Dwayland=enabled +else +GST1_VAAPI_CONF_OPTS += -Dwayland=disabled +endif + +ifeq ($(BR2_PACKAGE_XORG7),y) +GST1_VAAPI_CONF_OPTS += -Dx11=enabled +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +GST1_VAAPI_CONF_OPTS += -Dglx=enabled +else +GST1_VAAPI_CONF_OPTS += -Dglx=disabled +endif +else +GST1_VAAPI_CONF_OPTS += -Dx11=disabled -Dglx=disabled endif $(eval $(meson-package)) From peter at korsgaard.com Mon Feb 20 20:58:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:49 -0000 Subject: [Buildroot] [git commit branch/next] package/tekui: really disable parallel build Message-ID: <20230220205223.B0D77828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93036af53fbbd566a800a12fa8979000ea4fa31f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "c80789c917 tekui: disable parallel build" added TEKUI_MAKE but that is not a symbol used by the generic package infra. Ensure -j1 is passed to the build and install commands by using TEKUI_MAKE explicitly. Fixes: http://autobuild.buildroot.net/results/c6cd0d488581013a8b215b0ee2fd8f549a868d4b Cc: Francois Perrad Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/tekui/tekui.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tekui/tekui.mk b/package/tekui/tekui.mk index 13000edd3e..3cb7ff51e5 100644 --- a/package/tekui/tekui.mk +++ b/package/tekui/tekui.mk @@ -59,11 +59,11 @@ endif endif define TEKUI_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all + $(TARGET_MAKE_ENV) $(TEKUI_MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all endef define TEKUI_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install + $(TARGET_MAKE_ENV) $(TEKUI_MAKE) $(TEKUI_MAKE_OPTS) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install endef $(eval $(generic-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:53 -0000 Subject: [Buildroot] [git commit branch/next] configs/olimex_a10_olinuxino_lime_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230220205246.5767F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f54c7ffce70d583dbd85718f23d1bd7b18a0a744 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a10_olinuxino_lime_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a10_olinuxino_lime_defconfig b/configs/olimex_a10_olinuxino_lime_defconfig index d0e00301f7..9c454b1915 100644 --- a/configs/olimex_a10_olinuxino_lime_defconfig +++ b/configs/olimex_a10_olinuxino_lime_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a10-olinuxino" @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a10_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -33,7 +33,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A10-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From peter at korsgaard.com Mon Feb 20 20:58:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:53 -0000 Subject: [Buildroot] [git commit branch/next] package/ethtool: bump to version 6.1 Message-ID: <20230220205224.05ABF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=090ebb085f8d77b0d88dcb757835fad0aa530603 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 8a649876d9..609085aa5e 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 3b752a3329827907ac3812f2831dfecf51c8c41c55d2d69cfb9c53ca06449fc6 ethtool-5.19.tar.xz +sha256 c41fc881ffa5a40432d2dd829eb44c64a49dee482e716baacf9262c64daa8f90 ethtool-6.1.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index 32bd5e7db1..3381344e0a 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 5.19 +ETHTOOL_VERSION = 6.1 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:54 -0000 Subject: [Buildroot] [git commit branch/next] configs/olimex_a20_olinuxino_lime2_defconfig: bump Linux to 6.1.9 Message-ID: <20230220205246.6DBEA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=720d30f9d29327e326916457bb74eeeb976b3ff1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime2_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index a0ebcaed66..50a0986ab2 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.15 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" From peter at korsgaard.com Mon Feb 20 20:58:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:54 -0000 Subject: [Buildroot] [git commit branch/next] package/hwdata: bump to version 0.365 Message-ID: <20230220205224.133E08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e49d4fe20cbdf6195f23e4e920b1314786e1dac1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/hwdata/hwdata.hash | 2 +- package/hwdata/hwdata.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 6c5a091a06..4f56b0c12f 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 f0bb38588b9fcb43e15dac4ce8461b7580ef38ac20ecab83cef638413646decb hwdata-0.358.tar.gz +sha256 d6ae2436a69c6f5e04d926f5d753a99d90deb864065a2e2f8a8eda87b70dcdd5 hwdata-0.365.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index b2e1838074..00fe6c1455 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.358 +HWDATA_VERSION = 0.365 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:55 -0000 Subject: [Buildroot] [git commit branch/next] configs/olimex_a20_olinuxino_micro_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230220205246.8224B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f23405b39a850b54c61b719bf7d079664d773fc6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_micro_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index 1394c0b8b8..a7a6eb51a0 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-micro" @@ -33,7 +33,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino_MICRO" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From peter at korsgaard.com Mon Feb 20 20:58:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:56 -0000 Subject: [Buildroot] [git commit branch/next] package/libpcap: bump to version 1.10.2 Message-ID: <20230220205224.227C9828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6bee8635d90f3f9e3d04e03a9db2f37a387e077c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/libpcap/Config.in | 2 +- package/libpcap/libpcap.hash | 4 ++-- package/libpcap/libpcap.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libpcap/Config.in b/package/libpcap/Config.in index a5f64bdc81..7ffac64c46 100644 --- a/package/libpcap/Config.in +++ b/package/libpcap/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_LIBPCAP A system-independent library for user-level network packet capture. - http://www.tcpdump.org/ + https://www.tcpdump.org/ diff --git a/package/libpcap/libpcap.hash b/package/libpcap/libpcap.hash index 84c8e405df..b87d9d04ef 100644 --- a/package/libpcap/libpcap.hash +++ b/package/libpcap/libpcap.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz.sig -sha256 ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4 libpcap-1.10.1.tar.gz +# https://www.tcpdump.org/release/libpcap-1.10.2.tar.gz.sig +sha256 db6d79d4ad03b8b15fb16c42447d093ad3520c0ec0ae3d331104dcfb1ce77560 libpcap-1.10.2.tar.gz # Hash for license file: sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 21422b2c0a..173207de63 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPCAP_VERSION = 1.10.1 +LIBPCAP_VERSION = 1.10.2 LIBPCAP_SITE = https://www.tcpdump.org/release LIBPCAP_LICENSE = BSD-3-Clause LIBPCAP_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:56 -0000 Subject: [Buildroot] [git commit branch/next] configs/olimex_a33_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230220205246.8C2A286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4ac41042515944eafb892c8c26ea3b940211136 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a33_olinuxino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a33_olinuxino_defconfig b/configs/olimex_a33_olinuxino_defconfig index cdbc63efe1..35398ac6da 100644 --- a/configs/olimex_a33_olinuxino_defconfig +++ b/configs/olimex_a33_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a7=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="A33-olinuxino" @@ -15,7 +15,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A33-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -31,7 +31,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a33_olinuxino/boot # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y From peter at korsgaard.com Mon Feb 20 20:58:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:56 -0000 Subject: [Buildroot] [git commit branch/next] package/nano: bump to version 7.1 Message-ID: <20230220205224.400E186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a779b8966038bb3fa49c56eee1e134333fcb206 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- 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 86f414aca0..f49b712093 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/v7/nano-7.0.tar.xz.asc +# https://www.nano-editor.org/dist/v7/nano-7.1.tar.xz.asc # using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F -sha256 8dd6eac38b2b8786d82681f0e1afd84f6b75210d17391b6443c437e451552149 nano-7.0.tar.xz +sha256 57ba751e9b7519f0f6ddee505202e387c75dde440c1f7aa1b9310cc381406836 nano-7.1.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index f9338550d4..203c417f06 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 7 -NANO_VERSION = $(NANO_VERSION_MAJOR).0 +NANO_VERSION = $(NANO_VERSION_MAJOR).1 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 thomas.petazzoni at bootlin.com Mon Feb 20 20:58:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:57 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. Message-ID: <20230220205246.AF1298648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70477e5fee6e92b1d783257a8b3e57a78007438e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from buildroot into the linux tree, these .dts files are copied to arch/arm64/boot. Unfortunately, the post-image.sh script expects to find them in arch/arm64/boot/xilinx. This patch does not require the xilinx/ prefix to be present when symlinking the device-tree to system.dtb where u-boot expects to find it. Signed-off-by: Graeme Smecher Reviewed-by: Luca Ceresoli Reviewed-by: Neal Frager Signed-off-by: Thomas Petazzoni --- board/zynqmp/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index ed6dbe188c..c5de2db820 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -5,7 +5,7 @@ # devicetree listed in the config. FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ ${BR2_CONFIG}) [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb From peter at korsgaard.com Mon Feb 20 20:58:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:57 -0000 Subject: [Buildroot] [git commit branch/next] package/pcre2: bump to version 10.42 Message-ID: <20230220205224.4EE67828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64a03682cc1a90a311b2331224deac62f8c8940f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/pcre2/pcre2.hash | 4 ++-- package/pcre2/pcre2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index e3fe6b2d53..f609bdaee2 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature: -# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2.sig -sha256 14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68 pcre2-10.40.tar.bz2 +# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2.sig +sha256 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840 pcre2-10.42.tar.bz2 # Locally computed sha256 87d884eceb7fc54611470ce9f74280d28612b0c877adfc767e9676892a638987 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index 06a0afc9b8..aba378cab6 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE2_VERSION = 10.40 +PCRE2_VERSION = 10.42 PCRE2_SITE = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(PCRE2_VERSION) PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause From yann.morin.1998 at free.fr Mon Feb 20 20:58:58 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:58 -0000 Subject: [Buildroot] [git commit branch/next] package/libfuse3: bump to version 3.13.1 Message-ID: <20230220205246.D869D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b439a721e0e74e3e97ee10a89853ab6a4b8a627 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/a98/a984d275d949e8dc989870d2d2b6f6c7168d52bb/ Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index 691bfbc9d6..f697f4ad3f 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 224544214204eb348b548d6faa7a9bc91b053aacfc92e8b5da3f478c76ae4a03 libfuse3-3.13.0.tar.gz +sha256 96399b09b91bc717a9e96ffea660d611e6a342547c1abd4d0e858b3dca9d5a13 libfuse3-3.13.1.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index d94f7d3d3a..a2e9775868 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.13.0 +LIBFUSE3_VERSION = 3.13.1 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:58:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:58 -0000 Subject: [Buildroot] [git commit branch/next] package/strace: bump to version 6.1 Message-ID: <20230220205224.77E0A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=261b2e25f8fe42395f750d170da313826c5157f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/strace/strace.hash | 4 ++-- package/strace/strace.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 1743a369b4..9478fbd459 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.0/strace-6.0.tar.xz.asc -sha256 92d720a666855e9f1c6a11512fd6e99674a82bbfe1442557815f2ce8e1293338 strace-6.0.tar.xz +# https://strace.io/files/6.1/strace-6.1.tar.xz.asc +sha256 2579e9cec37dbb786f6ea0bebd15f40dd561ef2bde2a2a2ecdce5963b01859fd strace-6.1.tar.xz sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 09e620530e..cbb574559e 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.0 +STRACE_VERSION = 6.1 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:59 -0000 Subject: [Buildroot] [git commit branch/next] package/elf2flt: fix error when building gdb for target on m68k Message-ID: <20230220205247.183198648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6f15e85b3ac58ba1d387ea86945d3fabf4f8990 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Thomas reported that m68k fails to build when enabling BR2_PACKAGE_GDB. It fails when building gdb for the target with the following error: elf2flt: ERROR: text=0x3c826 overlaps data=0x256e0 ? It turns out that the gdb binary has another problematic input section (.gcc_except_table), which causes elf2flt to try to append to the .text output section, after it has already moved on with appending sections to the .data output section. elf2flt cannot append to a previous output section once it has moved on to another output section. Update the existing elf2flt patch to also add an exception for .gcc_except_table. Reported-by: Thomas Petazzoni Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni --- ...-fatal-error-regression-on-m68k-xtensa-ri.patch | 47 +++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch index 278709cb1c..616bbc891f 100644 --- a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch +++ b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch @@ -1,8 +1,7 @@ -From 65ac5f9e69cfb989d970da74c41e478774d29be5 Mon Sep 17 00:00:00 2001 +From a8c9f650b82109abf7aa730f298ea5182ed62613 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 9 Aug 2022 21:06:05 +0200 -Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, - riscv64 +Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64 Commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") changed the condition of which input sections that should be included @@ -12,16 +11,15 @@ to: ((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == (SEC_DATA | SEC_READONLY | SEC_RELOC)) -On ARM, the .eh_frame input section does not have the SEC_RELOC flag -set, so this specific change had no effect on ARM. +On ARM, the .eh_frame input section does not have the SEC_RELOC flag set, +so on ARM, this change caused .eh_frame to move from .text to .data. -However, on e.g. m68k and riscv64, the .eh_frame input section does -have the SEC_RELOC flag set, which means that after commit ba379d08bb78 -("elf2flt: fix for segfault on some ARM ELFs"), read-only relocation -data sections were placed in .text output section, instead of .data -output section. +However, on e.g. m68k, xtensa and riscv64, the .eh_frame input section +does have the SEC_RELOC flag set, which means that the change in +commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") +caused .eh_frame to move in an opposite way, i.e. from .data to .text. -This will result in a fatal error on m68k, xtensa and riscv64: +This resulted in a fatal error on m68k, xtensa and riscv64: ERROR: text=0x3bab8 overlaps data=0x33f60 ? This is because elf2flt cannot append to .text after .data has been @@ -36,21 +34,26 @@ to .text after .data has been appended to (which will require elf2flt to move/relocate everything that has already been appended to .data, since the virtual addresses are contiguous). -However, for now, add an exception for m68k, xtensa and riscv64 -(specifically for the problematic input section, .eh_frame), so that we -get the same behavior as older elf2flt releases, where we put read-only -relocation data in .data, which was working perfectly fine. +However, for now, add an exception for input sections which have all +three flags SEC_DATA, SEC_READONLY, and SEC_RELOC set, and which have a +name equal to a problematic input section (.eh_frame, .gcc_except_table). +That way, we get the same behavior as older elf2flt releases for m68k, +xtensa and riscv64, where we put read-only relocation data in .data, +which was working perfectly fine. + +This exception will not change any behavior on ARM, as the .eh_frame +input section does not have flag SEC_RELOC set. Signed-off-by: Niklas Cassel --- - elf2flt.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) + elf2flt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/elf2flt.c b/elf2flt.c -index 9c32f9a..a680c89 100644 +index e0d7891..39d035f 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -340,8 +340,15 @@ compare_relocs (const void *pa, const void *pb) +@@ -341,8 +341,13 @@ compare_relocs (const void *pa, const void *pb) static bool ro_reloc_data_section_should_be_in_text(asection *s) { @@ -58,10 +61,8 @@ index 9c32f9a..a680c89 100644 - (SEC_DATA | SEC_READONLY | SEC_RELOC); + if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == + (SEC_DATA | SEC_READONLY | SEC_RELOC)) { -+#if defined(TARGET_m68k) || defined(TARGET_riscv64) || defined(TARGET_xtensa) -+ if (!strcmp(".eh_frame", s->name)) ++ if (!strcmp(".eh_frame", s->name) || !strcmp(".gcc_except_table", s->name)) + return false; -+#endif + return true; + } + return false; @@ -69,5 +70,5 @@ index 9c32f9a..a680c89 100644 static uint32_t * -- -2.37.1 +2.39.0 From peter at korsgaard.com Mon Feb 20 20:58:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:59 -0000 Subject: [Buildroot] [git commit branch/next] package/prosody: bump to version 0.11.14 Message-ID: <20230220205224.5BBB68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6e88fff91dd4702c725f47fb4fdd1a00b228f64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/prosody/prosody.hash | 8 ++++---- package/prosody/prosody.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index 3a3a363a4b..1fd1abafe9 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 7214ee57d4702585bd0d3428e69790b4 prosody-0.11.13.tar.gz -sha1 1cc5a72d98738872d0c1a4c34b1fcb8878348c7d prosody-0.11.13.tar.gz -sha256 39c61b346a09b5125b604cb969e14206cbbcb86c81156ffc6ba2d62527cf0432 prosody-0.11.13.tar.gz -sha512 7616785536b7b51767a26963a80c961ef2403609e1e78dda3f88cf68c00d5bb899278c70a22b006b58c36c62cbb1bbd390a9298bad5b8d6524928a1cd5457813 prosody-0.11.13.tar.gz +md5 93665d86c47e99c9c525610ac53400fb prosody-0.11.14.tar.gz +sha1 abbd0ad42e2b30051f4d3f198c54a52b4e9f39d0 prosody-0.11.14.tar.gz +sha256 ec0c7447ec07ed336b6912d06a2f533439cb16d60d8d3bffa8ce46269ee52c87 prosody-0.11.14.tar.gz +sha512 128e12427ae0b5080fd3cc2380974c04570b16f0f79de7b39ef85cec6e8f579bee2d1150ce70ca731222c487dba646cbcd48bdb4a102a14395644eb5f19f1c88 prosody-0.11.14.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 62ba073b9e..b5d89ebba4 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.13 +PROSODY_VERSION = 0.11.14 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:59:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:00 -0000 Subject: [Buildroot] [git commit branch/next] package/modsecurity2: security bump to version 2.9.7 Message-ID: <20230220205247.39C608648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42e34cf10f9eb037aa8c48a4fb9e8f521901b983 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads in ModSecurity before 2.9.7 may allow for Web Application Firewall bypasses and buffer overflows on the Web Application Firewall when executing rules that read the FILES_TMP_CONTENT collection. - host-pkgconf is mandatory and used to find libxml2 since https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 - pcre2 is supported since: https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modsecurity2/Config.in | 2 +- package/modsecurity2/modsecurity2.hash | 4 ++-- package/modsecurity2/modsecurity2.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in index 2870386a99..fb1bfc960e 100644 --- a/package/modsecurity2/Config.in +++ b/package/modsecurity2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_MODSECURITY2 bool "modsecurity2" depends on BR2_PACKAGE_APACHE select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help ModSecurity is an open source, cross-platform web application firewall (WAF) module. Known as the "Swiss Army Knife" of diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash index a19f4823a8..2c77ffd830 100644 --- a/package/modsecurity2/modsecurity2.hash +++ b/package/modsecurity2/modsecurity2.hash @@ -1,5 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.5/modsecurity-2.9.5.tar.gz.sha256 -sha256 e2bfc8cd8b8de1e21f054d310543373ea5d89adbd96784e832be0da3e4dc149e modsecurity-2.9.5.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz.sha256 +sha256 2a28fcfccfef21581486f98d8d5fe0397499749b8380f60ec7bb1c08478e1839 modsecurity-2.9.7.tar.gz # Locally computed sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index a1ad8fe5bc..c251291e64 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODSECURITY2_VERSION = 2.9.5 +MODSECURITY2_VERSION = 2.9.7 MODSECURITY2_SOURCE = modsecurity-$(MODSECURITY2_VERSION).tar.gz MODSECURITY2_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) MODSECURITY2_LICENSE = Apache-2.0 @@ -12,11 +12,10 @@ MODSECURITY2_LICENSE_FILES = LICENSE MODSECURITY2_CPE_ID_VENDOR = trustwave MODSECURITY2_CPE_ID_PRODUCT = modsecurity MODSECURITY2_INSTALL_STAGING = YES -MODSECURITY2_DEPENDENCIES = apache libxml2 pcre +MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 MODSECURITY2_CONF_OPTS = \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ - --with-libxml=$(STAGING_DIR)/usr \ + --with-pcre2=$(STAGING_DIR)/usr/bin/pcre2-config \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ --with-apu=$(STAGING_DIR)/usr/bin/apu-1-config \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ From peter at korsgaard.com Mon Feb 20 20:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:00 -0000 Subject: [Buildroot] [git commit branch/next] package/sqlite: security bump to version 3.40.1 Message-ID: <20230220205224.B28168648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99b3ea44295a2ec3aa841f83d81c9231f89cb6e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: CVE-2022-46908: SQLite through 3.40.0, when relying on --safe for execution of an untrusted CLI script, does not properly implement the azProhibitedFunctions protection mechanism, and instead allows UDF functions such as WRITEFILE. Release notes: https://sqlite.org/releaselog/3_40_1.html Signed-off-by: Bernd Kuhls [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- 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 ea4e30a463..36f6907fbc 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0333552076d2700c75352256e91c78bf5cd62491589ba0c69aed0a81868980e7 sqlite-autoconf-3400000.tar.gz +sha256 2c5dea207fa508d765af1ef620b637dcb06572afa6f01f0815bd5bbf864b33d9 sqlite-autoconf-3400100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 9d0b60ab59..789eddfa0a 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.40.0 -SQLITE_TAR_VERSION = 3400000 +SQLITE_VERSION = 3.40.1 +SQLITE_TAR_VERSION = 3400100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain From yann.morin.1998 at free.fr Mon Feb 20 20:59:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:01 -0000 Subject: [Buildroot] [git commit branch/next] package/rdma-core: new package Message-ID: <20230220205246.E5F0E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is the userspace components for the Linux Kernel's drivers/infiniband subsystem. https://github.com/linux-rdma/rdma-core Tested-by: Shamraiz Ashraf Signed-off-by: Julien Olivain [yann.morin.1998 at free.fr: - select iproute2 as it provides the 'rdma' utility ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 + package/Config.in | 1 + package/rdma-core/Config.in | 20 ++++++ package/rdma-core/rdma-core.hash | 5 ++ package/rdma-core/rdma-core.mk | 24 +++++++ package/rdma-core/readme.txt | 75 ++++++++++++++++++++++ support/testing/tests/package/test_rdma_core.py | 43 +++++++++++++ .../package/test_rdma_core/linux-rdma.fragment | 9 +++ 8 files changed, 180 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d526451ca3..73905748ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1695,6 +1695,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/tinycompress/ F: package/z3/ @@ -1710,6 +1711,8 @@ F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_rdma_core.py +F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py N: Julien Viard de Galbert diff --git a/package/Config.in b/package/Config.in index 83fddf316f..1f6db14d56 100644 --- a/package/Config.in +++ b/package/Config.in @@ -573,6 +573,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..59f5ef63ae --- /dev/null +++ b/package/rdma-core/Config.in @@ -0,0 +1,20 @@ +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_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_IPROUTE2 # runtime + 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 + +comment "rdma-core needs a toolchain w/ headers >= 3.4, threads, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \ + || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash new file mode 100644 index 0000000000..1aff44f7f4 --- /dev/null +++ b/package/rdma-core/rdma-core.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 4a2eec55b37ac25f25e7680a372f71c1781c23808542bd31fb68dc0448b8cba2 rdma-core-44.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..885821bf98 --- /dev/null +++ b/package/rdma-core/rdma-core.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# rdma-core +# +################################################################################ + +RDMA_CORE_VERSION = 44.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..9a95226ef4 --- /dev/null +++ b/package/rdma-core/readme.txt @@ -0,0 +1,75 @@ +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 configuration, 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). The Kernel +config fragment file used for package test can be used as a starting +point. See: + + support/testing/tests/package/test_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 -d 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..614fb51f48 --- /dev/null +++ b/support/testing/tests/package/test_rdma_core.py @@ -0,0 +1,43 @@ +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.91" + 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="{}" + 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 + """.format( + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") + ) + + 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") diff --git a/support/testing/tests/package/test_rdma_core/linux-rdma.fragment b/support/testing/tests/package/test_rdma_core/linux-rdma.fragment new file mode 100644 index 0000000000..e305f27e62 --- /dev/null +++ b/support/testing/tests/package/test_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 From peter at korsgaard.com Mon Feb 20 20:59:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:01 -0000 Subject: [Buildroot] [git commit branch/next] package/tcpdump: bump to version 4.99.2 Message-ID: <20230220205224.875238648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa2b795b2e48663cb2924a35e22fb47071ef9531 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/tcpdump/Config.in | 2 +- package/tcpdump/tcpdump.hash | 4 ++-- package/tcpdump/tcpdump.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/tcpdump/Config.in b/package/tcpdump/Config.in index 8b54c603df..7429471362 100644 --- a/package/tcpdump/Config.in +++ b/package/tcpdump/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_TCPDUMP help A tool for network monitoring and data acquisition. - http://www.tcpdump.org/ + https://www.tcpdump.org/ if BR2_PACKAGE_TCPDUMP diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index 1990aa797b..a950d3fa66 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature at -# https://www.tcpdump.org/release/tcpdump-4.99.1.tar.gz.sig +# https://www.tcpdump.org/release/tcpdump-4.99.2.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 79b36985fb2703146618d87c4acde3e068b91c553fb93f021a337f175fd10ebe tcpdump-4.99.1.tar.gz +sha256 f4304357d34b79d46f4e17e654f1f91f9ce4e3d5608a1badbd53295a26fb44d5 tcpdump-4.99.2.tar.gz sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 7741c3b58e..c38d46e2cd 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.99.1 +TCPDUMP_VERSION = 4.99.2 TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:59:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:02 -0000 Subject: [Buildroot] [git commit branch/next] package/upx: security bump to version 4.0.2 Message-ID: <20230220205247.441DB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02befac8f9404ae30d0d090221d21a8460c82ec7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to cause a denial of service (abort) via a crafted file. Fix CVE-2023-23457: A Segmentation fault was found in UPX in PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a crafted input file allows invalid memory address access that could lead to a denial of service. https://github.com/upx/upx/blob/v4.0.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/upx/upx.hash | 2 +- package/upx/upx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 9f7c40c819..7c24906152 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz +sha256 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f upx-4.0.2-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index ef346b2310..6018b0a63d 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPX_VERSION = 4.0.1 +UPX_VERSION = 4.0.2 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ From peter at korsgaard.com Mon Feb 20 20:59:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:02 -0000 Subject: [Buildroot] [git commit branch/next] package/vdr: bump version to 2.6.3 Message-ID: <20230220205224.C1AD086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d290f602b679043810dd658eba1f6f1f87faa9b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://github.com/vdr-projects/vdr/blob/master/HISTORY Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/vdr/vdr.hash | 2 +- package/vdr/vdr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vdr/vdr.hash b/package/vdr/vdr.hash index 2216e317fe..1b7ced0b77 100644 --- a/package/vdr/vdr.hash +++ b/package/vdr/vdr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dfb252a0466e95071ca16707914d14c7e5c2e45020e4dc530ea85b7b3c3ea17e vdr-2.6.1.tar.gz +sha256 70352c7558d627202c02e80d88c83d25d9df4c5e49a010f7d1d9ae631bd54ad0 vdr-2.6.3.tar.gz sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index 61acb9971f..a44e1ff512 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -VDR_VERSION = 2.6.1 +VDR_VERSION = 2.6.3 VDR_SITE = $(call github,vdr-projects,vdr,$(VDR_VERSION)) VDR_LICENSE = GPL-2.0+ VDR_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:59:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:03 -0000 Subject: [Buildroot] [git commit branch/next] package/z3: bump to version 4.12.1 Message-ID: <20230220205247.66BDE8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a7b1b913e756358b40359115c12fff241d4ca92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For change log since v4.12.0, see: - https://github.com/Z3Prover/z3/releases/tag/z3-4.12.1 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/z3/z3.hash | 2 +- package/z3/z3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/z3/z3.hash b/package/z3/z3.hash index 517e2f4923..8a511c3fe5 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5f575f0a3950760436217da1cc1a714569b6d4f664a75bb6775876328cf0a580 z3-4.12.0.tar.gz +sha256 a3735fabf00e1341adcc70394993c05fd3e2ae167a3e9bb46045e33084eb64a3 z3-4.12.1.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index ecd79325dc..45c412ad12 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.12.0 +Z3_VERSION = 4.12.1 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 20 20:59:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:03 -0000 Subject: [Buildroot] [git commit branch/next] package/minetest{-game}: bump to version 5.6.1 Message-ID: <20230220205224.9566286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e41117c64cada4a06fcb20fd17517354a42e948 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release announcement: 5.6.0: https://forum.minetest.net/viewtopic.php?f=18&t=28511 5.6.1: https://forum.minetest.net/viewtopic.php?f=18&t=28703 minetest: - Update license file hash due to new image file in the project sources. - IrrlichtMt 1.9.0mt8 is required to build Minetest >= 5.6.1. - Add xlib_libXi dependency for xinput2 support enabled by default for Linux. - Remove xlib_libXxf86vm dependency previously used by gamma ramp code [1]. [1] https://github.com/minetest/irrlicht/commit/538c9e5cde425ecee1e802fd53344111683b60be Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/minetest-game/minetest-game.hash | 2 +- package/minetest-game/minetest-game.mk | 2 +- package/minetest/Config.in | 2 +- package/minetest/minetest.hash | 6 +++--- package/minetest/minetest.mk | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/minetest-game/minetest-game.hash b/package/minetest-game/minetest-game.hash index 2b7eeffd8f..629871edbe 100644 --- a/package/minetest-game/minetest-game.hash +++ b/package/minetest-game/minetest-game.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 5a24fec4ed838744906f020096c35616e7ba76eeec2b93b980a40af011107e7c minetest-game-5.5.1.tar.gz +sha256 5dc857003d24bb489f126865fcd6bf0d9c0cb146ca4c1c733570699d15abd0e3 minetest-game-5.6.1.tar.gz sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt diff --git a/package/minetest-game/minetest-game.mk b/package/minetest-game/minetest-game.mk index e5ee45b6ab..ec8d5bff26 100644 --- a/package/minetest-game/minetest-game.mk +++ b/package/minetest-game/minetest-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_GAME_VERSION = 5.5.1 +MINETEST_GAME_VERSION = 5.6.1 MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION)) MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \ CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods) diff --git a/package/minetest/Config.in b/package/minetest/Config.in index 3e331dff7e..4e139ac3e2 100644 --- a/package/minetest/Config.in +++ b/package/minetest/Config.in @@ -28,7 +28,7 @@ config BR2_PACKAGE_MINETEST_CLIENT select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_JPEG - select BR2_PACKAGE_XLIB_LIBXXF86VM + select BR2_PACKAGE_XLIB_LIBXI help Build Minetest client. diff --git a/package/minetest/minetest.hash b/package/minetest/minetest.hash index e78f865969..ec67d4136d 100644 --- a/package/minetest/minetest.hash +++ b/package/minetest/minetest.hash @@ -1,6 +1,6 @@ # Locally calculated -sha256 dc0ae5188ef351db85c38b27f38f8549b133ed82aa46daea6deee148aa3454f4 minetest-5.5.1.tar.gz -sha256 6d38dd7f3e3c8d768e1f5776b98dd5359b184c2e6740ddf733f4dc8615191bef irrlicht-1.9.0mt5.tar.gz +sha256 1440603e19dca70e2691e86a74c822ee2c4a36fceee32b2d85ae74772149e9a3 minetest-5.6.1.tar.gz +sha256 27594242da8c7cc1e5ef45922e1dfdd130c37d77719b5d927359eb47992051e0 irrlicht-1.9.0mt8.tar.gz -sha256 d1d8a63f7f70d89a3a899f3b9fb5ca1ea7dbbd4eb449be2a7b2ff861b1f09192 LICENSE.txt +sha256 b38c8d428ceddf8e9b49dca63610c74499d952895d756b7eab5f5d4cef2954f6 LICENSE.txt sha256 ca38f1ba4ab901111f6eee50009bd46dbd866e6beb98d592d843f7c162d73409 lib/irrlichtmt/doc/irrlicht-license.txt diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk index 6d56c3222f..3904bd687c 100644 --- a/package/minetest/minetest.mk +++ b/package/minetest/minetest.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_VERSION = 5.5.1 +MINETEST_VERSION = 5.6.1 MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION)) MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds), Zlib (irrlicht) MINETEST_LICENSE_FILES = LICENSE.txt lib/irrlichtmt/doc/irrlicht-license.txt @@ -12,7 +12,7 @@ MINETEST_CPE_ID_VENDOR = minetest MINETEST_DEPENDENCIES = gmp jsoncpp luajit sqlite zlib zstd -MINETEST_IRRLICHTMT_VERSION = 1.9.0mt5 +MINETEST_IRRLICHTMT_VERSION = 1.9.0mt8 MINETEST_EXTRA_DOWNLOADS = $(call github,minetest,irrlicht,$(MINETEST_IRRLICHTMT_VERSION))/irrlicht-$(MINETEST_IRRLICHTMT_VERSION).tar.gz define MINETEST_IRRLICHTMT_EXTRACT @@ -36,7 +36,7 @@ MINETEST_CONF_OPTS = \ -DBUILD_UNITTESTS=OFF ifeq ($(BR2_PACKAGE_MINETEST_CLIENT),y) -MINETEST_DEPENDENCIES += bzip2 freetype jpeg libgl libpng xlib_libXxf86vm +MINETEST_DEPENDENCIES += bzip2 freetype jpeg libgl libpng xlib_libXi MINETEST_CONF_OPTS += -DBUILD_CLIENT=ON else MINETEST_CONF_OPTS += -DBUILD_CLIENT=OFF From peter at korsgaard.com Mon Feb 20 20:59:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:04 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-mediasdk: bump version to 22.6.5 Message-ID: <20230220205224.F2D31828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ebb0f810a21103af0bd6d988a24645503e7d10e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 7cbedb7127..903b6f3394 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 197acd056f81e9ff1c27068d50e8c84c2014d94c7ac17cad69d5c2d61e445fd3 intel-mediasdk-22.6.4.tar.gz +sha256 3a671cc692da5111c041088f5e32528b4346e122e8a134fad71310c572705106 intel-mediasdk-22.6.5.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 3bd6197779..f7bce30c74 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.6.4 +INTEL_MEDIASDK_VERSION = 22.6.5 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:59:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:04 -0000 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: fix openssl dependency Message-ID: <20230220205247.7189986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78e3637dd26766976d09e5d8286613f67975f8d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since the addition of the package in commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: Makefile:576: *** libopenssl is in the dependency chain of fluent-bit that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Fixes: - http://autobuild.buildroot.org/results/9c3b8e19063f7587877fdb0598739b55abccb3e8 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/fluent-bit/fluent-bit.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 879437e5f4..13077e53cc 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -10,7 +10,7 @@ FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit -FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl +FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ From peter at korsgaard.com Mon Feb 20 20:59:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:05 -0000 Subject: [Buildroot] [git commit branch/next] package/libsndfile: bump to version 1.2.0 Message-ID: <20230220205224.D1AC5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1757c1fe0556d7339d23c5726fb49cca1c7d7759 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/libsndfile/libsndfile/releases/tag/1.2.0 Drop patch (already in version). Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...bstitute-EXTERNAL_MPEG_LIBS-in-sndfile-pc.patch | 24 ---------------------- package/libsndfile/libsndfile.hash | 2 +- package/libsndfile/libsndfile.mk | 4 +--- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/package/libsndfile/0001-configure-ac-substitute-EXTERNAL_MPEG_LIBS-in-sndfile-pc.patch b/package/libsndfile/0001-configure-ac-substitute-EXTERNAL_MPEG_LIBS-in-sndfile-pc.patch deleted file mode 100644 index 44ed6dc2cb..0000000000 --- a/package/libsndfile/0001-configure-ac-substitute-EXTERNAL_MPEG_LIBS-in-sndfile-pc.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e4fdaeefddd39bae1db27d48ccb7db7733e0c009 Mon Sep 17 00:00:00 2001 -From: Michael Cho -Date: Sun, 17 Apr 2022 21:31:07 -0700 -Subject: [PATCH] configure.ac: substitute EXTERNAL_MPEG_LIBS in sndfile.pc - -[Retrieved from: -https://github.com/libsndfile/libsndfile/commit/e4fdaeefddd39bae1db27d48ccb7db7733e0c009] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 727b67bc0..a4c776d70 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -739,6 +739,7 @@ AC_SUBST(SNDIO_LIBS) - AC_SUBST(EXTERNAL_XIPH_CFLAGS) - AC_SUBST(EXTERNAL_XIPH_LIBS) - AC_SUBST(EXTERNAL_XIPH_REQUIRE) -+AC_SUBST(EXTERNAL_MPEG_LIBS) - AC_SUBST(EXTERNAL_MPEG_REQUIRE) - AC_SUBST(MPG123_CFLAGS) - AC_SUBST(MPG123_LIBS) diff --git a/package/libsndfile/libsndfile.hash b/package/libsndfile/libsndfile.hash index 67d10d03c4..be3ba41dc6 100644 --- a/package/libsndfile/libsndfile.hash +++ b/package/libsndfile/libsndfile.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 0f98e101c0f7c850a71225fb5feaf33b106227b3d331333ddc9bacee190bcf41 libsndfile-1.1.0.tar.xz +sha256 0e30e7072f83dc84863e2e55f299175c7e04a5902ae79cfb99d4249ee8f6d60a libsndfile-1.2.0.tar.xz # Locally calculated sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index 0b57a1fdd8..d8d1725444 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -4,15 +4,13 @@ # ################################################################################ -LIBSNDFILE_VERSION = 1.1.0 +LIBSNDFILE_VERSION = 1.2.0 LIBSNDFILE_SOURCE = libsndfile-$(LIBSNDFILE_VERSION).tar.xz LIBSNDFILE_SITE = https://github.com/libsndfile/libsndfile/releases/download/$(LIBSNDFILE_VERSION) LIBSNDFILE_INSTALL_STAGING = YES LIBSNDFILE_LICENSE = LGPL-2.1+ LIBSNDFILE_LICENSE_FILES = COPYING LIBSNDFILE_CPE_ID_VENDOR = libsndfile_project -# We're patching configure.ac -LIBSNDFILE_AUTORECONF = YES LIBSNDFILE_DEPENDENCIES = host-pkgconf LIBSNDFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From thomas.petazzoni at bootlin.com Mon Feb 6 09:14:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 10:14:11 +0100 Subject: [Buildroot] [git commit branch/next] package/libcamera-apps: fix overflow conversion error Message-ID: <20230220205247.A3E9A81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bbf8d89810479d2cc4777b84f3cc49bc3548d868 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Upstream commit: https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861 Fixes: - http://autobuild.buildroot.net/results/758631a9fcd62835844f78914a36dfb579e7beba/ Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- ...ore-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch b/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch new file mode 100644 index 0000000000..fbd1d2d4ba --- /dev/null +++ b/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch @@ -0,0 +1,35 @@ +From a65682a97e19f96b86aeceb3ca3befb1687e3861 Mon Sep 17 00:00:00 2001 +From: Marcus Folkesson +Date: Tue, 31 Jan 2023 09:14:15 +0100 +Subject: [PATCH] core: pass VIDIOC_QUERYCAP as unsigned long + +VIDIOC_QUARYCAP is an unsigned long and should be passed as one. + +Get rid of the following error: +core/libcamera_app.cpp:33:22: error: overflow in conversion from 'long unsigned int' to 'int' changes value from '2154321408' to '-2140645888' [-Werror=overflow] + 33 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); + +Upstream: https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861 +Signed-off-by: Marcus Folkesson +--- + core/libcamera_app.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/core/libcamera_app.cpp b/core/libcamera_app.cpp +index 04696fb..8cb6563 100644 +--- a/core/libcamera_app.cpp ++++ b/core/libcamera_app.cpp +@@ -30,7 +30,9 @@ static void check_camera_stack() + return; + + v4l2_capability caps; +- int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); ++ unsigned long request = VIDIOC_QUERYCAP; ++ ++ int ret = ioctl(fd, request, &caps); + close(fd); + + if (ret < 0 || strcmp((char *)caps.driver, "bm2835 mmal")) +-- +2.38.1 + From peter at korsgaard.com Mon Feb 6 10:01:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:01:01 +0100 Subject: [Buildroot] [git commit branch/next] package/mongoose: fix build with gcc 4.8 Message-ID: <20230220205247.C06F786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6139aeacd847487a296f1c7b8a9d302d678cd8ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with gcc 4.8 raised since bump to version 7.8 in commit f9e51e1150f59962577358b3da5c390ca4749291: /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c: In function 'mg_iotest': /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c:4484:3: error: 'for' loop initial declarations are only allowed in C99 mode for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) { ^ Fixes: - http://autobuild.buildroot.org/results/c538c6d8e87e4e24097c9878ee15083802276505 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mongoose/mongoose.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 8d06ed4689..0693f7553a 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -13,7 +13,7 @@ MONGOOSE_INSTALL_STAGING = YES # static library MONGOOSE_INSTALL_TARGET = NO -MONGOOSE_CFLAGS = $(TARGET_CFLAGS) +MONGOOSE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGOOSE_DEPENDENCIES += openssl From peter at korsgaard.com Mon Feb 20 20:59:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:06 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-gmmlib: bump version to 22.3.2 Message-ID: <20230220205224.E36EC8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=935f8774e5b10028c71d85c014380dd67714af5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 9491f23680..d36bd8b9b6 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4adcd33a07617e1c95c4bc6d85bac2e3a881ba19ffcca2857da765248295fd2c intel-gmmlib-22.3.1.tar.gz +sha256 f725fbb4291ab67bbc7b31e1a268f523df384667360c931b40144db861be53d7 intel-gmmlib-22.3.2.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 81c455eafd..ffd101808b 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.1 +INTEL_GMMLIB_VERSION = 22.3.2 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Mon Feb 6 10:01:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:01:01 +0100 Subject: [Buildroot] [git commit branch/next] package/gpsd: bump to version 3.25 Message-ID: <20230220205247.CBA5C81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c7fece853f3def9a425eccc384b9dacb1010051 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch (not needed anymore) https://gitlab.com/gpsd/gpsd/-/blob/release-3.25/NEWS Signed-off-by: Fabrice Fontaine Tested-by: Yann E. MORIN Acked-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- package/gpsd/0001-gpsctl-fix-yodaification.patch | 44 ------------------------ package/gpsd/gpsd.hash | 2 +- package/gpsd/gpsd.mk | 2 +- 3 files changed, 2 insertions(+), 46 deletions(-) diff --git a/package/gpsd/0001-gpsctl-fix-yodaification.patch b/package/gpsd/0001-gpsctl-fix-yodaification.patch deleted file mode 100644 index 753ff300eb..0000000000 --- a/package/gpsd/0001-gpsctl-fix-yodaification.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 72ae7ce646792b07061cbbb31ed47f55a1d2422c Mon Sep 17 00:00:00 2001 -Message-Id: <72ae7ce646792b07061cbbb31ed47f55a1d2422c.1663075350.git.yann.morin at orange.com> -From: "Yann E. MORIN" -Date: Tue, 13 Sep 2022 15:10:48 +0200 -Subject: [PATCH] gpsctl: fix yodaification - -Commit d5a672abd98a (gpsctl.c: Style tweaks. Yoda style, braces, // -comments.) claimed "No functional changes", but mis-treated a comparison -when it was converted to yoda-style (simplified diff): - - - if (write(gpsdata->gps_fd, buf, strlen(buf)) <= 0) { - + if (0 <= write(gpsdata->gps_fd, buf, strlen(buf))) { - -As one may notice, the comparison operator was not reversed while the -operands were. - -This got silently fixed in commit 3219ab9f6a89 (gpsctl.c: First cut at ---ship sending commands to running gpsd.) but this is completely -unrelated. - -Fix that comparison. - -Signed-off-by: Yann E. MORIN -Upstream status: not applicable as already fixed. ---- - gpsctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gpsctl.c b/gpsctl.c -index cb342af87..ef59a6622 100644 ---- a/gpsctl.c -+++ b/gpsctl.c -@@ -96,7 +96,7 @@ static bool gps_query(struct gps_data_t *gpsdata, - if ('\n' != buf[strnlen(buf, sizeof(buf) - 1) - 1]) { - (void)strlcat(buf, "\n", sizeof(buf)); - } -- if (0 <= write(gpsdata->gps_fd, buf, strnlen(buf, sizeof(buf)))) { -+ if (0 >= write(gpsdata->gps_fd, buf, strnlen(buf, sizeof(buf)))) { - GPSD_LOG(LOG_ERROR, &context.errout, "gps_query(), write failed\n"); - return false; - } --- -2.25.1 - diff --git a/package/gpsd/gpsd.hash b/package/gpsd/gpsd.hash index f415c3af0f..15e1181ed9 100644 --- a/package/gpsd/gpsd.hash +++ b/package/gpsd/gpsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c gpsd-3.24.tar.gz +sha256 b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2 gpsd-3.25.tar.gz sha256 fdf339997bbca9eaf507476b82fbcac608fc39a3d89b86b51e16db4c9f933716 COPYING diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 961ebde649..d7425513fd 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSD_VERSION = 3.24 +GPSD_VERSION = 3.25 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-2-Clause GPSD_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 20:59:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:07 -0000 Subject: [Buildroot] [git commit branch/next] configs/amarula_vyasa_rk3288_defconfig: bump to Linux version 6.1.2 and U-Boot 2022.10 Message-ID: <20230220205225.1E0FF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5424bd0a827ef2a36707b5c12a11251169622160 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- configs/amarula_vyasa_rk3288_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig index ff96019e1e..7976537225 100644 --- a/configs/amarula_vyasa_rk3288_defconfig +++ b/configs/amarula_vyasa_rk3288_defconfig @@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" From peter at korsgaard.com Mon Feb 6 10:17:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:17:15 +0100 Subject: [Buildroot] [git commit branch/next] package/iwd: bump to version 2.3 Message-ID: <20230220205247.ED56281979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6929c0cdd944c86b0affbe04cf72c2c0398da64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 be048b3da6..1647f93d9e 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 dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570 iwd-2.2.tar.xz +sha256 b0506d797a8bfb88f3c3eeea5e49dcf4ee8e6cef118f57c118e587eeb377ac64 iwd-2.3.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index b0a2f6e9ed..c54031b102 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 2.2 +IWD_VERSION = 2.3 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 Mon Feb 20 20:59:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:08 -0000 Subject: [Buildroot] [git commit branch/next] package/re2: bump to version 2022-12-01 Message-ID: <20230220205225.2D229828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4432cf65ee7ec0fe9cc23bcac251adca16aeb014 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 380b547658..9019867db4 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd4f4508bee946ab0f re2-2022-06-01.tar.gz +sha256 665b65b6668156db2b46dddd33405cd422bd611352c5052ab3dae6a5fbac5506 re2-2022-12-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 39b2c8d990..07bb9378de 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2022-06-01 +RE2_VERSION = 2022-12-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:59:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:09 -0000 Subject: [Buildroot] [git commit branch/next] package/glib-networking: drop dangling GLIB_NETWORKING_INSTALL_TARGET_OPTS Message-ID: <20230220205225.5D7008648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4f2459e8a94c1f30c0fcbeb3cd72b62b5ee3e64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In 2015, commit "3fe434bf35 glib-networking: specify GIO_MODULE_DIR for target" correctly used _INSTALL_TARGET_OPTS with an autotools package. But later on, in 2018, commit "928a72c49f package/glib-networking: bump version to 2.56.1" changed the package to use the meson infra, that does not support _INSTALL_TARGET_OPTS. So this symbol is bogus since 2018. Drop it now. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/glib-networking/glib-networking.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index e8905dfff4..4adc13d39f 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -21,8 +21,6 @@ GLIB_NETWORKING_CONF_OPTS = \ GLIB_NETWORKING_LICENSE = LGPL-2.0+ GLIB_NETWORKING_LICENSE_FILES = COPYING GLIB_NETWORKING_CPE_ID_VENDOR = gnome -GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \ - GIO_MODULE_DIR=/usr/lib/gio/modules install ifeq ($(BR2_PACKAGE_GNUTLS),y) GLIB_NETWORKING_DEPENDENCIES += gnutls From peter at korsgaard.com Mon Feb 6 10:19:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:19:32 +0100 Subject: [Buildroot] [git commit branch/next] package/tmux: bump to version 3.3a Message-ID: <20230220205248.03EA78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e279599d255a79c08ef20b97b96eb248689d52a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next systemd is an optional dependency since https://github.com/tmux/tmux/commit/fc7f1e7acb3539a43df46136e971f770515e0b0d https://github.com/tmux/tmux/blob/3.3a/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tmux/tmux.hash | 2 +- package/tmux/tmux.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index 75538e09ae..b5c0fe58d0 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386 tmux-3.1c.tar.gz +sha256 e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f tmux-3.3a.tar.gz sha256 c031bd37f464c534277814f6aa38686fa023d094261d57fd2545ad592bb53ccd COPYING diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index b1c0af1a83..47ee9b16ca 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,13 +4,20 @@ # ################################################################################ -TMUX_VERSION = 3.1c +TMUX_VERSION = 3.3a TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +TMUX_DEPENDENCIES += systemd +TMUX_CONF_OPTS += --enable-systemd +else +TMUX_CONF_OPTS += --disable-systemd +endif + ifeq ($(BR2_PACKAGE_UTF8PROC),y) TMUX_DEPENDENCIES += utf8proc TMUX_CONF_OPTS += --enable-utf8proc From peter at korsgaard.com Mon Feb 6 10:24:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:24:31 +0100 Subject: [Buildroot] [git commit branch/next] Config.in.legacy: fix typo on BR2_PACKAGE_MEDIAART_BACKEND_QT Message-ID: <20230220205248.40F898648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=316e149611a761db04171ee6141048d9057183c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Currently using this minimal .config: BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF=y triggers: *** Legacy options removed in 2018.05 *** [ ] libmediaart none backend option renamed (NEW) [*] libmediaart gdk-pixbuf backend option renamed [*] libmediaart qt backend option renamed Commit "8553b39887 libmediaart: rename options to have proper prefix", part of the 2018.05 release had a copy&paste error. As stated in the beginning of the file: The oldest symbols will be removed again after about two years. But while we carry these legacy symbols, let's fix the typo. Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 4d82a54208..e5cfcea8fa 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2700,7 +2700,7 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF +config BR2_PACKAGE_MEDIAART_BACKEND_QT bool "libmediaart qt backend option renamed" select BR2_LEGACY help From thomas.petazzoni at bootlin.com Mon Feb 6 10:57:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:57:08 +0100 Subject: [Buildroot] [git commit branch/next] boot/barebox: explicitly set the timezone for the kbuild timestamp Message-ID: <20230220205248.6CE9B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11e75ecbf092420f00f0fc88a7183d5d99887ff1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This adjusts the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") to explicitly set the timezone when calculating KBUILD_BUILD_TIMESTAMP, like is already done in linux/linux.mk. Signed-off-by: Thomas Petazzoni --- boot/barebox/barebox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index a0cfaffe09..d7bcafe436 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -78,7 +78,7 @@ ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C TZ='UTC' date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From peter at korsgaard.com Mon Feb 20 20:59:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:11 -0000 Subject: [Buildroot] [git commit branch/next] package/libtalloc: drop bogus LIBTALLOC_{C, LD}FLAGS Message-ID: <20230220205225.7DF09828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ad6b4e10e4538532c00f8c04363da64f19c313a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "f0d37e275a package/libtalloc: new package" added these symbols but they are not used in the package and also not recognized by the waf package infra. So drop the ignored symbols. Cc: David GOUARIN Cc: Matt Weber Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/libtalloc/libtalloc.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/libtalloc/libtalloc.mk b/package/libtalloc/libtalloc.mk index 75d3da263b..ca15180d22 100644 --- a/package/libtalloc/libtalloc.mk +++ b/package/libtalloc/libtalloc.mk @@ -31,8 +31,6 @@ LIBTALLOC_CONF_OPTS += --cross-compile \ --with-libiconv=$(STAGING_DIR)/usr ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -LIBTALLOC_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` -LIBTALLOC_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` LIBTALLOC_DEPENDENCIES += libtirpc host-pkgconf endif From thomas.petazzoni at bootlin.com Mon Feb 6 10:57:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:57:29 +0100 Subject: [Buildroot] [git commit branch/next] package/libass: bump version to 0.17.0 Message-ID: <20230220205248.78D1686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06646238303b974e4bce81143a6c022fdf790568 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/libass/libass/releases/tag/0.17.0 Added new optional dependency to libunibreak introduced by this bump. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libass/libass.hash | 2 +- package/libass/libass.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/libass/libass.hash b/package/libass/libass.hash index b8952a4730..beb7639b1f 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5dbde9e22339119cf8eed59eea6c623a0746ef5a90b689e68a090109078e3c08 libass-0.16.0.tar.xz +sha256 971e2e1db59d440f88516dcd1187108419a370e64863f70687da599fdf66cc1a libass-0.17.0.tar.xz sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING diff --git a/package/libass/libass.mk b/package/libass/libass.mk index 4ba812e3fc..1cc8310312 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.16.0 +LIBASS_VERSION = 0.17.0 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. @@ -33,4 +33,11 @@ else LIBASS_CONF_OPTS += --disable-fontconfig --disable-require-system-font-provider endif +ifeq ($(BR2_PACKAGE_LIBUNIBREAK),y) +LIBASS_DEPENDENCIES += libunibreak +LIBASS_CONF_OPTS += --enable-libunibreak +else +LIBASS_CONF_OPTS += --disable-libunibreak +endif + $(eval $(autotools-package)) From peter at korsgaard.com Mon Feb 6 10:26:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:26:41 +0100 Subject: [Buildroot] [git commit branch/next] utils/checkpackagelib: warn about redefined config Message-ID: <20230220205248.4B91086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bbda72743d39df29dfc91e0f52be02b2d465f6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Warn the developer in the case the same config is declared more than once in the same Config.in file. But take into account the conditional code that lets the config be visible and warn only when it is declared more than once in the same conditions. For instance, do not warn for: if BR2_PACKAGE_BUSYBOX config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_config.py | 38 ++++++++++++++++ utils/checkpackagelib/test_lib_config.py | 78 ++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index b05831f2c3..f26ca0d898 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -233,3 +233,41 @@ class Indent(_CheckFunction): return ["{}:{}: should not be indented" .format(self.filename, lineno), text] + + +class RedefinedConfig(_CheckFunction): + CONFIG = re.compile(r"^\s*(menu|)config\s+(BR2_\w+)\b") + IF = re.compile(r"^\s*if\s+([^#]*)\b") + ENDIF = re.compile(r"^\s*endif\b") + + def before(self): + self.configs = {} + self.conditional = [] + + def check_line(self, lineno, text): + if _empty_or_comment(text) or _part_of_help_text(text): + return + + m = self.IF.search(text) + if m is not None: + condition = m.group(1) + self.conditional.append(condition) + return + + m = self.ENDIF.search(text) + if m is not None: + self.conditional.pop() + return + + m = self.CONFIG.search(text) + if m is None: + return + config = m.group(2) + + key = (config, ' AND '.join(self.conditional)) + if key in self.configs.keys(): + previous_line = self.configs[key] + return ["{}:{}: config {} redeclared (previous line: {})" + .format(self.filename, lineno, config, previous_line), + text] + self.configs[key] = lineno diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py index 91a549adf2..474d17105e 100644 --- a/utils/checkpackagelib/test_lib_config.py +++ b/utils/checkpackagelib/test_lib_config.py @@ -385,3 +385,81 @@ Indent = [ def test_Indent(testname, filename, string, expected): warnings = util.check_file(m.Indent, filename, string) assert warnings == expected + + +RedefinedConfig = [ + ('no redefinition', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO_BAR\n' + 'bool "foo"\n', + []), + ('no conditional', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('three times', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:3: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n'], + ['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('same conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:6: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:8: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('not equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if !BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', RedefinedConfig) +def test_RedefinedConfig(testname, filename, string, expected): + warnings = util.check_file(m.RedefinedConfig, filename, string) + assert warnings == expected From peter at korsgaard.com Mon Feb 20 20:59:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:13 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: drop dangling SWUPDATE_BUILD_CONFIG Message-ID: <20230220205225.CF057828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca5cd8d67554c568daee4da1f058bcf3b35b2976 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next "6c63e4de4a boot/swupdate: don't specify .config to munge" dropped all usages of this define but the define itself was left dangling. Drop it now. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/swupdate/swupdate.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 8f05b83922..11a3946753 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -208,8 +208,6 @@ define SWUPDATE_SET_WEBSERVER endef endif -SWUPDATE_BUILD_CONFIG = $(@D)/.config - SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)) SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig From peter at korsgaard.com Mon Feb 20 20:59:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:14 -0000 Subject: [Buildroot] [git commit branch/next] package/qoriq-rcw: drop bogus QORIQ_RCW_FILE_BIN Message-ID: <20230220205225.AD89D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41aa369d01a4dd6646390066f44135d99f926fe4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next While applying [1] and cleaning up, the commit "d167f7006e package/qoriq-rcw: add in-tree rcw source support" ended up keeping an unused define. Drop it now. [1] http://patchwork.ozlabs.org/project/buildroot/patch/20200207083857.28058-4-jerry.huang at nxp.com/ Cc: Matt Weber Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/qoriq-rcw/qoriq-rcw.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index 8b1ceacfce..b9c9e99222 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -59,7 +59,6 @@ endef else ifneq ($(QORIQ_RCW_INTREE),) QORIQ_RCW_PLATFORM = $(firstword $(subst /, ,$(QORIQ_RCW_INTREE))) -QORIQ_RCW_FILE_BIN = $(lastword $(subst /, ,$(QORIQ_RCW_INTREE))) define HOST_QORIQ_RCW_BUILD_CMDS $(MAKE) -C $(@D)/$(QORIQ_RCW_PLATFORM) From thomas.petazzoni at bootlin.com Mon Feb 6 11:13:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 12:13:36 +0100 Subject: [Buildroot] [git commit branch/next] package/postgresql: work around gcc bug 43744 Message-ID: <20230220205248.AFC0886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3def0679e3a424983354346eb517bbaa07b905df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Package postgresql suffers from gcc bug 43744 other than 85180, so let's work around disabling compiler optimization for this gcc bug too. Fixes: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 5313e03b12..2ffcac6595 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -101,7 +101,7 @@ endif POSTGRESQL_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_43744)$(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),) POSTGRESQL_CFLAGS += -O0 endif From peter at korsgaard.com Mon Feb 20 20:59:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:15 -0000 Subject: [Buildroot] [git commit branch/next] package/rhash: drop dangling RHASH_ADDLDFLAGS Message-ID: <20230220205225.BDB218648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eae97036f34e69e2ca197cd31fd87c673f2ebe37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "ead2afda13 package/rhash: bump version to 1.4.0" dropped the only usage of this define but the define itself was left dangling. Drop it now. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/rhash/rhash.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index 8c33de1862..1f7456e4e7 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -12,7 +12,6 @@ RHASH_LICENSE_FILES = COPYING RHASH_CPE_ID_VENDOR = rhash_project RHASH_INSTALL_STAGING = YES RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) RHASH_CONF_OPTS += --enable-gettext From yann.morin.1998 at free.fr Mon Feb 6 11:00:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:00:14 +0100 Subject: [Buildroot] [git commit branch/next] package/crudini: add host-crudini Message-ID: <20230220205248.9AD5C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c96b2b21f7aedd78094fd009f03d8f82361e5105 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Make the host variant of crudini package. This can be useful in post-{build,image} scripts. Signed-off-by: Konstantin Menyaev Reviewed-by: Heiko Thiery [yann.morin.1998 at free.fr: select python3, don't depend on it] Signed-off-by: Yann E. MORIN --- package/Config.in.host | 1 + package/crudini/Config.in.host | 9 +++++++++ package/crudini/crudini.mk | 1 + 3 files changed, 11 insertions(+) diff --git a/package/Config.in.host b/package/Config.in.host index 0f612d7872..8d28f426d1 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -14,6 +14,7 @@ menu "Host utilities" source "package/checksec/Config.in.host" source "package/cmake/Config.in.host" source "package/cramfs/Config.in.host" + source "package/crudini/Config.in.host" source "package/cryptsetup/Config.in.host" source "package/dbus-python/Config.in.host" source "package/delve/Config.in.host" diff --git a/package/crudini/Config.in.host b/package/crudini/Config.in.host new file mode 100644 index 0000000000..4e77095627 --- /dev/null +++ b/package/crudini/Config.in.host @@ -0,0 +1,9 @@ +config BR2_PACKAGE_HOST_CRUDINI + bool "host crudini" + select BR2_PACKAGE_HOST_PYTHON3 + select BR2_PACKAGE_HOST_PYTHON_INIPARSE # runtime + help + A utility for handling ini files from the command line and + shell scripts + + https://pypi.python.org/pypi/crudini diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk index 7141e2b2a0..c376c5f777 100644 --- a/package/crudini/crudini.mk +++ b/package/crudini/crudini.mk @@ -11,3 +11,4 @@ CRUDINI_LICENSE = GPL-2.0 CRUDINI_LICENSE_FILES = COPYING $(eval $(python-package)) +$(eval $(host-python-package)) From peter at korsgaard.com Mon Feb 20 20:59:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:16 -0000 Subject: [Buildroot] [git commit branch/next] package/wpa_supplicant: drop dangling WPA_SUPPLICANT_{LDFLAGS, MAKE_ENV} Message-ID: <20230220205225.E210386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11479db32c5ea6bbdd7ce9b77873561a2ca07cfb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "0340b45da0 wpa_supplicant: bump to version 1.0" from 2012 converted the package to use the generic infra, but added a bogus WPA_SUPPLICANT_LDFLAGS end left a dangling WPA_SUPPLICANT_MAKE_ENV. Drop the symbols that are not used since 2012. Cc: Matt Weber Cc: Sergey Matyukevich Cc: Yegor Yefremov Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/wpa_supplicant/wpa_supplicant.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index e5e3938be1..42c6f772ac 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -13,7 +13,6 @@ WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config WPA_SUPPLICANT_SUBDIR = wpa_supplicant WPA_SUPPLICANT_DBUS_SERVICE = fi.w1.wpa_supplicant1 WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ -WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) WPA_SUPPLICANT_SELINUX_MODULES = networkmanager # install the wpa_client library @@ -157,9 +156,6 @@ endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS),y) WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus -WPA_SUPPLICANT_MAKE_ENV = \ - PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_NEW define WPA_SUPPLICANT_INSTALL_DBUS_NEW $(INSTALL) -m 0644 -D \ From yann.morin.1998 at free.fr Mon Feb 6 11:36:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:36:56 +0100 Subject: [Buildroot] [git commit branch/next] package/Config.in.host: fix missing double-quote Message-ID: <20230220205248.D5CED8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3cab8f29eb9c7e573099a4a0e45f251e4f15f97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit c96b2b21f7ae (package/python-iniparse: add host-python-iniparse) missed that. Reported-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in.host b/package/Config.in.host index 8d28f426d1..dcadbfdfc1 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -78,7 +78,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python-cython/Config.in.host" source "package/python-greenlet/Config.in.host" - source "package/python-iniparse/Config.in.host + source "package/python-iniparse/Config.in.host" source "package/python-kflash/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-pyyaml/Config.in.host" From yann.morin.1998 at free.fr Mon Feb 6 13:21:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 14:21:42 +0100 Subject: [Buildroot] [git commit branch/next] Makefile: fix build when $(O) ends in _defconfig Message-ID: <20230220205248.EF25F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5bd2cafc326141eede4f917069ed21b6d38f88c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit e6195c53041f (Makefile: fix use of many br2-external trees) fixed a slowdown with many br2-external trees. In doing so, it changed the type of the %_defconfig rule: the stem is no longer present in the prerequisites, so it changes from a pattern rule to an implicit pattern rule [0]. It is not unusual to name the build directory after the defconfig that is being built, so we may end up with a build directory named meh_defconfig. Before e6195c53041f, the pattern rule would not match [1], but now it does, which causes somewhat-cryptic build failures: Makefile:1015: *** "Can't find /some/path/meh_defconfig". Stop. The issue is that we have this set of rules and assignments (elided and reordered for legibility): all: world world: target-post-image target-post-image: staging-finalize staging-finalize: $(STAGING_DIR_SYMLINK) $(STAGING_DIR_SYMLINK): | $(BASE_DIR) BASE_DIR := $(CANONICAL_O) CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) So, there is a rule that (eventually) has a dependency on $(O), but we have no rule that provides it explicitly, so the %_defconfig rule kicks in, with the stem as "/some/path/meh". When the loop searches all the ".../configs/" directories for a file named ".../configs/%_defconfig", it actually looks for a file named ".../configs//some/path/meh_defconfig" and that indeed never matches anything. The solution is to provide an actual rule for $(BASE_DIR), so that the implicit rule does not kick in. [0] Terminology and behaviour in make is hard, so the terms we used here may be wrong or incorrectly used, and/or the explanations for the behaviour be wrong or incomplete... Still, the reasoning stands, and the root cause is the removal of the stem in the RHS of the rule (adding one back does fix the issue). [1] not sure how the prerequisite was solved before e6195c53041f, though... Fixes: e6195c53041f Reported-by: Romain Naour Signed-off-by: Yann E. MORIN Cc: Nevo Hed Cc: Peter Korsgaard Tested-by: Sebastian Weyer Signed-off-by: Yann E. MORIN --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8517d563d5..f39af5eae9 100644 --- a/Makefile +++ b/Makefile @@ -1042,7 +1042,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile # staging and target directories do NOT list these as # dependencies anywhere else -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): @mkdir -p $@ # outputmakefile generates a Makefile in the output directory, if using a From peter at korsgaard.com Mon Feb 20 20:59:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:17 -0000 Subject: [Buildroot] [git commit branch/next] package/checkpolicy: drop bogus CHECKPOLICY_STAGING_CMDS Message-ID: <20230220205226.105058648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14956d8908776e52ea9ace2fbb3f41716ebb4262 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "b06110621d checkpolicy: allow compiling for target" contains a typo that prevents installing to staging. It also forgot to enable CHECKPOLICY_INSTALL_STAGING. But the package does not install headers or libraries, only ELF and manual files. So instead of fixing the install to staging, drop the bogus CHECKPOLICY_STAGING_CMDS. Cc: Clayton Shotwell Cc: Matt Weber Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/checkpolicy/checkpolicy.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index af9a58cee8..baf16fb802 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -20,11 +20,6 @@ define CHECKPOLICY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR) endef -define CHECKPOLICY_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install - -endef - define CHECKPOLICY_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install endef From peter at korsgaard.com Mon Feb 6 13:22:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:37 +0100 Subject: [Buildroot] [git commit branch/next] package/fwts: use ifeq instead of ifdef Message-ID: <20230220205249.0F20C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6ae82531928662764536cadbe2d6f3c558e7de2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The conditional code using ifdef was added in 2018 and works as expected. But there is no reason to use ifdef instead of ifeq. For consistence, switch to use ifeq like almost all packages already do. Cc: Arnout Vandecappelle Cc: Erico Nunes Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/fwts/fwts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index b208aa0c14..f04c7a848f 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -15,7 +15,7 @@ FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) -ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE +ifeq ($(BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE),y) FWTS_MODULE_SUBDIRS = efi_runtime $(eval $(kernel-module)) endif From peter at korsgaard.com Mon Feb 20 20:59:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:18 -0000 Subject: [Buildroot] [git commit branch/next] bash: bump version to 5.2.15 Message-ID: <20230220205225.F4051828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8a2e1dc08a4de2db903a4a5a41c8541e6abfe81 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Martin Hundeb??ll Signed-off-by: Peter Korsgaard --- ...typo-local_shiftstates-vs.-locale_shiftst.patch | 72 ---------------------- ...ix-dequote_pathname-vs.-udequote_pathname.patch | 40 ------------ package/bash/bash.hash | 4 +- package/bash/bash.mk | 2 +- 4 files changed, 3 insertions(+), 115 deletions(-) diff --git a/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch b/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch deleted file mode 100644 index 1636c18036..0000000000 --- a/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 3d6b9e18506ad9daf4ec7b7d406b38d58ec88009 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 11 Mar 2021 20:48:36 +0100 -Subject: [PATCH] locale: fix typo local_shiftstates vs. locale_shiftstates -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - locale.c:94:3: error: ???local_shiftstates??? undeclared (first use in this function); did you mean ???locale_shiftstates???? - 94 | local_shiftstates = 0; - | ^~~~~~~~~~~~~~~~~ - | locale_shiftstates - -Signed-off-by: Peter Seiderer ---- - locale.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/locale.c b/locale.c -index 17ccc58..d6dd95a 100644 ---- a/locale.c -+++ b/locale.c -@@ -91,7 +91,7 @@ set_default_locale () - #if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - #else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - #endif - } - -@@ -117,7 +117,7 @@ set_default_locale_vars () - # if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - # else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - # endif - - u32reset (); -@@ -226,7 +226,7 @@ set_locale_var (var, value) - # if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - # else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - # endif - u32reset (); - return r; -@@ -250,7 +250,7 @@ set_locale_var (var, value) - #if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - #else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - #endif - u32reset (); - } -@@ -391,7 +391,7 @@ reset_locale_vars () - # if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - # else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - # endif - u32reset (); - #endif --- -2.30.1 - diff --git a/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch b/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch deleted file mode 100644 index a801f68236..0000000000 --- a/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a60ab1e5e88863acf9b0e9bcaa7919bbf093da05 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 11 Mar 2021 20:55:52 +0100 -Subject: [PATCH] glob: fix dequote_pathname vs. udequote_pathname -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - glob.c:123:28: error: static declaration of ???udequote_pathname??? follows non-static declaration - 123 | # define dequote_pathname udequote_pathname - | ^~~~~~~~~~~~~~~~~ - glob.c:125:13: note: in expansion of macro ???dequote_pathname??? - 125 | static void dequote_pathname PARAMS((char *)); - | ^~~~~~~~~~~~~~~~ - glob.c:118:6: note: previous declaration of ???udequote_pathname??? was here - 118 | void udequote_pathname PARAMS((char *)); - | ^~~~~~~~~~~~~~~~~ - -Signed-off-by: Peter Seiderer ---- - lib/glob/glob.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lib/glob/glob.c b/lib/glob/glob.c -index eb6277f..c903b15 100644 ---- a/lib/glob/glob.c -+++ b/lib/glob/glob.c -@@ -117,6 +117,5 @@ static int mbskipname PARAMS((char *, char *, int)); - #else - # define dequote_pathname udequote_pathname - #endif --static void dequote_pathname PARAMS((char *)); - static int glob_testdir PARAMS((char *, int)); - static char **glob_dir_to_array PARAMS((char *, char **, int)); - --- -2.30.1 - diff --git a/package/bash/bash.hash b/package/bash/bash.hash index 4660e9d38a..e0a1ebac91 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/bash/bash-5.1.16.tar.gz.sig -sha256 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558 bash-5.1.16.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.2.15.tar.gz.sig +sha256 13720965b5f4fc3a0d4b61dd37e7565c741da9a5be24edc2ae00182fc1b3588c bash-5.2.15.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 3aca22898e..ec5e2d722f 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.1.16 +BASH_VERSION = 5.2.15 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ From peter at korsgaard.com Mon Feb 20 20:59:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:19 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xdriinfo: bump version to 1.0.7 Message-ID: <20230220205226.32C37828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43b13ebbdc89f3d7597f476123bcddb7e0a1655d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003308.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash | 8 +++----- package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash index 21c50184c7..ce11d06977 100644 --- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash +++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002858.html -md5 480e63cd365f03eb2515a6527d5f4ca6 xdriinfo-1.0.6.tar.bz2 -sha1 11682ae1f04a311b832651d78bbf4c6ac77f0ed9 xdriinfo-1.0.6.tar.bz2 -sha256 d9ccd2c3e87899417acc9ea1f3e319a4198112babe1dc711273584f607449d51 xdriinfo-1.0.6.tar.bz2 -sha512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f xdriinfo-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003308.html +sha256 dd838bae9d2b19ddd71fe6d30ed33abc7c85e19d223e79d35600db3fa44bf734 xdriinfo-1.0.7.tar.xz +sha512 a368cf32c606ca78f3a23bc5d88fb57b9c1a3827d0fec3e48cee153703135e47cecd3db8ee0eba93f309d7f03b4306c3f2e7f46f36d0d2970671c5e5b78093ad xdriinfo-1.0.7.tar.xz # Locally computed sha256 de2fbb160bbb64c48975d7a3ebe3636a312b73227df1efe37488a8cecb9c1932 COPYING diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk index 7f7aac9e15..7672dc8899 100644 --- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk +++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDRIINFO_VERSION = 1.0.6 -XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2 -XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDRIINFO_VERSION = 1.0.7 +XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.xz +XAPP_XDRIINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDRIINFO_LICENSE = MIT XAPP_XDRIINFO_LICENSE_FILES = COPYING XAPP_XDRIINFO_DEPENDENCIES = libgl xlib_libX11 xorgproto From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit branch/next] package/busybox: add comment about variable override Message-ID: <20230220205249.4BC61828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01c0fb3862bce6605881d9e32c29b5f7373bb2f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The same comment already exists for UCLIBC_CONFIG_FILE. Both variables can be override from command-line, as described in the manual, at section 'Environment variables'. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index ef628e90e9..0f14bf999d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -108,6 +108,8 @@ BUSYBOX_MAKE_OPTS = \ CONFIG_PREFIX="$(TARGET_DIR)" \ SKIP_STRIP=y +# specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config +# setting. ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif From peter at korsgaard.com Mon Feb 20 20:59:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:21 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libSM: bump version to 1.2.4 Message-ID: <20230220205226.431808648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a70e0bdfdabad5e9d789db181e0f4c37544a426b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003307.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libSM/xlib_libSM.hash | 8 +++----- package/x11r7/xlib_libSM/xlib_libSM.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libSM/xlib_libSM.hash b/package/x11r7/xlib_libSM/xlib_libSM.hash index 7ac288ba4e..3068c85b93 100644 --- a/package/x11r7/xlib_libSM/xlib_libSM.hash +++ b/package/x11r7/xlib_libSM/xlib_libSM.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-October/002922.html -md5 87c7fad1c1813517979184c8ccd76628 libSM-1.2.3.tar.bz2 -sha1 437d7b13fa2eba325df3a106f177df46ccec6546 libSM-1.2.3.tar.bz2 -sha256 2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb libSM-1.2.3.tar.bz2 -sha512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903 libSM-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003307.html +sha256 fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84 libSM-1.2.4.tar.xz +sha512 7f1d41b7b6c5dd456c49ccad7740c3ba9791a2793fa50fd94814a4164ce2e20c4a0a0ad42a87708e494ed5c23f611be6d3ccd9ef1e9add6d46ac545e2b0f6f86 libSM-1.2.4.tar.xz # Locally computed sha256 af7926a14d85ad367622688636e8c9c6f7807c8a6867536af1c530b5c262bfba COPYING diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk index 708224e2d1..8e5c90127a 100644 --- a/package/x11r7/xlib_libSM/xlib_libSM.mk +++ b/package/x11r7/xlib_libSM/xlib_libSM.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBSM_VERSION = 1.2.3 -XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.bz2 -XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBSM_VERSION = 1.2.4 +XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.xz +XLIB_LIBSM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBSM_LICENSE = MIT XLIB_LIBSM_LICENSE_FILES = COPYING XLIB_LIBSM_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit branch/next] boot/uboot: remove use of legacy xloader symbol Message-ID: <20230220205249.6AE65828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b1b1763b754f8a25cf0f2a7fe05e53d256fe675 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "070b183d0c boot/xloader: remove package", from release 2018.11, removed the package, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 282418c3ed..f5c20f5168 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -450,7 +450,6 @@ endif config BR2_TARGET_UBOOT_SPL bool "Install U-Boot SPL binary image" - depends on !BR2_TARGET_XLOADER help Install the U-Boot SPL binary image to the images directory. From peter at korsgaard.com Mon Feb 20 20:59:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:22 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xcb-util: bump version to 0.4.1 Message-ID: <20230220205226.54A96828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b249eca85819761140f670cc52dcf8fb09ef5b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003306.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xcb-util/xcb-util.hash | 4 +++- package/x11r7/xcb-util/xcb-util.mk | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xcb-util/xcb-util.hash b/package/x11r7/xcb-util/xcb-util.hash index c088a62bab..b9d6687752 100644 --- a/package/x11r7/xcb-util/xcb-util.hash +++ b/package/x11r7/xcb-util/xcb-util.hash @@ -1,3 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2022-December/003306.html +sha256 5abe3bbbd8e54f0fa3ec945291b7e8fa8cfd3cccc43718f8758430f94126e512 xcb-util-0.4.1.tar.xz +sha512 da67f2f017d2a1788dcf35f28d6956e171303a622a1dd085cd3d69fdb2ed77965d83c557cc926ebf9b32e905eb2cbb5921987250192d78a2f5edc4d437ed7d2b xcb-util-0.4.1.tar.xz # locally computed -sha256 46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9 xcb-util-0.4.0.tar.bz2 sha256 325b64f0b0284e08bbb7a78ae3e55c1edc2a7cd77f603225ae4b8ffc35423e37 COPYING diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk index bb73530f94..793c3dc7f2 100644 --- a/package/x11r7/xcb-util/xcb-util.mk +++ b/package/x11r7/xcb-util/xcb-util.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_VERSION = 0.4.0 -XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2 -XCB_UTIL_SITE = http://xcb.freedesktop.org/dist +XCB_UTIL_VERSION = 0.4.1 +XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.xz +XCB_UTIL_SITE = https://xorg.freedesktop.org/archive/individual/lib XCB_UTIL_LICENSE = MIT XCB_UTIL_LICENSE_FILES = COPYING XCB_UTIL_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit branch/next] package/linux-headers: remove bogus symbol BR2_PACKAGE_HOST_LINUX_HEADERS Message-ID: <20230220205249.8147586496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=367bd65f3c216426e2fc21742dbff11ea8d896d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The package host-linux-headers does not exist and there were never references to this symbol in the tree, do drop it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3a5207e0b6..1146231e41 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -1,8 +1,5 @@ comment "Kernel Header Options" -config BR2_PACKAGE_HOST_LINUX_HEADERS - bool - choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL From peter at korsgaard.com Mon Feb 20 20:59:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:23 -0000 Subject: [Buildroot] [git commit branch/next] package/check: disable doc Message-ID: <20230220205226.75268828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7d48b9840d242acf1b8bfb141c89904e53301fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next documentation can be disabled since version 0.13.0 and https://github.com/libcheck/check/commit/8ca1f79a73c374e9e9172937938947584c921659 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/check/check.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/check/check.mk b/package/check/check.mk index be82539469..ccffd08ee3 100644 --- a/package/check/check.mk +++ b/package/check/check.mk @@ -10,6 +10,7 @@ CHECK_INSTALL_STAGING = YES CHECK_DEPENDENCIES = host-pkgconf CHECK_LICENSE = LGPL-2.1+ CHECK_LICENSE_FILES = COPYING.LESSER +CHECK_CONF_OPTS = --disable-build-docs # Having checkmk in the target makes no sense define CHECK_REMOVE_CHECKMK From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit branch/next] toolchain/toolchain-buildroot: add comment about using virtual package infra Message-ID: <20230220205249.6115F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abcecd737b198e8a1a48bf4533e5c2b8de8b8cf4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "9a8ec9195c toolchain/toolchain-buildroot: migrate to virtual package infrastructure" made the packages toolchain and toolchain-buildroot to use the virtual package infra even they being generic packages. This works because on package/pkg-virtual.mk when a package do not define neither _PROVIDES_ or _HAS_ symbols, only _IS_VIRTUAL is set to YES and _VERSION and _SOURCE are set to empty before relaying the call to inner-generic-package. Add a comment explaining why the virtual package infra is used in these cases. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Yann E. MORIN Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- toolchain/toolchain-buildroot/toolchain-buildroot.mk | 3 +++ toolchain/toolchain/toolchain.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk index b30cc332d2..6da64b7c77 100644 --- a/toolchain/toolchain-buildroot/toolchain-buildroot.mk +++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk @@ -14,4 +14,7 @@ TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-buildroot-virtual +# instead of toolchain-buildroot-undefined) $(eval $(virtual-package)) diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index 18f1dbea1a..ac60a7b248 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -47,4 +47,7 @@ endef TOOLCHAIN_POST_INSTALL_TARGET_HOOKS += TOOLCHAIN_GLIBC_COPY_NSSWITCH_FILE endif +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-virtual instead +# of toolchain-undefined) $(eval $(virtual-package)) From peter at korsgaard.com Mon Feb 20 20:59:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:24 -0000 Subject: [Buildroot] [git commit branch/next] package/janus-gateway: bump to version 1.1.1 Message-ID: <20230220205226.87F728648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01518e5660366be41e6a8e0a0f2b487d7cdf48a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/meetecho/janus-gateway/blob/v1.1.1/CHANGELOG.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/janus-gateway/janus-gateway.hash | 2 +- package/janus-gateway/janus-gateway.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash index 5d73ede87f..7a87ae737a 100644 --- a/package/janus-gateway/janus-gateway.hash +++ b/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5b8a7304761783585bfa8db7471bf8c393fa2a0ffc346747afadc0c1a9d213f5 janus-gateway-1.0.3.tar.gz +sha256 bb83c19d6137e39833e8eb2b1deeecb33b5d19d4f503d51703bdcc478c447940 janus-gateway-1.1.1.tar.gz sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 9a74350b2c..0d906f1b62 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = 1.0.3 +JANUS_GATEWAY_VERSION = 1.1.1 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION)) JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception JANUS_GATEWAY_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit branch/next] package/lua: properly handle legacy for removed version Message-ID: <20230220205249.A75AF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f461543d9c0f8ea1586004e51561ba0a37b8aecf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "297613f1c7 package/lua: remove 5.2.x version" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2019.02, following the example described in the beginning of the file. Cc: Francois Perrad Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- package/lua/Config.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 73d8ab4ca7..22d7fbe4be 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2224,9 +2224,9 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD config BR2_PACKAGE_LUA_5_2 bool "Lua 5.2.x version removed" select BR2_LEGACY - select BR2_PACKAGE_LUA_5_3 help The Lua 5.2.x version was removed. +# Note: BR2_PACKAGE_LUA_5_2 is still referenced from package/lua/Config.in config BR2_TARGET_GENERIC_PASSWD_MD5 bool "target passwd md5 format support has been removed" diff --git a/package/lua/Config.in b/package/lua/Config.in index 456f3b8c12..888c34b21d 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER choice prompt "Lua Version" + default BR2_PACKAGE_LUA_5_3 if BR2_PACKAGE_LUA_5_2 # legacy default BR2_PACKAGE_LUA_5_4 help Select the version of Lua API/ABI you wish to use. From peter at korsgaard.com Mon Feb 20 20:59:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:25 -0000 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.2 Message-ID: <20230220205226.97A2D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a16221834a0c7a8744f620c2cada751c693279d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.freedesktop.org/archives/mesa-dev/2022-December/225903.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 e5988cad5e..f6b3ade3ea 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 = 22.3.1 +MESA3D_HEADERS_VERSION = 22.3.2 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 613ebce89f..e902e6b828 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-December/000697.html -sha256 3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb mesa-22.3.1.tar.xz -sha512 8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b mesa-22.3.1.tar.xz +# From https://lists.freedesktop.org/archives/mesa-dev/2022-December/225903.html +sha256 c15df758a8795f53e57f2a228eb4593c22b16dffd9b38f83901f76cd9533140b mesa-22.3.2.tar.xz +sha512 32934dd23cfcd6165c365597d9a469da0b806b72ea98a200f499344c3b47815db3bf78875b4ea766d2d28d9c70b50c1615d2d3fcbfd4769447fe0a9d3b32951f mesa-22.3.2.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index b6f1214102..523b642d0c 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 = 22.3.1 +MESA3D_VERSION = 22.3.2 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From thomas.petazzoni at bootlin.com Mon Feb 6 21:10:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:10:57 +0100 Subject: [Buildroot] [git commit branch/next] Makefile: check-package should use the ignore list Message-ID: <20230220205250.94F468648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=394afb3c3b97ec4db28b19c27539c4d653f22e5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For now, we need to ignore a number of check-package warning checks. Signed-off-by: Thomas Petazzoni --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 49ee4ff119..4880b426b5 100644 --- a/Makefile +++ b/Makefile @@ -1257,7 +1257,8 @@ check-flake8: | xargs -- python3 -m flake8 --statistics check-package: - $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` + $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` \ + --ignore-list=$(TOPDIR)/.checkpackageignore .PHONY: .checkpackageignore .checkpackageignore: From peter at korsgaard.com Mon Feb 20 20:59:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:30 -0000 Subject: [Buildroot] [git commit branch/next] package/wireshark: add minizip-zlib optional dependency Message-ID: <20230220205227.01ACE8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8702cecb142e42c6fd522d8256732ec54bab1711 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next minizip-zlib is an optional dependency which is enabled by default since version 3.1.0 and https://github.com/wireshark/wireshark/commit/390071ed0bc8aaf378c3468989ccde1c93817542 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index f7fd72558e..c1efef2280 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -115,6 +115,13 @@ else WIRESHARK_CONF_OPTS += -DENABLE_LZ4=OFF endif +ifeq ($(BR2_PACKAGE_MINIZIP_ZLIB),y) +WIRESHARK_CONF_OPTS += -DENABLE_MINIZIP=ON +WIRESHARK_DEPENDENCIES += minizip-zlib +else +WIRESHARK_CONF_OPTS += -DENABLE_MINIZIP=OFF +endif + ifeq ($(BR2_PACKAGE_NGHTTP2),y) WIRESHARK_CONF_OPTS += -DENABLE_NGHTTP2=ON WIRESHARK_DEPENDENCIES += nghttp2 From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit branch/next] support/testing: test check-package ignore list Message-ID: <20230220205250.60DB381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d631615eb1b833977003039626a0194589334f45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Extend test_check_package to also check the ignore list functionality. Check: - the entries in the ignore list use relative path; - an entry in the ignore list actually ignores the warning; - an outdated entry in the ignore list generates a warning by its own, preventing the ignoring list to grow indefinitely. For this to work, add 3 test fixtures, listing entries for an pre-existing file in the br2-external used in the test. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .../tests/utils/br2-external/.checkpackageignore | 1 + .../utils/br2-external/package/.checkpackageignore | 1 + .../package/.checkpackageignore_outdated | 1 + support/testing/tests/utils/test_check_package.py | 31 ++++++++++++++++++++++ 4 files changed, 34 insertions(+) diff --git a/support/testing/tests/utils/br2-external/.checkpackageignore b/support/testing/tests/utils/br2-external/.checkpackageignore new file mode 100644 index 0000000000..efb7680173 --- /dev/null +++ b/support/testing/tests/utils/br2-external/.checkpackageignore @@ -0,0 +1 @@ +package/external/external.mk PackageHeader diff --git a/support/testing/tests/utils/br2-external/package/.checkpackageignore b/support/testing/tests/utils/br2-external/package/.checkpackageignore new file mode 100644 index 0000000000..5f4a5e1187 --- /dev/null +++ b/support/testing/tests/utils/br2-external/package/.checkpackageignore @@ -0,0 +1 @@ +external/external.mk PackageHeader diff --git a/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated b/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated new file mode 100644 index 0000000000..1df59f3bed --- /dev/null +++ b/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated @@ -0,0 +1 @@ +external/external.mk Indent NewlineAtEof PackageHeader diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index c70ba02324..ce1998753c 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -75,6 +75,12 @@ class TestCheckPackage(unittest.TestCase): generated = int(stderr[1].split()[0]) self.assertGreater(generated, 0) + def assert_no_warnings_generated_for_file(self, stderr): + """Infer from check-package stderr if no warning was generated and fail otherwise.""" + self.assertIn("warnings generated", stderr[1], stderr) + generated = int(stderr[1].split()[0]) + self.assertEqual(generated, 0) + def test_run(self): """Test the various ways the script can be called in a simple top to bottom sequence.""" @@ -201,3 +207,28 @@ class TestCheckPackage(unittest.TestCase): self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) + + # br2-external with ignore list + topdir_path = infra.filepath("tests/utils/br2-external") + topdir_file = os.path.join(topdir_path, "package/external/external.mk") + subdir_path = infra.filepath("tests/utils/br2-external/package") + subdir_file = os.path.join(subdir_path, "external/external.mk") + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore", "-b", topdir_file], + self.WITH_UTILS_IN_PATH, topdir_path) + self.assert_file_was_processed(m) + self.assert_no_warnings_generated_for_file(m) + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore", "-b", subdir_file], + self.WITH_UTILS_IN_PATH, subdir_path) + self.assert_file_was_processed(m) + self.assert_no_warnings_generated_for_file(m) + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore_outdated", "-b", subdir_file], + self.WITH_UTILS_IN_PATH, subdir_path) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: Indent was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + .format(subdir_file), w) + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + .format(subdir_file), w) From peter at korsgaard.com Mon Feb 20 20:59:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:31 -0000 Subject: [Buildroot] [git commit branch/next] package/ulogd: add libdbi support Message-ID: <20230220205227.3106E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b3dbd0183265c3f7da49b0b331688fb7573383f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ulogd/ulogd.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 65280a2ba6..561429599c 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -7,7 +7,6 @@ ULOGD_VERSION = 2.0.8 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files -ULOGD_CONF_OPTS = --disable-dbi ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ libnfnetlink @@ -17,6 +16,12 @@ ULOGD_SELINUX_MODULES = ulogd # DB backends need threads ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ifeq ($(BR2_PACKAGE_LIBDBI),y) +ULOGD_CONF_OPTS += --enable-dbi +ULOGD_DEPENDENCIES += libdbi +else +ULOGD_CONF_OPTS += --disable-dbi +endif ifeq ($(BR2_PACKAGE_MYSQL),y) ULOGD_CONF_OPTS += --enable-mysql ULOGD_DEPENDENCIES += mysql From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit branch/next] Makefile: add target to update .checkpackageignore Message-ID: <20230220205250.6AEAE8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd28acc1e8085c15d12e233090550580dafe1f96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When a developer fixes an ignored warning from check-package, he/she needs to update .checkpackageignore By running './utils/docker-run make check-package' the developer receives a warning about this. Make that change easier to make, by adding a helper target on Makefile. Add an option --failed-only to check-package that generates output in the format: [ ...] This is the very same format used by check-package ignore file. Add the phony target .checkpackageignore So one can update the ignore file using: $ ./utils/docker-run make .checkpackageignore Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- Makefile | 5 +++++ utils/check-package | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f39af5eae9..817cfed13c 100644 --- a/Makefile +++ b/Makefile @@ -1261,6 +1261,11 @@ check-package: -a -not -name '*.orig' -a -not -name '*.rej' \ -exec ./utils/check-package --exclude=Sob {} + +.PHONY: .checkpackageignore +.checkpackageignore: + find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ + -exec ./utils/check-package --exclude=Sob --failed-only {} > .checkpackageignore + + include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) diff --git a/utils/check-package b/utils/check-package index f08e76b374..848311bac8 100755 --- a/utils/check-package +++ b/utils/check-package @@ -63,11 +63,17 @@ def parse_args(): help="do not run the specified functions (debug)") parser.add_argument("--dry-run", action="store_true", help="print the " "functions that would be called for each file (debug)") + parser.add_argument("--failed-only", action="store_true", help="print only" + " the name of the functions that failed (debug)") flags = parser.parse_args() flags.ignore_list = get_ignored_parsers_per_file(flags.intree_only, flags.ignore_filename) + if flags.failed_only: + flags.dry_run = False + flags.verbose = -1 + return flags @@ -221,6 +227,11 @@ def check_file_using_lib(fname): .format(fname, should_fail, flags.ignore_filename)) nwarnings += 1 + if flags.failed_only: + if len(failed) > 0: + f = " ".join(sorted(failed)) + print("{} {}".format(fname, f)) + return nwarnings, nlines @@ -259,7 +270,7 @@ def __main__(): print("{} lines processed".format(total_lines), file=sys.stderr) print("{} warnings generated".format(total_warnings), file=sys.stderr) - if total_warnings > 0: + if total_warnings > 0 and not flags.failed_only: sys.exit(1) From peter at korsgaard.com Mon Feb 6 21:39:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 22:39:15 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: require FindBin perl package for libopenssl Message-ID: <20230220205250.C3FD67FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5aab8c59d5b310540105166e7b48faf3d5bd200b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/5d1/5d10f4f545dccf126e3f5b5efce777a393c5e7bc/ http://autobuild.buildroot.net/results/7c2/7c2df31c6eb34b68e460e092d8c262bdc6c8f25a/ The configure script of (host-)libopenssl needs the FindBin perl module on the host: Can't locate FindBin.pm in @INC (you may need to install the FindBin module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./Configure line 15. BEGIN failed--compilation aborted at ./Configure line 15. As this is needed for both libopenssl and host-libopenssl (which does not have a corresponding config symbol in the .config), we have to require it unconditionally. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 4b5012b807..afd30008e8 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -268,6 +268,7 @@ fi required_perl_modules="Data::Dumper" # Needed to build host-autoconf required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake +required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" From thomas.petazzoni at bootlin.com Mon Feb 20 20:59:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:59:32 -0000 Subject: [Buildroot] [git commit branch/next] package/libgpg-error: add configure option to install gpg-error-config Message-ID: <20230220205227.4F0EF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a22b009992883ad57553ffb3f194303f90ad1a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Upstream commit[1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff;h=0b47de9c719b0ed0da0791f0525de073737bde5a changed behaviour: "gpg-error-config is now only installed when enabled" Fixes: http://autobuild.buildroot.net/results/bc1/bc1566a0fa42f68f1f15f74a61d4081e269e1689/ [1] included in version 1.46, added in buildroot with commit b5bdcb4cc5 Signed-off-by: Bernd Kuhls Reviewed-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/libgpg-error/libgpg-error.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index ab3c7c3bf2..3f4a45a7e4 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -15,6 +15,7 @@ LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LIBGPG_ERROR_CONF_OPTS = \ --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) \ + --enable-install-gpg-error-config \ --disable-tests \ --disable-languages From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit branch/next] Makefile: make check-package assume a git tree Message-ID: <20230220205250.74FDF86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aeec8faf3189b5dde90c465a9b14897406b1fc08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next ... just like check-flake8 already does. When a new check_function is added to check-package, often there are files in the tree that would generate warnings. An example is the Sob check_function for patch files: | $ ./utils/check-package --i Sob $(git ls-files) >/dev/null | 369301 lines processed | 46 warnings generated Currently these warnings are listed when calling check-package directly, and also at the output of pkg-stats, but the check_function does not run on 'make check-package' (that is used to catch regressions on GitLab CI 'check-package' job) until all warnings in the tree are fixed. This (theoretically) allows new .patch files be added without SoB, without the GitLab CI catching it. Since now check-package has an ignore file to list all warnings in the tree, that will eventually be fixed, there is no need to filter the files passed to check-package. So test all files in the tree when 'make check-package' is called. It brings following advantages; - any new check_function added to check-package takes place immediately for new files; - adding new check_functions is less traumatic to the developer doing this, since he/she does not need anymore to fix all warnings in the tree before the new check_function takes effect; - prevent regressions, e.g. ANY new .patch file must have SoB; - as a side-effect, print a single statistics line as output of 'make ckeck-package'. But just enabling the check would generate many warnings when 'make check-package' is called, so update the ignore file by using: $ ./utils/docker-run make .checkpackageignore Notice: in order to ensure reproducible results, one should run 'make check-package' and 'make .checkpackageignore' inside the docker image, otherwise a variation in shellcheck version (installed in the host) can produce different results. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 8 +-- 2 files changed, 183 insertions(+), 5 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index e69de29bb2..b1f2d99b99 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -0,0 +1,180 @@ +package/alsamixergui/0001-misc-fixes.patch Sob +package/am33x-cm3/S93-am335x-pm-firmware-load Variables +package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch Sob +package/apache/S50apache Indent Shellcheck Variables +package/at/S99at Indent Variables +package/audit/S02auditd Shellcheck Variables +package/avahi/S05avahi-setup.sh Indent Variables +package/avahi/S50avahi-daemon Indent Variables +package/babeld/S50babeld Indent Shellcheck Variables +package/bind/S81named Indent Shellcheck Variables +package/bluez5_utils/S40bluetooth NotExecutable Variables +package/boinc/S99boinc-client Indent Shellcheck Variables +package/brickd/S70brickd Indent Shellcheck Variables +package/brltty/S10brltty Indent Shellcheck Variables +package/busybox/S02sysctl Variables +package/busybox/S10mdev ConsecutiveEmptyLines Indent Shellcheck +package/busybox/S15watchdog Indent Variables +package/busybox/S50telnet Indent Shellcheck Variables +package/c-icap/S96cicap Indent Shellcheck Variables +package/cfm/S65cfm Indent Variables +package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables +package/chrony/S49chrony Indent Shellcheck Variables +package/connman/S45connman Variables +package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob +package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob +package/curlftpfs/0003-nocache-memleak-fix.patch Sob +package/dante/S50dante Indent Shellcheck Variables +package/darkhttpd/S50darkhttpd Indent Shellcheck Variables +package/dbus/S30dbus Indent Shellcheck TrailingSpace Variables +package/dcron/S90dcron Variables +package/dhcp/S80dhcp-relay Shellcheck Variables +package/dhcp/S80dhcp-server Shellcheck Variables +package/dhcpcd/S41dhcpcd Indent Variables +package/dhrystone/0001-cmdline-nruns.patch Sob +package/dhrystone/0002-HZ.patch Sob +package/dhrystone/0003-exit.patch Sob +package/dhrystone/0004-headers.patch Sob +package/dhrystone/0005-prototypes.patch Sob +package/directfb-examples/0001-remove-bzero.patch Sob +package/dmraid/S20dmraid Variables +package/dnsmasq/S80dnsmasq Shellcheck Variables +package/docker-engine/S60dockerd Indent Shellcheck Variables +package/domoticz/S99domoticz Shellcheck +package/dropbear/S50dropbear Indent Shellcheck Variables +package/earlyoom/S02earlyoom Indent Shellcheck +package/ejabberd/S50ejabberd Indent Shellcheck Variables +package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables +package/exim/S86exim Indent Variables +package/fail2ban/S60fail2ban Shellcheck Variables +package/fbv/0001-cross.patch Sob +package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob +package/fbv/0005-include.patch Sob +package/freescale-imx/imx-uuc/S80imx-uuc Indent Shellcheck Variables +package/frr/S50frr Shellcheck +package/gamin/0002-no-const-return.patch Sob +package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch Sob +package/genromfs/0001-build-system.patch Sob +package/gerbera/S99gerbera Indent +package/gpsd/S50gpsd Indent Shellcheck Variables +package/haveged/S21haveged Shellcheck Variables +package/htpdate/S43htpdate Shellcheck +package/i2pd/S99i2pd Indent Shellcheck Variables +package/ifplugd/0001-cross.patch Sob +package/ifplugd/0002-fix-headers.patch Sob +package/ifupdown-scripts/S40network EmptyLastLine Indent Shellcheck Variables +package/igd2-for-linux/S99upnpd Indent Shellcheck Variables +package/inadyn/S70inadyn Indent NotExecutable +package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Variables +package/iptables/S35iptables Shellcheck +package/irda-utils/0001-daemon.patch Sob +package/irda-utils/0002-nommu.patch Sob +package/irda-utils/0003-subdir.patch Sob +package/irqbalance/S13irqbalance Indent Shellcheck Variables +package/iucode-tool/S00iucode-tool Variables +package/iwd/S40iwd Shellcheck Variables +package/keyutils/0002-cifs.patch Sob +package/kodi/S50kodi Shellcheck Variables +package/libart/0001-art-config-cross.patch Sob +package/libcgicc/0001-disable-documentation-option.patch Sob +package/libfcgi/0002-disable-examples.patch Sob +package/libftdi/0001-pkgconfig_libusb.patch Sob +package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch Sob +package/libiio/S99iiod Shellcheck Variables +package/libmad/0001-mips-h-constraint-removal.patch Sob +package/lighttpd/S50lighttpd EmptyLastLine Indent Shellcheck Variables +package/linux-tools/S10hyperv Indent Variables +package/linuxptp/S65ptp4l Indent Shellcheck +package/linuxptp/S66phc2sys Indent Shellcheck +package/lirc-tools/S25lircd Indent Variables +package/lite/0001-dfbspy-stat.patch Sob +package/lite/0002-no-tests.patch Sob +package/lite/0003-pkg-config.patch Sob +package/lldpd/S60lldpd Indent Shellcheck Variables +package/lockfile-progs/0001-sus3v-legacy.patch Sob +package/madplay/0001-switch-to-new-alsa-api.patch Sob +package/mariadb/S97mysqld Indent Shellcheck Variables +package/mender-connect/S43mender-connect Shellcheck +package/mii-diag/0001-strchr.patch Sob +package/minidlna/S60minidlnad Indent Shellcheck Variables +package/minissdpd/S50minissdpd Indent Shellcheck Variables +package/modem-manager/S44modem-manager Shellcheck Variables +package/mosquitto/S50mosquitto Indent Shellcheck Variables +package/motion/S99motion Indent Shellcheck Variables +package/mpd/S95mpd Variables +package/mrouted/S41mrouted NotExecutable +package/mrp/S65mrp Indent Variables +package/multipath-tools/S60multipathd Shellcheck +package/neard/S53neard Indent Shellcheck Variables +package/netatalk/S50netatalk EmptyLastLine Indent Variables +package/netcat/0001-signed-bit-counting.patch Sob +package/netopeer2/S52netopeer2 Shellcheck Variables +package/netplug/0001-makefile-flags.patch Sob +package/netplug/S29netplug Indent Shellcheck Variables +package/netsnmp/S59snmpd Indent Shellcheck Variables +package/network-manager/S45network-manager ConsecutiveEmptyLines EmptyLastLine Shellcheck Variables +package/nfs-utils/S60nfs ConsecutiveEmptyLines Shellcheck Variables +package/nginx/S50nginx Indent Variables +package/nodm/S90nodm Indent Shellcheck Variables +package/nss-pam-ldapd/S45nslcd EmptyLastLine Indent Shellcheck Variables +package/ntp/S49ntp.in Variables +package/ofono/S46ofono Variables +package/olsr/S50olsr Indent Shellcheck Variables +package/openntpd/S49ntp Shellcheck Variables +package/openssh/S50sshd EmptyLastLine Indent Variables +package/openvpn/S60openvpn Indent Shellcheck Variables +package/oracle-mysql/S97mysqld Shellcheck Variables +package/owfs/S55owserver Shellcheck Variables +package/owfs/S60owfs Shellcheck Variables +package/pigpio/S50pigpio Shellcheck Variables +package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob +package/postgresql/S50postgresql Variables +package/procps-ng/S02sysctl Variables +package/proftpd/S50proftpd Indent Shellcheck Variables +package/prosody/S50prosody Indent Shellcheck Variables +package/ptpd/S65ptpd Indent Shellcheck Variables +package/ptpd2/S65ptpd2 Indent Shellcheck Variables +package/pulseaudio/S50pulseaudio ConsecutiveEmptyLines EmptyLastLine Indent Variables +package/python-web2py/S51web2py Shellcheck Variables +package/rdesktop/0001-8bit-colors.patch Sob +package/redis/S50redis Shellcheck Variables +package/restorecond/S02restorecond Shellcheck +package/rng-tools/S21rngd Shellcheck Variables +package/rpcbind/S30rpcbind EmptyLastLine Indent Variables +package/rubix/0002-misc-fixes.patch Sob +package/rygel/S99rygel Indent Shellcheck Variables +package/samba4/S91smb Indent Shellcheck Variables +package/seatd/S70seatd NotExecutable Variables +package/ser2net/S50ser2net Indent Shellcheck Variables +package/shairport-sync/S99shairport-sync Indent Shellcheck Variables +package/smcroute/S41smcroute Indent NotExecutable Variables +package/smstools3/S50smsd Shellcheck Variables +package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch Sob +package/squid/S97squid Indent Shellcheck Variables +package/sshguard/S49sshguard Indent +package/sslh/S35sslh Indent Shellcheck Variables +package/stunnel/S50stunnel Indent Shellcheck Variables +package/supervisor/S99supervisord Variables +package/suricata/S99suricata Shellcheck +package/sysrepo/S51sysrepo-plugind Indent Shellcheck +package/targetcli-fb/S50target Shellcheck Variables +package/tcf-agent/S55tcf-agent Shellcheck Variables +package/tftpd/S80tftpd-hpa Indent Shellcheck Variables +package/ti-gfx/S80ti-gfx Shellcheck Variables +package/ti-sgx-um/S80ti-sgx Variables +package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables +package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables +package/triggerhappy/S10triggerhappy Indent Shellcheck Variables +package/tvheadend/S99tvheadend Indent Shellcheck Variables +package/unbound/S70unbound Shellcheck +package/unscd/S46unscd Indent Shellcheck Variables +package/upmpdcli/S99upmpdcli Indent Shellcheck Variables +package/urandom-scripts/S20urandom Variables +package/usbguard/S20usbguard Indent Shellcheck Variables +package/vsftpd/S70vsftpd Indent Shellcheck Variables +package/watchdogd/S01watchdogd Indent NotExecutable +package/x11r7/xapp_xdm/S99xdm Indent Variables +package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob +package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob +package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob +package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables diff --git a/Makefile b/Makefile index 817cfed13c..49ee4ff119 100644 --- a/Makefile +++ b/Makefile @@ -1257,14 +1257,12 @@ check-flake8: | xargs -- python3 -m flake8 --statistics check-package: - find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ - -a -not -name '*.orig' -a -not -name '*.rej' \ - -exec ./utils/check-package --exclude=Sob {} + + $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` .PHONY: .checkpackageignore .checkpackageignore: - find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ - -exec ./utils/check-package --exclude=Sob --failed-only {} > .checkpackageignore + + $(Q)./utils/check-package --failed-only `git ls-tree -r --name-only HEAD` \ + > .checkpackageignore include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) From peter at korsgaard.com Mon Feb 20 20:59:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:33 -0000 Subject: [Buildroot] [git commit branch/next] package/wireshark: bump to version 4.0.2 Message-ID: <20230220205227.215328648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4aca99f51cc97cfc3bcd3affa65f4694004dd444 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - pcre2 is mandatory since version 3.7.0 and https://github.com/wireshark/wireshark/commit/b9f2e4b7fa091719b93f6256ac34be8e32bd8e94 - Set HAVE_C99_VSNPRINTF to avoid a build failure due to check_c_source_runs - DISABLE_WERROR was renamed to ENABLE_WERROR 4.x series is the new stable release https://www.wireshark.org/news/20221207.html https://www.wireshark.org/docs/relnotes/wireshark-4.0.2.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/Config.in | 1 + package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in index cd92beb1d1..8b05599ecb 100644 --- a/package/wireshark/Config.in +++ b/package/wireshark/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_WIRESHARK select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_SPEEXDSP help Network traffic sniffer and protocol decoder. diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 56363e717f..ae06ab09b7 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.16.txt -sha1 b0e64d5fdd6701106d94bdc8f59dd40a34c7c807 wireshark-3.4.16.tar.xz -sha256 6acb3155b89b65bcdbcdac7a9e6a59013a6e21d8ae6a8249a9af4fe9ce3d91ba wireshark-3.4.16.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.2.txt +sha1 0127180ff18515b086fe5603f767f53ddaa64c1a wireshark-4.0.2.tar.xz +sha256 f35915699f2f9b28ddb211202d40ec8984e5834d3c911483144a4984ba44411d wireshark-4.0.2.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index d9314fb211..ee3d6b1905 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.16 +WIRESHARK_VERSION = 4.0.2 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license @@ -18,13 +18,15 @@ WIRESHARK_DEPENDENCIES = \ libgcrypt \ libglib2 \ libpcap \ + pcre2 \ speexdsp WIRESHARK_CONF_OPTS = \ - -DDISABLE_WERROR=ON \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ + -DENABLE_WERROR=OFF \ + -DHAVE_C99_VSNPRINTF=ON \ -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) From thomas.petazzoni at bootlin.com Mon Feb 6 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit branch/next] fs/cpio: allow users to provide their own dracut modules Message-ID: <20230220205250.DC17386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb6e466c102306cfcb1b459d91aa5440f6b8a621 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Dracut modules can only be looked for in HOST_DIR/lib/dracut/modules.d/ as dracut does not offer the possibility to look elsewhere. Installing files in HOST_DIR/ can do done either from a host-package, or via a post-built script; there is no overlay like there is for target/. This is a bit cumbersome. Additional modules are most probably developped in a relatively tight loop with the configuration files, so it makes sense to expose both close together. Add an option to the fs/cpio filesystem, so users can point to a list of modules to install. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Thierry Bultel Cc: Adam Duskett Signed-off-by: Thomas Petazzoni --- fs/cpio/Config.in | 5 +++++ fs/cpio/cpio.mk | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in index bec2d9dca2..4d38276c88 100644 --- a/fs/cpio/Config.in +++ b/fs/cpio/Config.in @@ -29,6 +29,11 @@ endchoice if BR2_TARGET_ROOTFS_CPIO_DRACUT +config BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES + string "extra dracut modules" + help + Space-separated list of directories containing dracut modules. + config BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES string "dracut configuration files" default "fs/cpio/dracut.conf" diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk index 061f4a18f1..00ab6a8f82 100644 --- a/fs/cpio/cpio.mk +++ b/fs/cpio/cpio.mk @@ -50,6 +50,13 @@ else ifeq ($(BR2_TARGET_ROOTFS_CPIO_DRACUT),y) ROOTFS_CPIO_DEPENDENCIES += host-dracut +ROOTFS_CPIO_DRACUT_MODULES = $(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES)) +ifeq ($(BR_BUILDING),y) +ifneq ($(words $(ROOTFS_CPIO_DRACUT_MODULES)),$(words $(sort $(notdir $(ROOTFS_CPIO_DRACUT_MODULES))))) +$(error No two dracut modules can have the same basename, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES setting) +endif +endif + ROOTFS_CPIO_DRACUT_CONF_FILES = $(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES)) ifeq ($(BR_BUILDING),y) ifeq ($(ROOTFS_CPIO_DRACUT_CONF_FILES),) @@ -68,11 +75,14 @@ ROOTFS_CPIO_OPTS += --no-kernel endif define ROOTFS_CPIO_CMD - mkdir -p $(ROOTFS_CPIO_DIR)/tmp $(ROOTFS_CPIO_DIR)/confdir + mkdir -p $(ROOTFS_CPIO_DIR)/tmp $(ROOTFS_CPIO_DIR)/confdir $(HOST_DIR)/lib/dracut/modules.d touch $(ROOTFS_CPIO_DIR)/empty-config $(foreach cfg,$(ROOTFS_CPIO_DRACUT_CONF_FILES), \ cp $(cfg) $(ROOTFS_CPIO_DIR)/confdir/$(notdir $(cfg)) ) + $(foreach m,$(ROOTFS_CPIO_DRACUT_MODULES), \ + cp -a $(m)/* $(HOST_DIR)/lib/dracut/modules.d/ + ) $(HOST_DIR)/bin/dracut \ $(ROOTFS_CPIO_OPTS) \ -c $(ROOTFS_CPIO_DIR)/empty-config \ From peter at korsgaard.com Mon Feb 20 20:59:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:34 -0000 Subject: [Buildroot] [git commit branch/next] package/libnss: bump version to 3.87 Message-ID: <20230220205227.5DB8E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c8eefa6a4e2a40ee9b832d5f1e71bf4ddfd9f1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 50c5e583af..f847ec4f77 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_86_RTM/src/SHA256SUMS -sha256 3f385fc686476bbba811035fa6821b542475d55747b18c20c221d4d66573b975 nss-3.86.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_87_RTM/src/SHA256SUMS +sha256 68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d nss-3.87.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index cee0e596a1..90fd9259d5 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.86 +LIBNSS_VERSION = 3.87 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 peter at korsgaard.com Mon Feb 6 22:32:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 23:32:13 +0100 Subject: [Buildroot] [git commit branch/next] package/libcamera: bump to version 0.0.4 Message-ID: <20230220205251.1685E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce3d349384f4d80ed8fc50a82ff864bd5bcf6375 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcus Folkesson Reviewed-by: Quentin Schulz Signed-off-by: Peter Korsgaard --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 033e318910..ea204aee98 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 d7100286616550aca487b46ae9de2a70bb471352a332b8214901b4148739990f libcamera-v0.0.3-br1.tar.gz +sha256 13e53b33652b16454264b6eff0a6f032aa9331f919b07b6d0e622917ed7f7dd8 libcamera-v0.0.4-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 8979a43aca..01c4cb2ff2 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = v0.0.3 +LIBCAMERA_VERSION = v0.0.4 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ From peter at korsgaard.com Mon Feb 20 20:59:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:35 -0000 Subject: [Buildroot] [git commit branch/next] package/fmlib: bump to version LSDK-21.08 Message-ID: <20230220205227.6FBD38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b68271287d470f4dfeab074a1222da869328f4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next License file was updated in commit: https://github.com/nxp-qoriq/fmlib/commit/22126510006f366981c078a340e012a1e0415429 Notable changes in the license update are: - GPL-2.0+ option was removed, - Copyright years updated, - NXP was added, - License text was reflowed. Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/fmlib/fmlib.hash | 4 ++-- package/fmlib/fmlib.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/fmlib/fmlib.hash b/package/fmlib/fmlib.hash index d4dcf3be5c..f81b017869 100644 --- a/package/fmlib/fmlib.hash +++ b/package/fmlib/fmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6e9e6bdb42dc2a6a76cfd756a2d4cdfcc2be90925c1f439e8a11eafa871896a6 fmlib-43fa98fdbf0c697167e415c3f060896d5b482791.tar.gz -sha256 837559e20d83910a005e7883b876cc5c42805fe4abcf7e5c5b3c8d036b7f61c8 COPYING +sha256 64dc76c0adc3aa58bce6aba470dee7dee001d4964ccb1958e899a59d9917b21d fmlib-LSDK-21.08.tar.gz +sha256 5d7770fa9f70f0c6f0b4784bbca8401811259a4b1e03455dbd863ffd0d34d2ca COPYING diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk index 9509f3de56..3d185979d5 100644 --- a/package/fmlib/fmlib.mk +++ b/package/fmlib/fmlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -FMLIB_VERSION = 43fa98fdbf0c697167e415c3f060896d5b482791 +FMLIB_VERSION = LSDK-21.08 FMLIB_SITE = $(call github,nxp-qoriq,fmlib,$(FMLIB_VERSION)) -FMLIB_LICENSE = BSD-3-Clause, GPL-2.0+ +FMLIB_LICENSE = BSD-3-Clause FMLIB_LICENSE_FILES = COPYING FMLIB_DEPENDENCIES = linux FMLIB_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Tue Feb 7 08:31:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:31:41 +0100 Subject: [Buildroot] [git commit branch/next] support/tests: allow top-level parallel builds Message-ID: <20230220205251.34CAC8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c41fb6225632ecea0b7008969bb70cf8e2636ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Running tests with top-level parallel builds can speed up running some tests, expecially those that have a lot of packages like the systemd init tests. Trigger TLPB when the configuration enables per-package directories. We're using the jlevel argument, which normally is used for BR2_JLEVEL as the value for calling make -j at the top-level. In fact, BR2_JLEVEL is "unused" when using TLPB, because the top-level make acts as the job server that distributes tokens to sub-makes (except for the few build systems like waf or scons that don't support this), so it's really the top-level make -j that determines the level of parallelism, and BR2_JLEVEL doesn't really have an effect. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni [Thomas: extend explanation a bit] Signed-off-by: Thomas Petazzoni --- support/testing/infra/basetest.py | 2 +- support/testing/infra/builder.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 45bcd4c2e2..670c7213d6 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -52,7 +52,7 @@ class BRConfigTest(unittest.TestCase): def setUp(self): self.show_msg("Starting") - self.b = Builder(self.config, self.builddir, self.logtofile) + self.b = Builder(self.config, self.builddir, self.logtofile, self.jlevel) if not self.keepbuilds: self.b.delete() diff --git a/support/testing/infra/builder.py b/support/testing/infra/builder.py index 922a707220..a2abb9ed89 100644 --- a/support/testing/infra/builder.py +++ b/support/testing/infra/builder.py @@ -6,11 +6,12 @@ import infra class Builder(object): - def __init__(self, config, builddir, logtofile): + def __init__(self, config, builddir, logtofile, jlevel=None): self.config = '\n'.join([line.lstrip() for line in config.splitlines()]) + '\n' self.builddir = builddir self.logfile = infra.open_log_file(builddir, "build", logtofile) + self.jlevel = jlevel def is_defconfig_valid(self, configfile, defconfig): """Check if the .config is contains all lines present in the defconfig.""" @@ -87,6 +88,8 @@ class Builder(object): env.update(make_extra_env) cmd = ["make", "-C", self.builddir] + if "BR2_PER_PACKAGE_DIRECTORIES=y" in self.config.splitlines() and self.jlevel: + cmd.append(f"-j{self.jlevel}") cmd += make_extra_opts ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, From peter at korsgaard.com Mon Feb 20 20:59:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:36 -0000 Subject: [Buildroot] [git commit branch/next] package/fmc: bump to version LSDK-21.08 Message-ID: <20230220205227.80D30828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c943cb38e4174cd349b4bb80e5e16269b25079d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This commit also updates the sed pattern, as the default platform was changed in: https://github.com/nxp-qoriq/fmc/commit/4377bfc24626a0db3bedb6e1cbb201f6f6df964c Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/fmc/fmc.hash | 2 +- package/fmc/fmc.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fmc/fmc.hash b/package/fmc/fmc.hash index 7309562b09..961ce18ac7 100644 --- a/package/fmc/fmc.hash +++ b/package/fmc/fmc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e8594e37eb81e5b1f492f8494b98086f65180637b1e2e08d8a4475c23653a404 fmc-a079d2c844edd85dff85a317a63198e7988bcd09.tar.gz +sha256 a58514816108a16d07307f924ebceb67c7d61709e4449978763fc44ed6e1fc44 fmc-LSDK-21.08.tar.gz sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 COPYING diff --git a/package/fmc/fmc.mk b/package/fmc/fmc.mk index 6ac8c768df..4f25545ffd 100644 --- a/package/fmc/fmc.mk +++ b/package/fmc/fmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMC_VERSION = a079d2c844edd85dff85a317a63198e7988bcd09 +FMC_VERSION = LSDK-21.08 FMC_SITE = $(call github,nxp-qoriq,fmc,$(FMC_VERSION)) FMC_LICENSE = MIT FMC_LICENSE_FILES = COPYING @@ -26,7 +26,7 @@ endif FMC_PLATFORM = $(call qstrip,$(BR2_PACKAGE_FMLIB_PLATFORM)) define FMC_BUILD_CMDS - $(SED) "s:P4080:$(FMC_PLATFORM):g" $(@D)/source/Makefile + $(SED) "s:LS1043:$(FMC_PLATFORM):g" $(@D)/source/Makefile # The linking step has dependency issues so using MAKE1 $(TARGET_MAKE_ENV) $(MAKE1) $(FMC_MAKE_OPTS) -C $(@D)/source endef From thomas.petazzoni at bootlin.com Tue Feb 7 09:05:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:05:19 +0100 Subject: [Buildroot] [git commit branch/next] configs/beaglebone: bump U-Boot version to 2022.10 Message-ID: <20230220205251.5D7D78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=588ccf38618e1d9401f6636c7565424d438a51b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Starting from version 2021.10 only distro booting is supported, as reported by commit ff8f277e9121 ("ti: am335x_evm: Switch to DISTRO_BOOT only"). The patch allows to update U-Boot to versions later than 2021.10. Tested on beaglebone black. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- board/beaglebone/extlinux.conf | 4 ++++ board/beaglebone/genimage.cfg | 1 + board/beaglebone/post-build.sh | 2 ++ configs/beaglebone_defconfig | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/board/beaglebone/extlinux.conf b/board/beaglebone/extlinux.conf new file mode 100644 index 0000000000..13affcabd4 --- /dev/null +++ b/board/beaglebone/extlinux.conf @@ -0,0 +1,4 @@ +label beaglebone-buildroot + kernel /zImage + fdtdir / + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index 987d205075..4b026fda84 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -12,6 +12,7 @@ image boot.vfat { "am335x-bonegreen.dtb", "am335x-boneblack-wireless.dtb", "am335x-bonegreen-wireless.dtb", + "extlinux" } } diff --git a/board/beaglebone/post-build.sh b/board/beaglebone/post-build.sh index ffdd19138c..b7afd92ffe 100755 --- a/board/beaglebone/post-build.sh +++ b/board/beaglebone/post-build.sh @@ -2,3 +2,5 @@ BOARD_DIR="$(dirname $0)" cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 3ce5721265..d0aa5ad860 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -34,7 +34,7 @@ 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="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set From peter at korsgaard.com Mon Feb 20 20:59:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:37 -0000 Subject: [Buildroot] [git commit branch/next] configs/sipeed_lichee_rv_defconfig: use OpenSBI 1.2 Message-ID: <20230220205227.A8C38828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f9a31bb8ce5567c8b3a59e50c44302f69788e02 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- configs/sipeed_lichee_rv_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sipeed_lichee_rv_defconfig b/configs/sipeed_lichee_rv_defconfig index f03a6b4f69..750d2d6e3b 100644 --- a/configs/sipeed_lichee_rv_defconfig +++ b/configs/sipeed_lichee_rv_defconfig @@ -15,7 +15,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y From thomas.petazzoni at bootlin.com Tue Feb 7 09:05:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:05:19 +0100 Subject: [Buildroot] [git commit branch/next] configs/beaglebone: bump Linux version to 5.10.162-ti-r56 Message-ID: <20230220205251.52EB586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=010de6d5c7e2ebafe08234e32818bc0db2ebc569 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The previous version failed to boot from sd card with a log reported by the document [1]. In my case it always failed, a 100% failure against 75% reported by the document. Instead of adding the patch to fix the problem, I preferred to update the kernel version. Tested on beaglebone black. [1] https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- configs/beaglebone_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 639b491e97..3ce5721265 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.162-ti-r56)/linux-5.10.162-ti-r56.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" From peter at korsgaard.com Mon Feb 20 20:59:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:38 -0000 Subject: [Buildroot] [git commit branch/next] package/qemu: pixman only used for system emulation Message-ID: <20230220205227.907E68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0a428f135e1b220f8fc6043a7a1b8067f3bb8e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When we initially introduced the target qemu in 98e1a6b9619c (package/qemu: build for the target (i386 or x86_64 only)), we unconditionally enabled all the system and user emulation without distinction, so pixman was made a mandatory dependency. However, soon afterwards, in 68ec49acc7be (package/qemu: add basic target selection), we added an option to enable/disable the system emulation, but the dependency on pixman was not moved to that new option. Fix that now, and only depend on pixman when system emulation is enabled. Signed-off-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- package/qemu/Config.in | 2 +- package/qemu/qemu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 2bbc6a14c0..154b98a541 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -25,7 +25,6 @@ menuconfig BR2_PACKAGE_QEMU depends on BR2_USE_WCHAR # gettext depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_ZLIB select BR2_PACKAGE_QEMU_TOOLS if !BR2_PACKAGE_QEMU_SYSTEM && !BR2_PACKAGE_QEMU_LINUX_USER help @@ -53,6 +52,7 @@ comment "Emulators selection" config BR2_PACKAGE_QEMU_SYSTEM bool "Enable systems emulation" depends on !BR2_STATIC_LIBS # dtc + select BR2_PACKAGE_PIXMAN help Say 'y' to build system emulators/virtualisers. diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 5c7a8d504c..58b4ff10a5 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -27,7 +27,6 @@ QEMU_DEPENDENCIES = \ host-pkgconf \ host-python3 \ libglib2 \ - pixman \ zlib # Need the LIBS variable because librt and libm are @@ -45,6 +44,7 @@ QEMU_VARS = LIBTOOL=$(HOST_DIR)/bin/libtool # checks if the specified sub-set is valid. ifeq ($(BR2_PACKAGE_QEMU_SYSTEM),y) +QEMU_DEPENDENCIES += pixman QEMU_OPTS += --enable-system QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64) += aarch64-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ALPHA) += alpha-softmmu From peter at korsgaard.com Tue Feb 7 09:06:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 10:06:28 +0100 Subject: [Buildroot] [git commit branch/next] support/testing: test_check_package.py: fix flake8 line length error Message-ID: <20230220205251.67D6E86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63da115085ca0cb369ab3c644200ba4b025da48b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit d631615eb1b8 (support/testing: test check-package ignore list) added a too long line causing the check-flake8 target to fail: support/testing/tests/utils/test_check_package.py:233:133: E501 line too long (138 > 132 characters) https://gitlab.com/buildroot.org/buildroot/-/jobs/3726245521 Signed-off-by: Peter Korsgaard --- support/testing/tests/utils/test_check_package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index ce1998753c..580ad56d42 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -230,5 +230,6 @@ class TestCheckPackage(unittest.TestCase): self.assert_warnings_generated_for_file(m) self.assertIn("{}:0: Indent was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" .format(subdir_file), w) - self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update " + ".checkpackageignore_outdated?" .format(subdir_file), w) From peter at korsgaard.com Mon Feb 20 20:59:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:40 -0000 Subject: [Buildroot] [git commit branch/next] configs/sipeed_lichee_rv_dock_defconfig: use OpenSBI 1.2 Message-ID: <20230220205227.B80A286496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1d22c7331d5888c4d1bac0504e35862d72829fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard Reviewed-by: Julien Olivain Tested-by: Julien Olivain Signed-off-by: Peter Korsgaard --- configs/sipeed_lichee_rv_dock_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sipeed_lichee_rv_dock_defconfig b/configs/sipeed_lichee_rv_dock_defconfig index 807209eeec..a228cd8cb7 100644 --- a/configs/sipeed_lichee_rv_dock_defconfig +++ b/configs/sipeed_lichee_rv_dock_defconfig @@ -23,7 +23,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y From thomas.petazzoni at bootlin.com Mon Feb 6 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit branch/next] package/mesa3d-demos: bump version to 8.5.0 Message-ID: <20230220205250.F18238648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa75c4a3054e0cd3457f9e50deb1b9c06325c242 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The package build system changed from autotools to meson. Autotools was deprecated in commit [1], which is included in this 8.5.0 version. It was definitevely removed soon after, in commit [2]. The package patch file making libgl optional was fully rewritten for meson. This patch also updates the old ftp _SITE url to the new https one, published in the project README.rst file. See [3]. This patch also removes openvg and freetype2 dependencies, as their support was removed in commit [4]. The 'gbm' option is removed, and the option 'libdrm' is added. The md5 and sha1 entries in hash files are also removed, to keep only sha256 and sha512 from the release announce email [5]. For change log, see the release announce [5]. [1] https://gitlab.freedesktop.org/mesa/demos/-/commit/2df8e9710834c3b42ce5cfb67b7662c110ab904e [2] https://gitlab.freedesktop.org/mesa/demos/-/commit/abfead37587f1f2e124bdfcde755b6e90421b538 [3] https://gitlab.freedesktop.org/mesa/demos/-/blob/mesa-demos-8.5.0/README.rst [4] https://gitlab.freedesktop.org/mesa/demos/-/commit/e6d0d9a8682c544870fd41983ea2e0484b9767b1 [5] https://lists.freedesktop.org/archives/mesa-announce/2022-May/000677.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...-demos-makes-opengl-an-optional-component.patch | 157 +++++++++++---------- package/mesa3d-demos/mesa3d-demos.hash | 8 +- package/mesa3d-demos/mesa3d-demos.mk | 56 ++++---- 3 files changed, 112 insertions(+), 109 deletions(-) diff --git a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch index b328fca810..e51b6f1a2a 100644 --- a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch +++ b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch @@ -1,88 +1,101 @@ -From bb0ffae7164d296d32da24fa5499534de259169a Mon Sep 17 00:00:00 2001 -From: Spenser Gilliland -Date: Sat, 24 Feb 2018 11:36:17 +0100 +From 9ec9f7b4d0ef5e799ca4cc5103163e4630d184d8 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 16 Sep 2022 22:30:59 +0200 Subject: [PATCH] demos: makes opengl an optional component -Signed-off-by: Spenser Gilliland -[Romain: convert to git patch, rebase on 8.4.0] -Signed-off-by: Romain Naour +This patch is a port of [1] for the new meson build system. + +[1]. +https://git.busybox.net/buildroot/tree/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch?h=2022.08 + +Signed-off-by: Julien Olivain --- - configure.ac | 12 +++++++++++- - src/egl/opengl/Makefile.am | 2 ++ - src/util/Makefile.am | 2 ++ - 3 files changed, 15 insertions(+), 1 deletion(-) + meson.build | 19 ++++++++++++------- + meson_options.txt | 1 + + src/egl/meson.build | 5 ++++- + src/meson.build | 4 +++- + 4 files changed, 20 insertions(+), 9 deletions(-) -diff --git a/configure.ac b/configure.ac -index 0b5e9a76..24298c44 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -51,6 +51,14 @@ m4_ifndef([PKG_PROG_PKG_CONFIG], - ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])]) - PKG_PROG_PKG_CONFIG() +diff --git a/meson.build b/meson.build +index e1968fab..a15699d6 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,7 +38,10 @@ add_project_arguments( + dep_m = cc.find_library('m', required : false) + dep_winmm = cc.find_library('winmm', required : false) -+AC_ARG_ENABLE([gl], -+ [AS_HELP_STRING([--enable-gl], -+ [enable GL library @<:@default=no@:>@])], -+ [gl_enabled="$enableval"], -+ [gl_enabled=auto]) -+ -+if test "x$gl_enabled" != "xno"; then -+ - dnl Get the pkg-config definitions for libGL. We include a fallback - dnl path for GL implementation that don't provide a .pc file - PKG_CHECK_MODULES(GL, [gl], [], [ -@@ -112,6 +120,8 @@ PKG_CHECK_MODULES(GLU, [glu], [], - DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" - DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" +-dep_gl = dependency('gl') ++dep_gl = dependency('gl', required : get_option('gl')) ++if not dep_gl.found() ++ add_project_arguments('-DEGL_NO_X11=1', language: 'c') ++endif -+fi -+ - AC_ARG_ENABLE([egl], - [AS_HELP_STRING([--enable-egl], - [enable EGL library @<:@default=auto@:>@])], -@@ -302,7 +312,7 @@ AC_SUBST([MESA_GLAPI]) - AC_SUBST([WAYLAND_CFLAGS]) - AC_SUBST([WAYLAND_LIBS]) + dep_gles1 = dependency('glesv1_cm', required : get_option('gles1')) + dep_gles2 = dependency('glesv2', required : get_option('gles2')) +@@ -75,13 +78,15 @@ endif -- -+AM_CONDITIONAL(HAVE_GL, test "x$gl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") -diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am -index 6d184ff6..219ab850 100644 ---- a/src/egl/opengl/Makefile.am -+++ b/src/egl/opengl/Makefile.am -@@ -56,6 +56,7 @@ endif - endif + dep_threads = dependency('threads') - if HAVE_EGL -+if HAVE_GL - bin_PROGRAMS = \ - eglinfo - noinst_PROGRAMS = \ -@@ -64,6 +65,7 @@ noinst_PROGRAMS = \ - $(EGL_X11_DEMOS) \ - $(EGL_WL_DEMOS) +-dep_glu = dependency('glu', required : dep_x11.found()) +-if not dep_glu.found() +- _glu_name = 'GLU' +- if host_machine.system() == 'windows' +- _glu_name = 'glu32' ++if dep_gl.found() ++ dep_glu = dependency('glu', required : dep_x11.found()) ++ if not dep_glu.found() ++ _glu_name = 'GLU' ++ if host_machine.system() == 'windows' ++ _glu_name = 'glu32' ++ endif ++ dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h') + endif +- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h') endif + + # GBM is needed for EGL on KMS +diff --git a/meson_options.txt b/meson_options.txt +index ddadd2e3..f5405698 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,5 +1,6 @@ + option('with-glut', type : 'string') + option('egl', type : 'feature') ++option('gl', type : 'feature') + option('gles1', type : 'feature') + option('gles2', type : 'feature') + option('osmesa', type : 'feature') +diff --git a/src/egl/meson.build b/src/egl/meson.build +index d1846921..42bf8ecd 100644 +--- a/src/egl/meson.build ++++ b/src/egl/meson.build +@@ -19,7 +19,10 @@ + # SOFTWARE. + + subdir('eglut') +-subdir('opengl') ++ ++if dep_gl.found() ++ subdir('opengl') +endif - egltri_x11_SOURCES = egltri.c - eglgears_x11_SOURCES = eglgears.c -diff --git a/src/util/Makefile.am b/src/util/Makefile.am -index 759a293a..012b9c75 100644 ---- a/src/util/Makefile.am -+++ b/src/util/Makefile.am -@@ -27,7 +27,9 @@ AM_CFLAGS = \ - AM_LDFLAGS = \ - $(DEMO_LIBS) + if dep_gles1.found() + subdir('opengles1') +diff --git a/src/meson.build b/src/meson.build +index 39cac78d..7607c6de 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -20,7 +20,9 @@ + + subdir('glad') -+if HAVE_GL - noinst_LTLIBRARIES = libutil.la +-subdir('util') ++if dep_gl.found() ++ subdir('util') +endif - if HAVE_GLUT - AM_CFLAGS += \ + if dep_glut.found() + subdir('demos') -- -2.14.3 +2.37.3 diff --git a/package/mesa3d-demos/mesa3d-demos.hash b/package/mesa3d-demos/mesa3d-demos.hash index 8a4955f120..b0cfb88816 100644 --- a/package/mesa3d-demos/mesa3d-demos.hash +++ b/package/mesa3d-demos/mesa3d-demos.hash @@ -1,5 +1,3 @@ -# From https://lists.freedesktop.org/archives/mesa-dev/2018-February/186542.html -md5 6b65a02622765522176d00f553086fa3 mesa-demos-8.4.0.tar.bz2 -sha1 57ba892e919fa22ce3db9f25e7331a6fa33c652c mesa-demos-8.4.0.tar.bz2 -sha256 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d mesa-demos-8.4.0.tar.bz2 -sha512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957 mesa-demos-8.4.0.tar.bz2 +# From https://lists.freedesktop.org/archives/mesa-announce/2022-May/000677.html +sha256 cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1 mesa-demos-8.5.0.tar.bz2 +sha512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8 mesa-demos-8.5.0.tar.bz2 diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index 6b5262a2e9..5f7fe8e24d 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -4,77 +4,69 @@ # ################################################################################ -MESA3D_DEMOS_VERSION = 8.4.0 +MESA3D_DEMOS_VERSION = 8.5.0 MESA3D_DEMOS_SOURCE = mesa-demos-$(MESA3D_DEMOS_VERSION).tar.bz2 -MESA3D_DEMOS_SITE = ftp://ftp.freedesktop.org/pub/mesa/demos -# 0001-demos-makes-opengl-an-optional-component.patch -MESA3D_DEMOS_AUTORECONF = YES +MESA3D_DEMOS_SITE = https://archive.mesa3d.org/demos/$(MESA3D_DEMOS_VERSION) MESA3D_DEMOS_DEPENDENCIES = host-pkgconf MESA3D_DEMOS_LICENSE = MIT MESA3D_DEMOS_CONF_OPTS += \ - --disable-gles1 + -Dgles1=disabled ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy) MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext -MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11 +MESA3D_DEMOS_CONF_OPTS += -Dgl=enabled -Dx11=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-gl --disable-x11 +MESA3D_DEMOS_CONF_OPTS += -Dgl=disabled -Dx11=disabled endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) MESA3D_DEMOS_DEPENDENCIES += libegl -MESA3D_DEMOS_CONF_OPTS += --enable-egl +MESA3D_DEMOS_CONF_OPTS += -Degl=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-egl +MESA3D_DEMOS_CONF_OPTS += -Degl=disabled endif ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) MESA3D_DEMOS_DEPENDENCIES += libgles -MESA3D_DEMOS_CONF_OPTS += --enable-gles2 +MESA3D_DEMOS_CONF_OPTS += -Dgles2=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-gles2 +MESA3D_DEMOS_CONF_OPTS += -Dgles2=disabled endif -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -MESA3D_DEMOS_DEPENDENCIES += libopenvg -MESA3D_DEMOS_CONF_OPTS += --enable-vg +ifeq ($(BR2_PACKAGE_LIBDRM),y) +MESA3D_DEMOS_DEPENDENCIES += libdrm +MESA3D_DEMOS_CONF_OPTS += -Dlibdrm=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-vg +MESA3D_DEMOS_CONF_OPTS += -Dlibdrm=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) +# Meson search for gbm, but has no option to enable/disable it. See: +# https://gitlab.freedesktop.org/mesa/demos/-/blob/mesa-demos-8.5.0/meson.build#L88 +# We still add the dependency, if needed, to make sure it will always +# be detected. MESA3D_DEMOS_DEPENDENCIES += mesa3d -MESA3D_DEMOS_CONF_OPTS += --enable-gbm -else -MESA3D_DEMOS_CONF_OPTS += --disable-gbm -endif - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -MESA3D_DEMOS_DEPENDENCIES += freetype -MESA3D_DEMOS_CONF_OPTS += --enable-freetype2 -else -MESA3D_DEMOS_CONF_OPTS += --disable-freetype2 endif ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MESA3D_DEMOS_DEPENDENCIES += libfreeglut -MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr +MESA3D_DEMOS_CONF_OPTS += -Dwith-glut=$(STAGING_DIR)/usr # osmesa support depends on glut ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) -MESA3D_DEMOS_CONF_OPTS += --enable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif else -MESA3D_DEMOS_CONF_OPTS += --without-glut --disable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif ifeq ($(BR2_PACKAGE_WAYLAND),y) MESA3D_DEMOS_DEPENDENCIES += wayland -MESA3D_DEMOS_CONF_OPTS += --enable-wayland +MESA3D_DEMOS_CONF_OPTS += -Dwayland=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-wayland +MESA3D_DEMOS_CONF_OPTS += -Dwayland=disabled endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From peter at korsgaard.com Mon Feb 20 20:59:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:41 -0000 Subject: [Buildroot] [git commit branch/next] configs/spike_riscv64_defconfig: use OpenSBI 1.2 Message-ID: <20230220205227.DA9D2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5db2e5d45e75b44e7c7c5ad8c61d1be2a2748cbc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard Reviewed-by: Julien Olivain Tested-by: Julien Olivain Signed-off-by: Peter Korsgaard --- configs/spike_riscv64_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index 26103682f9..e23f1ce32c 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -9,7 +9,7 @@ BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y BR2_PACKAGE_HOST_RISCV_ISA_SIM=y From peter at korsgaard.com Mon Feb 20 20:59:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:41 -0000 Subject: [Buildroot] [git commit branch/next] configs/qemu_riscv64_virt_defconfig: use OpenSBI 1.2 Message-ID: <20230220205227.CF07586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=035cc3caf998a71dea37eefb852d20867fd89b39 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Rather than the default (currently 0.9). Signed-off-by: Peter Korsgaard --- configs/qemu_riscv64_virt_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index c455680ee0..b3174a152c 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -25,6 +25,8 @@ BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing From peter at korsgaard.com Tue Feb 7 09:50:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 10:50:36 +0100 Subject: [Buildroot] [git commit branch/next] package/python-bunch: remove package Message-ID: <20230220205251.80D938648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29fd8481e22fd7e8ac00e0bc47614ff06be33706 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since the python3 bump to version 3.11 in commit 738500c296c8b1206f20e94ca3e7c5932a6a0486 python-bunch has failed to build. This is due to open() which no longer accepts 'U' (???universal newline???) in the file mode. Remove this package as it has not had a release since 2011 and is unmaintained upstream. Details: https://docs.python.org/3.11/whatsnew/3.11.html#porting-to-python-3-11 Fixes: - http://autobuild.buildroot.net/results/2ba/2ba72fc9837605a36ea63bbd3e6e181a40cdf360 Signed-off-by: James Hilliard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-bunch/Config.in | 6 ------ package/python-bunch/python-bunch.hash | 5 ----- package/python-bunch/python-bunch.mk | 14 -------------- 6 files changed, 7 insertions(+), 27 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 61686fdd11..ad80522451 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_PYTHON_BUNCH + bool "python-bunch removed" + select BR2_LEGACY + help + The python-bunch package is unmaintained and is replaced + by the python-munch package. + config BR2_TARGET_GUMMIBOOT bool "gummiboot removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f8acf8776c..cad8d6affa 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2040,7 +2040,6 @@ F: package/policycoreutils/ F: package/proftpd/ F: package/protobuf-c/ F: package/protobuf/ -F: package/python-bunch/ F: package/python-colorama/ F: package/python-filelock/ F: package/python-flask-cors/ diff --git a/package/Config.in b/package/Config.in index b6211f1102..8b9570c447 100644 --- a/package/Config.in +++ b/package/Config.in @@ -985,7 +985,6 @@ menu "External python modules" source "package/python-bottle/Config.in" source "package/python-brotli/Config.in" source "package/python-bsdiff4/Config.in" - source "package/python-bunch/Config.in" source "package/python-cached-property/Config.in" source "package/python-can/Config.in" source "package/python-canopen/Config.in" diff --git a/package/python-bunch/Config.in b/package/python-bunch/Config.in deleted file mode 100644 index 89eae742b8..0000000000 --- a/package/python-bunch/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_BUNCH - bool "python-bunch" - help - A dot-accessible dictionary (a la JavaScript objects). - - http://github.com/dsc/bunch diff --git a/package/python-bunch/python-bunch.hash b/package/python-bunch/python-bunch.hash deleted file mode 100644 index cfde2db603..0000000000 --- a/package/python-bunch/python-bunch.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/bunch/json -md5 0a829d64e95ed96defbcae2bf9061bb0 bunch-1.0.1.tar.gz -sha256 50c77a0fc0cb372dfe48b5e11937d5f70e743adbf42683f3a6d2857645a76aaa bunch-1.0.1.tar.gz -# Locally computed sha256 checksums -sha256 57ca95c92059c8380625192462979bd32994aae3fcdf902ff6eb1e467eeb0469 LICENSE.txt diff --git a/package/python-bunch/python-bunch.mk b/package/python-bunch/python-bunch.mk deleted file mode 100644 index 18fdc223bb..0000000000 --- a/package/python-bunch/python-bunch.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-bunch -# -################################################################################ - -PYTHON_BUNCH_VERSION = 1.0.1 -PYTHON_BUNCH_SOURCE = bunch-$(PYTHON_BUNCH_VERSION).tar.gz -PYTHON_BUNCH_SITE = https://files.pythonhosted.org/packages/ef/bf/a4cf1779a4ffb4f610903fa08e15d1f4a8a2f4e3353a02afbe097c5bf4a8 -PYTHON_BUNCH_SETUP_TYPE = setuptools -PYTHON_BUNCH_LICENSE = MIT -PYTHON_BUNCH_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:59:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:42 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: fix static build Message-ID: <20230220205228.482678648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f37af1800c82ae255c202ea8cfc7e11a65d489f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static build failure raised since bump to version 1.7.2 in commit 6987b92da510a8c8b9534a22506850c163d0f035 and https://github.com/containers/crun/commit/5837234e9840cd067edd9f6cd2ed9cae9a0e6570: src/crun.c:26:10: fatal error: dlfcn.h: No such file or directory 26 | #include | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/a5f52a7ee757c92c9571261c0ed884d05caeaf2f Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: make it an actual backport now] Signed-off-by: Yann E. MORIN --- ...0001-src-crun.c-fix-build-without-dlfcn.h.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch b/package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch new file mode 100644 index 0000000000..104c19a40f --- /dev/null +++ b/package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch @@ -0,0 +1,39 @@ +From 278b9b447bec3fb81bf252eb2fe2c856892ec802 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 30 Dec 2022 18:40:15 +0100 +Subject: [PATCH] src/crun.c: fix build without dlfcn.h + +Fix the following build failure without dlfcn.h raised since version 1.7 +and +https://github.com/containers/crun/commit/5837234e9840cd067edd9f6cd2ed9cae9a0e6570: + +src/crun.c:26:10: fatal error: dlfcn.h: No such file or directory + 26 | #include + | ^~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a5f52a7ee757c92c9571261c0ed884d05caeaf2f + +[fontaine.fabrice at gmail.com: backport upstream commit] +Signed-off-by: Fabrice Fontaine +--- + src/crun.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/crun.c b/src/crun.c +index cbfe900..af0cc97 100644 +--- a/src/crun.c ++++ b/src/crun.c +@@ -23,7 +23,9 @@ + #include + #include + ++#ifdef HAVE_DLOPEN + #include ++#endif + + #include "crun.h" + #include "libcrun/utils.h" +-- +2.25.1 + From thomas.petazzoni at bootlin.com Tue Feb 7 10:30:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:30:47 +0100 Subject: [Buildroot] [git commit branch/next] toolchain/toolchain-external: handle case of dangling symlink Message-ID: <20230220205251.B2EFF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b11ed25c4a0a6a4f7b9ee38390578d724caa081d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next copy_toolchain_lib_root was not handling the case of "readlink" returning nothing, which will happen if the symlink it is trying to resolve does not point to a valid file on the build host. This shouldn't happen, but it can. The end result of this situation would be an endless loop of error messages that would only end if aborted manually. [...] cp: missing destination file operand after '/local/users/mmayer/buildroot/output/arm64/target//' Try 'cp --help' for more information. readlink: missing operand Try 'readlink --help' for more information. basename: missing operand Try 'basename --help' for more information. dirname: missing operand Try 'dirname --help' for more information. ^C make[1]: *** [package/pkg-generic.mk:384: Instead of looping endlessly without explanation, let's abort and inform the user that something seems amiss with their setup. Signed-off-by: Markus Mayer Signed-off-by: Thomas Petazzoni --- toolchain/helpers.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index eec46d44c6..1cd7494fdb 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -19,7 +19,12 @@ copy_toolchain_lib_root = \ rm -fr $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ if test -h $${LIBPATH} ; then \ cp -d $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ + OLD_LIBPATH="$${LIBPATH}"; \ LIBPATH="`readlink -f $${LIBPATH}`"; \ + if [ "$${LIBPATH}" = "" ]; then \ + echo "LIBPATH empty after trying to resolve symlink $${OLD_LIBPATH}" 1>&2; \ + exit 1; \ + fi; \ elif test -f $${LIBPATH}; then \ $(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ break ; \ From yann.morin.1998 at free.fr Mon Feb 20 20:59:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:43 -0000 Subject: [Buildroot] [git commit branch/next] Makefile: fix use of many br2-external trees Message-ID: <20230220205228.25C1986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6195c53041f5a8aa375b9715f90beb5188d33e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The top level Makefile in buildroot has a recursive rule which causes the appearance of a hang as the number of directories in BR2_EXTERNAL increases. When the number of directories in BR2_EXTERNAL is small, the recursion occurs, but make detects the recursion and determines the target does not have to be remade. This allows make to progress. This is the failing rule: define percent_defconfig # Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig %_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig outputmakefile @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) endef $(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent_defconfig,$(d))$(sep))) The rule for %defconfig is created for each directory in BR2_EXTERNAL. When the rule is matched, the stem is 'defconfig_name'. The second prerequisite is expanded to $(1)/configs/defconfig_name_defconfig. The rule, and all of the other rules defined by this macro, are invoked again, but the stem is now $(1)/configs/defconfig_name_defconfig. The second prerequisite is now expanded to $(1)/configs/($1)/configs/defconfig_name_defconfig. This expansion continues until make detects the infinite recursion. With up to 5 br2-external trees, the time is very small, so that it is not noticeable. But starting with 6 br2-external trees, the time is insanely big (so much so that we did not even let it finish after it ran for hours); see timings toward the end of the commit log. We fix that by adding a single %_defconfig rule, which is now rsponsible to find the actual defconfig file that triggered the rule, by iterating on the reverse list of br2-external trees and then in main tree. Of course, now, there is no way for make to warn that there is no such defconfig, as it is no longer part of the prerequisites of the rule. So, we delegate to the recipe the responsibility to check for that. Timing (seconds) of `make pc_x86_64_bios_defconfig` with 1..1000 external trees, with make 4.2.1 (* with make 4.3), on a Core i7-7700HQ: #trees Before After 1 0.312 0.319 2 0.319 0.323 3 0.325 0.327 4 0.353 0.339 5 0.993 0.349 6 1.26* 0.347 7 9.10* 0.362 8 85.93* 0.360 9 n/a 0.373 10 n/a 0.374 50 n/a 0.738 100 n/a 1.228 500 n/a 7.483 1000 n/a 16.076 How to reproduce: #!/usr/bin/env bash N="${1:-1000}" for i in $(seq 1 1000); do [ -d "br2-external/${i}/configs" ] && break mkdir -p br2-external/${i}/configs touch br2-external/${i}/{Config.in,external.mk} echo "name: BR_TEST_${i}" >br2-external/${i}/external.desc touch br2-external/${i}/configs/foo{,_${i}}_defconfig done time make \ BR2_EXTERNAL="$( for i in $(seq 1 ${N}); do printf '%s\n' "$(pwd)/br2-external/${i}" done )" \ foo_1_defconfig Notes: the timings are very dependent on how much the CPU is otherwise loaded, but having a multi-core CPU slightly loaded helps maintain a high frequency on the siblings, and that can reduce the above timings in half! Best to try on an otherwise-idle system. Fixes: #14996 Reported-by: David Lawson Signed-off-by: Nevo Hed [yann.morin.1998 at free.fr: - split long foreach - drastically extend the commit log - provide reproducer script and redo timings ] Signed-off-by: Yann E. MORIN --- Makefile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 88f90cd2fa..efa0b2a7a0 100644 --- a/Makefile +++ b/Makefile @@ -1013,13 +1013,18 @@ oldconfig syncconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf outputmake defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN) -define percent_defconfig -# Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig -%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig outputmakefile - @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ - $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) -endef -$(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent_defconfig,$(d))$(sep))) +%_defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile + @defconfig=$(or \ + $(firstword \ + $(foreach d, \ + $(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)), \ + $(wildcard $(d)/configs/$@) \ + ) \ + ), \ + $(error "Can't find $@") \ + ); \ + $(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$${defconfig} \ + $< --defconfig=$${defconfig} $(CONFIG_CONFIG_IN) update-defconfig: savedefconfig From thomas.petazzoni at bootlin.com Tue Feb 7 10:30:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:30:53 +0100 Subject: [Buildroot] [git commit branch/next] package/rtl8192eu: disable package for s390x architecture Message-ID: <20230220205251.BD56786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26893ab1c67d7df8c1b71269051ad41b5ea03e5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this package for this architecture. Fixes: http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8192eu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rtl8192eu/Config.in b/package/rtl8192eu/Config.in index 4d71b711c3..969ba090ce 100644 --- a/package/rtl8192eu/Config.in +++ b/package/rtl8192eu/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTL8192EU bool "rtl8192eu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help A standalone driver for the RTL8192EU USB Wi-Fi adapter. @@ -10,4 +11,5 @@ config BR2_PACKAGE_RTL8192EU https://github.com/clnhub/rtl8192eu-linux comment "rtl8192eu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL From peter at korsgaard.com Mon Feb 20 20:59:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:44 -0000 Subject: [Buildroot] [git commit branch/next] package/{glibc, localedef}: bump to version 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c Message-ID: <20230220205228.17B318648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87ee360f3a18db33d50b5826590c55e37ee9f993 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patches which are now upstream. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...ix-MAKEFLAGS-assignment-for-upcoming-make.patch | 117 --------------------- package/glibc/0002-x86-Fix-Os-build-BZ-29576.patch | 48 --------- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- package/localedef/localedef.mk | 2 +- 5 files changed, 3 insertions(+), 168 deletions(-) diff --git a/package/glibc/0002-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch b/package/glibc/0002-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch deleted file mode 100644 index 0c82d7abbe..0000000000 --- a/package/glibc/0002-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 2d7ed98add14f75041499ac189696c9bd3d757fe Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Tue, 13 Sep 2022 13:39:13 -0400 -Subject: [PATCH] Makerules: fix MAKEFLAGS assignment for upcoming make-4.4 - [BZ# 29564] - -make-4.4 will add long flags to MAKEFLAGS variable: - - * WARNING: Backward-incompatibility! - Previously only simple (one-letter) options were added to the MAKEFLAGS - variable that was visible while parsing makefiles. Now, all options - are available in MAKEFLAGS. - -This causes locale builds to fail when long options are used: - - $ make --shuffle - ... - make -C localedata install-locales - make: invalid shuffle mode: '1662724426r' - -The change fixes it by passing eash option via whitespace and dashes. -That way option is appended to both single-word form and whitespace -separated form. - -While at it fixed --silent mode detection in $(MAKEFLAGS) by filtering -out --long-options. Otherwise options like --shuffle flag enable silent -mode unintentionally. $(silent-make) variable consolidates the checks. - -Resolves: BZ# 29564 - -CC: Paul Smith -CC: Siddhesh Poyarekar -Signed-off-by: Sergei Trofimovich -Reviewed-by: Siddhesh Poyarekar -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -2d7ed98add14f75041499ac189696c9bd3d757fe] ---- - Makeconfig | 18 +++++++++++++++++- - Makerules | 4 ++-- - elf/rtld-Rules | 2 +- - 3 files changed, 20 insertions(+), 4 deletions(-) - -diff --git a/Makeconfig b/Makeconfig -index f8164a0025..842f49eb58 100644 ---- a/Makeconfig -+++ b/Makeconfig -@@ -43,6 +43,22 @@ else - $(error objdir must be defined by the build-directory Makefile) - endif - -+# Did we request 'make -s' run? "yes" or "no". -+# Starting from make-4.4 MAKEFLAGS now contains long -+# options like '--shuffle'. To detect presence of 's' -+# we pick first word with short options. Long options -+# are guaranteed to come after whitespace. We use '-' -+# prefix to always have a word before long options -+# even if no short options were passed. -+# Typical MAKEFLAGS values to watch for: -+# "rs --shuffle=42" (silent) -+# " --shuffle" (not silent) -+ifeq ($(findstring s, $(firstword -$(MAKEFLAGS))),) -+silent-make := no -+else -+silent-make := yes -+endif -+ - # Root of the sysdeps tree. - sysdep_dir := $(..)sysdeps - export sysdep_dir := $(sysdep_dir) -@@ -917,7 +933,7 @@ endif - # umpteen zillion filenames along with it (we use `...' instead) - # but we don't want this echoing done when the user has said - # he doesn't want to see commands echoed by using -s. --ifneq "$(findstring s,$(MAKEFLAGS))" "" # if -s -+ifeq ($(silent-make),yes) # if -s - +cmdecho := echo >/dev/null - else # not -s - +cmdecho := echo -diff --git a/Makerules b/Makerules -index d1e139d03c..09c0cf8357 100644 ---- a/Makerules -+++ b/Makerules -@@ -794,7 +794,7 @@ endif - # Maximize efficiency by minimizing the number of rules. - .SUFFIXES: # Clear the suffix list. We don't use suffix rules. - # Don't define any builtin rules. --MAKEFLAGS := $(MAKEFLAGS)r -+MAKEFLAGS := $(MAKEFLAGS) -r - - # Generic rule for making directories. - %/: -@@ -811,7 +811,7 @@ MAKEFLAGS := $(MAKEFLAGS)r - .PRECIOUS: $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c)) - - # Use the verbose option of ar and tar when not running silently. --ifeq "$(findstring s,$(MAKEFLAGS))" "" # if not -s -+ifeq ($(silent-make),no) # if not -s - verbose := v - else # -s - verbose := -diff --git a/elf/rtld-Rules b/elf/rtld-Rules -index ca00dd1fe2..3c5e273f2b 100644 ---- a/elf/rtld-Rules -+++ b/elf/rtld-Rules -@@ -52,7 +52,7 @@ $(objpfx)rtld-libc.a: $(foreach dir,$(rtld-subdirs),\ - mv -f $@T $@ - - # Use the verbose option of ar and tar when not running silently. --ifeq "$(findstring s,$(MAKEFLAGS))" "" # if not -s -+ifeq ($(silent-make),no) # if not -s - verbose := v - else # -s - verbose := --- -2.34.1 - diff --git a/package/glibc/0002-x86-Fix-Os-build-BZ-29576.patch b/package/glibc/0002-x86-Fix-Os-build-BZ-29576.patch deleted file mode 100644 index 4470324f1c..0000000000 --- a/package/glibc/0002-x86-Fix-Os-build-BZ-29576.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3935b543adcb9a46ab79f8931bc489068b049378 Mon Sep 17 00:00:00 2001 -From: Adhemerval Zanella Netto -Date: Wed, 21 Sep 2022 10:51:08 -0300 -Subject: [PATCH] x86: Fix -Os build (BZ #29576) - -The compiler might transform __stpcpy calls (which are routed to -__builtin_stpcpy as an optimization) to strcpy and x86_64 strcpy -multiarch implementation does not build any working symbol due -ISA_SHOULD_BUILD not being evaluated for IS_IN(rtld). - -Checked on x86_64-linux-gnu. -Reviewed-by: Carlos O'Donell -Tested-by: Carlos O'Donell - -(cherry picked from commit 9dc4e29f630c6ef8299120b275e503321dc0c8c7) -Signed-off-by: Romain Naour ---- - sysdeps/x86_64/multiarch/rtld-strcpy.S | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - create mode 100644 sysdeps/x86_64/multiarch/rtld-strcpy.S - -diff --git a/sysdeps/x86_64/multiarch/rtld-strcpy.S b/sysdeps/x86_64/multiarch/rtld-strcpy.S -new file mode 100644 -index 0000000000..19439c553d ---- /dev/null -+++ b/sysdeps/x86_64/multiarch/rtld-strcpy.S -@@ -0,0 +1,18 @@ -+/* Copyright (C) 2022 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. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY 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 the GNU C Library; if not, see -+ . */ -+ -+#include "../strcpy.S" --- -2.34.3 - diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 16290461ac..4ce4c6f6d1 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 51b946f6c8dddd2b0c9902f7792ecf594497da6b0cc8fb9246fa30f108cbb422 glibc-2.36-66-ga1dc0be03c9dd850b864bd7a9c03cf8e396eb7ca.tar.gz +sha256 666482e657c319f7e139121121a0d97d303c65207b9f9730f42a3ee83c79f686 glibc-2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index bb7c9e9a05..354f035d33 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.36-66-ga1dc0be03c9dd850b864bd7a9c03cf8e396eb7ca +GLIBC_VERSION = 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 05db7fa423..6699840854 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.36-66-ga1dc0be03c9dd850b864bd7a9c03cf8e396eb7ca +LOCALEDEF_VERSION = 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From thomas.petazzoni at bootlin.com Tue Feb 7 10:41:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:41:37 +0100 Subject: [Buildroot] [git commit branch/next] package/versal-firmware: use Xilinx github for versal-firmware Message-ID: <20230220205251.E37CF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0781f44c0a9b46d9119557708918948a769e6881 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate versal-firmware package from nealfrager github to Xilinx github. The images are identical, so this patch has zero impact on functionality. Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- configs/versal_vck190_defconfig | 2 +- package/versal-firmware/Config.in | 2 +- package/versal-firmware/versal-firmware.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index fcda6eb431..2808fa522b 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_PACKAGE_VERSAL_FIRMWARE=y -BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="v2022.2" +BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="2022.2_br_1" BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/package/versal-firmware/Config.in b/package/versal-firmware/Config.in index 8d13816149..b4b63282d8 100644 --- a/package/versal-firmware/Config.in +++ b/package/versal-firmware/Config.in @@ -10,7 +10,7 @@ if BR2_PACKAGE_VERSAL_FIRMWARE config BR2_PACKAGE_VERSAL_FIRMWARE_VERSION string "firmware version" - default "v2022.2" + default "2022.2_br_1" help Release version of Versal firmware. diff --git a/package/versal-firmware/versal-firmware.mk b/package/versal-firmware/versal-firmware.mk index 3e4b9e558d..0bc5a00bc6 100644 --- a/package/versal-firmware/versal-firmware.mk +++ b/package/versal-firmware/versal-firmware.mk @@ -5,7 +5,7 @@ ################################################################################ VERSAL_FIRMWARE_VERSION = $(call qstrip,$(BR2_PACKAGE_VERSAL_FIRMWARE_VERSION)) -VERSAL_FIRMWARE_SITE = $(call github,nealfrager,buildroot-firmware,$(VERSAL_FIRMWARE_VERSION)) +VERSAL_FIRMWARE_SITE = $(call github,Xilinx,ubuntu-firmware,$(VERSAL_FIRMWARE_VERSION)) VERSAL_FIRMWARE_LICENSE = Xilinx-Binary-Only VERSAL_FIRMWARE_LICENSE_FILES = LICENSE VERSAL_FIRMWARE_INSTALL_TARGET = NO From peter at korsgaard.com Mon Feb 20 20:59:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:45 -0000 Subject: [Buildroot] [git commit branch/next] package/ntpsec: bump version to 1.2.2 Message-ID: <20230220205228.05DDC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=658ece1afa84e916503e3e949c40b3c0d24c6335 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - remove 001-ntptime-fix-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch (upstream applied, see [1]) - rename 0002-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch to 0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch - remove 0003-fix-build-with-libressl.patch (upstream applied, see [2]) - update license file list (change from LICENSE.adoc to LICENSES/BSD-2, LICENSES/BSD-3, LICENSES/CC-BY-4.0, LICENSES/MIT, LICENSES/NTP) For details see [3]. [1] https://gitlab.com/NTPsec/ntpsec/-/commit/0bea0bef36ff9cfa3ff52de25a839c283cf46cf7 [2] https://gitlab.com/NTPsec/ntpsec/-/commit/128b66ae122d7b41ce4b99f427383fd6a5923d71 [3] https://gitlab.com/NTPsec/ntpsec/-/blob/master/NEWS.adoc Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch | 90 ---------------------- ...ve-checks-for-bsd-string.h-fixes-host-co.patch} | 0 package/ntpsec/0003-fix-build-with-libressl.patch | 80 ------------------- package/ntpsec/ntpsec.hash | 8 +- package/ntpsec/ntpsec.mk | 12 ++- 5 files changed, 15 insertions(+), 175 deletions(-) diff --git a/package/ntpsec/0001-ntptime-fix-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch b/package/ntpsec/0001-ntptime-fix-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch deleted file mode 100644 index aa3cb183c3..0000000000 --- a/package/ntpsec/0001-ntptime-fix-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch +++ /dev/null @@ -1,90 +0,0 @@ -From aa9ed14c7f4d0edbda9370760b44be045638f8a0 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 4 Oct 2021 22:25:58 +0200 -Subject: [PATCH] ntptime: fix jfmt5/ofmt5 jfmt6/ofmt6 related compile failure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use same define guard for definiton as for usage ('HAVE_STRUCT_NTPTIMEVAL_TAI' -instead of 'NTP_API && NTP_API > 3'). - -While at it use HAVE_STRUCT_NTPTIMEVAL_TAI define guard for the two remaining -places using NTP_API (which is not defined by the uclibc sys/timex.h header). - -Fixes: - - ../../ntptime/ntptime.c: In function ???main???: - ../../ntptime/ntptime.c:349:17: error: ???jfmt5??? undeclared (first use in this function); did you mean ???jfmt6???? - 349 | printf(json ? jfmt5 : ofmt5, (long)ntv.tai); - | ^~~~~ - | jfmt6 - ../../ntptime/ntptime.c:349:17: note: each undeclared identifier is reported only once for each function it appears in - ../../ntptime/ntptime.c:349:25: error: ???ofmt5??? undeclared (first use in this function); did you mean ???ofmt6???? - 349 | printf(json ? jfmt5 : ofmt5, (long)ntv.tai); - | ^~~~~ - | ofmt6 - ../../ntptime/ntptime.c:321:15: warning: unused variable ???jfmt6??? [-Wunused-variable] - 321 | const char *jfmt6 = ""; - | ^~~~~ - ../../ntptime/ntptime.c:311:15: warning: unused variable ???ofmt6??? [-Wunused-variable] - 311 | const char *ofmt6 = "\n"; - | ^~~~~ - -[Upstream: https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1245] -Signed-off-by: Peter Seiderer ---- - ntptime/ntptime.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/ntptime/ntptime.c b/ntptime/ntptime.c -index ff861cb3b..7fbd09977 100644 ---- a/ntptime/ntptime.c -+++ b/ntptime/ntptime.c -@@ -138,7 +138,7 @@ main( - ntx.modes |= MOD_NANO; - break; - #endif --#if defined NTP_API && NTP_API > 3 -+#if defined(HAVE_STRUCT_NTPTIMEVAL_TAI) - case 'T': - ntx.modes = MOD_TAI; - ntx.constant = atoi(ntp_optarg); -@@ -222,7 +222,7 @@ main( - #else - "", - #endif --#if defined NTP_API && NTP_API > 3 -+#if defined(HAVE_STRUCT_NTPTIMEVAL_TAI) - "-T tai_offset set TAI offset\n", - #else - "", -@@ -305,21 +305,21 @@ main( - const char *ofmt2 = " time %s, (.%0*d),\n"; - const char *ofmt3 = " maximum error %lu us, estimated error %lu us"; - const char *ofmt4 = " ntptime=%x.%x unixtime=%x.%0*d %s"; --#if defined NTP_API && NTP_API > 3 -+#if defined(HAVE_STRUCT_NTPTIMEVAL_TAI) - const char *ofmt5 = ", TAI offset %ld\n"; - #else - const char *ofmt6 = "\n"; --#endif /* NTP_API */ -+#endif /* HAVE_STRUCT_NTPTIMEVAL_TAI */ - /* JSON formats */ - const char *jfmt1 = "{\"gettime-code\":%d,\"gettime-status\":\"%s\","; - const char *jfmt2 = "\"time\":\"%s\",\"fractional-time\":\".%0*d\","; - const char *jfmt3 = "\"maximum-error\":%lu,\"estimated-error\":%lu,"; - const char *jfmt4 = "\"raw-ntp-time\":\"%x.%x\",\"raw-unix-time\":\"%x.%0*d %s\","; --#if defined NTP_API && NTP_API > 3 -+#if defined(HAVE_STRUCT_NTPTIMEVAL_TAI) - const char *jfmt5 = "\"TAI-offset\":%d,"; - #else - const char *jfmt6 = ""; --#endif /* NTP_API */ -+#endif /* HAVE_STRUCT_NTPTIMEVAL_TAI */ - printf(json ? jfmt1 : ofmt1, status, timex_state(status)); - time_frac = ntv.time.tv_frac_sec; - #ifdef STA_NANO --- -2.34.1 - diff --git a/package/ntpsec/0002-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch b/package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch similarity index 100% rename from package/ntpsec/0002-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch rename to package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch diff --git a/package/ntpsec/0003-fix-build-with-libressl.patch b/package/ntpsec/0003-fix-build-with-libressl.patch deleted file mode 100644 index a5c9543157..0000000000 --- a/package/ntpsec/0003-fix-build-with-libressl.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 743f16fb3fed9a05e601226f184be236614efe9a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 12 Aug 2022 23:35:52 +0200 -Subject: [PATCH] fix build with libressl - -Fix the following build failure with libressl: - -/home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/armeb-buildroot-linux-gnueabi/11.3.0/../../../../armeb-buildroot-linux-gnueabi/bin/ld: libntp/libntp.a(ntp_random.c.1.o): in function `ntp_RAND_priv_bytes': -ntp_random.c:(.text+0xac): undefined reference to `RAND_priv_bytes' - -Fixes: - - http://autobuild.buildroot.org/results/a6a825b7f0efc7c82e8ecf792a1f9951ffb047c5 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1285] ---- - attic/cmac-timing.c | 2 ++ - attic/random.c | 8 ++++++++ - libntp/ntp_random.c | 2 +- - 3 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/attic/cmac-timing.c b/attic/cmac-timing.c -index 464daa76b..4f2fd3338 100644 ---- a/attic/cmac-timing.c -+++ b/attic/cmac-timing.c -@@ -204,7 +204,9 @@ static void DoPKEY( - printf("## Oops, EVP_MD_CTX_new() failed.\n"); - return; - } -+#ifdef EVP_MD_CTX_FLAG_FINALISE - EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_FINALISE); -+#endif - - clock_gettime(CLOCK_MONOTONIC, &start); - for (int i = 0; i < SAMPLESIZE; i++) { -diff --git a/attic/random.c b/attic/random.c -index 446c68535..8530ecd25 100644 ---- a/attic/random.c -+++ b/attic/random.c -@@ -127,7 +127,11 @@ static int do_avg_priv(unsigned int bytes) { - - clock_gettime(CLOCK_REALTIME, &start); - for (int i = 0; i < BATCHSIZE; i++) { -+#ifdef LIBRESSL_VERSION_NUMBER -+ err += RAND_bytes((unsigned char *)&rnd, bytes); -+#else - err += RAND_priv_bytes((unsigned char *)&rnd, bytes); -+#endif - } - clock_gettime(CLOCK_REALTIME, &stop); - -@@ -209,7 +213,11 @@ static int do_fast_priv(unsigned bytes) { - - for (int i = 0; i < BATCHSIZE; i++) { - clock_gettime(CLOCK_REALTIME, &start); -+#ifdef LIBRESSL_VERSION_NUMBER -+ err += RAND_bytes((unsigned char *)&rnd, bytes); -+#else - err += RAND_priv_bytes((unsigned char *)&rnd, bytes); -+#endif - clock_gettime(CLOCK_REALTIME, &stop); - sec = (stop.tv_sec-start.tv_sec); - nanos = sec*BILLION + (stop.tv_nsec-start.tv_nsec); -diff --git a/libntp/ntp_random.c b/libntp/ntp_random.c -index 9304a790d..adb375b24 100644 ---- a/libntp/ntp_random.c -+++ b/libntp/ntp_random.c -@@ -29,7 +29,7 @@ void ntp_RAND_bytes(unsigned char *buf, int num) { - - void ntp_RAND_priv_bytes(unsigned char *buf, int num) { - int err; --#if (OPENSSL_VERSION_NUMBER > 0x1010100fL) -+#if (OPENSSL_VERSION_NUMBER > 0x1010100fL) && !defined(LIBRESSL_VERSION_NUMBER) - err = RAND_priv_bytes(buf, num); - #else - err = RAND_bytes(buf, num); --- -2.35.1 - diff --git a/package/ntpsec/ntpsec.hash b/package/ntpsec/ntpsec.hash index 49dc4e4d52..44e04b2403 100644 --- a/package/ntpsec/ntpsec.hash +++ b/package/ntpsec/ntpsec.hash @@ -1,4 +1,8 @@ # Locally calculated -sha256 71c9f4bde6953bbc048bbaf278da81c451a56cc08d6772542b4ad37c67d72e89 ntpsec-NTPsec_1_2_1.tar.bz2 -sha256 b4db4de3317c3b0554ed91eb692968800bdfd6ad2c16ffbeee8ce4895ed91da4 LICENSE.adoc +sha256 ad45f5b88d08a159bc9f44ecb79e08358d26d3d22bb6c96ab7aaa3734de130e6 ntpsec-NTPsec_1_2_2.tar.bz2 +sha256 899261d6eb6c922cf8f051225411f27b738ba0014be18c2eaf6afbf30d421bb1 LICENSES/BSD-2 +sha256 5fe38d8724c53ff4e69f0a3492a368b4a6719700ac16f706efeb01a45c62f2b5 LICENSES/BSD-3 +sha256 9ba9550ad48438d0836ddab3da480b3b69ffa0aac7b7878b5a0039e7ab429411 LICENSES/CC-BY-4.0 +sha256 074415b57c6ba1780483d89e55f40dec3ded96c28aaf47d63c486683ba553e7c LICENSES/MIT +sha256 62fec6cd79721af81b7c12f1a679535235fdd22800ab17653042f024187ff274 LICENSES/NTP sha256 d3b21470adadd9abd9c6d675378f8c371ac5a4ea6dbec91859e02fadca3c0856 docs/copyright.adoc diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index ac4b90e37a..c7fa2f85a8 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -6,12 +6,18 @@ NTPSEC_VERSION_MAJOR = 1 NTPSEC_VERSION_MINOR = 2 -NTPSEC_VERSION_POINT = 1 +NTPSEC_VERSION_POINT = 2 NTPSEC_VERSION = $(NTPSEC_VERSION_MAJOR)_$(NTPSEC_VERSION_MINOR)_$(NTPSEC_VERSION_POINT) NTPSEC_SOURCE = ntpsec-NTPsec_$(NTPSEC_VERSION).tar.bz2 NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(NTPSEC_VERSION) -NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT -NTPSEC_LICENSE_FILES = LICENSE.adoc docs/copyright.adoc +NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT, CC-BY-4.0 (docs) +NTPSEC_LICENSE_FILES = \ + LICENSES/BSD-2 \ + LICENSES/BSD-3 \ + LICENSES/CC-BY-4.0 \ + LICENSES/MIT \ + LICENSES/NTP \ + docs/copyright.adoc NTPSEC_CPE_ID_VENDOR = ntpsec NTPSEC_CPE_ID_VERSION = $(NTPSEC_VERSION_MAJOR).$(NTPSEC_VERSION_MINOR) From yann.morin.1998 at free.fr Tue Feb 7 10:06:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:06:53 +0100 Subject: [Buildroot] [git commit branch/next] package/docker-proxy: drop package Message-ID: <20230220205251.9A8AC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ae48b70aedf38bf6e90a7bbea5bf28a7c55bdbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The docker-proxy binary (libnetwork) has been merged into the docker-engine source (moby). Drop the docker-proxy package and add cmd/docker-proxy as a build target of docker-engine instead. https://github.com/moby/libnetwork/commit/563fe8e248f3afac75a270f693f38bdc3eea7bf3 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/docker-engine/Config.in | 1 - package/docker-engine/docker-engine.mk | 2 +- package/docker-proxy/Config.in | 19 ------------------- package/docker-proxy/docker-proxy.hash | 3 --- package/docker-proxy/docker-proxy.mk | 21 --------------------- 8 files changed, 9 insertions(+), 47 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index ad80522451..72deb03c35 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy removed" + select BR2_LEGACY + select BR2_PACKAGE_DOCKER_ENGINE + help + docker-proxy has been dropped by upstream since version + 563fe8. it has been merged into docker-engine (moby). + config BR2_PACKAGE_PYTHON_BUNCH bool "python-bunch removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index cad8d6affa..f10036f7f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -545,7 +545,6 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-compose/ F: package/docker-engine/ -F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ diff --git a/package/Config.in b/package/Config.in index 8b9570c447..aa87f1305d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2618,7 +2618,6 @@ menu "System tools" source "package/docker-cli/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" - source "package/docker-proxy/Config.in" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 1f0efb8fcc..b5a356eab9 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_USE_MMU # containerd select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency - select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency help Docker is a platform to build, ship, diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index c50f08245d..ca1aa27b0a 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -24,7 +24,7 @@ DOCKER_ENGINE_LDFLAGS = \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs -DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_ENGINE_DEPENDENCIES += libapparmor diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in deleted file mode 100644 index 7e40536537..0000000000 --- a/package/docker-proxy/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_DOCKER_PROXY - bool "docker-proxy" - 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 - help - Libnetwork is a Container Network Model that provides a - consistent programming interface and the required network - abstractions for applications. - - This package provides docker-proxy, a run-time dependency of - Docker. - - https://github.com/docker/libnetwork - -comment "docker-proxy needs a 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_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash deleted file mode 100644 index 63296f14c1..0000000000 --- a/package/docker-proxy/docker-proxy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 05bf95637bae134d12d02bd7a7854cd0c768e6fccb662c2c64523f05b997b204 docker-proxy-f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk deleted file mode 100644 index fe7982e8f6..0000000000 --- a/package/docker-proxy/docker-proxy.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# docker-proxy -# -################################################################################ - -DOCKER_PROXY_VERSION = f6ccccb1c082a432c2a5814aaedaca56af33d9ea -DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) - -DOCKER_PROXY_LICENSE = Apache-2.0 -DOCKER_PROXY_LICENSE_FILES = LICENSE - -DOCKER_PROXY_DEPENDENCIES = host-pkgconf - -DOCKER_PROXY_BUILD_TARGETS = cmd/proxy - -define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy -endef - -$(eval $(golang-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:59:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:46 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: add libgcrypt optional dependency Message-ID: <20230220205228.69A168648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d5fd84496ac0ec65e7aed73a9386ab62f2a2c19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libgcrypt is an optional dependency which is enabled by default since version 1.7 and https://github.com/containers/crun/commit/dd310aaf5aee336d0f6236c1c2add7b7cb030482 Unfortunately, thetre are no associated --enable/disable flags; it all depends on auto-detection. Signed-off-by: Fabrice Fontaine Reviewed-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/crun/crun.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/crun/crun.mk b/package/crun/crun.mk index 8c9993993c..fd8bfb0981 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -26,6 +26,10 @@ else CRUN_CONF_OPTS += --disable-caps endif +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +CRUN_DEPENDENCIES += libgcrypt +endif + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) CRUN_DEPENDENCIES += libseccomp CRUN_CONF_OPTS += --enable-seccomp From peter at korsgaard.com Tue Feb 7 11:35:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 12:35:46 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: correct check for open perl module Message-ID: <20230220205252.18E9886496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b63e155e5fb7104e6660aa0570befa9498259cd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 4cdd99190e89 (support/dependencies/dependencies.sh: require open perl package for libxcrypt) added a check for the "open" perl module for libxcrypt, but it does not work as "open" cannot be directly used with "require" as an argument is needed: perl -e "require open" Not enough arguments for open at -e line 1, at EOF Execution of -e aborted due to compilation errors. So special case the check to instead check with "use open ':std'". Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 353817f8fb..88eabe921d 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -271,10 +271,6 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl -if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then - required_perl_modules="$required_perl_modules open" -fi - if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" @@ -291,6 +287,13 @@ fi # This variable will keep the modules that are missing in your system. missing_perl_modules="" +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + # open cannot be used with require + if ! perl -e "use open ':std'" > /dev/null 2>&1 ; then + missing_perl_modules="$missing_perl_modules open" + fi +fi + for pm in $required_perl_modules ; do if ! perl -e "require $pm" > /dev/null 2>&1 ; then missing_perl_modules="$missing_perl_modules $pm" From yann.morin.1998 at free.fr Mon Feb 20 20:59:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:48 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: impersonate runc Message-ID: <20230220205228.7A534828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=680f28af58364f4152f3d9b582b312538fa0e500 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next crun is a drop-in replacement for runc, so we can use the former to impersonate the latter when it is not enabled. To do so, we create a runc symlink pointing to crun, when runc is not enabled. See: https://github.com/containerd/containerd/discussions/6162 Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart [yann.morin.1998 at free.fr: split into its own patch] Signed-off-by: Yann E. MORIN --- package/crun/crun.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/crun/crun.mk b/package/crun/crun.mk index fd8bfb0981..ddb96a0b33 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -44,4 +44,11 @@ else CRUN_CONF_OPTS += --disable-systemd endif +ifeq ($(BR2_PACKAGE_RUNC),) +define CRUN_CREATE_SYMLINK + ln -sf crun $(TARGET_DIR)/usr/bin/runc +endef +CRUN_POST_INSTALL_TARGET_HOOKS += CRUN_CREATE_SYMLINK +endif + $(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:59:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:49 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: needs fexecve Message-ID: <20230220205228.58775828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0e134a05342507bd9ac47da03abca4c9c113a64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next crun unconditionally uses fexecve since its addition in commit 530d6f661e506a4774b7236cb93d65f669adbc92 and https://github.com/containers/crun/commit/ce4dfbb97a8a05bef125030eaa6c46c07a5f9344: resulting in the following uclibc build failure: /tmp/instance-11/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arceb-snps-linux-uclibc/9.2.1/../../../../arceb-snps-linux-uclibc/bin/ld: src/libcrun/crun-cloned_binary.o: in function `ensure_cloned_binary': cloned_binary.c:(.text+0x1006): undefined reference to `fexecve' In 6e3f7fbc072c (package/runc: add upstream security fix for CVE-2019-5736), we made runc unavailable for uclibc toolchains, and crun uses fexecve for that same reason, to fix CVE-2019-5736. So, also make crun unavailable for uclibc toolchains. Fixes: - http://autobuild.buildroot.org/results/e1f4ef2b392c0e7161390ba0f97d6eef3bd12e9c Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/crun/Config.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/crun/Config.in b/package/crun/Config.in index 5def7001c1..fa0894e126 100644 --- a/package/crun/Config.in +++ b/package/crun/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_CRUN bool "crun" - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve + select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_YAJL # libocispec help crun is a fast and low-memory OCI Container Runtime in C. https://github.com/containers/crun + +comment "crun needs a glibc or musl toolchain" + depends on BR2_TOOLCHAIN_USES_UCLIBC From thomas.petazzoni at bootlin.com Tue Feb 7 11:32:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 12:32:35 +0100 Subject: [Buildroot] [git commit branch/next] package/python-idna: set _SETUP_TYPE = flit Message-ID: <20230220205252.0E9E2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a9da9a8cad5f77902547fab3b24d04175749a7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Python idna package switched to pyproject.toml in commit: https://github.com/kjd/idna/commit/2a00e518efe55d2eeb62cd3f88ace7db41338603 which is included in idna v3.4. When using the old setuptools infra, the package is incorrectly installed as v0.0, which is then incorrectly detected by other packages when using setuptools pkg_resources. The issue can be reproduced with the command: python3 <= 2.5"] import pkg_resources EOF which will fail with output: pkg_resources.ContextualVersionConflict: (idna 0.0.0 (/usr/lib/python3.11/site-packages), Requirement.parse('idna>=2.5'), {'hyperlink'}) pkg_resources.DistributionNotFound: The 'idna>=2.5' distribution was not found and is required by hyperlink This commit changes _SETUP_TYPE to "flit" to fix this issue. Signed-off-by: Julien Olivain Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-idna/python-idna.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 4d9994a9c7..3976cb1518 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -9,7 +9,7 @@ PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/8b/e1/43beb3d38dba6cb420cefa297822eac205a277ab43e5ba5d5c46faf96438 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md -PYTHON_IDNA_SETUP_TYPE = setuptools +PYTHON_IDNA_SETUP_TYPE = flit $(eval $(python-package)) $(eval $(host-python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:59:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:50 -0000 Subject: [Buildroot] [git commit branch/next] package/hiredis: enable host package Message-ID: <20230220205228.9B5C68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=359205b4f5b151a6ddff93cd75fd569a6f5c54b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The host-hiredis package is needed for the upcoming ccache update. So, being a dependency of ccache, we can't use ccache, so we must unset the options set by the cmake infra (this will be true only when we eventually bump ccache, but hiredis builds very fast even without ccache so we don't care about ccache even now). Reorder CONF_OPTS assignments so that comments apply equally to the host and target variants. Cc: Dominik Michael Rauh Cc: Anders F Bj??rklund Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: - add Dominik and Anders in Cc to ack they provided inspiration - use -Ufoo instead of -Dfoo="" (as per Dominik & Anders) - reorder CONF_OPTS assignments ] Signed-off-by: Yann E. MORIN --- package/hiredis/hiredis.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index f79b6c757a..a2f7627b58 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -11,9 +11,14 @@ HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING HIREDIS_CPE_ID_VENDOR = redislabs HIREDIS_INSTALL_STAGING = YES + +HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON +HOST_HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON -DENABLE_SSL=OFF + # Set CMAKE_BUILD_TYPE to Release or the libraries will be suffixed with "d" -# resulting in a build failure with collectd -HIREDIS_CONF_OPTS = -DCMAKE_BUILD_TYPE=Release -DDISABLE_TESTS=ON +# resulting in build failures when linking. +HIREDIS_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release +HOST_HIREDIS_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy) HIREDIS_CONF_OPTS += -DENABLE_SSL=ON @@ -22,4 +27,11 @@ else HIREDIS_CONF_OPTS += -DENABLE_SSL=OFF endif +# We may be a ccache dependency, so we can't use ccache; reset the +# options set by the cmake infra. +HOST_HIREDIS_CONF_OPTS += \ + -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER + $(eval $(cmake-package)) +$(eval $(host-cmake-package)) From yann.morin.1998 at free.fr Tue Feb 7 11:47:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:47:08 +0100 Subject: [Buildroot] [git commit branch/next] package/bash: fix strtoimax builtin inclusion logic Message-ID: <20230220205252.251628648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12d85e9646ed89552c732775de000ad0b436a139 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Backport fixes from upstream to fix an issue where the strtoimax builtin got built when not necessary. This resolves bash static builds issues when using musl and uClibc. We fix both the m4 file and configure in that order, to be safe andnot trigger an automatic autoreconf (even though bash does not have a rule to automatically regenerate configure if an m4 file changes). Fixes: http://autobuild.buildroot.org/results/f8c/f8cb91f7f9ac6a46bb2ecfc22c1e42cf699f28d3// http://autobuild.buildroot.org/results/b0e/b0e5fcab9eeb799e31bca27fcb7280b728349bc6// Upstream: https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 Signed-off-by: Vincent Fazio [yann.morin.1998 at free.fr: - patch configure after the m4 file - add blurb in commit log to explain that ] Signed-off-by: Yann E. MORIN --- ...re-invert-condition-for-strtoimax-builtin.patch | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch new file mode 100644 index 0000000000..c412dcfce2 --- /dev/null +++ b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch @@ -0,0 +1,62 @@ +From 754e0d1edc1c01b18f4890de7c58f7610e589d76 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 03:55:28 -0600 +Subject: [PATCH] configure: invert condition for strtoimax builtin + +Previously, bash would attempt to build a replacement for strtoimax if +it found that the C library had the function already declared. + +This caused build errors when linking against static libraries that did +not define the function as a weak alias but, in reality, was a logic +error since bash should only provide it's own implementation if one is +not provided by the C library. + +Now, fix this by inverting the logic. + +Upstream: + https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 + +Signed-off-by: Vincent Fazio +[yann.morin.1998 at free.fr: patch configure after the m file] +Signed-off-by: Yann E. MORIN +--- + configure | 6 +++++- + m4/strtoimax.m4 | 5 ++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 +index 30985723..fa43ac7b 100644 +--- a/m4/strtoimax.m4 ++++ b/m4/strtoimax.m4 +@@ -29,7 +29,10 @@ AC_CACHE_VAL(bash_cv_func_strtoimax, + fi + ]) + AC_MSG_RESULT($bash_cv_func_strtoimax) +-if test $bash_cv_func_strtoimax = yes; then ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then ++AC_DEFINE([HAVE_DECL_STRTOIMAX], [1]) ++fi ++if test $bash_cv_func_strtoimax = no; then + AC_LIBOBJ(strtoimax) + fi + ]) +diff --git a/configure b/configure +index 47313753..6039cee7 100755 +--- a/configure ++++ b/configure +@@ -20443,7 +20443,11 @@ fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bash_cv_func_strtoimax" >&5 + printf "%s\n" "$bash_cv_func_strtoimax" >&6; } +-if test $bash_cv_func_strtoimax = yes; then ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then ++printf "%s\n" "#define HAVE_DECL_STRTOIMAX 1" >>confdefs.h ++ ++fi ++if test $bash_cv_func_strtoimax = no; then + case " $LIBOBJS " in + *" strtoimax.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strtoimax.$ac_objext" +-- +2.25.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:59:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:51 -0000 Subject: [Buildroot] [git commit branch/next] package/pkg-gemneric: don't add host-ccache dependency to host-{hiredis, pkgconf, zstd} Message-ID: <20230220205228.CEFF98648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75519b19c8d0763fc02647c6df55c67fbe3ac89e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Now that we made those three package never use ccache to build, we don't need to add the dependency to host-ccache for those packages. So far, this is harmless, but when we eventually bump ccache, those packages will be actual dependency of host-ccache, so we will then really want to not have them depend on host-ccache. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: split off into its own patch] Signed-off-by: Yann E. MORIN --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f24e03a325..f2bea01d7d 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -792,7 +792,7 @@ $(2)_EXTRACT_DEPENDENCIES += \ endif ifeq ($$(BR2_CCACHE),y) -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-hiredis host-pkgconf host-zstd,$(1)),) $(2)_DEPENDENCIES += host-ccache endif endif From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:07 +0100 Subject: [Buildroot] [git commit branch/next] package/rtl8821cu: fix build failure due to missing Linux options Message-ID: <20230220205254.515DB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=737964e2f12057a0d968a2f10197e80e91ba65eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/aea/aea6bc1e4f89bd1010dfdc9caa54c37edb567d5f/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8821cu/rtl8821cu.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk index 18222e0014..97f50d9633 100644 --- a/package/rtl8821cu/rtl8821cu.mk +++ b/package/rtl8821cu/rtl8821cu.mk @@ -9,6 +9,14 @@ RTL8821CU_SITE = $(call github,morrownr,8821cu-20210118,$(RTL8821CU_VERSION)) RTL8821CU_LICENSE = GPL-2.0 RTL8821CU_LICENSE_FILES = LICENSE +define RTL8821CU_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB) +endef + RTL8821CU_USER_EXTRA_CFLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ -DCONFIG_IOCTL_CFG80211 \ From peter at korsgaard.com Mon Feb 20 21:00:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:06 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-uri: bump version to 5.17 Message-ID: <20230220205230.03CD7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d924b20fc4fc2c2dc5476d2e8975cb127e8868e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-uri/perl-uri.hash | 4 ++-- package/perl-uri/perl-uri.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-uri/perl-uri.hash b/package/perl-uri/perl-uri.hash index a169fc067d..daf043347f 100644 --- a/package/perl-uri/perl-uri.hash +++ b/package/perl-uri/perl-uri.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d7fc1b1c88d03357aed2f03b455a223e URI-5.12.tar.gz -sha256 66abe0eaddd76b74801ecd28ec1411605887550fc0a45ef6aa744fdad768d9b3 URI-5.12.tar.gz +md5 63675c429cfb1df73d7d21a9302e1000 URI-5.17.tar.gz +sha256 5f7e42b769cb27499113cfae4b786c37d49e7c7d32dbb469602cd808308568f8 URI-5.17.tar.gz # computed by scancpan sha256 d4f0b7a8771dcb1eee79a38c2e466eb997e23565a6687dd1900a2027eabe12a0 LICENSE diff --git a/package/perl-uri/perl-uri.mk b/package/perl-uri/perl-uri.mk index b0ac885c10..d4bfcb44ef 100644 --- a/package/perl-uri/perl-uri.mk +++ b/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 5.12 +PERL_URI_VERSION = 5.17 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_URI_LICENSE = Artistic or GPL-1.0+ From peter at korsgaard.com Mon Feb 20 21:00:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:07 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-net-dns: bump version to 1.36 Message-ID: <20230220205229.E81A78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6375be324460f2e2de888e36f6b255b9033d5120 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-net-dns/perl-net-dns.hash | 4 ++-- package/perl-net-dns/perl-net-dns.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-net-dns/perl-net-dns.hash b/package/perl-net-dns/perl-net-dns.hash index 52f2f2bff2..a98ac3525d 100644 --- a/package/perl-net-dns/perl-net-dns.hash +++ b/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 f10276a44ce157cd5f709be4c70c34a8 Net-DNS-1.34.tar.gz -sha256 de756e3fb6addbd32beafc869c4dd1c6a0b3783c5ef56dbefc6809443a4b1d15 Net-DNS-1.34.tar.gz +md5 b70b74481908d995f57569ab7cfe6432 Net-DNS-1.36.tar.gz +sha256 143ba0e530f8b727be61ec052974cbf52df5b0afc0582d75b04809e0b2a95ebe Net-DNS-1.36.tar.gz # computed by scancpan sha256 1e44fcf65509b47a251eda0ce1f8bd6aefa13517e38cb1e95b8d36120fb15452 LICENSE diff --git a/package/perl-net-dns/perl-net-dns.mk b/package/perl-net-dns/perl-net-dns.mk index cfb16d8ded..f4c20c07ad 100644 --- a/package/perl-net-dns/perl-net-dns.mk +++ b/package/perl-net-dns/perl-net-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_DNS_VERSION = 1.34 +PERL_NET_DNS_VERSION = 1.36 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS PERL_NET_DNS_LICENSE = MIT From peter at korsgaard.com Tue Feb 7 21:26:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 22:26:57 +0100 Subject: [Buildroot] [git commit branch/next] package/libgtk3: bump to version 3.24.36 Message-ID: <20230220205253.A91A48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40866ae0ce6e71d01a132dfb7694daa2ec559184 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/37c/37c7db88622c93f1c58aff7431b638143ae741d3/ As the 3.24.5 release tarball was missing a file: https://gitlab.gnome.org/GNOME/gtk/-/issues/5355 Switch to meson infra and remove autotools specific patches as the autotools support has been dropped: https://download.gnome.org/sources/gtk+/3.24/gtk%2B-3.24.36.news host-libgtk3 is a hack which builds only gtk-update-icon-cache host-libgtk3 is used by libgtk3 & adwaita-icon-theme Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- ...-bridge.patch => 0001-disable-atk-bridge.patch} | 28 +++---- package/libgtk3/0001-no-gtk-doc.patch | 25 ------- ...-dependency-from-gtk-encode-symbolic-svg.patch} | 0 package/libgtk3/0002-fix-introspection-check.patch | 28 ------- package/libgtk3/Config.in | 1 + package/libgtk3/libgtk3.hash | 4 +- package/libgtk3/libgtk3.mk | 87 +++++----------------- 7 files changed, 35 insertions(+), 138 deletions(-) diff --git a/package/libgtk3/0003-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch similarity index 62% rename from package/libgtk3/0003-disable-atk-bridge.patch rename to package/libgtk3/0001-disable-atk-bridge.patch index 390fc012fa..f3e9bff2ba 100644 --- a/package/libgtk3/0003-disable-atk-bridge.patch +++ b/package/libgtk3/0001-disable-atk-bridge.patch @@ -5,21 +5,6 @@ add two new packages just for it: at-spi2-core and at-spi2-atk. Signed-off-by: Hadrien Boutteville ---- a/configure.ac -+++ b/configure.ac -@@ -1386,11 +1386,7 @@ - # Check for Accessibility Toolkit flags - ######################################## - --if test x$enable_x11_backend = xyes; then -- ATK_PACKAGES="atk atk-bridge-2.0" --else -- ATK_PACKAGES="atk" --fi -+ATK_PACKAGES="atk" - - PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) - --- a/gtk/a11y/gtkaccessibility.c +++ b/gtk/a11y/gtkaccessibility.c @@ -37,10 +37,6 @@ @@ -33,7 +18,7 @@ Signed-off-by: Hadrien Boutteville static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, -@@ -988,9 +984,5 @@ +@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) _gtk_accessibility_override_atk_util (); do_window_event_initialization (); @@ -43,3 +28,14 @@ Signed-off-by: Hadrien Boutteville - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); } +--- a/meson.build ++++ b/meson.build +@@ -564,7 +564,7 @@ if x11_enabled + xfixes_dep = dependency('xfixes', required: false) + xcomposite_dep = dependency('xcomposite', required: false) + fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) +- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) ++ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) + + backend_immodules += ['xim'] + diff --git a/package/libgtk3/0001-no-gtk-doc.patch b/package/libgtk3/0001-no-gtk-doc.patch deleted file mode 100644 index e1d3208022..0000000000 --- a/package/libgtk3/0001-no-gtk-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -Same patch as for systemd in commit -http://git.buildroot.net/buildroot/commit/?id=7144f2f04b70553 - -Fix deactivation of gtk-doc - -The tarball contains the Makefile for building documentation with gtk-doc, -Unfortunately the AM_CONDITIONAL variable is not the correct one, which -results in an error when running autoreconf. - -This patch fixes this issue. - -Signed-off-by: Eric Le Bihan -Signed-off-by: Hadrien Boutteville - ---- a/gtk-doc.make -+++ b/gtk-doc.make -@@ -300,7 +300,7 @@ - # - # Require gtk-doc when making dist - # --if HAVE_GTK_DOC -+if ENABLE_GTK_DOC - dist-check-gtkdoc: docs - else - dist-check-gtkdoc: diff --git a/package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch b/package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch similarity index 100% rename from package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch rename to package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch diff --git a/package/libgtk3/0002-fix-introspection-check.patch b/package/libgtk3/0002-fix-introspection-check.patch deleted file mode 100644 index 7edf7db71f..0000000000 --- a/package/libgtk3/0002-fix-introspection-check.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix HAVE_INTROSPECTION does not appear in AM_CONDITIONAL - -During autoreconf GOBJECT_INTROSPECTION_CHECK could not be resolved because we -don't have introspection which provides its custom m4 macro. Reconfigure fails -with: - -gdk/Makefile.am:196: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL -gtk/Makefile.am:1347: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL - -We avoid to add a copy of introspection.m4 in the m4 directory of libgtk3 by -adding a check, as performed in Systemd. - -Signed-off-by: Hadrien Boutteville - ---- a/configure.ac -+++ b/configure.ac -@@ -1690,7 +1690,10 @@ - # GObject introspection - ################################################## - --GOBJECT_INTROSPECTION_CHECK(introspection_required_version) -+m4_ifdef([GOBJECT_INTROSPECTION_CHECK], -+ [GOBJECT_INTROSPECTION_CHECK(introspection_required_version)], -+ [AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) -+ enable_introspection=no]) - - ################################################## - # colord module diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index bc8cacd9f5..82ca68d2da 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -88,6 +88,7 @@ config BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXI help diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 1715b94e73..9fed2c9df2 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.35.sha256sum -sha256 ec10fe6d712ef0b3c63b5f932639c9d1ae99fce94f500f6f06965629fef60bd1 gtk+-3.24.35.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.36.sha256sum +sha256 27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691 gtk+-3.24.36.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 4c93413fb2..283c129cef 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).35 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).36 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ @@ -13,69 +13,42 @@ LIBGTK3_LICENSE_FILES = COPYING LIBGTK3_CPE_ID_VENDOR = gnome LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_AUTORECONF = YES - -LIBGTK3_CONF_ENV = \ - ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/bin/gtk-update-icon-cache \ - ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/bin/gdk-pixbuf-csource \ - PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf - -LIBGTK3_CONF_OPTS = \ - --disable-glibtest \ - --enable-explicit-deps=no -HOST_LIBGTK3_CONF_OPTS = --disable-introspection - -# Override pkg-config pkgdatadir variable, it needs the prefix -LIBGTK3_MAKE_OPTS = \ - WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols \ - LIBS=$(TARGET_NLS_LIBS) LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \ gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrender xlib_libXi - -LIBGTK3_CONF_OPTS += \ - --enable-x11-backend \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib +LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrandr xlib_libXrender xlib_libXi +LIBGTK3_CONF_OPTS += -Dx11_backend=true else -LIBGTK3_CONF_OPTS += --disable-x11-backend +LIBGTK3_CONF_OPTS += -Dx11_backend=false endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBGTK3_CONF_OPTS += --enable-introspection +LIBGTK3_CONF_OPTS += -Dintrospection=true LIBGTK3_DEPENDENCIES += gobject-introspection else -LIBGTK3_CONF_OPTS += --disable-introspection +LIBGTK3_CONF_OPTS += -Dintrospection=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) LIBGTK3_DEPENDENCIES += wayland wayland-protocols libxkbcommon -LIBGTK3_CONF_OPTS += --enable-wayland-backend +LIBGTK3_CONF_OPTS += -Dwayland_backend=true else -LIBGTK3_CONF_OPTS += --disable-wayland-backend +LIBGTK3_CONF_OPTS += -Dwayland_backend=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_BROADWAY),y) -LIBGTK3_CONF_OPTS += --enable-broadway-backend +LIBGTK3_CONF_OPTS += -Dbroadway_backend=true else -LIBGTK3_CONF_OPTS += --disable-broadway-backend +LIBGTK3_CONF_OPTS += -Dbroadway_backend=false endif ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -LIBGTK3_CONF_OPTS += --enable-xinerama +LIBGTK3_CONF_OPTS += -Dxinerama=yes LIBGTK3_DEPENDENCIES += xlib_libXinerama else -LIBGTK3_CONF_OPTS += --disable-xinerama -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -LIBGTK3_CONF_OPTS += --enable-xrandr -LIBGTK3_DEPENDENCIES += xlib_libXrandr -else -LIBGTK3_CONF_OPTS += --disable-xrandr +LIBGTK3_CONF_OPTS += -Dxinerama=no endif ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) @@ -83,55 +56,35 @@ LIBGTK3_DEPENDENCIES += xlib_libXcursor endif ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) -LIBGTK3_CONF_OPTS += --enable-xfixes LIBGTK3_DEPENDENCIES += xlib_libXfixes -else -LIBGTK3_CONF_OPTS += --disable-xfixes endif ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) -LIBGTK3_CONF_OPTS += --enable-xcomposite LIBGTK3_DEPENDENCIES += xlib_libXcomposite -else -LIBGTK3_CONF_OPTS += --disable-xcomposite endif ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y) -LIBGTK3_CONF_OPTS += --enable-xdamage LIBGTK3_DEPENDENCIES += xlib_libXdamage -else -LIBGTK3_CONF_OPTS += --disable-xdamage -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y) -LIBGTK3_CONF_OPTS += --enable-xkb -LIBGTK3_DEPENDENCIES += xlib_libxkbfile -else -LIBGTK3_CONF_OPTS += --disable-xkb endif ifeq ($(BR2_PACKAGE_CUPS),y) -LIBGTK3_CONF_OPTS += --enable-cups -LIBGTK3_CONF_ENV += ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config +LIBGTK3_CONF_OPTS += -Dprint_backends=cups LIBGTK3_DEPENDENCIES += cups else -LIBGTK3_CONF_OPTS += --disable-cups +LIBGTK3_CONF_OPTS += -Dprint_backends=auto endif ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y) +LIBGTK3_CONF_OPTS += -Ddemos=true -Dexamples=true LIBGTK3_DEPENDENCIES += hicolor-icon-theme shared-mime-info else -define LIBGTK3_REMOVE_DEMOS - $(RM) $(TARGET_DIR)/usr/bin/gtk3-demo \ - $(TARGET_DIR)/usr/bin/gtk3-demo-application -endef -LIBGTK3_POST_INSTALL_TARGET_HOOKS += LIBGTK3_REMOVE_DEMOS +LIBGTK3_CONF_OPTS += -Ddemos=false -Dexamples=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_TESTS),y) -LIBGTK3_CONF_OPTS += --enable-installed-tests +LIBGTK3_CONF_OPTS += -Dtests=true -Dinstalled_tests=true else -LIBGTK3_CONF_OPTS += --disable-installed-tests +LIBGTK3_CONF_OPTS += -Dtests=false -Dinstalled_tests=false endif define LIBGTK3_COMPILE_GLIB_SCHEMAS @@ -198,5 +151,5 @@ define LIBGTK3_UPDATE_ICON_CACHE endef LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-generic-package)) From peter at korsgaard.com Mon Feb 20 21:00:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:08 -0000 Subject: [Buildroot] [git commit branch/next] package/iw: bump version to 5.19 Message-ID: <20230220205230.152128648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c21710040224448d71d4417e166cdd2c7f6a06b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Nicolas Cavallari Signed-off-by: Peter Korsgaard --- package/iw/iw.hash | 2 +- package/iw/iw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iw/iw.hash b/package/iw/iw.hash index 33dd117368..376dc3b499 100644 --- a/package/iw/iw.hash +++ b/package/iw/iw.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/iw/sha256sums.asc -sha256 4c44e42762f903f9094ba5a598998c800a97a62afd6fd31ec1e0a799e308659c iw-5.16.tar.xz +sha256 f167bbe947dd53bb9ebc0c1dcef5db6ad73ac1d6084f2c6f9376c5c360cc4d4e iw-5.19.tar.xz # Locally calculated sha256 5932fb70481e128940168a5fdf133e6454293c0865c7e757874b235cb6daa2af COPYING diff --git a/package/iw/iw.mk b/package/iw/iw.mk index 9bf6ddbfc6..60ada9d57f 100644 --- a/package/iw/iw.mk +++ b/package/iw/iw.mk @@ -4,7 +4,7 @@ # ################################################################################ -IW_VERSION = 5.16 +IW_VERSION = 5.19 IW_SOURCE = iw-$(IW_VERSION).tar.xz IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw IW_LICENSE = ISC From thomas.petazzoni at bootlin.com Tue Feb 7 21:57:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:57:06 +0100 Subject: [Buildroot] [git commit branch/next] package/xz: fix microblaze compiles Message-ID: <20230220205254.2CE348648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bed21bb9b462bece7cd1b9741643aa553ced4d35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Patch xz to check if __attribute__((symver ..)) is supported via a compile check during configure. Fixes: http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni --- .../xz/0001-Detect-symver-attribute-support.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch new file mode 100644 index 0000000000..9ec43ea7a0 --- /dev/null +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -0,0 +1,61 @@ +From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 08:51:24 -0600 +Subject: [PATCH] Detect symver attribute support + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://github.com/tukaani-project/xz/pull/32 +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vincent Fazio +--- + configure.ac | 9 +++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5ad5589..08c623a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -791,6 +791,15 @@ else + time with Libtool if neither --with-pic nor + --without-pic is used). This define must be + used together with liblzma_linux.map.]) ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE( ++ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ])], ++ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], ++ [Define to 1 if GCC supports the symver attribute])], ++ []) ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic +diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h +index 11fec52..1d2ef9c 100644 +--- a/src/liblzma/common/common.h ++++ b/src/liblzma/common/common.h +@@ -76,7 +76,7 @@ + // too (which doesn't support __symver__) so use it to detect if __symver__ + // is available. This should be far more reliable than looking at compiler + // version macros as nowadays especially __GNUC__ is defined by many compilers. +-# if lzma_has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define LZMA_SYMVER_API(extnamever, type, intname) \ + extern __attribute__((__symver__(extnamever))) \ + LZMA_API(type) intname +-- +2.25.1 + From peter at korsgaard.com Mon Feb 20 21:00:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:09 -0000 Subject: [Buildroot] [git commit branch/next] configs/chiliboard: bump linux to 6.1.4 Message-ID: <20230220205230.2167886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3842ca3c66c6368fd13a7329a518c4d02b1beb6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- configs/grinn_chiliboard_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig index 80f3077b76..df483d991a 100644 --- a/configs/grinn_chiliboard_defconfig +++ b/configs/grinn_chiliboard_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/chiliboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-chiliboard" From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:33 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Giulio Benetti to package rtl8821cu Message-ID: <20230220205254.5C7B28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfad9bef35e984f00ae70f1cd51cc75b89ff5efc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index d7c4d03c4c..2cb3361c83 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1163,6 +1163,7 @@ F: package/rtl8723bu/ F: package/rtl8723ds/ F: package/rtl8812au-aircrack-ng/ F: package/rtl8821au/ +F: package/rtl8821cu/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ F: package/sunxi-tools/ From thomas.petazzoni at bootlin.com Wed Feb 8 08:54:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:54:14 +0100 Subject: [Buildroot] [git commit branch/next] package/libva: switch to meson Message-ID: <20230220205254.8C23A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17be7d028c193dc1160a4cb9313efe37326e7aa9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The time between version 2.17.0 being tagged and the release of its tarball version containing autoconf scripts was three weeks now. With the switch to meson we can directly use the github-generated tarball while not needing to run autoreconf. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libva/libva.hash | 4 +--- package/libva/libva.mk | 19 +++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 700ace0378..780c186069 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,5 +1,3 @@ -# From https://github.com/intel/libva/releases/download/2.17.0/libva-2.17.0.tar.bz2.sha1sum -sha1 997f7b3111bc5a4d32ec72e9d7f9fcfca41e4923 libva-2.17.0.tar.bz2 # Locally computed -sha256 f3e5eb27c305e05a9bb62703d1915a127301cc0c4f9f209025767432230c4eac libva-2.17.0.tar.bz2 +sha256 8940541980ef998a36cd8f6ad905e81838ea4ddf56dc479ed2bebd12711e6001 libva-2.17.0.tar.gz sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index c6b9f63b10..f50010d9fc 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -5,8 +5,7 @@ ################################################################################ LIBVA_VERSION = 2.17.0 -LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 -LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) +LIBVA_SITE = $(call github,intel,libva,$(LIBVA_VERSION)) LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING LIBVA_INSTALL_STAGING = YES @@ -14,25 +13,25 @@ LIBVA_DEPENDENCIES = host-pkgconf libdrm # libdrm is a hard-dependency LIBVA_CONF_OPTS = \ - --enable-drm \ - --with-drivers-path="/usr/lib/va" + -Ddisable_drm=false \ + -Ddriverdir="/usr/lib/va" ifeq ($(BR2_PACKAGE_XORG7),y) LIBVA_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes -LIBVA_CONF_OPTS += --enable-x11 +LIBVA_CONF_OPTS += -Dwith_x11=yes ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) LIBVA_DEPENDENCIES += libgl -LIBVA_CONF_OPTS += --enable-glx +LIBVA_CONF_OPTS += -Dwith_glx=yes endif else -LIBVA_CONF_OPTS += --disable-glx --disable-x11 +LIBVA_CONF_OPTS += -Dwith_glx=no -Dwith_x11=no endif ifeq ($(BR2_PACKAGE_WAYLAND),y) LIBVA_DEPENDENCIES += wayland -LIBVA_CONF_OPTS += --enable-wayland +LIBVA_CONF_OPTS += -Dwith_wayland=yes else -LIBVA_CONF_OPTS += --disable-wayland +LIBVA_CONF_OPTS += -Dwith_wayland=no endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From peter at korsgaard.com Mon Feb 20 21:00:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:10 -0000 Subject: [Buildroot] [git commit branch/next] configs/liteboard: bump linux to 6.1.4 Message-ID: <20230220205230.390EF81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5c509bcc0e28a71d58248158e904315486624bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- configs/grinn_liteboard_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig index 9cad66e15a..ab22911d66 100644 --- a/configs/grinn_liteboard_defconfig +++ b/configs/grinn_liteboard_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/liteboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard" From thomas.petazzoni at bootlin.com Wed Feb 8 08:54:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:54:35 +0100 Subject: [Buildroot] [git commit branch/next] package/libva-utils: bump version to 2.17.1 Message-ID: <20230220205254.981828648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9231fe0d6eeb6cdf373715d35b2203d34fd9e859 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/intel/libva-utils/blob/v2.17-branch/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libva-utils/libva-utils.hash | 2 +- package/libva-utils/libva-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 95bcee782b..41374a2ff6 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 646c9bfff6a83504c48de2c786c9514ca30c5e916127faf00f143ef8147ee950 libva-utils-2.16.0.tar.gz +sha256 6ea5993c3eba230a979fa9d35b4cad8df06d4474a773dc0918033bf50353f966 libva-utils-2.17.1.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index 5feaa36995..3dc8cdacde 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.16.0 +LIBVA_UTILS_VERSION = 2.17.1 LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 21:00:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:12 -0000 Subject: [Buildroot] [git commit branch/next] configs/liteboard: bump u-boot to 2023.01 Message-ID: <20230220205230.4B9D7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=895a5562c02b7f1ac762f17dcd08ee8b2a39e4f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- configs/grinn_liteboard_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig index ab22911d66..3ae4a2a0b5 100644 --- a/configs/grinn_liteboard_defconfig +++ b/configs/grinn_liteboard_defconfig @@ -16,7 +16,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="liteboard" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y From peter at korsgaard.com Mon Feb 20 21:00:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:12 -0000 Subject: [Buildroot] [git commit branch/next] package/libsigc: bump to version 3.4.0 Message-ID: <20230220205230.767D08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb066af7f9d84abf890c5692879477aaca36bff8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/libsigcplusplus/libsigcplusplus/blob/3.4.0/NEWS Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- package/libsigc/libsigc.hash | 4 ++-- package/libsigc/libsigc.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libsigc/libsigc.hash b/package/libsigc/libsigc.hash index 046584fc2b..a358732faa 100644 --- a/package/libsigc/libsigc.hash +++ b/package/libsigc/libsigc.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.2/libsigc++-3.2.0.sha256sum -sha256 8cdcb986e3f0a7c5b4474aa3c833d676e62469509f4899110ddf118f04082651 libsigc++-3.2.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.4/libsigc++-3.4.0.sha256sum +sha256 02e2630ffb5ce93cd52c38423521dfe7063328863a6e96d41d765a6116b8707e libsigc++-3.4.0.tar.xz # Locally calculated sha256 97628afebc60f026f5c2b25d7491c46a5c4ee61f693e7cfa07fbd2c03605979b COPYING diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk index eca4111ff6..2de49a0c1c 100644 --- a/package/libsigc/libsigc.mk +++ b/package/libsigc/libsigc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSIGC_VERSION_MAJOR = 3.2 +LIBSIGC_VERSION_MAJOR = 3.4 LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).0 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) @@ -13,6 +13,7 @@ LIBSIGC_LICENSE = LGPL-3.0+ LIBSIGC_LICENSE_FILES = COPYING LIBSIGC_CONF_OPTS = \ -Dbuild-examples=false \ + -Dbuild-tests=false \ -Dvalidation=false $(eval $(meson-package)) From peter at korsgaard.com Wed Feb 8 10:47:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:47:01 +0100 Subject: [Buildroot] [git commit branch/next] package/timescaledb: bump version to 2.9.3 Message-ID: <20230220205254.BAE328648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35423540c4eb0155f73b898539e00b72ed5f2b32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/timescale/timescaledb/releases/tag/2.9.3 Signed-off-by: Maxim Kochetkov 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 a6560eb326..2fd14e6c1a 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 883638f2e79d25ec88ee58f603f3c81c999b6364cb4c799919d363f04089b47b timescaledb-2.9.1.tar.gz +sha256 ff0820891646a772aceab19ee0f7da0a5343dc53b9a72c965ab70f723d231d5c timescaledb-2.9.3.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 44e365285b..e3c94ed2fe 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.9.1 +TIMESCALEDB_VERSION = 2.9.3 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 21:00:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:14 -0000 Subject: [Buildroot] [git commit branch/next] board/orangepi-zero-plus: bump Linux/U-Boot and switch to extlinux Message-ID: <20230220205230.6785D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19eaece70a9c7aac8b26bd09c1a49b30e29f824a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Follow changes to other OrangePi boards, most importantly orangepi-zero-plus2, which this board support is based on. This includes switching to extlinux as boot mechanism and dropping custom U-Boot boot script. Rootfs image no longer fits into default 60M (mostly due to Linux modules), so increase it to 120M. While at it, bump Linux to 6.1.4 and U-Boot to 2023.01. Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-zero-plus/boot.cmd | 6 ---- board/orangepi/orangepi-zero-plus/genimage.cfg | 40 -------------------------- configs/orangepi_zero_plus_defconfig | 27 +++++++++-------- 3 files changed, 15 insertions(+), 58 deletions(-) diff --git a/board/orangepi/orangepi-zero-plus/boot.cmd b/board/orangepi/orangepi-zero-plus/boot.cmd deleted file mode 100644 index 18c4d521af..0000000000 --- a/board/orangepi/orangepi-zero-plus/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero-plus/genimage.cfg b/board/orangepi/orangepi-zero-plus/genimage.cfg deleted file mode 100644 index a8f3161c39..0000000000 --- a/board/orangepi/orangepi-zero-plus/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-zero-plus.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig index e8de5c203d..26a25bd9f8 100644 --- a/configs/orangepi_zero_plus_defconfig +++ b/configs/orangepi_zero_plus_defconfig @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" @@ -17,35 +17,38 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=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_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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-zero-plus/boot.cmd" +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# 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-plus/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" From arnout at mind.be Tue Feb 7 16:26:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 17:26:31 +0100 Subject: [Buildroot] [git commit branch/next] package/{rust, rust-bin}: bump to version 1.67.0 Message-ID: <20230220205253.3C779828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cffe45f91bc5aed2a2a56f84e3a34b6385f70ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Link to Rust 1.67.0 announcement: https://blog.rust-lang.org/2023/01/26/Rust-1.67.0.html Signed-off-by: James Hilliard Tested-by: Sebastian Weyer Signed-off-by: Arnout Vandecappelle --- package/rust-bin/rust-bin.hash | 252 ++++++++++++++++++++--------------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index adf1799ad7..d00e6342e8 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 a1279760f91b3571733e0b0268128d143be2734916753900b5fe7b8ecc3c0900 rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 835b4e1b4d396674f7866a83b9a4f44db16fd12f01a7eaed527282b3700a9b92 rust-1.66.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc -sha256 c7349617c42274bf50f6e3662dfb4f6832a93780099c3bb510be1a5b93d04c37 rust-1.66.1-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 fc38663870f0af47a27241d980ca886c3f7d432267920deb412ac8576bef68f0 rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 2b1a6c54db49a9e62d60cc96c1768f405e0f4c59d698186bf3a28a1bb017b6b5 rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 777d3a650448c15048710282388e90d10740540f570f5d17ed4a2dbdabb89552 rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 875bb310bae7c8c1d2d228a49aa4b547608b6c807ddc9ec44bc87272c77d869b rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 89164ccf75909b3d02bdcb787e33876cad87e55ab0e6239b030b4b6631ed356a rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 e83f9fc473072db23376783595a008cdd9b2f2e9b3be109e55939392864840eb rust-1.66.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 a201aa4595ec8015662b7103b1409a4787c6d1f1d540bb68746633527d855858 rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24 rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc -sha256 520ac446f20490685cc4d73192cfbb4c9b9e55c884aa4ae2b098e3a54d891de8 rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 42afd189ef64988f64976f767a734734bccd7c71e578780e902148c98226fa29 rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 506126773af9c3dacc506776a0b2e12fe6fa0c95eaf4f4ebb5cdbd335feb83fa rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 3d21b478fbf07bd27902bdd189e6988341f0c2c0108b538f926cea3031bc8ea6 rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.asc -sha256 5282fc97111a7eafbead3463ed7bc0f3065332f21aec6a39a740157fe42f943a rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 0ebf0178bbe9c5572d1db89e190dee23aef0e2f667995abedbd66e33d0bd73ab rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 938e7442c21ea0895c44ec78fa718ea1d3abe32ed0425ed328c905e188af250e rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 bdc491f4c05669e7a3382b6bfdaeaa20e2cfa5ef553305df0e0d73729a45e6e4 rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 d75c6dc3c00d662b0d3f6ce7fde0f76057542edfbc97a20b29247842c8a711d2 rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 830285e5388081c68fac9dc955aa824a4d919b0e24eadc6e0b95b30103d79db9 rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 d720bd1e493f53797f90d83dbe6d52ecbe1ff3cae282f4b2e18c37fe92c9adf6 rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.asc -sha256 90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17 rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.asc -sha256 c4bab2d63223d0c6e63806082e30d8c38b37eefc10ee2e7380971e3012c00bca rust-std-1.66.1-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.asc -sha256 52013329eb6697d94f5dce01dd509b4b93b473c18a3a2c05d0230b9dfeab14d1 rust-std-1.66.1-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.asc -sha256 e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568 rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.asc -sha256 23f917eccaca59d4c911eb96d8ffefe86834dbcdf902c9ab6dad8558c31c4575 rust-std-1.66.1-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 70d1406e0981d5d31c1d3f85c848bba0476e0ff6203e7706f66b4d2212f01b66 rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 0fd221d4b4205ce548e83f0e7416c8332eb12b64d5a43c0b3ed61e9f7d6edf13 rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 132d6d5750a877972ebc6f23e831f2ef3077465b2ab24ca645d32ea83c496fe3 rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 533f370368ac8b6192e1450289c64544ebf9cacc38c3a52ef6c0ecded7ee6fa5 rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.asc -sha256 d7028820888d0decde047a6e77b866e690532aa09522c9a23a3fbf8780a72257 rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1 rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35 rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770 rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062 rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927 rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377 rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc -sha256 a9710727ba28955deb7fbec799faed19486c9af3c7e3088ec6659a257515ffca rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc +sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc +sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc +sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc +sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index 89009288f4..d62ce39cfc 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.66.1 +RUST_BIN_VERSION = 1.67.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 545a452bf0..2a260ca64f 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc -sha256 07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe rustc-1.66.1-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc +sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 691683b492..d14ad3a3e7 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.66.1 +RUST_VERSION = 1.67.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From peter at korsgaard.com Mon Feb 20 21:00:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:15 -0000 Subject: [Buildroot] [git commit branch/next] package/libsigc: switch to https download Message-ID: <20230220205230.86695828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21175102a0cd544a789c3cedead7d5141191275c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- package/libsigc/libsigc.hash | 2 +- package/libsigc/libsigc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsigc/libsigc.hash b/package/libsigc/libsigc.hash index a358732faa..6becfb19ce 100644 --- a/package/libsigc/libsigc.hash +++ b/package/libsigc/libsigc.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.4/libsigc++-3.4.0.sha256sum +# From https://download.gnome.org/sources/libsigc++/3.4/libsigc++-3.4.0.sha256sum sha256 02e2630ffb5ce93cd52c38423521dfe7063328863a6e96d41d765a6116b8707e libsigc++-3.4.0.tar.xz # Locally calculated diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk index 2de49a0c1c..c054575ea6 100644 --- a/package/libsigc/libsigc.mk +++ b/package/libsigc/libsigc.mk @@ -7,7 +7,7 @@ LIBSIGC_VERSION_MAJOR = 3.4 LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).0 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz -LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) +LIBSIGC_SITE = https://download.gnome.org/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) LIBSIGC_INSTALL_STAGING = YES LIBSIGC_LICENSE = LGPL-3.0+ LIBSIGC_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for widgets gtk backend Message-ID: <20230220205255.1866386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=889f451caf22f5b36ff8430d7927e8cb3a56681e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2a0afa6d27..911375aa6d 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -217,6 +217,15 @@ endif ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON + +# only enable gtk support if libgtk3 X11 backend is enabled +ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy) +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=ON +QT6BASE_DEPENDENCIES += libgtk3 +else +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif From peter at korsgaard.com Mon Feb 20 21:00:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:16 -0000 Subject: [Buildroot] [git commit branch/next] package/python-ujson: bump to version 5.7.0 Message-ID: <20230220205230.A291F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f397197b3658968931a5a4b273fcebf5fdca1569 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-ujson/python-ujson.hash | 4 ++-- package/python-ujson/python-ujson.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-ujson/python-ujson.hash b/package/python-ujson/python-ujson.hash index 3dfc681167..759cafc250 100644 --- a/package/python-ujson/python-ujson.hash +++ b/package/python-ujson/python-ujson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ujson/json -md5 45a74680e2936470821bf74a8f043a71 ujson-5.6.0.tar.gz -sha256 f881e2d8a022e9285aa2eab6ba8674358dbcb2b57fa68618d88d62937ac3ff04 ujson-5.6.0.tar.gz +md5 f93bd7aa33e3e6ed41c9e3782abe7b48 ujson-5.7.0.tar.gz +sha256 e788e5d5dcae8f6118ac9b45d0b891a0d55f7ac480eddcb7f07263f2bcf37b23 ujson-5.7.0.tar.gz # Locally computed sha256 checksums sha256 6a00a8f8b4050303368b694147bde1aed9c96bdff869c181dbbf3ccb784a1501 LICENSE.txt diff --git a/package/python-ujson/python-ujson.mk b/package/python-ujson/python-ujson.mk index 24ad4822b8..3afd33cb5a 100644 --- a/package/python-ujson/python-ujson.mk +++ b/package/python-ujson/python-ujson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UJSON_VERSION = 5.6.0 +PYTHON_UJSON_VERSION = 5.7.0 PYTHON_UJSON_SOURCE = ujson-$(PYTHON_UJSON_VERSION).tar.gz -PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/45/48/466d672c53fcb93d64a2817e3a0306214103e3baba109821c88e1150c100 +PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/43/1a/b0a027144aa5c8f4ea654f4afdd634578b450807bb70b9f8bad00d6f6d3c PYTHON_UJSON_SETUP_TYPE = setuptools PYTHON_UJSON_LICENSE = BSD-3-Clause PYTHON_UJSON_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Wed Feb 8 10:48:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:48:59 +0100 Subject: [Buildroot] [git commit branch/next] package/osm2pgsql: bump version to 1.8.0 Message-ID: <20230220205254.D276086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d27f4c311c19f5ae130ec1941e964976d3a4f2b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.8.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index 505a4496c8..b5b76c15c6 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94c72ceb3c401c816499339f8765c62efbf40685a798dcdf9a4bf7dbedf6c7a5 osm2pgsql-1.7.2.tar.gz +sha256 b266b50f46fe4d1caddab61d26b39f10ea33b896ec23b8b3e294be4666e7b927 osm2pgsql-1.8.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 2bc8d41e6e..9cdfb44ce0 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.7.2 +OSM2PGSQL_VERSION = 1.8.0 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 21:00:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:17 -0000 Subject: [Buildroot] [git commit branch/next] package/redis: bump to v7.0.7 Message-ID: <20230220205230.D32128648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbdc0f8ef8bdbe919925e281b2d5ce1583fd1aab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next >From the release notes (https://github.com/redis/redis/blob/7.0.7/00-RELEASENOTES) ================================================================================ Redis 7.0.7 Released Fri Dec 16 12:00:00 IST 2022 ================================================================================ Upgrade urgency: MODERATE, Contains fix for a regression in Geo commands. ================================================================================ Redis 7.0.6 Released Mon Dec 12 12:00:00 IST 2022 ================================================================================ Upgrade urgency: MODERATE, Contains fixes for a few non-critical or unlikely bugs, and some dramatic optimizations to Geo, EVAL, and Sorted sets commands. Signed-off-by: Titouan Christophe Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 2 +- package/redis/redis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index a10df46031..eb8c21be98 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 67054cc37b58c125df93bd78000261ec0ef4436a26b40f38262c780e56315cc3 redis-7.0.5.tar.gz +sha256 8d327d7e887d1bb308fc37aaf717a0bf79f58129e3739069aaeeae88955ac586 redis-7.0.7.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 7a637c106c..b08be11538 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 7.0.5 +REDIS_VERSION = 7.0.7 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Wed Feb 8 10:50:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:50:37 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for fontconfig/harfbuzz Message-ID: <20230220205254.E9C908648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf5c0db35a06455182f6568ab2cfa69346f8b3a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Additionally the harfbuzz license file is added and the hash for this is also added to the hash file Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 17 +++++++++++++++++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 1810b1586d..ac2058c901 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -59,6 +59,23 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_FONTCONFIG + bool "fontconfig support" + select BR2_PACKAGE_FONTCONFIG + help + This option enables Fontconfig support using the system + fontconfig library. + +config BR2_PACKAGE_QT6BASE_HARFBUZZ + bool "harfbuzz support" + select BR2_PACKAGE_HARFBUZZ if \ + BR2_TOOLCHAIN_HAS_SYNC_4 && \ + BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + This option enables HarfBuzz support (either system harfbuzz + if the toolchain supports __sync for 4 bytes, or the qt + provided one which avoids this dependency by using QAtomic). + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 6544a371c6..fedbbba79f 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -11,3 +11,4 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt sha256 d040359701c01996a017d5c515678929cd1b0625e64cb86db44025fbb6cdf1fc LICENSES/MIT.txt sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index bcf2464590..6c155a4abb 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -172,6 +172,29 @@ else QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_HARFBUZZ),y) +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=ON +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y) +# system harfbuzz in case __sync for 4 bytes is supported +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=OFF +QT6BASE_DEPENDENCIES += harfbuzz +else #BR2_TOOLCHAIN_HAS_SYNC_4 +# qt harfbuzz otherwise (using QAtomic instead) +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=ON +QT6BASE_LICENSE += , MIT (harfbuzz) +QT6BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON +QT6BASE_DEPENDENCIES += fontconfig +else +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From peter at korsgaard.com Mon Feb 20 21:00:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:18 -0000 Subject: [Buildroot] [git commit branch/next] package/python-watchdog: bump to version 2.2.1 Message-ID: <20230220205230.B3343828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a598dedd8090d3c7ba4ea8c323a702289586647 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-watchdog/python-watchdog.hash | 4 ++-- package/python-watchdog/python-watchdog.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-watchdog/python-watchdog.hash b/package/python-watchdog/python-watchdog.hash index 3bacccf2d6..0653787110 100644 --- a/package/python-watchdog/python-watchdog.hash +++ b/package/python-watchdog/python-watchdog.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/watchdog/json -md5 d029b806814bcba26745c26769a847bc watchdog-2.2.0.tar.gz -sha256 83cf8bc60d9c613b66a4c018051873d6273d9e45d040eed06d6a96241bd8ec01 watchdog-2.2.0.tar.gz +md5 04cda210c7ffd04582d2466328ee7368 watchdog-2.2.1.tar.gz +sha256 cdcc23c9528601a8a293eb4369cbd14f6b4f34f07ae8769421252e9c22718b6f watchdog-2.2.1.tar.gz # Locally computed sha256 checksums sha256 02c8760f988a76e92a9d6cb525456a86f7b0fd1953870dd491de5955cb974d41 COPYING sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-watchdog/python-watchdog.mk b/package/python-watchdog/python-watchdog.mk index bb9f145e16..9c058e38ad 100644 --- a/package/python-watchdog/python-watchdog.mk +++ b/package/python-watchdog/python-watchdog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WATCHDOG_VERSION = 2.2.0 +PYTHON_WATCHDOG_VERSION = 2.2.1 PYTHON_WATCHDOG_SOURCE = watchdog-$(PYTHON_WATCHDOG_VERSION).tar.gz -PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/c3/fb/bd960970258366b0704307ccd12617d64201407bfb6d31ae412d2762ccf1 +PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/11/6f/0396d373e039b89c60e23a1a9025edc6dd203121fe0af7d1427e85d5ec98 PYTHON_WATCHDOG_SETUP_TYPE = setuptools PYTHON_WATCHDOG_LICENSE = Apache-2.0 PYTHON_WATCHDOG_LICENSE_FILES = LICENSE COPYING From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for tslib Message-ID: <20230220205255.3C0D48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73d6df812d9eaccfad9cf4b5cb4fc53d30205e20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 3af6fd9f72..da42b2ae0c 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -216,6 +216,12 @@ config BR2_PACKAGE_QT6BASE_TEST help This options enables the Qt6Test library. +config BR2_PACKAGE_QT6BASE_TSLIB + bool "Enable Tslib support" + select BR2_PACKAGE_TSLIB + help + This options enables the Tslib plugin + config BR2_PACKAGE_QT6BASE_XML bool "XML module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 828fe57d0b..8db59bbc31 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -229,6 +229,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) +QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON +QT6BASE_DEPENDENCIES += tslib +else +QT6BASE_CONF_OPTS += -DFEATURE_tslib=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON QT6BASE_DEPENDENCIES += libegl libgbm From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for printsupport/cups Message-ID: <20230220205255.6085E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d195622f2388edd021c6f71ba78eb3d2f9539f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 8 ++++++++ package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index da42b2ae0c..7927975bff 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -153,6 +153,14 @@ config BR2_PACKAGE_QT6BASE_WIDGETS help This option enables the Qt6Widgets library. +config BR2_PACKAGE_QT6BASE_PRINTSUPPORT + bool "printing support" + # yes, print support needs widgets + depends on BR2_PACKAGE_QT6BASE_WIDGETS + help + This option enables printing support, optionally using CUPS + if available. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index f4e63ab8d9..7b57eba4ab 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -207,6 +207,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT),y) +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON +ifeq ($(BR2_PACKAGE_CUPS),y) +QT6BASE_CONF_OPTS += -DFEATURE_cups=ON +QT6BASE_DEPENDENCIES += cups +else +QT6BASE_CONF_OPTS += -DFEATURE_cups=OFF +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF +endif + ifeq ($(BR2_PACKAGE_LIBDRM),y) QT6BASE_CONF_OPTS += -DFEATURE_kms=ON QT6BASE_DEPENDENCIES += libdrm From peter at korsgaard.com Mon Feb 20 21:00:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:20 -0000 Subject: [Buildroot] [git commit branch/next] package/python-xlsxwriter: bump to version 3.0.6 Message-ID: <20230220205231.003B18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=431683def0785583705fb32dc1a54f82da65e423 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next License hash changed due to date update: https://github.com/jmcnamara/XlsxWriter/commit/ba92afc31a232322597709bf7ad4a3b14ca7b293 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-xlsxwriter/python-xlsxwriter.hash | 6 +++--- package/python-xlsxwriter/python-xlsxwriter.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-xlsxwriter/python-xlsxwriter.hash b/package/python-xlsxwriter/python-xlsxwriter.hash index 4363799079..4a4b946fcb 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.hash +++ b/package/python-xlsxwriter/python-xlsxwriter.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/xlsxwriter/json -md5 b08fcc4753c14aa64b9d99219475d91e XlsxWriter-3.0.3.tar.gz -sha256 e89f4a1d2fa2c9ea15cde77de95cd3fd8b0345d0efb3964623f395c8c4988b7f XlsxWriter-3.0.3.tar.gz +md5 3df433a1b6427d40af6e7cac36f0b5c4 XlsxWriter-3.0.6.tar.gz +sha256 2f9e5ea13343fe85486e349d4e5fdf746bb69dc7bc1dedfa9b5fae2bb48c0795 XlsxWriter-3.0.6.tar.gz # Locally computed sha256 checksums -sha256 6287be39bd007c8729f5c3cf8dfda9b462af725c1d06e3bf0e17b1532196a08f LICENSE.txt +sha256 b3b494c7e7456dad12ac1b3e61c60e850d60d3ce865fa056c4ce0ae680c03677 LICENSE.txt diff --git a/package/python-xlsxwriter/python-xlsxwriter.mk b/package/python-xlsxwriter/python-xlsxwriter.mk index 4055e52622..f05b10670c 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.mk +++ b/package/python-xlsxwriter/python-xlsxwriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLSXWRITER_VERSION = 3.0.3 +PYTHON_XLSXWRITER_VERSION = 3.0.6 PYTHON_XLSXWRITER_SOURCE = XlsxWriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz -PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/53/04/91ff43803c3e88c32aa272fdbda5859fc3c3b50b0de3a1e439cc57455330 +PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/d4/b5/cef6fadeaf316a3bbe82a506252081f2e6533cdf4b69ed64f8831ac01fb0 PYTHON_XLSXWRITER_SETUP_TYPE = setuptools PYTHON_XLSXWRITER_LICENSE = BSD-2-Clause PYTHON_XLSXWRITER_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Wed Feb 8 10:52:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:52:45 +0100 Subject: [Buildroot] [git commit branch/next] package/tinycompress: install to staging Message-ID: <20230220205255.6B77D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ee78c0a8b7854b4e8b260e1791909b8591ae5ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This will be needed for upcoming pipewire compress offload support. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/tinycompress/tinycompress.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinycompress/tinycompress.mk b/package/tinycompress/tinycompress.mk index 062233ec80..c9cfbb574b 100644 --- a/package/tinycompress/tinycompress.mk +++ b/package/tinycompress/tinycompress.mk @@ -9,5 +9,6 @@ TINYCOMPRESS_SOURCE = tinycompress-$(TINYCOMPRESS_VERSION).tar.bz2 TINYCOMPRESS_SITE = https://www.alsa-project.org/files/pub/tinycompress TINYCOMPRESS_LICENSE = BSD-3-Clause and LGPL-2.1 TINYCOMPRESS_LICENSE_FILES = COPYING +TINYCOMPRESS_INSTALL_STAGING = YES $(eval $(autotools-package)) From peter at korsgaard.com Mon Feb 20 21:00:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:21 -0000 Subject: [Buildroot] [git commit branch/next] package/libpjsip: security bump to version 2.13 Message-ID: <20230220205231.1027781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbc80c75570f535e991297602191c724ff33a04d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Fix CVE-2022-39269, CVE-2022-39244 and CVE-2022-31031: https://github.com/pjsip/pjproject/security/advisories/GHSA-wx5m-cj97-4wwg https://github.com/pjsip/pjproject/security/advisories/GHSA-fq45-m3f7-3mhj https://github.com/pjsip/pjproject/security/advisories/GHSA-26j7-ww69-c4qj - Drop patch (already in version) - libuuid configure option is available since https://github.com/pjsip/pjproject/commit/0b0488f17b41c5323028b522cc7323f2cd9b684c - libupnp is an optional dependency since https://github.com/pjsip/pjproject/commit/82247cb8c0441d0eafd18cb69e6c7bf55fc6a088 - libsrtp is optional since https://github.com/pjsip/pjproject/commit/fe6cbbc39764cae8ff6789a98f8ef8e85c63445c https://github.com/pjsip/pjproject/releases/tag/2.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...rge-pull-request-from-GHSA-26j7-ww69-c4qj.patch | 44 ---------------------- package/libpjsip/Config.in | 1 - package/libpjsip/libpjsip.hash | 2 +- package/libpjsip/libpjsip.mk | 28 ++++++++++---- 4 files changed, 22 insertions(+), 53 deletions(-) diff --git a/package/libpjsip/0001-Merge-pull-request-from-GHSA-26j7-ww69-c4qj.patch b/package/libpjsip/0001-Merge-pull-request-from-GHSA-26j7-ww69-c4qj.patch deleted file mode 100644 index 42b842a616..0000000000 --- a/package/libpjsip/0001-Merge-pull-request-from-GHSA-26j7-ww69-c4qj.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 450baca94f475345542c6953832650c390889202 Mon Sep 17 00:00:00 2001 -From: sauwming -Date: Tue, 7 Jun 2022 12:00:13 +0800 -Subject: [PATCH] Merge pull request from GHSA-26j7-ww69-c4qj - -[Retrieved from: -https://github.com/pjsip/pjproject/commit/450baca94f475345542c6953832650c390889202] -Signed-off-by: Fabrice Fontaine ---- - pjlib-util/src/pjlib-util/stun_simple.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/pjlib-util/src/pjlib-util/stun_simple.c b/pjlib-util/src/pjlib-util/stun_simple.c -index 722519584..d0549176d 100644 ---- a/pjlib-util/src/pjlib-util/stun_simple.c -+++ b/pjlib-util/src/pjlib-util/stun_simple.c -@@ -54,6 +54,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, - { - pj_uint16_t msg_type, msg_len; - char *p_attr; -+ int attr_max_cnt = PJ_ARRAY_SIZE(msg->attr); - - PJ_CHECK_STACK(); - -@@ -83,7 +84,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, - msg->attr_count = 0; - p_attr = (char*)buf + sizeof(pjstun_msg_hdr); - -- while (msg_len > 0) { -+ while (msg_len > 0 && msg->attr_count < attr_max_cnt) { - pjstun_attr_hdr **attr = &msg->attr[msg->attr_count]; - pj_uint32_t len; - pj_uint16_t attr_type; -@@ -111,6 +112,10 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, - p_attr += len; - ++msg->attr_count; - } -+ if (msg->attr_count == attr_max_cnt) { -+ PJ_LOG(4, (THIS_FILE, "Warning: max number attribute %d reached.", -+ attr_max_cnt)); -+ } - - return PJ_SUCCESS; - } diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in index 727d2ec3d0..980fada3d5 100644 --- a/package/libpjsip/Config.in +++ b/package/libpjsip/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_LIBPJSIP bool "libpjsip" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBSRTP help PJSIP is a free and open source multimedia communication library written in C language implementing standard based diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index b1ccdb2f37..9935575567 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d0feef6963b07934e821ba4328aecb4c36358515c1b3e507da5874555d713533 pjproject-2.12.1.tar.gz +sha256 4178bb9f586299111463fc16ea04e461adca4a73e646f8ddef61ea53dafa92d9 pjproject-2.13.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 4134d40da8..5cc0423f5d 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,11 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.12.1 +LIBPJSIP_VERSION = 2.13 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING LIBPJSIP_CPE_ID_VENDOR = teluu @@ -16,9 +15,6 @@ LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) -# 0001-Merge-pull-request-from-GHSA-26j7-ww69-c4qj.patch -LIBPJSIP_IGNORE_CVES += CVE-2022-31031 - LIBPJSIP_CFLAGS = $(TARGET_CFLAGS) -DPJ_HAS_IPV6=1 # relocation truncated to fit: R_68K_GOT16O @@ -40,8 +36,7 @@ LIBPJSIP_CONF_OPTS = \ --disable-l16-codec \ --disable-g722-codec \ --disable-ipp \ - --disable-silk \ - --with-external-srtp + --disable-silk # Note: aconfigure.ac is broken: --enable-epoll or --disable-epoll will # both enable it. But that's OK, epoll is better than the alternative, @@ -103,6 +98,22 @@ else LIBPJSIP_CONF_OPTS += --disable-libsamplerate endif +ifeq ($(BR2_PACKAGE_LIBSRTP),y) +LIBPJSIP_DEPENDENCIES += libsrtp +LIBPJSIP_CONF_OPTS += \ + --enable-libsrtp \ + --with-external-srtp +else +LIBPJSIP_CONF_OPTS += --disable-libsrtp +endif + +ifeq ($(BR2_PACKAGE_LIBUPNP),y) +LIBPJSIP_DEPENDENCIES += libupnp +LIBPJSIP_CONF_OPTS += --with-upnp=$(STAGING_DIR)/usr +else +LIBPJSIP_CONF_OPTS += --disable-upnp +endif + ifeq ($(BR2_PACKAGE_LIBV4L),y) # --enable-v4l2 is broken (check for libv4l2 will be omitted) LIBPJSIP_DEPENDENCIES += libv4l @@ -161,6 +172,9 @@ endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) LIBPJSIP_DEPENDENCIES += util-linux +LIBPJSIP_CONF_OPTS += --enable-libuuid +else +LIBPJSIP_CONF_OPTS += --disable-libuuid endif # disable build of test binaries From peter at korsgaard.com Wed Feb 8 10:55:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:55:07 +0100 Subject: [Buildroot] [git commit branch/next] package/pipewire: bump to version 0.3.65 Message-ID: <20230220205255.7646186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=247e2d0eb1e60f483044d58bed58c5ed321528f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add support for new compress-offload and pw-cat-ffmpeg features. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index d8b5b0cc86..0e027aaa55 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 24b218cf3bb1fb279c8c489c14cc9ae483e1da7b4c8215b2ee5a5ee831bae94f pipewire-0.3.62.tar.bz2 +sha256 c78c95cdff2774418f0a9468e94a1b2800761d322f13104df6501e1a0dc92558 pipewire-0.3.65.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 6bcda0a93d..976d7783b9 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.62 +PIPEWIRE_VERSION = 0.3.65 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) @@ -122,10 +122,10 @@ PIPEWIRE_CONF_OPTS += -Dbluez5=disabled -Dbluez5-codec-opus=disabled endif ifeq ($(BR2_PACKAGE_FFMPEG),y) -PIPEWIRE_CONF_OPTS += -Dffmpeg=enabled +PIPEWIRE_CONF_OPTS += -Dffmpeg=enabled -Dpw-cat-ffmpeg=enabled PIPEWIRE_DEPENDENCIES += ffmpeg else -PIPEWIRE_CONF_OPTS += -Dffmpeg=disabled +PIPEWIRE_CONF_OPTS += -Dffmpeg=disabled -Dpw-cat-ffmpeg=disabled endif ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) @@ -215,6 +215,13 @@ else PIPEWIRE_CONF_OPTS += -Dsdl2=disabled endif +ifeq ($(BR2_PACKAGE_TINYCOMPRESS),y) +PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled +PIPEWIRE_DEPENDENCIES += tinycompress +else +PIPEWIRE_CONF_OPTS += -Dcompress-offload=disabled +endif + ifeq ($(WEBRTC_AUDIO_PROCESSING),y) PIPEWIRE_CONF_OPTS += -Decho-cancel-webrtc=enabled PIPEWIRE_DEPENDENCIES += webrtc-audio-processing From peter at korsgaard.com Mon Feb 20 21:00:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:22 -0000 Subject: [Buildroot] [git commit branch/next] package/trinity: fix build with kernel >= 6.1 Message-ID: <20230220205231.2D7508648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49ca11e339c41ea2dd0484556b7b5beacff9fee9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with kernel >= 6.1: net/proto-decnet.c:5:10: fatal error: linux/dn.h: No such file or directory 5 | #include | ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/47e0a5e0b6fcf33ab4f9848d5d8c2be9e5283950 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/trinity/0004-drop-decnet.patch | 130 +++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/package/trinity/0004-drop-decnet.patch b/package/trinity/0004-drop-decnet.patch new file mode 100644 index 0000000000..15ba7f8e82 --- /dev/null +++ b/package/trinity/0004-drop-decnet.patch @@ -0,0 +1,130 @@ +From ec8dcc7faf13c57f5f6d785e4429818f1239a058 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 Jan 2023 20:50:18 +0100 +Subject: [PATCH] drop decnet + +Drop decnet as it has been removed since kernel 6.1 and +https://github.com/torvalds/linux/commit/1202cdd665315c525b5237e96e0bedc76d7e754f +resulting in the following build failure: + +net/proto-decnet.c:5:10: fatal error: linux/dn.h: No such file or directory + 5 | #include + | ^~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/47e0a5e0b6fcf33ab4f9848d5d8c2be9e5283950 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/kernelslacker/trinity/pull/41] +--- + include/net.h | 1 - + net/proto-decnet.c | 59 ---------------------------------------------- + net/proto-unix.c | 1 - + net/protocols.c | 1 - + 4 files changed, 62 deletions(-) + delete mode 100644 net/proto-decnet.c + +diff --git a/include/net.h b/include/net.h +index 99d55363..791e8090 100644 +--- a/include/net.h ++++ b/include/net.h +@@ -80,7 +80,6 @@ extern const struct netproto proto_atmpvc; + extern const struct netproto proto_atmsvc; + extern const struct netproto proto_x25; + extern const struct netproto proto_rose; +-extern const struct netproto proto_decnet; + extern const struct netproto proto_llc; + extern const struct netproto proto_netlink; + extern const struct netproto proto_packet; +diff --git a/net/proto-decnet.c b/net/proto-decnet.c +deleted file mode 100644 +index 7711cf00..00000000 +--- a/net/proto-decnet.c ++++ /dev/null +@@ -1,59 +0,0 @@ +-#include +-#include +-#include +-#include +-#include +-#include +-#include "net.h" +-#include "random.h" +-#include "utils.h" // RAND_ARRAY +-#include "compat.h" +- +-static void decnet_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen) +-{ +- struct sockaddr_dn *dn; +- unsigned int i; +- +- dn = zmalloc(sizeof(struct sockaddr_dn)); +- +- dn->sdn_family = PF_DECnet; +- dn->sdn_flags = rnd(); +- dn->sdn_objnum = rnd(); +- dn->sdn_objnamel = rnd() % 16; +- for (i = 0; i < dn->sdn_objnamel; i++) +- dn->sdn_objname[i] = rnd(); +- dn->sdn_add.a_len = RAND_BOOL(); +- dn->sdn_add.a_addr[0] = rnd(); +- dn->sdn_add.a_addr[1] = rnd(); +- *addr = (struct sockaddr *) dn; +- *addrlen = sizeof(struct sockaddr_dn); +-} +- +-static const unsigned int decnet_opts[] = { +- SO_CONDATA, SO_CONACCESS, SO_PROXYUSR, SO_LINKINFO, +- DSO_CONDATA, DSO_DISDATA, DSO_CONACCESS, DSO_ACCEPTMODE, +- DSO_CONACCEPT, DSO_CONREJECT, DSO_LINKINFO, DSO_STREAM, +- DSO_SEQPACKET, DSO_MAXWINDOW, DSO_NODELAY, DSO_CORK, +- DSO_SERVICES, DSO_INFO +-}; +- +-static void decnet_setsockopt(struct sockopt *so, __unused__ struct socket_triplet *triplet) +-{ +- so->level = SOL_DECNET; +- so->optname = RAND_ARRAY(decnet_opts); +- +- // TODO: set optlen correctly +-} +- +-static struct socket_triplet decnet_triplets[] = { +- { .family = PF_DECnet, .protocol = DNPROTO_NSP, .type = SOCK_SEQPACKET }, +- { .family = PF_DECnet, .protocol = DNPROTO_NSP, .type = SOCK_STREAM }, +-}; +- +-const struct netproto proto_decnet = { +- .name = "decnet", +- .setsockopt = decnet_setsockopt, +- .gen_sockaddr = decnet_gen_sockaddr, +- .valid_triplets = decnet_triplets, +- .nr_triplets = ARRAY_SIZE(decnet_triplets), +-}; +diff --git a/net/proto-unix.c b/net/proto-unix.c +index f7427a22..119c1429 100644 +--- a/net/proto-unix.c ++++ b/net/proto-unix.c +@@ -2,7 +2,6 @@ + #include + #include + #include +-#include + #include + #include "net.h" + #include "random.h" +diff --git a/net/protocols.c b/net/protocols.c +index ea64d5f5..278f08b5 100644 +--- a/net/protocols.c ++++ b/net/protocols.c +@@ -18,7 +18,6 @@ const struct protoptr net_protocols[TRINITY_PF_MAX] = { + #ifdef USE_IPV6 + [PF_INET6] = { .proto = &proto_inet6 }, + #endif +- [PF_DECnet] = { .proto = &proto_decnet }, + [PF_PACKET] = { .proto = &proto_packet }, + #ifdef USE_NETECONET + [PF_ECONET] = { .proto = &proto_econet }, +-- +2.39.0 + From thomas.petazzoni at bootlin.com Wed Feb 8 11:19:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:19:56 +0100 Subject: [Buildroot] [git commit branch/next] configs/olimex_stmp157: bump Linux and U-Boot Message-ID: <20230220205255.9A8268648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=019bf138eaf634ba1781037755c6cc594371ada0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_stmp157_olinuxino_lime_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index a63394fa0b..49670dbe4f 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -16,8 +16,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/stmp1_olinuxino/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/OLIMEX/linux-olimex.git" -# branch release-20220413-v5.10.105 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="d417808c240d55576ee76e5cbb40413ad444ecfd" +# branch release-20221011-v5.10.105 +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1b955f3ee7ef3234f290f65dbea108063996aea0" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olimex/stmp1_olinuxino/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -34,8 +34,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/OLIMEX/u-boot-olinuxino.git" -# release-20220413, based on 2021.04 -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="b39c5a7c93a2d8efaecc9cad4284378af857c3f7" +# release-20220927, based on 2021.04 +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="98ab5ecb0a16eeb426f34b2a1a28e56658c1a59c" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y From peter at korsgaard.com Mon Feb 20 21:00:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:23 -0000 Subject: [Buildroot] [git commit branch/next] package/perl: bump to version 5.36.0 Message-ID: <20230220205231.3FE63828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9103c8f2e94f69d7ef392746aa53bbf2f468a008 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/perl/perl.hash | 8 ++++---- package/perl/perl.mk | 4 ++-- utils/scancpan | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 9ec2b42e34..b21023f730 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,7 +1,7 @@ -# 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://www.cpan.org/src/5.0/perl-5.36.0.tar.xz.{md5,sha1,sha256}.txt +md5 826e42da130011699172fd655e49cfa2 perl-5.36.0.tar.xz +sha1 938c56a77ae094eb7f5019318a5e4efb2d9c74fa perl-5.36.0.tar.xz +sha256 0f386dccbee8e26286404b2cca144e1005be65477979beb9b1ba272d4819bcf0 perl-5.36.0.tar.xz # Hash from: https://github.com/arsv/perl-cross/releases/download/1.4/perl-cross-1.4.hash sha256 be9d9f9f7148edff7a2f9695ba3cb7e3975eff6b25a9a81dd311725fd757aa91 perl-cross-1.4.tar.gz diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 27acfaeff2..9be00e1b2c 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, also update utils/scancpan -PERL_VERSION_MAJOR = 34 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 +PERL_VERSION_MAJOR = 36 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ diff --git a/utils/scancpan b/utils/scancpan index 48f8bd83b7..e7739a8ad1 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -488,9 +488,9 @@ use Digest::SHA qw(sha256_hex); use Text::Wrap; $Text::Wrap::columns = 62; -# Below, 5.034 should be aligned with the version of perl actually +# Below, 5.036 should be aligned with the version of perl actually # bundled in Buildroot: -die <<"MSG" if $] < 5.034; +die <<"MSG" if $] < 5.036; This script needs a host perl with the same major version as Buildroot target perl. Your current host perl is: @@ -498,7 +498,7 @@ Your current host perl is: version $] You may install a local one by running: - perlbrew install perl-5.34.0 + perlbrew install perl-5.36.0 MSG my ($help, $man, $quiet, $force, $recommend, $test, $host); @@ -967,7 +967,7 @@ in order to work with the right CoreList data. =head1 LICENSE -Copyright (C) 2013-2020 by Francois Perrad +Copyright (C) 2013-2023 by Francois Perrad 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 From arnout at mind.be Wed Feb 8 12:31:04 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 13:31:04 +0100 Subject: [Buildroot] [git commit branch/next] .checkpackageignore: remove package/urandom-scripts/S20urandom Message-ID: <20230220205255.C588F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30624cf777b84ead9c788cee911fb1c387d358fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 4a6f9d2516820c296a8af788b259ca96926cd60d removed package/urandom-scripts/S20urandom but didn't remove it from .checkpackageignore. Do so now. The commit actually renamed it to S20seedrng, but it also fixed the Variables errors so it no longer needs to be ignored. Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index b1f2d99b99..c4d07c1d7d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -169,7 +169,6 @@ package/tvheadend/S99tvheadend Indent Shellcheck Variables package/unbound/S70unbound Shellcheck package/unscd/S46unscd Indent Shellcheck Variables package/upmpdcli/S99upmpdcli Indent Shellcheck Variables -package/urandom-scripts/S20urandom Variables package/usbguard/S20usbguard Indent Shellcheck Variables package/vsftpd/S70vsftpd Indent Shellcheck Variables package/watchdogd/S01watchdogd Indent NotExecutable From peter at korsgaard.com Mon Feb 20 21:00:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:24 -0000 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.3 Message-ID: <20230220205231.6DBE7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6469c513d5ee9b46c1a7484b93f1c50162aa359 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-January/000699.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 f6b3ade3ea..c1765c3eaa 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 = 22.3.2 +MESA3D_HEADERS_VERSION = 22.3.3 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 e902e6b828..c2ceaa6ead 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-dev/2022-December/225903.html -sha256 c15df758a8795f53e57f2a228eb4593c22b16dffd9b38f83901f76cd9533140b mesa-22.3.2.tar.xz -sha512 32934dd23cfcd6165c365597d9a469da0b806b72ea98a200f499344c3b47815db3bf78875b4ea766d2d28d9c70b50c1615d2d3fcbfd4769447fe0a9d3b32951f mesa-22.3.2.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000699.html +sha256 bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922 mesa-22.3.3.tar.xz +sha512 dcf166bc7c80e6ad09337e0188219e5ea4bdc558bc4b4ca35ce30d5421568f6b5328e5508b3175a2696521214e466354d8652ade22468ce448d9f61d5709c8a1 mesa-22.3.3.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 523b642d0c..9fa2c05230 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 = 22.3.2 +MESA3D_VERSION = 22.3.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From thomas.petazzoni at bootlin.com Wed Feb 8 12:24:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:24:16 +0100 Subject: [Buildroot] [git commit branch/next] package/gstreamer1/gst1-plugins-bad: add zxing plugin support Message-ID: <20230220205255.BBDCD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11b2ab5ee261e8af1065f15e2e69290e15e9e4ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/Config.in | 9 +++++++++ package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 1e89cd124f..d477924eec 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -738,6 +738,15 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 +config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING + bool "zxing" + depends on !BR2_STATIC_LIBS # zxing-cpp + depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp + select BR2_PACKAGE_ZXING_CPP + +comment "zxing plugin needs a toolchain w/ C++, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP + endif comment "gst1-plugins-bad needs a toolchain w/ C++" diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index dfe1f1c9eb..edac818985 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -70,7 +70,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dsvthevcenc=disabled \ -Dtranscode=disabled \ -Dwasapi2=disabled \ - -Dzxing=disabled \ -Dmagicleap=disabled \ -Disac=disabled \ -Diqa=disabled \ @@ -812,6 +811,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dzbar=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += zxing-cpp +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=disabled +endif + # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dgpl=enabled From peter at korsgaard.com Mon Feb 20 21:00:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:25 -0000 Subject: [Buildroot] [git commit branch/next] package/docker-engine: bump version to 20.10.22 Message-ID: <20230220205231.921D486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de51efc543775cf32456c1090d1b396d0b67f9bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bug fixes and enhancements - Improve error message when attempting to pull an unsupported image format or OCI artifact (moby/moby#44413, moby/moby#44569) - Fix an issue where the host's ephemeral port-range was ignored when selecting random ports for containers (moby/moby#44476). - Fix ssh: parse error in message type 27 errors during docker build on hosts using OpenSSH 8.9 or above (moby/moby#3862). - seccomp: block socket calls to AF_VSOCK in default profile (moby/moby#44564). https://github.com/moby/moby/releases/tag/v20.10.22 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 10e9727a08..d15b1359cb 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 61f4c3a2d0426e1bbbda1b0e5dd33ec203776f7d99d1a61522c77c04c4ed09fe docker-engine-20.10.21.tar.gz +sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 36c66485ba..2a9b72ca78 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.21 +DOCKER_ENGINE_VERSION = 20.10.22 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Wed Feb 8 13:35:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 14:35:21 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6serialport: use DESTDIR instead of --prefix for installation Message-ID: <20230220205256.0B3C986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d8e207e7aaf035f48252e19013b610893d2fce0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Even though it works, overriding --prefix at installation time is a bit weird. In order to be more consistent with what is done with other build systems, use DESTDIR instead at installation time. Note that $(DESTDIR) comes in addition to the -DCMAKE_INSTALL_PREFIX=/usr that is passed at configure time, so with this commit, the files continue to be installed in $(STAGING_DIR)/usr and $(TARGET_DIR)/usr as they should be. Signed-off-by: Thomas Petazzoni --- package/qt6/qt6serialport/qt6serialport.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt6/qt6serialport/qt6serialport.mk b/package/qt6/qt6serialport/qt6serialport.mk index 9656e97c96..497719d4ec 100644 --- a/package/qt6/qt6serialport/qt6serialport.mk +++ b/package/qt6/qt6serialport/qt6serialport.mk @@ -41,11 +41,11 @@ define QT6SERIALPORT_BUILD_CMDS endef define QT6SERIALPORT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) --prefix $(STAGING_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) endef define QT6SERIALPORT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) --prefix $(TARGET_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) endef $(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 20 21:00:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:26 -0000 Subject: [Buildroot] [git commit branch/next] package/tor: security bump version to 0.4.7.13 Message-ID: <20230220205231.BD50186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=beeb4a2aad034d201a13caecd9ddbfb19761beb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://gitlab.torproject.org/tpo/core/tor/-/blob/main/ChangeLog?expanded=true&viewer=simple Fixes CVE-2023-23589 aka TROVE-2022-002: https://gitlab.torproject.org/tpo/core/tor/-/issues/40730 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 4 ++-- package/tor/tor.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 2a2953dc29..51892f15c3 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.7.12.tar.gz.sha256sum -sha256 3b5d969712c467851bd028f314343ef15a97ea457191e93ffa97310b05b9e395 tor-0.4.7.12.tar.gz +# From https://dist.torproject.org/tor-0.4.7.13.tar.gz.sha256sum +sha256 2079172cce034556f110048e26083ce9bea751f3154b0ad2809751815b11ea9d tor-0.4.7.13.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 6812005618..03bd998708 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.7.12 +TOR_VERSION = 0.4.7.13 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 8 14:28:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:31 +0100 Subject: [Buildroot] [git commit branch/next] utils/docker-run: fix shellcheck errors Message-ID: <20230220205256.37E7A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c3466bbeeedad1cfc8fda5120d452fd786d68e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In utils/docker-run line 10: --user $(id -u):$(id -g) \ ^------^ SC2046: Quote this to prevent word splitting. ^------^ SC2046: Quote this to prevent word splitting. The suggestions from shellcheck can be applied. Signed-off-by: Arnout Vandecappelle --- utils/docker-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 5653764254..164e11c0e6 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -7,7 +7,7 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') exec docker run -it --rm \ - --user $(id -u):$(id -g) \ + --user "$(id -u):$(id -g)" \ --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ --workdir "${MAIN_DIR}" \ "${IMAGE}" "${@}" From peter at korsgaard.com Mon Feb 20 21:00:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:27 -0000 Subject: [Buildroot] [git commit branch/next] package/network-manager-openvpn: bump to version 1.10.2 Message-ID: <20230220205231.DE1698648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=346bd6a20c22fc3b95f2e27030289de726fcfdf0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Peter Korsgaard --- package/network-manager-openvpn/network-manager-openvpn.hash | 4 ++-- package/network-manager-openvpn/network-manager-openvpn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network-manager-openvpn/network-manager-openvpn.hash b/package/network-manager-openvpn/network-manager-openvpn.hash index d0cbc7ca87..11fb28f8c8 100644 --- a/package/network-manager-openvpn/network-manager-openvpn.hash +++ b/package/network-manager-openvpn/network-manager-openvpn.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.14.sha256sum -sha256 e7419053fc3b5a7e25f1a7517c313ad4531b6ea280255524ebb85a70c76fdbeb NetworkManager-openvpn-1.8.14.tar.xz +# From https://download.gnome.org/sources/NetworkManager-openvpn/1.10/NetworkManager-openvpn-1.10.2.sha256sum +sha256 62f0f2a8782221b923f212ac2a8ebbc1002efd6a90ee945dad4adfb56d076d21 NetworkManager-openvpn-1.10.2.tar.xz # Locally computed sha256 c39e345d992dfba62db265f8c6d6ff1d90c61d92876635ae05adbfa2f45fff46 COPYING diff --git a/package/network-manager-openvpn/network-manager-openvpn.mk b/package/network-manager-openvpn/network-manager-openvpn.mk index d5d4c5da42..ccc86e45f7 100644 --- a/package/network-manager-openvpn/network-manager-openvpn.mk +++ b/package/network-manager-openvpn/network-manager-openvpn.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.8 -NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).14 +NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.10 +NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).2 NETWORK_MANAGER_OPENVPN_SOURCE = NetworkManager-openvpn-$(NETWORK_MANAGER_OPENVPN_VERSION).tar.xz NETWORK_MANAGER_OPENVPN_SITE = https://download.gnome.org/sources/NetworkManager-openvpn/$(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR) NETWORK_MANAGER_OPENVPN_DEPENDENCIES = network-manager openvpn From thomas.petazzoni at bootlin.com Wed Feb 8 13:00:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 14:00:10 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6serialbus: new package Message-ID: <20230220205256.005E48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e447f56408f9308cc0e527f97dcc1844f2d6c850 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 1 + package/qt6/qt6serialbus/Config.in | 15 ++++++++++ package/qt6/qt6serialbus/qt6serialbus.hash | 11 ++++++++ package/qt6/qt6serialbus/qt6serialbus.mk | 45 ++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 831ae72c3c..655fa8392a 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -44,6 +44,7 @@ menuconfig BR2_PACKAGE_QT6 if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" endif diff --git a/package/qt6/qt6serialbus/Config.in b/package/qt6/qt6serialbus/Config.in new file mode 100644 index 0000000000..1f24310e61 --- /dev/null +++ b/package/qt6/qt6serialbus/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_QT6SERIALBUS + bool "qt6serialbus" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD + select BR2_PACKAGE_QT6SERIALPORT + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6serialbus module. + + https://doc.qt.io/qt-6/qtserialbus-index.html + +comment "qt6serialbus needs headers >= 3.6" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash new file mode 100644 index 0000000000..be01f13363 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialbus-everywhere-src-6.4.2.tar.xz.sha256 +sha256 604013657c7327899aa50748deb4bcb5e545ab37ff4964795b9e6f617d48bf1b qtserialbus-everywhere-src-6.4.2.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.mk b/package/qt6/qt6serialbus/qt6serialbus.mk new file mode 100644 index 0000000000..0717736387 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qt6serialbus +# +################################################################################ + +QT6SERIALBUS_VERSION = $(QT6_VERSION) +QT6SERIALBUS_SITE = $(QT6_SITE) +QT6SERIALBUS_SOURCE = qtserialbus-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALBUS_VERSION).tar.xz +QT6SERIALBUS_INSTALL_STAGING = YES +QT6SERIALBUS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SERIALBUS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6SERIALBUS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6SERIALBUS_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SERIALBUS_DEPENDENCIES = \ + qt6serialport + +define QT6SERIALBUS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) +endef + +$(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 20 21:00:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:28 -0000 Subject: [Buildroot] [git commit branch/next] package/modem-manager: bump version to 1.20.4 Message-ID: <20230220205231.AF5898648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2e2da2e70f638889f3aa0aeb7125f3bf16a7f67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch that is now upstream. Signed-off-by: Heiko Thiery Signed-off-by: Peter Korsgaard --- ...son-Un-hardcode-building-a-shared-library.patch | 54 ---------------------- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 3 files changed, 2 insertions(+), 56 deletions(-) diff --git a/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch b/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch deleted file mode 100644 index e99396d0d1..0000000000 --- a/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch +++ /dev/null @@ -1,54 +0,0 @@ -From a9651f2390d3691dc74bcdb24b69a043fb0aacae Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 31 Dec 2022 10:18:32 +0100 -Subject: [PATCH] meson: Un-hardcode building a shared library - -Use library() instead of shared_library() to allow specifying which kind -of library to build with "meson setup --default-library ..." - -This will avoid the following static build failure: - -FAILED: src/ModemManager -/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/bin/m68k-linux-gcc -o src/ModemManager src/ModemManager.p/meson-generated_.._mm-daemon-enums-types.c.o src/ModemManager.p/main.c.o src/ModemManager.p/mm-auth-provider.c.o src/ModemManager.p/mm-base-bearer.c.o src/ModemManager.p/mm-base-call.c.o src/ModemManager.p/mm-base-manager.c.o src/ModemManager.p/mm-base-modem-at.c.o src/ModemManager.p/mm-base-modem.c.o src/ModemManager.p/mm-base-sim.c.o src/ModemManager.p/mm-base-sms.c.o src/ModemManager.p/mm-bearer-list.c.o src/ModemManager.p/mm-broadband-bearer.c.o src/ModemManager.p/mm-broadband-modem.c.o src/ModemManager.p/mm-call-list.c.o src/ModemManager.p/mm-context.c.o src/ModemManager.p/mm-device.c.o src/ModemManager.p/mm-dispatcher.c.o src/ModemManager.p/mm-dispatcher-connection.c.o src/ModemManager.p/mm-dispatcher-fcc-unlock.c.o src/ModemManager.p/mm-filter.c.o src/ModemManager.p/mm-iface-modem-3gpp.c.o src/ModemManager.p/mm-iface-modem-3gpp-profile-manag er.c.o src/ModemManager.p/mm-iface-modem-3gpp-ussd.c.o src/ModemManager.p/mm-iface-modem.c.o src/ModemManager.p/mm-iface-modem-cdma.c.o src/ModemManager.p/mm-iface-modem-firmware.c.o src/ModemManager.p/mm-iface-modem-location.c.o src/ModemManager.p/mm-iface-modem-messaging.c.o src/ModemManager.p/mm-iface-modem-oma.c.o src/ModemManager.p/mm-iface-modem-sar.c.o src/ModemManager.p/mm-iface-modem-signal.c.o src/ModemManager.p/mm-iface-modem-simple.c.o src/ModemManager.p/mm-iface-modem-time.c.o src/ModemManager.p/mm-iface-modem-voice.c.o src/ModemManager.p/mm-plugin.c.o src/ModemManager.p/mm-plugin-manager.c.o src/ModemManager.p/mm-port-probe.c.o src/ModemManager.p/mm-port-probe-at.c.o src/ModemManager.p/mm-private-boxed-types.c.o src/ModemManager.p/mm-sms-list.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static '-Wl,-rpath,$ORIGIN/../libmm-glib' -Wl,-rpath-link,/home/autobuild/autobuild/instance-11/output-1/build/modem-manager-1.20.2/build/libmm-glib -Wl,--start-group src/libport.a s rc/libkerneldevice.a src/libhelpers.a libmm-glib/libmm-glib.so.0.9.0 libqcdm/src/libqcdm.a libmm-glib/generated/tests/libmm-test-generated.a -Wl,--export-dynamic /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libglib-2.0.a -pthread -lm /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpcre.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libffi.a /home/auto build/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libblkid.a -Wl,--end-group -/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/opt/ext-toolchain/bin/../lib/gcc/m68k-buildroot-linux-uclibc/11.2.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `libmm-glib/libmm-glib.so.0.9.0' - -Fixes: - - http://autobuild.buildroot.org/results/9803d593305df36c4a8d67aac2fb4c9a3120a072 - -Signed-off-by: Fabrice Fontaine -[yann.morin.1998 at free.fr: actual backport of upstreeam commit] -Signed-off-by: Yann E. MORIN ---- - libmm-glib/meson.build | 2 +- - plugins/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libmm-glib/meson.build b/libmm-glib/meson.build -index 42f8ac61..de668dab 100644 ---- a/libmm-glib/meson.build -+++ b/libmm-glib/meson.build -@@ -129,7 +129,7 @@ deps = [include_dep] - - libname = 'mm-glib' - --libmm_glib = shared_library( -+libmm_glib = library( - libname, - version: mm_glib_version, - sources: sources, -diff --git a/plugins/meson.build b/plugins/meson.build -index f849bb53..9e081beb 100644 ---- a/plugins/meson.build -+++ b/plugins/meson.build -@@ -18,7 +18,7 @@ if enable_tests - libmm_test_generated_dep - ] - -- libmm_test_common = shared_library( -+ libmm_test_common = library( - 'mm-test-common', - sources: sources, - include_directories: top_inc, --- -2.25.1 - diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index e6967f8d62..4b8b795af7 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ #Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc -sha256 ba56aa764edc148f58348a589743cf1c1e27c55dcd7ebd820dcedd52fb8d7179 ModemManager-1.20.2.tar.gz +sha256 9c16b47547faac9515f2d03d1e8175de9c5e6769b1ee16b608ba6cfe6f04b03e ModemManager-1.20.4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index f1fc17523a..979a80a8e9 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.20.2 +MODEM_MANAGER_VERSION = 1.20.4 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.gz MODEM_MANAGER_SITE = https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEM_MANAGER_VERSION) MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) From arnout at mind.be Wed Feb 8 14:28:30 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:30 +0100 Subject: [Buildroot] [git commit branch/next] utils/config: fix shellcheck errors Message-ID: <20230220205256.2E2EB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7150edc790cda61270eb0ec1af7ab78255c90003 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In utils/config line 54: ARG="`echo $ARG | tr a-z- A-Z_`" ^------------------------^ SC2006: Use $(...) notation instead of legacy backticked `...`. ^--^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: ARG="$(echo "$ARG" | tr a-z- A-Z_)" In utils/config line 87: local tmpfile="$infile.swp" ^-----^ SC2034: tmpfile appears unused. Verify use (or export if used externally). In utils/config line 182: if [ $? != 0 ] ; then ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. For more information: https://www.shellcheck.net/wiki/SC2034 -- tmpfile appears unused. Verify us... https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ... https://www.shellcheck.net/wiki/SC2006 -- Use $(...) notation instead of le... The suggestions from shellcheck can be applied. The unused variable tmpfile in fact occurs in several functions, all of them can be removed. For the check exit code, the condition is swapped to avoid negative logic. Signed-off-by: Arnout Vandecappelle --- utils/config | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/utils/config b/utils/config index c5e2d723ea..5f5e4362e5 100755 --- a/utils/config +++ b/utils/config @@ -51,7 +51,7 @@ checkarg() { usage fi if [ "$MUNGE_CASE" = "yes" ] ; then - ARG="`echo $ARG | tr a-z- A-Z_`" + ARG="$(echo "$ARG" | tr a-z- A-Z_)" fi case "$ARG" in ${BR2_PREFIX}*) @@ -64,7 +64,6 @@ txt_append() { local anchor="$1" local insert="$2" local infile="$3" - local tmpfile="$infile.swp" # sed append cmd: 'a\' + newline + text + newline cmd="$(printf "a\\%b$insert" "\n")" @@ -76,7 +75,6 @@ txt_subst() { local before="$1" local after="$2" local infile="$3" - local tmpfile="$infile.swp" sed -i -e "s:$before:$after:" "$infile" } @@ -84,7 +82,6 @@ txt_subst() { txt_delete() { local text="$1" local infile="$2" - local tmpfile="$infile.swp" sed -i -e "/$text/d" "$infile" } @@ -178,15 +175,14 @@ while [ "$1" != "" ] ; do if grep -q "# ${BR2_PREFIX}$ARG is not set" $FN ; then echo n else - V="$(grep "^${BR2_PREFIX}$ARG=" $FN)" - if [ $? != 0 ] ; then - echo undef - else + if V="$(grep "^${BR2_PREFIX}$ARG=" $FN)"; then V="${V/#${BR2_PREFIX}$ARG=/}" V="${V/#\"/}" V="${V/%\"/}" V="${V//\\\"/\"}" echo "${V}" + else + echo undef fi fi ;; From arnout at mind.be Wed Feb 8 14:28:32 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:32 +0100 Subject: [Buildroot] [git commit branch/next] utils/docker-run: fix shellcheck errors Message-ID: <20230220205256.421E786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dab7a877148adad499a07c5ed785c42707593175 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In utils/test-pkg line 8: if [ ! -z "${TEMP_CONF}" ]; then ^-- SC2236: Use -n instead of ! -z. In utils/test-pkg line 75: TEMP_CONF=$(mktemp /tmp/test-${pkg}-config.XXXXXX) ^----^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: TEMP_CONF=$(mktemp /tmp/test-"${pkg}"-config.XXXXXX) In utils/test-pkg line 76: echo "${pkg_br_name}=y" > ${TEMP_CONF} ^----------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: echo "${pkg_br_name}=y" > "${TEMP_CONF}" In utils/test-pkg line 86: if [ ${random} -gt 0 ]; then ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${random}" -gt 0 ]; then In utils/test-pkg line 90: if [ ${number} -gt 0 ]; then ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${number}" -gt 0 ]; then In utils/test-pkg line 109: toolchains=($(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ ^-- SC2207: Prefer mapfile or read -a to split command output (or quote to avoid splitting). In utils/test-pkg line 110: |if [ ${random} -gt 0 ]; then \ ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: |if [ "${random}" -gt 0 ]; then \ In utils/test-pkg line 111: sort -R |head -n ${random} ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: sort -R |head -n "${random}" In utils/test-pkg line 121: if [ ${nb_tc} -eq 0 ]; then ^------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${nb_tc}" -eq 0 ]; then In utils/test-pkg line 134: printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} ${nb} ${nb_tc} ^---^ SC2086: Double quote to prevent globbing and word splitting. ^------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} "${nb}" "${nb_tc}" In utils/test-pkg line 146: ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} ^---^ SC2086: Double quote to prevent globbing and word splitting. ^--------^ SC2086: Double quote to prevent globbing and word splitting. ^--------^ SC2086: Double quote to prevent globbing and word splitting. ^---------^ SC2086: Double quote to prevent globbing and word splitting. ^--------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: "${nb}" "${nb_skip}" "${nb_fail}" "${nb_legal}" "${nb_show}" In utils/test-pkg line 160: CONFIG_= support/kconfig/merge_config.sh -O "${dir}" \ ^-- SC1007: Remove space after = if trying to assign a value (for empty string, use var='' ... ). In utils/test-pkg line 181: if [ ${prepare_only} -eq 1 ]; then ^-------------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${prepare_only}" -eq 1 ]; then For more information: https://www.shellcheck.net/wiki/SC1007 -- Remove space after = if trying to... https://www.shellcheck.net/wiki/SC2207 -- Prefer mapfile or read -a to spli... https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ... The suggestions from shellcheck can be applied. This script already uses bash so we can rely on mapfile. The warning about CONFIG_= assignment misinterpreted the intention: we don't want to assign to CONFIG_, we want to clear it from the environment. Spell this as CONFIG_="". Signed-off-by: Arnout Vandecappelle --- utils/test-pkg | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/utils/test-pkg b/utils/test-pkg index e7f5464817..19d8713d6a 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -5,7 +5,7 @@ TOOLCHAINS_CSV='support/config-fragments/autobuild/toolchain-configs.csv' TEMP_CONF="" do_clean() { - if [ ! -z "${TEMP_CONF}" ]; then + if [ -n "${TEMP_CONF}" ]; then rm -f "${TEMP_CONF}" fi } @@ -72,8 +72,8 @@ main() { if [ -z "${cfg}" ]; then pkg_br_name="${pkg//-/_}" pkg_br_name="BR2_PACKAGE_${pkg_br_name^^}" - TEMP_CONF=$(mktemp /tmp/test-${pkg}-config.XXXXXX) - echo "${pkg_br_name}=y" > ${TEMP_CONF} + TEMP_CONF="$(mktemp /tmp/test-"${pkg}"-config.XXXXXX)" + echo "${pkg_br_name}=y" > "${TEMP_CONF}" cfg="${TEMP_CONF}" fi if [ ! -e "${cfg}" ]; then @@ -83,15 +83,15 @@ main() { dir="${HOME}/br-test-pkg" fi - if [ ${random} -gt 0 ]; then + if [ "${random}" -gt 0 ]; then mode=$((mode+1)) fi - if [ ${number} -gt 0 ]; then + if [ "${number}" -gt 0 ]; then mode=$((mode+1)) fi - if [ ${all} -eq 1 ]; then + if [ "${all}" -eq 1 ]; then mode=$((mode+1)) fi @@ -106,19 +106,18 @@ main() { # Extract the URLs of the toolchains; drop internal toolchains # E.g.: http://server/path/to/name.config,arch,libc # --> http://server/path/to/name.config - toolchains=($(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ - |if [ ${random} -gt 0 ]; then \ - sort -R |head -n ${random} - elif [ ${number} -gt 0 ]; then \ - head -n ${number} - else - sort - fi - ) - ) + mapfile -t toolchains < <(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ + | if [ "${random}" -gt 0 ]; then \ + sort -R | head -n "${random}" + elif [ "${number}" -gt 0 ]; then \ + head -n "${number}" + else + sort + fi + ) nb_tc="${#toolchains[@]}" - if [ ${nb_tc} -eq 0 ]; then + if [ "${nb_tc}" -eq 0 ]; then printf "error: no toolchain found (networking issue?)\n" >&2; exit 1 fi @@ -131,7 +130,7 @@ main() { : $((nb++)) toolchain="$(basename "${toolchainconfig}" .config)" build_dir="${dir}/${toolchain}" - printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} ${nb} ${nb_tc} + printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} "${nb}" "${nb_tc}" build_one "${build_dir}" "${toolchainconfig}" "${cfg}" "${pkg}" "${prepare_only}" && ret=0 || ret=${?} case ${ret} in (0) printf "OK\n";; @@ -143,7 +142,7 @@ main() { done printf "%d builds, %d skipped, %d build failed, %d legal-info failed, %d show-info failed\n" \ - ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} + "${nb}" "${nb_skip}" "${nb_fail}" "${nb_legal}" "${nb_show}" return $((nb_fail + nb_legal)) } @@ -157,7 +156,7 @@ build_one() { mkdir -p "${dir}" - CONFIG_= support/kconfig/merge_config.sh -O "${dir}" \ + CONFIG_="" support/kconfig/merge_config.sh -O "${dir}" \ "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" \ >> "${dir}/logfile" 2>&1 # We want all the options from the snippet to be present as-is (set @@ -178,7 +177,7 @@ build_one() { rm -f "${dir}/missing.config" # Defer building the job to the caller (e.g. a gitlab pipeline) - if [ ${prepare_only} -eq 1 ]; then + if [ "${prepare_only}" -eq 1 ]; then return 0 fi From peter at korsgaard.com Mon Feb 20 21:00:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:29 -0000 Subject: [Buildroot] [git commit branch/next] package/unbound: bump version to 1.17.1 Message-ID: <20230220205231.EDC56828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16d83fa724e97c51b78d516674842a1f33c9a71b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Kyle Harding Signed-off-by: Peter Korsgaard --- 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 147ac7b13a..91e1d82dd2 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.0.tar.gz.sha256 -sha256 dcbc95d7891d9f910c66e4edc9f1f2fde4dea2eec18e3af9f75aed44a02f1341 unbound-1.17.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz.sha256 +sha256 ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 unbound-1.17.1.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 7b62522727..fa7884e937 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.17.0 +UNBOUND_VERSION = 1.17.1 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl From arnout at mind.be Wed Feb 8 12:31:06 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 13:31:06 +0100 Subject: [Buildroot] [git commit branch/next] utils/check-package: check all shell scripts Message-ID: <20230220205255.D108886496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5a3dfb9a4a6550b9097b22b1c96a99f90880a64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Currently only SysV init scripts are checked using shellcheck and a few other rules (e.g. variable naming, file naming). Extend the check using shellcheck to all shell scripts in the tree. This is actually limited to the list of directories that check-package knows that can check, but that list can be expanded later. In order to apply the check to all shell scripts, use python3-magic to determine the file type. Unfortunately, there are two different python modules called "magic". Support both by detecting which one is installed and defining get_filetype accordingly. Keep testing first for name pattern, and only in the case there is no match, check the file type. This ensures, for instance, that SysV init scripts follow specific rules. Apply these checks for shell scripts: - shellcheck; - trailing space; - consecutive empty lines; - empty last line on file; - newline at end of file. Update the list of ignored warnings. Do not add unit tests since no function was added, they were just reused. But expand the runtime test for check-package using as fixture a file that generates a shellcheck warning. Signed-off-by: Ricardo Martincoski [Arnout: support both variants of the "magic" module] Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 21 ++++++++++++++++ .../tests/utils/br2-external/utils/x-shellscript | 2 ++ support/testing/tests/utils/test_check_package.py | 17 +++++++++++++ utils/check-package | 28 +++++++++++++++++++++- utils/checkpackagelib/lib_shellscript.py | 5 ++++ 5 files changed, 72 insertions(+), 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index c4d07c1d7d..405e1c5677 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -16,11 +16,13 @@ package/busybox/S02sysctl Variables package/busybox/S10mdev ConsecutiveEmptyLines Indent Shellcheck package/busybox/S15watchdog Indent Variables package/busybox/S50telnet Indent Shellcheck Variables +package/busybox/udhcpc.script Shellcheck package/c-icap/S96cicap Indent Shellcheck Variables package/cfm/S65cfm Indent Variables package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables package/chrony/S49chrony Indent Shellcheck Variables package/connman/S45connman Variables +package/coremark-pro/coremark-pro.sh.in Shellcheck package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob package/curlftpfs/0003-nocache-memleak-fix.patch Sob @@ -30,6 +32,7 @@ package/dbus/S30dbus Indent Shellcheck TrailingSpace Variables package/dcron/S90dcron Variables package/dhcp/S80dhcp-relay Shellcheck Variables package/dhcp/S80dhcp-server Shellcheck Variables +package/dhcp/dhclient-script Shellcheck TrailingSpace package/dhcpcd/S41dhcpcd Indent Variables package/dhrystone/0001-cmdline-nruns.patch Sob package/dhrystone/0002-HZ.patch Sob @@ -41,12 +44,15 @@ package/dmraid/S20dmraid Variables package/dnsmasq/S80dnsmasq Shellcheck Variables package/docker-engine/S60dockerd Indent Shellcheck Variables package/domoticz/S99domoticz Shellcheck +package/dracut/merged-usr-module-setup.sh Shellcheck package/dropbear/S50dropbear Indent Shellcheck Variables package/earlyoom/S02earlyoom Indent Shellcheck package/ejabberd/S50ejabberd Indent Shellcheck Variables +package/ejabberd/check-erlang-lib Shellcheck package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables package/exim/S86exim Indent Variables package/fail2ban/S60fail2ban Shellcheck Variables +package/fakedate/fakedate Shellcheck package/fbv/0001-cross.patch Sob package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob package/fbv/0005-include.patch Sob @@ -56,6 +62,7 @@ package/gamin/0002-no-const-return.patch Sob package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch Sob package/genromfs/0001-build-system.patch Sob package/gerbera/S99gerbera Indent +package/google-breakpad/gen-syms.sh Shellcheck package/gpsd/S50gpsd Indent Shellcheck Variables package/haveged/S21haveged Shellcheck Variables package/htpdate/S43htpdate Shellcheck @@ -63,8 +70,12 @@ package/i2pd/S99i2pd Indent Shellcheck Variables package/ifplugd/0001-cross.patch Sob package/ifplugd/0002-fix-headers.patch Sob package/ifupdown-scripts/S40network EmptyLastLine Indent Shellcheck Variables +package/ifupdown-scripts/network/if-pre-up.d/wait_iface EmptyLastLine Shellcheck +package/ifupdown-scripts/nfs_check Shellcheck package/igd2-for-linux/S99upnpd Indent Shellcheck Variables package/inadyn/S70inadyn Indent NotExecutable +package/initscripts/init.d/rcK ConsecutiveEmptyLines EmptyLastLine Shellcheck +package/initscripts/init.d/rcS ConsecutiveEmptyLines EmptyLastLine Shellcheck package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Variables package/iptables/S35iptables Shellcheck package/irda-utils/0001-daemon.patch Sob @@ -94,6 +105,7 @@ package/lldpd/S60lldpd Indent Shellcheck Variables package/lockfile-progs/0001-sus3v-legacy.patch Sob package/madplay/0001-switch-to-new-alsa-api.patch Sob package/mariadb/S97mysqld Indent Shellcheck Variables +package/matchbox-keyboard/mb-applet-kbd-wrapper.sh Shellcheck TrailingSpace package/mender-connect/S43mender-connect Shellcheck package/mii-diag/0001-strchr.patch Sob package/minidlna/S60minidlnad Indent Shellcheck Variables @@ -111,6 +123,7 @@ package/netcat/0001-signed-bit-counting.patch Sob package/netopeer2/S52netopeer2 Shellcheck Variables package/netplug/0001-makefile-flags.patch Sob package/netplug/S29netplug Indent Shellcheck Variables +package/netplug/netplug-script ConsecutiveEmptyLines Shellcheck package/netsnmp/S59snmpd Indent Shellcheck Variables package/network-manager/S45network-manager ConsecutiveEmptyLines EmptyLastLine Shellcheck Variables package/nfs-utils/S60nfs ConsecutiveEmptyLines Shellcheck Variables @@ -122,11 +135,13 @@ package/ofono/S46ofono Variables package/olsr/S50olsr Indent Shellcheck Variables package/openntpd/S49ntp Shellcheck Variables package/openssh/S50sshd EmptyLastLine Indent Variables +package/openvmtools/shutdown Shellcheck package/openvpn/S60openvpn Indent Shellcheck Variables package/oracle-mysql/S97mysqld Shellcheck Variables package/owfs/S55owserver Shellcheck Variables package/owfs/S60owfs Shellcheck Variables package/pigpio/S50pigpio Shellcheck Variables +package/pkgconf/pkg-config.in Shellcheck package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob package/postgresql/S50postgresql Variables package/procps-ng/S02sysctl Variables @@ -147,6 +162,7 @@ package/samba4/S91smb Indent Shellcheck Variables package/seatd/S70seatd NotExecutable Variables package/ser2net/S50ser2net Indent Shellcheck Variables package/shairport-sync/S99shairport-sync Indent Shellcheck Variables +package/skeleton-init-systemd/fakeroot_tmpfiles.sh Shellcheck package/smcroute/S41smcroute Indent NotExecutable Variables package/smstools3/S50smsd Shellcheck Variables package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch Sob @@ -156,11 +172,13 @@ package/sslh/S35sslh Indent Shellcheck Variables package/stunnel/S50stunnel Indent Shellcheck Variables package/supervisor/S99supervisord Variables package/suricata/S99suricata Shellcheck +package/swupdate/swupdate.sh Shellcheck package/sysrepo/S51sysrepo-plugind Indent Shellcheck package/targetcli-fb/S50target Shellcheck Variables package/tcf-agent/S55tcf-agent Shellcheck Variables package/tftpd/S80tftpd-hpa Indent Shellcheck Variables package/ti-gfx/S80ti-gfx Shellcheck Variables +package/ti-gfx/esrev.sh Shellcheck package/ti-sgx-um/S80ti-sgx Variables package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables @@ -170,10 +188,13 @@ package/unbound/S70unbound Shellcheck package/unscd/S46unscd Indent Shellcheck Variables package/upmpdcli/S99upmpdcli Indent Shellcheck Variables package/usbguard/S20usbguard Indent Shellcheck Variables +package/vala/vala-wrapper Shellcheck package/vsftpd/S70vsftpd Indent Shellcheck Variables package/watchdogd/S01watchdogd Indent NotExecutable +package/wpa_supplicant/ifupdown.sh Shellcheck package/x11r7/xapp_xdm/S99xdm Indent Variables package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables +package/xl2tp/xl2tpd TrailingSpace diff --git a/support/testing/tests/utils/br2-external/utils/x-shellscript b/support/testing/tests/utils/br2-external/utils/x-shellscript new file mode 100755 index 0000000000..a7de4124bd --- /dev/null +++ b/support/testing/tests/utils/br2-external/utils/x-shellscript @@ -0,0 +1,2 @@ +#!/bin/bash +unused="text" diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index 580ad56d42..d2c1556845 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -233,3 +233,20 @@ class TestCheckPackage(unittest.TestCase): self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update " ".checkpackageignore_outdated?" .format(subdir_file), w) + + # shell scripts are tested using shellcheck + rel_file = "utils/x-shellscript" + abs_path = infra.filepath("tests/utils/br2-external") + abs_file = os.path.join(abs_path, rel_file) + + w, m = call_script(["check-package", "-b", rel_file], + self.WITH_UTILS_IN_PATH, abs_path) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(rel_file), w) + + w, m = call_script(["check-package", "-b", abs_file], + self.WITH_UTILS_IN_PATH, infra.basepath()) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(abs_file), w) diff --git a/utils/check-package b/utils/check-package index 848311bac8..12009b2476 100755 --- a/utils/check-package +++ b/utils/check-package @@ -3,6 +3,7 @@ import argparse import inspect +import magic import os import re import six @@ -13,11 +14,27 @@ import checkpackagelib.lib_config import checkpackagelib.lib_hash import checkpackagelib.lib_mk import checkpackagelib.lib_patch +import checkpackagelib.lib_shellscript import checkpackagelib.lib_sysv VERBOSE_LEVEL_TO_SHOW_IGNORED_FILES = 3 flags = None # Command line arguments. +# There are two Python packages called 'magic': +# https://pypi.org/project/file-magic/ +# https://pypi.org/project/python-magic/ +# Both allow to return a MIME file type, but with a slightly different +# interface. Detect which one of the two we have based on one of the +# attributes. +if hasattr(magic, 'FileMagic'): + # https://pypi.org/project/file-magic/ + def get_filetype(fname): + return magic.detect_from_filename(fname).mime_type +else: + # https://pypi.org/project/python-magic/ + def get_filetype(fname): + return magic.from_file(fname, mime=True) + def get_ignored_parsers_per_file(intree_only, ignore_filename): ignored = dict() @@ -77,6 +94,15 @@ def parse_args(): return flags +def get_lib_from_filetype(fname): + if not os.path.isfile(fname): + return None + filetype = get_filetype(fname) + if filetype == "text/x-shellscript": + return checkpackagelib.lib_shellscript + return None + + CONFIG_IN_FILENAME = re.compile(r"Config\.\S*$") DO_CHECK_INTREE = re.compile(r"|".join([ r"Config.in", @@ -120,7 +146,7 @@ def get_lib_from_filename(fname): return checkpackagelib.lib_patch if SYSV_INIT_SCRIPT_FILENAME.search(fname): return checkpackagelib.lib_sysv - return None + return get_lib_from_filetype(fname) def common_inspect_rules(m): diff --git a/utils/checkpackagelib/lib_shellscript.py b/utils/checkpackagelib/lib_shellscript.py new file mode 100644 index 0000000000..9b4f4aed58 --- /dev/null +++ b/utils/checkpackagelib/lib_shellscript.py @@ -0,0 +1,5 @@ +from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 +from checkpackagelib.lib import EmptyLastLine # noqa: F401 +from checkpackagelib.lib import NewlineAtEof # noqa: F401 +from checkpackagelib.lib import TrailingSpace # noqa: F401 +from checkpackagelib.tool import Shellcheck # noqa: F401 From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:30 -0000 Subject: [Buildroot] [git commit branch/next] package/libnetconf2: bump version to 2.1.25. Message-ID: <20230220205232.26AD3828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c9259635564f799ff4b0e63b1baff62505571938 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libnetconf2/libnetconf2.hash | 2 +- package/libnetconf2/libnetconf2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 001a51d682..34e934089e 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0b0f0c84291710b0ca2497e1e02504a5ded7b83d49deeb4992bea7936e1d74b9 libnetconf2-2.1.11.tar.gz +sha256 2f1a6559e8e43ea18ea337ab5f194f8443695c7ab4dde5d7b2560603f9bf702a libnetconf2-2.1.25.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 6aa9aa9498..0d4294d8d3 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 2.1.11 +LIBNETCONF2_VERSION = 2.1.25 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause From peter at korsgaard.com Mon Feb 20 21:00:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:39 -0000 Subject: [Buildroot] [git commit branch/next] package/{rust, rust-bin}: security bump to version 1.66.1 Message-ID: <20230220205231.824A28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0da2742abbe2123d8bafe30e307b94c2b72f94cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes CVE-2022-46176: Cargo did not perform SSH host key verification when cloning indexes and dependencies via SSH https://blog.rust-lang.org/2023/01/10/cve-2022-46176.html Link to Rust 1.66.1 announcement: https://blog.rust-lang.org/2023/01/10/Rust-1.66.1.html Newest version of the source archives have been retrieved with their hash values, and the signature of the .asc files have been verified as follows: $ curl -fsSL https://static.rust-lang.org/rust-key.gpg.ascii | gpg --import $ gpg --verify There is no typographical error in the packages according to the check-pakage utility: $ ./utils/check-package package/rust-bin/* $ ./utils/check-package package/rust/* The testsuite tool were successfully run for rust and rust-bin packages to test the Rust toolchain under 1.66.1: $ ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_rust.TestRustBin $ ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_rust.TestRust In order to verify the compatibility of packages depending on Rust 1.66.1, tests using `./utils/test-pkg` were run. You may want to execute the test-pkg command after creating a `.config` file enabling the corresponding BR2_PACKAGE, for example: Create a file `buildroot/ripgrep.config` containing "BR2_PACKAGE_RIPGREP=y" Then execute: $ ./utils/test-pkg -d test-pkg -c ripgrep.config -p ripgrep Results: librsvg OK ripgrep OK suricata OK bat OK Signed-off-by: James Hilliard [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- package/rust-bin/rust-bin.hash | 252 ++++++++++++++++++++--------------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 7cc1052dd9..adf1799ad7 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 e8d853383355aa17fd8d7efae740ac0f18b3a5f452c9ac62f5042fc96ebda3e9 rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 c9551f9650fcaf74ea4fb6874b6853f9ffecb6925e7a087afb4f36840e5b7b8d rust-1.66.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 ec49ef94889c88f8fd107e9c263003aa6dcd9fb4d17ba057ffab4e4dc28fefd4 rust-1.66.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 755bcca28ee9d4504b7bd87265dc492a8e39550211f8081740940ada9e48cc7e rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 eaaca0295a75a180082456eb3606e6c3fbc16a4f2b54bd754caab5a69b192f88 rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 a194c1a8f1bd8c450872ad2220bfe74e590c5706d4ec939577c69a013a0bbcff rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 9fa197239eb374e071ef4486939c4713a2d662c5e7ebca0505626a3a53a7ed75 rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 6331e676198af2e75734f6566ca62ae22bb61b1d55e749494c454e777a73f195 rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 8d7053db5ea68f4801c7a808a222473076b8a602af70379975e81eede8a7e0ea rust-1.66.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 a656328e1cd36b253bf39807b5a3eacdf0ce7d982fc9fb51a026f273386de84a rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 b5ac5985a8fefd2a0de67197f7c2549aacee502cc784a3c3c93921b005aa31fa rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 ca62347018d1ace5e13a4a2f898dd2b19d5cb96db41482119418538f6482e2db rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 c8d10c558605673fe975b3b1c8ec8d2a9887f18cb97690bf900c19668b6d05ba rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 70650b3a8c04c183a83a2a4ebee7047d6546e69a81e227c24afa6d34ad54fe9b rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 262a2024250e4aa7865a33d52d9b6826b5f059f0562a73f6067a04020879d4f0 rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 e41c5f840d73ed1073ef3a8abb125e6f41a66008ad7817fb2a1e703cf93f0a8b rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 8b8ab8fe4af3ce9604e264fada7ddaed610d8e517d8425d5d85184ea4f111b52 rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 ec0552562348852c487e401168a0ad5f9e90cfc4cf03f5200f80b6594aa47d6d rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 5d166402813621d8c426bdb7dc857f97c72c921c2f2b52a893639a4c73862838 rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 a7170034ddb9218f4f78d6a1d8f8d7ce8c17419015393a96a24aa13f9c89da2d rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 fbc7e7565196fb7ec18b9b2ef0c8a1267fb4825bf68ff0559c0956841d5ade14 rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 7caecb4b926d78ec879e53eaaa4d8001ef575cd80e6340e0518545fd8500eb8f rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 b22aaa59dee87dfc504f7e37ec1f297bbbe3f9ca5a7e4177d40975f2b4b32570 rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-musl.tar.xz.asc -sha256 b538209ea82733f25d88e3a9dc7d7b00f23f61ede128142412404c37846bad69 rust-std-1.66.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 5c7da9cc8d71e72021bfcc8040a6d2c248127d1fbed12d81e2e4bdf61c70b8d6 rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-musl.tar.xz.asc -sha256 3f14c6381c74b175e32ce0f2e6337811a5ea2cc048239fc55101b6319b0ce7f8 rust-std-1.66.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 8909dff6e3fd2c0a2f7c747d8c31003cf6d4fd2ea877ddb933b3fd7861c1cf87 rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-musl.tar.xz.asc -sha256 e76c5fea6da85b42a6f313cc326d064067314532d6a057cfc95f733c2f019de1 rust-std-1.66.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 26e5304dc5d592b2a34933794c4636220ad86d78e9c639e36c18f46d3a8c0235 rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 a621c95eef9b548d59234beeea031cc369d5744312a5ebfe4ac2250cb1b900e8 rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 41b2e528e2b123220b2dbc8b6bf93986c22d86091f7cd653ac55d1b169720e1f rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 28de7df8cead0a09a6c4dbb3be6898f7bb495c803e5d1f15945dd66a60ebb2c4 rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 519403a99b0859f21d4cabd347bada629f24fff913dafc54af255e4776d18f1b rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 d1a8d76bd7549b3845dad92cdab45876c987e7ba6a27ea67f39414d498a66761 rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 b68691f94417033b612f0fdb510d385499558ea19dcf2caf02a5c1d7141816fd rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 0be870ead23d432b83981a45b37bb173315965485ef9ad6dcee1418702a26a3a rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ed05f169784776c94c4880281fbabab66b49ed05a221d8e06c6926e1161b8bbe rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 93a8b0514106c8039a8767b961090e8a0f8e4b62d1488e70e93e2e553860f70c rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 304008a504385f91672ab6ddf86b50f05a588432f01537049f4fbe95f8d41402 rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 107045313c7b6678579eba1fb0b96519585a2e282570635c64c02ef4544aacaa rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 c59ca7959a019f3f660c1f46bea3c13e7769b67732731469c0c42d02f28d08e7 rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 b4dbc07eb417f77d9b794546d647f014d1650e1e0c0e76ff3d878dc09479e320 rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 a1279760f91b3571733e0b0268128d143be2734916753900b5fe7b8ecc3c0900 rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 835b4e1b4d396674f7866a83b9a4f44db16fd12f01a7eaed527282b3700a9b92 rust-1.66.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 c7349617c42274bf50f6e3662dfb4f6832a93780099c3bb510be1a5b93d04c37 rust-1.66.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 fc38663870f0af47a27241d980ca886c3f7d432267920deb412ac8576bef68f0 rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 2b1a6c54db49a9e62d60cc96c1768f405e0f4c59d698186bf3a28a1bb017b6b5 rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 777d3a650448c15048710282388e90d10740540f570f5d17ed4a2dbdabb89552 rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 875bb310bae7c8c1d2d228a49aa4b547608b6c807ddc9ec44bc87272c77d869b rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 89164ccf75909b3d02bdcb787e33876cad87e55ab0e6239b030b4b6631ed356a rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 e83f9fc473072db23376783595a008cdd9b2f2e9b3be109e55939392864840eb rust-1.66.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 a201aa4595ec8015662b7103b1409a4787c6d1f1d540bb68746633527d855858 rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24 rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 520ac446f20490685cc4d73192cfbb4c9b9e55c884aa4ae2b098e3a54d891de8 rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 42afd189ef64988f64976f767a734734bccd7c71e578780e902148c98226fa29 rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 506126773af9c3dacc506776a0b2e12fe6fa0c95eaf4f4ebb5cdbd335feb83fa rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 3d21b478fbf07bd27902bdd189e6988341f0c2c0108b538f926cea3031bc8ea6 rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 5282fc97111a7eafbead3463ed7bc0f3065332f21aec6a39a740157fe42f943a rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 0ebf0178bbe9c5572d1db89e190dee23aef0e2f667995abedbd66e33d0bd73ab rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 938e7442c21ea0895c44ec78fa718ea1d3abe32ed0425ed328c905e188af250e rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 bdc491f4c05669e7a3382b6bfdaeaa20e2cfa5ef553305df0e0d73729a45e6e4 rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 d75c6dc3c00d662b0d3f6ce7fde0f76057542edfbc97a20b29247842c8a711d2 rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 830285e5388081c68fac9dc955aa824a4d919b0e24eadc6e0b95b30103d79db9 rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 d720bd1e493f53797f90d83dbe6d52ecbe1ff3cae282f4b2e18c37fe92c9adf6 rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17 rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.asc +sha256 c4bab2d63223d0c6e63806082e30d8c38b37eefc10ee2e7380971e3012c00bca rust-std-1.66.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.asc +sha256 52013329eb6697d94f5dce01dd509b4b93b473c18a3a2c05d0230b9dfeab14d1 rust-std-1.66.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568 rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.asc +sha256 23f917eccaca59d4c911eb96d8ffefe86834dbcdf902c9ab6dad8558c31c4575 rust-std-1.66.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 70d1406e0981d5d31c1d3f85c848bba0476e0ff6203e7706f66b4d2212f01b66 rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 0fd221d4b4205ce548e83f0e7416c8332eb12b64d5a43c0b3ed61e9f7d6edf13 rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 132d6d5750a877972ebc6f23e831f2ef3077465b2ab24ca645d32ea83c496fe3 rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 533f370368ac8b6192e1450289c64544ebf9cacc38c3a52ef6c0ecded7ee6fa5 rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 d7028820888d0decde047a6e77b866e690532aa09522c9a23a3fbf8780a72257 rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1 rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35 rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770 rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062 rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927 rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377 rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 a9710727ba28955deb7fbec799faed19486c9af3c7e3088ec6659a257515ffca rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index b341bc4b7c..89009288f4 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.66.0 +RUST_BIN_VERSION = 1.66.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 35028b304b..545a452bf0 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.xz.asc -sha256 0dc176e34fae9871f855a6ba4cb30fa19d69c5b4428d29281a07419c4950715c rustc-1.66.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc +sha256 07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe rustc-1.66.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 55fa38df18..691683b492 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.66.0 +RUST_VERSION = 1.66.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From peter at korsgaard.com Fri Feb 10 14:10:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:10:59 +0100 Subject: [Buildroot] [git commit branch/next] package/jack2: fix build with host python >= 3.11 Message-ID: <20230220205257.4092C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8fe92584446bba2bb81f454c5ebbcb4f80a371b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/5ce/5ce5ebd20e0e509b31b51d2ec1aed56fdb8f45aa/ The bundled waf script is too old (2.0.12) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Jack unfortunately uses a modified waf, so we cannot just set JACK2_NEEDS_EXTERNAL_WAF, so instead backport an upstream patch fixing the compatibility issue: https://github.com/jackaudio/jack2/pull/884 Signed-off-by: Peter Korsgaard --- ...e-of-U-mode-bit-for-opening-files-in-pyth.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch new file mode 100644 index 0000000000..9ee5a43e18 --- /dev/null +++ b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch @@ -0,0 +1,55 @@ +From 328c58967dce8be426f9208ba7717ab5afc2c4f3 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Mon, 11 Jul 2022 00:56:28 +0200 +Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python + +The 'U' mode bit is removed in python 3.11. It has been +deprecated for a long time. The 'U' mode bit has no effect +so this change doesn't change any behavior. + +See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api + +Signed-off-by: Peter Korsgaard +--- + waflib/ConfigSet.py | 2 +- + waflib/Context.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index b300bb56..84736c9c 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -312,7 +312,7 @@ class ConfigSet(object): + :type filename: string + """ + tbl = self.table +- code = Utils.readf(filename, m='rU') ++ code = Utils.readf(filename, m='r') + for m in re_imp.finditer(code): + g = m.group + tbl[g(2)] = eval(g(3)) +diff --git a/waflib/Context.py b/waflib/Context.py +index 9fee3fa1..761b521f 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -266,7 +266,7 @@ class Context(ctx): + cache[node] = True + self.pre_recurse(node) + try: +- function_code = node.read('rU', encoding) ++ function_code = node.read('r', encoding) + exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict) + finally: + self.post_recurse(node) +@@ -662,7 +662,7 @@ def load_module(path, encoding=None): + + module = imp.new_module(WSCRIPT_FILE) + try: +- code = Utils.readf(path, m='rU', encoding=encoding) ++ code = Utils.readf(path, m='r', encoding=encoding) + except EnvironmentError: + raise Errors.WafError('Could not read the file %r' % path) + +-- +2.30.2 + From yann.morin.1998 at free.fr Mon Feb 20 21:00:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:40 -0000 Subject: [Buildroot] [git commit branch/next] package/{python-}protobuf: bump to version 21.12 Message-ID: <20230220205233.4C5F68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59461ec52ef6d70d08d0e68cd24a6a3db2dbb7fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 2 +- package/python-protobuf/python-protobuf.hash | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index f1f5fa77cd..b092c9303f 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 96f0ab99b7414e44e7bf9b218bb59510d61549ca68e648f19e3622f9999bec00 protobuf-cpp-3.21.11.tar.gz +sha256 4eab9b524aa5913c6fffb20b2a8abf5ef7f95a80bc0701f3a6dbb4c607f73460 protobuf-cpp-3.21.12.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 33a7c40f40..8cd4e99e06 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,7 +7,7 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works and to update its hash, # as they share the same version/site variables. -PROTOBUF_VERSION = 21.11 +PROTOBUF_VERSION = 21.12 PROTOBUF_SOURCE = protobuf-cpp-3.$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index c2afc3955a..e7af678b97 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ae4ca6e1da635f31019d8911923163f372d9d333e8857510f513acba33172d0c protobuf-python-4.21.11.tar.gz +sha256 e2b976e67d6fcf7078f799143a73f2a4d9cf3126ca68a1a6f1bda30fe5f3585c protobuf-python-4.21.12.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE From peter at korsgaard.com Fri Feb 10 15:26:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:26:48 +0100 Subject: [Buildroot] [git commit branch/next] package/webkitgtk: Build with ninja Message-ID: <20230220205257.65A9486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16e5c92ff5fd2b44a1126bd7d7538c68ce838213 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b42ac3b644..a6974db926 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -139,4 +139,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# webkitgtk needs cmake >= 3.20 when not building with ninja, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WEBKITGTK_CONF_OPTS += -GNinja +WEBKITGTK_DEPENDENCIES += host-ninja + +define WEBKITGTK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:41 -0000 Subject: [Buildroot] [git commit branch/next] package/at-spi2-core: switch to https download Message-ID: <20230220205233.3463A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dde078790a965dfd469ec6ed745e4f7b5edc60ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/at-spi2-core/at-spi2-core.hash | 2 +- package/at-spi2-core/at-spi2-core.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index e2cc403e71..764e4c3661 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum +# From https://download.gnome.org/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz # locally calculated diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index cf7fdd297c..f0b019c0ed 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -7,7 +7,7 @@ AT_SPI2_CORE_VERSION_MAJOR = 2.36 AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz -AT_SPI2_CORE_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) +AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) AT_SPI2_CORE_LICENSE = LGPL-2.1+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES From peter at korsgaard.com Fri Feb 10 15:53:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:53:27 +0100 Subject: [Buildroot] [git commit branch/next] package/elixir: drop package Message-ID: <20230220205257.8FF2B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=406698de03a9c9e4ded5a50070de2249398380ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Elixir was a dependency of rabbitmq-server which got dropped in 89815bad0a531d01ee2733dd9c17576a7647e1d9. It is a host package with no other users, hence it is no longer required. Additionally, newer versions require Erlang 23+. Signed-off-by: Frank Vanbever Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - package/elixir/elixir.hash | 3 --- package/elixir/elixir.mk | 21 --------------------- 3 files changed, 25 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 32c6e54919..e8e0671709 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1089,7 +1089,6 @@ F: package/upx/ F: package/zxing-cpp/ N: Frank Vanbever -F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ diff --git a/package/elixir/elixir.hash b/package/elixir/elixir.hash deleted file mode 100644 index 6d083e72de..0000000000 --- a/package/elixir/elixir.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Computed locally -sha256 f3465d8a8e386f3e74831bf9594ee39e6dfde6aa430fe9260844cfe46aa10139 elixir-1.9.4.tar.gz -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE diff --git a/package/elixir/elixir.mk b/package/elixir/elixir.mk deleted file mode 100644 index 6d935516f4..0000000000 --- a/package/elixir/elixir.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# elixir -# -################################################################################ - -ELIXIR_VERSION = 1.9.4 -ELIXIR_SITE = $(call github,elixir-lang,elixir,v$(ELIXIR_VERSION)) -ELIXIR_LICENSE = Apache-2.0 -ELIXIR_LICENSE_FILES = LICENSE -HOST_ELIXIR_DEPENDENCIES = host-erlang - -define HOST_ELIXIR_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) compile -endef - -define HOST_ELIXIR_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX="$(HOST_DIR)" -C $(@D) install -endef - -$(eval $(host-generic-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:00:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:42 -0000 Subject: [Buildroot] [git commit branch/next] package/python-aioblescan: bump to version 0.2.14 Message-ID: <20230220205233.62BD8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c35f2393327abab5d21a9155d468067482af383b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aioblescan/python-aioblescan.hash | 4 ++-- package/python-aioblescan/python-aioblescan.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioblescan/python-aioblescan.hash b/package/python-aioblescan/python-aioblescan.hash index 9a40ca4560..c754325fb1 100644 --- a/package/python-aioblescan/python-aioblescan.hash +++ b/package/python-aioblescan/python-aioblescan.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioblescan/json -md5 0601cf9335e5d89166a88f53597c79bf aioblescan-0.2.13.tar.gz -sha256 28632e32c8180ea4b792f4cf9b88968dd100f4d3cee0cf16d27c193cf954422a aioblescan-0.2.13.tar.gz +md5 10014cfd24b8f9f54099bbf7e2ea528a aioblescan-0.2.14.tar.gz +sha256 3a47c5292186ee87fc49cb076a5271c766510f44749b93ac4a32bbb4cb5258a0 aioblescan-0.2.14.tar.gz # Locally computed sha256 checksums sha256 c2066cd44079e0c706234001af18cb6ad4b62fc68d0d08d29fdc7319916647e0 LICENSE.txt diff --git a/package/python-aioblescan/python-aioblescan.mk b/package/python-aioblescan/python-aioblescan.mk index f0e277d528..7e0cde6c85 100644 --- a/package/python-aioblescan/python-aioblescan.mk +++ b/package/python-aioblescan/python-aioblescan.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOBLESCAN_VERSION = 0.2.13 +PYTHON_AIOBLESCAN_VERSION = 0.2.14 PYTHON_AIOBLESCAN_SOURCE = aioblescan-$(PYTHON_AIOBLESCAN_VERSION).tar.gz -PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/bd/04/c6798c76704d57da22f19c2e47485821d4b23144ef75f9c0e18dbfe47565 +PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/45/15/faf503083bc5a2d81f1b17fbbe30d15f35217b6c5e944c771c8760354d59 PYTHON_AIOBLESCAN_SETUP_TYPE = setuptools PYTHON_AIOBLESCAN_LICENSE = MIT PYTHON_AIOBLESCAN_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Fri Feb 10 22:30:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:30:30 +0100 Subject: [Buildroot] [git commit branch/next] configs/asus_tinker_rk3288: bump Linux to 6.1.2 and U-boot to 2022.10 Message-ID: <20230220205257.D00CA81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fdf20249574b64285979f109bef74eb9cdbf0db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/asus_tinker_rk3288_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 02b340a7f1..40f4125880 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" From yann.morin.1998 at free.fr Mon Feb 20 21:00:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:43 -0000 Subject: [Buildroot] [git commit branch/next] package/python-asgiref: bump to version 3.6.0 Message-ID: <20230220205233.8AF4686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=823e3e98671bf70135d526298346a8c72beacd8a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-asgiref/python-asgiref.hash | 4 ++-- package/python-asgiref/python-asgiref.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-asgiref/python-asgiref.hash b/package/python-asgiref/python-asgiref.hash index fec707ce02..26d8e78e47 100644 --- a/package/python-asgiref/python-asgiref.hash +++ b/package/python-asgiref/python-asgiref.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asgiref/json -md5 b3cf42bb1f9191196f9ed1678f9dc106 asgiref-3.5.2.tar.gz -sha256 4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424 asgiref-3.5.2.tar.gz +md5 562ecd896dcbf5576db8c29cb1881ca4 asgiref-3.6.0.tar.gz +sha256 9567dfe7bd8d3c8c892227827c41cce860b368104c3431da67a0c5a65a949506 asgiref-3.6.0.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-asgiref/python-asgiref.mk b/package/python-asgiref/python-asgiref.mk index afc083fb1f..bfd90f10e8 100644 --- a/package/python-asgiref/python-asgiref.mk +++ b/package/python-asgiref/python-asgiref.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASGIREF_VERSION = 3.5.2 +PYTHON_ASGIREF_VERSION = 3.6.0 PYTHON_ASGIREF_SOURCE = asgiref-$(PYTHON_ASGIREF_VERSION).tar.gz -PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/1f/35/e7d59b92ceffb1dc62c65156278de378670b46ab2364a3ea7216fe194ba3 +PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/78/2d/797c0537426266d6c9377a2ed6a4ac61e50c2d5b1ab4da101a4b9bfe26e2 PYTHON_ASGIREF_SETUP_TYPE = setuptools PYTHON_ASGIREF_LICENSE = BSD-3-Clause PYTHON_ASGIREF_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Fri Feb 10 22:26:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:26:56 +0100 Subject: [Buildroot] [git commit branch/next] package/gtest: drop patch adding debug 'd' to library names in pkg-config files Message-ID: <20230220205257.A99AA81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f661c00342befb21c0032e593c758dfb2d336007 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - drop patch adding debug 'd' to gmock/gtest library names in pkg-config files (not longer needed since gtest version bump to 1.22 ([1]) and upstream commit 'FIX #2174 -- remove `DEBUG_POSTFIX`' ([2]). Fixes: http://autobuild.buildroot.net/results/5ea8f180e4909f8157565238b25f567fcf1f3beb .../host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/7.3.1/../../../../aarch64-linux-gnu/bin/ld: cannot find -lgtestd [1] https://git.buildroot.net/buildroot/commit/?id=a336b731af5979a25213b33c5840de6d1ed88bdc [2] https://github.com/google/googletest/commit/ca3ffd90f2726f6c0c6e790f05c7c88491a16466 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...fix-gtest.pc-gmock.pc-library-names-for-t.patch | 62 ---------------------- 1 file changed, 62 deletions(-) diff --git a/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch b/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch deleted file mode 100644 index c47e8fc8f8..0000000000 --- a/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cf5a3177159ca832470e7f876cab0a1923fa666f Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 22 Oct 2021 20:17:36 +0200 -Subject: [PATCH] pkg-config: fix gtest.pc/gmock.pc library names for the debug - build - -In case CMAKE_BUILD_TYPE is set to Debug the gtest library is -name libgtestd.a but the link command returned from gtest.pc is -'-lgtest' (without the debug d) and so the linking of dependent -packages fails (see [1] for a buildroot failure example). - -Enhance the gtest.pc ang gmock.pc generation to honour the debug 'd'. - -[1] http://lists.busybox.net/pipermail/buildroot/2021-October/626382.html - -[Upstream: https://github.com/google/googletest/pull/3625] -Signed-off-by: Peter Seiderer ---- - googlemock/cmake/gmock.pc.in | 2 +- - googletest/cmake/gtest.pc.in | 2 +- - googletest/cmake/internal_utils.cmake | 3 +++ - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in -index 23c67b5c..0f469857 100644 ---- a/googlemock/cmake/gmock.pc.in -+++ b/googlemock/cmake/gmock.pc.in -@@ -6,5 +6,5 @@ Description: GoogleMock (without main() function) - Version: @PROJECT_VERSION@ - URL: https://github.com/google/googletest - Requires: gtest = @PROJECT_VERSION@ --Libs: -L${libdir} -lgmock @CMAKE_THREAD_LIBS_INIT@ -+Libs: -L${libdir} -lgmock at DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@ - Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ -diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in -index b4148fae..225bba81 100644 ---- a/googletest/cmake/gtest.pc.in -+++ b/googletest/cmake/gtest.pc.in -@@ -5,5 +5,5 @@ Name: gtest - Description: GoogleTest (without main() function) - Version: @PROJECT_VERSION@ - URL: https://github.com/google/googletest --Libs: -L${libdir} -lgtest @CMAKE_THREAD_LIBS_INIT@ -+Libs: -L${libdir} -lgtest at DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@ - Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ -diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake -index 58fc9bfb..fd81b825 100644 ---- a/googletest/cmake/internal_utils.cmake -+++ b/googletest/cmake/internal_utils.cmake -@@ -335,6 +335,9 @@ function(install_project) - # Configure and install pkgconfig files. - foreach(t ${ARGN}) - set(configured_pc "${generated_dir}/${t}.pc") -+ if(CMAKE_BUILD_TYPE MATCHES Debug) -+ set(DEBUG_POSTFIX "d") -+ endif() - configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in" - "${configured_pc}" @ONLY) - install(FILES "${configured_pc}" --- -2.33.1 - From yann.morin.1998 at free.fr Mon Feb 20 21:00:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:44 -0000 Subject: [Buildroot] [git commit branch/next] package/python-attrs: bump to version 22.2.0 Message-ID: <20230220205233.A0C53828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f8d6264d79f6645ce4f2bbf0b76a919db29fcb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-attrs/python-attrs.hash | 4 ++-- package/python-attrs/python-attrs.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash index d5548c0ed3..66b2082cff 100644 --- a/package/python-attrs/python-attrs.hash +++ b/package/python-attrs/python-attrs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/attrs/json -md5 0487081b7ead8753fc46cf7c6d1e28e3 attrs-22.1.0.tar.gz -sha256 29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 attrs-22.1.0.tar.gz +md5 eff16b3bbd0d9b72e118cca83a19d380 attrs-22.2.0.tar.gz +sha256 c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99 attrs-22.2.0.tar.gz # Locally computed sha256 checksums sha256 882115c95dfc2af1eeb6714f8ec6d5cbcabf667caff8729f42420da63f714e9f LICENSE diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 33651ee80a..0462f7cb0b 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ATTRS_VERSION = 22.1.0 +PYTHON_ATTRS_VERSION = 22.2.0 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/1a/cb/c4ffeb41e7137b23755a45e1bfec9cbb76ecf51874c6f1d113984ecaa32c +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/21/31/3f468da74c7de4fcf9b25591e682856389b3400b4b62f201e65f15ea3e07 PYTHON_ATTRS_SETUP_TYPE = setuptools PYTHON_ATTRS_LICENSE = MIT PYTHON_ATTRS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Feb 11 11:00:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 12:00:55 +0100 Subject: [Buildroot] [git commit branch/next] package/pkg-waf: add one more missing $ Message-ID: <20230220205258.36A8686496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33107962eb29d2d33fcf4bed429d5239c1b2d278 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Further fix on top on 9d1b223b91b0 (package/pkg-waf: add missing $). Repeat after me: all variables in an inner-package macro must be expanded, except for: parameters, pkgdir, and pkgname. Signed-off-by: Yann E. MORIN --- package/pkg-waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index c3e965bdf3..0529bb6dda 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -42,7 +42,7 @@ define inner-waf-package # otherwise waf errors out with: # Waf script 'X' and library 'Y' do not match define WAF_PACKAGE_REMOVE_WAF_LIB - $(RM) -fr $$(@D)/waf $$(@D)/waflib + $$(RM) -fr $$(@D)/waf $$(@D)/waflib endef # We need host-python3 to run waf From thomas.petazzoni at bootlin.com Wed Feb 15 21:45:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:45:26 +0100 Subject: [Buildroot] [git commit branch/next] package/dmalloc: convert existing patch to git format Message-ID: <20230220205301.1BB188648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7bd0fdb88a15b15d4b41bdc82a37cf35ab2b268 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We're going to add more patches, so let's cleanup our historical baggage... Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../dmalloc/0001-configure-fix-build-on-mips.patch | 90 ++++++++++++++++++++++ package/dmalloc/0001-mips.patch | 45 ----------- 2 files changed, 90 insertions(+), 45 deletions(-) diff --git a/package/dmalloc/0001-configure-fix-build-on-mips.patch b/package/dmalloc/0001-configure-fix-build-on-mips.patch new file mode 100644 index 0000000000..9b1525d0d1 --- /dev/null +++ b/package/dmalloc/0001-configure-fix-build-on-mips.patch @@ -0,0 +1,90 @@ +From af6adb3f5f05be4faa88a5aa83296c388c8085e7 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 12:30:10 +0100 +Subject: [PATCH] configure: fix build on mips + +This patch is a historical baggage that Buildroot has carried for ages +(since 2006), and the reason for it are notentirely clear. + +Since dmalloc is pretty tricky, and as this patch has not been +identified as causing issues, we keep it; we just add the configure.ac +patchlet to match the one in configure. + +As for the title, the original patch was named dmalloc-mips.patch, so +presumably it fixes some mips issue; let's title the commit that way. + +[Fabrice: Updated for 5.6.5] +Signed-off-by: Fabrice Fontaine +[yann.morin.1998 at free.fr: make it a git-formatted patch] +Signed-off-by: Yann E. MORIN +--- + configure | 4 ++-- + configure.ac | 2 +- + return.h | 16 +++------------- + 3 files changed, 6 insertions(+), 16 deletions(-) + +diff --git a/configure b/configure +index d52a1e8..c18dfb2 100755 +--- a/configure ++++ b/configure +@@ -5413,8 +5413,8 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 + $as_echo_n "checking return.h macros work... " >&6; } + if test "$cross_compiling" = yes; then : +- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assume yes (cross-compiling)" >&5 + $as_echo "no" >&6; } + + else +diff --git a/configure.ac b/configure.ac +index a5295f1..9740fdc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -705,7 +705,7 @@ int main() + ])], + [ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([yes]) ], + [ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ], +-[ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ] ++[ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([assume yes (cross-compiling)]) ] + ) + + ############################################################################## +diff --git a/return.h b/return.h +index 9d3f5f1..d916c7a 100644 +--- a/return.h ++++ b/return.h +@@ -117,26 +117,16 @@ + /*************************************/ + + /* +- * For DEC Mips machines running Ultrix ++ * For Mips machines running Linux + */ + #if __mips + +-/* +- * I have no idea how to get inline assembly with the default cc. +- * Anyone know how? +- */ +- +-#if 0 +- + /* + * NOTE: we assume here that file is global. + * +- * $31 is the frame pointer. $2 looks to be the return address but maybe +- * not consistently. ++ * $31 is the return address. + */ +-#define GET_RET_ADDR(file) asm("sw $2, file") +- +-#endif ++#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) + + #endif /* __mips */ + +-- +2.25.1 + diff --git a/package/dmalloc/0001-mips.patch b/package/dmalloc/0001-mips.patch deleted file mode 100644 index 3150d030ec..0000000000 --- a/package/dmalloc/0001-mips.patch +++ /dev/null @@ -1,45 +0,0 @@ -[Fabrice: Updated for 5.6.5] -Signed-off-by: Fabrice Fontaine ---- a/configure -+++ b/configure -@@ -7107,7 +7107,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 - $as_echo_n "checking return.h macros work... " >&6; } - if test "$cross_compiling" = yes; then : -- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h -+ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - ---- a/return.h -+++ b/return.h -@@ -106,26 +106,16 @@ - /*************************************/ - - /* -- * For DEC Mips machines running Ultrix -+ * For Mips machines running Linux - */ - #if __mips - - /* -- * I have no idea how to get inline assembly with the default cc. -- * Anyone know how? -- */ -- --#if 0 -- --/* - * NOTE: we assume here that file is global. - * -- * $31 is the frame pointer. $2 looks to be the return address but maybe -- * not consistently. -+ * $31 is the return address. - */ --#define GET_RET_ADDR(file) asm("sw $2, file") -- --#endif -+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) - - #endif /* __mips */ - From yann.morin.1998 at free.fr Mon Feb 20 21:01:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:16 -0000 Subject: [Buildroot] [git commit branch/next] package/z3: bump to version 4.12.0 Message-ID: <20230220205236.1D7398648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8eef1e1488bce0732dbce137baa4f506a29dd13f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For change log since v4.11.2, see: - https://github.com/Z3Prover/z3/releases/tag/z3-4.12.0 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/z3/z3.hash | 2 +- package/z3/z3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/z3/z3.hash b/package/z3/z3.hash index d38c5f1971..517e2f4923 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e3a82431b95412408a9c994466fad7252135c8ed3f719c986cd75c8c5f234c7e z3-4.11.2.tar.gz +sha256 5f575f0a3950760436217da1cc1a714569b6d4f664a75bb6775876328cf0a580 z3-4.12.0.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index 2252e05395..ecd79325dc 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.11.2 +Z3_VERSION = 4.12.0 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Wed Feb 15 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit branch/next] package/dmalloc: don't use SSP Message-ID: <20230220205301.35B1E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3481674ee36fe9fa695e2e6c255bf02b5ab380b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next dmalloc directly calls into $(LD) to generate a shared library our of the static one. To detect what command it should run, ./configure tries various incantations of ld with various command line options until one does not fail. One of those is (basically): $(LD) --whole-archive -o contest.o.t contest.a This makes ./configure conclude what the command to link a shared library in the Makefile should be, and thus stores that in a variable: shlinkargs='$(LD) --whole-archive -o $@' ... which is then AC_SUBST()ed into Makefile.in with a rule like: $(SHLIB): $(LIBRARY) @shlinkargs@ $(LIRARY) which once substiuted, gives: $(SHLIB): $(LIBRARY) $(LD) --whole-archive -o $@ $(LIRARY) However, when SSP is enabled, the __stack_chk_fail_local and co symbols are provided by additional libraries or object files, and that is the responsibility of gcc to pass those when linking. But as dmalloc directly calls ld, it misses those. Changing dmalloc to use $(CC) is not trivial, however. First, we can't pass LD=$(TARGET_CC), otherwise the whole package explodes [0]: indeed --whole-archive is unknown to gcc, so it must be passed as -Wl,--whole archive instead. So we'd need to add a new test that uses $(CC), like so: $(CC) -Wl,--whole-archive -o contest.o.t contest.a However, in that case, gcc does pass additional libs/objs (like, for eample, the SSP ones) to the linker. But then those are also included in the whole-archive section. This causes the linker to add all the symbols form those libs/objs, even those not needed for SSP; on some archs, like PPC, that may require floating point symbols (__muldiv3 et al.) which are in another library, and thus the linker can't find them. The proper solution wouild be to add -Wl,--no-whole-archive, but that would have to be added _after_ the library we want to link, i.e.e we should be able to evntually run: $(CC) -Wl,--whole-archive -o $@ $(LIRARY) -Wl,--no-whole-archive That would require that we introduce a new variable that is added _after_ the $(LIBRARY), e.g. @shlinkargs_post@ or so... This is a bigger endeavour than we want to pursue... Since dmalloc is a debugging utility, it is not supposed to go into production builds, and during debugging, it would not be surprising that it needs to poke around arrays to debug them. So, we go the easier route: disable SSP altogether. [0] with lots of nice colors, but that's not the point, is it? Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dmalloc/dmalloc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 6b90f810b2..5bd6691725 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -14,6 +14,13 @@ DMALLOC_LICENSE_FILES = LICENSE.txt DMALLOC_INSTALL_STAGING = YES DMALLOC_CFLAGS = $(TARGET_CFLAGS) +# dmalloc uses $(LD) to link, and thus misses the object files or libs that +# are needed to provide the __stack_chk_fail_local and co. symbols. Changing +# to use $(CC) is really more complex that we'd like. Since dmalloc is +# involved in debugging memory allocation, it is not expected to be a +# production library, so we do not care that much that it has SSP. +DMALLOC_CFLAGS += -fno-stack-protector + ifeq ($(BR2_STATIC_LIBS),y) DMALLOC_CONF_OPTS += --disable-shlib else From yann.morin.1998 at free.fr Mon Feb 20 21:01:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:17 -0000 Subject: [Buildroot] [git commit branch/next] package/sscep: requires des support in openssl Message-ID: <20230220205236.2BDE3828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af8200a4c3543403ca653f4064f6649a052440e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Enable des in openssl to fix the following build failure raised since the addition of the package in commit 72fa60dc102679f51b228336ec38f5af78ff7646: src/sscep.c: In function 'get_cipher_alg': src/sscep.c:119:32: warning: implicit declaration of function 'EVP_des_ede3_cbc'; did you mean 'NID_des_ede3_cbc'? [-Wimplicit-function-declaration] 119 | return EVP_des_ede3_cbc(); | ^~~~~~~~~~~~~~~~ | NID_des_ede3_cbc Fixes: - http://autobuild.buildroot.net/results/34bd76e8e5e7df0db31918d610a0dadf531f369d Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/sscep/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sscep/Config.in b/package/sscep/Config.in index 2e5e29f7c8..549c65274b 100644 --- a/package/sscep/Config.in +++ b/package/sscep/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SSCEP bool "sscep" select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL help SSCEP is a client-only implementation of the SCEP From thomas.petazzoni at bootlin.com Fri Feb 17 13:28:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:28:47 +0100 Subject: [Buildroot] [git commit branch/next] package/dotconf: new package Message-ID: <20230220205301.876B48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5336566668bd2ac9cd458a051eb6e8105d4b4544 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/dotconf/Config.in | 6 ++++++ package/dotconf/dotconf.hash | 3 +++ package/dotconf/dotconf.mk | 15 +++++++++++++++ 5 files changed, 28 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f8451c7fec..b9d54feb46 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2297,6 +2297,9 @@ F: package/wireguard-linux-compat/ F: package/wireguard-tools/ F: support/testing/tests/package/test_docker_compose.py +N: Peter Seiderer +F: package/dotconf/ + N: Peter Thompson F: package/sdl2_gfx/ F: package/sdl2_image/ diff --git a/package/Config.in b/package/Config.in index 0af4adffa5..b2808cc6f8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2019,6 +2019,7 @@ menu "Other" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" source "package/ding-libs/Config.in" + source "package/dotconf/Config.in" source "package/double-conversion/Config.in" source "package/eigen/Config.in" source "package/elfutils/Config.in" diff --git a/package/dotconf/Config.in b/package/dotconf/Config.in new file mode 100644 index 0000000000..21a74fa065 --- /dev/null +++ b/package/dotconf/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_DOTCONF + bool "dotconf" + help + Configuration file parser. + + https://github.com/williamh/dotconf diff --git a/package/dotconf/dotconf.hash b/package/dotconf/dotconf.hash new file mode 100644 index 0000000000..3233ea62c8 --- /dev/null +++ b/package/dotconf/dotconf.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7f1ecf40de1ad002a065a321582ed34f8c14242309c3547ad59710ae3c805653 dotconf-1.3.tar.gz +sha256 a50cc98d5044a7bbddabe61fc0ec42aa671c73bf414d0c6b50da83ea8ae041c6 COPYING diff --git a/package/dotconf/dotconf.mk b/package/dotconf/dotconf.mk new file mode 100644 index 0000000000..26e78b3c7a --- /dev/null +++ b/package/dotconf/dotconf.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# dotconf +# +################################################################################ + +DOTCONF_VERSION = 1.3 +DOTCONF_SITE = $(call github,williamh,dotconf,v$(DOTCONF_VERSION)) +DOTCONF_LICENSE = LGPL-2.1 +DOTCONF_LICENSE_FILES = COPYING +DOTCONF_INSTALL_STAGING = YES +# dotconf source code is released without configure script +DOTCONF_AUTORECONF = YES + +$(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:01:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:18 -0000 Subject: [Buildroot] [git commit branch/next] package/lua-cffi: bump to version 0.2.3 Message-ID: <20230220205236.4A1608648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aac8ce4999c3c2e105347fd247ba65304ab0d26a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-cffi/lua-cffi.hash | 2 +- package/lua-cffi/lua-cffi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lua-cffi/lua-cffi.hash b/package/lua-cffi/lua-cffi.hash index e710199936..318f60fefe 100644 --- a/package/lua-cffi/lua-cffi.hash +++ b/package/lua-cffi/lua-cffi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 34fb4eea7a0abec2095f08596f604ac01c81b979bead7d2f5cb084b3e2b46cbc lua-cffi-0.2.2.tar.gz +sha256 1d2577a62a843e5e6db35af1b58300d279b4df58eccef5e823441501f960d388 lua-cffi-0.2.3.tar.gz sha256 f5653a4d5864a3920ea1e07dacfd646067314be647598f0acaaf685beaa2e396 COPYING.md diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk index ac351f7f98..30427ac34c 100644 --- a/package/lua-cffi/lua-cffi.mk +++ b/package/lua-cffi/lua-cffi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CFFI_VERSION = 0.2.2 +LUA_CFFI_VERSION = 0.2.3 LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) LUA_CFFI_LICENSE = MIT LUA_CFFI_LICENSE_FILES = COPYING.md From thomas.petazzoni at bootlin.com Fri Feb 17 13:45:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:45:57 +0100 Subject: [Buildroot] [git commit branch/next] package/speechd: new package Message-ID: <20230220205301.9353E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/speechd/Config.in | 20 ++++++++++++++++++++ package/speechd/speechd.hash | 5 +++++ package/speechd/speechd.mk | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b9d54feb46..319ea9f4dc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2299,6 +2299,7 @@ F: support/testing/tests/package/test_docker_compose.py N: Peter Seiderer F: package/dotconf/ +F: package/speechd/ N: Peter Thompson F: package/sdl2_gfx/ diff --git a/package/Config.in b/package/Config.in index b2808cc6f8..e9746862b4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -51,6 +51,7 @@ menu "Audio and video applications" source "package/pipewire-media-session/Config.in" source "package/pulseaudio/Config.in" source "package/sox/Config.in" + source "package/speechd/Config.in" source "package/squeezelite/Config.in" source "package/tinycompress/Config.in" source "package/tovid/Config.in" diff --git a/package/speechd/Config.in b/package/speechd/Config.in new file mode 100644 index 0000000000..8fdc452d19 --- /dev/null +++ b/package/speechd/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_SPEECHD + bool "speechd" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_DOTCONF + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSNDFILE + help + Speech Dispatcher project provides a high-level device + independent layer for access to speech synthesis through + a simple, stable and well documented interface. + + https://freebsoft.org/speechd + +comment "speechd needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/speechd/speechd.hash b/package/speechd/speechd.hash new file mode 100644 index 0000000000..4eb4cd09d2 --- /dev/null +++ b/package/speechd/speechd.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 628d4446894b47f0df099123924c1070180b5b5b09c5b637ebe80d8578fba92f speechd-0.11.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL-2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL-3 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk new file mode 100644 index 0000000000..0d43e4b6fb --- /dev/null +++ b/package/speechd/speechd.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# speechd +# +################################################################################ + +SPEECHD_VERSION = 0.11.4 +SPEECHD_SITE = $(call github,brailcom,speechd,$(SPEECHD_VERSION)) +SPEECHD_LICENSE = GPL-2.0+, GPL-3.0+ (buildsystem), LGPL-2.1+ +SPEECHD_LICENSE_FILES = COPYING.GPL-2 COPYING.GPL-3 COPYING.LGPL +SPEECHD_INSTALL_STAGING = YES +# speechd source code is released without configure script +SPEECHD_AUTORECONF = YES +SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile + +# fix missing config.rpath (needed for autoreconf) in the codebase +define SPEECHD_TOUCH_CONFIG_RPATH + touch $(@D)/config.rpath +endef +SPEECHD_PRE_CONFIGURE_HOOKS += SPEECHD_TOUCH_CONFIG_RPATH + +ifeq ($(BR2_PACKAGE_LIBTOOL),y) +SPEECHD_DEPENDENCIES += libtool +SPEECHD_CONF_OPTS += --with-libltdl +else +SPEECHD_CONF_OPTS += --without-libltdl +endif + +define SPEECHD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/speech-dispatcherd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/speech-dispatcherd.service +endef + +$(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:01:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:19 -0000 Subject: [Buildroot] [git commit branch/next] package/go: set GOCACHE for download post-process Message-ID: <20230220205236.58C4A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07a745e55d76616802a20dcbfd72dfe6fe8e3b05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The go mod vendor call in support/download/go-post-process accesses the go cache, so pass GOCACHE= in the environment to ensure our cache directory is used. The go cache defaults to ~/.cache/go-build if not set, so this fixes builds where that location (or GOCACHE if set in the environment) is not writable: rm -rf ~/.cache/go-build chmod -w ~/.cache make docker-compose-source .. failed to initialize build cache at /home/peko/.cache/go-build: mkdir /home/peko/.cache/go-build: permission denied make[1]: *** [package/pkg-generic.mk:189: /home/peko/source/buildroot/output/build/docker-compose-2.14.0/.stamp_downloaded] Error 1 We use two different cache directories for target and host builds, but the download/vendoring should be independent of the architecture, so use the target variant even for host-only packages for simplicity. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/go/go.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/go/go.mk b/package/go/go.mk index d3ed07f03b..c4f72d403c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -25,6 +25,7 @@ HOST_GO_COMMON_ENV = \ GOFLAGS=-mod=vendor \ GOROOT="$(HOST_GO_ROOT)" \ GOPATH="$(HOST_GO_GOPATH)" \ + GOCACHE="$(HOST_GO_TARGET_CACHE)" \ GOPROXY=off \ PATH=$(BR_PATH) \ GOBIN= \ @@ -75,7 +76,6 @@ HOST_GO_TARGET_ENV = \ $(HOST_GO_COMMON_ENV) \ GOOS="linux" \ GOARCH=$(GO_GOARCH) \ - GOCACHE="$(HOST_GO_TARGET_CACHE)" \ CC="$(TARGET_CC)" \ CXX="$(TARGET_CXX)" \ CGO_CFLAGS="$(TARGET_CFLAGS)" \ From thomas.petazzoni at bootlin.com Fri Feb 17 15:02:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:02:28 +0100 Subject: [Buildroot] [git commit branch/next] package/openipmi: add libexecinfo optional dependency Message-ID: <20230220205301.C84C08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5357f650d7e58043a5b8ab820972984eb07fef4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add libexecinfo optional dependency as upstream rejected the patch to add --with-execinfo=no Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-configure.ac-add-without-execinfo-option.patch | 55 ---------------------- package/openipmi/openipmi.mk | 6 ++- 2 files changed, 5 insertions(+), 56 deletions(-) diff --git a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch deleted file mode 100644 index e1838a06f4..0000000000 --- a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 388033e3d0129510c3884333bc428cefeb75e0b8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 3 Jan 2022 23:27:21 +0100 -Subject: [PATCH] configure.ac: add --without-execinfo option - -Add an option to allow the user to disable execinfo to avoid the -following build failure on musl with -https://github.com/mikroskeem/libexecinfo: - -/home/buildroot/autobuild/instance-3/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-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' - -Fixes: - - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://sourceforge.net/p/openipmi/patches/36] ---- - configure.ac | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 607864b9..f369166f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -77,6 +77,16 @@ AC_ARG_WITH(poptlibs, - POPTLIBS="$withval" - ) - -+tryexecinfo=yes -+AC_ARG_WITH(execinfo, -+[ --with-execinfo[[=yes|no]] Look for execinfo.], -+ if test "x$withval" = "xyes"; then -+ tryexecinfo=yes -+ elif test "x$withval" = "xno"; then -+ tryexecinfo=no -+ fi, -+) -+ - # If UCD SNMP requires OpenSSL, this tells where to find the crypto lib - tryopenssl=yes - AC_ARG_WITH(openssl, -@@ -275,7 +285,9 @@ AM_PROG_CC_C_O - AC_PROG_LIBTOOL - AC_STDC_HEADERS - --AC_CHECK_HEADERS(execinfo.h) -+if test "x$tryexecinfo" != "xno"; then -+ AC_CHECK_HEADERS(execinfo.h) -+fi - AC_CHECK_HEADERS([netinet/ether.h]) - AC_CHECK_HEADERS([sys/ethernet.h]) - --- -2.34.1 - diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index b3a4d90d4b..81492ec131 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -15,7 +15,6 @@ OPENIPMI_INSTALL_STAGING = YES OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" OPENIPMI_CONF_OPTS = \ - --with-execinfo=no \ --with-glib=no \ --with-tcl=no \ --with-perl=no \ @@ -26,6 +25,11 @@ ifeq ($(BR2_PACKAGE_GDBM),y) OPENIPMI_DEPENDENCIES += gdbm endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +OPENIPMI_DEPENDENCIES += libexecinfo +OPENIPMI_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPENIPMI_DEPENDENCIES += openssl OPENIPMI_CONF_OPTS += --with-openssl=yes From yann.morin.1998 at free.fr Mon Feb 20 21:01:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:20 -0000 Subject: [Buildroot] [git commit branch/next] fs/erofs: enable support for reproducible build Message-ID: <20230220205236.72D978648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac5ecaf86809a999d68d851c2200705a8f10a7b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next By default, mkfs.erofs will sue the current date to set some metadata in the filesystem it generates, and will also use generate a random UUID for that filesystem. This is not reproducible. When BR2_REPRODUCIBLE is selected, set the filesystem timestamps to $SOURCE_DATE_EPOCH, and the filesystem UUID to the nil uuid (as good as any other arbitrary one). Signed-off-by: Casey Reeves [yann.morin.1998 at free.fr: - one multi-line assignment, not two - slightly rephrase the commit log ] Signed-off-by: Yann E. MORIN --- fs/erofs/erofs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/erofs/erofs.mk b/fs/erofs/erofs.mk index 0e9d4401a9..e43d74927b 100644 --- a/fs/erofs/erofs.mk +++ b/fs/erofs/erofs.mk @@ -10,6 +10,12 @@ ifeq ($(BR2_TARGET_ROOTFS_EROFS_LZ4HC),y) ROOTFS_EROFS_ARGS += -zlz4hc endif +ifeq ($(BR2_REPRODUCIBLE),y) +ROOTFS_EROFS_ARGS += \ + -T $(SOURCE_DATE_EPOCH) \ + -U 00000000-0000-0000-0000-000000000000 +endif + ifneq ($(BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE),0) ROOTFS_EROFS_ARGS += -C$(strip $(BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE)) endif From thomas.petazzoni at bootlin.com Sat Feb 18 11:15:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 12:15:05 +0100 Subject: [Buildroot] [git commit branch/next] package/python-webargs: fix formatting in hash file Message-ID: <20230220205302.0748E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6085c00d0feece6f3ba635e7847ea653bc5fac3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: package/python-webargs/python-webargs.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Thomas Petazzoni --- package/python-webargs/python-webargs.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-webargs/python-webargs.hash b/package/python-webargs/python-webargs.hash index 619b584807..10bb3651f0 100644 --- a/package/python-webargs/python-webargs.hash +++ b/package/python-webargs/python-webargs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/webargs/json -md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz +md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz sha256 99d68940c452e07726485a15fef43f12f8ae6c0c5b391bcba76065d4527fb85d webargs-8.2.0.tar.gz # Locally computed sha256 checksums sha256 5973e5dcc20b65e4eb4b4acdf273bb78a18522914ab626f496f1b070f7e6294d LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:01:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:21 -0000 Subject: [Buildroot] [git commit branch/next] package/frr: bump to version 8.4.2 Message-ID: <20230220205236.840FB81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ccaf9f316544f0c8c3546b70568ed48c265e801b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changes since 8.3.1: - https://frrouting.org/release/8.4 - https://frrouting.org/release/8.4.1 Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/frr/frr.hash | 2 +- package/frr/frr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/frr/frr.hash b/package/frr/frr.hash index 87ade19c16..836f130b93 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9b0430d01f8da2d780ac5e41de2cf4e53abff0ed06a0cc75d745f4b1f29e5b9e frr-8.3.1.tar.gz +sha256 8a6b0e0fa1e89493ba84cf176674e55c7a814821fd02a7188095b76c37c3935f frr-8.4.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 72c46ba4aa..abae784c40 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 8.3.1 +FRR_VERSION = 8.4.2 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 19 16:52:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:52:09 +0100 Subject: [Buildroot] [git commit branch/next] package/python3: bump version to 3.11.2 Message-ID: <20230220205302.1343A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be235c048f004617851d7ef752ee5f4dc2373e28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://docs.python.org/release/3.11.2/whatsnew/changelog.html#python-3-11-2 Updated license hash due to copyright year bump: https://github.com/python/cpython/commit/07d1f99e8faefcf24dab2113fb0df27202fa6f71 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/python3/python3.hash | 4 ++-- package/python3/python3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 7f079865d9..f235347efb 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f Python-3.11.1.tar.xz -sha256 d4a223f033419313218c9b8444167e91e87a5bebdb43fb8490df441df5220a8b LICENSE +sha256 29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af Python-3.11.2.tar.xz +sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index fb6dbf2e64..56fe95cd07 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From peter at korsgaard.com Mon Feb 20 21:01:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:01:22 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.11.1 Message-ID: <20230220205236.A304981979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a796cfb2e0343730a1232d0f5aff405a9788a15d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard (cherry picked from commit d48a8beb39275a479185ab9b3232cd15dcfb87ab) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 6de79c7d35..e23cd4eaf8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,53 @@ +2022.11.1, released January 18th, 2023 + + Important / security related fixes. + + Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + Go: Ensure our go build and module cache is used, even for the + download step. + + Legal-info: Stop warning about not saving sources for local / + override packages if _REDISTRIBUTE is set to NO. + + Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + Defconfigs: zcu106, kria kv260: Fix U-Boot build + + Updated/fixed packages: asterisk, bearssl, botan, cairo, + capnproto, check, checkpolicy, connman, containerd, crun, + dbus-cxx, docker-cli, docker-engine, exempi, exfat, + exfat-utils, falcosecurity-libs, fluidsynth, fmc, fmlib, + freeradius-server, gcc, glib-networking, go, + gobject-introspection, gperf, i2pd, ima-evm-utils, + imx-alsa-plugins, imx-kobs, imx-lib, imx-m4fwloader, + imx-mkimage, intel-microcode, janus-gateway, libcurl, + libdeflate, libftdi1, libkcapi, libksba, libmbim, libmng, + libpjsip, libtalloc, libuwsc, libxkbcommon, lpeg, lrzsz, + lttng-tools, lua-cqueues, mali-driver, mbedtls, mfgtools, + moby-buildkit, mutt, opensc, php, policycoreutils, polkit, + postgresql, pptp-linux, qcom-db410c-firmware, qemu, qoriq-rcw, + qt5virtualkeyboard, redis, rhash, rtl8189es, rtl8192eu, + rtl_433, ruby, sqlite, swupdate, tealdeer, tekui, tiff, + tinyxml, tor, webkitgtk, wireshark, wpasupplicant, wpewebkit, + xr819-xradio, xdriver_xf86-video-imx-viv, xserver_xorg-server, + xxhash, zip + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + 2022.11, released December 5th, 2022 Fixes all over the tree. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 02fe6bca67..9eee9955ec 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2022.11' +RELEASE='2022.11.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Sun Feb 19 16:52:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:52:32 +0100 Subject: [Buildroot] [git commit branch/next] package/php: security bump version to 8.2.3 Message-ID: <20230220205302.1E3E186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66b1926764582a628b0b6b68a3aebe4b9790ab12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://www.php.net/ChangeLog-8.php#8.2.3 Fixes CVE-2023-0567, CVE-2023-0568 & CVE-2023-0662. Signed-off-by: Bernd Kuhls 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 869cb9b94f..41aa326156 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz +sha256 b9b566686e351125d67568a33291650eb8dfa26614d205d70d82e6e92613d457 php-8.2.3.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 9ce153f4fa..bd7d5a8c3c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.2 +PHP_VERSION = 8.2.3 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 21:01:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:23 -0000 Subject: [Buildroot] [git commit branch/next] package/xxhash: set XXH_NO_INLINE_HINTS Message-ID: <20230220205236.DDF958648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94b66fb49cd57d0863245fbe0a3dc0833e76aad0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Set XXH_NO_INLINE_HINTS to marks all internal functions as static, giving the compiler full control on whether to inline or not. This will fix the following build failure raised since bump to version 0.8.1 in commit 5dbdb2535c649ee617595b8c4ae3cbba0ee37b97: In file included from xxhash.c:43: In function 'XXH3_accumulate', inlined from 'XXH3_hashLong_internal_loop' at xxhash.h:4390:9, inlined from 'XXH3_hashLong_64b_internal' at xxhash.h:4453:5, inlined from 'XXH3_hashLong_64b_withSecret' at xxhash.h:4473:12, inlined from 'XXH3_64bits_internal' at xxhash.h:4554:12, inlined from 'XXH3_64bits_withSecret' at xxhash.h:4570:12: xxhash.h:4196:1: error: inlining failed in call to 'always_inline' 'XXH3_accumulate_512_scalar': function not considered for inlining 4196 | XXH3_accumulate_512_scalar(void* XXH_RESTRICT acc, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/f2c52238df97cc4c13117d8dc1423235231a094c Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/xxhash/xxhash.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 04bc98690f..40e3c2696c 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -28,6 +28,7 @@ endif define XXHASH_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + CFLAGS="$(TARGET_CFLAGS) -DXXH_NO_INLINE_HINTS" \ $(XXHASH_TARGETS) endef From peter at korsgaard.com Sun Feb 19 16:55:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:55:03 +0100 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: fix build with libexecinfo Message-ID: <20230220205302.5C1827FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=364511933811d76d4b866fe3aa04adff449cf94b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with libexecinfo raised since commit d649bcd3805a26cedb30120ebbdcf12f8fbf449f: /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/10.4.0/../../../../mips-buildroot-linux-musl/bin/ld: ../lib/monkey/library/libmonkey.a(mk_utils.c.o): in function `mk_utils_stacktrace': mk_utils.c:(.text+0x1578): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index d618fdf1e2..8ba16399bb 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -56,6 +56,11 @@ FLUENT_BIT_CXXFLAGS += -fcommon FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +FLUENT_BIT_DEPENDENCIES += libexecinfo +FLUENT_BIT_LDFLAGS += -lexecinfo +endif + ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) FLUENT_BIT_DEPENDENCIES += musl-fts FLUENT_BIT_LDFLAGS += -lfts From peter at korsgaard.com Mon Feb 20 21:01:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:01:24 -0000 Subject: [Buildroot] [git commit branch/next] docs/website: update for 2022.11.1 Message-ID: <20230220205236.AF3D88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=281e51f00b838dc26be5babf4acf9730f8ad87be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 7fc5d1169b..0b62522043 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@
        -

        Latest stable release: 2022.11

        +

        Latest stable release: 2022.11.1

        - +
        - +
        -

        buildroot-2022.11.tar.gz

        -

        PGP signature

        +

        buildroot-2022.11.1.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2022.11.tar.xz

        -

        PGP signature

        +

        buildroot-2022.11.1.tar.xz

        +

        PGP signature

        +
        Source code
        diff --git a/docs/website/news.html b/docs/website/news.html index 687efeb377..8acf454052 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

        News

          +
        • +
          +
          +
          +

          2023.02-rc1 released

          +

          20 February 2023

          +
          +
          +

          We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

          + +

          Go to the downloads page to pick up the + 2023.02-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

          +
          +
          +
          • +
        • From peter at korsgaard.com Sun Feb 19 17:11:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:11:02 +0100 Subject: [Buildroot] [git commit branch/next] package/lighttpd: bump to version 1.4.69 Message-ID: <20230220205302.8C5677FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c9622ae5084473b9eeb15b04673d081f5c9fa11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: - https://www.lighttpd.net/2023/1/3/1.4.68/ - https://www.lighttpd.net/2023/2/10/1.4.69/ In this commit: - rebased patch & dropped server.use-ipv6 option [1] - fix changed meson options [2] [1]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/376d20f1617f2c0202fb415e4cc66d3f780db5ca [2]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/6b31f76cd9b36b6033607181238fbf41c5b81e07 Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...default-lighttpd-configuration-file-to-ha.patch | 33 +++++------ package/lighttpd/lighttpd.hash | 4 +- package/lighttpd/lighttpd.mk | 64 +++++++++++----------- 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch index 1a887655b8..2eab2a84e5 100644 --- a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +++ b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch @@ -1,11 +1,11 @@ -From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001 +From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Dec 2021 22:07:17 +0100 Subject: [PATCH] Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames - * Disable IPv6 + * Disable IPv6 (Dropped since 1.4.68) * Do not setuid to a user that doesn't exist on the system * Change the network backend to writev since linux-sendfile fails on buildroot @@ -13,13 +13,15 @@ Signed-off-by: Maxime Ripard Signed-off-by: Simon Dawson [Gustavo: update for 1.4.37] Signed-off-by: Gustavo Zacarias +[Thomas: update for 1.4.69 - drop server.use-ipv6] +Signed-off-by: Thomas Devoogdt --- doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) + doc/config/lighttpd.conf | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf -index e685d43..92cff4f 100644 +index e685d437..92cff4f0 100644 --- a/doc/config/conf.d/access_log.conf +++ b/doc/config/conf.d/access_log.conf @@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) @@ -32,7 +34,7 @@ index e685d43..92cff4f 100644 ## ## The default format produces CLF compatible output. diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index 495d2a1..c3e1446 100644 +index d45a284d..4e926d5a 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -13,8 +13,8 @@ @@ -46,16 +48,7 @@ index 495d2a1..c3e1446 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ server.port = 80 - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" +@@ -97,8 +97,8 @@ server.port = 80 ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -66,7 +59,7 @@ index 495d2a1..c3e1446 100644 ## ## Enable lighttpd to serve requests on sockets received from systemd -@@ -118,7 +118,7 @@ server.groupname = "lighttpd" +@@ -114,7 +114,7 @@ server.groupname = "lighttpd" ## ## Document root ## @@ -75,7 +68,7 @@ index 495d2a1..c3e1446 100644 ## ## The value for the "Server:" response field. -@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid" +@@ -140,7 +140,7 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## @@ -84,7 +77,7 @@ index 495d2a1..c3e1446 100644 ## ## If you want to log to syslog you have to unset the -@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf" +@@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf" ## and write(). Every modern OS provides its own syscall to help network ## servers transfer files as fast as possible ## @@ -94,5 +87,5 @@ index 495d2a1..c3e1446 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.34.1 +2.39.0 diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 8353857ad9..29bf5124b6 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.67.sha512sum -sha512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627 lighttpd-1.4.67.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum +sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index d3440040fb..ca2035b6b3 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).67 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -13,49 +13,49 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=false \ - -Dwith_fam=false \ + -Dwith_dbi=disabled \ + -Dwith_fam=disabled \ -Dwith_gnutls=false \ - -Dwith_libev=false \ - -Dwith_libunwind=false \ + -Dwith_libev=disabled \ + -Dwith_libunwind=disabled \ -Dwith_mbedtls=false \ -Dwith_nettle=false \ -Dwith_nss=false \ - -Dwith_pcre=false \ - -Dwith_sasl=false \ + -Dwith_pcre=disabled \ + -Dwith_sasl=disabled \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=true \ + -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli -LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +LIGHTTPD_CONF_OPTS += -Dwith_brotli=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +LIGHTTPD_CONF_OPTS += -Dwith_bzip=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 -LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +LIGHTTPD_CONF_OPTS += -Dwith_krb5=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) LIGHTTPD_DEPENDENCIES += openldap -LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +LIGHTTPD_CONF_OPTS += -Dwith_ldap=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) @@ -67,16 +67,16 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) LIGHTTPD_DEPENDENCIES += libmaxminddb -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mysql -LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) @@ -88,9 +88,9 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += -Dwith_pam=true +LIGHTTPD_CONF_OPTS += -Dwith_pam=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pam=false +LIGHTTPD_CONF_OPTS += -Dwith_pam=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) @@ -102,36 +102,36 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) LIGHTTPD_DEPENDENCIES += postgresql -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=enabled ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=enabled LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=disabled endif else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true +LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) LIGHTTPD_DEPENDENCIES += zstd -LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +LIGHTTPD_CONF_OPTS += -Dwith_zstd=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +LIGHTTPD_CONF_OPTS += -Dwith_zstd=disabled endif define LIGHTTPD_INSTALL_CONFIG From thomas.petazzoni at bootlin.com Sun Feb 19 22:04:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 23:04:04 +0100 Subject: [Buildroot] [git commit branch/next] package/ipmiutil: fix uclibc build without wchar Message-ID: <20230220205302.F1AE38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b4937a1709a88f90abbeac48e2e2db33b83d44b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For an unknown reason, wchar_t is incorrectly detected with uclibc resulting in the following build failure: In file included from igetevent.c:136: imb_api.h:150:5: error: unknown type name 'wchar_t' 150 | wchar_t *Buffer; | ^~~~~~~ The build failure can be reproduced even when reverting bump to version 3.1.8. Fixes: - http://autobuild.buildroot.org/results/e9ff3bd08e106dc834968bf5e4296ce8299027f8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipmiutil/ipmiutil.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk index ad9fbfc24c..b48eaa7cb2 100644 --- a/package/ipmiutil/ipmiutil.mk +++ b/package/ipmiutil/ipmiutil.mk @@ -10,6 +10,7 @@ IPMIUTIL_LICENSE = BSD-3-Clause IPMIUTIL_LICENSE_FILES = COPYING IPMIUTIL_MAKE = $(MAKE1) +IPMIUTIL_CONF_ENV = ac_cv_type_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) ifeq ($(BR2_PACKAGE_OPENSSL),y) # tests against distro libcrypto so it might get a false positive when From peter at korsgaard.com Mon Feb 20 17:05:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:05:06 +0100 Subject: [Buildroot] [git commit branch/next] package/less: fix CVE-2022-46663 Message-ID: <20230220205303.17500828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=924ca9414fa962ce767c39b277489a0bdcbfad79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In GNU Less before 609, crafted data can result in "less -R" not filtering ANSI escape sequences sent to the terminal. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...rlink-on-invalid-embedded-escape-sequence.patch | 27 ++++++++++++++++++++++ package/less/less.mk | 3 +++ 2 files changed, 30 insertions(+) diff --git a/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch new file mode 100644 index 0000000000..233f949e24 --- /dev/null +++ b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch @@ -0,0 +1,27 @@ +From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 +From: Mark Nudelman +Date: Fri, 7 Oct 2022 19:25:46 -0700 +Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. + +[Retrieved from: +https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c] +Signed-off-by: Fabrice Fontaine +--- + line.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/line.c b/line.c +index 236c49ae..cba7bdd1 100644 +--- a/line.c ++++ b/line.c +@@ -633,8 +633,8 @@ ansi_step(pansi, ch) + /* Hyperlink ends with \7 or ESC-backslash. */ + if (ch == '\7') + return ANSI_END; +- if (pansi->prev_esc && ch == '\\') +- return ANSI_END; ++ if (pansi->prev_esc) ++ return (ch == '\\') ? ANSI_END : ANSI_ERR; + pansi->prev_esc = (ch == ESC); + return ANSI_MID; + } diff --git a/package/less/less.mk b/package/less/less.mk index 7d7a6d5fe5..f01f94d6c8 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -11,6 +11,9 @@ LESS_LICENSE_FILES = COPYING LESS_CPE_ID_VENDOR = gnu LESS_DEPENDENCIES = ncurses +# 0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch +LESS_IGNORE_CVES += CVE-2022-46663 + define LESS_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less endef From thomas.petazzoni at bootlin.com Sat Feb 18 11:14:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 12:14:21 +0100 Subject: [Buildroot] [git commit branch/next] package/python-flask-smorest: fix formatting in hash file Message-ID: <20230220205301.EDFE7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41cca5274a8afce269f9b2bdc9e113e073e28abb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: package/python-flask-smorest/python-flask-smorest.hash:5: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Thomas Petazzoni --- package/python-flask-smorest/python-flask-smorest.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-flask-smorest/python-flask-smorest.hash b/package/python-flask-smorest/python-flask-smorest.hash index 5abe0c5033..941535c503 100644 --- a/package/python-flask-smorest/python-flask-smorest.hash +++ b/package/python-flask-smorest/python-flask-smorest.hash @@ -2,4 +2,4 @@ md5 1dad52f26c59ca2dcaf0c5d109879605 flask-smorest-0.40.0.tar.gz sha256 9b46b4937ccf78702d99fed8cfd1cd5c37608ddefd65ff16a86d1ad5c7f7d8c0 flask-smorest-0.40.0.tar.gz # Locally computed sha256 checksums -sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE +sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE From peter at korsgaard.com Mon Feb 20 17:22:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:22:29 +0100 Subject: [Buildroot] [git commit branch/next] package/webkitgtk: security bump to version 2.38.5 Message-ID: <20230220205303.7EA908648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c7fcbbe75de5c535e8d5dd7182900b6d09e2b03 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bugfix release, with many security fixes, including (but not limited to) a patch for CVE-2023-23529. Release notes: https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0002.html Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, we do check on >= GCC 8, because we can't check on >= GCC 8.3. https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b Signed-off-by: Thomas Devoogdt Acked-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 4 ++-- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index dc5d738dae..976341093e 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 34fd19d3de..c771297b5a 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums -md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz -sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz -sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums +md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz +sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz +sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index a6974db926..3263f7fea0 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.4 +WEBKITGTK_VERSION = 2.38.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From peter at korsgaard.com Sun Feb 19 16:53:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:53:44 +0100 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-trident: bump version to 1.4.0 Message-ID: <20230220205302.359A181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05de8e14ce9bf9ea109aa028b34aba559aa18aad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003326.html Removed patch which was applied upstream. Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-Remove-ramdac.patch | 56 ---------------------- .../xdriver_xf86-video-trident.hash | 5 +- .../xdriver_xf86-video-trident.mk | 6 +-- 3 files changed, 6 insertions(+), 61 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch b/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch deleted file mode 100644 index 38ca9afebf..0000000000 --- a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 07a5c4732f1c28ffcb873ee04500e3cb813c50b4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Dec 2021 22:28:04 +0100 -Subject: [PATCH] Remove ramdac - -ramdac drivers have been removed from xserver since version 21.0.99.1 -and -https://gitlab.freedesktop.org/xorg/xserver/-/commit/f0385fb420158ac3bc1c4c325431ffc5c62344bb -resulting in the following build failure: - -In file included from trident_bank.c:37: -trident.h:41:10: fatal error: xf86RamDac.h: No such file or directory - 41 | #include "xf86RamDac.h" - | ^~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/c81ac8075af257e8626d9d097270be7a7b4a1496 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/merge_requests/1] ---- - src/trident.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/trident.h b/src/trident.h -index 5cadf52..c82de4c 100644 ---- a/src/trident.h -+++ b/src/trident.h -@@ -38,7 +38,6 @@ - #include "xaa.h" - #endif - #include "xf86fbman.h" --#include "xf86RamDac.h" - #include "compiler.h" - #include "vgaHW.h" - #include "xf86i2c.h" -@@ -103,7 +102,6 @@ typedef struct { - int useEXA; - int Chipset; - int DACtype; -- int RamDac; - int ChipRev; - int HwBpp; - int BppShift; -@@ -169,7 +167,6 @@ typedef struct { - CARD32 BltScanDirection; - CARD32 DrawFlag; - CARD16 LinePattern; -- RamDacRecPtr RamDacRec; - int CursorOffset; - xf86CursorInfoPtr CursorInfoRec; - xf86Int10InfoPtr Int10; --- -2.33.0 - diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash index 321f35d4f0..2ef664487c 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002762.html -sha256 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f xf86-video-trident-1.3.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003326.html +sha256 7f76219ca7d7dc6061aa3c2aa59bc2a63895b8e6217e413ce315949f57b0189b xf86-video-trident-1.4.0.tar.xz +sha512 86f349ccfcf7c704e77a95882f63ac92f55819a3a00388f294777762fed04dde2197dd6124cded9e787af1982fecc43ad4d0af34307845e616a73d5a2ba750b9 xf86-video-trident-1.4.0.tar.xz # Locally calculated sha256 4f065198c49eac1513b915bc4478152c21119f31a97919a6ea8f3e1d10133d15 COPYING diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk index 20ec4bbc24..53fe150420 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.8 -XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.4.0 +XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.xz +XDRIVER_XF86_VIDEO_TRIDENT_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT XDRIVER_XF86_VIDEO_TRIDENT_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xorgproto From thomas.petazzoni at bootlin.com Fri Feb 17 14:57:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 15:57:08 +0100 Subject: [Buildroot] [git commit branch/next] package/catch2: new package Message-ID: <20230220205301.BCE9E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5b597d5d839486e82a80f1c59c2a91a5af87c06 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Catch2 is a modern C++ unit testing framework which is increasing in popularity. This package is staging only and allows to build tests to be run on the target. - https://github.com/catchorg/Catch2 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/catch2/Config.in | 28 ++++++++++++++++++++++++++++ package/catch2/catch2.hash | 3 +++ package/catch2/catch2.mk | 22 ++++++++++++++++++++++ 5 files changed, 55 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3d9c51a094..7894b10e38 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2035,6 +2035,7 @@ F: package/sdl2/ N: Michael Nosthoff F: package/boost/ +F: package/catch2/ F: package/fmt/ F: package/grpc/ F: package/gtest/ diff --git a/package/Config.in b/package/Config.in index 523cf7cbdf..6c5238a9b0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2012,6 +2012,7 @@ menu "Other" source "package/boost/Config.in" source "package/c-capnproto/Config.in" source "package/capnproto/Config.in" + source "package/catch2/Config.in" source "package/cctz/Config.in" source "package/cereal/Config.in" source "package/clang/Config.in" diff --git a/package/catch2/Config.in b/package/catch2/Config.in new file mode 100644 index 0000000000..2f53d197b2 --- /dev/null +++ b/package/catch2/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_CATCH2 + bool "catch2" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_USE_MMU # fork() + help + Catch2 is mainly a unit testing framework for C++, but it + also provides basic micro-benchmarking features, and simple + BDD macros. + + Catch2's main advantage is that using it is both simple and + natural. Tests autoregister themselves and do not have to + be named with valid identifiers, assertions look like + normal C++ code, and sections provide a nice way to share + set-up and tear-down code in tests. + + This package allows running testsuites on the target which + might be advantageous in certain cases. + + https://github.com/catchorg/Catch2 + +comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash new file mode 100644 index 0000000000..664164fd76 --- /dev/null +++ b/package/catch2/catch2.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 2106bccfec18c8ce673623d56780220e38527dd8f283ccba26aa4b8758737d0e catch2-3.1.1.tar.gz +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk new file mode 100644 index 0000000000..ab62cc943b --- /dev/null +++ b/package/catch2/catch2.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# catch2 +# +################################################################################ + +CATCH2_VERSION = 3.1.1 +CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) +CATCH2_INSTALL_STAGING = YES +CATCH2_INSTALL_TARGET = NO +CATCH2_LICENSE = BSL-1.0 +CATCH2_LICENSE_FILES = LICENSE.txt +CATCH2_SUPPORTS_IN_SOURCE_BUILD = NO + +# We force building a static library only as building a dynamic +# library is not really supported officially: +# https://github.com/catchorg/Catch2/blob/devel/docs/faq.md#can-i-compile-catch2-into-a-dynamic-library +CATCH2_CONF_OPTS = \ + -DCATCH_INSTALL_DOCS=OFF \ + -DBUILD_SHARED_LIBS=OFF + +$(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 20 17:12:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:12:11 +0100 Subject: [Buildroot] [git commit branch/next] package/glslsandbox-player: add wayland-protocols optional dependency Message-ID: <20230220205303.59467828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee13e3fb41dc7c0c001127733b5a599c1e509747 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next wayland-protocols is an optional dependency which is enabled by default resulting in the following wayland build failure since the addition of the package in commit f201ca9d0d25b491ec5e1ed4e1d02fd52d027997: checking for wayland_client... yes checking for wayland_egl... yes configure: Wayland EGL support enabled checking for wayland_protocols... no configure: error: Package requirements (wayland-protocols >= 1.12) were not met: Package 'wayland-protocols', required by 'virtual:world', not found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables wayland_protocols_CFLAGS and wayland_protocols_LIBS to avoid the need to call pkg-config. Fixes: - http://autobuild.buildroot.org/results/865af860f9e52fe5311bb0c6a246ff871ae5a989 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/glslsandbox-player/Config.in | 5 ++++- package/glslsandbox-player/glslsandbox-player.mk | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 132705584e..530c158fc3 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -111,8 +111,11 @@ endchoice if BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI bool "Wayland IVI shell support" -endif +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG + bool "Wayland XDG shell support" + select BR2_PACKAGE_WAYLAND_PROTOCOLS +endif endif comment "glslsandbox-player needs openGL ES and EGL driver" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index f0a9475aa6..241f3475d2 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -72,6 +72,12 @@ GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-ivi else GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-ivi endif +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += wayland-protocols +GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-wlxdg +else +GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-wlxdg +endif else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += xlib_libX11 GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=x11 From peter at korsgaard.com Mon Feb 20 20:57:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:23 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl_433: bump to version 22.11 Message-ID: <20230220205215.2892581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f848c068f8ab0cc67fb48582e00221158ddc8cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop all patches (already in version) - Threads is not mandatory since https://github.com/merbanan/rtl_433/commit/4f5231bef29f42acc0ce5700584e8c4df5dc0aa2 https://github.com/merbanan/rtl_433/releases/tag/22.11 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...001-minor-Fix-a-compiler-flag-needs-GCC-7.patch | 27 ---------- ...parse.c-fix-build-without-__has_attribute.patch | 34 ------------- ...overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch | 58 ---------------------- .../0004-Fix-overflow-in-Acurite-00275rm.patch | 35 ------------- package/rtl_433/Config.in | 5 -- package/rtl_433/rtl_433.hash | 2 +- package/rtl_433/rtl_433.mk | 14 +++--- 7 files changed, 8 insertions(+), 167 deletions(-) diff --git a/package/rtl_433/0001-minor-Fix-a-compiler-flag-needs-GCC-7.patch b/package/rtl_433/0001-minor-Fix-a-compiler-flag-needs-GCC-7.patch deleted file mode 100644 index dd3debf7ee..0000000000 --- a/package/rtl_433/0001-minor-Fix-a-compiler-flag-needs-GCC-7.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2010e8f949ab7b4555b99dbf184e149a3f33df46 Mon Sep 17 00:00:00 2001 -From: "Christian W. Zuckschwerdt" -Date: Fri, 24 Dec 2021 11:03:06 +0100 -Subject: [PATCH] minor: Fix a compiler flag needs GCC 7 - -[Retrieved from: -https://github.com/merbanan/rtl_433/commit/2010e8f949ab7b4555b99dbf184e149a3f33df46] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3f11ac99..bfa6595ca 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,7 +74,9 @@ if(("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" MATCHES - ADD_DEFINITIONS(-pedantic) - ADD_DEFINITIONS(-Wshadow) - ADD_DEFINITIONS(-Wmissing-prototypes) -- ADD_DEFINITIONS(-Wimplicit-fallthrough) -+ if("${CMAKE_C_COMPILER_ID}" MATCHES "Clang" OR NOT "7.0.0" VERSION_GREATER CMAKE_C_COMPILER_VERSION) -+ ADD_DEFINITIONS(-Wimplicit-fallthrough) -+ endif() - #ADD_DEFINITIONS(-Wfloat-equal) - #ADD_DEFINITIONS(-Wbad-function-cast) - #ADD_DEFINITIONS(-Wdocumentation) diff --git a/package/rtl_433/0002-src-optparse.c-fix-build-without-__has_attribute.patch b/package/rtl_433/0002-src-optparse.c-fix-build-without-__has_attribute.patch deleted file mode 100644 index 683754845f..0000000000 --- a/package/rtl_433/0002-src-optparse.c-fix-build-without-__has_attribute.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b74826f155406f86846d5c97b3534aab87cf6da Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 26 Dec 2021 15:21:39 +0100 -Subject: [PATCH] src/optparse.c: fix build without __has_attribute - -Fix build failure without __has_attribute (e.g. gcc 4.8) which is raised -since -https://github.com/merbanan/rtl_433/commit/6c8af75c757712bd58b169317795484a72e9a16c - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/merbanan/rtl_433/pull/1918] ---- - src/optparse.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/optparse.c b/src/optparse.c -index aa3d0b53..b5e2d37e 100644 ---- a/src/optparse.c -+++ b/src/optparse.c -@@ -232,9 +232,11 @@ int atoi_time(char const *str, char const *error_hint) - } - // intentional fallthrough - #if defined(__GNUC__) || defined(__clang__) -+#if defined __has_attribute - #if __has_attribute(fallthrough) - __attribute__((fallthrough)); - #endif -+#endif - #endif - case ':': - ++colons; --- -2.33.0 - 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 deleted file mode 100644 index e2088b29e7..0000000000 --- a/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch +++ /dev/null @@ -1,58 +0,0 @@ -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/0004-Fix-overflow-in-Acurite-00275rm.patch b/package/rtl_433/0004-Fix-overflow-in-Acurite-00275rm.patch deleted file mode 100644 index 057bf9cf64..0000000000 --- a/package/rtl_433/0004-Fix-overflow-in-Acurite-00275rm.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 37455483889bd1c641bdaafc493d1cc236b74904 Mon Sep 17 00:00:00 2001 -From: "Christian W. Zuckschwerdt" -Date: Fri, 18 Mar 2022 08:09:15 +0100 -Subject: [PATCH] Fix overflow in Acurite-00275rm (closes #2012) - -[Retrieved from: -https://github.com/merbanan/rtl_433/commit/37455483889bd1c641bdaafc493d1cc236b74904] -Signed-off-by: Fabrice Fontaine ---- - src/devices/acurite.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/devices/acurite.c b/src/devices/acurite.c -index 6879e52da..4f3e83eb3 100644 ---- a/src/devices/acurite.c -+++ b/src/devices/acurite.c -@@ -1318,15 +1318,15 @@ static int acurite_00275rm_decode(r_device *decoder, bitbuffer_t *bitbuffer) - - // Combine signal if exactly three repeats were found - if (n_rows == 3) { -- uint8_t *b = bitbuffer->bb[bitbuffer->num_rows]; -+ bitbuffer_add_row(bitbuffer); -+ uint8_t *b = bitbuffer->bb[bitbuffer->num_rows - 1]; - for (int i = 0; i < 11; ++i) { - // The majority bit count wins - b[i] = (b_rows[0][i] & b_rows[1][i]) | - (b_rows[1][i] & b_rows[2][i]) | - (b_rows[2][i] & b_rows[0][i]); - } -- bitbuffer->bits_per_row[bitbuffer->num_rows] = 88; -- bitbuffer->num_rows += 1; -+ bitbuffer->bits_per_row[bitbuffer->num_rows - 1] = 88; - } - - // Output the first valid row diff --git a/package/rtl_433/Config.in b/package/rtl_433/Config.in index a6db00f477..01c1e2f5cd 100644 --- a/package/rtl_433/Config.in +++ b/package/rtl_433/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_RTL_433 bool "rtl_433" depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK if BR2_PACKAGE_LIBOPENSSL help rtl_433 (despite the name) is a generic data receiver, mainly @@ -9,7 +8,3 @@ config BR2_PACKAGE_RTL_433 MHz ISM bands. https://github.com/merbanan/rtl_433 - -comment "rtl_433 needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/rtl_433/rtl_433.hash b/package/rtl_433/rtl_433.hash index fd479dfd21..51fb29c78e 100644 --- a/package/rtl_433/rtl_433.hash +++ b/package/rtl_433/rtl_433.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b362ef3410adec64aee7ad8e6d4d74875f1b3d59ef6fb4856e96adc03876dc65 rtl_433-21.12.tar.gz +sha256 61a9163d69cc4b1da46aebbcaf969bd180a055a6b90f42ad281218cc4fbefb86 rtl_433-22.11.tar.gz # License file, locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk index 74a0b54a3d..e3be0e5ecf 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL_433_VERSION = 21.12 +RTL_433_VERSION = 22.11 RTL_433_SITE = $(call github,merbanan,rtl_433,$(RTL_433_VERSION)) RTL_433_LICENSE = GPL-2.0+ RTL_433_LICENSE_FILES = COPYING @@ -18,12 +18,6 @@ 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 - -# 0004-Fix-overflow-in-Acurite-00275rm.patch -RTL_433_IGNORE_CVES += CVE-2022-27419 - ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) RTL_433_DEPENDENCIES += librtlsdr RTL_433_CONF_OPTS += -DENABLE_RTLSDR=ON @@ -38,4 +32,10 @@ else RTL_433_CONF_OPTS += -DENABLE_OPENSSL=OFF endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +RTL_433_CONF_OPTS += -DENABLE_THREADS=ON +else +RTL_433_CONF_OPTS += -DENABLE_THREADS=OFF +endif + $(eval $(cmake-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:57:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:24 -0000 Subject: [Buildroot] [git commit branch/next] package/python-tempora: bump to version 5.2.0 Message-ID: <20230220205235.C4C6E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c60f09bf11cd465caa51c7f099508c44d6359a01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-tempora/python-tempora.hash | 4 ++-- package/python-tempora/python-tempora.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-tempora/python-tempora.hash b/package/python-tempora/python-tempora.hash index 39249eb4fa..ac6483b77f 100644 --- a/package/python-tempora/python-tempora.hash +++ b/package/python-tempora/python-tempora.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tempora/json -md5 f9954a8c3b091f9769eb7bbe0faddccf tempora-5.1.0.tar.gz -sha256 3e7c4a5369a1788c88a99b6be3a4c74c0c7728d3b62fd768a7e81bd0be0e88df tempora-5.1.0.tar.gz +md5 87fc0d99edd557323e61a16017707a8b tempora-5.2.0.tar.gz +sha256 af82eb016decda8daf566d1e4836f94f7f8ba8c7153637460156e081aadc64df tempora-5.2.0.tar.gz # Locally computed sha256 checksums sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-tempora/python-tempora.mk b/package/python-tempora/python-tempora.mk index 68516a8388..3074ad0de2 100644 --- a/package/python-tempora/python-tempora.mk +++ b/package/python-tempora/python-tempora.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEMPORA_VERSION = 5.1.0 +PYTHON_TEMPORA_VERSION = 5.2.0 PYTHON_TEMPORA_SOURCE = tempora-$(PYTHON_TEMPORA_VERSION).tar.gz -PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/a9/4e/41863232e77742b3a5b30a81e1398abd102aa0a67657bc86a53800966b8e +PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/97/70/5cf5031a83ca6d0431a53459b2a98aa387ba23d06710a5e48d681ff3956f PYTHON_TEMPORA_LICENSE = MIT PYTHON_TEMPORA_LICENSE_FILES = LICENSE PYTHON_TEMPORA_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Mon Feb 20 20:57:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:24 -0000 Subject: [Buildroot] [git commit branch/next] package/multipath-tools: drop patch Message-ID: <20230220205215.6CB1D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54a8cb19331c8e75f6a48cb529c18619379414d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop path and set SYSTEMD="" if needed following upstream feedback: https://github.com/opensvc/multipath-tools/pull/34 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...c-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch | 35 ---------------------- package/multipath-tools/multipath-tools.mk | 3 +- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch b/package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch deleted file mode 100644 index 133094a7f7..0000000000 --- a/package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8370da992c752e4238de7a8b02ce0e179353c959 Mon Sep 17 00:00:00 2001 -From: Alexander Egorenkov -Date: Sun, 6 Sep 2020 10:37:41 +0200 -Subject: [PATCH] Makefile.inc: Enable systemd if ENABLE_SYSTEMD is defined - -systemd is disabled by default, to activate it set ENABLE_SYSTEMD. - -Signed-off-by: Alexander Egorenkov ---- - Makefile.inc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile.inc b/Makefile.inc -index d4d1e0dd..32bc1846 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -35,6 +35,7 @@ ifndef RUN - endif - endif - -+ifdef ENABLE_SYSTEMD - ifndef SYSTEMD - ifeq ($(shell pkg-config --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) - SYSTEMD = $(shell pkg-config --modversion libsystemd) -@@ -45,6 +46,7 @@ ifndef SYSTEMD - endif - endif - endif -+endif - - ifndef SYSTEMDPATH - SYSTEMDPATH=usr/lib --- -2.28.0 - diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index df3d5138e8..d6abf68ca0 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -31,7 +31,8 @@ MULTIPATH_TOOLS_MAKE_OPTS = \ ifeq ($(BR2_PACKAGE_SYSTEMD),y) MULTIPATH_TOOLS_DEPENDENCIES += systemd -MULTIPATH_TOOLS_MAKE_OPTS += ENABLE_SYSTEMD=1 +else +MULTIPATH_TOOLS_MAKE_OPTS += SYSTEMD="" endif define MULTIPATH_TOOLS_BUILD_CMDS From yann.morin.1998 at free.fr Mon Feb 20 20:57:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:25 -0000 Subject: [Buildroot] [git commit branch/next] package/python-simplejson: bump to version 3.18.1 Message-ID: <20230220205235.B8CC78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9779ba9cc603df2b75156fcc8979175d8b2ff665 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-simplejson/python-simplejson.hash | 4 ++-- package/python-simplejson/python-simplejson.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-simplejson/python-simplejson.hash b/package/python-simplejson/python-simplejson.hash index 1c99b87590..a8b946b2c4 100644 --- a/package/python-simplejson/python-simplejson.hash +++ b/package/python-simplejson/python-simplejson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplejson/json -md5 83e24e662f024e06af2fffe698227da4 simplejson-3.18.0.tar.gz -sha256 58a429d2c2fa80834115b923ff689622de8f214cf0dc4afa9f59e824b444ab31 simplejson-3.18.0.tar.gz +md5 ecd07fca7a7fa0bcc9acdf9d82e41eb1 simplejson-3.18.1.tar.gz +sha256 746086e3ef6d74b53599df31b491d88a355abf2e31c837137dd90f8c4561cafa simplejson-3.18.1.tar.gz # Locally computed sha256 checksums sha256 fcaa1e313a99304322e2e0836ea4ee7d839ce9a480438f3922a853edfdde129f LICENSE.txt diff --git a/package/python-simplejson/python-simplejson.mk b/package/python-simplejson/python-simplejson.mk index 1607d9c90c..5782626387 100644 --- a/package/python-simplejson/python-simplejson.mk +++ b/package/python-simplejson/python-simplejson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEJSON_VERSION = 3.18.0 +PYTHON_SIMPLEJSON_VERSION = 3.18.1 PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz -PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/17/3d/b8bfe1f40558f6a16f70c349adf97480dc71a7d11b2b1a5dc0824a87faa0 +PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/0f/a0/79d2bec499cb53678bc20d41f9706ca02777f0876efa9b29a69fb3d55dfd PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt PYTHON_SIMPLEJSON_CPE_ID_VENDOR = simplejson_project From yann.morin.1998 at free.fr Mon Feb 20 20:57:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:25 -0000 Subject: [Buildroot] [git commit branch/next] package/liboping: fix build with ncurses-6.3 Message-ID: <20230220205215.613E88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9b155e45faa9fb941c1a4fc51baea82b6496dff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://git.busybox.net/buildroot/commit/?id=a38a30eb3a46570705642dc37235ddcc1471b434 bumped ncurses to version 6.3 which breaks build of liboping. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...-always-use-s-style-format-for-printf-sty.patch | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch b/package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch new file mode 100644 index 0000000000..3b68feea3d --- /dev/null +++ b/package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch @@ -0,0 +1,59 @@ +From 670834fd8fbd2533ea25ca83065800e924116579 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 15 Nov 2021 08:05:43 +0000 +Subject: [PATCH] src/oping.c: always use "%s"-style format for + printf()-style functions + +`ncuses-6.3` added printf-style function attributes and now makes +it easier to catch cases when user input is used in palce of format +string when built with CFLAGS=-Werror=format-security: + + oping.c:1265:41: error: format not a string literal and no format arguments [-Werror=format-security] + 1265 | hist_symbols_utf8[index]); + | ^~~~~~~~~~~~~~~~~ + +Let's wrap all the missing places with "%s" format. + +Downloaded from upstream PR https://github.com/octo/liboping/pull/61 + +Signed-off-by: Bernd Kuhls +[Bernd: rebased for liboping version 1.10.0] +--- + src/oping.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/oping.c b/src/oping.c +index c087c80..af4a0cb 100644 +--- a/src/oping.c ++++ b/src/oping.c +@@ -1156,7 +1156,7 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */ + wattron (ctx->window, COLOR_PAIR(color)); + + if (has_utf8()) +- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol); ++ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", symbol); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc); + +@@ -1262,7 +1262,7 @@ static int update_graph_histogram (ping_context_t *ctx) /* {{{ */ + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' '); + else if (has_utf8 ()) + mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, +- hist_symbols_utf8[index]); ++ "%s", hist_symbols_utf8[index]); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, + hist_symbols_acs[index] | A_ALTCHARSET); +@@ -1639,8 +1639,7 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ + + HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ", + data_len, context->host, context->addr, +- sequence, recv_ttl, +- format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str))); ++ sequence, recv_ttl); + if ((recv_qos != 0) || (opt_send_qos != 0)) + { + HOST_PRINTF ("qos=%s ", +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:57:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:26 -0000 Subject: [Buildroot] [git commit branch/next] package/sscep: fix linking error Message-ID: <20230220205236.3B0D786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=04fc02a8b7a70bc0afe17fe0625cfd2b4c55b776 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Apply the patch to fix the following build failure raised since the addition of the package in commit 72fa60dc102679f51b228336ec38f5af78ff7646: uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `__GI_getopt': getopt.c:(.text+0x598): multiple definition of `getopt'; src/getopt.o:getopt.c:(.text+0x0): first defined here The patch has been submitted and accepted upstream to address this issue. Fixes: - http://autobuild.buildroot.net/results/844c7dd79f69ef2ea8f293bb73a2d4b7533aa97c Signed-off-by: Dario Binacchi [yann.morin.1998 at free.fr: do an actual bacport] Signed-off-by: Yann E. MORIN --- package/sscep/0001-Fix-getopt-linking-error.patch | 57 +++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/package/sscep/0001-Fix-getopt-linking-error.patch b/package/sscep/0001-Fix-getopt-linking-error.patch new file mode 100644 index 0000000000..9427593cc3 --- /dev/null +++ b/package/sscep/0001-Fix-getopt-linking-error.patch @@ -0,0 +1,57 @@ +From 65561b53344b834877e6b63320066a1e26038a3c Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Fri, 9 Dec 2022 18:18:27 +0100 +Subject: [PATCH] Fix getopt linking error + +The buildroot project, to which the sscep application was added, has +configurations that raise the following linking error: +buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os):(.data+0x8): multiple definition of `optind'; src/getopt.o:(.data+0x0): first defined here +buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `__GI_getopt': +getopt.c:(.text+0x5a4): multiple definition of `getopt'; src/getopt.o:getopt.c:(.text+0x0): first defined here +buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `getopt_long': +getopt.c:(.text+0x5b0): multiple definition of `getopt_long'; src/getopt.o:getopt.c:(.text+0x128): first defined here +collect2: error: ld returned 1 exit status +make[2]: *** [Makefile:507: sscep] Error 1 +make[1]: *** [package/pkg-generic.mk:293: buildroot/output/build/sscep-0.10.0/.stamp_built] Error 2 + +The patch re-added a check that commit +81f56f635259b9 ("Replaced GNU getopt by a BSD licensed alternative") +removed. + +Signed-off-by: Dario Binacchi +[yann.morin.1998 at free.fr: make that an actual backport] +Signed-off-by: Yann E. MORIN +--- + src/getopt.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/getopt.c b/src/getopt.c +index eae36a6..0109406 100644 +--- a/src/getopt.c ++++ b/src/getopt.c +@@ -31,6 +31,16 @@ + #include + #include + ++#define GETOPT_INTERFACE_VERSION 2 ++#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 ++# include ++# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION ++# define ELIDE_CODE ++# endif ++#endif ++ ++#ifndef ELIDE_CODE ++ + char* optarg; + int optopt; + /* The variable optind [...] shall be initialized to 1 by the system. */ +@@ -226,3 +236,5 @@ int getopt_long(int argc, char* const argv[], const char* optstring, + ++optind; + return retval; + } ++ ++#endif /* Not ELIDE_CODE. */ +-- +2.25.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:57:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:26 -0000 Subject: [Buildroot] [git commit branch/next] package/lua-ev: bump to version 1.5 Message-ID: <20230220205215.A1A3D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=327b72f32bcfc01d580fa47f3e06cd42a828cd99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-ev/lua-ev.hash | 4 ++-- package/lua-ev/lua-ev.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lua-ev/lua-ev.hash b/package/lua-ev/lua-ev.hash index eb4f4cf74c..278f5f8f7f 100644 --- a/package/lua-ev/lua-ev.hash +++ b/package/lua-ev/lua-ev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4e26e05830955fdd882a1b48b535be94356582eea310327f839f830cd9250d3a lua-ev-339426fbe528f11cb3cd1af69a88f06bba367981.tar.gz -sha256 c224cc31feec52e33b621ccdbc245e21316a20a134a4cd8706438a3b3382e8ac README +sha256 26ac116722a241bf59daf5315ce0ffe751c1babea9a146ffc0a389f1af3facca lua-ev-1.5.tar.gz +sha256 3b6f8a25e3443c8be61fc7a91e1d27b5514d489bb3ea5986eace6fe1531aabcc README diff --git a/package/lua-ev/lua-ev.mk b/package/lua-ev/lua-ev.mk index 39394875b8..eec078944b 100644 --- a/package/lua-ev/lua-ev.mk +++ b/package/lua-ev/lua-ev.mk @@ -4,8 +4,8 @@ # ################################################################################ -LUA_EV_VERSION = 339426fbe528f11cb3cd1af69a88f06bba367981 -LUA_EV_SITE = $(call github,brimworks,lua-ev,$(LUA_EV_VERSION)) +LUA_EV_VERSION = 1.5 +LUA_EV_SITE = $(call github,brimworks,lua-ev,v$(LUA_EV_VERSION)) LUA_EV_DEPENDENCIES = luainterpreter libev LUA_EV_LICENSE = MIT LUA_EV_LICENSE_FILES = README From yann.morin.1998 at free.fr Mon Feb 20 20:57:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:27 -0000 Subject: [Buildroot] [git commit branch/next] package/go: explicitly set GOMODCACHE Message-ID: <20230220205236.6888E81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=162f656884185662d85e5366871284adca87a465 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next go mod vendor caches downloaded modules to the Go module cache, which defaults to $GOPATH/pkg/mod - But can be overridden with the GOMODCACHE environment variable: https://go.dev/ref/mod#module-cache So explicitly set GOMODCACHE= for reproducibility. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/go/go.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/go/go.mk b/package/go/go.mk index c4f72d403c..c38ae0b99c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -26,6 +26,7 @@ HOST_GO_COMMON_ENV = \ GOROOT="$(HOST_GO_ROOT)" \ GOPATH="$(HOST_GO_GOPATH)" \ GOCACHE="$(HOST_GO_TARGET_CACHE)" \ + GOMODCACHE="$(HOST_GO_GOPATH)/pkg/mod" \ GOPROXY=off \ PATH=$(BR_PATH) \ GOBIN= \ From yann.morin.1998 at free.fr Mon Feb 20 20:57:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:27 -0000 Subject: [Buildroot] [git commit branch/next] ncurses: bump to 6.3 Message-ID: <20230220205215.3F3628648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a38a30eb3a46570705642dc37235ddcc1471b434 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next remove 0001-gcc-5.x-MKlib_gen.patch as it has already been applied upstream. Signed-off-by: Dennis Van Hoorick Signed-off-by: Yann E. MORIN --- package/ncurses/0001-gcc-5.x-MKlib_gen.patch | 44 ----------- package/ncurses/ncurses.hash | 98 ++++++++++++++++--------- package/ncurses/ncurses.mk | 106 +++++++++++++++------------ 3 files changed, 123 insertions(+), 125 deletions(-) diff --git a/package/ncurses/0001-gcc-5.x-MKlib_gen.patch b/package/ncurses/0001-gcc-5.x-MKlib_gen.patch deleted file mode 100644 index 0106e8077f..0000000000 --- a/package/ncurses/0001-gcc-5.x-MKlib_gen.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix gcc 5.x build failure - -Extracted from upstream commit -http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39bbff30ba2825df9517. - -+ modify MKlib_gen.sh to work around change in development version of - gcc introduced here: - https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html - https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html - (reports by Marcus Shawcroft, Maohui Lei). - -Original author: Thomas E. Dickey -Signed-off-by: Mikhail Peselnik -[Adam Duskett: Refresh for 6.1] -Signed-off-by: Adam Duskett ---- a/ncurses/base/MKlib_gen.sh 2015-08-06 20:48:24.000000000 -0400 -+++ b/ncurses/base/MKlib_gen.sh 2017-02-07 10:09:01.293962392 -0500 -@@ -505,11 +505,22 @@ - -e 's/gen_$//' \ - -e 's/ / /g' >>$TMP - -+cat >$ED1 < $ED2 -+cat $ED2 >$TMP -+ - $preprocessor $TMP 2>/dev/null \ --| sed \ -- -e 's/ / /g' \ -- -e 's/^ //' \ -- -e 's/_Bool/NCURSES_BOOL/g' \ -+| sed -f $ED1 \ - | $AWK -f $AW2 \ - | sed -f $ED3 \ - | sed \ diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index 69115f5caf..1029c1ddcb 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -1,39 +1,65 @@ # Locally calculated after checking pgp signature -sha256 aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 ncurses-6.1.tar.gz -sha256 cf9038be62c49a6b5fe93f33b32f983649b2f4c4c31cc99bd18e1e5871c31443 ncurses-6.1-20190609-patch.sh.bz2 -sha256 4b0a4c6abce4543ac4fd4c3389b14825e73b7cddcbb01a687c5dd837f21a3b04 ncurses-6.1-20190615.patch.gz -sha256 b2302625ec2fa6dce79622670452e56ff6130dc02e655b52177264cfeff84c51 ncurses-6.1-20190623.patch.gz -sha256 48b004a3e5409a02a5e751f996fe487f5ce45be1fff38572f7cc8167b22179bf ncurses-6.1-20190630.patch.gz -sha256 faf849eed92161ac09782badf84a19ad6beae472e87d460905865e08a6ed46e4 ncurses-6.1-20190706.patch.gz -sha256 62d4954bf818659105aa1c21cc27cb2c133e02bdc7d3f6aa548caae2d1db7440 ncurses-6.1-20190713.patch.gz -sha256 0c1a54bd5de9c890d1fabcfa92bf5bf46f7eccc54a48051367e82bdb29636450 ncurses-6.1-20190720.patch.gz -sha256 0bbd08d3bd12686d4427c242d6a8fde2e299698039cd597303af713c5f538f17 ncurses-6.1-20190727.patch.gz -sha256 40e5f350a921dbd03e3d9ff93bc477ec4f1f65878f307c534882fba3b0b40507 ncurses-6.1-20190728.patch.gz -sha256 9648104311e209d17db9556d6efc898d5c80ed5fc80e8aa3cd08769544c839b8 ncurses-6.1-20190803.patch.gz -sha256 fa1f583575717b2538d3a4ea59a67bc17dd07ed46cb99fe2beaf23d1b006e9df ncurses-6.1-20190810.patch.gz -sha256 5e9ae4f1b3e2e2d567a01a8fb2c9b7f3804cae97f28cd483d239afee781b8c2b ncurses-6.1-20190817.patch.gz -sha256 7592e5e610b3e9eeca78897da2330b7518f00e0a59d20df873c88a9b26bc4da9 ncurses-6.1-20190824.patch.gz -sha256 1a9800a5ccc4f2cb572b63cdc8f1431642e014a58a30151af73977614d5c4aac ncurses-6.1-20190831.patch.gz -sha256 87685a6b90225efcd03375eb11b124fd9e95ee4b0f36bcbc82e56a70cd466b33 ncurses-6.1-20190907.patch.gz -sha256 4ddebb6e0e5a67028eb3aca2352c9bd48cf122a512719f93e449e00a3c6634f8 ncurses-6.1-20190914.patch.gz -sha256 4c725fa729d754f4e75af78fda4cf67d60e71c1625b5f4f49b7930c95bb8dd36 ncurses-6.1-20190921.patch.gz -sha256 a830b879b57906b1e480e4785b32cec05081b7849c06c4b116459c4d343ba21b ncurses-6.1-20190928.patch.gz -sha256 d5eae35d920409613f565825e1e215fed89828040aab541328455da38e1a9b7c ncurses-6.1-20191005.patch.gz -sha256 136dbd07254810728c1fcb7614b566e7c3cb6af8c0783019bbb6b4b5e3c1e2c6 ncurses-6.1-20191012.patch.gz -sha256 1d5125b20792e9f534432c3ef2aa68984c713416addeb2c4364c5ae897a3b8b7 ncurses-6.1-20191015.patch.gz -sha256 a6475c05312ba0b12b72b83529c1d283a14c4470414c505fa45451e35f3ffcf5 ncurses-6.1-20191019.patch.gz -sha256 f6c7469f33065faf1d04ac9e9bea1a88142b00b82e3db3674cca9ec24920b4af ncurses-6.1-20191026.patch.gz -sha256 0d0443937b9c04663de25b405bb95e658e7c87e1dd7a726b3813aa7f9b55f69a ncurses-6.1-20191102.patch.gz -sha256 f3b75787918d2f02a2005877e81fdc054c45b8249b43aabb531e3b817bcf7576 ncurses-6.1-20191109.patch.gz -sha256 801d138b55986719aea7f42dc8c0cb618fa9a6edf92d1789a6ba5d61678f7761 ncurses-6.1-20191116.patch.gz -sha256 45f447cf2c7a24295c7b9210473e943a238c57ca80581d121c9a1a3aa05332a6 ncurses-6.1-20191123.patch.gz -sha256 ea758e3b0162348c4d5d6dac56f95809da3b7d0589205661a13430eb93f72f75 ncurses-6.1-20191130.patch.gz -sha256 16b5a588c56a53c468d2359b21d5d8a007c4ef7696de12c964a1b661ed185f72 ncurses-6.1-20191207.patch.gz -sha256 8725a2dc8f1cfdab41cb5fe56f930e070f8cdc81a77f303ef2658f65cd0b8edd ncurses-6.1-20191214.patch.gz -sha256 7e2a06fb0af6c84269d23ffe06c689bf1a8a57af39369690ee0698778d4b6cda ncurses-6.1-20191221.patch.gz -sha256 d052bcdb38f8b45a00c0a3190dec7ac1e72d5682f3a16d8accda239308aad62f ncurses-6.1-20191228.patch.gz -sha256 7b6253bae438154a88c7f3e301b872ed7ad71f943c873f4e6c82d8d36a5df72b ncurses-6.1-20200104.patch.gz -sha256 e438f28025c7d97c7f8fabf40eeab68bbf8ca871a0ba349e3fdec9165efe85cb ncurses-6.1-20200111.patch.gz -sha256 06d002c33f727c4a36a0b502c226ea3c3c5b80770703d2f783fffa6a0db04d92 ncurses-6.1-20200118.patch.gz +sha256 97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059 ncurses-6.3.tar.gz +sha256 51bad0e386d06d3a26d7f28087b2072658282452f209e7e5eb7722556b042570 ncurses-6.3-20211026.patch.gz +sha256 4e1b0694a2633cc681987c80091175cb2b17a6c882750a7c6afb0560f5447249 ncurses-6.3-20211030.patch.gz +sha256 de7e0b2c784342188da48147d3fa661be38d5b5d517bb224423f15893e27334f ncurses-6.3-20211106.patch.gz +sha256 df78f157336fce33d96ae1e3c2f7d7b48e9b728409d9a4ab59e77242255b03ab ncurses-6.3-20211113.patch.gz +sha256 b7bf59d9a8e243263b05b166c6fe321bfca8e67eb32ebc26a1c813df42d64fee ncurses-6.3-20211115.patch.gz +sha256 7cb46c897e2e54d5f085cd9edc8d523c13b8f4a13878dd01ce094ec52bd26aec ncurses-6.3-20211120.patch.gz +sha256 ee8cf6ab6db3a01f2533959d14a5e1cc8e1412fbce4b2ab4668c7d1101f71684 ncurses-6.3-20211127.patch.gz +sha256 9d9055badff9e15fc1fbe4f4b2cce7c76384d446ab857573cbb1d645430d8ac7 ncurses-6.3-20211204.patch.gz +sha256 6059625cac99819a3580955db377c0820b6be7ae5da4d8a82e9638948a7b0679 ncurses-6.3-20211211.patch.gz +sha256 acb77a09fe6ab37b96e9f70d9ebfde0aaf7bdee064761c605b47125bd31be2ae ncurses-6.3-20211219.patch.gz +sha256 f2786f19c85258da9e9255459480e5ac2efb61b6ea5d0866b9b8507fa8f5b036 ncurses-6.3-20211225.patch.gz +sha256 ca5736eda90cd7cb597be0fdb0ed10f04deb7304cc7ffb0b166dfa07c39ab1e7 ncurses-6.3-20220101.patch.gz +sha256 7e43911e6baa4a7cfeaad1880777bda352eb7b22493db5bc9f72a52aec8d6d78 ncurses-6.3-20220115.patch.gz +sha256 ecfdd8bed6ff3b1fae5050da555c77dd41035c35bebed30162862e343324443e ncurses-6.3-20220122.patch.gz +sha256 32ec2da0fe48c353489c4018b38f890a59eafeb37ab24b82e32ba553845438a4 ncurses-6.3-20220129.patch.gz +sha256 f74b0d1f7f96bf8609c6a62e268019289e4affec9e02f9182ab14817637180e7 ncurses-6.3-20220205.patch.gz +sha256 6506f709e745375f692d05f53c45b50f1e60d13a3e4346db46d14f69e19adbb1 ncurses-6.3-20220212.patch.gz +sha256 349433e684e96096cbacaa1014d3ccd285c441d1bd99a721ae0b705b02de4145 ncurses-6.3-20220219.patch.gz +sha256 2181cf581fcdabb5b534606ab81c4c625bf819f9d351c670972a7f3a85f36197 ncurses-6.3-20220226.patch.gz +sha256 1acd0f2d18ea7c783286658e550c4f61cbe750a907c9be5fc00e67f2ea8f7eb5 ncurses-6.3-20220305.patch.gz +sha256 ced13543cc19ee341d82eb7fd501e15a2f3d1bc08fbbeb9de7edbd6422ca4799 ncurses-6.3-20220312.patch.gz +sha256 450fce90a10b1ab0b20ba5efc222741fe96f8445d1e4528e2a7b7711c26a5254 ncurses-6.3-20220319.patch.gz +sha256 c97213841e41d33b50a8492ba252dc79a24b38721f7ac0966442b3176f5666c7 ncurses-6.3-20220326.patch.gz +sha256 4c6253ea2c3cf83fbac2fdb5af56914e6bdc5a7c6e6e7532a4f218b7af6d05eb ncurses-6.3-20220402.patch.gz +sha256 5b46bc2bec8f9192c2ed7d25f2080c57b7d7ecbe294d85ab8d3c7d4eb4a678fa ncurses-6.3-20220409.patch.gz +sha256 fddd3b7dea2db1dc70adfa46ccb52301c820854821ce35366056e8e8daba8360 ncurses-6.3-20220416.patch.gz +sha256 1dba62d927affe93face3d55710d8abce7b70a904a0dd0114894efff7ba8ac72 ncurses-6.3-20220423.patch.gz +sha256 f6289906a3be560da9240e0d4a7a1bbd213dd9316f0b395e6852524491ff6322 ncurses-6.3-20220430.patch.gz +sha256 a6f631b9b934d0012617c429834b370732084d6f3c1784d11d8f18f26ea9e0d4 ncurses-6.3-20220501.patch.gz +sha256 79e75286b2a3292058bbe0aa67d8ea49682f7942b108c3ffc725a34765d4fce7 ncurses-6.3-20220507.patch.gz +sha256 1dda27245cbd6634f89766624dc72c156312bf00635214ea7ac299c9330b18f2 ncurses-6.3-20220514.patch.gz +sha256 0a251674845e0669e92c8bee6b6e5bb317439f8707f3316424eae590322f87c6 ncurses-6.3-20220521.patch.gz +sha256 411c4fdfc2ea4f56fdb57ff758a13dffa4b2fff68e71b65cf3248c925f6c30ee ncurses-6.3-20220529.patch.gz +sha256 acc315edb22a04f6476d9cd2a43866d478e0f4b2a555f480c92a18983bec5ee7 ncurses-6.3-20220604.patch.gz +sha256 2dae4db33c73766cd63b2b700e09588750bae44622749ce007404e3e30420ada ncurses-6.3-20220612.patch.gz +sha256 1e4b5c3deaab601a9749da591952b66a53d96017967eeec033f3b4d30e12d2de ncurses-6.3-20220618.patch.gz +sha256 65379719532023cd77c80a495cf31ff773345173e919ec8eef8b3f9517969626 ncurses-6.3-20220625.patch.gz +sha256 028864b31ada91862f0d8f4aa016b62bc3fe7e3981d62e81110d5143e26d0e0d ncurses-6.3-20220703.patch.gz +sha256 06c2f6d967480d0bcf20f301db26c8e5c90caf6d3adf616bc277e21407e9c955 ncurses-6.3-20220709.patch.gz +sha256 66aa8564d09fcc7bbd85bbe79685772330633c14d70af2fef00d10491e6b22fb ncurses-6.3-20220716.patch.gz +sha256 fffcc8ec0eab3dcbb7b8d8a208d880a15fe128f6f2dbc63a87d5640d8ade95cf ncurses-6.3-20220724.patch.gz +sha256 1787619c0b5052121dc5816bdb4cbd9699e1b61ba6c98072a3733b17cc7009f9 ncurses-6.3-20220729.patch.gz +sha256 d7fb1f2e2246079527351c8b7c8847c28751c6a5bb46740681d4b6ba790b22cc ncurses-6.3-20220806.patch.gz +sha256 10a04d3189a34187e691e73435c210af3939025f07ff6c34c1bfc48fda6f5a5d ncurses-6.3-20220813.patch.gz +sha256 b9238267413c2fce5bfe4c029f28dbbbef7230cdf47792ecd4070b857fe1a869 ncurses-6.3-20220820.patch.gz +sha256 7d30766caaac9136ab0ff7164d33761b186b698ec237560cb8fce0eb937f90b8 ncurses-6.3-20220827.patch.gz +sha256 5f04fd2d954b3461671290c766f784a4151091eb4e9197a7745dcdbb9c030483 ncurses-6.3-20220903.patch.gz +sha256 b948a0efe45341ccc913cc67231ee1e6bc737f178bcd758ce9f2e856e575071f ncurses-6.3-20220910.patch.gz +sha256 f9ad5781a72d669bdd06fe075136cc79e6a570960f6f641a9c486fc102a45c3b ncurses-6.3-20220917.patch.gz +sha256 bbb9d5afaec836e66b9f919c97c81c0505fd111b479b59ab6e376822ff6df1d3 ncurses-6.3-20220924.patch.gz +sha256 7ffeae28a0f8416c6ab088a99807d0d1ee5be821828c288f0a572ea769a8e2e5 ncurses-6.3-20221001.patch.gz +sha256 204baff40926d29ec30b1def4d4cc5d7ce074918327d8e271a49c960032b5a49 ncurses-6.3-20221008.patch.gz +sha256 f578dbb3beb1976636c74b33ffe5d300fee5a7653bc4f64bb7870d1b9cf85e7b ncurses-6.3-20221015.patch.gz +sha256 b01fc81093a331d5d645dbcbacebf6e5d459430b38cbdae0db053c6e5dff7d7e ncurses-6.3-20221023.patch.gz +sha256 e6e819c78c78c3a0355e7da4360d084f5d69871fa556b51322980f22da4edcea ncurses-6.3-20221029.patch.gz +sha256 4da9b5bf14a1b7d6d8a4181e79a98b9e5782153bc7db93773ac43e0b758c4da2 ncurses-6.3-20221105.patch.gz +sha256 b3381da6071bbed04e6ddaabbd5375d280e50af429f94522e32e9d0f22766155 ncurses-6.3-20221112.patch.gz +sha256 bf30c435283a4483280e0433f6370d9eea1fb704323bd887e540592eb8203e2f ncurses-6.3-20221119.patch.gz +sha256 32dc21b671ead8b199d66111ebd3404e8cd5f8c4ca5587cfeb5c6a4913b2d103 ncurses-6.3-20221126.patch.gz +sha256 8fe3bcacaea784ac7971e102a8eb8ca58c4c2c4c13c1ec33f32334600b9e4f56 ncurses-6.3-20221203.patch.gz + # Locally computed sha256 4d1fde61868c73776a539366dccf5d5a4857e7fd7299efb1f02e07c2afe9ea87 COPYING diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 2881ca1308..79593d8084 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -4,62 +4,78 @@ # ################################################################################ -NCURSES_VERSION = 6.1 +NCURSES_VERSION = 6.3 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses NCURSES_INSTALL_STAGING = YES NCURSES_DEPENDENCIES = host-ncurses NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING NCURSES_CPE_ID_VENDOR = gnu -# Commit 4b21273d71d09 added upstream (security) patches up to 20200118 -NCURSES_IGNORE_CVES += CVE-2018-10754 -NCURSES_IGNORE_CVES += CVE-2018-19211 -NCURSES_IGNORE_CVES += CVE-2018-19217 -NCURSES_IGNORE_CVES += CVE-2019-17594 -NCURSES_IGNORE_CVES += CVE-2019-17595 NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config NCURSES_PATCH = \ $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ - ncurses-6.1-20190609-patch.sh.bz2 \ - ncurses-6.1-20190615.patch.gz \ - ncurses-6.1-20190623.patch.gz \ - ncurses-6.1-20190630.patch.gz \ - ncurses-6.1-20190706.patch.gz \ - ncurses-6.1-20190713.patch.gz \ - ncurses-6.1-20190720.patch.gz \ - ncurses-6.1-20190727.patch.gz \ - ncurses-6.1-20190728.patch.gz \ - ncurses-6.1-20190803.patch.gz \ - ncurses-6.1-20190810.patch.gz \ - ncurses-6.1-20190817.patch.gz \ - ncurses-6.1-20190824.patch.gz \ - ncurses-6.1-20190831.patch.gz \ - ncurses-6.1-20190907.patch.gz \ - ncurses-6.1-20190914.patch.gz \ - ncurses-6.1-20190921.patch.gz \ - ncurses-6.1-20190928.patch.gz \ - ncurses-6.1-20191005.patch.gz \ - ncurses-6.1-20191012.patch.gz \ - ncurses-6.1-20191015.patch.gz \ - ncurses-6.1-20191019.patch.gz \ - ncurses-6.1-20191026.patch.gz \ - ncurses-6.1-20191102.patch.gz \ - ncurses-6.1-20191109.patch.gz \ - ncurses-6.1-20191116.patch.gz \ - ncurses-6.1-20191123.patch.gz \ - ncurses-6.1-20191130.patch.gz \ - ncurses-6.1-20191207.patch.gz \ - ncurses-6.1-20191214.patch.gz \ - ncurses-6.1-20191221.patch.gz \ - ncurses-6.1-20191228.patch.gz \ - ncurses-6.1-20200104.patch.gz \ - ncurses-6.1-20200111.patch.gz \ - ncurses-6.1-20200118.patch.gz \ + ncurses-6.3-20211026.patch.gz \ + ncurses-6.3-20211030.patch.gz \ + ncurses-6.3-20211106.patch.gz \ + ncurses-6.3-20211113.patch.gz \ + ncurses-6.3-20211115.patch.gz \ + ncurses-6.3-20211120.patch.gz \ + ncurses-6.3-20211127.patch.gz \ + ncurses-6.3-20211204.patch.gz \ + ncurses-6.3-20211211.patch.gz \ + ncurses-6.3-20211219.patch.gz \ + ncurses-6.3-20211225.patch.gz \ + ncurses-6.3-20220101.patch.gz \ + ncurses-6.3-20220115.patch.gz \ + ncurses-6.3-20220122.patch.gz \ + ncurses-6.3-20220129.patch.gz \ + ncurses-6.3-20220205.patch.gz \ + ncurses-6.3-20220212.patch.gz \ + ncurses-6.3-20220219.patch.gz \ + ncurses-6.3-20220226.patch.gz \ + ncurses-6.3-20220305.patch.gz \ + ncurses-6.3-20220312.patch.gz \ + ncurses-6.3-20220319.patch.gz \ + ncurses-6.3-20220326.patch.gz \ + ncurses-6.3-20220402.patch.gz \ + ncurses-6.3-20220409.patch.gz \ + ncurses-6.3-20220416.patch.gz \ + ncurses-6.3-20220423.patch.gz \ + ncurses-6.3-20220430.patch.gz \ + ncurses-6.3-20220501.patch.gz \ + ncurses-6.3-20220507.patch.gz \ + ncurses-6.3-20220514.patch.gz \ + ncurses-6.3-20220521.patch.gz \ + ncurses-6.3-20220529.patch.gz \ + ncurses-6.3-20220604.patch.gz \ + ncurses-6.3-20220612.patch.gz \ + ncurses-6.3-20220618.patch.gz \ + ncurses-6.3-20220625.patch.gz \ + ncurses-6.3-20220703.patch.gz \ + ncurses-6.3-20220709.patch.gz \ + ncurses-6.3-20220716.patch.gz \ + ncurses-6.3-20220724.patch.gz \ + ncurses-6.3-20220729.patch.gz \ + ncurses-6.3-20220806.patch.gz \ + ncurses-6.3-20220813.patch.gz \ + ncurses-6.3-20220820.patch.gz \ + ncurses-6.3-20220827.patch.gz \ + ncurses-6.3-20220903.patch.gz \ + ncurses-6.3-20220910.patch.gz \ + ncurses-6.3-20220917.patch.gz \ + ncurses-6.3-20220924.patch.gz \ + ncurses-6.3-20221001.patch.gz \ + ncurses-6.3-20221008.patch.gz \ + ncurses-6.3-20221015.patch.gz \ + ncurses-6.3-20221023.patch.gz \ + ncurses-6.3-20221029.patch.gz \ + ncurses-6.3-20221105.patch.gz \ + ncurses-6.3-20221112.patch.gz \ + ncurses-6.3-20221119.patch.gz \ + ncurses-6.3-20221126.patch.gz \ + ncurses-6.3-20221203.patch.gz \ ) -# ncurses-6.1-20191012.patch.gz -NCURSES_IGNORE_CVES += CVE-2019-17594 CVE-2019-17595 - NCURSES_CONF_OPTS = \ --without-cxx \ --without-cxx-binding \ From yann.morin.1998 at free.fr Mon Feb 20 20:57:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:28 -0000 Subject: [Buildroot] [git commit branch/next] package/lua-utf8: bump to version 0.1.5 Message-ID: <20230220205215.ADDF18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3ce4fa930419e2968f844db4c7bc7a09ef473ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-utf8/Config.in | 2 +- package/lua-utf8/lua-utf8.hash | 4 ++-- package/lua-utf8/lua-utf8.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lua-utf8/Config.in b/package/lua-utf8/Config.in index 313fa4e45d..5815936df5 100644 --- a/package/lua-utf8/Config.in +++ b/package/lua-utf8/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LUA_UTF8 This module adds UTF-8 support to Lua. It's compatible with Lua "string" module. - http://github.com/starwing/luautf8 + https://github.com/starwing/luautf8 diff --git a/package/lua-utf8/lua-utf8.hash b/package/lua-utf8/lua-utf8.hash index b6720b3603..b4d455ceb7 100644 --- a/package/lua-utf8/lua-utf8.hash +++ b/package/lua-utf8/lua-utf8.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 88c456bc0f00d28201b33551d83fa6e5c3ae6025aebec790c37afb317290e4fa luautf8-0.1.3-1.src.rock -sha256 74506285923bcc3e58aaca1b774db26461021783d02b2dc26bafcaa02ef7a00b luautf8-0.1.3/LICENSE +sha256 68bd8e3c3e20f98fceb9e20d5a7a50168202c22eb45b87eff3247a0608f465ae luautf8-0.1.5-2.src.rock +sha256 74506285923bcc3e58aaca1b774db26461021783d02b2dc26bafcaa02ef7a00b luautf8-0.1.5/LICENSE diff --git a/package/lua-utf8/lua-utf8.mk b/package/lua-utf8/lua-utf8.mk index 52aaf5c71e..33c34a4eb2 100644 --- a/package/lua-utf8/lua-utf8.mk +++ b/package/lua-utf8/lua-utf8.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_UTF8_VERSION = 0.1.3-1 +LUA_UTF8_VERSION = 0.1.5-2 LUA_UTF8_NAME_UPSTREAM = luautf8 LUA_UTF8_LICENSE = MIT LUA_UTF8_LICENSE_FILES = $(LUA_UTF8_SUBDIR)/LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:57:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:28 -0000 Subject: [Buildroot] [git commit branch/next] package/ipmitool: fix broken IANA PEN registry URL Message-ID: <20230220205236.9033C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b6ccffcfb84938d2f0813d7c98907d75b49b842 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Backport the upstream fix for the IANA Private Enterprise Numbers registry URL so the correct file gets downloaded and installed. Signed-off-by: Vincent Fazio Signed-off-by: Vincent Fazio Signed-off-by: Yann E. MORIN --- .../ipmitool/0002-Fix-enterprise-numbers-URL.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/ipmitool/0002-Fix-enterprise-numbers-URL.patch b/package/ipmitool/0002-Fix-enterprise-numbers-URL.patch new file mode 100644 index 0000000000..07cdbd4527 --- /dev/null +++ b/package/ipmitool/0002-Fix-enterprise-numbers-URL.patch @@ -0,0 +1,36 @@ +From 1edb0e27e44196d1ebe449aba0b9be22d376bcb6 Mon Sep 17 00:00:00 2001 +From: Alexander Amelkin +Date: Tue, 22 Nov 2022 13:55:33 +0300 +Subject: [PATCH] Fix enterprise-numbers URL + +IANA has changed their URL scheme, and the content at the old URL for +enterprise-numbers switched from text/plain to text/html. + +Fix Makefile.am to use the new URL + +Resolves ipmitool/ipmitool#377 + +Signed-off-by: Alexander Amelkin + +[vfazio: backport from upstream 1edb0e27e44196d1ebe449aba0b9be22d376bcb6] +Signed-off-by: Vincent Fazio +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index ce3267f..3182a52 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -41,7 +41,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure configure-stamp \ + $(distdir).tar.gz $(distdir).tar.bz2 + + SUBDIRS = lib src include doc contrib control +-IANA_PEN = http://www.iana.org/assignments/enterprise-numbers ++IANA_PEN = http://www.iana.org/assignments/enterprise-numbers.txt + + dist-hook: + cp control/ipmitool.spec $(distdir) +-- +2.25.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:29 -0000 Subject: [Buildroot] [git commit branch/next] package/libpwquality: bump to version 1.4.5 Message-ID: <20230220205215.EB904828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a58d1aa9eb3a83d07fd445875c79722b609a78b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/libpwquality/libpwquality/blob/libpwquality-1.4.5/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libpwquality/libpwquality.hash | 2 +- package/libpwquality/libpwquality.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpwquality/libpwquality.hash b/package/libpwquality/libpwquality.hash index 1469bc0b7a..e64fb4bf50 100644 --- a/package/libpwquality/libpwquality.hash +++ b/package/libpwquality/libpwquality.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d43baf23dc6887fe8f8e9b75cabaabc5f4bbbaa0f9eff44278d276141752a545 libpwquality-1.4.4.tar.bz2 +sha256 6fcf18b75d305d99d04d2e42982ed5b787a081af2842220ed63287a2d6a10988 libpwquality-1.4.5.tar.bz2 sha256 aa44d09f651bf99b56253187c7778a240740c767d28453ab7fdc9804c842baee COPYING diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index d4f7a47120..ae6babbcae 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPWQUALITY_VERSION = 1.4.4 +LIBPWQUALITY_VERSION = 1.4.5 LIBPWQUALITY_SOURCE = libpwquality-$(LIBPWQUALITY_VERSION).tar.bz2 LIBPWQUALITY_SITE = https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$(LIBPWQUALITY_VERSION) LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ From peter at korsgaard.com Mon Feb 20 20:57:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:29 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.02.9 Message-ID: <20230220205236.C19FC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b56604060a9bb6d06e790934421909dc1b763d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard (cherry picked from commit ae835e094f607d69f1c2581593a4c55723486c39) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/CHANGES b/CHANGES index e23cd4eaf8..dbf62e5a63 100644 --- a/CHANGES +++ b/CHANGES @@ -580,6 +580,50 @@ #14731: BR2_PACKAGE_IOSTAT #14751: LVM2 Outdated Link +2022.02.9, released January 18th, 2023 + + Important / security related fixes. + + Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + Go: Ensure our go build and module cache is used, even for the + download step. + + Legal-info: Stop warning about not saving sources for local / + override packages if _REDISTRIBUTE is set to NO. + + Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + Updated/fixed packages: asterisk, bearssl, botan, cairo, + capnproto, check, checkpolicy, connman, containerd, + docker-cli, docker-engine, exempi, exfat, exfat-utils, fmc, + fmlib, glib-networking, go, gobject-introspection, gperf, + i2pd, ima-evm-utils, imx-alsa-plugins, imx-kobs, imx-lib, + imx-m4fwloader, imx-mkimage, intel-microcode, janus-gateway, + libcurl, libftdi1, libksba, libmbim, libmng, libpjsip, + libtalloc, libuwsc, libxkbcommon, linux, lpeg, lrzsz, + lttng-tools, lua-cqueues, mbedtls, mfgtools, mutt, php, + policycoreutils, polkit, postgresql, pptp-linux, + qcom-db410c-firmware, qemu, qoriq-rcw, qt5virtualkeyboard, + rhash, rtl_433, ruby, sqlite, swupdate, tekui, tiff, tinyxml, + tor, wayland, wireshark, wpa_supplicant, + xdriver_xf86-video-imx-viv, xserver_xorg-server, xxhash, zip + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + 2022.02.8, released December 10th, 2022 Important / security related fixes. From yann.morin.1998 at free.fr Mon Feb 20 20:57:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:30 -0000 Subject: [Buildroot] [git commit branch/next] package/proftpd: sftpd does not build with libressl Message-ID: <20230220205236.EBCAE828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7797603d260b498c864d089b107d01679edf0a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next sftp doesn't build with libressl >= 3.5.0 resulting in the following build failure since commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: mac.c: In function 'init_mac': mac.c:189:3: warning: implicit declaration of function 'HMAC_CTX_init'; did you mean 'HMAC_CTX_new'? [-Wimplicit-function-declaration] 189 | HMAC_CTX_init(hmac_ctx); | ^~~~~~~~~~~~~ | HMAC_CTX_new mac.c: In function 'set_mac_key': mac.c:435:14: error: storage size of 'ctx' isn't known 435 | EVP_MD_CTX ctx; | ^~~ So force use of openssl for sftpd, as no feedback was received on https://github.com/proftpd/proftpd/pull/1481 Fixes: - http://autobuild.buildroot.org/results/a16ccd7cc78eb63de06a6d738fccc6b947da13e7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/proftpd/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in index 83094028a0..aed1958b8d 100644 --- a/package/proftpd/Config.in +++ b/package/proftpd/Config.in @@ -29,7 +29,8 @@ config BR2_PACKAGE_PROFTPD_MOD_REDIS config BR2_PACKAGE_PROFTPD_MOD_SFTP bool "mod_sftp support" select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 help Compile ProFTPD with mod_sftp support From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:31 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi: bump version to 19.5-Matrix Message-ID: <20230220205216.0E78D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=95a16926ed78c905d38f6eeb8bc46c9d3d3bb5a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Removed two upstream patches included in this version. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- ...t-as-char-as-formatting-of-non-void-point.patch | 54 ---------------------- ...1-cast-as-char-as-formatting-of-non-void-.patch | 33 ------------- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 6 files changed, 4 insertions(+), 91 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 8cc2297bdb..a13fb91afe 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.4-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 19.5-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 4733399edc..9432e4bbd6 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.4-Matrix +KODI_TEXTUREPACKER_VERSION = 19.5-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/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch b/package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch deleted file mode 100644 index af68de220c..0000000000 --- a/package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 44b30c116682968bacf8aec566fc9c193026ecc9 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Wed, 6 Jul 2022 22:48:35 +1000 -Subject: [PATCH] GLUtils: cast as char as formatting of non-void pointers - is disallowed - -Downloaded from upstream commit: -https://github.com/xbmc/xbmc/commit/44b30c116682968bacf8aec566fc9c193026ecc9 - -Signed-off-by: Bernd Kuhls ---- - xbmc/utils/GLUtils.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp -index 1ef804709f..c36dcf6a20 100644 ---- a/xbmc/utils/GLUtils.cpp -+++ b/xbmc/utils/GLUtils.cpp -@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno) - void LogGraphicsInfo() - { - #if defined(HAS_GL) || defined(HAS_GLES) -- const GLubyte *s; -+ const char* s; - -- s = glGetString(GL_VENDOR); -+ s = reinterpret_cast(glGetString(GL_VENDOR)); - if (s) - CLog::Log(LOGINFO, "GL_VENDOR = %s", s); - else - CLog::Log(LOGINFO, "GL_VENDOR = NULL"); - -- s = glGetString(GL_RENDERER); -+ s = reinterpret_cast(glGetString(GL_RENDERER)); - if (s) - CLog::Log(LOGINFO, "GL_RENDERER = %s", s); - else - CLog::Log(LOGINFO, "GL_RENDERER = NULL"); - -- s = glGetString(GL_VERSION); -+ s = reinterpret_cast(glGetString(GL_VERSION)); - if (s) - CLog::Log(LOGINFO, "GL_VERSION = %s", s); - else - CLog::Log(LOGINFO, "GL_VERSION = NULL"); - -- s = glGetString(GL_SHADING_LANGUAGE_VERSION); -+ s = reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION)); - if (s) - CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s); - else --- -2.30.2 - diff --git a/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch b/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch deleted file mode 100644 index 41dc3356bd..0000000000 --- a/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 651c82853fe69dc5aa3e6a50f2eb2f752caafba0 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Mon, 11 Jul 2022 09:39:02 +0000 -Subject: [PATCH] WinSystemX11: cast as char as formatting of non-void - pointers is disallowed - -Downloaded from upstream commit: -https://github.com/xbmc/xbmc/commit/651c82853fe69dc5aa3e6a50f2eb2f752caafba0 - -Signed-off-by: Bernd Kuhls ---- - xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp -index 8a18288fd8..033c0f77bf 100644 ---- a/xbmc/windowing/X11/WinSystemX11.cpp -+++ b/xbmc/windowing/X11/WinSystemX11.cpp -@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager() - - if(status == Success && items_read) - { -- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data); -+ const char* s; -+ -+ s = reinterpret_cast(data); -+ CLog::Log(LOGDEBUG, "Window Manager Name: {}", s); - } - else - CLog::Log(LOGDEBUG,"Window Manager Name: "); --- -2.30.2 - diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index a17e0fb29f..e0f548879e 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz +sha256 56e0074f27f08496b2a21af5704a15378a2f0979ae3e9fa9a50a2630d0313d19 kodi-19.5-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 c41c515d10..dbe6c1e8f6 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.4 +KODI_VERSION_MAJOR = 19.5 KODI_VERSION_NAME = Matrix KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) From yann.morin.1998 at free.fr Mon Feb 20 20:57:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:53 -0000 Subject: [Buildroot] [git commit branch/next] package/ssdp-responder: fix misspelled define directive Message-ID: <20230220205239.B90228648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e0ba6bfc2d28a8079d336a18cc50f0825952ec2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/ssdp-responder/ssdp-responder.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index fd7b1ea44b..d40f6f8c57 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,7 +25,7 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP-RESPONDER_INSTALL_INIT_SYSTEMD +define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service endef From yann.morin.1998 at free.fr Mon Feb 20 20:58:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:21 -0000 Subject: [Buildroot] [git commit branch/next] package/python-greenlet: bump to version 2.0.2 Message-ID: <20230220205243.535EF86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b86cc6a313773ac90bceabf376e33bba789c2950 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-greenlet/python-greenlet.hash | 4 ++-- package/python-greenlet/python-greenlet.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-greenlet/python-greenlet.hash b/package/python-greenlet/python-greenlet.hash index 4e9e96398a..f378436beb 100644 --- a/package/python-greenlet/python-greenlet.hash +++ b/package/python-greenlet/python-greenlet.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/greenlet/json -md5 8d0f10b807144a86b54841cfab2620a9 greenlet-2.0.1.tar.gz -sha256 42e602564460da0e8ee67cb6d7236363ee5e131aa15943b6670e44e5c2ed0f67 greenlet-2.0.1.tar.gz +md5 e6637d59015cba7e86f2111e6aa8168b greenlet-2.0.2.tar.gz +sha256 e7c8dc13af7db097bed64a051d2dd49e9f0af495c26995c00a9ee842690d34c0 greenlet-2.0.2.tar.gz # Locally computed sha256 checksums sha256 769831d6e5dfaf2c20802faccff1fafb4c2025dd8f6253dfa47fcad59d4d0979 LICENSE sha256 e5ff3c23c110e494cd7d736c10fd96d462457bafeca310840db6527298c7d46b LICENSE.PSF diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index 232e2820f8..40f05f667e 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GREENLET_VERSION = 2.0.1 +PYTHON_GREENLET_VERSION = 2.0.2 PYTHON_GREENLET_SOURCE = greenlet-$(PYTHON_GREENLET_VERSION).tar.gz -PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/fd/6a/f07b0028baff9bca61ecfcd9ee021e7e33369da8094f00eff409f2ff32be +PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/1e/1e/632e55a04d732c8184201238d911207682b119c35cecbb9a573a6c566731 PYTHON_GREENLET_SETUP_TYPE = setuptools PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:22 -0000 Subject: [Buildroot] [git commit branch/next] package/rng-tools: bump to version 6.16 Message-ID: <20230220205243.0E7208648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a97ab5d2faf4c0498e1c7b4eb68f98fc2eb78060 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patches (already in version) - libcap is a mandatory dependency since https://github.com/nhorman/rng-tools/commit/50afdce9d3fed6244a0cf772d38f2d8475312bc5 - Add Qrypt support: https://github.com/nhorman/rng-tools/commit/7ab7f540da567467055f77016590744d828fc9eb https://github.com/nhorman/rng-tools/releases/tag/v6.16 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...configure.ac-fix-build-without-sys-auxv.h.patch | 52 ---------------------- ...erentropy-detection-to-look-for-the-setti.patch | 30 ------------- ...erentropy-library-to-timeout-fail-on-long.patch | 39 ---------------- package/rng-tools/Config.in | 16 +++++++ package/rng-tools/rng-tools.hash | 2 +- package/rng-tools/rng-tools.mk | 11 ++++- 6 files changed, 26 insertions(+), 124 deletions(-) diff --git a/package/rng-tools/0001-configure.ac-fix-build-without-sys-auxv.h.patch b/package/rng-tools/0001-configure.ac-fix-build-without-sys-auxv.h.patch deleted file mode 100644 index 0c15ab6b7d..0000000000 --- a/package/rng-tools/0001-configure.ac-fix-build-without-sys-auxv.h.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 6ea89861c300a732d1bbcffd085d92f5c4c9228e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 15 Aug 2022 11:57:21 +0200 -Subject: [PATCH] configure.ac: fix build without sys/auxv.h - -Fix the following build failure on aarch64 without sys/auxv.h (e.g. on -uclibc) raised since version 6.13 and -https://github.com/nhorman/rng-tools/commit/9070a04adfcd21ec3839ee8ff190e7130ccd5c9b: - -rngd_rndr.c:34:10: fatal error: sys/auxv.h: No such file or directory - 34 | #include - | ^~~~~~~~~~~~ - -The same issue could be raised on powerpc64le since version 6.11 and -https://github.com/nhorman/rng-tools/commit/ade348cdb90c25b44b203fd4e9c33ec4bccff323 - -Fixes: - - http://autobuild.buildroot.org/results/41d5ab9e67eb0d8af8d789fc94d4366f130a7fb2 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/nhorman/rng-tools/commit/6ea89861c300a732d1bbcffd085d92f5c4c9228e] ---- - configure.ac | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0af64e7..411c7b8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,14 +76,17 @@ AC_PROG_GCC_TRADITIONAL - - AX_PTHREAD - -+dnl Checks for header files. -+AC_CHECK_HEADERS(sys/auxv.h) -+ - AM_CONDITIONAL([RDRAND], [test $host_cpu = x86_64 || test $host_cpu = i686]) - AS_IF([test $host_cpu = x86_64 || test $host_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[]) - --AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le]) --AS_IF([test $host_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[]) -+AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le -a "$ac_cv_header_sys_auxv_h" = "yes"]) -+AS_IF([test $host_cpu = powerpc64le -a "$ac_cv_header_sys_auxv_h" = "yes"], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[]) - --AM_CONDITIONAL([RNDR], [test $host_cpu = aarch64]) --AS_IF([test $host_cpu = aarch64], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[]) -+AM_CONDITIONAL([RNDR], [test $host_cpu = aarch64 -a "$ac_cv_header_sys_auxv_h" = "yes"]) -+AS_IF([test $host_cpu = aarch64 -a "$ac_cv_header_sys_auxv_h" = "yes"], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[]) - AM_CONDITIONAL([JITTER], [false]) - - AC_ARG_ENABLE(jitterentropy, diff --git a/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch b/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch deleted file mode 100644 index 553842640d..0000000000 --- a/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e2698477e8abf623c18ab28d33cc894ec882a706 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Fri, 18 Mar 2022 18:59:52 -0400 -Subject: [PATCH] Adjust jitterentropy detection to look for the settick - function - -Theres no great way to detect if jitterentropy has the internal timer -feature enabled so we have to look for a function that is only defined -when it is enabled - -Signed-off-by: Bernd Kuhls -[downloaded from upstream commit - https://github.com/nhorman/rng-tools/commit/e2698477e8abf623c18ab28d33cc894ec882a706] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e16e1a0..0f5a38e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -94,7 +94,7 @@ AS_IF( - AC_SEARCH_LIBS(jent_version,jitterentropy, - [AM_CONDITIONAL([JITTER], [true]) - AC_DEFINE([HAVE_JITTER],1,[Enable JITTER]) -- AC_CHECK_LIB(jitterentropy, jent_entropy_switch_notime_impl, -+ AC_CHECK_LIB(jitterentropy, jent_notime_settick, - [AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])], - [],-lpthread)], - AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread) diff --git a/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch b/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch deleted file mode 100644 index 9d8dbe2d0b..0000000000 --- a/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c29424f10a0dcbd18ac25607fa1c81c18a960e81 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Mon, 16 May 2022 13:38:54 -0400 -Subject: [PATCH] Adjust jitterentropy library to timeout/fail on long delay - -[Bernd: removed description of unrelated part of the patch] - -Also while we're at it, I might have a build solution for the presence -of internal timers. When jitterentropy is built without internal -timers, jent_notime_init is defined publically, but when it is built -with timers, its declared as a static symbol, preenting resolution, so -we can test to see if the function exists. If it does we _don't_ have -notime support. The logic is a bit backwards, but i think it works - -Signed-off-by: Bernd Kuhls -[downloaded configure.ac patch from upstream commit - https://github.com/nhorman/rng-tools/commit/57be6d4c90e78ea9ad036a3a6e9b09822ed4d219] ---- - configure.ac | 6 ++--- - rngd_jitter.c | 62 ++++++++++++++++++++++++++++++++++++++------------- - 2 files changed, 49 insertions(+), 19 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 52f2bb5..0af64e7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -101,9 +101,9 @@ AS_IF( - AC_SEARCH_LIBS(jent_version,jitterentropy, - [AM_CONDITIONAL([JITTER], [true]) - AC_DEFINE([HAVE_JITTER],1,[Enable JITTER]) -- AC_CHECK_LIB(jitterentropy, jent_notime_settick, -- [AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])], -- [],-lpthread)], -+ AC_CHECK_LIB(jitterentropy, jent_notime_init, -+ [], -+ [AC_DEFINE([HAVE_JITTER_NOTIME],1, [Enable JITTER_NOTIME])],-lpthread)], - AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread) - ], [AC_MSG_NOTICE([Disabling JITTER entropy source])] - ) diff --git a/package/rng-tools/Config.in b/package/rng-tools/Config.in index 0dd269c818..be3f078a0b 100644 --- a/package/rng-tools/Config.in +++ b/package/rng-tools/Config.in @@ -2,7 +2,9 @@ config BR2_PACKAGE_RNG_TOOLS bool "rng-tools" # pthread_setaffinity_np depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU # libcap select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_OPENSSL help Daemon to use hardware random number generators. @@ -35,7 +37,21 @@ config BR2_PACKAGE_RNG_TOOLS_NISTBEACON never be used for cryptographic purposes, or any use case in which random data should be known only by a single entity. +config BR2_PACKAGE_RNG_TOOLS_QRYPT + bool "Qrypt Entropy Beacon support" + select BR2_PACKAGE_JANSSON + select BR2_PACKAGE_LIBCURL + help + Enable Qrypt NIST-Beacon like entropy support. + + Entropy gathered from Qrypt server based entropy beacons. Like + NIST, it should likely not be used directly in cryptographic + operation, as the entropy may be intercepted over a network, + but can provide copius amounts of entropy for non-crypto + purposes. + endif comment "rng-tools needs a toolchain w/ NPTL" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash index be2ee13969..4c86791267 100644 --- a/package/rng-tools/rng-tools.hash +++ b/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a rng-tools-6.15.tar.gz +sha256 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 rng-tools-6.16.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index f736193a23..3e565103e4 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,14 +4,14 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.15 +RNG_TOOLS_VERSION = 6.16 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project RNG_TOOLS_SELINUX_MODULES = rngd -RNG_TOOLS_DEPENDENCIES = host-pkgconf openssl +RNG_TOOLS_DEPENDENCIES = host-pkgconf libcap openssl # From git RNG_TOOLS_AUTORECONF = YES @@ -45,6 +45,13 @@ else RNG_TOOLS_CONF_OPTS += --without-nistbeacon endif +ifeq ($(BR2_PACKAGE_RNG_TOOLS_QRYPT),y) +RNG_TOOLS_DEPENDENCIES += jansson libcurl +RNG_TOOLS_CONF_OPTS += --with-qrypt +else +RNG_TOOLS_CONF_OPTS += --without-qrypt +endif + define RNG_TOOLS_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/rng-tools/S21rngd \ $(TARGET_DIR)/etc/init.d/S21rngd From peter at korsgaard.com Mon Feb 20 20:59:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:58 -0000 Subject: [Buildroot] [git commit branch/next] package/parted: bump to version 3.5 Message-ID: <20230220205229.374E6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57817fe05a4250a260a08201812c6652b306a0e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- package/parted/parted.hash | 2 +- package/parted/parted.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/parted/parted.hash b/package/parted/parted.hash index 392436ec4b..8a167d9bb8 100644 --- a/package/parted/parted.hash +++ b/package/parted/parted.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342 parted-3.4.tar.xz +sha256 4938dd5c1c125f6c78b1f4b3e297526f18ee74aa43d45c248578b1d2470c05a2 parted-3.5.tar.xz # Locally calculated sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING diff --git a/package/parted/parted.mk b/package/parted/parted.mk index 23158179e4..6d4626e2e6 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -4,7 +4,7 @@ # ################################################################################ -PARTED_VERSION = 3.4 +PARTED_VERSION = 3.5 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(BR2_GNU_MIRROR)/parted PARTED_DEPENDENCIES = host-pkgconf util-linux From thomas.petazzoni at bootlin.com Tue Feb 7 17:10:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:10:35 +0100 Subject: [Buildroot] [git commit branch/next] package/uclibc: don't let uClibc build system strip uClibc Message-ID: <20230220205253.50CB28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf92dcfaa92f6564830d10d4e18ae00fd8102ab2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Let Buildroot handle this, so we can have an unstripped uClibc if needed. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 125aa4cdcf..d2baffc95e 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -397,6 +397,7 @@ define UCLIBC_KCONFIG_FIXUP_CMDS $(call KCONFIG_SET_OPT,RUNTIME_PREFIX,"/") $(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr") $(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib") + $(call KCONFIG_DISABLE_OPT,DOSTRIP) $(UCLIBC_MMU_CONFIG) $(UCLIBC_BINFMT_CONFIG) $(UCLIBC_AARCH64_PAGE_SIZE_CONFIG) From peter at korsgaard.com Mon Feb 20 20:59:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:59 -0000 Subject: [Buildroot] [git commit branch/next] package/fetchmail: bump version to 6.4.35 Message-ID: <20230220205229.6486D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a029f6e8855b7c6b0b558a4f715d25faf1dba32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://sourceforge.net/p/fetchmail/mailman/message/37756758/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/fetchmail/fetchmail.hash | 4 ++-- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 4b2cf90ed8..bb03dcf94a 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37721221/ -sha256 c3bdded1b5ce236960bd1ceeee3f3257220ed99c3eec84a5d76bb5618e3258d4 fetchmail-6.4.34.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37756758/ +sha256 7b0b56cbc0fca854504f167795fab532d5a54d5a7d3b6e3e36a33f34a0960a01 fetchmail-6.4.35.tar.xz # Locally computed: sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index 063e41b2e1..d6053508a5 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).34 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).35 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING From yann.morin.1998 at free.fr Tue Feb 7 17:14:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:14:59 +0100 Subject: [Buildroot] [git commit branch/next] support/docker: update Debian distro to a newer tag/date Message-ID: <20230220205253.6F9D28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d24c6f4b15f4794046e8e1ee220298c90ddecd19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/docker/Dockerfile | 2 +- support/docker/apt-sources.list | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index d775ae23e1..de1534e77a 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -6,7 +6,7 @@ # We use a specific tag for the base image *and* the corresponding date # for the repository., so do not forget to update the apt-sources.list # file that is shipped next to this Dockerfile. -FROM debian:bullseye-20210902 +FROM debian:bullseye-20230202 LABEL maintainer="Buildroot mailing list " \ vendor="Buildroot" \ diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list index 0f872fd398..849996d9f7 100644 --- a/support/docker/apt-sources.list +++ b/support/docker/apt-sources.list @@ -1,4 +1,4 @@ -# Latest just before 20210817T000000Z: -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20210902T193650Z/ bullseye-security main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main +# Latest just before 20230207T102800Z: +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20230206T092119Z/ bullseye-security main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye-updates main From peter at korsgaard.com Mon Feb 20 21:00:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:00 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-mediadriver: bump version to 22.6.6 Message-ID: <20230220205229.55EAC8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c163b2c782e6034f0ae6d60c479d092a539263e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 b2c45eb025..a5e9c64e97 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cbb6a514564f8c3349b1f78fc0906b636ea2074d7605cb0e820c5b727ce88cdc intel-media-22.6.5.tar.gz +sha256 b553290e829dfd824eb62295c9f07dbe8062ce7998f7c527cc92856d0792562d intel-media-22.6.6.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 8d3fc09260..8fa93218fa 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.6.5 +INTEL_MEDIADRIVER_VERSION = 22.6.6 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 thomas.petazzoni at bootlin.com Tue Feb 7 17:10:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:10:35 +0100 Subject: [Buildroot] [git commit branch/next] package/uclibc: pass $(TARGET_DEBUGGING) flags Message-ID: <20230220205253.5B606828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17481bd0bf6abff260ccc579974b813050f91d4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In order to have debugging symbols in uClibc, let's pass $(TARGET_DEBUGGING) in UCLIBC_EXTRA_CFLAGS. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index d2baffc95e..342d841087 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -375,7 +375,7 @@ endif # Commands # -UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) +UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) $(TARGET_DEBUGGING) # uClibc-ng does not build with LTO, so explicitly disable it # when using a compiler that may have support for LTO From peter at korsgaard.com Mon Feb 20 21:00:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:01 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_kria_kv260_defconfig: fix linux dts name Message-ID: <20230220205229.81107828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3f5c5cb87b2f5d0e24b291697d959b8773e8b86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The Linux DTS name has changed for the zynqmp_kria_kv260 with Xilinx 2022.2. smk-k26-revA-sck-kv-g-revB has become zynqmp-smk-k26-revA-sck-kv-g-revB. This DTS corresponds to generating the zynqmp-smk-k26-revA.dtb for the k26 som and applying the zynqmp-sck-kv-g-revB.dtbo for the kv260 carrier board. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3477506541 Signed-off-by: Neal Frager Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/zynqmp_kria_kv260_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 3214d45fa9..94631da034 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -8,7 +8,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/smk-k26-revA-sck-kv-g-revB" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y From thomas.petazzoni at bootlin.com Tue Feb 7 17:10:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:10:35 +0100 Subject: [Buildroot] [git commit branch/next] package/uclibc: enable DODEBUG when BR2_ENABLE_RUNTIME_DEBUG Message-ID: <20230220205253.662B186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9867a725c12975af52dda9dffbdc33c3b0312db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The DODEBUG=y option of uClibc causes uClibc to be built with -O0 and -DDEBUG, which has a significant runtime performance impact. Currently, DODEBUG=y is passed when BR2_ENABLE_DEBUG=y, but BR2_ENABLE_DEBUG is only about enabling debugging symbols, not about runtime debugging additions. The more recently added BR2_ENABLE_RUNTIME_DEBUG option is precisely designed for that, so we changed the logic to pass DODEBUG=y when BR2_ENABLE_RUNTIME_DEBUG=y, and not BR2_ENABLE_DEBUG=y. This allows to build uClibc with debugging symbols when BR2_ENABLE_DEBUG=y, without disabling optimizations and adding more debugging features that have a runtime performance impact. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 342d841087..4c05d36ab3 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -217,7 +217,7 @@ endif # # Debug # -ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) define UCLIBC_DEBUG_CONFIG $(call KCONFIG_ENABLE_OPT,DODEBUG) endef From peter at korsgaard.com Mon Feb 20 21:00:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:02 -0000 Subject: [Buildroot] [git commit branch/next] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot Message-ID: <20230220205229.906C48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e9929e9a826d93ff47060267fe6cc1d9ec35718 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_lime2_defconfig | 4 ++-- configs/olimex_a20_olinuxino_lime_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 1bb628b56b..a0ebcaed66 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.71" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -44,7 +44,7 @@ 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="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 7105ea9962..f685d19421 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.71" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -44,7 +44,7 @@ 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="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From peter at korsgaard.com Tue Feb 7 17:24:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 18:24:10 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: silence gcc plugin test Message-ID: <20230220205253.8D2B786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fbd2f6d2cf26225f73f584c3a0cacb1b2476f5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The gcc plugin test was not using the -q option to grep causing it to print the line to stdout, so fix that. While we're at it, adjust the locale check to use grep -q instead of redirecting to /dev/null for consistency with the other checks. Signed-off-by: Peter Korsgaard --- 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 88eabe921d..0aa5e59274 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -194,7 +194,7 @@ if [ "${PATCH_MAJOR}" -lt 2 ] || [ "${PATCH_MAJOR}" -eq 2 -a "${PATCH_MINOR}" -l exit 1; fi -if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then +if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then if ! which locale > /dev/null ; then echo echo "You need locale support on your build machine to build a toolchain supporting locales" @@ -254,7 +254,7 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then fi fi -if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then +if grep -q ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then if ! echo "#include " | $HOSTCXX_NOCCACHE -I$($HOSTCXX_NOCCACHE -print-file-name=plugin)/include -x c++ -c - -o /dev/null ; then echo echo "Your Buildroot configuration needs a host compiler capable of building gcc plugins." From arnout at mind.be Tue Feb 7 21:51:26 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:26 +0100 Subject: [Buildroot] [git commit branch/next] system: Warn if systemd is used with kernel < 4.15 Message-ID: <20230220205254.095CC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a095643b4dd34eb7acb69662aa64fa945f4b542 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next To quote the README: > Kernel versions below 4.15 have significant gaps in functionality and > are not recommended for use with this version of systemd. Taint flag > 'old-kernel' will be set. Systemd will most likely still function, but > upstream support and testing are limited. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- system/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/Config.in b/system/Config.in index 6100d965e7..1ca7690ea3 100644 --- a/system/Config.in +++ b/system/Config.in @@ -140,6 +140,10 @@ comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and targe !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 +comment "systemd highly recommends Linux >= 4.15" + depends on BR2_INIT_SYSTEMD + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + config BR2_INIT_NONE bool "None" select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT From peter at korsgaard.com Mon Feb 20 21:00:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:03 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-html-parser: bump version to 3.80 Message-ID: <20230220205229.B403B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e35750b5246e1cd7bce0c53b6e32cca592c4f3ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Updated license hash due to typo/whitespace-only fixes in license file: https://github.com/libwww-perl/HTML-Parser/commit/96192e7cb1f31559e8ad834fd5d7642d04e35f65#diff-c693279643b8cd5d248172d9c22cb7cf4ed163a3c98c8a3f69c2717edd3eacb7 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-html-parser/perl-html-parser.hash | 6 +++--- package/perl-html-parser/perl-html-parser.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-html-parser/perl-html-parser.hash b/package/perl-html-parser/perl-html-parser.hash index 36b094a7cb..ccd115d6c9 100644 --- a/package/perl-html-parser/perl-html-parser.hash +++ b/package/perl-html-parser/perl-html-parser.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 60e266d5a07fbea671a0383dd8af7b6c HTML-Parser-3.76.tar.gz -sha256 64d9e2eb2b420f1492da01ec0e6976363245b4be9290f03f10b7d2cb63fa2f61 HTML-Parser-3.76.tar.gz +md5 8e7151d08f30457a2ba80020b936285f HTML-Parser-3.80.tar.gz +sha256 63411db03016747e37c2636db11b05f8cc71608ef5bff36d04ddb0dc92f7835b HTML-Parser-3.80.tar.gz # computed by scancpan -sha256 0e57338bc10d5fb8891012ebee65a7b504b247f5bb485e121b8b48d7a118a60b LICENSE +sha256 9081922eb873ec1809c20672a7385a65f3c6b1163166bf69b2bbe986fb5b0159 LICENSE diff --git a/package/perl-html-parser/perl-html-parser.mk b/package/perl-html-parser/perl-html-parser.mk index 097564dbcb..1e1f8e6050 100644 --- a/package/perl-html-parser/perl-html-parser.mk +++ b/package/perl-html-parser/perl-html-parser.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTML_PARSER_VERSION = 3.76 +PERL_HTML_PARSER_VERSION = 3.80 PERL_HTML_PARSER_SOURCE = HTML-Parser-$(PERL_HTML_PARSER_VERSION).tar.gz PERL_HTML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTML_PARSER_LICENSE = Artistic or GPL-1.0+ From arnout at mind.be Tue Feb 7 21:51:22 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:22 +0100 Subject: [Buildroot] [git commit branch/next] package/systemd: bump to version 252.4 Message-ID: <20230220205253.D9DA78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2c823d1f548d5a0120d27d6c000603192360f7b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Following files changed *license* from CC0-1.0 to MIT-0: - src/systemctl/systemd-sysv-install.SKELETON - config files - examples under /network The file LICENSES/MIT-0.txt has been added for this reason, hashes added, corrected for LICENSES/README.md. Kernel version 3.15 is now the bare minimum, but only version 4.15 and higher are fully supported and tested: - bump kernel header dependencies - correct kconfig description - improvements to make the kconfig description better reflect the information from the README Set new options to their default, remove -Defi-cc option. Set -Ddbus=false to ensure dbus dependency is runtime only. Set -Ddbus-interfaces-dir=no as interface XML file generation is not supported when cross compiling. Set -Ddefault-user-shell=/bin/sh to the always available shell. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/systemd/Config.in | 12 +++++++++--- package/systemd/systemd.hash | 5 +++-- package/systemd/systemd.mk | 16 ++++++++++++++-- system/Config.in | 6 +++--- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 33ac03e584..0d4147840d 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on !BR2_STATIC_LIBS # kmod depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV @@ -51,7 +51,11 @@ menuconfig BR2_PACKAGE_SYSTEMD an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. - Systemd requires a Linux kernel >= 3.13 with the following + Kernel versions below 4.15 ("recommended baseline") have + significant gaps in functionality and are not recommended + for use with this version of systemd. + + Systemd requires a Linux kernel >= 3.15 with the following options enabled: - CONFIG_DEVTMPFS @@ -66,9 +70,11 @@ menuconfig BR2_PACKAGE_SYSTEMD - CONFIG_PROC_FS - CONFIG_FHANDLE (libudev, mount and bind mount handling) - - CONFIG_NET_NS (needed by PrivateNetwork=, used in some + - CONFIG_NET_NS (Required for PrivateNetwork=, used in some systemd units) + - CONFIG_USER_NS (Required for PrivateUsers=) + - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS - CONFIG_TMPFS_POSIX_ACL - CONFIG_TMPFS_XATTR diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 3b98566f32..00c08edcd9 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 638a2fc78828765fc97bc73f428205b6dc1d359149b6c6bfe4d2a649cba2cca8 systemd-250.8.tar.gz +sha256 cf2d27e67663d599a045101c7178cf0ec63d9df2962a54adf7de0d0357724f00 systemd-252.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt @@ -8,7 +8,8 @@ sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENS sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 LICENSES/LGPL-2.0-or-later.txt sha256 5bcef4fedbfc08776630e65d5d0d074dd31208037eddb167ca46a9ec4f737764 LICENSES/Linux-syscall-note.txt sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENSES/lookup3-public-domain.txt +sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENSES/MIT-0.txt sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md +sha256 da9b2c7b8cd10516fd2c4279b82496ea61787148f13e899c62fc8988c5fac34f LICENSES/README.md diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index f191542866..a38eeba1a8 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.8 +SYSTEMD_VERSION = 252.4 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ @@ -29,6 +29,7 @@ SYSTEMD_LICENSE = \ BSD-3-Clause (tools/chromiumos), \ CC0-1.0 (few source files, see LICENSES/README.md), \ GPL-2.0 with Linux-syscall-note (linux kernel headers), \ + MIT-0 (few source files, see LICENSES/README.md), \ MIT (few source files, see LICENSES/README.md), \ OFL-1.1 (Heebo fonts) SYSTEMD_LICENSE_FILES = \ @@ -40,6 +41,7 @@ SYSTEMD_LICENSE_FILES = \ LICENSES/LGPL-2.0-or-later.txt \ LICENSES/Linux-syscall-note.txt \ LICENSES/lookup3-public-domain.txt \ + LICENSES/MIT-0.txt \ LICENSES/MIT.txt \ LICENSES/murmurhash2-public-domain.txt \ LICENSES/OFL-1.1.txt \ @@ -61,7 +63,13 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ + -Ddbus=false \ + -Ddbus-interfaces-dir=no \ + -Ddefault-compression='auto' \ -Ddefault-hierarchy=unified \ + -Ddefault-locale='C.UTF-8' \ + -Ddefault-user-shell=/bin/sh \ + -Dfirst-boot-full-preset=false \ -Didn=true \ -Dima=false \ -Dkexec-path=/usr/sbin/kexec \ @@ -72,6 +80,7 @@ SYSTEMD_CONF_OPTS += \ -Dman=false \ -Dmount-path=/usr/bin/mount \ -Dmode=release \ + -Dnspawn-locale='C.UTF-8' \ -Dnss-systemd=true \ -Dquotacheck-path=/usr/sbin/quotacheck \ -Dquotaon-path=/usr/sbin/quotaon \ @@ -82,6 +91,7 @@ SYSTEMD_CONF_OPTS += \ -Dsulogin-path=/usr/sbin/sulogin \ -Dsystem-gid-max=999 \ -Dsystem-uid-max=999 \ + -Dsysupdate=false \ -Dsysvinit-path= \ -Dsysvrcnd-path= \ -Dtelinit-path= \ @@ -558,7 +568,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi SYSTEMD_CONF_OPTS += \ -Defi=true \ -Dgnu-efi=true \ - -Defi-cc=$(TARGET_CC) \ -Defi-ld=bfd \ -Defi-libdir=$(STAGING_DIR)/usr/lib \ -Defi-includedir=$(STAGING_DIR)/usr/include/efi @@ -798,6 +807,8 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dbinfmt=false \ -Drepart=false \ -Dcoredump=false \ + -Ddbus=false \ + -Ddbus-interfaces-dir=no \ -Dpstore=false \ -Doomd=false \ -Dlogind=false \ @@ -806,6 +817,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dmachined=false \ -Dportabled=false \ -Dsysext=false \ + -Dsysupdate=false \ -Duserdb=false \ -Dhomed=false \ -Dnetworkd=false \ diff --git a/system/Config.in b/system/Config.in index deb464f4d0..6100d965e7 100644 --- a/system/Config.in +++ b/system/Config.in @@ -124,19 +124,19 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5" +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_HAS_SSP || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 From peter at korsgaard.com Mon Feb 20 21:00:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:04 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-file-listing: bump version to 6.15 Message-ID: <20230220205229.A2411828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57a907fb3b1c303c2402268450616a13f8571a5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Updated license hash due to typo/whitespace-only fixes in license file. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-file-listing/perl-file-listing.hash | 6 +++--- package/perl-file-listing/perl-file-listing.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-file-listing/perl-file-listing.hash b/package/perl-file-listing/perl-file-listing.hash index 2358965714..cb52c127cd 100644 --- a/package/perl-file-listing/perl-file-listing.hash +++ b/package/perl-file-listing/perl-file-listing.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 cf60a79563185391831613178a79b4cd File-Listing-6.14.tar.gz -sha256 15b3a4871e23164a36f226381b74d450af41f12cc94985f592a669fcac7b48ff File-Listing-6.14.tar.gz +md5 8ba34641a6c5a2ec1b0bf7064f68c535 File-Listing-6.15.tar.gz +sha256 46c4fb9f9eb9635805e26b7ea55b54455e47302758a10ed2a0b92f392713770c File-Listing-6.15.tar.gz # computed by scancpan -sha256 7f0ccec295e6d7d2be1439cedd7caf6cc6247191f4c10ac56d91ee9bc265ba02 LICENSE +sha256 287e6f0fdf2db790a24975b492cde64b210c16af7137f44373cbd03fcf844212 LICENSE diff --git a/package/perl-file-listing/perl-file-listing.mk b/package/perl-file-listing/perl-file-listing.mk index 61bbc18eb8..c8584ffa8a 100644 --- a/package/perl-file-listing/perl-file-listing.mk +++ b/package/perl-file-listing/perl-file-listing.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_FILE_LISTING_VERSION = 6.14 +PERL_FILE_LISTING_VERSION = 6.15 PERL_FILE_LISTING_SOURCE = File-Listing-$(PERL_FILE_LISTING_VERSION).tar.gz PERL_FILE_LISTING_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PL/PLICEASE PERL_FILE_LISTING_LICENSE = Artistic or GPL-1.0+ From peter at korsgaard.com Sat Feb 11 22:20:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:20:15 +0100 Subject: [Buildroot] [git commit branch/next] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 Message-ID: <20230220205258.7A72186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8f0c02574b485e3250030d8cbf5c057ced578a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003321.html Fixes CVE-2023-0494: https://lists.x.org/archives/xorg-announce/2023-February/003320.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 0c3c807ff3..e2a2a251c3 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003310.html -sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz -sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003321.html +sha256 d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb xorg-server-21.1.7.tar.xz +sha512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5 xorg-server-21.1.7.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 04eb5e90b7..33b35b7979 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.6 +XSERVER_XORG_SERVER_VERSION = 21.1.7 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From yann.morin.1998 at free.fr Mon Feb 20 21:00:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:49 -0000 Subject: [Buildroot] [git commit branch/next] package/python-canopen: bump to version 2.1.0 Message-ID: <20230220205234.0AAE0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7be2ff33abdd049dc3670c5a6e2e385c1fba6f41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Verified license remains MIT after hash changed. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-canopen/python-canopen.hash | 6 +++--- package/python-canopen/python-canopen.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-canopen/python-canopen.hash b/package/python-canopen/python-canopen.hash index 610dca3f34..e6485e72f0 100644 --- a/package/python-canopen/python-canopen.hash +++ b/package/python-canopen/python-canopen.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/canopen/json -md5 0719b73bd8ccaeaa9fb758c5338fd030 canopen-2.0.0.tar.gz -sha256 bcc8aa9ea83f7ada5da0dade81038977be52a93802c2657649729eb1f82065d9 canopen-2.0.0.tar.gz +md5 d51443bdc8a55faea63c9da82196dd47 canopen-2.1.0.tar.gz +sha256 bc126bb1dcb62e3b34d8a12e38a07b5aa8319c17457c9bfe208f0bbbda90ff61 canopen-2.1.0.tar.gz # Locally computed sha256 checksums -sha256 0740d30978affcd91c0fc817b7cf942a332381bf0380fe17e60c6a0b377c6e0d LICENSE.txt +sha256 d9035caf7b8b135899da92a2730e2ac2e9f5ae3220dc98bd661be18045fcf689 LICENSE.txt diff --git a/package/python-canopen/python-canopen.mk b/package/python-canopen/python-canopen.mk index bd0a3bfba7..a0f5220ded 100644 --- a/package/python-canopen/python-canopen.mk +++ b/package/python-canopen/python-canopen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CANOPEN_VERSION = 2.0.0 +PYTHON_CANOPEN_VERSION = 2.1.0 PYTHON_CANOPEN_SOURCE = canopen-$(PYTHON_CANOPEN_VERSION).tar.gz -PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/9e/d6/6ced4b410b904aeee5f7d0227187eae95a5ad769f01014a74fc0e016845e +PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/29/d1/54462c949c384b1a9a2bd260143a8ec6f4259a18d119bd122e8f8a791b50 PYTHON_CANOPEN_SETUP_TYPE = setuptools PYTHON_CANOPEN_LICENSE = MIT PYTHON_CANOPEN_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Sun Feb 12 08:28:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:28:57 +0100 Subject: [Buildroot] [git commit branch/next] package/re2: bump to version 2023-02-01 Message-ID: <20230220205258.8FAFB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d758b054b496619999e03c60c63b6636d818f3e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 9019867db4..a39dece7a9 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 665b65b6668156db2b46dddd33405cd422bd611352c5052ab3dae6a5fbac5506 re2-2022-12-01.tar.gz +sha256 cbce8b7803e856827201a132862e41af386e7afd9cc6d9a9bc7a4fa4d8ddbdde re2-2023-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 07bb9378de..5587366b1f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2022-12-01 +RE2_VERSION = 2023-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:00:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:50 -0000 Subject: [Buildroot] [git commit branch/next] package/python-crontab: bump to version 2.7.1 Message-ID: <20230220205234.1C4B486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3030baaa67dcafcc9f2c0802278c51f2ea016936 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-crontab/python-crontab.hash | 4 ++-- package/python-crontab/python-crontab.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-crontab/python-crontab.hash b/package/python-crontab/python-crontab.hash index b3aa96fc1b..d9519096df 100644 --- a/package/python-crontab/python-crontab.hash +++ b/package/python-crontab/python-crontab.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-crontab/json -md5 2982bdce2d9b7789f32da649a9507c4b python-crontab-2.6.0.tar.gz -sha256 1e35ed7a3cdc3100545b43e196d34754e6551e7f95e4caebbe0e1c0ca41c2f1b python-crontab-2.6.0.tar.gz +md5 0a71aa83eed18752c2850632d84cfd89 python-crontab-2.7.1.tar.gz +sha256 b21af4647c7bbb848fef2f020616c6b0289dcb9f94b4f991a55310ff9bec5749 python-crontab-2.7.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/python-crontab/python-crontab.mk b/package/python-crontab/python-crontab.mk index 9b29e11ccd..1c2802ef61 100644 --- a/package/python-crontab/python-crontab.mk +++ b/package/python-crontab/python-crontab.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CRONTAB_VERSION = 2.6.0 -PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/06/b0/c270a1b5c83d9e0f83ab654d3153c39d80f61ba49fefde50fd23ab351381 +PYTHON_CRONTAB_VERSION = 2.7.1 +PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/6a/b6/94d861e868698b8e3f288f7e4684e30535b0d9a6b38316ee0a3d4d31e6ae PYTHON_CRONTAB_SETUP_TYPE = setuptools PYTHON_CRONTAB_LICENSE = LGPL-3.0+ PYTHON_CRONTAB_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 12 08:38:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:38:54 +0100 Subject: [Buildroot] [git commit branch/next] support/download: catch post-process errors Message-ID: <20230220205258.99B4086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a39116b5dba6cf0695620e2ba5302f21fa80a4a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/12a/12a63ae177fe3ed0c9a1ef2fa01870f334f36b0f/ Currently, when the post-process helper fails while downloading from upstream, there is no fallback to the backup mirror. In case the post-process helper fails, we must consider that to be a download failure, so we must bail out as if the download backend itself did fail, but we fail to do so. Duplicate the logic we have for the download helper: if the post-process helper fails, remove the downloaded stuff, and continue on to the next URI, which will ultimately hit the backup mirror (if one has been configured). Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/download/dl-wrapper | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 09a6ac1f1a..1e8d6058f6 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -138,9 +138,15 @@ main() { fi if [ -n "${post_process}" ] ; then - "${OLDPWD}/support/download/${post_process}-post-process" \ - -o "${tmpf}" \ - -n "${raw_base_name}" + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + then + # cd back to keep path coherence + cd "${OLDPWD}" + rm -rf "${tmpd}" + continue + fi fi # cd back to free the temp-dir, so we can remove it later From yann.morin.1998 at free.fr Mon Feb 20 21:00:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:51 -0000 Subject: [Buildroot] [git commit branch/next] package/python-dbus-fast: bump to version 1.84.0 Message-ID: <20230220205234.43095828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f29c7f18d6267e65863aedb6d0c515cf8f9404f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-dbus-fast/python-dbus-fast.hash | 4 ++-- package/python-dbus-fast/python-dbus-fast.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dbus-fast/python-dbus-fast.hash b/package/python-dbus-fast/python-dbus-fast.hash index f0dceeb43d..e9a3992f8e 100644 --- a/package/python-dbus-fast/python-dbus-fast.hash +++ b/package/python-dbus-fast/python-dbus-fast.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dbus-fast/json -md5 eebf2c558dd1af0f8f32b361e91f2fa3 dbus_fast-1.61.1.tar.gz -sha256 bda4a7d559047b74f409eda278f68f610a418e86ad3efa0368fa2ed240daa6b6 dbus_fast-1.61.1.tar.gz +md5 21e3675168e3dbe807c6c8a29267241f dbus_fast-1.84.0.tar.gz +sha256 d64f1b68c1c81268e846471caeb9264a9306a6c6ad356c30d5cdf7d1ecc251a1 dbus_fast-1.84.0.tar.gz # Locally computed sha256 checksums sha256 c37e9c75110e01d1f0c5360dc7d7776a30ac5f70d2440db214423e4b7a77a6af LICENSE diff --git a/package/python-dbus-fast/python-dbus-fast.mk b/package/python-dbus-fast/python-dbus-fast.mk index de7049ba22..9dd88f613f 100644 --- a/package/python-dbus-fast/python-dbus-fast.mk +++ b/package/python-dbus-fast/python-dbus-fast.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DBUS_FAST_VERSION = 1.61.1 +PYTHON_DBUS_FAST_VERSION = 1.84.0 PYTHON_DBUS_FAST_SOURCE = dbus_fast-$(PYTHON_DBUS_FAST_VERSION).tar.gz -PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/dd/f4/a280d46b119d59f6a3d84abf474452ae76651558b0963ab8c48ae13b5a44 +PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/81/67/a83522d6692a72911c3586e2fcd2363ce22d1522a7e17e1012f255a6083b PYTHON_DBUS_FAST_SETUP_TYPE = setuptools PYTHON_DBUS_FAST_LICENSE = MIT PYTHON_DBUS_FAST_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Feb 12 20:03:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 21:03:01 +0100 Subject: [Buildroot] [git commit branch/next] package/log4cplus: bump to version 2.1.0 Message-ID: <20230220205258.BD4158648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bb77eb8f14585bc79307fd672cab79b7e4e476d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/log4cplus/log4cplus/blob/REL_2_1_0/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/log4cplus/log4cplus.hash | 2 +- package/log4cplus/log4cplus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/log4cplus/log4cplus.hash b/package/log4cplus/log4cplus.hash index c4540c9d56..1779b30949 100644 --- a/package/log4cplus/log4cplus.hash +++ b/package/log4cplus/log4cplus.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f5949e713cf8635fc554384ab99b04716e3430f28eed6dd7d71ad03d959b91a0 log4cplus-2.0.8.tar.xz +sha256 d84ac8b1c46645122fbf72691f8eacef68c71b587403ee833bd9a252e06d46cc log4cplus-2.1.0.tar.xz sha256 91d7e42ff80e74c4c94e5ad353375fa0358cd0abbf43f5fe957097cdbd4e2c4d LICENSE diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk index 2dab661654..28eb4ed8f4 100644 --- a/package/log4cplus/log4cplus.mk +++ b/package/log4cplus/log4cplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOG4CPLUS_VERSION = 2.0.8 +LOG4CPLUS_VERSION = 2.1.0 LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION) LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) From yann.morin.1998 at free.fr Mon Feb 20 21:00:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:52 -0000 Subject: [Buildroot] [git commit branch/next] package/python-dicttoxml: bump to version 1.7.16 Message-ID: <20230220205234.526C886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc457e3d320bea68eac1bab8bd759c1ba0f7b40b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-dicttoxml/python-dicttoxml.hash | 4 ++-- package/python-dicttoxml/python-dicttoxml.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dicttoxml/python-dicttoxml.hash b/package/python-dicttoxml/python-dicttoxml.hash index dcde7cf1b6..1c94d3446a 100644 --- a/package/python-dicttoxml/python-dicttoxml.hash +++ b/package/python-dicttoxml/python-dicttoxml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dicttoxml/json -md5 234550e3aa875c6f3520aa9a2dff1ef1 dicttoxml-1.7.15.tar.gz -sha256 5540fe7dfde2d2ed9467e67fcc981cbd2e164dc3120c862bdb7333202ac48838 dicttoxml-1.7.15.tar.gz +md5 f4853a05c41f9056172447d4e59517b9 dicttoxml-1.7.16.tar.gz +sha256 6f36ce644881db5cd8940bee9b7cb3f3f6b7b327ba8a67d83d3e2caa0538bf9d dicttoxml-1.7.16.tar.gz # Locally computed sha256 checksums sha256 4514114bd9da0b2fbf8c4fa264c0e6cc80fd41e6ac7f09d7a39a215662951c7c LICENCE.txt diff --git a/package/python-dicttoxml/python-dicttoxml.mk b/package/python-dicttoxml/python-dicttoxml.mk index 3e5f90e9de..c26c16b72a 100644 --- a/package/python-dicttoxml/python-dicttoxml.mk +++ b/package/python-dicttoxml/python-dicttoxml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DICTTOXML_VERSION = 1.7.15 +PYTHON_DICTTOXML_VERSION = 1.7.16 PYTHON_DICTTOXML_SOURCE = dicttoxml-$(PYTHON_DICTTOXML_VERSION).tar.gz -PYTHON_DICTTOXML_SITE = https://files.pythonhosted.org/packages/45/b5/efa170fd88e8b8bc025c59592eade0fb7de6ae02ed3dd63957956adc1396 +PYTHON_DICTTOXML_SITE = https://files.pythonhosted.org/packages/ee/c9/3132427f9e64d572688e6a1cbe3d542d1a03f676b81fb600f3d1fd7d2ec5 PYTHON_DICTTOXML_SETUP_TYPE = distutils PYTHON_DICTTOXML_LICENSE = GPL-2.0 PYTHON_DICTTOXML_LICENSE_FILES = LICENCE.txt From yann.morin.1998 at free.fr Sun Feb 12 20:20:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:20:30 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Julien Olivain for z3 runtime test files Message-ID: <20230220205258.D2FD486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0dc2fa3865b0dbb2a6c103d6bc3bbc294ada604 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index ece0d986ae..dcc607ba60 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1724,6 +1724,7 @@ F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py +F: support/testing/tests/package/test_z3/ N: Julien Viard de Galbert F: package/dieharder/ From yann.morin.1998 at free.fr Mon Feb 20 21:00:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:54 -0000 Subject: [Buildroot] [git commit branch/next] package/python-filelock: bump to version 3.9.0 Message-ID: <20230220205234.6F4C0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b88d0f7b9775db73da55504f3968bc0ff25687a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate from setuptools to hatchling pep517 build backend. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-filelock/python-filelock.hash | 4 ++-- package/python-filelock/python-filelock.mk | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-filelock/python-filelock.hash b/package/python-filelock/python-filelock.hash index f9e6bc03e8..4ef7afed00 100644 --- a/package/python-filelock/python-filelock.hash +++ b/package/python-filelock/python-filelock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/filelock/json -md5 d66099b8823ebbdd980cde0dae8f7341 filelock-3.8.2.tar.gz -sha256 7565f628ea56bfcd8e54e42bdc55da899c85c1abfe1b5bcfd147e9188cebb3b2 filelock-3.8.2.tar.gz +md5 40eeb4a2963e1b07b8eab12b5db08418 filelock-3.9.0.tar.gz +sha256 7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de filelock-3.9.0.tar.gz # Locally computed sha256 checksums sha256 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd LICENSE diff --git a/package/python-filelock/python-filelock.mk b/package/python-filelock/python-filelock.mk index 86f1220b54..02759935ad 100644 --- a/package/python-filelock/python-filelock.mk +++ b/package/python-filelock/python-filelock.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_FILELOCK_VERSION = 3.8.2 +PYTHON_FILELOCK_VERSION = 3.9.0 PYTHON_FILELOCK_SOURCE = filelock-$(PYTHON_FILELOCK_VERSION).tar.gz -PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/d8/73/292d9ea2370840a163e6dd2d2816a571244e9335e2f6ad957bf0527c492f -PYTHON_FILELOCK_SETUP_TYPE = setuptools +PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/0b/dc/eac02350f06c6ed78a655ceb04047df01b02c6b7ea3fc02d4df24ca87d24 +PYTHON_FILELOCK_SETUP_TYPE = pep517 PYTHON_FILELOCK_LICENSE = Public Domain PYTHON_FILELOCK_LICENSE_FILES = LICENSE +PYTHON_FILELOCK_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs $(eval $(python-package)) From yann.morin.1998 at free.fr Sun Feb 12 20:30:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:30:05 +0100 Subject: [Buildroot] [git commit branch/next] package/opencv3: bump to version 3.4.19 Message-ID: <20230220205259.003C28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d40cab45e21cd1c66bfffa911b1310e29c321486 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This bump will fix the following build failure with gcc >= 12: /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp: In function 'bool base64::base64_valid(const uint8_t*, size_t, size_t)': /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp:167:31: error: comparing the result of pointer addition '(src + ((sizetype)off))' and NULL [-Werror=address] 167 | if (src == 0 || src + off == 0) | ~~~~~~~~~~^~~~ cc1plus: some warnings being treated as errors Update hash of LICENSE file (update in year: https://github.com/opencv/opencv/commit/f6fe5c07f61eb0bc934672200b2bfd453f2fc41d) https://github.com/opencv/opencv/wiki/ChangeLog#version3419 Fixes: - http://autobuild.buildroot.org/results/cb9c120c15c8042e6919858d6885c1cc4d996c0c Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/opencv3/opencv3.hash | 4 ++-- package/opencv3/opencv3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash index 30308188aa..3d6fd2ed8a 100644 --- a/package/opencv3/opencv3.hash +++ b/package/opencv3/opencv3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1353eec67849aadb20df71d8bae18b83708e18fc5da080fe5efeabb1e99b2ee8 opencv3-3.4.17.tar.gz -sha256 9076d3d934839a2f8e7bfe549abda6faea4751f1edd6e9460ff703559890ad5f LICENSE +sha256 9b913e74299ce4416a5c94000da577c592bf670fd53bad16220eb115a0821529 opencv3-3.4.19.tar.gz +sha256 c1fed9cd2f557ba23a1b37a21e2c90629d1a60bdb61e92d0e79369bb6fca3390 LICENSE diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 8e4c90786e..29fb246e65 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV3_VERSION = 3.4.17 +OPENCV3_VERSION = 3.4.19 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause From yann.morin.1998 at free.fr Mon Feb 20 21:01:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:01 -0000 Subject: [Buildroot] [git commit branch/next] package/python-posix-ipc: bump to version 1.1.1 Message-ID: <20230220205234.E6E76828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46d6bd7820622c67ed11ca09a1161a574f6af9e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-posix-ipc/python-posix-ipc.hash | 4 ++-- package/python-posix-ipc/python-posix-ipc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-posix-ipc/python-posix-ipc.hash b/package/python-posix-ipc/python-posix-ipc.hash index 74d2db0f5e..427e4c7b55 100644 --- a/package/python-posix-ipc/python-posix-ipc.hash +++ b/package/python-posix-ipc/python-posix-ipc.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/posix-ipc/json -md5 81baeabebd3e4064972ec62fd9eace0b posix_ipc-1.1.0.tar.gz -sha256 f86a15b32b38573c78e305ebd9100d8198a3d9facc03ffafe39edc35833738e3 posix_ipc-1.1.0.tar.gz +md5 523a31c4dbd56e0d4fd677f33e126e5d posix_ipc-1.1.1.tar.gz +sha256 e2456ba0cfb2ee5ba14121450e8d825b3c4a1461fca0761220aab66d4111cbb7 posix_ipc-1.1.1.tar.gz # Locally computed sha256 checksums sha256 2b58f0bf31a8cbd7e56bfef030e9f7f02758ce8a810d073ccf41753bdc2a0747 LICENSE diff --git a/package/python-posix-ipc/python-posix-ipc.mk b/package/python-posix-ipc/python-posix-ipc.mk index c25af9ecbd..bdd2f1d4af 100644 --- a/package/python-posix-ipc/python-posix-ipc.mk +++ b/package/python-posix-ipc/python-posix-ipc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_POSIX_IPC_VERSION = 1.1.0 +PYTHON_POSIX_IPC_VERSION = 1.1.1 PYTHON_POSIX_IPC_SOURCE = posix_ipc-$(PYTHON_POSIX_IPC_VERSION).tar.gz -PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/41/72/90b6702782921c0e3e0b10a66f2a47d8cfaf9c2255d763ab45cc8cea25eb +PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/07/7f/b954f224a226960a4aa98b6c5fa3d4f3fafb20bb8461446e41b563aee863 PYTHON_POSIX_IPC_LICENSE = BSD-3-Clause PYTHON_POSIX_IPC_LICENSE_FILES = LICENSE PYTHON_POSIX_IPC_SETUP_TYPE = setuptools From peter at korsgaard.com Tue Feb 14 17:11:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:11:38 +0100 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230220205259.998DF86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36a8be4770d93c0a4346008c56f6ab6862b9b509 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 4.9.x / 6.0.x is now EOL. 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 774f1e0975..11dc5cce07 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.11" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" 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 e88abe5bb8..f797d5a61a 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b linux-6.1.9.tar.xz +sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz -sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz -sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz +sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz +sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz +sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz -sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz +sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz +sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1146231e41..8a76f93d62 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -394,13 +394,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.304" if BR2_KERNEL_HEADERS_4_14 - default "4.19.271" if BR2_KERNEL_HEADERS_4_19 - default "5.4.230" if BR2_KERNEL_HEADERS_5_4 - default "5.10.166" if BR2_KERNEL_HEADERS_5_10 - default "5.15.91" if BR2_KERNEL_HEADERS_5_15 + default "4.14.305" if BR2_KERNEL_HEADERS_4_14 + default "4.19.272" if BR2_KERNEL_HEADERS_4_19 + default "5.4.231" if BR2_KERNEL_HEADERS_5_4 + default "5.10.167" if BR2_KERNEL_HEADERS_5_10 + default "5.15.93" if BR2_KERNEL_HEADERS_5_15 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 - default "6.1.9" if BR2_KERNEL_HEADERS_6_1 + default "6.1.11" if BR2_KERNEL_HEADERS_6_1 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 yann.morin.1998 at free.fr Mon Feb 20 21:01:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:02 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pygments: bump to version 2.14.0 Message-ID: <20230220205235.22D498648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1f426de2e67018d8b57c03457dbf1d719ac3b19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pygments/python-pygments.hash | 4 ++-- package/python-pygments/python-pygments.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pygments/python-pygments.hash b/package/python-pygments/python-pygments.hash index 610acb96d7..f7396cb3d6 100644 --- a/package/python-pygments/python-pygments.hash +++ b/package/python-pygments/python-pygments.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pygments/json -md5 6ccae578d28d18968b30a4711652fd9a Pygments-2.13.0.tar.gz -sha256 56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1 Pygments-2.13.0.tar.gz +md5 447be4afb076c8325a7dc659aff5b931 Pygments-2.14.0.tar.gz +sha256 b3ed06a9e8ac9a9aae5a6f5dbe78a8a58655d17b43b93c078f094ddc476ae297 Pygments-2.14.0.tar.gz # Locally computed sha256 checksums sha256 a9d66f1d526df02e29dce73436d34e56e8632f46c275bbdffc70569e882f9f17 LICENSE diff --git a/package/python-pygments/python-pygments.mk b/package/python-pygments/python-pygments.mk index c09350c42b..9c4f0be6c8 100644 --- a/package/python-pygments/python-pygments.mk +++ b/package/python-pygments/python-pygments.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYGMENTS_VERSION = 2.13.0 +PYTHON_PYGMENTS_VERSION = 2.14.0 PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/e0/ef/5905cd3642f2337d44143529c941cc3a02e5af16f0f65f81cbef7af452bb +PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/da/6a/c427c06913204e24de28de5300d3f0e809933f376e0b7df95194b2bb3f71 PYTHON_PYGMENTS_LICENSE = BSD-2-Clause PYTHON_PYGMENTS_LICENSE_FILES = LICENSE PYTHON_PYGMENTS_CPE_ID_VENDOR = pygments From peter at korsgaard.com Tue Feb 14 17:12:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:48 +0100 Subject: [Buildroot] [git commit branch/next] package/zabbix: bump to version 6.2.7 Message-ID: <20230220205259.CA5E5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89fa774a191d41ed5d125d87d812ff3478902251 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - host-pkgconf is now mandatory - switch to pcre2 which is supported since version 6.0.0 and https://github.com/zabbix/zabbix/commit/18917f919a68abc863a5c79ba88c0cb156255fdc - Update hash of README (links updated with https://github.com/zabbix/zabbix/commit/067f5f873fb18ae7b22c5eaef40f0898b98edeb5 https://github.com/zabbix/zabbix/commit/499dbc81b987513233d579610335b8938f1ae91d) https://github.com/zabbix/zabbix/blob/6.2.7/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/zabbix/Config.in | 2 +- package/zabbix/zabbix.hash | 4 ++-- package/zabbix/zabbix.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index 0f7a0b0003..377c0ff692 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ZABBIX bool "zabbix" depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Zabbix is an enterprise-class open source distributed monitoring solution. Zabbix is free of cost. Zabbix is diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash index 42cc0bda57..bb6127e5ec 100644 --- a/package/zabbix/zabbix.hash +++ b/package/zabbix/zabbix.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 19686628df76e8d5ef7c2ed2975b258c7ca3ec7d151b1bb59d7e132f9fc7c941 zabbix-5.4.9.tar.gz -sha256 10d68ec3abacc29222c07748fc5e5cb9474fd7cd9ccdde1b92ff941ded946b78 README +sha256 6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d zabbix-6.2.7.tar.gz +sha256 f8fc3fd12521b60d53d8c5d48a883eb3c9c5ddec9de986a273e1b77f69d811db README sha256 444fe54aecc95ac0f3314289c300afc73b3946a4dc9fbd7e022709b3e0924dd0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e00d693ba5..db9efed78b 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -4,8 +4,8 @@ # ################################################################################ -ZABBIX_VERSION_MAJOR = 5.4 -ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 +ZABBIX_VERSION_MAJOR = 6.2 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).7 ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING @@ -13,9 +13,8 @@ ZABBIX_CPE_ID_VENDOR = zabbix # We're patching m4/netsnmp.m4 ZABBIX_AUTORECONF = YES -ZABBIX_DEPENDENCIES = pcre +ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ - --with-libpcre=$(STAGING_DIR)/usr/bin/ \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \ From yann.morin.1998 at free.fr Mon Feb 20 21:01:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:04 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pysmb: bump to version 1.2.9 Message-ID: <20230220205235.5F6B5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ffc7b4bb1241eb64272aa78448aac35d67ff4ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pysmb/python-pysmb.hash | 2 +- package/python-pysmb/python-pysmb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pysmb/python-pysmb.hash b/package/python-pysmb/python-pysmb.hash index 025e47d030..87b1edf595 100644 --- a/package/python-pysmb/python-pysmb.hash +++ b/package/python-pysmb/python-pysmb.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9215356c446e4c6b335b4a481f52d746ff60926badfecbc33524b94908fdc0e1 pysmb-1.2.8.tar.gz +sha256 30558c11ba141e9ad26e5edb1b85b94813a335ed5c0fe11df8046942b0c7e813 pysmb-1.2.9.tar.gz sha256 8c487d5c10f024e44a9cf1df21d1fd28a80bd2dfddd9f1dcd109a47d721f497f LICENSE diff --git a/package/python-pysmb/python-pysmb.mk b/package/python-pysmb/python-pysmb.mk index 36993ce42c..394a9d806c 100644 --- a/package/python-pysmb/python-pysmb.mk +++ b/package/python-pysmb/python-pysmb.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYSMB_VERSION = 1.2.8 +PYTHON_PYSMB_VERSION = 1.2.9 PYTHON_PYSMB_SOURCE = pysmb-$(PYTHON_PYSMB_VERSION).tar.gz PYTHON_PYSMB_SITE = https://miketeo.net/files/Projects/pysmb PYTHON_PYSMB_LICENSE = Libpng From peter at korsgaard.com Tue Feb 14 17:14:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:57 +0100 Subject: [Buildroot] [git commit branch/next] package/sdl2: bump version to 2.26.3 Message-ID: <20230220205300.06E8481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=910aae1e23806fff74b16088c8975827e6664c2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update the license hash because of a change in copyright year: - Copyright (C) 1997-2022 Sam Lantinga + Copyright (C) 1997-2023 Sam Lantinga Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.hash | 6 +++--- package/sdl2/sdl2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 86e0d86e7c..e26dcee301 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.2.tar.gz.sig -sha256 95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0 SDL2-2.26.2.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.3.tar.gz.sig +sha256 c661205a553b7d252425f4b751ff13209e5e020b876bbfa1598494af61790057 SDL2-2.26.3.tar.gz # Locally calculated -sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt +sha256 9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 8995178e71..c01f12d12c 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.26.2 +SDL2_VERSION = 2.26.3 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From yann.morin.1998 at free.fr Mon Feb 20 21:01:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:05 -0000 Subject: [Buildroot] [git commit branch/next] package/{, python-py}mupdf: bump to version 1.21.1 Message-ID: <20230220205235.3174C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e52a5966ec9be07d846ca3a0264cbd892d256b53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/mupdf/mupdf.hash | 4 ++-- package/mupdf/mupdf.mk | 2 +- package/python-pymupdf/python-pymupdf.hash | 4 ++-- package/python-pymupdf/python-pymupdf.mk | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mupdf/mupdf.hash b/package/mupdf/mupdf.hash index 6785aa163a..ef91abee18 100644 --- a/package/mupdf/mupdf.hash +++ b/package/mupdf/mupdf.hash @@ -1,8 +1,8 @@ # From https://mupdf.com/downloads/index.html: -sha1 27d75cae256450abb9f50cd00b3e5a895fc684cf mupdf-1.21.0-source.tar.lz +sha1 f759d914ec6ad6a3b96f994630ff70b75823831b mupdf-1.21.1-source.tar.lz # Locally computed: -sha256 f23fc1ad9081375d9c5f2318d6e6e5c5be490ecb70b10ed7167932afbe1ccfb5 mupdf-1.21.0-source.tar.lz +sha256 66a43490676c7f7c2ff74067328ef13285506fcc758d365ae27ea3668bd5e620 mupdf-1.21.1-source.tar.lz # Hash for license files: sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index e93a41bd00..d6cc407c49 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -5,7 +5,7 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -MUPDF_VERSION = 1.21.0 +MUPDF_VERSION = 1.21.1 MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.lz MUPDF_SITE = https://mupdf.com/downloads/archive MUPDF_LICENSE = AGPL-3.0+ diff --git a/package/python-pymupdf/python-pymupdf.hash b/package/python-pymupdf/python-pymupdf.hash index d930d04335..bda356d905 100644 --- a/package/python-pymupdf/python-pymupdf.hash +++ b/package/python-pymupdf/python-pymupdf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymupdf/json -md5 ae24d77d44369e46bbcd5457fe97d776 PyMuPDF-1.21.0.tar.gz -sha256 a63dfc289e127a16ab60310ee6005fe83121c7a97f7c120db688f9281c9e5d0f PyMuPDF-1.21.0.tar.gz +md5 be10963679ac6d52b7aed2311ca7e3c5 PyMuPDF-1.21.1.tar.gz +sha256 f815741a435c62a0036bbcbf5fa6c533567bd69c5338d413714fc57b22db93e0 PyMuPDF-1.21.1.tar.gz # Locally computed sha256 checksums sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index 38212dc44b..70448e8d90 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -5,9 +5,9 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -PYTHON_PYMUPDF_VERSION = 1.21.0 +PYTHON_PYMUPDF_VERSION = 1.21.1 PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz -PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/61/14/632eefe5568ee7a4ec95aa7fc9c63996ff6a6d2464d4e3a9dc35da11a409 +PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/30/44/9fce79689e5df7deebe2d17cb2b9b2a6b888439c241e71296e732aefa649 PYTHON_PYMUPDF_SETUP_TYPE = setuptools PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING From peter at korsgaard.com Tue Feb 14 17:15:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:11 +0100 Subject: [Buildroot] [git commit branch/next] package/gnuplot: bump version to 5.4.6 Message-ID: <20230220205300.1187C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df50979e7bf0ff7f0b8a2461ed7ae9dbd103d836 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard --- package/gnuplot/gnuplot.hash | 8 ++++---- package/gnuplot/gnuplot.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index 1ee6b53694..de0741d609 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.5/ -md5 c10cf81faa69d77e255a1dcfc625ba78 gnuplot-5.4.5.tar.gz -sha1 1179a768fd5f585a5dcb6aedea76cfa7a8dd5dfe gnuplot-5.4.5.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.6/ +md5 da719235bb2f46830f9d2101d04b14a5 gnuplot-5.4.6.tar.gz +sha1 31ea0c00af5c156e5d068e3b1cc2fb1847f471ab gnuplot-5.4.6.tar.gz # Locally computed -sha256 66f679115dd30559e110498fc94d926949d4d370b4999a042e724b8e910ee478 gnuplot-5.4.5.tar.gz +sha256 02fc27918200ed64d8f0c3b84fe81b95b59cd47ad99f270939ae497c19f27419 gnuplot-5.4.6.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 1ee49cb6ce..c49fbc497d 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.5 +GNUPLOT_VERSION = 5.4.6 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright From peter at korsgaard.com Tue Feb 14 17:15:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:39 +0100 Subject: [Buildroot] [git commit branch/next] package/libmdbx: bump version to 0.11.14 "Sergey Kapitsa" Message-ID: <20230220205300.1C75286496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efdcc850be902de2596412dbf0f142c3f679ce35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is stable bugfix release of libmdbx, in memory of Sergey Kapitsa (Russian physicist and demographer) on his 95th birthday. It is reasonable to backport this patch to all applicable releases/branches of Buildroot, at least this release fixes build for sh4 arch. Release notes for v0.11.14 -------------------------- Fixes: - backport: Refined the `__cold`/`__hot` macros to avoid the `error: inlining failed in call to ???always_inline FOO(...)???: target specific option mismatch` issue during build using GCC >10.x for SH4 arch. Actually this is GCC' SH4-backend bug which triggered by the `__attribute__((__optimize__("Os")))` used in conjunction with the `__attribute__((__cold__))`. - backport: Fixed `SIGSEGV` or an erroneous call to `free()` in case where errors occur when reopening by `mdbx_env_open()` of a previously used environment. - backport: Fixed `cursor_put_nochecklen()` internals for case when dupsort'ed named subDb contains a single key with multiple values (aka duplicates), which are replaced with a single value by put-operation with the `MDBX_UPSERT+MDBX_ALLDUPS` flags. In this case, the database becomes completely empty, without any pages. However exactly this condition was not considered and thus wasn't handled correctly. See [issue#8](https://gitflic.ru/project/erthink/libmdbx/issue/8) for more information. - backport: Fixed extra assertion inside `override_meta()`, which could lead to false-positive failing of the assertion in a debug builds during DB recovery and/or auto-rollback. Minors: - backport: Fixed typos. - backport: Refined `const` and `noexcept` for few C++ API methods. - backport: Resolve false-posirive `used uninitialized` warning from GCC >10.x while build for SH4 arch. - backport: Fixed insignificant typo of `||` inside `#if` byte-order condition. The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md Signed-off-by: ???????????? ?????????? (Leonid Yuriev) Signed-off-by: Peter Korsgaard --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index e3fb309461..b1a2891b91 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 9449fd357119e19902363ab90134d82c9a713b706394c2a1389b5bb4787b5164 libmdbx-amalgamated-0.11.13.tar.xz +sha256 97b03965b5b61727dc4232c50ccb174c632470a3d24438b3c52315bef6fb4033 libmdbx-amalgamated-0.11.14.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index a139e062f6..5e7995f8c8 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.13 +LIBMDBX_VERSION = 0.11.14 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From yann.morin.1998 at free.fr Mon Feb 20 21:01:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:06 -0000 Subject: [Buildroot] [git commit branch/next] package/python-scapy: bump to version 2.5.0 Message-ID: <20230220205235.93DCD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c2d7e401296e4b17ba9c6d521eca62eaff15159 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-scapy/python-scapy.hash | 4 ++-- package/python-scapy/python-scapy.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-scapy/python-scapy.hash b/package/python-scapy/python-scapy.hash index 4dccffd39a..7b21e6cb30 100644 --- a/package/python-scapy/python-scapy.hash +++ b/package/python-scapy/python-scapy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/scapy/json -md5 54072af118e9291b6c7898b4ea87cdaf scapy-2.4.5.tar.gz -sha256 bc707e3604784496b6665a9e5b2a69c36cc9fb032af4864b29051531b24c8593 scapy-2.4.5.tar.gz +md5 f546b1c82c2c98e0dae1a436219dd042 scapy-2.5.0.tar.gz +sha256 5b260c2b754fd8d409ba83ee7aee294ecdbb2c235f9f78fe90bc11cb6e5debc2 scapy-2.5.0.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-scapy/python-scapy.mk b/package/python-scapy/python-scapy.mk index 9cf17db671..a2c6cc6872 100644 --- a/package/python-scapy/python-scapy.mk +++ b/package/python-scapy/python-scapy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCAPY_VERSION = 2.4.5 +PYTHON_SCAPY_VERSION = 2.5.0 PYTHON_SCAPY_SOURCE = scapy-$(PYTHON_SCAPY_VERSION).tar.gz -PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/85/47/c919432ca258f354bb2c1e645623f891603f185bfc7563d4a21f6432e7ed +PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/67/a1/2a60d5b6f0fed297dd0c0311c887d5e8a30ba1250506585b897e5a662f4c PYTHON_SCAPY_SETUP_TYPE = setuptools PYTHON_SCAPY_LICENSE = GPL-2.0 PYTHON_SCAPY_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 15 09:14:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:14:25 +0100 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: bump to version 2.0.9 Message-ID: <20230220205300.328BA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=656af31891cc68eb8b27866cb9e9a7ca428a2b16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Release Notes: https://fluentbit.io/announcements/v2.0.9/ - Patch dropped, as it is upstream: https://github.com/fluent/fluent-bit/commit/7bcb502ebdcd647d6b83c972805e734ad522eb1a Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...-CMakeLists.txt-only-require-a-C-compiler.patch | 27 ---------------------- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch b/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch deleted file mode 100644 index e71bcf0c0d..0000000000 --- a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7bcb502ebdcd647d6b83c972805e734ad522eb1a Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 30 Jan 2023 09:10:37 +0100 -Subject: [PATCH] CMakeLists.txt: only require a C compiler - -Fluent-bit is mostly written in C, -so don't require CXX in the top-level project. - -Signed-off-by: Thomas Devoogdt ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7adb02de..3ff7360d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.12) --project(fluent-bit) -+project(fluent-bit C) - - # CMP0069 ensures that LTO is enabled for all compilers - cmake_policy(SET CMP0069 NEW) --- -2.30.2 - diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index ce7cea7b59..0caadcd56f 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8ff5566389033669feabc9c69a5c6f417dad5c8b066454388e6a706507262acf fluent-bit-2.0.8.tar.gz +sha256 393ad4a6ced48c327607653d610ef273843085a17b6e5c8013877abdf31e6945 fluent-bit-2.0.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 13077e53cc..c10ef613d7 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.0.8 +FLUENT_BIT_VERSION = 2.0.9 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:01:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:07 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pyspnego: bump to version 0.7.0 Message-ID: <20230220205235.6CA1C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc64eb6d1238515b4c53b2b34d89fc3bd09fb59b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyspnego/python-pyspnego.hash | 4 ++-- package/python-pyspnego/python-pyspnego.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyspnego/python-pyspnego.hash b/package/python-pyspnego/python-pyspnego.hash index 400e380b5d..0ae6cf1d4e 100644 --- a/package/python-pyspnego/python-pyspnego.hash +++ b/package/python-pyspnego/python-pyspnego.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pyspnego/json -md5 67114f5e59c6d5b45fe2b38c128c2140 pyspnego-0.6.3.tar.gz -sha256 6060a0e683171090adcf92c9d319ddd334f15117fa199a703d8c9bd094d9f6c0 pyspnego-0.6.3.tar.gz +md5 93ab1a088d65e6a7c97efdb567ba37b0 pyspnego-0.7.0.tar.gz +sha256 da78096fd7c9f40e716f6fbe3e30d913103d75fd676f839f98fc3a6fee92fbe3 pyspnego-0.7.0.tar.gz # Locally computed sha256 286517c93031c343f809f64b38563a783614b762e1367242af6cdd4107335471 LICENSE diff --git a/package/python-pyspnego/python-pyspnego.mk b/package/python-pyspnego/python-pyspnego.mk index 0910c57b7d..2fbb779d98 100644 --- a/package/python-pyspnego/python-pyspnego.mk +++ b/package/python-pyspnego/python-pyspnego.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYSPNEGO_VERSION = 0.6.3 +PYTHON_PYSPNEGO_VERSION = 0.7.0 PYTHON_PYSPNEGO_SOURCE = pyspnego-$(PYTHON_PYSPNEGO_VERSION).tar.gz -PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/ba/13/7b4e7dcff1eb24a13e0a631a4b49eab361678e4490d691c03253ae736da4 +PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/97/f3/bdf3cd5f4c5a1bf9e1d4bb771c133850ee08241c18cafd90a6d872937a9f PYTHON_PYSPNEGO_SETUP_TYPE = setuptools PYTHON_PYSPNEGO_LICENSE = MIT PYTHON_PYSPNEGO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:05 +0100 Subject: [Buildroot] [git commit branch/next] package/libnetconf2: bump version to 2.1.28 Message-ID: <20230220205300.6AE3686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d22988bfbdca479b18cce6a60b7d51b59e125a6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libnetconf2/libnetconf2.hash | 2 +- package/libnetconf2/libnetconf2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 34e934089e..675c76a500 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2f1a6559e8e43ea18ea337ab5f194f8443695c7ab4dde5d7b2560603f9bf702a libnetconf2-2.1.25.tar.gz +sha256 72e9a6461fadbd22f0cf0d23ba68d62b297c8f564f7f2bee069748fb67fc3a24 libnetconf2-2.1.28.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 0d4294d8d3..e349c1bce4 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 2.1.25 +LIBNETCONF2_VERSION = 2.1.28 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause From yann.morin.1998 at free.fr Mon Feb 20 21:01:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:08 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pytz: bump to version 2022.7 Message-ID: <20230220205235.8774A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9af376f6da76c7c8b38e01d9d3cae04948d5f758 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pytz/python-pytz.hash | 4 ++-- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index e71e77e5b7..6d6e1b606c 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 bf46b54a7e9bcb65ea38f54646181979 pytz-2022.6.tar.gz -sha256 e89512406b793ca39f5971bc999cc538ce125c0e51c27941bef4568b460095e2 pytz-2022.6.tar.gz +md5 3b9356e4dcd441df922cc01e8eb15983 pytz-2022.7.tar.gz +sha256 7ccfae7b4b2c067464a6733c6261673fdb8fd1be905460396b97a073e9fa683a pytz-2022.7.tar.gz # Locally computed sha256 checksums sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 58f06e1993..057a3ef173 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2022.6 +PYTHON_PYTZ_VERSION = 2022.7 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/76/63/1be349ff0a44e4795d9712cc0b2d806f5e063d4d34631b71b832fac715a8 +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/6d/37/54f2d7c147e42dc85ffbc6910862bb4f141fb3fc14d9a88efaa1a76c7df2 PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Wed Feb 15 09:23:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:23:35 +0100 Subject: [Buildroot] [git commit branch/next] support/config-fragments: add a bootlin s390x toolchain Message-ID: <20230220205300.52C3B7FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=740d923423f18d94d62e60d0efe8200c7bd889d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next I do constantly get mails that fluent-bit fails to build for s390x. So added this to ensure that the s390x architecture is checked as well if I manually do: $ ./utils/test-pkg -p fluent-bit -a Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config | 5 +++++ support/config-fragments/autobuild/toolchain-configs.csv | 1 + 2 files changed, 6 insertions(+) diff --git a/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config new file mode 100644 index 0000000000..fe3f0380c9 --- /dev/null +++ b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config @@ -0,0 +1,5 @@ +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 diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 0b19051543..a65e9bacc3 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -38,6 +38,7 @@ support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv32-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-sh4-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc64-glibc.config,x86_64 From yann.morin.1998 at free.fr Mon Feb 20 21:01:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:09 -0000 Subject: [Buildroot] [git commit branch/next] package/python-sentry-sdk: bump to version 1.12.1 Message-ID: <20230220205235.A018386496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b341e0cc646665ccda1c6997fb845503c12a0d06 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-sentry-sdk/python-sentry-sdk.hash | 4 ++-- package/python-sentry-sdk/python-sentry-sdk.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index 2aa739f398..38ae3380a8 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 4980e01dc73c6bcf794b0b7d3f3e08d7 sentry-sdk-1.11.1.tar.gz -sha256 675f6279b6bb1fea09fd61751061f9a90dca3b5929ef631dd50dc8b3aeb245e9 sentry-sdk-1.11.1.tar.gz +md5 ea2d728c847879f66c3d24cfbade2026 sentry-sdk-1.12.1.tar.gz +sha256 5bbe4b72de22f9ac1e67f2a4e6efe8fbd595bb59b7b223443f50fe5802a5551c sentry-sdk-1.12.1.tar.gz # Locally computed sha256 checksums sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index 056a015952..c3092a5184 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 1.11.1 +PYTHON_SENTRY_SDK_VERSION = 1.12.1 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/a3/d5/db26377e9817407ae8d7b65e15b3c3b8d817c301633be15bd2aef61f38a3 +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/32/03/496a7c8313658dec419303e8add969f314b7538c29f4ec5ebe6d86fb8ce2 PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:13 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: drop Matt Weber Message-ID: <20230220205300.8FD0B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b5b92019ba30aecdaa7ba34c255d15e0c0489e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next I regret that my work situation doesn't sustain me contributing. Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 105 ------------------------------------------------------------- 1 file changed, 105 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index df2b98ad53..72a56deb4c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1984,111 +1984,6 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ -N: Matt Weber -F: board/freescale/p* -F: board/freescale/t* -F: board/qemu/ppc64-e5500/ -F: configs/freescale_p* -F: configs/freescale_t* -F: configs/qemu_ppc64_e5500_defconfig -F: package/ace/ -F: package/argp-standalone/ -F: package/aufs/ -F: package/aufs-util/ -F: package/bc/ -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/ -F: package/davici/ -F: package/dnsmasq/ -F: package/dosfstools/ -F: package/eigen/ -F: package/ethtool/ -F: package/flashbench/ -F: package/fmc/ -F: package/fmlib/ -F: package/freeradius-server/ -F: package/git/ -F: package/gnutls/ -F: package/hostapd/ -F: package/i2c-tools/ -F: package/ifplugd/ -F: package/igmpproxy/ -F: package/iperf/ -F: package/iperf3/ -F: package/iputils/ -F: package/iw/ -F: package/jitterentropy-library/ -F: package/kvm-unit-tests/ -F: package/kvmtool/ -F: package/libcsv/ -F: package/libcurl/ -F: package/libeastl/ -F: package/libfcgi/ -F: package/libopenssl/ -F: package/libselinux/ -F: package/libsemanage/ -F: package/libsepol/ -F: package/libssh2/ -F: package/libtalloc/ -F: package/libqmi/ -F: package/lighttpd/ -F: package/logrotate/ -F: package/makedevs/ -F: package/memtester/ -F: package/mii-diag/ -F: package/mrouted/ -F: package/mtd/ -F: package/mtools/ -F: package/nginx-upload/ -F: package/omniorb/ -F: package/openresolv/ -F: package/paxtest/ -F: package/picocom/ -F: package/policycoreutils/ -F: package/proftpd/ -F: package/protobuf-c/ -F: package/protobuf/ -F: package/python-colorama/ -F: package/python-filelock/ -F: package/python-flask-cors/ -F: package/python-iptables/ -F: package/python-ipy/ -F: package/python-iwlib/ -F: package/python-posix-ipc/ -F: package/python-pycairo/ -F: package/python-pysftp/ -F: package/python-tinyrpc/ -F: package/python-txdbus/ -F: package/qoriq-rcw/ -F: package/raptor/ -F: package/rng-tools/ -F: package/rsyslog/ -F: package/setools/ -F: package/sloci-image/ -F: package/smcroute/ -F: package/tclap/ -F: package/tini/ -F: package/uboot-tools/ -F: package/unionfs/ -F: package/valijson/ -F: package/wpa_supplicant/ -F: package/wireless_tools/ -F: package/xen/ -F: package/xml-security-c/ -F: support/testing/tests/fs/test_oci.py -F: support/testing/tests/package/br2-external/clang-compiler-rt/ -F: support/testing/tests/package/br2-external/openjdk/ -F: support/testing/tests/package/test_clang.py -F: support/testing/tests/package/test_openjdk.py -F: support/testing/tests/package/test_opkg/ -F: support/testing/tests/package/test_opkg.py - N: Mauro Condarelli F: package/mc/ F: package/python-autobahn/ From yann.morin.1998 at free.fr Mon Feb 20 21:01:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:10 -0000 Subject: [Buildroot] [git commit branch/next] package/python-setuptools-scm: bump to version 7.1.0 Message-ID: <20230220205235.AC7AA828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3dfa2421e1840758f9ec5292da85a9c884567318 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop no longer required host-python-tomli dependency. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-setuptools-scm/python-setuptools-scm.hash | 4 ++-- package/python-setuptools-scm/python-setuptools-scm.mk | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 8ef125840a..8cfe07d1d9 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.hash +++ b/package/python-setuptools-scm/python-setuptools-scm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json -md5 0df4e7fd923e4983cd65786efaa0e0d0 setuptools_scm-7.0.5.tar.gz -sha256 031e13af771d6f892b941adb6ea04545bbf91ebc5ce68c78aaf3fff6e1fb4844 setuptools_scm-7.0.5.tar.gz +md5 158dc741637fb4fa4b955c62bd2c08be setuptools_scm-7.1.0.tar.gz +sha256 6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 setuptools_scm-7.1.0.tar.gz # sha256 locally computed sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index 87d5dd290d..5a35c35a1f 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,16 +4,15 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 7.0.5 +PYTHON_SETUPTOOLS_SCM_VERSION = 7.1.0 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/d0/43/f038b5009f93bcd77b1b8da9e6d424b739ab17aec9726f3a99eba23d53ca +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/98/12/2c1e579bb968759fc512391473340d0661b1a8c96a59fb7c65b02eec1321 PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = \ host-python-packaging \ - host-python-tomli \ host-python-typing-extensions $(eval $(host-python-package)) From arnout at mind.be Wed Feb 15 21:23:17 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:23:17 +0100 Subject: [Buildroot] [git commit branch/next] package/pipewire: compress-offload needs kernel >= 5.7 Message-ID: <20230220205300.C045C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=854314d15361dc3b69b97ee29d483ee920b9098f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next SND_AUDIOCODEC_A{LAC,PE} are only available since kernel 5.7 and https://github.com/torvalds/linux/commit/0f546d6f0292fb624b4cf0cc70096ddb9ea070e6 resulting in the following build failure since bump to version 0.3.65 in commit 247e2d0eb1e60f483044d58bed58c5ed321528f7 and https://git.buildroot.net/buildroot/commit/?id=247e2d0eb1e60f483044d58bed58c5ed321528f7: ../spa/plugins/alsa/alsa-compress-offload-sink.c:183:11: error: 'SND_AUDIOCODEC_ALAC' undeclared here (not in a function); did you mean 'SND_AUDIOCODEC_AAC'? 183 | { SND_AUDIOCODEC_ALAC, }, | ^~~~~~~~~~~~~~~~~~~ | SND_AUDIOCODEC_AAC Moreover, flac_d is also only available since kernel 5.5 and https://github.com/torvalds/linux/commit/d2522335c92c090bf58531a2b696d7fe80ab2a7a Take this opportunity to make compress offload an explicit option rather than automatic based on the availability of tinycompress. The relationship between them is not obvious. Fixes: - http://autobuild.buildroot.org/results/9ecd9aca5edc3756154da59573157954f06e6537 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/pipewire/Config.in | 12 ++++++++++++ package/pipewire/pipewire.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/pipewire/Config.in b/package/pipewire/Config.in index f038291e87..4929e5d3d1 100644 --- a/package/pipewire/Config.in +++ b/package/pipewire/Config.in @@ -15,6 +15,18 @@ config BR2_PACKAGE_PIPEWIRE if BR2_PACKAGE_PIPEWIRE +config BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD + bool "pipewire Compress-Offload" + depends on !BR2_STATIC_LIBS # tinycompress + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + select BR2_PACKAGE_TINYCOMPRESS + help + Enable ALSA Compress-Offload support + +comment "pipewire Compress-Offload needs a toolchain w/ dynamic library, headers >= 5.7" + depends on BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + config BR2_PACKAGE_PIPEWIRE_EXAMPLES bool "pipewire examples" help diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 976d7783b9..ecf4a035ec 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -215,7 +215,7 @@ else PIPEWIRE_CONF_OPTS += -Dsdl2=disabled endif -ifeq ($(BR2_PACKAGE_TINYCOMPRESS),y) +ifeq ($(BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD),y) PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled PIPEWIRE_DEPENDENCIES += tinycompress else From yann.morin.1998 at free.fr Mon Feb 20 21:01:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:12 -0000 Subject: [Buildroot] [git commit branch/next] package/python-termcolor: bump to version 2.2.0 Message-ID: <20230220205235.D0F458648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e85e54729ece9fd7285c2e4d3f7ea537aabe0a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-termcolor/python-termcolor.hash | 4 ++-- package/python-termcolor/python-termcolor.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-termcolor/python-termcolor.hash b/package/python-termcolor/python-termcolor.hash index 73fb9129ed..9be0ad00c8 100644 --- a/package/python-termcolor/python-termcolor.hash +++ b/package/python-termcolor/python-termcolor.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/termcolor/json -md5 f7f59efd147dd1ec2a25e667616e8a52 termcolor-2.1.1.tar.gz -sha256 67cee2009adc6449c650f6bcf3bdeed00c8ba53a8cda5362733c53e0a39fb70b termcolor-2.1.1.tar.gz +md5 ba0af4ee713cd0030c2d436091af4241 termcolor-2.2.0.tar.gz +sha256 dfc8ac3f350788f23b2947b3e6cfa5a53b630b612e6cd8965a015a776020b99a termcolor-2.2.0.tar.gz # Locally computed sha256 checksums sha256 e79b6bd82962c1330caaa7c42278567b08667777673f8e2371a624d5715d4c0e COPYING.txt diff --git a/package/python-termcolor/python-termcolor.mk b/package/python-termcolor/python-termcolor.mk index d7511d692f..5cbedfb396 100644 --- a/package/python-termcolor/python-termcolor.mk +++ b/package/python-termcolor/python-termcolor.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TERMCOLOR_VERSION = 2.1.1 +PYTHON_TERMCOLOR_VERSION = 2.2.0 PYTHON_TERMCOLOR_SOURCE = termcolor-$(PYTHON_TERMCOLOR_VERSION).tar.gz -PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/19/da/ff1f0906818a5bd2e69e773d88801ca3c9e92d0d7caa99db1665658819ea +PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/e5/4e/b2a54a21092ad2d5d70b0140e4080811bee06a39cc8481651579fe865c89 PYTHON_TERMCOLOR_SETUP_TYPE = pep517 PYTHON_TERMCOLOR_LICENSE = MIT PYTHON_TERMCOLOR_LICENSE_FILES = COPYING.txt From arnout at mind.be Wed Feb 15 21:00:04 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:00:04 +0100 Subject: [Buildroot] [git commit branch/next] toolchain/helper: check the arch sysroot Message-ID: <20230220205300.9AAF086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4433ad8f5c88fafe3f0aebbaff1abdae17aadcb7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since the commit [1], the utils/genrandconfig script improved the configuration randomization used by autobuilders. Since then it can generate a configuration that is not suitable for an external toolchain such the "Codescape IMG GNU Linux Toolchain". Indeed this toolchain can be selected for mips32r5 or mips64r5 while only mips32r2 or mips64r2 are really supported. The toolchain issue will be fixed in a followup change. We want to catch such issue in check_unusable_toolchain function otherwise it is detected late during the sysroot import into staging and trigger a weird error message: ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot/usr//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory This is similar test than for the main sysroot check but this time we have to use the toolchain cflags to check the architecture sysroot. If the architecture sysroot doesn't exist, the toolchain will reply with "libc.a". Either the toolchain is really broken or we used a wrong target architecture variant. In the later case, the toolchain infrastructure will print a meaningful error message. Note: We also may get a similar issue using the toolchain-external-custom package if a toolchain is used with a wrong target architecture variant. Fixes: http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ [1] aeee90ec109b83c42779e6a2617f7d57e25a2b65 Signed-off-by: Romain Naour Cc: Giulio Benetti Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- toolchain/helpers.mk | 11 +++++++++++ toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 1cd7494fdb..24c482923a 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -422,12 +422,16 @@ check_cross_compiler_exists = \ # the host tuple. # - Exclude distro-class toolchains which are not relocatable. # - Exclude broken toolchains which return "libc.a" with -print-file-name. +# - Exclude toolchains used with wrong toolchain cflags or broken toolchains +# which return "libc.a" with -print-file-name and toolchain cflags. # - Exclude toolchains which doesn't support --sysroot option. # # $1: cross-gcc path +# $1: toolchain cflags # check_unusable_toolchain = \ __CROSS_CC=$(strip $1) ; \ + __TOOLCHAIN_CFLAGS=$(strip $2) ; \ vendor=`$${__CROSS_CC} -dumpmachine | cut -f2 -d'-'` ; \ if test "$${vendor}" = "angstrom" ; then \ echo "Angstrom toolchains are not pure toolchains: they contain" ; \ @@ -449,6 +453,13 @@ check_unusable_toolchain = \ echo "Unable to detect the toolchain sysroot, Buildroot cannot use this toolchain." ; \ exit 1 ; \ fi ; \ + libc_a_archsysroot_path=`$${__CROSS_CC} $${__TOOLCHAIN_CFLAGS} -print-file-name=libc.a` ; \ + if test "$${libc_a_archsysroot_path}" = "libc.a" ; then \ + echo "Unable to detect the toolchain architecture sysroot." ; \ + echo "Please check the Target Architecture Variant selected, the toolchains may not support it." ; \ + echo "Buildroot cannot use this toolchain." ; \ + exit 1 ; \ + fi; \ sysroot_dir="$(call toolchain_find_sysroot,$${__CROSS_CC})" ; \ if test -z "$${sysroot_dir}" ; then \ echo "External toolchain doesn't support --sysroot. Cannot use." ; \ diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 299b6008aa..c37f3500d9 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -563,7 +563,7 @@ endif # kernel headers version, type of C library and all C library features. define $(2)_CONFIGURE_CMDS $$(Q)$$(call check_cross_compiler_exists,$$(TOOLCHAIN_EXTERNAL_CC)) - $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC)) + $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC),"$$(TOOLCHAIN_EXTERNAL_CFLAGS)") $$(Q)SYSROOT_DIR="$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC))" ; \ $$(call check_kernel_headers_version,\ $$(BUILD_DIR),\ From yann.morin.1998 at free.fr Mon Feb 20 21:01:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:13 -0000 Subject: [Buildroot] [git commit branch/next] package/python-traitlets: bump to version 5.8.0 Message-ID: <20230220205235.DDE09828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e68d50ffb27acc6b89d55ebc7d19c3daae269a40 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-traitlets/python-traitlets.hash | 4 ++-- package/python-traitlets/python-traitlets.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-traitlets/python-traitlets.hash b/package/python-traitlets/python-traitlets.hash index 0c68e04518..80fa8d4d44 100644 --- a/package/python-traitlets/python-traitlets.hash +++ b/package/python-traitlets/python-traitlets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/traitlets/json -md5 74ad03a0c8dd45d5621b12e0be0ab38f traitlets-5.7.1.tar.gz -sha256 fde8f62c05204ead43c2c1b9389cfc85befa7f54acb5da28529d671175bb4108 traitlets-5.7.1.tar.gz +md5 95b21c721316bbc06922df9d97af5158 traitlets-5.8.0.tar.gz +sha256 6cc57d6dc28c85d5365961726ffd19b538739347749e13ebe34e03323a0e8f84 traitlets-5.8.0.tar.gz # Locally computed sha256 checksums sha256 3dcd47086529bf178cf7d10f35a8c188a1e9710391acecceef700898a4cf099b COPYING.md diff --git a/package/python-traitlets/python-traitlets.mk b/package/python-traitlets/python-traitlets.mk index 8cda56817f..7054557a48 100644 --- a/package/python-traitlets/python-traitlets.mk +++ b/package/python-traitlets/python-traitlets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TRAITLETS_VERSION = 5.7.1 +PYTHON_TRAITLETS_VERSION = 5.8.0 PYTHON_TRAITLETS_SOURCE = traitlets-$(PYTHON_TRAITLETS_VERSION).tar.gz -PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/0b/db/9adbbb2bef9a43ecfa4f1cbcec1d662adade10262328a4b7ef65effc6341 +PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/56/48/0eb99357330a02974d537be8e4096bc58cfac1089e3153570119ccea7a40 PYTHON_TRAITLETS_LICENSE = BSD-3-Clause PYTHON_TRAITLETS_LICENSE_FILES = COPYING.md PYTHON_TRAITLETS_SETUP_TYPE = pep517 From thomas.petazzoni at bootlin.com Wed Feb 15 21:37:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:37:52 +0100 Subject: [Buildroot] [git commit branch/next] package/rtl8812au-aircrack-ng: bump to 2023-02-03 version to fix build failure with Linux 6.1 Message-ID: <20230220205300.E25D58648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d69ea9664f067e5660e13ddf65c52df46f2eca07 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/e128298929fce31374687a566e50b00c150131b8/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index bc3a926314..cdf5f3b4e2 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eed4888da9cfdc0f83ad3335beaf73af33ce0796b0a2637aeec102d47e1eb8f0 rtl8812au-aircrack-ng-e7a4a390ccbdd768411e1b2a8922c47837f76b47.tar.gz +sha256 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index 45a6ce5729..ab3ebe2077 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = e7a4a390ccbdd768411e1b2a8922c47837f76b47 +RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:01:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:14 -0000 Subject: [Buildroot] [git commit branch/next] package/python-orjson: bump to version 3.8.4 Message-ID: <20230220205236.0C044828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=627c38caf07de44e26b187e40f0cfed9e2e6591a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-orjson/python-orjson.hash | 2 +- package/python-orjson/python-orjson.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-orjson/python-orjson.hash b/package/python-orjson/python-orjson.hash index 515590795b..f1298c05ce 100644 --- a/package/python-orjson/python-orjson.hash +++ b/package/python-orjson/python-orjson.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 0c8d161dfd8b9e4133beabd81e3e1473c246efe55abec571845f72a2ba7b74e4 orjson-3.8.3.tar.gz +sha256 b932fc1e43598fb91022b1dc651afeaef650793a2a590ca4fbeef57a3808abf5 orjson-3.8.4.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/python-orjson/python-orjson.mk b/package/python-orjson/python-orjson.mk index bda0a8ab48..8eeadecb3d 100644 --- a/package/python-orjson/python-orjson.mk +++ b/package/python-orjson/python-orjson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ORJSON_VERSION = 3.8.3 +PYTHON_ORJSON_VERSION = 3.8.4 PYTHON_ORJSON_SOURCE = orjson-$(PYTHON_ORJSON_VERSION).tar.gz -PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/1c/b9/a0b4fb195ded02820e0a933ffe28b782b7e5ef7a4f8c1e1c742d619548e4 +PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/8f/2d/ae31eddf7e097eec5e25c7da954ef6e944f4dbf79153676f94cea3dc5116 PYTHON_ORJSON_SETUP_TYPE = pep517 PYTHON_ORJSON_LICENSE = Apache-2.0 or MIT PYTHON_ORJSON_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT From thomas.petazzoni at bootlin.com Wed Feb 15 21:38:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:38:54 +0100 Subject: [Buildroot] [git commit branch/next] package/open-iscsi: fix libressl build Message-ID: <20230220205301.05D0886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=295baf16a181b110eba09007f6ad7ac384914581 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following libressl build failure raised since the addition of the package in commit 2a571acddd0badaf9636649d98fd095757878348: /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' Fixes: - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-SHA3-is-not-supported-by-libressl.patch | 144 +++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch new file mode 100644 index 0000000000..0423179d93 --- /dev/null +++ b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch @@ -0,0 +1,144 @@ +From 29a4c3a518d13bfc0a07915e7e87fbec2b66597c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 13 Feb 2023 08:55:11 +0100 +Subject: [PATCH] SHA3 is not supported by libressl + +Disable SHA3 with libressl as it is not supported resulting in the +following build failure: + +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': +auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' + +Fixes: + - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/open-iscsi/open-iscsi/pull/396] +--- + libopeniscsiusr/idbm.h | 2 ++ + usr/auth.c | 13 ++++++++++++- + usr/auth.h | 4 ++++ + usr/idbm.c | 2 ++ + 4 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h +index be5986f..1043b27 100644 +--- a/libopeniscsiusr/idbm.h ++++ b/libopeniscsiusr/idbm.h +@@ -56,7 +56,9 @@ enum iscsi_chap_algs { + ISCSI_AUTH_CHAP_ALG_MD5 = 5, + ISCSI_AUTH_CHAP_ALG_SHA1 = 6, + ISCSI_AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + ISCSI_AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5, + }; + +diff --git a/usr/auth.c b/usr/auth.c +index 46c328e..5f50e26 100644 +--- a/usr/auth.c ++++ b/usr/auth.c +@@ -181,9 +181,11 @@ static int auth_hash_init(EVP_MD_CTX **context, int chap_alg) { + case AUTH_CHAP_ALG_SHA256: + digest = EVP_sha256(); + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + digest = EVP_sha3_256(); + break; ++#endif + } + + if (*context == NULL) +@@ -298,7 +300,9 @@ static int + acl_chk_chap_alg_optn(int chap_algorithm) + { + if (chap_algorithm == AUTH_OPTION_NONE || ++#ifndef LIBRESSL_VERSION_NUMBER + chap_algorithm == AUTH_CHAP_ALG_SHA3_256 || ++#endif + chap_algorithm == AUTH_CHAP_ALG_SHA256 || + chap_algorithm == AUTH_CHAP_ALG_SHA1 || + chap_algorithm == AUTH_CHAP_ALG_MD5) +@@ -711,9 +715,11 @@ acl_chk_chap_alg_key(struct iscsi_acl *client) + case AUTH_CHAP_ALG_SHA256: + client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN; + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN; + break; ++#endif + } + return; + } +@@ -862,7 +868,10 @@ acl_local_auth(struct iscsi_acl *client) + client->local_state = AUTH_LOCAL_STATE_ERROR; + client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT; + break; +- } else if ((client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++ } else if ( ++#ifndef LIBRESSL_VERSION_NUMBER ++ (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++#endif + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) { +@@ -1824,6 +1833,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA256 due to crypto lib configuration"); + } + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) { + value_list[i++] = AUTH_CHAP_ALG_SHA3_256; +@@ -1832,6 +1842,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA3-256 due to crypto lib configuration"); + } + break; ++#endif + case ~0: + /* unset value in array, just ignore */ + break; +diff --git a/usr/auth.h b/usr/auth.h +index 16cdb24..9357772 100644 +--- a/usr/auth.h ++++ b/usr/auth.h +@@ -32,7 +32,9 @@ enum { + AUTH_CHAP_MD5_RSP_LEN = 16, + AUTH_CHAP_SHA1_RSP_LEN = 20, + AUTH_CHAP_SHA256_RSP_LEN = 32, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_SHA3_256_RSP_LEN = 32, ++#endif + AUTH_CHAP_RSP_MAX = 32, + }; + +@@ -67,7 +69,9 @@ enum { + AUTH_CHAP_ALG_MD5 = 5, + AUTH_CHAP_ALG_SHA1 = 6, + AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5 + }; + +diff --git a/usr/idbm.c b/usr/idbm.c +index 90bc142..082e1c6 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -200,7 +200,9 @@ static struct int_list_tbl { + { "MD5", AUTH_CHAP_ALG_MD5 }, + { "SHA1", AUTH_CHAP_ALG_SHA1 }, + { "SHA256", AUTH_CHAP_ALG_SHA256 }, ++#ifndef LIBRESSL_VERSION_NUMBER + { "SHA3-256", AUTH_CHAP_ALG_SHA3_256 }, ++#endif + }; + + static void +-- +2.39.0 + From yann.morin.1998 at free.fr Mon Feb 20 21:01:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:15 -0000 Subject: [Buildroot] [git commit branch/next] package/python-cryptography: bump to version 39.0.0 Message-ID: <20230220205235.F1A388648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c81ab9f8a978ee6d2d6a882d6e9ba6ce93dd6a23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cryptography/python-cryptography.hash | 2 +- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index a01c8810e3..3f2204eeb1 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 2abbeb6d42e8844de036bf2e0d78a42feeee1d57ebf29a07684490f98bdcab37 cryptography-38.0.4.tar.gz +sha256 2d00e023261719f85caf360ee061d37ee27654a0344d1376441c8a29ea3bac86 cryptography-39.0.0.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 4254fa3557..6868ff4633 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 38.0.4 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.0 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/e3/3f/41186b1f2fd86a542d399175f6b8e43f82cd4dfa51235a0b030a042b811a +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/12/e3/c46c274cf466b24e5d44df5d5cd31a31ff23e57f074a2bb30931a8c9b01a PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From peter at korsgaard.com Mon Feb 20 17:07:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:07:55 +0100 Subject: [Buildroot] [git commit branch/next] package/libostree: bump to version 2023.1 Message-ID: <20230220205303.35D088648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d37b3916a1ce75085da8232db95cfd354137e540 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index ed31109fdb..63dfe98d80 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f libostree-2022.7.tar.xz +sha256 dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55 libostree-2023.1.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 8e8ec63213..4b17fcf391 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2022.7 +LIBOSTREE_VERSION = 2023.1 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From peter at korsgaard.com Mon Feb 20 21:01:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:01:30 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXpm: security bump version to 3.5.15 Message-ID: <20230220205237.487DC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0dfd717f3ff888b4ab6d8c40bb6a01a939370cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003313.html Fixes CVE-2022-4883, CVE-2022-44617 & CVE-2022-46285: https://lists.x.org/archives/xorg-announce/2023-January/003312.html Updated license hash due to upstream commit: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/501494c6c68a84114fdd0b44d4b67ef9cde776c9 Added configure option to disable compressed pixmaps support: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/4841039e5385f264d12757903894f47c64f59361 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 8 ++++---- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index 9ccfb4c8de..733c404543 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003261.html -sha256 f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2 libXpm-3.5.14.tar.xz -sha512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-January/003313.html +sha256 60bb906c5c317a6db863e39b69c4a83fdbd2ae2154fcf47640f8fefc9fdfd1c1 libXpm-3.5.15.tar.xz +sha512 955d716fcea2c9d868ab941c56f017b39bfa0f47fd2904e9b04c6a9be17f23f8b8c906da9c90a89a789f1f399d419641705ff5b6f9921820e34d4807c7a1992f libXpm-3.5.15.tar.xz # Locally calculated -sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING +sha256 a80d706759624a04aa90fd62bc644a360fc3d72e08dcbfb129f167c11ca285de COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 417dcfec38..970ec93407 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.14 +XLIB_LIBXPM_VERSION = 3.5.15 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT @@ -16,6 +16,7 @@ XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(TARGET_NLS_DEPENDENCIES) XLIB_LIBXPM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +XLIB_LIBXPM_CONF_OPTS = --disable-open-zfile ifeq ($(BR2_SYSTEM_ENABLE_NLS),) XLIB_LIBXPM_CONF_ENV += ac_cv_search_gettext=no From peter at korsgaard.com Mon Feb 20 17:10:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:10:37 +0100 Subject: [Buildroot] [git commit branch/next] package/python-django: security bump to version 4.1.7 Message-ID: <20230220205303.4218081979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a85ed5d21c14cbe3ec2864206fe792152598e4db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2023-23969 and CVE-2023-24580 https://docs.djangoproject.com/en/dev/releases/4.1.6 https://docs.djangoproject.com/en/dev/releases/4.1.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 1d3035bb98..cb03b33bfe 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 6b6a47d7478ead15b0a0835841c433dc Django-4.1.5.tar.gz -sha256 ff56ebd7ead0fd5dbe06fe157b0024a7aaea2e0593bb3785fb594cf94dad58ef Django-4.1.5.tar.gz +md5 626f96c63ddfab24bab90d80c87a7aad Django-4.1.7.tar.gz +sha256 44f714b81c5f190d9d2ddad01a532fe502fa01c4cb8faf1d081f4264ed15dcd8 Django-4.1.7.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index e08de68954..e8c91cf51f 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.5 +PYTHON_DJANGO_VERSION = 4.1.7 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/41/c8/b3c469353f9d1b7f0e99b45520582b891da02cd87408bc867affa6e039a3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/9f/a7/07939866241b7e8f8d3bf164b7d6ad428163723e29dd472700f8ab0e5fd5 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:01:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:31 -0000 Subject: [Buildroot] [git commit branch/next] package/cantarell: switch to https download Message-ID: <20230220205237.90BD381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e483a7340a4aeecf1d362328e06c2fcdec1dcae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/cantarell/cantarell.hash | 2 +- package/cantarell/cantarell.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cantarell/cantarell.hash b/package/cantarell/cantarell.hash index 49b4634063..18e0fc2cfa 100644 --- a/package/cantarell/cantarell.hash +++ b/package/cantarell/cantarell.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.25.sha256sum +# From https://download.gnome.org/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.25.sha256sum sha256 14a228aa0b516dfc367b434a850f955a00c57fc549cbb05348e2b150196a737f cantarell-fonts-0.0.25.tar.xz # locally computed sha256 79a9d6198c0d9192c1b0bf55bcbc404a39390bd0d8c650cf20d652c2eaa284d8 COPYING diff --git a/package/cantarell/cantarell.mk b/package/cantarell/cantarell.mk index 2769b35c1f..59e65b25c1 100644 --- a/package/cantarell/cantarell.mk +++ b/package/cantarell/cantarell.mk @@ -6,7 +6,7 @@ CANTARELL_VERSION_MAJOR = 0.0 CANTARELL_VERSION = $(CANTARELL_VERSION_MAJOR).25 -CANTARELL_SITE = http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/$(CANTARELL_VERSION_MAJOR) +CANTARELL_SITE = https://download.gnome.org/sources/cantarell-fonts/$(CANTARELL_VERSION_MAJOR) CANTARELL_SOURCE = cantarell-fonts-$(CANTARELL_VERSION).tar.xz CANTARELL_DEPENDENCIES = host-pkgconf CANTARELL_LICENSE = OFL-1.1 From peter at korsgaard.com Mon Feb 20 17:17:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:17:14 +0100 Subject: [Buildroot] [git commit branch/next] Revert "xorg-server: not available with musl on ARM" Message-ID: <20230220205303.72E9F81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b21cd8be3f9469d6bdbbaed951ae7c59efb46a24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit 9daafbcb75a7ab593ce8a1f21c6149c8437bc0bc. Fixed since https://gitlab.freedesktop.org/xorg/xserver/-/issues/840 (xserver 1.20.6). Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 865917c4ec..b933bd0285 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -1,11 +1,6 @@ -comment "xorg-server needs a glibc or uClibc toolchain" - depends on BR2_arm && BR2_TOOLCHAIN_USES_MUSL - config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" depends on BR2_USE_MMU # fork() - # xserver uses inb/outb on arm, which aren't available with musl - depends on !(BR2_arm && BR2_TOOLCHAIN_USES_MUSL) # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. From yann.morin.1998 at free.fr Mon Feb 20 21:01:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:32 -0000 Subject: [Buildroot] [git commit branch/next] package/atkmm: switch to https download Message-ID: <20230220205237.7954B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11bb66247bc364ab46b9bf10d769cecdb7b6fdc0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/atkmm/atkmm.hash | 2 +- package/atkmm/atkmm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/atkmm/atkmm.hash b/package/atkmm/atkmm.hash index f965ad29cb..9e2bb2830c 100644 --- a/package/atkmm/atkmm.hash +++ b/package/atkmm/atkmm.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atkmm/2.36/atkmm-2.36.1.sha256sum +# From https://download.gnome.org/sources/atkmm/2.36/atkmm-2.36.1.sha256sum sha256 e11324bfed1b6e330a02db25cecc145dca03fb0dff47f0710c85e317687da458 atkmm-2.36.1.tar.xz # locally computed sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk index 3bcb941c9f..7ceb87b047 100644 --- a/package/atkmm/atkmm.mk +++ b/package/atkmm/atkmm.mk @@ -7,7 +7,7 @@ ATKMM_VERSION_MAJOR = 2.36 ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).1 ATKMM_SOURCE = atkmm-$(ATKMM_VERSION).tar.xz -ATKMM_SITE = http://ftp.gnome.org/pub/gnome/sources/atkmm/$(ATKMM_VERSION_MAJOR) +ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR) ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) ATKMM_LICENSE_FILES = COPYING COPYING.tools ATKMM_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sun Feb 19 20:57:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:57:47 +0100 Subject: [Buildroot] [git commit branch/next] package/catch2: bump to version 3.3.1 Message-ID: <20230220205302.D1B728648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3a462e85a786401964d522124e4f431d79339e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next raise the minimum gcc to 5 as stated in release notes for 3.1.0 [0]. [0] https://github.com/catchorg/Catch2/releases/tag/v3.1.0 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/catch2/Config.in | 6 +++--- package/catch2/catch2.hash | 2 +- package/catch2/catch2.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/catch2/Config.in b/package/catch2/Config.in index 2f53d197b2..40d2d12434 100644 --- a/package/catch2/Config.in +++ b/package/catch2/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_CATCH2 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 depends on BR2_USE_MMU # fork() help Catch2 is mainly a unit testing framework for C++, but it @@ -21,8 +21,8 @@ config BR2_PACKAGE_CATCH2 https://github.com/catchorg/Catch2 -comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash index 664164fd76..b533792f8f 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2106bccfec18c8ce673623d56780220e38527dd8f283ccba26aa4b8758737d0e catch2-3.1.1.tar.gz +sha256 d90351cdc55421f640c553cfc0875a8c834428679444e8062e9187d05b18aace catch2-3.3.1.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index ab62cc943b..6e4af3d670 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.1.1 +CATCH2_VERSION = 3.3.1 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO From yann.morin.1998 at free.fr Mon Feb 20 21:01:33 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:33 -0000 Subject: [Buildroot] [git commit branch/next] package/gdk-pixbuf: switch to https download Message-ID: <20230220205237.AA1CF81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b0d9d97b3434e41879046c0994dd1b5708c46007 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gdk-pixbuf/gdk-pixbuf.hash | 2 +- package/gdk-pixbuf/gdk-pixbuf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.hash b/package/gdk-pixbuf/gdk-pixbuf.hash index 23a7c3fc05..c3953e15a6 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.hash +++ b/package/gdk-pixbuf/gdk-pixbuf.hash @@ -1,3 +1,3 @@ -# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.sha256sum +# From https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.sha256sum sha256 ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b gdk-pixbuf-2.42.10.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 561e191569..e041d2cbde 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -7,7 +7,7 @@ GDK_PIXBUF_VERSION_MAJOR = 2.42 GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).10 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz -GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) +GDK_PIXBUF_SITE = https://download.gnome.org/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) GDK_PIXBUF_LICENSE = LGPL-2.1+ GDK_PIXBUF_LICENSE_FILES = COPYING GDK_PIXBUF_CPE_ID_VENDOR = gnome From thomas.petazzoni at bootlin.com Sun Feb 19 21:09:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 22:09:25 +0100 Subject: [Buildroot] [git commit branch/next] package/s390-tools: bump to version 2.26.0 Message-ID: <20230220205302.DC9AC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d782c0682f559d407e64698470b511512a5bdc78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- 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 a0dde477c3..37b67c5cb1 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ccb20954e748309a50fd56edd9abd94c6f897081e9a1a33e9d965a56f650990d s390-tools-2.25.0.tar.gz +sha256 da81c55fb11d84923c0ebaed703f557052eb1a273495f60ebe3d20a74627303e s390-tools-2.26.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index cb6278dfb8..8cd5491405 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.25.0 +S390_TOOLS_VERSION = 2.26.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 yann.morin.1998 at free.fr Mon Feb 20 21:01:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:34 -0000 Subject: [Buildroot] [git commit branch/next] package/gdk-pixbuf-xlib: switch to https download Message-ID: <20230220205237.B5224828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14d70068be395f47a034e4275e9a26e19b2804db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash | 2 +- package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash index e7f74e2b4b..7298ef50c4 100644 --- a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-2.40.2.sha256sum +# From https://download.gnome.org/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 diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk index 3e61373b3a..5af33c6aea 100644 --- a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk @@ -7,7 +7,7 @@ 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_SITE = https://download.gnome.org/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 From peter at korsgaard.com Sun Feb 19 17:10:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:10:18 +0100 Subject: [Buildroot] [git commit branch/next] package/wlroots: add XWayland support Message-ID: <20230220205302.7F6B286496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5945a71d87c988cb6b864600dd8dbecae0ef30fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The new option enables the XWayland support, so X11 application can be running on a wlroots based compositor. Also, do not enable the XWayland support if the X11 backend is active, as it is unrelated to it. Signed-off-by: Raphael Pavlidis Signed-off-by: Peter Korsgaard --- package/wlroots/Config.in | 19 +++++++++++++++++++ package/wlroots/wlroots.mk | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 84a4ef846e..b2d3f3c3b1 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -41,4 +41,23 @@ config BR2_PACKAGE_WLROOTS_X11 help Support Wayland sessions nested inside a X11 window +config BR2_PACKAGE_WLROOTS_XWAYLAND + bool "XWayland support" + depends on BR2_PACKAGE_XORG7 # libxcb, xcb-util-wm, xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_XWAYLAND + help + Support for running X11 applications under wayland + +comment "XWayland support needs X.org enabled" + depends on !BR2_PACKAGE_XORG7 + +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + endif diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 4f14d20b11..5b930a51be 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -30,8 +30,12 @@ WLROOTS_BACKENDS = libinput drm ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) WLROOTS_BACKENDS += x11 -WLROOTS_CONF_OPTS += -Dxwayland=enabled WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 +endif + +ifeq ($(BR2_PACKAGE_WLROOTS_XWAYLAND),y) +WLROOTS_CONF_OPTS += -Dxwayland=enabled +WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xwayland else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif From yann.morin.1998 at free.fr Mon Feb 20 21:01:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:35 -0000 Subject: [Buildroot] [git commit branch/next] package/gobject-introspection: switch to https download Message-ID: <20230220205237.D6F8281979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01e4f72b6bc8120437dd462673fdfccb4ef7df20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gobject-introspection/gobject-introspection.hash | 2 +- package/gobject-introspection/gobject-introspection.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index 8f9d323d9a..fa3fdfe306 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,4 +1,4 @@ -#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.70/gobject-introspection-1.72.0.sha256sum +#From https://download.gnome.org/sources/gobject-introspection/1.72/gobject-introspection-1.72.0.sha256sum sha256 02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc gobject-introspection-1.72.0.tar.xz sha256 faa2e414bd5f91d2d2c39e85c7cc3f2ccde05c3306f96b404f8ed8cf0266c279 COPYING.LGPL sha256 4c1cedcbb4a12ea964f1160dbbf36099e5a59b96129a99a1a1a61f2cb09271fb COPYING.GPL diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 12e5b81b1b..37e1b2c64a 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -6,7 +6,7 @@ GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.72 GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 -GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) +GOBJECT_INTROSPECTION_SITE = https://download.gnome.org/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz GOBJECT_INTROSPECTION_INSTALL_STAGING = YES GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause From peter at korsgaard.com Mon Feb 20 17:05:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:05:58 +0100 Subject: [Buildroot] [git commit branch/next] package/libcurl: bump version to 7.88.0 Message-ID: <20230220205303.216337FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14ca6b5fdb6a5e0fa99b04461240772d93076b2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://curl.se/changes.html#7_88_0 Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/2bc1d775f510196154283374284f98d3eae03544#diff-400d38e5cfee181230373a8b02d38f50271a5bf62c62410382efddb8e8b19e22 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 230ec8d704..714b02acb0 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.87.0.tar.xz.asc +# https://curl.se/download/curl-7.88.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff curl-7.87.0.tar.xz -sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING +sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 994b685d34..eb481e4782 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.87.0 +LIBCURL_VERSION = 7.88.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From yann.morin.1998 at free.fr Mon Feb 20 21:01:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:37 -0000 Subject: [Buildroot] [git commit branch/next] package/gssdp: switch to https download Message-ID: <20230220205237.EE956828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9086723227c535010986d831954ec932d3e783fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gssdp/gssdp.hash | 2 +- package/gssdp/gssdp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gssdp/gssdp.hash b/package/gssdp/gssdp.hash index c9bbd66083..34ccfa8044 100644 --- a/package/gssdp/gssdp.hash +++ b/package/gssdp/gssdp.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.4/gssdp-1.4.0.1.sha256sum: +# Hash from: https://download.gnome.org/sources/gssdp/1.4/gssdp-1.4.0.1.sha256sum: sha256 8676849d57fb822b8728856dbadebf3867f89ee47a0ec47a20045d011f431582 gssdp-1.4.0.1.tar.xz # Hash for license file: diff --git a/package/gssdp/gssdp.mk b/package/gssdp/gssdp.mk index f1fed3713d..f7ebb44acd 100644 --- a/package/gssdp/gssdp.mk +++ b/package/gssdp/gssdp.mk @@ -7,7 +7,7 @@ GSSDP_VERSION_MAJOR = 1.4 GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).0.1 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz -GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR) +GSSDP_SITE = https://download.gnome.org/sources/gssdp/$(GSSDP_VERSION_MAJOR) GSSDP_LICENSE = LGPL-2.1+ GSSDP_LICENSE_FILES = COPYING GSSDP_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 17:13:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:13:07 +0100 Subject: [Buildroot] [git commit branch/next] package/rockchip-mali: needs C++ Message-ID: <20230220205303.6693C86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f1858e859833da272fce70bf445ca1b53ebffe1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next rockchip-mali pre-built libraries needs C++ since the addition of the package in commit 97c74a73e5dee17530647f89b2c7d8692781eb14: readelf -a output/build/rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427/lib/aarch64-linux-gnu/libmali-bifrost-g31-rxp0-gbm.so|grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libpthread.so.0] 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] 0x0000000000000001 (NEEDED) Shared library: [librt.so.1] 0x0000000000000001 (NEEDED) Shared library: [libdrm.so.2] 0x0000000000000001 (NEEDED) Shared library: [libm.so.6] 0x0000000000000001 (NEEDED) Shared library: [libstdc++.so.6] 0x0000000000000001 (NEEDED) Shared library: [libgcc_s.so.1] 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] While at it, add a comment when dependencies are not met Fixes: - No autobuilder failures (yet), found when debugging an issue with rockchip-mali and glslsandbox-player Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/rockchip-mali/Config.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/rockchip-mali/Config.in b/package/rockchip-mali/Config.in index d616284911..5a23954af3 100644 --- a/package/rockchip-mali/Config.in +++ b/package/rockchip-mali/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ROCKCHIP_MALI bool "rockchip-mali" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_ARM_EABIHF || BR2_aarch64 # lidbrm. This would normally need a Config.in comment, but @@ -30,3 +31,8 @@ config BR2_PACKAGE_PROVIDES_LIBGBM default "rockchip-mali" endif + +comment "rockchip-mali needs a glibc toolchain w/ C++, threads" + depends on BR2_ARM_EABIHF || BR2_aarch64 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS From yann.morin.1998 at free.fr Mon Feb 20 21:01:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:37 -0000 Subject: [Buildroot] [git commit branch/next] package/gtkmm3: switch to https download Message-ID: <20230220205238.1093E81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30b916546b7c5000130db461880e7d21b5741952 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gtkmm3/gtkmm3.hash | 2 +- package/gtkmm3/gtkmm3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gtkmm3/gtkmm3.hash b/package/gtkmm3/gtkmm3.hash index 26687507f4..fc7e33339e 100644 --- a/package/gtkmm3/gtkmm3.hash +++ b/package/gtkmm3/gtkmm3.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.0.sha256sum +# From https://download.gnome.org/sources/gtkmm/3.22/gtkmm-3.22.0.sha256sum sha256 05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5 gtkmm-3.22.0.tar.xz # Locally computed sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gtkmm3/gtkmm3.mk b/package/gtkmm3/gtkmm3.mk index 009889142e..d717c08bd8 100644 --- a/package/gtkmm3/gtkmm3.mk +++ b/package/gtkmm3/gtkmm3.mk @@ -7,7 +7,7 @@ GTKMM3_VERSION_MAJOR = 3.22 GTKMM3_VERSION = $(GTKMM3_VERSION_MAJOR).0 GTKMM3_SOURCE = gtkmm-$(GTKMM3_VERSION).tar.xz -GTKMM3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtkmm/$(GTKMM3_VERSION_MAJOR) +GTKMM3_SITE = https://download.gnome.org/sources/gtkmm/$(GTKMM3_VERSION_MAJOR) GTKMM3_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GTKMM3_LICENSE_FILES = COPYING COPYING.tools GTKMM3_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 17:11:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:11:07 +0100 Subject: [Buildroot] [git commit branch/next] package/python-cryptography: security bump to version 39.0.1 Message-ID: <20230220205303.4C7047FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67c967c2d16c29f193fde43b3c48edf0911baccd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2023-23931: cryptography is a package designed to expose cryptographic primitives and recipes to Python developers. In affected versions `Cipher.update_into` would accept Python objects which implement the buffer protocol, but provide only immutable buffers. This would allow immutable objects (such as `bytes`) to be mutated, thus violating fundamental rules of Python and resulting in corrupted output. This now correctly raises an exception. This issue has been present since `update_into` was originally introduced in cryptography 1.8. https://github.com/pyca/cryptography/security/advisories/GHSA-w7pp-m8wf-vj6r https://cryptography.io/en/latest/changelog/#v39-0-1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-cryptography/python-cryptography.hash | 2 +- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 3f2204eeb1..a23944a06f 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 2d00e023261719f85caf360ee061d37ee27654a0344d1376441c8a29ea3bac86 cryptography-39.0.0.tar.gz +sha256 531348679f144d118156be5b17ddac750974cdcd9f44bb0a7cfd7ddcfee79c80 cryptography-39.0.1.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 6868ff4633..a130b2d10d 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 39.0.0 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.1 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/12/e3/c46c274cf466b24e5d44df5d5cd31a31ff23e57f074a2bb30931a8c9b01a +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/6a/f5/a729774d087e50fffd1438b3877a91e9281294f985bda0fd15bf99016c78 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From yann.morin.1998 at free.fr Mon Feb 20 21:01:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:39 -0000 Subject: [Buildroot] [git commit branch/next] package/gtksourceview: switch to https download Message-ID: <20230220205238.1B055828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76c0ac9725cb798487ec44b1b67057d5cb895070 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gtksourceview/gtksourceview.hash | 2 +- package/gtksourceview/gtksourceview.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gtksourceview/gtksourceview.hash b/package/gtksourceview/gtksourceview.hash index 2e3c430ac0..7a9cf00655 100644 --- a/package/gtksourceview/gtksourceview.hash +++ b/package/gtksourceview/gtksourceview.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/gtksourceview-3.24.7.sha256sum: +# Hash from: https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.7.sha256sum: sha256 a5c20d3a6347533689358f3ea52486409f6dd41d5a69c65eab7570cfaffee8e6 gtksourceview-3.24.7.tar.xz # Locally computed: diff --git a/package/gtksourceview/gtksourceview.mk b/package/gtksourceview/gtksourceview.mk index ae1d3ff295..3f5aaea4ae 100644 --- a/package/gtksourceview/gtksourceview.mk +++ b/package/gtksourceview/gtksourceview.mk @@ -8,7 +8,7 @@ GTKSOURCEVIEW_VERSION_MAJOR = 3.24 GTKSOURCEVIEW_VERSION = $(GTKSOURCEVIEW_VERSION_MAJOR).7 GTKSOURCEVIEW_SOURCE = gtksourceview-$(GTKSOURCEVIEW_VERSION).tar.xz GTKSOURCEVIEW_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/gtksourceview/$(GTKSOURCEVIEW_VERSION_MAJOR) + https://download.gnome.org/sources/gtksourceview/$(GTKSOURCEVIEW_VERSION_MAJOR) GTKSOURCEVIEW_LICENSE = LGPL-2.1+ GTKSOURCEVIEW_LICENSE_FILES = COPYING GTKSOURCEVIEW_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sun Feb 19 20:54:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:54:39 +0100 Subject: [Buildroot] [git commit branch/next] package/speechd: disable kali support Message-ID: <20230220205302.ADFCA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8797f3fb272e9c1a5fe6a1953cacf6e5065a133a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable kali support as it is not needed and raises the following build failure without C++ since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: CXX sd_kali-kali.o /bin/sh: line 1: no: command not found Fixes: - http://autobuild.buildroot.org/results/2f6c8b3674753d6a9f165117c70e7dad88505505 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 0d43e4b6fb..46c0672f59 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,6 +12,7 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile +SPEECHD_CONF_OPTS = --without-kali # fix missing config.rpath (needed for autoreconf) in the codebase define SPEECHD_TOUCH_CONFIG_RPATH From yann.morin.1998 at free.fr Mon Feb 20 21:01:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:40 -0000 Subject: [Buildroot] [git commit branch/next] package/gupnp-dlna: switch to https download Message-ID: <20230220205238.30B2F81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b443913bcc4809c3fd29d8fa12e940e51225913a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gupnp-dlna/gupnp-dlna.hash | 2 +- package/gupnp-dlna/gupnp-dlna.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gupnp-dlna/gupnp-dlna.hash b/package/gupnp-dlna/gupnp-dlna.hash index dd9f2e4e4f..c7cab2601c 100644 --- a/package/gupnp-dlna/gupnp-dlna.hash +++ b/package/gupnp-dlna/gupnp-dlna.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-dlna/0.12/gupnp-dlna-0.12.0.sha256sum: +# Hash from: https://download.gnome.org/sources/gupnp-dlna/0.12/gupnp-dlna-0.12.0.sha256sum: sha256 3d53b96f85bc5628d33e367ec9bf2adb38ef2b34d7ad0434a6ba0cf4ad9048e6 gupnp-dlna-0.12.0.tar.xz # Locally computed: diff --git a/package/gupnp-dlna/gupnp-dlna.mk b/package/gupnp-dlna/gupnp-dlna.mk index 64146f894b..0064700fd2 100644 --- a/package/gupnp-dlna/gupnp-dlna.mk +++ b/package/gupnp-dlna/gupnp-dlna.mk @@ -8,7 +8,7 @@ GUPNP_DLNA_VERSION_MAJOR = 0.12 GUPNP_DLNA_VERSION = $(GUPNP_DLNA_VERSION_MAJOR).0 GUPNP_DLNA_SOURCE = gupnp-dlna-$(GUPNP_DLNA_VERSION).tar.xz GUPNP_DLNA_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/gupnp-dlna/$(GUPNP_DLNA_VERSION_MAJOR) + https://download.gnome.org/sources/gupnp-dlna/$(GUPNP_DLNA_VERSION_MAJOR) # COPYING contains LGPL-2.1 but all source files contain LPGL-2.0+ GUPNP_DLNA_LICENSE = LGPL-2.0+ GUPNP_DLNA_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 21:01:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:01:59 -0000 Subject: [Buildroot] [git commit branch/next] package/libosmium: bump version to 2.19.0 Message-ID: <20230220205239.DDFF586496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3621312a840306e38573c667459b5dee4db19531 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release-notes: https://github.com/osmcode/libosmium/releases/tag/v2.19.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/libosmium/libosmium.hash | 2 +- package/libosmium/libosmium.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libosmium/libosmium.hash b/package/libosmium/libosmium.hash index cb53a91c67..b055aa21ea 100644 --- a/package/libosmium/libosmium.hash +++ b/package/libosmium/libosmium.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c05a3e95c9c811521ebad8637e90f43ab8fb053b310875acce741cc4c17d6f59 libosmium-2.18.0.tar.gz +sha256 6911a8ca8e81d49205357177982df908af11376919f93b814cccf02f1d4d63e3 libosmium-2.19.0.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE diff --git a/package/libosmium/libosmium.mk b/package/libosmium/libosmium.mk index f7ced04de3..2725130e72 100644 --- a/package/libosmium/libosmium.mk +++ b/package/libosmium/libosmium.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSMIUM_VERSION = 2.18.0 +LIBOSMIUM_VERSION = 2.19.0 LIBOSMIUM_SITE = $(call github,osmcode,libosmium,v$(LIBOSMIUM_VERSION)) LIBOSMIUM_LICENSE = BSL-1.0 LIBOSMIUM_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:02:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:02:00 -0000 Subject: [Buildroot] [git commit branch/next] package/systemd: reenable utmp support Message-ID: <20230220205239.A9F24828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6789e8b8b5f39e0efb9f4a9af492de416c121c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch provides a way to enable utmp support when using systemd, with it disabled by default, as some security concerns may apply. Still, there are cases where having utmp is desirable, even though it is rare, so let's make this configurable. See commit 32f53bdfb482d0d78308e548c654898089b5c183. Signed-off-by: Casey Reeves Signed-off-by: Yann E. MORIN --- package/systemd/Config.in | 20 ++++++++++++++++++++ package/systemd/systemd.mk | 9 +++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 45a9e2d644..33ac03e584 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -518,6 +518,26 @@ config BR2_PACKAGE_SYSTEMD_USERDB https://www.freedesktop.org/software/systemd/man/systemd-userdbd.service.html +config BR2_PACKAGE_SYSTEMD_UTMP + bool "enable utmp support" + help + systemd-update-utmp-runlevel.service is a service that writes + SysV runlevel changes to utmp and wtmp, as well as the audit + logs, as they occur. systemd-update-utmp.service does the + same for system reboots and shutdown requests. + + https://www.freedesktop.org/software/systemd/man/systemd-update-utmp.service.html + + Utmp keeps track of what users do on the system (where they + logged from, on which terminal, ...) along with a general + status of the system (list of reboots, current uptime, current + number of users logged in). + + You should only enable this if your system will have actual + users who log in. + + https://man7.org/linux/man-pages/man5/utmp.5.html + config BR2_PACKAGE_SYSTEMD_VCONSOLE bool "enable vconsole tool" default y diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b96873b73f..f191542866 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -87,8 +87,7 @@ SYSTEMD_CONF_OPTS += \ -Dtelinit-path= \ -Dtests=false \ -Dtmpfiles=true \ - -Dumount-path=/usr/bin/umount \ - -Dutmp=false + -Dumount-path=/usr/bin/umount SYSTEMD_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_OPTIMIZE_FAST),y) @@ -331,6 +330,12 @@ else SYSTEMD_CONF_OPTS += -Dbinfmt=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_UTMP),y) +SYSTEMD_CONF_OPTS += -Dutmp=true +else +SYSTEMD_CONF_OPTS += -Dutmp=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_VCONSOLE),y) SYSTEMD_CONF_OPTS += -Dvconsole=true else From peter at korsgaard.com Mon Feb 20 21:02:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:00 -0000 Subject: [Buildroot] [git commit branch/next] package/libgit2: security bump to 1.5.1 Message-ID: <20230220205239.C57D681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc47da516cf5b76752d63361a8a7579d93e6fbbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes CVE-2023-22742: when compiled with BR2_PACKAGE_LIBSSH2, libgit2 fails to verify SSH keys by default. https://github.com/libgit2/libgit2/blob/v1.5.1/docs/changelog.md Signed-off-by: Nicolas Cavallari Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index fb760fd4cc..e834525df5 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e libgit2-1.5.0.tar.gz +sha256 7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88 libgit2-1.5.1.tar.gz sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 9409011eb4..c962c8030f 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.5.0 +LIBGIT2_VERSION = 1.5.1 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From peter at korsgaard.com Mon Feb 20 21:03:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:03:01 -0000 Subject: [Buildroot] [git commit branch/next] package/luaposix: bump to version 36.1 Message-ID: <20230220205245.62E2781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2c3e8ea8b2107ac514baddaed97921112a90cb7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/luaposix/luaposix.hash | 2 +- package/luaposix/luaposix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash index fc0b5fa747..2d54a6901e 100644 --- a/package/luaposix/luaposix.hash +++ b/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e0fcb4996f76aa49ae3e5edf69978171091e3d69d5de5589d591d227f8a427c1 luaposix-36.0.tar.gz +sha256 7944c2b4fbcef0667d407302740d87645325e751fd8d819f2b253c5d9ad0d497 luaposix-36.1.tar.gz sha256 ea0fdaae50b0d31a81c2c99f4354264783c71043fd40522feaa40eecc069599b LICENSE diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index 1a537defc4..d17c8188b5 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 36.0 +LUAPOSIX_VERSION = 36.1 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:03:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:03:02 -0000 Subject: [Buildroot] [git commit branch/next] package/libarchive: Only add "iconv" to the .pc file if needed Message-ID: <20230220205245.46BA886496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9525bc7e64e8f44c31ab9dfd3f516ecb35982429 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with fwup raised since bump to version 3.6.2 in commit 380341b249175382691f268de4b41d3843ff0acc and https://github.com/libarchive/libarchive/commit/a83f3d327aefe8d628230f326621b014d82f55b4 checking for pkg-config... /tmp/instance-19/output-1/host/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for ARCHIVE... no configure: error: Requires libarchive. Libarchive must be built with zlib support. Fixes: http://autobuild.buildroot.net/results/f5d/f5d549fb4f08156ba5952ce75926f7fd2242bfdf/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...1-Only-add-iconv-to-the-pc-file-if-needed.patch | 44 ++++++++++++++++++++++ package/libarchive/libarchive.mk | 4 ++ 2 files changed, 48 insertions(+) diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch new file mode 100644 index 0000000000..c93944f789 --- /dev/null +++ b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch @@ -0,0 +1,44 @@ +From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 +From: Peter Pentchev +Date: Thu, 29 Dec 2022 00:04:40 +0200 +Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) + +Hi, + +Thanks for writing and maintaining libarchive! + +What do you think about this trivial change that does not add "iconv" to +the pkg-config file's list of required packages unless it is actually +needed? On at least Debian GNU/Linux systems, the iconv(3) function is +part of the system C library and there is no Debian package that +installs an iconv.pc file, so I had to make this change to the Debian +package of libarchive. + +Thanks again, and keep up the great work! + +G'luck, +Peter + +Downloaded from upstream commit: +https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99bff20d1..e2715cfde 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then + AC_CHECK_HEADERS([localcharset.h]) + am_save_LIBS="$LIBS" + LIBS="${LIBS} ${LIBICONV}" +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" ++ if test -n "$LIBICONV"; then ++ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" ++ fi + AC_CHECK_FUNCS([locale_charset]) + LIBS="${am_save_LIBS}" + if test "x$ac_cv_func_locale_charset" != "xyes"; then diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cfc148d01d..cd7c13fbed 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -11,6 +11,10 @@ LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING LIBARCHIVE_CPE_ID_VENDOR = libarchive +# We're patching configure.ac +LIBARCHIVE_AUTORECONF = YES +# needed for autoreconf +LIBARCHIVE_DEPENDENCIES += host-pkgconf ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit branch/next] docs/manual: check-package before submitting patch Message-ID: <20230220205250.7FBC781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efccb2a7dd909f8f9b316d809859b9434a2737b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add 'utils/docker-run make check-package' to the default workflow of submitting patches, just after the rebase and before using format-patch. Cc: Thomas De Schampheleire Cc: Romain Naour Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- docs/manual/contribute.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index e588c69be6..94f1c64496 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -294,6 +294,12 @@ $ git fetch --all --tags $ git rebase origin/master --------------------- +Now check the coding style for the changes you committed: + +--------------------- +$ utils/docker-run make check-package +--------------------- + Now, you are ready to generate then submit your patch set. To generate it, run: From thomas.petazzoni at bootlin.com Tue Feb 7 08:24:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:24:16 +0100 Subject: [Buildroot] [git commit branch/next] utils/get-developers: bail out on parsing errors Message-ID: <20230220205251.20CF4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ee1dd85a34b6228c634a66450deefadbb2c9b50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Currently 4 types of parsing errors/warnings can be found: - entry for a file that is not in the tree anymore (warning) - developer entry with no file entry (error) - file entry with no developer (error) - entry that is not a developer, a file or a comment (hard error) Currently only the last one ends the script with -v with error code. Make all 3 error types into hard errors and bail out at the first error found, because the rest of the state machine is not designed to handle malformed input. Suggested-by: Thomas Petazzoni Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/testing/tests/utils/test_get_developers.py | 9 ++++----- utils/getdeveloperlib.py | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/testing/tests/utils/test_get_developers.py b/support/testing/tests/utils/test_get_developers.py index 12710fe8d3..0b313c7c59 100644 --- a/support/testing/tests/utils/test_get_developers.py +++ b/support/testing/tests/utils/test_get_developers.py @@ -70,11 +70,11 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) self.assertIn("Syntax error in DEVELOPERS file, line 1", err) - self.assertEqual(rc, 0) + self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) - # -v generating error for developer entry with no file entries + # -v generating error for developer entry with no file entries, stopping on first error developers = b'# comment\n' \ b'# comment\n' \ b'\n' \ @@ -84,10 +84,9 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) self.assertIn("Syntax error in DEVELOPERS file, line 1", err) - self.assertIn("Syntax error in DEVELOPERS file, line 2", err) - self.assertEqual(rc, 0) + self.assertEqual(rc, 1) self.assertEqual(len(out), 0) - self.assertEqual(len(err), 2) + self.assertEqual(len(err), 1) # -v not generating error for developer entry with empty list of file entries developers = b'# comment\n' \ diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index 2a8d5c213c..dbd21af443 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -243,6 +243,7 @@ def parse_developers(filename=None): if name is not None or len(files) != 0: print("Syntax error in DEVELOPERS file, line %d" % linen, file=sys.stderr) + return None name = line[2:].strip() elif line.startswith("F:"): fname = line[2:].strip() From thomas.petazzoni at bootlin.com Tue Feb 7 08:24:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:24:16 +0100 Subject: [Buildroot] [git commit branch/next] utils/get-developers: print error for correct line Message-ID: <20230220205251.2B38381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de03312db0190adc5b7dfa5b7658b2275801c933 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Start counting the line numbers in 1 instead of 0, in case an error must be printed. Both the error about a developer entry with no file entry and the error about a file entry with no developer entry actually belong to the non-empty line previous the one being analysed, so in these cases print the line number from the line before. Also count empty and comment lines, so a developer fixing the file can jump to the correct line (or the nearest one). At same time standardize the messages, printing the line number also in the case of a warning for a file that is not in the tree anymore. Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/testing/tests/utils/test_get_developers.py | 16 ++++++++-------- utils/getdeveloperlib.py | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/support/testing/tests/utils/test_get_developers.py b/support/testing/tests/utils/test_get_developers.py index 0b313c7c59..ffc01f6ce7 100644 --- a/support/testing/tests/utils/test_get_developers.py +++ b/support/testing/tests/utils/test_get_developers.py @@ -48,7 +48,7 @@ class TestGetDevelopers(unittest.TestCase): # -v generating error, called from the main dir developers = b'text1\n' out, err, rc = call_get_developers("./utils/get-developers", ["-v"], self.WITH_EMPTY_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 0: 'text1'", err) + self.assertIn("Syntax error in DEVELOPERS file, line 1: 'text1'", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -56,7 +56,7 @@ class TestGetDevelopers(unittest.TestCase): # -v generating error, called from path developers = b'text2\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 0: 'text2'", err) + self.assertIn("Syntax error in DEVELOPERS file, line 1: 'text2'", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -69,7 +69,7 @@ class TestGetDevelopers(unittest.TestCase): b'N:\tAuthor2 \n' \ b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 1", err) + self.assertIn("Syntax error in DEVELOPERS file, line 4", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -83,7 +83,7 @@ class TestGetDevelopers(unittest.TestCase): b'N:\tAuthor3 \n' \ b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 1", err) + self.assertIn("Syntax error in DEVELOPERS file, line 4", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -108,8 +108,8 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tpath/that/does/not/exists/1\n' \ b'F:\tpath/that/does/not/exists/2\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file", err) - self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file", err) + self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file, line 2", err) + self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file, line 3", err) self.assertEqual(rc, 0) self.assertEqual(len(out), 0) self.assertEqual(len(err), 2) @@ -119,8 +119,8 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tpath/that/does/not/exists/1\n' \ b'F:\tpath/that/does/not/exists/2\n' out, err, rc = call_get_developers("./utils/get-developers", ["-c"], self.WITH_EMPTY_PATH, topdir, developers) - self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file", err) - self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file", err) + self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file, line 2", err) + self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file, line 3", err) self.assertEqual(rc, 0) self.assertGreater(len(out), 1000) self.assertEqual(len(err), 2) diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index dbd21af443..e7d0d23e49 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -236,12 +236,13 @@ def parse_developers(filename=None): files = [] name = None for line in f: + linen += 1 line = line.strip() if line.startswith("#"): continue elif line.startswith("N:"): if name is not None or len(files) != 0: - print("Syntax error in DEVELOPERS file, line %d" % linen, + print("Syntax error in DEVELOPERS file, line %d" % (linen - 1), file=sys.stderr) return None name = line[2:].strip() @@ -249,7 +250,7 @@ def parse_developers(filename=None): fname = line[2:].strip() dev_files = glob.glob(os.path.join(brpath, fname)) if len(dev_files) == 0: - print("WARNING: '%s' doesn't match any file" % fname, + print("WARNING: '%s' doesn't match any file, line %d" % (fname, linen), file=sys.stderr) for f in dev_files: dev_file = os.path.relpath(f, brpath) @@ -267,7 +268,6 @@ def parse_developers(filename=None): print("Syntax error in DEVELOPERS file, line %d: '%s'" % (linen, line), file=sys.stderr) return None - linen += 1 # handle last developer if name is not None: developers.append(Developer(name, files)) From peter at korsgaard.com Tue Feb 7 08:39:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 09:39:29 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: require English perl package for host-libxml-parser-perl Message-ID: <20230220205251.48C5781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f8085e63a4a755d587a25a73dbaafe33b23f867 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes http://autobuild.buildroot.net/results/166/1667b4ebd8e16e7d8b47bc3ca128a76daf27b4d9/ The configure script of host-libxml-parser-perl needs the English perl module on the host: ERROR from evaluation of /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/Expat/Makefile.PL: Can't locate English.pm in @INC (you may need to install the English module) (@INC contains: /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/inc /home/buildroot/autobuild/instance-1/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at ./Makefile.PL line 3. So add a check for it in dependencies.sh similar to the existing check for ExtUtils::MakeMaker. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index afd30008e8..ea16a21e20 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -266,6 +266,7 @@ fi # Check that the Perl installation is complete enough for Buildroot. required_perl_modules="Data::Dumper" # Needed to build host-autoconf +required_perl_modules="$required_perl_modules English" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl From peter at korsgaard.com Tue Feb 7 09:33:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 10:33:33 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: require open perl package for libxcrypt Message-ID: <20230220205251.717F5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4cdd99190e89d538c25a8fc701372775fbde3b97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/16c/16cba783be11cc5024f9c56bb0a7abb0acf13ef8/ The configure script of libxcrypt needs the open perl module on the host: Can't locate open.pm in @INC (you may need to install the open module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./build-aux/scripts/expand-selected-hashes line 20. So add a check for it in dependencies.sh similar to how it is done for mpv. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index ea16a21e20..353817f8fb 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -271,6 +271,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules open" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From thomas.petazzoni at bootlin.com Tue Feb 7 10:39:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:39:38 +0100 Subject: [Buildroot] [git commit branch/next] package/uuu: bump to version 1.5.21 Message-ID: <20230220205251.CBCBC81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ff52ac09b1c21fdce65deae39127b31d47858e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Fixed android super.img loop download 52byte after some block - Use login header as in curl - Skip sleep in usb_add - Add empty line after input password - linux prompt ask user name and password for http(s) download - fix linux build failure Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/uuu/uuu.hash | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index cc1cd83266..a5b665620c 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 932c0a4acde0f52b907f5693c6d133c83142c4ca6e9df05a38b3ac1e50628883 uuu_source-1.5.11.tar.gz +sha256 e89d3665af499ab71360d948176cf64619b082f8272a994d1fbfc000e67c0f14 uuu_source-1.5.21.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE sha256 584bfbb18b4c08b872d48b80419dd453307212a144134fb516bd6ddc0700c2e8 README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 647015e2dd..1a5f84ce4d 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.11 +UUU_VERSION = 1.5.21 UUU_SOURCE = uuu_source-$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License From yann.morin.1998 at free.fr Tue Feb 7 10:06:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:06:55 +0100 Subject: [Buildroot] [git commit branch/next] package/docker-cli: bump version to v23.0.0 Message-ID: <20230220205251.A72EC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5599cb1b41289adcff86ecf91ee6c069fefa9c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Like docker-engine, docker-cli uses a non-standard vendor/ directory structure, so we use the same fixes as we introduced for docker-engine (see commit: package/docker-engine: bump version to v23.0.0): - remove the problematic vendor/modules.txt - create a go.mod Signed-off-by: Christian Stewart [yann.morin.1998 at free.fr: - use post-extract hook - simplify commit message to refer to docker-engine ] Signed-off-by: Yann E. MORIN --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index c6db95f9b3..ff981be963 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz +sha256 3379d06cd6177832b91f4796c680b6bf15c7895773448716b4c3c5253f611d1b docker-cli-23.0.0.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index cb44c68c1b..d61f47e46e 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.22 +DOCKER_CLI_VERSION = 23.0.0 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 @@ -29,6 +29,15 @@ DOCKER_CLI_TAGS += osusergo netgo DOCKER_CLI_GO_ENV = CGO_ENABLED=no endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_FIX_VENDORING + printf "module $(DOCKER_CLI_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef +DOCKER_CLI_POST_EXTRACT_HOOKS += DOCKER_CLI_FIX_VENDORING + DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) $(eval $(golang-package)) From yann.morin.1998 at free.fr Tue Feb 7 10:05:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:05:45 +0100 Subject: [Buildroot] [git commit branch/next] package/docker-engine: bump version to v23.0.0 Message-ID: <20230220205251.8B31E81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=485b47e025541a58358d8852c600b8e7644b4ec6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This update requires a few workaround for the non-standard vendor/ structure in the docker-engine repository. First, as the vendor/ directory exists, our go-post-process script does not do the vendoring, and exits early, which is exactly what we need. Second, docker-engine does not use the "new" go.mod mechanism, so it does not ship any go.mod file, so our go-post-proces, exiting early, does not check that the go.mod file exists, and thus does not fail, which is again exactly what we need. Third, docker-engine has an invalid vendor/modules.txt file that we need to remove or go would fail to build. Since our go-post-process exits early, there is no vendoring, and thus it does not break at download, which once more is exactly what we need. However, the missing go.mod and the problematic vendor/modules.txt cause go to fail at build time, which this time is not really, even really not, what we want... So, we fix it up in two ways. First, the easy part: we just remove the problematic vendor/modules.txt file. Second, we create a go.mod to tell the Go compiler the root import path prefix for the module and the language version. Note that the language version in go.mod is not required to be equal the version of the Go compiler. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 Note that as of v23.0.0 docker-engine expects containerd to be started by systemd if --containerd= flag is set in dockerd.service, whereas in previous versions containerd was started by the docker daemon as a sub-process. There is no sysv unit for containerd, but this is OK: in the Docker sysv init file S60dockerd, we do not set the --containerd flag. The docker daemon will start containerd as a sub-process automatically due to the absence of this flag. Signed-off-by: Christian Stewart [yann.morin.1998 at free.fr: - run fixups in post-extract hook - rework commit log for (hopefully) better explanations ] Signed-off-by: Yann E. MORIN --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d15b1359cb..670cbd414b 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 2a9b72ca78..c50f08245d 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.22 +DOCKER_ENGINE_VERSION = 23.0.0 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -62,6 +62,15 @@ else DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_ENGINE_FIX_VENDORING + printf "module $(DOCKER_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef +DOCKER_ENGINE_POST_EXTRACT_HOOKS += DOCKER_ENGINE_FIX_VENDORING + DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD From yann.morin.1998 at free.fr Tue Feb 7 11:28:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:28:32 +0100 Subject: [Buildroot] [git commit branch/next] toolchain/toolchain-wrapper.c: set CCACHE env variables only when ccache is enabled Message-ID: <20230220205252.03BDF86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=231d00e63ac08c98d7e823c3bd60a618ff322577 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This commit modifies the toolchain-wrapper to make sure that the CCACHE_COMPILERCHECK and CCACHE_BASEDIR are only set if ccache support is enabled. Indeed, when BR2_USE_CCACHE is not set (or to a value different than 1), we don't call the compiler with ccache, so there is no reason to set those ccache environment variables, and they could potentially conflict with a separate usage of ccache, outside of Buildroot, for example when using the Buildroot SDK. In particular, the value of CCACHE_BASEDIR doesn't not make any sense when the Buildroot toolchain is not used during the Buildroot build, as it points to the output directory $(BASE_DIR). We pay attention to also not show those variables as being set in the BR2_DEBUG_WRAPPER dump. To help a little bit with this, a ccache_enabled boolean is introduced to indicate when ccache is being used. There is still quite a bit of #ifdef-ery involved, but it's not easy to find a simpler way to organize the code. Signed-off-by: Thomas Petazzoni Tested-By: Vincent Fazio Signed-off-by: Yann E. MORIN --- toolchain/toolchain-wrapper.c | 49 ++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 4c08e97237..f66e588bfd 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -494,10 +494,28 @@ int main(int argc, char **argv) exec_args = args; #ifdef BR_CCACHE - /* If BR2_USE_CCACHE is not defined, or its value is not 1, - * skip the ccache call */ + /* If BR2_USE_CCACHE is set and its value is 1, enable ccache + * usage */ char *br_use_ccache = getenv("BR2_USE_CCACHE"); - if (!br_use_ccache || strncmp(br_use_ccache, "1", strlen("1"))) + bool ccache_enabled = br_use_ccache && !strncmp(br_use_ccache, "1", strlen("1")); + + if (ccache_enabled) { +#ifdef BR_CCACHE_HASH + /* Allow compilercheck to be overridden through the environment */ + if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { + perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); + return 3; + } +#endif +#ifdef BR_CCACHE_BASEDIR + /* Allow compilercheck to be overridden through the environment */ + if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { + perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); + return 3; + } +#endif + } else + /* ccache is disabled, skip it */ exec_args++; #endif @@ -505,12 +523,14 @@ int main(int argc, char **argv) if (debug > 0) { fprintf(stderr, "Toolchain wrapper executing:"); #ifdef BR_CCACHE_HASH - fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", - (debug == 2) ? "\n " : " "); + if (ccache_enabled) + fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", + (debug == 2) ? "\n " : " "); #endif #ifdef BR_CCACHE_BASEDIR - fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", - (debug == 2) ? "\n " : " "); + if (ccache_enabled) + fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", + (debug == 2) ? "\n " : " "); #endif for (i = 0; exec_args[i]; i++) fprintf(stderr, "%s'%s'", @@ -518,21 +538,6 @@ int main(int argc, char **argv) fprintf(stderr, "\n"); } -#ifdef BR_CCACHE_HASH - /* Allow compilercheck to be overridden through the environment */ - if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { - perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); - return 3; - } -#endif -#ifdef BR_CCACHE_BASEDIR - /* Allow compilercheck to be overridden through the environment */ - if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { - perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); - return 3; - } -#endif - if (execv(exec_args[0], exec_args)) perror(path); From thomas.petazzoni at bootlin.com Tue Feb 7 10:39:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:39:41 +0100 Subject: [Buildroot] [git commit branch/next] package/mcelog: bump to version 191 Message-ID: <20230220205251.D516D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=537daa143b237e88f2e272056bb05771db7f48d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Create .os_version to specify the version since there is no git checkout available. https://github.com/andikleen/mcelog/releases/tag/v191 https://github.com/andikleen/mcelog/releases/tag/v190 Signed-off-by: Jordan Speicher Signed-off-by: Thomas Petazzoni --- package/mcelog/mcelog.hash | 2 +- package/mcelog/mcelog.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash index e0350b085d..23fd4e50f3 100644 --- a/package/mcelog/mcelog.hash +++ b/package/mcelog/mcelog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 30364d134ff416f3f9469720add84bdccea226268d334f06022110f484550cd9 mcelog-189.tar.gz +sha256 b3b2616acde7afba4752d4dc447a2c2ad5a75da65e7496e0da30f8f8d2015cfa mcelog-191.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk index 8b5876d32e..9f7194e376 100644 --- a/package/mcelog/mcelog.mk +++ b/package/mcelog/mcelog.mk @@ -4,13 +4,14 @@ # ################################################################################ -MCELOG_VERSION = 189 +MCELOG_VERSION = 191 MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION)) MCELOG_LICENSE = GPL-2.0 MCELOG_LICENSE_FILES = LICENSE MCELOG_SELINUX_MODULES = mcelog define MCELOG_BUILD_CMDS + echo "$(MCELOG_VERSION)" > $(@D)/.os_version $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all endef From yann.morin.1998 at free.fr Tue Feb 7 11:10:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:10:46 +0100 Subject: [Buildroot] [git commit branch/next] package/balena-engine: bump to version 20.10.26 Message-ID: <20230220205251.EDBDB81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a1081dcbf8d706b08df53fe2ff2d652caf889ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Like docker-engine and docker-cli, balena-engine uses a non-standard vendor/ directory structure, so we use the same fixes as we introduced for docker-engine ((see commit: package/docker-engine: bump version to v23.0.0): - remove the problematic vendor/modules.txt - create a go.mod Also remove the vendor/archive/ sub-tree (fixes a build error) because Go no longer allows having duplicate packages in GOPATH and GOROOT. vendor/archive/tar cannot be in vendor/ because it exists in the standard library. Since we remove the full vendor/archive/, that is also fixed. https://github.com/balena-os/balena-engine/releases/tag/v20.10.26 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 4adb8ce561..6a92a40cc8 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz +sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index ecfb62bfbf..49d526a465 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 20.10.21 +BALENA_ENGINE_VERSION = 20.10.26 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 @@ -34,6 +34,17 @@ BALENA_ENGINE_TAGS = \ BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# remove the conflicting vendor/archive (not allowed in go1.20) +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define BALENA_ENGINE_FIX_VENDORING + printf "module $(BALENA_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt + rm -rf $(@D)/vendor/archive +endef +BALENA_ENGINE_POST_EXTRACT_HOOKS += BALENA_ENGINE_FIX_VENDORING + ifeq ($(BR2_INIT_SYSTEMD),y) BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald From thomas.petazzoni at bootlin.com Tue Feb 7 11:50:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 12:50:27 +0100 Subject: [Buildroot] [git commit branch/next] package/python-hkdf: new package Message-ID: <20230220205252.3387B81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=433ce2966f787248d5b8a62c46634e2f86250f8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next HMAC-based Extract-and-Expand Key Derivation Function (HKDF). https://github.com/casebeer/python-hkdf Signed-off-by: Julien Olivain [Thomas: justify the license.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/python-hkdf/Config.in | 7 +++++++ package/python-hkdf/python-hkdf.hash | 3 +++ package/python-hkdf/python-hkdf.mk | 17 +++++++++++++++++ .../testing/tests/package/sample_python_hkdf.py | 22 ++++++++++++++++++++++ support/testing/tests/package/test_python_hkdf.py | 11 +++++++++++ 7 files changed, 63 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f10036f7f2..69e73636be 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1693,6 +1693,7 @@ F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ +F: package/python-hkdf/ F: package/python-pyalsa/ F: package/rdma-core/ F: package/riscv-isa-sim/ @@ -1709,6 +1710,7 @@ F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py +F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_rdma_core.py diff --git a/package/Config.in b/package/Config.in index aa87f1305d..b28949500e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1073,6 +1073,7 @@ menu "External python modules" source "package/python-h11/Config.in" source "package/python-h2/Config.in" source "package/python-hiredis/Config.in" + source "package/python-hkdf/Config.in" source "package/python-hpack/Config.in" source "package/python-html5lib/Config.in" source "package/python-httplib2/Config.in" diff --git a/package/python-hkdf/Config.in b/package/python-hkdf/Config.in new file mode 100644 index 0000000000..2add348ca2 --- /dev/null +++ b/package/python-hkdf/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_HKDF + bool "python-hkdf" + help + HMAC-based Extract-and-Expand Key Derivation Function + (HKDF). + + https://github.com/casebeer/python-hkdf diff --git a/package/python-hkdf/python-hkdf.hash b/package/python-hkdf/python-hkdf.hash new file mode 100644 index 0000000000..87702b4582 --- /dev/null +++ b/package/python-hkdf/python-hkdf.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/hkdf/json +md5 d10471ad0ec891cdbe165d78282c943e hkdf-0.0.3.tar.gz +sha256 622a31c634bc185581530a4b44ffb731ed208acf4614f9c795bdd70e77991dca hkdf-0.0.3.tar.gz diff --git a/package/python-hkdf/python-hkdf.mk b/package/python-hkdf/python-hkdf.mk new file mode 100644 index 0000000000..8b68c5cc9f --- /dev/null +++ b/package/python-hkdf/python-hkdf.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-hkdf +# +################################################################################ + +PYTHON_HKDF_VERSION = 0.0.3 +PYTHON_HKDF_SOURCE = hkdf-$(PYTHON_HKDF_VERSION).tar.gz +PYTHON_HKDF_SITE = https://files.pythonhosted.org/packages/c3/be/327e072850db181ce56afd51e26ec7aa5659b18466c709fa5ea2548c935f +PYTHON_HKDF_SETUP_TYPE = setuptools +# No license file in the tree, but +# https://github.com/casebeer/python-hkdf/blob/master/LICENSE shows +# it's BSD-2-Clause. Issue already reported upstream: +# https://github.com/casebeer/python-hkdf/issues/6 +PYTHON_HKDF_LICENSE = BSD-2-Clause + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_hkdf.py b/support/testing/tests/package/sample_python_hkdf.py new file mode 100644 index 0000000000..a730c633e1 --- /dev/null +++ b/support/testing/tests/package/sample_python_hkdf.py @@ -0,0 +1,22 @@ +import hashlib +from binascii import hexlify, unhexlify + +from hkdf import Hkdf, hkdf_expand, hkdf_extract + +salt = b"ThisIsTheSalt." +key_in = b"ThisIsTheSecretKey" +key_info = b"KeyInfo1" +key_len = 16 +expected_key = unhexlify(b"b49d6cc9065b72f3a0859377d8bb7299") + +prk = hkdf_extract(salt, input_key_material=key_in, hash=hashlib.sha512) +key1 = hkdf_expand(prk, info=key_info, length=key_len) + +print("key1:", hexlify(key1)) +assert key1 == expected_key + +kdf = Hkdf(salt, input_key_material=key_in, hash=hashlib.sha512) +key2 = kdf.expand(info=key_info, length=key_len) + +print("key2:", hexlify(key2)) +assert key2 == expected_key diff --git a/support/testing/tests/package/test_python_hkdf.py b/support/testing/tests/package/test_python_hkdf.py new file mode 100644 index 0000000000..e93c24ff60 --- /dev/null +++ b/support/testing/tests/package/test_python_hkdf.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Hkdf(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_HKDF=y + """ + sample_scripts = ["tests/package/sample_python_hkdf.py"] From thomas.petazzoni at bootlin.com Tue Feb 7 12:41:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:41:48 +0100 Subject: [Buildroot] [git commit branch/next] package/python-spake2: new package Message-ID: <20230220205252.428C5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9aaef2a07780a200512ccadb2381c559c4ffd8e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next SPAKE2 password-authenticated key exchange (in pure python). This library implements the SPAKE2 password-authenticated key exchange ("PAKE") algorithm. This allows two parties, who share a weak password, to safely derive a strong shared secret (and therefore build an encrypted+authenticated channel). https://github.com/warner/python-spake2 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-spake2/Config.in | 13 +++++++++++++ package/python-spake2/python-spake2.hash | 5 +++++ package/python-spake2/python-spake2.mk | 14 ++++++++++++++ .../testing/tests/package/sample_python_spake2.py | 22 ++++++++++++++++++++++ .../testing/tests/package/test_python_spake2.py | 11 +++++++++++ 7 files changed, 69 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 69e73636be..a631c32405 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1695,6 +1695,7 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-hkdf/ F: package/python-pyalsa/ +F: package/python-spake2/ F: package/rdma-core/ F: package/riscv-isa-sim/ F: package/tinycompress/ @@ -1703,6 +1704,7 @@ 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/sample_python_pyalsa.py +F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py @@ -1713,6 +1715,7 @@ F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py diff --git a/package/Config.in b/package/Config.in index b28949500e..ec7a6483f6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1290,6 +1290,7 @@ menu "External python modules" source "package/python-sockjs/Config.in" source "package/python-sortedcontainers/Config.in" source "package/python-soupsieve/Config.in" + source "package/python-spake2/Config.in" source "package/python-spidev/Config.in" source "package/python-sqlalchemy/Config.in" source "package/python-sqliteschema/Config.in" diff --git a/package/python-spake2/Config.in b/package/python-spake2/Config.in new file mode 100644 index 0000000000..1c2e3a49af --- /dev/null +++ b/package/python-spake2/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_SPAKE2 + bool "python-spake2" + select BR2_PACKAGE_PYTHON_HKDF # runtime + help + SPAKE2 password-authenticated key exchange (in pure python). + + This library implements the SPAKE2 password-authenticated + key exchange ("PAKE") algorithm. This allows two parties, + who share a weak password, to safely derive a strong shared + secret (and therefore build an encrypted+authenticated + channel). + + https://github.com/warner/python-spake2 diff --git a/package/python-spake2/python-spake2.hash b/package/python-spake2/python-spake2.hash new file mode 100644 index 0000000000..30052b1b36 --- /dev/null +++ b/package/python-spake2/python-spake2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/spake2/json +md5 0155bad518bb49c39994fe0b7d9fb32c spake2-0.8.tar.gz +sha256 c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4 spake2-0.8.tar.gz +# Locally computed sha256 checksums +sha256 2a8a1200c3a2769d1815727f3b4439bd800f3bc88163118a36ff30b007d30031 LICENSE diff --git a/package/python-spake2/python-spake2.mk b/package/python-spake2/python-spake2.mk new file mode 100644 index 0000000000..99ce7dae13 --- /dev/null +++ b/package/python-spake2/python-spake2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-spake2 +# +################################################################################ + +PYTHON_SPAKE2_VERSION = 0.8 +PYTHON_SPAKE2_SOURCE = spake2-$(PYTHON_SPAKE2_VERSION).tar.gz +PYTHON_SPAKE2_SITE = https://files.pythonhosted.org/packages/60/0b/bb5eca8e18c38a10b1c207bbe6103df091e5cf7b3e5fdc0efbcad7b85b60 +PYTHON_SPAKE2_SETUP_TYPE = setuptools +PYTHON_SPAKE2_LICENSE = MIT +PYTHON_SPAKE2_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_spake2.py b/support/testing/tests/package/sample_python_spake2.py new file mode 100644 index 0000000000..49dd914ca8 --- /dev/null +++ b/support/testing/tests/package/sample_python_spake2.py @@ -0,0 +1,22 @@ +from binascii import hexlify + +from spake2 import SPAKE2_A, SPAKE2_B + + +shared_password = b"This Is The Password!" + +alice = SPAKE2_A(shared_password) +alice_msg = alice.start() + +bob = SPAKE2_B(shared_password) +bob_msg = bob.start() + +# Alice and Bob exchange their messages... + +alice_key = alice.finish(bob_msg) +bob_key = bob.finish(alice_msg) + +print("alice_key:", hexlify(alice_key)) +print(" bob_key:", hexlify(bob_key)) + +assert alice_key == bob_key diff --git a/support/testing/tests/package/test_python_spake2.py b/support/testing/tests/package/test_python_spake2.py new file mode 100644 index 0000000000..fb47a0802c --- /dev/null +++ b/support/testing/tests/package/test_python_spake2.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Spake2(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_SPAKE2=y + """ + sample_scripts = ["tests/package/sample_python_spake2.py"] From thomas.petazzoni at bootlin.com Tue Feb 7 12:47:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:47:55 +0100 Subject: [Buildroot] [git commit branch/next] package/python-magic-wormhole: new package Message-ID: <20230220205252.5083581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb013c3757548f3153a9da59906c388d32a376fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Securely transfer data between computers. This package provides a library and a command-line tool named "wormhole", which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. The two endpoints are identified by using identical "wormhole codes": in general, the sending machine generates and displays the code, which must then be typed into the receiving machine. https://github.com/magic-wormhole/magic-wormhole Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-magic-wormhole/Config.in | 27 ++++++++++++++++++++++ .../python-magic-wormhole.hash | 5 ++++ .../python-magic-wormhole/python-magic-wormhole.mk | 14 +++++++++++ 5 files changed, 48 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a631c32405..8d1d9340bb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1694,6 +1694,7 @@ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ F: package/python-hkdf/ +F: package/python-magic-wormhole/ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ diff --git a/package/Config.in b/package/Config.in index ec7a6483f6..cb9a2b829f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1120,6 +1120,7 @@ menu "External python modules" source "package/python-logstash/Config.in" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" + source "package/python-magic-wormhole/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-magic-wormhole/Config.in b/package/python-magic-wormhole/Config.in new file mode 100644 index 0000000000..e8429d203b --- /dev/null +++ b/package/python-magic-wormhole/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE + bool "python-magic-wormhole" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime + select BR2_PACKAGE_PYTHON_AUTOMAT # runtime + select BR2_PACKAGE_PYTHON_CLICK # runtime + select BR2_PACKAGE_PYTHON_HKDF # runtime + select BR2_PACKAGE_PYTHON_HUMANIZE # runtime + select BR2_PACKAGE_PYTHON_PYNACL # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_SPAKE2 # runtime + select BR2_PACKAGE_PYTHON_TQDM # runtime + select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_TXTORCON # runtime + help + Securely transfer data between computers. + + This package provides a library and a command-line tool + named "wormhole", which makes it possible to get + arbitrary-sized files and directories (or short pieces of + text) from one computer to another. The two endpoints are + identified by using identical "wormhole codes": in general, + the sending machine generates and displays the code, which + must then be typed into the receiving machine. + + https://github.com/magic-wormhole/magic-wormhole diff --git a/package/python-magic-wormhole/python-magic-wormhole.hash b/package/python-magic-wormhole/python-magic-wormhole.hash new file mode 100644 index 0000000000..5e880d5427 --- /dev/null +++ b/package/python-magic-wormhole/python-magic-wormhole.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole/json +md5 ca190d92f56fe32ec8dfd4fc5aab8337 magic-wormhole-0.12.0.tar.gz +sha256 1b0fd8a334da978f3dd96b620fa9b9348cabedf26a87f74baac7a37052928160 magic-wormhole-0.12.0.tar.gz +# Locally computed sha256 checksums +sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE diff --git a/package/python-magic-wormhole/python-magic-wormhole.mk b/package/python-magic-wormhole/python-magic-wormhole.mk new file mode 100644 index 0000000000..91f0f826d5 --- /dev/null +++ b/package/python-magic-wormhole/python-magic-wormhole.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_VERSION = 0.12.0 +PYTHON_MAGIC_WORMHOLE_SOURCE = magic-wormhole-$(PYTHON_MAGIC_WORMHOLE_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_SITE = https://files.pythonhosted.org/packages/d4/62/5e4a86f7c4b111e016577f1b304063ebe604f430db15465ac58b13993608 +PYTHON_MAGIC_WORMHOLE_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 13:01:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:01:05 +0100 Subject: [Buildroot] [git commit branch/next] support/testing/tests/package/test_python_magic_wormhole.py: new runtime test Message-ID: <20230220205252.7859481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e23807372370974a307b3c70ef9d77964a149ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../tests/package/test_python_magic_wormhole.py | 62 ++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5776d6d7a5..8dde37bd67 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1717,6 +1717,7 @@ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py +F: support/testing/tests/package/test_python_magic_wormhole.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py diff --git a/support/testing/tests/package/test_python_magic_wormhole.py b/support/testing/tests/package/test_python_magic_wormhole.py new file mode 100644 index 0000000000..d6541a2480 --- /dev/null +++ b/support/testing/tests/package/test_python_magic_wormhole.py @@ -0,0 +1,62 @@ +import os + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3MagicWormhole(TestPythonPackageBase): + __test__ = True + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE=y + BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER=y + BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + timeout = 60 + + def twistd_cmd(self, command): + s = "twistd" + s += " --pidfile=/tmp/{}.pid".format(command) + s += " --logfile=/tmp/{}.log".format(command) + s += " {}".format(command) + + return s + + def test_run(self): + code = "123-hello-buildroot" + text = "Hello Buildroot!" + + relay_url = "ws://localhost:4000/v1" + transit_helper = "tcp:localhost:4001" + + img = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", kernel="builtin", + options=["-initrd", img]) + + self.emulator.login() + + cmd = self.twistd_cmd("wormhole-mailbox") + self.assertRunOk(cmd, timeout=30) + + cmd = self.twistd_cmd("transitrelay") + self.assertRunOk(cmd, timeout=30) + + wormhole_cmd = "wormhole --relay-url={} --transit-helper={}".format( + relay_url, transit_helper) + + cmd = wormhole_cmd + " send --code={} --text=\"{}\" & ".format(code, text) + cmd += "sleep 25" + self.assertRunOk(cmd, timeout=30) + + cmd = wormhole_cmd + " receive {}".format(code) + output, exit_code = self.emulator.run(cmd, timeout=35) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], text) From peter at korsgaard.com Tue Feb 7 13:52:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 14:52:26 +0100 Subject: [Buildroot] [git commit branch/next] package/mesa3d-headers: only check for conflicts when building Message-ID: <20230220205252.A962981979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=509956da4cdba6a76214322b1ace979bbe6cd6a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 03bf635816..9177adceda 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -6,7 +6,7 @@ # mesa3d-headers is inherently incompatible with mesa3d, so error out # if both are enabled. -ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yy) +ifeq ($(BR_BUILDING)$(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yyy) $(error mesa3d-headers enabled, but mesa3d enabled too) endif From thomas.petazzoni at bootlin.com Tue Feb 7 12:54:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:54:07 +0100 Subject: [Buildroot] [git commit branch/next] package/python-magic-wormhole-mailbox-server: new package Message-ID: <20230220205252.5E55C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9244052f28d87d6d85b73402e7d15f730eb66c4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This package is the main server that Magic-Wormhole clients connect to. The server performs store-and-forward delivery for small key-exchange and control messages. Bulk data is sent over a direct TCP connection, or through a transit-relay. https://github.com/magic-wormhole/magic-wormhole-mailbox-server Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...move-the-U-open-mode-removed-in-Python-3..patch | 39 ++++++++++++++++++++++ .../python-magic-wormhole-mailbox-server/Config.in | 15 +++++++++ .../python-magic-wormhole-mailbox-server.hash | 5 +++ .../python-magic-wormhole-mailbox-server.mk | 14 ++++++++ 6 files changed, 75 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8d1d9340bb..afc079a609 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1695,6 +1695,7 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-hkdf/ F: package/python-magic-wormhole/ +F: package/python-magic-wormhole-mailbox-server/ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ diff --git a/package/Config.in b/package/Config.in index cb9a2b829f..2ef403168a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1121,6 +1121,7 @@ menu "External python modules" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" source "package/python-magic-wormhole/Config.in" + source "package/python-magic-wormhole-mailbox-server/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch b/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch new file mode 100644 index 0000000000..8afe7c9546 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch @@ -0,0 +1,39 @@ +From df6126ee86c1f84c7e0c25fcf69543b83b1b32c6 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 5 Nov 2022 13:06:07 +0100 +Subject: [PATCH] setup.py: remove the 'U' open mode removed in Python 3.11 + +The 'U' open mode was removed in Python 3.11. See: +https://docs.python.org/3.11/library/functions.html#open + +Installing with Python 3.11 fails with: + + /path/to/python-magic-wormhole-mailbox-server-0.4.1/setup.py", line 20, in + long_description=open('README.md', 'rU').read(), + ^^^^^^^^^^^^^^^^^^^^^^^ + ValueError: invalid mode: 'rU' + +This patch removes the 'U' open mode. + +Upstream: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/commit/df6126ee86c1f84c7e0c25fcf69543b83b1b32c6 +Signed-off-by: Julien Olivain +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 6ef292f..ad9ff5a 100644 +--- a/setup.py ++++ b/setup.py +@@ -17,7 +17,7 @@ trove_classifiers = [ + setup(name="magic-wormhole-mailbox-server", + version=versioneer.get_version(), + description="Securely transfer data between computers", +- long_description=open('README.md', 'rU').read(), ++ long_description=open('README.md', 'r').read(), + long_description_content_type='text/markdown', + author="Brian Warner", + author_email="warner-magic-wormhole at lothar.com", +-- +2.38.1 + diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in new file mode 100644 index 0000000000..db20d3e7b6 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER + bool "python-magic-wormhole-mailbox-server" + select BR2_PACKAGE_PYTHON3_SQLITE # runtime + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_TWISTED # runtime + help + This package is the main server that Magic-Wormhole clients + connect to. The server performs store-and-forward delivery + for small key-exchange and control messages. Bulk data is + sent over a direct TCP connection, or through a + transit-relay. + + https://github.com/magic-wormhole/magic-wormhole-mailbox-server diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash new file mode 100644 index 0000000000..c714712641 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole-mailbox-server/json +md5 3da441df1f354a8399a728da3421ac8f magic-wormhole-mailbox-server-0.4.1.tar.gz +sha256 1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb magic-wormhole-mailbox-server-0.4.1.tar.gz +# Locally computed sha256 checksums +sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk new file mode 100644 index 0000000000..a3394c7dcd --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole-mailbox-server +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION = 0.4.1 +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SOURCE = magic-wormhole-mailbox-server-$(PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SITE = https://files.pythonhosted.org/packages/5b/ba/cbb211bc8f8bfdf7fb620d33331f07bcd889c7a28e7fd8a0de9029bb5a2f +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit branch/next] package/cli11: new package Message-ID: <20230220205252.D640781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f25b760186b72d2224d7087324ca5f2baeafb8b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/cli11/Config.in | 13 +++++++++++++ package/cli11/cli11.hash | 3 +++ package/cli11/cli11.mk | 15 +++++++++++++++ 5 files changed, 33 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8dde37bd67..830dab56f0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2787,6 +2787,7 @@ N: Sven Oliver Moll F: package/most/ N: TIAN Yuanhao +F: package/cli11/ F: package/open-isns/ N: Tan En De diff --git a/package/Config.in b/package/Config.in index b5418c56f6..3773901552 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2150,6 +2150,7 @@ endmenu menu "Text and terminal handling" source "package/augeas/Config.in" + source "package/cli11/Config.in" source "package/docopt-cpp/Config.in" source "package/enchant/Config.in" source "package/fmt/Config.in" diff --git a/package/cli11/Config.in b/package/cli11/Config.in new file mode 100644 index 0000000000..87db9ac8f7 --- /dev/null +++ b/package/cli11/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_CLI11 + bool "cli11" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + CLI11 is a command line parser for C++11 and beyond that + provides a rich feature set with a simple and intuitive + interface. + + https://github.com/CLIUtils/CLI11 + +comment "cli11 needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/cli11/cli11.hash b/package/cli11/cli11.hash new file mode 100644 index 0000000000..12e5b4fb55 --- /dev/null +++ b/package/cli11/cli11.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 378da73d2d1d9a7b82ad6ed2b5bda3e7bc7093c4034a1d680a2e009eb067e7b2 cli11-2.3.1.tar.gz +sha256 89022151dbf5827a22430557ef2f8a75808dd25fa1e9a12709ef5421d363e66d LICENSE diff --git a/package/cli11/cli11.mk b/package/cli11/cli11.mk new file mode 100644 index 0000000000..b02bd4478f --- /dev/null +++ b/package/cli11/cli11.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# cli11 +# +################################################################################ + +CLI11_VERSION = 2.3.1 +CLI11_SITE = $(call github,CLIUtils,CLI11,v$(CLI11_VERSION)) +CLI11_LICENSE = BSD-3-Clause +CLI11_LICENSE_FILES = LICENSE +CLI11_INSTALL_STAGING = YES +CLI11_INSTALL_TARGET = NO +CLI11_CONF_OPTS = -DCLI11_BUILD_DOCS=OFF -DCLI11_BUILD_EXAMPLES=OFF + +$(eval $(cmake-package)) From arnout at mind.be Tue Feb 7 13:30:56 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 14:30:56 +0100 Subject: [Buildroot] [git commit branch/next] package/busybox: update to 1.36.0 Message-ID: <20230220205252.8491B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d68b617993bd2f5c82a4936ed1e24e4fec6b94a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Remove upstream patch 0003-awk-fix-use-after-free-CVE-2022-30065.patch and update _IGNORE_CVES accordingly. The two other CVE fixes are still not applied upstream. Renumber the patches and update the comment in the .mk file. Refresh busybox.config. All configs are set to the new defaults, except for CONFIG_UDHCPC_DEFAULT_SCRIPT: for this one, reuse the script we also use for DHCPv4. This is matches the behaviour previous to the bump, where we had a single script handling both. Signed-off-by: Arnout Vandecappelle --- ...003-awk-fix-use-after-free-CVE-2022-30065.patch | 52 ---------------------- ...dr2str-ensure-only-printable-characters-.patch} | 0 ...itize-all-printed-strings-with-printable.patch} | 0 package/busybox/busybox.config | 23 +++++++--- package/busybox/busybox.hash | 2 +- package/busybox/busybox.mk | 8 ++-- 6 files changed, 21 insertions(+), 64 deletions(-) diff --git a/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch b/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch deleted file mode 100644 index f9bfee328e..0000000000 --- a/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e06b1f0839972cc3f5b432849d574d14a8f17613 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Fri, 17 Jun 2022 17:45:34 +0200 -Subject: [PATCH] awk: fix use after free (CVE-2022-30065) - -fixes https://bugs.busybox.net/show_bug.cgi?id=14781 - -function old new delta -evaluate 3343 3357 +14 - -Signed-off-by: Natanael Copa -Signed-off-by: Denys Vlasenko -Backport: https://git.busybox.net/busybox/commit/?id=e63d7cdfdac78c6fd27e9e63150335767592b85e -[straightforward conflict resolution in testsuite/awk.tests] -Signed-off-by: Quentin Schulz ---- - editors/awk.c | 3 +++ - testsuite/awk.tests | 6 ++++++ - 2 files changed, 9 insertions(+) - -diff --git a/editors/awk.c b/editors/awk.c -index f6314ac72..654cbac33 100644 ---- a/editors/awk.c -+++ b/editors/awk.c -@@ -3114,6 +3114,9 @@ static var *evaluate(node *op, var *res) - - case XC( OC_MOVE ): - debug_printf_eval("MOVE\n"); -+ /* make sure that we never return a temp var */ -+ if (L.v == TMPVAR0) -+ L.v = res; - /* if source is a temporary string, jusk relink it to dest */ - if (R.v == TMPVAR1 - && !(R.v->type & VF_NUMBER) -diff --git a/testsuite/awk.tests b/testsuite/awk.tests -index bcaafe8fd..156aa65eb 100755 ---- a/testsuite/awk.tests -+++ b/testsuite/awk.tests -@@ -469,4 +469,10 @@ testing 'awk printf %% prints one %' \ - "%\n" \ - '' '' - -+testing 'awk assign while test' \ -+ "awk '\$1==\$1=\"foo\" {print \$1}'" \ -+ "foo\n" \ -+ "" \ -+ "foo" -+ - exit $FAILCOUNT --- -2.37.3 - diff --git a/package/busybox/0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch b/package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch similarity index 100% rename from package/busybox/0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch rename to package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch diff --git a/package/busybox/0005-nslookup-sanitize-all-printed-strings-with-printable.patch b/package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch similarity index 100% rename from package/busybox/0005-nslookup-sanitize-all-printed-strings-with-printable.patch rename to package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index e7f628ca6d..4826fb8242 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.35.0 -# Thu Jan 27 10:16:54 2022 +# Busybox version: 1.36.0 +# Tue Feb 7 12:34:02 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA1_SMALL=3 +CONFIG_SHA1_HWACCEL=y +CONFIG_SHA256_HWACCEL=y CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_NON_POSIX_CP=y # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set @@ -123,6 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=0 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets @@ -338,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y CONFIG_TRUNCATE=y +CONFIG_TSORT=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux" @@ -520,7 +527,7 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y -# CONFIG_USE_BB_CRYPT_SHA is not set +CONFIG_USE_BB_CRYPT_SHA=y # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set CONFIG_ADDGROUP=y @@ -811,10 +818,10 @@ CONFIG_FEATURE_LESS_TRUNCATE=y CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_FEATURE_LESS_WINCH is not set # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set +CONFIG_FEATURE_LESS_DASHCMD=y # CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_FEATURE_LESS_RAW is not set -# CONFIG_FEATURE_LESS_ENV is not set +CONFIG_FEATURE_LESS_RAW=y +CONFIG_FEATURE_LESS_ENV=y CONFIG_LSSCSI=y CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set @@ -831,10 +838,12 @@ CONFIG_PARTPROBE=y # CONFIG_RFKILL is not set CONFIG_RUNLEVEL=y # CONFIG_RX is not set +CONFIG_SEEDRNG=y CONFIG_SETFATTR=y CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y +CONFIG_TREE=y CONFIG_TS=y # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set @@ -1007,6 +1016,7 @@ CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC6_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" # CONFIG_UDHCPC6 is not set # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set @@ -1141,6 +1151,7 @@ CONFIG_ASH_IDLE_TIMEOUT=y CONFIG_ASH_ECHO=y CONFIG_ASH_PRINTF=y CONFIG_ASH_TEST=y +CONFIG_ASH_SLEEP=y CONFIG_ASH_HELP=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 2091cdaf65..6d1c36906d 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ # From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 -sha256 faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 busybox-1.35.0.tar.bz2 +sha256 542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5 busybox-1.36.0.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index f8f9cb5616..1633ca525d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,17 +4,15 @@ # ################################################################################ -BUSYBOX_VERSION = 1.35.0 +BUSYBOX_VERSION = 1.36.0 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 BUSYBOX_LICENSE_FILES = LICENSE archival/libarchive/bz/LICENSE BUSYBOX_CPE_ID_VENDOR = busybox -# 0003-awk-fix-use-after-free-CVE-2022-30065.patch -BUSYBOX_IGNORE_CVES += CVE-2022-30065 -# 0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch -# 0005-nslookup-sanitize-all-printed-strings-with-printable.patch +# 0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch +# 0004-nslookup-sanitize-all-printed-strings-with-printable.patch BUSYBOX_IGNORE_CVES += CVE-2022-28391 BUSYBOX_CFLAGS = \ From arnout at mind.be Tue Feb 7 15:03:27 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 16:03:27 +0100 Subject: [Buildroot] [git commit branch/next] package/urandom-scripts: actually credit seed files via seedrng Message-ID: <20230220205252.C3366828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a6f9d2516820c296a8af788b259ca96926cd60d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, Busybox 1.36.0 contains SeedRNG, a tiny program meant to be called at startup and shutdown (and at arbitrary other points in between if desired). Note that initially, the way seedrng was included in busybox broke things quite severely, but now it's been reverted to a reasonably acceptable version. This is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. Because seedrng is part of busybox, urandom-scripts now depends on BR2_PACKAGE_BUSYBOX. This can be removed again if later we add a standalone seedrng package. Add a decent explanation to the init script about the need for a persistent directory to make this actually work. Signed-off-by: Jason A. Donenfeld [Arnout: - Remove busybox patch, it's now part of busybox 1.36.0. - Depend on busybox. - Fix shellcheck errors. - Use DAEMON and SEEDRNG_ARGS. - Don't bother with "seed_dir" and "skip_credit" variables. - Rename to S20seedrng. ] Signed-off-by: Arnout Vandecappelle --- package/urandom-scripts/Config.in | 5 +-- package/urandom-scripts/S20seedrng | 40 +++++++++++++++++ package/urandom-scripts/S20urandom | 70 ------------------------------ package/urandom-scripts/urandom-scripts.mk | 4 +- 4 files changed, 43 insertions(+), 76 deletions(-) diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in index 987e442e22..6b4a609f95 100644 --- a/package/urandom-scripts/Config.in +++ b/package/urandom-scripts/Config.in @@ -1,10 +1,7 @@ config BR2_PACKAGE_URANDOM_SCRIPTS bool "urandom-initscripts" default y if BR2_PACKAGE_INITSCRIPTS + depends on BR2_PACKAGE_BUSYBOX 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/S20seedrng b/package/urandom-scripts/S20seedrng new file mode 100644 index 0000000000..0fea0bea83 --- /dev/null +++ b/package/urandom-scripts/S20seedrng @@ -0,0 +1,40 @@ +#! /bin/sh +# +# Preserve the random seed between reboots. See urandom(4). +# +# This script can be called multiple times during operation (e.g. with +# "reload" argument) to refresh the seed. + +# The following arguments can be added to SEEDRNG_ARGS in +# /etc/default/seedrng: +# --seed-dir=/path/to/seed/directory +# Path to the directory where the seed and the lock files are stored. +# for optimal operation, this should be a persistent, writeable +# location. Default is /var/lib/seedrng +# +# --skip-credit +# 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. +# +# Example: +# SEEDRNG_ARGS="--seed-dir=/data/seedrng --skip-credit" +# + +DAEMON="seedrng" +SEEDRNG_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +case "$1" in + start|stop|restart|reload) + # Never fail, as this isn't worth making a fuss + # over if it doesn't go as planned. + # shellcheck disable=SC2086 # we need the word splitting + seedrng $SEEDRNG_ARGS || true;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom deleted file mode 100644 index 6c6aea9eee..0000000000 --- a/package/urandom-scripts/S20urandom +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/sh -# -# 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" - -# 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() { - [ -f "$URANDOM_SEED" ] || return 0 - 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;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 2c09728c46..32f3e09343 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -5,8 +5,8 @@ ################################################################################ define URANDOM_SCRIPTS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ - $(TARGET_DIR)/etc/init.d/S20urandom + $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20seedrng \ + $(TARGET_DIR)/etc/init.d/S20seedrng endef $(eval $(generic-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit branch/next] package/libsolv: new package Message-ID: <20230220205253.13AC481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93ce3c1be0753189d6af3ee9968b935037519c25 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Required by micromamba. Signed-off-by: TIAN Yuanhao [Thomas: - rework shared/static lib handling - don't pass ENABLE_CONDA=ON based on BR2_PACKAGE_MICROMAMBA=y as it's weird that a dependency does something different depending on which of its reverse dependencies is enabled] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libsolv/Config.in | 9 +++++++++ package/libsolv/libsolv.hash | 3 +++ package/libsolv/libsolv.mk | 27 +++++++++++++++++++++++++++ 5 files changed, 41 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 220a326adc..e8ddad71cd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2788,6 +2788,7 @@ F: package/most/ N: TIAN Yuanhao F: package/cli11/ +F: package/libsolv/ F: package/open-isns/ F: package/termcolor/ F: package/tl-expected/ diff --git a/package/Config.in b/package/Config.in index fa0713c311..6ca4c61959 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2085,6 +2085,7 @@ menu "Other" source "package/libshdata/Config.in" source "package/libsigc/Config.in" source "package/libsigsegv/Config.in" + source "package/libsolv/Config.in" source "package/libspatialindex/Config.in" source "package/libtalloc/Config.in" source "package/libtasn1/Config.in" diff --git a/package/libsolv/Config.in b/package/libsolv/Config.in new file mode 100644 index 0000000000..1415d2bc2b --- /dev/null +++ b/package/libsolv/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBSOLV + bool "libsolv" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_ZLIB + help + A free package dependency solver using a satisfiability + algorithm. + + https://github.com/openSUSE/libsolv diff --git a/package/libsolv/libsolv.hash b/package/libsolv/libsolv.hash new file mode 100644 index 0000000000..162e46e54d --- /dev/null +++ b/package/libsolv/libsolv.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 968aef452b5493751fa0168cd58745a77c755e202a43fe8d549d791eb16034d5 libsolv-0.7.22.tar.gz +sha256 57f15acfb29fbef7749779e096a5885c60b716633e34484a21bb717554c0198f LICENSE.BSD diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk new file mode 100644 index 0000000000..144ce68a83 --- /dev/null +++ b/package/libsolv/libsolv.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# libsolv +# +################################################################################ + +LIBSOLV_VERSION = 0.7.22 +LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) +LIBSOLV_LICENSE = BSD-3-Clause +LIBSOLV_LICENSE_FILES = LICENSE.BSD +LIBSOLV_INSTALL_STAGING = YES +LIBSOLV_DEPENDENCIES = zlib +LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON +else +LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON +endif + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON +else +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON +endif + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit branch/next] package/tl-expected: new package Message-ID: <20230220205253.06C1F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ffbc3a9cb9d4386f6ae171207f7b85ef182e8a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/tl-expected/Config.in | 12 ++++++++++++ package/tl-expected/tl-expected.hash | 3 +++ package/tl-expected/tl-expected.mk | 20 ++++++++++++++++++++ 5 files changed, 37 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 9cc080f7a4..220a326adc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2790,6 +2790,7 @@ N: TIAN Yuanhao F: package/cli11/ F: package/open-isns/ F: package/termcolor/ +F: package/tl-expected/ N: Tan En De F: package/libkcapi/ diff --git a/package/Config.in b/package/Config.in index e1a1b153b1..fa0713c311 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2132,6 +2132,7 @@ endif source "package/startup-notification/Config.in" source "package/tbb/Config.in" source "package/tinycbor/Config.in" + source "package/tl-expected/Config.in" source "package/tz/Config.in" source "package/tzdata/Config.in" source "package/uvw/Config.in" diff --git a/package/tl-expected/Config.in b/package/tl-expected/Config.in new file mode 100644 index 0000000000..92758ffee5 --- /dev/null +++ b/package/tl-expected/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TL_EXPECTED + bool "tl-expected" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + C++11/14/17 std::expected with functional-style extensions and + reference support. + + https://github.com/TartanLlama/expected + +comment "tl-expected needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/tl-expected/tl-expected.hash b/package/tl-expected/tl-expected.hash new file mode 100644 index 0000000000..e5c9cc2a3e --- /dev/null +++ b/package/tl-expected/tl-expected.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 2611769546cedcaef233ef587e71420d1f079a794eb7bb19b888dedf991ace7c tl-expected-v1.0.0-br1.tar.gz +sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 COPYING diff --git a/package/tl-expected/tl-expected.mk b/package/tl-expected/tl-expected.mk new file mode 100644 index 0000000000..8d62c75fea --- /dev/null +++ b/package/tl-expected/tl-expected.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# tl-expected +# +################################################################################ + +TL_EXPECTED_VERSION = v1.0.0 +TL_EXPECTED_SITE = https://github.com/TartanLlama/expected +TL_EXPECTED_SITE_METHOD = git +TL_EXPECTED_GIT_SUBMODULES = YES +TL_EXPECTED_LICENSE = CC0-1.0 +TL_EXPECTED_LICENSE_FILES = COPYING +TL_EXPECTED_INSTALL_STAGING = YES +TL_EXPECTED_INSTALL_TARGET = NO +TL_EXPECTED_CONF_OPTS = \ + -DCMAKE_MODULE_PATH=$(TL_EXPECTED_DIR)/cmake/tl-cmake \ + -DEXPECTED_ENABLE_TESTS=OFF \ + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Tue Feb 7 16:48:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 17:48:42 +0100 Subject: [Buildroot] [git commit branch/next] utils/test-pkg: proper output on host without jq installed Message-ID: <20230220205253.4665581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09ac5a9e18e96ba6d3cd13e5e8d34aeccfcb603d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next On host without jq installed, test-pkg's output is as following: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) ... Since test-pkg handles this case we can hide this error message and have proper output: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK Signed-off-by: S??bastien Szymanski Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN --- utils/test-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test-pkg b/utils/test-pkg index 4ebfd9af66..e7f5464817 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -201,7 +201,7 @@ build_one() { # Validate that we generate proper json as show-info { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; - JQ="$(which jq)" + JQ="$(which jq 2> /dev/null)" if [ -z "${JQ}" ]; then make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 JQ="${dir}/host/bin/jq" From yann.morin.1998 at free.fr Tue Feb 7 15:48:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 16:48:49 +0100 Subject: [Buildroot] [git commit branch/next] package/python3: use pure python UUID backend for host variant Message-ID: <20230220205253.314C086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b635bda5bc5ea9db15cb83390d8e3908b85c2629 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next host-python3 currently does not build if util-linux-uuid option is not enabled, failing with the following error messages: """ /usr/lib64/ccache/gcc -fPIC -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -O2 -I/home/qschulz/work/upstream/buildroot/output/host/include -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I./Include -I. -I/home/qschulz/work/upstream/buildroot/output/host/include -I/usr/local/include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1 -c /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c -o build/temp.linux-x86_64-3.11/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.o /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c: In function ???py_uuid_generate_time_safe???: /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: error: storage size of ???uui ??? isn???t known 27 | uuid_t uuid; | ^~~~ /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:31:11: error: implicit declaration of function ???uuid_generate_time_safe???; did you mean ???py_uuid_generate_time_safe???? [-Werror=implicit-function-declaration] 31 | res = uuid_generate_time_safe(uuid); | ^~~~~~~~~~~~~~~~~~~~~~~ | py_uuid_generate_time_safe /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: warning: unused variable ???uuid??? [-Wunused-variable] 27 | uuid_t uuid; | ^~~~ /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:47:1: warning: control reaches end of non-void function [-Wreturn-type] 47 | } | ^ cc1: some warnings being treated as errors The necessary bits to build these optional modules were not found: _dbm _gdbm _tkinter nis readline To find the necessary bits, look in setup.py in detect_modules() for the module's name. The following modules found by detect_modules() in setup.py have not been built, they are *disabled* by configure: _ctypes_test _sqlite3 _testbuffer _testcapi _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz Failed to build these modules: _uuid """ Therefore, let's disable building the _uuid extension the same way it's done for the target package since commit 0b68713aae28 ("python3: use pure python UUID backend"). Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Yann E. MORIN --- package/python3/python3.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 219d135b3f..fb6dbf2e64 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -31,6 +31,7 @@ HOST_PYTHON3_CONF_OPTS += \ --enable-unicodedata \ --disable-test-modules \ --disable-idle3 \ + --disable-uuid \ --disable-ossaudiodev # Make sure that LD_LIBRARY_PATH overrides -rpath. From yann.morin.1998 at free.fr Tue Feb 7 17:14:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:14:59 +0100 Subject: [Buildroot] [git commit branch/next] support/docker: use APT::Retries in apt-get calls to retry Message-ID: <20230220205253.791FD81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a7c6725f6ca5c1108e6fb76fad414132555b373 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next snapshot.debian.org is notoriously slow, and quite often leads to timeouts when downloading packages. To give us a better chance of succeeding, let's retry 3 times before failing. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index de1534e77a..a16c1e3849 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -20,8 +20,8 @@ COPY apt-sources.list /etc/apt/sources.list # The container has no package lists, so need to update first RUN dpkg --add-architecture i386 && \ - apt-get update -y -RUN apt-get install -y --no-install-recommends \ + apt-get -o APT::Retries=3 update -y +RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ bc \ build-essential \ bzr \ From yann.morin.1998 at free.fr Tue Feb 7 17:15:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:15:00 +0100 Subject: [Buildroot] [git commit branch/next] .gitlab-ci.yml: update Docker image to use Message-ID: <20230220205253.81EC7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bde165f7ad4922e218cabdb6eb7c40e1661179f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We have a new Docker image, updated with the new requirements from bcd15aa08aab1e8292b93995c44dc765a9801632 ("support/docker: add python3-magic"), but also with an updated Debian Bullseye installation. Let's use it. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cad35c96bc..ed17bb14b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # Configuration for Gitlab-CI. # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines -image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1756 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123 stages: - generate-gitlab-ci From thomas.petazzoni at bootlin.com Tue Feb 7 21:37:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:37:15 +0100 Subject: [Buildroot] [git commit branch/next] package/wolfssl: handle ARM Thumb situation Message-ID: <20230220205253.C10C481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f79a9c775ff0a59027f274a237d98b5f8d31c022 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next By default on ARM32, wolfssl uses assembly instructions that are not supported on Thumb (original Thumb, not Thumb 2), causing a build failure: /tmp/ccgn33X7.s:299: Error: selected processor does not support `umlal r4,r5,r10,ip' in Thumb mode /tmp/ccgn33X7.s:386: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' /tmp/ccgn33X7.s:387: Error: unshifted register required -- `adc r3,r3,#0' /tmp/ccgn33X7.s:395: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' Fix that by passing --with-arm-target=thumb, which tells wolfssl to use a different set of assembly routines. Fixes: http://autobuild.buildroot.net/results/907/907a5967439c3157c426023b0be1e613092d7bfe/ Signed-off-by: Thomas Petazzoni --- package/wolfssl/wolfssl.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index f415e11bb5..8f6cba56ec 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -43,4 +43,8 @@ else WOLFSSL_CONF_OPTS += --disable-armasm endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +WOLFSSL_CONF_OPTS += --with-arm-target=thumb +endif + $(eval $(autotools-package)) From arnout at mind.be Tue Feb 7 21:51:25 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:25 +0100 Subject: [Buildroot] [git commit branch/next] package/systemd: support dnssec if openssl is available Message-ID: <20230220205253.F2D6E81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b16ae93c85355aad3440737bc4ef7c3ec2d534f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Set -Ddefault-dnssec=allow-downgrade if openssl is available as both openssl and gcrypt are now supported for dnssec. Move this out of the gcrypt condition into a joint openssl/gcrypt condition. So the dependency and the openssl/gcrypt config is set in the individual openssl and gcrypt conditions, while the default-dnssec option is set in a joint openssl or gcrypt condition. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/systemd/systemd.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 6536a2740d..cce9162f6d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -245,9 +245,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) SYSTEMD_DEPENDENCIES += libgcrypt -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade -Dgcrypt=true +SYSTEMD_CONF_OPTS += -Dgcrypt=true else -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no -Dgcrypt=false +SYSTEMD_CONF_OPTS += -Dgcrypt=false endif ifeq ($(BR2_PACKAGE_P11_KIT),y) @@ -317,6 +317,12 @@ else SYSTEMD_CONF_OPTS += -Dselinux=false endif +ifneq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_LIBOPENSSL),) +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade +else +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true define SYSTEMD_BUILD_HWDB From arnout at mind.be Tue Feb 7 21:51:23 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:23 +0100 Subject: [Buildroot] [git commit branch/next] package/systemd: Add config option for sysupdate feature Message-ID: <20230220205253.E5E79828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=545f8c4b5a4f95e204f31ecb496ae93aa91fcd86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Support the new feature added with v251, requires openssl. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/systemd/Config.in | 16 ++++++++++++++++ package/systemd/systemd.mk | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 0d4147840d..9f4d933779 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -481,6 +481,22 @@ config BR2_PACKAGE_SYSTEMD_SYSEXT https://www.freedesktop.org/software/systemd/man/systemd-sysext.html +config BR2_PACKAGE_SYSTEMD_SYSUPDATE + bool "enable sysupdate support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + systemd-sysupdate atomically updates the host OS, container + images, portable service images or other sources, based on + the transfer configuration files described in sysupdate.d. + + Note that the bootloader must be configured specifically to + support the A/B update mechanism defined by sysupdate. Only + systemd-boot does this out of the box. + + https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html + config BR2_PACKAGE_SYSTEMD_SYSUSERS bool "enable sysusers support" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index a38eeba1a8..6536a2740d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -91,7 +91,6 @@ SYSTEMD_CONF_OPTS += \ -Dsulogin-path=/usr/sbin/sulogin \ -Dsystem-gid-max=999 \ -Dsystem-uid-max=999 \ - -Dsysupdate=false \ -Dsysvinit-path= \ -Dsysvrcnd-path= \ -Dtelinit-path= \ @@ -494,6 +493,12 @@ else SYSTEMD_CONF_OPTS += -Dsysext=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) +SYSTEMD_CONF_OPTS += -Dsysupdate=true +else +SYSTEMD_CONF_OPTS += -Dsysupdate=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management From thomas.petazzoni at bootlin.com Tue Feb 7 17:38:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:38:53 +0100 Subject: [Buildroot] [git commit branch/next] package/nfs-utils: handle pkg-config in the Autotools standard way for nfsrahead Message-ID: <20230220205253.9C2CB81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=700fc2d7bdb53d33368046840ea91c6c4e6b12b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next While using the correct PKG_CHECK_MODULES() approach for libmount we end up having host-nfs-utils needing libmount. But libmount is only needed by nfsrahead that we don't need in host-nfs-utils. But we need host-nfs-utils itself(rpcgen tool specifically) to build nfs-utils. To solve this recursive situation: 1) Update the first patch with the upstreamed one that handles libmount using PKG_CHECK_MODULES(). 2) Add another patch to allow to disable nfsrahead during building for host since this tool is not needed and requires libmount. This way the first patch approach can be correctly used. 3) Add --disable-nfsrahead to HOST_NFS_UTILS_CONF_OPTS 4) Remove en/disable-uuid since now it's required by default: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=c5528f40f9db5061e06dcf1f9b7fce5185b376c6 Both patches have been committed: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=627c95b2b853161b359095e7fdf05d3b07d51379 https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=844d3ad5376603bc9c205a6084d38a2d25146179 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...fsrahead-fix-linking-while-static-linking.patch | 41 ++++++++----- ...figure.ac-allow-to-disable-nfsrahead-tool.patch | 68 ++++++++++++++++++++++ package/nfs-utils/nfs-utils.mk | 7 +-- 3 files changed, 97 insertions(+), 19 deletions(-) diff --git a/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch b/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch index b8dcea63f7..e1d57f30cf 100644 --- a/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch +++ b/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch @@ -1,31 +1,46 @@ -From a69014a1b4e5b8068630abe3109f31eb64b6a076 Mon Sep 17 00:00:00 2001 +From d9abb221cea81dee5956bd987c6efa680c03571a Mon Sep 17 00:00:00 2001 From: Giulio Benetti -Date: Wed, 10 Aug 2022 00:10:51 +0200 +Date: Wed, 10 Aug 2022 23:38:17 +0200 Subject: [PATCH] nfsrahead: fix linking while static linking --lmount must preceed -lblkid and to obtain this let's add: -`pkg-config --libs mount` -in place of: -`-lmount` -This ways the library order will always be correct. +-lmount must preceed -lblkid and to obtain this let's add in configure.ac: +PKG_CHECK_MODULES([LIBMOUNT], [mount]) +and in tools/nfsrahead/Makefile.am let's substitute explicit `-lmount` +with: +$(LIBMOUNT_LIBS) +This way all the required libraries will be present and in the right order +when static linking. Signed-off-by: Giulio Benetti +[Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=627c95b2b853161b359095e7fdf05d3b07d51379] --- -Pending Upstream: -https://patchwork.kernel.org/project/linux-nfs/patch/20220809223308.1421081-1-giulio.benetti at benettiengineering.com/ ---- + configure.ac | 3 +++ tools/nfsrahead/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 2 files changed, 4 insertions(+), 1 deletion(-) +diff --git a/configure.ac b/configure.ac +index f1c46c5c..ff85200b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -273,6 +273,9 @@ AC_LIBCAP + dnl Check for -lxml2 + AC_LIBXML2 + ++dnl Check for -lmount ++PKG_CHECK_MODULES([LIBMOUNT], [mount]) ++ + # Check whether user wants TCP wrappers support + AC_TCP_WRAPPERS + diff --git a/tools/nfsrahead/Makefile.am b/tools/nfsrahead/Makefile.am -index 845ea0d5..280a2eb4 100644 +index 845ea0d5..7e08233a 100644 --- a/tools/nfsrahead/Makefile.am +++ b/tools/nfsrahead/Makefile.am @@ -1,6 +1,6 @@ libexec_PROGRAMS = nfsrahead nfsrahead_SOURCES = main.c -nfsrahead_LDFLAGS= -lmount -+nfsrahead_LDFLAGS= `pkg-config --libs mount` ++nfsrahead_LDFLAGS= $(LIBMOUNT_LIBS) nfsrahead_LDADD = ../../support/nfs/libnfsconf.la man5_MANS = nfsrahead.man diff --git a/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch b/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch new file mode 100644 index 0000000000..ee5e3fa251 --- /dev/null +++ b/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch @@ -0,0 +1,68 @@ +From 9a0002978eb32b78d22f053302e012a4255dc4ef Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 19 Sep 2022 23:43:28 +0200 +Subject: [PATCH] configure.ac: allow to disable nfsrahead tool + +This allows to make libmount not mandatory but depending on nfsrahead +since it only requires it. This is useful when cross-compiling because +in that case we need rpcgen only built for host but not nfsrahead that +also require libmount. So this reduces the dependencies for host +building. + +Signed-off-by: Giulio Benetti +[Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=844d3ad5376603bc9c205a6084d38a2d25146179] +--- + configure.ac | 13 ++++++++++--- + tools/Makefile.am | 6 +++++- + 2 files changed, 15 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ff85200b..5d9cbf31 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -249,6 +249,16 @@ AC_ARG_ENABLE(nfsdcld, + enable_nfsdcld=$enableval, + enable_nfsdcld="yes") + ++AC_ARG_ENABLE(nfsrahead, ++ [AS_HELP_STRING([--disable-nfsrahead],[disable nfsrahead command @<:@default=no@:>@])], ++ enable_nfsrahead=$enableval, ++ enable_nfsrahead="yes") ++ AM_CONDITIONAL(CONFIG_NFSRAHEAD, [test "$enable_nfsrahead" = "yes" ]) ++ if test "$enable_nfsrahead" = yes; then ++ dnl Check for -lmount ++ PKG_CHECK_MODULES([LIBMOUNT], [mount]) ++ fi ++ + AC_ARG_ENABLE(nfsdcltrack, + [AS_HELP_STRING([--disable-nfsdcltrack],[disable NFSv4 clientid tracking programs @<:@default=no@:>@])], + enable_nfsdcltrack=$enableval, +@@ -273,9 +283,6 @@ AC_LIBCAP + dnl Check for -lxml2 + AC_LIBXML2 + +-dnl Check for -lmount +-PKG_CHECK_MODULES([LIBMOUNT], [mount]) +- + # Check whether user wants TCP wrappers support + AC_TCP_WRAPPERS + +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 40c17c37..48fd0cdf 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -12,6 +12,10 @@ if CONFIG_NFSDCLD + OPTDIRS += nfsdclddb + endif + +-SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcctl nfsdclnts nfsrahead $(OPTDIRS) ++if CONFIG_NFSRAHEAD ++OPTDIRS += nfsrahead ++endif ++ ++SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcctl nfsdclnts $(OPTDIRS) + + MAINTAINERCLEANFILES = Makefile.in +-- +2.34.1 + diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index ed205a26b1..1a4a99f566 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -34,6 +34,7 @@ HOST_NFS_UTILS_CONF_OPTS = \ --without-tcp-wrappers \ --with-statedir=/run/nfs \ --disable-caps \ + --disable-nfsrahead \ --without-systemd \ --with-rpcgen=internal \ --with-tirpcinclude=$(HOST_DIR)/include/tirpc @@ -68,12 +69,6 @@ else NFS_UTILS_CONF_OPTS += --disable-caps endif -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) -NFS_UTILS_CONF_OPTS += --enable-uuid -else -NFS_UTILS_CONF_OPTS += --disable-uuid -endif - define NFS_UTILS_INSTALL_FIXUP cd $(TARGET_DIR) && rm -f $(NFS_UTILS_TARGETS_) touch $(TARGET_DIR)/etc/exports From thomas.petazzoni at bootlin.com Tue Feb 7 21:37:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:37:15 +0100 Subject: [Buildroot] [git commit branch/next] package/wolfssl: disable broken asm implementations on 32-bit Arm Message-ID: <20230220205253.B444B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36b8c9494b56b877fea62f17926f747c7c7bfb8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next wolfSSL has ARMv8-A assembly implementations of some functions for both A64 and A32 ISAs. However, some of the A32 versions use r11, which is usually not allowed: wolfcrypt/src/port/arm/armv8-aes.c: In function 'wc_AesCbcEncrypt': wolfcrypt/src/port/arm/armv8-aes.c:3303:5: error: fp cannot be used in 'asm' here 3303 | } | ^ That can be fixed by adding the compiler flag -fomit-frame-pointer, but then there is another failure: /tmp/ccV19DQV.s: Assembler messages: /tmp/ccV19DQV.s:248: Error: first transfer register must be even -- `ldrd r11,r10,[r14,#4*14]' make[3]: *** [Makefile:5858: wolfcrypt/src/port/arm/src_libwolfssl_la-armv8-chacha.lo] Error 1 This is definitely not a valid instruction in A32, which suggests that this code isn't being tested at all upstream. So disable it here. Fixes: http://autobuild.buildroot.net/results/502/502a2b217845eb290c1961d4740b032462f8ae53/ Signed-off-by: Ben Hutchings Signed-off-by: Thomas Petazzoni --- package/wolfssl/wolfssl.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index cd3acd9411..f415e11bb5 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -33,14 +33,12 @@ WOLFSSL_CONF_OPTS += --disable-sslv3 endif # enable ARMv8 hardware acceleration -ifeq ($(BR2_ARM_CPU_ARMV8A),y) +ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm # the flag -mstrict-align is needed to prevent build errors caused by # some inline assembly in parts of the AES structure using the "m" # constraint -ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -mstrict-align" -endif else WOLFSSL_CONF_OPTS += --disable-armasm endif From thomas.petazzoni at bootlin.com Tue Feb 7 21:55:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:55:49 +0100 Subject: [Buildroot] [git commit branch/next] gitlab-ci: don't use before_script in job templates Message-ID: <20230220205254.13F4A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e92bb8f1c9523227413500380df16bfc64053fad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When gitlab prepares a job to run, it checks out the repository with a non-root user, and spawns a container that runs as root, with some UID mapping that makes the files be owned by root in the container. However, our pipelines run as a nont-root user. Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated the docker image that is used to run in our pipelines. That new image includes a git version that is stricter about the ownership of the git tree it is acting in: git aborts in error when the user running it does not own the repository. We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} rules, so they all fail (in various ways). To fix this, we either need to fix the ownership or tell git to ignore the situation. In either case, we'll need to run a scriptlet before all our jobs. Gitlab-ci allows to provide a global before_script, that is inherited by all jobs. However, some of our jobs already declare a before_script, and that would shadow the global before_script. There is no technical reason to do our before_script separately from the actual script, so we move the code from the before_scripts to the corresponding scripts. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/misc/gitlab-ci.yml.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 0ccf36665e..9c1faf0d5f 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -23,9 +23,8 @@ - utils/check-symbols .defconfig_check: - before_script: - - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') script: + - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - support/scripts/check-dotconfig.py .config configs/${DEFCONFIG_NAME} @@ -44,10 +43,9 @@ } .defconfig_base: - before_script: + script: - DEFCONFIG_NAME=${CI_JOB_NAME} - OUTPUT_DIR=output - script: - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} @@ -72,13 +70,12 @@ - runtime-test.log .runtime_test_base: - before_script: - - TEST_CASE_NAME=${CI_JOB_NAME} # Keep build directories so the rootfs can be an artifact of the job. The # runner will clean up those files for us. # Multiply every emulator timeout by 10 to avoid sporadic failures in # elastic runners. script: + - TEST_CASE_NAME=${CI_JOB_NAME} - echo "Starting runtime test ${TEST_CASE_NAME}" - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} artifacts: @@ -91,9 +88,8 @@ .test_pkg: stage: build - before_script: - - OUTPUT_DIR=${CI_JOB_NAME} script: + - OUTPUT_DIR=${CI_JOB_NAME} - echo "Configure Buildroot for ${OUTPUT_DIR}" - make O=${OUTPUT_DIR} syncconfig - make O=${OUTPUT_DIR} savedefconfig From thomas.petazzoni at bootlin.com Tue Feb 7 22:03:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:03:03 +0100 Subject: [Buildroot] [git commit branch/next] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring Message-ID: <20230220205254.3AA00828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c8ee42bbe6ebb7f20978b06a581c42733197ae2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The vendoring done for cargo / go packages (may) need git, so ensure we check for it in dependencies, similar to how it is done for packages directly using git. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5d618c6b39..82187d7db9 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1250,6 +1250,13 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD +# cargo/go vendoring (may) need git +ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),cargo) +DL_TOOLS_DEPENDENCIES += git +else ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),go) +DL_TOOLS_DEPENDENCIES += git +endif + DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. From thomas.petazzoni at bootlin.com Tue Feb 7 22:03:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:03:10 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: ensure git is >= 2.0.0 for vendoring Message-ID: <20230220205254.4579F81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f229564c36ec64c1f1292b7281ae0bd33840d7a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The go vendoring fails on CentOS 7 (which uses git 1.8.3.1) with errors related to shallow clones: make docker-compose-source .. go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 github.com/docker/compose/v2/pkg/mocks imports github.com/theupdateframework/notary/client imports github.com/docker/go/canonical/json: github.com/docker/go at v1.5.1-1.0.20160303222718-d30aec9fd63c: invalid pseudo-version: git fetch --unshallow -f origin in /home/jacmet/source/buildroot-mirror/output/host/share/go-path/pkg/mod/cache/vcs/48fbd2dfabec81f4c93170677bfc89087d4bec07a2d08f6ca5ce3d17962677ee: exit status 128: fatal: git fetch-pack: expected shallow list make[1]: *** [/home/jacmet/source/buildroot-mirror/output/build/docker-compose-2.15.1/.stamp_downloaded] Error 1 It works with git 2.0.0 (released May 2014, included in Debian 8), so check for >= 2.0.0 with logic similar to the GNU patch version check. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 0aa5e59274..cf6635bff6 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -174,6 +174,16 @@ for prog in perl tar wget cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do echo " xargs is usually part of the findutils package in your distribution" fi fi + + # we need git >= 2.0.0 for shallow clones / vendoring + if test $prog = "git" ; then + GIT_VERSION="$(git --version | sed -n 's/^git version \(.*\)/\1/p')" + GIT_MAJOR="$(echo "${GIT_VERSION}" | cut -d . -f 1)" + if [ "${GIT_MAJOR}" -lt 2 ]; then + echo "You have git '${GIT_VERSION}' installed. Git >= 2.0.0 is required" + exit 1 + fi + fi done if test "${missing_progs}" = "yes" ; then From thomas.petazzoni at bootlin.com Tue Feb 7 21:55:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:55:49 +0100 Subject: [Buildroot] [git commit branch/next] gitlab-ci: fix pipelines Message-ID: <20230220205254.1E64181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a016b693f7830f3c8ae815851d3204b8b6e99821 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When gitlab prepares a job to run, it checks out the repository with a non-root user, and spawns a container that runs as root, with some UID mapping that makes the files be owned by root in the container. However, our pipelines run as a nont-root user. Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated the docker image that is used to run in our pipelines. That new image includes a git version that is stricter about the ownership of the git tree it is acting in: git aborts in error when the user running it does not own the repository. We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} rules, so they all fail (in various ways). To fix this, we either need to fix the ownership or tell git to ignore the situation. It is most probably impossible to change the ownership of the files: we run as non-root,and the files belong to root (in the container). So we're stuck. The alternative, is to do as git suggest, and tell it to ignore the situation. In a local setup, this would be very insecure, but in the pipelines, this is in a throw-away container, where a single user exists and is running, so we don't care much (if at all). Add a global before_script that registers the git config to ignore ownership issues in the buildroot repository; see [0] for the definition of the CI_PROJECT_DIR variable. Note: unlike what is said in there, and in [1], the value actually seen in CI_PROJECT_DIR is already prefixed with CI_BUILDS_DIR (the documentation is unclear about that point). [0] https://docs.gitlab.com/ee/ci/variables/predefined_variables.html [1] https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/misc/gitlab-ci.yml.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 9c1faf0d5f..38aca31fb5 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -1,3 +1,6 @@ +before_script: + - git config --global --add safe.directory ${CI_PROJECT_DIR} + .check-check-package_base: script: - python3 -m pytest -v utils/checkpackagelib/ From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:52 +0100 Subject: [Buildroot] [git commit branch/next] package/perl-mail-dkim: bump version to 1.20220520 Message-ID: <20230220205254.679E6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57a64a702a1c162a33097db7ee7e069fb64b39df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-mail-dkim/perl-mail-dkim.hash | 4 ++-- package/perl-mail-dkim/perl-mail-dkim.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-mail-dkim/perl-mail-dkim.hash b/package/perl-mail-dkim/perl-mail-dkim.hash index e94adfc6ed..6edeaa9d8b 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.hash +++ b/package/perl-mail-dkim/perl-mail-dkim.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9de35f8aa77a85dc17423cbcce2bf46d Mail-DKIM-1.20200824.tar.gz -sha256 871d329830acb4840423aa59036622fb2ee394efc1d09316dcc32ae94454e916 Mail-DKIM-1.20200824.tar.gz +md5 5a0dec58f0c2526521b2952a3c126906 Mail-DKIM-1.20220520.tar.gz +sha256 8ac4b8c84bbfad00a3d24bf676493d207dd3cd4a735efabb9e17181534f23646 Mail-DKIM-1.20220520.tar.gz # computed by scancpan sha256 ffaa40feb768566e52d93879fedd2c5483828b6de483874f30a0a4425351555f LICENSE diff --git a/package/perl-mail-dkim/perl-mail-dkim.mk b/package/perl-mail-dkim/perl-mail-dkim.mk index e67bf5ee18..f3383a02bf 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.mk +++ b/package/perl-mail-dkim/perl-mail-dkim.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MAIL_DKIM_VERSION = 1.20200824 +PERL_MAIL_DKIM_VERSION = 1.20220520 PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MB/MBRADSHAW PERL_MAIL_DKIM_LICENSE = Artistic or GPL-1.0+ From thomas.petazzoni at bootlin.com Tue Feb 7 22:17:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:17:46 +0100 Subject: [Buildroot] [git commit branch/next] package/php: bump version to 8.2.1 Message-ID: <20230220205254.7463D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90ab065162a35b8aa2c429903e3d59d4ad2c0d7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_2 Updated license hash due to copyright year bump: https://github.com/php/php-src/commit/bf2867bc7235dfb65675ff4e9c21c8bc537726e2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/php/php.hash | 4 ++-- package/php/php.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 23ec84f19f..a9c3b7640b 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 e16e47a872d58685913ac848ce92ec49f42c1828110c98c65fb6265a08724a1a php-8.1.14.tar.xz +sha256 650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af php-8.2.1.tar.xz # License file -sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE +sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 23dd4ba96f..372d55f68a 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.1.14 +PHP_VERSION = 8.2.1 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Tue Feb 7 22:23:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 23:23:19 +0100 Subject: [Buildroot] [git commit branch/next] package/gcc: map debug prefix when reproducible Message-ID: <20230220205254.8040F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9a92ea1cb1dd2aa9b3f9c83c04d7d01c1f6e148 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When building with BR2_REPRODUCIBLE the toolchain wrapper passes -fdebug-prefix-map for all packages that are built. But this doesn't affect the target libraries (like libgcc) built by GCC's build system. GCC 4.3 added a configure option to set the debug prefix map for these libraries, which is used here to avoid encoding potentially non-reproducible build paths into the debug data. Signed-off-by: John Keeping Signed-off-by: Yann E. MORIN --- package/gcc/gcc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index ec6f3b550a..6dfd93f2a4 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -84,6 +84,10 @@ HOST_GCC_COMMON_CONF_OPTS = \ --with-bugurl="http://bugs.buildroot.net/" \ --without-zstd +ifeq ($(BR2_REPRODUCIBLE),y) +HOST_GCC_COMMON_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot +endif + # Don't build documentation. It takes up extra space / build time, # and sometimes needs specific makeinfo versions to work HOST_GCC_COMMON_CONF_ENV = \ From thomas.petazzoni at bootlin.com Wed Feb 8 08:54:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:54:49 +0100 Subject: [Buildroot] [git commit branch/next] package/intel-mediadriver: bump version to 23.1.0 Message-ID: <20230220205254.A434381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19447f02f729ff373e138a74f3c2477739f425df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 a5e9c64e97..e4e41e4ad3 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b553290e829dfd824eb62295c9f07dbe8062ce7998f7c527cc92856d0792562d intel-media-22.6.6.tar.gz +sha256 edae1bdc07b694bd6e42099feddcf875e3b5d7254894f4b3fb292128577baf82 intel-media-23.1.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 8fa93218fa..6cc862dce4 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.6.6 +INTEL_MEDIADRIVER_VERSION = 23.1.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 thomas.petazzoni at bootlin.com Wed Feb 8 08:55:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:55:42 +0100 Subject: [Buildroot] [git commit branch/next] package/intel-mediasdk: bump version to 23.1.0 Message-ID: <20230220205254.AF5E0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5997d0d63557488f2cbd06d4425fa3410adf336b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 903b6f3394..a2c4243790 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3a671cc692da5111c041088f5e32528b4346e122e8a134fad71310c572705106 intel-mediasdk-22.6.5.tar.gz +sha256 9208c35641ba995760d662689426a6c433973cf5283b8510f9cfb774e4b9cb38 intel-mediasdk-23.1.0.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index f7bce30c74..462d487ebe 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.6.5 +INTEL_MEDIASDK_VERSION = 23.1.0 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 8 10:47:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:47:10 +0100 Subject: [Buildroot] [git commit branch/next] package/libressl: security bump to version 3.6.2 Message-ID: <20230220205254.C73D381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02f80f5c224a1d8830fab48ae0c19a9e28f2c082 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next security fix: A malicious certificate revocation list or timestamp response token would allow an attacker to read arbitrary memory. Signed-off-by: Francois Perrad 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 0988e6a36d..907b9cdd06 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 acfac61316e93b919c28d62d53037ca734de85c46b4d703f19fd8395cf006774 libressl-3.6.1.tar.gz +sha256 4be80fff073746cf50b4a8e5babe2795acae98c6b132a9e02519b445dfbfd033 libressl-3.6.2.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 8fd7bccbc4..b5fae7e26e 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.6.1 +LIBRESSL_VERSION = 3.6.2 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 thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for widgets Message-ID: <20230220205255.0D1BD828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05e4ad9c7e64e85d56126db8396dcf98138e84ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 5 +++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 394b2d8745..973fb2f11c 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -95,6 +95,11 @@ config BR2_PACKAGE_QT6BASE_PNG This option enables PNG support using the system libpng library. +config BR2_PACKAGE_QT6BASE_WIDGETS + bool "widgets module" + help + This option enables the Qt6Widgets library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index b368cd6dca..2a0afa6d27 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -215,6 +215,12 @@ else QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:17 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for jpeg/png/gif image format Message-ID: <20230220205255.00BA681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6d91bc90afab2d601f55990e94c4cef9f0317ce6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 19 +++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index ac2058c901..394b2d8745 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -76,6 +76,25 @@ config BR2_PACKAGE_QT6BASE_HARFBUZZ if the toolchain supports __sync for 4 bytes, or the qt provided one which avoids this dependency by using QAtomic). +config BR2_PACKAGE_QT6BASE_GIF + bool "GIF support" + help + This compiles and installs the plugin for GIF reading support. + +config BR2_PACKAGE_QT6BASE_JPEG + bool "JPEG support" + select BR2_PACKAGE_JPEG + help + This option enables JPEG support using the system libjpeg + library. + +config BR2_PACKAGE_QT6BASE_PNG + bool "PNG support" + select BR2_PACKAGE_LIBPNG + help + This option enables PNG support using the system libpng + library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 6c155a4abb..b368cd6dca 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -188,6 +188,26 @@ else QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PNG),y) +QT6BASE_CONF_OPTS += -DFEATURE_png=ON -DFEATURE_system_png=ON +QT6BASE_DEPENDENCIES += libpng +else +QT6BASE_CONF_OPTS += -DFEATURE_png=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_GIF),y) +QT6BASE_CONF_OPTS += -DFEATURE_gif=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_gif=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_JPEG),y) +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=ON +QT6BASE_DEPENDENCIES += jpeg +else +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig From thomas.petazzoni at bootlin.com Wed Feb 8 10:50:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:50:37 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for gui module Message-ID: <20230220205254.DE12B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c189e7462103591eb17d34a6e33430ddc636c84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 31 +++++++++++++++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index e8357a675c..1810b1586d 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,37 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_GUI + bool "gui module" + select BR2_PACKAGE_FREETYPE + # At least one graphic backend must be enabled, so enable + # linuxfb if nothing is enabled. + select BR2_PACKAGE_QT6BASE_LINUXFB if \ + !BR2_PACKAGE_QT6BASE_XCB + help + This option enables the Qt6Gui library. + +if BR2_PACKAGE_QT6BASE_GUI + +config BR2_PACKAGE_QT6BASE_LINUXFB + bool "linuxfb support" + +config BR2_PACKAGE_QT6BASE_XCB + bool "X.org XCB support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_IMAGE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_LIBXKBCOMMON + +comment "X.org XCB backend available if X.org is enabled" + depends on !BR2_PACKAGE_XORG7 + +endif + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2f159f380b..bcf2464590 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -40,7 +40,6 @@ QT6BASE_INSTALL_STAGING = YES QT6BASE_CONF_OPTS = \ -GNinja \ -DQT_HOST_PATH=$(HOST_DIR) \ - -DFEATURE_gui=OFF \ -DFEATURE_concurrent=OFF \ -DFEATURE_xml=OFF \ -DFEATURE_sql=OFF \ @@ -141,6 +140,42 @@ else QT6BASE_CONF_OPTS += -DFEATURE_glib=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_gui=ON \ + -DFEATURE_freetype=ON \ + -DINPUT_opengl=no \ + -DFEATURE_vulkan=OFF +QT6BASE_DEPENDENCIES += freetype + +ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_xcb=ON \ + -DFEATURE_xcb_xlib=ON \ + -DFEATURE_xkbcommon=ON \ + -DFEATURE_xkbcommon_x11=ON +QT6BASE_DEPENDENCIES += \ + libxcb \ + libxkbcommon \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xlib_libX11 +else +QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add QPA backend selection Message-ID: <20230220205255.30917828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bd9a456b2e2c818f35d22a212812087c3f28e4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 13 +++++++++++++ package/qt6/qt6base/qt6base.mk | 3 +++ 2 files changed, 16 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 131dfadc1b..3af6fd9f72 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -67,6 +67,19 @@ config BR2_PACKAGE_QT6BASE_EGLFS depends on BR2_PACKAGE_QT6_GL_SUPPORTS select BR2_PACKAGE_QT6BASE_OPENGL +config BR2_PACKAGE_QT6BASE_DEFAULT_QPA + string "Default graphical platform" + help + Choose the default platform abstraction to use for graphical + applications (e.g xcb, linuxfb, eglfs, ...). If this is + empty, the default for your architecture will be used + (usually this is eglfs). + + You can get a list of supported platforms by running a Qt + application with the option "-platform help" on your + target. You can choose a different platform at runtime with + the -platform option. + config BR2_PACKAGE_QT6BASE_OPENGL bool "OpenGL support" depends on BR2_PACKAGE_QT6_GL_SUPPORTS diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2540fbb59c..828fe57d0b 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -250,6 +250,9 @@ else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif +QT6BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT6BASE_DEFAULT_QPA)) +QT6BASE_CONF_OPTS += $(if $(QT6BASE_DEFAULT_QPA),-DQT_QPA_DEFAULT_PLATFORM=$(QT6BASE_DEFAULT_QPA)) + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add opengl support Message-ID: <20230220205255.243F181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=beeae174f9fffe6ea9c50a717a9b45c71ed45ea9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 5 +++++ package/qt6/qt6base/Config.in | 42 +++++++++++++++++++++++++++++++++++++++++- package/qt6/qt6base/qt6base.mk | 18 +++++++++++++++++- 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 4b2b9a1174..831ae72c3c 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -12,6 +12,11 @@ config BR2_PACKAGE_QT6_ARCH_SUPPORTS default y if BR2_sparc64 depends on BR2_USE_MMU +config BR2_PACKAGE_QT6_GL_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + comment "qt6 needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, host gcc >= 8" depends on !BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT6_ARCH_SUPPORTS diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 973fb2f11c..131dfadc1b 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -36,7 +36,8 @@ config BR2_PACKAGE_QT6BASE_GUI # At least one graphic backend must be enabled, so enable # linuxfb if nothing is enabled. select BR2_PACKAGE_QT6BASE_LINUXFB if \ - !BR2_PACKAGE_QT6BASE_XCB + !BR2_PACKAGE_QT6BASE_XCB && \ + !BR2_PACKAGE_QT6BASE_EGLFS help This option enables the Qt6Gui library. @@ -59,6 +60,45 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_EGLFS + bool "eglfs support" + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGBM + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_QT6BASE_OPENGL + +config BR2_PACKAGE_QT6BASE_OPENGL + bool "OpenGL support" + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + help + This option enables OpenGL support. + +comment "OpenGL support needs an OpenGL-capable backend" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS + +if BR2_PACKAGE_QT6BASE_OPENGL + +choice + prompt "OpenGL API" + help + Select OpenGL API. + +config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP + bool "Desktop OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL + help + Use desktop OpenGL. + +config BR2_PACKAGE_QT6BASE_OPENGL_ES2 + bool "OpenGL ES 2.0+" + depends on BR2_PACKAGE_HAS_LIBGLES + help + Use OpenGL ES 2.0 and later versions. + +endchoice + +endif + config BR2_PACKAGE_QT6BASE_FONTCONFIG bool "fontconfig support" select BR2_PACKAGE_FONTCONFIG diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 911375aa6d..2540fbb59c 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -144,7 +144,6 @@ ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) QT6BASE_CONF_OPTS += \ -DFEATURE_gui=ON \ -DFEATURE_freetype=ON \ - -DINPUT_opengl=no \ -DFEATURE_vulkan=OFF QT6BASE_DEPENDENCIES += freetype @@ -230,6 +229,23 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) +QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON +QT6BASE_DEPENDENCIES += libegl libgbm +else +QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON +QT6BASE_DEPENDENCIES += libgl +else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON +QT6BASE_DEPENDENCIES += libgles +else +QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for libinput Message-ID: <20230220205255.477AD81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2db19af40179d6c2dfd78e08c005e67b01cdc01e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 8db59bbc31..49a61e4d25 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -229,6 +229,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_LIBINPUT),y) +QT6BASE_CONF_OPTS += -DFEATURE_libinput=ON +QT6BASE_DEPENDENCIES += libinput +else +QT6BASE_CONF_OPTS += -DFEATURE_libinput=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON QT6BASE_DEPENDENCIES += tslib From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for kms Message-ID: <20230220205255.5577486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=653e573436398ed58e0d4323d684c237b55f9378 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 49a61e4d25..f4e63ab8d9 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -207,6 +207,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT6BASE_CONF_OPTS += -DFEATURE_kms=ON +QT6BASE_DEPENDENCIES += libdrm +else +QT6BASE_CONF_OPTS += -DFEATURE_kms=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig From peter at korsgaard.com Wed Feb 8 10:57:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:57:26 +0100 Subject: [Buildroot] [git commit branch/next] package/neon-2-sse: bump to version 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f Message-ID: <20230220205255.819BC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c419ef62d84b5be65599452ab84f7ed719bbe470 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/neon-2-sse/0001-Fix-cmake-languages.patch | 40 ----------------------- package/neon-2-sse/neon-2-sse.hash | 2 +- package/neon-2-sse/neon-2-sse.mk | 2 +- 3 files changed, 2 insertions(+), 42 deletions(-) diff --git a/package/neon-2-sse/0001-Fix-cmake-languages.patch b/package/neon-2-sse/0001-Fix-cmake-languages.patch deleted file mode 100644 index e0becb1ffa..0000000000 --- a/package/neon-2-sse/0001-Fix-cmake-languages.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 186ec82e033d8c718d760d14945535a9d7e160fd Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sun, 29 Jan 2023 21:00:27 -0700 -Subject: [PATCH] Fix cmake languages - -When no language is set cmake defaults to C and CXX, since we support -C by itself we should set the project language to C so that we don't -get a compiler error when building without a CXX toolchain. - -Fixes: -CMake Error at CMakeLists.txt:5 (project): - No CMAKE_CXX_COMPILER could be found. - - Tell CMake where to find the compiler by setting either the environment - variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path - to the compiler, or to the compiler name if it is in the PATH. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/intel/ARM_NEON_2_x86_SSE/pull/62] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e4b8980..8f58e79 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,7 +2,7 @@ - # Modification: Copyright (C) 2017 David Hirvonen - - cmake_minimum_required(VERSION 3.0) --project(NEON_2_SSE VERSION 1.0.0) -+project(NEON_2_SSE VERSION 1.0.0 LANGUAGES C) - - add_library(${PROJECT_NAME} INTERFACE) - --- -2.34.1 - diff --git a/package/neon-2-sse/neon-2-sse.hash b/package/neon-2-sse/neon-2-sse.hash index ded20d58f5..f964d2fa61 100644 --- a/package/neon-2-sse/neon-2-sse.hash +++ b/package/neon-2-sse/neon-2-sse.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 019fbc7ec25860070a1d90e12686fc160cfb33e22aa063c80f52b363f1361e9d neon-2-sse-a15b489e1222b2087007546b4912e21293ea86ff.tar.gz +sha256 4567ca8c8cbc8ce0ea3ddb9dc0f158707eb85c631cb400fd7010cd299cdc5377 neon-2-sse-097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f.tar.gz # License files, locally calculated sha256 7022f51b439a5915e933ecc270c83e24ca0cb2cceeb08b0132dcd4dbb03ed2dc LICENSE diff --git a/package/neon-2-sse/neon-2-sse.mk b/package/neon-2-sse/neon-2-sse.mk index 3e87c62e21..ee6f5446b6 100644 --- a/package/neon-2-sse/neon-2-sse.mk +++ b/package/neon-2-sse/neon-2-sse.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEON_2_SSE_VERSION = a15b489e1222b2087007546b4912e21293ea86ff +NEON_2_SSE_VERSION = 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f NEON_2_SSE_SITE = $(call github,intel,ARM_NEON_2_x86_SSE,$(NEON_2_SSE_VERSION)) NEON_2_SSE_LICENSE = BSD-2-Clause NEON_2_SSE_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 8 11:19:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:19:56 +0100 Subject: [Buildroot] [git commit branch/next] configs/olimex_stmp157: configure eth0 with DHCP Message-ID: <20230220205255.A5182828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4ad6d332b9e47e432f9934405946621b2e0c09a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_stmp157_olinuxino_lime_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index 49670dbe4f..60c34d7fa1 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -8,6 +8,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="stmp1-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/stmp1_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/stmp1_olinuxino/genimage.cfg" From peter at korsgaard.com Mon Feb 20 20:58:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:39 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 5.15.x / 6.{0, 1}.x series Message-ID: <20230220205222.4CF5686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a94567b4b5481c14352be3e293672572a326836c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 6 +++--- package/linux-headers/Config.in.host | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index b5c65eded4..bca1b3fc8b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.2" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 8d85dc4c6f..8ac04b60f9 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,8 +1,8 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 a3e61377cf4435a9e2966b409a37a1056f6aaa59e561add9125a88e3c0971dfb linux-6.1.1.tar.xz -sha256 d484eb3d4f88be14b42507a85ad4b0932e92e7a742acbce74e8be007124a6820 linux-6.0.15.tar.xz +sha256 ee41f3c4f599b2f46f08aae428c9243db403e7292eb2c9f04ee34909b038d1ae linux-6.1.2.tar.xz +sha256 842071bca611c1f080cbc39c7ab3a6b58d7951f4f41e553b3db4fbe3e0705ce4 linux-6.0.16.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 2c0bae29fac98e0a9408914a4551b2971365ac0000351cb255d6bd9aa0849808 linux-5.15.85.tar.xz +sha256 80fcd9efa443502de9e2750f6dfb59e8de43a5d87a6d2be09dca748d79b5f2ee linux-5.15.86.tar.xz sha256 7aaaf6d0bcd8a2cfa14ad75f02ca62bb2de08aad3bee3eff198de49ea5254079 linux-5.10.161.tar.xz sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 60bbe5b768..216b496fe4 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -401,9 +401,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.269" if BR2_KERNEL_HEADERS_4_19 default "5.4.228" if BR2_KERNEL_HEADERS_5_4 default "5.10.161" if BR2_KERNEL_HEADERS_5_10 - default "5.15.85" if BR2_KERNEL_HEADERS_5_15 - default "6.0.15" if BR2_KERNEL_HEADERS_6_0 - default "6.1.1" if BR2_KERNEL_HEADERS_6_1 + default "5.15.86" if BR2_KERNEL_HEADERS_5_15 + default "6.0.16" if BR2_KERNEL_HEADERS_6_0 + default "6.1.2" if BR2_KERNEL_HEADERS_6_1 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 Mon Feb 20 20:58:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:39 -0000 Subject: [Buildroot] [git commit branch/next] package/cni-plugins: bump version to 1.2.0 Message-ID: <20230220205244.BCCBD86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb6410b09b339a372e1cc9b9f09901635ebdf406 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Adds new device driver main/dummy and various bug fixes/cleanups. https://github.com/containernetworking/plugins/releases/tag/v1.2.0 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/cni-plugins/cni-plugins.hash | 2 +- package/cni-plugins/cni-plugins.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/cni-plugins/cni-plugins.hash b/package/cni-plugins/cni-plugins.hash index fc3b5a7ead..0c3e07c91c 100644 --- a/package/cni-plugins/cni-plugins.hash +++ b/package/cni-plugins/cni-plugins.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c86c44877c47f69cd23611e22029ab26b613f620195b76b3ec20f589367a7962 cni-plugins-1.1.1.tar.gz +sha256 f3496ddda9c7770a0b695b67ae7ee80a4ee331ac2745af4830054b81627f79b7 cni-plugins-1.2.0.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/cni-plugins/cni-plugins.mk b/package/cni-plugins/cni-plugins.mk index b30937095a..be02c2ff45 100644 --- a/package/cni-plugins/cni-plugins.mk +++ b/package/cni-plugins/cni-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_VERSION = 1.1.1 +CNI_PLUGINS_VERSION = 1.2.0 CNI_PLUGINS_SITE = $(call github,containernetworking,plugins,v$(CNI_PLUGINS_VERSION)) CNI_PLUGINS_LICENSE = Apache-2.0 CNI_PLUGINS_LICENSE_FILES = LICENSE @@ -12,6 +12,7 @@ CNI_PLUGINS_LICENSE_FILES = LICENSE CNI_PLUGINS_BUILD_TARGETS = \ plugins/ipam/dhcp \ plugins/main/bridge \ + plugins/main/dummy \ plugins/main/host-device \ plugins/main/ipvlan \ plugins/main/loopback \ From peter at korsgaard.com Mon Feb 20 20:58:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:40 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Julien Olivain for package/gnupg2 Message-ID: <20230220205222.F3DB4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f02b4ba5d17922e52d17f00c3ecaa40563522f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8399dcc7af..86e3f0e7b1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1682,6 +1682,7 @@ F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ +F: package/gnupg2/ F: package/glslsandbox-player/ F: package/octave/ F: package/ola/ From peter at korsgaard.com Mon Feb 20 20:58:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:40 -0000 Subject: [Buildroot] [git commit branch/next] package/libwpe: bump to version 1.14.0 Message-ID: <20230220205223.1033786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ae7a1a22146e817b8d5cac03d321b5eece65bb4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This version is the first stable release with support for gamepad input events and configuring target frame rates. These will be used by a follow-up update of the wpewebkit package. Release notes: https://wpewebkit.org/release/libwpe-1.14.0.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/libwpe/libwpe.hash | 8 ++++---- package/libwpe/libwpe.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash index 2bbe1f0749..28b7685b93 100644 --- a/package/libwpe/libwpe.hash +++ b/package/libwpe/libwpe.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.12.3.tar.xz.sums -md5 e538eb8e521d92f2bde3c4cd864abaa1 libwpe-1.12.3.tar.xz -sha1 9d94c411a502a10e68f69bd1fa273539cc6af2ca libwpe-1.12.3.tar.xz -sha256 b84fdbfbc849ce4fdf084bb28b58e5463b1b4b6cc8f200dc77b41f8545d5329d libwpe-1.12.3.tar.xz +# From https://wpewebkit.org/releases/libwpe-1.14.0.tar.xz.sums +md5 f9737912975f979f9e4e01eec174a271 libwpe-1.14.0.tar.xz +sha1 7a5d51c99254fc14ffcbcca9e8550cc7940fe871 libwpe-1.14.0.tar.xz +sha256 c073305bbac5f4402cc1c8a4753bfa3d63a408901f86182051eaa5a75dd89c00 libwpe-1.14.0.tar.xz # Hashes for license files: sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk index ac533642d9..e7b3ce9eaf 100644 --- a/package/libwpe/libwpe.mk +++ b/package/libwpe/libwpe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWPE_VERSION = 1.12.3 +LIBWPE_VERSION = 1.14.0 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz LIBWPE_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:58:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:40 -0000 Subject: [Buildroot] [git commit branch/next] package/moby-buildkit: bump to version 0.11.2 Message-ID: <20230220205244.C79BE8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c7c179e9a50b908b14aa2dd2f11c5df5a42109a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/moby/buildkit/releases/tag/v0.11.2 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- 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 43ee1b12c9..ef927636d9 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5ffe5a2d11736719649dae962461f66df394ae4cc1e58294e5f2bd4d4632d9d0 moby-buildkit-0.10.6.tar.gz +sha256 b1746575f37715a8a2f2df5bab77ea081ba8436854e241792702109fc9e3653d moby-buildkit-0.11.2.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 59d68a7dca..a25f676710 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.10.6 +MOBY_BUILDKIT_VERSION = 0.11.2 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:58:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:41 -0000 Subject: [Buildroot] [git commit branch/next] package/libksba: security bump to version 1.6.3 Message-ID: <20230220205222.D39FB828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=456f18409861a0bee1d553d530cef8bf3482ee7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-47629 See also: https://gnupg.org/blog/20221017-pepe-left-the-ksba.html For changelog see: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libksba.git;a=log;h=libksba-1.6.3 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/libksba/libksba.hash | 2 +- package/libksba/libksba.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libksba/libksba.hash b/package/libksba/libksba.hash index 77485c0cb6..5c6c5eda7a 100644 --- a/package/libksba/libksba.hash +++ b/package/libksba/libksba.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971 libksba-1.6.2.tar.bz2 +sha256 3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c libksba-1.6.3.tar.bz2 # Hash for license files: sha256 8f1b87e551d97b2b23b6d3403a5d598c63ea89824cb8ee351f631f6cab2beaa5 AUTHORS diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index 727a836cf4..b7c0508df8 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKSBA_VERSION = 1.6.2 +LIBKSBA_VERSION = 1.6.3 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = https://gnupg.org/ftp/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) From peter at korsgaard.com Mon Feb 20 20:58:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:41 -0000 Subject: [Buildroot] [git commit branch/next] package/ell: bump to version 0.56 Message-ID: <20230220205245.1B22286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=607eafa2cd0656929db4bc8a743b28b0c48df8e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard 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 68832c3201..c0f1731676 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 a7d0df846af839bbea1b80f292166371070328854b3fa785b5c607fe600552ad ell-0.53.tar.xz +sha256 58eb8b2b64087f7479d5db6a830a0656c536d93e5f11d4c9a4443ce8760a1b63 ell-0.56.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index b27d6feb65..994b0e19f0 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.53 +ELL_VERSION = 0.56 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 Mon Feb 20 20:58:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:42 -0000 Subject: [Buildroot] [git commit branch/next] package/libgpg-error: bump to version 1.46 Message-ID: <20230220205222.E5DEB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5bdcb4cc562942cac592519c710bc67d1decf8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For the changelog, see: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=log;h=libgpg-error-1.46 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/libgpg-error/libgpg-error.hash | 6 +++--- package/libgpg-error/libgpg-error.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index b29ec37598..ffe27e9d99 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,10 +1,10 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 fe724ed37b4935964059a47b7c64d5f8246659d8 libgpg-error-1.45.tar.bz2 +sha1 a6e5efdd72e848aab4064e5ef4c6835ba344bcf1 libgpg-error-1.46.tar.bz2 # Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.45.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.46.tar.bz2.sig # using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26 libgpg-error-1.45.tar.bz2 +sha256 b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d libgpg-error-1.46.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 252d95ac7f..ab3c7c3bf2 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.45 +LIBGPG_ERROR_VERSION = 1.46 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:42 -0000 Subject: [Buildroot] [git commit branch/next] configs/qemu_arm_ebbr: new defconfig Message-ID: <20230220205244.7312186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7115ab39189a6c660745267d8bf0bf41cf8b3db7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add a defconfig to build a 32b ARMv7-A U-Boot based firmware implementing the subset of UEFI defined by EBBR[1], as well as a Linux OS disk image booting with UEFI, to run on Qemu. The generated firmware binary can also be used to install or run another OS supporting the EBBR specification. [1]: https://github.com/ARM-software/ebbr Signed-off-by: Vincent Stehl?? Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ board/qemu/arm-ebbr/genimage.cfg | 31 ++++++++++++++++ board/qemu/arm-ebbr/grub.cfg | 6 ++++ board/qemu/arm-ebbr/linux.fragment | 2 ++ board/qemu/arm-ebbr/post-image.sh | 11 ++++++ board/qemu/arm-ebbr/readme.txt | 71 +++++++++++++++++++++++++++++++++++++ board/qemu/arm-ebbr/u-boot.fragment | 35 ++++++++++++++++++ configs/qemu_arm_ebbr_defconfig | 57 +++++++++++++++++++++++++++++ 8 files changed, 215 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 706ee80ece..e19087c577 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2986,7 +2986,9 @@ F: package/utp_com/ N: Vincent Stehl?? F: board/qemu/aarch64-ebbr/ +F: board/qemu/arm-ebbr/ F: configs/qemu_aarch64_ebbr_defconfig +F: configs/qemu_arm_ebbr_defconfig F: package/edk2-non-osi/ N: Vincent Stehl?? diff --git a/board/qemu/arm-ebbr/genimage.cfg b/board/qemu/arm-ebbr/genimage.cfg new file mode 100644 index 0000000000..3d4c9cff1a --- /dev/null +++ b/board/qemu/arm-ebbr/genimage.cfg @@ -0,0 +1,31 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file zImage { + image = "zImage" + } + } + + size = 128M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = U + offset = 32K + bootable = true + } + + partition root { + partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 + image = "rootfs.ext2" + } +} diff --git a/board/qemu/arm-ebbr/grub.cfg b/board/qemu/arm-ebbr/grub.cfg new file mode 100644 index 0000000000..ab3a6ec26b --- /dev/null +++ b/board/qemu/arm-ebbr/grub.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /zImage root=PARTLABEL=root rootwait +} diff --git a/board/qemu/arm-ebbr/linux.fragment b/board/qemu/arm-ebbr/linux.fragment new file mode 100644 index 0000000000..07554cf843 --- /dev/null +++ b/board/qemu/arm-ebbr/linux.fragment @@ -0,0 +1,2 @@ +CONFIG_TEE=y +CONFIG_OPTEE=y diff --git a/board/qemu/arm-ebbr/post-image.sh b/board/qemu/arm-ebbr/post-image.sh new file mode 100755 index 0000000000..c884a8b6f6 --- /dev/null +++ b/board/qemu/arm-ebbr/post-image.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -eu + +BOARD_DIR=$(dirname "$0") + +# Create flash.bin TF-A FIP image from bl1.bin and fip.bin +dd if="${BINARIES_DIR}/bl1.bin" of="${BINARIES_DIR}/flash.bin" bs=1M +dd if="${BINARIES_DIR}/fip.bin" of="${BINARIES_DIR}/flash.bin" seek=64 bs=4096 conv=notrunc + +# Override the default GRUB configuration file with our own. +cp -f "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" diff --git a/board/qemu/arm-ebbr/readme.txt b/board/qemu/arm-ebbr/readme.txt new file mode 100644 index 0000000000..085e723fe6 --- /dev/null +++ b/board/qemu/arm-ebbr/readme.txt @@ -0,0 +1,71 @@ +Introduction +============ + +The qemu_arm_ebbr_defconfig is meant to illustrate some aspects of the Arm +EBBR specification[1] and the Arm SystemReady IR[2] compliance program. +It allows building a 32b ARMv7-A U-Boot based firmware implementing the subset +of UEFI defined by EBBR, as well as a Linux OS disk image booting with UEFI, to +run on Qemu. + +Building +======== + + $ make qemu_arm_ebbr_defconfig + $ make + +Generated files under output/images: + +* flash.bin: A firmware image comprising TF-A, OP-TEE and the U-Boot bootloader. + +* disk.img: An OS disk image comprising the GRUB bootloader, the Linux kernel + and the root filesystem. + +Running under Qemu +================== + +Run the emulation with: + + qemu-system-arm \ + -M virt,secure=on \ + -bios output/images/flash.bin \ + -cpu cortex-a15 \ + -device virtio-blk-device,drive=hd0 \ + -device virtio-net-device,netdev=eth0 \ + -device virtio-rng-device,rng=rng0 \ + -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ + -m 1024 \ + -netdev user,id=eth0 \ + -no-acpi \ + -nographic \ + -object rng-random,filename=/dev/urandom,id=rng0 \ + -rtc base=utc,clock=host \ + -smp 2 # qemu_arm_ebbr_defconfig + +The login prompt will appear in the terminal that started Qemu. + +Using the EBBR firmware to run another OS under Qemu +---------------------------------------------------- + +It is possible to use the generated firmware binary to run another OS +supporting the EBBR specification. + +To run another OS on emulation using a live or pre-installed image, use the same +Qemu command line as for the generated OS but adapt the OS image path in the +-drive stanza. +The 32b Arm ACS-IR image[3] is an example of a pre-installed OS image. +Linux distributions such as Debian or openSUSE provide a pre-installed OS +image. + +Miscellaneous +============= + +This configuration is inspired by the qemu_arm_vexpress_tz_defconfig, the +qemu_aarch64_ebbr_defconfig and the Arm SystemReady IR IoT Integration, Test, +and Certification Guide[4]. + +Firmware update is currently not supported. + +[1]: https://github.com/ARM-software/ebbr +[2]: https://developer.arm.com/Architectures/Arm%20SystemReady%20IR +[3]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images +[4]: https://developer.arm.com/documentation/DUI1101/1-1/?lang=en diff --git a/board/qemu/arm-ebbr/u-boot.fragment b/board/qemu/arm-ebbr/u-boot.fragment new file mode 100644 index 0000000000..bfc382cde9 --- /dev/null +++ b/board/qemu/arm-ebbr/u-boot.fragment @@ -0,0 +1,35 @@ +CONFIG_BOOTM_EFI=y +CONFIG_CMD_BOOTEFI=y +CONFIG_CMD_BOOTEFI_HELLO=y +CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y +CONFIG_CMD_BOOTEFI_SELFTEST=y +CONFIG_CMD_EFIDEBUG=y +CONFIG_CMD_EFI_VARIABLE_FILE_STORE=y +CONFIG_CMD_GPT=y +CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_RNG=y +CONFIG_CMD_RTC=y +CONFIG_DM_RTC=y +CONFIG_EFI_DEVICE_PATH_TO_TEXT=y +CONFIG_EFI_GET_TIME=y +CONFIG_EFI_HAVE_RUNTIME_RESET=y +CONFIG_EFI_LOADER=y +CONFIG_EFI_LOADER_HII=y +CONFIG_EFI_MM_COMM_TEE=y +CONFIG_EFI_PARTITION=y +CONFIG_EFI_SECURE_BOOT=y +CONFIG_EFI_SET_TIME=y +CONFIG_EFI_UNICODE_CAPITALIZATION=y +CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y +CONFIG_EFI_VARIABLE_FILE_STORE=y +CONFIG_FAT_WRITE=y +CONFIG_FIT=y +CONFIG_FS_FAT=y +CONFIG_OF_LIBFDT=y +CONFIG_OPTEE=y +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_RNG_OPTEE=y +CONFIG_RTC_EMULATION=y +CONFIG_SCMI_FIRMWARE=y +CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_TEE=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig new file mode 100644 index 0000000000..f3e2d42a54 --- /dev/null +++ b/configs/qemu_arm_ebbr_defconfig @@ -0,0 +1,57 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15=y + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post-image.sh support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" + +# Linux headers +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.9" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" + +# Packages +BR2_PACKAGE_OPTEE_CLIENT=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set + +# Firmware and bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_RAM_LOCATION=tdram" +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_ARM_EFI=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_NEEDS_DTC=y +BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y + +# Host tools +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From peter at korsgaard.com Mon Feb 20 20:58:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:43 -0000 Subject: [Buildroot] [git commit branch/next] package/libmng: fix optional dependency to lcms2 Message-ID: <20230220205223.703C28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7aeeb632d66dd59e0dbcff8ad6fee724c4e829d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next "0ce9b533e3 libmng: new package" introduced a typo that makes the optional dependency to lcms2 ineffective. Fix the typo LIBMNG_DEPDENDENCIES -> LIBMNG_DEPENDENCIES. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/libmng/libmng.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmng/libmng.mk b/package/libmng/libmng.mk index 090fe18380..8ffd74c05b 100644 --- a/package/libmng/libmng.mk +++ b/package/libmng/libmng.mk @@ -14,7 +14,7 @@ LIBMNG_LICENSE = libmng license LIBMNG_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_LCMS2),y) -LIBMNG_DEPDENDENCIES += lcms2 +LIBMNG_DEPENDENCIES += lcms2 else LIBMNG_CONF_OPTS += --without-lcms2 endif From yann.morin.1998 at free.fr Mon Feb 20 20:58:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:43 -0000 Subject: [Buildroot] [git commit branch/next] package/wpewebkit: security bump to version 2.38.4 Message-ID: <20230220205245.0D90F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02ace135ee0d31d30021cd000d0594bb6360ca94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.4.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index ccd928b3df..dcd082e045 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums -md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz -sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz -sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums +md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz +sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz +sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b2bbc0301b..54f37fd702 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.3 +WPEWEBKIT_VERSION = 2.38.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:58:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:44 -0000 Subject: [Buildroot] [git commit branch/next] package/qcom-db410c-firmware: fix typo for _LICENSE Message-ID: <20230220205223.60865828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa35d8d071faf68abc4538be2a3bb636ea6b4a2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Cc: Mike Frampton Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/qcom-db410c-firmware/qcom-db410c-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qcom-db410c-firmware/qcom-db410c-firmware.mk b/package/qcom-db410c-firmware/qcom-db410c-firmware.mk index 9ef32cc9d4..cf4b59b72e 100644 --- a/package/qcom-db410c-firmware/qcom-db410c-firmware.mk +++ b/package/qcom-db410c-firmware/qcom-db410c-firmware.mk @@ -8,7 +8,7 @@ QCOM_DB410C_FIRMWARE_VERSION = 1034.2.1 QCOM_DB410C_FIRMWARE_BASE = linux-board-support-package-r$(QCOM_DB410C_FIRMWARE_VERSION) QCOM_DB410C_FIRMWARE_SOURCE = $(QCOM_DB410C_FIRMWARE_BASE).zip QCOM_DB410C_FIRMWARE_SITE = https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware -QCOM_DB410C_FIRMWARE_LICENCE = Qualcomm firmware license +QCOM_DB410C_FIRMWARE_LICENSE = Qualcomm firmware license QCOM_DB410C_FIRMWARE_LICENSE_FILES = LICENSE QCOM_DB410C_FIRMWARE_DEPENDENCIES = host-mtools From peter at korsgaard.com Mon Feb 20 20:58:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:44 -0000 Subject: [Buildroot] [git commit branch/next] package/gstreamer1: bump to version 1.22.0 Message-ID: <20230220205245.7B5DB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e30ce907d58e5f675704545599ca77ce2035acd2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard 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 5fb52606fe..db0ed5bede 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.4.tar.xz.sha256sum -sha256 67c1edf8c3c339cda5dde85f4f7b953bb9607c2d13ae970e2491c5c4c055ef5f gstreamer-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.0.tar.xz.sha256sum +sha256 78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09 gstreamer-1.22.0.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 16c016b145..09d1a10ce7 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.20.4 +GSTREAMER1_VERSION = 1.22.0 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 Feb 20 20:58:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:45 -0000 Subject: [Buildroot] [git commit branch/next] package/libnice: bump to version 0.1.21 Message-ID: <20230220205245.6E8468648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c392e8b76f73d2b8ebfba2117ed6b03d902b8243 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/libnice/libnice.hash | 2 +- package/libnice/libnice.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnice/libnice.hash b/package/libnice/libnice.hash index 83b28a9ad9..cf6d825f83 100644 --- a/package/libnice/libnice.hash +++ b/package/libnice/libnice.hash @@ -1,5 +1,5 @@ # Locally computed after checking pgp signature -sha256 6747af710998cf708a2e8ceef51cccd181373d94201dd4b8d40797a070ed47cc libnice-0.1.19.tar.gz +sha256 72e73a2acf20f59093e21d5601606e405873503eb35f346fa621de23e99b3b39 libnice-0.1.21.tar.gz # Hash for license files: sha256 9246b2ee8b1db30cf03d5d9719ad8bb5edce1cadc85f8cfef319c23d24d950b5 COPYING diff --git a/package/libnice/libnice.mk b/package/libnice/libnice.mk index 2b223bedd3..56ee35e452 100644 --- a/package/libnice/libnice.mk +++ b/package/libnice/libnice.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNICE_VERSION = 0.1.19 -LIBNICE_SITE = http://nice.freedesktop.org/releases +LIBNICE_VERSION = 0.1.21 +LIBNICE_SITE = https://libnice.freedesktop.org/releases LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL LIBNICE_DEPENDENCIES = libglib2 host-pkgconf From peter at korsgaard.com Mon Feb 20 20:58:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:45 -0000 Subject: [Buildroot] [git commit branch/next] package/cog: bump to version 0.16.0 Message-ID: <20230220205223.41F1F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43c833e6cb44d4ffe59629cd83344caa9f63a0c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This new version includes support for setting proxy options and gamepad support. Release notes: https://wpewebkit.org/release/cog-0.16.0.html This imports a small patch to properly pick libdrm compiler flags, fetched from the upstream repository. Signed-off-by: Adrian Perez de Castro Tested-by: Gary Bisson Tested-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...libdrm-dependency-when-protocols-are-used.patch | 36 +++++++++++++++++++++ package/cog/cog.hash | 8 ++--- package/cog/cog.mk | 37 ++++++++++++---------- 3 files changed, 60 insertions(+), 21 deletions(-) diff --git a/package/cog/0001-wl-Fix-libdrm-dependency-when-protocols-are-used.patch b/package/cog/0001-wl-Fix-libdrm-dependency-when-protocols-are-used.patch new file mode 100644 index 0000000000..44e555c121 --- /dev/null +++ b/package/cog/0001-wl-Fix-libdrm-dependency-when-protocols-are-used.patch @@ -0,0 +1,36 @@ +From 9a1982c563e218b7695e6a174c8230d3b063eb27 Mon Sep 17 00:00:00 2001 +From: Gary Bisson +Date: Thu, 6 Oct 2022 09:04:22 +0200 +Subject: [PATCH] wl: Fix libdrm dependency when protocols are used + +As the comment says, cog-platform-wl.c needs drm_fourcc.h to build +properly when wayland_weston_direct_display is enabled. + +However, libdrm.pc doesn't specify "include/libdrm" as part of its +includedir but whether in its cflags. So use the compile_args dep +instead of includes to fix the build failure. + +Signed-off-by: Gary Bisson +(cherry picked from commit 32c1d9533bcdc22cbc01d02bf2e6ac0d4bda2dc2) +Signed-off-by: Adrian Perez de Castro +[Upstream status: https://github.com/Igalia/cog/pull/501] +--- + platform/wayland/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/platform/wayland/meson.build b/platform/wayland/meson.build +index f1e18ec..31e4460 100644 +--- a/platform/wayland/meson.build ++++ b/platform/wayland/meson.build +@@ -67,7 +67,7 @@ if wayland_platform_weston_protocols.length() > 0 + + # The code uses definitions from the drm_fourcc.h header, but does not + # need to link the library; libdrm here is only a build-time dependency. +- wayland_platform_dependencies += [dependency('libdrm').partial_dependency(includes: true)] ++ wayland_platform_dependencies += [dependency('libdrm').partial_dependency(compile_args: true)] + endif + + +-- +2.38.0 + diff --git a/package/cog/cog.hash b/package/cog/cog.hash index aa128d73d8..a2c55c4b94 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.14.1.tar.xz.sums -md5 69d72ac046a0fc485ea7b61b96e7e7fc cog-0.14.1.tar.xz -sha1 6236972b0ae0bce38a0a017610f161b349723862 cog-0.14.1.tar.xz -sha256 fb91104e25e1dde27189c91c70acc356e387f47acebaa8997e01ce5879c3a600 cog-0.14.1.tar.xz +# From https://wpewebkit.org/releases/cog-0.16.0.tar.xz.sums +md5 2705472ea4f333290973722c0862b21d cog-0.16.0.tar.xz +sha1 ef16e5e3d91d0da056fe5e4f596c211af7453b4e cog-0.16.0.tar.xz +sha256 2956f719d36c9a6368f63901a0d1ceaf4d27f529f7df441b3748c36d72906fc6 cog-0.16.0.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 1f24bebee4..241c4e309c 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.14.1 +COG_VERSION = 0.16.0 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES @@ -12,37 +12,40 @@ COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo wayland COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \ - -DCOG_BUILD_PROGRAMS=ON \ - -DCOG_PLATFORM_HEADLESS=ON \ - -DINSTALL_MAN_PAGES=OFF \ - -DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \ - -DUSE_SOUP2=ON + -Ddocumentation=false \ + -Dmanpages=false \ + -Dprograms=true \ + -Dsoup2=enabled \ + -Dcog_home_uri='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \ + -Dplatforms='$(subst $(space),$(comma),$(strip $(COG_PLATFORMS_LIST)))' + +COG_PLATFORMS_LIST = headless ifeq ($(BR2_PACKAGE_WESTON),y) -COG_CONF_OPTS += -DCOG_WESTON_DIRECT_DISPLAY=ON +COG_CONF_OPTS += -Dwayland_weston_direct_display=true COG_DEPENDENCIES += weston else -COG_CONF_OPTS += -DCOG_WESTON_DIRECT_DISPLAY=OFF +COG_CONF_OPTS += -Dwayland_weston_direct_display=false endif ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y) -COG_CONF_OPTS += -DCOG_PLATFORM_WL=ON +COG_PLATFORMS_LIST += wayland COG_DEPENDENCIES += libxkbcommon wayland-protocols -else -COG_CONF_OPTS += -DCOG_PLATFORM_WL=OFF endif ifeq ($(BR2_PACKAGE_COG_PLATFORM_DRM),y) -COG_CONF_OPTS += -DCOG_PLATFORM_DRM=ON +COG_PLATFORMS_LIST += drm COG_DEPENDENCIES += libdrm libinput libgbm libegl udev -else -COG_CONF_OPTS += -DCOG_PLATFORM_DRM=OFF endif ifeq ($(BR2_PACKAGE_COG_USE_SYSTEM_DBUS),y) -COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=ON +COG_CONF_OPTS += -Dcog_dbus_control=system else -COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=OFF +COG_CONF_OPTS += -Dcog_dbus_control=user +endif + +ifeq ($(BR2_PACKAGE_LIBMANETTE),y) +COG_DEPENDENCIES += libmanette endif -$(eval $(cmake-package)) +$(eval $(meson-package)) From peter at korsgaard.com Mon Feb 20 20:58:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:46 -0000 Subject: [Buildroot] [git commit branch/next] package/ima-evm-utils: really install to staging Message-ID: <20230220205223.8DA8D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee73336da98a7de04301a90c9b5a881761274a47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "8229196d41 package/ima-evm-utils: new package" added IMA_EVM_UTILS_INSTALL_STAGING_CMDS without enabling IMA_EVM_UTILS_INSTALL_STAGING, so currently the package is not installed to staging. Enable installing to staging. Cc: Petr Vorel Signed-off-by: Ricardo Martincoski Reviewed-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/ima-evm-utils/ima-evm-utils.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ima-evm-utils/ima-evm-utils.mk b/package/ima-evm-utils/ima-evm-utils.mk index 7ee34d5e1a..01984402ce 100644 --- a/package/ima-evm-utils/ima-evm-utils.mk +++ b/package/ima-evm-utils/ima-evm-utils.mk @@ -8,6 +8,7 @@ IMA_EVM_UTILS_VERSION = 1.4 IMA_EVM_UTILS_SITE = http://downloads.sourceforge.net/project/linux-ima/ima-evm-utils IMA_EVM_UTILS_LICENSE = GPL-2.0 IMA_EVM_UTILS_LICENSE_FILES = COPYING +IMA_EVM_UTILS_INSTALL_STAGING = YES IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl tpm2-tss # Tarball doesn't contain configure From yann.morin.1998 at free.fr Mon Feb 20 20:58:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:50 -0000 Subject: [Buildroot] [git commit branch/next] package/libks: bump version to 1.8.2 Message-ID: <20230220205246.3708B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e09e7987b986d01e86e4ec45319e2dd5945259c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- 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 d4ad7ebbbc..dba442bdd2 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz +sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index 4aca5c5c4c..c4f0cd5c78 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.8.0 +LIBKS_VERSION = 1.8.2 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright From peter at korsgaard.com Mon Feb 20 20:58:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:50 -0000 Subject: [Buildroot] [git commit branch/next] Revert "package/zip: install to staging" Message-ID: <20230220205223.CF8358648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11614fdde1611f846b8e5d99f55af7c6c131b817 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit c5b5b5ccabe35e11f0ca8db4361bb3f335fc59fb. Commit "c5b5b5ccab package/zip: install to staging" contains a typo that prevents installing to staging. ZIP_INSTALLING_STAGING_CMDS -> ZIP_INSTALL_STAGING_CMDS But the package does not install headers or libraries, only ELF and manual files. So instead of fixing the install to staging, revert the bogus commit. Cc: Jan Pedersen Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/zip/zip.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/zip/zip.mk b/package/zip/zip.mk index 2d11e1c763..67958a4a66 100644 --- a/package/zip/zip.mk +++ b/package/zip/zip.mk @@ -11,7 +11,6 @@ ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src ZIP_LICENSE = Info-ZIP ZIP_LICENSE_FILES = LICENSE ZIP_CPE_ID_VENDOR = info-zip_project -ZIP_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_BZIP2),y) ZIP_DEPENDENCIES += bzip2 @@ -41,11 +40,6 @@ define ZIP_INSTALL_TARGET_CMDS prefix=$(TARGET_DIR)/usr endef -define ZIP_INSTALLING_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ - prefix=$(STAGING_DIR)/usr -endef - define HOST_ZIP_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \ From peter at korsgaard.com Mon Feb 20 20:58:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:51 -0000 Subject: [Buildroot] [git commit branch/next] package/grpc: bump to version 1.51.1 Message-ID: <20230220205223.EAEE086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cb6906eeb5a79bf222e881b7170d6d97280370a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- 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 4d838703cc..e6b76dcb5e 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 76900ab068da86378395a8e125b5cc43dfae671e09ff6462ddfef18676e2165a grpc-1.50.0.tar.gz +sha256 b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229 grpc-1.51.1.tar.gz sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 9aac241e47..9125b1f9f6 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.50.0 +GRPC_VERSION = 1.51.1 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 peter at korsgaard.com Mon Feb 20 20:58:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:51 -0000 Subject: [Buildroot] [git commit branch/next] package/gst1-python: bump version to 1.22.0 Message-ID: <20230220205246.1C67A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b53e11f2ec049002a4c3c2829aaa0e7a31551f1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard 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 adb116ac4c..128a739c2c 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.4.tar.xz.sha256sum -sha256 5eb4136d03e2a495f4499c8b2e6d9d3e7b5e73c5a8b8acf9213d57bc6a7bd3c1 gst-python-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.0.tar.xz.sha256sum +sha256 6c63ad364ca4617eb2cbb3975ab26c66760eb3c7a6adf5be69f99c11e21ef3a5 gst-python-1.22.0.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index feb2de718a..2fc268b0ac 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.4 +GST1_PYTHON_VERSION = 1.22.0 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 Feb 20 20:58:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:52 -0000 Subject: [Buildroot] [git commit branch/next] package/freeswitch: security bump version to 1.10.9 Message-ID: <20230220205246.2B4C686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46683dd4a6e65b5ae3188440e9ae8eaf055d9a85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 Upstream removed zrtp support: https://github.com/signalwire/freeswitch/pull/1848 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/freeswitch/freeswitch.hash | 5 ++--- package/freeswitch/freeswitch.mk | 11 +---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 18a36ff23c..3497a3283f 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,11 +1,10 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.8.-release.tar.xz.sha256 -sha256 1176b26b2f463de2980e5be953f81ced94d23c784452bd41e086d3933a88be5f freeswitch-1.10.8.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.9.-release.tar.xz.sha256 +sha256 f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 freeswitch-1.10.9.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 6234dd8e97..7497cc4964 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.8 +FREESWITCH_VERSION = 1.10.9 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -81,15 +81,6 @@ FREESWITCH_CONF_OPTS = \ --without-python \ --disable-system-xmlrpc-c -# zrtp supports a limited set of archs, sparc support is also broken due -# to a broken ld call by gcc, see libs/libzrtp/include/zrtp_config.h -ifeq ($(BR2_i386)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le)$(BR2_x86_64),y) -FREESWITCH_LICENSE_FILES += libs/libzrtp/src/zrtp_legal.c -FREESWITCH_CONF_OPTS += --enable-zrtp -else -FREESWITCH_CONF_OPTS += --disable-zrtp -endif - # Enable optional modules FREESWITCH_ENABLED_MODULES += \ applications/mod_avmd \ From yann.morin.1998 at free.fr Mon Feb 20 21:00:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:36 -0000 Subject: [Buildroot] [git commit branch/next] package/lpeg: add missing LPEG_LICENSE_FILES Message-ID: <20230220205232.9B0CC8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52afc0b3b504c9616b3875dcdf67ab7be41455f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The lpeg.html file declares the licensing terms at its bottom, so it should work as a license file. Signed-off-by: Nicolas Carrier [yann.morin.1998 at free.fr: use LPEG_SUBDIR] Signed-off-by: Yann E. MORIN --- package/lpeg/lpeg.hash | 2 ++ package/lpeg/lpeg.mk | 1 + 2 files changed, 3 insertions(+) diff --git a/package/lpeg/lpeg.hash b/package/lpeg/lpeg.hash index 1ccaf242c4..cb995bde2c 100644 --- a/package/lpeg/lpeg.hash +++ b/package/lpeg/lpeg.hash @@ -1,2 +1,4 @@ # computed by luarocks/buildroot sha256 e0d0d687897f06588558168eeb1902ac41a11edd1b58f1aa61b99d0ea0abbfbc lpeg-1.0.2-1.src.rock +# computed locally +sha256 2b80a8cce793e008ba433e5e0184f20aca4a67ec741439fafd86a874a6a91c49 lpeg-1.0.2/lpeg.html diff --git a/package/lpeg/lpeg.mk b/package/lpeg/lpeg.mk index cdb2e81a5f..7326e59e01 100644 --- a/package/lpeg/lpeg.mk +++ b/package/lpeg/lpeg.mk @@ -6,5 +6,6 @@ LPEG_VERSION = 1.0.2-1 LPEG_LICENSE = MIT +LPEG_LICENSE_FILES = $(LPEG_SUBDIR)/lpeg.html $(eval $(luarocks-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:00:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:55 -0000 Subject: [Buildroot] [git commit branch/next] package/python-hatchling: bump to version 1.12.2 Message-ID: <20230220205234.7EE7F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=194c0247e796e9d1b3c6682b3cf37395d05f95d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-hatchling/python-hatchling.hash | 4 ++-- package/python-hatchling/python-hatchling.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatchling/python-hatchling.hash b/package/python-hatchling/python-hatchling.hash index 41d7be977e..154c1fdcac 100644 --- a/package/python-hatchling/python-hatchling.hash +++ b/package/python-hatchling/python-hatchling.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatchling/json -md5 e06cc65ac646f9b01df5406aa1f97022 hatchling-1.11.1.tar.gz -sha256 9f84361f70cf3a7ab9543b0c3ecc64211ed2ba8a606a71eb6a473c1c9b08e1d0 hatchling-1.11.1.tar.gz +md5 5a6e2fd0c877feea7e71b9d72bbdbed9 hatchling-1.12.2.tar.gz +sha256 8a6d719d96653a0f3901072b12710c9c3cc934f9061b443775c6789b45333495 hatchling-1.12.2.tar.gz # Locally computed sha256 checksums sha256 7f143a8127ad4873862d70854b5bd2abd0085aa73e64fd2b08704a3b9f5c07fc LICENSE.txt diff --git a/package/python-hatchling/python-hatchling.mk b/package/python-hatchling/python-hatchling.mk index 13155a20a4..61aa1a6c23 100644 --- a/package/python-hatchling/python-hatchling.mk +++ b/package/python-hatchling/python-hatchling.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCHLING_VERSION = 1.11.1 +PYTHON_HATCHLING_VERSION = 1.12.2 PYTHON_HATCHLING_SOURCE = hatchling-$(PYTHON_HATCHLING_VERSION).tar.gz -PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/24/20/3e21d2bc57229822ac9fb9b314d7892c16f829f34a0eb247c55fc11e09a8 +PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/f5/ea/3ed5a7ecdd8a8f7e84cffd3b5ec24279a09ce2694c218ff922c35c6f1a77 PYTHON_HATCHLING_LICENSE = MIT PYTHON_HATCHLING_LICENSE_FILES = LICENSE.txt PYTHON_HATCHLING_SETUP_TYPE = pep517 From yann.morin.1998 at free.fr Mon Feb 20 21:00:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:56 -0000 Subject: [Buildroot] [git commit branch/next] package/python-iniconfig: bump to version 2.0.0 Message-ID: <20230220205234.90AD6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f947ac259692879cf651c13dc595236103b0d1f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate from setuptools to hatchling pep517 build backend. Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-iniconfig/python-iniconfig.hash | 4 ++-- package/python-iniconfig/python-iniconfig.mk | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-iniconfig/python-iniconfig.hash b/package/python-iniconfig/python-iniconfig.hash index b2469db99b..541ae3e3f3 100644 --- a/package/python-iniconfig/python-iniconfig.hash +++ b/package/python-iniconfig/python-iniconfig.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/iniconfig/json -md5 0b7f3be87481211c183eae095bcea6f1 iniconfig-1.1.1.tar.gz -sha256 bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32 iniconfig-1.1.1.tar.gz +md5 3c030b3f51dcc3aca585de05635600e4 iniconfig-2.0.0.tar.gz +sha256 2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 iniconfig-2.0.0.tar.gz # Locally computed sha256 checksums sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE diff --git a/package/python-iniconfig/python-iniconfig.mk b/package/python-iniconfig/python-iniconfig.mk index 5c31c69957..99e946f0ab 100644 --- a/package/python-iniconfig/python-iniconfig.mk +++ b/package/python-iniconfig/python-iniconfig.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_INICONFIG_VERSION = 1.1.1 +PYTHON_INICONFIG_VERSION = 2.0.0 PYTHON_INICONFIG_SOURCE = iniconfig-$(PYTHON_INICONFIG_VERSION).tar.gz -PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/23/a2/97899f6bd0e873fed3a7e67ae8d3a08b21799430fb4da15cfedf10d6e2c2 -PYTHON_INICONFIG_SETUP_TYPE = setuptools +PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/d7/4b/cbd8e699e64a6f16ca3a8220661b5f83792b3017d0f79807cb8708d33913 +PYTHON_INICONFIG_SETUP_TYPE = pep517 PYTHON_INICONFIG_LICENSE = MIT PYTHON_INICONFIG_LICENSE_FILES = LICENSE +PYTHON_INICONFIG_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs $(eval $(python-package)) From yann.morin.1998 at free.fr Sun Feb 12 20:34:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:34:14 +0100 Subject: [Buildroot] [git commit branch/next] package/libsolv: fix build without C++ Message-ID: <20230220205259.15E7486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=add76a41c3c68e649ecae69aa896d5f8b627d1be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure without C++ raised since the addition ot the package in commit 93ce3c1be0753189d6af3ee9968b935037519c25: CMake Error at CMakeLists.txt:1 (PROJECT): No CMAKE_CXX_COMPILER could be found. Tell CMake where to find the compiler by setting either the environment variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path to the compiler, or to the compiler name if it is in the PATH. Fixes: - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsolv/0001-Fix-build-without-C.patch | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/package/libsolv/0001-Fix-build-without-C.patch b/package/libsolv/0001-Fix-build-without-C.patch new file mode 100644 index 0000000000..2389aebcde --- /dev/null +++ b/package/libsolv/0001-Fix-build-without-C.patch @@ -0,0 +1,49 @@ +From 5691f58d1f8ce1332b02536e48f1ac5864629c6c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 12 Feb 2023 15:27:27 +0100 +Subject: [PATCH] Fix build without C++ + +Fix the following build failure without C++: + +CMake Error at CMakeLists.txt:1 (PROJECT): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Fixes: + - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/openSUSE/libsolv/pull/520] +--- + CMakeLists.txt | 2 +- + ext/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3541f496..f899c49a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-PROJECT (libsolv) ++PROJECT (libsolv C) + + CMAKE_MINIMUM_REQUIRED (VERSION 2.8.5) + +diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt +index f01c0238..589fa946 100644 +--- a/ext/CMakeLists.txt ++++ b/ext/CMakeLists.txt +@@ -103,6 +103,7 @@ IF (ENABLE_CUDFREPO) + ENDIF (ENABLE_CUDFREPO) + + IF (ENABLE_HAIKU) ++ enable_language(CXX) + SET (libsolvext_SRCS ${libsolvext_SRCS} + repo_haiku.cpp) + SET (libsolvext_HEADERS ${libsolvext_HEADERS} +-- +2.39.0 + From yann.morin.1998 at free.fr Mon Feb 20 21:00:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:57 -0000 Subject: [Buildroot] [git commit branch/next] package/python-ipython: bump to version 8.8.0 Message-ID: <20230220205234.A07EB81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d88b18fd42fceb375339c7255cc1d07f755f85c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 aae34f6f9b..f11ad1e18c 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 3adf9fca317512e5b3516a9ac25b3442 ipython-8.7.0.tar.gz -sha256 882899fe78d5417a0aa07f995db298fa28b58faeba2112d2e3a4c95fe14bb738 ipython-8.7.0.tar.gz +md5 a1ea9b6e43c5568e5031974eb3a6acb0 ipython-8.8.0.tar.gz +sha256 f3bf2c08505ad2c3f4ed5c46ae0331a8547d36bf4b21a451e8ae80c0791db95b ipython-8.8.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 1af1081741..f5a114c2f3 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 8.7.0 +PYTHON_IPYTHON_VERSION = 8.8.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/82/2b/026af47da09998404f51064d328f5f1f68c78829082d2945be489343fde6 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/f5/39/89664d8c3e4dfb0a73862cbbff8eb4028a1e3d4305da80ab0a493848ed9b PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From yann.morin.1998 at free.fr Sun Feb 12 20:46:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:46:22 +0100 Subject: [Buildroot] [git commit branch/next] package/python-magic-wormhole-mailbox-server: add missing reverse dependency on host-rustc Message-ID: <20230220205259.2BB238648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0c933adab99e1767bb673610b69de5eedf42c5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next As reported by Yann in [1], Kconfig warns about an unmet dependency. The issue can be reproduced on master branch at commit 451672e, with the command: KCONFIG_SEED=0x1D15B9D4 make randconfig The patch adds the missing dependency. Fixes: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_AUTOBAHN Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER [=y] && BR2_PACKAGE_PYTHON3 [=y] [1] https://lists.buildroot.org/pipermail/buildroot/2023-February/661898.html Cc: Yann E. MORIN Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/python-magic-wormhole-mailbox-server/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in index db20d3e7b6..a0721e866f 100644 --- a/package/python-magic-wormhole-mailbox-server/Config.in +++ b/package/python-magic-wormhole-mailbox-server/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER bool "python-magic-wormhole-mailbox-server" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime From yann.morin.1998 at free.fr Mon Feb 20 21:00:58 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:58 -0000 Subject: [Buildroot] [git commit branch/next] package/python-multidict: bump to version 6.0.4 Message-ID: <20230220205234.BB87286496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89a2bafaa4bd5aee71a13fb1542a15c7410cd6af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-multidict/python-multidict.hash | 4 ++-- package/python-multidict/python-multidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index eae60af37c..568c320c53 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 b5875cf0a0578956dcfffc123d8344ca multidict-6.0.3.tar.gz -sha256 2523a29006c034687eccd3ee70093a697129a3ffe8732535d3b2df6a4ecc279d multidict-6.0.3.tar.gz +md5 ec06a613d871dadfb66f2be3a1f2f3fa multidict-6.0.4.tar.gz +sha256 3666906492efb76453c0e7b97f2cf459b0682e7402c0489a95484965dbc1da49 multidict-6.0.4.tar.gz # Locally computed sha256 checksums sha256 06a240ea10ba868fda2de58df859886961df873aa74bbab1e0f13eaf99f92b7b LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index bfffb84709..cd35dcb4cb 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 6.0.3 +PYTHON_MULTIDICT_VERSION = 6.0.4 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/b5/5b/1dd3b9cf73c474ea1d0f0b1f8b7b712b0f13817493fd93101256ec856b59 +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/4a/15/bd620f7a6eb9aa5112c4ef93e7031bcd071e0611763d8e17706ef8ba65e0 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sun Feb 12 20:53:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:53:55 +0100 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_beforelight: bump version to 1.0.6 Message-ID: <20230220205259.4CE897FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa93d0cdd7adf1051cdb1643e978c81ae183327c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003317.html The license file was previously a stub, but it now contains the proper license text since upstream commit: https://gitlab.freedesktop.org/xorg/app/beforelight/-/commit/fa1e473dd64673a36a73a01a84a8db61eaa425dc Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls [yann.morin.1998 at free.fr: properly explain the license hash change] Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_beforelight/xapp_beforelight.hash | 7 ++++--- package/x11r7/xapp_beforelight/xapp_beforelight.mk | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.hash b/package/x11r7/xapp_beforelight/xapp_beforelight.hash index 00aff75779..f5b0cb21a4 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.hash +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002131.html -sha256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 beforelight-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-January/003317.html +sha256 53f0bf085b7272ebbf626d1b9b0ad320d1a07bc1fe7f3ae260c86a71a857ad28 beforelight-1.0.6.tar.xz +sha512 48a165d151676f6d213883bee98b34007403a77e025253c8649f9a0f5ea258b09381ab523a5e906030ac9fc8245fce2c6beaf9ad0f81116e302d51ad4a0fad5a beforelight-1.0.6.tar.xz # Locally computed -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING +sha256 3909739fae1ee37c3c7167a91f53d29317965aaf932813e16ef733f033619a7b COPYING diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk index 7dcb715ef3..6b753833f7 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_BEFORELIGHT_VERSION = 1.0.5 -XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2 -XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_BEFORELIGHT_VERSION = 1.0.6 +XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.xz +XAPP_BEFORELIGHT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_BEFORELIGHT_LICENSE = MIT XAPP_BEFORELIGHT_LICENSE_FILES = COPYING XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt From yann.morin.1998 at free.fr Mon Feb 20 21:00:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:59 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pillow: bump to version 9.4.0 Message-ID: <20230220205234.D9B728648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64848d5dcddad89dd0b151282d3b5060d96dffaf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next License hash changed due to year update: https://github.com/python-pillow/Pillow/commit/13306974e749871822dac413be66e699a0f4645e Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pillow/python-pillow.hash | 6 +++--- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index 46da25dddc..d514bdfe56 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 a6507c1e811a51071d2d6de83070e703 Pillow-9.3.0.tar.gz -sha256 c935a22a557a560108d780f9a0fc426dd7459940dc54faa49d83249c8d3e760f Pillow-9.3.0.tar.gz +md5 ee6e9a6c729ed9e9a78ccd3f6e9d7143 Pillow-9.4.0.tar.gz +sha256 a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e Pillow-9.4.0.tar.gz # Locally computed sha256 checksums -sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE +sha256 4e1755595052d843e2f350c930759f945ecf707bf812883948d181016b12dd0f LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 5ea9fcf264..c02968610f 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 9.3.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/16/11/da8d395299ca166aa56d9436e26fe8440e5443471de16ccd9a1d06f5993a +PYTHON_PILLOW_VERSION = 9.4.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/bc/07/830784e061fb94d67649f3e438ff63cfb902dec6d48ac75aeaaac7c7c30e PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sun Feb 12 21:07:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 22:07:18 +0100 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xvidtune: bump version to 1.0.4 Message-ID: <20230220205259.651AB7FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89710c804ede6879db45c8e41aca3607bd2bb051 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003319.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xvidtune/xapp_xvidtune.hash | 5 +++-- package/x11r7/xapp_xvidtune/xapp_xvidtune.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash index ecf7d0330b..0e7e231383 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002129.html -sha256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 xvidtune-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003319.html +sha256 0d4eecd54e440cc11f1bdaaa23180fcf890f003444343f533f639086b05b2cc5 xvidtune-1.0.4.tar.xz +sha512 747d5358f4f7d3d7db508c3f034711ce4b9dd278160d35312e9c4d1604623e84a2438d039b536546fd2df7db8c5ea1907e8a6101985fad2932b6dee5a62c7b80 xvidtune-1.0.4.tar.xz # Locally computed sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk index d7c4d5bf56..cc40d39098 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XVIDTUNE_VERSION = 1.0.3 -XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2 -XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XVIDTUNE_VERSION = 1.0.4 +XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.xz +XAPP_XVIDTUNE_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XVIDTUNE_LICENSE = MIT XAPP_XVIDTUNE_LICENSE_FILES = COPYING XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm From yann.morin.1998 at free.fr Mon Feb 20 21:01:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:00 -0000 Subject: [Buildroot] [git commit branch/next] package/python-networkx: bump to version 3.0 Message-ID: <20230220205234.C8DCD81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5a1a38c8975153838f4e3f43ea03820613e4882 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop no longer required decorator dependency. License hash changed due to year update: https://github.com/networkx/networkx/commit/49f20fe11d2a804a83d538759e06511eb90ad5a3 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-networkx/Config.in | 1 - package/python-networkx/python-networkx.hash | 6 +++--- package/python-networkx/python-networkx.mk | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in index 0f3e86f497..e2fc6ae478 100644 --- a/package/python-networkx/Config.in +++ b/package/python-networkx/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_NETWORKX bool "python-networkx" - select BR2_PACKAGE_PYTHON_DECORATOR # runtime help A Python package for the creation, manipulation, and study of the structure, dynamics, and diff --git a/package/python-networkx/python-networkx.hash b/package/python-networkx/python-networkx.hash index d166f0b8d8..96ef9777da 100644 --- a/package/python-networkx/python-networkx.hash +++ b/package/python-networkx/python-networkx.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/networkx/json -md5 22139ab5a47818fa00cbaa91eb126381 networkx-2.8.8.tar.gz -sha256 230d388117af870fce5647a3c52401fcf753e94720e6ea6b4197a5355648885e networkx-2.8.8.tar.gz +md5 1bfbb5cd184b486feae8345f541a5e50 networkx-3.0.tar.gz +sha256 9a9992345353618ae98339c2b63d8201c381c2944f38a2ab49cb45a4c667e412 networkx-3.0.tar.gz # Locally computed sha256 checksums -sha256 aae9f809fb1a1592ed72e9f52df10cfad8fe226b8d4d28385f90dd4341ce7119 LICENSE.txt +sha256 50b5a27cb43f7a20cede7aa7b9ab2033552e0412c9a1fde51d38885c1417e95f LICENSE.txt diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk index f097671d66..d369df1a04 100644 --- a/package/python-networkx/python-networkx.mk +++ b/package/python-networkx/python-networkx.mk @@ -4,15 +4,14 @@ # ################################################################################ -PYTHON_NETWORKX_VERSION = 2.8.8 +PYTHON_NETWORKX_VERSION = 3.0 PYTHON_NETWORKX_SOURCE = networkx-$(PYTHON_NETWORKX_VERSION).tar.gz -PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/cd/16/c44e8550012735b8f21b3df7f39e8ba5a987fb764ac017ad5f3589735889 +PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/99/f9/d45c9ecf50a6b67a200e0bbd324201b5cd777dfc0e6c8f6d1620ce5a7ada PYTHON_NETWORKX_LICENSE = BSD-3-Clause PYTHON_NETWORKX_LICENSE_FILES = LICENSE.txt PYTHON_NETWORKX_CPE_ID_VENDOR = python PYTHON_NETWORKX_CPE_ID_PRODUCT = networkx PYTHON_NETWORKX_SETUP_TYPE = setuptools -HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator $(eval $(python-package)) $(eval $(host-python-package)) From peter at korsgaard.com Tue Feb 14 17:11:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:11:29 +0100 Subject: [Buildroot] [git commit branch/next] package/mpd: update to version 0.23.12 Message-ID: <20230220205259.8DD8A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=86a3bd33c2d52b2d3e014913857abaa7f24f428c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next List of changes: decoder::mad: fix integer underflow with very small files input::curl: require CURL 7.55.0 or later output::pipewire: adjust to PipeWire 0.3.64 API change tags:: fix crash bug due to race condition fix build failures with GCC 13 Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.12/NEWS Commit: https://github.com/MusicPlayerDaemon/MPD/commit/b1422fb Tested on: i386 (build) x86_64 (build, run) Aarch64 (build) Signed-off-by: Andreas Ziegler Signed-off-by: Peter Korsgaard --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 8c488d0357..2521238f64 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 edb4e7a8f9dff238b5610f9e2461940ea98c727a5462fafb1cdf836304dfdca9 mpd-0.23.11.tar.xz +sha256 b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7 mpd-0.23.12.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 449600eda2..6c25c9b46f 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).11 +MPD_VERSION = $(MPD_VERSION_MAJOR).12 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 Mon Feb 20 21:02:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:01 -0000 Subject: [Buildroot] [git commit branch/next] package/nano: bump to version 7.2 Message-ID: <20230220205240.02DE981979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ec326fb97e51baa9f874d309a8fb2c69d6c8c18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- 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 f49b712093..3ca37c6337 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/v7/nano-7.1.tar.xz.asc +# https://www.nano-editor.org/dist/v7/nano-7.2.tar.xz.asc # using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F -sha256 57ba751e9b7519f0f6ddee505202e387c75dde440c1f7aa1b9310cc381406836 nano-7.1.tar.xz +sha256 86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526 nano-7.2.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 203c417f06..8a2003b92a 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 7 -NANO_VERSION = $(NANO_VERSION_MAJOR).1 +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 yann.morin.1998 at free.fr Mon Feb 20 21:02:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:02:02 -0000 Subject: [Buildroot] [git commit branch/next] package/ipmitool: allow configuring PEN registry source Message-ID: <20230220205239.9CF6B81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0901160666852eaea15eeac4a1905cfff94bab1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The default, the IANA PEN registry used by ipmitool is large (4 MiB+) and changes at the whim of IANA, meaning reproducible builds may not be possible by using the default package. Add a configuration option to specify the source of the registry file. Remote and local files are supported. If no source is specified, no registry file will be installed to the target. Backport upstream patches to allow this to add requisite support: Make a missing registry file non-fatal Make downloading/installing the registry optional Signed-off-by: Vincent Fazio Co-Developed-by: Yann E. MORIN [yann.morin.1998 at free.fr: - use https for the default URL - use simple assignment for first _CONF_OPTS - squeeze empty lines, comment closing endif ] Signed-off-by: Yann E. MORIN --- ...Do-not-require-the-IANA-PEN-registry-file.patch | 115 +++++++++++++++++++++ ...ure.ac-allow-disabling-registry-downloads.patch | 75 ++++++++++++++ package/ipmitool/Config.in | 12 +++ package/ipmitool/ipmitool.mk | 18 ++++ 4 files changed, 220 insertions(+) diff --git a/package/ipmitool/0003-Do-not-require-the-IANA-PEN-registry-file.patch b/package/ipmitool/0003-Do-not-require-the-IANA-PEN-registry-file.patch new file mode 100644 index 0000000000..3f35a78af2 --- /dev/null +++ b/package/ipmitool/0003-Do-not-require-the-IANA-PEN-registry-file.patch @@ -0,0 +1,115 @@ +From 26b088193a55624df4cbe2a0d33c7bba5bca108d Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Sat, 7 Jan 2023 21:02:48 -0600 +Subject: [PATCH] Do not require the IANA PEN registry file + +Previously, ipmitool would fail to run if the local copy of the IANA PEN +registry could not be parsed. + +When the registry is not available the manufacturer will be "Unknown" but +ipmitool will otherwise function so should not be considered fatal. + +Also, fix an issue with improperly handling the `oem_info_list_load` +return value. Previously, in `ipmi_oem_info_init`, if `oem_info_list_load` +returned a negative value due to the registry file not existing, an +improper count would cause `oem_info_init_from_list` to aallocate a list +that didn't encompass the full header/tail list. + + IANA PEN registry open failed: No such file or directory + Allocating 3 entries + [ 1] 16777214 | A Debug Assisting Company, Ltd. + [ 0] 1048575 | Unspecified + +Now, use a signed int and ensure a valid count of loaded OEMs is used. + +Signed-off-by: Vincent Fazio + +[vfazio: backport from upstream 26b088193a55624df4cbe2a0d33c7bba5bca108d] +Signed-off-by: Vincent Fazio +--- + include/ipmitool/ipmi_strings.h | 2 +- + lib/ipmi_main.c | 5 +---- + lib/ipmi_strings.c | 19 +++++-------------- + 3 files changed, 7 insertions(+), 19 deletions(-) + +diff --git a/include/ipmitool/ipmi_strings.h b/include/ipmitool/ipmi_strings.h +index 17c37c6..d60179c 100644 +--- a/include/ipmitool/ipmi_strings.h ++++ b/include/ipmitool/ipmi_strings.h +@@ -55,7 +55,7 @@ extern const struct valstr ipmi_integrity_algorithms[]; + extern const struct valstr ipmi_encryption_algorithms[]; + extern const struct valstr ipmi_user_enable_status_vals[]; + extern const struct valstr *ipmi_oem_info; +-int ipmi_oem_info_init(); ++void ipmi_oem_info_init(); + void ipmi_oem_info_free(); + + extern const struct valstr picmg_frucontrol_vals[]; +diff --git a/lib/ipmi_main.c b/lib/ipmi_main.c +index a673a30..510bc2d 100644 +--- a/lib/ipmi_main.c ++++ b/lib/ipmi_main.c +@@ -853,10 +853,7 @@ ipmi_main(int argc, char ** argv, + } + + /* load the IANA PEN registry */ +- if (ipmi_oem_info_init()) { +- lprintf(LOG_ERR, "Failed to initialize the OEM info dictionary"); +- goto out_free; +- } ++ ipmi_oem_info_init(); + + /* run OEM setup if found */ + if (oemtype && +diff --git a/lib/ipmi_strings.c b/lib/ipmi_strings.c +index 26b359f..c8fc2d0 100644 +--- a/lib/ipmi_strings.c ++++ b/lib/ipmi_strings.c +@@ -1719,39 +1719,30 @@ out: + return rc; + } + +-int ipmi_oem_info_init() ++void ipmi_oem_info_init() + { + oem_valstr_list_t terminator = { { -1, NULL}, NULL }; /* Terminator */ + oem_valstr_list_t *oemlist = &terminator; + bool free_strings = true; +- size_t count; +- int rc = -4; ++ int count; + + lprintf(LOG_INFO, "Loading IANA PEN Registry..."); + + if (ipmi_oem_info) { + lprintf(LOG_INFO, "IANA PEN Registry is already loaded"); +- rc = 0; + goto out; + } + +- if (!(count = oem_info_list_load(&oemlist))) { +- /* +- * We can't identify OEMs without a loaded registry. +- * Set the pointer to dummy and return. +- */ +- ipmi_oem_info = ipmi_oem_info_dummy; +- goto out; ++ if ((count = oem_info_list_load(&oemlist)) < 1) { ++ lprintf(LOG_WARN, "Failed to load entries from IANA PEN Registry"); ++ count = 0; + } + + /* In the array was allocated, don't free the strings at cleanup */ + free_strings = !oem_info_init_from_list(oemlist, count); + +- rc = IPMI_CC_OK; +- + out: + oem_info_list_free(&oemlist, free_strings); +- return rc; + } + + void ipmi_oem_info_free() +-- +2.25.1 + diff --git a/package/ipmitool/0004-configure.ac-allow-disabling-registry-downloads.patch b/package/ipmitool/0004-configure.ac-allow-disabling-registry-downloads.patch new file mode 100644 index 0000000000..9a995b9a14 --- /dev/null +++ b/package/ipmitool/0004-configure.ac-allow-disabling-registry-downloads.patch @@ -0,0 +1,75 @@ +From be11d948f89b10be094e28d8a0a5e8fb532c7b60 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Wed, 11 Jan 2023 22:55:51 -0600 +Subject: [PATCH] configure.ac: allow disabling registry downloads + +Some environments require reproducible builds. Since the IANA PEN +registry is constantly updating and there is no snapshot available, +installing ipmitool via `make install` is not reproducible. + +Provide a configure mechanism to disable the registry download/install.. + +[vfazio: backport from upstream be11d948f89b10be094e28d8a0a5e8fb532c7b60] +Signed-off-by: Vincent Fazio +--- + configure.ac | 30 ++++++++++++++++++++---------- + 1 file changed, 20 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4ee1be8..1dd2742 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,8 +18,6 @@ AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_CHECK_PROG([RPMBUILD], [rpmbuild], [rpmbuild], [rpm]) + AC_CHECK_PROG([SED], [sed], [sed]) +-AC_CHECK_PROG([WGET], [wget], [wget]) +-AC_CHECK_PROG([CURL], [curl], [curl]) + + AC_HEADER_STDC + AC_CHECK_HEADERS([stdlib.h string.h sys/ioctl.h sys/stat.h unistd.h paths.h]) +@@ -56,21 +54,33 @@ if test "x$exec_prefix" = "xNONE"; then + exec_prefix="$prefix" + fi + +-if test "x$WGET" = "x"; then +- if test "x$CURL" = "x"; then ++dnl allow enabling/disabling the fetching of the IANA PEN registry ++AC_ARG_ENABLE([registry-download], ++ [AC_HELP_STRING([--enable-registry-download], ++ [download/install the IANA PEN registry [default=yes]])], ++ [xenable_registry_download=$enableval], ++ [xenable_registry_download=yes]) ++ ++AM_CONDITIONAL([DOWNLOAD], [false]) ++ ++if test "x$xenable_registry_download" = "xyes"; then ++ AC_CHECK_PROG([WGET], [wget], [wget]) ++ AC_CHECK_PROG([CURL], [curl], [curl]) ++ ++ if test "x$WGET" = "x" && test "x$CURL" = "x"; then + AC_MSG_WARN([** Neither wget nor curl could be found.]) + AC_MSG_WARN([** IANA PEN database will not be installed by `make install` !]) + else +- DOWNLOAD="$CURL --location --progress-bar" + AM_CONDITIONAL([DOWNLOAD], [true]) ++ if test "x$WGET" != "x"; then ++ DOWNLOAD="$WGET -c -nd -O -" ++ else ++ DOWNLOAD="$CURL --location --progress-bar" ++ fi + fi +-else +- DOWNLOAD="$WGET -c -nd -O -" +- AM_CONDITIONAL([DOWNLOAD], [true]) + fi + +-AC_MSG_WARN([** Download is:]) +-AC_MSG_WARN($DOWNLOAD) ++AC_MSG_WARN([** Download is: $DOWNLOAD]) + AC_SUBST(DOWNLOAD, $DOWNLOAD) + + dnl +-- +2.25.1 + diff --git a/package/ipmitool/Config.in b/package/ipmitool/Config.in index dbd6483110..9516ff8596 100644 --- a/package/ipmitool/Config.in +++ b/package/ipmitool/Config.in @@ -9,6 +9,18 @@ config BR2_PACKAGE_IPMITOOL if BR2_PACKAGE_IPMITOOL +config BR2_PACKAGE_IPMITOOL_PEN_REG_URI + string "IANA PEN registry URL or path" + default "https://www.iana.org/assignments/enterprise-numbers.txt" + help + Enter an URL or a file path to the PEN registry to use. + + Note that the official registry is 4MiB+ and may change any + time and is thus not guaranteed to be reproducible. + + Leave empty to not use a registry; vendor IDs will be + displayed instead of the corresponding names. + config BR2_PACKAGE_IPMITOOL_LANPLUS bool "enable lanplus interface" select BR2_PACKAGE_OPENSSL diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index 5e34434a03..b3f1e217ff 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -13,6 +13,8 @@ IPMITOOL_CPE_ID_VENDOR = ipmitool_project IPMITOOL_AUTORECONF = YES IPMITOOL_DEPENDENCIES = host-pkgconf +IPMITOOL_CONF_OPTS = --disable-registry-download + ifeq ($(BR2_PACKAGE_FREEIPMI),y) IPMITOOL_DEPENDENCIES += freeipmi IPMITOOL_CONF_OPTS += --enable-intf-free @@ -47,4 +49,20 @@ endef IPMITOOL_POST_INSTALL_TARGET_HOOKS += IPMITOOL_REMOVE_IPMIEVD endif +IPMITOOL_PEN_REG_URI = $(call qstrip,$(BR2_PACKAGE_IPMITOOL_PEN_REG_URI)) +ifneq ($(IPMITOOL_PEN_REG_URI),) +ifneq ($(findstring ://,$(IPMITOOL_PEN_REG_URI)),) +IPMITOOL_EXTRA_DOWNLOADS += $(IPMITOOL_PEN_REG_URI) +BR_NO_CHECK_HASH_FOR += $(notdir $(IPMITOOL_PEN_REG_URI)) +IPMITOOL_PEN_REG = $(IPMITOOL_DL_DIR)/$(notdir $(IPMITOOL_PEN_REG_URI)) +else +IPMITOOL_PEN_REG = $(IPMITOOL_PEN_REG_URI) +endif #findstring +define IPMITOOL_INSTALL_PEN_REG + $(INSTALL) -D -m 0644 $(IPMITOOL_PEN_REG) \ + $(TARGET_DIR)/usr/share/misc/enterprise-numbers +endef +IPMITOOL_POST_INSTALL_TARGET_HOOKS += IPMITOOL_INSTALL_PEN_REG +endif # IPMITOOL_PEN_REG_URI !empty + $(eval $(autotools-package)) From peter at korsgaard.com Mon Feb 20 21:02:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:03 -0000 Subject: [Buildroot] [git commit branch/next] package/python-future: security bump to version 0.18.3 Message-ID: <20230220205240.29E90828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51eb81ddcf340457cff13286fd1aa04082c4903a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-40899: An issue discovered in Python Charmers Future 0.18.2 and earlier allows remote attackers to cause a denial of service via crafted Set-Cookie header from malicious web server. https://github.com/PythonCharmers/python-future/releases/tag/v0.18.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-future/python-future.hash | 6 +++--- package/python-future/python-future.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-future/python-future.hash b/package/python-future/python-future.hash index 4fb5d2a2d7..3b2bbb0212 100644 --- a/package/python-future/python-future.hash +++ b/package/python-future/python-future.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.python.org/pypi/future/json -md5 e4579c836b9c025872efe230f6270349 future-0.18.2.tar.gz -sha256 b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d future-0.18.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/future/json +md5 dedcb70d14b23388670d54145aab8be4 future-0.18.3.tar.gz +sha256 34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307 future-0.18.3.tar.gz # Locally computed sha256 checksums sha256 916e561392d48471b9c23437f56e2652f320cb3b119ceaa162edf41016f746b9 LICENSE.txt diff --git a/package/python-future/python-future.mk b/package/python-future/python-future.mk index 76f32180ac..57bf13d83b 100644 --- a/package/python-future/python-future.mk +++ b/package/python-future/python-future.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FUTURE_VERSION = 0.18.2 +PYTHON_FUTURE_VERSION = 0.18.3 PYTHON_FUTURE_SOURCE = future-$(PYTHON_FUTURE_VERSION).tar.gz -PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/45/0b/38b06fd9b92dc2b68d58b75f900e97884c45bedd2ff83203d933cf5851c9 +PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/8f/2e/cf6accf7415237d6faeeebdc7832023c90e0282aa16fd3263db0eb4715ec PYTHON_FUTURE_SETUP_TYPE = setuptools PYTHON_FUTURE_LICENSE = MIT PYTHON_FUTURE_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 20 21:02:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:04 -0000 Subject: [Buildroot] [git commit branch/next] package/c-icap: bump to version 0.5.10 Message-ID: <20230220205240.370038648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb6ad853d67d3c3a83093924ae305f35213793bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://sourceforge.net/p/c-icap/news/2021/10/the-c-icap-0510-is-released https://sourceforge.net/p/c-icap/news/2021/09/the-c-icap-059-is-released https://sourceforge.net/p/c-icap/news/2021/03/the-c-icap-058-is-released Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/c-icap/c-icap.hash | 6 +++--- package/c-icap/c-icap.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/c-icap/c-icap.hash b/package/c-icap/c-icap.hash index 6aa81c2641..9a596cf375 100644 --- a/package/c-icap/c-icap.hash +++ b/package/c-icap/c-icap.hash @@ -1,6 +1,6 @@ # Retrieved from https://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/ -md5 82fd2fba1a08a8a0cf3567fe24aa035d c_icap-0.5.7.tar.gz -sha1 3b2470e00abd1418bec3a440d3073d7a6231c4c1 c_icap-0.5.7.tar.gz +md5 c8329684588a906d10a687e84ba4a478 c_icap-0.5.10.tar.gz +sha1 2901aa19c8c4b09b700164290942290c34132076 c_icap-0.5.10.tar.gz # Locally calculated -sha256 01ef17d7999d3476fe705abc56d0da562c2f180aafe08fc1269f419cad8521a9 c_icap-0.5.7.tar.gz +sha256 541d503354907f06d1d72fa90fffd031002f0f4346150fb7b2203ad5825ae49d c_icap-0.5.10.tar.gz sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk index fb66c75e61..707069870d 100644 --- a/package/c-icap/c-icap.mk +++ b/package/c-icap/c-icap.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ICAP_VERSION = 0.5.7 +C_ICAP_VERSION = 0.5.10 C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz C_ICAP_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_LICENSE = LGPL-2.1+ From peter at korsgaard.com Mon Feb 20 21:02:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:05 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/kria/uboot.fragment: remove unnecessary configs Message-ID: <20230220205240.4D97C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa341f029832a658865ed4b5849efc4b765452f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Reduce the configs in the kria/uboot.fragment to only what is necessary. These 4 configs are already included in the xilinx_zynqmp_virt_defconfig, so it is redundant to include them in the kria/uboot.fragment file. Applying this patch has zero impact on the u-boot binaries that are built. This patch has been build and run tested on a kria kv260 starter kit. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- board/zynqmp/kria/uboot.fragment | 4 ---- 1 file changed, 4 deletions(-) diff --git a/board/zynqmp/kria/uboot.fragment b/board/zynqmp/kria/uboot.fragment index 40709549dc..d8efc230a0 100644 --- a/board/zynqmp/kria/uboot.fragment +++ b/board/zynqmp/kria/uboot.fragment @@ -7,9 +7,5 @@ CONFIG_PHY=y CONFIG_PHY_XILINX_ZYNQMP=y CONFIG_PINCTRL=y CONFIG_PINCONF=y -CONFIG_POWER_DOMAIN=y -CONFIG_ZYNQMP_POWER_DOMAIN=y -CONFIG_DM_RESET=y -CONFIG_RESET_ZYNQMP=y CONFIG_VIDEO_ZYNQMP_DPSUB=y CONFIG_SF_DEFAULT_SPEED=40000000 From peter at korsgaard.com Mon Feb 20 21:02:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:06 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_zcu106_defconfig: use Xilinx github for pmufw.elf Message-ID: <20230220205240.6C0988648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0939cecb401fa3a4227649b36bc4298790544928 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate zcu106_pmufw.elf location from nealfrager github to Xilinx github. The image is identical, so this patch has zero impact on functionality. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu106_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 699e528f32..88295571af 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -29,7 +29,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.2/zcu106/zcu106_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/2022.2_br_1/zcu106/zcu106_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From peter at korsgaard.com Mon Feb 20 21:02:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:08 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Marcus Folkesson for libcamera/libcamera-apps Message-ID: <20230220205240.9521C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c373ca0572e2017e04bd48a9ce63151fb23e378a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libcamera-apps is orphaned, so take care of it. Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e8e0dffcd3..b973c37b82 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1890,6 +1890,8 @@ F: support/testing/tests/package/test_python_pytest.py F: support/testing/tests/package/test_python_pytest_asyncio.py N: Marcus Folkesson +F: package/libcamera/ +F: package/libcamera-apps/ F: package/libostree/ F: package/libselinux/ F: package/libsemanage/ From peter at korsgaard.com Mon Feb 20 21:02:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:08 -0000 Subject: [Buildroot] [git commit branch/next] package/nginx: bump to version 1.22.1 Message-ID: <20230220205240.0FC468648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=722b84eafa5e3d9540e0a80bae0c971a3a778358 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop eleventh patch (already in version) - Update hash of LICENSE file (update in year) - pcre2 is supported (and enabled by default) since https://github.com/nginx/nginx/commit/c6fec0b027569a4e0b1d8aaee7dea0f2e4d6052b http://nginx.org/en/CHANGES-1.22 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../nginx/0011-Mp4-disabled-duplicate-atoms.patch | 315 --------------------- package/nginx/Config.in | 2 +- package/nginx/nginx.hash | 4 +- package/nginx/nginx.mk | 11 +- 4 files changed, 7 insertions(+), 325 deletions(-) diff --git a/package/nginx/0011-Mp4-disabled-duplicate-atoms.patch b/package/nginx/0011-Mp4-disabled-duplicate-atoms.patch deleted file mode 100644 index 7baa810b56..0000000000 --- a/package/nginx/0011-Mp4-disabled-duplicate-atoms.patch +++ /dev/null @@ -1,315 +0,0 @@ -From 6b022a5556af22b6e18532e547a6ae46b0d8c6ea Mon Sep 17 00:00:00 2001 -From: Roman Arutyunyan -Date: Wed, 19 Oct 2022 10:53:17 +0300 -Subject: [PATCH] Mp4: disabled duplicate atoms. - -Most atoms should not appear more than once in a container. Previously, -this was not enforced by the module, which could result in worker process -crash, memory corruption and disclosure. - -Signed-off-by: Peter Korsgaard ---- - src/http/modules/ngx_http_mp4_module.c | 147 +++++++++++++++++++++++++ - 1 file changed, 147 insertions(+) - -diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c -index 9c3f627f..4eff01e9 100644 ---- a/src/http/modules/ngx_http_mp4_module.c -+++ b/src/http/modules/ngx_http_mp4_module.c -@@ -1121,6 +1121,12 @@ ngx_http_mp4_read_ftyp_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - return NGX_ERROR; - } - -+ if (mp4->ftyp_atom.buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 ftyp atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; - - ftyp_atom = ngx_palloc(mp4->request->pool, atom_size); -@@ -1179,6 +1185,12 @@ ngx_http_mp4_read_moov_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - return NGX_DECLINED; - } - -+ if (mp4->moov_atom.buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 moov atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - conf = ngx_http_get_module_loc_conf(mp4->request, ngx_http_mp4_module); - - if (atom_data_size > mp4->buffer_size) { -@@ -1246,6 +1258,12 @@ ngx_http_mp4_read_mdat_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mdat atom"); - -+ if (mp4->mdat_atom.buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 mdat atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - data = &mp4->mdat_data_buf; - data->file = &mp4->file; - data->in_file = 1; -@@ -1372,6 +1390,12 @@ ngx_http_mp4_read_mvhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mvhd atom"); - -+ if (mp4->mvhd_atom.buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 mvhd atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom_header = ngx_mp4_atom_header(mp4); - mvhd_atom = (ngx_mp4_mvhd_atom_t *) atom_header; - mvhd64_atom = (ngx_mp4_mvhd64_atom_t *) atom_header; -@@ -1637,6 +1661,13 @@ ngx_http_mp4_read_tkhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_TKHD_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 tkhd atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->tkhd_size = atom_size; - trak->movie_duration = duration; - -@@ -1676,6 +1707,12 @@ ngx_http_mp4_read_mdia_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_MDIA_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 mdia atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->mdia_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -1799,6 +1836,13 @@ ngx_http_mp4_read_mdhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_MDHD_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 mdhd atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->mdhd_size = atom_size; - trak->timescale = timescale; - trak->duration = duration; -@@ -1862,6 +1906,12 @@ ngx_http_mp4_read_hdlr_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_HDLR_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 hdlr atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->hdlr_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -1890,6 +1940,12 @@ ngx_http_mp4_read_minf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_MINF_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 minf atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->minf_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -1933,6 +1989,15 @@ ngx_http_mp4_read_vmhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf -+ || trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf) -+ { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 vmhd/smhd atom in \"%s\"", -+ mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->vmhd_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -1964,6 +2029,15 @@ ngx_http_mp4_read_smhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf -+ || trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf) -+ { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 vmhd/smhd atom in \"%s\"", -+ mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->smhd_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -1995,6 +2069,12 @@ ngx_http_mp4_read_dinf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_DINF_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 dinf atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->dinf_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -2023,6 +2103,12 @@ ngx_http_mp4_read_stbl_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_STBL_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stbl atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->stbl_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -2144,6 +2230,12 @@ ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_STSD_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stsd atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->stsd_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -2212,6 +2304,13 @@ ngx_http_mp4_read_stts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - atom_end = atom_table + entries * sizeof(ngx_mp4_stts_entry_t); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_STTS_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stts atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->time_to_sample_entries = entries; - - atom = &trak->stts_atom_buf; -@@ -2480,6 +2579,13 @@ ngx_http_mp4_read_stss_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - "sync sample entries:%uD", entries); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_STSS_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stss atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->sync_samples_entries = entries; - - atom_table = atom_header + sizeof(ngx_http_mp4_stss_atom_t); -@@ -2678,6 +2784,13 @@ ngx_http_mp4_read_ctts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - "composition offset entries:%uD", entries); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_CTTS_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 ctts atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->composition_offset_entries = entries; - - atom_table = atom_header + sizeof(ngx_mp4_ctts_atom_t); -@@ -2881,6 +2994,13 @@ ngx_http_mp4_read_stsc_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - atom_end = atom_table + entries * sizeof(ngx_mp4_stsc_entry_t); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_STSC_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stsc atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->sample_to_chunk_entries = entries; - - atom = &trak->stsc_atom_buf; -@@ -3213,6 +3333,13 @@ ngx_http_mp4_read_stsz_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - "sample uniform size:%uD, entries:%uD", size, entries); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_STSZ_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stsz atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->sample_sizes_entries = entries; - - atom_table = atom_header + sizeof(ngx_mp4_stsz_atom_t); -@@ -3396,6 +3523,16 @@ ngx_http_mp4_read_stco_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - atom_end = atom_table + entries * sizeof(uint32_t); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_STCO_ATOM].buf -+ || trak->out[NGX_HTTP_MP4_CO64_ATOM].buf) -+ { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stco/co64 atom in \"%s\"", -+ mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->chunks = entries; - - atom = &trak->stco_atom_buf; -@@ -3602,6 +3739,16 @@ ngx_http_mp4_read_co64_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - atom_end = atom_table + entries * sizeof(uint64_t); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_STCO_ATOM].buf -+ || trak->out[NGX_HTTP_MP4_CO64_ATOM].buf) -+ { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stco/co64 atom in \"%s\"", -+ mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->chunks = entries; - - atom = &trak->co64_atom_buf; --- -2.30.2 - diff --git a/package/nginx/Config.in b/package/nginx/Config.in index 90a0822298..406a1c861a 100644 --- a/package/nginx/Config.in +++ b/package/nginx/Config.in @@ -214,7 +214,7 @@ config BR2_PACKAGE_NGINX_HTTP_REFERER_MODULE config BR2_PACKAGE_NGINX_HTTP_REWRITE_MODULE bool "ngx_http_rewrite_module" default y - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Enable ngx_http_rewrite_module diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 06d3392a2e..06454c5e32 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49 nginx-1.20.1.tar.gz +sha256 9ebb333a9e82b952acd3e2b4aeb1d4ff6406f72491bab6cd9fe69f0dea737f31 nginx-1.22.1.tar.gz # License files, locally calculated -sha256 b57270c1f73eb6624b38b2d0a1affcec56b21fab39efbf8c837428f05cef1d73 LICENSE +sha256 ececed0b0e7243a4766cbc62b26df4bd3513b41de3a07425da1679c836d06320 LICENSE diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 62ea379ffc..10cc95d90e 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.20.1 +NGINX_VERSION = 1.22.1 NGINX_SITE = http://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE @@ -19,9 +19,6 @@ NGINX_CONF_OPTS = \ --with-cpp="$(TARGET_CC)" \ --with-ld-opt="$(TARGET_LDFLAGS)" -# 0011-Mp4-disabled-duplicate-atoms.patch -NGINX_IGNORE_CVES += CVE-2022-41741 CVE-2022-41742 - # www-data user and group are used for nginx. Because these user and group # are already set by buildroot, it is not necessary to redefine them. # See system/skeleton/etc/passwd @@ -83,8 +80,8 @@ else NGINX_CONF_ENV += ngx_force_have_libatomic=no endif -ifeq ($(BR2_PACKAGE_PCRE),y) -NGINX_DEPENDENCIES += pcre +ifeq ($(BR2_PACKAGE_PCRE2),y) +NGINX_DEPENDENCIES += pcre2 NGINX_CONF_OPTS += --with-pcre else NGINX_CONF_OPTS += --without-pcre @@ -167,7 +164,7 @@ NGINX_CONF_OPTS += --without-http_gzip_module endif ifeq ($(BR2_PACKAGE_NGINX_HTTP_REWRITE_MODULE),y) -NGINX_DEPENDENCIES += pcre +NGINX_DEPENDENCIES += pcre2 else NGINX_CONF_OPTS += --without-http_rewrite_module endif From peter at korsgaard.com Mon Feb 20 21:02:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:09 -0000 Subject: [Buildroot] [git commit branch/next] package/s390-tools: bump to version 2.25 Message-ID: <20230220205240.B553A7FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11d7fb7013d0fbdb959897e00acc5955427a31de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Alexander Egorenkov Signed-off-by: Peter Korsgaard --- 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 f74695b81d..a0dde477c3 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c04d1f7d7f4c941f19a293188eb6302194cc298171f88a4dc17a08a8001c6c01 s390-tools-2.23.0.tar.gz +sha256 ccb20954e748309a50fd56edd9abd94c6f897081e9a1a33e9d965a56f650990d s390-tools-2.25.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index 99fc669ce7..cb6278dfb8 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.23.0 +S390_TOOLS_VERSION = 2.25.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 peter at korsgaard.com Mon Feb 20 21:02:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:11 -0000 Subject: [Buildroot] [git commit branch/next] package/libcamera-apps: bump to version 1.1.0 Message-ID: <20230220205240.892FD81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fac163b9315a26f2ad041e0624fac283078d795 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- ...e-Werror-and-Wfatal-errors-compiler-comma.patch | 37 -------------------- ...-egl_preview-compile-conversion-from-Wind.patch | 39 ---------------------- package/libcamera-apps/libcamera-apps.hash | 2 +- package/libcamera-apps/libcamera-apps.mk | 4 +-- 4 files changed, 3 insertions(+), 79 deletions(-) diff --git a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch deleted file mode 100644 index 988d89cca3..0000000000 --- a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6bd733b52f0b4039407c676cd3126a9e2f79456b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 5 Feb 2021 18:24:08 +0100 -Subject: [PATCH] cmake: remove -Werror and -Wfatal-errors compiler command - line option -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes (with bootlin-riscv64-musl toolchain): - - .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/core/libcamera_app.cpp:30:22: error: overflow in conversion from ???long unsigned int??? to ???int??? changes value from ???2154321408??? to ???-2140645888??? [-Werror=overflow] - 30 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); - | ^~~~~~~~~~~~~~~ - cc1plus: all warnings being treated as errors - -Signed-off-by: Peter Seiderer ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 748c6dd..1ca1e39 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 -Werror -Wfatal-errors) -+add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new) - add_definitions(-D_FILE_OFFSET_BITS=64) - - if (CMAKE_COMPILER_IS_GNUCXX) --- -2.34.1 - 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 deleted file mode 100644 index cc9069aa86..0000000000 --- a/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 - diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash index 2dbb74d463..cc2d3b6926 100644 --- a/package/libcamera-apps/libcamera-apps.hash +++ b/package/libcamera-apps/libcamera-apps.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 611aec06dd24de6586580164d9b7c55da0698ac4cf129944b2fc41fe67210597 libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5.tar.gz +sha256 2d895ad5d11a6004b1e84eb8d486d5dca64dda1b41e0f4f3f87904666f249e3e libcamera-apps-1.1.0.tar.gz sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index f4fc019c17..a5d9227250 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCAMERA_APPS_VERSION = 2d1009e3badcc8047361ff81149ad6cba3b911b5 -LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) +LIBCAMERA_APPS_VERSION = 1.1.0 +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,v$(LIBCAMERA_APPS_VERSION)) LIBCAMERA_APPS_LICENSE = BSD-2-Clause LIBCAMERA_APPS_LICENSE_FILES = license.txt LIBCAMERA_APPS_DEPENDENCIES = \ From peter at korsgaard.com Mon Feb 20 21:02:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:12 -0000 Subject: [Buildroot] [git commit branch/next] package/openlayers: bump to version 7.2.2 Message-ID: <20230220205240.C2D5A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ccd391bfd94fdcaed77a2fe31c577e428cefc0ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Thomas Claveirole Signed-off-by: Peter Korsgaard --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index 1b3f3cce51..7e33716f78 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 37a0e5fde4df3db6e6c11ed0ceb8e20608121afe5f8f7f91cf03990e89a919ca v7.1.0-package.zip +sha256 31b848cc55967c7de63fece8cd1699fc51152421d04653b859103c7391ad5bbe v7.2.2-package.zip sha256 6c4347b83a8c9feef18d57b18e3b6c44cf901b3c344a4a1fbd837e421555ab8e LICENSE.md diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 7396e38fb9..852f5f1dcf 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 7.1.0 +OPENLAYERS_VERSION = 7.2.2 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-package.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause From peter at korsgaard.com Mon Feb 20 21:02:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:13 -0000 Subject: [Buildroot] [git commit branch/next] package/sexpect: new package Message-ID: <20230220205240.D23C37FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c157330da49dcfe41fe7cef9fe4ec77636f326f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next sexpect is useful for shell controlled testing. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/sexpect/Config.in | 8 ++++++++ package/sexpect/sexpect.hash | 3 +++ package/sexpect/sexpect.mk | 13 +++++++++++++ 5 files changed, 26 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 385a46ccf9..83fa9e403d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -294,6 +294,7 @@ F: package/ebtables/ F: package/i2c-tools/ F: package/libcurl/ F: package/libpcap/ +F: package/sexpect/ F: package/socat/ F: package/strace/ F: package/tcpdump/ diff --git a/package/Config.in b/package/Config.in index b281a67157..eabb0d5201 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2568,6 +2568,7 @@ comment "Utilities" source "package/rtty/Config.in" source "package/screen/Config.in" source "package/screenfetch/Config.in" + source "package/sexpect/Config.in" source "package/sudo/Config.in" source "package/terminology/Config.in" source "package/time/Config.in" diff --git a/package/sexpect/Config.in b/package/sexpect/Config.in new file mode 100644 index 0000000000..bdf5c3bbf5 --- /dev/null +++ b/package/sexpect/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SEXPECT + bool "sexpect" + help + sexpect is another implementation of Expect which is + specifically designed for Shell scripts + (sh, bash, ksh, zsh, ...) + + https://github.com/clarkwang/sexpect diff --git a/package/sexpect/sexpect.hash b/package/sexpect/sexpect.hash new file mode 100644 index 0000000000..d512117626 --- /dev/null +++ b/package/sexpect/sexpect.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f6801c8b979d56eec54aedd7ede06e2342f382cee291beea88b52869186c557c sexpect-2.3.14.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/sexpect/sexpect.mk b/package/sexpect/sexpect.mk new file mode 100644 index 0000000000..7b878600e4 --- /dev/null +++ b/package/sexpect/sexpect.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# sexpect +# +################################################################################ + +SEXPECT_VERSION = 2.3.14 +SEXPECT_SITE = $(call github,clarkwang,sexpect,v$(SEXPECT_VERSION)) +SEXPECT_LICENSE = GPL-3.0 +SEXPECT_LICENSE_FILES = LICENSE +SEXPECT_SUPPORTS_IN_SOURCE_BUILD = NO + +$(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 20 21:02:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:14 -0000 Subject: [Buildroot] [git commit branch/next] package/libpsl: bump to version 0.21.2 Message-ID: <20230220205240.EB2D3828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33703b32bf5fbb18a25546403527e7140292eba0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patch (already in version) - Update hash of COPYING (update in year: https://github.com/rockdaboot/libpsl/commit/927b202c69bcd9be4c30ba51c74925f2575e1a69) - builtin is a boolean since https://github.com/rockdaboot/libpsl/commit/aa4909766c24c17bd1d9000ca419f6dc6b32c238 https://github.com/rockdaboot/libpsl/releases/tag/0.21.2 Signed-off-by: Fabrice Fontaine Reviewed-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- ...001-Add-libiconv-dep-to-meson-build-again.patch | 60 ---------------------- package/libpsl/libpsl.hash | 4 +- package/libpsl/libpsl.mk | 9 ++-- 3 files changed, 7 insertions(+), 66 deletions(-) diff --git a/package/libpsl/0001-Add-libiconv-dep-to-meson-build-again.patch b/package/libpsl/0001-Add-libiconv-dep-to-meson-build-again.patch deleted file mode 100644 index 72f50aa593..0000000000 --- a/package/libpsl/0001-Add-libiconv-dep-to-meson-build-again.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5b63816e82287808e81b8603a528af3cc6fab354 Mon Sep 17 00:00:00 2001 -From: Zhao Zhili -Date: Thu, 7 Jan 2021 20:59:17 +0800 -Subject: [PATCH] Add libiconv dep to meson build again - -Build success on macOS and ubuntu. - -[Retrieved from: -https://github.com/rockdaboot/libpsl/commit/5b63816e82287808e81b8603a528af3cc6fab354] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 14 ++++++++++++++ - src/meson.build | 2 +- - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index f248171..fb2de31 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,6 +20,7 @@ libicu_dep = notfound - libidn_dep = notfound - libunistring = notfound - networking_deps = notfound -+libiconv_dep = notfound - - # FIXME: Cleanup this when Meson gets 'feature-combo': - # https://github.com/mesonbuild/meson/issues/4566 -@@ -86,6 +87,19 @@ endif - if libidn2_dep.found() or libidn_dep.found() - # Check for libunistring, we need it for psl_str_to_utf8lower() - libunistring = cc.find_library('unistring') -+ found_iconv = false -+ if cc.has_function('iconv_open') -+ libiconv_dep = [] -+ found_iconv = true -+ endif -+ if not found_iconv and cc.has_header_symbol('iconv.h', 'iconv_open') -+ libiconv_dep = [cc.find_library('iconv')] -+ found_iconv = true -+ endif -+ -+ if not found_iconv -+ error('iconv implementation not found') -+ endif - endif - - if host_machine.system() == 'windows' -diff --git a/src/meson.build b/src/meson.build -index 0d1dcdf..746bf44 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -19,7 +19,7 @@ cargs = [ - libpsl = library('psl', sources, suffixes_dafsa_h, - include_directories : [configinc, includedir], - c_args : cargs, -- dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps], -+ dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps, libiconv_dep], - version: lt_version, - install: true, - ) diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash index 552935e9ec..a35a609ff2 100644 --- a/package/libpsl/libpsl.hash +++ b/package/libpsl/libpsl.hash @@ -1,6 +1,6 @@ # Locally generated -sha256 ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c libpsl-0.21.1.tar.gz +sha256 e35991b6e17001afa2c0ca3b10c357650602b92596209b7492802f3768a6285f libpsl-0.21.2.tar.gz # Hashes for license files: -sha256 7903413e7aa0bbcb77aa19150a3f1034edc0a760cff174f9a53efe4de6f056a4 COPYING +sha256 776cd11d54f0ea3e5efdd25ff1a0d952a1744215bb5858ea7aeb91808e70c9f7 COPYING sha256 1d7f52747a9169751cdf2641a8299c0098e9ecdf9429296ffd55bdb14c9ed5b3 src/LICENSE.chromium diff --git a/package/libpsl/libpsl.mk b/package/libpsl/libpsl.mk index 742117e8ea..ef3c524b4f 100644 --- a/package/libpsl/libpsl.mk +++ b/package/libpsl/libpsl.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBPSL_VERSION = 0.21.1 +LIBPSL_VERSION = 0.21.2 LIBPSL_SITE = https://github.com/rockdaboot/libpsl/releases/download/$(LIBPSL_VERSION) LIBPSL_LICENSE = MIT, BSD-3-Clause LIBPSL_LICENSE_FILES = COPYING src/LICENSE.chromium +LIBPSL_CONF_OPTS = -Dbuiltin=true LIBPSL_DEPENDENCIES = host-pkgconf LIBPSL_INSTALL_STAGING = YES @@ -17,13 +18,13 @@ endif # The order of checks is the same as done by libpsl when configured. ifeq ($(BR2_PACKAGE_LIBIDN2)$(BR2_PACKAGE_LIBUNISTRING),yy) -LIBPSL_CONF_OPTS += -Druntime=libidn2 -Dbuiltin=libidn2 +LIBPSL_CONF_OPTS += -Druntime=libidn2 LIBPSL_DEPENDENCIES += libidn2 libunistring else ifeq ($(BR2_PACKAGE_ICU),y) -LIBPSL_CONF_OPTS += -Druntime=libicu -Dbuiltin=libicu +LIBPSL_CONF_OPTS += -Druntime=libicu LIBPSL_DEPENDENCIES += icu else -LIBPSL_CONF_OPTS += -Druntime=libidn -Dbuiltin=libidn +LIBPSL_CONF_OPTS += -Druntime=libidn LIBPSL_DEPENDENCIES += libidn libunistring endif From peter at korsgaard.com Mon Feb 20 21:02:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:15 -0000 Subject: [Buildroot] [git commit branch/next] package/libmodsecurity: bump to version 3.0.8 Message-ID: <20230220205241.1075D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b20c52a5bb13fde04f4ad47fafd1daca664c2bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/SpiderLabs/ModSecurity/releases/tag/v3.0.8 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libmodsecurity/libmodsecurity.hash | 4 ++-- package/libmodsecurity/libmodsecurity.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index 087157d162..7ba0ef7f18 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.7/modsecurity-v3.0.7.tar.gz.sha256 -sha256 cfd8b7e7e6a0e9ca4e19b9adeb07594ba75eba16a66da5e9b0974c0117c21a34 modsecurity-v3.0.7.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.8/modsecurity-v3.0.8.tar.gz.sha256 +sha256 e241c89b3cd7e58a863d0d0d6b9b8ba4d33ffb0f51171044c258c62e3e7956c7 modsecurity-v3.0.8.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 916ba8fbcb..e83fda895f 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.7 +LIBMODSECURITY_VERSION = 3.0.8 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 21:02:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:16 -0000 Subject: [Buildroot] [git commit branch/next] package/bubblewrap: bump to version 0.7.0 Message-ID: <20230220205241.1CDA8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9735d0e74fb8588ebbf2d888b40caac0aa8fa98 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This version contains a few minor fixes, provides better error messages, and includes a new option to set the size of created tmpfs volumes. Release notes: https://github.com/containers/bubblewrap/releases/tag/v0.7.0 Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- 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 98fafc3679..0475f8882a 100644 --- a/package/bubblewrap/bubblewrap.hash +++ b/package/bubblewrap/bubblewrap.hash @@ -1,5 +1,5 @@ -# From https://github.com/containers/bubblewrap/releases/tag/v0.6.2 -sha256 8a0ec802d1b3e956c5bb0a40a81c9ce0b055a31bf30a8efa547433603b8af20b bubblewrap-0.6.2.tar.xz +# From https://github.com/containers/bubblewrap/releases/tag/v0.7.0 +sha256 764ab7100bd037ea53d440d362e099d7a425966bc62d1f00ab26b8fbb882a9dc bubblewrap-0.7.0.tar.xz # Hash for license files: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 91864d2b76..658e6e113c 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUBBLEWRAP_VERSION = 0.6.2 +BUBBLEWRAP_VERSION = 0.7.0 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 thomas.petazzoni at bootlin.com Mon Feb 20 21:02:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:17 -0000 Subject: [Buildroot] [git commit branch/next] package/luajit: bump to version d0e88930ddde28ff662503f9f20facf34f7265aa Message-ID: <20230220205241.4455A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b83a41ccd8c75caff009a826d938fd74a70a10f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/luajit/luajit.hash | 2 +- package/luajit/luajit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash index d00cea4ee0..c655e9931c 100644 --- a/package/luajit/luajit.hash +++ b/package/luajit/luajit.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 19a911fdd77af69e48fa50749606a9009696f543cc88e898b4480d8d3c8828f5 luajit-6c4826f12c4d33b8b978004bc681eb1eef2be977.tar.gz +sha256 aa354d1265814db5a1ee9dfff6049e19b148e1fd818f1ecfa4fcf2b19f6e4dd9 luajit-d0e88930ddde28ff662503f9f20facf34f7265aa.tar.gz # Locally calculated sha256 52fc5b15ac968ed81aabb4c1e23ab3bce50f57a5764e9cdca86b463a11072921 COPYRIGHT diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index c79f18bf62..09bde3590f 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAJIT_VERSION = 6c4826f12c4d33b8b978004bc681eb1eef2be977 +LUAJIT_VERSION = d0e88930ddde28ff662503f9f20facf34f7265aa LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:18 -0000 Subject: [Buildroot] [git commit branch/next] package/postgresql: bump version to 15.1 Message-ID: <20230220205241.66D7381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af2788ea2ff34e5795ed10df8703bf0f89fda1d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://www.postgresql.org/docs/release/15.1/ Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 26bb626943..ef2806c2dd 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v14.6/postgresql-14.6.tar.bz2.sha256 -sha256 508840fc1809d39ab72274d5f137dabb9fd7fb4f933da4168aeebb20069edf22 postgresql-14.6.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v14.6/postgresql-15.1.tar.bz2.sha256 +sha256 64fdf23d734afad0dfe4077daca96ac51dcd697e68ae2d3d4ca6c45cb14e21ae postgresql-15.1.tar.bz2 # License file, Locally calculated sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 502860bc99..5313e03b12 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 14.6 +POSTGRESQL_VERSION = 15.1 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 Mon Feb 20 21:02:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:19 -0000 Subject: [Buildroot] [git commit branch/next] package/janet: bump to version 1.26.0 Message-ID: <20230220205241.353A181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c6f32bd255fc97823d464beacfa905a141066ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next diff LICENCE: -Copyright (c) 2021 Calvin Rose and contributors +Copyright (c) 2023 Calvin Rose and contributors Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/janet/janet.hash | 4 ++-- package/janet/janet.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/janet/janet.hash b/package/janet/janet.hash index 5cd3db1c29..47e0de4a0f 100644 --- a/package/janet/janet.hash +++ b/package/janet/janet.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 5bf9b680adbc5511835aec3787117df37032eef796e1664edbbcfd540b6acaf3 janet-1.25.0.tar.gz +sha256 c95dab93e8e4ebcab5c293d5ee448fb43ab8bd2f6391fd66a6ca92fe1ec72c03 janet-1.26.0.tar.gz # Locally calculated -sha256 e2d2ae8360d95386af751ac7d1a3da36ea8ceb230e5f0eba7eb762547b1c58c9 LICENSE +sha256 95fca700e8dce9699248e7cc80ac88ce2357874c8352cd2be4d18f183dc9710b LICENSE diff --git a/package/janet/janet.mk b/package/janet/janet.mk index 284e6c2642..db1eb2a5c4 100644 --- a/package/janet/janet.mk +++ b/package/janet/janet.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANET_VERSION = 1.25.0 +JANET_VERSION = 1.26.0 JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION)) JANET_LICENSE = MIT JANET_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 21:02:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:20 -0000 Subject: [Buildroot] [git commit branch/next] package/iptables: bump to version 1.8.9 Message-ID: <20230220205241.03CE48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef2af4b67f3403fc0feaca8a07d1733f17c6b316 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patches (already in version) https://netfilter.org/projects/iptables/files/changes-iptables-1.8.9.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...fix-build-for-missing-ETH_ALEN-definition.patch | 69 --------- .../0002-treewide-use-uint-instead-of-u_int.patch | 167 --------------------- package/iptables/0003-netfilter-add-nf_log.h.patch | 38 ----- package/iptables/iptables.hash | 2 +- package/iptables/iptables.mk | 4 +- 5 files changed, 3 insertions(+), 277 deletions(-) diff --git a/package/iptables/0001-Revert-fix-build-for-missing-ETH_ALEN-definition.patch b/package/iptables/0001-Revert-fix-build-for-missing-ETH_ALEN-definition.patch deleted file mode 100644 index 4f3831d9e4..0000000000 --- a/package/iptables/0001-Revert-fix-build-for-missing-ETH_ALEN-definition.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 0e7cf0ad306cdf95dc3c28d15a254532206a888e Mon Sep 17 00:00:00 2001 -Message-Id: <0e7cf0ad306cdf95dc3c28d15a254532206a888e.1656908815.git.baruch at tkos.co.il> -From: Phil Sutter -Date: Wed, 18 May 2022 16:04:09 +0200 -Subject: [PATCH] Revert "fix build for missing ETH_ALEN definition" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit c5d9a723b5159a28f547b577711787295a14fd84 as it broke -compiling against musl libc. Might be a bug in the latter, but for the -time being try to please both by avoiding the include and instead -defining ETH_ALEN if unset. - -While being at it, move netinet/ether.h include up. - -Fixes: 1bdb5535f561a ("libxtables: Extend MAC address printing/parsing support") -Signed-off-by: Phil Sutter -Reviewed-by: Maciej ??enczykowski -Signed-off-by: Baruch Siach ---- -Upstream status: commit 0e7cf0ad306cdf95dc3c28d15a254532206a888e - - libxtables/xtables.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/libxtables/xtables.c b/libxtables/xtables.c -index 96fd783a066c..0638f9271c60 100644 ---- a/libxtables/xtables.c -+++ b/libxtables/xtables.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -45,7 +46,6 @@ - - #include - #include /* INT_MAX in ip_tables.h/ip6_tables.h */ --#include /* ETH_ALEN */ - #include - #include - #include -@@ -72,6 +72,10 @@ - #define PROC_SYS_MODPROBE "/proc/sys/kernel/modprobe" - #endif - -+#ifndef ETH_ALEN -+#define ETH_ALEN 6 -+#endif -+ - /* we need this for ip6?tables-restore. ip6?tables-restore.c sets line to the - * current line of the input file, in order to give a more precise error - * message. ip6?tables itself doesn't need this, so it is initialized to the -@@ -2245,8 +2249,6 @@ void xtables_print_num(uint64_t number, unsigned int format) - printf(FMT("%4lluT ","%lluT "), (unsigned long long)number); - } - --#include -- - static const unsigned char mac_type_unicast[ETH_ALEN] = {}; - static const unsigned char msk_type_unicast[ETH_ALEN] = {1}; - static const unsigned char mac_type_multicast[ETH_ALEN] = {1}; --- -2.35.1 - diff --git a/package/iptables/0002-treewide-use-uint-instead-of-u_int.patch b/package/iptables/0002-treewide-use-uint-instead-of-u_int.patch deleted file mode 100644 index e254c061af..0000000000 --- a/package/iptables/0002-treewide-use-uint-instead-of-u_int.patch +++ /dev/null @@ -1,167 +0,0 @@ -From f319389525b066b7dc6d389c88f16a0df3b8f189 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Nick Hainke -Date: Mon, 16 May 2022 18:16:41 +0200 -Subject: [PATCH] treewide: use uint* instead of u_int* - -Gcc complains about missing types. Some commits introduced u_int* instead -of uint*. Use uint treewide. - -Fixes errors in the form of: -In file included from xtables-legacy-multi.c:5: -xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'? - 83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, - | ^~~~~~~~~ - | uint16_t -make[6]: *** [Makefile:712: xtables_legacy_multi-xtables-legacy-multi.o] Error 1 - -Avoid libipq API breakage by adjusting libipq.h include accordingly. For -arpt_mangle.h kernel uAPI header, apply same change as in kernel commit -e91ded8db5747 ("uapi: netfilter_arp: use __u8 instead of u_int8_t"). - -Signed-off-by: Nick Hainke -Signed-off-by: Phil Sutter -Signed-off-by: Baruch Siach ---- -Upstream status: commit f319389525b066b7dc6d389c88f16a0df3b8f189 - - extensions/libxt_conntrack.c | 2 +- - include/libipq/libipq.h | 8 ++++---- - include/libiptc/libxtc.h | 2 +- - include/linux/netfilter_arp/arpt_mangle.h | 2 +- - iptables/xshared.c | 2 +- - iptables/xshared.h | 2 +- - libipq/ipq_create_handle.3 | 2 +- - libipq/ipq_set_mode.3 | 2 +- - 8 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c -index 64018ce152b7..234085c5211c 100644 ---- a/extensions/libxt_conntrack.c -+++ b/extensions/libxt_conntrack.c -@@ -778,7 +778,7 @@ matchinfo_print(const void *ip, const struct xt_entry_match *match, int numeric, - - static void - conntrack_dump_ports(const char *prefix, const char *opt, -- u_int16_t port_low, u_int16_t port_high) -+ uint16_t port_low, uint16_t port_high) - { - if (port_high == 0 || port_low == port_high) - printf(" %s%s %u", prefix, opt, port_low); -diff --git a/include/libipq/libipq.h b/include/libipq/libipq.h -index 3cd1329217a0..dd0cb205179c 100644 ---- a/include/libipq/libipq.h -+++ b/include/libipq/libipq.h -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -48,19 +48,19 @@ typedef unsigned long ipq_id_t; - struct ipq_handle - { - int fd; -- u_int8_t blocking; -+ uint8_t blocking; - struct sockaddr_nl local; - struct sockaddr_nl peer; - }; - --struct ipq_handle *ipq_create_handle(u_int32_t flags, u_int32_t protocol); -+struct ipq_handle *ipq_create_handle(uint32_t flags, uint32_t protocol); - - int ipq_destroy_handle(struct ipq_handle *h); - - ssize_t ipq_read(const struct ipq_handle *h, - unsigned char *buf, size_t len, int timeout); - --int ipq_set_mode(const struct ipq_handle *h, u_int8_t mode, size_t len); -+int ipq_set_mode(const struct ipq_handle *h, uint8_t mode, size_t len); - - ipq_packet_msg_t *ipq_get_packet(const unsigned char *buf); - -diff --git a/include/libiptc/libxtc.h b/include/libiptc/libxtc.h -index 37010188b64f..a1d16ef996d7 100644 ---- a/include/libiptc/libxtc.h -+++ b/include/libiptc/libxtc.h -@@ -10,7 +10,7 @@ extern "C" { - #endif - - #ifndef XT_MIN_ALIGN --/* xt_entry has pointers and u_int64_t's in it, so if you align to -+/* xt_entry has pointers and uint64_t's in it, so if you align to - it, you'll also align to any crazy matches and targets someone - might write */ - #define XT_MIN_ALIGN (__alignof__(struct xt_entry)) -diff --git a/include/linux/netfilter_arp/arpt_mangle.h b/include/linux/netfilter_arp/arpt_mangle.h -index 250f502902bb..8c2b16a1f5a0 100644 ---- a/include/linux/netfilter_arp/arpt_mangle.h -+++ b/include/linux/netfilter_arp/arpt_mangle.h -@@ -13,7 +13,7 @@ struct arpt_mangle - union { - struct in_addr tgt_ip; - } u_t; -- u_int8_t flags; -+ __u8 flags; - int target; - }; - -diff --git a/iptables/xshared.c b/iptables/xshared.c -index a8512d380815..9b5e5b5bddc2 100644 ---- a/iptables/xshared.c -+++ b/iptables/xshared.c -@@ -1025,7 +1025,7 @@ static const int inverse_for_options[NUMBER_OF_OPT] = - }; - - void --set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, -+set_option(unsigned int *options, unsigned int option, uint16_t *invflg, - bool invert) - { - if (*options & option) -diff --git a/iptables/xshared.h b/iptables/xshared.h -index 14568bb00fb6..f82129883968 100644 ---- a/iptables/xshared.h -+++ b/iptables/xshared.h -@@ -80,7 +80,7 @@ struct xtables_target; - #define IPT_INV_ARPHRD 0x0800 - - void --set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, -+set_option(unsigned int *options, unsigned int option, uint16_t *invflg, - bool invert); - - /** -diff --git a/libipq/ipq_create_handle.3 b/libipq/ipq_create_handle.3 -index 11ef95c4b79f..ebe46daab92d 100644 ---- a/libipq/ipq_create_handle.3 -+++ b/libipq/ipq_create_handle.3 -@@ -24,7 +24,7 @@ ipq_create_handle, ipq_destroy_handle \(em create and destroy libipq handles. - .br - .B #include - .sp --.BI "struct ipq_handle *ipq_create_handle(u_int32_t " flags ", u_int32_t " protocol ");" -+.BI "struct ipq_handle *ipq_create_handle(uint32_t " flags ", uint32_t " protocol ");" - .br - .BI "int ipq_destroy_handle(struct ipq_handle *" h ); - .SH DESCRIPTION -diff --git a/libipq/ipq_set_mode.3 b/libipq/ipq_set_mode.3 -index 0edd3c00a84f..e206886c8c62 100644 ---- a/libipq/ipq_set_mode.3 -+++ b/libipq/ipq_set_mode.3 -@@ -24,7 +24,7 @@ ipq_set_mode \(em set the ip_queue queuing mode - .br - .B #include - .sp --.BI "int ipq_set_mode(const struct ipq_handle *" h ", u_int8_t " mode ", size_t " range ); -+.BI "int ipq_set_mode(const struct ipq_handle *" h ", uint8_t " mode ", size_t " range ); - .SH DESCRIPTION - The - .B ipq_set_mode --- -2.35.1 - diff --git a/package/iptables/0003-netfilter-add-nf_log.h.patch b/package/iptables/0003-netfilter-add-nf_log.h.patch deleted file mode 100644 index 50112faf86..0000000000 --- a/package/iptables/0003-netfilter-add-nf_log.h.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 15ea3fa147dea25d8cae3c2ac417142f2e0f029e Mon Sep 17 00:00:00 2001 -From: Markus Mayer -To: Netfilter Mailing List -Date: Thu, 16 Jun 2022 15:29:58 -0700 -Subject: [PATCH] netfilter: add nf_log.h - -Since libxt_NFLOG is now using the UAPI version of nf_log.h, it should -be bundled alongside the other netfilter kernel headers. - -This copy of nf_log.h was taken from Linux 5.18. - -Signed-off-by: Markus Mayer -Upstream: https://git.netfilter.org/iptables/commit/?id=9ea7e6aa638d0dfa14613f6f97e6dc06c857e609 ---- -diff --git a/include/linux/netfilter/nf_log.h b/include/linux/netfilter/nf_log.h -new file mode 100644 -index 000000000000..2ae00932d3d2 ---- /dev/null -+++ b/include/linux/netfilter/nf_log.h -@@ -0,0 +1,15 @@ -+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -+#ifndef _NETFILTER_NF_LOG_H -+#define _NETFILTER_NF_LOG_H -+ -+#define NF_LOG_TCPSEQ 0x01 /* Log TCP sequence numbers */ -+#define NF_LOG_TCPOPT 0x02 /* Log TCP options */ -+#define NF_LOG_IPOPT 0x04 /* Log IP options */ -+#define NF_LOG_UID 0x08 /* Log UID owning local socket */ -+#define NF_LOG_NFLOG 0x10 /* Unsupported, don't reuse */ -+#define NF_LOG_MACDECODE 0x20 /* Decode MAC header */ -+#define NF_LOG_MASK 0x2f -+ -+#define NF_LOG_PREFIXLEN 128 -+ -+#endif /* _NETFILTER_NF_LOG_H */ --- -2.25.1 - diff --git a/package/iptables/iptables.hash b/package/iptables/iptables.hash index f4e5ae1593..a908b9cbc1 100644 --- a/package/iptables/iptables.hash +++ b/package/iptables/iptables.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/iptables/downloads.html -sha256 71c75889dc710676631553eb1511da0177bbaaf1b551265b912d236c3f51859f iptables-1.8.8.tar.bz2 +sha256 ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f iptables-1.8.9.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index a6143677d1..561c82ca0b 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,8 +4,8 @@ # ################################################################################ -IPTABLES_VERSION = 1.8.8 -IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 +IPTABLES_VERSION = 1.8.9 +IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.xz IPTABLES_SITE = https://netfilter.org/projects/iptables/files IPTABLES_INSTALL_STAGING = YES IPTABLES_DEPENDENCIES = host-pkgconf From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:21 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-io-socket-ssl: bump to version 2.080 Message-ID: <20230220205241.E223B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e1dde2258755213710d3f5afd716025d2140f16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-io-socket-ssl/perl-io-socket-ssl.hash | 4 ++-- package/perl-io-socket-ssl/perl-io-socket-ssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash index 8c6bb30523..a4abcc33cd 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 8f0f6bff4db5e4be6e848aa49fd29380 IO-Socket-SSL-2.075.tar.gz -sha256 c30ee2220b1e181a968ebbc81861d0cadf334b001377a44105ae5a8637ddae8c IO-Socket-SSL-2.075.tar.gz +md5 eaea5b17592ccbd925aff47747f41dde IO-Socket-SSL-2.080.tar.gz +sha256 cd0ed303b08a72c5c256a9ec3bbb6ff61360be3a2ff6d775e4f6e25375fa8d1f IO-Socket-SSL-2.080.tar.gz # computed by scancpan sha256 090aff5421fd55a9dceeaf6c612c36360402e8d29c1284aef88c87be565ce032 README diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk index daa46acf95..d5c09d9082 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_IO_SOCKET_SSL_VERSION = 2.075 +PERL_IO_SOCKET_SSL_VERSION = 2.080 PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPL-1.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:22 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-exporter-tiny: bump to version 1.006000 Message-ID: <20230220205241.D736A81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ab730250b1da4ec72569f8cf95bc9df26ecb80d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next diff LICENSE: -This software is copyright (c) 2020 by Toby Inkster. +This software is copyright (c) 2022 by Toby Inkster. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-exporter-tiny/perl-exporter-tiny.hash | 7 +++---- package/perl-exporter-tiny/perl-exporter-tiny.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/perl-exporter-tiny/perl-exporter-tiny.hash b/package/perl-exporter-tiny/perl-exporter-tiny.hash index c714ef902e..0ecdf78482 100644 --- a/package/perl-exporter-tiny/perl-exporter-tiny.hash +++ b/package/perl-exporter-tiny/perl-exporter-tiny.hash @@ -1,7 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 485897322a2514b4d6ca90b2daacb7cd Exporter-Tiny-1.002002.tar.gz -sha256 00f0b95716b18157132c6c118ded8ba31392563d19e490433e9a65382e707101 Exporter-Tiny-1.002002.tar.gz +md5 2d555e289eac6450052e8683c292cbf7 Exporter-Tiny-1.006000.tar.gz +sha256 d95479ff085699d6422f7fc8306db085e34b626438deb82ec82d41df2295f400 Exporter-Tiny-1.006000.tar.gz # computed by scancpan -sha256 f4cb223c8ac37d6ccd0e78b2892ca54a48a6adbe6a271c3c17c0226646297e66 COPYRIGHT -sha256 1fb7395e76eabf94c421912d7d0a4f7fa745d49e1acb76b222c21d605b66bd25 LICENSE +sha256 a4f85c6f4d6e8bdd37b7ab08013e3e3bee1fe8e910e20f8f54d5025ffe40f384 LICENSE diff --git a/package/perl-exporter-tiny/perl-exporter-tiny.mk b/package/perl-exporter-tiny/perl-exporter-tiny.mk index c7abfbae2d..489ee54e17 100644 --- a/package/perl-exporter-tiny/perl-exporter-tiny.mk +++ b/package/perl-exporter-tiny/perl-exporter-tiny.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_EXPORTER_TINY_VERSION = 1.002002 +PERL_EXPORTER_TINY_VERSION = 1.006000 PERL_EXPORTER_TINY_SOURCE = Exporter-Tiny-$(PERL_EXPORTER_TINY_VERSION).tar.gz PERL_EXPORTER_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOBYINK PERL_EXPORTER_TINY_LICENSE = Artistic or GPL-1.0+ -PERL_EXPORTER_TINY_LICENSE_FILES = COPYRIGHT LICENSE +PERL_EXPORTER_TINY_LICENSE_FILES = LICENSE PERL_EXPORTER_TINY_DISTNAME = Exporter-Tiny $(eval $(perl-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:23 -0000 Subject: [Buildroot] [git commit branch/next] configs/acmesystems_acqua_a5_*: bump to Linux v5.15 Message-ID: <20230220205241.94892828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e84d84886daab3208dc209f362aabb4436ba00a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The updated device tree is provided by Acme Systems: https://www.acmesystems.it/compile_kernel_5_15 It is released under GPLv2 or later. Signed-off-by: Edgar Bonet Signed-off-by: Thomas Petazzoni --- board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts | 51 +++++++++++++++++++---- configs/acmesystems_acqua_a5_256mb_defconfig | 4 +- configs/acmesystems_acqua_a5_512mb_defconfig | 4 +- 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts index 264af29809..39fa4df1b1 100644 --- a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts +++ b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts @@ -4,7 +4,7 @@ * Copyright (C) 2014 Atmel, * 2014 Nicolas Ferre * - * 2020 Sergio Tanzilli + * 2022 Sergio Tanzilli * * Licensed under GPLv2 or later. */ @@ -17,7 +17,7 @@ chosen { stdout-path = "serial0:115200n8"; - bootargs = "mem=256M console=ttyS0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait consoleblank=0"; + bootargs = "mem=256M console=ttyS0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait net.ifnames=0"; }; memory { @@ -128,15 +128,19 @@ i2c3@ { compatible = "i2c-gpio"; - gpios = <&pioE 1 0 /* SDA */ - &pioE 2 0 /* SCK */ - >; - i2c-gpio,delay-us = <4>; /* ~178 kHz */ + + sda-gpios = <&pioE 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + scl-gpios = <&pioE 2 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3_gpio>; + + i2c-gpio,delay-us = <4>; /* ~178 kHz */ #address-cells = <1>; #size-cells = <0>; - + /* EEPROM contains the eth0 MAC address */ - + eeprom at 58 { compatible = "atmel,24mac402"; pagesize = <256>; @@ -149,6 +153,7 @@ reg = <0x0 0x06>; }; }; + }; pwm0: pwm at f002c000 { @@ -204,6 +209,17 @@ }; pinctrl at fffff200 { + + atmel,mux-mask = < + /* A B C */ + 0xffffffff 0xc0fc0000 0xc0ff0000 /* pioA */ + 0xffffffff 0x0ff8ffff 0x00000000 /* pioB */ + 0xffffffff 0xbc00f1ff 0x7c00fc00 /* pioC */ + 0xffffffff 0xc001c0e0 0x0001c1e0 /* pioD */ + 0xfffffff9 0xbf9f8000 0x18000000 /* pioE */ + /* 0xffffffff 0xb8000000 0x18000000 */ /* pioE */ + >; + board { pinctrl_i2c0_pu: i2c0_pu { atmel,pins = @@ -217,6 +233,13 @@ ; }; + pinctrl_i2c3_gpio: i2c3-gpio { + atmel,pins = + ; + }; + + pinctrl_key_gpio: key_gpio_0 { atmel,pins = ; @@ -236,12 +259,20 @@ atmel,pins = ; /* PE9, conflicts with A9 */ }; + + pinctrl_gpio_leds: gpio_leds_default { + atmel,pins = + ; + }; }; }; }; usb0: gadget at 500000 { - status = "okay"; + status = "disabled"; }; usb1: ohci at 600000 { @@ -272,6 +303,8 @@ leds { compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_leds>; led0 { label = "led0"; diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index f8129f3780..5a5b9559d6 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.107" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.90" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index e399d4a9ff..bb5bb1964e 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.107" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.90" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:24 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-mozilla-ca: bump to version 20221114 Message-ID: <20230220205242.11D1D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57ee214f608ca862bed6ccfec044b3d46d85e800 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-mozilla-ca/perl-mozilla-ca.hash | 4 ++-- package/perl-mozilla-ca/perl-mozilla-ca.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-mozilla-ca/perl-mozilla-ca.hash b/package/perl-mozilla-ca/perl-mozilla-ca.hash index 07966f9906..799a531fe6 100644 --- a/package/perl-mozilla-ca/perl-mozilla-ca.hash +++ b/package/perl-mozilla-ca/perl-mozilla-ca.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 843e42f367ea3c7abc5de5b6225791dc Mozilla-CA-20211001.tar.gz -sha256 122c8900000a9d388aa8e44f911cab6c118fe8497417917a84a8ec183971b449 Mozilla-CA-20211001.tar.gz +md5 2f136d096352a418e546e4afb70e7aa9 Mozilla-CA-20221114.tar.gz +sha256 701bea67be670add5a102f9f8c879402b4983096b1cb0e20dd47d52d7a10666b Mozilla-CA-20221114.tar.gz # computed by scancpan sha256 95cd63dae5c2bf6e7cf33435981614a36c85ef01fc7a02464e05e58a5355398e README diff --git a/package/perl-mozilla-ca/perl-mozilla-ca.mk b/package/perl-mozilla-ca/perl-mozilla-ca.mk index 6b970c0f94..a124860b7a 100644 --- a/package/perl-mozilla-ca/perl-mozilla-ca.mk +++ b/package/perl-mozilla-ca/perl-mozilla-ca.mk @@ -4,9 +4,9 @@ # ################################################################################ -PERL_MOZILLA_CA_VERSION = 20211001 +PERL_MOZILLA_CA_VERSION = 20221114 PERL_MOZILLA_CA_SOURCE = Mozilla-CA-$(PERL_MOZILLA_CA_VERSION).tar.gz -PERL_MOZILLA_CA_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AB/ABH +PERL_MOZILLA_CA_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG PERL_MOZILLA_CA_LICENSE = MPL-2.0 PERL_MOZILLA_CA_LICENSE_FILES = README PERL_MOZILLA_CA_DISTNAME = Mozilla-CA From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:25 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi-peripheral-xarcade: bump version to 19.0.5-Matrix Message-ID: <20230220205242.3F7D0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=acc4570bf41d10573c73cda08defb385324becc6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash | 2 +- package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash index 0ae1ffaa50..5467513a0b 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1327ecd05e2e66a4faf809efee4c5b99627912d971db26a0a905f0299e4f876b kodi-peripheral-xarcade-19.0.4-Matrix.tar.gz +sha256 11f746cfeeffdfc1de6829d17aad999c8b598ca2239fcddb64801738546be6c9 kodi-peripheral-xarcade-19.0.5-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk index 9ee26ea2fe..2d9e33b625 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_XARCADE_VERSION = 19.0.4-Matrix +KODI_PERIPHERAL_XARCADE_VERSION = 19.0.5-Matrix KODI_PERIPHERAL_XARCADE_SITE = $(call github,kodi-game,peripheral.xarcade,$(KODI_PERIPHERAL_XARCADE_VERSION)) KODI_PERIPHERAL_XARCADE_LICENSE = GPL-2.0+ KODI_PERIPHERAL_XARCADE_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:26 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-mojolicious: security bump to version 9.31 Message-ID: <20230220205242.06F47828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fb59f913d0e21a51491e64ea781702400cfcd5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next see https://metacpan.org/dist/Mojolicious/changes#L3 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-mojolicious/perl-mojolicious.hash | 4 ++-- package/perl-mojolicious/perl-mojolicious.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-mojolicious/perl-mojolicious.hash b/package/perl-mojolicious/perl-mojolicious.hash index 97625d1290..989eaf3419 100644 --- a/package/perl-mojolicious/perl-mojolicious.hash +++ b/package/perl-mojolicious/perl-mojolicious.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 494db2d1529e84a2575527dae8f3672d Mojolicious-9.26.tar.gz -sha256 9e428c5512698f05e151338d8fa12aede287ab3a5e429ec3d38c80a4a82c8d88 Mojolicious-9.26.tar.gz +md5 523193316a839ff56a447f0f0c2e5b36 Mojolicious-9.31.tar.gz +sha256 cb96ccd7a5319321ec6f57633c88bf17193d45169f4d7846da254bb6f9ed8312 Mojolicious-9.31.tar.gz # computed by scancpan sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE diff --git a/package/perl-mojolicious/perl-mojolicious.mk b/package/perl-mojolicious/perl-mojolicious.mk index dbf2e61737..618327d09d 100644 --- a/package/perl-mojolicious/perl-mojolicious.mk +++ b/package/perl-mojolicious/perl-mojolicious.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOJOLICIOUS_VERSION = 9.26 +PERL_MOJOLICIOUS_VERSION = 9.31 PERL_MOJOLICIOUS_SOURCE = Mojolicious-$(PERL_MOJOLICIOUS_VERSION).tar.gz PERL_MOJOLICIOUS_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SR/SRI PERL_MOJOLICIOUS_LICENSE = Artistic-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:27 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi-peripheral-joystick: bump version to 19.0.4-Matrix Message-ID: <20230220205242.3463181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d183a6d333eaf57b6a5f5c1a7eb323b5ada7cd6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 5ac4247cbf..0b483f70bf 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0a595933998565902f112f0d476ada1cd732a1961ed10b8a2b9a52ed8bd8c652 kodi-peripheral-joystick-19.0.3-Matrix.tar.gz +sha256 a5c7c6b8b1f39c92d00289bd602ea2db13a3d3f73a50bd3f95ec08cf110a570e kodi-peripheral-joystick-19.0.4-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index 1b2b3f4984..db1bc2c50f 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.3-Matrix +KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.4-Matrix KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Feb 20 21:02:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:02:47 -0000 Subject: [Buildroot] [git commit branch/next] package/neon-2-sse: new package Message-ID: <20230220205244.02B0A81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee399a868957fbf963db525adeeb4ab2dd3f04fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This package is required by tensorflow-lite. Tested-by: Stefan Hager Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/neon-2-sse/Config.in | 9 +++++++++ package/neon-2-sse/neon-2-sse.hash | 4 ++++ package/neon-2-sse/neon-2-sse.mk | 14 ++++++++++++++ 5 files changed, 29 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d0a51086cd..8a652c7c12 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1344,6 +1344,7 @@ F: package/lua-std-debug/ F: package/lua-std-normalize/ F: package/lilv/ F: package/lv2/ +F: package/neon-2-sse/ F: package/pipewire/ F: package/python-aioconsole/ F: package/python-aiodns/ diff --git a/package/Config.in b/package/Config.in index fc468148df..96a44a3623 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2107,6 +2107,7 @@ endif source "package/msgpack/Config.in" source "package/musl-compat-headers/Config.in" source "package/musl-fts/Config.in" + source "package/neon-2-sse/Config.in" source "package/openblas/Config.in" source "package/orc/Config.in" source "package/p11-kit/Config.in" diff --git a/package/neon-2-sse/Config.in b/package/neon-2-sse/Config.in new file mode 100644 index 0000000000..25613c5ec4 --- /dev/null +++ b/package/neon-2-sse/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_NEON_2_SSE + bool "neon-2-sse" + help + The platform independent header allowing to compile any + C/C++ code containing ARM NEON intrinsic functions for + x86 target systems using SIMD up to SSE4 intrinsic + functions. + + https://github.com/intel/ARM_NEON_2_x86_SSE diff --git a/package/neon-2-sse/neon-2-sse.hash b/package/neon-2-sse/neon-2-sse.hash new file mode 100644 index 0000000000..ded20d58f5 --- /dev/null +++ b/package/neon-2-sse/neon-2-sse.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 019fbc7ec25860070a1d90e12686fc160cfb33e22aa063c80f52b363f1361e9d neon-2-sse-a15b489e1222b2087007546b4912e21293ea86ff.tar.gz +# License files, locally calculated +sha256 7022f51b439a5915e933ecc270c83e24ca0cb2cceeb08b0132dcd4dbb03ed2dc LICENSE diff --git a/package/neon-2-sse/neon-2-sse.mk b/package/neon-2-sse/neon-2-sse.mk new file mode 100644 index 0000000000..0e9d066abd --- /dev/null +++ b/package/neon-2-sse/neon-2-sse.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# neon-2-sse +# +################################################################################ + +NEON_2_SSE_VERSION = a15b489e1222b2087007546b4912e21293ea86ff +NEON_2_SSE_SITE = $(call github,intel,ARM_NEON_2_x86_SSE,$(NEON_2_SSE_VERSION)) +NEON_2_SSE_LICENSE = BSD-2-Clause +NEON_2_SSE_LICENSE_FILES = LICENSE +NEON_2_SSE_INSTALL_STAGING = YES +NEON_2_SSE_INSTALL_TARGET = NO + +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:02:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:02:48 -0000 Subject: [Buildroot] [git commit branch/next] package/{, lib}apparmor: bump to version 3.1.2 Message-ID: <20230220205243.D3F7B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15864d79130479aa8d0c6990a95d9921892e822c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the location where the hashes are retrieved from. Signed-off-by: Angelo Compagnucci [yann.morin.1998 at free.fr: hashes location changed] Signed-off-by: Yann E. MORIN --- package/apparmor/apparmor.hash | 4 ++-- package/apparmor/apparmor.mk | 4 ++-- package/libapparmor/libapparmor.hash | 4 ++-- package/libapparmor/libapparmor.mk | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/apparmor/apparmor.hash b/package/apparmor/apparmor.hash index 497491b6c9..22037e3e11 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 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz +# From https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.2 +sha256 7cbd0b2f6393abf57acaf25dc2b32b2ae197c0b5b0d661e14be46127df93a5eb apparmor-3.1.2.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 76c9f2cafe..eeedd805e6 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, please also update the libapparmor package -APPARMOR_VERSION_MAJOR = 3.0 -APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).4 +APPARMOR_VERSION_MAJOR = 3.1 +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).2 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/libapparmor.hash b/package/libapparmor/libapparmor.hash index 9fbfe3b92e..574ff95b60 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 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz +# From https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.2 +sha256 7cbd0b2f6393abf57acaf25dc2b32b2ae197c0b5b0d661e14be46127df93a5eb apparmor-3.1.2.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index af59335933..7f3cfcab2f 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, please also update the apparmor package -LIBAPPARMOR_VERSION_MAJOR = 3.0 -LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).4 +LIBAPPARMOR_VERSION_MAJOR = 3.1 +LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).2 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 thomas.petazzoni at bootlin.com Mon Feb 20 21:02:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:49 -0000 Subject: [Buildroot] [git commit branch/next] package/libva: bump version to 2.17.0 Message-ID: <20230220205244.47D2D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76152e95a9749d05c0e334e1fa6affdf9aeafb7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/intel/libva/blob/v2.17-branch/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 2916898c31..700ace0378 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,5 +1,5 @@ -# From https://github.com/intel/libva/releases/download/2.16.0/libva-2.16.0.tar.bz2.sha1sum -sha1 ba1c0e196d69a26e54b065dc0f645bdf3be147a7 libva-2.16.0.tar.bz2 +# From https://github.com/intel/libva/releases/download/2.17.0/libva-2.17.0.tar.bz2.sha1sum +sha1 997f7b3111bc5a4d32ec72e9d7f9fcfca41e4923 libva-2.17.0.tar.bz2 # Locally computed -sha256 115faca0db2c417a37da49830870e260450fa13066f5e24e252a20c36d920a1c libva-2.16.0.tar.bz2 +sha256 f3e5eb27c305e05a9bb62703d1915a127301cc0c4f9f209025767432230c4eac libva-2.17.0.tar.bz2 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 3b6e9580d3..c6b9f63b10 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.16.0 +LIBVA_VERSION = 2.17.0 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) LIBVA_LICENSE = MIT From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:50 -0000 Subject: [Buildroot] [git commit branch/next] boot/uboot: add BR2_TARGET_UBOOT_NEEDS_XXD option Message-ID: <20230220205244.54BE2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=319cc24aca38d6cb8898400694135b855731940f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A host dependency to xxd is required if the U-Boot board configuration has CONFIG_USE_DEFAULT_ENV_FILE enabled. So introduce a new BR U-Boot config option BR2_TARGET_UBOOT_NEEDS_XXD to solve this problem. xxd is provided by host-vim. Signed-off-by: Jerry Kooyman Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 8 ++++++++ boot/uboot/uboot.mk | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index a729280060..282418c3ed 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -198,6 +198,14 @@ config BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX This is typically the case when the board configuration has CONFIG_TOOLS_MKEFICAPSULE enabled. +config BR2_TARGET_UBOOT_NEEDS_XXD + bool "U-Boot needs xxd" + help + Select this option if your U-Boot board configuration + requires xxd to be available on the host. This is + typically the case when the board configuration has + CONFIG_USE_DEFAULT_ENV_FILE enabled. + config BR2_TARGET_UBOOT_NEEDS_ATF_BL31 bool "U-Boot needs ATF BL31" depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 99e80ea5a1..4eae8e95c3 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -239,6 +239,10 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX),y) UBOOT_DEPENDENCIES += host-util-linux endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) +UBOOT_DEPENDENCIES += host-vim +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:51 -0000 Subject: [Buildroot] [git commit branch/next] package/ulogd: fix mysql build Message-ID: <20230220205244.8836D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=039dfca25290c4cebe1b7d859a03944598f4c104 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following mysql build failure raised since bump to version 2.0.8 in commit 6fc4b59ffd3007ca9e436d33647acc5dfff62970: checking for mysql_config... no configure: error: libmysqlclient not found Fixes: - http://autobuild.buildroot.org/results/a059be353b7464d4e6a7830a685b43bdd7ecd5fa Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ulogd/ulogd.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 7d4a1fde4d..033acb06c2 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -23,7 +23,9 @@ else ULOGD_CONF_OPTS += --disable-dbi endif ifeq ($(BR2_PACKAGE_MYSQL),y) -ULOGD_CONF_OPTS += --enable-mysql +ULOGD_CONF_OPTS += \ + --enable-mysql \ + --with-mysql-config=$(STAGING_DIR)/usr/bin/mysql_config ULOGD_DEPENDENCIES += mysql else ULOGD_CONF_OPTS += --disable-mysql From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:52 -0000 Subject: [Buildroot] [git commit branch/next] package/ulogd: dbi needs threads Message-ID: <20230220205244.7D9DE828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7316a0c2c22c8207edff531544e6eb0d6326b45c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 3b3dbd0183265c3f7da49b0b331688fb7573383f forgot to disable dbi without threads Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ulogd/ulogd.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 561429599c..7d4a1fde4d 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -41,7 +41,11 @@ else ULOGD_CONF_OPTS += --disable-sqlite3 endif else -ULOGD_CONF_OPTS += --disable-mysql --disable-pgsql --disable-sqlite3 +ULOGD_CONF_OPTS += \ + --disable-dbi \ + --disable-mysql \ + --disable-pgsql \ + --disable-sqlite3 endif ifeq ($(BR2_PACKAGE_LIBPCAP),y) From peter at korsgaard.com Mon Feb 20 21:02:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:53 -0000 Subject: [Buildroot] [git commit branch/next] package/docker-compose: security bump version to 2.15.1 Message-ID: <20230220205244.B237781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67c92fbd5004a750e6af253dd1eba4c3f669ef42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-27664 and CVE-2022-32149 high-risk vulnerability. Many other bugfixes, enhancements, and improvements. https://github.com/docker/compose/releases/tag/v2.15.1 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 7a7ab5f110..2c924d5080 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5cbf6cd1dd8ce98c5e2d62ca7f622e96abce444979b8e8852b033213a98e2049 docker-compose-2.14.0.tar.gz +sha256 346571ca487bf3f4b3dc9caeadc88a645354b0e098fa60f350249ec35ab3f240 docker-compose-2.15.1.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index ef9ee97196..3bced8bb7b 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.14.0 +DOCKER_COMPOSE_VERSION = 2.15.1 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 21:02:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:54 -0000 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: needs arch support and C++ for wasm Message-ID: <20230220205244.A6C16828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aff4317797c34c78747f4c6c5ee8d9a1bc0ae270 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next See: https://github.com/fluent/fluent-bit/tree/master/lib/wasm-micro-runtime-WAMR-1.1.1#supported-architectures-and-platforms MIPS & RISCV32 are mentioned in the supported list, but that seems to be wrong, so excluded those. Fixes: - http://autobuild.buildroot.org/results/dfb/dfb8f71d7e016cdfd3beb4b8196081898bd49ae2/build-end.log - http://autobuild.buildroot.org/results/ecf/ecfe7b67af68cd7f397a50360900cd9a7afc830e/build-end.log Signed-off-by: Thomas Devoogdt [Peter: Move arch dependency to _WASM_ARCH_SUPPORTS blind option, add help text, use normal style for prompt and fix indentation] Signed-off-by: Peter Korsgaard --- package/fluent-bit/Config.in | 21 +++++++++++++++++++++ package/fluent-bit/fluent-bit.mk | 6 ++++++ 2 files changed, 27 insertions(+) diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 11ceb55d4f..6c2299e695 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -8,5 +8,26 @@ config BR2_PACKAGE_FLUENT_BIT https://github.com/fluent/fluent-bit +if BR2_PACKAGE_FLUENT_BIT + +config BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + bool + # see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms + default y if BR2_arc + default y if BR2_arm || BR2_armeb + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + default y if BR2_RISCV_64 + default y if BR2_xtensa + +config BR2_PACKAGE_FLUENT_BIT_WASM + bool "wasm runtime support" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + help + Support for WASM-based plugins. + +endif + comment "fluent-bit needs a glibc toolchain" depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index c84042a0fa..6e9a33e02e 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -17,6 +17,12 @@ FLUENT_BIT_CONF_OPTS += \ -DFLB_CHUNK_TRACE=No \ -DFLB_BACKTRACE=No +ifeq ($(BR2_PACKAGE_FLUENT_BIT_WASM),y) +FLUENT_BIT_CONF_OPTS += -DFLB_WASM=Yes +else +FLUENT_BIT_CONF_OPTS += -DFLB_WASM=No +endif + ifeq ($(BR2_PACKAGE_LUAJIT),y) FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=Yes FLUENT_BIT_DEPENDENCIES += luajit From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:56 -0000 Subject: [Buildroot] [git commit branch/next] configs/imx8mn_bsh_smm_s2_defconfig: new defconfig Message-ID: <20230220205242.CC3D581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c65ab5fab325b5abfe34652c1236c3b8b10d752 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next BSH SMM S2 (SystemMaster S2) Board is an add-on board which provide input and output interfaces to a dedicated carrier board. It is designed mainly to provide graphical/video and connectivity interfaces to the appliance. Board support package includes the following components: - mainline Linux kernel 6.1.6 - mainline U-Boot 2022-07 - default packages from buildroot https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ The smm s2 board is basically the same as the pro except it boots from NAND instead of eMMC. Co-authored-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 + board/bsh/imx8mn-bsh-smm-s2/flash.sh | 26 + board/bsh/imx8mn-bsh-smm-s2/linux.fragment | 895 +++++++++++++++++++++ board/bsh/imx8mn-bsh-smm-s2/nand-full.lst | 29 + ...figs-Remove-rootwait-1-to-all-the-affecte.patch | 160 ++++ board/bsh/imx8mn-bsh-smm-s2/post-build.sh | 4 + board/bsh/imx8mn-bsh-smm-s2/readme.txt | 75 ++ configs/imx8mn_bsh_smm_s2_defconfig | 41 + 8 files changed, 1234 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 4ead3a71f2..2e187d7b03 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -686,6 +686,8 @@ F: package/luaexpat/ F: package/xinetd/ N: Dario Binacchi +F: board/bsh/ +F: configs/imx8mn_bsh_smm_s2_defconfig F: package/sscep/ F: package/uuu/ @@ -2118,6 +2120,8 @@ F: package/python-crc16/ F: package/python-pyzmq/ N: Michael Trimarchi +F: board/bsh/ +F: configs/imx8mn_bsh_smm_s2_defconfig F: package/python-spidev/ N: Michael Vetter diff --git a/board/bsh/imx8mn-bsh-smm-s2/flash.sh b/board/bsh/imx8mn-bsh-smm-s2/flash.sh new file mode 100755 index 0000000000..1f343d516d --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/flash.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +if [ $# -eq 0 ]; then + OUTPUT_DIR=output +else + OUTPUT_DIR=$1 +fi + +if ! test -d "${OUTPUT_DIR}" ; then + echo "ERROR: no output directory specified." + echo "Usage: $0 OUTPUT_DIR" + echo "" + echo "Arguments:" + echo " OUTPUT_DIR The Buildroot output directory." + exit 1 +fi + +IMAGES_DIR=${OUTPUT_DIR}/images + +${OUTPUT_DIR}/host/bin/uuu -v -b ${IMAGES_DIR}/nand-full.lst \ + ${IMAGES_DIR}/flash.bin \ + ${IMAGES_DIR}/flash.bin \ + ${IMAGES_DIR}/rootfs.ubifs \ + ${IMAGES_DIR}/Image \ + ${IMAGES_DIR}/freescale/imx8mn-bsh-smm-s2.dtb + diff --git a/board/bsh/imx8mn-bsh-smm-s2/linux.fragment b/board/bsh/imx8mn-bsh-smm-s2/linux.fragment new file mode 100644 index 0000000000..80803ab088 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/linux.fragment @@ -0,0 +1,895 @@ +# CONFIG_BPF_SYSCALL is not set +CONFIG_TASK_DELAY_ACCT=y +CONFIG_CGROUP_FREEZER=y +# CONFIG_CGROUP_BPF is not set +CONFIG_RELAY=y +# CONFIG_ARCH_ACTIONS is not set +# CONFIG_ARCH_SUNXI is not set +# CONFIG_ARCH_ALPINE is not set +# CONFIG_ARCH_APPLE is not set +# CONFIG_ARCH_BCM2835 is not set +# CONFIG_ARCH_BCM4908 is not set +# CONFIG_ARCH_BCM_IPROC is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_BRCMSTB is not set +# CONFIG_ARCH_EXYNOS is not set +# CONFIG_ARCH_K3 is not set +# CONFIG_ARCH_LAYERSCAPE is not set +# CONFIG_ARCH_LG1K is not set +# CONFIG_ARCH_HISI is not set +# CONFIG_ARCH_KEEMBAY is not set +# CONFIG_ARCH_MEDIATEK is not set +# CONFIG_ARCH_MESON is not set +# CONFIG_ARCH_MVEBU is not set +# CONFIG_ARCH_QCOM is not set +# CONFIG_ARCH_RENESAS is not set +# CONFIG_ARCH_ROCKCHIP is not set +# CONFIG_ARCH_S32 is not set +# CONFIG_ARCH_SEATTLE is not set +# CONFIG_ARCH_INTEL_SOCFPGA is not set +# CONFIG_ARCH_SYNQUACER is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_TESLA_FSD is not set +# CONFIG_ARCH_SPRD is not set +# CONFIG_ARCH_THUNDER is not set +# CONFIG_ARCH_THUNDER2 is not set +# CONFIG_ARCH_UNIPHIER is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_VISCONTI is not set +# CONFIG_ARCH_XGENE is not set +# CONFIG_ARCH_ZYNQMP is not set +# CONFIG_KEXEC is not set +# CONFIG_KEXEC_FILE is not set +# CONFIG_XEN is not set +# CONFIG_ARM64_PTR_AUTH is not set +# CONFIG_ARM64_TLB_RANGE is not set +# CONFIG_ARM64_MTE is not set +CONFIG_PM_DEBUG=y +CONFIG_PM_TEST_SUSPEND=y +# CONFIG_HIBERNATION is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +# CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set +# CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set +CONFIG_ARM_IMX_CPUFREQ_DT=y +# CONFIG_ARM_QCOM_CPUFREQ_NVMEM is not set +# CONFIG_ARM_QCOM_CPUFREQ_HW is not set +# CONFIG_ARM_RASPBERRYPI_CPUFREQ is not set +# CONFIG_ARM_SCMI_CPUFREQ is not set +# CONFIG_ARM_TEGRA186_CPUFREQ is not set +# CONFIG_ARM_MEDIATEK_CPUFREQ is not set +# CONFIG_QORIQ_CPUFREQ is not set +# CONFIG_ACPI_APEI_PCIEAER is not set +# CONFIG_VIRTUALIZATION is not set +# CONFIG_KVM is not set +# CONFIG_GCC_PLUGINS is not set +CONFIG_IPV6=y +CONFIG_MODVERSIONS=y +CONFIG_IPV6_SIT=m +CONFIG_NET_DSA_TAG_OCELOT=m +CONFIG_VLAN_8021Q=y +CONFIG_LLC2=y +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_PKTGEN=m +CONFIG_BT=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=y +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=y +# CONFIG_CAN_RCAR is not set +# CONFIG_CAN_RCAR_CANFD is not set +# CONFIG_CAN_MCP251XFD is not set +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIVHCI=y +CONFIG_CFG80211=y +CONFIG_NL80211_TESTMODE=y +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=y +# CONFIG_BT_HCIUART_MRVL is not set +# CONFIG_BT_MRVL is not set +# CONFIG_BT_MRVL_SDIO is not set +# CONFIG_BT_QCOMSMD is not set +# CONFIG_RFKILL is not set +# CONFIG_PCI is not set +# CONFIG_PCIEPORTBUS is not set +# CONFIG_PCIEAER is not set +# CONFIG_PCI_IOV is not set +# CONFIG_PCI_PASID is not set +# CONFIG_HOTPLUG_PCI is not set +# CONFIG_HOTPLUG_PCI_ACPI is not set +# CONFIG_PCI_AARDVARK is not set +# CONFIG_PCI_TEGRA is not set +# CONFIG_PCIE_RCAR_HOST is not set +# CONFIG_PCIE_RCAR_EP is not set +# CONFIG_PCI_HOST_GENERIC is not set +# CONFIG_PCI_XGENE is not set +# CONFIG_PCIE_ALTERA is not set +# CONFIG_PCIE_ALTERA_MSI is not set +# CONFIG_PCI_HOST_THUNDER_PEM is not set +# CONFIG_PCI_HOST_THUNDER_ECAM is not set +# CONFIG_PCIE_ROCKCHIP_HOST is not set +# CONFIG_PCIE_BRCMSTB is not set +# CONFIG_PCI_IMX6 is not set +# CONFIG_PCI_LAYERSCAPE is not set +# CONFIG_PCI_HISI is not set +# CONFIG_PCIE_QCOM is not set +# CONFIG_PCIE_ARMADA_8K is not set +# CONFIG_PCIE_KIRIN is not set +# CONFIG_PCIE_HISI_STB is not set +# CONFIG_PCIE_TEGRA194_HOST is not set +# CONFIG_PCIE_VISCONTI_HOST is not set +# CONFIG_PCIE_LAYERSCAPE_GEN4 is not set +# CONFIG_PCI_ENDPOINT is not set +# CONFIG_PCI_ENDPOINT_CONFIGFS is not set +# CONFIG_PCI_EPF_TEST is not set +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_BRCMSTB_GISB_ARB=y +CONFIG_VEXPRESS_CONFIG=y +# CONFIG_HISILICON_LPC is not set +# CONFIG_TEGRA_ACONNECT is not set +# CONFIG_RASPBERRYPI_FIRMWARE is not set +# CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_STRATIX10_RSU is not set +CONFIG_IMX_DSP=y +# CONFIG_GNSS is not set +# CONFIG_GNSS_MTK_SERIAL is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_NAND_BRCMNAND is not set +CONFIG_MTD_NAND_GPMI_NAND=y +# CONFIG_MTD_NAND_MARVELL is not set +# CONFIG_MTD_NAND_FSL_IFC is not set +# CONFIG_MTD_NAND_QCOM is not set +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_MTD_UBI=y +# CONFIG_BLK_DEV_NVME is not set +# CONFIG_PCI_ENDPOINT_TEST is not set +CONFIG_RAID_ATTRS=m +# CONFIG_SCSI_HISI_SAS_PCI is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT3SAS is not set +# CONFIG_SCSI_UFS_QCOM is not set +# CONFIG_SCSI_UFS_HISI is not set +# CONFIG_SCSI_UFS_EXYNOS is not set +# CONFIG_SATA_AHCI is not set +CONFIG_AHCI_IMX=y +# CONFIG_AHCI_BRCM is not set +# CONFIG_AHCI_MVEBU is not set +# CONFIG_SATA_SIL24 is not set +# CONFIG_SATA_RCAR is not set +CONFIG_DM_CRYPT=m +# CONFIG_NET_DSA_BCM_SF2 is not set +# CONFIG_NET_DSA_MSCC_FELIX is not set +# CONFIG_NET_XGENE is not set +# CONFIG_ATL1C is not set +# CONFIG_SYSTEMPORT is not set +# CONFIG_BNX2X is not set +# CONFIG_THUNDER_NIC_PF is not set +CONFIG_FSL_XGMAC_MDIO=y +CONFIG_FSL_ENETC_IERB=y +# CONFIG_FSL_FMAN is not set +# CONFIG_FSL_DPAA_ETH is not set +# CONFIG_FSL_DPAA2_ETH is not set +# CONFIG_FSL_ENETC is not set +# CONFIG_FSL_ENETC_VF is not set +# CONFIG_FSL_ENETC_QOS is not set +CONFIG_MVMDIO=y +CONFIG_MSCC_OCELOT_SWITCH=m +# CONFIG_HNS3 is not set +# CONFIG_HNS3_HCLGE is not set +# CONFIG_HNS3_ENET is not set +# CONFIG_E1000 is not set +# CONFIG_E1000E is not set +# CONFIG_IGB is not set +# CONFIG_IGBVF is not set +# CONFIG_MVNETA is not set +# CONFIG_MVPP2 is not set +# CONFIG_SKY2 is not set +# CONFIG_MLX4_EN is not set +# CONFIG_MLX5_CORE is not set +# CONFIG_MLX5_CORE_EN is not set +# CONFIG_R8169 is not set +# CONFIG_SH_ETH is not set +# CONFIG_RAVB is not set +CONFIG_STMMAC_ETH=y +CONFIG_DWMAC_GENERIC=m +CONFIG_MICROCHIP_PHY=y +CONFIG_NXP_TJA11XX_PHY=y +CONFIG_MDIO_BITBANG=y +# CONFIG_SNI_AVE is not set +# CONFIG_SNI_NETSEC is not set +# CONFIG_TI_K3_AM65_CPSW_NUSS is not set +# CONFIG_QCOM_IPA is not set +# CONFIG_MESON_GXL_PHY is not set +# CONFIG_AQUANTIA_PHY is not set +# CONFIG_BCM54140_PHY is not set +# CONFIG_MARVELL_PHY is not set +# CONFIG_MARVELL_10G_PHY is not set +# CONFIG_MICREL_PHY is not set +# CONFIG_MICROSEMI_PHY is not set +# CONFIG_AT803X_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_ROCKCHIP_PHY is not set +# CONFIG_DP83867_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_USB_BRCMSTB is not set +CONFIG_USB_RTL8152=y +CONFIG_USB_USBNET=y +CONFIG_BRCMFMAC=y +CONFIG_HOSTAP=y +# CONFIG_ATH10K is not set +# CONFIG_ATH10K_PCI is not set +# CONFIG_ATH10K_SNOC is not set +# CONFIG_WCN36XX is not set +# CONFIG_MWIFIEX is not set +# CONFIG_MWIFIEX_SDIO is not set +# CONFIG_MWIFIEX_PCIE is not set +CONFIG_KEYBOARD_SNVS_PWRKEY=y +# CONFIG_KEYBOARD_IMX_SC_KEY is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_INPUT_PM8941_PWRKEY is not set +# CONFIG_INPUT_PM8XXX_VIBRATOR is not set +# CONFIG_INPUT_PWM_BEEPER is not set +# CONFIG_INPUT_PWM_VIBRA is not set +# CONFIG_INPUT_HISI_POWERKEY is not set +# CONFIG_SERIAL_8250_BCM2835AUX is not set +# CONFIG_SERIAL_8250_OMAP is not set +# CONFIG_SERIAL_8250_MT6577 is not set +# CONFIG_SERIAL_8250_UNIPHIER is not set +# CONFIG_SERIAL_MESON is not set +# CONFIG_SERIAL_MESON_CONSOLE is not set +# CONFIG_SERIAL_SAMSUNG is not set +# CONFIG_SERIAL_SAMSUNG_CONSOLE is not set +# CONFIG_SERIAL_TEGRA is not set +# CONFIG_SERIAL_TEGRA_TCU is not set +# CONFIG_SERIAL_SH_SCI is not set +# CONFIG_SERIAL_MSM is not set +# CONFIG_SERIAL_MSM_CONSOLE is not set +# CONFIG_SERIAL_QCOM_GENI is not set +# CONFIG_SERIAL_QCOM_GENI_CONSOLE is not set +# CONFIG_SERIAL_MVEBU_UART is not set +# CONFIG_SERIAL_OWL is not set +# CONFIG_I2C_MUX is not set +# CONFIG_I2C_BCM2835 is not set +# CONFIG_I2C_MESON is not set +# CONFIG_I2C_MT65XX is not set +# CONFIG_I2C_MV64XXX is not set +# CONFIG_I2C_OMAP is not set +# CONFIG_I2C_OWL is not set +# CONFIG_I2C_PXA is not set +# CONFIG_I2C_QCOM_CCI is not set +# CONFIG_I2C_QCOM_GENI is not set +# CONFIG_I2C_QUP is not set +# CONFIG_I2C_RIIC is not set +# CONFIG_I2C_S3C2410 is not set +# CONFIG_I2C_SH_MOBILE is not set +# CONFIG_I2C_TEGRA is not set +# CONFIG_I2C_UNIPHIER_F is not set +# CONFIG_I2C_RCAR is not set +# CONFIG_SPI_ARMADA_3700 is not set +# CONFIG_SPI_BCM2835 is not set +# CONFIG_SPI_BCM2835AUX is not set +# CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI_DW_DMA is not set +# CONFIG_SPI_DW_MMIO is not set +CONFIG_SPI_IMX=y +# CONFIG_SPI_FSL_DSPI is not set +# CONFIG_SPI_MESON_SPICC is not set +# CONFIG_SPI_MESON_SPIFC is not set +# CONFIG_SPI_ORION is not set +CONFIG_SPI_SPIDEV=y +CONFIG_SPI_SLAVE=y +CONFIG_SPI_SLAVE_TIME=y +CONFIG_SPI_SLAVE_SYSTEM_CONTROL=y +CONFIG_PINCTRL=y +# CONFIG_SPI_RPCIF is not set +# CONFIG_SPI_RSPI is not set +# CONFIG_SPI_QCOM_QSPI is not set +# CONFIG_SPI_QUP is not set +# CONFIG_SPI_QCOM_GENI is not set +# CONFIG_SPI_S3C64XX is not set +# CONFIG_SPI_SH_MSIOF is not set +# CONFIG_SPI_SUN6I is not set +# CONFIG_SPMI is not set +# CONFIG_PINCTRL_OWL is not set +# CONFIG_PINCTRL_S700 is not set +# CONFIG_PINCTRL_S900 is not set +CONFIG_GPIOLIB=y +# CONFIG_PINCTRL_MSM is not set +# CONFIG_PINCTRL_IPQ8074 is not set +# CONFIG_PINCTRL_IPQ6018 is not set +# CONFIG_PINCTRL_MSM8916 is not set +# CONFIG_PINCTRL_MSM8994 is not set +# CONFIG_PINCTRL_MSM8996 is not set +# CONFIG_PINCTRL_MSM8998 is not set +# CONFIG_PINCTRL_QCS404 is not set +# CONFIG_PINCTRL_QDF2XXX is not set +# CONFIG_PINCTRL_QCOM_SPMI_PMIC is not set +# CONFIG_PINCTRL_SC7180 is not set +# CONFIG_PINCTRL_SC7280 is not set +# CONFIG_PINCTRL_SDM845 is not set +# CONFIG_PINCTRL_SM8150 is not set +# CONFIG_PINCTRL_SM8250 is not set +# CONFIG_PINCTRL_SM8350 is not set +# CONFIG_PINCTRL_SM8450 is not set +# CONFIG_PINCTRL_LPASS_LPI is not set +# CONFIG_GPIO_DAVINCI is not set +# CONFIG_GPIO_MPC8XXX is not set +# CONFIG_GPIO_RCAR is not set +# CONFIG_GPIO_UNIPHIER is not set +# CONFIG_GPIO_VISCONTI is not set +# CONFIG_GPIO_XGENE_SB is not set +CONFIG_POWER_RESET_BRCMSTB=y +# CONFIG_GPIO_MAX77620 is not set +# CONFIG_GPIO_SL28CPLD is not set +# CONFIG_POWER_RESET_MSM is not set +# CONFIG_POWER_RESET_QCOM_PON is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_BQ25890 is not set +# CONFIG_CHARGER_BQ25980 is not set +# CONFIG_SENSORS_JC42 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_RASPBERRYPI_HWMON is not set +# CONFIG_SENSORS_SL28CPLD is not set +CONFIG_THERMAL_WRITABLE_TRIPS=y +CONFIG_IMX_SC_THERMAL=y +CONFIG_IMX8MM_THERMAL=y +CONFIG_QORIQ_THERMAL=y +# CONFIG_SUN8I_THERMAL is not set +# CONFIG_ROCKCHIP_THERMAL is not set +# CONFIG_RCAR_THERMAL is not set +# CONFIG_RCAR_GEN3_THERMAL is not set +# CONFIG_RZG2L_THERMAL is not set +# CONFIG_ARMADA_THERMAL is not set +# CONFIG_BCM2711_THERMAL is not set +# CONFIG_BCM2835_THERMAL is not set +# CONFIG_BRCMSTB_THERMAL is not set +# CONFIG_EXYNOS_THERMAL is not set +# CONFIG_TEGRA_SOCTHERM is not set +# CONFIG_TEGRA_BPMP_THERMAL is not set +# CONFIG_QCOM_TSENS is not set +# CONFIG_QCOM_SPMI_TEMP_ALARM is not set +# CONFIG_QCOM_LMH is not set +# CONFIG_UNIPHIER_THERMAL is not set +# CONFIG_SL28CPLD_WATCHDOG is not set +# CONFIG_S3C2410_WATCHDOG is not set +# CONFIG_BCM7038_WDT is not set +# CONFIG_SUNXI_WATCHDOG is not set +CONFIG_IMX_SC_WDT=y +CONFIG_IMX7ULP_WDT=y +# CONFIG_QCOM_WDT is not set +# CONFIG_MESON_GXBB_WATCHDOG is not set +# CONFIG_MESON_WATCHDOG is not set +# CONFIG_RENESAS_WDT is not set +# CONFIG_RENESAS_RZG2LWDT is not set +# CONFIG_UNIPHIER_WATCHDOG is not set +# CONFIG_BCM2835_WDT is not set +# CONFIG_MFD_ALTERA_SYSMGR is not set +# CONFIG_MFD_AXP20X_RSB is not set +# CONFIG_MFD_EXYNOS_LPASS is not set +# CONFIG_MFD_HI655X_PMIC is not set +# CONFIG_MFD_MT6397 is not set +# CONFIG_MFD_SPMI_PMIC is not set +# CONFIG_MFD_SL28CPLD is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_HI655X is not set +# CONFIG_REGULATOR_MP8859 is not set +# CONFIG_REGULATOR_MT6358 is not set +# CONFIG_REGULATOR_MT6397 is not set +# CONFIG_REGULATOR_PF8X00 is not set +# CONFIG_REGULATOR_QCOM_RPMH is not set +# CONFIG_REGULATOR_QCOM_SMD_RPM is not set +# CONFIG_REGULATOR_QCOM_SPMI is not set +# CONFIG_REGULATOR_TPS65132 is not set +CONFIG_MEDIA_SUPPORT=y +# CONFIG_RC_CORE is not set +# CONFIG_RC_DECODERS is not set +# CONFIG_RC_DEVICES is not set +# CONFIG_IR_MESON is not set +# CONFIG_IR_SUNXI is not set +CONFIG_SDR_PLATFORM_DRIVERS=y +# CONFIG_VIDEO_QCOM_CAMSS is not set +# CONFIG_VIDEO_RCAR_CSI2 is not set +# CONFIG_VIDEO_RCAR_VIN is not set +# CONFIG_VIDEO_SUN6I_CSI is not set +# CONFIG_VIDEO_RCAR_ISP is not set +# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set +# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set +# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set +# CONFIG_VIDEO_RENESAS_FDP1 is not set +# CONFIG_VIDEO_RENESAS_FCP is not set +# CONFIG_VIDEO_RENESAS_VSP1 is not set +# CONFIG_VIDEO_QCOM_VENUS is not set +# CONFIG_VIDEO_RCAR_DRIF is not set +CONFIG_VIDEO_OV5640=y +CONFIG_DRM=y +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +# CONFIG_DRM_NOUVEAU is not set +# CONFIG_DRM_EXYNOS is not set +# CONFIG_DRM_EXYNOS5433_DECON is not set +# CONFIG_DRM_EXYNOS7_DECON is not set +# CONFIG_DRM_EXYNOS_DSI is not set +# CONFIG_DRM_EXYNOS_DP is not set +# CONFIG_DRM_EXYNOS_HDMI is not set +# CONFIG_DRM_EXYNOS_MIC is not set +# CONFIG_DRM_ROCKCHIP is not set +# CONFIG_ROCKCHIP_ANALOGIX_DP is not set +# CONFIG_ROCKCHIP_CDN_DP is not set +# CONFIG_ROCKCHIP_DW_HDMI is not set +# CONFIG_ROCKCHIP_DW_MIPI_DSI is not set +# CONFIG_ROCKCHIP_INNO_HDMI is not set +# CONFIG_ROCKCHIP_LVDS is not set +# CONFIG_DRM_RCAR_DU is not set +# CONFIG_DRM_RCAR_MIPI_DSI is not set +# CONFIG_DRM_SUN4I is not set +# CONFIG_DRM_SUN6I_DSI is not set +# CONFIG_DRM_SUN8I_DW_HDMI is not set +# CONFIG_DRM_SUN8I_MIXER is not set +# CONFIG_DRM_MSM is not set +# CONFIG_DRM_TEGRA is not set +# CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set +# CONFIG_DRM_PANEL_LVDS is not set +# CONFIG_DRM_PANEL_SIMPLE is not set +# CONFIG_DRM_PANEL_EDP is not set +# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set +CONFIG_DRM_DISPLAY_CONNECTOR=m +# CONFIG_DRM_LONTIUM_LT8912B is not set +CONFIG_DRM_NWL_MIPI_DSI=y +# CONFIG_DRM_LONTIUM_LT9611UXC is not set +# CONFIG_DRM_PARADE_PS8640 is not set +CONFIG_DRM_I2C_ADV7511=y +CONFIG_DRM_DW_HDMI_I2S_AUDIO=m +CONFIG_DRM_IMX_DCSS=y +# CONFIG_DRM_VC4 is not set +# CONFIG_DRM_HISI_HIBMC is not set +CONFIG_DRM_MXSFB=y +# CONFIG_DRM_MEDIATEK is not set +# CONFIG_DRM_MEDIATEK_HDMI is not set +# CONFIG_DRM_MESON is not set +CONFIG_DRM_LEGACY=y +# CONFIG_FB is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_EFI is not set +# CONFIG_BACKLIGHT_PWM is not set +# CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_LOGO is not set +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_ALOOP=m +# CONFIG_SND_SPI is not set +# CONFIG_SND_USB is not set +# CONFIG_SND_HDA_TEGRA is not set +# CONFIG_SND_HDA_CODEC_HDMI is not set +CONFIG_SND_SOC_FSL_ASRC=y +CONFIG_SND_SOC_FSL_EASRC=y +CONFIG_SND_IMX_SOC=y +CONFIG_SND_SOC_FSL_ASOC_CARD=y +CONFIG_SND_SOC_SOF_TOPLEVEL=y +CONFIG_SND_SOC_SOF_OF=m +CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y +CONFIG_SND_SOC_AK4458=y +CONFIG_SND_SOC_AK5558=y +CONFIG_SND_SOC_PCM512x_I2C=y +CONFIG_SND_SIMPLE_CARD=y +CONFIG_SND_AUDIO_GRAPH_CARD=y +CONFIG_USB_CONN_GPIO=y +# CONFIG_SND_BCM2835_SOC_I2S is not set +# CONFIG_SND_SOC_FSL_MICFIL is not set +# CONFIG_SND_SOC_IMX_SGTL5000 is not set +# CONFIG_SND_SOC_IMX_SPDIF is not set +# CONFIG_SND_SOC_IMX_AUDMIX is not set +# CONFIG_SND_MESON_AXG_SOUND_CARD is not set +# CONFIG_SND_MESON_GX_SOUND_CARD is not set +# CONFIG_SND_SOC_QCOM is not set +# CONFIG_SND_SOC_APQ8016_SBC is not set +# CONFIG_SND_SOC_MSM8996 is not set +# CONFIG_SND_SOC_SDM845 is not set +# CONFIG_SND_SOC_SM8250 is not set +# CONFIG_SND_SOC_ROCKCHIP is not set +# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set +# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set +# CONFIG_SND_SOC_RK3399_GRU_SOUND is not set +# CONFIG_SND_SOC_SAMSUNG is not set +# CONFIG_SND_SOC_RCAR is not set +# CONFIG_SND_SOC_RZ is not set +# CONFIG_SND_SUN4I_I2S is not set +# CONFIG_SND_SUN4I_SPDIF is not set +# CONFIG_SND_SOC_TEGRA is not set +# CONFIG_SND_SOC_TEGRA210_AHUB is not set +# CONFIG_SND_SOC_TEGRA210_DMIC is not set +# CONFIG_SND_SOC_TEGRA210_I2S is not set +# CONFIG_SND_SOC_TEGRA186_DSPK is not set +# CONFIG_SND_SOC_TEGRA210_ADMAIF is not set +# CONFIG_SND_SOC_TEGRA210_MVC is not set +# CONFIG_SND_SOC_TEGRA210_SFC is not set +# CONFIG_SND_SOC_TEGRA210_AMX is not set +# CONFIG_SND_SOC_TEGRA210_ADX is not set +# CONFIG_SND_SOC_TEGRA210_MIXER is not set +# CONFIG_SND_SOC_TEGRA_AUDIO_GRAPH_CARD is not set +# CONFIG_SND_SOC_AK4613 is not set +# CONFIG_SND_SOC_ES7134 is not set +# CONFIG_SND_SOC_ES7241 is not set +# CONFIG_SND_SOC_GTM601 is not set +# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set +# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_PCM3168A_I2C is not set +# CONFIG_SND_SOC_RT5659 is not set +# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set +# CONFIG_SND_SOC_SIMPLE_MUX is not set +# CONFIG_SND_SOC_TAS571X is not set +# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set +# CONFIG_SND_SOC_WCD934X is not set +# CONFIG_SND_SOC_WM8904 is not set +# CONFIG_SND_SOC_WM8960 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_WSA881X is not set +# CONFIG_SND_SOC_NAU8822 is not set +# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set +# CONFIG_SND_SOC_LPASS_VA_MACRO is not set +# CONFIG_SND_AUDIO_GRAPH_CARD2 is not set +# CONFIG_HID_MULTITOUCH is not set +# CONFIG_I2C_HID_ACPI is not set +# CONFIG_I2C_HID_OF is not set +# CONFIG_USB_XHCI_PCI_RENESAS is not set +# CONFIG_USB_XHCI_TEGRA is not set +# CONFIG_USB_EHCI_EXYNOS is not set +# CONFIG_USB_OHCI_EXYNOS is not set +CONFIG_USB_HCD_TEST_MODE=y +# CONFIG_USB_RENESAS_USBHS_HCD is not set +# CONFIG_USB_RENESAS_USBHS is not set +CONFIG_USB_UAS=y +# CONFIG_USB_CDNS_SUPPORT is not set +# CONFIG_USB_CDNS3 is not set +# CONFIG_USB_CDNS3_GADGET is not set +# CONFIG_USB_CDNS3_HOST is not set +# CONFIG_USB_MTU3 is not set +# CONFIG_USB_MUSB_SUNXI is not set +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=y +CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_TEST=m +CONFIG_USB_EHSET_TEST_FIXTURE=y +# CONFIG_USB_SERIAL_CP210X is not set +# CONFIG_USB_SERIAL_OPTION is not set +CONFIG_USB_MXS_PHY=y +CONFIG_USB_ULPI=y +CONFIG_USB_SNP_UDC_PLAT=y +CONFIG_USB_BDC_UDC=y +CONFIG_USB_CONFIGFS=y +# CONFIG_USB_RENESAS_USBHS_UDC is not set +# CONFIG_USB_RENESAS_USB3 is not set +# CONFIG_USB_TEGRA_XUDC is not set +CONFIG_USB_CONFIGFS_F_LB_SS=y +CONFIG_USB_CONFIGFS_F_UAC1=y +CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y +CONFIG_USB_CONFIGFS_F_UAC2=y +CONFIG_USB_CONFIGFS_F_MIDI=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_USB_CONFIGFS_F_UVC=y +CONFIG_USB_ZERO=m +CONFIG_USB_AUDIO=m +CONFIG_USB_ETH=m +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_SERIAL=m +CONFIG_TYPEC=y +CONFIG_TYPEC_TCPM=y +CONFIG_TYPEC_TCPCI=y +# CONFIG_TYPEC_TPS6598X is not set +# CONFIG_MMC_SDHCI_ACPI is not set +# CONFIG_MMC_SDHCI_TEGRA is not set +# CONFIG_MMC_MESON_GX is not set +# CONFIG_MMC_SDHCI_MSM is not set +# CONFIG_MMC_SDHI is not set +# CONFIG_MMC_UNIPHIER is not set +# CONFIG_MMC_DW_ROCKCHIP is not set +# CONFIG_MMC_SUNXI is not set +# CONFIG_MMC_BCM2835 is not set +# CONFIG_MMC_MTK is not set +# CONFIG_MMC_OWL is not set +# CONFIG_LEDS_LM3692X is not set +# CONFIG_LEDS_PCA9532 is not set +# CONFIG_EDAC_LAYERSCAPE is not set +# CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_PCF85063 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_RV3028 is not set +# CONFIG_RTC_DRV_FSL_FTM_ALARM is not set +# CONFIG_RTC_DRV_S3C is not set +CONFIG_RTC_DRV_SNVS=y +CONFIG_RTC_DRV_IMX_SC=y +# CONFIG_RTC_DRV_SUN6I is not set +# CONFIG_RTC_DRV_ARMADA38X is not set +# CONFIG_RTC_DRV_PM8XXX is not set +# CONFIG_RTC_DRV_TEGRA is not set +# CONFIG_RTC_DRV_XGENE is not set +# CONFIG_RTC_DRV_MT6397 is not set +CONFIG_BCM_SBA_RAID=m +# CONFIG_DMA_BCM2835 is not set +# CONFIG_DMA_SUN6I is not set +CONFIG_FSL_QDMA=m +CONFIG_IMX_SDMA=y +# CONFIG_K3_DMA is not set +# CONFIG_MV_XOR is not set +CONFIG_MXS_DMA=y +# CONFIG_OWL_DMA is not set +# CONFIG_TEGRA186_GPC_DMA is not set +# CONFIG_TEGRA20_APB_DMA is not set +# CONFIG_TEGRA210_ADMA is not set +# CONFIG_QCOM_BAM_DMA is not set +CONFIG_DMATEST=y +CONFIG_DMABUF_HEAPS=y +CONFIG_DMABUF_HEAPS_SYSTEM=y +CONFIG_DMABUF_HEAPS_CMA=y +# CONFIG_RCAR_DMAC is not set +# CONFIG_RENESAS_USB_DMAC is not set +# CONFIG_RZ_DMAC is not set +# CONFIG_TI_K3_UDMA is not set +# CONFIG_TI_K3_UDMA_GLUE_LAYER is not set +# CONFIG_VFIO_PCI is not set +# CONFIG_VIRTIO_PCI is not set +# CONFIG_XEN_GNTDEV is not set +# CONFIG_XEN_GRANT_DEV_ALLOC is not set +# CONFIG_VIDEO_HANTRO is not set +# CONFIG_VIDEO_IMX_MEDIA is not set +# CONFIG_COMMON_CLK_SCMI is not set +# CONFIG_COMMON_CLK_FSL_SAI is not set +CONFIG_COMMON_CLK_XGENE=y +# CONFIG_COMMON_CLK_BD718XX is not set +# CONFIG_CLK_RASPBERRYPI is not set +# CONFIG_CLK_IMX8MM is not set +# CONFIG_CLK_IMX8MP is not set +# CONFIG_CLK_IMX8MQ is not set +# CONFIG_CLK_IMX8QXP is not set +# CONFIG_CLK_IMX8ULP is not set +# CONFIG_TI_SCI_CLK is not set +# CONFIG_COMMON_CLK_QCOM is not set +# CONFIG_QCOM_A53PLL is not set +# CONFIG_QCOM_CLK_APCS_MSM8916 is not set +# CONFIG_QCOM_CLK_APCC_MSM8996 is not set +# CONFIG_QCOM_CLK_SMD_RPM is not set +# CONFIG_QCOM_CLK_RPMH is not set +# CONFIG_IPQ_GCC_6018 is not set +# CONFIG_IPQ_GCC_8074 is not set +# CONFIG_MSM_GCC_8916 is not set +# CONFIG_MSM_GCC_8994 is not set +# CONFIG_MSM_MMCC_8996 is not set +# CONFIG_MSM_GCC_8998 is not set +# CONFIG_QCS_GCC_404 is not set +# CONFIG_SC_GCC_7180 is not set +# CONFIG_SC_GCC_7280 is not set +# CONFIG_SDM_CAMCC_845 is not set +# CONFIG_SDM_GPUCC_845 is not set +# CONFIG_SDM_VIDEOCC_845 is not set +# CONFIG_SDM_DISPCC_845 is not set +# CONFIG_SM_GCC_8350 is not set +# CONFIG_SM_GCC_8450 is not set +# CONFIG_SM_GPUCC_8150 is not set +# CONFIG_SM_GPUCC_8250 is not set +# CONFIG_QCOM_HFPLL is not set +# CONFIG_CLK_GFM_LPASS_SM8250 is not set +# CONFIG_CLK_RCAR_USB2_CLOCK_SEL is not set +# CONFIG_HWSPINLOCK_QCOM is not set +# CONFIG_RENESAS_OSTM is not set +# CONFIG_BCM2835_MBOX is not set +# CONFIG_QCOM_APCS_IPC is not set +# CONFIG_QCOM_IPCC is not set +# CONFIG_ROCKCHIP_IOMMU is not set +# CONFIG_TEGRA_IOMMU_SMMU is not set +# CONFIG_MTK_IOMMU is not set +# CONFIG_QCOM_IOMMU is not set +CONFIG_IMX_REMOTEPROC=y +CONFIG_IMX_DSP_REMOTEPROC=y +CONFIG_RPMSG_CHAR=y +# CONFIG_QCOM_Q6V5_MSS is not set +# CONFIG_QCOM_Q6V5_PAS is not set +# CONFIG_QCOM_SYSMON is not set +# CONFIG_QCOM_WCNSS_PIL is not set +# CONFIG_RPMSG_QCOM_GLINK_SMEM is not set +# CONFIG_RPMSG_QCOM_SMD is not set +CONFIG_SOC_BRCMSTB=y +# CONFIG_OWL_PM_DOMAINS is not set +# CONFIG_RASPBERRYPI_POWER is not set +# CONFIG_FSL_DPAA is not set +# CONFIG_FSL_MC_DPIO is not set +CONFIG_SOC_TI=y +# CONFIG_MTK_DEVAPC is not set +# CONFIG_MTK_PMIC_WRAP is not set +# CONFIG_QCOM_AOSS_QMP is not set +# CONFIG_QCOM_COMMAND_DB is not set +# CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_GENI_SE is not set +# CONFIG_QCOM_RMTFS_MEM is not set +# CONFIG_QCOM_RPMH is not set +# CONFIG_QCOM_RPMHPD is not set +# CONFIG_QCOM_RPMPD is not set +# CONFIG_QCOM_SMEM is not set +# CONFIG_QCOM_SMD_RPM is not set +# CONFIG_QCOM_SMP2P is not set +# CONFIG_QCOM_SMSM is not set +# CONFIG_QCOM_SOCINFO is not set +# CONFIG_QCOM_STATS is not set +# CONFIG_QCOM_WCNSS_CTRL is not set +# CONFIG_QCOM_APR is not set +# CONFIG_ARCH_R8A77995 is not set +# CONFIG_ARCH_R8A77990 is not set +# CONFIG_ARCH_R8A77950 is not set +# CONFIG_ARCH_R8A77951 is not set +# CONFIG_ARCH_R8A77965 is not set +# CONFIG_ARCH_R8A77960 is not set +# CONFIG_ARCH_R8A77961 is not set +# CONFIG_ARCH_R8A779F0 is not set +# CONFIG_ARCH_R8A77980 is not set +# CONFIG_ARCH_R8A77970 is not set +# CONFIG_ARCH_R8A779A0 is not set +# CONFIG_ARCH_R8A774C0 is not set +# CONFIG_ARCH_R8A774E1 is not set +# CONFIG_ARCH_R8A774A1 is not set +# CONFIG_ARCH_R8A774B1 is not set +# CONFIG_ARCH_R9A07G044 is not set +# CONFIG_ROCKCHIP_IODOMAIN is not set +# CONFIG_ROCKCHIP_PM_DOMAINS is not set +# CONFIG_ARCH_TEGRA_132_SOC is not set +# CONFIG_ARCH_TEGRA_210_SOC is not set +# CONFIG_ARCH_TEGRA_186_SOC is not set +# CONFIG_ARCH_TEGRA_194_SOC is not set +# CONFIG_ARCH_TEGRA_234_SOC is not set +# CONFIG_TI_SCI_PM_DOMAINS is not set +# CONFIG_ARM_IMX_BUS_DEVFREQ is not set +# CONFIG_ARM_IMX8M_DDRC_DEVFREQ is not set +CONFIG_MEMORY=y +# CONFIG_RENESAS_RPCIF is not set +CONFIG_IMX8QXP_ADC=y +# CONFIG_EXYNOS_ADC is not set +# CONFIG_QCOM_SPMI_VADC is not set +# CONFIG_QCOM_SPMI_ADC5 is not set +# CONFIG_ROCKCHIP_SARADC is not set +# CONFIG_RZG2L_ADC is not set +# CONFIG_TI_ADS1015 is not set +CONFIG_IIO_ST_LSM6DSX=y +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_VCNL4000 is not set +# CONFIG_IIO_ST_MAGN_3AXIS is not set +# CONFIG_MPL3115 is not set +# CONFIG_PWM_BCM2835 is not set +# CONFIG_PWM_BRCMSTB is not set +CONFIG_PWM_FSL_FTM=m +CONFIG_PWM_IMX27=y +# CONFIG_PWM_MESON is not set +# CONFIG_PWM_MTK_DISP is not set +# CONFIG_PWM_MEDIATEK is not set +# CONFIG_PWM_RCAR is not set +# CONFIG_PWM_RENESAS_TPU is not set +# CONFIG_PWM_ROCKCHIP is not set +# CONFIG_PWM_SAMSUNG is not set +# CONFIG_PWM_SL28CPLD is not set +# CONFIG_PWM_SUN4I is not set +# CONFIG_PWM_TEGRA is not set +# CONFIG_PWM_VISCONTI is not set +# CONFIG_SL28CPLD_INTC is not set +# CONFIG_QCOM_PDC is not set +# CONFIG_RESET_QCOM_AOSS is not set +# CONFIG_RESET_QCOM_PDC is not set +# CONFIG_RESET_RZG2L_USBPHY_CTRL is not set +# CONFIG_RESET_TI_SCI is not set +CONFIG_PHY_CADENCE_SALVO=y +CONFIG_PHY_MIXEL_MIPI_DPHY=y +# CONFIG_PHY_SUN4I_USB is not set +# CONFIG_PHY_CADENCE_SIERRA is not set +# CONFIG_PHY_FSL_IMX8M_PCIE is not set +# CONFIG_PHY_HI6220_USB is not set +# CONFIG_PHY_HISTB_COMBPHY is not set +# CONFIG_PHY_HISI_INNO_USB2 is not set +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set +# CONFIG_PHY_MTK_TPHY is not set +# CONFIG_PHY_QCOM_QMP is not set +# CONFIG_PHY_QCOM_QUSB2 is not set +CONFIG_PHY_SAMSUNG_USB2=y +# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set +# CONFIG_PHY_RCAR_GEN3_PCIE is not set +# CONFIG_PHY_RCAR_GEN3_USB2 is not set +# CONFIG_PHY_RCAR_GEN3_USB3 is not set +# CONFIG_PHY_ROCKCHIP_EMMC is not set +# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set +# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set +# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set +# CONFIG_PHY_ROCKCHIP_PCIE is not set +# CONFIG_PHY_ROCKCHIP_TYPEC is not set +# CONFIG_PHY_SAMSUNG_UFS is not set +# CONFIG_PHY_UNIPHIER_USB2 is not set +# CONFIG_PHY_UNIPHIER_USB3 is not set +# CONFIG_PHY_TEGRA_XUSB is not set +# CONFIG_PHY_AM654_SERDES is not set +# CONFIG_PHY_J721E_WIZ is not set +CONFIG_FSL_IMX8_DDR_PMU=y +# CONFIG_QCOM_L2_PMU is not set +# CONFIG_QCOM_L3_PMU is not set +# CONFIG_MTK_EFUSE is not set +# CONFIG_QCOM_QFPROM is not set +# CONFIG_ROCKCHIP_EFUSE is not set +# CONFIG_NVMEM_SUNXI_SID is not set +# CONFIG_UNIPHIER_EFUSE is not set +# CONFIG_MESON_EFUSE is not set +# CONFIG_NVMEM_RMEM is not set +# CONFIG_NVMEM_LAYERSCAPE_SFP is not set +# CONFIG_FPGA_MGR_ALTERA_CVP is not set +# CONFIG_FPGA_MGR_STRATIX10_SOC is not set +# CONFIG_SLIMBUS is not set +# CONFIG_SLIM_QCOM_NGD_CTRL is not set +# CONFIG_INTERCONNECT_IMX is not set +# CONFIG_INTERCONNECT_IMX8MM is not set +# CONFIG_INTERCONNECT_IMX8MN is not set +# CONFIG_INTERCONNECT_IMX8MQ is not set +# CONFIG_INTERCONNECT_QCOM is not set +# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set +# CONFIG_INTERCONNECT_QCOM_OSM_L3 is not set +# CONFIG_INTERCONNECT_QCOM_SC7280 is not set +# CONFIG_INTERCONNECT_QCOM_SDM845 is not set +# CONFIG_INTERCONNECT_QCOM_SM8150 is not set +# CONFIG_INTERCONNECT_QCOM_SM8250 is not set +# CONFIG_INTERCONNECT_QCOM_SM8350 is not set +# CONFIG_INTERCONNECT_QCOM_SM8450 is not set +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_UBIFS_FS=y +CONFIG_SQUASHFS_XZ=y +CONFIG_CRYPTO_USER=y +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_DH=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_CFB=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_OFB=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_STREEBOG=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_AEAD=m +# CONFIG_CRYPTO_DEV_SUN8I_CE is not set +# CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM is not set +# CONFIG_CRYPTO_DEV_QCOM_RNG is not set +CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m +CONFIG_INDIRECT_PIO=y +CONFIG_CRC_CCITT=m +# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set +# CONFIG_CRYPTO_DEV_HISI_ZIP is not set +# CONFIG_CRYPTO_DEV_HISI_HPRE is not set +# CONFIG_CRYPTO_DEV_HISI_TRNG is not set +CONFIG_IRQ_POLL=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_INFO_REDUCED is not set +CONFIG_CORESIGHT=y +CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y +CONFIG_CORESIGHT_SOURCE_ETM4X=y diff --git a/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst b/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst new file mode 100644 index 0000000000..c01d2d6c1d --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst @@ -0,0 +1,29 @@ +# @_flash.bin | bootloader +# @_image [_flash.bin] | image burn to nand, default is the same as bootloader +# @_filesystem | filesystem to burn +# @_kernel | kernel image +# @_dtb | dtb image + +# This command will be run when ROM support stream mode +# i.MX8QXP, i.MX8QM +SDPS: boot -f _flash.bin + +FB: ucmd setenv fastboot_buffer ${loadaddr} +FB: download -f _image +# Burn image to nandfit partition if needed +FB: ucmd if env exists nandfit_part; then nand erase.part nandfit; nand write ${fastboot_buffer} nandfit ${filesize}; else true; fi; +FB: ucmd nandbcb init ${fastboot_buffer} nandboot ${filesize} + +FB[-t 10000]: ucmd ubi part nandrootfs +FB[-t 10000]: ucmd ubi create root - +FB: download -f _filesystem +FB[-t 60000]: ucmd ubi write ${loadaddr} root ${filesize} + +FB: download -f _kernel +FB[-t 10000]: ucmd nand write ${loadaddr} nandkernel ${filesize} + +FB: download -f _dtb +FB[-t 8000]: ucmd nand write ${loadaddr} nanddtb ${filesize} + +FB: reboot +FB: done diff --git a/board/bsh/imx8mn-bsh-smm-s2/patches/uboot/0001-include-configs-Remove-rootwait-1-to-all-the-affecte.patch b/board/bsh/imx8mn-bsh-smm-s2/patches/uboot/0001-include-configs-Remove-rootwait-1-to-all-the-affecte.patch new file mode 100644 index 0000000000..59db559b93 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/patches/uboot/0001-include-configs-Remove-rootwait-1-to-all-the-affecte.patch @@ -0,0 +1,160 @@ +From 3878b941c6bde84e29b2725e4261d85bea828752 Mon Sep 17 00:00:00 2001 +From: Michael Trimarchi +Date: Sun, 22 May 2022 15:22:08 +0200 +Subject: [PATCH] include/configs: Remove rootwait=1 to all the affected boards + +rootwait=1 is not a valid kernel boot parameters. According +to the documenation is only rootwait + +rootwait [KNL] Wait (indefinitely) for root device to show up. + Useful for devices that are detected asynchronously + (e.g. USB and MMC devices). + +Fix: +Unknown kernel command line parameters "rootwait=1", will be passed to user space. + +Signed-off-by: Michael Trimarchi +Reviewed-by: Heiko Schocher +Link: https://patchwork.ozlabs.org/project/uboot/patch/20220520110013.32811-1-michael at amarulasolutions.com/ +Signed-off-by: Dario Binacchi +--- + include/configs/am335x_evm.h | 2 +- + include/configs/am43xx_evm.h | 2 +- + include/configs/baltos.h | 2 +- + include/configs/chiliboard.h | 2 +- + include/configs/etamin.h | 2 +- + include/configs/imx8mn_bsh_smm_s2.h | 2 +- + include/configs/siemens-am33x-common.h | 4 ++-- + include/configs/ti_armv7_keystone2.h | 2 +- + include/environment/ti/nand.h | 2 +- + 9 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h +index fd5b209a52db..f301a6dc835b 100644 +--- a/include/configs/am335x_evm.h ++++ b/include/configs/am335x_evm.h +@@ -34,7 +34,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ +diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h +index 5057441f7506..1f5c3cd04e88 100644 +--- a/include/configs/am43xx_evm.h ++++ b/include/configs/am43xx_evm.h +@@ -166,7 +166,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,4096\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ +diff --git a/include/configs/baltos.h b/include/configs/baltos.h +index b881d8c03fd7..7b43741fde7c 100644 +--- a/include/configs/baltos.h ++++ b/include/configs/baltos.h +@@ -37,7 +37,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=5\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "setenv loadaddr 0x84000000; " \ +diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h +index 82acda595f09..8bad0f9ac4b6 100644 +--- a/include/configs/chiliboard.h ++++ b/include/configs/chiliboard.h +@@ -20,7 +20,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdt_addr} NAND.u-boot-spl-os; " \ +diff --git a/include/configs/etamin.h b/include/configs/etamin.h +index 9cf93924df93..1c0a86d1ed10 100644 +--- a/include/configs/etamin.h ++++ b/include/configs/etamin.h +@@ -113,7 +113,7 @@ + "nand_active_ubi_vol=rootfs_a\0" \ + "rootfs_name=rootfs\0" \ + "kernel_name=uImage\0"\ +- "nand_root_fs_type=ubifs rootwait=1\0" \ ++ "nand_root_fs_type=ubifs rootwait\0" \ + "nand_args=run bootargs_defaults;" \ + "mtdparts default;" \ + "setenv ${partitionset_active} true;" \ +diff --git a/include/configs/imx8mn_bsh_smm_s2.h b/include/configs/imx8mn_bsh_smm_s2.h +index d09c2ab01610..0dc514f00684 100644 +--- a/include/configs/imx8mn_bsh_smm_s2.h ++++ b/include/configs/imx8mn_bsh_smm_s2.h +@@ -22,7 +22,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:root rw ubi.mtd=nandrootfs\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdt_addr_r} nanddtb; " \ +diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h +index 08c4d52d658f..9f1a6cd51b40 100644 +--- a/include/configs/siemens-am33x-common.h ++++ b/include/configs/siemens-am33x-common.h +@@ -237,7 +237,7 @@ + "nand_active_ubi_vol=rootfs_a\0" \ + "nand_active_ubi_vol_A=rootfs_a\0" \ + "nand_active_ubi_vol_B=rootfs_b\0" \ +- "nand_root_fs_type=ubifs rootwait=1\0" \ ++ "nand_root_fs_type=ubifs rootwait\0" \ + "nand_src_addr=0x280000\0" \ + "nand_src_addr_A=0x280000\0" \ + "nand_src_addr_B=0x780000\0" \ +@@ -314,7 +314,7 @@ + "nand_active_ubi_vol=rootfs_a\0" \ + "rootfs_name=rootfs\0" \ + "kernel_name=uImage\0"\ +- "nand_root_fs_type=ubifs rootwait=1\0" \ ++ "nand_root_fs_type=ubifs rootwait\0" \ + "nand_args=run bootargs_defaults;" \ + "mtdparts default;" \ + "setenv ${partitionset_active} true;" \ +diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h +index 57f013cbf846..133daecf7164 100644 +--- a/include/configs/ti_armv7_keystone2.h ++++ b/include/configs/ti_armv7_keystone2.h +@@ -180,7 +180,7 @@ + "sf write ${loadaddr} 0 ${filesize}\0" \ + "burn_uboot_nand=nand erase 0 0x100000; " \ + "nand write ${loadaddr} 0 ${filesize}\0" \ +- "args_all=setenv bootargs console=ttyS0,115200n8 rootwait=1 " \ ++ "args_all=setenv bootargs console=ttyS0,115200n8 rootwait " \ + KERNEL_MTD_PARTS \ + "args_net=setenv bootargs ${bootargs} rootfstype=nfs " \ + "root=/dev/nfs rw nfsroot=${serverip}:${nfs_root}," \ +diff --git a/include/environment/ti/nand.h b/include/environment/ti/nand.h +index 11dcefcc41ca..7d00afa2b10f 100644 +--- a/include/environment/ti/nand.h ++++ b/include/environment/ti/nand.h +@@ -14,7 +14,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ +-- +2.32.0 + diff --git a/board/bsh/imx8mn-bsh-smm-s2/post-build.sh b/board/bsh/imx8mn-bsh-smm-s2/post-build.sh new file mode 100755 index 0000000000..49df4cd6fb --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +cp ${BOARD_DIR}/nand-full.lst ${BINARIES_DIR} diff --git a/board/bsh/imx8mn-bsh-smm-s2/readme.txt b/board/bsh/imx8mn-bsh-smm-s2/readme.txt new file mode 100644 index 0000000000..37081091e8 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/readme.txt @@ -0,0 +1,75 @@ +i.MX8MN BSH SMM S2 +================== + +This tutorial describes how to use the predefined Buildroot +configuration for the i.MX8MN BSH SMM S2 PRO board. + +Building +-------- + +Configure buildroot: + + $ make imx8mn_bsh_smm_s2_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +------------------- + +After building, the output/images directory contains: + + output/images/ + ????????? bl31.bin + ????????? ddr3* + ????????? flash.bin + ????????? freescale/imx8mn-bsh-smm-s2.dtb + ????????? Image + ????????? nand-full.lst + ????????? rootfs.ext2 + ????????? rootfs.ext4 -> rootfs.ext2 + ????????? rootfs.tar + ????????? rootfs.ubifs + ????????? u-boot.bin + ????????? u-boot-spl.bin + + +Preparing the board +------------------- + +Plug the USB type A to micro B cable into the USB Debug +Connector (DBG UART). Use serial port settings 115200 8N1 +to access the debug console. + +Plug another USB type A to micro B cable into the USB-OTG +Connector (USB1). This connection is used to flash the board +firmware using the Freescale/NXP UUU tool. + +Connect the power supply/adaptor to the DC Power Jack (labelled ++5V). + + +Flashing +-------- + +Power up the board by switching on the Power ON Switch, which is +placed right next to the DC Jack. + +Enter the following U-Boot commands on the debug serial console: + + $ nand erase.chip + $ reset + +Flash the built images directly to board???s memory. On your computer, +run: + + $ board/bsh/imx8mn-bsh-smm-s2/flash.sh output/ + +It will flash the bootloader, the Device Tree Blob, the kernel image +and the UBI root file system. diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig new file mode 100644 index 0000000000..4b03d2e89e --- /dev/null +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GLOBAL_PATCH_DIR="board/bsh/imx8mn-bsh-smm-s2/patches" +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2/post-build.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.6" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/imx8mn-bsh-smm-s2/linux.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y +BR2_TARGET_ROOTFS_UBIFS=y +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 +BR2_TARGET_ROOTFS_UBIFS_RT_NONE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_UUU=y From peter at korsgaard.com Mon Feb 20 21:02:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:57 -0000 Subject: [Buildroot] [git commit branch/next] package/containerd: bump to version 1.6.16 Message-ID: <20230220205244.EAB6881979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7ea83dd2df315ba4f492a9ef6b24152ba4cc4f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bugfixes and improvements. We now install the containerd.service systemd unit. https://github.com/containerd/containerd/releases/tag/v1.6.16 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 04a29949d7..16474089d1 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 b86e5c42f58b8348422c972513ff49783c0d505ed84e498d0d0245c5992e4320 containerd-1.6.12.tar.gz +sha256 e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a containerd-1.6.16.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 192175800c..4a0d6ec38b 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.12 +CONTAINERD_VERSION = 1.6.16 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE @@ -41,4 +41,10 @@ else CONTAINERD_TAGS += no_btrfs endif +define CONTAINERD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/containerd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/containerd.service + $(SED) 's,/usr/local/bin,/usr/bin,g' $(TARGET_DIR)/usr/lib/systemd/system/containerd.service +endef + $(eval $(golang-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:02:58 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:02:58 -0000 Subject: [Buildroot] [git commit branch/next] package/openvpn: get rid of -e in S60openvpn shebang Message-ID: <20230220205245.361D781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=28ca1da23433d58112304c191c319ac11edc5d77 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The -e switch makes the script terminate on error from start-stop-daemon, rendering unreachable the code that checks the exit status. There is no need in the -e switch in the first place either, as the script takes care of errors handling. Signed-off-by: Sergey Organov Signed-off-by: Yann E. MORIN --- package/openvpn/S60openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn index f097cf11ec..00156c80db 100644 --- a/package/openvpn/S60openvpn +++ b/package/openvpn/S60openvpn @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # # Original version by Robert Leslie # , edited by iwj and cs From peter at korsgaard.com Mon Feb 20 21:02:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:59 -0000 Subject: [Buildroot] [git commit branch/next] package/iwd: bump to version 2.2 Message-ID: <20230220205245.27FAA828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13de1138f89909890e945b6e433e64ebbaab01ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 e7971cd637..be048b3da6 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 9fd13512dc27d83efb8d341f7df98f5488f70131686021fcd0d93fc97af013b8 iwd-1.30.tar.xz +sha256 dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570 iwd-2.2.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 5ffbde334e..b0a2f6e9ed 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.30 +IWD_VERSION = 2.2 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Mon Feb 20 21:03:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:03:00 -0000 Subject: [Buildroot] [git commit branch/next] package/webkitgtk: security bump to version 2.38.4 Message-ID: <20230220205245.02B73828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca203080d132d44fc0b62148066b85cce66628fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://webkitgtk.org/2023/02/02/webkitgtk2.38.4-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index eff7f5c18f..34fd19d3de 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums -md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz -sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz -sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums +md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz +sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz +sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b1bca7b88a..b42ac3b644 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.3 +WEBKITGTK_VERSION = 2.38.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Wed Feb 8 12:43:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:43:19 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: use DESTDIR instead of --prefix for installation Message-ID: <20230220205255.DD26081979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfb5035c6fae1285ff0100275083fabc2b9816c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Even though it works, overriding --prefix at installation time is a bit weird. In order to be more consistent with what is done with other build systems, use DESTDIR instead at installation time. Note that $(DESTDIR) comes in addition to the -DCMAKE_INSTALL_PREFIX=/usr that is passed at configure time, so with this commit, the files continue to be installed in $(STAGING_DIR)/usr and $(TARGET_DIR)/usr as they should be. Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 7b57eba4ab..212b2d689e 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -79,11 +79,11 @@ define QT6BASE_BUILD_CMDS endef define QT6BASE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) --prefix $(STAGING_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) endef define QT6BASE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) --prefix $(TARGET_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) endef HOST_QT6BASE_DEPENDENCIES = \ From thomas.petazzoni at bootlin.com Wed Feb 8 12:23:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:23:49 +0100 Subject: [Buildroot] [git commit branch/next] package/zxing-cpp: bump to version 1.4.0 Message-ID: <20230220205255.B07A881979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=456a7398316655ad0b669635f580e4887c24a700 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patches which are no longer required. Verified license remains Apache-2.0 after hash change. Rework config options for 1.4.0. Add new host-pkgconf and stb build dependency. Drop optional libiconv dependency which is no longer used. Add optional python module support. Add optional qt5 support. Add optional opencv4 support. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...ke-libs-private-not-exported-to-the-users.patch | 43 ------------------- ...02-CMakeLists-txt-add-BUILD_OPENCV-option.patch | 39 ------------------ package/zxing-cpp/Config.in | 2 + package/zxing-cpp/zxing-cpp.hash | 4 +- package/zxing-cpp/zxing-cpp.mk | 48 +++++++++++++++++----- 5 files changed, 42 insertions(+), 94 deletions(-) diff --git a/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch b/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch deleted file mode 100644 index 90b2320384..0000000000 --- a/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9e5dfa57f3b998bc3049bfa893b20e81dea656df Mon Sep 17 00:00:00 2001 -From: Yuri -Date: Sat, 20 Apr 2019 07:28:26 -0700 -Subject: [PATCH] Link library with OpenCV, not only the executable, make libs - PRIVATE. - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/86] ---- - CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 738f4e1..efe3aee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,10 +60,12 @@ include_directories(core/src) - add_library(libzxing ${LIBZXING_FILES}) - set_target_properties(libzxing PROPERTIES PREFIX "") - -+set(libzxing_LIBS "") -+ - find_package(Iconv) - if(ICONV_FOUND) - include_directories(${ICONV_INCLUDE_DIR}) -- target_link_libraries(libzxing ${ICONV_LIBRARIES}) -+ set(libzxing_LIBS ${libzxing_LIBS} ${ICONV_LIBRARIES}) - else() - add_definitions(-DNO_ICONV=1) - endif() -@@ -75,9 +77,12 @@ if(OpenCV_FOUND) - "./opencv-cli/src/*.h" - ) - add_executable(zxing-cv ${OPENCV_ZXING_FILES}) -+ set(libzxing_LIBS ${libzxing_LIBS} ${OpenCV_LIBRARIES}) - target_link_libraries(zxing-cv libzxing ${OpenCV_LIBRARIES}) - endif() - -+target_link_libraries(libzxing PRIVATE ${libzxing_LIBS}) -+ - # Add cli executable. - file(GLOB_RECURSE ZXING_FILES - "./cli/src/*.cpp" diff --git a/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch b/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch deleted file mode 100644 index 31753d7c24..0000000000 --- a/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fe740316af970f57ec511cdeafb512510e4842a9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 9 Nov 2019 17:21:13 +0100 -Subject: [PATCH] CMakeLists.txt: add BUILD_OPENCV option - -Add BUILD_OPENCV option to allow the user to disable OpenCV. It is -especially useful as opencv library can be built without highgui support - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/90] ---- - CMakeLists.txt | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 738f4e1..12913cd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.0) - project(zxing) - - option(BUILD_TESTING "Enable generation of test targets" OFF) -+option(BUILD_OPENCV "Enable OpenCV classes and OpenCV cli executable" ON) - - set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH}) - -@@ -44,8 +45,10 @@ else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - --# OpenCV classes --find_package(OpenCV) -+if (BUILD_OPENCV) -+ # OpenCV classes -+ find_package(OpenCV) -+endif() - if(OpenCV_FOUND) - list(APPEND LIBZXING_FILES - opencv/src/zxing/MatSource.cpp diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index c1109219a0..6c17565d2a 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_ZXING_CPP bool "zxing-cpp" depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_STB + select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 help ZXing-cpp (pronounced "zebra crossing") is an open-source, multi-format 1D/2D barcode image processing library diff --git a/package/zxing-cpp/zxing-cpp.hash b/package/zxing-cpp/zxing-cpp.hash index cabe3e70d4..5457ede44a 100644 --- a/package/zxing-cpp/zxing-cpp.hash +++ b/package/zxing-cpp/zxing-cpp.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4c2b8601d0e3377143c1a0bbab220146af9fa5a5e29e8fbef42862fe3d38f8e6 zxing-cpp-e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10.tar.gz +sha256 126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862 zxing-cpp-1.4.0.tar.gz # License files -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 COPYING +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index e9c80b4453..1051376808 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -4,23 +4,51 @@ # ################################################################################ -ZXING_CPP_VERSION = e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10 -ZXING_CPP_SITE = $(call github,glassechidna,zxing-cpp,$(ZXING_CPP_VERSION)) +ZXING_CPP_VERSION = 1.4.0 +ZXING_CPP_SITE = $(call github,zxing-cpp,zxing-cpp,v$(ZXING_CPP_VERSION)) ZXING_CPP_LICENSE = Apache-2.0 -ZXING_CPP_LICENSE_FILES = COPYING +ZXING_CPP_LICENSE_FILES = LICENSE ZXING_CPP_INSTALL_STAGING = YES ZXING_CPP_SUPPORTS_IN_SOURCE_BUILD = NO -ZXING_CPP_CONF_OPTS = -DBUILD_TESTING=OFF +ZXING_CPP_DEPENDENCIES = host-pkgconf stb +ZXING_CPP_CONF_OPTS = \ + -DBUILD_READERS=ON \ + -DBUILD_WRITERS=ON \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_BLACKBOX_TESTS=OFF \ + -DBUILD_UNIT_TESTS=OFF \ + -DBUILD_DEPENDENCIES=LOCAL -ifeq ($(BR2_PACKAGE_LIBICONV),y) -ZXING_CPP_DEPENDENCIES += libiconv +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV4_LIB_HIGHGUI),y) +ifeq ($(BR2_PACKAGE_OPENCV3),y) +ZXING_CPP_DEPENDENCIES += opencv3 +endif +ifeq ($(BR2_PACKAGE_OPENCV4),y) +ZXING_CPP_DEPENDENCIES += opencv4 +endif +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_OpenCV=TRUE +else +ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV=TRUE endif -ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y) -ZXING_CPP_DEPENDENCIES += opencv3 -ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON +ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy) +ZXING_CPP_DEPENDENCIES += python3 python-pybind +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=ON +else +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF +endif + +ifeq ($(BR2_PACKAGE_QT5BASE),y) +ZXING_CPP_DEPENDENCIES += qt5base +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yy) +ZXING_CPP_DEPENDENCIES += qt5declarative qt5multimedia +endif +# Only set qt5 as required when all optional qt5 dependencies are present +ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yyy) +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_Qt5=TRUE +endif else -ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFF +ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE endif $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Wed Feb 8 12:52:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:52:39 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6: bump version to 6.4.2 Message-ID: <20230220205255.E85D9828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74686296a4a20438f1e94e22a5a3372df2e830cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For details see [1] and [2]. [1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.1/release-note.md [2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.2/release-note.md Signed-off-by: Peter Seiderer Tested-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6.mk | 2 +- package/qt6/qt6base/qt6base.hash | 4 ++-- package/qt6/qt6serialport/qt6serialport.hash | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 575b2f826c..431bb8c9d3 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -5,7 +5,7 @@ ################################################################################ QT6_VERSION_MAJOR = 6.4 -QT6_VERSION = $(QT6_VERSION_MAJOR).0 +QT6_VERSION = $(QT6_VERSION_MAJOR).2 QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index fedbbba79f..63af373836 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtbase-everywhere-src-6.4.0.tar.xz.sha256 -sha256 cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d qtbase-everywhere-src-6.4.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 +sha256 a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d qtbase-everywhere-src-6.4.2.tar.xz # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash index 54a45681fa..1eaa3d6150 100644 --- a/package/qt6/qt6serialport/qt6serialport.hash +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtserialport-everywhere-src-6.4.0.tar.xz.sha256 -sha256 f148cc9e87ce2228e82bff7a64d9521339ece66c4c66aa43b91bac614f4a4483 qtserialport-everywhere-src-6.4.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialport-everywhere-src-6.4.2.tar.xz.sha256 +sha256 336d95919037800184b3c3de8ccb6f62954b20f3756c05adce8d5010504340fa qtserialport-everywhere-src-6.4.2.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt From peter at korsgaard.com Fri Feb 10 15:36:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:36:24 +0100 Subject: [Buildroot] [git commit branch/next] package/python-flit-core: set license path Message-ID: <20230220205257.7E86E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1613273542554776b089b3df2b6b71c1af2cc0da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When generating legal info with a configuration enabling a package which uses flit as setup type, we get a warning about python-flit-core license: WARNING: python-flit-core-3.8.0: cannot save license (HOST_PYTHON_FLIT_CORE_LICENSE_FILES not defined) Add missing variable to point to python-flit-core license file Signed-off-by: Alexis Lothor?? [Peter: add sha256sum to .hash file] Signed-off-by: Peter Korsgaard --- package/python-flit-core/python-flit-core.hash | 2 ++ package/python-flit-core/python-flit-core.mk | 1 + 2 files changed, 3 insertions(+) diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash index 9281635f1a..f63a64ed1b 100644 --- a/package/python-flit-core/python-flit-core.hash +++ b/package/python-flit-core/python-flit-core.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flit_core/json md5 7c41da13273f7787709a24f74e0f5a99 flit_core-3.8.0.tar.gz sha256 b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3 flit_core-3.8.0.tar.gz +# Locally computed +sha256 35b4f1dec512e617077fd6980dbb43ef8c2887adc5d0185edb4c04da175dd816 LICENSE diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 4d7bee81da..f96191ade6 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -8,6 +8,7 @@ PYTHON_FLIT_CORE_VERSION = 3.8.0 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/10/e5/be08751d07b30889af130cec20955c987a74380a10058e6e8856e4010afc PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause +PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap # Use flit built in bootstrap_install for installing host-python-flit-core. From thomas.petazzoni at bootlin.com Fri Feb 10 22:29:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:29:10 +0100 Subject: [Buildroot] [git commit branch/next] configs/asus_tinker_rk3288: fix boot by prepending tpl to spl+u-boot Message-ID: <20230220205257.B530A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e738d5b7251918a62922f3f3b6491b642f9ec182 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next During the last U-boot version bump it's not been noted that the TPL was not prepended to SPL anymore preventing the board to boot, so let's copy TPL to the image folder, prepend it to u-boot-spl-dtb.bin and place it at offset 32KB, where RK3288 bootrom expects to find it. Let's also place u-boot-dtb separated from SPL at offset 8M, where the SPL expects it to find it. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/genimage.cfg | 11 +++++++++-- board/asus/tinker/post-build.sh | 4 ++-- configs/asus_tinker_rk3288_defconfig | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/board/asus/tinker/genimage.cfg b/board/asus/tinker/genimage.cfg index a4b1e8d608..fa7fd734f2 100644 --- a/board/asus/tinker/genimage.cfg +++ b/board/asus/tinker/genimage.cfg @@ -2,12 +2,19 @@ image sdcard.img { hdimage { } - partition u-boot-spl-dtb { + partition u-boot-tpl-spl-dtb { in-partition-table = "no" - image = "u-boot-spl-dtb.img" + image = "u-boot-tpl-spl-dtb.img" offset = 32K } + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 8M + size = 30M + } + partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/asus/tinker/post-build.sh b/board/asus/tinker/post-build.sh index 8108ed83ff..ffbbcdeb58 100755 --- a/board/asus/tinker/post-build.sh +++ b/board/asus/tinker/post-build.sh @@ -3,7 +3,7 @@ MKIMAGE=$HOST_DIR/bin/mkimage BOARD_DIR="$(dirname $0)" -$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img -cat $BINARIES_DIR/u-boot-dtb.bin >> $BINARIES_DIR/u-boot-spl-dtb.img +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl-dtb.bin > $BINARIES_DIR/u-boot-tpl-spl-dtb.img install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 6963fa939f..02b340a7f1 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y From thomas.petazzoni at bootlin.com Fri Feb 10 22:30:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:30:08 +0100 Subject: [Buildroot] [git commit branch/next] board/asus/tinker: rename label linux-next to linux in extlinux.conf Message-ID: <20230220205257.C30A88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4b46bc3c6997e32050b332d7578f0cb289b57be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We're not using next branch so let's rename label linux-next to linux. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf index 136af0debd..bb96ddb893 100644 --- a/board/asus/tinker/extlinux.conf +++ b/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ -label Tinker linux-next +label Tinker linux kernel /boot/uImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait From thomas.petazzoni at bootlin.com Fri Feb 10 22:05:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:05:38 +0100 Subject: [Buildroot] [git commit branch/next] package/gnupg2: bump to version 2.4.0 Message-ID: <20230220205257.9CD7986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f868e97f6b42ccaa0844880775f86002656227d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next See announce: https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html This commit also drop a patch which is now included in the new version. See: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7011286ce6e1fb56c2989fdafbd11b931c489faa Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gnupg2/0001-ks_ldap_free_state.patch | 21 --------------------- package/gnupg2/gnupg2.hash | 10 +++++----- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch deleted file mode 100644 index fa55d27c04..0000000000 --- a/package/gnupg2/0001-ks_ldap_free_state.patch +++ /dev/null @@ -1,21 +0,0 @@ - -Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is not -installed - -Backported from: 7011286ce6e1fb56c2989fdafbd11b931c489faa - -Signed-off-by: Michael Fischer - ---- a/dirmngr/server.c -+++ b/dirmngr/server.c -@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) - ctrl->refcount); - else - { -+#if USE_LDAP - ks_ldap_free_state (ctrl->ks_get_state); - ctrl->ks_get_state = NULL; -+#endif - release_ctrl_ocsp_certs (ctrl); - xfree (ctrl->server_local); - dirmngr_deinit_default_ctrl (ctrl); diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index f9c071ad45..c642862fe2 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html -sha1 1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc gnupg-2.3.8.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html +sha1 63dde155a8df0d5e1987efa5fc17438beca83ac1 gnupg-2.4.0.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.8.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA and AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD -sha256 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed gnupg-2.3.8.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2.sig +# using key 6DAA6E64A76D2840571B4902528897B826403ADA +sha256 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 gnupg-2.4.0.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 9dc29ca99e..5935ce6939 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.3.8 +GNUPG2_VERSION = 2.4.0 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From thomas.petazzoni at bootlin.com Fri Feb 10 22:31:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:31:15 +0100 Subject: [Buildroot] [git commit branch/next] board/asus/tinker: add a note to readme.txt for power supply Message-ID: <20230220205257.E0067828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d87d6281869d4023e0ff888b99cdd5bdf2a0326 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/readme.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/board/asus/tinker/readme.txt b/board/asus/tinker/readme.txt index 7372d29520..110e2168c9 100644 --- a/board/asus/tinker/readme.txt +++ b/board/asus/tinker/readme.txt @@ -35,3 +35,9 @@ You can write this image directly to an SD card device (i.e. /dev/xxx): $ sudo sync Finally, you can insert the SD card to the Tinker RK3288 board and boot it. + +NOTE: +USB power supply requires more than the standard 500mA USB current, so +this board must be supplied from a capable port or from an external +AC/DC adapter. Otherwise it will hang forever while loading the kernel +image. From thomas.petazzoni at bootlin.com Fri Feb 10 22:38:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:38:44 +0100 Subject: [Buildroot] [git commit branch/next] package/ssdp-responder; drop systemd unit installation, not needed Message-ID: <20230220205258.081B88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6e3d36a85f19acedd2ed58f5b8616dbf24f57a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When systemd is enabled the ssdp-responder build system already installs the unit file, with the correct name, so we can safely drop this. This fixes the recurring autobuilder problems that cropped up the last week+ or so after fixing the spelling error in 6e0ba6b. - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/ssdp-responder/ssdp-responder.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index d40f6f8c57..5193966908 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,9 +25,4 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service -endef - $(eval $(autotools-package)) From yann.morin.1998 at free.fr Sat Feb 11 10:02:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 11:02:49 +0100 Subject: [Buildroot] [git commit branch/next] package/pkg-waf: add missing $ Message-ID: <20230220205258.2C8B481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d1b223b91b08acdb52611864ae5921b9f3c757b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We want to have $(@D) expanded at the time the recipe is run, so like all other variables, we need to $$-expand it. Fixes: 1b4d7f6e13212b4c65ec2832681719fd960e75e6 Fixes: http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826 Signed-off-by: Romain Naour Cc: Yann E. MORIN Cc: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/pkg-waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index 0e752072c8..c3e965bdf3 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -42,7 +42,7 @@ define inner-waf-package # otherwise waf errors out with: # Waf script 'X' and library 'Y' do not match define WAF_PACKAGE_REMOVE_WAF_LIB - $(RM) -fr $(@D)/waf $(@D)/waflib + $(RM) -fr $$(@D)/waf $$(@D)/waflib endef # We need host-python3 to run waf From yann.morin.1998 at free.fr Sat Feb 11 12:12:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 13:12:51 +0100 Subject: [Buildroot] [git commit branch/next] configs/stm32f429_xip_defconfig: bump Linux version to 6.1.10 Message-ID: <20230220205258.40CD08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2bf4d02ff35bd8a0d5aace354c987a166437db88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The size of xipImage has grown by 84KB but there are still 278KB left before running out of 2MB of flash memory. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- configs/stm32f429_disco_xip_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index f9b3270ecd..872e4b6a30 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_m4=y -BR2_KERNEL_HEADERS_5_15=y +BR2_KERNEL_HEADERS_6_1=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f429-disco/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From thomas.petazzoni at bootlin.com Fri Feb 10 22:36:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:36:16 +0100 Subject: [Buildroot] [git commit branch/next] support/testing/tests/package/test_gnupg2.py: new runtime test Message-ID: <20230220205257.EEF8381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a82eec628c25f96a15ed7f1443923ff625e0d2bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_gnupg2.py | 114 +++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e8e0671709..0af1323340 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1708,6 +1708,7 @@ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py diff --git a/support/testing/tests/package/test_gnupg2.py b/support/testing/tests/package/test_gnupg2.py new file mode 100644 index 0000000000..4505e1c339 --- /dev/null +++ b/support/testing/tests/package/test_gnupg2.py @@ -0,0 +1,114 @@ +import os + +import infra.basetest + + +class TestGnupg2(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_GNUPG2=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Some common data for all the tests + plain_data = "Some plain text data" + plain_file = "file.txt" + gpg_file = plain_file + ".gpg" + asc_file = plain_file + ".asc" + sig_file = plain_file + ".sig" + good_passphrase = "Good Passphrase" + gpg_userid = "br-test at buildroot" + + # Test the program can execute + self.assertRunOk("gpg --version") + + # Generate plain text data + cmd = "echo '{}' > {}".format(plain_data, plain_file) + self.assertRunOk(cmd) + + # Test symmetric encrypt + cmd = "gpg --batch --symmetric" + cmd += " --passphrase '{}' {}".format(good_passphrase, plain_file) + self.assertRunOk(cmd) + + # Test symmetric decrypt + cmd = "gpg --batch --decrypt" + cmd += " --passphrase '{}' {}".format(good_passphrase, gpg_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + + # Test a failed decrypt with a bad password + cmd = "gpg --batch --decrypt" + cmd += " --passphrase 'A-Bad-Password' {}".format(gpg_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Test the generation of an asymmetric key + cmd = "gpg --batch --passphrase ''" + cmd += " --quick-generate-key {} default default".format(gpg_userid) + self.assertRunOk(cmd) + + # Test asymmetric encrypt+sign + cmd = "gpg --batch --yes --encrypt --sign" + cmd += " --recipient {} {}".format(gpg_userid, plain_file) + self.assertRunOk(cmd) + + # Test asymmetric decrypt+verify + cmd = "gpg --decrypt {}".format(gpg_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test asymmetric armored encrypt+sign + cmd = "gpg --batch --yes --armor --encrypt --sign" + cmd += " --recipient {} {}".format(gpg_userid, plain_file) + self.assertRunOk(cmd) + + # Test asymmetric armored decrypt+verify + cmd = "gpg --armor --decrypt {}".format(asc_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test detached signature + cmd = "gpg --batch --yes --detach-sign {}".format(plain_file) + self.assertRunOk(cmd) + + # Test detached signature verification + cmd = "gpg --verify {}".format(sig_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test detached armored signature + cmd = "gpg --batch --yes --armor --detach-sign {}".format(plain_file) + self.assertRunOk(cmd) + + # Test detached armored signature verification + cmd = "gpg --armor --verify {}".format(asc_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test the signature verification of a corrupted file actually fails + cmd = "echo 'CORRUPTED' >> {}".format(plain_file) + self.assertRunOk(cmd) + + cmd = "gpg --verify {}".format(sig_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + cmd = "gpg --armor --verify {}".format(asc_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) From peter at korsgaard.com Sat Feb 11 22:18:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:26 +0100 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libX11: bump version to 1.8.4 Message-ID: <20230220205258.60CB28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b9bea584c2f2c14122395eba7cdbf325ed7256c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003318.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 62b67ad544..ed68164d5f 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003305.html -sha256 e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd libX11-1.8.3.tar.xz -sha512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 libX11-1.8.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003318.html +sha256 c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518 libX11-1.8.4.tar.xz +sha512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e libX11-1.8.4.tar.xz # Locally computed sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 3bb3fffce0..add16f49db 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.8.3 +XLIB_LIBX11_VERSION = 1.8.4 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT From yann.morin.1998 at free.fr Sat Feb 11 14:58:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 15:58:35 +0100 Subject: [Buildroot] [git commit branch/next] package/chrony: run as unprivileged user Message-ID: <20230220205258.4B21381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=451672e890b5f605aa9ad7a386491a31397c737f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next There are three ways to run chronyd: - start as root, and continue running as root; - start as root, then setuid() to a non-root user via either a command line option or a configuration directive; - start as root, and setuid() to a build-time specified non-root user. Currently, the first situation is used by Buildroot, which does not follow security best practices of dropping elevated privileges for daemon at runtime when that is possible. We switch to the third situation, where a compile-time default non-root user is then used at runtime to drop privileges, with libcap used to keep the capabilities required to call the appropriate syscalls to adjust the system time (typically, CAP_SYS_TIME to call adjtimex() or clock_settime() et al.). This means that libcap is now a mandatory dependency. To be noted: users who previously had configured their systems to run chronyd as non root, would have done so with either the command-line option (`-u`), or the configuration directive (`user`). Those take precedence over the compile-time default, so this should not break their systems (presumably, they also run as the `chrony` user). They would also have taken care to run chronyc as the appropriate user to manipulate chronyd at runtime via the UNIX socket. For those who were running chronyd as root, this does not change either: the functionality is unchanged, and they were running chronyc as root, which should still be capable of manipulating chronyd via its UNIX socket. Take that opportunity to brine chrony's Config.in to current coding style: enclose sub-option in an if-endif block. Signed-off-by: James Kent Signed-off-by: Yann E. MORIN --- package/chrony/Config.in | 6 +++++- package/chrony/chrony.mk | 11 +++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/package/chrony/Config.in b/package/chrony/Config.in index 158dc20530..c22b756c11 100644 --- a/package/chrony/Config.in +++ b/package/chrony/Config.in @@ -1,16 +1,20 @@ config BR2_PACKAGE_CHRONY bool "chrony" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBCAP help Chrony is a pair of programs which are used to maintain the accuracy of the system clock. http://chrony.tuxfamily.org/ +if BR2_PACKAGE_CHRONY + config BR2_PACKAGE_CHRONY_DEBUG_LOGGING bool "enable debug logging support" - depends on BR2_PACKAGE_CHRONY help Enable support for debug logging output from Chrony when enabled at runtime. If disabled, code for debug logging will not be compiled in. + +endif diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 379e95a778..86f23d9060 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -10,20 +10,19 @@ CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING CHRONY_CPE_ID_VENDOR = tuxfamily CHRONY_SELINUX_MODULES = chronyd -CHRONY_DEPENDENCIES = host-pkgconf +CHRONY_DEPENDENCIES = host-pkgconf libcap CHRONY_CONF_OPTS = \ --host-system=Linux \ --host-machine=$(BR2_ARCH) \ --prefix=/usr \ --without-tomcrypt \ + --with-user=chrony \ $(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug) -ifeq ($(BR2_PACKAGE_LIBCAP),y) -CHRONY_DEPENDENCIES += libcap -else -CHRONY_CONF_OPTS += --without-libcap -endif +define CHRONY_USERS + chrony -1 chrony -1 * /run/chrony - - Time daemon +endef ifeq ($(BR2_PACKAGE_LIBNSS),y) CHRONY_DEPENDENCIES += libnss From peter at korsgaard.com Sat Feb 11 22:18:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:48 +0100 Subject: [Buildroot] [git commit branch/next] package/libdrm: bump version to 2.4.115 Message-ID: <20230220205258.6E84F81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e1fdd144300106704e21176673e465163245669 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003323.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 387beadc3f..87cc170617 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003250.html -sha256 3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026 libdrm-2.4.114.tar.xz -sha512 8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644 libdrm-2.4.114.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003323.html +sha256 554cfbfe0542bddb391b4e3e05bfbbfc3e282b955bd56218d21c0616481f65eb libdrm-2.4.115.tar.xz +sha512 0c38d3cfd76f627b899f052527c2939d5fc87a417422dceb0761839ba21e69736703a87ba170b5ba7a4aca2506a240760c8c97ca1781a7fb78468225295293bd libdrm-2.4.115.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 56366b6c48..52ac13b7d0 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.114 +LIBDRM_VERSION = 2.4.115 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From peter at korsgaard.com Sun Feb 12 08:39:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:39:19 +0100 Subject: [Buildroot] [git commit branch/next] support/download: fix the cargo post-process in face of failed vendoring Message-ID: <20230220205258.A4AA981979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59b2e826f2a6c1874c5d032d3a5852326028bc0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In commit 04154a651729 (support/download/cargo-post-process: cargo output for vendor config), we switched away from our hand-crafted cargo.toml mangling, to use cargo itself to update that file. In doing so, we enabled the shell pipefail option, so that we could catch cargo failures, while redirecting its output through tee to the cargo.toml. However, pipefail is overzealous, and will hit us even for pipes we do not want to globally fail, like the one that actually checks whether an archive is already vendored or not: if tar tf "${output}" | grep -q "^[^/]*/VENDOR" ; then ... with pipefail, the above may always fail: - if the tarball is already vendored, grep will exit on the first match because of -q (it only needs a single match to decide that its return code will be zero), so the | will get closed, and tar may get -EPIPE before it had a chance to finish listing the archive, and thus would terminate in error; - if the tarball is not vendored, grep will exit in error. It turns out that the tee was only added so that we could see the messages emitted by cargo, and still fill the cargo.tom with the output of cargo. But that's a bit overkill: the cargo messages are going to stderr, and the blurb to add to cargo.toml to stdout, so we just need to redirect stdout. Yes, we do not see what cargo added to cargo.toml, but that is not so interesting. Still, cargo ends its messages with a suggestion for the user to modify cargo.toml, with: To use vendored sources, add this to your .cargo/config.toml for this project: But since we've already redirected that to cargo.toml, there is nothing for the user to edit, so the above can get confusing. Emit a little blurb that states that everything is under control. And then we can drop pipefail. Note: the go-post-process initially had pipefail too, but it was dropped in bfd1a31d0e59 (support/download/go-post-process: drop -o pipefail) as it was causing spurious breakage when extracting the archive before vendoring, so it is only reasonable that we also remove it from the cargo-post-process. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Simon Richter Signed-off-by: Peter Korsgaard --- support/download/cargo-post-process | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index aea2d8da7a..3f4666c006 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -e -set -o pipefail . "${0%/*}/helpers" @@ -31,7 +30,13 @@ flock "${CARGO_HOME}"/.br-lock \ cargo vendor \ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ --locked VENDOR \ - | tee .cargo/config + > .cargo/config + +# "cargo vendor' outputs on stderr a message directing to add some data +# to the project's .cargo/config.toml, data that it outputs on stdout. +# Since we redirect stdout to .cargo/config.toml, the message on stderr +# gets confusing, so instruct the user that it's been handled. +printf '(note: .cargo/config.toml automatically updated by Buildroot)\n\n' popd > /dev/null From yann.morin.1998 at free.fr Sun Feb 12 20:20:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:20:15 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: reorder entries for Julien Olivain Message-ID: <20230220205258.C7A7A81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f33c8490fe8d110c13a1f28bd5a2063983002fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Entries for "gnupg2" and "test_python_hkdf.py" were not at the right position. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ae698f87c5..ece0d986ae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1685,8 +1685,8 @@ F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ -F: package/gnupg2/ F: package/glslsandbox-player/ +F: package/gnupg2/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1716,8 +1716,8 @@ F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py -F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py +F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_magic_wormhole.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py From peter at korsgaard.com Sun Feb 12 20:02:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 21:02:14 +0100 Subject: [Buildroot] [git commit branch/next] package/libnss: bump version to 3.88.1 Message-ID: <20230220205258.B21B5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99024eca8f154062ea88af985ff10e12ae7016b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 f847ec4f77..ec3fe0d777 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_87_RTM/src/SHA256SUMS -sha256 68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d nss-3.87.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_88_1_RTM/src/SHA256SUMS +sha256 27d243edf87d1cf1bb9c861f03d387e0e9230ce5017f4308c941f558b54b3496 nss-3.88.1.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 90fd9259d5..ac342cf3af 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.87 +LIBNSS_VERSION = 3.88.1 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 yann.morin.1998 at free.fr Sun Feb 12 20:27:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:27:42 +0100 Subject: [Buildroot] [git commit branch/next] package/zxing-cpp: update homepage Message-ID: <20230220205258.DD8DF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6dbf3909dd4816230001f0d71dd31d9e96939083 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 456a7398316655ad0b669635f580e4887c24a700 decided to switch to an active fork but forgot to update homepage in Config.in Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zxing-cpp/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 6c17565d2a..2550dcf023 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_ZXING_CPP implemented in Java, with ports to other languages. This compiles the C++ port. - https://github.com/glassechidna/zxing-cpp + https://github.com/zxing-cpp/zxing-cpp From yann.morin.1998 at free.fr Sun Feb 12 20:27:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:27:47 +0100 Subject: [Buildroot] [git commit branch/next] package/zxing-cpp: needs wchar Message-ID: <20230220205258.E857881979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=631d0289fe880952d9bedf37cc10b043c70c1482 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next wchar is mandatory since switch to an active fork in commit 456a7398316655ad0b669635f580e4887c24a700: In file included from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Result.h:12, from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/GTIN.cpp:9: /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Content.h:40:14: error: 'wstring' in namespace 'std' does not name a type 40 | std::wstring render(bool withECI) const; | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/4f97f1b291a99218f4706fce8b2934bd845755e1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-bad/Config.in | 6 ++++-- package/zxing-cpp/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index d477924eec..d2ef450d74 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -741,11 +741,13 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING bool "zxing" depends on !BR2_STATIC_LIBS # zxing-cpp + depends on BR2_USE_WCHAR # zxing-cpp depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp select BR2_PACKAGE_ZXING_CPP -comment "zxing plugin needs a toolchain w/ C++, dynamic library" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP +comment "zxing plugin needs a toolchain w/ C++, wchar, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_INSTALL_LIBSTDCPP endif diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 2550dcf023..0d8b79538d 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -1,9 +1,11 @@ -comment "zxing-cpp needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "zxing-cpp needs a toolchain w/ C++, wchar, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + BR2_STATIC_LIBS config BR2_PACKAGE_ZXING_CPP bool "zxing-cpp" depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_STB select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 From yann.morin.1998 at free.fr Sun Feb 12 20:34:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:34:09 +0100 Subject: [Buildroot] [git commit branch/next] package/libsolv: drop unrecognized variables Message-ID: <20230220205259.0B25F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4706e04e3ca7428c755bffd79ddf8ef8628141e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop unrecognized variables: CMake Warning: Manually-specified variables were not used by the project: BUILD_DOC BUILD_DOCS BUILD_EXAMPLE BUILD_EXAMPLES BUILD_TEST BUILD_TESTING BUILD_TESTS CMAKE_CXX_COMPILER_FORCED DISABLE_STATIC ENABLE_SHARED Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsolv/libsolv.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 29f8a6a3d2..04fdb387fd 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -11,16 +11,15 @@ LIBSOLV_LICENSE_FILES = LICENSE.BSD LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib -LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON else -LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=OFF endif ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=OFF else LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON endif From yann.morin.1998 at free.fr Sun Feb 12 20:37:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:37:48 +0100 Subject: [Buildroot] [git commit branch/next] package/zabbix: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230220205259.2115981979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=895686180fa73a23f2e4e9ee374618fa259a79ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next zabbix uses custom --enable-{static,shared} options, instead of standard libtool directives resulting in the following build failure with openssl or libcurl: configure:13132: /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib conftest.c -lssl -lcrypto -lm >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): in function `dlfcn_globallookup': dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): in function `BIO_lookup_ex': b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): in function `BIO_gethostbyname': b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /tmp/cceWHjDi.o: in function `main': conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' [...] configure: error: OpenSSL library libssl or libcrypto not found Signed-off-by: Yann E. MORIN --- package/zabbix/zabbix.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index adc54028ad..e00d693ba5 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -125,6 +125,13 @@ endif endif # BR2_PACKAGE_ZABBIX_SERVER +# zabbix uses custom --enable-{static,shared} options, instead of +# standard libtool directives resulting in a build failure with libcurl +# or openssl. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ZABBIX_CONF_OPTS += --disable-static +endif + define ZABBIX_INSTALL_INIT_SYSTEMD $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ From yann.morin.1998 at free.fr Sun Feb 12 21:06:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 22:06:38 +0100 Subject: [Buildroot] [git commit branch/next] package/cryptsetup: bump version to 2.6.1 Message-ID: <20230220205259.5ABE38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=888ac96e55c0c53bf5ada2f3f6d58e9e1179d91b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 149d1e71f1..87cdf840c3 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc -sha256 44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735 cryptsetup-2.6.0.tar.xz +sha256 410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 cryptsetup-2.6.1.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 659fdfa2a4..3f3034475f 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.6 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From yann.morin.1998 at free.fr Sun Feb 12 20:48:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:48:36 +0100 Subject: [Buildroot] [git commit branch/next] package/rtl8723ds: bump to 2023-02-11 version with new license file Message-ID: <20230220205259.363CB828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27f38e175346c09eed003e95daa0f065b43e27e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A COPYING file has been added to rtl8723ds as of the most recent commit. Update the version of the package and add the license file hash. Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/rtl8723ds/rtl8723ds.hash | 3 ++- package/rtl8723ds/rtl8723ds.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index d5abf9913c..e94a7b40ef 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 97f3ebc5d977ba35d10c9c06e6817e4a00458727b651b56fc00c207c05a61995 rtl8723ds-a638cc8639015b8b9390af3350fab0366b6c87e7.tar.gz +sha256 672787c3f3d1f795b750cd74de8ca34bb661b8ae60f5aa50fb279ec08ff3f05f rtl8723ds-ec85dc6b9f72bfe413bff464ed01a272e29c8dbe.tar.gz +sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 COPYING diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index f303a24041..1bb164fa86 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,9 +4,10 @@ # ################################################################################ -RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 +RTL8723DS_VERSION = ec85dc6b9f72bfe413bff464ed01a272e29c8dbe RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 +RTL8723DS_LICENSE_FILES = COPYING RTL8723DS_USER_EXTRA_CLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ From yann.morin.1998 at free.fr Sun Feb 12 20:49:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:49:09 +0100 Subject: [Buildroot] [git commit branch/next] board/visionfive2: add link to documentation Message-ID: <20230220205259.42D2181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f48b3983cdb32dfcd59e7e549c8eaa1503fe342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add a link to RVspace Documentation Center, which did not exist when readme.txt was first submitted. It provides datasheet, quick start, schematics, and so on. Signed-off-by: Francois Dugast Signed-off-by: Yann E. MORIN --- board/visionfive2/readme.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt index 2da98f3847..1924cbc12b 100644 --- a/board/visionfive2/readme.txt +++ b/board/visionfive2/readme.txt @@ -4,6 +4,8 @@ Starfive VisionFive2 The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a Starfive JH7110 processor. +https://doc-en.rvspace.org/Doc_Center/visionfive_2.html + How to build ============ From peter at korsgaard.com Sun Feb 12 08:28:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:28:45 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: require diagnostics perl package for mosh Message-ID: <20230220205258.848CC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5be2d9bb621e3f3aa552516c8887a7821ed62788 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' perl -Mdiagnostics -c ./mosh.pl Can't locate diagnostics.pm in @INC (you may need to install the diagnostics module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5). BEGIN failed--compilation aborted. So add a check for it in dependencies.sh similar to the other perl modules. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index cf6635bff6..4353e9585e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -281,6 +281,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules diagnostics" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From peter at korsgaard.com Tue Feb 14 17:12:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:05 +0100 Subject: [Buildroot] [git commit branch/next] package/linux-headers: drop 4.9.x option Message-ID: <20230220205259.A741E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6634710cdb12ec5b972c2c4068636dfd591cae4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The 4.9.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 72deb03c35..e2dc854c78 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_4_9 + bool "kernel headers version 4.9.x are no longer supported" + select BR2_LEGACY + help + Version 4.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_DOCKER_PROXY bool "docker-proxy removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index f797d5a61a..ae8b5e5f62 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -6,7 +6,6 @@ sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux- sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz # Locally computed diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8a76f93d62..6970090855 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -24,11 +24,6 @@ config BR2_KERNEL_HEADERS_AS_KERNEL depends on BR2_LINUX_KERNEL select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION -config BR2_KERNEL_HEADERS_4_9 - bool "Linux 4.9.x kernel headers" - depends on !BR2_riscv - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 - config BR2_KERNEL_HEADERS_4_14 bool "Linux 4.14.x kernel headers" depends on !BR2_riscv @@ -393,7 +388,6 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.337" if BR2_KERNEL_HEADERS_4_9 default "4.14.305" if BR2_KERNEL_HEADERS_4_14 default "4.19.272" if BR2_KERNEL_HEADERS_4_19 default "5.4.231" if BR2_KERNEL_HEADERS_5_4 From peter at korsgaard.com Tue Feb 14 17:12:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:17 +0100 Subject: [Buildroot] [git commit branch/next] package/linux-headers: drop 6.0.x option Message-ID: <20230220205259.B49CD81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2b70aa9492517717f948f199e99f055a5c1dde1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The 6.0.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e2dc854c78..7f69462f2e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_6_0 + bool "kernel headers version 6.0.x are no longer supported" + select BR2_LEGACY + help + Version 6.0.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_KERNEL_HEADERS_4_9 bool "kernel headers version 4.9.x are no longer supported" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index ae8b5e5f62..52eb534b40 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz -sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6970090855..18c179ec8d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -45,10 +45,6 @@ config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 -config BR2_KERNEL_HEADERS_6_0 - bool "Linux 6.0.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 - config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 @@ -393,7 +389,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.231" if BR2_KERNEL_HEADERS_5_4 default "5.10.167" if BR2_KERNEL_HEADERS_5_10 default "5.15.93" if BR2_KERNEL_HEADERS_5_15 - default "6.0.19" if BR2_KERNEL_HEADERS_6_0 default "6.1.11" if BR2_KERNEL_HEADERS_6_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From thomas.petazzoni at bootlin.com Mon Feb 13 22:18:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 23:18:03 +0100 Subject: [Buildroot] [git commit branch/next] package/highway: new package Message-ID: <20230220205259.72B05828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4733f9bd5774171b8309e5c42e0419a0e8264308 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Highway is a C++ library that provides portable SIMD/vector intrinsics. https://github.com/google/highway Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + package/Config.in | 1 + ...0001-Check-for-the-presence-of-sys-auxv.h.patch | 62 ++++++++++++++++++++++ package/highway/Config.in | 34 ++++++++++++ package/highway/highway.hash | 3 ++ package/highway/highway.mk | 50 +++++++++++++++++ support/testing/tests/package/test_highway.py | 22 ++++++++ 7 files changed, 174 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index dcc607ba60..28cad8f58f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1687,6 +1687,7 @@ F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/gnupg2/ +F: package/highway/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1709,6 +1710,7 @@ F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_gnupg2.py +F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py diff --git a/package/Config.in b/package/Config.in index 511e691ed3..d205bcd816 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2034,6 +2034,7 @@ menu "Other" source "package/gsl/Config.in" source "package/gtest/Config.in" source "package/gumbo-parser/Config.in" + source "package/highway/Config.in" source "package/jemalloc/Config.in" source "package/lapack/Config.in" source "package/libabseil-cpp/Config.in" diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch new file mode 100644 index 0000000000..df86798613 --- /dev/null +++ b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch @@ -0,0 +1,62 @@ +From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Wed, 23 Nov 2022 23:27:11 +0100 +Subject: [PATCH] Check for the presence of + +Not all gcc versions are providing . Checking for +HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not +sufficient and fail to build in some situations (it was observed for +some gcc armv7m toolchains). + +This patch adds a check for and include it only if present. + +Signed-off-by: Julien Olivain +--- + CMakeLists.txt | 3 +++ + hwy/detect_targets.h | 2 +- + hwy/targets.cc | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b6b14ab..df6b5ab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,6 +84,9 @@ check_cxx_source_compiles( + HWY_RISCV + ) + ++include(CheckIncludeFile) ++check_include_file(sys/auxv.h HAVE_SYS_AUXV_H) ++ + if (HWY_ENABLE_CONTRIB) + # Glob all the traits so we don't need to modify this file when adding + # additional special cases. +diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h +index 7f7e179..f0c6f94 100644 +--- a/hwy/detect_targets.h ++++ b/hwy/detect_targets.h +@@ -392,7 +392,7 @@ + #define HWY_HAVE_RUNTIME_DISPATCH 1 + // On Arm, currently only GCC does, and we require Linux to detect CPU + // capabilities. +-#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX ++#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX && HAVE_SYS_AUXV_H + #define HWY_HAVE_RUNTIME_DISPATCH 1 + #else + #define HWY_HAVE_RUNTIME_DISPATCH 0 +diff --git a/hwy/targets.cc b/hwy/targets.cc +index 2fde4db..abd6a94 100644 +--- a/hwy/targets.cc ++++ b/hwy/targets.cc +@@ -42,7 +42,7 @@ + #include + #endif // HWY_COMPILER_MSVC + +-#elif HWY_ARCH_ARM && HWY_OS_LINUX ++#elif HWY_ARCH_ARM && HWY_OS_LINUX && HAVE_SYS_AUXV_H + #include + #include + #endif // HWY_ARCH_* +-- +2.38.1 + diff --git a/package/highway/Config.in b/package/highway/Config.in new file mode 100644 index 0000000000..f4cef30e01 --- /dev/null +++ b/package/highway/Config.in @@ -0,0 +1,34 @@ +config BR2_PACKAGE_HIGHWAY + bool "highway" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_INSTALL_LIBSTDCPP + # For gcc bug 58969, see: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58969 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++11, GCC_BUG_58969 + help + Highway is a C++ library that provides portable SIMD/vector + intrinsics. + + https://github.com/google/highway + +if BR2_PACKAGE_HIGHWAY + +config BR2_PACKAGE_HIGHWAY_CONTRIB + bool "Enable Contrib" + help + Build Highway contrib library which contains extra + SIMD-related utilities: an image class with aligned rows, a + math library (16 functions already implemented, mostly + trigonometry), and functions for computing dot products and + sorting. + +config BR2_PACKAGE_HIGHWAY_EXAMPLES + bool "Enable Examples" + help + Build Highway examples + +endif + +comment "highway needs a toolchain w/ C++, gcc >= 7" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/highway/highway.hash b/package/highway/highway.hash new file mode 100644 index 0000000000..3ff468443e --- /dev/null +++ b/package/highway/highway.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db highway-1.0.2.tar.gz +sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE diff --git a/package/highway/highway.mk b/package/highway/highway.mk new file mode 100644 index 0000000000..ed7f6ca871 --- /dev/null +++ b/package/highway/highway.mk @@ -0,0 +1,50 @@ +################################################################################ +# +# highway +# +################################################################################ + +HIGHWAY_VERSION = 1.0.2 +HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) +HIGHWAY_LICENSE = Apache-2.0 +HIGHWAY_LICENSE_FILES = LICENSE +HIGHWAY_INSTALL_STAGING = YES + +HIGHWAY_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_PACKAGE_HIGHWAY_CONTRIB),y) +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=ON +else +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=OFF +endif + +ifeq ($(BR2_PACKAGE_HIGHWAY_EXAMPLES),y) +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=ON +# Examples are not installed by cmake. This binary can be useful for +# quick testing and debug. +define HIGHWAY_INSTALL_EXAMPLES + $(INSTALL) -m 0755 \ + $(@D)/examples/hwy_benchmark \ + $(TARGET_DIR)/usr/bin/hwy_benchmark +endef +HIGHWAY_POST_INSTALL_TARGET_HOOKS += HIGHWAY_INSTALL_EXAMPLES +else +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=OFF +endif + +ifeq ($(BR2_ARM_FPU_VFPV4),y) +HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=ON +else +HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=OFF +endif + +# Workaround for gcc bug 104028 on m68k. +# See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104028 +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_104028),y) +HIGHWAY_CXXFLAGS += -O0 +endif + +HIGHWAY_CONF_OPTS += \ + -DCMAKE_CXX_FLAGS="$(HIGHWAY_CXXFLAGS)" + +$(eval $(cmake-package)) diff --git a/support/testing/tests/package/test_highway.py b/support/testing/tests/package/test_highway.py new file mode 100644 index 0000000000..f32363e26f --- /dev/null +++ b/support/testing/tests/package/test_highway.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestHighway(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_HIGHWAY=y + BR2_PACKAGE_HIGHWAY_EXAMPLES=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("hwy_benchmark", timeout=20) From thomas.petazzoni at bootlin.com Mon Feb 13 22:18:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 23:18:05 +0100 Subject: [Buildroot] [git commit branch/next] package/libjxl: new package Message-ID: <20230220205259.837B27FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e648d399d8bd609697e78f13f7fa76be06d91a57 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libjxl is the reference implementation of JPEG XL (encoder and decoder). https://github.com/libjxl/libjxl Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/libjxl/Config.in | 25 +++++++++++++ package/libjxl/libjxl.hash | 4 +++ package/libjxl/libjxl.mk | 33 +++++++++++++++++ support/testing/tests/package/test_libjxl.py | 53 ++++++++++++++++++++++++++++ toolchain/Config.in | 5 +++ 7 files changed, 123 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 28cad8f58f..df2b98ad53 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1688,6 +1688,7 @@ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/gnupg2/ F: package/highway/ +F: package/libjxl/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1712,6 +1713,7 @@ F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py diff --git a/package/Config.in b/package/Config.in index d205bcd816..fff2fb7a93 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1603,6 +1603,7 @@ menu "Graphics" source "package/libgta/Config.in" source "package/libgtk2/Config.in" source "package/libgtk3/Config.in" + source "package/libjxl/Config.in" source "package/libmediaart/Config.in" source "package/libmng/Config.in" source "package/libpng/Config.in" diff --git a/package/libjxl/Config.in b/package/libjxl/Config.in new file mode 100644 index 0000000000..da04b89f9b --- /dev/null +++ b/package/libjxl/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_LIBJXL + bool "libjxl" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # highway + depends on BR2_TOOLCHAIN_HAS_ATOMIC # highway + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP # highway + # libjxl fail to link statically due to libatomic issue + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + select BR2_PACKAGE_BROTLI + select BR2_PACKAGE_HIGHWAY + select BR2_PACKAGE_LCMS2 + help + libjxl is the reference implementation of JPEG XL (encoder + and decoder). + + https://github.com/libjxl/libjxl + +comment "libjxl needs a toolchain with C++, threads, gcc >= 7, dynamic library" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash new file mode 100644 index 0000000000..e71d32e61d --- /dev/null +++ b/package/libjxl/libjxl.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e libjxl-0.7.0.tar.gz +sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE +sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk new file mode 100644 index 0000000000..cc24ba258c --- /dev/null +++ b/package/libjxl/libjxl.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# libjxl +# +################################################################################ + +LIBJXL_VERSION = 0.7.0 +LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) +LIBJXL_LICENSE = BSD-3-Clause +LIBJXL_LICENSE_FILES = LICENSE PATENTS +LIBJXL_CPE_ID_VENDOR = libjxl_project +LIBJXL_INSTALL_STAGING = YES + +LIBJXL_DEPENDENCIES = \ + brotli \ + lcms2 \ + highway + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +LIBJXL_DEPENDENCIES += libpng +endif + +LIBJXL_CONF_OPTS = \ + -DJPEGXL_BUNDLE_LIBPNG=OFF \ + -DJPEGXL_BUNDLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_DOXYGEN=OFF \ + -DJPEGXL_ENABLE_JNI=OFF \ + -DJPEGXL_ENABLE_MANPAGES=OFF \ + -DJPEGXL_ENABLE_OPENEXR=OFF \ + -DJPEGXL_ENABLE_SJPEG=OFF \ + -DJPEGXL_ENABLE_SKCMS=OFF + +$(eval $(cmake-package)) diff --git a/support/testing/tests/package/test_libjxl.py b/support/testing/tests/package/test_libjxl.py new file mode 100644 index 0000000000..b6d5ffc9ce --- /dev/null +++ b/support/testing/tests/package/test_libjxl.py @@ -0,0 +1,53 @@ +import os + +import infra.basetest + + +class TestLibJXL(infra.basetest.BRTest): + # infra.basetest.BASIC_TOOLCHAIN_CONFIG is not used as it is armv5 + # and the image encoding would take too long (several minutes). + # We also add GraphicsMagick to generate and compare images for + # the test. + 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.79" + 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_GRAPHICSMAGICK=y + BR2_PACKAGE_LIBJXL=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", "256M", "-initrd", img]) + self.emulator.login() + + ref = "/var/tmp/reference.ppm" + jxl = "/var/tmp/encoded.jxl" + dec = "/var/tmp/decoded.ppm" + + cmd = "gm convert IMAGE:LOGO {}".format(ref) + self.assertRunOk(cmd) + + cmd = "cjxl {} {}".format(ref, jxl) + self.assertRunOk(cmd, timeout=30) + + cmd = "djxl {} {}".format(jxl, dec) + self.assertRunOk(cmd) + + cmd = "gm compare -metric mse -maximum-error 1e-3 {} {}".format( + ref, dec) + self.assertRunOk(cmd) diff --git a/toolchain/Config.in b/toolchain/Config.in index 01215e0e96..08e4ccad9e 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -141,6 +141,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_68485 bool default y if BR2_microblaze +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81426 +config BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + bool + default y if BR2_sh + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83143 # Error: invalid operands (*UND* and .text sections) for `-' on sh4. # This bug no longer exists in gcc 10.x but reappeared on gcc 11.x and From peter at korsgaard.com Tue Feb 14 17:13:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:13:18 +0100 Subject: [Buildroot] [git commit branch/next] package/postgresql: fix legal info Message-ID: <20230220205259.D509681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3cd0132561ecfb471d76409f40aa565612f10208 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 57e297a215193c92f6a178139db53616f2ee23b5 forgot to update hash of COPYRIGHT file (year updated with https://github.com/postgres/postgres/commit/1fbcb1360bc19b89369209203ea7cc19b8cde224) Fixes: - http://autobuild.buildroot.org/results/93f40dc71619745ddc6741598c9a488c81ea440f Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index e6a9bd6658..3e89d3ec35 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ # From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated -sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT +sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT From peter at korsgaard.com Tue Feb 14 17:14:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:21 +0100 Subject: [Buildroot] [git commit branch/next] package/dnsmasq: bump version to 2.89 Message-ID: <20230220205259.E20FD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38101cea6ed695901ec54e52ae3db528f5e19979 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Tested-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/dnsmasq/dnsmasq.hash | 4 ++-- package/dnsmasq/dnsmasq.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index fd015d38ac..02ffb2656b 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.88.tar.xz.asc -sha256 23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3 dnsmasq-2.88.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc +sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 3945e4256a..58c5390433 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.88 +DNSMASQ_VERSION = 2.89 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" From peter at korsgaard.com Tue Feb 14 17:12:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:33 +0100 Subject: [Buildroot] [git commit branch/next] package/apr-util: security bump to version 1.6.3 Message-ID: <20230220205259.BF4628648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4231054b05436978795267330202f72be0d3a4d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next *) SECURITY: CVE-2022-25147 (cve.mitre.org) Integer Overflow or Wraparound vulnerability in apr_base64 functions of Apache Portable Runtime Utility (APR-util) allows an attacker to write beyond bounds of a buffer. https://downloads.apache.org/apr/Announcement-aprutil-1.x.html https://downloads.apache.org/apr/CHANGES-APR-UTIL-1.6 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/apr-util/apr-util.hash | 4 ++-- package/apr-util/apr-util.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apr-util/apr-util.hash b/package/apr-util/apr-util.hash index 59ef590109..7e2793cd77 100644 --- a/package/apr-util/apr-util.hash +++ b/package/apr-util/apr-util.hash @@ -1,4 +1,4 @@ -# From http://www.apache.org/dist/apr/apr-util-1.6.1.tar.bz2.sha256 -sha256 d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b apr-util-1.6.1.tar.bz2 +# From http://www.apache.org/dist/apr/apr-util-1.6.3.tar.bz2.sha256 +sha256 a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5 apr-util-1.6.3.tar.bz2 # Locally calculated sha256 ef5609d18601645ad6fe22c6c122094be40e976725c1d0490778abacc836e7a2 LICENSE diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index fb0735f5e7..02b6d5e277 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -4,7 +4,7 @@ # ################################################################################ -APR_UTIL_VERSION = 1.6.1 +APR_UTIL_VERSION = 1.6.3 APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2 APR_UTIL_SITE = https://archive.apache.org/dist/apr APR_UTIL_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:57:24 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/nginx-naxsi: fix build with pcre2 In-Reply-To: <20230219173536.615233-1-fontaine.fabrice@gmail.com> References: <20230219173536.615233-1-fontaine.fabrice@gmail.com> Message-ID: <20230220215724.538719dd@windsurf> On Sun, 19 Feb 2023 18:35:36 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump of nginx to version > 1.22.1 in commit 722b84eafa5e3d9540e0a80bae0c971a3a778358: > > /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c: In function 'ngx_http_process_basic_rule_buffer': > /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c:205:61: error: invalid use of incomplete typedef 'ngx_regex_t' {aka 'struct pcre2_real_code_8'} > 205 | (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, > | ^~ > > Fixes: > - http://autobuild.buildroot.org/results/7fff888bd36710e2d2f5bb39a38597e8c04305ce > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Fix patch number Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 20 20:56:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:33 -0000 Subject: [Buildroot] [git commit branch/next] package/webkitgtk: security bump to version 2.38.3 Message-ID: <20230220205222.B16A78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d64a089a64aff7c8cbf197beea460d644646243d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bugfix release, with a security patch for CVE-2022-42799, CVE-2022-42823, CVE-2022-42824, CVE-2022-42852, CVE-2022-42856, CVE-2022-42863, CVE-2022-42867, CVE-2022-46691, CVE-2022-46692, CVE-2022-46698, CVE-2022-46699 and CVE-2022-46700. Release notes: https://webkitgtk.org/2022/10/20/webkitgtk2.38.1-released.html https://webkitgtk.org/2022/11/04/webkitgtk2.38.2-released.html https://webkitgtk.org/2022/12/22/webkitgtk2.38.3-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2022-0010.html https://webkitgtk.org/security/WSA-2022-0011.html Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index c2512be9c6..eff7f5c18f 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.0.tar.xz.sums -md5 a69cd8fc05f7299458b4faf1bc99b875 webkitgtk-2.38.0.tar.xz -sha1 6dcb65b8dc56c52f086bfeecfca7920e9cc78348 webkitgtk-2.38.0.tar.xz -sha256 f9ce6375a3b6e1329b0b609f46921e2627dc7ad6224b37b967ab2ea643bc0fbd webkitgtk-2.38.0.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums +md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz +sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz +sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 336744954e..b1bca7b88a 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.0 +WEBKITGTK_VERSION = 2.38.3 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:56:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:33 -0000 Subject: [Buildroot] [git commit branch/next] package/arp-scan: bump to version 1.10.0 Message-ID: <20230220205211.116D18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1975c531764828fbdaff673e4cf1f25ea009aa2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Use official tarball and so drop autoreconf - libcap is an optional dependency since https://github.com/royhills/arp-scan/commit/923f123a281139f1ec3daceb1db4bc7317ec6978 https://github.com/royhills/arp-scan/releases/tag/1.10.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/arp-scan/arp-scan.hash | 2 +- package/arp-scan/arp-scan.mk | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/arp-scan/arp-scan.hash b/package/arp-scan/arp-scan.hash index b18c6ceb38..3a2977f906 100644 --- a/package/arp-scan/arp-scan.hash +++ b/package/arp-scan/arp-scan.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b9b75ceaef6348f5951b06c773ec7a243a9e780e160eafebc369f9c27f6a7d3f arp-scan-1.9.8.tar.gz +sha256 a078fe8711ecbb8b99121c3d8be26ae7e7f339f11010ef61318be4f33394d012 arp-scan-1.10.0.tar.gz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/arp-scan/arp-scan.mk b/package/arp-scan/arp-scan.mk index 73d1b99bc7..89644be9d3 100644 --- a/package/arp-scan/arp-scan.mk +++ b/package/arp-scan/arp-scan.mk @@ -4,12 +4,11 @@ # ################################################################################ -ARP_SCAN_VERSION = 1.9.8 -ARP_SCAN_SITE = $(call github,royhills,arp-scan,$(ARP_SCAN_VERSION)) +ARP_SCAN_VERSION = 1.10.0 +ARP_SCAN_SITE = https://github.com/royhills/arp-scan/releases/download/$(ARP_SCAN_VERSION) ARP_SCAN_LICENSE = GPL-3.0+ ARP_SCAN_LICENSE_FILES = COPYING ARP_SCAN_DEPENDENCIES = libpcap -ARP_SCAN_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) ARP_SCAN_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" @@ -17,4 +16,11 @@ endif ARP_SCAN_CONF_ENV = pgac_cv_snprintf_long_long_int_format='%lld' +ifeq ($(BR2_PACKAGE_LIBCAP),y) +ARP_SCAN_DEPENDENCIES += libcap +ARP_SCAN_CONF_OPTS += --with-libcap +else +ARP_SCAN_CONF_OPTS += --without-libcap +endif + $(eval $(autotools-package)) From peter at korsgaard.com Mon Feb 20 20:56:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:34 -0000 Subject: [Buildroot] [git commit branch/next] package/wpebackend-fdo: bump to version 1.14.0 Message-ID: <20230220205223.231BD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76dfd8d0278d75dabfe2871cd4e683b7a2790d26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This new version contains only small fixes after 1.12.1. Release notes: https://wpewebkit.org/release/wpebackend-fdo-1.14.0.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index 49c60fce0f..e2f2c6c89f 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.12.1.tar.xz.sums -md5 494f4a5b2bd89dacef37b69534b2e1ce wpebackend-fdo-1.12.1.tar.xz -sha1 72a85e4615e085926f7ad8fc8414f9c6a878ef28 wpebackend-fdo-1.12.1.tar.xz -sha256 45aa833c44ec292f31fa943b01b8cc75e54eb623ad7ba6a66fc2f118fe69e629 wpebackend-fdo-1.12.1.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.14.0.tar.xz.sums +md5 ea62dfa9ecb366598a837d7446ed48ac wpebackend-fdo-1.14.0.tar.xz +sha1 1500be9212381a404f4a46b22b90a9880ba11c01 wpebackend-fdo-1.14.0.tar.xz +sha256 e75b0cb2c7145448416e8696013d8883f675c66c11ed750e06865efec5809155 wpebackend-fdo-1.14.0.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk index 2e2bdee94e..afe37b086e 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.12.1 +WPEBACKEND_FDO_VERSION = 1.14.0 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:57:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:02 -0000 Subject: [Buildroot] [git commit branch/next] package/python-maturin: bump to version 0.14.9 Message-ID: <20230220205230.5A8A086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3949fe31120917b2bac139fbfc6f285ef0f780ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index 9d68751c03..b104b1fbbe 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 383f60977a330ec8699a51c37ea9c5175ee7e95fc36b06d9415e0eec1f3acaf0 maturin-0.14.5.tar.gz +sha256 59157a06c0a482aec750d64746f2b23e556ce3ec62d9cdce74fcb7b4658b722b maturin-0.14.9.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index 4570ad4535..3484e09d22 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.5 +PYTHON_MATURIN_VERSION = 0.14.9 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/36/83/2bdec738921e253d774ab8b9e99f4540a406ad0d8a1442c84575e5506686 +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/90/f9/f4242c0e8bc5def9a7135c12574449dbb411ecc595cf72202ca97a79c2ad PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From peter at korsgaard.com Mon Feb 20 20:57:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:03 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Daniel Lang for package/libsigc Message-ID: <20230220205230.92D5A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=189543e4ab6c421001209423cce45c75e3242d75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8e1d68c026..e8e0dffcd3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -639,6 +639,7 @@ F: package/dacapo/ N: Daniel Lang F: package/dbus-cxx/ +F: package/libsigc/ F: package/paho-mqtt-cpp/ N: Damien Lanson From peter at korsgaard.com Mon Feb 20 20:57:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:03 -0000 Subject: [Buildroot] [git commit branch/next] package/gcnano-binaries: bump version to 6.4.9 Message-ID: <20230220205213.75DAB81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ddf15854deb5f03a4c98afa6c86f9f3b4d6893c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update to the latest version of the gcnano-binaries blobs, which are compatible with the last v5.15-stm32mp-r2 kernel from the STMicroelectronics BSP. The management of libraries links have now changed. We moved on from a version with several links present but few of them missing to no links at all. Now, all the links are made by the build system. The loop mechanism to make them are imported from the ST Yocto layer. The packageconfig have also changed, no need to update prefix and version value anymore. Signed-off-by: Kory Maincent Signed-off-by: Peter Korsgaard --- package/gcnano-binaries/gcnano-binaries.hash | 2 +- package/gcnano-binaries/gcnano-binaries.mk | 30 +++++++++++----------------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/package/gcnano-binaries/gcnano-binaries.hash b/package/gcnano-binaries/gcnano-binaries.hash index 1ed66e3753..7bb942e6da 100644 --- a/package/gcnano-binaries/gcnano-binaries.hash +++ b/package/gcnano-binaries/gcnano-binaries.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d3aebbc87ca27e743fdd21d71025cdf0761af748907bbdd7b193262eb48ab3c7 gcnano-binaries-a20611434ef048d3d0c04f55b6cd7d75a2156d43.tar.gz +sha256 b122a0cd7a1bd2cee8c6117b259ef977a765d24e48655f639694cbef471da99b gcnano-binaries-0ac1a89d7a59d040a69745a85f0da7e98644cc4b.tar.gz sha256 7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57 EULA diff --git a/package/gcnano-binaries/gcnano-binaries.mk b/package/gcnano-binaries/gcnano-binaries.mk index d9c47bf64e..83261f3b7c 100644 --- a/package/gcnano-binaries/gcnano-binaries.mk +++ b/package/gcnano-binaries/gcnano-binaries.mk @@ -4,10 +4,10 @@ # ################################################################################ -GCNANO_BINARIES_LIB_VERSION = 6.4.7 +GCNANO_BINARIES_LIB_VERSION = 6.4.9 GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION) -GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20220524 -GCNANO_BINARIES_VERSION = a20611434ef048d3d0c04f55b6cd7d75a2156d43 +GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20221206 +GCNANO_BINARIES_VERSION = 0ac1a89d7a59d040a69745a85f0da7e98644cc4b GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION)) GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms @@ -38,31 +38,25 @@ GCNANO_BINARIES_POST_EXTRACT_HOOKS += GCNANO_BINARIES_EXTRACT_HELPER GCNANO_BINARIES_MODULE_MAKE_OPTS = \ KERNEL_DIR=$(LINUX_DIR) \ - SOC_PLATFORM=st-st \ + SOC_PLATFORM=st-mp1 \ AQROOT=$(@D) \ DEBUG=0 GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION) -# This creates: -# libGLESv2.so.2 -> libGLESv2.so -# libGLESv1_CM.so.1 -> libGLESv1_CM.so -# symlinks, as most OpenGL implementations have them, and they are -# expected by some users such as libepoxy. define GCNANO_BINARIES_INSTALL cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/drivers/ ; \ find . -type f -exec $(INSTALL) -D -m 0755 {} $(1)/usr/lib/{} \; ; \ - find . -type l -exec cp -a {} $(1)/usr/lib \; - ln -sf libGLESv2.so $(1)/usr/lib/libGLESv2.so.2 - ln -sf libGLESv1_CM.so $(1)/usr/lib/libGLESv1_CM.so.1 + for sharelib in *.so.*; do \ + dev_lib_name=`echo $${sharelib} | awk -F'.so' '{print $$1}'`.so ; \ + link_name=`$(TARGET_OBJDUMP) -x $${sharelib} 2>/dev/null | grep SONAME | sed 's/.* //'` ; \ + ln -sf $${sharelib} $(1)/usr/lib/$${dev_lib_name} ; \ + ln -sf $${sharelib} $(1)/usr/lib/$${link_name} ; \ + done mkdir -p $(1)/usr/include cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/* $(1)/usr/include/ - ln -sf gbm/gbm.h $(1)/usr/include/gbm.h - cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/ ; \ - for file in *.pc ; do \ - sed -e "s|#PREFIX#|/usr|" -e "s|#VERSION#|21.1.1|" $$file > $$file.temp ; \ - $(INSTALL) -D -m 0644 $$file.temp $(1)/usr/lib/pkgconfig/$$file ; \ - done + mkdir -p $(1)/usr/lib/pkgconfig/ + cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/* $(1)/usr/lib/pkgconfig/ endef define GCNANO_BINARIES_INSTALL_TARGET_CMDS From peter at korsgaard.com Mon Feb 20 20:57:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:22 -0000 Subject: [Buildroot] [git commit branch/next] package/memcached: bump to version 1.6.17 Message-ID: <20230220205215.101B58648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f81b1358fc115fc854a9c9699daaca4be713f873 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Refresh second patch - Drop fourth patch (already in version) https://github.com/memcached/memcached/wiki/ReleaseNotes1617 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/memcached/0002-check-for-sys-auxv.h.patch | 10 +- ...ure-ac-use-pkg-config-to-retrieve-openssl.patch | 181 --------------------- package/memcached/memcached.hash | 6 +- package/memcached/memcached.mk | 2 +- 4 files changed, 9 insertions(+), 190 deletions(-) diff --git a/package/memcached/0002-check-for-sys-auxv.h.patch b/package/memcached/0002-check-for-sys-auxv.h.patch index 8c41bb4f01..a7d0dfdd00 100644 --- a/package/memcached/0002-check-for-sys-auxv.h.patch +++ b/package/memcached/0002-check-for-sys-auxv.h.patch @@ -37,14 +37,14 @@ index 26df879..05e61ff 100644 --- a/crc32c.c +++ b/crc32c.c @@ -273,7 +273,7 @@ void crc32c_init(void) { - } } --#elif defined(__aarch64__) && defined(__linux__) -+#elif defined(__aarch64__) && defined(__linux__) && defined(HAVE_SYS_AUX_H) + #elif defined(__aarch64__) && (defined(__linux__) || defined(__APPLE__)) +-#if defined(__linux__) ++#if defined(__linux__) && defined(HAVE_SYS_AUX_H) #include - - #if defined(HWCAP_CRC32) + #elif defined(__APPLE__) + #include -- 2.35.1 diff --git a/package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch b/package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch deleted file mode 100644 index 402fa03b3b..0000000000 --- a/package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 656dedad48c81541060448d008b90290196263c5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 6 Sep 2020 23:38:19 +0200 -Subject: [PATCH] configure.ac: use pkg-config to retrieve openssl - -Use pkg-config to retrieve openssl dependencies such as -latomic or -lz - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/memcached/memcached/commit/656dedad48c81541060448d008b90290196263c5] ---- - README.md | 2 +- - configure.ac | 133 ++++++++++++++++++++++++++------------------------- - 2 files changed, 69 insertions(+), 66 deletions(-) - -diff --git a/README.md b/README.md -index 3ce1bc2156..8fe067b767 100644 ---- a/README.md -+++ b/README.md -@@ -21,7 +21,7 @@ list to ask questions, github issues aren't seen by everyone! - * libseccomp (optional, experimental, linux) - enables process restrictions for - better security. Tested only on x86-64 architectures. - * openssl (optional) - enables TLS support. need relatively up to date -- version. -+ version. pkg-config is needed to find openssl dependencies (such as -lz). - - ## Environment - -diff --git a/configure.ac b/configure.ac -index a0851f2131..2959a86c89 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -437,80 +437,83 @@ AC_ARG_WITH(libssl, - dnl ---------------------------------------------------------------------------- - dnl libssl detection. swiped from libevent. modified for openssl detection. - -+PKG_PROG_PKG_CONFIG - OPENSSL_URL=https://www.openssl.org/ - if test "x$enable_tls" = "xyes"; then -- AC_CACHE_CHECK([for libssl directory], ac_cv_libssl_dir, [ -- saved_LIBS="$LIBS" -- saved_LDFLAGS="$LDFLAGS" -- saved_CPPFLAGS="$CPPFLAGS" -- le_found=no -- for ledir in $trylibssldir "" $prefix /usr/local ; do -+ PKG_CHECK_MODULES(OPENSSL, openssl, [LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_CFLAGS"], [ -+ AC_CACHE_CHECK([for libssl directory], ac_cv_libssl_dir, [ -+ saved_LIBS="$LIBS" -+ saved_LDFLAGS="$LDFLAGS" -+ saved_CPPFLAGS="$CPPFLAGS" -+ le_found=no -+ for ledir in $trylibssldir "" $prefix /usr/local ; do -+ LDFLAGS="$saved_LDFLAGS" -+ LIBS="-lssl -lcrypto $saved_LIBS" -+ -+ # Skip the directory if it isn't there. -+ if test ! -z "$ledir" -a ! -d "$ledir" ; then -+ continue; -+ fi -+ if test ! -z "$ledir" ; then -+ if test -d "$ledir/lib" ; then -+ LDFLAGS="-L$ledir/lib $LDFLAGS" -+ else -+ LDFLAGS="-L$ledir $LDFLAGS" -+ fi -+ if test -d "$ledir/include" ; then -+ CPPFLAGS="-I$ledir/include $CPPFLAGS" -+ else -+ CPPFLAGS="-I$ledir $CPPFLAGS" -+ fi -+ fi -+ # Can I compile and link it? -+ AC_TRY_LINK([#include -+ #include -+ #include -+ #include ], [ SSL_CTX* ssl_ctx = SSL_CTX_new(TLS_server_method()); -+ assert(OPENSSL_VERSION_NUMBER >= 0x10100000L);], -+ [ libssl_linked=yes ], [ libssl_linked=no ]) -+ if test $libssl_linked = yes; then -+ if test ! -z "$ledir" ; then -+ ac_cv_libssl_dir=$ledir -+ _myos=`echo $target_os | cut -f 1 -d .` -+ AS_IF(test "$SUNCC" = "yes" -o "x$_myos" = "xsolaris2", -+ [saved_LDFLAGS="$saved_LDFLAGS -Wl,-R$ledir/lib"], -+ [AS_IF(test "$GCC" = "yes", -+ [saved_LDFLAGS="$saved_LDFLAGS -Wl,-rpath,$ledir/lib"])]) -+ else -+ ac_cv_libssl_dir="(system)" -+ fi -+ le_found=yes -+ break -+ fi -+ done -+ LIBS="$saved_LIBS" - LDFLAGS="$saved_LDFLAGS" -- LIBS="-lssl -lcrypto $saved_LIBS" -+ CPPFLAGS="$saved_CPPFLAGS" -+ if test $le_found = no ; then -+ AC_MSG_ERROR([libssl (at least version 1.1.0) is required. You can get it from $OPENSSL_URL - -- # Skip the directory if it isn't there. -- if test ! -z "$ledir" -a ! -d "$ledir" ; then -- continue; -+ If it's already installed, specify its path using --with-libssl=/dir/ -+ ]) - fi -- if test ! -z "$ledir" ; then -- if test -d "$ledir/lib" ; then -- LDFLAGS="-L$ledir/lib $LDFLAGS" -- else -- LDFLAGS="-L$ledir $LDFLAGS" -- fi -- if test -d "$ledir/include" ; then -- CPPFLAGS="-I$ledir/include $CPPFLAGS" -- else -- CPPFLAGS="-I$ledir $CPPFLAGS" -- fi -+ ]) -+ LIBS="-lssl -lcrypto $LIBS" -+ if test $ac_cv_libssl_dir != "(system)"; then -+ if test -d "$ac_cv_libssl_dir/lib" ; then -+ LDFLAGS="-L$ac_cv_libssl_dir/lib $LDFLAGS" -+ le_libdir="$ac_cv_libssl_dir/lib" -+ else -+ LDFLAGS="-L$ac_cv_libssl_dir $LDFLAGS" -+ le_libdir="$ac_cv_libssl_dir" - fi -- # Can I compile and link it? -- AC_TRY_LINK([#include -- #include -- #include -- #include ], [ SSL_CTX* ssl_ctx = SSL_CTX_new(TLS_server_method()); -- assert(OPENSSL_VERSION_NUMBER >= 0x10100000L);], -- [ libssl_linked=yes ], [ libssl_linked=no ]) -- if test $libssl_linked = yes; then -- if test ! -z "$ledir" ; then -- ac_cv_libssl_dir=$ledir -- _myos=`echo $target_os | cut -f 1 -d .` -- AS_IF(test "$SUNCC" = "yes" -o "x$_myos" = "xsolaris2", -- [saved_LDFLAGS="$saved_LDFLAGS -Wl,-R$ledir/lib"], -- [AS_IF(test "$GCC" = "yes", -- [saved_LDFLAGS="$saved_LDFLAGS -Wl,-rpath,$ledir/lib"])]) -- else -- ac_cv_libssl_dir="(system)" -- fi -- le_found=yes -- break -+ if test -d "$ac_cv_libssl_dir/include" ; then -+ CPPFLAGS="-I$ac_cv_libssl_dir/include $CPPFLAGS" -+ else -+ CPPFLAGS="-I$ac_cv_libssl_dir $CPPFLAGS" - fi -- done -- LIBS="$saved_LIBS" -- LDFLAGS="$saved_LDFLAGS" -- CPPFLAGS="$saved_CPPFLAGS" -- if test $le_found = no ; then -- AC_MSG_ERROR([libssl (at least version 1.1.0) is required. You can get it from $OPENSSL_URL -- -- If it's already installed, specify its path using --with-libssl=/dir/ -- ]) - fi - ]) -- LIBS="-lssl -lcrypto $LIBS" -- if test $ac_cv_libssl_dir != "(system)"; then -- if test -d "$ac_cv_libssl_dir/lib" ; then -- LDFLAGS="-L$ac_cv_libssl_dir/lib $LDFLAGS" -- le_libdir="$ac_cv_libssl_dir/lib" -- else -- LDFLAGS="-L$ac_cv_libssl_dir $LDFLAGS" -- le_libdir="$ac_cv_libssl_dir" -- fi -- if test -d "$ac_cv_libssl_dir/include" ; then -- CPPFLAGS="-I$ac_cv_libssl_dir/include $CPPFLAGS" -- else -- CPPFLAGS="-I$ac_cv_libssl_dir $CPPFLAGS" -- fi -- fi - fi - - if test "x$enable_static" = "xyes"; then diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 3bdd1e5e33..78875dde66 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.6.16.tar.gz.sha1 -sha1 724f31c3462fb6b07264d72d0043fd65545fd84a memcached-1.6.16.tar.gz +# From http://www.memcached.org/files/memcached-1.6.17.tar.gz.sha1 +sha1 e25639473e15f1bd9516b915fb7e03ab8209030f memcached-1.6.17.tar.gz # Locally computed -sha256 3051a93bf1dd0c3af2d0e589ff6ef6511f876385a35b18e9ff8741e4a1ab34da memcached-1.6.16.tar.gz +sha256 2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224 memcached-1.6.17.tar.gz sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 7b4069e820..7183da6c14 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.6.16 +MEMCACHED_VERSION = 1.6.17 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From yann.morin.1998 at free.fr Mon Feb 20 20:57:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:23 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pytest-asyncio: bump to version 0.20.3 Message-ID: <20230220205235.7AB0286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cec8c511127ccb6223a133399a88b3fd5cd8ded9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-pytest-asyncio/python-pytest-asyncio.hash | 4 ++-- package/python-pytest-asyncio/python-pytest-asyncio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.hash b/package/python-pytest-asyncio/python-pytest-asyncio.hash index b683c60553..051670aa51 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.hash +++ b/package/python-pytest-asyncio/python-pytest-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest-asyncio/json -md5 894109d45a7b6f46718bbe4611aa7817 pytest-asyncio-0.20.1.tar.gz -sha256 626699de2a747611f3eeb64168b3575f70439b06c3d0206e6ceaeeb956e65519 pytest-asyncio-0.20.1.tar.gz +md5 dce438c7b0081d7f580b5a79d7105570 pytest-asyncio-0.20.3.tar.gz +sha256 83cbf01169ce3e8eb71c6c278ccb0574d1a7a3bb8eaaf5e50e0ad342afb33b36 pytest-asyncio-0.20.3.tar.gz # Locally computed sha256 checksums sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.mk b/package/python-pytest-asyncio/python-pytest-asyncio.mk index b70e0ad0f4..c94c9ea876 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.mk +++ b/package/python-pytest-asyncio/python-pytest-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_ASYNCIO_VERSION = 0.20.1 +PYTHON_PYTEST_ASYNCIO_VERSION = 0.20.3 PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/9e/8f/5a918ac4e2366b61156e16fa9bfb3be52401d81f5309efb1f4e04d99ac39 +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/6e/06/38b0ca5d53582bb49697626975b5540435ea064762d852b5c66646c729e9 PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:58:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:22 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx8mqevk: update codeaurora URLs to github Message-ID: <20230220205221.3D1378648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a01cb853fe978d85037d9a4dd762113c9132dc4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mqevk_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8mqevk_defconfig b/configs/freescale_imx8mqevk_defconfig index 7f5dd87b5f..e3f88dc44c 100644 --- a/configs/freescale_imx8mqevk_defconfig +++ b/configs/freescale_imx8mqevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-evk" @@ -19,16 +18,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:23 -0000 Subject: [Buildroot] [git commit branch/next] configs/imx8mn_bsh_smm_s2_pro_defconfig: new defconfig Message-ID: <20230220205242.D919E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=498797acce390a8c91b6a3c306a4655e83ae9f6f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next BSH SMM S2 PRO (SystemMaster S2 Pro) Board is an add-on board which provide input and output interfaces to a dedicated carrier board. It is designed mainly to provide graphical/video and connectivity interfaces to the appliance. Board support package includes the following components: - mainline Linux kernel 6.1.6 - mainline U-Boot 2022-07 - Default packages from buildroot https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ Add Ariel D'Alessandro and Dario Binacchi as co-maintainer, we work together on platform mainline Build and tested using: docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 Cc: Ariel D'Alessandro Cc: Jagan Teki Cc: Heiko Thiery Cc: Giulio Benetti Reviewed-by: Giulio Benetti Reviewed-by: Heiko Thiery Signed-off-by: Michael Trimarchi Tested-by: Ariel D'Alessandro Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++ .../{ => common}/imx8mn-bsh-smm-s2/linux.fragment | 0 board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf | 4 ++ board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh | 23 +++++++ board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg | 17 +++++ board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh | 7 +++ board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh | 3 + board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt | 73 ++++++++++++++++++++++ configs/imx8mn_bsh_smm_s2_defconfig | 2 +- ...2_defconfig => imx8mn_bsh_smm_s2_pro_defconfig} | 19 +++--- 10 files changed, 142 insertions(+), 10 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 2e187d7b03..e942b4b3f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -225,6 +225,8 @@ F: configs/snps_archs38_haps_defconfig F: configs/snps_archs38_hsdk_defconfig N: Ariel D'Alessandro +F: board/bsh/ +F: configs/imx8mn_bsh_smm_s2_pro_defconfig F: package/axfsutils/ F: package/mali-t76x/ @@ -688,6 +690,7 @@ F: package/xinetd/ N: Dario Binacchi F: board/bsh/ F: configs/imx8mn_bsh_smm_s2_defconfig +F: configs/imx8mn_bsh_smm_s2_pro_defconfig F: package/sscep/ F: package/uuu/ @@ -2122,6 +2125,7 @@ F: package/python-pyzmq/ N: Michael Trimarchi F: board/bsh/ F: configs/imx8mn_bsh_smm_s2_defconfig +F: configs/imx8mn_bsh_smm_s2_pro_defconfig F: package/python-spidev/ N: Michael Vetter diff --git a/board/bsh/imx8mn-bsh-smm-s2/linux.fragment b/board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment similarity index 100% rename from board/bsh/imx8mn-bsh-smm-s2/linux.fragment rename to board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf b/board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf new file mode 100644 index 0000000000..9111354742 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh b/board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh new file mode 100755 index 0000000000..17b20f0097 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +if [ $# -eq 0 ]; then + OUTPUT_DIR=output +else + OUTPUT_DIR=$1 +fi + +if ! test -d "${OUTPUT_DIR}" ; then + echo "ERROR: no output directory specified." + echo "Usage: $0 OUTPUT_DIR" + echo "" + echo "Arguments:" + echo " OUTPUT_DIR The Buildroot output directory." + exit 1 +fi + +IMAGES_DIR=${OUTPUT_DIR}/images + +${OUTPUT_DIR}/host/bin/uuu -v -b emmc_all \ + ${IMAGES_DIR}/flash.bin \ + ${IMAGES_DIR}/sdcard.img + diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg b/board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg new file mode 100644 index 0000000000..10c52548cd --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 32K + } + + partition rootfs { + offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh b/board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh b/board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh new file mode 100755 index 0000000000..3452fd4501 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt b/board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt new file mode 100644 index 0000000000..5763f164fe --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt @@ -0,0 +1,73 @@ +i.MX8MN BSH SMM S2 PRO +====================== + +How to build it +--------------- + +Configure buildroot: + + $ make imx8mn_bsh_smm_s2_pro_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +------------------- + +After building, the output/images directory contains: + + output/images/ + ????????? bl31.bin + ????????? Image + ????????? flash.bin + ????????? ddr3* + ????????? rootfs.ext2 + ????????? rootfs.ext4 -> rootfs.ext2 + ????????? rootfs.tar + ????????? sdcard.img + ????????? u-boot.bin + ????????? u-boot-nodtb.bin + ????????? u-boot-spl.bin + + +Preparing the board +------------------- + +Plug the USB type A to micro B cable into the USB Debug +Connector (DBG UART). Use serial port settings 115200 8N1 +to access the debug console. + +Plug another USB type A to micro B cable into the USB-OTG +Connector (USB1). This connection is used to flash the board +firmware using the Freescale/NXP UUU tool. + +Connect the power supply/adaptor to the DC Power Jack (labelled ++5V). + + +Flashing the emmc card image +---------------------------- + +Power up the board by switching on the Power ON Switch, which is +placed right next to the DC Jack. + +Enter the following U-Boot commands on the debug serial console: + + $ fastboot usb 0 + +Flash the images on eMMC. On your computer, run: + + $ board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh output/ + + +Booting the board +----------------- + +By default the bootloader will search for the first valid image, +starting with the internal eMMC. diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig index 4b03d2e89e..9b8ac8bfe2 100644 --- a/configs/imx8mn_bsh_smm_s2_defconfig +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -7,7 +7,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.6" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/imx8mn-bsh-smm-s2/linux.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2" BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_pro_defconfig similarity index 69% copy from configs/imx8mn_bsh_smm_s2_defconfig copy to configs/imx8mn_bsh_smm_s2_pro_defconfig index 4b03d2e89e..ebef4e5932 100644 --- a/configs/imx8mn_bsh_smm_s2_defconfig +++ b/configs/imx8mn_bsh_smm_s2_pro_defconfig @@ -1,35 +1,35 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y -BR2_GLOBAL_PATCH_DIR="board/bsh/imx8mn-bsh-smm-s2/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2/post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.6" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/imx8mn-bsh-smm-s2/linux.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y BR2_PACKAGE_FIRMWARE_IMX=y BR2_PACKAGE_FIRMWARE_IMX_DDR3=y -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 -BR2_TARGET_ROOTFS_UBIFS_RT_NONE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -38,4 +38,5 @@ BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UUU=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:23 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx8qmmek: update codeaurora URLs to github Message-ID: <20230220205221.7A7A98648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47f2896fe36b4439b80b149f86f1975c53b1e5bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8qmmek_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8qmmek_defconfig b/configs/freescale_imx8qmmek_defconfig index 8a0e866cee..75777646df 100644 --- a/configs/freescale_imx8qmmek_defconfig +++ b/configs/freescale_imx8qmmek_defconfig @@ -4,9 +4,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qm-mek.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qm-mek" @@ -20,16 +19,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:24 -0000 Subject: [Buildroot] [git commit branch/next] package/python-trio: new package Message-ID: <20230220205243.87A3D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c09481f7f0419e8a69a2813052bc56895a598353 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-trio/Config.in | 12 ++++++++++++ package/python-trio/python-trio.hash | 7 +++++++ package/python-trio/python-trio.mk | 14 ++++++++++++++ 5 files changed, 35 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b686dbd87a..9fdc66f60b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1402,6 +1402,7 @@ F: package/python-sockjs/ F: package/python-terminaltables/ F: package/python-tinycss2/ F: package/python-tomli/ +F: package/python-trio/ F: package/python-typeguard/ F: package/python-typing-inspect/ F: package/python-uhid/ diff --git a/package/Config.in b/package/Config.in index 195398b844..aa6bb7bce3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1306,6 +1306,7 @@ menu "External python modules" source "package/python-tqdm/Config.in" source "package/python-traitlets/Config.in" source "package/python-treq/Config.in" + source "package/python-trio/Config.in" source "package/python-twisted/Config.in" source "package/python-txaio/Config.in" source "package/python-txdbus/Config.in" diff --git a/package/python-trio/Config.in b/package/python-trio/Config.in new file mode 100644 index 0000000000..0aa53c90ca --- /dev/null +++ b/package/python-trio/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_TRIO + bool "python-trio" + select BR2_PACKAGE_PYTHON_ASYNC_GENERATOR # runtime + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_IDNA # runtime + select BR2_PACKAGE_PYTHON_OUTCOME # runtime + select BR2_PACKAGE_PYTHON_SNIFFIO # runtime + select BR2_PACKAGE_PYTHON_SORTEDCONTAINERS # runtime + help + A friendly Python library for async concurrency and I/O. + + https://github.com/python-trio/trio diff --git a/package/python-trio/python-trio.hash b/package/python-trio/python-trio.hash new file mode 100644 index 0000000000..487194662e --- /dev/null +++ b/package/python-trio/python-trio.hash @@ -0,0 +1,7 @@ +# md5, sha256 from https://pypi.org/pypi/trio/json +md5 f7dbfa6a8722065f09da188641d8ed93 trio-0.22.0.tar.gz +sha256 ce68f1c5400a47b137c5a4de72c7c901bd4e7a24fbdebfe9b41de8c6c04eaacf trio-0.22.0.tar.gz +# Locally computed sha256 checksums +sha256 418d025e1284311f2690263e6efa6bf51585e5741818ece63e5862487e505bb9 LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE2 +sha256 faa301d72dcc023b432bd77dc08a773ca3449e5c27440b9d66eb46fb8500b430 LICENSE.MIT diff --git a/package/python-trio/python-trio.mk b/package/python-trio/python-trio.mk new file mode 100644 index 0000000000..80da203c15 --- /dev/null +++ b/package/python-trio/python-trio.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-trio +# +################################################################################ + +PYTHON_TRIO_VERSION = 0.22.0 +PYTHON_TRIO_SOURCE = trio-$(PYTHON_TRIO_VERSION).tar.gz +PYTHON_TRIO_SITE = https://files.pythonhosted.org/packages/0b/b8/1b81d2149c3e2c25900d40b8e6c8d3ca502a3cc844b90c962b0854aaf3f3 +PYTHON_TRIO_SETUP_TYPE = setuptools +PYTHON_TRIO_LICENSE = Apache-2.0 or MIT +PYTHON_TRIO_LICENSE_FILES = LICENSE LICENSE.APACHE2 LICENSE.MIT + +$(eval $(python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:58:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:24 -0000 Subject: [Buildroot] [git commit branch/next] package/modem-manager: disable man pages Message-ID: <20230220205221.C808E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bca2c28fc9ed2ebca91e6f1347d947389997a4c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modem-manager/modem-manager.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 5b8b9c5576..f1fc17523a 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -13,6 +13,7 @@ MODEM_MANAGER_SELINUX_MODULES = modemmanager MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIES) host-libxslt MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = \ + -Dman=false \ -Dpowerd_suspend_resume=false \ -Dtests=false \ -Dudevdir=/usr/lib/udev From peter at korsgaard.com Mon Feb 20 20:58:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:52 -0000 Subject: [Buildroot] [git commit branch/next] boot/ti-k3-r5-loader: drop bogus TI_K3_R5_LOADER_BOARD Message-ID: <20230220205223.DD4CF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90e65e46b7c00218058e32efd079df291b736c4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "0189bcb47c boot/ti-k3-r5-loader: new package" added an unused define. The define value is calculated from an inexistent option BR2_TARGET_TI_K3_R5_LOADER_BOARD, so drop the line. Cc: Anand Gadiyar Cc: Xuanhao Shi Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 422ab20d71..afa309aa98 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -26,7 +26,6 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ $(BR2_BISON_HOST_DEPENDENCY) \ $(BR2_FLEX_HOST_DEPENDENCY) -TI_K3_R5_LOADER_BOARD = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD)) ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) From peter at korsgaard.com Mon Feb 20 20:59:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:10 -0000 Subject: [Buildroot] [git commit branch/next] package/falcosecurity-libs: drop bogus FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD Message-ID: <20230220205225.4DBF1828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbb6a55e6e03ea0b4e0a9b744f289e11da963c62 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "a15e35c4eb falcosecurity-libs: add new package" uses the infras kernel-module and generic-package. Neither of them support _SUPPORTS_IN_SOURCE_BUILD, only the CMake infra does. So drop the bogus symbol. Cc: Francis Laniel Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/falcosecurity-libs/falcosecurity-libs.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/falcosecurity-libs/falcosecurity-libs.mk b/package/falcosecurity-libs/falcosecurity-libs.mk index f2c389948f..92d5c61832 100644 --- a/package/falcosecurity-libs/falcosecurity-libs.mk +++ b/package/falcosecurity-libs/falcosecurity-libs.mk @@ -9,7 +9,6 @@ FALCOSECURITY_LIBS_SITE = $(call github,falcosecurity,libs,$(FALCOSECURITY_LIBS_ FALCOSECURITY_LIBS_LICENSE = Apache-2.0 (userspace), MIT or GPL-2.0 (driver) FALCOSECURITY_LIBS_LICENSE_FILES = COPYING driver/MIT.txt driver/GPL2.txt FALCOSECURITY_LIBS_CPE_ID_VENDOR = falco -FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD = NO FALCOSECURITY_LIBS_DEPENDENCIES = \ c-ares \ From peter at korsgaard.com Mon Feb 20 20:59:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:12 -0000 Subject: [Buildroot] [git commit branch/next] package/lrzsz: drop bogus LRZSZ_BUILD_HOOKS Message-ID: <20230220205225.8E7F68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5fde4abc8d67ac2317b1de7a1b4cde8091f4e3c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "4f3f291a3b lrzsz: convert to autotools infrastructure" converted the package to use autotools infra but added a define that is never called. Drop the bogus define. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/lrzsz/lrzsz.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 45c88619e0..3897975d73 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -18,10 +18,6 @@ define LRZSZ_POST_CONFIGURE_HOOKS $(SED) "s~\(#define ENABLE_SYSLOG.*\)~/* \1 */~;" $(@D)/config.h endef -define LRZSZ_BUILD_HOOKS - $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(@D) -endef - define LRZSZ_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz $(INSTALL) -m 0755 -D $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz From peter at korsgaard.com Mon Feb 6 13:28:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:28:08 +0100 Subject: [Buildroot] [git commit branch/next] package/sunxi-mali-utgard: properly handle legacy for renamed options Message-ID: <20230220205249.CB1B28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efc223abd4fe764f8af8238aec67e8cb700db45e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "6a7a652b14 package/sunxi-mali-utgard: rename from sunxi-mali-mainline" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2022.02, following the example described in the beginning of the file. Cc: Giulio Benetti Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/sunxi-mali-utgard/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 53fe2f0b97..4bfebe3f89 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -761,20 +761,22 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 bool "sunxi-mali-mainline-r6p2 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 bool "sunxi-mali-mainline-r8p1 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_QT5WEBKIT_EXAMPLES bool "qt5webkit-examples removed" diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in index ff49ea03f1..59ac21f5ab 100644 --- a/package/sunxi-mali-utgard/Config.in +++ b/package/sunxi-mali-utgard/Config.in @@ -20,6 +20,8 @@ config BR2_PACKAGE_PROVIDES_LIBGLES choice prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 # legacy + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 # legacy default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help Select the version of the userspace module. From peter at korsgaard.com Mon Feb 20 20:59:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:26 -0000 Subject: [Buildroot] [git commit branch/next] package/php: security bump version to 8.1.14 Message-ID: <20230220205226.B9AC6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16168abd26b06656bcc24c2b511c29a0f047ebf4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://www.php.net/ChangeLog-8.php#8.1.14 Fixes CVE 2022-31631: https://bugs.php.net/bug.php?id=81740 Signed-off-by: Bernd Kuhls 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 461dc36031..23ec84f19f 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 b15ef0ccdd6760825604b3c4e3e73558dcf87c75ef1d68ef4289d8fd261ac856 php-8.1.13.tar.xz +sha256 e16e47a872d58685913ac848ce92ec49f42c1828110c98c65fb6265a08724a1a php-8.1.14.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 1fdf5c68a2..23dd4ba96f 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.1.13 +PHP_VERSION = 8.1.14 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 6 13:40:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:40:32 +0100 Subject: [Buildroot] [git commit branch/next] Config.in.legacy: select BR2_LEGACY from _XF86_INPUT_KEYBOARD Message-ID: <20230220205249.E4B648648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00410ab668833d822f645fffd782ce11253457b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 1100ead7b318 (package/x11r7/xdriver_xf86-input-keyboard: remove package) added a legacy symbol for BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD, but forgot to select BR2_LEGACY. Fix that. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 1 + 1 file changed, 1 insertion(+) diff --git a/Config.in.legacy b/Config.in.legacy index 4bfebe3f89..191a209eeb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -210,6 +210,7 @@ config BR2_PACKAGE_QEMU_CUSTOM_TARGETS_WRAP config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD bool "xf86-input-keyboard removed" + select BR2_LEGACY help The X.org keyboard input driver no longer support Linux. From peter at korsgaard.com Mon Feb 20 20:59:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:27 -0000 Subject: [Buildroot] [git commit branch/next] package/hiredis: fix debug install Message-ID: <20230220205226.C8FDA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ff5f7ff0a5ffb8de98d132740fe2fbe4fb71b5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next hiredis suffix its debug libraries with "d" since version 1.1.0 and https://github.com/redis/hiredis/commit/dde6916b42a4723b364355eff8fbb477723a789a resulting in the following build failure with collectd since commit bd7e90779861bb603fc1cca03f6fad4d951f7bd9: redis . . . . . . . . no (symbol 'redisCommand' not found) (dependency error) Fixes: - http://autobuild.buildroot.org/results/394ebf2b6816c69dbdd7901491c0e3fd52befedc Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/hiredis/hiredis.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index d59933845c..f79b6c757a 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -11,7 +11,9 @@ HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING HIREDIS_CPE_ID_VENDOR = redislabs HIREDIS_INSTALL_STAGING = YES -HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON +# Set CMAKE_BUILD_TYPE to Release or the libraries will be suffixed with "d" +# resulting in a build failure with collectd +HIREDIS_CONF_OPTS = -DCMAKE_BUILD_TYPE=Release -DDISABLE_TESTS=ON ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy) HIREDIS_CONF_OPTS += -DENABLE_SSL=ON From peter at korsgaard.com Mon Feb 6 15:30:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:19 +0100 Subject: [Buildroot] [git commit branch/next] package/libvirt: drop reference to legacy BR2_PACKAGE_QEMU_CUSTOM_TARGETS Message-ID: <20230220205250.0541B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01ce9e95eb4f7fb731b20f3973edd582d4640084 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 44be514b21fd9409 (package/qemu: refactor target emulator selection) dropped BR2_PACKAGE_QEMU_CUSTOM_TARGETS, but didn't remove the reference from libvirt. Fix that. Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index f0687cd5db..3f4fc70e62 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -73,7 +73,7 @@ config BR2_PACKAGE_LIBVIRT_QEMU select BR2_PACKAGE_HWDATA_PCI_IDS # libpciaccess select BR2_PACKAGE_LIBSECCOMP select BR2_PACKAGE_QEMU - select BR2_PACKAGE_QEMU_SYSTEM if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = "" + select BR2_PACKAGE_QEMU_SYSTEM select BR2_PACKAGE_YAJL help QEMU/KVM support From peter at korsgaard.com Mon Feb 6 15:30:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:20 +0100 Subject: [Buildroot] [git commit branch/next] utils/check-symbols: new script Message-ID: <20230220205250.3DA9081979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c5472ace2490b2db7f26a79d12b01a8bb5a42dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This script checks for inconsistencies on symbols declared in Config.in and used in .mk files. Currently it checks only symbols following the pattern BR2_\w+ . The script first gets the list of all files in the repository (using git ls-files like 'make check-flake8' already do). Then it parses all relevant files, searching for symbol definitions and usages, and add entries into a database. At the end, the database is searched for inconsistencies: - symbol that is part of "choice" and is referenced with "select"; - legacy symbol being referenced in packages; - legacy symbol being redefined in packages; - symbol referenced but not defined; - symbol defined but not referenced; - legacy symbol that has a Note stating it is referenced by a package (for legacy handling) but is referenced in the package without a comment "# legacy"; - legacy symbol that has a Note stating it is referenced by a package but it is not actually referenced. There is also a debug parameter --search that dumps any filename or symbol entries from the database that matches a regexp. Sample usages: $ utils/check-symbols $ utils/docker-run utils/check-symbols $ utils/check-symbols --search 'GETTEXT\b|\/openssl' At same time the script is created: - add unit tests for it, they can be run using: utils/docker-run python3 -m pytest -v utils/checksymbolslib/ - add two more GitLab CI jobs: check-symbols (to check current tree using the script) and check-check-symbols (to check the script against its unit tests) Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski [Peter: print warnings to stderr, rename change_current_dir() to change_to_top_dir()] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/misc/gitlab-ci.yml.in | 8 + support/scripts/generate-gitlab-ci-yml | 2 +- utils/check-symbols | 78 ++++++ utils/checksymbolslib/__init__.py | 0 utils/checksymbolslib/br.py | 140 +++++++++++ utils/checksymbolslib/db.py | 205 +++++++++++++++ utils/checksymbolslib/file.py | 83 +++++++ utils/checksymbolslib/kconfig.py | 139 +++++++++++ utils/checksymbolslib/makefile.py | 100 ++++++++ utils/checksymbolslib/test_db.py | 286 +++++++++++++++++++++ utils/checksymbolslib/test_file.py | 152 ++++++++++++ utils/checksymbolslib/test_kconfig.py | 438 +++++++++++++++++++++++++++++++++ utils/checksymbolslib/test_makefile.py | 304 +++++++++++++++++++++++ utils/checksymbolslib/test_util.py | 15 ++ 15 files changed, 1951 insertions(+), 1 deletion(-) Patch is too large, so refusing to show it From peter at korsgaard.com Mon Feb 20 20:59:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:28 -0000 Subject: [Buildroot] [git commit branch/next] package/wireshark: add zlib optional dependency Message-ID: <20230220205226.E6887828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6365126e731a1d0bf40eea91cb51b98b6918ecf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next zlib is an optional dependency which is enabled by default since at least version 1.8.0 and https://github.com/wireshark/wireshark/commit/7133f6944dc26740f5ebf56c2ca33be86a6e0f09 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 5da344fc55..f7fd72558e 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -157,6 +157,13 @@ else WIRESHARK_CONF_OPTS += -DBUILD_sdjournal=OFF endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +WIRESHARK_CONF_OPTS += -DENABLE_ZLIB=ON +WIRESHARK_DEPENDENCIES += zlib +else +WIRESHARK_CONF_OPTS += -DENABLE_ZLIB=OFF +endif + ifeq ($(BR2_PACKAGE_ZSTD),y) WIRESHARK_CONF_OPTS += -DENABLE_ZSTD=ON WIRESHARK_DEPENDENCIES += zstd From peter at korsgaard.com Mon Feb 20 20:59:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:29 -0000 Subject: [Buildroot] [git commit branch/next] package/wireshark: add libcap optional dependency Message-ID: <20230220205227.12312828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f70149c80cda5d2f6bbe2266b247d52818391cda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libcap is an optional dependency which is enabled by default since at least version 1.8.0 and https://github.com/wireshark/wireshark/commit/9250a69a9976617c735679aa5383e53802e5b43e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index c1efef2280..d9314fb211 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -65,6 +65,13 @@ else WIRESHARK_CONF_OPTS += -DENABLE_GNUTLS=OFF endif +ifeq ($(BR2_PACKAGE_LIBCAP),y) +WIRESHARK_CONF_OPTS += -DENABLE_CAP=ON +WIRESHARK_DEPENDENCIES += libcap +else +WIRESHARK_CONF_OPTS += -DENABLE_CAP=OFF +endif + ifeq ($(BR2_PACKAGE_LIBKRB5),y) WIRESHARK_CONF_OPTS += -DENABLE_KERBEROS=ON WIRESHARK_DEPENDENCIES += libkrb5 From yann.morin.1998 at free.fr Mon Feb 20 20:59:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:52 -0000 Subject: [Buildroot] [git commit branch/next] package/zstd: disable ccache for host package Message-ID: <20230220205228.AEFD2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9fba87b8d708caa51ac674a56b9f2a50ed5fdc36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We need to disable ccache when building host-zstd as the upcoming ccache update depends on host-zstd. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: introduce HOST_ZSTD_ENV] Signed-off-by: Yann E. MORIN --- package/zstd/zstd.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index e8f6315222..73bb97a793 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -96,14 +96,18 @@ define ZSTD_INSTALL_TARGET_CMDS endef HOST_ZSTD_OPTS += PREFIX=$(HOST_DIR) +HOST_ZSTD_ENV = $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) + +# We are a ccache dependency, so we can't use ccache +HOST_ZSTD_ENV += CC="$(HOSTCC_NOCCACHE)" CXX="$(HOSTCXX_NOCCACHE)" define HOST_ZSTD_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ + $(HOST_ZSTD_ENV) $(MAKE) $(HOST_ZSTD_OPTS) \ -C $(@D) zstd-release lib-release endef define HOST_ZSTD_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ + $(HOST_ZSTD_ENV) $(MAKE) $(HOST_ZSTD_OPTS) \ -C $(@D) install endef From thomas.petazzoni at bootlin.com Tue Feb 7 13:44:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:44:02 +0100 Subject: [Buildroot] [git commit branch/next] package/dahdi-linux: update URL in Config.in help text Message-ID: <20230220205252.9DC7C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e06975b38047fe1ef47650248f154ecf88fe09b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next http://www.asterisk.org/downloads/dahdi no longer works, use the Github page instead. Signed-off-by: Thomas Petazzoni --- package/dahdi-linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dahdi-linux/Config.in b/package/dahdi-linux/Config.in index 7b6ce79422..b6086fdc6c 100644 --- a/package/dahdi-linux/Config.in +++ b/package/dahdi-linux/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_DAHDI_LINUX DAHDI Linux is the open source device driver framework used to interface Asterisk with telephony hardware. - http://www.asterisk.org/downloads/dahdi + https://github.com/asterisk/dahdi-linux comment "dahdi-linux needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL From peter at korsgaard.com Mon Feb 20 20:59:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:53 -0000 Subject: [Buildroot] [git commit branch/next] boot/barebox: bump version to 2022.12.0 Message-ID: <20230220205229.16110828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=693c88d9d276c16e7a3aad333cb20e56cfffbf20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 726f0f980b..3961c69c56 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 "2022.04.0" + bool "2022.12.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2022.04.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2022.12.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 3a92f7fd82..161fc43d43 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 e4970687cf7943eadf71b1ae6d344ff7 barebox-2022.04.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2022.12.0.tar.bz2.md5 +md5 e4bf25cbf1e0b0c9a67ee56214617b9c barebox-2022.12.0.tar.bz2 # Locally calculated -sha256 f751b506deb0a5d82682a85cf65e329dd562e48ea057533dc5c8876120a09ebc barebox-2022.04.0.tar.bz2 +sha256 9f570d4ae089560bd6c17b2b7d21cdb6557ecb00612c77ecee72ac47575a6b74 barebox-2022.12.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING From thomas.petazzoni at bootlin.com Tue Feb 7 12:56:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:56:25 +0100 Subject: [Buildroot] [git commit branch/next] package/python-magic-wormhole-transit-relay: new package Message-ID: <20230220205252.6BEF08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=037dbe64d861e3d5580ecac608bd278afc9bbcc6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Transit Relay server for Magic-Wormhole. This repository implements the Magic-Wormhole "Transit Relay", a server that helps clients establish bulk-data transit connections even when both are behind NAT boxes. Each side makes a TCP connection to this server and presents a handshake. Two connections with identical handshakes are glued together, allowing them to pretend they have a direct connection. https://github.com/magic-wormhole/magic-wormhole-transit-relay Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-magic-wormhole-transit-relay/Config.in | 15 +++++++++++++++ .../python-magic-wormhole-transit-relay.hash | 5 +++++ .../python-magic-wormhole-transit-relay.mk | 14 ++++++++++++++ 5 files changed, 36 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index afc079a609..5776d6d7a5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1696,6 +1696,7 @@ F: package/python-gnupg/ F: package/python-hkdf/ F: package/python-magic-wormhole/ F: package/python-magic-wormhole-mailbox-server/ +F: package/python-magic-wormhole-transit-relay/ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ diff --git a/package/Config.in b/package/Config.in index 2ef403168a..b5418c56f6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1122,6 +1122,7 @@ menu "External python modules" source "package/python-m2crypto/Config.in" source "package/python-magic-wormhole/Config.in" source "package/python-magic-wormhole-mailbox-server/Config.in" + source "package/python-magic-wormhole-transit-relay/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-magic-wormhole-transit-relay/Config.in b/package/python-magic-wormhole-transit-relay/Config.in new file mode 100644 index 0000000000..1a743c10fe --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY + bool "python-magic-wormhole-transit-relay" + select BR2_PACKAGE_PYTHON_TWISTED # runtime + help + Transit Relay server for Magic-Wormhole. + + This repository implements the Magic-Wormhole "Transit + Relay", a server that helps clients establish bulk-data + transit connections even when both are behind NAT + boxes. Each side makes a TCP connection to this server and + presents a handshake. Two connections with identical + handshakes are glued together, allowing them to pretend they + have a direct connection. + + https://github.com/magic-wormhole/magic-wormhole-transit-relay diff --git a/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash new file mode 100644 index 0000000000..f131477a40 --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole-transit-relay/json +md5 aa575a4e22b3d5099674ba88b136a9a2 magic-wormhole-transit-relay-0.2.1.tar.gz +sha256 cb4801b46890eaff97286e0e3fec62d1d52ffe317d140083b6336a1fb4e8fa5e magic-wormhole-transit-relay-0.2.1.tar.gz +# Locally computed sha256 checksums +sha256 d70f6469bb210c2aa4c0dfd74f498ef5f0467a137d8296479088e7243c5884eb LICENSE diff --git a/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk new file mode 100644 index 0000000000..e4ffe6e7a6 --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole-transit-relay +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_VERSION = 0.2.1 +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SOURCE = magic-wormhole-transit-relay-$(PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SITE = https://files.pythonhosted.org/packages/21/c9/be25bb30e327037e009657960fc594d089b118c0d81cc6a200cad1bb3852 +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From peter at korsgaard.com Mon Feb 20 20:59:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:54 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: remove Bartosz Golaszewski Message-ID: <20230220205229.061668648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24c532c9f6885174ddf1a9621cc1d55412139676 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next It's been a while since I've even used buildroot at all and I don't really have any spare cycles to spend on maintaining its packages. Let's face reality and drop me from the DEVELOPERS file. Signed-off-by: Bartosz Golaszewski Signed-off-by: Peter Korsgaard --- DEVELOPERS | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 86e3f0e7b1..8e1d68c026 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -283,17 +283,6 @@ F: package/ttyd/ F: package/qt5/qt5scxml/ F: package/qt5/qt5webview/ -N: Bartosz Golaszewski -F: package/autoconf-archive/ -F: package/doxygen/ -F: package/libgpiod/ -F: package/libserialport/ -F: package/libsigrok/ -F: package/libsigrokdecode/ -F: package/libzip/ -F: package/pulseview/ -F: package/sigrok-cli/ - N: Baruch Siach F: board/solidrun/clearfog_gt_8k/ F: configs/solidrun_clearfog_gt_8k_defconfig From thomas.petazzoni at bootlin.com Tue Feb 7 13:44:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:44:02 +0100 Subject: [Buildroot] [git commit branch/next] package/dahdi-linux: fix build with kernel >= 6.1 Message-ID: <20230220205252.926AB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33bdf7bb037c05863aa69bbe219e1cb78d596a3a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with kernel >= 6.1 In file included from ./include/linux/string.h:20, from ./include/linux/bitmap.h:11, from ./include/linux/cpumask.h:12, from ./include/linux/mm_types_task.h:14, from ./include/linux/mm_types.h:5, from ./include/linux/buildid.h:5, from ./include/linux/module.h:14, from /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:24: ./arch/powerpc/include/asm/string.h:27:22: note: expected ???void *??? but argument is of type ???const unsigned char *??? 27 | extern void * memcpy(void *,const void *,__kernel_size_t); | ^~~~~~ /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:661:9: error: too many arguments to function ???netif_napi_add??? 661 | netif_napi_add(netdev, &wc->napi, &wctc4xxp_poll, 64); | ^~~~~~~~~~~~~~ In file included from ./include/net/inet_sock.h:19, from ./include/linux/udp.h:16, from /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:38: ./include/linux/netdevice.h:2562:1: note: declared here 2562 | netif_napi_add(struct net_device *dev, struct napi_struct *napi, | ^~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/d7ce103a886329c68c04ebe05571be8f95a873ce Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0004-next-fix-kernel-6-1-build.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch b/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch new file mode 100644 index 0000000000..b910c4b775 --- /dev/null +++ b/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch @@ -0,0 +1,32 @@ +From a759a578277bde98eba7ef4bf86bdf819a900de9 Mon Sep 17 00:00:00 2001 +From: John Thomson +Date: Sun, 23 Oct 2022 13:42:52 +1000 +Subject: [PATCH] fix kernel 6.1 build + +kernel 6.1 includes b48b89f9c189 ("net: drop the weight argument from netif_napi_add") [0] + +[0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b48b89f9c189d24eb5e2b4a0ac067da5a24ee86d + +Signed-off-by: John Thomson +[Retrieved from: +https://github.com/asterisk/dahdi-linux/pull/14/commits/a759a578277bde98eba7ef4bf86bdf819a900de9] +Signed-off-by: Fabrice Fontaine +--- + include/dahdi/kernel.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h +index 35e93bc4..fd64a15e 100644 +--- a/include/dahdi/kernel.h ++++ b/include/dahdi/kernel.h +@@ -58,6 +58,10 @@ + + #include + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++#define netif_napi_add netif_napi_add_weight ++#endif ++ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) + #include + #include From peter at korsgaard.com Mon Feb 20 20:59:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:55 -0000 Subject: [Buildroot] [git commit branch/next] package/go: bump version to 1.19.5 Message-ID: <20230220205229.282D48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab8a8066f5cf397d98c76a06757a9523d25d6500 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next go1.19.5 (released 2023-01-10) includes fixes to the compiler, the linker, and the crypto/x509, net/http, sync/atomic, and syscall packages. https://github.com/golang/go/issues?q=milestone%3AGo1.19.5+label%3ACherryPickApproved 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 d35db10213..4c22f0f274 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368 go1.19.4.src.tar.gz +sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 44e0c622c9..d3ed07f03b 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.4 +GO_VERSION = 1.19.5 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Tue Feb 7 13:52:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 14:52:27 +0100 Subject: [Buildroot] [git commit branch/next] package/pkg-generic.mk: only check for virtual package conflicts when building Message-ID: <20230220205252.B76608648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7231701a290ba447fde9807ba9d260022ddfc8e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 2f8ba39edf..5d618c6b39 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1182,10 +1182,12 @@ ifeq ($$($$($(2)_KCONFIG_VAR)),y) # Ensure the calling package is the declared provider for all the virtual # packages it claims to be an implementation of. +ifeq ($(BR_BUILDING),y) ifneq ($$($(2)_PROVIDES),) $$(foreach pkg,$$($(2)_PROVIDES),\ $$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep))) endif +endif # Register package as a reverse-dependencies of all its dependencies $$(eval $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),\ From thomas.petazzoni at bootlin.com Mon Feb 20 20:59:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:59:56 -0000 Subject: [Buildroot] [git commit branch/next] docs/website: update sponsors.html page Message-ID: <20230220205228.EC10E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fce9f0eea00ed9aaeca12c1529ea380617baa477 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Thank Smile for sponsoring the Buildroot Developers Meeting of February 2023 by providing the meeting room - Thank Armadeus and Logilin for their financial sponsoring in 2022 - Move older sponsors to the "Past sponsors" section - Remove section about the Buildroot.org domain sponsor, as that sponsoring ended in 2019. Signed-off-by: Thomas Petazzoni --- docs/website/images/armadeus-systems-logo.png | Bin 0 -> 43363 bytes docs/website/sponsors.html | 69 +++++++++++++++++--------- 2 files changed, 46 insertions(+), 23 deletions(-) diff --git a/docs/website/images/armadeus-systems-logo.png b/docs/website/images/armadeus-systems-logo.png new file mode 100644 index 0000000000..9b6080fb13 Binary files /dev/null and b/docs/website/images/armadeus-systems-logo.png differ diff --git a/docs/website/sponsors.html b/docs/website/sponsors.html index 2f3f6309ae..9c17bed0c7 100644 --- a/docs/website/sponsors.html +++ b/docs/website/sponsors.html @@ -9,18 +9,40 @@
          +
          - - + +
          - Tap2Open - financially sponsored the Buildroot Association - in 2020.
          + Smile sponsored the + Buildroot project by hosting + the Buildroot + Developers Meeting of February 2023 in Brussels, + after the FOSDEM + conference. +
          +
          +
          +
          + +
          +
          +
          +
          + + + +
          +
          + Armadeus + Systems financially sponsored + the Buildroot + Association in 2022.
          @@ -36,7 +58,7 @@
          Logilin financially sponsored the Buildroot Association - in 2020.
          + in 2022.
        @@ -44,23 +66,6 @@
    -
    -
    Sponsor of the Buildroot.org domain
    -
    -
    -

    The Buildroot community would like to thank - Zillabit for - donating the buildroot.org domain name and sponsoring - the registration fees 2009 - 2019.

    -
    -
    - - - -
    -
    -
    -
    Past sponsors
    @@ -343,6 +348,24 @@
    +
    +
    +
    +
    +
    + + + +
    +
    + Tap2Open + financially sponsored the Buildroot Association + in 2020.
    +
    +
    +
    +
    +
    From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit branch/next] package/termcolor: new package Message-ID: <20230220205252.E80238648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e4402d4efb86256a3cff9c17c03f7300e427e1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/termcolor/Config.in | 12 ++++++++++++ package/termcolor/termcolor.hash | 3 +++ package/termcolor/termcolor.mk | 14 ++++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 830dab56f0..9cc080f7a4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2789,6 +2789,7 @@ F: package/most/ N: TIAN Yuanhao F: package/cli11/ F: package/open-isns/ +F: package/termcolor/ N: Tan En De F: package/libkcapi/ diff --git a/package/Config.in b/package/Config.in index 3773901552..e1a1b153b1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2176,6 +2176,7 @@ menu "Text and terminal handling" source "package/readline/Config.in" source "package/slang/Config.in" source "package/tclap/Config.in" + source "package/termcolor/Config.in" source "package/utf8proc/Config.in" endmenu diff --git a/package/termcolor/Config.in b/package/termcolor/Config.in new file mode 100644 index 0000000000..979ad61d81 --- /dev/null +++ b/package/termcolor/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TERMCOLOR + bool "termcolor" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + Termcolor is a header-only C++ library for printing colored + messages to the terminal. + + https://github.com/ikalnytskyi/termcolor + +comment "termcolor needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/termcolor/termcolor.hash b/package/termcolor/termcolor.hash new file mode 100644 index 0000000000..dede06c9b0 --- /dev/null +++ b/package/termcolor/termcolor.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 435994c32557674469404cb1527c283fdcf45746f7df75fd2996bb200d6a759f termcolor-2.1.0.tar.gz +sha256 bab0f53c36b248df22e2298ddf9eeea14b28783f187fcbff6a38f2c47b3a3a7d LICENSE diff --git a/package/termcolor/termcolor.mk b/package/termcolor/termcolor.mk new file mode 100644 index 0000000000..0374ce8b73 --- /dev/null +++ b/package/termcolor/termcolor.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# termcolor +# +################################################################################ + +TERMCOLOR_VERSION = 2.1.0 +TERMCOLOR_SITE = $(call github,ikalnytskyi,termcolor,v$(TERMCOLOR_VERSION)) +TERMCOLOR_LICENSE = BSD-3-Clause +TERMCOLOR_LICENSE_FILES = LICENSE +TERMCOLOR_INSTALL_STAGING = YES +TERMCOLOR_INSTALL_TARGET = NO + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit branch/next] package/reproc: new package Message-ID: <20230220205253.238B88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26dd70e954a7c9142b078837ab1bbfad54d0e5cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/reproc/Config.in | 14 ++++++++++++++ package/reproc/reproc.hash | 3 +++ package/reproc/reproc.mk | 17 +++++++++++++++++ 5 files changed, 36 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e8ddad71cd..d7c4d03c4c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2790,6 +2790,7 @@ N: TIAN Yuanhao F: package/cli11/ F: package/libsolv/ F: package/open-isns/ +F: package/reproc/ F: package/termcolor/ F: package/tl-expected/ diff --git a/package/Config.in b/package/Config.in index 6ca4c61959..06d0a05854 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2126,6 +2126,7 @@ endif source "package/protozero/Config.in" source "package/qhull/Config.in" source "package/qlibc/Config.in" + source "package/reproc/Config.in" source "package/riemann-c-client/Config.in" source "package/shapelib/Config.in" source "package/skalibs/Config.in" diff --git a/package/reproc/Config.in b/package/reproc/Config.in new file mode 100644 index 0000000000..a4e9c893b1 --- /dev/null +++ b/package/reproc/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_REPROC + bool "reproc" + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # uses wchar_t + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + help + reproc is a cross-platform C/C++ library that simplifies + starting, stopping and communicating with external programs. + + https://github.com/DaanDeMeyer/reproc + +comment "reproc needs a toolchain w/ threads, wchar" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/reproc/reproc.hash b/package/reproc/reproc.hash new file mode 100644 index 0000000000..6da6d0a0bb --- /dev/null +++ b/package/reproc/reproc.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 55c780f7faa5c8cabd83ebbb84b68e5e0e09732de70a129f6b3c801e905415dd reproc-14.2.4.tar.gz +sha256 8f91afbe266bebac2cf1b220e0e67ace4cb9a97d2b21940abef20eb6691cfa91 LICENSE diff --git a/package/reproc/reproc.mk b/package/reproc/reproc.mk new file mode 100644 index 0000000000..3167911c4d --- /dev/null +++ b/package/reproc/reproc.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# reproc +# +################################################################################ + +REPROC_VERSION = 14.2.4 +REPROC_SITE = $(call github,DaanDeMeyer,reproc,v$(REPROC_VERSION)) +REPROC_LICENSE = MIT +REPROC_LICENSE_FILES = LICENSE +REPROC_INSTALL_STAGING = YES + +ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),yy) # C++11 +REPROC_CONF_OPTS += -DREPROC++=ON +endif + +$(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 8 11:13:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 12:13:44 +0100 Subject: [Buildroot] [git commit branch/next] package/gstreamer1/gstd: bump to version 0.15.0 Message-ID: <20230220205255.8D93881979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbd06adac50e304f413689febf676911ae29d967 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patches which are now upstream. Add new libedit dependency. License hash changed due to LGPL-2.1+ relicense: https://github.com/RidgeRun/gstd-1.x/commit/2cb6bb8b6c3bba24098a83557c5fa58a8a15ff58 https://github.com/RidgeRun/gstd-1.x/commit/76d9fb61a05973b30220fcae5ff87de9d618ea49 Signed-off-by: James Hilliard [Peter: add BSD-3-Clause license change commit for clarity] Signed-off-by: Peter Korsgaard --- ...e-gstd-check-user-xenv.sh-for-systemd-se.patch} | 0 .../gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch | 27 -------- ...ve-meson-python-module-for-python-install.patch | 78 ---------------------- .../0004-meson.build-add-missing-init-subdir.patch | 28 -------- ...uild-use-dependency-function-for-readline.patch | 51 -------------- package/gstreamer1/gstd/Config.in | 5 +- package/gstreamer1/gstd/gstd.hash | 4 +- package/gstreamer1/gstd/gstd.mk | 5 +- 8 files changed, 8 insertions(+), 190 deletions(-) diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch b/package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch similarity index 100% rename from package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch rename to package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch diff --git a/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch b/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch deleted file mode 100644 index 79a65ffbdc..0000000000 --- a/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f1c953b9077619a83ab21c24dc343c7e21cd220d Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 01:46:25 -0600 -Subject: [PATCH] Fix gstd_chmod.sh DESTDIR path. - -This should fix the chmod path when cross compiling. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/247] ---- - gstd/gstd_chmod.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gstd/gstd_chmod.sh b/gstd/gstd_chmod.sh -index 8e58bce..fa7fa80 100755 ---- a/gstd/gstd_chmod.sh -+++ b/gstd/gstd_chmod.sh -@@ -3,4 +3,4 @@ - # $1 mode - # $2 file - --chmod $1 $2 -+chmod $1 ${DESTDIR}/$2 --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch b/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch deleted file mode 100644 index a27d79a0e9..0000000000 --- a/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1067f6138e947d18fd835e4a39f229ae2293f864 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 23:37:03 -0600 -Subject: [PATCH] Use native meson python module for python install. - -Signed-off-by: James Hilliard -[upstreeam: https://github.com/RidgeRun/gstd-1.x/pull/253] -Signed-off-by: Yann E. MORIN ---- - libgstc/meson.build | 4 +++- - libgstc/python/meson.build | 26 +++++++++++++++++++++++++- - meson_options.txt | 2 ++ - 3 files changed, 30 insertions(+), 2 deletions(-) - -diff --git a/libgstc/meson.build b/libgstc/meson.build -index e94dcd1..582cbb8 100644 ---- a/libgstc/meson.build -+++ b/libgstc/meson.build -@@ -1,2 +1,4 @@ - subdir('c') --subdir('python') -+if not get_option('enable-python').disabled() -+ subdir('python') -+endif -diff --git a/libgstc/python/meson.build b/libgstc/python/meson.build -index 057114b..24e3242 100644 ---- a/libgstc/python/meson.build -+++ b/libgstc/python/meson.build -@@ -1 +1,25 @@ --run_command('pip3', 'install', '.') -+pymod = import('python') -+python = pymod.find_installation( -+ get_option('with-python-version'), -+ required : get_option('enable-python').enabled(), -+ disabler : true -+) -+ -+pythonver = python.language_version() -+if pythonver.version_compare('<3.7') -+ error('Python @0@ is not supported anymore, please port your code to python3.7 or newer.'.format(python.language_version())) -+endif -+ -+pygstc_src_files = [ -+ 'pygstc/__init__.py', -+ 'pygstc/gstc.py', -+ 'pygstc/gstcerror.py', -+ 'pygstc/logger.py', -+ 'pygstc/tcp.py' -+] -+ -+python.install_sources( -+ pygstc_src_files, -+ subdir : 'pygstc', -+ pure : true -+) -diff --git a/meson_options.txt b/meson_options.txt -index f50e540..25292e6 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,6 +4,7 @@ option('enable-examples', type : 'feature', value : 'auto', yield : true, descri - option('enable-gtk-doc', type : 'boolean', value : false, description : 'Use gtk-doc to build documentation') - option('enable-systemd', type : 'feature', value : 'auto', description : 'Enable systemd gstd.service install') - option('enable-initd', type : 'feature', value : 'disabled', description : 'Enable init script install') -+option('enable-python', type : 'feature', value : 'auto', description : 'Install the pygstc library') - - # String options - option('with-gstd-runstatedir', type : 'string', value : '${prefix}/var/run/gstd', description : 'Specify the location of the gstd\'s PID file') -@@ -11,6 +12,7 @@ option('with-gstd-logstatedir', type : 'string', value : '${prefix}/var/log/gstd - option('with-gstd-systemddir', type : 'string', value : 'Systemd default systemduserunitdir', description : 'Specify the location of gstd.service file') - option('with-gstd-initddir', type : 'string', value : '${sysconfdir}/init.d', description : 'Specify the location of gstd init script') - option('with-statedir-owner', type : 'string', value : 'root', description : 'Specify the owner of gstd\'s run and log dirs created by the initd script') -+option('with-python-version', type : 'string', value : 'python3', description : 'Specify the python version for pygstc installation') - - # Common options - option('package-name', type : 'string', yield : true, --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0004-meson.build-add-missing-init-subdir.patch b/package/gstreamer1/gstd/0004-meson.build-add-missing-init-subdir.patch deleted file mode 100644 index ed3738e3d4..0000000000 --- a/package/gstreamer1/gstd/0004-meson.build-add-missing-init-subdir.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 689265cd522c770ad3e0391cae80ee884a8c475c Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 21 Apr 2022 01:14:52 -0500 -Subject: [PATCH] meson.build: add missing init subdir - -Seems this got accidentially removed in: -9f4490138c8892b1c86008134438b2ab405c9b0f - -Restore it so that init files are properly installed. - -Signed-off-by: James Hilliard -[upstreeam: https://github.com/RidgeRun/gstd-1.x/pull/291] ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index a30f776..7a8690a 100644 ---- a/meson.build -+++ b/meson.build -@@ -300,3 +300,4 @@ subdir('gst_client') - subdir('tests') - subdir('examples') - subdir('docs') -+subdir('init') --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0005-meson.build-use-dependency-function-for-readline.patch b/package/gstreamer1/gstd/0005-meson.build-use-dependency-function-for-readline.patch deleted file mode 100644 index 51422e56d6..0000000000 --- a/package/gstreamer1/gstd/0005-meson.build-use-dependency-function-for-readline.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3ef45c41105e61efe84c9be3a9a22988dfe10db8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 22 Oct 2021 07:33:04 +0200 -Subject: [PATCH] meson.build: use dependency function for readline - -Use meson dependency function to find readline instead of -cc.find_library. This function will retrieve readline pkg-config file -which is available since version 7 (released 5 years ago) and -https://git.savannah.gnu.org/cgit/readline.git/commit/readline.pc.in?id=d49a9082c0e15bba8cd3d8cc0a994409cf823cac. -readline.pc sets tinfo in Requires.Private which will avoid the -following static build failure: - -/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/lib/libreadline.a(display.o): in function `_rl_move_cursor_relative': -display.c:(.text+0xbb5): undefined reference to `tputs' - -Fixes: - - http://autobuild.buildroot.org/results/77c10947ddc749c54c7c233e3143f5cdf1edc73d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/RidgeRun/gstd-1.x/pull/261] ---- - meson.build | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index 7a8690a..44ed5c2 100644 ---- a/meson.build -+++ b/meson.build -@@ -32,8 +32,8 @@ systemd_required = get_option('enable-systemd').enabled() - systemd_dep = dependency('systemd', required : systemd_required, version : '>=232') - - cc = meson.get_compiler('c') --readline = cc.find_library('readline', required: true) --if readline.found() -+readline_dep = dependency('readline') -+if readline_dep.found() - add_project_arguments('-DHAVE_LIBREADLINE', language: 'c') - add_project_arguments('-DHAVE_READLINE_HISTORY', language: 'c') - # Add arguments to the compiler command line. -@@ -48,8 +48,6 @@ if readline.found() - else - add_project_arguments('-DHAVE_HISTORY_H', language: 'c') - endif -- -- readline_dep = readline - endif - - ## Dependencies --- -2.37.1 - diff --git a/package/gstreamer1/gstd/Config.in b/package/gstreamer1/gstd/Config.in index f36d25f11f..df1d2f59c3 100644 --- a/package/gstreamer1/gstd/Config.in +++ b/package/gstreamer1/gstd/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_GSTD bool "gstd" - depends on BR2_USE_WCHAR # libglib2 -> gettext, libsoup + depends on BR2_USE_WCHAR # libglib2 -> gettext, libedit, libsoup depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libsoup - depends on BR2_USE_MMU # libdaemon, libglib2 + depends on BR2_USE_MMU # libdaemon, libedit, libglib2 select BR2_PACKAGE_GSTREAMER1_GST_DEBUG # gst_debug_bin_to_dot_data select BR2_PACKAGE_JANSSON select BR2_PACKAGE_JSON_GLIB select BR2_PACKAGE_LIBDAEMON + select BR2_PACKAGE_LIBEDIT select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_READLINE diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash index 20c821a27f..632f83f8e8 100644 --- a/package/gstreamer1/gstd/gstd.hash +++ b/package/gstreamer1/gstd/gstd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 56afd58530b63d0d88dd818fd4e6c9230861819b3e131c6a87a46084c3f3fa96 gstd-0.14.0.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 f4a83765d2cf2948c38abc5107ab07d49a01b4101047f188fed7204f1d4e49c7 gstd-0.15.0.tar.gz +sha256 10162be9f7ddb9e98c22c3edd0f78d62ab88f0ca8b1cc968bd85d5d665489d90 COPYING diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk index 817e9143ae..ccb3b3e1bc 100644 --- a/package/gstreamer1/gstd/gstd.mk +++ b/package/gstreamer1/gstd/gstd.mk @@ -4,10 +4,10 @@ # ################################################################################ -GSTD_VERSION = 0.14.0 +GSTD_VERSION = 0.15.0 GSTD_SITE = $(call github,RidgeRun,gstd-1.x,v$(GSTD_VERSION)) GSTD_LICENSE_FILES = COPYING -GSTD_LICENSE = GPL-2.0+ +GSTD_LICENSE = LGPL-2.1+ GSTD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ @@ -15,6 +15,7 @@ GSTD_DEPENDENCIES = \ jansson \ json-glib \ libdaemon \ + libedit \ libglib2 \ libsoup \ readline From arnout at mind.be Wed Feb 8 14:28:33 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:33 +0100 Subject: [Buildroot] [git commit branch/next] utils/check-package: check files in utils/ Message-ID: <20230220205256.4C34D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b021bc1d77ce485ac46114482024d12339d6b5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next All the errors in existing scripts in utils/ have been fixed, so nothing needs to be added to .checkpackageignore. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle --- utils/check-package | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/check-package b/utils/check-package index 12009b2476..98a25bd0b2 100755 --- a/utils/check-package +++ b/utils/check-package @@ -113,6 +113,7 @@ DO_CHECK_INTREE = re.compile(r"|".join([ r"package/", r"system/", r"toolchain/", + r"utils/", ])) DO_NOT_CHECK_INTREE = re.compile(r"|".join([ r"boot/barebox/barebox\.mk$", From arnout at mind.be Wed Feb 8 14:28:28 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:28 +0100 Subject: [Buildroot] [git commit branch/next] utils/brmake: fix shellcheck errors Message-ID: <20230220205256.23DEA81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc364c6ae65d3167409380b8883123a55270b18d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In utils/brmake line 6: local found ret start d h m mf ^---^ SC2034: found appears unused. Verify use (or export if used externally). In utils/brmake line 16: > >( while read line; do ^--^ SC2162: read without -r will mangle backslashes. For both, the suggestions from shellcheck can be applied. Signed-off-by: Arnout Vandecappelle --- utils/brmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/brmake b/utils/brmake index e30119dd10..70dfb6cdc8 100755 --- a/utils/brmake +++ b/utils/brmake @@ -3,7 +3,7 @@ # License: WTFPL, https://spdx.org/licenses/WTFPL.html main() { - local found ret start d h m mf + local ret start d h m mf if ! which unbuffer >/dev/null 2>&1; then printf "you need to install 'unbuffer' (from package expect or expect-dev)\n" >&2 @@ -13,7 +13,7 @@ main() { start=${SECONDS} ( exec 2>&1; unbuffer make "${@}"; ) \ - > >( while read line; do + > >( while read -r line; do printf "%(%Y-%m-%dT%H:%M:%S)T %s\n" -1 "${line}" done \ |tee -a br.log \ From peter at korsgaard.com Wed Feb 8 14:34:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 15:34:42 +0100 Subject: [Buildroot] [git commit branch/next] package/rust: fix bootstrap build Message-ID: <20230220205256.56E2781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7df32882203fdd525156ddb785d171b193e5b282 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The update to v1.67.0 of rust broke the bootstrap build. This patch applies an upstream patch to fix this: https://github.com/rust-lang/rust/commit/3fe64ebbce21e79adb64099984e96dfb79bdd0f9 Fixes: http://autobuild.buildroot.org/results/214/214fcbb3458893784b7f85b60f7ee1edb428c77f/build-end.log Signed-off-by: Sebastian Weyer Cc: Eric Le Bihan Cc: James Hilliard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...1-fix-unsoundness-in-bootstrap-cache-code.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch new file mode 100644 index 0000000000..3eae34642f --- /dev/null +++ b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch @@ -0,0 +1,43 @@ +From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 +From: Michael Goulet +Date: Mon, 12 Dec 2022 18:29:33 +0000 +Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= + =?UTF-8?q?ap=20cache=20code?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) +Signed-off-by: Sebastian Weyer +--- + src/bootstrap/cache.rs | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs +index be5c9bb0788..05f25af68ea 100644 +--- a/src/bootstrap/cache.rs ++++ b/src/bootstrap/cache.rs +@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { + + impl Deref for Interned { + type Target = T::Target; +- fn deref(&self) -> &'static Self::Target { ++ fn deref(&self) -> &Self::Target { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } ++ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } + } + } + + impl, U: ?Sized> AsRef for Interned { +- fn as_ref(&self) -> &'static U { ++ fn as_ref(&self) -> &U { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } ++ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } + } + } + +-- +2.25.1 + From peter at korsgaard.com Wed Feb 8 13:55:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 14:55:31 +0100 Subject: [Buildroot] [git commit branch/next] package/sway: new package Message-ID: <20230220205256.19703828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b739d6bd98e8ee12ec2150563ef9cdef35d2ea35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next i3-compatible Wayland compositor This Wayland compositor can be used as a kiosk compositor like cage, but with the advantage of better configuration of multiple monitor and windows. For example, move a window by title to the output X or set the resolution of Y to Z. Signed-off-by: Raphael Pavlidis [Peter: Fix white space, add gdk-pixbuf to _DEPENDENCIES] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 ++- package/Config.in | 1 + package/sway/Config.in | 42 ++++++++++++++++++++++++++++++++++++++++++ package/sway/sway.hash | 3 +++ package/sway/sway.mk | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 2cb3361c83..0bb4db81bb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2507,8 +2507,9 @@ F: support/testing/tests/package/test_python_jmespath.py F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py -N: Raphael Pavlidis +N: Raphael Pavlidis F: package/slirp4netns/ +F: package/sway/ N: Refik Tuzakli F: package/freescale-imx/ diff --git a/package/Config.in b/package/Config.in index 06d0a05854..2adfcdbb1d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -327,6 +327,7 @@ comment "Graphic applications" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in" source "package/stellarium/Config.in" + source "package/sway/Config.in" source "package/tesseract-ocr/Config.in" source "package/tinifier/Config.in" diff --git a/package/sway/Config.in b/package/sway/Config.in new file mode 100644 index 0000000000..f8d073520f --- /dev/null +++ b/package/sway/Config.in @@ -0,0 +1,42 @@ +config BR2_PACKAGE_SWAY + bool "sway" + depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider + depends on !BR2_STATIC_LIBS # wlroots + depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots + depends on BR2_PACKAGE_HAS_LIBGLES # wlroots + depends on BR2_PACKAGE_HAS_UDEV # wlroots + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_USE_WCHAR # pango + depends on BR2_TOOLCHAIN_HAS_THREADS # pango + depends on BR2_USE_MMU # pango + depends on BR2_INSTALL_LIBSTDCPP # pango + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango + select BR2_PACKAGE_WLROOTS + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_PANGO + help + i3-compatible Wayland compositor + + https://github.com/swaywm/sway + +comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" + depends on !BR2_PACKAGE_SYSTEMD || \ + !BR2_PACKAGE_HAS_UDEV || \ + !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + !BR2_PACKAGE_HAS_LIBGLES + +comment "sway needs a toolchain w/ wchar, threads, C++, dynamic library, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_INSTALL_LIBSTDCPP || \ + BR2_STATIC_LIBS diff --git a/package/sway/sway.hash b/package/sway/sway.hash new file mode 100644 index 0000000000..6dfa71730f --- /dev/null +++ b/package/sway/sway.hash @@ -0,0 +1,3 @@ +# Locally computed, tarball verified with GPG signature +sha256 0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84 sway-1.7.tar.gz +sha256 bd35722bff46327f5eded1d211207277bbe043d2a22048b282c42ef801593b8b LICENSE diff --git a/package/sway/sway.mk b/package/sway/sway.mk new file mode 100644 index 0000000000..802371c827 --- /dev/null +++ b/package/sway/sway.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# sway +# +################################################################################ + +SWAY_VERSION = 1.7 +SWAY_SITE = $(call github,swaywm,sway,v$(SWAY_VERSION)) +SWAY_LICENSE = MIT +SWAY_LICENSE_FILES = LICENSE +SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango +SWAY_CONF_OPTS = \ + -Dwerror=false \ + -Ddefault-wallpaper=false \ + -Dzsh-completions=false \ + -Dbash-completions=false \ + -Dfish-completions=false \ + -Dswaybar=false \ + -Dswaynag=false \ + -Dtray=disabled \ + -Dman-pages=disabled \ + -Dsd-bus-provider=libsystemd + +ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) +SWAY_CONF_OPTS += -Dxwayland=enabled +else +SWAY_CONF_OPTS += -Dxwayland=disabled +endif + +ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y) +SWAY_CONF_OPTS += -Dgdk-pixbuf=enabled +SWAY_DEPENDENCIES += gdk-pixbuf +else +SWAY_CONF_OPTS += -Dgdk-pixbuf=disabled +endif + +$(eval $(meson-package)) From thomas.petazzoni at bootlin.com Wed Feb 8 16:41:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:41:33 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6base: additional disable FEATURE_avx512vbmi2 and FEATURE_vaes Message-ID: <20230220205256.8826781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ff07d3e60d23816a958aae413d4dc7e2dd17003 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - additional disable new FEATURE_avx512vbmi2/FEATURE_vaes (added with upstream commit [1]) [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=38e6b637b71fae274caedc1d326f641b904e00a4 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 212b2d689e..e6cf4f14bb 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -72,7 +72,9 @@ QT6BASE_CONF_OPTS += \ -DFEATURE_avx512ifma=OFF \ -DFEATURE_avx512pf=OFF \ -DFEATURE_avx512vbmi=OFF \ - -DFEATURE_avx512vl=OFF + -DFEATURE_avx512vbmi2=OFF \ + -DFEATURE_avx512vl=OFF \ + -DFEATURE_vaes=OFF define QT6BASE_BUILD_CMDS $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6BASE_BUILDDIR) From thomas.petazzoni at bootlin.com Wed Feb 8 19:23:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:23:13 +0100 Subject: [Buildroot] [git commit branch/next] package/xr819-xradio: bump to 2022-12-30 version on branch master Message-ID: <20230220205256.BA3AB81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd2e9a2a0d7fd4e407e831503979cc00aa2c4858 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This version allows to build with Linux 6.1 Fixes: Still not reported Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/xr819-xradio/xr819-xradio.hash | 2 +- package/xr819-xradio/xr819-xradio.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index 08a3b6e8cc..60185db736 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 839fdae93eba29121d4116de335b00a026ef63874caf516747dbdf24c17f208b xr819-xradio-58d597bcf081e44904335916e6033bc8ef28b043.tar.gz +sha256 2b297fbcc9b5ed190bcfff9f6f808c170632ac3d69dbd92156a7f4f57142dec9 xr819-xradio-005f28cfe9e20b7f2dfd9d32d38ee97060dc707f.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index 8c1cb1587f..e5daaa6051 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 58d597bcf081e44904335916e6033bc8ef28b043 +XR819_XRADIO_VERSION = 005f28cfe9e20b7f2dfd9d32d38ee97060dc707f XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 8 19:27:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:27:34 +0100 Subject: [Buildroot] [git commit branch/next] package/rtl8723ds: change CFLAGS approach Message-ID: <20230220205256.C53C7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=672544148b3cafa1cda47cd6e4b88210fc693e14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Instead of undefining endiannes CFLAGS let's change the approach. Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default involving the endianness to be set to little. This way we can set the CFLAGS according to architecture with some default define like: -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -Wno-error Suggested-by: Arnout Vandecappelle Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8723ds/rtl8723ds.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 7e27fa75ea..f303a24041 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -8,12 +8,14 @@ RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 -# Undefine the hardcoded CONFIG_LITTLE_ENDIAN -RTL8723DS_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN -# Set endianness -RTL8723DS_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN +RTL8723DS_USER_EXTRA_CLAGS = \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error RTL8723DS_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_I386_PC=n \ CONFIG_RTL8723DS=m \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) \ From arnout at mind.be Thu Feb 9 20:28:47 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:28:47 +0100 Subject: [Buildroot] [git commit branch/next] lksctp-tools: bump to version 1.0.19 Message-ID: <20230220205256.D016386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=554d79f5cc01c20d886cbe9c676195159947f066 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/sctp/lksctp-tools/blob/v1.0.19/ChangeLog Signed-off-by: Maxim Kochetkov Tested-by: Maksim Kiselev Signed-off-by: Arnout Vandecappelle --- package/lksctp-tools/lksctp-tools.hash | 4 ++-- package/lksctp-tools/lksctp-tools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lksctp-tools/lksctp-tools.hash b/package/lksctp-tools/lksctp-tools.hash index fb892fdc3b..b3a1f59d86 100644 --- a/package/lksctp-tools/lksctp-tools.hash +++ b/package/lksctp-tools/lksctp-tools.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ -md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz -sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz +md5 0fbb288c9f9625b88d3ab21c9ed9f011 lksctp-tools-1.0.19.tar.gz +sha1 d410a596485c38464177a38ae7c7081444e6589e lksctp-tools-1.0.19.tar.gz # Locally computed sha256 dee5f35e583183abb9212938643ecb2d858fd89e2e286f4b1d903f65d49d6c76 COPYING.lib sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk index 5ac794e842..af86a28516 100644 --- a/package/lksctp-tools/lksctp-tools.mk +++ b/package/lksctp-tools/lksctp-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -LKSCTP_TOOLS_VERSION = 1.0.17 -LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools +LKSCTP_TOOLS_VERSION = 1.0.19 +LKSCTP_TOOLS_SITE = $(call github,sctp,lksctp-tools,v$(LKSCTP_TOOLS_VERSION)) LKSCTP_TOOLS_INSTALL_STAGING = YES # configure not shipped LKSCTP_TOOLS_AUTORECONF = YES From arnout at mind.be Thu Feb 9 20:44:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:44:31 +0100 Subject: [Buildroot] [git commit branch/next] package/open-iscsi: add OPEN_ISCSI_CPE_ID_VENDOR Message-ID: <20230220205256.E9C188648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4856c75b2fe0cbab36fcae7f5f223026b24e884f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next cpe:2.3:a:open-iscsi_project:open-iscsi is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen-iscsi_project%3Aopen-iscsi Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/open-iscsi/open-iscsi.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk index 249253c64f..e5b965b80d 100644 --- a/package/open-iscsi/open-iscsi.mk +++ b/package/open-iscsi/open-iscsi.mk @@ -10,6 +10,7 @@ OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) # well. See https://github.com/open-iscsi/open-iscsi/issues/379 OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ OPEN_ISCSI_LICENSE_FILES = COPYING +OPEN_ISCSI_CPE_ID_VENDOR = open-iscsi_project OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi From thomas.petazzoni at bootlin.com Wed Feb 8 16:42:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:42:32 +0100 Subject: [Buildroot] [git commit branch/next] package/libopenssl: security bump to version 1.1.1t Message-ID: <20230220205256.98013828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=040896bd4338f7ca419766578db49af154b762c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog (for details see [1] and [2]): Changes between 1.1.1s and 1.1.1t [7 Feb 2023] *) Fixed X.400 address type confusion in X.509 GeneralName. There is a type confusion vulnerability relating to X.400 address processing inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This vulnerability may allow an attacker who can provide a certificate chain and CRL (neither of which need have a valid signature) to pass arbitrary pointers to a memcmp call, creating a possible read primitive, subject to some constraints. Refer to the advisory for more information. Thanks to David Benjamin for discovering this issue. (CVE-2023-0286) This issue has been fixed by changing the public header file definition of GENERAL_NAME so that x400Address reflects the implementation. It was not possible for any existing application to successfully use the existing definition; however, if any application references the x400Address field (e.g. in dead code), note that the type of this field has changed. There is no ABI change. [Hugo Landau] *) Fixed Use-after-free following BIO_new_NDEF. The public API function BIO_new_NDEF is a helper function used for streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL to support the SMIME, CMS and PKCS7 streaming capabilities, but may also be called directly by end user applications. The function receives a BIO from the caller, prepends a new BIO_f_asn1 filter BIO onto the front of it to form a BIO chain, and then returns the new head of the BIO chain to the caller. Under certain conditions, for example if a CMS recipient public key is invalid, the new filter BIO is freed and the function returns a NULL result indicating a failure. However, in this case, the BIO chain is not properly cleaned up and the BIO passed by the caller still retains internal pointers to the previously freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO then a use-after-free will occur. This will most likely result in a crash. (CVE-2023-0215) [Viktor Dukhovni, Matt Caswell] *) Fixed Double free after calling PEM_read_bio_ex. The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload data. If the function succeeds then the "name_out", "header" and "data" arguments are populated with pointers to buffers containing the relevant decoded data. The caller is responsible for freeing those buffers. It is possible to construct a PEM file that results in 0 bytes of payload data. In this case PEM_read_bio_ex() will return a failure code but will populate the header argument with a pointer to a buffer that has already been freed. If the caller also frees this buffer then a double free will occur. This will most likely lead to a crash. The functions PEM_read_bio() and PEM_read() are simple wrappers around PEM_read_bio_ex() and therefore these functions are also directly affected. These functions are also called indirectly by a number of other OpenSSL functions including PEM_X509_INFO_read_bio_ex() and SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL internal uses of these functions are not vulnerable because the caller does not free the header argument if PEM_read_bio_ex() returns a failure code. (CVE-2022-4450) [Kurt Roeckx, Matt Caswell] *) Fixed Timing Oracle in RSA Decryption. A timing based side channel exists in the OpenSSL RSA Decryption implementation which could be sufficient to recover a plaintext across a network in a Bleichenbacher style attack. To achieve a successful decryption an attacker would have to be able to send a very large number of trial messages for decryption. The vulnerability affects all RSA padding modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. (CVE-2022-4304) [Dmitry Belyavsky, Hubert Kario] Changes between 1.1.1r and 1.1.1s [1 Nov 2022] *) Fixed a regression introduced in 1.1.1r version not refreshing the certificate data to be signed before signing the certificate. [Gibeom Gwon] Changes between 1.1.1q and 1.1.1r [11 Oct 2022] *) Fixed the linux-mips64 Configure target which was missing the SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that platform. [Adam Joseph] *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was causing incorrect results in some cases as a result. [Paul Dale] *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to report correct results in some cases [Matt Caswell] *) Fixed a regression introduced in 1.1.1o for re-signing certificates with different key sizes [Todd Short] *) Added the loongarch64 target [Shi Pujin] *) Fixed a DRBG seed propagation thread safety issue [Bernd Edlinger] *) Fixed a memory leak in tls13_generate_secret [Bernd Edlinger] *) Fixed reported performance degradation on aarch64. Restored the implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid 32-bit lane assignment in CTR mode") for 64bit targets only, since it is reportedly 2-17% slower and the silicon errata only affects 32bit targets. The new algorithm is still used for 32 bit targets. [Bernd Edlinger] *) Added a missing header for memcmp that caused compilation failure on some platforms [Gregor Jasny] [1] https://www.openssl.org/news/cl111.txt [2] https://www.openssl.org/news/vulnerabilities.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- 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 8457df6c0a..ebc56b11dd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1q.tar.gz.sha256 -sha256 d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca openssl-1.1.1q.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 +sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index fc22c20467..6e84f06175 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1q +LIBOPENSSL_VERSION = 1.1.1t LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From arnout at mind.be Thu Feb 9 20:46:10 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:46:10 +0100 Subject: [Buildroot] [git commit branch/next] package/libsolv: add LIBSOLV_CPE_ID_VENDOR Message-ID: <20230220205257.02A53828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8cee8fb37c6ad0164d3f7bad8cfd0f812592ad6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next cpe:2.3:a:opensuse:libsolv is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopensuse%3Alibsolv Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libsolv/libsolv.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 144ce68a83..29f8a6a3d2 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -8,6 +8,7 @@ LIBSOLV_VERSION = 0.7.22 LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) LIBSOLV_LICENSE = BSD-3-Clause LIBSOLV_LICENSE_FILES = LICENSE.BSD +LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON From peter at korsgaard.com Fri Feb 10 14:11:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:11:16 +0100 Subject: [Buildroot] [git commit branch/next] package/norm: use external waf Message-ID: <20230220205257.4CE0881979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8012a86f5cf751f9c4d5d4a63f6502a6ac60d13a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/ee1/ee15cadf8af10dee6c83b9726a034367e8ae81a7/ The bundled waf script is too old (2.0.7) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/norm/norm.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/norm/norm.mk b/package/norm/norm.mk index 2f9fc7b657..a3fa1b4f80 100644 --- a/package/norm/norm.mk +++ b/package/norm/norm.mk @@ -11,6 +11,9 @@ NORM_INSTALL_STAGING = YES NORM_LICENSE = NRL License NORM_LICENSE_FILES = LICENSE.TXT +# The bundled waf script is too old for >= python3.11 +NORM_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y) NORM_DEPENDENCIES += libnetfilter_queue endif From peter at korsgaard.com Fri Feb 10 14:10:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:10:42 +0100 Subject: [Buildroot] [git commit branch/next] package/glmark2: use external waf Message-ID: <20230220205257.34214828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e331da62fb7612b7a52a40e37312753cc1c1eef5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/bbd/bbd90f11975b691f694412a6fc3446f37dd7c0aa/ The bundled waf script is too old (1.9.3) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/glmark2/glmark2.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index e8d6f71dad..bac9d9ff6f 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -10,6 +10,9 @@ GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng +# The bundled waf script is too old for >= python3.11 +GLMARK2_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y) GLMARK2_DEPENDENCIES += libdrm libgbm libgles udev GLMARK2_FLAVORS += drm-glesv2 From peter at korsgaard.com Fri Feb 10 14:10:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:10:35 +0100 Subject: [Buildroot] [git commit branch/next] package/aubio: drop AUBIO_REMOVE_OLD_WAF hook Message-ID: <20230220205257.27D7F81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4543911494b2a485f159eae21bb703b676ec2c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next As that is now handled by the waf-package infrastructure. Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/aubio/aubio.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index c995fdfac7..64174a113d 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -21,12 +21,6 @@ AUBIO_CONF_OPTS = \ # https://github.com/jackaudio/jack2/issues/898 AUBIO_NEEDS_EXTERNAL_WAF = YES -# The old waf script bundled in aubio 0.4.9 need to be removed first. -define AUBIO_REMOVE_OLD_WAF - $(RM) -fr $(@D)/waf $(@D)/waflib -endef -AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF - # Add --notests for each build step to avoid running unit tests on the # build machine. AUBIO_WAF_OPTS = --notests From peter at korsgaard.com Fri Feb 10 14:14:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:14:10 +0100 Subject: [Buildroot] [git commit branch/next] package/postgresql: bump version to 15.2 Message-ID: <20230220205257.59AF5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57e297a215193c92f6a178139db53616f2ee23b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://www.postgresql.org/docs/release/15.2/ Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index ef2806c2dd..e6a9bd6658 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v14.6/postgresql-15.1.tar.bz2.sha256 -sha256 64fdf23d734afad0dfe4077daca96ac51dcd697e68ae2d3d4ca6c45cb14e21ae postgresql-15.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 +sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 2ffcac6595..e90aa794b0 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 15.1 +POSTGRESQL_VERSION = 15.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 Fri Feb 10 15:26:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:26:54 +0100 Subject: [Buildroot] [git commit branch/next] package/wpewebkit: Build with ninja Message-ID: <20230220205257.7198581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78d499409f71d8a22b0632c8ebc06f67ee6ae6dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 54f37fd702..b9c2fef395 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -103,4 +103,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# wpewebkit needs cmake >= 3.20 when building with the make backend, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WPEWEBKIT_CONF_OPTS += -GNinja +WPEWEBKIT_DEPENDENCIES += host-ninja + +define WPEWEBKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + $(eval $(cmake-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:07:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 22:07:18 +0100 Subject: [Buildroot] [git commit] package/tmux: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230220210739.2E1878649D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54237eec447abd4bd788b0a8ac5d48293c2c4eb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master tmux uses custom --enable-static option to drive whether a static link should be attempted, which is not what the standard libtool directive is about and that we pass in our autotools-package infra. This results in the following build failure with systemd or utf8proc raised since commits 1f618aa388535181c281c85e2b5264532de4ef0f and e279599d255a79c08ef20b97b96eb248689d52a9: checking for utf8proc.h... yes checking for library containing utf8proc_charwidth... no configure: error: "utf8proc not found" In file included from tmux.h:34, from alerts.c:23: compat.h:379:18: error: conflicting types for 'forkpty'; have 'pid_t(int *, char *, struct termios *, struct winsize *)' {aka 'int(int *, char *, struct termios *, struct winsize *)'} 379 | pid_t forkpty(int *, char *, struct termios *, struct winsize *); | ^~~~~~~ Link to (closed) upstream issue: https://github.com/tmux/tmux/issues/3290 Fixes: - http://autobuild.buildroot.org/results/6e8523d8d514bf6d8fc3377d05e5edbe7fc2d5bb - http://autobuild.buildroot.org/results/cba06f3bb6d9be25e91f56c390a70ddf9904832e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/tmux/tmux.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 47ee9b16ca..af06c8570b 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -25,6 +25,12 @@ else TMUX_CONF_OPTS += --disable-utf8proc endif +# tmux uses custom --enable-static option, instead of standard libtool +# directive resulting in a build failure with systemd or utf8proc +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +TMUX_CONF_OPTS += --disable-static +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS From thomas.petazzoni at bootlin.com Mon Feb 20 21:07:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:07:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: fix BR2_SHARED_STATIC_LIBS In-Reply-To: <20230219232301.1795196-1-fontaine.fabrice@gmail.com> References: <20230219232301.1795196-1-fontaine.fabrice@gmail.com> Message-ID: <20230220220741.1f38012c@windsurf> Hello Fabrice, On Mon, 20 Feb 2023 00:23:01 +0100 Fabrice Fontaine wrote: > tmux uses custom --enable-static option, instead of standard libtool > directive resulting in the following build failure with systemd or > utf8proc raised since commits > 1f618aa388535181c281c85e2b5264532de4ef0f and > e279599d255a79c08ef20b97b96eb248689d52a9: I am rather confused by the reasoning here. > checking for utf8proc.h... yes > checking for library containing utf8proc_charwidth... no > configure: error: "utf8proc not found" So this one is: http://autobuild.buildroot.net/results/6e8/6e8523d8d514bf6d8fc3377d05e5edbe7fc2d5bb/build-end.log http://autobuild.buildroot.net/results/623/62309091c9da69eb29c3e9464aa95d089ce886f8/build-end.log I think here the problem is indeed that tmux interprets --enable-static as "please provide a statically linked binary" instead of the standard "please build/install static libraries". So, when it tries to detect libutf8proc, it doesn't find it: /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/or1k-buildroot-linux-musl/11.3.0/../../../../or1k-buildroot-linux-musl/bin/ld: cannot find -lutf8proc: No such file or directory because utf8proc is based on CMake, and CMake is not able to build both shared and static libraries, so in the BR2_STATIC_SHARED_LIBS=y case, it only installs shared libraries. Because the above utf8proc library test is done with -static, it requires a static variant of libutf8proc, which isn't there. So indeed, for this case, it makes sense to not pass --enable-static to tmux, but it's both due to tmux having a non-standard behavior for --enable-static *AND* the fact that utf8proc also doesn't behave properly in the BR2_STATIC_SHARED_LIBS=y case. > In file included from tmux.h:34, > from alerts.c:23: > compat.h:379:18: error: conflicting types for 'forkpty'; have 'pid_t(int *, char *, struct termios *, struct winsize *)' {aka 'int(int *, char *, struct termios *, struct winsize *)'} > 379 | pid_t forkpty(int *, char *, struct termios *, struct winsize *); > | ^~~~~~~ However this one, I am really, really confused as to how it can be related to BR2_STATIC_SHARED_LIBS and --enable-static. Could you provide some more details on the reasoning? Thanks! 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 Mon Feb 20 21:10:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 22:10:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: fix BR2_SHARED_STATIC_LIBS In-Reply-To: <20230219232301.1795196-1-fontaine.fabrice@gmail.com> References: <20230219232301.1795196-1-fontaine.fabrice@gmail.com> Message-ID: <20230220211017.GF2718518@scaer> Fabrice, All, On 2023-02-20 00:23 +0100, Fabrice Fontaine spake thusly: > tmux uses custom --enable-static option, instead of standard libtool > directive In fact, the purpose is also different: libtool's --enable-static drives whether to generate static libraries, while tmux' --enable-static drives whether to link against static libraries. So, not unrelated, but still different. > resulting in the following build failure with systemd or > utf8proc raised since commits > 1f618aa388535181c281c85e2b5264532de4ef0f and > e279599d255a79c08ef20b97b96eb248689d52a9: > > checking for utf8proc.h... yes > checking for library containing utf8proc_charwidth... no > configure: error: "utf8proc not found" > > In file included from tmux.h:34, > from alerts.c:23: > compat.h:379:18: error: conflicting types for 'forkpty'; have 'pid_t(int *, char *, struct termios *, struct winsize *)' {aka 'int(int *, char *, struct termios *, struct winsize *)'} > 379 | pid_t forkpty(int *, char *, struct termios *, struct winsize *); > | ^~~~~~~ > > Link to (closed) upstream issue: > https://github.com/tmux/tmux/issues/3290 > > Fixes: > - http://autobuild.buildroot.org/results/6e8523d8d514bf6d8fc3377d05e5edbe7fc2d5bb > - http://autobuild.buildroot.org/results/cba06f3bb6d9be25e91f56c390a70ddf9904832e > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/tmux/tmux.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk > index 47ee9b16ca..af06c8570b 100644 > --- a/package/tmux/tmux.mk > +++ b/package/tmux/tmux.mk > @@ -25,6 +25,12 @@ else > TMUX_CONF_OPTS += --disable-utf8proc > endif > > +# tmux uses custom --enable-static option, instead of standard libtool > +# directive resulting in a build failure with systemd or utf8proc > +ifeq ($(BR2_SHARED_STATIC_LIBS),y) > +TMUX_CONF_OPTS += --disable-static > +endif > + > # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear > # can reject the user connection. See man shells. > define TMUX_ADD_TMUX_TO_SHELLS > -- > 2.39.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 thomas.petazzoni at bootlin.com Mon Feb 20 21:17:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:17:21 +0100 Subject: [Buildroot] [PATCH v2] package/libcamera-apps: enable LIBAV only if libdrm is present In-Reply-To: <20230220071846.2334907-1-marcus.folkesson@gmail.com> References: <20230220071846.2334907-1-marcus.folkesson@gmail.com> Message-ID: <20230220221721.3ebb047b@windsurf> Hello Marcus, On Mon, 20 Feb 2023 08:18:46 +0100 Marcus Folkesson wrote: > Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps > does enable LIBAV by default which depends on libdrm. > > Fixes: > - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ > > /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory > 13 | #include > | ^~~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: Marcus Folkesson I need to do some test builds, but I believe this patch is not correct. What the error message seems to say is that when you build libav support in libcamera-apps, then libdrm support is needed. But what you're patch is doing is that it's forcing to have libva as soon as libdrm is available, which I'm not sure is needed. > diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in > index 711fd6de05..d0cc6a4210 100644 > --- a/package/libcamera-apps/Config.in > +++ b/package/libcamera-apps/Config.in > @@ -15,6 +15,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS > 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_FFMPEG if BR2_PACKAGE_LIBDRM > 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 > diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk > index 290ee9a026..1464875298 100644 > --- a/package/libcamera-apps/libcamera-apps.mk > +++ b/package/libcamera-apps/libcamera-apps.mk > @@ -23,10 +23,12 @@ LIBCAMERA_APPS_CONF_OPTS = \ > -DENABLE_TFLITE=0 > > ifeq ($(BR2_PACKAGE_LIBDRM),y) > -LIBCAMERA_APPS_DEPENDENCIES += libdrm > +LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm > LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 > else > LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 > endif Could you instead try something like this: ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_LIBDRM),yy) LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 endif To test this, you need to test 4 different cases: - libcamera-apps enabled, ffmpeg disabled, libdrm disabled - libcamera-apps enabled, ffmpeg enabled, libdrm disabled - libcamera-apps enabled, ffmpeg disabled, libdrm enabled - libcamera-apps enabled, ffmpeg enabled, libdrm enabled Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 21:32:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:32:47 +0100 Subject: [Buildroot] [git commit] package/python-webargs: add CPE variables Message-ID: <20230220213258.1F8B8864B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81de6207f1237f17ec3e17e3afaae25474c7aca5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:webargs_project:webargs is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Awebargs_project%3Awebargs Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-webargs/python-webargs.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-webargs/python-webargs.mk b/package/python-webargs/python-webargs.mk index e048d8a4ac..ce270842c1 100644 --- a/package/python-webargs/python-webargs.mk +++ b/package/python-webargs/python-webargs.mk @@ -10,5 +10,7 @@ PYTHON_WEBARGS_SITE = https://files.pythonhosted.org/packages/4b/7d/fece8e6547b3 PYTHON_WEBARGS_SETUP_TYPE = setuptools PYTHON_WEBARGS_LICENSE = MIT PYTHON_WEBARGS_LICENSE_FILES = LICENSE +PYTHON_WEBARGS_CPE_ID_VENDOR = webargs_project +PYTHON_WEBARGS_CPE_ID_PRODUCT = webargs $(eval $(python-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 21:32:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:32:40 +0100 Subject: [Buildroot] [git commit] package/python-marshmallow: add CPE variables Message-ID: <20230220213258.16B92864AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=555f128feb3bc1e3f8f3bd52315abff5cc308aaa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:marshmallow_project:marshmallow is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Amarshmallow_project%3Amarshmallow Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-marshmallow/python-marshmallow.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-marshmallow/python-marshmallow.mk b/package/python-marshmallow/python-marshmallow.mk index 6427296508..ba6da6b29c 100644 --- a/package/python-marshmallow/python-marshmallow.mk +++ b/package/python-marshmallow/python-marshmallow.mk @@ -10,5 +10,7 @@ PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/5e/59/dd465e5a PYTHON_MARSHMALLOW_SETUP_TYPE = setuptools PYTHON_MARSHMALLOW_LICENSE = MIT PYTHON_MARSHMALLOW_LICENSE_FILES = LICENSE +PYTHON_MARSHMALLOW_CPE_ID_VENDOR = marshmallow_project +PYTHON_MARSHMALLOW_CPE_ID_PRODUCT = marshmallow $(eval $(python-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 21:34:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:34:17 +0100 Subject: [Buildroot] [PATCH v2] package/libcamera-apps: enable LIBAV only if libdrm is present In-Reply-To: <20230220221721.3ebb047b@windsurf> References: <20230220071846.2334907-1-marcus.folkesson@gmail.com> <20230220221721.3ebb047b@windsurf> Message-ID: <20230220223417.5b1c3c08@windsurf> On Mon, 20 Feb 2023 22:17:21 +0100 Thomas Petazzoni wrote: > I need to do some test builds, but I believe this patch is not correct. I confirm the patch is not correct: if you have a configuration with libcamera-apps and libdrm (but ffmpeg disabled), it builds just fine, and DRM support in camera-apps is enabled. In this configuration, your patch forces a dependency on ffmpeg, which is not correct. Could you have a look at my previous suggestion instead? Thanks a lot, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 21:34:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:34:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-marshmallow: add CPE variables In-Reply-To: <20230215225947.26078-1-fontaine.fabrice@gmail.com> References: <20230215225947.26078-1-fontaine.fabrice@gmail.com> Message-ID: <20230220223449.1c38bdb4@windsurf> On Wed, 15 Feb 2023 23:59:47 +0100 Fabrice Fontaine wrote: > cpe:2.3:a:marshmallow_project:marshmallow is a valid CPE identifier for > this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Amarshmallow_project%3Amarshmallow > > Signed-off-by: Fabrice Fontaine > --- > package/python-marshmallow/python-marshmallow.mk | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 21:34:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:34:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-webargs: add CPE variables In-Reply-To: <20230215230413.28610-1-fontaine.fabrice@gmail.com> References: <20230215230413.28610-1-fontaine.fabrice@gmail.com> Message-ID: <20230220223455.318a2fbf@windsurf> On Thu, 16 Feb 2023 00:04:13 +0100 Fabrice Fontaine wrote: > cpe:2.3:a:webargs_project:webargs is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Awebargs_project%3Awebargs > > Signed-off-by: Fabrice Fontaine > --- > package/python-webargs/python-webargs.mk | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 21:39:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:39:07 +0100 Subject: [Buildroot] [git commit] package/network-manager: add patch to set mobile-broadband-provider-info-database location Message-ID: <20230220213917.5D2FE864B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c36f6938858d3246ca493dacc925717586e2ea0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When building network-manager in cross-compile environment pkg-config returns the wrong path to the mobile-broadband-provider-info database. By adding the option 'mobile_broadband_provider_info_database' to set the correct path to the datafile this can be solved. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- ...-add-option-to-set-the-mobile-broadband-p.patch | 60 ++++++++++++++++++++++ package/network-manager/network-manager.mk | 1 + 2 files changed, 61 insertions(+) diff --git a/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch b/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch new file mode 100644 index 0000000000..4336472e45 --- /dev/null +++ b/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch @@ -0,0 +1,60 @@ +From 03ba04d4784fa4fc7ec31455070fb5ecf25ade23 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Fri, 27 Jan 2023 22:38:42 +0100 +Subject: [PATCH] build: meson: add option to set the + mobile-broadband-provider-info database + +When building network-manager in cross-compile environment meson is not able +to detect the right location of the mobile-broadband-provider-info +database by using the pkg-config module. + +By adding the option 'mobile_broadband_provider_info_database' to set the +correct path to the datafile this can be solved. + +Signed-off-by: Heiko Thiery + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1519 +--- + meson.build | 6 +++++- + meson_options.txt | 1 + + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 0adc42f738..84ce52c736 100644 +--- a/meson.build ++++ b/meson.build +@@ -584,7 +584,10 @@ enable_modem_manager = get_option('modem_manager') + if enable_modem_manager + mm_glib_dep = dependency('mm-glib', version: '>= 0.7.991') + +- mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ mobile_broadband_provider_info_database = get_option('mobile_broadband_provider_info_database') ++ if mobile_broadband_provider_info_database == '' ++ mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ endif + config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_database) + endif + +@@ -1054,6 +1057,7 @@ output += ' jansson: ' + jansson_msg + '\n' + output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n' + output += ' nft: ' + config_h.get('NFT_PATH') + '\n' + output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n' ++output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' + output += ' ofono: ' + enable_ofono.to_string() + '\n' + output += ' concheck: ' + enable_concheck.to_string() + '\n' + output += ' libteamdctl: ' + enable_teamdctl.to_string() + '\n' +diff --git a/meson_options.txt b/meson_options.txt +index 8b1d32e645..4e359f9e92 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -32,6 +32,7 @@ option('ppp', type: 'boolean', value: true, description: 'enable PPP/PPPoE suppo + option('pppd', type: 'string', value: '', description: 'path to pppd binary') + option('pppd_plugin_dir', type: 'string', value: '', description: 'path to the pppd plugins directory') + option('modem_manager', type: 'boolean', value: true, description: 'Enable new ModemManager1 interface support') ++option('mobile_broadband_provider_info_database', type: 'string', value: '', description: 'path to the mobile-broadband-provider-info database') + option('ofono', type: 'boolean', value: false, description: 'Enable oFono support (experimental)') + option('concheck', type: 'boolean', value: true, description: 'enable connectivity checking support') + option('teamdctl', type: 'boolean', value: false, description: 'enable Teamd control support') +-- +2.20.1 + diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 138ff46e4a..87932c75e4 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -96,6 +96,7 @@ endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true +NETWORK_MANAGER_CONF_OPTS += -Dmobile_broadband_provider_info_database=/usr/share/mobile-broadband-provider-info/serviceproviders.xml else NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif From thomas.petazzoni at bootlin.com Mon Feb 20 21:39:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:39:20 +0100 Subject: [Buildroot] [PATCH 1/2] package/network-manager: add patch to set mobile-broadband-provider-info-database location In-Reply-To: <20230213124021.12522-1-heiko.thiery@gmail.com> References: <20230213124021.12522-1-heiko.thiery@gmail.com> Message-ID: <20230220223920.43c5921c@windsurf> On Mon, 13 Feb 2023 13:40:21 +0100 Heiko Thiery wrote: > When building network-manager in cross-compile environment pkg-config returns > the wrong path to the mobile-broadband-provider-info database. > > By adding the option 'mobile_broadband_provider_info_database' to set the > correct path to the datafile this can be solved. > > Signed-off-by: Heiko Thiery > --- > ...option-to-set-the-mobile-broadband-p.patch | 60 +++++++++++++++++++ > package/network-manager/network-manager.mk | 1 + > 2 files changed, 61 insertions(+) > create mode 100644 package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Mon Feb 20 22:23:55 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 23:23:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: fix BR2_SHARED_STATIC_LIBS In-Reply-To: <20230220220741.1f38012c@windsurf> References: <20230219232301.1795196-1-fontaine.fabrice@gmail.com> <20230220220741.1f38012c@windsurf> Message-ID: Le lun. 20 f?vr. 2023 ? 22:07, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > Hello Fabrice, > > On Mon, 20 Feb 2023 00:23:01 +0100 > Fabrice Fontaine wrote: > > > tmux uses custom --enable-static option, instead of standard libtool > > directive resulting in the following build failure with systemd or > > utf8proc raised since commits > > 1f618aa388535181c281c85e2b5264532de4ef0f and > > e279599d255a79c08ef20b97b96eb248689d52a9: > > I am rather confused by the reasoning here. > > > checking for utf8proc.h... yes > > checking for library containing utf8proc_charwidth... no > > configure: error: "utf8proc not found" > > So this one is: > > > http://autobuild.buildroot.net/results/6e8/6e8523d8d514bf6d8fc3377d05e5edbe7fc2d5bb/build-end.log > > http://autobuild.buildroot.net/results/623/62309091c9da69eb29c3e9464aa95d089ce886f8/build-end.log > > I think here the problem is indeed that tmux interprets --enable-static > as "please provide a statically linked binary" instead of the standard > "please build/install static libraries". > > So, when it tries to detect libutf8proc, it doesn't find it: > > /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/or1k-buildroot-linux-musl/11.3.0/../../../../or1k-buildroot-linux-musl/bin/ld: > cannot find -lutf8proc: No such file or directory > > because utf8proc is based on CMake, and CMake is not able to build both > shared and static libraries, so in the BR2_STATIC_SHARED_LIBS=y case, > it only installs shared libraries. Because the above utf8proc library > test is done with -static, it requires a static variant of libutf8proc, > which isn't there. > > So indeed, for this case, it makes sense to not pass --enable-static to > tmux, but it's both due to tmux having a non-standard behavior for > --enable-static *AND* the fact that utf8proc also doesn't behave > properly in the BR2_STATIC_SHARED_LIBS=y case. > > > In file included from tmux.h:34, > > from alerts.c:23: > > compat.h:379:18: error: conflicting types for 'forkpty'; have 'pid_t(int > *, char *, struct termios *, struct winsize *)' {aka 'int(int *, char *, > struct termios *, struct winsize *)'} > > 379 | pid_t forkpty(int *, char *, struct termios *, struct > winsize *); > > | ^~~~~~~ > > > However this one, I am really, really confused as to how it can be > related to BR2_STATIC_SHARED_LIBS and --enable-static. Could you > provide some more details on the reasoning? > This is the same issue, availability of forkpty in systemd is wrongly detected because of --static. Here is an extract of http://autobuild.buildroot.org/results/cba/cba06f3bb6d9be25e91f56c390a70ddf9904832e//tmux-3.3a/config.log : configure:7278: /home/autobuild/autobuild/instance-12/output-1/host/bin/powerpc64-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -D_FORTIFY_SOURCE=2 -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lutil -L/home/autobuild/autobuild/instance-12/output-1/host/bin/../powerpc64-buildroot-linux-gnu/sysroot/usr/lib -lsystemd -lncurses -L/home/autobuild/autobuild/instance-12/output-1/host/bin/../powerpc64-buildroot-linux-gnu/sysroot/usr/lib -levent_core -lm >&5 /home/autobuild/autobuild/instance-12/output-1/host/lib/gcc/powerpc64-buildroot-linux-gnu/11.3.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: cannot find -lsystemd > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Mon Feb 20 22:31:25 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 23:31:25 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/libmodsecurity: needs dynamic library with libcurl, libssh2 and mbedtls In-Reply-To: <20230220215531.7b3a1783@windsurf> References: <20230219172440.519540-1-fontaine.fabrice@gmail.com> <20230220215531.7b3a1783@windsurf> Message-ID: Hello, Le lun. 20 f?vr. 2023 ? 21:55, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > Hello Fabrice, > > On Sun, 19 Feb 2023 18:24:40 +0100 > Fabrice Fontaine wrote: > > > Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as > > mbedtls can be pulled in libcurl through libssh2 resulting in the > > following build failure: > > > > > /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: > /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): > in function `mbedtls_md5_init': > > md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; > ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): > first defined here > > > > Fixes: > > - > http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a > > > > Signed-off-by: Fabrice Fontaine > > --- > > Changes v2 -> v3: > > - Fix syntax > > Changes v1 -> v2: > > - Update nginx-modsecurity > > Isn't that a bit madness? If libmodsecurity has its copy of parts of > mbedtls, but didn't take care of renaming the symbols, then ultimately > what we should conclude is that using libmodsecurity in a statically > linked configuration is not supported. > > So I would advocate for simplifying the whole thing and just make > libmodsecurity and its reverse dependencies depends on !BR2_STATIC_LIBS > and be done with it. > > What do you think? > OK, I'll send a v4 > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Mon Feb 20 22:31:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:31:42 +0100 Subject: [Buildroot] [git commit] package/postgresql: add lz4 and zstd support Message-ID: <20230220223154.39624864C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9cd2e6e090449f9d2f371d24152580c038892f3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PostgreSQL has optional compression support (LZ4 and Zstandard). So enable it if libraries are available. Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index e90aa794b0..5e3601cb46 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -91,6 +91,20 @@ else POSTGRESQL_CONF_OPTS += --without-libxml endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +POSTGRESQL_DEPENDENCIES += zstd +POSTGRESQL_CONF_OPTS += --with-zstd +else +POSTGRESQL_CONF_OPTS += --without-zstd +endif + +ifeq ($(BR2_PACKAGE_LZ4),y) +POSTGRESQL_DEPENDENCIES += lz4 +POSTGRESQL_CONF_OPTS += --with-lz4 +else +POSTGRESQL_CONF_OPTS += --without-lz4 +endif + # required for postgresql.service Type=notify ifeq ($(BR2_PACKAGE_SYSTEMD),y) POSTGRESQL_DEPENDENCIES += systemd From fontaine.fabrice at gmail.com Mon Feb 20 22:31:51 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 23:31:51 +0100 Subject: [Buildroot] [PATCH v4, 1/1] package/libmodsecurity: needs dynamic library Message-ID: <20230220223151.12965-1-fontaine.fabrice@gmail.com> Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as mbedtls can be pulled in libcurl through libssh2 resulting in the following build failure: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init': md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a Signed-off-by: Fabrice Fontaine --- Changes v3 -> v4 (after review of Thomas Petazzoni): - Disable building statically Changes v2 -> v3: - Fix syntax Changes v1 -> v2: - Update nginx-modsecurity package/libmodsecurity/Config.in | 10 ++++------ package/nginx-modsecurity/Config.in | 9 +++------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index b15d808759..2186d216f4 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBMODSECURITY depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity embeds several mbedtls source files - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_PCRE2 help Libmodsecurity is one component of the ModSecurity @@ -17,8 +17,6 @@ config BR2_PACKAGE_LIBMODSECURITY https://github.com/SpiderLabs/ModSecurity -comment "libmodsecurity needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "libmodsecurity needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS +comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in index 5cbe57a866..f3c270ff31 100644 --- a/package/nginx-modsecurity/Config.in +++ b/package/nginx-modsecurity/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY depends on BR2_PACKAGE_NGINX_HTTP depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) # libmodsecurity + depends on !BR2_STATIC_LIBS # libmodsecurity select BR2_PACKAGE_LIBMODSECURITY help The ModSecurity-nginx connector is the connection @@ -14,8 +14,5 @@ config BR2_PACKAGE_NGINX_MODSECURITY comment "nginx-modsecurity needs a toolchain w/ C++, threads" depends on BR2_PACKAGE_NGINX_HTTP - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "nginx-modsecurity needs a toolchain w/ dynamic library" - depends on BR2_PACKAGE_NGINX_HTTP - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS -- 2.39.0 From thomas.petazzoni at bootlin.com Mon Feb 20 22:32:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:32:04 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/postgresql: add lz4 and zstd support In-Reply-To: <20230208071226.33697-1-fido_max@inbox.ru> References: <20230208071226.33697-1-fido_max@inbox.ru> Message-ID: <20230220233204.056b091a@windsurf> On Wed, 8 Feb 2023 10:12:26 +0300 Maxim Kochetkov via buildroot wrote: > PostgreSQL has optional compression support (LZ4 and Zstandard). > So enable it if libraries are available. > > Signed-off-by: Maxim Kochetkov > --- > package/postgresql/postgresql.mk | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 22:32:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:32:47 +0100 Subject: [Buildroot] [git commit branch/next] package/tinyalsa: add option to enable utility tools Message-ID: <20230220223303.7886D864C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2c1e10b8ac3531ab5a48e23c23b702cd24b3f73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add option to enable useful tools, like tinyplay, tinymix, etc. Signed-off-by: Konstantin Menyaev Signed-off-by: Thomas Petazzoni --- package/tinyalsa/Config.in | 9 +++++++++ package/tinyalsa/tinyalsa.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/tinyalsa/Config.in b/package/tinyalsa/Config.in index d9ce22c8a7..b4d4aeb276 100644 --- a/package/tinyalsa/Config.in +++ b/package/tinyalsa/Config.in @@ -13,5 +13,14 @@ config BR2_PACKAGE_TINYALSA https://github.com/tinyalsa/tinyalsa +if BR2_PACKAGE_TINYALSA + +config BR2_PACKAGE_TINYALSA_TOOLS + bool "tinyalsa tools" + help + Build utility tools (tinyplay, tinycap, tinymix, tinypcminfo) + +endif #BR2_PACKAGE_TINYALSA + comment "tinyalsa needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index b5c39e35d6..fe6d373ec8 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -9,6 +9,12 @@ TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3-Clause TINYALSA_LICENSE_FILES = NOTICE TINYALSA_INSTALL_STAGING = YES -TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled +TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled + +ifeq ($(BR2_PACKAGE_TINYALSA_TOOLS),y) +TINYALSA_CONF_OPTS += -Dutils=enabled +else +TINYALSA_CONF_OPTS += -Dutils=disabled +endif $(eval $(meson-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 22:33:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:33:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinyalsa: add option to enable utility tools In-Reply-To: <20230201060001.134150-1-KAMenyaev@sberdevices.ru> References: <20230201060001.134150-1-KAMenyaev@sberdevices.ru> Message-ID: <20230220233303.77bc24dd@windsurf> On Wed, 1 Feb 2023 09:00:01 +0300 Konstantin Menyaev via buildroot wrote: > From: Konstantin Menyaev > > Add option to enable useful tools, > like tinyplay, tinymix, etc. > > Signed-off-by: Konstantin Menyaev > --- > package/tinyalsa/Config.in | 9 +++++++++ > package/tinyalsa/tinyalsa.mk | 8 +++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 22:47:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:47:21 +0100 Subject: [Buildroot] [git commit branch/next] package/openjdk{-bin}: bump versions to 11.0.18+10 and 17.0.6+10 Message-ID: <20230220224732.1DBAE864D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc0d6bdd66e477ee0e3de0538e37d49bdfd7a9e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/openjdk-bin/openjdk-bin.hash | 8 ++++---- package/openjdk-bin/openjdk-bin.mk | 4 ++-- ...01-Add-ARCv2-ISA-processors-support-to-Zero.patch | 20 ++++++++++---------- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 4d3942125f..241ca34a04 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,10 +1,10 @@ # https://github.com/adoptium/temurin17-binaries/releases -sha256 288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48 OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz -sha256 302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz +sha256 a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289 OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz +sha256 9e0e88bbd9fa662567d0c1e22d469268c68ac078e9e5fe5a7244f56fec71f55f OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz # From https://github.com/adoptium/temurin11-binaries/releases -sha256 43fb84f8063ad9bf6b6d694a67b8f64c8827552b920ec5ce794dfe5602edffe7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz -sha256 79572f5172c6a040591d34632f98a20ed148702bbce2f57649e8ac01c0d2e3db OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14.1_1.tar.gz +sha256 4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz +sha256 04d5eeff6a6449bcdca0f52cd97bafd43ce09d40ef1e73fa0e1add63bea4a9c8 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index 608a0bc3ac..c3eb0b05e6 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_8 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.6_10 else HOST_OPENJDK_BIN_VERSION_MAJOR = 11 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.14.1_1 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.18_10 endif ifeq ($(HOSTARCH),x86_64) diff --git a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 83% rename from package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index 1ef523a419..dfd3b07bea 100644 --- a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -23,8 +23,8 @@ diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 index 5120918aed2..f7a99955874 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 -@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], - BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread" +@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], + fi fi + # Libatomic library @@ -55,7 +55,7 @@ index c0f2446dbd7..dc416ece885 100644 arm*) VAR_CPU=arm VAR_CPU_ARCH=arm -@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], +@@ -563,6 +569,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], HOTSPOT_$1_CPU_DEFINE=PPC64 # The cpu defines below are for zero, we don't support them directly. @@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c index b08caf4d5d3..2bf084895ba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,12 +95,12 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { - static Elf32_Half running_arch_code=EM_RISCV; +@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { + static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ -- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc -+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc +- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc ++ AARCH64, ALPHA, ARC ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc #endif // Identify compatibility class for VM's architecture and library's architecture diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 293787792d..0a67e7a3ec 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2fdd23261526362d4aaf58323441d4c31d29de2e374ba94bbf2727a00adc0ea7 openjdk-17.0.2+8.tar.gz -sha256 0e859cc03378439023e17ee82aecee5a52265fb38906a8bebf16027aa2b2bcf5 openjdk-11.0.14.1+1.tar.gz +sha256 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472 openjdk-17.0.6+10.tar.gz +sha256 04af71fc7adda41a49861870f9ec0ac0f059c2cf9393ce32995ea8ef4279a1b1 openjdk-11.0.18+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 42d52d57c4..0fe506bbfd 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.2+8 +OPENJDK_VERSION_MINOR = 0.6+10 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.14.1+1 +OPENJDK_VERSION_MINOR = 0.18+10 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) From thomas.petazzoni at bootlin.com Mon Feb 20 22:47:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:47:38 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/openjdk{-bin}: bump versions to 11.0.18+10 and 17.0.6+10 In-Reply-To: <20230215224712.487272-1-aduskett@gmail.com> References: <20230215224712.487272-1-aduskett@gmail.com> Message-ID: <20230220234738.40b492d3@windsurf> On Wed, 15 Feb 2023 14:47:12 -0800 Adam Duskett wrote: > Signed-off-by: Adam Duskett > --- > v1 -> v2: Add missing openjdk-bin updates Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 22:48:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:48:27 +0100 Subject: [Buildroot] [PATCH 1/2] configs/bananapi_m2_ultra_defconfig: bump Linux to 6.1 and U-Boot to 2023.01 In-Reply-To: <20230215200902.538238-1-giulio.benetti@benettiengineering.com> References: <20230215200902.538238-1-giulio.benetti@benettiengineering.com> Message-ID: <20230220234827.28c6b92f@windsurf> On Wed, 15 Feb 2023 21:09:01 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti > --- > configs/bananapi_m2_ultra_defconfig | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Both applied to next, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 21:37:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:37:15 +0100 Subject: [Buildroot] [git commit branch/next] package/wolfssl: disable assembly when not supported Message-ID: <20230220205253.CD9DF86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8dc5315eb712eca0a5cbf793a6714a47ab6e57e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next wolfssl contains some assembly code and its configure.ac script enables the assembly code depending on the CPU architecture. However, the detection logic is not sufficient and leads to using the assembly code in situation where it should not. Here are two examples: - As soon as the architecture is mips64/mips64el, it uses assembly code, but that assembly code is not mips64r6 compatible. - As soon as the architecture is RISC-V, it uses assembly code, but that assembly code uses multiplication instructions, without paying attention that the "M" extension may not be available in the RISC-V CPU instruction set. In order to avoid this, we introduce a BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS hidden boolean to decide when to enable/disable assembly code. We set an initial value with the supported CPU architectures, with the exclusion of the problematic cases described above. It is pretty likely that this variable will need tuning progressively, as it is difficult to determine which CPU variants exactly are supported by the assembly code in wolfssl. Fixes: - MIPS64 case: http://autobuild.buildroot.net/results/43e/43ee1a457cbeb986d958c9a70cac0676377661c0/ - RISC-V case: http://autobuild.buildroot.net/results/f05/f056ebe7749a69994afba39a9d4967e2774c45ea/ Signed-off-by: Thomas Petazzoni --- package/wolfssl/Config.in | 12 ++++++++++++ package/wolfssl/wolfssl.mk | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/package/wolfssl/Config.in b/package/wolfssl/Config.in index 3a97125e8d..c41bdb6888 100644 --- a/package/wolfssl/Config.in +++ b/package/wolfssl/Config.in @@ -1,3 +1,15 @@ +config BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm || BR2_armeb + default y if BR2_powerpc + default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_mips64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64el && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips || BR2_mipsel + default y if BR2_riscv && BR2_RISCV_ISA_RVM + default y if BR2_s390x + config BR2_PACKAGE_WOLFSSL bool "wolfssl" depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 8f6cba56ec..9f06bb1b4b 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -32,6 +32,12 @@ else WOLFSSL_CONF_OPTS += --disable-sslv3 endif +ifeq ($(BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS),y) +WOLFSSL_CONF_OPTS += --enable-asm +else +WOLFSSL_CONF_OPTS += --disable-asm +endif + # enable ARMv8 hardware acceleration ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm From peter at korsgaard.com Mon Feb 20 21:00:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:05 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-http-message: bump version to 6.44 Message-ID: <20230220205229.D5FF1828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79e8aad721099eb05e60b449432136691275022f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-http-message/perl-http-message.hash | 4 ++-- package/perl-http-message/perl-http-message.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-http-message/perl-http-message.hash b/package/perl-http-message/perl-http-message.hash index 0e05da644e..94b5c06a4f 100644 --- a/package/perl-http-message/perl-http-message.hash +++ b/package/perl-http-message/perl-http-message.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 17ca8ec3be118d50c5299b232f3109d7 HTTP-Message-6.37.tar.gz -sha256 0e59da0a85e248831327ebfba66796314cb69f1bfeeff7a9da44ad766d07d802 HTTP-Message-6.37.tar.gz +md5 926a077669a7828c5ca39b5cf7735625 HTTP-Message-6.44.tar.gz +sha256 398b647bf45aa972f432ec0111f6617742ba32fc773c6612d21f64ab4eacbca1 HTTP-Message-6.44.tar.gz # computed by scancpan sha256 f2f428b5f8a3bf4e6a71cd5ea92558a3d123d3d7c5075d34923e71e46dea94df LICENSE diff --git a/package/perl-http-message/perl-http-message.mk b/package/perl-http-message/perl-http-message.mk index 79402c3298..67b68b0de2 100644 --- a/package/perl-http-message/perl-http-message.mk +++ b/package/perl-http-message/perl-http-message.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_MESSAGE_VERSION = 6.37 +PERL_HTTP_MESSAGE_VERSION = 6.44 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_MESSAGE_LICENSE = Artistic or GPL-1.0+ From peter at korsgaard.com Wed Feb 8 15:24:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 16:24:25 +0100 Subject: [Buildroot] [git commit branch/next] package/xz: patch configure due to microblaze patch Message-ID: <20230220205256.61FDD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5a83df8da04f5854c2e248e23dea3af620954cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit bed21bb9b added a patch to change configure.ac but failed to update configure which caused build failures due to the timestamp difference between configure and configure.ac and the makefile attempting to run aclocal. XZ_AUTORECONF = YES creates a circular dependency where the host autotools need host-xz which also gets patched. Because of this, we need to patch xz's configure script manually and NOT patch configure.ac so its timestamp stays older than Makefile.in. While we're doing this, correct the language in the commit body of the patch, remove a stray whitespace, and fix the offset for configure.ac Fixes: bed21bb9b ("package/xz: fix microblaze compiles") Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685/ Signed-off-by: Vincent Fazio [Peter: Only patch configure] Signed-off-by: Peter Korsgaard --- .../xz/0001-Detect-symver-attribute-support.patch | 71 ++++++++++++---------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch index 9ec43ea7a0..462fa9d86b 100644 --- a/package/xz/0001-Detect-symver-attribute-support.patch +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -1,11 +1,11 @@ -From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From f0e0e8bd08b4d4e7c89a5a3b7d9a3c083f7e5432 Mon Sep 17 00:00:00 2001 From: Vincent Fazio -Date: Tue, 7 Feb 2023 08:51:24 -0600 +Date: Wed, 8 Feb 2023 12:58:37 +0000 Subject: [PATCH] Detect symver attribute support -On non-ELF platforms, such as microblaze, builds will fail when trying -to add symver information because __attribute__((symver ..)) is not -supported even though __has_attribute(__symver__) returns true. +On Microblaze, builds will fail when trying to add symver information +because __attribute__((symver ..)) is not supported even though +__has_attribute(__symver__) returns true. Support for symver needs to be detected via a compile test since __has_attribute can report false positives [0]. @@ -18,33 +18,16 @@ it is supported and define a variable to advertise support. Upstream: https://github.com/tukaani-project/xz/pull/32 Signed-off-by: Thomas Petazzoni Signed-off-by: Vincent Fazio +[Peter: patch configure instead of configure.ac so autoreconf isn't +triggered at build time] +Signed-off-by: Peter Korsgaard --- - configure.ac | 9 +++++++++ - src/liblzma/common/common.h | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) + configure | 15 +++++++++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 5ad5589..08c623a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -791,6 +791,15 @@ else - time with Libtool if neither --with-pic nor - --without-pic is used). This define must be - used together with liblzma_linux.map.]) -+ OLD_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE( -+ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } -+ ])], -+ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], -+ [Define to 1 if GCC supports the symver attribute])], -+ []) -+ CFLAGS="$OLD_CFLAGS" - ;; - *) - enable_symbol_versions=generic diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h -index 11fec52..1d2ef9c 100644 +index 671d3bc..27b56ee 100644 --- a/src/liblzma/common/common.h +++ b/src/liblzma/common/common.h @@ -76,7 +76,7 @@ @@ -52,10 +35,36 @@ index 11fec52..1d2ef9c 100644 // is available. This should be far more reliable than looking at compiler // version macros as nowadays especially __GNUC__ is defined by many compilers. -# if lzma_has_attribute(__symver__) -+# if defined(HAVE_SYMVER_ATTRIBUTE) ++# if defined(HAVE_SYMVER_ATTRIBUTE) # define LZMA_SYMVER_API(extnamever, type, intname) \ extern __attribute__((__symver__(extnamever))) \ LZMA_API(type) intname +diff --git a/configure b/configure +index ff0eed5..e685b30 100755 +--- a/configure ++++ b/configure +@@ -16687,6 +16687,21 @@ printf "%s\n" "" >&6; } + + printf "%s\n" "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h + ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO" ++then : ++ ++printf "%s\n" "#define HAVE_SYMVER_ATTRIBUTE 1" >>confdefs.h ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic -- -2.25.1 +2.34.1 From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:31 -0000 Subject: [Buildroot] [git commit branch/next] package/libnetconf2: bump version 2.2.12 Message-ID: <20230220205232.36E2A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=113e3a8fed6c89e947bea2f44672c47338d08c96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/sysrepo/sysrepo.hash | 2 +- package/sysrepo/sysrepo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index 1db33df626..a90d8259bf 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 357a50851e4cc052b484b924ed0a5808c29159a7c9d48d9b1b8c42784c4b6917 sysrepo-2.1.64.tar.gz +sha256 1bc866f13e41ba5e7e4acd52b5c3d42b1a2a1e032775e0a9b094f3265844cd25 sysrepo-2.2.12.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 0ed27e3cfb..9da8c22ca2 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.1.64 +SYSREPO_VERSION = 2.2.12 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause From thomas.petazzoni at bootlin.com Wed Feb 8 16:43:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:43:31 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: update e-mail for Frank Vanbever Message-ID: <20230220205256.AE7CB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=416213be39c6adb860a9d3e85f0a634139c27cac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0e116e92a3..32c6e54919 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1088,7 +1088,7 @@ F: package/sane-backends/ F: package/upx/ F: package/zxing-cpp/ -N: Frank Vanbever +N: Frank Vanbever F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:32 -0000 Subject: [Buildroot] [git commit branch/next] package/janus-gateway: add libcurl optional dependency Message-ID: <20230220205232.5BF22828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60cf07079b78d4c4bb495fd18cb2a145a4cb3635 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libcurl is an optional dependency which is enabled by default since at least version 0.0.9 and https://github.com/meetecho/janus-gateway/commit/ca9c0a86f975f88fbdd791af3cb4f8986883c1c2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/janus-gateway/janus-gateway.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 0d906f1b62..dd898563e5 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -128,6 +128,13 @@ else JANUS_GATEWAY_CONF_OPTS += --disable-websockets endif +ifeq ($(BR2_PACKAGE_LIBCURL),y) +JANUS_GATEWAY_DEPENDENCIES += libcurl +JANUS_GATEWAY_CONF_OPTS += --enable-turn-rest-api +else +JANUS_GATEWAY_CONF_OPTS += --disable-turn-rest-api +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) JANUS_GATEWAY_DEPENDENCIES += systemd JANUS_GATEWAY_CONF_OPTS += --enable-systemd-sockets From thomas.petazzoni at bootlin.com Wed Feb 8 15:54:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:54:35 +0100 Subject: [Buildroot] [git commit branch/next] boot/afboot-stm32: disable stack-protector Message-ID: <20230220205256.7CFCA86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c33a133704166d602090b0b0d394aa9428e6acd4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable stack-protector to avoid the following build failure: /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0003-Makefile-disable-stack-protector.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch new file mode 100644 index 0000000000..27a81b45d5 --- /dev/null +++ b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch @@ -0,0 +1,36 @@ +From d65b07d6fe438e760fdbc33a8e42650a27d5b417 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 11:09:38 +0100 +Subject: [PATCH] Makefile: disable stack-protector + +Disable stack-protector to avoid the following build failure: + +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': +stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 8f42be1..8da7a25 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ CFLAGS := -mthumb -mcpu=cortex-m4 + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Os -std=gnu99 -Wall + CFLAGS += -fno-builtin ++CFLAGS += -fno-stack-protector + LINKERFLAGS := --gc-sections + + obj-y += gpio.o mpu.o qspi.o start_kernel.o +-- +2.35.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:34 -0000 Subject: [Buildroot] [git commit branch/next] package/janus-gateway: fix libcurl build Message-ID: <20230220205232.6C2258648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=664897295a3667db2ff95c5c1b458b16c1192a47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following libcurl build failure raised since bump to version 1.1.1 in commit 01518e5660366be41e6a8e0a0f2b487d7cdf48a2: In file included from /home/autobuild/autobuild/instance-11/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/curl/curl.h:3195, from turnrest.c:21: turnrest.c: In function 'janus_turnrest_request': turnrest.c:168:2: error: void value not ignored as it ought to be 168 | curl_easy_setopt(curl, api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST, 1); | ^ Fixes: - http://autobuild.buildroot.org/results/11bb0079f5a7d06d3494a61b411f0af2e8c4d342 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...003-Use-parentheses-to-ensure-compilation.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch b/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch new file mode 100644 index 0000000000..f91c13d1f6 --- /dev/null +++ b/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch @@ -0,0 +1,27 @@ +From 51431c36cd5f2997c0f7723909195b9883ae0486 Mon Sep 17 00:00:00 2001 +From: Benson Muite +Date: Wed, 4 Jan 2023 13:33:36 +0300 +Subject: [PATCH] Use parentheses to ensure compilation (#3138) + +Compiler fails with latest Curl release. Use parenthesis to ensure compiler evaluates expression correctly. + +[Retrieved from: +https://github.com/meetecho/janus-gateway/commit/51431c36cd5f2997c0f7723909195b9883ae0486] +Signed-off-by: Fabrice Fontaine +--- + src/turnrest.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/turnrest.c b/src/turnrest.c +index b8560d22f2..42e6114de8 100644 +--- a/src/turnrest.c ++++ b/src/turnrest.c +@@ -165,7 +165,7 @@ janus_turnrest_response *janus_turnrest_request(const char *user) { + JANUS_LOG(LOG_VERB, "Sending request: %s\n", request_uri); + janus_mutex_unlock(&api_mutex); + curl_easy_setopt(curl, CURLOPT_URL, request_uri); +- curl_easy_setopt(curl, api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST, 1); ++ curl_easy_setopt(curl, (api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST), 1); + if(!api_http_get) { + /* FIXME Some servers don't like a POST with no data */ + curl_easy_setopt(curl, CURLOPT_POSTFIELDS, query_string); From thomas.petazzoni at bootlin.com Wed Feb 8 15:34:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:34:15 +0100 Subject: [Buildroot] [git commit branch/next] package/open-iscsi: new package Message-ID: <20230220205256.6F9EE86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a571acddd0badaf9636649d98fd095757878348 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: TIAN Yuanhao Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/open-iscsi/Config.in | 18 ++++++++++++++++++ package/open-iscsi/open-iscsi.hash | 3 +++ package/open-iscsi/open-iscsi.mk | 29 +++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0bb4db81bb..0e116e92a3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2791,6 +2791,7 @@ F: package/most/ N: TIAN Yuanhao F: package/cli11/ F: package/libsolv/ +F: package/open-iscsi/ F: package/open-isns/ F: package/reproc/ F: package/termcolor/ diff --git a/package/Config.in b/package/Config.in index 2adfcdbb1d..511e691ed3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2408,6 +2408,7 @@ endif source "package/odhcp6c/Config.in" source "package/odhcploc/Config.in" source "package/olsr/Config.in" + source "package/open-iscsi/Config.in" source "package/open-lldp/Config.in" source "package/open-plc-utils/Config.in" source "package/openntpd/Config.in" diff --git a/package/open-iscsi/Config.in b/package/open-iscsi/Config.in new file mode 100644 index 0000000000..e55bbfd867 --- /dev/null +++ b/package/open-iscsi/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_OPEN_ISCSI + bool "open-iscsi" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + depends on !BR2_STATIC_LIBS # kmod + select BR2_PACKAGE_KMOD + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPEN_ISNS + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + help + iSCSI tools for Linux. + + https://www.open-iscsi.com + +comment "open-iscsi needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/open-iscsi/open-iscsi.hash b/package/open-iscsi/open-iscsi.hash new file mode 100644 index 0000000000..9fd651cae8 --- /dev/null +++ b/package/open-iscsi/open-iscsi.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2 open-iscsi-2.1.8.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk new file mode 100644 index 0000000000..249253c64f --- /dev/null +++ b/package/open-iscsi/open-iscsi.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# open-iscsi +# +################################################################################ + +OPEN_ISCSI_VERSION = 2.1.8 +OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) +# The COPYING file says GPL-2.0, but there is some GPL-3.0+ code as +# well. See https://github.com/open-iscsi/open-iscsi/issues/379 +OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ +OPEN_ISCSI_LICENSE_FILES = COPYING +OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux + +OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +OPEN_ISCSI_DEPENDENCIES += systemd +OPEN_ISCSI_CONF_OPTS += -Dno_systemd=false +else +OPEN_ISCSI_CONF_OPTS += -Dno_systemd=true +endif + +define OPEN_ISCSI_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_SCSI_LOWLEVEL) + $(call KCONFIG_ENABLE_OPT,CONFIG_ISCSI_TCP) +endef + +$(eval $(meson-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:00:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:35 -0000 Subject: [Buildroot] [git commit branch/next] package/pkg-generic.mk: no legal info WARNING if REDISTRIBUTE = NO Message-ID: <20230220205232.8C4F6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c541df41806f0940128ab333d693fb7766e98da7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Packages making use of OVERRIDE_SRC_DIR or of the local SITE_METHOD, will trigger a warning when the legal-info target is built, for example: WARNING: foo: sources not saved (local packages not handled) But in the situation where the packages has explicitly defined FOO_REDISTRIBUTE = NO in its .mk file, it makes no sense since the sources wouldn't be saved anyway. This patch swap the conditions on the type of package and on the REDISTRIBUTE value, so that the warnings get issued only if REDISTRIBUTE equals YES. Signed-off-by: Nicolas Carrier Signed-off-by: Yann E. MORIN --- package/pkg-generic.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f2bea01d7d..2f8ba39edf 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1145,6 +1145,7 @@ else $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$($(2)_HASH_FILE),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) endif # license files +ifeq ($$($(2)_REDISTRIBUTE),YES) ifeq ($$($(2)_SITE_METHOD),local) # Packages without a tarball: don't save and warn @$$(call legal-warning-nosource,$$($(2)_RAWNAME),local) @@ -1155,7 +1156,6 @@ else ifneq ($$($(2)_OVERRIDE_SRCDIR),) else # Other packages -ifeq ($$($(2)_REDISTRIBUTE),YES) # Save the source tarball and any extra downloads, but not # patches, as they are handled specially afterwards. $$(foreach e,$$($(2)_ACTUAL_SOURCE_TARBALL) $$(notdir $$($(2)_EXTRA_DOWNLOADS)),\ @@ -1169,9 +1169,9 @@ ifeq ($$($(2)_REDISTRIBUTE),YES) $$($(2)_REDIST_SOURCES_DIR) || exit 1; \ printf "%s\n" "$$$${f##*/}" >>$$($(2)_REDIST_SOURCES_DIR)/series || exit 1; \ done <$$($(2)_DIR)/.applied_patches_list -endif # redistribute - endif # other packages + +endif # redistribute @$$(call legal-manifest,$$(call UPPERCASE,$(4)),$$($(2)_RAWNAME),$$($(2)_VERSION),$$(subst $$(space)$$(comma),$$(comma),$$($(2)_LICENSE)),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_ACTUAL_SOURCE_TARBALL),$$($(2)_ACTUAL_SOURCE_SITE),$$(call legal-deps,$(1))) endif # ifneq ($$(call qstrip,$$($(2)_SOURCE)),) $$(foreach hook,$$($(2)_POST_LEGAL_INFO_HOOKS),$$(call $$(hook))$$(sep)) From arnout at mind.be Thu Feb 9 20:51:47 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:51:47 +0100 Subject: [Buildroot] [git commit branch/next] package/ply: add dependency on Linux headers >= 5.5 Message-ID: <20230220205257.0F05286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2fd606b91784ced64c7312e02fcbf95f3e736d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Version 2.3.0 of ply now requires Linux headers >= 5.5 This was missing in commit b9612601b037e6deb79af300e64e0557dda1be5c ("package/ply: bump to version 2.3.0") Fixes: http://autobuild.buildroot.net/results/ce37039991cb0fb02b97d341d78327e54d0e1d26 http://autobuild.buildroot.net/results/c00714847ae92dd609bc8990df318bee58be38b8 http://autobuild.buildroot.net/results/8210bd2b9c67d6d7616ada525019b2658195416a Signed-off-by: Andreas Klinger Signed-off-by: Arnout Vandecappelle --- package/ply/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ply/Config.in b/package/ply/Config.in index 0500e7883f..f7507095c1 100644 --- a/package/ply/Config.in +++ b/package/ply/Config.in @@ -5,16 +5,16 @@ config BR2_PACKAGE_PLY_ARCH_SUPPORTS default y if BR2_powerpc default y if BR2_x86_64 -comment "ply needs a toolchain w/ dynamic library, headers >= 4.14" +comment "ply needs a toolchain w/ dynamic library, headers >= 5.5" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 || BR2_STATIC_LIBS config BR2_PACKAGE_PLY bool "ply" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # BPF_JLT + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 # BPF_JLT depends on !BR2_STATIC_LIBS help ply is a light-weight dynamic tracer for Linux. By means of From thomas.petazzoni at bootlin.com Wed Feb 8 16:43:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:43:26 +0100 Subject: [Buildroot] [git commit branch/next] package/nginx-modsecurity: bump to version 1.0.3 Message-ID: <20230220205256.A40638648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41671deec7b00de10dcc372cdeee4400df1d76ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni --- package/nginx-modsecurity/nginx-modsecurity.hash | 4 ++-- package/nginx-modsecurity/nginx-modsecurity.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nginx-modsecurity/nginx-modsecurity.hash b/package/nginx-modsecurity/nginx-modsecurity.hash index fbaf1ca239..0cd2ee07cd 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.hash +++ b/package/nginx-modsecurity/nginx-modsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.2/modsecurity-nginx-v1.0.2.tar.gz.sha256 -sha256 41a6660c50508c60df59f8f09c444d18ef8112a4c118cdc791a3992390b78c32 modsecurity-nginx-v1.0.2.tar.gz +# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.3/modsecurity-nginx-v1.0.3.tar.gz.sha256 +sha256 ae811c7208ac029cb7a99d6f63e03d3971797607517187f47620df39c1f78add modsecurity-nginx-v1.0.3.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/nginx-modsecurity/nginx-modsecurity.mk b/package/nginx-modsecurity/nginx-modsecurity.mk index 90ef8ecd51..a00c200469 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.mk +++ b/package/nginx-modsecurity/nginx-modsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_MODSECURITY_VERSION = 1.0.2 +NGINX_MODSECURITY_VERSION = 1.0.3 NGINX_MODSECURITY_SOURCE = modsecurity-nginx-v$(NGINX_MODSECURITY_VERSION).tar.gz NGINX_MODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v$(NGINX_MODSECURITY_VERSION) NGINX_MODSECURITY_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:37 -0000 Subject: [Buildroot] [git commit branch/next] package/libbpf: bump to version 1.1.0 Message-ID: <20230220205232.B96E9828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c9d6f0e1c8a99eec548b1690e1bb58d90189a44d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...-Fix-cross-compilation-for-32-bit-targets.patch | 38 ---------------------- package/libbpf/libbpf.hash | 2 +- package/libbpf/libbpf.mk | 2 +- 3 files changed, 2 insertions(+), 40 deletions(-) diff --git a/package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch b/package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch deleted file mode 100644 index 12c22f3147..0000000000 --- a/package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 68e6f83f223ebf3fbf0d94c0f4592e5e6773f0c1 Mon Sep 17 00:00:00 2001 -From: Tobias Waldekranz -Date: Fri, 14 Oct 2022 21:14:14 +0200 -Subject: [PATCH] Makefile: Fix cross-compilation for 32-bit targets - -Determining the correct library installation path (lib vs. lib64) -using uname(1) breaks in cross compilation scenarios where word widths -differ between the host and target system. - -Instead, source the information from the compilers '-dumpmachine' -option (supported by both GCC and Clang). - -We call this the "host" architecture, using the same nomenclature as -Autotools (--host configure option). - -Upstream: https://github.com/libbpf/libbpf/commit/68e6f83f223ebf3fbf0d94c0f4592e5e6773f0c1 -Signed-off-by: Tobias Waldekranz ---- - src/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 3cd0854..d535f81 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -77,7 +77,8 @@ INSTALL = install - - DESTDIR ?= - --ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(shell uname -m)),) -+HOSTARCH = $(firstword $(subst -, ,$(shell $(CC) -dumpmachine))) -+ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(HOSTARCH)),) - LIBSUBDIR := lib64 - else - LIBSUBDIR := lib --- -2.34.1 - diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index 4305872d9f..75f2b1695c 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 3d6afde67682c909e341bf194678a8969f17628705af25f900d5f68bd299cb03 libbpf-1.0.1.tar.gz +sha256 5da826c968fdb8a2f714701cfef7a4b7078be030cf58b56143b245816301cbb8 libbpf-1.1.0.tar.gz sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE sha256 e1638b9a0c68ca90fad3df1d6b4e430804d2fbdc15e58d02cffddfae38953bbf LICENSE.BSD-2-Clause sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 820f1dc4bf..b498136ace 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBPF_VERSION = 1.0.1 +LIBBPF_VERSION = 1.1.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 peter at korsgaard.com Fri Feb 10 14:08:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:08:54 +0100 Subject: [Buildroot] [git commit branch/next] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used Message-ID: <20230220205257.1C1FE86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b4d7f6e13212b4c65ec2832681719fd960e75e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Waf requires that the version of the waf script matches the version of waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as otherwise waf errors out with errors like: Waf script '2.0.24' and library '1.9.3' do not match Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour [Peter: Run as a post-patch hook as suggested by Yann] Signed-off-by: Peter Korsgaard --- package/pkg-waf.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index e090afa9e6..0e752072c8 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) define inner-waf-package +# The version of waflib has to match with the version of waf, +# otherwise waf errors out with: +# Waf script 'X' and library 'Y' do not match +define WAF_PACKAGE_REMOVE_WAF_LIB + $(RM) -fr $(@D)/waf $(@D)/waflib +endef + # We need host-python3 to run waf $(2)_DEPENDENCIES += host-python3 @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) $(2)_DEPENDENCIES += host-waf $(2)_WAF = $$(HOST_DIR)/bin/waf +$(2)_POST_PATCH_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB else $(2)_WAF ?= ./waf endif From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:38 -0000 Subject: [Buildroot] [git commit branch/next] package/bpftool: bump to version 7.1.0 Message-ID: <20230220205232.CEBBF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4db36b268d8978b65bb5ed46e8f7e57412f3097f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Use install-bin for installation instead of install as we don't want bash-completion files to be installed. Set empty host installation prefix so that we install to: $(HOST_DIR)/sbin/bpftool Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/bpftool/bpftool.hash | 2 +- package/bpftool/bpftool.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash index 92b9359fe3..cfd3c54515 100644 --- a/package/bpftool/bpftool.hash +++ b/package/bpftool/bpftool.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 465a50fea4afbacd326f2209d81ae0dcff637fbb2c9d1a315e94f79a788ce960 bpftool-v7.0.0-br1.tar.gz +sha256 35ff149cab4a3ab209b0c04cab2707243ab7ee753de5f4b5678296c975cf7fe0 bpftool-v7.1.0-br1.tar.gz sha256 7c588754d5e81e92e2a12e47cf78949d485c9c22b4850f12d21b3835c85947d1 LICENSE sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0 diff --git a/package/bpftool/bpftool.mk b/package/bpftool/bpftool.mk index 3b27698130..cd68d89799 100644 --- a/package/bpftool/bpftool.mk +++ b/package/bpftool/bpftool.mk @@ -4,7 +4,7 @@ # ################################################################################ -BPFTOOL_VERSION = v7.0.0 +BPFTOOL_VERSION = v7.1.0 BPFTOOL_SITE = https://github.com/libbpf/bpftool BPFTOOL_SITE_METHOD = git BPFTOOL_GIT_SUBMODULES = YES @@ -33,12 +33,12 @@ endef define BPFTOOL_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ - -C $(@D)/src install DESTDIR="$(TARGET_DIR)" prefix=/usr + -C $(@D)/src install-bin DESTDIR="$(TARGET_DIR)" prefix=/usr endef define HOST_BPFTOOL_INSTALL_CMDS $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - -C $(@D)/src install DESTDIR="$(HOST_DIR)" prefix=/usr + -C $(@D)/src install-bin DESTDIR="$(HOST_DIR)" prefix= endef $(eval $(generic-package)) From arnout at mind.be Thu Feb 9 20:32:43 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:32:43 +0100 Subject: [Buildroot] [git commit branch/next] package/pipewire-media-session: bump to version 0.4.2 Message-ID: <20230220205256.DC16581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1bceb4b51581e0c7b3953181ee3a2c31f0094f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Explicitly set installed_tests to disabled. Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- ...eson-remove-session-managers-option-check.patch | 36 ---------------------- .../pipewire-media-session.hash | 2 +- .../pipewire-media-session.mk | 7 +++-- 3 files changed, 6 insertions(+), 39 deletions(-) diff --git a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch b/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch deleted file mode 100644 index fc1d25edb3..0000000000 --- a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1923c97fbd0b3d8cacdb72386886f860c818bccf Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Wed, 10 Nov 2021 08:54:06 -0700 -Subject: [PATCH] meson: remove session-managers option check. - -This option no longer exists and causes a build failure if building -with the systemd system service enabled. - -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/pipewire/media-session/-/merge_requests/24] ---- - systemd/system/meson.build | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/systemd/system/meson.build b/systemd/system/meson.build -index ab0d49064..0e9885b0f 100644 ---- a/systemd/system/meson.build -+++ b/systemd/system/meson.build -@@ -4,9 +4,7 @@ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunit - systemd_config = configuration_data() - systemd_config.set('PW_MEDIA_SESSION_BINARY', media_session_bindir / 'pipewire-media-session') - --if get_option('session-managers').contains('media-session') -- configure_file(input : 'pipewire-media-session.service.in', -- output : 'pipewire-media-session.service', -- configuration : systemd_config, -- install_dir : systemd_system_services_dir) --endif -+configure_file(input : 'pipewire-media-session.service.in', -+ output : 'pipewire-media-session.service', -+ configuration : systemd_config, -+ install_dir : systemd_system_services_dir) --- -2.25.1 - diff --git a/package/pipewire-media-session/pipewire-media-session.hash b/package/pipewire-media-session/pipewire-media-session.hash index e335fd8913..e6b176eea2 100644 --- a/package/pipewire-media-session/pipewire-media-session.hash +++ b/package/pipewire-media-session/pipewire-media-session.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ebdf9f8e389896fdc4b58da5f909afce18441b4b53d5b4f2104dd53586ea8681 media-session-0.4.1.tar.bz2 +sha256 26e21852e0834a4418b40eae342ac5178dfe40342b9c5afe204d43ef8aafa14e media-session-0.4.2.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 77b9c867237ef919e33c0fdbcf22ab84b1cf24a63f9431ec68759026b658c994 LICENSE diff --git a/package/pipewire-media-session/pipewire-media-session.mk b/package/pipewire-media-session/pipewire-media-session.mk index d349fd7454..cc7317f925 100644 --- a/package/pipewire-media-session/pipewire-media-session.mk +++ b/package/pipewire-media-session/pipewire-media-session.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.1 +PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.2 PIPEWIRE_MEDIA_SESSION_SOURCE = media-session-$(PIPEWIRE_MEDIA_SESSION_VERSION).tar.bz2 PIPEWIRE_MEDIA_SESSION_SITE = https://gitlab.freedesktop.org/pipewire/media-session/-/archive/$(PIPEWIRE_MEDIA_SESSION_VERSION) PIPEWIRE_MEDIA_SESSION_LICENSE = MIT @@ -17,7 +17,10 @@ PIPEWIRE_MEDIA_SESSION_DEPENDENCIES = \ pipewire \ $(TARGET_NLS_DEPENDENCIES) -PIPEWIRE_MEDIA_SESSION_CONF_OPTS = -Ddocs=disabled -Dtests=disabled +PIPEWIRE_MEDIA_SESSION_CONF_OPTS = \ + -Ddocs=disabled \ + -Dtests=disabled \ + -Dinstalled_tests=disabled PIPEWIRE_MEDIA_SESSION_MODULE_SETS_LIST = alsa From yann.morin.1998 at free.fr Mon Feb 20 21:00:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:45 -0000 Subject: [Buildroot] [git commit branch/next] package/python-autobahn: bump to version 22.12.1 Message-ID: <20230220205233.B29278648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0cd7fadb263decfa5b4566f6ad71c02914726146 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-autobahn/python-autobahn.hash | 4 ++-- package/python-autobahn/python-autobahn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 4ae158be03..f9b68dcb22 100644 --- a/package/python-autobahn/python-autobahn.hash +++ b/package/python-autobahn/python-autobahn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/autobahn/json -md5 2921fb2bdea60b4cb36ccec367625995 autobahn-22.7.1.tar.gz -sha256 8b462ea2e6aad6b4dc0ed45fb800b6cbfeb0325e7fe6983907f122f2be4a1fe9 autobahn-22.7.1.tar.gz +md5 98d8451385ccd8ece2d2fac023c61a19 autobahn-22.12.1.tar.gz +sha256 43b4e8b1aeaeb20a0cc0a81572e613dc958057c0ab248a7d6b41b2763270f925 autobahn-22.12.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk index fb3a7b84de..4c14151960 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 22.7.1 +PYTHON_AUTOBAHN_VERSION = 22.12.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/c5/b5/c92d6640fd55cbbdd97c05800ab534d84197f7b485d89a9df981ab67cce3 +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/a8/6f/78b90951f263232e468439627f31a2c0846e36043c95af96dc527a4aeee6 PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar From yann.morin.1998 at free.fr Fri Feb 10 23:11:29 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 00:11:29 +0100 Subject: [Buildroot] [git commit branch/next] package/nodejs: add patch to adjust default NodeJS search path Message-ID: <20230220205258.1535E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0de216f95fc28c57cc430f39f011d5f88ead083b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next By default, NodeJS searches global modules in /usr/lib/node, but NPM installs them in /usr/lib/node_modules/. Therefore by default, if one installs modules with BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL, they are not accessible by NodeJS, unless by passing a NODE_PATH=/usr/lib/node_modules/ variable. Since this is not obvious, and it's nicer when things work out of the box, we simply patch NodeJS to look for modules at the right place. See https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package for some discussions on this topic. Signed-off-by: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN --- ...l-modules-cjs-loader.js-adjust-default-pa.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch new file mode 100644 index 0000000000..5b93998e5e --- /dev/null +++ b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch @@ -0,0 +1,36 @@ +From a31425bdfcb5d695ab25c3d295898326784cffec Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 25 Sep 2022 11:10:06 +0200 +Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to + search modules + +NPM installs modules in /usr/lib/node_modules/, but by default NodeJS +searches for them only in /usr/lib/node/. We could also set the +NODE_PATH environment variable, but it is more convienient to have +NodeJS configured by default to find modules where they are installed. + +This issue is discussed at +https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package. + +Signed-off-by: Thomas Petazzoni +--- + lib/internal/modules/cjs/loader.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js +index f1971c40a4..5fe3884156 100644 +--- a/lib/internal/modules/cjs/loader.js ++++ b/lib/internal/modules/cjs/loader.js +@@ -1261,7 +1261,8 @@ Module._initPaths = function() { + path.resolve(process.execPath, '..') : + path.resolve(process.execPath, '..', '..'); + +- const paths = [path.resolve(prefixDir, 'lib', 'node')]; ++ const paths = [path.resolve(prefixDir, 'lib', 'node'), ++ path.resolve(prefixDir, 'lib', 'node_modules')]; + + if (homeDir) { + ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); +-- +2.37.3 + From yann.morin.1998 at free.fr Mon Feb 20 21:00:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:46 -0000 Subject: [Buildroot] [git commit branch/next] package/python-bidict: bump to version 0.22.1 Message-ID: <20230220205233.C5F0586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1db8f1edf859a501fb8444e90a2af7916f48de42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-bidict/python-bidict.hash | 4 ++-- package/python-bidict/python-bidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-bidict/python-bidict.hash b/package/python-bidict/python-bidict.hash index fe9a94af53..bcb9ea3f34 100644 --- a/package/python-bidict/python-bidict.hash +++ b/package/python-bidict/python-bidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bidict/json -md5 da3d37ae93c740c191b5666918c3164f bidict-0.22.0.tar.gz -sha256 5c826b3e15e97cc6e615de295756847c282a79b79c5430d3bfc909b1ac9f5bd8 bidict-0.22.0.tar.gz +md5 67dd74f41341e7ff437d69e00a6fd514 bidict-0.22.1.tar.gz +sha256 1e0f7f74e4860e6d0943a05d4134c63a2fad86f3d4732fb265bd79e4e856d81d bidict-0.22.1.tar.gz # Locally computed sha256 checksums sha256 be0487398bba08e7772b4077b637787b94973b53c44b3cbdd6c7dab10ed15035 LICENSE diff --git a/package/python-bidict/python-bidict.mk b/package/python-bidict/python-bidict.mk index 7ba15db605..ae3a1ee024 100644 --- a/package/python-bidict/python-bidict.mk +++ b/package/python-bidict/python-bidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BIDICT_VERSION = 0.22.0 +PYTHON_BIDICT_VERSION = 0.22.1 PYTHON_BIDICT_SOURCE = bidict-$(PYTHON_BIDICT_VERSION).tar.gz -PYTHON_BIDICT_SITE = https://files.pythonhosted.org/packages/2b/84/159749556b9c49ea4489dadeb94d44f05d6033d1db3af4c83120ecac5b15 +PYTHON_BIDICT_SITE = https://files.pythonhosted.org/packages/f2/be/b31e6ea9c94096a323e7a0e2c61480db01f07610bb7e7ea72a06fd1a23a8 PYTHON_BIDICT_SETUP_TYPE = setuptools PYTHON_BIDICT_LICENSE = MPL-2.0 PYTHON_BIDICT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Fri Feb 10 23:13:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 00:13:08 +0100 Subject: [Buildroot] [git commit branch/next] support/testing/tests: add NodeJS tests Message-ID: <20230220205258.2136486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f25b0b6d1dcc8580f6b880eb57872b5c4064b89f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This commit adds two new test cases: - TestNodeJSBasic which builds a target configuration with just NodeJS enabled, and which runs a very simple NodeJS script on the target. - TestNodeJSModule, which builds a target configuration with NodeJS enabled + the installation of one extra module, which means npm on the host (from host-nodejs) is used, and which runs a very simple NodeJS script on the target that uses this extra module. Having both tests separately allows to validate that both nodejs-only and nodejs+host-nodejs configurations behave correctly, at least in minimal scenarios. Signed-off-by: Thomas Petazzoni Tested-by: Romain Naour Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 ++ .../testing/tests/package/sample_nodejs_basic.js | 3 ++ .../testing/tests/package/sample_nodejs_module.js | 7 +++ support/testing/tests/package/test_nodejs.py | 52 ++++++++++++++++++++++ 4 files changed, 65 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0af1323340..ae698f87c5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2944,11 +2944,14 @@ F: package/weston/ F: support/testing/tests/boot/test_grub.py F: support/testing/tests/boot/test_grub/ F: support/testing/tests/boot/test_syslinux.py +F: support/testing/tests/package/sample_nodejs_basic.js +F: support/testing/tests/package/sample_nodejs_module.js F: support/testing/tests/package/sample_python_augeas.py F: support/testing/tests/package/sample_python_flask.py F: support/testing/tests/package/sample_python_flask_expects_json.py F: support/testing/tests/package/sample_python_git.py F: support/testing/tests/package/sample_python_unittest_xml_reporting.py +F: support/testing/tests/package/test_nodejs.py F: support/testing/tests/package/test_python_augeas.py F: support/testing/tests/package/test_python_flask.py F: support/testing/tests/package/test_python_flask_expects_json.py diff --git a/support/testing/tests/package/sample_nodejs_basic.js b/support/testing/tests/package/sample_nodejs_basic.js new file mode 100644 index 0000000000..7633173c64 --- /dev/null +++ b/support/testing/tests/package/sample_nodejs_basic.js @@ -0,0 +1,3 @@ +var assert = require('assert'); +assert.strictEqual(1, 1); +console.log("Hello World"); diff --git a/support/testing/tests/package/sample_nodejs_module.js b/support/testing/tests/package/sample_nodejs_module.js new file mode 100644 index 0000000000..57aee73408 --- /dev/null +++ b/support/testing/tests/package/sample_nodejs_module.js @@ -0,0 +1,7 @@ +var assert = require('assert'); +var lodash = require('lodash'); +result = lodash.chunk(['a', 'b', 'c', 'd'], 2); +expected = [ [ 'a', 'b' ], [ 'c', 'd' ] ]; +assert.deepStrictEqual(result, expected) + + diff --git a/support/testing/tests/package/test_nodejs.py b/support/testing/tests/package/test_nodejs.py new file mode 100644 index 0000000000..9463c76b72 --- /dev/null +++ b/support/testing/tests/package/test_nodejs.py @@ -0,0 +1,52 @@ +import os + +import infra.basetest + + +class TestNodeJSBasic(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_NODEJS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), + infra.filepath("tests/package/sample_nodejs_basic.js")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + self.assertRunOk("node sample_nodejs_basic.js") + + +class TestNodeJSModule(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_NODEJS=y + BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="lodash" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), + infra.filepath("tests/package/sample_nodejs_module.js")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + self.assertRunOk("node sample_nodejs_module.js") From yann.morin.1998 at free.fr Mon Feb 20 21:00:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:47 -0000 Subject: [Buildroot] [git commit branch/next] package/python-boto3: bump to version 1.26.45 Message-ID: <20230220205233.D6EF7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63f59977dd884c36fe9a4fe4a51e3bd5d183705a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-boto3/python-boto3.hash | 4 ++-- package/python-boto3/python-boto3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-boto3/python-boto3.hash b/package/python-boto3/python-boto3.hash index 60fd07681c..eecc87ab2d 100644 --- a/package/python-boto3/python-boto3.hash +++ b/package/python-boto3/python-boto3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/boto3/json -md5 9d5447419233a259b3ade6fb86d86cb6 boto3-1.26.27.tar.gz -sha256 255a7565226c21c5d500f69aabb977e1ac07dbaf576f4428d00558e8e508a23b boto3-1.26.27.tar.gz +md5 e3777333a201a2511dd7c814782fe9f0 boto3-1.26.45.tar.gz +sha256 cc7f652df93e1ce818413fd82ffd645d4f92a64fec67c72946212d3750eaa80f boto3-1.26.45.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/python-boto3/python-boto3.mk b/package/python-boto3/python-boto3.mk index e40ac92f09..4d8fe58701 100644 --- a/package/python-boto3/python-boto3.mk +++ b/package/python-boto3/python-boto3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTO3_VERSION = 1.26.27 +PYTHON_BOTO3_VERSION = 1.26.45 PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz -PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/62/7b/7cdcb980d9d90c910a6abec2cdee0ff6aa7a3d8afea4044ffd968d5c107c +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/f5/5d/62bfcda02d90699d41d5ff2573f88b5555354fb87308e8a3427fef3956c5 PYTHON_BOTO3_SETUP_TYPE = setuptools PYTHON_BOTO3_LICENSE = Apache-2.0 PYTHON_BOTO3_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Feb 11 22:18:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:12 +0100 Subject: [Buildroot] [git commit branch/next] package/php: bump version to 8.2.2 Message-ID: <20230220205258.55C7E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a54bb2a2d99b835f672ae194dc4934757881e08b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://news-web.php.net/php.announce/345 Changelog: https://www.php.net/ChangeLog-8.php#8.2.2 Signed-off-by: Bernd Kuhls 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 a9c3b7640b..869cb9b94f 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af php-8.2.1.tar.xz +sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 372d55f68a..9ce153f4fa 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.1 +PHP_VERSION = 8.2.2 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 21:00:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:48 -0000 Subject: [Buildroot] [git commit branch/next] package/python-botocore: bump to version 1.29.45 Message-ID: <20230220205233.EA8878648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2abc0d6a3809eaa9c71043368b3915572f5d0735 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-botocore/python-botocore.hash | 4 ++-- package/python-botocore/python-botocore.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-botocore/python-botocore.hash b/package/python-botocore/python-botocore.hash index 8314c534e9..0e9d0572d7 100644 --- a/package/python-botocore/python-botocore.hash +++ b/package/python-botocore/python-botocore.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/botocore/json -md5 488df64a4fcd884f9fbcf990bdc8b34c botocore-1.29.27.tar.gz -sha256 0932b22d8737b11037adf7e734f9b90425b575d0757e4c1a035e99f382955221 botocore-1.29.27.tar.gz +md5 3946a693e09b65a0f6615a1a30f606d7 botocore-1.29.45.tar.gz +sha256 62ae03e591ff25555854aa338da35190ffe18c0b1be2ebf5cfb277164233691f botocore-1.29.45.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt diff --git a/package/python-botocore/python-botocore.mk b/package/python-botocore/python-botocore.mk index 4b14af4368..ceb3fbe6ea 100644 --- a/package/python-botocore/python-botocore.mk +++ b/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.29.27 +PYTHON_BOTOCORE_VERSION = 1.29.45 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/08/3f/e9f97b0700e0be670404a7d4a9ac62fd59495897f15c928dd38874e98ef7 +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/9d/4f/1c24126941d1f8c1f2ecf459f88959d59566af34a55a81d926368fd2e6e5 PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt From fontaine.fabrice at gmail.com Mon Feb 20 23:19:02 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 00:19:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build without C++ Message-ID: <20230220231902.340496-1-fontaine.fabrice@gmail.com> Commit dedbc69022ba0beaf259463ac8082c86776f7e88 was incomplete resuling in the following build failure since the addition of the package in commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: -- Check for working CXX compiler: /usr/bin/c++ - broken CMake Error at /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message): The C++ compiler "/usr/bin/c++" is not able to compile a simple test program. It fails with the following output: Change Dir: /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp Run Build Command(s):/home/autobuild/make/make -f Makefile cmTC_bfb29/fast && make[1]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make CMakeFiles/cmTC_bfb29.dir/build make[2]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o /usr/bin/c++ --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx c++: error: unrecognized command-line option '-mlongcalls' c++: error: unrecognized command-line option '-mauto-litpools' make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 make[2]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 make[1]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' CMake will not be able to correctly generate this project. Call Stack (most recent call first): lib/msgpack-c/CMakeLists.txt:2 (project) While at it, add missing comment about C++ dependency for wasm Fixes: - http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda Signed-off-by: Fabrice Fontaine --- .../fluent-bit/0003-fix-build-without-C.patch | 131 ++++++++++++++++++ package/fluent-bit/Config.in | 4 + 2 files changed, 135 insertions(+) create mode 100644 package/fluent-bit/0003-fix-build-without-C.patch diff --git a/package/fluent-bit/0003-fix-build-without-C.patch b/package/fluent-bit/0003-fix-build-without-C.patch new file mode 100644 index 0000000000..16afec3fe5 --- /dev/null +++ b/package/fluent-bit/0003-fix-build-without-C.patch @@ -0,0 +1,131 @@ +From 014e44808ebaf29b0c25b5a3fa2e35a99a30f628 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 00:09:57 +0100 +Subject: [PATCH] fix build without C++ + +Fix the following build failure without C++: + +-- Check for working CXX compiler: /usr/bin/c++ - broken +CMake Error at /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message): + The C++ compiler + + "/usr/bin/c++" + + is not able to compile a simple test program. + + It fails with the following output: + + Change Dir: /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp + + Run Build Command(s):/home/autobuild/make/make -f Makefile cmTC_bfb29/fast && make[1]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make CMakeFiles/cmTC_bfb29.dir/build + make[2]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o + /usr/bin/c++ --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx + c++: error: unrecognized command-line option '-mlongcalls' + c++: error: unrecognized command-line option '-mauto-litpools' + make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 + make[2]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 + make[1]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + + CMake will not be able to correctly generate this project. +Call Stack (most recent call first): + lib/msgpack-c/CMakeLists.txt:2 (project) + +Fixes: + - http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/fluent/fluent-bit/pull/6893] +--- + lib/chunkio/CMakeLists.txt | 2 +- + lib/lwrb/CMakeLists.txt | 2 +- + lib/msgpack-c/CMakeLists.txt | 2 +- + lib/onigmo/CMakeLists.txt | 2 +- + lib/snappy-fef67ac/CMakeLists.txt | 2 +- + lib/tutf8e/CMakeLists.txt | 2 +- + src/stream_processor/CMakeLists.txt | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt +index 233bce35c..8bfe5199d 100644 +--- a/lib/chunkio/CMakeLists.txt ++++ b/lib/chunkio/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.0) +-project(chunk-io) ++project(chunk-io C) + + set(CIO_VERSION_MAJOR 1) + set(CIO_VERSION_MINOR 4) +diff --git a/lib/lwrb/CMakeLists.txt b/lib/lwrb/CMakeLists.txt +index 2fabd6319..031cbc1dd 100644 +--- a/lib/lwrb/CMakeLists.txt ++++ b/lib/lwrb/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.0) + + # Setup project +-project(LwLibPROJECT) ++project(LwLibPROJECT C) + + # ------------------------------------------------- + # This CMakeLists.txt is used only if it is a top-level file. +diff --git a/lib/msgpack-c/CMakeLists.txt b/lib/msgpack-c/CMakeLists.txt +index 810ad609a..ffbbc5ddb 100644 +--- a/lib/msgpack-c/CMakeLists.txt ++++ b/lib/msgpack-c/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(msgpack-c) ++project(msgpack-c C) + + set(src + src/objectc.c +diff --git a/lib/onigmo/CMakeLists.txt b/lib/onigmo/CMakeLists.txt +index 4a3b30d7d..66865130a 100644 +--- a/lib/onigmo/CMakeLists.txt ++++ b/lib/onigmo/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.4) +-project(onigmo) ++project(onigmo C) + + # Onigmo Version + set(ONIGMO_VERSION_MAJOR 6) +diff --git a/lib/snappy-fef67ac/CMakeLists.txt b/lib/snappy-fef67ac/CMakeLists.txt +index 8bb1e9598..ae9225c49 100644 +--- a/lib/snappy-fef67ac/CMakeLists.txt ++++ b/lib/snappy-fef67ac/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(snappy-c) ++project(snappy-c C) + + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +diff --git a/lib/tutf8e/CMakeLists.txt b/lib/tutf8e/CMakeLists.txt +index 35cbe01ad..a056ef83c 100644 +--- a/lib/tutf8e/CMakeLists.txt ++++ b/lib/tutf8e/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(tutf8e) ++project(tutf8e C) + + # Not supported: -std=c90 (lacks support for inline) + # Supported: -std=gnu90, -std=c99 or -std=gnu99 +diff --git a/src/stream_processor/CMakeLists.txt b/src/stream_processor/CMakeLists.txt +index 8c5d70d13..de2c2fe38 100644 +--- a/src/stream_processor/CMakeLists.txt ++++ b/src/stream_processor/CMakeLists.txt +@@ -1,4 +1,4 @@ +-project(stream-processor) ++project(stream-processor C) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +-- +2.39.0 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index f53eacb447..bfdea895b0 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -30,6 +30,10 @@ config BR2_PACKAGE_FLUENT_BIT_WASM help Support for WASM-based plugins. +comment "wasm runtime support needs a toolchain w/ C++" + depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP + endif comment "fluent-bit needs a toolchain w/ threads, dynamic library" -- 2.39.0 From ju.o at free.fr Mon Feb 20 23:42:00 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 21 Feb 2023 00:42:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/highway: bump to version 1.0.3 Message-ID: <20230220234200.464390-1-ju.o@free.fr> - Dropped patch upstreamed in: https://github.com/google/highway/commit/1cab22047a6ef750ef2bc38ad47d6e765d6d376a - Add an upstream patch, not in 1.0.3 release: https://github.com/google/highway/commit/411300d0eec10d5635cbdd064299630c507348e1 - Add a new patch, to fix armv7 builds with vfp < v4. Proposed upstream in: https://github.com/google/highway/pull/1143 - Add a comment about -DHWY_CMAKE_ARM7=OFF since the name is a bit misleading. It should better be ARMV7 or ARMV7_VFPV4. For change log since 1.0.2, see: - https://github.com/google/highway/releases/tag/1.0.3 Signed-off-by: Julien Olivain --- Tested on top of branch master at commit 9cd2e6e with commands: make check-package ... 0 warnings generated support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_highway ... OK utils/test-pkg -a -p highway ... 45 builds, 7 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- ...Check-for-the-presence-of-sys-auxv.h.patch | 62 --------- ...Fix-compilation-for-armv7-with-gcc-8.patch | 46 +++++++ ...for-armv7-targets-with-vfp-v4-and-gc.patch | 118 ++++++++++++++++++ package/highway/highway.hash | 2 +- package/highway/highway.mk | 5 +- 5 files changed, 169 insertions(+), 64 deletions(-) delete mode 100644 package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch create mode 100644 package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch create mode 100644 package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch deleted file mode 100644 index df86798613..0000000000 --- a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Wed, 23 Nov 2022 23:27:11 +0100 -Subject: [PATCH] Check for the presence of - -Not all gcc versions are providing . Checking for -HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not -sufficient and fail to build in some situations (it was observed for -some gcc armv7m toolchains). - -This patch adds a check for and include it only if present. - -Signed-off-by: Julien Olivain ---- - CMakeLists.txt | 3 +++ - hwy/detect_targets.h | 2 +- - hwy/targets.cc | 2 +- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b6b14ab..df6b5ab 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -84,6 +84,9 @@ check_cxx_source_compiles( - HWY_RISCV - ) - -+include(CheckIncludeFile) -+check_include_file(sys/auxv.h HAVE_SYS_AUXV_H) -+ - if (HWY_ENABLE_CONTRIB) - # Glob all the traits so we don't need to modify this file when adding - # additional special cases. -diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h -index 7f7e179..f0c6f94 100644 ---- a/hwy/detect_targets.h -+++ b/hwy/detect_targets.h -@@ -392,7 +392,7 @@ - #define HWY_HAVE_RUNTIME_DISPATCH 1 - // On Arm, currently only GCC does, and we require Linux to detect CPU - // capabilities. --#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX -+#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX && HAVE_SYS_AUXV_H - #define HWY_HAVE_RUNTIME_DISPATCH 1 - #else - #define HWY_HAVE_RUNTIME_DISPATCH 0 -diff --git a/hwy/targets.cc b/hwy/targets.cc -index 2fde4db..abd6a94 100644 ---- a/hwy/targets.cc -+++ b/hwy/targets.cc -@@ -42,7 +42,7 @@ - #include - #endif // HWY_COMPILER_MSVC - --#elif HWY_ARCH_ARM && HWY_OS_LINUX -+#elif HWY_ARCH_ARM && HWY_OS_LINUX && HAVE_SYS_AUXV_H - #include - #include - #endif // HWY_ARCH_* --- -2.38.1 - diff --git a/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch b/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch new file mode 100644 index 0000000000..0634460453 --- /dev/null +++ b/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch @@ -0,0 +1,46 @@ +From 94cda9cc8cd12345a6dbe70e40f3119d5bf7ee78 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 10 Feb 2023 21:25:36 +0100 +Subject: [PATCH] Fix compilation for armv7 with gcc < 8 + +Highway uses the construct __attribute__((target(+neon-vfpv4)) for +Armv7. The target "+neon-vfpv4" was introduced in gcc 8, in commit [1]. +When using a gcc < 8 (for example, like [2]), compilation fails with +message: + + In file included from /build/highway-1.0.3/hwy/foreach_target.h:81:0, + from /build/highway-1.0.3/hwy/per_target.cc:20: + /build/highway-1.0.3/hwy/per_target.cc: At global scope: + /build/highway-1.0.3/hwy/per_target.cc:23:22: error: attribute(target("+neon-vfpv4")) is unknown + +This commit protects the definition of HWY_TARGET_STR only when gcc +version 8 or greater is used for armv7. + +[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e87afe54b86c478ae63569e51e7abb67d3fe3fce +[2] https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/arm-linux-gnueabihf/gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz + +Signed-off-by: Julien Olivain +--- + hwy/ops/set_macros-inl.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/hwy/ops/set_macros-inl.h b/hwy/ops/set_macros-inl.h +index 051dbb3..00b4b1b 100644 +--- a/hwy/ops/set_macros-inl.h ++++ b/hwy/ops/set_macros-inl.h +@@ -230,7 +230,12 @@ + // Can use pragmas instead of -march compiler flag + #if HWY_HAVE_RUNTIME_DISPATCH + #if HWY_ARCH_ARM_V7 ++#if HWY_COMPILER_GCC_ACTUAL >= 800 ++// The __attribute__((target(+neon-vfpv4)) was introduced in gcc >= 8. ++// In case we have a gcc < 8, we can still compile by keeping ++// HWY_TARGET_STR undefined. + #define HWY_TARGET_STR "+neon-vfpv4" ++#endif + #else + #define HWY_TARGET_STR "+crypto" + #endif // HWY_ARCH_ARM_V7 +-- +2.39.2 + diff --git a/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch b/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch new file mode 100644 index 0000000000..f9b1a1aa91 --- /dev/null +++ b/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch @@ -0,0 +1,118 @@ +From 93d4579f90dd6ad26fd0dcda6420b3bb2fdcbc02 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Mon, 20 Feb 2023 23:22:28 +0100 +Subject: [PATCH] Fix compilation for armv7 targets with vfp < v4 and gcc >= 8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When using a armv7 gcc >= 8 toolchain (like [1]) with Highway +configured with -DHWY_CMAKE_ARM7=OFF and HWY_ENABLE_CONTRIB=ON, +compilation fails with error: + + In file included from /build/highway-1.0.3/hwy/ops/arm_neon-inl.h:33, + from /build/highway-1.0.3/hwy/highway.h:358, + from /build/highway-1.0.3/hwy/contrib/sort/shared-inl.h:104, + from /build/highway-1.0.3/hwy/contrib/sort/traits128-inl.h:27, + from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:23, + from /build/highway-1.0.3/hwy/foreach_target.h:81, + from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:20: + /toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h: In function 'void hwy::N_NEON::StoreU(Vec128, Full128, uint64_t*)': + /toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h:11052:1: error: inlining failed in call to 'always_inline' 'void vst1q_u64(uint64_t*, uint64x2_t)': target specific option mismatch + 11052 | vst1q_u64 (uint64_t * __a, uint64x2_t __b) + | ^~~~~~~~~ + /build/highway-1.0.3/hwy/ops/arm_neon-inl.h:2786:12: note: called from here + 2786 | vst1q_u64(unaligned, v.raw); + | ~~~~~~~~~^~~~~~~~~~~~~~~~~~ + +The same errors happen when configured with HWY_ENABLE_EXAMPLES=ON, +or from client libraries like libjxl (at other places). + +The issue is that Highway Arm NEON ops have a dependency on the +Advanced SIMD (Neon) v2 and the VFPv4 floating-point instructions. +The SIMD (Neon) v1 and VFPv3 instructions are not supported. + +There was several attempts to fix variants of this issues. +See #834 and #1032. + +HWY_NEON target is selected only if __ARM_NEON is defined. See: +https://github.com/google/highway/blob/1.0.3/hwy/detect_targets.h#L251 + +This test is not sufficient since __ARM_NEON will be predefined in +any cases when Neon is enabled (neon-vfpv3, neon-vfpv4). + +The issue is that HWY_CMAKE_ARM7=ON implies VFPv4 / NEON SIMD v2. +When setting HWY_CMAKE_ARM7=OFF, "neon-vfpv4" will not be forced, +but the code is still using intrinsics assuming VFPv4. Gcc will fail +with error because code cannot be generated for the selected +architecture. + +This issue can be avoided by adding "-DHWY_DISABLED_TARGETS=HWY_NEON" in +CXXFLAGS. The problem with this solution is that every client program will +also need to do the same. This goes against the very purpose of +"hwy/detect_targets.h". + +Technically, Armv7-a processors with VFPv4 can be detected using some +ACLE (Arm C Language Extensions [2]) predefined macros: + +Basically, we want Highway to define HWY_NEON only when the target +supports SIMDv2/VFPv4 or higher. An older target with vfpv3 only +(e.g. Cortex-A8, A9, ...) would NOT define HWY_NEON, and therefore +would fallback on HWY_SCALAR implementation. + +However, not all compiler completely support ACLE. There is also +several versions too. So we cannot easily rely on macros like +"__ARM_VFPV4__" (which clang predefine, but not gcc). + +The alternative solution proposed in this patch, is to declare the +HWY_NEON target architecture as broken, when we detect the target is +Armv7-A, but mandatory features for vfpv4 (namely half-float, FMA) +are missing. Half-floats are tested using the macro __ARM_NEON_FP, +and the FMA with the macro __ARM_FEATURE_FMA. See ACLE [2]. The +intent of declaring the target as broken, rather than selecting +HWY_NEON only if vfpv4 features are detected is to remain a bit +conservative, since the detection is slithly inaccurate. + +For a given compiler/cflags, predefined macros for Arm/ACLE can be +reviewed with commands like: + + arm-linux-gnueabihf-gcc -mcpu=cortex-a9 -mfpu=neon-vfpv3 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + arm-linux-gnueabihf-gcc -mcpu=cortex-a7 -mfpu=neon-vfpv4 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + clang -target armv7a -mcpu=cortex-a9 -mfpu=neon-vfpv3 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + clang -target armv7a -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + +The different values of __ARM_NEON_FP can be seen, depending which +"-mfpu" is passed. Same for __ARM_FEATURE_FMA. + +[1] https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2022.08-1.tar.bz2 +[2] https://github.com/ARM-software/acle/ + +Signed-off-by: Julien Olivain +--- + hwy/detect_targets.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h +index 2beca95..40ae7fe 100644 +--- a/hwy/detect_targets.h ++++ b/hwy/detect_targets.h +@@ -154,6 +154,16 @@ + (defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN)) + #define HWY_BROKEN_TARGETS (HWY_NEON) + ++// armv7-a without a detected vfpv4 is not supported ++// (for example Cortex-A8, Cortex-A9) ++// vfpv4 always have neon half-float _and_ FMA. ++#elif HWY_ARCH_ARM_V7 && \ ++ (__ARM_ARCH_PROFILE == 'A') && \ ++ !defined(__ARM_VFPV4__) && \ ++ !((__ARM_NEON_FP & 0x2 /* half-float */) && \ ++ (__ARM_FEATURE_FMA == 1)) ++#define HWY_BROKEN_TARGETS (HWY_NEON) ++ + // SVE[2] require recent clang or gcc versions. + #elif (HWY_COMPILER_CLANG && HWY_COMPILER_CLANG < 1100) || \ + (HWY_COMPILER_GCC_ACTUAL && HWY_COMPILER_GCC_ACTUAL < 1000) +-- +2.39.2 + diff --git a/package/highway/highway.hash b/package/highway/highway.hash index 3ff468443e..16a9282176 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db highway-1.0.2.tar.gz +sha256 566fc77315878473d9a6bd815f7de78c73734acdcb745c3dde8579560ac5440e highway-1.0.3.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE diff --git a/package/highway/highway.mk b/package/highway/highway.mk index ed7f6ca871..56d63a83f9 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.0.2 +HIGHWAY_VERSION = 1.0.3 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 HIGHWAY_LICENSE_FILES = LICENSE @@ -35,6 +35,9 @@ endif ifeq ($(BR2_ARM_FPU_VFPV4),y) HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=ON else +# Highway Armv7 Neon support requires in fact vfpv4 / neon v2. When we +# are in a vfpv3 case (e.g. Cortex-A8, Cortex-A9) this flag need to be +# set to off. HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=OFF endif -- 2.39.2 From james.hilliard1 at gmail.com Tue Feb 21 01:22:38 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 20 Feb 2023 18:22:38 -0700 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.67.1 Message-ID: <20230221012238.3809280-1-james.hilliard1@gmail.com> Link to Rust 1.67.1 announcement: https://blog.rust-lang.org/2023/02/09/Rust-1.67.1.html Drop patch which is now upstream. Signed-off-by: James Hilliard --- package/rust-bin/rust-bin.hash | 252 +++++++++--------- package/rust-bin/rust-bin.mk | 2 +- ...-unsoundness-in-bootstrap-cache-code.patch | 43 --- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 5 files changed, 131 insertions(+), 174 deletions(-) delete mode 100644 package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d00e6342e8..11cfae5e9b 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc -sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc -sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc -sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 b7b8e8b70cae457092661894efa5a4861ef4f0e20f2f617d05d6f17b1f780a68 rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 b686a2d0d1648e1b84def715dd65a85a3d2802b33ecf65808bdb2ed639aec7d3 rust-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 c9df968487707eb63207f63086daed4fe1484829fb6221bd9414de2700424995 rust-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 4f56194a354b1413fb973d25f1c895aaa8e85211d316755508d6848e3a4fe18b rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 852e5a714ea8d2737f2cd5b0d6a12ecfa712b75238c643ba8138b490fc39fc43 rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0a5bc85383d5d9d077dccaad1fb213d9498b6137112aaaabced6eb079fe12c9e rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 574851ff8503df9cb0dd04e6a1cd0ce5d709b5ea8b9c1265b314b9e182c818da rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 50e98fefef58218bd2c09c826308d43abe11b05f528b08ecca3d2657d7996630 rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 6e8629ace0c1b9cc0c2bc6225e6716df852370e5c7e907815ff8e6241e427699 rust-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 7dbb718bdb09adad7e36b9a413e571863913682495527f7f2d6507ea2c068542 rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 35027409400faaaa38ea2855b92dea6b553b2e656dff735da730f67ac02e57e6 rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 dcd3926c151cdd33d4de2860f021c86a18556809c4d06cbddebc1b377638710a rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 da42d5b07984dac9a41719511eeb47cbb6c5e70b32a6eacba96c9f860ced0307 rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 3b95c9595db3e10077c4eca8f63d80414bf3a50c1f0f6b2ac33f1992ee0940db rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 767761d99846174dfb7dfb579e2e2be63800478858a82f3f7050cc9555209a89 rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 1e53306124de9f282452bd6085e86918e5e9f6f1940fc79809a1b284272e2d2b rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 3e8bb4265c8c6d8984b69eeefe015131ea140148a58179b3abec5653d93bea7d rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 cbfce327b623e341c1243f0d29ef2f60e5fb205d406c79eb8be1433652c3c9a5 rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 b6d00c4e338744ce1bf5b314f1056472acf1eb416f65057a8b3ca0a992fb04df rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 8a7e46b15adb0718b4e4ee33cd46529117411e8d73c29043778b05e7412c2b46 rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 6102f98617dd37874f3d755d0a325b45d47c6e1715c39d5e9bc037992e4d3cd6 rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 720958bc039c9ff00e7e399adf45f044484c5695a71bde0d07e0c895a819fe74 rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 22cbbf0b22d9b0894cfbd6e1dd6b95b71c7ad02cee4e477d375dcf81af8d1337 rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.asc +sha256 49beb678732f34a0bfc22f94900c3d4a17ec05effdb7377864042df73b2a2819 rust-std-1.67.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 aab2d7aa76793e78c9c8810e93ed8978f6422843b1277e9c60337b0f943a4409 rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.asc +sha256 a2c6e55a8a2987d0c306d2c164347a70ab7a6a18f6562039a772b33e25934972 rust-std-1.67.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 048b3da190212b742f7a052618b57683dc96ee2b6c25fc7f5ae751143cb79bad rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.asc +sha256 b9ef413b764a92d42e07a2e588268ece09994d2cd1ab2a93858c27f85a250349 rust-std-1.67.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 ef7fe3160de629f0d38788f2c270f87b0631480e5b0d848595b460528de719e4 rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 15fdb3e8b39c8a122e9beee0c4c909ee8ec356e57aaaaae5f2b9e94f58d73c87 rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 6ccfd98fd920cc2f1199bcf9a842430c27f6fcd2cc46c18421e487309ff7811e rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 78477c45f5b848b156adaf0e0f6f2954ae73e2903321d1636c155020175eaaf5 rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 94410897626546dde806a114299c3c32abb6b4b294af5daea5c4d136751fe063 rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 b3f1a338e69428f1611f059c67b8afafa78ce5c7ed0799f8a90795390261d3a4 rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 26efe78c09ed36da34964c0d023cf9aa404766ab790a94d9becd373b8879cb5a rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 135f5e6ab6d8f077a14521d387d3f31831abdb840ca4e6a15b6f0d0d5b7dbc81 rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 364c47ed22e4268edf238d221c40007d7d8792a66ca325d3937596a9c911ea48 rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 63a7e6a6c889a3d01bb3c66a3def3e41963511ea52e13906669da5b29b2fd9da rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 04573298d9e815c1e8c47a2f9548ea55d4a2afc538eceaa6a704d44a5e1f7e3e rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 addf0b0beb1966787e599f32849f18c28d5cb65515272b7d9608d4a1dddee2e7 rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 f4dc8468dfc1dbd86f865b10f06e0e4b4e76f5a3a1cc27317a520ab1660844e9 rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 89741cd2ac00c3a3f565bcccdf442cc1f9ec58ea419f1f0d09e911be0ff86c87 rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index d62ce39cfc..bb66de5ec5 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.67.0 +RUST_BIN_VERSION = 1.67.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch deleted file mode 100644 index 3eae34642f..0000000000 --- a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 -From: Michael Goulet -Date: Mon, 12 Dec 2022 18:29:33 +0000 -Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= - =?UTF-8?q?ap=20cache=20code?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) -Signed-off-by: Sebastian Weyer ---- - src/bootstrap/cache.rs | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs -index be5c9bb0788..05f25af68ea 100644 ---- a/src/bootstrap/cache.rs -+++ b/src/bootstrap/cache.rs -@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { - - impl Deref for Interned { - type Target = T::Target; -- fn deref(&self) -> &'static Self::Target { -+ fn deref(&self) -> &Self::Target { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } -+ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } - } - } - - impl, U: ?Sized> AsRef for Interned { -- fn as_ref(&self) -> &'static U { -+ fn as_ref(&self) -> &U { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } -+ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } - } - } - --- -2.25.1 - diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 2a260ca64f..1b4b08cecc 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc -sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.asc +sha256 77e0615011f887d9533d5374bf9c15c590c3caf32bbb035b392d1c2ae502a682 rustc-1.67.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index d14ad3a3e7..814a3c1dd4 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.67.0 +RUST_VERSION = 1.67.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT -- 2.34.1 From thomas.petazzoni at bootlin.com Tue Feb 21 07:38:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 07:38:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-20 Message-ID: <20230221073840.84D8442A6B@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-20 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 13 | 12 | 0 | 25 | master | 153 | 139 | 2 | 294 | next | 2 | 0 | 0 | 2 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 8 host-pahole-1.24 | 7 linux-6.1.11 | 7 unknown | 7 host-binutils-2.38 | 5 host-go-1.19.6 | 5 elfutils-0.186 | 4 speechd-0.11.4 | 4 busybox-1.36.0 | 3 glibc-2.36-81-g4f4d7a13edfd... | 3 host-binutils-2.37 | 3 host-libarchive-3.6.2 | 3 host-rust-1.67.0 | 3 libgcrypt-1.10.1 | 3 libglib2-2.72.3 | 3 systemd-252.4 | 3 brltty-6.5 | 2 fftw-quad-3.3.8 | 2 fontconfig-2.13.1 | 2 freeradius-client-1.1.7 | 2 gerbera-1.10.0 | 2 gobject-introspection | 2 host-binutils-2.39 | 2 netsurf-3.10 | 2 olsr-0.9.8 | 2 python-numpy-1.23.5 | 2 valgrind-3.19.0 | 2 xfsprogs-5.14.2 | 2 zabbix-6.2.7 | 2 acpid-2.0.34 | 1 android-tools-4.2.2+git2013... | 1 boost-1.80.0 | 1 btrfs-progs-5.16.2 | 1 containerd-1.6.16 | 1 docker-cli-23.0.0 | 1 fdk-aac-2.0.2 | 1 flac-1.4.2 | 1 fluent-bit-2.0.9 | 1 fs/ubi/ubi.mk:51: /home/bui... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fstrcmp-0.7.D001 | 1 glslsandbox-player-2021.08.24 | 1 gvfs-1.48.1 | 1 host-gcc-final-11.3.0 | 1 host-gcc-final-12.2.0 | 1 libcpprestsdk-2.10.18 | 1 libgpg-error-1.46 | 1 libjxl-0.7.0 | 1 libnss-3.88.1 | 1 linux-5.10.162-cip24 | 1 linux-5.10.162-cip24-rt10 | 1 lirc-tools-0.10.2 | 1 ltp-testsuite-20220930 | 1 multipath-tools-0.9.4 | 1 mutt-2.2.9 | 1 ntp-4.2.8p15 | 1 optee-client-3.19.0 | 1 opus-1.3.1 | 1 perl-5.36.0 | 1 php-8.2.3 | 1 pixz-1.0.7 | 1 qemu-7.2.0 | 1 quickjs-2021-03-27 | 1 ruby-3.1.3 | 1 syslinux-6.03 | 1 uclibc-1.0.42 | 1 ulog-0389d243352255f6182326... | 1 uqmi-0a19b5b77140465c29e2af... | 1 wolfssl-5.5.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/e3180b157da82a873e26d82a214bf45209a1e3b8 | ORPH powerpc64le | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/4cbc60e95e38bbb1d0c5d4ecc504e5da8ae22af4 | arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/4cf51b37c785eed8f5e950fe26e79e8fb20c8566 | microblaze | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/2529778cc04100e9b901323808d3274ea83bd4f8 | microblaze | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/d496753fa4e5f47dec317b1b81c098bdbbae0238 | or1k | btrfs-progs-5.16.2 | NOK | http://autobuild.buildroot.net/results/893288c3b7ab58a8d15e1f96ee30ae19d2e8312a | ORPH mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/a67bbd05aa05e926512a58f5e534635b73c4d03a | ORPH mips64 | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/3ad70dc07bbae130b74bf699e249cbf116d81010 | ORPH arm | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/6ed313724af39600c19e639e7ae7aeb60109828a | ORPH arm | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/8cae16a62a81d9ea998a1248bb377d129db33ea5 | x86_64 | docker-cli-23.0.0 | NOK | http://autobuild.buildroot.net/results/c8be4259dd17753f79eee10c36a3f5f80b7672fc | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/1ee3401edeae9430303ffdea35bfbea5921a2b3d | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/62ad9d9e29485e57df6fccdb55e736f984dd4ae5 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/77f471b242682c7af39d5c42becd1ba03f67e68e | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/d10e2fb80131f6358d297dff596ab6141c28c603 | ORPH x86_64 | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/8ec43c2db6dd7f308bcf02bec4e12ab33632e3f5 | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/e5524c2e43dbb7fe5f517b553e18e55927fdde5f | ORPH powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/1d9c3980b45c0d8d1bd3880983e83893e5e54a53 | ORPH sh4a | flac-1.4.2 | NOK | http://autobuild.buildroot.net/results/7d426e2650e409ca73cf289b4d7dab7dcbf214e3 | xtensa | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/cb5a21a6f5bf39e09919c4ec915d5aa6480f7aa9 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/21ac1bdc72848aeaefe85fff95700f1c761a65f5 | ORPH riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/22d258b0b35ce5cea180d392c4259d2a85dd5d17 | riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/b11001f71bed7b5ea58f8b70f7539b4f4ee32a0f | mips | fs/ubi/ubi.mk:51: /home/bui... | NOK | http://autobuild.buildroot.net/results/a70b5a8fbac22269ac5d21ee10542131214b5ff8 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/6480b3aef0e0aa2adea1da0d35f3573c9d6b2f16 | microblaze | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/af49f968088530b66082641464d5b2df7b5ec63e | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/e60048d62b7ac4c5651cf98c7842840f6db765b3 | or1k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/33e2b14f31d1faf1b41df11db113a5c3fb347924 | or1k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/e5c0bc96e2b8c7fa9b50096b0021c92f62753019 | armeb | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/56dda0c224c04d68747cfc4c2045165fc2bc2d71 | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/0c9cc1d43daccd21b16de1ea21322c7b1e9a1bbd | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/22275e769ac373961971fb44695d645d7687f123 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/fa8e220621a2ac472346fa14ad9a7006a1274b8d | powerpc64 | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/3ed5e504e7f994b1e103e9fa6a8b324126eff5f7 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/2aec85e60080e8abcb0200bf2b60807f35eba2bf | aarch64 | glslsandbox-player-2021.08.24 | NOK | http://autobuild.buildroot.net/results/ac765b0ff5f914df4087ae4691fe711dc912f03b | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/9303b861da97521c25bd2898ea044f37c01ad5bf | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/3bead068b84e8a40077c8bef57d90a5ab47a18c2 | microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/358bc905ee73e70dd41a1347174577c905bd82a0 | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/86adfc65a263e02ebf1f9acf75574c7c1f212dfd | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/4657f21099bfa7d52dcec08dc09d8bf6b74fa34b | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/fab352ec1be76fca9b4133ab58b109a56a75ceb3 | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/55df3b1bc4aed899f9bf673045f633f0e27a05ec | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1d7775d5538c765d23bf5619219739679824e3ab | ORPH mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/60cd771ca50accf6cf19f66226c42a9edb7930f1 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f2a649a36e9cc5a27dc1a5bfd7af85e703e282c8 | ORPH x86_64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/98dc4b415115cca65b53e4cd986144ef85bf17ad | ORPH mips64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/86b4f7b620c5ed46a94f2835d4f1f142717db952 | mips64el | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/7c53e187e2b87ca0262f55a54cc110de9f1e247d | armeb | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/8d95190345d3072345cad2bf4c87faee33c9e302 | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/aa8912eb231b5810fb89323c19e82230ec3b6cbb | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/3e6534f937518ff34f0bc92c0355661db86fc81f | or1k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/b56524f4bd95d1726140c0330de87bc10d37e4d1 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/7b34fe3de9396d6d721e88e1c35f2a1a1d2e5dc3 | arm | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/effb52b4257096c107997ddc172801894bdc6aa4 | riscv32 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/42c3383a825966d9cb0944149313cf20f5ed8169 | xtensa | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/5bc22eda781d23e4e0dc574d3f7eba6a2fa81381 | microblazeel | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/ee7821580f8cc59cd1d4992eafcc8de43e7a9668 | armeb | host-gcc-final-12.2.0 | NOK | http://autobuild.buildroot.net/results/e6ceec6b459b37ffbbb277355986e9ec549cc786 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/9612b79f94fae7160b67f349b9b7bca93b1c9b61 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/402c0e7d55677602b81cba7b7b7e478f643b9314 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/57b236ce192b2879786b5140364d836dfc4a0b4f | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/a4c4c3e20c4ac313ef3ddcb6e7847ca4a1bacb4c | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/4a3b0e8239d3a7a150cc3ed6169176ee78366e21 | mips64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/ee687375ebd7cc912378664308c46a0f83b6c335 | arc | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/11868e9bc4916843a7fc76f7b5e4c251f89e33dc | riscv32 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/bed12b7f41bb42b009b366a6e7de87ba543f7c9f | sh4eb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/23c8297c18d5e2c9375e001b4264bae290e82309 | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/eddbeedc7249a9ea6943c4078f190de891bc356a | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/94d07202bbb84cbde0eb8cc6debd7c9bcdd666f5 | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/0d41179361f2cdde07ef8d9b0df58e167ba54155 | mipsel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/a385950474714b5adb117f9b1151fab5c9b16542 | i686 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1797d9e956d5fdbcb847399b54939b4bb244c17d | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/5defc47a6efca1e061642868663f36c2f81e1e57 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/b6a153fc8319e6454d4b7d042c38fa9334ca40d9 | mips | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/a13012dc03256c45aa3f7f69b96d14c86d0f2dd4 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/a90f58bcf2cf05bdd6917def8fb01ceba1f7cf8e | arc | libcpprestsdk-2.10.18 | NOK | http://autobuild.buildroot.net/results/e6778e60cc1ea455f5b4511d5824f04d8040f67b | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/7fa10c8b2d0e48641e247b457f76de88a5c2e127 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/ecb0c243ac4766acc39af8d286c36486837318e1 | ORPH i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/1cbbc0b4bcbf86170ee797a55226002e2e631785 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/31291a8707f6fb0c8567fe73e136059062f92d8b | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/ef1a0ff1a9d4b060cf0e259144befd42979e093f | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/a5cbff35ed4b5d6b74cdf2ac7173d8be571a4401 | aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/7d26d0f05815c529d4d7ebd1de1e7019484d8eef | ORPH arc | libjxl-0.7.0 | NOK | http://autobuild.buildroot.net/results/9893a0da313e77a47550595b71befcece76bb206 | mipsel | libnss-3.88.1 | NOK | http://autobuild.buildroot.net/results/26871866e8f2b4a79ef32c114ac5295a3b4d7762 | s390x | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/a4d183f54ab5d149613f6ad432331b2a4db4b94c | ORPH mips64el | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/248fca028f60e7659d1f66b635eb071f162995ef | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/b5aa7990927abc9fcaed9e23506950c6b550d71c | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4af79f7293316522f49137ffd44a62585780d3ab | ORPH sh4a | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/dab96083e4de1fc5f3e63900aaf2e2bd20d80e87 | ORPH m68k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/8f6c7cf4636ef5149b210c0de8a8766876d6e3d2 | ORPH m68k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/7f3c829796e55eee4b64fb2c2e8dc4c0ae01df1e | ORPH i686 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/a9522c0e9bfa4a23f31573c3fb43939b54fa79ff | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/41e178fa6b4c03a69c986207741c315cb9255e50 | ORPH sparc64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/8d0d603a04380b2305fdce4295df42e426e05368 | ORPH s390x | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/0f21f69e11fb52b320de306c69b8844ed90417ec | aarch64_be | multipath-tools-0.9.4 | NOK | http://autobuild.buildroot.net/results/e8542b8a733b23450a697d67fbb40042e4dfd4ed | powerpc64le | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/4291c582a750a7bd794f1d862f67a7d624165c3e | mips64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/d47cad90021082b972bbaa597078ffa31cf5456a | powerpc64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/94d5b30d7d297813828d4476d20ea6c926d8f8be | riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/72ab327ea556ffab1997db5d8089a913f34103f1 | ORPH powerpc64le | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/e5354c926b61d4f3dd9170bf019c24a74166cf06 | ORPH arc | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/d34acbc52c200a0b76ad8e2f8f8f5d4f83264883 | ORPH arceb | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/ba922e5d5afc1a8e96dbe1c814495dd26fdddf36 | armeb | opus-1.3.1 | NOK | http://autobuild.buildroot.net/results/9966147849708b47df5137b88c319c01961b2c7c | ORPH arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/8c190f0a7ee54a45c79b925087d16a2b6f0687a7 | microblaze | php-8.2.3 | NOK | http://autobuild.buildroot.net/results/93ccccd233cf83aadce01bf8171317bfe8be492d | arc | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/52efcad081d94e9800723bc5bac52a0f1f8c3f76 | i686 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/20ce30249942f92ba17c40a27867f7c128fe59a1 | sh4 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/6601739b21ae44c8d685affc2524e14fd9d110f8 | riscv32 | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/9b3a4007a776dec173ed6347167f9971ac8843e9 | sh4a | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/71a29398d5dffa04a01b495e95fd7121b1803c4e | sh4 | ruby-3.1.3 | NOK | http://autobuild.buildroot.net/results/5eaac7cb81a496fdc3432a31d6786561bd3776f1 | x86_64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/b91c6f19cceccf064a90e27d7ca082e3b82cc6d0 | sparc64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/583306d5210ab35da1400a8b9b56e9d3e066a64b | nios2 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/cc1817efb4a5d54ffd2e7ac2f4fc773535f70972 | sparc64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/215507ff5cfc779ad095156b384bf45cb84b8461 | i586 | syslinux-6.03 | NOK | http://autobuild.buildroot.net/results/de88089888b2ca354b28af3550abf846560da7d5 | ORPH mipsel | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/5cfb6c51fe8da507fd547c15170169d84ee36abd | sh4aeb | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/be2198865ad16d565816590768948910a9f612f9 | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/dfc23dfa90556becd4c882e893a0f72f78574c7c | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/40315d6915c1d72144da8f9c10d73587eae6b21c | aarch64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/ff50155db80ac1c57034b23dd994f701a0fea8bb | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/f64ce692967cf043fe8dbd82e789ccb8b4d86901 | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/f8b3abd256ff40d04aed63c5676ab54b31cf4b68 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/634e1da40c275bcf51e9d8bbd48e96c0f074c223 | sparc | unknown | NOK | http://autobuild.buildroot.net/results/7f868232e74ed44c11a8662e53568607531f742a | or1k | unknown | NOK | http://autobuild.buildroot.net/results/ade13ceb9b7d88105be2b292c49a31f6a8647a9b | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/3ce8c243b77bed8c69475a5f293d8fe24beaa310 | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/b8f0df18ae70a2b511441f44dd5fc939c0a71b55 | x86_64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/e991e633e9f4bc2b074dab07a500c735120aecff | ORPH powerpc | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/38015111b9d410840eb1c19f4c2ea7748160feb8 | ORPH i686 | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/a9c418e1bfea6d0fe797d252ed104c8945d7a3d8 | ORPH mips64 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/ab27cb2c835b9325c061c6ee50234ccfa6839c02 | mips64 | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/dc6bd721bcc2b59581bb49d10e0c404d8ea5da46 | ORPH mipsel | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/35fc9dfe97e2d9dd8a0fefea51882e97c308742d | ORPH mips64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/bc4fc8ff640aa538e1ec70485d47e3ea3d606d8a | mips64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/5bc66df6a7dd22cbafd4749ee1626113af6cf6e5 | Classification of failures by reason for 2022.11.x -------------------------------------------------- netsurf-3.10 | 2 xxhash-0.8.1 | 2 collectd-5.12.0 | 1 coreutils-9.1 | 1 dieharder-3.31.1 | 1 gobject-introspection-1.72.0 | 1 linux-5.10.145-cip17 | 1 mutt-2.2.9 | 1 unknown | 1 zabbix-5.4.9 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | collectd-5.12.0 | NOK | http://autobuild.buildroot.net/results/64543c5e5a1abdcbeeb09aa53b30d0c2aa390f62 | sh4 | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/ab4e284f4d67e22ea0d02505829e970b605fd7ae | ORPH microblaze | dieharder-3.31.1 | NOK | http://autobuild.buildroot.net/results/8ab826577b203ae89559d427b6aa1611540342aa | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/117a607f0cba5827e7cccb185a7a6e9603b20efd | ORPH m68k | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/35e256ea6d48f9f35363fee3f924c541d49b1d31 | ORPH i686 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/2ff1b2d4a5ef54d47b03a50fe0785dd3d9679fbc | s390x | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/c9ee089b3fe01158a7b3e65724696f6a18767ff8 | arc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/534ce0af5a26d52d145242a518cb4b71e2daf89a | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/7ce89193d8a00bb5f6d8abd60a274893acfc4053 | or1k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/e79b34a1d7c058ebc0a0eb0982381ed71341a2b6 | ORPH mipsel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/cfc5eda527f53e9109572aefe1a84826c636126d | ORPH sparc64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/e71836f4cba58e791785ac73add1d282afc9fa21 | -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Mon Feb 20 22:49:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:49:24 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Giulio Benetti as maintainer for board bananapi-m2-ultra Message-ID: <20230221081921.82111864D6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60ab36a931f5d88cccb08575076e68d5e3757ae9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2eff5b23ef..caa73698f9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1135,9 +1135,11 @@ F: package/webp/ F: package/xapian/ N: Giulio Benetti +F: board/bananapi/bananapi-m2-ultra/ F: board/olimex/a* F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig +F: configs/bananapi_m2_ultra_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ From thomas.petazzoni at bootlin.com Tue Feb 21 08:19:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:19:02 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Giulio Benetti to board imx6ullevk for both mainline and NXP(Freescale) versions Message-ID: <20230221081921.A514C86509@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d7dd1b79145a34f861d30d09750f6e988e10fd5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index caa73698f9..599cfe6886 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1136,10 +1136,13 @@ F: package/xapian/ N: Giulio Benetti F: board/bananapi/bananapi-m2-ultra/ +F: board/freescale/imx6ullevk/ F: board/olimex/a* F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig F: configs/bananapi_m2_ultra_defconfig +F: configs/freescale_imx6ullevk_defconfig +F: configs/imx6ullevk_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ From thomas.petazzoni at bootlin.com Mon Feb 20 22:58:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:58:21 +0100 Subject: [Buildroot] [git commit branch/next] configs/imx6ullevk_defconfig: bump Linux to 6.1.12 and U-Boot to 2023.01 Message-ID: <20230221081921.8D0C486506@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=497e60a2fa7e11644a41cf4a9441f7fde6c782ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Let's also reorder BR2_UBOOT_ options by moving BR2_TARGET_UBOOT_FORMAT_DTB_IMX after BR2_TARGET_UBOOT_NEEDS_OPENSSL since this reflects the order in boot/uboot/Config.in file. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/imx6ullevk_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/imx6ullevk_defconfig b/configs/imx6ullevk_defconfig index c6e2981697..b507d1c0d6 100644 --- a/configs/imx6ullevk_defconfig +++ b/configs/imx6ullevk_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -22,10 +22,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" -BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y From thomas.petazzoni at bootlin.com Mon Feb 20 22:47:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:47:53 +0100 Subject: [Buildroot] [git commit branch/next] configs/bananapi_m2_ultra_defconfig: bump Linux to 6.1 and U-Boot to 2023.01 Message-ID: <20230221081921.784B786501@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d7f902eb127eb9dd1334cda04a2008d14945a7d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/bananapi_m2_ultra_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 2ec0e60e8d..0f267021f8 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Ultra" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-ultra/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-r40-bananapi-m2-ultra" @@ -16,7 +16,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From thomas.petazzoni at bootlin.com Mon Feb 20 22:58:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:58:25 +0100 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6ullevk_defconfig: bump Linux and U-Boot to lf-5.15.71-2.2.0 Message-ID: <20230221081921.98C9C86508@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9e09ac2c02d1ff8d3872ebc72e915e9baa7fbd0d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Let's also enable BR2_TARGET_UBOOT_NEEDS_OPENSSL required by uboot to build correctly. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/freescale_imx6ullevk_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index 7a8965be18..db4fa69f71 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -1,11 +1,11 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.15.71-2.2.0)/linux-imx-lf-5.15.71-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -15,8 +15,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.15.71-2.2.0)/uboot-imx-lf-5.15.71-2.2.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y From thomas.petazzoni at bootlin.com Tue Feb 21 08:21:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:21:15 +0100 Subject: [Buildroot] [PATCH 1/3] configs/imx6ullevk_defconfig: bump Linux to 6.1.12 and U-Boot to 2023.01 In-Reply-To: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> References: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> Message-ID: <20230221092115.1041a5ed@windsurf> On Thu, 16 Feb 2023 22:25:51 +0100 Giulio Benetti wrote: > Let's also reorder BR2_UBOOT_ options by moving > BR2_TARGET_UBOOT_FORMAT_DTB_IMX after BR2_TARGET_UBOOT_NEEDS_OPENSSL since > this reflects the order in boot/uboot/Config.in file. > > Signed-off-by: Giulio Benetti > --- > configs/imx6ullevk_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Series applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:23:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.67.1 In-Reply-To: <20230221012238.3809280-1-james.hilliard1@gmail.com> References: <20230221012238.3809280-1-james.hilliard1@gmail.com> Message-ID: <20230221092310.3d532276@windsurf> On Mon, 20 Feb 2023 18:22:38 -0700 James Hilliard wrote: > Link to Rust 1.67.1 announcement: https://blog.rust-lang.org/2023/02/09/Rust-1.67.1.html > > Drop patch which is now upstream. > > Signed-off-by: James Hilliard > --- > package/rust-bin/rust-bin.hash | 252 +++++++++--------- > package/rust-bin/rust-bin.mk | 2 +- > ...-unsoundness-in-bootstrap-cache-code.patch | 43 --- > package/rust/rust.hash | 6 +- > package/rust/rust.mk | 2 +- > 5 files changed, 131 insertions(+), 174 deletions(-) > delete mode 100644 package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:23:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/highway: bump to version 1.0.3 In-Reply-To: <20230220234200.464390-1-ju.o@free.fr> References: <20230220234200.464390-1-ju.o@free.fr> Message-ID: <20230221092316.12468ad1@windsurf> On Tue, 21 Feb 2023 00:42:00 +0100 Julien Olivain wrote: > - Dropped patch upstreamed in: > https://github.com/google/highway/commit/1cab22047a6ef750ef2bc38ad47d6e765d6d376a > > - Add an upstream patch, not in 1.0.3 release: > https://github.com/google/highway/commit/411300d0eec10d5635cbdd064299630c507348e1 > > - Add a new patch, to fix armv7 builds with vfp < v4. > Proposed upstream in: > https://github.com/google/highway/pull/1143 > > - Add a comment about -DHWY_CMAKE_ARM7=OFF since the name is a bit > misleading. It should better be ARMV7 or ARMV7_VFPV4. > > For change log since 1.0.2, see: > - https://github.com/google/highway/releases/tag/1.0.3 > > Signed-off-by: Julien Olivain > --- > Tested on top of branch master at commit 9cd2e6e with commands: Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:23:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-iptvsimple: bump version to 19.3.0-Matrix In-Reply-To: <20230220192534.103145-1-bernd.kuhls@t-online.de> References: <20230220192534.103145-1-bernd.kuhls@t-online.de> Message-ID: <20230221092335.6539378b@windsurf> On Mon, 20 Feb 2023 20:25:34 +0100 Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls > --- > package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- > package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:23:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:29 +0100 Subject: [Buildroot] [git commit branch/next] package/kodi-pvr-iptvsimple: bump version to 19.3.0-Matrix Message-ID: <20230221082339.9C61C8654B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3927054736881e5807b86fe9b1e5b275d941d6fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 47dd202258..de71703c53 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 57710d3add72301d47a9eef016916ee5f61b7b8604c73450d67b9ba962eff60c kodi-pvr-iptvsimple-19.2.2-Matrix.tar.gz +sha256 421a883054dd31ad512866236c364e5a564d7db9fa595dadc3e37b9169b7fe79 kodi-pvr-iptvsimple-19.3.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 5b91c35c0c..e5976a7d3a 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 19.2.2-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 19.3.0-Matrix KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Tue Feb 21 08:23:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:07 +0100 Subject: [Buildroot] [git commit branch/next] package/highway: bump to version 1.0.3 Message-ID: <20230221082339.90E0286549@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a789cd0d1badf7f68749b304f7b2e3d9f9ca2c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Dropped patch upstreamed in: https://github.com/google/highway/commit/1cab22047a6ef750ef2bc38ad47d6e765d6d376a - Add an upstream patch, not in 1.0.3 release: https://github.com/google/highway/commit/411300d0eec10d5635cbdd064299630c507348e1 - Add a new patch, to fix armv7 builds with vfp < v4. Proposed upstream in: https://github.com/google/highway/pull/1143 - Add a comment about -DHWY_CMAKE_ARM7=OFF since the name is a bit misleading. It should better be ARMV7 or ARMV7_VFPV4. For change log since 1.0.2, see: - https://github.com/google/highway/releases/tag/1.0.3 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...0001-Check-for-the-presence-of-sys-auxv.h.patch | 62 ----------- ...0001-Fix-compilation-for-armv7-with-gcc-8.patch | 46 ++++++++ ...tion-for-armv7-targets-with-vfp-v4-and-gc.patch | 118 +++++++++++++++++++++ package/highway/highway.hash | 2 +- package/highway/highway.mk | 5 +- 5 files changed, 169 insertions(+), 64 deletions(-) diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch deleted file mode 100644 index df86798613..0000000000 --- a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Wed, 23 Nov 2022 23:27:11 +0100 -Subject: [PATCH] Check for the presence of - -Not all gcc versions are providing . Checking for -HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not -sufficient and fail to build in some situations (it was observed for -some gcc armv7m toolchains). - -This patch adds a check for and include it only if present. - -Signed-off-by: Julien Olivain ---- - CMakeLists.txt | 3 +++ - hwy/detect_targets.h | 2 +- - hwy/targets.cc | 2 +- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b6b14ab..df6b5ab 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -84,6 +84,9 @@ check_cxx_source_compiles( - HWY_RISCV - ) - -+include(CheckIncludeFile) -+check_include_file(sys/auxv.h HAVE_SYS_AUXV_H) -+ - if (HWY_ENABLE_CONTRIB) - # Glob all the traits so we don't need to modify this file when adding - # additional special cases. -diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h -index 7f7e179..f0c6f94 100644 ---- a/hwy/detect_targets.h -+++ b/hwy/detect_targets.h -@@ -392,7 +392,7 @@ - #define HWY_HAVE_RUNTIME_DISPATCH 1 - // On Arm, currently only GCC does, and we require Linux to detect CPU - // capabilities. --#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX -+#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX && HAVE_SYS_AUXV_H - #define HWY_HAVE_RUNTIME_DISPATCH 1 - #else - #define HWY_HAVE_RUNTIME_DISPATCH 0 -diff --git a/hwy/targets.cc b/hwy/targets.cc -index 2fde4db..abd6a94 100644 ---- a/hwy/targets.cc -+++ b/hwy/targets.cc -@@ -42,7 +42,7 @@ - #include - #endif // HWY_COMPILER_MSVC - --#elif HWY_ARCH_ARM && HWY_OS_LINUX -+#elif HWY_ARCH_ARM && HWY_OS_LINUX && HAVE_SYS_AUXV_H - #include - #include - #endif // HWY_ARCH_* --- -2.38.1 - diff --git a/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch b/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch new file mode 100644 index 0000000000..0634460453 --- /dev/null +++ b/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch @@ -0,0 +1,46 @@ +From 94cda9cc8cd12345a6dbe70e40f3119d5bf7ee78 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 10 Feb 2023 21:25:36 +0100 +Subject: [PATCH] Fix compilation for armv7 with gcc < 8 + +Highway uses the construct __attribute__((target(+neon-vfpv4)) for +Armv7. The target "+neon-vfpv4" was introduced in gcc 8, in commit [1]. +When using a gcc < 8 (for example, like [2]), compilation fails with +message: + + In file included from /build/highway-1.0.3/hwy/foreach_target.h:81:0, + from /build/highway-1.0.3/hwy/per_target.cc:20: + /build/highway-1.0.3/hwy/per_target.cc: At global scope: + /build/highway-1.0.3/hwy/per_target.cc:23:22: error: attribute(target("+neon-vfpv4")) is unknown + +This commit protects the definition of HWY_TARGET_STR only when gcc +version 8 or greater is used for armv7. + +[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e87afe54b86c478ae63569e51e7abb67d3fe3fce +[2] https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/arm-linux-gnueabihf/gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz + +Signed-off-by: Julien Olivain +--- + hwy/ops/set_macros-inl.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/hwy/ops/set_macros-inl.h b/hwy/ops/set_macros-inl.h +index 051dbb3..00b4b1b 100644 +--- a/hwy/ops/set_macros-inl.h ++++ b/hwy/ops/set_macros-inl.h +@@ -230,7 +230,12 @@ + // Can use pragmas instead of -march compiler flag + #if HWY_HAVE_RUNTIME_DISPATCH + #if HWY_ARCH_ARM_V7 ++#if HWY_COMPILER_GCC_ACTUAL >= 800 ++// The __attribute__((target(+neon-vfpv4)) was introduced in gcc >= 8. ++// In case we have a gcc < 8, we can still compile by keeping ++// HWY_TARGET_STR undefined. + #define HWY_TARGET_STR "+neon-vfpv4" ++#endif + #else + #define HWY_TARGET_STR "+crypto" + #endif // HWY_ARCH_ARM_V7 +-- +2.39.2 + diff --git a/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch b/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch new file mode 100644 index 0000000000..f29b385501 --- /dev/null +++ b/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch @@ -0,0 +1,118 @@ +From 93d4579f90dd6ad26fd0dcda6420b3bb2fdcbc02 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Mon, 20 Feb 2023 23:22:28 +0100 +Subject: [PATCH] Fix compilation for armv7 targets with vfp < v4 and gcc >= 8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When using a armv7 gcc >= 8 toolchain (like [1]) with Highway +configured with -DHWY_CMAKE_ARM7=OFF and HWY_ENABLE_CONTRIB=ON, +compilation fails with error: + + In file included from /build/highway-1.0.3/hwy/ops/arm_neon-inl.h:33, + from /build/highway-1.0.3/hwy/highway.h:358, + from /build/highway-1.0.3/hwy/contrib/sort/shared-inl.h:104, + from /build/highway-1.0.3/hwy/contrib/sort/traits128-inl.h:27, + from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:23, + from /build/highway-1.0.3/hwy/foreach_target.h:81, + from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:20: + /toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h: In function 'void hwy::N_NEON::StoreU(Vec128, Full128, uint64_t*)': + /toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h:11052:1: error: inlining failed in call to 'always_inline' 'void vst1q_u64(uint64_t*, uint64x2_t)': target specific option mismatch + 11052 | vst1q_u64 (uint64_t * __a, uint64x2_t __b) + | ^~~~~~~~~ + /build/highway-1.0.3/hwy/ops/arm_neon-inl.h:2786:12: note: called from here + 2786 | vst1q_u64(unaligned, v.raw); + | ~~~~~~~~~^~~~~~~~~~~~~~~~~~ + +The same errors happen when configured with HWY_ENABLE_EXAMPLES=ON, +or from client libraries like libjxl (at other places). + +The issue is that Highway Arm NEON ops have a dependency on the +Advanced SIMD (Neon) v2 and the VFPv4 floating-point instructions. +The SIMD (Neon) v1 and VFPv3 instructions are not supported. + +There was several attempts to fix variants of this issues. +See #834 and #1032. + +HWY_NEON target is selected only if __ARM_NEON is defined. See: +https://github.com/google/highway/blob/1.0.3/hwy/detect_targets.h#L251 + +This test is not sufficient since __ARM_NEON will be predefined in +any cases when Neon is enabled (neon-vfpv3, neon-vfpv4). + +The issue is that HWY_CMAKE_ARM7=ON implies VFPv4 / NEON SIMD v2. +When setting HWY_CMAKE_ARM7=OFF, "neon-vfpv4" will not be forced, +but the code is still using intrinsics assuming VFPv4. Gcc will fail +with error because code cannot be generated for the selected +architecture. + +This issue can be avoided by adding "-DHWY_DISABLED_TARGETS=HWY_NEON" in +CXXFLAGS. The problem with this solution is that every client program will +also need to do the same. This goes against the very purpose of +"hwy/detect_targets.h". + +Technically, Armv7-a processors with VFPv4 can be detected using some +ACLE (Arm C Language Extensions [2]) predefined macros: + +Basically, we want Highway to define HWY_NEON only when the target +supports SIMDv2/VFPv4 or higher. An older target with vfpv3 only +(e.g. Cortex-A8, A9, ...) would NOT define HWY_NEON, and therefore +would fallback on HWY_SCALAR implementation. + +However, not all compiler completely support ACLE. There is also +several versions too. So we cannot easily rely on macros like +"__ARM_VFPV4__" (which clang predefine, but not gcc). + +The alternative solution proposed in this patch, is to declare the +HWY_NEON target architecture as broken, when we detect the target is +Armv7-A, but mandatory features for vfpv4 (namely half-float, FMA) +are missing. Half-floats are tested using the macro __ARM_NEON_FP, +and the FMA with the macro __ARM_FEATURE_FMA. See ACLE [2]. The +intent of declaring the target as broken, rather than selecting +HWY_NEON only if vfpv4 features are detected is to remain a bit +conservative, since the detection is slithly inaccurate. + +For a given compiler/cflags, predefined macros for Arm/ACLE can be +reviewed with commands like: + + arm-linux-gnueabihf-gcc -mcpu=cortex-a9 -mfpu=neon-vfpv3 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + arm-linux-gnueabihf-gcc -mcpu=cortex-a7 -mfpu=neon-vfpv4 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + clang -target armv7a -mcpu=cortex-a9 -mfpu=neon-vfpv3 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + clang -target armv7a -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + +The different values of __ARM_NEON_FP can be seen, depending which +"-mfpu" is passed. Same for __ARM_FEATURE_FMA. + +[1] https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2022.08-1.tar.bz2 +[2] https://github.com/ARM-software/acle/ + +Signed-off-by: Julien Olivain +--- + hwy/detect_targets.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h +index 2beca95..40ae7fe 100644 +--- a/hwy/detect_targets.h ++++ b/hwy/detect_targets.h +@@ -154,6 +154,16 @@ + (defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN)) + #define HWY_BROKEN_TARGETS (HWY_NEON) + ++// armv7-a without a detected vfpv4 is not supported ++// (for example Cortex-A8, Cortex-A9) ++// vfpv4 always have neon half-float _and_ FMA. ++#elif HWY_ARCH_ARM_V7 && \ ++ (__ARM_ARCH_PROFILE == 'A') && \ ++ !defined(__ARM_VFPV4__) && \ ++ !((__ARM_NEON_FP & 0x2 /* half-float */) && \ ++ (__ARM_FEATURE_FMA == 1)) ++#define HWY_BROKEN_TARGETS (HWY_NEON) ++ + // SVE[2] require recent clang or gcc versions. + #elif (HWY_COMPILER_CLANG && HWY_COMPILER_CLANG < 1100) || \ + (HWY_COMPILER_GCC_ACTUAL && HWY_COMPILER_GCC_ACTUAL < 1000) +-- +2.39.2 + diff --git a/package/highway/highway.hash b/package/highway/highway.hash index 3ff468443e..16a9282176 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db highway-1.0.2.tar.gz +sha256 566fc77315878473d9a6bd815f7de78c73734acdcb745c3dde8579560ac5440e highway-1.0.3.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE diff --git a/package/highway/highway.mk b/package/highway/highway.mk index ed7f6ca871..56d63a83f9 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.0.2 +HIGHWAY_VERSION = 1.0.3 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 HIGHWAY_LICENSE_FILES = LICENSE @@ -35,6 +35,9 @@ endif ifeq ($(BR2_ARM_FPU_VFPV4),y) HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=ON else +# Highway Armv7 Neon support requires in fact vfpv4 / neon v2. When we +# are in a vfpv3 case (e.g. Cortex-A8, Cortex-A9) this flag need to be +# set to off. HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=OFF endif From thomas.petazzoni at bootlin.com Tue Feb 21 08:21:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:21:24 +0100 Subject: [Buildroot] [git commit branch/next] package/{rust, rust-bin}: bump to version 1.67.1 Message-ID: <20230221082339.839B486546@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=792f1975175cb995600f7e3ac092fc3c741aa096 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Link to Rust 1.67.1 announcement: https://blog.rust-lang.org/2023/02/09/Rust-1.67.1.html Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.hash | 252 ++++++++++----------- package/rust-bin/rust-bin.mk | 2 +- ...1-fix-unsoundness-in-bootstrap-cache-code.patch | 43 ---- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 5 files changed, 131 insertions(+), 174 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d00e6342e8..11cfae5e9b 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc -sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc -sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc -sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 b7b8e8b70cae457092661894efa5a4861ef4f0e20f2f617d05d6f17b1f780a68 rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 b686a2d0d1648e1b84def715dd65a85a3d2802b33ecf65808bdb2ed639aec7d3 rust-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 c9df968487707eb63207f63086daed4fe1484829fb6221bd9414de2700424995 rust-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 4f56194a354b1413fb973d25f1c895aaa8e85211d316755508d6848e3a4fe18b rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 852e5a714ea8d2737f2cd5b0d6a12ecfa712b75238c643ba8138b490fc39fc43 rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0a5bc85383d5d9d077dccaad1fb213d9498b6137112aaaabced6eb079fe12c9e rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 574851ff8503df9cb0dd04e6a1cd0ce5d709b5ea8b9c1265b314b9e182c818da rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 50e98fefef58218bd2c09c826308d43abe11b05f528b08ecca3d2657d7996630 rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 6e8629ace0c1b9cc0c2bc6225e6716df852370e5c7e907815ff8e6241e427699 rust-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 7dbb718bdb09adad7e36b9a413e571863913682495527f7f2d6507ea2c068542 rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 35027409400faaaa38ea2855b92dea6b553b2e656dff735da730f67ac02e57e6 rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 dcd3926c151cdd33d4de2860f021c86a18556809c4d06cbddebc1b377638710a rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 da42d5b07984dac9a41719511eeb47cbb6c5e70b32a6eacba96c9f860ced0307 rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 3b95c9595db3e10077c4eca8f63d80414bf3a50c1f0f6b2ac33f1992ee0940db rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 767761d99846174dfb7dfb579e2e2be63800478858a82f3f7050cc9555209a89 rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 1e53306124de9f282452bd6085e86918e5e9f6f1940fc79809a1b284272e2d2b rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 3e8bb4265c8c6d8984b69eeefe015131ea140148a58179b3abec5653d93bea7d rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 cbfce327b623e341c1243f0d29ef2f60e5fb205d406c79eb8be1433652c3c9a5 rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 b6d00c4e338744ce1bf5b314f1056472acf1eb416f65057a8b3ca0a992fb04df rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 8a7e46b15adb0718b4e4ee33cd46529117411e8d73c29043778b05e7412c2b46 rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 6102f98617dd37874f3d755d0a325b45d47c6e1715c39d5e9bc037992e4d3cd6 rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 720958bc039c9ff00e7e399adf45f044484c5695a71bde0d07e0c895a819fe74 rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 22cbbf0b22d9b0894cfbd6e1dd6b95b71c7ad02cee4e477d375dcf81af8d1337 rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.asc +sha256 49beb678732f34a0bfc22f94900c3d4a17ec05effdb7377864042df73b2a2819 rust-std-1.67.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 aab2d7aa76793e78c9c8810e93ed8978f6422843b1277e9c60337b0f943a4409 rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.asc +sha256 a2c6e55a8a2987d0c306d2c164347a70ab7a6a18f6562039a772b33e25934972 rust-std-1.67.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 048b3da190212b742f7a052618b57683dc96ee2b6c25fc7f5ae751143cb79bad rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.asc +sha256 b9ef413b764a92d42e07a2e588268ece09994d2cd1ab2a93858c27f85a250349 rust-std-1.67.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 ef7fe3160de629f0d38788f2c270f87b0631480e5b0d848595b460528de719e4 rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 15fdb3e8b39c8a122e9beee0c4c909ee8ec356e57aaaaae5f2b9e94f58d73c87 rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 6ccfd98fd920cc2f1199bcf9a842430c27f6fcd2cc46c18421e487309ff7811e rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 78477c45f5b848b156adaf0e0f6f2954ae73e2903321d1636c155020175eaaf5 rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 94410897626546dde806a114299c3c32abb6b4b294af5daea5c4d136751fe063 rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 b3f1a338e69428f1611f059c67b8afafa78ce5c7ed0799f8a90795390261d3a4 rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 26efe78c09ed36da34964c0d023cf9aa404766ab790a94d9becd373b8879cb5a rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 135f5e6ab6d8f077a14521d387d3f31831abdb840ca4e6a15b6f0d0d5b7dbc81 rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 364c47ed22e4268edf238d221c40007d7d8792a66ca325d3937596a9c911ea48 rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 63a7e6a6c889a3d01bb3c66a3def3e41963511ea52e13906669da5b29b2fd9da rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 04573298d9e815c1e8c47a2f9548ea55d4a2afc538eceaa6a704d44a5e1f7e3e rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 addf0b0beb1966787e599f32849f18c28d5cb65515272b7d9608d4a1dddee2e7 rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 f4dc8468dfc1dbd86f865b10f06e0e4b4e76f5a3a1cc27317a520ab1660844e9 rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 89741cd2ac00c3a3f565bcccdf442cc1f9ec58ea419f1f0d09e911be0ff86c87 rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index d62ce39cfc..bb66de5ec5 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.67.0 +RUST_BIN_VERSION = 1.67.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch deleted file mode 100644 index 3eae34642f..0000000000 --- a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 -From: Michael Goulet -Date: Mon, 12 Dec 2022 18:29:33 +0000 -Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= - =?UTF-8?q?ap=20cache=20code?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) -Signed-off-by: Sebastian Weyer ---- - src/bootstrap/cache.rs | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs -index be5c9bb0788..05f25af68ea 100644 ---- a/src/bootstrap/cache.rs -+++ b/src/bootstrap/cache.rs -@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { - - impl Deref for Interned { - type Target = T::Target; -- fn deref(&self) -> &'static Self::Target { -+ fn deref(&self) -> &Self::Target { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } -+ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } - } - } - - impl, U: ?Sized> AsRef for Interned { -- fn as_ref(&self) -> &'static U { -+ fn as_ref(&self) -> &U { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } -+ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } - } - } - --- -2.25.1 - diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 2a260ca64f..1b4b08cecc 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc -sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.asc +sha256 77e0615011f887d9533d5374bf9c15c590c3caf32bbb035b392d1c2ae502a682 rustc-1.67.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index d14ad3a3e7..814a3c1dd4 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.67.0 +RUST_VERSION = 1.67.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From thomas.petazzoni at bootlin.com Tue Feb 21 08:23:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 22.3.5 In-Reply-To: <20230220191822.99026-1-bernd.kuhls@t-online.de> References: <20230220191822.99026-1-bernd.kuhls@t-online.de> Message-ID: <20230221092352.3fe46a32@windsurf> On Mon, 20 Feb 2023 20:18:22 +0100 Bernd Kuhls wrote: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.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 next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:28:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:28:21 +0100 Subject: [Buildroot] [PATCH] package/grpc: bump to version 1.52.1 In-Reply-To: <20230220124945.1842532-1-buildroot@heine.tech> References: <20230220124945.1842532-1-buildroot@heine.tech> Message-ID: <20230221092821.2f227afc@windsurf> Hello Michael, Thanks for the new iteration! On Mon, 20 Feb 2023 13:49:45 +0100 Michael Nosthoff via buildroot wrote: > +comment "grpc needs a toolchain w/ C++, gcc >= 7.3" It's a bit annoying that it depends on gcc >= 7.3 and not gcc >= 7, because technically BR2_TOOLCHAIN_GCC_AT_LEAST_7 only implies >= 7.x, and not >= 7.3. Did you check what happens with gcc 7.0, 7.1 or 7.2 ? https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2017.11-1.tar.bz2 uses gcc 7.2.0 for example. Here is a fragment to use it: https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/fragments/armv7-eabihf--glibc--bleeding-edge-2017.11-1.frag. I don't easily find a toolchain with gcc 7.0 or 7.1 unfortunately. Worst case, we could make this dependency >= 8.0. But clearly, a comment that says >= 7.3, but with a dependency on BR2_TOOLCHAIN_GCC_AT_LEAST_7 is going to be very misleading. 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 Feb 21 08:23:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:46 +0100 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.5 Message-ID: <20230221082849.3FA5586561@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ab0431b70e3d963ff3bbc8f10a1871d9f628789 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.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 9177adceda..ad1999a30d 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 = 22.3.4 +MESA3D_HEADERS_VERSION = 22.3.5 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 e4de997f0e..50c5bcc7fc 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html -sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz -sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.html +sha256 3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9 mesa-22.3.5.tar.xz +sha512 a4cad9b7e6501678fac279bd88a37e522633c7128afa8df04982f469c930e3557bb1d05b4b0f5ae16704d8d04e50c90a7489943a48861df17dd947704c329b85 mesa-22.3.5.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index cf2352a355..1e919d73f2 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 = 22.3.4 +MESA3D_VERSION = 22.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From thomas.petazzoni at bootlin.com Tue Feb 21 08:28:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:28:39 +0100 Subject: [Buildroot] [git commit branch/next] package/ssdp-responder: bump to v2.0 Message-ID: <20230221082849.4889386544@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07634619d9738154e46e9b309d0697d223639167 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next ChangeLog: - https://github.com/troglobit/ssdp-responder/releases/tag/v2.0 - https://github.com/troglobit/ssdp-responder/blob/v2.0/ChangeLog.md Critical Fixes: - Fix periodic busy loop causing intermittent 100% CPU load - Fix invalid uuid:uuid:... in description.xml (dup uuid:) Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/ssdp-responder/ssdp-responder.hash | 2 +- package/ssdp-responder/ssdp-responder.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.hash b/package/ssdp-responder/ssdp-responder.hash index 425ad86e08..8b4f3e4e45 100644 --- a/package/ssdp-responder/ssdp-responder.hash +++ b/package/ssdp-responder/ssdp-responder.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 974c244abd4ba8c87532867a84756182a1460c99072ffb1eb91c5a1f73311d89 ssdp-responder-1.9.tar.gz +sha256 d8888f2ac59febfb3b2473a1402041014052ad4dc1eeb4168c78aeca1692aae3 ssdp-responder-2.0.tar.gz sha256 68d6fdc22e337f725fe719bf9ae6d92b1d8d0ca4cff8219b303ab76706670a8d LICENSE diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index 5193966908..20e7219386 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSDP_RESPONDER_VERSION = 1.9 +SSDP_RESPONDER_VERSION = 2.0 SSDP_RESPONDER_SITE = https://github.com/troglobit/ssdp-responder/releases/download/v$(SSDP_RESPONDER_VERSION) SSDP_RESPONDER_LICENSE = ISC SSDP_RESPONDER_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 21 08:28:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:28:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/ssdp-responder: bump to v2.0 In-Reply-To: <20230219222048.22093-2-troglobit@gmail.com> References: <20230219222048.22093-1-troglobit@gmail.com> <20230219222048.22093-2-troglobit@gmail.com> Message-ID: <20230221092855.0385f44e@windsurf> On Sun, 19 Feb 2023 23:20:47 +0100 Joachim Wiberg wrote: > ChangeLog: > - https://github.com/troglobit/ssdp-responder/releases/tag/v2.0 > - https://github.com/troglobit/ssdp-responder/blob/v2.0/ChangeLog.md > > Critical Fixes: > - Fix periodic busy loop causing intermittent 100% CPU load > - Fix invalid uuid:uuid:... in description.xml (dup uuid:) > > Signed-off-by: Joachim Wiberg > --- > package/ssdp-responder/ssdp-responder.hash | 2 +- > package/ssdp-responder/ssdp-responder.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:30:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:30:41 +0100 Subject: [Buildroot] [git commit] package/libmodsecurity: needs dynamic library Message-ID: <20230221083059.6EB9E86580@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97bdc0616c6027fe4b92bfa80dd9e7d43df20505 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as mbedtls can be pulled in libcurl through libssh2 resulting in the following build failure: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init': md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libmodsecurity/Config.in | 14 +++++++------- package/nginx-modsecurity/Config.in | 11 ++++------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index b15d808759..69bb0494cc 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -2,8 +2,10 @@ config BR2_PACKAGE_LIBMODSECURITY bool "libmodsecurity" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - # libmodsecurity embeds several mbedtls source files - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) + # libmodsecurity embeds several mbedtls source files, causing + # various issues when static linking and other dependencies of + # libmodsecurity in turn use mbedtls + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_PCRE2 help Libmodsecurity is one component of the ModSecurity @@ -17,8 +19,6 @@ config BR2_PACKAGE_LIBMODSECURITY https://github.com/SpiderLabs/ModSecurity -comment "libmodsecurity needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "libmodsecurity needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS +comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in index 5cbe57a866..0bbf05fad9 100644 --- a/package/nginx-modsecurity/Config.in +++ b/package/nginx-modsecurity/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY depends on BR2_PACKAGE_NGINX_HTTP depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) # libmodsecurity + depends on !BR2_STATIC_LIBS # libmodsecurity select BR2_PACKAGE_LIBMODSECURITY help The ModSecurity-nginx connector is the connection @@ -12,10 +12,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY https://github.com/SpiderLabs/ModSecurity-nginx -comment "nginx-modsecurity needs a toolchain w/ C++, threads" +comment "nginx-modsecurity needs a toolchain w/ C++, threads, dynamic library" depends on BR2_PACKAGE_NGINX_HTTP - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "nginx-modsecurity needs a toolchain w/ dynamic library" - depends on BR2_PACKAGE_NGINX_HTTP - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS From thomas.petazzoni at bootlin.com Tue Feb 21 08:32:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:32:15 +0100 Subject: [Buildroot] [PATCH v4, 1/1] package/libmodsecurity: needs dynamic library In-Reply-To: <20230220223151.12965-1-fontaine.fabrice@gmail.com> References: <20230220223151.12965-1-fontaine.fabrice@gmail.com> Message-ID: <20230221093215.419fcf40@windsurf> Hello Fabrice, On Mon, 20 Feb 2023 23:31:51 +0100 Fabrice Fontaine wrote: > diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in > index b15d808759..2186d216f4 100644 > --- a/package/libmodsecurity/Config.in > +++ b/package/libmodsecurity/Config.in > @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBMODSECURITY > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_TOOLCHAIN_HAS_THREADS > # libmodsecurity embeds several mbedtls source files I've expanded a bit this comment, as it was not very clear why this causes problem with static linking. > - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) > + depends on !BR2_STATIC_LIBS > select BR2_PACKAGE_PCRE2 > help > comment "nginx-modsecurity needs a toolchain w/ C++, threads" > depends on BR2_PACKAGE_NGINX_HTTP > - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS > - > -comment "nginx-modsecurity needs a toolchain w/ dynamic library" > - depends on BR2_PACKAGE_NGINX_HTTP > - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS > + depends on !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS Something was wrong here: you forgot to update the comment prompt itself to mention the dependency on dynamic library. I fixed both minor issues and applied to master. Thanks a lot! 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 Feb 21 08:37:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:37:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build without C++ In-Reply-To: <20230220231902.340496-1-fontaine.fabrice@gmail.com> References: <20230220231902.340496-1-fontaine.fabrice@gmail.com> Message-ID: <20230221093719.5215ef5d@windsurf> On Tue, 21 Feb 2023 00:19:02 +0100 Fabrice Fontaine wrote: > Commit dedbc69022ba0beaf259463ac8082c86776f7e88 was incomplete resuling > in the following build failure since the addition of the package in > commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: > > -- Check for working CXX compiler: /usr/bin/c++ - broken > CMake Error at /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message): > The C++ compiler > > "/usr/bin/c++" > > is not able to compile a simple test program. > > It fails with the following output: > > Change Dir: /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp > > Run Build Command(s):/home/autobuild/make/make -f Makefile cmTC_bfb29/fast && make[1]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make CMakeFiles/cmTC_bfb29.dir/build > make[2]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o > /usr/bin/c++ --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx > c++: error: unrecognized command-line option '-mlongcalls' > c++: error: unrecognized command-line option '-mauto-litpools' > make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 > make[2]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 > make[1]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > > CMake will not be able to correctly generate this project. > Call Stack (most recent call first): > lib/msgpack-c/CMakeLists.txt:2 (project) > > While at it, add missing comment about C++ dependency for wasm > > Fixes: > - http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda > > Signed-off-by: Fabrice Fontaine > --- > .../fluent-bit/0003-fix-build-without-C.patch | 131 ++++++++++++++++++ > package/fluent-bit/Config.in | 4 + > 2 files changed, 135 insertions(+) > create mode 100644 package/fluent-bit/0003-fix-build-without-C.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:37:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:37:36 +0100 Subject: [Buildroot] [git commit] package/multipath-tools: fix path to kernel headers Message-ID: <20230221083752.B23E9865A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=762b3f743dd0687841a2edb64c4b56a522058d5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master With change 6b7d47be3b23 ("multipath-tools: Makefiles: simplify code for include dirs") the Makefile variable 'LINUX_HEADERS_INCDIR' has been replaced with 'kernel_incdir'. fpin_handlers.c:355:32: note: each undeclared identifier is reported only once for each function it appears in fpin_handlers.c:360:37: error: ???ELS_DTAG_LNK_INTEGRITY??? undeclared (first use in this function) 360 | if (dtag == ELS_DTAG_LNK_INTEGRITY) { | ^~~~~~~~~~~~~~~~~~~~~~ make[2]: *** [../Makefile.inc:116: fpin_handlers.o] Error 1 Fixes: http://autobuild.buildroot.net/results/e0f56ef924c13d6b1535fdc350ad8ecc06ea0a58 Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- package/multipath-tools/multipath-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index 90394fae9f..23b3cc9442 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -22,7 +22,7 @@ MULTIPATH_TOOLS_CPE_ID_VENDOR = opensvc MULTIPATH_TOOLS_DEPENDENCIES = lvm2 json-c readline udev liburcu libaio host-pkgconf MULTIPATH_TOOLS_MAKE_OPTS = \ - LINUX_HEADERS_INCDIR=$(STAGING_DIR)/usr/include \ + kernel_incdir=$(STAGING_DIR)/usr/include \ LIB="lib" \ RUN="run" \ OPTFLAGS="" \ From thomas.petazzoni at bootlin.com Tue Feb 21 08:37:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:37:06 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: fix build without C++ Message-ID: <20230221083752.A82F58659D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ceb9c36b921f5237f823c34ab369ef521f3ba12b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit dedbc69022ba0beaf259463ac8082c86776f7e88 was incomplete resuling in the following build failure since the addition of the package in commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: -- Check for working CXX compiler: /usr/bin/c++ - broken CMake Error at /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message): The C++ compiler "/usr/bin/c++" is not able to compile a simple test program. It fails with the following output: Change Dir: /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp Run Build Command(s):/home/autobuild/make/make -f Makefile cmTC_bfb29/fast && make[1]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make CMakeFiles/cmTC_bfb29.dir/build make[2]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o /usr/bin/c++ --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx c++: error: unrecognized command-line option '-mlongcalls' c++: error: unrecognized command-line option '-mauto-litpools' make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 make[2]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 make[1]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' CMake will not be able to correctly generate this project. Call Stack (most recent call first): lib/msgpack-c/CMakeLists.txt:2 (project) While at it, add missing comment about C++ dependency for wasm Fixes: - http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/fluent-bit/0003-fix-build-without-C.patch | 131 ++++++++++++++++++++++ package/fluent-bit/Config.in | 4 + 2 files changed, 135 insertions(+) diff --git a/package/fluent-bit/0003-fix-build-without-C.patch b/package/fluent-bit/0003-fix-build-without-C.patch new file mode 100644 index 0000000000..3bc5f46de9 --- /dev/null +++ b/package/fluent-bit/0003-fix-build-without-C.patch @@ -0,0 +1,131 @@ +From 014e44808ebaf29b0c25b5a3fa2e35a99a30f628 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 00:09:57 +0100 +Subject: [PATCH] fix build without C++ + +Fix the following build failure without C++: + +-- Check for working CXX compiler: /usr/bin/c++ - broken +CMake Error at /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message): + The C++ compiler + + "/usr/bin/c++" + + is not able to compile a simple test program. + + It fails with the following output: + + Change Dir: /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp + + Run Build Command(s):/home/autobuild/make/make -f Makefile cmTC_bfb29/fast && make[1]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make CMakeFiles/cmTC_bfb29.dir/build + make[2]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o + /usr/bin/c++ --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx + c++: error: unrecognized command-line option '-mlongcalls' + c++: error: unrecognized command-line option '-mauto-litpools' + make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 + make[2]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 + make[1]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + + CMake will not be able to correctly generate this project. +Call Stack (most recent call first): + lib/msgpack-c/CMakeLists.txt:2 (project) + +Fixes: + - http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/fluent/fluent-bit/pull/6893] +--- + lib/chunkio/CMakeLists.txt | 2 +- + lib/lwrb/CMakeLists.txt | 2 +- + lib/msgpack-c/CMakeLists.txt | 2 +- + lib/onigmo/CMakeLists.txt | 2 +- + lib/snappy-fef67ac/CMakeLists.txt | 2 +- + lib/tutf8e/CMakeLists.txt | 2 +- + src/stream_processor/CMakeLists.txt | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt +index 233bce35c..8bfe5199d 100644 +--- a/lib/chunkio/CMakeLists.txt ++++ b/lib/chunkio/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.0) +-project(chunk-io) ++project(chunk-io C) + + set(CIO_VERSION_MAJOR 1) + set(CIO_VERSION_MINOR 4) +diff --git a/lib/lwrb/CMakeLists.txt b/lib/lwrb/CMakeLists.txt +index 2fabd6319..031cbc1dd 100644 +--- a/lib/lwrb/CMakeLists.txt ++++ b/lib/lwrb/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.0) + + # Setup project +-project(LwLibPROJECT) ++project(LwLibPROJECT C) + + # ------------------------------------------------- + # This CMakeLists.txt is used only if it is a top-level file. +diff --git a/lib/msgpack-c/CMakeLists.txt b/lib/msgpack-c/CMakeLists.txt +index 810ad609a..ffbbc5ddb 100644 +--- a/lib/msgpack-c/CMakeLists.txt ++++ b/lib/msgpack-c/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(msgpack-c) ++project(msgpack-c C) + + set(src + src/objectc.c +diff --git a/lib/onigmo/CMakeLists.txt b/lib/onigmo/CMakeLists.txt +index 4a3b30d7d..66865130a 100644 +--- a/lib/onigmo/CMakeLists.txt ++++ b/lib/onigmo/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.4) +-project(onigmo) ++project(onigmo C) + + # Onigmo Version + set(ONIGMO_VERSION_MAJOR 6) +diff --git a/lib/snappy-fef67ac/CMakeLists.txt b/lib/snappy-fef67ac/CMakeLists.txt +index 8bb1e9598..ae9225c49 100644 +--- a/lib/snappy-fef67ac/CMakeLists.txt ++++ b/lib/snappy-fef67ac/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(snappy-c) ++project(snappy-c C) + + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +diff --git a/lib/tutf8e/CMakeLists.txt b/lib/tutf8e/CMakeLists.txt +index 35cbe01ad..a056ef83c 100644 +--- a/lib/tutf8e/CMakeLists.txt ++++ b/lib/tutf8e/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(tutf8e) ++project(tutf8e C) + + # Not supported: -std=c90 (lacks support for inline) + # Supported: -std=gnu90, -std=c99 or -std=gnu99 +diff --git a/src/stream_processor/CMakeLists.txt b/src/stream_processor/CMakeLists.txt +index 8c5d70d13..de2c2fe38 100644 +--- a/src/stream_processor/CMakeLists.txt ++++ b/src/stream_processor/CMakeLists.txt +@@ -1,4 +1,4 @@ +-project(stream-processor) ++project(stream-processor C) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +-- +2.39.0 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index f53eacb447..bfdea895b0 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -30,6 +30,10 @@ config BR2_PACKAGE_FLUENT_BIT_WASM help Support for WASM-based plugins. +comment "wasm runtime support needs a toolchain w/ C++" + depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP + endif comment "fluent-bit needs a toolchain w/ threads, dynamic library" From thomas.petazzoni at bootlin.com Tue Feb 21 08:37:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:37:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/multipath-tools: fix path to kernel headers In-Reply-To: <20230218092943.2598-1-egorenar-dev@posteo.net> References: <20230218092943.2598-1-egorenar-dev@posteo.net> Message-ID: <20230221093756.06a8f7c5@windsurf> On Sat, 18 Feb 2023 09:29:43 +0000 Alexander Egorenkov wrote: > With change 6b7d47be3b23 ("multipath-tools: Makefiles: simplify code for > include dirs") the Makefile variable 'LINUX_HEADERS_INCDIR' has been replaced > with 'kernel_incdir'. > > fpin_handlers.c:355:32: note: each undeclared identifier is reported only once for each function it appears in > fpin_handlers.c:360:37: error: ?ELS_DTAG_LNK_INTEGRITY? undeclared (first use in this function) > 360 | if (dtag == ELS_DTAG_LNK_INTEGRITY) { > | ^~~~~~~~~~~~~~~~~~~~~~ > make[2]: *** [../Makefile.inc:116: fpin_handlers.o] Error 1 > > Fixes: http://autobuild.buildroot.net/results/e0f56ef924c13d6b1535fdc350ad8ecc06ea0a58 > Signed-off-by: Alexander Egorenkov > --- > package/multipath-tools/multipath-tools.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:38:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:38:41 +0100 Subject: [Buildroot] [git commit branch/next] configs/qemu_arm_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 Message-ID: <20230221083905.3EF99865B9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a86bbb4ae4a6f5580e4cbfad8ecf8ebf81b6e053 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Bump Linux kernel version to 6.1.12. - Bump U-Boot version to 2023.01 and follow CONFIG_SYS_TEXT_BASE renaming. Signed-off-by: Vincent Stehl?? Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- board/qemu/arm-ebbr/u-boot.fragment | 2 +- configs/qemu_arm_ebbr_defconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/qemu/arm-ebbr/u-boot.fragment b/board/qemu/arm-ebbr/u-boot.fragment index bfc382cde9..66fe910f16 100644 --- a/board/qemu/arm-ebbr/u-boot.fragment +++ b/board/qemu/arm-ebbr/u-boot.fragment @@ -31,5 +31,5 @@ CONFIG_PARTITION_TYPE_GUID=y CONFIG_RNG_OPTEE=y CONFIG_RTC_EMULATION=y CONFIG_SCMI_FIRMWARE=y -CONFIG_SYS_TEXT_BASE=0x60000000 CONFIG_TEE=y +CONFIG_TEXT_BASE=0x60000000 diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index f3e2d42a54..8fbb3069bc 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" @@ -42,7 +42,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From thomas.petazzoni at bootlin.com Tue Feb 21 08:38:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:38:48 +0100 Subject: [Buildroot] [git commit branch/next] configs/qemu_aarch64_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 Message-ID: <20230221083905.4C18C865BA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2215548546af47f3cfce89a15bfc31f736cd74bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Bump Linux kernel version to 6.1.12. - Bump U-Boot version to 2023.01 and rename config fragment to make it clearer that it is not a complete config file. Signed-off-by: Vincent Stehl?? Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- board/qemu/aarch64-ebbr/{u-boot.config => u-boot.fragment} | 0 configs/qemu_aarch64_ebbr_defconfig | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/qemu/aarch64-ebbr/u-boot.config b/board/qemu/aarch64-ebbr/u-boot.fragment similarity index 100% rename from board/qemu/aarch64-ebbr/u-boot.config rename to board/qemu/aarch64-ebbr/u-boot.fragment diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index d293ad0e60..e3157089a9 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -39,9 +39,9 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.config" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Host tools From thomas.petazzoni at bootlin.com Tue Feb 21 08:39:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:39:23 +0100 Subject: [Buildroot] [PATCH 1/2] configs/qemu_arm_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 In-Reply-To: <20230216100751.446662-1-vincent.stehle@arm.com> References: <20230216100751.446662-1-vincent.stehle@arm.com> Message-ID: <20230221093923.76ea5ef7@windsurf> On Thu, 16 Feb 2023 11:07:50 +0100 Vincent Stehl? wrote: > - Bump Linux kernel version to 6.1.12. > - Bump U-Boot version to 2023.01 and follow CONFIG_SYS_TEXT_BASE renaming. > > Signed-off-by: Vincent Stehl? > Cc: Romain Naour > --- > board/qemu/arm-ebbr/u-boot.fragment | 2 +- > configs/qemu_arm_ebbr_defconfig | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) Both applied to next, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:40:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:40:50 +0100 Subject: [Buildroot] [PATCH v2] package/zstd: bump to version 1.5.4 In-Reply-To: <20230216084714.85507-1-nolange79@gmail.com> References: <20230216084714.85507-1-nolange79@gmail.com> Message-ID: <20230221094050.22a51eb7@windsurf> On Thu, 16 Feb 2023 09:47:13 +0100 Norbert Lange wrote: > The LICENSE text has changed, nominally the copyright owner changed > from "Facebook" to "Meta Platforms, Inc. and affiliates", > reflecting the name change of that company. > > Add upstream patch to fix zstd-dll build. > > Signed-off-by: Norbert Lange > --- > v1->v2: recreate upstream patch with git-formatpatch > --- > ...-dll-build-missing-dependencies-3496.patch | 321 ++++++++++++++++++ > package/zstd/zstd.hash | 6 +- > package/zstd/zstd.mk | 2 +- > 3 files changed, 325 insertions(+), 4 deletions(-) > create mode 100644 package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:41:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:41:07 +0100 Subject: [Buildroot] [PATCH 2/2] package/network-manager: bump version to 1.42.0 In-Reply-To: <20230213124021.12522-2-heiko.thiery@gmail.com> References: <20230213124021.12522-1-heiko.thiery@gmail.com> <20230213124021.12522-2-heiko.thiery@gmail.com> Message-ID: <20230221094107.2b149b02@windsurf> On Mon, 13 Feb 2023 13:40:23 +0100 Heiko Thiery wrote: > Signed-off-by: Heiko Thiery > --- > package/network-manager/network-manager.hash | 4 ++-- > package/network-manager/network-manager.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:43:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:43:29 +0100 Subject: [Buildroot] [PATCH v2] package/dbus-broker: bump to release 33 In-Reply-To: <29cebb7af48c3652e440c61cc90fafa4fe3f8046.1676300324.git.stefan@agner.ch> References: <29cebb7af48c3652e440c61cc90fafa4fe3f8046.1676300324.git.stefan@agner.ch> Message-ID: <20230221094329.79cf0b8e@windsurf> Hello Stefan, On Mon, 13 Feb 2023 15:58:57 +0100 Stefan Agner wrote: > This release contains mostly a bugfixes, with some improvements around > error handling for unimplemented functionality and resiliency against > runtime changes of dbus service-files. > > Signed-off-by: Stefan Agner Thanks a lot for the update. However see below for a comment. > --- > package/dbus-broker/dbus-broker.hash | 6 +++--- > package/dbus-broker/dbus-broker.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash > index f6c2cbe160..06c8f229b7 100644 > --- a/package/dbus-broker/dbus-broker.hash > +++ b/package/dbus-broker/dbus-broker.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz > +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz > sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE > sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS > sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md > @@ -11,7 +11,7 @@ sha256 23f24eeaaded5fedd6e7840b6f7b73838f9a4e2112ad6a12fe1ef958f73d0214 subpro > sha256 05113a24aca4c537819dd0d91b95b13edb85bea4b6a77a6d9269becb397ed374 subprojects/libcrbtree-3/README.md > sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS > sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md > -sha256 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 subprojects/libcstdaux-1/AUTHORS > -sha256 7c4b6c325b0bc02150089112f65132ee999b0f44500b73d1fc06d96c93161037 subprojects/libcstdaux-1/README.md > +sha256 e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 subprojects/libcstdaux-1/AUTHORS > +sha256 92006886d7f28894fef08bf97e35ef52147067bd3c4d4d6381da7c59f9901dae subprojects/libcstdaux-1/README.md When there are changes in the license files, we need to have a short explanation in the commit log about these. Indeed, if we simply "blindly" update the hashes, then having those hashes in the first place is completely useless: the whole point of having hashes for license files is to detect changes in the license files, analyze them and justify if they require or not a change in how the licensing of the package is described in Buildroot. Could you resend with an updated commit message that explain the changes in the license files? Even if they are minimal/trivial, having this explanation in the commit log will help the reviewers/maintainers to make sure the changes in those license files have been verified. Thanks a lot! 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 Feb 21 08:50:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:50:18 +0100 Subject: [Buildroot] [PATCH] package/networkd-dispatcher: bump to version 2.2.4 In-Reply-To: <20230213151039.4073397-1-buildroot@heine.tech> References: <20230213151039.4073397-1-buildroot@heine.tech> Message-ID: <20230221095018.35fe1c66@windsurf> On Mon, 13 Feb 2023 16:10:39 +0100 Michael Nosthoff via buildroot wrote: > Signed-off-by: Michael Nosthoff > --- > package/networkd-dispatcher/networkd-dispatcher.hash | 2 +- > package/networkd-dispatcher/networkd-dispatcher.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:40:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:40:59 +0100 Subject: [Buildroot] [git commit branch/next] package/network-manager: bump version to 1.42.0 Message-ID: <20230221085502.136AA865D9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3706f1e0b7008674169809166c414825a551d04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 3895c1ffc3..270699d63a 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.10.sha256sum -sha256 fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7 NetworkManager-1.40.10.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.42/NetworkManager-1.42.0.sha256sum +sha256 2f6756d507bb6b46716594b67e6fe7491891e1b5b167bbafc5157dfa7753d5b4 NetworkManager-1.42.0.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 138ff46e4a..3001530930 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.40 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 +NETWORK_MANAGER_VERSION_MAJOR = 1.42 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 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 From thomas.petazzoni at bootlin.com Tue Feb 21 08:48:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:48:50 +0100 Subject: [Buildroot] [git commit branch/next] package/networkd-dispatcher: bump to version 2.2.4 Message-ID: <20230221085502.22A3C865DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b851097ba6db559042183eb31dc48dc1533fac04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/networkd-dispatcher/networkd-dispatcher.hash | 2 +- package/networkd-dispatcher/networkd-dispatcher.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash index ffb4fa846a..f50dd75163 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.hash +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 61270b4c2f39c36da4b0a62724a3cc01f6732493fed0f166ee675bafedff11df networkd-dispatcher-2.2.3.tar.bz2 +sha256 993086fa2dab11ba6b54a121adaccbd4c679ce3c8b3193cfa5c00500c28cbdf9 networkd-dispatcher-2.2.4.tar.bz2 sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk index 2b1aa257ce..a3e0319c10 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.mk +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETWORKD_DISPATCHER_VERSION = 2.2.3 +NETWORKD_DISPATCHER_VERSION = 2.2.4 NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) NETWORKD_DISPATCHER_LICENSE = GPL-3.0 From thomas.petazzoni at bootlin.com Tue Feb 21 08:40:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:40:39 +0100 Subject: [Buildroot] [git commit branch/next] package/zstd: bump to version 1.5.4 Message-ID: <20230221085502.087C7865D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e464dc4033d0437c337e8cf0998a95c9deeeee12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The LICENSE text has changed, nominally the copyright owner changed from "Facebook" to "Meta Platforms, Inc. and affiliates", reflecting the name change of that company. Add upstream patch to fix zstd-dll build. Signed-off-by: Norbert Lange Signed-off-by: Thomas Petazzoni --- ...-zstd-dll-build-missing-dependencies-3496.patch | 321 +++++++++++++++++++++ package/zstd/zstd.hash | 6 +- package/zstd/zstd.mk | 2 +- 3 files changed, 325 insertions(+), 4 deletions(-) diff --git a/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch new file mode 100644 index 0000000000..60737159c6 --- /dev/null +++ b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch @@ -0,0 +1,321 @@ +From e47c7c0d5a923dcdc3b302f9944eb4a70b7ee0be Mon Sep 17 00:00:00 2001 +From: Yonatan Komornik <11005061+yoniko at users.noreply.github.com> +Date: Sun, 12 Feb 2023 12:32:31 -0800 +Subject: [PATCH] Fix zstd-dll build missing dependencies (#3496) + +* Fixes zstd-dll build (https://github.com/facebook/zstd/issues/3492): +- Adds pool.o and threading.o dependency to the zstd-dll target +- Moves custom allocation functions into header to avoid needing to add dependency on common.o +- Adds test target for zstd-dll +- Adds github workflow that buildis zstd-dll + +[nolange79: backport from upstream c78f434aa4f5f1097c8edb975f4c1635817a5a71] +Signed-off-by: Norbert Lange +--- + .github/workflows/dev-short-tests.yml | 9 +++- + contrib/linux-kernel/zstd_common_module.c | 3 -- + lib/common/allocations.h | 55 +++++++++++++++++++++++ + lib/common/pool.c | 2 +- + lib/common/zstd_common.c | 35 --------------- + lib/common/zstd_internal.h | 5 --- + lib/compress/zstd_compress.c | 1 + + lib/compress/zstd_cwksp.h | 1 + + lib/compress/zstdmt_compress.c | 1 + + lib/decompress/zstd_ddict.c | 1 + + lib/decompress/zstd_decompress.c | 1 + + programs/Makefile | 2 +- + tests/Makefile | 8 +++- + 13 files changed, 76 insertions(+), 48 deletions(-) + create mode 100644 lib/common/allocations.h + +diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml +index 132dbb99..3ae2e9da 100644 +--- a/.github/workflows/dev-short-tests.yml ++++ b/.github/workflows/dev-short-tests.yml +@@ -55,6 +55,14 @@ jobs: + run: | + make c89build V=1 + ++ build-zstd-dll: ++ runs-on: ubuntu-latest ++ steps: ++ - uses: actions/checkout at ac593985615ec2ede58e132d2e21d2b1cbd6127c # tag=v3 ++ - name: build zstd bin against a dynamic lib (debuglevel for more dependencies) ++ run: | ++ make -C lib lib-mt-release ++ DEBUGLEVEL=2 make -C programs zstd-dll + + gcc-7-libzstd: + runs-on: ubuntu-latest +@@ -328,7 +336,6 @@ jobs: + make -j -C programs allVariants MOREFLAGS=-O0 + ./tests/test-variants.sh + +- + qemu-consistency: + name: QEMU ${{ matrix.name }} + runs-on: ubuntu-20.04 +diff --git a/contrib/linux-kernel/zstd_common_module.c b/contrib/linux-kernel/zstd_common_module.c +index 2fead39e..466828e3 100644 +--- a/contrib/linux-kernel/zstd_common_module.c ++++ b/contrib/linux-kernel/zstd_common_module.c +@@ -24,9 +24,6 @@ EXPORT_SYMBOL_GPL(HUF_readStats_wksp); + EXPORT_SYMBOL_GPL(ZSTD_isError); + EXPORT_SYMBOL_GPL(ZSTD_getErrorName); + EXPORT_SYMBOL_GPL(ZSTD_getErrorCode); +-EXPORT_SYMBOL_GPL(ZSTD_customMalloc); +-EXPORT_SYMBOL_GPL(ZSTD_customCalloc); +-EXPORT_SYMBOL_GPL(ZSTD_customFree); + + MODULE_LICENSE("Dual BSD/GPL"); + MODULE_DESCRIPTION("Zstd Common"); +diff --git a/lib/common/allocations.h b/lib/common/allocations.h +new file mode 100644 +index 00000000..a3153c4b +--- /dev/null ++++ b/lib/common/allocations.h +@@ -0,0 +1,55 @@ ++/* ++ * Copyright (c) Meta Platforms, Inc. and affiliates. ++ * All rights reserved. ++ * ++ * This source code is licensed under both the BSD-style license (found in the ++ * LICENSE file in the root directory of this source tree) and the GPLv2 (found ++ * in the COPYING file in the root directory of this source tree). ++ * You may select, at your option, one of the above-listed licenses. ++ */ ++ ++/* This file provides custom allocation primitives ++ */ ++ ++#define ZSTD_DEPS_NEED_MALLOC ++#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ ++ ++#include "mem.h" /* MEM_STATIC */ ++#define ZSTD_STATIC_LINKING_ONLY ++#include "../zstd.h" /* ZSTD_customMem */ ++ ++#ifndef ZSTD_ALLOCATIONS_H ++#define ZSTD_ALLOCATIONS_H ++ ++/* custom memory allocation functions */ ++ ++MEM_STATIC void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) ++ return customMem.customAlloc(customMem.opaque, size); ++ return ZSTD_malloc(size); ++} ++ ++MEM_STATIC void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) { ++ /* calloc implemented as malloc+memset; ++ * not as efficient as calloc, but next best guess for custom malloc */ ++ void* const ptr = customMem.customAlloc(customMem.opaque, size); ++ ZSTD_memset(ptr, 0, size); ++ return ptr; ++ } ++ return ZSTD_calloc(1, size); ++} ++ ++MEM_STATIC void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) ++{ ++ if (ptr!=NULL) { ++ if (customMem.customFree) ++ customMem.customFree(customMem.opaque, ptr); ++ else ++ ZSTD_free(ptr); ++ } ++} ++ ++#endif /* ZSTD_ALLOCATIONS_H */ +diff --git a/lib/common/pool.c b/lib/common/pool.c +index f3d9d085..d5ca5a78 100644 +--- a/lib/common/pool.c ++++ b/lib/common/pool.c +@@ -10,9 +10,9 @@ + + + /* ====== Dependencies ======= */ ++#include "../common/allocations.h" /* ZSTD_customCalloc, ZSTD_customFree */ + #include "zstd_deps.h" /* size_t */ + #include "debug.h" /* assert */ +-#include "zstd_internal.h" /* ZSTD_customCalloc, ZSTD_customFree */ + #include "pool.h" + + /* ====== Compiler specifics ====== */ +diff --git a/lib/common/zstd_common.c b/lib/common/zstd_common.c +index 32085524..3f04c22a 100644 +--- a/lib/common/zstd_common.c ++++ b/lib/common/zstd_common.c +@@ -14,7 +14,6 @@ + * Dependencies + ***************************************/ + #define ZSTD_DEPS_NEED_MALLOC +-#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ + #include "error_private.h" + #include "zstd_internal.h" + +@@ -47,37 +46,3 @@ ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); } + /*! ZSTD_getErrorString() : + * provides error code string from enum */ + const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); } +- +- +- +-/*=************************************************************** +-* Custom allocator +-****************************************************************/ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) +- return customMem.customAlloc(customMem.opaque, size); +- return ZSTD_malloc(size); +-} +- +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) { +- /* calloc implemented as malloc+memset; +- * not as efficient as calloc, but next best guess for custom malloc */ +- void* const ptr = customMem.customAlloc(customMem.opaque, size); +- ZSTD_memset(ptr, 0, size); +- return ptr; +- } +- return ZSTD_calloc(1, size); +-} +- +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) +-{ +- if (ptr!=NULL) { +- if (customMem.customFree) +- customMem.customFree(customMem.opaque, ptr); +- else +- ZSTD_free(ptr); +- } +-} +diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h +index 37836dc7..1f942f27 100644 +--- a/lib/common/zstd_internal.h ++++ b/lib/common/zstd_internal.h +@@ -350,11 +350,6 @@ typedef struct { + const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx); /* compress & dictBuilder */ + int ZSTD_seqToCodes(const seqStore_t* seqStorePtr); /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */ + +-/* custom memory allocation functions */ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem); +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem); +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem); +- + + /* ZSTD_invalidateRepCodes() : + * ensures next compression will not use repcodes from previous block. +diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c +index b55f684c..173ce242 100644 +--- a/lib/compress/zstd_compress.c ++++ b/lib/compress/zstd_compress.c +@@ -11,6 +11,7 @@ + /*-************************************* + * Dependencies + ***************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* INT_MAX, ZSTD_memset, ZSTD_memcpy */ + #include "../common/mem.h" + #include "hist.h" /* HIST_countFast_wksp */ +diff --git a/lib/compress/zstd_cwksp.h b/lib/compress/zstd_cwksp.h +index 97676693..9113cdbd 100644 +--- a/lib/compress/zstd_cwksp.h ++++ b/lib/compress/zstd_cwksp.h +@@ -14,6 +14,7 @@ + /*-************************************* + * Dependencies + ***************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ + #include "../common/zstd_internal.h" + + #if defined (__cplusplus) +diff --git a/lib/compress/zstdmt_compress.c b/lib/compress/zstdmt_compress.c +index 7a2c7172..bf2de4a7 100644 +--- a/lib/compress/zstdmt_compress.c ++++ b/lib/compress/zstdmt_compress.c +@@ -20,6 +20,7 @@ + + + /* ====== Dependencies ====== */ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memset, INT_MAX, UINT_MAX */ + #include "../common/mem.h" /* MEM_STATIC */ + #include "../common/pool.h" /* threadpool */ +diff --git a/lib/decompress/zstd_ddict.c b/lib/decompress/zstd_ddict.c +index ad5c34a7..309ec0d0 100644 +--- a/lib/decompress/zstd_ddict.c ++++ b/lib/decompress/zstd_ddict.c +@@ -14,6 +14,7 @@ + /*-******************************************************* + * Dependencies + *********************************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ + #include "../common/cpu.h" /* bmi2 */ + #include "../common/mem.h" /* low level memory routines */ +diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c +index d487966c..3f3ca57c 100644 +--- a/lib/decompress/zstd_decompress.c ++++ b/lib/decompress/zstd_decompress.c +@@ -55,6 +55,7 @@ + /*-******************************************************* + * Dependencies + *********************************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ + #include "../common/mem.h" /* low level memory routines */ + #define FSE_STATIC_LINKING_ONLY +diff --git a/programs/Makefile b/programs/Makefile +index fcff41dc..8507abef 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -225,7 +225,7 @@ zstd-noxz : zstd + .PHONY: zstd-dll + zstd-dll : LDFLAGS+= -L$(LIBZSTD) + zstd-dll : LDLIBS += -lzstd +-zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c ++zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c pool.c threading.c + zstd-dll : zstd + + +diff --git a/tests/Makefile b/tests/Makefile +index 3eed19ea..778c7d67 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -95,7 +95,7 @@ allnothread: fullbench fuzzer paramgrill datagen decodecorpus + dll: fuzzer-dll zstreamtest-dll + + .PHONY: zstd zstd32 zstd-nolegacy # only external makefile knows how to build or update them +-zstd zstd32 zstd-nolegacy: ++zstd zstd32 zstd-nolegacy zstd-dll: + $(MAKE) -C $(PRGDIR) $@ MOREFLAGS+="$(DEBUGFLAGS)" + + .PHONY: libzstd +@@ -328,13 +328,17 @@ test-all: test test32 test-decodecorpus-cli + test-zstd: ZSTD = $(PRGDIR)/zstd + test-zstd: zstd + ++.PHONY: test-zstd-dll ++test-zstd-dll: ZSTD = $(PRGDIR)/zstd ++test-zstd-dll: zstd-dll ++ + test-zstd32: ZSTD = $(PRGDIR)/zstd32 + test-zstd32: zstd32 + + test-zstd-nolegacy: ZSTD = $(PRGDIR)/zstd-nolegacy + test-zstd-nolegacy: zstd-nolegacy + +-test-zstd test-zstd32 test-zstd-nolegacy: datagen ++test-zstd test-zstd32 test-zstd-nolegacy test-zstd-dll: datagen + file $(ZSTD) + EXE_PREFIX="$(QEMU_SYS)" ZSTD_BIN="$(ZSTD)" DATAGEN_BIN=./datagen ./playTests.sh $(ZSTDRTTEST) + +-- +2.39.1 + diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index eca44b89f0..ca4e2fa0b9 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,6 +1,6 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 -sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.gz.sha256 +sha256 0f470992aedad543126d06efab344dc5f3e171893810455787d38347343a4424 zstd-1.5.4.tar.gz # License files (locally computed) -sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE +sha256 7055266497633c9025b777c78eb7235af13922117480ed5c674677adc381c9d8 LICENSE sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 73bb97a793..45e8bf1bc2 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.2 +ZSTD_VERSION = 1.5.4 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 From thomas.petazzoni at bootlin.com Tue Feb 21 08:50:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:50:26 +0100 Subject: [Buildroot] [git commit branch/next] package/python-maturin: bump to version 0.14.13 Message-ID: <20230221085502.30853865D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db97a1d196da07d2c1d1f41061dcac851c110915 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index b104b1fbbe..d1344f2744 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 59157a06c0a482aec750d64746f2b23e556ce3ec62d9cdce74fcb7b4658b722b maturin-0.14.9.tar.gz +sha256 7ed1234824ef2b0c919c6d24550540bf044fe992612b322a6abda1253f5bb500 maturin-0.14.13.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index 3484e09d22..7781a1070b 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.9 +PYTHON_MATURIN_VERSION = 0.14.13 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/90/f9/f4242c0e8bc5def9a7135c12574449dbb411ecc595cf72202ca97a79c2ad +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/a9/a9/bcff9592d7ad68052432e6369bd310606e2ddeb9bcc0b52d5f69e4140290 PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From thomas.petazzoni at bootlin.com Tue Feb 21 08:55:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:55:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-maturin: bump to version 0.14.13 In-Reply-To: <20230214202541.2485669-1-james.hilliard1@gmail.com> References: <20230214202541.2485669-1-james.hilliard1@gmail.com> Message-ID: <20230221095506.13a27e52@windsurf> On Tue, 14 Feb 2023 13:25:41 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-maturin/python-maturin.hash | 2 +- > package/python-maturin/python-maturin.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:57:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:57:05 +0100 Subject: [Buildroot] [PATCH 1/5] DEVELOPERS: add Julien Olivain for package/openmpi In-Reply-To: <20230207220941.58066-1-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> Message-ID: <20230221095705.1dc184ff@windsurf> On Tue, 7 Feb 2023 23:09:37 +0100 Julien Olivain wrote: > The package has been orphan since commit ee58353 (2018-12-22). > > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:56:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:56:47 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Julien Olivain for package/openmpi Message-ID: <20230221085829.7341F865DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d02eab8bcf57495c8c7675021c69fc2e3edd508 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The package has been orphan since commit ee58353 (2018-12-22). Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2eff5b23ef..6256576e02 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1691,6 +1691,7 @@ F: package/highway/ F: package/libjxl/ F: package/octave/ F: package/ola/ +F: package/openmpi/ F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ From thomas.petazzoni at bootlin.com Tue Feb 21 09:10:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 10:10:39 +0100 Subject: [Buildroot] [PATCH 3/5] package/openmpi: enable mpi compiler wrapper scripts In-Reply-To: <20230207220941.58066-3-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> <20230207220941.58066-3-ju.o@free.fr> Message-ID: <20230221101039.2d86fdcb@windsurf> Hello Julien, On Tue, 7 Feb 2023 23:09:39 +0100 Julien Olivain wrote: > openmpi normally includes compiler wrapper binary programs (e.g. mpicc, > mpicxx, etc...). Those programs are inconvenient when cross compiling. > Those target binary wrappers are useless in Buildroot, as the target > root filesystem does not include compilers. For cross compilation, > openmpi also ships Perl scripts providing a subset of those functions. > With those compiler wrappers, openmpi programs can now be cross > compiled properly in Buildroot. This patch enables those wrappers. > > Signed-off-by: Julien Olivain > --- > package/openmpi/openmpi.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk > index f14b55ced5..e6f5cd0250 100644 > --- a/package/openmpi/openmpi.mk > +++ b/package/openmpi/openmpi.mk > @@ -17,7 +17,9 @@ OPENMPI_INSTALL_STAGING = YES > # found. This makes the configuration fail. See: > # https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 > # Disable explicitly to avoid the issue. > -OPENMPI_CONF_OPTS = --without-ime > +OPENMPI_CONF_OPTS = \ > + --enable-script-wrapper-compilers \ So if I look at your PATCH 4/5, this means that "mpicc" is one of those wrapper script, installed in $(STAGING_DIR), but meant to be executed on the host? As you're saying it's written in Perl, did you test it with a minimal Fedora installation, to see if it has requirements beyond the base Perl installation? (compared to Debian/Ubuntu, Fedora has a much more fine-grained packaging of basic Perl modules, this recently lead to a small amount of additional checks in dependencies.sh, see https://gitlab.com/buildroot.org/buildroot/-/commits/master/support/dependencies/dependencies.sh). Best regards, 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 Feb 21 09:12:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 10:12:33 +0100 Subject: [Buildroot] [PATCH 4/5] package/openmpi-examples: new package In-Reply-To: <20230207220941.58066-4-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> <20230207220941.58066-4-ju.o@free.fr> Message-ID: <20230221101233.039af4c5@windsurf> Hello Julien, On Tue, 7 Feb 2023 23:09:40 +0100 Julien Olivain wrote: > diff --git a/package/openmpi-examples/Config.in b/package/openmpi-examples/Config.in > new file mode 100644 > index 0000000000..caaa02d802 > --- /dev/null > +++ b/package/openmpi-examples/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_OPENMPI_EXAMPLES > + bool "openmpi-examples" > + select BR2_PACKAGE_OPENMPI > + help > + This package includes the hello_c example from openmpi. It > + is mainly used as a simple openmpi program to test the > + libraries. It is also a recipe example for cross compiling > + an openmpi program with the mpicc wrappers. > diff --git a/package/openmpi-examples/openmpi-examples.hash b/package/openmpi-examples/openmpi-examples.hash > new file mode 120000 > index 0000000000..b8afe5e2d9 > --- /dev/null > +++ b/package/openmpi-examples/openmpi-examples.hash > @@ -0,0 +1 @@ > +../openmpi/openmpi.hash > \ No newline at end of file > diff --git a/package/openmpi-examples/openmpi-examples.mk b/package/openmpi-examples/openmpi-examples.mk > new file mode 100644 > index 0000000000..be679333c7 > --- /dev/null > +++ b/package/openmpi-examples/openmpi-examples.mk > @@ -0,0 +1,29 @@ > +################################################################################ > +# > +# openmpi-examples > +# > +################################################################################ > + > +OPENMPI_EXAMPLES_VERSION = $(OPENMPI_VERSION) > +OPENMPI_EXAMPLES_SOURCE = $(OPENMPI_SOURCE) > +OPENMPI_EXAMPLES_DL_SUBDIR = openmpi > +OPENMPI_EXAMPLES_SITE = $(OPENMPI_SITE) > +OPENMPI_EXAMPLES_LICENSE = $(OPENMPI_LINCENSE) > +OPENMPI_EXAMPLES_LICENSE_FILES = $(OPENMPI_LICENSE_FILES) Why is this a separate package? If those examples come with openmpi, then building the examples should be a suboption of the openmpi package. > +OPENMPI_EXAMPLES_DEPENDENCIES = openmpi > + > +define OPENMPI_EXAMPLES_BUILD_CMDS > + $(TARGET_MAKE_ENV) PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) OPAL_DESTDIR=$(STAGING_DIR)/usr \ Adding $(STAGING_DIR)/usr/bin in the PATH is a bad idea, as it contains a lot of tools/binaries cross-compiled for the target. > + mpicc \ > + $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ > + -o $(@D)/examples/hello_c \ > + $(@D)/examples/hello_c.c So either, we need to change things so that mpicc is installed to $(HOST_DIR), or you need to invoke it as $(STAGING_DIR)/usr/bin/mpicc. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Feb 21 11:29:11 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 12:29:11 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-synopsys-arc: drop locale Message-ID: <20230221112911.177963-1-fontaine.fabrice@gmail.com> locale is not enabled resulting in the following libcpprestsdk build failure: In file included from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/json.h:18, from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/pch/stdafx.h:88, from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/http/client/http_client_msg.cpp:13: /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/asyncrt_utils.h:317:13: error: 'locale_t' does not name a type 317 | typedef locale_t xplat_locale; | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e6778e60cc1ea455f5b4511d5824f04d8040f67b Signed-off-by: Fabrice Fontaine --- .../toolchain-external/toolchain-external-synopsys-arc/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in index c3483f331c..37c7b82644 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -4,7 +4,6 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC depends on BR2_HOSTARCH = "x86_64" select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP - select BR2_ENABLE_LOCALE select BR2_USE_WCHAR select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_NPTL -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 11:34:32 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 12:34:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build without C++ In-Reply-To: <20230221093719.5215ef5d@windsurf> References: <20230220231902.340496-1-fontaine.fabrice@gmail.com> <20230221093719.5215ef5d@windsurf> Message-ID: Le mar. 21 f?vr. 2023 ? 09:37, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > On Tue, 21 Feb 2023 00:19:02 +0100 > Fabrice Fontaine wrote: > > > Commit dedbc69022ba0beaf259463ac8082c86776f7e88 was incomplete resuling > > in the following build failure since the addition of the package in > > commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: > > > > -- Check for working CXX compiler: /usr/bin/c++ - broken > > CMake Error at > /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 > (message): > > The C++ compiler > > > > "/usr/bin/c++" > > > > is not able to compile a simple test program. > > > > It fails with the following output: > > > > Change Dir: > /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp > > > > Run Build Command(s):/home/autobuild/make/make -f Makefile > cmTC_bfb29/fast && make[1]: Entering directory > '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > > /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make > CMakeFiles/cmTC_bfb29.dir/build > > make[2]: Entering directory > '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > > Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o > > /usr/bin/c++ > --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE > -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c > /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx > > c++: error: unrecognized command-line option '-mlongcalls' > > c++: error: unrecognized command-line option '-mauto-litpools' > > make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: > CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 > > make[2]: Leaving directory > '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > > make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 > > make[1]: Leaving directory > '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > > > > CMake will not be able to correctly generate this project. > > Call Stack (most recent call first): > > lib/msgpack-c/CMakeLists.txt:2 (project) > > > > While at it, add missing comment about C++ dependency for wasm > > > > Fixes: > > - > http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda > > > > Signed-off-by: Fabrice Fontaine > > --- > > .../fluent-bit/0003-fix-build-without-C.patch | 131 ++++++++++++++++++ > > package/fluent-bit/Config.in | 4 + > > 2 files changed, 135 insertions(+) > > create mode 100644 package/fluent-bit/0003-fix-build-without-C.patch > > Applied to master, thanks. > A build failure is raised when applying patch because of line ending in lib/snappy-fef67ac/CMakeLists.txt > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Tue Feb 21 11:50:01 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 12:50:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcre2: drop JIT sparc Message-ID: <20230221115001.190317-1-fontaine.fabrice@gmail.com> JIT sparc support has been dropped since version 10.41 and https://github.com/PCRE2Project/pcre2/commit/b67d5682019fd192a615a1d5ed254b564f54126b resulting in the following build failure since bump to version 10.42 in commit 64a03682cc1a90a311b2331224deac62f8c8940f: src/pcre2_jit_compile.c:82:2: error: #error Unsupported architecture 82 | #error Unsupported architecture | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/d8246c9e3e54547cdb7d94dcdbf376d292dfd787 Signed-off-by: Fabrice Fontaine --- package/pcre2/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pcre2/Config.in b/package/pcre2/Config.in index f06f1914f3..ba4719dd3d 100644 --- a/package/pcre2/Config.in +++ b/package/pcre2/Config.in @@ -29,7 +29,6 @@ config BR2_PACKAGE_PCRE2_JIT_ARCH_SUPPORTS default y if BR2_i386 || BR2_x86_64 default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el default y if BR2_powerpc - default y if BR2_sparc config BR2_PACKAGE_PCRE2_JIT bool "enable JIT support" -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 13:00:40 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 14:00:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: fix build with -Dmodem_manager=false Message-ID: <20230221130040.868693-1-fontaine.fabrice@gmail.com> Fix the following build failure with -Dmodem_manager=false raised since commit c36f6938858d3246ca493dacc925717586e2ea0f: ../output-1/build/network-manager-1.40.10/meson.build:1060:0: ERROR: Unknown variable "mobile_broadband_provider_info_database". Fixes: - http://autobuild.buildroot.org/results/896879c8e8ce022556ee834216ced2f962ff279c Signed-off-by: Fabrice Fontaine --- ...build-failure-with-Dmodem_manager-fa.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch diff --git a/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch b/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch new file mode 100644 index 0000000000..648be027e0 --- /dev/null +++ b/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch @@ -0,0 +1,38 @@ +From 736a2c356c1c4871e8c4e70be622c65c87d3bca8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 13:03:00 +0100 +Subject: [PATCH] meson.build: fix build failure with -Dmodem_manager=false + +Fix the following build failure with -Dmodem_manager=false raised since +https://gitlab.freedesktop.org/ffontaine/NetworkManager/-/commit/03ba04d4784fa4fc7ec31455070fb5ecf25ade23: + +../output-1/build/network-manager-1.40.10/meson.build:1060:0: ERROR: Unknown variable "mobile_broadband_provider_info_database". + +Fixes: + - http://autobuild.buildroot.org/results/896879c8e8ce022556ee834216ced2f962ff279c + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1544] +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 84ce52c736..b79240efc0 100644 +--- a/meson.build ++++ b/meson.build +@@ -1057,7 +1057,9 @@ output += ' jansson: ' + jansson_msg + '\n' + output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n' + output += ' nft: ' + config_h.get('NFT_PATH') + '\n' + output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n' +-output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' ++if enable_modem_manager ++ output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' ++endif + output += ' ofono: ' + enable_ofono.to_string() + '\n' + output += ' concheck: ' + enable_concheck.to_string() + '\n' + output += ' libteamdctl: ' + enable_teamdctl.to_string() + '\n' +-- +2.39.0 + -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 13:05:54 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 14:05:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/rdma-core: needs NPTL Message-ID: <20230221130554.871679-1-fontaine.fabrice@gmail.com> rdma-core unconditionally uses pthread_spin_lock since its addition in commit ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 resulting in the following build failure: /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/sh4-buildroot-linux-uclibc/12.2.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: CMakeFiles/hfi1verbs-rdmav34.dir/verbs.c.o: in function `post_recv': verbs.c:(.text+0xc4): undefined reference to `pthread_spin_lock' Fixes: - http://autobuild.buildroot.org/results/a943e03b79c4cc328b7712046ecff09706045f81 Signed-off-by: Fabrice Fontaine --- package/rdma-core/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rdma-core/Config.in b/package/rdma-core/Config.in index 59f5ef63ae..3360e6873d 100644 --- a/package/rdma-core/Config.in +++ b/package/rdma-core/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_RDMA_CORE depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 depends on !BR2_STATIC_LIBS # dlopen() - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_IPROUTE2 # runtime select BR2_PACKAGE_LIBNL help @@ -13,8 +13,8 @@ config BR2_PACKAGE_RDMA_CORE https://github.com/linux-rdma/rdma-core -comment "rdma-core needs a toolchain w/ headers >= 3.4, threads, dynamic library" +comment "rdma-core needs a toolchain w/ headers >= 3.4, NPTL, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \ - || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 13:30:41 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 14:30:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/ace: fix build with libressl >= 3.5.0 Message-ID: <20230221133041.963258-1-fontaine.fabrice@gmail.com> Fix the following build failure with libressl raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: /tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type 45 | static BIO_METHOD methods_ACE = | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb Signed-off-by: Fabrice Fontaine --- ...Asynch_BIO.cpp-fix-build-with-libres.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch diff --git a/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch b/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch new file mode 100644 index 0000000000..4f9fde5579 --- /dev/null +++ b/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch @@ -0,0 +1,56 @@ +From 82b139f921ddb549c1bd236030bbc86e314852b3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 14:20:11 +0100 +Subject: [PATCH] ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >= + 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +/tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type + 45 | static BIO_METHOD methods_ACE = + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/DOCGroup/ACE_TAO/pull/2053] +--- + ACE/ace/SSL/SSL_Asynch_BIO.cpp | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp +index 0faa775fc0..5543598873 100644 +--- a/ace/SSL/SSL_Asynch_BIO.cpp ++++ b/ace/SSL/SSL_Asynch_BIO.cpp +@@ -41,7 +41,8 @@ extern "C" + + #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK ) + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + static BIO_METHOD methods_ACE = + { + BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER, +@@ -68,14 +69,15 @@ static BIO_METHOD methods_ACE = + #else + static BIO_METHOD* methods_ACE; + # define BIO_set_num(b, val) +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ ++#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) */ + + ACE_BEGIN_VERSIONED_NAMESPACE_DECL + + BIO * + ACE_SSL_make_BIO (void * ssl_asynch_stream) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + BIO * const pBIO = BIO_new (&methods_ACE); + #else + if (!methods_ACE) +-- +2.39.0 + -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 13:36:08 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 14:36:08 +0100 Subject: [Buildroot] [PATCH 1/1] support/dependencies/dependencies.sh: require FileHandle perl package for ace Message-ID: <20230221133608.966158-1-fontaine.fabrice@gmail.com> ace needs FileHandle module: Can't locate FileHandle.pm in @INC (you may need to install the FileHandle module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/ace-7.0.6/MPC/prj_install.pl line 17. BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/ace-7.0.6/MPC/prj_install.pl line 17. Fixes: - http://autobuild.buildroot.org/results/9dee7c09fd7b41d276df0285a0f3dcae1a71f041 Signed-off-by: Fabrice Fontaine --- support/dependencies/dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index a692856d31..078559f086 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -298,7 +298,7 @@ if grep -q -E '^BR2_PACKAGE_(WEBKITGTK|WPEWEBKIT)=y' $BR2_CONFIG ; then required_perl_modules="${required_perl_modules} JSON::PP" fi -if grep -q ^BR2_TARGET_SYSLINUX=y $BR2_CONFIG ; then +if grep -q -E '^BR2_(PACKAGE_ACE|TARGET_SYSLINUX)=y' $BR2_CONFIG ; then required_perl_modules="$required_perl_modules FileHandle" fi -- 2.39.0 From thomas.petazzoni at bootlin.com Tue Feb 21 13:47:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 14:47:18 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: fix line endings in part of 0003-fix-build-without-C.patch Message-ID: <20230221135006.DD0E7865EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c6e45f7eb4981810883961dd3af37ec0dc9d229 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/894/894cd923baa25643d9aea21678c4bca105e86b45/ Reported-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/fluent-bit/0003-fix-build-without-C.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/fluent-bit/0003-fix-build-without-C.patch b/package/fluent-bit/0003-fix-build-without-C.patch index 3bc5f46de9..0f0b239216 100644 --- a/package/fluent-bit/0003-fix-build-without-C.patch +++ b/package/fluent-bit/0003-fix-build-without-C.patch @@ -1,4 +1,4 @@ -From 014e44808ebaf29b0c25b5a3fa2e35a99a30f628 Mon Sep 17 00:00:00 2001 +From f2aeca6fcc37bf22dd7307cab8fc9db6b53dd652 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 00:09:57 +0100 Subject: [PATCH] fix build without C++ @@ -99,12 +99,12 @@ index 8bb1e9598..ae9225c49 100644 --- a/lib/snappy-fef67ac/CMakeLists.txt +++ b/lib/snappy-fef67ac/CMakeLists.txt @@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 2.8) --project(snappy-c) -+project(snappy-c C) - - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - + cmake_minimum_required(VERSION 2.8) +-project(snappy-c) ++project(snappy-c C) + + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + diff --git a/lib/tutf8e/CMakeLists.txt b/lib/tutf8e/CMakeLists.txt index 35cbe01ad..a056ef83c 100644 --- a/lib/tutf8e/CMakeLists.txt @@ -127,5 +127,5 @@ index 8c5d70d13..de2c2fe38 100644 include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -- -2.39.0 +2.39.1 From thomas.petazzoni at bootlin.com Tue Feb 21 13:50:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 14:50:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build without C++ In-Reply-To: References: <20230220231902.340496-1-fontaine.fabrice@gmail.com> <20230221093719.5215ef5d@windsurf> Message-ID: <20230221145035.363e3b06@windsurf> On Tue, 21 Feb 2023 12:34:32 +0100 Fabrice Fontaine wrote: > A build failure is raised when applying patch because of line ending in > lib/snappy-fef67ac/CMakeLists.txt Thanks for pointing this out. Fixed in https://gitlab.com/buildroot.org/buildroot/-/commit/5c6e45f7eb4981810883961dd3af37ec0dc9d229 Best regards, Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Feb 21 13:56:58 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 14:56:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/nut: ensure time_t is defined Message-ID: <20230221135658.1489271-1-fontaine.fabrice@gmail.com> Ensure time_t is defined to fix the following collectd build failure on musl: src/nut.c:40:2: error: #error "Unable to determine the UPS connection type." 40 | #error "Unable to determine the UPS connection type." | ^~~~~ src/nut.c:46:3: error: unknown type name 'collectd_upsconn_t' 46 | collectd_upsconn_t *conn; | ^~~~~~~~~~~~~~~~~~ libupsclient is an optional dependency of nut plugin since version 5.10.0 of collectd and https://github.com/collectd/collectd/commit/bc2d94024d0250211c1e498db1b43bb4525324da Fixes: - http://autobuild.buildroot.org/results/22b758097e8fb72c68e41329cbc7abc748d81ca6 Signed-off-by: Fabrice Fontaine --- ...upsclient-h-ensure-time_t-is-defined.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch diff --git a/package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch b/package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch new file mode 100644 index 0000000000..c9fb04b8cd --- /dev/null +++ b/package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch @@ -0,0 +1,35 @@ +From cafd77993ec5e16634b774b65bf6da9b34a21fc5 Mon Sep 17 00:00:00 2001 +From: Jim Klimov +Date: Wed, 31 Aug 2022 11:24:19 +0200 +Subject: [PATCH] clients/upsclient.h: ensure time_t is defined + +[Retrieved from: +https://github.com/networkupstools/nut/commit/cafd77993ec5e16634b774b65bf6da9b34a21fc5] +Signed-off-by: Fabrice Fontaine +--- + clients/upsclient.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/clients/upsclient.h b/clients/upsclient.h +index 08574b8f8b..e346d8f519 100644 +--- a/clients/upsclient.h ++++ b/clients/upsclient.h +@@ -41,6 +41,18 @@ + #include + #endif + ++/* Not including NUT timehead.h because this is part of end-user API */ ++#ifdef TIME_WITH_SYS_TIME ++# include ++# include ++#else ++# ifdef HAVE_SYS_TIME_H ++# include ++# else ++# include ++# endif ++#endif ++ + #ifdef __cplusplus + /* *INDENT-OFF* */ + extern "C" { -- 2.39.0 From thomas.petazzoni at bootlin.com Tue Feb 21 14:01:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 15:01:22 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-synopsys-arc: drop locale In-Reply-To: <20230221112911.177963-1-fontaine.fabrice@gmail.com> References: <20230221112911.177963-1-fontaine.fabrice@gmail.com> Message-ID: <20230221150122.63e353f7@windsurf> On Tue, 21 Feb 2023 12:29:11 +0100 Fabrice Fontaine wrote: > locale is not enabled resulting in the following libcpprestsdk build > failure: > > In file included from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/json.h:18, > from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/pch/stdafx.h:88, > from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/http/client/http_client_msg.cpp:13: > /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/asyncrt_utils.h:317:13: error: 'locale_t' does not name a type > 317 | typedef locale_t xplat_locale; > | ^~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/e6778e60cc1ea455f5b4511d5824f04d8040f67b > > Signed-off-by: Fabrice Fontaine The thing is that the toolchain claims to have locale support: $ grep LOCALE output/host/opt/ext-toolchain/arc-snps-linux-uclibc/sysroot/usr/include/bits/uClibc_config.h #define __UCLIBC_HAS_LOCALE__ 1 #define __UCLIBC_BUILD_MINIMAL_LOCALE__ 1 #undef __UCLIBC_BUILD_ALL_LOCALE__ #define __UCLIBC_BUILD_MINIMAL_LOCALES__ "en_US" #undef __UCLIBC_HAS_XLOCALE__ Are you sure your commit doesn't break the build? Indeed normally for external toolchains, we verify that the Buildroot configuration matches the toolchain, and abort the build if not. So if the toolchain supports locale (which it does here according to __UCLIBC_HAS_LOCALE__) but your Buildroot configuration doesn't say so, the build should normally abort with: XYZ available in C library, please enable ABC See in toolchains/helpers.mk: check_uclibc_feature = \ IS_IN_LIBC=`grep -q "\#define $(1) 1" $(3) && echo y` ; \ if [ -z "$(2)" ] ; then \ if [ "$${IS_IN_LIBC}" != "y" ] ; then \ echo "$(4) not available in C library, toolchain unsuitable for Buildroot" ; \ exit 1 ; \ fi ; \ else \ if [ "$($(2))" != "y" -a "$${IS_IN_LIBC}" = "y" ] ; then \ echo "$(4) available in C library, please enable $(2)" ; \ exit 1 ; \ fi ; \ if [ "$($(2))" = "y" -a "$${IS_IN_LIBC}" != "y" ] ; then \ echo "$(4) not available in C library, please disable $(2)" ; \ exit 1 ; \ fi ; \ fi check_uclibc = \ [...] $(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Feb 21 14:09:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 15:09:47 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-synopsys-arc: drop locale In-Reply-To: <20230221150122.63e353f7@windsurf> References: <20230221112911.177963-1-fontaine.fabrice@gmail.com> <20230221150122.63e353f7@windsurf> Message-ID: Le mar. 21 f?vr. 2023 ? 15:01, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > On Tue, 21 Feb 2023 12:29:11 +0100 > Fabrice Fontaine wrote: > > > locale is not enabled resulting in the following libcpprestsdk build > > failure: > > > > In file included from > /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/json.h:18, > > from > /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/pch/stdafx.h:88, > > from > /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/http/client/http_client_msg.cpp:13: > > > /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/asyncrt_utils.h:317:13: > error: 'locale_t' does not name a type > > 317 | typedef locale_t xplat_locale; > > | ^~~~~~~~ > > > > Fixes: > > - > http://autobuild.buildroot.org/results/e6778e60cc1ea455f5b4511d5824f04d8040f67b > > > > Signed-off-by: Fabrice Fontaine > > The thing is that the toolchain claims to have locale support: > > $ grep LOCALE > output/host/opt/ext-toolchain/arc-snps-linux-uclibc/sysroot/usr/include/bits/uClibc_config.h > > #define __UCLIBC_HAS_LOCALE__ 1 > #define __UCLIBC_BUILD_MINIMAL_LOCALE__ 1 > #undef __UCLIBC_BUILD_ALL_LOCALE__ > #define __UCLIBC_BUILD_MINIMAL_LOCALES__ "en_US" > #undef __UCLIBC_HAS_XLOCALE__ > I think the issue is that __UCLIBC_HAS_XLOCALE__ is disabled. To my understanding, locale_t is defined in xlocale.h: https://github.com/wbx-github/uclibc-ng/blob/ab1dd83bec59c9e65c31efd6e887182948f627be/include/xlocale.h#L46 I'm far from being an expert in locale/uclibc-ng so I'm a bit lost between all those variables ... In uclibc.mk, we're enabling UCLIBC_HAS_XLOCALE in UCLIBC_LOCALE_CONFIG hook. > > Are you sure your commit doesn't break the build? Indeed normally for > external toolchains, we verify that the Buildroot configuration matches > the toolchain, and abort the build if not. So if the toolchain supports > locale (which it does here according to __UCLIBC_HAS_LOCALE__) but your > Buildroot configuration doesn't say so, the build should normally abort > with: > > XYZ available in C library, please enable ABC > > See in toolchains/helpers.mk: > > check_uclibc_feature = \ > IS_IN_LIBC=`grep -q "\#define $(1) 1" $(3) && echo y` ; \ > if [ -z "$(2)" ] ; then \ > if [ "$${IS_IN_LIBC}" != "y" ] ; then \ > echo "$(4) not available in C library, toolchain > unsuitable for Buildroot" ; \ > exit 1 ; \ > fi ; \ > else \ > if [ "$($(2))" != "y" -a "$${IS_IN_LIBC}" = "y" ] ; then \ > echo "$(4) available in C library, please enable > $(2)" ; \ > exit 1 ; \ > fi ; \ > if [ "$($(2))" = "y" -a "$${IS_IN_LIBC}" != "y" ] ; then \ > echo "$(4) not available in C library, please > disable $(2)" ; \ > exit 1 ; \ > fi ; \ > fi > > check_uclibc = \ > [...] > $(call > check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale > support) ;\ > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From gwenj at trabucayre.com Tue Feb 21 13:30:54 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Tue, 21 Feb 2023 14:30:54 +0100 Subject: [Buildroot] [PATCH] package/volk: bump version to 3.0.0 Message-ID: <1676986254-52744-1-git-send-email-gwenj@trabucayre.com> From: Gwenhael Goavec-Merou Remove GPL-3.0+ license, no more COPYING-LGPL: merged into COPYING Signed-off-by: Gwenhael Goavec-Merou --- package/volk/volk.hash | 5 ++--- package/volk/volk.mk | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/volk/volk.hash b/package/volk/volk.hash index 4c62c6d315..8047a68bab 100644 --- a/package/volk/volk.hash +++ b/package/volk/volk.hash @@ -1,4 +1,3 @@ # Locally computed -sha256 eff53206cd1ec3314755e0b2bde3c7aaea21dd0f0ad8d753bff07d98e93ddee2 volk-2.5.2.tar.xz -sha256 6dcdafa9e750545f5f65c2e6f53820184822db728ac2b8bfe1d4a47da09ec0d6 COPYING -sha256 258f450f060a161fb9f9e2e7c07c6b1ee73e5142297e6792dc1ee76b028cf0ca COPYING-LGPL +sha256 88fd80638a3683f23a8cae6c551a8cfe9ea55735c701846f3eeeeeea8a14f6a3 volk-3.0.0.tar.xz +sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING diff --git a/package/volk/volk.mk b/package/volk/volk.mk index af5bd4306b..c9c098f237 100644 --- a/package/volk/volk.mk +++ b/package/volk/volk.mk @@ -4,13 +4,13 @@ # ################################################################################ -VOLK_VERSION = 2.5.2 +VOLK_VERSION = 3.0.0 VOLK_SITE = https://github.com/gnuradio/volk/releases/download/v$(VOLK_VERSION) VOLK_SOURCE = volk-$(VOLK_VERSION).tar.xz # See https://github.com/gnuradio/volk/tree/v2.5.1#license for some # details on the licensing. -VOLK_LICENSE = GPL-3.0+, LGPL-3.0+ -VOLK_LICENSE_FILES = COPYING COPYING-LGPL +VOLK_LICENSE = LGPL-3.0+ +VOLK_LICENSE_FILES = COPYING VOLK_SUPPORTS_IN_SOURCE_BUILD = NO -- 2.30.2 From thomas.petazzoni at bootlin.com Tue Feb 21 14:21:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 15:21:00 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-synopsys-arc: drop locale In-Reply-To: References: <20230221112911.177963-1-fontaine.fabrice@gmail.com> <20230221150122.63e353f7@windsurf> Message-ID: <20230221152100.27549e20@windsurf> On Tue, 21 Feb 2023 15:09:47 +0100 Fabrice Fontaine wrote: > I think the issue is that __UCLIBC_HAS_XLOCALE__ is disabled. > To my understanding, locale_t is defined in xlocale.h: > https://github.com/wbx-github/uclibc-ng/blob/ab1dd83bec59c9e65c31efd6e887182948f627be/include/xlocale.h#L46 Possible indeed. There are newer versions of the ARC toolchain available at https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases, but I checked the latest and it still has xlocale disabled. One option is to ask the ARC/Synopsys people to enable XLOCALE in their uClibc configuration. Another option is to drop the ARC/Synopsys toolchain entirely. A third option is to change the check done by Buildroot to verify __UCLIBC_HAS_XLOCALE__ instead of __UCLIBC_HAS_LOCALE__. This way it will be valid to say that the ARC toolchain does not have locale support. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Feb 21 14:21:44 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 15:21:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast Message-ID: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> systemd can't be built with -Ofast since version 252 and https://github.com/systemd/systemd/commit/60f97fee2d2f948c8e8963ea8ff767008cb93cae resulting in the following build failure since bump to version 252.4 in commit a2c823d1f548d5a0120d27d6c000603192360f7b: ../output-1/build/systemd-252.4/meson.build:397:8: ERROR: Problem encountered: -Ofast, -ffast-math, or -ffinite-math-only is specified in c_args. While at it, revert changes made by commit 9cd084b54e2223e49c37962b0cbefae7bea26ef5 Fixes: - http://autobuild.buildroot.org/results/8f41c4984b645851724e554c3162b83bc312bee7 Signed-off-by: Fabrice Fontaine --- package/systemd/Config.in | 1 + package/systemd/systemd.mk | 5 ----- system/Config.in | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 9f4d933779..5bbdbb405f 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -25,6 +25,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd + depends on !BR2_OPTIMIZE_FAST select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime select BR2_PACKAGE_LIBCAP diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index cce9162f6d..edba8c2677 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -98,11 +98,6 @@ SYSTEMD_CONF_OPTS += \ -Dtmpfiles=true \ -Dumount-path=/usr/bin/umount -SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_OPTIMIZE_FAST),y) -SYSTEMD_CFLAGS += -O3 -endif - ifeq ($(BR2_nios2),y) # Nios2 ld emits warnings, make warnings not to be treated as errors SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings diff --git a/system/Config.in b/system/Config.in index 1ca7690ea3..8a8b198fcd 100644 --- a/system/Config.in +++ b/system/Config.in @@ -127,6 +127,7 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 + depends on !BR2_OPTIMIZE_FAST select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT @@ -140,6 +141,9 @@ comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and targe !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 +comment "systemd can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST + comment "systemd highly recommends Linux >= 4.15" depends on BR2_INIT_SYSTEMD depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 14:29:19 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 15:29:19 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-synopsys-arc: drop locale In-Reply-To: <20230221152100.27549e20@windsurf> References: <20230221112911.177963-1-fontaine.fabrice@gmail.com> <20230221150122.63e353f7@windsurf> <20230221152100.27549e20@windsurf> Message-ID: Le mar. 21 f?vr. 2023 ? 15:21, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > On Tue, 21 Feb 2023 15:09:47 +0100 > Fabrice Fontaine wrote: > > > I think the issue is that __UCLIBC_HAS_XLOCALE__ is disabled. > > To my understanding, locale_t is defined in xlocale.h: > > > https://github.com/wbx-github/uclibc-ng/blob/ab1dd83bec59c9e65c31efd6e887182948f627be/include/xlocale.h#L46 > > Possible indeed. There are newer versions of the ARC toolchain > available at > https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases > , > but I checked the latest and it still has xlocale disabled. > > One option is to ask the ARC/Synopsys people to enable XLOCALE in their > uClibc configuration. > I added a comment to an issue opened in 2020: https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/issues/241 > > Another option is to drop the ARC/Synopsys toolchain entirely. > > A third option is to change the check done by Buildroot to verify > __UCLIBC_HAS_XLOCALE__ instead of __UCLIBC_HAS_LOCALE__. This way it > will be valid to say that the ARC toolchain does not have locale > support. > I'll send a patch. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Tue Feb 21 14:35:33 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 15:35:33 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/helpers.mk: fix uclibc locale support Message-ID: <20230221143533.1510153-1-fontaine.fabrice@gmail.com> locale_t is defined by uclibc in xlocale.h: https://github.com/wbx-github/uclibc-ng/blob/ab1dd83bec59c9e65c31efd6e887182948f627be/include/xlocale.h#L46 As a result, without xlocale, locale is not fully enabled which will result in the following build failure with toolchain-external-synopsys-arc and libcpprestsdk: In file included from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/json.h:18, from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/pch/stdafx.h:88, from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/http/client/http_client_msg.cpp:13: /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/asyncrt_utils.h:317:13: error: 'locale_t' does not name a type 317 | typedef locale_t xplat_locale; | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e6778e60cc1ea455f5b4511d5824f04d8040f67b Signed-off-by: Fabrice Fontaine --- toolchain/helpers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index f8fc933914..601a64f191 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -307,7 +307,7 @@ check_uclibc = \ $(call check_uclibc_feature,__UCLIBC_HAS_LFS__,,$${UCLIBC_CONFIG_FILE},Large file support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_NATIVE_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\ - $(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ + $(call check_uclibc_feature,__UCLIBC_HAS_XLOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support) ;\ $(call check_uclibc_feature,__PTHREADS_DEBUG_SUPPORT__,BR2_TOOLCHAIN_HAS_THREADS_DEBUG,$${UCLIBC_CONFIG_FILE},Thread debugging support) ;\ -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 14:45:05 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 15:45:05 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add ubi handling Message-ID: <20230221144505.1515495-1-fontaine.fabrice@gmail.com> Add a custom case to make sure that a random configuration with an empty configuration file for ubi doesn't fail. ubinize: error!: no sections found the ini-file "/home/buildroot/autobuild/instance-2/output-1/build/ubinize.cfg" Fixes: - http://autobuild.buildroot.org/results/f678c17cc4df06fb2737467e769cd8f72a3ea420 Signed-off-by: Fabrice Fontaine --- utils/genrandconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index dbace1b07f..d192c5b324 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -508,6 +508,12 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_ROOTFS_F2FS_SIZE="100M"\n') configlines.append('BR2_TARGET_ROOTFS_F2FS_SIZE="%s"\n' % ROOTFS_SIZE) + if 'BR2_TARGET_ROOTFS_UBI=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE=""\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y\n') + configlines.remove('BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE=""\n') + if 'BR2_TARGET_S500_BOOTLOADER=y\n' in configlines and \ 'BR2_TARGET_S500_BOOTLOADER_BOARD=""\n' in configlines: return False -- 2.39.0 From thomas.petazzoni at bootlin.com Tue Feb 21 14:48:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 15:48:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast In-Reply-To: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> References: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> Message-ID: <20230221154827.7e737960@windsurf> Hello Fabrice, On Tue, 21 Feb 2023 15:21:44 +0100 Fabrice Fontaine wrote: > systemd can't be built with -Ofast since version 252 and > https://github.com/systemd/systemd/commit/60f97fee2d2f948c8e8963ea8ff767008cb93cae > resulting in the following build failure since bump to version 252.4 in > commit a2c823d1f548d5a0120d27d6c000603192360f7b: > > ../output-1/build/systemd-252.4/meson.build:397:8: ERROR: Problem encountered: -Ofast, -ffast-math, or -ffinite-math-only is specified in c_args. > > While at it, revert changes made by commit 9cd084b54e2223e49c37962b0cbefae7bea26ef5 > > Fixes: > - http://autobuild.buildroot.org/results/8f41c4984b645851724e554c3162b83bc312bee7 > > Signed-off-by: Fabrice Fontaine > --- > package/systemd/Config.in | 1 + > package/systemd/systemd.mk | 5 ----- > system/Config.in | 4 ++++ > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index 9f4d933779..5bbdbb405f 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -25,6 +25,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd > + depends on !BR2_OPTIMIZE_FAST I really dislike this. > -SYSTEMD_CFLAGS = $(TARGET_CFLAGS) > -ifeq ($(BR2_OPTIMIZE_FAST),y) > -SYSTEMD_CFLAGS += -O3 > -endif And this should work. It's really systemd that is stupid to look for -Ofast in c_flags without seeing that -O3 later overrides it. 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 Feb 21 14:49:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 15:49:40 +0100 Subject: [Buildroot] [PATCH] package/volk: bump version to 3.0.0 In-Reply-To: <1676986254-52744-1-git-send-email-gwenj@trabucayre.com> References: <1676986254-52744-1-git-send-email-gwenj@trabucayre.com> Message-ID: <20230221154940.17aa2764@windsurf> On Tue, 21 Feb 2023 14:30:54 +0100 Gwenhael Goavec-Merou wrote: > From: Gwenhael Goavec-Merou > > Remove GPL-3.0+ license, no more COPYING-LGPL: merged into COPYING Do you have some source information on the removal of GPL-3.0+ ? > # See https://github.com/gnuradio/volk/tree/v2.5.1#license for some > # details on the licensing. Is this comment still up to date? Probably not based on the URL of the link :) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Feb 21 15:11:28 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 16:11:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl_433: fix build without threads Message-ID: <20230221151128.1926887-1-fontaine.fabrice@gmail.com> Fix the following build failure without threads raised since bump to version 22.11 in commit 6f848c068f8ab0cc67fb48582e00221158ddc8cb: In file included from /home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/src/data_tag.c:17: /home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/include/mongoose.h:407:10: fatal error: pthread.h: No such file or directory 407 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/9f1677fc5a4568be0b9c121060c5d821ac2ae21b Signed-off-by: Fabrice Fontaine --- ...r-Fix-mongoose-build-without-threads.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch diff --git a/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch b/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch new file mode 100644 index 0000000000..85bc45147a --- /dev/null +++ b/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch @@ -0,0 +1,42 @@ +From 707b51ecbc5598eed2fb67962232bf3fe0e96f81 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 27 Dec 2022 21:30:54 +0100 +Subject: [PATCH] minor: Fix mongoose build without threads (#2291) + +Fix the following build failure without threads: + +In file included from /home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/src/data_tag.c:17: +/home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/include/mongoose.h:407:10: fatal error: pthread.h: No such file or directory + 407 | #include + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/9f1677fc5a4568be0b9c121060c5d821ac2ae21b + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/707b51ecbc5598eed2fb67962232bf3fe0e96f81] +--- + include/mongoose.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/mongoose.h b/include/mongoose.h +index 1173b3fc7..b111ea34e 100644 +--- a/include/mongoose.h ++++ b/include/mongoose.h +@@ -404,7 +404,6 @@ unsigned int sleep(unsigned int seconds); + #include + #include + #include +-#include + #include + #include + #include +@@ -4658,6 +4657,7 @@ size_t mg_fwrite(const void *ptr, size_t size, size_t count, FILE *f); + #endif /* MG_ENABLE_FILESYSTEM */ + + #if MG_ENABLE_THREADS ++#include + /* + * Starts a new detached thread. + * Arguments and semantics are the same as pthead's `pthread_create()`. -- 2.39.0 From gwenj at trabucayre.com Tue Feb 21 14:40:18 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Tue, 21 Feb 2023 15:40:18 +0100 Subject: [Buildroot] [PATCH v2] package/volk: bump version to 3.0.0 Message-ID: <1676990418-53157-1-git-send-email-gwenj@trabucayre.com> From: Gwenhael Goavec-Merou As mentionned into release message [1], github license page [2] and announce [3], this release is primarly dedicated to fully removing GPL-3.0+ license, no more COPYING-LGPL: merged into COPYING [1]: https://github.com/gnuradio/volk/releases/tag/v3.0.0 [2]: https://github.com/gnuradio/volk/tree/v3.0.0#license [3]: https://lists.gnu.org/archive/html/discuss-gnuradio/2023-01/msg00046.html Signed-off-by: Gwenhael Goavec-Merou --- Changes v1 -> v2: - update commit message with links related to GPL-3.0+ license removing - remove .mk note about license details --- package/volk/volk.hash | 5 ++--- package/volk/volk.mk | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package/volk/volk.hash b/package/volk/volk.hash index 4c62c6d315..8047a68bab 100644 --- a/package/volk/volk.hash +++ b/package/volk/volk.hash @@ -1,4 +1,3 @@ # Locally computed -sha256 eff53206cd1ec3314755e0b2bde3c7aaea21dd0f0ad8d753bff07d98e93ddee2 volk-2.5.2.tar.xz -sha256 6dcdafa9e750545f5f65c2e6f53820184822db728ac2b8bfe1d4a47da09ec0d6 COPYING -sha256 258f450f060a161fb9f9e2e7c07c6b1ee73e5142297e6792dc1ee76b028cf0ca COPYING-LGPL +sha256 88fd80638a3683f23a8cae6c551a8cfe9ea55735c701846f3eeeeeea8a14f6a3 volk-3.0.0.tar.xz +sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING diff --git a/package/volk/volk.mk b/package/volk/volk.mk index af5bd4306b..67475d5c90 100644 --- a/package/volk/volk.mk +++ b/package/volk/volk.mk @@ -4,13 +4,11 @@ # ################################################################################ -VOLK_VERSION = 2.5.2 +VOLK_VERSION = 3.0.0 VOLK_SITE = https://github.com/gnuradio/volk/releases/download/v$(VOLK_VERSION) VOLK_SOURCE = volk-$(VOLK_VERSION).tar.xz -# See https://github.com/gnuradio/volk/tree/v2.5.1#license for some -# details on the licensing. -VOLK_LICENSE = GPL-3.0+, LGPL-3.0+ -VOLK_LICENSE_FILES = COPYING COPYING-LGPL +VOLK_LICENSE = LGPL-3.0+ +VOLK_LICENSE_FILES = COPYING VOLK_SUPPORTS_IN_SOURCE_BUILD = NO -- 2.30.2 From fontaine.fabrice at gmail.com Tue Feb 21 15:27:22 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 16:27:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/janet: needs gcc >= 4.9 Message-ID: <20230221152722.2418893-1-fontaine.fabrice@gmail.com> janet needs gcc >= 4.9 for stdatomic.h since version 1.26.0 and https://github.com/janet-lang/janet/commit/bfcfd58259911b92ff516bab9216831b34653805 resulting in the following build failure since commit 5c6f32bd255fc97823d464beacfa905a141066ec: src/core/abstract.c:35:23: fatal error: stdatomic.h: No such file or directory Fixes: - http://autobuild.buildroot.org/results/a2b40adb93b751221ba2cdf9a705f86c30499021 Signed-off-by: Fabrice Fontaine --- package/janet/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/janet/Config.in b/package/janet/Config.in index 0e25ce34e3..7b78c14bf4 100644 --- a/package/janet/Config.in +++ b/package/janet/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_JANET bool "janet" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h help Janet is a functional and imperative programming language. The entire language (core library, interpreter, compiler, @@ -8,3 +9,6 @@ config BR2_PACKAGE_JANET and two headers. https://janet-lang.org/ + +comment "janet needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 15:48:45 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 16:48:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/janet: fix build without threads Message-ID: <20230221154845.2896796-1-fontaine.fabrice@gmail.com> Fix the following build failure without threads raised since bump to version 1.26.0 in commit 5c6f32bd255fc97823d464beacfa905a141066ec: ffi.c:(.text+0x9d8): undefined reference to `janet_abstract_threaded' Fixes: - http://autobuild.buildroot.org/results/20108e76990d8af7f47d474eadbbea8562ef6728 Signed-off-by: Fabrice Fontaine --- .../0001-Update-for-more-minimal-builds.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/janet/0001-Update-for-more-minimal-builds.patch diff --git a/package/janet/0001-Update-for-more-minimal-builds.patch b/package/janet/0001-Update-for-more-minimal-builds.patch new file mode 100644 index 0000000000..ba36a9beba --- /dev/null +++ b/package/janet/0001-Update-for-more-minimal-builds.patch @@ -0,0 +1,29 @@ +From 746ff5307d309536984b648460e7b5c5dac44453 Mon Sep 17 00:00:00 2001 +From: Calvin Rose +Date: Sun, 12 Feb 2023 12:14:11 -0600 +Subject: [PATCH] Update for more minimal builds. + +[Retrieved (and backported) from: +https://github.com/janet-lang/janet/commit/746ff5307d309536984b648460e7b5c5dac44453] +Signed-off-by: Fabrice Fontaine +--- + src/core/ffi.c | 4 ++++ + src/core/marsh.c | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/core/ffi.c b/src/core/ffi.c +index 45a498c7..b453f1f6 100644 +--- a/src/core/ffi.c ++++ b/src/core/ffi.c +@@ -1311,7 +1311,11 @@ JANET_CORE_FN(cfun_ffi_jitfn, + size_t alloc_size = ((size_t) bytes.len + FFI_PAGE_MASK) & ~FFI_PAGE_MASK; + + #ifdef JANET_FFI_JIT ++#ifdef JANET_EV + JanetFFIJittedFn *fn = janet_abstract_threaded(&janet_type_ffijit, sizeof(JanetFFIJittedFn)); ++#else ++ JanetFFIJittedFn *fn = janet_abstract(&janet_type_ffijit, sizeof(JanetFFIJittedFn)); ++#endif + fn->function_pointer = NULL; + fn->size = 0; + #ifdef JANET_WINDOWS -- 2.39.0 From thomas at devoogdt.com Tue Feb 21 15:52:49 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 21 Feb 2023 16:52:49 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: <6d000223-f440-43bb-b9ba-2144375776be@korsgaard.com> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-2-thomas.devoogdt@barco.com> <87edqkz1yv.fsf@dell.be.48ers.dk> <20230220214958.19d88af8@windsurf> <6d000223-f440-43bb-b9ba-2144375776be@korsgaard.com> Message-ID: Hi The reason for this patch was to fix this bug: ``` Package 'atk-bridge-2.0', required by 'gtk+-3.0', not found Package atk-bridge-2.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `atk-bridge-2.0.pc' to the PKG_CONFIG_PATH environment variable ``` Right now, the upstream 2.38.5 is not compiling (or at least not my branch which is rebased on 2023.02-rc1). So it will be important to have the proposed patch series from Thomas Petazzoni merged into the master before 2023.02 lands. My original patch can be dropped then. Also, it would require Xorg to be built, even if build for e.g. Wayland. Unfortunately, I could not apply the patch series myself due to some weird encoding (UTF-16?). But if I find out how to do that, then I can double-check. Kr, Thomas ``` >>> webkitgtk 2.38.5 Building PATH="/home/thomas/buildroot/output/host/bin:/home/thomas/buildroot/output/host/sbin:/home/thomas/.local/bin:/home/thomas/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin:/home/thomas/.dotnet/tools:/home/thomas/.local/bin" /usr/bin/cmake --build /home/thomas/buildroot/output/build/webkitgtk-2.38.5/ [773/5265] Generating ../../WebCore/DerivedSources/CSSProperties.jso..., ../../WebCore/DerivedSources/CSSStyleDeclaration+PropertyNames.idl 1 input keys have identical hash values, examine output carefully... [995/5265] Building CXX object Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/API/glib/JSCOptions.cpp.o /home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/JavaScriptCore/API/glib/JSCOptions.cpp: In function ?GOptionGroup* jsc_options_get_option_group()?: /home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/JavaScriptCore/API/glib/JSCOptions.cpp:703:84: warning: cast from ?gchar*? {aka ?char*?} to ?GOptionEntry*? {aka ?_GOptionEntry*?} increases required alignment of target type [-Wcast-align] g_option_group_add_entries(group, reinterpret_cast(entries->data)); ^ [1910/5265] Building CXX object Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o FAILED: Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o /home/thomas/buildroot/output/host/bin/arm-linux-g++ --sysroot=/home/thomas/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot -DBUILDING_GTK__=1 -DBUILDING_PAL -DBUILDING_WITH_CMAKE=1 -DGETTEXT_PACKAGE=\"WebKit2GTK-4.1\" -DHAVE_CONFIG_H=1 -DJSC_GLIB_API_ENABLED -DPAS_BMALLOC=1 -DWEBKITGTK_API_VERSION_STRING=\"4.1\" -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5 -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/PAL/DerivedSources -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/crypto -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/system -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/text -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/JavaScriptCore/Headers -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/JavaScriptCore/PrivateHeaders -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/JavaScriptCoreGLib/Headers -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/JavaScriptCoreGLib/DerivedSources -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/WTF/Headers -fdiagnostics-color=always -Wextra -Wall -pipe -Wno-odr -Wno-stringop-overflow -Wno-nonnull -Wno-array-bounds -Wno-expansion-to-defined -Wno-noexcept-type -Wno-psabi -Wno-misleading-indentation -Wno-maybe-uninitialized -Wwrite-strings -Wundef -Wpointer-arith -Wmissing-format-attribute -Wformat-security -Wcast-align -Wno-tautological-compare -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -fno-strict-aliasing -fno-exceptions -fno-rtti -DNDEBUG -fPIC -fvisibility=hidden -std=c++2a -MD -MT Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o -MF Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o.d -o Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o -c /home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/text/TextCodecICU.cpp In file included from /home/thomas/buildroot/output/build/webkitgtk-2.38.5/WTF/Headers/wtf/URL.h:31, from /home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/text/TextEncoding.h:29, from /home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/text/TextCodecICU.cpp:30: /home/thomas/buildroot/output/build/webkitgtk-2.38.5/WTF/Headers/wtf/glib/GRefPtr.h:28:10: fatal error: glib.h: No such file or directory #include ^~~~~~~~ compilation terminated. [1923/5265] Generating ../../inspector-resources.stamp ninja: build stopped: subcommand failed. make[1]: *** [package/pkg-generic.mk:293: /home/thomas/buildroot/output/build/webkitgtk-2.38.5/.stamp_built] Error 1 make: *** [Makefile:82: _all] Error 2 ``` Op ma 20 feb. 2023 om 21:57 schreef Peter Korsgaard : > > On 20/02/2023 21.49, Thomas Petazzoni wrote: > >> Maybe it is? Does at-spi2 work under wayland? > > > > Please note that we also have a series that removes atk, at-spi2-atk, > > and bumps at-spi2-core, which now replaces both atk and at-spi2-atk: > > > > https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 > > Ahh yes, that is probably the way to go. > > -- > Bye, Peter Korsgaard > > From fontaine.fabrice at gmail.com Tue Feb 21 16:00:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 17:00:36 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-codescape-mti-mips: disable gdbserver Message-ID: <20230221160036.2903448-1-fontaine.fabrice@gmail.com> Fix the following build failure: >>> toolchain-external-codescape-mti-mips 2018.09-02 Copying gdbserver Could not find gdbserver in external toolchain Fixes: - http://autobuild.buildroot.org/results/ead304285a9cf32bf6b9dcc7fc30acece25ec680 Signed-off-by: Fabrice Fontaine --- .../toolchain-external-codescape-mti-mips/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index 8217ddc38c..720d705d14 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -5,6 +5,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 16:01:37 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 17:01:37 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-codescape-img-mips: disable gdbserver Message-ID: <20230221160137.2904208-1-fontaine.fabrice@gmail.com> Fix the following build failure: >>> toolchain-external-codescape-img-mips 2018.09-02 Copying gdbserver Could not find gdbserver in external toolchain Fixes: - http://autobuild.buildroot.org/results/b0786965e0b249c8168df855682e54cfe95fa0cc Signed-off-by: Fabrice Fontaine --- .../toolchain-external-codescape-img-mips/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in index 2341d08832..d49c610237 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in @@ -5,6 +5,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 -- 2.39.0 From giulio.benetti at benettiengineering.com Tue Feb 21 16:15:21 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 21 Feb 2023 17:15:21 +0100 Subject: [Buildroot] [PATCH] package/webkitgtk: fix build failure with mixed boolean types Message-ID: <20230221161522.3749804-1-giulio.benetti@benettiengineering.com> Add local patch pending upstream[0] to fix build failure due to mixed typedef enum { FALSE = 0, TRUE = 1 } boolean; and Fixes: still not failed [0]: https://github.com/WebKit/WebKit/pull/10447 Signed-off-by: Giulio Benetti --- ...oder-boolean-enum-and-define-TRUE-FA.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/webkitgtk/0001-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch diff --git a/package/webkitgtk/0001-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch b/package/webkitgtk/0001-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch new file mode 100644 index 0000000000..7648ce8f29 --- /dev/null +++ b/package/webkitgtk/0001-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch @@ -0,0 +1,53 @@ +From 37f07b014126f8ca56b60b3a4ed38f96f07d2ec9 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Tue, 21 Feb 2023 16:43:05 +0100 +Subject: [PATCH] Fix JPEGImageDecoder boolean enum and #define TRUE/FALSE mix + https://bugs.webkit.org/show_bug.cgi?id=252666 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reviewed by NOBODY (OOPS!). + +jpeglib.h contains a typedef enum for boolean type but LCMSUniquePtr.h +include files that can contain #define TRUE/FALSE. This way build fails +with: +JPEGImageDecoder.cpp:343:43: error: invalid conversion from ?int? to ?boolean? + +This is because TRUE or FALSE should be an enum instead they get defined +as 1 or 0. To fix this move jpeglib.h inclusion after LCMSUniquePtr.h +inclusion. + +Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h: + +Signed-off-by: Giulio Benetti +--- + .../platform/image-decoders/jpeg/JPEGImageDecoder.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h +index aa875de00faa..c396e1086d41 100644 +--- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h ++++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h +@@ -32,14 +32,15 @@ + // ICU defines TRUE and FALSE macros, breaking libjpeg v9 headers + #undef TRUE + #undef FALSE +-extern "C" { +-#include "jpeglib.h" +-} + + #if USE(LCMS) + #include "LCMSUniquePtr.h" + #endif + ++extern "C" { ++#include "jpeglib.h" ++} ++ + namespace WebCore { + + class JPEGImageReader; +-- +2.34.1 + -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 21 16:15:22 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 21 Feb 2023 17:15:22 +0100 Subject: [Buildroot] [PATCH] package/wpewebkit: fix build failure with mixed boolean types In-Reply-To: <20230221161522.3749804-1-giulio.benetti@benettiengineering.com> References: <20230221161522.3749804-1-giulio.benetti@benettiengineering.com> Message-ID: <20230221161522.3749804-2-giulio.benetti@benettiengineering.com> Add local patch pending upstream[0] to fix build failure due to mixed typedef enum { FALSE = 0, TRUE = 1 } boolean; and #define FALSE 0 #define TRUE 1 Fixes: still not failed [0]: https://github.com/WebKit/WebKit/pull/10447 Signed-off-by: Giulio Benetti --- ...oder-boolean-enum-and-define-TRUE-FA.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/wpewebkit/0002-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch diff --git a/package/wpewebkit/0002-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch b/package/wpewebkit/0002-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch new file mode 100644 index 0000000000..7648ce8f29 --- /dev/null +++ b/package/wpewebkit/0002-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch @@ -0,0 +1,53 @@ +From 37f07b014126f8ca56b60b3a4ed38f96f07d2ec9 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Tue, 21 Feb 2023 16:43:05 +0100 +Subject: [PATCH] Fix JPEGImageDecoder boolean enum and #define TRUE/FALSE mix + https://bugs.webkit.org/show_bug.cgi?id=252666 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reviewed by NOBODY (OOPS!). + +jpeglib.h contains a typedef enum for boolean type but LCMSUniquePtr.h +include files that can contain #define TRUE/FALSE. This way build fails +with: +JPEGImageDecoder.cpp:343:43: error: invalid conversion from ?int? to ?boolean? + +This is because TRUE or FALSE should be an enum instead they get defined +as 1 or 0. To fix this move jpeglib.h inclusion after LCMSUniquePtr.h +inclusion. + +Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h: + +Signed-off-by: Giulio Benetti +--- + .../platform/image-decoders/jpeg/JPEGImageDecoder.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h +index aa875de00faa..c396e1086d41 100644 +--- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h ++++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h +@@ -32,14 +32,15 @@ + // ICU defines TRUE and FALSE macros, breaking libjpeg v9 headers + #undef TRUE + #undef FALSE +-extern "C" { +-#include "jpeglib.h" +-} + + #if USE(LCMS) + #include "LCMSUniquePtr.h" + #endif + ++extern "C" { ++#include "jpeglib.h" ++} ++ + namespace WebCore { + + class JPEGImageReader; +-- +2.34.1 + -- 2.34.1 From vfazio at xes-inc.com Tue Feb 21 17:21:51 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:51 -0600 Subject: [Buildroot] [PATCH 01/15] package/pkg-autotools: drop FOO_GETTEXTIZE_OPTS support Message-ID: <20230221172205.2450111-1-vfazio@xes-inc.com> From: Vincent Fazio No package in the current tree is currently utilizing this option. The long term solution is to use autopoint over gettextize in which case these options aren't relevant anyway. Signed-off-by: Vincent Fazio --- package/pkg-autotools.mk | 6 +----- package/pkg-generic.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 717ff81593..55d95d204e 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -92,7 +92,7 @@ endef # define GETTEXTIZE_HOOK @$(call MESSAGE,"Gettextizing") - $(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE) $($(PKG)_GETTEXTIZE_OPTS) + $(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE) endef # @@ -152,10 +152,6 @@ ifndef $(2)_GETTEXTIZE endif endif -ifeq ($(4),host) - $(2)_GETTEXTIZE_OPTS ?= $$($(3)_GETTEXTIZE_OPTS) -endif - ifeq ($(4),host) $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS) endif diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 82187d7db9..a6ef5efb5f 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1206,9 +1206,16 @@ $(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_ $(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS)) $(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS)) $(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)) +# Check for deprecated variables that have no replacement +ifneq ($$($(2)_GETTEXTIZE_OPT),) +$$(error "$(2)_GETTEXTIZE_OPT is no longer supported. Please fix your .mk file.") +endif +ifneq ($$($(2)_GETTEXTIZE_OPTS),) +$$(error "$(2)_GETTEXTIZE_OPTS is no longer supported. Please fix your .mk file.") +endif + PACKAGES += $(1) ifneq ($$($(2)_PERMISSIONS),) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:52 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:52 -0600 Subject: [Buildroot] [PATCH 02/15] manual: remove LIBFOO_GETTEXTIZE_OPTS In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-2-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- docs/manual/adding-packages-autotools.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt index a041d91eb6..8655a79693 100644 --- a/docs/manual/adding-packages-autotools.txt +++ b/docs/manual/adding-packages-autotools.txt @@ -136,12 +136,6 @@ cases, typical packages will therefore only use a few of them. 'gettextize'.) Only valid when +LIBFOO_AUTORECONF=YES+. Valid values are +YES+ and +NO+. The default is +NO+. -* +LIBFOO_GETTEXTIZE_OPTS+, to specify additional options passed to - the 'gettextize' program, if +LIBFOO_GETTEXTIZE=YES+. You may - use that if, for example, the +.po+ files are not located in the - standard place (i.e. in +po/+ at the root of the package.) By - default, '-f'. - * +LIBFOO_LIBTOOL_PATCH+ tells whether the Buildroot patch to fix libtool cross-compilation issues should be applied or not. Valid values are +YES+ and +NO+. By -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:54 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:54 -0600 Subject: [Buildroot] [PATCH 04/15] package/pkg-autotools: add FOO_AUTOPOINT flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-4-vfazio@xes-inc.com> From: Vincent Fazio Add a new variable to run autopoint during autoreconf. This variable depends on FOO_AUTORECONF = YES. It is mutually exclusive to FOO_GETTEXTIZE. If both are set, FOO_AUTOPOINT is ignored to preserve previous behavior. This support is being added per a previous discussion [1]. The usage of gettextize needs to be removed cuz mama says so [2]. ... is not part of the GNU build system, in the sense that it should not be invoked automatically, and not be invoked by someone who doesn?t assume the responsibilities of a package maintainer. For the latter purpose, a separate tool is provided, see Invoking the autopoint Program [3] Using gettextize has the unintended consequence of updating the package based on the version of host-gettext vs what was chosen by the upstream maintainer. As mama said above, we should use autopoint. Do as she says to avoid further scolding (gettextize shoehorning and package patching). [1] https://patchwork.ozlabs.org/project/buildroot/patch/20170827110920.15579-1-aleksander at aleksander.es/ [2] https://www.gnu.org/software/gettext/manual/html_node/gettextize-Invocation.html [3] https://www.gnu.org/software/gettext/manual/html_node/autopoint-Invocation.html Signed-off-by: Vincent Fazio --- package/pkg-autotools.mk | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 418cd10945..48485567d7 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -152,6 +152,15 @@ ifndef $(2)_GETTEXTIZE endif endif +ifndef $(2)_AUTOPOINT + ifdef $(3)_AUTOPOINT + $(2)_AUTOPOINT = $$($(3)_AUTOPOINT) + else + $(2)_AUTOPOINT ?= NO + endif +endif + + ifeq ($(4),host) $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS) endif @@ -240,8 +249,14 @@ ifeq ($$($(2)_AUTORECONF),YES) ifeq ($$($(2)_GETTEXTIZE),YES) $(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK $(2)_DEPENDENCIES += host-gettext -endif $(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true +# autopoint is provided by gettext +else ifeq ($$($(2)_AUTOPOINT),YES) +$(2)_DEPENDENCIES += host-gettext +$(2)_AUTORECONF_ENV += AUTOPOINT=$$(HOST_DIR)/bin/autopoint +else +$(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true +endif $(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK # default values are not evaluated yet, so don't rely on this defaulting to YES ifneq ($$($(2)_LIBTOOL_PATCH),NO) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:53 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:53 -0600 Subject: [Buildroot] [PATCH 03/15] package/pkg-autotools: set AUTOPOINT via AUTOCONF_ENV In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-3-vfazio@xes-inc.com> From: Vincent Fazio Previously, AUTOPOINT was hardcoded to /bin/true in autoconf.mk. Moving the definition of this variable into AUTOCONF_ENV as part of the autotools infrastructure will allow us to conditionally set the variable based on package flags to support migrating away from FOO_GETTEXTIZE. Signed-off-by: Vincent Fazio --- package/autoconf/autoconf.mk | 2 +- package/pkg-autotools.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 7e0850422b..3cac20cc34 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -23,4 +23,4 @@ $(eval $(host-autotools-package)) # variables used by other packages AUTOCONF = $(HOST_DIR)/bin/autoconf -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" AUTOHEADER = $(HOST_DIR)/bin/autoheader -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" -AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true GTKDOCIZE=/bin/true $(HOST_DIR)/bin/autoreconf -f -i +AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" GTKDOCIZE=/bin/true $(HOST_DIR)/bin/autoreconf -f -i diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 55d95d204e..418cd10945 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -241,6 +241,7 @@ ifeq ($$($(2)_GETTEXTIZE),YES) $(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK $(2)_DEPENDENCIES += host-gettext endif +$(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true $(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK # default values are not evaluated yet, so don't rely on this defaulting to YES ifneq ($$($(2)_LIBTOOL_PATCH),NO) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:55 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:55 -0600 Subject: [Buildroot] [PATCH 05/15] package/aumix: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-5-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- package/aumix/aumix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/aumix/aumix.mk b/package/aumix/aumix.mk index a4001f5bbb..03072d5d35 100644 --- a/package/aumix/aumix.mk +++ b/package/aumix/aumix.mk @@ -8,7 +8,7 @@ AUMIX_VERSION = 2.9.1 AUMIX_SOURCE = aumix-$(AUMIX_VERSION).tar.bz2 AUMIX_SITE = http://jpj.net/~trevor/aumix/releases AUMIX_AUTORECONF = YES -AUMIX_GETTEXTIZE = YES +AUMIX_AUTOPOINT = YES AUMIX_LICENSE = GPL-2.0+ AUMIX_LICENSE_FILES = COPYING -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:22:05 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:22:05 -0600 Subject: [Buildroot] [PATCH 15/15] manual: drop LIBFOO_GETTEXTIZE, add LIBFOO_AUTOPOINT In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-15-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- docs/manual/adding-packages-autotools.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt index 8655a79693..ad96957f3d 100644 --- a/docs/manual/adding-packages-autotools.txt +++ b/docs/manual/adding-packages-autotools.txt @@ -130,10 +130,9 @@ cases, typical packages will therefore only use a few of them. passed to the 'autoreconf' program if +LIBFOO_AUTORECONF=YES+. By default, empty. -* +LIBFOO_GETTEXTIZE+, tells whether the package should be - gettextized or not (i.e. if the package uses a different gettext - version than Buildroot provides, and it is needed to run - 'gettextize'.) Only valid when +LIBFOO_AUTORECONF=YES+. Valid +* +LIBFOO_AUTOPOINT+, tells whether the package should be + autopointed or not (i.e. if the package needs I18N infrastructure + copied in.) Only valid when +LIBFOO_AUTORECONF=YES+. Valid values are +YES+ and +NO+. The default is +NO+. * +LIBFOO_LIBTOOL_PATCH+ tells whether the Buildroot -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:59 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:59 -0600 Subject: [Buildroot] [PATCH 09/15] package/libuio: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-9-vfazio@xes-inc.com> From: Vincent Fazio Drop patch that is no longer necessary after moving to new package flag. Add patch to fix builds due to missing required files. Signed-off-by: Vincent Fazio --- ...0001-configure-remove-po-Makefile.in.patch | 26 ---------------- ...c-set-automake-strictness-to-foreign.patch | 31 +++++++++++++++++++ package/libuio/libuio.mk | 2 +- 3 files changed, 32 insertions(+), 27 deletions(-) delete mode 100644 package/libuio/0001-configure-remove-po-Makefile.in.patch create mode 100644 package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch diff --git a/package/libuio/0001-configure-remove-po-Makefile.in.patch b/package/libuio/0001-configure-remove-po-Makefile.in.patch deleted file mode 100644 index 067465cc31..0000000000 --- a/package/libuio/0001-configure-remove-po-Makefile.in.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c5fa0b778e1c2a7d03ff6e661bdfa2faef878f68 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 1 Jul 2016 17:56:30 +0200 -Subject: [PATCH] configure: remove po/Makefile.in - -The file po/Makefile.in is automatically added to AC_OUTPUT while using gettexize - -Signed-off-by: Romain Naour ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f7fb40f..a25e463 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,5 +55,4 @@ dnl last but not least - AC_OUTPUT([Makefile - libuio.dox - libuio-uninstalled.pc -- libuio.pc -- po/Makefile.in]) -+ libuio.pc]) --- -2.5.5 - diff --git a/package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch b/package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch new file mode 100644 index 0000000000..1ce91f01f3 --- /dev/null +++ b/package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch @@ -0,0 +1,31 @@ +From 546e07b2405455c03b7eb0d392c331e189913bc4 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 31 Jan 2023 19:06:29 -0600 +Subject: [PATCH] configure.ac: set automake strictness to foreign + +libuio does not conform to the GNU's strict layout requirements. [1] + +Set the strictness to foreign to account for this. + +[1] https://www.gnu.org/software/automake/manual/html_node/Strictness.html + +Signed-off-by: Vincent Fazio +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 101abd3..ef46171 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,6 +1,6 @@ + dnl Every other copy of the package version number gets its value from here + AC_INIT(libuio, 0.2.8, https://github.com/linutronix/libuio/issues) +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + + AM_CONFIG_HEADER(config.h) + +-- +2.25.1 + diff --git a/package/libuio/libuio.mk b/package/libuio/libuio.mk index a0285277ab..d5019af594 100644 --- a/package/libuio/libuio.mk +++ b/package/libuio/libuio.mk @@ -14,7 +14,7 @@ LIBUIO_LIBS = $(TARGET_NLS_LIBS) LIBUIO_INSTALL_STAGING = YES # Fetched from github, no pre-generated configure script provided -LIBUIO_GETTEXTIZE = YES +LIBUIO_AUTOPOINT = YES LIBUIO_AUTORECONF = YES # Avoid build issue when makeinfo is missing -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:57 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:57 -0600 Subject: [Buildroot] [PATCH 07/15] package/flex: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-7-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- package/flex/flex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 85da5ddae8..f1e731ce2e 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -20,7 +20,7 @@ HOST_FLEX_DEPENDENCIES = host-m4 # 0002-build-make-it-possible-to-disable-the-build-of-the-f.patch # 0003-build-make-it-possible-to-disable-the-build-of-the-d.patch FLEX_AUTORECONF = YES -FLEX_GETTEXTIZE = YES +FLEX_AUTOPOINT = YES FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4 \ ac_cv_func_reallocarray=no -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:56 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:56 -0600 Subject: [Buildroot] [PATCH 06/15] package/dc3dd: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-6-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- package/dc3dd/dc3dd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dc3dd/dc3dd.mk b/package/dc3dd/dc3dd.mk index cc89bb63d0..4d94194af6 100644 --- a/package/dc3dd/dc3dd.mk +++ b/package/dc3dd/dc3dd.mk @@ -13,6 +13,6 @@ DC3DD_LICENSE_FILES = COPYING # We are patching Makefile.am, so we need to autoreconf. We also need to # enable gettextize as dc3dd comes with an old gettext infra. DC3DD_AUTORECONF = YES -DC3DD_GETTEXTIZE = YES +DC3DD_AUTOPOINT = YES $(eval $(autotools-package)) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:58 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:58 -0600 Subject: [Buildroot] [PATCH 08/15] package/hddtemp: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-8-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- package/hddtemp/hddtemp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hddtemp/hddtemp.mk b/package/hddtemp/hddtemp.mk index 4f45647dff..42dcb3d416 100644 --- a/package/hddtemp/hddtemp.mk +++ b/package/hddtemp/hddtemp.mk @@ -11,7 +11,7 @@ HDDTEMP_LICENSE_FILES = GPL-2 # Fetched from Github with no configure script HDDTEMP_AUTORECONF = YES -HDDTEMP_GETTEXTIZE = YES +HDDTEMP_AUTOPOINT = YES HDDTEMP_DB_PATH = /usr/share/misc/hddtemp.db HDDTEMP_CONF_OPTS = --with-db-path=$(HDDTEMP_DB_PATH) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:22:00 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:22:00 -0600 Subject: [Buildroot] [PATCH 10/15] package/motion: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-10-vfazio@xes-inc.com> From: Vincent Fazio Drop patch that is no longer necessary. Signed-off-by: Vincent Fazio --- ...1-configure.ac-remove-po-Makefile.in.patch | 29 ------------------- package/motion/motion.mk | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 package/motion/0001-configure.ac-remove-po-Makefile.in.patch diff --git a/package/motion/0001-configure.ac-remove-po-Makefile.in.patch b/package/motion/0001-configure.ac-remove-po-Makefile.in.patch deleted file mode 100644 index 9b514bafcd..0000000000 --- a/package/motion/0001-configure.ac-remove-po-Makefile.in.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0e05d4116678de3a7d913177a8fc63f10e58ad24 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 18 Jan 2020 00:00:21 +0100 -Subject: [PATCH] configure.ac: remove po/Makefile.in - -The file po/Makefile.in is automatically added to AC_OUTPUT while using -gettexize - -Signed-off-by: Fabrice Fontaine -[Upstream status: not upstreamable] ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3876adb..221dacf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -471,7 +471,6 @@ LDFLAGS="$TEMP_LDFLAGS" - AC_CONFIG_FILES([ - Makefile - src/Makefile -- po/Makefile.in - man/Makefile - data/camera1-dist.conf - data/camera2-dist.conf --- -2.24.1 - diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 4e9ccdc3f7..2cce6cd1ff 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -12,7 +12,7 @@ MOTION_CPE_ID_VENDOR = motion_project MOTION_DEPENDENCIES = host-pkgconf jpeg libmicrohttpd $(TARGET_NLS_DEPENDENCIES) # From git MOTION_AUTORECONF = YES -MOTION_GETTEXTIZE = YES +MOTION_AUTOPOINT = YES MOTION_CONF_OPTS += --without-optimizecpu -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:22:03 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:22:03 -0600 Subject: [Buildroot] [PATCH 13/15] package/pkg-autotools: drop support for FOO_GETTEXTIZE In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-13-vfazio@xes-inc.com> From: Vincent Fazio Remove all support for FOO_GETTEXTIZE and alert users to FOO_AUTOPOINT as the recommended solution in its stead. Signed-off-by: Vincent Fazio --- package/pkg-autotools.mk | 23 +---------------------- package/pkg-generic.mk | 3 +++ 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 48485567d7..f17186dfe4 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -87,14 +87,6 @@ define CONFIGURE_FIX_POWERPC64_HOOK support/scripts/fix-configure-powerpc64.sh $($(PKG)_DIR) endef -# -# Hook to gettextize the package if needed -# -define GETTEXTIZE_HOOK - @$(call MESSAGE,"Gettextizing") - $(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE) -endef - # # Hook to autoreconf the package if needed # @@ -144,14 +136,6 @@ ifndef $(2)_AUTORECONF endif endif -ifndef $(2)_GETTEXTIZE - ifdef $(3)_GETTEXTIZE - $(2)_GETTEXTIZE = $$($(3)_GETTEXTIZE) - else - $(2)_GETTEXTIZE ?= NO - endif -endif - ifndef $(2)_AUTOPOINT ifdef $(3)_AUTOPOINT $(2)_AUTOPOINT = $$($(3)_AUTOPOINT) @@ -245,13 +229,8 @@ $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK ifeq ($$($(2)_AUTORECONF),YES) -# This has to come before autoreconf -ifeq ($$($(2)_GETTEXTIZE),YES) -$(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK -$(2)_DEPENDENCIES += host-gettext -$(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true # autopoint is provided by gettext -else ifeq ($$($(2)_AUTOPOINT),YES) +ifeq ($$($(2)_AUTOPOINT),YES) $(2)_DEPENDENCIES += host-gettext $(2)_AUTORECONF_ENV += AUTOPOINT=$$(HOST_DIR)/bin/autopoint else diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a6ef5efb5f..6be28db623 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1215,6 +1215,9 @@ endif ifneq ($$($(2)_GETTEXTIZE_OPTS),) $$(error "$(2)_GETTEXTIZE_OPTS is no longer supported. Please fix your .mk file.") endif +ifneq ($$($(2)_GETTEXTIZE),) +$$(error "$(2)_GETTEXTIZE is no longer supported in favor of $(2)_AUTOPOINT. Please update your package.") +endif PACKAGES += $(1) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:22:04 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:22:04 -0600 Subject: [Buildroot] [PATCH 14/15] package/gettext: drop GETTEXTIZE variable In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-14-vfazio@xes-inc.com> From: Vincent Fazio This variable is no longer used anywhere in the tree so remove it. Signed-off-by: Vincent Fazio --- package/gettext/gettext.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 146d40e13b..a86e26f69e 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -4,7 +4,5 @@ # ################################################################################ -GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/bin/autom4te $(HOST_DIR)/bin/gettextize -f - $(eval $(virtual-package)) $(eval $(host-virtual-package)) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:22:02 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:22:02 -0600 Subject: [Buildroot] [PATCH 12/15] package/popt: remove POPT_GETTEXTIZE In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-12-vfazio@xes-inc.com> From: Vincent Fazio Commit 895bfba dropped POPT_AUTORECONF but did not drop POPT_GETTEXTIZE, which requires POPT_AUTORECONF = YES. Fixes: 895bfba ("package/popt: bump to version 1.19") Signed-off-by: Vincent Fazio --- package/popt/popt.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/popt/popt.mk b/package/popt/popt.mk index 842cf0d035..5cee8e9673 100644 --- a/package/popt/popt.mk +++ b/package/popt/popt.mk @@ -11,7 +11,6 @@ POPT_LICENSE = MIT POPT_LICENSE_FILES = COPYING POPT_CPE_ID_VENDOR = popt_project -POPT_GETTEXTIZE = YES POPT_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) POPT_CONF_ENV = ac_cv_va_copy=yes -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:22:01 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:22:01 -0600 Subject: [Buildroot] [PATCH 11/15] package/rrdtool: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-11-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- package/rrdtool/rrdtool.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk index 2731b7b39d..b2cceccedc 100644 --- a/package/rrdtool/rrdtool.mk +++ b/package/rrdtool/rrdtool.mk @@ -12,7 +12,7 @@ RRDTOOL_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) # autoreconf needed to avoid link failure due to missing -lintl, # gettextize needed as a consequence of autoreconf RRDTOOL_AUTORECONF = YES -RRDTOOL_GETTEXTIZE = YES +RRDTOOL_AUTOPOINT = YES RRDTOOL_INSTALL_STAGING = YES RRDTOOL_CONF_OPTS = \ --disable-examples \ -- 2.25.1 From fontaine.fabrice at gmail.com Tue Feb 21 17:28:29 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 18:28:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/mutt: fix build failure when host provides an old gpgrt-config Message-ID: <20230221172829.3407641-1-fontaine.fabrice@gmail.com> As already done for gnupg2 in commit d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8, apply the same fix to mutt to avoid the following build failure: /home/thomas/autobuild/instance-2/output-1/host/bin/i686-buildroot-linux-uclibc-gcc -DPKGDATADIR=\"/usr/share/mutt\" -DSYSCONFDIR=\"/etc\" -DBINDIR=\"/usr/bin\" -DMUTTLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H=1 -I. -I. -I. -I/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -pedantic -Wno-long-long -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -c -o txt2c.o txt2c.c i686-buildroot-linux-uclibc-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' Fixes: - http://autobuild.buildroot.org/results/98010be4ef70e58819ea2d17315bdac66a619b23 Signed-off-by: Fabrice Fontaine --- package/mutt/mutt.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 0a98396d88..5cf1b6bad2 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -37,6 +37,10 @@ MUTT_DEPENDENCIES += libgpgme MUTT_CONF_OPTS += \ --enable-gpgme \ --with-gpgme-prefix=$(STAGING_DIR)/usr + +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +MUTT_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config else MUTT_CONF_OPTS += --disable-gpgme endif -- 2.39.0 From gwenj at trabucayre.com Tue Feb 21 17:27:16 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Tue, 21 Feb 2023 18:27:16 +0100 Subject: [Buildroot] [PATCH] package/openfpgaloader: bump to version 0.10.0 Message-ID: <1677000436-53977-1-git-send-email-gwenj@trabucayre.com> From: Gwenhael Goavec-Merou Also adds libgpiod support. Signed-off-by: Gwenhael Goavec-Merou --- package/openfpgaloader/Config.in | 10 ++++++++++ package/openfpgaloader/openfpgaloader.hash | 2 +- package/openfpgaloader/openfpgaloader.mk | 9 ++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in index 054278c256..4ba01d12d3 100644 --- a/package/openfpgaloader/Config.in +++ b/package/openfpgaloader/Config.in @@ -24,6 +24,16 @@ config BR2_PACAKGE_OPENFPGALOADER_CMSIS comment "openfpgaloader CMSIS-DAP needs udev /dev management and a toolchain w/ NPTL threads" depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS_NPTL +config BR2_PACKAGE_OPENFPGALOADER_LIBGPIOD + bool "libgpiod support" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 # libgpiod + select BR2_PACKAGE_LIBGPIOD + help + openfpgaloader libgpiod support + +comment "openfpgaloader libgpiod needs kernel headers >= 4.8" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + endif comment "openfpgaloader needs a toolchain w/ threads, C++, gcc >= 4.9" diff --git a/package/openfpgaloader/openfpgaloader.hash b/package/openfpgaloader/openfpgaloader.hash index 6c9d8a2b91..a8b537782c 100644 --- a/package/openfpgaloader/openfpgaloader.hash +++ b/package/openfpgaloader/openfpgaloader.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a862a209d696becff915a77512e6a8c22f92d73480a45cc12273d9ad1db60d23 openfpgaloader-0.6.1.tar.gz +sha256 966b4629df86b1d520ddd8a4e0a3fc00060b26b5ab4e172b596bd9d4659a196e openfpgaloader-0.10.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk index 0c39aad687..042b16612e 100644 --- a/package/openfpgaloader/openfpgaloader.mk +++ b/package/openfpgaloader/openfpgaloader.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENFPGALOADER_VERSION = 0.6.1 +OPENFPGALOADER_VERSION = 0.10.0 OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,v$(OPENFPGALOADER_VERSION)) OPENFPGALOADER_LICENSE = Apache-2.0 OPENFPGALOADER_LICENSE_FILES = LICENSE @@ -24,4 +24,11 @@ else OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=OFF endif +ifeq ($(BR2_PACAKGE_OPENFPGALOADER_LIBGPIOD),y) +OPENFPGALOADER_DEPENDENCIES += libgpiod +OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=ON +else +OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=OFF +endif + $(eval $(cmake-package)) -- 2.30.2 From giulio.benetti at benettiengineering.com Tue Feb 21 18:30:51 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 21 Feb 2023 19:30:51 +0100 Subject: [Buildroot] [PATCH] package/jpeg: fix build failure when qt5base tries to use libjpeg Message-ID: <20230221183051.4011311-1-giulio.benetti@benettiengineering.com> Qt5 fails to build with libjpeg since the API is different from libjpeg-turbo and libjpeg-turbo is pointed as the library Qt5 usually link against to[0]. So let's default jpeg variant to libjpeg-turbo if BR2_PACKAGE_QT5BASE_JPEG is selected. Fixes: still not failed [0]: https://doc.qt.io/qt-5/qtgui-index.html#licenses-and-attributions Signed-off-by: Giulio Benetti --- package/jpeg/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index 371f89aa49..3a39a0dfb8 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -16,7 +16,8 @@ if BR2_PACKAGE_JPEG choice prompt "jpeg variant" - default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT + default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT || \ + BR2_PACKAGE_QT5BASE_JPEG help Select the normal libjpeg or libjpeg-turbo. -- 2.34.1 From thomas at devoogdt.com Tue Feb 21 19:27:59 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 21 Feb 2023 20:27:59 +0100 Subject: [Buildroot] [PATCH v3 1/4] package/at-spi2-core: bump to version 2.47.1 In-Reply-To: References: Message-ID: <20230221192802.4117856-1-thomas.devoogdt@barco.com> From: Daniel Lang https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_47_1/NEWS - X11 is now optional. - libxml2 is no longer optional. - atk and at-spi2-atk have been merged into at-spi2-core. - atk introspection option added. Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) --- package/at-spi2-core/Config.in | 8 ++------ package/at-spi2-core/at-spi2-core.hash | 4 ++-- package/at-spi2-core/at-spi2-core.mk | 20 +++++++++++++++++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/package/at-spi2-core/Config.in b/package/at-spi2-core/Config.in index f56c5b93c4..1f6c421777 100644 --- a/package/at-spi2-core/Config.in +++ b/package/at-spi2-core/Config.in @@ -1,12 +1,12 @@ config BR2_PACKAGE_AT_SPI2_CORE bool "at-spi2-core" - depends on BR2_PACKAGE_XORG7 # xlib-libxtst depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2 depends on BR2_USE_MMU # glib2 depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_XORG7 # optionally for X11 help The At-Spi2 Core package is a part of the GNOME Accessibility Project. It provides a Service Provider @@ -19,7 +19,3 @@ config BR2_PACKAGE_AT_SPI2_CORE comment "at-spi2-core needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -comment "at-spi2-core depends on X.org" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_XORG7 diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index 764e4c3661..4531bf396c 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum -sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz +# From https://download.gnome.org/sources/at-spi2-core/2.47/at-spi2-core-2.47.1.sha256sum +sha256 c6ba7c160434edebf09d2936933569c936f6ec972301766f2bdac5a4d418153c at-spi2-core-2.47.1.tar.xz # locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index f0b019c0ed..e98e779884 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -4,17 +4,31 @@ # ################################################################################ -AT_SPI2_CORE_VERSION_MAJOR = 2.36 -AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 +AT_SPI2_CORE_VERSION_MAJOR = 2.47 +AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).1 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) AT_SPI2_CORE_LICENSE = LGPL-2.1+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES -AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \ +AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 libxml2 \ $(TARGET_NLS_DEPENDENCIES) AT_SPI2_CORE_CONF_OPTS = -Ddbus_daemon=/usr/bin/dbus-daemon +ifeq ($(BR2_PACKAGE_XORG7),y) +AT_SPI2_CORE_CONF_OPTS += -Dx11=enabled +AT_SPI2_CORE_DEPENDENCIES += xlib_libXtst +else +AT_SPI2_CORE_CONF_OPTS += -Dx11=disabled +endif + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +AT_SPI2_CORE_CONF_OPTS += -Dintrospection=enabled +AT_SPI2_CORE_DEPENDENCIES += gobject-introspection +else +AT_SPI2_CORE_CONF_OPTS += -Dintrospection=disabled +endif + AT_SPI2_CORE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) $(eval $(meson-package)) -- 2.39.2 From thomas at devoogdt.com Tue Feb 21 19:28:00 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 21 Feb 2023 20:28:00 +0100 Subject: [Buildroot] [PATCH v3 2/4] package/at-spi2-atk: remove package In-Reply-To: <20230221192802.4117856-1-thomas.devoogdt@barco.com> References: <20230221192802.4117856-1-thomas.devoogdt@barco.com> Message-ID: <20230221192802.4117856-2-thomas.devoogdt@barco.com> From: Daniel Lang at-spi2-atk has been merged into at-spi2-core with version 2.45.1. https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_45_1/NEWS https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78 Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) --- Config.in.legacy | 7 +++ DEVELOPERS | 1 - package/Config.in | 1 - .../0001-meson-add-tests-option.patch | 43 ------------------- package/at-spi2-atk/Config.in | 22 ---------- package/at-spi2-atk/at-spi2-atk.hash | 5 --- package/at-spi2-atk/at-spi2-atk.mk | 19 -------- 7 files changed, 7 insertions(+), 91 deletions(-) delete mode 100644 package/at-spi2-atk/0001-meson-add-tests-option.patch delete mode 100644 package/at-spi2-atk/Config.in delete mode 100644 package/at-spi2-atk/at-spi2-atk.hash delete mode 100644 package/at-spi2-atk/at-spi2-atk.mk diff --git a/Config.in.legacy b/Config.in.legacy index 7f69462f2e..0de7e6e6d6 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_AT_SPI2_ATK + bool "at-spi2-atk removed" + select BR2_LEGACY + select BR2_PACKAGE_AT_SPI2_CORE + help + at-spi2-atk is now part of at-spi2-core. + config BR2_KERNEL_HEADERS_6_0 bool "kernel headers version 6.0.x are no longer supported" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 6256576e02..9530c4cfb2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1612,7 +1612,6 @@ F: support/testing/tests/package/test_avocado.py F: support/testing/tests/package/test_python_aexpect.py N: Joseph Kogut -F: package/at-spi2-atk/ F: package/at-spi2-core/ F: package/clang/ F: package/earlyoom/ diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..fe64b2a8e1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1553,7 +1553,6 @@ endmenu menu "Graphics" source "package/assimp/Config.in" - source "package/at-spi2-atk/Config.in" source "package/at-spi2-core/Config.in" source "package/atk/Config.in" source "package/atkmm/Config.in" diff --git a/package/at-spi2-atk/0001-meson-add-tests-option.patch b/package/at-spi2-atk/0001-meson-add-tests-option.patch deleted file mode 100644 index 3a2aefa090..0000000000 --- a/package/at-spi2-atk/0001-meson-add-tests-option.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 466d04a57b32417dbf2d5e818af1b7593af5f802 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 May 2020 10:29:36 +0200 -Subject: [PATCH] meson: add tests option - -Add tests option to allow the user to build at-spi2-atk without tests, -it is especially useful as one of the test requires libxml-2.0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/at-spi2-atk/-/merge_requests/22] ---- - meson.build | 4 +++- - meson_options.txt | 4 ++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9fce5d6..61bc93d 100644 ---- a/meson.build -+++ b/meson.build -@@ -61,4 +61,6 @@ install_data('at-spi2-atk.desktop', - - subdir('droute') - subdir('atk-adaptor') --subdir('tests') -+if get_option('tests') -+ subdir('tests') -+endif -diff --git a/meson_options.txt b/meson_options.txt -index 24c9228..a4abdc2 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -2,3 +2,7 @@ option('disable_p2p', - description: 'Disable peer-to-peer DBus connections', - type: 'boolean', - value: false) -+option('tests', -+ description: 'Whether to build tests', -+ type: 'boolean', -+ value: true) --- -2.26.2 - diff --git a/package/at-spi2-atk/Config.in b/package/at-spi2-atk/Config.in deleted file mode 100644 index 9a7cfde0af..0000000000 --- a/package/at-spi2-atk/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_AT_SPI2_ATK - bool "at-spi2-atk" - depends on BR2_PACKAGE_XORG7 # at-spi2-core - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_USE_WCHAR # glib2 - select BR2_PACKAGE_ATK - select BR2_PACKAGE_AT_SPI2_CORE - select BR2_PACKAGE_LIBGLIB2 - help - The At-Spi2 Atk package contains a library that bridges - ATK to At-Spi2 D-Bus service. - - https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/ - -comment "at-spi2-atk needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -comment "at-spi2-atk depends on X.org" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_XORG7 diff --git a/package/at-spi2-atk/at-spi2-atk.hash b/package/at-spi2-atk/at-spi2-atk.hash deleted file mode 100644 index 9c564c32af..0000000000 --- a/package/at-spi2-atk/at-spi2-atk.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.sha256sum -sha256 901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0 at-spi2-atk-2.34.2.tar.xz - -# locally calculated -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-atk/at-spi2-atk.mk b/package/at-spi2-atk/at-spi2-atk.mk deleted file mode 100644 index 232b577230..0000000000 --- a/package/at-spi2-atk/at-spi2-atk.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# at-spi2-atk -# -################################################################################ - -AT_SPI2_ATK_VERSION_MAJOR = 2.34 -AT_SPI2_ATK_VERSION = $(AT_SPI2_ATK_VERSION_MAJOR).2 -AT_SPI2_ATK_SOURCE = at-spi2-atk-$(AT_SPI2_ATK_VERSION).tar.xz -AT_SPI2_ATK_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) -AT_SPI2_ATK_LICENSE = LGPL-2.1+ -AT_SPI2_ATK_LICENSE_FILES = COPYING -AT_SPI2_ATK_CPE_ID_VENDOR = gnome -AT_SPI2_ATK_INSTALL_STAGING = YES -AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf -AT_SPI2_ATK_CONF_OPTS = -Dtests=false - -$(eval $(meson-package)) -- 2.39.2 From thomas at devoogdt.com Tue Feb 21 19:28:01 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 21 Feb 2023 20:28:01 +0100 Subject: [Buildroot] [PATCH v3 3/4] package/atk: remove package In-Reply-To: <20230221192802.4117856-1-thomas.devoogdt@barco.com> References: <20230221192802.4117856-1-thomas.devoogdt@barco.com> Message-ID: <20230221192802.4117856-3-thomas.devoogdt@barco.com> From: Daniel Lang atk has been merged into at-spi2-core with version 2.45.1. https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_45_1/NEWS https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78 Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/atk/Config.in | 14 -------------- package/atk/atk.hash | 5 ----- package/atk/atk.mk | 25 ------------------------- package/atkmm/Config.in | 8 ++++---- package/atkmm/atkmm.mk | 2 +- package/libglade/Config.in | 2 +- package/libglade/libglade.mk | 2 +- package/libgtk2/Config.in | 2 +- package/libgtk2/libgtk2.mk | 2 +- package/libgtk3/Config.in | 2 +- package/libgtk3/libgtk3.mk | 2 +- 13 files changed, 18 insertions(+), 56 deletions(-) delete mode 100644 package/atk/Config.in delete mode 100644 package/atk/atk.hash delete mode 100644 package/atk/atk.mk diff --git a/Config.in.legacy b/Config.in.legacy index 0de7e6e6d6..0bdfc6cf73 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_ATK + bool "atk removed" + select BR2_LEGACY + select BR2_PACKAGE_AT_SPI2_CORE + help + atk is now part of at-spi2-core. + config BR2_PACKAGE_AT_SPI2_ATK bool "at-spi2-atk removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index fe64b2a8e1..64876eb7f1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1554,7 +1554,6 @@ endmenu menu "Graphics" source "package/assimp/Config.in" source "package/at-spi2-core/Config.in" - source "package/atk/Config.in" source "package/atkmm/Config.in" source "package/bayer2rgb-neon/Config.in" source "package/bullet/Config.in" diff --git a/package/atk/Config.in b/package/atk/Config.in deleted file mode 100644 index d9371b879b..0000000000 --- a/package/atk/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_ATK - bool "atk" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - The ATK accessibility toolkit, needed to build GTK+-2.x. - - https://gitlab.gnome.org/GNOME/atk - -comment "atk needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/atk/atk.hash b/package/atk/atk.hash deleted file mode 100644 index d8cd69ff1f..0000000000 --- a/package/atk/atk.hash +++ /dev/null @@ -1,5 +0,0 @@ -# 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 deleted file mode 100644 index 2820fb486d..0000000000 --- a/package/atk/atk.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# atk -# -################################################################################ - -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) -ATK_LICENSE = LGPL-2.0+ -ATK_LICENSE_FILES = COPYING -ATK_INSTALL_STAGING = YES -ATK_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) - -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -ATK_CONF_OPTS += -Dintrospection=true -ATK_DEPENDENCIES += gobject-introspection -else -ATK_CONF_OPTS += -Dintrospection=false -endif - -ATK_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) - -$(eval $(meson-package)) diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in index aa58f8d593..f6f2ca8fc2 100644 --- a/package/atkmm/Config.in +++ b/package/atkmm/Config.in @@ -2,10 +2,10 @@ config BR2_PACKAGE_ATKMM bool "atkmm" depends on BR2_INSTALL_LIBSTDCPP # glibmm depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc - depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 - depends on BR2_USE_MMU # atk/glibmm -> libglib2 - depends on BR2_USE_WCHAR # atk/glibmm -> libglib2 - select BR2_PACKAGE_ATK + depends on BR2_TOOLCHAIN_HAS_THREADS # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_MMU # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_WCHAR # at-spi2-core/glibmm -> libglib2 + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_GLIBMM select BR2_PACKAGE_LIBSIGC diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk index 7ceb87b047..da763c8386 100644 --- a/package/atkmm/atkmm.mk +++ b/package/atkmm/atkmm.mk @@ -11,6 +11,6 @@ ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR) ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) ATKMM_LICENSE_FILES = COPYING COPYING.tools ATKMM_INSTALL_STAGING = YES -ATKMM_DEPENDENCIES = atk glibmm libsigc host-pkgconf +ATKMM_DEPENDENCIES = at-spi2-core glibmm libsigc host-pkgconf $(eval $(meson-package)) diff --git a/package/libglade/Config.in b/package/libglade/Config.in index c97c9becd2..8d0d26f159 100644 --- a/package/libglade/Config.in +++ b/package/libglade/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBGLADE depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_LIBXML2 help Libglade allows you to load glade interface files in a program diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk index 21aed60605..af73d8bd00 100644 --- a/package/libglade/libglade.mk +++ b/package/libglade/libglade.mk @@ -9,7 +9,7 @@ LIBGLADE_VERSION = $(LIBGLADE_VERSION_MAJOR).4 LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2 LIBGLADE_SITE = https://download.gnome.org/sources/libglade/$(LIBGLADE_VERSION_MAJOR) LIBGLADE_INSTALL_STAGING = YES -LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2 +LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 at-spi2-core libxml2 LIBGLADE_LICENSE = LGPL-2.0+ LIBGLADE_LICENSE_FILES = COPYING diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index c75c37fb63..f2888b2f51 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 859925e8d3..608c263e4d 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -23,7 +23,7 @@ LIBGTK2_CONF_ENV = \ LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no -LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk \ +LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango at-spi2-core \ gdk-pixbuf $(TARGET_NLS_DEPENDENCIES) LIBGTK2_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS) diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 82ca68d2da..34b8d49eb3 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -23,7 +23,7 @@ config BR2_PACKAGE_LIBGTK3 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 283c129cef..2821c7eb52 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -14,7 +14,7 @@ LIBGTK3_CPE_ID_VENDOR = gnome LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \ +LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 at-spi2-core libglib2 cairo pango \ gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -- 2.39.2 From thomas at devoogdt.com Tue Feb 21 19:28:02 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 21 Feb 2023 20:28:02 +0100 Subject: [Buildroot] [PATCH v3 4/4] package/libgtk3: only update-icon-cache when the demos are built In-Reply-To: <20230221192802.4117856-1-thomas.devoogdt@barco.com> References: <20230221192802.4117856-1-thomas.devoogdt@barco.com> Message-ID: <20230221192802.4117856-4-thomas.devoogdt@barco.com> Similar to: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4358/diffs Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) --- package/libgtk3/libgtk3.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 2821c7eb52..b78578d568 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -145,11 +145,13 @@ endef # Create icon-theme.cache for each of the icon directories/themes # It's not strictly necessary but speeds up lookups +ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y) define LIBGTK3_UPDATE_ICON_CACHE find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; endef LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE +endif $(eval $(meson-package)) $(eval $(host-generic-package)) -- 2.39.2 From peter at korsgaard.com Tue Feb 21 19:58:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 20:58:01 +0100 Subject: [Buildroot] [git commit] package/elf2flt: fix error when building gdb for target on m68k In-Reply-To: <20230205141346.2F75283842@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Sun, 5 Feb 2023 15:13:15 +0100") References: <20230205141346.2F75283842@busybox.osuosl.org> Message-ID: <87wn4ayenq.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=f6f15e85b3ac58ba1d387ea86945d3fabf4f8990 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Thomas reported that m68k fails to build when enabling BR2_PACKAGE_GDB. > It fails when building gdb for the target with the following error: > elf2flt: ERROR: text=0x3c826 overlaps data=0x256e0 ? > It turns out that the gdb binary has another problematic input section > (.gcc_except_table), which causes elf2flt to try to append to the .text > output section, after it has already moved on with appending sections > to the .data output section. > elf2flt cannot append to a previous output section once it has moved on > to another output section. > Update the existing elf2flt patch to also add an exception for > .gcc_except_table. > Reported-by: Thomas Petazzoni > Signed-off-by: Niklas Cassel > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Tue Feb 21 20:01:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:01:45 +0100 Subject: [Buildroot] [git commit branch/next] package/openmpi: bump to version 4.1.4 Message-ID: <20230221200211.6B5768660C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec7258f3f4ea4442cd1f8c78a066a062a4d0cbd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Notable changes in this commit: - change from v4.0.x to v4.1.x "current" version series, - move the sha256 hash out of the "Locally computed" section, as the value comes from the download page, - the LICENSE file hash changed, as the file was updated (copyright years updated and new contributors added), - the IME (Infinite Memory Engine), introduced in v4.1.x, is disabled to workaround a failure when cross-compiled, - the package now requires a toolchain with atomic support, and needs to link against libatomic when needed. For change log since v4.0.0, see: - https://github.com/open-mpi/ompi/blob/v4.1.4/NEWS#L61 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/openmpi/Config.in | 2 ++ package/openmpi/openmpi.hash | 10 +++++----- package/openmpi/openmpi.mk | 17 ++++++++++++++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/package/openmpi/Config.in b/package/openmpi/Config.in index 4413c55f9c..e64eb81c3e 100644 --- a/package/openmpi/Config.in +++ b/package/openmpi/Config.in @@ -1,5 +1,6 @@ comment "openmpi needs a toolchain w/ dynamic library, NPTL, wchar, C++" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_sparc depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP @@ -8,6 +9,7 @@ config BR2_PACKAGE_OPENMPI bool "openmpi" depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # dlfcn.h diff --git a/package/openmpi/openmpi.hash b/package/openmpi/openmpi.hash index a399adc758..745ed7c580 100644 --- a/package/openmpi/openmpi.hash +++ b/package/openmpi/openmpi.hash @@ -1,6 +1,6 @@ -# From: https://www.open-mpi.org/software/ompi/v4.0/ -md5 e3da67df1e968c8798827e0e5fe9a510 openmpi-4.0.0.tar.bz2 -sha1 fee1d0287abfb150bae16957de342752c9bdd4e8 openmpi-4.0.0.tar.bz2 +# From: https://www.open-mpi.org/software/ompi/v4.1/ +md5 f057e12aabaf7dd5a6a658180fca404e openmpi-4.1.4.tar.bz2 +sha1 357c61a8e06e103d987c0e4a054e8780a034c8b1 openmpi-4.1.4.tar.bz2 +sha256 92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d openmpi-4.1.4.tar.bz2 # Locally computed -sha256 2f0b8a36cfeb7354b45dda3c5425ef8393c9b04115570b615213faaa3f97366b openmpi-4.0.0.tar.bz2 -sha256 8298a80ed5f09cfd007bae1c0e7d67d1c2810c6389876778dad070c31a691dac LICENSE +sha256 2db71de9577ebfe15c186605844c470dcecd3717f4ef0118c9440d801c0f58f8 LICENSE diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index 8bdc3fa188..f14b55ced5 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -4,14 +4,21 @@ # ################################################################################ -OPENMPI_VERSION_MAJOR = 4.0 -OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).0 +OPENMPI_VERSION_MAJOR = 4.1 +OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).4 OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2 OPENMPI_LICENSE = BSD-3-Clause OPENMPI_LICENSE_FILES = LICENSE OPENMPI_INSTALL_STAGING = YES +# The macro searching for IME (Infinite Memory Engine) filesystem +# brings "-I/usr/local/include" in the CPPFLAGS, even if not +# found. This makes the configuration fail. See: +# https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 +# Disable explicitly to avoid the issue. +OPENMPI_CONF_OPTS = --without-ime + # Enabling Fortran support requires pre-seeding the configure script # with various values that cannot be guessed, so we provide cache # files for various architectures. @@ -43,6 +50,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) OPENMPI_CFLAGS += -O0 endif -OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +OPENMPI_LIBS += -latomic +endif + +OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" LIBS="$(OPENMPI_LIBS)" $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Tue Feb 21 20:04:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:04:10 +0100 Subject: [Buildroot] [PATCH] package/jpeg: fix build failure when qt5base tries to use libjpeg In-Reply-To: <20230221183051.4011311-1-giulio.benetti@benettiengineering.com> References: <20230221183051.4011311-1-giulio.benetti@benettiengineering.com> Message-ID: <20230221210410.61bd1054@windsurf> On Tue, 21 Feb 2023 19:30:51 +0100 Giulio Benetti wrote: > Qt5 fails to build with libjpeg since the API is different from > libjpeg-turbo and libjpeg-turbo is pointed as the library Qt5 usually link > against to[0]. So let's default jpeg variant to libjpeg-turbo if > BR2_PACKAGE_QT5BASE_JPEG is selected. > > Fixes: > still not failed > > [0]: https://doc.qt.io/qt-5/qtgui-index.html#licenses-and-attributions > > Signed-off-by: Giulio Benetti > --- > package/jpeg/Config.in | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in > index 371f89aa49..3a39a0dfb8 100644 > --- a/package/jpeg/Config.in > +++ b/package/jpeg/Config.in > @@ -16,7 +16,8 @@ if BR2_PACKAGE_JPEG > > choice > prompt "jpeg variant" > - default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT > + default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT || \ > + BR2_PACKAGE_QT5BASE_JPEG I don't think this will work, as it doesn't prevent from using classic libjpeg with Qt5, it only changes the default. So a user can still select Qt5 + classic libjpeg, and the autobuilder randomization will also generate such configurations. If really classic libjpeg are jpeg-turbo are no longer compatible, then we probably need to drop the virtual package entirely... but it's going to be a lot of work to handle both variants in all packages using jpeg... 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 Feb 21 20:06:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:06:06 +0100 Subject: [Buildroot] [PATCH 2/5] package/openmpi: bump to version 4.1.4 In-Reply-To: <20230207220941.58066-2-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> <20230207220941.58066-2-ju.o@free.fr> Message-ID: <20230221210606.03e4b536@windsurf> Hello Julien, On Tue, 7 Feb 2023 23:09:38 +0100 Julien Olivain wrote: > diff --git a/package/openmpi/Config.in b/package/openmpi/Config.in > index 4413c55f9c..80b01a26e1 100644 > --- a/package/openmpi/Config.in > +++ b/package/openmpi/Config.in > @@ -8,6 +8,7 @@ config BR2_PACKAGE_OPENMPI > bool "openmpi" > depends on BR2_USE_MMU # fork() > depends on BR2_USE_WCHAR > + depends on BR2_TOOLCHAIN_HAS_ATOMIC This should affect the dependencies of the Config.in comment, so I fixed that up and applied your patch to the next branch. Thanks! 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 Tue Feb 21 20:08:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 21 Feb 2023 21:08:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast In-Reply-To: <20230221154827.7e737960@windsurf> References: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> <20230221154827.7e737960@windsurf> Message-ID: <20230221200857.GG2718518@scaer> Fabrice, all, On 2023-02-21 15:48 +0100, Thomas Petazzoni spake thusly: > Hello Fabrice, > > On Tue, 21 Feb 2023 15:21:44 +0100 > Fabrice Fontaine wrote: > > > systemd can't be built with -Ofast since version 252 and > > https://github.com/systemd/systemd/commit/60f97fee2d2f948c8e8963ea8ff767008cb93cae > > resulting in the following build failure since bump to version 252.4 in > > commit a2c823d1f548d5a0120d27d6c000603192360f7b: > > > > ../output-1/build/systemd-252.4/meson.build:397:8: ERROR: Problem encountered: -Ofast, -ffast-math, or -ffinite-math-only is specified in c_args. > > > > While at it, revert changes made by commit 9cd084b54e2223e49c37962b0cbefae7bea26ef5 > > > > Fixes: > > - http://autobuild.buildroot.org/results/8f41c4984b645851724e554c3162b83bc312bee7 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/systemd/Config.in | 1 + > > package/systemd/systemd.mk | 5 ----- > > system/Config.in | 4 ++++ > > 3 files changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > > index 9f4d933779..5bbdbb405f 100644 > > --- a/package/systemd/Config.in > > +++ b/package/systemd/Config.in > > @@ -25,6 +25,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > > depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 > > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > > depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd > > + depends on !BR2_OPTIMIZE_FAST > I really dislike this. Agreed. > > -SYSTEMD_CFLAGS = $(TARGET_CFLAGS) > > -ifeq ($(BR2_OPTIMIZE_FAST),y) > > -SYSTEMD_CFLAGS += -O3 > > -endif > > And this should work. It's really systemd that is stupid to look for > -Ofast in c_flags without seeing that -O3 later overrides it. Indeed. Probably something along the lines of: SYSTEMD_CFLAGS = $(filter-out -Ofast,$(TARGET_CFLAGS)) would do the trick? Alternatively, as the upstream commit also implies, maybe we should in this case keep -Ofast and just add: SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-finite-math-only 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 thomas.petazzoni at bootlin.com Tue Feb 21 20:26:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:26:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast In-Reply-To: <20230221200857.GG2718518@scaer> References: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> <20230221154827.7e737960@windsurf> <20230221200857.GG2718518@scaer> Message-ID: <20230221212634.736f8d70@windsurf> On Tue, 21 Feb 2023 21:08:57 +0100 "Yann E. MORIN" wrote: > Alternatively, as the upstream commit also implies, maybe we should in > this case keep -Ofast and just add: > > SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-finite-math-only But the upstream commit causes the build to bail out as soon as -Ofast is in the CFLAGS, so even if you specify -Ofast -fno-finite-math-only, systemd's meson machinery will bail out. So your other idea of: SYSTEMD_CFLAGS = $(filter-out -Ofast,$(TARGET_CFLAGS)) certainly looks very relevant. Fabrice, could you give it a try? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Tue Feb 21 20:32:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:32:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/opusfile: fix CVE-2022-47021 In-Reply-To: <20230205130600.18051-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 5 Feb 2023 14:06:00 +0100") References: <20230205130600.18051-1-fontaine.fabrice@gmail.com> Message-ID: <87sfeyyd1p.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > A null pointer dereference issue was discovered in functions op_get_data > and op_open1 in opusfile.c in xiph opusfile 0.9 thru 0.12 allows > attackers to cause denial of service or other unspecified impacts. > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Tue Feb 21 20:34:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 21 Feb 2023 21:34:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast In-Reply-To: <20230221212634.736f8d70@windsurf> References: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> <20230221154827.7e737960@windsurf> <20230221200857.GG2718518@scaer> <20230221212634.736f8d70@windsurf> Message-ID: <20230221203403.GH2718518@scaer> On 2023-02-21 21:26 +0100, Thomas Petazzoni spake thusly: > On Tue, 21 Feb 2023 21:08:57 +0100 > "Yann E. MORIN" wrote: > > > Alternatively, as the upstream commit also implies, maybe we should in > > this case keep -Ofast and just add: > > > > SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-finite-math-only > > But the upstream commit causes the build to bail out as soon as -Ofast > is in the CFLAGS, so even if you specify -Ofast -fno-finite-math-only, > systemd's meson machinery will bail out. The upstream code is (split for readability): if (('-Ofast' in c_args or '-ffast-math' in c_args or '-ffinite-math-only' in c_args ) and not '-fno-finite-math-only' in c_args ) So, if -fno-finite-math-only is in c_args, then the whole condition should evaluate to false, and thus it should not error out, right? Or did I lose more than my grep-fu? ;-) Regards, Yann E. MORIN. > So your other idea of: > > SYSTEMD_CFLAGS = $(filter-out -Ofast,$(TARGET_CFLAGS)) > > certainly looks very relevant. > > Fabrice, could you give it a try? > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com -- .-----------------.--------------------.------------------.--------------------. | 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 Tue Feb 21 20:34:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:34:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/modsecurity2: security bump to version 2.9.7 In-Reply-To: <20230205140002.154492-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 5 Feb 2023 15:00:02 +0100") References: <20230205140002.154492-1-fontaine.fabrice@gmail.com> Message-ID: <87o7pmycz2.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads > in ModSecurity before 2.9.7 may allow for Web Application Firewall > bypasses and buffer overflows on the Web Application Firewall when > executing rules that read the FILES_TMP_CONTENT collection. > - host-pkgconf is mandatory and used to find libxml2 since > https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 > - pcre2 is supported since: > https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 > https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:34:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:34:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/modsecurity2: disable pcre In-Reply-To: <20230219165638.147772-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 19 Feb 2023 17:56:38 +0100") References: <20230219165638.147772-1-fontaine.fabrice@gmail.com> Message-ID: <87k00aycye.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable pcre to avoid the following build failure if pcre-config is > found on host raised since bump to version 2.9.7 in commit > 42e34cf10f9eb037aa8c48a4fb9e8f521901b983: > /home/thomas/autobuild/instance-0/output-1/per-package/modsecurity2/host/bin/../lib/gcc/mips64el-buildroot-linux-gnu/11.3.0/../../../../mips64el-buildroot-linux-gnu/bin/ld: > cannot find -lpcre: No such file or directory > Fixes: > - http://autobuild.buildroot.org/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:38:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:38:33 +0100 Subject: [Buildroot] [PATCH 1/2] package/upx: bump to version 4.0.1 In-Reply-To: <20221223173818.51581-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 23 Dec 2022 18:38:17 +0100") References: <20221223173818.51581-1-fontaine.fabrice@gmail.com> Message-ID: <87fsayycs6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Drop patch (already in version) > - cmake must be used since > https://github.com/upx/upx/commit/c7d8b6fed1b551158540e1d2e884dc224fce474c > - ucl and zlib are directly included in upx since > https://github.com/upx/upx/commit/61e1366122f8d1b9e2434a8103e7af00a35ea902 > https://github.com/upx/upx/blob/v4.0.1/NEWS > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:38:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:38:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/upx: security bump to version 4.0.2 In-Reply-To: <20230205140602.161881-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 5 Feb 2023 15:06:02 +0100") References: <20230205140602.161881-1-fontaine.fabrice@gmail.com> Message-ID: <87bklmycrt.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in > UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to > cause a denial of service (abort) via a crafted file. > Fix CVE-2023-23457: A Segmentation fault was found in UPX in > PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a > crafted input file allows invalid memory address access that could lead > to a denial of service. > https://github.com/upx/upx/blob/v4.0.2/NEWS > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:43:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:43:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 4.0.3 In-Reply-To: <20230205142543.285695-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 5 Feb 2023 15:25:43 +0100") References: <20230205142543.285695-1-fontaine.fabrice@gmail.com> Message-ID: <877cwayckl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-0411, CVE-2023-0412, CVE-2023-0413, CVE-2023-0414, > CVE-2023-0415, CVE-2023-0416 and CVE-2023-0417 > https://www.wireshark.org/security/wnpa-sec-2023-01 > https://www.wireshark.org/security/wnpa-sec-2023-02 > https://www.wireshark.org/security/wnpa-sec-2023-03 > https://www.wireshark.org/security/wnpa-sec-2023-04 > https://www.wireshark.org/security/wnpa-sec-2023-05 > https://www.wireshark.org/security/wnpa-sec-2023-06 > https://www.wireshark.org/security/wnpa-sec-2023-07 > https://www.wireshark.org/docs/relnotes/wireshark-4.0.3.html It looks like these issues do not affect 3.4.x, so I have NOT backported this. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:46:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:46:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: add utf8proc optional dependency In-Reply-To: <20230205132307.41753-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 5 Feb 2023 14:23:07 +0100") References: <20230205132307.41753-1-fontaine.fabrice@gmail.com> Message-ID: <87356yycf9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > utf8proc is an optional dependency since version 2.3 and > https://github.com/tmux/tmux/commit/6c94774b70f72952c4c512e4aa59a207ca1c34f2 > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. > --- > package/tmux/tmux.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk > index 281b7d8ee6..b1c0af1a83 100644 > --- a/package/tmux/tmux.mk > +++ b/package/tmux/tmux.mk > @@ -11,6 +11,13 @@ TMUX_LICENSE_FILES = COPYING > TMUX_CPE_ID_VENDOR = tmux_project > TMUX_DEPENDENCIES = libevent ncurses host-pkgconf > +ifeq ($(BR2_PACKAGE_UTF8PROC),y) > +TMUX_DEPENDENCIES += utf8proc > +TMUX_CONF_OPTS += --enable-utf8proc > +else > +TMUX_CONF_OPTS += --disable-utf8proc > +endif > + > # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear > # can reject the user connection. See man shells. > define TMUX_ADD_TMUX_TO_SHELLS > -- > 2.39.0 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:47:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:47:42 +0100 Subject: [Buildroot] [git commit] package/xxhash: use MOREFLAGS instead of overriding CFLAGS In-Reply-To: <20230206083621.0D5EB83950@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Mon, 6 Feb 2023 09:34:39 +0100") References: <20230206083621.0D5EB83950@busybox.osuosl.org> Message-ID: <87y1oqwxsh.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=bfef88762d19b2fd8f99b55cee5c9ebaf986e1c7 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Set MOREFLAGS instead of overriding CFLAGS to avoid the following build > failure raised since commit 94b66fb49cd57d0863245fbe0a3dc0833e76aad0: > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /tmp/ccabb8cF.o: relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC > Fixes: > - http://autobuild.buildroot.org/results/953133575d8c13266f1450fa545e70e4a518508d > Signed-off-by: Fabrice Fontaine > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:32:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:32:16 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/opusfile: fix CVE-2022-47021 Message-ID: <20230221204754.881978662D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3959f94377fd1d36c5779791320bbaee0f383e24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x A null pointer dereference issue was discovered in functions op_get_data and op_open1 in opusfile.c in xiph opusfile 0.9 thru 0.12 allows attackers to cause denial of service or other unspecified impacts. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ae65870e652088dd65ca41d63304893d1d4443a2) Signed-off-by: Peter Korsgaard --- ...e-allocation-failure-from-ogg_sync_buffer.patch | 44 ++++++++++++++++++++++ package/opusfile/opusfile.mk | 3 ++ 2 files changed, 47 insertions(+) diff --git a/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch new file mode 100644 index 0000000000..2ef08502ab --- /dev/null +++ b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch @@ -0,0 +1,44 @@ +From 0a4cd796df5b030cb866f3f4a5e41a4b92caddf5 Mon Sep 17 00:00:00 2001 +From: Ralph Giles +Date: Tue, 6 Sep 2022 19:04:31 -0700 +Subject: [PATCH] Propagate allocation failure from ogg_sync_buffer. + +Instead of segfault, report OP_EFAULT if ogg_sync_buffer returns +a null pointer. This allows more graceful recovery by the caller +in the unlikely event of a fallible ogg_malloc call. + +We do check the return value elsewhere in the code, so the new +checks make the code more consistent. + +Thanks to https://github.com/xiph/opusfile/issues/36 for reporting. + +Signed-off-by: Timothy B. Terriberry +Signed-off-by: Mark Harris + +[Retrieved from: +https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5] +Signed-off-by: Fabrice Fontaine +--- + src/opusfile.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/opusfile.c b/src/opusfile.c +index ca219b2..3c3c81e 100644 +--- a/src/opusfile.c ++++ b/src/opusfile.c +@@ -148,6 +148,7 @@ static int op_get_data(OggOpusFile *_of,int _nbytes){ + int nbytes; + OP_ASSERT(_nbytes>0); + buffer=(unsigned char *)ogg_sync_buffer(&_of->oy,_nbytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + nbytes=(int)(*_of->callbacks.read)(_of->stream,buffer,_nbytes); + OP_ASSERT(nbytes<=_nbytes); + if(OP_LIKELY(nbytes>0))ogg_sync_wrote(&_of->oy,nbytes); +@@ -1527,6 +1528,7 @@ static int op_open1(OggOpusFile *_of, + if(_initial_bytes>0){ + char *buffer; + buffer=ogg_sync_buffer(&_of->oy,(long)_initial_bytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + memcpy(buffer,_initial_data,_initial_bytes*sizeof(*buffer)); + ogg_sync_wrote(&_of->oy,(long)_initial_bytes); + } diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk index 72ae82e801..63553a81e7 100644 --- a/package/opusfile/opusfile.mk +++ b/package/opusfile/opusfile.mk @@ -11,6 +11,9 @@ OPUSFILE_LICENSE = BSD-3-Clause OPUSFILE_LICENSE_FILES = COPYING OPUSFILE_INSTALL_STAGING = YES +# 0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch +OPUSFILE_IGNORE_CVES += CVE-2022-47021 + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPUSFILE_DEPENDENCIES += openssl else From peter at korsgaard.com Tue Feb 21 20:33:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:33:45 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/modsecurity2: disable pcre Message-ID: <20230221204754.A291186630@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cefcf40163f6fe0be7023571d1488f6133e29ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Disable pcre to avoid the following build failure if pcre-config is found on host raised since bump to version 2.9.7 in commit 42e34cf10f9eb037aa8c48a4fb9e8f521901b983: /home/thomas/autobuild/instance-0/output-1/per-package/modsecurity2/host/bin/../lib/gcc/mips64el-buildroot-linux-gnu/11.3.0/../../../../mips64el-buildroot-linux-gnu/bin/ld: cannot find -lpcre: No such file or directory Fixes: - http://autobuild.buildroot.org/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 06af305874abc1eb4bb98dbd8aabe071fa5d77bc) Signed-off-by: Peter Korsgaard --- package/modsecurity2/modsecurity2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index c251291e64..88bbf3bb29 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -21,6 +21,7 @@ MODSECURITY2_CONF_OPTS = \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ --without-curl \ --without-lua \ + --without-pcre \ --without-yajl \ --without-ssdeep From peter at korsgaard.com Tue Feb 21 20:33:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:33:34 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/modsecurity2: security bump to version 2.9.7 Message-ID: <20230221204754.945BA8662F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3665ba04bc683ccb9e44a182c8992cfd00ec76c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads in ModSecurity before 2.9.7 may allow for Web Application Firewall bypasses and buffer overflows on the Web Application Firewall when executing rules that read the FILES_TMP_CONTENT collection. - host-pkgconf is mandatory and used to find libxml2 since https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 - pcre2 is supported since: https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 42e34cf10f9eb037aa8c48a4fb9e8f521901b983) Signed-off-by: Peter Korsgaard --- package/modsecurity2/Config.in | 2 +- package/modsecurity2/modsecurity2.hash | 4 ++-- package/modsecurity2/modsecurity2.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in index 2870386a99..fb1bfc960e 100644 --- a/package/modsecurity2/Config.in +++ b/package/modsecurity2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_MODSECURITY2 bool "modsecurity2" depends on BR2_PACKAGE_APACHE select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help ModSecurity is an open source, cross-platform web application firewall (WAF) module. Known as the "Swiss Army Knife" of diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash index a19f4823a8..2c77ffd830 100644 --- a/package/modsecurity2/modsecurity2.hash +++ b/package/modsecurity2/modsecurity2.hash @@ -1,5 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.5/modsecurity-2.9.5.tar.gz.sha256 -sha256 e2bfc8cd8b8de1e21f054d310543373ea5d89adbd96784e832be0da3e4dc149e modsecurity-2.9.5.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz.sha256 +sha256 2a28fcfccfef21581486f98d8d5fe0397499749b8380f60ec7bb1c08478e1839 modsecurity-2.9.7.tar.gz # Locally computed sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index a1ad8fe5bc..c251291e64 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODSECURITY2_VERSION = 2.9.5 +MODSECURITY2_VERSION = 2.9.7 MODSECURITY2_SOURCE = modsecurity-$(MODSECURITY2_VERSION).tar.gz MODSECURITY2_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) MODSECURITY2_LICENSE = Apache-2.0 @@ -12,11 +12,10 @@ MODSECURITY2_LICENSE_FILES = LICENSE MODSECURITY2_CPE_ID_VENDOR = trustwave MODSECURITY2_CPE_ID_PRODUCT = modsecurity MODSECURITY2_INSTALL_STAGING = YES -MODSECURITY2_DEPENDENCIES = apache libxml2 pcre +MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 MODSECURITY2_CONF_OPTS = \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ - --with-libxml=$(STAGING_DIR)/usr \ + --with-pcre2=$(STAGING_DIR)/usr/bin/pcre2-config \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ --with-apu=$(STAGING_DIR)/usr/bin/apu-1-config \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ From peter at korsgaard.com Tue Feb 21 20:43:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:43:55 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/tmux: add utf8proc optional dependency Message-ID: <20230221204754.C88638662F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=527e770697eec7cbc8c7b18bb44fd8e014c33f68 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x utf8proc is an optional dependency since version 2.3 and https://github.com/tmux/tmux/commit/6c94774b70f72952c4c512e4aa59a207ca1c34f2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 1f618aa388535181c281c85e2b5264532de4ef0f) Signed-off-by: Peter Korsgaard --- package/tmux/tmux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 281b7d8ee6..b1c0af1a83 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -11,6 +11,13 @@ TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_UTF8PROC),y) +TMUX_DEPENDENCIES += utf8proc +TMUX_CONF_OPTS += --enable-utf8proc +else +TMUX_CONF_OPTS += --disable-utf8proc +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS From peter at korsgaard.com Tue Feb 21 19:53:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 20:53:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/elf2flt: fix error when building gdb for target on m68k Message-ID: <20230221204754.7C2A48662C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26df863eb6f8f91f2d8167cecff35a6a98d03cc5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Thomas reported that m68k fails to build when enabling BR2_PACKAGE_GDB. It fails when building gdb for the target with the following error: elf2flt: ERROR: text=0x3c826 overlaps data=0x256e0 ? It turns out that the gdb binary has another problematic input section (.gcc_except_table), which causes elf2flt to try to append to the .text output section, after it has already moved on with appending sections to the .data output section. elf2flt cannot append to a previous output section once it has moved on to another output section. Update the existing elf2flt patch to also add an exception for .gcc_except_table. Reported-by: Thomas Petazzoni Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni (cherry picked from commit f6f15e85b3ac58ba1d387ea86945d3fabf4f8990) Signed-off-by: Peter Korsgaard --- ...-fatal-error-regression-on-m68k-xtensa-ri.patch | 47 +++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch index 278709cb1c..616bbc891f 100644 --- a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch +++ b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch @@ -1,8 +1,7 @@ -From 65ac5f9e69cfb989d970da74c41e478774d29be5 Mon Sep 17 00:00:00 2001 +From a8c9f650b82109abf7aa730f298ea5182ed62613 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 9 Aug 2022 21:06:05 +0200 -Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, - riscv64 +Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64 Commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") changed the condition of which input sections that should be included @@ -12,16 +11,15 @@ to: ((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == (SEC_DATA | SEC_READONLY | SEC_RELOC)) -On ARM, the .eh_frame input section does not have the SEC_RELOC flag -set, so this specific change had no effect on ARM. +On ARM, the .eh_frame input section does not have the SEC_RELOC flag set, +so on ARM, this change caused .eh_frame to move from .text to .data. -However, on e.g. m68k and riscv64, the .eh_frame input section does -have the SEC_RELOC flag set, which means that after commit ba379d08bb78 -("elf2flt: fix for segfault on some ARM ELFs"), read-only relocation -data sections were placed in .text output section, instead of .data -output section. +However, on e.g. m68k, xtensa and riscv64, the .eh_frame input section +does have the SEC_RELOC flag set, which means that the change in +commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") +caused .eh_frame to move in an opposite way, i.e. from .data to .text. -This will result in a fatal error on m68k, xtensa and riscv64: +This resulted in a fatal error on m68k, xtensa and riscv64: ERROR: text=0x3bab8 overlaps data=0x33f60 ? This is because elf2flt cannot append to .text after .data has been @@ -36,21 +34,26 @@ to .text after .data has been appended to (which will require elf2flt to move/relocate everything that has already been appended to .data, since the virtual addresses are contiguous). -However, for now, add an exception for m68k, xtensa and riscv64 -(specifically for the problematic input section, .eh_frame), so that we -get the same behavior as older elf2flt releases, where we put read-only -relocation data in .data, which was working perfectly fine. +However, for now, add an exception for input sections which have all +three flags SEC_DATA, SEC_READONLY, and SEC_RELOC set, and which have a +name equal to a problematic input section (.eh_frame, .gcc_except_table). +That way, we get the same behavior as older elf2flt releases for m68k, +xtensa and riscv64, where we put read-only relocation data in .data, +which was working perfectly fine. + +This exception will not change any behavior on ARM, as the .eh_frame +input section does not have flag SEC_RELOC set. Signed-off-by: Niklas Cassel --- - elf2flt.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) + elf2flt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/elf2flt.c b/elf2flt.c -index 9c32f9a..a680c89 100644 +index e0d7891..39d035f 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -340,8 +340,15 @@ compare_relocs (const void *pa, const void *pb) +@@ -341,8 +341,13 @@ compare_relocs (const void *pa, const void *pb) static bool ro_reloc_data_section_should_be_in_text(asection *s) { @@ -58,10 +61,8 @@ index 9c32f9a..a680c89 100644 - (SEC_DATA | SEC_READONLY | SEC_RELOC); + if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == + (SEC_DATA | SEC_READONLY | SEC_RELOC)) { -+#if defined(TARGET_m68k) || defined(TARGET_riscv64) || defined(TARGET_xtensa) -+ if (!strcmp(".eh_frame", s->name)) ++ if (!strcmp(".eh_frame", s->name) || !strcmp(".gcc_except_table", s->name)) + return false; -+#endif + return true; + } + return false; @@ -69,5 +70,5 @@ index 9c32f9a..a680c89 100644 static uint32_t * -- -2.37.1 +2.39.0 From peter at korsgaard.com Tue Feb 21 20:47:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:47:23 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/xxhash: use MOREFLAGS instead of overriding CFLAGS Message-ID: <20230221204754.DC68385DB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81344a37d6640a75ab3c9e37fb1cc769fa5ec5b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Set MOREFLAGS instead of overriding CFLAGS to avoid the following build failure raised since commit 94b66fb49cd57d0863245fbe0a3dc0833e76aad0: /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /tmp/ccabb8cF.o: relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC Fixes: - http://autobuild.buildroot.org/results/953133575d8c13266f1450fa545e70e4a518508d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit bfef88762d19b2fd8f99b55cee5c9ebaf986e1c7) Signed-off-by: Peter Korsgaard --- package/xxhash/xxhash.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 40e3c2696c..75d375a2fa 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -28,8 +28,7 @@ endif define XXHASH_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - CFLAGS="$(TARGET_CFLAGS) -DXXH_NO_INLINE_HINTS" \ - $(XXHASH_TARGETS) + MOREFLAGS=-DXXH_NO_INLINE_HINTS $(XXHASH_TARGETS) endef define XXHASH_INSTALL_STAGING_CMDS From peter at korsgaard.com Tue Feb 21 20:36:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:36:37 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/upx: bump to version 4.0.1 Message-ID: <20230221204754.ADB3885DB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b87222f6bfb424e15039c59722415558d7ff18ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x - Drop patch (already in version) - cmake must be used since https://github.com/upx/upx/commit/c7d8b6fed1b551158540e1d2e884dc224fce474c - ucl and zlib are directly included in upx since https://github.com/upx/upx/commit/61e1366122f8d1b9e2434a8103e7af00a35ea902 https://github.com/upx/upx/blob/v4.0.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 1567516d8984a4bddfbee30ee69c771cf3f8e224) Signed-off-by: Peter Korsgaard --- ...1-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch | 80 ---------------------- package/upx/upx.hash | 2 +- package/upx/upx.mk | 22 +----- 3 files changed, 4 insertions(+), 100 deletions(-) diff --git a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch b/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch deleted file mode 100644 index 6fae9cac0e..0000000000 --- a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001 -From: John Reiser -Date: Fri, 11 Dec 2020 13:38:18 -0800 -Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ - -https://github.com/upx/upx/issues/421 - modified: p_lx_elf.cpp - -[Retrieved from: -https://github.com/upx/upx/commit/3781df9da23840e596d5e9e8493f22666802fe6c] -Signed-off-by: Fabrice Fontaine ---- - src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 5 deletions(-) - -diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp -index 182db192f..3a4101cf7 100644 ---- a/src/p_lx_elf.cpp -+++ b/src/p_lx_elf.cpp -@@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack() - int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ]; - if (z_rel && z_rsz) { - unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val); -+ if ((unsigned)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_REL] %#x\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off]; - unsigned relsz = get_te32(&dynseg[-1+ z_rsz].d_val); -+ if ((unsigned)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_RELSZ] %#x\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp); - for (; rp < last; ++rp) { - unsigned r_va = get_te32(&rp->r_offset); -@@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack() - int z_rel = dt_table[Elf64_Dyn::DT_RELA]; - int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ]; - if (z_rel && z_rsz) { -- unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ if ((u64_t)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELA] %#llx\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off]; -- unsigned relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ upx_uint64_t relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ if ((u64_t)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELASZ] %#llx\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp); - for (; rp < last; ++rp) { -- unsigned r_va = get_te64(&rp->r_offset); -+ upx_uint64_t r_va = get_te64(&rp->r_offset); - if (r_va == user_init_ava) { // found the Elf64_Rela -- unsigned r_info = get_te64(&rp->r_info); -+ upx_uint64_t r_info = get_te64(&rp->r_info); - unsigned r_type = ELF64_R_TYPE(r_info); - if (Elf64_Ehdr::EM_AARCH64 == e_machine - && R_AARCH64_RELATIVE == r_type) { -@@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack() - } - else { - char msg[50]; snprintf(msg, sizeof(msg), -- "bad relocation %#x DT_INIT_ARRAY[0]", -+ "bad relocation %#llx DT_INIT_ARRAY[0]", - r_info); - throwCantPack(msg); - } diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 7f3698ca0d..9f7c40c819 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 47774df5c958f2868ef550fb258b97c73272cb1f44fe776b798e393465993714 upx-3.96-src.tar.xz +sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index e693a70db1..ef346b2310 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,28 +4,12 @@ # ################################################################################ -UPX_VERSION = 3.96 +UPX_VERSION = 4.0.1 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING UPX_CPE_ID_VENDOR = upx_project +UPX_SUPPORTS_IN_SOURCE_BUILD = NO -# 0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch -UPX_IGNORE_CVES += CVE-2021-20285 - -HOST_UPX_DEPENDENCIES = host-ucl host-zlib - -# We need to specify all, otherwise the default target only prints a message -# stating to "please choose a target for 'make'"... :-( -define HOST_UPX_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - UPX_UCLDIR=$(HOST_DIR) CXXFLAGS_WERROR= -C $(@D) all -endef - -# UPX has no install procedure, so install it manually. -define HOST_UPX_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/upx.out $(HOST_DIR)/bin/upx -endef - -$(eval $(host-generic-package)) +$(eval $(host-cmake-package)) From peter at korsgaard.com Tue Feb 21 20:37:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:37:06 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/upx: security bump to version 4.0.2 Message-ID: <20230221204754.BA3D686631@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5e565d9b2e9e2ec5098293b160ded29db2d03a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to cause a denial of service (abort) via a crafted file. Fix CVE-2023-23457: A Segmentation fault was found in UPX in PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a crafted input file allows invalid memory address access that could lead to a denial of service. https://github.com/upx/upx/blob/v4.0.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 02befac8f9404ae30d0d090221d21a8460c82ec7) Signed-off-by: Peter Korsgaard --- package/upx/upx.hash | 2 +- package/upx/upx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 9f7c40c819..7c24906152 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz +sha256 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f upx-4.0.2-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index ef346b2310..6018b0a63d 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPX_VERSION = 4.0.1 +UPX_VERSION = 4.0.2 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ From peter at korsgaard.com Tue Feb 21 20:32:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:32:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/opusfile: fix CVE-2022-47021 Message-ID: <20230221204903.1ADAA8666F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4aaa7f20775d3ef01df8544f5ebc21e54b91a67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x A null pointer dereference issue was discovered in functions op_get_data and op_open1 in opusfile.c in xiph opusfile 0.9 thru 0.12 allows attackers to cause denial of service or other unspecified impacts. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ae65870e652088dd65ca41d63304893d1d4443a2) Signed-off-by: Peter Korsgaard --- ...e-allocation-failure-from-ogg_sync_buffer.patch | 44 ++++++++++++++++++++++ package/opusfile/opusfile.mk | 3 ++ 2 files changed, 47 insertions(+) diff --git a/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch new file mode 100644 index 0000000000..2ef08502ab --- /dev/null +++ b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch @@ -0,0 +1,44 @@ +From 0a4cd796df5b030cb866f3f4a5e41a4b92caddf5 Mon Sep 17 00:00:00 2001 +From: Ralph Giles +Date: Tue, 6 Sep 2022 19:04:31 -0700 +Subject: [PATCH] Propagate allocation failure from ogg_sync_buffer. + +Instead of segfault, report OP_EFAULT if ogg_sync_buffer returns +a null pointer. This allows more graceful recovery by the caller +in the unlikely event of a fallible ogg_malloc call. + +We do check the return value elsewhere in the code, so the new +checks make the code more consistent. + +Thanks to https://github.com/xiph/opusfile/issues/36 for reporting. + +Signed-off-by: Timothy B. Terriberry +Signed-off-by: Mark Harris + +[Retrieved from: +https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5] +Signed-off-by: Fabrice Fontaine +--- + src/opusfile.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/opusfile.c b/src/opusfile.c +index ca219b2..3c3c81e 100644 +--- a/src/opusfile.c ++++ b/src/opusfile.c +@@ -148,6 +148,7 @@ static int op_get_data(OggOpusFile *_of,int _nbytes){ + int nbytes; + OP_ASSERT(_nbytes>0); + buffer=(unsigned char *)ogg_sync_buffer(&_of->oy,_nbytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + nbytes=(int)(*_of->callbacks.read)(_of->stream,buffer,_nbytes); + OP_ASSERT(nbytes<=_nbytes); + if(OP_LIKELY(nbytes>0))ogg_sync_wrote(&_of->oy,nbytes); +@@ -1527,6 +1528,7 @@ static int op_open1(OggOpusFile *_of, + if(_initial_bytes>0){ + char *buffer; + buffer=ogg_sync_buffer(&_of->oy,(long)_initial_bytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + memcpy(buffer,_initial_data,_initial_bytes*sizeof(*buffer)); + ogg_sync_wrote(&_of->oy,(long)_initial_bytes); + } diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk index 72ae82e801..63553a81e7 100644 --- a/package/opusfile/opusfile.mk +++ b/package/opusfile/opusfile.mk @@ -11,6 +11,9 @@ OPUSFILE_LICENSE = BSD-3-Clause OPUSFILE_LICENSE_FILES = COPYING OPUSFILE_INSTALL_STAGING = YES +# 0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch +OPUSFILE_IGNORE_CVES += CVE-2022-47021 + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPUSFILE_DEPENDENCIES += openssl else From peter at korsgaard.com Tue Feb 21 20:33:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:33:58 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/modsecurity2: security bump to version 2.9.7 Message-ID: <20230221204903.28F1886670@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f09b5bec825e039130b3400461b067bb535e3434 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads in ModSecurity before 2.9.7 may allow for Web Application Firewall bypasses and buffer overflows on the Web Application Firewall when executing rules that read the FILES_TMP_CONTENT collection. - host-pkgconf is mandatory and used to find libxml2 since https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 - pcre2 is supported since: https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 42e34cf10f9eb037aa8c48a4fb9e8f521901b983) Signed-off-by: Peter Korsgaard --- package/modsecurity2/Config.in | 2 +- package/modsecurity2/modsecurity2.hash | 4 ++-- package/modsecurity2/modsecurity2.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in index 2870386a99..fb1bfc960e 100644 --- a/package/modsecurity2/Config.in +++ b/package/modsecurity2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_MODSECURITY2 bool "modsecurity2" depends on BR2_PACKAGE_APACHE select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help ModSecurity is an open source, cross-platform web application firewall (WAF) module. Known as the "Swiss Army Knife" of diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash index a19f4823a8..2c77ffd830 100644 --- a/package/modsecurity2/modsecurity2.hash +++ b/package/modsecurity2/modsecurity2.hash @@ -1,5 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.5/modsecurity-2.9.5.tar.gz.sha256 -sha256 e2bfc8cd8b8de1e21f054d310543373ea5d89adbd96784e832be0da3e4dc149e modsecurity-2.9.5.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz.sha256 +sha256 2a28fcfccfef21581486f98d8d5fe0397499749b8380f60ec7bb1c08478e1839 modsecurity-2.9.7.tar.gz # Locally computed sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index a1ad8fe5bc..c251291e64 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODSECURITY2_VERSION = 2.9.5 +MODSECURITY2_VERSION = 2.9.7 MODSECURITY2_SOURCE = modsecurity-$(MODSECURITY2_VERSION).tar.gz MODSECURITY2_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) MODSECURITY2_LICENSE = Apache-2.0 @@ -12,11 +12,10 @@ MODSECURITY2_LICENSE_FILES = LICENSE MODSECURITY2_CPE_ID_VENDOR = trustwave MODSECURITY2_CPE_ID_PRODUCT = modsecurity MODSECURITY2_INSTALL_STAGING = YES -MODSECURITY2_DEPENDENCIES = apache libxml2 pcre +MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 MODSECURITY2_CONF_OPTS = \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ - --with-libxml=$(STAGING_DIR)/usr \ + --with-pcre2=$(STAGING_DIR)/usr/bin/pcre2-config \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ --with-apu=$(STAGING_DIR)/usr/bin/apu-1-config \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ From peter at korsgaard.com Tue Feb 21 20:34:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:34:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/modsecurity2: disable pcre Message-ID: <20230221204903.354C88666E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12123bd4a5fc1e63e6b4adc07a3ec5eef8c4f743 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Disable pcre to avoid the following build failure if pcre-config is found on host raised since bump to version 2.9.7 in commit 42e34cf10f9eb037aa8c48a4fb9e8f521901b983: /home/thomas/autobuild/instance-0/output-1/per-package/modsecurity2/host/bin/../lib/gcc/mips64el-buildroot-linux-gnu/11.3.0/../../../../mips64el-buildroot-linux-gnu/bin/ld: cannot find -lpcre: No such file or directory Fixes: - http://autobuild.buildroot.org/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 06af305874abc1eb4bb98dbd8aabe071fa5d77bc) Signed-off-by: Peter Korsgaard --- package/modsecurity2/modsecurity2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index c251291e64..88bbf3bb29 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -21,6 +21,7 @@ MODSECURITY2_CONF_OPTS = \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ --without-curl \ --without-lua \ + --without-pcre \ --without-yajl \ --without-ssdeep From peter at korsgaard.com Tue Feb 21 19:55:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 20:55:50 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/elf2flt: fix error when building gdb for target on m68k Message-ID: <20230221204903.0DEB18666E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fe181faa9a055c3b172f87bc7b519f65450529b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Thomas reported that m68k fails to build when enabling BR2_PACKAGE_GDB. It fails when building gdb for the target with the following error: elf2flt: ERROR: text=0x3c826 overlaps data=0x256e0 ? It turns out that the gdb binary has another problematic input section (.gcc_except_table), which causes elf2flt to try to append to the .text output section, after it has already moved on with appending sections to the .data output section. elf2flt cannot append to a previous output section once it has moved on to another output section. Update the existing elf2flt patch to also add an exception for .gcc_except_table. Reported-by: Thomas Petazzoni Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni (cherry picked from commit f6f15e85b3ac58ba1d387ea86945d3fabf4f8990) Signed-off-by: Peter Korsgaard --- ...-fatal-error-regression-on-m68k-xtensa-ri.patch | 47 +++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch index 278709cb1c..616bbc891f 100644 --- a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch +++ b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch @@ -1,8 +1,7 @@ -From 65ac5f9e69cfb989d970da74c41e478774d29be5 Mon Sep 17 00:00:00 2001 +From a8c9f650b82109abf7aa730f298ea5182ed62613 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 9 Aug 2022 21:06:05 +0200 -Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, - riscv64 +Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64 Commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") changed the condition of which input sections that should be included @@ -12,16 +11,15 @@ to: ((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == (SEC_DATA | SEC_READONLY | SEC_RELOC)) -On ARM, the .eh_frame input section does not have the SEC_RELOC flag -set, so this specific change had no effect on ARM. +On ARM, the .eh_frame input section does not have the SEC_RELOC flag set, +so on ARM, this change caused .eh_frame to move from .text to .data. -However, on e.g. m68k and riscv64, the .eh_frame input section does -have the SEC_RELOC flag set, which means that after commit ba379d08bb78 -("elf2flt: fix for segfault on some ARM ELFs"), read-only relocation -data sections were placed in .text output section, instead of .data -output section. +However, on e.g. m68k, xtensa and riscv64, the .eh_frame input section +does have the SEC_RELOC flag set, which means that the change in +commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") +caused .eh_frame to move in an opposite way, i.e. from .data to .text. -This will result in a fatal error on m68k, xtensa and riscv64: +This resulted in a fatal error on m68k, xtensa and riscv64: ERROR: text=0x3bab8 overlaps data=0x33f60 ? This is because elf2flt cannot append to .text after .data has been @@ -36,21 +34,26 @@ to .text after .data has been appended to (which will require elf2flt to move/relocate everything that has already been appended to .data, since the virtual addresses are contiguous). -However, for now, add an exception for m68k, xtensa and riscv64 -(specifically for the problematic input section, .eh_frame), so that we -get the same behavior as older elf2flt releases, where we put read-only -relocation data in .data, which was working perfectly fine. +However, for now, add an exception for input sections which have all +three flags SEC_DATA, SEC_READONLY, and SEC_RELOC set, and which have a +name equal to a problematic input section (.eh_frame, .gcc_except_table). +That way, we get the same behavior as older elf2flt releases for m68k, +xtensa and riscv64, where we put read-only relocation data in .data, +which was working perfectly fine. + +This exception will not change any behavior on ARM, as the .eh_frame +input section does not have flag SEC_RELOC set. Signed-off-by: Niklas Cassel --- - elf2flt.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) + elf2flt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/elf2flt.c b/elf2flt.c -index 9c32f9a..a680c89 100644 +index e0d7891..39d035f 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -340,8 +340,15 @@ compare_relocs (const void *pa, const void *pb) +@@ -341,8 +341,13 @@ compare_relocs (const void *pa, const void *pb) static bool ro_reloc_data_section_should_be_in_text(asection *s) { @@ -58,10 +61,8 @@ index 9c32f9a..a680c89 100644 - (SEC_DATA | SEC_READONLY | SEC_RELOC); + if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == + (SEC_DATA | SEC_READONLY | SEC_RELOC)) { -+#if defined(TARGET_m68k) || defined(TARGET_riscv64) || defined(TARGET_xtensa) -+ if (!strcmp(".eh_frame", s->name)) ++ if (!strcmp(".eh_frame", s->name) || !strcmp(".gcc_except_table", s->name)) + return false; -+#endif + return true; + } + return false; @@ -69,5 +70,5 @@ index 9c32f9a..a680c89 100644 static uint32_t * -- -2.37.1 +2.39.0 From peter at korsgaard.com Tue Feb 21 20:44:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:44:09 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/tmux: add utf8proc optional dependency Message-ID: <20230221204903.5E9938666E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11374681baa1b7eedc30c5bd04ad3b10c3488155 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x utf8proc is an optional dependency since version 2.3 and https://github.com/tmux/tmux/commit/6c94774b70f72952c4c512e4aa59a207ca1c34f2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 1f618aa388535181c281c85e2b5264532de4ef0f) Signed-off-by: Peter Korsgaard --- package/tmux/tmux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 281b7d8ee6..b1c0af1a83 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -11,6 +11,13 @@ TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_UTF8PROC),y) +TMUX_DEPENDENCIES += utf8proc +TMUX_CONF_OPTS += --enable-utf8proc +else +TMUX_CONF_OPTS += --disable-utf8proc +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS From peter at korsgaard.com Tue Feb 21 20:37:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:37:22 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/upx: security bump to version 4.0.2 Message-ID: <20230221204903.51BEE86670@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3820c4b934ddc90c7f34c923254f0b2c9fad2c4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to cause a denial of service (abort) via a crafted file. Fix CVE-2023-23457: A Segmentation fault was found in UPX in PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a crafted input file allows invalid memory address access that could lead to a denial of service. https://github.com/upx/upx/blob/v4.0.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 02befac8f9404ae30d0d090221d21a8460c82ec7) Signed-off-by: Peter Korsgaard --- package/upx/upx.hash | 2 +- package/upx/upx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 9f7c40c819..7c24906152 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz +sha256 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f upx-4.0.2-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index ef346b2310..6018b0a63d 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPX_VERSION = 4.0.1 +UPX_VERSION = 4.0.2 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ From peter at korsgaard.com Tue Feb 21 20:47:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:47:16 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/xxhash: use MOREFLAGS instead of overriding CFLAGS Message-ID: <20230221204903.6BDB486671@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02ea469db39bb3774093cbcf5c327873febeb0f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Set MOREFLAGS instead of overriding CFLAGS to avoid the following build failure raised since commit 94b66fb49cd57d0863245fbe0a3dc0833e76aad0: /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /tmp/ccabb8cF.o: relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC Fixes: - http://autobuild.buildroot.org/results/953133575d8c13266f1450fa545e70e4a518508d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit bfef88762d19b2fd8f99b55cee5c9ebaf986e1c7) Signed-off-by: Peter Korsgaard --- package/xxhash/xxhash.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 40e3c2696c..75d375a2fa 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -28,8 +28,7 @@ endif define XXHASH_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - CFLAGS="$(TARGET_CFLAGS) -DXXH_NO_INLINE_HINTS" \ - $(XXHASH_TARGETS) + MOREFLAGS=-DXXH_NO_INLINE_HINTS $(XXHASH_TARGETS) endef define XXHASH_INSTALL_STAGING_CMDS From peter at korsgaard.com Tue Feb 21 20:37:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:37:19 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/upx: bump to version 4.0.1 Message-ID: <20230221204903.43D2F8666F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a425a8926c8b546de085ab0f691891005482771 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Drop patch (already in version) - cmake must be used since https://github.com/upx/upx/commit/c7d8b6fed1b551158540e1d2e884dc224fce474c - ucl and zlib are directly included in upx since https://github.com/upx/upx/commit/61e1366122f8d1b9e2434a8103e7af00a35ea902 https://github.com/upx/upx/blob/v4.0.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 1567516d8984a4bddfbee30ee69c771cf3f8e224) Signed-off-by: Peter Korsgaard --- ...1-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch | 80 ---------------------- package/upx/upx.hash | 2 +- package/upx/upx.mk | 22 +----- 3 files changed, 4 insertions(+), 100 deletions(-) diff --git a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch b/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch deleted file mode 100644 index 6fae9cac0e..0000000000 --- a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001 -From: John Reiser -Date: Fri, 11 Dec 2020 13:38:18 -0800 -Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ - -https://github.com/upx/upx/issues/421 - modified: p_lx_elf.cpp - -[Retrieved from: -https://github.com/upx/upx/commit/3781df9da23840e596d5e9e8493f22666802fe6c] -Signed-off-by: Fabrice Fontaine ---- - src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 5 deletions(-) - -diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp -index 182db192f..3a4101cf7 100644 ---- a/src/p_lx_elf.cpp -+++ b/src/p_lx_elf.cpp -@@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack() - int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ]; - if (z_rel && z_rsz) { - unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val); -+ if ((unsigned)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_REL] %#x\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off]; - unsigned relsz = get_te32(&dynseg[-1+ z_rsz].d_val); -+ if ((unsigned)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_RELSZ] %#x\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp); - for (; rp < last; ++rp) { - unsigned r_va = get_te32(&rp->r_offset); -@@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack() - int z_rel = dt_table[Elf64_Dyn::DT_RELA]; - int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ]; - if (z_rel && z_rsz) { -- unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ if ((u64_t)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELA] %#llx\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off]; -- unsigned relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ upx_uint64_t relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ if ((u64_t)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELASZ] %#llx\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp); - for (; rp < last; ++rp) { -- unsigned r_va = get_te64(&rp->r_offset); -+ upx_uint64_t r_va = get_te64(&rp->r_offset); - if (r_va == user_init_ava) { // found the Elf64_Rela -- unsigned r_info = get_te64(&rp->r_info); -+ upx_uint64_t r_info = get_te64(&rp->r_info); - unsigned r_type = ELF64_R_TYPE(r_info); - if (Elf64_Ehdr::EM_AARCH64 == e_machine - && R_AARCH64_RELATIVE == r_type) { -@@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack() - } - else { - char msg[50]; snprintf(msg, sizeof(msg), -- "bad relocation %#x DT_INIT_ARRAY[0]", -+ "bad relocation %#llx DT_INIT_ARRAY[0]", - r_info); - throwCantPack(msg); - } diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 7f3698ca0d..9f7c40c819 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 47774df5c958f2868ef550fb258b97c73272cb1f44fe776b798e393465993714 upx-3.96-src.tar.xz +sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index e693a70db1..ef346b2310 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,28 +4,12 @@ # ################################################################################ -UPX_VERSION = 3.96 +UPX_VERSION = 4.0.1 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING UPX_CPE_ID_VENDOR = upx_project +UPX_SUPPORTS_IN_SOURCE_BUILD = NO -# 0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch -UPX_IGNORE_CVES += CVE-2021-20285 - -HOST_UPX_DEPENDENCIES = host-ucl host-zlib - -# We need to specify all, otherwise the default target only prints a message -# stating to "please choose a target for 'make'"... :-( -define HOST_UPX_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - UPX_UCLDIR=$(HOST_DIR) CXXFLAGS_WERROR= -C $(@D) all -endef - -# UPX has no install procedure, so install it manually. -define HOST_UPX_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/upx.out $(HOST_DIR)/bin/upx -endef - -$(eval $(host-generic-package)) +$(eval $(host-cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 21 20:49:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:49:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast In-Reply-To: <20230221203403.GH2718518@scaer> References: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> <20230221154827.7e737960@windsurf> <20230221200857.GG2718518@scaer> <20230221212634.736f8d70@windsurf> <20230221203403.GH2718518@scaer> Message-ID: <20230221214948.0b7ba737@windsurf> On Tue, 21 Feb 2023 21:34:03 +0100 "Yann E. MORIN" wrote: > The upstream code is (split for readability): > > if (('-Ofast' in c_args or > '-ffast-math' in c_args or > '-ffinite-math-only' in c_args > ) and > not '-fno-finite-math-only' in c_args > ) > > So, if -fno-finite-math-only is in c_args, then the whole condition > should evaluate to false, and thus it should not error out, right? > > Or did I lose more than my grep-fu? ;-) No, tonight your grep-fu is better than mine: you're totally right! :-) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Tue Feb 21 20:50:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:50:08 +0100 Subject: [Buildroot] [PATCH 2/2] boot/barebox: pass required environment variables for reproducible build In-Reply-To: <20230119121004.3416962-3-casey@xogium.me> (Casey Reeves's message of "Thu, 19 Jan 2023 13:10:04 +0100") References: <20230119121004.3416962-1-casey@xogium.me> <20230119121004.3416962-3-casey@xogium.me> Message-ID: <87sfeywxof.fsf@dell.be.48ers.dk> >>>>> "Casey" == Casey Reeves writes: > Barebox makes use of the same variables as the linux kernel does for > handling reproducible build -- KBUILD_BUILD_HOST, > KBUILD_BUILD_TIMESTAMP, KBUILD_BUILD_USER. This patch sets the proper > variables based on linux/linux.mk, and passes them to the make > invocation when building, to ensure a reproducible build is possible > when BR2_REPRODUCIBLE is enabled. > Signed-off-by: Casey Reeves Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:48:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:48:58 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] boot/barebox: pass required environment variables for reproducible build Message-ID: <20230221210052.7D1EB8667C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=caca4a1ff13298736718d3eb6bda4e209550dc2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Barebox makes use of the same variables as the linux kernel does for handling reproducible build -- KBUILD_BUILD_HOST, KBUILD_BUILD_TIMESTAMP, KBUILD_BUILD_USER. This patch sets the proper variables based on linux/linux.mk, and passes them to the make invocation when building, to ensure a reproducible build is possible when BR2_REPRODUCIBLE is enabled. Signed-off-by: Casey Reeves Signed-off-by: Thomas Petazzoni (cherry picked from commit c90bd74ebb264ccc925f10a142ccd82ef63a4601) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index da151d3c25..90be8c1ecc 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -74,6 +74,13 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) +ifeq ($(BR2_REPRODUCIBLE),y) +$(1)_MAKE_ENV += \ + KBUILD_BUILD_USER=buildroot \ + KBUILD_BUILD_HOST=buildroot \ + KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" +endif + ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) $(1)_KCONFIG_DEFCONFIG = $$(call qstrip,$$(BR2_TARGET_$(1)_BOARD_DEFCONFIG))_defconfig else ifeq ($$(BR2_TARGET_$(1)_USE_CUSTOM_CONFIG),y) @@ -121,7 +128,7 @@ endef define $(1)_BUILD_CMDS $$($(1)_BUILD_BAREBOXENV_CMDS) - $$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) + $$($(1)_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) $$($(1)_BUILD_CUSTOM_ENV) endef From peter at korsgaard.com Tue Feb 21 20:48:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:48:49 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] boot/barebox: pass required environment variables for reproducible build Message-ID: <20230221210052.29A158667C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c42880d994c3162efdd583d4a6097538cd185eb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Barebox makes use of the same variables as the linux kernel does for handling reproducible build -- KBUILD_BUILD_HOST, KBUILD_BUILD_TIMESTAMP, KBUILD_BUILD_USER. This patch sets the proper variables based on linux/linux.mk, and passes them to the make invocation when building, to ensure a reproducible build is possible when BR2_REPRODUCIBLE is enabled. Signed-off-by: Casey Reeves Signed-off-by: Thomas Petazzoni (cherry picked from commit c90bd74ebb264ccc925f10a142ccd82ef63a4601) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 6506294d6d..05629bb4e3 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -74,6 +74,13 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) +ifeq ($(BR2_REPRODUCIBLE),y) +$(1)_MAKE_ENV += \ + KBUILD_BUILD_USER=buildroot \ + KBUILD_BUILD_HOST=buildroot \ + KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" +endif + ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) $(1)_KCONFIG_DEFCONFIG = $$(call qstrip,$$(BR2_TARGET_$(1)_BOARD_DEFCONFIG))_defconfig else ifeq ($$(BR2_TARGET_$(1)_USE_CUSTOM_CONFIG),y) @@ -121,7 +128,7 @@ endef define $(1)_BUILD_CMDS $$($(1)_BUILD_BAREBOXENV_CMDS) - $$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) + $$($(1)_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) $$($(1)_BUILD_CUSTOM_ENV) endef From yann.morin.1998 at free.fr Tue Feb 21 21:15:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 21 Feb 2023 22:15:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast In-Reply-To: <20230221214948.0b7ba737@windsurf> References: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> <20230221154827.7e737960@windsurf> <20230221200857.GG2718518@scaer> <20230221212634.736f8d70@windsurf> <20230221203403.GH2718518@scaer> <20230221214948.0b7ba737@windsurf> Message-ID: <20230221211554.GI2718518@scaer> Thomas, All, On 2023-02-21 21:49 +0100, Thomas Petazzoni spake thusly: > On Tue, 21 Feb 2023 21:34:03 +0100 > "Yann E. MORIN" wrote: > > > The upstream code is (split for readability): > > > > if (('-Ofast' in c_args or > > '-ffast-math' in c_args or > > '-ffinite-math-only' in c_args > > ) and > > not '-fno-finite-math-only' in c_args > > ) > > > > So, if -fno-finite-math-only is in c_args, then the whole condition > > should evaluate to false, and thus it should not error out, right? > > > > Or did I lose more than my grep-fu? ;-) > > No, tonight your grep-fu is better than mine: you're totally right! :-) Note however that upstream code is anyway buggy. If CFLAGS contain, in that order: -fno-finite-math-only -ffinite-math-only then the condition will evaluate to false, and thus the test will not abort, but still this would be incorrect, as -ffinite-math-only would win the setting because it comes last... So presumably, we should even be able to do: SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-finite-math-only -ffinite-math-only which would again break the build.... Even if we do not do that ourselves, nothing prevents a suer from providing that in their BR2_TARGET_OPTIMIZATION. But then, we can't protect people from shooting themselves in the foot... ;-) 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 thomas.petazzoni at bootlin.com Tue Feb 21 20:16:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:16:10 +0100 Subject: [Buildroot] [git commit branch/next] package/cmake: disable ccache for host-cmake Message-ID: <20230221212251.E2DB886692@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6c05b47f71a6e140a0743dda276267f653f94f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The upcoming ccache update will depend on host-cmake, so we must ensure host-cmake doesn't use ccache when being built. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/cmake/cmake.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 053658fad6..dc92c8bb4e 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -40,9 +40,16 @@ CMAKE_CONF_OPTS = \ HOST_CMAKE_CFLAGS = $(shell echo $(HOST_CFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%") HOST_CMAKE_CXXFLAGS = $(shell echo $(HOST_CXXFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%") +# We may be a ccache dependency, so we can't use ccache +HOST_CMAKE_CONFIGURE_OPTS = \ + $(HOST_CONFIGURE_OPTS) \ + CC="$(HOSTCC_NOCCACHE)" \ + GCC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" + define HOST_CMAKE_CONFIGURE_CMDS (cd $(@D); \ - $(HOST_CONFIGURE_OPTS) \ + $(HOST_CMAKE_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CMAKE_CFLAGS)" \ ./bootstrap --prefix=$(HOST_DIR) \ --parallel=$(PARALLEL_JOBS) -- \ From thomas.petazzoni at bootlin.com Tue Feb 21 20:16:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:16:19 +0100 Subject: [Buildroot] [git commit branch/next] package/ccache: bump to version 4.7.4 Message-ID: <20230221212251.F261F8660B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7087e5286d8419f4625f5f6e52aa84567c6b7ed0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate to cmake package infrastructure. Add new host-hiredis host-zstd dependencies. Add new ccache dependency exclusions to pkg-generic. Migrate HOST_CCACHE_PATCH_CONFIGURATION to handle updated source files/format. License hashes changed due to migrating urls to https: https://github.com/ccache/ccache/commit/a0f32f161f1b8b9c5d287ca8abe88e3fd1e940a2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/ccache/ccache.hash | 6 +++--- package/ccache/ccache.mk | 38 +++++++++++++++++--------------------- package/pkg-generic.mk | 2 +- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 16cfad602c..9b11f026ec 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400 ccache-3.7.12.tar.xz -sha256 ec6b1a326ff93b2cc21df88a697ae470ff6927a55b8929e7e491b315e1563361 GPL-3.0.txt -sha256 4f63223bcdee822d55a6768cc8399ffe06401d7a03cfe79e1dc305f50dc22c59 LICENSE.adoc +sha256 df0c64d15d3efaf0b4f6837dd6b1467e40eeaaa807db25ce79c3a08a46a84e36 ccache-4.7.4.tar.xz +sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt +sha256 56cf64f68b7b8150300acd79899941615523ea5c56c120e92f5b175b7cc78e3c LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 97aa8b1c75..6b7d57b40c 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,27 +4,19 @@ # ################################################################################ -CCACHE_VERSION = 3.7.12 +CCACHE_VERSION = 4.7.4 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others CCACHE_LICENSE_FILES = LICENSE.adoc GPL-3.0.txt - -# Force ccache to use its internal zlib. The problem is that without -# this, ccache would link against the zlib of the build system, but we -# might build and install a different version of zlib in $(O)/host -# afterwards, which ccache will pick up. This might break if there is -# a version mismatch. A solution would be to add host-zlib has a -# dependency of ccache, but it would require tuning the zlib .mk file -# to use HOSTCC_NOCCACHE as the compiler. Instead, we take the easy -# path: tell ccache to use its internal copy of zlib, so that ccache -# has zero dependency besides the C library. -HOST_CCACHE_CONF_OPTS += --with-bundled-zlib +HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd # We are ccache, so we can't use ccache -HOST_CCACHE_CONF_ENV = \ - CC="$(HOSTCC_NOCCACHE)" \ - CXX="$(HOSTCXX_NOCCACHE)" +HOST_CCACHE_CONF_OPTS += \ + -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER \ + -DZSTD_FROM_INTERNET=OFF \ + -DHIREDIS_FROM_INTERNET=OFF # Patch host-ccache as follows: # - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR @@ -33,13 +25,17 @@ HOST_CCACHE_CONF_ENV = \ # BR2_CCACHE_DIR. # - Change hard-coded last-ditch default to match path in .config, to avoid # the need to specify BR_CACHE_DIR when invoking ccache directly. -# CCache replaces "%s" with the home directory of the current user, -# So rewrite BR_CACHE_DIR to take that into consideration for SDK purpose -HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,\%s/%,$(BR_CACHE_DIR)) +# CCache replaces "home_dir" with the home directory of the current user, +# so rewrite BR_CACHE_DIR to take that into consideration for SDK purpose +HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,%,$(BR_CACHE_DIR)) define HOST_CCACHE_PATCH_CONFIGURATION - sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/ccache.c - sed -i 's,"%s/.ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/conf.c + sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/Config.cpp + sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp + sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp + sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp + sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/Config.cpp + sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/Config.cpp endef HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION @@ -62,7 +58,7 @@ endef HOST_CCACHE_POST_INSTALL_HOOKS += HOST_CCACHE_DO_INITIAL_SETUP endif -$(eval $(host-autotools-package)) +$(eval $(host-cmake-package)) ifeq ($(BR2_CCACHE),y) ccache-stats: host-ccache diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 82187d7db9..d460251f48 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -792,7 +792,7 @@ $(2)_EXTRACT_DEPENDENCIES += \ endif ifeq ($$(BR2_CCACHE),y) -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-hiredis host-pkgconf host-zstd,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd,$(1)),) $(2)_DEPENDENCIES += host-ccache endif endif From thomas.petazzoni at bootlin.com Tue Feb 21 21:24:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:24:06 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/cmake: disable ccache for host-cmake In-Reply-To: <20230109001037.641422-1-james.hilliard1@gmail.com> References: <20230109001037.641422-1-james.hilliard1@gmail.com> Message-ID: <20230221222406.7f4d974d@windsurf> Hello James, On Sun, 8 Jan 2023 17:10:36 -0700 James Hilliard wrote: > The upcoming ccache update will depend on host-cmake, so we must > ensure host-cmake doesn't use ccache when being built. > > Signed-off-by: James Hilliard > --- > package/cmake/cmake.mk | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) I've applied both patches to the next branch. There's quite some trickery in the ccache package itself to tweak the paths, so hopefully it will work alright. In my limited testing, it was working fine. Let's give it some broader testing by having it in the next branch. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 21:24:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:24:36 +0100 Subject: [Buildroot] [git commit branch/next] package/openfpgaloader: bump to version 0.10.0 Message-ID: <20230221212504.A9C898669D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fd1f8a892a89d1b6d27b8e9884d645f71192813 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Also adds libgpiod support. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/openfpgaloader/Config.in | 10 ++++++++++ package/openfpgaloader/openfpgaloader.hash | 2 +- package/openfpgaloader/openfpgaloader.mk | 9 ++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in index 054278c256..4ba01d12d3 100644 --- a/package/openfpgaloader/Config.in +++ b/package/openfpgaloader/Config.in @@ -24,6 +24,16 @@ config BR2_PACAKGE_OPENFPGALOADER_CMSIS comment "openfpgaloader CMSIS-DAP needs udev /dev management and a toolchain w/ NPTL threads" depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS_NPTL +config BR2_PACKAGE_OPENFPGALOADER_LIBGPIOD + bool "libgpiod support" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 # libgpiod + select BR2_PACKAGE_LIBGPIOD + help + openfpgaloader libgpiod support + +comment "openfpgaloader libgpiod needs kernel headers >= 4.8" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + endif comment "openfpgaloader needs a toolchain w/ threads, C++, gcc >= 4.9" diff --git a/package/openfpgaloader/openfpgaloader.hash b/package/openfpgaloader/openfpgaloader.hash index 6c9d8a2b91..a8b537782c 100644 --- a/package/openfpgaloader/openfpgaloader.hash +++ b/package/openfpgaloader/openfpgaloader.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a862a209d696becff915a77512e6a8c22f92d73480a45cc12273d9ad1db60d23 openfpgaloader-0.6.1.tar.gz +sha256 966b4629df86b1d520ddd8a4e0a3fc00060b26b5ab4e172b596bd9d4659a196e openfpgaloader-0.10.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk index 0c39aad687..042b16612e 100644 --- a/package/openfpgaloader/openfpgaloader.mk +++ b/package/openfpgaloader/openfpgaloader.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENFPGALOADER_VERSION = 0.6.1 +OPENFPGALOADER_VERSION = 0.10.0 OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,v$(OPENFPGALOADER_VERSION)) OPENFPGALOADER_LICENSE = Apache-2.0 OPENFPGALOADER_LICENSE_FILES = LICENSE @@ -24,4 +24,11 @@ else OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=OFF endif +ifeq ($(BR2_PACAKGE_OPENFPGALOADER_LIBGPIOD),y) +OPENFPGALOADER_DEPENDENCIES += libgpiod +OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=ON +else +OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=OFF +endif + $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 21 21:25:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:25:08 +0100 Subject: [Buildroot] [PATCH] package/openfpgaloader: bump to version 0.10.0 In-Reply-To: <1677000436-53977-1-git-send-email-gwenj@trabucayre.com> References: <1677000436-53977-1-git-send-email-gwenj@trabucayre.com> Message-ID: <20230221222508.6f2ba8f0@windsurf> On Tue, 21 Feb 2023 18:27:16 +0100 Gwenhael Goavec-Merou wrote: > From: Gwenhael Goavec-Merou > > Also adds libgpiod support. > > Signed-off-by: Gwenhael Goavec-Merou > --- > package/openfpgaloader/Config.in | 10 ++++++++++ > package/openfpgaloader/openfpgaloader.hash | 2 +- > package/openfpgaloader/openfpgaloader.mk | 9 ++++++++- > 3 files changed, 19 insertions(+), 2 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 21:25:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:25:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/mutt: fix build failure when host provides an old gpgrt-config In-Reply-To: <20230221172829.3407641-1-fontaine.fabrice@gmail.com> References: <20230221172829.3407641-1-fontaine.fabrice@gmail.com> Message-ID: <20230221222552.17c73eca@windsurf> On Tue, 21 Feb 2023 18:28:29 +0100 Fabrice Fontaine wrote: > As already done for gnupg2 in commit > d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8, apply the same fix to mutt to > avoid the following build failure: > > /home/thomas/autobuild/instance-2/output-1/host/bin/i686-buildroot-linux-uclibc-gcc -DPKGDATADIR=\"/usr/share/mutt\" -DSYSCONFDIR=\"/etc\" -DBINDIR=\"/usr/bin\" -DMUTTLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H=1 -I. -I. -I. -I/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -pedantic -Wno-long-long -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -c -o txt2c.o txt2c.c > i686-buildroot-linux-uclibc-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' > > Fixes: > - http://autobuild.buildroot.org/results/98010be4ef70e58819ea2d17315bdac66a619b23 > > Signed-off-by: Fabrice Fontaine > --- > package/mutt/mutt.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 21:25:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:25:31 +0100 Subject: [Buildroot] [git commit] package/mutt: fix build failure when host provides an old gpgrt-config Message-ID: <20230221212652.F253A866A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a39e328bb2835cd157ee1622d5117ba252d44733 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As already done for gnupg2 in commit d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8, apply the same fix to mutt to avoid the following build failure: /home/thomas/autobuild/instance-2/output-1/host/bin/i686-buildroot-linux-uclibc-gcc -DPKGDATADIR=\"/usr/share/mutt\" -DSYSCONFDIR=\"/etc\" -DBINDIR=\"/usr/bin\" -DMUTTLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H=1 -I. -I. -I. -I/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -pedantic -Wno-long-long -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -c -o txt2c.o txt2c.c i686-buildroot-linux-uclibc-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' Fixes: - http://autobuild.buildroot.org/results/98010be4ef70e58819ea2d17315bdac66a619b23 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mutt/mutt.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 0a98396d88..5cf1b6bad2 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -37,6 +37,10 @@ MUTT_DEPENDENCIES += libgpgme MUTT_CONF_OPTS += \ --enable-gpgme \ --with-gpgme-prefix=$(STAGING_DIR)/usr + +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +MUTT_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config else MUTT_CONF_OPTS += --disable-gpgme endif From colin.foster at in-advantage.com Tue Feb 21 21:36:04 2023 From: colin.foster at in-advantage.com (Colin Foster) Date: Tue, 21 Feb 2023 13:36:04 -0800 Subject: [Buildroot] [PATCH] package/rauc-hawkbit-updater: new package In-Reply-To: <20230208185516.858096-1-colin.foster@in-advantage.com> References: <20230208185516.858096-1-colin.foster@in-advantage.com> Message-ID: On Wed, Feb 08, 2023 at 10:55:16AM -0800, Colin Foster wrote: > Add useful tool for bridging RAUC with the Hawkbit API. > > Signed-off-by: Colin Foster I'm just sending this follow up to see if it fell through the cracks. I can re-send otherwise. I think Eric's email bounced, so hopefully that isn't the issue. > --- > package/Config.in | 1 + > package/rauc-hawkbit-updater/Config.in | 14 ++++++++++++++ > .../rauc-hawkbit-updater.hash | 3 +++ > .../rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 15 +++++++++++++++ > 4 files changed, 33 insertions(+) > create mode 100644 package/rauc-hawkbit-updater/Config.in > create mode 100644 package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash > create mode 100644 package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk > > diff --git a/package/Config.in b/package/Config.in > index 511e691ed3..84e5efa856 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2677,6 +2677,7 @@ menu "System tools" > source "package/quota/Config.in" > source "package/quotatool/Config.in" > source "package/rauc/Config.in" > + source "package/rauc-hawkbit-updater/Config.in" > source "package/rsyslog/Config.in" > source "package/runc/Config.in" > source "package/s390-tools/Config.in" > diff --git a/package/rauc-hawkbit-updater/Config.in b/package/rauc-hawkbit-updater/Config.in > new file mode 100644 > index 0000000000..bd7b8d7cf5 > --- /dev/null > +++ b/package/rauc-hawkbit-updater/Config.in > @@ -0,0 +1,14 @@ > +config BR2_PACKAGE_RAUC_HAWKBIT_UPDATER > + bool "rauc-hawkbit-updater" > + depends on BR2_PACKAGE_RAUC > + depends on BR2_PACKAGE_JSON_GLIB > + help > + rauc-hawkbit-updater is a link between Pengutronix > + RAUC and the Eclipse Hawkbit API. Hawkbit can > + communicate to remote update servers, and use the > + d-bus interface to trigger updates from RAUC. > + > + http://rauc.io/ > + > +comment "rauc-hawkbit-updater needs rauc and json-glib" > + depends on !BR2_PACKAGE_RAUC || !BR2_PACKAGE_JSON_GLIB > diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash > new file mode 100644 > index 0000000000..c65ead3784 > --- /dev/null > +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 42318e96a464e6c716edb45c48bd3ec3b874462973db902fbe099a395e4acb4b rauc-hawkbit-updater-1.3.tar.xz > +sha256 041234c81fd6fe6c531ea1a886b9e740b9ee06759d1a910a14edbd06f4aa62c7 LICENSE > diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk > new file mode 100644 > index 0000000000..5a74181361 > --- /dev/null > +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk > @@ -0,0 +1,15 @@ > +############################################################################### > +# > +# rauc-hawkbit-updater > +# > +############################################################################### > + > +RAUC_HAWKBIT_UPDATER_VERSION = 1.3 > +RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/releases/download/v$(RAUC_HAWKBIT_UPDATER_VERSION) > +RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz > +RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 > +RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE > +RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix > +RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib > + > +$(eval $(meson-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Tue Feb 21 21:34:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:34:27 +0100 Subject: [Buildroot] [git commit branch/next] boot/arm-trusted-firmware: allow using Barebox as BL33 Message-ID: <20230221214836.AEDE9866B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48d9042e5d2e0bc8bd0efc3a2516b156c4b89190 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since version 2022.04.0, Barebox now supports a generic image built for platforms, to be used as BL33 to generate FIP images. This patch makes it available as a choice of BL33 to be used with ATF and is based on the similar work put into U-Boot as BL33. Signed-off-by: Casey Reeves Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 21 +++++++++++++++++++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 6 ++++++ 2 files changed, 27 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index a9b9bbcc5a..cb54c6c9d8 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -129,6 +129,27 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE endchoice +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 + bool "Use Barebox as BL33" + depends on BR2_TARGET_BAREBOX + help + This option allows to embed the Barebox generic BL33 image in + the ARM Trusted Firmware. It ensures that the Barebox package + gets built before ATF, and that the appropriate BL33 + variable pointing to the generic bl33 image is passed + when building ATF. + +if BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE + string "Barebox BL33 image name" + default "*-generic-bl33.img" + help + Name of the Barebox BL33 image to include in ATF, it must + have been installed to BINARIES_DIR by the Barebox package. + +endif + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 bool "Use U-Boot as BL33" depends on BR2_TARGET_UBOOT diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 1164c81410..648f62ed85 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -105,6 +105,12 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += AARCH32_SP=optee endif endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33),y) +ARM_TRUSTED_FIRMWARE_BAREBOX_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE)) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_BAREBOX_BIN) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += barebox +endif + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33),y) ARM_TRUSTED_FIRMWARE_DEPENDENCIES += edk2 # Since the flash device name vary between platforms, we use the variable From thomas.petazzoni at bootlin.com Tue Feb 21 21:48:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:48:40 +0100 Subject: [Buildroot] [PATCH v2] boot/arm-trusted-firmware: Barebox available as BL33 In-Reply-To: <20230119185041.3430421-1-casey@xogium.me> References: <20230119183026.3428277-1-casey@xogium.me> <20230119185041.3430421-1-casey@xogium.me> Message-ID: <20230221224840.668f2559@windsurf> On Thu, 19 Jan 2023 19:50:40 +0100 Casey Reeves wrote: > Since version 2022.04.0, Barebox now support a generic image built for > platforms, to be used as BL33 to generate FIP images. This patch makes > it available as choice of BL33 to be used with ATF and is based on the > similar work put into U-Boot as BL33. > > Signed-off-by: Casey Reeves > > --- > Changes v1 -> v2: > - fixed quoting issue in the default image name > --- > boot/arm-trusted-firmware/Config.in | 21 +++++++++++++++++++ > .../arm-trusted-firmware.mk | 6 ++++++ > 2 files changed, 27 insertions(+) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 21:49:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:49:03 +0100 Subject: [Buildroot] [PATCH] boot/arm-trusted-firmware: introduce a choice to select the BL33 image Message-ID: <20230221214904.454053-1-thomas.petazzoni@bootlin.com> We now have 3 different options to select an image as the BL33 stage of TF-A: Barebox, U-Boot or EDK2. Technically speaking, they are mutually exclusive: they all specify a BL33= variable to the TF-A build, and TF-A can only support a single BL33 stage. However, as pointed out by Vincent Fazio in [0] there is nothing that prevents selecting Barebox, U-Boot and EDK2 together, even though it doesn't make sense. To address this, this commit introduces a choice...endchoice block, into which the Barebox, U-Boot and EDK2 options are moved. An additional "none" option is added, which is the default, and corresponds to not having any BL33 image. Since we keep the same name for the options, no legacy handling is necessary. [0] https://lore.kernel.org/buildroot/PH1P110MB1603A4AA1638838DA56BAA069FDA9 at PH1P110MB1603.NAMP110.PROD.OUTLOOK.COM/ Reported-by: Vincent Fazio Cc: Vincent Fazio Cc: Casey Reeves Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 57 +++++++++++++++++------------ 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index cb54c6c9d8..a5ac987172 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -129,8 +129,17 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE endchoice +choice + prompt "BL33" + default BR2_TARGET_ARM_TRUSTED_FIRMWARE_NONE_AS_BL33 + help + Select the image to include as BL33. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NONE_AS_BL33 + bool "None" + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 - bool "Use Barebox as BL33" + bool "Barebox" depends on BR2_TARGET_BAREBOX help This option allows to embed the Barebox generic BL33 image in @@ -139,6 +148,30 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 variable pointing to the generic bl33 image is passed when building ATF. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 + bool "U-Boot" + depends on BR2_TARGET_UBOOT + help + This option allows to embed u-boot.bin as the BL33 part of + the ARM Trusted Firmware. It ensures that the u-boot package + gets built before ATF, and that the appropriate BL33 + variable pointing to u-boot.bin is passed when building ATF. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 + bool "EDK2" + depends on BR2_TARGET_EDK2 + help + This option allows to embed EDK2 as the BL33 part of + the ARM Trusted Firmware. It ensures that the EDK2 package + gets built before ATF, and that the appropriate BL33 + variable pointing to the EDK2 is passed when building ATF. + + Do not choose this option if you intend to build ATF and EDK2 + for the 'qemu_sbsa' platform. In this case, due to the EDK2 + build system, the dependency between ATF and EDK is reversed. + +endchoice + if BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE @@ -150,15 +183,6 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE endif -config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 - bool "Use U-Boot as BL33" - depends on BR2_TARGET_UBOOT - help - This option allows to embed u-boot.bin as the BL33 part of - the ARM Trusted Firmware. It ensures that the u-boot package - gets built before ATF, and that the appropriate BL33 - variable pointing to u-boot.bin is passed when building ATF. - if BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE @@ -170,19 +194,6 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE endif -config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 - bool "Use EDK2 as BL33" - depends on BR2_TARGET_EDK2 - help - This option allows to embed EDK2 as the BL33 part of - the ARM Trusted Firmware. It ensures that the EDK2 package - gets built before ATF, and that the appropriate BL33 - variable pointing to the EDK2 is passed when building ATF. - - Do not choose this option if you intend to build ATF and EDK2 - for the 'qemu_sbsa' platform. In this case, due to the EDK2 - build system, the dependency between ATF and EDK is reversed. - config BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW bool "Include NXP RCW in BL2" depends on BR2_PACKAGE_HOST_QORIQ_RCW -- 2.39.1 From thomas.petazzoni at bootlin.com Tue Feb 21 21:54:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:54:06 +0100 Subject: [Buildroot] [External] - [PATCH v2] boot/arm-trusted-firmware: Barebox available as BL33 In-Reply-To: References: <20230119183026.3428277-1-casey@xogium.me> <20230119185041.3430421-1-casey@xogium.me> Message-ID: <20230221225406.1bb8d63b@windsurf> Hello Vincent, On Mon, 6 Feb 2023 13:36:09 +0000 Vincent Fazio wrote: > Does TFA allow multiple BL33 images to be defined? I don't see a guard if some other package such as U-Boot or EDK2 has been enabled as well. > If only one image is supported but multiple images are supplied via BL33 on the make command line, is it last declared wins? This is absolutely true, so I have submitted https://patchwork.ozlabs.org/project/buildroot/patch/20230221214904.454053-1-thomas.petazzoni at bootlin.com/ to move to a choice..endchoice in Config.in to select the BL33. Thanks for reporting this! Best regards, 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 Feb 21 21:59:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:59:18 +0100 Subject: [Buildroot] [git commit branch/next] boot/grub2: add details on grub.cfg location Message-ID: <20230221215944.C9336866C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7692d5beb2d9e4d0b463f0f26a177829e5bcc1ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: AndreiCherniaev Signed-off-by: Thomas Petazzoni --- boot/grub2/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in index 92b5dd501b..f05f33ccc7 100644 --- a/boot/grub2/Config.in +++ b/boot/grub2/Config.in @@ -27,6 +27,10 @@ config BR2_TARGET_GRUB2 Amongst others, GRUB2 offers EFI support, which GRUB Legacy doesn't provide. + The file boot/grub2/grub.cfg is used by default as the Grub + configuration file. It can be overridden using a rootfs + overlay or post-build script. + For additional notes on using Grub 2 with Buildroot, see boot/grub2/readme.txt From thomas.petazzoni at bootlin.com Tue Feb 21 22:01:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 23:01:55 +0100 Subject: [Buildroot] [PATCH] boot/grub2: add information where is configuration file In-Reply-To: <20230109073353.11701-1-cherniaev.andrei@kairo.space> References: <20230109073353.11701-1-cherniaev.andrei@kairo.space> Message-ID: <20230221230155.0e21a186@windsurf> Hello Andrei, On Mon, 9 Jan 2023 16:33:52 +0900 AndreiCherniaev wrote: > diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in > index 92b5dd501b..bf0400c08f 100644 > --- a/boot/grub2/Config.in > +++ b/boot/grub2/Config.in > @@ -125,6 +125,7 @@ config BR2_TARGET_GRUB2_BUILTIN_CONFIG_PC > into the Grub image itself. This allows to set the root > device and other configuration parameters, but however menu > entries cannot be described in this embedded configuration. > + Use boot/grub2/grub.cfg to edit menu entries. Actually no, you probably don't want to change boot/grub2/grub.cfg: it is part of Buildroot itself, and you probably don't want to have project-specific changes in there. Instead, you should override it using a rootfs overlay (if grub.cfg is in $(TARGET_DIR)/boot) or a post-build/post-image script (if it's in the EFI partition). I have nevertheless applied your patch, but after tweaking the message in the help text, and moving it to the main Grub2 option. See: https://gitlab.com/buildroot.org/buildroot/-/commit/7692d5beb2d9e4d0b463f0f26a177829e5bcc1ec Best regards, Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Feb 21 22:47:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 23:47:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/gcc/gcc-initial: fix typo Message-ID: <20230221224747.117361-1-fontaine.fabrice@gmail.com> Fix typo: am internal step -> an internal step Signed-off-by: Fabrice Fontaine --- package/gcc/gcc-initial/gcc-initial.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index ebd8e8f017..a8ac20c5d8 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -9,7 +9,7 @@ GCC_INITIAL_SITE = $(GCC_SITE) GCC_INITIAL_SOURCE = $(GCC_SOURCE) # We do not have a 'gcc' package per-se; we only have two incarnations, -# gcc-initial and gcc-final. gcc-initial is just am internal step that +# gcc-initial and gcc-final. gcc-initial is just an internal step that # users should not care about, while gcc-final is the one they shall see. HOST_GCC_INITIAL_DL_SUBDIR = gcc -- 2.39.0 From christian at paral.in Wed Feb 22 07:23:37 2023 From: christian at paral.in (Christian Stewart) Date: Tue, 21 Feb 2023 23:23:37 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/docker-cli-buildx: new package Message-ID: <20230222072337.2953461-1-christian@paral.in> buildx is a docker CLI plugin implementing extended build features. buildx is the default builder as of Docker v23.x, and if the plugin is not present, the CLI will output an error warning that it is using the deprecated built-in builder instead of the buildx builder. However, buildx is a separate repository from docker-cli: it is a plugin that needs to be installed at /usr/lib/docker/cli-plugins on the target. https://github.com/docker/buildx Signed-off-by: Christian Stewart --- package/Config.in | 1 + package/docker-cli-buildx/Config.in | 15 ++++++++ .../docker-cli-buildx/docker-cli-buildx.hash | 3 ++ .../docker-cli-buildx/docker-cli-buildx.mk | 36 +++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 package/docker-cli-buildx/Config.in create mode 100644 package/docker-cli-buildx/docker-cli-buildx.hash create mode 100644 package/docker-cli-buildx/docker-cli-buildx.mk diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..140c2417d9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2639,6 +2639,7 @@ menu "System tools" source "package/ddrescue/Config.in" source "package/debianutils/Config.in" source "package/docker-cli/Config.in" + source "package/docker-cli-buildx/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" source "package/earlyoom/Config.in" diff --git a/package/docker-cli-buildx/Config.in b/package/docker-cli-buildx/Config.in new file mode 100644 index 0000000000..a6b343a794 --- /dev/null +++ b/package/docker-cli-buildx/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_DOCKER_CLI_BUILDX + bool "docker-cli-buildx" + 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 + select BR2_PACKAGE_DOCKER_CLI + help + buildx is a Docker CLI plugin for extended build capabilities with BuildKit. + + https://github.com/docker/buildx + +comment "docker-cli-buildx needs a 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_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-cli-buildx/docker-cli-buildx.hash b/package/docker-cli-buildx/docker-cli-buildx.hash new file mode 100644 index 0000000000..6a360a5ead --- /dev/null +++ b/package/docker-cli-buildx/docker-cli-buildx.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 e21ce4b222cfcc5fe981a1ee51fca1f7c7d59de0f1911ae3f64f6d9a969695a3 docker-cli-buildx-0.10.3.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/docker-cli-buildx/docker-cli-buildx.mk b/package/docker-cli-buildx/docker-cli-buildx.mk new file mode 100644 index 0000000000..9aafcac85e --- /dev/null +++ b/package/docker-cli-buildx/docker-cli-buildx.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# docker-cli-buildx +# +################################################################################ + +DOCKER_CLI_BUILDX_VERSION = 0.10.3 +DOCKER_CLI_BUILDX_SITE = $(call github,docker,buildx,v$(DOCKER_CLI_BUILDX_VERSION)) + +DOCKER_CLI_BUILDX_LICENSE = Apache-2.0 +DOCKER_CLI_BUILDX_LICENSE_FILES = LICENSE + +DOCKER_CLI_BUILDX_DEPENDENCIES = host-pkgconf + +DOCKER_CLI_BUILDX_BUILD_TARGETS = cmd/buildx +DOCKER_CLI_BUILDX_GOMOD = github.com/docker/buildx + +DOCKER_CLI_BUILDX_LDFLAGS = \ + -X $(DOCKER_CLI_BUILDX_GOMOD)/version.Revision=$(DOCKER_CLI_BUILDX_VERSION) \ + -X $(DOCKER_CLI_BUILDX_GOMOD)/version.Version=$(DOCKER_CLI_BUILDX_VERSION) + +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_BUILDX_FIX_VENDORING + printf "module $(DOCKER_CLI_BUILDX_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef +DOCKER_CLI_BUILDX_POST_EXTRACT_HOOKS += DOCKER_CLI_BUILDX_FIX_VENDORING + +define DOCKER_CLI_BUILDX_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/bin/buildx \ + $(TARGET_DIR)/usr/lib/docker/cli-plugins/buildx +endef + +$(eval $(golang-package)) -- 2.39.2 From thomas.petazzoni at bootlin.com Wed Feb 22 07:37:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 07:37:02 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-21 Message-ID: <20230222073710.0E33941762@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-21 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 12 | 15 | 0 | 27 | master | 137 | 152 | 3 | 292 | next | 18 | 23 | 0 | 41 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 8 glibc-2.36-81-g4f4d7a13edfd... | 7 host-binutils-2.38 | 7 linux-6.1.11 | 7 elfutils-0.186 | 6 fluent-bit-2.0.9 | 4 host-go-1.19.6 | 4 linux-5.10.162-cip24 | 4 perl-5.36.0 | 4 unknown | 4 gobject-introspection | 3 host-pahole-1.24 | 3 libglib2-2.72.3 | 3 network-manager-1.40.10 | 3 olsr-0.9.8 | 3 systemd-252.4 | 3 uqmi-0a19b5b77140465c29e2af... | 3 check-0.15.2 | 2 coreutils-9.1 | 2 dc3dd-7.2.641 | 2 host-gdb-arc-2020.09-releas... | 2 host-rust-1.67.0 | 2 libgcrypt-1.10.1 | 2 libgpg-error-1.46 | 2 linux-5.10.162-cip24-rt10 | 2 mutt-2.2.9 | 2 sudo-1.9.12p2 | 2 uccp420wlan-6.9.1 | 2 uclibc-ng-test-6790eafe897b... | 2 ulog-0389d243352255f6182326... | 2 ace-7.0.6 | 1 asterisk-16.29.1 | 1 bat-0.19.0 | 1 collectd-5.12.0 | 1 ding-libs-0.6.2 | 1 efivar-38 | 1 ffmpeg-4.4.3 | 1 fftw-quad-3.3.8 | 1 file-5.43 | 1 freerdp-2.10.0 | 1 fs/axfs/axfs.mk:32: /home/t... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gerbera-1.10.0 | 1 glmark2-06e78b67702b5413335... | 1 gnuradio-3.10.4.0 | 1 host-gcc-final-10.4.0 | 1 host-wine-7.0 | 1 janet-1.26.0 | 1 jemalloc-5.3.0 | 1 libabseil-cpp-20220623.1 | 1 libev-4.33 | 1 libuhttpd-3.14.1 | 1 libunwind-1.6.2 | 1 libxml2-2.10.3 | 1 linux-pam-1.5.2 | 1 lirc-tools-0.10.2 | 1 ltp-testsuite-20220930 | 1 matio-1.5.23 | 1 mesa3d-22.3.4 | 1 mxs-bootlets-10.12.01 | 1 netsurf-3.10 | 1 openblas-0.3.21 | 1 pcre2-10.42 | 1 php-8.2.3 | 1 proxychains-ng-4.16 | 1 pv-1.6.20 | 1 python-numpy-1.23.5 | 1 rdma-core-44.0 | 1 rtl_433-22.11 | 1 sigrok-cli-0.7.2 | 1 speechd-0.11.4 | 1 toolchain-external-codescap... | 1 xenomai-3.0.10 | 1 xfsprogs-5.14.2 | 1 xvisor-0.3.1 | 1 zabbix-6.2.7 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/7f40d6dde03134238151c248fbbd66e4713546cb | ORPH powerpc64le | asterisk-16.29.1 | NOK | http://autobuild.buildroot.net/results/97c6e74cffc06c0e7ab757d9e9470100edec9198 | mips | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/7632451fc322cc125e7b873167a5aeab7341ad3f | mips | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/97c6e6cdf8346c1b08fb6e4b44cc4fa6a29b6a4d | ORPH i686 | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/a2b265f02cd14a4687312259e0ae0adecd8aa585 | ORPH x86_64 | collectd-5.12.0 | NOK | http://autobuild.buildroot.net/results/91b1886c9dcbeb11f0e52cbdad03ea12a233dca5 | sh4a | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/95379249acac7d328f215c48700b9d6557bc2521 | ORPH sh4a | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/1df8a8d804b358c4ffcaba8581a20ee1404a4d3b | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/509103bddf96936928a7f1332e041bc2b95e8cae | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/ae64181ae51dafeb22be30ab98ded83a190c82da | ORPH arc | ding-libs-0.6.2 | NOK | http://autobuild.buildroot.net/results/7d38d90b72f3a4b8cffcba3c65e301b9ac462119 | mips64el | efivar-38 | NOK | http://autobuild.buildroot.net/results/f2da14f91dc602a32dd5b2b7bdf3d3aa43afa7f4 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/5aa9f0f466d09fbff69085059c66dae32aff515c | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/0b612c682c605db5bd3e8b2cb0ca0b2b7dc1f651 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/84873ce870309ea33962c4fa4ca666040323e208 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/60f8f264c9e27e3c7a792df74cbd208281321a62 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/51e78ed823820f4e3a4032f86f6d6725dfba0667 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/ceef84f4d86e7ac2d62c7cdc98a90a9b920d6216 | ORPH arm | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/4abfe6b56d94f79c8cfb56f9accf7121245080c9 | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/aab750c13efd25ec414885d72cedc41b141c0ead | ORPH armeb | file-5.43 | NOK | http://autobuild.buildroot.net/results/1dff61124fadb65f96816d8521f69ca0ea3ec0b8 | ORPH x86_64 | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/894cd923baa25643d9aea21678c4bca105e86b45 | s390x | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/170afd36536aef86755b48b5f274bad35f9aef48 | powerpc64 | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/3d47f9ea8dd9ce7fe8413f06ff67ef9bc28cbfb7 | microblaze | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/b1b0d02876d9760a193e3b0f60a3ea5ffab14830 | mips64 | freerdp-2.10.0 | NOK | http://autobuild.buildroot.net/results/e96848576ac292799636abe7485c37aa54196a2c | i686 | fs/axfs/axfs.mk:32: /home/t... | NOK | http://autobuild.buildroot.net/results/e9b489fa8d6c2e4075a3e30c23e22f6f133c51a0 | sh4aeb | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/bd5c4da18f4191c7d4c98ef0a5f3a68e47aa0f6d | x86_64 | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/bafc2c9127673569d67bfb74c70302283428da7b | mips64el | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/bb78e1253bdfb6d24ab0611b25e98eb411dc6346 | mips | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/8205140af8e774c6a9eaddf4c7091194ac05082b | arceb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/da346a8bbb94dd1698126d6b9942691315063920 | microblaze | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/bb2cd65d22ee996c994ca17a2e4510bb8e93b0cc | mips64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/3a41e94e88cf5dc7ff2886b4907ebfda7b5b06cb | aarch64_be | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/fee875dfc8965d2b7b915a5e4697d9a74f2bd6d0 | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/d2a1088939052a538a14eccfab2c2a33c03da1d3 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b97fabce6ffe19854837649ea37763475d4b8290 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/8bf7b39d5632305ac0277480e03fa6e50943ba3f | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/ab09697b65bdd6d04f2089f9f48403ab9e52ef39 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/a07d4a8d11357a29e081e3e41da0d13161137a29 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/83d9608457a9858fbcf5ec08ba754959bda13238 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/62e13d92d28bc966e7a9cfe4118d3f6c4741d01a | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b807fa9bff3e32de6053c3c79501e5d85103b20c | aarch64 | glmark2-06e78b67702b5413335... | NOK | http://autobuild.buildroot.net/results/b3245c4ee8e0b3592b09e0bc57bc0928018936c2 | i686 | gnuradio-3.10.4.0 | NOK | http://autobuild.buildroot.net/results/047866cdd799090db4e93620ed58638d52a96f65 | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/fd6b9990f359f12fa9a283752a3f02c087b8e793 | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/4db435e44a620396e32ae1dccf8ff0c4a34f62d5 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/297da024b72322a1321ba18bec050b0e51bddb90 | powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0cc5693888bda210cc0a603a24d0ef7236601042 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/96ff10b0d3f3e5b95a20c9c532494d6b7f6a33d3 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7894e8d382774ff354ac6b1b1dfd4e4c1eafa7f5 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/c82a01af19a244215ab7f46a1ea5c03e7b37928c | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/b3341b28d21885078368e829773e9dd4ca9e8769 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/ca19947023641b027f057b5c06eb5e6cb84f57ff | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3269e501df5c3d2b04b05f7f48d5271666253238 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/52169862bb9ae73edf6ee1d9605552770aa1de4e | ORPH xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/5c01104910fe7eb1b592efc054cfdc988bb1b461 | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/77c677e86e4b671bb38314523f0e54ff174e1dd9 | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1b0333984b1c90a219b9801b6f2690f938194f61 | nios2 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2f6544193846822416e0d126e2e273f72d5afab4 | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/ff4a2fa691da6f4b87e68d6fe0b62c1051103e15 | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6f3a5b3e42d1ee0bf494fd6d862aa744d61bd006 | or1k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e5fd96ff62e529bdcc1b92c52c0b09f4d4ccef44 | microblazeel | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/7249ccf43f466f346e6a0355081a7b2304bb1cc0 | arceb | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/ced6dec91623b0b572a02dd662ee02b2059c07a3 | ORPH arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/0070763ac9d3f54e108bf8366073e4bb520f8e8e | ORPH mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/ed91bdabe4f1904ba1d94682a10a2d67685e7950 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e86d106113f7072e765a6af633cc16009e8f02da | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/537626cd91f349974d119025492f236878d49305 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/bfbd0c6c80a0c2799ff6ed5485cf7e233664d07c | microblaze | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ee95db1c3b740f0d0b4e1e25d7c7c2299a30093a | sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/dc026c4b0f6311b5516d1572f6634a59e60af352 | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/127ae88888cf9d3457c7daf5b4f98f6984ed2485 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/46f734aece37922ad25cecfdf99df94aa09eec9a | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/8a5b6d8cd40d25f8e6279df9949a2480347f33ea | i686 | host-wine-7.0 | NOK | http://autobuild.buildroot.net/results/62228252348e33d7b0501596c329bd8eb4828d99 | riscv64 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/20108e76990d8af7f47d474eadbbea8562ef6728 | sh4a | jemalloc-5.3.0 | NOK | http://autobuild.buildroot.net/results/3de02468e8822d875670f03c5d30322df50fc225 | mips64el | libabseil-cpp-20220623.1 | NOK | http://autobuild.buildroot.net/results/7d8ddb2726483fc5711cbed1a51a3dc7d726614e | arm | libev-4.33 | NOK | http://autobuild.buildroot.net/results/1c597c9da724d6cac06b09b1ecd456a28440a3a3 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/2e63572493cbc7c676085dd4c08cb1b19b390282 | ORPH armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/4b96f4e41724e5c9c806a6c7df397a58d1ae1b1e | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/f2ec691eed8220620fc16bbf9a7832d1c06fad62 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/403457e4dfe0c39112b6b9f900ce9a8718b1d4cf | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/bdfc093d0a8ed7c6084f414f59ace240d5619fd2 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/84bcb4726bafe55ee8587bf0b38121153d625811 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/99abe06cfea2d143a722b4a515f9c5a13faf3674 | ORPH mips64 | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/aaf9b7a3ddf2eb8ab322b167f09f184f0dfb75b3 | arm | libunwind-1.6.2 | NOK | http://autobuild.buildroot.net/results/1175e15122506113ac85051c4ec435a69415f6ef | ORPH armeb | libxml2-2.10.3 | NOK | http://autobuild.buildroot.net/results/9cf1fa9e27b9a79a36c9732deaac5e3a2f19f499 | mips64 | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/8ae153d06313c2bb9033ff06018549ffa9707c02 | ORPH mips64el | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/e493ba5c49858f5cecdb164a95f55a380d6c19aa | ORPH mips64 | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/8d9eeaa33f8a82cac1acd324c2fab03180fe0f1d | ORPH arceb | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/a57e329a9882a39209439b7061843ecb4fbafafd | ORPH m68k | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/12f3281312eb920a27c5c668c40354b2d3b37d79 | ORPH mips64 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/8f345b8e489af415059f71d5a591db74d4c9eee9 | ORPH sparc | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/ecbd8057145cf3f4ae49619883854b5885d25280 | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/08ed0f5a51752c3e4bb98f4da01f2ce863bb0831 | ORPH or1k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4d1411950519ede2336637c43c468db2ca3ad90a | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/69d963ee153f5af43aac221dc98dc26956d99d94 | ORPH mipsel | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/a47b8ff3183489b9c5e3daf544281178d61bad2d | ORPH powerpc64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4370b26c25e4f4a938ab4b0aa63038b16e4961f5 | ORPH arceb | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/3cfe26ea27ebc447409fd9d0ee4db5bec97ab1e4 | ORPH xtensa | linux-pam-1.5.2 | NOK | http://autobuild.buildroot.net/results/011bf863339450d8b2b6665d42c2cd56bf147c93 | ORPH microblaze | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/df75af1cd7cc351332b32ec3d75c48718b6db8c8 | ORPH x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/5a2afd7b4c7eb9025f50df6b75aa9963335f7527 | nios2 | matio-1.5.23 | NOK | http://autobuild.buildroot.net/results/65e3fe45e1b049e53f31db884627982045a3f4ae | powerpc | mesa3d-22.3.4 | NOK | http://autobuild.buildroot.net/results/8077f4b8c2dd6f3824d7aa498843c3afabdf3673 | sparc64 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/f0724f3a8fcf79620d7af9d756af37d762608712 | i686 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/98010be4ef70e58819ea2d17315bdac66a619b23 | arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/d3a6a492638b4305cac33273fd8de2e74351d9e3 | ORPH powerpc64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/19942f35c9a6cdb72c9a386711f18bcb43bd7ba1 | or1k | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/9eef5574efbbb6d651e04079467724bc643c497a | ORPH powerpc64le | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/896879c8e8ce022556ee834216ced2f962ff279c | ORPH microblaze | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/cf61c42d5be29c132ae8e963151d7d30e0037a32 | ORPH m68k | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/6f4744d1e49cd0a59f039ee22d2085dd28925343 | ORPH s390x | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/53dd28d062f630b30aa122c1ce1203aba9ef9211 | ORPH sh4a | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/a33b79e1fce7c7dafef55bb8e6794c488721544b | ORPH i686 | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/6c8b926e497af3c4a6b9bd965c71b8323913ae0c | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/00d3d815b00778d7c67d76461688e77689327949 | ORPH aarch64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/de41975fa2590e13a558642dc67cd80c9d512c9c | mips64el | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/157a4dda7ffe397f72f3dbb18fb34b480d482862 | arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/a994142c97e5de0ba00275f135ef1f00e9a7e758 | powerpc64le | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/98de64b42e5b838a130d365e369c13007235117c | microblazeel | php-8.2.3 | NOK | http://autobuild.buildroot.net/results/faa23037cd14cd5c9af9034a7300ad073bb7ee43 | mips | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/2ffb857cdc3cc1b3ad6a5a68806789d3e7ce2555 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/14f9571dcd65696b1cac5d11bfd148b50a94374c | ORPH x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/6ea08926398c3d534787b0b85076a5a4e137f462 | sh4 | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/a943e03b79c4cc328b7712046ecff09706045f81 | xtensa | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/81e9bc4b0882a4d9bbbccd0d7e766de112d3d41a | powerpc64le | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/8a4b0432870ae6753ffee01d998ae53648295a92 | ORPH powerpc | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/502f1fa93757f96f6f60fe371a0824cc694fccff | sparc | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/f24a8c19c86a19303bf9158d2602a527ad05915c | ORPH arc | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/d45a1184d0ef8c89b371c777510d239025b0e065 | ORPH mips64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/7840662fb987efd3a3be5073b5182439430a8664 | armeb | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/8f41c4984b645851724e554c3162b83bc312bee7 | mips | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/7d44204580448d09d31ca6e0752aca166daa87bf | mips64el | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/1c708d8399e9b5652a3f21d0b7d4074f67b059ee | ORPH powerpc64 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/da20d07682760b1c840f60dab8b5fd22f384e992 | ORPH or1k | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/6870303c9e2c4abba0f3b3d33730b63f5307609a | ORPH mips64 | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/3adf5988f17a964cba9ee833fd0831e318fafa5f | mips | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/fc9854089a9c6036f026420253dc5f4e0ac63549 | aarch64_be | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/7ab27d8aab13abebc3fb6a4a14499b67654d687a | sh4 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/46617161034c4fcdba5eb4102e4e1756c1030bc7 | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/9a909474a8d31ad4cd4bc274f4537a89679879ab | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/5e76dbabbfc8c3912421a133f68f07c28a38b8c3 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/dd1109a71f926db810832fb378805a27be238d5c | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd | powerpc | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/3f31292046bdca618c1c7c901acc236cfe47fb1c | ORPH x86_64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/7b7d7ae9b457fb6af8b9ff2131eace37ffb2cd39 | ORPH or1k | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/037650f61f4da50b273d7f8cda4ae62507d764dc | ORPH x86_64 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/cd10c1890995256c7bbfe0116f7fa554b3e0e1c0 | mipsel | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/73e586930253e843036f5c5f15687240d7cd345a | ORPH x86_64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/a7e5183785c6da4c9ee96985ffeb950d81a30657 | powerpc64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/cfb046b80fa140e28aa14d969804edcf000ee64c | Classification of failures by reason for next --------------------------------------------- brltty-6.5 | 2 host-binutils-2.38 | 2 python-numpy-1.23.5 | 2 fluent-bit-2.0.9 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 gerbera-1.10.0 | 1 gnu-efi-3.0.15 | 1 gobject-introspection-1.72.0 | 1 host-binutils-2.37 | 1 host-go-1.19.6 | 1 jailhouse-0.12 | 1 libdeflate-1.15 | 1 libgcrypt-1.10.1 | 1 pcre2-10.42 | 1 python-pyicu-2.10.2 | 1 sudo-1.9.12p2 | 1 systemd-252.4 | 1 unknown | 1 xfsprogs-5.14.2 | 1 Detail of failures for next --------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/434c780a0758ecf0de3a42b15988035846913b60 | mips | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/84e5c6adb430f4d0a909492286ad589af4cb20f8 | i686 | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/9555fea983902219eaf7471758c1d40dbdb5991d | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/1a4b73695077a6eb9c13e9210074e1586868ed85 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/8f9365dc3d2f797d580ac4e63d5532a982ebbf5d | arc | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/50b4ef0f9f8dd77c1bcbd01ffc8b395adb96f47a | mips64el | gnu-efi-3.0.15 | NOK | http://autobuild.buildroot.net/results/bc2d56fa2d634c7bc9275216e2c2d7d592e23e9e | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/affbf93571e54dc15cace555e3aaa6a775b96adc | ORPH arm | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/942f515190fb6a9779781c1ed806768d1b240cdf | riscv32 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/a29b5bd2fc0feb81d9a547bd19492e0c7f5ffedc | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/5d81ec35c7617aa7a262024ea2f869db561b49da | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/2d9b9d122ea66997282503d61b41a8ec92ab8813 | aarch64 | jailhouse-0.12 | NOK | http://autobuild.buildroot.net/results/8fb6f6382843e5e64810bb36af95e8049862f736 | armeb | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/9b2c347ad4390fc536a17e4b642dfaca5c0e6b0c | i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/745e45e5aac54cfa0f7eb50f81826c1d6df0585b | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/93a0c7fbbe0847fab03e5e9351fbc76480b1fe92 | ORPH mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/a3831200316ea0909ffabb655f66cd044be5ed49 | arm | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/fa2137348eedd72a63ab900665221fe74b2493e6 | sh4 | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/10f78bdd9d9665178469447bb3b2894d739df8be | sparc | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/8be59dd94e4916f9457cb435104e36e62a28373b | ORPH s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/1f3a18843ea07fc54ab1d59b624a26a7ae03ea50 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/a1798321cdc624cdaa2e516f8f5b4de3a7fcc7b7 | mips | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/2c9fef8fa21a775371c746511c65394a9bdfbb8f | ORPH Classification of failures by reason for 2022.11.x -------------------------------------------------- android-tools-4.2.2+git2013... | 1 fs/ubi/ubi.mk:51: /home/bui... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 host-go-1.19.5 | 1 jemalloc-5.3.0 | 1 libgcrypt-1.10.1 | 1 libuci-4b3db1179747b6a67790... | 1 libxml2-2.10.3 | 1 linux-5.10.145-cip17-rt7 | 1 mutt-2.2.9 | 1 python-numpy-1.23.4 | 1 unknown | 1 xz-5.2.7 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/f30b9b32d7ece8a6b97093379341a552ea4a6d3d | xtensa | fs/ubi/ubi.mk:51: /home/bui... | NOK | http://autobuild.buildroot.net/results/f678c17cc4df06fb2737467e769cd8f72a3ea420 | microblazeel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/ce4399484dfc37497db75fd8e8190b353594743a | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/d1491bf8dd8c063cdf203ab935a96a0123b95d86 | mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0cb1f51e93b9503ceaf0ba56b92791c374bb9adf | ORPH powerpc64le | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/28f87e8ee0a22a82cbe3915bcc215a4513ec133d | sh4 | jemalloc-5.3.0 | NOK | http://autobuild.buildroot.net/results/ac1cecabf95bab9924d20cadce88f51dbe1b25f9 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/3cb24dbed26c8ccbd3ef5b9b91d7813c54dba1dd | ORPH mips64 | libuci-4b3db1179747b6a67790... | NOK | http://autobuild.buildroot.net/results/e1240855ef29037a52dfca0851625fa7497f415f | mips64el | libxml2-2.10.3 | NOK | http://autobuild.buildroot.net/results/1a72ff1cf82ef9c5cd331c35e74beab3f811196e | sh4aeb | linux-5.10.145-cip17-rt7 | NOK | http://autobuild.buildroot.net/results/f0c97e48fc03379dc89594864803eab3d52c108d | ORPH sparc | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/dfd674161046447a2ffb45ce6912277325d1daed | mipsel | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/2f3e4b083cb70dc2c02890388fc2163e61a2034d | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/55b7d50b7f9d6c9c61869c4f0bfa974c455d9fe7 | microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/4e10965f7aa890d6d1c66689e9d32e5769d5cba1 | ORPH Gitlab CI results for 2023-02-21 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestAarch64Pages64kGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454778 | ORPH TestAarch64Pages64kMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454782 | ORPH TestAarch64Pages64kuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454784 | ORPH TestCheckPackage | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455189 | TestClangCompilerRT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454401 | ORPH ...ioDracutGlibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454282 | ORPH TestCrudiniPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454404 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454410 | ORPH ...rch64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454804 | ORPH ...tlinAarch64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454805 | ORPH ...arch64MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454806 | ORPH ...otlinAarch64MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454807 | ORPH ...ch64UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454808 | ORPH ...linAarch64UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454810 | ORPH ...h64beGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454812 | ORPH ...inAarch64beGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454813 | ORPH ...64beUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454815 | ORPH ...nAarch64beUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454817 | ORPH ...750dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454819 | ORPH ...nArcle750dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454821 | ORPH ...ehs38GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454822 | ORPH ...inArclehs38GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454826 | ORPH ...hs38UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454827 | ORPH ...nArclehs38UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454829 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454830 | ORPH ...mebv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454832 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454833 | ORPH ...rmebv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454835 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454836 | ORPH ...ebv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454839 | ORPH ...5eabiGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454841 | ORPH ...inArmv5eabiGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454842 | ORPH ...v5eabiMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454844 | ORPH ...linArmv5eabiMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454846 | ORPH ...eabiUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454848 | ORPH ...nArmv5eabiUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454851 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454852 | ORPH ...Armv6eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454855 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454857 | ORPH ...nArmv6eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454860 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454861 | ORPH ...rmv6eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454862 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454863 | ORPH ...Armv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454864 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454865 | ORPH ...nArmv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454866 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454868 | ORPH ...rmv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454871 | ORPH ...mv7mUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454873 | ORPH ...tlinArmv7mUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454876 | ORPH ...8xxxUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454878 | ORPH ...nM68k68xxxUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454879 | ORPH ...fireUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454881 | ORPH ...8kcoldfireUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454882 | ORPH ...azebeGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454883 | ORPH ...icroblazebeGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454885 | ORPH ...lazebeMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454888 | ORPH ...MicroblazebeMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454889 | ORPH ...zebeUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454891 | ORPH ...croblazebeUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454892 | ORPH ...azeelGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454894 | ORPH ...icroblazeelGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454895 | ORPH ...lazeelMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454896 | ORPH ...MicroblazeelMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454897 | ORPH ...zeelUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454900 | ORPH ...croblazeelUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454902 | ORPH ...ips32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454904 | ORPH ...otlinMips32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454905 | ORPH ...Mips32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454906 | ORPH ...ootlinMips32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454908 | ORPH ...ps32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454909 | ORPH ...tlinMips32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454910 | ORPH ...s32elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454912 | ORPH ...linMips32elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454913 | ORPH ...ps32elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454914 | ORPH ...tlinMips32elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454915 | ORPH ...32elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454917 | ORPH ...inMips32elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454918 | ORPH ...2r5elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454920 | ORPH ...nMips32r5elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454921 | ORPH ...32r5elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454922 | ORPH ...inMips32r5elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454925 | ORPH ...r5elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454928 | ORPH ...Mips32r5elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454932 | ORPH ...2r6elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454936 | ORPH ...nMips32r6elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454941 | ORPH ...32r6elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454944 | ORPH ...inMips32r6elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454948 | ORPH ...r6elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454952 | ORPH ...Mips32r6elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454953 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454954 | ORPH ...Mips64eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454955 | ORPH ...4eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454957 | ORPH ...nMips64eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454958 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454959 | ORPH ...ips64eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454960 | ORPH ...64n32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454962 | ORPH ...inMips64n32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454963 | ORPH ...s64n32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454964 | ORPH ...linMips64n32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454967 | ORPH ...4n32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454968 | ORPH ...nMips64n32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454969 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454970 | ORPH ...ps64r6eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454971 | ORPH ...6eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454972 | ORPH ...ips64r6eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454975 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454976 | ORPH ...s64r6eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454977 | ORPH ...Nios2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454979 | ORPH ...ootlinNios2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454981 | ORPH ...nriscGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454983 | ORPH ...linOpenriscGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454986 | ORPH ...enriscMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454988 | ORPH ...tlinOpenriscMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454990 | ORPH ...riscUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454993 | ORPH ...inOpenriscUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454994 | ORPH ...440fpGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454996 | ORPH ...owerpc440fpGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454997 | ORPH ...c440fpMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454999 | ORPH ...Powerpc440fpMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455000 | ORPH ...40fpUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455003 | ORPH ...werpc440fpUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455004 | ORPH ...e5500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455006 | ORPH ...erpc64e5500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455008 | ORPH ...e6500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455009 | ORPH ...erpc64e6500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455010 | ORPH ...4e6500MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455011 | ORPH ...werpc64e6500MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455012 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455014 | ORPH ...c64lepower8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455016 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455017 | ORPH ...pc64lepower8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455019 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455020 | ORPH ...rpc64power8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455022 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455023 | ORPH ...erpc64power8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455033 | ORPH ...300c3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455036 | ORPH ...werpce300c3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455039 | ORPH ...e300c3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455042 | ORPH ...owerpce300c3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455047 | ORPH ...00c3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455049 | ORPH ...erpce300c3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455053 | ORPH ...500mcGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455055 | ORPH ...werpce500mcGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455057 | ORPH ...e500mcMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455059 | ORPH ...owerpce500mcMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455060 | ORPH ...00mcUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455061 | ORPH ...erpce500mcUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455066 | ORPH ...lp32dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455069 | ORPH ...lp64dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455072 | ORPH ...iscv64lp64dGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455077 | ORPH ...4lp64dMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455079 | ORPH ...Riscv64lp64dMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455080 | ORPH ...p64dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455082 | ORPH ...scv64lp64dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455084 | ORPH ...0xz13GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455086 | ORPH ...linS390xz13GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455088 | ORPH ...Shsh4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455090 | ORPH ...ootlinShsh4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455092 | ORPH ...nShsh4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455093 | ORPH ...BootlinShsh4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455096 | ORPH ...hsh4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455098 | ORPH ...otlinShsh4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455101 | ORPH ...h4aebGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455103 | ORPH ...linShsh4aebGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455104 | ORPH ...sh4aebMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455105 | ORPH ...tlinShsh4aebMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455108 | ORPH ...arc64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455109 | ORPH ...tlinSparc64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455111 | ORPH ...rcv8UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455115 | ORPH ...linSparcv8UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455117 | ORPH ...X8664GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455121 | ORPH ...ootlinX8664GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455123 | ORPH ...nX8664MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455124 | ORPH ...BootlinX8664MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455125 | ORPH ...8664UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455126 | ORPH ...otlinX8664UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455128 | ORPH ...orei7GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455130 | ORPH ...X8664corei7GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455132 | ORPH ...corei7MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455134 | ORPH ...nX8664corei7MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455138 | ORPH ...rei7UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455141 | ORPH ...8664corei7UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455144 | ORPH ...664v2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455146 | ORPH ...tlinX8664v2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455148 | ORPH ...8664v2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455149 | ORPH ...otlinX8664v2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455150 | ORPH ...64v2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455152 | ORPH ...linX8664v2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455153 | ORPH ...664v3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455154 | ORPH ...tlinX8664v3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455155 | ORPH ...8664v3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455156 | ORPH ...otlinX8664v3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455157 | ORPH ...64v3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455158 | ORPH ...linX8664v3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455159 | ORPH ...664v4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455160 | ORPH ...tlinX8664v4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455162 | ORPH ...8664v4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455163 | ORPH ...otlinX8664v4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455165 | ORPH ...64v4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455166 | ORPH ...linX8664v4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455167 | ORPH ...core2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455169 | ORPH ...linX86core2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455170 | ORPH ...6core2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455171 | ORPH ...tlinX86core2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455172 | ORPH ...ore2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455174 | ORPH ...inX86core2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455176 | ORPH ...6i686GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455179 | ORPH ...tlinX86i686GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455181 | ORPH ...86i686MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455183 | ORPH ...otlinX86i686MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455184 | ORPH ...i686UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455185 | ORPH ...linX86i686UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455186 | ORPH ...lx60UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455187 | ORPH ...Xtensalx60UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455188 | ORPH ...ToolchainBuildrootMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454786 | ORPH ...olchainBuildrootuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454788 | ORPH ...xternalToolchainCCache | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454790 | ORPH ...ernalToolchainCtngMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454792 | ORPH ...rnalToolchainLinaroArm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454793 | ORPH ...ToolchainSourceryArmv4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454797 | ORPH ...ToolchainSourceryArmv5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454800 | ORPH ...ToolchainSourceryArmv7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454802 | ORPH TestFileCapabilities | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454235 | ORPH TestGdbserverOnly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454450 | ORPH TestGetDevelopers | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455191 | ORPH TestGlibcAllTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454265 | ORPH ...DefaultLimitedTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454268 | ORPH TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454455 | ORPH TestGnupg2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454461 | ORPH TestGst1Python | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454465 | ORPH TestHWLoc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454470 | ORPH TestHighway | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454468 | ORPH TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454476 | ORPH ...InitSystemBusyboxRoNet | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454342 | ORPH TestInitSystemBusyboxRw | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454344 | ORPH TestInitSystemNone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454349 | ORPH ...IfupdownDbusbrokerDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454362 | ORPH ...ystemSystemdRoNetworkd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454365 | ORPH TestIso9660Grub2EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454306 | ORPH TestIso9660Grub2External | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454307 | ORPH ...0Grub2ExternalCompress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454309 | ORPH TestIso9660Grub2Hybrid | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454313 | ORPH TestIso9660Grub2Internal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454316 | ORPH ...so9660SyslinuxExternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454317 | ORPH ...slinuxExternalCompress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454320 | ORPH ...so9660SyslinuxInternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454321 | ORPH TestJffs2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454324 | ORPH TestLibJXL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454480 | ORPH TestLibshdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454483 | ORPH TestLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454495 | ORPH TestLuaHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454524 | ORPH TestLuaInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454526 | ORPH TestLuaLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454485 | ORPH TestLuaLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454491 | ORPH TestLuaLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454498 | ORPH TestLuaLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454505 | ORPH TestLuaLuaCffi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454514 | ORPH TestLuaLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454518 | ORPH TestLuaLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454543 | ORPH TestLuaLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454546 | ORPH TestLuaLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454522 | ORPH TestLuaLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454548 | ORPH TestLuaLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454532 | ORPH TestLuaLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454553 | ORPH TestLuaLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454537 | ORPH TestLuaLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454555 | ORPH TestLuaLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454559 | ORPH TestLuaLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454520 | ORPH TestLuaLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454550 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454562 | ORPH TestLuaLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454541 | ORPH TestLuaLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454528 | ORPH TestLuaLzlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454578 | ORPH TestLuaRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454746 | ORPH TestLuaUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454539 | ORPH TestLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454496 | ORPH TestLuajitHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454525 | ORPH TestLuajitInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454527 | ORPH TestLuajitLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454488 | ORPH TestLuajitLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454494 | ORPH TestLuajitLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454500 | ORPH TestLuajitLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454513 | ORPH TestLuajitLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454519 | ORPH TestLuajitLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454544 | ORPH TestLuajitLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454547 | ORPH TestLuajitLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454523 | ORPH TestLuajitLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454549 | ORPH TestLuajitLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454534 | ORPH TestLuajitLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454554 | ORPH TestLuajitLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454538 | ORPH TestLuajitLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454558 | ORPH TestLuajitLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454561 | ORPH TestLuajitLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454521 | ORPH TestLuajitLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454551 | ORPH TestLuajitLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454564 | ORPH TestLuajitLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454542 | ORPH TestLuajitLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454530 | ORPH TestLuajitRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454747 | ORPH TestLuajitTurbolua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454764 | ORPH TestLuajitUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454540 | ORPH TestLuvi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454569 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454576 | ORPH TestMender | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454579 | ORPH TestMsrTools | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454582 | ORPH TestNcdu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454583 | ORPH TestNetdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454584 | ORPH TestNodeJSBasic | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454587 | ORPH TestNodeJSModule | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454588 | ORPH TestOctave | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454591 | ORPH TestOla | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454592 | ORPH TestOpenJdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454594 | ORPH TestOpenSshGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454595 | ORPH TestOpenSshuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454597 | ORPH TestOpkg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454598 | ORPH TestPerftest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454600 | ORPH TestPerl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454601 | ORPH TestPerlClassLoad | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454602 | ORPH TestPerlDBDmysql | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454604 | ORPH TestPerlEncodeDetect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454605 | ORPH TestPerlGDGraph | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454606 | ORPH TestPerlHTMLParser | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454609 | ORPH TestPerlIOSocketMulticast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454613 | ORPH TestPerlIOSocketSSL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454617 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454620 | ORPH TestPerlMailDKIM | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454621 | ORPH TestPerlX10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454623 | ORPH TestPerlXMLLibXML | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454626 | ORPH TestPerllibwwwperl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454618 | ORPH TestPhpApcu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454627 | ORPH TestPhpLuaLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454630 | ORPH TestPhpLuaLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454633 | ORPH TestPhpPam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454635 | ORPH TestPhpPeclDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454638 | ORPH TestPixz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454641 | ORPH TestPolkitInitd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454643 | ORPH TestPolkitSystemd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454645 | ORPH TestProsodyLua51 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454648 | ORPH TestProsodyLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454651 | ORPH TestPyNdiff | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454722 | ORPH TestPython3Py | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454653 | ORPH TestPython3PyPyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454655 | ORPH TestPython3Pyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454657 | ORPH TestPythonAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454665 | ORPH TestPythonAvro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454668 | ORPH TestPythonPahoMQTT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454715 | ORPH TestPythonPy3Aexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454658 | ORPH TestPythonPy3Argh | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454660 | ORPH TestPythonPy3Attrs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454661 | ORPH TestPythonPy3Autobahn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454666 | ORPH TestPythonPy3Automat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454667 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454670 | ORPH TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454673 | ORPH TestPythonPy3Botocore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454676 | ORPH TestPythonPy3Can | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454679 | ORPH TestPythonPy3Cbor | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454680 | ORPH TestPythonPy3Click | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454682 | ORPH TestPythonPy3Colorzero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454683 | ORPH TestPythonPy3Constantly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454685 | ORPH TestPythonPy3Construct | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454687 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454688 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454689 | ORPH TestPythonPy3DBusFast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454690 | ORPH TestPythonPy3DBusNext | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454692 | ORPH TestPythonPy3Dicttoxml2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454693 | ORPH TestPythonPy3Distro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454694 | ORPH TestPythonPy3Django | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454695 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454698 | ORPH TestPythonPy3Flask | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454700 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454701 | ORPH TestPythonPy3Git | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454702 | ORPH TestPythonPy3Gitdb2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454703 | ORPH TestPythonPy3GnuPG | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454705 | ORPH TestPythonPy3Gobject | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454706 | ORPH TestPythonPy3Gpiozero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454707 | ORPH TestPythonPy3Hkdf | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454708 | ORPH TestPythonPy3Incremental | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454710 | ORPH TestPythonPy3Iptables | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454711 | ORPH TestPythonPy3Jmespath | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454712 | ORPH TestPythonPy3Libftdi1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454478 | ORPH ...PythonPy3MagicWormhole | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454713 | ORPH TestPythonPy3Munch | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454714 | ORPH TestPythonPy3Passlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454716 | ORPH TestPythonPy3Pexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454717 | ORPH TestPythonPy3PyAlsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454719 | ORPH TestPythonPy3Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454721 | ORPH TestPythonPy3Pytest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454723 | ORPH ...PythonPy3PytestAsyncio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454724 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454725 | ORPH TestPythonPy3Qrcode | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454726 | ORPH TestPythonPy3RSA | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454728 | ORPH TestPythonPy3RpiGpio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454727 | ORPH TestPythonPy3S3transfer | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454731 | ORPH TestPythonPy3SciPy | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454732 | ORPH ...thonPy3ServiceIdentity | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454733 | ORPH TestPythonPy3Smmap2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454734 | ORPH TestPythonPy3Spake2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454735 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454736 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454737 | ORPH TestPythonPy3Txaio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454738 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454740 | ORPH TestPythonPy3Ubjson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454741 | ORPH ...y3UnitTestXmlReporting | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454742 | ORPH TestPythonPy3rtoml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454729 | ORPH TestPythonPybind | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454720 | ORPH TestRdmaCore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454743 | ORPH TestRedis | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454744 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454748 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454750 | ORPH TestS6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454752 | ORPH TestS6Networking | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454754 | ORPH TestS6PortableUtils | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454756 | ORPH TestS6Rc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454758 | ORPH TestSquashfsMaxBlocksize | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454331 | ORPH TestSudo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454759 | ORPH TestSyslogNg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454761 | ORPH TestTmux | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454762 | ORPH TestUbootOpensslPkgConfig | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454766 | ORPH TestZ3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454768 | ORPH TestZerofree | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454769 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454771 | ORPH TestZfsMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454773 | ORPH TestZfsUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454775 | ORPH -- http://autobuild.buildroot.net From cherniaev.andrei at kairo.space Wed Feb 22 09:30:55 2023 From: cherniaev.andrei at kairo.space (Andrei Cherniaev) Date: Wed, 22 Feb 2023 18:30:55 +0900 Subject: [Buildroot] [RE]Re: [PATCH] boot/grub2: add information where isconfiguration file Message-ID: <167705825735.1345689.5559147157105378409@wmail10.mailplug.com> Hello Thomas Petazzoni"boot/grub2/grub.cfg: it is part of Buildroot itself, and you probably don't want to have project-specific changes in there."You say that I try to set project-specific settings. Look at Buildroot, it set project-specific set default="0"set timeout="5"Why? Why 5, not 6? Buildroot shouldn't set project-specific settings, isn't it? May be maintainer should just removeset default="0"set timeout="5"from grub.cfg ?Andrei Cherniaev----- Original Message -----From : Thomas Petazzoni To : "AndreiCherniaev" Cc : Sent : 2023-02-22 07:02:02Subject : Re: [Buildroot] [PATCH] boot/grub2: add information where isconfiguration fileHello Andrei,On Mon, 9 Jan 2023 16:33:52 +0900AndreiCherniaev wrote:> diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in> index 92b5dd501b..bf0400c08f 100644> --- a/boot/grub2/Config.in> +++ b/boot/grub2/Config.in> @@ -125,6 +125,7 @@ config BR2_TARGET_GRUB2_BUILTIN_CONFIG_PC> into the Grub image itself. This allows to set the root> device and other configuration parameters, but however menu> entries cannot be described in this embedded configuration.> + Use boot/grub2/grub.cfg to edit menu entries.Actually no, you probably don't want to change boot/grub2/grub.cfg: itis part of Buildroot itself, and you probably don't want to haveproject-specific changes in there.Instead, you should override it using a rootfs overlay (if grub.cfg isin $(TARGET_DIR)/boot) or a post-build/post-image script (if it's inthe EFI partition).I have nevertheless applied your patch, but after tweaking the messagein the help text, and moving it to the main Grub2 option. See: https://gitlab.com/buildroot.org/buildroot/-/commit/7692d5beb2d9e4d0b463f0f26a177829e5bcc1ecBest regards,Thomas Petazzoni-- Thomas Petazzoni, co-owner and CEO, BootlinEmbedded Linux and Kernel engineering and traininghttps://bootlin.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Wed Feb 22 09:41:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 10:41:22 +0100 Subject: [Buildroot] [RE]Re: [PATCH] boot/grub2: add information where isconfiguration file In-Reply-To: <167705825735.1345689.5559147157105378409@wmail10.mailplug.com> References: <167705825735.1345689.5559147157105378409@wmail10.mailplug.com> Message-ID: <20230222104122.6eff1ef1@windsurf> Hello Andrei, Sorry but the plain text version of your e-mail is unreadable. Could you use an e-mail client that sends a proper plain text version of its e-mails? Thanks a lot, Thomas Petazzoni On Wed, 22 Feb 2023 18:30:55 +0900 Andrei Cherniaev wrote: > Hello Thomas Petazzoni"boot/grub2/grub.cfg: it is part of Buildroot itself, and you probably don't want to have project-specific changes in there."You say that I try to set project-specific settings. Look at Buildroot, it set project-specific set default="0"set timeout="5"Why? Why 5, not 6? Buildroot shouldn't set project-specific settings, isn't it? May be maintainer should just removeset default="0"set timeout="5"from grub.cfg ?Andrei Cherniaev----- Original Message -----From : Thomas Petazzoni To : "AndreiCherniaev" Cc : Sent : 2023-02-22 07:02:02Subject : Re: [Buildroot] [PATCH] boot/grub2: add information where isconfiguration fileHello Andrei,On Mon, 9 Jan 2023 16:33:52 +0900AndreiCherniaev wrote:> diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in> index 92b5dd501b..bf0400c08f 100644> --- a/boot/grub2/Config.in> +++ b/boot/grub2/Config.in> @@ -125,6 +125 ,7 @@ config BR2_TARGET_GRUB2_BUILTIN_CONFIG_PC> into the Grub image itself. This allows to set the root> device and other configuration parameters, but however menu> entries cannot be described in this embedded configuration.> + Use boot/grub2/grub.cfg to edit menu entries.Actually no, you probably don't want to change boot/grub2/grub.cfg: itis part of Buildroot itself, and you probably don't want to haveproject-specific changes in there.Instead, you should override it using a rootfs overlay (if grub.cfg isin $(TARGET_DIR)/boot) or a post-build/post-image script (if it's inthe EFI partition).I have nevertheless applied your patch, but after tweaking the messagein the help text, and moving it to the main Grub2 option. See: https://gitlab.com/buildroot.org/buildroot/-/commit/7692d5beb2d9e4d0b463f0f26a177829e5bcc1ecBest regards,Thomas Petazzoni-- Thomas Petazzoni, co-owner and CEO, BootlinEmbedded Linux and Kernel engineering and traininghttps://bootlin.com -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Wed Feb 22 09:44:41 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 10:44:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/sudo: fix openssl static build Message-ID: <20230222094441.439014-1-fontaine.fabrice@gmail.com> Fix the following build failure with sparc raised since bump to version 1.9.11p2 in commit 9b7f8da96be549a52630cd87b30851d600f163a4 and https://github.com/sudo-project/sudo/commit/9fbbca7b7a4cc60a8aa27d73de54278004a704c0: hecking for X509_STORE_CTX_get0_cert configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 /home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' [...] In file included from ./hostcheck.c:38: ../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) | ^~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b Signed-off-by: Fabrice Fontaine --- ...onfigure.ac-fix-openssl-static-build.patch | 49 +++++++++++++++++++ package/sudo/sudo.mk | 2 + 2 files changed, 51 insertions(+) create mode 100644 package/sudo/0001-configure.ac-fix-openssl-static-build.patch diff --git a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch new file mode 100644 index 0000000000..32edd148a0 --- /dev/null +++ b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch @@ -0,0 +1,49 @@ +From 5cfc7e277d0b262a1d12e867c47a36301fb7edb7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 22 Feb 2023 10:01:25 +0100 +Subject: [PATCH] configure.ac: fix openssl static build + +Do not use AX_APPEND_FLAG as it will break static builds by removing +duplicates such as -lz or -latomic which are needed by -lssl and +-lcrypto. This will fix the following build failure with sparc which +needs -latomic: + +Checking for X509_STORE_CTX_get0_cert +configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 +/home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': +x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' + +[...] + +In file included from ./hostcheck.c:38: +../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' + 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) + | ^~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/sudo-project/sudo/pull/244] +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8eccad7e4..523d8e56b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3082,7 +3082,9 @@ if test "${enable_openssl-no}" != no; then + SUDO_APPEND_LIBPATH([LIBTLS], [$f]) + ;; + *) +- AX_APPEND_FLAG([$f], [LIBTLS]) ++ # Do not use AX_APPEND_FLAG as it will break static builds by removing ++ # duplicates such as -lz or -latomic which are needed by -lssl and -lcrypto ++ LIBTLS="$LIBTLS $f" + ;; + esac + done +-- +2.39.0 + diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index c4eaafa6b1..3b5c898917 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -13,6 +13,8 @@ SUDO_LICENSE_FILES = LICENSE.md SUDO_CPE_ID_VERSION = $(SUDO_VERSION_MAJOR) SUDO_CPE_ID_UPDATE = $(SUDO_VERSION_MINOR) SUDO_SELINUX_MODULES = sudo +# We're patching configure.ac +SUDO_AUTORECONF = YES # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \ -- 2.39.0 From diego.hdmp at gmail.com Wed Feb 22 09:49:16 2023 From: diego.hdmp at gmail.com (Diego Hurtado de Mendoza) Date: Wed, 22 Feb 2023 10:49:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/hackrf: bump to version 2023.01.1 Message-ID: <20230222094916.1853413-1-diego.hdmp@gmail.com> https://github.com/greatscottgadgets/hackrf/releases/tag/v2023.01.1 Signed-off-by: Diego Hurtado de Mendoza --- package/hackrf/hackrf.hash | 2 +- package/hackrf/hackrf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hackrf/hackrf.hash b/package/hackrf/hackrf.hash index 16ccb9dcfb..0426009dd3 100644 --- a/package/hackrf/hackrf.hash +++ b/package/hackrf/hackrf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bacd4e7937467ffa14654624444c8b5c716ab470d8c1ee8d220d2094ae2adb3e hackrf-2022.09.1.tar.xz +sha256 32a03f943a30be4ba478e94bf69f14a5b7d55be6761007f4a4f5453418206a11 hackrf-2023.01.1.tar.xz sha256 49b60a6288f90f49074228cc1fae0fb16871ba36b756013abdf7c2fc92f01fad COPYING diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 4317da60bc..0d7533815d 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -4,7 +4,7 @@ # ################################################################################ -HACKRF_VERSION = 2022.09.1 +HACKRF_VERSION = 2023.01.1 HACKRF_SITE = https://github.com/greatscottgadgets/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause -- 2.39.2 From fontaine.fabrice at gmail.com Wed Feb 22 09:54:34 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 10:54:34 +0100 Subject: [Buildroot] [PATCH 1/1] boot/opensbi: fix build with empty OPENSBI_PLAT Message-ID: <20230222095434.444552-1-fontaine.fabrice@gmail.com> Fix the following build failure when OPENSBI_PLAT is empty raised since commit 9b5b7165deb91bad3cdb1ea0dd8f940eff75f3a9: /usr/bin/install -m 0644 -D /nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin /nvmedata/autobuild/instance-4/output-1/images/fw_jump.bin /usr/bin/install: cannot stat '/nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin': No such file or directory Fixes: - http://autobuild.buildroot.org/results/8033327f090e4a3d84a7fce1f62b14fdf89dbd89 Signed-off-by: Fabrice Fontaine --- boot/opensbi/opensbi.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk index 06ec87b2c3..dd113a0bf8 100644 --- a/boot/opensbi/opensbi.mk +++ b/boot/opensbi/opensbi.mk @@ -71,6 +71,7 @@ OPENSBI_INSTALL_IMAGES = YES OPENSBI_FW_IMAGES += payload endif +ifneq ($(OPENSBI_PLAT),) define OPENSBI_INSTALL_IMAGES_CMDS $(foreach f,$(OPENSBI_FW_IMAGES),\ $(INSTALL) -m 0644 -D $(@D)/build/platform/$(OPENSBI_PLAT)/firmware/fw_$(f).bin \ @@ -79,6 +80,7 @@ define OPENSBI_INSTALL_IMAGES_CMDS $(BINARIES_DIR)/fw_$(f).elf ) endef +endif # libsbi.a is not a library meant to be linked in user-space code, but # with bare metal code, which is why we don't install it in -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 10:32:42 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 11:32:42 +0100 Subject: [Buildroot] [PATCH 1/1] boot/at91dataflashboot: disable stack-protector Message-ID: <20230222103242.755918-1-fontaine.fabrice@gmail.com> Disable stack-protector to avoid the following build failure: /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T elf32-littlearm.lds -Ttext 0 -n -o DataflashBoot-1.05.out objs/cstartup_ram.o objs/at45.o objs/com.o objs/dataflash.o objs/div0.o objs/init.o objs/main.o objs/stdio.o objs/asm_isr.o objs/jump.o objs/_udivsi3.o objs/_umodsi3.o objs/led.o /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: objs/main.o: in function `main': main.c:(.text.startup+0x834): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/502c54be4978e628724d72ee2a75d4c5e0a6ace8 Signed-off-by: Fabrice Fontaine --- boot/at91dataflashboot/at91dataflashboot.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk index 0ad8b6fc44..c66f27e343 100644 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ b/boot/at91dataflashboot/at91dataflashboot.mk @@ -12,7 +12,8 @@ AT91DATAFLASHBOOT_INSTALL_TARGET = NO AT91DATAFLASHBOOT_INSTALL_IMAGES = YES define AT91DATAFLASHBOOT_BUILD_CMDS - make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) + make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \ + CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector" endef define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS -- 2.39.0 From marcus.folkesson at gmail.com Wed Feb 22 10:39:17 2023 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Wed, 22 Feb 2023 11:39:17 +0100 Subject: [Buildroot] [PATCH v3] package/libcamera-apps: enable LIBAV only if libdrm and ffmpeg is present Message-ID: <20230222103917.2709112-1-marcus.folkesson@gmail.com> Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps does enable LIBAV by default which depends on libdrm and ffpmeg. Fixes: - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 13 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Marcus Folkesson --- Notes: v3: - Only enable libav if both libdrm and ffmpeg is selected - Tested with these four combinations: - libcamera-apps enabled, ffmpeg disabled, libdrm disabled - libcamera-apps enabled, ffmpeg enabled, libdrm disabled - libcamera-apps enabled, ffmpeg disabled, libdrm enabled - libcamera-apps enabled, ffmpeg enabled, libdrm enabled v2: -Add dependency to ffmpeg package/libcamera-apps/libcamera-apps.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 290ee9a026..fe402ec3f4 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -29,6 +29,13 @@ else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 endif +ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_LIBDRM),yy) +LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 +endif + ifeq ($(BR2_PACKAGE_XORG7),y) LIBCAMERA_APPS_DEPENDENCIES += \ $(if $(BR2_PACKAGE_LIBEPOXY),libepoxy) \ -- 2.39.2 From fontaine.fabrice at gmail.com Wed Feb 22 11:10:59 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 12:10:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: fix libressl build Message-ID: <20230222111059.887398-1-fontaine.fabrice@gmail.com> Fix the following build failure with libressl raised since bump to version 2.10.0 in commit 03bab7117d232c9dcd784a74eefc0e48ea51ee53: /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c: In function 'crypto_cert_get_signature_alg': /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c:980:8: error: 'NID_sha3_224' undeclared (first use in this function) case NID_sha3_224: ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e96848576ac292799636abe7485c37aa54196a2c Signed-off-by: Fabrice Fontaine --- ...e-sha3-and-shake-hashes-for-libressl.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch diff --git a/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch b/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch new file mode 100644 index 0000000000..14f615e2e7 --- /dev/null +++ b/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch @@ -0,0 +1,38 @@ +From bd093454fe126163634c00b7484ab7fee6ffe670 Mon Sep 17 00:00:00 2001 +From: akallabeth +Date: Mon, 20 Feb 2023 16:23:39 +0100 +Subject: [PATCH] Fix #8702: Disable sha3 and shake hashes for libressl + +[Retrieved (and backported) from: +https://github.com/FreeRDP/FreeRDP/pull/8708/commits/bd093454fe126163634c00b7484ab7fee6ffe670] +Signed-off-by: Fabrice Fontaine +--- + libfreerdp/crypto/x509_utils.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c +index 6e87a88b8d8..62cf2939be7 100644 +--- a/libfreerdp/crypto/crypto.c ++++ b/libfreerdp/crypto/crypto.c +@@ -748,7 +748,7 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) + return WINPR_MD_SHA512; + case NID_ripemd160: + return WINPR_MD_RIPEMD160; +-#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) && !defined(LIBRESSL_VERSION_NUMBER) + case NID_sha3_224: + return WINPR_MD_SHA3_224; + case NID_sha3_256: +@@ -757,11 +757,11 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) + return WINPR_MD_SHA3_384; + case NID_sha3_512: + return WINPR_MD_SHA3_512; +-#endif + case NID_shake128: + return WINPR_MD_SHAKE128; + case NID_shake256: + return WINPR_MD_SHAKE256; ++#endif + case NID_undef: + default: + return WINPR_MD_NONE; -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 14:35:12 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 15:35:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/audit: force arm mode instead of Thumb mode Message-ID: <20230222143512.1555539-1-fontaine.fabrice@gmail.com> Fix the following build failure: /tmp/ccY5gl3z.s:2145: Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/9d18a0d360b2e2f9e87c55daedda62d6ce198bb9 Signed-off-by: Fabrice Fontaine --- package/audit/audit.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/audit/audit.mk b/package/audit/audit.mk index cbb174b980..af81dabac0 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -15,6 +15,13 @@ AUDIT_INSTALL_STAGING = YES AUDIT_CONF_OPTS = --without-python --without-python3 +# src/libev has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) AUDIT_DEPENDENCIES += libcap-ng AUDIT_CONF_OPTS += --with-libcap-ng=yes -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 14:37:53 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 15:37:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/libev: force arm mode instead of Thumb mode Message-ID: <20230222143753.1563322-1-fontaine.fabrice@gmail.com> Fix the following build failure: /tmp/ccHc3Awn.s:825: Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/1c597c9da724d6cac06b09b1ecd456a28440a3a3 Signed-off-by: Fabrice Fontaine --- package/libev/libev.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libev/libev.mk b/package/libev/libev.mk index 9f3c19d46c..cbd5433d76 100644 --- a/package/libev/libev.mk +++ b/package/libev/libev.mk @@ -10,6 +10,13 @@ LIBEV_INSTALL_STAGING = YES LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+ LIBEV_LICENSE_FILES = LICENSE +# libev has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBEV_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + # The 'compatibility' event.h header conflicts with libevent # It's completely unnecessary for BR packages so remove it define LIBEV_DISABLE_EVENT_H_INSTALL -- 2.39.0 From thomas.petazzoni at bootlin.com Wed Feb 22 14:51:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:51:34 +0100 Subject: [Buildroot] [git commit] package/freerdp: fix libressl build Message-ID: <20230222145144.65618866DE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0af2840b1b16dd95b9a468e46b6e275186e5447 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with libressl raised since bump to version 2.10.0 in commit 03bab7117d232c9dcd784a74eefc0e48ea51ee53: /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c: In function 'crypto_cert_get_signature_alg': /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c:980:8: error: 'NID_sha3_224' undeclared (first use in this function) case NID_sha3_224: ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e96848576ac292799636abe7485c37aa54196a2c Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...isable-sha3-and-shake-hashes-for-libressl.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch b/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch new file mode 100644 index 0000000000..14f615e2e7 --- /dev/null +++ b/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch @@ -0,0 +1,38 @@ +From bd093454fe126163634c00b7484ab7fee6ffe670 Mon Sep 17 00:00:00 2001 +From: akallabeth +Date: Mon, 20 Feb 2023 16:23:39 +0100 +Subject: [PATCH] Fix #8702: Disable sha3 and shake hashes for libressl + +[Retrieved (and backported) from: +https://github.com/FreeRDP/FreeRDP/pull/8708/commits/bd093454fe126163634c00b7484ab7fee6ffe670] +Signed-off-by: Fabrice Fontaine +--- + libfreerdp/crypto/x509_utils.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c +index 6e87a88b8d8..62cf2939be7 100644 +--- a/libfreerdp/crypto/crypto.c ++++ b/libfreerdp/crypto/crypto.c +@@ -748,7 +748,7 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) + return WINPR_MD_SHA512; + case NID_ripemd160: + return WINPR_MD_RIPEMD160; +-#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) && !defined(LIBRESSL_VERSION_NUMBER) + case NID_sha3_224: + return WINPR_MD_SHA3_224; + case NID_sha3_256: +@@ -757,11 +757,11 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) + return WINPR_MD_SHA3_384; + case NID_sha3_512: + return WINPR_MD_SHA3_512; +-#endif + case NID_shake128: + return WINPR_MD_SHAKE128; + case NID_shake256: + return WINPR_MD_SHAKE256; ++#endif + case NID_undef: + default: + return WINPR_MD_NONE; From thomas.petazzoni at bootlin.com Wed Feb 22 14:51:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:51:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: fix libressl build In-Reply-To: <20230222111059.887398-1-fontaine.fabrice@gmail.com> References: <20230222111059.887398-1-fontaine.fabrice@gmail.com> Message-ID: <20230222155152.336584d6@windsurf> On Wed, 22 Feb 2023 12:10:59 +0100 Fabrice Fontaine wrote: > Fix the following build failure with libressl raised since bump to > version 2.10.0 in commit 03bab7117d232c9dcd784a74eefc0e48ea51ee53: > > /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c: In function 'crypto_cert_get_signature_alg': > /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c:980:8: error: 'NID_sha3_224' undeclared (first use in this function) > case NID_sha3_224: > ^~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/e96848576ac292799636abe7485c37aa54196a2c > > Signed-off-by: Fabrice Fontaine > --- > ...e-sha3-and-shake-hashes-for-libressl.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 14:52:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:52:12 +0100 Subject: [Buildroot] [PATCH v3] package/libcamera-apps: enable LIBAV only if libdrm and ffmpeg is present In-Reply-To: <20230222103917.2709112-1-marcus.folkesson@gmail.com> References: <20230222103917.2709112-1-marcus.folkesson@gmail.com> Message-ID: <20230222155212.4aecfc97@windsurf> On Wed, 22 Feb 2023 11:39:17 +0100 Marcus Folkesson wrote: > Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps > does enable LIBAV by default which depends on libdrm and ffpmeg. > > Fixes: > - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ > > /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory > 13 | #include > | ^~~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: Marcus Folkesson > --- Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Wed Feb 22 14:52:22 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 22 Feb 2023 15:52:22 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 7.0.1 In-Reply-To: <20230222145059.1939094-1-giulio.benetti@benettiengineering.com> References: <20230222145059.1939094-1-giulio.benetti@benettiengineering.com> Message-ID: Pardon, this is for-next Best regards -- CEO/CTO at Benetti Engineering sas On 22/02/23 15:50, Giulio Benetti wrote: > Since the major release changed all the packages that have direct > dependency to harfbuzz has been succesfully built: > - efl > - libass > - mupdf > - pango > - qt5base > - qt5webengine > - qt6base > - sdl2_ttf > - supertuxkart > - vlc > - webkitgtk > - wpewebkit > > Signed-off-by: Giulio Benetti > --- > 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 9489f25c6a..eee48c0b68 100644 > --- a/package/harfbuzz/harfbuzz.hash > +++ b/package/harfbuzz/harfbuzz.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d harfbuzz-5.3.1.tar.xz > +sha256 2cf4d3d8f225007511990a36a34195f0d6562ca56df0a8b0885b382837948199 harfbuzz-7.0.1.tar.xz > sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING > diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk > index b0112168e1..f8724793a9 100644 > --- a/package/harfbuzz/harfbuzz.mk > +++ b/package/harfbuzz/harfbuzz.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HARFBUZZ_VERSION = 5.3.1 > +HARFBUZZ_VERSION = 7.0.1 > 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 thomas.petazzoni at bootlin.com Wed Feb 22 14:52:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:52:36 +0100 Subject: [Buildroot] [PATCH 1/1] boot/at91dataflashboot: disable stack-protector In-Reply-To: <20230222103242.755918-1-fontaine.fabrice@gmail.com> References: <20230222103242.755918-1-fontaine.fabrice@gmail.com> Message-ID: <20230222155236.3f6e3ba8@windsurf> On Wed, 22 Feb 2023 11:32:42 +0100 Fabrice Fontaine wrote: > Disable stack-protector to avoid the following build failure: > > /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T elf32-littlearm.lds -Ttext 0 -n -o DataflashBoot-1.05.out objs/cstartup_ram.o objs/at45.o objs/com.o objs/dataflash.o objs/div0.o objs/init.o objs/main.o objs/stdio.o objs/asm_isr.o objs/jump.o objs/_udivsi3.o objs/_umodsi3.o objs/led.o > /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: objs/main.o: in function `main': > main.c:(.text.startup+0x834): undefined reference to `__stack_chk_guard' > > Fixes: > - http://autobuild.buildroot.org/results/502c54be4978e628724d72ee2a75d4c5e0a6ace8 > > Signed-off-by: Fabrice Fontaine > --- > boot/at91dataflashboot/at91dataflashboot.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 14:52:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:52:01 +0100 Subject: [Buildroot] [git commit] package/libcamera-apps: enable LIBAV only if libdrm and ffmpeg is present Message-ID: <20230222145311.53FA0866E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf4c94de51eb5c303a3e9ee62e97baa8b37d7461 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps does enable LIBAV by default which depends on libdrm and ffpmeg. Fixes: - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 13 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- package/libcamera-apps/libcamera-apps.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 290ee9a026..fe402ec3f4 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -29,6 +29,13 @@ else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 endif +ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_LIBDRM),yy) +LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 +endif + ifeq ($(BR2_PACKAGE_XORG7),y) LIBCAMERA_APPS_DEPENDENCIES += \ $(if $(BR2_PACKAGE_LIBEPOXY),libepoxy) \ From thomas.petazzoni at bootlin.com Wed Feb 22 14:52:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:52:22 +0100 Subject: [Buildroot] [git commit] boot/at91dataflashboot: disable stack-protector Message-ID: <20230222145311.60B0A866EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d868d09d3a0c0db2c5112964139e5ecae8b1da51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable stack-protector to avoid the following build failure: /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T elf32-littlearm.lds -Ttext 0 -n -o DataflashBoot-1.05.out objs/cstartup_ram.o objs/at45.o objs/com.o objs/dataflash.o objs/div0.o objs/init.o objs/main.o objs/stdio.o objs/asm_isr.o objs/jump.o objs/_udivsi3.o objs/_umodsi3.o objs/led.o /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: objs/main.o: in function `main': main.c:(.text.startup+0x834): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/502c54be4978e628724d72ee2a75d4c5e0a6ace8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- boot/at91dataflashboot/at91dataflashboot.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk index 0ad8b6fc44..c66f27e343 100644 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ b/boot/at91dataflashboot/at91dataflashboot.mk @@ -12,7 +12,8 @@ AT91DATAFLASHBOOT_INSTALL_TARGET = NO AT91DATAFLASHBOOT_INSTALL_IMAGES = YES define AT91DATAFLASHBOOT_BUILD_CMDS - make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) + make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \ + CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector" endef define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS From thomas.petazzoni at bootlin.com Wed Feb 22 14:55:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:55:33 +0100 Subject: [Buildroot] [git commit] boot/opensbi: fix build with empty OPENSBI_PLAT Message-ID: <20230222145543.A0657866EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd061466f90e3f17d47d4e1641590d60c07a6cac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure when OPENSBI_PLAT is empty raised since commit 9b5b7165deb91bad3cdb1ea0dd8f940eff75f3a9: /usr/bin/install -m 0644 -D /nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin /nvmedata/autobuild/instance-4/output-1/images/fw_jump.bin /usr/bin/install: cannot stat '/nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin': No such file or directory Fixes: - http://autobuild.buildroot.org/results/8033327f090e4a3d84a7fce1f62b14fdf89dbd89 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- boot/opensbi/opensbi.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk index 06ec87b2c3..dd113a0bf8 100644 --- a/boot/opensbi/opensbi.mk +++ b/boot/opensbi/opensbi.mk @@ -71,6 +71,7 @@ OPENSBI_INSTALL_IMAGES = YES OPENSBI_FW_IMAGES += payload endif +ifneq ($(OPENSBI_PLAT),) define OPENSBI_INSTALL_IMAGES_CMDS $(foreach f,$(OPENSBI_FW_IMAGES),\ $(INSTALL) -m 0644 -D $(@D)/build/platform/$(OPENSBI_PLAT)/firmware/fw_$(f).bin \ @@ -79,6 +80,7 @@ define OPENSBI_INSTALL_IMAGES_CMDS $(BINARIES_DIR)/fw_$(f).elf ) endef +endif # libsbi.a is not a library meant to be linked in user-space code, but # with bare metal code, which is why we don't install it in From thomas.petazzoni at bootlin.com Wed Feb 22 14:55:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:55:43 +0100 Subject: [Buildroot] [PATCH 1/1] boot/opensbi: fix build with empty OPENSBI_PLAT In-Reply-To: <20230222095434.444552-1-fontaine.fabrice@gmail.com> References: <20230222095434.444552-1-fontaine.fabrice@gmail.com> Message-ID: <20230222155543.0b46db89@windsurf> On Wed, 22 Feb 2023 10:54:34 +0100 Fabrice Fontaine wrote: > Fix the following build failure when OPENSBI_PLAT is empty raised since > commit 9b5b7165deb91bad3cdb1ea0dd8f940eff75f3a9: > > /usr/bin/install -m 0644 -D /nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin /nvmedata/autobuild/instance-4/output-1/images/fw_jump.bin > /usr/bin/install: cannot stat '/nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin': No such file or directory > > Fixes: > - http://autobuild.buildroot.org/results/8033327f090e4a3d84a7fce1f62b14fdf89dbd89 > > Signed-off-by: Fabrice Fontaine > --- > boot/opensbi/opensbi.mk | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 14:56:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:56:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/sudo: fix openssl static build In-Reply-To: <20230222094441.439014-1-fontaine.fabrice@gmail.com> References: <20230222094441.439014-1-fontaine.fabrice@gmail.com> Message-ID: <20230222155601.279070c4@windsurf> On Wed, 22 Feb 2023 10:44:41 +0100 Fabrice Fontaine wrote: > Fix the following build failure with sparc raised since bump to version > 1.9.11p2 in commit 9b7f8da96be549a52630cd87b30851d600f163a4 and > https://github.com/sudo-project/sudo/commit/9fbbca7b7a4cc60a8aa27d73de54278004a704c0: > > hecking for X509_STORE_CTX_get0_cert > configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 > /home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': > x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' > > [...] > > In file included from ./hostcheck.c:38: > ../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' > 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) > | ^~~~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b > > Signed-off-by: Fabrice Fontaine > --- > ...onfigure.ac-fix-openssl-static-build.patch | 49 +++++++++++++++++++ > package/sudo/sudo.mk | 2 + > 2 files changed, 51 insertions(+) > create mode 100644 package/sudo/0001-configure.ac-fix-openssl-static-build.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 14:56:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:56:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/gcc/gcc-initial: fix typo In-Reply-To: <20230221224747.117361-1-fontaine.fabrice@gmail.com> References: <20230221224747.117361-1-fontaine.fabrice@gmail.com> Message-ID: <20230222155625.5444048e@windsurf> On Tue, 21 Feb 2023 23:47:47 +0100 Fabrice Fontaine wrote: > Fix typo: am internal step -> an internal step > > Signed-off-by: Fabrice Fontaine > --- > package/gcc/gcc-initial/gcc-initial.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 14:55:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:55:51 +0100 Subject: [Buildroot] [git commit] package/sudo: fix openssl static build Message-ID: <20230222145706.44E1A86705@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4655d84ff567e8ecc2665ac0760ef01023aae91d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with sparc raised since bump to version 1.9.11p2 in commit 9b7f8da96be549a52630cd87b30851d600f163a4 and https://github.com/sudo-project/sudo/commit/9fbbca7b7a4cc60a8aa27d73de54278004a704c0: hecking for X509_STORE_CTX_get0_cert configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 /home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' [...] In file included from ./hostcheck.c:38: ../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) | ^~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...001-configure.ac-fix-openssl-static-build.patch | 49 ++++++++++++++++++++++ package/sudo/sudo.mk | 2 + 2 files changed, 51 insertions(+) diff --git a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch new file mode 100644 index 0000000000..32edd148a0 --- /dev/null +++ b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch @@ -0,0 +1,49 @@ +From 5cfc7e277d0b262a1d12e867c47a36301fb7edb7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 22 Feb 2023 10:01:25 +0100 +Subject: [PATCH] configure.ac: fix openssl static build + +Do not use AX_APPEND_FLAG as it will break static builds by removing +duplicates such as -lz or -latomic which are needed by -lssl and +-lcrypto. This will fix the following build failure with sparc which +needs -latomic: + +Checking for X509_STORE_CTX_get0_cert +configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 +/home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': +x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' + +[...] + +In file included from ./hostcheck.c:38: +../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' + 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) + | ^~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/sudo-project/sudo/pull/244] +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8eccad7e4..523d8e56b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3082,7 +3082,9 @@ if test "${enable_openssl-no}" != no; then + SUDO_APPEND_LIBPATH([LIBTLS], [$f]) + ;; + *) +- AX_APPEND_FLAG([$f], [LIBTLS]) ++ # Do not use AX_APPEND_FLAG as it will break static builds by removing ++ # duplicates such as -lz or -latomic which are needed by -lssl and -lcrypto ++ LIBTLS="$LIBTLS $f" + ;; + esac + done +-- +2.39.0 + diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index c4eaafa6b1..3b5c898917 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -13,6 +13,8 @@ SUDO_LICENSE_FILES = LICENSE.md SUDO_CPE_ID_VERSION = $(SUDO_VERSION_MAJOR) SUDO_CPE_ID_UPDATE = $(SUDO_VERSION_MINOR) SUDO_SELINUX_MODULES = sudo +# We're patching configure.ac +SUDO_AUTORECONF = YES # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \ From thomas.petazzoni at bootlin.com Wed Feb 22 14:56:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:56:10 +0100 Subject: [Buildroot] [git commit] package/gcc/gcc-initial: fix typo Message-ID: <20230222145706.4FA5A86708@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51793e0d56eef07d9f68c676f9c84be3f425082b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix typo: am internal step -> an internal step Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gcc/gcc-initial/gcc-initial.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index ebd8e8f017..a8ac20c5d8 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -9,7 +9,7 @@ GCC_INITIAL_SITE = $(GCC_SITE) GCC_INITIAL_SOURCE = $(GCC_SOURCE) # We do not have a 'gcc' package per-se; we only have two incarnations, -# gcc-initial and gcc-final. gcc-initial is just am internal step that +# gcc-initial and gcc-final. gcc-initial is just an internal step that # users should not care about, while gcc-final is the one they shall see. HOST_GCC_INITIAL_DL_SUBDIR = gcc From thomas.petazzoni at bootlin.com Wed Feb 22 14:58:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:58:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/hackrf: bump to version 2023.01.1 In-Reply-To: <20230222094916.1853413-1-diego.hdmp@gmail.com> References: <20230222094916.1853413-1-diego.hdmp@gmail.com> Message-ID: <20230222155803.3789d84b@windsurf> On Wed, 22 Feb 2023 10:49:16 +0100 Diego Hurtado de Mendoza wrote: > https://github.com/greatscottgadgets/hackrf/releases/tag/v2023.01.1 > > Signed-off-by: Diego Hurtado de Mendoza > --- > package/hackrf/hackrf.hash | 2 +- > package/hackrf/hackrf.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Wed Feb 22 14:50:59 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 22 Feb 2023 15:50:59 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 7.0.1 Message-ID: <20230222145059.1939094-1-giulio.benetti@benettiengineering.com> Since the major release changed all the packages that have direct dependency to harfbuzz has been succesfully built: - efl - libass - mupdf - pango - qt5base - qt5webengine - qt6base - sdl2_ttf - supertuxkart - vlc - webkitgtk - wpewebkit Signed-off-by: Giulio Benetti --- 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 9489f25c6a..eee48c0b68 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d harfbuzz-5.3.1.tar.xz +sha256 2cf4d3d8f225007511990a36a34195f0d6562ca56df0a8b0885b382837948199 harfbuzz-7.0.1.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index b0112168e1..f8724793a9 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 5.3.1 +HARFBUZZ_VERSION = 7.0.1 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 22 14:56:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:56:46 +0100 Subject: [Buildroot] [git commit branch/next] package/hackrf: bump to version 2023.01.1 Message-ID: <20230222145854.4CE8386715@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9793454bd2f0ada2b3928896aaf90b4d753d0399 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/greatscottgadgets/hackrf/releases/tag/v2023.01.1 Signed-off-by: Diego Hurtado de Mendoza Signed-off-by: Thomas Petazzoni --- package/hackrf/hackrf.hash | 2 +- package/hackrf/hackrf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hackrf/hackrf.hash b/package/hackrf/hackrf.hash index 16ccb9dcfb..0426009dd3 100644 --- a/package/hackrf/hackrf.hash +++ b/package/hackrf/hackrf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bacd4e7937467ffa14654624444c8b5c716ab470d8c1ee8d220d2094ae2adb3e hackrf-2022.09.1.tar.xz +sha256 32a03f943a30be4ba478e94bf69f14a5b7d55be6761007f4a4f5453418206a11 hackrf-2023.01.1.tar.xz sha256 49b60a6288f90f49074228cc1fae0fb16871ba36b756013abdf7c2fc92f01fad COPYING diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 4317da60bc..0d7533815d 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -4,7 +4,7 @@ # ################################################################################ -HACKRF_VERSION = 2022.09.1 +HACKRF_VERSION = 2023.01.1 HACKRF_SITE = https://github.com/greatscottgadgets/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause From fontaine.fabrice at gmail.com Wed Feb 22 15:04:49 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 16:04:49 +0100 Subject: [Buildroot] [PATCH RFC,1/1] package/gcc: fix GCC_DL_DIR Message-ID: <20230222150449.2005824-1-fontaine.fabrice@gmail.com> GCC_DL_DIR is empty as gcc is not a "real" package, as a result, the following (silent) error is raised when BR2_CCACHE is set: /home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/bin/ccache /usr/bin/gcc -O2 -I/home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/include -DBR_CROSS_PATH_SUFFIX='".br_real"' -DBR_CCACHE_HASH=\"` printf '%s\n' --target=aarch64_be-buildroot-linux-gnu --with-sysroot=@HOST_DIR@/aarch64_be-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto --with-gmp=@HOST_DIR@ --with-mpc=@HOST_DIR@ --with-mpfr=@HOST_DIR@ --with-bugurl="http://bugs.buildroot.net/" --without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads --without-isl --without-cloog --with-abi="lp64" --with-cpu=cortex-a53 --enable-languages=c --disable-shared --without-headers --disable-threads --with-newlib --disable-largefile | sha256sum - /gcc-11.3.0.tar.xz package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch | cut -c -64 | tr -d '\n'`\" -DBR_SYSROOT='"aarch64_be-buildroot-linux-gnu/sysroot"' -DBR_ADDITIONAL_CFLAGS='"-Wl,-z,max-page-size=65536", "-Wl,-z,common-page-size=65536", "-fstack-protector-strong",' -DBR_CCACHE -DBR2_RELRO_PARTIAL -s -Wl,--hash-style=both toolchain/toolchain-wrapper.c -o /home/thomas/autobuild/instance-0/output-1/build/host-gcc-initial-11.3.0/toolchain-wrapper sha256sum: /gcc-11.3.0.tar.xz: No such file or directory This patch replaces GCC_DL_DIR by HOST_GCC_INITIAL_DL_DIR. As, this can be considered as a "hack", any comment to improve this patch is appreciated Fixes: - Found when investigating: http://autobuild.buildroot.org/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd Signed-off-by: Fabrice Fontaine --- package/gcc/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 6dfd93f2a4..0755b59e96 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -284,7 +284,7 @@ HOST_GCC_COMMON_MAKE_OPTS = \ gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) ifeq ($(BR2_CCACHE),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(GCC_DL_DIR)/$(GCC_SOURCE) +HOST_GCC_COMMON_CCACHE_HASH_FILES += $(HOST_GCC_INITIAL_DL_DIR)/$(GCC_SOURCE) # Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned # and unversioned patches unconditionally. Moreover, to facilitate the -- 2.39.0 From thomas.petazzoni at bootlin.com Wed Feb 22 15:05:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 16:05:18 +0100 Subject: [Buildroot] [PATCH] package/wilc-driver: fix build failure due to wrong pointer casts In-Reply-To: <20221231174208.1999716-1-giulio.benetti@benettiengineering.com> References: <20221231174208.1999716-1-giulio.benetti@benettiengineering.com> Message-ID: <20230222160518.3361b224@windsurf> On Sat, 31 Dec 2022 18:42:08 +0100 Giulio Benetti wrote: > Add local patch pending upstream[0] to fix the bug. > > [0]: https://github.com/embeddedTS/wilc3000-external-module/pull/3 > > Fixes: > http://autobuild.buildroot.net/results/0a0/0a022d5c053bf8f7a53349b8bae4b2168a9cd134/ > > Signed-off-by: Giulio Benetti > --- > .../wilc-driver/0005-Fix-cast-warnings.patch | 43 +++++++++++++++++++ > 1 file changed, 43 insertions(+) > create mode 100644 package/wilc-driver/0005-Fix-cast-warnings.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 15:06:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 16:06:17 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/rtl8812au-aircrack-ng: bump to 2022-12-22 version of v5.6.4.2 branch In-Reply-To: <20221230025221.1051537-1-christian@paral.in> References: <20221230025221.1051537-1-christian@paral.in> Message-ID: <20230222160617.4728e771@windsurf> Hello Christian, On Thu, 29 Dec 2022 18:52:21 -0800 Christian Stewart via buildroot wrote: > Fixes: > http://autobuild.buildroot.net/results/4f6/4f65b521d5c6cffdf5f6294ce0257b9a19e441fc/ > > Reviewed-by: Giulio Benetti > Signed-off-by: Christian Stewart > > --- In the mean time, we merged "package/rtl8812au-aircrack-ng: bump to 2023-02-03 version to fix build failure with Linux 6.1", which updates to a even newer version, and therefore should hopefully address the same problems. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Wed Feb 22 15:37:24 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 22 Feb 2023 16:37:24 +0100 Subject: [Buildroot] [PATCH 2/2] package/harfbuzz: bump to version 6.0.0 In-Reply-To: <20230208230721.3269610-3-giulio.benetti@benettiengineering.com> References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> <20230208230721.3269610-3-giulio.benetti@benettiengineering.com> Message-ID: This patch is superseded by this one: https://patchwork.ozlabs.org/project/buildroot/patch/20230222145059.1939094-1-giulio.benetti at benettiengineering.com/ Best regards -- CEO/CTO at Benetti Engineering sas On 09/02/23 00:07, Giulio Benetti wrote: > Since the major release changed all the packages that have direct > dependency to harfbuzz has been succesfully built: > - efl > - libass > - mupdf > - pango > - qt5base > - qt5webengine > - qt6base > - sdl2_ttf > - supertuxkart > - vlc > - webkitgtk > - wpewebkit > > Signed-off-by: Giulio Benetti > --- > 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 9489f25c6a..faae7b91e3 100644 > --- a/package/harfbuzz/harfbuzz.hash > +++ b/package/harfbuzz/harfbuzz.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d harfbuzz-5.3.1.tar.xz > +sha256 1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4 harfbuzz-6.0.0.tar.xz > sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING > diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk > index b0112168e1..02fe4ecec3 100644 > --- a/package/harfbuzz/harfbuzz.mk > +++ b/package/harfbuzz/harfbuzz.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HARFBUZZ_VERSION = 5.3.1 > +HARFBUZZ_VERSION = 6.0.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 peter at korsgaard.com Wed Feb 22 15:48:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:48:54 +0100 Subject: [Buildroot] [PATCH v2] toolchain/Config.in: extend gcc bug 43744 to every sh architecture In-Reply-To: <20230205212521.903480-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sun, 5 Feb 2023 22:25:21 +0100") References: <20230205131559.6f79944f@windsurf> <20230205212521.903480-1-giulio.benetti@benettiengineering.com> Message-ID: <87mt55wvix.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Gcc bug 43744 affects seems to affect all SH family because it already > affects: > 1) sh4, here you can find a buildroot defconfig that fails to build: > http://autobuild.buildroot.net/results/1db/1db6c59c98e3c09fa13277076ee2fbe7967f1f6b/defconfig > 2) sh4a, here you can find a buildroot defconfig that fails to build: > http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a/defconfig > Note also that gcc bugzilla entry reports the bug for SH and not for > sub-architectures: > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43744 > So let's extend the bug to BR2_sh to match the entire SH architecture. > Signed-off-by: Giulio Benetti > --- V1-> V2: > * add a commit log with details about gcc bug 43744 as pointed by Thomas Petazzoni Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 15:50:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:50:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongoose: fix build with gcc 4.8 In-Reply-To: <20230114170738.1101463-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 14 Jan 2023 18:07:38 +0100") References: <20230114170738.1101463-1-fontaine.fabrice@gmail.com> Message-ID: <87ilftwvge.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with gcc 4.8 raised since bump to > version 7.8 in commit f9e51e1150f59962577358b3da5c390ca4749291: > /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c: In function 'mg_iotest': > /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c:4484:3: error: 'for' loop initial declarations are only allowed in C99 mode > for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) { > ^ > Fixes: > - http://autobuild.buildroot.org/results/c538c6d8e87e4e24097c9878ee15083802276505 > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 15:52:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:52:27 +0100 Subject: [Buildroot] [git commit] package/yajl: explicitly request a tag in _SITE In-Reply-To: <20230206100315.9B99A839FF@busybox.osuosl.org> (Arnout Vandecappelle's message of "Mon, 6 Feb 2023 11:02:53 +0100") References: <20230206100315.9B99A839FF@busybox.osuosl.org> Message-ID: <87edqhwvd0.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > commit: https://git.buildroot.net/buildroot/commit/?id=5be76a39d3a0c21d6f3ceeab0889edc3cec9f2f3 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The yajl repository has both a branch and a tag names 2.1.0. Because of > this, when we use the usual github URL [1], github doesn't return a > tarball but rather an ASCII string: > the given path has multiple possibilities: #, # > This obviously (and fortunately) leads to a hash check failure. > To make sure we get the tag and not the branch, we should use a URL that > explicitly asks for refs/tags/2.1.0 [2]. We can't change VERSION to > include refs/tags, because that also affects the _SOURCE default, the > contents of the tarball, the CPE ID and the release-monitoring access. > Therefore, add the refs/tags/ prefix to the github helper call. > [1] https://github.com/lloyd/yajl/archive/2.1.0/yajl-2.1.0.tar.gz > [1] https://github.com/lloyd/yajl/archive/refs/tags/2.1.0/yajl-2.1.0.tar.gz > Signed-off-by: Arnout Vandecappelle Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 15:53:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:53:35 +0100 Subject: [Buildroot] [next] package/thermald: bump to 2.5.1 In-Reply-To: <20221127141926.1976657-1-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 11:19:26 -0300") References: <20221127141926.1976657-1-ricardo.martincoski@gmail.com> Message-ID: <87a615wvb4.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > README.txt states only these changes: > - Static analysis fixes > - Missing init, which causes skipping of conditions in a Dell system > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 15:51:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:51:59 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/yajl: explicitly request a tag in _SITE Message-ID: <20230222155428.B464F86727@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6751cb90fef4f745c499cdeacd9559d6a9b2a17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The yajl repository has both a branch and a tag names 2.1.0. Because of this, when we use the usual github URL [1], github doesn't return a tarball but rather an ASCII string: the given path has multiple possibilities: #, # This obviously (and fortunately) leads to a hash check failure. To make sure we get the tag and not the branch, we should use a URL that explicitly asks for refs/tags/2.1.0 [2]. We can't change VERSION to include refs/tags, because that also affects the _SOURCE default, the contents of the tarball, the CPE ID and the release-monitoring access. Therefore, add the refs/tags/ prefix to the github helper call. [1] https://github.com/lloyd/yajl/archive/2.1.0/yajl-2.1.0.tar.gz [1] https://github.com/lloyd/yajl/archive/refs/tags/2.1.0/yajl-2.1.0.tar.gz Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5be76a39d3a0c21d6f3ceeab0889edc3cec9f2f3) Signed-off-by: Peter Korsgaard --- package/yajl/yajl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index 1fb16f50e9..d14a68b402 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -5,7 +5,7 @@ ################################################################################ YAJL_VERSION = 2.1.0 -YAJL_SITE = $(call github,lloyd,yajl,$(YAJL_VERSION)) +YAJL_SITE = $(call github,lloyd,yajl,refs/tags/$(YAJL_VERSION)) YAJL_INSTALL_STAGING = YES YAJL_LICENSE = ISC YAJL_LICENSE_FILES = COPYING From fontaine.fabrice at gmail.com Wed Feb 22 15:55:29 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 16:55:29 +0100 Subject: [Buildroot] [PATCH 2/2] package/harfbuzz: bump to version 6.0.0 In-Reply-To: References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> <20230208230721.3269610-3-giulio.benetti@benettiengineering.com> Message-ID: Hi, Le mer. 22 f?vr. 2023 ? 16:37, Giulio Benetti < giulio.benetti at benettiengineering.com> a ?crit : > This patch is superseded by this one: > > https://patchwork.ozlabs.org/project/buildroot/patch/20230222145059.1939094-1-giulio.benetti at benettiengineering.com/ This bump should be tagged as a security bump as it includes a fix for CVE-2023-25193 (or you could backport fix on master). > > > Best regards > -- > CEO/CTO at Benetti Engineering sas > > On 09/02/23 00:07, Giulio Benetti wrote: > > Since the major release changed all the packages that have direct > > dependency to harfbuzz has been succesfully built: > > - efl > > - libass > > - mupdf > > - pango > > - qt5base > > - qt5webengine > > - qt6base > > - sdl2_ttf > > - supertuxkart > > - vlc > > - webkitgtk > > - wpewebkit > > > > Signed-off-by: Giulio Benetti > > --- > > 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 9489f25c6a..faae7b91e3 100644 > > --- a/package/harfbuzz/harfbuzz.hash > > +++ b/package/harfbuzz/harfbuzz.hash > > @@ -1,3 +1,3 @@ > > # Locally computed > > -sha256 > 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d > harfbuzz-5.3.1.tar.xz > > +sha256 > 1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4 > harfbuzz-6.0.0.tar.xz > > sha256 > 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING > > diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk > > index b0112168e1..02fe4ecec3 100644 > > --- a/package/harfbuzz/harfbuzz.mk > > +++ b/package/harfbuzz/harfbuzz.mk > > @@ -4,7 +4,7 @@ > > # > > > ################################################################################ > > > > -HARFBUZZ_VERSION = 5.3.1 > > +HARFBUZZ_VERSION = 6.0.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) > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Wed Feb 22 15:51:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:51:12 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/yajl: explicitly request a tag in _SITE Message-ID: <20230222155544.9AB5486743@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd67740aa9946be0c272f89fc5795ff597664cf6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The yajl repository has both a branch and a tag names 2.1.0. Because of this, when we use the usual github URL [1], github doesn't return a tarball but rather an ASCII string: the given path has multiple possibilities: #, # This obviously (and fortunately) leads to a hash check failure. To make sure we get the tag and not the branch, we should use a URL that explicitly asks for refs/tags/2.1.0 [2]. We can't change VERSION to include refs/tags, because that also affects the _SOURCE default, the contents of the tarball, the CPE ID and the release-monitoring access. Therefore, add the refs/tags/ prefix to the github helper call. [1] https://github.com/lloyd/yajl/archive/2.1.0/yajl-2.1.0.tar.gz [1] https://github.com/lloyd/yajl/archive/refs/tags/2.1.0/yajl-2.1.0.tar.gz Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5be76a39d3a0c21d6f3ceeab0889edc3cec9f2f3) Signed-off-by: Peter Korsgaard --- package/yajl/yajl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index 1fb16f50e9..d14a68b402 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -5,7 +5,7 @@ ################################################################################ YAJL_VERSION = 2.1.0 -YAJL_SITE = $(call github,lloyd,yajl,$(YAJL_VERSION)) +YAJL_SITE = $(call github,lloyd,yajl,refs/tags/$(YAJL_VERSION)) YAJL_INSTALL_STAGING = YES YAJL_LICENSE = ISC YAJL_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 22 15:52:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:52:58 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/thermald: bump to 2.5.1 Message-ID: <20230222155544.A584C86744@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4adcd3c4b229bd73df34980160f7647606e50936 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x README.txt states only these changes: - Static analysis fixes - Missing init, which causes skipping of conditions in a Dell system Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 11d98385f56e61e2928707f056c001ceec5d06e9) Signed-off-by: Peter Korsgaard --- package/thermald/thermald.hash | 2 +- package/thermald/thermald.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/thermald/thermald.hash b/package/thermald/thermald.hash index eceff77d37..9693813ca9 100644 --- a/package/thermald/thermald.hash +++ b/package/thermald/thermald.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e6515678ce8ff37978a453e1617a087a40ba3a31809a42c1768b6f816e564cc9 thermald-2.5.tar.gz +sha256 75c165df45b3d09c904d314c8c19789158e9538f46e3d2b606457dc631eb3af5 thermald-2.5.1.tar.gz sha256 e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d COPYING diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk index 38f6b5a00f..fd0246745f 100644 --- a/package/thermald/thermald.mk +++ b/package/thermald/thermald.mk @@ -4,7 +4,7 @@ # ################################################################################ -THERMALD_VERSION = 2.5 +THERMALD_VERSION = 2.5.1 THERMALD_SITE = $(call github,intel,thermal_daemon,v$(THERMALD_VERSION)) # fetched from Github, with no configure script THERMALD_AUTORECONF = YES From peter at korsgaard.com Wed Feb 22 15:46:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:46:24 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] toolchain/Config.in: extend gcc bug 43744 to every sh architecture Message-ID: <20230222155544.807AE86740@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b15b33fc57949b49f2b347b99e8b5d7d085f0e32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Gcc bug 43744 affects seems to affect all SH family because it already affects: 1) sh4, here you can find a buildroot defconfig that fails to build: http://autobuild.buildroot.net/results/1db/1db6c59c98e3c09fa13277076ee2fbe7967f1f6b/defconfig 2) sh4a, here you can find a buildroot defconfig that fails to build: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a/defconfig Note also that gcc bugzilla entry reports the bug for SH and not for sub-architectures: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43744 So let's extend the bug to BR2_sh to match the entire SH architecture. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit ee7cf14b5188aca5f17dd38ab0b6673d5789942b) Signed-off-by: Peter Korsgaard --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 4947ab3aae..a00a486bed 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -115,7 +115,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_43744 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 - depends on BR2_sh4 + depends on BR2_sh # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63261. This bug no # longer exists in gcc 8.x. From peter at korsgaard.com Wed Feb 22 15:50:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:50:03 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/mongoose: fix build with gcc 4.8 Message-ID: <20230222155544.8FC0686741@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5efc9e326d033b52da69bd1670127d894dfd59b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fix the following build failure with gcc 4.8 raised since bump to version 7.8 in commit f9e51e1150f59962577358b3da5c390ca4749291: /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c: In function 'mg_iotest': /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c:4484:3: error: 'for' loop initial declarations are only allowed in C99 mode for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) { ^ Fixes: - http://autobuild.buildroot.org/results/c538c6d8e87e4e24097c9878ee15083802276505 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 6139aeacd847487a296f1c7b8a9d302d678cd8ab) Signed-off-by: Peter Korsgaard --- package/mongoose/mongoose.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 8d06ed4689..0693f7553a 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -13,7 +13,7 @@ MONGOOSE_INSTALL_STAGING = YES # static library MONGOOSE_INSTALL_TARGET = NO -MONGOOSE_CFLAGS = $(TARGET_CFLAGS) +MONGOOSE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGOOSE_DEPENDENCIES += openssl From fontaine.fabrice at gmail.com Wed Feb 22 16:05:10 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 17:05:10 +0100 Subject: [Buildroot] [PATCH 1/5] package/gnuradio: drop unrecognized volk variables Message-ID: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Volk submodule has been removed since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/80c04479da962d048d41165081b026aafdaa0316 orc dependency can also be dropped as it was only used by volk submodule Signed-off-by: Fabrice Fontaine --- package/gnuradio/gnuradio.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index cc41f1e12b..c2fcba9586 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -22,9 +22,7 @@ GNURADIO_DEPENDENCIES = \ GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ - -DENABLE_VOLK=ON \ -DENABLE_GNURADIO_RUNTIME=ON \ - -DENABLE_INTERNAL_VOLK=OFF \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND @@ -36,13 +34,6 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) GNURADIO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif -ifeq ($(BR2_PACKAGE_ORC),y) -GNURADIO_DEPENDENCIES += orc -GNURADIO_CONF_OPTS += -DENABLE_ORC=ON -else -GNURADIO_CONF_OPTS += -DENABLE_ORC=OFF -endif - ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON else -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 16:05:11 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 17:05:11 +0100 Subject: [Buildroot] [PATCH 2/5] package/gnuradio: disable examples In-Reply-To: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Message-ID: <20230222160514.2069544-2-fontaine.fabrice@gmail.com> Examples can be disabled since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/530262c6df3fb9b87a80133dbde5650dbe948c4c Signed-off-by: Fabrice Fontaine --- package/gnuradio/gnuradio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index c2fcba9586..c2e5ec5cad 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -22,6 +22,7 @@ GNURADIO_DEPENDENCIES = \ GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ + -DENABLE_EXAMPLES=OFF \ -DENABLE_GNURADIO_RUNTIME=ON \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 16:05:12 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 17:05:12 +0100 Subject: [Buildroot] [PATCH 3/5] package/gnuradio: add libsndfile optional dependency In-Reply-To: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Message-ID: <20230222160514.2069544-3-fontaine.fabrice@gmail.com> libsndfile is an optional dependency since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/18f64ba685cfc2533e2d7726aa43c524b007d97b Signed-off-by: Fabrice Fontaine --- package/gnuradio/gnuradio.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index c2e5ec5cad..59fb23d89d 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -55,6 +55,9 @@ endif ifeq ($(BR2_PACKAGE_GNURADIO_BLOCKS),y) GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=ON +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +GNURADIO_DEPENDENCIES += libsndfile +endif else GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=OFF endif -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 16:05:13 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 17:05:13 +0100 Subject: [Buildroot] [PATCH 4/5] package/gnuradio: add gr-network block support In-Reply-To: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Message-ID: <20230222160514.2069544-4-fontaine.fabrice@gmail.com> grnet networking block support is available since version version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/cc37c3e8cd5eabcb5c9d919e5fffc5d938690140 gr-network is a mandatory dependency of latest gqrx Signed-off-by: Fabrice Fontaine --- package/gnuradio/Config.in | 6 ++++++ package/gnuradio/gnuradio.mk | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 1824589263..51237e62b9 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -134,6 +134,12 @@ config BR2_PACKAGE_GNURADIO_FILTER help Filter signal processing blocks +config BR2_PACKAGE_GNURADIO_NETWORK + bool "gr-network support" + select BR2_PACKAGE_GNURADIO_BLOCKS + help + TCP and UDP source/sink blocks + config BR2_PACKAGE_GNURADIO_QTGUI bool "gr-qtgui" depends on BR2_PACKAGE_GNURADIO_PYTHON diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 59fb23d89d..d9218b533d 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -106,6 +106,12 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_NETWORK),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GNURADIO_DEPENDENCIES += python3 python-pybind \ host-python-numpy host-python-packaging -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 16:05:14 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 17:05:14 +0100 Subject: [Buildroot] [PATCH 5/5] package/gqrx: bump to version 2.15.9 In-Reply-To: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Message-ID: <20230222160514.2069544-5-fontaine.fabrice@gmail.com> This bump will fix the following build failure raised since bump pf gnuradio to version 3.10.4.0 in commit e37c110bead8b7b35cd97915673fa785ccb39f2d: In file included from /home/buildroot/autobuild/instance-2/output-1/build/gqrx-2.14.4/src/applications/gqrx/receiver.cpp:32: /home/buildroot/autobuild/instance-2/output-1/build/gqrx-2.14.4/src/applications/gqrx/receiver.h:34:10: fatal error: gnuradio/blocks/wavfile_sink.h: No such file or directory 34 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/gqrx-sdr/gqrx/blob/v2.15.9/resources/news.txt Fixes: - http://autobuild.buildroot.org/results/42b5ab2e555063273ea55fd1c09a9be6d8b620e2 Signed-off-by: Fabrice Fontaine --- package/gqrx/Config.in | 2 ++ package/gqrx/gqrx.hash | 2 +- package/gqrx/gqrx.mk | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in index 442b28e546..97f0b7de07 100644 --- a/package/gqrx/Config.in +++ b/package/gqrx/Config.in @@ -34,7 +34,9 @@ config BR2_PACKAGE_GQRX select BR2_PACKAGE_GNURADIO_DIGITAL select BR2_PACKAGE_GNURADIO_FFT select BR2_PACKAGE_GNURADIO_FILTER + select BR2_PACKAGE_GNURADIO_NETWORK select BR2_PACKAGE_GR_OSMOSDR + select BR2_PACKAGE_LIBSNDFILE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5SVG diff --git a/package/gqrx/gqrx.hash b/package/gqrx/gqrx.hash index 1991dfea82..567ff947f9 100644 --- a/package/gqrx/gqrx.hash +++ b/package/gqrx/gqrx.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 aec35c77ebde9c71a5f973c509eec3d6aa2f18a6e052b180fcd9029d88273e5b gqrx-2.14.4.tar.gz +sha256 4a826b468b2fb38a59cbe1f1b566e62c3114509186a7a25ba27dc92833f3eb44 gqrx-2.15.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK diff --git a/package/gqrx/gqrx.mk b/package/gqrx/gqrx.mk index 4d464298ca..d2518213b8 100644 --- a/package/gqrx/gqrx.mk +++ b/package/gqrx/gqrx.mk @@ -4,11 +4,11 @@ # ################################################################################ -GQRX_VERSION = 2.14.4 +GQRX_VERSION = 2.15.9 GQRX_SITE = $(call github,csete,gqrx,v$(GQRX_VERSION)) GQRX_LICENSE = GPL-3.0+, Apache-2.0 GQRX_LICENSE_FILES = COPYING LICENSE-CTK -GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg +GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr libsndfile qt5base qt5svg GQRX_CONF_OPTS = -DLINUX_AUDIO_BACKEND=Gr-audio -- 2.39.0 From peter at korsgaard.com Wed Feb 22 16:08:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:08:08 +0100 Subject: [Buildroot] [next 01/25] *: fix typo for separate(d|) in text In-Reply-To: <20221127130739.1862398-2-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:15 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-2-ricardo.martincoski@gmail.com> Message-ID: <875ybtwumv.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > seperate is a common misspelling of separate > Fix all the typos in the tree that are not related to patch files. > CHANGES > seperate -> separate, in the list of changes > Config.in.legacy > seperate -> separate, in option name and help texts > package/leafnode2/leafnode2.mk > seperate -> separate, in a comment > system/Config.in > seperated -> separated, in a help text > Cc: Bernd Kuhls > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:08:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:08:14 +0100 Subject: [Buildroot] [next 02/25] package, legacy: fix typo for "daemon" on help text In-Reply-To: <20221127130739.1862398-3-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:16 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-3-ricardo.martincoski@gmail.com> Message-ID: <871qmhwump.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > deamon -> daemon > At same time, in Config.in.legacy fix other typos in the same help text: > spae -> space > monolitic -> monolithic > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:08:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:08:28 +0100 Subject: [Buildroot] [next 03/25] Config.in.legacy: fix typo on BR2_PACKAGE_MEDIAART_BACKEND_QT In-Reply-To: <20221127130739.1862398-4-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:17 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-4-ricardo.martincoski@gmail.com> Message-ID: <87wn49vg1v.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Currently using this minimal .config: > BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF=y > triggers: > *** Legacy options removed in 2018.05 *** > [ ] libmediaart none backend option renamed (NEW) > [*] libmediaart gdk-pixbuf backend option renamed > [*] libmediaart qt backend option renamed > Commit "8553b39887 libmediaart: rename options to have proper prefix", > part of the 2018.05 release had a copy&paste error. > As stated in the beginning of the file: > The oldest symbols will be removed again after about two years. > But while we carry these legacy symbols, let's fix the typo. > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski > --- > NOTE: Maybe it is time to drop old legacy symbols again? > If so, some patches in this series can be dropped. Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:09:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:09:08 +0100 Subject: [Buildroot] [next 04/25] utils/checkpackagelib: warn about redefined config In-Reply-To: <20221127130739.1862398-5-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:18 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-5-ricardo.martincoski@gmail.com> Message-ID: <87sfexvg0r.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Warn the developer in the case the same config is declared more than > once in the same Config.in file. > But take into account the conditional code that lets the config be > visible and warn only when it is declared more than once in the same > conditions. > For instance, do not warn for: > if BR2_PACKAGE_BUSYBOX > config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > endif > if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else > config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > endif > Signed-off-by: Ricardo Martincoski > --- > Applying only this patch on current master, check-package returns: > Config.in.legacy:2597: config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF > redeclared (previous line: 2589) Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 15:57:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:57:34 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package, legacy: fix typo for "daemon" on help text Message-ID: <20230222161022.A77798675D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42743a9503e83365ffa7b57f4423527cf2b672eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x deamon -> daemon At same time, in Config.in.legacy fix other typos in the same help text: spae -> space monolitic -> monolithic Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 6a9feaabbce4f21dd2a688d35a5027cb0e2a7a22) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 4 ++-- package/ngircd/Config.in | 2 +- package/rp-pppoe/Config.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 40bbcd41ba..896e75a9d6 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4338,8 +4338,8 @@ config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - - a monolitic user space library - - a user spae deamon driver + - a monolithic user space library + - a user space daemon driver config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" diff --git a/package/ngircd/Config.in b/package/ngircd/Config.in index 9b3d430922..1e93a5702c 100644 --- a/package/ngircd/Config.in +++ b/package/ngircd/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_NGIRCD bool "ngircd" depends on BR2_USE_MMU # fork() help - Next Generation IRC server deamon. + Next Generation IRC server daemon. http://ngircd.barton.de diff --git a/package/rp-pppoe/Config.in b/package/rp-pppoe/Config.in index 2ac81cbb2d..6ff005a1e1 100644 --- a/package/rp-pppoe/Config.in +++ b/package/rp-pppoe/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_RP_PPPOE select BR2_PACKAGE_PPPD help An implementation of the Point-to-point protocol over - Ethernet. Has userspace client and server deamons. You + Ethernet. Has userspace client and server daemons. You likely only need this package if you are implementing the pppoe server that will service other pppoe client devices. Otherwise the normal client functionality already From peter at korsgaard.com Wed Feb 22 16:08:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:08:58 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] utils/checkpackagelib: warn about redefined config Message-ID: <20230222161022.C25D886759@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eace3a9a0323098cbdd2774de6b09823865ba377 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Warn the developer in the case the same config is declared more than once in the same Config.in file. But take into account the conditional code that lets the config be visible and warn only when it is declared more than once in the same conditions. For instance, do not warn for: if BR2_PACKAGE_BUSYBOX config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 4bbda72743d39df29dfc91e0f52be02b2d465f6d) Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_config.py | 38 ++++++++++++++++ utils/checkpackagelib/test_lib_config.py | 78 ++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index b05831f2c3..f26ca0d898 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -233,3 +233,41 @@ class Indent(_CheckFunction): return ["{}:{}: should not be indented" .format(self.filename, lineno), text] + + +class RedefinedConfig(_CheckFunction): + CONFIG = re.compile(r"^\s*(menu|)config\s+(BR2_\w+)\b") + IF = re.compile(r"^\s*if\s+([^#]*)\b") + ENDIF = re.compile(r"^\s*endif\b") + + def before(self): + self.configs = {} + self.conditional = [] + + def check_line(self, lineno, text): + if _empty_or_comment(text) or _part_of_help_text(text): + return + + m = self.IF.search(text) + if m is not None: + condition = m.group(1) + self.conditional.append(condition) + return + + m = self.ENDIF.search(text) + if m is not None: + self.conditional.pop() + return + + m = self.CONFIG.search(text) + if m is None: + return + config = m.group(2) + + key = (config, ' AND '.join(self.conditional)) + if key in self.configs.keys(): + previous_line = self.configs[key] + return ["{}:{}: config {} redeclared (previous line: {})" + .format(self.filename, lineno, config, previous_line), + text] + self.configs[key] = lineno diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py index 91a549adf2..474d17105e 100644 --- a/utils/checkpackagelib/test_lib_config.py +++ b/utils/checkpackagelib/test_lib_config.py @@ -385,3 +385,81 @@ Indent = [ def test_Indent(testname, filename, string, expected): warnings = util.check_file(m.Indent, filename, string) assert warnings == expected + + +RedefinedConfig = [ + ('no redefinition', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO_BAR\n' + 'bool "foo"\n', + []), + ('no conditional', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('three times', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:3: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n'], + ['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('same conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:6: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:8: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('not equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if !BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', RedefinedConfig) +def test_RedefinedConfig(testname, filename, string, expected): + warnings = util.check_file(m.RedefinedConfig, filename, string) + assert warnings == expected From peter at korsgaard.com Wed Feb 22 15:54:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:54:42 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] *: fix typo for separate(d|) in text Message-ID: <20230222161022.96FD186759@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcd81208ad9bbbd6368262a89b9a9122d5a4be1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x seperate is a common misspelling of separate Fix all the typos in the tree that are not related to patch files. CHANGES seperate -> separate, in the list of changes Config.in.legacy seperate -> separate, in option name and help texts package/leafnode2/leafnode2.mk seperate -> separate, in a comment system/Config.in seperated -> separated, in a help text Cc: Bernd Kuhls Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 4092d2a3546c1edfcb27f9d00fd4e7cac9878d2f) Signed-off-by: Peter Korsgaard --- CHANGES | 4 ++-- Config.in.legacy | 6 +++--- package/leafnode2/leafnode2.mk | 2 +- system/Config.in | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index e501fcb4c6..d8507a5a25 100644 --- a/CHANGES +++ b/CHANGES @@ -7661,7 +7661,7 @@ Architecture: Default to bf532 CPU variant for blackfin, Fix flat one memory region support for m68k and disable flat - seperate data support because of compatibility issues. + separate data support because of compatibility issues. Defconfigs: Minnowboard and Raspberrypi: Fix errors with post-build scripts when systemd is used. @@ -8197,7 +8197,7 @@ Minor fixes. - Merged/seperate /usr handling is now also performed for + Merged/separate /usr handling is now also performed for staging so cross-gdb / gdbserver can find the libraries. Updated/fixed packages: autossh, conntrack-tools, dcron, diff --git a/Config.in.legacy b/Config.in.legacy index 49f63fd14c..40bbcd41ba 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -3254,7 +3254,7 @@ config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND select BR2_PACKAGE_RESTORECOND help The policycoreutils package no longer offers restorecond - as a option. This package has been moved into a seperate + as a option. This package has been moved into a separate package maintained by the SELinux maintainers. config BR2_PACKAGE_SEPOLGEN @@ -3848,7 +3848,7 @@ config BR2_GDB_VERSION_7_9 comment "Legacy options removed in 2016.11" config BR2_PACKAGE_PHP_SAPI_CLI_CGI - bool "PHP CGI and CLI options are now seperate" + bool "PHP CGI and CLI options are now separate" select BR2_PACKAGE_PHP_SAPI_CLI select BR2_PACKAGE_PHP_SAPI_CGI select BR2_LEGACY @@ -4878,7 +4878,7 @@ config BR2_PACKAGE_KODI_PVR_ADDONS select BR2_PACKAGE_KODI_PVR_VUPLUS select BR2_PACKAGE_KODI_PVR_WMC help - Kodi PVR addon was split into seperate modules + Kodi PVR addon was split into separate modules config BR2_BINUTILS_VERSION_2_23_2 bool "binutils 2.23 option renamed" diff --git a/package/leafnode2/leafnode2.mk b/package/leafnode2/leafnode2.mk index a02aad4302..e82ca2e1ee 100644 --- a/package/leafnode2/leafnode2.mk +++ b/package/leafnode2/leafnode2.mk @@ -23,7 +23,7 @@ LEAFNODE2_CONF_OPTS = \ --enable-runas-user=root # Leafnode2 needs the host version of b_sortnl during -# compilation. Instead of creating a seperate host package and +# compilation. Instead of creating a separate host package and # installing b_sortnl to $(HOST_DIR) this binary is compiled # on-the-fly, host-pcre is needed for this define LEAFNODE2_BUILD_SORTNL_TOOL diff --git a/system/Config.in b/system/Config.in index 888c24ce81..e6dcd25455 100644 --- a/system/Config.in +++ b/system/Config.in @@ -443,7 +443,7 @@ config BR2_ENABLE_LOCALE_WHITELIST default "C en_US" depends on BR2_ENABLE_LOCALE_PURGE help - Whitespace seperated list of locales to allow on target. + Whitespace separated list of locales to allow on target. Locales not listed here will be removed from the target. See 'locale -a' on your host for a list of locales available on your build host, or have a look in /usr/share/locale in From peter at korsgaard.com Wed Feb 22 16:07:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:07:19 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] Config.in.legacy: fix typo on BR2_PACKAGE_MEDIAART_BACKEND_QT Message-ID: <20230222161022.B53478675F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d981ed04c8359db048730ca1acd7b68e69b19616 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Currently using this minimal .config: BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF=y triggers: *** Legacy options removed in 2018.05 *** [ ] libmediaart none backend option renamed (NEW) [*] libmediaart gdk-pixbuf backend option renamed [*] libmediaart qt backend option renamed Commit "8553b39887 libmediaart: rename options to have proper prefix", part of the 2018.05 release had a copy&paste error. As stated in the beginning of the file: The oldest symbols will be removed again after about two years. But while we carry these legacy symbols, let's fix the typo. Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 316e149611a761db04171ee6141048d9057183c8) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 896e75a9d6..98861137d2 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2608,7 +2608,7 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF +config BR2_PACKAGE_MEDIAART_BACKEND_QT bool "libmediaart qt backend option renamed" select BR2_LEGACY help From peter at korsgaard.com Wed Feb 22 16:11:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:11:13 +0100 Subject: [Buildroot] [git commit] boot/barebox: use $$ instead of $ where needed In-Reply-To: <20230206105723.71FF4838DC@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Mon, 6 Feb 2023 11:57:08 +0100") References: <20230206105723.71FF4838DC@busybox.osuosl.org> Message-ID: <87o7plvfxa.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=75c313816eb526fe09a6baab8b327279e01be5ef > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass > required environment variables for reproducible build") caused the > build to generate a spurious error message due to the $(shell > ... date -d @$(SOURCE_DATE_EPOCH)) command being executed even when > BR2_REPRODUCIBLE was disabled. > This is due to the fact that variable references must be done using $$ > within macros. This commit fixes that for the two variables that we > are referencing in the code added in commit > c90bd74ebb264ccc925f10a142ccd82ef63a4601. > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 15:57:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:57:29 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package, legacy: fix typo for "daemon" on help text Message-ID: <20230222161136.48F4B86789@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d75ea9fdba8d6797d505e45e43af55b70663c6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x deamon -> daemon At same time, in Config.in.legacy fix other typos in the same help text: spae -> space monolitic -> monolithic Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 6a9feaabbce4f21dd2a688d35a5027cb0e2a7a22) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 4 ++-- package/ngircd/Config.in | 2 +- package/rp-pppoe/Config.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 1c76eb918a..3a2e6883e9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4163,8 +4163,8 @@ config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - - a monolitic user space library - - a user spae deamon driver + - a monolithic user space library + - a user space daemon driver config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" diff --git a/package/ngircd/Config.in b/package/ngircd/Config.in index 9b3d430922..1e93a5702c 100644 --- a/package/ngircd/Config.in +++ b/package/ngircd/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_NGIRCD bool "ngircd" depends on BR2_USE_MMU # fork() help - Next Generation IRC server deamon. + Next Generation IRC server daemon. http://ngircd.barton.de diff --git a/package/rp-pppoe/Config.in b/package/rp-pppoe/Config.in index 2ac81cbb2d..6ff005a1e1 100644 --- a/package/rp-pppoe/Config.in +++ b/package/rp-pppoe/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_RP_PPPOE select BR2_PACKAGE_PPPD help An implementation of the Point-to-point protocol over - Ethernet. Has userspace client and server deamons. You + Ethernet. Has userspace client and server daemons. You likely only need this package if you are implementing the pppoe server that will service other pppoe client devices. Otherwise the normal client functionality already From peter at korsgaard.com Wed Feb 22 16:07:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:07:24 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] Config.in.legacy: fix typo on BR2_PACKAGE_MEDIAART_BACKEND_QT Message-ID: <20230222161136.56F878678A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd8decd5811c44d742188e31e61b34f116f32335 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Currently using this minimal .config: BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF=y triggers: *** Legacy options removed in 2018.05 *** [ ] libmediaart none backend option renamed (NEW) [*] libmediaart gdk-pixbuf backend option renamed [*] libmediaart qt backend option renamed Commit "8553b39887 libmediaart: rename options to have proper prefix", part of the 2018.05 release had a copy&paste error. As stated in the beginning of the file: The oldest symbols will be removed again after about two years. But while we carry these legacy symbols, let's fix the typo. Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 316e149611a761db04171ee6141048d9057183c8) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3a2e6883e9..5000c7a7be 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2433,7 +2433,7 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF +config BR2_PACKAGE_MEDIAART_BACKEND_QT bool "libmediaart qt backend option renamed" select BR2_LEGACY help From peter at korsgaard.com Wed Feb 22 15:54:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:54:57 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] *: fix typo for separate(d|) in text Message-ID: <20230222161136.3B83886785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ca1305d64b30c0b98dc375e4b9f2d39694b9bb9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x seperate is a common misspelling of separate Fix all the typos in the tree that are not related to patch files. CHANGES seperate -> separate, in the list of changes Config.in.legacy seperate -> separate, in option name and help texts package/leafnode2/leafnode2.mk seperate -> separate, in a comment system/Config.in seperated -> separated, in a help text Cc: Bernd Kuhls Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 4092d2a3546c1edfcb27f9d00fd4e7cac9878d2f) Signed-off-by: Peter Korsgaard --- CHANGES | 4 ++-- Config.in.legacy | 6 +++--- package/leafnode2/leafnode2.mk | 2 +- system/Config.in | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 8af15d3b1e..c0e144755d 100644 --- a/CHANGES +++ b/CHANGES @@ -7097,7 +7097,7 @@ Architecture: Default to bf532 CPU variant for blackfin, Fix flat one memory region support for m68k and disable flat - seperate data support because of compatibility issues. + separate data support because of compatibility issues. Defconfigs: Minnowboard and Raspberrypi: Fix errors with post-build scripts when systemd is used. @@ -7633,7 +7633,7 @@ Minor fixes. - Merged/seperate /usr handling is now also performed for + Merged/separate /usr handling is now also performed for staging so cross-gdb / gdbserver can find the libraries. Updated/fixed packages: autossh, conntrack-tools, dcron, diff --git a/Config.in.legacy b/Config.in.legacy index 8db70cae5a..1c76eb918a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -3079,7 +3079,7 @@ config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND select BR2_PACKAGE_RESTORECOND help The policycoreutils package no longer offers restorecond - as a option. This package has been moved into a seperate + as a option. This package has been moved into a separate package maintained by the SELinux maintainers. config BR2_PACKAGE_SEPOLGEN @@ -3673,7 +3673,7 @@ config BR2_GDB_VERSION_7_9 comment "Legacy options removed in 2016.11" config BR2_PACKAGE_PHP_SAPI_CLI_CGI - bool "PHP CGI and CLI options are now seperate" + bool "PHP CGI and CLI options are now separate" select BR2_PACKAGE_PHP_SAPI_CLI select BR2_PACKAGE_PHP_SAPI_CGI select BR2_LEGACY @@ -4703,7 +4703,7 @@ config BR2_PACKAGE_KODI_PVR_ADDONS select BR2_PACKAGE_KODI_PVR_VUPLUS select BR2_PACKAGE_KODI_PVR_WMC help - Kodi PVR addon was split into seperate modules + Kodi PVR addon was split into separate modules config BR2_BINUTILS_VERSION_2_23_2 bool "binutils 2.23 option renamed" diff --git a/package/leafnode2/leafnode2.mk b/package/leafnode2/leafnode2.mk index a02aad4302..e82ca2e1ee 100644 --- a/package/leafnode2/leafnode2.mk +++ b/package/leafnode2/leafnode2.mk @@ -23,7 +23,7 @@ LEAFNODE2_CONF_OPTS = \ --enable-runas-user=root # Leafnode2 needs the host version of b_sortnl during -# compilation. Instead of creating a seperate host package and +# compilation. Instead of creating a separate host package and # installing b_sortnl to $(HOST_DIR) this binary is compiled # on-the-fly, host-pcre is needed for this define LEAFNODE2_BUILD_SORTNL_TOOL diff --git a/system/Config.in b/system/Config.in index a4ffbfa18c..34b0a9a3a4 100644 --- a/system/Config.in +++ b/system/Config.in @@ -432,7 +432,7 @@ config BR2_ENABLE_LOCALE_WHITELIST default "C en_US" depends on BR2_ENABLE_LOCALE_PURGE help - Whitespace seperated list of locales to allow on target. + Whitespace separated list of locales to allow on target. Locales not listed here will be removed from the target. See 'locale -a' on your host for a list of locales available on your build host, or have a look in /usr/share/locale in From peter at korsgaard.com Wed Feb 22 16:08:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:08:43 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] utils/checkpackagelib: warn about redefined config Message-ID: <20230222161136.62B4786785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8b6ca8bcfe202d2472500aec38514cced11e30b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Warn the developer in the case the same config is declared more than once in the same Config.in file. But take into account the conditional code that lets the config be visible and warn only when it is declared more than once in the same conditions. For instance, do not warn for: if BR2_PACKAGE_BUSYBOX config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 4bbda72743d39df29dfc91e0f52be02b2d465f6d) Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_config.py | 38 ++++++++++++++++ utils/checkpackagelib/test_lib_config.py | 78 ++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index b05831f2c3..f26ca0d898 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -233,3 +233,41 @@ class Indent(_CheckFunction): return ["{}:{}: should not be indented" .format(self.filename, lineno), text] + + +class RedefinedConfig(_CheckFunction): + CONFIG = re.compile(r"^\s*(menu|)config\s+(BR2_\w+)\b") + IF = re.compile(r"^\s*if\s+([^#]*)\b") + ENDIF = re.compile(r"^\s*endif\b") + + def before(self): + self.configs = {} + self.conditional = [] + + def check_line(self, lineno, text): + if _empty_or_comment(text) or _part_of_help_text(text): + return + + m = self.IF.search(text) + if m is not None: + condition = m.group(1) + self.conditional.append(condition) + return + + m = self.ENDIF.search(text) + if m is not None: + self.conditional.pop() + return + + m = self.CONFIG.search(text) + if m is None: + return + config = m.group(2) + + key = (config, ' AND '.join(self.conditional)) + if key in self.configs.keys(): + previous_line = self.configs[key] + return ["{}:{}: config {} redeclared (previous line: {})" + .format(self.filename, lineno, config, previous_line), + text] + self.configs[key] = lineno diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py index 91a549adf2..474d17105e 100644 --- a/utils/checkpackagelib/test_lib_config.py +++ b/utils/checkpackagelib/test_lib_config.py @@ -385,3 +385,81 @@ Indent = [ def test_Indent(testname, filename, string, expected): warnings = util.check_file(m.Indent, filename, string) assert warnings == expected + + +RedefinedConfig = [ + ('no redefinition', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO_BAR\n' + 'bool "foo"\n', + []), + ('no conditional', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('three times', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:3: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n'], + ['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('same conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:6: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:8: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('not equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if !BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', RedefinedConfig) +def test_RedefinedConfig(testname, filename, string, expected): + warnings = util.check_file(m.RedefinedConfig, filename, string) + assert warnings == expected From peter at korsgaard.com Wed Feb 22 16:11:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:11:43 +0100 Subject: [Buildroot] [git commit] boot/barebox: explicitly set the timezone for the kbuild timestamp In-Reply-To: <20230206105723.7A6F7838E3@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Mon, 6 Feb 2023 11:57:08 +0100") References: <20230206105723.7A6F7838E3@busybox.osuosl.org> Message-ID: <87k009vfwg.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=11e75ecbf092420f00f0fc88a7183d5d99887ff1 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > This adjusts the code added in commit > c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required > environment variables for reproducible build") to explicitly set the > timezone when calculating KBUILD_BUILD_TIMESTAMP, like is already done > in linux/linux.mk. > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:11:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:11:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] boot/barebox: explicitly set the timezone for the kbuild timestamp Message-ID: <20230222161315.3C8D68679F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=427095a091c68f7c670e535ecf08a521af49b619 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This adjusts the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") to explicitly set the timezone when calculating KBUILD_BUILD_TIMESTAMP, like is already done in linux/linux.mk. Signed-off-by: Thomas Petazzoni (cherry picked from commit 11e75ecbf092420f00f0fc88a7183d5d99887ff1) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 39f656c599..281013ed0f 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -78,7 +78,7 @@ ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C TZ='UTC' date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From peter at korsgaard.com Wed Feb 22 16:10:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:10:41 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] boot/barebox: use $$ instead of $ where needed Message-ID: <20230222161315.30ED18679E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8cd934489ac0c38bfb1f0a6223083652bf85de53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") caused the build to generate a spurious error message due to the $(shell ... date -d @$(SOURCE_DATE_EPOCH)) command being executed even when BR2_REPRODUCIBLE was disabled. This is due to the fact that variable references must be done using $$ within macros. This commit fixes that for the two variables that we are referencing in the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601. Signed-off-by: Thomas Petazzoni (cherry picked from commit 75c313816eb526fe09a6baab8b327279e01be5ef) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 05629bb4e3..39f656c599 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -74,11 +74,11 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) -ifeq ($(BR2_REPRODUCIBLE),y) +ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From peter at korsgaard.com Wed Feb 22 16:10:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:10:47 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] boot/barebox: use $$ instead of $ where needed Message-ID: <20230222161342.1604B83CA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41aade348afab8e876d114f4e16dddb8f5b21b96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") caused the build to generate a spurious error message due to the $(shell ... date -d @$(SOURCE_DATE_EPOCH)) command being executed even when BR2_REPRODUCIBLE was disabled. This is due to the fact that variable references must be done using $$ within macros. This commit fixes that for the two variables that we are referencing in the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601. Signed-off-by: Thomas Petazzoni (cherry picked from commit 75c313816eb526fe09a6baab8b327279e01be5ef) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 90be8c1ecc..a0cfaffe09 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -74,11 +74,11 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) -ifeq ($(BR2_REPRODUCIBLE),y) +ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From peter at korsgaard.com Wed Feb 22 16:11:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:11:28 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] boot/barebox: explicitly set the timezone for the kbuild timestamp Message-ID: <20230222161342.1F1A88679F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4027a4dddd92ab8b65c30733241a0a5751d3530 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x This adjusts the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") to explicitly set the timezone when calculating KBUILD_BUILD_TIMESTAMP, like is already done in linux/linux.mk. Signed-off-by: Thomas Petazzoni (cherry picked from commit 11e75ecbf092420f00f0fc88a7183d5d99887ff1) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index a0cfaffe09..d7bcafe436 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -78,7 +78,7 @@ ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C TZ='UTC' date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From peter at korsgaard.com Wed Feb 22 16:22:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:22:54 +0100 Subject: [Buildroot] [PATCH 2/2] package/postgresql: work around gcc bug 43744 In-Reply-To: <20230202154239.325711-2-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Thu, 2 Feb 2023 16:42:39 +0100") References: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> <20230202154239.325711-2-giulio.benetti@benettiengineering.com> Message-ID: <87fsaxvfdt.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Package postgresql suffers from gcc bug 43744 other than 85180, so let's > work around disabling compiler optimization for this gcc bug too. > Fixes: > http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a > Signed-off-by: Giulio Benetti Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From gwenj at trabucayre.com Wed Feb 22 16:19:41 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Wed, 22 Feb 2023 17:19:41 +0100 Subject: [Buildroot] [PATCH 2/5] package/gnuradio: disable examples In-Reply-To: <20230222160514.2069544-2-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> <20230222160514.2069544-2-fontaine.fabrice@gmail.com> Message-ID: <20230222171942.11601e98@x230> On Wed, 22 Feb 2023 17:05:11 +0100 Fabrice Fontaine wrote: > Examples can be disabled since version 3.9.0.0 and > https://github.com/gnuradio/gnuradio/commit/530262c6df3fb9b87a80133dbde5650dbe948c4c > > Signed-off-by: Fabrice Fontaine > --- > package/gnuradio/gnuradio.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk > index c2fcba9586..c2e5ec5cad 100644 > --- a/package/gnuradio/gnuradio.mk > +++ b/package/gnuradio/gnuradio.mk > @@ -22,6 +22,7 @@ GNURADIO_DEPENDENCIES = \ > GNURADIO_CONF_OPTS = \ > -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > -DENABLE_DEFAULT=OFF \ > + -DENABLE_EXAMPLES=OFF \ > -DENABLE_GNURADIO_RUNTIME=ON \ > -DENABLE_TESTING=OFF \ > -DXMLTO_EXECUTABLE=NOTFOUND > -- > 2.39.0 > Acked-by: Gwenhael Goavec-merou Regargs, Gwen From gwenj at trabucayre.com Wed Feb 22 16:14:44 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Wed, 22 Feb 2023 17:14:44 +0100 Subject: [Buildroot] [PATCH 1/5] package/gnuradio: drop unrecognized volk variables In-Reply-To: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Message-ID: <20230222171444.5e9e8f2f@x230> On Wed, 22 Feb 2023 17:05:10 +0100 Fabrice Fontaine wrote: > Volk submodule has been removed since version 3.9.0.0 and > https://github.com/gnuradio/gnuradio/commit/80c04479da962d048d41165081b026aafdaa0316 > > orc dependency can also be dropped as it was only used by volk submodule > > Signed-off-by: Fabrice Fontaine > --- > package/gnuradio/gnuradio.mk | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk > index cc41f1e12b..c2fcba9586 100644 > --- a/package/gnuradio/gnuradio.mk > +++ b/package/gnuradio/gnuradio.mk > @@ -22,9 +22,7 @@ GNURADIO_DEPENDENCIES = \ > GNURADIO_CONF_OPTS = \ > -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > -DENABLE_DEFAULT=OFF \ > - -DENABLE_VOLK=ON \ > -DENABLE_GNURADIO_RUNTIME=ON \ > - -DENABLE_INTERNAL_VOLK=OFF \ > -DENABLE_TESTING=OFF \ > -DXMLTO_EXECUTABLE=NOTFOUND > > @@ -36,13 +34,6 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > GNURADIO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > endif > > -ifeq ($(BR2_PACKAGE_ORC),y) > -GNURADIO_DEPENDENCIES += orc > -GNURADIO_CONF_OPTS += -DENABLE_ORC=ON > -else > -GNURADIO_CONF_OPTS += -DENABLE_ORC=OFF > -endif > - > ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) > GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON > else > -- > 2.39.0 > Acked-by: Gwenhael Goavec-merou Regargs, Gwen From gwenj at trabucayre.com Wed Feb 22 16:26:42 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Wed, 22 Feb 2023 17:26:42 +0100 Subject: [Buildroot] [PATCH 4/5] package/gnuradio: add gr-network block support In-Reply-To: <20230222160514.2069544-4-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> <20230222160514.2069544-4-fontaine.fabrice@gmail.com> Message-ID: <20230222172621.4994893c@x230> On Wed, 22 Feb 2023 17:05:13 +0100 Fabrice Fontaine wrote: > grnet networking block support is available since version version > 3.9.0.0 and > https://github.com/gnuradio/gnuradio/commit/cc37c3e8cd5eabcb5c9d919e5fffc5d938690140 > > gr-network is a mandatory dependency of latest gqrx > > Signed-off-by: Fabrice Fontaine > --- > package/gnuradio/Config.in | 6 ++++++ > package/gnuradio/gnuradio.mk | 6 ++++++ > 2 files changed, 12 insertions(+) > > diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in > index 1824589263..51237e62b9 100644 > --- a/package/gnuradio/Config.in > +++ b/package/gnuradio/Config.in > @@ -134,6 +134,12 @@ config BR2_PACKAGE_GNURADIO_FILTER > help > Filter signal processing blocks > > +config BR2_PACKAGE_GNURADIO_NETWORK > + bool "gr-network support" > + select BR2_PACKAGE_GNURADIO_BLOCKS > + help > + TCP and UDP source/sink blocks > + > config BR2_PACKAGE_GNURADIO_QTGUI > bool "gr-qtgui" > depends on BR2_PACKAGE_GNURADIO_PYTHON > diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk > index 59fb23d89d..d9218b533d 100644 > --- a/package/gnuradio/gnuradio.mk > +++ b/package/gnuradio/gnuradio.mk > @@ -106,6 +106,12 @@ else > GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF > endif > > +ifeq ($(BR2_PACKAGE_GNURADIO_NETWORK),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=OFF > +endif > + > ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) > GNURADIO_DEPENDENCIES += python3 python-pybind \ > host-python-numpy host-python-packaging > -- > 2.39.0 > Acked-by: Gwenhael Goavec-merou Regargs, Gwen From peter at korsgaard.com Wed Feb 22 16:30:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:30:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/netopeer2: fix sysv init script, does not start In-Reply-To: <20230131142003.1354787-1-troglobit@gmail.com> (Joachim Wiberg's message of "Tue, 31 Jan 2023 15:20:03 +0100") References: <20230131142003.1354787-1-troglobit@gmail.com> Message-ID: <87bkllvf1l.fsf@dell.be.48ers.dk> >>>>> "Joachim" == Joachim Wiberg writes: > - The netopeer server forks to background by default, no need for '-b' > - The path to the daemon is /usr/sbin, not /usr/bin > Signed-off-by: Joachim Wiberg Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:31:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:31:46 +0100 Subject: [Buildroot] [PATCH] Makefile: fix build when $(O) ends in _defconfig In-Reply-To: <038b530f-18f1-fd5e-f926-32e73d434a63@smile.fr> (Sebastian WEYER's message of "Mon, 6 Feb 2023 11:57:11 +0100") References: <20230122090947.1369673-1-yann.morin.1998@free.fr> <038b530f-18f1-fd5e-f926-32e73d434a63@smile.fr> Message-ID: <877cw9vez1.fsf@dell.be.48ers.dk> >>>>> "Sebastian" == Sebastian WEYER writes: > Hi all, > On 22/01/2023 10:09, Yann E. MORIN wrote: >> Commit e6195c53041f (Makefile: fix use of many br2-external trees) fixed >> a slowdown with many br2-external trees. In doing so, it changed the >> type of the %_defconfig rule: the stem is no longer present in the >> prerequisites, so it changes from a pattern rule to an implicit pattern >> rule [0]. >> >> It is not unusual to name the build directory after the defconfig that >> is being built, so we may end up with a build directory named >> meh_defconfig. Before e6195c53041f, the pattern rule would not match >> [1], but now it does, which causes somewhat-cryptic build failures: >> >> Makefile:1015: *** "Can't find /some/path/meh_defconfig". Stop. >> >> The issue is that we have this set of rules and assignments (elided and >> reordered for legibility): >> >> all: world >> world: target-post-image >> target-post-image: staging-finalize >> staging-finalize: $(STAGING_DIR_SYMLINK) >> $(STAGING_DIR_SYMLINK): | $(BASE_DIR) >> BASE_DIR := $(CANONICAL_O) >> CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) >> >> So, there is a rule that (eventually) has a dependency on $(O), but we >> have no rule that provides it explicitly, so the %_defconfig rule kicks >> in, with the stem as "/some/path/meh". When the loop searches all the >> ".../configs/" directories for a file named ".../configs/%_defconfig", >> it actually lookes for a file named ".../configs//some/path/meh_defconfig" >> and that indeed never matches anything. >> >> The solution is to provide an actual rule for $(BASE_DIR), so that the >> implicit rule does not kick in. >> >> [0] Terminology and behaviour in make is hard, so the terms we used here >> may be wrong or incorrectly used, and/or the explanations for the >> behavious be wrong or incomplete... Still, the reasoning stands, and >> the root cause is the removal of the stem in the RHS of the rule >> (adding one back does fix the issue). >> >> [1] not sure how the prerequisite was solved before e6195c53041f, >> though... >> >> Fixes: e6195c53041f >> >> Reported-by: Romain Naour >> Signed-off-by: Yann E. MORIN >> Cc: Nevo Hed >> Cc: Peter Korsgaard >> --- >> Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/Makefile b/Makefile >> index 8517d563d5..f39af5eae9 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -1042,7 +1042,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile >> >> # staging and target directories do NOT list these as >> # dependencies anywhere else >> -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): >> +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): >> @mkdir -p $@ >> >> # outputmakefile generates a Makefile in the output directory, if using a > I first verified that the build fails when the output folder's name ends in > "_defconfig" with "make O=./test/second_defconfig qemu_aarch64_virt_defconfig" > followed by "make O=./test/second_defconfig". > I then applied the patch and redid "make O=./test/second_defconfig" and verified > that the build succeeded. > Tested-by: Sebastian Weyer Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From gwenj at trabucayre.com Wed Feb 22 16:31:56 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Wed, 22 Feb 2023 17:31:56 +0100 Subject: [Buildroot] [PATCH 3/5] package/gnuradio: add libsndfile optional dependency In-Reply-To: <20230222160514.2069544-3-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> <20230222160514.2069544-3-fontaine.fabrice@gmail.com> Message-ID: <20230222173156.0f63bb68@x230> On Wed, 22 Feb 2023 17:05:12 +0100 Fabrice Fontaine wrote: > libsndfile is an optional dependency since version 3.9.0.0 and > https://github.com/gnuradio/gnuradio/commit/18f64ba685cfc2533e2d7726aa43c524b007d97b > > Signed-off-by: Fabrice Fontaine > --- > package/gnuradio/gnuradio.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk > index c2e5ec5cad..59fb23d89d 100644 > --- a/package/gnuradio/gnuradio.mk > +++ b/package/gnuradio/gnuradio.mk > @@ -55,6 +55,9 @@ endif > > ifeq ($(BR2_PACKAGE_GNURADIO_BLOCKS),y) > GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=ON > +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) > +GNURADIO_DEPENDENCIES += libsndfile > +endif > else > GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=OFF > endif > -- > 2.39.0 > Acked-by: Gwenhael Goavec-merou Regargs, Gwen From peter at korsgaard.com Wed Feb 22 16:22:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:22:32 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/postgresql: work around gcc bug 43744 Message-ID: <20230222163514.A04BE867C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39d4aaf32f4147ac2bccc8fe290753e3e6761b43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Package postgresql suffers from gcc bug 43744 other than 85180, so let's work around disabling compiler optimization for this gcc bug too. Fixes: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 3def0679e3a424983354346eb517bbaa07b905df) Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 2de7f3eede..3c190c34e3 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -101,7 +101,7 @@ endif POSTGRESQL_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_43744)$(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),) POSTGRESQL_CFLAGS += -O0 endif From peter at korsgaard.com Wed Feb 22 16:29:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:29:07 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/netopeer2: fix sysv init script, does not start Message-ID: <20230222163514.AB933867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9292cf956b1ef5f7cda75fc3cbf140611360640c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - The netopeer server forks to background by default, no need for '-b' - The path to the daemon is /usr/sbin, not /usr/bin Signed-off-by: Joachim Wiberg Acked-by: Heiko Thiery Signed-off-by: Yann E. MORIN (cherry picked from commit 6ddc29708d3c82f2f6055b596e484a6d963a6eae) Signed-off-by: Peter Korsgaard --- package/netopeer2/S52netopeer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netopeer2/S52netopeer2 b/package/netopeer2/S52netopeer2 index cf53a8f109..cadd6b9feb 100644 --- a/package/netopeer2/S52netopeer2 +++ b/package/netopeer2/S52netopeer2 @@ -8,7 +8,7 @@ NETOPEER2_SERVER_ARGS="" start() { printf 'Starting %s: ' "$DAEMON" - start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -p $PIDFILE -x "/usr/sbin/$DAEMON" \ -- $NETOPEER2_SERVER_ARGS status=$? if [ "$status" -eq 0 ]; then From peter at korsgaard.com Wed Feb 22 16:31:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:31:06 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] Makefile: fix build when $(O) ends in _defconfig Message-ID: <20230222163514.B85F1867CB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8d59bec22a31e3faafc77db97dc7fa8fa79fa15 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit e6195c53041f (Makefile: fix use of many br2-external trees) fixed a slowdown with many br2-external trees. In doing so, it changed the type of the %_defconfig rule: the stem is no longer present in the prerequisites, so it changes from a pattern rule to an implicit pattern rule [0]. It is not unusual to name the build directory after the defconfig that is being built, so we may end up with a build directory named meh_defconfig. Before e6195c53041f, the pattern rule would not match [1], but now it does, which causes somewhat-cryptic build failures: Makefile:1015: *** "Can't find /some/path/meh_defconfig". Stop. The issue is that we have this set of rules and assignments (elided and reordered for legibility): all: world world: target-post-image target-post-image: staging-finalize staging-finalize: $(STAGING_DIR_SYMLINK) $(STAGING_DIR_SYMLINK): | $(BASE_DIR) BASE_DIR := $(CANONICAL_O) CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) So, there is a rule that (eventually) has a dependency on $(O), but we have no rule that provides it explicitly, so the %_defconfig rule kicks in, with the stem as "/some/path/meh". When the loop searches all the ".../configs/" directories for a file named ".../configs/%_defconfig", it actually looks for a file named ".../configs//some/path/meh_defconfig" and that indeed never matches anything. The solution is to provide an actual rule for $(BASE_DIR), so that the implicit rule does not kick in. [0] Terminology and behaviour in make is hard, so the terms we used here may be wrong or incorrectly used, and/or the explanations for the behaviour be wrong or incomplete... Still, the reasoning stands, and the root cause is the removal of the stem in the RHS of the rule (adding one back does fix the issue). [1] not sure how the prerequisite was solved before e6195c53041f, though... Fixes: e6195c53041f Reported-by: Romain Naour Signed-off-by: Yann E. MORIN Cc: Nevo Hed Cc: Peter Korsgaard Tested-by: Sebastian Weyer Signed-off-by: Yann E. MORIN (cherry picked from commit 5bd2cafc326141eede4f917069ed21b6d38f88c2) Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3bdc2f08c9..3828cf26ed 100644 --- a/Makefile +++ b/Makefile @@ -1044,7 +1044,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile # staging and target directories do NOT list these as # dependencies anywhere else -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): @mkdir -p $@ # outputmakefile generates a Makefile in the output directory, if using a From peter at korsgaard.com Wed Feb 22 16:28:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:28:55 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/netopeer2: fix sysv init script, does not start Message-ID: <20230222163531.7EAB9867CB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3fd22e80cdf15465cf2297e8a1817ea79e638fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x - The netopeer server forks to background by default, no need for '-b' - The path to the daemon is /usr/sbin, not /usr/bin Signed-off-by: Joachim Wiberg Acked-by: Heiko Thiery Signed-off-by: Yann E. MORIN (cherry picked from commit 6ddc29708d3c82f2f6055b596e484a6d963a6eae) Signed-off-by: Peter Korsgaard --- package/netopeer2/S52netopeer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netopeer2/S52netopeer2 b/package/netopeer2/S52netopeer2 index cf53a8f109..cadd6b9feb 100644 --- a/package/netopeer2/S52netopeer2 +++ b/package/netopeer2/S52netopeer2 @@ -8,7 +8,7 @@ NETOPEER2_SERVER_ARGS="" start() { printf 'Starting %s: ' "$DAEMON" - start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -p $PIDFILE -x "/usr/sbin/$DAEMON" \ -- $NETOPEER2_SERVER_ARGS status=$? if [ "$status" -eq 0 ]; then From peter at korsgaard.com Wed Feb 22 16:31:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:31:16 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] Makefile: fix build when $(O) ends in _defconfig Message-ID: <20230222163531.89130867D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2759b8a3081e806c10b3c2ff7f04efcdef8a8212 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit e6195c53041f (Makefile: fix use of many br2-external trees) fixed a slowdown with many br2-external trees. In doing so, it changed the type of the %_defconfig rule: the stem is no longer present in the prerequisites, so it changes from a pattern rule to an implicit pattern rule [0]. It is not unusual to name the build directory after the defconfig that is being built, so we may end up with a build directory named meh_defconfig. Before e6195c53041f, the pattern rule would not match [1], but now it does, which causes somewhat-cryptic build failures: Makefile:1015: *** "Can't find /some/path/meh_defconfig". Stop. The issue is that we have this set of rules and assignments (elided and reordered for legibility): all: world world: target-post-image target-post-image: staging-finalize staging-finalize: $(STAGING_DIR_SYMLINK) $(STAGING_DIR_SYMLINK): | $(BASE_DIR) BASE_DIR := $(CANONICAL_O) CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) So, there is a rule that (eventually) has a dependency on $(O), but we have no rule that provides it explicitly, so the %_defconfig rule kicks in, with the stem as "/some/path/meh". When the loop searches all the ".../configs/" directories for a file named ".../configs/%_defconfig", it actually looks for a file named ".../configs//some/path/meh_defconfig" and that indeed never matches anything. The solution is to provide an actual rule for $(BASE_DIR), so that the implicit rule does not kick in. [0] Terminology and behaviour in make is hard, so the terms we used here may be wrong or incorrectly used, and/or the explanations for the behaviour be wrong or incomplete... Still, the reasoning stands, and the root cause is the removal of the stem in the RHS of the rule (adding one back does fix the issue). [1] not sure how the prerequisite was solved before e6195c53041f, though... Fixes: e6195c53041f Reported-by: Romain Naour Signed-off-by: Yann E. MORIN Cc: Nevo Hed Cc: Peter Korsgaard Tested-by: Sebastian Weyer Signed-off-by: Yann E. MORIN (cherry picked from commit 5bd2cafc326141eede4f917069ed21b6d38f88c2) Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ab5f97aeff..804ae58689 100644 --- a/Makefile +++ b/Makefile @@ -1041,7 +1041,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile # staging and target directories do NOT list these as # dependencies anywhere else -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): @mkdir -p $@ # outputmakefile generates a Makefile in the output directory, if using a From peter at korsgaard.com Wed Feb 22 16:22:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:22:28 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/postgresql: work around gcc bug 43744 Message-ID: <20230222163531.72F80867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=45f5c85ee5eae562467b84a88b067fc57232952f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Package postgresql suffers from gcc bug 43744 other than 85180, so let's work around disabling compiler optimization for this gcc bug too. Fixes: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 3def0679e3a424983354346eb517bbaa07b905df) Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 502860bc99..549a47f42e 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -101,7 +101,7 @@ endif POSTGRESQL_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_43744)$(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),) POSTGRESQL_CFLAGS += -O0 endif From peter at korsgaard.com Wed Feb 22 16:38:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:38:34 +0100 Subject: [Buildroot] [next 05/25] support/scripts/generate-gitlab-ci-yml: improve test-pkg support In-Reply-To: <20221127130739.1862398-6-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:19 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-6-ricardo.martincoski@gmail.com> Message-ID: <87356xvenp.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Following the example of test-pkg config described in commit > "12c7a05da1 utils/test-pkg: add gitlab-ci support" to test a defconfig > fragment that contains a disabled option is currently possible, but > it do requires one to change the git config core.commentChart so the > lines starting with "#" are not discarded by git when creating/editing > the commit message. > For instance, without the indentation the 3rd line below would be > excluded from the commit message when the editor is closed: > test-pkg config: > SOME_OPTION=y > # OTHER_OPTION is not set > SOME_VARIABLE="some value" > Requiring to change git configs is not very nice. > So make the developer's life easier by changing the sed expression to > remove indentation with spaces from a defconfig fragment found on a > commit message. > For instance these lines become valid and generate a defconfig fragment > without the indentation of one space to be tested in GitLab CI: > test-pkg config: > SOME_OPTION=y > # OTHER_OPTION is not set > SOME_VARIABLE="some value" > Signed-off-by: Ricardo Martincoski > --- > Example usage: > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704846763 Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:38:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:38:40 +0100 Subject: [Buildroot] [next 06/25] package/fwts: use ifeq instead of ifdef In-Reply-To: <20221127130739.1862398-7-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:20 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-7-ricardo.martincoski@gmail.com> Message-ID: <87y1opu033.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The conditional code using ifdef was added in 2018 and works as > expected. > But there is no reason to use ifdef instead of ifeq. > For consistence, switch to use ifeq like almost all packages already do. > Cc: Arnout Vandecappelle > Cc: Erico Nunes > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:38:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:38:46 +0100 Subject: [Buildroot] [next 07/25] package/live555: fix build config with locale In-Reply-To: <20221127130739.1862398-8-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:21 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-8-ricardo.martincoski@gmail.com> Message-ID: <87ttzdu02x.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Using current conditional code, added in 2014: > ifndef ($(BR2_ENABLE_LOCALE),y) > LIVE555_CFLAGS += -DLOCALE_NOT_USED > endif > the define LOCALE_NOT_USED is always passed on CFLAGS, because there is > no symbol with following names defined: > "(y,y)" -> not defined when BR2_ENABLE_LOCALE=y > "(,y)" -> not defined when BR2_ENABLE_LOCALE is not set > So fix the typo, switching ifndef to ifneq. > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:39:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:39:15 +0100 Subject: [Buildroot] [next 08/25] package/pugixml: unconditionally set BUILD_DEFINES In-Reply-To: <20221127130739.1862398-9-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:22 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-9-ricardo.martincoski@gmail.com> Message-ID: <87pma1u024.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The ifdef construct intended to avoid passing -DBUILD_DEFINES="" was > never needed, because even upstream version v1.9 used in 2019 when the > configuration options were added, can handle an empty string for > BUILD_DEFINES. > In fact an empty string is the default for v1.9 if it is not passed > during configure. > Also, the host variant already sets BUILD_DEFINES unconditionally. > So remove the unneeded conditional. > Cc: Arnout Vandecappelle > Cc: Theo Debrouwere > Signed-off-by: Ricardo Martincoski > --- > NOTE 1: > For versions starting from v1.11 this flag BUILD_DEFINES is ignored, but > it will be fixed in the next patch. > I had split into 2 patches because this first one applies to old > versions of the package too. Someone could theoretically decide to > backport to a local copy of buildroot 2020.05.x for instance. > NOTE 2: > It doesn't test much, since BUILD_DEFINES is ignored, but anyway: > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704554673 > 44 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > test-pkg config: > BR2_PACKAGE_PUGIXML=y Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:40:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:40:01 +0100 Subject: [Buildroot] [next 09/25] package/pugixml: fix configuration options In-Reply-To: <20221127130739.1862398-10-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:23 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-10-ricardo.martincoski@gmail.com> Message-ID: <87lekpu00u.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit upstream 1c5a0bb32583fd294022e68e66b541bf6ff71a67 > ":sparkles: Update CMake to modern approach" removed all feature > toogles, so starting from release v1.11 any flag passed in BUILD_DEFINES > was completely ignored during the build. > Version 1.11.4 was in use in buildroot since February 2021. > Commit upstream 0f1e75a902ef1751dd63a67fe223b5e8daf4c7f1 > "Re-introduced the custom build defines" added PUGIXML_BUILD_DEFINES to > release v1.12, but BUILD_DEFINES is still completely ignored during the > build. > Version 1.12.1 is in use in buildroot since March 2022. > So switch the config options to use PUGIXML_BUILD_DEFINES instead of > BUILD_DEFINES. > Cc: Arnout Vandecappelle > Cc: Theo Debrouwere > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:41:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:41:09 +0100 Subject: [Buildroot] [next 10/25] package/pugixml: use explicit build options In-Reply-To: <20221127130739.1862398-11-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:24 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-11-ricardo.martincoski@gmail.com> Message-ID: <87h6vdtzyy.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit upstream 986b7ffd01aedcd4f2aa16e78e4cad9313b6d7b2 > "Add Cmake options for pugiconfig.hpp" added feature toogles to release > v1.12, including PUGIXML_NO_XPATH and PUGIXML_COMPACT. > Commit upstream 5f49f2c6575cc2b7d343f8d41581fe92d69d7b52 > "Mark advanced options and removed redundant ones" removed CMake > specific support for PUGIXML_HEADER_ONLY and PUGIXML_HAS_LONG_LONG, but > they can still be provided using PUGIXML_BUILD_DEFINES, starting from > release v1.12. > So use the explicit build options PUGIXML_NO_XPATH and PUGIXML_COMPACT, > but keep using PUGIXML_BUILD_DEFINES to set PUGIXML_HEADER_ONLY and > PUGIXML_HAS_LONG_LONG. > Cc: Arnout Vandecappelle > Cc: Theo Debrouwere > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x, thanks (2022.02.x uses v1.11.4). -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:41:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:41:41 +0100 Subject: [Buildroot] [next 11/25] package/busybox: add comment about variable override In-Reply-To: <20221127130739.1862398-12-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:25 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-12-ricardo.martincoski@gmail.com> Message-ID: <87cz61tzy2.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The same comment already exists for UCLIBC_CONFIG_FILE. > Both variables can be override from command-line, as described in the > manual, at section 'Environment variables'. > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:44:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:44:09 +0100 Subject: [Buildroot] [next 12/25] utils/checkpackagelib: warn about ifdef on .mk In-Reply-To: <20221127130739.1862398-13-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:26 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-13-ricardo.martincoski@gmail.com> Message-ID: <878rgptzty.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > There are two legitimate cases to prefer ifdef over ifeq in package > recipes: command-line overrides are allowed for busybox and uclibc > configs. > Except for that, all package in tree already use ifeq, so warn the > developer adding/changing a package to use ifeq instead of ifdef, in > order to keep consistence across packages. > file.mk:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL > file.mk:5: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL > The difference between ifeq and ifdef is that ifdef doesn't expand > recursively. > Add comments to busybox and uclibc packages to avoid a warning in such > special cases. > Cc: Arnout Vandecappelle > Signed-off-by: Ricardo Martincoski > --- > NOTE 1: > I only state "all package in tree already use ifeq" because earlier in > the series other 3 (2 ifdef and 1 ifndef) uses were removed. Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:44:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:44:55 +0100 Subject: [Buildroot] [next 13/25] toolchain/toolchain-buildroot: add comment about using virtual package infra In-Reply-To: <20221127130739.1862398-14-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:27 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-14-ricardo.martincoski@gmail.com> Message-ID: <874jrdtzso.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "9a8ec9195c toolchain/toolchain-buildroot: migrate to virtual > package infrastructure" made the packages toolchain and > toolchain-buildroot to use the virtual package infra even they being > generic packages. > This works because on package/pkg-virtual.mk when a package do not > define neither _PROVIDES_ or _HAS_ symbols, only _IS_VIRTUAL is set to > YES and _VERSION and _SOURCE are set to empty before relaying the call > to inner-generic-package. > Add a comment explaining why the virtual package infra is used in these > cases. > Cc: Giulio Benetti > Cc: Romain Naour > Cc: Thomas De Schampheleire > Cc: Thomas Petazzoni > Cc: Yann E. MORIN > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:45:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:45:24 +0100 Subject: [Buildroot] [next 14/25] boot/uboot: remove use of legacy xloader symbol In-Reply-To: <20221127130739.1862398-15-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:28 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-15-ricardo.martincoski@gmail.com> Message-ID: <87zg95sl7f.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "070b183d0c boot/xloader: remove package", from release 2018.11, > removed the package, but the symbol is still referenced. > Remove the reference to it. > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:45:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:45:51 +0100 Subject: [Buildroot] [next 15/25] system: remove use of legacy md5 option In-Reply-To: <20221127130739.1862398-16-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:29 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-16-ricardo.martincoski@gmail.com> Message-ID: <87v8jtsl6o.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "bf3626002f system cfg: remove mkpasswd MD5 format option", from > release 2019.02, moved the symbol to legacy handling, but the symbol is > still referenced. > Remove the reference to it. > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:46:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:46:25 +0100 Subject: [Buildroot] [next 16/25] package/linux-headers: remove bogus symbol BR2_PACKAGE_HOST_LINUX_HEADERS In-Reply-To: <20221127130739.1862398-17-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:30 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-17-ricardo.martincoski@gmail.com> Message-ID: <87r0uhsl5q.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The package host-linux-headers does not exist and there were never > references to this symbol in the tree, do drop it. > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:47:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:47:26 +0100 Subject: [Buildroot] [next 18/25] package/openpowerlink: properly handle legacy options In-Reply-To: <20221127130739.1862398-19-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:32 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-19-ricardo.martincoski@gmail.com> Message-ID: <87mt55sl41.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "b1063a0136 package/openpowerlink: bump to v2.2.2" tried to add > legacy handling but the new symbols are part of a choice, and Kconfig > does not enforce the select of a option from a choice. > Update the legacy entry for 2016.02, following the example described in > the beginning of the file. > Cc: Romain Naour > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:47:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:47:57 +0100 Subject: [Buildroot] [next 19/25] package/gcc: properly handle legacy for renamed ARC option In-Reply-To: <20221127130739.1862398-20-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:33 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-20-ricardo.martincoski@gmail.com> Message-ID: <87ilftsl36.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "50332a530b gcc: rename option for ARC gcc" tried to add legacy > handling but the new symbol is part of a choice, and Kconfig does not > enforce the select of a option from a choice. > Update the legacy entry for 2016.11, following the example described in > the beginning of the file. > Cc: Giulio Benetti > Cc: Romain Naour > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:48:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:48:28 +0100 Subject: [Buildroot] [next 20/25] package/lua: properly handle legacy for removed version In-Reply-To: <20221127130739.1862398-21-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:34 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-21-ricardo.martincoski@gmail.com> Message-ID: <87edqhsl2b.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "297613f1c7 package/lua: remove 5.2.x version" tried to add > legacy handling but the new symbols are part of a choice, and Kconfig > does not enforce the select of a option from a choice. > Update the legacy entry for 2019.02, following the example described in > the beginning of the file. > Cc: Francois Perrad > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:49:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:49:04 +0100 Subject: [Buildroot] [next 21/25] package/ti-sgx-km: properly handle legacy for removed options In-Reply-To: <20221127130739.1862398-22-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:35 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-22-ricardo.martincoski@gmail.com> Message-ID: <87a615sl1b.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "c38b5566fe package/ti-sgx-{km, um, demos}: bump to latest TI > version", added in release 2020.02, removed some options that were > previously renamed in release 2018.05. > Update the legacy entry for 2018.05 and add the corresponding legacy > entries for 2020.02. > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:49:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:49:39 +0100 Subject: [Buildroot] [next 22/25] package/openjdk: properly handle legacy for renamed options In-Reply-To: <20221127130739.1862398-23-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:36 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-23-ricardo.martincoski@gmail.com> Message-ID: <875ybtsl0c.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "a610bf9967 package/openjdk{-bin}: bump version to 17.0.1+12" > tried to add legacy handling but the new symbols are part of a choice, > and Kconfig does not enforce the select of a option from a choice. > Update the legacy entry for 2021.11, following the example described in > the beginning of the file. > Cc: Tudor Holton > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:50:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:50:22 +0100 Subject: [Buildroot] [next 23/25] package/sunxi-mali-utgard: properly handle legacy for renamed options In-Reply-To: <20221127130739.1862398-24-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:37 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-24-ricardo.martincoski@gmail.com> Message-ID: <871qmhskz5.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "6a7a652b14 package/sunxi-mali-utgard: rename from > sunxi-mali-mainline" tried to add legacy handling but the new symbols > are part of a choice, and Kconfig does not enforce the select of a > option from a choice. > Update the legacy entry for 2022.02, following the example described in > the beginning of the file. > Cc: Giulio Benetti > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:36:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:36:45 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/scripts/generate-gitlab-ci-yml: improve test-pkg support Message-ID: <20230222170816.19523867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f63e64d9c8782987c2fc1fafe3ada2f8762e809 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Following the example of test-pkg config described in commit "12c7a05da1 utils/test-pkg: add gitlab-ci support" to test a defconfig fragment that contains a disabled option is currently possible, but it do requires one to change the git config core.commentChart so the lines starting with "#" are not discarded by git when creating/editing the commit message. For instance, without the indentation the 3rd line below would be excluded from the commit message when the editor is closed: test-pkg config: SOME_OPTION=y # OTHER_OPTION is not set SOME_VARIABLE="some value" Requiring to change git configs is not very nice. So make the developer's life easier by changing the sed expression to remove indentation with spaces from a defconfig fragment found on a commit message. For instance these lines become valid and generate a defconfig fragment without the indentation of one space to be tested in GitLab CI: test-pkg config: SOME_OPTION=y # OTHER_OPTION is not set SOME_VARIABLE="some value" Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 0ad3ae14c52ed0aac872875ca7f87cdcf6942128) Signed-off-by: Peter Korsgaard --- support/scripts/generate-gitlab-ci-yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index aa43aac019..27f586f1b6 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -91,7 +91,7 @@ gen_tests() { # Retrieve defconfig for test-pkg from the git commit message (if any) if grep -q -E '^test-pkg config:$' <<<"${CI_COMMIT_DESCRIPTION}"; then - sed -r -n -e '/^test-pkg config:$/{:a;n;p;ba;}' \ + sed -r -n -e '/^test-pkg config:$/{:a;n;s/^ +//;p;ba;}' \ <<<"${CI_COMMIT_DESCRIPTION}" \ >defconfig.frag if [ ! -s defconfig.frag ]; then From peter at korsgaard.com Wed Feb 22 16:38:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:38:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/live555: fix build config with locale Message-ID: <20230222170816.2E3E8867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa019b8d64d549541d8f4a754b5d418017a14b85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Using current conditional code, added in 2014: ifndef ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif the define LOCALE_NOT_USED is always passed on CFLAGS, because there is no symbol with following names defined: "(y,y)" -> not defined when BR2_ENABLE_LOCALE=y "(,y)" -> not defined when BR2_ENABLE_LOCALE is not set So fix the typo, switching ifndef to ifneq. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 04a4b86a982e307268d660a38d231315134572fb) Signed-off-by: Peter Korsgaard --- package/live555/live555.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/live555/live555.mk b/package/live555/live555.mk index effd4517cf..56ed705783 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -39,7 +39,7 @@ else LIVE555_CFLAGS += -DNO_OPENSSL endif -ifndef ($(BR2_ENABLE_LOCALE),y) +ifneq ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif From peter at korsgaard.com Wed Feb 22 16:37:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:37:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/fwts: use ifeq instead of ifdef Message-ID: <20230222170816.23AFF867D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a54bc3316155ae95eefc597d5780cb5d3078e13 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The conditional code using ifdef was added in 2018 and works as expected. But there is no reason to use ifdef instead of ifeq. For consistence, switch to use ifeq like almost all packages already do. Cc: Arnout Vandecappelle Cc: Erico Nunes Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit e6ae82531928662764536cadbe2d6f3c558e7de2) Signed-off-by: Peter Korsgaard --- package/fwts/fwts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index 6634cdc40e..cd9bccae2c 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -15,7 +15,7 @@ FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) -ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE +ifeq ($(BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE),y) FWTS_MODULE_SUBDIRS = efi_runtime $(eval $(kernel-module)) endif From peter at korsgaard.com Wed Feb 22 16:41:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:41:57 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] utils/checkpackagelib: warn about ifdef on .mk Message-ID: <20230222170816.5AD56867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13c79ad4a57930f42516763937eb8f4d731fa1c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x There are two legitimate cases to prefer ifdef over ifeq in package recipes: command-line overrides are allowed for busybox and uclibc configs. Except for that, all package in tree already use ifeq, so warn the developer adding/changing a package to use ifeq instead of ifdef, in order to keep consistence across packages. file.mk:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL file.mk:5: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL The difference between ifeq and ifdef is that ifdef doesn't expand recursively. Add comments to busybox and uclibc packages to avoid a warning in such special cases. Cc: Arnout Vandecappelle Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 29c9b4435503d1b3130ce37dcab88c89156b1481) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 1 + package/uclibc/uclibc.mk | 1 + utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++ utils/checkpackagelib/test_lib_mk.py | 48 ++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 0f14bf999d..f8f9cb5616 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -110,6 +110,7 @@ BUSYBOX_MAKE_OPTS = \ # specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config # setting. +# check-package disable Ifdef ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 5006aa0cb6..2621361157 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -22,6 +22,7 @@ UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting. +# check-package disable Ifdef ifndef UCLIBC_CONFIG_FILE UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG)) endif diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index b50a19ac62..8adf844e9a 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -21,6 +21,24 @@ continue_conditional = ["elif", "else"] end_conditional = ["endif"] +class Ifdef(_CheckFunction): + IFDEF = re.compile(r"^\s*(else\s+|)(ifdef|ifndef)\s") + + def check_line(self, lineno, text): + m = self.IFDEF.search(text) + if m is None: + return + word = m.group(2) + if word == 'ifdef': + return ["{}:{}: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL" + .format(self.filename, lineno), + text] + else: + return ["{}:{}: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL" + .format(self.filename, lineno), + text] + + class Indent(_CheckFunction): COMMENT = re.compile(r"^\s*#") CONDITIONAL = re.compile(r"^\s*({})\s".format("|".join(start_conditional + end_conditional + continue_conditional))) diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 49fa216fcd..80a1736b4e 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -3,6 +3,54 @@ import checkpackagelib.test_util as util import checkpackagelib.lib_mk as m +Ifdef = [ + ('ignore commented line', + 'any', + '# ifdef\n', + []), + ('simple', + 'any', + '\n' + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n' + 'endif\n', + [['any:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n']]), + ('ignore indentation', + 'any', + ' ifdef FOO\n' + ' endif\n' + '\tifdef BAR\n' + 'endif\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + ' ifdef FOO\n'], + ['any:3: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + '\tifdef BAR\n']]), + ('typo', + 'any', + '\n' + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n' + 'endif\n', + [['any:2: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n']]), + ('else ifdef', + 'any', + 'else ifdef SYMBOL # comment\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'else ifdef SYMBOL # comment\n']]), + ('else ifndef', + 'any', + '\t else ifndef\t($(SYMBOL),y) # comment\n', + [['any:1: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + '\t else ifndef\t($(SYMBOL),y) # comment\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Ifdef) +def test_Ifdef(testname, filename, string, expected): + warnings = util.check_file(m.Ifdef, filename, string) + assert warnings == expected + + Indent = [ ('ignore comment at beginning of line', 'any', From peter at korsgaard.com Wed Feb 22 16:39:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:39:44 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pugixml: fix configuration options Message-ID: <20230222170816.4608B867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef6d357f261bb9209e781f9ca7e33b7bd28b653d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit upstream 1c5a0bb32583fd294022e68e66b541bf6ff71a67 ":sparkles: Update CMake to modern approach" removed all feature toogles, so starting from release v1.11 any flag passed in BUILD_DEFINES was completely ignored during the build. Version 1.11.4 was in use in buildroot since February 2021. Commit upstream 0f1e75a902ef1751dd63a67fe223b5e8daf4c7f1 "Re-introduced the custom build defines" added PUGIXML_BUILD_DEFINES to release v1.12, but BUILD_DEFINES is still completely ignored during the build. Version 1.12.1 is in use in buildroot since March 2022. So switch the config options to use PUGIXML_BUILD_DEFINES instead of BUILD_DEFINES. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit cc3a4a7b1de7b158354c650d234339e8a969a730) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index e77ab1a799..bbcb913da6 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -29,11 +29,11 @@ ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif -PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" +PUGIXML_CONF_OPTS += -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" HOST_PUGIXML_CONF_OPTS += \ -DBUILD_PKGCONFIG=ON \ - -DBUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" + -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" $(eval $(cmake-package)) $(eval $(host-cmake-package)) From peter at korsgaard.com Wed Feb 22 16:39:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:39:07 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pugixml: unconditionally set BUILD_DEFINES Message-ID: <20230222170816.38F88867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fe2713152e60fe63e8fc78d9baf58fee18a3473 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The ifdef construct intended to avoid passing -DBUILD_DEFINES="" was never needed, because even upstream version v1.9 used in 2019 when the configuration options were added, can handle an empty string for BUILD_DEFINES. In fact an empty string is the default for v1.9 if it is not passed during configure. Also, the host variant already sets BUILD_DEFINES unconditionally. So remove the unneeded conditional. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 01cb02cfaecb34fd7d413775673e78272c68f85f) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index bc018180ef..e77ab1a799 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -29,9 +29,7 @@ ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif -ifdef PUGIXML_BUILD_DEFINES PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" -endif HOST_PUGIXML_CONF_OPTS += \ -DBUILD_PKGCONFIG=ON \ From peter at korsgaard.com Wed Feb 22 16:45:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:45:46 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] system: remove use of legacy md5 option Message-ID: <20230222170816.76169867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=253ee5b11f643a08fa7d144c5d5abeb4fb6ce1a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "bf3626002f system cfg: remove mkpasswd MD5 format option", from release 2019.02, moved the symbol to legacy handling, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 032cfbc716749869b185f83dab450ec47f969765) Signed-off-by: Peter Korsgaard --- system/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/system/Config.in b/system/Config.in index 34b0a9a3a4..3db03dce64 100644 --- a/system/Config.in +++ b/system/Config.in @@ -78,7 +78,6 @@ endchoice # Passwd encoding config BR2_TARGET_GENERIC_PASSWD_METHOD string - default "md5" if BR2_TARGET_GENERIC_PASSWD_MD5 default "sha-256" if BR2_TARGET_GENERIC_PASSWD_SHA256 default "sha-512" if BR2_TARGET_GENERIC_PASSWD_SHA512 From peter at korsgaard.com Wed Feb 22 16:44:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:44:48 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] toolchain/toolchain-buildroot: add comment about using virtual package infra Message-ID: <20230222170816.63A29867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48351fe47d2d0390687f9a401fc684076eae2936 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "9a8ec9195c toolchain/toolchain-buildroot: migrate to virtual package infrastructure" made the packages toolchain and toolchain-buildroot to use the virtual package infra even they being generic packages. This works because on package/pkg-virtual.mk when a package do not define neither _PROVIDES_ or _HAS_ symbols, only _IS_VIRTUAL is set to YES and _VERSION and _SOURCE are set to empty before relaying the call to inner-generic-package. Add a comment explaining why the virtual package infra is used in these cases. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Yann E. MORIN Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit abcecd737b198e8a1a48bf4533e5c2b8de8b8cf4) Signed-off-by: Peter Korsgaard --- toolchain/toolchain-buildroot/toolchain-buildroot.mk | 3 +++ toolchain/toolchain/toolchain.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk index b30cc332d2..6da64b7c77 100644 --- a/toolchain/toolchain-buildroot/toolchain-buildroot.mk +++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk @@ -14,4 +14,7 @@ TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-buildroot-virtual +# instead of toolchain-buildroot-undefined) $(eval $(virtual-package)) diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index 18f1dbea1a..ac60a7b248 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -47,4 +47,7 @@ endef TOOLCHAIN_POST_INSTALL_TARGET_HOOKS += TOOLCHAIN_GLIBC_COPY_NSSWITCH_FILE endif +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-virtual instead +# of toolchain-undefined) $(eval $(virtual-package)) From peter at korsgaard.com Wed Feb 22 16:50:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:50:12 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/sunxi-mali-utgard: properly handle legacy for renamed options Message-ID: <20230222170816.C88FF867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fb4e35b33d42cb43c605d1e3d63ebbbfcb334e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "6a7a652b14 package/sunxi-mali-utgard: rename from sunxi-mali-mainline" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2022.02, following the example described in the beginning of the file. Cc: Giulio Benetti Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit efc223abd4fe764f8af8238aec67e8cb700db45e) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/sunxi-mali-utgard/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e9159782b8..6cc4f47609 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -470,20 +470,22 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 bool "sunxi-mali-mainline-r6p2 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 bool "sunxi-mali-mainline-r8p1 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_QT5WEBKIT_EXAMPLES bool "qt5webkit-examples removed" diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in index ff49ea03f1..59ac21f5ab 100644 --- a/package/sunxi-mali-utgard/Config.in +++ b/package/sunxi-mali-utgard/Config.in @@ -20,6 +20,8 @@ config BR2_PACKAGE_PROVIDES_LIBGLES choice prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 # legacy + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 # legacy default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help Select the version of the userspace module. From peter at korsgaard.com Wed Feb 22 16:37:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:37:20 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/fwts: use ifeq instead of ifdef Message-ID: <20230222170818.76CD382261@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4236802adc320e130c3838a9225584bfc0bf57c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The conditional code using ifdef was added in 2018 and works as expected. But there is no reason to use ifdef instead of ifeq. For consistence, switch to use ifeq like almost all packages already do. Cc: Arnout Vandecappelle Cc: Erico Nunes Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit e6ae82531928662764536cadbe2d6f3c558e7de2) Signed-off-by: Peter Korsgaard --- package/fwts/fwts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index b208aa0c14..f04c7a848f 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -15,7 +15,7 @@ FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) -ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE +ifeq ($(BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE),y) FWTS_MODULE_SUBDIRS = efi_runtime $(eval $(kernel-module)) endif From peter at korsgaard.com Wed Feb 22 16:47:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:47:45 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gcc: properly handle legacy for renamed ARC option Message-ID: <20230222170816.99422867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85dcee4664d8d293aeb16c116c374bf528975334 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "50332a530b gcc: rename option for ARC gcc" tried to add legacy handling but the new symbol is part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2016.11, following the example described in the beginning of the file. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit eb8f38891b16e5fb0f010c658b271e22670a1633) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 3 ++- package/gcc/Config.in.host | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6f5d01709a..47e2d48e58 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -3809,10 +3809,11 @@ config BR2_LINUX_KERNEL_TOOL_SELFTESTS config BR2_GCC_VERSION_4_8_ARC bool "gcc arc option renamed" select BR2_LEGACY - select BR2_GCC_VERSION_ARC help The option that selects the gcc version for the ARC architecture has been renamed to BR2_GCC_VERSION_ARC. +# Note: BR2_GCC_VERSION_4_8_ARC is still referenced from +# package/gcc/Config.in.host config BR2_KERNEL_HEADERS_4_0 bool "kernel headers version 4.0.x are no longer supported" diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 84f7a71c9c..48aa8785f0 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -2,6 +2,7 @@ comment "GCC Options" choice prompt "GCC compiler Version" + default BR2_GCC_VERSION_ARC if BR2_GCC_VERSION_4_8_ARC # legacy default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_POWERPC_SPE if BR2_powerpc_SPE default BR2_GCC_VERSION_10_X From peter at korsgaard.com Wed Feb 22 16:48:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:48:21 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/lua: properly handle legacy for removed version Message-ID: <20230222170816.A45E2867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=22b99575bdd79222c0f6e78eb401261abc930de7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "297613f1c7 package/lua: remove 5.2.x version" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2019.02, following the example described in the beginning of the file. Cc: Francois Perrad Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit f461543d9c0f8ea1586004e51561ba0a37b8aecf) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- package/lua/Config.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 47e2d48e58..0ed989f8b0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -1933,9 +1933,9 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD config BR2_PACKAGE_LUA_5_2 bool "Lua 5.2.x version removed" select BR2_LEGACY - select BR2_PACKAGE_LUA_5_3 help The Lua 5.2.x version was removed. +# Note: BR2_PACKAGE_LUA_5_2 is still referenced from package/lua/Config.in config BR2_TARGET_GENERIC_PASSWD_MD5 bool "target passwd md5 format support has been removed" diff --git a/package/lua/Config.in b/package/lua/Config.in index 309dd6eec2..8fa9f9b7ab 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER choice prompt "Lua Version" + default BR2_PACKAGE_LUA_5_3 if BR2_PACKAGE_LUA_5_2 # legacy default BR2_PACKAGE_LUA_5_4 help Select the version of Lua API/ABI you wish to use. From peter at korsgaard.com Wed Feb 22 16:45:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:45:13 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] boot/uboot: remove use of legacy xloader symbol Message-ID: <20230222170816.6C4B8867D5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ba34e0e3d59917e9c3645e738ba1faa472b48a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "070b183d0c boot/xloader: remove package", from release 2018.11, removed the package, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 9b1b1763b754f8a25cf0f2a7fe05e53d256fe675) Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 953c36135e..3fe2a94ff9 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -414,7 +414,6 @@ endif config BR2_TARGET_UBOOT_SPL bool "Install U-Boot SPL binary image" - depends on !BR2_TARGET_XLOADER help Install the U-Boot SPL binary image to the images directory. From peter at korsgaard.com Wed Feb 22 16:43:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:43:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/pugixml: fix configuration options Message-ID: <20230222170818.98AB0867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85b4570d63762886188122aec3771d79fbab3660 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit upstream 1c5a0bb32583fd294022e68e66b541bf6ff71a67 ":sparkles: Update CMake to modern approach" removed all feature toogles, so starting from release v1.11 any flag passed in BUILD_DEFINES was completely ignored during the build. Version 1.11.4 was in use in buildroot since February 2021. Commit upstream 0f1e75a902ef1751dd63a67fe223b5e8daf4c7f1 "Re-introduced the custom build defines" added PUGIXML_BUILD_DEFINES to release v1.12, but BUILD_DEFINES is still completely ignored during the build. Version 1.12.1 is in use in buildroot since March 2022. So switch the config options to use PUGIXML_BUILD_DEFINES instead of BUILD_DEFINES. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit cc3a4a7b1de7b158354c650d234339e8a969a730) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 6c756e9c29..c54148d98f 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -29,11 +29,11 @@ ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif -PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" +PUGIXML_CONF_OPTS += -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" HOST_PUGIXML_CONF_OPTS += \ -DBUILD_PKGCONFIG=ON \ - -DBUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" + -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" $(eval $(cmake-package)) $(eval $(host-cmake-package)) From peter at korsgaard.com Wed Feb 22 16:37:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:37:09 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/scripts/generate-gitlab-ci-yml: improve test-pkg support Message-ID: <20230222170818.69B09867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=feebcb90a245e9293b1eb50f3aed64e9d1574134 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Following the example of test-pkg config described in commit "12c7a05da1 utils/test-pkg: add gitlab-ci support" to test a defconfig fragment that contains a disabled option is currently possible, but it do requires one to change the git config core.commentChart so the lines starting with "#" are not discarded by git when creating/editing the commit message. For instance, without the indentation the 3rd line below would be excluded from the commit message when the editor is closed: test-pkg config: SOME_OPTION=y # OTHER_OPTION is not set SOME_VARIABLE="some value" Requiring to change git configs is not very nice. So make the developer's life easier by changing the sed expression to remove indentation with spaces from a defconfig fragment found on a commit message. For instance these lines become valid and generate a defconfig fragment without the indentation of one space to be tested in GitLab CI: test-pkg config: SOME_OPTION=y # OTHER_OPTION is not set SOME_VARIABLE="some value" Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 0ad3ae14c52ed0aac872875ca7f87cdcf6942128) Signed-off-by: Peter Korsgaard --- support/scripts/generate-gitlab-ci-yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index aa43aac019..27f586f1b6 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -91,7 +91,7 @@ gen_tests() { # Retrieve defconfig for test-pkg from the git commit message (if any) if grep -q -E '^test-pkg config:$' <<<"${CI_COMMIT_DESCRIPTION}"; then - sed -r -n -e '/^test-pkg config:$/{:a;n;p;ba;}' \ + sed -r -n -e '/^test-pkg config:$/{:a;n;s/^ +//;p;ba;}' \ <<<"${CI_COMMIT_DESCRIPTION}" \ >defconfig.frag if [ ! -s defconfig.frag ]; then From peter at korsgaard.com Wed Feb 22 16:44:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:44:43 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] toolchain/toolchain-buildroot: add comment about using virtual package infra Message-ID: <20230222170818.C3A38867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=972ad2022e2757eb43d2cea328fc583fbfdaf408 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "9a8ec9195c toolchain/toolchain-buildroot: migrate to virtual package infrastructure" made the packages toolchain and toolchain-buildroot to use the virtual package infra even they being generic packages. This works because on package/pkg-virtual.mk when a package do not define neither _PROVIDES_ or _HAS_ symbols, only _IS_VIRTUAL is set to YES and _VERSION and _SOURCE are set to empty before relaying the call to inner-generic-package. Add a comment explaining why the virtual package infra is used in these cases. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Yann E. MORIN Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit abcecd737b198e8a1a48bf4533e5c2b8de8b8cf4) Signed-off-by: Peter Korsgaard --- toolchain/toolchain-buildroot/toolchain-buildroot.mk | 3 +++ toolchain/toolchain/toolchain.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk index b30cc332d2..6da64b7c77 100644 --- a/toolchain/toolchain-buildroot/toolchain-buildroot.mk +++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk @@ -14,4 +14,7 @@ TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-buildroot-virtual +# instead of toolchain-buildroot-undefined) $(eval $(virtual-package)) diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index 18f1dbea1a..ac60a7b248 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -47,4 +47,7 @@ endef TOOLCHAIN_POST_INSTALL_TARGET_HOOKS += TOOLCHAIN_GLIBC_COPY_NSSWITCH_FILE endif +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-virtual instead +# of toolchain-undefined) $(eval $(virtual-package)) From peter at korsgaard.com Wed Feb 22 16:41:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:41:33 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/busybox: add comment about variable override Message-ID: <20230222170816.50479867D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0776d7c18e95fe0d33e832c578ec59e3dbf00f9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The same comment already exists for UCLIBC_CONFIG_FILE. Both variables can be override from command-line, as described in the manual, at section 'Environment variables'. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 01c0fb3862bce6605881d9e32c29b5f7373bb2f9) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index ef628e90e9..0f14bf999d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -108,6 +108,8 @@ BUSYBOX_MAKE_OPTS = \ CONFIG_PREFIX="$(TARGET_DIR)" \ SKIP_STRIP=y +# specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config +# setting. ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif From peter at korsgaard.com Wed Feb 22 16:49:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:49:31 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openjdk: properly handle legacy for renamed options Message-ID: <20230222170816.BE522867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=749129b54a81a9b798202e355c31dff62930b434 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "a610bf9967 package/openjdk{-bin}: bump version to 17.0.1+12" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2021.11, following the example described in the beginning of the file. Cc: Tudor Holton Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit a97a4a74aa993b09b958639e2276e7f5cf7a75d2) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/openjdk/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 1b8d197882..e9159782b8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -541,18 +541,20 @@ comment "Legacy options removed in 2021.11" config BR2_OPENJDK_VERSION_LTS bool "OpenJDK LTS version was renamed to OpenJDK 11" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_11 help The LTS version option was renamed to OpenJDK 11 to make it clear what LTS version is. +# Note: BR2_OPENJDK_VERSION_LTS is still referenced from +# package/openjdk/Config.in config BR2_OPENJDK_VERSION_LATEST bool "OpenJDK latest version (16.x) was removed" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_17 help OpenJDK 16.x is no longer mainted, so the option has been removed. Use OpenJDK 17.x instead. +# Note: BR2_OPENJDK_VERSION_LATEST is still referenced from +# package/openjdk/Config.in config BR2_PACKAGE_MPD_TIDAL bool "mpd tidal option removed" diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 8b7fd4653e..7671356fdd 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -56,6 +56,8 @@ if BR2_PACKAGE_OPENJDK choice prompt "openjdk version" + default BR2_PACKAGE_OPENJDK_VERSION_11 if BR2_OPENJDK_VERSION_LTS # legacy + default BR2_PACKAGE_OPENJDK_VERSION_17 if BR2_OPENJDK_VERSION_LATEST # legacy default BR2_PACKAGE_OPENJDK_VERSION_17 help Select the version of OpenJDK you wish to use. From peter at korsgaard.com Wed Feb 22 16:43:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:43:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/pugixml: unconditionally set BUILD_DEFINES Message-ID: <20230222170818.8E7FF867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4dd50584123986cb032776a3ede0c62eeb11fab7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The ifdef construct intended to avoid passing -DBUILD_DEFINES="" was never needed, because even upstream version v1.9 used in 2019 when the configuration options were added, can handle an empty string for BUILD_DEFINES. In fact an empty string is the default for v1.9 if it is not passed during configure. Also, the host variant already sets BUILD_DEFINES unconditionally. So remove the unneeded conditional. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 01cb02cfaecb34fd7d413775673e78272c68f85f) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 9137f04630..6c756e9c29 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -29,9 +29,7 @@ ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif -ifdef PUGIXML_BUILD_DEFINES PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" -endif HOST_PUGIXML_CONF_OPTS += \ -DBUILD_PKGCONFIG=ON \ From peter at korsgaard.com Wed Feb 22 16:46:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:46:56 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/openpowerlink: properly handle legacy options Message-ID: <20230222170818.EB8D282261@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9afadcbe5cef8346caa4fc6569c151dbabae43f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "b1063a0136 package/openpowerlink: bump to v2.2.2" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2016.02, following the example described in the beginning of the file. Cc: Romain Naour Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit e1e4f3950719dd92a2456e2c45856f8cf5dc587e) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/openpowerlink/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 98861137d2..5ffeb01af3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4327,19 +4327,21 @@ config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB help openpowerlink kernel modules are built if the kernel stack library is selected. +# Note: BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE is still referenced from +# package/openpowerlink/Config.in config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - a monolithic user space library - a user space daemon driver +# Note: BR2_PACKAGE_OPENPOWERLINK_LIBPCAP is still referenced from +# package/openpowerlink/Config.in config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in index 1a3dd62acd..ef59a04baf 100644 --- a/package/openpowerlink/Config.in +++ b/package/openpowerlink/Config.in @@ -38,6 +38,8 @@ endchoice choice prompt "stack type" + default BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB if BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE # legacy + default BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB if BR2_PACKAGE_OPENPOWERLINK_LIBPCAP # legacy config BR2_PACKAGE_OPENPOWERLINK_STACK_MONOLITHIC_USER_STACK_LIB bool "linked into application" From peter at korsgaard.com Wed Feb 22 16:48:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:48:49 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/ti-sgx-km: properly handle legacy for removed options Message-ID: <20230222170816.AF508867D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a01ee07c7925b3a8f0ced7c7b85a8b714cb2aba9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "c38b5566fe package/ti-sgx-{km, um, demos}: bump to latest TI version", added in release 2020.02, removed some options that were previously renamed in release 2018.05. Update the legacy entry for 2018.05 and add the corresponding legacy entries for 2020.02. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit b2661fe63990386cf2626ce1dd26919346ca86c0) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 66 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 0ed989f8b0..1b8d197882 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -1468,6 +1468,35 @@ config BR2_PACKAGE_RPI_USERLAND_START_VCFILED help The vcfiled support was removed upstream. +config BR2_PACKAGE_TI_SGX_KM_AM335X + bool "ti-sgx-km AM335X option removed" + select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM437X + bool "ti-sgx-km AM437X option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM4430 + bool "ti-sgx-km AM4430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM5430 + bool "ti-sgx-km AM5430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + comment "Legacy options removed in 2019.11" config BR2_PACKAGE_OPENVMTOOLS_PROCPS @@ -2441,45 +2470,34 @@ config BR2_PACKAGE_MEDIAART_BACKEND_QT BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_QT -# Note: BR2_PACKAGE_TI_SGX_AM335X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM335X - bool "ti-sgx-km AM335X option renamed" + bool "ti-sgx-km AM335X option removed" select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM335X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM335X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM437X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM437X - bool "ti-sgx-km AM437X option renamed" + bool "ti-sgx-km AM437X option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM437X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM437X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM4430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM4430 - bool "ti-sgx-km AM4430 option renamed" + bool "ti-sgx-km AM4430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM4430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM4430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM5430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM5430 - bool "ti-sgx-km AM5430 option renamed" + bool "ti-sgx-km AM5430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM5430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM5430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. config BR2_PACKAGE_JANUS_AUDIO_BRIDGE bool "janus-gateway audio-bridge option renamed" From peter at korsgaard.com Wed Feb 22 16:48:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:48:58 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/ti-sgx-km: properly handle legacy for removed options Message-ID: <20230222170819.1957982261@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c573c30a2e76b9c711288ae9a902d415491f9c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "c38b5566fe package/ti-sgx-{km, um, demos}: bump to latest TI version", added in release 2020.02, removed some options that were previously renamed in release 2018.05. Update the legacy entry for 2018.05 and add the corresponding legacy entries for 2020.02. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit b2661fe63990386cf2626ce1dd26919346ca86c0) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 66 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5758d408f6..aa1e31d8d6 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -1643,6 +1643,35 @@ config BR2_PACKAGE_RPI_USERLAND_START_VCFILED help The vcfiled support was removed upstream. +config BR2_PACKAGE_TI_SGX_KM_AM335X + bool "ti-sgx-km AM335X option removed" + select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM437X + bool "ti-sgx-km AM437X option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM4430 + bool "ti-sgx-km AM4430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM5430 + bool "ti-sgx-km AM5430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + comment "Legacy options removed in 2019.11" config BR2_PACKAGE_OPENVMTOOLS_PROCPS @@ -2616,45 +2645,34 @@ config BR2_PACKAGE_MEDIAART_BACKEND_QT BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_QT -# Note: BR2_PACKAGE_TI_SGX_AM335X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM335X - bool "ti-sgx-km AM335X option renamed" + bool "ti-sgx-km AM335X option removed" select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM335X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM335X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM437X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM437X - bool "ti-sgx-km AM437X option renamed" + bool "ti-sgx-km AM437X option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM437X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM437X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM4430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM4430 - bool "ti-sgx-km AM4430 option renamed" + bool "ti-sgx-km AM4430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM4430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM4430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM5430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM5430 - bool "ti-sgx-km AM5430 option renamed" + bool "ti-sgx-km AM5430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM5430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM5430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. config BR2_PACKAGE_JANUS_AUDIO_BRIDGE bool "janus-gateway audio-bridge option renamed" From peter at korsgaard.com Wed Feb 22 16:45:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:45:42 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] system: remove use of legacy md5 option Message-ID: <20230222170818.D6798867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f513808d04edee344bcbab3ec7951bd9110c482d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "bf3626002f system cfg: remove mkpasswd MD5 format option", from release 2019.02, moved the symbol to legacy handling, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 032cfbc716749869b185f83dab450ec47f969765) Signed-off-by: Peter Korsgaard --- system/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/system/Config.in b/system/Config.in index e6dcd25455..bf65b07a76 100644 --- a/system/Config.in +++ b/system/Config.in @@ -78,7 +78,6 @@ endchoice # Passwd encoding config BR2_TARGET_GENERIC_PASSWD_METHOD string - default "md5" if BR2_TARGET_GENERIC_PASSWD_MD5 default "sha-256" if BR2_TARGET_GENERIC_PASSWD_SHA256 default "sha-512" if BR2_TARGET_GENERIC_PASSWD_SHA512 From peter at korsgaard.com Wed Feb 22 16:46:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:46:15 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/linux-headers: remove bogus symbol BR2_PACKAGE_HOST_LINUX_HEADERS Message-ID: <20230222170816.828FA867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d91470731e28e3c6c42e95e5c405b6e8ff975feb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The package host-linux-headers does not exist and there were never references to this symbol in the tree, do drop it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 367bd65f3c216426e2fc21742dbff11ea8d896d7) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f6654f8578..775ec2cb67 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -1,8 +1,5 @@ comment "Kernel Header Options" -config BR2_PACKAGE_HOST_LINUX_HEADERS - bool - choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL From peter at korsgaard.com Wed Feb 22 16:43:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:43:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] utils/checkpackagelib: warn about ifdef on .mk Message-ID: <20230222170818.BA79A867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21691c1a49426e765ab5fb321ea7002d5b3bf6d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x There are two legitimate cases to prefer ifdef over ifeq in package recipes: command-line overrides are allowed for busybox and uclibc configs. Except for that, all package in tree already use ifeq, so warn the developer adding/changing a package to use ifeq instead of ifdef, in order to keep consistence across packages. file.mk:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL file.mk:5: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL The difference between ifeq and ifdef is that ifdef doesn't expand recursively. Add comments to busybox and uclibc packages to avoid a warning in such special cases. Cc: Arnout Vandecappelle Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 29c9b4435503d1b3130ce37dcab88c89156b1481) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 1 + package/uclibc/uclibc.mk | 1 + utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++ utils/checkpackagelib/test_lib_mk.py | 48 ++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 0f14bf999d..f8f9cb5616 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -110,6 +110,7 @@ BUSYBOX_MAKE_OPTS = \ # specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config # setting. +# check-package disable Ifdef ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 0ddf7dfa6d..125aa4cdcf 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -22,6 +22,7 @@ UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting. +# check-package disable Ifdef ifndef UCLIBC_CONFIG_FILE UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG)) endif diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index b50a19ac62..8adf844e9a 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -21,6 +21,24 @@ continue_conditional = ["elif", "else"] end_conditional = ["endif"] +class Ifdef(_CheckFunction): + IFDEF = re.compile(r"^\s*(else\s+|)(ifdef|ifndef)\s") + + def check_line(self, lineno, text): + m = self.IFDEF.search(text) + if m is None: + return + word = m.group(2) + if word == 'ifdef': + return ["{}:{}: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL" + .format(self.filename, lineno), + text] + else: + return ["{}:{}: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL" + .format(self.filename, lineno), + text] + + class Indent(_CheckFunction): COMMENT = re.compile(r"^\s*#") CONDITIONAL = re.compile(r"^\s*({})\s".format("|".join(start_conditional + end_conditional + continue_conditional))) diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 49fa216fcd..80a1736b4e 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -3,6 +3,54 @@ import checkpackagelib.test_util as util import checkpackagelib.lib_mk as m +Ifdef = [ + ('ignore commented line', + 'any', + '# ifdef\n', + []), + ('simple', + 'any', + '\n' + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n' + 'endif\n', + [['any:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n']]), + ('ignore indentation', + 'any', + ' ifdef FOO\n' + ' endif\n' + '\tifdef BAR\n' + 'endif\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + ' ifdef FOO\n'], + ['any:3: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + '\tifdef BAR\n']]), + ('typo', + 'any', + '\n' + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n' + 'endif\n', + [['any:2: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n']]), + ('else ifdef', + 'any', + 'else ifdef SYMBOL # comment\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'else ifdef SYMBOL # comment\n']]), + ('else ifndef', + 'any', + '\t else ifndef\t($(SYMBOL),y) # comment\n', + [['any:1: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + '\t else ifndef\t($(SYMBOL),y) # comment\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Ifdef) +def test_Ifdef(testname, filename, string, expected): + warnings = util.check_file(m.Ifdef, filename, string) + assert warnings == expected + + Indent = [ ('ignore comment at beginning of line', 'any', From peter at korsgaard.com Wed Feb 22 16:47:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:47:06 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openpowerlink: properly handle legacy options Message-ID: <20230222170816.8E8A1867D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=693f779fe85292ae9cae612867afe4de05f3cfcc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "b1063a0136 package/openpowerlink: bump to v2.2.2" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2016.02, following the example described in the beginning of the file. Cc: Romain Naour Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit e1e4f3950719dd92a2456e2c45856f8cf5dc587e) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/openpowerlink/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5000c7a7be..6f5d01709a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4152,19 +4152,21 @@ config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB help openpowerlink kernel modules are built if the kernel stack library is selected. +# Note: BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE is still referenced from +# package/openpowerlink/Config.in config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - a monolithic user space library - a user space daemon driver +# Note: BR2_PACKAGE_OPENPOWERLINK_LIBPCAP is still referenced from +# package/openpowerlink/Config.in config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in index 1a3dd62acd..ef59a04baf 100644 --- a/package/openpowerlink/Config.in +++ b/package/openpowerlink/Config.in @@ -38,6 +38,8 @@ endchoice choice prompt "stack type" + default BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB if BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE # legacy + default BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB if BR2_PACKAGE_OPENPOWERLINK_LIBPCAP # legacy config BR2_PACKAGE_OPENPOWERLINK_STACK_MONOLITHIC_USER_STACK_LIB bool "linked into application" From peter at korsgaard.com Wed Feb 22 16:48:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:48:16 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/lua: properly handle legacy for removed version Message-ID: <20230222170819.0C995867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=768ecb25b245feb5b1269f2b449590486e843401 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "297613f1c7 package/lua: remove 5.2.x version" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2019.02, following the example described in the beginning of the file. Cc: Francois Perrad Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit f461543d9c0f8ea1586004e51561ba0a37b8aecf) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- package/lua/Config.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6c3384f445..5758d408f6 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2108,9 +2108,9 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD config BR2_PACKAGE_LUA_5_2 bool "Lua 5.2.x version removed" select BR2_LEGACY - select BR2_PACKAGE_LUA_5_3 help The Lua 5.2.x version was removed. +# Note: BR2_PACKAGE_LUA_5_2 is still referenced from package/lua/Config.in config BR2_TARGET_GENERIC_PASSWD_MD5 bool "target passwd md5 format support has been removed" diff --git a/package/lua/Config.in b/package/lua/Config.in index 309dd6eec2..8fa9f9b7ab 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER choice prompt "Lua Version" + default BR2_PACKAGE_LUA_5_3 if BR2_PACKAGE_LUA_5_2 # legacy default BR2_PACKAGE_LUA_5_4 help Select the version of Lua API/ABI you wish to use. From peter at korsgaard.com Wed Feb 22 16:43:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:43:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/live555: fix build config with locale Message-ID: <20230222170818.80416867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a6d8ee54041bd23af01064d125b37cad99f6e68d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Using current conditional code, added in 2014: ifndef ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif the define LOCALE_NOT_USED is always passed on CFLAGS, because there is no symbol with following names defined: "(y,y)" -> not defined when BR2_ENABLE_LOCALE=y "(,y)" -> not defined when BR2_ENABLE_LOCALE is not set So fix the typo, switching ifndef to ifneq. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 04a4b86a982e307268d660a38d231315134572fb) Signed-off-by: Peter Korsgaard --- package/live555/live555.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/live555/live555.mk b/package/live555/live555.mk index effd4517cf..56ed705783 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -39,7 +39,7 @@ else LIVE555_CFLAGS += -DNO_OPENSSL endif -ifndef ($(BR2_ENABLE_LOCALE),y) +ifneq ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif From peter at korsgaard.com Wed Feb 22 16:49:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:49:26 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/openjdk: properly handle legacy for renamed options Message-ID: <20230222170819.27475867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0734a1da838393d640dac8cf5e01c133b82bfde9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "a610bf9967 package/openjdk{-bin}: bump version to 17.0.1+12" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2021.11, following the example described in the beginning of the file. Cc: Tudor Holton Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit a97a4a74aa993b09b958639e2276e7f5cf7a75d2) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/openjdk/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index aa1e31d8d6..f3f5b6cf66 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -716,18 +716,20 @@ comment "Legacy options removed in 2021.11" config BR2_OPENJDK_VERSION_LTS bool "OpenJDK LTS version was renamed to OpenJDK 11" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_11 help The LTS version option was renamed to OpenJDK 11 to make it clear what LTS version is. +# Note: BR2_OPENJDK_VERSION_LTS is still referenced from +# package/openjdk/Config.in config BR2_OPENJDK_VERSION_LATEST bool "OpenJDK latest version (16.x) was removed" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_17 help OpenJDK 16.x is no longer mainted, so the option has been removed. Use OpenJDK 17.x instead. +# Note: BR2_OPENJDK_VERSION_LATEST is still referenced from +# package/openjdk/Config.in config BR2_PACKAGE_MPD_TIDAL bool "mpd tidal option removed" diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 8fbe51a27f..24a56e6b84 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -57,6 +57,8 @@ if BR2_PACKAGE_OPENJDK choice prompt "openjdk version" + default BR2_PACKAGE_OPENJDK_VERSION_11 if BR2_OPENJDK_VERSION_LTS # legacy + default BR2_PACKAGE_OPENJDK_VERSION_17 if BR2_OPENJDK_VERSION_LATEST # legacy default BR2_PACKAGE_OPENJDK_VERSION_17 help Select the version of OpenJDK you wish to use. From peter at korsgaard.com Wed Feb 22 16:50:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:50:16 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/sunxi-mali-utgard: properly handle legacy for renamed options Message-ID: <20230222170819.34A93867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fa653b1180646cf2ab3965514c10d6ad1f109f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "6a7a652b14 package/sunxi-mali-utgard: rename from sunxi-mali-mainline" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2022.02, following the example described in the beginning of the file. Cc: Giulio Benetti Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit efc223abd4fe764f8af8238aec67e8cb700db45e) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/sunxi-mali-utgard/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f3f5b6cf66..ceb7adfd7c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -645,20 +645,22 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 bool "sunxi-mali-mainline-r6p2 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 bool "sunxi-mali-mainline-r8p1 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_QT5WEBKIT_EXAMPLES bool "qt5webkit-examples removed" diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in index ff49ea03f1..59ac21f5ab 100644 --- a/package/sunxi-mali-utgard/Config.in +++ b/package/sunxi-mali-utgard/Config.in @@ -20,6 +20,8 @@ config BR2_PACKAGE_PROVIDES_LIBGLES choice prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 # legacy + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 # legacy default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help Select the version of the userspace module. From peter at korsgaard.com Wed Feb 22 16:43:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:43:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/busybox: add comment about variable override Message-ID: <20230222170818.AC2FF867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f188f8aa499ab5a8feddf3bc98ced0eecaf9f215 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The same comment already exists for UCLIBC_CONFIG_FILE. Both variables can be override from command-line, as described in the manual, at section 'Environment variables'. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 01c0fb3862bce6605881d9e32c29b5f7373bb2f9) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index ef628e90e9..0f14bf999d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -108,6 +108,8 @@ BUSYBOX_MAKE_OPTS = \ CONFIG_PREFIX="$(TARGET_DIR)" \ SKIP_STRIP=y +# specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config +# setting. ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif From peter at korsgaard.com Wed Feb 22 16:43:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:43:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/pugixml: use explicit build options Message-ID: <20230222170818.A1D2382261@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01f08ce374237ecb7f021194370ddbca04de08e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit upstream 986b7ffd01aedcd4f2aa16e78e4cad9313b6d7b2 "Add Cmake options for pugiconfig.hpp" added feature toogles to release v1.12, including PUGIXML_NO_XPATH and PUGIXML_COMPACT. Commit upstream 5f49f2c6575cc2b7d343f8d41581fe92d69d7b52 "Mark advanced options and removed redundant ones" removed CMake specific support for PUGIXML_HEADER_ONLY and PUGIXML_HAS_LONG_LONG, but they can still be provided using PUGIXML_BUILD_DEFINES, starting from release v1.12. So use the explicit build options PUGIXML_NO_XPATH and PUGIXML_COMPACT, but keep using PUGIXML_BUILD_DEFINES to set PUGIXML_HEADER_ONLY and PUGIXML_HAS_LONG_LONG. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit f043f928674e94687d1d3173394142271ca3d397) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index c54148d98f..1cf81c45f3 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -12,6 +12,18 @@ PUGIXML_CPE_ID_VENDOR = pugixml_project PUGIXML_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),y) +PUGIXML_CONF_OPTS += -DPUGIXML_NO_XPATH=OFF +else +PUGIXML_CONF_OPTS += -DPUGIXML_NO_XPATH=ON +endif + +ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y) +PUGIXML_CONF_OPTS += -DPUGIXML_COMPACT=ON +else +PUGIXML_CONF_OPTS += -DPUGIXML_COMPACT=OFF +endif + # Pugixml will automatically enable 'long long' support on C++11 compilers, # which means gcc 4.8+. As gcc always supports the 'long long' type, # force-enable this option to support older gcc versions. See also: @@ -19,12 +31,6 @@ PUGIXML_INSTALL_STAGING = YES PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG HOST_PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG -ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),) -PUGIXML_BUILD_DEFINES += PUGIXML_NO_XPATH -endif -ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y) -PUGIXML_BUILD_DEFINES += PUGIXML_COMPACT -endif ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif From peter at korsgaard.com Wed Feb 22 16:45:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:45:18 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] boot/uboot: remove use of legacy xloader symbol Message-ID: <20230222170818.CD19C82261@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89d06caa82ddd0ba259a5c1d302155fa904ac4bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "070b183d0c boot/xloader: remove package", from release 2018.11, removed the package, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 9b1b1763b754f8a25cf0f2a7fe05e53d256fe675) Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 557472b58b..7b7cad53f1 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -430,7 +430,6 @@ endif config BR2_TARGET_UBOOT_SPL bool "Install U-Boot SPL binary image" - depends on !BR2_TARGET_XLOADER help Install the U-Boot SPL binary image to the images directory. From peter at korsgaard.com Wed Feb 22 16:46:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:46:19 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/linux-headers: remove bogus symbol BR2_PACKAGE_HOST_LINUX_HEADERS Message-ID: <20230222170818.DFBE9867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d2f70b381a1a13c8913799f4172dcbc3c9cebe2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The package host-linux-headers does not exist and there were never references to this symbol in the tree, do drop it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 367bd65f3c216426e2fc21742dbff11ea8d896d7) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 00cc18ea62..7ce514a5fa 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -1,8 +1,5 @@ comment "Kernel Header Options" -config BR2_PACKAGE_HOST_LINUX_HEADERS - bool - choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL From peter at korsgaard.com Wed Feb 22 16:47:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:47:50 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/gcc: properly handle legacy for renamed ARC option Message-ID: <20230222170819.01EE7867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35b29aaa3cf1feb67fea1d4ac17d8185d95d1d6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "50332a530b gcc: rename option for ARC gcc" tried to add legacy handling but the new symbol is part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2016.11, following the example described in the beginning of the file. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit eb8f38891b16e5fb0f010c658b271e22670a1633) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 3 ++- package/gcc/Config.in.host | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5ffeb01af3..6c3384f445 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -3984,10 +3984,11 @@ config BR2_LINUX_KERNEL_TOOL_SELFTESTS config BR2_GCC_VERSION_4_8_ARC bool "gcc arc option renamed" select BR2_LEGACY - select BR2_GCC_VERSION_ARC help The option that selects the gcc version for the ARC architecture has been renamed to BR2_GCC_VERSION_ARC. +# Note: BR2_GCC_VERSION_4_8_ARC is still referenced from +# package/gcc/Config.in.host config BR2_KERNEL_HEADERS_4_0 bool "kernel headers version 4.0.x are no longer supported" diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index d7fedc9591..cd1b9fa46d 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -2,6 +2,7 @@ comment "GCC Options" choice prompt "GCC compiler Version" + default BR2_GCC_VERSION_ARC if BR2_GCC_VERSION_4_8_ARC # legacy default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_POWERPC_SPE if BR2_powerpc_SPE default BR2_GCC_VERSION_11_X From fontaine.fabrice at gmail.com Wed Feb 22 18:12:54 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 19:12:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/xerces: drop patch Message-ID: <20230222181254.2533041-1-fontaine.fabrice@gmail.com> Drop patch which is not needed since commit 62cab101356c97432da482e168adaf065de65c4f. This patch is actually raising a build failure since bump to version 3.2.4 in commit d2d8f146a9f0ed3b66c4dd470bb76efdbb630a75 and https://github.com/apache/xerces-c/commit/af1935b567c18c8b2de71d6ea97239be60876335: CMake Error at src/CMakeLists.txt:1271 (add_library): Target "xerces-c" links to target "CURL::libcurl" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Fixes: - http://autobuild.buildroot.org/results/c62856a5eeb34714f26235b2d6f8adc4ea612686 Signed-off-by: Fabrice Fontaine --- .../0001-fix-static-linking-with-curl.patch | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 package/xerces/0001-fix-static-linking-with-curl.patch diff --git a/package/xerces/0001-fix-static-linking-with-curl.patch b/package/xerces/0001-fix-static-linking-with-curl.patch deleted file mode 100644 index db38de79fc..0000000000 --- a/package/xerces/0001-fix-static-linking-with-curl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 26e3f1440bbc75c704fc93ff43a2abbfbe4c0203 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 11 Oct 2018 22:56:50 +0200 -Subject: [PATCH] fix static linking with curl - -When curl is statically built with openssl support, xerces needs to -link with openssl libraries so use pkg_check_modules to get any -needed dependencies - -Fixes: - - http://autobuild.buildroot.org/results/29ca90fff2c8e38f2edf7240eca3aa3fe7397c45 - -Signed-off-by: Fabrice Fontaine ---- - cmake/XercesNetAccessorSelection.cmake | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/cmake/XercesNetAccessorSelection.cmake b/cmake/XercesNetAccessorSelection.cmake -index 7a63f1f6b..e90fcf034 100644 ---- a/cmake/XercesNetAccessorSelection.cmake -+++ b/cmake/XercesNetAccessorSelection.cmake -@@ -31,7 +31,13 @@ if(network) - - # Requires select() which is UNIX only - if(UNIX) -- find_package(CURL) -+ find_package(PkgConfig) -+ if (PkgConfig_FOUND) -+ pkg_check_modules(CURL libcurl) -+ if (NOT CURL_FOUND) -+ find_package(CURL) -+ endif() -+ endif() - if(CURL_FOUND) - list(APPEND netaccessors curl) - endif() --- -2.17.1 - -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 18:22:10 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 19:22:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/lightning: needs threads Message-ID: <20230222182210.2539248-1-fontaine.fabrice@gmail.com> threads are mandatory since bump to version 2.2.0 in commit af6f7aa76db5aed1eada0b27bd0375610a2fc728 and https://git.savannah.gnu.org/cgit/lightning.git/commit/?id=d5a7c8e4ad719e84dbb4904c532f906a1ef5a77b: In file included from incr.c:2: ../include/lightning.h:27:10: fatal error: pthread.h: No such file or directory 27 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/62205869159d4a73c59a9795140fa77e9c3310ae Signed-off-by: Fabrice Fontaine --- package/lightning/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/lightning/Config.in b/package/lightning/Config.in index a0542edce9..3cf7c28ae2 100644 --- a/package/lightning/Config.in +++ b/package/lightning/Config.in @@ -1,13 +1,14 @@ -comment "lightning needs a toolchain w/ dynamic library" +comment "lightning needs a toolchain w/ dynamic library, threads" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_LIGHTNING bool "lightning" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS help GNU lightning is a library that generates assembly language code at run-time. -- 2.39.0 From ckhardin at gmail.com Wed Feb 22 18:34:26 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 10:34:26 -0800 Subject: [Buildroot] [PATCH 1/4] linux: create a scmversion file based on the custom repo variables In-Reply-To: <1f6626fc-12c0-d1f0-2a8a-2fa2fd0431b6@mind.be> References: <20230209231518.9458-1-ckhardin@gmail.com> <1f6626fc-12c0-d1f0-2a8a-2fa2fd0431b6@mind.be> Message-ID: > On Feb 14, 2023, at 1:46 PM, Arnout Vandecappelle wrote: > > Hi Charles, > > First of all, in patchwork [1] there are about twelve patches from you about this subject, but I think all except these four are superseded. Is that correct? Could you update patchwork and mark the old ones as superseded? > Yeah, sorry - had some mail server changes that kept saying an error but apparently the mail went thru. > > On 10/02/2023 00:15, ckhardin at gmail.com wrote: >> From: Charles Hardin >> When using the custom repositories, the archive creation will >> omit the source history to get reproducible hashes. This has >> the side effect of making the setlocalversion scripts within the >> builds to not create the tracking information as expected. So, >> just generate a .scmversion so that kernels will be labelled >> with where buildroot referenced them. > > This is less than ideal because it's completely different than the normal git describe output. In particular, if you first develop something in an OVERRIDE_SRCDIR (after applying patch 4) and then change the config to point to the exact same commit with BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION, it will create a completely different UTS_RELEASE string... Agreed -I would argue that the OVERRIDE_SRCDIR patch is functionally correct and what is desired particularly for local dev but the CUSTOM_REPO is a bit hackish and broken. Trying to figure out a way to do that. > > I think a better solution would be to extend the git download wrapper with a hook that gets called in the git tree itself. E.g.: > > LINUX_SCMVERSION_HOOK = ./scripts/setlocalversion --save-scmversion > > The same hook could then also be used for rsync. And it would be easy to add the same feature to barebox, tf-a, ... That is a good idea - but, from what I can tell the git download script does a pull and extract all at once with no hooks being run from support/download/git ``` #!/usr/bin/env bash # NOTE: if the output of this backend has to change (e.g. we change what gets # included in the archive (e.g. LFS), or we change the format of the archive # (e.g. tar options, compression ratio or method)), we MUST update the format # version in the variable BR_FMT_VERSION_git, in package/pkg-download.mk. # We want to catch any unexpected failure, and exit immediately set -E ? snip snip ? Download from git repo in here ? snip snip ? # Generate the archive. # We do not want the .git dir; we keep other .git files, in case they are the # only files in their directory. # The .git dir would generate non reproducible tarballs as it depends on # the state of the remote server. It also would generate large tarballs # (gigabytes for some linux trees) when a full clone took place. mk_tar_gz "${git_cache}" "${basename}" "${date}" "${output}" ".git/*? ``` So from the above I don?t see where to put a HOOK in from the make scripts - is there an example for this because we cann?t run the hook from the tarball because there is no ?.git? history in the tarball and the hook would need to be done at the creation? right? > > Regards, > Arnout > > >> For example (line wrapped) >> #define UTS_RELEASE "5.4.70-repo-version-" \ >> "92c23d10d0031e0a13244a1a97e7530d3b53fc6e" >> Signed-off-by: Charles Hardin >> --- >> linux/linux.mk | 14 ++++++++++++++ >> 1 file changed, 14 insertions(+) >> diff --git a/linux/linux.mk b/linux/linux.mk >> index 7645b5f507..0b27c8dee2 100644 >> --- a/linux/linux.mk >> +++ b/linux/linux.mk >> @@ -596,6 +596,20 @@ endif >> ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)),) >> $(error No custom repo URL set. Check your BR2_LINUX_KERNEL_CUSTOM_REPO_URL setting) >> endif >> + >> +# Create a custom scm version file to reflect the source version since the >> +# archive will omit source directories like .git to maintain reproducible >> +# hashes for the archives >> +LINUX_CUSTOM_REPO_SCMVERSION = \ >> + "-repo-version-$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION))" >> +define LINUX_CUSTOM_REPO_SCMVERSION_HOOK >> + (cd $(@D); \ >> + if [ ! -f .scmversion ]; then \ >> + echo $(LINUX_CUSTOM_REPO_SCMVERSION) > .scmversion; \ >> + fi) >> +endef >> + >> +LINUX_POST_EXTRACT_HOOKS += LINUX_CUSTOM_REPO_SCMVERSION_HOOK >> endif >> ifeq ($(BR_BUILDING),y) -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Wed Feb 22 19:18:50 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 20:18:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgcrypt: fix Thumb mode workaround Message-ID: <20230222191850.182174-1-fontaine.fabrice@gmail.com> Fix the following build failure: /tmp/ccRqWxnA.s:98: Error: instruction not supported in Thumb16 mode -- `adds ip,fp,r0' Fixes: - http://autobuild.buildroot.org/results/4b96f4e41724e5c9c806a6c7df397a58d1ae1b1e Signed-off-by: Fabrice Fontaine --- package/libgcrypt/libgcrypt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 6cf9b235f3..dc19116df6 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -27,8 +27,8 @@ LIBGCRYPT_CONF_OPTS += --disable-asm endif # Code doesn't build in thumb mode -ifeq ($(BR2_arm),y) -LIBGCRYPT_CONF_ENV += CFLAGS="$(patsubst -mthumb,,$(TARGET_CFLAGS))" +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBGCRYPT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" endif $(eval $(autotools-package)) -- 2.39.1 From peter at korsgaard.com Wed Feb 22 19:44:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:44:38 +0100 Subject: [Buildroot] [git commit] package/gitlab-runner: use LIBCURL_FORCE_TLS to enforce TLS support in curl In-Reply-To: <20230206153040.1FC2B83CA5@busybox.osuosl.org> (Peter Korsgaard's message of "Mon, 6 Feb 2023 16:30:20 +0100") References: <20230206153040.1FC2B83CA5@busybox.osuosl.org> Message-ID: <87wn49qyc9.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=b95f7591bd83a0e483d2b6db49258d2ea8b44f3d > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > BR2_PACKAGE_LIBCURL_OPENSSL is part of a "choice" option so it cannot be > selected. What seems to be really be needed is HTTPS support in curl, so > use the blind LIBCURL_FORCE_TLS option instead (openssl is already > selected). > Signed-off-by: Peter Korsgaard Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 19:29:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:29:39 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/gitlab-runner: use LIBCURL_FORCE_TLS to enforce TLS support in curl Message-ID: <20230222194454.03B5E867D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=227bfb48661865a2496ce28236d1aba0ca831bae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x BR2_PACKAGE_LIBCURL_OPENSSL is part of a "choice" option so it cannot be selected. What seems to be really be needed is HTTPS support in curl, so use the blind LIBCURL_FORCE_TLS option instead (openssl is already selected). Signed-off-by: Peter Korsgaard (cherry picked from commit b95f7591bd83a0e483d2b6db49258d2ea8b44f3d) Signed-off-by: Peter Korsgaard --- package/gitlab-runner/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gitlab-runner/Config.in b/package/gitlab-runner/Config.in index 89e3e87b5c..4289613ab9 100644 --- a/package/gitlab-runner/Config.in +++ b/package/gitlab-runner/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_GITLAB_RUNNER select BR2_PACKAGE_GIT # runtime select BR2_PACKAGE_LIBCURL # runtime select BR2_PACKAGE_LIBCURL_CURL # runtime - select BR2_PACKAGE_LIBCURL_OPENSSL # runtime, for ca-certificates. + select BR2_PACKAGE_LIBCURL_FORCE_TLS # runtime select BR2_PACKAGE_OPENSSL # runtime select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL # runtime select BR2_PACKAGE_LIBOPENSSL_BIN # runtime From peter at korsgaard.com Wed Feb 22 19:47:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:47:20 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require FindBin perl package for libopenssl In-Reply-To: <20230206213956.B167A83D34@busybox.osuosl.org> (Peter Korsgaard's message of "Mon, 6 Feb 2023 22:39:15 +0100") References: <20230206213956.B167A83D34@busybox.osuosl.org> Message-ID: <87sfexqy7r.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=5aab8c59d5b310540105166e7b48faf3d5bd200b > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes: > http://autobuild.buildroot.net/results/5d1/5d10f4f545dccf126e3f5b5efce777a393c5e7bc/ > http://autobuild.buildroot.net/results/7c2/7c2df31c6eb34b68e460e092d8c262bdc6c8f25a/ > The configure script of (host-)libopenssl needs the FindBin perl module on the host: > Can't locate FindBin.pm in @INC (you may need to install the FindBin module) > (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl > /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 > /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 > /usr/share/perl5) at ./Configure line 15. BEGIN failed--compilation aborted > at ./Configure line 15. > As this is needed for both libopenssl and host-libopenssl (which does not > have a corresponding config symbol in the .config), we have to require it > unconditionally. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 19:47:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:47:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: require FindBin perl package for libopenssl Message-ID: <20230222195028.256DE867EB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=703781013b150c1dae011e43935d89dc9cc69d50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes: http://autobuild.buildroot.net/results/5d1/5d10f4f545dccf126e3f5b5efce777a393c5e7bc/ http://autobuild.buildroot.net/results/7c2/7c2df31c6eb34b68e460e092d8c262bdc6c8f25a/ The configure script of (host-)libopenssl needs the FindBin perl module on the host: Can't locate FindBin.pm in @INC (you may need to install the FindBin module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./Configure line 15. BEGIN failed--compilation aborted at ./Configure line 15. As this is needed for both libopenssl and host-libopenssl (which does not have a corresponding config symbol in the .config), we have to require it unconditionally. Signed-off-by: Peter Korsgaard (cherry picked from commit 5aab8c59d5b310540105166e7b48faf3d5bd200b) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 2b678ae8c4..906781ab78 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -277,6 +277,7 @@ fi required_perl_modules="Data::Dumper" # Needed to build host-autoconf required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake +required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" From peter at korsgaard.com Wed Feb 22 19:46:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:46:56 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: require FindBin perl package for libopenssl Message-ID: <20230222195137.78DC3867F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=579945a3baa365aae556b886b9e2405a9176d1a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes: http://autobuild.buildroot.net/results/5d1/5d10f4f545dccf126e3f5b5efce777a393c5e7bc/ http://autobuild.buildroot.net/results/7c2/7c2df31c6eb34b68e460e092d8c262bdc6c8f25a/ The configure script of (host-)libopenssl needs the FindBin perl module on the host: Can't locate FindBin.pm in @INC (you may need to install the FindBin module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./Configure line 15. BEGIN failed--compilation aborted at ./Configure line 15. As this is needed for both libopenssl and host-libopenssl (which does not have a corresponding config symbol in the .config), we have to require it unconditionally. Signed-off-by: Peter Korsgaard (cherry picked from commit 5aab8c59d5b310540105166e7b48faf3d5bd200b) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 2b678ae8c4..906781ab78 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -277,6 +277,7 @@ fi required_perl_modules="Data::Dumper" # Needed to build host-autoconf required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake +required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" From peter at korsgaard.com Wed Feb 22 19:52:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:52:24 +0100 Subject: [Buildroot] [PATCH v2] package/qt5: fix build failure due to libressl use In-Reply-To: <20230206234520.4a140264@windsurf> (Thomas Petazzoni via buildroot's message of "Mon, 6 Feb 2023 23:45:20 +0100") References: <20220928205527.GH1419013@scaer> <20220929104648.324977-1-giulio.benetti@benettiengineering.com> <20230206234520.4a140264@windsurf> Message-ID: <87o7plqxzb.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Thu, 29 Sep 2022 12:46:48 +0200 > Giulio Benetti wrote: >> Qt5 only supports openssl, check [0] and [1]. So in qt5base.mk let's check >> if BR2_PACKAGE_LIBOPENSSL is enabled instead of BR2_PACKAGE_OPENSSL(that >> could be openssl or libressl) and for qt5enginio and qt5webkit let's select >> BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of only BR2_PACKAGE_OPENSSL. >> This way we make sure that only openssl is selected and not libressl or >> other future openssl-like implementations. >> >> Fixes: >> http://autobuild.buildroot.net/results/a956b48b782dbaa055d7146360465e2493a809d9/ >> >> [0]: https://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support >> [1]: https://bugreports.qt.io/browse/QTBUG-68374 >> >> Signed-off-by: Giulio Benetti >> --- V1-> V2: >> * select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of BR2_PACKAGE_LIBOPENSSL >> --- >> package/qt5/qt5base/qt5base.mk | 4 ++-- >> package/qt5/qt5enginio/Config.in | 1 + >> package/qt5/qt5webkit/Config.in | 1 + >> 3 files changed, 4 insertions(+), 2 deletions(-) > Applied to master, thanks. Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 19:56:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:56:47 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require English perl package for host-libxml-parser-perl In-Reply-To: <20230207083951.455AD83F4E@busybox.osuosl.org> (Peter Korsgaard's message of "Tue, 7 Feb 2023 09:39:29 +0100") References: <20230207083951.455AD83F4E@busybox.osuosl.org> Message-ID: <87k009qxs0.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=8f8085e63a4a755d587a25a73dbaafe33b23f867 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes http://autobuild.buildroot.net/results/166/1667b4ebd8e16e7d8b47bc3ca128a76daf27b4d9/ > The configure script of host-libxml-parser-perl needs the English perl > module on the host: > ERROR from evaluation of > /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/Expat/Makefile.PL: > Can't locate English.pm in @INC (you may need to install the English module) > (@INC contains: > /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/inc > /home/buildroot/autobuild/instance-1/output-1/host/lib/perl > /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 > /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 > /usr/share/perl5 .) at ./Makefile.PL line 3. > So add a check for it in dependencies.sh similar to the existing check for > ExtUtils::MakeMaker. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 20:02:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 21:02:27 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require open perl package for libxcrypt In-Reply-To: <20230207093548.1B15A83F98@busybox.osuosl.org> (Peter Korsgaard's message of "Tue, 7 Feb 2023 10:33:33 +0100") References: <20230207093548.1B15A83F98@busybox.osuosl.org> Message-ID: <87fsaxqxik.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=4cdd99190e89d538c25a8fc701372775fbde3b97 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes: > http://autobuild.buildroot.net/results/16c/16cba783be11cc5024f9c56bb0a7abb0acf13ef8/ > The configure script of libxcrypt needs the open perl module on the host: > Can't locate open.pm in @INC (you may need to install the open module) (@INC > contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl > /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 > /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 > /usr/share/perl5) at ./build-aux/scripts/expand-selected-hashes line 20. > So add a check for it in dependencies.sh similar to how it is done for mpv. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 19:56:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:56:21 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: require English perl package for host-libxml-parser-perl Message-ID: <20230222200317.7DE0386811@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea68d30c344899e7f890ec0996b7c8554c2fa61e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes http://autobuild.buildroot.net/results/166/1667b4ebd8e16e7d8b47bc3ca128a76daf27b4d9/ The configure script of host-libxml-parser-perl needs the English perl module on the host: ERROR from evaluation of /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/Expat/Makefile.PL: Can't locate English.pm in @INC (you may need to install the English module) (@INC contains: /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/inc /home/buildroot/autobuild/instance-1/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at ./Makefile.PL line 3. So add a check for it in dependencies.sh similar to the existing check for ExtUtils::MakeMaker. Signed-off-by: Peter Korsgaard (cherry picked from commit 8f8085e63a4a755d587a25a73dbaafe33b23f867) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 906781ab78..b879c58ff2 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -275,6 +275,7 @@ fi # Check that the Perl installation is complete enough for Buildroot. required_perl_modules="Data::Dumper" # Needed to build host-autoconf +required_perl_modules="$required_perl_modules English" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl From peter at korsgaard.com Wed Feb 22 20:02:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 21:02:13 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: require open perl package for libxcrypt Message-ID: <20230222200317.87F5F86812@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=18db3685293a7865d9eb11cbee1ae5ed506cd429 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes: http://autobuild.buildroot.net/results/16c/16cba783be11cc5024f9c56bb0a7abb0acf13ef8/ The configure script of libxcrypt needs the open perl module on the host: Can't locate open.pm in @INC (you may need to install the open module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./build-aux/scripts/expand-selected-hashes line 20. So add a check for it in dependencies.sh similar to how it is done for mpv. Signed-off-by: Peter Korsgaard (cherry picked from commit 4cdd99190e89d538c25a8fc701372775fbde3b97) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index b879c58ff2..683bb5cb7e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -280,6 +280,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules open" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From peter at korsgaard.com Wed Feb 22 19:51:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:51:33 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5: fix build failure due to libressl use Message-ID: <20230222200317.73DF086810@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c667302fd6a0f16a36925a77d0e2e6b7ec64bbc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Qt5 only supports openssl, check [0] and [1]. So in qt5base.mk let's check if BR2_PACKAGE_LIBOPENSSL is enabled instead of BR2_PACKAGE_OPENSSL(that could be openssl or libressl) and for qt5enginio and qt5webkit let's select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of only BR2_PACKAGE_OPENSSL. This way we make sure that only openssl is selected and not libressl or other future openssl-like implementations. Fixes: http://autobuild.buildroot.net/results/a956b48b782dbaa055d7146360465e2493a809d9/ [0]: https://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support [1]: https://bugreports.qt.io/browse/QTBUG-68374 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit a94d39d693d84f96f996a6a3decfecc60a9625bd) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 4 ++-- package/qt5/qt5enginio/Config.in | 2 ++ package/qt5/qt5webkit/Config.in | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index f880f806cc..ab6c579fdb 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -216,8 +216,8 @@ else QT5BASE_CONFIGURE_OPTS += -no-eglfs endif -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBOPENSSL),-openssl,-no-openssl) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBOPENSSL),openssl) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig) diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in index b738f0db7c..a1ac6f8ca0 100644 --- a/package/qt5/qt5enginio/Config.in +++ b/package/qt5/qt5enginio/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_QT5ENGINIO bool "qt5enginio" select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_NETWORK help diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 26c3897d1d..9b84ac5f96 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -16,6 +16,8 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS From peter at korsgaard.com Wed Feb 22 20:02:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 21:02:05 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: require open perl package for libxcrypt Message-ID: <20230222200429.00F7C86844@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a007e20b33ddc224d014392f5490218a12c94add branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes: http://autobuild.buildroot.net/results/16c/16cba783be11cc5024f9c56bb0a7abb0acf13ef8/ The configure script of libxcrypt needs the open perl module on the host: Can't locate open.pm in @INC (you may need to install the open module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./build-aux/scripts/expand-selected-hashes line 20. So add a check for it in dependencies.sh similar to how it is done for mpv. Signed-off-by: Peter Korsgaard (cherry picked from commit 4cdd99190e89d538c25a8fc701372775fbde3b97) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index b879c58ff2..683bb5cb7e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -280,6 +280,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules open" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From peter at korsgaard.com Wed Feb 22 19:51:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:51:21 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/qt5: fix build failure due to libressl use Message-ID: <20230222200428.DC61D86828@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5094adb260ddabb1ae54db71fd9cf95c09499633 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Qt5 only supports openssl, check [0] and [1]. So in qt5base.mk let's check if BR2_PACKAGE_LIBOPENSSL is enabled instead of BR2_PACKAGE_OPENSSL(that could be openssl or libressl) and for qt5enginio and qt5webkit let's select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of only BR2_PACKAGE_OPENSSL. This way we make sure that only openssl is selected and not libressl or other future openssl-like implementations. Fixes: http://autobuild.buildroot.net/results/a956b48b782dbaa055d7146360465e2493a809d9/ [0]: https://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support [1]: https://bugreports.qt.io/browse/QTBUG-68374 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit a94d39d693d84f96f996a6a3decfecc60a9625bd) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 4 ++-- package/qt5/qt5enginio/Config.in | 2 ++ package/qt5/qt5webkit/Config.in | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index a81892422c..efa0e16e9a 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -229,8 +229,8 @@ else QT5BASE_CONFIGURE_OPTS += -no-eglfs endif -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBOPENSSL),-openssl,-no-openssl) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBOPENSSL),openssl) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig) diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in index b738f0db7c..a1ac6f8ca0 100644 --- a/package/qt5/qt5enginio/Config.in +++ b/package/qt5/qt5enginio/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_QT5ENGINIO bool "qt5enginio" select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_NETWORK help diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 26c3897d1d..9b84ac5f96 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -16,6 +16,8 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS From peter at korsgaard.com Wed Feb 22 19:56:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:56:28 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: require English perl package for host-libxml-parser-perl Message-ID: <20230222200428.E8EC48683E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a17c925e063b3531202a67500879e39599ed1a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes http://autobuild.buildroot.net/results/166/1667b4ebd8e16e7d8b47bc3ca128a76daf27b4d9/ The configure script of host-libxml-parser-perl needs the English perl module on the host: ERROR from evaluation of /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/Expat/Makefile.PL: Can't locate English.pm in @INC (you may need to install the English module) (@INC contains: /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/inc /home/buildroot/autobuild/instance-1/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at ./Makefile.PL line 3. So add a check for it in dependencies.sh similar to the existing check for ExtUtils::MakeMaker. Signed-off-by: Peter Korsgaard (cherry picked from commit 8f8085e63a4a755d587a25a73dbaafe33b23f867) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 906781ab78..b879c58ff2 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -275,6 +275,7 @@ fi # Check that the Perl installation is complete enough for Buildroot. required_perl_modules="Data::Dumper" # Needed to build host-autoconf +required_perl_modules="$required_perl_modules English" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl From peter at korsgaard.com Wed Feb 22 20:10:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 21:10:51 +0100 Subject: [Buildroot] [PATCH] package/rtl8192eu: disable package for s390x architecture In-Reply-To: <20230206133149.910237-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Mon, 6 Feb 2023 14:31:49 +0100") References: <20230206133149.910237-1-giulio.benetti@benettiengineering.com> Message-ID: <87bkllqx4k.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this > package for this architecture. > Fixes: > http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2/ > Signed-off-by: Giulio Benetti Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 20:09:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 21:09:45 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/rtl8192eu: disable package for s390x architecture Message-ID: <20230222201137.705E18684A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc5a107fd3f4bd5c72e48fd4df12abe1319e401d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this package for this architecture. Fixes: http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 26893ab1c67d7df8c1b71269051ad41b5ea03e5e) Signed-off-by: Peter Korsgaard --- package/rtl8192eu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rtl8192eu/Config.in b/package/rtl8192eu/Config.in index 4d71b711c3..969ba090ce 100644 --- a/package/rtl8192eu/Config.in +++ b/package/rtl8192eu/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTL8192EU bool "rtl8192eu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help A standalone driver for the RTL8192EU USB Wi-Fi adapter. @@ -10,4 +11,5 @@ config BR2_PACKAGE_RTL8192EU https://github.com/clnhub/rtl8192eu-linux comment "rtl8192eu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL From ju.o at free.fr Wed Feb 22 20:41:33 2023 From: ju.o at free.fr (Julien Olivain) Date: Wed, 22 Feb 2023 21:41:33 +0100 Subject: [Buildroot] [PATCH next 1/2] package/opencsd: new package Message-ID: <20230222204134.38884-1-ju.o@free.fr> This library provides an API suitable for the decode of ARM(r) CoreSight(tm) trace streams. OpenCSD is for example an optional dependency in the Linux "perf" tool, starting from kernel version 5.1. https://github.com/Linaro/OpenCSD Signed-off-by: Julien Olivain --- Patch tested on branch next at commit 9793454 with commands: make check-package ... 0 warnings generated ./utils/test-pkg -a -p opencsd arm-aarch64 [ 1/45]: OK bootlin-aarch64-glibc [ 2/45]: OK bootlin-arcle-hs38-uclibc [ 3/45]: SKIPPED bootlin-armv5-uclibc [ 4/45]: OK bootlin-armv7-glibc [ 5/45]: OK bootlin-armv7m-uclibc [ 6/45]: SKIPPED bootlin-armv7-musl [ 7/45]: OK bootlin-m68k-5208-uclibc [ 8/45]: SKIPPED bootlin-m68k-68040-uclibc [ 9/45]: SKIPPED bootlin-microblazeel-uclibc [10/45]: SKIPPED bootlin-mipsel32r6-glibc [11/45]: SKIPPED bootlin-mipsel-uclibc [12/45]: SKIPPED bootlin-nios2-glibc [13/45]: SKIPPED bootlin-openrisc-uclibc [14/45]: SKIPPED bootlin-powerpc64le-power8-glibc [15/45]: SKIPPED bootlin-powerpc-e500mc-uclibc [16/45]: SKIPPED bootlin-riscv32-glibc [17/45]: SKIPPED bootlin-riscv64-glibc [18/45]: SKIPPED bootlin-riscv64-musl [19/45]: SKIPPED bootlin-s390x-z13-glibc [20/45]: SKIPPED bootlin-sh4-uclibc [21/45]: SKIPPED bootlin-sparc64-glibc [22/45]: SKIPPED bootlin-sparc-uclibc [23/45]: SKIPPED bootlin-x86-64-glibc [24/45]: SKIPPED bootlin-x86-64-musl [25/45]: SKIPPED bootlin-x86-64-uclibc [26/45]: SKIPPED bootlin-xtensa-uclibc [27/45]: SKIPPED br-arm-basic [28/45]: SKIPPED br-arm-full-nothread [29/45]: OK br-arm-full-static [30/45]: SKIPPED br-i386-pentium4-full [31/45]: SKIPPED br-i386-pentium-mmx-musl [32/45]: SKIPPED br-mips64-n64-full [33/45]: SKIPPED br-mips64r6-el-hf-glibc [34/45]: SKIPPED br-powerpc-603e-basic-cpp [35/45]: SKIPPED br-powerpc64-power7-glibc [36/45]: SKIPPED 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-mips64 [43/45]: SKIPPED sourcery-mips [44/45]: SKIPPED sourcery-nios2 [45/45]: SKIPPED 45 builds, 33 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- DEVELOPERS | 1 + package/Config.in | 1 + package/opencsd/Config.in | 27 +++++++++++++++++++++++++++ package/opencsd/opencsd.hash | 3 +++ package/opencsd/opencsd.mk | 31 +++++++++++++++++++++++++++++++ 5 files changed, 63 insertions(+) create mode 100644 package/opencsd/Config.in create mode 100644 package/opencsd/opencsd.hash create mode 100644 package/opencsd/opencsd.mk diff --git a/DEVELOPERS b/DEVELOPERS index 599cfe6886..32524c152a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1696,6 +1696,7 @@ F: package/highway/ F: package/libjxl/ F: package/octave/ F: package/ola/ +F: package/opencsd/ F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..fcbf8e8b6c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1708,6 +1708,7 @@ menu "Hardware handling" source "package/mtdev/Config.in" source "package/ne10/Config.in" source "package/neardal/Config.in" + source "package/opencsd/Config.in" source "package/opensc/Config.in" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" diff --git a/package/opencsd/Config.in b/package/opencsd/Config.in new file mode 100644 index 0000000000..0e63d99251 --- /dev/null +++ b/package/opencsd/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_OPENCSD_ARCH_SUPPORTS + bool + default y if BR2_arm + default y if BR2_armeb + default y if BR2_aarch64 + default y if BR2_aarch64_be + +config BR2_PACKAGE_OPENCSD + bool "OpenCSD" + depends on BR2_PACKAGE_OPENCSD_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + This library provides an API suitable for the decode of + ARM(r) CoreSight(tm) trace streams. + + OpenCSD is for example an optional dependency in the Linux + "perf" tool, starting from kernel version 5.1. + + https://github.com/Linaro/OpenCSD + +comment "OpenCSD needs a toolchain w/ C++11, gcc >= 4.8, dynamic libraries" + depends on BR2_PACKAGE_OPENCSD_ARCH_SUPPORTS + depends on BR2_STATIC_LIBS \ + || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/opencsd/opencsd.hash b/package/opencsd/opencsd.hash new file mode 100644 index 0000000000..84a762fb36 --- /dev/null +++ b/package/opencsd/opencsd.hash @@ -0,0 +1,3 @@ +# Locally Computed: +sha256 e1bb6d8d09e87974cb5ca6db2a13b0e1ba9e51117ca2ed71879df07ff7af4de2 opencsd-1.4.0.tar.gz +sha256 980eef4b0744e63834e3ec0d50c2a4ff6d81d7ec62dd8ba8c66acae0ec5a2e88 LICENSE diff --git a/package/opencsd/opencsd.mk b/package/opencsd/opencsd.mk new file mode 100644 index 0000000000..680364d01d --- /dev/null +++ b/package/opencsd/opencsd.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# opencsd +# +################################################################################ + +OPENCSD_VERSION = 1.4.0 +OPENCSD_SITE = $(call github,Linaro,OpenCSD,v$(OPENCSD_VERSION)) +OPENCSD_LICENSE = BSD-3-Clause +OPENCSD_LICENSE_FILES = LICENSE +OPENCSD_INSTALL_STAGING = YES + +OPENCSD_MAKE_OPTS = \ + CROSS_COMPILE="$(TARGET_CROSS)" + +define OPENCSD_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/decoder/build/linux \ + $(OPENCSD_MAKE_OPTS) all +endef + +define OPENCSD_INSTALL_TARGET_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/decoder/build/linux \ + $(OPENCSD_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install +endef + +define OPENCSD_INSTALL_STAGING_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/decoder/build/linux \ + $(OPENCSD_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install +endef + +$(eval $(generic-package)) -- 2.39.2 From ju.o at free.fr Wed Feb 22 20:41:34 2023 From: ju.o at free.fr (Julien Olivain) Date: Wed, 22 Feb 2023 21:41:34 +0100 Subject: [Buildroot] [PATCH next 2/2] package/linux-tools: perf: add OpenCSD support In-Reply-To: <20230222204134.38884-1-ju.o@free.fr> References: <20230222204134.38884-1-ju.o@free.fr> Message-ID: <20230222204134.38884-2-ju.o@free.fr> This commit adds the Arm CoreSight trace data Decoder support to perf. See: https://docs.kernel.org/trace/coresight/coresight-perf.html Signed-off-by: Julien Olivain --- package/linux-tools/linux-tool-perf.mk.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index dda63cccec..3a16705087 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -119,6 +119,13 @@ else PERF_MAKE_FLAGS += NO_LZMA=1 endif +ifeq ($(BR2_PACKAGE_OPENCSD),y) +PERF_DEPENDENCIES += opencsd +PERF_MAKE_FLAGS += CORESIGHT=1 +# There is no "else CORESIGHT=0" case, because "perf" Makefile uses +# bare "ifdef CORESIGHT" constructs. +endif + # We really do not want to build the perf documentation, because it # has stringent requirement on the documentation generation tools, # like xmlto and asciidoc), which may be lagging behind on some -- 2.39.2 From thomas.petazzoni at bootlin.com Wed Feb 22 15:07:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 16:07:35 +0100 Subject: [Buildroot] [git commit branch/next] package/rtl8192eu: bump to 2022-12-29 version on branch 5.11.2.1 Message-ID: <20230222205617.795D586881@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8beed8ac56a51d4d6a9dd81b81b8025cb7f8d99b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop local patch since it's been merged[0]. [0]: https://github.com/clnhub/rtl8192eu-linux/pull/69 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...ailure-due-to-redefition-of-local-sha256-.patch | 108 --------------------- package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 3 files changed, 2 insertions(+), 110 deletions(-) diff --git a/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch b/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch deleted file mode 100644 index 52ef8c9005..0000000000 --- a/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 1f968bd58656f200347bd398b34aa9f1b6393302 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 28 Dec 2022 18:54:48 +0100 -Subject: [PATCH] Fix build failure due to redefition of local sha256 data - types and functions - -Linux provides sha256_init() and 'struct sha256_state' in file -include/crypto/sha2.h so this leads to a build failure due to redefinition. -To avoid this let's prepend to all local exposed functions and data types -rtl_. sha256_process() and sha256_done() are not required to be renamed but -let's change them for consistency. - -[Upstream status: https://github.com/clnhub/rtl8192eu-linux/pull/69] -Signed-off-by: Giulio Benetti ---- - core/crypto/sha256-internal.c | 16 ++++++++-------- - core/crypto/sha256_i.h | 8 ++++---- - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/core/crypto/sha256-internal.c b/core/crypto/sha256-internal.c -index 4d61cb1..537bb2e 100644 ---- a/core/crypto/sha256-internal.c -+++ b/core/crypto/sha256-internal.c -@@ -26,17 +26,17 @@ - int sha256_vector(size_t num_elem, const u8 *addr[], const size_t *len, - u8 *mac) - { -- struct sha256_state ctx; -+ struct rtl_sha256_state ctx; - size_t i; - - if (TEST_FAIL()) - return -1; - -- sha256_init(&ctx); -+ rtl_sha256_init(&ctx); - for (i = 0; i < num_elem; i++) -- if (sha256_process(&ctx, addr[i], len[i])) -+ if (rtl_sha256_process(&ctx, addr[i], len[i])) - return -1; -- if (sha256_done(&ctx, mac)) -+ if (rtl_sha256_done(&ctx, mac)) - return -1; - return 0; - } -@@ -82,7 +82,7 @@ static const unsigned long K[64] = { - #endif - - /* compress 512-bits */ --static int sha256_compress(struct sha256_state *md, unsigned char *buf) -+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf) - { - u32 S[8], W[64], t0, t1; - u32 t; -@@ -125,7 +125,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) - - - /* Initialize the hash state */ --void sha256_init(struct sha256_state *md) -+void rtl_sha256_init(struct rtl_sha256_state *md) - { - md->curlen = 0; - md->length = 0; -@@ -146,7 +146,7 @@ void sha256_init(struct sha256_state *md) - @param inlen The length of the data (octets) - @return CRYPT_OK if successful - */ --int sha256_process(struct sha256_state *md, const unsigned char *in, -+int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, - unsigned long inlen) - { - unsigned long n; -@@ -186,7 +186,7 @@ int sha256_process(struct sha256_state *md, const unsigned char *in, - @param out [out] The destination of the hash (32 bytes) - @return CRYPT_OK if successful - */ --int sha256_done(struct sha256_state *md, unsigned char *out) -+int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out) - { - int i; - -diff --git a/core/crypto/sha256_i.h b/core/crypto/sha256_i.h -index a502d2b..93a8858 100644 ---- a/core/crypto/sha256_i.h -+++ b/core/crypto/sha256_i.h -@@ -11,15 +11,15 @@ - - #define SHA256_BLOCK_SIZE 64 - --struct sha256_state { -+struct rtl_sha256_state { - u64 length; - u32 state[8], curlen; - u8 buf[SHA256_BLOCK_SIZE]; - }; - --void sha256_init(struct sha256_state *md); --int sha256_process(struct sha256_state *md, const unsigned char *in, -+void rtl_sha256_init(struct rtl_sha256_state *md); -+int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, - unsigned long inlen); --int sha256_done(struct sha256_state *md, unsigned char *out); -+int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out); - - #endif /* SHA256_I_H */ --- -2.34.1 - diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index 0cb9961345..2d6498f19d 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 827e9592336744cbcfca5de988d8f4e14a62690302d3cabf72aa4bedebded2b7 rtl8192eu-94bce7798bbb18de6d8b1646dedb2511f24867d3.tar.gz +sha256 72d1d97c6d2038885e5666f3271609b4dcbe45633c19a5606dc59745ff8ab543 rtl8192eu-865656c3a1d1aee8c4ba459ce7608756d17c712f.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index d967db90b8..da6fe42e99 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = 94bce7798bbb18de6d8b1646dedb2511f24867d3 +RTL8192EU_VERSION = 865656c3a1d1aee8c4ba459ce7608756d17c712f RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 From thomas.petazzoni at bootlin.com Wed Feb 22 20:56:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:56:32 +0100 Subject: [Buildroot] [PATCH] package/rtl8192eu: bump to 2022-12-29 version on branch 5.11.2.1 In-Reply-To: <20221229184520.68111-1-giulio.benetti@benettiengineering.com> References: <20221229184520.68111-1-giulio.benetti@benettiengineering.com> Message-ID: <20230222215632.11f5f7b0@windsurf> On Thu, 29 Dec 2022 19:45:20 +0100 Giulio Benetti wrote: > Drop local patch since it's been merged[0]. > > [0]: https://github.com/clnhub/rtl8192eu-linux/pull/69 > > Signed-off-by: Giulio Benetti > --- > ...e-due-to-redefition-of-local-sha256-.patch | 108 ------------------ > package/rtl8192eu/rtl8192eu.hash | 2 +- > package/rtl8192eu/rtl8192eu.mk | 2 +- > 3 files changed, 2 insertions(+), 110 deletions(-) > delete mode 100644 package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 14:59:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:59:37 +0100 Subject: [Buildroot] [git commit] package/wilc-driver: fix build failure due to wrong pointer casts Message-ID: <20230222205839.53BF4868BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=293a878ae268cd0561fc3ab81c04b9a438acf921 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add local patch pending upstream[0] to fix the bug. [0]: https://github.com/embeddedTS/wilc3000-external-module/pull/3 Fixes: http://autobuild.buildroot.net/results/0a0/0a022d5c053bf8f7a53349b8bae4b2168a9cd134/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/wilc-driver/0005-Fix-cast-warnings.patch | 43 ++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/package/wilc-driver/0005-Fix-cast-warnings.patch b/package/wilc-driver/0005-Fix-cast-warnings.patch new file mode 100644 index 0000000000..713a15e667 --- /dev/null +++ b/package/wilc-driver/0005-Fix-cast-warnings.patch @@ -0,0 +1,43 @@ +From ebd083223883d479b2dd6f8a0da272797f90d236 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Sat, 31 Dec 2022 18:38:33 +0100 +Subject: [PATCH] Fix cast warnings + +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 2 +- + netdev.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cfg80211.c b/cfg80211.c +index 016aa06..2f40c9d 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -1794,7 +1794,7 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev, + if (ret != 0) + netdev_err(dev, "Error in setting channel\n"); + +- wilc_wlan_set_bssid(dev, dev->dev_addr, WILC_AP_MODE); ++ wilc_wlan_set_bssid(dev, (u8 *)dev->dev_addr, WILC_AP_MODE); + + return wilc_add_beacon(vif, settings->beacon_interval, + settings->dtim_period, &settings->beacon); +diff --git a/netdev.c b/netdev.c +index 824afea..5a1a51d 100644 +--- a/netdev.c ++++ b/netdev.c +@@ -899,9 +899,9 @@ static int wilc_mac_open(struct net_device *ndev) + vif->idx); + + if (is_valid_ether_addr(ndev->dev_addr)) +- wilc_set_mac_address(vif, ndev->dev_addr); ++ wilc_set_mac_address(vif, (u8 *)ndev->dev_addr); + else +- wilc_get_mac_address(vif, ndev->dev_addr); ++ wilc_get_mac_address(vif, (u8 *)ndev->dev_addr); + netdev_dbg(ndev, "Mac address: %pM\n", ndev->dev_addr); + + if (!is_valid_ether_addr(ndev->dev_addr)) { +-- +2.34.1 + From thomas.petazzoni at bootlin.com Wed Feb 22 20:57:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:57:18 +0100 Subject: [Buildroot] [git commit] package/gnuradio: disable examples Message-ID: <20230222205839.6B89A868BF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f4dec2107354ab7d6a3fa4fe6646a2c7c517418 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Examples can be disabled since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/530262c6df3fb9b87a80133dbde5650dbe948c4c Signed-off-by: Fabrice Fontaine Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/gnuradio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index c2fcba9586..c2e5ec5cad 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -22,6 +22,7 @@ GNURADIO_DEPENDENCIES = \ GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ + -DENABLE_EXAMPLES=OFF \ -DENABLE_GNURADIO_RUNTIME=ON \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND From thomas.petazzoni at bootlin.com Wed Feb 22 20:58:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:58:20 +0100 Subject: [Buildroot] [git commit] package/gqrx: bump to version 2.15.9 Message-ID: <20230222205839.94E61868BE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5893d2d1f19168a12e823d78882d6037b791e276 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure raised since bump pf gnuradio to version 3.10.4.0 in commit e37c110bead8b7b35cd97915673fa785ccb39f2d: In file included from /home/buildroot/autobuild/instance-2/output-1/build/gqrx-2.14.4/src/applications/gqrx/receiver.cpp:32: /home/buildroot/autobuild/instance-2/output-1/build/gqrx-2.14.4/src/applications/gqrx/receiver.h:34:10: fatal error: gnuradio/blocks/wavfile_sink.h: No such file or directory 34 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/gqrx-sdr/gqrx/blob/v2.15.9/resources/news.txt Fixes: - http://autobuild.buildroot.org/results/42b5ab2e555063273ea55fd1c09a9be6d8b620e2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gqrx/Config.in | 2 ++ package/gqrx/gqrx.hash | 2 +- package/gqrx/gqrx.mk | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in index 442b28e546..97f0b7de07 100644 --- a/package/gqrx/Config.in +++ b/package/gqrx/Config.in @@ -34,7 +34,9 @@ config BR2_PACKAGE_GQRX select BR2_PACKAGE_GNURADIO_DIGITAL select BR2_PACKAGE_GNURADIO_FFT select BR2_PACKAGE_GNURADIO_FILTER + select BR2_PACKAGE_GNURADIO_NETWORK select BR2_PACKAGE_GR_OSMOSDR + select BR2_PACKAGE_LIBSNDFILE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5SVG diff --git a/package/gqrx/gqrx.hash b/package/gqrx/gqrx.hash index 1991dfea82..567ff947f9 100644 --- a/package/gqrx/gqrx.hash +++ b/package/gqrx/gqrx.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 aec35c77ebde9c71a5f973c509eec3d6aa2f18a6e052b180fcd9029d88273e5b gqrx-2.14.4.tar.gz +sha256 4a826b468b2fb38a59cbe1f1b566e62c3114509186a7a25ba27dc92833f3eb44 gqrx-2.15.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK diff --git a/package/gqrx/gqrx.mk b/package/gqrx/gqrx.mk index 4d464298ca..d2518213b8 100644 --- a/package/gqrx/gqrx.mk +++ b/package/gqrx/gqrx.mk @@ -4,11 +4,11 @@ # ################################################################################ -GQRX_VERSION = 2.14.4 +GQRX_VERSION = 2.15.9 GQRX_SITE = $(call github,csete,gqrx,v$(GQRX_VERSION)) GQRX_LICENSE = GPL-3.0+, Apache-2.0 GQRX_LICENSE_FILES = COPYING LICENSE-CTK -GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg +GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr libsndfile qt5base qt5svg GQRX_CONF_OPTS = -DLINUX_AUDIO_BACKEND=Gr-audio From thomas.petazzoni at bootlin.com Wed Feb 22 20:57:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:57:15 +0100 Subject: [Buildroot] [git commit] package/gnuradio: drop unrecognized volk variables Message-ID: <20230222205839.5F3FD868BE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=802cfb90d68f866bc8f61d9c6c3a764abae2580f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Volk submodule has been removed since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/80c04479da962d048d41165081b026aafdaa0316 orc dependency can also be dropped as it was only used by volk submodule Signed-off-by: Fabrice Fontaine Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/gnuradio.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index cc41f1e12b..c2fcba9586 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -22,9 +22,7 @@ GNURADIO_DEPENDENCIES = \ GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ - -DENABLE_VOLK=ON \ -DENABLE_GNURADIO_RUNTIME=ON \ - -DENABLE_INTERNAL_VOLK=OFF \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND @@ -36,13 +34,6 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) GNURADIO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif -ifeq ($(BR2_PACKAGE_ORC),y) -GNURADIO_DEPENDENCIES += orc -GNURADIO_CONF_OPTS += -DENABLE_ORC=ON -else -GNURADIO_CONF_OPTS += -DENABLE_ORC=OFF -endif - ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON else From thomas.petazzoni at bootlin.com Wed Feb 22 20:58:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:58:17 +0100 Subject: [Buildroot] [git commit] package/gnuradio: add gr-network block support Message-ID: <20230222205839.878B6868BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25c8c00b98e37186d23ea6515e944060e59cfa8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master grnet networking block support is available since version version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/cc37c3e8cd5eabcb5c9d919e5fffc5d938690140 gr-network is a mandatory dependency of latest gqrx Signed-off-by: Fabrice Fontaine Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/Config.in | 6 ++++++ package/gnuradio/gnuradio.mk | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 1824589263..51237e62b9 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -134,6 +134,12 @@ config BR2_PACKAGE_GNURADIO_FILTER help Filter signal processing blocks +config BR2_PACKAGE_GNURADIO_NETWORK + bool "gr-network support" + select BR2_PACKAGE_GNURADIO_BLOCKS + help + TCP and UDP source/sink blocks + config BR2_PACKAGE_GNURADIO_QTGUI bool "gr-qtgui" depends on BR2_PACKAGE_GNURADIO_PYTHON diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 59fb23d89d..d9218b533d 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -106,6 +106,12 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_NETWORK),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GNURADIO_DEPENDENCIES += python3 python-pybind \ host-python-numpy host-python-packaging From thomas.petazzoni at bootlin.com Wed Feb 22 20:57:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:57:28 +0100 Subject: [Buildroot] [git commit] package/gnuradio: add libsndfile optional dependency Message-ID: <20230222205839.79FF3868C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55dff4a30b7b7a577ac84768466ee88a8c6fa262 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libsndfile is an optional dependency since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/18f64ba685cfc2533e2d7726aa43c524b007d97b Signed-off-by: Fabrice Fontaine Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/gnuradio.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index c2e5ec5cad..59fb23d89d 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -55,6 +55,9 @@ endif ifeq ($(BR2_PACKAGE_GNURADIO_BLOCKS),y) GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=ON +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +GNURADIO_DEPENDENCIES += libsndfile +endif else GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 22 20:58:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:58:55 +0100 Subject: [Buildroot] [PATCH 1/5] package/gnuradio: drop unrecognized volk variables In-Reply-To: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Message-ID: <20230222215855.32deb357@windsurf> On Wed, 22 Feb 2023 17:05:10 +0100 Fabrice Fontaine wrote: > Volk submodule has been removed since version 3.9.0.0 and > https://github.com/gnuradio/gnuradio/commit/80c04479da962d048d41165081b026aafdaa0316 > > orc dependency can also be dropped as it was only used by volk submodule > > Signed-off-by: Fabrice Fontaine > --- > package/gnuradio/gnuradio.mk | 9 --------- > 1 file changed, 9 deletions(-) Series applied to master. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 21:00:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 22:00:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/xerces: drop patch In-Reply-To: <20230222181254.2533041-1-fontaine.fabrice@gmail.com> References: <20230222181254.2533041-1-fontaine.fabrice@gmail.com> Message-ID: <20230222220045.5508e055@windsurf> On Wed, 22 Feb 2023 19:12:54 +0100 Fabrice Fontaine wrote: > Drop patch which is not needed since commit > 62cab101356c97432da482e168adaf065de65c4f. This patch is actually raising > a build failure since bump to version 3.2.4 in commit > d2d8f146a9f0ed3b66c4dd470bb76efdbb630a75 and > https://github.com/apache/xerces-c/commit/af1935b567c18c8b2de71d6ea97239be60876335: > > CMake Error at src/CMakeLists.txt:1271 (add_library): > Target "xerces-c" links to target "CURL::libcurl" but the target was not > found. Perhaps a find_package() call is missing for an IMPORTED target, or > an ALIAS target is missing? > > Fixes: > - http://autobuild.buildroot.org/results/c62856a5eeb34714f26235b2d6f8adc4ea612686 > > Signed-off-by: Fabrice Fontaine > --- > .../0001-fix-static-linking-with-curl.patch | 39 ------------------- > 1 file changed, 39 deletions(-) > delete mode 100644 package/xerces/0001-fix-static-linking-with-curl.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 21:00:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 22:00:40 +0100 Subject: [Buildroot] [git commit] package/xerces: drop patch Message-ID: <20230222210118.9D1BE868C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5178b092a820e328434490cad47c2ea8342f392 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch which is not needed since commit 62cab101356c97432da482e168adaf065de65c4f. This patch is actually raising a build failure since bump to version 3.2.4 in commit d2d8f146a9f0ed3b66c4dd470bb76efdbb630a75 and https://github.com/apache/xerces-c/commit/af1935b567c18c8b2de71d6ea97239be60876335: CMake Error at src/CMakeLists.txt:1271 (add_library): Target "xerces-c" links to target "CURL::libcurl" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Fixes: - http://autobuild.buildroot.org/results/c62856a5eeb34714f26235b2d6f8adc4ea612686 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../xerces/0001-fix-static-linking-with-curl.patch | 39 ---------------------- 1 file changed, 39 deletions(-) diff --git a/package/xerces/0001-fix-static-linking-with-curl.patch b/package/xerces/0001-fix-static-linking-with-curl.patch deleted file mode 100644 index db38de79fc..0000000000 --- a/package/xerces/0001-fix-static-linking-with-curl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 26e3f1440bbc75c704fc93ff43a2abbfbe4c0203 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 11 Oct 2018 22:56:50 +0200 -Subject: [PATCH] fix static linking with curl - -When curl is statically built with openssl support, xerces needs to -link with openssl libraries so use pkg_check_modules to get any -needed dependencies - -Fixes: - - http://autobuild.buildroot.org/results/29ca90fff2c8e38f2edf7240eca3aa3fe7397c45 - -Signed-off-by: Fabrice Fontaine ---- - cmake/XercesNetAccessorSelection.cmake | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/cmake/XercesNetAccessorSelection.cmake b/cmake/XercesNetAccessorSelection.cmake -index 7a63f1f6b..e90fcf034 100644 ---- a/cmake/XercesNetAccessorSelection.cmake -+++ b/cmake/XercesNetAccessorSelection.cmake -@@ -31,7 +31,13 @@ if(network) - - # Requires select() which is UNIX only - if(UNIX) -- find_package(CURL) -+ find_package(PkgConfig) -+ if (PkgConfig_FOUND) -+ pkg_check_modules(CURL libcurl) -+ if (NOT CURL_FOUND) -+ find_package(CURL) -+ endif() -+ endif() - if(CURL_FOUND) - list(APPEND netaccessors curl) - endif() --- -2.17.1 - From thomas.petazzoni at bootlin.com Wed Feb 22 21:01:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 22:01:08 +0100 Subject: [Buildroot] [git commit] package/lightning: needs threads Message-ID: <20230222210118.A7158868C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f665acb88c7a9a50e6b93a0daefb53ca3bcc2f79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master threads are mandatory since bump to version 2.2.0 in commit af6f7aa76db5aed1eada0b27bd0375610a2fc728 and https://git.savannah.gnu.org/cgit/lightning.git/commit/?id=d5a7c8e4ad719e84dbb4904c532f906a1ef5a77b: In file included from incr.c:2: ../include/lightning.h:27:10: fatal error: pthread.h: No such file or directory 27 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/62205869159d4a73c59a9795140fa77e9c3310ae Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lightning/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/lightning/Config.in b/package/lightning/Config.in index a0542edce9..3cf7c28ae2 100644 --- a/package/lightning/Config.in +++ b/package/lightning/Config.in @@ -1,13 +1,14 @@ -comment "lightning needs a toolchain w/ dynamic library" +comment "lightning needs a toolchain w/ dynamic library, threads" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_LIGHTNING bool "lightning" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS help GNU lightning is a library that generates assembly language code at run-time. From thomas.petazzoni at bootlin.com Wed Feb 22 21:01:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 22:01:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/lightning: needs threads In-Reply-To: <20230222182210.2539248-1-fontaine.fabrice@gmail.com> References: <20230222182210.2539248-1-fontaine.fabrice@gmail.com> Message-ID: <20230222220120.5b3f3d48@windsurf> On Wed, 22 Feb 2023 19:22:10 +0100 Fabrice Fontaine wrote: > threads are mandatory since bump to version 2.2.0 in commit > af6f7aa76db5aed1eada0b27bd0375610a2fc728 and > https://git.savannah.gnu.org/cgit/lightning.git/commit/?id=d5a7c8e4ad719e84dbb4904c532f906a1ef5a77b: > > In file included from incr.c:2: > ../include/lightning.h:27:10: fatal error: pthread.h: No such file or directory > 27 | #include > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/62205869159d4a73c59a9795140fa77e9c3310ae > > Signed-off-by: Fabrice Fontaine > --- > package/lightning/Config.in | 5 +++-- > 1 file changed, 3 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 Wed Feb 22 21:03:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 22:03:18 +0100 Subject: [Buildroot] [git commit branch/next] package/qemu: add option to install blobs Message-ID: <20230222210330.DD7F1868CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97c40266b1b69e101ce035c8aa73bf2665c5c256 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Binary blobs are BIOS of some sorts for the various machines emulated by QEMU. There is no option to individually install blobs; it's an all-or-nothing option. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in | 11 +++++++++++ package/qemu/qemu.mk | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 154b98a541..a446c0cf68 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -58,6 +58,17 @@ config BR2_PACKAGE_QEMU_SYSTEM if BR2_PACKAGE_QEMU_SYSTEM +config BR2_PACKAGE_QEMU_BLOBS + bool "Install binary blobs" + default y + help + Say 'y' here (the default) to install binary blobs (such as + BIOS or firmwares for the different machines simulated by + QEMU). Say 'n' to not install those blobs. + + Note: Some machines may be unbootable without those blobs. + If unsure, say 'y'. + config BR2_PACKAGE_QEMU_SLIRP bool "Enable user mode networking (SLIRP)" select BR2_PACKAGE_SLIRP diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 58b4ff10a5..d514a2285c 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -246,6 +246,12 @@ ifeq ($(BR2_STATIC_LIBS),y) QEMU_OPTS += --static endif +ifeq ($(BR2_PACKAGE_QEMU_BLOBS),y) +QEMU_OPTS += --enable-install-blobs +else +QEMU_OPTS += --disable-install-blobs +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define QEMU_CONFIGURE_CMDS From thomas.petazzoni at bootlin.com Wed Feb 22 21:03:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 22:03:49 +0100 Subject: [Buildroot] [PATCH] package/qemu: add option to install blobs In-Reply-To: <20230101143232.187601-1-yann.morin.1998@free.fr> References: <20230101143232.187601-1-yann.morin.1998@free.fr> Message-ID: <20230222220349.3cb1cbc5@windsurf> On Sun, 1 Jan 2023 15:32:32 +0100 "Yann E. MORIN" wrote: > Binary blobs are BIOS of some sorts for the various machines emulated > by QEMU. There is no option to individually install blobs; it's an > all-or-nothing option. > > Signed-off-by: "Yann E. MORIN" > --- > package/qemu/Config.in | 11 +++++++++++ > package/qemu/qemu.mk | 6 ++++++ > 2 files changed, 17 insertions(+) Applied to next, thanks. Should we install them unconditionally in the host variant? Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Wed Feb 22 21:22:35 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 22:22:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/netsurf: force libopenssl Message-ID: <20230222212235.16202-1-fontaine.fabrice@gmail.com> netsurf raises the following build failure since bump of libressl to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: content/fetchers/about.c: In function 'ns_X509_get_signature_nid': content/fetchers/about.c:548:25: error: dereferencing pointer to incomplete type 'X509 {aka struct x509_st}' return OBJ_obj2nid(cert->cert_info->key->algor->algorithm); ^~ Fixes: - http://autobuild.buildroot.org/results/c225aaac31398ba495921bd4b85e588199822561 Signed-off-by: Fabrice Fontaine --- package/netsurf/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/netsurf/Config.in b/package/netsurf/Config.in index 4f7d5c2713..394befcf28 100644 --- a/package/netsurf/Config.in +++ b/package/netsurf/Config.in @@ -20,6 +20,7 @@ config BR2_PACKAGE_NETSURF select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL if BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if BR2_PACKAGE_LIBCURL help NetSurf is a compact graphical web browser which aims for HTML5, CSS and JavaScript support. -- 2.39.1 From fontaine.fabrice at gmail.com Wed Feb 22 22:08:35 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 23:08:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/optee-client: fix BR2_PACKAGE_OPTEE_CLIENT_TEEACL Message-ID: <20230222220835.355342-1-fontaine.fabrice@gmail.com> Fix typo added by commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82 resulting in the following build failure: -- Checking for module 'uuid' -- Package 'uuid', required by 'virtual:world', not found CMake Error at /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:603 (message): A required package was not found Call Stack (most recent call first): /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:825 (_pkg_check_modules_internal) CMakeLists.txt:43 (pkg_check_modules) Fixes: - http://autobuild.buildroot.org/results/e1c6b5c9e841a003037045b2ff7afd9836e7c640 Signed-off-by: Fabrice Fontaine --- package/optee-client/optee-client.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 311ca191b0..ef113c838f 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -27,7 +27,7 @@ OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF endif ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y) -OPTEE_CLIENT_EXT_DEPENDENCIES += host-pkgconf util-linux +OPTEE_CLIENT_DEPENDENCIES += host-pkgconf util-linux OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=ON else OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=OFF -- 2.39.1 From ckhardin at gmail.com Wed Feb 22 22:11:31 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:11:31 -0800 Subject: [Buildroot] [PATCH v2 0/3] RFC source control tracking for linux/uboot In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230222221134.25904-1-ckhardin@gmail.com> Adding source control tracking into the linux and uboot packages specifically. The generic problem is that buildroot needs to make reproducible tarballs for verification which means the ".git" directories have to exlcuded from the archive since they can change even thought the contents from the git reference has not changed. This leads to the problem that common setlocalversion script will not work in the build because after the extract there is no access to the history information given the reasons above. To mitigate this problem and allow change control tracking for local development and remote references a somewhat intruisive change needs to be introduced at the download step for the archive to add an scmversion during the creation when both the revision history in the source tree exists and the archive is being created. Charles Hardin (3): support/download: add a helper scipt to generate scmversions boot/uboot: add a scmversion rsync hook when overriding srcdir linux: add a scmversion rsync hook when overriding srcdir boot/uboot/uboot.mk | 12 +++++++ linux/linux.mk | 12 +++++++ package/pkg-download.mk | 1 + support/download/dl-wrapper | 5 +-- support/download/git | 10 ++++++ support/download/hg | 10 ++++++ support/download/scmversion | 63 +++++++++++++++++++++++++++++++++++++ support/download/svn | 10 ++++++ 8 files changed, 121 insertions(+), 2 deletions(-) create mode 100755 support/download/scmversion -- 2.24.3 (Apple Git-128) From ckhardin at gmail.com Wed Feb 22 22:11:32 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:11:32 -0800 Subject: [Buildroot] [PATCH v2 1/3] support/download: add a helper scipt to generate scmversions In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230222221134.25904-2-ckhardin@gmail.com> Primarily focused on uboot and linux, getting the scmversion from the custom repository references is required for change control tracking off of different builds and pipelines. So, extend the download framework to generate these files while the locks are being held for the generation to avoid the git information from changes during the download process. Signed-off-by: Charles Hardin --- package/pkg-download.mk | 1 + support/download/dl-wrapper | 5 +-- support/download/git | 10 ++++++ support/download/hg | 10 ++++++ support/download/scmversion | 63 +++++++++++++++++++++++++++++++++++++ support/download/svn | 10 ++++++ 6 files changed, 97 insertions(+), 2 deletions(-) create mode 100755 support/download/scmversion diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 0718f21aad..333a53ce7e 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -119,6 +119,7 @@ define DOWNLOAD -n '$($(2)_BASENAME_RAW)' \ -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ + $(if $($(2)_SCMVERSION),-s) \ $(if $($(2)_GIT_SUBMODULES),-r) \ $(if $($(2)_GIT_LFS),-l) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 1e8d6058f6..dfb02f7fe8 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -25,7 +25,7 @@ main() { local -a uris # Parse our options; anything after '--' is for the backend - while getopts ":c:d:D:o:n:N:H:lrf:u:qp:" OPT; do + while getopts ":c:d:D:o:n:N:H:slrf:u:qp:" OPT; do case "${OPT}" in c) cset="${OPTARG}";; d) dl_dir="${OPTARG}";; @@ -34,6 +34,7 @@ main() { n) raw_base_name="${OPTARG}";; N) base_name="${OPTARG}";; H) hfile="${OPTARG}";; + s) scmversion="-s";; l) large_file="-l";; r) recurse="-r";; f) filename="${OPTARG}";; @@ -129,7 +130,7 @@ main() { -f "${filename}" \ -u "${uri}" \ -o "${tmpf}" \ - ${quiet} ${large_file} ${recurse} -- "${@}" + ${quiet} ${scmversion} ${large_file} ${recurse} -- "${@}" then # cd back to keep path coherence cd "${OLDPWD}" diff --git a/support/download/git b/support/download/git index 1a1c315f73..0a640bbec9 100755 --- a/support/download/git +++ b/support/download/git @@ -12,6 +12,7 @@ set -E # # Options: # -q Be quiet. +# -s Generate an scmversion file # -r Clone and archive sub-modules. # -o FILE Generate archive in FILE. # -u URI Clone from repository at URI. @@ -51,11 +52,13 @@ _on_error() { } quiet= +scmversion=0 large_file=0 recurse=0 while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q; exec >/dev/null;; + s) scmversion=1;; l) large_file=1;; r) recurse=1;; o) output="${OPTARG}";; @@ -229,3 +232,10 @@ popd >/dev/null # the state of the remote server. It also would generate large tarballs # (gigabytes for some linux trees) when a full clone took place. mk_tar_gz "${git_cache}" "${basename}" "${date}" "${output}" ".git/*" + +# If an scmversion is needed then generate the version information +if [ ${scmversion} -eq 1 ]; then + post_process_unpack "${base_name}" "${output}" + support/download/scmversion "${git_cache}" "${base_name}/.scmversion" + post_process_repack "$(pwd)" "${base_name}" "${output}" +fi diff --git a/support/download/hg b/support/download/hg index 768a27e06f..6bf058f0a7 100755 --- a/support/download/hg +++ b/support/download/hg @@ -7,6 +7,7 @@ set -e # # Options: # -q Be quiet. +# -s Generate an scmversion file # -o FILE Generate archive in FILE. # -u URI Clone from repository at URI. # -c CSET Use changeset (or revision) CSET. @@ -16,9 +17,11 @@ set -e # HG : the hg command to call quiet= +scmversion= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q;; + s) scmversion=1;; o) output="${OPTARG}";; u) uri="${OPTARG}";; c) cset="${OPTARG}";; @@ -48,3 +51,10 @@ _hg clone ${quiet} "${@}" --noupdate "'${uri}'" "'${basename}'" _plain_hg archive ${quiet} --repository "'${basename}'" --type tgz \ --prefix "'${basename}'" --rev "'${cset}'" \ - >"${output}" + +# If an scmversion is needed then generate the version information +if [ ${scmversion} -eq 1 ]; then + post_process_unpack "${base_name}" "${output}" + support/download/scmversion "${git_cache}" "${base_name}/.scmversion" + post_process_repack "$(pwd)" "${base_name}" "${output}" +fi diff --git a/support/download/scmversion b/support/download/scmversion new file mode 100755 index 0000000000..16868a11e5 --- /dev/null +++ b/support/download/scmversion @@ -0,0 +1,63 @@ +#!/usr/bin/env bash +set -x +set -e + +# Helper to generate an scmversion in a dowload script before +# the tarball is created. Because the tarball has to exclude +# repository directories like .git and .hg to make reproducible +# archives on subsequent downloads the version information is +# not available during the builds for a script like setlocalversion +# to run. +# +# So, this is hook to call right before the make tarball gz that +# will generate a .scmversion file that will be included in an +# archive and then available during the build steps. +# +# Call it with: +# $1: the path to the srctree (see mk_tar_gz in helpers) +# $2: output file +# +# Because this can fail for a variety of reason, there is no exit +# code to avoid build breakage. It is assumed the scripts will be +# reproducible because they are based on the contents that get generated + +while getopts :q OPT; do + case "${OPT}" in + q) exec >/dev/null;; + \?) exit 1;; + esac +done +shift $((OPTIND-1)) + +srctree="${1}" +scmversion="${2}" + +# Bail early if no srctree or scmversion +if [ -z "${srctree}" -o -z "${scmversion}" ]; then + exit 0 +fi + +# Does the scmversion exist and readonly +if [ -f "${scmversion}" -a ! -w "${scmversion}" ]; then + printf "WARNING: scmversion %s is readonly\n" "${scmversion}" >&2 + exit 0 +fi + +# +# Generate the scmversion from some expected locations in srctree +# and fallback to the buildroot version of setlocalversion another +# script is not used +# +if [ -x "${srctree}/setlocalversion" ]; then + res=$(cd "${srctree}"; ./setlocalversion) +elif [ -x "${srctree}/scripts/setlocalversion" ]; then + res=$(cd "${srctree}"; ./scripts/setlocalversion) +elif [ -x "${srctree}/tools/setlocalversion" ]; then + res=$(cd "${srctree}"; ./tools/setlocalversion) +fi +if [ -z "${res}" ]; then + res=$("${0%/*}/../scripts/setlocalversion" "${srctree}") +fi + +[ -n "${res}" ] && (echo "${res}" > "${scmversion}") +exit 0 diff --git a/support/download/svn b/support/download/svn index b23b7773d3..89da736172 100755 --- a/support/download/svn +++ b/support/download/svn @@ -12,6 +12,7 @@ set -e # # Options: # -q Be quiet. +# -s Generate an scmversion file # -o FILE Generate archive in FILE. # -u URI Checkout from repository at URI. # -c REV Use revision REV. @@ -23,9 +24,11 @@ set -e . "${0%/*}/helpers" quiet= +scmversion=0 while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q;; + s) scmversion=1;; o) output="${OPTARG}";; u) uri="${OPTARG}";; c) rev="${OPTARG}";; @@ -65,3 +68,10 @@ date="$( _plain_svn info "'${uri}@${rev}'" \ # We did a 'svn export' above, so it's not a working copy (there is no .svn # directory or file to ignore). mk_tar_gz "${basename}" "${basename}" "${date}" "${output}" + +# If an scmversion is needed then generate the version information +if [ ${scmversion} -eq 1 ]; then + post_process_unpack "${base_name}" "${output}" + support/download/scmversion "${git_cache}" "${base_name}/.scmversion" + post_process_repack "$(pwd)" "${base_name}" "${output}" +fi -- 2.24.3 (Apple Git-128) From ckhardin at gmail.com Wed Feb 22 22:11:33 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:11:33 -0800 Subject: [Buildroot] [PATCH v2 2/3] boot/uboot: add a scmversion rsync hook when overriding srcdir In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230222221134.25904-3-ckhardin@gmail.com> During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define PLAIN_VERSION "2018.03-01358-gbda75d6a8b" #define U_BOOT_VERSION "U-Boot " PLAIN_VERSION Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..edb6c646c7 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -28,18 +28,30 @@ UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL)) else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = git +UBOOT_SCMVERSION = YES else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_HG),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = hg +UBOOT_SCMVERSION = YES else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_SVN),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = svn +UBOOT_SCMVERSION = YES else # Handle stable official U-Boot versions UBOOT_SITE = https://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 endif +ifneq ($(UBOOT_OVERRIDE_SRCDIR),) +define UBOOT_SCMVERSION_HOOK + $(TOPDIR)/support/download/scmversion \ + $(abspath $(UBOOT_OVERRIDE_SRCDIR)) $(@D)/.scmversion +endef + +UBOOT_POST_RSYNC_HOOKS += UBOOT_SCMVERSION_HOOK +endif + ifeq ($(BR2_TARGET_UBOOT)$(BR2_TARGET_UBOOT_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) endif -- 2.24.3 (Apple Git-128) From ckhardin at gmail.com Wed Feb 22 22:11:34 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:11:34 -0800 Subject: [Buildroot] [PATCH v2 3/3] linux: add a scmversion rsync hook when overriding srcdir In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230222221134.25904-4-ckhardin@gmail.com> During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define UTS_RELEASE "5.4.70-00031-g92c23d10d003" Signed-off-by: Charles Hardin --- linux/linux.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..b72318e3f2 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -24,12 +24,15 @@ LINUX_SOURCE = $(notdir $(LINUX_TARBALL)) else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = git +LINUX_SCMVERSION = YES else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_HG),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = hg +LINUX_SCMVERSION = YES else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_SVN),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = svn +LINUX_SCMVERSION = YES else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION),y) LINUX_SOURCE = linux-cip-$(LINUX_VERSION).tar.gz LINUX_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot @@ -46,6 +49,15 @@ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_ endif endif +ifneq ($(LINUX_OVERRIDE_SRCDIR),) +define LINUX_SCMVERSION_HOOK + $(TOPDIR)/support/download/scmversion \ + $(abspath $(LINUX_OVERRIDE_SRCDIR)) $(@D)/.scmversion +endef + +LINUX_POST_RSYNC_HOOKS += LINUX_SCMVERSION_HOOK +endif + ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) endif -- 2.24.3 (Apple Git-128) From fontaine.fabrice at gmail.com Wed Feb 22 22:17:50 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 23:17:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/optee-client: fix uclibc build Message-ID: <20230222221750.558885-1-fontaine.fabrice@gmail.com> Fix the following uclibc build failure raised since bump to version 3.19.0 in commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82: /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c: In function 'teeacl_user_is_member_of': /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c:75:12: error: implicit declaration of function 'reallocarray' [-Werror=implicit-function-declaration] 75 | groups = reallocarray(groups, grouplistsize, sizeof(gid_t)); | ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/03eba71ab9b87676f2606ecf2a9b5a151fc396bb Signed-off-by: Fabrice Fontaine --- ...-use-realloc-instead-of-reallocarray.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch diff --git a/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch new file mode 100644 index 0000000000..88f5a4f87e --- /dev/null +++ b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch @@ -0,0 +1,34 @@ +From dde6306458331371be5df15e3ca953697d2463ef Mon Sep 17 00:00:00 2001 +From: Eero Aaltonen +Date: Thu, 2 Feb 2023 17:22:29 +0200 +Subject: [PATCH] libteeacl: use realloc() instead of reallocarray() + +Use realloc() instead of reallocarray(), since uClibc apparently does +not implement reallocarray(). + +Fixes: https://github.com/OP-TEE/optee_client/issues/339 + +Signed-off-by: Eero Aaltonen +Reviewed-by: Jerome Forissier + +[Retrieved from: +https://github.com/OP-TEE/optee_client/commit/dde6306458331371be5df15e3ca953697d2463ef] +Signed-off-by: Fabrice Fontaine +--- + libteeacl/src/group.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libteeacl/src/group.c b/libteeacl/src/group.c +index 10965dd0..bd165a11 100644 +--- a/libteeacl/src/group.c ++++ b/libteeacl/src/group.c +@@ -72,7 +72,8 @@ enum rv_groupmember teeacl_user_is_member_of(const char *user, gid_t group) + if (ret == -1) { + p_groups = groups; + +- groups = reallocarray(groups, grouplistsize, sizeof(gid_t)); ++ /* we use realloc, since uClibc does not implement reallocarray */ ++ groups = realloc(groups, grouplistsize * sizeof(gid_t)); + if (!groups) { + free(p_groups); + return E_MEMORY; -- 2.39.1 From thomas.petazzoni at bootlin.com Wed Feb 22 22:19:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:19:04 +0100 Subject: [Buildroot] [git commit branch/next] package/shadow: new package Message-ID: <20230222222058.23633868E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f78c5cb5cae93a9e63dad4361d78e1787759382f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next shadow provides utilities to deal with user accounts. The shadow package includes the necessary programs for converting UNIX password files to the shadow password format, plus programs for managing user and group accounts. Especially it is useful if rootless podman container should be used, which requires newuidmap and newgidmap. Co-authored-by: Nicolas Carrier [Nicolas.Carrier at orolia.com provided the test case] Signed-off-by: Raphael Pavlidis Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/shadow/Config.in | 62 ++++++++++++ package/shadow/shadow.hash | 3 + package/shadow/shadow.mk | 135 +++++++++++++++++++++++++++ support/testing/tests/package/test_shadow.py | 55 +++++++++++ 6 files changed, 257 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 599cfe6886..d052e59122 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2429,6 +2429,7 @@ F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py N: Raphael Pavlidis +F: package/shadow/ F: package/slirp4netns/ F: package/sway/ F: package/x11r7/xwayland/ diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..7c32305129 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2701,6 +2701,7 @@ menu "System tools" source "package/sdbus-cpp/Config.in" source "package/sdbusplus/Config.in" source "package/seatd/Config.in" + source "package/shadow/Config.in" source "package/smack/Config.in" source "package/start-stop-daemon/Config.in" source "package/supervisor/Config.in" diff --git a/package/shadow/Config.in b/package/shadow/Config.in new file mode 100644 index 0000000000..e3580c2cf5 --- /dev/null +++ b/package/shadow/Config.in @@ -0,0 +1,62 @@ +menuconfig BR2_PACKAGE_SHADOW + bool "shadow" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + help + Utilities to deal with user accounts. + + https://github.com/shadow-maint/shadow + +if BR2_PACKAGE_SHADOW + +config BR2_PACKAGE_SHADOW_SHADOWGRP + bool "shadowgrp" + help + Enable shadow group support. + +config BR2_PACKAGE_SHADOW_ACCOUNT_TOOLS_SETUID + bool "account-tools-setuid" + depends on BR2_USE_MMU # linux-pam + depends on BR2_ENABLE_LOCALE # linux-pam + depends on BR2_USE_WCHAR # linux-pam + depends on !BR2_STATIC_LIBS # linux-pam + select BR2_PACKAGE_LINUX_PAM + help + Install the user and group management tools (e.g. groupadd) + with setuid and authenticate the callers via PAM. + +comment "account-tools-setuid needs a toolchain w/ dynamic library, wchar, locale" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_ENABLE_LOCALE + +config BR2_PACKAGE_SHADOW_UTMPX + bool "utmpx" + help + Enable loggin in utmpx / wtmpx. + +config BR2_PACKAGE_SHADOW_SUBORDINATE_IDS + bool "subordinate-ids" + help + Support subordinate ids. Helpful to use container solution + like podman without root. + +config BR2_PACKAGE_SHADOW_SHA_CRYPT + bool "sha-crypt" + default y + help + Allow the SHA256 and SHA512 password encryption algorithms. + +config BR2_PACKAGE_SHADOW_BCRYPT + bool "bcrypt" + help + Allow the bcrypt password encryption algorithm. + +config BR2_PACKAGE_SHADOW_YESCRYPT + bool "yescrypt" + help + Allow the yescrypt password encryption algorithm. + +endif # BR2_PACKAGE_SHADOW + +comment "shadow needs a toolchain w/ headers >= 4.14, dynamic library" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash new file mode 100644 index 0000000000..2e5c4a8168 --- /dev/null +++ b/package/shadow/shadow.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9afe245d79a2e7caac5f1ed62519b17416b057ec89df316df1c3935502f9dd2c shadow-4.13.tar.xz +sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk new file mode 100644 index 0000000000..d8f913a648 --- /dev/null +++ b/package/shadow/shadow.mk @@ -0,0 +1,135 @@ +################################################################################ +# +# shadow +# +################################################################################ + +SHADOW_VERSION = 4.13 +SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION) +SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz +SHADOW_LICENSE = BSD-3-Clause +SHADOW_LICENSE_FILES = COPYING +SHADOW_CPE_ID_VENDOR = debian + +SHADOW_CONF_OPTS = \ + --disable-man \ + --without-btrfs \ + --without-nscd \ + --without-skey \ + --without-sssd \ + --without-su \ + --without-tcb + +ifeq ($(BR2_PACKAGE_SHADOW_SHADOWGRP),y) +SHADOW_CONF_OPTS += --enable-shadowgrp +else +SHADOW_CONF_OPTS += --disable-shadowgrp +endif + +ifeq ($(BR2_PACKAGE_SHADOW_ACCOUNT_TOOLS_SETUID),y) +SHADOW_CONF_OPTS += --enable-account-tools-setuid +define SHADOW_ACCOUNT_TOOLS_SETUID_PERMISSIONS + /usr/sbin/chgpasswd f 4755 0 0 - - - - - + /usr/sbin/chpasswd f 4755 0 0 - - - - - + /usr/sbin/groupadd f 4755 0 0 - - - - - + /usr/sbin/groupdel f 4755 0 0 - - - - - + /usr/sbin/groupmod f 4755 0 0 - - - - - + /usr/sbin/newusers f 4755 0 0 - - - - - + /usr/sbin/useradd f 4755 0 0 - - - - - + /usr/sbin/userdel f 4755 0 0 - - - - - + /usr/sbin/usermod f 4755 0 0 - - - - - +endef +else +SHADOW_CONF_OPTS += --disable-account-tools-setuid +endif + +ifeq ($(BR2_PACKAGE_SHADOW_UTMPX),y) +SHADOW_CONF_OPTS += --enable-utmpx +else +SHADOW_CONF_OPTS += --disable-utmpx +endif + +ifeq ($(BR2_PACKAGE_SHADOW_SUBORDINATE_IDS),y) +SHADOW_CONF_OPTS += --enable-subordinate-ids +define SHADOW_SUBORDINATE_IDS_PERMISSIONS + /usr/bin/newuidmap f 4755 0 0 - - - - - + /usr/bin/newgidmap f 4755 0 0 - - - - - +endef +else +SHADOW_CONF_OPTS += --disable-subordinate-ids +endif + +ifeq ($(BR2_PACKAGE_ACL),y) +SHADOW_CONF_OPTS += --with-acl +SHADOW_DEPENDENCIES += acl +else +SHADOW_CONF_OPTS += --without-acl +endif + +ifeq ($(BR2_PACKAGE_ATTR),y) +SHADOW_CONF_OPTS += --with-attr +SHADOW_DEPENDENCIES += attr +else +SHADOW_CONF_OPTS += --without-attr +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +SHADOW_CONF_OPTS += --with-audit +SHADOW_DEPENDENCIES += audit +else +SHADOW_CONF_OPTS += --without-audit +endif + +ifeq ($(BR2_PACKAGE_CRACKLIB),y) +SHADOW_CONF_OPTS += --with-libcrack +SHADOW_DEPENDENCIES += cracklib +else +SHADOW_CONF_OPTS += --without-libcrack +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +SHADOW_CONF_OPTS += --with-selinux +SHADOW_DEPENDENCIES += libselinux libsemanage +else +SHADOW_CONF_OPTS += --without-selinux +endif + +# linux-pam is also used without account-tools-setuid enabled +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +SHADOW_CONF_OPTS += --with-libpam +SHADOW_DEPENDENCIES += linux-pam +else +SHADOW_CONF_OPTS += --without-libpam +endif + +ifeq ($(BR2_PACKAGE_SHADOW_SHA_CRYPT),y) +SHADOW_CONF_OPTS += --with-sha-crypt +else +SHADOW_CONF_OPTS += --without-sha-crypt +endif + +ifeq ($(BR2_PACKAGE_SHADOW_BCRYPT),y) +SHADOW_CONF_OPTS += --with-bcrypt +else +SHADOW_CONF_OPTS += --without-bcrypt +endif + +ifeq ($(BR2_PACKAGE_SHADOW_YESCRYPT),y) +SHADOW_CONF_OPTS += --with-yescrypt +else +SHADOW_CONF_OPTS += --without-yescrypt +endif + +define SHADOW_PERMISSIONS + /usr/bin/chage f 4755 0 0 - - - - - + /usr/bin/chfn f 4755 0 0 - - - - - + /usr/bin/chsh f 4755 0 0 - - - - - + /usr/bin/expiry f 4755 0 0 - - - - - + /usr/bin/gpasswd f 4755 0 0 - - - - - + /usr/bin/newgrp f 4755 0 0 - - - - - + /usr/bin/passwd f 4755 0 0 - - - - - + $(SHADOW_ACCOUNT_TOOLS_SETUID_PERMISSIONS) + $(SHADOW_SUBORDINATE_IDS_PERMISSIONS) +endef + +$(eval $(autotools-package)) diff --git a/support/testing/tests/package/test_shadow.py b/support/testing/tests/package/test_shadow.py new file mode 100644 index 0000000000..c5151b4fdb --- /dev/null +++ b/support/testing/tests/package/test_shadow.py @@ -0,0 +1,55 @@ +import os + +from infra.basetest import BRTest, BASIC_TOOLCHAIN_CONFIG + + +class TestShadow(BRTest): + username = 'user_test' + config = BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_arm=y + BR2_PACKAGE_SHADOW=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="65536" + """ + timeout = 60 + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.ext4") + self.emulator.boot(arch="armv7", + kernel="builtin", + kernel_cmdline=["root=/dev/mmcblk0", + "rootfstype=ext4"], + options=["-drive", f"file={img},if=sd,format=raw"]) + self.emulator.login() + + def test_nologin(self): + self.login() + + self.assertRunOk("! nologin") + cmd = 'test "$(nologin)" = "This account is currently not available."' + self.assertRunOk(cmd) + + def test_useradd_del(self): + username = self.username + self.login() + + self.assertRunOk(f'userdel {username} || true') + self.assertRunOk(f'groupdel {username} || true') + self.assertRunOk(f'useradd -s /bin/sh {username}') + self.assertRunOk(f'test $(su {username} -c "whoami") = {username}') + self.assertRunOk(f'userdel {username}') + + def test_usermod(self): + username = self.username + new_home = '/tmp' + self.login() + + self.assertRunOk(f'userdel {username} || true') + self.assertRunOk(f'groupdel {username} || true') + self.assertRunOk(f'useradd -s /bin/sh {username}') + self.assertRunOk(f'usermod {username} --home {new_home}') + self.assertRunOk(f'test $(su {username} -c \'echo $HOME\') = {new_home}') + self.assertRunOk(f'userdel {username}') + From thomas.petazzoni at bootlin.com Wed Feb 22 22:21:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:21:57 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: <20221224171920.11256-1-raphael.pavlidis@gmail.com> References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> Message-ID: <20230222232157.380b6109@windsurf> On Sat, 24 Dec 2022 18:19:20 +0100 Raphael Pavlidis wrote: > shadow provides utilities to deal with user accounts. > > The shadow package includes the necessary programs for converting UNIX > password files to the shadow password format, plus programs for managing > user and group accounts. Especially it is useful if rootless podman > container should be used, which requires newuidmap and newgidmap. > > Co-authored-by: Nicolas Carrier > [Nicolas.Carrier at orolia.com provided the test case] > Signed-off-by: Raphael Pavlidis > --- > Changes v3 -> v4: > - fix formatting issues in Config.in and shadow.mk. > - bump to version 4.13. > - add SHADOW_CPE_ID_VENDOR in shadow.mk. > - add userdel in the setuid list. > - fix typo in SHADOW_ACCOUNT_TOOLS_SETUID_PERMISSIONS. I have finally applied your patch. I fixed only two things: - Added a dependency on !BR2_STATIC_LIBS, because shadow uses unconditionally - Fixed the Config.in comment that already existed that said "shared libs", while we normally use "dynamic library". With those changes, applied to our next branch. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 22:22:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:22:11 +0100 Subject: [Buildroot] [git commit branch/next] package/wine: bump to version 8.0 Message-ID: <20230222222235.331C4868E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=463d0dd49454669e7d72179319aeb967686c129e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Multiple library checks are obsolete, either due to removal or due to built-in solutions. License file changed due to update of copyright year. Signed-off-by: Andr?? Zwing Signed-off-by: Thomas Petazzoni --- ...codeca-avoid-mpg123-functions-with-suffix.patch | 21 ------------- ...p3dmod-avoid-mpg123-functions-with-suffix.patch | 21 ------------- package/wine/wine.hash | 4 +-- package/wine/wine.mk | 35 ++-------------------- 4 files changed, 5 insertions(+), 76 deletions(-) diff --git a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch b/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 8332db4b38..0000000000 --- a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 75b70efdaa2d4baa064271098878b79f66df155f -Author: Andr?? Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - l3codeca.acm: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/75b70efdaa2d4baa064271098878b79f66df155f] -Signed-off-by: Andr?? Zwing - -diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in -index 451794b2624..31765766d4e 100644 ---- a/dlls/l3codeca.acm/Makefile.in -+++ b/dlls/l3codeca.acm/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = l3codeca.acm - IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mpegl3.c diff --git a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch b/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 16f2ba2898..0000000000 --- a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 8d441659f7c7ae359e06a99e7abaae57792356a0 -Author: Andr?? Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - mp3dmod: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/8d441659f7c7ae359e06a99e7abaae57792356a0] -Signed-off-by: Andr?? Zwing - -diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in -index dabbb1dfeae..3ba343a4d34 100644 ---- a/dlls/mp3dmod/Makefile.in -+++ b/dlls/mp3dmod/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = mp3dmod.dll - IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mp3dmod.c diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 9a7a1c342a..b87964da12 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 5b43e27d5c085cb18f97394e46180310d5eef7c1d91c6895432a3889b2de086b wine-7.0.tar.xz +sha256 0272c20938f8721ae4510afaa8b36037457dd57661e4d664231079b9e91c792e wine-8.0.tar.xz # Locally calculated sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB -sha256 7c360930e51d56c8fa12fe1df8ed348ac77a9ad73f9582a303919469399b3ce4 LICENSE +sha256 793d045546467c8f49e35fbd6e02859e57e78f8bb53571e8200bffd0e966dfa8 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index a1c65bef4e..a629bf0dd6 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 7.0 +WINE_VERSION = 8.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/7.0 +WINE_SITE = https://dl.winehq.org/wine/source/8.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_CPE_ID_VENDOR = winehq @@ -27,7 +27,6 @@ WINE_CONF_OPTS = \ --without-mingw \ --without-opencl \ --without-oss \ - --without-vkd3d \ --without-vulkan # Wine uses a wrapper around gcc, and uses the value of --host to @@ -131,20 +130,6 @@ else WINE_CONF_OPTS += --without-v4l2 endif -ifeq ($(BR2_PACKAGE_OPENAL),y) -WINE_CONF_OPTS += --with-openal -WINE_DEPENDENCIES += openal -else -WINE_CONF_OPTS += --without-openal -endif - -ifeq ($(BR2_PACKAGE_OPENLDAP),y) -WINE_CONF_OPTS += --with-ldap -WINE_DEPENDENCIES += openldap -else -WINE_CONF_OPTS += --without-ldap -endif - ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) WINE_CONF_OPTS += --with-osmesa WINE_DEPENDENCIES += mesa3d @@ -266,19 +251,8 @@ endif # Wine only needs the host tools to be built, so cut-down the # build time by building just what we need. -HOST_WINE_TOOLS = \ - tools \ - tools/sfnt2fon \ - tools/widl \ - tools/winebuild \ - tools/winegcc \ - tools/wmc \ - tools/wrc - define HOST_WINE_BUILD_CMDS - $(foreach t, $(HOST_WINE_TOOLS), - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/$(t) - ) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) __tooldeps__ endef # Wine only needs its host variant to be built, not that it is @@ -304,10 +278,8 @@ HOST_WINE_CONF_OPTS += \ --without-gssapi \ --without-gstreamer \ --without-krb5 \ - --without-ldap \ --without-mingw \ --without-netapi \ - --without-openal \ --without-opencl \ --without-opengl \ --without-osmesa \ @@ -318,7 +290,6 @@ HOST_WINE_CONF_OPTS += \ --without-sdl \ --without-usb \ --without-v4l2 \ - --without-vkd3d \ --without-vulkan \ --without-x \ --without-xcomposite \ From thomas.petazzoni at bootlin.com Wed Feb 22 22:22:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:22:35 +0100 Subject: [Buildroot] [PATCH] package/wine: bump to version 8.0 In-Reply-To: <20230201192157.1631613-1-nerv@dawncrow.de> References: <20230201192157.1631613-1-nerv@dawncrow.de> Message-ID: <20230222232235.076e7017@windsurf> On Wed, 1 Feb 2023 20:21:57 +0100 Andr? Zwing wrote: > Multiple library checks are obsolete, either due to removal or due to built-in solutions. > > License file changed due to update of copyright year. > > Signed-off-by: Andr? Zwing > --- > ...a-avoid-mpg123-functions-with-suffix.patch | 21 ----------- > ...d-avoid-mpg123-functions-with-suffix.patch | 21 ----------- > package/wine/wine.hash | 4 +-- > package/wine/wine.mk | 35 ++----------------- > 4 files changed, 5 insertions(+), 76 deletions(-) > delete mode 100644 package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch > delete mode 100644 package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 22:23:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:23:31 +0100 Subject: [Buildroot] [git commit] package/netsurf: force libopenssl Message-ID: <20230222222356.8F4C086905@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efe2734fc58cc6bfcc8fa1b696bba81a9797efb9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master netsurf raises the following build failure since bump of libressl to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: content/fetchers/about.c: In function 'ns_X509_get_signature_nid': content/fetchers/about.c:548:25: error: dereferencing pointer to incomplete type 'X509 {aka struct x509_st}' return OBJ_obj2nid(cert->cert_info->key->algor->algorithm); ^~ Fixes: - http://autobuild.buildroot.org/results/c225aaac31398ba495921bd4b85e588199822561 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/netsurf/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/netsurf/Config.in b/package/netsurf/Config.in index 4f7d5c2713..394befcf28 100644 --- a/package/netsurf/Config.in +++ b/package/netsurf/Config.in @@ -20,6 +20,7 @@ config BR2_PACKAGE_NETSURF select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL if BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if BR2_PACKAGE_LIBCURL help NetSurf is a compact graphical web browser which aims for HTML5, CSS and JavaScript support. From thomas.petazzoni at bootlin.com Wed Feb 22 22:23:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:23:45 +0100 Subject: [Buildroot] [git commit] package/optee-client: fix BR2_PACKAGE_OPTEE_CLIENT_TEEACL Message-ID: <20230222222356.9C95686906@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02a6b77ed8214d837f7d1d43b10321ec5672fea9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix typo added by commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82 resulting in the following build failure: -- Checking for module 'uuid' -- Package 'uuid', required by 'virtual:world', not found CMake Error at /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:603 (message): A required package was not found Call Stack (most recent call first): /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:825 (_pkg_check_modules_internal) CMakeLists.txt:43 (pkg_check_modules) Fixes: - http://autobuild.buildroot.org/results/e1c6b5c9e841a003037045b2ff7afd9836e7c640 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/optee-client/optee-client.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 311ca191b0..ef113c838f 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -27,7 +27,7 @@ OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF endif ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y) -OPTEE_CLIENT_EXT_DEPENDENCIES += host-pkgconf util-linux +OPTEE_CLIENT_DEPENDENCIES += host-pkgconf util-linux OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=ON else OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=OFF From thomas.petazzoni at bootlin.com Wed Feb 22 22:23:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:23:15 +0100 Subject: [Buildroot] [git commit] package/optee-client: fix uclibc build Message-ID: <20230222222356.829AC86904@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5be4abc574d6f2acfde4e523c73f4cee7ac373e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following uclibc build failure raised since bump to version 3.19.0 in commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82: /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c: In function 'teeacl_user_is_member_of': /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c:75:12: error: implicit declaration of function 'reallocarray' [-Werror=implicit-function-declaration] 75 | groups = reallocarray(groups, grouplistsize, sizeof(gid_t)); | ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/03eba71ab9b87676f2606ecf2a9b5a151fc396bb Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...eeacl-use-realloc-instead-of-reallocarray.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch new file mode 100644 index 0000000000..88f5a4f87e --- /dev/null +++ b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch @@ -0,0 +1,34 @@ +From dde6306458331371be5df15e3ca953697d2463ef Mon Sep 17 00:00:00 2001 +From: Eero Aaltonen +Date: Thu, 2 Feb 2023 17:22:29 +0200 +Subject: [PATCH] libteeacl: use realloc() instead of reallocarray() + +Use realloc() instead of reallocarray(), since uClibc apparently does +not implement reallocarray(). + +Fixes: https://github.com/OP-TEE/optee_client/issues/339 + +Signed-off-by: Eero Aaltonen +Reviewed-by: Jerome Forissier + +[Retrieved from: +https://github.com/OP-TEE/optee_client/commit/dde6306458331371be5df15e3ca953697d2463ef] +Signed-off-by: Fabrice Fontaine +--- + libteeacl/src/group.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libteeacl/src/group.c b/libteeacl/src/group.c +index 10965dd0..bd165a11 100644 +--- a/libteeacl/src/group.c ++++ b/libteeacl/src/group.c +@@ -72,7 +72,8 @@ enum rv_groupmember teeacl_user_is_member_of(const char *user, gid_t group) + if (ret == -1) { + p_groups = groups; + +- groups = reallocarray(groups, grouplistsize, sizeof(gid_t)); ++ /* we use realloc, since uClibc does not implement reallocarray */ ++ groups = realloc(groups, grouplistsize * sizeof(gid_t)); + if (!groups) { + free(p_groups); + return E_MEMORY; From ckhardin at gmail.com Wed Feb 22 22:30:50 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:30:50 -0800 Subject: [Buildroot] RFC [PATCH v2 0/3] scmversion tracking for linux and uboot In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: Adding source control tracking into the linux and uboot packages specifically. The generic problem is that buildroot needs to make reproducible tarballs for verification which means the ".git" directories have to be excluded from the archive since they can change even though the contents from the git reference has not changed. This leads to the problem that a setlocalversion script will not work in the build because after the extract there is no access to the history information given the reasons above. To mitigate this problem and allow change control tracking for local development and remote references a somewhat intruisive change needs to be introduced at the download step for the archive to add an scmversion during the creation when both the revision history in the source tree exists and the archive is being created. Charles Hardin (3): support/download: add a helper scipt to generate scmversions boot/uboot: add a scmversion rsync hook when overriding srcdir linux: add a scmversion rsync hook when overriding srcdir boot/uboot/uboot.mk | 12 +++++++ linux/linux.mk | 12 +++++++ package/pkg-download.mk | 1 + support/download/dl-wrapper | 5 +-- support/download/git | 10 ++++++ support/download/hg | 10 ++++++ support/download/scmversion | 63 +++++++++++++++++++++++++++++++++++++ support/download/svn | 10 ++++++ 8 files changed, 121 insertions(+), 2 deletions(-) create mode 100755 support/download/scmversion -- 2.24.3 (Apple Git-128) From ckhardin at gmail.com Wed Feb 22 22:30:51 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:30:51 -0800 Subject: [Buildroot] [PATCH v2 1/3] support/download: add a helper scipt to generate scmversions In-Reply-To: References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: Primarily focused on uboot and linux, getting the scmversion from the custom repository references is required for change control tracking off of different builds and pipelines. So, extend the download framework to generate these files while the locks are being held for the generation to avoid the git information from changes during the download process. Signed-off-by: Charles Hardin wip scmversion Signed-off-by: Charles Hardin --- package/pkg-download.mk | 1 + support/download/dl-wrapper | 5 +-- support/download/git | 10 ++++++ support/download/hg | 10 ++++++ support/download/scmversion | 63 +++++++++++++++++++++++++++++++++++++ support/download/svn | 10 ++++++ 6 files changed, 97 insertions(+), 2 deletions(-) create mode 100755 support/download/scmversion diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 0718f21aad..333a53ce7e 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -119,6 +119,7 @@ define DOWNLOAD -n '$($(2)_BASENAME_RAW)' \ -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ + $(if $($(2)_SCMVERSION),-s) \ $(if $($(2)_GIT_SUBMODULES),-r) \ $(if $($(2)_GIT_LFS),-l) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 1e8d6058f6..dfb02f7fe8 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -25,7 +25,7 @@ main() { local -a uris # Parse our options; anything after '--' is for the backend - while getopts ":c:d:D:o:n:N:H:lrf:u:qp:" OPT; do + while getopts ":c:d:D:o:n:N:H:slrf:u:qp:" OPT; do case "${OPT}" in c) cset="${OPTARG}";; d) dl_dir="${OPTARG}";; @@ -34,6 +34,7 @@ main() { n) raw_base_name="${OPTARG}";; N) base_name="${OPTARG}";; H) hfile="${OPTARG}";; + s) scmversion="-s";; l) large_file="-l";; r) recurse="-r";; f) filename="${OPTARG}";; @@ -129,7 +130,7 @@ main() { -f "${filename}" \ -u "${uri}" \ -o "${tmpf}" \ - ${quiet} ${large_file} ${recurse} -- "${@}" + ${quiet} ${scmversion} ${large_file} ${recurse} -- "${@}" then # cd back to keep path coherence cd "${OLDPWD}" diff --git a/support/download/git b/support/download/git index 1a1c315f73..277c412e26 100755 --- a/support/download/git +++ b/support/download/git @@ -12,6 +12,7 @@ set -E # # Options: # -q Be quiet. +# -s Generate an scmversion file # -r Clone and archive sub-modules. # -o FILE Generate archive in FILE. # -u URI Clone from repository at URI. @@ -51,11 +52,13 @@ _on_error() { } quiet= +scmversion=0 large_file=0 recurse=0 while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q; exec >/dev/null;; + s) scmversion=1;; l) large_file=1;; r) recurse=1;; o) output="${OPTARG}";; @@ -229,3 +232,10 @@ popd >/dev/null # the state of the remote server. It also would generate large tarballs # (gigabytes for some linux trees) when a full clone took place. mk_tar_gz "${git_cache}" "${basename}" "${date}" "${output}" ".git/*" + +# If an scmversion is needed then generate the version information +if [ ${scmversion} -eq 1 ]; then + post_process_unpack "${basename}" "${output}" + support/download/scmversion "${git_cache}" "${basename}/.scmversion" + post_process_repack "$(pwd)" "${basename}" "${output}" +fi diff --git a/support/download/hg b/support/download/hg index 768a27e06f..dcf36e6e1f 100755 --- a/support/download/hg +++ b/support/download/hg @@ -7,6 +7,7 @@ set -e # # Options: # -q Be quiet. +# -s Generate an scmversion file # -o FILE Generate archive in FILE. # -u URI Clone from repository at URI. # -c CSET Use changeset (or revision) CSET. @@ -16,9 +17,11 @@ set -e # HG : the hg command to call quiet= +scmversion= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q;; + s) scmversion=1;; o) output="${OPTARG}";; u) uri="${OPTARG}";; c) cset="${OPTARG}";; @@ -48,3 +51,10 @@ _hg clone ${quiet} "${@}" --noupdate "'${uri}'" "'${basename}'" _plain_hg archive ${quiet} --repository "'${basename}'" --type tgz \ --prefix "'${basename}'" --rev "'${cset}'" \ - >"${output}" + +# If an scmversion is needed then generate the version information +if [ ${scmversion} -eq 1 ]; then + post_process_unpack "${basename}" "${output}" + support/download/scmversion "${@}" "${basename}/.scmversion" + post_process_repack "$(pwd)" "${basename}" "${output}" +fi diff --git a/support/download/scmversion b/support/download/scmversion new file mode 100755 index 0000000000..16868a11e5 --- /dev/null +++ b/support/download/scmversion @@ -0,0 +1,63 @@ +#!/usr/bin/env bash +set -x +set -e + +# Helper to generate an scmversion in a dowload script before +# the tarball is created. Because the tarball has to exclude +# repository directories like .git and .hg to make reproducible +# archives on subsequent downloads the version information is +# not available during the builds for a script like setlocalversion +# to run. +# +# So, this is hook to call right before the make tarball gz that +# will generate a .scmversion file that will be included in an +# archive and then available during the build steps. +# +# Call it with: +# $1: the path to the srctree (see mk_tar_gz in helpers) +# $2: output file +# +# Because this can fail for a variety of reason, there is no exit +# code to avoid build breakage. It is assumed the scripts will be +# reproducible because they are based on the contents that get generated + +while getopts :q OPT; do + case "${OPT}" in + q) exec >/dev/null;; + \?) exit 1;; + esac +done +shift $((OPTIND-1)) + +srctree="${1}" +scmversion="${2}" + +# Bail early if no srctree or scmversion +if [ -z "${srctree}" -o -z "${scmversion}" ]; then + exit 0 +fi + +# Does the scmversion exist and readonly +if [ -f "${scmversion}" -a ! -w "${scmversion}" ]; then + printf "WARNING: scmversion %s is readonly\n" "${scmversion}" >&2 + exit 0 +fi + +# +# Generate the scmversion from some expected locations in srctree +# and fallback to the buildroot version of setlocalversion another +# script is not used +# +if [ -x "${srctree}/setlocalversion" ]; then + res=$(cd "${srctree}"; ./setlocalversion) +elif [ -x "${srctree}/scripts/setlocalversion" ]; then + res=$(cd "${srctree}"; ./scripts/setlocalversion) +elif [ -x "${srctree}/tools/setlocalversion" ]; then + res=$(cd "${srctree}"; ./tools/setlocalversion) +fi +if [ -z "${res}" ]; then + res=$("${0%/*}/../scripts/setlocalversion" "${srctree}") +fi + +[ -n "${res}" ] && (echo "${res}" > "${scmversion}") +exit 0 diff --git a/support/download/svn b/support/download/svn index b23b7773d3..b0e9f69a6b 100755 --- a/support/download/svn +++ b/support/download/svn @@ -12,6 +12,7 @@ set -e # # Options: # -q Be quiet. +# -s Generate an scmversion file # -o FILE Generate archive in FILE. # -u URI Checkout from repository at URI. # -c REV Use revision REV. @@ -23,9 +24,11 @@ set -e . "${0%/*}/helpers" quiet= +scmversion=0 while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q;; + s) scmversion=1;; o) output="${OPTARG}";; u) uri="${OPTARG}";; c) rev="${OPTARG}";; @@ -65,3 +68,10 @@ date="$( _plain_svn info "'${uri}@${rev}'" \ # We did a 'svn export' above, so it's not a working copy (there is no .svn # directory or file to ignore). mk_tar_gz "${basename}" "${basename}" "${date}" "${output}" + +# If an scmversion is needed then generate the version information +if [ ${scmversion} -eq 1 ]; then + post_process_unpack "${basename}" "${output}" + support/download/scmversion "${basename}" "${basename}/.scmversion" + post_process_repack "$(pwd)" "${basename}" "${output}" +fi -- 2.24.3 (Apple Git-128) From ckhardin at gmail.com Wed Feb 22 22:30:52 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:30:52 -0800 Subject: [Buildroot] [PATCH v2 2/3] boot/uboot: add a scmversion rsync hook when overriding srcdir In-Reply-To: References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <70c8c0b4e34438c96257697086ff8b62fb6f2cd7.1677104777.git.ckhardin@gmail.com> During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define PLAIN_VERSION "2018.03-01358-gbda75d6a8b" #define U_BOOT_VERSION "U-Boot " PLAIN_VERSION Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..edb6c646c7 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -28,18 +28,30 @@ UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL)) else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = git +UBOOT_SCMVERSION = YES else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_HG),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = hg +UBOOT_SCMVERSION = YES else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_SVN),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = svn +UBOOT_SCMVERSION = YES else # Handle stable official U-Boot versions UBOOT_SITE = https://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 endif +ifneq ($(UBOOT_OVERRIDE_SRCDIR),) +define UBOOT_SCMVERSION_HOOK + $(TOPDIR)/support/download/scmversion \ + $(abspath $(UBOOT_OVERRIDE_SRCDIR)) $(@D)/.scmversion +endef + +UBOOT_POST_RSYNC_HOOKS += UBOOT_SCMVERSION_HOOK +endif + ifeq ($(BR2_TARGET_UBOOT)$(BR2_TARGET_UBOOT_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) endif -- 2.24.3 (Apple Git-128) From ckhardin at gmail.com Wed Feb 22 22:30:53 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:30:53 -0800 Subject: [Buildroot] [PATCH v2 3/3] linux: add a scmversion rsync hook when overriding srcdir In-Reply-To: References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define UTS_RELEASE "5.4.70-00031-g92c23d10d003" Signed-off-by: Charles Hardin --- linux/linux.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..b72318e3f2 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -24,12 +24,15 @@ LINUX_SOURCE = $(notdir $(LINUX_TARBALL)) else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = git +LINUX_SCMVERSION = YES else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_HG),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = hg +LINUX_SCMVERSION = YES else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_SVN),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = svn +LINUX_SCMVERSION = YES else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION),y) LINUX_SOURCE = linux-cip-$(LINUX_VERSION).tar.gz LINUX_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot @@ -46,6 +49,15 @@ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_ endif endif +ifneq ($(LINUX_OVERRIDE_SRCDIR),) +define LINUX_SCMVERSION_HOOK + $(TOPDIR)/support/download/scmversion \ + $(abspath $(LINUX_OVERRIDE_SRCDIR)) $(@D)/.scmversion +endef + +LINUX_POST_RSYNC_HOOKS += LINUX_SCMVERSION_HOOK +endif + ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) endif -- 2.24.3 (Apple Git-128) From thomas.petazzoni at bootlin.com Wed Feb 22 23:01:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 00:01:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/netsurf: force libopenssl In-Reply-To: <20230222212235.16202-1-fontaine.fabrice@gmail.com> References: <20230222212235.16202-1-fontaine.fabrice@gmail.com> Message-ID: <20230223000124.587fcdfa@windsurf> On Wed, 22 Feb 2023 22:22:35 +0100 Fabrice Fontaine wrote: > netsurf raises the following build failure since bump of libressl to > version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: > > content/fetchers/about.c: In function 'ns_X509_get_signature_nid': > content/fetchers/about.c:548:25: error: dereferencing pointer to incomplete type 'X509 {aka struct x509_st}' > return OBJ_obj2nid(cert->cert_info->key->algor->algorithm); > ^~ > > Fixes: > - http://autobuild.buildroot.org/results/c225aaac31398ba495921bd4b85e588199822561 > > Signed-off-by: Fabrice Fontaine > --- > package/netsurf/Config.in | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 23:01:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 00:01:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/optee-client: fix BR2_PACKAGE_OPTEE_CLIENT_TEEACL In-Reply-To: <20230222220835.355342-1-fontaine.fabrice@gmail.com> References: <20230222220835.355342-1-fontaine.fabrice@gmail.com> Message-ID: <20230223000129.0f8c4d51@windsurf> On Wed, 22 Feb 2023 23:08:35 +0100 Fabrice Fontaine wrote: > Fix typo added by commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82 > resulting in the following build failure: > > -- Checking for module 'uuid' > -- Package 'uuid', required by 'virtual:world', not found > CMake Error at /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:603 (message): > A required package was not found > Call Stack (most recent call first): > /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:825 (_pkg_check_modules_internal) > CMakeLists.txt:43 (pkg_check_modules) > > Fixes: > - http://autobuild.buildroot.org/results/e1c6b5c9e841a003037045b2ff7afd9836e7c640 > > Signed-off-by: Fabrice Fontaine > --- > package/optee-client/optee-client.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 23:01:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 00:01:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/optee-client: fix uclibc build In-Reply-To: <20230222221750.558885-1-fontaine.fabrice@gmail.com> References: <20230222221750.558885-1-fontaine.fabrice@gmail.com> Message-ID: <20230223000133.6e7cd7f3@windsurf> On Wed, 22 Feb 2023 23:17:50 +0100 Fabrice Fontaine wrote: > Fix the following uclibc build failure raised since bump to version > 3.19.0 in commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82: > > /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c: In function 'teeacl_user_is_member_of': > /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c:75:12: error: implicit declaration of function 'reallocarray' [-Werror=implicit-function-declaration] > 75 | groups = reallocarray(groups, grouplistsize, sizeof(gid_t)); > | ^~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/03eba71ab9b87676f2606ecf2a9b5a151fc396bb > > Signed-off-by: Fabrice Fontaine > --- > ...-use-realloc-instead-of-reallocarray.patch | 34 +++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From Alberto.Fahrenkrog at rigtechnologies.com.au Thu Feb 23 04:42:53 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Thu, 23 Feb 2023 04:42:53 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build Message-ID: Hello all, I'm trying to build a very simple custom python package following the instructions on the manual, yet I must be doing something very wrong as I get this result: $ make python-koala make[1]: *** No rule to make target 'python-koala'. Stop. make: *** [Makefile:23: _all] Error 2 I create my out of tree build with: make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads br_build_defconfig On my "br_build" folder I have a Config.in file: menu "Python-Libs" source "~/Projects/br_build/package/python-koala/Config.in" endmenu In "br_build/packages/python-koala/Config.in" config BR2_PACKAGE_PYTHON_KOALA ??????bool "python-koala" depends on BR2_PACKAGE_PYTHON3 ??????help ?????? Python implementation of Koala Library In "br_build/packages/python-koala/python-koala.mk" ################################################################################ # # python-koala # ################################################################################ PYTHON_KOALA_VERSION = 1.3.3 PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz PYTHON_KOALA_SITE = https://mywebsite.com.au/ExternalCode/koala/archive/ PYTHON_KOALA_SETUP_TYPE = setuptools $(eval $(python-koala)) If I run "make menuconfig" I can select or deselect the package, and it's selected per default on the br_build_defconfig (and in .config): BR2_PACKAGE_PYTHON_KOALA=y But if I try to run "make python-koala" I get the "no target" error. I'll still have a read and see what I might be doing wrong, but I'm very confused. Any ideas are very welcome. Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image900784.png Type: image/png Size: 14270 bytes Desc: image900784.png URL: From Alberto.Fahrenkrog at rigtechnologies.com.au Thu Feb 23 04:47:35 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Thu, 23 Feb 2023 04:47:35 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: References: Message-ID: Update, if I change $(eval $(python-koala)) to $(eval $(python-package)) I still get the same error. I assume that might have been one mistake. Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: buildroot on behalf of Alberto Fahrenkrog Sent: Thursday, February 23, 2023 12:42 PM To: buildroot at buildroot.org Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is important Hello all, I'm trying to build a very simple custom python package following the instructions on the manual, yet I must be doing something very wrong as I get this result: $ make python-koala make[1]: *** No rule to make target 'python-koala'. Stop. make: *** [Makefile:23: _all] Error 2 I create my out of tree build with: make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads br_build_defconfig On my "br_build" folder I have a Config.in file: menu "Python-Libs" source "~/Projects/br_build/package/python-koala/Config.in" endmenu In "br_build/packages/python-koala/Config.in" config BR2_PACKAGE_PYTHON_KOALA ??????bool "python-koala" depends on BR2_PACKAGE_PYTHON3 ??????help ?????? Python implementation of Koala Library In "br_build/packages/python-koala/python-koala.mk" ################################################################################ # # python-koala # ################################################################################ PYTHON_KOALA_VERSION = 1.3.3 PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz PYTHON_KOALA_SITE = https://mywebsite.com.au/ExternalCode/koala/archive/ PYTHON_KOALA_SETUP_TYPE = setuptools $(eval $(python-koala)) If I run "make menuconfig" I can select or deselect the package, and it's selected per default on the br_build_defconfig (and in .config): BR2_PACKAGE_PYTHON_KOALA=y But if I try to run "make python-koala" I get the "no target" error. I'll still have a read and see what I might be doing wrong, but I'm very confused. Any ideas are very welcome. Cheers, Alberto [cid:image900784.png at 3A858536.258EC748] Alberto? Fahrenkrog Senior Embedded Engineer Orica ? Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image900784.png Type: image/png Size: 14270 bytes Desc: image900784.png URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image261033.png Type: image/png Size: 14270 bytes Desc: image261033.png URL: From vfazio at xes-inc.com Wed Feb 22 15:32:34 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Wed, 22 Feb 2023 15:32:34 +0000 Subject: [Buildroot] [External] - [PATCH] boot/arm-trusted-firmware: introduce a choice to select the BL33 image In-Reply-To: <20230221214904.454053-1-thomas.petazzoni@bootlin.com> References: <20230221214904.454053-1-thomas.petazzoni@bootlin.com> Message-ID: > -----Original Message----- > From: Thomas Petazzoni > Sent: Tuesday, February 21, 2023 3:49 PM > To: buildroot at buildroot.org > Cc: Thomas Petazzoni ; Vincent Fazio > ; Casey Reeves ; Dick Olsson > ; Sergey Matyukevich > Subject: [External] - [PATCH] boot/arm-trusted-firmware: introduce a choice > to select the BL33 image > > We now have 3 different options to select an image as the BL33 stage of TF- > A: Barebox, U-Boot or EDK2. Technically speaking, they are mutually > exclusive: they all specify a BL33= variable to the TF-A build, and TF-A can > only support a single BL33 stage. > > However, as pointed out by Vincent Fazio in [0] there is nothing that > prevents selecting Barebox, U-Boot and EDK2 together, even though it > doesn't make sense. > > To address this, this commit introduces a choice...endchoice block, into which > the Barebox, U-Boot and EDK2 options are moved. An additional "none" > option is added, which is the default, and corresponds to not having any BL33 > image. > > Since we keep the same name for the options, no legacy handling is > necessary. > > [0] > https://lore.kernel.org/buildroot/PH1P110MB1603A4AA1638838DA56BAA06 > 9FDA9 at PH1P110MB1603.NAMP110.PROD.OUTLOOK.COM/ > > Reported-by: Vincent Fazio > Cc: Vincent Fazio > Cc: Casey Reeves > Signed-off-by: Thomas Petazzoni > --- > boot/arm-trusted-firmware/Config.in | 57 +++++++++++++++++------------ > 1 file changed, 34 insertions(+), 23 deletions(-) > > diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted- > firmware/Config.in > index cb54c6c9d8..a5ac987172 100644 > --- a/boot/arm-trusted-firmware/Config.in > +++ b/boot/arm-trusted-firmware/Config.in > @@ -129,8 +129,17 @@ config > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE > > endchoice > > +choice > + prompt "BL33" > + default BR2_TARGET_ARM_TRUSTED_FIRMWARE_NONE_AS_BL33 > + help > + Select the image to include as BL33. > + > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NONE_AS_BL33 > + bool "None" > + > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 > - bool "Use Barebox as BL33" > + bool "Barebox" > depends on BR2_TARGET_BAREBOX > help > This option allows to embed the Barebox generic BL33 image in @@ - > 139,6 +148,30 @@ config > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 > variable pointing to the generic bl33 image is passed > when building ATF. > > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 > + bool "U-Boot" > + depends on BR2_TARGET_UBOOT > + help > + This option allows to embed u-boot.bin as the BL33 part of > + the ARM Trusted Firmware. It ensures that the u-boot package > + gets built before ATF, and that the appropriate BL33 > + variable pointing to u-boot.bin is passed when building ATF. > + > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 > + bool "EDK2" > + depends on BR2_TARGET_EDK2 > + help > + This option allows to embed EDK2 as the BL33 part of > + the ARM Trusted Firmware. It ensures that the EDK2 package > + gets built before ATF, and that the appropriate BL33 > + variable pointing to the EDK2 is passed when building ATF. > + > + Do not choose this option if you intend to build ATF and EDK2 > + for the 'qemu_sbsa' platform. In this case, due to the EDK2 > + build system, the dependency between ATF and EDK is reversed. > + > +endchoice > + > if BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 > > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE > @@ -150,15 +183,6 @@ config > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE > > endif > > -config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 > - bool "Use U-Boot as BL33" > - depends on BR2_TARGET_UBOOT > - help > - This option allows to embed u-boot.bin as the BL33 part of > - the ARM Trusted Firmware. It ensures that the u-boot package > - gets built before ATF, and that the appropriate BL33 > - variable pointing to u-boot.bin is passed when building ATF. > - > if BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 > > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE > @@ -170,19 +194,6 @@ config > BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE > > endif > > -config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 > - bool "Use EDK2 as BL33" > - depends on BR2_TARGET_EDK2 > - help > - This option allows to embed EDK2 as the BL33 part of > - the ARM Trusted Firmware. It ensures that the EDK2 package > - gets built before ATF, and that the appropriate BL33 > - variable pointing to the EDK2 is passed when building ATF. > - > - Do not choose this option if you intend to build ATF and EDK2 > - for the 'qemu_sbsa' platform. In this case, due to the EDK2 > - build system, the dependency between ATF and EDK is reversed. > - > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW > bool "Include NXP RCW in BL2" > depends on BR2_PACKAGE_HOST_QORIQ_RCW > -- > 2.39.1 > Tested-by: Vincent Fazio From yann.morin.1998 at free.fr Thu Feb 23 06:22:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 23 Feb 2023 07:22:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/audit: force arm mode instead of Thumb mode In-Reply-To: <20230222143512.1555539-1-fontaine.fabrice@gmail.com> References: <20230222143512.1555539-1-fontaine.fabrice@gmail.com> Message-ID: <20230223062259.GJ2718518@scaer> Fabrice, All, On 2023-02-22 15:35 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure: > > /tmp/ccY5gl3z.s:2145: Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode > > Fixes: > - http://autobuild.buildroot.org/results/9d18a0d360b2e2f9e87c55daedda62d6ce198bb9 > > Signed-off-by: Fabrice Fontaine > --- > package/audit/audit.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/audit/audit.mk b/package/audit/audit.mk > index cbb174b980..af81dabac0 100644 > --- a/package/audit/audit.mk > +++ b/package/audit/audit.mk > @@ -15,6 +15,13 @@ AUDIT_INSTALL_STAGING = YES > > AUDIT_CONF_OPTS = --without-python --without-python3 > > +# src/libev has some assembly function that is not present in Thumb mode: > +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode > +# so, we desactivate Thumb mode > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > +AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" > +endif But then it would not work on systems that have a armv7m: BR2_cortex_m3, BR2_cortex_m4, or BR2_cortex_m7. I looked at the code, and it's going to be very complex to patch it to support armv7m, i.e. thumb-only. So, we will have to disallow audit in this case. It is going to be easy, as it already have a _ARCH_SUPPORTS, but it going to neeed a bit of cleanup: config BR2_PACKAGE_AUDIT_ARCH_SUPPORTS bool default y if BR2_aarch64 default y if (BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc || BR2_powerpc64 And then, the only 'select' is from libsemanage, which already depends on AUDIT_ARCH_SUPPORT, so all is going to be alright (in the end). Regards, Yann E. MORIN. > ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) > AUDIT_DEPENDENCIES += libcap-ng > AUDIT_CONF_OPTS += --with-libcap-ng=yes > -- > 2.39.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 Thu Feb 23 06:36:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 23 Feb 2023 07:36:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/libev: force arm mode instead of Thumb mode In-Reply-To: <20230222143753.1563322-1-fontaine.fabrice@gmail.com> References: <20230222143753.1563322-1-fontaine.fabrice@gmail.com> Message-ID: <20230223063607.GK2718518@scaer> Fabrice, All, On 2023-02-22 15:37 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure: > > /tmp/ccHc3Awn.s:825: Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode > > Fixes: > - http://autobuild.buildroot.org/results/1c597c9da724d6cac06b09b1ecd456a28440a3a3 > > Signed-off-by: Fabrice Fontaine > --- > package/libev/libev.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/libev/libev.mk b/package/libev/libev.mk > index 9f3c19d46c..cbd5433d76 100644 > --- a/package/libev/libev.mk > +++ b/package/libev/libev.mk > @@ -10,6 +10,13 @@ LIBEV_INSTALL_STAGING = YES > LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+ > LIBEV_LICENSE_FILES = LICENSE > > +# libev has some assembly function that is not present in Thumb mode: > +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode > +# so, we desactivate Thumb mode > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > +LIBEV_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" > +endif Same as for the audit change, this is going to fail for armv7m machines, so we need to hide away libeve for those. Unfortuantely, libev does not already have an _ARCH_SUPPORTS, and adding one just for this is a bit overkill. However, libeve has 12 reverse dependencies, so it's going to be a little pain. If we expect that libeve has more arch-dependencies, then it might be a good idea, but I have no clue there... In fact, re-reading the libev code, it seems that the situation is more coplex that "not thumb": 814 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \ 815 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ \ 816 || defined __ARM_ARCH_6T2__ 817 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory") 818 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \ 819 || defined __ARM_ARCH_7R__ || defined __ARM_ARCH_7M__ 820 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") So, it goes through the armv6 case, and it looks like it does have support for Thumb2 (6T2) or armv7m. So, the condition is a bit more complex. It is OK for ARM full or Thumb2 (armv7m implies Thumb2). So, adding an LIBEVE_ARCH_SUPPORT is maybe a good idea, in the end: config BR2_PACKAGE_LIBEV_ARCH_SUPPORTS bool default y if !(BR2_arm || BR2_armeb) || BR2_ARM_CPU_HAS_ARM || BR2_ARM_CPU_HAS_THUMB2 Regards, Yann E. MORIN. > # The 'compatibility' event.h header conflicts with libevent > # It's completely unnecessary for BR packages so remove it > define LIBEV_DISABLE_EVENT_H_INSTALL > -- > 2.39.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 Thu Feb 23 06:41:29 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 23 Feb 2023 07:41:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/audit: force arm mode instead of Thumb mode In-Reply-To: <20230223062259.GJ2718518@scaer> References: <20230222143512.1555539-1-fontaine.fabrice@gmail.com> <20230223062259.GJ2718518@scaer> Message-ID: <20230223064129.GL2718518@scaer> Fabrice, All, On 2023-02-23 07:22 +0100, Yann E. MORIN spake thusly: > On 2023-02-22 15:35 +0100, Fabrice Fontaine spake thusly: > > Fix the following build failure: > > > > /tmp/ccY5gl3z.s:2145: Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode > > > > Fixes: > > - http://autobuild.buildroot.org/results/9d18a0d360b2e2f9e87c55daedda62d6ce198bb9 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/audit/audit.mk | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/package/audit/audit.mk b/package/audit/audit.mk > > index cbb174b980..af81dabac0 100644 > > --- a/package/audit/audit.mk > > +++ b/package/audit/audit.mk > > @@ -15,6 +15,13 @@ AUDIT_INSTALL_STAGING = YES > > > > AUDIT_CONF_OPTS = --without-python --without-python3 > > > > +# src/libev has some assembly function that is not present in Thumb mode: > > +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode > > +# so, we desactivate Thumb mode > > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > > +AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" > > +endif > > But then it would not work on systems that have a armv7m: BR2_cortex_m3, > BR2_cortex_m4, or BR2_cortex_m7. > > I looked at the code, and it's going to be very complex to patch it to > support armv7m, i.e. thumb-only. > > So, we will have to disallow audit in this case. It is going to be easy, > as it already have a _ARCH_SUPPORTS, but it going to neeed a bit of > cleanup: > > config BR2_PACKAGE_AUDIT_ARCH_SUPPORTS > bool > default y if BR2_aarch64 > default y if (BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM As I wrote in the libev review for the same issue, the condition is a bit more complex: default y if (BR2_arm || BR2_armeb) && (BR2_ARM_CPU_HAS_ARM || BR2_ARM_CPU_HAS_THUMB2) Regards, Yann E. MORIN. > default y if BR2_i386 || BR2_x86_64 > default y if BR2_powerpc || BR2_powerpc64 > > And then, the only 'select' is from libsemanage, which already depends > on AUDIT_ARCH_SUPPORT, so all is going to be alright (in the end). > > Regards, > Yann E. MORIN. > > > ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) > > AUDIT_DEPENDENCIES += libcap-ng > > AUDIT_CONF_OPTS += --with-libcap-ng=yes > > -- > > 2.39.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. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > 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 br015 at umbiko.net Thu Feb 23 06:49:25 2023 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 23 Feb 2023 06:49:25 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: References: Message-ID: <40f9568e5843d49c2afd808bec856bde@umbiko.net> Hi Alberto, On 2023-02-23 04:47, Alberto Fahrenkrog wrote: > Update, > > if I change $(eval $(python-koala)) to $(eval $(python-package)) I > still get the same error. I assume that might have been one mistake. > > Cheers, > > Alberto > > Alberto Fahrenkrog Senior Embedded Engineer > Orica - Perth Technology Centre > p: +61 (0) 8 6365 4056 > e: Alberto.Fahrenkrog at rigtechnologies.com.au > ________________________________ > From: buildroot on behalf of Alberto > Fahrenkrog > Sent: Thursday, February 23, 2023 12:42 PM > To: buildroot at buildroot.org > Subject: [Buildroot] [Help] Struggling to build external python package > on out of tree build > > You don't often get email from > alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is > important > Hello all, > > I'm trying to build a very simple custom python package following the > instructions on the manual, yet I must be doing something very wrong as > I get this result: > > $ make python-koala > make[1]: *** No rule to make target 'python-koala'. Stop. > make: *** [Makefile:23: _all] Error 2 > > I create my out of tree build with: > make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build > O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads > br_build_defconfig > > On my "br_build" folder I have a Config.in file: > menu "Python-Libs" > source "~/Projects/br_build/package/python-koala/Config.in" > endmenu Similar to the include file for configs, you also need an external.mk file for the project make files, with this content: include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) Otherwise your .mk files will not be picked up. > In "br_build/packages/python-koala/Config.in" The package directory is usually named 'package', not sure if this is relevant (but Config.in /external.mk have to match it). > config BR2_PACKAGE_PYTHON_KOALA > ??????bool "python-koala" > depends on BR2_PACKAGE_PYTHON3 > ??????help > ?????? Python implementation of Koala Library > > In "br_build/packages/python-koala/python-koala.mk" > ################################################################################ > # > # python-koala > # > ################################################################################ > > PYTHON_KOALA_VERSION = 1.3.3 > PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz > PYTHON_KOALA_SITE = > https://mywebsite.com.au/ExternalCode/koala/archive/ > PYTHON_KOALA_SETUP_TYPE = setuptools > > $(eval $(python-koala)) > > If I run "make menuconfig" I can select or deselect the package, and > it's selected per default on the br_build_defconfig (and in .config): > BR2_PACKAGE_PYTHON_KOALA=y > > But if I try to run "make python-koala" I get the "no target" error. > I'll still have a read and see what I might be doing wrong, but I'm > very confused. Any ideas are very welcome. > > Cheers, > > Alberto Kind regards, Andreas From francois.perrad at gadz.org Thu Feb 23 06:58:30 2023 From: francois.perrad at gadz.org (=?UTF-8?Q?Fran=C3=A7ois_Perrad?=) Date: Thu, 23 Feb 2023 07:58:30 +0100 Subject: [Buildroot] [PATCH v3 4/4] package/libgtk3: only update-icon-cache when the demos are built In-Reply-To: <20230221192802.4117856-4-thomas.devoogdt@barco.com> References: <20230221192802.4117856-1-thomas.devoogdt@barco.com> <20230221192802.4117856-4-thomas.devoogdt@barco.com> Message-ID: Le mar. 21 f?vr. 2023 ? 20:29, Thomas Devoogdt a ?crit : > Similar to: > https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4358/diffs > > Signed-off-by: Thomas Devoogdt > --- > v3: > - rebased on > https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 > - needed to fix the webkitgtk 2.38.5 compilation > ( > https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/ > ) > --- > package/libgtk3/libgtk3.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk > index 2821c7eb52..b78578d568 100644 > --- a/package/libgtk3/libgtk3.mk > +++ b/package/libgtk3/libgtk3.mk > @@ -145,11 +145,13 @@ endef > > # Create icon-theme.cache for each of the icon directories/themes > # It's not strictly necessary but speeds up lookups > +ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y) > I disagree with this logic. At this time, icons could installed by 2 packages: - hicolor-icon-theme which is selected by libgtk3-demo - adwaita-icon-theme >From my point of view, this finalize hook must be always enabled as actually, but it must never fails even when there is no icons. Fran?ois > define LIBGTK3_UPDATE_ICON_CACHE > find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d > \ > -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; > endef > LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE > +endif > > $(eval $(meson-package)) > $(eval $(host-generic-package)) > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From Alberto.Fahrenkrog at rigtechnologies.com.au Thu Feb 23 07:09:00 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Thu, 23 Feb 2023 07:09:00 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: <40f9568e5843d49c2afd808bec856bde@umbiko.net> References: <40f9568e5843d49c2afd808bec856bde@umbiko.net> Message-ID: Hi Andreas, Thank you so much! That did it! Where in the manual is external.mk explained? I missed it for sure... Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: buildroot on behalf of Andreas Ziegler Sent: Thursday, February 23, 2023 2:49 PM To: Alberto Fahrenkrog Cc: buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build [You don't often get email from br015 at umbiko.net. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] Hi Alberto, On 2023-02-23 04:47, Alberto Fahrenkrog wrote: > Update, > > if I change $(eval $(python-koala)) to $(eval $(python-package)) I > still get the same error. I assume that might have been one mistake. > > Cheers, > > Alberto > > Alberto Fahrenkrog Senior Embedded Engineer > Orica - Perth Technology Centre > p: +61 (0) 8 6365 4056 > e: Alberto.Fahrenkrog at rigtechnologies.com.au > ________________________________ > From: buildroot on behalf of Alberto > Fahrenkrog > Sent: Thursday, February 23, 2023 12:42 PM > To: buildroot at buildroot.org > Subject: [Buildroot] [Help] Struggling to build external python package > on out of tree build > > You don't often get email from > alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is > important > Hello all, > > I'm trying to build a very simple custom python package following the > instructions on the manual, yet I must be doing something very wrong as > I get this result: > > $ make python-koala > make[1]: *** No rule to make target 'python-koala'. Stop. > make: *** [Makefile:23: _all] Error 2 > > I create my out of tree build with: > make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build > O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads > br_build_defconfig > > On my "br_build" folder I have a Config.in file: > menu "Python-Libs" > source "~/Projects/br_build/package/python-koala/Config.in" > endmenu Similar to the include file for configs, you also need an external.mk file for the project make files, with this content: include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) Otherwise your .mk files will not be picked up. > In "br_build/packages/python-koala/Config.in" The package directory is usually named 'package', not sure if this is relevant (but Config.in /external.mk have to match it). > config BR2_PACKAGE_PYTHON_KOALA > ??????bool "python-koala" > depends on BR2_PACKAGE_PYTHON3 > ??????help > ?????? Python implementation of Koala Library > > In "br_build/packages/python-koala/python-koala.mk" > ################################################################################ > # > # python-koala > # > ################################################################################ > > PYTHON_KOALA_VERSION = 1.3.3 > PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz > PYTHON_KOALA_SITE = > https://mywebsite.com.au/ExternalCode/koala/archive/ > PYTHON_KOALA_SETUP_TYPE = setuptools > > $(eval $(python-koala)) > > If I run "make menuconfig" I can select or deselect the package, and > it's selected per default on the br_build_defconfig (and in .config): > BR2_PACKAGE_PYTHON_KOALA=y > > But if I try to run "make python-koala" I get the "no target" error. > I'll still have a read and see what I might be doing wrong, but I'm > very confused. Any ideas are very welcome. > > Cheers, > > Alberto Kind regards, Andreas _______________________________________________ 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: image479269.png Type: image/png Size: 14270 bytes Desc: image479269.png URL: From Alberto.Fahrenkrog at rigtechnologies.com.au Thu Feb 23 07:13:50 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Thu, 23 Feb 2023 07:13:50 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: References: <40f9568e5843d49c2afd808bec856bde@umbiko.net> Message-ID: Ok, I see now that external.mk is explained in chapter 9. I jumped straight to chapter 18 and missed external.mk completely. And for some reason I never found external.mk on my google searches. Thanks all for your help! Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: buildroot on behalf of Alberto Fahrenkrog Sent: Thursday, February 23, 2023 3:09 PM To: buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is important Hi Andreas, Thank you so much! That did it! Where in the manual is external.mk explained? I missed it for sure... Cheers, Alberto [cid:image479269.png at DC79B523.511A6FAF] Alberto? Fahrenkrog Senior Embedded Engineer Orica ? Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: buildroot on behalf of Andreas Ziegler Sent: Thursday, February 23, 2023 2:49 PM To: Alberto Fahrenkrog Cc: buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build [You don't often get email from br015 at umbiko.net. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] Hi Alberto, On 2023-02-23 04:47, Alberto Fahrenkrog wrote: > Update, > > if I change $(eval $(python-koala)) to $(eval $(python-package)) I > still get the same error. I assume that might have been one mistake. > > Cheers, > > Alberto > > Alberto Fahrenkrog Senior Embedded Engineer > Orica - Perth Technology Centre > p: +61 (0) 8 6365 4056 > e: Alberto.Fahrenkrog at rigtechnologies.com.au > ________________________________ > From: buildroot on behalf of Alberto > Fahrenkrog > Sent: Thursday, February 23, 2023 12:42 PM > To: buildroot at buildroot.org > Subject: [Buildroot] [Help] Struggling to build external python package > on out of tree build > > You don't often get email from > alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is > important > Hello all, > > I'm trying to build a very simple custom python package following the > instructions on the manual, yet I must be doing something very wrong as > I get this result: > > $ make python-koala > make[1]: *** No rule to make target 'python-koala'. Stop. > make: *** [Makefile:23: _all] Error 2 > > I create my out of tree build with: > make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build > O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads > br_build_defconfig > > On my "br_build" folder I have a Config.in file: > menu "Python-Libs" > source "~/Projects/br_build/package/python-koala/Config.in" > endmenu Similar to the include file for configs, you also need an external.mk file for the project make files, with this content: include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) Otherwise your .mk files will not be picked up. > In "br_build/packages/python-koala/Config.in" The package directory is usually named 'package', not sure if this is relevant (but Config.in /external.mk have to match it). > config BR2_PACKAGE_PYTHON_KOALA > ??????bool "python-koala" > depends on BR2_PACKAGE_PYTHON3 > ??????help > ?????? Python implementation of Koala Library > > In "br_build/packages/python-koala/python-koala.mk" > ################################################################################ > # > # python-koala > # > ################################################################################ > > PYTHON_KOALA_VERSION = 1.3.3 > PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz > PYTHON_KOALA_SITE = > https://mywebsite.com.au/ExternalCode/koala/archive/ > PYTHON_KOALA_SETUP_TYPE = setuptools > > $(eval $(python-koala)) > > If I run "make menuconfig" I can select or deselect the package, and > it's selected per default on the br_build_defconfig (and in .config): > BR2_PACKAGE_PYTHON_KOALA=y > > But if I try to run "make python-koala" I get the "no target" error. > I'll still have a read and see what I might be doing wrong, but I'm > very confused. Any ideas are very welcome. > > Cheers, > > Alberto Kind regards, Andreas _______________________________________________ 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: image479269.png Type: image/png Size: 14270 bytes Desc: image479269.png URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image003669.png Type: image/png Size: 14270 bytes Desc: image003669.png URL: From thomas at devoogdt.com Thu Feb 23 08:01:13 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 23 Feb 2023 09:01:13 +0100 Subject: [Buildroot] [PATCH v3 4/4] package/libgtk3: only update-icon-cache when the demos are built In-Reply-To: References: <20230221192802.4117856-1-thomas.devoogdt@barco.com> <20230221192802.4117856-4-thomas.devoogdt@barco.com> Message-ID: Hi, Ok, the proposed solution makes sense. And would be safer anyway. I adapt the last patch. Kr, Thomas Op do 23 feb. 2023 om 07:58 schreef Fran?ois Perrad : > > > > Le mar. 21 f?vr. 2023 ? 20:29, Thomas Devoogdt a ?crit : >> >> Similar to: >> https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4358/diffs >> >> Signed-off-by: Thomas Devoogdt >> --- >> v3: >> - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 >> - needed to fix the webkitgtk 2.38.5 compilation >> (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) >> --- >> package/libgtk3/libgtk3.mk | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk >> index 2821c7eb52..b78578d568 100644 >> --- a/package/libgtk3/libgtk3.mk >> +++ b/package/libgtk3/libgtk3.mk >> @@ -145,11 +145,13 @@ endef >> >> # Create icon-theme.cache for each of the icon directories/themes >> # It's not strictly necessary but speeds up lookups >> +ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y) > > > I disagree with this logic. > At this time, icons could installed by 2 packages: > - hicolor-icon-theme which is selected by libgtk3-demo > - adwaita-icon-theme > > From my point of view, this finalize hook must be always enabled as actually, > but it must never fails even when there is no icons. > > Fran?ois > > >> >> define LIBGTK3_UPDATE_ICON_CACHE >> find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ >> -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; >> endef >> LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE >> +endif >> >> $(eval $(meson-package)) >> $(eval $(host-generic-package)) >> -- >> 2.39.2 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From Alberto.Fahrenkrog at rigtechnologies.com.au Thu Feb 23 09:13:28 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Thu, 23 Feb 2023 09:13:28 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: References: <40f9568e5843d49c2afd808bec856bde@umbiko.net> Message-ID: Hi all, I'm slowly getting ahead with this, and I still have a few more questions... I'm trying to get a tar.gz file from a git repo, which needs authentication. The command that works manually is: wget https://outwebsite.com/koala/archive/release1.2.3.tar.gz --header 'Authorization: token MY_TOKEN' And the .mk file is configured as: PYTHON_KOALA_SITE_METHOD = wget PYTHON_KOALA_DL_OPTS = --header 'Authorization: token MY_TOKEN' PYTHON_KOALA_SITE = https://outwebsite.com/koala/archive/ The .mk file is being read correctly, but I can't figure out how to use DL_OPTS. The manual says DL_OPTS is a space separated list, but i see wget tries to use "token" or "MY_TOKEN" as the address. I tried a few different combinations of inverted commas, but none worked. Thanks again, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: Alberto Fahrenkrog Sent: Thursday, February 23, 2023 3:13 PM To: buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build Ok, I see now that external.mk is explained in chapter 9. I jumped straight to chapter 18 and missed external.mk completely. And for some reason I never found external.mk on my google searches. Thanks all for your help! Cheers, Alberto ________________________________ From: buildroot on behalf of Alberto Fahrenkrog Sent: Thursday, February 23, 2023 3:09 PM To: buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is important Hi Andreas, Thank you so much! That did it! Where in the manual is external.mk explained? I missed it for sure... Cheers, Alberto [cid:image479269.png at DC79B523.511A6FAF] Alberto? Fahrenkrog Senior Embedded Engineer Orica ? Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: buildroot on behalf of Andreas Ziegler Sent: Thursday, February 23, 2023 2:49 PM To: Alberto Fahrenkrog Cc: buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build [You don't often get email from br015 at umbiko.net. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] Hi Alberto, On 2023-02-23 04:47, Alberto Fahrenkrog wrote: > Update, > > if I change $(eval $(python-koala)) to $(eval $(python-package)) I > still get the same error. I assume that might have been one mistake. > > Cheers, > > Alberto > > Alberto Fahrenkrog Senior Embedded Engineer > Orica - Perth Technology Centre > p: +61 (0) 8 6365 4056 > e: Alberto.Fahrenkrog at rigtechnologies.com.au > ________________________________ > From: buildroot on behalf of Alberto > Fahrenkrog > Sent: Thursday, February 23, 2023 12:42 PM > To: buildroot at buildroot.org > Subject: [Buildroot] [Help] Struggling to build external python package > on out of tree build > > You don't often get email from > alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is > important > Hello all, > > I'm trying to build a very simple custom python package following the > instructions on the manual, yet I must be doing something very wrong as > I get this result: > > $ make python-koala > make[1]: *** No rule to make target 'python-koala'. Stop. > make: *** [Makefile:23: _all] Error 2 > > I create my out of tree build with: > make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build > O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads > br_build_defconfig > > On my "br_build" folder I have a Config.in file: > menu "Python-Libs" > source "~/Projects/br_build/package/python-koala/Config.in" > endmenu Similar to the include file for configs, you also need an external.mk file for the project make files, with this content: include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) Otherwise your .mk files will not be picked up. > In "br_build/packages/python-koala/Config.in" The package directory is usually named 'package', not sure if this is relevant (but Config.in /external.mk have to match it). > config BR2_PACKAGE_PYTHON_KOALA > ??????bool "python-koala" > depends on BR2_PACKAGE_PYTHON3 > ??????help > ?????? Python implementation of Koala Library > > In "br_build/packages/python-koala/python-koala.mk" > ################################################################################ > # > # python-koala > # > ################################################################################ > > PYTHON_KOALA_VERSION = 1.3.3 > PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz > PYTHON_KOALA_SITE = > https://mywebsite.com.au/ExternalCode/koala/archive/ > PYTHON_KOALA_SETUP_TYPE = setuptools > > $(eval $(python-koala)) > > If I run "make menuconfig" I can select or deselect the package, and > it's selected per default on the br_build_defconfig (and in .config): > BR2_PACKAGE_PYTHON_KOALA=y > > But if I try to run "make python-koala" I get the "no target" error. > I'll still have a read and see what I might be doing wrong, but I'm > very confused. Any ideas are very welcome. > > Cheers, > > Alberto Kind regards, Andreas _______________________________________________ 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: image479269.png Type: image/png Size: 14270 bytes Desc: image479269.png URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image793626.png Type: image/png Size: 14270 bytes Desc: image793626.png URL: From fontaine.fabrice at gmail.com Thu Feb 23 09:52:54 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 10:52:54 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/audit: force arm mode instead of Thumb mode Message-ID: <20230223095254.9141-1-fontaine.fabrice@gmail.com> Fix the following build failure: /tmp/ccY5gl3z.s:2145: Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/9d18a0d360b2e2f9e87c55daedda62d6ce198bb9 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Update BR2_PACKAGE_AUDIT_ARCH_SUPPORTS package/audit/Config.in | 8 +++++--- package/audit/audit.mk | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package/audit/Config.in b/package/audit/Config.in index 6e5761533f..89341dfe31 100644 --- a/package/audit/Config.in +++ b/package/audit/Config.in @@ -1,9 +1,11 @@ # audit has some builtin per-architecture system call tables config BR2_PACKAGE_AUDIT_ARCH_SUPPORTS bool - default y if BR2_aarch64 || BR2_arm || BR2_armeb || \ - BR2_i386 || BR2_powerpc || BR2_powerpc64 || \ - BR2_x86_64 + default y if BR2_aarch64 + default y if (BR2_arm || BR2_armeb) && \ + (BR2_ARM_CPU_HAS_ARM || BR2_ARM_CPU_HAS_THUMB2) + default y if BR2_i386 || BR2_x86_64 + default y if BR2_powerpc || BR2_powerpc64 config BR2_PACKAGE_AUDIT bool "audit" diff --git a/package/audit/audit.mk b/package/audit/audit.mk index cbb174b980..af81dabac0 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -15,6 +15,13 @@ AUDIT_INSTALL_STAGING = YES AUDIT_CONF_OPTS = --without-python --without-python3 +# src/libev has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) AUDIT_DEPENDENCIES += libcap-ng AUDIT_CONF_OPTS += --with-libcap-ng=yes -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 10:10:32 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 11:10:32 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/libev: force arm mode instead of Thumb mode Message-ID: <20230223101032.19265-1-fontaine.fabrice@gmail.com> Fix the following build failure: /tmp/ccHc3Awn.s:825: Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/1c597c9da724d6cac06b09b1ecd456a28440a3a3 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Add BR2_PACKAGE_LIBEV_ARCH_SUPPORTS package/atest/Config.in | 2 ++ package/cfm/Config.in | 2 ++ package/dvblast/Config.in | 2 ++ package/libev/Config.in | 6 ++++++ package/libev/libev.mk | 7 +++++++ package/libpagekite/Config.in | 2 ++ package/libuhttpd/Config.in | 2 ++ package/libuwsc/Config.in | 1 + package/lua-ev/Config.in | 1 + package/mrp/Config.in | 2 ++ package/rtty/Config.in | 1 + package/shadowsocks-libev/Config.in | 1 + package/uacme/Config.in | 2 ++ package/unclutter-xfixes/Config.in | 1 + 14 files changed, 32 insertions(+) diff --git a/package/atest/Config.in b/package/atest/Config.in index 647b2163ea..44caff1954 100644 --- a/package/atest/Config.in +++ b/package/atest/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ATEST bool "atest" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_LIBEV @@ -10,4 +11,5 @@ config BR2_PACKAGE_ATEST https://github.com/amouiche/atest comment "atest needs a toolchain w/ threads" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/cfm/Config.in b/package/cfm/Config.in index 1c2e92be67..81f8d8eb8b 100644 --- a/package/cfm/Config.in +++ b/package/cfm/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_CFM bool "cfm" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 select BR2_PACKAGE_LIBEV @@ -13,5 +14,6 @@ config BR2_PACKAGE_CFM https://github.com/microchip-ung/cfm comment "cfm needs a toolchain w/ threads, kernel headers >= 5.0" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 diff --git a/package/dvblast/Config.in b/package/dvblast/Config.in index 973eee88c6..93da42b785 100644 --- a/package/dvblast/Config.in +++ b/package/dvblast/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_DVBLAST bool "dvblast" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_BITSTREAM select BR2_PACKAGE_LIBEV @@ -11,4 +12,5 @@ config BR2_PACKAGE_DVBLAST http://www.videolan.org/projects/dvblast.html comment "dvblast needs a toolchain w/ threads" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libev/Config.in b/package/libev/Config.in index 71abe7737d..820f01e8c0 100644 --- a/package/libev/Config.in +++ b/package/libev/Config.in @@ -1,5 +1,11 @@ + config BR2_PACKAGE_LIBEV_ARCH_SUPPORTS + bool + default y if !(BR2_arm || BR2_armeb) || \ + BR2_ARM_CPU_HAS_ARM || BR2_ARM_CPU_HAS_THUMB2 + config BR2_PACKAGE_LIBEV bool "libev" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS help Userspace library for handling asynchronous notifications diff --git a/package/libev/libev.mk b/package/libev/libev.mk index 9f3c19d46c..cbd5433d76 100644 --- a/package/libev/libev.mk +++ b/package/libev/libev.mk @@ -10,6 +10,13 @@ LIBEV_INSTALL_STAGING = YES LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+ LIBEV_LICENSE_FILES = LICENSE +# libev has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBEV_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + # The 'compatibility' event.h header conflicts with libevent # It's completely unnecessary for BR packages so remove it define LIBEV_DISABLE_EVENT_H_INSTALL diff --git a/package/libpagekite/Config.in b/package/libpagekite/Config.in index 0ecf4f97e1..11972d40c7 100644 --- a/package/libpagekite/Config.in +++ b/package/libpagekite/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBPAGEKITE bool "libpagekite" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBEV select BR2_PACKAGE_OPENSSL @@ -21,4 +22,5 @@ config BR2_PACKAGE_LIBPAGEKITE https://github.com/pagekite/libpagekite comment "libpagekite needs a toolchain with threads" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in index a552a88f0c..63cc246092 100644 --- a/package/libuhttpd/Config.in +++ b/package/libuhttpd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBUHTTPD bool "libuhttpd" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBEV @@ -12,5 +13,6 @@ config BR2_PACKAGE_LIBUHTTPD https://github.com/zhaojh329/libuhttpd comment "libuhttpd needs a toolchain w/ gcc >= 4.9" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libuwsc/Config.in b/package/libuwsc/Config.in index ae99b6d2dc..1675aca88b 100644 --- a/package/libuwsc/Config.in +++ b/package/libuwsc/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBUWSC bool "libuwsc" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev select BR2_PACKAGE_LIBEV help A Lightweight and fully asynchronous WebSocket client diff --git a/package/lua-ev/Config.in b/package/lua-ev/Config.in index 1e89c270a0..75c4862f8a 100644 --- a/package/lua-ev/Config.in +++ b/package/lua-ev/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LUA_EV bool "lua-ev" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev select BR2_PACKAGE_LIBEV help Get access to the libev library from Lua. diff --git a/package/mrp/Config.in b/package/mrp/Config.in index ac42fa4773..56353baef2 100644 --- a/package/mrp/Config.in +++ b/package/mrp/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MRP bool "mrp" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 select BR2_PACKAGE_LIBEV @@ -14,5 +15,6 @@ config BR2_PACKAGE_MRP https://github.com/microchip-ung/mrp comment "mrp needs a toolchain w/ threads, kernel headers >= 5.0" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 diff --git a/package/rtty/Config.in b/package/rtty/Config.in index 198d465713..ed154af6e1 100644 --- a/package/rtty/Config.in +++ b/package/rtty/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTTY bool "rtty" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBEV help diff --git a/package/shadowsocks-libev/Config.in b/package/shadowsocks-libev/Config.in index fefb27bcc1..25e7ea7b77 100644 --- a/package/shadowsocks-libev/Config.in +++ b/package/shadowsocks-libev/Config.in @@ -17,6 +17,7 @@ config BR2_PACKAGE_SHADOWSOCKS_LIBEV config BR2_PACKAGE_SHADOWSOCKS_LIBEV_CONNMARKTOS bool "connmarktos support in ss-server" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_PACKAGE_SHADOWSOCKS_LIBEV select BR2_PACKAGE_LIBNETFILTER_CONNTRACK help diff --git a/package/uacme/Config.in b/package/uacme/Config.in index 2c6864871c..94367cb220 100644 --- a/package/uacme/Config.in +++ b/package/uacme/Config.in @@ -19,6 +19,7 @@ if BR2_PACKAGE_UACME config BR2_PACKAGE_UACME_UALPN bool "enable ualpn" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBEV select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL \ @@ -28,6 +29,7 @@ config BR2_PACKAGE_UACME_UALPN challenge responder. comment "ualpn needs a toolchain w/ threads" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS endif diff --git a/package/unclutter-xfixes/Config.in b/package/unclutter-xfixes/Config.in index 852a8cfda9..ed266c3f82 100644 --- a/package/unclutter-xfixes/Config.in +++ b/package/unclutter-xfixes/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_UNCLUTTER_XFIXES bool "unclutter-xfixes" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBEV select BR2_PACKAGE_XLIB_LIBX11 -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 10:20:23 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 11:20:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/multipath-tools: fix legal-info Message-ID: <20230223102023.25489-1-fontaine.fabrice@gmail.com> Commit b535fd2a093eca5e8967a5c8004da55f7295d101 forgot to update hash of README.md (updates not related to license) Fixes: - http://autobuild.buildroot.org/results/21bc3aa3e1b89ace5aebe771b8c34d5bd0cb9c3d Signed-off-by: Fabrice Fontaine --- package/multipath-tools/multipath-tools.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index 3f01408c76..ecaad05e25 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -4,4 +4,4 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENS sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1 -sha256 1e6095ac219062b8ddb2416d2a3cc40560619cd6b3ba609f5602bbd320413be0 README.md +sha256 b8b4369c539d6a61ad2a5a359a1ecdfb9f630a89590216d490314e19bf07aa0c README.md -- 2.39.1 From martin at geanix.com Thu Feb 23 10:40:48 2023 From: martin at geanix.com (=?UTF-8?q?Martin=20Hundeb=C3=B8ll?=) Date: Thu, 23 Feb 2023 11:40:48 +0100 Subject: [Buildroot] [PATCH] ifupdown: bump to 0.8.41 Message-ID: <20230223104048.333575-1-martin@geanix.com> From: Martin Hundeboll Musl is not supported since June 2017, where use of fnmatch() was introduced to support wildcard matching on interfaces. Signed-off-by: Martin Hundeb?ll --- package/ifupdown/Config.in | 1 + package/ifupdown/ifupdown.hash | 4 ++-- package/ifupdown/ifupdown.mk | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/ifupdown/Config.in b/package/ifupdown/Config.in index 97d02b4c37..999a2e7e0c 100644 --- a/package/ifupdown/Config.in +++ b/package/ifupdown/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_IFUPDOWN bool "ifupdown" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 + depends on !BR2_TOOLCHAIN_USES_MUSL # missing FNM_EXTMATCH define depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # runtime for ip binary select BR2_PACKAGE_IPROUTE2 if !BR2_PACKAGE_BUSYBOX diff --git a/package/ifupdown/ifupdown.hash b/package/ifupdown/ifupdown.hash index f8844a60a6..f5c2d2d34c 100644 --- a/package/ifupdown/ifupdown.hash +++ b/package/ifupdown/ifupdown.hash @@ -1,4 +1,4 @@ -# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.16.dsc -sha256 601416c12e39ac29022951a2867aed5c607f732ac57fd51517bfba92a4cc4fb0 ifupdown_0.8.16.tar.xz +# From http://snapshot.debian.org/archive/debian/20230222T205615Z/pool/main/i/ifupdown/ifupdown_0.8.41.dsc +sha256 222c5bef313a9e71d9be4b946c73c8606c98f9e0229153191d9c6d8fb9b3599c ifupdown_0.8.41.tar.xz # Locally computed sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk index e62c2a79c5..14c36db0db 100644 --- a/package/ifupdown/ifupdown.mk +++ b/package/ifupdown/ifupdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -IFUPDOWN_VERSION = 0.8.16 +IFUPDOWN_VERSION = 0.8.41 IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz -IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160922T165503Z/pool/main/i/ifupdown +IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20230222T205615Z/pool/main/i/ifupdown IFUPDOWN_LICENSE = GPL-2.0+ IFUPDOWN_LICENSE_FILES = COPYING IFUPDOWN_CPE_ID_VENDOR = debian @@ -14,6 +14,7 @@ IFUPDOWN_CPE_ID_VENDOR = debian define IFUPDOWN_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -D'IFUPDOWN_VERSION=\"$(IFUPDOWN_VERSION)\"'" \ + ARCH=linux \ -C $(@D) endef -- 2.39.2 From fontaine.fabrice at gmail.com Thu Feb 23 10:53:03 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 11:53:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/efivar: fix build without threads Message-ID: <20230223105303.290875-1-fontaine.fabrice@gmail.com> Fix the following build failure without threads raised since bump to version 38 in commit f24029b561fbda0953c7dbd93d2485b03873996d and https://github.com/rhboot/efivar/commit/cff88dd96b9d43e2c5875a24ba6180b196890ded: thread-test.c:14:10: fatal error: pthread.h: No such file or directory 14 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/f2da14f91dc602a32dd5b2b7bdf3d3aa43afa7f4 Signed-off-by: Fabrice Fontaine --- .../efivar/0005-Add-NO_THREADS-variable.patch | 54 +++++++++++++++++++ package/efivar/efivar.mk | 4 ++ 2 files changed, 58 insertions(+) create mode 100644 package/efivar/0005-Add-NO_THREADS-variable.patch diff --git a/package/efivar/0005-Add-NO_THREADS-variable.patch b/package/efivar/0005-Add-NO_THREADS-variable.patch new file mode 100644 index 0000000000..fdd874ab70 --- /dev/null +++ b/package/efivar/0005-Add-NO_THREADS-variable.patch @@ -0,0 +1,54 @@ +From 9fd025945212ab2b2bf71328588b2a5377655176 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 11:46:38 +0100 +Subject: [PATCH] Add NO_THREADS variable + +Allow the user to disable building thread-test to avoid the following +build failure without threads raised since version 38 and +https://github.com/rhboot/efivar/commit/cff88dd96b9d43e2c5875a24ba6180b196890ded: + +thread-test.c:14:10: fatal error: pthread.h: No such file or directory + 14 | #include + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/277f783c33102a0cea7c82ca902119ab90f37ad4 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rhboot/efivar/pull/238] +--- + src/Makefile | 5 ++++- + src/include/defaults.mk | 1 + + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index ec1eabe..eb0427e 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -7,7 +7,10 @@ include $(TOPDIR)/src/include/defaults.mk + + LIBTARGETS=libefivar.so libefiboot.so libefisec.so + STATICLIBTARGETS=libefivar.a libefiboot.a libefisec.a +-BINTARGETS=efivar efisecdb thread-test ++BINTARGETS=efivar efisecdb ++ifeq ($(NO_THREADS),) ++BINTARGETS += thread-test ++endif + STATICBINTARGETS=efivar-static efisecdb-static + PCTARGETS=efivar.pc efiboot.pc efisec.pc + TARGETS=$(LIBTARGETS) $(BINTARGETS) $(PCTARGETS) +diff --git a/src/include/defaults.mk b/src/include/defaults.mk +index 630da23..9632887 100644 +--- a/src/include/defaults.mk ++++ b/src/include/defaults.mk +@@ -8,6 +8,7 @@ BINDIR ?= $(EXEC_PREFIX)/bin + PCDIR ?= $(LIBDIR)/pkgconfig + DESTDIR ?= + PKGS ?= ++NO_THREADS ?= + + CROSS_COMPILE ?= + COMPILER ?= gcc +-- +2.39.1 + diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk index 8b1d338bec..27ad7a39e2 100644 --- a/package/efivar/efivar.mk +++ b/package/efivar/efivar.mk @@ -23,6 +23,10 @@ EFIVAR_MAKE_OPTS = \ SUBDIRS=src \ LD_DASH_T=-T +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +EFIVAR_MAKE_OPTS += NO_THREADS=1 +endif + define HOST_EFIVAR_BUILD_CMDS # makeguids is an internal host tool and must be built separately with # $(HOST_CC), otherwise it gets cross-built. -- 2.39.1 From giulio.benetti at benettiengineering.com Thu Feb 23 11:14:08 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 23 Feb 2023 12:14:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/harfbuzz: bump to version 6.0.0 In-Reply-To: References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> <20230208230721.3269610-3-giulio.benetti@benettiengineering.com> Message-ID: <5bce1e75-8d41-1275-d599-e95aca1c1c1e@benettiengineering.com> Hi Fabrice, Thomas, On 22/02/23 16:55, Fabrice Fontaine wrote: > Hi, > > Le?mer. 22 f?vr. 2023 ??16:37, Giulio Benetti > > a ?crit?: > > This patch is superseded by this one: > https://patchwork.ozlabs.org/project/buildroot/patch/20230222145059.1939094-1-giulio.benetti at benettiengineering.com/ > > > This bump should be tagged as a security bump as it includes a fix for > CVE-2023-25193 (or you could backport fix on master). Thanks a lot for pointing. I've found that the CVE is present in version 6.0.0 only. So as discussed on IRC with Thomas we're going to keep version 5.3.1 for Buildroot 2023.02 and apply the patch to bump harfbuzz to 7.0.1 to next. Best regards -- Giulio Benetti CEO/CTO at Benetti Engineering sas > > > > Best regards > -- > CEO/CTO at Benetti Engineering sas > > On 09/02/23 00:07, Giulio Benetti wrote: > > Since the major release changed all the packages that have direct > > dependency to harfbuzz has been succesfully built: > > - efl > > - libass > > - mupdf > > - pango > > - qt5base > > - qt5webengine > > - qt6base > > - sdl2_ttf > > - supertuxkart > > - vlc > > - webkitgtk > > - wpewebkit > > > > Signed-off-by: Giulio Benetti > > > > --- > >? ?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 9489f25c6a..faae7b91e3 100644 > > --- a/package/harfbuzz/harfbuzz.hash > > +++ b/package/harfbuzz/harfbuzz.hash > > @@ -1,3 +1,3 @@ > >? ?# Locally computed > > -sha256 > 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d > harfbuzz-5.3.1.tar.xz > > +sha256 > 1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4 > harfbuzz-6.0.0.tar.xz > >? ?sha256 > 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 > COPYING > > diff --git a/package/harfbuzz/harfbuzz.mk > b/package/harfbuzz/harfbuzz.mk > > index b0112168e1..02fe4ecec3 100644 > > --- a/package/harfbuzz/harfbuzz.mk > > +++ b/package/harfbuzz/harfbuzz.mk > > @@ -4,7 +4,7 @@ > >? ?# > > > ?################################################################################ > > > > -HARFBUZZ_VERSION = 5.3.1 > > +HARFBUZZ_VERSION = 6.0.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) > > > Best Regards, > > Fabrice From fontaine.fabrice at gmail.com Thu Feb 23 11:19:03 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 12:19:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/s6-linux-utils: fix build with glibc < 2.25 Message-ID: <20230223111903.315678-1-fontaine.fabrice@gmail.com> Fix the following build failure with glibc < 2.25 raised since bump to version 2.6.0.0 in commit 5aac1d0105a73133fd886acc6c5195ca28f7e17f and https://github.com/skarnet/s6-linux-utils/commit/ad5973028c42d947440cdae5e4f106152c3dda28: src/minutils/rngseed.c:15:24: fatal error: sys/random.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/214bcecfc389cb412b68627c831300478d614a3a Signed-off-by: Fabrice Fontaine --- ...utils-rngseed.c-fix-build-with-glibc.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch diff --git a/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch b/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch new file mode 100644 index 0000000000..2df8a99700 --- /dev/null +++ b/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch @@ -0,0 +1,39 @@ +From 3ab8bdc1c657f91a2a96f4e6db308d17098de0c4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 12:09:11 +0100 +Subject: [PATCH] src/s6-linux-utils/rngseed.c: fix build with glibc < + +getrandom and sys/random.h are only available since glibc 2.25 resulting +in the following build failure since version 2.6.0.0 and +https://github.com/skarnet/s6-linux-utils/commit/ad5973028c42d947440cdae5e4f106152c3dda28: + +src/minutils/rngseed.c:15:24: fatal error: sys/random.h: No such file or directory + #include + ^ + +Fixes: + - http://autobuild.buildroot.org/results/214bcecfc389cb412b68627c831300478d614a3a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/skarnet/s6-linux-utils/pull/2] +--- + src/s6-linux-utils/rngseed.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/minutils/rngseed.c b/src/minutils/rngseed.c +index 2b1772c..223f50a 100644 +--- a/src/minutils/rngseed.c ++++ b/src/minutils/rngseed.c +@@ -12,7 +12,9 @@ + #include + #include + #include ++#ifdef SKALIBS_HASGETRANDOM + #include ++#endif + #include + + #include +-- +2.39.1 + -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 12:36:44 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 13:36:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/lttng-babeltrace: fix popt static build with libiconv Message-ID: <20230223123644.402595-1-fontaine.fabrice@gmail.com> Fix the following popt static build failure with libiconv: configure:18149: checking for poptGetContext in -lpopt configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5 /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': poptint.c:(.text+0x28a): undefined reference to `libiconv_open' [...] checking for poptGetContext in -lpopt... no configure: error: Cannot find popt. Fixes: - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f Signed-off-by: Fabrice Fontaine --- ...2-configure.ac-fix-popt-static-build.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch diff --git a/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch b/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch new file mode 100644 index 0000000000..896c67470f --- /dev/null +++ b/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch @@ -0,0 +1,48 @@ +From 35076fd4592ca23136ff5eacdf8eaebc926e0224 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 13:04:08 +0100 +Subject: [PATCH] configure.ac: fix popt static build + +Fix the following popt static build failure: + +configure:18149: checking for poptGetContext in -lpopt +configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5 +/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': +poptint.c:(.text+0x28a): undefined reference to `libiconv_open' + +[...] + +checking for poptGetContext in -lpopt... no +configure: error: Cannot find popt. + +Fixes: + - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f + +Signed-off-by: Fabrice Fontaine +[Upstream status: not upstreamable as popt has been removed with +https://github.com/efficios/babeltrace/commit/916d0d910ad5407bc7826505aa05b277f5739a34] +--- + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a17c23c3..8f700d3e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -223,8 +223,11 @@ AC_CHECK_LIB([c], [faccessat], + ] + ) + +-AC_CHECK_LIB([popt], [poptGetContext], [], +- [AC_MSG_ERROR([Cannot find popt.])] ++PKG_CHECK_MODULES([POPT], [popt], [LIBS="${POPT_LIBS} ${LIBS}"], ++[ ++ AC_CHECK_LIB([popt], [poptGetContext], [], ++ [AC_MSG_ERROR([Cannot find popt.])]) ++] + ) + + # For Python +-- +2.39.1 + -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 12:52:42 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 13:52:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/mender: force libopenssl Message-ID: <20230223125242.411118-1-fontaine.fabrice@gmail.com> mender raises the following build failure with libressl since at least version 3.1.0 (and probably since the addition of the package): vendor/github.com/mendersoftware/openssl/conn.go:103:61: could not determine kind of name for C.X509_V_ERR_DANE_NO_MATCH Fixes: - http://autobuild.buildroot.org/results/2b032d2a4e7cfbb20444c13821003120a4d00abd - http://autobuild.buildroot.org/results/621c057c0b8b627c8140456a2b0af4f95d239dcc Signed-off-by: Fabrice Fontaine --- package/mender/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mender/Config.in b/package/mender/Config.in index cccb46361b..7d768cebec 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -4,8 +4,9 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 help Mender is an open source over-the-air (OTA) software updater for embedded Linux devices. Mender comprises a client -- 2.39.1 From thomas at devoogdt.com Thu Feb 23 12:56:12 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 23 Feb 2023 13:56:12 +0100 Subject: [Buildroot] [PATCH v4 4/4] package/libgtk3: fix update-icon-cache on empty directory In-Reply-To: References: Message-ID: <20230223125612.3156012-1-thomas.devoogdt@barco.com> If both, hicolor-icon-theme (selected by libgtk3-demo) and adwaita-icon-theme is not selected, then the /usr/share/icons folder is empty, causing find to fail. Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) v4: - replace only update-icon-cache when the demos are built to a dir check --- package/libgtk3/libgtk3.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 2821c7eb52..e2dc8eabfb 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -146,6 +146,7 @@ endef # Create icon-theme.cache for each of the icon directories/themes # It's not strictly necessary but speeds up lookups define LIBGTK3_UPDATE_ICON_CACHE +[ ! -d $(TARGET_DIR)/usr/share/icons ] || \ find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; endef -- 2.39.2 From fontaine.fabrice at gmail.com Thu Feb 23 14:06:06 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 15:06:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/erlang: fix build with libressl >= 3.5.0 Message-ID: <20230223140606.208040-1-fontaine.fabrice@gmail.com> Fix the following build failure with libressl >= 3.5.0 raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: api_ng.c: In function 'EVP_CIPHER_CTX_copy': api_ng.c:392:28: error: invalid use of incomplete typedef 'EVP_CIPHER_CTX' {aka 'const struct evp_cipher_ctx_st'} 392 | if ((in == NULL) || (in->cipher == NULL)) | ^~ Fixes: - http://autobuild.buildroot.org/results/90f7365d8477d35fca452b7b3f38babba086375e Signed-off-by: Fabrice Fontaine --- ...0003-crypto-Fixes-for-LibreSSL-3-5-0.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch diff --git a/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch b/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch new file mode 100644 index 0000000000..84c75fef83 --- /dev/null +++ b/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch @@ -0,0 +1,30 @@ +From 8e5170d79e387d7e898d948a78e0c70407a4030c Mon Sep 17 00:00:00 2001 +From: Hans Nilsson +Date: Mon, 14 Feb 2022 15:51:35 +0100 +Subject: [PATCH] crypto: Fixes for LibreSSL 3.5.0 + +[Retrieved (and backported) from: +https://github.com/erlang/otp/commit/8e5170d79e387d7e898d948a78e0c70407a4030c] +Signed-off-by: Fabrice Fontaine +--- + lib/crypto/c_src/openssl_config.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h +index 6fdd049fb30a..39e4b2d9d7c0 100644 +--- a/lib/crypto/c_src/openssl_config.h ++++ b/lib/crypto/c_src/openssl_config.h +@@ -122,7 +122,14 @@ + # endif + #endif + ++#ifdef HAS_LIBRESSL ++# if LIBRESSL_VERSION_NUMBER >= 0x3050000fL ++# define HAS_EVP_PKEY_CTX ++# define HAVE_EVP_CIPHER_CTX_COPY ++# endif ++#endif ++ + #ifndef HAS_LIBRESSL + # if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0) + # define HAS_EVP_PKEY_CTX -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 14:17:45 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 15:17:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: fix build with fmt >= 9.0.0 Message-ID: <20230223141745.303457-1-fontaine.fabrice@gmail.com> Fix the following build failure with fmt >= 9.0.0 raised since commit 5c83dc5451fb59ffa5cd40d30c4c532dd25e8333: /tmp/instance-5/output-1/build/gerbera-1.10.0/src/database/sql_database.cc:1688:26: required from here /tmp/instance-5/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/fmt/format.h:3973:36: error: passing 'const fmt::v9::formatter >, __gnu_cxx::__normal_iterator >, char>, char, void>::formatter_type' {aka 'const fmt::v9::formatter'} as 'this' argument discards qualifiers [-fpermissive] 3973 | out = value_formatter_.format(map(*it), ctx); | ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/56c46fa7e922360d2c4b4093f8a030cc83726799 Signed-off-by: Fabrice Fontaine --- .../gerbera/0001-Fix-build-with-fmt-9-0.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/gerbera/0001-Fix-build-with-fmt-9-0.patch diff --git a/package/gerbera/0001-Fix-build-with-fmt-9-0.patch b/package/gerbera/0001-Fix-build-with-fmt-9-0.patch new file mode 100644 index 0000000000..63ae8382a3 --- /dev/null +++ b/package/gerbera/0001-Fix-build-with-fmt-9-0.patch @@ -0,0 +1,36 @@ +From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001 +From: Felix Yan +Date: Fri, 19 Aug 2022 15:22:10 +0300 +Subject: [PATCH] Fix build with fmt 9.0 + +Fixes #2681 + +[Retrieved from: +https://github.com/gerbera/gerbera/commit/d7b8fafbc94405c20753fed569abd8878cccde89] +Signed-off-by: Fabrice Fontaine +--- + src/database/sql_format.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/database/sql_format.h b/src/database/sql_format.h +index 32dc00efa..e4e1909a8 100644 +--- a/src/database/sql_format.h ++++ b/src/database/sql_format.h +@@ -42,7 +42,7 @@ struct SQLIdentifier { + template <> + struct fmt::formatter : formatter { + template +- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end); + } +@@ -61,7 +61,7 @@ struct ColumnUpdate { + template <> + struct fmt::formatter : formatter { + template +- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{} = {}", a.column, a.value); + } -- 2.39.1 From sebastien.szymanski at armadeus.com Thu Feb 23 08:56:04 2023 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Thu, 23 Feb 2023 09:56:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/rt-tests: bump version to 2.5 Message-ID: <20230223085604.28572-1-sebastien.szymanski@armadeus.com> Signed-off-by: S?bastien Szymanski --- package/rt-tests/rt-tests.hash | 2 +- package/rt-tests/rt-tests.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rt-tests/rt-tests.hash b/package/rt-tests/rt-tests.hash index 49df8313f9..eb28f4d441 100644 --- a/package/rt-tests/rt-tests.hash +++ b/package/rt-tests/rt-tests.hash @@ -1,4 +1,4 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc -sha256 393457f0c91cce57e82b876ecb9b672871f898e6cecafc751548079512bcc808 rt-tests-2.4.tar.xz +sha256 2ed2e4c965c7f336a15d3354dec090e27a0b1e9ada91ae0b9ef18bbcb993874e rt-tests-2.5.tar.xz # locally computed hash sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk index 74290211ce..8ad4215ee1 100644 --- a/package/rt-tests/rt-tests.mk +++ b/package/rt-tests/rt-tests.mk @@ -6,7 +6,7 @@ RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 2.4 +RT_TESTS_VERSION = 2.5 RT_TESTS_LICENSE = GPL-2.0+ RT_TESTS_LICENSE_FILES = COPYING -- 2.39.2 From frank.vanbever at mind.be Thu Feb 23 15:01:41 2023 From: frank.vanbever at mind.be (Frank Vanbever) Date: Thu, 23 Feb 2023 16:01:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmodsecurity: bump to version 3.0.8 In-Reply-To: <20230115173240.81077-1-fontaine.fabrice@gmail.com> References: <20230115173240.81077-1-fontaine.fabrice@gmail.com> Message-ID: <2902185.e9J7NaK4W3@wintermute> Hi all, Any version of libmodsecurity < 3.0.8 is affected by CVE-2022-48279 [1] so this bump is also relevant for 2022.11.x (3.0.7) and 2022.02.x (3.0.6) I originally backported the fix from 3.0.8 to 3.0.7 and it comes in at just under 1MB. This rightfully triggered a quarantine in the mailing list and is a pretty good sign that a version bump might be a better course of action here. Best regards, Frank [1] https://nvd.nist.gov/vuln/detail/CVE-2022-48279 On zondag 15 januari 2023 18:32:40 CET Fabrice Fontaine wrote: > https://github.com/SpiderLabs/ModSecurity/releases/tag/v3.0.8 > > Signed-off-by: Fabrice Fontaine > --- > package/libmodsecurity/libmodsecurity.hash | 4 ++-- > package/libmodsecurity/libmodsecurity.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libmodsecurity/libmodsecurity.hash > b/package/libmodsecurity/libmodsecurity.hash index 087157d162..7ba0ef7f18 > 100644 > --- a/package/libmodsecurity/libmodsecurity.hash > +++ b/package/libmodsecurity/libmodsecurity.hash > @@ -1,4 +1,4 @@ > -# From > https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.7/modsecur > ity-v3.0.7.tar.gz.sha256 -sha256 > cfd8b7e7e6a0e9ca4e19b9adeb07594ba75eba16a66da5e9b0974c0117c21a34 > modsecurity-v3.0.7.tar.gz +# From > https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.8/modsecur > ity-v3.0.8.tar.gz.sha256 +sha256 > e241c89b3cd7e58a863d0d0d6b9b8ba4d33ffb0f51171044c258c62e3e7956c7 > modsecurity-v3.0.8.tar.gz # Localy calculated > sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 > LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk > b/package/libmodsecurity/libmodsecurity.mk index 916ba8fbcb..e83fda895f > 100644 > --- a/package/libmodsecurity/libmodsecurity.mk > +++ b/package/libmodsecurity/libmodsecurity.mk > @@ -4,7 +4,7 @@ > # > ########################################################################### > ##### > > -LIBMODSECURITY_VERSION = 3.0.7 > +LIBMODSECURITY_VERSION = 3.0.8 > LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz > LIBMODSECURITY_SITE = > https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURI > TY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES From fontaine.fabrice at gmail.com Thu Feb 23 15:32:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 16:32:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/cairo: fix pthread detection Message-ID: <20230223153236.914358-1-fontaine.fabrice@gmail.com> pthreads detection fails if a warning is emitted resulting in the following build failure with some toolchains: onfigure:34189: checking for cairo's pthread feature configure:34300: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm -lpthread >&5 /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker configure:34300: $? = 0 configure:34419: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm >&5 /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker configure:34419: $? = 0 configure:34500: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm >&5 /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker configure:34500: $? = 0 configure:34555: checking whether cairo's pthread feature could be enabled configure:34557: result: no (can't link with -lpthread or -pthread) [...] In file included from cairo-mutex-type-private.h:45, from cairo-scaled-font-private.h:45, from cairoint.h:434, from cairo-analysis-surface.c:37: cairo-mutex-impl-private.h:262:3: error: #error "XXX: No mutex implementation found. Cairo will not work with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile cairo without thread-safety support." 262 | # error "XXX: No mutex implementation found. Cairo will not work with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile cairo without thread-safety support." | ^~~~~ To avoid this build failure, add a patch that overrides this broken mechanism Fixes: - http://autobuild.buildroot.org/results/5420beaf94855e47eeb08627e8e3c169dc00419a Signed-off-by: Fabrice Fontaine --- ...e.ac.pthread-respect-enable-pthreads.patch | 59 +++++++++++++++++++ package/cairo/cairo.mk | 13 ++-- 2 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch diff --git a/package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch b/package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch new file mode 100644 index 0000000000..c350c596cf --- /dev/null +++ b/package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch @@ -0,0 +1,59 @@ +From 243fe7f3d51c23159e25f36adee7e953fee29f6c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 16:07:04 +0100 +Subject: [PATCH] build/configure.ac.pthread: respect --enable-pthreads + +Respect --enable-pthreads as pthreads detection fails if a warning is +emitted resulting in the following build failure with some toolchains: + +onfigure:34189: checking for cairo's pthread feature +configure:34300: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm -lpthread >&5 +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker +configure:34300: $? = 0 +configure:34419: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm >&5 +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker +configure:34419: $? = 0 +configure:34500: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm >&5 +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker +configure:34500: $? = 0 +configure:34555: checking whether cairo's pthread feature could be enabled +configure:34557: result: no (can't link with -lpthread or -pthread) + +[...] + +In file included from cairo-mutex-type-private.h:45, + from cairo-scaled-font-private.h:45, + from cairoint.h:434, + from cairo-analysis-surface.c:37: +cairo-mutex-impl-private.h:262:3: error: #error "XXX: No mutex implementation found. Cairo will not work with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile cairo without thread-safety support." + 262 | # error "XXX: No mutex implementation found. Cairo will not work with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile cairo without thread-safety support." + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/5420beaf94855e47eeb08627e8e3c169dc00419a + +Signed-off-by: Fabrice Fontaine +--- + build/configure.ac.pthread | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build/configure.ac.pthread b/build/configure.ac.pthread +index 29c930da9..084445587 100644 +--- a/build/configure.ac.pthread ++++ b/build/configure.ac.pthread +@@ -244,7 +244,8 @@ AC_DEFUN([CAIRO_CONFIGURE_PTHREAD],[dnl + + dnl Make sure we scored some pthreads. + if test "x$enable_pthread" = "xyes" -a "x$have_pthread" != "xyes"; then +- AC_MSG_ERROR([pthread requested but not found]) ++ AC_MSG_WARN([pthread requested but not found]) ++ have_pthread=yes + fi + + dnl Set the output variables for CAIRO_ENABLE. +-- +2.39.1 + diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index e8a704c7da..9034068403 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -11,6 +11,8 @@ CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 CAIRO_CPE_ID_VENDOR = cairographics CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES +# We're patching build/configure.ac.pthread +CAIRO_AUTORECONF = YES # 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch CAIRO_IGNORE_CVES += CVE-2018-19876 @@ -26,10 +28,6 @@ ifeq ($(BR2_m68k_cf),y) CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" -endif - # cairo can use C++11 atomics when available, so we need to link with # libatomic for the architectures who need libatomic. ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) @@ -70,6 +68,13 @@ HOST_CAIRO_DEPENDENCIES = \ host-pixman \ host-pkgconf +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +CAIRO_CONF_OPTS += --enable-pthread +else +CAIRO_CONF_OPTS += --disable-pthread +CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" +endif + # DirectFB svg support rely on Cairo and Cairo DirectFB support depends on # DirectFB. Break circular dependency by disabling DirectFB support in Cairo # (which is experimental) -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 16:07:14 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 17:07:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/xtables-addons: drop XTABLES_ADDONS_DISABLE_GEOIP_HELPERS Message-ID: <20230223160714.1210026-1-fontaine.fabrice@gmail.com> Drop XTABLES_ADDONS_DISABLE_GEOIP_HELPERS which raises the following build failure (probably since the addition of the package): make[3]: *** No rule to make target '/xt_geoip_query', needed by 'all-am'. Stop. unzip and perl don't seem to be needed Fixes: - http://autobuild.buildroot.org/results/f2d596b510f027b94a6b1fad10c363922c50cbec Signed-off-by: Fabrice Fontaine --- package/xtables-addons/xtables-addons.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 77dcfd741c..b656ab0e81 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -16,12 +16,6 @@ XTABLES_ADDONS_CONF_OPTS = \ --with-xtables="$(STAGING_DIR)/usr" \ --with-xtlibdir="/usr/lib/xtables" -# geoip helpers need perl with modules and unzip so disable -define XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - $(SED) 's/ geoip//' $(@D)/Makefile.in -endef -XTABLES_ADDONS_POST_PATCH_HOOKS += XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - define XTABLES_ADDONS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) endef -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 16:28:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 17:28:47 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/efivar: needs threads Message-ID: <20230223162847.9247-1-fontaine.fabrice@gmail.com> Add a thread dependency as Upstream quickly closed https://github.com/rhboot/efivar/pull/238 to fix the following build failure without threads raised since bump to version 38 in commit f24029b561fbda0953c7dbd93d2485b03873996d and https://github.com/rhboot/efivar/commit/cff88dd96b9d43e2c5875a24ba6180b196890ded: thread-test.c:14:10: fatal error: pthread.h: No such file or directory 14 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/f2da14f91dc602a32dd5b2b7bdf3d3aa43afa7f4 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Add a thread dependency package/efibootmgr/Config.in | 5 +++-- package/efivar/Config.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index 98ff71c996..5800e6c143 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_EFIBOOTMGR bool "efibootmgr" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS # efivar depends on !BR2_STATIC_LIBS # efivar + depends on BR2_TOOLCHAIN_HAS_THREADS # efivar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS @@ -15,9 +16,9 @@ config BR2_PACKAGE_EFIBOOTMGR https://github.com/rhboot/efibootmgr -comment "efibootmgr needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efibootmgr needs a toolchain w/ dynamic library, threads, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/package/efivar/Config.in b/package/efivar/Config.in index 74f2bb5abb..d4402dbcf7 100644 --- a/package/efivar/Config.in +++ b/package/efivar/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_EFIVAR depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # linux/nvme.h + depends on BR2_TOOLCHAIN_HAS_THREADS # linux/nvme.h has been renamed to linux/nvme_ioctl.h since 4.4, # and the efivar source handles that situation. However, some # Sourcery CodeBench toolchains use 4.4 kernel headers but they @@ -22,9 +23,9 @@ config BR2_PACKAGE_EFIVAR https://github.com/rhboot/efivar -comment "efivar needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efivar needs a toolchain w/ dynamic library, threads, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS -- 2.39.1 From geomatsi at gmail.com Thu Feb 23 16:47:47 2023 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Thu, 23 Feb 2023 19:47:47 +0300 Subject: [Buildroot] [PATCH 1/1] package/wpa_supplicant: fix builds with missing sha384 hash functions Message-ID: <20230223164747.1653580-1-geomatsi@gmail.com> SAE, unlike OWE or DPP, does not explicitly enable support for sha384 hash functions. Possible WPA3 build issue is masked, since all three SAE/OWE/DPP are included. However, there exist other configurations that enable only SAE. For instance, one such build configuration is wpa_supplicant AP mode with mesh support. This change adds upstream patch that includes sha384 and sha256 hash functions to builds with SAE support. Fixes: http://autobuild.buildroot.net/results/f349130985870f4a781cca56c3f551108f81aa3e/ Signed-off-by: Sergey Matyukevich --- ...384-512-KDF-for-SAE-if-SHA384-512-is.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch diff --git a/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch b/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch new file mode 100644 index 0000000000..d85e343380 --- /dev/null +++ b/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch @@ -0,0 +1,62 @@ +From c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sun, 17 Apr 2022 12:28:41 +0300 +Subject: [PATCH] Include HMAC-SHA384/512 KDF for SAE if SHA384/512 is included + +It was possible to miss the HMAC functions if some other build +configuration parameters ended up setting NEED_SHA384/512=y. + +Upstream: https://w1.fi/cgit/hostap/commit/?id=c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 +Signed-off-by: Jouni Malinen +--- + wpa_supplicant/Android.mk | 11 +++++++++++ + wpa_supplicant/Makefile | 11 +++++++++++ + 2 files changed, 22 insertions(+) + +diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk +index 0e0ce467c..bcdbd6c90 100644 +--- a/wpa_supplicant/Android.mk ++++ b/wpa_supplicant/Android.mk +@@ -1361,6 +1361,17 @@ endif + endif + endif + ++ifdef CONFIG_SAE ++ifdef NEED_SHA384 ++# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. ++NEED_HMAC_SHA384_KDF=y ++endif ++ifdef NEED_SHA512 ++# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. ++NEED_HMAC_SHA512_KDF=y ++endif ++endif ++ + SHA256OBJS = # none by default + L_CFLAGS += -DCONFIG_SHA256 + ifneq ($(CONFIG_TLS), openssl) +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index ed49aa972..69c80121c 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -1475,6 +1475,17 @@ endif + endif + endif + ++ifdef CONFIG_SAE ++ifdef NEED_SHA384 ++# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. ++NEED_HMAC_SHA384_KDF=y ++endif ++ifdef NEED_SHA512 ++# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. ++NEED_HMAC_SHA512_KDF=y ++endif ++endif ++ + SHA256OBJS = # none by default + CFLAGS += -DCONFIG_SHA256 + ifneq ($(CONFIG_TLS), openssl) +-- +2.39.2 + -- 2.39.2 From vincent.stehle at arm.com Thu Feb 23 18:08:45 2023 From: vincent.stehle at arm.com (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Thu, 23 Feb 2023 19:08:45 +0100 Subject: [Buildroot] [PATCH 0/2] Bump Arm Foundation Message-ID: <20230223180847.2512056-1-vincent.stehle@arm.com> Hi, Here are a couple of patches to bump boot-wrapper and the arm_foundationv8_defconfig. They should be applied in order, please. The updated model version mentioned in the second patch will not run the older boot-wrapper "as is"; it would need option `--arm-v8.0' for example. Best regards, Vincent. Vincent Stehl? (2): boot/boot-wrapper-aarch64: bump version configs/arm_foundationv8: bump to Linux 6.1.13 board/arm/foundation-v8/readme.txt | 4 ++-- boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +- configs/arm_foundationv8_defconfig | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) -- 2.39.1 From vincent.stehle at arm.com Thu Feb 23 18:08:46 2023 From: vincent.stehle at arm.com (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Thu, 23 Feb 2023 19:08:46 +0100 Subject: [Buildroot] [PATCH 1/2] boot/boot-wrapper-aarch64: bump version In-Reply-To: <20230223180847.2512056-1-vincent.stehle@arm.com> References: <20230223180847.2512056-1-vincent.stehle@arm.com> Message-ID: <20230223180847.2512056-2-vincent.stehle@arm.com> Bump boot-wrapper to the latest version. Signed-off-by: Vincent Stehl? Cc: Thomas Petazzoni --- boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index 30b352f8e7..95f7e22760 100644 --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a +BOOT_WRAPPER_AARCH64_VERSION = 9f26a1c1f27bd6b5b66c265114848007fc22e4aa BOOT_WRAPPER_AARCH64_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git BOOT_WRAPPER_AARCH64_SITE_METHOD = git BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause -- 2.39.1 From vincent.stehle at arm.com Thu Feb 23 18:08:47 2023 From: vincent.stehle at arm.com (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Thu, 23 Feb 2023 19:08:47 +0100 Subject: [Buildroot] [PATCH 2/2] configs/arm_foundationv8: bump to Linux 6.1.13 In-Reply-To: <20230223180847.2512056-1-vincent.stehle@arm.com> References: <20230223180847.2512056-1-vincent.stehle@arm.com> Message-ID: <20230223180847.2512056-3-vincent.stehle@arm.com> - Bump Linux kernel to v6.1.13 and increase the rootfs size accordingly. - Bump the FVP in the readme to version 11.20 build 15 and update the command line. Signed-off-by: Vincent Stehl? Cc: Masahiro Yamada --- board/arm/foundation-v8/readme.txt | 4 ++-- configs/arm_foundationv8_defconfig | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/board/arm/foundation-v8/readme.txt b/board/arm/foundation-v8/readme.txt index b5106f015e..cb0fe08b87 100644 --- a/board/arm/foundation-v8/readme.txt +++ b/board/arm/foundation-v8/readme.txt @@ -3,14 +3,14 @@ ARM software simulator of the AArch64 architecture. First, one has to download the AArch64 software simulator from: - https://silver.arm.com/download/download.tm?pv=4807186 + https://armkeil.blob.core.windows.net/developer/Files/downloads/ecosystem-models/Foundation_Platform_11.20_15_Linux64.tgz Then, use the arm_foundationv8_defconfig configuration to build your Buildroot system. Finally, boot your system with: - ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-6.4/Foundation_Platform \ + ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-9.3/Foundation_Platform \ --image output/images/linux-system.axf \ --block-device output/images/rootfs.ext2 \ --network=nat \ diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig index 3c63f5dc76..102fe8fd09 100644 --- a/configs/arm_foundationv8_defconfig +++ b/configs/arm_foundationv8_defconfig @@ -1,15 +1,16 @@ BR2_aarch64=y -# Linux headers same as kernel, a 5.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.20" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.13" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8-gicv3-psci" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BOOT_WRAPPER_AARCH64=y BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8-gicv3-psci" -- 2.39.1 From peter at korsgaard.com Thu Feb 23 19:02:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:02:31 +0100 Subject: [Buildroot] [PATCH next v2 1/7] package/python-idna: set _SETUP_TYPE = flit In-Reply-To: <7b2f79e7-0880-f210-5c35-d58f7dfaf367@othermo.de> (Marcus Hoffmann via buildroot's message of "Wed, 21 Dec 2022 23:21:26 +0100") References: <20221122203130.184496-1-ju.o@free.fr> <7b2f79e7-0880-f210-5c35-d58f7dfaf367@othermo.de> Message-ID: <87zg94p5mg.fsf@dell.be.48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > On 22.11.22 21:31, Julien Olivain wrote: >> Python idna package switched to pyproject.toml in commit: >> https://github.com/kjd/idna/commit/2a00e518efe55d2eeb62cd3f88ace7db41338603 >> which is included in idna v3.4. >> >> When using the old setuptools infra, the package is incorrectly >> installed as v0.0, which is then incorrectly detected by other >> packages when using setuptools pkg_resources. >> >> The issue can be reproduced with the command: >> >> python3 <> __requires__ = ["idna >= 2.5"] >> import pkg_resources >> EOF >> >> which will fail with output: >> >> pkg_resources.ContextualVersionConflict: (idna 0.0.0 >> (/usr/lib/python3.11/site-packages), Requirement.parse('idna>=2.5'), >> {'hyperlink'}) >> pkg_resources.DistributionNotFound: The 'idna>=2.5' >> distribution was not found and is required by hyperlink >> >> This commit changes _SETUP_TYPE to "flit" to fix this issue. >> >> Signed-off-by: Julien Olivain > Reviewed-by: Marcus Hoffmann Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 23 19:03:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:03:22 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: correct check for open perl module In-Reply-To: <20230207113647.F360184086@busybox.osuosl.org> (Peter Korsgaard's message of "Tue, 7 Feb 2023 12:35:46 +0100") References: <20230207113647.F360184086@busybox.osuosl.org> Message-ID: <87v8jsp5l1.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=b63e155e5fb7104e6660aa0570befa9498259cd7 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Commit 4cdd99190e89 (support/dependencies/dependencies.sh: require open perl > package for libxcrypt) added a check for the "open" perl module for > libxcrypt, but it does not work as "open" cannot be directly used with > "require" as an argument is needed: > perl -e "require open" > Not enough arguments for open at -e line 1, at EOF > Execution of -e aborted due to compilation errors. > So special case the check to instead check with "use open ':std'". > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 23 19:03:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:03:06 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: correct check for open perl module Message-ID: <20230223190725.A71E786927@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00cbf0095cdc1da96ddd1d991ac1e5979bd05d08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit 4cdd99190e89 (support/dependencies/dependencies.sh: require open perl package for libxcrypt) added a check for the "open" perl module for libxcrypt, but it does not work as "open" cannot be directly used with "require" as an argument is needed: perl -e "require open" Not enough arguments for open at -e line 1, at EOF Execution of -e aborted due to compilation errors. So special case the check to instead check with "use open ':std'". Signed-off-by: Peter Korsgaard (cherry picked from commit b63e155e5fb7104e6660aa0570befa9498259cd7) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 683bb5cb7e..cd0e900ff6 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -280,10 +280,6 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl -if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then - required_perl_modules="$required_perl_modules open" -fi - if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" @@ -300,6 +296,13 @@ fi # This variable will keep the modules that are missing in your system. missing_perl_modules="" +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + # open cannot be used with require + if ! perl -e "use open ':std'" > /dev/null 2>&1 ; then + missing_perl_modules="$missing_perl_modules open" + fi +fi + for pm in $required_perl_modules ; do if ! perl -e "require $pm" > /dev/null 2>&1 ; then missing_perl_modules="$missing_perl_modules $pm" From peter at korsgaard.com Thu Feb 23 19:08:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:08:20 +0100 Subject: [Buildroot] [git commit] package/dahdi-linux: update URL in Config.in help text In-Reply-To: <20230207134415.6E95E84194@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Tue, 7 Feb 2023 14:44:02 +0100") References: <20230207134415.6E95E84194@busybox.osuosl.org> Message-ID: <87r0ugp5cr.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=e06975b38047fe1ef47650248f154ecf88fe09b5 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > http://www.asterisk.org/downloads/dahdi no longer works, use the > Github page instead. > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 23 19:03:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:03:02 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: correct check for open perl module Message-ID: <20230223190839.A459F86931@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df702ada1056305086fbd9f36e9cdf2092b19704 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit 4cdd99190e89 (support/dependencies/dependencies.sh: require open perl package for libxcrypt) added a check for the "open" perl module for libxcrypt, but it does not work as "open" cannot be directly used with "require" as an argument is needed: perl -e "require open" Not enough arguments for open at -e line 1, at EOF Execution of -e aborted due to compilation errors. So special case the check to instead check with "use open ':std'". Signed-off-by: Peter Korsgaard (cherry picked from commit b63e155e5fb7104e6660aa0570befa9498259cd7) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 683bb5cb7e..cd0e900ff6 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -280,10 +280,6 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl -if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then - required_perl_modules="$required_perl_modules open" -fi - if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" @@ -300,6 +296,13 @@ fi # This variable will keep the modules that are missing in your system. missing_perl_modules="" +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + # open cannot be used with require + if ! perl -e "use open ':std'" > /dev/null 2>&1 ; then + missing_perl_modules="$missing_perl_modules open" + fi +fi + for pm in $required_perl_modules ; do if ! perl -e "require $pm" > /dev/null 2>&1 ; then missing_perl_modules="$missing_perl_modules $pm" From peter at korsgaard.com Thu Feb 23 19:01:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:01:20 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/python-idna: set _SETUP_TYPE = flit Message-ID: <20230223190839.995CC86930@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3dad2c0c146157fe6256af69ee39b7af90a8f5ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Python idna package switched to pyproject.toml in commit: https://github.com/kjd/idna/commit/2a00e518efe55d2eeb62cd3f88ace7db41338603 which is included in idna v3.4. When using the old setuptools infra, the package is incorrectly installed as v0.0, which is then incorrectly detected by other packages when using setuptools pkg_resources. The issue can be reproduced with the command: python3 <= 2.5"] import pkg_resources EOF which will fail with output: pkg_resources.ContextualVersionConflict: (idna 0.0.0 (/usr/lib/python3.11/site-packages), Requirement.parse('idna>=2.5'), {'hyperlink'}) pkg_resources.DistributionNotFound: The 'idna>=2.5' distribution was not found and is required by hyperlink This commit changes _SETUP_TYPE to "flit" to fix this issue. Signed-off-by: Julien Olivain Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit 8a9da9a8cad5f77902547fab3b24d04175749a7c) Signed-off-by: Peter Korsgaard --- package/python-idna/python-idna.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 4d9994a9c7..3976cb1518 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -9,7 +9,7 @@ PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/8b/e1/43beb3d38dba6cb420cefa297822eac205a277ab43e5ba5d5c46faf96438 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md -PYTHON_IDNA_SETUP_TYPE = setuptools +PYTHON_IDNA_SETUP_TYPE = flit $(eval $(python-package)) $(eval $(host-python-package)) From peter at korsgaard.com Thu Feb 23 19:09:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:09:09 +0100 Subject: [Buildroot] [git commit] package/pkg-generic.mk: only check for virtual package conflicts when building In-Reply-To: <20230207135235.D0949841B7@busybox.osuosl.org> (Peter Korsgaard's message of "Tue, 7 Feb 2023 14:52:27 +0100") References: <20230207135235.D0949841B7@busybox.osuosl.org> Message-ID: <87mt54p5be.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=7231701a290ba447fde9807ba9d260022ddfc8e4 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The configuration checks should only be done when building so that > make allyespackageconfig && make source works. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 23 19:09:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:09:14 +0100 Subject: [Buildroot] [git commit] package/mesa3d-headers: only check for conflicts when building In-Reply-To: <20230207135235.C34CC841B6@busybox.osuosl.org> (Peter Korsgaard's message of "Tue, 7 Feb 2023 14:52:26 +0100") References: <20230207135235.C34CC841B6@busybox.osuosl.org> Message-ID: <87ilfsp5b9.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=509956da4cdba6a76214322b1ace979bbe6cd6a8 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The configuration checks should only be done when building so that > make allyespackageconfig && make source works. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 23 19:08:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:08:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/dahdi-linux: update URL in Config.in help text Message-ID: <20230223190957.ABAC18694A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efd9ca6df67298ed1b60fd05d9d2d783dee1bd98 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x http://www.asterisk.org/downloads/dahdi no longer works, use the Github page instead. Signed-off-by: Thomas Petazzoni (cherry picked from commit e06975b38047fe1ef47650248f154ecf88fe09b5) Signed-off-by: Peter Korsgaard --- package/dahdi-linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dahdi-linux/Config.in b/package/dahdi-linux/Config.in index 7b6ce79422..b6086fdc6c 100644 --- a/package/dahdi-linux/Config.in +++ b/package/dahdi-linux/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_DAHDI_LINUX DAHDI Linux is the open source device driver framework used to interface Asterisk with telephony hardware. - http://www.asterisk.org/downloads/dahdi + https://github.com/asterisk/dahdi-linux comment "dahdi-linux needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL From peter at korsgaard.com Thu Feb 23 19:08:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:08:49 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pkg-generic.mk: only check for virtual package conflicts when building Message-ID: <20230223190957.C506F8694D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=421f58cfa996a27d85b01775521b3c52125de264 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard (cherry picked from commit 7231701a290ba447fde9807ba9d260022ddfc8e4) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a88934b866..6c3b64b4c8 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1182,10 +1182,12 @@ ifeq ($$($$($(2)_KCONFIG_VAR)),y) # Ensure the calling package is the declared provider for all the virtual # packages it claims to be an implementation of. +ifeq ($(BR_BUILDING),y) ifneq ($$($(2)_PROVIDES),) $$(foreach pkg,$$($(2)_PROVIDES),\ $$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep))) endif +endif # Register package as a reverse-dependencies of all its dependencies $$(eval $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),\ From peter at korsgaard.com Thu Feb 23 19:08:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:08:32 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/mesa3d-headers: only check for conflicts when building Message-ID: <20230223190957.B896E8694B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f5a9f375ecbe6adf83966e646f460f12ccac54f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard (cherry picked from commit 509956da4cdba6a76214322b1ace979bbe6cd6a8) Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 871cf2f495..abfa0e9b55 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -6,7 +6,7 @@ # mesa3d-headers is inherently incompatible with mesa3d, so error out # if both are enabled. -ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yy) +ifeq ($(BR_BUILDING)$(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yyy) $(error mesa3d-headers enabled, but mesa3d enabled too) endif From peter at korsgaard.com Thu Feb 23 19:08:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:08:38 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/mesa3d-headers: only check for conflicts when building Message-ID: <20230223191106.09CE58696A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81b082a4fe581fe3729b0eb4155a2781f99be2fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard (cherry picked from commit 509956da4cdba6a76214322b1ace979bbe6cd6a8) Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 3712c79db0..83830ba23b 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -6,7 +6,7 @@ # mesa3d-headers is inherently incompatible with mesa3d, so error out # if both are enabled. -ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yy) +ifeq ($(BR_BUILDING)$(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yyy) $(error mesa3d-headers enabled, but mesa3d enabled too) endif From peter at korsgaard.com Thu Feb 23 19:08:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:08:44 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/pkg-generic.mk: only check for virtual package conflicts when building Message-ID: <20230223191106.16D4D8697C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc12f089b6f102b97497c287fa44e2ce5707639e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard (cherry picked from commit 7231701a290ba447fde9807ba9d260022ddfc8e4) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b31c563ae5..f9c0ea71e1 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1182,10 +1182,12 @@ ifeq ($$($$($(2)_KCONFIG_VAR)),y) # Ensure the calling package is the declared provider for all the virtual # packages it claims to be an implementation of. +ifeq ($(BR_BUILDING),y) ifneq ($$($(2)_PROVIDES),) $$(foreach pkg,$$($(2)_PROVIDES),\ $$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep))) endif +endif # Register package as a reverse-dependencies of all its dependencies $$(eval $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),\ From peter at korsgaard.com Thu Feb 23 19:07:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:07:56 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/dahdi-linux: update URL in Config.in help text Message-ID: <20230223191105.F32D686968@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3ed1e376b5ba51c129ccd09bc56104073525037 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x http://www.asterisk.org/downloads/dahdi no longer works, use the Github page instead. Signed-off-by: Thomas Petazzoni (cherry picked from commit e06975b38047fe1ef47650248f154ecf88fe09b5) Signed-off-by: Peter Korsgaard --- package/dahdi-linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dahdi-linux/Config.in b/package/dahdi-linux/Config.in index 7b6ce79422..b6086fdc6c 100644 --- a/package/dahdi-linux/Config.in +++ b/package/dahdi-linux/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_DAHDI_LINUX DAHDI Linux is the open source device driver framework used to interface Asterisk with telephony hardware. - http://www.asterisk.org/downloads/dahdi + https://github.com/asterisk/dahdi-linux comment "dahdi-linux needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL From arnout at mind.be Thu Feb 23 19:18:32 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 23 Feb 2023 20:18:32 +0100 Subject: [Buildroot] [PATCH] package/rauc-hawkbit-updater: new package In-Reply-To: References: <20230208185516.858096-1-colin.foster@in-advantage.com> Message-ID: On 21/02/2023 22:36, Colin Foster wrote: > On Wed, Feb 08, 2023 at 10:55:16AM -0800, Colin Foster wrote: >> Add useful tool for bridging RAUC with the Hawkbit API. >> >> Signed-off-by: Colin Foster > > I'm just sending this follow up to see if it fell through the cracks. > I can re-send otherwise. No, it's still in patchwork [1] along with 286 other patches, so we'll get around to it at some point. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20230208185516.858096-1-colin.foster at in-advantage.com/ > > I think Eric's email bounced, so hopefully that isn't the issue. > >> --- >> package/Config.in | 1 + >> package/rauc-hawkbit-updater/Config.in | 14 ++++++++++++++ >> .../rauc-hawkbit-updater.hash | 3 +++ >> .../rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 15 +++++++++++++++ >> 4 files changed, 33 insertions(+) >> create mode 100644 package/rauc-hawkbit-updater/Config.in >> create mode 100644 package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash >> create mode 100644 package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk >> >> diff --git a/package/Config.in b/package/Config.in >> index 511e691ed3..84e5efa856 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -2677,6 +2677,7 @@ menu "System tools" >> source "package/quota/Config.in" >> source "package/quotatool/Config.in" >> source "package/rauc/Config.in" >> + source "package/rauc-hawkbit-updater/Config.in" >> source "package/rsyslog/Config.in" >> source "package/runc/Config.in" >> source "package/s390-tools/Config.in" >> diff --git a/package/rauc-hawkbit-updater/Config.in b/package/rauc-hawkbit-updater/Config.in >> new file mode 100644 >> index 0000000000..bd7b8d7cf5 >> --- /dev/null >> +++ b/package/rauc-hawkbit-updater/Config.in >> @@ -0,0 +1,14 @@ >> +config BR2_PACKAGE_RAUC_HAWKBIT_UPDATER >> + bool "rauc-hawkbit-updater" >> + depends on BR2_PACKAGE_RAUC >> + depends on BR2_PACKAGE_JSON_GLIB >> + help >> + rauc-hawkbit-updater is a link between Pengutronix >> + RAUC and the Eclipse Hawkbit API. Hawkbit can >> + communicate to remote update servers, and use the >> + d-bus interface to trigger updates from RAUC. >> + >> + http://rauc.io/ >> + >> +comment "rauc-hawkbit-updater needs rauc and json-glib" >> + depends on !BR2_PACKAGE_RAUC || !BR2_PACKAGE_JSON_GLIB >> diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash >> new file mode 100644 >> index 0000000000..c65ead3784 >> --- /dev/null >> +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash >> @@ -0,0 +1,3 @@ >> +# Locally calculated >> +sha256 42318e96a464e6c716edb45c48bd3ec3b874462973db902fbe099a395e4acb4b rauc-hawkbit-updater-1.3.tar.xz >> +sha256 041234c81fd6fe6c531ea1a886b9e740b9ee06759d1a910a14edbd06f4aa62c7 LICENSE >> diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk >> new file mode 100644 >> index 0000000000..5a74181361 >> --- /dev/null >> +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk >> @@ -0,0 +1,15 @@ >> +############################################################################### >> +# >> +# rauc-hawkbit-updater >> +# >> +############################################################################### >> + >> +RAUC_HAWKBIT_UPDATER_VERSION = 1.3 >> +RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/releases/download/v$(RAUC_HAWKBIT_UPDATER_VERSION) >> +RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz >> +RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 >> +RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE >> +RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix >> +RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib >> + >> +$(eval $(meson-package)) >> -- >> 2.25.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 arnout at mind.be Thu Feb 23 19:24:17 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 23 Feb 2023 20:24:17 +0100 Subject: [Buildroot] [PATCH RFC,1/1] package/gcc: fix GCC_DL_DIR In-Reply-To: <20230222150449.2005824-1-fontaine.fabrice@gmail.com> References: <20230222150449.2005824-1-fontaine.fabrice@gmail.com> Message-ID: <7a565459-473d-a5c4-cf25-13f688e2a295@mind.be> On 22/02/2023 16:04, Fabrice Fontaine wrote: > GCC_DL_DIR is empty as gcc is not a "real" package, as a result, the > following (silent) error is raised when BR2_CCACHE is set: > > /home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/bin/ccache /usr/bin/gcc -O2 -I/home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/include -DBR_CROSS_PATH_SUFFIX='".br_real"' -DBR_CCACHE_HASH=\"` printf '%s\n' --target=aarch64_be-buildroot-linux-gnu --with-sysroot=@HOST_DIR@/aarch64_be-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto --with-gmp=@HOST_DIR@ --with-mpc=@HOST_DIR@ --with-mpfr=@HOST_DIR@ --with-bugurl="http://bugs.buildroot.net/" --without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads --without-isl --without-cloog --with-abi="lp64" --with-cpu=cortex-a53 --enable-languages=c --disable-shared --without-headers --disable-threads --with-newlib --disable-largefile | sha256sum - /gcc-11.3.0.tar.xz package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch package/ > gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch | cut -c -64 | tr -d '\n'`\" -DBR_SYSROOT='"aarch64_be-buildroot-linux-gnu/sysroot"' -DBR_ADDITIONAL_CFLAGS='"-Wl,-z,max-page-size=65536", "-Wl,-z,common-page-size=65536", "-fstack-protector-strong",' -DBR_CCACHE -DBR2_RELRO_PARTIAL -s -Wl,--hash-style=both toolchain/toolchain-wrapper.c -o /home/thomas/autobuild/instance-0/output-1/build/host-gcc-initial-11.3.0/toolchain-wrapper > sha256sum: /gcc-11.3.0.tar.xz: No such file or directory > > This patch replaces GCC_DL_DIR by HOST_GCC_INITIAL_DL_DIR. As, this can > be considered as a "hack", any comment to improve this patch is > appreciated > > Fixes: > - Found when investigating: http://autobuild.buildroot.org/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd > > Signed-off-by: Fabrice Fontaine > --- > package/gcc/gcc.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk > index 6dfd93f2a4..0755b59e96 100644 > --- a/package/gcc/gcc.mk > +++ b/package/gcc/gcc.mk > @@ -284,7 +284,7 @@ HOST_GCC_COMMON_MAKE_OPTS = \ > gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) > > ifeq ($(BR2_CCACHE),y) > -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(GCC_DL_DIR)/$(GCC_SOURCE) > +HOST_GCC_COMMON_CCACHE_HASH_FILES += $(HOST_GCC_INITIAL_DL_DIR)/$(GCC_SOURCE) How about HOST_GCC_COMMON_CCACHE_HASH_FILES += $($(PKG)_DL_DIR)/$(GCC_SOURCE) ? Regards, Arnout > > # Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned > # and unversioned patches unconditionally. Moreover, to facilitate the From AdamG at esdemc.com Thu Feb 23 19:27:03 2023 From: AdamG at esdemc.com (Adam Gausmann) Date: Thu, 23 Feb 2023 13:27:03 -0600 Subject: [Buildroot] [PATCH v2 1/1] add package/python-pyqtchart In-Reply-To: <11b5699c-ebc7-7a6c-e8f8-c3824fe166d3@mind.be> References: <20220518213933.2475-1-adamg@esdemc.com> <11b5699c-ebc7-7a6c-e8f8-c3824fe166d3@mind.be> Message-ID: (Apologies to Arnout; I forgot to click reply-all) Hi Arnout, thanks for the review; On Tue, Feb 7, 2023 at 4:55 AM Arnout Vandecappelle wrote: > > +# > > +################################################################################ > > + > > +PYTHON_PYQTCHART_VERSION = 5.7 > > Why this ancient version released 7 years ago? > > +PYTHON_PYQTCHART_SOURCE = PyQtChart_gpl-$(PYTHON_PYQTCHART_VERSION).tar.gz > > +PYTHON_PYQTCHART_SITE = http://downloads.sourceforge.net/project/pyqt/PyQtChart/PyQtChart-$(PYT HON_PYQTCHART_VERSION) > > As mentioned earlier, better download from pypi Keep in mind, I wrote this almost a year ago! This is the version and site that was used for python-pyqt5 back then. I will certainly update these in the next revision of the patch. > Wouldn't it make more sense to call this python-pyqt5chart, given that there's > python-pyqt5, and that there's PyQt6-Charts? Normally we prefer to use the > upstream name, which is pyqtchart (or PyQt-Charts or PyQtChart, depending on > where you look), but in this case I feel OK calling it python-pyqt5chart. The PyPI packages are "PyQtChart" (The original/legacy name for the Qt5 version) and "PyQt6-Charts"; the download page refers to them as "PyQt-Charts for PyQt5" and "PyQt-Charts for PyQt6". (https://www.riverbankcomputing.com/software/pyqtchart/download) My suggestion is to keep it the same as the official PyPI packages; either keep the legacy name "PyQtChart" (python-pyqtchart) or if you want to include the version number, retroactively use the naming scheme from "PyQt6-Charts" to make "PyQt5-Charts" (python-pyqt5-charts). However, I don't have a strong preference; I'll use whatever name works best for you all. Thanks, Adam From arnout at mind.be Thu Feb 23 19:39:18 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 23 Feb 2023 20:39:18 +0100 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: References: <40f9568e5843d49c2afd808bec856bde@umbiko.net> Message-ID: <03da8459-7360-1391-7e64-86d3fd75f145@mind.be> On 23/02/2023 10:13, Alberto Fahrenkrog wrote: > Hi all, I'm slowly getting ahead with this, and I still have a few more questions... > > I'm trying to get a tar.gz file from a git repo, which needs authentication. The > command that works manually is: > /wget https://outwebsite.com/koala/archive/release1.2.3.tar.gz --header > 'Authorization: token MY_TOKEN'/ > / > / > And the .mk file is configured as: > PYTHON_KOALA_SITE_METHOD?= wget > PYTHON_KOALA_DL_OPTS?= --header 'Authorization: token MY_TOKEN' Since commit 3f2bdd0701de4f2bca7e6d96f96972e7bcabdd93 (by Yann, in Cc), it is necessary to twice-quote the arguments to wget (and wget only). So PYTHON_KOALA_DL_OPTS = --header "'Authorization: token MY_TOKEN'" Yann, I honestly don't understand why this eval is needed, instead of simply passing BR2_HG unquoted... But I didn't look too deeply into it. Regards, Arnout > PYTHON_KOALA_SITE?= https://outwebsite.com/koala/archive/ > > > The .mk file is being read correctly, but I can't figure out how to use DL_OPTS. > The manual says DL_OPTS is a space separated list, but i see wget tries to use > "token" or "MY_TOKEN" as the address. I tried a few different combinations of > inverted commas, but none worked. > > Thanks again, > > Alberto > / > / > / > / > Alberto??Fahrenkrog > > Senior?Embedded?Engineer > > Orica???Perth?Technology?Centre > > p:?+61?(0)?8?6365?4056 > > e: *Alberto.Fahrenkrog at rigtechnologies.com.au* > > > -------------------------------------------------------------------------------- > *From:* Alberto Fahrenkrog > *Sent:* Thursday, February 23, 2023 3:13 PM > *To:* buildroot at buildroot.org > *Subject:* Re: [Buildroot] [Help] Struggling to build external python package on > out of tree build > Ok, I see now that external.mk is explained in chapter 9. I jumped straight to > chapter 18 and missed external.mk completely. And for some reason I never found > external.mk on my google searches. > > Thanks all for your help! > > Cheers, > > Alberto > -------------------------------------------------------------------------------- > *From:* buildroot on behalf of Alberto > Fahrenkrog > *Sent:* Thursday, February 23, 2023 3:09 PM > *To:* buildroot at buildroot.org > *Subject:* Re: [Buildroot] [Help] Struggling to build external python package on > out of tree build > > You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. Learn > why this is important > > > Hi Andreas, > > Thank you so much! That did it! Where in the manual is external.mk explained? I > missed it for sure... > > Cheers, > > Alberto > Alberto??Fahrenkrog > > Senior?Embedded?Engineer > > Orica???Perth?Technology?Centre > > p:?+61?(0)?8?6365?4056 > > e: *Alberto.Fahrenkrog at rigtechnologies.com.au* > > > -------------------------------------------------------------------------------- > *From:* buildroot on behalf of Andreas Ziegler > > *Sent:* Thursday, February 23, 2023 2:49 PM > *To:* Alberto Fahrenkrog > *Cc:* buildroot at buildroot.org > *Subject:* Re: [Buildroot] [Help] Struggling to build external python package on > out of tree build > [You don't often get email from br015 at umbiko.net. Learn why this is important at > https://aka.ms/LearnAboutSenderIdentification > ] > > Hi Alberto, > > On 2023-02-23 04:47, Alberto Fahrenkrog wrote: >> Update, >> >> if I change? $(eval $(python-koala)) to $(eval $(python-package)) I >> still get the same error. I assume that might have been one mistake. >> >> Cheers, >> >> Alberto >> >> Alberto Fahrenkrog Senior Embedded Engineer >> Orica - Perth Technology Centre >> p: +61 (0) 8 6365 4056 >> e: Alberto.Fahrenkrog at rigtechnologies.com.au >> ________________________________ >> From: buildroot on behalf of Alberto >> Fahrenkrog >> Sent: Thursday, February 23, 2023 12:42 PM >> To: buildroot at buildroot.org >> Subject: [Buildroot] [Help] Struggling to build external python package >> on out of tree build >> >> You don't often get email from >> alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is >> important > >> Hello all, >> >> I'm trying to build a very simple custom python package following the >> instructions on the manual, yet I must be doing something very wrong as >> I get this result: >> >> $ make python-koala >> make[1]: *** No rule to make target 'python-koala'.? Stop. >> make: *** [Makefile:23: _all] Error 2 >> >> I create my out of tree build with: >> make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build >> O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads >> br_build_defconfig >> >> On my "br_build" folder I have a Config.in file: >> menu "Python-Libs" >>???? source "~/Projects/br_build/package/python-koala/Config.in" >> endmenu > > Similar to the include file for configs, you also need an external.mk > file for the project make files, with this content: > > ?? include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) > > Otherwise your .mk files will not be picked up. > >> In "br_build/packages/python-koala/Config.in" > > The package directory is usually named 'package', not sure if this is > relevant (but Config.in /external.mk have to match it). > >> config BR2_PACKAGE_PYTHON_KOALA >> ??????bool "python-koala" >>?? depends on BR2_PACKAGE_PYTHON3 >> ??????help >> ??????? Python implementation of Koala Library >> >> In "br_build/packages/python-koala/python-koala.mk" >> ################################################################################ >> # >> # python-koala >> # >> ################################################################################ >> >> PYTHON_KOALA_VERSION = 1.3.3 >> PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz >> PYTHON_KOALA_SITE = >> https://mywebsite.com.au/ExternalCode/koala/archive/ > >> PYTHON_KOALA_SETUP_TYPE = setuptools >> >> $(eval $(python-koala)) >> >> If I run "make menuconfig" I can select or deselect the package, and >> it's selected per default on the br_build_defconfig (and in .config): >> BR2_PACKAGE_PYTHON_KOALA=y >> >> But if I try to run "make python-koala" I get the "no target" error. >> I'll still have a read and see what I might be doing wrong, but I'm >> very confused. Any ideas are very welcome. >> >> Cheers, >> >> Alberto > > > > Kind regards, > Andreas > _______________________________________________ > 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 yann.morin.1998 at free.fr Thu Feb 23 19:54:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 23 Feb 2023 20:54:09 +0100 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: <03da8459-7360-1391-7e64-86d3fd75f145@mind.be> References: <40f9568e5843d49c2afd808bec856bde@umbiko.net> <03da8459-7360-1391-7e64-86d3fd75f145@mind.be> Message-ID: <20230223195409.GM2718518@scaer> Arnout, All, On 2023-02-23 20:39 +0100, Arnout Vandecappelle spake thusly: > On 23/02/2023 10:13, Alberto Fahrenkrog wrote: > >Hi all, I'm slowly getting ahead with this, and I still have a few more questions... > > > >I'm trying to get a tar.gz file from a git repo, which needs > >authentication. The command that works manually is: > >/wget https://outwebsite.com/koala/archive/release1.2.3.tar.gz --header > >'Authorization: token MY_TOKEN'/ > >/ > >/ > >And the .mk file is configured as: > >PYTHON_KOALA_SITE_METHOD?= wget > >PYTHON_KOALA_DL_OPTS?= --header 'Authorization: token MY_TOKEN' > > Since commit 3f2bdd0701de4f2bca7e6d96f96972e7bcabdd93 (by Yann, in Cc), it > is necessary to twice-quote the arguments to wget (and wget only). So Oh dang, a commit from 7 years ago... ;-) > PYTHON_KOALA_DL_OPTS = --header "'Authorization: token MY_TOKEN'" > > Yann, I honestly don't understand why this eval is needed, instead of > simply passing BR2_HG unquoted... But I didn't look too deeply into it. That's because that does not work? $ cat ess #!/usr/bin/env bash bar() { for i in "${@}"; do printf '__%s__\n' "${i}" done } MY_CMD="bar '1 2 3' a b 'C D'" ${MY_CMD} START "${@}" END echo MY_CMD="./foo '1 2 3' a b 'C D'" ${MY_CMD} START "${@}" END $ cat foo #!/usr/bin/env bash for i in "${@}"; do printf '>>%s<<\n' "${i}" done $ ./ess wee woo "woot woot" __'1__ __2__ __3'__ __a__ __b__ __'C__ __D'__ __START__ __wee__ __woo__ __woot woot__ __END__ >>'1<< >>2<< >>3'<< >>a<< >>b<< >>'C<< >>D'<< >>START<< >>wee<< >>woo<< >>woot woot<< >>END<< So, if the command for a downloader, as provided in the .config, contains quoted material, the quotes would be part of the word. Regards, Yann E. MORIN. > Regards, > Arnout > > > >PYTHON_KOALA_SITE?= https://outwebsite.com/koala/archive/ > > > > > >The .mk file is being read correctly, but I can't figure out how to use > >DL_OPTS. The manual says DL_OPTS is a space separated list, but i see wget > >tries to use "token" or "MY_TOKEN" as the address. I tried a few different > >combinations of inverted commas, but none worked. > > > >Thanks again, > > > >Alberto > >/ > >/ > >/ > >/ > >Alberto??Fahrenkrog > > > > Senior?Embedded?Engineer > > > >Orica???Perth?Technology?Centre > > > >p:?+61?(0)?8?6365?4056 > > > >e: *Alberto.Fahrenkrog at rigtechnologies.com.au* > > > > > >-------------------------------------------------------------------------------- > >*From:* Alberto Fahrenkrog > >*Sent:* Thursday, February 23, 2023 3:13 PM > >*To:* buildroot at buildroot.org > >*Subject:* Re: [Buildroot] [Help] Struggling to build external python > >package on out of tree build > >Ok, I see now that external.mk is explained in chapter 9. I jumped > >straight to chapter 18 and missed external.mk completely. And for some > >reason I never found external.mk on my google searches. > > > >Thanks all for your help! > > > >Cheers, > > > >Alberto > >-------------------------------------------------------------------------------- > >*From:* buildroot on behalf of Alberto > >Fahrenkrog > >*Sent:* Thursday, February 23, 2023 3:09 PM > >*To:* buildroot at buildroot.org > >*Subject:* Re: [Buildroot] [Help] Struggling to build external python > >package on out of tree build > > > >You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. > >Learn why this is important > > > > > > > >Hi Andreas, > > > >Thank you so much! That did it! Where in the manual is external.mk > >explained? I missed it for sure... > > > >Cheers, > > > >Alberto > >Alberto??Fahrenkrog > > > > Senior?Embedded?Engineer > > > >Orica???Perth?Technology?Centre > > > >p:?+61?(0)?8?6365?4056 > > > >e: *Alberto.Fahrenkrog at rigtechnologies.com.au* > > > > > >-------------------------------------------------------------------------------- > >*From:* buildroot on behalf of Andreas > >Ziegler > >*Sent:* Thursday, February 23, 2023 2:49 PM > >*To:* Alberto Fahrenkrog > >*Cc:* buildroot at buildroot.org > >*Subject:* Re: [Buildroot] [Help] Struggling to build external python > >package on out of tree build > >[You don't often get email from br015 at umbiko.net. Learn why this is > >important at https://aka.ms/LearnAboutSenderIdentification > > ] > > > >Hi Alberto, > > > >On 2023-02-23 04:47, Alberto Fahrenkrog wrote: > >>Update, > >> > >>if I change? $(eval $(python-koala)) to $(eval $(python-package)) I > >>still get the same error. I assume that might have been one mistake. > >> > >>Cheers, > >> > >>Alberto > >> > >>Alberto Fahrenkrog Senior Embedded Engineer > >>Orica - Perth Technology Centre > >>p: +61 (0) 8 6365 4056 > >>e: Alberto.Fahrenkrog at rigtechnologies.com.au > >>________________________________ > >>From: buildroot on behalf of Alberto > >>Fahrenkrog > >>Sent: Thursday, February 23, 2023 12:42 PM > >>To: buildroot at buildroot.org > >>Subject: [Buildroot] [Help] Struggling to build external python package > >>on out of tree build > >> > >>You don't often get email from > >>alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is > >>important >> > >>Hello all, > >> > >>I'm trying to build a very simple custom python package following the > >>instructions on the manual, yet I must be doing something very wrong as > >>I get this result: > >> > >>$ make python-koala > >>make[1]: *** No rule to make target 'python-koala'.? Stop. > >>make: *** [Makefile:23: _all] Error 2 > >> > >>I create my out of tree build with: > >>make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build > >>O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads > >>br_build_defconfig > >> > >>On my "br_build" folder I have a Config.in file: > >>menu "Python-Libs" > >>???? source "~/Projects/br_build/package/python-koala/Config.in" > >>endmenu > > > >Similar to the include file for configs, you also need an external.mk > >file for the project make files, with this content: > > > > ?? include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) > > > >Otherwise your .mk files will not be picked up. > > > >>In "br_build/packages/python-koala/Config.in" > > > >The package directory is usually named 'package', not sure if this is > >relevant (but Config.in /external.mk have to match it). > > > >>config BR2_PACKAGE_PYTHON_KOALA > >>??????bool "python-koala" > >>?? depends on BR2_PACKAGE_PYTHON3 > >>??????help > >>??????? Python implementation of Koala Library > >> > >>In "br_build/packages/python-koala/python-koala.mk" > >>################################################################################ > >># > >># python-koala > >># > >>################################################################################ > >> > >>PYTHON_KOALA_VERSION = 1.3.3 > >>PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz > >>PYTHON_KOALA_SITE = > >>https://mywebsite.com.au/ExternalCode/koala/archive/ > > > >>PYTHON_KOALA_SETUP_TYPE = setuptools > >> > >>$(eval $(python-koala)) > >> > >>If I run "make menuconfig" I can select or deselect the package, and > >>it's selected per default on the br_build_defconfig (and in .config): > >>BR2_PACKAGE_PYTHON_KOALA=y > >> > >>But if I try to run "make python-koala" I get the "no target" error. > >>I'll still have a read and see what I might be doing wrong, but I'm > >>very confused. Any ideas are very welcome. > >> > >>Cheers, > >> > >>Alberto > > > > > > > >Kind regards, > >Andreas > >_______________________________________________ > >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 -- .-----------------.--------------------.------------------.--------------------. | 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 contact at martb.dev Thu Feb 23 20:15:10 2023 From: contact at martb.dev (=?UTF-8?q?Martin=20B=C3=B6h?=) Date: Thu, 23 Feb 2023 21:15:10 +0100 Subject: [Buildroot] [PATCH 1/2] package/gnuradio: bump to 3.10.5.1 Message-ID: <20230223201511.217372-1-contact@martb.dev> Signed-off-by: Martin B?h --- ...g-missing-vector-in-blockinterleaver.patch | 42 ------------------- ...rleaving.h-add-missing-cstddef-heade.patch | 33 --------------- package/gnuradio/gnuradio.hash | 2 +- package/gnuradio/gnuradio.mk | 2 +- 4 files changed, 2 insertions(+), 77 deletions(-) delete mode 100644 package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch delete mode 100644 package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch diff --git a/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch b/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch deleted file mode 100644 index 39b8c0b51e..0000000000 --- a/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 45fe4ac55ad88b6793d225e676205c30388ec138 Mon Sep 17 00:00:00 2001 -From: Ryan Volz -Date: Fri, 16 Sep 2022 21:05:51 -0400 -Subject: [PATCH] blocks: Including missing in blockinterleaver. - -Signed-off-by: Ryan Volz -[Retrieved (and backported) from: -https://github.com/gnuradio/gnuradio/commit/463c3477549b26b32d9b73eef30044e97c4eee64] -Signed-off-by: Gwenhael Goavec-Merou ---- - gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 2 +- - gr-blocks/lib/blockinterleaving.cc | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -index 9d4e0f249..df831fe5a 100644 ---- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -+++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -@@ -12,7 +12,7 @@ - #define INCLUDED_GR_BLOCKS_BLOCKINTERLEAVING_H - - #include -- -+#include - - namespace gr { - namespace blocks { -diff --git a/gr-blocks/lib/blockinterleaving.cc b/gr-blocks/lib/blockinterleaving.cc -index fc5873e11..768ad9ea7 100644 ---- a/gr-blocks/lib/blockinterleaving.cc -+++ b/gr-blocks/lib/blockinterleaving.cc -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - - namespace gr { - namespace blocks { --- -2.35.1 - diff --git a/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch b/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch deleted file mode 100644 index f1ad77580f..0000000000 --- a/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 901c2ad1ac88908a2e6db5615d5af39a218d826d Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Fri, 23 Sep 2022 08:41:26 +0200 -Subject: [PATCH] blocks/blockinterleaving.h: add missing cstddef header - (required for size_t) - -Fix build failure like: - -gnuradio/gr-blocks/lib/../include/gnuradio/blocks/blockinterleaving.h:25:36: error: ?size_t? was not declared in this scope - -This failure is due to the miss of cstddef include - -Signed-off-by: Gwenhael Goavec-Merou -[Upstream status: https://github.com/gnuradio/gnuradio/pull/6188] ---- - gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -index df831fe5a..33c59e35b 100644 ---- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -+++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -@@ -13,6 +13,7 @@ - - #include - #include -+#include - - namespace gr { - namespace blocks { --- -2.35.1 - diff --git a/package/gnuradio/gnuradio.hash b/package/gnuradio/gnuradio.hash index efa0bb462b..44bb6562df 100644 --- a/package/gnuradio/gnuradio.hash +++ b/package/gnuradio/gnuradio.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c6b9f59447a842559b00b3a67b4ca1186e9adb8db742b25400507fedc747f2bd gnuradio-3.10.4.0.tar.gz +sha256 85d90147f7f28450bff75eeefd2b44adc88b231d29fe8e86cc3a65437dba6d9f gnuradio-3.10.5.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index cc41f1e12b..8004ef0554 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNURADIO_VERSION = 3.10.4.0 +GNURADIO_VERSION = 3.10.5.1 GNURADIO_SITE = $(call github,gnuradio,gnuradio,v$(GNURADIO_VERSION)) GNURADIO_LICENSE = GPL-3.0+ GNURADIO_LICENSE_FILES = COPYING -- 2.39.2 From contact at martb.dev Thu Feb 23 20:15:11 2023 From: contact at martb.dev (=?UTF-8?q?Martin=20B=C3=B6h?=) Date: Thu, 23 Feb 2023 21:15:11 +0100 Subject: [Buildroot] [PATCH 2/2] package/gnuradio: remove pybind target suffix when crosscompiling In-Reply-To: <20230223201511.217372-1-contact@martb.dev> References: <20230223201511.217372-1-contact@martb.dev> Message-ID: <20230223201511.217372-2-contact@martb.dev> This is required as pybind11 uses host python3 and therefore the host platform suffixes. Without this change gnuradio and all plugins relying on its GrPybind macros, use the wrong suffixes. This leads to module load failures when crosscompiling. See: - https://github.com/gnuradio/gnuradio/issues/5455 - https://github.com/pybind/pybind11/issues/3640 Signed-off-by: Martin B?h --- ...nd-remove-suffix-when-crosscompiling.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch diff --git a/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch b/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch new file mode 100644 index 0000000000..0ac4395e58 --- /dev/null +++ b/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch @@ -0,0 +1,56 @@ +From c58760b002c1a954a9ab628352900fcd8e6e199c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20B=C3=B6h?= +Date: Wed, 22 Feb 2023 03:05:08 +0100 +Subject: [PATCH] grPyBind: fix invalid suffix + +This is required as pybind11 uses host python3 and therefore the host platform suffixes. +--- + cmake/Modules/GrPybind.cmake | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/cmake/Modules/GrPybind.cmake b/cmake/Modules/GrPybind.cmake +index 5a6fb7633..c2df17c2d 100644 +--- a/cmake/Modules/GrPybind.cmake ++++ b/cmake/Modules/GrPybind.cmake +@@ -8,6 +8,12 @@ macro(GR_PYBIND_MAKE name updir filter files) + ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) + + pybind11_add_module(${name}_python ${files}) ++ ++ # Use normal .so suffix when crosscompiling ++ # See https://github.com/gnuradio/gnuradio/issues/5455 ++ if (CMAKE_CROSSCOMPILING) ++ set_target_properties(${name}_python PROPERTIES SUFFIX ".so") ++ endif() + + set(MODULE_NAME ${name}) + if(${name} STREQUAL gr) +@@ -135,6 +141,12 @@ macro(GR_PYBIND_MAKE_CHECK_HASH name updir filter files) + + pybind11_add_module(${name}_python ${files}) + ++ # Use normal .so suffix when crosscompiling ++ # See https://github.com/gnuradio/gnuradio/issues/5455 ++ if (CMAKE_CROSSCOMPILING) ++ set_target_properties(${name}_python PROPERTIES SUFFIX ".so") ++ endif() ++ + set(MODULE_NAME ${name}) + if(${name} STREQUAL gr) + set(MODULE_NAME "runtime") +@@ -286,6 +298,12 @@ macro(GR_PYBIND_MAKE_OOT name updir filter files) + + pybind11_add_module(${name}_python ${files}) + ++ # Use normal .so suffix when crosscompiling ++ # See https://github.com/gnuradio/gnuradio/issues/5455 ++ if (CMAKE_CROSSCOMPILING) ++ set_target_properties(${name}_python PROPERTIES SUFFIX ".so") ++ endif() ++ + set(MODULE_NAME ${name}) + if(${name} STREQUAL gr) + set(MODULE_NAME "runtime") +-- +2.39.1 + -- 2.39.2 From contact at martb.dev Thu Feb 23 20:17:33 2023 From: contact at martb.dev (=?UTF-8?q?Martin=20B=C3=B6h?=) Date: Thu, 23 Feb 2023 21:17:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/gr-osmosdr: add missing host-python-six dependency to python support Message-ID: <20230223201733.222573-1-contact@martb.dev> Osmosdr failed to build docs when python support is enabled. [ 41%] Copying osmosdr docstring templates as pybind headers ... Traceback (most recent call last): File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/update_pydoc.py", line 22, in from doxyxml import DoxyIndex, DoxyClass, DoxyFriend, DoxyFunction, DoxyFile File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/__init__.py", line 69, in from .doxyindex import DoxyIndex, DoxyFunction, DoxyParam, DoxyClass, DoxyFile, DoxyNamespace, DoxyGroup, DoxyFriend, DoxyOther File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/doxyindex.py", line 31, in from .generated import index File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/index.py", line 13, in from . import compound File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compound.py", line 15, in from . import compoundsuper as supermod File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compoundsuper.py", line 15, in import six ModuleNotFoundError: No module named 'six' make[2]: *** [python/bindings/CMakeFiles/osmosdr_docstrings.dir/build.make:73: python/bindings/docstring_status] Fehler 1 make[1]: *** [CMakeFiles/Makefile2:332: python/bindings/CMakeFiles/osmosdr_docstrings.dir/all] Fehler 2 Signed-off-by: Martin B?h --- package/gr-osmosdr/gr-osmosdr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index 89907c1baa..b96a32a221 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -24,7 +24,7 @@ GR_OSMOSDR_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_GR_OSMOSDR_PYTHON),y) GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=ON -GR_OSMOSDR_DEPENDENCIES += python3 +GR_OSMOSDR_DEPENDENCIES += python3 host-python-six else GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=OFF endif -- 2.39.2 From contact at martb.dev Thu Feb 23 20:18:17 2023 From: contact at martb.dev (=?UTF-8?q?Martin=20B=C3=B6h?=) Date: Thu, 23 Feb 2023 21:18:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/gr-osmosdr: add support for HACKRF receivers Message-ID: <20230223201817.224238-1-contact@martb.dev> Signed-off-by: Martin B?h --- package/gr-osmosdr/Config.in | 6 ++++++ package/gr-osmosdr/gr-osmosdr.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/gr-osmosdr/Config.in b/package/gr-osmosdr/Config.in index 04fa10be80..05b5c46a63 100644 --- a/package/gr-osmosdr/Config.in +++ b/package/gr-osmosdr/Config.in @@ -43,4 +43,10 @@ config BR2_PACKAGE_GR_OSMOSDR_RFSPACE help Enable RFSPACE Receivers support +config BR2_PACKAGE_GR_OSMOSDR_HACKRF + bool "Osmocom HACKRF support" + depends on BR2_PACKAGE_HACKRF + help + Enable Osmocom HACKRF support + endif diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index b96a32a221..78c7fa30da 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -54,4 +54,11 @@ else GR_OSMOSDR_CONF_OPTS += -DENABLE_RFSPACE=OFF endif +ifeq ($(BR2_PACKAGE_GR_OSMOSDR_HACKRF),y) +GR_OSMOSDR_CONF_OPTS += -DENABLE_HACKRF=ON +GR_OSMOSDR_DEPENDENCIES += hackrf +else +GR_OSMOSDR_CONF_OPTS += -DENABLE_HACKRF=OFF +endif + $(eval $(cmake-package)) -- 2.39.2 From thomas.petazzoni at bootlin.com Thu Feb 23 21:42:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 22:42:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/audit: force arm mode instead of Thumb mode In-Reply-To: <20230223062259.GJ2718518@scaer> References: <20230222143512.1555539-1-fontaine.fabrice@gmail.com> <20230223062259.GJ2718518@scaer> Message-ID: <20230223224201.0e351b16@windsurf> Hello Yann, On Thu, 23 Feb 2023 07:22:59 +0100 "Yann E. MORIN" wrote: > > +# src/libev has some assembly function that is not present in Thumb mode: > > +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode > > +# so, we desactivate Thumb mode > > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > > +AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" > > +endif > > But then it would not work on systems that have a armv7m: BR2_cortex_m3, > BR2_cortex_m4, or BR2_cortex_m7. BR2_ARM_INSTRUCTIONS_THUMB is for "classic" Thumb, not Thumb2. BR2_ARM_INSTRUCTIONS_THUMB2 is used for Thumb2 platforms, such as ARMv7-M. So the above condition will only trigger for ARMv4/ARMv5/ARMv6 cores, and they all support both classic Thumb and regular ARM instruction set. So to me, the above proposal from Fabrice works fine. > I looked at the code, and it's going to be very complex to patch it to > support armv7m, i.e. thumb-only. Thumb2-only, which is totally different. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Thu Feb 23 22:09:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 23:09:47 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/gcc: fix GCC_DL_DIR Message-ID: <20230223220947.8226-1-fontaine.fabrice@gmail.com> GCC_DL_DIR is empty as gcc is not a "real" package, as a result, the following (silent) error is raised when BR2_CCACHE is set: /home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/bin/ccache /usr/bin/gcc -O2 -I/home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/include -DBR_CROSS_PATH_SUFFIX='".br_real"' -DBR_CCACHE_HASH=\"` printf '%s\n' --target=aarch64_be-buildroot-linux-gnu --with-sysroot=@HOST_DIR@/aarch64_be-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto --with-gmp=@HOST_DIR@ --with-mpc=@HOST_DIR@ --with-mpfr=@HOST_DIR@ --with-bugurl="http://bugs.buildroot.net/" --without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads --without-isl --without-cloog --with-abi="lp64" --with-cpu=cortex-a53 --enable-languages=c --disable-shared --without-headers --disable-threads --with-newlib --disable-largefile | sha256sum - /gcc-11.3.0.tar.xz package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch | cut -c -64 | tr -d '\n'`\" -DBR_SYSROOT='"aarch64_be-buildroot-linux-gnu/sysroot"' -DBR_ADDITIONAL_CFLAGS='"-Wl,-z,max-page-size=65536", "-Wl,-z,common-page-size=65536", "-fstack-protector-strong",' -DBR_CCACHE -DBR2_RELRO_PARTIAL -s -Wl,--hash-style=both toolchain/toolchain-wrapper.c -o /home/thomas/autobuild/instance-0/output-1/build/host-gcc-initial-11.3.0/toolchain-wrapper sha256sum: /gcc-11.3.0.tar.xz: No such file or directory This patch replaces GCC_DL_DIR by $($(PKG)_DL_DIR) as suggested by Arnout Vandecappelle. Fixes: - Found when investigating: http://autobuild.buildroot.org/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Arnout Vandecappelle): - Use $($(PKG)_DL_DIR) package/gcc/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 6dfd93f2a4..25cb4ce8e2 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -284,7 +284,7 @@ HOST_GCC_COMMON_MAKE_OPTS = \ gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) ifeq ($(BR2_CCACHE),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(GCC_DL_DIR)/$(GCC_SOURCE) +HOST_GCC_COMMON_CCACHE_HASH_FILES += $($(PKG)_DL_DIR)/$(GCC_SOURCE) # Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned # and unversioned patches unconditionally. Moreover, to facilitate the -- 2.39.1 From thomas.petazzoni at bootlin.com Thu Feb 23 22:12:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:12:58 +0100 Subject: [Buildroot] [PATCH 2/2] package/gnuradio: remove pybind target suffix when crosscompiling In-Reply-To: <20230223201511.217372-2-contact@martb.dev> References: <20230223201511.217372-1-contact@martb.dev> <20230223201511.217372-2-contact@martb.dev> Message-ID: <20230223231258.0e07045c@windsurf> Hello Martin, Thanks for your patch. Some comment/question below. On Thu, 23 Feb 2023 21:15:11 +0100 Martin B?h via buildroot wrote: > This is required as pybind11 uses host python3 and therefore the host platform suffixes. > Without this change gnuradio and all plugins relying on its GrPybind macros, use the wrong suffixes. > This leads to module load failures when crosscompiling. > > See: > - https://github.com/gnuradio/gnuradio/issues/5455 > - https://github.com/pybind/pybind11/issues/3640 > > Signed-off-by: Martin B?h > --- > ...nd-remove-suffix-when-crosscompiling.patch | 56 +++++++++++++++++++ > 1 file changed, 56 insertions(+) > create mode 100644 package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch > > diff --git a/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch b/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch > new file mode 100644 > index 0000000000..0ac4395e58 > --- /dev/null > +++ b/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch > @@ -0,0 +1,56 @@ > +From c58760b002c1a954a9ab628352900fcd8e6e199c Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Martin=20B=C3=B6h?= > +Date: Wed, 22 Feb 2023 03:05:08 +0100 > +Subject: [PATCH] grPyBind: fix invalid suffix > + > +This is required as pybind11 uses host python3 and therefore the host platform suffixes. We need your Signed-off-by here, and also the upstream status of this patch. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:13:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:13:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/gr-osmosdr: add missing host-python-six dependency to python support In-Reply-To: <20230223201733.222573-1-contact@martb.dev> References: <20230223201733.222573-1-contact@martb.dev> Message-ID: <20230223231341.4dcc6d21@windsurf> Hello Martin, On Thu, 23 Feb 2023 21:17:33 +0100 Martin B?h via buildroot wrote: > Osmosdr failed to build docs when python support is enabled. > [ 41%] Copying osmosdr docstring templates as pybind headers ... > Traceback (most recent call last): > File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/update_pydoc.py", line 22, in > from doxyxml import DoxyIndex, DoxyClass, DoxyFriend, DoxyFunction, DoxyFile > File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/__init__.py", line 69, in > from .doxyindex import DoxyIndex, DoxyFunction, DoxyParam, DoxyClass, DoxyFile, DoxyNamespace, DoxyGroup, DoxyFriend, DoxyOther > File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/doxyindex.py", line 31, in > from .generated import index > File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/index.py", line 13, in > from . import compound > File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compound.py", line 15, in > from . import compoundsuper as supermod > File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compoundsuper.py", line 15, in > import six > ModuleNotFoundError: No module named 'six' > make[2]: *** [python/bindings/CMakeFiles/osmosdr_docstrings.dir/build.make:73: python/bindings/docstring_status] Fehler 1 > make[1]: *** [CMakeFiles/Makefile2:332: python/bindings/CMakeFiles/osmosdr_docstrings.dir/all] Fehler 2 > > Signed-off-by: Martin B?h Is there potentially a way to disable building documentation instead? Of course, adding host-python-six in the dependencies is not a huge deal, but we really don't care about building documentation in the context of Buildroot. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Thu Feb 23 22:25:39 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 23:25:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmad: force arm mode instead of Thumb mode Message-ID: <20230223222539.294264-1-fontaine.fabrice@gmail.com> Fix the following build failure: /tmp/ccv8mDeW.s:93: Error: selected processor does not support `smull r6,r7,r3,r1' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/92a3f19b4fa12a7724f9e3d99284da4ad2beecb2 Signed-off-by: Fabrice Fontaine --- package/libmad/libmad.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 684b8a2261..5555bf5a36 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -32,6 +32,13 @@ LIBMAD_IGNORE_CVES += CVE-2017-8374 # is able to properly behave in the face of a missing C++ compiler. LIBMAD_AUTORECONF = YES +# libmad has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `smull r6,r7,r3,r1' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBMAD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + define LIBMAD_INSTALL_STAGING_PC $(INSTALL) -D package/libmad/mad.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/mad.pc -- 2.39.1 From thomas.petazzoni at bootlin.com Thu Feb 23 22:33:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:33:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/gr-osmosdr: add support for HACKRF receivers In-Reply-To: <20230223201817.224238-1-contact@martb.dev> References: <20230223201817.224238-1-contact@martb.dev> Message-ID: <20230223233331.75b619b1@windsurf> Hello Martin, On Thu, 23 Feb 2023 21:18:17 +0100 Martin B?h via buildroot wrote: > +config BR2_PACKAGE_GR_OSMOSDR_HACKRF > + bool "Osmocom HACKRF support" > + depends on BR2_PACKAGE_HACKRF We would normally use a select BR2_PACKAGE_HACKRF here, which means you have to replicate the depends on from hackrf: depends on !BR2_STATIC_LIBS # hackrf depends on BR2_TOOLCHAIN_HAS_THREADS # hackrf depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # hackrf and the corresponding Config.in comment: comment "hackrf support needs a toolchain w/ threads, dynamic library, gcc >= 4.9" depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:34:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:34:20 +0100 Subject: [Buildroot] [git commit] package/efivar: needs threads Message-ID: <20230223223441.F029E8698D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c29f6d63e0adebc8502dd707d3e4050af254d342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a thread dependency as Upstream quickly closed https://github.com/rhboot/efivar/pull/238 to fix the following build failure without threads raised since bump to version 38 in commit f24029b561fbda0953c7dbd93d2485b03873996d and https://github.com/rhboot/efivar/commit/cff88dd96b9d43e2c5875a24ba6180b196890ded: thread-test.c:14:10: fatal error: pthread.h: No such file or directory 14 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/f2da14f91dc602a32dd5b2b7bdf3d3aa43afa7f4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/efibootmgr/Config.in | 5 +++-- package/efivar/Config.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index 98ff71c996..5800e6c143 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_EFIBOOTMGR bool "efibootmgr" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS # efivar depends on !BR2_STATIC_LIBS # efivar + depends on BR2_TOOLCHAIN_HAS_THREADS # efivar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS @@ -15,9 +16,9 @@ config BR2_PACKAGE_EFIBOOTMGR https://github.com/rhboot/efibootmgr -comment "efibootmgr needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efibootmgr needs a toolchain w/ dynamic library, threads, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/package/efivar/Config.in b/package/efivar/Config.in index 74f2bb5abb..d4402dbcf7 100644 --- a/package/efivar/Config.in +++ b/package/efivar/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_EFIVAR depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # linux/nvme.h + depends on BR2_TOOLCHAIN_HAS_THREADS # linux/nvme.h has been renamed to linux/nvme_ioctl.h since 4.4, # and the efivar source handles that situation. However, some # Sourcery CodeBench toolchains use 4.4 kernel headers but they @@ -22,9 +23,9 @@ config BR2_PACKAGE_EFIVAR https://github.com/rhboot/efivar -comment "efivar needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efivar needs a toolchain w/ dynamic library, threads, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS From thomas.petazzoni at bootlin.com Thu Feb 23 22:34:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:34:45 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/efivar: needs threads In-Reply-To: <20230223162847.9247-1-fontaine.fabrice@gmail.com> References: <20230223162847.9247-1-fontaine.fabrice@gmail.com> Message-ID: <20230223233445.47f2a4af@windsurf> On Thu, 23 Feb 2023 17:28:47 +0100 Fabrice Fontaine wrote: > Add a thread dependency as Upstream quickly closed > https://github.com/rhboot/efivar/pull/238 to fix the following build > failure without threads raised since bump to version 38 in commit > f24029b561fbda0953c7dbd93d2485b03873996d and > https://github.com/rhboot/efivar/commit/cff88dd96b9d43e2c5875a24ba6180b196890ded: > > thread-test.c:14:10: fatal error: pthread.h: No such file or directory > 14 | #include > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/f2da14f91dc602a32dd5b2b7bdf3d3aa43afa7f4 > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Add a thread dependency Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:35:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:35:45 +0100 Subject: [Buildroot] [git commit] package/wpa_supplicant: fix builds with missing sha384 hash functions Message-ID: <20230223224320.0D7CB8699F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93b461bb5e34ec25c9aac3024b41d132736c5dd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master SAE, unlike OWE or DPP, does not explicitly enable support for sha384 hash functions. Possible WPA3 build issue is masked, since all three SAE/OWE/DPP are included. However, there exist other configurations that enable only SAE. For instance, one such build configuration is wpa_supplicant AP mode with mesh support. This change adds upstream patch that includes sha384 and sha256 hash functions to builds with SAE support. Fixes: http://autobuild.buildroot.net/results/f349130985870f4a781cca56c3f551108f81aa3e/ Signed-off-by: Sergey Matyukevich Signed-off-by: Thomas Petazzoni --- ...C-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch b/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch new file mode 100644 index 0000000000..98df56e540 --- /dev/null +++ b/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch @@ -0,0 +1,64 @@ +From c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sun, 17 Apr 2022 12:28:41 +0300 +Subject: [PATCH] Include HMAC-SHA384/512 KDF for SAE if SHA384/512 is included + +It was possible to miss the HMAC functions if some other build +configuration parameters ended up setting NEED_SHA384/512=y. + +Upstream: https://w1.fi/cgit/hostap/commit/?id=c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 + +Signed-off-by: Jouni Malinen +Signed-off-by: Sergey Matyukevich +--- + wpa_supplicant/Android.mk | 11 +++++++++++ + wpa_supplicant/Makefile | 11 +++++++++++ + 2 files changed, 22 insertions(+) + +diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk +index 0e0ce467c..bcdbd6c90 100644 +--- a/wpa_supplicant/Android.mk ++++ b/wpa_supplicant/Android.mk +@@ -1361,6 +1361,17 @@ endif + endif + endif + ++ifdef CONFIG_SAE ++ifdef NEED_SHA384 ++# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. ++NEED_HMAC_SHA384_KDF=y ++endif ++ifdef NEED_SHA512 ++# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. ++NEED_HMAC_SHA512_KDF=y ++endif ++endif ++ + SHA256OBJS = # none by default + L_CFLAGS += -DCONFIG_SHA256 + ifneq ($(CONFIG_TLS), openssl) +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index ed49aa972..69c80121c 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -1475,6 +1475,17 @@ endif + endif + endif + ++ifdef CONFIG_SAE ++ifdef NEED_SHA384 ++# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. ++NEED_HMAC_SHA384_KDF=y ++endif ++ifdef NEED_SHA512 ++# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. ++NEED_HMAC_SHA512_KDF=y ++endif ++endif ++ + SHA256OBJS = # none by default + CFLAGS += -DCONFIG_SHA256 + ifneq ($(CONFIG_TLS), openssl) +-- +2.39.2 + From thomas.petazzoni at bootlin.com Thu Feb 23 22:43:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:43:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpa_supplicant: fix builds with missing sha384 hash functions In-Reply-To: <20230223164747.1653580-1-geomatsi@gmail.com> References: <20230223164747.1653580-1-geomatsi@gmail.com> Message-ID: <20230223234321.427b3772@windsurf> On Thu, 23 Feb 2023 19:47:47 +0300 Sergey Matyukevich wrote: > SAE, unlike OWE or DPP, does not explicitly enable support for sha384 > hash functions. Possible WPA3 build issue is masked, since all three > SAE/OWE/DPP are included. However, there exist other configurations > that enable only SAE. For instance, one such build configuration is > wpa_supplicant AP mode with mesh support. > > This change adds upstream patch that includes sha384 and sha256 hash > functions to builds with SAE support. > > Fixes: http://autobuild.buildroot.net/results/f349130985870f4a781cca56c3f551108f81aa3e/ > > Signed-off-by: Sergey Matyukevich > --- > ...384-512-KDF-for-SAE-if-SHA384-512-is.patch | 62 +++++++++++++++++++ > 1 file changed, 62 insertions(+) > create mode 100644 package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:43:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:43:56 +0100 Subject: [Buildroot] [PATCH 1/2] boot/boot-wrapper-aarch64: bump version In-Reply-To: <20230223180847.2512056-2-vincent.stehle@arm.com> References: <20230223180847.2512056-1-vincent.stehle@arm.com> <20230223180847.2512056-2-vincent.stehle@arm.com> Message-ID: <20230223234356.1ebf1e50@windsurf> On Thu, 23 Feb 2023 19:08:46 +0100 Vincent Stehl? wrote: > Bump boot-wrapper to the latest version. > > Signed-off-by: Vincent Stehl? > Cc: Thomas Petazzoni > --- > boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Series applied to next. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:43:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:43:32 +0100 Subject: [Buildroot] [git commit branch/next] boot/boot-wrapper-aarch64: bump version Message-ID: <20230223224433.D92ED869E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3254a2886a4e20111e5c87614f6f374ec626b755 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bump boot-wrapper to the latest version. Signed-off-by: Vincent Stehl?? Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index 30b352f8e7..95f7e22760 100644 --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a +BOOT_WRAPPER_AARCH64_VERSION = 9f26a1c1f27bd6b5b66c265114848007fc22e4aa BOOT_WRAPPER_AARCH64_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git BOOT_WRAPPER_AARCH64_SITE_METHOD = git BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause From thomas.petazzoni at bootlin.com Thu Feb 23 22:44:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:44:23 +0100 Subject: [Buildroot] [git commit] package/gcc: fix GCC_DL_DIR Message-ID: <20230223224433.83D41869E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6455558f6202663f21d8d72e430d73b13d5339cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master GCC_DL_DIR is empty as gcc is not a "real" package, as a result, the following (silent) error is raised when BR2_CCACHE is set: /home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/bin/ccache /usr/bin/gcc -O2 -I/home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/include -DBR_CROSS_PATH_SUFFIX='".br_real"' -DBR_CCACHE_HASH=\"` printf '%s\n' --target=aarch64_be-buildroot-linux-gnu --with-sysroot=@HOST_DIR@/aarch64_be-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto --with-gmp=@HOST_DIR@ --with-mpc=@HOST_DIR@ --with-mpfr=@HOST_DIR@ --with-bugurl="http://bugs.buildroot.net/" --without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads --without-isl --without-cloog --with-abi="lp64" --with-cpu=cortex-a53 --enable-languages=c --disable-shared --without-headers --disable-threads --with-newlib --disable-largefile | sha256sum - /gcc-11.3.0.tar.xz package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch package/ gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch | cut -c -64 | tr -d '\n'`\" -DBR_SYSROOT='"aarch64_be-buildroot-linux-gnu/sysroot"' -DBR_ADDITIONAL_CFLAGS='"-Wl,-z,max-page-size=65536", "-Wl,-z,common-page-size=65536", "-fstack-protector-strong",' -DBR_CCACHE -DBR2_RELRO_PARTIAL -s -Wl,--hash-style=both toolchain/toolchain-wrapper.c -o /home/thomas/autobuild/instance-0/output-1/build/host-gcc-initial-11.3.0/toolchain-wrapper sha256sum: /gcc-11.3.0.tar.xz: No such file or directory This patch replaces GCC_DL_DIR by $($(PKG)_DL_DIR) as suggested by Arnout Vandecappelle. Fixes: - Found when investigating: http://autobuild.buildroot.org/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gcc/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 6dfd93f2a4..25cb4ce8e2 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -284,7 +284,7 @@ HOST_GCC_COMMON_MAKE_OPTS = \ gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) ifeq ($(BR2_CCACHE),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(GCC_DL_DIR)/$(GCC_SOURCE) +HOST_GCC_COMMON_CCACHE_HASH_FILES += $($(PKG)_DL_DIR)/$(GCC_SOURCE) # Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned # and unversioned patches unconditionally. Moreover, to facilitate the From thomas.petazzoni at bootlin.com Thu Feb 23 22:43:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:43:46 +0100 Subject: [Buildroot] [git commit branch/next] configs/arm_foundationv8: bump to Linux 6.1.13 Message-ID: <20230223224433.E3E25869E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b793f3a49e1ef8a48671ce19579586a0b018179d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Bump Linux kernel to v6.1.13 and increase the rootfs size accordingly. - Bump the FVP in the readme to version 11.20 build 15 and update the command line. Signed-off-by: Vincent Stehl?? Cc: Masahiro Yamada Signed-off-by: Thomas Petazzoni --- board/arm/foundation-v8/readme.txt | 4 ++-- configs/arm_foundationv8_defconfig | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/board/arm/foundation-v8/readme.txt b/board/arm/foundation-v8/readme.txt index b5106f015e..cb0fe08b87 100644 --- a/board/arm/foundation-v8/readme.txt +++ b/board/arm/foundation-v8/readme.txt @@ -3,14 +3,14 @@ ARM software simulator of the AArch64 architecture. First, one has to download the AArch64 software simulator from: - https://silver.arm.com/download/download.tm?pv=4807186 + https://armkeil.blob.core.windows.net/developer/Files/downloads/ecosystem-models/Foundation_Platform_11.20_15_Linux64.tgz Then, use the arm_foundationv8_defconfig configuration to build your Buildroot system. Finally, boot your system with: - ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-6.4/Foundation_Platform \ + ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-9.3/Foundation_Platform \ --image output/images/linux-system.axf \ --block-device output/images/rootfs.ext2 \ --network=nat \ diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig index 3c63f5dc76..102fe8fd09 100644 --- a/configs/arm_foundationv8_defconfig +++ b/configs/arm_foundationv8_defconfig @@ -1,15 +1,16 @@ BR2_aarch64=y -# Linux headers same as kernel, a 5.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.20" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.13" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8-gicv3-psci" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BOOT_WRAPPER_AARCH64=y BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8-gicv3-psci" From thomas.petazzoni at bootlin.com Thu Feb 23 22:44:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:44:34 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/gcc: fix GCC_DL_DIR In-Reply-To: <20230223220947.8226-1-fontaine.fabrice@gmail.com> References: <20230223220947.8226-1-fontaine.fabrice@gmail.com> Message-ID: <20230223234434.5875481b@windsurf> On Thu, 23 Feb 2023 23:09:47 +0100 Fabrice Fontaine wrote: > GCC_DL_DIR is empty as gcc is not a "real" package, as a result, the > following (silent) error is raised when BR2_CCACHE is set: > > /home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/bin/ccache /usr/bin/gcc -O2 -I/home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/include -DBR_CROSS_PATH_SUFFIX='".br_real"' -DBR_CCACHE_HASH=\"` printf '%s\n' --target=aarch64_be-buildroot-linux-gnu --with-sysroot=@HOST_DIR@/aarch64_be-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto --with-gmp=@HOST_DIR@ --with-mpc=@HOST_DIR@ --with-mpfr=@HOST_DIR@ --with-bugurl="http://bugs.buildroot.net/" --without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads --without-isl --without-cloog --with-abi="lp64" --with-cpu=cortex-a53 --enable-languages=c --disable-shared --without-headers --disable-threads --with-newlib --disable-largefile | sha256sum - /gcc-11.3.0.tar.xz package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch packag e/ > gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch | cut -c -64 | tr -d '\n'`\" -DBR_SYSROOT='"aarch64_be-buildroot-linux-gnu/sysroot"' -DBR_ADDITIONAL_CFLAGS='"-Wl,-z,max-page-size=65536", "-Wl,-z,common-page-size=65536", "-fstack-protector-strong",' -DBR_CCACHE -DBR2_RELRO_PARTIAL -s -Wl,--hash-style=both toolchain/toolchain-wrapper.c -o /home/thomas/autobuild/instance-0/output-1/build/host-gcc-initial-11.3.0/toolchain-wrapper > sha256sum: /gcc-11.3.0.tar.xz: No such file or directory > > This patch replaces GCC_DL_DIR by $($(PKG)_DL_DIR) as suggested by > Arnout Vandecappelle. > > Fixes: > - Found when investigating: http://autobuild.buildroot.org/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Arnout Vandecappelle): > - Use $($(PKG)_DL_DIR) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:44:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:44:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/erlang: fix build with libressl >= 3.5.0 In-Reply-To: <20230223140606.208040-1-fontaine.fabrice@gmail.com> References: <20230223140606.208040-1-fontaine.fabrice@gmail.com> Message-ID: <20230223234459.0f7483fc@windsurf> On Thu, 23 Feb 2023 15:06:06 +0100 Fabrice Fontaine wrote: > Fix the following build failure with libressl >= 3.5.0 raised since bump > to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: > > api_ng.c: In function 'EVP_CIPHER_CTX_copy': > api_ng.c:392:28: error: invalid use of incomplete typedef 'EVP_CIPHER_CTX' {aka 'const struct evp_cipher_ctx_st'} > 392 | if ((in == NULL) || (in->cipher == NULL)) > | ^~ > > Fixes: > - http://autobuild.buildroot.org/results/90f7365d8477d35fca452b7b3f38babba086375e > > Signed-off-by: Fabrice Fontaine > --- > ...0003-crypto-Fixes-for-LibreSSL-3-5-0.patch | 30 +++++++++++++++++++ > 1 file changed, 30 insertions(+) > create mode 100644 package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:45:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:45:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: fix build with fmt >= 9.0.0 In-Reply-To: <20230223141745.303457-1-fontaine.fabrice@gmail.com> References: <20230223141745.303457-1-fontaine.fabrice@gmail.com> Message-ID: <20230223234518.032c0b0a@windsurf> On Thu, 23 Feb 2023 15:17:45 +0100 Fabrice Fontaine wrote: > Fix the following build failure with fmt >= 9.0.0 raised since commit > 5c83dc5451fb59ffa5cd40d30c4c532dd25e8333: > > /tmp/instance-5/output-1/build/gerbera-1.10.0/src/database/sql_database.cc:1688:26: required from here > /tmp/instance-5/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/fmt/format.h:3973:36: error: passing 'const fmt::v9::formatter >, __gnu_cxx::__normal_iterator >, char>, char, void>::formatter_type' {aka 'const fmt::v9::formatter'} as 'this' argument discards qualifiers [-fpermissive] > 3973 | out = value_formatter_.format(map(*it), ctx); > | ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/56c46fa7e922360d2c4b4093f8a030cc83726799 > > Signed-off-by: Fabrice Fontaine > --- > .../gerbera/0001-Fix-build-with-fmt-9-0.patch | 36 +++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 package/gerbera/0001-Fix-build-with-fmt-9-0.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:44:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:44:54 +0100 Subject: [Buildroot] [git commit] package/erlang: fix build with libressl >= 3.5.0 Message-ID: <20230223224636.777A3869F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26254066439596b88783b80a3a87f67570c0b0b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with libressl >= 3.5.0 raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: api_ng.c: In function 'EVP_CIPHER_CTX_copy': api_ng.c:392:28: error: invalid use of incomplete typedef 'EVP_CIPHER_CTX' {aka 'const struct evp_cipher_ctx_st'} 392 | if ((in == NULL) || (in->cipher == NULL)) | ^~ Fixes: - http://autobuild.buildroot.org/results/90f7365d8477d35fca452b7b3f38babba086375e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0003-crypto-Fixes-for-LibreSSL-3-5-0.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch b/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch new file mode 100644 index 0000000000..84c75fef83 --- /dev/null +++ b/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch @@ -0,0 +1,30 @@ +From 8e5170d79e387d7e898d948a78e0c70407a4030c Mon Sep 17 00:00:00 2001 +From: Hans Nilsson +Date: Mon, 14 Feb 2022 15:51:35 +0100 +Subject: [PATCH] crypto: Fixes for LibreSSL 3.5.0 + +[Retrieved (and backported) from: +https://github.com/erlang/otp/commit/8e5170d79e387d7e898d948a78e0c70407a4030c] +Signed-off-by: Fabrice Fontaine +--- + lib/crypto/c_src/openssl_config.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h +index 6fdd049fb30a..39e4b2d9d7c0 100644 +--- a/lib/crypto/c_src/openssl_config.h ++++ b/lib/crypto/c_src/openssl_config.h +@@ -122,7 +122,14 @@ + # endif + #endif + ++#ifdef HAS_LIBRESSL ++# if LIBRESSL_VERSION_NUMBER >= 0x3050000fL ++# define HAS_EVP_PKEY_CTX ++# define HAVE_EVP_CIPHER_CTX_COPY ++# endif ++#endif ++ + #ifndef HAS_LIBRESSL + # if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0) + # define HAS_EVP_PKEY_CTX From thomas.petazzoni at bootlin.com Thu Feb 23 22:45:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:45:14 +0100 Subject: [Buildroot] [git commit] package/gerbera: fix build with fmt >= 9.0.0 Message-ID: <20230223224636.84BF9869F8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b911c8e8fe52914c1578b846914d7399450067b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with fmt >= 9.0.0 raised since commit 5c83dc5451fb59ffa5cd40d30c4c532dd25e8333: /tmp/instance-5/output-1/build/gerbera-1.10.0/src/database/sql_database.cc:1688:26: required from here /tmp/instance-5/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/fmt/format.h:3973:36: error: passing 'const fmt::v9::formatter >, __gnu_cxx::__normal_iterator >, char>, char, void>::formatter_type' {aka 'const fmt::v9::formatter'} as 'this' argument discards qualifiers [-fpermissive] 3973 | out = value_formatter_.format(map(*it), ctx); | ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/56c46fa7e922360d2c4b4093f8a030cc83726799 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gerbera/0001-Fix-build-with-fmt-9-0.patch | 36 +++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/gerbera/0001-Fix-build-with-fmt-9-0.patch b/package/gerbera/0001-Fix-build-with-fmt-9-0.patch new file mode 100644 index 0000000000..63ae8382a3 --- /dev/null +++ b/package/gerbera/0001-Fix-build-with-fmt-9-0.patch @@ -0,0 +1,36 @@ +From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001 +From: Felix Yan +Date: Fri, 19 Aug 2022 15:22:10 +0300 +Subject: [PATCH] Fix build with fmt 9.0 + +Fixes #2681 + +[Retrieved from: +https://github.com/gerbera/gerbera/commit/d7b8fafbc94405c20753fed569abd8878cccde89] +Signed-off-by: Fabrice Fontaine +--- + src/database/sql_format.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/database/sql_format.h b/src/database/sql_format.h +index 32dc00efa..e4e1909a8 100644 +--- a/src/database/sql_format.h ++++ b/src/database/sql_format.h +@@ -42,7 +42,7 @@ struct SQLIdentifier { + template <> + struct fmt::formatter : formatter { + template +- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end); + } +@@ -61,7 +61,7 @@ struct ColumnUpdate { + template <> + struct fmt::formatter : formatter { + template +- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{} = {}", a.column, a.value); + } From fontaine.fabrice at gmail.com Thu Feb 23 22:47:45 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 23:47:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/cairo: fix pthread detection In-Reply-To: <20230223153236.914358-1-fontaine.fabrice@gmail.com> References: <20230223153236.914358-1-fontaine.fabrice@gmail.com> Message-ID: Le jeu. 23 f?vr. 2023 ? 16:32, Fabrice Fontaine a ?crit : > pthreads detection fails if a warning is emitted resulting in the > following build failure with some toolchains: > > onfigure:34189: checking for cairo's pthread feature > configure:34300: > /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > conftest.c -lrt -latomic -lexecinfo -lm -lpthread >&5 > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > warning: > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: > missing .note.GNU-stack section implies executable stack > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > NOTE: This behaviour is deprecated and will be removed in a future version > of the linker > configure:34300: $? = 0 > configure:34419: > /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -pthread > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > conftest.c -lrt -latomic -lexecinfo -lm >&5 > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > warning: > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: > missing .note.GNU-stack section implies executable stack > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > NOTE: This behaviour is deprecated and will be removed in a future version > of the linker > configure:34419: $? = 0 > configure:34500: > /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > conftest.c -lrt -latomic -lexecinfo -lm >&5 > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > warning: > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: > missing .note.GNU-stack section implies executable stack > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > NOTE: This behaviour is deprecated and will be removed in a future version > of the linker > configure:34500: $? = 0 > configure:34555: checking whether cairo's pthread feature could be enabled > configure:34557: result: no (can't link with -lpthread or -pthread) > It should be noted that shellinabox has the same kind of issue, a warning is preventing the correct detection of ptsname_r: http://autobuild.buildroot.org/results/287/2872b26253ecb5a1550268fcbcefe8fd974ff70d//shellinabox-2.20/config.log So there is something fishy with those recent autobuilder failures. > > [...] > > In file included from cairo-mutex-type-private.h:45, > from cairo-scaled-font-private.h:45, > from cairoint.h:434, > from cairo-analysis-surface.c:37: > cairo-mutex-impl-private.h:262:3: error: #error "XXX: No mutex > implementation found. Cairo will not work with multiple threads. Define > CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile > cairo without thread-safety support." > 262 | # error "XXX: No mutex implementation found. Cairo will not work > with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and > accept this limitation and compile cairo without thread-safety support." > | ^~~~~ > > To avoid this build failure, add a patch that overrides this broken > mechanism > > Fixes: > - > http://autobuild.buildroot.org/results/5420beaf94855e47eeb08627e8e3c169dc00419a > > Signed-off-by: Fabrice Fontaine > --- > ...e.ac.pthread-respect-enable-pthreads.patch | 59 +++++++++++++++++++ > package/cairo/cairo.mk | 13 ++-- > 2 files changed, 68 insertions(+), 4 deletions(-) > create mode 100644 > package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch > > diff --git > a/package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch > b/package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch > new file mode 100644 > index 0000000000..c350c596cf > --- /dev/null > +++ > b/package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch > @@ -0,0 +1,59 @@ > +From 243fe7f3d51c23159e25f36adee7e953fee29f6c Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Thu, 23 Feb 2023 16:07:04 +0100 > +Subject: [PATCH] build/configure.ac.pthread: respect --enable-pthreads > + > +Respect --enable-pthreads as pthreads detection fails if a warning is > +emitted resulting in the following build failure with some toolchains: > + > +onfigure:34189: checking for cairo's pthread feature > +configure:34300: > /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > conftest.c -lrt -latomic -lexecinfo -lm -lpthread >&5 > +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > warning: > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: > missing .note.GNU-stack section implies executable stack > +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > NOTE: This behaviour is deprecated and will be removed in a future version > of the linker > +configure:34300: $? = 0 > +configure:34419: > /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -pthread > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > conftest.c -lrt -latomic -lexecinfo -lm >&5 > +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > warning: > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: > missing .note.GNU-stack section implies executable stack > +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > NOTE: This behaviour is deprecated and will be removed in a future version > of the linker > +configure:34419: $? = 0 > +configure:34500: > /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > conftest.c -lrt -latomic -lexecinfo -lm >&5 > +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > warning: > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: > missing .note.GNU-stack section implies executable stack > +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > NOTE: This behaviour is deprecated and will be removed in a future version > of the linker > +configure:34500: $? = 0 > +configure:34555: checking whether cairo's pthread feature could be enabled > +configure:34557: result: no (can't link with -lpthread or -pthread) > + > +[...] > + > +In file included from cairo-mutex-type-private.h:45, > + from cairo-scaled-font-private.h:45, > + from cairoint.h:434, > + from cairo-analysis-surface.c:37: > +cairo-mutex-impl-private.h:262:3: error: #error "XXX: No mutex > implementation found. Cairo will not work with multiple threads. Define > CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile > cairo without thread-safety support." > + 262 | # error "XXX: No mutex implementation found. Cairo will not work > with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and > accept this limitation and compile cairo without thread-safety support." > + | ^~~~~ > + > +Fixes: > + - > http://autobuild.buildroot.org/results/5420beaf94855e47eeb08627e8e3c169dc00419a > + > +Signed-off-by: Fabrice Fontaine > +--- > + build/configure.ac.pthread | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/build/configure.ac.pthread b/build/configure.ac.pthread > +index 29c930da9..084445587 100644 > +--- a/build/configure.ac.pthread > ++++ b/build/configure.ac.pthread > +@@ -244,7 +244,8 @@ AC_DEFUN([CAIRO_CONFIGURE_PTHREAD],[dnl > + > + dnl Make sure we scored some pthreads. > + if test "x$enable_pthread" = "xyes" -a "x$have_pthread" != "xyes"; > then > +- AC_MSG_ERROR([pthread requested but not found]) > ++ AC_MSG_WARN([pthread requested but not found]) > ++ have_pthread=yes > + fi > + > + dnl Set the output variables for CAIRO_ENABLE. > +-- > +2.39.1 > + > diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk > index e8a704c7da..9034068403 100644 > --- a/package/cairo/cairo.mk > +++ b/package/cairo/cairo.mk > @@ -11,6 +11,8 @@ CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 > COPYING-MPL-1.1 > CAIRO_CPE_ID_VENDOR = cairographics > CAIRO_SITE = http://cairographics.org/releases > CAIRO_INSTALL_STAGING = YES > +# We're patching build/configure.ac.pthread > +CAIRO_AUTORECONF = YES > > # > 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch > CAIRO_IGNORE_CVES += CVE-2018-19876 > @@ -26,10 +28,6 @@ ifeq ($(BR2_m68k_cf),y) > CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" > endif > > -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) > -CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" > -endif > - > # cairo can use C++11 atomics when available, so we need to link with > # libatomic for the architectures who need libatomic. > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > @@ -70,6 +68,13 @@ HOST_CAIRO_DEPENDENCIES = \ > host-pixman \ > host-pkgconf > > +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) > +CAIRO_CONF_OPTS += --enable-pthread > +else > +CAIRO_CONF_OPTS += --disable-pthread > +CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" > +endif > + > # DirectFB svg support rely on Cairo and Cairo DirectFB support depends on > # DirectFB. Break circular dependency by disabling DirectFB support in > Cairo > # (which is experimental) > -- > 2.39.1 > > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Thu Feb 23 22:58:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:58:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/xtables-addons: drop XTABLES_ADDONS_DISABLE_GEOIP_HELPERS In-Reply-To: <20230223160714.1210026-1-fontaine.fabrice@gmail.com> References: <20230223160714.1210026-1-fontaine.fabrice@gmail.com> Message-ID: <20230223235801.6b4a2c05@windsurf> Hello Fabrice, On Thu, 23 Feb 2023 17:07:14 +0100 Fabrice Fontaine wrote: > Drop XTABLES_ADDONS_DISABLE_GEOIP_HELPERS which raises the following > build failure (probably since the addition of the package): No, it is not since the addition of the package. Upstream commit 7ad55ad6210d450521664f64453f854b3ba13d8d looks like this: commit 7ad55ad6210d450521664f64453f854b3ba13d8d Author: Jan Engelhardt Date: Tue Aug 16 10:44:56 2022 +0200 build: eliminate geoip/ make recursion diff --git a/Makefile.am b/Makefile.am index c051d53..0518bb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,16 @@ # -*- Makefile -*- ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = extensions extensions/ACCOUNT extensions/pknock geoip - -pkglibexec_SCRIPTS = asn/xt_asn_build asn/xt_asn_dl asn/xt_asn_fetch -man_MANS = xtables-addons.8 asn/xt_asn_build.1 asn/xt_asn_dl.1 +SUBDIRS = extensions extensions/ACCOUNT extensions/pknock + +bin_SCRIPTS = geoip/xt_geoip_query +pkglibexec_SCRIPTS = asn/xt_asn_build asn/xt_asn_dl asn/xt_asn_fetch \ + geoip/xt_geoip_build geoip/xt_geoip_build_maxmind \ + geoip/xt_geoip_dl geoip/xt_geoip_dl_maxmind +man_MANS = xtables-addons.8 asn/xt_asn_build.1 asn/xt_asn_dl.1 \ + geoip/xt_geoip_build.1 geoip/xt_geoip_dl.1 \ + geoip/xt_geoip_build_maxmind.1 geoip/xt_geoip_dl_maxmind.1 \ + geoip/xt_geoip_query.1 .PHONY: FORCE FORCE: So up to this commit (which was part of the xtables-addons v3.22 release), the $(SED) invocation was working fine to drop geoip from the SUBDIRS variable. Now that they have removed the recursive make, replace " geoip" with nothing causes: bin_SCRIPTS = geoip/xt_geoip_query to become: bin_SCRIPTS = xt_geoip_query causing the build breakage. So it's actually Buildroot commit 53f2999edfa5e67923d4d8a102c15fa3200e089c (from you!) that broke this :-) > make[3]: *** No rule to make target '/xt_geoip_query', needed by 'all-am'. Stop. > > unzip and perl don't seem to be needed They are, but not at build time. The comment was referring to the fact that they are needed at runtime: the scripts in the geoip/ subdir are written in Perl, and one of them uses unzip. So practically speaking, installing them on the target is useless because xtables-addons does not force installing Perl on the target. However, the package anyway also installs asn/xt_asn_fetch and asn/xt_asn_build which are also written in Perl. So perhaps what needs to be done is simply to remove these scripts in a POST_INSTALL_TARGET_HOOKS ? (And indeed drop the SED expression as you did). Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Thu Feb 23 22:59:42 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 23:59:42 +0100 Subject: [Buildroot] [PATCH 1/1] support/dependencies/dependencies.sh: require MD5 perl package for netsurf Message-ID: <20230223225942.313435-1-fontaine.fabrice@gmail.com> Fix the following build failure: Can't locate object method "hexhash" via package "MD5" at utils/git-testament.pl line 47 Fixes: - http://autobuild.buildroot.org/results/3dddcbbe7f6ecae5a2db6fac11fb659719452f73 Signed-off-by: Fabrice Fontaine --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 078559f086..58f44c8723 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -290,6 +290,10 @@ if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigRat" fi +if grep -q ^BR2_PACKAGE_NETSURF=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules Digest::MD5" +fi + if grep -q ^BR2_PACKAGE_WHOIS=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules autodie" fi -- 2.39.1 From thomas.petazzoni at bootlin.com Thu Feb 23 23:00:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 24 Feb 2023 00:00:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/cairo: fix pthread detection In-Reply-To: <20230223153236.914358-1-fontaine.fabrice@gmail.com> References: <20230223153236.914358-1-fontaine.fabrice@gmail.com> Message-ID: <20230224000059.367730f1@windsurf> Hello, On Thu, 23 Feb 2023 16:32:36 +0100 Fabrice Fontaine wrote: > pthreads detection fails if a warning is emitted resulting in the > following build failure with some toolchains: > > onfigure:34189: checking for cairo's pthread feature > configure:34300: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm -lpthread >&5 > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker > configure:34300: $? = 0 So this returns success. > configure:34419: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm >&5 > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker > configure:34419: $? = 0 This as well. > configure:34500: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm >&5 > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker > configure:34500: $? = 0 This as well. > configure:34555: checking whether cairo's pthread feature could be enabled > configure:34557: result: no (can't link with -lpthread or -pthread) So why does it conclude that thread support is not available? > + dnl Make sure we scored some pthreads. > + if test "x$enable_pthread" = "xyes" -a "x$have_pthread" != "xyes"; then > +- AC_MSG_ERROR([pthread requested but not found]) > ++ AC_MSG_WARN([pthread requested but not found]) > ++ have_pthread=yes This looks odd because you're basically "ignoring" the detection/validation of thread support. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From Alberto.Fahrenkrog at rigtechnologies.com.au Thu Feb 23 23:47:01 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Thu, 23 Feb 2023 23:47:01 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: <20230223195409.GM2718518@scaer> References: <40f9568e5843d49c2afd808bec856bde@umbiko.net> <03da8459-7360-1391-7e64-86d3fd75f145@mind.be> <20230223195409.GM2718518@scaer> Message-ID: Yann, Arnout, thanks a lot. I just tried this and it worked beautifully! I really appreciate your support. Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: Yann E. MORIN Sent: Friday, February 24, 2023 3:54 AM To: Arnout Vandecappelle Cc: Alberto Fahrenkrog ; buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build Arnout, All, On 2023-02-23 20:39 +0100, Arnout Vandecappelle spake thusly: > On 23/02/2023 10:13, Alberto Fahrenkrog wrote: > >Hi all, I'm slowly getting ahead with this, and I still have a few more questions... > > > >I'm trying to get a tar.gz file from a git repo, which needs > >authentication. The command that works manually is: > >/wget https://outwebsite.com/koala/archive/release1.2.3.tar.gz --header > >'Authorization: token MY_TOKEN'/ > >/ > >/ > >And the .mk file is configured as: > >PYTHON_KOALA_SITE_METHOD = wget > >PYTHON_KOALA_DL_OPTS = --header 'Authorization: token MY_TOKEN' > > Since commit 3f2bdd0701de4f2bca7e6d96f96972e7bcabdd93 (by Yann, in Cc), it > is necessary to twice-quote the arguments to wget (and wget only). So Oh dang, a commit from 7 years ago... ;-) > PYTHON_KOALA_DL_OPTS = --header "'Authorization: token MY_TOKEN'" > > Yann, I honestly don't understand why this eval is needed, instead of > simply passing BR2_HG unquoted... But I didn't look too deeply into it. That's because that does not work? $ cat ess #!/usr/bin/env bash bar() { for i in "${@}"; do printf '__%s__\n' "${i}" done } MY_CMD="bar '1 2 3' a b 'C D'" ${MY_CMD} START "${@}" END echo MY_CMD="./foo '1 2 3' a b 'C D'" ${MY_CMD} START "${@}" END $ cat foo #!/usr/bin/env bash for i in "${@}"; do printf '>>%s<<\n' "${i}" done $ ./ess wee woo "woot woot" __'1__ __2__ __3'__ __a__ __b__ __'C__ __D'__ __START__ __wee__ __woo__ __woot woot__ __END__ >>'1<< >>2<< >>3'<< >>a<< >>b<< >>'C<< >>D'<< >>START<< >>wee<< >>woo<< >>woot woot<< >>END<< So, if the command for a downloader, as provided in the .config, contains quoted material, the quotes would be part of the word. Regards, Yann E. MORIN. > Regards, > Arnout > > > >PYTHON_KOALA_SITE = https://outwebsite.com/koala/archive/ > > > > > >The .mk file is being read correctly, but I can't figure out how to use > >DL_OPTS. The manual says DL_OPTS is a space separated list, but i see wget > >tries to use "token" or "MY_TOKEN" as the address. I tried a few different > >combinations of inverted commas, but none worked. > > > >Thanks again, > > > >Alberto > >/ > >/ > >/ > >/ > >Alberto? Fahrenkrog > > > > Senior Embedded Engineer > > > >Orica ? Perth Technology Centre > > > >p: +61 (0) 8 6365 4056 > > > >e: *Alberto.Fahrenkrog at rigtechnologies.com.au* > > > > > >-------------------------------------------------------------------------------- > >*From:* Alberto Fahrenkrog > >*Sent:* Thursday, February 23, 2023 3:13 PM > >*To:* buildroot at buildroot.org > >*Subject:* Re: [Buildroot] [Help] Struggling to build external python > >package on out of tree build > >Ok, I see now that external.mk is explained in chapter 9. I jumped > >straight to chapter 18 and missed external.mk completely. And for some > >reason I never found external.mk on my google searches. > > > >Thanks all for your help! > > > >Cheers, > > > >Alberto > >-------------------------------------------------------------------------------- > >*From:* buildroot on behalf of Alberto > >Fahrenkrog > >*Sent:* Thursday, February 23, 2023 3:09 PM > >*To:* buildroot at buildroot.org > >*Subject:* Re: [Buildroot] [Help] Struggling to build external python > >package on out of tree build > > > >You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. > >Learn why this is important > > > > > > > >Hi Andreas, > > > >Thank you so much! That did it! Where in the manual is external.mk > >explained? I missed it for sure... > > > >Cheers, > > > >Alberto > >Alberto? Fahrenkrog > > > > Senior Embedded Engineer > > > >Orica ? Perth Technology Centre > > > >p: +61 (0) 8 6365 4056 > > > >e: *Alberto.Fahrenkrog at rigtechnologies.com.au* > > > > > >-------------------------------------------------------------------------------- > >*From:* buildroot on behalf of Andreas > >Ziegler > >*Sent:* Thursday, February 23, 2023 2:49 PM > >*To:* Alberto Fahrenkrog > >*Cc:* buildroot at buildroot.org > >*Subject:* Re: [Buildroot] [Help] Struggling to build external python > >package on out of tree build > >[You don't often get email from br015 at umbiko.net. Learn why this is > >important at https://aka.ms/LearnAboutSenderIdentification > > ] > > > >Hi Alberto, > > > >On 2023-02-23 04:47, Alberto Fahrenkrog wrote: > >>Update, > >> > >>if I change $(eval $(python-koala)) to $(eval $(python-package)) I > >>still get the same error. I assume that might have been one mistake. > >> > >>Cheers, > >> > >>Alberto > >> > >>Alberto Fahrenkrog Senior Embedded Engineer > >>Orica - Perth Technology Centre > >>p: +61 (0) 8 6365 4056 > >>e: Alberto.Fahrenkrog at rigtechnologies.com.au > >>________________________________ > >>From: buildroot on behalf of Alberto > >>Fahrenkrog > >>Sent: Thursday, February 23, 2023 12:42 PM > >>To: buildroot at buildroot.org > >>Subject: [Buildroot] [Help] Struggling to build external python package > >>on out of tree build > >> > >>You don't often get email from > >>alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is > >>important >> > >>Hello all, > >> > >>I'm trying to build a very simple custom python package following the > >>instructions on the manual, yet I must be doing something very wrong as > >>I get this result: > >> > >>$ make python-koala > >>make[1]: *** No rule to make target 'python-koala'. Stop. > >>make: *** [Makefile:23: _all] Error 2 > >> > >>I create my out of tree build with: > >>make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build > >>O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads > >>br_build_defconfig > >> > >>On my "br_build" folder I have a Config.in file: > >>menu "Python-Libs" > >> source "~/Projects/br_build/package/python-koala/Config.in" > >>endmenu > > > >Similar to the include file for configs, you also need an external.mk > >file for the project make files, with this content: > > > > include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) > > > >Otherwise your .mk files will not be picked up. > > > >>In "br_build/packages/python-koala/Config.in" > > > >The package directory is usually named 'package', not sure if this is > >relevant (but Config.in /external.mk have to match it). > > > >>config BR2_PACKAGE_PYTHON_KOALA > >>??????bool "python-koala" > >> depends on BR2_PACKAGE_PYTHON3 > >>??????help > >>?????? Python implementation of Koala Library > >> > >>In "br_build/packages/python-koala/python-koala.mk" > >>################################################################################ > >># > >># python-koala > >># > >>################################################################################ > >> > >>PYTHON_KOALA_VERSION = 1.3.3 > >>PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz > >>PYTHON_KOALA_SITE = > >>https://mywebsite.com.au/ExternalCode/koala/archive/ > > > >>PYTHON_KOALA_SETUP_TYPE = setuptools > >> > >>$(eval $(python-koala)) > >> > >>If I run "make menuconfig" I can select or deselect the package, and > >>it's selected per default on the br_build_defconfig (and in .config): > >>BR2_PACKAGE_PYTHON_KOALA=y > >> > >>But if I try to run "make python-koala" I get the "no target" error. > >>I'll still have a read and see what I might be doing wrong, but I'm > >>very confused. Any ideas are very welcome. > >> > >>Cheers, > >> > >>Alberto > > > > > > > >Kind regards, > >Andreas > >_______________________________________________ > >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 -- .-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------' -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image506347.png Type: image/png Size: 14270 bytes Desc: image506347.png URL: From contact at martb.dev Fri Feb 24 01:04:45 2023 From: contact at martb.dev (=?UTF-8?Q?Martin_B=c3=b6h?=) Date: Fri, 24 Feb 2023 02:04:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/gr-osmosdr: add missing host-python-six dependency to python support In-Reply-To: References: Message-ID: Hey Thomas, thanks for taking a look. Sadly this is part of the pybind11 build process and there is no way to get rid of these docs, the ENABLE_DOXYGEN does not affect it. I found no viable solution to get rid of them. Same with gnuradio, it also has a lot of docs that cant be disabled. Kind regards, Martin B?h Am 23.02.23 um 23:13 schrieb Thomas Petazzoni: > Hello Martin, > > On Thu, 23 Feb 2023 21:17:33 +0100 > Martin B?h via buildroot wrote: > >> Osmosdr failed to build docs when python support is enabled. >> [ 41%] Copying osmosdr docstring templates as pybind headers ... >> Traceback (most recent call last): >> File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/update_pydoc.py", line 22, in >> from doxyxml import DoxyIndex, DoxyClass, DoxyFriend, DoxyFunction, DoxyFile >> File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/__init__.py", line 69, in >> from .doxyindex import DoxyIndex, DoxyFunction, DoxyParam, DoxyClass, DoxyFile, DoxyNamespace, DoxyGroup, DoxyFriend, DoxyOther >> File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/doxyindex.py", line 31, in >> from .generated import index >> File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/index.py", line 13, in >> from . import compound >> File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compound.py", line 15, in >> from . import compoundsuper as supermod >> File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compoundsuper.py", line 15, in >> import six >> ModuleNotFoundError: No module named 'six' >> make[2]: *** [python/bindings/CMakeFiles/osmosdr_docstrings.dir/build.make:73: python/bindings/docstring_status] Fehler 1 >> make[1]: *** [CMakeFiles/Makefile2:332: python/bindings/CMakeFiles/osmosdr_docstrings.dir/all] Fehler 2 >> >> Signed-off-by: Martin B?h > Is there potentially a way to disable building documentation instead? > Of course, adding host-python-six in the dependencies is not a huge > deal, but we really don't care about building documentation in the > context of Buildroot. > > Best regards, > > Thomas From thomas.petazzoni at bootlin.com Fri Feb 24 07:35:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 24 Feb 2023 07:35:53 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-23 Message-ID: <20230224073602.0E9FC40327@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-23 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 12 | 10 | 0 | 22 | master | 138 | 139 | 1 | 278 | next | 16 | 27 | 0 | 43 | Classification of failures by reason for master ----------------------------------------------- unknown | 8 glibc-2.36-81-g4f4d7a13edfd... | 6 gobject-introspection-1.72.0 | 6 host-binutils-2.38 | 6 host-pahole-1.24 | 6 python-numpy-1.23.5 | 6 elfutils-0.186 | 5 host-go-1.19.6 | 5 host-rust-1.67.0 | 3 libglib2-2.72.3 | 3 linux-6.1.11 | 3 systemd-252.4 | 3 boost-1.80.0 | 2 cairo-1.16.0 | 2 fs/cramfs/cramfs.mk:46: /ho... | 2 fs/ubifs/ubifs.mk:49: /home... | 2 gerbera-1.10.0 | 2 kexec-2.0.25 | 2 libcap-ng-0.8.3 | 2 libgpg-error-1.46 | 2 lirc-tools-0.10.2 | 2 mender-3.4.0 | 2 ocf-linux-20171122 | 2 olsr-0.9.8 | 2 package/multipath-tools/mul... | 2 putty-0.76 | 2 rdma-core-44.0 | 2 speechd-0.11.4 | 2 uqmi-0a19b5b77140465c29e2af... | 2 busybox-1.36.0 | 1 check-0.15.2 | 1 erlang-22.3.4.22 | 1 exim-4.96 | 1 frr-8.4.2 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fstrcmp-0.7.D001 | 1 gdal-3.5.2 | 1 gocryptfs-2.3 | 1 gtkmm3-3.22.0 | 1 host-binutils-2.37 | 1 host-binutils-2.39 | 1 host-gcc-final-10.4.0 | 1 json-c-0.16 | 1 kmod-30 | 1 kvmtool-f77d646ba01d04be5aa... | 1 libgcrypt-1.10.1 | 1 libmad-0.15.1b | 1 libnfc-1.8.0 | 1 libudfread-1.1.2 | 1 linux-5.10.162-cip24 | 1 mariadb-10.3.36 | 1 mawk | 1 netsniff-ng-0.6.8 | 1 netsurf-3.10 | 1 openssh-9.1p1 | 1 perl-5.36.0 | 1 php-8.2.3 | 1 quickjs-2021-03-27 | 1 reaver-1.6.6 | 1 s6-linux-utils-2.6.0.0 | 1 shellinabox-2.20 | 1 skalibs-2.12.0.1 | 1 tcf-agent-1.7.0 | 1 ti-sgx-km-cf7f48cb30abfd5df... | 1 uccp420wlan-6.9.1 | 1 valgrind-3.19.0 | 1 xenomai-3.0.10 | 1 xtables-addons-3.22 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/ad60da197a64f186595e2ec626f044e922da00f4 | arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/16ffef680a4ff393c992c3863d265e3251183ec0 | mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/ae787a8e73c7d6a5ade7551689c5acbf7b6113b7 | ORPH xtensa | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/5420beaf94855e47eeb08627e8e3c169dc00419a | xtensa | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/8598e1f68673c1754d02a770806099e1f6bb7b2e | powerpc64le | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/81fb9ac90dbf6ff1c76afd5f380fdcdeb7884cf5 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/81e8c2505fa175d6f4a4fe224577b21d708742b3 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/a75c7b19bf1d8c1f01dd0ba928335c38950f1578 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/0672c1b5af6b1af3c52e028bc61c8da938a04359 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/e8e7bf3aa8737dc9c5a6c04ccb75de6c2e0fef43 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/388a684b264c95d211a151c91198abea7980b277 | ORPH x86_64 | erlang-22.3.4.22 | NOK | http://autobuild.buildroot.net/results/36c74201f05f52b8e2fc7cbd6e42dbc6dfcfa045 | arm | exim-4.96 | NOK | http://autobuild.buildroot.net/results/fa5bc99a93473e9ab640a558b388833dbcafc94b | xtensa | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/a6542e2d41ff104cd5eaa35c2892b648bb88b85c | mips64el | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/537bcf98b0137a40c0b558289a811df5d3cd2065 | arm | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/c3da7d6f00be505e6f713e4b4770fd5ed9c4b058 | microblaze | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/e0f1a55e324688bc2aa56e0a73ea75c3e08e1bb1 | mipsel | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/647801e2b6500cdc6869ee090f39edbeaa0a2912 | sh4eb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/7a74b54a7568d17db3cd70430cb5469e461c51d5 | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/24e4e12456d31ed4cf0af28012c9b2cda262d2b3 | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/d7ee50fae8fa01e1ace6d8ef6c79b1d21778a9c6 | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/5d4c375a1f64b33f80bb9d4149376eb5ddeca245 | sparc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/fe9fd607c4a6384084790a11731835063d6a41fb | aarch64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/2be92d0ea9b7d949bcd0baddb4935a373152b7a2 | s390x | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/0992ccbc272b86a16ab8f650406bb89eb615711c | riscv32 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/b11ed715f4aa7027775bc5a1846d3d1ec3d7908a | mipsel | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/2b77e06af7547f34ab2405194cb83f8fee82ba08 | sh4 | gdal-3.5.2 | NOK | http://autobuild.buildroot.net/results/4e34ad89caeabd4443011f96cf4f635af5912fd7 | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/56c46fa7e922360d2c4b4093f8a030cc83726799 | sparc64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/f14c54a190b1453e0413f7f75c74d2fa6e335041 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/5549551b3d3eabc1e30e504b7d074537a9a96782 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/0afe67afafa3986d1e5255ea15e8da7efac2d743 | powerpc64 | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/d6ddc9ac4fcb1ab2522f4e5801891b8efbf9b635 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/bdea93970781a7219b3d36581d3ce23140f56757 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/6a363a0373e627acdb06e81de9693c6e1125a345 | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/13f6957545ca286cc8cfed2afe3e6e323351670c | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/b52569bb531e8aa33203033278e31ad272f7ba2f | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/59045ff4df658c242042433ecb4ae51de23aab82 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/6a2eeef3b5bb29974edd7f641e18aad674aaae13 | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/217569dcd6e0857ce6e3331c461515fff8f91645 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/bbb63a44bfc55e4ef49e18c1aa52bdd4c43a4fec | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/e24eef231eae4bdf9fbcf1e4d1a71679aa26b555 | ORPH x86_64 | gocryptfs-2.3 | NOK | http://autobuild.buildroot.net/results/18f0dfaa5dec76deac30e4947231194af47c13ca | aarch64_be | gtkmm3-3.22.0 | NOK | http://autobuild.buildroot.net/results/912b870d6483aa5e3533fb4b8515c5b872cfabd1 | mipsel | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/de5016ed30fe888f039e856cb0e08de31036ee6a | sparc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e1eb5ac94e1a2be459d0b999d2a5ec4484ad6c1b | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/f2bb8b9a1b539365257a706fefcf3a9f988a7b70 | mipsel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/b087bf6a64184cdbe35901c1bbe49235790fb343 | aarch64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/a0c8f2f07150d9be0af0cd361d549daeac84fe63 | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/9d17c96b4b1ab52adbd629f7cbda17e452fa6854 | i686 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/c500b73d8c0339cca4d2d7d42b435fd7be0ff60f | x86_64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/036ad6f59279405b01fa3529caeb2b78cd895550 | arceb | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/ee593cf22bfc11d4ccb52d7407cd55840a47684f | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/f0dd3dab511ee13e56f409a6eac62e771d2e4f15 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/23a54f54efbec94d74a49639bb71edc139162a55 | aarch64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/3b850ca2b6c51cf28eb230e78ed9eb97599a4fad | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/9dc2d77eaeb49b84adcdba0d2de56e56d6e73b99 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/bcae3c97f94db3cf21509c11b30d3e269902b5e6 | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2363ba61b4df285bbd60237eb32f49b10f5a3dd7 | sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/9d9fc6e24735de49583df40cd050c5a67f0553d1 | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ea21636a588aad04ad7793912b46844726cb4c85 | s390x | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ed4db2e03a5d4036cc757c067cff1311b11047d9 | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/3119be2906530a556205320771ee8a8fce7025fb | microblaze | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2a608d7490d2f14dbcb6dea0c24498ad3e175309 | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/9bdf41aa2f04394693d1fa2822edf648de1ce75c | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/ec9bf8fa13a995ef068508ab8755b48c8a2a6465 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/f3316d5c9fa4728e5ccc55cb4bfc82c250e2cfe6 | riscv64 | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/d37420015b230798611253aa121bf2122514d808 | armeb | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/90418c5239d596a4ee4ef70bbd5875cd3305de26 | ORPH sh4 | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/49771da00c31741063a12ee78eaa44539b230ec4 | ORPH arm | kmod-30 | NOK | http://autobuild.buildroot.net/results/c3ab3dcc55ec43b275e8f2e673fa7da817d07a37 | i686 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/3aaf26b96d25e9bf6e2c76035eb550dfecaf0228 | ORPH riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/0fba229d25f05e450365b6c903bd92a219550b7b | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/76d8ff47149c02dbe2ec68f66ac8152bed85f6d8 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/746df16ce64a879c8defc128cea6d026cbc33387 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/95f7ba434cfb6d5f0c0937619275482c4df1b346 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/d5deb31857091e0d44f01d94818d877b5deeb470 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/915f6b953ae88fed06c19e140c24f10089ea6d36 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/133152f7810c2e4354b102144b79d36d37630aec | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/61f92f8dd99fa7a8364438c531fafd4a4b1dc8f1 | ORPH armeb | libmad-0.15.1b | NOK | http://autobuild.buildroot.net/results/92a3f19b4fa12a7724f9e3d99284da4ad2beecb2 | ORPH or1k | libnfc-1.8.0 | NOK | http://autobuild.buildroot.net/results/64024ca6a7b070bb633ca3a80efd618357705625 | arm | libudfread-1.1.2 | NOK | http://autobuild.buildroot.net/results/30a2ba15186688d0211da8c9bdb7ca53e171a03a | mips | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/413b95a1962447bf7d52b6d10c5e8b1383617c85 | ORPH arceb | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/feef141784f2c8ddb7469baabf79bd1815cfd055 | ORPH riscv32 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/30d5816e7d8c105f3925a297e29d1f967778c387 | ORPH arm | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4135396a30d8411d4b72f34a2784dce6ba21663a | ORPH aarch64_be | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/e0e98ce16ecf70c9de48b25bd925b867090c64cd | ORPH i686 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/b08d307a235975fbbaa12f484136b7e9e438c70f | ORPH sparc | mariadb-10.3.36 | NOK | http://autobuild.buildroot.net/results/e6bf8871d438d272a08d977a87fe23ffc261c77c | ORPH m68k | mawk | TIM | http://autobuild.buildroot.net/results/c30e6acfc89d9b23400f76a6efd471aab512f132 | i686 | mender-3.4.0 | NOK | http://autobuild.buildroot.net/results/2b032d2a4e7cfbb20444c13821003120a4d00abd | i686 | mender-3.4.0 | NOK | http://autobuild.buildroot.net/results/f22e6d74d2511a71a6835bcf58290b892ab9a9c0 | x86_64 | netsniff-ng-0.6.8 | NOK | http://autobuild.buildroot.net/results/ff6cc5a2aff1f79fa361e6265514af16c58a20c6 | microblazeel | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/3dddcbbe7f6ecae5a2db6fac11fb659719452f73 | i586 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/5bcf0767ceea96c837aabc49558ea1bbd9bfd2c4 | ORPH powerpc64 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/dc669ea62e9a75a454d4281bae18ed93cd642497 | ORPH aarch64_be | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/5c36fc50a28dc2342c1ad0359ac2f3549c6e9750 | ORPH mipsel | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/40ddc2fc4a1552810aadc0f55ff2b0f3e57a37e6 | ORPH m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/55cfe103675557590faab5073aaee776377b5d33 | ORPH s390x | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/21bc3aa3e1b89ace5aebe771b8c34d5bd0cb9c3d | aarch64_be | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/5aa82ae809473f959ce49516c18a3ed11c4b1734 | s390x | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/1be343f89db372e78de5c6e7b916db08d7aec3da | microblazeel | php-8.2.3 | NOK | http://autobuild.buildroot.net/results/d4a6eb20005badca84214a55680cc2336b557528 | aarch64 | putty-0.76 | NOK | http://autobuild.buildroot.net/results/91dd5c89cbdf4068d06b42df25b66435b3cb6005 | aarch64 | putty-0.76 | NOK | http://autobuild.buildroot.net/results/6a4065b432887107b8e054b43a79708ce5e42307 | arm | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/e62abbcf18f15d4791fdbafa515662bb5c4a975b | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/36bb9349ee7e7e760eff679c83e21e84cb51a1aa | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/7b6809f5f5bbcc6027ebef1cb76a721f69724c54 | sh4aeb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/6bbfa1e76a79340727a9405fd3020c46780b729e | sh4 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/218a64ea89209e3370a703a713a65adfae45fd2b | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/2e3a624c24991413d52559d55b34262204fb64f2 | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/1529211d0fb4fc802420518485c581f32b737799 | m68k | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/abc85841893e97f058f22e012e99c7d1200ee7d7 | i586 | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/aa8e9a8fed8764d7e63580882f3f05909fcf3843 | arc | reaver-1.6.6 | NOK | http://autobuild.buildroot.net/results/926c9c7839023ec240f8fd4ba065ef15bd35a397 | mips64el | s6-linux-utils-2.6.0.0 | NOK | http://autobuild.buildroot.net/results/214bcecfc389cb412b68627c831300478d614a3a | xtensa | shellinabox-2.20 | NOK | http://autobuild.buildroot.net/results/2872b26253ecb5a1550268fcbcefe8fd974ff70d | or1k | skalibs-2.12.0.1 | NOK | http://autobuild.buildroot.net/results/c4d8dea9ba085a65e45b43e0b26d4cbb4325d65f | aarch64_be | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/4473bdfaa74b932f02957b7642ce8aaec41dae2f | x86_64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/500352a7678c21f4c66e5a3f2beea1cc791db872 | aarch64_be | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/6227df3a53f8a322fae400291207c2093e861dcf | mips64el | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/9826151cdc64c2e633da5f2b984b1205c5899df9 | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/b1796e6bf853560de9c7685b670edef7d2abe6b1 | microblazeel | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/7aab9a839d4ae8f5081e487f71796f73a46a1279 | arm | ti-sgx-km-cf7f48cb30abfd5df... | NOK | http://autobuild.buildroot.net/results/89149fe01a3d2a8d046bec7899486292567bb37d | s390x | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/c3a4e424916f1474b444e831d72fb4e2c5e65004 | ORPH aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/4f4820647f5839cc1c6b725dd3dd7665c5275aa1 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/82f02cee961f7df18e1f79bfc5ae86bf66b85169 | arceb | unknown | NOK | http://autobuild.buildroot.net/results/3ca012ce9b6a7e7d9ecd8949e8ee8b7750cc3e61 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/2eb02664c4524f65507b38b66de57f1ec1fcf535 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/fd766e4ad4815b92e44a8488bfba51fa2f8f6110 | mips | unknown | NOK | http://autobuild.buildroot.net/results/6cd359b3429f33b74f156b99550839e75348c694 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/aaf03f8cdad4c02bf1881e74ac1263193d9587fa | mips | unknown | NOK | http://autobuild.buildroot.net/results/addb9c2ed80e61bae4ce18421a163d2bb2cb1160 | s390x | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/d6bc02326877435a9479d9231cba43ea66556f15 | ORPH nios2 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/f6261181b0726c62703818ddc6772b87cd40a9a9 | ORPH mips | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/19b58969ca4a768804022eadb32922130ab600c3 | ORPH powerpc | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/b44bafe2e9229d0031df35a3a700635d009a1140 | arc | xtables-addons-3.22 | NOK | http://autobuild.buildroot.net/results/f2d596b510f027b94a6b1fad10c363922c50cbec | ORPH Classification of failures by reason for next --------------------------------------------- linux-6.1.11 | 4 host-binutils-2.38 | 2 host-rust-1.67.1 | 2 libgcrypt-1.10.1 | 2 acpid-2.0.34 | 1 elfutils-0.186 | 1 fwup-1.9.1 | 1 gmp-6.2.1 | 1 gqrx-2.14.4 | 1 host-pahole-1.24 | 1 hwloc-2.8.0 | 1 libcamera-apps-1.1.1 | 1 libglib2-2.72.3 | 1 ltp-testsuite-20220930 | 1 lttng-babeltrace-1.5.7 | 1 mutt-2.2.9 | 1 pv-1.6.20 | 1 uccp420wlan-6.9.1 | 1 ulog-0389d243352255f6182326... | 1 unknown | 1 xfsprogs-5.14.2 | 1 Detail of failures for next --------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/35368c241971ca36db7e4e62929131898d707f4c | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/c171c695cb4ceb5745cce22aac2b880e74f790fc | ORPH mipsel | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/a522676bf5ce7b8bce4a9c2fac90599afc10e529 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/8c259722ad084da709644b02f272a79d210659ad | ORPH mipsel | gqrx-2.14.4 | NOK | http://autobuild.buildroot.net/results/5f224d0f40fe38e58cd48354b4053f6ae243f2c8 | mips64el | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/f10e828deb87773bc8d5f030342acfba6e507cf7 | powerpc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/b7ae1443ea956f3ba7291ad7c9fb73095e97c513 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/256b80c8192581091d37e0a2eed4c5492b666962 | mipsel | host-rust-1.67.1 | NOK | http://autobuild.buildroot.net/results/a664aed4764312378e9aa9da937923c44dca0b47 | x86_64 | host-rust-1.67.1 | NOK | http://autobuild.buildroot.net/results/98a203801ed1c06e80b0702f7b2be75ba185ae19 | x86_64 | hwloc-2.8.0 | NOK | http://autobuild.buildroot.net/results/aaf4faa3964df8bff747fb2069f632fb9fcd6f7a | mips64 | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/a14e2548af4d39a47f3916384e48135413c621e2 | i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/9929386044ff8f37f998203a0c6cbbd78a510ec9 | ORPH arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/c2cfe1769a231db897e945ca17159fa06b0e5f92 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/bc4cf3975c784a6b3b9eee72d9bfda3becf7a7be | mipsel | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/184eebcbb0769400388bc176ad04fd8ca1bea2c0 | ORPH powerpc64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/e67a61eff21e51ad1a918729146f9720ea324e09 | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/8be1e703bd3738aedd80bac93565d56ce23aa1a9 | ORPH sh4a | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/db2d0efa501959943febce11f5dbfdefa2cf2cf8 | ORPH arm | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/b713e4294a891ae08ad4afd8031e46bd1d09bd57 | m68k | lttng-babeltrace-1.5.7 | NOK | http://autobuild.buildroot.net/results/4f465fe15664b1f9df3f26c331dc550852972f2f | aarch64_be | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/2399a6d8eba249e2e880a0a060bb38a92f5e047e | armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/499042067b2cdb54127275cc90f580f5f9b306f6 | ORPH i586 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/f85427ba27fdc3fa2bf1b936baab017259fbac71 | ORPH sparc64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/d2bd9e5271e16794e6aa47d001a88f15eb1bfb7e | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/fb707d74d9cc0e6069ba9297c544ea3ad8d7ef3d | mipsel | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/1187a079fb2d0aafcce899575e6e43f396df41f8 | ORPH Classification of failures by reason for 2022.11.x -------------------------------------------------- ace-7.0.6 | 1 boost-1.80.0 | 1 dropbear-2022.82 | 1 efivar-38 | 1 elfutils-0.186 | 1 gerbera-1.10.0 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 luajit-6c4826f12c4d33b8b978... | 1 open62541-v1.3.3 | 1 zabbix-5.4.9 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/549727e0f7066e9d4467899089f698b5cdb186be | ORPH arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/1575b04c32dff0cc702bf722fcaad2fee06d5ccb | riscv64 | dropbear-2022.82 | NOK | http://autobuild.buildroot.net/results/330a84cb6471e86d4bdf191e61f5e35a710a77f4 | arm | efivar-38 | NOK | http://autobuild.buildroot.net/results/277f783c33102a0cea7c82ca902119ab90f37ad4 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/9166cdf54f9523d24a79dc2aeaae5139c91be178 | ORPH aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/739b57ae928aed1d734e32fcd732c4b63a1e8e32 | arc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/1539bf86643d38f9a16081978c46b7ef14aca7ce | powerpc | luajit-6c4826f12c4d33b8b978... | NOK | http://autobuild.buildroot.net/results/37cba5632c67b3c5eabbd47f208297849dc51eef | riscv32 | open62541-v1.3.3 | NOK | http://autobuild.buildroot.net/results/79de0744f5c4cbd4d7e4b8348008eb9c04c0acc0 | ORPH s390x | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/5cd9212264e61ca43cbdbb0995939c247a549f4c | Gitlab CI results for 2023-02-23 ================================ Detail of defconfig failures for 2023.02-rc1 -------------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ qemu_s390x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3819524265 | Detail of runtime-test failures for 2023.02-rc1 ----------------------------------------------- runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ DetectBadArchTest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787630 | ORPH TestAarch64Pages64kGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788057 | ORPH TestAarch64Pages64kMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788058 | ORPH TestAarch64Pages64kuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788059 | ORPH TestAtop | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787779 | ORPH TestAvocado | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787781 | ORPH TestClangCompilerRT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787789 | ORPH TestCpioDracutGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787667 | ORPH ...ioDracutGlibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787668 | ORPH TestCpioDracutMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787669 | ORPH ...pioDracutMuslMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787670 | ORPH TestCpioDracutUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787671 | ORPH ...oDracutUclibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787672 | ORPH TestCpioFull | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787673 | ORPH TestCrudiniPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787792 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787795 | ORPH TestDropbear | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787797 | ORPH TestDtbocfg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787799 | ORPH TestExecline | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787800 | ORPH TestExt2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787674 | ORPH TestExt2r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787677 | ORPH TestExt3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787678 | ORPH TestExt4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787680 | ORPH ...rch64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788069 | ORPH ...tlinAarch64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788070 | ORPH ...arch64MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788071 | ORPH ...otlinAarch64MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788072 | ORPH ...ch64UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788073 | ORPH ...linAarch64UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788074 | ORPH ...h64beGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788075 | ORPH ...inAarch64beGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788076 | ORPH ...64beUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788077 | ORPH ...nAarch64beUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788078 | ORPH ...750dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788079 | ORPH ...nArcle750dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788080 | ORPH ...ehs38GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788081 | ORPH ...inArclehs38GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788082 | ORPH ...hs38UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788084 | ORPH ...nArclehs38UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788085 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788086 | ORPH ...mebv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788087 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788088 | ORPH ...rmebv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788089 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788090 | ORPH ...ebv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788091 | ORPH ...5eabiGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788092 | ORPH ...inArmv5eabiGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788093 | ORPH ...v5eabiMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788094 | ORPH ...linArmv5eabiMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788095 | ORPH ...eabiUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788096 | ORPH ...nArmv5eabiUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788097 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788098 | ORPH ...Armv6eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788099 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788100 | ORPH ...nArmv6eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788101 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788102 | ORPH ...rmv6eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788104 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788106 | ORPH ...Armv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788108 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788111 | ORPH ...nArmv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788112 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788113 | ORPH ...rmv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788114 | ORPH ...mv7mUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788115 | ORPH ...tlinArmv7mUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788116 | ORPH ...8xxxUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788117 | ORPH ...nM68k68xxxUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788118 | ORPH ...fireUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788119 | ORPH ...8kcoldfireUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788120 | ORPH ...azebeGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788121 | ORPH ...icroblazebeGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788122 | ORPH ...lazebeMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788123 | ORPH ...MicroblazebeMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788125 | ORPH ...zebeUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788127 | ORPH ...croblazebeUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788128 | ORPH ...azeelGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788130 | ORPH ...icroblazeelGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788131 | ORPH ...lazeelMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788133 | ORPH ...MicroblazeelMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788135 | ORPH ...zeelUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788137 | ORPH ...croblazeelUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788138 | ORPH ...ips32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788140 | ORPH ...otlinMips32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788142 | ORPH ...Mips32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788144 | ORPH ...ootlinMips32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788146 | ORPH ...ps32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788148 | ORPH ...tlinMips32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788150 | ORPH ...s32elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788151 | ORPH ...linMips32elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788153 | ORPH ...ps32elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788154 | ORPH ...tlinMips32elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788156 | ORPH ...32elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788157 | ORPH ...inMips32elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788159 | ORPH ...2r5elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788160 | ORPH ...nMips32r5elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788162 | ORPH ...32r5elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788163 | ORPH ...inMips32r5elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788164 | ORPH ...r5elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788165 | ORPH ...Mips32r5elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788166 | ORPH ...2r6elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788167 | ORPH ...nMips32r6elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788168 | ORPH ...32r6elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788169 | ORPH ...inMips32r6elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788170 | ORPH ...r6elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788171 | ORPH ...Mips32r6elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788172 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788173 | ORPH ...Mips64eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788174 | ORPH ...4eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788175 | ORPH ...nMips64eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788176 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788177 | ORPH ...ips64eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788179 | ORPH ...64n32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788180 | ORPH ...inMips64n32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788182 | ORPH ...s64n32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788183 | ORPH ...linMips64n32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788184 | ORPH ...4n32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788185 | ORPH ...nMips64n32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788186 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788187 | ORPH ...ps64r6eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788188 | ORPH ...6eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788189 | ORPH ...ips64r6eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788190 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788191 | ORPH ...s64r6eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788192 | ORPH ...Nios2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788193 | ORPH ...ootlinNios2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788194 | ORPH ...nriscGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788195 | ORPH ...linOpenriscGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788196 | ORPH ...enriscMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788197 | ORPH ...tlinOpenriscMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788198 | ORPH ...riscUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788199 | ORPH ...inOpenriscUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788201 | ORPH ...440fpGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788202 | ORPH ...owerpc440fpGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788204 | ORPH ...c440fpMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788206 | ORPH ...Powerpc440fpMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788208 | ORPH ...40fpUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788212 | ORPH ...werpc440fpUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788214 | ORPH ...e5500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788216 | ORPH ...erpc64e5500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788220 | ORPH ...e6500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788224 | ORPH ...erpc64e6500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788228 | ORPH ...4e6500MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788230 | ORPH ...werpc64e6500MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788231 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788233 | ORPH ...c64lepower8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788235 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788236 | ORPH ...pc64lepower8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788238 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788241 | ORPH ...rpc64power8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788242 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788244 | ORPH ...erpc64power8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788246 | ORPH ...300c3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788247 | ORPH ...werpce300c3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788250 | ORPH ...e300c3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788252 | ORPH ...owerpce300c3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788253 | ORPH ...00c3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788256 | ORPH ...erpce300c3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788260 | ORPH ...500mcGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788261 | ORPH ...werpce500mcGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788263 | ORPH ...e500mcMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788265 | ORPH ...owerpce500mcMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788267 | ORPH ...00mcUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788268 | ORPH ...erpce500mcUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788270 | ORPH ...lp32dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788271 | ORPH ...lp64dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788272 | ORPH ...iscv64lp64dGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788273 | ORPH ...4lp64dMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788274 | ORPH ...Riscv64lp64dMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788276 | ORPH ...p64dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788278 | ORPH ...scv64lp64dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788279 | ORPH ...0xz13GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788280 | ORPH ...linS390xz13GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788282 | ORPH ...Shsh4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788283 | ORPH ...ootlinShsh4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788284 | ORPH ...nShsh4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788285 | ORPH ...BootlinShsh4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788286 | ORPH ...hsh4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788287 | ORPH ...otlinShsh4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788288 | ORPH ...h4aebGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788289 | ORPH ...linShsh4aebGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788290 | ORPH ...sh4aebMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788291 | ORPH ...tlinShsh4aebMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788292 | ORPH ...arc64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788293 | ORPH ...tlinSparc64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788294 | ORPH ...rcv8UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788295 | ORPH ...linSparcv8UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788297 | ORPH ...X8664GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788300 | ORPH ...ootlinX8664GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788302 | ORPH ...nX8664MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788304 | ORPH ...BootlinX8664MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788307 | ORPH ...8664UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788309 | ORPH ...otlinX8664UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788311 | ORPH ...orei7GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788312 | ORPH ...X8664corei7GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788314 | ORPH ...corei7MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788315 | ORPH ...nX8664corei7MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788317 | ORPH ...rei7UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788318 | ORPH ...8664corei7UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788319 | ORPH ...664v2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788320 | ORPH ...tlinX8664v2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788322 | ORPH ...8664v2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788323 | ORPH ...otlinX8664v2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788324 | ORPH ...64v2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788325 | ORPH ...linX8664v2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788326 | ORPH ...664v3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788327 | ORPH ...tlinX8664v3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788328 | ORPH ...8664v3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788329 | ORPH ...otlinX8664v3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788330 | ORPH ...64v3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788331 | ORPH ...linX8664v3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788332 | ORPH ...664v4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788333 | ORPH ...tlinX8664v4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788334 | ORPH ...8664v4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788335 | ORPH ...otlinX8664v4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788336 | ORPH ...64v4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788337 | ORPH ...linX8664v4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788338 | ORPH ...core2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788339 | ORPH ...linX86core2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788340 | ORPH ...6core2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788341 | ORPH ...tlinX86core2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788342 | ORPH ...ore2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788343 | ORPH ...inX86core2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788344 | ORPH ...6i686GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788345 | ORPH ...tlinX86i686GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788346 | ORPH ...86i686MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788347 | ORPH ...otlinX86i686MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788348 | ORPH ...i686UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788349 | ORPH ...ToolchainBuildrootMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788060 | ORPH ...olchainBuildrootuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788061 | ORPH ...xternalToolchainCCache | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788062 | ORPH ...ernalToolchainCtngMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788063 | ORPH ...rnalToolchainLinaroArm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788064 | ORPH ...ToolchainSourceryArmv4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788065 | ORPH ...ToolchainSourceryArmv5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788066 | ORPH ...ToolchainSourceryArmv7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788067 | ORPH TestF2FS | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787684 | ORPH TestFileCapabilities | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787631 | ORPH TestFortifyConserv | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787633 | ORPH TestFortifyNone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787634 | ORPH TestGdbArc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787803 | ORPH TestGdbFullTarget | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787805 | ORPH ...GdbHostOnlyAllFeatures | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787807 | ORPH TestGdbHostOnlyDefault | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787810 | ORPH TestGdbserverOnly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787814 | ORPH TestGitHash | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787659 | ORPH TestGitHub | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787662 | ORPH TestGitLab | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787664 | ORPH TestGitRefs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787661 | ORPH TestGlibcAllTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787654 | ORPH ...DefaultLimitedTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787655 | ORPH TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787815 | ORPH TestGnupg2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787818 | ORPH TestGrubAArch64EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787621 | ORPH TestGrubX8664EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787622 | ORPH TestGrubi386BIOS | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787623 | ORPH TestGrubi386EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787625 | ORPH TestGst1Python | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787821 | ORPH TestHWLoc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787826 | ORPH TestHighway | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787823 | ORPH TestHostBmapTools | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787782 | ORPH TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787829 | ORPH TestInitSystemBusyboxRo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787726 | ORPH ...InitSystemBusyboxRoNet | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787728 | ORPH TestInitSystemBusyboxRw | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787730 | ORPH ...InitSystemBusyboxRwNet | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787733 | ORPH TestInitSystemNone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787734 | ORPH ...InitSystemOpenrcRoFull | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787738 | ORPH ...InitSystemOpenrcRwFull | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787740 | ORPH ...nitSystemSystemdRoFull | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787744 | ORPH ...ystemSystemdRoIfupdown | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787747 | ORPH ...mdRoIfupdownDbusbroker | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787750 | ORPH ...IfupdownDbusbrokerDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787753 | ORPH ...ystemSystemdRoNetworkd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787756 | ORPH ...nitSystemSystemdRwFull | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787758 | ORPH ...ystemSystemdRwIfupdown | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787761 | ORPH ...mdRwIfupdownDbusbroker | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787765 | ORPH ...IfupdownDbusbrokerDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787767 | ORPH ...ystemSystemdRwNetworkd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787770 | ORPH TestIso9660Grub2EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787685 | ORPH TestIso9660Grub2External | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787689 | ORPH ...0Grub2ExternalCompress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787692 | ORPH TestIso9660Grub2Hybrid | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787695 | ORPH TestIso9660Grub2Internal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787699 | ORPH ...so9660SyslinuxExternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787702 | ORPH ...slinuxExternalCompress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787704 | ORPH ...so9660SyslinuxInternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787707 | ORPH TestJffs2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787710 | ORPH TestLibJXL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787835 | ORPH TestLibshdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787837 | ORPH TestLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787848 | ORPH TestLuaHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787875 | ORPH TestLuaInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787878 | ORPH TestLuaLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787841 | ORPH TestLuaLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787844 | ORPH TestLuaLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787854 | ORPH TestLuaLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787857 | ORPH TestLuaLuaCffi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787862 | ORPH TestLuaLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787863 | ORPH TestLuaLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787893 | ORPH TestLuaLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787895 | ORPH TestLuaLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787872 | ORPH TestLuaLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787897 | ORPH TestLuaLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787884 | ORPH TestLuaLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787901 | ORPH TestLuaLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787886 | ORPH TestLuaLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787903 | ORPH TestLuaLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787905 | ORPH TestLuaLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787869 | ORPH TestLuaLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787899 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787907 | ORPH TestLuaLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787891 | ORPH TestLuaLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787881 | ORPH TestLuaLzlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787911 | ORPH TestLuaRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788038 | ORPH TestLuaUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787889 | ORPH TestLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787851 | ORPH TestLuajitHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787877 | ORPH TestLuajitInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787880 | ORPH TestLuajitLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787843 | ORPH TestLuajitLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787846 | ORPH TestLuajitLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787855 | ORPH TestLuajitLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787859 | ORPH TestLuajitLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787866 | ORPH TestLuajitLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787894 | ORPH TestLuajitLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787896 | ORPH TestLuajitLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787873 | ORPH TestLuajitLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787898 | ORPH TestLuajitLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787885 | ORPH TestLuajitLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787902 | ORPH TestLuajitLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787888 | ORPH TestLuajitLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787904 | ORPH TestLuajitLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787906 | ORPH TestLuajitLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787870 | ORPH TestLuajitLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787900 | ORPH TestLuajitLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787908 | ORPH TestLuajitLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787892 | ORPH TestLuajitLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787882 | ORPH TestLuajitRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788039 | ORPH TestLuajitTurbolua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788050 | ORPH TestLuajitUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787890 | ORPH TestLuvi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787909 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787910 | ORPH TestMender | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787912 | ORPH TestMsrTools | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787913 | ORPH TestNcdu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787914 | ORPH TestNetdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787915 | ORPH TestNoTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787657 | ORPH TestNodeJSBasic | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787916 | ORPH TestNodeJSModule | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787917 | ORPH TestOci | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787712 | ORPH TestOctave | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787918 | ORPH TestOla | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787920 | ORPH TestOpenJdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787921 | ORPH TestOpenSshGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787922 | ORPH TestOpenSshuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787923 | ORPH TestOpkg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787924 | ORPH TestPerftest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787925 | ORPH TestPerl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787926 | ORPH TestPerlClassLoad | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787927 | ORPH TestPerlDBDmysql | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787928 | ORPH TestPerlEncodeDetect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787929 | ORPH TestPerlGDGraph | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787930 | ORPH TestPerlHTMLParser | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787931 | ORPH TestPerlIOSocketMulticast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787932 | ORPH TestPerlIOSocketSSL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787933 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787935 | ORPH TestPerlMailDKIM | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787936 | ORPH TestPerlX10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787937 | ORPH TestPerlXMLLibXML | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787938 | ORPH TestPerllibwwwperl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787934 | ORPH TestPhpApcu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787939 | ORPH TestPhpLuaLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787940 | ORPH TestPhpLuaLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787941 | ORPH TestPhpPam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787942 | ORPH TestPhpPeclDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787943 | ORPH TestPixz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787944 | ORPH TestPolkitInitd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787945 | ORPH TestPolkitSystemd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787946 | ORPH TestPostScripts | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787639 | ORPH TestProsodyLua51 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787947 | ORPH TestProsodyLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787948 | ORPH TestPy3BmapTools | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787786 | ORPH TestPyNdiff | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788009 | ORPH TestPython3Py | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787949 | ORPH TestPython3PyPyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787950 | ORPH TestPython3Pyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787951 | ORPH TestPythonAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787955 | ORPH TestPythonAvro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787958 | ORPH TestPythonPahoMQTT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788003 | ORPH TestPythonPy3Aexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787952 | ORPH TestPythonPy3Argh | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787953 | ORPH TestPythonPy3Attrs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787954 | ORPH TestPythonPy3Autobahn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787956 | ORPH TestPythonPy3Automat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787957 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787959 | ORPH TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787960 | ORPH TestPythonPy3Botocore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787961 | ORPH TestPythonPy3Can | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787963 | ORPH TestPythonPy3Cbor | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787964 | ORPH TestPythonPy3Click | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787965 | ORPH TestPythonPy3Colorzero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787966 | ORPH TestPythonPy3Constantly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787968 | ORPH TestPythonPy3Construct | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787970 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787972 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787973 | ORPH TestPythonPy3DBusFast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787975 | ORPH TestPythonPy3DBusNext | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787977 | ORPH TestPythonPy3Dicttoxml2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787979 | ORPH TestPythonPy3Distro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787980 | ORPH TestPythonPy3Django | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787982 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787984 | ORPH TestPythonPy3Flask | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787986 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787987 | ORPH TestPythonPy3Git | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787989 | ORPH TestPythonPy3Gitdb2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787991 | ORPH TestPythonPy3GnuPG | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787993 | ORPH TestPythonPy3Gobject | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787994 | ORPH TestPythonPy3Gpiozero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787995 | ORPH TestPythonPy3Hkdf | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787996 | ORPH TestPythonPy3Incremental | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787997 | ORPH TestPythonPy3Iptables | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787999 | ORPH TestPythonPy3Jmespath | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788000 | ORPH TestPythonPy3Libftdi1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787832 | ORPH ...PythonPy3MagicWormhole | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788001 | ORPH TestPythonPy3Munch | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788002 | ORPH TestPythonPy3Passlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788004 | ORPH TestPythonPy3Pexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788005 | ORPH TestPythonPy3PyAlsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788006 | ORPH TestPythonPy3Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788008 | ORPH TestPythonPy3Pytest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788010 | ORPH ...PythonPy3PytestAsyncio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788011 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788012 | ORPH TestPythonPy3Qrcode | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788013 | ORPH TestPythonPy3RSA | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788015 | ORPH TestPythonPy3RpiGpio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788014 | ORPH TestPythonPy3S3transfer | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788017 | ORPH TestPythonPy3SciPy | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788018 | ORPH ...thonPy3ServiceIdentity | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788019 | ORPH TestPythonPy3Smmap2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788020 | ORPH TestPythonPy3Spake2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788021 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788023 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788025 | ORPH TestPythonPy3Txaio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788027 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788029 | ORPH TestPythonPy3Ubjson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788030 | ORPH ...y3UnitTestXmlReporting | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788032 | ORPH TestPythonPy3rtoml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788016 | ORPH TestPythonPybind | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788007 | ORPH TestRdmaCore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788034 | ORPH TestRedis | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788037 | ORPH TestRelro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787635 | ORPH TestRelroPartial | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787636 | ORPH TestRootPassword | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787640 | ORPH TestRootfsOverlay | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787642 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788040 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788041 | ORPH TestS6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788042 | ORPH TestS6Networking | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788043 | ORPH TestS6PortableUtils | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788045 | ORPH TestS6Rc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788046 | ORPH TestSCP | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787665 | ORPH TestSELinuxCustomGit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787645 | ORPH TestSELinuxExtraModules | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787648 | ORPH ...ELinuxExtraModulesDirs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787649 | ORPH TestSELinuxPackage | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787652 | ORPH TestSELinuxSystemdExt4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787773 | ORPH ...SELinuxSystemdSquashfs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787776 | ORPH TestSFTP | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787666 | ORPH TestSquashfs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787714 | ORPH TestSquashfsMaxBlocksize | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787717 | ORPH TestSquashfsMinBlocksize | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787718 | ORPH TestSspNone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787637 | ORPH TestSspStrong | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787638 | ORPH TestSudo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788047 | ORPH TestSysLinuxX86EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787626 | ORPH TestSysLinuxX86LegacyBios | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787627 | ORPH TestSysLinuxX86_64EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787628 | ORPH ...sLinuxX86_64LegacyBios | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787629 | ORPH TestSyslogNg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788048 | ORPH TestTmux | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788049 | ORPH TestUbi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787720 | ORPH TestUbootOpensslPkgConfig | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788051 | ORPH TestYaffs2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787723 | ORPH TestZ3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788052 | ORPH TestZerofree | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788053 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788054 | ORPH TestZfsMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788055 | ORPH TestZfsUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788056 | ORPH -- http://autobuild.buildroot.net From peter at korsgaard.com Fri Feb 24 07:35:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 24 Feb 2023 08:35:59 +0100 Subject: [Buildroot] [PATCH 1/1] utils/test-pkg: proper output on host without jq installed In-Reply-To: <20230207165109.GJ4124@scaer> (Yann E. MORIN's message of "Tue, 7 Feb 2023 17:51:09 +0100") References: <20221012164831.10476-1-sebastien.szymanski@armadeus.com> <20230207165109.GJ4124@scaer> Message-ID: <87edqfplb4.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > S?bastien, All, > On 2022-10-12 18:48 +0200, S?bastien Szymanski spake thusly: >> On host without jq installed, test-pkg's output is as following: >> >> $ ./utils/test-pkg -p mmc-utils >> bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) >> JQ IS >> OK >> bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) >> JQ IS >> OK >> bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) >> ... >> >> Since test-pkg handles this case we can hide this error message and have >> proper output: >> >> $ ./utils/test-pkg -p mmc-utils >> bootlin-armv5-uclibc [1/6]: OK >> bootlin-armv7-glibc [2/6]: OK >> bootlin-armv7m-uclibc [3/6]: OK >> >> Signed-off-by: S?bastien Szymanski > Applied to master, thanks. Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 24 07:35:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 24 Feb 2023 08:35:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] utils/test-pkg: proper output on host without jq installed Message-ID: <20230224073609.A805686A03@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c4fb99b80ae2925e04676cfc9ecffd0c35c430c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x On host without jq installed, test-pkg's output is as following: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) ... Since test-pkg handles this case we can hide this error message and have proper output: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK Signed-off-by: S??bastien Szymanski Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 09ac5a9e18e96ba6d3cd13e5e8d34aeccfcb603d) Signed-off-by: Peter Korsgaard --- utils/test-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test-pkg b/utils/test-pkg index 4ebfd9af66..e7f5464817 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -201,7 +201,7 @@ build_one() { # Validate that we generate proper json as show-info { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; - JQ="$(which jq)" + JQ="$(which jq 2> /dev/null)" if [ -z "${JQ}" ]; then make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 JQ="${dir}/host/bin/jq" From peter at korsgaard.com Fri Feb 24 07:35:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 24 Feb 2023 08:35:16 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] utils/test-pkg: proper output on host without jq installed Message-ID: <20230224073716.4F3A386A0B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=626cd6827cb2ac8caee295350195fe282121807f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x On host without jq installed, test-pkg's output is as following: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) ... Since test-pkg handles this case we can hide this error message and have proper output: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK Signed-off-by: S??bastien Szymanski Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 09ac5a9e18e96ba6d3cd13e5e8d34aeccfcb603d) Signed-off-by: Peter Korsgaard --- utils/test-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test-pkg b/utils/test-pkg index 4ebfd9af66..e7f5464817 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -201,7 +201,7 @@ build_one() { # Validate that we generate proper json as show-info { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; - JQ="$(which jq)" + JQ="$(which jq 2> /dev/null)" if [ -z "${JQ}" ]; then make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 JQ="${dir}/host/bin/jq" From d.lang at abatec.at Fri Feb 24 08:42:18 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:42:18 +0000 Subject: [Buildroot] [PATCH 0/6] package/gtkmm3: duplicate needed packages Message-ID: As discussed some time ago [0], gtkmm3 doesn't support newer versions of the other C++ binding packages. According to the gtkmm mailing list [1] there were no plans to every support them, back then the API change was introduced in all the other packages. gtkmm4, which targets libgtk4 supports them. Recent interest in gtkmm3 let me to try and put together a series that would duplicate the needed packages. The alternative to this series would be to drop gtkmm3. All of them support installing and using both versions side-by-side. [0]: https://lists.buildroot.org/pipermail/buildroot/2021-October/625850.html [1]: https://mail.gnome.org/archives/gtkmm-list/2021-May/msg00000.html [2]: https://lists.buildroot.org/pipermail/buildroot/2023-February/661803.html Daniel Lang (6): package/libsigc2: new package package/glibmm2_66: new package package/atkmm2_28: new package package/cairomm1_14: new package package/pangomm2_46: new package package/gtkmm3: use correct versions of mm packages DEVELOPERS | 10 ++++++++++ package/Config.in | 5 +++++ package/atkmm/Config.in | 2 +- package/atkmm2_28/Config.in | 23 +++++++++++++++++++++++ package/atkmm2_28/atkmm2_28.hash | 5 +++++ package/atkmm2_28/atkmm2_28.mk | 16 ++++++++++++++++ package/cairomm/Config.in | 2 +- package/cairomm1_14/Config.in | 22 ++++++++++++++++++++++ package/cairomm1_14/cairomm1_14.hash | 3 +++ package/cairomm1_14/cairomm1_14.mk | 16 ++++++++++++++++ package/glibmm/Config.in | 2 +- package/glibmm2_66/Config.in | 21 +++++++++++++++++++++ package/glibmm2_66/glibmm2_66.hash | 5 +++++ package/glibmm2_66/glibmm2_66.mk | 23 +++++++++++++++++++++++ package/gtkmm3/Config.in | 16 ++++++++-------- package/gtkmm3/gtkmm3.mk | 2 +- package/libsigc/Config.in | 2 +- package/libsigc2/Config.in | 17 +++++++++++++++++ package/libsigc2/libsigc2.hash | 5 +++++ package/libsigc2/libsigc2.mk | 19 +++++++++++++++++++ package/pangomm/Config.in | 2 +- package/pangomm2_46/Config.in | 25 +++++++++++++++++++++++++ package/pangomm2_46/pangomm2_46.hash | 5 +++++ package/pangomm2_46/pangomm2_46.mk | 16 ++++++++++++++++ 24 files changed, 250 insertions(+), 14 deletions(-) create mode 100644 package/atkmm2_28/Config.in create mode 100644 package/atkmm2_28/atkmm2_28.hash create mode 100644 package/atkmm2_28/atkmm2_28.mk create mode 100644 package/cairomm1_14/Config.in create mode 100644 package/cairomm1_14/cairomm1_14.hash create mode 100644 package/cairomm1_14/cairomm1_14.mk create mode 100644 package/glibmm2_66/Config.in create mode 100644 package/glibmm2_66/glibmm2_66.hash create mode 100644 package/glibmm2_66/glibmm2_66.mk create mode 100644 package/libsigc2/Config.in create mode 100644 package/libsigc2/libsigc2.hash create mode 100644 package/libsigc2/libsigc2.mk create mode 100644 package/pangomm2_46/Config.in create mode 100644 package/pangomm2_46/pangomm2_46.hash create mode 100644 package/pangomm2_46/pangomm2_46.mk -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:42:34 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:42:34 +0000 Subject: [Buildroot] [PATCH 1/6] package/libsigc2: new package Message-ID: This is the version of libsigc needed for gtkmm3. Signed-off-by: Daniel Lang --- DEVELOPERS | 1 + package/Config.in | 1 + package/libsigc/Config.in | 2 +- package/libsigc2/Config.in | 17 +++++++++++++++++ package/libsigc2/libsigc2.hash | 5 +++++ package/libsigc2/libsigc2.mk | 19 +++++++++++++++++++ 6 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 package/libsigc2/Config.in create mode 100644 package/libsigc2/libsigc2.hash create mode 100644 package/libsigc2/libsigc2.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6256576e02..e6fa139bd5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -642,6 +642,7 @@ F: package/dacapo/ N: Daniel Lang F: package/dbus-cxx/ F: package/libsigc/ +F: package/libsigc2/ F: package/paho-mqtt-cpp/ N: Damien Lanson diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..18327ef3d3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2096,6 +2096,7 @@ menu "Other" source "package/libseccomp/Config.in" source "package/libshdata/Config.in" source "package/libsigc/Config.in" + source "package/libsigc2/Config.in" source "package/libsigsegv/Config.in" source "package/libsolv/Config.in" source "package/libspatialindex/Config.in" diff --git a/package/libsigc/Config.in b/package/libsigc/Config.in index 428774a3ab..4bea596579 100644 --- a/package/libsigc/Config.in +++ b/package/libsigc/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_LIBSIGC - bool "libsigc++" + bool "libsigc++ (latest)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_INSTALL_LIBSTDCPP help diff --git a/package/libsigc2/Config.in b/package/libsigc2/Config.in new file mode 100644 index 0000000000..e302e27af0 --- /dev/null +++ b/package/libsigc2/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_LIBSIGC2 + bool "libsigc++ (2.x.x)" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_INSTALL_LIBSTDCPP + help + libsigc++ implements a typesafe callback system for standard + C++. It allows you to define signals and to connect those + signals to any callback function, either global or a member + function, regardless of whether it is static or virtual. + + This is the last version before the API and ABI change + introduced in 3.0.0 which requires C++17. + + https://libsigcplusplus.github.io/libsigcplusplus/ + +comment "libsigc++ (2.x.x) needs a toolchain w/ C++, gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libsigc2/libsigc2.hash b/package/libsigc2/libsigc2.hash new file mode 100644 index 0000000000..4811213568 --- /dev/null +++ b/package/libsigc2/libsigc2.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/libsigc++/2.12/libsigc++-2.12.0.sha256sum +sha256 1c466d2e64b34f9b118976eb21b138c37ed124d0f61497df2a90ce6c3d9fa3b5 libsigc++-2.12.0.tar.xz + +# Locally calculated +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/libsigc2/libsigc2.mk b/package/libsigc2/libsigc2.mk new file mode 100644 index 0000000000..845d03ba85 --- /dev/null +++ b/package/libsigc2/libsigc2.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# libsigc2 +# +################################################################################ + +LIBSIGC2_VERSION_MAJOR = 2.12 +LIBSIGC2_VERSION = $(LIBSIGC2_VERSION_MAJOR).0 +LIBSIGC2_SOURCE = libsigc++-$(LIBSIGC2_VERSION).tar.xz +LIBSIGC2_SITE = https://download.gnome.org/sources/libsigc++/$(LIBSIGC2_VERSION_MAJOR) +LIBSIGC2_INSTALL_STAGING = YES +LIBSIGC2_LICENSE = LGPL-2.1+ +LIBSIGC2_LICENSE_FILES = COPYING +LIBSIGC2_CONF_OPTS = \ + -Dbuild-examples=false \ + -Dbuild-tests=false \ + -Dvalidation=false + +$(eval $(meson-package)) -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:42:44 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:42:44 +0000 Subject: [Buildroot] [PATCH 2/6] package/glibmm2_66: new package Message-ID: This is the version needed for gtkmm3. Signed-off-by: Daniel Lang --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/glibmm/Config.in | 2 +- package/glibmm2_66/Config.in | 21 +++++++++++++++++++++ package/glibmm2_66/glibmm2_66.hash | 5 +++++ package/glibmm2_66/glibmm2_66.mk | 23 +++++++++++++++++++++++ 6 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 package/glibmm2_66/Config.in create mode 100644 package/glibmm2_66/glibmm2_66.hash create mode 100644 package/glibmm2_66/glibmm2_66.mk diff --git a/DEVELOPERS b/DEVELOPERS index e6fa139bd5..20ad528243 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -641,6 +641,8 @@ F: package/dacapo/ N: Daniel Lang F: package/dbus-cxx/ +F: package/glibmm/ +F: package/glibmm2_66/ F: package/libsigc/ F: package/libsigc2/ F: package/paho-mqtt-cpp/ diff --git a/package/Config.in b/package/Config.in index 18327ef3d3..f62b1f8b0b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2038,6 +2038,7 @@ menu "Other" source "package/gflags/Config.in" source "package/gli/Config.in" source "package/glibmm/Config.in" + source "package/glibmm2_66/Config.in" source "package/glm/Config.in" source "package/gmp/Config.in" source "package/gobject-introspection/Config.in" diff --git a/package/glibmm/Config.in b/package/glibmm/Config.in index 2dfc861817..b7bed195e9 100644 --- a/package/glibmm/Config.in +++ b/package/glibmm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_GLIBMM - bool "glibmm" + bool "glibmm (latest)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # libglib2 diff --git a/package/glibmm2_66/Config.in b/package/glibmm2_66/Config.in new file mode 100644 index 0000000000..628584cae5 --- /dev/null +++ b/package/glibmm2_66/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_GLIBMM2_66 + bool "glibmm (2.66.x)" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # regex_replace + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSIGC2 + help + The GLibmm package is a set of C++ bindings for GLib. + + This is the last version before the API and ABI change + introduced in 2.68.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "glibmm (2.66.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/glibmm2_66/glibmm2_66.hash b/package/glibmm2_66/glibmm2_66.hash new file mode 100644 index 0000000000..b7d19b261c --- /dev/null +++ b/package/glibmm2_66/glibmm2_66.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/glibmm/2.66/glibmm-2.66.5.sha256sum +sha256 7b384662dd6ec3b86c0570331d32af05db2bd99a791602b767b4a0b2566ec149 glibmm-2.66.5.tar.xz +# License files, locally calculated +sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/glibmm2_66/glibmm2_66.mk b/package/glibmm2_66/glibmm2_66.mk new file mode 100644 index 0000000000..b58c7ca8df --- /dev/null +++ b/package/glibmm2_66/glibmm2_66.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# glibmm2_66 +# +################################################################################ + +GLIBMM2_66_VERSION_MAJOR = 2.66 +GLIBMM2_66_VERSION = $(GLIBMM2_66_VERSION_MAJOR).5 +GLIBMM2_66_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) +GLIBMM2_66_LICENSE_FILES = COPYING COPYING.tools +GLIBMM2_66_SOURCE = glibmm-$(GLIBMM2_66_VERSION).tar.xz +GLIBMM2_66_SITE = https://download.gnome.org/sources/glibmm/$(GLIBMM2_66_VERSION_MAJOR) +GLIBMM2_66_INSTALL_STAGING = YES +GLIBMM2_66_DEPENDENCIES = libglib2 libsigc2 host-pkgconf +GLIBMM2_66_CONF_OPTS = -Dbuild-examples=false + +GLIBMM2_66_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +GLIBMM2_66_CXXFLAGS += -O0 +endif + +$(eval $(meson-package)) -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:42:52 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:42:52 +0000 Subject: [Buildroot] [PATCH 3/6] package/atkmm2_28: new package Message-ID: This is the version needed for gtkmm3. Signed-off-by: Daniel Lang --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/atkmm/Config.in | 2 +- package/atkmm2_28/Config.in | 23 +++++++++++++++++++++++ package/atkmm2_28/atkmm2_28.hash | 5 +++++ package/atkmm2_28/atkmm2_28.mk | 16 ++++++++++++++++ 6 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 package/atkmm2_28/Config.in create mode 100644 package/atkmm2_28/atkmm2_28.hash create mode 100644 package/atkmm2_28/atkmm2_28.mk diff --git a/DEVELOPERS b/DEVELOPERS index 20ad528243..a1294addea 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -640,6 +640,8 @@ N: Daniel J. Leach F: package/dacapo/ N: Daniel Lang +F: package/atkmm/ +F: package/atkmm2_28/ F: package/dbus-cxx/ F: package/glibmm/ F: package/glibmm2_66/ diff --git a/package/Config.in b/package/Config.in index f62b1f8b0b..03fcd9096c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1557,6 +1557,7 @@ menu "Graphics" source "package/at-spi2-core/Config.in" source "package/atk/Config.in" source "package/atkmm/Config.in" + source "package/atkmm2_28/Config.in" source "package/bayer2rgb-neon/Config.in" source "package/bullet/Config.in" source "package/cairo/Config.in" diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in index aa58f8d593..1f370356ea 100644 --- a/package/atkmm/Config.in +++ b/package/atkmm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_ATKMM - bool "atkmm" + bool "atkmm (latest)" depends on BR2_INSTALL_LIBSTDCPP # glibmm depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 diff --git a/package/atkmm2_28/Config.in b/package/atkmm2_28/Config.in new file mode 100644 index 0000000000..2340465b20 --- /dev/null +++ b/package/atkmm2_28/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_ATKMM2_28 + bool "atkmm (2.28.x)" + depends on BR2_INSTALL_LIBSTDCPP # glibmm + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 + depends on BR2_USE_MMU # atk/glibmm -> libglib2 + depends on BR2_USE_WCHAR # atk/glibmm -> libglib2 + select BR2_PACKAGE_ATK + select BR2_PACKAGE_GLIBMM2_66 + select BR2_PACKAGE_LIBSIGC2 + + help + The atkmm package is a set of C++ bindings for Atk. + + This is the last version before the API and ABI change + introduced in 2.36.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "atkmm (2.28.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/atkmm2_28/atkmm2_28.hash b/package/atkmm2_28/atkmm2_28.hash new file mode 100644 index 0000000000..776c9851b8 --- /dev/null +++ b/package/atkmm2_28/atkmm2_28.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/atkmm/2.28/atkmm-2.28.3.sha256sum +sha256 7c2088b486a909be8da2b18304e56c5f90884d1343c8da7367ea5cd3258b9969 atkmm-2.28.3.tar.xz +# locally computed +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/atkmm2_28/atkmm2_28.mk b/package/atkmm2_28/atkmm2_28.mk new file mode 100644 index 0000000000..dc57363cf5 --- /dev/null +++ b/package/atkmm2_28/atkmm2_28.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# atkmm2_28 +# +################################################################################ + +ATKMM2_28_VERSION_MAJOR = 2.28 +ATKMM2_28_VERSION = $(ATKMM2_28_VERSION_MAJOR).3 +ATKMM2_28_SOURCE = atkmm-$(ATKMM2_28_VERSION).tar.xz +ATKMM2_28_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM2_28_VERSION_MAJOR) +ATKMM2_28_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) +ATKMM2_28_LICENSE_FILES = COPYING COPYING.tools +ATKMM2_28_INSTALL_STAGING = YES +ATKMM2_28_DEPENDENCIES = atk glibmm2_66 libsigc2 host-pkgconf + +$(eval $(meson-package)) -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:42:58 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:42:58 +0000 Subject: [Buildroot] [PATCH 4/6] package/cairomm1_14: new package Message-ID: This is the version needed by gtkmm3. Signed-off-by: Daniel Lang --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/cairomm/Config.in | 2 +- package/cairomm1_14/Config.in | 22 ++++++++++++++++++++++ package/cairomm1_14/cairomm1_14.hash | 3 +++ package/cairomm1_14/cairomm1_14.mk | 16 ++++++++++++++++ 6 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 package/cairomm1_14/Config.in create mode 100644 package/cairomm1_14/cairomm1_14.hash create mode 100644 package/cairomm1_14/cairomm1_14.mk diff --git a/DEVELOPERS b/DEVELOPERS index a1294addea..de36a0cdcb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -642,6 +642,8 @@ F: package/dacapo/ N: Daniel Lang F: package/atkmm/ F: package/atkmm2_28/ +F: package/cairomm/ +F: package/cairomm1_14/ F: package/dbus-cxx/ F: package/glibmm/ F: package/glibmm2_66/ diff --git a/package/Config.in b/package/Config.in index 03fcd9096c..e5e9d7f875 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1562,6 +1562,7 @@ menu "Graphics" source "package/bullet/Config.in" source "package/cairo/Config.in" source "package/cairomm/Config.in" + source "package/cairomm1_14/Config.in" source "package/chipmunk/Config.in" source "package/exempi/Config.in" source "package/exiv2/Config.in" diff --git a/package/cairomm/Config.in b/package/cairomm/Config.in index dae52f01f7..75f6692b8a 100644 --- a/package/cairomm/Config.in +++ b/package/cairomm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_CAIROMM - bool "cairomm" + bool "cairomm (latest)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 diff --git a/package/cairomm1_14/Config.in b/package/cairomm1_14/Config.in new file mode 100644 index 0000000000..6e767d2428 --- /dev/null +++ b/package/cairomm1_14/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_CAIROMM1_14 + bool "cairomm (1.14.x)" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSIGC2 + help + The cairomm package is a set of C++ bindings for Cairo. + + This is the last version before the API and ABI change + introduced in 1.16.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "cairomm (1.14.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package/cairomm1_14/cairomm1_14.hash b/package/cairomm1_14/cairomm1_14.hash new file mode 100644 index 0000000000..521e7cc546 --- /dev/null +++ b/package/cairomm1_14/cairomm1_14.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 ee12b920b2d47cea1b6e20c367690d726eb22b4ca9fc711db329d03adcc0c8e0 cairomm-1.14.4.tar.gz +sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/package/cairomm1_14/cairomm1_14.mk b/package/cairomm1_14/cairomm1_14.mk new file mode 100644 index 0000000000..5d076ddf0a --- /dev/null +++ b/package/cairomm1_14/cairomm1_14.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# cairomm1_14 +# +################################################################################ + +CAIROMM1_14_VERSION = 1.14.4 +CAIROMM1_14_LICENSE = LGPL-2.0+ +CAIROMM1_14_LICENSE_FILES = COPYING +CAIROMM1_14_SOURCE = cairomm-$(CAIROMM1_14_VERSION).tar.gz +CAIROMM1_14_SITE = https://gitlab.freedesktop.org/cairo/cairomm/-/archive/$(CAIROMM1_14_VERSION) +CAIROMM1_14_INSTALL_STAGING = YES +CAIROMM1_14_DEPENDENCIES = cairo libglib2 libsigc2 host-pkgconf +CAIROMM1_14_CONF_OPTS = -Dbuild-examples=false -Dbuild-tests=false + +$(eval $(meson-package)) -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:43:02 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:43:02 +0000 Subject: [Buildroot] [PATCH 5/6] package/pangomm2_46: new package Message-ID: This is the version needed by gtkmm3. Signed-off-by: Daniel Lang --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/pangomm/Config.in | 2 +- package/pangomm2_46/Config.in | 25 +++++++++++++++++++++++++ package/pangomm2_46/pangomm2_46.hash | 5 +++++ package/pangomm2_46/pangomm2_46.mk | 16 ++++++++++++++++ 6 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 package/pangomm2_46/Config.in create mode 100644 package/pangomm2_46/pangomm2_46.hash create mode 100644 package/pangomm2_46/pangomm2_46.mk diff --git a/DEVELOPERS b/DEVELOPERS index de36a0cdcb..c183c9a2df 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -650,6 +650,8 @@ F: package/glibmm2_66/ F: package/libsigc/ F: package/libsigc2/ F: package/paho-mqtt-cpp/ +F: package/pangomm/ +F: package/pangomm2_46/ N: Damien Lanson F: package/libvdpau/ diff --git a/package/Config.in b/package/Config.in index e5e9d7f875..b940eea2af 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1636,6 +1636,7 @@ menu "Graphics" source "package/openjpeg/Config.in" source "package/pango/Config.in" source "package/pangomm/Config.in" + source "package/pangomm2_46/Config.in" source "package/pixman/Config.in" source "package/poppler/Config.in" source "package/powervr/Config.in" diff --git a/package/pangomm/Config.in b/package/pangomm/Config.in index c23ac4aaa8..6ddad9e6ef 100644 --- a/package/pangomm/Config.in +++ b/package/pangomm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_PANGOMM - bool "pangomm" + bool "pangomm (latest)" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # glibmm/pango depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc diff --git a/package/pangomm2_46/Config.in b/package/pangomm2_46/Config.in new file mode 100644 index 0000000000..772b523c83 --- /dev/null +++ b/package/pangomm2_46/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_PANGOMM2_46 + bool "pangomm (2.46.x)" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz + depends on BR2_INSTALL_LIBSTDCPP # glibmm/pango + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/pango -> libglib2 + depends on BR2_USE_MMU # *mm/pango -> libglib2 + depends on BR2_USE_WCHAR # *mm/pango -> libglib2 + select BR2_PACKAGE_CAIROMM1_14 + select BR2_PACKAGE_GLIBMM2_66 + select BR2_PACKAGE_PANGO + select BR2_PACKAGE_LIBSIGC2 + help + The pangomm package is a set of C++ bindings for Pango. + + This is the last version before the API and ABI change + introduced in 2.48.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "pangomm (2.46.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/pangomm2_46/pangomm2_46.hash b/package/pangomm2_46/pangomm2_46.hash new file mode 100644 index 0000000000..8d05dbc2ff --- /dev/null +++ b/package/pangomm2_46/pangomm2_46.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/pangomm/2.46/pangomm-2.46.3.sha256sum +sha256 410fe04d471a608f3f0273d3a17d840241d911ed0ff2c758a9859c66c6f24379 pangomm-2.46.3.tar.xz +# Locally computed +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/pangomm2_46/pangomm2_46.mk b/package/pangomm2_46/pangomm2_46.mk new file mode 100644 index 0000000000..1725158491 --- /dev/null +++ b/package/pangomm2_46/pangomm2_46.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# pangomm2_46 +# +################################################################################ + +PANGOMM2_46_VERSION_MAJOR = 2.46 +PANGOMM2_46_VERSION = $(PANGOMM2_46_VERSION_MAJOR).3 +PANGOMM2_46_SOURCE = pangomm-$(PANGOMM2_46_VERSION).tar.xz +PANGOMM2_46_SITE = https://download.gnome.org/sources/pangomm/$(PANGOMM2_46_VERSION_MAJOR) +PANGOMM2_46_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) +PANGOMM2_46_LICENSE_FILES = COPYING COPYING.tools +PANGOMM2_46_INSTALL_STAGING = YES +PANGOMM2_46_DEPENDENCIES = glibmm2_66 cairomm1_14 libsigc2 pango host-pkgconf + +$(eval $(meson-package)) -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:43:23 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:43:23 +0000 Subject: [Buildroot] [PATCH 6/6] package/gtkmm3: use correct versions of mm packages Message-ID: Many of the C++ wrapper packages had API changes. These changes where never introduced in gtkmm3, meaning that older, but still maintained versions are needed to build gtkmm3. Fixes: - http://autobuild.buildroot.net/results/172/17263ac51f197031106eb7fd595126a2720f0397 Signed-off-by: Daniel Lang --- DEVELOPERS | 1 + package/gtkmm3/Config.in | 16 ++++++++-------- package/gtkmm3/gtkmm3.mk | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index c183c9a2df..c42ebeb6c9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -647,6 +647,7 @@ F: package/cairomm1_14/ F: package/dbus-cxx/ F: package/glibmm/ F: package/glibmm2_66/ +F: package/gtkmm3/ F: package/libsigc/ F: package/libsigc2/ F: package/paho-mqtt-cpp/ diff --git a/package/gtkmm3/Config.in b/package/gtkmm3/Config.in index 3c1c6f36e8..6b924c856b 100644 --- a/package/gtkmm3/Config.in +++ b/package/gtkmm3/Config.in @@ -1,7 +1,7 @@ -comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 7" +comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \ + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ || !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 \ || !BR2_TOOLCHAIN_HAS_THREADS @@ -14,16 +14,16 @@ config BR2_PACKAGE_GTKMM3 depends on !BR2_nios2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pangomm, libgtk3 -> pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # glibmm, libpangomm -> glibmm/pango - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/libgtk3 -> libglib2 depends on BR2_USE_MMU # *mm/libgtk3 -> libglib2 depends on BR2_USE_WCHAR # *mm/libgtk3 -> libglib2 depends on BR2_PACKAGE_LIBGTK3 - select BR2_PACKAGE_ATKMM - select BR2_PACKAGE_CAIROMM - select BR2_PACKAGE_GLIBMM - select BR2_PACKAGE_LIBSIGC - select BR2_PACKAGE_PANGOMM + select BR2_PACKAGE_ATKMM2_28 + select BR2_PACKAGE_CAIROMM1_14 + select BR2_PACKAGE_GLIBMM2_66 + select BR2_PACKAGE_LIBSIGC2 + select BR2_PACKAGE_PANGOMM2_46 help The gtkmm3 package is a set of C++ bindings for GTK 3. diff --git a/package/gtkmm3/gtkmm3.mk b/package/gtkmm3/gtkmm3.mk index d717c08bd8..8bbcf224e6 100644 --- a/package/gtkmm3/gtkmm3.mk +++ b/package/gtkmm3/gtkmm3.mk @@ -11,6 +11,6 @@ GTKMM3_SITE = https://download.gnome.org/sources/gtkmm/$(GTKMM3_VERSION_MAJOR) GTKMM3_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GTKMM3_LICENSE_FILES = COPYING COPYING.tools GTKMM3_INSTALL_STAGING = YES -GTKMM3_DEPENDENCIES = atkmm cairomm glibmm libgtk3 libsigc pangomm host-pkgconf +GTKMM3_DEPENDENCIES = atkmm2_28 cairomm1_14 glibmm2_66 libgtk3 libsigc2 pangomm2_46 host-pkgconf $(eval $(autotools-package)) -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:53:24 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:53:24 +0000 Subject: [Buildroot] Dependency problem for gtkmm3 In-Reply-To: <87ad276e-999c-2503-4dbb-37f54d2b6e15@mind.be> References: <20230210231454.4f3aedbd@windsurf> <20230213084735.5318a511@windsurf> <87ad276e-999c-2503-4dbb-37f54d2b6e15@mind.be> Message-ID: > On 13/02/2023 15:52, Lang Daniel via buildroot wrote: >> Hi Thomas, Dirk, >> >>> Hello Dirk, >>> >>> On Sun, 12 Feb 2023 08:51:17 +0000 >>> Dirk De Becker wrote: >>> >>>> Thank you for your quick reply. >>>> Will this issue be fixed in the 2023.02 release? >>> >>> It all depends on whether someone submits a fix for the issue. Do you >>> think you could have a look? >> >> The problem comes down to an incompatibility that I tried to point out some >> time ago [0]. Current versions of cairomm, pangomm, glibmm have a different >> ABI that's not supported in gtkmm 3.x.y. >> Even the most recent version of gtkmm 3.24.x doesn't support the current >> version of of the other -mm packages and according to the mailing list of >> gtkmm [1] there are no plans to support it. The are compatible with gtk4. >> >> As it stands gtkmm3 isn't usable and fixing it brings up the same problems >> of duplicating packages. > > So we have two options: > > 1. Drop gtkmm3. It has no internal users. > > 2. Create cairomm112 etc. packages (or whatever the latest working version was) > and live with their unmaintained status. I have just submitted a patch series [0] that would duplicate the needed packages. So far it is only compile tested for all of the toolchains that support it via utils/test-pkg. As it stands right now, all of these pre-API versions are still maintained, each seeing their last release about 5 months ago. If dropping gtkmm3 is the preferred way, let me know. > > Eventually we'll end up with option 1, of course, since gtkmm3 is EOL itself > (they're only working on gtkmm4 AFAIU). Just like libgtk3 gtkmm3 is still being worked on, at least for bug fix releases. > > @Dirk in conclusion: the best you can expect for 2023.02 is for the package to > be dropped, which isn't going to help you, of course. I guess I'm to late with my series for 2023.02. Regards, Daniel > > Regards, > Arnout > > >> >> [0]: https://lists.buildroot.org/pipermail/buildroot/2021-October/625850.html >> [1]: https://mail.gnome.org/archives/gtkmm-list/2021-May/msg00000.html >> >>> >>> Best regards, >>> >>> Thomas >> >> Regards >> Daniel >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Fri Feb 24 09:25:35 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 10:25:35 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/xtables-addons: replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS Message-ID: <20230224092535.306646-1-fontaine.fabrice@gmail.com> Replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS by XTABLES_ADDONS_REMOVE_GEOIP_HELPERS to avoid the following build failure raised since bump to version 3.22 in commit 53f2999edfa5e67923d4d8a102c15fa3200e089c: make[3]: *** No rule to make target '/xt_geoip_query', needed by 'all-am'. Stop. Fixes: - http://autobuild.buildroot.org/results/f2d596b510f027b94a6b1fad10c363922c50cbec Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni): - Add XTABLES_ADDONS_REMOVE_GEOIP_HELPERS package/xtables-addons/xtables-addons.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 77dcfd741c..e794538956 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -16,12 +16,6 @@ XTABLES_ADDONS_CONF_OPTS = \ --with-xtables="$(STAGING_DIR)/usr" \ --with-xtlibdir="/usr/lib/xtables" -# geoip helpers need perl with modules and unzip so disable -define XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - $(SED) 's/ geoip//' $(@D)/Makefile.in -endef -XTABLES_ADDONS_POST_PATCH_HOOKS += XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - define XTABLES_ADDONS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) endef @@ -30,6 +24,15 @@ define XTABLES_ADDONS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install endef +# geoip helpers need perl with modules and unzip so remove them +define XTABLES_ADDONS_REMOVE_GEOIP_HELPERS + $(RM) $(TARGET_DIR)/usr/bin/xt_geoip* + $(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_asn* + $(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_geoip* +endef + +XTABLES_ADDONS_POST_INSTALL_TARGET_HOOKS += XTABLES_ADDONS_REMOVE_GEOIP_HELPERS + define XTABLES_ADDONS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 09:50:45 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 10:50:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/asterisk: fix build with libressl Message-ID: <20230224095045.782119-1-fontaine.fabrice@gmail.com> Fix the following build failure with libressl by using SSL_is_server which is available since version 2.7.0 and https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: iostream.c: In function 'ast_iostream_close': iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} 559 | if (!stream->ssl->server) { | ^~ Fixes: - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 Signed-off-by: Fabrice Fontaine --- ...n-iostream.c-fix-build-with-libressl.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch diff --git a/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch b/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch new file mode 100644 index 0000000000..cdd3aa8cfb --- /dev/null +++ b/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch @@ -0,0 +1,38 @@ +From 9569fa20fec49f530170a3042afb99556cf66a2e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Apr 2022 10:52:42 +0200 +Subject: [PATCH] main/iostream.c: fix build with libressl + +Fix the following build failure with libressl by using SSL_is_server +which is available since version 2.7.0 and +https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: + +iostream.c: In function 'ast_iostream_close': +iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} + 559 | if (!stream->ssl->server) { + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 + +Signed-off-by: Fabrice Fontaine +--- + main/iostream.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main/iostream.c b/main/iostream.c +index d060b6d6d4..b8ab80ec91 100644 +--- a/main/iostream.c ++++ b/main/iostream.c +@@ -553,7 +553,7 @@ int ast_iostream_close(struct ast_iostream *stream) + ERR_error_string(sslerr, err), ssl_error_to_string(sslerr, res)); + } + +-#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if !(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x2070000L)) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + if (!SSL_is_server(stream->ssl)) { + #else + if (!stream->ssl->server) { +-- +2.35.1 + -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 10:10:39 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 11:10:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/libblockdev: needs locale Message-ID: <20230224101039.1445129-1-fontaine.fabrice@gmail.com> locale_t is unconditionally used since version 1.5 and https://github.com/storaged-project/libblockdev/commit/4ed6f0b3a46fc77554dab661c22150829aa75966 resulting in the following build failure since the addition of the package in commit 0c52826291d1884db0f8f35130216065fbc7b574: module.c:33:37: error: unknown type name 'locale_t' 33 | static char *strerror_l(int errnum, locale_t locale UNUSED) | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ede9eb1f13d56c77005cc448416fb2efa9d16ff0 Signed-off-by: Fabrice Fontaine --- package/libblockdev/Config.in | 6 ++++-- package/udisks/Config.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 4389fd794c..4f98621bd8 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBBLOCKDEV depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_ENABLE_LOCALE select BR2_PACKAGE_KMOD select BR2_PACKAGE_LIBGLIB2 help @@ -66,7 +67,8 @@ config BR2_PACKAGE_LIBBLOCKDEV_SWAP endif -comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library" +comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library, locale" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_ENABLE_LOCALE diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 253d5cdc6b..b1d02a31b2 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_UDISKS bool "udisks" - depends on BR2_ENABLE_LOCALE # parted + depends on BR2_ENABLE_LOCALE # libblockdev, parted depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # polkit -> C++17 depends on BR2_TOOLCHAIN_HAS_THREADS # polkit -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 10:17:20 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 11:17:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: add linux-pam optional dependency Message-ID: <20230224101720.1458102-1-fontaine.fabrice@gmail.com> Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=15316 Signed-off-by: Fabrice Fontaine --- package/xscreensaver/xscreensaver.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 6cc7e8febe..dc5f8b7e1e 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -42,6 +42,13 @@ else XSCREENSAVER_CONF_OPTS += --with-png=no endif +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +XSCREENSAVER_CONF_OPTS += --with-pam=yes +XSCREENSAVER_DEPENDENCIES += linux-pam +else +XSCREENSAVER_CONF_OPTS += --with-pam=no +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) XSCREENSAVER_CONF_OPTS += --with-systemd=yes XSCREENSAVER_DEPENDENCIES += systemd -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 10:51:48 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 11:51:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/ntpsec: fix build without stack-protector Message-ID: <20230224105148.1780818-1-fontaine.fabrice@gmail.com> Fix the following build failure without stack-protector raised since the addition of the package in commit 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a: Checking for library ssp : not found Checking for library ssp_nonshared : not found Checking if C compiler supports -fstack-protector-all : yes [...] The configuration failed (complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log) Fixes: - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a - http://autobuild.buildroot.org/results/62be818e2f2eac07b4a2de6f4a8898cc4cc05b1f Signed-off-by: Fabrice Fontaine --- ...pt-fix-build-without-stack-protector.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch diff --git a/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch b/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch new file mode 100644 index 0000000000..f494bf479c --- /dev/null +++ b/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch @@ -0,0 +1,50 @@ +From 0a3ce09c14eb9c7e36aa30a4dafe40e56676d678 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 Feb 2023 11:33:32 +0100 +Subject: [PATCH] wscript: fix build without stack-protector + +-fstack-protector-all can depends on ssp library availability (e.g. on musl) so +move the test from cc_test_flags to ld_hardening_flags, this will avoid the +following build failure: + +Checking for library ssp : not found +Checking for library ssp_nonshared : not found +Checking if C compiler supports -fstack-protector-all : yes + +[...] + +The configuration failed +(complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log) + +Fixes: + - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ntpsec/ntpsec/pull/6] +--- + wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index be396b33b..f301809fc 100644 +--- a/wscript ++++ b/wscript +@@ -298,7 +298,6 @@ def configure(ctx): + ctx.env.LDFLAGS += ["-lssp_nonshared"] + + cc_test_flags = [ +- ('f_stack_protector_all', '-fstack-protector-all'), + ('PIC', '-fPIC'), + ('PIE', '-pie -fPIE'), + # this quiets most of macOS warnings on -fpie +@@ -332,6 +331,7 @@ def configure(ctx): + + # Check which linker flags are supported + ld_hardening_flags = [ ++ ('f_stack_protector_all', '-fstack-protector-all'), + ("z_now", "-Wl,-z,now"), # no deferred symbol resolution + ] + +-- +2.39.1 + -- 2.39.1 From thomas at devoogdt.com Fri Feb 24 11:15:07 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Fri, 24 Feb 2023 12:15:07 +0100 Subject: [Buildroot] [PATCH v1 1/3] pkg-cmake: add option to select the Ninja generator Message-ID: <20230224111509.2434694-1-thomas.devoogdt@barco.com> E.g. Commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213, and 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd can now be replaced by: WEBKITGTK_CMAKE_NINJA = YES Packages that are selecting Ninja, should also use the NINJA_{ENV,OPTS} variables iso the MAKE variables. Signed-off-by: Thomas Devoogdt --- package/pkg-cmake.mk | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 8c375779cb..4ce3e6bada 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -65,6 +65,13 @@ else $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build endif +ifeq ($$($(3)_CMAKE_NINJA),YES) +$(2)_DEPENDENCIES += host-ninja +$(2)_GENERATOR = "Ninja" +else +$(2)_GENERATOR = "Unix Makefiles" +endif + # # Configure step. Only define it if not already defined by the package # .mk file. And take care of the differences between host and target @@ -88,7 +95,7 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ @@ -119,7 +126,7 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -165,45 +172,75 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) # ifndef $(2)_BUILD_CMDS ifeq ($(4),target) +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_BUILD_CMDS + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) +endef +else define $(2)_BUILD_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) endef +endif +else +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_BUILD_CMDS + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) +endef else define $(2)_BUILD_CMDS $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif endif +endif # # Host installation step. Only define it if not already defined by the # package .mk file. # ifndef $(2)_INSTALL_CMDS +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_INSTALL_CMDS + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) +endef +else define $(2)_INSTALL_CMDS $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif +endif # # Staging installation step. Only define it if not already defined by # the package .mk file. # ifndef $(2)_INSTALL_STAGING_CMDS +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_INSTALL_STAGING_CMDS + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR install +endef +else define $(2)_INSTALL_STAGING_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif +endif # # Target installation step. Only define it if not already defined by # the package .mk file. # ifndef $(2)_INSTALL_TARGET_CMDS +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_INSTALL_TARGET_CMDS + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install +endef +else define $(2)_INSTALL_TARGET_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif +endif # Call the generic package infrastructure to generate the necessary # make targets -- 2.39.2 From thomas at devoogdt.com Fri Feb 24 11:15:09 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Fri, 24 Feb 2023 12:15:09 +0100 Subject: [Buildroot] [PATCH v1 3/3] package/wpewebkit: use the CMAKE_NINJA flag In-Reply-To: <20230224111509.2434694-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-1-thomas.devoogdt@barco.com> Message-ID: <20230224111509.2434694-3-thomas.devoogdt@barco.com> Replaces: commit 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd Author: Peter Korsgaard Date: Thu Feb 9 18:07:06 2023 +0100 package/wpewebkit: Build with ninja Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Devoogdt --- package/wpewebkit/wpewebkit.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 48e5c2f8cd..c1b5dee121 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -14,6 +14,7 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit +WPEWEBKIT_CMAKE_NINJA = YES WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo @@ -103,23 +104,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# wpewebkit needs cmake >= 3.20 when building with the make backend, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WPEWEBKIT_CONF_OPTS += -GNinja -WPEWEBKIT_DEPENDENCIES += host-ninja - -define WPEWEBKIT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - $(eval $(cmake-package)) -- 2.39.2 From thomas at devoogdt.com Fri Feb 24 11:15:08 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Fri, 24 Feb 2023 12:15:08 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/webkitgtk: use the CMAKE_NINJA flag In-Reply-To: <20230224111509.2434694-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-1-thomas.devoogdt@barco.com> Message-ID: <20230224111509.2434694-2-thomas.devoogdt@barco.com> Replaces: commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 Author: Peter Korsgaard Date: Thu Feb 9 18:07:05 2023 +0100 package/webkitgtk: Build with ninja Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Devoogdt --- package/webkitgtk/webkitgtk.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 3263f7fea0..b43f97f0ca 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -13,6 +13,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk +WEBKITGTK_CMAKE_NINJA = YES WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 @@ -139,23 +140,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# webkitgtk needs cmake >= 3.20 when not building with ninja, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WEBKITGTK_CONF_OPTS += -GNinja -WEBKITGTK_DEPENDENCIES += host-ninja - -define WEBKITGTK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - $(eval $(cmake-package)) -- 2.39.2 From fontaine.fabrice at gmail.com Fri Feb 24 11:21:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 12:21:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix libcurl build In-Reply-To: <20230220214423.1a42a0e5@windsurf> References: <20230220093336.77462-1-fontaine.fabrice@gmail.com> <20230220214423.1a42a0e5@windsurf> Message-ID: Hello, Le lun. 20 f?vr. 2023 ? 21:44, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > Hello Fabrice, > > On Mon, 20 Feb 2023 10:33:36 +0100 > Fabrice Fontaine wrote: > > > Fix the following libcurl build failure: > > > > In file included from > /tmp/instance-1/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/include/curl/curl.h:3195, > > from ../../../../include/sysinc.h:384, > > from ../../../../include/common.h:23, > > from simple.c:20: > > simple.c: In function 'check_https': > > simple.c:167:65: error: invalid use of void expression > > 167 | if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt > = CURLOPT_USERAGENT, "Zabbix " ZABBIX_VERSION)) || > > | ^ > > > > Fixes: > > - > http://autobuild.buildroot.org/results/053a62e9969046a7f8a0e1890c24d2bfb099ae42 > > > > Signed-off-by: Fabrice Fontaine > > --- > > ...se-parentheses-to-ensure-compilation.patch | 65 +++++++++++++++++++ > > 1 file changed, 65 insertions(+) > > create mode 100644 > package/zabbix/0002-Use-parentheses-to-ensure-compilation.patch > > This was reported to curl upstream in > https://github.com/curl/curl/issues/10148, and apparently fixed in curl > by > > https://github.com/curl/curl/commit/e2aed004302e51cfa5b6ce8c8ab65ef92aa83196 > . > > So it apparently was considered a bug in curl, so perhaps it should be > fixed in curl rather than in zabbix? > Indeed, I'll set this patch as not applicable as the build failure is not raised since commit 14ca6b5fdb6a5e0fa99b04461240772d93076b2e > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Fri Feb 24 11:43:20 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 12:43:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix build with libressl >= 3.5.0 Message-ID: <20230224114320.2152346-1-fontaine.fabrice@gmail.com> Fix the following build failure with libressl >= 3.5.0 raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration 113 | static void OPENSSL_cleanup(void) | ^~~~~~~~~~~~~~~ In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, from ../../../include/zbxcomms.h:65, from tls.c:20: /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' 565 | void OPENSSL_cleanup(void); | ^~~~~~~~~~~~~~~ In file included from tls.c:20: tls.c: In function 'zbx_log_ciphersuites': ../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) | ^~ tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); | ^~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 Signed-off-by: Fabrice Fontaine --- .../0002-fix-build-with-libressl-3.5.0.patch | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 package/zabbix/0002-fix-build-with-libressl-3.5.0.patch diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 0000000000..7e32ad5745 --- /dev/null +++ b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,71 @@ +From 5c8511384f1d41f9c2a131604d5cb2dbc1c0aec9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 Feb 2023 12:23:56 +0100 +Subject: [PATCH] fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration + 113 | static void OPENSSL_cleanup(void) + | ^~~~~~~~~~~~~~~ +In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, + from ../../../include/zbxcomms.h:65, + from tls.c:20: +/home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' + 565 | void OPENSSL_cleanup(void); + | ^~~~~~~~~~~~~~~ +In file included from tls.c:20: +tls.c: In function 'zbx_log_ciphersuites': +../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} + 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) + | ^~ +tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' + 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); + | ^~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent (no feedback on first patch)] +--- + include/zbxcomms.h | 3 ++- + src/libs/zbxcomms/tls.c | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/include/zbxcomms.h b/include/zbxcomms.h +index e7d74dbd0f..d6efa358fe 100644 +--- a/include/zbxcomms.h ++++ b/include/zbxcomms.h +@@ -253,7 +253,8 @@ int zbx_telnet_execute(ZBX_SOCKET socket_fd, const char *command, AGENT_RESULT * + /* TLS BLOCK */ + #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) + +-#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) ++#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL + # if !defined(LIBRESSL_VERSION_NUMBER) + # define OPENSSL_INIT_LOAD_SSL_STRINGS 0 + # define OPENSSL_INIT_LOAD_CRYPTO_STRINGS 0 +diff --git a/src/libs/zbxcomms/tls.c b/src/libs/zbxcomms/tls.c +index 54ab0a6ef4..bd4075b3e4 100644 +--- a/src/libs/zbxcomms/tls.c ++++ b/src/libs/zbxcomms/tls.c +@@ -30,8 +30,9 @@ + #include "zbxstr.h" + #include "zbxtime.h" + +-#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) +-/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ ++#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x300000fL ++/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL (before 3.5.0) */ + + /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and example in crypto/threads/mttest.c) */ + +-- +2.39.1 + -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 13:40:28 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 14:40:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/hawktracer: update URL in Config.in Message-ID: <20230224134028.307983-1-fontaine.fabrice@gmail.com> Current website is down: https://github.com/amzn/hawktracer/issues/87 Signed-off-by: Fabrice Fontaine --- package/hawktracer/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hawktracer/Config.in b/package/hawktracer/Config.in index 7648707404..bee9c27b7d 100644 --- a/package/hawktracer/Config.in +++ b/package/hawktracer/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_HAWKTRACER profiling tool built in Amazon Video for getting performance metrics from low-end devices. - https://www.hawktracer.org/ + https://hawktracer.github.io/ if BR2_PACKAGE_HAWKTRACER -- 2.39.1 From sebastien.szymanski at armadeus.com Fri Feb 24 10:53:15 2023 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Fri, 24 Feb 2023 11:53:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/freescale-imx/imx-gpu-g2d: drop BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES Message-ID: <20230224105315.16171-1-sebastien.szymanski@armadeus.com> Arm and aarch64 packages don't contain examples anymore so drop the config option to install them to prevent build failure when selected: >>> imx-gpu-g2d 6.4.3.p4.4-arm Installing to target mkdir -p /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ cp -a /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/* /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ cp: cannot stat '/home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/*': No such file or directory make: *** [package/pkg-generic.mk:384: /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/.stamp_target_installed] Error 1 Fixes: b84557b588b3 ("package/freescale-imx/imx-gpu-g2d: bump version to 6.4.3.p4.4") Signed-off-by: S?bastien Szymanski --- Config.in.legacy | 6 ++++++ package/freescale-imx/imx-gpu-g2d/Config.in | 9 --------- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 8 -------- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7f69462f2ec1..af1d8cc1dc9f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES + bool "imx-gpu-g2d examples removed" + select BR2_LEGACY + help + The examples are not provided by NXP anymore. + config BR2_KERNEL_HEADERS_6_0 bool "kernel headers version 6.0.x are no longer supported" select BR2_LEGACY diff --git a/package/freescale-imx/imx-gpu-g2d/Config.in b/package/freescale-imx/imx-gpu-g2d/Config.in index aeca087f865b..c143b17c47ff 100644 --- a/package/freescale-imx/imx-gpu-g2d/Config.in +++ b/package/freescale-imx/imx-gpu-g2d/Config.in @@ -18,12 +18,3 @@ config BR2_PACKAGE_IMX_GPU_G2D This library is provided by NXP as-is and doesn't have an upstream. - -if BR2_PACKAGE_IMX_GPU_G2D - -config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES - bool "install examples" - help - Copy the Vivante G2D examples to the target. - -endif diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index d94da24d8f0e..42a1fe70cf11 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -26,15 +26,7 @@ define IMX_GPU_G2D_INSTALL_STAGING_CMDS cp -a $(@D)/g2d/usr/* $(STAGING_DIR)/usr endef -ifeq ($(BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES),y) -define IMX_GPU_G2D_INSTALL_EXAMPLES - mkdir -p $(TARGET_DIR)/usr/share/examples/ - cp -a $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/ -endef -endif - define IMX_GPU_G2D_INSTALL_TARGET_CMDS - $(IMX_GPU_G2D_INSTALL_EXAMPLES) cp -a $(@D)/g2d/usr/lib $(TARGET_DIR)/usr endef -- 2.39.2 From fontaine.fabrice at gmail.com Fri Feb 24 16:15:43 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 17:15:43 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/systemd: fix build with -Ofast Message-ID: <20230224161543.27879-1-fontaine.fabrice@gmail.com> Update -Ofast workaround as suggested by Yann E. Morin to avoid the following build failure raised since bump to version 252.4 in commit a2c823d1f548d5a0120d27d6c000603192360f7b and https://github.com/systemd/systemd/commit/60f97fee2d2f948c8e8963ea8ff767008cb93cae: ../output-1/build/systemd-252.4/meson.build:397:8: ERROR: Problem encountered: -Ofast, -ffast-math, or -ffinite-math-only is specified in c_args. Fixes: - http://autobuild.buildroot.org/results/8f41c4984b645851724e554c3162b83bc312bee7 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni and Yann E. Morin): - Update workaround instead of disabling with -Ofast package/systemd/systemd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index cce9162f6d..63467171ed 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -100,7 +100,7 @@ SYSTEMD_CONF_OPTS += \ SYSTEMD_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_OPTIMIZE_FAST),y) -SYSTEMD_CFLAGS += -O3 +SYSTEMD_CFLAGS += -O3 -fno-finite-math-only endif ifeq ($(BR2_nios2),y) -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 16:31:16 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 17:31:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/hawktracer: bump to 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 Message-ID: <20230224163116.46934-1-fontaine.fabrice@gmail.com> This bump will fix the following build failure with gcc >= 12: /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp: In function 'HT_Thread* ht_thread_create(ht_thread_callback_t, void*)': /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp:1006:28: error: no matching function for call to 'operator new(sizetype, std::thread*)' 1006 | new(&th->th) HT_Thread(); | ^ https://github.com/amzn/hawktracer/compare/e53b07bc812c4cfe8f6253ddb48ac43de8fa74a8...2ec19d71923344148928ef45fce549eda67030a4 Fixes: - http://autobuild.buildroot.org/results/d18a1b2ee6cdcb289567ae90b2d836844427b5f6 Signed-off-by: Fabrice Fontaine --- package/hawktracer/hawktracer.hash | 2 +- package/hawktracer/hawktracer.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hawktracer/hawktracer.hash b/package/hawktracer/hawktracer.hash index 47a8b35b6b..29d00e29ec 100644 --- a/package/hawktracer/hawktracer.hash +++ b/package/hawktracer/hawktracer.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 a48e26082fd644222d4a20ecfd5a34700865cf572d41b7eac5b0c8242fef9c5f hawktracer-2ec19d71923344148928ef45fce549eda67030a4.tar.gz +sha256 099f76d5be18ad5d714fded0c6f889f588986cdde2b31f2c0058413698a5f35c hawktracer-3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5.tar.gz sha256 2f377333e64ad08ad3afec8ed6c2c96ced2a6d7d67443eb2784a931bb7b3fd59 LICENSE diff --git a/package/hawktracer/hawktracer.mk b/package/hawktracer/hawktracer.mk index fd635e350d..462d073755 100644 --- a/package/hawktracer/hawktracer.mk +++ b/package/hawktracer/hawktracer.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAWKTRACER_VERSION = 2ec19d71923344148928ef45fce549eda67030a4 +HAWKTRACER_VERSION = 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 HAWKTRACER_SITE = $(call github,amzn,hawktracer,$(HAWKTRACER_VERSION)) HAWKTRACER_LICENSE = MIT HAWKTRACER_LICENSE_FILES = LICENSE -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 16:40:53 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 17:40:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-gmmlib: needs threads Message-ID: <20230224164053.53287-1-fontaine.fabrice@gmail.com> threads are mandatory since version 19.1.1 and https://github.com/intel/gmmlib/commit/9e4aa143fb7e7e87332fcb7c9871040ff4a1a1da resulting in the following build failure since commit cd206d9b808a322a00294b4caad203a892ed4c92: CMake Error at /home/thomas/autobuild/instance-2/output-1/host/share/cmake-3.22/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find Threads (missing: Threads_FOUND) Fixes: - http://autobuild.buildroot.org/results/c1120932e8c212820b239ee8cd4a057623a73376 Signed-off-by: Fabrice Fontaine --- package/intel-gmmlib/Config.in | 6 ++++-- package/intel-mediadriver/Config.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/intel-gmmlib/Config.in b/package/intel-gmmlib/Config.in index b6f93f7416..a3d0d2610b 100644 --- a/package/intel-gmmlib/Config.in +++ b/package/intel-gmmlib/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_INTEL_GMMLIB depends on BR2_x86_64 depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS help The Intel(R) Graphics Memory Management Library provides device specific and buffer management for the Intel(R) @@ -11,5 +12,6 @@ config BR2_PACKAGE_INTEL_GMMLIB https://github.com/intel/gmmlib -comment "intel-gmmlib needs a toolchain w/ dynamic library, C++" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP +comment "intel-gmmlib needs a toolchain w/ dynamic library, C++, threads" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/intel-mediadriver/Config.in b/package/intel-mediadriver/Config.in index ad56590008..537e4abd2f 100644 --- a/package/intel-mediadriver/Config.in +++ b/package/intel-mediadriver/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER depends on !BR2_STATIC_LIBS # mesa3d, libva depends on BR2_INSTALL_LIBSTDCPP # intel-gmmlib, mesa3d depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d - depends on BR2_TOOLCHAIN_HAS_THREADS # libva + depends on BR2_TOOLCHAIN_HAS_THREADS # intel-gmmlib, libva depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d select BR2_PACKAGE_INTEL_GMMLIB select BR2_PACKAGE_LIBPCIACCESS -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 16:57:53 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 17:57:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/ntpsec: fix CPE ID version Message-ID: <20230224165753.64394-1-fontaine.fabrice@gmail.com> CPE ID is wrong since the addition of the package in commit 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a, the correct CPE ID is cpe:2.3:a:ntpsec:ntpsec:1.2.2:*:*:*:*:*:*:*, not cpe:2.3:a:ntpsec:ntpsec:1.2:2:*:*:*:*:*:* Signed-off-by: Fabrice Fontaine --- package/ntpsec/ntpsec.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index c7fa2f85a8..e612e982ec 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -4,12 +4,9 @@ # ################################################################################ -NTPSEC_VERSION_MAJOR = 1 -NTPSEC_VERSION_MINOR = 2 -NTPSEC_VERSION_POINT = 2 -NTPSEC_VERSION = $(NTPSEC_VERSION_MAJOR)_$(NTPSEC_VERSION_MINOR)_$(NTPSEC_VERSION_POINT) -NTPSEC_SOURCE = ntpsec-NTPsec_$(NTPSEC_VERSION).tar.bz2 -NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(NTPSEC_VERSION) +NTPSEC_VERSION = 1.2.2 +NTPSEC_SOURCE = ntpsec-NTPsec_$(subst .,_,$(NTPSEC_VERSION)).tar.bz2 +NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(subst .,_,$(NTPSEC_VERSION)) NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT, CC-BY-4.0 (docs) NTPSEC_LICENSE_FILES = \ LICENSES/BSD-2 \ @@ -20,8 +17,6 @@ NTPSEC_LICENSE_FILES = \ docs/copyright.adoc NTPSEC_CPE_ID_VENDOR = ntpsec -NTPSEC_CPE_ID_VERSION = $(NTPSEC_VERSION_MAJOR).$(NTPSEC_VERSION_MINOR) -NTPSEC_CPE_ID_UPDATE = $(NTPSEC_VERSION_POINT) NTPSEC_DEPENDENCIES = \ host-bison \ -- 2.39.1 From john at metanate.com Fri Feb 24 17:53:24 2023 From: john at metanate.com (John Keeping) Date: Fri, 24 Feb 2023 17:53:24 +0000 Subject: [Buildroot] [PATCH v1 1/3] pkg-cmake: add option to select the Ninja generator In-Reply-To: <20230224111509.2434694-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-1-thomas.devoogdt@barco.com> Message-ID: On Fri, Feb 24, 2023 at 12:15:07PM +0100, Thomas Devoogdt wrote: > E.g. Commit > 16e5c92ff5fd2b44a1126bd7d7538c68ce838213, and > 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd > can now be replaced by: WEBKITGTK_CMAKE_NINJA = YES > > Packages that are selecting Ninja, should also use the NINJA_{ENV,OPTS} variables iso the MAKE variables. The current webkitgtk build commands use `cmake --build` and `cmake --install`, wouldn't it be better to use those here? I wonder if it makes more sense to replace anything generator-specific (like $(PKG)_MAKE_OPTS or $(PKG)_NINJA_OPTS) with general $(PKG)_CMAKE_BUILD_OPTS and $(PKG)_CMAKE_INSTALL_OPTS so that packages become independent of the generator. If those options are at the end of the command, then packages still have the option (in the build phase) to pass built-tool specific options by including `--` in the value. > Signed-off-by: Thomas Devoogdt > --- > package/pkg-cmake.mk | 41 +++++++++++++++++++++++++++++++++++++++-- No change in docs/? ;-) > 1 file changed, 39 insertions(+), 2 deletions(-) > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > index 8c375779cb..4ce3e6bada 100644 > --- a/package/pkg-cmake.mk > +++ b/package/pkg-cmake.mk > @@ -65,6 +65,13 @@ else > $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build > endif > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +$(2)_DEPENDENCIES += host-ninja > +$(2)_GENERATOR = "Ninja" > +else > +$(2)_GENERATOR = "Unix Makefiles" > +endif > + > # > # Configure step. Only define it if not already defined by the package > # .mk file. And take care of the differences between host and target > @@ -88,7 +95,7 @@ define $(2)_CONFIGURE_CMDS > rm -f CMakeCache.txt && \ > PATH=$$(BR_PATH) \ > $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > - -G"Unix Makefiles" \ > + -G$$($$(PKG)_GENERATOR) \ > -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ > -DCMAKE_INSTALL_PREFIX="/usr" \ > -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ > @@ -119,7 +126,7 @@ define $(2)_CONFIGURE_CMDS > PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ > $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > - -G"Unix Makefiles" \ > + -G$$($$(PKG)_GENERATOR) \ > -DCMAKE_INSTALL_SO_NO_EXE=0 \ > -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ > -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ > @@ -165,45 +172,75 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) > # > ifndef $(2)_BUILD_CMDS > ifeq ($(4),target) > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +define $(2)_BUILD_CMDS > + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) > +endef > +else > define $(2)_BUILD_CMDS > $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) > endef > +endif > +else > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +define $(2)_BUILD_CMDS > + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) > +endef > else > define $(2)_BUILD_CMDS > $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) > endef > endif > endif > +endif > > # > # Host installation step. Only define it if not already defined by the > # package .mk file. > # > ifndef $(2)_INSTALL_CMDS > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +define $(2)_INSTALL_CMDS > + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) > +endef > +else > define $(2)_INSTALL_CMDS > $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) > endef > endif > +endif > > # > # Staging installation step. Only define it if not already defined by > # the package .mk file. > # > ifndef $(2)_INSTALL_STAGING_CMDS > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +define $(2)_INSTALL_STAGING_CMDS > + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR install > +endef > +else > define $(2)_INSTALL_STAGING_CMDS > $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) > endef > endif > +endif > > # > # Target installation step. Only define it if not already defined by > # the package .mk file. > # > ifndef $(2)_INSTALL_TARGET_CMDS > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +define $(2)_INSTALL_TARGET_CMDS > + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install > +endef > +else > define $(2)_INSTALL_TARGET_CMDS > $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) > endef > endif > +endif > > # Call the generic package infrastructure to generate the necessary > # make targets > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas at devoogdt.com Fri Feb 24 18:12:21 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Fri, 24 Feb 2023 19:12:21 +0100 Subject: [Buildroot] [PATCH v1 1/3] pkg-cmake: add option to select the Ninja generator In-Reply-To: References: <20230224111509.2434694-1-thomas.devoogdt@barco.com> Message-ID: Hi, I don't disagree to have a more generic keyword to add build options. I just took the meson example. Before I rewrite further, I would like to have also feedback from others. About webkit, yes it uses --build very recently. If I can fit the existing MAKE_OPTS with that --build flag, then I will change it. About the doc, I never came to the point where I had to change that, my bad. But would prefer to first get this in to the code base. Documentation can follow if everything stabilizes. Kr, Thomas Op vr 24 feb. 2023 18:53 schreef John Keeping : > On Fri, Feb 24, 2023 at 12:15:07PM +0100, Thomas Devoogdt wrote: > > E.g. Commit > > 16e5c92ff5fd2b44a1126bd7d7538c68ce838213, and > > 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd > > can now be replaced by: WEBKITGTK_CMAKE_NINJA = YES > > > > Packages that are selecting Ninja, should also use the NINJA_{ENV,OPTS} > variables iso the MAKE variables. > > The current webkitgtk build commands use `cmake --build` and `cmake > --install`, wouldn't it be better to use those here? > > I wonder if it makes more sense to replace anything generator-specific > (like $(PKG)_MAKE_OPTS or $(PKG)_NINJA_OPTS) with general > $(PKG)_CMAKE_BUILD_OPTS and $(PKG)_CMAKE_INSTALL_OPTS so that packages > become independent of the generator. > > If those options are at the end of the command, then packages still have > the option (in the build phase) to pass built-tool specific options by > including `--` in the value. > > > Signed-off-by: Thomas Devoogdt > > --- > > package/pkg-cmake.mk | 41 +++++++++++++++++++++++++++++++++++++++-- > > No change in docs/? ;-) > > > 1 file changed, 39 insertions(+), 2 deletions(-) > > > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > > index 8c375779cb..4ce3e6bada 100644 > > --- a/package/pkg-cmake.mk > > +++ b/package/pkg-cmake.mk > > @@ -65,6 +65,13 @@ else > > $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build > > endif > > > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > > +$(2)_DEPENDENCIES += host-ninja > > +$(2)_GENERATOR = "Ninja" > > +else > > +$(2)_GENERATOR = "Unix Makefiles" > > +endif > > + > > # > > # Configure step. Only define it if not already defined by the package > > # .mk file. And take care of the differences between host and target > > @@ -88,7 +95,7 @@ define $(2)_CONFIGURE_CMDS > > rm -f CMakeCache.txt && \ > > PATH=$$(BR_PATH) \ > > $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > > - -G"Unix Makefiles" \ > > + -G$$($$(PKG)_GENERATOR) \ > > > -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ > > -DCMAKE_INSTALL_PREFIX="/usr" \ > > -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ > > @@ -119,7 +126,7 @@ define $(2)_CONFIGURE_CMDS > > PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > > PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ > > $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > > - -G"Unix Makefiles" \ > > + -G$$($$(PKG)_GENERATOR) \ > > -DCMAKE_INSTALL_SO_NO_EXE=0 \ > > -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ > > -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ > > @@ -165,45 +172,75 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) > > # > > ifndef $(2)_BUILD_CMDS > > ifeq ($(4),target) > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > > +define $(2)_BUILD_CMDS > > + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) > $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) > > +endef > > +else > > define $(2)_BUILD_CMDS > > $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) > $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) > > endef > > +endif > > +else > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > > +define $(2)_BUILD_CMDS > > + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) > $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) > > +endef > > else > > define $(2)_BUILD_CMDS > > $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) > $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) > > endef > > endif > > endif > > +endif > > > > # > > # Host installation step. Only define it if not already defined by the > > # package .mk file. > > # > > ifndef $(2)_INSTALL_CMDS > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > > +define $(2)_INSTALL_CMDS > > + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) > -C $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) > > +endef > > +else > > define $(2)_INSTALL_CMDS > > $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) > $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) > > endef > > endif > > +endif > > > > # > > # Staging installation step. Only define it if not already defined by > > # the package .mk file. > > # > > ifndef $(2)_INSTALL_STAGING_CMDS > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > > +define $(2)_INSTALL_STAGING_CMDS > > + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) > $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR install > > +endef > > +else > > define $(2)_INSTALL_STAGING_CMDS > > $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) > $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C > $$($$(PKG)_BUILDDIR) > > endef > > endif > > +endif > > > > # > > # Target installation step. Only define it if not already defined by > > # the package .mk file. > > # > > ifndef $(2)_INSTALL_TARGET_CMDS > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > > +define $(2)_INSTALL_TARGET_CMDS > > + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) > $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install > > +endef > > +else > > define $(2)_INSTALL_TARGET_CMDS > > $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) > $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C > $$($$(PKG)_BUILDDIR) > > endef > > endif > > +endif > > > > # Call the generic package infrastructure to generate the necessary > > # make targets > > -- > > 2.39.2 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Fri Feb 24 22:00:19 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 24 Feb 2023 22:00:19 +0000 Subject: [Buildroot] [Bug 15181] Building libcurl fails due to faulty package definition In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15181 --- Comment #2 from Jookia --- My friend Xogium hit this issue this month and after a few debugging sessions we tracked this down. Here's what I've found: - Arch Linux's host toolchain now sets runpath instead of rpath - libcurl sets LD_LIBRARY_PATH to /lib:/usr/lib - Buildroot pkgconf and Arch Linux pkgconf versions line up - Arch Linux pkgconf library is installed to /usr/lib/libpkgconf.so - Buildroot pkgconf uses the host libpkgconf.so due to LD_LIBRARY_PATH - this is respected because rpath does not override it - The Buildroot pkg-conf script sets LIBPATH to build/host/bin/../sysroot/... and SYSROOT to build/host/sysroot - pkgconf 1.8 silently ignores LIBPATH if it's outside sysroot - pkgconf 1.8 does not normalize paths - pkgconf reverted LIBPATH to the one in the host's libpkg.so, /lib and /usr/lib - curl build tries to find openssl but can't Two fixes are needed: - libcurl build should not set LD_LIBRARY_PATH - the pkg-config wrapper should use normalized paths -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Sat Feb 25 07:39:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 07:39:36 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-24 Message-ID: <20230225073943.A5D7E60E4E@smtp3.osuosl.org> Hello, Autobuild statistics for 2023-02-24 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 10 | 17 | 0 | 27 | master | 146 | 124 | 0 | 270 | next | 13 | 21 | 0 | 34 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 9 host-go-1.19.6 | 7 elfutils-0.186 | 6 glibc-2.36-81-g4f4d7a13edfd... | 6 host-pahole-1.24 | 6 python-numpy-1.23.5 | 5 systemd-252.4 | 4 host-binutils-2.38 | 3 lirc-tools-0.10.2 | 3 netsurf-3.10 | 3 ulog-0389d243352255f6182326... | 3 libcap-ng-0.8.3 | 2 libgcrypt-1.10.1 | 2 libglib2-2.72.3 | 2 linux-5.10.162-cip24-rt10 | 2 network-manager-1.40.10 | 2 ntpsec-1_2_2 | 2 olsr-0.9.8 | 2 sdl-1.2.15 | 2 unknown | 2 android-tools-4.2.2+git2013... | 1 asterisk-16.29.1 | 1 dahdi-linux-3.2.0 | 1 duma-2.5.15 | 1 fdk-aac-2.0.2 | 1 fftw-quad-3.3.8 | 1 flannel-0.14.0 | 1 fontconfig-2.13.1 | 1 fs/axfs/axfs.mk:32: /tmp/in... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 hawktracer-2ec19d7192334414... | 1 host-binutils-2.37 | 1 host-binutils-2.39 | 1 host-wine-7.0 | 1 intel-gmmlib-22.3.3 | 1 janet-1.26.0 | 1 kexec-2.0.25 | 1 kvmtool-f77d646ba01d04be5aa... | 1 libblockdev-2.26 | 1 libcamera-v0.0.4 | 1 libev-4.33 | 1 libfreeimage-3.18.0 | 1 libgpg-error-1.46 | 1 libnl-3.7.0 | 1 linux-6.1.11 | 1 lttng-modules-2.13.7 | 1 nginx-1.22.1 | 1 ntp-4.2.8p15 | 1 openvmtools-11.3.5-18557794 | 1 package/multipath-tools/mul... | 1 pcre2-10.42 | 1 perl-5.36.0 | 1 php-8.2.3 | 1 proxychains-ng-4.16 | 1 python-bcrypt-4.0.1 | 1 python-orjson-3.8.4 | 1 quickjs-2021-03-27 | 1 rsyslog-8.2204.1 | 1 skalibs-2.12.0.1 | 1 uclibc-ng-test-6790eafe897b... | 1 uqmi-0a19b5b77140465c29e2af... | 1 wolfssl-5.5.3 | 1 xfsprogs-5.14.2 | 1 zabbix-6.2.7 | 1 zeek-4.1.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/f7b3e83b2aa61d6d0176b2c788acdc08c6d254b4 | x86_64 | asterisk-16.29.1 | NOK | http://autobuild.buildroot.net/results/e3d9da661b02236c7306d30bcff5386759da17b2 | x86_64 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/a4eacc63a9d3948db260a56aae77beaac04a04ca | sparc64 | duma-2.5.15 | NOK | http://autobuild.buildroot.net/results/553e673cb404f62f03d20a6e58b528d13f5a072f | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3544ba3422612db91a11377d362ec2b2a4fd6e29 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/939128e3080768d5ad2caef2dde8f0277e9c468e | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/0ca940b239a41333481ce07e9a6f3f15c64f177b | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/a5f372c6c858fb78b3e9078d961b6482f73fb6d4 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/02b5daebba4b6c87168039bd9e4dcd51719e6557 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/63e0c08e4651f11ced53bd7818d2d1134404dd61 | ORPH mipsel | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/2dcfb380b4187ad02b88bde9e6702f3e726b6cf8 | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/066433efe70c5662c932fdf80bd307205a0969bb | ORPH s390x | flannel-0.14.0 | NOK | http://autobuild.buildroot.net/results/6a517df1a1575a2796c7a59d12869b2d24e2a715 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/b3a9d140c76ac7a5edadab7b71929cf5f056d6ac | ORPH s390x | fs/axfs/axfs.mk:32: /tmp/in... | NOK | http://autobuild.buildroot.net/results/0cc980f29478575d6db5ed9ffbc98c10729f8d4d | aarch64_be | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/4b3ebdc8af9576e7e8fd7b487a35aa164be7c55f | mips64el | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/4ff0ff4ecc2ac7b8e4f00c08af3a5014bd92cbcc | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/f35c21732c3f9fde6a80963b98c1f8e9974986a7 | powerpc64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/5a370c0ff0011ebf559a0faa46ad487b67abba0d | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/60ae6c0a8926ebd284f61cb6a0a6cee423d84c6a | microblazeel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/181664494ee18a77d327e24bc5b184e7ac84ae75 | i686 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/0a32ab120903f77a03c8dae0bf5438862b53b55e | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e46add0564797e425a292ac9ce80aa58e6b498a0 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/19b1dc6fea570914c8034d9f0471959dc03dfdf8 | riscv64 | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b4f78c046112edb9fab1e576bd547352430e6054 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/d74f0401d25942770bb5aa66dd62f17a63eeee03 | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/5a5e2093b317b4d44cbec4cf2b9ab38340676d8e | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/f6eb1199e3639fca53ba22eda2a79bd62d23abd7 | mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1569485719ad0e6c61164012988b9aeabd98a306 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/caefad691bf88a6a18ad947129ef015a0239f659 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/cb9a5b322c8e2edb3e80a80a918d23541ddd0b45 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/baa186a92d06a24cefb54602201354c1dad5988b | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f2770f474bcc553deea2c3088ef03174e3714a5a | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/52460aa74e2ac681b6f88f7dd28d16612f9a9df1 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/acd635636d6d5ed99843598518e5578747eeda35 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/788acda9badd553f6a2e2b569b59eb87c0e1a61d | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/bfc1b7b6a412ad72490b2b33511c4d07aaae06f3 | ORPH powerpc64le | hawktracer-2ec19d7192334414... | NOK | http://autobuild.buildroot.net/results/3002d6cde21a49fa82c48e72c6bb9a112724032a | mips | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/f6354e3351fd9408d9449db973d1ee40d1460d71 | mips64el | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/5a67c70100e6eb4f839fa41f942d7be117a3fcf0 | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2cbad4f71884a20c57724c15a00d3fd8702c1225 | powerpc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/eb6fc3e1ba14911bf22f6af788f6d64c5bd057c5 | sparc64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/102d4e7ed503b12760d63461ba9fde6aa514b01f | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/8c217b8b081267665b95cc09ca5f9257cb67d3e7 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/8701f281e6c19c58e0fff3730c296ebe06bc6cd3 | powerpc64le | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e595f8156eb5ae79448622f516da1ca85bd1c6c4 | riscv64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/7f29b6db185d1d8aef51893ba638bee6702adbe4 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/bb0ee79e4c101c3bf52ade4c6ef2475b8325209e | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/c6f58ae9c1ec2d13073d8085aeb126b47d63c37f | powerpc64le | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/02ef299a16a8f42e298ffab70856ec994a9ca2ab | arc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/75441f53bd62d3de3a588887a806ae7eba2bdbd0 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/77df82bf0ec4947809c5ecf6d7d448c009dd3e3e | arc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/57a7b16a9b1878f88bb051b5b8a28fba1cf9c081 | m68k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/e142bc1e79edb8c9da462057d7ff248d7ce7df43 | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/bd8722008628f1138a324578af54060220d9cf99 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d594fbd8a98528349f3e37e07ae0987f7abc23a7 | i686 | host-wine-7.0 | NOK | http://autobuild.buildroot.net/results/e60d8a433cd8352ef3df875210583aba24bb4444 | x86_64 | intel-gmmlib-22.3.3 | NOK | http://autobuild.buildroot.net/results/813da152d8e22778132e208902421e61f760d01e | mips64el | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/265720597fa22d1447f0ff6a0a02a057980682b3 | arm | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/59a3259aa9574cd48f1814325597059707e3d089 | ORPH i686 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/a51055f15636cfeeb01d1fcdb48b6cc2a61bfe6a | ORPH sparc | libblockdev-2.26 | NOK | http://autobuild.buildroot.net/results/ede9eb1f13d56c77005cc448416fb2efa9d16ff0 | ORPH or1k | libcamera-v0.0.4 | NOK | http://autobuild.buildroot.net/results/f3586ebc835dd189bc0335dd89858133c5423808 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/12d7aa8e2b8b7e0ce10360186d4be955881ceb34 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/2f2785f4c05e6b91b6259d010782cd560ec0b478 | armeb | libev-4.33 | NOK | http://autobuild.buildroot.net/results/b348d0669e34218b5ada73a344382cb2b26cd718 | ORPH mips | libfreeimage-3.18.0 | NOK | http://autobuild.buildroot.net/results/180cea9806fff2d8e022dd9fac313a5877376022 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/6b13dfb9122403696430ce3c10a15c4588e0d47b | ORPH arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/8cb64e800a7ecd7dcdeb80142ab56a8a6f251028 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/06fdc4bb89f895933364f614f92609d88978575d | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/78abc1140800e1eda13e66e9a92b5a35563c5b2c | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/2592972d3b9b16d3de7172b62edb21606aabd183 | ORPH mips64 | libnl-3.7.0 | NOK | http://autobuild.buildroot.net/results/a357e480781bd58364b5fdc958f5a975fbb3f427 | ORPH nios2 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/9b184ba9bc88727747d36873e20d243443fb0f08 | ORPH microblaze | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/8212366e7f8a53a48f86614453bafb5f0e1f5085 | ORPH riscv32 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/9e070a2822f3ee339704482a2f028ad4b9cfd70b | ORPH sparc64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/a59f6d3e509bf5bd09974a8417fe19e4b1ea3c32 | ORPH mipsel | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/cf377a92f4df3f82960507784b33491d0261282b | ORPH sparc | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/85359d3f678b49e46821a1c10da5f14edfb5e6d0 | ORPH aarch64_be | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/c73232a7fea00db72606be54dd5d98d47bf44a55 | aarch64_be | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/bcb48536431046eb7531debbfa55ab861b5e6bfe | nios2 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/5c4f6d3926913daab6aa8c787e8cc737635e6338 | sparc64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/81844aeadcedf73179f9f9fd3ecb5d76ec31c332 | sh4aeb | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/8739deb2a7b9de4257e3f10cebad258d67275ced | ORPH powerpc64 | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/f8483b98d1038029b0de34b3fed9365184cd6818 | ORPH powerpc64 | nginx-1.22.1 | NOK | http://autobuild.buildroot.net/results/9033346dd04c9c9cf307400eca7a235298115135 | riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/7f96b486b541819bb7d9a59494f427e0198315f2 | ORPH i686 | ntpsec-1_2_2 | NOK | http://autobuild.buildroot.net/results/f38abc6b7f8464836231192cfe078a5b27319a8a | ORPH m68k | ntpsec-1_2_2 | NOK | http://autobuild.buildroot.net/results/5470b3f8b163f5ae2d10abca181f4d0feba6598e | ORPH nios2 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/7663b4fe18289c4da8b7073c6f3d3e11cdf1f700 | ORPH arc | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/47a22c0deacfb57b3cfb2d7fa19dd3f940bdc927 | ORPH x86_64 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/2328c77a20eb00dbaed6546a8df44fef183acfe2 | sparc64 | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/a1807f038f7fa400963fd7115653568ca804d0c5 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/5b7d05fa4ab80b51929fa42850b01f70c37e2ae1 | ORPH arm | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/df4c18a050464482d14719627ffcf87e4bcd5b48 | microblazeel | php-8.2.3 | NOK | http://autobuild.buildroot.net/results/3c44e4fda8faa23c5fd033f6082b1c2a0e71c238 | mips64el | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/69677ea90d1229ec900010a3e8bb4a6d887ae176 | ORPH mips64el | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/c52abc122b805f1c16a42d8979a90e7ab05a34ee | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/46e68772eb2d73630ea3eca2d16371e1889ef2bd | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/cbd23821abb15237e1bee3a1d237348ffe92d893 | powerpc | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/812191aaf0c241a776bee984096142fd7bccf9e6 | mips | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/2f64df95a38c7a217674ac1a14498871778a0896 | sh4 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/172a312de5cf03aea85d1bc29dbee499411384c0 | mips | python-orjson-3.8.4 | NOK | http://autobuild.buildroot.net/results/0a91bd206cd114c075cc0ef3f328c2372f33cec5 | sh4aeb | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/56e98b1b1ab804c58b677d9557b145f026d723f0 | arceb | rsyslog-8.2204.1 | NOK | http://autobuild.buildroot.net/results/1d07cd52ef2da7fb00a79e722a8d9edbf04569ae | ORPH sh4eb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/20271dbd5f31dd87766179f9e25d8a2eadfec8f9 | ORPH sh4a | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/0ede8b97d66a729f9c2a3fe447c8c56fdd05251e | ORPH or1k | skalibs-2.12.0.1 | NOK | http://autobuild.buildroot.net/results/3911f194418ffbafee61db9d9b3179f249a233a7 | sparc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/4192f18c053b268238a66e7231434637ef35fbc6 | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/a6d563cd65f40816a73b7f237e011492841f40f1 | mips64el | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/33da864a48a289234b9eeb9d4e6821dc6643573e | powerpc64le | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/f05d1d44a0f667eeb63cb9c906416019988e1f21 | mips64el | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/47b5a5b3a938ade6773062bdfb47906e2da9b91f | sparc64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/03bf110beb45ab746093520cd9b8ba6a51661a1f | aarch64_be | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/8cffe81496d1c77dab4ad30fb13bbc2776ebf50a | sh4aeb | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/8acdfcc0a50caf73966af0138565cc2f85206539 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/229e85b778e84e4cb5672a113939cf983edbe542 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/3aedf3b5c0cb7e924fa01518302ca677d891638f | mips64el | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/1858135e0042ca51251ce8a94a2e34a5ca66e41b | ORPH mipsel | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/3bfa444ea08baa704f2ea54b9d7102fd42ed3523 | mips64el | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/bf0909ffafbc4802bfca1c661c7ff50470b1a53f | ORPH mips | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/acdfcb17b39d438ccf5e4621707a10f60577d233 | sparc | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/45387d5aa0f08c1db137b0e639e9e67cbf06d956 | Classification of failures by reason for next --------------------------------------------- python-numpy-1.23.5 | 3 glibc-2.36-81-g4f4d7a13edfd... | 2 host-go-1.19.6 | 2 elfutils-0.186 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 gnu-efi-3.0.15 | 1 host-binutils-2.38 | 1 host-binutils-2.39 | 1 host-pahole-1.24 | 1 libcap-ng-0.8.3 | 1 libglib2-2.72.3 | 1 optee-client-3.19.0 | 1 quickjs-2021-03-27 | 1 stress-ng-0.13.05 | 1 systemd-252.4 | 1 toolchain-external-codescap... | 1 unknown | 1 Detail of failures for next --------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/073d029087bc2506070862cb7f0c6d9bfc387f6c | ORPH powerpc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/deea68496b6c9da3f8da9b5dd5ec3b7e171e1338 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e8671855fba77240348f8d789a5668ad40b881b7 | powerpc64le | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/dc86ab1036fabf1e760af4e27cf47f7c34b5d472 | mips64el | gnu-efi-3.0.15 | NOK | http://autobuild.buildroot.net/results/148215fa2fac98eb0d71ac0f34a0230c16bfb8e8 | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6df3b13ddf1ccb33c3c8660e103f7d3676da21e0 | mips64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/23d52d9c5c6d5c10e868c24e65debfcd6b3fc122 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/77823d7ff448adbb154fe9e57f3dde60e742af47 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/95555037cf97ed6c3bf8c320ee73072207e9b283 | arc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d7953cedc8f3356036d18586e0f8d51aaddf3424 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/c0ec92ef2ba15104e7b8bc84acaff567ab73ba5d | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/86fbfc77f10d94c97b145d8b0a4b282e507a55c5 | arceb | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/649cfd5c375e83af0ac3913ae883ca86dd4026e8 | arm | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/994d9de3f78bd576295395e96d6d6e9fca8c1779 | powerpc | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/a21660b39ea2d6d41652247e5b71a584d8fd895b | mips | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/7cde446f1ba174490ad65b1aa88beeaa41502b2f | microblaze | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/e40640b1d51a80130873da3a5b40a20b0534beda | sparc | stress-ng-0.13.05 | NOK | http://autobuild.buildroot.net/results/d217493756824318ffdc48767cf8a3577cfcdd80 | sparc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/8db81160b19e4f7e58d213883b0ce5683ea7e497 | mips64 | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/437786d42025034193c30dc4bf6d8721c6b9e8ab | ORPH powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/e1cd48b17ec8beb72a5675e817bd0394a4132f4a | Classification of failures by reason for 2022.11.x -------------------------------------------------- host-rust-1.64.0 | 3 host-binutils-2.38 | 2 host-pahole-1.24 | 2 elfutils-0.186 | 1 frr-8.3.1 | 1 gobject-introspection-1.72.0 | 1 gummiboot-2bcd919c681c952eb... | 1 libglib2-2.72.3 | 1 s6-linux-utils-2.6.0.0 | 1 ulog-0389d243352255f6182326... | 1 unknown | 1 wolfssl-5.5.3 | 1 xz-5.2.7 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/8331c8b9780552fa3f0088488d2b3643d80b54ec | ORPH arceb | frr-8.3.1 | NOK | http://autobuild.buildroot.net/results/fe1e945b5627f8d601c55af5d3e4a55e40d908af | i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d7380c8442d4c1c3428f61c87c2a1d6728e70ca6 | ORPH x86_64 | gummiboot-2bcd919c681c952eb... | NOK | http://autobuild.buildroot.net/results/a270cd4cd5a75a344e8af735e2746a5d149ea181 | mipsel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/390e91c1b6b780cefa8f2287ef9e08aab73c5249 | aarch64_be | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/f28017f2486b959f1e330683f88e310ec6215b3c | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/0f90bd3691c16bb66c25d85f330430a82de15cae | nios2 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/387d27fc29e8ea039436496abbc825b40cd12583 | sparc64 | host-rust-1.64.0 | NOK | http://autobuild.buildroot.net/results/1e100d56271d0b84844cc16130fb60edf3d03056 | armeb | host-rust-1.64.0 | NOK | http://autobuild.buildroot.net/results/5572adce8e555d9cb9b213729cb08ef490e13c79 | mips | host-rust-1.64.0 | NOK | http://autobuild.buildroot.net/results/381e5c4660303c82ee0d3eb54dcb30f6a3f9a778 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/08d6090acf12d0e08762a02cf16e8adf52e6bcad | mips64el | s6-linux-utils-2.6.0.0 | NOK | http://autobuild.buildroot.net/results/731427c2db251121866a8279e1a079630d274b10 | i686 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/1b3bebba4bb2abbf217ecf5ec9a759bb64e7787c | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/b4ac81ba02647bb42b4c69c2d81fecc0d7cfef92 | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/27dcca13f5089b7343474655984340bc462ebccb | microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/d07fed316ccc7b0c305b36f25f4b316601df8960 | ORPH Gitlab CI results for 2023-02-24 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820927991 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820927995 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928002 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928003 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928004 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928005 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928006 | avenger96 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928007 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928008 | bananapi_m2_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928009 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928010 | ORPH beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928011 | beaglebone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928012 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928013 | beagleboneai | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928014 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928015 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928016 | broadcom_northstar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928017 | canaan_kd233 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928018 | chromebook_elm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928019 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928020 | ci20 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928022 | cubieboard2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928023 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928024 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928026 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928027 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928029 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928030 | freescale_imx28evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928032 | freescale_imx6dlsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928033 | freescale_imx6dlsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928034 | freescale_imx6qsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928036 | freescale_imx6qsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928037 | freescale_imx6sxsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928039 | freescale_imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928040 | freescale_imx7dsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928041 | freescale_imx8mmevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928043 | freescale_imx8mnevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928044 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928045 | freescale_imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928046 | freescale_imx8qmmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928047 | freescale_imx8qxpmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928048 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928049 | ORPH freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928050 | ORPH freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928051 | ORPH friendlyarm_nanopi_r2s | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928052 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928053 | globalscale_espressobin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928054 | grinn_chiliboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928055 | grinn_liteboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928056 | hifive_unleashed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928057 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928058 | imx6-sabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928059 | imx6-sabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928060 | imx6-sabresd_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928061 | imx6slevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928062 | imx6sx-sdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928063 | imx6ulevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928064 | imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928065 | imx6ulpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928066 | imx7d-sdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928068 | imx7dpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928069 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928070 | imx8mn_bsh_smm_s2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928072 | imx8mn_bsh_smm_s2_pro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928073 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928074 | imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928076 | kontron_bl_imx8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928077 | kontron_pitx_imx8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928079 | kontron_smarc_sal28 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928080 | lafrite | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928081 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928082 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928084 | linksprite_pcduino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928085 | ls1028ardb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928087 | mender_x86_64_efi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928089 | ORPH microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928090 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928092 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928094 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928095 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928098 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928100 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928101 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928103 | minnowboard_max | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928104 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928106 | mx51evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928107 | mx53loco | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928109 | mx6cubox | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928110 | mx6sx_udoo_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928111 | mx6udoo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928112 | nexbox_a95x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928113 | nezha | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928114 | nitrogen6sx | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928115 | nitrogen6x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928116 | nitrogen7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928117 | nitrogen8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928118 | nitrogen8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928119 | nitrogen8mn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928120 | nitrogen8mp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928121 | octavo_osd32mp1_brk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928122 | octavo_osd32mp1_red | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928123 | odroidc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928124 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928125 | olimex_a10_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928126 | olimex_a13_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928127 | olimex_a20_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928129 | olimex_a20_olinuxino_lime2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928128 | olimex_a20_olinuxino_micro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928130 | olimex_a33_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928131 | olimex_a64_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928132 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928133 | olimex_stmp157_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928134 | olpc_xo1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928136 | olpc_xo175 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928135 | openblocks_a6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928137 | orangepi_lite | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928139 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928138 | orangepi_one | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928140 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928141 | orangepi_pc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928142 | orangepi_pc_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928143 | orangepi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928144 | orangepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928145 | orangepi_zero_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928147 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928146 | pandaboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928148 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928149 | pc_x86_64_efi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928150 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928151 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928152 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928153 | qemu_aarch64_ebbr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928154 | qemu_aarch64_sbsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928155 | qemu_aarch64_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928156 | qemu_arm_ebbr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928157 | qemu_arm_versatile | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928158 | qemu_arm_vexpress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928159 | qemu_arm_vexpress_tz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928160 | qemu_m68k_mcf5208 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928161 | qemu_m68k_q800 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928162 | qemu_microblazebe_mmu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928163 | qemu_microblazeel_mmu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928164 | qemu_mips32r2_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928165 | qemu_mips32r2el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928166 | qemu_mips32r6_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928167 | qemu_mips32r6el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928168 | qemu_mips64_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928169 | qemu_mips64el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928170 | qemu_mips64r6_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928171 | qemu_mips64r6el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928172 | qemu_nios2_10m50 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928173 | qemu_or1k | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928174 | qemu_ppc64_e5500 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928175 | qemu_ppc64_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928176 | qemu_ppc64le_powernv8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928177 | qemu_ppc64le_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928179 | qemu_ppc_bamboo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928180 | qemu_ppc_e500mc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928181 | qemu_ppc_g3beige | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928182 | qemu_ppc_mac99 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928183 | qemu_ppc_mpc8544ds | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928184 | qemu_riscv32_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928185 | qemu_riscv64_nommu_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928186 | qemu_riscv64_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928187 | qemu_s390x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928188 | qemu_sh4_r2d | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928189 | qemu_sh4eb_r2d | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928191 | qemu_sparc64_sun4u | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928193 | qemu_sparc_ss10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928194 | qemu_x86 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928198 | qemu_x86_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928195 | qemu_xtensa_lx60 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928199 | qemu_xtensa_lx60_nommu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928201 | raspberrypi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928216 | ORPH raspberrypi0 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928203 | ORPH raspberrypi0w | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928206 | ORPH raspberrypi2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928208 | ORPH raspberrypi3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928211 | raspberrypi3_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928209 | ORPH raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928212 | ORPH raspberrypi4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928215 | ORPH raspberrypi4_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928213 | ORPH raspberrypicm4io | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928219 | ORPH raspberrypicm4io_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928218 | ORPH raspberrypizero2w | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928221 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928222 | rock64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928224 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928225 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928226 | roseapplepi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928229 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928230 | sheevaplug | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928232 | sipeed_lichee_rv | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928233 | sipeed_lichee_rv_dock | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928234 | sipeed_maix_bit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928235 | sipeed_maix_bit_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928237 | sipeed_maix_dock | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928238 | sipeed_maix_dock_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928239 | sipeed_maix_go | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928241 | sipeed_maix_go_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928242 | sipeed_maixduino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928243 | sipeed_maixduino_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928246 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928247 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928248 | snps_archs38_haps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928249 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928252 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928253 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928254 | solidrun_clearfog_gt_8k | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928255 | solidrun_macchiatobin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928257 | ORPH spike_riscv64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928258 | stm32f429_disco_xip | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928259 | stm32f469_disco_sd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928262 | stm32f469_disco_xip | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928263 | stm32mp157a_dk1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928265 | stm32mp157c_dk2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928266 | stm32mp157c_odyssey | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928267 | terasic_de10nano_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928268 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928269 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928270 | ts5500 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928271 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928273 | uevm5432 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928274 | versal_vck190 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928275 | visionfive | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928277 | visionfive2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928276 | wandboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928278 | warp7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928279 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928281 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928282 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928283 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928284 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928285 | zynqmp_kria_kv260 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928286 | zynqmp_zcu102 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928287 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928288 | -- http://autobuild.buildroot.net From fontaine.fabrice at gmail.com Sat Feb 25 09:22:27 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 10:22:27 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add ti-k3-r5-loader handling Message-ID: <20230225092227.9308-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 0189bcb47c7733c36fcbcb88fbf26f57958db576: make[2]: *** No rule to make target '_defconfig'. Stop. Fixes: - http://autobuild.buildroot.org/results/d7449b2b2f2349af672bfeee832b89a223a7d9cc Signed-off-by: Fabrice Fontaine --- utils/genrandconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index d192c5b324..64b9be69db 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -518,6 +518,11 @@ def fixup_config(sysinfo, configfile): 'BR2_TARGET_S500_BOOTLOADER_BOARD=""\n' in configlines: return False + if 'BR2_TARGET_TI_K3_R5_LOADER=y\n' in configlines and \ + 'BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG=y\n' in configlines and \ + 'BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG=""\n' in configlines: + return False + if 'BR2_TARGET_UBOOT=y\n' in configlines and \ 'BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y\n' in configlines and \ 'BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y\n' in configlines and \ -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 09:35:27 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 10:35:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: add host-pkgconf dependency Message-ID: <20230225093527.16587-1-fontaine.fabrice@gmail.com> host-pkgconf is mandatory to find lz4 and zstd resulting in the following build failure since commit 9cd2e6e090449f9d2f371d24152580c038892f3d: configure: error: in `/home/autobuild/autobuild/instance-5/output-1/build/postgresql-15.2': configure: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. Alternatively, you may set the environment variables LZ4_CFLAGS and LZ4_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. Fixes: - http://autobuild.buildroot.org/results/8744277ebe9910635ef8fe290c8ba4eee420b538 Signed-off-by: Fabrice Fontaine --- package/postgresql/postgresql.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 1e9e4b83df..f087c0c964 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -92,14 +92,14 @@ POSTGRESQL_CONF_OPTS += --without-libxml endif ifeq ($(BR2_PACKAGE_ZSTD),y) -POSTGRESQL_DEPENDENCIES += zstd +POSTGRESQL_DEPENDENCIES += host-pkgconf zstd POSTGRESQL_CONF_OPTS += --with-zstd else POSTGRESQL_CONF_OPTS += --without-zstd endif ifeq ($(BR2_PACKAGE_LZ4),y) -POSTGRESQL_DEPENDENCIES += lz4 +POSTGRESQL_DEPENDENCIES += host-pkgconf lz4 POSTGRESQL_CONF_OPTS += --with-lz4 else POSTGRESQL_CONF_OPTS += --without-lz4 -- 2.39.1 From thomas.petazzoni at bootlin.com Sat Feb 25 09:37:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:37:19 +0100 Subject: [Buildroot] [git commit] package/systemd: fix build with -Ofast Message-ID: <20230225093924.AF2198691D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=45e2aa588d7d10941032c1661b9cf1e6c52b2680 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update -Ofast workaround as suggested by Yann E. Morin to avoid the following build failure raised since bump to version 252.4 in commit a2c823d1f548d5a0120d27d6c000603192360f7b and https://github.com/systemd/systemd/commit/60f97fee2d2f948c8e8963ea8ff767008cb93cae: ../output-1/build/systemd-252.4/meson.build:397:8: ERROR: Problem encountered: -Ofast, -ffast-math, or -ffinite-math-only is specified in c_args. Fixes: - http://autobuild.buildroot.org/results/8f41c4984b645851724e554c3162b83bc312bee7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index cce9162f6d..63467171ed 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -100,7 +100,7 @@ SYSTEMD_CONF_OPTS += \ SYSTEMD_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_OPTIMIZE_FAST),y) -SYSTEMD_CFLAGS += -O3 +SYSTEMD_CFLAGS += -O3 -fno-finite-math-only endif ifeq ($(BR2_nios2),y) From thomas.petazzoni at bootlin.com Sat Feb 25 09:37:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:37:14 +0100 Subject: [Buildroot] [git commit] package/hawktracer: update URL in Config.in Message-ID: <20230225093924.A2EE586911@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=edc6350d427bdd47552a276d80c6ad055add86af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Current website is down: https://github.com/amzn/hawktracer/issues/87 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hawktracer/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hawktracer/Config.in b/package/hawktracer/Config.in index 7648707404..bee9c27b7d 100644 --- a/package/hawktracer/Config.in +++ b/package/hawktracer/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_HAWKTRACER profiling tool built in Amazon Video for getting performance metrics from low-end devices. - https://www.hawktracer.org/ + https://hawktracer.github.io/ if BR2_PACKAGE_HAWKTRACER From thomas.petazzoni at bootlin.com Sat Feb 25 09:37:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:37:39 +0100 Subject: [Buildroot] [git commit] package/intel-gmmlib: needs threads Message-ID: <20230225093924.C90AC8690E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5d310772d71f547146684673c7113f208a31b5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master threads are mandatory since version 19.1.1 and https://github.com/intel/gmmlib/commit/9e4aa143fb7e7e87332fcb7c9871040ff4a1a1da resulting in the following build failure since commit cd206d9b808a322a00294b4caad203a892ed4c92: CMake Error at /home/thomas/autobuild/instance-2/output-1/host/share/cmake-3.22/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find Threads (missing: Threads_FOUND) Fixes: - http://autobuild.buildroot.org/results/c1120932e8c212820b239ee8cd4a057623a73376 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/intel-gmmlib/Config.in | 6 ++++-- package/intel-mediadriver/Config.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/intel-gmmlib/Config.in b/package/intel-gmmlib/Config.in index b6f93f7416..a3d0d2610b 100644 --- a/package/intel-gmmlib/Config.in +++ b/package/intel-gmmlib/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_INTEL_GMMLIB depends on BR2_x86_64 depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS help The Intel(R) Graphics Memory Management Library provides device specific and buffer management for the Intel(R) @@ -11,5 +12,6 @@ config BR2_PACKAGE_INTEL_GMMLIB https://github.com/intel/gmmlib -comment "intel-gmmlib needs a toolchain w/ dynamic library, C++" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP +comment "intel-gmmlib needs a toolchain w/ dynamic library, C++, threads" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/intel-mediadriver/Config.in b/package/intel-mediadriver/Config.in index ad56590008..537e4abd2f 100644 --- a/package/intel-mediadriver/Config.in +++ b/package/intel-mediadriver/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER depends on !BR2_STATIC_LIBS # mesa3d, libva depends on BR2_INSTALL_LIBSTDCPP # intel-gmmlib, mesa3d depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d - depends on BR2_TOOLCHAIN_HAS_THREADS # libva + depends on BR2_TOOLCHAIN_HAS_THREADS # intel-gmmlib, libva depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d select BR2_PACKAGE_INTEL_GMMLIB select BR2_PACKAGE_LIBPCIACCESS From thomas.petazzoni at bootlin.com Sat Feb 25 09:37:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:37:23 +0100 Subject: [Buildroot] [git commit] package/hawktracer: bump to 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 Message-ID: <20230225093924.BB06786922@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=656aec42d96f1286b4acb3ad0e9c84073db3c6b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure with gcc >= 12: /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp: In function 'HT_Thread* ht_thread_create(ht_thread_callback_t, void*)': /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp:1006:28: error: no matching function for call to 'operator new(sizetype, std::thread*)' 1006 | new(&th->th) HT_Thread(); | ^ https://github.com/amzn/hawktracer/compare/e53b07bc812c4cfe8f6253ddb48ac43de8fa74a8...2ec19d71923344148928ef45fce549eda67030a4 Fixes: - http://autobuild.buildroot.org/results/d18a1b2ee6cdcb289567ae90b2d836844427b5f6 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hawktracer/hawktracer.hash | 2 +- package/hawktracer/hawktracer.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hawktracer/hawktracer.hash b/package/hawktracer/hawktracer.hash index 47a8b35b6b..29d00e29ec 100644 --- a/package/hawktracer/hawktracer.hash +++ b/package/hawktracer/hawktracer.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 a48e26082fd644222d4a20ecfd5a34700865cf572d41b7eac5b0c8242fef9c5f hawktracer-2ec19d71923344148928ef45fce549eda67030a4.tar.gz +sha256 099f76d5be18ad5d714fded0c6f889f588986cdde2b31f2c0058413698a5f35c hawktracer-3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5.tar.gz sha256 2f377333e64ad08ad3afec8ed6c2c96ced2a6d7d67443eb2784a931bb7b3fd59 LICENSE diff --git a/package/hawktracer/hawktracer.mk b/package/hawktracer/hawktracer.mk index fd635e350d..462d073755 100644 --- a/package/hawktracer/hawktracer.mk +++ b/package/hawktracer/hawktracer.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAWKTRACER_VERSION = 2ec19d71923344148928ef45fce549eda67030a4 +HAWKTRACER_VERSION = 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 HAWKTRACER_SITE = $(call github,amzn,hawktracer,$(HAWKTRACER_VERSION)) HAWKTRACER_LICENSE = MIT HAWKTRACER_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sat Feb 25 09:38:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:38:37 +0100 Subject: [Buildroot] [git commit] package/ntpsec: fix CPE ID version Message-ID: <20230225093924.D575986911@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=723ecc92979183a08a28176c6bf65c5555a88263 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master CPE ID is wrong since the addition of the package in commit 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a, the correct CPE ID is cpe:2.3:a:ntpsec:ntpsec:1.2.2:*:*:*:*:*:*:*, not cpe:2.3:a:ntpsec:ntpsec:1.2:2:*:*:*:*:*:* Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ntpsec/ntpsec.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index c7fa2f85a8..e612e982ec 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -4,12 +4,9 @@ # ################################################################################ -NTPSEC_VERSION_MAJOR = 1 -NTPSEC_VERSION_MINOR = 2 -NTPSEC_VERSION_POINT = 2 -NTPSEC_VERSION = $(NTPSEC_VERSION_MAJOR)_$(NTPSEC_VERSION_MINOR)_$(NTPSEC_VERSION_POINT) -NTPSEC_SOURCE = ntpsec-NTPsec_$(NTPSEC_VERSION).tar.bz2 -NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(NTPSEC_VERSION) +NTPSEC_VERSION = 1.2.2 +NTPSEC_SOURCE = ntpsec-NTPsec_$(subst .,_,$(NTPSEC_VERSION)).tar.bz2 +NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(subst .,_,$(NTPSEC_VERSION)) NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT, CC-BY-4.0 (docs) NTPSEC_LICENSE_FILES = \ LICENSES/BSD-2 \ @@ -20,8 +17,6 @@ NTPSEC_LICENSE_FILES = \ docs/copyright.adoc NTPSEC_CPE_ID_VENDOR = ntpsec -NTPSEC_CPE_ID_VERSION = $(NTPSEC_VERSION_MAJOR).$(NTPSEC_VERSION_MINOR) -NTPSEC_CPE_ID_UPDATE = $(NTPSEC_VERSION_POINT) NTPSEC_DEPENDENCIES = \ host-bison \ From thomas.petazzoni at bootlin.com Sat Feb 25 09:39:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:39:05 +0100 Subject: [Buildroot] [git commit] utils/genrandconfig: add ti-k3-r5-loader handling Message-ID: <20230225093924.E275A8691D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02b6af266340638d154257bf2634ccc13d47ec69 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 0189bcb47c7733c36fcbcb88fbf26f57958db576: make[2]: *** No rule to make target '_defconfig'. Stop. Fixes: - http://autobuild.buildroot.org/results/d7449b2b2f2349af672bfeee832b89a223a7d9cc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index b3576f8a51..ea8548d42c 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -519,6 +519,11 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_S500_BOOTLOADER=y\n') configlines.remove('BR2_TARGET_S500_BOOTLOADER_BOARD=""\n') + if 'BR2_TARGET_TI_K3_R5_LOADER=y\n' in configlines and \ + 'BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG=y\n' in configlines and \ + 'BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG=""\n' in configlines: + return False + if 'BR2_TARGET_UBOOT=y\n' in configlines and \ 'BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y\n' in configlines and \ 'BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y\n' in configlines and \ From thomas.petazzoni at bootlin.com Sat Feb 25 09:39:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:39:12 +0100 Subject: [Buildroot] [git commit] package/postgresql: add host-pkgconf dependency Message-ID: <20230225093924.EF1B486922@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5215f56e5bed387575b35de65b78d815b96ba6f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-pkgconf is mandatory to find lz4 and zstd resulting in the following build failure since commit 9cd2e6e090449f9d2f371d24152580c038892f3d: configure: error: in `/home/autobuild/autobuild/instance-5/output-1/build/postgresql-15.2': configure: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. Alternatively, you may set the environment variables LZ4_CFLAGS and LZ4_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. Fixes: - http://autobuild.buildroot.org/results/8744277ebe9910635ef8fe290c8ba4eee420b538 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 5e3601cb46..a2aed9a2eb 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -92,14 +92,14 @@ POSTGRESQL_CONF_OPTS += --without-libxml endif ifeq ($(BR2_PACKAGE_ZSTD),y) -POSTGRESQL_DEPENDENCIES += zstd +POSTGRESQL_DEPENDENCIES += host-pkgconf zstd POSTGRESQL_CONF_OPTS += --with-zstd else POSTGRESQL_CONF_OPTS += --without-zstd endif ifeq ($(BR2_PACKAGE_LZ4),y) -POSTGRESQL_DEPENDENCIES += lz4 +POSTGRESQL_DEPENDENCIES += host-pkgconf lz4 POSTGRESQL_CONF_OPTS += --with-lz4 else POSTGRESQL_CONF_OPTS += --without-lz4 From thomas.petazzoni at bootlin.com Sat Feb 25 09:37:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:37:07 +0100 Subject: [Buildroot] [git commit] package/zabbix: fix build with libressl >= 3.5.0 Message-ID: <20230225093924.95C5F8690E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7edb4a6a4db7d864c6c1560f3fdc1ef4fbd7f0fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with libressl >= 3.5.0 raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration 113 | static void OPENSSL_cleanup(void) | ^~~~~~~~~~~~~~~ In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, from ../../../include/zbxcomms.h:65, from tls.c:20: /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' 565 | void OPENSSL_cleanup(void); | ^~~~~~~~~~~~~~~ In file included from tls.c:20: tls.c: In function 'zbx_log_ciphersuites': ../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) | ^~ tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); | ^~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0002-fix-build-with-libressl-3.5.0.patch | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 0000000000..7e32ad5745 --- /dev/null +++ b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,71 @@ +From 5c8511384f1d41f9c2a131604d5cb2dbc1c0aec9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 Feb 2023 12:23:56 +0100 +Subject: [PATCH] fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration + 113 | static void OPENSSL_cleanup(void) + | ^~~~~~~~~~~~~~~ +In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, + from ../../../include/zbxcomms.h:65, + from tls.c:20: +/home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' + 565 | void OPENSSL_cleanup(void); + | ^~~~~~~~~~~~~~~ +In file included from tls.c:20: +tls.c: In function 'zbx_log_ciphersuites': +../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} + 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) + | ^~ +tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' + 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); + | ^~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent (no feedback on first patch)] +--- + include/zbxcomms.h | 3 ++- + src/libs/zbxcomms/tls.c | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/include/zbxcomms.h b/include/zbxcomms.h +index e7d74dbd0f..d6efa358fe 100644 +--- a/include/zbxcomms.h ++++ b/include/zbxcomms.h +@@ -253,7 +253,8 @@ int zbx_telnet_execute(ZBX_SOCKET socket_fd, const char *command, AGENT_RESULT * + /* TLS BLOCK */ + #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) + +-#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) ++#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL + # if !defined(LIBRESSL_VERSION_NUMBER) + # define OPENSSL_INIT_LOAD_SSL_STRINGS 0 + # define OPENSSL_INIT_LOAD_CRYPTO_STRINGS 0 +diff --git a/src/libs/zbxcomms/tls.c b/src/libs/zbxcomms/tls.c +index 54ab0a6ef4..bd4075b3e4 100644 +--- a/src/libs/zbxcomms/tls.c ++++ b/src/libs/zbxcomms/tls.c +@@ -30,8 +30,9 @@ + #include "zbxstr.h" + #include "zbxtime.h" + +-#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) +-/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ ++#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x300000fL ++/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL (before 3.5.0) */ + + /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and example in crypto/threads/mttest.c) */ + +-- +2.39.1 + From thomas.petazzoni at bootlin.com Sat Feb 25 09:40:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix build with libressl >= 3.5.0 In-Reply-To: <20230224114320.2152346-1-fontaine.fabrice@gmail.com> References: <20230224114320.2152346-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104001.7df24464@windsurf> On Fri, 24 Feb 2023 12:43:20 +0100 Fabrice Fontaine wrote: > Fix the following build failure with libressl >= 3.5.0 raised since bump > to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: > > tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration > 113 | static void OPENSSL_cleanup(void) > | ^~~~~~~~~~~~~~~ > In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, > from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, > from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, > from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, > from ../../../include/zbxcomms.h:65, > from tls.c:20: > /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' > 565 | void OPENSSL_cleanup(void); > | ^~~~~~~~~~~~~~~ > In file included from tls.c:20: > tls.c: In function 'zbx_log_ciphersuites': > ../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} > 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) > | ^~ > tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' > 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); > | ^~~~~~~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 > > Signed-off-by: Fabrice Fontaine > --- > .../0002-fix-build-with-libressl-3.5.0.patch | 71 +++++++++++++++++++ > 1 file changed, 71 insertions(+) > create mode 100644 package/zabbix/0002-fix-build-with-libressl-3.5.0.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:40:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/hawktracer: update URL in Config.in In-Reply-To: <20230224134028.307983-1-fontaine.fabrice@gmail.com> References: <20230224134028.307983-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104006.25c03674@windsurf> On Fri, 24 Feb 2023 14:40:28 +0100 Fabrice Fontaine wrote: > Current website is down: > https://github.com/amzn/hawktracer/issues/87 > > Signed-off-by: Fabrice Fontaine > --- > package/hawktracer/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:40:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:15 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/systemd: fix build with -Ofast In-Reply-To: <20230224161543.27879-1-fontaine.fabrice@gmail.com> References: <20230224161543.27879-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104015.3f24e165@windsurf> On Fri, 24 Feb 2023 17:15:43 +0100 Fabrice Fontaine wrote: > Update -Ofast workaround as suggested by Yann E. Morin to avoid the > following build failure raised since bump to version 252.4 in commit > a2c823d1f548d5a0120d27d6c000603192360f7b and > https://github.com/systemd/systemd/commit/60f97fee2d2f948c8e8963ea8ff767008cb93cae: > > ../output-1/build/systemd-252.4/meson.build:397:8: ERROR: Problem encountered: -Ofast, -ffast-math, or -ffinite-math-only is specified in c_args. > > Fixes: > - http://autobuild.buildroot.org/results/8f41c4984b645851724e554c3162b83bc312bee7 > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Thomas Petazzoni and Yann E. Morin): > - Update workaround instead of disabling with -Ofast Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:40:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/hawktracer: bump to 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 In-Reply-To: <20230224163116.46934-1-fontaine.fabrice@gmail.com> References: <20230224163116.46934-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104020.1495fb25@windsurf> On Fri, 24 Feb 2023 17:31:16 +0100 Fabrice Fontaine wrote: > This bump will fix the following build failure with gcc >= 12: > > /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp: In function 'HT_Thread* ht_thread_create(ht_thread_callback_t, void*)': > /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp:1006:28: error: no matching function for call to 'operator new(sizetype, std::thread*)' > 1006 | new(&th->th) HT_Thread(); > | ^ > > https://github.com/amzn/hawktracer/compare/e53b07bc812c4cfe8f6253ddb48ac43de8fa74a8...2ec19d71923344148928ef45fce549eda67030a4 > > Fixes: > - http://autobuild.buildroot.org/results/d18a1b2ee6cdcb289567ae90b2d836844427b5f6 > > Signed-off-by: Fabrice Fontaine > --- > package/hawktracer/hawktracer.hash | 2 +- > package/hawktracer/hawktracer.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 Sat Feb 25 09:40:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-gmmlib: needs threads In-Reply-To: <20230224164053.53287-1-fontaine.fabrice@gmail.com> References: <20230224164053.53287-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104025.23e4e21c@windsurf> On Fri, 24 Feb 2023 17:40:53 +0100 Fabrice Fontaine wrote: > threads are mandatory since version 19.1.1 and > https://github.com/intel/gmmlib/commit/9e4aa143fb7e7e87332fcb7c9871040ff4a1a1da > resulting in the following build failure since commit > cd206d9b808a322a00294b4caad203a892ed4c92: > > CMake Error at /home/thomas/autobuild/instance-2/output-1/host/share/cmake-3.22/Modules/FindPackageHandleStandardArgs.cmake:230 (message): > Could NOT find Threads (missing: Threads_FOUND) > > Fixes: > - http://autobuild.buildroot.org/results/c1120932e8c212820b239ee8cd4a057623a73376 > > Signed-off-by: Fabrice Fontaine > --- > package/intel-gmmlib/Config.in | 6 ++++-- > package/intel-mediadriver/Config.in | 2 +- > 2 files changed, 5 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 Sat Feb 25 09:40:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/ntpsec: fix CPE ID version In-Reply-To: <20230224165753.64394-1-fontaine.fabrice@gmail.com> References: <20230224165753.64394-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104029.7ace5a7e@windsurf> On Fri, 24 Feb 2023 17:57:53 +0100 Fabrice Fontaine wrote: > CPE ID is wrong since the addition of the package in commit > 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a, the correct CPE ID is > cpe:2.3:a:ntpsec:ntpsec:1.2.2:*:*:*:*:*:*:*, not > cpe:2.3:a:ntpsec:ntpsec:1.2:2:*:*:*:*:*:* > > Signed-off-by: Fabrice Fontaine > --- > package/ntpsec/ntpsec.mk | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:40:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:40 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add ti-k3-r5-loader handling In-Reply-To: <20230225092227.9308-1-fontaine.fabrice@gmail.com> References: <20230225092227.9308-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104040.2aaf653b@windsurf> On Sat, 25 Feb 2023 10:22:27 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit 0189bcb47c7733c36fcbcb88fbf26f57958db576: > > make[2]: *** No rule to make target '_defconfig'. Stop. > > Fixes: > - http://autobuild.buildroot.org/results/d7449b2b2f2349af672bfeee832b89a223a7d9cc > > Signed-off-by: Fabrice Fontaine > --- > utils/genrandconfig | 5 +++++ > 1 file changed, 5 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:40:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: add host-pkgconf dependency In-Reply-To: <20230225093527.16587-1-fontaine.fabrice@gmail.com> References: <20230225093527.16587-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104044.0c68f497@windsurf> On Sat, 25 Feb 2023 10:35:27 +0100 Fabrice Fontaine wrote: > host-pkgconf is mandatory to find lz4 and zstd resulting in the > following build failure since commit > 9cd2e6e090449f9d2f371d24152580c038892f3d: > > configure: error: in `/home/autobuild/autobuild/instance-5/output-1/build/postgresql-15.2': > configure: error: The pkg-config script could not be found or is too old. Make sure it > is in your PATH or set the PKG_CONFIG environment variable to the full > path to pkg-config. > > Alternatively, you may set the environment variables LZ4_CFLAGS > and LZ4_LIBS to avoid the need to call pkg-config. > See the pkg-config man page for more details. > > Fixes: > - http://autobuild.buildroot.org/results/8744277ebe9910635ef8fe290c8ba4eee420b538 > > Signed-off-by: Fabrice Fontaine > --- > package/postgresql/postgresql.mk | 4 ++-- > 1 file 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 Sat Feb 25 09:41:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:41:29 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/xtables-addons: replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS In-Reply-To: <20230224092535.306646-1-fontaine.fabrice@gmail.com> References: <20230224092535.306646-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104129.71eef68c@windsurf> On Fri, 24 Feb 2023 10:25:35 +0100 Fabrice Fontaine wrote: > Replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS by > XTABLES_ADDONS_REMOVE_GEOIP_HELPERS to avoid the following build failure > raised since bump to version 3.22 in commit > 53f2999edfa5e67923d4d8a102c15fa3200e089c: > > make[3]: *** No rule to make target '/xt_geoip_query', needed by 'all-am'. Stop. > > Fixes: > - http://autobuild.buildroot.org/results/f2d596b510f027b94a6b1fad10c363922c50cbec > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Thomas Petazzoni): > - Add XTABLES_ADDONS_REMOVE_GEOIP_HELPERS Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:42:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:42:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/asterisk: fix build with libressl In-Reply-To: <20230224095045.782119-1-fontaine.fabrice@gmail.com> References: <20230224095045.782119-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104216.6f9f39b6@windsurf> On Fri, 24 Feb 2023 10:50:45 +0100 Fabrice Fontaine wrote: > Fix the following build failure with libressl by using SSL_is_server > which is available since version 2.7.0 and > https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: > > iostream.c: In function 'ast_iostream_close': > iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} > 559 | if (!stream->ssl->server) { > | ^~ > > Fixes: > - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 > > Signed-off-by: Fabrice Fontaine > --- > ...n-iostream.c-fix-build-with-libressl.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch Applied to master, thanks. What is the upstream status of this patch? Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:43:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:43:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/libblockdev: needs locale In-Reply-To: <20230224101039.1445129-1-fontaine.fabrice@gmail.com> References: <20230224101039.1445129-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104336.1ffa8dc8@windsurf> On Fri, 24 Feb 2023 11:10:39 +0100 Fabrice Fontaine wrote: > locale_t is unconditionally used since version 1.5 and > https://github.com/storaged-project/libblockdev/commit/4ed6f0b3a46fc77554dab661c22150829aa75966 > resulting in the following build failure since the addition of the > package in commit 0c52826291d1884db0f8f35130216065fbc7b574: > > module.c:33:37: error: unknown type name 'locale_t' > 33 | static char *strerror_l(int errnum, locale_t locale UNUSED) > | ^~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/ede9eb1f13d56c77005cc448416fb2efa9d16ff0 > > Signed-off-by: Fabrice Fontaine > --- > package/libblockdev/Config.in | 6 ++++-- > package/udisks/Config.in | 2 +- > 2 files changed, 5 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 Sat Feb 25 09:44:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:44:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: add linux-pam optional dependency In-Reply-To: <20230224101720.1458102-1-fontaine.fabrice@gmail.com> References: <20230224101720.1458102-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104423.3a9cc6ab@windsurf> On Fri, 24 Feb 2023 11:17:20 +0100 Fabrice Fontaine wrote: > +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) > +XSCREENSAVER_CONF_OPTS += --with-pam=yes > +XSCREENSAVER_DEPENDENCIES += linux-pam > +else > +XSCREENSAVER_CONF_OPTS += --with-pam=no > +endif Any reason not to use --with-pam/--without-pam like we do in Buildroot, rather than --with-pam=yes/--with-pam=no? 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 Sat Feb 25 09:49:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:49:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/ntpsec: fix build without stack-protector In-Reply-To: <20230224105148.1780818-1-fontaine.fabrice@gmail.com> References: <20230224105148.1780818-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104926.28b9bb48@windsurf> On Fri, 24 Feb 2023 11:51:48 +0100 Fabrice Fontaine wrote: > Fix the following build failure without stack-protector raised since the > addition of the package in commit > 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a: > > Checking for library ssp : not found > Checking for library ssp_nonshared : not found > Checking if C compiler supports -fstack-protector-all : yes > > [...] > > The configuration failed > (complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log) > > Fixes: > - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a > - http://autobuild.buildroot.org/results/62be818e2f2eac07b4a2de6f4a8898cc4cc05b1f > > Signed-off-by: Fabrice Fontaine > --- > ...pt-fix-build-without-stack-protector.patch | 50 +++++++++++++++++++ > 1 file changed, 50 insertions(+) > create mode 100644 package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:41:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:41:18 +0100 Subject: [Buildroot] [git commit] package/xtables-addons: replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS Message-ID: <20230225095001.9FA9986A88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7243e9394c53c7e0e6e10c3d149a2afa999635ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS by XTABLES_ADDONS_REMOVE_GEOIP_HELPERS to avoid the following build failure raised since bump to version 3.22 in commit 53f2999edfa5e67923d4d8a102c15fa3200e089c: make[3]: *** No rule to make target '/xt_geoip_query', needed by 'all-am'. Stop. Fixes: - http://autobuild.buildroot.org/results/f2d596b510f027b94a6b1fad10c363922c50cbec Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xtables-addons/xtables-addons.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 77dcfd741c..e794538956 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -16,12 +16,6 @@ XTABLES_ADDONS_CONF_OPTS = \ --with-xtables="$(STAGING_DIR)/usr" \ --with-xtlibdir="/usr/lib/xtables" -# geoip helpers need perl with modules and unzip so disable -define XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - $(SED) 's/ geoip//' $(@D)/Makefile.in -endef -XTABLES_ADDONS_POST_PATCH_HOOKS += XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - define XTABLES_ADDONS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) endef @@ -30,6 +24,15 @@ define XTABLES_ADDONS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install endef +# geoip helpers need perl with modules and unzip so remove them +define XTABLES_ADDONS_REMOVE_GEOIP_HELPERS + $(RM) $(TARGET_DIR)/usr/bin/xt_geoip* + $(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_asn* + $(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_geoip* +endef + +XTABLES_ADDONS_POST_INSTALL_TARGET_HOOKS += XTABLES_ADDONS_REMOVE_GEOIP_HELPERS + define XTABLES_ADDONS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) From thomas.petazzoni at bootlin.com Sat Feb 25 09:49:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:49:52 +0100 Subject: [Buildroot] [git commit] package/freescale-imx/imx-gpu-g2d: drop BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES Message-ID: <20230225095001.CFAFA86A88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=333580b68037ef756fa637bbfc49f34f1ad5e0ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Arm and aarch64 packages don't contain examples anymore so drop the config option to install them to prevent build failure when selected: >>> imx-gpu-g2d 6.4.3.p4.4-arm Installing to target mkdir -p /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ cp -a /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/* /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ cp: cannot stat '/home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/*': No such file or directory make: *** [package/pkg-generic.mk:384: /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/.stamp_target_installed] Error 1 Fixes: b84557b588b3 ("package/freescale-imx/imx-gpu-g2d: bump version to 6.4.3.p4.4") Signed-off-by: S??bastien Szymanski Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ++++++ package/freescale-imx/imx-gpu-g2d/Config.in | 9 --------- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 8 -------- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7f69462f2e..af1d8cc1dc 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES + bool "imx-gpu-g2d examples removed" + select BR2_LEGACY + help + The examples are not provided by NXP anymore. + config BR2_KERNEL_HEADERS_6_0 bool "kernel headers version 6.0.x are no longer supported" select BR2_LEGACY diff --git a/package/freescale-imx/imx-gpu-g2d/Config.in b/package/freescale-imx/imx-gpu-g2d/Config.in index aeca087f86..c143b17c47 100644 --- a/package/freescale-imx/imx-gpu-g2d/Config.in +++ b/package/freescale-imx/imx-gpu-g2d/Config.in @@ -18,12 +18,3 @@ config BR2_PACKAGE_IMX_GPU_G2D This library is provided by NXP as-is and doesn't have an upstream. - -if BR2_PACKAGE_IMX_GPU_G2D - -config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES - bool "install examples" - help - Copy the Vivante G2D examples to the target. - -endif diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index d94da24d8f..42a1fe70cf 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -26,15 +26,7 @@ define IMX_GPU_G2D_INSTALL_STAGING_CMDS cp -a $(@D)/g2d/usr/* $(STAGING_DIR)/usr endef -ifeq ($(BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES),y) -define IMX_GPU_G2D_INSTALL_EXAMPLES - mkdir -p $(TARGET_DIR)/usr/share/examples/ - cp -a $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/ -endef -endif - define IMX_GPU_G2D_INSTALL_TARGET_CMDS - $(IMX_GPU_G2D_INSTALL_EXAMPLES) cp -a $(@D)/g2d/usr/lib $(TARGET_DIR)/usr endef From thomas.petazzoni at bootlin.com Sat Feb 25 09:43:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:43:26 +0100 Subject: [Buildroot] [git commit] package/libblockdev: needs locale Message-ID: <20230225095001.B7CDE86A8C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a6b4217312815379a7c52bf5d53752dbe0838645 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master locale_t is unconditionally used since version 1.5 and https://github.com/storaged-project/libblockdev/commit/4ed6f0b3a46fc77554dab661c22150829aa75966 resulting in the following build failure since the addition of the package in commit 0c52826291d1884db0f8f35130216065fbc7b574: module.c:33:37: error: unknown type name 'locale_t' 33 | static char *strerror_l(int errnum, locale_t locale UNUSED) | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ede9eb1f13d56c77005cc448416fb2efa9d16ff0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libblockdev/Config.in | 6 ++++-- package/udisks/Config.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 4389fd794c..4f98621bd8 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBBLOCKDEV depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_ENABLE_LOCALE select BR2_PACKAGE_KMOD select BR2_PACKAGE_LIBGLIB2 help @@ -66,7 +67,8 @@ config BR2_PACKAGE_LIBBLOCKDEV_SWAP endif -comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library" +comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library, locale" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_ENABLE_LOCALE diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 253d5cdc6b..b1d02a31b2 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_UDISKS bool "udisks" - depends on BR2_ENABLE_LOCALE # parted + depends on BR2_ENABLE_LOCALE # libblockdev, parted depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # polkit -> C++17 depends on BR2_TOOLCHAIN_HAS_THREADS # polkit From thomas.petazzoni at bootlin.com Sat Feb 25 09:48:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:48:28 +0100 Subject: [Buildroot] [git commit] package/ntpsec: fix build without stack-protector Message-ID: <20230225095001.C2CA986A8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a99d6611f0de6b1844cdbdc81d0ff25949c2b16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without stack-protector raised since the addition of the package in commit 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a: Checking for library ssp : not found Checking for library ssp_nonshared : not found Checking if C compiler supports -fstack-protector-all : yes [...] The configuration failed (complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log) Fixes: - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a - http://autobuild.buildroot.org/results/62be818e2f2eac07b4a2de6f4a8898cc4cc05b1f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...wscript-fix-build-without-stack-protector.patch | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch b/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch new file mode 100644 index 0000000000..f494bf479c --- /dev/null +++ b/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch @@ -0,0 +1,50 @@ +From 0a3ce09c14eb9c7e36aa30a4dafe40e56676d678 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 Feb 2023 11:33:32 +0100 +Subject: [PATCH] wscript: fix build without stack-protector + +-fstack-protector-all can depends on ssp library availability (e.g. on musl) so +move the test from cc_test_flags to ld_hardening_flags, this will avoid the +following build failure: + +Checking for library ssp : not found +Checking for library ssp_nonshared : not found +Checking if C compiler supports -fstack-protector-all : yes + +[...] + +The configuration failed +(complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log) + +Fixes: + - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ntpsec/ntpsec/pull/6] +--- + wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index be396b33b..f301809fc 100644 +--- a/wscript ++++ b/wscript +@@ -298,7 +298,6 @@ def configure(ctx): + ctx.env.LDFLAGS += ["-lssp_nonshared"] + + cc_test_flags = [ +- ('f_stack_protector_all', '-fstack-protector-all'), + ('PIC', '-fPIC'), + ('PIE', '-pie -fPIE'), + # this quiets most of macOS warnings on -fpie +@@ -332,6 +331,7 @@ def configure(ctx): + + # Check which linker flags are supported + ld_hardening_flags = [ ++ ('f_stack_protector_all', '-fstack-protector-all'), + ("z_now", "-Wl,-z,now"), # no deferred symbol resolution + ] + +-- +2.39.1 + From thomas.petazzoni at bootlin.com Sat Feb 25 09:41:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:41:59 +0100 Subject: [Buildroot] [git commit] package/asterisk: fix build with libressl Message-ID: <20230225095001.A9F6986904@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8985cf50cca852cc5cc840a605e01713e758d40 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with libressl by using SSL_is_server which is available since version 2.7.0 and https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: iostream.c: In function 'ast_iostream_close': iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} 559 | if (!stream->ssl->server) { | ^~ Fixes: - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...6-main-iostream.c-fix-build-with-libressl.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch b/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch new file mode 100644 index 0000000000..cdd3aa8cfb --- /dev/null +++ b/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch @@ -0,0 +1,38 @@ +From 9569fa20fec49f530170a3042afb99556cf66a2e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Apr 2022 10:52:42 +0200 +Subject: [PATCH] main/iostream.c: fix build with libressl + +Fix the following build failure with libressl by using SSL_is_server +which is available since version 2.7.0 and +https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: + +iostream.c: In function 'ast_iostream_close': +iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} + 559 | if (!stream->ssl->server) { + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 + +Signed-off-by: Fabrice Fontaine +--- + main/iostream.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main/iostream.c b/main/iostream.c +index d060b6d6d4..b8ab80ec91 100644 +--- a/main/iostream.c ++++ b/main/iostream.c +@@ -553,7 +553,7 @@ int ast_iostream_close(struct ast_iostream *stream) + ERR_error_string(sslerr, err), ssl_error_to_string(sslerr, res)); + } + +-#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if !(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x2070000L)) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + if (!SSL_is_server(stream->ssl)) { + #else + if (!stream->ssl->server) { +-- +2.35.1 + From thomas.petazzoni at bootlin.com Sat Feb 25 09:50:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:50:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/freescale-imx/imx-gpu-g2d: drop BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES In-Reply-To: <20230224105315.16171-1-sebastien.szymanski@armadeus.com> References: <20230224105315.16171-1-sebastien.szymanski@armadeus.com> Message-ID: <20230225105003.632fa577@windsurf> On Fri, 24 Feb 2023 11:53:15 +0100 S?bastien Szymanski wrote: > Arm and aarch64 packages don't contain examples anymore so drop the > config option to install them to prevent build failure when selected: > > >>> imx-gpu-g2d 6.4.3.p4.4-arm Installing to target > mkdir -p /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ > cp -a /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/* /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ > cp: cannot stat '/home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/*': No such file or directory > make: *** [package/pkg-generic.mk:384: /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/.stamp_target_installed] Error 1 > > Fixes: b84557b588b3 ("package/freescale-imx/imx-gpu-g2d: bump version to 6.4.3.p4.4") > Signed-off-by: S?bastien Szymanski > --- > Config.in.legacy | 6 ++++++ > package/freescale-imx/imx-gpu-g2d/Config.in | 9 --------- > package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 8 -------- > 3 files changed, 6 insertions(+), 17 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:52:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:52:10 +0100 Subject: [Buildroot] [PATCH v4 4/4] package/libgtk3: fix update-icon-cache on empty directory In-Reply-To: <20230223125612.3156012-1-thomas.devoogdt@barco.com> References: <20230223125612.3156012-1-thomas.devoogdt@barco.com> Message-ID: <20230225105210.248b646a@windsurf> Hello Thomas, On Thu, 23 Feb 2023 13:56:12 +0100 Thomas Devoogdt wrote: > If both, hicolor-icon-theme (selected by libgtk3-demo) and > adwaita-icon-theme is not selected, then the /usr/share/icons > folder is empty, causing find to fail. > > Signed-off-by: Thomas Devoogdt Thanks for this work on gtk! Could you please always resend complete series, even if only one patch is changed? Otherwise, it's super confusing. We see just PATCH 4/4 in version 4, and we wonder if the other patches (1/4, 2/4, 3/4) were lost. > @@ -146,6 +146,7 @@ endef > # Create icon-theme.cache for each of the icon directories/themes > # It's not strictly necessary but speeds up lookups > define LIBGTK3_UPDATE_ICON_CACHE > +[ ! -d $(TARGET_DIR)/usr/share/icons ] || \ Indentation is not correct, this line should be indented with one tab. > find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ > -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; > endef Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:52:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:52:18 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require MD5 perl package for netsurf Message-ID: <20230225095226.A7CA086A8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b83a9675cb81d4281594e5a59e7a8805e8561bd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure: Can't locate object method "hexhash" via package "MD5" at utils/git-testament.pl line 47 Fixes: - http://autobuild.buildroot.org/results/3dddcbbe7f6ecae5a2db6fac11fb659719452f73 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index a692856d31..563dbe1595 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -290,6 +290,10 @@ if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigRat" fi +if grep -q ^BR2_PACKAGE_NETSURF=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules Digest::MD5" +fi + if grep -q ^BR2_PACKAGE_WHOIS=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules autodie" fi From thomas.petazzoni at bootlin.com Sat Feb 25 09:52:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:52:26 +0100 Subject: [Buildroot] [PATCH 1/1] support/dependencies/dependencies.sh: require MD5 perl package for netsurf In-Reply-To: <20230223225942.313435-1-fontaine.fabrice@gmail.com> References: <20230223225942.313435-1-fontaine.fabrice@gmail.com> Message-ID: <20230225105226.0e62e4cb@windsurf> On Thu, 23 Feb 2023 23:59:42 +0100 Fabrice Fontaine wrote: > Fix the following build failure: > > Can't locate object method "hexhash" via package "MD5" at utils/git-testament.pl line 47 > > Fixes: > - http://autobuild.buildroot.org/results/3dddcbbe7f6ecae5a2db6fac11fb659719452f73 > > Signed-off-by: Fabrice Fontaine > --- > support/dependencies/dependencies.sh | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 10:07:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 11:07:36 +0100 Subject: [Buildroot] [git commit] package/lttng-babeltrace: fix popt static build with libiconv Message-ID: <20230225100802.39B7586A96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34625d54c9ba4f9e19fdc350fcf0a48a05c98576 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following popt static build failure with libiconv: configure:18149: checking for poptGetContext in -lpopt configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5 /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': poptint.c:(.text+0x28a): undefined reference to `libiconv_open' [...] checking for poptGetContext in -lpopt... no configure: error: Cannot find popt. Fixes: - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0002-configure.ac-fix-popt-static-build.patch | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch b/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch new file mode 100644 index 0000000000..896c67470f --- /dev/null +++ b/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch @@ -0,0 +1,48 @@ +From 35076fd4592ca23136ff5eacdf8eaebc926e0224 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 13:04:08 +0100 +Subject: [PATCH] configure.ac: fix popt static build + +Fix the following popt static build failure: + +configure:18149: checking for poptGetContext in -lpopt +configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5 +/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': +poptint.c:(.text+0x28a): undefined reference to `libiconv_open' + +[...] + +checking for poptGetContext in -lpopt... no +configure: error: Cannot find popt. + +Fixes: + - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f + +Signed-off-by: Fabrice Fontaine +[Upstream status: not upstreamable as popt has been removed with +https://github.com/efficios/babeltrace/commit/916d0d910ad5407bc7826505aa05b277f5739a34] +--- + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a17c23c3..8f700d3e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -223,8 +223,11 @@ AC_CHECK_LIB([c], [faccessat], + ] + ) + +-AC_CHECK_LIB([popt], [poptGetContext], [], +- [AC_MSG_ERROR([Cannot find popt.])] ++PKG_CHECK_MODULES([POPT], [popt], [LIBS="${POPT_LIBS} ${LIBS}"], ++[ ++ AC_CHECK_LIB([popt], [poptGetContext], [], ++ [AC_MSG_ERROR([Cannot find popt.])]) ++] + ) + + # For Python +-- +2.39.1 + From thomas.petazzoni at bootlin.com Sat Feb 25 10:08:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 11:08:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/lttng-babeltrace: fix popt static build with libiconv In-Reply-To: <20230223123644.402595-1-fontaine.fabrice@gmail.com> References: <20230223123644.402595-1-fontaine.fabrice@gmail.com> Message-ID: <20230225110801.6c7053fa@windsurf> On Thu, 23 Feb 2023 13:36:44 +0100 Fabrice Fontaine wrote: > Fix the following popt static build failure with libiconv: > > configure:18149: checking for poptGetContext in -lpopt > configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5 > /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': > poptint.c:(.text+0x28a): undefined reference to `libiconv_open' > > [...] > > checking for poptGetContext in -lpopt... no > configure: error: Cannot find popt. > > Fixes: > - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f > > Signed-off-by: Fabrice Fontaine > --- > ...2-configure.ac-fix-popt-static-build.patch | 48 +++++++++++++++++++ > 1 file changed, 48 insertions(+) > create mode 100644 package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sat Feb 25 10:35:14 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 11:35:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/asterisk: fix build with libressl In-Reply-To: <20230225104216.6f9f39b6@windsurf> References: <20230224095045.782119-1-fontaine.fabrice@gmail.com> <20230225104216.6f9f39b6@windsurf> Message-ID: Le sam. 25 f?vr. 2023 ? 10:42, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > On Fri, 24 Feb 2023 10:50:45 +0100 > Fabrice Fontaine wrote: > > > Fix the following build failure with libressl by using SSL_is_server > > which is available since version 2.7.0 and > > > https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7 > : > > > > iostream.c: In function 'ast_iostream_close': > > iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka > 'struct ssl_st'} > > 559 | if (!stream->ssl->server) { > > | ^~ > > > > Fixes: > > - > http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 > > > > Signed-off-by: Fabrice Fontaine > > --- > > ...n-iostream.c-fix-build-with-libressl.patch | 38 +++++++++++++++++++ > > 1 file changed, 38 insertions(+) > > create mode 100644 > package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch > > Applied to master, thanks. What is the upstream status of this patch? > I finally sent it today ( https://issues.asterisk.org/jira/browse/ASTERISK-30107), I really hate gerrit ... > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Sat Feb 25 10:39:23 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 11:39:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: add linux-pam optional dependency In-Reply-To: <20230225104423.3a9cc6ab@windsurf> References: <20230224101720.1458102-1-fontaine.fabrice@gmail.com> <20230225104423.3a9cc6ab@windsurf> Message-ID: Le sam. 25 f?vr. 2023 ? 10:44, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > On Fri, 24 Feb 2023 11:17:20 +0100 > Fabrice Fontaine wrote: > > > +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) > > +XSCREENSAVER_CONF_OPTS += --with-pam=yes > > +XSCREENSAVER_DEPENDENCIES += linux-pam > > +else > > +XSCREENSAVER_CONF_OPTS += --with-pam=no > > +endif > > Any reason not to use --with-pam/--without-pam like we do in Buildroot, > rather than --with-pam=yes/--with-pam=no? > The only reason is for consistency with the other options in xscreensaver.mk . > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Sat Feb 25 10:57:15 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 11:57:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix second patch Message-ID: <20230225105715.1265130-1-fontaine.fabrice@gmail.com> Fix patch added by commit 7edb4a6a4db7d864c6c1560f3fdc1ef4fbd7f0fd: 0x300000fL -> 0x3050000fL Signed-off-by: Fabrice Fontaine --- package/zabbix/0002-fix-build-with-libressl-3.5.0.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch index 7e32ad5745..acb5cfc9a6 100644 --- a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch +++ b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch @@ -61,7 +61,7 @@ index 54ab0a6ef4..bd4075b3e4 100644 -#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) -/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ +#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ -+ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x300000fL ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL +/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL (before 3.5.0) */ /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and example in crypto/threads/mttest.c) */ -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 11:12:52 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 12:12:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsigrokdecode: fix build with python > 3.10 Message-ID: <20230225111252.1658233-1-fontaine.fabrice@gmail.com> Fix the following build failure with sigrok-cli and python > 3.10: /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mips64-buildroot-linux-gnu/11.3.0/../../../../mips64-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/bin/../mips64-buildroot-linux-gnu/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyTuple_SetItem' Fixes: - http://autobuild.buildroot.org/results/435ad19597a1e216a7974bc9ccaf17064d1eccea Signed-off-by: Fabrice Fontaine --- ...c-Use-python3-embed-pc-as-a-fallback.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch diff --git a/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch b/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch new file mode 100644 index 0000000000..8e9c6f0063 --- /dev/null +++ b/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch @@ -0,0 +1,30 @@ +From a6a5e2c8b0e9ecf5d69d0c237c8e8b717b82b36f Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras +Date: Thu, 3 Dec 2020 19:17:00 +0200 +Subject: [PATCH] configure.ac: Use python3-embed.pc as a fallback + +This provides some future-proofing against newer Python versions. + +[Retrieved from: +https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commit;h=a6a5e2c8b0e9ecf5d69d0c237c8e8b717b82b36f] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b8841f8..c1314bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python3-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + +-- +2.30.2 + -- 2.39.1 From casey at xogium.me Sat Feb 25 11:28:38 2023 From: casey at xogium.me (Casey Reeves) Date: Sat, 25 Feb 2023 12:28:38 +0100 Subject: [Buildroot] [PATCH] package/lzop: bump to version 1.04 Message-ID: <20230225112838.4061103-1-casey@xogium.me> lzop 1.04 uses libtool 2.4.2.418, which is right between 2.4.2 and 2.4.4. While our patch for 2.4 is also supposed to work up to and including 2.4.2.x, it does not work for libtool 2.4.2.418, which requires the patch for 2.4.4. We could change our infra to better pick the appropriate patch, but we do not know exactly which 2.4.2.x version is actually the cutting point that requires the 2.4.4 patch. Until we have more data point, let's handle the case in an ad-hoc manner for lzop. Additionally, this lzop bump carries the patch from florian B?uerle, which allows to set the mtime of the lzop archive for reproducible build support using SOURCE_DATE_EPOCH. https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch --- ...1-allow-overriding-modification-time.patch | 35 ++++++ package/lzop/0001-build-with-gcc6.patch | 37 ------- ...es-as-the-external-inline-definition.patch | 102 ------------------ package/lzop/lzop.hash | 2 +- package/lzop/lzop.mk | 9 +- 5 files changed, 44 insertions(+), 141 deletions(-) create mode 100644 package/lzop/0001-allow-overriding-modification-time.patch delete mode 100644 package/lzop/0001-build-with-gcc6.patch delete mode 100644 package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch diff --git a/package/lzop/0001-allow-overriding-modification-time.patch b/package/lzop/0001-allow-overriding-modification-time.patch new file mode 100644 index 0000000000..192d73c2b2 --- /dev/null +++ b/package/lzop/0001-allow-overriding-modification-time.patch @@ -0,0 +1,35 @@ +From: =?UTF-8?q?Florian=20B=C3=A4uerle?= +Date: Thu, 25 Oct 2018 17:26:30 +0200 +Subject: [PATCH] allow overriding modification time + +--- + src/lzop.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/lzop.c b/src/lzop.c +index a540ad9c4d33..c2f877d16f92 100644 +--- a/src/lzop.c ++++ b/src/lzop.c +@@ -712,6 +712,7 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + assert(opt_method > 0); + assert(opt_level > 0); + assert(fip->st.st_mode == 0 || S_ISREG(fip->st.st_mode)); ++ const char *source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + + memset(h,0,sizeof(header_t)); + +@@ -748,7 +749,13 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + + h->mode = fix_mode_for_header(fip->st.st_mode); + +- if (fip->st.st_mtime > 0) ++ if (source_date_epoch) ++ { ++ time_t mtime = strtoul(source_date_epoch, NULL, 0); ++ h->mtime_low = (lzo_uint32) (mtime); ++ h->mtime_high = (lzo_uint32) ((mtime >> 16) >> 16); ++ } ++ else if (fip->st.st_mtime > 0) + { + h->mtime_low = (lzo_uint32) (fip->st.st_mtime); + h->mtime_high = (lzo_uint32) ((fip->st.st_mtime >> 16) >> 16); diff --git a/package/lzop/0001-build-with-gcc6.patch b/package/lzop/0001-build-with-gcc6.patch deleted file mode 100644 index 03bd887d51..0000000000 --- a/package/lzop/0001-build-with-gcc6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Jaap Crezee -Date: Sat, 25 june 2016 13:13:00 +0200 -Subject: [PATCH] fix compilation host-lzop with gcc-6 - -This patch allows host-lzop to be compiled with host systems containing gcc-6 - -Upstream patch found here: -https://build.opensuse.org/package/view_file/Archiving/lzop/lzop-1.03-gcc6.patch?expand=1 - -Signed-off-by: Jaap Crezee - ---- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100 -+++ b/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 -@@ -4469,12 +4469,12 @@ - #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) -+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) - #endif - ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) - #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) -+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) - #endif - ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) - #if defined(acc_int16e_t) -@@ -4703,7 +4703,7 @@ - #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) -- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) -+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) - #endif - #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) - # pragma option pop diff --git a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch b/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch deleted file mode 100644 index f6d076a9f7..0000000000 --- a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch +++ /dev/null @@ -1,102 +0,0 @@ -From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 16 Aug 2015 10:35:47 -0700 -Subject: [PATCH] use static inlines as the external inline definition has - changed with gcc5 - -[Patch from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch] -Signed-off-by: Khem Raj -Signed-off-by: Peter Korsgaard ---- -Upstream-Status: Pending - - src/miniacc.h | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - -diff --git a/src/miniacc.h b/src/miniacc.h -index 09e6f0c..cae98d1 100644 ---- a/src/miniacc.h -+++ b/src/miniacc.h -@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } --- -2.5.0 - diff --git a/package/lzop/lzop.hash b/package/lzop/lzop.hash index adc20648b6..99796dc8c9 100644 --- a/package/lzop/lzop.hash +++ b/package/lzop/lzop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 lzop-1.03.tar.gz +sha256 7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41 lzop-1.04.tar.gz sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk index 55157c4d48..2eeedaab34 100644 --- a/package/lzop/lzop.mk +++ b/package/lzop/lzop.mk @@ -4,13 +4,20 @@ # ################################################################################ -LZOP_VERSION = 1.03 +LZOP_VERSION = 1.04 LZOP_SITE = http://www.lzop.org/download LZOP_LICENSE = GPL-2.0+ LZOP_LICENSE_FILES = COPYING LZOP_DEPENDENCIES = lzo HOST_LZOP_DEPENDENCIES = host-lzo +LZOP_LIBTOOL_PATCH=NO +LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP + +define LZOP_LIBTOOL_FIXUP + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $(@D)/autoconf/ltmain.sh +endef + $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.39.2 From fontaine.fabrice at gmail.com Sat Feb 25 12:30:22 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 13:30:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtty: bump to version 8.1.0 Message-ID: <20230225123022.1987160-1-fontaine.fabrice@gmail.com> This bump will fix the following build failure with wolfssl raised, at least, since bump of wolfssl to version 5.5.0 in commit 1891419db38e4d85595b2111db448f68eef684b8: /tmp/instance-18/output-1/build/rtty-7.4.0/src/ssl.c:75:5: error: unknown type name 'SSL_CTX' 75 | SSL_CTX *ctx; | ^~~~~~~ https://github.com/zhaojh329/rtty/compare/v7.4.0...v8.1.0 Fixes: - http://autobuild.buildroot.org/results/d045d85890ca97accfcea6c13c94757485d867c2 Signed-off-by: Fabrice Fontaine --- package/rtty/rtty.hash | 2 +- package/rtty/rtty.mk | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package/rtty/rtty.hash b/package/rtty/rtty.hash index b2e9db2436..a6ccb5c2e6 100644 --- a/package/rtty/rtty.hash +++ b/package/rtty/rtty.hash @@ -1,2 +1,2 @@ -sha256 9bc5d30dfa9bd664a62711b6229f47505b83adb364907f24e3a404aad52a4802 rtty-7.4.0.tar.gz +sha256 e634939bae62bf3d52ceebae5df00179629d214634b93464eeb2294406512b30 rtty-8.1.0.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index 4ec220394c..964ec04ec4 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTTY_VERSION = 7.4.0 +RTTY_VERSION = 8.1.0 RTTY_SITE = https://github.com/zhaojh329/rtty/releases/download/v$(RTTY_VERSION) RTTY_LICENSE = MIT RTTY_LICENSE_FILES = LICENSE @@ -13,26 +13,26 @@ RTTY_DEPENDENCIES = libev ifeq ($(BR2_PACKAGE_MBEDTLS),y) RTTY_DEPENDENCIES += mbedtls RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=ON \ - -DRTTY_USE_OPENSSL=OFF \ - -DRTTY_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=ON \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_OPENSSL),y) RTTY_DEPENDENCIES += host-pkgconf openssl RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=OFF \ - -DRTTY_USE_OPENSSL=ON \ - -DRTTY_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=ON \ + -DUSE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_WOLFSSL),y) RTTY_DEPENDENCIES += wolfssl RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=OFF \ - -DRTTY_USE_OPENSSL=OFF \ - -DRTTY_USE_WOLFSSL=ON + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=ON else -RTTY_CONF_OPTS += -DRTTY_SSL_SUPPORT=OFF +RTTY_CONF_OPTS += -DSSL_SUPPORT=OFF endif $(eval $(cmake-package)) -- 2.39.1 From ju.o at free.fr Sat Feb 25 12:55:44 2023 From: ju.o at free.fr (Julien Olivain) Date: Sat, 25 Feb 2023 13:55:44 +0100 Subject: [Buildroot] [PATCH next 1/1] package/ptm2human: bump to latest commit d0b8b6b Message-ID: <20230225125544.390204-1-ju.o@free.fr> For change log since commit d0b8b6b, see project commit log: https://github.com/hwangcc23/ptm2human/commits/c8c5e7d5bdacd73114f4f244355e88c7f4e7d64a Signed-off-by: Julien Olivain --- Patch tested on branch next at commit b793f3a with commands: make check-package ... 0 warnings generated utils/test-pkg -a -p ptm2human ... 45 builds, 30 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/ptm2human/ptm2human.hash | 2 +- package/ptm2human/ptm2human.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ptm2human/ptm2human.hash b/package/ptm2human/ptm2human.hash index 0346019667..d581491bde 100644 --- a/package/ptm2human/ptm2human.hash +++ b/package/ptm2human/ptm2human.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 28947eeb458d8b6a362cbeb8c5cb6098006274af04ebb4f5da70eac89f927d95 ptm2human-d0b8b6be9897ea5b04fd6460038a4773cec078bc.tar.gz +sha256 4c66e9429dfb92b5f4332b08050db0436511581102d1ec56555eb8229d9c2c74 ptm2human-c8c5e7d5bdacd73114f4f244355e88c7f4e7d64a.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/ptm2human/ptm2human.mk b/package/ptm2human/ptm2human.mk index 28a7b7ab48..edba21d401 100644 --- a/package/ptm2human/ptm2human.mk +++ b/package/ptm2human/ptm2human.mk @@ -4,7 +4,7 @@ # ################################################################################ -PTM2HUMAN_VERSION = d0b8b6be9897ea5b04fd6460038a4773cec078bc +PTM2HUMAN_VERSION = c8c5e7d5bdacd73114f4f244355e88c7f4e7d64a PTM2HUMAN_SITE = $(call github,hwangcc23,ptm2human,$(PTM2HUMAN_VERSION)) PTM2HUMAN_LICENSE = GPL-2.0 PTM2HUMAN_LICENSE_FILES = LICENSE -- 2.39.2 From casey at xogium.me Sat Feb 25 13:29:27 2023 From: casey at xogium.me (Casey Reeves) Date: Sat, 25 Feb 2023 14:29:27 +0100 Subject: [Buildroot] [PATCH v2] package/lzop: bump to version 1.04 In-Reply-To: <20230225112838.4061103-1-casey@xogium.me> References: <20230225112838.4061103-1-casey@xogium.me> Message-ID: <20230225132927.4067626-1-casey@xogium.me> lzop 1.04 uses libtool 2.4.2.418, which is right between 2.4.2 and 2.4.4. While our patch for 2.4 is also supposed to work up to and including 2.4.2.x, it does not work for libtool 2.4.2.418, which requires the patch for 2.4.4. We could change our infra to better pick the appropriate patch, but we do not know exactly which 2.4.2.x version is actually the cutting point that requires the 2.4.4 patch. Until we have more data point, let's handle the case in an ad-hoc manner for lzop. Additionally, this lzop bump carries the patch from florian B?uerle, which allows to set the mtime of the lzop archive for reproducible build support using SOURCE_DATE_EPOCH. https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch Signed-off-by: Casey Reeves --- Changes v1 -> v2: - added missing SoB for both the commit and the included patch - provided explanation and origin of the patch in its file --- ...1-allow-overriding-modification-time.patch | 42 ++++++++ package/lzop/0001-build-with-gcc6.patch | 37 ------- ...es-as-the-external-inline-definition.patch | 102 ------------------ package/lzop/lzop.hash | 2 +- package/lzop/lzop.mk | 11 +- 5 files changed, 53 insertions(+), 141 deletions(-) create mode 100644 package/lzop/0001-allow-overriding-modification-time.patch delete mode 100644 package/lzop/0001-build-with-gcc6.patch delete mode 100644 package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch diff --git a/package/lzop/0001-allow-overriding-modification-time.patch b/package/lzop/0001-allow-overriding-modification-time.patch new file mode 100644 index 0000000000..5ffc64cd30 --- /dev/null +++ b/package/lzop/0001-allow-overriding-modification-time.patch @@ -0,0 +1,42 @@ +From: =?UTF-8?q?Florian=20B=C3=A4uerle?= +Date: Thu, 25 Oct 2018 17:26:30 +0200 +Subject: [PATCH] allow overriding modification time + +This patch allows to set the mtime of the lzop archive to +$SOURCE_DATE_EPOCH, required for reproducible build. It was submitted to +pengutronix by florian B?uerle in october 2018. + +https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch + +Signed-off-by: Casey Reeves +--- + src/lzop.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/lzop.c b/src/lzop.c +index a540ad9c4d33..c2f877d16f92 100644 +--- a/src/lzop.c ++++ b/src/lzop.c +@@ -712,6 +712,7 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + assert(opt_method > 0); + assert(opt_level > 0); + assert(fip->st.st_mode == 0 || S_ISREG(fip->st.st_mode)); ++ const char *source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + + memset(h,0,sizeof(header_t)); + +@@ -748,7 +749,13 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + + h->mode = fix_mode_for_header(fip->st.st_mode); + +- if (fip->st.st_mtime > 0) ++ if (source_date_epoch) ++ { ++ time_t mtime = strtoul(source_date_epoch, NULL, 0); ++ h->mtime_low = (lzo_uint32) (mtime); ++ h->mtime_high = (lzo_uint32) ((mtime >> 16) >> 16); ++ } ++ else if (fip->st.st_mtime > 0) + { + h->mtime_low = (lzo_uint32) (fip->st.st_mtime); + h->mtime_high = (lzo_uint32) ((fip->st.st_mtime >> 16) >> 16); diff --git a/package/lzop/0001-build-with-gcc6.patch b/package/lzop/0001-build-with-gcc6.patch deleted file mode 100644 index 03bd887d51..0000000000 --- a/package/lzop/0001-build-with-gcc6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Jaap Crezee -Date: Sat, 25 june 2016 13:13:00 +0200 -Subject: [PATCH] fix compilation host-lzop with gcc-6 - -This patch allows host-lzop to be compiled with host systems containing gcc-6 - -Upstream patch found here: -https://build.opensuse.org/package/view_file/Archiving/lzop/lzop-1.03-gcc6.patch?expand=1 - -Signed-off-by: Jaap Crezee - ---- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100 -+++ b/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 -@@ -4469,12 +4469,12 @@ - #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) -+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) - #endif - ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) - #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) -+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) - #endif - ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) - #if defined(acc_int16e_t) -@@ -4703,7 +4703,7 @@ - #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) -- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) -+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) - #endif - #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) - # pragma option pop diff --git a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch b/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch deleted file mode 100644 index f6d076a9f7..0000000000 --- a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch +++ /dev/null @@ -1,102 +0,0 @@ -From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 16 Aug 2015 10:35:47 -0700 -Subject: [PATCH] use static inlines as the external inline definition has - changed with gcc5 - -[Patch from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch] -Signed-off-by: Khem Raj -Signed-off-by: Peter Korsgaard ---- -Upstream-Status: Pending - - src/miniacc.h | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - -diff --git a/src/miniacc.h b/src/miniacc.h -index 09e6f0c..cae98d1 100644 ---- a/src/miniacc.h -+++ b/src/miniacc.h -@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } --- -2.5.0 - diff --git a/package/lzop/lzop.hash b/package/lzop/lzop.hash index adc20648b6..99796dc8c9 100644 --- a/package/lzop/lzop.hash +++ b/package/lzop/lzop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 lzop-1.03.tar.gz +sha256 7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41 lzop-1.04.tar.gz sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk index 55157c4d48..056d724a7b 100644 --- a/package/lzop/lzop.mk +++ b/package/lzop/lzop.mk @@ -4,13 +4,22 @@ # ################################################################################ -LZOP_VERSION = 1.03 +LZOP_VERSION = 1.04 LZOP_SITE = http://www.lzop.org/download LZOP_LICENSE = GPL-2.0+ LZOP_LICENSE_FILES = COPYING LZOP_DEPENDENCIES = lzo HOST_LZOP_DEPENDENCIES = host-lzo +LZOP_LIBTOOL_PATCH=NO +#LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP + +define LZOP_LIBTOOL_FIXUP + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $(@D)/autoconf/ltmain.sh +endef + +LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP + $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.39.2 From fontaine.fabrice at gmail.com Sat Feb 25 14:14:12 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 15:14:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/lirc-tools: fix python build Message-ID: <20230225141412.2968950-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 0.10.2 in commit 58cc3977e83487bdaa1df232cf7adf6383d49cd7: In file included from /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/python3.11/Python.h:38, from lirc/_client.c:1: /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/python3.11/pyport.h:601:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 601 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/85359d3f678b49e46821a1c10da5f14edfb5e6d0 Signed-off-by: Fabrice Fontaine --- package/lirc-tools/lirc-tools.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk index 5263330741..a3ad6bd5a0 100644 --- a/package/lirc-tools/lirc-tools.mk +++ b/package/lirc-tools/lirc-tools.mk @@ -48,7 +48,9 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3),y) LIRC_TOOLS_DEPENDENCIES += python3 host-python-setuptools -LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' +LIRC_TOOLS_MAKE_ENV += \ + CC="$(TARGET_CC)" \ + SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' endif define LIRC_TOOLS_INSTALL_INIT_SYSV -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 14:49:04 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 15:49:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-numpy: needs C++ Message-ID: <20230225144904.3033289-1-fontaine.fabrice@gmail.com> C++ is mandatory since at least version 1.23.0 and https://github.com/numpy/numpy/commit/c91a7d0c5691c9d78bd75284777fda73f225155d resulting in the following build failure since bump to version 1.23.4 in commit 32d8e23b977a5bba1f23e3821709c6aa9ff3bc55: RuntimeError: Broken toolchain: cannot link a simple C++ program. note: A compiler with support for C++11 language features is required. Fixes: - http://autobuild.buildroot.org/results/2d048d9b669ad60f37eeb2162b0a4f9fb425be1e Signed-off-by: Fabrice Fontaine --- package/piglit/Config.in | 6 ++++-- package/python-numpy/Config.in | 6 ++++-- package/python-zlmdb/Config.in | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package/piglit/Config.in b/package/piglit/Config.in index 736fd95d71..5e957a555a 100644 --- a/package/piglit/Config.in +++ b/package/piglit/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_PIGLIT BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND || \ BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL || \ BR2_PACKAGE_WAFFLE_SUPPORTS_GBM + depends on BR2_INSTALL_LIBSTDCPP # python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBPNG @@ -31,5 +32,6 @@ config BR2_PACKAGE_PIGLIT https://piglit.freedesktop.org -comment "piglit needs glibc or musl" - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) +comment "piglit needs a glibc or musl toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index a65164d9d5..132c3f7a82 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP # python-numpy needs fenv.h which is not provided by uclibc depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL help @@ -27,6 +28,7 @@ config BR2_PACKAGE_PYTHON_NUMPY http://www.numpy.org/ -comment "python-numpy needs glibc or musl" +comment "python-numpy needs a glibc or musl toolchain w/ C++" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-zlmdb/Config.in b/package/python-zlmdb/Config.in index ac4ee05442..8eba2d7946 100644 --- a/package/python-zlmdb/Config.in +++ b/package/python-zlmdb/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB bool "python-zlmdb" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_INSTALL_LIBSTDCPP # python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_PYTHON_CBOR2 # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime @@ -17,6 +18,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB https://github.com/crossbario/zlmdb -comment "python-zlmdb needs glibc or musl" +comment "python-zlmdb needs a glibc or musl toolchain w/ C++" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 16:01:23 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 17:01:23 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add lpc32xxcdl handling Message-ID: <20230225160123.264914-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 20695936ad63f602662bc4c6124a26312c46ff52: make[2]: *** /tmp/instance-0/output-1/build/lpc32xxcdl-2.11/csps/lpc32xx/bsps//source: No such file or directory. Stop. Fixes: - http://autobuild.buildroot.org/results/72c9a4080318b1b247ca3517c95c689dff1068d2 Signed-off-by: Fabrice Fontaine --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 64b9be69db..a3d98119c7 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -487,6 +487,10 @@ def fixup_config(sysinfo, configfile): 'BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n' in configlines: return False + if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ + 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: + return False + if 'BR2_TARGET_OPTEE_OS=y\n' in configlines and \ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y\n' in configlines and \ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION=""\n' in configlines: -- 2.39.1 From bugzilla at busybox.net Sat Feb 25 16:30:48 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sat, 25 Feb 2023 16:30:48 +0000 Subject: [Buildroot] [Bug 15356] New: package gobject-introspection-1.72.0 fails to build Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15356 Bug ID: 15356 Summary: package gobject-introspection-1.72.0 fails to build Product: buildroot Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: hydrosaure at gmail.com CC: buildroot at uclibc.org Target Milestone: --- Hello, When building with target architecture "x86_64" and setting an architecture variant as anything other than "x86_64" ie. "haswell" or "broadwell", package "gobject-introspection" fails to build and ends erroring out with messages like: qemu: uncaught target signal 4 (Illegal instruction) - core dumped Illegal instruction (core dumped) Many examples of this error can be found on the buildbot at http://autobuild.buildroot.org/?arch=x86_64&reason=gobject-introspection-1.72.0&step=50&start=0 and checking out endlog data. When building with target architecture "x86_64" and architecture variant "x86_64" it completes correctly. Could it be there is some confusion between host and target for the wrapper commands? -- You are receiving this mail because: You are on the CC list for the bug. From fontaine.fabrice at gmail.com Sat Feb 25 17:02:29 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 18:02:29 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix CIP RT kernel on microblaze Message-ID: <20230225170229.358936-1-fontaine.fabrice@gmail.com> Fix the following build failure with CIP RT kernel on microblaze raised since bump to version 5.10.83-cip1-rt1 in commit b5778d7b76c098010a4abc339938f2694e8cf57f and https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?id=32ac92b5a39e2ef91308929bf5ed0804094b4183: arch/microblaze/mm/init.c:71:2: error: #endif without #if 71 | #endif /* CONFIG_HIGHMEM */ | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33 Signed-off-by: Fabrice Fontaine --- ...-arch-microblaze-mm-init.c-fix-build.patch | 37 +++++++++++++++++++ linux/linux.mk | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch diff --git a/linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch b/linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch new file mode 100644 index 0000000000..4760d9e4fb --- /dev/null +++ b/linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch @@ -0,0 +1,37 @@ +From 1fc03e1fdc8bb606d1c95e9fa557a9e5f6df17ec Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Feb 2023 17:26:56 +0100 +Subject: [PATCH] arch/microblaze/mm/init.c: fix build + +Fix the following build failure on microblaze raised since +https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/arch/microblaze/mm/init.c?h=v5.10.168-cip27-rt11&id=32ac92b5a39e2ef91308929bf5ed0804094b4183: + +arch/microblaze/mm/init.c:71:2: error: #endif without #if + 71 | #endif /* CONFIG_HIGHMEM */ + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to +Sebastian Andrzej Siewior ] +--- + arch/microblaze/mm/init.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c +index 1f4b5b34e600..a444778e59de 100644 +--- a/arch/microblaze/mm/init.c ++++ b/arch/microblaze/mm/init.c +@@ -49,6 +49,7 @@ unsigned long lowmem_size; + EXPORT_SYMBOL(min_low_pfn); + EXPORT_SYMBOL(max_low_pfn); + ++#ifdef CONFIG_HIGHMEM + static void __init highmem_init(void) + { + pr_debug("%x\n", (u32)PKMAP_BASE); +-- +2.39.1 + diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..f3fdc40328 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -33,6 +33,7 @@ LINUX_SITE_METHOD = svn else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION),y) LINUX_SOURCE = linux-cip-$(LINUX_VERSION).tar.gz LINUX_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot +LINUX_PATCHES += linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch else ifneq ($(findstring -rc,$(LINUX_VERSION)),) # Since 4.12-rc1, -rc kernels are generated from cgit. This also works for # older -rc kernels. @@ -50,7 +51,7 @@ ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) endif -LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH)) +LINUX_PATCHES += $(call qstrip,$(BR2_LINUX_KERNEL_PATCH)) # We have no way to know the hashes for user-supplied patches. BR_NO_CHECK_HASH_FOR += $(notdir $(LINUX_PATCHES)) -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 17:28:06 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 18:28:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/pistache: fix libressl build Message-ID: <20230225172806.9444-1-fontaine.fabrice@gmail.com> Fix the following libressl build failure which is probably raised since the addition of the package in commit 65d891efc2fb069f9cf707f47302776f7076b80c: ../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': ../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? 582 | (SSL_verify_cb)cb | ^~~~~~~~~~~~~ | RSA_verify Fixes: - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 Signed-off-by: Fabrice Fontaine --- ...erver-listener.cc-fix-libressl-build.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch diff --git a/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch b/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch new file mode 100644 index 0000000000..f2fe2183ae --- /dev/null +++ b/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch @@ -0,0 +1,38 @@ +From 656bff21c1d20b25058da9dbc27d28ad2ac7ae6e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Feb 2023 18:09:39 +0100 +Subject: [PATCH] src/server/listener.cc: fix libressl build + +Fix the following libressl build failure: + +../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': +../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? + 582 | (SSL_verify_cb)cb + | ^~~~~~~~~~~~~ + | RSA_verify + +Fixes: + - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/pistacheio/pistache/pull/1124] +--- + src/server/listener.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/server/listener.cc b/src/server/listener.cc +index 38d2661..c09cb36 100644 +--- a/src/server/listener.cc ++++ b/src/server/listener.cc +@@ -609,7 +609,7 @@ namespace Pistache::Tcp + SSL_CTX_set_verify(GetSSLContext(ssl_ctx_), + SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE, + /* Callback type did change in 1.0.1 */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + (int (*)(int, X509_STORE_CTX*))cb + #else + (SSL_verify_cb)cb +-- +2.39.1 + -- 2.39.1 From thomas.petazzoni at bootlin.com Sat Feb 25 20:46:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:46:19 +0100 Subject: [Buildroot] [git commit] package/zabbix: fix second patch Message-ID: <20230225205333.0BC9586AE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21a3097e7e227e8a26075f4f036324706e20d54f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix patch added by commit 7edb4a6a4db7d864c6c1560f3fdc1ef4fbd7f0fd: 0x300000fL -> 0x3050000fL Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/zabbix/0002-fix-build-with-libressl-3.5.0.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch index 7e32ad5745..acb5cfc9a6 100644 --- a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch +++ b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch @@ -61,7 +61,7 @@ index 54ab0a6ef4..bd4075b3e4 100644 -#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) -/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ +#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ -+ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x300000fL ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL +/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL (before 3.5.0) */ /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and example in crypto/threads/mttest.c) */ From thomas.petazzoni at bootlin.com Sat Feb 25 20:53:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:53:06 +0100 Subject: [Buildroot] [git commit] package/python-numpy: needs C++ Message-ID: <20230225205333.35EAA86AE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc5a6c4af7e7809fccdb72b7140b33dacbbd1a94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master C++ is mandatory since at least version 1.23.0 and https://github.com/numpy/numpy/commit/c91a7d0c5691c9d78bd75284777fda73f225155d resulting in the following build failure since bump to version 1.23.4 in commit 32d8e23b977a5bba1f23e3821709c6aa9ff3bc55: RuntimeError: Broken toolchain: cannot link a simple C++ program. note: A compiler with support for C++11 language features is required. Fixes: - http://autobuild.buildroot.org/results/2d048d9b669ad60f37eeb2162b0a4f9fb425be1e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/piglit/Config.in | 6 ++++-- package/python-numpy/Config.in | 6 ++++-- package/python-zlmdb/Config.in | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package/piglit/Config.in b/package/piglit/Config.in index 736fd95d71..5e957a555a 100644 --- a/package/piglit/Config.in +++ b/package/piglit/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_PIGLIT BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND || \ BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL || \ BR2_PACKAGE_WAFFLE_SUPPORTS_GBM + depends on BR2_INSTALL_LIBSTDCPP # python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBPNG @@ -31,5 +32,6 @@ config BR2_PACKAGE_PIGLIT https://piglit.freedesktop.org -comment "piglit needs glibc or musl" - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) +comment "piglit needs a glibc or musl toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index a65164d9d5..132c3f7a82 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP # python-numpy needs fenv.h which is not provided by uclibc depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL help @@ -27,6 +28,7 @@ config BR2_PACKAGE_PYTHON_NUMPY http://www.numpy.org/ -comment "python-numpy needs glibc or musl" +comment "python-numpy needs a glibc or musl toolchain w/ C++" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-zlmdb/Config.in b/package/python-zlmdb/Config.in index ac4ee05442..8eba2d7946 100644 --- a/package/python-zlmdb/Config.in +++ b/package/python-zlmdb/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB bool "python-zlmdb" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_INSTALL_LIBSTDCPP # python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_PYTHON_CBOR2 # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime @@ -17,6 +18,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB https://github.com/crossbario/zlmdb -comment "python-zlmdb needs glibc or musl" +comment "python-zlmdb needs a glibc or musl toolchain w/ C++" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) From thomas.petazzoni at bootlin.com Sat Feb 25 20:49:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:49:06 +0100 Subject: [Buildroot] [git commit] package/lirc-tools: fix python build Message-ID: <20230225205333.2B25586AE8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ec2a9d4383b3370da39d70805b7c7854cefeded branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 0.10.2 in commit 58cc3977e83487bdaa1df232cf7adf6383d49cd7: In file included from /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/python3.11/Python.h:38, from lirc/_client.c:1: /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/python3.11/pyport.h:601:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 601 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/85359d3f678b49e46821a1c10da5f14edfb5e6d0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lirc-tools/lirc-tools.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk index 5263330741..a3ad6bd5a0 100644 --- a/package/lirc-tools/lirc-tools.mk +++ b/package/lirc-tools/lirc-tools.mk @@ -48,7 +48,9 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3),y) LIRC_TOOLS_DEPENDENCIES += python3 host-python-setuptools -LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' +LIRC_TOOLS_MAKE_ENV += \ + CC="$(TARGET_CC)" \ + SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' endif define LIRC_TOOLS_INSTALL_INIT_SYSV From thomas.petazzoni at bootlin.com Sat Feb 25 20:47:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:47:01 +0100 Subject: [Buildroot] [git commit] package/rtty: bump to version 8.1.0 Message-ID: <20230225205333.2117686AE6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e608885a2df51ba77378f210f4c0e8cb59d5b8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure with wolfssl raised, at least, since bump of wolfssl to version 5.5.0 in commit 1891419db38e4d85595b2111db448f68eef684b8: /tmp/instance-18/output-1/build/rtty-7.4.0/src/ssl.c:75:5: error: unknown type name 'SSL_CTX' 75 | SSL_CTX *ctx; | ^~~~~~~ https://github.com/zhaojh329/rtty/compare/v7.4.0...v8.1.0 Fixes: - http://autobuild.buildroot.org/results/d045d85890ca97accfcea6c13c94757485d867c2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rtty/rtty.hash | 2 +- package/rtty/rtty.mk | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package/rtty/rtty.hash b/package/rtty/rtty.hash index b2e9db2436..a6ccb5c2e6 100644 --- a/package/rtty/rtty.hash +++ b/package/rtty/rtty.hash @@ -1,2 +1,2 @@ -sha256 9bc5d30dfa9bd664a62711b6229f47505b83adb364907f24e3a404aad52a4802 rtty-7.4.0.tar.gz +sha256 e634939bae62bf3d52ceebae5df00179629d214634b93464eeb2294406512b30 rtty-8.1.0.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index 4ec220394c..964ec04ec4 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTTY_VERSION = 7.4.0 +RTTY_VERSION = 8.1.0 RTTY_SITE = https://github.com/zhaojh329/rtty/releases/download/v$(RTTY_VERSION) RTTY_LICENSE = MIT RTTY_LICENSE_FILES = LICENSE @@ -13,26 +13,26 @@ RTTY_DEPENDENCIES = libev ifeq ($(BR2_PACKAGE_MBEDTLS),y) RTTY_DEPENDENCIES += mbedtls RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=ON \ - -DRTTY_USE_OPENSSL=OFF \ - -DRTTY_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=ON \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_OPENSSL),y) RTTY_DEPENDENCIES += host-pkgconf openssl RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=OFF \ - -DRTTY_USE_OPENSSL=ON \ - -DRTTY_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=ON \ + -DUSE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_WOLFSSL),y) RTTY_DEPENDENCIES += wolfssl RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=OFF \ - -DRTTY_USE_OPENSSL=OFF \ - -DRTTY_USE_WOLFSSL=ON + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=ON else -RTTY_CONF_OPTS += -DRTTY_SSL_SUPPORT=OFF +RTTY_CONF_OPTS += -DSSL_SUPPORT=OFF endif $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Sat Feb 25 20:46:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:46:32 +0100 Subject: [Buildroot] [git commit] package/libsigrokdecode: fix build with python > 3.10 Message-ID: <20230225205333.162E886AE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11ba2c5b8d23e086d589e025b7a31cdd7bae14a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with sigrok-cli and python > 3.10: /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mips64-buildroot-linux-gnu/11.3.0/../../../../mips64-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/bin/../mips64-buildroot-linux-gnu/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyTuple_SetItem' Fixes: - http://autobuild.buildroot.org/results/435ad19597a1e216a7974bc9ccaf17064d1eccea Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ure-ac-Use-python3-embed-pc-as-a-fallback.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch b/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch new file mode 100644 index 0000000000..8e9c6f0063 --- /dev/null +++ b/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch @@ -0,0 +1,30 @@ +From a6a5e2c8b0e9ecf5d69d0c237c8e8b717b82b36f Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras +Date: Thu, 3 Dec 2020 19:17:00 +0200 +Subject: [PATCH] configure.ac: Use python3-embed.pc as a fallback + +This provides some future-proofing against newer Python versions. + +[Retrieved from: +https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commit;h=a6a5e2c8b0e9ecf5d69d0c237c8e8b717b82b36f] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b8841f8..c1314bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python3-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + +-- +2.30.2 + From thomas.petazzoni at bootlin.com Sat Feb 25 20:53:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:53:48 +0100 Subject: [Buildroot] [git commit] utils/genrandconfig: add lpc32xxcdl handling Message-ID: <20230225210124.6E3A286B0C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e1a50e4e67b6a650f9d13729ee955e8332de951 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 20695936ad63f602662bc4c6124a26312c46ff52: make[2]: *** /tmp/instance-0/output-1/build/lpc32xxcdl-2.11/csps/lpc32xx/bsps//source: No such file or directory. Stop. Fixes: - http://autobuild.buildroot.org/results/72c9a4080318b1b247ca3517c95c689dff1068d2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index ea8548d42c..6ec398851a 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -492,6 +492,10 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_BAREBOX_USE_DEFCONFIG=y\n') configlines.remove('BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n') + if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ + 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: + return False + if 'BR2_TARGET_OPTEE_OS=y\n' in configlines and \ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y\n' in configlines and \ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION=""\n' in configlines: From thomas.petazzoni at bootlin.com Sat Feb 25 20:58:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:58:41 +0100 Subject: [Buildroot] [git commit] package/pistache: fix libressl build Message-ID: <20230225210124.783F286B0D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b9dda434f9b0fa48c817fe29f949fea0abc53ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following libressl build failure which is probably raised since the addition of the package in commit 65d891efc2fb069f9cf707f47302776f7076b80c: ../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': ../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? 582 | (SSL_verify_cb)cb | ^~~~~~~~~~~~~ | RSA_verify Fixes: - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...src-server-listener.cc-fix-libressl-build.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch b/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch new file mode 100644 index 0000000000..f2fe2183ae --- /dev/null +++ b/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch @@ -0,0 +1,38 @@ +From 656bff21c1d20b25058da9dbc27d28ad2ac7ae6e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Feb 2023 18:09:39 +0100 +Subject: [PATCH] src/server/listener.cc: fix libressl build + +Fix the following libressl build failure: + +../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': +../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? + 582 | (SSL_verify_cb)cb + | ^~~~~~~~~~~~~ + | RSA_verify + +Fixes: + - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/pistacheio/pistache/pull/1124] +--- + src/server/listener.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/server/listener.cc b/src/server/listener.cc +index 38d2661..c09cb36 100644 +--- a/src/server/listener.cc ++++ b/src/server/listener.cc +@@ -609,7 +609,7 @@ namespace Pistache::Tcp + SSL_CTX_set_verify(GetSSLContext(ssl_ctx_), + SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE, + /* Callback type did change in 1.0.1 */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + (int (*)(int, X509_STORE_CTX*))cb + #else + (SSL_verify_cb)cb +-- +2.39.1 + From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix second patch In-Reply-To: <20230225105715.1265130-1-fontaine.fabrice@gmail.com> References: <20230225105715.1265130-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220221.47b9f651@windsurf> On Sat, 25 Feb 2023 11:57:15 +0100 Fabrice Fontaine wrote: > Fix patch added by commit 7edb4a6a4db7d864c6c1560f3fdc1ef4fbd7f0fd: > > 0x300000fL -> 0x3050000fL > > Signed-off-by: Fabrice Fontaine > --- > package/zabbix/0002-fix-build-with-libressl-3.5.0.patch | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsigrokdecode: fix build with python > 3.10 In-Reply-To: <20230225111252.1658233-1-fontaine.fabrice@gmail.com> References: <20230225111252.1658233-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220227.0b3b6385@windsurf> On Sat, 25 Feb 2023 12:12:52 +0100 Fabrice Fontaine wrote: > Fix the following build failure with sigrok-cli and python > 3.10: > > /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mips64-buildroot-linux-gnu/11.3.0/../../../../mips64-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/bin/../mips64-buildroot-linux-gnu/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyTuple_SetItem' > > Fixes: > - http://autobuild.buildroot.org/results/435ad19597a1e216a7974bc9ccaf17064d1eccea > > Signed-off-by: Fabrice Fontaine > --- > ...c-Use-python3-embed-pc-as-a-fallback.patch | 30 +++++++++++++++++++ > 1 file changed, 30 insertions(+) > create mode 100644 package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtty: bump to version 8.1.0 In-Reply-To: <20230225123022.1987160-1-fontaine.fabrice@gmail.com> References: <20230225123022.1987160-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220232.1f210f1e@windsurf> On Sat, 25 Feb 2023 13:30:22 +0100 Fabrice Fontaine wrote: > This bump will fix the following build failure with wolfssl raised, at > least, since bump of wolfssl to version 5.5.0 in commit > 1891419db38e4d85595b2111db448f68eef684b8: > > /tmp/instance-18/output-1/build/rtty-7.4.0/src/ssl.c:75:5: error: unknown type name 'SSL_CTX' > 75 | SSL_CTX *ctx; > | ^~~~~~~ > > https://github.com/zhaojh329/rtty/compare/v7.4.0...v8.1.0 > > Fixes: > - http://autobuild.buildroot.org/results/d045d85890ca97accfcea6c13c94757485d867c2 > > Signed-off-by: Fabrice Fontaine > --- > package/rtty/rtty.hash | 2 +- > package/rtty/rtty.mk | 28 ++++++++++++++-------------- > 2 files changed, 15 insertions(+), 15 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/lirc-tools: fix python build In-Reply-To: <20230225141412.2968950-1-fontaine.fabrice@gmail.com> References: <20230225141412.2968950-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220236.416f2462@windsurf> On Sat, 25 Feb 2023 15:14:12 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 0.10.2 in > commit 58cc3977e83487bdaa1df232cf7adf6383d49cd7: > > In file included from /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/python3.11/Python.h:38, > from lirc/_client.c:1: > /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/python3.11/pyport.h:601:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > 601 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > | ^~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/85359d3f678b49e46821a1c10da5f14edfb5e6d0 > > Signed-off-by: Fabrice Fontaine > --- > package/lirc-tools/lirc-tools.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-numpy: needs C++ In-Reply-To: <20230225144904.3033289-1-fontaine.fabrice@gmail.com> References: <20230225144904.3033289-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220242.2761cbe6@windsurf> On Sat, 25 Feb 2023 15:49:04 +0100 Fabrice Fontaine wrote: > C++ is mandatory since at least version 1.23.0 and > https://github.com/numpy/numpy/commit/c91a7d0c5691c9d78bd75284777fda73f225155d > resulting in the following build failure since bump to version 1.23.4 in > commit 32d8e23b977a5bba1f23e3821709c6aa9ff3bc55: > > RuntimeError: Broken toolchain: cannot link a simple C++ program. note: A compiler with support for C++11 language features is required. > > Fixes: > - http://autobuild.buildroot.org/results/2d048d9b669ad60f37eeb2162b0a4f9fb425be1e > > Signed-off-by: Fabrice Fontaine > --- > package/piglit/Config.in | 6 ++++-- > package/python-numpy/Config.in | 6 ++++-- > package/python-zlmdb/Config.in | 6 ++++-- > 3 files changed, 12 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:47 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add lpc32xxcdl handling In-Reply-To: <20230225160123.264914-1-fontaine.fabrice@gmail.com> References: <20230225160123.264914-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220247.4bdfa321@windsurf> On Sat, 25 Feb 2023 17:01:23 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit 20695936ad63f602662bc4c6124a26312c46ff52: > > make[2]: *** /tmp/instance-0/output-1/build/lpc32xxcdl-2.11/csps/lpc32xx/bsps//source: No such file or directory. Stop. > > Fixes: > - http://autobuild.buildroot.org/results/72c9a4080318b1b247ca3517c95c689dff1068d2 > > Signed-off-by: Fabrice Fontaine > --- > utils/genrandconfig | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/pistache: fix libressl build In-Reply-To: <20230225172806.9444-1-fontaine.fabrice@gmail.com> References: <20230225172806.9444-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220254.69e933f2@windsurf> On Sat, 25 Feb 2023 18:28:06 +0100 Fabrice Fontaine wrote: > Fix the following libressl build failure which is probably raised since > the addition of the package in commit > 65d891efc2fb069f9cf707f47302776f7076b80c: > > ../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': > ../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? > 582 | (SSL_verify_cb)cb > | ^~~~~~~~~~~~~ > | RSA_verify > > Fixes: > - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 > > Signed-off-by: Fabrice Fontaine > --- > ...erver-listener.cc-fix-libressl-build.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Sat Feb 25 21:03:57 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 25 Feb 2023 22:03:57 +0100 Subject: [Buildroot] [PATCH] package/rtl8723bu: fix module installation Message-ID: <20230225210357.1449825-1-giulio.benetti@benettiengineering.com> At the moment module is build but not installed to target/. To fix this let's bump package to 2023-02-18 version on master branch to fix module installation. Signed-off-by: Giulio Benetti --- package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 6a28c34773..bc3b8fc727 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 21372b654886c6d100f46636d7807428698bd618e00db1b8b49cfc3037e46d10 rtl8723bu-f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255.tar.gz +sha256 d0db523f256795d8f3284fa2ec03855f231747ede8337e878bc096325b965654 rtl8723bu-92c19318cb54ef96c2cfb4a22b2c98eb512812d8.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index af1ac9454e..ad9bb9a462 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255 +RTL8723BU_VERSION = 92c19318cb54ef96c2cfb4a22b2c98eb512812d8 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 25 22:50:31 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 23:50:31 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add boot-wrapper-aarch64 handling Message-ID: <20230225225031.9260-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 7689b72e00fd4d8c017880004e83a1c79144ab7b: configure: error: Could not find DTB file: /home/autobuild/autobuild/instance-9/output-1/build/linux-6.1.9/arch/arm64/boot/dts/.dtb Fixes: - http://autobuild.buildroot.org/results/44287ccc8cc9767704642919e6d928d1f57b436d Signed-off-by: Fabrice Fontaine --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index a3d98119c7..ca465547d8 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -487,6 +487,10 @@ def fixup_config(sysinfo, configfile): 'BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n' in configlines: return False + if 'BR2_TARGET_BOOT_WRAPPER_AARCH64=y\n' in configlines and \ + 'BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS=""\n' in configlines: + return False + if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: return False -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 23:14:19 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 00:14:19 +0100 Subject: [Buildroot] [PATCH 1/1] boot/mxs-bootlets: fix build without any bootstream Message-ID: <20230225231419.22342-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 2a636d15217cd326b4546e7017538c7a9e9d399c: sed -i 's,[^ *]power_prep.*;,\tpower_prep="/home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/power_prep/power_prep";,' /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/ sed: couldn't edit /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/: not a regular file Fixes: - http://autobuild.buildroot.org/results/b4b26f6b02fd1991f46eba5db240e5050b96d333 Signed-off-by: Fabrice Fontaine --- boot/mxs-bootlets/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in index b3e392afa8..8f9334b610 100644 --- a/boot/mxs-bootlets/Config.in +++ b/boot/mxs-bootlets/Config.in @@ -1,6 +1,8 @@ config BR2_TARGET_MXS_BOOTLETS bool "mxs-bootlets" depends on BR2_arm + depends on BR2_TARGET_BAREBOX || BR2_LINUX_KERNEL || \ + BR2_TARGET_UBOOT help Stage1 bootloaders for Freescale iMX23/iMX28 SoCs -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 23:22:17 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 00:22:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/flac: drop unrecognized option Message-ID: <20230225232217.27171-1-fontaine.fabrice@gmail.com> xmms-plugin has been dropped since version 1.4.2 and https://github.com/xiph/flac/commit/8fbeff238c41464fe220cd23c45861c9302d1172 Signed-off-by: Fabrice Fontaine --- package/flac/flac.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/flac/flac.mk b/package/flac/flac.mk index ebb4778521..595c2379b0 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -17,7 +17,6 @@ FLAC_CONF_OPTS = \ $(if $(BR2_POWERPC_CPU_HAS_ALTIVEC),--enable-altivec,--disable-altivec) \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ $(if $(BR2_POWERPC_CPU_HAS_VSX),--enable-vsx,--disable-vsx) \ - --disable-xmms-plugin \ --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) -- 2.39.1 From baruch at tkos.co.il Sun Feb 26 06:07:34 2023 From: baruch at tkos.co.il (Baruch Siach) Date: Sun, 26 Feb 2023 08:07:34 +0200 Subject: [Buildroot] [PATCH v2] package/lzop: bump to version 1.04 In-Reply-To: <20230225132927.4067626-1-casey@xogium.me> References: <20230225112838.4061103-1-casey@xogium.me> <20230225132927.4067626-1-casey@xogium.me> Message-ID: <87mt51ez6l.fsf@tarshish> Hi Casey, On Sat, Feb 25 2023, Casey Reeves wrote: > diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk > index 55157c4d48..056d724a7b 100644 > --- a/package/lzop/lzop.mk > +++ b/package/lzop/lzop.mk > @@ -4,13 +4,22 @@ > # > ################################################################################ > > -LZOP_VERSION = 1.03 > +LZOP_VERSION = 1.04 > LZOP_SITE = http://www.lzop.org/download > LZOP_LICENSE = GPL-2.0+ > LZOP_LICENSE_FILES = COPYING > LZOP_DEPENDENCIES = lzo > HOST_LZOP_DEPENDENCIES = host-lzo > > +LZOP_LIBTOOL_PATCH=NO > +#LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP This commit looks redundant. baruch > + > +define LZOP_LIBTOOL_FIXUP > + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $(@D)/autoconf/ltmain.sh > +endef > + > +LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP > + > $(eval $(autotools-package)) > $(eval $(host-autotools-package)) -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From thomas.petazzoni at bootlin.com Sun Feb 26 07:39:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 26 Feb 2023 07:39:06 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-25 Message-ID: <20230226073912.8315A409F1@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-25 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 7 | 11 | 0 | 18 | master | 128 | 110 | 1 | 239 | next | 19 | 15 | 1 | 35 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 7 host-pahole-1.24 | 6 host-go-1.19.6 | 5 libglib2-2.72.3 | 4 linux-6.1.11 | 4 python-numpy-1.23.5 | 4 elfutils-0.186 | 3 host-binutils-2.38 | 3 libgpg-error-1.46 | 3 perl-5.36.0 | 3 libcap-ng-0.8.3 | 2 linux-5.10.162-cip24-rt10 | 2 network-manager-1.40.10 | 2 sigrok-cli-0.7.2 | 2 systemd-252.4 | 2 boost-1.80.0 | 1 brltty-6.5 | 1 bullet-3.21 | 1 containerd-1.6.16 | 1 expat-2.5.0 | 1 fftw-quad-3.3.8 | 1 flac-1.4.2 | 1 fontconfig-2.13.1 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 glibc-2.36-81-g4f4d7a13edfd... | 1 gobject-introspection | 1 host-binutils-2.37 | 1 host-binutils-2.39 | 1 host-gcc-initial-12.2.0 | 1 host-runc-1.1.4 | 1 host-rust-1.67.0 | 1 ipmitool-1_8_19 | 1 kexec-2.0.25 | 1 kvmtool-f77d646ba01d04be5aa... | 1 libdeflate-1.15 | 1 libgcrypt-1.10.1 | 1 libnss-3.88.1 | 1 lirc-tools-0.10.2 | 1 lpc32xxcdl-2.11 | 1 mxs-bootlets-10.12.01 | 1 netsurf-3.10 | 1 olsr-0.9.8 | 1 package/multipath-tools/mul... | 1 pcre2-10.42 | 1 pistache-3ec9d7c4f8b828fdd3... | 1 postgresql-15.2 | 1 python3-3.11.2 | 1 quickjs-2021-03-27 | 1 rdma-core-44.0 | 1 rtl_433-22.11 | 1 rtty-7.4.0 | 1 speechd-0.11.4 | 1 tcf-agent-1.7.0 | 1 ti-k3-r5-loader-2022.10 | 1 tpm2-tss-3.1.0 | 1 uccp420wlan-6.9.1 | 1 uclibc-1.0.42 | 1 ulog-0389d243352255f6182326... | 1 unknown | 1 uqmi-0a19b5b77140465c29e2af... | 1 xenomai-3.0.10 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/dadad1a59d57220ce6e407f46cc89c2dc3868237 | mips | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/abb287ecab6c2815d33af3de327e758cf5212b8f | sh4a | bullet-3.21 | NOK | http://autobuild.buildroot.net/results/073ff5c5b7d04990243aa0afe5f2e358d66c1b80 | x86_64 | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/464e56a0d8ac63dabef4c90d6ea80a34dbb1f711 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/bb46f54644dc764d919998158e1a76b910b3abbe | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/8d82ef956709bd2396de7fc3e1533a73d9b35f5d | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/798356fa474295972eb898555f55b8a1c0c53123 | ORPH powerpc64le | expat-2.5.0 | NOK | http://autobuild.buildroot.net/results/95f929aec1f0da398b2aab1351c7812170f47655 | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/20c3918f7d2d998b4e522debe764a1609415e20b | ORPH sh4a | flac-1.4.2 | NOK | http://autobuild.buildroot.net/results/6f66ebf6eabb923c5ca6858fddf2bcefe9643bff | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/dfb0611c0eb85962355274d16d2c7d7b7708600f | ORPH mips64 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/88268819a4ff09bbb0d8ee90d6a72eebfcdc9204 | mips64 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/0ef8b525052c5a48be04d7690268f27eb9b9ce7f | aarch64_be | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/df3d9aedb16faa3ce05943411c4ea1adc5b7942b | s390x | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/2e60ee03e5c10f572e5e31978ecd495f8b3014ef | arceb | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/344bc0000cbcaddc193e0da51a8cd36313957a85 | arm | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/7e8f187db0bbff8ad2a244cc9b398f8c52e84510 | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/8fb9028e70caa9c1286a262a1d406fa2728c623b | m68k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/441c8e0bb0f5c59e1d0d5fa481fe87c9060524f4 | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/23067dc98f39f09f5ed6b8e16dceb1b9cb76daa7 | mips | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/0b08f3e904eab616ce47577ff173e8d63666274b | mipsel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/9f6fc0db12ec866b55ea966d610149e88a8469b8 | xtensa | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/9989710e5afa52faf898e4e58bc8322cb1666de9 | powerpc64le | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/24b7f713da5cdb2753e27a7e6ee37d4115a4ef36 | arceb | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/8d07293748d0f0919b6c838fba4e771645c4c7c9 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b6753eee36b188c32e47464820b3069eca4e992d | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/4f7885dc1b98af163c04cef08ab44fac2c9e3eac | s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/bb5a27b609d8ff37d07a3cd9c5b3914ecaa43444 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/6e2993c24521b512eebf71a4b24a916715e03344 | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1c48c53d7c10e95f1bd4c6843934b90ad8697150 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/db55f10777f9cf79932c9bf09e40e7cee64501ba | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f30e73661bab691144fbcc0d9029d286260f0729 | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8248e1896e53c9c1c5aabb33bd8c5da7503abbb5 | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f7b0a6c8e0bbca321c2147602db0b1cef471ccdc | ORPH arc | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/69c3421f0d0537c2876820c0bd90616146d79176 | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/3bccc59e4acf9f1f0aa60ccf6db9a2e718ee9384 | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6262d41380e59ffb899a934922991bd9afdd3f10 | arc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1f7b414286f3716e0c65495e73cef0e6ddfd2360 | aarch64_be | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/beb2769a29ef7f4174c1be76c3c62d036a806556 | riscv64 | host-gcc-initial-12.2.0 | NOK | http://autobuild.buildroot.net/results/1abc834430587d6a5a4381392fdf544c9945ad53 | i586 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/d3c7faedd46d611c5da49505b769e8a4754ba387 | riscv64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/4611642b5f9d755b9759974586371b29334bc49a | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/580d2cff313313eb28158c9741d1ab533a519d08 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/40e5052eff8329d7998e115c962320b2ed6e3e72 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/4babee8a65c27a9fe289ba637ff0db4ccf2628ce | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/73afbf64f0619bf358e89719804db61b831d1441 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ea21ad00d4a7cce927b9af86d71f49412ec2000a | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/9b8b04603a6503e083048364601c7b9ca64cbb71 | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d099c7b2c04830e499e4a590d6aa65616f3a3493 | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2ecb20b8b3ce43b83cc02e9068b39e7c4dea4dc2 | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/e783dfc38aedf31f81fa2a614d234db79647279b | xtensa | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/41c77cdf19cd097854e79fe02bde8eb8c0f0279f | mips64el | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/2b696473aed057b70e9b00597506e33d5367bf6f | or1k | ipmitool-1_8_19 | NOK | http://autobuild.buildroot.net/results/763b866d0383141407e52288ed3729d3094b9b74 | sh4 | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/abf7b9578f1a3dbc39e87add33b98c5ea20c70d9 | ORPH i586 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/2fa8b9414b2a4739c5114d6aa0d59d1c5d4d485d | ORPH riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/227da9d6b6ae6c7bee32672750defa87a275b81d | or1k | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/c11e8353eaccb9a16c83b436b7b653e4bf5afda0 | arm | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/3d1d7d8c2b485238275d8f6ecd5c44c030046350 | i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/d8c835b0b3b477a3d8fa35b13abcb3846a2af406 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/cbeefbf14fa545a6dd556648a6d88f2bd211105e | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/a93b1864371f30dbc6440d548546c447da2b1166 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/675648d04552b97dcaf7205f2f04e0e300c2729d | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/373547fc7e0cb6c8e8ef551fd5a97b9a918c2e57 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/5a63509d4febcef0a60324129ee10caaff63de84 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/f576bd1db0625c6e4ac63c773bf16ff81fa1bae9 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/4003d9cae794a8c4ec010f667eed674cc02990f7 | ORPH aarch64 | libnss-3.88.1 | NOK | http://autobuild.buildroot.net/results/5ec967926229907c9084492d73832e512fa4dd13 | microblaze | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/160da79ce9e005ab91b33824f3e93783bbfcb482 | ORPH microblaze | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/27291870cf7539d26e45c45f34322d24a6dbca33 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/8591c8aa01fcd2e5154720826196d7c43dd3a2dc | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/24f9adb6cdfd1eaf3792228483f6c2687bbb0771 | ORPH m68k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/3d3f77f5b48eac3359399a84f5062b88a8519fc3 | ORPH m68k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/963e52d5b10d3cc80f1d89f698ef48a4ea04991a | ORPH sparc64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/0aec444765dc0168c31177983ed244a05fea3a12 | ORPH armeb | lpc32xxcdl-2.11 | NOK | http://autobuild.buildroot.net/results/72c9a4080318b1b247ca3517c95c689dff1068d2 | ORPH arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/25ee1a649fa511e7a0ae33b30d27ba44e5a7ee4f | ORPH powerpc64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/ba7377538a21477eecae6e5594df325bc7de7edf | nios2 | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/a1004c149f830263f9169680d4c3a13475457e0f | ORPH mips | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/daac2fe8a0ac2c22ace2af3a7cf59b5866b1b498 | ORPH powerpc64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/c4859aa362eda44caad9fee812aee49d2849afcd | ORPH sparc64 | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/dadd91a9ab0e845f699ea4345eccd987587f4f98 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/e070099d2a426d1f10c738082d55872ea6e7c6c9 | ORPH arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/987e6697994c7cf74b7afffb0ab62bbdeda0051e | sparc64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/87fcbc45e9095d8f969a55a53db5fa4ab3e1bc56 | xtensa | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/78c2d522a71ea97e38bb128053071675ff678b2c | sparc64 | pistache-3ec9d7c4f8b828fdd3... | NOK | http://autobuild.buildroot.net/results/066fc078980e5216f38411eee455088e15fa1101 | ORPH armeb | postgresql-15.2 | NOK | http://autobuild.buildroot.net/results/8744277ebe9910635ef8fe290c8ba4eee420b538 | armeb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/0986c206a2e1504b233a4cef5398abb641949bb4 | arm | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/28eec96baf7d383ae982ccfab4fc8069fda8b433 | sh4a | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/2d048d9b669ad60f37eeb2162b0a4f9fb425be1e | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/85a426be3e4508e7872fc35a6b92b65ea7791f27 | x86_64 | python3-3.11.2 | NOK | http://autobuild.buildroot.net/results/1f37b94f7c6946103a48d321b66c668edcb3fce4 | or1k | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/5fae32e9491fe08fb37251e135df34ecb02474b1 | xtensa | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/ff2f5c53361d19b165773e070777ca84a58ae0a4 | x86_64 | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/a0fa40b74c0395821364c21f6c4297c0db4d0a6a | powerpc | rtty-7.4.0 | NOK | http://autobuild.buildroot.net/results/d045d85890ca97accfcea6c13c94757485d867c2 | mips64 | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/435ad19597a1e216a7974bc9ccaf17064d1eccea | ORPH mips64el | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/7a63bd0586bc3c4c983a9b6ea161b84aefec863a | ORPH powerpc64le | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/283333290c5adb48d0c6e592b3261992537f92d3 | x86_64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/2164bdf4debe41fd4bf56962da206cdd07facd39 | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/090b09034feb37ef86e10734f86d16d445556039 | microblazeel | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/4afccfe3e08510d1aa6ab6fd342ece699ffb695c | aarch64 | ti-k3-r5-loader-2022.10 | NOK | http://autobuild.buildroot.net/results/d7449b2b2f2349af672bfeee832b89a223a7d9cc | powerpc64 | tpm2-tss-3.1.0 | NOK | http://autobuild.buildroot.net/results/95522de6d5a3988155cdc48bdadb49d7aeaec336 | ORPH powerpc64 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/7ed5969e02f962aa793773e00b9fe198ae7809c2 | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/87e75c7f517fa56b6865c10694a1a5dc3f1f6bde | aarch64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/643945805ed6201124646eaf45f1ac215d9fc930 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/355abd317d83bae8b04169cccd99d325e9698635 | arm | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/1568cfc513476991722eb0c68114f036026f27fb | ORPH arm | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/048fa89fdbcfc8a54d3d4d3c0d98e7beedb1cc8f | Classification of failures by reason for next --------------------------------------------- unknown | 4 elfutils-0.186 | 2 host-pahole-1.24 | 2 ffmpeg-4.4.3 | 1 gerbera-1.10.0 | 1 glibc-2.36-81-g4f4d7a13edfd... | 1 gobject-introspection | 1 gobject-introspection-1.72.0 | 1 linux-6.1.11 | 1 pv-1.6.20 | 1 speechd-0.11.4 | 1 Detail of failures for next --------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/87f9e78f3b66a19d386487e638672b29efe94046 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/7a7132c4fe8ca681da04616cbedb9822a87dc7d7 | ORPH arceb | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/f423d6965bccc60b33b010f6288be6d1684e5d4e | or1k | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/1f8c57916c8c37018b1ad19199507a17fecbb31b | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/d58ee93e1cfc6776e6c3addec1b9434c6980b4e2 | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/9700b87bb89be7965fe5af181eaee61a44c16a0c | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2828a72e91b566b70fa0e57b8dea8a7887c67883 | ORPH x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/f9cee7c967b8ec9e233da1ea004cadee39056498 | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/5f94ae0d4532d6bfee9c3723a85f336fcbb87096 | mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/06598b8095f73e9bf8fd670bb53c944a3ee4af03 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/81a4646e2bae975138ac7d340a6187a52f423ec9 | ORPH arceb | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/c74187cd6430c6f2095fc408573a81ab3f7c503e | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/4d6e181bdfdbc25c712230942ab5167bd9687f5d | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/b9dae374f225ed17664121ce350109d5e66b2fc1 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/29eb7f004a6db9a93dfd0c3a2883d1608f4ac290 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/7d02f27f7597158e90a451f87afc2e25ffa7e31b | Classification of failures by reason for 2022.11.x -------------------------------------------------- janus-gateway-1.0.3 | 3 frr-8.3.1 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 host-pahole-1.24 | 1 ocf-linux-20171122 | 1 wolfssl-5.5.3 | 1 xz-5.2.7 | 1 zstd-1.5.2 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | frr-8.3.1 | NOK | http://autobuild.buildroot.net/results/64498486878d0fdaebfede03d7b3a5fa038f47c5 | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/881737f47efe675c3f875ff42a03434747ebed9d | powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d5f98e5a7854245fd8894db6d7110246aed0e811 | ORPH arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d84b37aaff881ec32b0a0747c480af7c511e0f89 | microblaze | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/10e3941c8d436b2d49ea7282c3f252de0c7e5567 | powerpc64le | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/bfe183af06ef76f1d0cbc8258f3a81220b72a95a | aarch64_be | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/a174ebb138de04a63db3a6e67f17dff35cacc081 | arc | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/5214d1aaf1100edc114ddcc5222e21ef296054ec | ORPH mips64el | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/40bdf7b5b0ae3b354eff1dcac887e9368c90824e | microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/5765f24b27d3ba58548ba3374333ab6075f3b396 | ORPH microblaze | zstd-1.5.2 | NOK | http://autobuild.buildroot.net/results/1553700c129076437c62c67737312cd2fd07a64b | -- http://autobuild.buildroot.net From fontaine.fabrice at gmail.com Sun Feb 26 10:22:23 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 11:22:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/php-xdebug: bump to version 3.2.0 Message-ID: <20230226102223.325041-1-fontaine.fabrice@gmail.com> - Use official tarball - This bump will fix the following build failure raised since bump of php to version 8.2.1 in commit 90ab065162a35b8aa2c429903e3d59d4ad2c0d7f: checking Check for supported PHP versions... configure: error: not supported. Need a PHP version >= 7.2.0 and < 8.2.0 (found 8.2.1) https://xdebug.org/announcements/2022-12-08 https://xdebug.org/updates#x_3_2_0 Fixes: - http://autobuild.buildroot.org/results/092a6d388fc6801c109eb46635e8df80d06a803e Signed-off-by: Fabrice Fontaine --- package/php-xdebug/php-xdebug.hash | 2 +- package/php-xdebug/php-xdebug.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/php-xdebug/php-xdebug.hash b/package/php-xdebug/php-xdebug.hash index 72bfac67ce..fa92ee82ed 100644 --- a/package/php-xdebug/php-xdebug.hash +++ b/package/php-xdebug/php-xdebug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7e4f28fc65c8b535de43b6d2ec57429476a6de1d53c4d440a9108ae8d28e01f4 php-xdebug-3.0.4.tar.gz +sha256 7769b20eecdadf5fbe9f582512c10b394fb575b6f7a8c3a3a82db6883e0032b7 xdebug-3.2.0.tgz sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272 LICENSE diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk index 18ebc32592..9429d4afee 100644 --- a/package/php-xdebug/php-xdebug.mk +++ b/package/php-xdebug/php-xdebug.mk @@ -4,8 +4,9 @@ # ################################################################################ -PHP_XDEBUG_VERSION = 3.0.4 -PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION)) +PHP_XDEBUG_VERSION = 3.2.0 +PHP_XDEBUG_SOURCE = xdebug-$(PHP_XDEBUG_VERSION).tgz +PHP_XDEBUG_SITE = https://xdebug.org/files PHP_XDEBUG_INSTALL_STAGING = YES PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like) PHP_XDEBUG_LICENSE_FILES = LICENSE -- 2.39.1 From casey at xogium.me Sun Feb 26 11:04:00 2023 From: casey at xogium.me (Casey R.) Date: Sun, 26 Feb 2023 12:04:00 +0100 Subject: [Buildroot] [PATCH v2] package/lzop: bump to version 1.04 In-Reply-To: <87mt51ez6l.fsf@tarshish> References: <20230225112838.4061103-1-casey@xogium.me> <20230225132927.4067626-1-casey@xogium.me> <87mt51ez6l.fsf@tarshish> Message-ID: Hi, damn. I forgot to remove my commented out hook definition. More accurately I forgot to git add the file again after I did that. Ugh. Time for a v3, I guess ? Unless someone is kind enough to just take that out ? Thanks. On Sun Feb 26, 2023 at 7:07 AM CET, Baruch Siach wrote: > Hi Casey, > > On Sat, Feb 25 2023, Casey Reeves wrote: > > diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk > > index 55157c4d48..056d724a7b 100644 > > --- a/package/lzop/lzop.mk > > +++ b/package/lzop/lzop.mk > > @@ -4,13 +4,22 @@ > > # > > ################################################################################ > > > > -LZOP_VERSION = 1.03 > > +LZOP_VERSION = 1.04 > > LZOP_SITE = http://www.lzop.org/download > > LZOP_LICENSE = GPL-2.0+ > > LZOP_LICENSE_FILES = COPYING > > LZOP_DEPENDENCIES = lzo > > HOST_LZOP_DEPENDENCIES = host-lzo > > > > +LZOP_LIBTOOL_PATCH=NO > > +#LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP > > This commit looks redundant. > > baruch > > > + > > +define LZOP_LIBTOOL_FIXUP > > + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $(@D)/autoconf/ltmain.sh > > +endef > > + > > +LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP > > + > > $(eval $(autotools-package)) > > $(eval $(host-autotools-package)) > > > -- > ~. .~ Tk Open Systems > =}------------------------------------------------ooO--U--Ooo------------{= > - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - -- Casey Reeves they/them From casey at xogium.me Sun Feb 26 11:33:08 2023 From: casey at xogium.me (Casey Reeves) Date: Sun, 26 Feb 2023 12:33:08 +0100 Subject: [Buildroot] [PATCH v3] package/lzop: bump to version 1.04 Message-ID: <20230226113307.4088933-1-casey@xogium.me> lzop 1.04 uses libtool 2.4.2.418, which is right between 2.4.2 and 2.4.4. While our patch for 2.4 is also supposed to work up to and including 2.4.2.x, it does not work for libtool 2.4.2.418, which requires the patch for 2.4.4. We could change our infra to better pick the appropriate patch, but we do not know exactly which 2.4.2.x version is actually the cutting point that requires the 2.4.4 patch. Until we have more data point, let's handle the case in an ad-hoc manner for lzop. Additionally, this lzop bump carries the patch from florian B?uerle, which allows to set the mtime of the lzop archive for reproducible build support using SOURCE_DATE_EPOCH. https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch Signed-off-by: Casey Reeves --- Changes v2 -> v3: - removed commented line which called the fixup hook before its creation Changes v1 -> v2: - added missing SoB for both the commit and the included patch - provided explanation and origin of the patch in its file --- ...1-allow-overriding-modification-time.patch | 42 ++++++++ package/lzop/0001-build-with-gcc6.patch | 37 ------- ...es-as-the-external-inline-definition.patch | 102 ------------------ package/lzop/lzop.hash | 2 +- package/lzop/lzop.mk | 10 +- 5 files changed, 52 insertions(+), 141 deletions(-) create mode 100644 package/lzop/0001-allow-overriding-modification-time.patch delete mode 100644 package/lzop/0001-build-with-gcc6.patch delete mode 100644 package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch diff --git a/package/lzop/0001-allow-overriding-modification-time.patch b/package/lzop/0001-allow-overriding-modification-time.patch new file mode 100644 index 0000000000..5ffc64cd30 --- /dev/null +++ b/package/lzop/0001-allow-overriding-modification-time.patch @@ -0,0 +1,42 @@ +From: =?UTF-8?q?Florian=20B=C3=A4uerle?= +Date: Thu, 25 Oct 2018 17:26:30 +0200 +Subject: [PATCH] allow overriding modification time + +This patch allows to set the mtime of the lzop archive to +$SOURCE_DATE_EPOCH, required for reproducible build. It was submitted to +pengutronix by florian B?uerle in october 2018. + +https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch + +Signed-off-by: Casey Reeves +--- + src/lzop.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/lzop.c b/src/lzop.c +index a540ad9c4d33..c2f877d16f92 100644 +--- a/src/lzop.c ++++ b/src/lzop.c +@@ -712,6 +712,7 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + assert(opt_method > 0); + assert(opt_level > 0); + assert(fip->st.st_mode == 0 || S_ISREG(fip->st.st_mode)); ++ const char *source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + + memset(h,0,sizeof(header_t)); + +@@ -748,7 +749,13 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + + h->mode = fix_mode_for_header(fip->st.st_mode); + +- if (fip->st.st_mtime > 0) ++ if (source_date_epoch) ++ { ++ time_t mtime = strtoul(source_date_epoch, NULL, 0); ++ h->mtime_low = (lzo_uint32) (mtime); ++ h->mtime_high = (lzo_uint32) ((mtime >> 16) >> 16); ++ } ++ else if (fip->st.st_mtime > 0) + { + h->mtime_low = (lzo_uint32) (fip->st.st_mtime); + h->mtime_high = (lzo_uint32) ((fip->st.st_mtime >> 16) >> 16); diff --git a/package/lzop/0001-build-with-gcc6.patch b/package/lzop/0001-build-with-gcc6.patch deleted file mode 100644 index 03bd887d51..0000000000 --- a/package/lzop/0001-build-with-gcc6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Jaap Crezee -Date: Sat, 25 june 2016 13:13:00 +0200 -Subject: [PATCH] fix compilation host-lzop with gcc-6 - -This patch allows host-lzop to be compiled with host systems containing gcc-6 - -Upstream patch found here: -https://build.opensuse.org/package/view_file/Archiving/lzop/lzop-1.03-gcc6.patch?expand=1 - -Signed-off-by: Jaap Crezee - ---- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100 -+++ b/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 -@@ -4469,12 +4469,12 @@ - #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) -+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) - #endif - ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) - #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) -+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) - #endif - ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) - #if defined(acc_int16e_t) -@@ -4703,7 +4703,7 @@ - #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) -- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) -+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) - #endif - #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) - # pragma option pop diff --git a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch b/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch deleted file mode 100644 index f6d076a9f7..0000000000 --- a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch +++ /dev/null @@ -1,102 +0,0 @@ -From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 16 Aug 2015 10:35:47 -0700 -Subject: [PATCH] use static inlines as the external inline definition has - changed with gcc5 - -[Patch from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch] -Signed-off-by: Khem Raj -Signed-off-by: Peter Korsgaard ---- -Upstream-Status: Pending - - src/miniacc.h | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - -diff --git a/src/miniacc.h b/src/miniacc.h -index 09e6f0c..cae98d1 100644 ---- a/src/miniacc.h -+++ b/src/miniacc.h -@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } --- -2.5.0 - diff --git a/package/lzop/lzop.hash b/package/lzop/lzop.hash index adc20648b6..99796dc8c9 100644 --- a/package/lzop/lzop.hash +++ b/package/lzop/lzop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 lzop-1.03.tar.gz +sha256 7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41 lzop-1.04.tar.gz sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk index 55157c4d48..e946206a42 100644 --- a/package/lzop/lzop.mk +++ b/package/lzop/lzop.mk @@ -4,13 +4,21 @@ # ################################################################################ -LZOP_VERSION = 1.03 +LZOP_VERSION = 1.04 LZOP_SITE = http://www.lzop.org/download LZOP_LICENSE = GPL-2.0+ LZOP_LICENSE_FILES = COPYING LZOP_DEPENDENCIES = lzo HOST_LZOP_DEPENDENCIES = host-lzo +LZOP_LIBTOOL_PATCH=NO + +define LZOP_LIBTOOL_FIXUP + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $(@D)/autoconf/ltmain.sh +endef + +LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP + $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.39.2 From fontaine.fabrice at gmail.com Sun Feb 26 12:06:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 13:06:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcm-tools: needs NPTL Message-ID: <20230226120636.39100-1-fontaine.fabrice@gmail.com> pcm-tools needs NPTL since its addition in commit 60eb2cec80e5258a0c43090f539749606744e182: cpucounters.cpp: In constructor 'pcm::TemporalThreadAffinity::TemporalThreadAffinity(pcm::uint32, bool)': cpucounters.cpp:252:9: error: 'pthread_getaffinity_np' was not declared in this scope; did you mean 'sched_getaffinity'? 252 | pthread_getaffinity_np(pthread_self(), set_size, old_affinity); | ^~~~~~~~~~~~~~~~~~~~~~ | sched_getaffinity Fixes: - http://autobuild.buildroot.org/results/8bbf9c36af332bbf5e7c1abcbb594a0b231ef97e Signed-off-by: Fabrice Fontaine --- package/pcm-tools/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/pcm-tools/Config.in b/package/pcm-tools/Config.in index ca9719dc5f..6bf05f32d7 100644 --- a/package/pcm-tools/Config.in +++ b/package/pcm-tools/Config.in @@ -1,11 +1,13 @@ -comment "pcm-tools needs a toolchain w/ C++" +comment "pcm-tools needs a toolchain w/ C++, NPTL" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_INSTALL_LIBSTDCPP + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL config BR2_PACKAGE_PCM_TOOLS bool "pcm-tools" depends on BR2_i386 || BR2_x86_64 depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_HWDATA select BR2_PACKAGE_HWDATA_PCI_IDS help -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 12:07:32 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 13:07:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: fix build without NPTL Message-ID: <20230226120732.39710-1-fontaine.fabrice@gmail.com> Fix the following build failure without NPTL raised since the addition of the package in commit 1e64fa2956171cdc9d6e6c8896b4b589ce573513: /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: error: 'pthread_spin_init' was not declared in this scope; did you mean 'pthread_cond_init'? 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) | ^~~~~~~~~~~~~~~~~ | pthread_cond_init Fixes: - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f Signed-off-by: Fabrice Fontaine --- .../0001-fix-uclibc-build-without-NPTL.patch | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 package/gdal/0001-fix-uclibc-build-without-NPTL.patch diff --git a/package/gdal/0001-fix-uclibc-build-without-NPTL.patch b/package/gdal/0001-fix-uclibc-build-without-NPTL.patch new file mode 100644 index 0000000000..6ecbfc7f95 --- /dev/null +++ b/package/gdal/0001-fix-uclibc-build-without-NPTL.patch @@ -0,0 +1,102 @@ +From 0d3ee8a7661dcd85a9d7b636124af32de8d1b2f1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 11:31:23 +0100 +Subject: [PATCH] fix uclibc build without NPTL + +Check for pthread_spin_lock instead of pthread_spin_lock_t to avoid the +following uclibc build failure: + +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: error: 'pthread_spin_init' was not declared in this scope; did you mean 'pthread_cond_init'? + 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) + | ^~~~~~~~~~~~~~~~~ + | pthread_cond_init +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'int CPLAcquireSpinLock(CPLSpinLock*)': +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2283:12: error: 'pthread_spin_lock' was not declared in this scope; did you mean 'pthread_spinlock_t'? + 2283 | return pthread_spin_lock( &(psSpin->spin) ) == 0; + | ^~~~~~~~~~~~~~~~~ + | pthread_spinlock_t + +Fixes: + - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OSGeo/gdal/pull/7318] +--- + cmake/helpers/configure.cmake | 4 ++-- + cmake/template/cpl_config.h.in | 4 ++-- + port/cpl_config.h.in | 4 ++-- + port/cpl_multiproc.cpp | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/cmake/helpers/configure.cmake b/cmake/helpers/configure.cmake +index 08549df434..62a4f636ba 100644 +--- a/cmake/helpers/configure.cmake ++++ b/cmake/helpers/configure.cmake +@@ -110,9 +110,9 @@ else () + " + #define _GNU_SOURCE + #include +- int main() { pthread_spinlock_t spin; return 1; } ++ int main() { pthread_spinlock_t spin; return pthread_spin_lock(&spin); } + " +- HAVE_PTHREAD_SPINLOCK) ++ HAVE_PTHREAD_SPIN_LOCK) + + check_c_source_compiles( + " +diff --git a/cmake/template/cpl_config.h.in b/cmake/template/cpl_config.h.in +index cfa7da94aa..d1fd80bda9 100644 +--- a/cmake/template/cpl_config.h.in ++++ b/cmake/template/cpl_config.h.in +@@ -61,8 +61,8 @@ + /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ + #cmakedefine HAVE_PTHREAD_MUTEX_ADAPTIVE_NP 1 + +-/* Define to 1 if you have the `pthread_spinlock_t' type. */ +-#cmakedefine HAVE_PTHREAD_SPINLOCK 1 ++/* Define to 1 if you have the `pthread_spin_lock' function. */ ++#cmakedefine HAVE_PTHREAD_SPIN_LOCK 1 + + /* Define to 1 if you have the `pthread_atfork' function. */ + #cmakedefine HAVE_PTHREAD_ATFORK 1 +diff --git a/port/cpl_config.h.in b/port/cpl_config.h.in +index ea28efb3f0..09a48f242d 100644 +--- a/port/cpl_config.h.in ++++ b/port/cpl_config.h.in +@@ -51,8 +51,8 @@ + /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ + #undef HAVE_PTHREAD_MUTEX_ADAPTIVE_NP + +-/* Define to 1 if you have the `pthread_spinlock_t' type. */ +-#undef HAVE_PTHREAD_SPINLOCK ++/* Define to 1 if you have the `pthread_spin_lock' function. */ ++#undef HAVE_PTHREAD_SPIN_LOCK + + /* Define to 1 if you have the 5 args `mremap' function. */ + #undef HAVE_5ARGS_MREMAP +diff --git a/port/cpl_multiproc.cpp b/port/cpl_multiproc.cpp +index 7f5bcd9127..474ff5bb29 100644 +--- a/port/cpl_multiproc.cpp ++++ b/port/cpl_multiproc.cpp +@@ -2232,7 +2232,7 @@ void CPLCleanupTLS() + /* CPLCreateSpinLock() */ + /************************************************************************/ + +-#if defined(HAVE_PTHREAD_SPINLOCK) ++#if defined(HAVE_PTHREAD_SPIN_LOCK) + #define HAVE_SPINLOCK_IMPL + + struct _CPLSpinLock +@@ -2310,7 +2310,7 @@ void CPLDestroySpinLock(CPLSpinLock *psSpin) + pthread_spin_destroy(&(psSpin->spin)); + free(psSpin); + } +-#endif // HAVE_PTHREAD_SPINLOCK ++#endif // HAVE_PTHREAD_SPIN_LOCK + + #endif // def CPL_MULTIPROC_PTHREAD + +-- +2.39.1 + -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 12:23:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 13:23:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xwayland: xlib_libxshmfence is mandatory Message-ID: <20230226122336.49814-1-fontaine.fabrice@gmail.com> xlib_libxshmfence is mandatory, not optional, since the addition of the package in commit 05c3177493aa8447d5cb568c8c13e0c09eded18b: ../miext/sync/misyncshm.c:36:10: fatal error: X11/xshmfence.h: No such file or directory 36 | #include | ^~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/cccc8f97d452ed2adbcbc4624f159a00287a3d38 Signed-off-by: Fabrice Fontaine --- package/weston/Config.in | 4 ++++ package/wlroots/Config.in | 4 ++++ package/x11r7/xwayland/Config.in | 5 +++++ package/x11r7/xwayland/xwayland.mk | 5 +++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 09119edaaa..d5dbf27bbd 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -114,6 +114,8 @@ config BR2_PACKAGE_WESTON_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 @@ -125,6 +127,8 @@ comment "XWayland support needs libepoxy and X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS # Weston needs at least one shell; this can be one of the bundled ones, diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index b2d3f3c3b1..fb23e9069c 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -47,6 +47,8 @@ config BR2_PACKAGE_WLROOTS_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XCB_UTIL_WM select BR2_PACKAGE_XWAYLAND @@ -58,6 +60,8 @@ comment "XWayland support needs X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS endif diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in index 4f14f2cc36..241ab73ad3 100644 --- a/package/x11r7/xwayland/Config.in +++ b/package/x11r7/xwayland/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_XWAYLAND # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. + depends on !BR2_RISCV_32 # xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_WAYLAND @@ -14,6 +16,7 @@ config BR2_PACKAGE_XWAYLAND select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XLIB_LIBXKBFILE select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXSHMFENCE select BR2_PACKAGE_XLIB_XTRANS select BR2_PACKAGE_XORGPROTO help @@ -23,4 +26,6 @@ config BR2_PACKAGE_XWAYLAND comment "xwayland needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 174b440b07..7aef1156d3 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -18,6 +18,7 @@ XWAYLAND_DEPENDENCIES = \ xlib_libXfont2 \ xlib_libxkbfile \ xlib_libXrandr \ + xlib_libxshmfence \ xlib_xtrans \ xorgproto XWAYLAND_CONF_OPTS = \ @@ -77,9 +78,9 @@ XWAYLAND_CONF_OPTS += -Dsha1=libsha1 XWAYLAND_DEPENDENCIES += libsha1 endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_LIBDRM),yy) +ifeq ($(BR2_PACKAGE_LIBDRM),y) XWAYLAND_CONF_OPTS += -Ddri3=true -XWAYLAND_DEPENDENCIES += xlib_libxshmfence libdrm +XWAYLAND_DEPENDENCIES += libdrm else XWAYLAND_CONF_OPTS += -Ddri3=false endif -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 13:10:48 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 14:10:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-werkzeug: security bump to version 2.2.3 Message-ID: <20230226131048.75813-1-fontaine.fabrice@gmail.com> Fix CVE-2023-23934 and CVE-2023-25577 https://github.com/pallets/werkzeug/security/advisories/GHSA-px8h-6qxv-m22q https://github.com/pallets/werkzeug/security/advisories/GHSA-xg9f-g7g7-2323 https://werkzeug.palletsprojects.com/en/2.2.x/changes/#version-2-2-3 Signed-off-by: Fabrice Fontaine --- package/python-werkzeug/python-werkzeug.hash | 6 +++--- package/python-werkzeug/python-werkzeug.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash index 13b95bc448..0b60a40066 100644 --- a/package/python-werkzeug/python-werkzeug.hash +++ b/package/python-werkzeug/python-werkzeug.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/Werkzeug/json -md5 9d7e50c5bb3a9fc12823b5faf374b90e Werkzeug-2.2.2.tar.gz -sha256 7ea2d48322cc7c0f8b3a215ed73eabd7b5d75d0b50e31ab006286ccff9e00b8f Werkzeug-2.2.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/werkzeug/json +md5 28c3ec6a4b1ce8f06c85612c1dfa351a Werkzeug-2.2.3.tar.gz +sha256 2e1ccc9417d4da358b9de6f174e3ac094391ea1d4fbef2d667865d819dfd0afe Werkzeug-2.2.3.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk index 3ebae3c165..0dd27d145f 100644 --- a/package/python-werkzeug/python-werkzeug.mk +++ b/package/python-werkzeug/python-werkzeug.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 2.2.2 +PYTHON_WERKZEUG_VERSION = 2.2.3 PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/f8/c1/1c8e539f040acd80f844c69a5ef8e2fccdf8b442dabb969e497b55d544e1 +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/02/3c/baaebf3235c87d61d6593467056d5a8fba7c75ac838b8d100a5e64eba7a0 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst -- 2.39.1 From ju.o at free.fr Sun Feb 26 13:18:38 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 26 Feb 2023 14:18:38 +0100 Subject: [Buildroot] [PATCH next 1/1] configs/spike_riscv64: bump kernel to 6.1.14 Message-ID: <20230226131838.509224-1-ju.o@free.fr> Linux Kernel 6.1 now being officially promoted to be a LTS, this commit bump the kernel version of this defconfig to 6.1.14. A Kernel config fragment "linux.fragment" is now needed as the kernel no longer enable SBI v0.1 support and the earlycon RISC-V SBI in its riscv arch defconfig. See [1] [2]. The Spike riscv-isa-sim was updated upstream accordingly [3]. In order to keep a smooth transition, this kernel config fragment re-enable those options to make sure this kernel will work with both old Spike versions (not including commit [3] like the v1.1.0 currently included in Buildroot), and newer versions. This commit was also successfully tested with riscv-isa-sim at commit 0d1a48c0c0. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6f562570b9c5d6a3e30d87aec60a9d8f22a3203c [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3938d5a2f9369d1ebd56320629fed395ce327e9c [3] https://github.com/riscv-software-src/riscv-isa-sim/commit/191634d2854dfed448fc323195f9b65c305e2d77 Signed-off-by: Julien Olivain --- Patch tested on top of branch next at commit b793f3a with commands: make spike_riscv64_defconfig make board/spike/riscv64/start.sh --- board/spike/riscv64/linux.fragment | 3 +++ configs/spike_riscv64_defconfig | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 board/spike/riscv64/linux.fragment diff --git a/board/spike/riscv64/linux.fragment b/board/spike/riscv64/linux.fragment new file mode 100644 index 0000000000..b443b0ab36 --- /dev/null +++ b/board/spike/riscv64/linux.fragment @@ -0,0 +1,3 @@ +CONFIG_RISCV_SBI_V01=y +CONFIG_HVC_RISCV_SBI=y +CONFIG_SERIAL_EARLYCON_RISCV_SBI=y diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index e23f1ce32c..73ea566084 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -2,9 +2,10 @@ BR2_riscv=y BR2_RISCV_64=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/spike/riscv64/linux.fragment" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y -- 2.39.2 From fontaine.fabrice at gmail.com Sun Feb 26 13:20:26 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 14:20:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/bind: security bump to version 9.16.38 Message-ID: <20230226132026.82185-1-fontaine.fabrice@gmail.com> - Fix CVE-2022-3094, CVE-2022-3736 and CVE-2022-3924 - Update hash of COPYRIGHT (year updated with https://gitlab.isc.org/isc-projects/bind9/-/commit/1a5d707f52282117c9912a27dcc89f2ec412577a) https://downloads.isc.org/isc/bind9/9.16.38/doc/arm/html/notes.html Signed-off-by: Fabrice Fontaine --- package/bind/bind.hash | 6 +++--- package/bind/bind.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index d41a9bbc5e..32804b5ce0 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.16.33/bind-9.16.33.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.38/bind-9.16.38.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 ec4fbea4b2e368d1824971509e33fa159224ad14b436034c6bcd46104c328d91 bind-9.16.33.tar.xz -sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT +sha256 8df44c9d9a84a28ab8b49d55f3c33b624b90ef8f6a8b9ee6a4c33cc17c14c50f bind-9.16.38.tar.xz +sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index abc3100e6d..c6e992f76c 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.33 +BIND_VERSION = 9.16.38 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 13:27:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 14:27:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-m2crypto: fix CVE-2020-25657 Message-ID: <20230226132747.86908-1-fontaine.fabrice@gmail.com> A flaw was found in all released versions of m2crypto, where they are vulnerable to Bleichenbacher timing attacks in the RSA decryption API via the timed processing of valid PKCS#1 v1.5 Ciphertext. The highest threat from this vulnerability is to confidentiality. Signed-off-by: Fabrice Fontaine --- ...he-RSA-decryption-API-CVE-2020-25657.patch | 174 ++++++++++++++++++ package/python-m2crypto/python-m2crypto.mk | 3 + 2 files changed, 177 insertions(+) create mode 100644 package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch diff --git a/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch b/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch new file mode 100644 index 0000000000..68200b7d9b --- /dev/null +++ b/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch @@ -0,0 +1,174 @@ +From 84c53958def0f510e92119fca14d74f94215827a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= +Date: Tue, 28 Jun 2022 21:17:01 +0200 +Subject: [PATCH] Mitigate the Bleichenbacher timing attacks in the RSA + decryption API (CVE-2020-25657) + +Fixes #282 + +[Retrieved from: +https://gitlab.com/m2crypto/m2crypto/-/commit/84c53958def0f510e92119fca14d74f94215827a] +Signed-off-by: Fabrice Fontaine +--- + src/SWIG/_m2crypto_wrap.c | 20 ++++++++++++-------- + src/SWIG/_rsa.i | 20 ++++++++++++-------- + tests/test_rsa.py | 15 +++++++-------- + 3 files changed, 31 insertions(+), 24 deletions(-) + +diff --git a/src/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c +index aba9eb6d..a9f30da9 100644 +--- a/src/SWIG/_m2crypto_wrap.c ++++ b/src/SWIG/_m2crypto_wrap.c +@@ -7040,9 +7040,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7070,9 +7071,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7097,9 +7099,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7124,9 +7127,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); + +diff --git a/src/SWIG/_rsa.i b/src/SWIG/_rsa.i +index bc714e01..1377b8be 100644 +--- a/src/SWIG/_rsa.i ++++ b/src/SWIG/_rsa.i +@@ -239,9 +239,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -269,9 +270,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -296,9 +298,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -323,9 +326,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); + +diff --git a/tests/test_rsa.py b/tests/test_rsa.py +index 7bb3af75..5e75d681 100644 +--- a/tests/test_rsa.py ++++ b/tests/test_rsa.py +@@ -109,8 +109,9 @@ class RSATestCase(unittest.TestCase): + # The other paddings. + for padding in self.s_padding_nok: + p = getattr(RSA, padding) +- with self.assertRaises(RSA.RSAError): +- priv.private_encrypt(self.data, p) ++ # Exception disabled as a part of mitigation against CVE-2020-25657 ++ # with self.assertRaises(RSA.RSAError): ++ priv.private_encrypt(self.data, p) + # Type-check the data to be encrypted. + with self.assertRaises(TypeError): + priv.private_encrypt(self.gen_callback, RSA.pkcs1_padding) +@@ -127,10 +128,12 @@ class RSATestCase(unittest.TestCase): + self.assertEqual(ptxt, self.data) + + # no_padding +- with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): +- priv.public_encrypt(self.data, RSA.no_padding) ++ # Exception disabled as a part of mitigation against CVE-2020-25657 ++ # with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): ++ priv.public_encrypt(self.data, RSA.no_padding) + + # Type-check the data to be encrypted. ++ # Exception disabled as a part of mitigation against CVE-2020-25657 + with self.assertRaises(TypeError): + priv.public_encrypt(self.gen_callback, RSA.pkcs1_padding) + +@@ -146,10 +149,6 @@ class RSATestCase(unittest.TestCase): + b'\000\000\000\003\001\000\001') # aka 65537 aka 0xf4 + with self.assertRaises(RSA.RSAError): + setattr(rsa, 'e', '\000\000\000\003\001\000\001') +- with self.assertRaises(RSA.RSAError): +- rsa.private_encrypt(1) +- with self.assertRaises(RSA.RSAError): +- rsa.private_decrypt(1) + assert rsa.check_key() + + def test_loadpub_bad(self): +-- +GitLab + diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 02ad76d3f4..3c28fa3b0d 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -15,4 +15,7 @@ PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr +# 0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch +PYTHON_M2CRYPTO_IGNORE_CVES += CVE-2020-25657 + $(eval $(python-package)) -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 13:33:57 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 14:33:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/haproxy: security bump to version 2.6.9 Message-ID: <20230226133357.97330-1-fontaine.fabrice@gmail.com> Fix CVE-2023-25725 https://www.mail-archive.com/haproxy at formilux.org/msg43229.html https://www.mail-archive.com/haproxy at formilux.org/msg43224.html Signed-off-by: Fabrice Fontaine --- 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 2cd8ff1806..f5540ee44a 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.5.tar.gz.sha256 -sha256 ce9e19ebfcdd43e51af8a6090f1df8d512d972ddf742fa648a643bbb19056605 haproxy-2.6.5.tar.gz +# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.9.tar.gz.sha256 +sha256 f01a1c5f465dc1b5cd175d0b28b98beb4dfe82b5b5b63ddcc68d1df433641701 haproxy-2.6.9.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 35b1770d38..2c54e1c2c3 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.6 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).5 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).9 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 -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 13:39:46 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 14:39:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/tiff: fix CVE-2022-48281 Message-ID: <20230226133946.102275-1-fontaine.fabrice@gmail.com> processCropSelections in tools/tiffcrop.c in LibTIFF through 4.5.0 has a heap-based buffer overflow (e.g., "WRITE of size 307203") via a crafted TIFF image. Signed-off-by: Fabrice Fontaine --- ...rect-simple-copy-paste-error-Fix-488.patch | 28 +++++++++++++++++++ package/tiff/tiff.mk | 3 ++ 2 files changed, 31 insertions(+) create mode 100644 package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch diff --git a/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch b/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch new file mode 100644 index 0000000000..73c0d10ffc --- /dev/null +++ b/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch @@ -0,0 +1,28 @@ +From 97d65859bc29ee334012e9c73022d8a8e55ed586 Mon Sep 17 00:00:00 2001 +From: Su Laus +Date: Sat, 21 Jan 2023 15:58:10 +0000 +Subject: [PATCH] tiffcrop: Correct simple copy paste error. Fix #488. + +[Retrieved from: +https://gitlab.com/libtiff/libtiff/-/commit/97d65859bc29ee334012e9c73022d8a8e55ed586] +Signed-off-by: Fabrice Fontaine +--- + tools/tiffcrop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c +index 14fa18da..7db69883 100644 +--- a/tools/tiffcrop.c ++++ b/tools/tiffcrop.c +@@ -8591,7 +8591,7 @@ static int processCropSelections(struct image_data *image, + cropsize + NUM_BUFF_OVERSIZE_BYTES); + else + { +- prev_cropsize = seg_buffs[0].size; ++ prev_cropsize = seg_buffs[i].size; + if (prev_cropsize < cropsize) + { + next_buff = _TIFFrealloc( +-- +GitLab + diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index e7de51ea1e..f9754a4b49 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -12,6 +12,9 @@ TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES +# 0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch +TIFF_IGNORE_CVES += CVE-2022-48281 + # webp has a (optional) dependency on tiff, so we can't have webp # support in tiff, or that would create a circular dependency. TIFF_CONF_OPTS = \ -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 13:55:03 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 14:55:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpjsip: fix CVE-2022-235{3,4}7 Message-ID: <20230226135503.112605-1-fontaine.fabrice@gmail.com> https://github.com/pjsip/pjproject/security/advisories/GHSA-9pfh-r8x4-w26w https://github.com/pjsip/pjproject/security/advisories/GHSA-cxwq-5g9x-x7fr Signed-off-by: Fabrice Fontaine --- ...ull-request-from-GHSA-9pfh-r8x4-w26w.patch | 99 +++++++++++++++++++ package/libpjsip/libpjsip.mk | 6 ++ 2 files changed, 105 insertions(+) create mode 100644 package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch diff --git a/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch new file mode 100644 index 0000000000..01e1878189 --- /dev/null +++ b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch @@ -0,0 +1,99 @@ +From d8440f4d711a654b511f50f79c0445b26f9dd1e1 Mon Sep 17 00:00:00 2001 +From: Nanang Izzuddin +Date: Tue, 20 Dec 2022 11:39:12 +0700 +Subject: [PATCH] Merge pull request from GHSA-9pfh-r8x4-w26w + +* Fix buffer overread in STUN message decoder + +* Updates based on comments + +[Retrieved from: +https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1] +Signed-off-by: Fabrice Fontaine +--- + pjnath/include/pjnath/stun_msg.h | 4 ++++ + pjnath/src/pjnath/stun_msg.c | 14 +++++++++++--- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h +index b52f95c586..e49f096f3a 100644 +--- a/pjnath/include/pjnath/stun_msg.h ++++ b/pjnath/include/pjnath/stun_msg.h +@@ -442,6 +442,7 @@ typedef enum pj_stun_status + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_msg_hdr + { + /** +@@ -473,6 +474,7 @@ typedef struct pj_stun_msg_hdr + pj_uint8_t tsx_id[12]; + + } pj_stun_msg_hdr; ++#pragma pack() + + + /** +@@ -490,6 +492,7 @@ typedef struct pj_stun_msg_hdr + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_attr_hdr + { + /** +@@ -506,6 +509,7 @@ typedef struct pj_stun_attr_hdr + pj_uint16_t length; + + } pj_stun_attr_hdr; ++#pragma pack() + + + /** +diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c +index 3def6b3eac..e904a0ba47 100644 +--- a/pjnath/src/pjnath/stun_msg.c ++++ b/pjnath/src/pjnath/stun_msg.c +@@ -746,7 +746,7 @@ PJ_DEF(int) pj_stun_set_padding_char(int chr) + + #define INIT_ATTR(a,t,l) (a)->hdr.type=(pj_uint16_t)(t), \ + (a)->hdr.length=(pj_uint16_t)(l) +-#define ATTR_HDR_LEN 4 ++#define ATTR_HDR_LEN sizeof(pj_stun_attr_hdr) + + static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos) + { +@@ -2327,6 +2327,14 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + status = pj_stun_msg_check(pdu, pdu_len, options); + if (status != PJ_SUCCESS) + return status; ++ } else { ++ /* For safety, verify packet length at least */ ++ pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20; ++ if (msg_len > pdu_len || ++ ((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len)) ++ { ++ return PJNATH_EINSTUNMSGLEN; ++ } + } + + /* Create the message, copy the header, and convert to host byte order */ +@@ -2345,7 +2353,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + p_response = NULL; + + /* Parse attributes */ +- while (pdu_len >= 4) { ++ while (pdu_len >= ATTR_HDR_LEN) { + unsigned attr_type, attr_val_len; + const struct attr_desc *adesc; + +@@ -2357,7 +2365,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + attr_val_len = (attr_val_len + 3) & (~3); + + /* Check length */ +- if (pdu_len < attr_val_len) { ++ if (pdu_len < attr_val_len + ATTR_HDR_LEN) { + pj_str_t err_msg; + char err_msg_buf[80]; + diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 5cc0423f5d..24db641446 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -15,6 +15,12 @@ LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) +# 0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch +LIBPJSIP_IGNORE_CVES += CVE-2022-23537 + +# 0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch +LIBPJSIP_IGNORE_CVES += CVE-2022-23547 + LIBPJSIP_CFLAGS = $(TARGET_CFLAGS) -DPJ_HAS_IPV6=1 # relocation truncated to fit: R_68K_GOT16O -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 15:44:21 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 16:44:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/proxychains-ng: set -fPIC Message-ID: <20230226154421.47285-1-fontaine.fabrice@gmail.com> Set -fPIC to avoid the following build failure with some architectures such as mips or aarch64 raised since bump to version 4.14 in commit 35953d1e61aa8581be09c9dca39365955b10590e and https://github.com/rofl0r/proxychains-ng/commit/35a674bdbc294730429a1007c9e7ce01e65b49b5: checking what's the option to use in linker to set library name ... cannot find an option to set library name Fixes: - http://autobuild.buildroot.org/results/8ed1481e29321ed3da40251f700cb3bd66f62c94 - http://autobuild.buildroot.org/results/fd01df6eb9a37257894740d44a33eece9123355a Signed-off-by: Fabrice Fontaine --- package/proxychains-ng/proxychains-ng.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk index c4d487c7db..beb8909088 100644 --- a/package/proxychains-ng/proxychains-ng.mk +++ b/package/proxychains-ng/proxychains-ng.mk @@ -13,7 +13,8 @@ PROXYCHAINS_NG_CPE_ID_VENDOR = proxychains-ng_project define PROXYCHAINS_NG_CONFIGURE_CMDS cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) ./configure --prefix=/usr --sysconfdir=/etc + $(TARGET_CONFIGURE_OPTS) CPPFLAGS="$(TARGET_CPPFLAGS) -fPIC" \ + ./configure --prefix=/usr --sysconfdir=/etc endef define PROXYCHAINS_NG_BUILD_CMDS -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 16:20:21 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 17:20:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/uccp420wlan: drop package Message-ID: <20230226162021.67158-1-fontaine.fabrice@gmail.com> uccp420wlan is not maintained anymore (no commit since 2017) and fails to build with any "recent" kernel (e.g. >= 4.7 which includes https://github.com/torvalds/linux/commit/57fbcce37be7c1d2622b56587c10ade00e96afa3 or https://github.com/torvalds/linux/commit/8552a434b6a05cc38006733afe6a239ad4d600a2): /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c: In function ?uccp420wlan_tx_free_buff_req?: /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c:1142:49: error: ?IEEE80211_BAND_2GHZ? undeclared (first use in this function); did you mean ?IEEE80211_CHAN_2GHZ?? 1142 | if (ets_band == IEEE80211_BAND_2GHZ) | ^~~~~~~~~~~~~~~~~~~ | IEEE80211_CHAN_2GHZ [...] /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/core.c:428:29: error: implicit declaration of function ?ieee80211_csa_is_complete?; did you mean ?ieee80211_scan_completed?? [-Werror=implicit-function-declaration] 428 | if (ieee80211_csa_is_complete(uvif->vif)) | ^~~~~~~~~~~~~~~~~~~~~~~~~ | ieee80211_scan_completed Fixes: - http://autobuild.buildroot.org/results/7cd7151e390b8f7a0df3e647fe4cd5d6319a830b Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 7 +++++++ package/uccp420wlan/Config.in | 16 ---------------- package/uccp420wlan/uccp420wlan.hash | 4 ---- package/uccp420wlan/uccp420wlan.mk | 18 ------------------ 4 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 package/uccp420wlan/Config.in delete mode 100644 package/uccp420wlan/uccp420wlan.hash delete mode 100644 package/uccp420wlan/uccp420wlan.mk diff --git a/Config.in.legacy b/Config.in.legacy index af1d8cc1dc..381e1e3a8c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_UCCP420WLAN + bool "uccp420wlan removed" + select BR2_LEGACY + help + The uccp420wlan package is unmaintained and doesn't build + with any "recent" kernel (e.g. >= 4.7). + config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES bool "imx-gpu-g2d examples removed" select BR2_LEGACY diff --git a/package/uccp420wlan/Config.in b/package/uccp420wlan/Config.in deleted file mode 100644 index ef6a9db865..0000000000 --- a/package/uccp420wlan/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_UCCP420WLAN - bool "uccp420wlan" - depends on BR2_LINUX_KERNEL - help - SoftMAC (mac80211) based WiFi driver for Imagination's - Explorer RPU uccp420. This supports Dual Band WiFi with - 2.4GHz - 2x2 b/g/n 40MHz, 5GHz - 2x2 a/n/11ac 80MHz modes - - Used in creator ci40 board. - - This module needs a Linux kernel >= v4.2. - - https://github.com/CreatorDev/uccp420wlan - -comment "uccp420wlan needs a Linux kernel >= 4.2 to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package/uccp420wlan/uccp420wlan.hash b/package/uccp420wlan/uccp420wlan.hash deleted file mode 100644 index 905fa4299d..0000000000 --- a/package/uccp420wlan/uccp420wlan.hash +++ /dev/null @@ -1,4 +0,0 @@ -# locally computed hash -sha256 1d4de62fc842dbab739708cf0d9ebce270fcdf63c1c13ac676cbc253acdaa3bb uccp420wlan-6.9.1.tar.gz -sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING -sha256 9ac431585fddfe624b08cf7464876a5e96061047ff26a9e926da3d89d21a2a73 firmware/LICENSE.imagination diff --git a/package/uccp420wlan/uccp420wlan.mk b/package/uccp420wlan/uccp420wlan.mk deleted file mode 100644 index 7256b92774..0000000000 --- a/package/uccp420wlan/uccp420wlan.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# uccp420wlan -# -################################################################################ - -UCCP420WLAN_VERSION = 6.9.1 -UCCP420WLAN_SITE = $(call github,CreatorDev,uccp420wlan,v$(UCCP420WLAN_VERSION)) -UCCP420WLAN_LICENSE = GPL-2.0 (kernel module), proprietary (firmware blob) -UCCP420WLAN_LICENSE_FILES = COPYING firmware/LICENSE.imagination - -define UCCP420WLAN_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware/img/uccp420wlan - cp $(@D)/firmware/*.ldr $(TARGET_DIR)/lib/firmware/img/uccp420wlan -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 17:23:28 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 18:23:28 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/uccp420wlan: drop package Message-ID: <20230226172328.114504-1-fontaine.fabrice@gmail.com> uccp420wlan is not maintained anymore (no commit since 2017) and fails to build with any "recent" kernel (e.g. >= 4.7 which includes https://github.com/torvalds/linux/commit/57fbcce37be7c1d2622b56587c10ade00e96afa3 or https://github.com/torvalds/linux/commit/8552a434b6a05cc38006733afe6a239ad4d600a2): /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c: In function ?uccp420wlan_tx_free_buff_req?: /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c:1142:49: error: ?IEEE80211_BAND_2GHZ? undeclared (first use in this function); did you mean ?IEEE80211_CHAN_2GHZ?? 1142 | if (ets_band == IEEE80211_BAND_2GHZ) | ^~~~~~~~~~~~~~~~~~~ | IEEE80211_CHAN_2GHZ [...] /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/core.c:428:29: error: implicit declaration of function ?ieee80211_csa_is_complete?; did you mean ?ieee80211_scan_completed?? [-Werror=implicit-function-declaration] 428 | if (ieee80211_csa_is_complete(uvif->vif)) | ^~~~~~~~~~~~~~~~~~~~~~~~~ | ieee80211_scan_completed Fixes: - http://autobuild.buildroot.org/results/7cd7151e390b8f7a0df3e647fe4cd5d6319a830b Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Update package/Config.in Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/uccp420wlan/Config.in | 16 ---------------- package/uccp420wlan/uccp420wlan.hash | 4 ---- package/uccp420wlan/uccp420wlan.mk | 18 ------------------ 5 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 package/uccp420wlan/Config.in delete mode 100644 package/uccp420wlan/uccp420wlan.hash delete mode 100644 package/uccp420wlan/uccp420wlan.mk diff --git a/Config.in.legacy b/Config.in.legacy index af1d8cc1dc..381e1e3a8c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_UCCP420WLAN + bool "uccp420wlan removed" + select BR2_LEGACY + help + The uccp420wlan package is unmaintained and doesn't build + with any "recent" kernel (e.g. >= 4.7). + config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES bool "imx-gpu-g2d examples removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 0800984cf9..93e080f955 100644 --- a/package/Config.in +++ b/package/Config.in @@ -621,7 +621,6 @@ endmenu source "package/triggerhappy/Config.in" source "package/uboot-tools/Config.in" source "package/ubus/Config.in" - source "package/uccp420wlan/Config.in" source "package/udev/Config.in" source "package/udev-gentoo-scripts/Config.in" source "package/udisks/Config.in" diff --git a/package/uccp420wlan/Config.in b/package/uccp420wlan/Config.in deleted file mode 100644 index ef6a9db865..0000000000 --- a/package/uccp420wlan/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_UCCP420WLAN - bool "uccp420wlan" - depends on BR2_LINUX_KERNEL - help - SoftMAC (mac80211) based WiFi driver for Imagination's - Explorer RPU uccp420. This supports Dual Band WiFi with - 2.4GHz - 2x2 b/g/n 40MHz, 5GHz - 2x2 a/n/11ac 80MHz modes - - Used in creator ci40 board. - - This module needs a Linux kernel >= v4.2. - - https://github.com/CreatorDev/uccp420wlan - -comment "uccp420wlan needs a Linux kernel >= 4.2 to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package/uccp420wlan/uccp420wlan.hash b/package/uccp420wlan/uccp420wlan.hash deleted file mode 100644 index 905fa4299d..0000000000 --- a/package/uccp420wlan/uccp420wlan.hash +++ /dev/null @@ -1,4 +0,0 @@ -# locally computed hash -sha256 1d4de62fc842dbab739708cf0d9ebce270fcdf63c1c13ac676cbc253acdaa3bb uccp420wlan-6.9.1.tar.gz -sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING -sha256 9ac431585fddfe624b08cf7464876a5e96061047ff26a9e926da3d89d21a2a73 firmware/LICENSE.imagination diff --git a/package/uccp420wlan/uccp420wlan.mk b/package/uccp420wlan/uccp420wlan.mk deleted file mode 100644 index 7256b92774..0000000000 --- a/package/uccp420wlan/uccp420wlan.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# uccp420wlan -# -################################################################################ - -UCCP420WLAN_VERSION = 6.9.1 -UCCP420WLAN_SITE = $(call github,CreatorDev,uccp420wlan,v$(UCCP420WLAN_VERSION)) -UCCP420WLAN_LICENSE = GPL-2.0 (kernel module), proprietary (firmware blob) -UCCP420WLAN_LICENSE_FILES = COPYING firmware/LICENSE.imagination - -define UCCP420WLAN_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware/img/uccp420wlan - cp $(@D)/firmware/*.ldr $(TARGET_DIR)/lib/firmware/img/uccp420wlan -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) -- 2.39.1 From thomas.petazzoni at bootlin.com Sun Feb 26 17:43:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 26 Feb 2023 18:43:32 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix CIP RT kernel on microblaze In-Reply-To: <20230225170229.358936-1-fontaine.fabrice@gmail.com> References: <20230225170229.358936-1-fontaine.fabrice@gmail.com> Message-ID: <20230226184332.39c3a9b2@windsurf> On Sat, 25 Feb 2023 18:02:29 +0100 Fabrice Fontaine wrote: > diff --git a/linux/linux.mk b/linux/linux.mk > index 7645b5f507..f3fdc40328 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -33,6 +33,7 @@ LINUX_SITE_METHOD = svn > else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION),y) > LINUX_SOURCE = linux-cip-$(LINUX_VERSION).tar.gz > LINUX_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot > +LINUX_PATCHES += linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch Why not put the patch in linux/5.10.162-cip24-rt10/ directly? This way it would automatically be applied, with the need to tweak LINUX_PATCHES. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 26 17:44:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 26 Feb 2023 18:44:32 +0100 Subject: [Buildroot] [git commit] package/uccp420wlan: drop package Message-ID: <20230226174443.1A33786A91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a34ac4453553a5d86b91e038db3acf0e7eb6931f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master uccp420wlan is not maintained anymore (no commit since 2017) and fails to build with any "recent" kernel (e.g. >= 4.7 which includes https://github.com/torvalds/linux/commit/57fbcce37be7c1d2622b56587c10ade00e96afa3 or https://github.com/torvalds/linux/commit/8552a434b6a05cc38006733afe6a239ad4d600a2): /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c: In function ???uccp420wlan_tx_free_buff_req???: /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c:1142:49: error: ???IEEE80211_BAND_2GHZ??? undeclared (first use in this function); did you mean ???IEEE80211_CHAN_2GHZ???? 1142 | if (ets_band == IEEE80211_BAND_2GHZ) | ^~~~~~~~~~~~~~~~~~~ | IEEE80211_CHAN_2GHZ [...] /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/core.c:428:29: error: implicit declaration of function ???ieee80211_csa_is_complete???; did you mean ???ieee80211_scan_completed???? [-Werror=implicit-function-declaration] 428 | if (ieee80211_csa_is_complete(uvif->vif)) | ^~~~~~~~~~~~~~~~~~~~~~~~~ | ieee80211_scan_completed Fixes: - http://autobuild.buildroot.org/results/7cd7151e390b8f7a0df3e647fe4cd5d6319a830b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/uccp420wlan/Config.in | 16 ---------------- package/uccp420wlan/uccp420wlan.hash | 4 ---- package/uccp420wlan/uccp420wlan.mk | 18 ------------------ 5 files changed, 7 insertions(+), 39 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index af1d8cc1dc..381e1e3a8c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_UCCP420WLAN + bool "uccp420wlan removed" + select BR2_LEGACY + help + The uccp420wlan package is unmaintained and doesn't build + with any "recent" kernel (e.g. >= 4.7). + config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES bool "imx-gpu-g2d examples removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..3ace25c665 100644 --- a/package/Config.in +++ b/package/Config.in @@ -621,7 +621,6 @@ endmenu source "package/triggerhappy/Config.in" source "package/uboot-tools/Config.in" source "package/ubus/Config.in" - source "package/uccp420wlan/Config.in" source "package/udev/Config.in" source "package/udev-gentoo-scripts/Config.in" source "package/udisks/Config.in" diff --git a/package/uccp420wlan/Config.in b/package/uccp420wlan/Config.in deleted file mode 100644 index ef6a9db865..0000000000 --- a/package/uccp420wlan/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_UCCP420WLAN - bool "uccp420wlan" - depends on BR2_LINUX_KERNEL - help - SoftMAC (mac80211) based WiFi driver for Imagination's - Explorer RPU uccp420. This supports Dual Band WiFi with - 2.4GHz - 2x2 b/g/n 40MHz, 5GHz - 2x2 a/n/11ac 80MHz modes - - Used in creator ci40 board. - - This module needs a Linux kernel >= v4.2. - - https://github.com/CreatorDev/uccp420wlan - -comment "uccp420wlan needs a Linux kernel >= 4.2 to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package/uccp420wlan/uccp420wlan.hash b/package/uccp420wlan/uccp420wlan.hash deleted file mode 100644 index 905fa4299d..0000000000 --- a/package/uccp420wlan/uccp420wlan.hash +++ /dev/null @@ -1,4 +0,0 @@ -# locally computed hash -sha256 1d4de62fc842dbab739708cf0d9ebce270fcdf63c1c13ac676cbc253acdaa3bb uccp420wlan-6.9.1.tar.gz -sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING -sha256 9ac431585fddfe624b08cf7464876a5e96061047ff26a9e926da3d89d21a2a73 firmware/LICENSE.imagination diff --git a/package/uccp420wlan/uccp420wlan.mk b/package/uccp420wlan/uccp420wlan.mk deleted file mode 100644 index 7256b92774..0000000000 --- a/package/uccp420wlan/uccp420wlan.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# uccp420wlan -# -################################################################################ - -UCCP420WLAN_VERSION = 6.9.1 -UCCP420WLAN_SITE = $(call github,CreatorDev,uccp420wlan,v$(UCCP420WLAN_VERSION)) -UCCP420WLAN_LICENSE = GPL-2.0 (kernel module), proprietary (firmware blob) -UCCP420WLAN_LICENSE_FILES = COPYING firmware/LICENSE.imagination - -define UCCP420WLAN_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware/img/uccp420wlan - cp $(@D)/firmware/*.ldr $(TARGET_DIR)/lib/firmware/img/uccp420wlan -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Sun Feb 26 17:44:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 26 Feb 2023 18:44:56 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/uccp420wlan: drop package In-Reply-To: <20230226172328.114504-1-fontaine.fabrice@gmail.com> References: <20230226172328.114504-1-fontaine.fabrice@gmail.com> Message-ID: <20230226184456.550cc7dc@windsurf> On Sun, 26 Feb 2023 18:23:28 +0100 Fabrice Fontaine wrote: > uccp420wlan is not maintained anymore (no commit since 2017) and fails > to build with any "recent" kernel (e.g. >= 4.7 which includes > https://github.com/torvalds/linux/commit/57fbcce37be7c1d2622b56587c10ade00e96afa3 > or > https://github.com/torvalds/linux/commit/8552a434b6a05cc38006733afe6a239ad4d600a2): > > /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c: In function ?uccp420wlan_tx_free_buff_req?: > /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c:1142:49: error: ?IEEE80211_BAND_2GHZ? undeclared (first use in this function); did you mean ?IEEE80211_CHAN_2GHZ?? > 1142 | if (ets_band == IEEE80211_BAND_2GHZ) > | ^~~~~~~~~~~~~~~~~~~ > | IEEE80211_CHAN_2GHZ > > [...] > > /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/core.c:428:29: error: implicit declaration of function ?ieee80211_csa_is_complete?; did you mean ?ieee80211_scan_completed?? [-Werror=implicit-function-declaration] > 428 | if (ieee80211_csa_is_complete(uvif->vif)) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > | ieee80211_scan_completed > > Fixes: > - http://autobuild.buildroot.org/results/7cd7151e390b8f7a0df3e647fe4cd5d6319a830b > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Update package/Config.in Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sun Feb 26 19:44:27 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 20:44:27 +0100 Subject: [Buildroot] [PATCH v2,1/1] linux: fix CIP RT kernel on microblaze Message-ID: <20230226194427.979515-1-fontaine.fabrice@gmail.com> Fix the following build failure with CIP RT kernel on microblaze raised since bump to version 5.10.83-cip1-rt1 in commit b5778d7b76c098010a4abc339938f2694e8cf57f and https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?id=32ac92b5a39e2ef91308929bf5ed0804094b4183: arch/microblaze/mm/init.c:71:2: error: #endif without #if 71 | #endif /* CONFIG_HIGHMEM */ | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni): - Move patch to correct directory ...-arch-microblaze-mm-init.c-fix-build.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch diff --git a/linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch b/linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch new file mode 100644 index 0000000000..4760d9e4fb --- /dev/null +++ b/linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch @@ -0,0 +1,37 @@ +From 1fc03e1fdc8bb606d1c95e9fa557a9e5f6df17ec Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Feb 2023 17:26:56 +0100 +Subject: [PATCH] arch/microblaze/mm/init.c: fix build + +Fix the following build failure on microblaze raised since +https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/arch/microblaze/mm/init.c?h=v5.10.168-cip27-rt11&id=32ac92b5a39e2ef91308929bf5ed0804094b4183: + +arch/microblaze/mm/init.c:71:2: error: #endif without #if + 71 | #endif /* CONFIG_HIGHMEM */ + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to +Sebastian Andrzej Siewior ] +--- + arch/microblaze/mm/init.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c +index 1f4b5b34e600..a444778e59de 100644 +--- a/arch/microblaze/mm/init.c ++++ b/arch/microblaze/mm/init.c +@@ -49,6 +49,7 @@ unsigned long lowmem_size; + EXPORT_SYMBOL(min_low_pfn); + EXPORT_SYMBOL(max_low_pfn); + ++#ifdef CONFIG_HIGHMEM + static void __init highmem_init(void) + { + pr_debug("%x\n", (u32)PKMAP_BASE); +-- +2.39.1 + -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 19:53:15 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 20:53:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtty: fix openssl static build with -latomic Message-ID: <20230226195315.1184297-1-fontaine.fabrice@gmail.com> Fix the following openssl static build failure with -latomic raised since bump to version 8.1.0 in commit 7e608885a2df51ba77378f210f4c0e8cb59d5b8b: /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 Signed-off-by: Fabrice Fontaine --- ...keLists.txt-prefer-pkg_check_modules.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch diff --git a/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch new file mode 100644 index 0000000000..3714050445 --- /dev/null +++ b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch @@ -0,0 +1,40 @@ +From 565c003ac412c9b0fa39d208d4a911f4300477c3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 20:39:11 +0100 +Subject: [PATCH] CMakeLists.txt: prefer pkg_check_modules + +Prefer pkg_check_modules over find_package to avoid the following static +build failure with openssl and -latomic: + +/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': +ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' + +Fixes: + - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zhaojh329/ssl/pull/4] +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ssl/CMakeLists.txt b/src/ssl/CMakeLists.txt +index 4868bf7..36488c7 100644 +--- a/src/ssl/CMakeLists.txt ++++ b/src/ssl/CMakeLists.txt +@@ -14,10 +14,10 @@ endif() + + find_package(PkgConfig QUIET) + +-find_package(OpenSSL) ++pkg_check_modules(OPENSSL openssl) + + if (NOT OPENSSL_FOUND) +- pkg_check_modules(OPENSSL openssl) ++ find_package(OpenSSL) + endif() + + find_package(WolfSSL) +-- +2.39.1 + -- 2.39.1 From Alberto.Fahrenkrog at rigtechnologies.com.au Mon Feb 27 00:17:25 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Mon, 27 Feb 2023 00:17:25 +0000 Subject: [Buildroot] [Help] Building from a private PyPi server Message-ID: Hello all, In our company we have custom Python packages stored in a private PyPi server. To install them we simply add the --extra-index-url in our requirements.txt file when using pip. The packages are also available for manual download from the server, however all URLs to any .tar.gz file are in the form https://git.ourserver.com/packages/pypi/package-name/version-number/files/1234. This leads me to the following options (I think): * Try to get Buildroot to use the private PyPi server. I had a look at the "scanpypi" script and it generated the .mk and .in files for a regular PyPi package, but I could not find a way to tell scanpypi to use an extra url or private pypi address * Find a way, using wget, to download the package from the address above. Unfortunately I've had no luck with that yet. With the command: wget https://ourserver.com/-/packages/pypi/package-name/version_nr/files/5525 --header 'Authorization: token AUTH_TOKEN' --output-document=filename.tar.gz I was not able to get a correct tar.gz file. But that's more my problem than a Buildroot issue. * Download the file manually and have Buildroot use a local file. I will try that for the time being, although it seems the least automated possibility. If you guys have any other ideas I'd like to hear them. Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image497442.png Type: image/png Size: 14270 bytes Desc: image497442.png URL: From Alberto.Fahrenkrog at rigtechnologies.com.au Mon Feb 27 00:21:46 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Mon, 27 Feb 2023 00:21:46 +0000 Subject: [Buildroot] [Help] Building from a private PyPi server In-Reply-To: References: Message-ID: Apologies, Forgot to mention that I can also get a .whl file of the python package manually. Can Buildroot work with a .whl file? Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: buildroot on behalf of Alberto Fahrenkrog Sent: Monday, February 27, 2023 8:17 AM To: buildroot at buildroot.org Subject: [Buildroot] [Help] Building from a private PyPi server You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is important Hello all, In our company we have custom Python packages stored in a private PyPi server. To install them we simply add the --extra-index-url in our requirements.txt file when using pip. The packages are also available for manual download from the server, however all URLs to any .tar.gz file are in the form https://git.ourserver.com/packages/pypi/package-name/version-number/files/1234. This leads me to the following options (I think): * Try to get Buildroot to use the private PyPi server. I had a look at the "scanpypi" script and it generated the .mk and .in files for a regular PyPi package, but I could not find a way to tell scanpypi to use an extra url or private pypi address * Find a way, using wget, to download the package from the address above. Unfortunately I've had no luck with that yet. With the command: wget https://ourserver.com/-/packages/pypi/package-name/version_nr/files/5525 --header 'Authorization: token AUTH_TOKEN' --output-document=filename.tar.gz I was not able to get a correct tar.gz file. But that's more my problem than a Buildroot issue. * Download the file manually and have Buildroot use a local file. I will try that for the time being, although it seems the least automated possibility. If you guys have any other ideas I'd like to hear them. Cheers, Alberto [cid:image497442.png at 9FC6413F.5C1BC59F] Alberto? Fahrenkrog Senior Embedded Engineer Orica ? Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image497442.png Type: image/png Size: 14270 bytes Desc: image497442.png URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image695658.png Type: image/png Size: 14270 bytes Desc: image695658.png URL: From fido_max at inbox.ru Mon Feb 27 05:12:14 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Mon, 27 Feb 2023 08:12:14 +0300 Subject: [Buildroot] [PATCH 1/1] package/postgresql: add host-pkgconf dependency In-Reply-To: <20230225093527.16587-1-fontaine.fabrice@gmail.com> References: <20230225093527.16587-1-fontaine.fabrice@gmail.com> Message-ID: On 25.02.2023 12:35, Fabrice Fontaine wrote: > host-pkgconf is mandatory to find lz4 and zstd resulting in the > following build failure since commit > 9cd2e6e090449f9d2f371d24152580c038892f3d: > > configure: error: in `/home/autobuild/autobuild/instance-5/output-1/build/postgresql-15.2': > configure: error: The pkg-config script could not be found or is too old. Make sure it > is in your PATH or set the PKG_CONFIG environment variable to the full > path to pkg-config. > > Alternatively, you may set the environment variables LZ4_CFLAGS > and LZ4_LIBS to avoid the need to call pkg-config. > See the pkg-config man page for more details. > > Fixes: > - http://autobuild.buildroot.org/results/8744277ebe9910635ef8fe290c8ba4eee420b538 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov From giulio.benetti at benettiengineering.com Mon Feb 27 08:22:30 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 27 Feb 2023 09:22:30 +0100 Subject: [Buildroot] [PATCH] package/rtl8189es: fix build failure on PowerPC64 Message-ID: <20230227082230.429997-1-giulio.benetti@benettiengineering.com> Add local patches pending upstream[0] to fix conflict of get_ra(). get_ra() is present both in PowerPC64 Linux header and in rtl8189es driver so in the patch we rename all the occurences to rtl_get_ra(). Fixes: http://autobuild.buildroot.net/results/45efdb0806d0bb2f7d542be80ed02bf2dc080df4/ [0]: https://github.com/jwrdegoede/rtl8189ES_linux/pull/94 Signed-off-by: Giulio Benetti --- .../0001-Fix-build-failure-on-PowerPC64.patch | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch diff --git a/package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch b/package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch new file mode 100644 index 0000000000..8c876f16ee --- /dev/null +++ b/package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch @@ -0,0 +1,113 @@ +From c7bf7590bc0d7252005fd0496898ad420a85e1ae Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 27 Feb 2023 09:12:39 +0100 +Subject: [PATCH] Fix build failure on PowerPC64 + +get_ra() is defined in Linux kernel for PowerPC64 architecture and it +conflicts with local get_ra() definition so let's rename local definition +as rtl_get_ra(). + +Signed-off-by: Giulio Benetti +--- + core/rtw_odm.c | 6 +++--- + core/rtw_recv.c | 4 ++-- + hal/hal_com.c | 2 +- + include/wifi.h | 2 +- + os_dep/linux/ioctl_cfg80211.c | 2 +- + 5 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/core/rtw_odm.c b/core/rtw_odm.c +index 8a35816..d74e134 100644 +--- a/core/rtw_odm.c ++++ b/core/rtw_odm.c +@@ -273,7 +273,7 @@ void rtw_odm_parse_rx_phy_status_chinfo(union recv_frame *rframe, u8 *phys) + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u)\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t0->band, phys_t0->channel, phys_t0->rxsc + ); +@@ -383,7 +383,7 @@ type1_end: + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, rf_mode:%u, l_rxsc:%u, ht_rxsc:%u) => %u,%u\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t1->band, phys_t1->channel, phys_t1->rf_mode, phys_t1->l_rxsc, phys_t1->ht_rxsc + , pkt_cch, pkt_bw +@@ -401,7 +401,7 @@ type1_end: + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u, ht_rxsc:%u)\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t2->band, phys_t2->channel, phys_t2->l_rxsc, phys_t2->ht_rxsc + ); +diff --git a/core/rtw_recv.c b/core/rtw_recv.c +index dc65adf..a5a65f9 100644 +--- a/core/rtw_recv.c ++++ b/core/rtw_recv.c +@@ -4678,7 +4678,7 @@ void rx_query_phy_status( + wlanhdr = get_recvframe_data(precvframe); + + ta = get_ta(wlanhdr); +- ra = get_ra(wlanhdr); ++ ra = rtl_get_ra(wlanhdr); + is_ra_bmc = IS_MCAST(ra); + + if (_rtw_memcmp(adapter_mac_addr(padapter), ta, ETH_ALEN) == _TRUE) { +@@ -4818,7 +4818,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status) + { + s32 ret = _SUCCESS; + u8 *pbuf = precvframe->u.hdr.rx_data; +- u8 *pda = get_ra(pbuf); ++ u8 *pda = rtl_get_ra(pbuf); + u8 ra_is_bmc = IS_MCAST(pda); + _adapter *primary_padapter = precvframe->u.hdr.adapter; + #ifdef CONFIG_CONCURRENT_MODE +diff --git a/hal/hal_com.c b/hal/hal_com.c +index c28ae39..27b0825 100644 +--- a/hal/hal_com.c ++++ b/hal/hal_com.c +@@ -13406,7 +13406,7 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe) + + /*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __FUNCTION__);*/ + if (psta) { +- if (IS_MCAST(get_ra(get_recvframe_data(prframe)))) ++ if (IS_MCAST(rtl_get_ra(get_recvframe_data(prframe)))) + psta_dframe_info = &psta->sta_dframe_info_bmc; + else + psta_dframe_info = &psta->sta_dframe_info; +diff --git a/include/wifi.h b/include/wifi.h +index def77a4..c2e7afb 100644 +--- a/include/wifi.h ++++ b/include/wifi.h +@@ -456,7 +456,7 @@ __inline static int IS_MCAST(const u8 *da) + return _FALSE; + } + +-__inline static unsigned char *get_ra(unsigned char *pframe) ++__inline static unsigned char *rtl_get_ra(unsigned char *pframe) + { + unsigned char *ra; + ra = GetAddr1Ptr(pframe); +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index 4e810e5..e744d69 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -6347,7 +6347,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *adapter, union recv_frame *rfra + indicate: + #endif + #if defined(RTW_DEDICATED_P2P_DEVICE) +- if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), get_ra(frame), &wdev)) ++ if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), rtl_get_ra(frame), &wdev)) + if (0) + RTW_INFO("redirect to pd_wdev:%p\n", wdev); + #endif +-- +2.34.1 + -- 2.34.1 From frank.vanbever at mind.be Mon Feb 20 14:57:47 2023 From: frank.vanbever at mind.be (Frank Vanbever) Date: Mon, 20 Feb 2023 15:57:47 +0100 Subject: [Buildroot] [PATCH 2022.11.x 1/1] package/libmodsecurity: fix CVE-2022-48279 Message-ID: <20230220145747.53482-1-frank.vanbever@mind.be> In ModSecurity before 2.9.6 and 3.x before 3.0.8, HTTP multipart requests were incorrectly parsed and could bypass the Web Application Firewall. NOTE: this is related to CVE-2022-39956 but can be considered independent changes to the ModSecurity (C language) codebase. Signed-off-by: Frank Vanbever --- ...g-fixes-and-new-MULTIPART_PART_HEADE.patch | 19602 ++++++++++++++++ package/libmodsecurity/libmodsecurity.mk | 3 + 2 files changed, 19605 insertions(+) create mode 100644 package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch diff --git a/package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch b/package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch new file mode 100644 index 0000000000..ebecea983e --- /dev/null +++ b/package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch @@ -0,0 +1,19602 @@ +From 1abda9e196ff9db978efba3ad770f9a74ae00444 Mon Sep 17 00:00:00 2001 +From: Martin Vierula +Date: Wed, 7 Sep 2022 06:29:20 -0700 +Subject: [PATCH] Multipart parsing fixes and new MULTIPART_PART_HEADERS + collection + +Signed-off-by: Frank Vanbever +--- + CHANGES | 5 + + Makefile.am | 1 + + headers/modsecurity/transaction.h | 2 + + src/parser/seclang-parser.cc | 3226 +++---- + src/parser/seclang-parser.hh | 1342 +-- + src/parser/seclang-parser.yy | 14 + + src/parser/seclang-scanner.cc | 7767 +++++++++-------- + src/parser/seclang-scanner.ll | 3 + + src/request_body_processor/multipart.cc | 205 +- + src/request_body_processor/multipart.h | 20 + + src/variables/multipart_part_headers.h | 40 + + test/cppcheck_suppressions.txt | 2 +- + .../variable-MULTIPART_PART_HEADERS.json | 166 + + 13 files changed, 6606 insertions(+), 6187 deletions(-) + create mode 100644 src/variables/multipart_part_headers.h + create mode 100644 test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json + +diff --git a/CHANGES b/CHANGES +index 2f9cec67..94dcc218 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -1,3 +1,8 @@ ++v3.0.8 backports ++-------------------- ++ - Multipart parsing fixes and new MULTIPART_PART_HEADERS collection ++ [Issue #2795 - @terjanq, @martinhsv] ++ + v3.0.7 - 2022-May-30 + -------------------- + +diff --git a/Makefile.am b/Makefile.am +index 93c3de01..17eb62b0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -225,6 +225,7 @@ TESTS+=test/test-cases/regression/variable-MULTIPART_CRLF_LF_LINES.json + TESTS+=test/test-cases/regression/variable-MULTIPART_FILENAME.json + TESTS+=test/test-cases/regression/variable-MULTIPART_INVALID_HEADER_FOLDING.json + TESTS+=test/test-cases/regression/variable-MULTIPART_NAME.json ++TESTS+=test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json + TESTS+=test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json + TESTS+=test/test-cases/regression/variable-MULTIPART_UNMATCHED_BOUNDARY.json + TESTS+=test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json +diff --git a/headers/modsecurity/transaction.h b/headers/modsecurity/transaction.h +index 194b544c..4244ddd3 100644 +--- a/headers/modsecurity/transaction.h ++++ b/headers/modsecurity/transaction.h +@@ -201,6 +201,7 @@ class TransactionAnchoredVariables { + m_variableGeo(t, "GEO"), + m_variableRequestCookiesNames(t, "REQUEST_COOKIES_NAMES"), + m_variableFilesTmpNames(t, "FILES_TMPNAMES"), ++ m_variableMultipartPartHeaders(t, "MULTIPART_PART_HEADERS"), + m_variableOffset(0), + m_variableArgsNames("ARGS_NAMES", &m_variableArgs), + m_variableArgsGetNames("ARGS_GET_NAMES", &m_variableArgsGet), +@@ -282,6 +283,7 @@ class TransactionAnchoredVariables { + AnchoredSetVariable m_variableGeo; + AnchoredSetVariable m_variableRequestCookiesNames; + AnchoredSetVariable m_variableFilesTmpNames; ++ AnchoredSetVariable m_variableMultipartPartHeaders; + + int m_variableOffset; + +diff --git a/src/parser/seclang-parser.cc b/src/parser/seclang-parser.cc +index 98af1904..c8423b36 100644 +--- a/src/parser/seclang-parser.cc ++++ b/src/parser/seclang-parser.cc +@@ -42,7 +42,7 @@ + + + // Unqualified %code blocks. +-#line 326 "seclang-parser.yy" ++#line 327 "seclang-parser.yy" + + #include "src/parser/driver.h" + +@@ -1318,7 +1318,7 @@ namespace yy { + + + // User initialization code. +-#line 319 "seclang-parser.yy" ++#line 320 "seclang-parser.yy" + { + // Initialize the initial location. + yyla.location.begin.filename = yyla.location.end.filename = new std::string(driver.file); +@@ -1690,7 +1690,7 @@ namespace yy { + switch (yyn) + { + case 2: // input: "end of file" +-#line 713 "seclang-parser.yy" ++#line 715 "seclang-parser.yy" + { + return 0; + } +@@ -1698,7 +1698,7 @@ namespace yy { + break; + + case 6: // audit_log: "CONFIG_DIR_AUDIT_DIR_MOD" +-#line 726 "seclang-parser.yy" ++#line 728 "seclang-parser.yy" + { + driver.m_auditLog->setStorageDirMode(strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 8)); + } +@@ -1706,7 +1706,7 @@ namespace yy { + break; + + case 7: // audit_log: "CONFIG_DIR_AUDIT_DIR" +-#line 732 "seclang-parser.yy" ++#line 734 "seclang-parser.yy" + { + driver.m_auditLog->setStorageDir(yystack_[0].value.as < std::string > ()); + } +@@ -1714,7 +1714,7 @@ namespace yy { + break; + + case 8: // audit_log: "CONFIG_DIR_AUDIT_ENG" "CONFIG_VALUE_RELEVANT_ONLY" +-#line 738 "seclang-parser.yy" ++#line 740 "seclang-parser.yy" + { + driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::RelevantOnlyAuditLogStatus); + } +@@ -1722,7 +1722,7 @@ namespace yy { + break; + + case 9: // audit_log: "CONFIG_DIR_AUDIT_ENG" "CONFIG_VALUE_OFF" +-#line 742 "seclang-parser.yy" ++#line 744 "seclang-parser.yy" + { + driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::OffAuditLogStatus); + } +@@ -1730,7 +1730,7 @@ namespace yy { + break; + + case 10: // audit_log: "CONFIG_DIR_AUDIT_ENG" "CONFIG_VALUE_ON" +-#line 746 "seclang-parser.yy" ++#line 748 "seclang-parser.yy" + { + driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::OnAuditLogStatus); + } +@@ -1738,7 +1738,7 @@ namespace yy { + break; + + case 11: // audit_log: "CONFIG_DIR_AUDIT_FLE_MOD" +-#line 752 "seclang-parser.yy" ++#line 754 "seclang-parser.yy" + { + driver.m_auditLog->setFileMode(strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 8)); + } +@@ -1746,7 +1746,7 @@ namespace yy { + break; + + case 12: // audit_log: "CONFIG_DIR_AUDIT_LOG2" +-#line 758 "seclang-parser.yy" ++#line 760 "seclang-parser.yy" + { + driver.m_auditLog->setFilePath2(yystack_[0].value.as < std::string > ()); + } +@@ -1754,7 +1754,7 @@ namespace yy { + break; + + case 13: // audit_log: "CONFIG_DIR_AUDIT_LOG_P" +-#line 764 "seclang-parser.yy" ++#line 766 "seclang-parser.yy" + { + driver.m_auditLog->setParts(yystack_[0].value.as < std::string > ()); + } +@@ -1762,7 +1762,7 @@ namespace yy { + break; + + case 14: // audit_log: "CONFIG_DIR_AUDIT_LOG" +-#line 770 "seclang-parser.yy" ++#line 772 "seclang-parser.yy" + { + driver.m_auditLog->setFilePath1(yystack_[0].value.as < std::string > ()); + } +@@ -1770,7 +1770,7 @@ namespace yy { + break; + + case 15: // audit_log: CONFIG_DIR_AUDIT_LOG_FMT JSON +-#line 775 "seclang-parser.yy" ++#line 777 "seclang-parser.yy" + { + driver.m_auditLog->setFormat(modsecurity::audit_log::AuditLog::JSONAuditLogFormat); + } +@@ -1778,7 +1778,7 @@ namespace yy { + break; + + case 16: // audit_log: CONFIG_DIR_AUDIT_LOG_FMT NATIVE +-#line 780 "seclang-parser.yy" ++#line 782 "seclang-parser.yy" + { + driver.m_auditLog->setFormat(modsecurity::audit_log::AuditLog::NativeAuditLogFormat); + } +@@ -1786,7 +1786,7 @@ namespace yy { + break; + + case 17: // audit_log: "CONFIG_DIR_AUDIT_STS" +-#line 786 "seclang-parser.yy" ++#line 788 "seclang-parser.yy" + { + std::string relevant_status(yystack_[0].value.as < std::string > ()); + driver.m_auditLog->setRelevantStatus(relevant_status); +@@ -1795,7 +1795,7 @@ namespace yy { + break; + + case 18: // audit_log: "CONFIG_DIR_AUDIT_TPE" "CONFIG_VALUE_SERIAL" +-#line 793 "seclang-parser.yy" ++#line 795 "seclang-parser.yy" + { + driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::SerialAuditLogType); + } +@@ -1803,7 +1803,7 @@ namespace yy { + break; + + case 19: // audit_log: "CONFIG_DIR_AUDIT_TPE" "CONFIG_VALUE_PARALLEL" +-#line 797 "seclang-parser.yy" ++#line 799 "seclang-parser.yy" + { + driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::ParallelAuditLogType); + } +@@ -1811,7 +1811,7 @@ namespace yy { + break; + + case 20: // audit_log: "CONFIG_DIR_AUDIT_TPE" "CONFIG_VALUE_HTTPS" +-#line 801 "seclang-parser.yy" ++#line 803 "seclang-parser.yy" + { + driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::HttpsAuditLogType); + } +@@ -1819,7 +1819,7 @@ namespace yy { + break; + + case 21: // audit_log: "CONFIG_UPDLOAD_KEEP_FILES" "CONFIG_VALUE_ON" +-#line 807 "seclang-parser.yy" ++#line 809 "seclang-parser.yy" + { + driver.m_uploadKeepFiles = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -1827,7 +1827,7 @@ namespace yy { + break; + + case 22: // audit_log: "CONFIG_UPDLOAD_KEEP_FILES" "CONFIG_VALUE_OFF" +-#line 811 "seclang-parser.yy" ++#line 813 "seclang-parser.yy" + { + driver.m_uploadKeepFiles = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -1835,7 +1835,7 @@ namespace yy { + break; + + case 23: // audit_log: "CONFIG_UPDLOAD_KEEP_FILES" "CONFIG_VALUE_RELEVANT_ONLY" +-#line 815 "seclang-parser.yy" ++#line 817 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecUploadKeepFiles RelevantOnly is not currently supported. Accepted values are On or Off"); + YYERROR; +@@ -1844,7 +1844,7 @@ namespace yy { + break; + + case 24: // audit_log: "CONFIG_UPLOAD_FILE_LIMIT" +-#line 820 "seclang-parser.yy" ++#line 822 "seclang-parser.yy" + { + driver.m_uploadFileLimit.m_set = true; + driver.m_uploadFileLimit.m_value = strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 10); +@@ -1853,7 +1853,7 @@ namespace yy { + break; + + case 25: // audit_log: "CONFIG_UPLOAD_FILE_MODE" +-#line 825 "seclang-parser.yy" ++#line 827 "seclang-parser.yy" + { + driver.m_uploadFileMode.m_set = true; + driver.m_uploadFileMode.m_value = strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 8); +@@ -1862,7 +1862,7 @@ namespace yy { + break; + + case 26: // audit_log: "CONFIG_UPLOAD_DIR" +-#line 830 "seclang-parser.yy" ++#line 832 "seclang-parser.yy" + { + driver.m_uploadDirectory.m_set = true; + driver.m_uploadDirectory.m_value = yystack_[0].value.as < std::string > (); +@@ -1871,7 +1871,7 @@ namespace yy { + break; + + case 27: // audit_log: "CONFIG_UPDLOAD_SAVE_TMP_FILES" "CONFIG_VALUE_ON" +-#line 835 "seclang-parser.yy" ++#line 837 "seclang-parser.yy" + { + driver.m_tmpSaveUploadedFiles = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -1879,7 +1879,7 @@ namespace yy { + break; + + case 28: // audit_log: "CONFIG_UPDLOAD_SAVE_TMP_FILES" "CONFIG_VALUE_OFF" +-#line 839 "seclang-parser.yy" ++#line 841 "seclang-parser.yy" + { + driver.m_tmpSaveUploadedFiles = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -1887,7 +1887,7 @@ namespace yy { + break; + + case 29: // actions: "QUOTATION_MARK" actions_may_quoted "QUOTATION_MARK" +-#line 846 "seclang-parser.yy" ++#line 848 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[1].value.as < std::unique_ptr > > > ()); + } +@@ -1895,7 +1895,7 @@ namespace yy { + break; + + case 30: // actions: actions_may_quoted +-#line 850 "seclang-parser.yy" ++#line 852 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[0].value.as < std::unique_ptr > > > ()); + } +@@ -1903,7 +1903,7 @@ namespace yy { + break; + + case 31: // actions_may_quoted: actions_may_quoted "," act +-#line 857 "seclang-parser.yy" ++#line 859 "seclang-parser.yy" + { + ACTION_INIT(yystack_[0].value.as < std::unique_ptr > (), yystack_[3].location) + yystack_[2].value.as < std::unique_ptr > > > ()->push_back(std::move(yystack_[0].value.as < std::unique_ptr > ())); +@@ -1913,7 +1913,7 @@ namespace yy { + break; + + case 32: // actions_may_quoted: act +-#line 863 "seclang-parser.yy" ++#line 865 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + ACTION_INIT(yystack_[0].value.as < std::unique_ptr > (), yystack_[1].location) +@@ -1924,7 +1924,7 @@ namespace yy { + break; + + case 33: // op: op_before_init +-#line 873 "seclang-parser.yy" ++#line 875 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[0].value.as < std::unique_ptr > ()); + std::string error; +@@ -1937,7 +1937,7 @@ namespace yy { + break; + + case 34: // op: "NOT" op_before_init +-#line 882 "seclang-parser.yy" ++#line 884 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[0].value.as < std::unique_ptr > ()); + yylhs.value.as < std::unique_ptr > ()->m_negation = true; +@@ -1951,7 +1951,7 @@ namespace yy { + break; + + case 35: // op: run_time_string +-#line 892 "seclang-parser.yy" ++#line 894 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + std::string error; +@@ -1964,7 +1964,7 @@ namespace yy { + break; + + case 36: // op: "NOT" run_time_string +-#line 901 "seclang-parser.yy" ++#line 903 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + yylhs.value.as < std::unique_ptr > ()->m_negation = true; +@@ -1978,7 +1978,7 @@ namespace yy { + break; + + case 37: // op_before_init: "OPERATOR_UNCONDITIONAL_MATCH" +-#line 914 "seclang-parser.yy" ++#line 916 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::UnconditionalMatch()); + } +@@ -1986,7 +1986,7 @@ namespace yy { + break; + + case 38: // op_before_init: "OPERATOR_DETECT_SQLI" +-#line 918 "seclang-parser.yy" ++#line 920 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::DetectSQLi()); + } +@@ -1994,7 +1994,7 @@ namespace yy { + break; + + case 39: // op_before_init: "OPERATOR_DETECT_XSS" +-#line 922 "seclang-parser.yy" ++#line 924 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::DetectXSS()); + } +@@ -2002,7 +2002,7 @@ namespace yy { + break; + + case 40: // op_before_init: "OPERATOR_VALIDATE_URL_ENCODING" +-#line 926 "seclang-parser.yy" ++#line 928 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateUrlEncoding()); + } +@@ -2010,7 +2010,7 @@ namespace yy { + break; + + case 41: // op_before_init: "OPERATOR_VALIDATE_UTF8_ENCODING" +-#line 930 "seclang-parser.yy" ++#line 932 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateUtf8Encoding()); + } +@@ -2018,7 +2018,7 @@ namespace yy { + break; + + case 42: // op_before_init: "OPERATOR_INSPECT_FILE" run_time_string +-#line 934 "seclang-parser.yy" ++#line 936 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::InspectFile(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2026,7 +2026,7 @@ namespace yy { + break; + + case 43: // op_before_init: "OPERATOR_FUZZY_HASH" run_time_string +-#line 938 "seclang-parser.yy" ++#line 940 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::FuzzyHash(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2034,7 +2034,7 @@ namespace yy { + break; + + case 44: // op_before_init: "OPERATOR_VALIDATE_BYTE_RANGE" run_time_string +-#line 942 "seclang-parser.yy" ++#line 944 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateByteRange(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2042,7 +2042,7 @@ namespace yy { + break; + + case 45: // op_before_init: "OPERATOR_VALIDATE_DTD" run_time_string +-#line 946 "seclang-parser.yy" ++#line 948 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateDTD(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2050,7 +2050,7 @@ namespace yy { + break; + + case 46: // op_before_init: "OPERATOR_VALIDATE_HASH" run_time_string +-#line 950 "seclang-parser.yy" ++#line 952 "seclang-parser.yy" + { + /* $$ = new operators::ValidateHash($1); */ + OPERATOR_NOT_SUPPORTED("ValidateHash", yystack_[2].location); +@@ -2059,7 +2059,7 @@ namespace yy { + break; + + case 47: // op_before_init: "OPERATOR_VALIDATE_SCHEMA" run_time_string +-#line 955 "seclang-parser.yy" ++#line 957 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateSchema(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2067,7 +2067,7 @@ namespace yy { + break; + + case 48: // op_before_init: "OPERATOR_VERIFY_CC" run_time_string +-#line 959 "seclang-parser.yy" ++#line 961 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifyCC(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2075,7 +2075,7 @@ namespace yy { + break; + + case 49: // op_before_init: "OPERATOR_VERIFY_CPF" run_time_string +-#line 963 "seclang-parser.yy" ++#line 965 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifyCPF(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2083,7 +2083,7 @@ namespace yy { + break; + + case 50: // op_before_init: "OPERATOR_VERIFY_SSN" run_time_string +-#line 967 "seclang-parser.yy" ++#line 969 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifySSN(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2091,7 +2091,7 @@ namespace yy { + break; + + case 51: // op_before_init: "OPERATOR_VERIFY_SVNR" run_time_string +-#line 971 "seclang-parser.yy" ++#line 973 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifySVNR(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2099,7 +2099,7 @@ namespace yy { + break; + + case 52: // op_before_init: "OPERATOR_GSB_LOOKUP" run_time_string +-#line 975 "seclang-parser.yy" ++#line 977 "seclang-parser.yy" + { + /* $$ = new operators::GsbLookup($1); */ + OPERATOR_NOT_SUPPORTED("GsbLookup", yystack_[2].location); +@@ -2108,7 +2108,7 @@ namespace yy { + break; + + case 53: // op_before_init: "OPERATOR_RSUB" run_time_string +-#line 980 "seclang-parser.yy" ++#line 982 "seclang-parser.yy" + { + /* $$ = new operators::Rsub($1); */ + OPERATOR_NOT_SUPPORTED("Rsub", yystack_[2].location); +@@ -2117,7 +2117,7 @@ namespace yy { + break; + + case 54: // op_before_init: "OPERATOR_WITHIN" run_time_string +-#line 985 "seclang-parser.yy" ++#line 987 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Within(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2125,7 +2125,7 @@ namespace yy { + break; + + case 55: // op_before_init: "OPERATOR_CONTAINS_WORD" run_time_string +-#line 989 "seclang-parser.yy" ++#line 991 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ContainsWord(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2133,7 +2133,7 @@ namespace yy { + break; + + case 56: // op_before_init: "OPERATOR_CONTAINS" run_time_string +-#line 993 "seclang-parser.yy" ++#line 995 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Contains(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2141,7 +2141,7 @@ namespace yy { + break; + + case 57: // op_before_init: "OPERATOR_ENDS_WITH" run_time_string +-#line 997 "seclang-parser.yy" ++#line 999 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::EndsWith(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2149,7 +2149,7 @@ namespace yy { + break; + + case 58: // op_before_init: "OPERATOR_EQ" run_time_string +-#line 1001 "seclang-parser.yy" ++#line 1003 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Eq(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2157,7 +2157,7 @@ namespace yy { + break; + + case 59: // op_before_init: "OPERATOR_GE" run_time_string +-#line 1005 "seclang-parser.yy" ++#line 1007 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Ge(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2165,7 +2165,7 @@ namespace yy { + break; + + case 60: // op_before_init: "OPERATOR_GT" run_time_string +-#line 1009 "seclang-parser.yy" ++#line 1011 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Gt(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2173,7 +2173,7 @@ namespace yy { + break; + + case 61: // op_before_init: "OPERATOR_IP_MATCH_FROM_FILE" run_time_string +-#line 1013 "seclang-parser.yy" ++#line 1015 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::IpMatchF(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2181,7 +2181,7 @@ namespace yy { + break; + + case 62: // op_before_init: "OPERATOR_IP_MATCH" run_time_string +-#line 1017 "seclang-parser.yy" ++#line 1019 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::IpMatch(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2189,7 +2189,7 @@ namespace yy { + break; + + case 63: // op_before_init: "OPERATOR_LE" run_time_string +-#line 1021 "seclang-parser.yy" ++#line 1023 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Le(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2197,7 +2197,7 @@ namespace yy { + break; + + case 64: // op_before_init: "OPERATOR_LT" run_time_string +-#line 1025 "seclang-parser.yy" ++#line 1027 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Lt(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2205,7 +2205,7 @@ namespace yy { + break; + + case 65: // op_before_init: "OPERATOR_PM_FROM_FILE" run_time_string +-#line 1029 "seclang-parser.yy" ++#line 1031 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::PmFromFile(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2213,7 +2213,7 @@ namespace yy { + break; + + case 66: // op_before_init: "OPERATOR_PM" run_time_string +-#line 1033 "seclang-parser.yy" ++#line 1035 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Pm(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2221,7 +2221,7 @@ namespace yy { + break; + + case 67: // op_before_init: "OPERATOR_RBL" run_time_string +-#line 1037 "seclang-parser.yy" ++#line 1039 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rbl(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2229,7 +2229,7 @@ namespace yy { + break; + + case 68: // op_before_init: "OPERATOR_RX" run_time_string +-#line 1041 "seclang-parser.yy" ++#line 1043 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2237,7 +2237,7 @@ namespace yy { + break; + + case 69: // op_before_init: "OPERATOR_RX_GLOBAL" run_time_string +-#line 1045 "seclang-parser.yy" ++#line 1047 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::RxGlobal(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2245,7 +2245,7 @@ namespace yy { + break; + + case 70: // op_before_init: "OPERATOR_STR_EQ" run_time_string +-#line 1049 "seclang-parser.yy" ++#line 1051 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::StrEq(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2253,7 +2253,7 @@ namespace yy { + break; + + case 71: // op_before_init: "OPERATOR_STR_MATCH" run_time_string +-#line 1053 "seclang-parser.yy" ++#line 1055 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::StrMatch(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2261,7 +2261,7 @@ namespace yy { + break; + + case 72: // op_before_init: "OPERATOR_BEGINS_WITH" run_time_string +-#line 1057 "seclang-parser.yy" ++#line 1059 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::BeginsWith(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2269,7 +2269,7 @@ namespace yy { + break; + + case 73: // op_before_init: "OPERATOR_GEOLOOKUP" +-#line 1061 "seclang-parser.yy" ++#line 1063 "seclang-parser.yy" + { + #if defined(WITH_GEOIP) or defined(WITH_MAXMIND) + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::GeoLookup()); +@@ -2284,7 +2284,7 @@ namespace yy { + break; + + case 75: // expression: "DIRECTIVE" variables op actions +-#line 1076 "seclang-parser.yy" ++#line 1078 "seclang-parser.yy" + { + std::vector *a = new std::vector(); + std::vector *t = new std::vector(); +@@ -2318,7 +2318,7 @@ namespace yy { + break; + + case 76: // expression: "DIRECTIVE" variables op +-#line 1106 "seclang-parser.yy" ++#line 1108 "seclang-parser.yy" + { + variables::Variables *v = new variables::Variables(); + for (auto &i : *yystack_[1].value.as < std::unique_ptr > > > ().get()) { +@@ -2341,7 +2341,7 @@ namespace yy { + break; + + case 77: // expression: "CONFIG_DIR_SEC_ACTION" actions +-#line 1125 "seclang-parser.yy" ++#line 1127 "seclang-parser.yy" + { + std::vector *a = new std::vector(); + std::vector *t = new std::vector(); +@@ -2364,7 +2364,7 @@ namespace yy { + break; + + case 78: // expression: "DIRECTIVE_SECRULESCRIPT" actions +-#line 1144 "seclang-parser.yy" ++#line 1146 "seclang-parser.yy" + { + std::string err; + std::vector *a = new std::vector(); +@@ -2396,7 +2396,7 @@ namespace yy { + break; + + case 79: // expression: "CONFIG_DIR_SEC_DEFAULT_ACTION" actions +-#line 1172 "seclang-parser.yy" ++#line 1174 "seclang-parser.yy" + { + bool hasDisruptive = false; + std::vector *actions = new std::vector(); +@@ -2457,7 +2457,7 @@ namespace yy { + break; + + case 80: // expression: "CONFIG_DIR_SEC_MARKER" +-#line 1229 "seclang-parser.yy" ++#line 1231 "seclang-parser.yy" + { + driver.addSecMarker(modsecurity::utils::string::removeBracketsIfNeeded(yystack_[0].value.as < std::string > ()), + /* file name */ std::unique_ptr(new std::string(*yystack_[0].location.end.filename)), +@@ -2468,7 +2468,7 @@ namespace yy { + break; + + case 81: // expression: "CONFIG_DIR_RULE_ENG" "CONFIG_VALUE_OFF" +-#line 1236 "seclang-parser.yy" ++#line 1238 "seclang-parser.yy" + { + driver.m_secRuleEngine = modsecurity::RulesSet::DisabledRuleEngine; + } +@@ -2476,7 +2476,7 @@ namespace yy { + break; + + case 82: // expression: "CONFIG_DIR_RULE_ENG" "CONFIG_VALUE_ON" +-#line 1240 "seclang-parser.yy" ++#line 1242 "seclang-parser.yy" + { + driver.m_secRuleEngine = modsecurity::RulesSet::EnabledRuleEngine; + } +@@ -2484,7 +2484,7 @@ namespace yy { + break; + + case 83: // expression: "CONFIG_DIR_RULE_ENG" "CONFIG_VALUE_DETC" +-#line 1244 "seclang-parser.yy" ++#line 1246 "seclang-parser.yy" + { + driver.m_secRuleEngine = modsecurity::RulesSet::DetectionOnlyRuleEngine; + } +@@ -2492,7 +2492,7 @@ namespace yy { + break; + + case 84: // expression: "CONFIG_DIR_REQ_BODY" "CONFIG_VALUE_ON" +-#line 1248 "seclang-parser.yy" ++#line 1250 "seclang-parser.yy" + { + driver.m_secRequestBodyAccess = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -2500,7 +2500,7 @@ namespace yy { + break; + + case 85: // expression: "CONFIG_DIR_REQ_BODY" "CONFIG_VALUE_OFF" +-#line 1252 "seclang-parser.yy" ++#line 1254 "seclang-parser.yy" + { + driver.m_secRequestBodyAccess = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -2508,7 +2508,7 @@ namespace yy { + break; + + case 86: // expression: "CONFIG_DIR_RES_BODY" "CONFIG_VALUE_ON" +-#line 1256 "seclang-parser.yy" ++#line 1258 "seclang-parser.yy" + { + driver.m_secResponseBodyAccess = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -2516,7 +2516,7 @@ namespace yy { + break; + + case 87: // expression: "CONFIG_DIR_RES_BODY" "CONFIG_VALUE_OFF" +-#line 1260 "seclang-parser.yy" ++#line 1262 "seclang-parser.yy" + { + driver.m_secResponseBodyAccess = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -2524,7 +2524,7 @@ namespace yy { + break; + + case 88: // expression: "CONFIG_SEC_ARGUMENT_SEPARATOR" +-#line 1264 "seclang-parser.yy" ++#line 1266 "seclang-parser.yy" + { + if (yystack_[0].value.as < std::string > ().length() != 1) { + driver.error(yystack_[1].location, "Argument separator should be set to a single character."); +@@ -2537,7 +2537,7 @@ namespace yy { + break; + + case 89: // expression: "CONFIG_COMPONENT_SIG" +-#line 1273 "seclang-parser.yy" ++#line 1275 "seclang-parser.yy" + { + driver.m_components.push_back(yystack_[0].value.as < std::string > ()); + } +@@ -2545,7 +2545,7 @@ namespace yy { + break; + + case 90: // expression: "CONFIG_CONN_ENGINE" "CONFIG_VALUE_ON" +-#line 1277 "seclang-parser.yy" ++#line 1279 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecConnEngine is not yet supported."); + YYERROR; +@@ -2554,14 +2554,14 @@ namespace yy { + break; + + case 91: // expression: "CONFIG_CONN_ENGINE" "CONFIG_VALUE_OFF" +-#line 1282 "seclang-parser.yy" ++#line 1284 "seclang-parser.yy" + { + } + #line 2561 "seclang-parser.cc" + break; + + case 92: // expression: "CONFIG_SEC_WEB_APP_ID" +-#line 1285 "seclang-parser.yy" ++#line 1287 "seclang-parser.yy" + { + driver.m_secWebAppId.m_value = yystack_[0].value.as < std::string > (); + driver.m_secWebAppId.m_set = true; +@@ -2570,7 +2570,7 @@ namespace yy { + break; + + case 93: // expression: "CONFIG_SEC_SERVER_SIG" +-#line 1290 "seclang-parser.yy" ++#line 1292 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecServerSignature is not supported."); + YYERROR; +@@ -2579,7 +2579,7 @@ namespace yy { + break; + + case 94: // expression: "CONFIG_SEC_CACHE_TRANSFORMATIONS" +-#line 1295 "seclang-parser.yy" ++#line 1297 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecCacheTransformations is not supported."); + YYERROR; +@@ -2588,7 +2588,7 @@ namespace yy { + break; + + case 95: // expression: "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" "CONFIG_VALUE_ON" +-#line 1300 "seclang-parser.yy" ++#line 1302 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecDisableBackendCompression is not supported."); + YYERROR; +@@ -2597,14 +2597,14 @@ namespace yy { + break; + + case 96: // expression: "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" "CONFIG_VALUE_OFF" +-#line 1305 "seclang-parser.yy" ++#line 1307 "seclang-parser.yy" + { + } + #line 2604 "seclang-parser.cc" + break; + + case 97: // expression: "CONFIG_CONTENT_INJECTION" "CONFIG_VALUE_ON" +-#line 1308 "seclang-parser.yy" ++#line 1310 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecContentInjection is not yet supported."); + YYERROR; +@@ -2613,14 +2613,14 @@ namespace yy { + break; + + case 98: // expression: "CONFIG_CONTENT_INJECTION" "CONFIG_VALUE_OFF" +-#line 1313 "seclang-parser.yy" ++#line 1315 "seclang-parser.yy" + { + } + #line 2620 "seclang-parser.cc" + break; + + case 99: // expression: "CONFIG_SEC_CHROOT_DIR" +-#line 1316 "seclang-parser.yy" ++#line 1318 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecChrootDir is not supported."); + YYERROR; +@@ -2629,7 +2629,7 @@ namespace yy { + break; + + case 100: // expression: "CONFIG_SEC_HASH_ENGINE" "CONFIG_VALUE_ON" +-#line 1321 "seclang-parser.yy" ++#line 1323 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecHashEngine is not yet supported."); + YYERROR; +@@ -2638,14 +2638,14 @@ namespace yy { + break; + + case 101: // expression: "CONFIG_SEC_HASH_ENGINE" "CONFIG_VALUE_OFF" +-#line 1326 "seclang-parser.yy" ++#line 1328 "seclang-parser.yy" + { + } + #line 2645 "seclang-parser.cc" + break; + + case 102: // expression: "CONFIG_SEC_HASH_KEY" +-#line 1329 "seclang-parser.yy" ++#line 1331 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashKey is not yet supported."); + YYERROR; +@@ -2654,7 +2654,7 @@ namespace yy { + break; + + case 103: // expression: "CONFIG_SEC_HASH_PARAM" +-#line 1334 "seclang-parser.yy" ++#line 1336 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashParam is not yet supported."); + YYERROR; +@@ -2663,7 +2663,7 @@ namespace yy { + break; + + case 104: // expression: "CONFIG_SEC_HASH_METHOD_RX" +-#line 1339 "seclang-parser.yy" ++#line 1341 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashMethodRx is not yet supported."); + YYERROR; +@@ -2672,7 +2672,7 @@ namespace yy { + break; + + case 105: // expression: "CONFIG_SEC_HASH_METHOD_PM" +-#line 1344 "seclang-parser.yy" ++#line 1346 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashMethodPm is not yet supported."); + YYERROR; +@@ -2681,7 +2681,7 @@ namespace yy { + break; + + case 106: // expression: "CONFIG_DIR_GSB_DB" +-#line 1349 "seclang-parser.yy" ++#line 1351 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecGsbLookupDb is not supported."); + YYERROR; +@@ -2690,7 +2690,7 @@ namespace yy { + break; + + case 107: // expression: "CONFIG_SEC_GUARDIAN_LOG" +-#line 1354 "seclang-parser.yy" ++#line 1356 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecGuardianLog is not supported."); + YYERROR; +@@ -2699,7 +2699,7 @@ namespace yy { + break; + + case 108: // expression: "CONFIG_SEC_INTERCEPT_ON_ERROR" "CONFIG_VALUE_ON" +-#line 1359 "seclang-parser.yy" ++#line 1361 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecInterceptOnError is not yet supported."); + YYERROR; +@@ -2708,14 +2708,14 @@ namespace yy { + break; + + case 109: // expression: "CONFIG_SEC_INTERCEPT_ON_ERROR" "CONFIG_VALUE_OFF" +-#line 1364 "seclang-parser.yy" ++#line 1366 "seclang-parser.yy" + { + } + #line 2715 "seclang-parser.cc" + break; + + case 110: // expression: "CONFIG_SEC_CONN_R_STATE_LIMIT" +-#line 1367 "seclang-parser.yy" ++#line 1369 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecConnReadStateLimit is not yet supported."); + YYERROR; +@@ -2724,7 +2724,7 @@ namespace yy { + break; + + case 111: // expression: "CONFIG_SEC_CONN_W_STATE_LIMIT" +-#line 1372 "seclang-parser.yy" ++#line 1374 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecConnWriteStateLimit is not yet supported."); + YYERROR; +@@ -2733,7 +2733,7 @@ namespace yy { + break; + + case 112: // expression: "CONFIG_SEC_SENSOR_ID" +-#line 1377 "seclang-parser.yy" ++#line 1379 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecSensorId is not yet supported."); + YYERROR; +@@ -2742,7 +2742,7 @@ namespace yy { + break; + + case 113: // expression: "CONFIG_SEC_RULE_INHERITANCE" "CONFIG_VALUE_ON" +-#line 1382 "seclang-parser.yy" ++#line 1384 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecRuleInheritance is not yet supported."); + YYERROR; +@@ -2751,14 +2751,14 @@ namespace yy { + break; + + case 114: // expression: "CONFIG_SEC_RULE_INHERITANCE" "CONFIG_VALUE_OFF" +-#line 1387 "seclang-parser.yy" ++#line 1389 "seclang-parser.yy" + { + } + #line 2758 "seclang-parser.cc" + break; + + case 115: // expression: "CONFIG_SEC_RULE_PERF_TIME" +-#line 1390 "seclang-parser.yy" ++#line 1392 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecRulePerfTime is not yet supported."); + YYERROR; +@@ -2767,7 +2767,7 @@ namespace yy { + break; + + case 116: // expression: "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" +-#line 1395 "seclang-parser.yy" ++#line 1397 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecStreamInBodyInspection is not supported."); + YYERROR; +@@ -2776,7 +2776,7 @@ namespace yy { + break; + + case 117: // expression: "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" +-#line 1400 "seclang-parser.yy" ++#line 1402 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecStreamOutBodyInspection is not supported."); + YYERROR; +@@ -2785,7 +2785,7 @@ namespace yy { + break; + + case 118: // expression: "CONFIG_SEC_RULE_REMOVE_BY_ID" +-#line 1405 "seclang-parser.yy" ++#line 1407 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.load(yystack_[0].value.as < std::string > (), &error) == false) { +@@ -2802,7 +2802,7 @@ namespace yy { + break; + + case 119: // expression: "CONFIG_SEC_RULE_REMOVE_BY_TAG" +-#line 1418 "seclang-parser.yy" ++#line 1420 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadRemoveRuleByTag(yystack_[0].value.as < std::string > (), &error) == false) { +@@ -2819,7 +2819,7 @@ namespace yy { + break; + + case 120: // expression: "CONFIG_SEC_RULE_REMOVE_BY_MSG" +-#line 1431 "seclang-parser.yy" ++#line 1433 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadRemoveRuleByMsg(yystack_[0].value.as < std::string > (), &error) == false) { +@@ -2836,7 +2836,7 @@ namespace yy { + break; + + case 121: // expression: "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" variables_pre_process +-#line 1444 "seclang-parser.yy" ++#line 1446 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadUpdateTargetByTag(yystack_[1].value.as < std::string > (), std::move(yystack_[0].value.as < std::unique_ptr > > > ()), &error) == false) { +@@ -2853,7 +2853,7 @@ namespace yy { + break; + + case 122: // expression: "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" variables_pre_process +-#line 1457 "seclang-parser.yy" ++#line 1459 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadUpdateTargetByMsg(yystack_[1].value.as < std::string > (), std::move(yystack_[0].value.as < std::unique_ptr > > > ()), &error) == false) { +@@ -2870,7 +2870,7 @@ namespace yy { + break; + + case 123: // expression: "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" variables_pre_process +-#line 1470 "seclang-parser.yy" ++#line 1472 "seclang-parser.yy" + { + std::string error; + double ruleId; +@@ -2900,7 +2900,7 @@ namespace yy { + break; + + case 124: // expression: "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" actions +-#line 1496 "seclang-parser.yy" ++#line 1498 "seclang-parser.yy" + { + std::string error; + double ruleId; +@@ -2931,7 +2931,7 @@ namespace yy { + break; + + case 125: // expression: "CONFIG_DIR_DEBUG_LVL" +-#line 1524 "seclang-parser.yy" ++#line 1526 "seclang-parser.yy" + { + if (driver.m_debugLog != NULL) { + driver.m_debugLog->setDebugLogLevel(atoi(yystack_[0].value.as < std::string > ().c_str())); +@@ -2947,7 +2947,7 @@ namespace yy { + break; + + case 126: // expression: "CONFIG_DIR_DEBUG_LOG" +-#line 1536 "seclang-parser.yy" ++#line 1538 "seclang-parser.yy" + { + if (driver.m_debugLog != NULL) { + std::string error; +@@ -2970,7 +2970,7 @@ namespace yy { + break; + + case 127: // expression: "CONFIG_DIR_GEO_DB" +-#line 1556 "seclang-parser.yy" ++#line 1558 "seclang-parser.yy" + { + #if defined(WITH_GEOIP) or defined(WITH_MAXMIND) + std::string err; +@@ -3001,7 +3001,7 @@ namespace yy { + break; + + case 128: // expression: "CONFIG_DIR_ARGS_LIMIT" +-#line 1583 "seclang-parser.yy" ++#line 1585 "seclang-parser.yy" + { + driver.m_argumentsLimit.m_set = true; + driver.m_argumentsLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3010,7 +3010,7 @@ namespace yy { + break; + + case 129: // expression: "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" +-#line 1588 "seclang-parser.yy" ++#line 1590 "seclang-parser.yy" + { + driver.m_requestBodyJsonDepthLimit.m_set = true; + driver.m_requestBodyJsonDepthLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3019,7 +3019,7 @@ namespace yy { + break; + + case 130: // expression: "CONFIG_DIR_REQ_BODY_LIMIT" +-#line 1594 "seclang-parser.yy" ++#line 1596 "seclang-parser.yy" + { + driver.m_requestBodyLimit.m_set = true; + driver.m_requestBodyLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3028,7 +3028,7 @@ namespace yy { + break; + + case 131: // expression: "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" +-#line 1599 "seclang-parser.yy" ++#line 1601 "seclang-parser.yy" + { + driver.m_requestBodyNoFilesLimit.m_set = true; + driver.m_requestBodyNoFilesLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3037,7 +3037,7 @@ namespace yy { + break; + + case 132: // expression: "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" +-#line 1604 "seclang-parser.yy" ++#line 1606 "seclang-parser.yy" + { + std::stringstream ss; + ss << "As of ModSecurity version 3.0, SecRequestBodyInMemoryLimit is no longer "; +@@ -3050,7 +3050,7 @@ namespace yy { + break; + + case 133: // expression: "CONFIG_DIR_RES_BODY_LIMIT" +-#line 1613 "seclang-parser.yy" ++#line 1615 "seclang-parser.yy" + { + driver.m_responseBodyLimit.m_set = true; + driver.m_responseBodyLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3059,7 +3059,7 @@ namespace yy { + break; + + case 134: // expression: "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" "CONFIG_VALUE_PROCESS_PARTIAL" +-#line 1618 "seclang-parser.yy" ++#line 1620 "seclang-parser.yy" + { + driver.m_requestBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::ProcessPartialBodyLimitAction; + } +@@ -3067,7 +3067,7 @@ namespace yy { + break; + + case 135: // expression: "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" "CONFIG_VALUE_REJECT" +-#line 1622 "seclang-parser.yy" ++#line 1624 "seclang-parser.yy" + { + driver.m_requestBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::RejectBodyLimitAction; + } +@@ -3075,7 +3075,7 @@ namespace yy { + break; + + case 136: // expression: "CONFIG_DIR_RES_BODY_LIMIT_ACTION" "CONFIG_VALUE_PROCESS_PARTIAL" +-#line 1626 "seclang-parser.yy" ++#line 1628 "seclang-parser.yy" + { + driver.m_responseBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::ProcessPartialBodyLimitAction; + } +@@ -3083,7 +3083,7 @@ namespace yy { + break; + + case 137: // expression: "CONFIG_DIR_RES_BODY_LIMIT_ACTION" "CONFIG_VALUE_REJECT" +-#line 1630 "seclang-parser.yy" ++#line 1632 "seclang-parser.yy" + { + driver.m_responseBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::RejectBodyLimitAction; + } +@@ -3091,7 +3091,7 @@ namespace yy { + break; + + case 138: // expression: "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" "CONFIG_VALUE_ABORT" +-#line 1634 "seclang-parser.yy" ++#line 1636 "seclang-parser.yy" + { + driver.m_remoteRulesActionOnFailed = RulesSet::OnFailedRemoteRulesAction::AbortOnFailedRemoteRulesAction; + } +@@ -3099,7 +3099,7 @@ namespace yy { + break; + + case 139: // expression: "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" "CONFIG_VALUE_WARN" +-#line 1638 "seclang-parser.yy" ++#line 1640 "seclang-parser.yy" + { + driver.m_remoteRulesActionOnFailed = RulesSet::OnFailedRemoteRulesAction::WarnOnFailedRemoteRulesAction; + } +@@ -3107,7 +3107,7 @@ namespace yy { + break; + + case 142: // expression: "CONGIG_DIR_RESPONSE_BODY_MP" +-#line 1652 "seclang-parser.yy" ++#line 1654 "seclang-parser.yy" + { + std::istringstream buf(yystack_[0].value.as < std::string > ()); + std::istream_iterator beg(buf), end; +@@ -3123,7 +3123,7 @@ namespace yy { + break; + + case 143: // expression: "CONGIG_DIR_RESPONSE_BODY_MP_CLEAR" +-#line 1664 "seclang-parser.yy" ++#line 1666 "seclang-parser.yy" + { + driver.m_responseBodyTypeToBeInspected.m_set = true; + driver.m_responseBodyTypeToBeInspected.m_clear = true; +@@ -3133,7 +3133,7 @@ namespace yy { + break; + + case 144: // expression: "CONFIG_XML_EXTERNAL_ENTITY" "CONFIG_VALUE_OFF" +-#line 1670 "seclang-parser.yy" ++#line 1672 "seclang-parser.yy" + { + driver.m_secXMLExternalEntity = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -3141,7 +3141,7 @@ namespace yy { + break; + + case 145: // expression: "CONFIG_XML_EXTERNAL_ENTITY" "CONFIG_VALUE_ON" +-#line 1674 "seclang-parser.yy" ++#line 1676 "seclang-parser.yy" + { + driver.m_secXMLExternalEntity = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -3149,7 +3149,7 @@ namespace yy { + break; + + case 146: // expression: "CONGIG_DIR_SEC_TMP_DIR" +-#line 1678 "seclang-parser.yy" ++#line 1680 "seclang-parser.yy" + { + /* Parser error disabled to avoid breaking default installations with modsecurity.conf-recommended + std::stringstream ss; +@@ -3164,7 +3164,7 @@ namespace yy { + break; + + case 149: // expression: "CONGIG_DIR_SEC_COOKIE_FORMAT" +-#line 1699 "seclang-parser.yy" ++#line 1701 "seclang-parser.yy" + { + if (atoi(yystack_[0].value.as < std::string > ().c_str()) == 1) { + driver.error(yystack_[1].location, "SecCookieFormat 1 is not yet supported."); +@@ -3175,7 +3175,7 @@ namespace yy { + break; + + case 150: // expression: "CONFIG_SEC_COOKIEV0_SEPARATOR" +-#line 1706 "seclang-parser.yy" ++#line 1708 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecCookieV0Separator is not yet supported."); + YYERROR; +@@ -3184,7 +3184,7 @@ namespace yy { + break; + + case 152: // expression: "CONFIG_DIR_UNICODE_MAP_FILE" +-#line 1716 "seclang-parser.yy" ++#line 1718 "seclang-parser.yy" + { + std::string error; + std::vector param; +@@ -3242,7 +3242,7 @@ namespace yy { + break; + + case 153: // expression: "CONFIG_SEC_COLLECTION_TIMEOUT" +-#line 1770 "seclang-parser.yy" ++#line 1772 "seclang-parser.yy" + { + /* Parser error disabled to avoid breaking default CRS installations with crs-setup.conf-recommended + driver.error(@0, "SecCollectionTimeout is not yet supported."); +@@ -3253,7 +3253,7 @@ namespace yy { + break; + + case 154: // expression: "CONFIG_SEC_HTTP_BLKEY" +-#line 1777 "seclang-parser.yy" ++#line 1779 "seclang-parser.yy" + { + driver.m_httpblKey.m_set = true; + driver.m_httpblKey.m_value = yystack_[0].value.as < std::string > (); +@@ -3262,7 +3262,7 @@ namespace yy { + break; + + case 155: // variables: variables_pre_process +-#line 1785 "seclang-parser.yy" ++#line 1787 "seclang-parser.yy" + { + std::unique_ptr > > originalList = std::move(yystack_[0].value.as < std::unique_ptr > > > ()); + std::unique_ptr>> newList(new std::vector>()); +@@ -3300,7 +3300,7 @@ namespace yy { + break; + + case 156: // variables_pre_process: variables_may_be_quoted +-#line 1822 "seclang-parser.yy" ++#line 1824 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[0].value.as < std::unique_ptr > > > ()); + } +@@ -3308,7 +3308,7 @@ namespace yy { + break; + + case 157: // variables_pre_process: "QUOTATION_MARK" variables_may_be_quoted "QUOTATION_MARK" +-#line 1826 "seclang-parser.yy" ++#line 1828 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[1].value.as < std::unique_ptr > > > ()); + } +@@ -3316,7 +3316,7 @@ namespace yy { + break; + + case 158: // variables_may_be_quoted: variables_may_be_quoted PIPE var +-#line 1833 "seclang-parser.yy" ++#line 1835 "seclang-parser.yy" + { + yystack_[2].value.as < std::unique_ptr > > > ()->push_back(std::move(yystack_[0].value.as < std::unique_ptr > ())); + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[2].value.as < std::unique_ptr > > > ()); +@@ -3325,7 +3325,7 @@ namespace yy { + break; + + case 159: // variables_may_be_quoted: variables_may_be_quoted PIPE VAR_EXCLUSION var +-#line 1838 "seclang-parser.yy" ++#line 1840 "seclang-parser.yy" + { + std::unique_ptr c(new VariableModificatorExclusion(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + yystack_[3].value.as < std::unique_ptr > > > ()->push_back(std::move(c)); +@@ -3335,7 +3335,7 @@ namespace yy { + break; + + case 160: // variables_may_be_quoted: variables_may_be_quoted PIPE VAR_COUNT var +-#line 1844 "seclang-parser.yy" ++#line 1846 "seclang-parser.yy" + { + std::unique_ptr c(new VariableModificatorCount(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + yystack_[3].value.as < std::unique_ptr > > > ()->push_back(std::move(c)); +@@ -3345,7 +3345,7 @@ namespace yy { + break; + + case 161: // variables_may_be_quoted: var +-#line 1850 "seclang-parser.yy" ++#line 1852 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + b->push_back(std::move(yystack_[0].value.as < std::unique_ptr > ())); +@@ -3355,7 +3355,7 @@ namespace yy { + break; + + case 162: // variables_may_be_quoted: VAR_EXCLUSION var +-#line 1856 "seclang-parser.yy" ++#line 1858 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + std::unique_ptr c(new VariableModificatorExclusion(std::move(yystack_[0].value.as < std::unique_ptr > ()))); +@@ -3366,7 +3366,7 @@ namespace yy { + break; + + case 163: // variables_may_be_quoted: VAR_COUNT var +-#line 1863 "seclang-parser.yy" ++#line 1865 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + std::unique_ptr c(new VariableModificatorCount(std::move(yystack_[0].value.as < std::unique_ptr > ()))); +@@ -3377,7 +3377,7 @@ namespace yy { + break; + + case 164: // var: VARIABLE_ARGS "Dictionary element" +-#line 1873 "seclang-parser.yy" ++#line 1875 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Args_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3385,7 +3385,7 @@ namespace yy { + break; + + case 165: // var: VARIABLE_ARGS "Dictionary element, selected by regexp" +-#line 1877 "seclang-parser.yy" ++#line 1879 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Args_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3393,7 +3393,7 @@ namespace yy { + break; + + case 166: // var: VARIABLE_ARGS +-#line 1881 "seclang-parser.yy" ++#line 1883 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Args_NoDictElement()); + } +@@ -3401,7 +3401,7 @@ namespace yy { + break; + + case 167: // var: VARIABLE_ARGS_POST "Dictionary element" +-#line 1885 "seclang-parser.yy" ++#line 1887 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPost_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3409,7 +3409,7 @@ namespace yy { + break; + + case 168: // var: VARIABLE_ARGS_POST "Dictionary element, selected by regexp" +-#line 1889 "seclang-parser.yy" ++#line 1891 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPost_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3417,7 +3417,7 @@ namespace yy { + break; + + case 169: // var: VARIABLE_ARGS_POST +-#line 1893 "seclang-parser.yy" ++#line 1895 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPost_NoDictElement()); + } +@@ -3425,7 +3425,7 @@ namespace yy { + break; + + case 170: // var: VARIABLE_ARGS_GET "Dictionary element" +-#line 1897 "seclang-parser.yy" ++#line 1899 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGet_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3433,7 +3433,7 @@ namespace yy { + break; + + case 171: // var: VARIABLE_ARGS_GET "Dictionary element, selected by regexp" +-#line 1901 "seclang-parser.yy" ++#line 1903 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGet_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3441,7 +3441,7 @@ namespace yy { + break; + + case 172: // var: VARIABLE_ARGS_GET +-#line 1905 "seclang-parser.yy" ++#line 1907 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGet_NoDictElement()); + } +@@ -3449,7 +3449,7 @@ namespace yy { + break; + + case 173: // var: VARIABLE_FILES_SIZES "Dictionary element" +-#line 1909 "seclang-parser.yy" ++#line 1911 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesSizes_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3457,7 +3457,7 @@ namespace yy { + break; + + case 174: // var: VARIABLE_FILES_SIZES "Dictionary element, selected by regexp" +-#line 1913 "seclang-parser.yy" ++#line 1915 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesSizes_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3465,7 +3465,7 @@ namespace yy { + break; + + case 175: // var: VARIABLE_FILES_SIZES +-#line 1917 "seclang-parser.yy" ++#line 1919 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesSizes_NoDictElement()); + } +@@ -3473,7 +3473,7 @@ namespace yy { + break; + + case 176: // var: VARIABLE_FILES_NAMES "Dictionary element" +-#line 1921 "seclang-parser.yy" ++#line 1923 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesNames_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3481,7 +3481,7 @@ namespace yy { + break; + + case 177: // var: VARIABLE_FILES_NAMES "Dictionary element, selected by regexp" +-#line 1925 "seclang-parser.yy" ++#line 1927 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3489,7 +3489,7 @@ namespace yy { + break; + + case 178: // var: VARIABLE_FILES_NAMES +-#line 1929 "seclang-parser.yy" ++#line 1931 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesNames_NoDictElement()); + } +@@ -3497,7 +3497,7 @@ namespace yy { + break; + + case 179: // var: VARIABLE_FILES_TMP_CONTENT "Dictionary element" +-#line 1933 "seclang-parser.yy" ++#line 1935 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpContent_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3505,7 +3505,7 @@ namespace yy { + break; + + case 180: // var: VARIABLE_FILES_TMP_CONTENT "Dictionary element, selected by regexp" +-#line 1937 "seclang-parser.yy" ++#line 1939 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpContent_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3513,7 +3513,7 @@ namespace yy { + break; + + case 181: // var: VARIABLE_FILES_TMP_CONTENT +-#line 1941 "seclang-parser.yy" ++#line 1943 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpContent_NoDictElement()); + } +@@ -3521,7 +3521,7 @@ namespace yy { + break; + + case 182: // var: VARIABLE_MULTIPART_FILENAME "Dictionary element" +-#line 1945 "seclang-parser.yy" ++#line 1947 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartFileName_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3529,7 +3529,7 @@ namespace yy { + break; + + case 183: // var: VARIABLE_MULTIPART_FILENAME "Dictionary element, selected by regexp" +-#line 1949 "seclang-parser.yy" ++#line 1951 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartFileName_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3537,7 +3537,7 @@ namespace yy { + break; + + case 184: // var: VARIABLE_MULTIPART_FILENAME +-#line 1953 "seclang-parser.yy" ++#line 1955 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartFileName_NoDictElement()); + } +@@ -3545,7 +3545,7 @@ namespace yy { + break; + + case 185: // var: VARIABLE_MULTIPART_NAME "Dictionary element" +-#line 1957 "seclang-parser.yy" ++#line 1959 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartName_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3553,7 +3553,7 @@ namespace yy { + break; + + case 186: // var: VARIABLE_MULTIPART_NAME "Dictionary element, selected by regexp" +-#line 1961 "seclang-parser.yy" ++#line 1963 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartName_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3561,7 +3561,7 @@ namespace yy { + break; + + case 187: // var: VARIABLE_MULTIPART_NAME +-#line 1965 "seclang-parser.yy" ++#line 1967 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartName_NoDictElement()); + } +@@ -3569,7 +3569,7 @@ namespace yy { + break; + + case 188: // var: VARIABLE_MATCHED_VARS_NAMES "Dictionary element" +-#line 1969 "seclang-parser.yy" ++#line 1971 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarsNames_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3577,7 +3577,7 @@ namespace yy { + break; + + case 189: // var: VARIABLE_MATCHED_VARS_NAMES "Dictionary element, selected by regexp" +-#line 1973 "seclang-parser.yy" ++#line 1975 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarsNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3585,7 +3585,7 @@ namespace yy { + break; + + case 190: // var: VARIABLE_MATCHED_VARS_NAMES +-#line 1977 "seclang-parser.yy" ++#line 1979 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarsNames_NoDictElement()); + } +@@ -3593,7 +3593,7 @@ namespace yy { + break; + + case 191: // var: VARIABLE_MATCHED_VARS "Dictionary element" +-#line 1981 "seclang-parser.yy" ++#line 1983 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVars_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3601,7 +3601,7 @@ namespace yy { + break; + + case 192: // var: VARIABLE_MATCHED_VARS "Dictionary element, selected by regexp" +-#line 1985 "seclang-parser.yy" ++#line 1987 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVars_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3609,7 +3609,7 @@ namespace yy { + break; + + case 193: // var: VARIABLE_MATCHED_VARS +-#line 1989 "seclang-parser.yy" ++#line 1991 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVars_NoDictElement()); + } +@@ -3617,7 +3617,7 @@ namespace yy { + break; + + case 194: // var: VARIABLE_FILES "Dictionary element" +-#line 1993 "seclang-parser.yy" ++#line 1995 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Files_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3625,7 +3625,7 @@ namespace yy { + break; + + case 195: // var: VARIABLE_FILES "Dictionary element, selected by regexp" +-#line 1997 "seclang-parser.yy" ++#line 1999 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Files_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3633,7 +3633,7 @@ namespace yy { + break; + + case 196: // var: VARIABLE_FILES +-#line 2001 "seclang-parser.yy" ++#line 2003 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Files_NoDictElement()); + } +@@ -3641,7 +3641,7 @@ namespace yy { + break; + + case 197: // var: VARIABLE_REQUEST_COOKIES "Dictionary element" +-#line 2005 "seclang-parser.yy" ++#line 2007 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookies_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3649,7 +3649,7 @@ namespace yy { + break; + + case 198: // var: VARIABLE_REQUEST_COOKIES "Dictionary element, selected by regexp" +-#line 2009 "seclang-parser.yy" ++#line 2011 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookies_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3657,7 +3657,7 @@ namespace yy { + break; + + case 199: // var: VARIABLE_REQUEST_COOKIES +-#line 2013 "seclang-parser.yy" ++#line 2015 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookies_NoDictElement()); + } +@@ -3665,7 +3665,7 @@ namespace yy { + break; + + case 200: // var: VARIABLE_REQUEST_HEADERS "Dictionary element" +-#line 2017 "seclang-parser.yy" ++#line 2019 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeaders_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3673,7 +3673,7 @@ namespace yy { + break; + + case 201: // var: VARIABLE_REQUEST_HEADERS "Dictionary element, selected by regexp" +-#line 2021 "seclang-parser.yy" ++#line 2023 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeaders_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3681,7 +3681,7 @@ namespace yy { + break; + + case 202: // var: VARIABLE_REQUEST_HEADERS +-#line 2025 "seclang-parser.yy" ++#line 2027 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeaders_NoDictElement()); + } +@@ -3689,7 +3689,7 @@ namespace yy { + break; + + case 203: // var: VARIABLE_RESPONSE_HEADERS "Dictionary element" +-#line 2029 "seclang-parser.yy" ++#line 2031 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeaders_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3697,7 +3697,7 @@ namespace yy { + break; + + case 204: // var: VARIABLE_RESPONSE_HEADERS "Dictionary element, selected by regexp" +-#line 2033 "seclang-parser.yy" ++#line 2035 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeaders_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3705,7 +3705,7 @@ namespace yy { + break; + + case 205: // var: VARIABLE_RESPONSE_HEADERS +-#line 2037 "seclang-parser.yy" ++#line 2039 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeaders_NoDictElement()); + } +@@ -3713,7 +3713,7 @@ namespace yy { + break; + + case 206: // var: VARIABLE_GEO "Dictionary element" +-#line 2041 "seclang-parser.yy" ++#line 2043 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Geo_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3721,7 +3721,7 @@ namespace yy { + break; + + case 207: // var: VARIABLE_GEO "Dictionary element, selected by regexp" +-#line 2045 "seclang-parser.yy" ++#line 2047 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Geo_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3729,7 +3729,7 @@ namespace yy { + break; + + case 208: // var: VARIABLE_GEO +-#line 2049 "seclang-parser.yy" ++#line 2051 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Geo_NoDictElement()); + } +@@ -3737,7 +3737,7 @@ namespace yy { + break; + + case 209: // var: VARIABLE_REQUEST_COOKIES_NAMES "Dictionary element" +-#line 2053 "seclang-parser.yy" ++#line 2055 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookiesNames_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3745,7 +3745,7 @@ namespace yy { + break; + + case 210: // var: VARIABLE_REQUEST_COOKIES_NAMES "Dictionary element, selected by regexp" +-#line 2057 "seclang-parser.yy" ++#line 2059 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookiesNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3753,1905 +3753,1929 @@ namespace yy { + break; + + case 211: // var: VARIABLE_REQUEST_COOKIES_NAMES +-#line 2061 "seclang-parser.yy" ++#line 2063 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookiesNames_NoDictElement()); + } + #line 3761 "seclang-parser.cc" + break; + +- case 212: // var: VARIABLE_RULE "Dictionary element" +-#line 2065 "seclang-parser.yy" ++ case 212: // var: VARIABLE_MULTIPART_PART_HEADERS "Dictionary element" ++#line 2067 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartPartHeaders_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3769 "seclang-parser.cc" + break; + +- case 213: // var: VARIABLE_RULE "Dictionary element, selected by regexp" +-#line 2069 "seclang-parser.yy" ++ case 213: // var: VARIABLE_MULTIPART_PART_HEADERS "Dictionary element, selected by regexp" ++#line 2071 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartPartHeaders_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3777 "seclang-parser.cc" + break; + +- case 214: // var: VARIABLE_RULE +-#line 2073 "seclang-parser.yy" ++ case 214: // var: VARIABLE_MULTIPART_PART_HEADERS ++#line 2075 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartPartHeaders_NoDictElement()); + } + #line 3785 "seclang-parser.cc" + break; + +- case 215: // var: "RUN_TIME_VAR_ENV" "Dictionary element" +-#line 2077 "seclang-parser.yy" ++ case 215: // var: VARIABLE_RULE "Dictionary element" ++#line 2079 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3793 "seclang-parser.cc" + break; + +- case 216: // var: "RUN_TIME_VAR_ENV" "Dictionary element, selected by regexp" +-#line 2081 "seclang-parser.yy" ++ case 216: // var: VARIABLE_RULE "Dictionary element, selected by regexp" ++#line 2083 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3801 "seclang-parser.cc" + break; + +- case 217: // var: "RUN_TIME_VAR_ENV" +-#line 2085 "seclang-parser.yy" ++ case 217: // var: VARIABLE_RULE ++#line 2087 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV")); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_NoDictElement()); + } + #line 3809 "seclang-parser.cc" + break; + +- case 218: // var: "RUN_TIME_VAR_XML" "Dictionary element" +-#line 2089 "seclang-parser.yy" ++ case 218: // var: "RUN_TIME_VAR_ENV" "Dictionary element" ++#line 2091 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); + } + #line 3817 "seclang-parser.cc" + break; + +- case 219: // var: "RUN_TIME_VAR_XML" "Dictionary element, selected by regexp" +-#line 2093 "seclang-parser.yy" ++ case 219: // var: "RUN_TIME_VAR_ENV" "Dictionary element, selected by regexp" ++#line 2095 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); + } + #line 3825 "seclang-parser.cc" + break; + +- case 220: // var: "RUN_TIME_VAR_XML" +-#line 2097 "seclang-parser.yy" ++ case 220: // var: "RUN_TIME_VAR_ENV" ++#line 2099 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV")); + } + #line 3833 "seclang-parser.cc" + break; + +- case 221: // var: "FILES_TMPNAMES" "Dictionary element" +-#line 2101 "seclang-parser.yy" ++ case 221: // var: "RUN_TIME_VAR_XML" "Dictionary element" ++#line 2103 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); + } + #line 3841 "seclang-parser.cc" + break; + +- case 222: // var: "FILES_TMPNAMES" "Dictionary element, selected by regexp" +-#line 2105 "seclang-parser.yy" ++ case 222: // var: "RUN_TIME_VAR_XML" "Dictionary element, selected by regexp" ++#line 2107 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); + } + #line 3849 "seclang-parser.cc" + break; + +- case 223: // var: "FILES_TMPNAMES" +-#line 2109 "seclang-parser.yy" ++ case 223: // var: "RUN_TIME_VAR_XML" ++#line 2111 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML_NoDictElement()); + } + #line 3857 "seclang-parser.cc" + break; + +- case 224: // var: "RESOURCE" run_time_string +-#line 2113 "seclang-parser.yy" ++ case 224: // var: "FILES_TMPNAMES" "Dictionary element" ++#line 2115 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3865 "seclang-parser.cc" + break; + +- case 225: // var: "RESOURCE" "Dictionary element" +-#line 2117 "seclang-parser.yy" ++ case 225: // var: "FILES_TMPNAMES" "Dictionary element, selected by regexp" ++#line 2119 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3873 "seclang-parser.cc" + break; + +- case 226: // var: "RESOURCE" "Dictionary element, selected by regexp" +-#line 2121 "seclang-parser.yy" ++ case 226: // var: "FILES_TMPNAMES" ++#line 2123 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_NoDictElement()); + } + #line 3881 "seclang-parser.cc" + break; + +- case 227: // var: "RESOURCE" +-#line 2125 "seclang-parser.yy" ++ case 227: // var: "RESOURCE" run_time_string ++#line 2127 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3889 "seclang-parser.cc" + break; + +- case 228: // var: "VARIABLE_IP" run_time_string +-#line 2129 "seclang-parser.yy" ++ case 228: // var: "RESOURCE" "Dictionary element" ++#line 2131 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3897 "seclang-parser.cc" + break; + +- case 229: // var: "VARIABLE_IP" "Dictionary element" +-#line 2133 "seclang-parser.yy" ++ case 229: // var: "RESOURCE" "Dictionary element, selected by regexp" ++#line 2135 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3905 "seclang-parser.cc" + break; + +- case 230: // var: "VARIABLE_IP" "Dictionary element, selected by regexp" +-#line 2137 "seclang-parser.yy" ++ case 230: // var: "RESOURCE" ++#line 2139 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_NoDictElement()); + } + #line 3913 "seclang-parser.cc" + break; + +- case 231: // var: "VARIABLE_IP" +-#line 2141 "seclang-parser.yy" ++ case 231: // var: "VARIABLE_IP" run_time_string ++#line 2143 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3921 "seclang-parser.cc" + break; + +- case 232: // var: "VARIABLE_GLOBAL" run_time_string +-#line 2145 "seclang-parser.yy" ++ case 232: // var: "VARIABLE_IP" "Dictionary element" ++#line 2147 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3929 "seclang-parser.cc" + break; + +- case 233: // var: "VARIABLE_GLOBAL" "Dictionary element" +-#line 2149 "seclang-parser.yy" ++ case 233: // var: "VARIABLE_IP" "Dictionary element, selected by regexp" ++#line 2151 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3937 "seclang-parser.cc" + break; + +- case 234: // var: "VARIABLE_GLOBAL" "Dictionary element, selected by regexp" +-#line 2153 "seclang-parser.yy" ++ case 234: // var: "VARIABLE_IP" ++#line 2155 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_NoDictElement()); + } + #line 3945 "seclang-parser.cc" + break; + +- case 235: // var: "VARIABLE_GLOBAL" +-#line 2157 "seclang-parser.yy" ++ case 235: // var: "VARIABLE_GLOBAL" run_time_string ++#line 2159 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3953 "seclang-parser.cc" + break; + +- case 236: // var: "VARIABLE_USER" run_time_string +-#line 2161 "seclang-parser.yy" ++ case 236: // var: "VARIABLE_GLOBAL" "Dictionary element" ++#line 2163 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3961 "seclang-parser.cc" + break; + +- case 237: // var: "VARIABLE_USER" "Dictionary element" +-#line 2165 "seclang-parser.yy" ++ case 237: // var: "VARIABLE_GLOBAL" "Dictionary element, selected by regexp" ++#line 2167 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3969 "seclang-parser.cc" + break; + +- case 238: // var: "VARIABLE_USER" "Dictionary element, selected by regexp" +-#line 2169 "seclang-parser.yy" ++ case 238: // var: "VARIABLE_GLOBAL" ++#line 2171 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_NoDictElement()); + } + #line 3977 "seclang-parser.cc" + break; + +- case 239: // var: "VARIABLE_USER" +-#line 2173 "seclang-parser.yy" ++ case 239: // var: "VARIABLE_USER" run_time_string ++#line 2175 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3985 "seclang-parser.cc" + break; + +- case 240: // var: "VARIABLE_TX" run_time_string +-#line 2177 "seclang-parser.yy" ++ case 240: // var: "VARIABLE_USER" "Dictionary element" ++#line 2179 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3993 "seclang-parser.cc" + break; + +- case 241: // var: "VARIABLE_TX" "Dictionary element" +-#line 2181 "seclang-parser.yy" ++ case 241: // var: "VARIABLE_USER" "Dictionary element, selected by regexp" ++#line 2183 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4001 "seclang-parser.cc" + break; + +- case 242: // var: "VARIABLE_TX" "Dictionary element, selected by regexp" +-#line 2185 "seclang-parser.yy" ++ case 242: // var: "VARIABLE_USER" ++#line 2187 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_NoDictElement()); + } + #line 4009 "seclang-parser.cc" + break; + +- case 243: // var: "VARIABLE_TX" +-#line 2189 "seclang-parser.yy" ++ case 243: // var: "VARIABLE_TX" run_time_string ++#line 2191 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 4017 "seclang-parser.cc" + break; + +- case 244: // var: "VARIABLE_SESSION" run_time_string +-#line 2193 "seclang-parser.yy" ++ case 244: // var: "VARIABLE_TX" "Dictionary element" ++#line 2195 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4025 "seclang-parser.cc" + break; + +- case 245: // var: "VARIABLE_SESSION" "Dictionary element" +-#line 2197 "seclang-parser.yy" ++ case 245: // var: "VARIABLE_TX" "Dictionary element, selected by regexp" ++#line 2199 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4033 "seclang-parser.cc" + break; + +- case 246: // var: "VARIABLE_SESSION" "Dictionary element, selected by regexp" +-#line 2201 "seclang-parser.yy" ++ case 246: // var: "VARIABLE_TX" ++#line 2203 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_NoDictElement()); + } + #line 4041 "seclang-parser.cc" + break; + +- case 247: // var: "VARIABLE_SESSION" +-#line 2205 "seclang-parser.yy" ++ case 247: // var: "VARIABLE_SESSION" run_time_string ++#line 2207 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 4049 "seclang-parser.cc" + break; + +- case 248: // var: "Variable ARGS_NAMES" "Dictionary element" +-#line 2209 "seclang-parser.yy" ++ case 248: // var: "VARIABLE_SESSION" "Dictionary element" ++#line 2211 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4057 "seclang-parser.cc" + break; + +- case 249: // var: "Variable ARGS_NAMES" "Dictionary element, selected by regexp" +-#line 2213 "seclang-parser.yy" ++ case 249: // var: "VARIABLE_SESSION" "Dictionary element, selected by regexp" ++#line 2215 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4065 "seclang-parser.cc" + break; + +- case 250: // var: "Variable ARGS_NAMES" +-#line 2217 "seclang-parser.yy" ++ case 250: // var: "VARIABLE_SESSION" ++#line 2219 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_NoDictElement()); + } + #line 4073 "seclang-parser.cc" + break; + +- case 251: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element" +-#line 2221 "seclang-parser.yy" ++ case 251: // var: "Variable ARGS_NAMES" "Dictionary element" ++#line 2223 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4081 "seclang-parser.cc" + break; + +- case 252: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element, selected by regexp" +-#line 2225 "seclang-parser.yy" ++ case 252: // var: "Variable ARGS_NAMES" "Dictionary element, selected by regexp" ++#line 2227 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4089 "seclang-parser.cc" + break; + +- case 253: // var: VARIABLE_ARGS_GET_NAMES +-#line 2229 "seclang-parser.yy" ++ case 253: // var: "Variable ARGS_NAMES" ++#line 2231 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_NoDictElement()); + } + #line 4097 "seclang-parser.cc" + break; + +- case 254: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element" +-#line 2234 "seclang-parser.yy" ++ case 254: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element" ++#line 2235 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4105 "seclang-parser.cc" + break; + +- case 255: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element, selected by regexp" +-#line 2238 "seclang-parser.yy" ++ case 255: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element, selected by regexp" ++#line 2239 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4113 "seclang-parser.cc" + break; + +- case 256: // var: VARIABLE_ARGS_POST_NAMES +-#line 2242 "seclang-parser.yy" ++ case 256: // var: VARIABLE_ARGS_GET_NAMES ++#line 2243 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_NoDictElement()); + } + #line 4121 "seclang-parser.cc" + break; + +- case 257: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element" +-#line 2247 "seclang-parser.yy" ++ case 257: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element" ++#line 2248 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4129 "seclang-parser.cc" + break; + +- case 258: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element, selected by regexp" +-#line 2251 "seclang-parser.yy" ++ case 258: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element, selected by regexp" ++#line 2252 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4137 "seclang-parser.cc" + break; + +- case 259: // var: VARIABLE_REQUEST_HEADERS_NAMES +-#line 2255 "seclang-parser.yy" ++ case 259: // var: VARIABLE_ARGS_POST_NAMES ++#line 2256 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_NoDictElement()); + } + #line 4145 "seclang-parser.cc" + break; + +- case 260: // var: VARIABLE_RESPONSE_CONTENT_TYPE +-#line 2260 "seclang-parser.yy" ++ case 260: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element" ++#line 2261 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentType()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4153 "seclang-parser.cc" + break; + +- case 261: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element" ++ case 261: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element, selected by regexp" + #line 2265 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4161 "seclang-parser.cc" + break; + +- case 262: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element, selected by regexp" ++ case 262: // var: VARIABLE_REQUEST_HEADERS_NAMES + #line 2269 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_NoDictElement()); + } + #line 4169 "seclang-parser.cc" + break; + +- case 263: // var: VARIABLE_RESPONSE_HEADERS_NAMES +-#line 2273 "seclang-parser.yy" ++ case 263: // var: VARIABLE_RESPONSE_CONTENT_TYPE ++#line 2274 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentType()); + } + #line 4177 "seclang-parser.cc" + break; + +- case 264: // var: VARIABLE_ARGS_COMBINED_SIZE +-#line 2277 "seclang-parser.yy" ++ case 264: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element" ++#line 2279 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsCombinedSize()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4185 "seclang-parser.cc" + break; + +- case 265: // var: "AUTH_TYPE" +-#line 2281 "seclang-parser.yy" ++ case 265: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element, selected by regexp" ++#line 2283 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::AuthType()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4193 "seclang-parser.cc" + break; + +- case 266: // var: "FILES_COMBINED_SIZE" +-#line 2285 "seclang-parser.yy" ++ case 266: // var: VARIABLE_RESPONSE_HEADERS_NAMES ++#line 2287 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesCombinedSize()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_NoDictElement()); + } + #line 4201 "seclang-parser.cc" + break; + +- case 267: // var: "FULL_REQUEST" +-#line 2289 "seclang-parser.yy" ++ case 267: // var: VARIABLE_ARGS_COMBINED_SIZE ++#line 2291 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequest()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsCombinedSize()); + } + #line 4209 "seclang-parser.cc" + break; + +- case 268: // var: "FULL_REQUEST_LENGTH" +-#line 2293 "seclang-parser.yy" ++ case 268: // var: "AUTH_TYPE" ++#line 2295 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequestLength()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::AuthType()); + } + #line 4217 "seclang-parser.cc" + break; + +- case 269: // var: "INBOUND_DATA_ERROR" +-#line 2297 "seclang-parser.yy" ++ case 269: // var: "FILES_COMBINED_SIZE" ++#line 2299 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::InboundDataError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesCombinedSize()); + } + #line 4225 "seclang-parser.cc" + break; + +- case 270: // var: "MATCHED_VAR" +-#line 2301 "seclang-parser.yy" ++ case 270: // var: "FULL_REQUEST" ++#line 2303 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVar()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequest()); + } + #line 4233 "seclang-parser.cc" + break; + +- case 271: // var: "MATCHED_VAR_NAME" +-#line 2305 "seclang-parser.yy" ++ case 271: // var: "FULL_REQUEST_LENGTH" ++#line 2307 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarName()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequestLength()); + } + #line 4241 "seclang-parser.cc" + break; + +- case 272: // var: VARIABLE_MULTIPART_BOUNDARY_QUOTED +-#line 2309 "seclang-parser.yy" ++ case 272: // var: "INBOUND_DATA_ERROR" ++#line 2311 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryQuoted()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::InboundDataError()); + } + #line 4249 "seclang-parser.cc" + break; + +- case 273: // var: VARIABLE_MULTIPART_BOUNDARY_WHITESPACE +-#line 2313 "seclang-parser.yy" ++ case 273: // var: "MATCHED_VAR" ++#line 2315 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryWhiteSpace()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVar()); + } + #line 4257 "seclang-parser.cc" + break; + +- case 274: // var: "MULTIPART_CRLF_LF_LINES" +-#line 2317 "seclang-parser.yy" ++ case 274: // var: "MATCHED_VAR_NAME" ++#line 2319 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartCrlfLFLines()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarName()); + } + #line 4265 "seclang-parser.cc" + break; + +- case 275: // var: "MULTIPART_DATA_AFTER" +-#line 2321 "seclang-parser.yy" ++ case 275: // var: VARIABLE_MULTIPART_BOUNDARY_QUOTED ++#line 2323 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateAfter()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryQuoted()); + } + #line 4273 "seclang-parser.cc" + break; + +- case 276: // var: VARIABLE_MULTIPART_DATA_BEFORE +-#line 2325 "seclang-parser.yy" ++ case 276: // var: VARIABLE_MULTIPART_BOUNDARY_WHITESPACE ++#line 2327 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateBefore()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryWhiteSpace()); + } + #line 4281 "seclang-parser.cc" + break; + +- case 277: // var: "MULTIPART_FILE_LIMIT_EXCEEDED" +-#line 2329 "seclang-parser.yy" ++ case 277: // var: "MULTIPART_CRLF_LF_LINES" ++#line 2331 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartFileLimitExceeded()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartCrlfLFLines()); + } + #line 4289 "seclang-parser.cc" + break; + +- case 278: // var: "MULTIPART_HEADER_FOLDING" +-#line 2333 "seclang-parser.yy" ++ case 278: // var: "MULTIPART_DATA_AFTER" ++#line 2335 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartHeaderFolding()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateAfter()); + } + #line 4297 "seclang-parser.cc" + break; + +- case 279: // var: "MULTIPART_INVALID_HEADER_FOLDING" +-#line 2337 "seclang-parser.yy" ++ case 279: // var: VARIABLE_MULTIPART_DATA_BEFORE ++#line 2339 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidHeaderFolding()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateBefore()); + } + #line 4305 "seclang-parser.cc" + break; + +- case 280: // var: VARIABLE_MULTIPART_INVALID_PART +-#line 2341 "seclang-parser.yy" ++ case 280: // var: "MULTIPART_FILE_LIMIT_EXCEEDED" ++#line 2343 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidPart()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartFileLimitExceeded()); + } + #line 4313 "seclang-parser.cc" + break; + +- case 281: // var: "MULTIPART_INVALID_QUOTING" +-#line 2345 "seclang-parser.yy" ++ case 281: // var: "MULTIPART_HEADER_FOLDING" ++#line 2347 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidQuoting()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartHeaderFolding()); + } + #line 4321 "seclang-parser.cc" + break; + +- case 282: // var: VARIABLE_MULTIPART_LF_LINE +-#line 2349 "seclang-parser.yy" ++ case 282: // var: "MULTIPART_INVALID_HEADER_FOLDING" ++#line 2351 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartLFLine()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidHeaderFolding()); + } + #line 4329 "seclang-parser.cc" + break; + +- case 283: // var: VARIABLE_MULTIPART_MISSING_SEMICOLON +-#line 2353 "seclang-parser.yy" ++ case 283: // var: VARIABLE_MULTIPART_INVALID_PART ++#line 2355 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidPart()); + } + #line 4337 "seclang-parser.cc" + break; + +- case 284: // var: VARIABLE_MULTIPART_SEMICOLON_MISSING +-#line 2357 "seclang-parser.yy" ++ case 284: // var: "MULTIPART_INVALID_QUOTING" ++#line 2359 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidQuoting()); + } + #line 4345 "seclang-parser.cc" + break; + +- case 285: // var: "MULTIPART_STRICT_ERROR" +-#line 2361 "seclang-parser.yy" ++ case 285: // var: VARIABLE_MULTIPART_LF_LINE ++#line 2363 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartStrictError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartLFLine()); + } + #line 4353 "seclang-parser.cc" + break; + +- case 286: // var: "MULTIPART_UNMATCHED_BOUNDARY" +-#line 2365 "seclang-parser.yy" ++ case 286: // var: VARIABLE_MULTIPART_MISSING_SEMICOLON ++#line 2367 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartUnmatchedBoundary()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); + } + #line 4361 "seclang-parser.cc" + break; + +- case 287: // var: "OUTBOUND_DATA_ERROR" +-#line 2369 "seclang-parser.yy" ++ case 287: // var: VARIABLE_MULTIPART_SEMICOLON_MISSING ++#line 2371 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::OutboundDataError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); + } + #line 4369 "seclang-parser.cc" + break; + +- case 288: // var: "PATH_INFO" +-#line 2373 "seclang-parser.yy" ++ case 288: // var: "MULTIPART_STRICT_ERROR" ++#line 2375 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::PathInfo()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartStrictError()); + } + #line 4377 "seclang-parser.cc" + break; + +- case 289: // var: "QUERY_STRING" +-#line 2377 "seclang-parser.yy" ++ case 289: // var: "MULTIPART_UNMATCHED_BOUNDARY" ++#line 2379 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::QueryString()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartUnmatchedBoundary()); + } + #line 4385 "seclang-parser.cc" + break; + +- case 290: // var: "REMOTE_ADDR" +-#line 2381 "seclang-parser.yy" ++ case 290: // var: "OUTBOUND_DATA_ERROR" ++#line 2383 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteAddr()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::OutboundDataError()); + } + #line 4393 "seclang-parser.cc" + break; + +- case 291: // var: "REMOTE_HOST" +-#line 2385 "seclang-parser.yy" ++ case 291: // var: "PATH_INFO" ++#line 2387 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteHost()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::PathInfo()); + } + #line 4401 "seclang-parser.cc" + break; + +- case 292: // var: "REMOTE_PORT" +-#line 2389 "seclang-parser.yy" ++ case 292: // var: "QUERY_STRING" ++#line 2391 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemotePort()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::QueryString()); + } + #line 4409 "seclang-parser.cc" + break; + +- case 293: // var: "REQBODY_ERROR" +-#line 2393 "seclang-parser.yy" ++ case 293: // var: "REMOTE_ADDR" ++#line 2395 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteAddr()); + } + #line 4417 "seclang-parser.cc" + break; + +- case 294: // var: "REQBODY_ERROR_MSG" +-#line 2397 "seclang-parser.yy" ++ case 294: // var: "REMOTE_HOST" ++#line 2399 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyErrorMsg()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteHost()); + } + #line 4425 "seclang-parser.cc" + break; + +- case 295: // var: "REQBODY_PROCESSOR" +-#line 2401 "seclang-parser.yy" ++ case 295: // var: "REMOTE_PORT" ++#line 2403 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessor()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemotePort()); + } + #line 4433 "seclang-parser.cc" + break; + +- case 296: // var: "REQBODY_PROCESSOR_ERROR" +-#line 2405 "seclang-parser.yy" ++ case 296: // var: "REQBODY_ERROR" ++#line 2407 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyError()); + } + #line 4441 "seclang-parser.cc" + break; + +- case 297: // var: "REQBODY_PROCESSOR_ERROR_MSG" +-#line 2409 "seclang-parser.yy" ++ case 297: // var: "REQBODY_ERROR_MSG" ++#line 2411 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorErrorMsg()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyErrorMsg()); + } + #line 4449 "seclang-parser.cc" + break; + +- case 298: // var: "REQUEST_BASENAME" +-#line 2413 "seclang-parser.yy" ++ case 298: // var: "REQBODY_PROCESSOR" ++#line 2415 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBasename()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessor()); + } + #line 4457 "seclang-parser.cc" + break; + +- case 299: // var: "REQUEST_BODY" +-#line 2417 "seclang-parser.yy" ++ case 299: // var: "REQBODY_PROCESSOR_ERROR" ++#line 2419 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBody()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorError()); + } + #line 4465 "seclang-parser.cc" + break; + +- case 300: // var: "REQUEST_BODY_LENGTH" +-#line 2421 "seclang-parser.yy" ++ case 300: // var: "REQBODY_PROCESSOR_ERROR_MSG" ++#line 2423 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBodyLength()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorErrorMsg()); + } + #line 4473 "seclang-parser.cc" + break; + +- case 301: // var: "REQUEST_FILENAME" +-#line 2425 "seclang-parser.yy" ++ case 301: // var: "REQUEST_BASENAME" ++#line 2427 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestFilename()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBasename()); + } + #line 4481 "seclang-parser.cc" + break; + +- case 302: // var: "REQUEST_LINE" +-#line 2429 "seclang-parser.yy" ++ case 302: // var: "REQUEST_BODY" ++#line 2431 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestLine()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBody()); + } + #line 4489 "seclang-parser.cc" + break; + +- case 303: // var: "REQUEST_METHOD" +-#line 2433 "seclang-parser.yy" ++ case 303: // var: "REQUEST_BODY_LENGTH" ++#line 2435 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestMethod()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBodyLength()); + } + #line 4497 "seclang-parser.cc" + break; + +- case 304: // var: "REQUEST_PROTOCOL" +-#line 2437 "seclang-parser.yy" ++ case 304: // var: "REQUEST_FILENAME" ++#line 2439 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestProtocol()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestFilename()); + } + #line 4505 "seclang-parser.cc" + break; + +- case 305: // var: "REQUEST_URI" +-#line 2441 "seclang-parser.yy" ++ case 305: // var: "REQUEST_LINE" ++#line 2443 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURI()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestLine()); + } + #line 4513 "seclang-parser.cc" + break; + +- case 306: // var: "REQUEST_URI_RAW" +-#line 2445 "seclang-parser.yy" ++ case 306: // var: "REQUEST_METHOD" ++#line 2447 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURIRaw()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestMethod()); + } + #line 4521 "seclang-parser.cc" + break; + +- case 307: // var: "RESPONSE_BODY" +-#line 2449 "seclang-parser.yy" ++ case 307: // var: "REQUEST_PROTOCOL" ++#line 2451 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseBody()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestProtocol()); + } + #line 4529 "seclang-parser.cc" + break; + +- case 308: // var: "RESPONSE_CONTENT_LENGTH" +-#line 2453 "seclang-parser.yy" ++ case 308: // var: "REQUEST_URI" ++#line 2455 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentLength()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURI()); + } + #line 4537 "seclang-parser.cc" + break; + +- case 309: // var: "RESPONSE_PROTOCOL" +-#line 2457 "seclang-parser.yy" ++ case 309: // var: "REQUEST_URI_RAW" ++#line 2459 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseProtocol()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURIRaw()); + } + #line 4545 "seclang-parser.cc" + break; + +- case 310: // var: "RESPONSE_STATUS" +-#line 2461 "seclang-parser.yy" ++ case 310: // var: "RESPONSE_BODY" ++#line 2463 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseStatus()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseBody()); + } + #line 4553 "seclang-parser.cc" + break; + +- case 311: // var: "SERVER_ADDR" +-#line 2465 "seclang-parser.yy" ++ case 311: // var: "RESPONSE_CONTENT_LENGTH" ++#line 2467 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerAddr()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentLength()); + } + #line 4561 "seclang-parser.cc" + break; + +- case 312: // var: "SERVER_NAME" +-#line 2469 "seclang-parser.yy" ++ case 312: // var: "RESPONSE_PROTOCOL" ++#line 2471 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerName()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseProtocol()); + } + #line 4569 "seclang-parser.cc" + break; + +- case 313: // var: "SERVER_PORT" +-#line 2473 "seclang-parser.yy" ++ case 313: // var: "RESPONSE_STATUS" ++#line 2475 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerPort()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseStatus()); + } + #line 4577 "seclang-parser.cc" + break; + +- case 314: // var: "SESSIONID" +-#line 2477 "seclang-parser.yy" ++ case 314: // var: "SERVER_ADDR" ++#line 2479 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::SessionID()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerAddr()); + } + #line 4585 "seclang-parser.cc" + break; + +- case 315: // var: "UNIQUE_ID" +-#line 2481 "seclang-parser.yy" ++ case 315: // var: "SERVER_NAME" ++#line 2483 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UniqueID()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerName()); + } + #line 4593 "seclang-parser.cc" + break; + +- case 316: // var: "URLENCODED_ERROR" +-#line 2485 "seclang-parser.yy" ++ case 316: // var: "SERVER_PORT" ++#line 2487 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UrlEncodedError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerPort()); + } + #line 4601 "seclang-parser.cc" + break; + +- case 317: // var: "USERID" +-#line 2489 "seclang-parser.yy" ++ case 317: // var: "SESSIONID" ++#line 2491 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UserID()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::SessionID()); + } + #line 4609 "seclang-parser.cc" + break; + +- case 318: // var: "VARIABLE_STATUS" +-#line 2493 "seclang-parser.yy" ++ case 318: // var: "UNIQUE_ID" ++#line 2495 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UniqueID()); + } + #line 4617 "seclang-parser.cc" + break; + +- case 319: // var: "VARIABLE_STATUS_LINE" +-#line 2497 "seclang-parser.yy" ++ case 319: // var: "URLENCODED_ERROR" ++#line 2499 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UrlEncodedError()); + } + #line 4625 "seclang-parser.cc" + break; + +- case 320: // var: "WEBAPPID" +-#line 2501 "seclang-parser.yy" ++ case 320: // var: "USERID" ++#line 2503 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::WebAppId()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UserID()); + } + #line 4633 "seclang-parser.cc" + break; + +- case 321: // var: "RUN_TIME_VAR_DUR" +-#line 2505 "seclang-parser.yy" ++ case 321: // var: "VARIABLE_STATUS" ++#line 2507 "seclang-parser.yy" ++ { ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ } ++#line 4641 "seclang-parser.cc" ++ break; ++ ++ case 322: // var: "VARIABLE_STATUS_LINE" ++#line 2511 "seclang-parser.yy" ++ { ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ } ++#line 4649 "seclang-parser.cc" ++ break; ++ ++ case 323: // var: "WEBAPPID" ++#line 2515 "seclang-parser.yy" ++ { ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::WebAppId()); ++ } ++#line 4657 "seclang-parser.cc" ++ break; ++ ++ case 324: // var: "RUN_TIME_VAR_DUR" ++#line 2519 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new Duration(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4644 "seclang-parser.cc" ++#line 4668 "seclang-parser.cc" + break; + +- case 322: // var: "RUN_TIME_VAR_BLD" +-#line 2513 "seclang-parser.yy" ++ case 325: // var: "RUN_TIME_VAR_BLD" ++#line 2527 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new ModsecBuild(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4655 "seclang-parser.cc" ++#line 4679 "seclang-parser.cc" + break; + +- case 323: // var: "RUN_TIME_VAR_HSV" +-#line 2520 "seclang-parser.yy" ++ case 326: // var: "RUN_TIME_VAR_HSV" ++#line 2534 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new HighestSeverity(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4666 "seclang-parser.cc" ++#line 4690 "seclang-parser.cc" + break; + +- case 324: // var: "RUN_TIME_VAR_REMOTE_USER" +-#line 2527 "seclang-parser.yy" ++ case 327: // var: "RUN_TIME_VAR_REMOTE_USER" ++#line 2541 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new RemoteUser(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4677 "seclang-parser.cc" ++#line 4701 "seclang-parser.cc" + break; + +- case 325: // var: "RUN_TIME_VAR_TIME" +-#line 2534 "seclang-parser.yy" ++ case 328: // var: "RUN_TIME_VAR_TIME" ++#line 2548 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new Time(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4688 "seclang-parser.cc" ++#line 4712 "seclang-parser.cc" + break; + +- case 326: // var: "RUN_TIME_VAR_TIME_DAY" +-#line 2541 "seclang-parser.yy" ++ case 329: // var: "RUN_TIME_VAR_TIME_DAY" ++#line 2555 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeDay(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4699 "seclang-parser.cc" ++#line 4723 "seclang-parser.cc" + break; + +- case 327: // var: "RUN_TIME_VAR_TIME_EPOCH" +-#line 2548 "seclang-parser.yy" ++ case 330: // var: "RUN_TIME_VAR_TIME_EPOCH" ++#line 2562 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeEpoch(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4710 "seclang-parser.cc" ++#line 4734 "seclang-parser.cc" + break; + +- case 328: // var: "RUN_TIME_VAR_TIME_HOUR" +-#line 2555 "seclang-parser.yy" ++ case 331: // var: "RUN_TIME_VAR_TIME_HOUR" ++#line 2569 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeHour(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4721 "seclang-parser.cc" ++#line 4745 "seclang-parser.cc" + break; + +- case 329: // var: "RUN_TIME_VAR_TIME_MIN" +-#line 2562 "seclang-parser.yy" ++ case 332: // var: "RUN_TIME_VAR_TIME_MIN" ++#line 2576 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeMin(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4732 "seclang-parser.cc" ++#line 4756 "seclang-parser.cc" + break; + +- case 330: // var: "RUN_TIME_VAR_TIME_MON" +-#line 2569 "seclang-parser.yy" ++ case 333: // var: "RUN_TIME_VAR_TIME_MON" ++#line 2583 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeMon(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4743 "seclang-parser.cc" ++#line 4767 "seclang-parser.cc" + break; + +- case 331: // var: "RUN_TIME_VAR_TIME_SEC" +-#line 2576 "seclang-parser.yy" ++ case 334: // var: "RUN_TIME_VAR_TIME_SEC" ++#line 2590 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeSec(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4754 "seclang-parser.cc" ++#line 4778 "seclang-parser.cc" + break; + +- case 332: // var: "RUN_TIME_VAR_TIME_WDAY" +-#line 2583 "seclang-parser.yy" ++ case 335: // var: "RUN_TIME_VAR_TIME_WDAY" ++#line 2597 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeWDay(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4765 "seclang-parser.cc" ++#line 4789 "seclang-parser.cc" + break; + +- case 333: // var: "RUN_TIME_VAR_TIME_YEAR" +-#line 2590 "seclang-parser.yy" ++ case 336: // var: "RUN_TIME_VAR_TIME_YEAR" ++#line 2604 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeYear(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4776 "seclang-parser.cc" ++#line 4800 "seclang-parser.cc" + break; + +- case 334: // act: "Accuracy" +-#line 2600 "seclang-parser.yy" ++ case 337: // act: "Accuracy" ++#line 2614 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Accuracy(yystack_[0].value.as < std::string > ())); + } +-#line 4784 "seclang-parser.cc" ++#line 4808 "seclang-parser.cc" + break; + +- case 335: // act: "Allow" +-#line 2604 "seclang-parser.yy" ++ case 338: // act: "Allow" ++#line 2618 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Allow(yystack_[0].value.as < std::string > ())); + } +-#line 4792 "seclang-parser.cc" ++#line 4816 "seclang-parser.cc" + break; + +- case 336: // act: "Append" +-#line 2608 "seclang-parser.yy" ++ case 339: // act: "Append" ++#line 2622 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Append", yystack_[1].location); + } +-#line 4800 "seclang-parser.cc" ++#line 4824 "seclang-parser.cc" + break; + +- case 337: // act: "AuditLog" +-#line 2612 "seclang-parser.yy" ++ case 340: // act: "AuditLog" ++#line 2626 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::AuditLog(yystack_[0].value.as < std::string > ())); + } +-#line 4808 "seclang-parser.cc" ++#line 4832 "seclang-parser.cc" + break; + +- case 338: // act: "Block" +-#line 2616 "seclang-parser.yy" ++ case 341: // act: "Block" ++#line 2630 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Block(yystack_[0].value.as < std::string > ())); + } +-#line 4816 "seclang-parser.cc" ++#line 4840 "seclang-parser.cc" + break; + +- case 339: // act: "Capture" +-#line 2620 "seclang-parser.yy" ++ case 342: // act: "Capture" ++#line 2634 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Capture(yystack_[0].value.as < std::string > ())); + } +-#line 4824 "seclang-parser.cc" ++#line 4848 "seclang-parser.cc" + break; + +- case 340: // act: "Chain" +-#line 2624 "seclang-parser.yy" ++ case 343: // act: "Chain" ++#line 2638 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Chain(yystack_[0].value.as < std::string > ())); + } +-#line 4832 "seclang-parser.cc" ++#line 4856 "seclang-parser.cc" + break; + +- case 341: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_ON" +-#line 2628 "seclang-parser.yy" ++ case 344: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_ON" ++#line 2642 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditEngine("ctl:auditengine=on")); + driver.m_auditLog->setCtlAuditEngineActive(); + } +-#line 4841 "seclang-parser.cc" ++#line 4865 "seclang-parser.cc" + break; + +- case 342: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_OFF" +-#line 2633 "seclang-parser.yy" ++ case 345: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_OFF" ++#line 2647 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditEngine("ctl:auditengine=off")); + } +-#line 4849 "seclang-parser.cc" ++#line 4873 "seclang-parser.cc" + break; + +- case 343: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_RELEVANT_ONLY" +-#line 2637 "seclang-parser.yy" ++ case 346: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_RELEVANT_ONLY" ++#line 2651 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditEngine("ctl:auditengine=relevantonly")); + driver.m_auditLog->setCtlAuditEngineActive(); + } +-#line 4858 "seclang-parser.cc" ++#line 4882 "seclang-parser.cc" + break; + +- case 344: // act: "ACTION_CTL_AUDIT_LOG_PARTS" +-#line 2642 "seclang-parser.yy" ++ case 347: // act: "ACTION_CTL_AUDIT_LOG_PARTS" ++#line 2656 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditLogParts(yystack_[0].value.as < std::string > ())); + } +-#line 4866 "seclang-parser.cc" ++#line 4890 "seclang-parser.cc" + break; + +- case 345: // act: "ACTION_CTL_BDY_JSON" +-#line 2646 "seclang-parser.yy" ++ case 348: // act: "ACTION_CTL_BDY_JSON" ++#line 2660 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyProcessorJSON(yystack_[0].value.as < std::string > ())); + } +-#line 4874 "seclang-parser.cc" ++#line 4898 "seclang-parser.cc" + break; + +- case 346: // act: "ACTION_CTL_BDY_XML" +-#line 2650 "seclang-parser.yy" ++ case 349: // act: "ACTION_CTL_BDY_XML" ++#line 2664 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyProcessorXML(yystack_[0].value.as < std::string > ())); + } +-#line 4882 "seclang-parser.cc" ++#line 4906 "seclang-parser.cc" + break; + +- case 347: // act: "ACTION_CTL_BDY_URLENCODED" +-#line 2654 "seclang-parser.yy" ++ case 350: // act: "ACTION_CTL_BDY_URLENCODED" ++#line 2668 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyProcessorURLENCODED(yystack_[0].value.as < std::string > ())); + } +-#line 4890 "seclang-parser.cc" ++#line 4914 "seclang-parser.cc" + break; + +- case 348: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_ON" +-#line 2658 "seclang-parser.yy" ++ case 351: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_ON" ++#line 2672 "seclang-parser.yy" + { + //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0); + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Action(yystack_[1].value.as < std::string > ())); + } +-#line 4899 "seclang-parser.cc" ++#line 4923 "seclang-parser.cc" + break; + +- case 349: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_OFF" +-#line 2663 "seclang-parser.yy" ++ case 352: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_OFF" ++#line 2677 "seclang-parser.yy" + { + //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0); + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Action(yystack_[1].value.as < std::string > ())); + } +-#line 4908 "seclang-parser.cc" ++#line 4932 "seclang-parser.cc" + break; + +- case 350: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_ON" +-#line 2668 "seclang-parser.yy" ++ case 353: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_ON" ++#line 2682 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyAccess(yystack_[1].value.as < std::string > () + "true")); + } +-#line 4916 "seclang-parser.cc" ++#line 4940 "seclang-parser.cc" + break; + +- case 351: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_OFF" +-#line 2672 "seclang-parser.yy" ++ case 354: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_OFF" ++#line 2686 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyAccess(yystack_[1].value.as < std::string > () + "false")); + } +-#line 4924 "seclang-parser.cc" ++#line 4948 "seclang-parser.cc" + break; + +- case 352: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_ON" +-#line 2676 "seclang-parser.yy" ++ case 355: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_ON" ++#line 2690 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=on")); + } +-#line 4932 "seclang-parser.cc" ++#line 4956 "seclang-parser.cc" + break; + +- case 353: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_OFF" +-#line 2680 "seclang-parser.yy" ++ case 356: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_OFF" ++#line 2694 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=off")); + } +-#line 4940 "seclang-parser.cc" ++#line 4964 "seclang-parser.cc" + break; + +- case 354: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_DETC" +-#line 2684 "seclang-parser.yy" ++ case 357: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_DETC" ++#line 2698 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=detectiononly")); + } +-#line 4948 "seclang-parser.cc" ++#line 4972 "seclang-parser.cc" + break; + +- case 355: // act: "ACTION_CTL_RULE_REMOVE_BY_ID" +-#line 2688 "seclang-parser.yy" ++ case 358: // act: "ACTION_CTL_RULE_REMOVE_BY_ID" ++#line 2702 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveById(yystack_[0].value.as < std::string > ())); + } +-#line 4956 "seclang-parser.cc" ++#line 4980 "seclang-parser.cc" + break; + +- case 356: // act: "ACTION_CTL_RULE_REMOVE_BY_TAG" +-#line 2692 "seclang-parser.yy" ++ case 359: // act: "ACTION_CTL_RULE_REMOVE_BY_TAG" ++#line 2706 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveByTag(yystack_[0].value.as < std::string > ())); + } +-#line 4964 "seclang-parser.cc" ++#line 4988 "seclang-parser.cc" + break; + +- case 357: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" +-#line 2696 "seclang-parser.yy" ++ case 360: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" ++#line 2710 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveTargetById(yystack_[0].value.as < std::string > ())); + } +-#line 4972 "seclang-parser.cc" ++#line 4996 "seclang-parser.cc" + break; + +- case 358: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" +-#line 2700 "seclang-parser.yy" ++ case 361: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" ++#line 2714 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveTargetByTag(yystack_[0].value.as < std::string > ())); + } +-#line 4980 "seclang-parser.cc" ++#line 5004 "seclang-parser.cc" + break; + +- case 359: // act: "Deny" +-#line 2704 "seclang-parser.yy" ++ case 362: // act: "Deny" ++#line 2718 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Deny(yystack_[0].value.as < std::string > ())); + } +-#line 4988 "seclang-parser.cc" ++#line 5012 "seclang-parser.cc" + break; + +- case 360: // act: "DeprecateVar" +-#line 2708 "seclang-parser.yy" ++ case 363: // act: "DeprecateVar" ++#line 2722 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("DeprecateVar", yystack_[1].location); + } +-#line 4996 "seclang-parser.cc" ++#line 5020 "seclang-parser.cc" + break; + +- case 361: // act: "Drop" +-#line 2712 "seclang-parser.yy" ++ case 364: // act: "Drop" ++#line 2726 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Drop(yystack_[0].value.as < std::string > ())); + } +-#line 5004 "seclang-parser.cc" ++#line 5028 "seclang-parser.cc" + break; + +- case 362: // act: "Exec" +-#line 2716 "seclang-parser.yy" ++ case 365: // act: "Exec" ++#line 2730 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Exec(yystack_[0].value.as < std::string > ())); + } +-#line 5012 "seclang-parser.cc" ++#line 5036 "seclang-parser.cc" + break; + +- case 363: // act: "ExpireVar" +-#line 2720 "seclang-parser.yy" ++ case 366: // act: "ExpireVar" ++#line 2734 "seclang-parser.yy" + { + //ACTION_NOT_SUPPORTED("ExpireVar", @0); + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Action(yystack_[0].value.as < std::string > ())); + } +-#line 5021 "seclang-parser.cc" ++#line 5045 "seclang-parser.cc" + break; + +- case 364: // act: "Id" +-#line 2725 "seclang-parser.yy" ++ case 367: // act: "Id" ++#line 2739 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::RuleId(yystack_[0].value.as < std::string > ())); + } +-#line 5029 "seclang-parser.cc" ++#line 5053 "seclang-parser.cc" + break; + +- case 365: // act: "InitCol" run_time_string +-#line 2729 "seclang-parser.yy" ++ case 368: // act: "InitCol" run_time_string ++#line 2743 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::InitCol(yystack_[1].value.as < std::string > (), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5037 "seclang-parser.cc" ++#line 5061 "seclang-parser.cc" + break; + +- case 366: // act: "LogData" run_time_string +-#line 2733 "seclang-parser.yy" ++ case 369: // act: "LogData" run_time_string ++#line 2747 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::LogData(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5045 "seclang-parser.cc" ++#line 5069 "seclang-parser.cc" + break; + +- case 367: // act: "Log" +-#line 2737 "seclang-parser.yy" ++ case 370: // act: "Log" ++#line 2751 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Log(yystack_[0].value.as < std::string > ())); + } +-#line 5053 "seclang-parser.cc" ++#line 5077 "seclang-parser.cc" + break; + +- case 368: // act: "Maturity" +-#line 2741 "seclang-parser.yy" ++ case 371: // act: "Maturity" ++#line 2755 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Maturity(yystack_[0].value.as < std::string > ())); + } +-#line 5061 "seclang-parser.cc" ++#line 5085 "seclang-parser.cc" + break; + +- case 369: // act: "Msg" run_time_string +-#line 2745 "seclang-parser.yy" ++ case 372: // act: "Msg" run_time_string ++#line 2759 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Msg(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5069 "seclang-parser.cc" ++#line 5093 "seclang-parser.cc" + break; + +- case 370: // act: "MultiMatch" +-#line 2749 "seclang-parser.yy" ++ case 373: // act: "MultiMatch" ++#line 2763 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::MultiMatch(yystack_[0].value.as < std::string > ())); + } +-#line 5077 "seclang-parser.cc" ++#line 5101 "seclang-parser.cc" + break; + +- case 371: // act: "NoAuditLog" +-#line 2753 "seclang-parser.yy" ++ case 374: // act: "NoAuditLog" ++#line 2767 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::NoAuditLog(yystack_[0].value.as < std::string > ())); + } +-#line 5085 "seclang-parser.cc" ++#line 5109 "seclang-parser.cc" + break; + +- case 372: // act: "NoLog" +-#line 2757 "seclang-parser.yy" ++ case 375: // act: "NoLog" ++#line 2771 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::NoLog(yystack_[0].value.as < std::string > ())); + } +-#line 5093 "seclang-parser.cc" ++#line 5117 "seclang-parser.cc" + break; + +- case 373: // act: "Pass" +-#line 2761 "seclang-parser.yy" ++ case 376: // act: "Pass" ++#line 2775 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Pass(yystack_[0].value.as < std::string > ())); + } +-#line 5101 "seclang-parser.cc" ++#line 5125 "seclang-parser.cc" + break; + +- case 374: // act: "Pause" +-#line 2765 "seclang-parser.yy" ++ case 377: // act: "Pause" ++#line 2779 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Pause", yystack_[1].location); + } +-#line 5109 "seclang-parser.cc" ++#line 5133 "seclang-parser.cc" + break; + +- case 375: // act: "Phase" +-#line 2769 "seclang-parser.yy" ++ case 378: // act: "Phase" ++#line 2783 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Phase(yystack_[0].value.as < std::string > ())); + } +-#line 5117 "seclang-parser.cc" ++#line 5141 "seclang-parser.cc" + break; + +- case 376: // act: "Prepend" +-#line 2773 "seclang-parser.yy" ++ case 379: // act: "Prepend" ++#line 2787 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Prepend", yystack_[1].location); + } +-#line 5125 "seclang-parser.cc" ++#line 5149 "seclang-parser.cc" + break; + +- case 377: // act: "Proxy" +-#line 2777 "seclang-parser.yy" ++ case 380: // act: "Proxy" ++#line 2791 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Proxy", yystack_[1].location); + } +-#line 5133 "seclang-parser.cc" ++#line 5157 "seclang-parser.cc" + break; + +- case 378: // act: "Redirect" run_time_string +-#line 2781 "seclang-parser.yy" ++ case 381: // act: "Redirect" run_time_string ++#line 2795 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Redirect(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5141 "seclang-parser.cc" ++#line 5165 "seclang-parser.cc" + break; + +- case 379: // act: "Rev" +-#line 2785 "seclang-parser.yy" ++ case 382: // act: "Rev" ++#line 2799 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Rev(yystack_[0].value.as < std::string > ())); + } +-#line 5149 "seclang-parser.cc" ++#line 5173 "seclang-parser.cc" + break; + +- case 380: // act: "SanitiseArg" +-#line 2789 "seclang-parser.yy" ++ case 383: // act: "SanitiseArg" ++#line 2803 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseArg", yystack_[1].location); + } +-#line 5157 "seclang-parser.cc" ++#line 5181 "seclang-parser.cc" + break; + +- case 381: // act: "SanitiseMatched" +-#line 2793 "seclang-parser.yy" ++ case 384: // act: "SanitiseMatched" ++#line 2807 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseMatched", yystack_[1].location); + } +-#line 5165 "seclang-parser.cc" ++#line 5189 "seclang-parser.cc" + break; + +- case 382: // act: "SanitiseMatchedBytes" +-#line 2797 "seclang-parser.yy" ++ case 385: // act: "SanitiseMatchedBytes" ++#line 2811 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseMatchedBytes", yystack_[1].location); + } +-#line 5173 "seclang-parser.cc" ++#line 5197 "seclang-parser.cc" + break; + +- case 383: // act: "SanitiseRequestHeader" +-#line 2801 "seclang-parser.yy" ++ case 386: // act: "SanitiseRequestHeader" ++#line 2815 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseRequestHeader", yystack_[1].location); + } +-#line 5181 "seclang-parser.cc" ++#line 5205 "seclang-parser.cc" + break; + +- case 384: // act: "SanitiseResponseHeader" +-#line 2805 "seclang-parser.yy" ++ case 387: // act: "SanitiseResponseHeader" ++#line 2819 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseResponseHeader", yystack_[1].location); + } +-#line 5189 "seclang-parser.cc" ++#line 5213 "seclang-parser.cc" + break; + +- case 385: // act: "SetEnv" run_time_string +-#line 2809 "seclang-parser.yy" ++ case 388: // act: "SetEnv" run_time_string ++#line 2823 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetENV(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5197 "seclang-parser.cc" ++#line 5221 "seclang-parser.cc" + break; + +- case 386: // act: "SetRsc" run_time_string +-#line 2813 "seclang-parser.yy" ++ case 389: // act: "SetRsc" run_time_string ++#line 2827 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetRSC(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5205 "seclang-parser.cc" ++#line 5229 "seclang-parser.cc" + break; + +- case 387: // act: "SetSid" run_time_string +-#line 2817 "seclang-parser.yy" ++ case 390: // act: "SetSid" run_time_string ++#line 2831 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetSID(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5213 "seclang-parser.cc" ++#line 5237 "seclang-parser.cc" + break; + +- case 388: // act: "SetUID" run_time_string +-#line 2821 "seclang-parser.yy" ++ case 391: // act: "SetUID" run_time_string ++#line 2835 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetUID(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5221 "seclang-parser.cc" ++#line 5245 "seclang-parser.cc" + break; + +- case 389: // act: "SetVar" setvar_action +-#line 2825 "seclang-parser.yy" ++ case 392: // act: "SetVar" setvar_action ++#line 2839 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[0].value.as < std::unique_ptr > ()); + } +-#line 5229 "seclang-parser.cc" ++#line 5253 "seclang-parser.cc" + break; + +- case 390: // act: "Severity" +-#line 2829 "seclang-parser.yy" ++ case 393: // act: "Severity" ++#line 2843 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Severity(yystack_[0].value.as < std::string > ())); + } +-#line 5237 "seclang-parser.cc" ++#line 5261 "seclang-parser.cc" + break; + +- case 391: // act: "Skip" +-#line 2833 "seclang-parser.yy" ++ case 394: // act: "Skip" ++#line 2847 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Skip(yystack_[0].value.as < std::string > ())); + } +-#line 5245 "seclang-parser.cc" ++#line 5269 "seclang-parser.cc" + break; + +- case 392: // act: "SkipAfter" +-#line 2837 "seclang-parser.yy" ++ case 395: // act: "SkipAfter" ++#line 2851 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SkipAfter(yystack_[0].value.as < std::string > ())); + } +-#line 5253 "seclang-parser.cc" ++#line 5277 "seclang-parser.cc" + break; + +- case 393: // act: "Status" +-#line 2841 "seclang-parser.yy" ++ case 396: // act: "Status" ++#line 2855 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::data::Status(yystack_[0].value.as < std::string > ())); + } +-#line 5261 "seclang-parser.cc" ++#line 5285 "seclang-parser.cc" + break; + +- case 394: // act: "Tag" run_time_string +-#line 2845 "seclang-parser.yy" ++ case 397: // act: "Tag" run_time_string ++#line 2859 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Tag(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5269 "seclang-parser.cc" ++#line 5293 "seclang-parser.cc" + break; + +- case 395: // act: "Ver" +-#line 2849 "seclang-parser.yy" ++ case 398: // act: "Ver" ++#line 2863 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Ver(yystack_[0].value.as < std::string > ())); + } +-#line 5277 "seclang-parser.cc" ++#line 5301 "seclang-parser.cc" + break; + +- case 396: // act: "xmlns" +-#line 2853 "seclang-parser.yy" ++ case 399: // act: "xmlns" ++#line 2867 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::XmlNS(yystack_[0].value.as < std::string > ())); + } +-#line 5285 "seclang-parser.cc" ++#line 5309 "seclang-parser.cc" + break; + +- case 397: // act: "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" +-#line 2857 "seclang-parser.yy" ++ case 400: // act: "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" ++#line 2871 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ParityZero7bit(yystack_[0].value.as < std::string > ())); + } +-#line 5293 "seclang-parser.cc" ++#line 5317 "seclang-parser.cc" + break; + +- case 398: // act: "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" +-#line 2861 "seclang-parser.yy" ++ case 401: // act: "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" ++#line 2875 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ParityOdd7bit(yystack_[0].value.as < std::string > ())); + } +-#line 5301 "seclang-parser.cc" ++#line 5325 "seclang-parser.cc" + break; + +- case 399: // act: "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" +-#line 2865 "seclang-parser.yy" ++ case 402: // act: "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" ++#line 2879 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ParityEven7bit(yystack_[0].value.as < std::string > ())); + } +-#line 5309 "seclang-parser.cc" ++#line 5333 "seclang-parser.cc" + break; + +- case 400: // act: "ACTION_TRANSFORMATION_SQL_HEX_DECODE" +-#line 2869 "seclang-parser.yy" ++ case 403: // act: "ACTION_TRANSFORMATION_SQL_HEX_DECODE" ++#line 2883 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::SqlHexDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5317 "seclang-parser.cc" ++#line 5341 "seclang-parser.cc" + break; + +- case 401: // act: "ACTION_TRANSFORMATION_BASE_64_ENCODE" +-#line 2873 "seclang-parser.yy" ++ case 404: // act: "ACTION_TRANSFORMATION_BASE_64_ENCODE" ++#line 2887 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Base64Encode(yystack_[0].value.as < std::string > ())); + } +-#line 5325 "seclang-parser.cc" ++#line 5349 "seclang-parser.cc" + break; + +- case 402: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE" +-#line 2877 "seclang-parser.yy" ++ case 405: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE" ++#line 2891 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Base64Decode(yystack_[0].value.as < std::string > ())); + } +-#line 5333 "seclang-parser.cc" ++#line 5357 "seclang-parser.cc" + break; + +- case 403: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" +-#line 2881 "seclang-parser.yy" ++ case 406: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" ++#line 2895 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Base64DecodeExt(yystack_[0].value.as < std::string > ())); + } +-#line 5341 "seclang-parser.cc" ++#line 5365 "seclang-parser.cc" + break; + +- case 404: // act: "ACTION_TRANSFORMATION_CMD_LINE" +-#line 2885 "seclang-parser.yy" ++ case 407: // act: "ACTION_TRANSFORMATION_CMD_LINE" ++#line 2899 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::CmdLine(yystack_[0].value.as < std::string > ())); + } +-#line 5349 "seclang-parser.cc" ++#line 5373 "seclang-parser.cc" + break; + +- case 405: // act: "ACTION_TRANSFORMATION_SHA1" +-#line 2889 "seclang-parser.yy" ++ case 408: // act: "ACTION_TRANSFORMATION_SHA1" ++#line 2903 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Sha1(yystack_[0].value.as < std::string > ())); + } +-#line 5357 "seclang-parser.cc" ++#line 5381 "seclang-parser.cc" + break; + +- case 406: // act: "ACTION_TRANSFORMATION_MD5" +-#line 2893 "seclang-parser.yy" ++ case 409: // act: "ACTION_TRANSFORMATION_MD5" ++#line 2907 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Md5(yystack_[0].value.as < std::string > ())); + } +-#line 5365 "seclang-parser.cc" ++#line 5389 "seclang-parser.cc" + break; + +- case 407: // act: "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" +-#line 2897 "seclang-parser.yy" ++ case 410: // act: "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" ++#line 2911 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::EscapeSeqDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5373 "seclang-parser.cc" ++#line 5397 "seclang-parser.cc" + break; + +- case 408: // act: "ACTION_TRANSFORMATION_HEX_ENCODE" +-#line 2901 "seclang-parser.yy" ++ case 411: // act: "ACTION_TRANSFORMATION_HEX_ENCODE" ++#line 2915 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::HexEncode(yystack_[0].value.as < std::string > ())); + } +-#line 5381 "seclang-parser.cc" ++#line 5405 "seclang-parser.cc" + break; + +- case 409: // act: "ACTION_TRANSFORMATION_HEX_DECODE" +-#line 2905 "seclang-parser.yy" ++ case 412: // act: "ACTION_TRANSFORMATION_HEX_DECODE" ++#line 2919 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::HexDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5389 "seclang-parser.cc" ++#line 5413 "seclang-parser.cc" + break; + +- case 410: // act: "ACTION_TRANSFORMATION_LOWERCASE" +-#line 2909 "seclang-parser.yy" ++ case 413: // act: "ACTION_TRANSFORMATION_LOWERCASE" ++#line 2923 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::LowerCase(yystack_[0].value.as < std::string > ())); + } +-#line 5397 "seclang-parser.cc" ++#line 5421 "seclang-parser.cc" + break; + +- case 411: // act: "ACTION_TRANSFORMATION_UPPERCASE" +-#line 2913 "seclang-parser.yy" ++ case 414: // act: "ACTION_TRANSFORMATION_UPPERCASE" ++#line 2927 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UpperCase(yystack_[0].value.as < std::string > ())); + } +-#line 5405 "seclang-parser.cc" ++#line 5429 "seclang-parser.cc" + break; + +- case 412: // act: "ACTION_TRANSFORMATION_URL_DECODE_UNI" +-#line 2917 "seclang-parser.yy" ++ case 415: // act: "ACTION_TRANSFORMATION_URL_DECODE_UNI" ++#line 2931 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UrlDecodeUni(yystack_[0].value.as < std::string > ())); + } +-#line 5413 "seclang-parser.cc" ++#line 5437 "seclang-parser.cc" + break; + +- case 413: // act: "ACTION_TRANSFORMATION_URL_DECODE" +-#line 2921 "seclang-parser.yy" ++ case 416: // act: "ACTION_TRANSFORMATION_URL_DECODE" ++#line 2935 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UrlDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5421 "seclang-parser.cc" ++#line 5445 "seclang-parser.cc" + break; + +- case 414: // act: "ACTION_TRANSFORMATION_URL_ENCODE" +-#line 2925 "seclang-parser.yy" ++ case 417: // act: "ACTION_TRANSFORMATION_URL_ENCODE" ++#line 2939 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UrlEncode(yystack_[0].value.as < std::string > ())); + } +-#line 5429 "seclang-parser.cc" ++#line 5453 "seclang-parser.cc" + break; + +- case 415: // act: "ACTION_TRANSFORMATION_NONE" +-#line 2929 "seclang-parser.yy" ++ case 418: // act: "ACTION_TRANSFORMATION_NONE" ++#line 2943 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::None(yystack_[0].value.as < std::string > ())); + } +-#line 5437 "seclang-parser.cc" ++#line 5461 "seclang-parser.cc" + break; + +- case 416: // act: "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" +-#line 2933 "seclang-parser.yy" ++ case 419: // act: "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" ++#line 2947 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::CompressWhitespace(yystack_[0].value.as < std::string > ())); + } +-#line 5445 "seclang-parser.cc" ++#line 5469 "seclang-parser.cc" + break; + +- case 417: // act: "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" +-#line 2937 "seclang-parser.yy" ++ case 420: // act: "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" ++#line 2951 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveWhitespace(yystack_[0].value.as < std::string > ())); + } +-#line 5453 "seclang-parser.cc" ++#line 5477 "seclang-parser.cc" + break; + +- case 418: // act: "ACTION_TRANSFORMATION_REPLACE_NULLS" +-#line 2941 "seclang-parser.yy" ++ case 421: // act: "ACTION_TRANSFORMATION_REPLACE_NULLS" ++#line 2955 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ReplaceNulls(yystack_[0].value.as < std::string > ())); + } +-#line 5461 "seclang-parser.cc" ++#line 5485 "seclang-parser.cc" + break; + +- case 419: // act: "ACTION_TRANSFORMATION_REMOVE_NULLS" +-#line 2945 "seclang-parser.yy" ++ case 422: // act: "ACTION_TRANSFORMATION_REMOVE_NULLS" ++#line 2959 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveNulls(yystack_[0].value.as < std::string > ())); + } +-#line 5469 "seclang-parser.cc" ++#line 5493 "seclang-parser.cc" + break; + +- case 420: // act: "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" +-#line 2949 "seclang-parser.yy" ++ case 423: // act: "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" ++#line 2963 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::HtmlEntityDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5477 "seclang-parser.cc" ++#line 5501 "seclang-parser.cc" + break; + +- case 421: // act: "ACTION_TRANSFORMATION_JS_DECODE" +-#line 2953 "seclang-parser.yy" ++ case 424: // act: "ACTION_TRANSFORMATION_JS_DECODE" ++#line 2967 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::JsDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5485 "seclang-parser.cc" ++#line 5509 "seclang-parser.cc" + break; + +- case 422: // act: "ACTION_TRANSFORMATION_CSS_DECODE" +-#line 2957 "seclang-parser.yy" ++ case 425: // act: "ACTION_TRANSFORMATION_CSS_DECODE" ++#line 2971 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::CssDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5493 "seclang-parser.cc" ++#line 5517 "seclang-parser.cc" + break; + +- case 423: // act: "ACTION_TRANSFORMATION_TRIM" +-#line 2961 "seclang-parser.yy" ++ case 426: // act: "ACTION_TRANSFORMATION_TRIM" ++#line 2975 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Trim(yystack_[0].value.as < std::string > ())); + } +-#line 5501 "seclang-parser.cc" ++#line 5525 "seclang-parser.cc" + break; + +- case 424: // act: "ACTION_TRANSFORMATION_TRIM_LEFT" +-#line 2965 "seclang-parser.yy" ++ case 427: // act: "ACTION_TRANSFORMATION_TRIM_LEFT" ++#line 2979 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::TrimLeft(yystack_[0].value.as < std::string > ())); + } +-#line 5509 "seclang-parser.cc" ++#line 5533 "seclang-parser.cc" + break; + +- case 425: // act: "ACTION_TRANSFORMATION_TRIM_RIGHT" +-#line 2969 "seclang-parser.yy" ++ case 428: // act: "ACTION_TRANSFORMATION_TRIM_RIGHT" ++#line 2983 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::TrimRight(yystack_[0].value.as < std::string > ())); + } +-#line 5517 "seclang-parser.cc" ++#line 5541 "seclang-parser.cc" + break; + +- case 426: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" +-#line 2973 "seclang-parser.yy" ++ case 429: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" ++#line 2987 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::NormalisePathWin(yystack_[0].value.as < std::string > ())); + } +-#line 5525 "seclang-parser.cc" ++#line 5549 "seclang-parser.cc" + break; + +- case 427: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH" +-#line 2977 "seclang-parser.yy" ++ case 430: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH" ++#line 2991 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::NormalisePath(yystack_[0].value.as < std::string > ())); + } +-#line 5533 "seclang-parser.cc" ++#line 5557 "seclang-parser.cc" + break; + +- case 428: // act: "ACTION_TRANSFORMATION_LENGTH" +-#line 2981 "seclang-parser.yy" ++ case 431: // act: "ACTION_TRANSFORMATION_LENGTH" ++#line 2995 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Length(yystack_[0].value.as < std::string > ())); + } +-#line 5541 "seclang-parser.cc" ++#line 5565 "seclang-parser.cc" + break; + +- case 429: // act: "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" +-#line 2985 "seclang-parser.yy" ++ case 432: // act: "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" ++#line 2999 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Utf8ToUnicode(yystack_[0].value.as < std::string > ())); + } +-#line 5549 "seclang-parser.cc" ++#line 5573 "seclang-parser.cc" + break; + +- case 430: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" +-#line 2989 "seclang-parser.yy" ++ case 433: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" ++#line 3003 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveCommentsChar(yystack_[0].value.as < std::string > ())); + } +-#line 5557 "seclang-parser.cc" ++#line 5581 "seclang-parser.cc" + break; + +- case 431: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS" +-#line 2993 "seclang-parser.yy" ++ case 434: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS" ++#line 3007 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveComments(yystack_[0].value.as < std::string > ())); + } +-#line 5565 "seclang-parser.cc" ++#line 5589 "seclang-parser.cc" + break; + +- case 432: // act: "ACTION_TRANSFORMATION_REPLACE_COMMENTS" +-#line 2997 "seclang-parser.yy" ++ case 435: // act: "ACTION_TRANSFORMATION_REPLACE_COMMENTS" ++#line 3011 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ReplaceComments(yystack_[0].value.as < std::string > ())); + } +-#line 5573 "seclang-parser.cc" ++#line 5597 "seclang-parser.cc" + break; + +- case 433: // setvar_action: "NOT" var +-#line 3004 "seclang-parser.yy" ++ case 436: // setvar_action: "NOT" var ++#line 3018 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::unsetOperation, std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5581 "seclang-parser.cc" ++#line 5605 "seclang-parser.cc" + break; + +- case 434: // setvar_action: var +-#line 3008 "seclang-parser.yy" ++ case 437: // setvar_action: var ++#line 3022 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::setToOneOperation, std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5589 "seclang-parser.cc" ++#line 5613 "seclang-parser.cc" + break; + +- case 435: // setvar_action: var SETVAR_OPERATION_EQUALS run_time_string +-#line 3012 "seclang-parser.yy" ++ case 438: // setvar_action: var SETVAR_OPERATION_EQUALS run_time_string ++#line 3026 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::setOperation, std::move(yystack_[2].value.as < std::unique_ptr > ()), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5597 "seclang-parser.cc" ++#line 5621 "seclang-parser.cc" + break; + +- case 436: // setvar_action: var SETVAR_OPERATION_EQUALS_PLUS run_time_string +-#line 3016 "seclang-parser.yy" ++ case 439: // setvar_action: var SETVAR_OPERATION_EQUALS_PLUS run_time_string ++#line 3030 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::sumAndSetOperation, std::move(yystack_[2].value.as < std::unique_ptr > ()), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5605 "seclang-parser.cc" ++#line 5629 "seclang-parser.cc" + break; + +- case 437: // setvar_action: var SETVAR_OPERATION_EQUALS_MINUS run_time_string +-#line 3020 "seclang-parser.yy" ++ case 440: // setvar_action: var SETVAR_OPERATION_EQUALS_MINUS run_time_string ++#line 3034 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::substractAndSetOperation, std::move(yystack_[2].value.as < std::unique_ptr > ()), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5613 "seclang-parser.cc" ++#line 5637 "seclang-parser.cc" + break; + +- case 438: // run_time_string: run_time_string "FREE_TEXT_QUOTE_MACRO_EXPANSION" +-#line 3027 "seclang-parser.yy" ++ case 441: // run_time_string: run_time_string "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++#line 3041 "seclang-parser.yy" + { + yystack_[1].value.as < std::unique_ptr > ()->appendText(yystack_[0].value.as < std::string > ()); + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[1].value.as < std::unique_ptr > ()); + } +-#line 5622 "seclang-parser.cc" ++#line 5646 "seclang-parser.cc" + break; + +- case 439: // run_time_string: run_time_string var +-#line 3032 "seclang-parser.yy" ++ case 442: // run_time_string: run_time_string var ++#line 3046 "seclang-parser.yy" + { + yystack_[1].value.as < std::unique_ptr > ()->appendVar(std::move(yystack_[0].value.as < std::unique_ptr > ())); + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[1].value.as < std::unique_ptr > ()); + } +-#line 5631 "seclang-parser.cc" ++#line 5655 "seclang-parser.cc" + break; + +- case 440: // run_time_string: "FREE_TEXT_QUOTE_MACRO_EXPANSION" +-#line 3037 "seclang-parser.yy" ++ case 443: // run_time_string: "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++#line 3051 "seclang-parser.yy" + { + std::unique_ptr r(new RunTimeString()); + r->appendText(yystack_[0].value.as < std::string > ()); + yylhs.value.as < std::unique_ptr > () = std::move(r); + } +-#line 5641 "seclang-parser.cc" ++#line 5665 "seclang-parser.cc" + break; + +- case 441: // run_time_string: var +-#line 3043 "seclang-parser.yy" ++ case 444: // run_time_string: var ++#line 3057 "seclang-parser.yy" + { + std::unique_ptr r(new RunTimeString()); + r->appendVar(std::move(yystack_[0].value.as < std::unique_ptr > ())); + yylhs.value.as < std::unique_ptr > () = std::move(r); + } +-#line 5651 "seclang-parser.cc" ++#line 5675 "seclang-parser.cc" + break; + + +-#line 5655 "seclang-parser.cc" ++#line 5679 "seclang-parser.cc" + + default: + break; +@@ -6000,66 +6024,67 @@ namespace yy { + } + + +- const short seclang_parser::yypact_ninf_ = -413; ++ const short seclang_parser::yypact_ninf_ = -402; + + const signed char seclang_parser::yytable_ninf_ = -1; + + const short + seclang_parser::yypact_[] = + { +- 2507, -413, -256, -413, -91, -413, -251, -413, -413, -413, +- -413, -413, -275, -413, -413, -413, -413, -413, -290, -413, +- -413, -413, -249, -158, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -155, +- -413, -413, -156, -413, -148, -413, -149, -144, -413, -283, +- 2855, 2855, -413, -413, -413, -413, -142, -300, -413, -413, +- -413, 1149, 1149, 1149, 2855, -269, -133, -413, -413, -413, +- -131, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- 1149, 2855, 2668, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, 2125, -261, -413, -413, -413, +- -413, -413, -413, -413, -267, -413, -413, -413, -413, -129, +- -127, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, 2219, -413, 2219, -413, 2219, -413, -413, -413, -413, +- -413, -413, -413, -413, 2219, -413, -413, -413, -413, -413, +- -413, 2219, 2219, 2219, 2219, -413, -413, -413, -413, 2219, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, 3038, -413, +- 2, -413, -413, -413, -413, -413, -413, 2550, 2550, -161, +- -159, -157, -154, -152, -150, -147, -145, -143, -140, -138, +- -136, -132, -130, -128, -126, -413, -124, -122, -120, -118, +- -413, -413, -116, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -114, -413, +- -413, -413, -413, -413, 49, -413, -413, -413, -112, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, 457, 546, 635, 969, 1058, -110, -108, 1482, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, 4, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, 1662, -413, -413, -413, -413, +- 2550, -53, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, 3, 3038, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, 2324, -413, -413, -413, -413, 2324, +- -413, -413, 2324, -413, -413, 2324, -413, -413, 2324, -413, +- -413, 2324, -413, -413, -413, -413, 8, 1573, 1993, 2219, +- 2219, 2219, -413, -413, 2219, 2219, 2219, -413, 2219, 2219, +- 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, +- 2219, 2219, 2219, 2219, -413, 2219, 2219, 2219, 2219, -413, +- -413, 2219, 2219, 2219, 2219, 2219, 2855, -413, 2324, -413, +- 2219, 2219, 2219, -413, -413, -413, -413, -413, 2550, 2550, +- -413, -413, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, -413, 2324, 2324, 2324, -413, -413 ++ 2776, -402, -277, -402, -100, -402, -157, -402, -402, -402, ++ -402, -402, -292, -402, -402, -402, -402, -402, -274, -402, ++ -402, -402, -155, -153, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -149, ++ -402, -402, -150, -402, -145, -402, -146, -135, -402, -284, ++ -90, -90, -402, -402, -402, -402, -133, -301, -402, -402, ++ -402, 1492, 1492, 1492, -90, -271, -131, -402, -402, -402, ++ -129, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ 1492, -90, 2920, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, 2340, -259, -402, -402, -402, ++ -402, -402, -402, -402, -265, -402, -402, -402, -402, -127, ++ -125, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, 2473, -402, 2473, -402, 2473, -402, -402, -402, -402, ++ -402, -402, -402, -402, 2473, -402, -402, -402, -402, -402, ++ -402, 2473, 2473, 2473, 2473, -402, -402, -402, -402, 2473, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, 3107, -402, ++ 2, -402, -402, -402, -402, -402, -402, 2672, 2672, -159, ++ -156, -154, -152, -148, -142, -140, -138, -134, -132, -130, ++ -128, -126, -124, -122, -120, -118, -402, -116, -114, -112, ++ -110, -402, -402, -108, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -104, ++ -402, -402, -402, -402, -402, 460, -402, -402, -402, -102, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, 550, 640, 975, 1065, 1155, -99, -97, 1584, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, 16, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, 2008, -402, -402, -402, ++ -402, 2672, -50, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 3, 3107, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, 2563, -402, -402, ++ -402, -402, 2563, -402, -402, 2563, -402, -402, 2563, -402, ++ -402, 2563, -402, -402, 2563, -402, -402, -402, -402, 8, ++ 1676, 2141, 2473, 2473, 2473, -402, -402, 2473, 2473, 2473, ++ -402, 2473, 2473, 2473, 2473, 2473, 2473, 2473, 2473, 2473, ++ 2473, 2473, 2473, 2473, 2473, 2473, 2473, -402, 2473, 2473, ++ 2473, 2473, -402, -402, 2473, 2473, 2473, 2473, 2473, -90, ++ -402, 2563, -402, 2473, 2473, 2473, -402, -402, -402, -402, ++ -402, 2672, 2672, -402, -402, 2563, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 2563, 2563, -402, 2563, 2563, ++ 2563, -402, -402 + }; + + const short +@@ -6076,216 +6101,218 @@ namespace yy { + 0, 0, 0, 4, 74, 5, 98, 97, 15, 16, + 91, 90, 9, 10, 8, 20, 19, 18, 96, 95, + 101, 100, 85, 84, 134, 135, 87, 86, 136, 137, +- 114, 113, 83, 81, 82, 0, 0, 334, 335, 336, +- 337, 338, 339, 340, 0, 344, 345, 346, 347, 0, +- 0, 355, 356, 357, 358, 359, 360, 361, 362, 363, +- 364, 0, 367, 0, 368, 0, 370, 371, 372, 373, +- 374, 375, 376, 377, 0, 379, 380, 381, 382, 383, +- 384, 0, 0, 0, 0, 390, 391, 392, 393, 0, +- 401, 402, 403, 404, 416, 422, 407, 408, 409, 420, +- 421, 428, 410, 406, 415, 427, 426, 399, 398, 397, +- 431, 430, 419, 417, 432, 418, 405, 400, 423, 424, +- 425, 411, 414, 413, 412, 429, 395, 396, 0, 77, ++ 114, 113, 83, 81, 82, 0, 0, 337, 338, 339, ++ 340, 341, 342, 343, 0, 347, 348, 349, 350, 0, ++ 0, 358, 359, 360, 361, 362, 363, 364, 365, 366, ++ 367, 0, 370, 0, 371, 0, 373, 374, 375, 376, ++ 377, 378, 379, 380, 0, 382, 383, 384, 385, 386, ++ 387, 0, 0, 0, 0, 393, 394, 395, 396, 0, ++ 404, 405, 406, 407, 419, 425, 410, 411, 412, 423, ++ 424, 431, 413, 409, 418, 430, 429, 402, 401, 400, ++ 434, 433, 422, 420, 435, 421, 408, 403, 426, 427, ++ 428, 414, 417, 416, 415, 432, 398, 399, 0, 77, + 30, 32, 79, 109, 108, 138, 139, 0, 0, 166, + 169, 172, 175, 178, 181, 184, 187, 190, 193, 196, +- 199, 202, 205, 208, 211, 264, 253, 214, 250, 256, +- 265, 266, 223, 267, 268, 269, 270, 271, 272, 273, +- 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, +- 284, 285, 286, 287, 288, 289, 290, 291, 292, 294, +- 293, 297, 296, 295, 298, 300, 299, 301, 259, 302, +- 303, 304, 306, 305, 227, 307, 308, 260, 263, 309, +- 310, 311, 312, 313, 314, 315, 316, 317, 320, 318, +- 319, 231, 235, 243, 247, 239, 217, 220, 0, 322, +- 321, 323, 324, 325, 326, 327, 328, 329, 330, 331, +- 332, 333, 121, 156, 161, 122, 123, 124, 22, 21, +- 23, 28, 27, 144, 145, 0, 155, 78, 1, 3, +- 0, 434, 389, 354, 353, 352, 342, 341, 343, 349, +- 348, 351, 350, 440, 441, 365, 366, 369, 378, 385, +- 386, 387, 388, 394, 0, 0, 163, 162, 164, 165, +- 167, 168, 170, 171, 173, 174, 176, 177, 179, 180, +- 182, 183, 185, 186, 188, 189, 191, 192, 194, 195, +- 197, 198, 200, 201, 203, 204, 206, 207, 209, 210, +- 251, 252, 212, 213, 248, 249, 254, 255, 221, 222, +- 257, 258, 225, 226, 224, 261, 262, 229, 230, 228, +- 233, 234, 232, 241, 242, 240, 245, 246, 244, 237, +- 238, 236, 215, 216, 218, 219, 0, 0, 0, 0, +- 0, 0, 38, 39, 0, 0, 0, 73, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 37, 0, 0, 0, 0, 40, +- 41, 0, 0, 0, 0, 0, 76, 33, 35, 433, +- 0, 0, 0, 438, 439, 29, 31, 157, 0, 0, +- 158, 34, 36, 72, 56, 55, 57, 58, 43, 59, +- 52, 60, 42, 61, 62, 63, 64, 65, 66, 67, +- 53, 68, 69, 70, 71, 44, 45, 46, 47, 48, +- 49, 50, 51, 54, 75, 435, 436, 437, 160, 159 ++ 199, 202, 205, 208, 211, 214, 267, 256, 217, 253, ++ 259, 268, 269, 226, 270, 271, 272, 273, 274, 275, ++ 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, ++ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, ++ 297, 296, 300, 299, 298, 301, 303, 302, 304, 262, ++ 305, 306, 307, 309, 308, 230, 310, 311, 263, 266, ++ 312, 313, 314, 315, 316, 317, 318, 319, 320, 323, ++ 321, 322, 234, 238, 246, 250, 242, 220, 223, 0, ++ 325, 324, 326, 327, 328, 329, 330, 331, 332, 333, ++ 334, 335, 336, 121, 156, 161, 122, 123, 124, 22, ++ 21, 23, 28, 27, 144, 145, 0, 155, 78, 1, ++ 3, 0, 437, 392, 357, 356, 355, 345, 344, 346, ++ 352, 351, 354, 353, 443, 444, 368, 369, 372, 381, ++ 388, 389, 390, 391, 397, 0, 0, 163, 162, 164, ++ 165, 167, 168, 170, 171, 173, 174, 176, 177, 179, ++ 180, 182, 183, 185, 186, 188, 189, 191, 192, 194, ++ 195, 197, 198, 200, 201, 203, 204, 206, 207, 209, ++ 210, 212, 213, 254, 255, 215, 216, 251, 252, 257, ++ 258, 224, 225, 260, 261, 228, 229, 227, 264, 265, ++ 232, 233, 231, 236, 237, 235, 244, 245, 243, 248, ++ 249, 247, 240, 241, 239, 218, 219, 221, 222, 0, ++ 0, 0, 0, 0, 0, 38, 39, 0, 0, 0, ++ 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, ++ 0, 0, 40, 41, 0, 0, 0, 0, 0, 76, ++ 33, 35, 436, 0, 0, 0, 441, 442, 29, 31, ++ 157, 0, 0, 158, 34, 36, 72, 56, 55, 57, ++ 58, 43, 59, 52, 60, 42, 61, 62, 63, 64, ++ 65, 66, 67, 53, 68, 69, 70, 71, 44, 45, ++ 46, 47, 48, 49, 50, 51, 54, 75, 438, 439, ++ 440, 160, 159 + }; + + const short + seclang_parser::yypgoto_[] = + { +- -413, -413, -70, -413, -47, -192, -413, -412, -413, -413, +- -55, -153, -61, -332, -413, -134 ++ -402, -402, -74, -402, -47, -170, -402, -401, -402, -402, ++ -51, -254, -61, -316, -402, -136 + }; + + const short + seclang_parser::yydefgoto_[] = + { +- -1, 82, 83, 84, 209, 210, 476, 477, 85, 335, +- 322, 323, 354, 211, 342, 355 ++ -1, 82, 83, 84, 209, 210, 479, 480, 85, 336, ++ 323, 324, 355, 211, 343, 356 + }; + + const short + seclang_parser::yytable_[] = + { +- 324, 324, 324, 215, 212, 365, 365, 325, 326, 356, +- 437, 357, 339, 216, 437, 95, 364, 327, 96, 324, +- 358, 112, 97, 113, 114, 336, 491, 359, 360, 361, +- 362, 92, 93, 486, 337, 363, 94, 328, 329, 346, +- 347, 0, 330, 343, 348, 344, 345, 480, 481, 482, +- 86, 87, 88, 89, 341, 90, 91, 98, 99, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 100, 101, +- 414, 102, 103, 104, 105, 436, 366, 367, 106, 107, +- 108, 109, 110, 111, 213, 214, 0, 419, 422, 425, +- 428, 431, 0, 331, 332, 333, 334, 349, 350, 351, +- 352, 368, 369, 370, 371, 372, 373, 0, 374, 375, +- 376, 377, 378, 379, 0, 380, 381, 382, 383, 384, +- 385, 478, 386, 387, 388, 389, 390, 391, 0, 0, +- 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, +- 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, +- 415, 416, 432, 433, 434, 435, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 324, 0, 0, ++ 325, 325, 325, 215, 212, 366, 366, 357, 340, 358, ++ 115, 326, 327, 216, 440, 92, 93, 328, 359, 325, ++ 94, 112, 440, 113, 114, 360, 361, 362, 363, 337, ++ 86, 87, 95, 364, 338, 96, 329, 330, 365, 97, ++ 494, 331, 347, 348, 88, 89, 344, 349, 345, 346, ++ 489, 483, 484, 485, 342, 439, 116, 117, 118, 119, ++ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, ++ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, ++ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, ++ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, ++ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, ++ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, ++ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, ++ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, ++ 200, 201, 202, 203, 204, 205, 206, 207, 0, 417, ++ 90, 91, 98, 99, 100, 101, 367, 368, 102, 103, ++ 104, 105, 106, 107, 108, 109, 422, 425, 428, 431, ++ 434, 0, 110, 111, 213, 214, 332, 333, 334, 335, ++ 350, 351, 352, 353, 369, 370, 0, 371, 372, 373, ++ 374, 375, 376, 0, 0, 377, 378, 0, 0, 0, ++ 481, 379, 380, 381, 382, 383, 384, 0, 0, 385, ++ 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, ++ 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, ++ 406, 407, 408, 409, 410, 411, 412, 0, 208, 413, ++ 414, 418, 419, 0, 435, 436, 437, 438, 325, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 479, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 0, 492, 493, 494, 495, 0, 0, +- 496, 497, 498, 0, 499, 500, 501, 502, 503, 504, +- 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, +- 485, 515, 516, 517, 518, 487, 0, 519, 520, 521, +- 522, 523, 0, 0, 0, 0, 525, 526, 527, 0, +- 0, 0, 0, 484, 0, 0, 0, 0, 484, 0, +- 0, 484, 0, 0, 484, 0, 0, 484, 0, 0, +- 484, 0, 0, 0, 0, 353, 490, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, +- 0, 412, 413, 0, 0, 0, 0, 0, 0, 0, ++ 482, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 0, 495, 496, 497, 498, 0, ++ 0, 499, 500, 501, 0, 502, 503, 504, 505, 506, ++ 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, ++ 517, 488, 518, 519, 520, 521, 490, 0, 522, 523, ++ 524, 525, 526, 0, 0, 0, 0, 528, 529, 530, ++ 0, 0, 0, 0, 0, 0, 487, 0, 0, 0, ++ 0, 487, 0, 0, 487, 0, 0, 487, 0, 0, ++ 487, 0, 0, 487, 0, 0, 0, 0, 0, 493, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 484, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 528, 529, 524, +- 0, 484, 484, 484, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 484, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 484, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 0, 484, 484, 484, 219, 220, 221, +- 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, +- 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, +- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, +- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, +- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, +- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, +- 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, +- 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, +- 302, 303, 304, 305, 306, 307, 219, 220, 221, 222, +- 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, +- 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, +- 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, +- 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, +- 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, +- 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, +- 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, +- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, +- 303, 304, 305, 306, 307, 219, 220, 221, 222, 223, +- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, +- 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, +- 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, +- 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, +- 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, +- 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, +- 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, +- 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, +- 304, 305, 306, 307, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 487, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 531, 532, 527, 0, 487, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 487, 487, 0, 487, 487, 487, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 353, 0, 309, 310, 311, 312, 313, +- 314, 315, 316, 317, 318, 319, 320, 321, 0, 417, +- 418, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 354, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 0, 415, 416, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 353, 0, 309, 310, 311, 312, 313, 314, +- 315, 316, 317, 318, 319, 320, 321, 0, 420, 421, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 354, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 0, 420, 421, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 353, 0, 309, 310, 311, 312, 313, 314, 315, +- 316, 317, 318, 319, 320, 321, 0, 423, 424, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 219, 220, +- 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, +- 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, +- 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, +- 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, +- 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, +- 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, +- 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, +- 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, +- 301, 302, 303, 304, 305, 306, 307, 217, 218, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 354, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 0, 423, 424, 219, 220, 221, 222, 223, ++ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, ++ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 304, 305, 306, 307, 308, 219, 220, 221, 222, 223, ++ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, ++ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 304, 305, 306, 307, 308, 219, 220, 221, 222, 223, ++ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, ++ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 304, 305, 306, 307, 308, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 353, 0, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, +- 0, 426, 427, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 354, 0, 310, 311, 312, 313, 314, 315, ++ 316, 317, 318, 319, 320, 321, 322, 0, 426, 427, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 353, 0, 309, 310, 311, 312, +- 313, 314, 315, 316, 317, 318, 319, 320, 321, 0, +- 429, 430, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 354, 0, 310, 311, 312, 313, 314, 315, ++ 316, 317, 318, 319, 320, 321, 322, 0, 429, 430, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 308, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 354, 0, 310, 311, 312, 313, 314, 315, ++ 316, 317, 318, 319, 320, 321, 322, 0, 432, 433, + 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, + 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, + 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, +@@ -6295,31 +6322,31 @@ namespace yy { + 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, +- 307, 488, 489, 219, 220, 221, 222, 223, 224, 225, +- 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, +- 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, +- 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, +- 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, +- 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, +- 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, +- 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, +- 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, +- 306, 307, 219, 220, 221, 222, 223, 224, 225, 226, +- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, +- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, +- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, +- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, +- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, +- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, +- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, +- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, +- 307, 0, 0, 0, 0, 438, 439, 440, 441, 442, +- 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, +- 453, 454, 455, 456, 457, 458, 459, 0, 460, 461, +- 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, +- 472, 473, 474, 475, 0, 0, 0, 0, 0, 0, ++ 307, 308, 217, 218, 219, 220, 221, 222, 223, 224, ++ 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, ++ 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, ++ 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, ++ 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, ++ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, ++ 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, ++ 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, ++ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, ++ 305, 306, 307, 308, 491, 492, 219, 220, 221, 222, ++ 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, ++ 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, ++ 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, ++ 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, ++ 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, ++ 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, ++ 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, ++ 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, ++ 303, 304, 305, 306, 307, 308, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, +- 319, 320, 321, 0, 0, 0, 0, 0, 0, 0, ++ 319, 320, 321, 322, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -6327,17 +6354,64 @@ namespace yy { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 309, 310, 311, 312, 313, 314, 315, 316, 317, +- 318, 319, 320, 321, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 310, 311, 312, 313, 314, 315, 316, ++ 317, 318, 319, 320, 321, 322, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 353, 0, +- 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, +- 319, 320, 321, 219, 220, 221, 222, 223, 224, 225, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 310, 311, 312, 313, 314, ++ 315, 316, 317, 318, 319, 320, 321, 322, 219, 220, ++ 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, ++ 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, ++ 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, ++ 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, ++ 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, ++ 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, ++ 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, ++ 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, ++ 301, 302, 303, 304, 305, 306, 307, 308, 0, 0, ++ 0, 0, 441, 442, 443, 444, 445, 446, 447, 448, ++ 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, ++ 459, 460, 461, 462, 0, 463, 464, 465, 466, 467, ++ 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, ++ 478, 219, 220, 221, 222, 223, 224, 225, 226, 227, ++ 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, ++ 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, ++ 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, ++ 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, ++ 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, ++ 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, ++ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, ++ 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, ++ 308, 0, 0, 0, 0, 0, 442, 443, 444, 445, ++ 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, ++ 456, 457, 458, 459, 460, 461, 462, 0, 463, 464, ++ 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, ++ 475, 476, 477, 478, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 354, 0, 310, 311, 312, ++ 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, ++ 0, 0, 0, 0, 341, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 354, 0, ++ 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, ++ 320, 321, 322, 219, 220, 221, 222, 223, 224, 225, + 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, + 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, + 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, +@@ -6346,116 +6420,75 @@ namespace yy { + 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, + 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, + 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, +- 306, 307, 0, 0, 0, 0, 0, 439, 440, 441, +- 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, +- 452, 453, 454, 455, 456, 457, 458, 459, 0, 460, +- 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, +- 471, 472, 473, 474, 475, 219, 220, 221, 222, 223, +- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, +- 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, +- 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, +- 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, +- 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, +- 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, +- 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, +- 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, +- 304, 305, 306, 307, 0, 0, 0, 0, 340, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 0, 353, +- 0, 309, 310, 311, 312, 313, 314, 315, 316, 317, +- 318, 319, 320, 321, 219, 220, 221, 222, 223, 224, +- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, +- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, +- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, +- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, +- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, +- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, +- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, +- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, +- 305, 306, 307, 0, 0, 0, 0, 0, 0, 0, ++ 306, 307, 308, 219, 220, 221, 222, 223, 224, 225, ++ 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, ++ 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, ++ 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, ++ 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, ++ 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, ++ 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, ++ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, ++ 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, ++ 306, 307, 308, 0, 0, 0, 0, 0, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 219, 220, 221, 222, 223, 224, 225, 226, ++ 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, ++ 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, ++ 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, ++ 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, ++ 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, ++ 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, ++ 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, ++ 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, ++ 307, 308, 0, 0, 0, 0, 1, 0, 0, 0, ++ 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 354, 0, 310, 311, 312, 313, 314, 315, 316, 317, ++ 318, 319, 320, 321, 322, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 309, 310, 311, 312, 313, 314, 315, +- 316, 317, 318, 319, 320, 321, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, +- 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 353, 0, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, +- 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, +- 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, +- 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, +- 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, +- 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, +- 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, +- 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, +- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, +- 299, 300, 301, 302, 303, 304, 305, 306, 307, 4, +- 483, 0, 309, 310, 311, 312, 313, 314, 315, 316, +- 317, 318, 319, 320, 321, 0, 0, 0, 338, 0, +- 0, 0, 2, 3, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 486, 0, 310, 311, 312, 313, 314, 315, 316, 317, ++ 318, 319, 320, 321, 322, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, ++ 339, 0, 0, 0, 2, 3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 5, 6, 7, 8, 9, 10, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 310, 311, 312, 313, 314, 315, 316, 317, 318, ++ 319, 320, 321, 322, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 0, 54, 55, 56, 57, 58, 59, ++ 51, 52, 53, 4, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, +- 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 309, 310, +- 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, +- 321, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 5, 6, 7, 8, 9, +- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, +- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, +- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, +- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, +- 50, 51, 52, 53, 115, 54, 55, 56, 57, 58, +- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, +- 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 70, 71, 72, 73, 74, 75, 76, 77, +- 78, 79, 80, 81, 0, 0, 0, 0, 0, 0, +- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, +- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, +- 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, +- 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, +- 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, +- 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, +- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, +- 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, +- 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, +- 206, 207, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 115, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 208, 116, 117, 118, 119, 120, 121, 122, ++ 0, 0, 0, 0, 0, 0, 0, 0, 5, 6, ++ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ++ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, ++ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, ++ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ++ 47, 48, 49, 50, 51, 52, 53, 115, 54, 55, ++ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, ++ 66, 67, 68, 69, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 0, 0, 0, ++ 0, 0, 0, 116, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, +@@ -6470,155 +6503,156 @@ namespace yy { + const short + seclang_parser::yycheck_[] = + { +- 61, 62, 63, 303, 51, 3, 3, 62, 63, 143, +- 6, 145, 82, 313, 6, 305, 208, 64, 308, 80, +- 154, 304, 312, 306, 307, 80, 438, 161, 162, 163, +- 164, 306, 307, 365, 81, 169, 311, 306, 307, 306, +- 307, -1, 311, 304, 311, 306, 307, 100, 101, 102, +- 306, 307, 143, 144, 115, 306, 307, 306, 307, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, 306, 307, +- 284, 306, 307, 309, 310, 308, 217, 218, 306, 307, +- 309, 310, 306, 307, 306, 307, -1, 301, 302, 303, +- 304, 305, -1, 306, 307, 306, 307, 306, 307, 306, +- 307, 342, 343, 342, 343, 342, 343, -1, 342, 343, +- 342, 343, 342, 343, -1, 342, 343, 342, 343, 342, +- 343, 335, 342, 343, 342, 343, 342, 343, -1, -1, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 308, -1, -1, ++ 61, 62, 63, 304, 51, 3, 3, 143, 82, 145, ++ 100, 62, 63, 314, 6, 307, 308, 64, 154, 80, ++ 312, 305, 6, 307, 308, 161, 162, 163, 164, 80, ++ 307, 308, 306, 169, 81, 309, 307, 308, 208, 313, ++ 441, 312, 307, 308, 144, 145, 305, 312, 307, 308, ++ 366, 101, 102, 103, 115, 309, 146, 147, 148, 149, ++ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, ++ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, ++ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, ++ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, ++ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, ++ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, ++ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, ++ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, ++ 230, 231, 232, 233, 234, 235, 236, 237, -1, 285, ++ 307, 308, 307, 308, 307, 308, 217, 218, 307, 308, ++ 310, 311, 307, 308, 310, 311, 302, 303, 304, 305, ++ 306, -1, 307, 308, 307, 308, 307, 308, 307, 308, ++ 307, 308, 307, 308, 343, 344, -1, 343, 344, 343, ++ 344, 343, 344, -1, -1, 343, 344, -1, -1, -1, ++ 336, 343, 344, 343, 344, 343, 344, -1, -1, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, -1, 328, 343, ++ 344, 343, 344, -1, 343, 344, 343, 344, 309, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, -1, 340, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, 355, 356, 357, 358, 359, 360, +- 361, 362, 363, -1, 438, 439, 440, 441, -1, -1, +- 444, 445, 446, -1, 448, 449, 450, 451, 452, 453, +- 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, +- 327, 465, 466, 467, 468, 327, -1, 471, 472, 473, +- 474, 475, -1, -1, -1, -1, 480, 481, 482, -1, +- -1, -1, -1, 414, -1, -1, -1, -1, 419, -1, ++ 341, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 356, 357, 358, 359, 360, ++ 361, 362, 363, 364, -1, 441, 442, 443, 444, -1, ++ -1, 447, 448, 449, -1, 451, 452, 453, 454, 455, ++ 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, ++ 466, 328, 468, 469, 470, 471, 328, -1, 474, 475, ++ 476, 477, 478, -1, -1, -1, -1, 483, 484, 485, ++ -1, -1, -1, -1, -1, -1, 417, -1, -1, -1, + -1, 422, -1, -1, 425, -1, -1, 428, -1, -1, +- 431, -1, -1, -1, -1, 326, 437, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, +- -1, 342, 343, -1, -1, -1, -1, -1, -1, -1, ++ 431, -1, -1, 434, -1, -1, -1, -1, -1, 440, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 478, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 488, 489, 476, +- -1, 492, 493, 494, 495, 496, 497, 498, 499, 500, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 481, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 491, 492, 479, -1, 495, 496, 497, 498, 499, 500, + 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, + 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, +- 521, 522, 523, -1, 525, 526, 527, 10, 11, 12, +- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, +- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, +- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, +- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, +- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, +- 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, +- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, +- 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, +- 93, 94, 95, 96, 97, 98, 10, 11, 12, 13, +- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, +- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, +- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, +- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, +- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, +- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, +- 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, +- 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, +- 94, 95, 96, 97, 98, 10, 11, 12, 13, 14, +- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, +- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, +- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, +- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, +- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, +- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, +- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, +- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, +- 95, 96, 97, 98, -1, -1, -1, -1, -1, -1, ++ 521, 522, 523, 524, 525, 526, -1, 528, 529, 530, ++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ++ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ++ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, ++ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, ++ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ++ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ++ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ++ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, ++ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, ++ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ++ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ++ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ++ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, ++ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, ++ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ++ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, 326, -1, 328, 329, 330, 331, 332, +- 333, 334, 335, 336, 337, 338, 339, 340, -1, 342, +- 343, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, 327, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, -1, 343, 344, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, 326, -1, 328, 329, 330, 331, 332, 333, +- 334, 335, 336, 337, 338, 339, 340, -1, 342, 343, ++ -1, -1, -1, -1, -1, -1, -1, 327, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, -1, 343, 344, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, 327, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, -1, 343, 344, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, ++ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, ++ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, ++ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, ++ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, ++ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, ++ 95, 96, 97, 98, 99, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, ++ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, ++ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, ++ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, ++ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, ++ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, ++ 95, 96, 97, 98, 99, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, ++ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, ++ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, ++ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, ++ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, ++ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, ++ 95, 96, 97, 98, 99, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 326, -1, 328, 329, 330, 331, 332, 333, 334, +- 335, 336, 337, 338, 339, 340, -1, 342, 343, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, 10, 11, +- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, +- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, +- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, +- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, +- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, +- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, +- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, +- 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, +- 92, 93, 94, 95, 96, 97, 98, 8, 9, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, 327, -1, 329, 330, 331, 332, 333, 334, ++ 335, 336, 337, 338, 339, 340, 341, -1, 343, 344, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 326, -1, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, +- -1, 342, 343, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, 326, -1, 328, 329, 330, 331, +- 332, 333, 334, 335, 336, 337, 338, 339, 340, -1, +- 342, 343, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, 327, -1, 329, 330, 331, 332, 333, 334, ++ 335, 336, 337, 338, 339, 340, 341, -1, 343, 344, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, 327, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, 327, -1, 329, 330, 331, 332, 333, 334, ++ 335, 336, 337, 338, 339, 340, 341, -1, 343, 344, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, +@@ -6628,104 +6662,82 @@ namespace yy { + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, +- 98, 8, 9, 10, 11, 12, 13, 14, 15, 16, +- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, +- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, +- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, +- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, +- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, +- 97, 98, 10, 11, 12, 13, 14, 15, 16, 17, +- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, +- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, +- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, +- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, +- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, +- 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, +- 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, +- 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, +- 98, -1, -1, -1, -1, 103, 104, 105, 106, 107, +- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, +- 118, 119, 120, 121, 122, 123, 124, -1, 126, 127, +- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, +- 138, 139, 140, 141, -1, -1, -1, -1, -1, -1, +- 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, +- 338, 339, 340, -1, -1, -1, -1, -1, -1, -1, ++ 98, 99, 8, 9, 10, 11, 12, 13, 14, 15, ++ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, ++ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, ++ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, ++ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, ++ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, ++ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ++ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, ++ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, ++ 96, 97, 98, 99, 8, 9, 10, 11, 12, 13, ++ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, ++ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, ++ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, ++ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, ++ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, ++ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ++ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, ++ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, ++ 94, 95, 96, 97, 98, 99, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, ++ 338, 339, 340, 341, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 328, 329, 330, 331, 332, 333, 334, 335, 336, +- 337, 338, 339, 340, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, 329, 330, 331, 332, 333, 334, 335, ++ 336, 337, 338, 339, 340, 341, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, 326, -1, +- 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, +- 338, 339, 340, 10, 11, 12, 13, 14, 15, 16, +- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, +- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, +- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, +- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, +- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, +- 97, 98, -1, -1, -1, -1, -1, 104, 105, 106, +- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, +- 117, 118, 119, 120, 121, 122, 123, 124, -1, 126, +- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, +- 137, 138, 139, 140, 141, 10, 11, 12, 13, 14, +- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, +- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, +- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, +- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, +- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, +- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, +- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, +- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, +- 95, 96, 97, 98, -1, -1, -1, -1, 103, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, -1, 326, +- -1, 328, 329, 330, 331, 332, 333, 334, 335, 336, +- 337, 338, 339, 340, 10, 11, 12, 13, 14, 15, +- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, +- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, +- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, +- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, +- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, +- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, +- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, +- 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, +- 96, 97, 98, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, 328, 329, 330, 331, 332, 333, 334, +- 335, 336, 337, 338, 339, 340, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, +- -1, 4, 5, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 329, 330, 331, 332, 333, ++ 334, 335, 336, 337, 338, 339, 340, 341, 10, 11, ++ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, ++ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, ++ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, ++ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, ++ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, ++ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, ++ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ++ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, ++ 92, 93, 94, 95, 96, 97, 98, 99, -1, -1, ++ -1, -1, 104, 105, 106, 107, 108, 109, 110, 111, ++ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, ++ 122, 123, 124, 125, -1, 127, 128, 129, 130, 131, ++ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, ++ 142, 10, 11, 12, 13, 14, 15, 16, 17, 18, ++ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, ++ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, ++ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, ++ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, ++ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, ++ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, ++ 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, ++ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, ++ 99, -1, -1, -1, -1, -1, 105, 106, 107, 108, ++ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, ++ 119, 120, 121, 122, 123, 124, 125, -1, 127, 128, ++ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, ++ 139, 140, 141, 142, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 326, -1, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 327, -1, 329, 330, 331, ++ 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, +@@ -6734,97 +6746,125 @@ namespace yy { + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, +- 90, 91, 92, 93, 94, 95, 96, 97, 98, 142, +- 326, -1, 328, 329, 330, 331, 332, 333, 334, 335, +- 336, 337, 338, 339, 340, -1, -1, -1, 0, -1, +- -1, -1, 4, 5, -1, -1, -1, -1, -1, -1, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ++ -1, -1, -1, -1, 104, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, 327, -1, ++ 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, ++ 339, 340, 341, 10, 11, 12, 13, 14, 15, 16, ++ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, ++ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, ++ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ++ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, ++ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, ++ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ++ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, ++ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, ++ 97, 98, 99, 10, 11, 12, 13, 14, 15, 16, ++ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, ++ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, ++ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ++ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, ++ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, ++ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ++ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, ++ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, ++ 97, 98, 99, -1, -1, -1, -1, -1, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, 10, 11, 12, 13, 14, 15, 16, 17, ++ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, ++ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, ++ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, ++ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, ++ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, ++ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ++ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, ++ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, ++ 98, 99, -1, -1, -1, -1, 0, -1, -1, -1, ++ 4, 5, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 327, -1, 329, 330, 331, 332, 333, 334, 335, 336, ++ 337, 338, 339, 340, 341, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, 237, 238, 239, 240, 241, 242, +- 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, +- 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, +- 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, +- 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, +- 283, 284, 285, -1, 287, 288, 289, 290, 291, 292, +- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, +- 142, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 314, 315, 316, 317, 318, 319, 320, 321, 322, +- 323, 324, 325, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 327, -1, 329, 330, 331, 332, 333, 334, 335, 336, ++ 337, 338, 339, 340, 341, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, 143, ++ 0, -1, -1, -1, 4, 5, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, 328, 329, +- 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, +- 340, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 237, 238, 239, 240, 241, +- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, +- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, +- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, +- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, +- 282, 283, 284, 285, 99, 287, 288, 289, 290, 291, +- 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, +- 302, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, 314, 315, 316, 317, 318, 319, 320, 321, +- 322, 323, 324, 325, -1, -1, -1, -1, -1, -1, +- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, +- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, +- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, +- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, +- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, +- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, +- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, +- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, +- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, +- 235, 236, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, 329, 330, 331, 332, 333, 334, 335, 336, 337, ++ 338, 339, 340, 341, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 143, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, 315, 316, 317, 318, 319, 320, 321, 322, 323, ++ 324, 325, 326, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, 327, 145, 146, 147, 148, 149, 150, 151, +- 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, +- 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, +- 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, +- 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, +- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, +- 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, +- 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, +- 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, +- 232, 233, 234, 235, 236 ++ -1, -1, -1, -1, -1, -1, -1, -1, 238, 239, ++ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, ++ 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, ++ 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, ++ 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, ++ 280, 281, 282, 283, 284, 285, 286, 100, 288, 289, ++ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, ++ 300, 301, 302, 303, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 315, 316, 317, 318, 319, ++ 320, 321, 322, 323, 324, 325, 326, -1, -1, -1, ++ -1, -1, -1, 146, 147, 148, 149, 150, 151, 152, ++ 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, ++ 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, ++ 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, ++ 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, ++ 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, ++ 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, ++ 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, ++ 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, ++ 233, 234, 235, 236, 237 + }; + + const short + seclang_parser::yystos_[] = + { +- 0, 0, 4, 5, 142, 237, 238, 239, 240, 241, +- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, +- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, +- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, +- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, +- 282, 283, 284, 285, 287, 288, 289, 290, 291, 292, +- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, +- 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, +- 324, 325, 345, 346, 347, 352, 306, 307, 143, 144, +- 306, 307, 306, 307, 311, 305, 308, 312, 306, 307, +- 306, 307, 306, 307, 309, 310, 306, 307, 309, 310, +- 306, 307, 304, 306, 307, 99, 145, 146, 147, 148, +- 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, +- 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, +- 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, +- 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, +- 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, +- 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, +- 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, +- 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, +- 229, 230, 231, 232, 233, 234, 235, 236, 327, 348, +- 349, 357, 348, 306, 307, 303, 313, 8, 9, 10, ++ 0, 0, 4, 5, 143, 238, 239, 240, 241, 242, ++ 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, ++ 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, ++ 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, ++ 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, ++ 283, 284, 285, 286, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, ++ 325, 326, 346, 347, 348, 353, 307, 308, 144, 145, ++ 307, 308, 307, 308, 312, 306, 309, 313, 307, 308, ++ 307, 308, 307, 308, 310, 311, 307, 308, 310, 311, ++ 307, 308, 305, 307, 308, 100, 146, 147, 148, 149, ++ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, ++ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, ++ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, ++ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, ++ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, ++ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, ++ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, ++ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, ++ 230, 231, 232, 233, 234, 235, 236, 237, 328, 349, ++ 350, 358, 349, 307, 308, 304, 314, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +@@ -6833,67 +6873,51 @@ namespace yy { + 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, 327, 328, ++ 91, 92, 93, 94, 95, 96, 97, 98, 99, 328, + 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, +- 339, 340, 354, 355, 356, 354, 354, 348, 306, 307, +- 311, 306, 307, 306, 307, 353, 354, 348, 0, 346, +- 103, 356, 358, 304, 306, 307, 306, 307, 311, 306, +- 307, 306, 307, 326, 356, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 349, 3, 356, 356, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 359, 342, 343, 342, 343, 359, +- 342, 343, 359, 342, 343, 359, 342, 343, 359, 342, +- 343, 359, 342, 343, 342, 343, 355, 6, 103, 104, +- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, +- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, +- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, +- 136, 137, 138, 139, 140, 141, 350, 351, 359, 356, +- 100, 101, 102, 326, 356, 327, 357, 327, 8, 9, +- 356, 351, 359, 359, 359, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 359, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 359, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 348, 359, 359, 359, 356, 356 ++ 339, 340, 341, 355, 356, 357, 355, 355, 349, 307, ++ 308, 312, 307, 308, 307, 308, 354, 355, 349, 0, ++ 347, 104, 357, 359, 305, 307, 308, 307, 308, 312, ++ 307, 308, 307, 308, 327, 357, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 350, 3, 357, 357, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 360, 343, 344, ++ 343, 344, 360, 343, 344, 360, 343, 344, 360, 343, ++ 344, 360, 343, 344, 360, 343, 344, 343, 344, 356, ++ 6, 104, 105, 106, 107, 108, 109, 110, 111, 112, ++ 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, ++ 123, 124, 125, 127, 128, 129, 130, 131, 132, 133, ++ 134, 135, 136, 137, 138, 139, 140, 141, 142, 351, ++ 352, 360, 357, 101, 102, 103, 327, 357, 328, 358, ++ 328, 8, 9, 357, 352, 360, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 360, 360, 349, 360, 360, ++ 360, 357, 357 + }; + + const short + seclang_parser::yyr1_[] = + { +- 0, 344, 345, 345, 345, 346, 347, 347, 347, 347, +- 347, 347, 347, 347, 347, 347, 347, 347, 347, 347, +- 347, 347, 347, 347, 347, 347, 347, 347, 347, 348, +- 348, 349, 349, 350, 350, 350, 350, 351, 351, 351, +- 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, +- 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, +- 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, +- 351, 351, 351, 351, 352, 352, 352, 352, 352, 352, ++ 0, 345, 346, 346, 346, 347, 348, 348, 348, 348, ++ 348, 348, 348, 348, 348, 348, 348, 348, 348, 348, ++ 348, 348, 348, 348, 348, 348, 348, 348, 348, 349, ++ 349, 350, 350, 351, 351, 351, 351, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 353, 354, 354, 355, 355, +- 355, 355, 355, 355, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 352, 352, 352, 352, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 354, 355, 355, 356, 356, + 356, 356, 356, 356, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, +@@ -6904,8 +6928,25 @@ namespace yy { + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, +- 357, 357, 357, 358, 358, 358, 358, 358, 359, 359, +- 359, 359 ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 359, 359, 359, 359, ++ 359, 360, 360, 360, 360 + }; + + const signed char +@@ -6933,11 +6974,11 @@ namespace yy { + 1, 2, 2, 1, 2, 2, 1, 2, 2, 1, + 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, + 2, 1, 2, 2, 1, 2, 2, 1, 2, 2, +- 1, 2, 2, 1, 2, 2, 2, 1, 2, 2, +- 2, 1, 2, 2, 2, 1, 2, 2, 2, 1, +- 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, ++ 1, 2, 2, 1, 2, 2, 1, 2, 2, 2, ++ 1, 2, 2, 2, 1, 2, 2, 2, 1, 2, ++ 2, 2, 1, 2, 2, 2, 1, 2, 2, 2, + 1, 2, 2, 1, 2, 2, 1, 2, 2, 1, +- 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, ++ 2, 2, 1, 1, 2, 2, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +@@ -6945,17 +6986,17 @@ namespace yy { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +- 1, 2, 2, 2, 1, 1, 1, 1, 2, 2, +- 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, +- 1, 1, 1, 1, 1, 2, 2, 1, 1, 2, +- 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, +- 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, +- 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, ++ 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, ++ 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, ++ 1, 2, 1, 1, 1, 1, 1, 1, 2, 2, ++ 2, 2, 2, 1, 1, 1, 1, 2, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +- 1, 1, 1, 2, 1, 3, 3, 3, 2, 2, +- 1, 1 ++ 1, 1, 1, 1, 1, 1, 2, 1, 3, 3, ++ 3, 2, 2, 1, 1 + }; + + +@@ -6974,11 +7015,12 @@ namespace yy { + "VARIABLE_MATCHED_VARS_NAMES", "VARIABLE_MATCHED_VARS", "VARIABLE_FILES", + "VARIABLE_REQUEST_COOKIES", "VARIABLE_REQUEST_HEADERS", + "VARIABLE_RESPONSE_HEADERS", "VARIABLE_GEO", +- "VARIABLE_REQUEST_COOKIES_NAMES", "VARIABLE_ARGS_COMBINED_SIZE", +- "VARIABLE_ARGS_GET_NAMES", "VARIABLE_RULE", "\"Variable ARGS_NAMES\"", +- "VARIABLE_ARGS_POST_NAMES", "\"AUTH_TYPE\"", "\"FILES_COMBINED_SIZE\"", +- "\"FILES_TMPNAMES\"", "\"FULL_REQUEST\"", "\"FULL_REQUEST_LENGTH\"", +- "\"INBOUND_DATA_ERROR\"", "\"MATCHED_VAR\"", "\"MATCHED_VAR_NAME\"", ++ "VARIABLE_REQUEST_COOKIES_NAMES", "VARIABLE_MULTIPART_PART_HEADERS", ++ "VARIABLE_ARGS_COMBINED_SIZE", "VARIABLE_ARGS_GET_NAMES", ++ "VARIABLE_RULE", "\"Variable ARGS_NAMES\"", "VARIABLE_ARGS_POST_NAMES", ++ "\"AUTH_TYPE\"", "\"FILES_COMBINED_SIZE\"", "\"FILES_TMPNAMES\"", ++ "\"FULL_REQUEST\"", "\"FULL_REQUEST_LENGTH\"", "\"INBOUND_DATA_ERROR\"", ++ "\"MATCHED_VAR\"", "\"MATCHED_VAR_NAME\"", + "VARIABLE_MULTIPART_BOUNDARY_QUOTED", + "VARIABLE_MULTIPART_BOUNDARY_WHITESPACE", "\"MULTIPART_CRLF_LF_LINES\"", + "\"MULTIPART_DATA_AFTER\"", "VARIABLE_MULTIPART_DATA_BEFORE", +@@ -7147,51 +7189,51 @@ namespace yy { + const short + seclang_parser::yyrline_[] = + { +- 0, 712, 712, 716, 717, 720, 725, 731, 737, 741, +- 745, 751, 757, 763, 769, 774, 779, 785, 792, 796, +- 800, 806, 810, 814, 819, 824, 829, 834, 838, 845, +- 849, 856, 862, 872, 881, 891, 900, 913, 917, 921, +- 925, 929, 933, 937, 941, 945, 949, 954, 958, 962, +- 966, 970, 974, 979, 984, 988, 992, 996, 1000, 1004, +- 1008, 1012, 1016, 1020, 1024, 1028, 1032, 1036, 1040, 1044, +- 1048, 1052, 1056, 1060, 1074, 1075, 1105, 1124, 1143, 1171, +- 1228, 1235, 1239, 1243, 1247, 1251, 1255, 1259, 1263, 1272, +- 1276, 1281, 1284, 1289, 1294, 1299, 1304, 1307, 1312, 1315, +- 1320, 1325, 1328, 1333, 1338, 1343, 1348, 1353, 1358, 1363, +- 1366, 1371, 1376, 1381, 1386, 1389, 1394, 1399, 1404, 1417, +- 1430, 1443, 1456, 1469, 1495, 1523, 1535, 1555, 1582, 1587, +- 1593, 1598, 1603, 1612, 1617, 1621, 1625, 1629, 1633, 1637, +- 1641, 1646, 1651, 1663, 1669, 1673, 1677, 1688, 1697, 1698, +- 1705, 1710, 1715, 1769, 1776, 1784, 1821, 1825, 1832, 1837, +- 1843, 1849, 1855, 1862, 1872, 1876, 1880, 1884, 1888, 1892, +- 1896, 1900, 1904, 1908, 1912, 1916, 1920, 1924, 1928, 1932, +- 1936, 1940, 1944, 1948, 1952, 1956, 1960, 1964, 1968, 1972, +- 1976, 1980, 1984, 1988, 1992, 1996, 2000, 2004, 2008, 2012, +- 2016, 2020, 2024, 2028, 2032, 2036, 2040, 2044, 2048, 2052, +- 2056, 2060, 2064, 2068, 2072, 2076, 2080, 2084, 2088, 2092, +- 2096, 2100, 2104, 2108, 2112, 2116, 2120, 2124, 2128, 2132, +- 2136, 2140, 2144, 2148, 2152, 2156, 2160, 2164, 2168, 2172, +- 2176, 2180, 2184, 2188, 2192, 2196, 2200, 2204, 2208, 2212, +- 2216, 2220, 2224, 2228, 2233, 2237, 2241, 2246, 2250, 2254, +- 2259, 2264, 2268, 2272, 2276, 2280, 2284, 2288, 2292, 2296, +- 2300, 2304, 2308, 2312, 2316, 2320, 2324, 2328, 2332, 2336, +- 2340, 2344, 2348, 2352, 2356, 2360, 2364, 2368, 2372, 2376, +- 2380, 2384, 2388, 2392, 2396, 2400, 2404, 2408, 2412, 2416, +- 2420, 2424, 2428, 2432, 2436, 2440, 2444, 2448, 2452, 2456, +- 2460, 2464, 2468, 2472, 2476, 2480, 2484, 2488, 2492, 2496, +- 2500, 2504, 2512, 2519, 2526, 2533, 2540, 2547, 2554, 2561, +- 2568, 2575, 2582, 2589, 2599, 2603, 2607, 2611, 2615, 2619, +- 2623, 2627, 2632, 2636, 2641, 2645, 2649, 2653, 2657, 2662, +- 2667, 2671, 2675, 2679, 2683, 2687, 2691, 2695, 2699, 2703, +- 2707, 2711, 2715, 2719, 2724, 2728, 2732, 2736, 2740, 2744, +- 2748, 2752, 2756, 2760, 2764, 2768, 2772, 2776, 2780, 2784, +- 2788, 2792, 2796, 2800, 2804, 2808, 2812, 2816, 2820, 2824, +- 2828, 2832, 2836, 2840, 2844, 2848, 2852, 2856, 2860, 2864, +- 2868, 2872, 2876, 2880, 2884, 2888, 2892, 2896, 2900, 2904, +- 2908, 2912, 2916, 2920, 2924, 2928, 2932, 2936, 2940, 2944, +- 2948, 2952, 2956, 2960, 2964, 2968, 2972, 2976, 2980, 2984, +- 2988, 2992, 2996, 3003, 3007, 3011, 3015, 3019, 3026, 3031, +- 3036, 3042 ++ 0, 714, 714, 718, 719, 722, 727, 733, 739, 743, ++ 747, 753, 759, 765, 771, 776, 781, 787, 794, 798, ++ 802, 808, 812, 816, 821, 826, 831, 836, 840, 847, ++ 851, 858, 864, 874, 883, 893, 902, 915, 919, 923, ++ 927, 931, 935, 939, 943, 947, 951, 956, 960, 964, ++ 968, 972, 976, 981, 986, 990, 994, 998, 1002, 1006, ++ 1010, 1014, 1018, 1022, 1026, 1030, 1034, 1038, 1042, 1046, ++ 1050, 1054, 1058, 1062, 1076, 1077, 1107, 1126, 1145, 1173, ++ 1230, 1237, 1241, 1245, 1249, 1253, 1257, 1261, 1265, 1274, ++ 1278, 1283, 1286, 1291, 1296, 1301, 1306, 1309, 1314, 1317, ++ 1322, 1327, 1330, 1335, 1340, 1345, 1350, 1355, 1360, 1365, ++ 1368, 1373, 1378, 1383, 1388, 1391, 1396, 1401, 1406, 1419, ++ 1432, 1445, 1458, 1471, 1497, 1525, 1537, 1557, 1584, 1589, ++ 1595, 1600, 1605, 1614, 1619, 1623, 1627, 1631, 1635, 1639, ++ 1643, 1648, 1653, 1665, 1671, 1675, 1679, 1690, 1699, 1700, ++ 1707, 1712, 1717, 1771, 1778, 1786, 1823, 1827, 1834, 1839, ++ 1845, 1851, 1857, 1864, 1874, 1878, 1882, 1886, 1890, 1894, ++ 1898, 1902, 1906, 1910, 1914, 1918, 1922, 1926, 1930, 1934, ++ 1938, 1942, 1946, 1950, 1954, 1958, 1962, 1966, 1970, 1974, ++ 1978, 1982, 1986, 1990, 1994, 1998, 2002, 2006, 2010, 2014, ++ 2018, 2022, 2026, 2030, 2034, 2038, 2042, 2046, 2050, 2054, ++ 2058, 2062, 2066, 2070, 2074, 2078, 2082, 2086, 2090, 2094, ++ 2098, 2102, 2106, 2110, 2114, 2118, 2122, 2126, 2130, 2134, ++ 2138, 2142, 2146, 2150, 2154, 2158, 2162, 2166, 2170, 2174, ++ 2178, 2182, 2186, 2190, 2194, 2198, 2202, 2206, 2210, 2214, ++ 2218, 2222, 2226, 2230, 2234, 2238, 2242, 2247, 2251, 2255, ++ 2260, 2264, 2268, 2273, 2278, 2282, 2286, 2290, 2294, 2298, ++ 2302, 2306, 2310, 2314, 2318, 2322, 2326, 2330, 2334, 2338, ++ 2342, 2346, 2350, 2354, 2358, 2362, 2366, 2370, 2374, 2378, ++ 2382, 2386, 2390, 2394, 2398, 2402, 2406, 2410, 2414, 2418, ++ 2422, 2426, 2430, 2434, 2438, 2442, 2446, 2450, 2454, 2458, ++ 2462, 2466, 2470, 2474, 2478, 2482, 2486, 2490, 2494, 2498, ++ 2502, 2506, 2510, 2514, 2518, 2526, 2533, 2540, 2547, 2554, ++ 2561, 2568, 2575, 2582, 2589, 2596, 2603, 2613, 2617, 2621, ++ 2625, 2629, 2633, 2637, 2641, 2646, 2650, 2655, 2659, 2663, ++ 2667, 2671, 2676, 2681, 2685, 2689, 2693, 2697, 2701, 2705, ++ 2709, 2713, 2717, 2721, 2725, 2729, 2733, 2738, 2742, 2746, ++ 2750, 2754, 2758, 2762, 2766, 2770, 2774, 2778, 2782, 2786, ++ 2790, 2794, 2798, 2802, 2806, 2810, 2814, 2818, 2822, 2826, ++ 2830, 2834, 2838, 2842, 2846, 2850, 2854, 2858, 2862, 2866, ++ 2870, 2874, 2878, 2882, 2886, 2890, 2894, 2898, 2902, 2906, ++ 2910, 2914, 2918, 2922, 2926, 2930, 2934, 2938, 2942, 2946, ++ 2950, 2954, 2958, 2962, 2966, 2970, 2974, 2978, 2982, 2986, ++ 2990, 2994, 2998, 3002, 3006, 3010, 3017, 3021, 3025, 3029, ++ 3033, 3040, 3045, 3050, 3056 + }; + + void +@@ -7223,9 +7265,9 @@ namespace yy { + + + } // yy +-#line 7227 "seclang-parser.cc" ++#line 7269 "seclang-parser.cc" + +-#line 3049 "seclang-parser.yy" ++#line 3063 "seclang-parser.yy" + + + void yy::seclang_parser::error (const location_type& l, const std::string& m) { +diff --git a/src/parser/seclang-parser.hh b/src/parser/seclang-parser.hh +index 8cdbe22e..360ae8c3 100644 +--- a/src/parser/seclang-parser.hh ++++ b/src/parser/seclang-parser.hh +@@ -256,6 +256,7 @@ class Driver; + #include "src/variables/request_body_length.h" + #include "src/variables/request_cookies.h" + #include "src/variables/request_cookies_names.h" ++#include "src/variables/multipart_part_headers.h" + #include "src/variables/request_file_name.h" + #include "src/variables/request_headers.h" + #include "src/variables/request_headers_names.h" +@@ -351,7 +352,7 @@ using namespace modsecurity::operators; + a = std::move(c); + + +-#line 355 "seclang-parser.hh" ++#line 356 "seclang-parser.hh" + + # include + # include // std::abort +@@ -485,7 +486,7 @@ using namespace modsecurity::operators; + #endif + + namespace yy { +-#line 489 "seclang-parser.hh" ++#line 490 "seclang-parser.hh" + + + +@@ -995,324 +996,325 @@ namespace yy { + TOK_VARIABLE_RESPONSE_HEADERS = 278, // VARIABLE_RESPONSE_HEADERS + TOK_VARIABLE_GEO = 279, // VARIABLE_GEO + TOK_VARIABLE_REQUEST_COOKIES_NAMES = 280, // VARIABLE_REQUEST_COOKIES_NAMES +- TOK_VARIABLE_ARGS_COMBINED_SIZE = 281, // VARIABLE_ARGS_COMBINED_SIZE +- TOK_VARIABLE_ARGS_GET_NAMES = 282, // VARIABLE_ARGS_GET_NAMES +- TOK_VARIABLE_RULE = 283, // VARIABLE_RULE +- TOK_VARIABLE_ARGS_NAMES = 284, // "Variable ARGS_NAMES" +- TOK_VARIABLE_ARGS_POST_NAMES = 285, // VARIABLE_ARGS_POST_NAMES +- TOK_VARIABLE_AUTH_TYPE = 286, // "AUTH_TYPE" +- TOK_VARIABLE_FILES_COMBINED_SIZE = 287, // "FILES_COMBINED_SIZE" +- TOK_VARIABLE_FILES_TMP_NAMES = 288, // "FILES_TMPNAMES" +- TOK_VARIABLE_FULL_REQUEST = 289, // "FULL_REQUEST" +- TOK_VARIABLE_FULL_REQUEST_LENGTH = 290, // "FULL_REQUEST_LENGTH" +- TOK_VARIABLE_INBOUND_DATA_ERROR = 291, // "INBOUND_DATA_ERROR" +- TOK_VARIABLE_MATCHED_VAR = 292, // "MATCHED_VAR" +- TOK_VARIABLE_MATCHED_VAR_NAME = 293, // "MATCHED_VAR_NAME" +- TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 294, // VARIABLE_MULTIPART_BOUNDARY_QUOTED +- TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 295, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE +- TOK_VARIABLE_MULTIPART_CRLF_LF_LINES = 296, // "MULTIPART_CRLF_LF_LINES" +- TOK_VARIABLE_MULTIPART_DATA_AFTER = 297, // "MULTIPART_DATA_AFTER" +- TOK_VARIABLE_MULTIPART_DATA_BEFORE = 298, // VARIABLE_MULTIPART_DATA_BEFORE +- TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 299, // "MULTIPART_FILE_LIMIT_EXCEEDED" +- TOK_VARIABLE_MULTIPART_HEADER_FOLDING = 300, // "MULTIPART_HEADER_FOLDING" +- TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 301, // "MULTIPART_INVALID_HEADER_FOLDING" +- TOK_VARIABLE_MULTIPART_INVALID_PART = 302, // VARIABLE_MULTIPART_INVALID_PART +- TOK_VARIABLE_MULTIPART_INVALID_QUOTING = 303, // "MULTIPART_INVALID_QUOTING" +- TOK_VARIABLE_MULTIPART_LF_LINE = 304, // VARIABLE_MULTIPART_LF_LINE +- TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON = 305, // VARIABLE_MULTIPART_MISSING_SEMICOLON +- TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING = 306, // VARIABLE_MULTIPART_SEMICOLON_MISSING +- TOK_VARIABLE_MULTIPART_STRICT_ERROR = 307, // "MULTIPART_STRICT_ERROR" +- TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 308, // "MULTIPART_UNMATCHED_BOUNDARY" +- TOK_VARIABLE_OUTBOUND_DATA_ERROR = 309, // "OUTBOUND_DATA_ERROR" +- TOK_VARIABLE_PATH_INFO = 310, // "PATH_INFO" +- TOK_VARIABLE_QUERY_STRING = 311, // "QUERY_STRING" +- TOK_VARIABLE_REMOTE_ADDR = 312, // "REMOTE_ADDR" +- TOK_VARIABLE_REMOTE_HOST = 313, // "REMOTE_HOST" +- TOK_VARIABLE_REMOTE_PORT = 314, // "REMOTE_PORT" +- TOK_VARIABLE_REQBODY_ERROR_MSG = 315, // "REQBODY_ERROR_MSG" +- TOK_VARIABLE_REQBODY_ERROR = 316, // "REQBODY_ERROR" +- TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 317, // "REQBODY_PROCESSOR_ERROR_MSG" +- TOK_VARIABLE_REQBODY_PROCESSOR_ERROR = 318, // "REQBODY_PROCESSOR_ERROR" +- TOK_VARIABLE_REQBODY_PROCESSOR = 319, // "REQBODY_PROCESSOR" +- TOK_VARIABLE_REQUEST_BASENAME = 320, // "REQUEST_BASENAME" +- TOK_VARIABLE_REQUEST_BODY_LENGTH = 321, // "REQUEST_BODY_LENGTH" +- TOK_VARIABLE_REQUEST_BODY = 322, // "REQUEST_BODY" +- TOK_VARIABLE_REQUEST_FILE_NAME = 323, // "REQUEST_FILENAME" +- TOK_VARIABLE_REQUEST_HEADERS_NAMES = 324, // VARIABLE_REQUEST_HEADERS_NAMES +- TOK_VARIABLE_REQUEST_LINE = 325, // "REQUEST_LINE" +- TOK_VARIABLE_REQUEST_METHOD = 326, // "REQUEST_METHOD" +- TOK_VARIABLE_REQUEST_PROTOCOL = 327, // "REQUEST_PROTOCOL" +- TOK_VARIABLE_REQUEST_URI_RAW = 328, // "REQUEST_URI_RAW" +- TOK_VARIABLE_REQUEST_URI = 329, // "REQUEST_URI" +- TOK_VARIABLE_RESOURCE = 330, // "RESOURCE" +- TOK_VARIABLE_RESPONSE_BODY = 331, // "RESPONSE_BODY" +- TOK_VARIABLE_RESPONSE_CONTENT_LENGTH = 332, // "RESPONSE_CONTENT_LENGTH" +- TOK_VARIABLE_RESPONSE_CONTENT_TYPE = 333, // VARIABLE_RESPONSE_CONTENT_TYPE +- TOK_VARIABLE_RESPONSE_HEADERS_NAMES = 334, // VARIABLE_RESPONSE_HEADERS_NAMES +- TOK_VARIABLE_RESPONSE_PROTOCOL = 335, // "RESPONSE_PROTOCOL" +- TOK_VARIABLE_RESPONSE_STATUS = 336, // "RESPONSE_STATUS" +- TOK_VARIABLE_SERVER_ADDR = 337, // "SERVER_ADDR" +- TOK_VARIABLE_SERVER_NAME = 338, // "SERVER_NAME" +- TOK_VARIABLE_SERVER_PORT = 339, // "SERVER_PORT" +- TOK_VARIABLE_SESSION_ID = 340, // "SESSIONID" +- TOK_VARIABLE_UNIQUE_ID = 341, // "UNIQUE_ID" +- TOK_VARIABLE_URL_ENCODED_ERROR = 342, // "URLENCODED_ERROR" +- TOK_VARIABLE_USER_ID = 343, // "USERID" +- TOK_VARIABLE_WEB_APP_ID = 344, // "WEBAPPID" +- TOK_VARIABLE_STATUS = 345, // "VARIABLE_STATUS" +- TOK_VARIABLE_STATUS_LINE = 346, // "VARIABLE_STATUS_LINE" +- TOK_VARIABLE_IP = 347, // "VARIABLE_IP" +- TOK_VARIABLE_GLOBAL = 348, // "VARIABLE_GLOBAL" +- TOK_VARIABLE_TX = 349, // "VARIABLE_TX" +- TOK_VARIABLE_SESSION = 350, // "VARIABLE_SESSION" +- TOK_VARIABLE_USER = 351, // "VARIABLE_USER" +- TOK_RUN_TIME_VAR_ENV = 352, // "RUN_TIME_VAR_ENV" +- TOK_RUN_TIME_VAR_XML = 353, // "RUN_TIME_VAR_XML" +- TOK_ACTION_SETVAR = 354, // "SetVar" +- TOK_SETVAR_OPERATION_EQUALS = 355, // SETVAR_OPERATION_EQUALS +- TOK_SETVAR_OPERATION_EQUALS_PLUS = 356, // SETVAR_OPERATION_EQUALS_PLUS +- TOK_SETVAR_OPERATION_EQUALS_MINUS = 357, // SETVAR_OPERATION_EQUALS_MINUS +- TOK_NOT = 358, // "NOT" +- TOK_OPERATOR_BEGINS_WITH = 359, // "OPERATOR_BEGINS_WITH" +- TOK_OPERATOR_CONTAINS = 360, // "OPERATOR_CONTAINS" +- TOK_OPERATOR_CONTAINS_WORD = 361, // "OPERATOR_CONTAINS_WORD" +- TOK_OPERATOR_DETECT_SQLI = 362, // "OPERATOR_DETECT_SQLI" +- TOK_OPERATOR_DETECT_XSS = 363, // "OPERATOR_DETECT_XSS" +- TOK_OPERATOR_ENDS_WITH = 364, // "OPERATOR_ENDS_WITH" +- TOK_OPERATOR_EQ = 365, // "OPERATOR_EQ" +- TOK_OPERATOR_FUZZY_HASH = 366, // "OPERATOR_FUZZY_HASH" +- TOK_OPERATOR_GEOLOOKUP = 367, // "OPERATOR_GEOLOOKUP" +- TOK_OPERATOR_GE = 368, // "OPERATOR_GE" +- TOK_OPERATOR_GSB_LOOKUP = 369, // "OPERATOR_GSB_LOOKUP" +- TOK_OPERATOR_GT = 370, // "OPERATOR_GT" +- TOK_OPERATOR_INSPECT_FILE = 371, // "OPERATOR_INSPECT_FILE" +- TOK_OPERATOR_IP_MATCH_FROM_FILE = 372, // "OPERATOR_IP_MATCH_FROM_FILE" +- TOK_OPERATOR_IP_MATCH = 373, // "OPERATOR_IP_MATCH" +- TOK_OPERATOR_LE = 374, // "OPERATOR_LE" +- TOK_OPERATOR_LT = 375, // "OPERATOR_LT" +- TOK_OPERATOR_PM_FROM_FILE = 376, // "OPERATOR_PM_FROM_FILE" +- TOK_OPERATOR_PM = 377, // "OPERATOR_PM" +- TOK_OPERATOR_RBL = 378, // "OPERATOR_RBL" +- TOK_OPERATOR_RSUB = 379, // "OPERATOR_RSUB" +- TOK_OPERATOR_RX_CONTENT_ONLY = 380, // "Operator RX (content only)" +- TOK_OPERATOR_RX = 381, // "OPERATOR_RX" +- TOK_OPERATOR_RX_GLOBAL = 382, // "OPERATOR_RX_GLOBAL" +- TOK_OPERATOR_STR_EQ = 383, // "OPERATOR_STR_EQ" +- TOK_OPERATOR_STR_MATCH = 384, // "OPERATOR_STR_MATCH" +- TOK_OPERATOR_UNCONDITIONAL_MATCH = 385, // "OPERATOR_UNCONDITIONAL_MATCH" +- TOK_OPERATOR_VALIDATE_BYTE_RANGE = 386, // "OPERATOR_VALIDATE_BYTE_RANGE" +- TOK_OPERATOR_VALIDATE_DTD = 387, // "OPERATOR_VALIDATE_DTD" +- TOK_OPERATOR_VALIDATE_HASH = 388, // "OPERATOR_VALIDATE_HASH" +- TOK_OPERATOR_VALIDATE_SCHEMA = 389, // "OPERATOR_VALIDATE_SCHEMA" +- TOK_OPERATOR_VALIDATE_URL_ENCODING = 390, // "OPERATOR_VALIDATE_URL_ENCODING" +- TOK_OPERATOR_VALIDATE_UTF8_ENCODING = 391, // "OPERATOR_VALIDATE_UTF8_ENCODING" +- TOK_OPERATOR_VERIFY_CC = 392, // "OPERATOR_VERIFY_CC" +- TOK_OPERATOR_VERIFY_CPF = 393, // "OPERATOR_VERIFY_CPF" +- TOK_OPERATOR_VERIFY_SSN = 394, // "OPERATOR_VERIFY_SSN" +- TOK_OPERATOR_VERIFY_SVNR = 395, // "OPERATOR_VERIFY_SVNR" +- TOK_OPERATOR_WITHIN = 396, // "OPERATOR_WITHIN" +- TOK_CONFIG_DIR_AUDIT_LOG_FMT = 397, // CONFIG_DIR_AUDIT_LOG_FMT +- TOK_JSON = 398, // JSON +- TOK_NATIVE = 399, // NATIVE +- TOK_ACTION_CTL_RULE_ENGINE = 400, // "ACTION_CTL_RULE_ENGINE" +- TOK_ACTION_ACCURACY = 401, // "Accuracy" +- TOK_ACTION_ALLOW = 402, // "Allow" +- TOK_ACTION_APPEND = 403, // "Append" +- TOK_ACTION_AUDIT_LOG = 404, // "AuditLog" +- TOK_ACTION_BLOCK = 405, // "Block" +- TOK_ACTION_CAPTURE = 406, // "Capture" +- TOK_ACTION_CHAIN = 407, // "Chain" +- TOK_ACTION_CTL_AUDIT_ENGINE = 408, // "ACTION_CTL_AUDIT_ENGINE" +- TOK_ACTION_CTL_AUDIT_LOG_PARTS = 409, // "ACTION_CTL_AUDIT_LOG_PARTS" +- TOK_ACTION_CTL_BDY_JSON = 410, // "ACTION_CTL_BDY_JSON" +- TOK_ACTION_CTL_BDY_XML = 411, // "ACTION_CTL_BDY_XML" +- TOK_ACTION_CTL_BDY_URLENCODED = 412, // "ACTION_CTL_BDY_URLENCODED" +- TOK_ACTION_CTL_FORCE_REQ_BODY_VAR = 413, // "ACTION_CTL_FORCE_REQ_BODY_VAR" +- TOK_ACTION_CTL_REQUEST_BODY_ACCESS = 414, // "ACTION_CTL_REQUEST_BODY_ACCESS" +- TOK_ACTION_CTL_RULE_REMOVE_BY_ID = 415, // "ACTION_CTL_RULE_REMOVE_BY_ID" +- TOK_ACTION_CTL_RULE_REMOVE_BY_TAG = 416, // "ACTION_CTL_RULE_REMOVE_BY_TAG" +- TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 417, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" +- TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 418, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" +- TOK_ACTION_DENY = 419, // "Deny" +- TOK_ACTION_DEPRECATE_VAR = 420, // "DeprecateVar" +- TOK_ACTION_DROP = 421, // "Drop" +- TOK_ACTION_EXEC = 422, // "Exec" +- TOK_ACTION_EXPIRE_VAR = 423, // "ExpireVar" +- TOK_ACTION_ID = 424, // "Id" +- TOK_ACTION_INITCOL = 425, // "InitCol" +- TOK_ACTION_LOG = 426, // "Log" +- TOK_ACTION_LOG_DATA = 427, // "LogData" +- TOK_ACTION_MATURITY = 428, // "Maturity" +- TOK_ACTION_MSG = 429, // "Msg" +- TOK_ACTION_MULTI_MATCH = 430, // "MultiMatch" +- TOK_ACTION_NO_AUDIT_LOG = 431, // "NoAuditLog" +- TOK_ACTION_NO_LOG = 432, // "NoLog" +- TOK_ACTION_PASS = 433, // "Pass" +- TOK_ACTION_PAUSE = 434, // "Pause" +- TOK_ACTION_PHASE = 435, // "Phase" +- TOK_ACTION_PREPEND = 436, // "Prepend" +- TOK_ACTION_PROXY = 437, // "Proxy" +- TOK_ACTION_REDIRECT = 438, // "Redirect" +- TOK_ACTION_REV = 439, // "Rev" +- TOK_ACTION_SANITISE_ARG = 440, // "SanitiseArg" +- TOK_ACTION_SANITISE_MATCHED = 441, // "SanitiseMatched" +- TOK_ACTION_SANITISE_MATCHED_BYTES = 442, // "SanitiseMatchedBytes" +- TOK_ACTION_SANITISE_REQUEST_HEADER = 443, // "SanitiseRequestHeader" +- TOK_ACTION_SANITISE_RESPONSE_HEADER = 444, // "SanitiseResponseHeader" +- TOK_ACTION_SETENV = 445, // "SetEnv" +- TOK_ACTION_SETRSC = 446, // "SetRsc" +- TOK_ACTION_SETSID = 447, // "SetSid" +- TOK_ACTION_SETUID = 448, // "SetUID" +- TOK_ACTION_SEVERITY = 449, // "Severity" +- TOK_ACTION_SKIP = 450, // "Skip" +- TOK_ACTION_SKIP_AFTER = 451, // "SkipAfter" +- TOK_ACTION_STATUS = 452, // "Status" +- TOK_ACTION_TAG = 453, // "Tag" +- TOK_ACTION_TRANSFORMATION_BASE_64_ENCODE = 454, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" +- TOK_ACTION_TRANSFORMATION_BASE_64_DECODE = 455, // "ACTION_TRANSFORMATION_BASE_64_DECODE" +- TOK_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 456, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" +- TOK_ACTION_TRANSFORMATION_CMD_LINE = 457, // "ACTION_TRANSFORMATION_CMD_LINE" +- TOK_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 458, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" +- TOK_ACTION_TRANSFORMATION_CSS_DECODE = 459, // "ACTION_TRANSFORMATION_CSS_DECODE" +- TOK_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 460, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" +- TOK_ACTION_TRANSFORMATION_HEX_ENCODE = 461, // "ACTION_TRANSFORMATION_HEX_ENCODE" +- TOK_ACTION_TRANSFORMATION_HEX_DECODE = 462, // "ACTION_TRANSFORMATION_HEX_DECODE" +- TOK_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 463, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" +- TOK_ACTION_TRANSFORMATION_JS_DECODE = 464, // "ACTION_TRANSFORMATION_JS_DECODE" +- TOK_ACTION_TRANSFORMATION_LENGTH = 465, // "ACTION_TRANSFORMATION_LENGTH" +- TOK_ACTION_TRANSFORMATION_LOWERCASE = 466, // "ACTION_TRANSFORMATION_LOWERCASE" +- TOK_ACTION_TRANSFORMATION_MD5 = 467, // "ACTION_TRANSFORMATION_MD5" +- TOK_ACTION_TRANSFORMATION_NONE = 468, // "ACTION_TRANSFORMATION_NONE" +- TOK_ACTION_TRANSFORMATION_NORMALISE_PATH = 469, // "ACTION_TRANSFORMATION_NORMALISE_PATH" +- TOK_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 470, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" +- TOK_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 471, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" +- TOK_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 472, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" +- TOK_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 473, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" +- TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 474, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" +- TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 475, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" +- TOK_ACTION_TRANSFORMATION_REMOVE_NULLS = 476, // "ACTION_TRANSFORMATION_REMOVE_NULLS" +- TOK_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 477, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" +- TOK_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 478, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" +- TOK_ACTION_TRANSFORMATION_REPLACE_NULLS = 479, // "ACTION_TRANSFORMATION_REPLACE_NULLS" +- TOK_ACTION_TRANSFORMATION_SHA1 = 480, // "ACTION_TRANSFORMATION_SHA1" +- TOK_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 481, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" +- TOK_ACTION_TRANSFORMATION_TRIM = 482, // "ACTION_TRANSFORMATION_TRIM" +- TOK_ACTION_TRANSFORMATION_TRIM_LEFT = 483, // "ACTION_TRANSFORMATION_TRIM_LEFT" +- TOK_ACTION_TRANSFORMATION_TRIM_RIGHT = 484, // "ACTION_TRANSFORMATION_TRIM_RIGHT" +- TOK_ACTION_TRANSFORMATION_UPPERCASE = 485, // "ACTION_TRANSFORMATION_UPPERCASE" +- TOK_ACTION_TRANSFORMATION_URL_ENCODE = 486, // "ACTION_TRANSFORMATION_URL_ENCODE" +- TOK_ACTION_TRANSFORMATION_URL_DECODE = 487, // "ACTION_TRANSFORMATION_URL_DECODE" +- TOK_ACTION_TRANSFORMATION_URL_DECODE_UNI = 488, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" +- TOK_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 489, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" +- TOK_ACTION_VER = 490, // "Ver" +- TOK_ACTION_XMLNS = 491, // "xmlns" +- TOK_CONFIG_COMPONENT_SIG = 492, // "CONFIG_COMPONENT_SIG" +- TOK_CONFIG_CONN_ENGINE = 493, // "CONFIG_CONN_ENGINE" +- TOK_CONFIG_SEC_ARGUMENT_SEPARATOR = 494, // "CONFIG_SEC_ARGUMENT_SEPARATOR" +- TOK_CONFIG_SEC_WEB_APP_ID = 495, // "CONFIG_SEC_WEB_APP_ID" +- TOK_CONFIG_SEC_SERVER_SIG = 496, // "CONFIG_SEC_SERVER_SIG" +- TOK_CONFIG_DIR_AUDIT_DIR = 497, // "CONFIG_DIR_AUDIT_DIR" +- TOK_CONFIG_DIR_AUDIT_DIR_MOD = 498, // "CONFIG_DIR_AUDIT_DIR_MOD" +- TOK_CONFIG_DIR_AUDIT_ENG = 499, // "CONFIG_DIR_AUDIT_ENG" +- TOK_CONFIG_DIR_AUDIT_FLE_MOD = 500, // "CONFIG_DIR_AUDIT_FLE_MOD" +- TOK_CONFIG_DIR_AUDIT_LOG = 501, // "CONFIG_DIR_AUDIT_LOG" +- TOK_CONFIG_DIR_AUDIT_LOG2 = 502, // "CONFIG_DIR_AUDIT_LOG2" +- TOK_CONFIG_DIR_AUDIT_LOG_P = 503, // "CONFIG_DIR_AUDIT_LOG_P" +- TOK_CONFIG_DIR_AUDIT_STS = 504, // "CONFIG_DIR_AUDIT_STS" +- TOK_CONFIG_DIR_AUDIT_TPE = 505, // "CONFIG_DIR_AUDIT_TPE" +- TOK_CONFIG_DIR_DEBUG_LOG = 506, // "CONFIG_DIR_DEBUG_LOG" +- TOK_CONFIG_DIR_DEBUG_LVL = 507, // "CONFIG_DIR_DEBUG_LVL" +- TOK_CONFIG_SEC_CACHE_TRANSFORMATIONS = 508, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" +- TOK_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 509, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" +- TOK_CONFIG_SEC_HASH_ENGINE = 510, // "CONFIG_SEC_HASH_ENGINE" +- TOK_CONFIG_SEC_HASH_KEY = 511, // "CONFIG_SEC_HASH_KEY" +- TOK_CONFIG_SEC_HASH_PARAM = 512, // "CONFIG_SEC_HASH_PARAM" +- TOK_CONFIG_SEC_HASH_METHOD_RX = 513, // "CONFIG_SEC_HASH_METHOD_RX" +- TOK_CONFIG_SEC_HASH_METHOD_PM = 514, // "CONFIG_SEC_HASH_METHOD_PM" +- TOK_CONFIG_SEC_CHROOT_DIR = 515, // "CONFIG_SEC_CHROOT_DIR" +- TOK_CONFIG_DIR_GEO_DB = 516, // "CONFIG_DIR_GEO_DB" +- TOK_CONFIG_DIR_GSB_DB = 517, // "CONFIG_DIR_GSB_DB" +- TOK_CONFIG_SEC_GUARDIAN_LOG = 518, // "CONFIG_SEC_GUARDIAN_LOG" +- TOK_CONFIG_DIR_PCRE_MATCH_LIMIT = 519, // "CONFIG_DIR_PCRE_MATCH_LIMIT" +- TOK_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 520, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" +- TOK_CONFIG_SEC_CONN_R_STATE_LIMIT = 521, // "CONFIG_SEC_CONN_R_STATE_LIMIT" +- TOK_CONFIG_SEC_CONN_W_STATE_LIMIT = 522, // "CONFIG_SEC_CONN_W_STATE_LIMIT" +- TOK_CONFIG_SEC_SENSOR_ID = 523, // "CONFIG_SEC_SENSOR_ID" +- TOK_CONFIG_DIR_ARGS_LIMIT = 524, // "CONFIG_DIR_ARGS_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 525, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY = 526, // "CONFIG_DIR_REQ_BODY" +- TOK_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 527, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY_LIMIT = 528, // "CONFIG_DIR_REQ_BODY_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 529, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" +- TOK_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 530, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" +- TOK_CONFIG_DIR_RES_BODY = 531, // "CONFIG_DIR_RES_BODY" +- TOK_CONFIG_DIR_RES_BODY_LIMIT = 532, // "CONFIG_DIR_RES_BODY_LIMIT" +- TOK_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 533, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" +- TOK_CONFIG_SEC_RULE_INHERITANCE = 534, // "CONFIG_SEC_RULE_INHERITANCE" +- TOK_CONFIG_SEC_RULE_PERF_TIME = 535, // "CONFIG_SEC_RULE_PERF_TIME" +- TOK_CONFIG_DIR_RULE_ENG = 536, // "CONFIG_DIR_RULE_ENG" +- TOK_CONFIG_DIR_SEC_ACTION = 537, // "CONFIG_DIR_SEC_ACTION" +- TOK_CONFIG_DIR_SEC_DEFAULT_ACTION = 538, // "CONFIG_DIR_SEC_DEFAULT_ACTION" +- TOK_CONFIG_DIR_SEC_MARKER = 539, // "CONFIG_DIR_SEC_MARKER" +- TOK_CONFIG_DIR_UNICODE_MAP_FILE = 540, // "CONFIG_DIR_UNICODE_MAP_FILE" +- TOK_CONFIG_DIR_UNICODE_CODE_PAGE = 541, // "CONFIG_DIR_UNICODE_CODE_PAGE" +- TOK_CONFIG_SEC_COLLECTION_TIMEOUT = 542, // "CONFIG_SEC_COLLECTION_TIMEOUT" +- TOK_CONFIG_SEC_HTTP_BLKEY = 543, // "CONFIG_SEC_HTTP_BLKEY" +- TOK_CONFIG_SEC_INTERCEPT_ON_ERROR = 544, // "CONFIG_SEC_INTERCEPT_ON_ERROR" +- TOK_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 545, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" +- TOK_CONFIG_SEC_RULE_REMOVE_BY_ID = 546, // "CONFIG_SEC_RULE_REMOVE_BY_ID" +- TOK_CONFIG_SEC_RULE_REMOVE_BY_MSG = 547, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" +- TOK_CONFIG_SEC_RULE_REMOVE_BY_TAG = 548, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" +- TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 549, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" +- TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 550, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" +- TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 551, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" +- TOK_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 552, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" +- TOK_CONFIG_UPDLOAD_KEEP_FILES = 553, // "CONFIG_UPDLOAD_KEEP_FILES" +- TOK_CONFIG_UPDLOAD_SAVE_TMP_FILES = 554, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" +- TOK_CONFIG_UPLOAD_DIR = 555, // "CONFIG_UPLOAD_DIR" +- TOK_CONFIG_UPLOAD_FILE_LIMIT = 556, // "CONFIG_UPLOAD_FILE_LIMIT" +- TOK_CONFIG_UPLOAD_FILE_MODE = 557, // "CONFIG_UPLOAD_FILE_MODE" +- TOK_CONFIG_VALUE_ABORT = 558, // "CONFIG_VALUE_ABORT" +- TOK_CONFIG_VALUE_DETC = 559, // "CONFIG_VALUE_DETC" +- TOK_CONFIG_VALUE_HTTPS = 560, // "CONFIG_VALUE_HTTPS" +- TOK_CONFIG_VALUE_OFF = 561, // "CONFIG_VALUE_OFF" +- TOK_CONFIG_VALUE_ON = 562, // "CONFIG_VALUE_ON" +- TOK_CONFIG_VALUE_PARALLEL = 563, // "CONFIG_VALUE_PARALLEL" +- TOK_CONFIG_VALUE_PROCESS_PARTIAL = 564, // "CONFIG_VALUE_PROCESS_PARTIAL" +- TOK_CONFIG_VALUE_REJECT = 565, // "CONFIG_VALUE_REJECT" +- TOK_CONFIG_VALUE_RELEVANT_ONLY = 566, // "CONFIG_VALUE_RELEVANT_ONLY" +- TOK_CONFIG_VALUE_SERIAL = 567, // "CONFIG_VALUE_SERIAL" +- TOK_CONFIG_VALUE_WARN = 568, // "CONFIG_VALUE_WARN" +- TOK_CONFIG_XML_EXTERNAL_ENTITY = 569, // "CONFIG_XML_EXTERNAL_ENTITY" +- TOK_CONGIG_DIR_RESPONSE_BODY_MP = 570, // "CONGIG_DIR_RESPONSE_BODY_MP" +- TOK_CONGIG_DIR_SEC_ARG_SEP = 571, // "CONGIG_DIR_SEC_ARG_SEP" +- TOK_CONGIG_DIR_SEC_COOKIE_FORMAT = 572, // "CONGIG_DIR_SEC_COOKIE_FORMAT" +- TOK_CONFIG_SEC_COOKIEV0_SEPARATOR = 573, // "CONFIG_SEC_COOKIEV0_SEPARATOR" +- TOK_CONGIG_DIR_SEC_DATA_DIR = 574, // "CONGIG_DIR_SEC_DATA_DIR" +- TOK_CONGIG_DIR_SEC_STATUS_ENGINE = 575, // "CONGIG_DIR_SEC_STATUS_ENGINE" +- TOK_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 576, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" +- TOK_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 577, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" +- TOK_CONGIG_DIR_SEC_TMP_DIR = 578, // "CONGIG_DIR_SEC_TMP_DIR" +- TOK_DIRECTIVE = 579, // "DIRECTIVE" +- TOK_DIRECTIVE_SECRULESCRIPT = 580, // "DIRECTIVE_SECRULESCRIPT" +- TOK_FREE_TEXT_QUOTE_MACRO_EXPANSION = 581, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" +- TOK_QUOTATION_MARK = 582, // "QUOTATION_MARK" +- TOK_RUN_TIME_VAR_BLD = 583, // "RUN_TIME_VAR_BLD" +- TOK_RUN_TIME_VAR_DUR = 584, // "RUN_TIME_VAR_DUR" +- TOK_RUN_TIME_VAR_HSV = 585, // "RUN_TIME_VAR_HSV" +- TOK_RUN_TIME_VAR_REMOTE_USER = 586, // "RUN_TIME_VAR_REMOTE_USER" +- TOK_RUN_TIME_VAR_TIME = 587, // "RUN_TIME_VAR_TIME" +- TOK_RUN_TIME_VAR_TIME_DAY = 588, // "RUN_TIME_VAR_TIME_DAY" +- TOK_RUN_TIME_VAR_TIME_EPOCH = 589, // "RUN_TIME_VAR_TIME_EPOCH" +- TOK_RUN_TIME_VAR_TIME_HOUR = 590, // "RUN_TIME_VAR_TIME_HOUR" +- TOK_RUN_TIME_VAR_TIME_MIN = 591, // "RUN_TIME_VAR_TIME_MIN" +- TOK_RUN_TIME_VAR_TIME_MON = 592, // "RUN_TIME_VAR_TIME_MON" +- TOK_RUN_TIME_VAR_TIME_SEC = 593, // "RUN_TIME_VAR_TIME_SEC" +- TOK_RUN_TIME_VAR_TIME_WDAY = 594, // "RUN_TIME_VAR_TIME_WDAY" +- TOK_RUN_TIME_VAR_TIME_YEAR = 595, // "RUN_TIME_VAR_TIME_YEAR" +- TOK_VARIABLE = 596, // "VARIABLE" +- TOK_DICT_ELEMENT = 597, // "Dictionary element" +- TOK_DICT_ELEMENT_REGEXP = 598 // "Dictionary element, selected by regexp" ++ TOK_VARIABLE_MULTIPART_PART_HEADERS = 281, // VARIABLE_MULTIPART_PART_HEADERS ++ TOK_VARIABLE_ARGS_COMBINED_SIZE = 282, // VARIABLE_ARGS_COMBINED_SIZE ++ TOK_VARIABLE_ARGS_GET_NAMES = 283, // VARIABLE_ARGS_GET_NAMES ++ TOK_VARIABLE_RULE = 284, // VARIABLE_RULE ++ TOK_VARIABLE_ARGS_NAMES = 285, // "Variable ARGS_NAMES" ++ TOK_VARIABLE_ARGS_POST_NAMES = 286, // VARIABLE_ARGS_POST_NAMES ++ TOK_VARIABLE_AUTH_TYPE = 287, // "AUTH_TYPE" ++ TOK_VARIABLE_FILES_COMBINED_SIZE = 288, // "FILES_COMBINED_SIZE" ++ TOK_VARIABLE_FILES_TMP_NAMES = 289, // "FILES_TMPNAMES" ++ TOK_VARIABLE_FULL_REQUEST = 290, // "FULL_REQUEST" ++ TOK_VARIABLE_FULL_REQUEST_LENGTH = 291, // "FULL_REQUEST_LENGTH" ++ TOK_VARIABLE_INBOUND_DATA_ERROR = 292, // "INBOUND_DATA_ERROR" ++ TOK_VARIABLE_MATCHED_VAR = 293, // "MATCHED_VAR" ++ TOK_VARIABLE_MATCHED_VAR_NAME = 294, // "MATCHED_VAR_NAME" ++ TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 295, // VARIABLE_MULTIPART_BOUNDARY_QUOTED ++ TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 296, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE ++ TOK_VARIABLE_MULTIPART_CRLF_LF_LINES = 297, // "MULTIPART_CRLF_LF_LINES" ++ TOK_VARIABLE_MULTIPART_DATA_AFTER = 298, // "MULTIPART_DATA_AFTER" ++ TOK_VARIABLE_MULTIPART_DATA_BEFORE = 299, // VARIABLE_MULTIPART_DATA_BEFORE ++ TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 300, // "MULTIPART_FILE_LIMIT_EXCEEDED" ++ TOK_VARIABLE_MULTIPART_HEADER_FOLDING = 301, // "MULTIPART_HEADER_FOLDING" ++ TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 302, // "MULTIPART_INVALID_HEADER_FOLDING" ++ TOK_VARIABLE_MULTIPART_INVALID_PART = 303, // VARIABLE_MULTIPART_INVALID_PART ++ TOK_VARIABLE_MULTIPART_INVALID_QUOTING = 304, // "MULTIPART_INVALID_QUOTING" ++ TOK_VARIABLE_MULTIPART_LF_LINE = 305, // VARIABLE_MULTIPART_LF_LINE ++ TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON = 306, // VARIABLE_MULTIPART_MISSING_SEMICOLON ++ TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING = 307, // VARIABLE_MULTIPART_SEMICOLON_MISSING ++ TOK_VARIABLE_MULTIPART_STRICT_ERROR = 308, // "MULTIPART_STRICT_ERROR" ++ TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 309, // "MULTIPART_UNMATCHED_BOUNDARY" ++ TOK_VARIABLE_OUTBOUND_DATA_ERROR = 310, // "OUTBOUND_DATA_ERROR" ++ TOK_VARIABLE_PATH_INFO = 311, // "PATH_INFO" ++ TOK_VARIABLE_QUERY_STRING = 312, // "QUERY_STRING" ++ TOK_VARIABLE_REMOTE_ADDR = 313, // "REMOTE_ADDR" ++ TOK_VARIABLE_REMOTE_HOST = 314, // "REMOTE_HOST" ++ TOK_VARIABLE_REMOTE_PORT = 315, // "REMOTE_PORT" ++ TOK_VARIABLE_REQBODY_ERROR_MSG = 316, // "REQBODY_ERROR_MSG" ++ TOK_VARIABLE_REQBODY_ERROR = 317, // "REQBODY_ERROR" ++ TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 318, // "REQBODY_PROCESSOR_ERROR_MSG" ++ TOK_VARIABLE_REQBODY_PROCESSOR_ERROR = 319, // "REQBODY_PROCESSOR_ERROR" ++ TOK_VARIABLE_REQBODY_PROCESSOR = 320, // "REQBODY_PROCESSOR" ++ TOK_VARIABLE_REQUEST_BASENAME = 321, // "REQUEST_BASENAME" ++ TOK_VARIABLE_REQUEST_BODY_LENGTH = 322, // "REQUEST_BODY_LENGTH" ++ TOK_VARIABLE_REQUEST_BODY = 323, // "REQUEST_BODY" ++ TOK_VARIABLE_REQUEST_FILE_NAME = 324, // "REQUEST_FILENAME" ++ TOK_VARIABLE_REQUEST_HEADERS_NAMES = 325, // VARIABLE_REQUEST_HEADERS_NAMES ++ TOK_VARIABLE_REQUEST_LINE = 326, // "REQUEST_LINE" ++ TOK_VARIABLE_REQUEST_METHOD = 327, // "REQUEST_METHOD" ++ TOK_VARIABLE_REQUEST_PROTOCOL = 328, // "REQUEST_PROTOCOL" ++ TOK_VARIABLE_REQUEST_URI_RAW = 329, // "REQUEST_URI_RAW" ++ TOK_VARIABLE_REQUEST_URI = 330, // "REQUEST_URI" ++ TOK_VARIABLE_RESOURCE = 331, // "RESOURCE" ++ TOK_VARIABLE_RESPONSE_BODY = 332, // "RESPONSE_BODY" ++ TOK_VARIABLE_RESPONSE_CONTENT_LENGTH = 333, // "RESPONSE_CONTENT_LENGTH" ++ TOK_VARIABLE_RESPONSE_CONTENT_TYPE = 334, // VARIABLE_RESPONSE_CONTENT_TYPE ++ TOK_VARIABLE_RESPONSE_HEADERS_NAMES = 335, // VARIABLE_RESPONSE_HEADERS_NAMES ++ TOK_VARIABLE_RESPONSE_PROTOCOL = 336, // "RESPONSE_PROTOCOL" ++ TOK_VARIABLE_RESPONSE_STATUS = 337, // "RESPONSE_STATUS" ++ TOK_VARIABLE_SERVER_ADDR = 338, // "SERVER_ADDR" ++ TOK_VARIABLE_SERVER_NAME = 339, // "SERVER_NAME" ++ TOK_VARIABLE_SERVER_PORT = 340, // "SERVER_PORT" ++ TOK_VARIABLE_SESSION_ID = 341, // "SESSIONID" ++ TOK_VARIABLE_UNIQUE_ID = 342, // "UNIQUE_ID" ++ TOK_VARIABLE_URL_ENCODED_ERROR = 343, // "URLENCODED_ERROR" ++ TOK_VARIABLE_USER_ID = 344, // "USERID" ++ TOK_VARIABLE_WEB_APP_ID = 345, // "WEBAPPID" ++ TOK_VARIABLE_STATUS = 346, // "VARIABLE_STATUS" ++ TOK_VARIABLE_STATUS_LINE = 347, // "VARIABLE_STATUS_LINE" ++ TOK_VARIABLE_IP = 348, // "VARIABLE_IP" ++ TOK_VARIABLE_GLOBAL = 349, // "VARIABLE_GLOBAL" ++ TOK_VARIABLE_TX = 350, // "VARIABLE_TX" ++ TOK_VARIABLE_SESSION = 351, // "VARIABLE_SESSION" ++ TOK_VARIABLE_USER = 352, // "VARIABLE_USER" ++ TOK_RUN_TIME_VAR_ENV = 353, // "RUN_TIME_VAR_ENV" ++ TOK_RUN_TIME_VAR_XML = 354, // "RUN_TIME_VAR_XML" ++ TOK_ACTION_SETVAR = 355, // "SetVar" ++ TOK_SETVAR_OPERATION_EQUALS = 356, // SETVAR_OPERATION_EQUALS ++ TOK_SETVAR_OPERATION_EQUALS_PLUS = 357, // SETVAR_OPERATION_EQUALS_PLUS ++ TOK_SETVAR_OPERATION_EQUALS_MINUS = 358, // SETVAR_OPERATION_EQUALS_MINUS ++ TOK_NOT = 359, // "NOT" ++ TOK_OPERATOR_BEGINS_WITH = 360, // "OPERATOR_BEGINS_WITH" ++ TOK_OPERATOR_CONTAINS = 361, // "OPERATOR_CONTAINS" ++ TOK_OPERATOR_CONTAINS_WORD = 362, // "OPERATOR_CONTAINS_WORD" ++ TOK_OPERATOR_DETECT_SQLI = 363, // "OPERATOR_DETECT_SQLI" ++ TOK_OPERATOR_DETECT_XSS = 364, // "OPERATOR_DETECT_XSS" ++ TOK_OPERATOR_ENDS_WITH = 365, // "OPERATOR_ENDS_WITH" ++ TOK_OPERATOR_EQ = 366, // "OPERATOR_EQ" ++ TOK_OPERATOR_FUZZY_HASH = 367, // "OPERATOR_FUZZY_HASH" ++ TOK_OPERATOR_GEOLOOKUP = 368, // "OPERATOR_GEOLOOKUP" ++ TOK_OPERATOR_GE = 369, // "OPERATOR_GE" ++ TOK_OPERATOR_GSB_LOOKUP = 370, // "OPERATOR_GSB_LOOKUP" ++ TOK_OPERATOR_GT = 371, // "OPERATOR_GT" ++ TOK_OPERATOR_INSPECT_FILE = 372, // "OPERATOR_INSPECT_FILE" ++ TOK_OPERATOR_IP_MATCH_FROM_FILE = 373, // "OPERATOR_IP_MATCH_FROM_FILE" ++ TOK_OPERATOR_IP_MATCH = 374, // "OPERATOR_IP_MATCH" ++ TOK_OPERATOR_LE = 375, // "OPERATOR_LE" ++ TOK_OPERATOR_LT = 376, // "OPERATOR_LT" ++ TOK_OPERATOR_PM_FROM_FILE = 377, // "OPERATOR_PM_FROM_FILE" ++ TOK_OPERATOR_PM = 378, // "OPERATOR_PM" ++ TOK_OPERATOR_RBL = 379, // "OPERATOR_RBL" ++ TOK_OPERATOR_RSUB = 380, // "OPERATOR_RSUB" ++ TOK_OPERATOR_RX_CONTENT_ONLY = 381, // "Operator RX (content only)" ++ TOK_OPERATOR_RX = 382, // "OPERATOR_RX" ++ TOK_OPERATOR_RX_GLOBAL = 383, // "OPERATOR_RX_GLOBAL" ++ TOK_OPERATOR_STR_EQ = 384, // "OPERATOR_STR_EQ" ++ TOK_OPERATOR_STR_MATCH = 385, // "OPERATOR_STR_MATCH" ++ TOK_OPERATOR_UNCONDITIONAL_MATCH = 386, // "OPERATOR_UNCONDITIONAL_MATCH" ++ TOK_OPERATOR_VALIDATE_BYTE_RANGE = 387, // "OPERATOR_VALIDATE_BYTE_RANGE" ++ TOK_OPERATOR_VALIDATE_DTD = 388, // "OPERATOR_VALIDATE_DTD" ++ TOK_OPERATOR_VALIDATE_HASH = 389, // "OPERATOR_VALIDATE_HASH" ++ TOK_OPERATOR_VALIDATE_SCHEMA = 390, // "OPERATOR_VALIDATE_SCHEMA" ++ TOK_OPERATOR_VALIDATE_URL_ENCODING = 391, // "OPERATOR_VALIDATE_URL_ENCODING" ++ TOK_OPERATOR_VALIDATE_UTF8_ENCODING = 392, // "OPERATOR_VALIDATE_UTF8_ENCODING" ++ TOK_OPERATOR_VERIFY_CC = 393, // "OPERATOR_VERIFY_CC" ++ TOK_OPERATOR_VERIFY_CPF = 394, // "OPERATOR_VERIFY_CPF" ++ TOK_OPERATOR_VERIFY_SSN = 395, // "OPERATOR_VERIFY_SSN" ++ TOK_OPERATOR_VERIFY_SVNR = 396, // "OPERATOR_VERIFY_SVNR" ++ TOK_OPERATOR_WITHIN = 397, // "OPERATOR_WITHIN" ++ TOK_CONFIG_DIR_AUDIT_LOG_FMT = 398, // CONFIG_DIR_AUDIT_LOG_FMT ++ TOK_JSON = 399, // JSON ++ TOK_NATIVE = 400, // NATIVE ++ TOK_ACTION_CTL_RULE_ENGINE = 401, // "ACTION_CTL_RULE_ENGINE" ++ TOK_ACTION_ACCURACY = 402, // "Accuracy" ++ TOK_ACTION_ALLOW = 403, // "Allow" ++ TOK_ACTION_APPEND = 404, // "Append" ++ TOK_ACTION_AUDIT_LOG = 405, // "AuditLog" ++ TOK_ACTION_BLOCK = 406, // "Block" ++ TOK_ACTION_CAPTURE = 407, // "Capture" ++ TOK_ACTION_CHAIN = 408, // "Chain" ++ TOK_ACTION_CTL_AUDIT_ENGINE = 409, // "ACTION_CTL_AUDIT_ENGINE" ++ TOK_ACTION_CTL_AUDIT_LOG_PARTS = 410, // "ACTION_CTL_AUDIT_LOG_PARTS" ++ TOK_ACTION_CTL_BDY_JSON = 411, // "ACTION_CTL_BDY_JSON" ++ TOK_ACTION_CTL_BDY_XML = 412, // "ACTION_CTL_BDY_XML" ++ TOK_ACTION_CTL_BDY_URLENCODED = 413, // "ACTION_CTL_BDY_URLENCODED" ++ TOK_ACTION_CTL_FORCE_REQ_BODY_VAR = 414, // "ACTION_CTL_FORCE_REQ_BODY_VAR" ++ TOK_ACTION_CTL_REQUEST_BODY_ACCESS = 415, // "ACTION_CTL_REQUEST_BODY_ACCESS" ++ TOK_ACTION_CTL_RULE_REMOVE_BY_ID = 416, // "ACTION_CTL_RULE_REMOVE_BY_ID" ++ TOK_ACTION_CTL_RULE_REMOVE_BY_TAG = 417, // "ACTION_CTL_RULE_REMOVE_BY_TAG" ++ TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 418, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" ++ TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 419, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" ++ TOK_ACTION_DENY = 420, // "Deny" ++ TOK_ACTION_DEPRECATE_VAR = 421, // "DeprecateVar" ++ TOK_ACTION_DROP = 422, // "Drop" ++ TOK_ACTION_EXEC = 423, // "Exec" ++ TOK_ACTION_EXPIRE_VAR = 424, // "ExpireVar" ++ TOK_ACTION_ID = 425, // "Id" ++ TOK_ACTION_INITCOL = 426, // "InitCol" ++ TOK_ACTION_LOG = 427, // "Log" ++ TOK_ACTION_LOG_DATA = 428, // "LogData" ++ TOK_ACTION_MATURITY = 429, // "Maturity" ++ TOK_ACTION_MSG = 430, // "Msg" ++ TOK_ACTION_MULTI_MATCH = 431, // "MultiMatch" ++ TOK_ACTION_NO_AUDIT_LOG = 432, // "NoAuditLog" ++ TOK_ACTION_NO_LOG = 433, // "NoLog" ++ TOK_ACTION_PASS = 434, // "Pass" ++ TOK_ACTION_PAUSE = 435, // "Pause" ++ TOK_ACTION_PHASE = 436, // "Phase" ++ TOK_ACTION_PREPEND = 437, // "Prepend" ++ TOK_ACTION_PROXY = 438, // "Proxy" ++ TOK_ACTION_REDIRECT = 439, // "Redirect" ++ TOK_ACTION_REV = 440, // "Rev" ++ TOK_ACTION_SANITISE_ARG = 441, // "SanitiseArg" ++ TOK_ACTION_SANITISE_MATCHED = 442, // "SanitiseMatched" ++ TOK_ACTION_SANITISE_MATCHED_BYTES = 443, // "SanitiseMatchedBytes" ++ TOK_ACTION_SANITISE_REQUEST_HEADER = 444, // "SanitiseRequestHeader" ++ TOK_ACTION_SANITISE_RESPONSE_HEADER = 445, // "SanitiseResponseHeader" ++ TOK_ACTION_SETENV = 446, // "SetEnv" ++ TOK_ACTION_SETRSC = 447, // "SetRsc" ++ TOK_ACTION_SETSID = 448, // "SetSid" ++ TOK_ACTION_SETUID = 449, // "SetUID" ++ TOK_ACTION_SEVERITY = 450, // "Severity" ++ TOK_ACTION_SKIP = 451, // "Skip" ++ TOK_ACTION_SKIP_AFTER = 452, // "SkipAfter" ++ TOK_ACTION_STATUS = 453, // "Status" ++ TOK_ACTION_TAG = 454, // "Tag" ++ TOK_ACTION_TRANSFORMATION_BASE_64_ENCODE = 455, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" ++ TOK_ACTION_TRANSFORMATION_BASE_64_DECODE = 456, // "ACTION_TRANSFORMATION_BASE_64_DECODE" ++ TOK_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 457, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" ++ TOK_ACTION_TRANSFORMATION_CMD_LINE = 458, // "ACTION_TRANSFORMATION_CMD_LINE" ++ TOK_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 459, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" ++ TOK_ACTION_TRANSFORMATION_CSS_DECODE = 460, // "ACTION_TRANSFORMATION_CSS_DECODE" ++ TOK_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 461, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" ++ TOK_ACTION_TRANSFORMATION_HEX_ENCODE = 462, // "ACTION_TRANSFORMATION_HEX_ENCODE" ++ TOK_ACTION_TRANSFORMATION_HEX_DECODE = 463, // "ACTION_TRANSFORMATION_HEX_DECODE" ++ TOK_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 464, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" ++ TOK_ACTION_TRANSFORMATION_JS_DECODE = 465, // "ACTION_TRANSFORMATION_JS_DECODE" ++ TOK_ACTION_TRANSFORMATION_LENGTH = 466, // "ACTION_TRANSFORMATION_LENGTH" ++ TOK_ACTION_TRANSFORMATION_LOWERCASE = 467, // "ACTION_TRANSFORMATION_LOWERCASE" ++ TOK_ACTION_TRANSFORMATION_MD5 = 468, // "ACTION_TRANSFORMATION_MD5" ++ TOK_ACTION_TRANSFORMATION_NONE = 469, // "ACTION_TRANSFORMATION_NONE" ++ TOK_ACTION_TRANSFORMATION_NORMALISE_PATH = 470, // "ACTION_TRANSFORMATION_NORMALISE_PATH" ++ TOK_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 471, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" ++ TOK_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 472, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" ++ TOK_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 473, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" ++ TOK_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 474, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" ++ TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 475, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" ++ TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 476, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" ++ TOK_ACTION_TRANSFORMATION_REMOVE_NULLS = 477, // "ACTION_TRANSFORMATION_REMOVE_NULLS" ++ TOK_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 478, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" ++ TOK_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 479, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" ++ TOK_ACTION_TRANSFORMATION_REPLACE_NULLS = 480, // "ACTION_TRANSFORMATION_REPLACE_NULLS" ++ TOK_ACTION_TRANSFORMATION_SHA1 = 481, // "ACTION_TRANSFORMATION_SHA1" ++ TOK_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 482, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" ++ TOK_ACTION_TRANSFORMATION_TRIM = 483, // "ACTION_TRANSFORMATION_TRIM" ++ TOK_ACTION_TRANSFORMATION_TRIM_LEFT = 484, // "ACTION_TRANSFORMATION_TRIM_LEFT" ++ TOK_ACTION_TRANSFORMATION_TRIM_RIGHT = 485, // "ACTION_TRANSFORMATION_TRIM_RIGHT" ++ TOK_ACTION_TRANSFORMATION_UPPERCASE = 486, // "ACTION_TRANSFORMATION_UPPERCASE" ++ TOK_ACTION_TRANSFORMATION_URL_ENCODE = 487, // "ACTION_TRANSFORMATION_URL_ENCODE" ++ TOK_ACTION_TRANSFORMATION_URL_DECODE = 488, // "ACTION_TRANSFORMATION_URL_DECODE" ++ TOK_ACTION_TRANSFORMATION_URL_DECODE_UNI = 489, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" ++ TOK_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 490, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" ++ TOK_ACTION_VER = 491, // "Ver" ++ TOK_ACTION_XMLNS = 492, // "xmlns" ++ TOK_CONFIG_COMPONENT_SIG = 493, // "CONFIG_COMPONENT_SIG" ++ TOK_CONFIG_CONN_ENGINE = 494, // "CONFIG_CONN_ENGINE" ++ TOK_CONFIG_SEC_ARGUMENT_SEPARATOR = 495, // "CONFIG_SEC_ARGUMENT_SEPARATOR" ++ TOK_CONFIG_SEC_WEB_APP_ID = 496, // "CONFIG_SEC_WEB_APP_ID" ++ TOK_CONFIG_SEC_SERVER_SIG = 497, // "CONFIG_SEC_SERVER_SIG" ++ TOK_CONFIG_DIR_AUDIT_DIR = 498, // "CONFIG_DIR_AUDIT_DIR" ++ TOK_CONFIG_DIR_AUDIT_DIR_MOD = 499, // "CONFIG_DIR_AUDIT_DIR_MOD" ++ TOK_CONFIG_DIR_AUDIT_ENG = 500, // "CONFIG_DIR_AUDIT_ENG" ++ TOK_CONFIG_DIR_AUDIT_FLE_MOD = 501, // "CONFIG_DIR_AUDIT_FLE_MOD" ++ TOK_CONFIG_DIR_AUDIT_LOG = 502, // "CONFIG_DIR_AUDIT_LOG" ++ TOK_CONFIG_DIR_AUDIT_LOG2 = 503, // "CONFIG_DIR_AUDIT_LOG2" ++ TOK_CONFIG_DIR_AUDIT_LOG_P = 504, // "CONFIG_DIR_AUDIT_LOG_P" ++ TOK_CONFIG_DIR_AUDIT_STS = 505, // "CONFIG_DIR_AUDIT_STS" ++ TOK_CONFIG_DIR_AUDIT_TPE = 506, // "CONFIG_DIR_AUDIT_TPE" ++ TOK_CONFIG_DIR_DEBUG_LOG = 507, // "CONFIG_DIR_DEBUG_LOG" ++ TOK_CONFIG_DIR_DEBUG_LVL = 508, // "CONFIG_DIR_DEBUG_LVL" ++ TOK_CONFIG_SEC_CACHE_TRANSFORMATIONS = 509, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" ++ TOK_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 510, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" ++ TOK_CONFIG_SEC_HASH_ENGINE = 511, // "CONFIG_SEC_HASH_ENGINE" ++ TOK_CONFIG_SEC_HASH_KEY = 512, // "CONFIG_SEC_HASH_KEY" ++ TOK_CONFIG_SEC_HASH_PARAM = 513, // "CONFIG_SEC_HASH_PARAM" ++ TOK_CONFIG_SEC_HASH_METHOD_RX = 514, // "CONFIG_SEC_HASH_METHOD_RX" ++ TOK_CONFIG_SEC_HASH_METHOD_PM = 515, // "CONFIG_SEC_HASH_METHOD_PM" ++ TOK_CONFIG_SEC_CHROOT_DIR = 516, // "CONFIG_SEC_CHROOT_DIR" ++ TOK_CONFIG_DIR_GEO_DB = 517, // "CONFIG_DIR_GEO_DB" ++ TOK_CONFIG_DIR_GSB_DB = 518, // "CONFIG_DIR_GSB_DB" ++ TOK_CONFIG_SEC_GUARDIAN_LOG = 519, // "CONFIG_SEC_GUARDIAN_LOG" ++ TOK_CONFIG_DIR_PCRE_MATCH_LIMIT = 520, // "CONFIG_DIR_PCRE_MATCH_LIMIT" ++ TOK_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 521, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" ++ TOK_CONFIG_SEC_CONN_R_STATE_LIMIT = 522, // "CONFIG_SEC_CONN_R_STATE_LIMIT" ++ TOK_CONFIG_SEC_CONN_W_STATE_LIMIT = 523, // "CONFIG_SEC_CONN_W_STATE_LIMIT" ++ TOK_CONFIG_SEC_SENSOR_ID = 524, // "CONFIG_SEC_SENSOR_ID" ++ TOK_CONFIG_DIR_ARGS_LIMIT = 525, // "CONFIG_DIR_ARGS_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 526, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY = 527, // "CONFIG_DIR_REQ_BODY" ++ TOK_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 528, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY_LIMIT = 529, // "CONFIG_DIR_REQ_BODY_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 530, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" ++ TOK_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 531, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" ++ TOK_CONFIG_DIR_RES_BODY = 532, // "CONFIG_DIR_RES_BODY" ++ TOK_CONFIG_DIR_RES_BODY_LIMIT = 533, // "CONFIG_DIR_RES_BODY_LIMIT" ++ TOK_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 534, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" ++ TOK_CONFIG_SEC_RULE_INHERITANCE = 535, // "CONFIG_SEC_RULE_INHERITANCE" ++ TOK_CONFIG_SEC_RULE_PERF_TIME = 536, // "CONFIG_SEC_RULE_PERF_TIME" ++ TOK_CONFIG_DIR_RULE_ENG = 537, // "CONFIG_DIR_RULE_ENG" ++ TOK_CONFIG_DIR_SEC_ACTION = 538, // "CONFIG_DIR_SEC_ACTION" ++ TOK_CONFIG_DIR_SEC_DEFAULT_ACTION = 539, // "CONFIG_DIR_SEC_DEFAULT_ACTION" ++ TOK_CONFIG_DIR_SEC_MARKER = 540, // "CONFIG_DIR_SEC_MARKER" ++ TOK_CONFIG_DIR_UNICODE_MAP_FILE = 541, // "CONFIG_DIR_UNICODE_MAP_FILE" ++ TOK_CONFIG_DIR_UNICODE_CODE_PAGE = 542, // "CONFIG_DIR_UNICODE_CODE_PAGE" ++ TOK_CONFIG_SEC_COLLECTION_TIMEOUT = 543, // "CONFIG_SEC_COLLECTION_TIMEOUT" ++ TOK_CONFIG_SEC_HTTP_BLKEY = 544, // "CONFIG_SEC_HTTP_BLKEY" ++ TOK_CONFIG_SEC_INTERCEPT_ON_ERROR = 545, // "CONFIG_SEC_INTERCEPT_ON_ERROR" ++ TOK_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 546, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" ++ TOK_CONFIG_SEC_RULE_REMOVE_BY_ID = 547, // "CONFIG_SEC_RULE_REMOVE_BY_ID" ++ TOK_CONFIG_SEC_RULE_REMOVE_BY_MSG = 548, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" ++ TOK_CONFIG_SEC_RULE_REMOVE_BY_TAG = 549, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" ++ TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 550, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" ++ TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 551, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" ++ TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 552, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" ++ TOK_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 553, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" ++ TOK_CONFIG_UPDLOAD_KEEP_FILES = 554, // "CONFIG_UPDLOAD_KEEP_FILES" ++ TOK_CONFIG_UPDLOAD_SAVE_TMP_FILES = 555, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" ++ TOK_CONFIG_UPLOAD_DIR = 556, // "CONFIG_UPLOAD_DIR" ++ TOK_CONFIG_UPLOAD_FILE_LIMIT = 557, // "CONFIG_UPLOAD_FILE_LIMIT" ++ TOK_CONFIG_UPLOAD_FILE_MODE = 558, // "CONFIG_UPLOAD_FILE_MODE" ++ TOK_CONFIG_VALUE_ABORT = 559, // "CONFIG_VALUE_ABORT" ++ TOK_CONFIG_VALUE_DETC = 560, // "CONFIG_VALUE_DETC" ++ TOK_CONFIG_VALUE_HTTPS = 561, // "CONFIG_VALUE_HTTPS" ++ TOK_CONFIG_VALUE_OFF = 562, // "CONFIG_VALUE_OFF" ++ TOK_CONFIG_VALUE_ON = 563, // "CONFIG_VALUE_ON" ++ TOK_CONFIG_VALUE_PARALLEL = 564, // "CONFIG_VALUE_PARALLEL" ++ TOK_CONFIG_VALUE_PROCESS_PARTIAL = 565, // "CONFIG_VALUE_PROCESS_PARTIAL" ++ TOK_CONFIG_VALUE_REJECT = 566, // "CONFIG_VALUE_REJECT" ++ TOK_CONFIG_VALUE_RELEVANT_ONLY = 567, // "CONFIG_VALUE_RELEVANT_ONLY" ++ TOK_CONFIG_VALUE_SERIAL = 568, // "CONFIG_VALUE_SERIAL" ++ TOK_CONFIG_VALUE_WARN = 569, // "CONFIG_VALUE_WARN" ++ TOK_CONFIG_XML_EXTERNAL_ENTITY = 570, // "CONFIG_XML_EXTERNAL_ENTITY" ++ TOK_CONGIG_DIR_RESPONSE_BODY_MP = 571, // "CONGIG_DIR_RESPONSE_BODY_MP" ++ TOK_CONGIG_DIR_SEC_ARG_SEP = 572, // "CONGIG_DIR_SEC_ARG_SEP" ++ TOK_CONGIG_DIR_SEC_COOKIE_FORMAT = 573, // "CONGIG_DIR_SEC_COOKIE_FORMAT" ++ TOK_CONFIG_SEC_COOKIEV0_SEPARATOR = 574, // "CONFIG_SEC_COOKIEV0_SEPARATOR" ++ TOK_CONGIG_DIR_SEC_DATA_DIR = 575, // "CONGIG_DIR_SEC_DATA_DIR" ++ TOK_CONGIG_DIR_SEC_STATUS_ENGINE = 576, // "CONGIG_DIR_SEC_STATUS_ENGINE" ++ TOK_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 577, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" ++ TOK_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 578, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" ++ TOK_CONGIG_DIR_SEC_TMP_DIR = 579, // "CONGIG_DIR_SEC_TMP_DIR" ++ TOK_DIRECTIVE = 580, // "DIRECTIVE" ++ TOK_DIRECTIVE_SECRULESCRIPT = 581, // "DIRECTIVE_SECRULESCRIPT" ++ TOK_FREE_TEXT_QUOTE_MACRO_EXPANSION = 582, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++ TOK_QUOTATION_MARK = 583, // "QUOTATION_MARK" ++ TOK_RUN_TIME_VAR_BLD = 584, // "RUN_TIME_VAR_BLD" ++ TOK_RUN_TIME_VAR_DUR = 585, // "RUN_TIME_VAR_DUR" ++ TOK_RUN_TIME_VAR_HSV = 586, // "RUN_TIME_VAR_HSV" ++ TOK_RUN_TIME_VAR_REMOTE_USER = 587, // "RUN_TIME_VAR_REMOTE_USER" ++ TOK_RUN_TIME_VAR_TIME = 588, // "RUN_TIME_VAR_TIME" ++ TOK_RUN_TIME_VAR_TIME_DAY = 589, // "RUN_TIME_VAR_TIME_DAY" ++ TOK_RUN_TIME_VAR_TIME_EPOCH = 590, // "RUN_TIME_VAR_TIME_EPOCH" ++ TOK_RUN_TIME_VAR_TIME_HOUR = 591, // "RUN_TIME_VAR_TIME_HOUR" ++ TOK_RUN_TIME_VAR_TIME_MIN = 592, // "RUN_TIME_VAR_TIME_MIN" ++ TOK_RUN_TIME_VAR_TIME_MON = 593, // "RUN_TIME_VAR_TIME_MON" ++ TOK_RUN_TIME_VAR_TIME_SEC = 594, // "RUN_TIME_VAR_TIME_SEC" ++ TOK_RUN_TIME_VAR_TIME_WDAY = 595, // "RUN_TIME_VAR_TIME_WDAY" ++ TOK_RUN_TIME_VAR_TIME_YEAR = 596, // "RUN_TIME_VAR_TIME_YEAR" ++ TOK_VARIABLE = 597, // "VARIABLE" ++ TOK_DICT_ELEMENT = 598, // "Dictionary element" ++ TOK_DICT_ELEMENT_REGEXP = 599 // "Dictionary element, selected by regexp" + }; + /// Backward compatibility alias (Bison 3.6). + typedef token_kind_type yytokentype; +@@ -1329,7 +1331,7 @@ namespace yy { + { + enum symbol_kind_type + { +- YYNTOKENS = 344, ///< Number of tokens. ++ YYNTOKENS = 345, ///< Number of tokens. + S_YYEMPTY = -2, + S_YYEOF = 0, // "end of file" + S_YYerror = 1, // error +@@ -1357,340 +1359,341 @@ namespace yy { + S_VARIABLE_RESPONSE_HEADERS = 23, // VARIABLE_RESPONSE_HEADERS + S_VARIABLE_GEO = 24, // VARIABLE_GEO + S_VARIABLE_REQUEST_COOKIES_NAMES = 25, // VARIABLE_REQUEST_COOKIES_NAMES +- S_VARIABLE_ARGS_COMBINED_SIZE = 26, // VARIABLE_ARGS_COMBINED_SIZE +- S_VARIABLE_ARGS_GET_NAMES = 27, // VARIABLE_ARGS_GET_NAMES +- S_VARIABLE_RULE = 28, // VARIABLE_RULE +- S_VARIABLE_ARGS_NAMES = 29, // "Variable ARGS_NAMES" +- S_VARIABLE_ARGS_POST_NAMES = 30, // VARIABLE_ARGS_POST_NAMES +- S_VARIABLE_AUTH_TYPE = 31, // "AUTH_TYPE" +- S_VARIABLE_FILES_COMBINED_SIZE = 32, // "FILES_COMBINED_SIZE" +- S_VARIABLE_FILES_TMP_NAMES = 33, // "FILES_TMPNAMES" +- S_VARIABLE_FULL_REQUEST = 34, // "FULL_REQUEST" +- S_VARIABLE_FULL_REQUEST_LENGTH = 35, // "FULL_REQUEST_LENGTH" +- S_VARIABLE_INBOUND_DATA_ERROR = 36, // "INBOUND_DATA_ERROR" +- S_VARIABLE_MATCHED_VAR = 37, // "MATCHED_VAR" +- S_VARIABLE_MATCHED_VAR_NAME = 38, // "MATCHED_VAR_NAME" +- S_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 39, // VARIABLE_MULTIPART_BOUNDARY_QUOTED +- S_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 40, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE +- S_VARIABLE_MULTIPART_CRLF_LF_LINES = 41, // "MULTIPART_CRLF_LF_LINES" +- S_VARIABLE_MULTIPART_DATA_AFTER = 42, // "MULTIPART_DATA_AFTER" +- S_VARIABLE_MULTIPART_DATA_BEFORE = 43, // VARIABLE_MULTIPART_DATA_BEFORE +- S_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 44, // "MULTIPART_FILE_LIMIT_EXCEEDED" +- S_VARIABLE_MULTIPART_HEADER_FOLDING = 45, // "MULTIPART_HEADER_FOLDING" +- S_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 46, // "MULTIPART_INVALID_HEADER_FOLDING" +- S_VARIABLE_MULTIPART_INVALID_PART = 47, // VARIABLE_MULTIPART_INVALID_PART +- S_VARIABLE_MULTIPART_INVALID_QUOTING = 48, // "MULTIPART_INVALID_QUOTING" +- S_VARIABLE_MULTIPART_LF_LINE = 49, // VARIABLE_MULTIPART_LF_LINE +- S_VARIABLE_MULTIPART_MISSING_SEMICOLON = 50, // VARIABLE_MULTIPART_MISSING_SEMICOLON +- S_VARIABLE_MULTIPART_SEMICOLON_MISSING = 51, // VARIABLE_MULTIPART_SEMICOLON_MISSING +- S_VARIABLE_MULTIPART_STRICT_ERROR = 52, // "MULTIPART_STRICT_ERROR" +- S_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 53, // "MULTIPART_UNMATCHED_BOUNDARY" +- S_VARIABLE_OUTBOUND_DATA_ERROR = 54, // "OUTBOUND_DATA_ERROR" +- S_VARIABLE_PATH_INFO = 55, // "PATH_INFO" +- S_VARIABLE_QUERY_STRING = 56, // "QUERY_STRING" +- S_VARIABLE_REMOTE_ADDR = 57, // "REMOTE_ADDR" +- S_VARIABLE_REMOTE_HOST = 58, // "REMOTE_HOST" +- S_VARIABLE_REMOTE_PORT = 59, // "REMOTE_PORT" +- S_VARIABLE_REQBODY_ERROR_MSG = 60, // "REQBODY_ERROR_MSG" +- S_VARIABLE_REQBODY_ERROR = 61, // "REQBODY_ERROR" +- S_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 62, // "REQBODY_PROCESSOR_ERROR_MSG" +- S_VARIABLE_REQBODY_PROCESSOR_ERROR = 63, // "REQBODY_PROCESSOR_ERROR" +- S_VARIABLE_REQBODY_PROCESSOR = 64, // "REQBODY_PROCESSOR" +- S_VARIABLE_REQUEST_BASENAME = 65, // "REQUEST_BASENAME" +- S_VARIABLE_REQUEST_BODY_LENGTH = 66, // "REQUEST_BODY_LENGTH" +- S_VARIABLE_REQUEST_BODY = 67, // "REQUEST_BODY" +- S_VARIABLE_REQUEST_FILE_NAME = 68, // "REQUEST_FILENAME" +- S_VARIABLE_REQUEST_HEADERS_NAMES = 69, // VARIABLE_REQUEST_HEADERS_NAMES +- S_VARIABLE_REQUEST_LINE = 70, // "REQUEST_LINE" +- S_VARIABLE_REQUEST_METHOD = 71, // "REQUEST_METHOD" +- S_VARIABLE_REQUEST_PROTOCOL = 72, // "REQUEST_PROTOCOL" +- S_VARIABLE_REQUEST_URI_RAW = 73, // "REQUEST_URI_RAW" +- S_VARIABLE_REQUEST_URI = 74, // "REQUEST_URI" +- S_VARIABLE_RESOURCE = 75, // "RESOURCE" +- S_VARIABLE_RESPONSE_BODY = 76, // "RESPONSE_BODY" +- S_VARIABLE_RESPONSE_CONTENT_LENGTH = 77, // "RESPONSE_CONTENT_LENGTH" +- S_VARIABLE_RESPONSE_CONTENT_TYPE = 78, // VARIABLE_RESPONSE_CONTENT_TYPE +- S_VARIABLE_RESPONSE_HEADERS_NAMES = 79, // VARIABLE_RESPONSE_HEADERS_NAMES +- S_VARIABLE_RESPONSE_PROTOCOL = 80, // "RESPONSE_PROTOCOL" +- S_VARIABLE_RESPONSE_STATUS = 81, // "RESPONSE_STATUS" +- S_VARIABLE_SERVER_ADDR = 82, // "SERVER_ADDR" +- S_VARIABLE_SERVER_NAME = 83, // "SERVER_NAME" +- S_VARIABLE_SERVER_PORT = 84, // "SERVER_PORT" +- S_VARIABLE_SESSION_ID = 85, // "SESSIONID" +- S_VARIABLE_UNIQUE_ID = 86, // "UNIQUE_ID" +- S_VARIABLE_URL_ENCODED_ERROR = 87, // "URLENCODED_ERROR" +- S_VARIABLE_USER_ID = 88, // "USERID" +- S_VARIABLE_WEB_APP_ID = 89, // "WEBAPPID" +- S_VARIABLE_STATUS = 90, // "VARIABLE_STATUS" +- S_VARIABLE_STATUS_LINE = 91, // "VARIABLE_STATUS_LINE" +- S_VARIABLE_IP = 92, // "VARIABLE_IP" +- S_VARIABLE_GLOBAL = 93, // "VARIABLE_GLOBAL" +- S_VARIABLE_TX = 94, // "VARIABLE_TX" +- S_VARIABLE_SESSION = 95, // "VARIABLE_SESSION" +- S_VARIABLE_USER = 96, // "VARIABLE_USER" +- S_RUN_TIME_VAR_ENV = 97, // "RUN_TIME_VAR_ENV" +- S_RUN_TIME_VAR_XML = 98, // "RUN_TIME_VAR_XML" +- S_ACTION_SETVAR = 99, // "SetVar" +- S_SETVAR_OPERATION_EQUALS = 100, // SETVAR_OPERATION_EQUALS +- S_SETVAR_OPERATION_EQUALS_PLUS = 101, // SETVAR_OPERATION_EQUALS_PLUS +- S_SETVAR_OPERATION_EQUALS_MINUS = 102, // SETVAR_OPERATION_EQUALS_MINUS +- S_NOT = 103, // "NOT" +- S_OPERATOR_BEGINS_WITH = 104, // "OPERATOR_BEGINS_WITH" +- S_OPERATOR_CONTAINS = 105, // "OPERATOR_CONTAINS" +- S_OPERATOR_CONTAINS_WORD = 106, // "OPERATOR_CONTAINS_WORD" +- S_OPERATOR_DETECT_SQLI = 107, // "OPERATOR_DETECT_SQLI" +- S_OPERATOR_DETECT_XSS = 108, // "OPERATOR_DETECT_XSS" +- S_OPERATOR_ENDS_WITH = 109, // "OPERATOR_ENDS_WITH" +- S_OPERATOR_EQ = 110, // "OPERATOR_EQ" +- S_OPERATOR_FUZZY_HASH = 111, // "OPERATOR_FUZZY_HASH" +- S_OPERATOR_GEOLOOKUP = 112, // "OPERATOR_GEOLOOKUP" +- S_OPERATOR_GE = 113, // "OPERATOR_GE" +- S_OPERATOR_GSB_LOOKUP = 114, // "OPERATOR_GSB_LOOKUP" +- S_OPERATOR_GT = 115, // "OPERATOR_GT" +- S_OPERATOR_INSPECT_FILE = 116, // "OPERATOR_INSPECT_FILE" +- S_OPERATOR_IP_MATCH_FROM_FILE = 117, // "OPERATOR_IP_MATCH_FROM_FILE" +- S_OPERATOR_IP_MATCH = 118, // "OPERATOR_IP_MATCH" +- S_OPERATOR_LE = 119, // "OPERATOR_LE" +- S_OPERATOR_LT = 120, // "OPERATOR_LT" +- S_OPERATOR_PM_FROM_FILE = 121, // "OPERATOR_PM_FROM_FILE" +- S_OPERATOR_PM = 122, // "OPERATOR_PM" +- S_OPERATOR_RBL = 123, // "OPERATOR_RBL" +- S_OPERATOR_RSUB = 124, // "OPERATOR_RSUB" +- S_OPERATOR_RX_CONTENT_ONLY = 125, // "Operator RX (content only)" +- S_OPERATOR_RX = 126, // "OPERATOR_RX" +- S_OPERATOR_RX_GLOBAL = 127, // "OPERATOR_RX_GLOBAL" +- S_OPERATOR_STR_EQ = 128, // "OPERATOR_STR_EQ" +- S_OPERATOR_STR_MATCH = 129, // "OPERATOR_STR_MATCH" +- S_OPERATOR_UNCONDITIONAL_MATCH = 130, // "OPERATOR_UNCONDITIONAL_MATCH" +- S_OPERATOR_VALIDATE_BYTE_RANGE = 131, // "OPERATOR_VALIDATE_BYTE_RANGE" +- S_OPERATOR_VALIDATE_DTD = 132, // "OPERATOR_VALIDATE_DTD" +- S_OPERATOR_VALIDATE_HASH = 133, // "OPERATOR_VALIDATE_HASH" +- S_OPERATOR_VALIDATE_SCHEMA = 134, // "OPERATOR_VALIDATE_SCHEMA" +- S_OPERATOR_VALIDATE_URL_ENCODING = 135, // "OPERATOR_VALIDATE_URL_ENCODING" +- S_OPERATOR_VALIDATE_UTF8_ENCODING = 136, // "OPERATOR_VALIDATE_UTF8_ENCODING" +- S_OPERATOR_VERIFY_CC = 137, // "OPERATOR_VERIFY_CC" +- S_OPERATOR_VERIFY_CPF = 138, // "OPERATOR_VERIFY_CPF" +- S_OPERATOR_VERIFY_SSN = 139, // "OPERATOR_VERIFY_SSN" +- S_OPERATOR_VERIFY_SVNR = 140, // "OPERATOR_VERIFY_SVNR" +- S_OPERATOR_WITHIN = 141, // "OPERATOR_WITHIN" +- S_CONFIG_DIR_AUDIT_LOG_FMT = 142, // CONFIG_DIR_AUDIT_LOG_FMT +- S_JSON = 143, // JSON +- S_NATIVE = 144, // NATIVE +- S_ACTION_CTL_RULE_ENGINE = 145, // "ACTION_CTL_RULE_ENGINE" +- S_ACTION_ACCURACY = 146, // "Accuracy" +- S_ACTION_ALLOW = 147, // "Allow" +- S_ACTION_APPEND = 148, // "Append" +- S_ACTION_AUDIT_LOG = 149, // "AuditLog" +- S_ACTION_BLOCK = 150, // "Block" +- S_ACTION_CAPTURE = 151, // "Capture" +- S_ACTION_CHAIN = 152, // "Chain" +- S_ACTION_CTL_AUDIT_ENGINE = 153, // "ACTION_CTL_AUDIT_ENGINE" +- S_ACTION_CTL_AUDIT_LOG_PARTS = 154, // "ACTION_CTL_AUDIT_LOG_PARTS" +- S_ACTION_CTL_BDY_JSON = 155, // "ACTION_CTL_BDY_JSON" +- S_ACTION_CTL_BDY_XML = 156, // "ACTION_CTL_BDY_XML" +- S_ACTION_CTL_BDY_URLENCODED = 157, // "ACTION_CTL_BDY_URLENCODED" +- S_ACTION_CTL_FORCE_REQ_BODY_VAR = 158, // "ACTION_CTL_FORCE_REQ_BODY_VAR" +- S_ACTION_CTL_REQUEST_BODY_ACCESS = 159, // "ACTION_CTL_REQUEST_BODY_ACCESS" +- S_ACTION_CTL_RULE_REMOVE_BY_ID = 160, // "ACTION_CTL_RULE_REMOVE_BY_ID" +- S_ACTION_CTL_RULE_REMOVE_BY_TAG = 161, // "ACTION_CTL_RULE_REMOVE_BY_TAG" +- S_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 162, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" +- S_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 163, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" +- S_ACTION_DENY = 164, // "Deny" +- S_ACTION_DEPRECATE_VAR = 165, // "DeprecateVar" +- S_ACTION_DROP = 166, // "Drop" +- S_ACTION_EXEC = 167, // "Exec" +- S_ACTION_EXPIRE_VAR = 168, // "ExpireVar" +- S_ACTION_ID = 169, // "Id" +- S_ACTION_INITCOL = 170, // "InitCol" +- S_ACTION_LOG = 171, // "Log" +- S_ACTION_LOG_DATA = 172, // "LogData" +- S_ACTION_MATURITY = 173, // "Maturity" +- S_ACTION_MSG = 174, // "Msg" +- S_ACTION_MULTI_MATCH = 175, // "MultiMatch" +- S_ACTION_NO_AUDIT_LOG = 176, // "NoAuditLog" +- S_ACTION_NO_LOG = 177, // "NoLog" +- S_ACTION_PASS = 178, // "Pass" +- S_ACTION_PAUSE = 179, // "Pause" +- S_ACTION_PHASE = 180, // "Phase" +- S_ACTION_PREPEND = 181, // "Prepend" +- S_ACTION_PROXY = 182, // "Proxy" +- S_ACTION_REDIRECT = 183, // "Redirect" +- S_ACTION_REV = 184, // "Rev" +- S_ACTION_SANITISE_ARG = 185, // "SanitiseArg" +- S_ACTION_SANITISE_MATCHED = 186, // "SanitiseMatched" +- S_ACTION_SANITISE_MATCHED_BYTES = 187, // "SanitiseMatchedBytes" +- S_ACTION_SANITISE_REQUEST_HEADER = 188, // "SanitiseRequestHeader" +- S_ACTION_SANITISE_RESPONSE_HEADER = 189, // "SanitiseResponseHeader" +- S_ACTION_SETENV = 190, // "SetEnv" +- S_ACTION_SETRSC = 191, // "SetRsc" +- S_ACTION_SETSID = 192, // "SetSid" +- S_ACTION_SETUID = 193, // "SetUID" +- S_ACTION_SEVERITY = 194, // "Severity" +- S_ACTION_SKIP = 195, // "Skip" +- S_ACTION_SKIP_AFTER = 196, // "SkipAfter" +- S_ACTION_STATUS = 197, // "Status" +- S_ACTION_TAG = 198, // "Tag" +- S_ACTION_TRANSFORMATION_BASE_64_ENCODE = 199, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" +- S_ACTION_TRANSFORMATION_BASE_64_DECODE = 200, // "ACTION_TRANSFORMATION_BASE_64_DECODE" +- S_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 201, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" +- S_ACTION_TRANSFORMATION_CMD_LINE = 202, // "ACTION_TRANSFORMATION_CMD_LINE" +- S_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 203, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" +- S_ACTION_TRANSFORMATION_CSS_DECODE = 204, // "ACTION_TRANSFORMATION_CSS_DECODE" +- S_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 205, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" +- S_ACTION_TRANSFORMATION_HEX_ENCODE = 206, // "ACTION_TRANSFORMATION_HEX_ENCODE" +- S_ACTION_TRANSFORMATION_HEX_DECODE = 207, // "ACTION_TRANSFORMATION_HEX_DECODE" +- S_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 208, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" +- S_ACTION_TRANSFORMATION_JS_DECODE = 209, // "ACTION_TRANSFORMATION_JS_DECODE" +- S_ACTION_TRANSFORMATION_LENGTH = 210, // "ACTION_TRANSFORMATION_LENGTH" +- S_ACTION_TRANSFORMATION_LOWERCASE = 211, // "ACTION_TRANSFORMATION_LOWERCASE" +- S_ACTION_TRANSFORMATION_MD5 = 212, // "ACTION_TRANSFORMATION_MD5" +- S_ACTION_TRANSFORMATION_NONE = 213, // "ACTION_TRANSFORMATION_NONE" +- S_ACTION_TRANSFORMATION_NORMALISE_PATH = 214, // "ACTION_TRANSFORMATION_NORMALISE_PATH" +- S_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 215, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" +- S_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 216, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" +- S_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 217, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" +- S_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 218, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" +- S_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 219, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" +- S_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 220, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" +- S_ACTION_TRANSFORMATION_REMOVE_NULLS = 221, // "ACTION_TRANSFORMATION_REMOVE_NULLS" +- S_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 222, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" +- S_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 223, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" +- S_ACTION_TRANSFORMATION_REPLACE_NULLS = 224, // "ACTION_TRANSFORMATION_REPLACE_NULLS" +- S_ACTION_TRANSFORMATION_SHA1 = 225, // "ACTION_TRANSFORMATION_SHA1" +- S_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 226, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" +- S_ACTION_TRANSFORMATION_TRIM = 227, // "ACTION_TRANSFORMATION_TRIM" +- S_ACTION_TRANSFORMATION_TRIM_LEFT = 228, // "ACTION_TRANSFORMATION_TRIM_LEFT" +- S_ACTION_TRANSFORMATION_TRIM_RIGHT = 229, // "ACTION_TRANSFORMATION_TRIM_RIGHT" +- S_ACTION_TRANSFORMATION_UPPERCASE = 230, // "ACTION_TRANSFORMATION_UPPERCASE" +- S_ACTION_TRANSFORMATION_URL_ENCODE = 231, // "ACTION_TRANSFORMATION_URL_ENCODE" +- S_ACTION_TRANSFORMATION_URL_DECODE = 232, // "ACTION_TRANSFORMATION_URL_DECODE" +- S_ACTION_TRANSFORMATION_URL_DECODE_UNI = 233, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" +- S_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 234, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" +- S_ACTION_VER = 235, // "Ver" +- S_ACTION_XMLNS = 236, // "xmlns" +- S_CONFIG_COMPONENT_SIG = 237, // "CONFIG_COMPONENT_SIG" +- S_CONFIG_CONN_ENGINE = 238, // "CONFIG_CONN_ENGINE" +- S_CONFIG_SEC_ARGUMENT_SEPARATOR = 239, // "CONFIG_SEC_ARGUMENT_SEPARATOR" +- S_CONFIG_SEC_WEB_APP_ID = 240, // "CONFIG_SEC_WEB_APP_ID" +- S_CONFIG_SEC_SERVER_SIG = 241, // "CONFIG_SEC_SERVER_SIG" +- S_CONFIG_DIR_AUDIT_DIR = 242, // "CONFIG_DIR_AUDIT_DIR" +- S_CONFIG_DIR_AUDIT_DIR_MOD = 243, // "CONFIG_DIR_AUDIT_DIR_MOD" +- S_CONFIG_DIR_AUDIT_ENG = 244, // "CONFIG_DIR_AUDIT_ENG" +- S_CONFIG_DIR_AUDIT_FLE_MOD = 245, // "CONFIG_DIR_AUDIT_FLE_MOD" +- S_CONFIG_DIR_AUDIT_LOG = 246, // "CONFIG_DIR_AUDIT_LOG" +- S_CONFIG_DIR_AUDIT_LOG2 = 247, // "CONFIG_DIR_AUDIT_LOG2" +- S_CONFIG_DIR_AUDIT_LOG_P = 248, // "CONFIG_DIR_AUDIT_LOG_P" +- S_CONFIG_DIR_AUDIT_STS = 249, // "CONFIG_DIR_AUDIT_STS" +- S_CONFIG_DIR_AUDIT_TPE = 250, // "CONFIG_DIR_AUDIT_TPE" +- S_CONFIG_DIR_DEBUG_LOG = 251, // "CONFIG_DIR_DEBUG_LOG" +- S_CONFIG_DIR_DEBUG_LVL = 252, // "CONFIG_DIR_DEBUG_LVL" +- S_CONFIG_SEC_CACHE_TRANSFORMATIONS = 253, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" +- S_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 254, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" +- S_CONFIG_SEC_HASH_ENGINE = 255, // "CONFIG_SEC_HASH_ENGINE" +- S_CONFIG_SEC_HASH_KEY = 256, // "CONFIG_SEC_HASH_KEY" +- S_CONFIG_SEC_HASH_PARAM = 257, // "CONFIG_SEC_HASH_PARAM" +- S_CONFIG_SEC_HASH_METHOD_RX = 258, // "CONFIG_SEC_HASH_METHOD_RX" +- S_CONFIG_SEC_HASH_METHOD_PM = 259, // "CONFIG_SEC_HASH_METHOD_PM" +- S_CONFIG_SEC_CHROOT_DIR = 260, // "CONFIG_SEC_CHROOT_DIR" +- S_CONFIG_DIR_GEO_DB = 261, // "CONFIG_DIR_GEO_DB" +- S_CONFIG_DIR_GSB_DB = 262, // "CONFIG_DIR_GSB_DB" +- S_CONFIG_SEC_GUARDIAN_LOG = 263, // "CONFIG_SEC_GUARDIAN_LOG" +- S_CONFIG_DIR_PCRE_MATCH_LIMIT = 264, // "CONFIG_DIR_PCRE_MATCH_LIMIT" +- S_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 265, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" +- S_CONFIG_SEC_CONN_R_STATE_LIMIT = 266, // "CONFIG_SEC_CONN_R_STATE_LIMIT" +- S_CONFIG_SEC_CONN_W_STATE_LIMIT = 267, // "CONFIG_SEC_CONN_W_STATE_LIMIT" +- S_CONFIG_SEC_SENSOR_ID = 268, // "CONFIG_SEC_SENSOR_ID" +- S_CONFIG_DIR_ARGS_LIMIT = 269, // "CONFIG_DIR_ARGS_LIMIT" +- S_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 270, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" +- S_CONFIG_DIR_REQ_BODY = 271, // "CONFIG_DIR_REQ_BODY" +- S_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 272, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" +- S_CONFIG_DIR_REQ_BODY_LIMIT = 273, // "CONFIG_DIR_REQ_BODY_LIMIT" +- S_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 274, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" +- S_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 275, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" +- S_CONFIG_DIR_RES_BODY = 276, // "CONFIG_DIR_RES_BODY" +- S_CONFIG_DIR_RES_BODY_LIMIT = 277, // "CONFIG_DIR_RES_BODY_LIMIT" +- S_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 278, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" +- S_CONFIG_SEC_RULE_INHERITANCE = 279, // "CONFIG_SEC_RULE_INHERITANCE" +- S_CONFIG_SEC_RULE_PERF_TIME = 280, // "CONFIG_SEC_RULE_PERF_TIME" +- S_CONFIG_DIR_RULE_ENG = 281, // "CONFIG_DIR_RULE_ENG" +- S_CONFIG_DIR_SEC_ACTION = 282, // "CONFIG_DIR_SEC_ACTION" +- S_CONFIG_DIR_SEC_DEFAULT_ACTION = 283, // "CONFIG_DIR_SEC_DEFAULT_ACTION" +- S_CONFIG_DIR_SEC_MARKER = 284, // "CONFIG_DIR_SEC_MARKER" +- S_CONFIG_DIR_UNICODE_MAP_FILE = 285, // "CONFIG_DIR_UNICODE_MAP_FILE" +- S_CONFIG_DIR_UNICODE_CODE_PAGE = 286, // "CONFIG_DIR_UNICODE_CODE_PAGE" +- S_CONFIG_SEC_COLLECTION_TIMEOUT = 287, // "CONFIG_SEC_COLLECTION_TIMEOUT" +- S_CONFIG_SEC_HTTP_BLKEY = 288, // "CONFIG_SEC_HTTP_BLKEY" +- S_CONFIG_SEC_INTERCEPT_ON_ERROR = 289, // "CONFIG_SEC_INTERCEPT_ON_ERROR" +- S_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 290, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" +- S_CONFIG_SEC_RULE_REMOVE_BY_ID = 291, // "CONFIG_SEC_RULE_REMOVE_BY_ID" +- S_CONFIG_SEC_RULE_REMOVE_BY_MSG = 292, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" +- S_CONFIG_SEC_RULE_REMOVE_BY_TAG = 293, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" +- S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 294, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" +- S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 295, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" +- S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 296, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" +- S_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 297, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" +- S_CONFIG_UPDLOAD_KEEP_FILES = 298, // "CONFIG_UPDLOAD_KEEP_FILES" +- S_CONFIG_UPDLOAD_SAVE_TMP_FILES = 299, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" +- S_CONFIG_UPLOAD_DIR = 300, // "CONFIG_UPLOAD_DIR" +- S_CONFIG_UPLOAD_FILE_LIMIT = 301, // "CONFIG_UPLOAD_FILE_LIMIT" +- S_CONFIG_UPLOAD_FILE_MODE = 302, // "CONFIG_UPLOAD_FILE_MODE" +- S_CONFIG_VALUE_ABORT = 303, // "CONFIG_VALUE_ABORT" +- S_CONFIG_VALUE_DETC = 304, // "CONFIG_VALUE_DETC" +- S_CONFIG_VALUE_HTTPS = 305, // "CONFIG_VALUE_HTTPS" +- S_CONFIG_VALUE_OFF = 306, // "CONFIG_VALUE_OFF" +- S_CONFIG_VALUE_ON = 307, // "CONFIG_VALUE_ON" +- S_CONFIG_VALUE_PARALLEL = 308, // "CONFIG_VALUE_PARALLEL" +- S_CONFIG_VALUE_PROCESS_PARTIAL = 309, // "CONFIG_VALUE_PROCESS_PARTIAL" +- S_CONFIG_VALUE_REJECT = 310, // "CONFIG_VALUE_REJECT" +- S_CONFIG_VALUE_RELEVANT_ONLY = 311, // "CONFIG_VALUE_RELEVANT_ONLY" +- S_CONFIG_VALUE_SERIAL = 312, // "CONFIG_VALUE_SERIAL" +- S_CONFIG_VALUE_WARN = 313, // "CONFIG_VALUE_WARN" +- S_CONFIG_XML_EXTERNAL_ENTITY = 314, // "CONFIG_XML_EXTERNAL_ENTITY" +- S_CONGIG_DIR_RESPONSE_BODY_MP = 315, // "CONGIG_DIR_RESPONSE_BODY_MP" +- S_CONGIG_DIR_SEC_ARG_SEP = 316, // "CONGIG_DIR_SEC_ARG_SEP" +- S_CONGIG_DIR_SEC_COOKIE_FORMAT = 317, // "CONGIG_DIR_SEC_COOKIE_FORMAT" +- S_CONFIG_SEC_COOKIEV0_SEPARATOR = 318, // "CONFIG_SEC_COOKIEV0_SEPARATOR" +- S_CONGIG_DIR_SEC_DATA_DIR = 319, // "CONGIG_DIR_SEC_DATA_DIR" +- S_CONGIG_DIR_SEC_STATUS_ENGINE = 320, // "CONGIG_DIR_SEC_STATUS_ENGINE" +- S_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 321, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" +- S_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 322, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" +- S_CONGIG_DIR_SEC_TMP_DIR = 323, // "CONGIG_DIR_SEC_TMP_DIR" +- S_DIRECTIVE = 324, // "DIRECTIVE" +- S_DIRECTIVE_SECRULESCRIPT = 325, // "DIRECTIVE_SECRULESCRIPT" +- S_FREE_TEXT_QUOTE_MACRO_EXPANSION = 326, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" +- S_QUOTATION_MARK = 327, // "QUOTATION_MARK" +- S_RUN_TIME_VAR_BLD = 328, // "RUN_TIME_VAR_BLD" +- S_RUN_TIME_VAR_DUR = 329, // "RUN_TIME_VAR_DUR" +- S_RUN_TIME_VAR_HSV = 330, // "RUN_TIME_VAR_HSV" +- S_RUN_TIME_VAR_REMOTE_USER = 331, // "RUN_TIME_VAR_REMOTE_USER" +- S_RUN_TIME_VAR_TIME = 332, // "RUN_TIME_VAR_TIME" +- S_RUN_TIME_VAR_TIME_DAY = 333, // "RUN_TIME_VAR_TIME_DAY" +- S_RUN_TIME_VAR_TIME_EPOCH = 334, // "RUN_TIME_VAR_TIME_EPOCH" +- S_RUN_TIME_VAR_TIME_HOUR = 335, // "RUN_TIME_VAR_TIME_HOUR" +- S_RUN_TIME_VAR_TIME_MIN = 336, // "RUN_TIME_VAR_TIME_MIN" +- S_RUN_TIME_VAR_TIME_MON = 337, // "RUN_TIME_VAR_TIME_MON" +- S_RUN_TIME_VAR_TIME_SEC = 338, // "RUN_TIME_VAR_TIME_SEC" +- S_RUN_TIME_VAR_TIME_WDAY = 339, // "RUN_TIME_VAR_TIME_WDAY" +- S_RUN_TIME_VAR_TIME_YEAR = 340, // "RUN_TIME_VAR_TIME_YEAR" +- S_VARIABLE = 341, // "VARIABLE" +- S_DICT_ELEMENT = 342, // "Dictionary element" +- S_DICT_ELEMENT_REGEXP = 343, // "Dictionary element, selected by regexp" +- S_YYACCEPT = 344, // $accept +- S_input = 345, // input +- S_line = 346, // line +- S_audit_log = 347, // audit_log +- S_actions = 348, // actions +- S_actions_may_quoted = 349, // actions_may_quoted +- S_op = 350, // op +- S_op_before_init = 351, // op_before_init +- S_expression = 352, // expression +- S_variables = 353, // variables +- S_variables_pre_process = 354, // variables_pre_process +- S_variables_may_be_quoted = 355, // variables_may_be_quoted +- S_var = 356, // var +- S_act = 357, // act +- S_setvar_action = 358, // setvar_action +- S_run_time_string = 359 // run_time_string ++ S_VARIABLE_MULTIPART_PART_HEADERS = 26, // VARIABLE_MULTIPART_PART_HEADERS ++ S_VARIABLE_ARGS_COMBINED_SIZE = 27, // VARIABLE_ARGS_COMBINED_SIZE ++ S_VARIABLE_ARGS_GET_NAMES = 28, // VARIABLE_ARGS_GET_NAMES ++ S_VARIABLE_RULE = 29, // VARIABLE_RULE ++ S_VARIABLE_ARGS_NAMES = 30, // "Variable ARGS_NAMES" ++ S_VARIABLE_ARGS_POST_NAMES = 31, // VARIABLE_ARGS_POST_NAMES ++ S_VARIABLE_AUTH_TYPE = 32, // "AUTH_TYPE" ++ S_VARIABLE_FILES_COMBINED_SIZE = 33, // "FILES_COMBINED_SIZE" ++ S_VARIABLE_FILES_TMP_NAMES = 34, // "FILES_TMPNAMES" ++ S_VARIABLE_FULL_REQUEST = 35, // "FULL_REQUEST" ++ S_VARIABLE_FULL_REQUEST_LENGTH = 36, // "FULL_REQUEST_LENGTH" ++ S_VARIABLE_INBOUND_DATA_ERROR = 37, // "INBOUND_DATA_ERROR" ++ S_VARIABLE_MATCHED_VAR = 38, // "MATCHED_VAR" ++ S_VARIABLE_MATCHED_VAR_NAME = 39, // "MATCHED_VAR_NAME" ++ S_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 40, // VARIABLE_MULTIPART_BOUNDARY_QUOTED ++ S_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 41, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE ++ S_VARIABLE_MULTIPART_CRLF_LF_LINES = 42, // "MULTIPART_CRLF_LF_LINES" ++ S_VARIABLE_MULTIPART_DATA_AFTER = 43, // "MULTIPART_DATA_AFTER" ++ S_VARIABLE_MULTIPART_DATA_BEFORE = 44, // VARIABLE_MULTIPART_DATA_BEFORE ++ S_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 45, // "MULTIPART_FILE_LIMIT_EXCEEDED" ++ S_VARIABLE_MULTIPART_HEADER_FOLDING = 46, // "MULTIPART_HEADER_FOLDING" ++ S_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 47, // "MULTIPART_INVALID_HEADER_FOLDING" ++ S_VARIABLE_MULTIPART_INVALID_PART = 48, // VARIABLE_MULTIPART_INVALID_PART ++ S_VARIABLE_MULTIPART_INVALID_QUOTING = 49, // "MULTIPART_INVALID_QUOTING" ++ S_VARIABLE_MULTIPART_LF_LINE = 50, // VARIABLE_MULTIPART_LF_LINE ++ S_VARIABLE_MULTIPART_MISSING_SEMICOLON = 51, // VARIABLE_MULTIPART_MISSING_SEMICOLON ++ S_VARIABLE_MULTIPART_SEMICOLON_MISSING = 52, // VARIABLE_MULTIPART_SEMICOLON_MISSING ++ S_VARIABLE_MULTIPART_STRICT_ERROR = 53, // "MULTIPART_STRICT_ERROR" ++ S_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 54, // "MULTIPART_UNMATCHED_BOUNDARY" ++ S_VARIABLE_OUTBOUND_DATA_ERROR = 55, // "OUTBOUND_DATA_ERROR" ++ S_VARIABLE_PATH_INFO = 56, // "PATH_INFO" ++ S_VARIABLE_QUERY_STRING = 57, // "QUERY_STRING" ++ S_VARIABLE_REMOTE_ADDR = 58, // "REMOTE_ADDR" ++ S_VARIABLE_REMOTE_HOST = 59, // "REMOTE_HOST" ++ S_VARIABLE_REMOTE_PORT = 60, // "REMOTE_PORT" ++ S_VARIABLE_REQBODY_ERROR_MSG = 61, // "REQBODY_ERROR_MSG" ++ S_VARIABLE_REQBODY_ERROR = 62, // "REQBODY_ERROR" ++ S_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 63, // "REQBODY_PROCESSOR_ERROR_MSG" ++ S_VARIABLE_REQBODY_PROCESSOR_ERROR = 64, // "REQBODY_PROCESSOR_ERROR" ++ S_VARIABLE_REQBODY_PROCESSOR = 65, // "REQBODY_PROCESSOR" ++ S_VARIABLE_REQUEST_BASENAME = 66, // "REQUEST_BASENAME" ++ S_VARIABLE_REQUEST_BODY_LENGTH = 67, // "REQUEST_BODY_LENGTH" ++ S_VARIABLE_REQUEST_BODY = 68, // "REQUEST_BODY" ++ S_VARIABLE_REQUEST_FILE_NAME = 69, // "REQUEST_FILENAME" ++ S_VARIABLE_REQUEST_HEADERS_NAMES = 70, // VARIABLE_REQUEST_HEADERS_NAMES ++ S_VARIABLE_REQUEST_LINE = 71, // "REQUEST_LINE" ++ S_VARIABLE_REQUEST_METHOD = 72, // "REQUEST_METHOD" ++ S_VARIABLE_REQUEST_PROTOCOL = 73, // "REQUEST_PROTOCOL" ++ S_VARIABLE_REQUEST_URI_RAW = 74, // "REQUEST_URI_RAW" ++ S_VARIABLE_REQUEST_URI = 75, // "REQUEST_URI" ++ S_VARIABLE_RESOURCE = 76, // "RESOURCE" ++ S_VARIABLE_RESPONSE_BODY = 77, // "RESPONSE_BODY" ++ S_VARIABLE_RESPONSE_CONTENT_LENGTH = 78, // "RESPONSE_CONTENT_LENGTH" ++ S_VARIABLE_RESPONSE_CONTENT_TYPE = 79, // VARIABLE_RESPONSE_CONTENT_TYPE ++ S_VARIABLE_RESPONSE_HEADERS_NAMES = 80, // VARIABLE_RESPONSE_HEADERS_NAMES ++ S_VARIABLE_RESPONSE_PROTOCOL = 81, // "RESPONSE_PROTOCOL" ++ S_VARIABLE_RESPONSE_STATUS = 82, // "RESPONSE_STATUS" ++ S_VARIABLE_SERVER_ADDR = 83, // "SERVER_ADDR" ++ S_VARIABLE_SERVER_NAME = 84, // "SERVER_NAME" ++ S_VARIABLE_SERVER_PORT = 85, // "SERVER_PORT" ++ S_VARIABLE_SESSION_ID = 86, // "SESSIONID" ++ S_VARIABLE_UNIQUE_ID = 87, // "UNIQUE_ID" ++ S_VARIABLE_URL_ENCODED_ERROR = 88, // "URLENCODED_ERROR" ++ S_VARIABLE_USER_ID = 89, // "USERID" ++ S_VARIABLE_WEB_APP_ID = 90, // "WEBAPPID" ++ S_VARIABLE_STATUS = 91, // "VARIABLE_STATUS" ++ S_VARIABLE_STATUS_LINE = 92, // "VARIABLE_STATUS_LINE" ++ S_VARIABLE_IP = 93, // "VARIABLE_IP" ++ S_VARIABLE_GLOBAL = 94, // "VARIABLE_GLOBAL" ++ S_VARIABLE_TX = 95, // "VARIABLE_TX" ++ S_VARIABLE_SESSION = 96, // "VARIABLE_SESSION" ++ S_VARIABLE_USER = 97, // "VARIABLE_USER" ++ S_RUN_TIME_VAR_ENV = 98, // "RUN_TIME_VAR_ENV" ++ S_RUN_TIME_VAR_XML = 99, // "RUN_TIME_VAR_XML" ++ S_ACTION_SETVAR = 100, // "SetVar" ++ S_SETVAR_OPERATION_EQUALS = 101, // SETVAR_OPERATION_EQUALS ++ S_SETVAR_OPERATION_EQUALS_PLUS = 102, // SETVAR_OPERATION_EQUALS_PLUS ++ S_SETVAR_OPERATION_EQUALS_MINUS = 103, // SETVAR_OPERATION_EQUALS_MINUS ++ S_NOT = 104, // "NOT" ++ S_OPERATOR_BEGINS_WITH = 105, // "OPERATOR_BEGINS_WITH" ++ S_OPERATOR_CONTAINS = 106, // "OPERATOR_CONTAINS" ++ S_OPERATOR_CONTAINS_WORD = 107, // "OPERATOR_CONTAINS_WORD" ++ S_OPERATOR_DETECT_SQLI = 108, // "OPERATOR_DETECT_SQLI" ++ S_OPERATOR_DETECT_XSS = 109, // "OPERATOR_DETECT_XSS" ++ S_OPERATOR_ENDS_WITH = 110, // "OPERATOR_ENDS_WITH" ++ S_OPERATOR_EQ = 111, // "OPERATOR_EQ" ++ S_OPERATOR_FUZZY_HASH = 112, // "OPERATOR_FUZZY_HASH" ++ S_OPERATOR_GEOLOOKUP = 113, // "OPERATOR_GEOLOOKUP" ++ S_OPERATOR_GE = 114, // "OPERATOR_GE" ++ S_OPERATOR_GSB_LOOKUP = 115, // "OPERATOR_GSB_LOOKUP" ++ S_OPERATOR_GT = 116, // "OPERATOR_GT" ++ S_OPERATOR_INSPECT_FILE = 117, // "OPERATOR_INSPECT_FILE" ++ S_OPERATOR_IP_MATCH_FROM_FILE = 118, // "OPERATOR_IP_MATCH_FROM_FILE" ++ S_OPERATOR_IP_MATCH = 119, // "OPERATOR_IP_MATCH" ++ S_OPERATOR_LE = 120, // "OPERATOR_LE" ++ S_OPERATOR_LT = 121, // "OPERATOR_LT" ++ S_OPERATOR_PM_FROM_FILE = 122, // "OPERATOR_PM_FROM_FILE" ++ S_OPERATOR_PM = 123, // "OPERATOR_PM" ++ S_OPERATOR_RBL = 124, // "OPERATOR_RBL" ++ S_OPERATOR_RSUB = 125, // "OPERATOR_RSUB" ++ S_OPERATOR_RX_CONTENT_ONLY = 126, // "Operator RX (content only)" ++ S_OPERATOR_RX = 127, // "OPERATOR_RX" ++ S_OPERATOR_RX_GLOBAL = 128, // "OPERATOR_RX_GLOBAL" ++ S_OPERATOR_STR_EQ = 129, // "OPERATOR_STR_EQ" ++ S_OPERATOR_STR_MATCH = 130, // "OPERATOR_STR_MATCH" ++ S_OPERATOR_UNCONDITIONAL_MATCH = 131, // "OPERATOR_UNCONDITIONAL_MATCH" ++ S_OPERATOR_VALIDATE_BYTE_RANGE = 132, // "OPERATOR_VALIDATE_BYTE_RANGE" ++ S_OPERATOR_VALIDATE_DTD = 133, // "OPERATOR_VALIDATE_DTD" ++ S_OPERATOR_VALIDATE_HASH = 134, // "OPERATOR_VALIDATE_HASH" ++ S_OPERATOR_VALIDATE_SCHEMA = 135, // "OPERATOR_VALIDATE_SCHEMA" ++ S_OPERATOR_VALIDATE_URL_ENCODING = 136, // "OPERATOR_VALIDATE_URL_ENCODING" ++ S_OPERATOR_VALIDATE_UTF8_ENCODING = 137, // "OPERATOR_VALIDATE_UTF8_ENCODING" ++ S_OPERATOR_VERIFY_CC = 138, // "OPERATOR_VERIFY_CC" ++ S_OPERATOR_VERIFY_CPF = 139, // "OPERATOR_VERIFY_CPF" ++ S_OPERATOR_VERIFY_SSN = 140, // "OPERATOR_VERIFY_SSN" ++ S_OPERATOR_VERIFY_SVNR = 141, // "OPERATOR_VERIFY_SVNR" ++ S_OPERATOR_WITHIN = 142, // "OPERATOR_WITHIN" ++ S_CONFIG_DIR_AUDIT_LOG_FMT = 143, // CONFIG_DIR_AUDIT_LOG_FMT ++ S_JSON = 144, // JSON ++ S_NATIVE = 145, // NATIVE ++ S_ACTION_CTL_RULE_ENGINE = 146, // "ACTION_CTL_RULE_ENGINE" ++ S_ACTION_ACCURACY = 147, // "Accuracy" ++ S_ACTION_ALLOW = 148, // "Allow" ++ S_ACTION_APPEND = 149, // "Append" ++ S_ACTION_AUDIT_LOG = 150, // "AuditLog" ++ S_ACTION_BLOCK = 151, // "Block" ++ S_ACTION_CAPTURE = 152, // "Capture" ++ S_ACTION_CHAIN = 153, // "Chain" ++ S_ACTION_CTL_AUDIT_ENGINE = 154, // "ACTION_CTL_AUDIT_ENGINE" ++ S_ACTION_CTL_AUDIT_LOG_PARTS = 155, // "ACTION_CTL_AUDIT_LOG_PARTS" ++ S_ACTION_CTL_BDY_JSON = 156, // "ACTION_CTL_BDY_JSON" ++ S_ACTION_CTL_BDY_XML = 157, // "ACTION_CTL_BDY_XML" ++ S_ACTION_CTL_BDY_URLENCODED = 158, // "ACTION_CTL_BDY_URLENCODED" ++ S_ACTION_CTL_FORCE_REQ_BODY_VAR = 159, // "ACTION_CTL_FORCE_REQ_BODY_VAR" ++ S_ACTION_CTL_REQUEST_BODY_ACCESS = 160, // "ACTION_CTL_REQUEST_BODY_ACCESS" ++ S_ACTION_CTL_RULE_REMOVE_BY_ID = 161, // "ACTION_CTL_RULE_REMOVE_BY_ID" ++ S_ACTION_CTL_RULE_REMOVE_BY_TAG = 162, // "ACTION_CTL_RULE_REMOVE_BY_TAG" ++ S_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 163, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" ++ S_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 164, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" ++ S_ACTION_DENY = 165, // "Deny" ++ S_ACTION_DEPRECATE_VAR = 166, // "DeprecateVar" ++ S_ACTION_DROP = 167, // "Drop" ++ S_ACTION_EXEC = 168, // "Exec" ++ S_ACTION_EXPIRE_VAR = 169, // "ExpireVar" ++ S_ACTION_ID = 170, // "Id" ++ S_ACTION_INITCOL = 171, // "InitCol" ++ S_ACTION_LOG = 172, // "Log" ++ S_ACTION_LOG_DATA = 173, // "LogData" ++ S_ACTION_MATURITY = 174, // "Maturity" ++ S_ACTION_MSG = 175, // "Msg" ++ S_ACTION_MULTI_MATCH = 176, // "MultiMatch" ++ S_ACTION_NO_AUDIT_LOG = 177, // "NoAuditLog" ++ S_ACTION_NO_LOG = 178, // "NoLog" ++ S_ACTION_PASS = 179, // "Pass" ++ S_ACTION_PAUSE = 180, // "Pause" ++ S_ACTION_PHASE = 181, // "Phase" ++ S_ACTION_PREPEND = 182, // "Prepend" ++ S_ACTION_PROXY = 183, // "Proxy" ++ S_ACTION_REDIRECT = 184, // "Redirect" ++ S_ACTION_REV = 185, // "Rev" ++ S_ACTION_SANITISE_ARG = 186, // "SanitiseArg" ++ S_ACTION_SANITISE_MATCHED = 187, // "SanitiseMatched" ++ S_ACTION_SANITISE_MATCHED_BYTES = 188, // "SanitiseMatchedBytes" ++ S_ACTION_SANITISE_REQUEST_HEADER = 189, // "SanitiseRequestHeader" ++ S_ACTION_SANITISE_RESPONSE_HEADER = 190, // "SanitiseResponseHeader" ++ S_ACTION_SETENV = 191, // "SetEnv" ++ S_ACTION_SETRSC = 192, // "SetRsc" ++ S_ACTION_SETSID = 193, // "SetSid" ++ S_ACTION_SETUID = 194, // "SetUID" ++ S_ACTION_SEVERITY = 195, // "Severity" ++ S_ACTION_SKIP = 196, // "Skip" ++ S_ACTION_SKIP_AFTER = 197, // "SkipAfter" ++ S_ACTION_STATUS = 198, // "Status" ++ S_ACTION_TAG = 199, // "Tag" ++ S_ACTION_TRANSFORMATION_BASE_64_ENCODE = 200, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" ++ S_ACTION_TRANSFORMATION_BASE_64_DECODE = 201, // "ACTION_TRANSFORMATION_BASE_64_DECODE" ++ S_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 202, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" ++ S_ACTION_TRANSFORMATION_CMD_LINE = 203, // "ACTION_TRANSFORMATION_CMD_LINE" ++ S_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 204, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" ++ S_ACTION_TRANSFORMATION_CSS_DECODE = 205, // "ACTION_TRANSFORMATION_CSS_DECODE" ++ S_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 206, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" ++ S_ACTION_TRANSFORMATION_HEX_ENCODE = 207, // "ACTION_TRANSFORMATION_HEX_ENCODE" ++ S_ACTION_TRANSFORMATION_HEX_DECODE = 208, // "ACTION_TRANSFORMATION_HEX_DECODE" ++ S_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 209, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" ++ S_ACTION_TRANSFORMATION_JS_DECODE = 210, // "ACTION_TRANSFORMATION_JS_DECODE" ++ S_ACTION_TRANSFORMATION_LENGTH = 211, // "ACTION_TRANSFORMATION_LENGTH" ++ S_ACTION_TRANSFORMATION_LOWERCASE = 212, // "ACTION_TRANSFORMATION_LOWERCASE" ++ S_ACTION_TRANSFORMATION_MD5 = 213, // "ACTION_TRANSFORMATION_MD5" ++ S_ACTION_TRANSFORMATION_NONE = 214, // "ACTION_TRANSFORMATION_NONE" ++ S_ACTION_TRANSFORMATION_NORMALISE_PATH = 215, // "ACTION_TRANSFORMATION_NORMALISE_PATH" ++ S_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 216, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" ++ S_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 217, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" ++ S_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 218, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" ++ S_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 219, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" ++ S_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 220, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" ++ S_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 221, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" ++ S_ACTION_TRANSFORMATION_REMOVE_NULLS = 222, // "ACTION_TRANSFORMATION_REMOVE_NULLS" ++ S_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 223, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" ++ S_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 224, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" ++ S_ACTION_TRANSFORMATION_REPLACE_NULLS = 225, // "ACTION_TRANSFORMATION_REPLACE_NULLS" ++ S_ACTION_TRANSFORMATION_SHA1 = 226, // "ACTION_TRANSFORMATION_SHA1" ++ S_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 227, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" ++ S_ACTION_TRANSFORMATION_TRIM = 228, // "ACTION_TRANSFORMATION_TRIM" ++ S_ACTION_TRANSFORMATION_TRIM_LEFT = 229, // "ACTION_TRANSFORMATION_TRIM_LEFT" ++ S_ACTION_TRANSFORMATION_TRIM_RIGHT = 230, // "ACTION_TRANSFORMATION_TRIM_RIGHT" ++ S_ACTION_TRANSFORMATION_UPPERCASE = 231, // "ACTION_TRANSFORMATION_UPPERCASE" ++ S_ACTION_TRANSFORMATION_URL_ENCODE = 232, // "ACTION_TRANSFORMATION_URL_ENCODE" ++ S_ACTION_TRANSFORMATION_URL_DECODE = 233, // "ACTION_TRANSFORMATION_URL_DECODE" ++ S_ACTION_TRANSFORMATION_URL_DECODE_UNI = 234, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" ++ S_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 235, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" ++ S_ACTION_VER = 236, // "Ver" ++ S_ACTION_XMLNS = 237, // "xmlns" ++ S_CONFIG_COMPONENT_SIG = 238, // "CONFIG_COMPONENT_SIG" ++ S_CONFIG_CONN_ENGINE = 239, // "CONFIG_CONN_ENGINE" ++ S_CONFIG_SEC_ARGUMENT_SEPARATOR = 240, // "CONFIG_SEC_ARGUMENT_SEPARATOR" ++ S_CONFIG_SEC_WEB_APP_ID = 241, // "CONFIG_SEC_WEB_APP_ID" ++ S_CONFIG_SEC_SERVER_SIG = 242, // "CONFIG_SEC_SERVER_SIG" ++ S_CONFIG_DIR_AUDIT_DIR = 243, // "CONFIG_DIR_AUDIT_DIR" ++ S_CONFIG_DIR_AUDIT_DIR_MOD = 244, // "CONFIG_DIR_AUDIT_DIR_MOD" ++ S_CONFIG_DIR_AUDIT_ENG = 245, // "CONFIG_DIR_AUDIT_ENG" ++ S_CONFIG_DIR_AUDIT_FLE_MOD = 246, // "CONFIG_DIR_AUDIT_FLE_MOD" ++ S_CONFIG_DIR_AUDIT_LOG = 247, // "CONFIG_DIR_AUDIT_LOG" ++ S_CONFIG_DIR_AUDIT_LOG2 = 248, // "CONFIG_DIR_AUDIT_LOG2" ++ S_CONFIG_DIR_AUDIT_LOG_P = 249, // "CONFIG_DIR_AUDIT_LOG_P" ++ S_CONFIG_DIR_AUDIT_STS = 250, // "CONFIG_DIR_AUDIT_STS" ++ S_CONFIG_DIR_AUDIT_TPE = 251, // "CONFIG_DIR_AUDIT_TPE" ++ S_CONFIG_DIR_DEBUG_LOG = 252, // "CONFIG_DIR_DEBUG_LOG" ++ S_CONFIG_DIR_DEBUG_LVL = 253, // "CONFIG_DIR_DEBUG_LVL" ++ S_CONFIG_SEC_CACHE_TRANSFORMATIONS = 254, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" ++ S_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 255, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" ++ S_CONFIG_SEC_HASH_ENGINE = 256, // "CONFIG_SEC_HASH_ENGINE" ++ S_CONFIG_SEC_HASH_KEY = 257, // "CONFIG_SEC_HASH_KEY" ++ S_CONFIG_SEC_HASH_PARAM = 258, // "CONFIG_SEC_HASH_PARAM" ++ S_CONFIG_SEC_HASH_METHOD_RX = 259, // "CONFIG_SEC_HASH_METHOD_RX" ++ S_CONFIG_SEC_HASH_METHOD_PM = 260, // "CONFIG_SEC_HASH_METHOD_PM" ++ S_CONFIG_SEC_CHROOT_DIR = 261, // "CONFIG_SEC_CHROOT_DIR" ++ S_CONFIG_DIR_GEO_DB = 262, // "CONFIG_DIR_GEO_DB" ++ S_CONFIG_DIR_GSB_DB = 263, // "CONFIG_DIR_GSB_DB" ++ S_CONFIG_SEC_GUARDIAN_LOG = 264, // "CONFIG_SEC_GUARDIAN_LOG" ++ S_CONFIG_DIR_PCRE_MATCH_LIMIT = 265, // "CONFIG_DIR_PCRE_MATCH_LIMIT" ++ S_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 266, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" ++ S_CONFIG_SEC_CONN_R_STATE_LIMIT = 267, // "CONFIG_SEC_CONN_R_STATE_LIMIT" ++ S_CONFIG_SEC_CONN_W_STATE_LIMIT = 268, // "CONFIG_SEC_CONN_W_STATE_LIMIT" ++ S_CONFIG_SEC_SENSOR_ID = 269, // "CONFIG_SEC_SENSOR_ID" ++ S_CONFIG_DIR_ARGS_LIMIT = 270, // "CONFIG_DIR_ARGS_LIMIT" ++ S_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 271, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" ++ S_CONFIG_DIR_REQ_BODY = 272, // "CONFIG_DIR_REQ_BODY" ++ S_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 273, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" ++ S_CONFIG_DIR_REQ_BODY_LIMIT = 274, // "CONFIG_DIR_REQ_BODY_LIMIT" ++ S_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 275, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" ++ S_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 276, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" ++ S_CONFIG_DIR_RES_BODY = 277, // "CONFIG_DIR_RES_BODY" ++ S_CONFIG_DIR_RES_BODY_LIMIT = 278, // "CONFIG_DIR_RES_BODY_LIMIT" ++ S_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 279, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" ++ S_CONFIG_SEC_RULE_INHERITANCE = 280, // "CONFIG_SEC_RULE_INHERITANCE" ++ S_CONFIG_SEC_RULE_PERF_TIME = 281, // "CONFIG_SEC_RULE_PERF_TIME" ++ S_CONFIG_DIR_RULE_ENG = 282, // "CONFIG_DIR_RULE_ENG" ++ S_CONFIG_DIR_SEC_ACTION = 283, // "CONFIG_DIR_SEC_ACTION" ++ S_CONFIG_DIR_SEC_DEFAULT_ACTION = 284, // "CONFIG_DIR_SEC_DEFAULT_ACTION" ++ S_CONFIG_DIR_SEC_MARKER = 285, // "CONFIG_DIR_SEC_MARKER" ++ S_CONFIG_DIR_UNICODE_MAP_FILE = 286, // "CONFIG_DIR_UNICODE_MAP_FILE" ++ S_CONFIG_DIR_UNICODE_CODE_PAGE = 287, // "CONFIG_DIR_UNICODE_CODE_PAGE" ++ S_CONFIG_SEC_COLLECTION_TIMEOUT = 288, // "CONFIG_SEC_COLLECTION_TIMEOUT" ++ S_CONFIG_SEC_HTTP_BLKEY = 289, // "CONFIG_SEC_HTTP_BLKEY" ++ S_CONFIG_SEC_INTERCEPT_ON_ERROR = 290, // "CONFIG_SEC_INTERCEPT_ON_ERROR" ++ S_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 291, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" ++ S_CONFIG_SEC_RULE_REMOVE_BY_ID = 292, // "CONFIG_SEC_RULE_REMOVE_BY_ID" ++ S_CONFIG_SEC_RULE_REMOVE_BY_MSG = 293, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" ++ S_CONFIG_SEC_RULE_REMOVE_BY_TAG = 294, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" ++ S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 295, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" ++ S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 296, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" ++ S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 297, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" ++ S_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 298, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" ++ S_CONFIG_UPDLOAD_KEEP_FILES = 299, // "CONFIG_UPDLOAD_KEEP_FILES" ++ S_CONFIG_UPDLOAD_SAVE_TMP_FILES = 300, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" ++ S_CONFIG_UPLOAD_DIR = 301, // "CONFIG_UPLOAD_DIR" ++ S_CONFIG_UPLOAD_FILE_LIMIT = 302, // "CONFIG_UPLOAD_FILE_LIMIT" ++ S_CONFIG_UPLOAD_FILE_MODE = 303, // "CONFIG_UPLOAD_FILE_MODE" ++ S_CONFIG_VALUE_ABORT = 304, // "CONFIG_VALUE_ABORT" ++ S_CONFIG_VALUE_DETC = 305, // "CONFIG_VALUE_DETC" ++ S_CONFIG_VALUE_HTTPS = 306, // "CONFIG_VALUE_HTTPS" ++ S_CONFIG_VALUE_OFF = 307, // "CONFIG_VALUE_OFF" ++ S_CONFIG_VALUE_ON = 308, // "CONFIG_VALUE_ON" ++ S_CONFIG_VALUE_PARALLEL = 309, // "CONFIG_VALUE_PARALLEL" ++ S_CONFIG_VALUE_PROCESS_PARTIAL = 310, // "CONFIG_VALUE_PROCESS_PARTIAL" ++ S_CONFIG_VALUE_REJECT = 311, // "CONFIG_VALUE_REJECT" ++ S_CONFIG_VALUE_RELEVANT_ONLY = 312, // "CONFIG_VALUE_RELEVANT_ONLY" ++ S_CONFIG_VALUE_SERIAL = 313, // "CONFIG_VALUE_SERIAL" ++ S_CONFIG_VALUE_WARN = 314, // "CONFIG_VALUE_WARN" ++ S_CONFIG_XML_EXTERNAL_ENTITY = 315, // "CONFIG_XML_EXTERNAL_ENTITY" ++ S_CONGIG_DIR_RESPONSE_BODY_MP = 316, // "CONGIG_DIR_RESPONSE_BODY_MP" ++ S_CONGIG_DIR_SEC_ARG_SEP = 317, // "CONGIG_DIR_SEC_ARG_SEP" ++ S_CONGIG_DIR_SEC_COOKIE_FORMAT = 318, // "CONGIG_DIR_SEC_COOKIE_FORMAT" ++ S_CONFIG_SEC_COOKIEV0_SEPARATOR = 319, // "CONFIG_SEC_COOKIEV0_SEPARATOR" ++ S_CONGIG_DIR_SEC_DATA_DIR = 320, // "CONGIG_DIR_SEC_DATA_DIR" ++ S_CONGIG_DIR_SEC_STATUS_ENGINE = 321, // "CONGIG_DIR_SEC_STATUS_ENGINE" ++ S_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 322, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" ++ S_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 323, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" ++ S_CONGIG_DIR_SEC_TMP_DIR = 324, // "CONGIG_DIR_SEC_TMP_DIR" ++ S_DIRECTIVE = 325, // "DIRECTIVE" ++ S_DIRECTIVE_SECRULESCRIPT = 326, // "DIRECTIVE_SECRULESCRIPT" ++ S_FREE_TEXT_QUOTE_MACRO_EXPANSION = 327, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++ S_QUOTATION_MARK = 328, // "QUOTATION_MARK" ++ S_RUN_TIME_VAR_BLD = 329, // "RUN_TIME_VAR_BLD" ++ S_RUN_TIME_VAR_DUR = 330, // "RUN_TIME_VAR_DUR" ++ S_RUN_TIME_VAR_HSV = 331, // "RUN_TIME_VAR_HSV" ++ S_RUN_TIME_VAR_REMOTE_USER = 332, // "RUN_TIME_VAR_REMOTE_USER" ++ S_RUN_TIME_VAR_TIME = 333, // "RUN_TIME_VAR_TIME" ++ S_RUN_TIME_VAR_TIME_DAY = 334, // "RUN_TIME_VAR_TIME_DAY" ++ S_RUN_TIME_VAR_TIME_EPOCH = 335, // "RUN_TIME_VAR_TIME_EPOCH" ++ S_RUN_TIME_VAR_TIME_HOUR = 336, // "RUN_TIME_VAR_TIME_HOUR" ++ S_RUN_TIME_VAR_TIME_MIN = 337, // "RUN_TIME_VAR_TIME_MIN" ++ S_RUN_TIME_VAR_TIME_MON = 338, // "RUN_TIME_VAR_TIME_MON" ++ S_RUN_TIME_VAR_TIME_SEC = 339, // "RUN_TIME_VAR_TIME_SEC" ++ S_RUN_TIME_VAR_TIME_WDAY = 340, // "RUN_TIME_VAR_TIME_WDAY" ++ S_RUN_TIME_VAR_TIME_YEAR = 341, // "RUN_TIME_VAR_TIME_YEAR" ++ S_VARIABLE = 342, // "VARIABLE" ++ S_DICT_ELEMENT = 343, // "Dictionary element" ++ S_DICT_ELEMENT_REGEXP = 344, // "Dictionary element, selected by regexp" ++ S_YYACCEPT = 345, // $accept ++ S_input = 346, // input ++ S_line = 347, // line ++ S_audit_log = 348, // audit_log ++ S_actions = 349, // actions ++ S_actions_may_quoted = 350, // actions_may_quoted ++ S_op = 351, // op ++ S_op_before_init = 352, // op_before_init ++ S_expression = 353, // expression ++ S_variables = 354, // variables ++ S_variables_pre_process = 355, // variables_pre_process ++ S_variables_may_be_quoted = 356, // variables_may_be_quoted ++ S_var = 357, // var ++ S_act = 358, // act ++ S_setvar_action = 359, // setvar_action ++ S_run_time_string = 360 // run_time_string + }; + }; + +@@ -2413,13 +2416,13 @@ switch (yykind) + symbol_type (int tok, location_type l) + : super_type(token_type (tok), std::move (l)) + { +- YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); ++ YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_MULTIPART_PART_HEADERS || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); + } + #else + symbol_type (int tok, const location_type& l) + : super_type(token_type (tok), l) + { +- YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); ++ YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_MULTIPART_PART_HEADERS || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); + } + #endif + #if 201103L <= YY_CPLUSPLUS +@@ -2873,6 +2876,21 @@ switch (yykind) + return symbol_type (token::TOK_VARIABLE_REQUEST_COOKIES_NAMES, l); + } + #endif ++#if 201103L <= YY_CPLUSPLUS ++ static ++ symbol_type ++ make_VARIABLE_MULTIPART_PART_HEADERS (location_type l) ++ { ++ return symbol_type (token::TOK_VARIABLE_MULTIPART_PART_HEADERS, std::move (l)); ++ } ++#else ++ static ++ symbol_type ++ make_VARIABLE_MULTIPART_PART_HEADERS (const location_type& l) ++ { ++ return symbol_type (token::TOK_VARIABLE_MULTIPART_PART_HEADERS, l); ++ } ++#endif + #if 201103L <= YY_CPLUSPLUS + static + symbol_type +@@ -7973,9 +7991,9 @@ switch (yykind) + /// Constants. + enum + { +- yylast_ = 3274, ///< Last index in yytable_. ++ yylast_ = 3344, ///< Last index in yytable_. + yynnts_ = 16, ///< Number of nonterminal symbols. +- yyfinal_ = 338 ///< Termination state number. ++ yyfinal_ = 339 ///< Termination state number. + }; + + +@@ -8053,10 +8071,10 @@ switch (yykind) + 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, + 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, + 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, +- 335, 336, 337, 338, 339, 340, 341, 342, 343 ++ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344 + }; + // Last valid token kind. +- const int code_max = 598; ++ const int code_max = 599; + + if (t <= 0) + return symbol_kind::S_YYEOF; +@@ -8626,7 +8644,7 @@ switch (yykind) + } + + } // yy +-#line 8630 "seclang-parser.hh" ++#line 8648 "seclang-parser.hh" + + + +diff --git a/src/parser/seclang-parser.yy b/src/parser/seclang-parser.yy +index 0cbbee08..332a30d1 100644 +--- a/src/parser/seclang-parser.yy ++++ b/src/parser/seclang-parser.yy +@@ -217,6 +217,7 @@ class Driver; + #include "src/variables/request_body_length.h" + #include "src/variables/request_cookies.h" + #include "src/variables/request_cookies_names.h" ++#include "src/variables/multipart_part_headers.h" + #include "src/variables/request_file_name.h" + #include "src/variables/request_headers.h" + #include "src/variables/request_headers_names.h" +@@ -352,6 +353,7 @@ using namespace modsecurity::operators; + VARIABLE_RESPONSE_HEADERS + VARIABLE_GEO + VARIABLE_REQUEST_COOKIES_NAMES ++ VARIABLE_MULTIPART_PART_HEADERS + VARIABLE_ARGS_COMBINED_SIZE + VARIABLE_ARGS_GET_NAMES + VARIABLE_RULE +@@ -2061,6 +2063,18 @@ var: + { + VARIABLE_CONTAINER($$, new variables::RequestCookiesNames_NoDictElement()); + } ++ | VARIABLE_MULTIPART_PART_HEADERS DICT_ELEMENT ++ { ++ VARIABLE_CONTAINER($$, new variables::MultipartPartHeaders_DictElement($2)); ++ } ++ | VARIABLE_MULTIPART_PART_HEADERS DICT_ELEMENT_REGEXP ++ { ++ VARIABLE_CONTAINER($$, new variables::MultipartPartHeaders_DictElementRegexp($2)); ++ } ++ | VARIABLE_MULTIPART_PART_HEADERS ++ { ++ VARIABLE_CONTAINER($$, new variables::MultipartPartHeaders_NoDictElement()); ++ } + | VARIABLE_RULE DICT_ELEMENT + { + VARIABLE_CONTAINER($$, new variables::Rule_DictElement($2)); +diff --git a/src/parser/seclang-scanner.cc b/src/parser/seclang-scanner.cc +index 99fd50ca..3aa6f520 100644 +--- a/src/parser/seclang-scanner.cc ++++ b/src/parser/seclang-scanner.cc +@@ -433,8 +433,8 @@ static void yynoreturn yy_fatal_error ( const char* msg ); + /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\ + (yy_c_buf_p) = yy_cp; + /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ +-#define YY_NUM_RULES 542 +-#define YY_END_OF_BUFFER 543 ++#define YY_NUM_RULES 544 ++#define YY_END_OF_BUFFER 545 + /* This struct is not used in this scanner, + but its presence is necessary. */ + struct yy_trans_info +@@ -442,7 +442,7 @@ struct yy_trans_info + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +-static const flex_int16_t yy_accept[3953] = ++static const flex_int16_t yy_accept[3966] = + { 0, + 0, 0, 0, 0, 273, 273, 281, 281, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -451,108 +451,108 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 285, 285, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 543, 535, 529, 266, 270, 271, +- 269, 272, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 535, 535, 289, 289, 542, 289, 289, ++ 0, 0, 0, 0, 545, 537, 531, 266, 270, 271, ++ 269, 272, 537, 537, 537, 537, 537, 537, 537, 537, ++ 537, 537, 537, 537, 537, 289, 289, 544, 289, 289, + + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 126, 273, 279, 281, +- 283, 277, 276, 278, 275, 281, 274, 493, 493, 492, +- 493, 493, 493, 121, 120, 119, 128, 128, 128, 135, ++ 283, 277, 276, 278, 275, 281, 274, 495, 495, 494, ++ 495, 495, 495, 121, 120, 119, 128, 128, 128, 135, + 127, 128, 130, 130, 130, 129, 135, 130, 133, 133, +- 133, 132, 135, 131, 133, 534, 534, 534, 542, 495, +- 494, 444, 447, 542, 447, 444, 444, 444, 433, 433, +- 433, 436, 438, 433, 437, 433, 427, 433, 503, 503, +- 503, 502, 507, 503, 505, 505, 505, 504, 507, 505, ++ 133, 132, 135, 131, 133, 536, 536, 536, 544, 497, ++ 496, 446, 449, 544, 449, 446, 446, 446, 435, 435, ++ 435, 438, 440, 435, 439, 435, 429, 435, 505, 505, ++ 505, 504, 509, 505, 507, 507, 507, 506, 509, 507, + 118, 118, 110, 118, 115, 109, 118, 118, 118, 118, + + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, +- 118, 118, 118, 118, 113, 118, 112, 542, 512, 542, +- 508, 521, 542, 285, 286, 542, 499, 499, 498, 501, +- 499, 497, 497, 496, 501, 497, 150, 536, 537, 538, ++ 118, 118, 118, 118, 113, 118, 112, 544, 514, 544, ++ 510, 523, 544, 285, 286, 544, 501, 501, 500, 503, ++ 501, 499, 499, 498, 503, 499, 150, 538, 539, 540, + 137, 136, 137, 137, 137, 137, 137, 137, 141, 140, + 145, 146, 146, 145, 143, 142, 140, 148, 149, 149, +- 147, 148, 529, 266, 0, 269, 269, 269, 0, 0, ++ 147, 148, 531, 266, 0, 269, 269, 269, 0, 0, + 0, 0, 0, 0, 0, 0, 218, 0, 0, 0, +- 0, 0, 530, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 412, 0, 0, 0, ++ 0, 0, 532, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 414, 0, 0, 0, + +- 0, 0, 0, 0, 0, 0, 0, 0, 417, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 419, 0, + 0, 0, 0, 0, 122, 0, 125, 273, 279, 281, +- 283, 280, 281, 282, 283, 284, 529, 0, 0, 0, ++ 283, 280, 281, 282, 283, 284, 531, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 128, 0, 128, 128, 128, + 0, 134, 122, 128, 128, 130, 0, 0, 130, 130, + 130, 0, 130, 122, 130, 133, 0, 0, 133, 133, +- 133, 0, 133, 122, 133, 534, 534, 534, 0, 532, +- 534, 444, 0, 444, 0, 444, 444, 0, 444, 444, +- 433, 0, 0, 432, 433, 433, 433, 0, 433, 506, +- +- 433, 433, 0, 432, 0, 433, 425, 426, 433, 433, +- 503, 0, 0, 503, 503, 503, 0, 503, 122, 503, +- 505, 0, 505, 505, 0, 505, 0, 0, 122, 505, +- 505, 0, 110, 0, 109, 0, 111, 115, 116, 0, ++ 133, 0, 133, 122, 133, 536, 536, 536, 0, 534, ++ 536, 446, 0, 446, 0, 446, 446, 0, 446, 446, ++ 435, 0, 0, 434, 435, 435, 435, 0, 435, 508, ++ ++ 435, 435, 0, 434, 0, 435, 427, 428, 435, 435, ++ 505, 0, 0, 505, 505, 505, 0, 505, 122, 505, ++ 507, 0, 507, 507, 0, 507, 0, 0, 122, 507, ++ 507, 0, 110, 0, 109, 0, 111, 115, 116, 0, + 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 105, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 107, 0, 0, 113, 0, 114, 112, +- 112, 0, 512, 0, 521, 0, 512, 510, 520, 0, +- 508, 521, 0, 0, 528, 0, 511, 0, 285, 286, ++ 112, 0, 514, 0, 523, 0, 514, 512, 522, 0, ++ 510, 523, 0, 0, 530, 0, 513, 0, 285, 286, + +- 0, 286, 0, 0, 499, 0, 499, 0, 500, 499, +- 497, 0, 0, 497, 0, 497, 536, 537, 538, 0, ++ 0, 286, 0, 0, 501, 0, 501, 0, 502, 501, ++ 499, 0, 0, 499, 0, 499, 538, 539, 540, 0, + 0, 0, 0, 0, 0, 138, 139, 145, 0, 0, + 145, 0, 145, 144, 148, 0, 0, 148, 0, 148, + 269, 0, 0, 0, 0, 0, 0, 0, 217, 0, +- 0, 0, 0, 0, 0, 0, 530, 531, 0, 0, +- 0, 395, 0, 0, 385, 0, 0, 0, 420, 0, ++ 0, 0, 0, 0, 0, 0, 532, 533, 0, 0, ++ 0, 397, 0, 0, 385, 0, 0, 0, 422, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 423, 0, 0, 0, 0, 393, 122, +- 123, 124, 0, 0, 0, 0, 465, 0, 466, 0, ++ 0, 0, 0, 425, 0, 0, 0, 0, 395, 122, ++ 123, 124, 0, 0, 0, 0, 467, 0, 468, 0, + +- 467, 0, 0, 470, 471, 473, 0, 0, 475, 0, +- 0, 0, 0, 0, 0, 466, 0, 0, 0, 128, ++ 469, 0, 0, 472, 473, 475, 0, 0, 477, 0, ++ 0, 0, 0, 0, 0, 468, 0, 0, 0, 128, + 0, 0, 122, 123, 0, 130, 0, 0, 122, 123, +- 0, 133, 0, 0, 122, 123, 532, 533, 444, 0, +- 444, 0, 439, 0, 439, 0, 444, 0, 433, 0, +- 0, 433, 0, 432, 0, 433, 433, 433, 433, 433, +- 0, 0, 0, 0, 433, 433, 433, 0, 503, 0, +- 0, 122, 123, 0, 505, 0, 0, 122, 122, 123, ++ 0, 133, 0, 0, 122, 123, 534, 535, 446, 0, ++ 446, 0, 441, 0, 441, 0, 446, 0, 435, 0, ++ 0, 435, 0, 434, 0, 435, 435, 435, 435, 435, ++ 0, 0, 0, 0, 435, 435, 435, 0, 505, 0, ++ 0, 122, 123, 0, 507, 0, 0, 122, 122, 123, + 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, + + 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 107, 108, 510, 520, 516, 519, 0, +- 523, 0, 0, 528, 0, 0, 511, 509, 518, 0, +- 0, 287, 0, 0, 499, 0, 0, 0, 497, 0, ++ 0, 0, 0, 107, 108, 512, 522, 518, 521, 0, ++ 525, 0, 0, 530, 0, 0, 513, 511, 520, 0, ++ 0, 287, 0, 0, 501, 0, 0, 0, 499, 0, + 0, 0, 0, 0, 0, 0, 145, 0, 0, 0, + 148, 0, 0, 269, 0, 0, 0, 0, 0, 169, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 224, 531, 361, 0, 0, 396, 0, 0, 386, 0, ++ 224, 533, 361, 0, 0, 398, 0, 0, 386, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 389, 0, 0, 0, 408, 0, 0, +- 418, 0, 0, 394, 123, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 472, 474, 0, 0, 0, 0, ++ 0, 0, 0, 391, 0, 0, 0, 410, 0, 0, ++ 420, 0, 0, 396, 123, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 474, 476, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 128, 0, 123, +- 130, 0, 123, 133, 0, 123, 533, 444, 0, 0, +- 0, 0, 444, 0, 0, 440, 445, 441, 440, 445, +- 441, 433, 0, 433, 433, 433, 0, 433, 0, 0, +- 0, 0, 433, 0, 432, 0, 433, 433, 428, 434, ++ 130, 0, 123, 133, 0, 123, 535, 446, 0, 0, ++ 0, 0, 446, 0, 0, 442, 447, 443, 442, 447, ++ 443, 435, 0, 435, 435, 435, 0, 435, 0, 0, ++ 0, 0, 435, 0, 434, 0, 435, 435, 430, 436, + +- 429, 428, 434, 429, 0, 0, 433, 433, 503, 0, +- 123, 505, 0, 123, 123, 0, 0, 0, 0, 0, ++ 431, 430, 436, 431, 0, 0, 435, 435, 505, 0, ++ 123, 507, 0, 123, 123, 0, 0, 0, 0, 0, + 0, 0, 0, 5, 0, 0, 7, 0, 0, 0, + 8, 0, 0, 0, 49, 0, 0, 0, 13, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 63, 0, 0, 108, 516, +- 519, 515, 523, 0, 526, 0, 0, 522, 0, 0, +- 509, 518, 514, 517, 287, 0, 288, 499, 0, 497, ++ 0, 0, 0, 0, 0, 63, 0, 0, 108, 518, ++ 521, 517, 525, 0, 528, 0, 0, 524, 0, 0, ++ 511, 520, 516, 519, 287, 0, 288, 501, 0, 499, + + 0, 0, 0, 0, 0, 145, 0, 148, 0, 269, + 269, 214, 0, 0, 216, 0, 0, 0, 0, 0, +@@ -560,75 +560,75 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 362, 0, + 0, 0, 377, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 390, 0, +- 0, 0, 0, 0, 0, 424, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 491, ++ 0, 0, 0, 0, 0, 0, 0, 0, 392, 0, ++ 0, 0, 0, 0, 0, 426, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 493, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 0, 0, 0, 0, 0, 0, 0, 442, 442, 442, +- 0, 0, 430, 430, 0, 0, 0, 433, 433, 0, +- 430, 0, 433, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 444, 444, 444, ++ 0, 0, 432, 432, 0, 0, 0, 435, 435, 0, ++ 432, 0, 435, 0, 0, 0, 0, 0, 0, 0, + 26, 0, 0, 2, 0, 4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, + 14, 0, 0, 16, 0, 0, 53, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 75, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 515, 526, 0, 527, 522, 0, 524, 0, ++ 0, 0, 517, 528, 0, 529, 524, 0, 526, 0, + +- 514, 517, 513, 288, 0, 0, 0, 0, 0, 0, ++ 516, 519, 515, 288, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 269, 269, 0, 0, 0, + 170, 0, 0, 221, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, +- 0, 0, 0, 0, 0, 0, 378, 0, 0, 411, ++ 0, 0, 0, 0, 0, 0, 378, 0, 0, 413, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 415, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 417, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 359, 0, 0, 0, 0, + +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 477, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 446, +- 443, 446, 443, 435, 431, 435, 431, 0, 430, 0, +- 0, 0, 433, 0, 0, 0, 1, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 479, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 448, ++ 445, 448, 445, 437, 433, 437, 433, 0, 432, 0, ++ 0, 0, 435, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 41, 41, 0, 8, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 84, 0, 0, 0, 0, 74, 0, 92, 0, 0, +- 0, 0, 0, 0, 0, 0, 527, 524, 0, 525, ++ 0, 0, 0, 0, 0, 0, 529, 526, 0, 527, + +- 513, 0, 0, 0, 269, 269, 0, 0, 0, 0, ++ 515, 0, 0, 0, 269, 269, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 260, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 419, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 421, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 414, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 416, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 0, 0, 0, 461, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 463, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, + 0, 0, 41, 0, 41, 41, 0, 0, 0, 0, + 0, 0, 0, 50, 0, 0, 15, 0, 0, 52, + 0, 54, 22, 55, 56, 58, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 64, 0, 0, 65, 525, 0, 0, 269, 269, ++ 0, 64, 0, 0, 65, 527, 0, 0, 269, 269, + 0, 0, 0, 219, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 363, 0, 0, 0, 398, 0, 0, ++ 0, 0, 0, 363, 0, 0, 0, 400, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 413, 0, 0, +- 0, 0, 422, 0, 0, 401, 0, 0, 404, 405, +- 406, 0, 0, 0, 0, 360, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 469, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 415, 0, 0, ++ 0, 0, 424, 0, 0, 403, 0, 0, 406, 407, ++ 408, 0, 0, 0, 0, 360, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 471, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 27, 0, 0, 0, 0, 0, 0, +@@ -637,7 +637,7 @@ static const flex_int16_t yy_accept[3953] = + 57, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 97, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 64, 0, 269, 269, +- 0, 0, 0, 0, 539, 0, 0, 262, 0, 0, ++ 0, 0, 0, 0, 541, 0, 0, 262, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -646,10 +646,10 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 364, 0, 0, 365, 297, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 325, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 421, 0, 0, +- 0, 0, 356, 0, 0, 403, 409, 407, 357, 0, +- 0, 0, 463, 0, 0, 464, 0, 0, 0, 0, +- 468, 0, 476, 478, 0, 0, 486, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 423, 0, 0, ++ 0, 0, 356, 0, 0, 405, 411, 409, 357, 0, ++ 0, 0, 465, 0, 0, 466, 0, 0, 0, 0, ++ 470, 0, 478, 480, 0, 0, 488, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 40, 0, 40, 0, 0, + +@@ -668,9 +668,9 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 402, 0, 0, 0, +- 0, 0, 0, 481, 0, 490, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 487, 488, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 404, 0, 0, 0, ++ 0, 0, 0, 483, 0, 492, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 489, 490, 0, 0, 0, + 0, 0, 0, 25, 0, 25, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 46, 48, 0, + 48, 10, 11, 0, 0, 0, 0, 0, 0, 0, +@@ -679,7 +679,7 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 93, 0, 0, 0, 0, +- 0, 269, 0, 267, 267, 267, 267, 267, 0, 540, ++ 0, 269, 0, 267, 267, 267, 267, 267, 0, 542, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 193, 0, 0, +@@ -689,196 +689,197 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 294, 0, 0, 369, 367, + 0, 0, 0, 0, 0, 303, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 327, 328, 329, 400, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 345, 0, 0, 0, 0, 0, +- 353, 354, 355, 416, 0, 0, 479, 0, 0, 452, +- 449, 0, 0, 472, 0, 0, 0, 0, 0, 0, +- 0, 489, 0, 0, 458, 0, 455, 0, 0, 0, +- 0, 25, 0, 0, 0, 26, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 44, 44, 0, 0, 48, ++ 0, 327, 328, 329, 402, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 345, 0, 0, 0, 0, ++ 0, 353, 354, 355, 418, 0, 0, 481, 0, 0, ++ 454, 451, 0, 0, 474, 0, 0, 0, 0, 0, ++ 0, 0, 491, 0, 0, 460, 0, 457, 0, 0, ++ 0, 0, 25, 0, 0, 0, 26, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 44, 44, 0, 0, ++ ++ 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 61, 0, 0, 0, 91, 0, 78, 77, ++ 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 94, 80, 83, 81, 0, 269, 269, ++ 0, 0, 0, 0, 222, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 232, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 245, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, ++ 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 370, 368, 0, ++ 0, 300, 0, 0, 375, 0, 399, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 61, 0, 0, 0, 91, 0, 78, 77, 0, +- 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 94, 80, 83, 81, 0, 269, 269, 0, +- 0, 0, 0, 222, 0, 0, 0, 0, 0, 0, ++ 0, 326, 0, 0, 0, 337, 0, 0, 0, 341, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 232, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 245, 0, 0, 0, 0, ++ 0, 453, 482, 0, 0, 0, 485, 0, 0, 0, ++ 0, 0, 459, 0, 0, 0, 0, 24, 0, 0, ++ 24, 0, 0, 0, 0, 0, 0, 0, 0, 6, + +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, ++ 0, 44, 44, 0, 44, 0, 44, 44, 0, 0, ++ 47, 0, 0, 47, 0, 0, 0, 0, 0, 0, ++ 0, 0, 106, 0, 0, 0, 59, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 370, 368, 0, 0, +- 300, 0, 0, 375, 0, 397, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 326, +- 0, 0, 0, 337, 0, 0, 0, 341, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 451, +- 480, 0, 0, 0, 483, 0, 0, 0, 0, 0, +- 457, 0, 0, 0, 0, 24, 0, 0, 24, 0, +- 0, 0, 0, 0, 0, 0, 0, 6, 0, 44, +- +- 44, 0, 44, 0, 44, 44, 0, 0, 47, 0, +- 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, +- 106, 0, 0, 0, 59, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 268, +- 268, 268, 268, 268, 215, 0, 0, 0, 0, 0, +- 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 242, 0, 0, 0, 0, 0, 0, +- 0, 175, 0, 0, 0, 0, 0, 0, 243, 0, +- +- 0, 0, 192, 0, 0, 0, 0, 191, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 236, 0, 0, +- 0, 0, 0, 154, 154, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 376, 0, 0, 0, ++ 0, 268, 268, 268, 268, 268, 215, 0, 0, 0, ++ 0, 0, 167, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 242, 0, 0, 0, 0, ++ 0, 0, 0, 175, 0, 0, 0, 0, 0, 0, ++ ++ 243, 0, 0, 0, 192, 0, 0, 0, 0, 191, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 236, ++ 0, 0, 0, 0, 0, 154, 154, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 376, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 331, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 346, 0, 0, 0, 0, 0, 0, 462, +- 0, 0, 0, 484, 0, 0, 0, 0, 0, 0, +- 24, 25, 26, 0, 0, 0, 0, 0, 0, 103, +- 44, 43, 44, 44, 43, 0, 0, 44, 43, 0, +- +- 0, 44, 43, 44, 44, 45, 47, 48, 0, 0, +- 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, ++ 0, 0, 0, 0, 0, 331, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 346, 0, 0, 0, 0, ++ 0, 0, 464, 0, 0, 0, 486, 0, 0, 0, ++ 0, 0, 0, 24, 25, 26, 0, 0, 0, 0, ++ 0, 0, 103, 44, 43, 44, 44, 43, 0, 0, ++ ++ 44, 43, 0, 0, 44, 43, 44, 44, 45, 47, ++ 48, 0, 0, 0, 50, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 88, 0, 0, 0, 0, 0, 0, +- 220, 0, 0, 162, 0, 164, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 240, 0, 0, 0, 0, +- 0, 0, 0, 233, 0, 0, 0, 0, 0, 0, +- 250, 0, 0, 265, 265, 0, 0, 0, 0, 0, ++ 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 88, 0, 0, 0, ++ 0, 0, 0, 220, 0, 0, 162, 0, 164, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 240, 0, ++ 0, 0, 0, 0, 0, 0, 233, 0, 0, 0, ++ 0, 0, 0, 250, 0, 0, 265, 265, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 0, 0, 0, 210, 0, 0, 0, 0, 0, 0, +- 0, 0, 291, 0, 0, 391, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 210, 0, 0, 0, ++ 0, 0, 0, 0, 0, 291, 0, 0, 393, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 321, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 342, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 321, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 342, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 44, 0, 43, +- 0, 44, 44, 43, 0, 43, 0, 0, 43, 0, +- 0, 45, 43, 45, 45, 43, 0, 44, 43, 44, +- 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 44, 0, 43, 0, 44, 44, 43, 0, 43, ++ 0, 0, 43, 0, 0, 45, 43, 45, 45, 43, ++ 0, 44, 43, 44, 0, 0, 0, 0, 50, 0, + +- 0, 0, 0, 0, 0, 0, 60, 0, 60, 0, +- 60, 0, 0, 71, 70, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 87, 69, 82, 0, +- 0, 0, 171, 0, 0, 0, 0, 0, 0, 174, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, +- 0, 0, 0, 0, 0, 247, 246, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 237, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 153, 0, 0, 0, 0, 292, +- 295, 0, 392, 0, 0, 0, 0, 0, 0, 0, +- +- 0, 0, 0, 0, 0, 0, 0, 0, 320, 0, +- 0, 0, 0, 0, 0, 0, 0, 379, 0, 381, +- 0, 344, 0, 0, 0, 352, 0, 0, 0, 0, +- 0, 485, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 35, 0, 0, 42, 44, 42, 0, 44, 42, +- 0, 0, 42, 44, 0, 42, 0, 42, 45, 45, +- 42, 45, 26, 0, 18, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, +- 0, 0, 96, 96, 0, 67, 0, 0, 0, 0, +- 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- +- 241, 0, 0, 0, 0, 0, 0, 0, 0, 261, +- 0, 178, 178, 0, 248, 0, 0, 0, 0, 0, ++ 60, 0, 60, 0, 60, 0, 0, 71, 70, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 87, 69, 82, 0, 0, 0, 171, 0, 0, 0, ++ 0, 0, 0, 174, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 176, 0, 0, 0, 0, 0, 247, ++ 246, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 237, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 153, 0, ++ 0, 0, 0, 292, 295, 0, 394, 0, 0, 0, ++ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 320, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 379, 0, 381, 0, 344, 0, 0, 0, ++ 352, 0, 0, 0, 0, 0, 487, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 35, 0, 0, 42, ++ 44, 42, 0, 44, 42, 0, 0, 42, 44, 0, ++ 42, 0, 42, 45, 45, 42, 45, 26, 0, 18, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 211, 0, 0, 0, 153, 0, 0, 296, 0, +- 0, 0, 399, 0, 0, 302, 0, 0, 0, 0, ++ 0, 60, 0, 0, 0, 0, 0, 96, 96, 0, ++ 67, 0, 0, 0, 0, 98, 0, 0, 0, 0, ++ ++ 0, 0, 0, 0, 0, 241, 0, 0, 0, 0, ++ 0, 0, 0, 0, 261, 0, 178, 178, 0, 248, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 211, 0, 0, 0, ++ 153, 0, 0, 296, 0, 0, 0, 401, 0, 0, ++ 302, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 335, 0, ++ 380, 0, 338, 382, 0, 343, 0, 383, 0, 358, ++ 0, 470, 0, 0, 0, 0, 0, 0, 0, 28, ++ ++ 0, 0, 0, 0, 0, 0, 42, 42, 0, 42, ++ 0, 44, 0, 42, 45, 43, 45, 45, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, ++ 0, 0, 0, 0, 68, 66, 100, 0, 0, 0, ++ 0, 0, 0, 168, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 229, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 256, 0, 0, 0, 238, 0, 0, 0, 234, ++ 234, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0, ++ ++ 0, 0, 0, 317, 0, 0, 0, 0, 0, 0, ++ 330, 334, 0, 0, 0, 0, 384, 0, 351, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 335, 0, 380, 0, 338, 382, 0, 343, +- 0, 383, 0, 358, 0, 468, 0, 0, 0, 0, +- 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, +- +- 42, 42, 0, 42, 0, 44, 0, 42, 45, 43, +- 45, 45, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 60, 0, 0, 0, 0, 0, 0, 68, 66, +- 100, 0, 0, 0, 0, 0, 0, 168, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 229, 0, 0, ++ 0, 0, 0, 0, 43, 43, 45, 45, 43, 45, ++ 0, 0, 0, 0, 0, 0, 60, 0, 72, 0, ++ 76, 0, 0, 0, 0, 0, 101, 0, 0, 0, ++ 0, 0, 165, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 177, 0, 249, 0, 0, 0, 543, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 256, 0, 0, 0, 238, +- 0, 0, 0, 234, 234, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 371, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 317, 0, 0, +- +- 0, 0, 0, 330, 334, 0, 0, 0, 0, 384, +- 0, 351, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 43, 43, 45, +- 45, 43, 45, 0, 0, 0, 0, 0, 0, 60, +- 0, 72, 0, 76, 0, 0, 0, 0, 0, 101, +- 0, 0, 0, 0, 0, 165, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 177, 0, 249, 0, 0, +- 0, 541, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 208, 0, 290, 0, 372, 0, +- +- 301, 373, 0, 0, 0, 0, 311, 0, 0, 0, ++ ++ 0, 208, 0, 290, 0, 372, 0, 301, 373, 0, ++ 0, 0, 0, 311, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 482, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, +- 0, 0, 0, 60, 0, 89, 95, 95, 0, 86, +- 0, 181, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 155, 0, 0, 251, 180, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 195, 195, 0, ++ 0, 0, 484, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, ++ 0, 60, 0, 89, 95, 95, 0, 86, 0, 181, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 213, 0, 298, 299, 374, 0, 0, 0, 0, 310, ++ 155, 0, 0, 251, 180, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 195, 195, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 213, 0, + +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 324, +- 0, 336, 0, 0, 0, 0, 0, 410, 0, 0, ++ 298, 299, 374, 0, 0, 0, 0, 310, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 324, 0, ++ 336, 0, 0, 0, 0, 0, 412, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 156, +- 0, 166, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 187, 0, 0, 0, 0, 0, 0, +- 0, 0, 196, 196, 0, 198, 198, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 212, 225, 0, 0, +- 0, 307, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 450, 0, +- +- 0, 0, 456, 0, 0, 29, 0, 0, 0, 36, ++ 0, 0, 0, 0, 0, 0, 0, 0, 156, 0, ++ 166, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 187, 0, 0, 0, 0, 0, 0, 0, ++ 0, 196, 196, 0, 198, 198, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 212, 225, 0, 0, 0, ++ 307, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ ++ 0, 0, 0, 0, 0, 0, 0, 0, 452, 0, ++ 0, 0, 458, 0, 0, 29, 0, 0, 0, 36, + 0, 0, 19, 0, 0, 85, 99, 0, 0, 163, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 185, 0, 0, 190, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 194, 0, 0, 0, 308, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 387, 339, 0, 348, 0, +- 453, 0, 0, 459, 0, 0, 0, 0, 37, 0, +- 20, 0, 161, 228, 228, 0, 161, 157, 0, 0, +- 0, 264, 0, 252, 0, 231, 0, 0, 0, 0, +- +- 0, 0, 0, 0, 189, 0, 0, 197, 199, 0, +- 0, 0, 0, 152, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 315, 0, 0, 0, 322, +- 0, 0, 388, 340, 0, 349, 454, 0, 460, 0, +- 34, 0, 0, 21, 0, 0, 0, 158, 0, 0, +- 253, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 152, 0, 0, 209, 0, +- 0, 306, 0, 0, 0, 0, 0, 0, 0, 333, +- 347, 350, 0, 0, 0, 0, 160, 0, 0, 239, +- 0, 0, 0, 230, 0, 0, 263, 0, 0, 0, +- ++ 0, 0, 0, 0, 0, 0, 387, 339, 0, 348, ++ 0, 455, 0, 0, 461, 0, 0, 0, 0, 37, ++ 0, 20, 0, 161, 228, 228, 0, 161, 157, 0, ++ ++ 0, 0, 264, 0, 252, 0, 231, 0, 0, 0, ++ 0, 0, 0, 0, 0, 189, 0, 0, 197, 199, ++ 0, 0, 0, 0, 152, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 315, 0, 0, 389, ++ 0, 322, 0, 0, 388, 340, 0, 349, 456, 0, ++ 462, 0, 34, 0, 0, 21, 0, 0, 0, 158, ++ 0, 0, 253, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 152, 0, 0, ++ 209, 0, 0, 306, 0, 0, 0, 0, 0, 390, ++ 0, 0, 333, 347, 350, 0, 0, 0, 0, 160, ++ ++ 0, 0, 239, 0, 0, 0, 230, 0, 0, 263, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 312, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 159, 151, ++ 0, 0, 0, 0, 0, 0, 184, 0, 0, 226, ++ 226, 0, 207, 0, 205, 0, 0, 0, 257, 0, ++ 304, 0, 0, 0, 316, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 151, 0, 0, 0, 0, 0, ++ 188, 0, 0, 0, 203, 0, 201, 0, 258, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 312, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 159, 151, 0, 0, 0, +- 0, 0, 0, 184, 0, 0, 226, 226, 0, 207, +- 0, 205, 0, 0, 0, 257, 0, 304, 0, 0, +- 0, 316, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 151, 0, 0, 0, 0, 0, 188, 0, 0, +- 0, 203, 0, 201, 0, 258, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 38, 0, 172, +- 172, 0, 0, 0, 0, 0, 0, 0, 206, 204, +- +- 0, 0, 0, 0, 0, 318, 319, 0, 332, 0, +- 0, 0, 0, 39, 0, 259, 179, 0, 0, 186, +- 0, 202, 200, 0, 0, 0, 323, 0, 0, 0, +- 31, 173, 183, 0, 227, 305, 309, 0, 33, 30, +- 0, 182, 0, 0, 0, 0, 314, 0, 0, 0, +- 32, 0 ++ ++ 38, 0, 172, 172, 0, 0, 0, 0, 0, 0, ++ 0, 206, 204, 0, 0, 0, 0, 0, 318, 319, ++ 0, 332, 0, 0, 0, 0, 39, 0, 259, 179, ++ 0, 0, 186, 0, 202, 200, 0, 0, 0, 323, ++ 0, 0, 0, 31, 173, 183, 0, 227, 305, 309, ++ 0, 33, 30, 0, 182, 0, 0, 0, 0, 314, ++ 0, 0, 0, 32, 0 + } ; + + static const YY_CHAR yy_ec[256] = +@@ -926,953 +927,955 @@ static const YY_CHAR yy_meta[88] = + 15, 15, 15, 15, 17, 18, 1 + } ; + +-static const flex_int16_t yy_base[4238] = ++static const flex_int16_t yy_base[4251] = + { 0, + 0, 80, 161, 0, 4, 8, 14, 247, 21, 87, + 101, 254, 25, 40, 53, 261, 265, 275, 284, 290, +- 94, 304,11621,11620,11617,11573, 324, 347, 365, 383, ++ 94, 304,11801,11718,11649,11643, 324, 347, 365, 383, + 413, 434, 314, 448, 335, 397, 505, 0, 457, 464, + 591, 597, 603, 609, 419, 425, 271, 298, 102, 612, +- 11569,11568,11565,11539,11533,11532,11529,11504, 614, 622, +- 0, 0,11472,11471, 428, 611, 646, 668, 0, 0, +- 57, 79, 620, 627,11497,14261, 673,14261,14261,14261, +- 308,14261, 4, 25, 59, 52, 71, 72, 96, 279, +- 315, 97, 220, 271, 8,14261, 443,14261, 655, 269, ++ 11644,11641,11597,11591,11590,11587,11561,11555, 614, 622, ++ 0, 0,11528,11525, 428, 611, 646, 668, 0, 0, ++ 57, 79, 620, 627,11529,14283, 673,14283,14283,14283, ++ 308,14283, 4, 25, 59, 52, 71, 72, 96, 279, ++ 315, 97, 220, 271, 8,14283, 443,14283, 655, 269, + + 312, 578, 673, 330, 429, 681, 327, 358, 368, 686, +- 679, 699, 707, 421, 422, 38,11479, 133, 765, 771, +- 783,14261,14261,14261,14261, 789,14261,14261, 631,14261, +- 815, 76, 764,14261,14261,14261, 278, 798, 348, 417, +- 11426, 801, 372, 829, 752,11425, 540, 814, 855, 895, +- 883,11422, 546,11414, 904, 830, 901,14261, 913,14261, +- 14261, 918,11408,11407,11404, 924, 957, 964, 934, 980, +- 991,11315, 601, 1012,11109, 1024, 725, 1042, 770, 1054, +- 831,11103, 625, 1063, 645, 978, 802, 867, 663, 1072, +- 14261, 1081,14261,11156, 484, 475, 1047, 719, 764, 874, ++ 679, 699, 707, 421, 422, 38,11513, 133, 765, 771, ++ 783,14283,14283,14283,14283, 789,14283,14283, 631,14283, ++ 815, 76, 764,14283,14283,14283, 278, 798, 348, 417, ++ 11465, 801, 372, 829, 752,11462, 540, 814, 855, 895, ++ 883,11454, 546,11448, 904, 830, 901,14283, 913,14283, ++ 14283, 918,11447,11444,11436, 924, 957, 964, 934, 980, ++ 991,11430, 601, 1012,11429, 1024, 725, 1042, 770, 1054, ++ 831,11426, 625, 1063, 645, 978, 802, 867, 663, 1072, ++ 14283, 1081,14283,11391, 484, 475, 1047, 719, 764, 874, + + 717, 940, 752, 1056, 800, 953, 1064, 818, 1059, 917, +- 821, 885, 405, 1139,14261,11153, 1143, 1147, 476, 309, +- 1153, 1159, 410, 1011, 490, 493, 1096, 1114,11055, 911, +- 1122, 1124, 1129,11049, 943, 1158,14261, 0, 0, 0, +- 14261,14261, 990, 1017, 1053, 1062, 1105, 1118,14261, 120, +- 1162,11048, 1113, 1168,14261,14261, 282, 1178,11045, 1116, +- 10966, 1199, 1200,14261, 495, 0, 1187,10954, 1135, 1140, +- 1144, 1149, 1180, 1172, 1168, 1184,14261, 1173, 1178, 1184, +- 1199, 1182, 636,11013, 1229, 620, 1196, 1187, 1190, 1187, ++ 821, 885, 405, 1139,14283,11185, 1143, 1147, 476, 309, ++ 1153, 1159, 410, 1011, 490, 493, 1096, 1114,11125, 911, ++ 1122, 1124, 1129,11124, 943, 1158,14283, 0, 0, 0, ++ 14283,14283, 990, 1017, 1053, 1062, 1105, 1118,14283, 120, ++ 1162,11121, 1113, 1168,14283,14283, 282, 1178,11077, 1116, ++ 11071, 1199, 1200,14283, 495, 0, 1187,11064, 1135, 1140, ++ 1144, 1149, 1180, 1172, 1168, 1184,14283, 1173, 1178, 1184, ++ 1199, 1182, 636,11121, 1229, 620, 1196, 1187, 1190, 1187, + 1198, 1200, 1198, 1199, 1213, 1221, 297, 1205, 1225, 1220, + + 1213, 1214, 1234, 1230, 1232, 1236, 1245, 1237, 735, 1243, +- 1246, 1254, 1261, 1252, 641,11010,10902, 642, 1321, 1327, +- 1333,14261, 1293,14261, 1304,14261, 1294, 1279, 1270, 1283, ++ 1246, 1254, 1261, 1252, 641,11042,10954, 642, 1321, 1327, ++ 1333,14283, 1293,14283, 1304,14283, 1294, 1279, 1270, 1283, + 1297, 1268, 1304, 1311, 1298, 1302, 1317, 1302, 1314, 1328, +- 1321, 1329, 1354, 1321, 1339, 920,10924, 670, 1395, 1405, +- 1400,14261, 1409, 1410, 1406, 1416,10923,10920, 998, 1423, +- 1431, 1417, 1429, 1435, 1440, 1439,10912,10906, 1391, 1454, +- 1467, 1448, 1468, 1474, 1484, 1498, 1504,14261, 1510, 933, +- 1514, 1525,10905, 1518,10952, 1541, 1561, 346, 1578, 1584, +- 1585,10777,10773, 1609, 1527, 1624, 1642, 1500, 1648,14261, +- +- 1673, 1677, 1615, 1707, 842, 1708,14261,14261, 1733, 1739, +- 1488,10737,10687, 1005, 1722, 1549, 1633, 1684, 1745, 1701, +- 1568,10669, 1172, 1751, 1671, 1599, 1664, 1605, 1764, 1767, +- 1734, 1780,14261,10705, 949, 816,14261, 1784,14261,10701, ++ 1321, 1329, 1354, 1321, 1339, 920,10981, 670, 1395, 1405, ++ 1400,14283, 1409, 1410, 1406, 1416,10978,10952, 998, 1423, ++ 1431, 1417, 1429, 1435, 1440, 1439,10946,10945, 1391, 1454, ++ 1467, 1448, 1468, 1474, 1484, 1498, 1504,14283, 1510, 933, ++ 1514, 1525,10942, 1518,10984, 1541, 1561, 346, 1578, 1584, ++ 1585,10928,10927, 1609, 1527, 1624, 1642, 1500, 1648,14283, ++ ++ 1673, 1677, 1615, 1707, 842, 1708,14283,14283, 1733, 1739, ++ 1488,10924,10799, 1005, 1722, 1549, 1633, 1684, 1745, 1701, ++ 1568,10795, 1172, 1751, 1671, 1599, 1664, 1605, 1764, 1767, ++ 1734, 1780,14283,10813, 949, 816,14283, 1784,14283,10763, + 1463, 1335, 1402, 1444, 1474, 1477, 1503, 1529, 1581, 1753, +- 1658, 1746,10604, 1734, 1739, 1728, 1761, 1758, 1774, 1771, +- 14261, 1761, 1780, 1778, 1780, 1771, 1767, 1779, 1798, 1829, +- 1793, 1800, 1811, 1533,10589, 1880,14261,10583,14261, 1907, +- 1911, 1915, 1567, 701, 1921, 1075, 1691, 1560, 1847,10582, ++ 1658, 1746,10720, 1734, 1739, 1728, 1761, 1758, 1774, 1771, ++ 14283, 1761, 1780, 1778, 1780, 1771, 1767, 1779, 1798, 1829, ++ 1793, 1800, 1811, 1533,10727, 1880,14283,10723,14283, 1907, ++ 1911, 1915, 1567, 701, 1921, 1075, 1691, 1560, 1847,10651, + 1927, 1936, 1861, 898, 1755, 1100, 1886, 1035, 1940, 1854, + +- 1110, 1931, 1944,10579, 1943,10468, 1293, 1945,14261, 1947, +- 1949,10428,10422, 1428, 1951, 1953, 0, 0, 0, 1825, +- 1030, 1825, 1905, 1476, 1927,14261,14261, 1959,10421,10418, +- 1960, 1963, 1970,14261, 2011,10343,10307, 1976, 1984, 2022, +- 10235, 1931, 1948, 1952, 1957, 1969, 1970, 1980,14261, 1991, ++ 1110, 1931, 1944,10611, 1943,10551, 1293, 1945,14283, 1947, ++ 1949,10550,10547, 1428, 1951, 1953, 0, 0, 0, 1825, ++ 1030, 1825, 1905, 1476, 1927,14283,14283, 1959,10490,10450, ++ 1960, 1963, 1970,14283, 2011,10444,10443, 1976, 1984, 2022, ++ 10436, 1931, 1948, 1952, 1957, 1969, 1970, 1980,14283, 1991, + 1991, 1990, 1993, 2049, 1991, 1991, 1993, 2041, 1987, 2000, +- 2013, 1633, 2010, 2006, 1669, 2017, 2019, 2016,14261, 2029, ++ 2013, 1633, 2010, 2006, 1669, 2017, 2019, 2016,14283, 2029, + 2016, 2028, 2049, 2046, 2043, 2049, 2073, 2072, 2066, 2052, +- 2058, 2063, 2086,14261, 2087, 2101, 2089, 2107, 1948, 2065, +- 2069,14261, 2102, 2096, 2092, 2109,14261, 2088, 2102, 2116, ++ 2058, 2063, 2086,14283, 2087, 2101, 2089, 2107, 1948, 2065, ++ 2069,14283, 2102, 2096, 2092, 2109,14283, 2088, 2102, 2116, + +- 14261, 2101, 2108,14261,14261, 2117, 2112, 2104, 2120, 2110, ++ 14283, 2101, 2108,14283,14283, 2117, 2112, 2104, 2120, 2110, + 2126, 2118, 2113, 2113, 2119, 2128, 2141, 2135, 2123, 2180, +- 10121,10131, 2194, 2205,10113, 2188, 9761, 9370, 2209, 2216, +- 9369, 2215, 9340, 9367, 2226, 2233, 2198, 2207, 2250, 2175, +- 2273, 856, 2282, 9405, 2224, 1994, 2291, 9365, 2306, 9336, +- 9363, 2369, 2242, 2378, 2206, 2387, 2399, 2422, 2431, 2456, +- 9401, 2259, 2285, 2413, 2482, 2491, 2500, 9361, 2260, 9332, +- 9359, 2351, 2365, 2197, 2276, 9330, 9357, 2452, 2329, 2467, +- 14261, 2250, 2259, 2277, 2276, 2286, 2272, 2284, 9385, 2269, +- 2278, 2303, 2336, 2358, 2356, 2511, 2375, 2405, 2396, 9384, +- +- 2398, 2399, 2407,14261, 2437, 2441, 2442, 2470, 2467, 2483, +- 2490, 9383, 2487, 2510, 2492, 2482, 2491, 2512, 2521, 2497, ++ 10337,10329, 2194, 2205,10261, 2188,10143,10153, 2209, 2216, ++ 10135, 2215, 9783, 9392, 2226, 2233, 2198, 2207, 2250, 2175, ++ 2273, 856, 2282, 9430, 2224, 1994, 2291, 9390, 2306, 9361, ++ 9388, 2369, 2242, 2378, 2206, 2387, 2399, 2422, 2431, 2456, ++ 9426, 2259, 2285, 2413, 2482, 2491, 2500, 9386, 2260, 9357, ++ 9384, 2351, 2365, 2197, 2276, 9355, 9382, 2452, 2329, 2467, ++ 14283, 2250, 2259, 2277, 2276, 2286, 2272, 2284, 9410, 2269, ++ 2278, 2303, 2336, 2358, 2356, 2511, 2375, 2405, 2396, 9409, ++ ++ 2398, 2399, 2407,14283, 2437, 2441, 2442, 2470, 2467, 2483, ++ 2490, 9408, 2487, 2510, 2492, 2482, 2491, 2512, 2521, 2497, + 2517, 2498, 2537, 2517, 2515, 2532, 2530, 2538, 2529, 2551, +- 9382, 9381, 2534, 2254, 2303, 2339, 2607, 2344, 2613, 2614, +- 2360, 2621, 9405, 2398, 2628, 1372, 2629, 2579, 2635, 9404, +- 2636, 2606, 2642, 2539, 2597, 9321, 9348, 9347, 2638, 9318, +- 9345, 2590, 2587, 2590, 2598, 9310, 2646, 9281, 9308, 9306, +- 2656, 9277, 9293, 92, 2601, 2601, 2622, 2609, 2608,14261, ++ 9407, 9406, 2534, 2254, 2303, 2339, 2607, 2344, 2613, 2614, ++ 2360, 2621, 9430, 2398, 2628, 1372, 2629, 2579, 2635, 9429, ++ 2636, 2606, 2642, 2539, 2597, 9346, 9373, 9372, 2638, 9343, ++ 9370, 2590, 2587, 2590, 2598, 9369, 2646, 9340, 9367, 9332, ++ 2656, 9303, 9330, 92, 2601, 2601, 2622, 2609, 2608,14283, + 2610, 2622, 2630, 2636, 2618, 2640, 2651, 2669, 2671, 2668, + 2633, 2650, 2651, 2672, 2676, 2659, 2685, 2679, 2672, 2690, + +- 14261, 2735, 2716, 9255, 2675,14261, 2689, 9254,14261, 2710, +- 2710, 2696, 2714, 2720, 2717, 2713, 9251, 2705, 2711, 2717, +- 2728, 2713, 2720, 2241, 2732, 2729, 2719, 9246, 2720, 2728, +- 2777, 2730, 2743,14261, 2777, 2742, 2735, 2752, 2748, 2745, +- 2760, 2761, 2761, 2777, 2762,14261, 2779, 2770, 2779, 2772, ++ 14283, 2735, 2716, 9327, 2675,14283, 2689, 9326,14283, 2710, ++ 2710, 2696, 2714, 2720, 2717, 2713, 9314, 2705, 2711, 2717, ++ 2728, 2713, 2720, 2241, 2732, 2729, 2719, 9277, 2720, 2728, ++ 2777, 2730, 2743,14283, 2777, 2742, 2735, 2752, 2748, 2745, ++ 2760, 2761, 2761, 2777, 2762,14283, 2779, 2770, 2779, 2772, + 2779, 2780, 2782, 2786, 2781, 2779, 2787, 1723, 2822, 2851, + 2402, 2848, 2855, 2818, 2857, 2866, 2864, 2875, 947, 2825, +- 2852, 9240, 2892, 42, 2865, 9199, 916, 9195,14261, 9230, +- 14261, 2891, 2886, 2915, 2924, 2945, 1309, 2975, 2873, 2927, +- 9223, 2968, 2993, 2989, 3033, 1837, 3037, 3058, 3046, 1847, ++ 2852, 9316, 2892, 42, 2865, 9276, 916, 9274,14283, 9312, ++ 14283, 2891, 2886, 2915, 2924, 2945, 1309, 2975, 2873, 2927, ++ 9309, 2968, 2993, 2989, 3033, 1837, 3037, 3058, 3046, 1847, + +- 3057,14261, 9222,14261, 989, 1878, 3090, 3094, 2817, 2909, ++ 3057,14283, 9308,14283, 989, 1878, 3090, 3094, 2817, 2909, + 3014, 2831, 2908, 2966, 2884, 2852, 2911, 2945, 2949, 2965, +- 2958, 2985, 3062,14261, 3048, 3051,14261, 9125, 3037, 3108, +- 3133, 3055, 3058, 3070,14261, 3081, 3088, 3099,14261, 3102, +- 3104, 3105, 3086, 3094, 3091, 8916, 3094, 3101, 3100, 3122, ++ 2958, 2985, 3062,14283, 3048, 3051,14283, 9249, 3037, 3108, ++ 3133, 3055, 3058, 3070,14283, 3081, 3088, 3099,14283, 3102, ++ 3104, 3105, 3086, 3094, 3091, 9264, 3094, 3101, 3100, 3122, + 3123, 3132, 3118, 3147, 3123, 3130, 3146, 3138, 3133, 3150, +- 3130, 3142, 3152, 3143, 3135, 8902, 3148, 3145, 3152, 3166, +- 3157, 3161, 3155, 3161, 3168,14261, 8855, 3156, 2949, 3010, +- 3075, 3028, 3076, 3232, 3217, 3233, 3239, 3240, 3245, 8863, ++ 3130, 3142, 3152, 3143, 3135, 9245, 3148, 3145, 3152, 3166, ++ 3157, 3161, 3155, 3161, 3168,14283, 9096, 3156, 2949, 3010, ++ 3075, 3028, 3076, 3232, 3217, 3233, 3239, 3240, 3245, 9063, + 3246, 3251, 3252, 3257, 3258, 3263, 3264, 2957, 3262, 3220, + +- 3264, 3224, 3210, 3234, 2907, 3269, 3265, 3275, 3268, 8804, +- 8705,14261, 3232, 3231,14261, 3252, 3253, 3250, 3246, 3246, ++ 3264, 3224, 3210, 3234, 2907, 3269, 3265, 3275, 3268, 8881, ++ 8857,14283, 3232, 3231,14283, 3252, 3253, 3250, 3246, 3246, + 3268, 3250, 3265, 3269, 3272, 3258, 3268, 3257, 3310, 3266, + 3272, 3297, 3305, 3288, 3294, 3297, 3300, 3301, 3307, 3309, +- 3311, 3321, 3307, 3319, 3318, 3329, 3320, 3321,14261, 3359, ++ 3311, 3321, 3307, 3319, 3318, 3329, 3320, 3321,14283, 3359, + 3316, 3328, 3376, 3323, 3331, 3336, 3354, 3365, 3369, 3361, +- 3357, 3370, 8622, 3375, 3377, 3363, 3366, 3371,14261, 3368, +- 3372, 3369, 3413, 3386, 3389,14261, 3391, 3381, 3381, 3388, +- 3410, 3419, 3401, 3403, 3414, 3416, 3428, 3414, 3420,14261, ++ 3357, 3370, 8865, 3375, 3377, 3363, 3366, 3371,14283, 3368, ++ 3372, 3369, 3413, 3386, 3389,14283, 3391, 3381, 3381, 3388, ++ 3410, 3419, 3401, 3403, 3414, 3416, 3428, 3414, 3420,14283, + 3422, 3423, 3440, 3428, 3439, 3438, 3438, 3445, 3436, 3439, + +- 3451, 3431, 8594, 8617, 8575, 8602, 8543, 3505, 3499, 1508, +- 8563, 8534, 3517, 3500, 3479, 3485, 1344, 3526, 3538, 3539, +- 3592, 3571, 3604, 3541, 3613, 8501, 8433, 3469, 8431, 3499, +- 8486, 3513, 3510,14261, 3512,14261, 3526, 3556, 3573, 3580, +- 3567, 8443, 3588, 3660, 3580, 3576, 3588, 3587, 3593,14261, +- 14261, 8426, 3590,14261, 3600, 3606, 8436, 0, 3599, 3587, ++ 3451, 3431, 8836, 8860, 8778, 8788, 8753, 3505, 3499, 1508, ++ 8725, 8688, 3517, 3500, 3479, 3485, 1344, 3526, 3538, 3539, ++ 3592, 3571, 3604, 3541, 3613, 8706, 8656, 3469, 8610, 3499, ++ 8666, 3513, 3510,14283, 3512,14283, 3526, 3556, 3573, 3580, ++ 3567, 8638, 3588, 3660, 3580, 3576, 3588, 3587, 3593,14283, ++ 14283, 8550, 3590,14283, 3600, 3606, 8565, 0, 3599, 3587, + 3607, 3609, 3612, 3599, 3609, 3669, 3633, 3624, 3642, 3656, +- 3654, 3668, 3672, 3672, 3662, 3673, 3672, 3675,14261, 3676, +- 3669, 3674, 3669, 3673, 8418, 3678, 3674, 3683, 3685, 8385, +- 18, 8345, 3561, 3567, 3577, 3585, 3654, 3720, 3719, 3747, ++ 3654, 3668, 3672, 3672, 3662, 3673, 3672, 3675,14283, 3676, ++ 3669, 3674, 3669, 3673, 8512, 3678, 3674, 3683, 3685, 8453, ++ 18, 8431, 3561, 3567, 3577, 3585, 3654, 3720, 3719, 3747, + +- 3748, 3753, 3754, 3759, 3666, 8286, 8299, 8259, 3687, 3714, +- 3718, 8285, 8233, 8244, 8145, 8148, 8155, 3717, 3727, 3732, +- 14261, 3733, 3720,14261, 3726, 3732, 3721, 3734, 3736, 3730, ++ 3748, 3753, 3754, 3759, 3666, 8319, 8259, 8173, 3687, 3714, ++ 3718, 8200, 8158, 8147, 8094, 8062, 8031, 3717, 3727, 3732, ++ 14283, 3733, 3720,14283, 3726, 3732, 3721, 3734, 3736, 3730, + 3734, 3731, 3734, 3738, 3749, 3730, 3751, 3752, 3743, 3744, + 3739, 3750, 3743, 3757, 3777, 3784, 3776, 3771, 3777, 3789, +- 3776, 3774, 3777, 3793, 3795, 3797, 3786, 3801, 3798,14261, +- 3789, 3800, 3805, 3792, 3783, 3794,14261, 3835, 3806, 2941, +- 3792, 3809, 3811, 8166, 3817, 3830, 3831, 3828, 8052, 3823, +- 3830, 3848, 3833, 8047, 3839, 8046, 3855, 3841, 3843, 3850, +- 3855, 3857, 3857, 8038, 3848,14261, 3855, 3845, 3849, 3860, ++ 3776, 3774, 3777, 3793, 3795, 3797, 3786, 3801, 3798,14283, ++ 3789, 3800, 3805, 3792, 3783, 3794,14283, 3835, 3806, 2941, ++ 3792, 3809, 3811, 7988, 3817, 3830, 3831, 3828, 7987, 3823, ++ 3830, 3848, 3833, 7986, 3839, 7834, 3855, 3841, 3843, 3850, ++ 3855, 3857, 3857, 7822, 3848,14283, 3855, 3845, 3849, 3860, + +- 3850, 3862, 3866, 3879, 3885, 3898, 3900, 3891, 3903,14261, ++ 3850, 3862, 3866, 3879, 3885, 3898, 3900, 3891, 3903,14283, + 3886, 3903, 3907, 3884, 3896, 3891, 3897, 3909, 3913, 3927, +- 2307, 1689, 8052, 3928, 3971, 1903, 8033, 3964, 2395, 3989, +- 1749, 2447, 4015, 3931, 3914, 3955,14261, 3906, 3942, 3946, +- 3939, 3948, 3956, 3973, 3967, 0, 4033, 3957,14261, 3969, +- 3988, 3974, 4005, 3991, 4031, 4008, 4016, 4009, 8026, 4005, +- 7994, 7851, 7846, 7839, 7838, 4005, 4072, 4006, 7778, 7774, ++ 2307, 1689, 7858, 3928, 3971, 1903, 7803, 3964, 2395, 3989, ++ 1749, 2447, 4015, 3931, 3914, 3955,14283, 3906, 3942, 3946, ++ 3939, 3948, 3956, 3973, 3967, 0, 4033, 3957,14283, 3969, ++ 3988, 3974, 4005, 3991, 4031, 4008, 4016, 4009, 7787, 4005, ++ 7769, 7762, 7749, 7745, 7703, 4005, 4072, 4006, 7602, 7599, + 4018, 4010, 4024, 4014, 4026, 4030, 4041, 4045, 4030, 4052, +- 14261, 4072, 4055, 4057, 4079,14261, 4076, 4070, 4065, 4079, +- 4071, 4066, 966, 7741, 2483, 0, 3948, 3952, 4060, 3997, ++ 14283, 4072, 4055, 4057, 4079,14283, 4076, 4070, 4065, 4079, ++ 4071, 4066, 966, 7528, 2483, 0, 3948, 3952, 4060, 3997, + +- 4061, 3276, 4084, 4075, 7722, 7709, 4085, 4076, 4066, 4080, ++ 4061, 3276, 4084, 4075, 7431, 7418, 4085, 4076, 4066, 4080, + 4077, 4074, 4080, 4083, 4077, 4094, 4085, 4097, 4089, 4121, + 4100, 4097, 4125, 4124, 4114, 4134, 4122, 4123, 4136, 4136, + 4140, 4125, 4140, 4133, 4128, 4145, 4136, 4176, 4140, 4151, + 4137, 4159, 4152, 4161, 4167, 4186, 4175, 4169, 4183, 4178, +- 4186, 4181, 4185, 4188, 4188, 4203, 4196, 4193, 4190,14261, +- 7684, 7676, 7507, 4206, 4193, 4208, 4208, 4196, 4237, 7415, +- 7396, 4213, 4232, 4240, 4261, 4231, 4222, 4234, 4229, 4237, ++ 4186, 4181, 4185, 4188, 4188, 4203, 4196, 4193, 4190,14283, ++ 7341, 7128, 7122, 4206, 4193, 4208, 4208, 4196, 4237, 7115, ++ 7106, 4213, 4232, 4240, 4261, 4231, 4222, 4234, 4229, 4237, + 4238, 4252, 4256, 4259, 4252, 4258, 4259, 4259, 4244, 4254, + 4275, 4252, 4273, 4265, 4276, 4273, 4289, 4295, 4302, 4302, + +- 4297, 4287, 4305,14261, 4290, 4299, 4302, 4292, 4325, 4361, +- 4371, 4291, 4309, 4314, 4316,14261, 4317, 4325, 4309, 4345, +- 4335, 4342, 4389, 2971, 7361, 4390, 4362, 7378, 7372, 4343, +- 4349, 4361, 4374, 4413, 4369, 4382,14261, 4373, 4374,14261, +- 4390,14261,14261,14261,14261, 7368, 4374, 4395, 4440, 7351, ++ 4297, 4287, 4305,14283, 4290, 4299, 4302, 4292, 4325, 4361, ++ 4371, 4291, 4309, 4314, 4316,14283, 4317, 4325, 4309, 4345, ++ 4335, 4342, 4389, 2971, 7086, 4390, 4362, 7114, 7110, 4343, ++ 4349, 4361, 4374, 4413, 4369, 4382,14283, 4373, 4374,14283, ++ 4390,14283,14283,14283,14283, 7085, 4374, 4395, 4440, 7064, + 4397, 4408, 4416, 4419, 4422, 4423, 4424, 4425, 4434, 4440, + 4432, 4420, 4441, 4445, 4425, 4445, 4442, 4452, 4453, 4454, +- 4443, 7114, 4350, 7145, 0, 4404, 4454, 4477, 7058, 2002, +- 4446, 4447, 4490,14261, 4462, 4454, 4466, 4476, 4487, 4462, ++ 4443, 7013, 4350, 7050, 0, 4404, 4454, 4477, 6983, 2002, ++ 4446, 4447, 4490,14283, 4462, 4454, 4466, 4476, 4487, 4462, + 4470, 4490, 4480, 4481, 4491, 4480, 4486, 4496, 4493, 4491, + + 4492, 4493, 4491, 4492, 4502, 4498, 4508, 4509, 4514, 4504, + 4514, 4501, 4524, 4531, 4518, 4524, 4532, 4534, 4544, 4545, + 4548, 4536, 4536, 4537, 4537, 4544, 4540, 4537, 4556, 4557, +- 4546, 4543, 4565, 4583, 4563, 4549, 4566,14261, 4559, 4560, +- 4549, 4576, 4572, 4575, 4594, 4580, 4583, 4585, 7068, 4591, +- 4589, 4604, 4594, 4595, 4593, 4608, 4651, 4627, 7064, 4611, +- 4615, 4602,14261, 4614, 4610,14261, 4620, 4609,14261,14261, +- 14261, 4603, 4624, 4644, 4644,14261, 4632, 4649, 4641, 4644, ++ 4546, 4543, 4565, 4583, 4563, 4549, 4566,14283, 4559, 4560, ++ 4549, 4576, 4572, 4575, 4594, 4580, 4583, 4585, 6732, 4591, ++ 4589, 4604, 4594, 4595, 4593, 4608, 4651, 4627, 6708, 4611, ++ 4615, 4602,14283, 4614, 4610,14283, 4620, 4609,14283,14283, ++ 14283, 4603, 4624, 4644, 4644,14283, 4632, 4649, 4641, 4644, + 4643, 4657, 4647, 4647, 4648, 4665, 4667, 4665, 4663, 4671, + 4660, 4678, 4701, 4687, 4667, 4679, 4684, 4690, 4708, 4726, + +- 7090, 4714, 4699,14261, 4698, 4714, 4715, 4717, 4716, 4709, +- 7053, 4780, 7020, 4742, 7040, 4707, 0,14261, 7007, 4725, +- 4715, 4782, 4716, 4731, 4735, 4735, 4763, 7005, 4745, 4782, +- 14261, 7003, 4743, 4823, 4789, 4791, 4778, 4783, 4780, 4786, +- 4787, 4783, 4800,14261, 4804, 4797, 4830, 4834, 4831, 4834, +- 4833, 4833, 4840, 4827, 4828, 4823, 4827, 4860, 6660, 6636, +- 6432, 4826, 4834, 0, 4815, 4832, 4837,14261, 4838, 4839, ++ 6716, 4714, 4699,14283, 4698, 4714, 4715, 4717, 4716, 4709, ++ 6682, 4780, 6678, 4742, 6711, 4707, 0,14283, 6668, 4725, ++ 4715, 4782, 4716, 4731, 4735, 4735, 4763, 6490, 4745, 4782, ++ 14283, 6475, 4743, 4823, 4789, 4791, 4778, 4783, 4780, 4786, ++ 4787, 4783, 4800,14283, 4804, 4797, 4830, 4834, 4831, 4834, ++ 4833, 4833, 4840, 4827, 4828, 4823, 4827, 4860, 6311, 6300, ++ 6295, 4826, 4834, 0, 4815, 4832, 4837,14283, 4838, 4839, + 4840, 4841, 4856, 4841, 4857, 4868, 4881, 4877, 4871, 4886, + 4875, 4879, 4875, 4891, 4886, 4887, 4898, 4893, 4876, 4882, + 4886, 4894, 4901, 4937, 4887, 4893, 4893, 4896, 4909, 4909, + + 4900, 4918, 4919, 4934, 4931, 4923, 4942, 4939, 4977, 4945, +- 4946, 4949, 4947, 4952, 4949,14261, 4947, 4943, 4976,14261, +- 4962, 4962, 4964, 4959, 4966, 4967, 4976, 4979, 4982, 6306, +- 4989,14261, 4985, 4992, 4979, 4984, 4998, 4988, 4989, 5008, +- 4995, 5002, 5007, 5004, 5009, 4997, 4998,14261, 5044, 5013, +- 5007, 5007,14261, 5013, 5020,14261,14261,14261,14261, 5025, +- 6293, 5013, 5013, 5037, 5031,14261, 5046, 5042, 5043, 5053, +- 5047, 5054,14261,14261, 5058, 5077,14261, 5063, 5057, 5058, ++ 4946, 4949, 4947, 4952, 4949,14283, 4947, 4943, 4976,14283, ++ 4962, 4962, 4964, 4959, 4966, 4967, 4976, 4979, 4982, 6199, ++ 4989,14283, 4985, 4992, 4979, 4984, 4998, 4988, 4989, 5008, ++ 4995, 5002, 5007, 5004, 5009, 4997, 4998,14283, 5044, 5013, ++ 5007, 5007,14283, 5013, 5020,14283,14283,14283,14283, 5025, ++ 6091, 5013, 5013, 5037, 5031,14283, 5046, 5042, 5043, 5053, ++ 5047, 5054,14283,14283, 5058, 5077,14283, 5063, 5057, 5058, + 5061, 5057, 5067, 5075, 5106, 5088, 5070, 5071, 5111, 5084, +- 5084, 5091, 5101, 5096, 5104, 5177, 6317, 5139, 5140, 6218, ++ 5084, 5091, 5101, 5096, 5104, 5177, 6132, 5139, 5140, 6108, + +- 6110, 5146, 5121, 5125,14261, 5128, 5136, 5124, 5133, 5127, +- 5134,14261, 5142, 5140, 5160, 5159, 5223, 6095, 5165, 5158, +- 14261, 5155, 5171, 5174, 5176, 5177, 5173, 5178, 5174, 5175, ++ 6059, 5146, 5121, 5125,14283, 5128, 5136, 5124, 5133, 5127, ++ 5134,14283, 5142, 5140, 5160, 5159, 5223, 5994, 5165, 5158, ++ 14283, 5155, 5171, 5174, 5176, 5177, 5173, 5178, 5174, 5175, + 5173, 5193, 5201, 5215, 5210, 5225, 5233, 5230, 5218, 5231, +- 5221, 5237, 5238, 5229, 2600, 5933, 5276, 5920, 5304,14261, +- 5230, 5788, 5225, 5241, 5237, 5255, 5273, 5281, 5274, 5275, +- 5272, 5278, 5284, 5269, 5282, 5277, 5772, 5213, 5286, 5293, +- 5293, 5275, 5276, 5284, 5290,14261, 5292, 5300, 5297, 5288, ++ 5221, 5237, 5238, 5229, 2600, 5963, 5276, 5961, 5304,14283, ++ 5230, 5977, 5225, 5241, 5237, 5255, 5273, 5281, 5274, 5275, ++ 5272, 5278, 5284, 5269, 5282, 5277, 5787, 5213, 5286, 5293, ++ 5293, 5275, 5276, 5284, 5290,14283, 5292, 5300, 5297, 5288, + 5361, 5303, 5286, 5307, 5308, 5309, 5334, 5334, 5327, 5334, + 5343, 5341, 5338, 5334, 5335, 5329, 5379, 5331, 5340, 5346, + +- 5348, 5353, 5355, 5342, 5347, 5361, 5376,14261, 5350, 5356, ++ 5348, 5353, 5355, 5342, 5347, 5361, 5376,14283, 5350, 5356, + 5347, 5350, 5378, 5379, 5365, 5369, 5375, 5378, 5386, 5425, +- 5401, 5390, 5390, 5393, 5394, 5397, 5399, 5405, 5402, 5418, +- 5410, 5423, 5439, 5433, 5431, 5437, 5445, 5443, 5445, 5459, +- 5451, 5450, 5453, 5468, 5456, 5472,14261, 5721, 5473, 5473, +- 5468, 5475, 5742,14261, 5655,14261, 5473, 5472, 5484, 5475, +- 5466, 5473, 5493, 5492, 5482,14261,14261, 5478, 5494, 1035, +- 1169, 5492, 5490, 5163, 5532, 5534, 5515, 5520, 5512, 5512, +- 5524, 5512, 5527, 5524, 5538, 5526, 5214,14261, 5551, 5559, +- 5560,14261,14261, 5536, 5525, 5524, 5530, 5538, 5544, 5536, +- +- 5540, 5549, 5543, 5547, 5606, 5669, 5564, 5567, 5583, 5599, +- 5576, 5578, 5604, 0, 5603, 5605, 5591, 5614, 5605, 5618, +- 5619, 5605,14261, 5621, 5622, 5623, 5636, 5640, 5628, 5636, +- 5655, 5659, 5655, 5650, 5670,14261, 5655, 5671, 5673, 5674, +- 5671, 5562, 5556, 5709, 1883, 5658, 5714, 5717, 5680,14261, +- 5684, 5669, 5678, 5691, 5773, 5688, 5687, 5694, 5690, 5697, +- 5693, 5709, 5701, 5700, 5700, 5428, 5741, 5720, 5723, 5710, +- 5711, 5717, 5717, 5717, 5721, 5710, 5730, 5434, 0, 5748, +- 5746, 5751, 5765, 5754, 5751, 5750, 5749, 5756, 5753, 0, +- 5767, 5768, 5774, 5760, 0, 5810, 5767, 5787, 5772, 5794, +- +- 5804, 5838, 5798, 5809, 5802,14261, 5821, 5809, 5571, 5583, +- 5811, 5810, 5806, 5822, 5827, 5810, 5826, 5816, 5814, 5832, +- 5826, 5831, 5825, 5835, 5835, 5844, 5842, 5832, 5828, 5842, +- 14261,14261,14261,14261, 5850, 5863, 5863, 5845, 5860, 5873, +- 5875, 5875, 5873, 5862, 5554, 5879, 5870, 5884, 5871, 5886, +- 14261,14261,14261,14261, 5883, 5871,14261, 5873, 5575,14261, +- 14261, 5887, 5882,14261, 5883, 5880, 5897, 5883, 5895, 5892, +- 5899,14261, 1446, 1625,14261, 2350,14261, 5904, 5909, 5916, +- 5391, 5389, 5942, 5374, 5944,14261, 5908, 5927, 5928, 5919, +- 5935, 5929, 5924, 5922, 5930, 250, 5976, 5400, 5278, 5164, +- +- 5959, 5160, 5961, 5935, 5940, 5947, 5939, 5942, 5938, 5945, +- 5949,14261, 5973, 5956, 5962, 6001, 5967, 5963, 5984, 5995, +- 5985, 5985, 6000, 6005, 6002, 6010, 6009, 5997, 6010, 5998, +- 6001, 0, 6005, 6006, 6014,14261, 6019,14261,14261, 5999, +- 14261, 6009, 6010, 6016, 5181, 6016, 6019, 6021, 6014, 6022, +- 6025, 6030,14261,14261, 6034,14261, 6053, 5112, 6094, 5005, +- 6099, 6032, 6063,14261, 6063, 6056, 6104, 6105, 6069, 6073, +- 6085, 6082, 6069, 6065, 6072, 6122, 6081, 6080, 6095, 6081, +- 6083, 6094, 6092, 6102, 0, 6136, 6162, 6107, 6100, 6119, +- 6120, 6121, 6116, 6133, 6138,14261, 6171, 6129, 4814, 6133, +- +- 6142, 6145, 6136, 6149, 6146, 6147, 6152, 6138, 6155, 0, +- 6147, 6153, 6148, 6162, 4808, 6153, 6151, 6196, 6164, 6158, +- 6224, 6175, 6174, 6175, 6168, 6182,14261,14261, 6189, 6184, +- 4756, 6182, 4738, 6216, 6191,14261, 6186, 6198, 6191, 6200, +- 6212, 6195, 4726, 6199, 6206, 6207, 6203, 6210, 6223,14261, +- 6207, 6222, 6215, 4611, 6221, 6217, 6227,14261, 6219, 6221, +- 6219, 6217, 6223, 6246, 6234, 6236, 6243, 6245, 6262,14261, +- 14261, 6261, 6267, 6264,14261, 6264, 6268, 6269, 4392, 2671, +- 14261, 6274, 6271, 4385, 4371, 4190, 6295, 4171, 6297, 6298, +- 6261, 6274, 6269, 6265, 6272, 6274, 6268,14261, 6267, 4036, +- +- 6351, 6311, 6313, 6355, 6367, 6371, 3982, 3980, 3899, 6324, +- 3943, 6335, 6337, 6293, 3936, 6310, 6317, 6334, 6325, 6328, +- 14261, 6347, 6353, 6345,14261, 6356, 6354, 6363, 6362, 6350, +- 6365, 6352, 6356, 6358, 6357, 6358, 6362, 6366, 6369, 6376, +- 6373, 6386, 6388, 6388, 6396, 6399, 6405, 6409, 3814, 6409, +- 3707, 6409, 6397, 6412, 6406, 6409, 6418, 6409, 6409, 3607, +- 6455,14261, 3600, 6460,14261, 6414, 6420, 6428, 6435, 0, +- 0, 6333, 6423, 6431, 6428, 6430, 6441, 6440, 6440, 6451, +- 6486, 6440, 6453,14261, 6465, 6447, 6465, 6471, 6457, 3643, +- 0, 0, 6453, 6468, 6467, 6477, 6478, 6479,14261, 6473, +- +- 6521, 6478,14261, 6490, 6485, 6484, 6506,14261, 6491, 6499, +- 6511, 6543, 6515, 6520, 6508, 6519, 6509,14261, 6510, 6520, +- 6556, 6517, 6528, 0, 6570, 1544, 6524, 3586, 6524, 6541, +- 6544, 6536, 6536, 6547, 6551, 6556,14261, 6551, 6565, 6553, +- 6562, 6568, 6565, 6568, 6572, 6563, 6558, 6573, 6570, 6571, +- 6580, 3535, 3523, 6563, 6584, 6574, 6585, 6590, 6574, 6595, +- 6599, 6603,14261, 6606, 6607, 6600, 6595, 6599, 6606,14261, +- 6613, 6611, 6606,14261, 6612, 6612, 6623, 6617, 6617, 6628, +- 6652, 6653,14261, 6622, 6636, 6633, 6637, 6637, 6641,14261, +- 3546, 6663, 6696, 6700, 3468, 6685, 6694, 6701, 6661, 6719, +- +- 6731, 6754, 652, 6760, 6766, 3506, 6665, 6707, 6680, 6677, +- 6686,14261, 6711, 6714, 6703, 6710, 6710, 6720, 6728, 6736, +- 6740, 6742, 6751, 6747, 6742, 6754, 6757, 6759, 6749,14261, +- 6766, 6761, 6766, 6767, 6753, 6771, 6770, 6756, 6758, 6777, +- 6771, 6782, 6772,14261, 6777, 6800, 6790, 6805, 6802, 6809, +- 14261, 6814, 6803,14261, 3497, 0, 6804, 6813, 6806, 6800, +- 6816, 6804, 6818, 6810, 0, 0, 6817, 6820, 6808, 6828, +- 6827, 6811, 6831,14261, 3416, 6829, 6820, 6831, 6683, 6735, +- 14261, 6827, 6818, 0, 6739, 6847, 6848, 6890, 6865, 6842, +- 6868, 6866, 6847, 6901, 6878, 6881, 6863, 6879, 6860, 6882, +- +- 6886, 6879, 0, 0, 6881, 6876, 6883, 1551, 3362, 3034, +- 6888, 6879, 6711, 6882, 3348, 6919, 6899, 6903, 6902, 6905, +- 6924, 6914, 6924, 3240, 3233, 6916, 6926, 6921, 6925, 6926, +- 6950, 6935, 6936, 6920, 6936, 6929, 6924, 6932, 6941, 6928, +- 6936, 6933,14261, 6939, 6934, 6946, 6946, 6962, 6953, 6961, +- 6960, 6967, 6968, 6982, 6983, 6983, 6973, 6976, 6987, 6977, +- 7012, 6990, 6978, 6978, 6973, 3220, 7000, 7056, 7017, 749, +- 7060, 7068, 7079, 7091, 3231, 3179, 7047, 7070, 7076, 7078, +- 1915, 7109, 942, 7127, 7138, 7139, 7147, 6735, 7158, 7170, +- 7045, 3206, 3205, 7003,14261, 7017, 7014, 7038, 7045, 7061, +- +- 7072, 7082, 7082, 3113, 7122, 7122,14261, 7129,14261, 7129, +- 14261, 7134, 7130, 7143,14261, 7144, 7135, 7148, 7148, 7150, +- 7152, 7143, 7155, 7148, 7154, 7157,14261,14261,14261, 7168, +- 7157, 7171,14261, 7166, 7169, 7182, 7168, 7166, 7189,14261, +- 7175, 3117, 7181, 7181, 7195, 7182, 7184, 7038, 7187,14261, +- 7194, 7193, 7198, 7242, 7252,14261,14261, 7195, 7210, 0, +- 7219, 7222, 7212, 7212, 7227, 7222, 7237, 7225, 7270, 7242, +- 0, 7286, 7223, 7226, 7225, 7285, 7243, 7231, 7264, 7257, +- 3100, 7257, 7269, 7263, 3002, 3311, 3029, 7262, 7272,14261, +- 7084, 7263,14261, 7271, 7272, 7262, 7270, 7276, 7286, 7291, +- +- 7281, 7293, 7298, 7288, 7284, 7296, 7292, 7293,14261, 7293, +- 7291, 7309, 7300, 7305, 7310, 7321, 7315, 7344, 7327, 7350, +- 7326,14261, 7321, 7324, 7330,14261, 7329, 2968, 7344, 7350, +- 7341,14261, 7341, 7355, 7358, 7346, 7359, 2991, 7343, 7344, +- 7364,14261, 7342, 7367, 1445, 7422, 2883, 7399, 7400, 7375, +- 7428, 7434, 7440, 7459, 2890, 7419, 7438, 2039, 7463, 7447, +- 7475, 7494,14261, 2872, 7412, 7415, 7423, 2765, 7450, 2682, +- 7449, 2660, 7454, 7449, 7463, 7454,14261, 7463, 7448, 7454, +- 7471, 7462, 7455, 7457, 7463,14261, 7464, 7466, 7487, 7469, +- 14261, 7493, 7475, 7493, 7484, 7484, 7535, 7508, 7507, 7502, +- +- 14261, 7513, 7518, 7508, 7519, 7517, 7566, 7535, 7556,14261, +- 7535, 0, 7558, 0, 7593, 7526, 7525, 2612, 7540, 7547, +- 7538, 7538, 7553, 7563, 7568, 7565, 7566, 7573, 7616, 7582, +- 7568, 7588, 2576, 7581, 7585, 7575, 7608, 7581, 7587, 7593, +- 7595,14261, 7592, 7611, 7614, 4759, 7602, 7599,14261, 7618, +- 7610, 7624,14261, 7617, 7628,14261, 7616, 7629, 7630, 7632, +- 7625, 7630, 2425, 7636, 7636, 7635, 7631, 2424, 7637, 7628, +- 7641, 7631,14261, 7644,14261, 7638,14261,14261, 7640,14261, +- 2387, 7685, 7644,14261, 7645,14261, 7655, 7671, 7677, 7671, +- 7667, 7684, 7674,14261, 7671, 7689, 7689, 7675, 7685, 7677, +- +- 7725, 7726, 2880, 7755, 7759, 7763, 7729, 7788, 7789, 2931, +- 7819, 7820, 7673, 7696, 7731, 7743, 7733, 2418, 7742, 7738, +- 7748,14261, 7735, 7741, 7775, 7777, 7775, 7780,14261,14261, +- 7790, 7795, 7780, 7780, 7610, 7798, 7802,14261, 7848, 7793, +- 7805, 7810, 7798, 7794, 7813, 7812, 7814, 7869, 7820, 7881, +- 7848, 2414, 7839, 7873, 0, 7843, 7862, 7864, 7866, 7872, +- 7875, 7882, 7873, 7874, 7883, 7909, 7724, 7882, 7883,14261, +- 7877, 7888, 7889, 0, 7771, 7877, 7893, 7906, 7858, 7891, +- 7951, 7906, 7918, 7923, 7903, 7432, 7910, 7913, 7913, 7908, +- 2315, 7914, 7930, 7932, 7927, 7935, 2192,14261, 2188, 7927, +- +- 7938, 7939, 7930,14261, 2176, 7926, 7946, 7947, 7965,14261, +- 7936,14261, 7936, 7949, 7949, 7954, 7962, 7964, 7972, 7979, +- 2198, 7969, 7983, 7972, 7984, 7988, 7983, 8021, 8020, 8050, +- 8015, 8051, 8069, 7981, 8009, 8019, 8018, 8028, 2208,14261, +- 8009,14261, 8036,14261, 8034, 8028, 8029, 8037, 8048,14261, +- 8040, 8097, 8032, 8051, 8096, 8107, 8037, 8091, 8099, 8099, +- 8100, 8111, 8116, 8112, 8112, 8145, 8113,14261, 8111, 8171, +- 8125, 0, 8130, 8125, 8132, 8146, 8131, 8157, 8165, 8162, +- 8169,14261, 8088, 8089, 8104, 8161, 8156, 8205, 8165, 8163, +- 8177, 8212, 8213, 8233,14261, 8166,14261, 8184,14261, 8182, +- +- 14261, 7542, 2155, 8179, 8187, 8178, 7845, 8197, 8192, 8223, +- 8194, 8201, 8198, 8228, 8215, 8231, 8229, 8225, 8229, 8240, +- 8221, 8246, 8241, 8241,14261, 8236, 8242, 8244, 8239, 8245, +- 8271, 8252, 8253, 8259, 2165, 8256, 8264, 8317, 8267, 8279, +- 8284, 2063, 8262,14261, 8290,14261,14261,14261, 8294,14261, +- 8278, 8339, 8365, 8326, 8362, 8291, 8308, 8309, 8299, 8302, +- 8313, 8312,14261, 8331, 8338,14261, 8400, 8349, 8371, 8356, +- 8361, 8373, 8409, 8378, 8366, 8366, 8367, 0, 8331, 8332, +- 8444, 8396, 8397, 8445, 8395, 8385, 8396, 2064, 8333, 8459, +- 8450, 8382,14261,14261,14261, 8413, 8400, 8414, 8439,14261, +- +- 8439, 8449, 8457, 8462, 8444, 8461, 2002, 8449, 1997,14261, +- 8450,14261, 8464, 8465, 8457, 8456, 8460,14261, 1966, 8467, +- 8461, 3532, 8469, 8463, 8505, 8467, 8498, 8513, 0, 1807, +- 8499, 8502, 8517, 8519, 1759, 8519, 8507, 8506, 8543, 8565, +- 8591,14261, 8521, 8524, 8528, 8507, 8539, 8528, 8555, 8508, +- 8549, 8546, 8548,14261, 8555, 8558, 8619, 8572, 8558, 8559, +- 8625, 8554, 1709, 8645, 0, 1652, 8646, 0, 8574, 8579, +- 5041, 8616, 8619, 8613, 8666, 8676, 8685,14261, 8615, 8675, +- 8670,14261, 8680, 1579, 8682, 8686, 8670, 8674, 8677, 8678, +- 8677, 8691, 8676, 8676, 8677, 8690, 8693, 8694,14261, 1374, +- +- 8693, 3983,14261, 4005, 8694, 8729, 8719, 8723, 8724, 0, +- 0, 8742,14261, 8727, 8741,14261,14261, 8775, 8786, 8713, +- 8755, 8554, 8743, 8814, 8555, 0, 8739, 8656, 8744, 8746, +- 8756, 8741, 8747, 8823, 8748, 8785,14261, 8849, 8795, 8783, +- 1313, 1065, 8791, 8838, 7557, 1008, 7972, 8781, 8799, 8817, +- 8873, 8817, 8824, 8844,14261, 8847, 8844, 8850, 8835, 8836, +- 8848, 8850, 8853, 8857, 8858, 8214, 8425, 8854,14261, 8857, +- 14261, 989, 4343,14261, 4654, 8877, 914, 8869, 0, 8864, +- 14261, 8872, 8920, 8935, 0, 0, 0,14261, 8871, 8662, +- 8874, 8933, 8663, 0, 0, 8776, 0, 8898, 8889, 8896, +- +- 8901, 8906, 8906, 8923, 8955, 8913, 8929,14261,14261, 8931, +- 8933, 8919, 8939, 879, 8105, 876, 8944, 8934, 8936, 8936, +- 8937, 8939, 8935, 8950, 8962,14261, 8960, 8967, 8952,14261, +- 8951, 8955,14261,14261, 8966, 8836,14261, 4752,14261, 8957, +- 14261, 8962, 8969,14261, 830, 8958, 0, 9036, 0, 9003, +- 0, 743, 8969, 8981, 8979, 8985, 8984, 8989, 8996, 9001, +- 9040, 8670, 8671, 9007, 9012, 9043, 9008, 9016,14261, 9021, +- 9022,14261, 9025, 9022, 9015, 9020, 9020, 9017, 9025, 670, +- 14261,14261, 9031, 9023, 9039, 9043,14261, 9026, 602, 0, +- 9054, 447, 9069,14261, 9029, 9034,14261, 9037, 9043, 9044, +- +- 9051, 9050, 8786, 9063, 9107, 9120, 8816, 9126, 9060, 9060, +- 9079, 9066, 9084,14261, 436, 9083, 9079, 9090, 9096, 9091, +- 9104, 461, 367, 9099, 9135,14261, 330, 9131, 366, 9100, +- 9098, 9105, 9102,14261, 9096, 9106, 0, 9149, 9110, 9154, +- 0, 9164, 0, 9174, 9180,14261, 9111,14261, 9119, 9133, +- 9139,14261, 9132, 9140, 9155, 9140, 9158, 9155, 0, 315, +- 9192, 9153, 9146, 9196, 9142, 9161, 9202,14261, 9167, 262, +- 254, 9206, 0, 9219, 0,14261, 9184, 9182, 9177, 9181, +- 9190, 9181, 9194, 9190, 9184, 9187, 9193, 0, 0, 143, +- 9240, 0, 9194, 9249, 9244, 9189, 9260, 9246,14261,14261, +- +- 138, 109, 9245, 9253, 9247,14261,14261, 9235,14261, 9256, +- 9247, 9251, 9252, 0, 43,14261, 9276, 9305, 9306, 9314, +- 9266,14261,14261, 9280, 9289, 9310,14261, 6, 9301, 9311, +- 14261,14261, 9333, 9359,14261,14261,14261, 9308,14261,14261, +- 9304, 9368, 9305, 9335, 9332, 9325,14261, 9337, 9365, 9367, +- 14261,14261, 9429, 9447, 9465, 9483, 9501, 9519, 9537, 9555, +- 9573, 9591, 9609, 9627, 9645, 9663, 9681, 9699, 9717, 9735, +- 9753, 9771, 9789, 9807, 9825, 9843, 9861, 9879, 9897, 9915, +- 9933, 9951, 9969, 9987,10005,10023,10041,10059,10077,10095, +- 10113,10131,10149,10167,10185,10203,10221,10239,10257,10275, +- +- 10293,10311,10329,10347,10365,10383,10401,10419,10437,10455, +- 10473,10490,10508,10526,10544,10562,10580,10597,10615,10633, +- 10651,10669,10687,10705,10723,10741,10759,10777,10795,10813, +- 10831,10849,10867,10885,10903,10921,10939,10957,10975,10993, +- 11011,11028,11046,11064,11082,11100,11118,11136,11154,11171, +- 11189,11207,11225,11243,11261,11279,11297,11315,11333,11351, +- 11369,11387,11405,11423,11441,11459,11477,11495,11512,11530, +- 11548,11566,11584,11602,11620,11637,11655,11673,11691,11709, +- 11727,11745,11763,11781,11799,11817,11835,11853,11871,11889, +- 11907,11925,11943,11960,11978,11996,12014,12032,12050,12068, +- +- 12086,12104,12122,12140,12151,12165,12183,12191,12207,12224, +- 12228,12244,12262,12272,12288,12306,12324,12342,12359,12375, +- 12393,12411,12429,12447,12465,12482,12498,12516,12525,12541, +- 12559,12577,12595,12612,12620,12635,12651,12668,12686,12704, +- 12722,12740,12758,12776,12794,12812,12830,12848,12858,12866, +- 12881,12896,12907,12915,12923,12939,12955,12971,12988,13006, +- 13024,13042,13060,13078,13096,13114,13132,13150,13168,13186, +- 13204,13222,13240,13258,13271,13279,13287,13295,13306,13322, +- 13338,13346,13354,13370,13388,13406,13424,13442,13460,13478, +- 13496,13514,13532,13550,13568,13584,13600,13618,13636,13646, +- +- 13662,13678,13691,13709,13726,13743,13760,13771,13787,13804, +- 13821,13833,13849,13867,13884,13902,13919,13937,13954,13970, +- 13987,13997,14013,14030,14048,14065,14083,14101,14118,14135, +- 14153,14165,14181,14198,14215,14226,14242 ++ 5401, 5390, 5390, 5394, 5395, 5399, 5402, 5406, 5403, 5421, ++ 5420, 5428, 5446, 5437, 5432, 5439, 5449, 5445, 5449, 5465, ++ 5453, 5453, 5458, 5472, 5458, 5476,14283, 5734, 5478, 5476, ++ 5470, 5478, 5785,14283, 5753,14283, 5477, 5475, 5486, 5478, ++ 5469, 5475, 5495, 5494, 5482,14283,14283, 5485, 5498, 1035, ++ 1169, 5493, 5496, 5163, 5528, 5538, 5521, 5524, 5518, 5518, ++ 5529, 5518, 5532, 5527, 5540, 5529, 5214,14283, 5545, 5555, ++ 5563,14283,14283, 5539, 5528, 5527, 5533, 5541, 5546, 5537, ++ ++ 5541, 5549, 5538, 5566, 5625, 5602, 5547, 5555, 5598, 5591, ++ 5591, 5592, 5607, 0, 5607, 5609, 5600, 5619, 5608, 5622, ++ 5636, 5622,14283, 5638, 5639, 5640, 5641, 5643, 5631, 5637, ++ 5647, 5651, 5646, 5642, 5661,14283, 5645, 5661, 5663, 5674, ++ 5671, 5684, 5579, 5709, 1883, 5712, 5725, 5728, 5678,14283, ++ 5686, 5678, 5685, 5696, 5784, 5692, 5691, 5695, 5692, 5699, ++ 5695, 5710, 5702, 5699, 5700, 5428, 5749, 5717, 5721, 5709, ++ 5710, 5717, 5716, 5720, 5733, 5724, 5731, 5434, 0, 5756, ++ 5753, 5751, 5765, 5754, 5751, 5750, 5749, 5757, 5758, 0, ++ 5773, 5774, 5780, 5763, 0, 5441, 5768, 5784, 5768, 5775, ++ ++ 5786, 5845, 5791, 5802, 5808,14283, 5821, 5809, 5602, 5838, ++ 5811, 5811, 5807, 5824, 5833, 5818, 5834, 5824, 5822, 5840, ++ 5833, 5838, 5830, 5839, 5838, 5847, 5852, 5854, 5842, 5838, ++ 5853,14283,14283,14283,14283, 5846, 5860, 5859, 5852, 5867, ++ 5874, 5876, 5877, 5875, 5865, 5574, 5886, 5879, 5893, 5880, ++ 5895,14283,14283,14283,14283, 5892, 5880,14283, 5881, 5613, ++ 14283,14283, 5895, 5888,14283, 5889, 5884, 5905, 5893, 5906, ++ 5903, 5910,14283, 1446, 1625,14283, 2350,14283, 5903, 5907, ++ 5914, 5543, 5537, 5745, 5536, 5948,14283, 5914, 5927, 5928, ++ 5919, 5936, 5930, 5926, 5928, 5937, 250, 5983, 5402, 5372, ++ ++ 5278, 5968, 5164, 5969, 5943, 5948, 5951, 5942, 5945, 5951, ++ 5957, 5947,14283, 5970, 5955, 5962, 6023, 5967, 5965, 5988, ++ 5984, 5980, 5988, 6007, 6004, 6014, 6022, 6021, 6009, 6022, ++ 6009, 6014, 0, 6018, 6019, 6027,14283, 6034,14283,14283, ++ 6014,14283, 6024, 6025, 6028, 5191, 6028, 6031, 6033, 6026, ++ 6034, 6036, 6034,14283,14283, 6029,14283, 6050, 5150, 6107, ++ 5112, 6111, 6034, 6063,14283, 6083, 6051, 6014, 6119, 6076, ++ 6081, 6088, 6092, 6078, 6074, 6081, 6129, 6088, 6084, 6100, ++ 6087, 6089, 6099, 6098, 6107, 0, 6169, 6170, 6110, 6100, ++ 6119, 6125, 6128, 6136, 6147, 6150,14283, 6183, 6141, 5055, ++ ++ 6147, 6156, 6158, 6148, 6159, 6156, 6157, 6162, 6148, 6164, ++ 0, 6156, 6162, 6157, 6171, 4814, 6162, 6159, 6206, 6171, ++ 6161, 6211, 6184, 6202, 6202, 6195, 6204,14283,14283, 6205, ++ 6197, 4757, 6194, 4756, 6227, 6201,14283, 6195, 6205, 6198, ++ 6207, 6219, 6199, 4738, 6203, 6210, 6206, 6213, 6210, 6216, ++ 6229,14283, 6213, 6227, 6219, 4726, 6232, 6228, 6248,14283, ++ 6247, 6248, 6246, 6240, 6246, 6263, 6248, 6251, 6254, 6255, ++ 6270,14283,14283, 6269, 6275, 6272,14283, 6270, 6274, 6275, ++ 4642, 2671,14283, 6281, 6278, 4392, 4400, 4326, 6302, 4235, ++ 6303, 6304, 6267, 6279, 6273, 6276, 6283, 6295, 6290,14283, ++ ++ 6288, 4168, 6361, 6336, 6329, 6367, 6373, 6382, 4036, 3985, ++ 3935, 6338, 3944, 6341, 6342, 6305, 3943, 6315, 6337, 6345, ++ 6341, 6351,14283, 6363, 6368, 6359,14283, 6370, 6367, 6375, ++ 6373, 6364, 6377, 6364, 6367, 6368, 6367, 6369, 6373, 6377, ++ 6378, 6386, 6382, 6393, 6403, 6399, 6411, 6413, 6421, 6425, ++ 3922, 6425, 3814, 6423, 6410, 6425, 6418, 6420, 6429, 6420, ++ 6422, 3676, 6466,14283, 3607, 6474,14283, 6428, 6426, 6434, ++ 6443, 0, 0, 6491, 6433, 6440, 6435, 6446, 6455, 6454, ++ 6456, 6468, 6510, 6455, 6468,14283, 6477, 6463, 6479, 6485, ++ 6473, 3650, 0, 0, 6468, 6482, 6483, 6494, 6496, 6492, ++ ++ 14283, 6491, 6538, 6490,14283, 6506, 6501, 6496, 6519,14283, ++ 6505, 6515, 6527, 6558, 6530, 6533, 6522, 6534, 6524,14283, ++ 6525, 6535, 6570, 6542, 6538, 0, 6586, 1544, 6534, 3592, ++ 6533, 6555, 6561, 6551, 6551, 6561, 6566, 6571,14283, 6563, ++ 6578, 6567, 6578, 6584, 6581, 6583, 6588, 6578, 6572, 6587, ++ 6574, 6586, 6587, 6596, 3586, 3535, 6581, 6601, 6594, 6603, ++ 6609, 6593, 6612, 6618, 6625,14283, 6622, 6624, 6616, 6611, ++ 6615, 6620,14283, 6628, 6628, 6623,14283, 6629, 6629, 6640, ++ 6634, 6633, 6643, 6668, 6669,14283, 6638, 6652, 6651, 6654, ++ 6657, 6659,14283, 3566, 6692, 6722, 6726, 3504, 6690, 6701, ++ ++ 6703, 6679, 6738, 6752, 6758, 652, 6770, 6789, 3510, 6685, ++ 6705, 6709, 6698, 6703,14283, 6721, 6726, 6720, 6734, 6738, ++ 6738, 6741, 6745, 6753, 6755, 6763, 6759, 6755, 6768, 6771, ++ 6773, 6763,14283, 6779, 6774, 6782, 6784, 6772, 6790, 6789, ++ 6775, 6779, 6800, 6795, 6805, 6798,14283, 6794, 6809, 6799, ++ 6814, 6815, 6821,14283, 6825, 6815,14283, 3514, 0, 6816, ++ 6826, 6820, 6814, 6831, 6819, 6833, 6824, 0, 0, 6834, ++ 6837, 6825, 6847, 6846, 6830, 6850,14283, 3497, 6850, 6843, ++ 6855, 6707, 6766,14283, 6850, 6844, 0, 6909, 6864, 6857, ++ 6899, 6892, 6850, 6879, 6877, 6860, 6915, 6886, 6893, 6875, ++ ++ 6894, 6875, 6903, 6908, 6902, 0, 0, 6903, 6899, 6906, ++ 1551, 3366, 3034, 6911, 6899, 6123, 6900, 3361, 6334, 6915, ++ 6919, 6905, 6908, 6930, 6923, 6934, 3348, 3240, 6927, 6940, ++ 6937, 6941, 6942, 6969, 3233, 6954, 6955, 6940, 6956, 6949, ++ 6944, 6952, 6963, 6951, 6958, 6953,14283, 6959, 6952, 6962, ++ 6962, 6978, 6963, 6968, 6966, 6975, 6979, 6993, 6994, 6994, ++ 6987, 6992, 7003, 6993, 7031, 7009, 6998, 6998, 6993, 3220, ++ 7017, 7077, 7039, 749, 7078, 7096, 7097, 7108, 3231, 3179, ++ 7057, 7088, 7093, 7104, 1915, 7134, 942, 7155, 7164, 7170, ++ 7176, 7042, 7185, 7196, 7061, 3206, 3205, 7031,14283, 7057, ++ ++ 7043, 7075, 7077, 7089, 7093, 7094, 7092, 3113, 7141, 7146, ++ 14283, 7156,14283, 7159,14283, 7160, 7152, 7169,14283, 7171, ++ 7162, 7176, 7172, 7177, 7177, 7168, 7180, 7170, 7180, 7184, ++ 14283,14283,14283, 7194, 7182, 7192,14283, 7191, 7196, 7209, ++ 7192, 7193, 7218,14283, 7202, 3117, 7208, 7208, 7220, 7210, ++ 7211, 7056, 7214,14283, 7221, 7221, 7222, 7076, 7269,14283, ++ 14283, 7222, 7233, 0, 7244, 7248, 7238, 7235, 7246, 7241, ++ 7264, 7243, 7127, 7258, 0, 7297, 7242, 7248, 7254, 7142, ++ 7272, 7261, 7283, 7276, 3100, 7276, 7287, 7280, 3002, 3311, ++ 3029, 7282, 7288,14283, 7043, 7279,14283, 7286, 7287, 7277, ++ ++ 7289, 7295, 7305, 7310, 7300, 7320, 7312, 7306, 7305, 7318, ++ 7317, 7318,14283, 7325, 7319, 7317, 7339, 7325, 7325, 7330, ++ 7342, 7334, 7365, 7348, 7369, 7342,14283, 7337, 7339, 7349, ++ 14283, 7348, 2968, 7363, 7373, 7363,14283, 7363, 7376, 7379, ++ 7368, 7381, 2991, 7367, 7368, 7388,14283, 7365, 7390, 1445, ++ 7448, 2883, 7427, 7136, 7400, 7459, 7463, 7471, 7489, 2890, ++ 7440, 7460, 2039, 7507, 7413, 7519, 7525,14283, 2872, 7398, ++ 7393, 7416, 2765, 7421, 2682, 7432, 2660, 7445, 7441, 7456, ++ 7463,14283, 7473, 7457, 7474, 7491, 7484, 7480, 7488, 7492, ++ 14283, 7493, 7495, 7514, 7497,14283, 7518, 7500, 7518, 7510, ++ ++ 7506, 7438, 7527, 7522, 7517,14283, 7527, 7532, 7523, 7531, ++ 7528, 7587, 7537, 7488,14283, 7540, 0, 7497, 0, 7596, ++ 7549, 7549, 2612, 7561, 7571, 7562, 7570, 7573, 7581, 7585, ++ 7580, 7581, 7588, 7632, 7588, 7586, 7605, 2576, 7599, 7602, ++ 7592, 7501, 7597, 7603, 7625, 7626,14283, 7623, 7630, 7636, ++ 4759, 7622, 7617,14283, 7635, 7625, 7639,14283, 7632, 7643, ++ 14283, 7631, 7644, 7645, 7647, 7640, 7645, 2425, 7651, 7651, ++ 7650, 7656, 7650, 2424, 7656, 7647, 7659, 7649,14283, 7661, ++ 14283, 7672,14283,14283, 7673,14283, 2387, 7701, 7679,14283, ++ 7685,14283, 7678, 7693, 7698, 7688, 7684, 7701, 7691,14283, ++ ++ 7688, 7706, 7706, 7692, 7702, 7694, 7769, 7760, 2880, 7780, ++ 7781, 7789, 7766, 7800, 7801, 2931, 7820, 7838, 7692, 7716, ++ 7762, 7780, 7770, 2418, 7782, 7778, 7791,14283, 7781, 7787, ++ 7799, 7802, 7802, 7805,14283,14283, 7818, 7821, 7806, 7806, ++ 7621, 7825, 7829,14283, 7741, 7821, 7831, 7837, 7825, 7821, ++ 7834, 7832, 7830, 7885, 7835, 7895, 7890, 2414, 7879, 7884, ++ 0, 7883, 7891, 7892, 7884, 7890, 7891, 7898, 7890, 7891, ++ 7900, 7917, 7748, 7908, 7909,14283, 7902, 7913, 7914, 0, ++ 7752, 7901, 7920, 7931, 7876, 7916, 7885, 7918, 7929, 7934, ++ 7914, 7416, 7921, 7924, 7930, 7925, 2315, 7931, 7946, 7948, ++ ++ 7941, 7949, 2192,14283, 2188, 7955, 7942, 7953, 7954, 7945, ++ 14283, 2176, 7941, 7970, 7971, 7978,14283, 7959,14283, 7959, ++ 7972, 7971, 7982, 7988, 7990, 7985, 7991, 2198, 7981, 7994, ++ 7990, 8002, 8006, 8001, 8055, 8029, 8066, 8027, 8067, 8078, ++ 7997, 8028, 8026, 8034, 8044, 2208,14283, 8033,14283, 8060, ++ 14283, 8057, 8050, 8053, 8060, 8064,14283, 8055, 8127, 8038, ++ 8067, 8124, 8135, 8053, 8072, 8058, 8058, 8059, 8068, 8074, ++ 8070, 8070, 8162, 8072,14283, 8129, 8188, 8143, 0, 8161, ++ 8145, 8152, 8162, 8147, 8156, 8164, 8161, 8166,14283, 8116, ++ 8214, 8216, 8158, 8153, 8230, 8171, 8184, 8198, 8234, 8235, ++ ++ 8244,14283, 8194,14283, 8212,14283, 8210,14283, 8116, 2155, ++ 8208, 8216, 8207, 8225, 8215, 8210, 8239, 8207, 8225, 8216, ++ 8225, 8240, 8233, 8254, 8252, 8248, 8249, 8258, 8239, 8264, ++ 8259, 8259,14283, 8254, 8260, 8262, 8259, 8265, 8292, 8273, ++ 8275, 8278, 2165, 8275, 8280, 8339, 8294, 8296, 8302, 2063, ++ 8279,14283, 8303,14283,14283,14283, 8306,14283, 8294, 8360, ++ 8386, 8236, 8383, 8296, 8308, 8309, 8299, 8318, 8328, 8326, ++ 14283, 8323, 8329,14283, 8406, 8341, 8401, 8386, 8391, 8402, ++ 8436, 8405, 8393, 8393, 8394, 0, 8348, 8396, 8443, 8414, ++ 8415, 8447, 8416, 8407, 8416, 2064, 8350, 8480, 8467, 8401, ++ ++ 14283,14283,14283, 8461, 8430, 8448, 8450,14283, 8459, 8468, ++ 8476, 8481, 8462, 8480, 8481, 2002, 8469, 1997,14283, 8470, ++ 14283, 8484, 8485, 8477, 8476, 8480,14283, 1966, 8488, 8483, ++ 3532, 8491, 8485, 8527, 8497, 8505, 8534, 0, 1807, 8520, ++ 8522, 8537, 8539, 1759, 8539, 8527, 8354, 8565, 8585, 8611, ++ 14283, 8543, 8546, 8550, 8358, 8561, 8564, 8576, 8387, 8571, ++ 8567, 8569,14283, 8572, 8579, 8639, 8593, 8578, 8579, 8647, ++ 8574, 1709, 8471, 0, 1652, 8528, 0, 8584, 8585, 5041, ++ 8618, 8634, 8628, 8666, 8694, 8703,14283, 8621, 8635, 8630, ++ 14283, 8640, 1579, 8642, 8646, 8632, 8636, 8639, 8635, 8641, ++ ++ 8662, 8699, 8684, 8684, 8685, 8699, 8702, 8703,14283, 1374, ++ 8702, 3983,14283, 4005, 8703, 8713, 8690, 8694, 8706, 0, ++ 0, 8724,14283, 8709, 8723,14283,14283, 8772, 8771, 8780, ++ 8749, 8455, 8737, 8808, 8456, 0, 8738, 8574, 8741, 8763, ++ 8773, 8759, 8765, 8799, 8786, 8795,14283, 8847, 8814, 8802, ++ 1313, 1065, 8811, 8812, 7572, 1008, 7574, 8803, 8821, 8821, ++ 8872, 8812, 8820, 8825,14283, 8826, 8841, 8852, 8850, 8851, ++ 8863, 8854, 8865, 8857, 8861, 8862, 8449, 8892, 8860,14283, ++ 8862,14283, 989, 4343,14283, 4654, 8881, 914, 8864, 0, ++ 8860,14283, 8868, 8943, 8947, 0, 0, 0,14283, 8868, ++ ++ 8839, 8876, 8944, 8917, 0, 0, 8954, 0, 8892, 8908, ++ 8915, 8930, 8935, 8935, 8936, 8957, 8936, 8952,14283,14283, ++ 8955, 8956, 8942, 8961, 879, 8986, 876, 8955, 8945, 8947, ++ 8947, 8948, 8950, 8950, 8962, 8972,14283, 8969, 8976, 8909, ++ 8961,14283, 8960, 8964,14283,14283, 8975, 8988,14283, 4752, ++ 14283, 8973,14283, 8983, 8992,14283, 830, 8979, 0, 9043, ++ 0, 9037, 0, 743, 8997, 9008, 9007, 9013, 9011, 9009, ++ 9012, 9018, 9058, 8529, 8770, 9024, 9025, 9057, 9020, 9028, ++ 14283, 9033, 9034,14283, 9038, 9035, 9025, 9032, 9032,14283, ++ 9029, 9040, 670,14283,14283, 9048, 9040, 9057, 9061,14283, ++ ++ 9049, 602, 0, 9079, 447, 9095,14283, 9054, 9064,14283, ++ 9067, 9072, 9069, 9078, 9073, 9119, 9089, 9123, 9127, 9138, ++ 9142, 9079, 9082, 9099, 9093, 9113,14283, 436, 9112, 9111, ++ 9115, 9122, 9114, 9127, 461, 367, 9122, 9158,14283, 330, ++ 9155, 366, 9125, 9121, 9127, 9124,14283, 9118, 9125, 0, ++ 9169, 9130, 9173, 0, 9196, 0, 9197, 9203,14283, 9135, ++ 14283, 9137, 9153, 9153,14283, 9145, 9147, 9175, 9160, 9181, ++ 9174, 0, 315, 9219, 9166, 9170, 9225, 9170, 9183, 9227, ++ 14283, 9196, 262, 254, 9231, 0, 9242, 0,14283, 9204, ++ 9205, 9195, 9201, 9209, 9203, 9215, 9212, 9206, 9209, 9215, ++ ++ 0, 0, 143, 9259, 0, 9216, 9270, 9260, 9220, 9282, ++ 9240,14283,14283, 138, 109, 9267, 9275, 9269,14283,14283, ++ 9257,14283, 9278, 9269, 9273, 9274, 0, 43,14283, 9298, ++ 9327, 9276, 9336, 9288,14283,14283, 9302, 9311, 9332,14283, ++ 6, 9323, 9333,14283,14283, 9355, 9381,14283,14283,14283, ++ 9330,14283,14283, 9326, 9390, 9327, 9357, 9354, 9347,14283, ++ 9359, 9387, 9389,14283,14283, 9451, 9469, 9487, 9505, 9523, ++ 9541, 9559, 9577, 9595, 9613, 9631, 9649, 9667, 9685, 9703, ++ 9721, 9739, 9757, 9775, 9793, 9811, 9829, 9847, 9865, 9883, ++ 9901, 9919, 9937, 9955, 9973, 9991,10009,10027,10045,10063, ++ ++ 10081,10099,10117,10135,10153,10171,10189,10207,10225,10243, ++ 10261,10279,10297,10315,10333,10351,10369,10387,10405,10423, ++ 10441,10459,10477,10495,10512,10530,10548,10566,10584,10602, ++ 10619,10637,10655,10673,10691,10709,10727,10745,10763,10781, ++ 10799,10817,10835,10853,10871,10889,10907,10925,10943,10961, ++ 10979,10997,11015,11033,11050,11068,11086,11104,11122,11140, ++ 11158,11176,11193,11211,11229,11247,11265,11283,11301,11319, ++ 11337,11355,11373,11391,11409,11427,11445,11463,11481,11499, ++ 11517,11534,11552,11570,11588,11606,11624,11642,11659,11677, ++ 11695,11713,11731,11749,11767,11785,11803,11821,11839,11857, ++ ++ 11875,11893,11911,11929,11947,11965,11982,12000,12018,12036, ++ 12054,12072,12090,12108,12126,12144,12162,12173,12187,12205, ++ 12213,12229,12246,12250,12266,12284,12294,12310,12328,12346, ++ 12364,12381,12397,12415,12433,12451,12469,12487,12504,12520, ++ 12538,12547,12563,12581,12599,12617,12634,12642,12657,12673, ++ 12690,12708,12726,12744,12762,12780,12798,12816,12834,12852, ++ 12870,12880,12888,12903,12918,12929,12937,12945,12961,12977, ++ 12993,13010,13028,13046,13064,13082,13100,13118,13136,13154, ++ 13172,13190,13208,13226,13244,13262,13280,13293,13301,13309, ++ 13317,13328,13344,13360,13368,13376,13392,13410,13428,13446, ++ ++ 13464,13482,13500,13518,13536,13554,13572,13590,13606,13622, ++ 13640,13658,13668,13684,13700,13713,13731,13748,13765,13782, ++ 13793,13809,13826,13843,13855,13871,13889,13906,13924,13941, ++ 13959,13976,13992,14009,14019,14035,14052,14070,14087,14105, ++ 14123,14140,14157,14175,14187,14203,14220,14237,14248,14264 + } ; + +-static const flex_int16_t yy_def[4238] = ++static const flex_int16_t yy_def[4251] = + { 0, +- 3953, 3953, 3952, 3, 3954, 3954, 3, 3, 3955, 3955, +- 3955, 3955, 3956, 3956, 3957, 3957, 3958, 3958, 3959, 3959, +- 3960, 3960, 3954, 3954, 3954, 3954, 3961, 3961, 3962, 3962, +- 3962, 3962, 3963, 3963, 3964, 3964, 3952, 37, 37, 37, +- 3954, 3954, 3954, 3954, 3954, 3954, 3965, 3965, 3966, 3966, +- 3967, 3967, 3968, 3968, 3969, 3969, 3970, 3970, 3971, 3971, +- 3954, 3954, 3972, 3972, 3973, 3973, 3971, 3971, 3954, 3954, +- 3974, 3974, 3975, 3975, 3952, 3952, 3952, 3952, 3952, 3952, +- 3976, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 131, 3952, 3952, 3952, 3977, 3977, 3977, 3952, +- 3952, 3977, 3978, 3978, 3978, 3952, 3979, 3978, 3980, 3980, +- 3980, 3952, 3981, 3952, 3980, 3982, 3982, 3952, 3982, 3952, +- 3952, 3983, 3952, 3952, 3952, 3983, 3984, 3983, 3985, 3985, +- 3985, 3952, 3986, 3985, 3952, 3987, 3952, 3985, 3988, 3988, +- 3988, 3952, 3989, 3988, 3990, 3990, 3990, 3952, 3952, 3990, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3991, 3991, 3952, 3952, +- 3991, 3992, 3992, 3952, 3993, 3992, 3952, 3994, 3995, 3996, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3997, 3952, 3998, 3997, 3952, 3952, 3952, 3999, 3952, 4000, +- 3952, 3999, 3952, 3952, 3952, 4001, 4001, 4001, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4002, 3952, 4002, 4002, 4002, +- 3952, 3952, 4002, 4002, 4002, 4003, 3952, 4004, 4003, 4003, +- 4003, 3952, 4003, 4003, 4003, 4005, 3952, 4006, 4005, 4005, +- 4005, 3952, 4005, 4005, 4005, 4007, 4007, 3952, 4007, 3952, +- 4007, 4008, 3952, 4008, 3952, 4009, 4010, 4011, 4010, 4008, +- 4012, 3952, 4013, 4012, 4012, 4012, 4012, 3952, 4012, 3952, +- +- 4014, 4015, 4016, 4015, 4017, 4015, 3952, 3952, 4012, 4012, +- 4018, 3952, 4019, 4018, 4018, 4018, 3952, 4018, 4018, 4018, +- 4020, 3952, 4020, 4020, 3952, 4020, 3952, 3952, 4020, 4020, +- 4020, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 4021, 3952, 4021, 3952, 3952, 4021, +- 4022, 3952, 4023, 4022, 3952, 4022, 4024, 4025, 4026, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4027, 3952, 4028, +- 4027, 3952, 4027, 3952, 4029, 3952, 4030, 4029, 3952, 4029, +- 4031, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4032, +- 3952, 3952, 4032, 4032, 4033, 4034, 3952, 3952, 4034, 4034, +- 4035, 4036, 3952, 3952, 4036, 4036, 3952, 3952, 4037, 4038, +- 4037, 4039, 4040, 4041, 4041, 4041, 4040, 4042, 4043, 3952, +- 3952, 4044, 4045, 4044, 4046, 4044, 4047, 4048, 4048, 4048, +- 4049, 4049, 4049, 4050, 4048, 4043, 4043, 4051, 4052, 3952, +- 3952, 4052, 4052, 3952, 4053, 3952, 3952, 4053, 3952, 4053, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4054, 3952, 3952, 4055, 4056, 3952, +- 3952, 3952, 3952, 3952, 3952, 4057, 4058, 3952, 3952, 4059, +- 4060, 3952, 3952, 4061, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4062, 3952, 4062, +- 4063, 3952, 4063, 4064, 3952, 4064, 3952, 4065, 4066, 4066, +- 4066, 4067, 4065, 4067, 4067, 3952, 4068, 3952, 3952, 4068, +- 3952, 4043, 3952, 4069, 4069, 4069, 4070, 4071, 4070, 4070, +- 4072, 4073, 4069, 4074, 4071, 4072, 4071, 4071, 4043, 4075, +- +- 4043, 3952, 4075, 3952, 4075, 4075, 4076, 4043, 4077, 3952, +- 4077, 4078, 3952, 4078, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4079, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4080, 3952, 4081, +- +- 3952, 3952, 3952, 3952, 3952, 4082, 3952, 4083, 3952, 4084, +- 4084, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 4085, 3952, 4086, 3952, 4087, 4088, 4089, +- 4090, 3952, 4069, 4091, 4091, 4091, 4072, 4069, 4071, 4072, +- 4071, 4092, 4071, 4093, 4094, 4095, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4096, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4079, 4097, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4098, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 4099, 3952, 3952, 3952, +- 3952, 4100, 3952, 4101, 3952, 4102, 4102, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4088, +- 4089, 4088, 4089, 4091, 4071, 4091, 4072, 4091, 4072, 4103, +- 4072, 4072, 4071, 4093, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4096, 4104, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4105, 3952, 3952, 3952, 4097, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4098, 3952, 4098, 4106, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 4102, 4102, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4091, 4072, +- 4092, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4104, 4107, 4096, 4104, 3952, 3952, 3952, 3952, +- 3952, 3952, 4108, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4098, 3952, 4106, 3952, 3952, 3952, 4102, 4109, +- 3952, 3952, 4110, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4072, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4096, 4104, 3952, 4107, 4096, 3952, 4111, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4098, 3952, 4102, 4112, +- 4113, 3952, 3952, 4114, 4110, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4115, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4104, 3952, 4107, 4107, 3952, +- +- 4111, 4116, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4117, 4112, 4112, 4113, 4113, 3952, +- 3952, 4114, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4118, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4119, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4115, 4120, 4115, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4121, 3952, 4116, 4122, +- 4116, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4123, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4124, 4125, 4112, 3952, 4112, 4113, 4113, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4126, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4118, 4127, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4128, +- 3952, 3952, 3952, 3952, 4129, 4119, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4115, 4120, 3952, 4120, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4121, 4130, 4131, 3952, 4116, +- +- 4122, 3952, 4122, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4123, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4124, 4132, 4125, +- 4133, 3952, 3952, 3952, 3952, 3952, 4134, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4135, 4126, 4136, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4127, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4128, +- 3952, 3952, 3952, 3952, 4129, 3952, 3952, 3952, 3952, 3952, +- 4137, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4120, 3952, 4115, 4120, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4138, +- +- 4130, 4139, 4121, 4140, 4141, 4130, 4142, 3952, 3952, 4143, +- 3952, 4144, 4143, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4145, +- 4146, 3952, 4147, 4148, 3952, 3952, 3952, 3952, 3952, 4149, +- 4150, 4151, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4152, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4153, +- 4154, 4155, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 4156, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4157, 3952, 3952, 4158, 4158, 4159, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4160, 4161, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4162, 4163, 4164, 4165, 3952, 4166, 4167, 4163, 4168, 4169, +- +- 4170, 4171, 4162, 4164, 4171, 4172, 4173, 4174, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4175, 4176, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4177, 4178, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4179, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4180, 4180, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4181, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 4182, 4183, 3952, 3952, 3952, 4184, 3952, 4184, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4185, 3952, 3952, 3952, 3952, 3952, 3952, 4164, 4186, 4162, +- 4187, 4164, 4164, 4188, 3952, 3952, 4186, 4186, 4189, 4189, +- 4190, 4191, 4172, 4191, 4191, 4192, 4192, 4162, 4193, 4193, +- 4194, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4177, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4195, 4196, 3952, 3952, 3952, 3952, 4197, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4198, 4181, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4182, 3952, 3952, 3952, 3952, 4184, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4162, 4164, 3952, 4186, 4162, 4190, +- 4191, 4187, 4193, 4164, 3952, 4189, 4186, 4172, 4191, 4172, +- 4199, 4191, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4195, 4195, 4200, 4196, 3952, 3952, 4197, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4198, 3952, 3952, 3952, 4201, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4184, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 4164, 4186, 4190, 4187, 4187, 4193, 4189, 4191, 4199, 4172, +- 4191, 4199, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4202, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4200, 3952, 3952, 4203, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4201, 4201, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4164, 4186, 4199, +- 4172, 4191, 4199, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4203, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4204, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4205, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4199, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4204, 4204, 4206, +- 4207, 3952, 3952, 3952, 3952, 3952, 3952, 4205, 4205, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4208, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4206, 4206, 4209, 4207, 4207, 4210, 3952, 3952, +- 4211, 3952, 3952, 3952, 4205, 4205, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4208, +- 4212, 3952, 3952, 3952, 3952, 3952, 3952, 4213, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4214, 3952, 4215, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4209, 4210, 3952, 3952, 4211, 3952, 4211, 3952, 3952, 3952, +- 4205, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4212, 3952, +- 3952, 3952, 4213, 4213, 4216, 4217, 4218, 3952, 3952, 4219, +- 3952, 3952, 3952, 4214, 4220, 4215, 4221, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4211, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4217, 3952, 4222, 4219, 4223, 4224, +- 4220, 4221, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4211, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4222, 4223, +- 4224, 3952, 4224, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 4225, 3952, 4226, 4227, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4224, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4225, 4225, 3952, 4226, +- 4228, 4227, 4229, 4230, 4231, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4232, 3952, +- 4233, 4224, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4228, +- 4229, 4230, 4234, 4231, 4235, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4232, 4236, 4233, +- 4233, 4237, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 4234, 4235, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4236, 4237, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 0, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952 ++ 3966, 3966, 3965, 3, 3967, 3967, 3, 3, 3968, 3968, ++ 3968, 3968, 3969, 3969, 3970, 3970, 3971, 3971, 3972, 3972, ++ 3973, 3973, 3967, 3967, 3967, 3967, 3974, 3974, 3975, 3975, ++ 3975, 3975, 3976, 3976, 3977, 3977, 3965, 37, 37, 37, ++ 3967, 3967, 3967, 3967, 3967, 3967, 3978, 3978, 3979, 3979, ++ 3980, 3980, 3981, 3981, 3982, 3982, 3983, 3983, 3984, 3984, ++ 3967, 3967, 3985, 3985, 3986, 3986, 3984, 3984, 3967, 3967, ++ 3987, 3987, 3988, 3988, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3989, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 131, 3965, 3965, 3965, 3990, 3990, 3990, 3965, ++ 3965, 3990, 3991, 3991, 3991, 3965, 3992, 3991, 3993, 3993, ++ 3993, 3965, 3994, 3965, 3993, 3995, 3995, 3965, 3995, 3965, ++ 3965, 3996, 3965, 3965, 3965, 3996, 3997, 3996, 3998, 3998, ++ 3998, 3965, 3999, 3998, 3965, 4000, 3965, 3998, 4001, 4001, ++ 4001, 3965, 4002, 4001, 4003, 4003, 4003, 3965, 3965, 4003, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4004, 4004, 3965, 3965, ++ 4004, 4005, 4005, 3965, 4006, 4005, 3965, 4007, 4008, 4009, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4010, 3965, 4011, 4010, 3965, 3965, 3965, 4012, 3965, 4013, ++ 3965, 4012, 3965, 3965, 3965, 4014, 4014, 4014, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4015, 3965, 4015, 4015, 4015, ++ 3965, 3965, 4015, 4015, 4015, 4016, 3965, 4017, 4016, 4016, ++ 4016, 3965, 4016, 4016, 4016, 4018, 3965, 4019, 4018, 4018, ++ 4018, 3965, 4018, 4018, 4018, 4020, 4020, 3965, 4020, 3965, ++ 4020, 4021, 3965, 4021, 3965, 4022, 4023, 4024, 4023, 4021, ++ 4025, 3965, 4026, 4025, 4025, 4025, 4025, 3965, 4025, 3965, ++ ++ 4027, 4028, 4029, 4028, 4030, 4028, 3965, 3965, 4025, 4025, ++ 4031, 3965, 4032, 4031, 4031, 4031, 3965, 4031, 4031, 4031, ++ 4033, 3965, 4033, 4033, 3965, 4033, 3965, 3965, 4033, 4033, ++ 4033, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 4034, 3965, 4034, 3965, 3965, 4034, ++ 4035, 3965, 4036, 4035, 3965, 4035, 4037, 4038, 4039, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4040, 3965, 4041, ++ 4040, 3965, 4040, 3965, 4042, 3965, 4043, 4042, 3965, 4042, ++ 4044, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4045, ++ 3965, 3965, 4045, 4045, 4046, 4047, 3965, 3965, 4047, 4047, ++ 4048, 4049, 3965, 3965, 4049, 4049, 3965, 3965, 4050, 4051, ++ 4050, 4052, 4053, 4054, 4054, 4054, 4053, 4055, 4056, 3965, ++ 3965, 4057, 4058, 4057, 4059, 4057, 4060, 4061, 4061, 4061, ++ 4062, 4062, 4062, 4063, 4061, 4056, 4056, 4064, 4065, 3965, ++ 3965, 4065, 4065, 3965, 4066, 3965, 3965, 4066, 3965, 4066, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4067, 3965, 3965, 4068, 4069, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4070, 4071, 3965, 3965, 4072, ++ 4073, 3965, 3965, 4074, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4075, 3965, 4075, ++ 4076, 3965, 4076, 4077, 3965, 4077, 3965, 4078, 4079, 4079, ++ 4079, 4080, 4078, 4080, 4080, 3965, 4081, 3965, 3965, 4081, ++ 3965, 4056, 3965, 4082, 4082, 4082, 4083, 4084, 4083, 4083, ++ 4085, 4086, 4082, 4087, 4084, 4085, 4084, 4084, 4056, 4088, ++ ++ 4056, 3965, 4088, 3965, 4088, 4088, 4089, 4056, 4090, 3965, ++ 4090, 4091, 3965, 4091, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4092, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4093, 3965, 4094, ++ ++ 3965, 3965, 3965, 3965, 3965, 4095, 3965, 4096, 3965, 4097, ++ 4097, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 4098, 3965, 4099, 3965, 4100, 4101, 4102, ++ 4103, 3965, 4082, 4104, 4104, 4104, 4085, 4082, 4084, 4085, ++ 4084, 4105, 4084, 4106, 4107, 4108, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4109, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4092, 4110, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4111, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 4112, 3965, 3965, 3965, ++ 3965, 4113, 3965, 4114, 3965, 4115, 4115, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4101, ++ 4102, 4101, 4102, 4104, 4084, 4104, 4085, 4104, 4085, 4116, ++ 4085, 4085, 4084, 4106, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4109, 4117, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4118, 3965, 3965, 3965, 4110, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4111, 3965, 4111, 4119, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 4115, 4115, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4104, 4085, ++ 4105, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4117, 4120, 4109, 4117, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4121, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4111, 3965, 4119, 3965, 3965, 3965, 4115, 4122, ++ 3965, 3965, 4123, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4085, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4109, 4117, 3965, 4120, 4109, 3965, 4124, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4111, 3965, 4115, 4125, ++ 4126, 3965, 3965, 4127, 4123, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4128, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4117, 3965, 4120, 4120, 3965, ++ ++ 4124, 4129, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4130, 4125, 4125, 4126, 4126, 3965, ++ 3965, 4127, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4131, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4132, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4128, 4133, 4128, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4134, 3965, 4129, 4135, ++ 4129, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4136, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4137, 4138, 4125, 3965, 4125, 4126, 4126, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4139, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4131, 4140, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4141, ++ 3965, 3965, 3965, 3965, 4142, 4132, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4128, 4133, 3965, 4133, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4134, 4143, 4144, 3965, ++ ++ 4129, 4135, 3965, 4135, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4136, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4137, 4145, ++ 4138, 4146, 3965, 3965, 3965, 3965, 3965, 4147, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4148, 4139, 4149, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4140, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4141, 3965, 3965, 3965, 3965, 4142, 3965, 3965, 3965, 3965, ++ 3965, 4150, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4133, 3965, ++ 4128, 4133, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 4151, 4143, 4152, 4134, 4153, 4154, 4143, 4155, 3965, ++ 3965, 4156, 3965, 4157, 4156, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4158, 4159, 3965, 4160, 4161, 3965, 3965, 3965, 3965, ++ 3965, 4162, 4163, 4164, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4165, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4166, 4167, 4168, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 4169, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4170, 3965, 3965, 4171, 4171, 4172, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4173, 4174, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4175, 4176, 4177, 4178, 3965, 4179, 4180, ++ ++ 4176, 4181, 4182, 4183, 4184, 4175, 4177, 4184, 4185, 4186, ++ 4187, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4188, 4189, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4190, 4191, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4192, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4193, 4193, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4194, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 4195, 4196, 3965, 3965, 3965, ++ 4197, 3965, 4197, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4198, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4177, 4199, 4175, 4200, 4177, 4177, 4201, 3965, 3965, ++ 4199, 4199, 4202, 4202, 4203, 4204, 4185, 4204, 4204, 4205, ++ 4205, 4175, 4206, 4206, 4207, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4190, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4208, 4209, 3965, ++ 3965, 3965, 3965, 4210, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4211, 4194, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4195, 3965, 3965, 3965, 3965, 4197, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4175, ++ 4177, 3965, 4199, 4175, 4203, 4204, 4200, 4206, 4177, 3965, ++ 4202, 4199, 4185, 4204, 4185, 4212, 4204, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4208, 4208, 4213, 4209, ++ 3965, 3965, 4210, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4211, 3965, 3965, ++ 3965, 4214, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4197, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 4177, 4199, 4203, 4200, ++ 4200, 4206, 4202, 4204, 4212, 4185, 4204, 4212, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4215, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4213, 3965, 3965, ++ 4216, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4214, ++ 4214, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4177, 4199, 4212, 4185, 4204, 4212, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4216, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4217, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4218, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4212, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4217, 4217, 4219, 4220, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4218, 4218, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4221, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4219, 4219, 4222, 4220, 4220, 4223, 3965, 3965, 4224, ++ 3965, 3965, 3965, 4218, 4218, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4221, ++ 4225, 3965, 3965, 3965, 3965, 3965, 3965, 4226, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4227, 3965, 4228, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4222, 4223, 3965, 3965, 4224, 3965, 4224, 3965, 3965, 3965, ++ 4218, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4225, ++ 3965, 3965, 3965, 4226, 4226, 4229, 4230, 4231, 3965, 3965, ++ ++ 4232, 3965, 3965, 3965, 4227, 4233, 4228, 4234, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4224, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4230, 3965, 4235, 4232, ++ 4236, 4237, 4233, 4234, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4224, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 4235, 4236, 4237, 3965, 4237, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4238, 3965, 4239, 4240, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4237, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4238, ++ 4238, 3965, 4239, 4241, 4240, 4242, 4243, 4244, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4245, 3965, 4246, 4237, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4241, 4242, 4243, 4247, 4244, 4248, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 4245, 4249, 4246, 4246, 4250, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4247, 4248, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4249, 4250, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 0, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965 + } ; + +-static const flex_int16_t yy_nxt[14349] = ++static const flex_int16_t yy_nxt[14371] = + { 0, +- 3952, 77, 78, 79, 77, 118, 80, 81, 118, 118, +- 283, 284, 118, 3952, 82, 119, 120, 121, 119, 122, +- 123, 3952, 129, 98, 124, 129, 130, 98, 125, 1394, +- 83, 135, 84, 85, 3939, 269, 136, 86, 87, 88, +- 315, 316, 98, 89, 90, 91, 135, 92, 93, 3932, ++ 3965, 77, 78, 79, 77, 118, 80, 81, 118, 118, ++ 283, 284, 118, 3965, 82, 119, 120, 121, 119, 122, ++ 123, 3965, 129, 98, 124, 129, 130, 98, 125, 1394, ++ 83, 135, 84, 85, 3952, 269, 136, 86, 87, 88, ++ 315, 316, 98, 89, 90, 91, 135, 92, 93, 3945, + 131, 136, 94, 1110, 138, 139, 95, 138, 83, 874, + 84, 85, 140, 269, 141, 86, 87, 88, 256, 270, + 126, 89, 90, 91, 1395, 92, 93, 132, 283, 284, +@@ -1880,10 +1883,10 @@ static const flex_int16_t yy_nxt[14349] = + 256, 129, 130, 271, 82, 157, 158, 270, 157, 127, + + 96, 272, 129, 98, 233, 129, 130, 257, 234, 142, +- 83, 235, 84, 85, 273, 3923, 131, 86, 87, 88, ++ 83, 235, 84, 85, 273, 3936, 131, 86, 87, 88, + 274, 271, 1010, 89, 90, 91, 275, 92, 93, 272, + 133, 280, 94, 526, 318, 527, 95, 318, 83, 1011, +- 84, 85, 273, 132, 3922, 86, 87, 88, 274, 3952, ++ 84, 85, 273, 132, 3935, 86, 87, 88, 274, 3965, + 159, 89, 90, 91, 275, 92, 93, 132, 236, 280, + 94, 96, 97, 98, 96, 97, 96, 96, 96, 96, + 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, +@@ -1896,8 +1899,8 @@ static const flex_int16_t yy_nxt[14349] = + 96, 106, 96, 107, 108, 109, 110, 111, 112, 113, + 96, 114, 115, 96, 96, 96, 96, 117, 119, 120, + 121, 119, 122, 123, 281, 129, 98, 124, 129, 130, +- 3900, 125, 138, 139, 2298, 138, 144, 145, 3899, 144, +- 140, 146, 141, 228, 147, 229, 144, 145, 2500, 144, ++ 3913, 125, 138, 139, 2299, 138, 144, 145, 3912, 144, ++ 140, 146, 141, 228, 147, 229, 144, 145, 2502, 144, + 230, 146, 281, 133, 147, 150, 151, 347, 150, 347, + 152, 150, 151, 153, 150, 526, 152, 527, 154, 153, + +@@ -1905,12 +1908,12 @@ static const flex_int16_t yy_nxt[14349] = + 132, 489, 267, 569, 276, 180, 181, 142, 180, 289, + 182, 148, 277, 183, 569, 163, 164, 231, 163, 282, + 165, 148, 127, 96, 348, 166, 186, 187, 163, 188, +- 155, 167, 276, 3889, 189, 278, 155, 289, 163, 164, ++ 155, 167, 276, 3902, 189, 278, 155, 289, 163, 164, + 277, 163, 163, 165, 231, 290, 268, 347, 166, 347, + 159, 163, 279, 645, 167, 490, 170, 171, 295, 170, +- 184, 172, 3793, 278, 173, 163, 174, 301, 357, 175, +- 168, 358, 176, 290, 170, 171, 3829, 170, 302, 172, +- 279, 190, 173, 177, 174, 3859, 295, 175, 186, 187, ++ 184, 172, 3806, 278, 173, 163, 174, 301, 357, 175, ++ 168, 358, 176, 290, 170, 171, 3842, 170, 302, 172, ++ 279, 190, 173, 177, 174, 3872, 295, 175, 186, 187, + + 176, 188, 646, 168, 348, 301, 189, 474, 475, 163, + 163, 177, 497, 498, 170, 171, 302, 170, 303, 172, +@@ -1920,10 +1923,10 @@ static const flex_int16_t yy_nxt[14349] = + 181, 176, 180, 190, 182, 313, 252, 183, 214, 215, + 216, 217, 177, 191, 314, 214, 215, 216, 217, 178, + 191, 191, 296, 351, 297, 226, 441, 487, 191, 441, +- 487, 226, 488, 313, 254, 438, 439, 440, 438, 3858, +- 178, 502, 314, 3851, 502, 503, 504, 283, 284, 286, ++ 487, 226, 488, 313, 254, 438, 439, 440, 438, 3871, ++ 178, 502, 314, 3864, 502, 503, 504, 283, 284, 286, + +- 296, 352, 297, 3829, 184, 191, 192, 193, 194, 192, ++ 296, 352, 297, 3842, 184, 191, 192, 193, 194, 192, + 191, 195, 191, 191, 191, 191, 191, 191, 191, 196, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 197, 198, 199, 200, 201, +@@ -1934,58 +1937,58 @@ static const flex_int16_t yy_nxt[14349] = + 208, 209, 210, 191, 211, 191, 212, 191, 191, 191, + 191, 191, 218, 219, 220, 221, 359, 222, 218, 219, + +- 220, 221, 369, 222, 218, 219, 220, 221, 3826, 222, ++ 220, 221, 369, 222, 218, 219, 220, 221, 3839, 222, + 218, 219, 220, 221, 233, 222, 291, 252, 234, 242, + 253, 235, 315, 316, 352, 252, 259, 242, 292, 260, + 352, 261, 327, 259, 259, 327, 260, 557, 261, 252, + 557, 259, 590, 318, 291, 590, 318, 223, 259, 422, + 243, 242, 244, 223, 422, 259, 292, 395, 243, 223, +- 244, 245, 246, 247, 248, 223, 2298, 254, 236, 245, ++ 244, 245, 246, 247, 248, 223, 2299, 254, 236, 245, + 246, 247, 248, 242, 263, 264, 262, 263, 243, 619, + 244, 414, 243, 262, 244, 400, 243, 265, 244, 245, + 246, 247, 248, 245, 246, 247, 248, 245, 246, 247, + +- 248, 423, 287, 489, 243, 288, 244, 293, 2888, 400, ++ 248, 423, 287, 489, 243, 288, 244, 293, 2892, 400, + 243, 298, 244, 306, 294, 245, 246, 247, 248, 428, +- 304, 245, 246, 247, 248, 299, 620, 3820, 307, 265, ++ 304, 245, 246, 247, 248, 299, 620, 3833, 307, 265, + 287, 300, 243, 288, 244, 293, 305, 308, 407, 298, +- 408, 306, 294, 245, 246, 247, 248, 400, 304, 3794, ++ 408, 306, 294, 245, 246, 247, 248, 400, 304, 3807, + 310, 584, 309, 299, 311, 312, 307, 490, 357, 300, +- 446, 358, 584, 2298, 305, 308, 319, 320, 321, 319, ++ 446, 358, 584, 2299, 305, 308, 319, 320, 321, 319, + 452, 322, 323, 320, 321, 323, 412, 324, 310, 413, + 309, 398, 311, 312, 325, 321, 321, 325, 446, 326, + 323, 320, 321, 323, 447, 324, 455, 342, 452, 349, + +- 343, 448, 349, 353, 354, 3049, 422, 347, 359, 347, ++ 343, 448, 349, 353, 354, 3054, 422, 347, 359, 347, + 347, 422, 347, 449, 344, 345, 364, 365, 474, 475, + 357, 320, 447, 358, 455, 342, 414, 320, 343, 448, +- 360, 377, 378, 360, 377, 357, 3787, 412, 358, 321, ++ 360, 377, 378, 360, 377, 357, 3800, 412, 358, 321, + 413, 449, 344, 345, 459, 320, 328, 329, 330, 331, + 332, 333, 465, 334, 350, 472, 335, 355, 423, 662, + 336, 367, 337, 338, 368, 339, 340, 341, 285, 367, + 363, 285, 459, 874, 328, 329, 330, 331, 332, 333, +- 465, 334, 3647, 472, 335, 361, 379, 414, 336, 367, ++ 465, 334, 3657, 472, 335, 361, 379, 414, 336, 367, + 337, 338, 368, 339, 340, 341, 370, 367, 663, 370, + + 742, 367, 377, 378, 368, 377, 374, 375, 450, 367, + 367, 369, 875, 368, 377, 380, 381, 377, 367, 383, + 383, 451, 383, 427, 383, 383, 383, 473, 383, 347, +- 383, 347, 383, 645, 637, 3716, 450, 637, 383, 369, +- 392, 386, 3741, 393, 470, 394, 383, 471, 392, 451, +- 441, 371, 383, 441, 743, 473, 2298, 379, 383, 388, ++ 383, 347, 383, 645, 637, 3727, 450, 637, 383, 369, ++ 392, 386, 3753, 393, 470, 394, 383, 471, 392, 451, ++ 441, 371, 383, 441, 743, 473, 2299, 379, 383, 388, + 373, 383, 392, 383, 870, 383, 383, 508, 383, 379, + 383, 388, 646, 453, 384, 471, 348, 1572, 383, 424, + 384, 396, 425, 454, 396, 383, 392, 422, 460, 393, +- 395, 394, 383, 3737, 392, 509, 461, 392, 3060, 514, ++ 395, 394, 383, 3749, 392, 509, 461, 392, 3065, 514, + + 393, 453, 394, 383, 383, 392, 662, 625, 392, 383, + 383, 454, 499, 389, 668, 499, 460, 500, 392, 392, + 390, 393, 1573, 394, 461, 391, 392, 509, 391, 401, +- 392, 520, 872, 403, 426, 404, 397, 749, 405, 2274, +- 392, 2275, 383, 388, 409, 410, 569, 395, 392, 383, ++ 392, 520, 872, 403, 426, 404, 397, 749, 405, 2275, ++ 392, 2276, 383, 388, 409, 410, 569, 395, 392, 383, + 383, 393, 392, 394, 626, 415, 392, 569, 415, 520, +- 412, 669, 521, 413, 3716, 419, 420, 501, 395, 412, +- 392, 3709, 413, 659, 429, 430, 422, 497, 498, 442, ++ 412, 669, 521, 413, 3727, 419, 420, 501, 395, 412, ++ 392, 3720, 413, 659, 429, 430, 422, 497, 498, 442, + 406, 422, 432, 433, 434, 432, 456, 522, 443, 466, + 521, 750, 444, 467, 462, 435, 523, 445, 399, 468, + +@@ -1996,7 +1999,7 @@ static const flex_int16_t yy_nxt[14349] = + 476, 477, 478, 476, 480, 477, 478, 481, 482, 483, + 484, 482, 507, 485, 482, 483, 484, 491, 524, 485, + 492, 493, 494, 492, 512, 495, 525, 513, 529, 531, +- 507, 530, 538, 2276, 529, 2277, 529, 530, 510, 542, ++ 507, 530, 538, 2277, 529, 2278, 529, 530, 510, 542, + 514, 674, 529, 543, 536, 514, 524, 537, 267, 536, + 529, 267, 536, 544, 525, 436, 529, 534, 545, 436, + +@@ -2012,13 +2015,13 @@ static const flex_int16_t yy_nxt[14349] = + 573, 574, 588, 589, 323, 327, 575, 323, 327, 324, + + 576, 579, 754, 582, 577, 325, 578, 583, 325, 585, +- 326, 580, 581, 593, 594, 586, 587, 595, 598, 3708, ++ 326, 580, 581, 593, 594, 586, 587, 595, 598, 3719, + 588, 589, 319, 320, 321, 319, 889, 322, 323, 320, + 321, 323, 604, 324, 325, 321, 321, 325, 599, 326, + 596, 593, 594, 597, 606, 595, 598, 605, 607, 755, + 265, 610, 600, 601, 602, 1329, 603, 611, 612, 614, + 604, 1117, 613, 615, 617, 608, 599, 682, 596, 618, +- 609, 597, 606, 613, 989, 605, 607, 320, 3671, 610, ++ 609, 597, 606, 613, 989, 605, 607, 320, 3682, 610, + 600, 601, 602, 320, 603, 611, 612, 614, 616, 321, + 613, 615, 617, 608, 891, 682, 349, 618, 609, 349, + +@@ -2027,49 +2030,49 @@ static const flex_int16_t yy_nxt[14349] = + 347, 347, 357, 363, 360, 358, 627, 360, 990, 357, + 600, 601, 358, 364, 365, 357, 629, 758, 358, 629, + 625, 357, 630, 683, 358, 367, 357, 632, 368, 358, +- 2480, 350, 2481, 367, 373, 370, 622, 633, 370, 2298, ++ 2482, 350, 2483, 367, 373, 370, 622, 633, 370, 2299, + 367, 620, 355, 368, 441, 348, 348, 441, 367, 374, + 375, 683, 359, 628, 367, 635, 631, 368, 635, 361, + 367, 367, 367, 368, 759, 363, 636, 626, 367, 684, + 367, 359, 584, 368, 412, 369, 359, 413, 367, 377, + +- 378, 3049, 377, 584, 634, 377, 378, 685, 377, 650, ++ 378, 3054, 377, 584, 634, 377, 378, 685, 377, 650, + 371, 377, 380, 381, 377, 377, 638, 684, 377, 383, + 383, 686, 383, 632, 373, 874, 383, 383, 399, 383, + 369, 383, 383, 392, 734, 685, 648, 734, 394, 383, + 369, 392, 383, 640, 414, 383, 383, 383, 687, 686, +- 2809, 419, 420, 383, 379, 640, 651, 2985, 668, 688, ++ 2812, 419, 420, 383, 379, 640, 651, 2989, 668, 688, + 379, 736, 383, 388, 736, 383, 379, 383, 487, 383, + 379, 487, 422, 488, 390, 388, 687, 422, 643, 383, + 388, 384, 383, 649, 382, 383, 383, 688, 383, 383, + 383, 392, 388, 1323, 393, 643, 394, 641, 383, 392, + +- 2810, 429, 430, 383, 383, 669, 383, 2986, 674, 431, ++ 2813, 429, 430, 383, 383, 669, 383, 2990, 674, 431, + 383, 383, 383, 392, 676, 392, 399, 389, 393, 399, +- 394, 399, 689, 392, 423, 396, 642, 640, 396, 2274, +- 392, 2275, 660, 393, 647, 394, 3656, 392, 392, 418, ++ 394, 399, 689, 392, 423, 396, 642, 640, 396, 2275, ++ 392, 2276, 660, 393, 647, 394, 3666, 392, 392, 418, + 390, 395, 670, 399, 409, 410, 383, 388, 392, 806, +- 689, 648, 392, 394, 392, 675, 392, 393, 3952, 394, ++ 689, 648, 392, 394, 392, 675, 392, 393, 3965, 394, + 806, 677, 392, 383, 388, 395, 315, 316, 431, 383, + 383, 406, 285, 676, 391, 285, 392, 391, 391, 392, + 397, 391, 653, 392, 654, 809, 403, 655, 404, 671, + 412, 405, 487, 413, 658, 487, 809, 488, 649, 661, + + 399, 392, 693, 673, 399, 392, 870, 412, 391, 391, +- 413, 391, 391, 392, 392, 3952, 403, 664, 404, 404, ++ 413, 391, 391, 392, 392, 3965, 403, 664, 404, 404, + 677, 405, 405, 415, 658, 658, 415, 427, 412, 656, + 693, 413, 1102, 406, 666, 392, 391, 666, 422, 392, + 418, 667, 393, 422, 394, 392, 672, 392, 393, 672, + 394, 412, 424, 392, 413, 425, 744, 414, 657, 744, + 422, 392, 391, 406, 665, 678, 1117, 392, 679, 680, +- 2525, 422, 697, 422, 872, 698, 422, 699, 416, 620, ++ 2527, 422, 697, 422, 872, 698, 422, 699, 416, 620, + 694, 432, 433, 434, 432, 438, 439, 440, 438, 395, + 431, 695, 391, 391, 435, 395, 690, 700, 691, 701, + + 697, 414, 692, 698, 702, 699, 704, 426, 694, 705, + 707, 706, 708, 710, 713, 703, 714, 716, 715, 695, + 423, 711, 709, 423, 690, 700, 691, 701, 717, 731, +- 692, 712, 702, 888, 704, 3611, 436, 705, 707, 706, ++ 692, 712, 702, 888, 704, 3621, 436, 705, 707, 706, + 708, 710, 713, 703, 714, 716, 715, 732, 737, 711, + 709, 737, 733, 738, 1117, 502, 717, 731, 502, 712, + 718, 719, 740, 720, 662, 740, 721, 741, 722, 762, +@@ -2079,12 +2082,12 @@ static const flex_int16_t yy_nxt[14349] = + + 725, 763, 726, 663, 727, 728, 729, 730, 480, 477, + 478, 480, 480, 477, 478, 481, 482, 483, 484, 482, +- 889, 485, 492, 493, 494, 492, 2887, 495, 482, 483, ++ 889, 485, 492, 493, 494, 492, 2891, 495, 482, 483, + 484, 491, 502, 485, 1124, 502, 436, 492, 493, 494, +- 492, 499, 495, 2507, 499, 751, 500, 506, 751, 510, ++ 492, 499, 495, 2509, 499, 751, 500, 506, 751, 510, + 752, 506, 506, 764, 756, 512, 506, 516, 513, 512, + 760, 765, 513, 436, 834, 529, 529, 436, 530, 766, +- 3599, 486, 768, 529, 529, 834, 529, 496, 775, 530, ++ 3609, 486, 768, 529, 529, 834, 529, 496, 775, 530, + 776, 764, 536, 486, 529, 770, 777, 529, 891, 765, + 536, 533, 496, 772, 557, 540, 501, 557, 529, 507, + +@@ -2093,11 +2096,11 @@ static const flex_int16_t yy_nxt[14349] = + 537, 782, 536, 783, 784, 536, 533, 785, 536, 800, + 778, 537, 771, 536, 801, 803, 536, 804, 779, 536, + 773, 780, 802, 805, 807, 802, 781, 808, 810, 782, +- 536, 783, 784, 2298, 3592, 785, 811, 800, 266, 3590, +- 812, 813, 801, 803, 814, 804, 590, 538, 3575, 590, +- 835, 805, 807, 835, 2525, 808, 810, 815, 540, 786, ++ 536, 783, 784, 2299, 3602, 785, 811, 800, 266, 3600, ++ 812, 813, 801, 803, 814, 804, 590, 538, 3584, 590, ++ 835, 805, 807, 835, 2527, 808, 810, 815, 540, 786, + 816, 787, 788, 817, 811, 789, 790, 791, 812, 813, +- 818, 792, 814, 819, 793, 3060, 794, 795, 796, 797, ++ 818, 792, 814, 819, 793, 3065, 794, 795, 796, 797, + + 824, 798, 799, 825, 820, 815, 826, 786, 816, 787, + 788, 817, 827, 789, 790, 791, 822, 823, 818, 792, +@@ -2108,13 +2111,13 @@ static const flex_int16_t yy_nxt[14349] = + 852, 829, 853, 830, 831, 832, 836, 837, 854, 838, + 839, 840, 855, 856, 841, 842, 857, 843, 844, 351, + 845, 846, 847, 833, 848, 849, 850, 851, 852, 347, +- 853, 347, 870, 3529, 357, 623, 854, 358, 623, 637, ++ 853, 347, 870, 3538, 357, 623, 854, 358, 623, 637, + + 855, 856, 637, 347, 857, 347, 860, 355, 867, 860, +- 629, 867, 3496, 629, 347, 357, 347, 863, 358, 2525, +- 863, 367, 357, 889, 368, 358, 3431, 635, 879, 367, +- 635, 871, 367, 3416, 866, 368, 858, 866, 880, 367, +- 367, 645, 368, 399, 861, 3411, 399, 367, 399, 3410, ++ 629, 867, 3504, 629, 347, 357, 347, 863, 358, 2527, ++ 863, 367, 357, 889, 368, 358, 3439, 635, 879, 367, ++ 635, 871, 367, 3424, 866, 368, 858, 866, 880, 367, ++ 367, 645, 368, 399, 861, 3418, 399, 367, 399, 3417, + 348, 383, 640, 428, 383, 734, 383, 1069, 734, 886, + 872, 348, 890, 902, 640, 359, 412, 868, 1069, 413, + 399, 864, 359, 903, 383, 640, 662, 383, 383, 382, +@@ -2126,21 +2129,21 @@ static const flex_int16_t yy_nxt[14349] = + 392, 921, 922, 924, 874, 925, 887, 888, 916, 873, + 590, 917, 912, 590, 392, 642, 640, 926, 389, 918, + 736, 906, 919, 736, 904, 980, 920, 647, 980, 921, +- 922, 924, 672, 925, 2276, 672, 2277, 412, 642, 640, ++ 922, 924, 672, 925, 2277, 672, 2278, 412, 642, 640, + 413, 983, 882, 875, 983, 926, 911, 878, 388, 911, +- 391, 412, 3404, 391, 413, 392, 383, 388, 653, 391, ++ 391, 412, 3411, 391, 413, 392, 383, 388, 653, 391, + 654, 927, 391, 655, 392, 428, 884, 653, 391, 654, + 928, 391, 655, 392, 929, 884, 892, 392, 654, 744, + + 391, 655, 744, 391, 884, 392, 392, 414, 894, 927, + 895, 1104, 1117, 896, 399, 391, 897, 399, 928, 399, +- 3368, 414, 929, 391, 932, 656, 899, 392, 392, 2525, ++ 3375, 414, 929, 391, 932, 656, 899, 392, 392, 2527, + 660, 403, 391, 404, 656, 391, 900, 392, 933, 658, +- 403, 399, 404, 893, 3309, 405, 934, 936, 658, 937, ++ 403, 399, 404, 893, 3316, 405, 934, 936, 658, 937, + 392, 938, 932, 678, 657, 898, 679, 391, 626, 392, + 899, 422, 392, 657, 1117, 403, 933, 404, 914, 406, + 900, 915, 657, 658, 934, 936, 422, 937, 406, 938, +- 1327, 3301, 3296, 391, 392, 939, 391, 659, 392, 940, ++ 1327, 3308, 3302, 391, 392, 939, 391, 659, 392, 940, + 941, 403, 666, 404, 1572, 666, 405, 392, 399, 658, + + 393, 908, 394, 1510, 908, 392, 392, 901, 423, 393, +@@ -2151,19 +2154,19 @@ static const flex_int16_t yy_nxt[14349] = + 966, 961, 945, 947, 953, 954, 395, 949, 950, 967, + 951, 952, 968, 957, 969, 958, 962, 391, 955, 959, + 956, 964, 948, 960, 963, 970, 972, 978, 966, 961, +- 991, 965, 3270, 991, 971, 949, 950, 967, 951, 952, ++ 991, 965, 3276, 991, 971, 949, 950, 967, 951, 952, + 968, 957, 969, 958, 962, 508, 973, 959, 974, 964, + + 975, 506, 2143, 970, 972, 978, 506, 995, 737, 965, +- 995, 737, 971, 738, 981, 740, 3255, 981, 740, 982, ++ 995, 737, 971, 738, 981, 740, 3261, 981, 740, 982, + 741, 1002, 984, 510, 973, 984, 974, 985, 975, 987, + 747, 1003, 987, 747, 988, 748, 992, 751, 1004, 992, + 751, 993, 752, 996, 512, 1005, 996, 513, 997, 1002, + 1012, 1013, 529, 998, 1014, 530, 266, 1015, 1016, 1003, + 529, 1017, 536, 1018, 1019, 537, 1004, 536, 1020, 1021, +- 536, 2525, 1022, 1005, 529, 2480, 1036, 2481, 1012, 1013, ++ 536, 2527, 1022, 1005, 529, 2482, 1036, 2483, 1012, 1013, + 1037, 1025, 1014, 1038, 536, 1015, 1016, 1023, 1026, 1017, +- 1024, 1018, 1019, 2525, 1000, 1027, 1020, 1021, 1034, 1028, ++ 1024, 1018, 1019, 2527, 1000, 1027, 1020, 1021, 1034, 1028, + + 1022, 1043, 1006, 1029, 1036, 1031, 1039, 1030, 1037, 1025, + 1041, 1038, 1008, 1046, 1047, 1023, 1026, 1035, 1024, 1032, +@@ -2172,7 +2175,7 @@ static const flex_int16_t yy_nxt[14349] = + 1055, 1046, 1047, 1049, 1056, 1035, 1057, 1032, 1048, 1033, + 1040, 1058, 1052, 1042, 1059, 1060, 1044, 1061, 1045, 1063, + 1064, 1065, 1066, 1067, 1068, 1053, 1070, 1071, 1055, 1072, +- 1074, 1075, 1056, 1050, 1057, 1078, 2525, 1079, 835, 1058, ++ 1074, 1075, 1056, 1050, 1057, 1078, 2527, 1079, 835, 1058, + 1080, 835, 1059, 1060, 1081, 1061, 1082, 1063, 1064, 1065, + 1066, 1067, 1068, 1076, 1070, 1071, 1083, 1072, 1074, 1075, + +@@ -2185,33 +2188,33 @@ static const flex_int16_t yy_nxt[14349] = + 347, 357, 347, 373, 358, 867, 1107, 866, 867, 870, + 866, 390, 367, 669, 632, 368, 383, 640, 622, 383, + 367, 383, 874, 1905, 1114, 835, 1108, 675, 835, 640, +- 889, 3205, 868, 383, 640, 1112, 383, 392, 383, 1130, ++ 889, 3211, 868, 383, 640, 1112, 383, 392, 383, 1130, + +- 1111, 3057, 394, 383, 628, 392, 640, 348, 2507, 868, ++ 1111, 3062, 394, 383, 628, 392, 640, 348, 2509, 868, + 872, 359, 431, 634, 399, 418, 391, 1129, 1127, 391, + 383, 392, 369, 1076, 653, 391, 1113, 1130, 391, 655, +- 392, 641, 884, 653, 1076, 654, 1115, 872, 655, 3055, +- 428, 884, 651, 392, 889, 2298, 391, 649, 873, 391, ++ 392, 641, 884, 653, 1076, 654, 1115, 872, 655, 3060, ++ 428, 884, 651, 392, 889, 2299, 391, 649, 873, 391, + 979, 392, 392, 979, 653, 399, 1113, 1460, 891, 655, + 642, 640, 884, 1131, 677, 671, 1205, 914, 1460, 399, + 915, 656, 399, 392, 399, 422, 391, 642, 640, 391, +- 885, 392, 1713, 1116, 894, 886, 895, 3331, 1132, 896, ++ 885, 392, 1713, 1116, 894, 886, 895, 3338, 1132, 896, + 399, 1131, 897, 399, 391, 399, 399, 391, 1133, 392, + + 657, 885, 653, 392, 654, 1134, 1119, 655, 1135, 657, +- 884, 980, 891, 755, 980, 911, 1132, 399, 911, 3194, +- 412, 392, 423, 413, 656, 3185, 1133, 1714, 1136, 1193, +- 657, 888, 1193, 1134, 391, 2810, 1135, 391, 391, 392, +- 2985, 391, 894, 392, 895, 898, 894, 896, 1121, 1118, +- 897, 896, 392, 888, 897, 393, 1136, 394, 2987, 391, ++ 884, 980, 891, 755, 980, 911, 1132, 399, 911, 3200, ++ 412, 392, 423, 413, 656, 3191, 1133, 1714, 1136, 1193, ++ 657, 888, 1193, 1134, 391, 2813, 1135, 391, 391, 392, ++ 2989, 391, 894, 392, 895, 898, 894, 896, 1121, 1118, ++ 897, 896, 392, 888, 897, 393, 1136, 394, 2991, 391, + 392, 392, 391, 392, 392, 392, 393, 1122, 394, 895, + 414, 392, 896, 891, 392, 897, 981, 983, 657, 981, + 983, 982, 1140, 1141, 1143, 392, 391, 1145, 1146, 898, +- 2810, 391, 1137, 898, 391, 908, 392, 1138, 908, 1125, ++ 2813, 391, 1137, 898, 391, 908, 392, 1138, 908, 1125, + +- 392, 404, 395, 393, 405, 394, 3142, 658, 392, 1139, ++ 392, 404, 395, 393, 405, 394, 3147, 658, 392, 1139, + 1140, 1141, 1143, 395, 1123, 1145, 1146, 1147, 391, 1148, +- 1137, 1149, 392, 3101, 2525, 1138, 1144, 1144, 1144, 1144, ++ 1137, 1149, 392, 3106, 2527, 1138, 1144, 1144, 1144, 1144, + 1144, 1144, 1144, 1144, 1144, 1150, 1151, 1139, 1152, 1153, + 1154, 1155, 1156, 1159, 1160, 1147, 665, 1148, 1161, 1149, + 395, 931, 931, 931, 931, 931, 931, 931, 931, 931, +@@ -2221,30 +2224,30 @@ static const flex_int16_t yy_nxt[14349] = + 1164, 1180, 1182, 1165, 1183, 1181, 1185, 1184, 1186, 1187, + + 1188, 1168, 1189, 1190, 1192, 1167, 1169, 1170, 1171, 1172, +- 1173, 1174, 1175, 1176, 1177, 1178, 3063, 1905, 1194, 1180, ++ 1173, 1174, 1175, 1176, 1177, 1178, 3068, 1905, 1194, 1180, + 1182, 1194, 1183, 1181, 1185, 1184, 1186, 1187, 1188, 1207, +- 1189, 1190, 1192, 984, 1195, 3055, 984, 1195, 985, 1196, +- 987, 1197, 2880, 987, 1197, 988, 1198, 991, 3042, 1198, ++ 1189, 1190, 1192, 984, 1195, 3060, 984, 1195, 985, 1196, ++ 987, 1197, 2884, 987, 1197, 988, 1198, 991, 3047, 1198, + 991, 1199, 992, 1201, 1209, 992, 1201, 993, 1202, 995, + 1210, 1202, 995, 1203, 996, 1204, 510, 996, 1204, 997, + 516, 1206, 1211, 1208, 1213, 529, 759, 1215, 1212, 1218, + 1219, 536, 1209, 529, 1214, 1220, 536, 1221, 1210, 536, +- 3002, 1222, 1460, 533, 1223, 1224, 540, 3001, 1225, 1226, ++ 3014, 1222, 1460, 533, 1223, 1224, 540, 3006, 1225, 1226, + + 1211, 1227, 1228, 1460, 1229, 1230, 1235, 1218, 1219, 1231, +- 1232, 1233, 1234, 1220, 1238, 1221, 1239, 3146, 757, 1222, ++ 1232, 1233, 1234, 1220, 1238, 1221, 1239, 3151, 757, 1222, + 761, 769, 1223, 1224, 773, 767, 1225, 1226, 1240, 1227, + 1228, 771, 1229, 1230, 1235, 1241, 1242, 1231, 1232, 1233, + 1234, 1236, 1238, 1243, 1239, 1237, 1244, 1245, 1246, 1247, + 1250, 1253, 1255, 1248, 1251, 1249, 1240, 1256, 1252, 1257, +- 1258, 1259, 1260, 1241, 1242, 1265, 1266, 2810, 1254, 1236, ++ 1258, 1259, 1260, 1241, 1242, 1265, 1266, 2813, 1254, 1236, + 1269, 1243, 1270, 1237, 1244, 1245, 1246, 1247, 1250, 1253, + 1255, 1248, 1251, 1249, 1271, 1256, 1252, 1257, 1258, 1259, + 1260, 1261, 1267, 1265, 1266, 1262, 1254, 1272, 1269, 1273, + +- 1270, 1274, 1263, 1267, 1264, 2992, 1275, 1276, 1277, 1279, +- 1280, 1281, 1271, 1282, 1283, 1284, 1285, 1286, 2987, 1261, +- 1294, 1295, 2950, 1262, 1296, 1272, 1297, 1273, 1298, 1274, ++ 1270, 1274, 1263, 1267, 1264, 3005, 1275, 1276, 1277, 1279, ++ 1280, 1281, 1271, 1282, 1283, 1284, 1285, 1286, 2996, 1261, ++ 1294, 1295, 2991, 1262, 1296, 1272, 1297, 1273, 1298, 1274, + 1263, 1299, 1264, 1268, 1275, 1276, 1277, 1279, 1280, 1281, + 1300, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1294, 1295, + 1289, 1301, 1296, 1302, 1297, 1290, 1298, 1303, 1304, 1299, +@@ -2253,24 +2256,24 @@ static const flex_int16_t yy_nxt[14349] = + 1317, 1302, 1318, 1290, 1319, 1303, 1304, 351, 1305, 1291, + 1306, 1307, 1308, 1292, 1309, 1293, 889, 1310, 1311, 1312, + +- 1313, 1314, 889, 2933, 1315, 1316, 383, 640, 1317, 383, ++ 1313, 1314, 889, 2954, 1315, 1316, 383, 640, 1317, 383, + 1318, 383, 1319, 1322, 1326, 355, 870, 889, 391, 1320, +- 2298, 391, 868, 392, 2875, 428, 653, 391, 654, 1335, +- 391, 1324, 392, 383, 884, 1330, 3602, 654, 3603, 391, ++ 2937, 391, 868, 392, 2299, 428, 653, 391, 654, 1335, ++ 391, 1324, 392, 383, 884, 1330, 3612, 654, 3613, 391, + 655, 1328, 391, 884, 392, 392, 1337, 894, 1331, 1121, + 1334, 1338, 896, 431, 391, 897, 1117, 1335, 662, 1339, +- 2298, 641, 1193, 885, 891, 1193, 392, 399, 1194, 399, ++ 2879, 641, 1193, 885, 891, 1193, 392, 399, 1194, 399, + 891, 1194, 399, 656, 1337, 399, 1340, 399, 1195, 1338, +- 2836, 1195, 893, 1196, 1323, 1327, 1397, 1339, 1119, 1397, +- 1321, 640, 2835, 391, 888, 1332, 391, 906, 392, 399, ++ 2299, 1195, 893, 1196, 1323, 1327, 1397, 1339, 1119, 1397, ++ 1321, 640, 2840, 391, 888, 1332, 391, 906, 392, 399, + + 1341, 894, 1325, 895, 1340, 391, 896, 1342, 391, 897, + 392, 657, 1344, 894, 399, 895, 1345, 399, 896, 399, + 392, 897, 1348, 1343, 1350, 1351, 1352, 898, 1341, 1353, + 660, 1354, 392, 1356, 1357, 1342, 1358, 1360, 1361, 1362, +- 1344, 399, 1363, 2812, 1345, 1364, 1365, 1366, 898, 2774, +- 1348, 1343, 1350, 1351, 1352, 1197, 2361, 1353, 1197, 1354, +- 1333, 1356, 1357, 2359, 1358, 1360, 1361, 1362, 1368, 406, ++ 1344, 399, 1363, 2839, 1345, 1364, 1365, 1366, 898, 2815, ++ 1348, 1343, 1350, 1351, 1352, 1197, 2777, 1353, 1197, 1354, ++ 1333, 1356, 1357, 2362, 1358, 1360, 1361, 1362, 1368, 406, + 1363, 1349, 1369, 1364, 1365, 1366, 1370, 1325, 1144, 1144, + 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1367, 1367, 1367, + 1367, 1367, 1367, 1367, 1367, 1367, 1368, 1371, 399, 1372, +@@ -2278,7 +2281,7 @@ static const flex_int16_t yy_nxt[14349] = + 1369, 1373, 1374, 1377, 1370, 1375, 1376, 1378, 1379, 1380, + 1381, 1382, 1383, 1384, 1385, 1387, 1388, 1389, 1390, 1391, + 1398, 1198, 508, 1398, 1198, 1371, 1199, 1372, 1402, 1373, +- 1374, 1377, 2742, 1375, 1376, 1378, 1379, 1380, 1381, 1382, ++ 1374, 1377, 2360, 1375, 1376, 1378, 1379, 1380, 1381, 1382, + 1383, 1384, 1385, 1387, 1388, 1389, 1390, 1391, 1399, 1201, + 510, 1399, 1201, 1400, 1202, 1401, 1402, 1202, 1401, 1203, + 1204, 1403, 1404, 1204, 1407, 1408, 1409, 1410, 1411, 1412, +@@ -2289,7 +2292,7 @@ static const flex_int16_t yy_nxt[14349] = + 1415, 1416, 1417, 1418, 1419, 1420, 1422, 1423, 1424, 1425, + 1426, 1421, 1427, 1428, 1429, 1430, 1431, 1433, 1434, 1432, + 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1445, +- 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 2740, ++ 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 2745, + 1459, 1461, 1462, 1444, 1463, 1433, 1434, 1465, 1435, 1436, + 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1445, 1446, 1447, + 1448, 1449, 1450, 1451, 1452, 1453, 1454, 1455, 1459, 1461, +@@ -2301,19 +2304,19 @@ static const flex_int16_t yy_nxt[14349] = + 1475, 1457, 1458, 1477, 1478, 1479, 1480, 1482, 1483, 1484, + 1486, 1487, 1481, 1494, 1488, 1489, 1490, 1491, 1492, 1495, + 1496, 1493, 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, +- 1505, 1506, 1507, 1508, 870, 889, 1512, 2683, 662, 1397, +- 1515, 1494, 1397, 1398, 2513, 2511, 1398, 1495, 1496, 3952, ++ 1505, 1506, 1507, 1508, 870, 889, 1512, 2743, 662, 1397, ++ 1515, 1494, 1397, 1398, 2686, 2515, 1398, 1495, 1496, 3965, + 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, + 1507, 1508, 391, 1509, 1512, 391, 1516, 392, 1515, 1517, +- 894, 889, 895, 871, 890, 896, 1518, 3602, 897, 3603, +- 399, 2091, 399, 399, 1519, 399, 2298, 1520, 1576, 392, ++ 894, 889, 895, 871, 890, 896, 1518, 3612, 897, 3613, ++ 399, 2513, 399, 399, 1519, 399, 2091, 1520, 1576, 392, + +- 1513, 1576, 1514, 1521, 1516, 1522, 886, 1517, 1527, 3673, +- 1528, 3674, 872, 891, 1518, 659, 391, 399, 1529, 391, ++ 1513, 1576, 1514, 1521, 1516, 1522, 886, 1517, 1527, 3684, ++ 1528, 3685, 872, 891, 1518, 659, 391, 399, 1529, 391, + 1116, 392, 1519, 1530, 1511, 1520, 895, 898, 1513, 896, + 1514, 1521, 897, 1522, 1524, 1531, 1527, 1524, 1528, 1524, + 1532, 1537, 1533, 391, 1525, 656, 1529, 1524, 1538, 891, +- 2298, 1530, 1539, 1541, 1547, 1548, 1551, 1552, 1553, 1554, ++ 2299, 1530, 1539, 1541, 1547, 1548, 1551, 1552, 1553, 1554, + 1555, 1399, 1401, 1531, 1399, 1401, 1400, 1583, 1532, 1537, + 1583, 1123, 1535, 1556, 888, 1557, 1538, 1558, 1536, 1559, + 1539, 1541, 1547, 1548, 1551, 1552, 1553, 1554, 1555, 1526, +@@ -2327,14 +2330,14 @@ static const flex_int16_t yy_nxt[14349] = + 1585, 1586, 1587, 1588, 1589, 1594, 1590, 1591, 1599, 1592, + 1600, 1593, 1597, 1598, 1601, 1602, 1603, 1604, 1595, 1605, + 1606, 1610, 1611, 1596, 1612, 1613, 1607, 1614, 1608, 1615, +- 1616, 1609, 2490, 1594, 1623, 1624, 1599, 1625, 1600, 1626, ++ 1616, 1609, 2299, 1594, 1623, 1624, 1599, 1625, 1600, 1626, + 1627, 1628, 1601, 1602, 1603, 1604, 1595, 1605, 1606, 1610, + + 1611, 1596, 1612, 1613, 1607, 1614, 1608, 1615, 1616, 1609, + 1617, 1629, 1623, 1624, 1618, 1625, 1630, 1626, 1627, 1628, + 1631, 1619, 1632, 1620, 1621, 1633, 1622, 1634, 1635, 1636, + 1637, 1638, 1639, 1640, 1641, 1642, 1643, 1647, 1617, 1629, +- 1648, 1649, 1618, 1650, 1630, 1651, 2488, 1658, 1631, 1619, ++ 1648, 1649, 1618, 1650, 1630, 1651, 2492, 1658, 1631, 1619, + 1632, 1620, 1621, 1633, 1622, 1634, 1635, 1636, 1637, 1638, + 1639, 1640, 1641, 1642, 1643, 1647, 1659, 1652, 1648, 1649, + 1660, 1650, 1665, 1651, 1653, 1658, 1666, 1663, 1667, 1668, +@@ -2345,15 +2348,15 @@ static const flex_int16_t yy_nxt[14349] = + 1654, 1661, 1671, 1662, 1672, 1655, 1685, 1673, 1674, 1675, + 1676, 1677, 1686, 1680, 1678, 1679, 1687, 1664, 1681, 1682, + 1688, 1683, 1689, 1684, 1690, 1691, 1692, 1693, 1695, 1697, +- 1698, 1699, 889, 1696, 1685, 1701, 1702, 3673, 1703, 3674, ++ 1698, 1699, 889, 1696, 1685, 1701, 1702, 3684, 1703, 3685, + 1686, 1680, 1704, 1694, 1687, 1705, 1681, 1706, 1688, 1707, + 1689, 1757, 1690, 1691, 1692, 1693, 1695, 1697, 1698, 1699, + 1700, 1696, 399, 1701, 1702, 399, 1703, 399, 1117, 1708, +- 1704, 1694, 2076, 1705, 1709, 1706, 1710, 1707, 1119, 399, ++ 1704, 1694, 2490, 1705, 1709, 1706, 1710, 1707, 1119, 399, + 1524, 1524, 1716, 1524, 1524, 1524, 1524, 1719, 1720, 399, + + 1711, 1711, 1721, 1524, 1524, 1576, 1395, 1708, 1576, 885, +- 891, 2680, 1709, 1726, 1710, 1723, 1727, 1332, 2677, 1724, ++ 891, 2076, 1709, 1726, 1710, 1723, 1727, 1332, 2683, 1724, + 1716, 1725, 1728, 1729, 1730, 1719, 1720, 898, 1732, 1733, + 1721, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, + 1736, 1726, 1737, 1723, 1727, 1712, 1526, 1724, 1738, 1725, +@@ -2379,8 +2382,8 @@ static const flex_int16_t yy_nxt[14349] = + 1814, 1824, 1825, 1826, 1815, 1818, 1819, 1827, 1820, 1821, + 1822, 1828, 1823, 1829, 1830, 1832, 1833, 1834, 1835, 1836, + 1817, 1837, 1838, 1848, 1850, 1851, 1852, 1853, 1854, 1824, +- 1825, 1826, 1855, 1839, 1848, 1827, 1856, 1857, 3738, 1828, +- 3739, 1829, 1830, 1832, 1833, 1834, 1835, 1836, 2656, 1837, ++ 1825, 1826, 1855, 1839, 1848, 1827, 1856, 1857, 3750, 1828, ++ 3751, 1829, 1830, 1832, 1833, 1834, 1835, 1836, 2680, 1837, + 1838, 1858, 1850, 1851, 1852, 1853, 1854, 1859, 1860, 1861, + 1855, 1839, 1840, 1841, 1856, 1857, 1842, 1862, 1843, 1863, + 1864, 1865, 1844, 1845, 1866, 1867, 1846, 1868, 1869, 1858, +@@ -2390,15 +2393,15 @@ static const flex_int16_t yy_nxt[14349] = + 1844, 1845, 1866, 1867, 1846, 1868, 1869, 1882, 1870, 1847, + 1871, 1872, 1873, 1877, 1883, 1879, 1874, 1875, 1880, 1884, + 1876, 1881, 1885, 1117, 1887, 1888, 1878, 1889, 1890, 1891, +- 1894, 1892, 1895, 1898, 1900, 1882, 3738, 1903, 3739, 1904, +- 1906, 1877, 1883, 1879, 1893, 2985, 1880, 1884, 1907, 1908, ++ 1894, 1892, 1895, 1898, 1900, 1882, 3750, 1903, 3751, 1904, ++ 1906, 1877, 1883, 1879, 1893, 2989, 1880, 1884, 1907, 1908, + 1885, 1909, 1887, 1888, 1878, 1889, 1890, 1891, 1894, 1892, +- 1895, 1524, 1900, 2646, 1524, 1903, 1524, 1904, 1906, 1913, +- 1918, 1896, 1893, 1905, 1524, 2636, 1907, 1908, 1899, 1909, ++ 1895, 1524, 1900, 2659, 1524, 1903, 1524, 1904, 1906, 1913, ++ 1918, 1896, 1893, 1905, 1524, 2648, 1907, 1908, 1899, 1909, + + 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1910, +- 888, 1911, 1914, 2634, 2618, 2986, 3952, 1913, 1918, 3952, +- 2603, 3952, 1919, 1920, 1915, 1921, 1922, 1923, 1924, 1916, ++ 888, 1911, 1914, 2638, 2636, 2990, 3965, 1913, 1918, 3965, ++ 2620, 3965, 1919, 1920, 1915, 1921, 1922, 1923, 1924, 1916, + 1925, 1926, 1927, 1928, 1929, 1930, 1526, 1910, 1572, 1911, + 1914, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, + 1919, 1920, 1915, 1921, 1922, 1923, 1924, 1916, 1925, 1926, +@@ -2422,12 +2425,12 @@ static const flex_int16_t yy_nxt[14349] = + 2000, 1996, 2001, 2003, 2004, 2005, 2014, 2002, 2006, 2007, + 2019, 2010, 2021, 2022, 2011, 2023, 2012, 2024, 2015, 2016, + 2013, 2025, 2026, 2009, 2017, 2027, 2028, 2018, 2029, 2031, +- 2032, 2033, 2034, 2035, 2036, 2037, 2043, 3646, 2019, 2044, ++ 2032, 2033, 2034, 2035, 2036, 2037, 2043, 3656, 2019, 2044, + 2021, 2022, 2030, 2023, 2045, 2024, 2046, 2047, 2048, 2025, +- 2026, 2361, 2050, 2027, 2028, 2051, 2029, 2031, 2032, 2033, ++ 2026, 2605, 2050, 2027, 2028, 2051, 2029, 2031, 2032, 2033, + 2034, 2035, 2036, 2037, 2043, 2038, 2039, 2044, 2052, 2053, + 2030, 2040, 2045, 2054, 2046, 2047, 2048, 2055, 2056, 2041, +- 2050, 2057, 2042, 2051, 2058, 2059, 2060, 3647, 2066, 2075, ++ 2050, 2057, 2042, 2051, 2058, 2059, 2060, 3657, 2066, 2075, + + 2067, 2068, 2069, 2038, 2039, 2070, 2052, 2053, 2061, 2040, + 2062, 2054, 2071, 2072, 2063, 2055, 2056, 2041, 2077, 2057, +@@ -2435,14 +2438,14 @@ static const flex_int16_t yy_nxt[14349] = + 2069, 2081, 2082, 2070, 2083, 2084, 2061, 2061, 2062, 2062, + 2071, 2072, 2063, 2063, 2076, 2079, 2077, 2085, 2086, 2078, + 1713, 1713, 2080, 2064, 2064, 2065, 2073, 2090, 2092, 2081, +- 2082, 2093, 2083, 2084, 2094, 2061, 2095, 2062, 2359, 2098, +- 2096, 2063, 2097, 2079, 2281, 2085, 2086, 2099, 1524, 2100, ++ 2082, 2093, 2083, 2084, 2094, 2061, 2095, 2062, 2362, 2098, ++ 2096, 2063, 2097, 2079, 2282, 2085, 2086, 2099, 1524, 2100, + 2080, 1524, 2064, 1524, 2073, 2101, 2092, 2102, 1711, 2093, + 2103, 1524, 2094, 2104, 2095, 1714, 1899, 2098, 2096, 2115, + +- 2097, 2116, 2091, 2117, 2118, 2099, 2550, 2100, 2119, 2120, +- 2121, 2122, 2123, 2101, 2166, 2102, 2511, 2166, 2103, 2282, +- 2091, 2104, 2124, 2125, 2127, 2297, 2128, 2115, 2298, 2116, ++ 2097, 2116, 2091, 2117, 2118, 2099, 2360, 2100, 2119, 2120, ++ 2121, 2122, 2123, 2101, 2166, 2102, 2552, 2166, 2103, 2283, ++ 2513, 2104, 2124, 2125, 2127, 2298, 2128, 2115, 2299, 2116, + 2126, 2117, 2118, 1712, 2105, 2129, 2119, 2120, 2121, 2122, + 2123, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, + 2124, 2125, 2127, 2107, 2128, 2108, 2109, 2110, 2126, 2130, +@@ -2454,7 +2457,7 @@ static const flex_int16_t yy_nxt[14349] = + 2141, 2149, 2151, 2113, 2134, 2147, 2145, 2148, 2147, 2155, + 2152, 2156, 2157, 2158, 2153, 2159, 2160, 2161, 2162, 2154, + 2163, 2164, 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, +- 2175, 2176, 1947, 2177, 2508, 2180, 2181, 2155, 2182, 2156, ++ 2175, 2176, 1947, 2177, 2091, 2180, 2181, 2155, 2182, 2156, + 2157, 2158, 2183, 2159, 2160, 2161, 2162, 2184, 2163, 2164, + 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, + 1949, 2177, 1981, 2180, 2181, 1981, 2182, 2179, 2185, 2186, +@@ -2464,997 +2467,999 @@ static const flex_int16_t yy_nxt[14349] = + + 2188, 2189, 2190, 2206, 2191, 2192, 2193, 2194, 2211, 2197, + 2198, 2212, 2199, 2213, 2200, 2201, 2202, 2203, 2204, 2205, +- 2214, 2207, 2208, 2209, 2215, 2216, 2210, 2217, 2507, 2166, +- 2488, 2229, 2166, 2230, 2385, 3952, 2211, 2231, 3952, 2212, +- 3952, 2213, 2232, 2233, 2234, 2076, 2235, 2485, 2214, 2236, +- 2237, 2238, 2215, 2216, 2239, 2217, 2218, 2219, 2220, 2229, +- 2221, 2230, 2222, 2223, 2240, 2231, 2224, 2225, 2226, 2241, +- 2232, 2233, 2234, 2227, 2235, 2228, 2242, 2236, 2237, 2238, ++ 2214, 2207, 2208, 2209, 2215, 2216, 2210, 2217, 2510, 2166, ++ 2509, 2230, 2166, 2231, 2386, 3965, 2211, 2232, 3965, 2212, ++ 3965, 2213, 3965, 2233, 2234, 3965, 2235, 3965, 2214, 2236, ++ 2237, 2238, 2215, 2216, 2239, 2217, 2218, 2219, 2220, 2230, ++ 2221, 2231, 2222, 2223, 2240, 2232, 2224, 2225, 2226, 2241, ++ 2227, 2233, 2234, 2228, 2235, 2229, 2242, 2236, 2237, 2238, + 2243, 2244, 2239, 2245, 2218, 2219, 2220, 2246, 2221, 2247, +- 2222, 2223, 2240, 2248, 2224, 2225, 2226, 2241, 2249, 2250, +- +- 2251, 2227, 2252, 2228, 2242, 2253, 2254, 2256, 2243, 2244, +- 2257, 2245, 2258, 2259, 2262, 2246, 2263, 2247, 2264, 2265, +- 2266, 2248, 2267, 2268, 2269, 2272, 2249, 2250, 2251, 2270, +- 2252, 2271, 2273, 2253, 2254, 2256, 2278, 2279, 2257, 2280, +- 2258, 2259, 2262, 2284, 2263, 2281, 2264, 2265, 2266, 2286, +- 2267, 2268, 2269, 2272, 2287, 2288, 2289, 2270, 2290, 2271, +- 2273, 2291, 2299, 2292, 2278, 2279, 2293, 2280, 2294, 2295, +- 2302, 2299, 2304, 2305, 2306, 2307, 2308, 2286, 2309, 2470, +- 2310, 2311, 2287, 2288, 2289, 2312, 2290, 2427, 2285, 2291, +- 2076, 2292, 2313, 2314, 2293, 2315, 2294, 2295, 2427, 2428, +- +- 2304, 2305, 2306, 2307, 2308, 2324, 2309, 2300, 2310, 2311, +- 2428, 2461, 2361, 2312, 2325, 2303, 2091, 2326, 2359, 2329, +- 2313, 2314, 2330, 2315, 2316, 2316, 2316, 2316, 2316, 2316, +- 2316, 2316, 2316, 2324, 2331, 2333, 2317, 2334, 2318, 2319, +- 2320, 2327, 2325, 2335, 2321, 2326, 2328, 2329, 2336, 2322, +- 2330, 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2323, 2261, +- 2145, 2146, 2331, 2333, 2317, 2334, 2318, 2319, 2320, 2327, +- 2344, 2335, 2321, 2345, 2328, 2346, 2336, 2322, 2347, 2337, +- 2338, 2339, 2340, 2341, 2342, 2343, 2323, 2106, 2106, 2106, +- 2106, 2106, 2106, 2106, 2106, 2106, 2348, 2349, 2344, 2350, +- +- 2351, 2345, 2352, 2346, 2353, 2354, 2347, 2355, 2356, 2357, +- 2144, 2145, 2146, 2144, 1947, 2147, 2145, 2148, 2147, 2145, +- 2148, 2362, 2363, 2364, 2348, 2349, 2365, 2350, 2351, 2366, +- 2352, 2375, 2353, 2354, 2376, 2355, 2356, 2357, 2377, 2378, +- 2379, 2380, 2387, 2381, 2382, 2387, 2260, 2383, 2384, 2362, +- 2363, 2364, 2389, 2390, 2365, 2391, 2392, 2366, 2393, 2375, +- 2394, 2395, 2376, 2396, 2397, 1947, 2377, 2378, 2379, 2380, +- 1949, 2381, 2382, 1949, 2367, 2383, 2384, 2367, 2255, 2398, +- 2389, 2390, 2388, 2391, 2392, 2400, 2393, 2401, 2394, 2395, +- 2165, 2396, 2397, 2368, 2150, 2402, 2403, 2404, 2405, 2406, +- +- 2407, 2408, 2409, 2411, 2412, 2413, 2369, 2398, 2370, 2414, +- 2388, 3952, 2416, 2400, 3952, 2401, 3952, 2417, 2371, 2418, +- 2372, 2373, 2374, 2402, 2403, 2404, 2405, 2406, 2407, 2408, +- 2409, 2411, 2412, 2413, 2369, 2419, 2370, 2414, 2420, 2421, +- 2416, 2422, 2421, 2423, 2424, 2417, 2371, 2418, 2372, 2373, +- 2374, 2425, 2426, 2429, 2430, 2431, 2432, 2433, 2434, 2436, +- 2437, 2438, 2439, 2419, 2440, 2441, 2420, 2435, 2442, 2422, +- 2443, 2423, 2424, 2444, 2445, 2448, 2446, 2449, 2450, 2425, +- 2426, 2429, 2430, 2431, 2432, 2433, 2434, 2436, 2437, 2438, +- 2439, 2447, 2440, 2441, 2451, 2452, 2442, 2453, 2443, 2454, +- +- 2455, 2444, 2445, 2448, 2446, 2449, 2450, 2456, 2457, 2458, +- 2459, 2460, 2462, 2463, 2464, 2465, 2466, 2467, 2468, 2447, +- 2469, 2471, 2451, 2452, 2472, 2453, 2473, 2454, 2455, 2474, +- 2475, 2476, 2477, 2478, 2479, 2456, 2457, 2458, 2459, 2460, +- 2462, 2463, 2464, 2465, 2466, 2467, 2468, 2482, 2469, 2471, +- 2483, 2484, 2472, 2486, 2473, 2489, 2491, 2474, 2475, 2476, +- 2477, 2478, 2479, 2492, 2493, 2494, 2495, 2496, 2497, 2498, +- 2509, 2499, 2512, 2514, 2515, 2482, 1949, 2502, 2483, 2484, +- 2502, 2516, 2502, 2517, 2491, 2518, 2519, 2503, 2520, 1947, +- 2504, 2492, 2493, 2494, 2495, 2496, 2497, 2498, 2487, 2499, +- +- 2490, 2514, 2515, 2521, 2505, 2522, 2523, 2524, 2526, 2516, +- 2527, 2517, 2525, 2518, 2519, 2510, 2520, 2513, 2528, 2316, +- 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2531, 2532, +- 2533, 2521, 2506, 2522, 2523, 2524, 2526, 2529, 2527, 2534, +- 2535, 2536, 2530, 2537, 2538, 2539, 2528, 2540, 2541, 2542, +- 2543, 2544, 2545, 2546, 2547, 2548, 2531, 2532, 2533, 2549, +- 2551, 2552, 2553, 2554, 2555, 2529, 2556, 2534, 2535, 2536, +- 2530, 2537, 2538, 2539, 2557, 2540, 2541, 2542, 2543, 2544, +- 2545, 2546, 2547, 2548, 2558, 2559, 2565, 2549, 2551, 2552, +- 2553, 2554, 2555, 2566, 2556, 2561, 2562, 2567, 2561, 2569, +- +- 2564, 2562, 2557, 2564, 2568, 2367, 2572, 2573, 2367, 2572, +- 2570, 2574, 2558, 2559, 2565, 2576, 2577, 2575, 2578, 2579, +- 2580, 2566, 2114, 2581, 2582, 2567, 2581, 2569, 2583, 2584, +- 2585, 2586, 2568, 2587, 2588, 2573, 2589, 3952, 2088, 2574, +- 3952, 2593, 3952, 2576, 2577, 2575, 2578, 2579, 2580, 2594, +- 2359, 2595, 2582, 2596, 2597, 2361, 2583, 2584, 2585, 2586, +- 2598, 2587, 2588, 2387, 2589, 2358, 2387, 2599, 2591, 2593, +- 2360, 2600, 2601, 2602, 2604, 2601, 2605, 2594, 2606, 2595, +- 2607, 2596, 2597, 2608, 2609, 2610, 2611, 2612, 2598, 2613, +- 2614, 2615, 2616, 2617, 2619, 2599, 2620, 2621, 2622, 2600, +- +- 2621, 2602, 2604, 2623, 2605, 2627, 2606, 2628, 2607, 2629, +- 2630, 2608, 2609, 2610, 2611, 2612, 2631, 2613, 2614, 2615, +- 2616, 2617, 2619, 2632, 2620, 2625, 2622, 2633, 2625, 2635, +- 2626, 2623, 2637, 2627, 2639, 2628, 2640, 2629, 2630, 2641, +- 2642, 2643, 2644, 2637, 2631, 2087, 2645, 2647, 2648, 2649, +- 2650, 2632, 2651, 2652, 2653, 2633, 2654, 2635, 2655, 2657, +- 2658, 2659, 2639, 2660, 2640, 2661, 2662, 2641, 2642, 2643, +- 2644, 2663, 2664, 2638, 2645, 2647, 2648, 2649, 2650, 2665, +- 2651, 2652, 2653, 2666, 2654, 2667, 2655, 2657, 2658, 2659, +- 2668, 2660, 2669, 2661, 2662, 2670, 2671, 2672, 2673, 2663, +- +- 2664, 2674, 2675, 2676, 2678, 2679, 2681, 2665, 2281, 2486, +- 2683, 2666, 2684, 2667, 2685, 2686, 2687, 2688, 2668, 2689, +- 2669, 2690, 2695, 2670, 2671, 2672, 2673, 2298, 1899, 2674, +- 2675, 2676, 2678, 2679, 2572, 2707, 2709, 2572, 2683, 2696, +- 2684, 2500, 2685, 2686, 2687, 2688, 2299, 2689, 2509, 2690, +- 2049, 2490, 2502, 2682, 2490, 2502, 2502, 2502, 2710, 2502, +- 2711, 2502, 2692, 2020, 2709, 2504, 2699, 2697, 2502, 2698, +- 2712, 2502, 2502, 2502, 1905, 2502, 2713, 2502, 2703, 2693, +- 2513, 2504, 2692, 2700, 2714, 2504, 2710, 2715, 2711, 2716, +- 2717, 2708, 2718, 2513, 2719, 2704, 2720, 2721, 2712, 2693, +- +- 2722, 2723, 1905, 2724, 2713, 2725, 2726, 2694, 2727, 2728, +- 2729, 2701, 2714, 2730, 2731, 2715, 2732, 2716, 2717, 2733, +- 2718, 2734, 2719, 2705, 2720, 2721, 2735, 2506, 2722, 2723, +- 2736, 2724, 2737, 2725, 2726, 2738, 2727, 2728, 2729, 2739, +- 2741, 2730, 2731, 2743, 2732, 2744, 2745, 2733, 2746, 2734, +- 2747, 2748, 2749, 2750, 2735, 2751, 2561, 2562, 2736, 2561, +- 2737, 2564, 2562, 2738, 2564, 2752, 2753, 2739, 2741, 2754, +- 2757, 2743, 2758, 2744, 2745, 2759, 2746, 2760, 2747, 2748, +- 2749, 2750, 2761, 2751, 2762, 2763, 2764, 2581, 1949, 2767, +- 2581, 2768, 2765, 2752, 2753, 2769, 2770, 2754, 2757, 2771, +- +- 2758, 2772, 2773, 2759, 2776, 2760, 2777, 2778, 2779, 2780, +- 2761, 2359, 2762, 2763, 2764, 2781, 2361, 2767, 2782, 2768, +- 2783, 2786, 2785, 2769, 2770, 2785, 2358, 2771, 2787, 2772, +- 2773, 2360, 2776, 2788, 2777, 2778, 2779, 2780, 2789, 2790, +- 2791, 2792, 2793, 2781, 2794, 2795, 2782, 2794, 2783, 2786, +- 2797, 2798, 2799, 2800, 2801, 2802, 2787, 2621, 2805, 2806, +- 2621, 2788, 2803, 2807, 2796, 2811, 2789, 2790, 2791, 2792, +- 2793, 2625, 2813, 2795, 2625, 2814, 2626, 2815, 2797, 2798, +- 2799, 2800, 2801, 2802, 2816, 2817, 2805, 2806, 2818, 2819, +- 2820, 2807, 2796, 2811, 2821, 2822, 2823, 2824, 2825, 2826, +- +- 2813, 2827, 2828, 2814, 2829, 2815, 2830, 2831, 2832, 2833, +- 2834, 2837, 2816, 2817, 2838, 2839, 2818, 2819, 2820, 2840, +- 2841, 2842, 2821, 2822, 2823, 2824, 2825, 2826, 2843, 2827, +- 2828, 2844, 2829, 2845, 2830, 2831, 2832, 2833, 2834, 2837, +- 2846, 2847, 2838, 2839, 2848, 2849, 2850, 2840, 2841, 2842, +- 2851, 2852, 2853, 2854, 2855, 2856, 2843, 2857, 2858, 2844, +- 2859, 2845, 2860, 2486, 2861, 2862, 2863, 2864, 2846, 2847, +- 2865, 2866, 2848, 2849, 2850, 2867, 2509, 2298, 2851, 2852, +- 2853, 2854, 2855, 2856, 2954, 2857, 2858, 2954, 2859, 2507, +- 2860, 2500, 1947, 2862, 2863, 2864, 2876, 2869, 2865, 2866, +- +- 2869, 2502, 2869, 2867, 2502, 2879, 2502, 2870, 2487, 2076, +- 2871, 2874, 2506, 2877, 2504, 2298, 2892, 2881, 2891, 2698, +- 2869, 2510, 2696, 2869, 2872, 2869, 2893, 2990, 2693, 2500, +- 2883, 1945, 2502, 2871, 2894, 2502, 2955, 2502, 2990, 2955, +- 2785, 2878, 2886, 2785, 2892, 2895, 2890, 2884, 2896, 2298, +- 2880, 2897, 2873, 2898, 2893, 2502, 2506, 2899, 2502, 2700, +- 2502, 2869, 2894, 2091, 2869, 2703, 2869, 2502, 2504, 2900, +- 2502, 2870, 2502, 2895, 2871, 2885, 2896, 2889, 2901, 2897, +- 2504, 2898, 2704, 2902, 2903, 2899, 2904, 2887, 2872, 2905, +- 2906, 2907, 2908, 2909, 2704, 2910, 2911, 2900, 2912, 2913, +- +- 2914, 2915, 2916, 2917, 2918, 2919, 2901, 2920, 2921, 2922, +- 2705, 2902, 2903, 2923, 2904, 2924, 2873, 2905, 2906, 2907, +- 2908, 2909, 2890, 2910, 2911, 2925, 2912, 2913, 2914, 2915, +- 2916, 2917, 2918, 2919, 2926, 2920, 2921, 2922, 2927, 2928, +- 2929, 2923, 2930, 2924, 2931, 2932, 2934, 2935, 2936, 2937, +- 2938, 2939, 2940, 2925, 2941, 2943, 2944, 2945, 2946, 2947, +- 2948, 2949, 2926, 2951, 2952, 2953, 2927, 2928, 2929, 2956, +- 2930, 2957, 2931, 2932, 2934, 2935, 2936, 2937, 2938, 2939, +- 2940, 2958, 2941, 2943, 2944, 2945, 2946, 2947, 2948, 2949, +- 2959, 2951, 2952, 2953, 2960, 2962, 2967, 2956, 2968, 2957, +- +- 2969, 2970, 2794, 2963, 2964, 2794, 2965, 2971, 2966, 2958, +- 2973, 2974, 2975, 2976, 2977, 2978, 2979, 2980, 2959, 2982, +- 2983, 2984, 2988, 2962, 2967, 2961, 2968, 2989, 2969, 2970, +- 2991, 2963, 2964, 2994, 2965, 2993, 2966, 2995, 2973, 2974, +- 2975, 2976, 2977, 2978, 2979, 2980, 2993, 2982, 2983, 2984, +- 2988, 2996, 2997, 2961, 2998, 2989, 2999, 3000, 2991, 3003, +- 3005, 2994, 3006, 3007, 3008, 2995, 3009, 3010, 3011, 3012, +- 3013, 3014, 3015, 3004, 3016, 3017, 3018, 3009, 3019, 2996, +- 2997, 3020, 2998, 3021, 2999, 3000, 3022, 3003, 3005, 3023, +- 3006, 3007, 3008, 3024, 3025, 3010, 3011, 3012, 3013, 3014, +- +- 3015, 3026, 3016, 3017, 3018, 3027, 3019, 3028, 3029, 3020, +- 3030, 3021, 3031, 3032, 3022, 3033, 3034, 3023, 3035, 3036, +- 3037, 3024, 3025, 2486, 3038, 3039, 3040, 3041, 3047, 3026, +- 1917, 3043, 1912, 3027, 1902, 3028, 3029, 3064, 3030, 3107, +- 3031, 3032, 3107, 3033, 3034, 2877, 3035, 3036, 3037, 3044, +- 3065, 1526, 3038, 3039, 3040, 3041, 2509, 2869, 3047, 3043, +- 2869, 2869, 2869, 3066, 2869, 3064, 2869, 3045, 2285, 2869, +- 2871, 3050, 2869, 3048, 2869, 2877, 1897, 3044, 3065, 3045, +- 2869, 3056, 2871, 2869, 2872, 2869, 3067, 2695, 3051, 2695, +- 3053, 3066, 2502, 2871, 3068, 2502, 2872, 2502, 2877, 3069, +- +- 3149, 2303, 2692, 3048, 2696, 2504, 2696, 2872, 3070, 1715, +- 2869, 3149, 3046, 2869, 3067, 2869, 3052, 1886, 3071, 2693, +- 3058, 1849, 3068, 2871, 3046, 1831, 3057, 3069, 2869, 3072, +- 1759, 2869, 2697, 2869, 2880, 3054, 3070, 2884, 3058, 2869, +- 2502, 2871, 2869, 2502, 2869, 2502, 3071, 2694, 2502, 3061, +- 2699, 2502, 2871, 2502, 3073, 2884, 1395, 3072, 2699, 2502, +- 3074, 3075, 2502, 3076, 2502, 3059, 2884, 2700, 3077, 2703, +- 1574, 2502, 2504, 3078, 2502, 2700, 2502, 3079, 3080, 3081, +- 3082, 2703, 3073, 3059, 2504, 3083, 2704, 3084, 3074, 3075, +- 3085, 3076, 3086, 3087, 3062, 2701, 3077, 3088, 2704, 3089, +- +- 3090, 3078, 3091, 2887, 3092, 3079, 3080, 3081, 3082, 3093, +- 3094, 3095, 3096, 3083, 2705, 3084, 3097, 3098, 3085, 3099, +- 3086, 3087, 3100, 3102, 3103, 3088, 2890, 3089, 3090, 3104, +- 3091, 3105, 3092, 3106, 3108, 3109, 3110, 3093, 3094, 3095, +- 3096, 3111, 3116, 3113, 3097, 3098, 3113, 3099, 3117, 3119, +- 3100, 3102, 3103, 2955, 3120, 3121, 2955, 3104, 3114, 3105, +- 3122, 3106, 3108, 3109, 3110, 3123, 3124, 3125, 3128, 3111, +- 3116, 3129, 3134, 3135, 3129, 3136, 3117, 3119, 3126, 3127, +- 3130, 3138, 3120, 3121, 3131, 3139, 3137, 3952, 3122, 3137, +- 3952, 3132, 3952, 3123, 3124, 3125, 3128, 3140, 3141, 3143, +- +- 3134, 3135, 3144, 3136, 3145, 3147, 3126, 3127, 3130, 3138, +- 3148, 3150, 3131, 3139, 3151, 3152, 3153, 3154, 3155, 3132, +- 3156, 3157, 3158, 3159, 3160, 3140, 3141, 3143, 3161, 3162, +- 3144, 3163, 3145, 3147, 3164, 3165, 3166, 3167, 3148, 3150, +- 3168, 3169, 3151, 3152, 3153, 3154, 3155, 3170, 3156, 3157, +- 3158, 3159, 3160, 3171, 3172, 3173, 3161, 3162, 3174, 3163, +- 3175, 3177, 3164, 3165, 3166, 3167, 3178, 3180, 3168, 3169, +- 3181, 3175, 3182, 1735, 3183, 3170, 3184, 3178, 3186, 1731, +- 3187, 3171, 3172, 3173, 3188, 3189, 3174, 3190, 3191, 3177, +- 3192, 3193, 3195, 3196, 3197, 3180, 3199, 3200, 3181, 1718, +- +- 3182, 3176, 3183, 2507, 3184, 1717, 3186, 3179, 3187, 3198, +- 3202, 3054, 3188, 3189, 2298, 3190, 3191, 1715, 3192, 3193, +- 3195, 3196, 3197, 2869, 3199, 3200, 2869, 2877, 2869, 2869, +- 2695, 3203, 2869, 3201, 2869, 2869, 2871, 3198, 2869, 3058, +- 2869, 2502, 2871, 3213, 2502, 3204, 2502, 2696, 3399, 3047, +- 2872, 2703, 3214, 1657, 2504, 3057, 2884, 3215, 3062, 3399, +- 2869, 2298, 3051, 2869, 2869, 2869, 2877, 2869, 2704, 2869, +- 3045, 3213, 1656, 2871, 3208, 3207, 2502, 2871, 3054, 2502, +- 3214, 2502, 3216, 3217, 3059, 3215, 3210, 2872, 3218, 2504, +- 3205, 2884, 3219, 3220, 3057, 2869, 3206, 3221, 2869, 3222, +- +- 2869, 3223, 3224, 3211, 3225, 3058, 3226, 3227, 2871, 3228, +- 3216, 3217, 3229, 3230, 3231, 3054, 3218, 3232, 3233, 3062, +- 3219, 3220, 2884, 3234, 3235, 3221, 3236, 3222, 3237, 3223, +- 3224, 3212, 3225, 3238, 3226, 3227, 3239, 3228, 3240, 3239, +- 3229, 3230, 3231, 3241, 3242, 3232, 3233, 3243, 3244, 3245, +- 3062, 3234, 3235, 3246, 3236, 3247, 3237, 3250, 3495, 3113, +- 3250, 3238, 3113, 3714, 1646, 3249, 3240, 3107, 3251, 3495, +- 3107, 3241, 3242, 3253, 3254, 3243, 3244, 3245, 3256, 3257, +- 3258, 3246, 3259, 3247, 3248, 3248, 3248, 3248, 3248, 3248, +- 3248, 3248, 3248, 3249, 3952, 3260, 3251, 3952, 3261, 3952, +- +- 3262, 3253, 3254, 3263, 3264, 3265, 3256, 3257, 3258, 3275, +- 3259, 3352, 3275, 3715, 3352, 3267, 3268, 3129, 3269, 3271, +- 3129, 3272, 3273, 3260, 3276, 3277, 3261, 3278, 3262, 3279, +- 3280, 3263, 3264, 3265, 3266, 3266, 3266, 3266, 3266, 3266, +- 3266, 3266, 3266, 3267, 3268, 3281, 3269, 3271, 3282, 3272, +- 3273, 3283, 3276, 3277, 3284, 3278, 3285, 3279, 3280, 3286, +- 3287, 3288, 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3297, +- 3298, 3299, 3300, 3281, 3302, 3303, 3282, 3304, 3305, 3283, +- 3306, 3307, 3284, 3308, 3285, 3312, 3313, 3286, 3287, 3288, +- 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3297, 3298, 3299, +- +- 3300, 3310, 3302, 3303, 3314, 3304, 3305, 3315, 3306, 3307, +- 3316, 3308, 3310, 3312, 3313, 3317, 3318, 3319, 3320, 3321, +- 3322, 3323, 3324, 3325, 3327, 3383, 2869, 3334, 3383, 2869, +- 3335, 2869, 3314, 1645, 3326, 3315, 3045, 3047, 3316, 2871, +- 3329, 1644, 3311, 3317, 3318, 3319, 3320, 3321, 3322, 3323, +- 3324, 3325, 3327, 2872, 2877, 3334, 2869, 2696, 3335, 2869, +- 2869, 2869, 3326, 2869, 2502, 2869, 3050, 2502, 3336, 2502, +- 3050, 1580, 3275, 3337, 3328, 3275, 3338, 2504, 3339, 3340, +- 3341, 3046, 3048, 3051, 3342, 2880, 3343, 3051, 1579, 2869, +- 2502, 2704, 2869, 2502, 2869, 2502, 3336, 1574, 1550, 3058, +- +- 3210, 3337, 2871, 2504, 3338, 1549, 3339, 3340, 3341, 3344, +- 3345, 3052, 3342, 3346, 3343, 3205, 2884, 3211, 3347, 2890, +- 2869, 2502, 3348, 2869, 2502, 2869, 2502, 3349, 3350, 3351, +- 2883, 3332, 3353, 2871, 2504, 3354, 3357, 3344, 3345, 3358, +- 3359, 3346, 3360, 3361, 3059, 3330, 3347, 2884, 3211, 3239, +- 3348, 3362, 3239, 3363, 3355, 3349, 3350, 3351, 3364, 3392, +- 3353, 3500, 3392, 3354, 3357, 1546, 1545, 3358, 3359, 3365, +- 3360, 3361, 3500, 1544, 3370, 2885, 3333, 3370, 1543, 3362, +- 3367, 3363, 3250, 3369, 3373, 3250, 3364, 3248, 3248, 3248, +- 3248, 3248, 3248, 3248, 3248, 3248, 3374, 3365, 3375, 3366, +- +- 3366, 3366, 3366, 3366, 3366, 3366, 3366, 3366, 3367, 3376, +- 3377, 3369, 3373, 3378, 3379, 3380, 3381, 3382, 3384, 3385, +- 3371, 3386, 3387, 3388, 3374, 3389, 3375, 3266, 3266, 3266, +- 3266, 3266, 3266, 3266, 3266, 3266, 3390, 3376, 3377, 3391, +- 3393, 3378, 3379, 3380, 3381, 3382, 3384, 3385, 3371, 3386, +- 3387, 3388, 3394, 3389, 3395, 3394, 3396, 3397, 3398, 3400, +- 3401, 3402, 3403, 3405, 3390, 3406, 3407, 3391, 3393, 3408, +- 3409, 3412, 3413, 3414, 3415, 3417, 3418, 3419, 3714, 3422, +- 3423, 3424, 3395, 3425, 3396, 3397, 3398, 3400, 3401, 3402, +- 3403, 3405, 3426, 3406, 3407, 3427, 3428, 3408, 3409, 3412, +- +- 3413, 3414, 3415, 3417, 3418, 3419, 3420, 3422, 3423, 3424, +- 3429, 3425, 3430, 3432, 3421, 3433, 3434, 3435, 3436, 3437, +- 3426, 1542, 2869, 3427, 3428, 2869, 3333, 2869, 3647, 2298, +- 3439, 3047, 3045, 3453, 3420, 2871, 3453, 1540, 3429, 3440, +- 3430, 3432, 3421, 3433, 3434, 3435, 3436, 3437, 2877, 2872, +- 1117, 2502, 2869, 3441, 2502, 2869, 2502, 2869, 3439, 3442, +- 3443, 3438, 3058, 3444, 2504, 2871, 3445, 3440, 3446, 874, +- 2502, 3447, 3448, 2502, 3449, 2502, 2878, 2873, 3211, 2884, +- 3210, 3441, 3450, 2504, 3451, 3454, 3456, 3442, 3443, 3479, +- 3480, 3444, 3479, 3480, 3445, 1485, 3446, 3211, 3352, 3447, +- +- 3448, 3352, 3449, 1476, 1474, 3481, 3333, 2885, 3481, 1469, +- 3450, 3766, 3451, 3454, 3456, 3452, 3452, 3452, 3452, 3452, +- 3452, 3452, 3452, 3452, 3457, 3333, 3455, 3455, 3455, 3455, +- 3455, 3455, 3455, 3455, 3455, 3455, 3455, 3356, 3356, 3356, +- 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3458, 3459, +- 3460, 3455, 3457, 3461, 3462, 3463, 3464, 3465, 3466, 3468, +- 3469, 3647, 3356, 3366, 3366, 3366, 3366, 3366, 3366, 3366, +- 3366, 3366, 3370, 3470, 3471, 3370, 3458, 3459, 3460, 3472, +- 3473, 3461, 3462, 3463, 3464, 3465, 3466, 3468, 3469, 3467, +- 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3474, 3475, +- +- 3476, 3470, 3471, 3477, 3482, 3483, 3484, 3472, 3473, 3484, +- 3485, 3486, 3487, 3489, 3490, 3492, 3489, 3490, 3493, 3494, +- 3497, 3498, 3499, 1464, 1406, 1405, 3474, 3475, 3476, 540, +- 3733, 3477, 3482, 3483, 3394, 3501, 3502, 3394, 3485, 3486, +- 3487, 3733, 3506, 3492, 3507, 3508, 3493, 3494, 3497, 3498, +- 3499, 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3491, +- 3503, 3509, 3510, 3501, 3502, 3511, 3512, 3513, 3504, 3505, +- 3506, 3514, 3507, 3508, 3515, 3516, 3517, 3518, 3519, 3520, +- 3521, 3522, 3523, 3524, 3525, 3526, 3525, 3527, 3503, 3509, +- 3510, 3528, 3530, 3511, 3512, 3513, 3504, 3505, 3531, 3514, +- +- 538, 3532, 3515, 3516, 3517, 3518, 3519, 3520, 3521, 3522, +- 3523, 3524, 3533, 3526, 3534, 3527, 3535, 533, 2502, 3528, +- 3530, 2502, 3536, 2502, 3537, 3538, 3531, 3541, 3210, 3532, +- 3541, 2504, 3479, 3564, 3489, 3479, 3564, 3576, 3565, 3543, +- 3533, 531, 3534, 516, 3535, 3211, 3544, 3545, 3546, 3547, +- 3536, 3548, 3537, 3538, 3549, 514, 3525, 3452, 3452, 3452, +- 3452, 3452, 3452, 3452, 3452, 3452, 3453, 3543, 3542, 3453, +- 510, 3539, 1396, 3330, 3544, 3545, 3546, 3547, 3550, 3548, +- 3551, 3552, 3549, 3540, 3540, 3540, 3540, 3540, 3540, 3540, +- 3540, 3540, 3455, 3455, 3455, 3455, 3455, 3455, 3455, 3455, +- +- 3455, 3455, 3455, 3553, 3554, 3555, 3550, 3556, 3551, 3552, +- 3557, 1392, 3559, 3557, 3560, 3561, 3562, 3455, 3467, 3467, +- 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3569, 3570, 3572, +- 3573, 3553, 3554, 3555, 3574, 3556, 3578, 1386, 3581, 3558, +- 3559, 3734, 3560, 3561, 3562, 3567, 3484, 3952, 3567, 3484, +- 3568, 3571, 3734, 1355, 1347, 3569, 3570, 3572, 3573, 3579, +- 3490, 3582, 3574, 3490, 3578, 3580, 3581, 3558, 3491, 3491, +- 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3577, 3577, 3577, +- 3577, 3577, 3577, 3577, 3577, 3577, 3583, 3579, 3584, 3582, +- 3585, 3586, 3587, 3580, 3588, 3589, 3591, 3593, 3594, 3595, +- +- 3596, 3597, 3598, 3600, 3601, 3604, 3605, 3618, 3624, 3628, +- 3618, 3624, 3628, 1336, 3583, 431, 3584, 418, 3585, 3586, +- 3587, 3607, 3588, 3589, 3591, 3593, 3594, 3595, 3596, 3597, +- 3598, 3600, 3601, 3604, 3605, 3606, 3606, 3606, 3606, 3606, +- 3606, 3606, 3606, 3606, 3606, 3606, 3608, 3609, 3612, 3607, +- 3613, 3614, 3615, 3616, 3617, 3690, 3693, 414, 3690, 3693, +- 3606, 3619, 3619, 3619, 3619, 3619, 3619, 3619, 3619, 3619, +- 3621, 3622, 3623, 3625, 3608, 3609, 3612, 3626, 3613, 3614, +- 3615, 3616, 3617, 3540, 3540, 3540, 3540, 3540, 3540, 3540, +- 3540, 3540, 3541, 3627, 3629, 3541, 3630, 3631, 3621, 3622, +- +- 3623, 3625, 3632, 3633, 3635, 3626, 3636, 3637, 3640, 3620, +- 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 399, 395, +- 3557, 3627, 3629, 3557, 3630, 3631, 3638, 373, 3643, 3638, +- 3632, 3633, 3635, 3644, 3636, 3637, 3640, 3634, 3634, 3634, +- 3634, 3634, 3634, 3634, 3634, 3634, 3564, 3567, 3648, 3564, +- 3567, 3565, 3568, 3649, 3650, 3639, 3643, 3628, 369, 363, +- 3628, 3644, 3697, 3690, 3693, 3652, 3690, 3693, 3747, 3750, +- 3575, 3805, 3806, 359, 3805, 3806, 3648, 3489, 355, 1278, +- 3576, 3649, 3650, 3639, 3651, 3651, 3651, 3651, 3651, 3651, +- 3651, 3651, 3651, 3652, 3651, 3651, 3651, 3651, 3651, 3651, +- +- 3651, 3651, 3651, 3577, 3577, 3577, 3577, 3577, 3577, 3577, +- 3577, 3577, 3653, 3654, 3655, 3657, 3658, 3659, 3660, 3661, +- 3662, 3663, 3664, 3665, 3666, 3667, 3668, 3669, 3670, 3672, +- 3675, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, +- 3653, 3654, 3655, 3657, 3658, 3659, 3660, 3661, 3662, 3663, +- 3664, 3665, 3666, 3667, 3668, 3669, 3670, 3672, 3675, 3606, +- 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, +- 3676, 3677, 3678, 3680, 3681, 3682, 3684, 3952, 3685, 3684, +- 3952, 3686, 3952, 1217, 3606, 3689, 3691, 3838, 3695, 3685, +- 3838, 3698, 3688, 3699, 3700, 3701, 3702, 3703, 3676, 3677, +- +- 3678, 3680, 3681, 3682, 3619, 3619, 3619, 3619, 3619, 3619, +- 3619, 3619, 3619, 3689, 3691, 3624, 3695, 3844, 3624, 3698, +- 3844, 3699, 3700, 3701, 3702, 3703, 3704, 3706, 3707, 3710, +- 3717, 3718, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, +- 3692, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, +- 3638, 3719, 3782, 3638, 3704, 3706, 3707, 3710, 3717, 3718, +- 3687, 3720, 3721, 3782, 1216, 1200, 1191, 3705, 3705, 3705, +- 3705, 3705, 3705, 3705, 3705, 3705, 3711, 3575, 3722, 3719, +- 3712, 3723, 3724, 3725, 3726, 3727, 3728, 3713, 3729, 3720, +- 3721, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, +- +- 3730, 3731, 3732, 3735, 3711, 3736, 3722, 3740, 3712, 3723, +- 3724, 3725, 3726, 3727, 3728, 3713, 3729, 3742, 3743, 3744, +- 3746, 3685, 3749, 3685, 3685, 1179, 3952, 1158, 3730, 3731, +- 3732, 3735, 3753, 3736, 3685, 3740, 3684, 3754, 3685, 3684, +- 3755, 3686, 3756, 3757, 3758, 3742, 3743, 3744, 3746, 3685, +- 3749, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, +- 3753, 3759, 3760, 3761, 3762, 3754, 3763, 3764, 3755, 3765, +- 3756, 3757, 3758, 3705, 3705, 3705, 3705, 3705, 3705, 3705, +- 3705, 3705, 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3759, +- 3760, 3761, 3762, 3774, 3763, 3764, 3775, 3765, 3776, 3777, +- +- 3778, 3779, 3780, 3781, 3783, 3687, 3784, 3785, 3788, 3792, +- 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3795, 3786, 3796, +- 3687, 3774, 3797, 3798, 3775, 3799, 3776, 3777, 3778, 3779, +- 3780, 3781, 3783, 3800, 3784, 3785, 3788, 3952, 3801, 3802, +- 3952, 3803, 3952, 3807, 3803, 3795, 3786, 3796, 3808, 3714, +- 3797, 3798, 3809, 3799, 3810, 3811, 3812, 3813, 3814, 3793, +- 3827, 3800, 3815, 3816, 3817, 3818, 3801, 3802, 3819, 3821, +- 3822, 3807, 3823, 3824, 3825, 3827, 3808, 3830, 3831, 3832, +- 3809, 3833, 3810, 3811, 3812, 3813, 3814, 3834, 3804, 3835, +- 3815, 3816, 3817, 3818, 3836, 3839, 3819, 3821, 3822, 3715, +- +- 3823, 3824, 3825, 3846, 3847, 3830, 3831, 3832, 3805, 3833, +- 3828, 3805, 3848, 3841, 3849, 3834, 3804, 3835, 3850, 3852, +- 3853, 3806, 3836, 3839, 3806, 3793, 3843, 3845, 3854, 3855, +- 3845, 3846, 3847, 3856, 3857, 3860, 3861, 3862, 3863, 3861, +- 3848, 3864, 3849, 3865, 3866, 3867, 3850, 3852, 3853, 3868, +- 3838, 3869, 1142, 3838, 3876, 3952, 3854, 3855, 3952, 3827, +- 3952, 3856, 3857, 3860, 3877, 3952, 3863, 3878, 3952, 3864, +- 3952, 3865, 3866, 3867, 3879, 3844, 3880, 3868, 3844, 3869, +- 3873, 3845, 3876, 3881, 3845, 3882, 3875, 3793, 3883, 3884, +- 3893, 3895, 3877, 3891, 3885, 3878, 3891, 3894, 3892, 3896, +- +- 3894, 3898, 3879, 3897, 3880, 3886, 3897, 3952, 3887, 3828, +- 3952, 3881, 3952, 3882, 3903, 3904, 3883, 3884, 3893, 3895, +- 3952, 3905, 3885, 3952, 3906, 3952, 3907, 3896, 3908, 3898, +- 3909, 3910, 3911, 3886, 3912, 3913, 3887, 3916, 3919, 662, +- 1117, 3891, 3903, 3904, 3891, 3918, 3892, 645, 3918, 3905, +- 3894, 385, 3906, 3894, 3907, 385, 3908, 874, 3909, 3910, +- 3911, 3897, 3912, 3913, 3897, 3916, 3919, 3917, 3917, 3917, +- 3917, 3917, 3917, 3917, 3917, 3917, 3921, 3924, 3920, 3920, +- 3920, 3920, 3920, 3920, 3920, 3920, 3920, 3925, 3926, 3927, +- 3928, 3929, 3930, 3931, 3917, 3917, 3917, 3917, 3917, 3917, +- +- 3917, 3917, 3917, 1073, 3921, 3924, 3918, 3934, 1062, 3918, +- 3934, 1054, 1051, 3935, 3936, 3925, 3926, 3927, 3928, 3929, +- 3930, 3931, 3937, 3933, 3933, 3933, 3933, 3933, 3933, 3933, +- 3933, 3933, 3920, 3920, 3920, 3920, 3920, 3920, 3920, 3920, +- 3920, 3935, 3936, 3938, 3940, 3941, 3943, 3944, 3945, 1009, +- 3937, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, +- 3934, 540, 538, 3934, 1007, 533, 531, 3946, 3947, 3948, +- 3949, 3938, 3940, 3941, 3943, 3944, 3945, 3942, 3942, 3942, +- 3942, 3942, 3942, 3942, 3942, 3942, 3942, 3942, 3942, 3942, +- 3942, 3942, 3942, 3942, 3942, 3946, 3947, 3948, 3949, 3950, +- +- 3951, 1001, 516, 514, 999, 510, 994, 986, 977, 976, +- 946, 935, 923, 913, 431, 910, 418, 414, 662, 883, +- 399, 395, 645, 865, 373, 369, 862, 3950, 3951, 76, +- 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, +- 76, 76, 76, 76, 76, 76, 76, 98, 98, 98, ++ 2222, 2223, 2240, 2248, 2224, 2225, 2226, 2241, 2227, 2249, ++ ++ 2250, 2228, 2251, 2229, 2242, 2252, 2253, 2254, 2243, 2244, ++ 2255, 2245, 2257, 2258, 2259, 2246, 2260, 2247, 2263, 2264, ++ 2265, 2248, 2266, 2267, 2268, 2269, 2270, 2249, 2250, 2271, ++ 2251, 2272, 2273, 2252, 2253, 2254, 2274, 2279, 2255, 2285, ++ 2257, 2258, 2259, 2280, 2260, 2281, 2263, 2264, 2265, 2282, ++ 2266, 2267, 2268, 2269, 2270, 2287, 2300, 2271, 2288, 2272, ++ 2273, 2289, 2290, 2291, 2274, 2279, 2303, 2292, 2293, 2294, ++ 2295, 2280, 2296, 2281, 2300, 2305, 2306, 2307, 2308, 2309, ++ 2310, 2311, 2312, 2287, 2286, 2313, 2288, 2314, 2325, 2289, ++ 2290, 2291, 2490, 2076, 2076, 2292, 2293, 2294, 2295, 2487, ++ ++ 2296, 2301, 2326, 2305, 2306, 2307, 2308, 2309, 2310, 2311, ++ 2312, 2304, 2315, 2313, 2316, 2314, 2325, 2472, 2428, 2091, ++ 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2428, ++ 2326, 2463, 2327, 2328, 2330, 2362, 2331, 2332, 2329, 2334, ++ 2315, 2335, 2316, 2317, 2317, 2317, 2317, 2317, 2317, 2317, ++ 2317, 2317, 2336, 2337, 2338, 2318, 2339, 2319, 2320, 2321, ++ 2327, 2328, 2330, 2322, 2331, 2332, 2329, 2334, 2323, 2335, ++ 2340, 2341, 2342, 2343, 2344, 2345, 2346, 2324, 2347, 2348, ++ 2336, 2337, 2338, 2318, 2339, 2319, 2320, 2321, 2349, 2350, ++ 2351, 2322, 2352, 2353, 2354, 2355, 2323, 2356, 2340, 2341, ++ ++ 2342, 2343, 2344, 2345, 2346, 2324, 2347, 2348, 2357, 2358, ++ 2144, 2145, 2146, 2144, 2145, 2146, 2349, 2350, 2351, 2363, ++ 2352, 2353, 2354, 2355, 2364, 2356, 2147, 2145, 2148, 2147, ++ 2145, 2148, 2365, 2366, 2367, 2376, 2357, 2358, 2377, 2378, ++ 2360, 2379, 2380, 2381, 2382, 2383, 2384, 2363, 2385, 2390, ++ 2388, 2391, 2364, 2388, 2392, 2393, 2488, 2262, 2394, 2395, ++ 2365, 2366, 2367, 2376, 2396, 1947, 2377, 2378, 1947, 2379, ++ 2380, 2381, 2382, 2383, 2384, 2397, 2385, 2390, 2398, 2391, ++ 2399, 1949, 2392, 2393, 1949, 2368, 2394, 2395, 2368, 2261, ++ 2389, 2256, 2396, 2401, 2402, 2403, 2404, 2405, 2406, 2407, ++ ++ 2408, 2489, 2409, 2397, 2369, 2165, 2398, 2410, 2399, 2412, ++ 2413, 2414, 2415, 2417, 2418, 2419, 2420, 2370, 2389, 2371, ++ 2421, 2401, 2402, 2403, 2404, 2405, 2406, 2407, 2408, 2372, ++ 2409, 2373, 2374, 2375, 2423, 2410, 2424, 2412, 2413, 2414, ++ 2415, 2417, 2418, 2419, 2420, 2370, 2422, 2371, 2421, 2422, ++ 2425, 2426, 2427, 2430, 2429, 2431, 2432, 2372, 2433, 2373, ++ 2374, 2375, 2423, 2434, 2424, 2429, 2435, 2437, 2438, 2439, ++ 2440, 2441, 2442, 2443, 2444, 2436, 2445, 2446, 2425, 2426, ++ 2427, 2430, 2447, 2431, 2432, 2450, 2433, 2451, 2448, 2452, ++ 2453, 2434, 2454, 2455, 2435, 2437, 2438, 2439, 2440, 2441, ++ ++ 2442, 2443, 2444, 2449, 2445, 2446, 2456, 2457, 2458, 2459, ++ 2447, 2460, 2461, 2450, 2462, 2451, 2448, 2452, 2453, 2464, ++ 2454, 2455, 2465, 2466, 2467, 2468, 2469, 2470, 2471, 2473, ++ 2474, 2449, 2475, 2476, 2456, 2457, 2458, 2459, 2477, 2460, ++ 2461, 2478, 2462, 2479, 2480, 2481, 2484, 2464, 2485, 2486, ++ 2465, 2466, 2467, 2468, 2469, 2470, 2471, 2473, 2474, 2491, ++ 2475, 2476, 2493, 2494, 2495, 2496, 2477, 2497, 2498, 2478, ++ 2499, 2479, 2480, 2481, 2484, 2500, 2485, 2486, 2501, 2511, ++ 2514, 2516, 2517, 2150, 2504, 2518, 2519, 2504, 2520, 2504, ++ 2493, 2494, 2495, 2496, 2505, 2497, 2498, 2506, 2499, 2521, ++ ++ 2522, 2523, 2524, 2500, 2492, 2525, 2501, 2526, 2528, 2516, ++ 2517, 2507, 2529, 2518, 2519, 2368, 2520, 1949, 2368, 1947, ++ 2572, 2114, 2530, 2533, 2512, 2515, 2531, 2521, 2522, 2523, ++ 2524, 2532, 2534, 2525, 2527, 2526, 2528, 2535, 2536, 2508, ++ 2529, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, ++ 2530, 2533, 2537, 2538, 2531, 2539, 2540, 2541, 2542, 2532, ++ 2534, 2543, 2544, 2545, 2546, 2535, 2536, 2547, 2548, 2549, ++ 2550, 2551, 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, ++ 2537, 2538, 2561, 2539, 2540, 2541, 2542, 2088, 2567, 2543, ++ 2544, 2545, 2546, 2568, 2571, 2547, 2548, 2549, 2550, 2551, ++ ++ 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, 2563, 2564, ++ 2561, 2563, 2566, 2564, 2575, 2566, 2567, 2569, 2578, 2576, ++ 2574, 2568, 2571, 2574, 2570, 2577, 2579, 2580, 2581, 2582, ++ 2583, 2584, 2585, 2583, 2586, 2087, 2587, 2588, 2589, 2994, ++ 2590, 2591, 2575, 1899, 2595, 2569, 2578, 2576, 2049, 2596, ++ 2994, 2597, 2570, 2577, 2579, 2580, 2581, 2582, 2598, 2584, ++ 2585, 2599, 2586, 2360, 2587, 2588, 2589, 2362, 2590, 2591, ++ 3965, 2388, 2595, 3965, 2388, 3965, 2593, 2596, 2359, 2597, ++ 2600, 2601, 2361, 2602, 2603, 2604, 2598, 2603, 2606, 2599, ++ 2607, 2608, 2609, 2610, 2611, 2612, 2613, 2614, 2615, 2616, ++ ++ 2617, 2618, 2619, 2621, 2622, 2624, 2625, 2623, 2600, 2601, ++ 2623, 2602, 2627, 2604, 2629, 2627, 2606, 2628, 2607, 2608, ++ 2609, 2610, 2611, 2612, 2613, 2614, 2615, 2616, 2617, 2618, ++ 2619, 2621, 2622, 2624, 2625, 2630, 2631, 2632, 2633, 2634, ++ 2635, 2637, 2629, 2639, 2641, 2642, 2643, 2644, 2645, 2646, ++ 2647, 2649, 2650, 2651, 2639, 2652, 2020, 2653, 2654, 2655, ++ 2656, 2657, 2658, 2630, 2631, 2632, 2633, 2634, 2635, 2637, ++ 2660, 2661, 2641, 2642, 2643, 2644, 2645, 2646, 2647, 2649, ++ 2650, 2651, 2662, 2652, 2640, 2653, 2654, 2655, 2656, 2657, ++ 2658, 2663, 2664, 2665, 2666, 2667, 2668, 2669, 2660, 2661, ++ ++ 2670, 2671, 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, ++ 2662, 2681, 2682, 2684, 2282, 2488, 2686, 2687, 2688, 2663, ++ 2664, 2665, 2666, 2667, 2668, 2669, 2689, 2690, 2670, 2671, ++ 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, 2691, 2681, ++ 2682, 2692, 2693, 2299, 2686, 2687, 2688, 2698, 2712, 2710, ++ 2997, 1949, 2300, 2511, 2689, 2690, 1947, 2502, 2492, 2685, ++ 2492, 2997, 2504, 2713, 2699, 2504, 2691, 2504, 2504, 2692, ++ 2693, 2504, 2695, 2504, 2504, 2506, 2712, 2504, 2702, 2504, ++ 2714, 2715, 1945, 2504, 2706, 2701, 2504, 2506, 2504, 2696, ++ 1905, 2713, 2700, 2695, 2515, 2703, 2506, 2711, 2515, 2716, ++ ++ 2717, 2707, 2718, 2719, 2720, 2721, 2722, 2723, 2714, 2715, ++ 2696, 2724, 2725, 2726, 2727, 2728, 2729, 2697, 1905, 2730, ++ 2731, 2732, 2733, 2704, 2734, 2735, 2736, 2716, 2717, 2708, ++ 2718, 2719, 2720, 2721, 2722, 2723, 2737, 2738, 2508, 2724, ++ 2725, 2726, 2727, 2728, 2729, 2739, 2740, 2730, 2731, 2732, ++ 2733, 2741, 2734, 2735, 2736, 2742, 2744, 2746, 2747, 2748, ++ 2749, 2750, 2751, 2752, 2737, 2738, 2753, 2563, 2564, 2754, ++ 2563, 2755, 2756, 2739, 2740, 2566, 2564, 2757, 2566, 2741, ++ 2760, 2761, 2762, 2742, 2744, 2746, 2747, 2748, 2749, 2750, ++ 2751, 2752, 2574, 2763, 2753, 2574, 2764, 2754, 2765, 2755, ++ ++ 2756, 2766, 1917, 2767, 2770, 2757, 2771, 2772, 2760, 2761, ++ 2762, 2583, 2773, 2774, 2583, 2775, 2768, 1912, 2776, 2779, ++ 2780, 2763, 2360, 2781, 2764, 2782, 2765, 2783, 2784, 2766, ++ 2362, 2767, 2770, 2789, 2771, 2772, 2785, 2359, 2786, 2788, ++ 2773, 2774, 2788, 2775, 2790, 2361, 2776, 2779, 2780, 2791, ++ 2792, 2781, 2793, 2782, 2794, 2783, 2784, 2795, 2796, 2797, ++ 2798, 2789, 2797, 2800, 2785, 2801, 2786, 2802, 2803, 2804, ++ 2805, 2623, 2790, 2810, 2623, 2814, 2806, 2791, 2792, 2799, ++ 2793, 2816, 2794, 2808, 2809, 2795, 2796, 2627, 2798, 2817, ++ 2627, 2800, 2628, 2801, 2818, 2802, 2803, 2804, 2805, 2819, ++ ++ 2820, 2810, 2821, 2814, 2822, 2823, 2824, 2799, 2825, 2816, ++ 2826, 2808, 2809, 2827, 2828, 2829, 2830, 2817, 2831, 2832, ++ 2833, 2834, 2818, 2835, 2836, 2837, 2838, 2819, 2820, 2841, ++ 2821, 2842, 2822, 2823, 2824, 2843, 2825, 2844, 2826, 2845, ++ 2846, 2827, 2828, 2829, 2830, 2847, 2831, 2832, 2833, 2834, ++ 2848, 2835, 2836, 2837, 2838, 2849, 2850, 2841, 2851, 2842, ++ 2852, 2853, 2854, 2843, 2855, 2844, 2856, 2845, 2846, 2857, ++ 2858, 2859, 2860, 2847, 2861, 2862, 2863, 2864, 2848, 2488, ++ 2865, 2866, 2867, 2849, 2850, 2868, 2851, 2869, 2852, 2853, ++ 2854, 2870, 2855, 2871, 2856, 1902, 2511, 2857, 2858, 2859, ++ ++ 2860, 2880, 2861, 2862, 2863, 2864, 2299, 2509, 2958, 2866, ++ 2867, 2958, 2883, 2868, 2508, 2869, 2895, 2299, 2881, 2870, ++ 2502, 2871, 1526, 2873, 2489, 2076, 2873, 2504, 2873, 2699, ++ 2504, 2502, 2504, 2874, 1897, 2885, 2875, 2878, 1715, 2873, ++ 2506, 2512, 2873, 1886, 2873, 2896, 2882, 2897, 2701, 2887, ++ 2876, 2898, 2875, 2504, 2696, 2899, 2504, 2884, 2504, 2504, ++ 2900, 2091, 2504, 2890, 2504, 1849, 2888, 2959, 2901, 2706, ++ 2959, 2873, 2506, 2896, 2873, 2897, 2873, 2902, 2877, 2898, ++ 2703, 2874, 2508, 2899, 2875, 2903, 2707, 2904, 2900, 1831, ++ 2504, 2905, 2906, 2504, 2889, 2504, 2901, 2907, 2876, 2908, ++ ++ 2893, 2909, 2910, 2506, 2911, 2902, 2912, 2913, 2891, 2914, ++ 2915, 2916, 2917, 2903, 2708, 2904, 2918, 2707, 2919, 2905, ++ 2906, 2920, 2921, 2922, 2923, 2907, 2877, 2908, 2924, 2909, ++ 2910, 2925, 2911, 2926, 2912, 2913, 2927, 2914, 2915, 2916, ++ 2917, 2928, 2929, 2930, 2918, 2894, 2919, 2931, 2932, 2920, ++ 2921, 2922, 2923, 2933, 2934, 2935, 2924, 2936, 2938, 2925, ++ 2939, 2926, 2940, 2941, 2927, 2942, 2943, 2944, 2945, 2928, ++ 2929, 2930, 2947, 2948, 2949, 2931, 2932, 2950, 2951, 2952, ++ 2953, 2933, 2934, 2935, 2955, 2936, 2938, 2956, 2939, 2957, ++ 2940, 2941, 2960, 2942, 2943, 2944, 2945, 2961, 2962, 2963, ++ ++ 2947, 2948, 2949, 2964, 2971, 2950, 2951, 2952, 2953, 2972, ++ 2788, 2973, 2955, 2788, 2974, 2956, 2797, 2957, 2977, 2797, ++ 2960, 2975, 2966, 2978, 2979, 2961, 2962, 2963, 2980, 2981, ++ 2967, 2968, 2971, 2969, 2965, 2970, 2982, 2972, 2983, 2973, ++ 2984, 2986, 2974, 2987, 2988, 2992, 2977, 2993, 2995, 2998, ++ 2966, 2978, 2979, 2999, 3000, 3001, 2980, 2981, 2967, 2968, ++ 3002, 2969, 2965, 2970, 2982, 3003, 2983, 3004, 2984, 2986, ++ 3007, 2987, 2988, 2992, 3009, 2993, 2995, 2998, 3010, 3011, ++ 3012, 2999, 3000, 3001, 3008, 3013, 3015, 3016, 3002, 3017, ++ 3018, 3019, 3020, 3003, 3021, 3004, 3013, 3022, 3007, 3023, ++ ++ 3024, 3025, 3009, 3026, 3027, 3028, 3010, 3011, 3012, 3029, ++ 3030, 3031, 3032, 3033, 3015, 3016, 3034, 3017, 3018, 3019, ++ 3020, 3035, 3021, 3036, 3037, 3022, 3038, 3023, 3024, 3025, ++ 3039, 3026, 3027, 3028, 3040, 3041, 3042, 3029, 3030, 3031, ++ 3032, 3033, 2488, 3043, 3034, 3044, 3045, 3046, 3048, 3035, ++ 3052, 3036, 3037, 2894, 3038, 1759, 2299, 3112, 3039, 3154, ++ 3112, 1395, 3040, 3041, 3042, 3069, 3049, 2881, 3052, 1574, ++ 3154, 3043, 2511, 3044, 3045, 3046, 3048, 3118, 2873, 2873, ++ 3118, 2873, 2873, 2873, 2873, 2881, 1735, 2286, 3050, 3055, ++ 3070, 2875, 3071, 3069, 3049, 3053, 1731, 2873, 2873, 3061, ++ ++ 2873, 2873, 2873, 2873, 2698, 2876, 3056, 3050, 3058, 2504, ++ 2875, 2875, 2504, 3053, 2504, 2698, 2881, 2304, 3070, 2695, ++ 3071, 2699, 2506, 3072, 2876, 2876, 3073, 3074, 3134, 3075, ++ 3076, 3134, 2699, 3051, 3057, 2873, 2696, 1718, 2873, 3077, ++ 2873, 1717, 1715, 3142, 3062, 3063, 3142, 3059, 2875, 2700, ++ 2299, 3072, 3051, 3059, 3073, 3074, 2873, 3075, 3076, 2873, ++ 2884, 2873, 2888, 1657, 2697, 2873, 3063, 3077, 2873, 2875, ++ 2873, 2504, 1656, 3078, 2504, 3066, 2504, 2504, 2875, 1646, ++ 2504, 2702, 2504, 2888, 3079, 1645, 2504, 2702, 3080, 2504, ++ 3064, 2504, 2888, 3081, 3082, 3083, 2706, 2504, 2703, 2506, ++ ++ 2504, 3078, 2504, 3084, 2703, 3085, 3086, 2706, 3087, 3088, ++ 2506, 3064, 3079, 2707, 3089, 3090, 3080, 3091, 3092, 3093, ++ 3067, 3081, 3082, 3083, 2707, 3094, 2704, 3095, 3096, 3097, ++ 3098, 3084, 2891, 3085, 3086, 3099, 3087, 3088, 3100, 3101, ++ 3102, 2708, 3089, 3090, 3103, 3091, 3092, 3093, 3104, 3105, ++ 3107, 3108, 2894, 3094, 3109, 3095, 3096, 3097, 3098, 3110, ++ 3111, 3113, 3114, 3099, 3115, 3116, 3100, 3101, 3102, 3121, ++ 2959, 3122, 3103, 2959, 3124, 3119, 3104, 3105, 3107, 3108, ++ 3125, 3126, 3109, 3127, 3128, 3129, 3133, 3110, 3111, 3113, ++ 3114, 3139, 3115, 3116, 3130, 3140, 3135, 3121, 3965, 3122, ++ ++ 3136, 3965, 3124, 3965, 3141, 3131, 3132, 3137, 3125, 3126, ++ 3143, 3127, 3128, 3129, 3133, 3144, 3145, 3146, 3148, 3139, ++ 3149, 3150, 3130, 3140, 3135, 3152, 3153, 3155, 3136, 3156, ++ 3157, 3158, 3141, 3131, 3132, 3137, 3159, 3160, 3143, 3161, ++ 3162, 3163, 3166, 3144, 3145, 3146, 3148, 3167, 3149, 3150, ++ 3164, 3165, 3168, 3152, 3153, 3155, 3169, 3156, 3157, 3158, ++ 3170, 3171, 3172, 3173, 3159, 3160, 3174, 3161, 3162, 3163, ++ 3166, 3175, 3176, 3177, 3178, 3167, 3179, 3180, 3164, 3165, ++ 3168, 3181, 3183, 3186, 3169, 3184, 3187, 3188, 3170, 3171, ++ 3172, 3173, 3181, 3189, 3174, 3190, 3184, 3192, 1644, 3175, ++ ++ 3176, 3177, 3178, 3193, 3179, 3180, 3194, 3195, 3196, 3197, ++ 3183, 3186, 3198, 3199, 3187, 3188, 3201, 3202, 3203, 3205, ++ 3206, 3189, 3182, 3190, 3067, 3192, 3185, 2299, 2509, 3219, ++ 3220, 3193, 3406, 3204, 3194, 3195, 3196, 3197, 3208, 3245, ++ 3198, 3199, 3245, 3406, 3201, 3202, 3203, 3205, 3206, 2873, ++ 3221, 2698, 2873, 3222, 2873, 2881, 3209, 3219, 3220, 3207, ++ 2873, 3204, 2875, 2873, 2873, 2873, 3223, 2873, 2699, 2873, ++ 3063, 3052, 2504, 2875, 3210, 2504, 2876, 2504, 3221, 3224, ++ 1580, 3222, 2706, 3062, 3225, 2506, 3226, 2888, 2881, 3256, ++ 2873, 3056, 3256, 2873, 3223, 2873, 3213, 1579, 3118, 2707, ++ ++ 3050, 3118, 3281, 2875, 3059, 3281, 3227, 3224, 2873, 3228, ++ 3229, 2873, 3225, 2873, 3226, 3064, 3062, 2876, 3214, 3211, ++ 2504, 2875, 3230, 2504, 3231, 2504, 2873, 3212, 3232, 2873, ++ 3216, 2873, 3233, 2506, 3227, 2888, 3063, 3228, 3229, 2875, ++ 3234, 3235, 3236, 3237, 3238, 3059, 3239, 3217, 3240, 3241, ++ 3230, 3242, 3231, 2888, 3243, 3244, 3232, 3246, 3247, 3248, ++ 3233, 3249, 3250, 3067, 3251, 3252, 3253, 3255, 3234, 3235, ++ 3236, 3237, 3238, 3257, 3239, 3218, 3240, 3241, 3725, 3242, ++ 3725, 3067, 3243, 3244, 1574, 3246, 3247, 3248, 3112, 3249, ++ 3250, 3112, 3251, 3252, 3253, 3255, 3259, 3965, 3260, 3262, ++ ++ 3965, 3257, 3965, 3263, 3264, 3254, 3254, 3254, 3254, 3254, ++ 3254, 3254, 3254, 3254, 3265, 3266, 3267, 3268, 3269, 3270, ++ 3271, 3273, 3359, 1550, 3259, 3359, 3260, 3262, 3726, 1549, ++ 3657, 3263, 3264, 3134, 3274, 3275, 3134, 3277, 3278, 3279, ++ 3282, 3283, 3265, 3266, 3267, 3268, 3269, 3270, 3271, 3273, ++ 3272, 3272, 3272, 3272, 3272, 3272, 3272, 3272, 3272, 3284, ++ 3285, 3286, 3274, 3275, 3287, 3277, 3278, 3279, 3282, 3283, ++ 3288, 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3296, 3297, ++ 3298, 3299, 3300, 3301, 3303, 3304, 3305, 3284, 3285, 3286, ++ 3306, 3307, 3287, 3309, 3310, 3311, 3312, 3313, 3288, 3289, ++ ++ 3290, 3291, 3292, 3293, 3294, 3295, 3296, 3297, 3298, 3299, ++ 3300, 3301, 3303, 3304, 3305, 3314, 3315, 3317, 3306, 3307, ++ 3319, 3309, 3310, 3311, 3312, 3313, 3320, 3321, 3317, 3322, ++ 1546, 3323, 3324, 3325, 3326, 3327, 3328, 3329, 3330, 3331, ++ 3332, 3334, 3245, 3314, 3315, 3245, 3341, 3362, 3319, 3390, ++ 3342, 3333, 3390, 3281, 3320, 3321, 3281, 3322, 3318, 3323, ++ 3324, 3325, 3326, 3327, 3328, 3329, 3330, 3331, 3332, 3334, ++ 2873, 3052, 1545, 2873, 3341, 2873, 1544, 3336, 3342, 3333, ++ 3050, 2873, 2873, 2875, 2873, 2873, 2873, 2873, 2881, 1543, ++ 2504, 3055, 3055, 2504, 2699, 2504, 1542, 2876, 1540, 3343, ++ ++ 3335, 2873, 2504, 2506, 2873, 2504, 2873, 2504, 3056, 3056, ++ 3344, 3063, 3216, 3345, 2875, 2506, 3053, 2707, 3346, 3347, ++ 1117, 2873, 2884, 3348, 2873, 3051, 2873, 3343, 2888, 3217, ++ 3349, 2887, 3350, 3351, 2875, 3352, 3057, 3211, 3344, 2504, ++ 3353, 3345, 2504, 3354, 2504, 2894, 3346, 3347, 2888, 3339, ++ 3355, 3348, 2506, 3356, 3357, 3358, 3064, 3337, 3349, 3360, ++ 3350, 3351, 3361, 3352, 3364, 3365, 3217, 3366, 3353, 3367, ++ 3368, 3354, 3369, 3370, 3371, 874, 2889, 3399, 3355, 1485, ++ 3399, 3356, 3357, 3358, 3372, 3377, 3401, 3360, 3377, 3401, ++ 3361, 1476, 3364, 3365, 3340, 3366, 3256, 3367, 3368, 3256, ++ ++ 3369, 3370, 3371, 3254, 3254, 3254, 3254, 3254, 3254, 3254, ++ 3254, 3254, 3372, 3373, 3373, 3373, 3373, 3373, 3373, 3373, ++ 3373, 3373, 3374, 3376, 3380, 3381, 3382, 3383, 3384, 3385, ++ 3386, 3378, 3387, 3388, 3389, 3272, 3272, 3272, 3272, 3272, ++ 3272, 3272, 3272, 3272, 3391, 3392, 3393, 3394, 3395, 3396, ++ 3374, 3376, 3380, 3381, 3382, 3383, 3384, 3385, 3386, 3378, ++ 3387, 3388, 3389, 3397, 3398, 3400, 3402, 3403, 3404, 3405, ++ 3407, 3408, 3391, 3392, 3393, 3394, 3395, 3396, 3409, 3410, ++ 3412, 3413, 3414, 3415, 3416, 3419, 3420, 3421, 3422, 3423, ++ 3425, 3397, 3398, 3400, 3402, 3403, 3404, 3405, 3407, 3408, ++ ++ 3426, 3427, 3430, 3431, 3432, 3433, 3409, 3410, 3412, 3413, ++ 3414, 3415, 3416, 3419, 3420, 3421, 3422, 3423, 3425, 3428, ++ 3434, 3435, 3436, 3437, 3438, 3440, 3441, 3429, 3426, 3427, ++ 3430, 3431, 3432, 3433, 3442, 3443, 3444, 3445, 3340, 3461, ++ 3052, 2299, 3461, 1474, 1469, 1464, 3447, 3428, 3434, 3435, ++ 3436, 3437, 3438, 3440, 3441, 3429, 2873, 2881, 3448, 2873, ++ 3449, 2873, 3442, 3443, 3444, 3445, 3050, 2504, 2873, 2875, ++ 2504, 2873, 2504, 2873, 3447, 3450, 3451, 3446, 3063, 2504, ++ 2506, 2875, 2504, 2876, 2504, 2882, 3448, 3452, 3449, 3216, ++ 3453, 3454, 2506, 3455, 3217, 2888, 3456, 3457, 3458, 3459, ++ ++ 1406, 3462, 3464, 3450, 3451, 3465, 3217, 3466, 3467, 3468, ++ 3469, 2877, 3470, 3471, 3472, 3452, 3473, 3487, 3453, 3454, ++ 3487, 3455, 3340, 2889, 3456, 3457, 3458, 3459, 3359, 3462, ++ 3464, 3359, 3503, 3465, 3340, 3466, 3467, 3468, 3469, 1405, ++ 3470, 3471, 3472, 3503, 3473, 3460, 3460, 3460, 3460, 3460, ++ 3460, 3460, 3460, 3460, 3463, 3463, 3463, 3463, 3463, 3463, ++ 3463, 3463, 3463, 3463, 3463, 3363, 3363, 3363, 3363, 3363, ++ 3363, 3363, 3363, 3363, 3363, 3363, 3474, 3476, 540, 3463, ++ 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3377, ++ 3363, 3477, 3377, 3478, 3479, 3480, 3481, 3482, 3483, 3484, ++ ++ 3485, 3490, 3491, 538, 3474, 3476, 3475, 3475, 3475, 3475, ++ 3475, 3475, 3475, 3475, 3475, 3488, 3493, 3489, 3488, 3477, ++ 3489, 3478, 3479, 3480, 3481, 3482, 3483, 3484, 3485, 3490, ++ 3491, 3492, 3494, 3495, 3492, 3497, 3498, 3550, 3497, 3498, ++ 3550, 3508, 533, 3500, 3493, 3401, 3501, 3502, 3401, 3505, ++ 3506, 3507, 3508, 3509, 3510, 3514, 531, 516, 3515, 3516, ++ 3494, 3495, 3499, 3499, 3499, 3499, 3499, 3499, 3499, 3499, ++ 3499, 3500, 3517, 3518, 3501, 3502, 3511, 3505, 3506, 3507, ++ 3519, 3509, 3510, 3514, 3512, 3513, 3515, 3516, 3520, 3521, ++ 3522, 3523, 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, ++ ++ 3517, 3518, 3532, 3533, 3511, 3534, 3535, 3534, 3519, 3536, ++ 3537, 3539, 3512, 3513, 3540, 514, 3520, 3521, 3522, 3523, ++ 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, 3541, 3542, ++ 3532, 3533, 3543, 3544, 3535, 3545, 3546, 3536, 3537, 3539, ++ 2504, 3547, 3540, 2504, 3552, 2504, 3553, 3554, 3555, 3487, ++ 3216, 3497, 3487, 2506, 3585, 3628, 3541, 3542, 3628, 3634, ++ 3543, 3544, 3634, 3545, 3546, 3556, 3557, 3217, 3558, 3547, ++ 3559, 3560, 3552, 3561, 3553, 3554, 3555, 3534, 3460, 3460, ++ 3460, 3460, 3460, 3460, 3460, 3460, 3460, 3461, 3638, 3551, ++ 3461, 3638, 3548, 3556, 3557, 3337, 3558, 3573, 3559, 3560, ++ ++ 3573, 3561, 3574, 510, 3549, 3549, 3549, 3549, 3549, 3549, ++ 3549, 3549, 3549, 3463, 3463, 3463, 3463, 3463, 3463, 3463, ++ 3463, 3463, 3463, 3463, 3475, 3475, 3475, 3475, 3475, 3475, ++ 3475, 3475, 3475, 3562, 3563, 3564, 3565, 3566, 3463, 3568, ++ 3566, 3569, 3570, 3571, 3576, 3578, 3579, 3576, 3492, 3577, ++ 3581, 3492, 3582, 3580, 3583, 3587, 3701, 3704, 1396, 3701, ++ 3704, 3562, 3563, 3564, 3565, 3745, 3567, 3568, 3590, 3569, ++ 3570, 3571, 3573, 3578, 3579, 3573, 3745, 3574, 3581, 1392, ++ 3582, 3498, 3583, 3587, 3498, 3499, 3499, 3499, 3499, 3499, ++ 3499, 3499, 3499, 3499, 3567, 3591, 3590, 3592, 3586, 3586, ++ ++ 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3588, 3593, 3594, ++ 3595, 3596, 3597, 3589, 3598, 3599, 3601, 3603, 3604, 3605, ++ 3606, 3607, 3608, 3591, 3610, 3592, 3611, 3614, 3615, 3576, ++ 3818, 1386, 3576, 3818, 3577, 3588, 3593, 3594, 3595, 3596, ++ 3597, 3589, 3598, 3599, 3601, 3603, 3604, 3605, 3606, 3607, ++ 3608, 3617, 3610, 3618, 3611, 3614, 3615, 3616, 3616, 3616, ++ 3616, 3616, 3616, 3616, 3616, 3616, 3616, 3616, 3619, 3622, ++ 3623, 3624, 3625, 3626, 3627, 3638, 3965, 1355, 3638, 3617, ++ 3708, 3618, 3616, 3629, 3629, 3629, 3629, 3629, 3629, 3629, ++ 3629, 3629, 3631, 3632, 3633, 3635, 3619, 3622, 3623, 3624, ++ ++ 3625, 3626, 3627, 3549, 3549, 3549, 3549, 3549, 3549, 3549, ++ 3549, 3549, 3550, 3636, 3637, 3550, 3639, 3640, 3641, 3642, ++ 3631, 3632, 3633, 3635, 3643, 3645, 3646, 3647, 3650, 3630, ++ 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3653, 3654, ++ 3566, 3636, 3637, 3566, 3639, 3640, 3641, 3642, 3648, 1347, ++ 3658, 3648, 3643, 3645, 3646, 3647, 3650, 3644, 3644, 3644, ++ 3644, 3644, 3644, 3644, 3644, 3644, 3653, 3654, 3659, 3660, ++ 3584, 3662, 3663, 3664, 3665, 3667, 3668, 3649, 3658, 3669, ++ 3670, 3671, 3672, 3673, 3661, 3661, 3661, 3661, 3661, 3661, ++ 3661, 3661, 3661, 1336, 431, 3497, 3659, 3660, 3585, 3662, ++ ++ 3663, 3664, 3665, 3667, 3668, 3649, 3674, 3669, 3670, 3671, ++ 3672, 3673, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, ++ 3661, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, ++ 3675, 3676, 3677, 3678, 3674, 3679, 3680, 3681, 3683, 3686, ++ 418, 3687, 3688, 3616, 3616, 3616, 3616, 3616, 3616, 3616, ++ 3616, 3616, 3616, 3616, 3689, 3691, 3692, 3693, 3675, 3676, ++ 3677, 3678, 414, 3679, 3680, 3681, 3683, 3686, 3616, 3687, ++ 3688, 3819, 399, 3695, 3819, 3696, 3695, 3699, 3697, 3700, ++ 3702, 395, 3689, 3691, 3692, 3693, 3696, 3706, 3709, 3629, ++ 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3630, 3630, ++ ++ 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3700, 3702, 3634, ++ 3710, 3711, 3634, 3712, 3713, 3706, 3709, 3644, 3644, 3644, ++ 3644, 3644, 3644, 3644, 3644, 3644, 3703, 3703, 3703, 3703, ++ 3703, 3703, 3703, 3703, 3703, 3714, 3715, 373, 3710, 3711, ++ 3701, 3712, 3713, 3701, 369, 3759, 3717, 3718, 3648, 3721, ++ 3722, 3648, 3728, 3729, 3723, 3730, 3731, 3698, 3732, 3733, ++ 3734, 3724, 363, 3714, 3715, 3716, 3716, 3716, 3716, 3716, ++ 3716, 3716, 3716, 3716, 3717, 3718, 3584, 3721, 3722, 3735, ++ 3728, 3729, 3723, 3730, 3731, 3736, 3732, 3733, 3734, 3724, ++ 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3737, ++ ++ 3738, 3739, 3740, 3741, 3742, 3743, 3744, 3735, 3746, 3747, ++ 3748, 3752, 3754, 3736, 3755, 3756, 359, 3758, 3704, 3746, ++ 355, 3704, 1278, 3762, 3761, 3790, 3765, 3737, 3738, 3739, ++ 3740, 3741, 3742, 3743, 3744, 1217, 3790, 3747, 3748, 3752, ++ 3754, 1216, 3755, 3756, 3696, 3758, 3696, 3696, 3695, 3965, ++ 3696, 3695, 3761, 3697, 3765, 3965, 3766, 3696, 3965, 3767, ++ 3965, 3696, 3703, 3703, 3703, 3703, 3703, 3703, 3703, 3703, ++ 3703, 3768, 3769, 3770, 3771, 3716, 3716, 3716, 3716, 3716, ++ 3716, 3716, 3716, 3716, 3766, 3772, 3773, 3767, 3774, 3775, ++ 3776, 3777, 3778, 3779, 3780, 3781, 3782, 3783, 3784, 3768, ++ ++ 3769, 3770, 3771, 3785, 3795, 3786, 3787, 3788, 3789, 3791, ++ 3792, 3793, 3794, 3772, 3773, 3795, 3774, 3775, 3776, 3777, ++ 3796, 3779, 3780, 3781, 3782, 3783, 3784, 3797, 3698, 3801, ++ 3798, 3785, 3698, 3786, 3787, 3788, 3789, 3791, 3792, 3793, ++ 3794, 3799, 3657, 3805, 3965, 3808, 3809, 3965, 3796, 3965, ++ 3810, 3811, 3812, 3813, 3814, 3797, 3815, 3801, 3798, 3816, ++ 3820, 3821, 3816, 3725, 3822, 1200, 3823, 3824, 3825, 3799, ++ 3826, 3827, 3828, 3808, 3809, 3829, 3830, 3831, 3810, 3811, ++ 3812, 3813, 3814, 3832, 3815, 3840, 3834, 3835, 3820, 3821, ++ 3836, 3837, 3822, 3806, 3823, 3824, 3825, 3838, 3826, 3827, ++ ++ 3828, 3840, 3843, 3829, 3830, 3831, 3817, 1191, 3844, 3845, ++ 3846, 3832, 3847, 3726, 3834, 3835, 3848, 3849, 3836, 3837, ++ 3851, 3852, 3859, 3851, 3818, 3838, 3860, 3818, 3819, 3854, ++ 3843, 3819, 3861, 3856, 3817, 3841, 3844, 3845, 3846, 3857, ++ 3847, 3862, 3857, 3858, 3848, 3849, 3858, 3863, 3865, 3852, ++ 3859, 3806, 3866, 3867, 3860, 3868, 3869, 3870, 3873, 3874, ++ 3861, 3875, 3874, 3876, 3877, 3878, 3879, 3880, 3881, 3862, ++ 3851, 3882, 3840, 3851, 3965, 3863, 3865, 3965, 3889, 3965, ++ 3866, 3867, 3890, 3868, 3869, 3870, 3873, 3891, 3892, 3893, ++ 3894, 3876, 3877, 3878, 3879, 3880, 3881, 3965, 3857, 3882, ++ ++ 3965, 3857, 3965, 3886, 3858, 3895, 3889, 3858, 3896, 3888, ++ 3890, 3806, 3897, 3898, 3906, 3891, 3892, 3893, 3894, 3908, ++ 3904, 3909, 3841, 3904, 3899, 3905, 3907, 3900, 3910, 3907, ++ 3911, 3910, 3965, 3895, 3916, 3965, 3896, 3965, 3917, 3918, ++ 3897, 3898, 3906, 3965, 3919, 3920, 3965, 3908, 3965, 3909, ++ 3921, 3922, 3899, 3923, 3924, 3900, 3925, 3926, 3911, 3929, ++ 3904, 3931, 3916, 3904, 3931, 3905, 3917, 3918, 1179, 3932, ++ 3934, 3907, 3919, 3920, 3907, 1158, 1142, 3947, 3921, 3922, ++ 3947, 3923, 3924, 3910, 3925, 3926, 3910, 3929, 3930, 3930, ++ 3930, 3930, 3930, 3930, 3930, 3930, 3930, 3932, 3934, 3937, ++ ++ 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3938, ++ 3939, 3940, 3941, 3942, 3943, 3944, 3930, 3930, 3930, 3930, ++ 3930, 3930, 3930, 3930, 3930, 662, 1117, 3937, 3931, 645, ++ 385, 3931, 385, 874, 1073, 3948, 3949, 3938, 3939, 3940, ++ 3941, 3942, 3943, 3944, 3950, 3946, 3946, 3946, 3946, 3946, ++ 3946, 3946, 3946, 3946, 3933, 3933, 3933, 3933, 3933, 3933, ++ 3933, 3933, 3933, 3948, 3949, 3951, 3953, 3954, 3956, 3957, ++ 3958, 1062, 3950, 3946, 3946, 3946, 3946, 3946, 3946, 3946, ++ 3946, 3946, 3947, 1054, 1051, 3947, 1009, 540, 538, 3959, ++ 3960, 3961, 3962, 3951, 3953, 3954, 3956, 3957, 3958, 3955, ++ ++ 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, ++ 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3959, 3960, 3961, ++ 3962, 3963, 3964, 1007, 533, 531, 1001, 516, 514, 999, ++ 510, 994, 986, 977, 976, 946, 935, 923, 913, 431, ++ 910, 418, 414, 662, 883, 399, 395, 645, 865, 3963, ++ 3964, 76, 76, 76, 76, 76, 76, 76, 76, 76, ++ 76, 76, 76, 76, 76, 76, 76, 76, 76, 98, + 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, +- 98, 98, 98, 98, 98, 128, 128, 128, 128, 128, ++ 98, 98, 98, 98, 98, 98, 98, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, +- 128, 128, 128, 134, 134, 134, 134, 134, 134, 134, +- 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, + +- 134, 137, 137, 137, 137, 137, 137, 137, 137, 137, +- 137, 137, 137, 137, 137, 137, 137, 137, 137, 143, +- 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, +- 143, 143, 143, 143, 143, 143, 143, 149, 149, 149, ++ 128, 128, 128, 128, 128, 134, 134, 134, 134, 134, ++ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, ++ 134, 134, 134, 137, 137, 137, 137, 137, 137, 137, ++ 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, ++ 137, 143, 143, 143, 143, 143, 143, 143, 143, 143, ++ 143, 143, 143, 143, 143, 143, 143, 143, 143, 149, + 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, +- 149, 149, 149, 149, 149, 156, 156, 156, 156, 156, ++ 149, 149, 149, 149, 149, 149, 149, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, +- 156, 156, 156, 162, 162, 162, 162, 162, 162, 162, +- 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, +- 162, 169, 169, 169, 169, 169, 169, 169, 169, 169, ++ 156, 156, 156, 156, 156, 162, 162, 162, 162, 162, + +- 169, 169, 169, 169, 169, 169, 169, 169, 169, 179, +- 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, +- 179, 179, 179, 179, 179, 179, 179, 185, 185, 185, ++ 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, ++ 162, 162, 162, 169, 169, 169, 169, 169, 169, 169, ++ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, ++ 169, 179, 179, 179, 179, 179, 179, 179, 179, 179, ++ 179, 179, 179, 179, 179, 179, 179, 179, 179, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, +- 185, 185, 185, 185, 185, 227, 227, 227, 227, 227, ++ 185, 185, 185, 185, 185, 185, 185, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, +- 227, 227, 227, 232, 232, 232, 232, 232, 232, 232, ++ 227, 227, 227, 227, 227, 232, 232, 232, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, +- 232, 237, 237, 237, 237, 237, 237, 237, 237, 237, +- 237, 237, 237, 237, 237, 237, 237, 237, 237, 238, + +- 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, +- 238, 238, 238, 238, 238, 238, 238, 239, 239, 239, ++ 232, 232, 232, 237, 237, 237, 237, 237, 237, 237, ++ 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, ++ 237, 238, 238, 238, 238, 238, 238, 238, 238, 238, ++ 238, 238, 238, 238, 238, 238, 238, 238, 238, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, +- 239, 239, 239, 239, 239, 240, 240, 240, 240, 240, ++ 239, 239, 239, 239, 239, 239, 239, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, +- 240, 240, 240, 241, 241, 241, 241, 241, 241, 241, ++ 240, 240, 240, 240, 240, 241, 241, 241, 241, 241, + 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, +- 241, 249, 249, 249, 249, 249, 249, 249, 249, 249, +- 249, 249, 249, 249, 249, 249, 249, 249, 249, 251, +- 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, ++ 241, 241, 241, 249, 249, 249, 249, 249, 249, 249, + +- 251, 251, 251, 251, 251, 251, 251, 255, 255, 255, ++ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, ++ 249, 251, 251, 251, 251, 251, 251, 251, 251, 251, ++ 251, 251, 251, 251, 251, 251, 251, 251, 251, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, +- 255, 255, 255, 255, 255, 258, 258, 258, 258, 258, ++ 255, 255, 255, 255, 255, 255, 255, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, +- 258, 258, 258, 266, 266, 363, 266, 266, 266, 266, ++ 258, 258, 258, 258, 258, 266, 266, 373, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 346, 346, 346, 346, 346, 346, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 363, 363, 363, ++ 266, 266, 266, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, + ++ 346, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 356, 356, 356, 356, 356, 356, 356, 356, 356, 363, + 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 363, 363, 366, 366, 366, 366, 366, ++ 363, 363, 363, 363, 363, 363, 363, 366, 366, 366, + 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 366, 366, 373, 373, 373, 373, 373, 373, 373, ++ 366, 366, 366, 366, 366, 373, 373, 373, 373, 373, + 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, +- 373, 376, 376, 376, 376, 376, 376, 376, 376, 376, +- 376, 376, 376, 376, 376, 376, 376, 376, 376, 382, +- 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, +- 382, 382, 382, 382, 382, 382, 382, 387, 387, 387, +- 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, ++ 373, 373, 373, 376, 376, 376, 376, 376, 376, 376, ++ 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, ++ 376, 382, 382, 382, 382, 382, 382, 382, 382, 382, + +- 387, 387, 387, 387, 387, 391, 391, 391, 391, 391, ++ 382, 382, 382, 382, 382, 382, 382, 382, 382, 387, ++ 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, ++ 387, 387, 387, 387, 387, 387, 387, 391, 391, 391, + 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, +- 391, 391, 391, 399, 399, 399, 399, 399, 399, 399, ++ 391, 391, 391, 391, 391, 399, 399, 399, 399, 399, + 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- 399, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 402, 402, 402, 402, 402, 402, 402, 411, +- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 411, 411, 411, 411, 418, 418, 418, +- 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, +- 418, 418, 418, 418, 418, 421, 421, 421, 421, 421, ++ 399, 399, 399, 402, 402, 402, 402, 402, 402, 402, ++ 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, ++ 402, 411, 411, 411, 411, 411, 411, 411, 411, 411, ++ 411, 411, 411, 411, 411, 411, 411, 411, 411, 418, + ++ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 418, 418, 418, 418, 418, 418, 418, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 421, 421, 505, 505, 505, 505, 505, 505, 505, ++ 421, 421, 421, 421, 421, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 511, 511, 511, 511, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 517, 517, 359, +- 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, +- 517, 517, 517, 517, 517, 518, 518, 859, 518, 518, +- 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, ++ 505, 505, 505, 511, 511, 511, 511, 511, 511, 511, ++ 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, ++ 511, 516, 516, 516, 516, 516, 516, 516, 516, 516, ++ 516, 516, 516, 516, 516, 516, 516, 516, 516, 517, ++ 517, 369, 517, 517, 517, 517, 517, 517, 517, 517, + +- 518, 518, 518, 519, 519, 355, 519, 519, 519, 519, ++ 517, 517, 517, 517, 517, 517, 517, 518, 518, 862, ++ 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, ++ 518, 518, 518, 518, 518, 519, 519, 363, 519, 519, + 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, +- 519, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 528, 528, 528, 528, 528, 528, 533, +- 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 533, 533, 533, 533, 535, 535, 535, ++ 519, 519, 519, 528, 528, 528, 528, 528, 528, 528, ++ 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, ++ 528, 533, 533, 533, 533, 533, 533, 533, 533, 533, ++ 533, 533, 533, 533, 533, 533, 533, 533, 533, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 535, 535, 540, 540, 540, 540, 540, +- 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, +- 540, 540, 540, 266, 266, 774, 266, 266, 266, 266, ++ 535, 535, 535, 535, 535, 535, 535, 540, 540, 540, + ++ 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, ++ 540, 540, 540, 540, 540, 266, 266, 359, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 346, 346, 346, 346, 346, 346, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 363, 363, 363, ++ 266, 266, 266, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 346, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 356, 356, 356, 356, 356, 356, 356, 356, 356, 363, + 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 538, 363, 366, 366, 366, 366, 366, ++ 363, 363, 363, 363, 363, 859, 363, 366, 366, 366, + 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 366, 366, 373, 373, 373, 373, 373, 373, 373, +- 373, 373, 373, 373, 373, 373, 373, 373, 373, 539, + +- 373, 376, 376, 376, 376, 376, 376, 376, 376, 376, +- 376, 376, 376, 376, 376, 376, 376, 376, 376, 382, +- 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, +- 382, 382, 382, 382, 382, 382, 382, 639, 639, 639, ++ 366, 366, 366, 366, 366, 373, 373, 373, 373, 373, ++ 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, ++ 373, 355, 373, 376, 376, 376, 376, 376, 376, 376, ++ 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, ++ 376, 382, 382, 382, 382, 382, 382, 382, 382, 382, ++ 382, 382, 382, 382, 382, 382, 382, 382, 382, 639, + 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 639, 639, 387, 387, 387, 387, 387, ++ 639, 639, 639, 639, 639, 639, 639, 387, 387, 387, + 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, +- 387, 387, 387, 644, 531, 644, 644, 532, 514, 644, +- 644, 644, 644, 644, 515, 644, 644, 644, 644, 644, +- 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, ++ 387, 387, 387, 387, 387, 644, 774, 644, 644, 538, + +- 391, 391, 391, 391, 391, 391, 391, 391, 399, 399, ++ 539, 644, 644, 644, 644, 644, 531, 644, 644, 644, ++ 644, 644, 391, 391, 391, 391, 391, 391, 391, 391, ++ 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, + 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- 399, 399, 399, 399, 508, 399, 652, 652, 652, 652, ++ 399, 399, 399, 399, 399, 399, 532, 399, 652, 652, + 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, +- 652, 652, 652, 652, 402, 402, 402, 402, 402, 402, ++ 652, 652, 652, 652, 652, 652, 402, 402, 402, 402, + 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 659, 659, 659, 659, 659, 659, 659, 659, ++ 402, 402, 402, 402, 659, 659, 659, 659, 659, 659, + 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, +- 661, 753, 661, 661, 739, 479, 661, 661, 661, 661, +- 661, 735, 661, 661, 661, 661, 661, 411, 411, 411, + ++ 659, 659, 661, 514, 661, 661, 515, 508, 661, 661, ++ 661, 661, 661, 753, 661, 661, 661, 661, 661, 411, + 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 411, 411, 418, 418, 418, 418, 418, ++ 411, 411, 411, 411, 411, 411, 411, 418, 418, 418, + 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, +- 418, 696, 418, 421, 421, 421, 421, 421, 421, 421, ++ 418, 418, 418, 739, 418, 421, 421, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 505, 505, 505, 505, 505, 505, 505, 505, 511, +- 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 511, 511, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, ++ 421, 421, 421, 505, 505, 505, 505, 505, 505, 505, ++ 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, ++ 505, 511, 511, 511, 511, 511, 511, 511, 511, 511, + +- 516, 516, 516, 681, 516, 517, 517, 437, 517, 517, ++ 511, 511, 511, 511, 511, 511, 511, 511, 511, 516, ++ 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, ++ 516, 516, 516, 516, 516, 479, 516, 517, 517, 735, + 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, +- 517, 517, 517, 518, 518, 428, 518, 518, 518, 518, ++ 517, 517, 517, 517, 517, 518, 518, 696, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, +- 518, 519, 519, 414, 519, 519, 519, 519, 519, 519, +- 519, 519, 519, 519, 519, 519, 519, 519, 519, 528, +- 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 528, 528, 528, 528, 533, 533, 533, +- 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 417, 533, 535, 535, 535, 535, 535, ++ 518, 518, 518, 519, 519, 681, 519, 519, 519, 519, ++ 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, ++ 519, 528, 528, 528, 528, 528, 528, 528, 528, 528, ++ 528, 528, 528, 528, 528, 528, 528, 528, 528, 533, + ++ 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, ++ 533, 533, 533, 533, 533, 437, 533, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 540, 540, 540, 540, 540, 540, 540, +- 540, 540, 540, 540, 540, 540, 540, 540, 540, 395, +- 540, 266, 266, 398, 266, 266, 266, 266, 266, 266, +- 266, 266, 266, 266, 266, 266, 266, 266, 266, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 363, 363, 363, ++ 535, 535, 535, 535, 535, 540, 540, 540, 540, 540, ++ 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, ++ 540, 428, 540, 266, 266, 414, 266, 266, 266, 266, ++ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, ++ 266, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 363, + 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 363, 363, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, + +- 356, 356, 356, 373, 373, 373, 373, 373, 373, 373, ++ 363, 363, 363, 363, 363, 363, 363, 356, 356, 356, ++ 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 356, 356, 356, 356, 356, 373, 373, 373, 373, 373, + 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, +- 373, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 366, 366, 366, 366, 366, 366, 366, 366, 639, +- 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 639, 639, 639, 639, 869, 390, 869, +- 869, 385, 369, 869, 869, 869, 869, 869, 372, 869, +- 869, 869, 869, 869, 869, 872, 359, 872, 872, 362, +- 351, 872, 872, 872, 872, 872, 592, 872, 872, 872, +- 872, 872, 872, 387, 387, 387, 387, 387, 387, 387, ++ 373, 373, 373, 366, 366, 366, 366, 366, 366, 366, ++ 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, ++ 366, 639, 639, 639, 639, 639, 639, 639, 639, 639, ++ 639, 639, 639, 639, 639, 639, 639, 639, 639, 869, ++ 417, 869, 869, 395, 398, 869, 869, 869, 869, 869, ++ 390, 869, 869, 869, 869, 869, 869, 872, 385, 872, + ++ 872, 369, 372, 872, 872, 872, 872, 872, 359, 872, ++ 872, 872, 872, 872, 872, 387, 387, 387, 387, 387, + 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, +- 387, 644, 591, 644, 644, 558, 541, 644, 644, 644, +- 644, 644, 539, 644, 644, 644, 644, 644, 399, 399, ++ 387, 387, 387, 644, 362, 644, 644, 351, 592, 644, ++ 644, 644, 644, 644, 591, 644, 644, 644, 644, 644, + 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- 399, 399, 399, 399, 399, 399, 391, 391, 391, 391, ++ 399, 399, 399, 399, 399, 399, 399, 399, 391, 391, + 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, +- 391, 391, 391, 391, 652, 652, 652, 652, 652, 652, ++ 391, 391, 391, 391, 391, 391, 652, 652, 652, 652, + 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, +- 652, 652, 885, 885, 885, 885, 885, 885, 885, 885, +- 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, + +- 887, 539, 887, 887, 532, 515, 887, 887, 887, 887, +- 887, 508, 887, 887, 887, 887, 887, 887, 657, 657, ++ 652, 652, 652, 652, 885, 885, 885, 885, 885, 885, ++ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 885, 885, 887, 558, 887, 887, 541, 539, 887, 887, ++ 887, 887, 887, 539, 887, 887, 887, 887, 887, 887, + 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, +- 657, 657, 657, 657, 657, 657, 402, 402, 402, 402, ++ 657, 657, 657, 657, 657, 657, 657, 657, 402, 402, + 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 402, 402, 661, 479, 661, 661, 437, 417, +- 661, 661, 661, 661, 661, 398, 661, 661, 661, 661, +- 661, 659, 659, 659, 659, 659, 659, 659, 659, 659, +- 659, 659, 659, 659, 659, 659, 659, 659, 659, 418, +- 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 402, 402, 402, 402, 402, 402, 661, 532, 661, 661, ++ 515, 508, 661, 661, 661, 661, 661, 479, 661, 661, ++ 661, 661, 661, 659, 659, 659, 659, 659, 659, 659, + +- 418, 418, 418, 418, 418, 418, 418, 411, 411, 411, ++ 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, ++ 659, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 418, 418, 418, 418, 418, 418, 418, 418, 418, 411, + 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 411, 411, 421, 421, 421, 421, 421, ++ 411, 411, 411, 411, 411, 411, 411, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 421, 421, 505, 505, 505, 505, 505, 505, 505, ++ 421, 421, 421, 421, 421, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 516, 516, 516, 516, 516, 516, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 516, 511, +- 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 511, 511, 533, 533, 533, ++ 505, 505, 505, 516, 516, 516, 516, 516, 516, 516, ++ 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, + ++ 516, 511, 511, 511, 511, 511, 511, 511, 511, 511, ++ 511, 511, 511, 511, 511, 511, 511, 511, 511, 533, + 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 533, 533, 528, 528, 528, 528, 528, ++ 533, 533, 533, 533, 533, 533, 533, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 540, 540, 540, 540, 540, 540, 540, ++ 528, 528, 528, 528, 528, 540, 540, 540, 540, 540, + 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, +- 540, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 535, 535, 535, 535, 535, 535, 266, +- 266, 398, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 266, 266, 266, 266, 266, 266, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 540, 540, 540, 535, 535, 535, 535, 535, 535, 535, ++ 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, ++ 535, 266, 266, 437, 266, 266, 266, 266, 266, 266, + +- 346, 346, 346, 346, 346, 356, 356, 356, 356, 356, ++ 266, 266, 266, 266, 266, 266, 266, 266, 266, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 356, 356, 356, + 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 366, 366, 366, 366, 366, 366, 366, ++ 356, 356, 356, 356, 356, 366, 366, 366, 366, 366, + 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 639, 639, 639, 639, 639, 639, 869, +- 385, 869, 869, 385, 385, 869, 869, 869, 869, 869, +- 372, 869, 869, 869, 869, 869, 869, 872, 372, 872, +- 872, 362, 351, 872, 872, 872, 872, 872, 317, 872, +- 872, 872, 872, 872, 872, 644, 3952, 644, 644, 250, ++ 366, 366, 366, 639, 639, 639, 639, 639, 639, 639, ++ 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, ++ 639, 869, 417, 869, 869, 398, 398, 869, 869, 869, ++ 869, 869, 385, 869, 869, 869, 869, 869, 869, 872, + +- 250, 644, 644, 644, 644, 644, 98, 644, 644, 644, +- 644, 644, 652, 652, 652, 652, 652, 652, 652, 652, ++ 385, 872, 872, 385, 372, 872, 872, 872, 872, 872, ++ 372, 872, 872, 872, 872, 872, 872, 644, 362, 644, ++ 644, 351, 317, 644, 644, 644, 644, 644, 3965, 644, ++ 644, 644, 644, 644, 652, 652, 652, 652, 652, 652, + 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, +- 887, 98, 887, 887, 98, 98, 887, 887, 887, 887, +- 887, 98, 887, 887, 887, 887, 887, 887, 657, 657, ++ 652, 652, 887, 250, 887, 887, 250, 98, 887, 887, ++ 887, 887, 887, 98, 887, 887, 887, 887, 887, 887, + 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, +- 657, 657, 657, 657, 657, 657, 891, 98, 891, 891, +- 98, 98, 891, 891, 891, 891, 891, 161, 891, 891, +- 891, 891, 891, 891, 885, 885, 885, 885, 885, 885, +- 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 657, 657, 657, 657, 657, 657, 657, 657, 891, 98, ++ 891, 891, 98, 98, 891, 891, 891, 891, 891, 98, + +- 885, 885, 888, 888, 888, 888, 888, 888, 888, 888, ++ 891, 891, 891, 891, 891, 891, 885, 885, 885, 885, ++ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 885, 885, 885, 885, 888, 888, 888, 888, 888, 888, + 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, +- 661, 161, 661, 661, 160, 160, 661, 661, 661, 661, +- 661, 3952, 661, 661, 661, 661, 661, 402, 402, 402, ++ 888, 888, 661, 98, 661, 661, 98, 161, 661, 661, ++ 661, 661, 661, 161, 661, 661, 661, 661, 661, 402, + 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 402, 402, 402, 411, 411, 411, 411, 411, ++ 402, 402, 402, 402, 402, 402, 402, 411, 411, 411, + 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 421, 421, 421, 421, 421, 421, 421, +- 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, ++ 411, 411, 411, 411, 411, 421, 421, 421, 421, 421, + +- 3952, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 505, +- 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 505, 505, 505, 505, 505, 505, 511, 511, 511, ++ 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, ++ 421, 421, 421, 1157, 1157, 1157, 1157, 1157, 1157, 1157, ++ 1157, 1157, 160, 1157, 1157, 1157, 1157, 1157, 1157, 1157, ++ 1157, 505, 505, 505, 505, 505, 505, 505, 505, 505, ++ 505, 505, 505, 505, 505, 505, 505, 505, 505, 511, + 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 528, 528, 528, 528, 528, ++ 511, 511, 511, 511, 511, 511, 511, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 535, 535, 535, 535, 535, 535, 535, ++ 528, 528, 528, 528, 528, 535, 535, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 266, 266, 3952, 266, 266, 266, 266, 266, 266, +- 266, 266, 266, 266, 266, 266, 266, 266, 266, 363, + +- 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 363, 363, 363, 363, 373, 373, 373, ++ 535, 535, 535, 266, 266, 160, 266, 266, 266, 266, ++ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, ++ 266, 363, 363, 363, 363, 363, 363, 363, 363, 363, ++ 363, 363, 363, 363, 363, 363, 363, 363, 363, 373, + 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, +- 373, 373, 373, 373, 373, 639, 639, 639, 639, 639, ++ 373, 373, 373, 373, 373, 373, 373, 639, 639, 639, + 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 869, 3952, 869, 869, 3952, 3952, 869, +- 869, 869, 869, 869, 3952, 869, 869, 869, 869, 869, +- 869, 872, 3952, 872, 872, 3952, 3952, 872, 872, 872, +- 872, 872, 3952, 872, 872, 872, 872, 872, 872, 399, +- 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- +- 399, 399, 399, 399, 399, 399, 399, 887, 3952, 887, +- 887, 3952, 3952, 887, 887, 887, 887, 887, 3952, 887, +- 887, 887, 887, 887, 887, 888, 888, 888, 888, 888, ++ 639, 639, 639, 639, 639, 869, 3965, 869, 869, 3965, ++ 3965, 869, 869, 869, 869, 869, 3965, 869, 869, 869, ++ 869, 869, 869, 872, 3965, 872, 872, 3965, 3965, 872, ++ ++ 872, 872, 872, 872, 3965, 872, 872, 872, 872, 872, ++ 872, 399, 399, 399, 399, 399, 399, 399, 399, 399, ++ 399, 399, 399, 399, 399, 399, 399, 399, 399, 887, ++ 3965, 887, 887, 3965, 3965, 887, 887, 887, 887, 887, ++ 3965, 887, 887, 887, 887, 887, 887, 888, 888, 888, + 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, +- 888, 888, 888, 661, 3952, 661, 661, 3952, 3952, 661, +- 661, 661, 661, 661, 661, 661, 661, 661, 661, 661, ++ 888, 888, 888, 888, 888, 661, 3965, 661, 661, 3965, ++ 3965, 661, 661, 661, 661, 661, 661, 661, 661, 661, ++ 661, 661, 659, 659, 659, 659, 659, 659, 659, 659, + 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, +- 659, 659, 659, 659, 659, 659, 659, 659, 418, 418, +- 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, +- 418, 418, 418, 418, 418, 418, 1346, 3952, 1346, 1346, + +- 3952, 3952, 1346, 1346, 1346, 3952, 1346, 1346, 1346, 1346, +- 1346, 1346, 1346, 1346, 1359, 1359, 1359, 1359, 1359, 1359, +- 1359, 3952, 1359, 3952, 1359, 1359, 1359, 1359, 1359, 1359, +- 1359, 1359, 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, ++ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 418, 418, 418, 418, 418, 418, 418, 418, 1346, 3965, ++ 1346, 1346, 3965, 3965, 1346, 1346, 1346, 3965, 1346, 1346, ++ 1346, 1346, 1346, 1346, 1346, 1346, 1359, 1359, 1359, 1359, ++ 1359, 1359, 1359, 3965, 1359, 3965, 1359, 1359, 1359, 1359, ++ 1359, 1359, 1359, 1359, 1393, 1393, 1393, 1393, 1393, 1393, + 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, ++ 1393, 1393, 516, 516, 516, 516, 516, 516, 516, 516, + 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 533, 533, + 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 533, 533, 533, 540, 540, 540, 540, +- 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, + +- 540, 540, 540, 540, 266, 266, 3952, 266, 266, 266, ++ 533, 533, 533, 533, 533, 533, 533, 533, 540, 540, ++ 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, ++ 540, 540, 540, 540, 540, 540, 266, 266, 3965, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 266, 885, 885, 885, 885, 885, 885, 885, 885, ++ 266, 266, 266, 266, 885, 885, 885, 885, 885, 885, + 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 885, 885, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, + 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, +- 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1534, 3952, +- 3952, 1534, 3952, 3952, 1534, 1575, 3952, 3952, 3952, 3952, +- 3952, 1575, 1575, 1575, 3952, 1575, 1575, 1575, 1575, 1575, +- 1575, 1575, 1575, 1524, 1524, 1524, 1524, 1524, 1524, 1524, +- 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, ++ 1534, 3965, 3965, 1534, 3965, 3965, 1534, 1575, 3965, 3965, ++ 3965, 3965, 3965, 1575, 1575, 1575, 3965, 1575, 1575, 1575, + +- 1524, 1722, 3952, 3952, 1722, 3952, 1722, 1760, 1760, 1760, ++ 1575, 1575, 1575, 1575, 1575, 1524, 1524, 1524, 1524, 1524, ++ 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, ++ 1524, 1524, 1524, 1722, 3965, 3965, 1722, 3965, 1722, 1760, + 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, +- 1760, 1760, 1760, 1760, 1760, 1765, 3952, 3952, 1765, 1765, +- 3952, 3952, 1765, 3952, 1765, 3952, 1765, 1765, 1765, 1765, +- 1901, 1901, 1901, 1901, 1946, 1946, 3952, 1946, 1946, 1946, ++ 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1765, 3965, 3965, ++ 1765, 1765, 3965, 3965, 1765, 3965, 1765, 3965, 1765, 1765, ++ 1765, 1765, 1901, 1901, 1901, 1901, 1946, 1946, 3965, 1946, + 1946, 1946, 1946, 1946, 1946, 1946, 1946, 1946, 1946, 1946, +- 1946, 1946, 1948, 1948, 3952, 1948, 1948, 1948, 1948, 1948, ++ 1946, 1946, 1946, 1946, 1948, 1948, 3965, 1948, 1948, 1948, + 1948, 1948, 1948, 1948, 1948, 1948, 1948, 1948, 1948, 1948, +- 1952, 3952, 1952, 3952, 1952, 1952, 1952, 1952, 2074, 2074, +- 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, + +- 2074, 2074, 2074, 2074, 2074, 2074, 2089, 2089, 2089, 2089, ++ 1948, 1948, 1952, 3965, 1952, 3965, 1952, 1952, 1952, 1952, ++ 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, ++ 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2089, 2089, + 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, +- 2089, 2089, 2089, 2089, 2142, 2142, 2142, 2142, 2142, 2142, ++ 2089, 2089, 2089, 2089, 2089, 2089, 2142, 2142, 2142, 2142, + 2142, 2142, 2142, 2142, 2142, 2142, 2142, 2142, 2142, 2142, +- 2142, 2142, 2178, 2178, 3952, 3952, 2178, 2178, 2178, 2178, +- 2178, 3952, 2178, 2178, 2178, 2178, 2178, 2178, 2178, 2178, +- 2196, 3952, 3952, 2196, 2196, 3952, 3952, 2196, 3952, 2196, +- 3952, 2196, 2196, 2196, 2196, 2283, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2296, 3952, 2296, 2296, 3952, 3952, 2296, +- +- 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, +- 2296, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2332, +- 3952, 3952, 3952, 3952, 3952, 2332, 2332, 2332, 3952, 2332, +- 2332, 2332, 2332, 2332, 2332, 2332, 2332, 2358, 2358, 3952, +- 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, +- 2358, 2358, 2358, 2358, 2358, 2360, 2360, 3952, 2360, 2360, +- 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, +- 2360, 2360, 2360, 2386, 3952, 3952, 2386, 2386, 3952, 3952, +- 2386, 3952, 2386, 3952, 2386, 2386, 2386, 2386, 2399, 3952, +- +- 3952, 3952, 3952, 3952, 2399, 2399, 2399, 3952, 2399, 2399, +- 2399, 2399, 2399, 2399, 2399, 2399, 2410, 2410, 3952, 2410, +- 2410, 3952, 2410, 2410, 2410, 2410, 2410, 2410, 2410, 2410, +- 2410, 2410, 2410, 2415, 3952, 2415, 3952, 2415, 2415, 2415, +- 2415, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2298, +- 3952, 2298, 2298, 3952, 3952, 2298, 2298, 2298, 2298, 2298, +- 2298, 2298, 2298, 2298, 2298, 2298, 2298, 2560, 2560, 2560, +- 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, +- 2560, 2560, 2560, 2560, 2560, 2563, 2563, 2563, 2563, 2563, +- +- 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, +- 2563, 2563, 2563, 2571, 3952, 3952, 2571, 2571, 3952, 3952, +- 2571, 3952, 2571, 3952, 2571, 2571, 2571, 2571, 2590, 3952, +- 2590, 3952, 2590, 2590, 2590, 2590, 2592, 3952, 3952, 2592, +- 2592, 3952, 3952, 2592, 3952, 2592, 3952, 2592, 2592, 2592, +- 2592, 2624, 2624, 3952, 2624, 2624, 2624, 2624, 2624, 2624, +- 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2691, 3952, +- 2691, 2691, 3952, 3952, 2691, 2691, 2691, 2691, 2691, 2691, +- 2691, 2691, 2691, 2691, 2691, 2691, 2502, 2502, 2502, 2502, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- +- 2502, 2502, 2502, 2502, 2504, 2504, 2504, 2504, 2504, 2504, ++ 2142, 2142, 2142, 2142, 2178, 2178, 3965, 3965, 2178, 2178, ++ 2178, 2178, 2178, 3965, 2178, 2178, 2178, 2178, 2178, 2178, ++ 2178, 2178, 2196, 3965, 3965, 2196, 2196, 3965, 3965, 2196, ++ 3965, 2196, 3965, 2196, 2196, 2196, 2196, 2284, 2284, 2284, ++ ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2297, 3965, 2297, 2297, 3965, ++ 3965, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, ++ 2297, 2297, 2297, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2333, 3965, 3965, 3965, 3965, 3965, 2333, 2333, 2333, ++ 3965, 2333, 2333, 2333, 2333, 2333, 2333, 2333, 2333, 2359, ++ 2359, 3965, 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, ++ 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2361, 2361, 3965, ++ 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, ++ ++ 2361, 2361, 2361, 2361, 2361, 2387, 3965, 3965, 2387, 2387, ++ 3965, 3965, 2387, 3965, 2387, 3965, 2387, 2387, 2387, 2387, ++ 2400, 3965, 3965, 3965, 3965, 3965, 2400, 2400, 2400, 3965, ++ 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2411, 2411, ++ 3965, 2411, 2411, 3965, 2411, 2411, 2411, 2411, 2411, 2411, ++ 2411, 2411, 2411, 2411, 2411, 2416, 3965, 2416, 3965, 2416, ++ 2416, 2416, 2416, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2299, 3965, 2299, 2299, 3965, 3965, 2299, 2299, 2299, ++ 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2562, ++ ++ 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, ++ 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2565, 2565, 2565, ++ 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, ++ 2565, 2565, 2565, 2565, 2565, 2573, 3965, 3965, 2573, 2573, ++ 3965, 3965, 2573, 3965, 2573, 3965, 2573, 2573, 2573, 2573, ++ 2592, 3965, 2592, 3965, 2592, 2592, 2592, 2592, 2594, 3965, ++ 3965, 2594, 2594, 3965, 3965, 2594, 3965, 2594, 3965, 2594, ++ 2594, 2594, 2594, 2626, 2626, 3965, 2626, 2626, 2626, 2626, ++ 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, ++ 2694, 3965, 2694, 2694, 3965, 3965, 2694, 2694, 2694, 2694, ++ ++ 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2504, 2504, + 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, +- 2504, 2504, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2706, 3952, 2706, 2706, 3952, 3952, 2706, 2706, 2706, 2706, +- 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2089, 2089, 2089, 2089, ++ 2504, 2504, 2504, 2504, 2504, 2504, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2709, 3965, 2709, 2709, 3965, 3965, 2709, 2709, ++ 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2089, 2089, ++ + 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, +- 2089, 2089, 2089, 2089, 2358, 2358, 3952, 2358, 2358, 2358, +- +- 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, +- 2358, 2358, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, +- 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, +- 2360, 2360, 3952, 2360, 2360, 2360, 2360, 2360, 2360, 2360, +- 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2563, 2563, +- 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, +- 2563, 2563, 2563, 2563, 2563, 2563, 2755, 3952, 2755, 3952, +- 2755, 2755, 2755, 2755, 2571, 3952, 2571, 3952, 2571, 2571, +- 2571, 2571, 2756, 3952, 3952, 2756, 3952, 3952, 3952, 2756, +- 3952, 2756, 3952, 2756, 2756, 2756, 2756, 2766, 3952, 3952, +- +- 2766, 2766, 3952, 3952, 2766, 3952, 2766, 3952, 2766, 2766, +- 2766, 2766, 2590, 3952, 3952, 2590, 3952, 2590, 3952, 2590, +- 2590, 2590, 2590, 2775, 3952, 2775, 3952, 2775, 2775, 2775, +- 2775, 2592, 3952, 2592, 3952, 2592, 2592, 2592, 2592, 2784, +- 2784, 3952, 2784, 2784, 3952, 2784, 2784, 2784, 2784, 2784, +- 2784, 2784, 2784, 2784, 2784, 2784, 2804, 3952, 3952, 2804, +- 2804, 3952, 3952, 2804, 3952, 2804, 3952, 2804, 2804, 2804, +- 2804, 2624, 2624, 3952, 2624, 2624, 3952, 2624, 2624, 2624, +- 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2808, 2808, +- 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, +- +- 2808, 2808, 2808, 2808, 2808, 2808, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2283, 2074, 2074, 2074, 2074, 2074, 2074, ++ 2089, 2089, 2089, 2089, 2089, 2089, 2359, 2359, 3965, 2359, ++ 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, ++ 2359, 2359, 2359, 2359, 2562, 2562, 2562, 2562, 2562, 2562, ++ 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, ++ 2562, 2562, 2361, 2361, 3965, 2361, 2361, 2361, 2361, 2361, ++ 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, ++ 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, ++ 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2758, 3965, ++ 2758, 3965, 2758, 2758, 2758, 2758, 2573, 3965, 2573, 3965, ++ ++ 2573, 2573, 2573, 2573, 2759, 3965, 3965, 2759, 3965, 3965, ++ 3965, 2759, 3965, 2759, 3965, 2759, 2759, 2759, 2759, 2769, ++ 3965, 3965, 2769, 2769, 3965, 3965, 2769, 3965, 2769, 3965, ++ 2769, 2769, 2769, 2769, 2592, 3965, 3965, 2592, 3965, 2592, ++ 3965, 2592, 2592, 2592, 2592, 2778, 3965, 2778, 3965, 2778, ++ 2778, 2778, 2778, 2594, 3965, 2594, 3965, 2594, 2594, 2594, ++ 2594, 2787, 2787, 3965, 2787, 2787, 3965, 2787, 2787, 2787, ++ 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2807, 3965, ++ 3965, 2807, 2807, 3965, 3965, 2807, 3965, 2807, 3965, 2807, ++ 2807, 2807, 2807, 2626, 2626, 3965, 2626, 2626, 3965, 2626, ++ ++ 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, ++ 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, ++ 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2074, 2074, 2074, 2074, + 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, +- 2074, 2074, 2691, 3952, 2691, 2691, 3952, 3952, 2691, 2691, +- 2691, 2691, 2691, 2691, 2691, 2691, 2691, 2691, 2691, 2691, +- 2296, 3952, 2296, 2296, 3952, 3952, 2296, 2296, 2296, 2296, +- 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2868, 2868, +- 2868, 2868, 2868, 2868, 2868, 2868, 2868, 2868, 2868, 2868, +- 2868, 2868, 2868, 2868, 2868, 2868, 2501, 2501, 2501, 2501, +- +- 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2501, 2501, 2501, 2501, 2869, 2869, 2869, 2869, 2869, 2869, +- 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, +- 2869, 2869, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- 2298, 3952, 2298, 2298, 3952, 3952, 2298, 2298, 2298, 2298, +- 2298, 2298, 2298, 2298, 2298, 2298, 2298, 2298, 2882, 2882, +- 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, +- 2882, 2882, 2882, 2882, 2882, 2882, 2504, 2504, 2504, 2504, ++ 2074, 2074, 2074, 2074, 2694, 3965, 2694, 2694, 3965, 3965, ++ 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, ++ 2694, 2694, 2297, 3965, 2297, 2297, 3965, 3965, 2297, 2297, ++ 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, ++ ++ 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, ++ 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2873, 2873, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2504, 2504, 2504, 2504, 2504, 2504, + 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, +- +- 2504, 2504, 2504, 2504, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2706, 3952, 2706, 2706, 3952, 3952, 2706, 2706, +- 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2089, 2089, ++ 2504, 2504, 2299, 3965, 2299, 2299, 3965, 3965, 2299, 2299, ++ 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, ++ 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, ++ ++ 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2709, 3965, 2709, 2709, 3965, 3965, ++ 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, ++ 2709, 2709, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, + 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, +- 2089, 2089, 2089, 2089, 2089, 2089, 2755, 3952, 3952, 2755, +- 3952, 2755, 3952, 2755, 2755, 2755, 2755, 2756, 3952, 2756, +- 3952, 2756, 2756, 2756, 2756, 2942, 3952, 2942, 3952, 2942, +- +- 2942, 2942, 2942, 2766, 3952, 2766, 3952, 2766, 2766, 2766, +- 2766, 2775, 3952, 3952, 2775, 3952, 2775, 3952, 2775, 2775, +- 2775, 2775, 2784, 2784, 3952, 2784, 2784, 3952, 2784, 2784, +- 2784, 2784, 2784, 2784, 2784, 2784, 2784, 2784, 2784, 2972, +- 3952, 3952, 2972, 2972, 3952, 3952, 2972, 3952, 2972, 3952, +- 2972, 2972, 2972, 2972, 2981, 3952, 2981, 3952, 2981, 2981, +- 2981, 2981, 2804, 3952, 2804, 3952, 2804, 2804, 2804, 2804, +- 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, +- 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2283, 2283, +- 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, +- +- 2283, 2283, 2283, 2283, 2283, 2283, 2869, 2869, 2869, 2869, +- 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, +- 2869, 2869, 2869, 2869, 2871, 2871, 2871, 2871, 2871, 2871, +- 2871, 2871, 2871, 2871, 2871, 2871, 2871, 2871, 2871, 2871, +- 2871, 2871, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2298, 3952, +- 2298, 2298, 3952, 3952, 2298, 2298, 2298, 2298, 2298, 2298, +- 2298, 2298, 2298, 2298, 2298, 2298, 2882, 2882, 2882, 2882, +- +- 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, +- 2882, 2882, 2882, 2882, 2504, 2504, 2504, 2504, 2504, 2504, ++ 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2758, 3965, ++ ++ 3965, 2758, 3965, 2758, 3965, 2758, 2758, 2758, 2758, 2759, ++ 3965, 2759, 3965, 2759, 2759, 2759, 2759, 2946, 3965, 2946, ++ 3965, 2946, 2946, 2946, 2946, 2769, 3965, 2769, 3965, 2769, ++ 2769, 2769, 2769, 2778, 3965, 3965, 2778, 3965, 2778, 3965, ++ 2778, 2778, 2778, 2778, 2787, 2787, 3965, 2787, 2787, 3965, ++ 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, ++ 2787, 2976, 3965, 3965, 2976, 2976, 3965, 3965, 2976, 3965, ++ 2976, 3965, 2976, 2976, 2976, 2976, 2985, 3965, 2985, 3965, ++ 2985, 2985, 2985, 2985, 2807, 3965, 2807, 3965, 2807, 2807, ++ 2807, 2807, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, ++ ++ 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2873, 2873, 2875, 2875, 2875, 2875, ++ 2875, 2875, 2875, 2875, 2875, 2875, 2875, 2875, 2875, 2875, ++ 2875, 2875, 2875, 2875, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, + 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, +- 2504, 2504, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 3112, 3112, +- 3952, 3112, 3112, 3952, 3112, 3112, 3112, 3112, 3112, 3112, +- 3112, 3112, 3112, 3112, 3112, 3115, 3952, 3952, 3115, 3115, +- 3952, 3952, 3115, 3952, 3115, 3952, 3115, 3115, 3115, 3115, +- +- 3118, 3118, 3118, 3118, 3952, 3118, 3118, 3118, 3118, 3118, +- 3118, 3118, 3118, 3118, 3118, 3118, 3118, 3118, 3133, 3952, +- 3952, 3952, 3952, 3952, 3133, 3133, 3133, 3952, 3133, 3133, +- 3133, 3133, 3133, 3133, 3133, 3133, 3209, 3209, 3209, 3209, +- 3209, 3209, 3209, 3209, 3209, 3209, 3209, 3209, 3209, 3209, +- 3209, 3209, 3209, 3209, 3252, 3952, 3252, 3952, 3252, 3252, +- 3252, 3252, 3274, 3274, 3952, 3274, 3274, 3952, 3274, 3274, +- 3274, 3274, 3274, 3274, 3274, 3274, 3274, 3274, 3274, 3356, +- 3952, 3952, 3356, 3356, 3952, 3952, 3952, 3952, 3952, 3952, +- 3356, 3372, 3372, 3952, 3952, 3952, 3372, 3372, 3372, 3372, +- +- 3372, 3372, 3372, 3372, 3372, 3372, 3372, 3372, 3372, 3478, +- 3478, 3952, 3478, 3478, 3952, 3478, 3478, 3478, 3478, 3478, +- 3478, 3478, 3478, 3478, 3478, 3478, 3488, 3488, 3952, 3488, +- 3488, 3952, 3488, 3488, 3488, 3488, 3488, 3488, 3488, 3488, +- 3488, 3488, 3488, 3563, 3563, 3952, 3563, 3563, 3563, 3563, +- 3563, 3563, 3563, 3563, 3563, 3563, 3563, 3563, 3563, 3563, +- 3566, 3566, 3952, 3566, 3566, 3566, 3566, 3566, 3566, 3566, +- 3566, 3566, 3566, 3566, 3566, 3566, 3566, 3610, 3952, 3610, +- 3952, 3610, 3952, 3610, 3610, 3610, 3610, 3641, 3641, 3952, +- 3641, 3641, 3952, 3641, 3641, 3641, 3641, 3641, 3641, 3641, +- +- 3641, 3641, 3641, 3641, 3642, 3642, 3952, 3642, 3642, 3952, +- 3642, 3642, 3642, 3642, 3642, 3642, 3642, 3642, 3642, 3642, +- 3642, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, +- 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3679, +- 3952, 3679, 3952, 3679, 3952, 3679, 3679, 3679, 3679, 3683, +- 3683, 3952, 3683, 3683, 3683, 3683, 3683, 3683, 3683, 3683, +- 3683, 3683, 3683, 3683, 3683, 3683, 3683, 3694, 3694, 3952, +- 3694, 3694, 3952, 3694, 3694, 3694, 3694, 3694, 3694, 3694, +- 3694, 3694, 3694, 3694, 3696, 3696, 3952, 3952, 3696, 3696, +- 3696, 3696, 3696, 3952, 3696, 3696, 3696, 3696, 3696, 3696, +- +- 3696, 3696, 3685, 3685, 3952, 3685, 3685, 3952, 3685, 3685, +- 3685, 3685, 3685, 3685, 3685, 3685, 3685, 3685, 3685, 3745, +- 3952, 3952, 3952, 3952, 3952, 3745, 3745, 3745, 3952, 3745, +- 3745, 3745, 3745, 3745, 3745, 3745, 3745, 3687, 3952, 3952, +- 3952, 3952, 3952, 3687, 3687, 3687, 3952, 3687, 3687, 3687, +- 3687, 3687, 3687, 3687, 3687, 3748, 3952, 3952, 3748, 3748, +- 3952, 3952, 3748, 3952, 3748, 3952, 3748, 3748, 3748, 3748, +- 3751, 3751, 3952, 3751, 3751, 3952, 3751, 3751, 3751, 3751, +- 3751, 3751, 3751, 3751, 3751, 3751, 3751, 3752, 3952, 3952, +- 3952, 3952, 3952, 3752, 3752, 3752, 3952, 3752, 3752, 3752, +- +- 3752, 3752, 3752, 3752, 3752, 3789, 3952, 3789, 3952, 3789, +- 3789, 3789, 3789, 3790, 3790, 3952, 3790, 3790, 3952, 3790, +- 3790, 3790, 3790, 3790, 3790, 3790, 3790, 3790, 3790, 3790, +- 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, +- 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3837, 3837, +- 3952, 3837, 3837, 3952, 3837, 3837, 3837, 3837, 3837, 3837, +- 3837, 3837, 3837, 3837, 3837, 3840, 3840, 3952, 3952, 3840, +- 3840, 3840, 3840, 3840, 3952, 3840, 3840, 3840, 3840, 3840, +- 3840, 3840, 3840, 3842, 3842, 3952, 3952, 3842, 3842, 3842, +- 3842, 3842, 3952, 3842, 3842, 3842, 3842, 3842, 3842, 3842, +- +- 3842, 3870, 3870, 3952, 3870, 3870, 3952, 3870, 3870, 3870, +- 3870, 3870, 3870, 3870, 3870, 3870, 3870, 3870, 3871, 3871, +- 3952, 3871, 3871, 3952, 3871, 3871, 3871, 3871, 3871, 3871, +- 3871, 3871, 3871, 3871, 3871, 3872, 3872, 3952, 3952, 3872, +- 3872, 3872, 3872, 3872, 3952, 3872, 3872, 3872, 3872, 3872, +- 3872, 3872, 3872, 3874, 3874, 3952, 3952, 3874, 3874, 3874, +- 3874, 3874, 3952, 3874, 3874, 3874, 3874, 3874, 3874, 3874, +- 3874, 3888, 3952, 3888, 3952, 3888, 3952, 3888, 3888, 3888, +- 3888, 3890, 3890, 3952, 3890, 3890, 3890, 3890, 3890, 3890, +- 3890, 3890, 3890, 3890, 3890, 3890, 3890, 3890, 3901, 3901, +- +- 3952, 3901, 3901, 3952, 3901, 3901, 3901, 3901, 3901, 3901, +- 3901, 3901, 3901, 3901, 3901, 3902, 3902, 3952, 3902, 3902, +- 3952, 3902, 3902, 3902, 3902, 3902, 3902, 3902, 3902, 3902, +- 3902, 3902, 3914, 3952, 3914, 3952, 3914, 3952, 3914, 3914, +- 3914, 3914, 3915, 3952, 3952, 3952, 3952, 3952, 3915, 3915, +- 3915, 3952, 3915, 3915, 3915, 3915, 3915, 3915, 3915, 3915, +- 75, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952 ++ ++ 2299, 3965, 2299, 2299, 3965, 3965, 2299, 2299, 2299, 2299, ++ 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2886, 2886, ++ 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, ++ 2886, 2886, 2886, 2886, 2886, 2886, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 3117, 3117, 3965, 3117, 3117, 3965, 3117, 3117, 3117, 3117, ++ ++ 3117, 3117, 3117, 3117, 3117, 3117, 3117, 3120, 3965, 3965, ++ 3120, 3120, 3965, 3965, 3120, 3965, 3120, 3965, 3120, 3120, ++ 3120, 3120, 3123, 3123, 3123, 3123, 3965, 3123, 3123, 3123, ++ 3123, 3123, 3123, 3123, 3123, 3123, 3123, 3123, 3123, 3123, ++ 3138, 3965, 3965, 3965, 3965, 3965, 3138, 3138, 3138, 3965, ++ 3138, 3138, 3138, 3138, 3138, 3138, 3138, 3138, 3215, 3215, ++ 3215, 3215, 3215, 3215, 3215, 3215, 3215, 3215, 3215, 3215, ++ 3215, 3215, 3215, 3215, 3215, 3215, 3258, 3965, 3258, 3965, ++ 3258, 3258, 3258, 3258, 3280, 3280, 3965, 3280, 3280, 3965, ++ 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, ++ ++ 3280, 3363, 3965, 3965, 3363, 3363, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3363, 3379, 3379, 3965, 3965, 3965, 3379, 3379, ++ 3379, 3379, 3379, 3379, 3379, 3379, 3379, 3379, 3379, 3379, ++ 3379, 3486, 3486, 3965, 3486, 3486, 3965, 3486, 3486, 3486, ++ 3486, 3486, 3486, 3486, 3486, 3486, 3486, 3486, 3496, 3496, ++ 3965, 3496, 3496, 3965, 3496, 3496, 3496, 3496, 3496, 3496, ++ 3496, 3496, 3496, 3496, 3496, 3572, 3572, 3965, 3572, 3572, ++ 3572, 3572, 3572, 3572, 3572, 3572, 3572, 3572, 3572, 3572, ++ 3572, 3572, 3575, 3575, 3965, 3575, 3575, 3575, 3575, 3575, ++ 3575, 3575, 3575, 3575, 3575, 3575, 3575, 3575, 3575, 3620, ++ ++ 3965, 3620, 3965, 3620, 3965, 3620, 3620, 3620, 3620, 3651, ++ 3651, 3965, 3651, 3651, 3965, 3651, 3651, 3651, 3651, 3651, ++ 3651, 3651, 3651, 3651, 3651, 3651, 3652, 3652, 3965, 3652, ++ 3652, 3965, 3652, 3652, 3652, 3652, 3652, 3652, 3652, 3652, ++ 3652, 3652, 3652, 3655, 3655, 3655, 3655, 3655, 3655, 3655, ++ 3655, 3655, 3655, 3655, 3655, 3655, 3655, 3655, 3655, 3655, ++ 3655, 3690, 3965, 3690, 3965, 3690, 3965, 3690, 3690, 3690, ++ 3690, 3694, 3694, 3965, 3694, 3694, 3694, 3694, 3694, 3694, ++ 3694, 3694, 3694, 3694, 3694, 3694, 3694, 3694, 3694, 3705, ++ 3705, 3965, 3705, 3705, 3965, 3705, 3705, 3705, 3705, 3705, ++ ++ 3705, 3705, 3705, 3705, 3705, 3705, 3707, 3707, 3965, 3965, ++ 3707, 3707, 3707, 3707, 3707, 3965, 3707, 3707, 3707, 3707, ++ 3707, 3707, 3707, 3707, 3696, 3696, 3965, 3696, 3696, 3965, ++ 3696, 3696, 3696, 3696, 3696, 3696, 3696, 3696, 3696, 3696, ++ 3696, 3757, 3965, 3965, 3965, 3965, 3965, 3757, 3757, 3757, ++ 3965, 3757, 3757, 3757, 3757, 3757, 3757, 3757, 3757, 3698, ++ 3965, 3965, 3965, 3965, 3965, 3698, 3698, 3698, 3965, 3698, ++ 3698, 3698, 3698, 3698, 3698, 3698, 3698, 3760, 3965, 3965, ++ 3760, 3760, 3965, 3965, 3760, 3965, 3760, 3965, 3760, 3760, ++ 3760, 3760, 3763, 3763, 3965, 3763, 3763, 3965, 3763, 3763, ++ ++ 3763, 3763, 3763, 3763, 3763, 3763, 3763, 3763, 3763, 3764, ++ 3965, 3965, 3965, 3965, 3965, 3764, 3764, 3764, 3965, 3764, ++ 3764, 3764, 3764, 3764, 3764, 3764, 3764, 3802, 3965, 3802, ++ 3965, 3802, 3802, 3802, 3802, 3803, 3803, 3965, 3803, 3803, ++ 3965, 3803, 3803, 3803, 3803, 3803, 3803, 3803, 3803, 3803, ++ 3803, 3803, 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, ++ 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, ++ 3850, 3850, 3965, 3850, 3850, 3965, 3850, 3850, 3850, 3850, ++ 3850, 3850, 3850, 3850, 3850, 3850, 3850, 3853, 3853, 3965, ++ 3965, 3853, 3853, 3853, 3853, 3853, 3965, 3853, 3853, 3853, ++ ++ 3853, 3853, 3853, 3853, 3853, 3855, 3855, 3965, 3965, 3855, ++ 3855, 3855, 3855, 3855, 3965, 3855, 3855, 3855, 3855, 3855, ++ 3855, 3855, 3855, 3883, 3883, 3965, 3883, 3883, 3965, 3883, ++ 3883, 3883, 3883, 3883, 3883, 3883, 3883, 3883, 3883, 3883, ++ 3884, 3884, 3965, 3884, 3884, 3965, 3884, 3884, 3884, 3884, ++ 3884, 3884, 3884, 3884, 3884, 3884, 3884, 3885, 3885, 3965, ++ 3965, 3885, 3885, 3885, 3885, 3885, 3965, 3885, 3885, 3885, ++ 3885, 3885, 3885, 3885, 3885, 3887, 3887, 3965, 3965, 3887, ++ 3887, 3887, 3887, 3887, 3965, 3887, 3887, 3887, 3887, 3887, ++ 3887, 3887, 3887, 3901, 3965, 3901, 3965, 3901, 3965, 3901, ++ ++ 3901, 3901, 3901, 3903, 3903, 3965, 3903, 3903, 3903, 3903, ++ 3903, 3903, 3903, 3903, 3903, 3903, 3903, 3903, 3903, 3903, ++ 3914, 3914, 3965, 3914, 3914, 3965, 3914, 3914, 3914, 3914, ++ 3914, 3914, 3914, 3914, 3914, 3914, 3914, 3915, 3915, 3965, ++ 3915, 3915, 3965, 3915, 3915, 3915, 3915, 3915, 3915, 3915, ++ 3915, 3915, 3915, 3915, 3927, 3965, 3927, 3965, 3927, 3965, ++ 3927, 3927, 3927, 3927, 3928, 3965, 3965, 3965, 3965, 3965, ++ 3928, 3928, 3928, 3965, 3928, 3928, 3928, 3928, 3928, 3928, ++ 3928, 3928, 75, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965 + } ; + +-static const flex_int16_t yy_chk[14349] = ++static const flex_int16_t yy_chk[14371] = + { 0, + 0, 1, 1, 1, 1, 5, 1, 1, 5, 6, + 95, 95, 6, 0, 1, 7, 7, 7, 7, 7, + 7, 0, 9, 9, 7, 9, 9, 13, 7, 1191, +- 1, 13, 1, 1, 3928, 83, 13, 1, 1, 1, +- 116, 116, 14, 1, 1, 1, 14, 1, 1, 3915, ++ 1, 13, 1, 1, 3941, 83, 13, 1, 1, 1, ++ 116, 116, 14, 1, 1, 1, 14, 1, 1, 3928, + 9, 14, 1, 874, 15, 15, 1, 15, 1, 874, + 1, 1, 15, 83, 15, 1, 1, 1, 71, 84, + 7, 1, 1, 1, 1191, 1, 1, 9, 132, 132, +@@ -3462,10 +3467,10 @@ static const flex_int16_t yy_chk[14349] = + 72, 10, 10, 85, 2, 21, 21, 84, 21, 7, + + 7, 86, 11, 11, 49, 11, 11, 72, 49, 15, +- 2, 49, 2, 2, 87, 3902, 10, 2, 2, 2, ++ 2, 49, 2, 2, 87, 3915, 10, 2, 2, 2, + 88, 85, 774, 2, 2, 2, 89, 2, 2, 86, + 11, 92, 2, 250, 118, 250, 2, 118, 2, 774, +- 2, 2, 87, 10, 3901, 2, 2, 2, 88, 3890, ++ 2, 2, 87, 10, 3914, 2, 2, 2, 88, 3903, + 21, 2, 2, 2, 89, 2, 2, 11, 49, 92, + 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, +@@ -3478,8 +3483,8 @@ static const flex_int16_t yy_chk[14349] = + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 8, 8, + 8, 8, 8, 8, 93, 12, 12, 8, 12, 12, +- 3871, 8, 16, 16, 2296, 16, 17, 17, 3870, 17, +- 16, 17, 16, 47, 17, 47, 18, 18, 2296, 18, ++ 3884, 8, 16, 16, 2297, 16, 17, 17, 3883, 17, ++ 16, 17, 16, 47, 17, 47, 18, 18, 2297, 18, + 47, 18, 93, 12, 18, 19, 19, 137, 19, 137, + 19, 20, 20, 19, 20, 257, 20, 257, 19, 20, + +@@ -3487,12 +3492,12 @@ static const flex_int16_t yy_chk[14349] = + 12, 220, 81, 297, 90, 33, 33, 16, 33, 100, + 33, 17, 90, 33, 297, 27, 27, 47, 27, 94, + 27, 18, 8, 8, 137, 27, 35, 35, 27, 35, +- 19, 27, 90, 3860, 35, 91, 20, 100, 28, 28, ++ 19, 27, 90, 3873, 35, 91, 20, 100, 28, 28, + 90, 28, 27, 28, 48, 101, 81, 139, 28, 139, + 22, 28, 91, 388, 28, 220, 29, 29, 104, 29, +- 33, 29, 3829, 91, 29, 28, 29, 107, 143, 29, +- 27, 143, 29, 101, 30, 30, 3827, 30, 108, 30, +- 91, 35, 30, 29, 30, 3823, 104, 30, 36, 36, ++ 33, 29, 3842, 91, 29, 28, 29, 107, 143, 29, ++ 27, 143, 29, 101, 30, 30, 3840, 30, 108, 30, ++ 91, 35, 30, 29, 30, 3836, 104, 30, 36, 36, + + 30, 36, 388, 28, 139, 107, 36, 213, 213, 27, + 27, 30, 223, 223, 31, 31, 108, 31, 109, 31, +@@ -3502,10 +3507,10 @@ static const flex_int16_t yy_chk[14349] = + 34, 32, 34, 36, 34, 114, 65, 34, 39, 39, + 39, 39, 32, 39, 115, 40, 40, 40, 40, 31, + 40, 39, 105, 140, 105, 45, 196, 219, 40, 196, +- 219, 46, 219, 114, 65, 195, 195, 195, 195, 3822, +- 32, 225, 115, 3815, 225, 226, 226, 265, 265, 97, ++ 219, 46, 219, 114, 65, 195, 195, 195, 195, 3835, ++ 32, 225, 115, 3828, 225, 226, 226, 265, 265, 97, + +- 105, 140, 105, 3792, 34, 37, 37, 37, 37, 37, ++ 105, 140, 105, 3805, 34, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, +@@ -3516,49 +3521,49 @@ static const flex_int16_t yy_chk[14349] = + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 41, 41, 41, 41, 147, 41, 42, 42, + +- 42, 42, 153, 42, 43, 43, 43, 43, 3789, 43, ++ 42, 42, 153, 42, 43, 43, 43, 43, 3802, 43, + 44, 44, 44, 44, 50, 44, 102, 66, 50, 59, + 66, 50, 286, 286, 147, 66, 73, 60, 102, 73, + 153, 73, 129, 74, 73, 129, 74, 283, 74, 66, + 283, 74, 315, 318, 102, 315, 318, 41, 73, 185, + 59, 67, 59, 42, 185, 74, 102, 173, 60, 43, +- 60, 59, 59, 59, 59, 44, 2703, 66, 50, 60, ++ 60, 59, 59, 59, 59, 44, 2706, 66, 50, 60, + 60, 60, 60, 68, 77, 77, 73, 77, 59, 348, + 59, 183, 67, 74, 67, 173, 60, 129, 60, 59, + 59, 59, 59, 67, 67, 67, 67, 60, 60, 60, + +- 60, 185, 99, 484, 68, 99, 68, 103, 2703, 183, ++ 60, 185, 99, 484, 68, 99, 68, 103, 2706, 183, + 67, 106, 67, 111, 103, 68, 68, 68, 68, 189, +- 110, 67, 67, 67, 67, 106, 348, 3780, 111, 77, ++ 110, 67, 67, 67, 67, 106, 348, 3793, 111, 77, + 99, 106, 68, 99, 68, 103, 110, 112, 177, 106, +- 177, 111, 103, 68, 68, 68, 68, 189, 110, 3752, ++ 177, 111, 103, 68, 68, 68, 68, 189, 110, 3764, + 113, 309, 112, 106, 113, 113, 111, 484, 145, 106, +- 198, 145, 309, 2870, 110, 112, 119, 119, 119, 119, ++ 198, 145, 309, 2874, 110, 112, 119, 119, 119, 119, + 201, 119, 120, 120, 120, 120, 179, 120, 113, 179, + 112, 177, 113, 113, 121, 121, 121, 121, 198, 121, + 126, 126, 126, 126, 199, 126, 203, 133, 201, 138, + +- 133, 199, 138, 142, 142, 2870, 187, 138, 145, 138, ++ 133, 199, 138, 142, 142, 2874, 187, 138, 145, 138, + 142, 187, 142, 199, 133, 133, 148, 148, 436, 436, + 148, 119, 199, 148, 203, 133, 179, 120, 133, 199, +- 144, 156, 156, 144, 156, 144, 3745, 181, 144, 121, ++ 144, 156, 156, 144, 156, 144, 3757, 181, 144, 121, + 181, 199, 133, 133, 205, 126, 131, 131, 131, 131, + 131, 131, 208, 131, 138, 211, 131, 142, 187, 405, + 131, 149, 131, 131, 149, 131, 131, 131, 188, 149, + 148, 188, 205, 642, 131, 131, 131, 131, 131, 131, +- 208, 131, 3716, 211, 131, 144, 156, 181, 131, 151, ++ 208, 131, 3727, 211, 131, 144, 156, 181, 131, 151, + 131, 131, 151, 131, 131, 131, 150, 151, 405, 150, + + 494, 150, 157, 157, 150, 157, 155, 155, 200, 150, + 155, 149, 642, 155, 159, 159, 159, 159, 155, 162, + 162, 200, 162, 188, 162, 166, 166, 212, 166, 346, +- 166, 346, 162, 877, 380, 3714, 200, 380, 166, 151, +- 169, 166, 3677, 169, 210, 169, 162, 210, 169, 200, +- 435, 150, 166, 435, 494, 212, 2883, 157, 167, 167, ++ 166, 346, 162, 877, 380, 3725, 200, 380, 166, 151, ++ 169, 166, 3688, 169, 210, 169, 162, 210, 169, 200, ++ 435, 150, 166, 435, 494, 212, 2887, 157, 167, 167, + 155, 167, 169, 167, 869, 168, 168, 230, 168, 159, + 168, 167, 877, 202, 162, 210, 346, 1393, 168, 186, + 166, 170, 186, 202, 170, 167, 170, 186, 206, 170, +- 169, 170, 168, 3672, 170, 230, 206, 171, 2883, 235, ++ 169, 170, 168, 3683, 170, 230, 206, 171, 2887, 235, + + 171, 202, 171, 162, 162, 171, 905, 359, 170, 166, + 166, 202, 224, 167, 414, 224, 206, 224, 174, 171, +@@ -3566,8 +3571,8 @@ static const flex_int16_t yy_chk[14349] = + 176, 243, 869, 176, 186, 176, 170, 498, 176, 2070, + 174, 2070, 167, 167, 178, 178, 521, 171, 178, 168, + 168, 178, 176, 178, 359, 180, 178, 521, 180, 243, +- 180, 414, 244, 180, 3646, 184, 184, 224, 174, 184, +- 178, 3642, 184, 905, 190, 190, 190, 486, 486, 197, ++ 180, 414, 244, 180, 3656, 184, 184, 224, 174, 184, ++ 178, 3652, 184, 905, 190, 190, 190, 486, 486, 197, + 176, 190, 192, 192, 192, 192, 204, 245, 197, 209, + 244, 498, 197, 209, 207, 192, 246, 197, 178, 209, + +@@ -3594,13 +3599,13 @@ static const flex_int16_t yy_chk[14349] = + 301, 302, 313, 314, 323, 327, 303, 323, 327, 323, + + 304, 305, 507, 307, 304, 325, 304, 308, 325, 310, +- 325, 306, 306, 328, 329, 311, 312, 330, 332, 3641, ++ 325, 306, 306, 328, 329, 311, 312, 330, 332, 3651, + 313, 314, 319, 319, 319, 319, 887, 319, 320, 320, + 320, 320, 335, 320, 321, 321, 321, 321, 333, 321, + 331, 328, 329, 331, 336, 330, 332, 335, 337, 507, + 327, 338, 333, 333, 334, 1117, 334, 339, 340, 341, + 335, 1117, 340, 342, 344, 337, 333, 442, 331, 345, +- 337, 331, 336, 345, 746, 335, 337, 319, 3600, 338, ++ 337, 331, 336, 345, 746, 335, 337, 319, 3610, 338, + 333, 333, 334, 320, 334, 339, 340, 341, 343, 321, + 340, 342, 344, 337, 887, 442, 349, 345, 337, 349, + +@@ -3609,49 +3614,49 @@ static const flex_int16_t yy_chk[14349] = + 353, 354, 356, 362, 360, 356, 362, 360, 746, 360, + 343, 343, 360, 361, 361, 363, 364, 514, 363, 364, + 361, 364, 365, 443, 364, 366, 365, 369, 366, 365, +- 2273, 349, 2273, 366, 372, 370, 351, 372, 370, 3045, ++ 2274, 349, 2274, 366, 372, 370, 351, 372, 370, 3050, + 370, 350, 355, 370, 441, 353, 354, 441, 370, 371, + 371, 443, 356, 362, 373, 374, 371, 373, 374, 360, + 374, 371, 373, 374, 514, 363, 375, 361, 374, 444, + 375, 364, 524, 375, 411, 366, 365, 411, 375, 376, + +- 376, 3045, 376, 524, 372, 377, 377, 445, 377, 398, ++ 376, 3050, 376, 524, 372, 377, 377, 445, 377, 398, + 370, 379, 379, 379, 379, 381, 381, 444, 381, 384, + 384, 446, 384, 371, 373, 1110, 382, 382, 398, 382, + 374, 382, 384, 395, 474, 445, 395, 474, 395, 382, + 375, 395, 386, 386, 411, 386, 384, 386, 447, 446, +- 2626, 416, 416, 382, 376, 386, 398, 2808, 416, 448, ++ 2628, 416, 416, 382, 376, 386, 398, 2811, 416, 448, + 377, 488, 387, 387, 488, 387, 379, 387, 483, 386, + 381, 483, 421, 483, 384, 387, 447, 421, 387, 389, + 389, 382, 389, 395, 389, 390, 390, 448, 390, 387, + 390, 391, 389, 1110, 391, 389, 391, 386, 390, 391, + +- 2626, 426, 426, 384, 384, 416, 389, 2808, 426, 428, ++ 2628, 426, 426, 384, 384, 416, 389, 2811, 426, 428, + 382, 382, 390, 391, 428, 394, 403, 387, 394, 403, +- 394, 403, 449, 394, 421, 396, 386, 386, 396, 2274, +- 396, 2274, 403, 396, 389, 396, 3584, 394, 396, 417, ++ 394, 403, 449, 394, 421, 396, 386, 386, 396, 2275, ++ 396, 2275, 403, 396, 389, 396, 3593, 394, 396, 417, + 390, 391, 417, 403, 397, 397, 387, 387, 397, 562, +- 449, 397, 396, 397, 399, 426, 397, 399, 3566, 399, ++ 449, 397, 396, 397, 399, 426, 397, 399, 3575, 399, + 562, 428, 399, 389, 389, 394, 427, 427, 427, 390, + 390, 403, 425, 427, 401, 425, 399, 401, 402, 401, + 396, 402, 401, 402, 401, 565, 402, 401, 402, 417, + 418, 402, 487, 418, 402, 487, 565, 487, 397, 403, + + 403, 401, 451, 420, 399, 402, 1322, 420, 404, 406, +- 420, 404, 406, 404, 406, 3563, 404, 406, 404, 406, ++ 420, 404, 406, 404, 406, 3572, 404, 406, 404, 406, + 427, 404, 406, 415, 404, 406, 415, 425, 415, 401, + 451, 415, 858, 402, 409, 404, 406, 409, 431, 409, + 418, 410, 409, 431, 409, 410, 419, 409, 410, 419, + 410, 419, 424, 410, 419, 424, 495, 420, 401, 495, + 424, 409, 402, 404, 406, 429, 1331, 410, 429, 430, +- 3535, 430, 454, 429, 1322, 455, 430, 456, 415, 858, ++ 3544, 430, 454, 429, 1322, 455, 430, 456, 415, 858, + 452, 432, 432, 432, 432, 438, 438, 438, 438, 409, + 431, 452, 404, 406, 432, 410, 450, 457, 450, 458, + + 454, 419, 450, 455, 459, 456, 460, 424, 452, 462, + 463, 462, 464, 465, 466, 459, 467, 468, 467, 452, + 429, 465, 464, 430, 450, 457, 450, 458, 469, 471, +- 450, 465, 459, 1331, 460, 3530, 432, 462, 463, 462, ++ 450, 465, 459, 1331, 460, 3539, 432, 462, 463, 462, + 464, 465, 466, 459, 467, 468, 467, 472, 489, 465, + 464, 489, 473, 489, 896, 500, 469, 471, 500, 465, + 470, 470, 493, 470, 900, 493, 470, 493, 470, 520, +@@ -3661,12 +3666,12 @@ static const flex_int16_t yy_chk[14349] = + + 470, 522, 470, 900, 470, 470, 470, 470, 480, 480, + 480, 480, 481, 481, 481, 481, 482, 482, 482, 482, +- 1326, 482, 485, 485, 485, 485, 2881, 485, 491, 491, ++ 1326, 482, 485, 485, 485, 485, 2885, 485, 491, 491, + 491, 491, 502, 491, 906, 502, 476, 492, 492, 492, +- 492, 499, 492, 2881, 499, 503, 499, 505, 503, 508, ++ 492, 499, 492, 2885, 499, 503, 499, 505, 503, 508, + 503, 510, 505, 523, 508, 511, 510, 515, 511, 516, + 515, 525, 516, 480, 589, 528, 531, 481, 528, 531, +- 3519, 482, 532, 528, 531, 589, 533, 485, 542, 533, ++ 3528, 482, 532, 528, 531, 589, 533, 485, 542, 533, + 543, 523, 538, 491, 533, 538, 544, 528, 1326, 525, + 538, 532, 492, 539, 557, 539, 499, 557, 533, 505, + +@@ -3675,11 +3680,11 @@ static const flex_int16_t yy_chk[14349] = + 535, 550, 535, 551, 552, 535, 533, 553, 540, 555, + 545, 540, 538, 540, 556, 559, 540, 560, 546, 535, + 539, 547, 558, 561, 563, 558, 548, 564, 566, 550, +- 540, 551, 552, 3058, 3509, 553, 567, 555, 1580, 3507, +- 568, 570, 556, 559, 571, 560, 590, 535, 3488, 590, +- 591, 561, 563, 591, 3442, 564, 566, 572, 540, 554, ++ 540, 551, 552, 3063, 3518, 553, 567, 555, 1580, 3516, ++ 568, 570, 556, 559, 571, 560, 590, 535, 3496, 590, ++ 591, 561, 563, 591, 3450, 564, 566, 572, 540, 554, + 573, 554, 554, 574, 567, 554, 554, 554, 568, 570, +- 575, 554, 571, 576, 554, 3058, 554, 554, 554, 554, ++ 575, 554, 571, 576, 554, 3063, 554, 554, 554, 554, + + 579, 554, 554, 580, 577, 572, 581, 554, 573, 554, + 554, 574, 582, 554, 554, 554, 578, 578, 575, 554, +@@ -3690,13 +3695,13 @@ static const flex_int16_t yy_chk[14349] = + 613, 585, 614, 586, 587, 588, 593, 594, 615, 595, + 596, 598, 616, 617, 599, 600, 618, 602, 603, 619, + 606, 607, 608, 588, 609, 610, 611, 612, 613, 620, +- 614, 620, 640, 3435, 626, 623, 615, 626, 623, 637, ++ 614, 620, 640, 3443, 626, 623, 615, 626, 623, 637, + + 616, 617, 637, 623, 618, 623, 624, 619, 638, 624, +- 629, 638, 3403, 629, 624, 629, 624, 630, 629, 3339, +- 630, 632, 630, 655, 632, 630, 3321, 635, 645, 632, +- 635, 640, 635, 3305, 636, 635, 620, 636, 645, 636, +- 635, 645, 636, 653, 626, 3299, 653, 636, 653, 3297, ++ 629, 638, 3410, 629, 624, 629, 624, 630, 629, 3346, ++ 630, 632, 630, 655, 632, 630, 3328, 635, 645, 632, ++ 635, 640, 635, 3312, 636, 635, 620, 636, 645, 636, ++ 635, 645, 636, 653, 626, 3305, 653, 636, 653, 3303, + 623, 639, 639, 674, 639, 734, 639, 824, 734, 653, + 640, 624, 655, 662, 639, 629, 669, 639, 824, 669, + 653, 632, 630, 662, 641, 641, 662, 641, 639, 641, +@@ -3708,21 +3713,21 @@ static const flex_int16_t yy_chk[14349] = + 649, 687, 688, 690, 1321, 691, 653, 653, 682, 641, + 679, 683, 675, 679, 649, 639, 639, 692, 643, 684, + 736, 663, 685, 736, 662, 738, 686, 647, 738, 687, +- 688, 690, 672, 691, 2276, 672, 2276, 672, 641, 641, ++ 688, 690, 672, 691, 2277, 672, 2277, 672, 641, 641, + 672, 741, 649, 1321, 741, 692, 673, 643, 643, 673, +- 652, 673, 3291, 652, 673, 652, 647, 647, 652, 654, ++ 652, 673, 3297, 652, 673, 652, 647, 647, 652, 654, + 652, 693, 654, 652, 654, 679, 652, 654, 656, 654, + 694, 656, 654, 656, 695, 654, 656, 652, 656, 744, + + 657, 656, 744, 657, 656, 657, 654, 672, 657, 693, + 657, 861, 1329, 657, 664, 656, 657, 664, 694, 664, +- 3252, 673, 695, 658, 697, 652, 658, 657, 658, 3218, ++ 3258, 673, 695, 658, 697, 652, 658, 657, 658, 3224, + 664, 658, 659, 658, 654, 659, 658, 659, 698, 658, +- 659, 664, 659, 656, 3181, 659, 699, 701, 659, 702, ++ 659, 664, 659, 656, 3187, 659, 699, 701, 659, 702, + 658, 703, 697, 678, 652, 657, 678, 660, 861, 659, + 660, 678, 660, 654, 1332, 660, 698, 660, 680, 664, + 660, 680, 656, 660, 699, 701, 680, 702, 658, 703, +- 1329, 3168, 3163, 665, 660, 705, 665, 659, 665, 706, ++ 1329, 3174, 3168, 665, 660, 705, 665, 659, 665, 706, + 707, 665, 666, 665, 1395, 666, 665, 666, 664, 665, + + 666, 667, 666, 1332, 667, 666, 667, 658, 678, 667, +@@ -3733,19 +3738,19 @@ static const flex_int16_t yy_chk[14349] = + 724, 721, 711, 713, 715, 716, 667, 714, 714, 725, + 714, 714, 726, 719, 727, 719, 721, 665, 717, 719, + 718, 723, 714, 720, 722, 728, 729, 733, 724, 721, +- 748, 723, 3133, 748, 728, 714, 714, 725, 714, 714, ++ 748, 723, 3138, 748, 728, 714, 714, 725, 714, 714, + 726, 719, 727, 719, 721, 754, 730, 719, 730, 723, + + 730, 755, 1945, 728, 729, 733, 755, 752, 737, 723, +- 752, 737, 728, 737, 739, 740, 3118, 739, 740, 739, ++ 752, 737, 728, 737, 739, 740, 3123, 739, 740, 739, + 740, 762, 742, 754, 730, 742, 730, 742, 730, 745, + 747, 763, 745, 747, 745, 747, 749, 751, 764, 749, + 751, 749, 751, 753, 759, 765, 753, 759, 753, 762, + 775, 776, 767, 755, 777, 767, 1945, 778, 779, 763, + 767, 781, 771, 782, 783, 771, 764, 771, 784, 785, +- 771, 3072, 786, 765, 767, 2480, 791, 2480, 775, 776, ++ 771, 3077, 786, 765, 767, 2482, 791, 2482, 775, 776, + 792, 787, 777, 793, 771, 778, 779, 786, 787, 781, +- 786, 782, 783, 3070, 759, 787, 784, 785, 790, 788, ++ 786, 782, 783, 3075, 759, 787, 784, 785, 790, 788, + + 786, 796, 767, 788, 791, 789, 794, 788, 792, 787, + 795, 793, 771, 798, 799, 786, 787, 790, 786, 789, +@@ -3754,7 +3759,7 @@ static const flex_int16_t yy_chk[14349] = + 810, 798, 799, 803, 811, 790, 812, 789, 800, 789, + 794, 813, 805, 795, 814, 815, 797, 816, 797, 818, + 819, 820, 821, 822, 823, 807, 825, 826, 810, 827, +- 829, 830, 811, 803, 812, 832, 3068, 833, 835, 813, ++ 829, 830, 811, 803, 812, 832, 3073, 833, 835, 813, + 836, 835, 814, 815, 837, 816, 838, 818, 819, 820, + 821, 822, 823, 831, 825, 826, 839, 827, 829, 830, + +@@ -3766,34 +3771,34 @@ static const flex_int16_t yy_chk[14349] = + 855, 856, 860, 857, 862, 860, 863, 862, 871, 863, + 860, 863, 860, 865, 863, 867, 865, 866, 867, 871, + 866, 875, 866, 909, 864, 866, 868, 868, 859, 868, +- 866, 868, 875, 3064, 889, 915, 868, 912, 915, 868, +- 889, 3203, 868, 873, 873, 883, 873, 882, 873, 916, ++ 866, 868, 875, 3069, 889, 915, 868, 912, 915, 868, ++ 889, 3209, 868, 873, 873, 883, 873, 882, 873, 916, + +- 882, 3055, 882, 868, 862, 882, 873, 860, 3203, 873, ++ 882, 3060, 882, 868, 862, 882, 873, 860, 3209, 873, + 870, 863, 913, 865, 883, 910, 884, 913, 910, 884, + 873, 884, 866, 1005, 884, 885, 884, 916, 885, 884, +- 885, 868, 884, 885, 1005, 885, 890, 871, 885, 3047, +- 915, 885, 883, 884, 890, 3210, 886, 882, 873, 886, ++ 885, 868, 884, 885, 1005, 885, 890, 871, 885, 3052, ++ 915, 885, 883, 884, 890, 3216, 886, 882, 873, 886, + 979, 886, 885, 979, 886, 890, 886, 1270, 889, 886, + 868, 868, 886, 917, 913, 910, 998, 914, 1270, 892, + 914, 884, 892, 886, 892, 914, 888, 873, 873, 888, +- 885, 888, 1524, 890, 888, 892, 888, 3210, 918, 888, ++ 885, 888, 1524, 890, 888, 892, 888, 3216, 918, 888, + 894, 917, 888, 894, 893, 894, 892, 893, 919, 893, + + 884, 886, 893, 888, 893, 920, 894, 893, 921, 885, +- 893, 980, 890, 998, 980, 911, 918, 894, 911, 3038, +- 911, 893, 914, 911, 892, 3028, 919, 1524, 922, 982, +- 886, 888, 982, 920, 895, 2987, 921, 895, 897, 895, +- 2810, 897, 895, 897, 895, 894, 897, 895, 897, 893, +- 895, 897, 899, 892, 897, 899, 922, 899, 2985, 898, ++ 893, 980, 890, 998, 980, 911, 918, 894, 911, 3043, ++ 911, 893, 914, 911, 892, 3033, 919, 1524, 922, 982, ++ 886, 888, 982, 920, 895, 2991, 921, 895, 897, 895, ++ 2813, 897, 895, 897, 895, 894, 897, 895, 897, 893, ++ 895, 897, 899, 892, 897, 899, 922, 899, 2989, 898, + 899, 895, 898, 901, 898, 897, 901, 898, 901, 898, + 911, 901, 898, 894, 899, 898, 981, 983, 893, 981, + 983, 981, 925, 926, 929, 901, 898, 932, 933, 895, +- 2810, 907, 923, 897, 907, 908, 907, 923, 908, 907, ++ 2813, 907, 923, 897, 907, 908, 907, 923, 908, 907, + +- 908, 907, 899, 908, 907, 908, 2981, 907, 908, 923, ++ 908, 907, 899, 908, 907, 908, 2985, 907, 908, 923, + 925, 926, 929, 901, 898, 932, 933, 934, 907, 936, +- 923, 937, 908, 2942, 2904, 923, 930, 930, 930, 930, ++ 923, 937, 908, 2946, 2908, 923, 930, 930, 930, 930, + 930, 930, 930, 930, 930, 938, 940, 923, 941, 942, + 943, 944, 945, 947, 948, 934, 907, 936, 949, 937, + 908, 931, 931, 931, 931, 931, 931, 931, 931, 931, +@@ -3803,30 +3808,30 @@ static const flex_int16_t yy_chk[14349] = + 952, 967, 968, 953, 969, 967, 970, 969, 971, 972, + + 973, 955, 974, 975, 978, 954, 956, 957, 958, 959, +- 960, 961, 962, 963, 964, 965, 2893, 2892, 985, 967, ++ 960, 961, 962, 963, 964, 965, 2897, 2896, 985, 967, + 968, 985, 969, 967, 970, 969, 971, 972, 973, 1000, +- 974, 975, 978, 984, 986, 2876, 984, 986, 984, 986, +- 987, 988, 2875, 987, 988, 987, 989, 991, 2866, 989, ++ 974, 975, 978, 984, 986, 2880, 984, 986, 984, 986, ++ 987, 988, 2879, 987, 988, 987, 989, 991, 2870, 989, + 991, 989, 992, 993, 1002, 992, 993, 992, 994, 995, + 1003, 994, 995, 994, 996, 997, 999, 996, 997, 996, + 1001, 999, 1004, 1001, 1007, 1006, 1000, 1009, 1006, 1013, + 1014, 1008, 1002, 1006, 1008, 1016, 1008, 1017, 1003, 1008, +- 2825, 1018, 1402, 1007, 1019, 1020, 1009, 2824, 1021, 1022, ++ 2835, 1018, 1402, 1007, 1019, 1020, 1009, 2828, 1021, 1022, + + 1004, 1023, 1024, 1402, 1025, 1026, 1028, 1013, 1014, 1027, +- 1027, 1027, 1027, 1016, 1030, 1017, 1031, 2986, 999, 1018, ++ 1027, 1027, 1027, 1016, 1030, 1017, 1031, 2990, 999, 1018, + 1001, 1007, 1019, 1020, 1009, 1006, 1021, 1022, 1032, 1023, + 1024, 1008, 1025, 1026, 1028, 1033, 1034, 1027, 1027, 1027, + 1027, 1029, 1030, 1035, 1031, 1029, 1036, 1037, 1038, 1039, + 1040, 1042, 1043, 1039, 1041, 1039, 1032, 1044, 1041, 1045, +- 1046, 1047, 1048, 1033, 1034, 1051, 1052, 2986, 1042, 1029, ++ 1046, 1047, 1048, 1033, 1034, 1051, 1052, 2990, 1042, 1029, + 1054, 1035, 1055, 1029, 1036, 1037, 1038, 1039, 1040, 1042, + 1043, 1039, 1041, 1039, 1056, 1044, 1041, 1045, 1046, 1047, + 1048, 1050, 1053, 1051, 1052, 1050, 1042, 1057, 1054, 1058, + +- 1055, 1059, 1050, 1053, 1050, 2815, 1060, 1061, 1062, 1064, +- 1065, 1066, 1056, 1067, 1068, 1070, 1071, 1072, 2809, 1050, +- 1074, 1075, 2775, 1050, 1077, 1057, 1078, 1058, 1079, 1059, ++ 1055, 1059, 1050, 1053, 1050, 2827, 1060, 1061, 1062, 1064, ++ 1065, 1066, 1056, 1067, 1068, 1070, 1071, 1072, 2818, 1050, ++ 1074, 1075, 2812, 1050, 1077, 1057, 1078, 1058, 1079, 1059, + 1050, 1080, 1050, 1053, 1060, 1061, 1062, 1064, 1065, 1066, + 1081, 1067, 1068, 1070, 1071, 1072, 1073, 1073, 1074, 1075, + 1073, 1082, 1077, 1083, 1078, 1073, 1079, 1084, 1085, 1080, +@@ -3835,24 +3840,24 @@ static const flex_int16_t yy_chk[14349] = + 1099, 1083, 1100, 1073, 1101, 1084, 1085, 1102, 1086, 1073, + 1087, 1088, 1089, 1073, 1091, 1073, 1115, 1092, 1093, 1094, + +- 1095, 1096, 1116, 2755, 1097, 1098, 1108, 1108, 1099, 1108, ++ 1095, 1096, 1116, 2778, 1097, 1098, 1108, 1108, 1099, 1108, + 1100, 1108, 1101, 1109, 1114, 1102, 1109, 1114, 1113, 1108, +- 2706, 1113, 1108, 1113, 2695, 1128, 1113, 1118, 1113, 1130, +- 1118, 1113, 1118, 1108, 1113, 1118, 3522, 1118, 3522, 1119, ++ 2758, 1113, 1108, 1113, 2709, 1128, 1113, 1118, 1113, 1130, ++ 1118, 1113, 1118, 1108, 1113, 1118, 3531, 1118, 3531, 1119, + 1118, 1116, 1119, 1118, 1119, 1113, 1132, 1119, 1120, 1119, + 1124, 1133, 1119, 1128, 1118, 1119, 1120, 1130, 1124, 1135, +- 2691, 1108, 1193, 1115, 1115, 1193, 1119, 1120, 1194, 1124, ++ 2698, 1108, 1193, 1115, 1115, 1193, 1119, 1120, 1194, 1124, + 1116, 1194, 1122, 1113, 1132, 1122, 1137, 1122, 1195, 1133, +- 2653, 1195, 1118, 1195, 1109, 1114, 1196, 1135, 1122, 1196, +- 1108, 1108, 2652, 1121, 1119, 1120, 1121, 1124, 1121, 1122, ++ 2694, 1195, 1118, 1195, 1109, 1114, 1196, 1135, 1122, 1196, ++ 1108, 1108, 2656, 1121, 1119, 1120, 1121, 1124, 1121, 1122, + + 1138, 1121, 1113, 1121, 1137, 1123, 1121, 1139, 1123, 1121, + 1123, 1118, 1140, 1123, 1125, 1123, 1141, 1125, 1123, 1125, + 1121, 1123, 1143, 1139, 1145, 1146, 1147, 1122, 1138, 1148, + 1125, 1149, 1123, 1153, 1155, 1139, 1156, 1159, 1160, 1161, +- 1140, 1125, 1162, 2628, 1141, 1163, 1164, 1165, 1121, 2590, +- 1143, 1139, 1145, 1146, 1147, 1197, 2563, 1148, 1197, 1149, +- 1123, 1153, 1155, 2560, 1156, 1159, 1160, 1161, 1167, 1125, ++ 1140, 1125, 1162, 2655, 1141, 1163, 1164, 1165, 1121, 2630, ++ 1143, 1139, 1145, 1146, 1147, 1197, 2592, 1148, 1197, 1149, ++ 1123, 1153, 1155, 2565, 1156, 1159, 1160, 1161, 1167, 1125, + 1162, 1144, 1168, 1163, 1164, 1165, 1169, 1121, 1144, 1144, + 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1166, 1166, 1166, + 1166, 1166, 1166, 1166, 1166, 1166, 1167, 1170, 1125, 1171, +@@ -3860,7 +3865,7 @@ static const flex_int16_t yy_chk[14349] = + 1168, 1172, 1173, 1175, 1169, 1174, 1174, 1176, 1177, 1178, + 1180, 1181, 1182, 1183, 1184, 1186, 1187, 1188, 1189, 1189, + 1199, 1198, 1205, 1199, 1198, 1170, 1198, 1171, 1209, 1172, +- 1173, 1175, 2551, 1174, 1174, 1176, 1177, 1178, 1180, 1181, ++ 1173, 1175, 2562, 1174, 1174, 1176, 1177, 1178, 1180, 1181, + 1182, 1183, 1184, 1186, 1187, 1188, 1189, 1189, 1200, 1201, + 1205, 1200, 1201, 1200, 1202, 1203, 1209, 1202, 1203, 1202, + 1204, 1210, 1211, 1204, 1218, 1219, 1220, 1222, 1223, 1225, +@@ -3871,7 +3876,7 @@ static const flex_int16_t yy_chk[14349] = + 1228, 1229, 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237, + 1238, 1233, 1239, 1240, 1241, 1242, 1243, 1245, 1246, 1244, + 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, +- 1257, 1258, 1259, 1261, 1262, 1263, 1264, 1265, 1266, 2549, ++ 1257, 1258, 1259, 1261, 1262, 1263, 1264, 1265, 1266, 2553, + 1269, 1271, 1272, 1255, 1273, 1245, 1246, 1275, 1247, 1248, + 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258, + 1259, 1261, 1262, 1263, 1264, 1265, 1266, 1268, 1269, 1271, +@@ -3883,19 +3888,19 @@ static const flex_int16_t yy_chk[14349] = + 1285, 1268, 1268, 1287, 1288, 1289, 1290, 1291, 1292, 1293, + 1295, 1297, 1290, 1304, 1298, 1299, 1300, 1301, 1302, 1305, + 1306, 1303, 1307, 1308, 1309, 1311, 1312, 1313, 1314, 1315, +- 1316, 1317, 1318, 1319, 1320, 1324, 1335, 2515, 1334, 1397, +- 1338, 1304, 1397, 1398, 2511, 2509, 1398, 1305, 1306, 1334, ++ 1316, 1317, 1318, 1319, 1320, 1324, 1335, 2551, 1334, 1397, ++ 1338, 1304, 1397, 1398, 2517, 2513, 1398, 1305, 1306, 1334, + 1307, 1308, 1309, 1311, 1312, 1313, 1314, 1315, 1316, 1317, + 1318, 1319, 1325, 1328, 1335, 1325, 1339, 1325, 1338, 1340, +- 1325, 1328, 1325, 1320, 1324, 1325, 1341, 3602, 1325, 3602, +- 1330, 2508, 1328, 1330, 1342, 1330, 2507, 1343, 1400, 1325, ++ 1325, 1328, 1325, 1320, 1324, 1325, 1341, 3612, 1325, 3612, ++ 1330, 2511, 1328, 1330, 1342, 1330, 2510, 1343, 1400, 1325, + +- 1336, 1400, 1336, 1344, 1339, 1345, 1330, 1340, 1348, 3604, +- 1350, 3604, 1320, 1324, 1341, 1334, 1333, 1330, 1351, 1333, ++ 1336, 1400, 1336, 1344, 1339, 1345, 1330, 1340, 1348, 3614, ++ 1350, 3614, 1320, 1324, 1341, 1334, 1333, 1330, 1351, 1333, + 1328, 1333, 1342, 1352, 1333, 1343, 1333, 1325, 1336, 1333, + 1336, 1344, 1333, 1345, 1347, 1353, 1348, 1347, 1350, 1347, + 1354, 1356, 1355, 1333, 1347, 1330, 1351, 1347, 1357, 1328, +- 2500, 1352, 1358, 1360, 1366, 1368, 1371, 1372, 1373, 1374, ++ 2509, 1352, 1358, 1360, 1366, 1368, 1371, 1372, 1373, 1374, + 1375, 1399, 1401, 1353, 1399, 1401, 1399, 1409, 1354, 1356, + 1409, 1333, 1355, 1376, 1330, 1377, 1357, 1378, 1355, 1379, + 1358, 1360, 1366, 1368, 1371, 1372, 1373, 1374, 1375, 1347, +@@ -3909,14 +3914,14 @@ static const flex_int16_t yy_chk[14349] = + 1411, 1412, 1413, 1414, 1415, 1420, 1416, 1417, 1423, 1418, + 1424, 1419, 1421, 1422, 1425, 1426, 1427, 1428, 1420, 1429, + 1430, 1431, 1432, 1420, 1433, 1434, 1430, 1435, 1430, 1436, +- 1437, 1430, 2488, 1420, 1439, 1440, 1423, 1441, 1424, 1442, ++ 1437, 1430, 2502, 1420, 1439, 1440, 1423, 1441, 1424, 1442, + 1443, 1444, 1425, 1426, 1427, 1428, 1420, 1429, 1430, 1431, + + 1432, 1420, 1433, 1434, 1430, 1435, 1430, 1436, 1437, 1430, + 1438, 1445, 1439, 1440, 1438, 1441, 1446, 1442, 1443, 1444, + 1447, 1438, 1448, 1438, 1438, 1449, 1438, 1450, 1451, 1452, + 1453, 1454, 1455, 1456, 1457, 1458, 1459, 1464, 1438, 1445, +- 1465, 1466, 1438, 1467, 1446, 1468, 2486, 1472, 1447, 1438, ++ 1465, 1466, 1438, 1467, 1446, 1468, 2490, 1472, 1447, 1438, + 1448, 1438, 1438, 1449, 1438, 1450, 1451, 1452, 1453, 1454, + 1455, 1456, 1457, 1458, 1459, 1464, 1473, 1469, 1465, 1466, + 1474, 1467, 1476, 1468, 1469, 1472, 1477, 1475, 1478, 1479, +@@ -3927,15 +3932,15 @@ static const flex_int16_t yy_chk[14349] = + 1469, 1474, 1482, 1474, 1483, 1469, 1495, 1484, 1485, 1486, + 1487, 1488, 1496, 1491, 1489, 1490, 1497, 1475, 1491, 1492, + 1498, 1493, 1499, 1494, 1500, 1501, 1502, 1503, 1505, 1506, +- 1507, 1508, 1509, 1505, 1495, 1512, 1513, 3673, 1514, 3673, ++ 1507, 1508, 1509, 1505, 1495, 1512, 1513, 3684, 1514, 3684, + 1496, 1491, 1515, 1503, 1497, 1517, 1491, 1518, 1498, 1519, + 1499, 1573, 1500, 1501, 1502, 1503, 1505, 1506, 1507, 1508, + 1510, 1505, 1511, 1512, 1513, 1511, 1514, 1511, 1510, 1520, +- 1515, 1503, 2485, 1517, 1521, 1518, 1522, 1519, 1511, 1510, ++ 1515, 1503, 2488, 1517, 1521, 1518, 1522, 1519, 1511, 1510, + 1523, 1526, 1527, 1523, 1526, 1523, 1526, 1530, 1531, 1511, + + 1523, 1526, 1532, 1523, 1526, 1576, 1573, 1520, 1576, 1509, +- 1509, 2484, 1521, 1535, 1522, 1533, 1536, 1510, 2479, 1533, ++ 1509, 2487, 1521, 1535, 1522, 1533, 1536, 1510, 2486, 1533, + 1527, 1533, 1538, 1539, 1541, 1530, 1531, 1511, 1547, 1548, + 1532, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, + 1551, 1535, 1552, 1533, 1536, 1523, 1526, 1533, 1553, 1533, +@@ -3961,8 +3966,8 @@ static const flex_int16_t yy_chk[14349] = + 1632, 1642, 1643, 1644, 1633, 1635, 1636, 1645, 1637, 1639, + 1640, 1646, 1641, 1647, 1648, 1650, 1651, 1652, 1653, 1654, + 1634, 1655, 1656, 1658, 1660, 1661, 1662, 1664, 1665, 1642, +- 1643, 1644, 1667, 1656, 1658, 1645, 1668, 1672, 3675, 1646, +- 3675, 1647, 1648, 1650, 1651, 1652, 1653, 1654, 2454, 1655, ++ 1643, 1644, 1667, 1656, 1658, 1645, 1668, 1672, 3686, 1646, ++ 3686, 1647, 1648, 1650, 1651, 1652, 1653, 1654, 2481, 1655, + 1656, 1673, 1660, 1661, 1662, 1664, 1665, 1674, 1675, 1677, + 1667, 1656, 1657, 1657, 1668, 1672, 1657, 1678, 1657, 1679, + 1680, 1681, 1657, 1657, 1682, 1683, 1657, 1684, 1685, 1673, +@@ -3972,15 +3977,15 @@ static const flex_int16_t yy_chk[14349] = + 1657, 1657, 1682, 1683, 1657, 1684, 1685, 1696, 1686, 1657, + 1687, 1688, 1689, 1693, 1697, 1694, 1690, 1691, 1694, 1698, + 1692, 1695, 1699, 1700, 1702, 1703, 1693, 1705, 1706, 1707, +- 1709, 1708, 1710, 1714, 1716, 1696, 3738, 1720, 3738, 1721, +- 1723, 1693, 1697, 1694, 1708, 3146, 1694, 1698, 1724, 1725, ++ 1709, 1708, 1710, 1714, 1716, 1696, 3750, 1720, 3750, 1721, ++ 1723, 1693, 1697, 1694, 1708, 3151, 1694, 1698, 1724, 1725, + 1699, 1726, 1702, 1703, 1693, 1705, 1706, 1707, 1709, 1708, +- 1710, 1712, 1716, 2443, 1712, 1720, 1712, 1721, 1723, 1729, +- 1733, 1712, 1708, 1722, 1712, 2433, 1724, 1725, 1714, 1726, ++ 1710, 1712, 1716, 2456, 1712, 1720, 1712, 1721, 1723, 1729, ++ 1733, 1712, 1708, 1722, 1712, 2444, 1724, 1725, 1714, 1726, + + 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1727, +- 1700, 1727, 1730, 2431, 2415, 3146, 1765, 1729, 1733, 1765, +- 2399, 1765, 1735, 1735, 1730, 1736, 1737, 1738, 1739, 1730, ++ 1700, 1727, 1730, 2434, 2432, 3151, 1765, 1729, 1733, 1765, ++ 2416, 1765, 1735, 1735, 1730, 1736, 1737, 1738, 1739, 1730, + 1740, 1741, 1742, 1743, 1745, 1746, 1712, 1727, 1757, 1727, + 1730, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, + 1735, 1735, 1730, 1736, 1737, 1738, 1739, 1730, 1740, 1741, +@@ -4004,12 +4009,12 @@ static const flex_int16_t yy_chk[14349] = + 1812, 1808, 1812, 1813, 1814, 1815, 1824, 1812, 1817, 1818, + 1829, 1821, 1831, 1833, 1822, 1834, 1823, 1835, 1825, 1826, + 1824, 1836, 1837, 1819, 1827, 1838, 1839, 1828, 1840, 1841, +- 1842, 1843, 1844, 1845, 1846, 1847, 1850, 3571, 1829, 1851, ++ 1842, 1843, 1844, 1845, 1846, 1847, 1850, 3580, 1829, 1851, + 1831, 1833, 1840, 1834, 1852, 1835, 1854, 1855, 1860, 1836, +- 1837, 2360, 1862, 1838, 1839, 1863, 1840, 1841, 1842, 1843, ++ 1837, 2400, 1862, 1838, 1839, 1863, 1840, 1841, 1842, 1843, + 1844, 1845, 1846, 1847, 1850, 1849, 1849, 1851, 1864, 1865, + 1840, 1849, 1852, 1867, 1854, 1855, 1860, 1868, 1869, 1849, +- 1862, 1870, 1849, 1863, 1871, 1872, 1875, 3571, 1878, 1886, ++ 1862, 1870, 1849, 1863, 1871, 1872, 1875, 3580, 1878, 1886, + + 1879, 1880, 1881, 1849, 1849, 1882, 1864, 1865, 1876, 1849, + 1876, 1867, 1883, 1884, 1876, 1868, 1869, 1849, 1887, 1870, +@@ -4017,14 +4022,14 @@ static const flex_int16_t yy_chk[14349] = + 1881, 1890, 1891, 1882, 1892, 1893, 1876, 1885, 1876, 1885, + 1883, 1884, 1876, 1885, 1886, 1889, 1887, 1894, 1895, 1888, + 1898, 1899, 1889, 1876, 1885, 1876, 1885, 1902, 1903, 1890, +- 1891, 1904, 1892, 1893, 1906, 1885, 1907, 1885, 2358, 1909, ++ 1891, 1904, 1892, 1893, 1906, 1885, 1907, 1885, 2361, 1909, + 1908, 1885, 1908, 1889, 2074, 1894, 1895, 1910, 1896, 1911, + 1889, 1896, 1885, 1896, 1885, 1913, 1903, 1914, 1896, 1904, + 1915, 1896, 1906, 1916, 1907, 1898, 1899, 1909, 1908, 1919, + +- 1908, 1920, 1902, 1922, 1923, 1910, 2345, 1911, 1924, 1925, +- 1926, 1927, 1928, 1913, 1968, 1914, 2302, 1968, 1915, 2074, +- 2300, 1916, 1929, 1930, 1931, 2087, 1932, 1919, 2087, 1920, ++ 1908, 1920, 1902, 1922, 1923, 1910, 2359, 1911, 1924, 1925, ++ 1926, 1927, 1928, 1913, 1968, 1914, 2346, 1968, 1915, 2074, ++ 2303, 1916, 1929, 1930, 1931, 2087, 1932, 1919, 2087, 1920, + 1930, 1922, 1923, 1896, 1917, 1933, 1924, 1925, 1926, 1927, + 1928, 1917, 1917, 1917, 1917, 1917, 1917, 1917, 1917, 1917, + 1929, 1930, 1931, 1917, 1932, 1917, 1917, 1917, 1930, 1934, +@@ -4036,7 +4041,7 @@ static const flex_int16_t yy_chk[14349] = + 1944, 1951, 1953, 1917, 1937, 1949, 1949, 1949, 1949, 1957, + 1954, 1958, 1959, 1960, 1955, 1961, 1962, 1963, 1964, 1956, + 1965, 1966, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1977, +- 1978, 1979, 1947, 1980, 2299, 1982, 1983, 1957, 1984, 1958, ++ 1978, 1979, 1947, 1980, 2301, 1982, 1983, 1957, 1984, 1958, + 1959, 1960, 1985, 1961, 1962, 1963, 1964, 1986, 1965, 1966, + 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1977, 1978, 1979, + 1949, 1980, 1981, 1982, 1983, 1981, 1984, 1981, 1987, 1988, +@@ -4046,988 +4051,990 @@ static const flex_int16_t yy_chk[14349] = + + 1990, 1991, 1992, 2007, 1993, 1994, 1995, 1996, 2013, 1998, + 1999, 2014, 2000, 2015, 2001, 2002, 2003, 2004, 2005, 2006, +- 2016, 2009, 2010, 2011, 2017, 2018, 2012, 2019, 2298, 2166, +- 2284, 2021, 2166, 2022, 2166, 2178, 2013, 2023, 2178, 2014, +- 2178, 2015, 2024, 2025, 2026, 2282, 2027, 2281, 2016, 2028, +- 2029, 2030, 2017, 2018, 2031, 2019, 2020, 2020, 2020, 2021, +- 2020, 2022, 2020, 2020, 2032, 2023, 2020, 2020, 2020, 2033, +- 2024, 2025, 2026, 2020, 2027, 2020, 2034, 2028, 2029, 2030, +- 2035, 2036, 2031, 2037, 2020, 2020, 2020, 2038, 2020, 2039, +- 2020, 2020, 2032, 2040, 2020, 2020, 2020, 2033, 2041, 2042, +- +- 2043, 2020, 2044, 2020, 2034, 2045, 2046, 2049, 2035, 2036, +- 2050, 2037, 2051, 2052, 2057, 2038, 2058, 2039, 2059, 2060, +- 2061, 2040, 2062, 2063, 2064, 2068, 2041, 2042, 2043, 2065, +- 2044, 2065, 2069, 2045, 2046, 2049, 2072, 2073, 2050, 2073, +- 2051, 2052, 2057, 2075, 2058, 2076, 2059, 2060, 2061, 2077, +- 2062, 2063, 2064, 2068, 2078, 2079, 2080, 2065, 2081, 2065, +- 2069, 2082, 2089, 2083, 2072, 2073, 2084, 2073, 2085, 2086, +- 2090, 2091, 2094, 2095, 2096, 2097, 2098, 2077, 2099, 2259, +- 2100, 2101, 2078, 2079, 2080, 2102, 2081, 2209, 2075, 2082, +- 2076, 2083, 2103, 2104, 2084, 2104, 2085, 2086, 2209, 2210, +- +- 2094, 2095, 2096, 2097, 2098, 2107, 2099, 2089, 2100, 2101, +- 2210, 2245, 2143, 2102, 2108, 2090, 2091, 2109, 2142, 2111, +- 2103, 2104, 2112, 2104, 2105, 2105, 2105, 2105, 2105, 2105, +- 2105, 2105, 2105, 2107, 2113, 2115, 2105, 2116, 2105, 2105, +- 2105, 2110, 2108, 2117, 2105, 2109, 2110, 2111, 2118, 2105, +- 2112, 2119, 2120, 2121, 2122, 2124, 2125, 2126, 2105, 2055, +- 2146, 2146, 2113, 2115, 2105, 2116, 2105, 2105, 2105, 2110, +- 2127, 2117, 2105, 2128, 2110, 2129, 2118, 2105, 2130, 2119, +- 2120, 2121, 2122, 2124, 2125, 2126, 2105, 2106, 2106, 2106, +- 2106, 2106, 2106, 2106, 2106, 2106, 2131, 2132, 2127, 2133, +- +- 2134, 2128, 2135, 2129, 2137, 2138, 2130, 2139, 2140, 2141, +- 2144, 2144, 2144, 2144, 2146, 2147, 2147, 2147, 2147, 2148, +- 2148, 2149, 2151, 2152, 2131, 2132, 2153, 2133, 2134, 2154, +- 2135, 2156, 2137, 2138, 2157, 2139, 2140, 2141, 2158, 2159, +- 2160, 2161, 2167, 2162, 2163, 2167, 2053, 2164, 2165, 2149, +- 2151, 2152, 2168, 2169, 2153, 2170, 2171, 2154, 2172, 2156, +- 2173, 2174, 2157, 2175, 2176, 2144, 2158, 2159, 2160, 2161, +- 2147, 2162, 2163, 2148, 2155, 2164, 2165, 2155, 2048, 2177, +- 2168, 2169, 2167, 2170, 2171, 2180, 2172, 2181, 2173, 2174, +- 1967, 2175, 2176, 2155, 1952, 2182, 2183, 2184, 2185, 2186, +- +- 2187, 2188, 2189, 2191, 2192, 2193, 2155, 2177, 2155, 2194, +- 2167, 2196, 2197, 2180, 2196, 2181, 2196, 2198, 2155, 2199, +- 2155, 2155, 2155, 2182, 2183, 2184, 2185, 2186, 2187, 2188, +- 2189, 2191, 2192, 2193, 2155, 2200, 2155, 2194, 2201, 2202, +- 2197, 2203, 2202, 2204, 2205, 2198, 2155, 2199, 2155, 2155, +- 2155, 2207, 2208, 2211, 2212, 2213, 2214, 2215, 2216, 2217, +- 2218, 2219, 2220, 2200, 2221, 2222, 2201, 2216, 2223, 2203, +- 2224, 2204, 2205, 2225, 2226, 2228, 2227, 2229, 2230, 2207, +- 2208, 2211, 2212, 2213, 2214, 2215, 2216, 2217, 2218, 2219, +- 2220, 2227, 2221, 2222, 2235, 2236, 2223, 2237, 2224, 2238, +- +- 2239, 2225, 2226, 2228, 2227, 2229, 2230, 2240, 2241, 2242, +- 2243, 2244, 2246, 2247, 2248, 2249, 2250, 2255, 2256, 2227, +- 2258, 2262, 2235, 2236, 2263, 2237, 2265, 2238, 2239, 2266, +- 2267, 2268, 2269, 2270, 2271, 2240, 2241, 2242, 2243, 2244, +- 2246, 2247, 2248, 2249, 2250, 2255, 2256, 2278, 2258, 2262, +- 2279, 2280, 2263, 2283, 2265, 2285, 2287, 2266, 2267, 2268, +- 2269, 2270, 2271, 2288, 2289, 2290, 2291, 2292, 2293, 2294, +- 2301, 2295, 2303, 2304, 2305, 2278, 1948, 2297, 2279, 2280, +- 2297, 2306, 2297, 2307, 2287, 2308, 2309, 2297, 2310, 1946, +- 2297, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2283, 2295, +- +- 2285, 2304, 2305, 2311, 2297, 2313, 2314, 2315, 2317, 2306, +- 2318, 2307, 2316, 2308, 2309, 2301, 2310, 2303, 2319, 2316, +- 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2321, 2322, +- 2323, 2311, 2297, 2313, 2314, 2315, 2317, 2320, 2318, 2324, +- 2325, 2326, 2320, 2327, 2328, 2329, 2319, 2330, 2331, 2333, +- 2334, 2335, 2337, 2340, 2342, 2343, 2321, 2322, 2323, 2344, +- 2346, 2347, 2348, 2349, 2350, 2320, 2351, 2324, 2325, 2326, +- 2320, 2327, 2328, 2329, 2352, 2330, 2331, 2333, 2334, 2335, +- 2337, 2340, 2342, 2343, 2355, 2357, 2362, 2344, 2346, 2347, +- 2348, 2349, 2350, 2363, 2351, 2359, 2359, 2365, 2359, 2366, +- +- 2361, 2361, 2352, 2361, 2365, 2367, 2368, 2369, 2367, 2368, +- 2367, 2370, 2355, 2357, 2362, 2371, 2372, 2370, 2373, 2374, +- 2375, 2363, 1918, 2376, 2377, 2365, 2376, 2366, 2378, 2379, +- 2380, 2381, 2365, 2382, 2383, 2369, 2384, 2386, 1901, 2370, +- 2386, 2388, 2386, 2371, 2372, 2370, 2373, 2374, 2375, 2389, +- 2359, 2390, 2377, 2391, 2392, 2361, 2378, 2379, 2380, 2381, +- 2393, 2382, 2383, 2387, 2384, 2359, 2387, 2394, 2387, 2388, +- 2361, 2395, 2397, 2398, 2400, 2397, 2401, 2389, 2402, 2390, +- 2403, 2391, 2392, 2404, 2405, 2406, 2407, 2408, 2393, 2409, +- 2411, 2412, 2413, 2414, 2416, 2394, 2417, 2418, 2419, 2395, +- +- 2418, 2398, 2400, 2420, 2401, 2422, 2402, 2423, 2403, 2424, +- 2425, 2404, 2405, 2406, 2407, 2408, 2426, 2409, 2411, 2412, +- 2413, 2414, 2416, 2429, 2417, 2421, 2419, 2430, 2421, 2432, +- 2421, 2420, 2434, 2422, 2435, 2423, 2437, 2424, 2425, 2438, +- 2439, 2440, 2441, 2434, 2426, 1900, 2442, 2444, 2445, 2446, +- 2447, 2429, 2448, 2449, 2451, 2430, 2452, 2432, 2453, 2455, +- 2456, 2457, 2435, 2459, 2437, 2460, 2461, 2438, 2439, 2440, +- 2441, 2462, 2463, 2434, 2442, 2444, 2445, 2446, 2447, 2464, +- 2448, 2449, 2451, 2465, 2452, 2466, 2453, 2455, 2456, 2457, +- 2467, 2459, 2468, 2460, 2461, 2469, 2472, 2473, 2474, 2462, +- +- 2463, 2476, 2477, 2478, 2482, 2483, 2487, 2464, 2489, 2490, +- 2491, 2465, 2492, 2466, 2493, 2494, 2495, 2496, 2467, 2497, +- 2468, 2499, 2502, 2469, 2472, 2473, 2474, 2503, 1897, 2476, +- 2477, 2478, 2482, 2483, 2572, 2510, 2514, 2572, 2491, 2502, +- 2492, 2503, 2493, 2494, 2495, 2496, 2512, 2497, 2513, 2499, +- 1861, 2487, 2501, 2489, 2490, 2501, 2504, 2501, 2516, 2504, +- 2517, 2504, 2501, 1830, 2514, 2501, 2504, 2502, 2505, 2503, +- 2518, 2505, 2506, 2505, 2519, 2506, 2520, 2506, 2505, 2501, +- 2510, 2505, 2506, 2504, 2522, 2506, 2516, 2523, 2517, 2524, +- 2526, 2512, 2527, 2513, 2528, 2505, 2529, 2530, 2518, 2506, +- +- 2531, 2532, 2519, 2533, 2520, 2534, 2535, 2501, 2536, 2537, +- 2538, 2504, 2522, 2539, 2540, 2523, 2541, 2524, 2526, 2542, +- 2527, 2543, 2528, 2505, 2529, 2530, 2544, 2506, 2531, 2532, +- 2545, 2533, 2546, 2534, 2535, 2547, 2536, 2537, 2538, 2548, +- 2550, 2539, 2540, 2552, 2541, 2553, 2554, 2542, 2555, 2543, +- 2556, 2557, 2558, 2559, 2544, 2566, 2561, 2561, 2545, 2561, +- 2546, 2564, 2564, 2547, 2564, 2567, 2568, 2548, 2550, 2569, +- 2573, 2552, 2574, 2553, 2554, 2575, 2555, 2576, 2556, 2557, +- 2558, 2559, 2577, 2566, 2578, 2579, 2580, 2581, 1761, 2582, +- 2581, 2583, 2581, 2567, 2568, 2585, 2586, 2569, 2573, 2587, +- +- 2574, 2588, 2589, 2575, 2593, 2576, 2594, 2595, 2596, 2597, +- 2577, 2561, 2578, 2579, 2580, 2598, 2564, 2582, 2600, 2583, +- 2600, 2602, 2601, 2585, 2586, 2601, 2561, 2587, 2604, 2588, +- 2589, 2564, 2593, 2605, 2594, 2595, 2596, 2597, 2606, 2607, +- 2609, 2610, 2611, 2598, 2612, 2613, 2600, 2612, 2600, 2602, +- 2614, 2615, 2616, 2617, 2619, 2620, 2604, 2621, 2622, 2622, +- 2621, 2605, 2621, 2623, 2613, 2627, 2606, 2607, 2609, 2610, +- 2611, 2625, 2629, 2613, 2625, 2630, 2625, 2631, 2614, 2615, +- 2616, 2617, 2619, 2620, 2632, 2633, 2622, 2622, 2634, 2635, +- 2636, 2623, 2613, 2627, 2638, 2639, 2640, 2641, 2642, 2643, +- +- 2629, 2644, 2645, 2630, 2646, 2631, 2647, 2648, 2649, 2650, +- 2651, 2654, 2632, 2633, 2655, 2656, 2634, 2635, 2636, 2657, +- 2658, 2659, 2638, 2639, 2640, 2641, 2642, 2643, 2660, 2644, +- 2645, 2661, 2646, 2662, 2647, 2648, 2649, 2650, 2651, 2654, +- 2664, 2665, 2655, 2656, 2666, 2667, 2668, 2657, 2658, 2659, +- 2669, 2671, 2672, 2673, 2675, 2676, 2660, 2677, 2678, 2661, +- 2679, 2662, 2680, 2681, 2682, 2684, 2685, 2686, 2664, 2665, +- 2687, 2688, 2666, 2667, 2668, 2689, 2707, 2692, 2669, 2671, +- 2672, 2673, 2675, 2676, 2779, 2677, 2678, 2779, 2679, 2699, +- 2680, 2692, 1760, 2684, 2685, 2686, 2696, 2693, 2687, 2688, +- +- 2693, 2694, 2693, 2689, 2694, 2697, 2694, 2693, 2681, 2682, +- 2693, 2694, 2698, 2696, 2694, 2698, 2709, 2699, 2708, 2692, +- 2700, 2707, 2697, 2700, 2693, 2700, 2710, 2813, 2694, 2698, +- 2700, 1759, 2701, 2700, 2711, 2701, 2780, 2701, 2813, 2780, +- 2785, 2696, 2701, 2785, 2709, 2713, 2888, 2700, 2714, 2888, +- 2697, 2715, 2693, 2716, 2710, 2702, 2694, 2717, 2702, 2701, +- 2702, 2704, 2711, 2708, 2704, 2702, 2704, 2705, 2702, 2718, +- 2705, 2704, 2705, 2713, 2704, 2700, 2714, 2705, 2719, 2715, +- 2705, 2716, 2702, 2720, 2721, 2717, 2722, 2701, 2704, 2723, +- 2724, 2725, 2726, 2727, 2705, 2728, 2729, 2718, 2731, 2732, +- +- 2733, 2734, 2735, 2736, 2737, 2738, 2719, 2739, 2740, 2741, +- 2702, 2720, 2721, 2742, 2722, 2743, 2704, 2723, 2724, 2725, +- 2726, 2727, 2705, 2728, 2729, 2745, 2731, 2732, 2733, 2734, +- 2735, 2736, 2737, 2738, 2746, 2739, 2740, 2741, 2747, 2748, +- 2749, 2742, 2750, 2743, 2752, 2753, 2757, 2758, 2759, 2760, +- 2761, 2762, 2763, 2745, 2764, 2767, 2768, 2769, 2770, 2771, +- 2772, 2773, 2746, 2776, 2777, 2778, 2747, 2748, 2749, 2782, +- 2750, 2783, 2752, 2753, 2757, 2758, 2759, 2760, 2761, 2762, +- 2763, 2786, 2764, 2767, 2768, 2769, 2770, 2771, 2772, 2773, +- 2787, 2776, 2777, 2778, 2788, 2789, 2790, 2782, 2791, 2783, +- +- 2792, 2793, 2794, 2789, 2789, 2794, 2789, 2794, 2789, 2786, +- 2795, 2796, 2797, 2798, 2799, 2800, 2801, 2802, 2787, 2805, +- 2806, 2807, 2811, 2789, 2790, 2788, 2791, 2812, 2792, 2793, +- 2814, 2789, 2789, 2817, 2789, 2816, 2789, 2818, 2795, 2796, +- 2797, 2798, 2799, 2800, 2801, 2802, 2816, 2805, 2806, 2807, +- 2811, 2819, 2820, 2788, 2821, 2812, 2822, 2823, 2814, 2826, +- 2827, 2817, 2828, 2829, 2830, 2818, 2831, 2832, 2833, 2834, +- 2835, 2836, 2837, 2826, 2838, 2839, 2840, 2831, 2841, 2819, +- 2820, 2842, 2821, 2844, 2822, 2823, 2845, 2826, 2827, 2846, +- 2828, 2829, 2830, 2847, 2848, 2832, 2833, 2834, 2835, 2836, +- +- 2837, 2849, 2838, 2839, 2840, 2850, 2841, 2851, 2852, 2842, +- 2853, 2844, 2854, 2855, 2845, 2856, 2857, 2846, 2858, 2859, +- 2860, 2847, 2848, 2861, 2862, 2863, 2864, 2865, 2869, 2849, +- 1732, 2867, 1728, 2850, 1719, 2851, 2852, 2894, 2853, 2948, +- 2854, 2855, 2948, 2856, 2857, 2869, 2858, 2859, 2860, 2867, +- 2896, 1715, 2862, 2863, 2864, 2865, 2891, 2868, 2877, 2867, +- 2868, 2871, 2868, 2897, 2871, 2894, 2871, 2868, 2861, 2872, +- 2868, 2871, 2872, 2869, 2872, 2877, 1713, 2867, 2896, 2872, +- 2873, 2878, 2872, 2873, 2868, 2873, 2898, 2879, 2871, 2880, +- 2873, 2897, 2874, 2873, 2899, 2874, 2872, 2874, 2878, 2900, +- +- 2991, 2891, 2874, 2877, 2879, 2874, 2880, 2873, 2901, 1711, +- 2882, 2991, 2868, 2882, 2898, 2882, 2871, 1701, 2902, 2874, +- 2882, 1659, 2899, 2882, 2872, 1649, 2878, 2900, 2884, 2903, +- 1579, 2884, 2879, 2884, 2880, 2873, 2901, 2882, 2884, 2885, +- 2886, 2884, 2885, 2886, 2885, 2886, 2902, 2874, 2887, 2885, +- 2886, 2887, 2885, 2887, 2905, 2884, 1574, 2903, 2887, 2889, +- 2906, 2908, 2889, 2910, 2889, 2882, 2885, 2886, 2912, 2889, +- 1572, 2890, 2889, 2913, 2890, 2887, 2890, 2914, 2916, 2917, +- 2918, 2890, 2905, 2884, 2890, 2919, 2889, 2920, 2906, 2908, +- 2921, 2910, 2922, 2923, 2885, 2886, 2912, 2924, 2890, 2925, +- +- 2926, 2913, 2930, 2887, 2931, 2914, 2916, 2917, 2918, 2932, +- 2934, 2935, 2936, 2919, 2889, 2920, 2937, 2938, 2921, 2939, +- 2922, 2923, 2941, 2943, 2944, 2924, 2890, 2925, 2926, 2945, +- 2930, 2946, 2931, 2947, 2949, 2951, 2952, 2932, 2934, 2935, +- 2936, 2953, 2958, 2954, 2937, 2938, 2954, 2939, 2959, 2961, +- 2941, 2943, 2944, 2955, 2962, 2963, 2955, 2945, 2955, 2946, +- 2964, 2947, 2949, 2951, 2952, 2965, 2966, 2967, 2968, 2953, +- 2958, 2969, 2973, 2974, 2969, 2975, 2959, 2961, 2967, 2967, +- 2970, 2977, 2962, 2963, 2970, 2978, 2976, 2972, 2964, 2976, +- 2972, 2970, 2972, 2965, 2966, 2967, 2968, 2979, 2980, 2982, +- +- 2973, 2974, 2983, 2975, 2984, 2988, 2967, 2967, 2970, 2977, +- 2989, 2992, 2970, 2978, 2994, 2995, 2996, 2997, 2998, 2970, +- 2999, 3000, 3001, 3002, 3002, 2979, 2980, 2982, 3003, 3004, +- 2983, 3005, 2984, 2988, 3006, 3007, 3008, 3010, 2989, 2992, +- 3011, 3012, 2994, 2995, 2996, 2997, 2998, 3013, 2999, 3000, +- 3001, 3002, 3002, 3014, 3015, 3016, 3003, 3004, 3017, 3005, +- 3018, 3019, 3006, 3007, 3008, 3010, 3020, 3021, 3011, 3012, +- 3023, 3018, 3024, 1550, 3025, 3013, 3027, 3020, 3029, 1546, +- 3030, 3014, 3015, 3016, 3031, 3033, 3017, 3034, 3035, 3019, +- 3036, 3037, 3039, 3040, 3041, 3021, 3043, 3044, 3023, 1529, +- +- 3024, 3018, 3025, 3050, 3027, 1528, 3029, 3020, 3030, 3041, +- 3048, 3049, 3031, 3033, 3049, 3034, 3035, 1525, 3036, 3037, +- 3039, 3040, 3041, 3046, 3043, 3044, 3046, 3048, 3046, 3051, +- 3056, 3050, 3051, 3046, 3051, 3052, 3046, 3041, 3052, 3051, +- 3052, 3053, 3051, 3065, 3053, 3052, 3053, 3056, 3286, 3057, +- 3046, 3053, 3066, 1471, 3053, 3048, 3051, 3067, 3060, 3286, +- 3054, 3060, 3052, 3054, 3059, 3054, 3057, 3059, 3053, 3059, +- 3054, 3065, 1470, 3054, 3059, 3056, 3061, 3059, 3046, 3061, +- 3066, 3061, 3069, 3071, 3051, 3067, 3061, 3054, 3073, 3061, +- 3052, 3059, 3074, 3075, 3057, 3062, 3053, 3076, 3062, 3078, +- +- 3062, 3079, 3080, 3061, 3081, 3062, 3082, 3083, 3062, 3084, +- 3069, 3071, 3085, 3087, 3088, 3054, 3073, 3089, 3090, 3059, +- 3074, 3075, 3062, 3092, 3093, 3076, 3094, 3078, 3095, 3079, +- 3080, 3061, 3081, 3096, 3082, 3083, 3097, 3084, 3098, 3097, +- 3085, 3087, 3088, 3099, 3100, 3089, 3090, 3102, 3103, 3104, +- 3062, 3092, 3093, 3105, 3094, 3106, 3095, 3109, 3402, 3113, +- 3109, 3096, 3113, 3645, 1463, 3108, 3098, 3107, 3111, 3402, +- 3107, 3099, 3100, 3116, 3117, 3102, 3103, 3104, 3119, 3120, +- 3121, 3105, 3122, 3106, 3107, 3107, 3107, 3107, 3107, 3107, +- 3107, 3107, 3107, 3108, 3115, 3123, 3111, 3115, 3124, 3115, +- +- 3125, 3116, 3117, 3126, 3127, 3128, 3119, 3120, 3121, 3137, +- 3122, 3235, 3137, 3645, 3235, 3130, 3131, 3129, 3132, 3134, +- 3129, 3135, 3136, 3123, 3138, 3139, 3124, 3140, 3125, 3141, +- 3143, 3126, 3127, 3128, 3129, 3129, 3129, 3129, 3129, 3129, +- 3129, 3129, 3129, 3130, 3131, 3144, 3132, 3134, 3145, 3135, +- 3136, 3147, 3138, 3139, 3148, 3140, 3150, 3141, 3143, 3151, +- 3152, 3154, 3155, 3157, 3158, 3159, 3160, 3161, 3162, 3164, +- 3165, 3166, 3167, 3144, 3169, 3170, 3145, 3171, 3172, 3147, +- 3174, 3176, 3148, 3179, 3150, 3183, 3185, 3151, 3152, 3154, +- 3155, 3157, 3158, 3159, 3160, 3161, 3162, 3164, 3165, 3166, +- +- 3167, 3182, 3169, 3170, 3187, 3171, 3172, 3188, 3174, 3176, +- 3189, 3179, 3182, 3183, 3185, 3190, 3191, 3192, 3193, 3195, +- 3196, 3197, 3198, 3199, 3200, 3267, 3201, 3213, 3267, 3201, +- 3214, 3201, 3187, 1462, 3199, 3188, 3201, 3202, 3189, 3201, +- 3207, 1461, 3182, 3190, 3191, 3192, 3193, 3195, 3196, 3197, +- 3198, 3199, 3200, 3201, 3202, 3213, 3204, 3207, 3214, 3204, +- 3205, 3204, 3199, 3205, 3206, 3205, 3204, 3206, 3215, 3206, +- 3205, 1406, 3275, 3216, 3206, 3275, 3217, 3206, 3219, 3220, +- 3221, 3201, 3202, 3204, 3223, 3207, 3224, 3205, 1405, 3208, +- 3209, 3206, 3208, 3209, 3208, 3209, 3215, 1394, 1370, 3208, +- +- 3209, 3216, 3208, 3209, 3217, 1369, 3219, 3220, 3221, 3225, +- 3226, 3204, 3223, 3227, 3224, 3205, 3208, 3209, 3228, 3206, +- 3211, 3212, 3231, 3211, 3212, 3211, 3212, 3232, 3233, 3234, +- 3211, 3212, 3236, 3211, 3212, 3237, 3240, 3225, 3226, 3241, +- 3242, 3227, 3243, 3244, 3208, 3209, 3228, 3211, 3212, 3239, +- 3231, 3245, 3239, 3246, 3239, 3232, 3233, 3234, 3247, 3279, +- 3236, 3407, 3279, 3237, 3240, 1365, 1364, 3241, 3242, 3249, +- 3243, 3244, 3407, 1363, 3254, 3211, 3212, 3254, 1362, 3245, +- 3251, 3246, 3250, 3253, 3256, 3250, 3247, 3248, 3248, 3248, +- 3248, 3248, 3248, 3248, 3248, 3248, 3257, 3249, 3258, 3250, +- +- 3250, 3250, 3250, 3250, 3250, 3250, 3250, 3250, 3251, 3259, +- 3260, 3253, 3256, 3261, 3262, 3263, 3264, 3265, 3268, 3269, +- 3254, 3271, 3272, 3273, 3257, 3276, 3258, 3266, 3266, 3266, +- 3266, 3266, 3266, 3266, 3266, 3266, 3277, 3259, 3260, 3278, +- 3280, 3261, 3262, 3263, 3264, 3265, 3268, 3269, 3254, 3271, +- 3272, 3273, 3281, 3276, 3282, 3281, 3283, 3284, 3285, 3287, +- 3288, 3289, 3290, 3292, 3277, 3293, 3294, 3278, 3280, 3295, +- 3296, 3300, 3301, 3302, 3303, 3306, 3307, 3308, 3647, 3311, +- 3313, 3314, 3282, 3315, 3283, 3284, 3285, 3287, 3288, 3289, +- 3290, 3292, 3316, 3293, 3294, 3317, 3318, 3295, 3296, 3300, +- +- 3301, 3302, 3303, 3306, 3307, 3308, 3309, 3311, 3313, 3314, +- 3319, 3315, 3320, 3322, 3309, 3323, 3324, 3325, 3326, 3327, +- 3316, 1361, 3328, 3317, 3318, 3328, 3331, 3328, 3647, 3331, +- 3334, 3329, 3328, 3353, 3309, 3328, 3353, 1359, 3319, 3335, +- 3320, 3322, 3309, 3323, 3324, 3325, 3326, 3327, 3329, 3328, +- 1327, 3330, 3332, 3336, 3330, 3332, 3330, 3332, 3334, 3337, +- 3338, 3330, 3332, 3341, 3330, 3332, 3343, 3335, 3345, 1323, +- 3333, 3346, 3347, 3333, 3348, 3333, 3329, 3328, 3330, 3332, +- 3333, 3336, 3349, 3333, 3351, 3354, 3357, 3337, 3338, 3383, +- 3384, 3341, 3383, 3384, 3343, 1294, 3345, 3333, 3352, 3346, +- +- 3347, 3352, 3348, 1286, 1284, 3385, 3330, 3332, 3385, 1279, +- 3349, 3715, 3351, 3354, 3357, 3352, 3352, 3352, 3352, 3352, +- 3352, 3352, 3352, 3352, 3358, 3333, 3355, 3355, 3355, 3355, +- 3355, 3355, 3355, 3355, 3355, 3355, 3355, 3356, 3356, 3356, +- 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3359, 3360, +- 3361, 3355, 3358, 3362, 3363, 3364, 3365, 3367, 3369, 3371, +- 3373, 3715, 3356, 3366, 3366, 3366, 3366, 3366, 3366, 3366, +- 3366, 3366, 3370, 3374, 3375, 3370, 3359, 3360, 3361, 3376, +- 3377, 3362, 3363, 3364, 3365, 3367, 3369, 3371, 3373, 3370, +- 3370, 3370, 3370, 3370, 3370, 3370, 3370, 3370, 3378, 3379, +- +- 3380, 3374, 3375, 3381, 3386, 3387, 3388, 3376, 3377, 3388, +- 3389, 3390, 3391, 3392, 3393, 3396, 3392, 3393, 3398, 3400, +- 3404, 3405, 3406, 1274, 1217, 1216, 3378, 3379, 3380, 1215, +- 3666, 3381, 3386, 3387, 3394, 3408, 3409, 3394, 3389, 3390, +- 3391, 3666, 3411, 3396, 3412, 3413, 3398, 3400, 3404, 3405, +- 3406, 3394, 3394, 3394, 3394, 3394, 3394, 3394, 3394, 3394, +- 3410, 3414, 3415, 3408, 3409, 3416, 3417, 3418, 3410, 3410, +- 3411, 3419, 3412, 3413, 3420, 3421, 3422, 3423, 3424, 3426, +- 3427, 3428, 3429, 3430, 3431, 3432, 3431, 3433, 3410, 3414, +- 3415, 3434, 3436, 3416, 3417, 3418, 3410, 3410, 3437, 3419, +- +- 1214, 3439, 3420, 3421, 3422, 3423, 3424, 3426, 3427, 3428, +- 3429, 3430, 3440, 3432, 3441, 3433, 3443, 1213, 3438, 3434, +- 3436, 3438, 3445, 3438, 3449, 3451, 3437, 3454, 3438, 3439, +- 3454, 3438, 3479, 3480, 3489, 3479, 3480, 3489, 3480, 3456, +- 3440, 1212, 3441, 1208, 3443, 3438, 3457, 3458, 3459, 3460, +- 3445, 3461, 3449, 3451, 3462, 1207, 3431, 3452, 3452, 3452, +- 3452, 3452, 3452, 3452, 3452, 3452, 3453, 3456, 3455, 3453, +- 1206, 3453, 1192, 3438, 3457, 3458, 3459, 3460, 3464, 3461, +- 3465, 3468, 3462, 3453, 3453, 3453, 3453, 3453, 3453, 3453, +- 3453, 3453, 3455, 3455, 3455, 3455, 3455, 3455, 3455, 3455, +- +- 3455, 3455, 3455, 3469, 3470, 3471, 3464, 3472, 3465, 3468, +- 3473, 1190, 3474, 3473, 3475, 3476, 3477, 3455, 3467, 3467, +- 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3482, 3483, 3485, +- 3486, 3469, 3470, 3471, 3487, 3472, 3492, 1185, 3497, 3473, +- 3474, 3667, 3475, 3476, 3477, 3481, 3484, 1157, 3481, 3484, +- 3481, 3484, 3667, 1152, 1142, 3482, 3483, 3485, 3486, 3496, +- 3490, 3498, 3487, 3490, 3492, 3496, 3497, 3473, 3491, 3491, +- 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3490, 3490, 3490, +- 3490, 3490, 3490, 3490, 3490, 3490, 3499, 3496, 3501, 3498, +- 3502, 3503, 3504, 3496, 3505, 3506, 3508, 3511, 3513, 3514, +- +- 3515, 3516, 3517, 3520, 3521, 3523, 3524, 3538, 3546, 3550, +- 3538, 3546, 3550, 1131, 3499, 1129, 3501, 1127, 3502, 3503, +- 3504, 3526, 3505, 3506, 3508, 3511, 3513, 3514, 3515, 3516, +- 3517, 3520, 3521, 3523, 3524, 3525, 3525, 3525, 3525, 3525, +- 3525, 3525, 3525, 3525, 3525, 3525, 3527, 3528, 3531, 3526, +- 3532, 3533, 3534, 3536, 3537, 3622, 3625, 1126, 3622, 3625, +- 3525, 3539, 3539, 3539, 3539, 3539, 3539, 3539, 3539, 3539, +- 3543, 3544, 3545, 3547, 3527, 3528, 3531, 3548, 3532, 3533, +- 3534, 3536, 3537, 3540, 3540, 3540, 3540, 3540, 3540, 3540, +- 3540, 3540, 3541, 3549, 3551, 3541, 3552, 3553, 3543, 3544, +- +- 3545, 3547, 3555, 3556, 3558, 3548, 3559, 3560, 3562, 3541, +- 3541, 3541, 3541, 3541, 3541, 3541, 3541, 3541, 1112, 1111, +- 3557, 3549, 3551, 3557, 3552, 3553, 3561, 1107, 3569, 3561, +- 3555, 3556, 3558, 3570, 3559, 3560, 3562, 3557, 3557, 3557, +- 3557, 3557, 3557, 3557, 3557, 3557, 3564, 3567, 3572, 3564, +- 3567, 3564, 3567, 3573, 3574, 3561, 3569, 3628, 1106, 1105, +- 3628, 3570, 3628, 3690, 3693, 3579, 3690, 3693, 3690, 3693, +- 3575, 3762, 3763, 1104, 3762, 3763, 3572, 3576, 1103, 1063, +- 3576, 3573, 3574, 3561, 3575, 3575, 3575, 3575, 3575, 3575, +- 3575, 3575, 3575, 3579, 3576, 3576, 3576, 3576, 3576, 3576, +- +- 3576, 3576, 3576, 3577, 3577, 3577, 3577, 3577, 3577, 3577, +- 3577, 3577, 3580, 3581, 3583, 3585, 3586, 3587, 3588, 3589, +- 3590, 3591, 3592, 3593, 3594, 3595, 3596, 3597, 3598, 3601, +- 3605, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, +- 3580, 3581, 3583, 3585, 3586, 3587, 3588, 3589, 3590, 3591, +- 3592, 3593, 3594, 3595, 3596, 3597, 3598, 3601, 3605, 3606, +- 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, +- 3607, 3608, 3609, 3612, 3614, 3615, 3618, 3696, 3618, 3618, +- 3696, 3618, 3696, 1011, 3606, 3621, 3623, 3803, 3627, 3618, +- 3803, 3629, 3619, 3630, 3631, 3632, 3633, 3635, 3607, 3608, +- +- 3609, 3612, 3614, 3615, 3619, 3619, 3619, 3619, 3619, 3619, +- 3619, 3619, 3619, 3621, 3623, 3624, 3627, 3807, 3624, 3629, +- 3807, 3630, 3631, 3632, 3633, 3635, 3636, 3639, 3640, 3643, +- 3648, 3649, 3624, 3624, 3624, 3624, 3624, 3624, 3624, 3624, +- 3624, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, +- 3638, 3650, 3736, 3638, 3636, 3639, 3640, 3643, 3648, 3649, +- 3618, 3652, 3653, 3736, 1010, 990, 977, 3638, 3638, 3638, +- 3638, 3638, 3638, 3638, 3638, 3638, 3644, 3651, 3654, 3650, +- 3644, 3656, 3657, 3658, 3659, 3660, 3661, 3644, 3662, 3652, +- 3653, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, +- +- 3663, 3664, 3665, 3668, 3644, 3670, 3654, 3676, 3644, 3656, +- 3657, 3658, 3659, 3660, 3661, 3644, 3662, 3678, 3680, 3682, +- 3689, 3683, 3691, 3683, 3683, 966, 3683, 946, 3663, 3664, +- 3665, 3668, 3698, 3670, 3683, 3676, 3684, 3699, 3684, 3684, +- 3700, 3684, 3701, 3702, 3703, 3678, 3680, 3682, 3689, 3684, +- 3691, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, +- 3698, 3704, 3706, 3707, 3710, 3699, 3711, 3712, 3700, 3713, +- 3701, 3702, 3703, 3705, 3705, 3705, 3705, 3705, 3705, 3705, +- 3705, 3705, 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3704, +- 3706, 3707, 3710, 3724, 3711, 3712, 3725, 3713, 3727, 3728, +- +- 3729, 3731, 3732, 3735, 3740, 3683, 3742, 3743, 3746, 3750, +- 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3753, 3743, 3754, +- 3684, 3724, 3755, 3756, 3725, 3757, 3727, 3728, 3729, 3731, +- 3732, 3735, 3740, 3758, 3742, 3743, 3746, 3748, 3759, 3760, +- 3748, 3761, 3748, 3764, 3761, 3753, 3743, 3754, 3765, 3766, +- 3755, 3756, 3767, 3757, 3768, 3770, 3771, 3773, 3774, 3750, +- 3791, 3758, 3775, 3776, 3777, 3778, 3759, 3760, 3779, 3783, +- 3784, 3764, 3785, 3786, 3788, 3793, 3765, 3795, 3796, 3798, +- 3767, 3799, 3768, 3770, 3771, 3773, 3774, 3800, 3761, 3801, +- 3775, 3776, 3777, 3778, 3802, 3804, 3779, 3783, 3784, 3766, +- +- 3785, 3786, 3788, 3809, 3810, 3795, 3796, 3798, 3805, 3799, +- 3791, 3805, 3811, 3805, 3812, 3800, 3761, 3801, 3813, 3816, +- 3817, 3806, 3802, 3804, 3806, 3793, 3806, 3808, 3818, 3819, +- 3808, 3809, 3810, 3820, 3821, 3824, 3825, 3828, 3830, 3825, +- 3811, 3831, 3812, 3832, 3833, 3835, 3813, 3816, 3817, 3836, +- 3838, 3839, 928, 3838, 3847, 3840, 3818, 3819, 3840, 3862, +- 3840, 3820, 3821, 3824, 3849, 3842, 3830, 3850, 3842, 3831, +- 3842, 3832, 3833, 3835, 3851, 3844, 3853, 3836, 3844, 3839, +- 3844, 3845, 3847, 3854, 3845, 3855, 3845, 3828, 3856, 3857, +- 3863, 3865, 3849, 3861, 3858, 3850, 3861, 3864, 3861, 3866, +- +- 3864, 3869, 3851, 3867, 3853, 3858, 3867, 3872, 3858, 3862, +- 3872, 3854, 3872, 3855, 3877, 3878, 3856, 3857, 3863, 3865, +- 3874, 3879, 3858, 3874, 3880, 3874, 3881, 3866, 3882, 3869, +- 3883, 3884, 3885, 3858, 3886, 3887, 3858, 3893, 3896, 903, +- 891, 3891, 3877, 3878, 3891, 3895, 3891, 880, 3895, 3879, +- 3894, 878, 3880, 3894, 3881, 876, 3882, 872, 3883, 3884, +- 3885, 3897, 3886, 3887, 3897, 3893, 3896, 3894, 3894, 3894, +- 3894, 3894, 3894, 3894, 3894, 3894, 3898, 3903, 3897, 3897, +- 3897, 3897, 3897, 3897, 3897, 3897, 3897, 3904, 3905, 3908, +- 3910, 3911, 3912, 3913, 3917, 3917, 3917, 3917, 3917, 3917, +- +- 3917, 3917, 3917, 828, 3898, 3903, 3918, 3919, 817, 3918, +- 3919, 808, 804, 3921, 3924, 3904, 3905, 3908, 3910, 3911, +- 3912, 3913, 3925, 3918, 3918, 3918, 3918, 3918, 3918, 3918, +- 3918, 3918, 3920, 3920, 3920, 3920, 3920, 3920, 3920, 3920, +- 3920, 3921, 3924, 3926, 3929, 3930, 3938, 3941, 3943, 773, +- 3925, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, +- 3934, 772, 770, 3934, 769, 768, 766, 3944, 3945, 3946, +- 3948, 3926, 3929, 3930, 3938, 3941, 3943, 3934, 3934, 3934, +- 3934, 3934, 3934, 3934, 3934, 3934, 3942, 3942, 3942, 3942, +- 3942, 3942, 3942, 3942, 3942, 3944, 3945, 3946, 3948, 3949, +- +- 3950, 761, 760, 758, 757, 756, 750, 743, 732, 731, +- 712, 700, 689, 677, 676, 671, 670, 668, 661, 651, +- 650, 648, 644, 634, 633, 631, 628, 3949, 3950, 3953, +- 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3953, +- 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3954, 3954, 3954, +- 3954, 3954, 3954, 3954, 3954, 3954, 3954, 3954, 3954, 3954, +- 3954, 3954, 3954, 3954, 3954, 3955, 3955, 3955, 3955, 3955, +- 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, +- 3955, 3955, 3955, 3956, 3956, 3956, 3956, 3956, 3956, 3956, +- 3956, 3956, 3956, 3956, 3956, 3956, 3956, 3956, 3956, 3956, +- +- 3956, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, +- 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3958, +- 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3958, +- 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3959, 3959, 3959, +- 3959, 3959, 3959, 3959, 3959, 3959, 3959, 3959, 3959, 3959, +- 3959, 3959, 3959, 3959, 3959, 3960, 3960, 3960, 3960, 3960, +- 3960, 3960, 3960, 3960, 3960, 3960, 3960, 3960, 3960, 3960, +- 3960, 3960, 3960, 3961, 3961, 3961, 3961, 3961, 3961, 3961, +- 3961, 3961, 3961, 3961, 3961, 3961, 3961, 3961, 3961, 3961, +- 3961, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, +- +- 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3963, +- 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3963, +- 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3964, 3964, 3964, +- 3964, 3964, 3964, 3964, 3964, 3964, 3964, 3964, 3964, 3964, +- 3964, 3964, 3964, 3964, 3964, 3965, 3965, 3965, 3965, 3965, +- 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, +- 3965, 3965, 3965, 3966, 3966, 3966, 3966, 3966, 3966, 3966, +- 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, +- 3966, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, +- 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3968, +- ++ 2016, 2009, 2010, 2011, 2017, 2018, 2012, 2019, 2300, 2166, ++ 2299, 2021, 2166, 2022, 2166, 2178, 2013, 2023, 2178, 2014, ++ 2178, 2015, 2196, 2024, 2025, 2196, 2026, 2196, 2016, 2027, ++ 2028, 2029, 2017, 2018, 2030, 2019, 2020, 2020, 2020, 2021, ++ 2020, 2022, 2020, 2020, 2031, 2023, 2020, 2020, 2020, 2032, ++ 2020, 2024, 2025, 2020, 2026, 2020, 2033, 2027, 2028, 2029, ++ 2034, 2035, 2030, 2036, 2020, 2020, 2020, 2037, 2020, 2038, ++ 2020, 2020, 2031, 2039, 2020, 2020, 2020, 2032, 2020, 2040, ++ ++ 2041, 2020, 2042, 2020, 2033, 2043, 2044, 2045, 2034, 2035, ++ 2046, 2036, 2049, 2050, 2051, 2037, 2052, 2038, 2057, 2058, ++ 2059, 2039, 2060, 2061, 2062, 2063, 2064, 2040, 2041, 2065, ++ 2042, 2065, 2068, 2043, 2044, 2045, 2069, 2072, 2046, 2075, ++ 2049, 2050, 2051, 2073, 2052, 2073, 2057, 2058, 2059, 2076, ++ 2060, 2061, 2062, 2063, 2064, 2077, 2089, 2065, 2078, 2065, ++ 2068, 2079, 2080, 2081, 2069, 2072, 2090, 2082, 2083, 2084, ++ 2085, 2073, 2086, 2073, 2091, 2094, 2095, 2096, 2097, 2098, ++ 2099, 2100, 2101, 2077, 2075, 2102, 2078, 2103, 2107, 2079, ++ 2080, 2081, 2285, 2283, 2076, 2082, 2083, 2084, 2085, 2282, ++ ++ 2086, 2089, 2108, 2094, 2095, 2096, 2097, 2098, 2099, 2100, ++ 2101, 2090, 2104, 2102, 2104, 2103, 2107, 2260, 2209, 2091, ++ 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2209, ++ 2108, 2246, 2109, 2110, 2111, 2143, 2112, 2113, 2110, 2115, ++ 2104, 2116, 2104, 2105, 2105, 2105, 2105, 2105, 2105, 2105, ++ 2105, 2105, 2117, 2118, 2119, 2105, 2120, 2105, 2105, 2105, ++ 2109, 2110, 2111, 2105, 2112, 2113, 2110, 2115, 2105, 2116, ++ 2121, 2122, 2124, 2125, 2126, 2127, 2128, 2105, 2129, 2130, ++ 2117, 2118, 2119, 2105, 2120, 2105, 2105, 2105, 2131, 2132, ++ 2133, 2105, 2134, 2135, 2137, 2138, 2105, 2139, 2121, 2122, ++ ++ 2124, 2125, 2126, 2127, 2128, 2105, 2129, 2130, 2140, 2141, ++ 2144, 2144, 2144, 2144, 2146, 2146, 2131, 2132, 2133, 2149, ++ 2134, 2135, 2137, 2138, 2151, 2139, 2147, 2147, 2147, 2147, ++ 2148, 2148, 2152, 2153, 2154, 2156, 2140, 2141, 2157, 2158, ++ 2142, 2159, 2160, 2161, 2162, 2163, 2164, 2149, 2165, 2168, ++ 2167, 2169, 2151, 2167, 2170, 2171, 2284, 2055, 2172, 2173, ++ 2152, 2153, 2154, 2156, 2174, 2144, 2157, 2158, 2146, 2159, ++ 2160, 2161, 2162, 2163, 2164, 2175, 2165, 2168, 2176, 2169, ++ 2177, 2147, 2170, 2171, 2148, 2155, 2172, 2173, 2155, 2053, ++ 2167, 2048, 2174, 2180, 2181, 2182, 2183, 2184, 2185, 2186, ++ ++ 2187, 2284, 2188, 2175, 2155, 1967, 2176, 2189, 2177, 2191, ++ 2192, 2193, 2194, 2197, 2198, 2199, 2200, 2155, 2167, 2155, ++ 2201, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2155, ++ 2188, 2155, 2155, 2155, 2203, 2189, 2204, 2191, 2192, 2193, ++ 2194, 2197, 2198, 2199, 2200, 2155, 2202, 2155, 2201, 2202, ++ 2205, 2207, 2208, 2211, 2210, 2212, 2213, 2155, 2214, 2155, ++ 2155, 2155, 2203, 2215, 2204, 2210, 2216, 2217, 2218, 2219, ++ 2220, 2221, 2222, 2223, 2224, 2216, 2225, 2226, 2205, 2207, ++ 2208, 2211, 2227, 2212, 2213, 2229, 2214, 2230, 2228, 2231, ++ 2236, 2215, 2237, 2238, 2216, 2217, 2218, 2219, 2220, 2221, ++ ++ 2222, 2223, 2224, 2228, 2225, 2226, 2239, 2240, 2241, 2242, ++ 2227, 2243, 2244, 2229, 2245, 2230, 2228, 2231, 2236, 2247, ++ 2237, 2238, 2248, 2249, 2250, 2251, 2256, 2257, 2259, 2263, ++ 2264, 2228, 2266, 2267, 2239, 2240, 2241, 2242, 2268, 2243, ++ 2244, 2269, 2245, 2270, 2271, 2272, 2279, 2247, 2280, 2281, ++ 2248, 2249, 2250, 2251, 2256, 2257, 2259, 2263, 2264, 2286, ++ 2266, 2267, 2288, 2289, 2290, 2291, 2268, 2292, 2293, 2269, ++ 2294, 2270, 2271, 2272, 2279, 2295, 2280, 2281, 2296, 2302, ++ 2304, 2305, 2306, 1952, 2298, 2307, 2308, 2298, 2309, 2298, ++ 2288, 2289, 2290, 2291, 2298, 2292, 2293, 2298, 2294, 2310, ++ ++ 2311, 2312, 2314, 2295, 2286, 2315, 2296, 2316, 2318, 2305, ++ 2306, 2298, 2319, 2307, 2308, 2368, 2309, 1948, 2368, 1946, ++ 2368, 1918, 2320, 2322, 2302, 2304, 2321, 2310, 2311, 2312, ++ 2314, 2321, 2323, 2315, 2317, 2316, 2318, 2324, 2325, 2298, ++ 2319, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, ++ 2320, 2322, 2326, 2327, 2321, 2328, 2329, 2330, 2331, 2321, ++ 2323, 2332, 2334, 2335, 2336, 2324, 2325, 2338, 2341, 2343, ++ 2344, 2345, 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2356, ++ 2326, 2327, 2358, 2328, 2329, 2330, 2331, 1901, 2363, 2332, ++ 2334, 2335, 2336, 2364, 2367, 2338, 2341, 2343, 2344, 2345, ++ ++ 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2356, 2360, 2360, ++ 2358, 2360, 2362, 2362, 2370, 2362, 2363, 2366, 2372, 2371, ++ 2369, 2364, 2367, 2369, 2366, 2371, 2373, 2374, 2375, 2376, ++ 2377, 2378, 2379, 2377, 2380, 1900, 2381, 2382, 2383, 2816, ++ 2384, 2385, 2370, 1897, 2389, 2366, 2372, 2371, 1861, 2390, ++ 2816, 2391, 2366, 2371, 2373, 2374, 2375, 2376, 2392, 2378, ++ 2379, 2393, 2380, 2360, 2381, 2382, 2383, 2362, 2384, 2385, ++ 2387, 2388, 2389, 2387, 2388, 2387, 2388, 2390, 2360, 2391, ++ 2394, 2395, 2362, 2396, 2398, 2399, 2392, 2398, 2401, 2393, ++ 2402, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 2410, 2412, ++ ++ 2413, 2414, 2415, 2417, 2418, 2420, 2421, 2419, 2394, 2395, ++ 2419, 2396, 2422, 2399, 2423, 2422, 2401, 2422, 2402, 2403, ++ 2404, 2405, 2406, 2407, 2408, 2409, 2410, 2412, 2413, 2414, ++ 2415, 2417, 2418, 2420, 2421, 2424, 2425, 2426, 2427, 2430, ++ 2431, 2433, 2423, 2435, 2436, 2438, 2439, 2440, 2441, 2442, ++ 2443, 2445, 2446, 2447, 2435, 2448, 1830, 2449, 2450, 2451, ++ 2453, 2454, 2455, 2424, 2425, 2426, 2427, 2430, 2431, 2433, ++ 2457, 2458, 2436, 2438, 2439, 2440, 2441, 2442, 2443, 2445, ++ 2446, 2447, 2459, 2448, 2435, 2449, 2450, 2451, 2453, 2454, ++ 2455, 2461, 2462, 2463, 2464, 2465, 2466, 2467, 2457, 2458, ++ ++ 2468, 2469, 2470, 2471, 2474, 2475, 2476, 2478, 2479, 2480, ++ 2459, 2484, 2485, 2489, 2491, 2492, 2493, 2494, 2495, 2461, ++ 2462, 2463, 2464, 2465, 2466, 2467, 2496, 2497, 2468, 2469, ++ 2470, 2471, 2474, 2475, 2476, 2478, 2479, 2480, 2498, 2484, ++ 2485, 2499, 2501, 2505, 2493, 2494, 2495, 2504, 2516, 2512, ++ 2819, 1761, 2514, 2515, 2496, 2497, 1760, 2505, 2489, 2491, ++ 2492, 2819, 2503, 2518, 2504, 2503, 2498, 2503, 2506, 2499, ++ 2501, 2506, 2503, 2506, 2507, 2503, 2516, 2507, 2506, 2507, ++ 2519, 2520, 1759, 2508, 2507, 2505, 2508, 2507, 2508, 2503, ++ 2521, 2518, 2504, 2508, 2512, 2506, 2508, 2514, 2515, 2522, ++ ++ 2524, 2507, 2525, 2526, 2528, 2529, 2530, 2531, 2519, 2520, ++ 2508, 2532, 2533, 2534, 2535, 2536, 2537, 2503, 2521, 2538, ++ 2539, 2540, 2541, 2506, 2542, 2543, 2544, 2522, 2524, 2507, ++ 2525, 2526, 2528, 2529, 2530, 2531, 2545, 2546, 2508, 2532, ++ 2533, 2534, 2535, 2536, 2537, 2547, 2548, 2538, 2539, 2540, ++ 2541, 2549, 2542, 2543, 2544, 2550, 2552, 2554, 2555, 2556, ++ 2557, 2558, 2559, 2560, 2545, 2546, 2561, 2563, 2563, 2568, ++ 2563, 2569, 2570, 2547, 2548, 2566, 2566, 2571, 2566, 2549, ++ 2575, 2576, 2577, 2550, 2552, 2554, 2555, 2556, 2557, 2558, ++ 2559, 2560, 2574, 2578, 2561, 2574, 2579, 2568, 2580, 2569, ++ ++ 2570, 2581, 1732, 2582, 2584, 2571, 2585, 2587, 2575, 2576, ++ 2577, 2583, 2588, 2589, 2583, 2590, 2583, 1728, 2591, 2595, ++ 2596, 2578, 2563, 2597, 2579, 2598, 2580, 2599, 2600, 2581, ++ 2566, 2582, 2584, 2604, 2585, 2587, 2602, 2563, 2602, 2603, ++ 2588, 2589, 2603, 2590, 2606, 2566, 2591, 2595, 2596, 2607, ++ 2608, 2597, 2609, 2598, 2611, 2599, 2600, 2612, 2613, 2614, ++ 2615, 2604, 2614, 2616, 2602, 2617, 2602, 2618, 2619, 2621, ++ 2622, 2623, 2606, 2625, 2623, 2629, 2623, 2607, 2608, 2615, ++ 2609, 2631, 2611, 2624, 2624, 2612, 2613, 2627, 2615, 2632, ++ 2627, 2616, 2627, 2617, 2633, 2618, 2619, 2621, 2622, 2634, ++ ++ 2635, 2625, 2636, 2629, 2637, 2638, 2640, 2615, 2641, 2631, ++ 2642, 2624, 2624, 2643, 2644, 2645, 2646, 2632, 2647, 2648, ++ 2649, 2650, 2633, 2651, 2652, 2653, 2654, 2634, 2635, 2657, ++ 2636, 2658, 2637, 2638, 2640, 2659, 2641, 2660, 2642, 2661, ++ 2662, 2643, 2644, 2645, 2646, 2663, 2647, 2648, 2649, 2650, ++ 2664, 2651, 2652, 2653, 2654, 2665, 2667, 2657, 2668, 2658, ++ 2669, 2670, 2671, 2659, 2672, 2660, 2674, 2661, 2662, 2675, ++ 2676, 2678, 2679, 2663, 2680, 2681, 2682, 2683, 2664, 2684, ++ 2685, 2687, 2688, 2665, 2667, 2689, 2668, 2690, 2669, 2670, ++ 2671, 2691, 2672, 2692, 2674, 1719, 2710, 2675, 2676, 2678, ++ ++ 2679, 2699, 2680, 2681, 2682, 2683, 2695, 2702, 2782, 2687, ++ 2688, 2782, 2700, 2689, 2701, 2690, 2711, 2701, 2699, 2691, ++ 2695, 2692, 1715, 2696, 2684, 2685, 2696, 2697, 2696, 2700, ++ 2697, 2701, 2697, 2696, 1713, 2702, 2696, 2697, 1711, 2703, ++ 2697, 2710, 2703, 1701, 2703, 2712, 2699, 2713, 2695, 2703, ++ 2696, 2714, 2703, 2704, 2697, 2716, 2704, 2700, 2704, 2705, ++ 2717, 2711, 2705, 2704, 2705, 1659, 2703, 2783, 2718, 2705, ++ 2783, 2707, 2705, 2712, 2707, 2713, 2707, 2719, 2696, 2714, ++ 2704, 2707, 2697, 2716, 2707, 2720, 2705, 2721, 2717, 1649, ++ 2708, 2722, 2723, 2708, 2703, 2708, 2718, 2724, 2707, 2725, ++ ++ 2708, 2726, 2727, 2708, 2728, 2719, 2729, 2730, 2704, 2731, ++ 2732, 2734, 2735, 2720, 2705, 2721, 2736, 2708, 2737, 2722, ++ 2723, 2738, 2739, 2740, 2741, 2724, 2707, 2725, 2742, 2726, ++ 2727, 2743, 2728, 2744, 2729, 2730, 2745, 2731, 2732, 2734, ++ 2735, 2746, 2748, 2749, 2736, 2708, 2737, 2750, 2751, 2738, ++ 2739, 2740, 2741, 2752, 2753, 2755, 2742, 2756, 2760, 2743, ++ 2761, 2744, 2762, 2763, 2745, 2764, 2765, 2766, 2767, 2746, ++ 2748, 2749, 2770, 2771, 2772, 2750, 2751, 2773, 2774, 2775, ++ 2776, 2752, 2753, 2755, 2779, 2756, 2760, 2780, 2761, 2781, ++ 2762, 2763, 2785, 2764, 2765, 2766, 2767, 2786, 2789, 2790, ++ ++ 2770, 2771, 2772, 2791, 2793, 2773, 2774, 2775, 2776, 2794, ++ 2788, 2795, 2779, 2788, 2796, 2780, 2797, 2781, 2798, 2797, ++ 2785, 2797, 2792, 2799, 2800, 2786, 2789, 2790, 2801, 2802, ++ 2792, 2792, 2793, 2792, 2791, 2792, 2803, 2794, 2804, 2795, ++ 2805, 2808, 2796, 2809, 2810, 2814, 2798, 2815, 2817, 2820, ++ 2792, 2799, 2800, 2821, 2822, 2823, 2801, 2802, 2792, 2792, ++ 2824, 2792, 2791, 2792, 2803, 2825, 2804, 2826, 2805, 2808, ++ 2829, 2809, 2810, 2814, 2830, 2815, 2817, 2820, 2831, 2832, ++ 2833, 2821, 2822, 2823, 2829, 2834, 2836, 2837, 2824, 2838, ++ 2839, 2840, 2841, 2825, 2842, 2826, 2834, 2843, 2829, 2844, ++ ++ 2845, 2846, 2830, 2848, 2849, 2850, 2831, 2832, 2833, 2851, ++ 2852, 2853, 2854, 2855, 2836, 2837, 2856, 2838, 2839, 2840, ++ 2841, 2857, 2842, 2858, 2859, 2843, 2860, 2844, 2845, 2846, ++ 2861, 2848, 2849, 2850, 2862, 2863, 2864, 2851, 2852, 2853, ++ 2854, 2855, 2865, 2866, 2856, 2867, 2868, 2869, 2871, 2857, ++ 2873, 2858, 2859, 2892, 2860, 1579, 2892, 2952, 2861, 2995, ++ 2952, 1574, 2862, 2863, 2864, 2898, 2871, 2873, 2881, 1572, ++ 2995, 2866, 2895, 2867, 2868, 2869, 2871, 2958, 2872, 2875, ++ 2958, 2872, 2875, 2872, 2875, 2881, 1550, 2865, 2872, 2875, ++ 2900, 2872, 2901, 2898, 2871, 2873, 1546, 2876, 2877, 2882, ++ ++ 2876, 2877, 2876, 2877, 2883, 2872, 2875, 2876, 2877, 2878, ++ 2876, 2877, 2878, 2881, 2878, 2884, 2882, 2895, 2900, 2878, ++ 2901, 2883, 2878, 2902, 2876, 2877, 2903, 2904, 2973, 2905, ++ 2906, 2973, 2884, 2872, 2875, 2886, 2878, 1529, 2886, 2907, ++ 2886, 1528, 1525, 2980, 2882, 2886, 2980, 3054, 2886, 2883, ++ 3054, 2902, 2876, 2877, 2903, 2904, 2888, 2905, 2906, 2888, ++ 2884, 2888, 2886, 1471, 2878, 2889, 2888, 2907, 2889, 2888, ++ 2889, 2890, 1470, 2909, 2890, 2889, 2890, 2891, 2889, 1463, ++ 2891, 2890, 2891, 2888, 2910, 1462, 2893, 2891, 2912, 2893, ++ 2886, 2893, 2889, 2914, 2916, 2917, 2893, 2894, 2890, 2893, ++ ++ 2894, 2909, 2894, 2918, 2891, 2920, 2921, 2894, 2922, 2923, ++ 2894, 2888, 2910, 2893, 2924, 2925, 2912, 2926, 2927, 2928, ++ 2889, 2914, 2916, 2917, 2894, 2929, 2890, 2930, 2934, 2935, ++ 2936, 2918, 2891, 2920, 2921, 2938, 2922, 2923, 2939, 2940, ++ 2941, 2893, 2924, 2925, 2942, 2926, 2927, 2928, 2943, 2945, ++ 2947, 2948, 2894, 2929, 2949, 2930, 2934, 2935, 2936, 2950, ++ 2951, 2953, 2955, 2938, 2956, 2957, 2939, 2940, 2941, 2962, ++ 2959, 2963, 2942, 2959, 2965, 2959, 2943, 2945, 2947, 2948, ++ 2966, 2967, 2949, 2968, 2969, 2970, 2972, 2950, 2951, 2953, ++ 2955, 2977, 2956, 2957, 2971, 2978, 2974, 2962, 2976, 2963, ++ ++ 2974, 2976, 2965, 2976, 2979, 2971, 2971, 2974, 2966, 2967, ++ 2981, 2968, 2969, 2970, 2972, 2982, 2983, 2984, 2986, 2977, ++ 2987, 2988, 2971, 2978, 2974, 2992, 2993, 2996, 2974, 2998, ++ 2999, 3000, 2979, 2971, 2971, 2974, 3001, 3002, 2981, 3003, ++ 3004, 3005, 3007, 2982, 2983, 2984, 2986, 3008, 2987, 2988, ++ 3006, 3006, 3009, 2992, 2993, 2996, 3010, 2998, 2999, 3000, ++ 3011, 3012, 3014, 3015, 3001, 3002, 3016, 3003, 3004, 3005, ++ 3007, 3017, 3018, 3019, 3020, 3008, 3021, 3022, 3006, 3006, ++ 3009, 3023, 3024, 3026, 3010, 3025, 3028, 3029, 3011, 3012, ++ 3014, 3015, 3023, 3030, 3016, 3032, 3025, 3034, 1461, 3017, ++ ++ 3018, 3019, 3020, 3035, 3021, 3022, 3036, 3038, 3039, 3040, ++ 3024, 3026, 3041, 3042, 3028, 3029, 3044, 3045, 3046, 3048, ++ 3049, 3030, 3023, 3032, 3065, 3034, 3025, 3065, 3055, 3070, ++ 3071, 3035, 3292, 3046, 3036, 3038, 3039, 3040, 3053, 3102, ++ 3041, 3042, 3102, 3292, 3044, 3045, 3046, 3048, 3049, 3051, ++ 3072, 3061, 3051, 3074, 3051, 3053, 3055, 3070, 3071, 3051, ++ 3056, 3046, 3051, 3056, 3057, 3056, 3076, 3057, 3061, 3057, ++ 3056, 3062, 3058, 3056, 3057, 3058, 3051, 3058, 3072, 3078, ++ 1406, 3074, 3058, 3053, 3079, 3058, 3080, 3056, 3062, 3114, ++ 3059, 3057, 3114, 3059, 3076, 3059, 3061, 1405, 3118, 3058, ++ ++ 3059, 3118, 3142, 3059, 3051, 3142, 3081, 3078, 3064, 3083, ++ 3084, 3064, 3079, 3064, 3080, 3056, 3062, 3059, 3064, 3057, ++ 3066, 3064, 3085, 3066, 3086, 3066, 3067, 3058, 3087, 3067, ++ 3066, 3067, 3088, 3066, 3081, 3064, 3067, 3083, 3084, 3067, ++ 3089, 3090, 3092, 3093, 3094, 3059, 3095, 3066, 3097, 3098, ++ 3085, 3099, 3086, 3067, 3100, 3101, 3087, 3103, 3104, 3105, ++ 3088, 3107, 3108, 3064, 3109, 3110, 3111, 3113, 3089, 3090, ++ 3092, 3093, 3094, 3116, 3095, 3066, 3097, 3098, 3655, 3099, ++ 3657, 3067, 3100, 3101, 1394, 3103, 3104, 3105, 3112, 3107, ++ 3108, 3112, 3109, 3110, 3111, 3113, 3121, 3120, 3122, 3124, ++ ++ 3120, 3116, 3120, 3125, 3126, 3112, 3112, 3112, 3112, 3112, ++ 3112, 3112, 3112, 3112, 3127, 3128, 3129, 3130, 3131, 3132, ++ 3133, 3135, 3241, 1370, 3121, 3241, 3122, 3124, 3655, 1369, ++ 3657, 3125, 3126, 3134, 3136, 3137, 3134, 3139, 3140, 3141, ++ 3143, 3144, 3127, 3128, 3129, 3130, 3131, 3132, 3133, 3135, ++ 3134, 3134, 3134, 3134, 3134, 3134, 3134, 3134, 3134, 3145, ++ 3146, 3148, 3136, 3137, 3149, 3139, 3140, 3141, 3143, 3144, ++ 3150, 3152, 3153, 3155, 3156, 3157, 3159, 3160, 3162, 3163, ++ 3164, 3165, 3166, 3167, 3169, 3170, 3171, 3145, 3146, 3148, ++ 3172, 3173, 3149, 3175, 3176, 3177, 3178, 3180, 3150, 3152, ++ ++ 3153, 3155, 3156, 3157, 3159, 3160, 3162, 3163, 3164, 3165, ++ 3166, 3167, 3169, 3170, 3171, 3182, 3185, 3188, 3172, 3173, ++ 3189, 3175, 3176, 3177, 3178, 3180, 3191, 3193, 3188, 3194, ++ 1365, 3195, 3196, 3197, 3198, 3199, 3201, 3202, 3203, 3204, ++ 3205, 3206, 3245, 3182, 3185, 3245, 3219, 3245, 3189, 3273, ++ 3220, 3205, 3273, 3281, 3191, 3193, 3281, 3194, 3188, 3195, ++ 3196, 3197, 3198, 3199, 3201, 3202, 3203, 3204, 3205, 3206, ++ 3207, 3208, 1364, 3207, 3219, 3207, 1363, 3213, 3220, 3205, ++ 3207, 3210, 3211, 3207, 3210, 3211, 3210, 3211, 3208, 1362, ++ 3212, 3210, 3211, 3212, 3213, 3212, 1361, 3207, 1359, 3221, ++ ++ 3212, 3214, 3215, 3212, 3214, 3215, 3214, 3215, 3210, 3211, ++ 3222, 3214, 3215, 3223, 3214, 3215, 3208, 3212, 3225, 3226, ++ 1327, 3217, 3213, 3227, 3217, 3207, 3217, 3221, 3214, 3215, ++ 3229, 3217, 3230, 3231, 3217, 3232, 3210, 3211, 3222, 3218, ++ 3233, 3223, 3218, 3234, 3218, 3212, 3225, 3226, 3217, 3218, ++ 3237, 3227, 3218, 3238, 3239, 3240, 3214, 3215, 3229, 3242, ++ 3230, 3231, 3243, 3232, 3246, 3247, 3218, 3248, 3233, 3249, ++ 3250, 3234, 3251, 3252, 3253, 1323, 3217, 3285, 3237, 1294, ++ 3285, 3238, 3239, 3240, 3255, 3260, 3287, 3242, 3260, 3287, ++ 3243, 1286, 3246, 3247, 3218, 3248, 3256, 3249, 3250, 3256, ++ ++ 3251, 3252, 3253, 3254, 3254, 3254, 3254, 3254, 3254, 3254, ++ 3254, 3254, 3255, 3256, 3256, 3256, 3256, 3256, 3256, 3256, ++ 3256, 3256, 3257, 3259, 3262, 3263, 3264, 3265, 3266, 3267, ++ 3268, 3260, 3269, 3270, 3271, 3272, 3272, 3272, 3272, 3272, ++ 3272, 3272, 3272, 3272, 3274, 3275, 3277, 3278, 3279, 3282, ++ 3257, 3259, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 3260, ++ 3269, 3270, 3271, 3283, 3284, 3286, 3288, 3289, 3290, 3291, ++ 3293, 3294, 3274, 3275, 3277, 3278, 3279, 3282, 3295, 3296, ++ 3298, 3299, 3300, 3301, 3302, 3306, 3307, 3308, 3309, 3310, ++ 3313, 3283, 3284, 3286, 3288, 3289, 3290, 3291, 3293, 3294, ++ ++ 3314, 3315, 3318, 3320, 3321, 3322, 3295, 3296, 3298, 3299, ++ 3300, 3301, 3302, 3306, 3307, 3308, 3309, 3310, 3313, 3316, ++ 3323, 3324, 3325, 3326, 3327, 3329, 3330, 3316, 3314, 3315, ++ 3318, 3320, 3321, 3322, 3331, 3332, 3333, 3334, 3338, 3360, ++ 3336, 3338, 3360, 1284, 1279, 1274, 3341, 3316, 3323, 3324, ++ 3325, 3326, 3327, 3329, 3330, 3316, 3335, 3336, 3342, 3335, ++ 3343, 3335, 3331, 3332, 3333, 3334, 3335, 3337, 3339, 3335, ++ 3337, 3339, 3337, 3339, 3341, 3344, 3345, 3337, 3339, 3340, ++ 3337, 3339, 3340, 3335, 3340, 3336, 3342, 3348, 3343, 3340, ++ 3350, 3352, 3340, 3353, 3337, 3339, 3354, 3355, 3356, 3358, ++ ++ 1217, 3361, 3364, 3344, 3345, 3365, 3340, 3366, 3367, 3368, ++ 3369, 3335, 3370, 3371, 3372, 3348, 3374, 3390, 3350, 3352, ++ 3390, 3353, 3337, 3339, 3354, 3355, 3356, 3358, 3359, 3361, ++ 3364, 3359, 3409, 3365, 3340, 3366, 3367, 3368, 3369, 1216, ++ 3370, 3371, 3372, 3409, 3374, 3359, 3359, 3359, 3359, 3359, ++ 3359, 3359, 3359, 3359, 3362, 3362, 3362, 3362, 3362, 3362, ++ 3362, 3362, 3362, 3362, 3362, 3363, 3363, 3363, 3363, 3363, ++ 3363, 3363, 3363, 3363, 3363, 3363, 3376, 3378, 1215, 3362, ++ 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3377, ++ 3363, 3380, 3377, 3381, 3382, 3383, 3384, 3385, 3386, 3387, ++ ++ 3388, 3393, 3394, 1214, 3376, 3378, 3377, 3377, 3377, 3377, ++ 3377, 3377, 3377, 3377, 3377, 3391, 3396, 3392, 3391, 3380, ++ 3392, 3381, 3382, 3383, 3384, 3385, 3386, 3387, 3388, 3393, ++ 3394, 3395, 3397, 3398, 3395, 3399, 3400, 3462, 3399, 3400, ++ 3462, 3414, 1213, 3403, 3396, 3401, 3405, 3407, 3401, 3411, ++ 3412, 3413, 3414, 3415, 3416, 3418, 1212, 1208, 3419, 3420, ++ 3397, 3398, 3401, 3401, 3401, 3401, 3401, 3401, 3401, 3401, ++ 3401, 3403, 3421, 3422, 3405, 3407, 3417, 3411, 3412, 3413, ++ 3423, 3415, 3416, 3418, 3417, 3417, 3419, 3420, 3424, 3425, ++ 3426, 3427, 3428, 3429, 3430, 3431, 3432, 3434, 3435, 3436, ++ ++ 3421, 3422, 3437, 3438, 3417, 3439, 3440, 3439, 3423, 3441, ++ 3442, 3444, 3417, 3417, 3445, 1207, 3424, 3425, 3426, 3427, ++ 3428, 3429, 3430, 3431, 3432, 3434, 3435, 3436, 3447, 3448, ++ 3437, 3438, 3449, 3451, 3440, 3453, 3457, 3441, 3442, 3444, ++ 3446, 3459, 3445, 3446, 3464, 3446, 3465, 3466, 3467, 3487, ++ 3446, 3497, 3487, 3446, 3497, 3547, 3447, 3448, 3547, 3555, ++ 3449, 3451, 3555, 3453, 3457, 3468, 3469, 3446, 3470, 3459, ++ 3472, 3473, 3464, 3476, 3465, 3466, 3467, 3439, 3460, 3460, ++ 3460, 3460, 3460, 3460, 3460, 3460, 3460, 3461, 3559, 3463, ++ 3461, 3559, 3461, 3468, 3469, 3446, 3470, 3488, 3472, 3473, ++ ++ 3488, 3476, 3488, 1206, 3461, 3461, 3461, 3461, 3461, 3461, ++ 3461, 3461, 3461, 3463, 3463, 3463, 3463, 3463, 3463, 3463, ++ 3463, 3463, 3463, 3463, 3475, 3475, 3475, 3475, 3475, 3475, ++ 3475, 3475, 3475, 3477, 3478, 3479, 3480, 3481, 3463, 3482, ++ 3481, 3483, 3484, 3485, 3489, 3490, 3491, 3489, 3492, 3489, ++ 3493, 3492, 3494, 3492, 3495, 3500, 3632, 3635, 1192, 3632, ++ 3635, 3477, 3478, 3479, 3480, 3677, 3481, 3482, 3505, 3483, ++ 3484, 3485, 3573, 3490, 3491, 3573, 3677, 3573, 3493, 1190, ++ 3494, 3498, 3495, 3500, 3498, 3499, 3499, 3499, 3499, 3499, ++ 3499, 3499, 3499, 3499, 3481, 3506, 3505, 3507, 3498, 3498, ++ ++ 3498, 3498, 3498, 3498, 3498, 3498, 3498, 3504, 3509, 3510, ++ 3511, 3512, 3513, 3504, 3514, 3515, 3517, 3520, 3522, 3523, ++ 3524, 3525, 3526, 3506, 3529, 3507, 3530, 3532, 3533, 3576, ++ 3774, 1185, 3576, 3774, 3576, 3504, 3509, 3510, 3511, 3512, ++ 3513, 3504, 3514, 3515, 3517, 3520, 3522, 3523, 3524, 3525, ++ 3526, 3535, 3529, 3536, 3530, 3532, 3533, 3534, 3534, 3534, ++ 3534, 3534, 3534, 3534, 3534, 3534, 3534, 3534, 3537, 3540, ++ 3541, 3542, 3543, 3545, 3546, 3638, 1157, 1152, 3638, 3535, ++ 3638, 3536, 3534, 3548, 3548, 3548, 3548, 3548, 3548, 3548, ++ 3548, 3548, 3552, 3553, 3554, 3556, 3537, 3540, 3541, 3542, ++ ++ 3543, 3545, 3546, 3549, 3549, 3549, 3549, 3549, 3549, 3549, ++ 3549, 3549, 3550, 3557, 3558, 3550, 3560, 3561, 3562, 3564, ++ 3552, 3553, 3554, 3556, 3565, 3567, 3568, 3569, 3571, 3550, ++ 3550, 3550, 3550, 3550, 3550, 3550, 3550, 3550, 3578, 3579, ++ 3566, 3557, 3558, 3566, 3560, 3561, 3562, 3564, 3570, 1142, ++ 3581, 3570, 3565, 3567, 3568, 3569, 3571, 3566, 3566, 3566, ++ 3566, 3566, 3566, 3566, 3566, 3566, 3578, 3579, 3582, 3583, ++ 3584, 3588, 3589, 3590, 3592, 3594, 3595, 3570, 3581, 3596, ++ 3597, 3598, 3599, 3600, 3584, 3584, 3584, 3584, 3584, 3584, ++ 3584, 3584, 3584, 1131, 1129, 3585, 3582, 3583, 3585, 3588, ++ ++ 3589, 3590, 3592, 3594, 3595, 3570, 3601, 3596, 3597, 3598, ++ 3599, 3600, 3585, 3585, 3585, 3585, 3585, 3585, 3585, 3585, ++ 3585, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, ++ 3602, 3603, 3604, 3605, 3601, 3606, 3607, 3608, 3611, 3615, ++ 1127, 3617, 3618, 3616, 3616, 3616, 3616, 3616, 3616, 3616, ++ 3616, 3616, 3616, 3616, 3619, 3622, 3624, 3625, 3602, 3603, ++ 3604, 3605, 1126, 3606, 3607, 3608, 3611, 3615, 3616, 3617, ++ 3618, 3775, 1112, 3628, 3775, 3628, 3628, 3629, 3628, 3631, ++ 3633, 1111, 3619, 3622, 3624, 3625, 3628, 3637, 3639, 3629, ++ 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3630, 3630, ++ ++ 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3631, 3633, 3634, ++ 3640, 3641, 3634, 3642, 3643, 3637, 3639, 3644, 3644, 3644, ++ 3644, 3644, 3644, 3644, 3644, 3644, 3634, 3634, 3634, 3634, ++ 3634, 3634, 3634, 3634, 3634, 3645, 3646, 1107, 3640, 3641, ++ 3701, 3642, 3643, 3701, 1106, 3701, 3649, 3650, 3648, 3653, ++ 3654, 3648, 3658, 3659, 3654, 3660, 3662, 3628, 3663, 3664, ++ 3666, 3654, 1105, 3645, 3646, 3648, 3648, 3648, 3648, 3648, ++ 3648, 3648, 3648, 3648, 3649, 3650, 3661, 3653, 3654, 3667, ++ 3658, 3659, 3654, 3660, 3662, 3668, 3663, 3664, 3666, 3654, ++ 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3669, ++ ++ 3670, 3671, 3672, 3673, 3674, 3675, 3676, 3667, 3678, 3679, ++ 3681, 3687, 3689, 3668, 3691, 3693, 1104, 3700, 3704, 3678, ++ 1103, 3704, 1063, 3704, 3702, 3740, 3709, 3669, 3670, 3671, ++ 3672, 3673, 3674, 3675, 3676, 1011, 3740, 3679, 3681, 3687, ++ 3689, 1010, 3691, 3693, 3694, 3700, 3694, 3694, 3695, 3694, ++ 3695, 3695, 3702, 3695, 3709, 3707, 3710, 3694, 3707, 3711, ++ 3707, 3695, 3703, 3703, 3703, 3703, 3703, 3703, 3703, 3703, ++ 3703, 3712, 3713, 3714, 3715, 3716, 3716, 3716, 3716, 3716, ++ 3716, 3716, 3716, 3716, 3710, 3717, 3718, 3711, 3721, 3722, ++ 3723, 3724, 3726, 3728, 3729, 3730, 3731, 3732, 3733, 3712, ++ ++ 3713, 3714, 3715, 3734, 3748, 3735, 3736, 3738, 3739, 3741, ++ 3743, 3744, 3747, 3717, 3718, 3748, 3721, 3722, 3723, 3724, ++ 3752, 3728, 3729, 3730, 3731, 3732, 3733, 3754, 3694, 3758, ++ 3755, 3734, 3695, 3735, 3736, 3738, 3739, 3741, 3743, 3744, ++ 3747, 3755, 3726, 3762, 3760, 3765, 3766, 3760, 3752, 3760, ++ 3767, 3768, 3769, 3770, 3771, 3754, 3772, 3758, 3755, 3773, ++ 3776, 3777, 3773, 3778, 3779, 990, 3780, 3782, 3783, 3755, ++ 3785, 3786, 3787, 3765, 3766, 3788, 3789, 3791, 3767, 3768, ++ 3769, 3770, 3771, 3792, 3772, 3804, 3796, 3797, 3776, 3777, ++ 3798, 3799, 3779, 3762, 3780, 3782, 3783, 3801, 3785, 3786, ++ ++ 3787, 3806, 3808, 3788, 3789, 3791, 3773, 977, 3809, 3811, ++ 3812, 3792, 3813, 3778, 3796, 3797, 3814, 3815, 3798, 3799, ++ 3816, 3817, 3822, 3816, 3818, 3801, 3823, 3818, 3819, 3818, ++ 3808, 3819, 3824, 3819, 3773, 3804, 3809, 3811, 3812, 3820, ++ 3813, 3825, 3820, 3821, 3814, 3815, 3821, 3826, 3829, 3817, ++ 3822, 3806, 3830, 3831, 3823, 3832, 3833, 3834, 3837, 3838, ++ 3824, 3841, 3838, 3843, 3844, 3845, 3846, 3848, 3849, 3825, ++ 3851, 3852, 3875, 3851, 3853, 3826, 3829, 3853, 3860, 3853, ++ 3830, 3831, 3862, 3832, 3833, 3834, 3837, 3863, 3864, 3866, ++ 3867, 3843, 3844, 3845, 3846, 3848, 3849, 3855, 3857, 3852, ++ ++ 3855, 3857, 3855, 3857, 3858, 3868, 3860, 3858, 3869, 3858, ++ 3862, 3841, 3870, 3871, 3876, 3863, 3864, 3866, 3867, 3878, ++ 3874, 3879, 3875, 3874, 3871, 3874, 3877, 3871, 3880, 3877, ++ 3882, 3880, 3885, 3868, 3890, 3885, 3869, 3885, 3891, 3892, ++ 3870, 3871, 3876, 3887, 3893, 3894, 3887, 3878, 3887, 3879, ++ 3895, 3896, 3871, 3897, 3898, 3871, 3899, 3900, 3882, 3906, ++ 3904, 3908, 3890, 3904, 3908, 3904, 3891, 3892, 966, 3909, ++ 3911, 3907, 3893, 3894, 3907, 946, 928, 3932, 3895, 3896, ++ 3932, 3897, 3898, 3910, 3899, 3900, 3910, 3906, 3907, 3907, ++ 3907, 3907, 3907, 3907, 3907, 3907, 3907, 3909, 3911, 3916, ++ ++ 3910, 3910, 3910, 3910, 3910, 3910, 3910, 3910, 3910, 3917, ++ 3918, 3921, 3923, 3924, 3925, 3926, 3930, 3930, 3930, 3930, ++ 3930, 3930, 3930, 3930, 3930, 903, 891, 3916, 3931, 880, ++ 878, 3931, 876, 872, 828, 3934, 3937, 3917, 3918, 3921, ++ 3923, 3924, 3925, 3926, 3938, 3931, 3931, 3931, 3931, 3931, ++ 3931, 3931, 3931, 3931, 3933, 3933, 3933, 3933, 3933, 3933, ++ 3933, 3933, 3933, 3934, 3937, 3939, 3942, 3943, 3951, 3954, ++ 3956, 817, 3938, 3946, 3946, 3946, 3946, 3946, 3946, 3946, ++ 3946, 3946, 3947, 808, 804, 3947, 773, 772, 770, 3957, ++ 3958, 3959, 3961, 3939, 3942, 3943, 3951, 3954, 3956, 3947, ++ ++ 3947, 3947, 3947, 3947, 3947, 3947, 3947, 3947, 3955, 3955, ++ 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3957, 3958, 3959, ++ 3961, 3962, 3963, 769, 768, 766, 761, 760, 758, 757, ++ 756, 750, 743, 732, 731, 712, 700, 689, 677, 676, ++ 671, 670, 668, 661, 651, 650, 648, 644, 634, 3962, ++ 3963, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, ++ 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3967, ++ 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, ++ 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3968, 3968, 3968, + 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3968, +- 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3969, 3969, 3969, ++ ++ 3968, 3968, 3968, 3968, 3968, 3969, 3969, 3969, 3969, 3969, + 3969, 3969, 3969, 3969, 3969, 3969, 3969, 3969, 3969, 3969, +- 3969, 3969, 3969, 3969, 3969, 3970, 3970, 3970, 3970, 3970, ++ 3969, 3969, 3969, 3970, 3970, 3970, 3970, 3970, 3970, 3970, + 3970, 3970, 3970, 3970, 3970, 3970, 3970, 3970, 3970, 3970, +- 3970, 3970, 3970, 3971, 3971, 3971, 3971, 3971, 3971, 3971, +- 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, +- 3971, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, +- 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3973, ++ 3970, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, ++ 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3972, ++ 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, ++ 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3973, 3973, 3973, + 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3973, ++ 3973, 3973, 3973, 3973, 3973, 3974, 3974, 3974, 3974, 3974, + +- 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3974, 3974, 3974, + 3974, 3974, 3974, 3974, 3974, 3974, 3974, 3974, 3974, 3974, +- 3974, 3974, 3974, 3974, 3974, 3975, 3975, 3975, 3975, 3975, ++ 3974, 3974, 3974, 3975, 3975, 3975, 3975, 3975, 3975, 3975, + 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, +- 3975, 3975, 3975, 3976, 3976, 627, 3976, 3976, 3976, 3976, +- 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, +- 3976, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, +- 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3978, ++ 3975, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, ++ 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3977, ++ 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, ++ 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3978, 3978, 3978, + 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3978, +- 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3979, 3979, 3979, +- ++ 3978, 3978, 3978, 3978, 3978, 3979, 3979, 3979, 3979, 3979, + 3979, 3979, 3979, 3979, 3979, 3979, 3979, 3979, 3979, 3979, +- 3979, 3979, 3979, 3979, 3979, 3980, 3980, 3980, 3980, 3980, ++ ++ 3979, 3979, 3979, 3980, 3980, 3980, 3980, 3980, 3980, 3980, + 3980, 3980, 3980, 3980, 3980, 3980, 3980, 3980, 3980, 3980, +- 3980, 3980, 3980, 3981, 3981, 3981, 3981, 3981, 3981, 3981, +- 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, +- 3981, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, +- 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3983, ++ 3980, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, ++ 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3982, ++ 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, ++ 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3983, 3983, 3983, + 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, +- 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3984, 3984, 3984, ++ 3983, 3983, 3983, 3983, 3983, 3984, 3984, 3984, 3984, 3984, + 3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, ++ 3984, 3984, 3984, 3985, 3985, 3985, 3985, 3985, 3985, 3985, + +- 3984, 3984, 3984, 3984, 3984, 3985, 3985, 3985, 3985, 3985, + 3985, 3985, 3985, 3985, 3985, 3985, 3985, 3985, 3985, 3985, +- 3985, 3985, 3985, 3986, 3986, 3986, 3986, 3986, 3986, 3986, +- 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, +- 3986, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, +- 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3988, ++ 3985, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, ++ 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3987, ++ 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, ++ 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3988, 3988, 3988, + 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3988, +- 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3989, 3989, 3989, ++ 3988, 3988, 3988, 3988, 3988, 3989, 3989, 633, 3989, 3989, + 3989, 3989, 3989, 3989, 3989, 3989, 3989, 3989, 3989, 3989, +- 3989, 3989, 3989, 3989, 3989, 3990, 3990, 3990, 3990, 3990, +- ++ 3989, 3989, 3989, 3990, 3990, 3990, 3990, 3990, 3990, 3990, + 3990, 3990, 3990, 3990, 3990, 3990, 3990, 3990, 3990, 3990, +- 3990, 3990, 3990, 3991, 3991, 3991, 3991, 3991, 3991, 3991, +- 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, +- 3991, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, +- 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3993, ++ ++ 3990, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, ++ 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3992, ++ 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, ++ 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3993, 3993, 3993, + 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3993, +- 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3994, 3994, 625, ++ 3993, 3993, 3993, 3993, 3993, 3994, 3994, 3994, 3994, 3994, + 3994, 3994, 3994, 3994, 3994, 3994, 3994, 3994, 3994, 3994, +- 3994, 3994, 3994, 3994, 3994, 3995, 3995, 622, 3995, 3995, ++ 3994, 3994, 3994, 3995, 3995, 3995, 3995, 3995, 3995, 3995, + 3995, 3995, 3995, 3995, 3995, 3995, 3995, 3995, 3995, 3995, ++ 3995, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, + +- 3995, 3995, 3995, 3996, 3996, 621, 3996, 3996, 3996, 3996, +- 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, +- 3996, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, +- 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3998, ++ 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3997, ++ 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, ++ 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3998, 3998, 3998, + 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3998, +- 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3999, 3999, 3999, ++ 3998, 3998, 3998, 3998, 3998, 3999, 3999, 3999, 3999, 3999, + 3999, 3999, 3999, 3999, 3999, 3999, 3999, 3999, 3999, 3999, +- 3999, 3999, 3999, 3999, 3999, 4000, 4000, 4000, 4000, 4000, ++ 3999, 3999, 3999, 4000, 4000, 4000, 4000, 4000, 4000, 4000, + 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, +- 4000, 4000, 4000, 4001, 4001, 541, 4001, 4001, 4001, 4001, ++ 4000, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, ++ 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4002, + +- 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, +- 4001, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, +- 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4003, ++ 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, ++ 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4003, 4003, 4003, + 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4003, +- 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4004, 4004, 4004, ++ 4003, 4003, 4003, 4003, 4003, 4004, 4004, 4004, 4004, 4004, + 4004, 4004, 4004, 4004, 4004, 4004, 4004, 4004, 4004, 4004, +- 4004, 4004, 4004, 537, 4004, 4005, 4005, 4005, 4005, 4005, ++ 4004, 4004, 4004, 4005, 4005, 4005, 4005, 4005, 4005, 4005, + 4005, 4005, 4005, 4005, 4005, 4005, 4005, 4005, 4005, 4005, +- 4005, 4005, 4005, 4006, 4006, 4006, 4006, 4006, 4006, 4006, +- 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 536, ++ 4005, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, ++ 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4007, ++ 4007, 631, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, + +- 4006, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, +- 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4008, ++ 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4008, 4008, 628, + 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4008, +- 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4009, 4009, 4009, ++ 4008, 4008, 4008, 4008, 4008, 4009, 4009, 627, 4009, 4009, + 4009, 4009, 4009, 4009, 4009, 4009, 4009, 4009, 4009, 4009, +- 4009, 4009, 4009, 4009, 4009, 4010, 4010, 4010, 4010, 4010, ++ 4009, 4009, 4009, 4010, 4010, 4010, 4010, 4010, 4010, 4010, + 4010, 4010, 4010, 4010, 4010, 4010, 4010, 4010, 4010, 4010, +- 4010, 4010, 4010, 4011, 530, 4011, 4011, 529, 513, 4011, +- 4011, 4011, 4011, 4011, 512, 4011, 4011, 4011, 4011, 4011, ++ 4010, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, ++ 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4012, + 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, ++ 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4013, 4013, 4013, + +- 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4013, 4013, + 4013, 4013, 4013, 4013, 4013, 4013, 4013, 4013, 4013, 4013, +- 4013, 4013, 4013, 4013, 506, 4013, 4014, 4014, 4014, 4014, ++ 4013, 4013, 4013, 4013, 4013, 4014, 4014, 625, 4014, 4014, + 4014, 4014, 4014, 4014, 4014, 4014, 4014, 4014, 4014, 4014, +- 4014, 4014, 4014, 4014, 4015, 4015, 4015, 4015, 4015, 4015, ++ 4014, 4014, 4014, 4015, 4015, 4015, 4015, 4015, 4015, 4015, + 4015, 4015, 4015, 4015, 4015, 4015, 4015, 4015, 4015, 4015, +- 4015, 4015, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, +- 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, +- 4017, 504, 4017, 4017, 490, 478, 4017, 4017, 4017, 4017, +- 4017, 475, 4017, 4017, 4017, 4017, 4017, 4018, 4018, 4018, +- ++ 4015, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, ++ 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4017, ++ 4017, 4017, 4017, 4017, 4017, 4017, 4017, 4017, 4017, 4017, ++ 4017, 4017, 4017, 4017, 4017, 622, 4017, 4018, 4018, 4018, + 4018, 4018, 4018, 4018, 4018, 4018, 4018, 4018, 4018, 4018, ++ + 4018, 4018, 4018, 4018, 4018, 4019, 4019, 4019, 4019, 4019, + 4019, 4019, 4019, 4019, 4019, 4019, 4019, 4019, 4019, 4019, +- 4019, 453, 4019, 4020, 4020, 4020, 4020, 4020, 4020, 4020, ++ 4019, 621, 4019, 4020, 4020, 4020, 4020, 4020, 4020, 4020, + 4020, 4020, 4020, 4020, 4020, 4020, 4020, 4020, 4020, 4020, + 4020, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, + 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4022, + 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4022, + 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4023, 4023, 4023, + 4023, 4023, 4023, 4023, 4023, 4023, 4023, 4023, 4023, 4023, ++ 4023, 4023, 4023, 4023, 4023, 4024, 541, 4024, 4024, 537, + +- 4023, 4023, 4023, 440, 4023, 4024, 4024, 434, 4024, 4024, +- 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, +- 4024, 4024, 4024, 4025, 4025, 422, 4025, 4025, 4025, 4025, ++ 536, 4024, 4024, 4024, 4024, 4024, 530, 4024, 4024, 4024, ++ 4024, 4024, 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, + 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, +- 4025, 4026, 4026, 413, 4026, 4026, 4026, 4026, 4026, 4026, +- 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4027, ++ 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, ++ 4026, 4026, 4026, 4026, 4026, 4026, 529, 4026, 4027, 4027, + 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4027, +- 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4028, 4028, 4028, ++ 4027, 4027, 4027, 4027, 4027, 4027, 4028, 4028, 4028, 4028, + 4028, 4028, 4028, 4028, 4028, 4028, 4028, 4028, 4028, 4028, +- 4028, 4028, 4028, 412, 4028, 4029, 4029, 4029, 4029, 4029, +- ++ 4028, 4028, 4028, 4028, 4029, 4029, 4029, 4029, 4029, 4029, + 4029, 4029, 4029, 4029, 4029, 4029, 4029, 4029, 4029, 4029, +- 4029, 4029, 4029, 4030, 4030, 4030, 4030, 4030, 4030, 4030, +- 4030, 4030, 4030, 4030, 4030, 4030, 4030, 4030, 4030, 393, +- 4030, 4031, 4031, 392, 4031, 4031, 4031, 4031, 4031, 4031, +- 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4032, ++ ++ 4029, 4029, 4030, 513, 4030, 4030, 512, 506, 4030, 4030, ++ 4030, 4030, 4030, 504, 4030, 4030, 4030, 4030, 4030, 4031, ++ 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, ++ 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4032, 4032, 4032, + 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4032, +- 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4033, 4033, 4033, ++ 4032, 4032, 4032, 490, 4032, 4033, 4033, 4033, 4033, 4033, + 4033, 4033, 4033, 4033, 4033, 4033, 4033, 4033, 4033, 4033, +- 4033, 4033, 4033, 4033, 4033, 4034, 4034, 4034, 4034, 4034, ++ 4033, 4033, 4033, 4034, 4034, 4034, 4034, 4034, 4034, 4034, + 4034, 4034, 4034, 4034, 4034, 4034, 4034, 4034, 4034, 4034, ++ 4034, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, + +- 4034, 4034, 4034, 4035, 4035, 4035, 4035, 4035, 4035, 4035, +- 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, +- 4035, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, +- 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4037, ++ 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4036, ++ 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, ++ 4036, 4036, 4036, 4036, 4036, 478, 4036, 4037, 4037, 475, + 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4037, +- 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4038, 385, 4038, +- 4038, 383, 368, 4038, 4038, 4038, 4038, 4038, 367, 4038, +- 4038, 4038, 4038, 4038, 4038, 4039, 358, 4039, 4039, 357, +- 347, 4039, 4039, 4039, 4039, 4039, 317, 4039, 4039, 4039, +- 4039, 4039, 4039, 4040, 4040, 4040, 4040, 4040, 4040, 4040, +- +- 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, +- 4040, 4041, 316, 4041, 4041, 284, 268, 4041, 4041, 4041, +- 4041, 4041, 261, 4041, 4041, 4041, 4041, 4041, 4042, 4042, ++ 4037, 4037, 4037, 4037, 4037, 4038, 4038, 453, 4038, 4038, ++ 4038, 4038, 4038, 4038, 4038, 4038, 4038, 4038, 4038, 4038, ++ 4038, 4038, 4038, 4039, 4039, 440, 4039, 4039, 4039, 4039, ++ 4039, 4039, 4039, 4039, 4039, 4039, 4039, 4039, 4039, 4039, ++ 4039, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, ++ 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4041, ++ ++ 4041, 4041, 4041, 4041, 4041, 4041, 4041, 4041, 4041, 4041, ++ 4041, 4041, 4041, 4041, 4041, 434, 4041, 4042, 4042, 4042, + 4042, 4042, 4042, 4042, 4042, 4042, 4042, 4042, 4042, 4042, +- 4042, 4042, 4042, 4042, 4042, 4042, 4043, 4043, 4043, 4043, ++ 4042, 4042, 4042, 4042, 4042, 4043, 4043, 4043, 4043, 4043, + 4043, 4043, 4043, 4043, 4043, 4043, 4043, 4043, 4043, 4043, +- 4043, 4043, 4043, 4043, 4044, 4044, 4044, 4044, 4044, 4044, ++ 4043, 422, 4043, 4044, 4044, 413, 4044, 4044, 4044, 4044, + 4044, 4044, 4044, 4044, 4044, 4044, 4044, 4044, 4044, 4044, +- 4044, 4044, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, +- 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, ++ 4044, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, ++ 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4046, ++ 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4046, + +- 4046, 259, 4046, 4046, 252, 234, 4046, 4046, 4046, 4046, +- 4046, 229, 4046, 4046, 4046, 4046, 4046, 4046, 4047, 4047, ++ 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4047, 4047, 4047, + 4047, 4047, 4047, 4047, 4047, 4047, 4047, 4047, 4047, 4047, +- 4047, 4047, 4047, 4047, 4047, 4047, 4048, 4048, 4048, 4048, ++ 4047, 4047, 4047, 4047, 4047, 4048, 4048, 4048, 4048, 4048, + 4048, 4048, 4048, 4048, 4048, 4048, 4048, 4048, 4048, 4048, +- 4048, 4048, 4048, 4048, 4049, 216, 4049, 4049, 194, 182, +- 4049, 4049, 4049, 4049, 4049, 175, 4049, 4049, 4049, 4049, ++ 4048, 4048, 4048, 4049, 4049, 4049, 4049, 4049, 4049, 4049, ++ 4049, 4049, 4049, 4049, 4049, 4049, 4049, 4049, 4049, 4049, + 4049, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, + 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4051, +- 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4051, ++ 412, 4051, 4051, 393, 392, 4051, 4051, 4051, 4051, 4051, ++ 385, 4051, 4051, 4051, 4051, 4051, 4051, 4052, 383, 4052, + +- 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4052, 4052, 4052, +- 4052, 4052, 4052, 4052, 4052, 4052, 4052, 4052, 4052, 4052, ++ 4052, 368, 367, 4052, 4052, 4052, 4052, 4052, 358, 4052, + 4052, 4052, 4052, 4052, 4052, 4053, 4053, 4053, 4053, 4053, + 4053, 4053, 4053, 4053, 4053, 4053, 4053, 4053, 4053, 4053, +- 4053, 4053, 4053, 4054, 4054, 4054, 4054, 4054, 4054, 4054, +- 4054, 4054, 4054, 4054, 4054, 4054, 4054, 4054, 4054, 4054, +- 4054, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, +- 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4056, ++ 4053, 4053, 4053, 4054, 357, 4054, 4054, 347, 317, 4054, ++ 4054, 4054, 4054, 4054, 316, 4054, 4054, 4054, 4054, 4054, ++ 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, ++ 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4056, 4056, + 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4056, +- 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4057, 4057, 4057, +- ++ 4056, 4056, 4056, 4056, 4056, 4056, 4057, 4057, 4057, 4057, + 4057, 4057, 4057, 4057, 4057, 4057, 4057, 4057, 4057, 4057, +- 4057, 4057, 4057, 4057, 4057, 4058, 4058, 4058, 4058, 4058, ++ ++ 4057, 4057, 4057, 4057, 4058, 4058, 4058, 4058, 4058, 4058, + 4058, 4058, 4058, 4058, 4058, 4058, 4058, 4058, 4058, 4058, +- 4058, 4058, 4058, 4059, 4059, 4059, 4059, 4059, 4059, 4059, +- 4059, 4059, 4059, 4059, 4059, 4059, 4059, 4059, 4059, 4059, +- 4059, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, +- 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4061, +- 4061, 172, 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, +- 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4062, 4062, 4062, +- 4062, 4062, 4062, 4062, 4062, 4062, 4062, 4062, 4062, 4062, +- +- 4062, 4062, 4062, 4062, 4062, 4063, 4063, 4063, 4063, 4063, ++ 4058, 4058, 4059, 284, 4059, 4059, 268, 261, 4059, 4059, ++ 4059, 4059, 4059, 259, 4059, 4059, 4059, 4059, 4059, 4059, ++ 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, ++ 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4061, 4061, ++ 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, ++ 4061, 4061, 4061, 4061, 4061, 4061, 4062, 252, 4062, 4062, ++ 234, 229, 4062, 4062, 4062, 4062, 4062, 216, 4062, 4062, ++ 4062, 4062, 4062, 4063, 4063, 4063, 4063, 4063, 4063, 4063, ++ + 4063, 4063, 4063, 4063, 4063, 4063, 4063, 4063, 4063, 4063, +- 4063, 4063, 4063, 4064, 4064, 4064, 4064, 4064, 4064, 4064, +- 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, +- 4064, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, +- 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4066, +- 165, 4066, 4066, 164, 163, 4066, 4066, 4066, 4066, 4066, +- 154, 4066, 4066, 4066, 4066, 4066, 4066, 4067, 152, 4067, +- 4067, 146, 141, 4067, 4067, 4067, 4067, 4067, 117, 4067, +- 4067, 4067, 4067, 4067, 4067, 4068, 75, 4068, 4068, 64, +- +- 63, 4068, 4068, 4068, 4068, 4068, 58, 4068, 4068, 4068, +- 4068, 4068, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, +- 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, +- 4070, 57, 4070, 4070, 56, 55, 4070, 4070, 4070, 4070, +- 4070, 54, 4070, 4070, 4070, 4070, 4070, 4070, 4071, 4071, ++ 4063, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, ++ 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4065, ++ 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, ++ 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4066, 4066, 4066, ++ 4066, 4066, 4066, 4066, 4066, 4066, 4066, 4066, 4066, 4066, ++ 4066, 4066, 4066, 4066, 4066, 4067, 4067, 4067, 4067, 4067, ++ 4067, 4067, 4067, 4067, 4067, 4067, 4067, 4067, 4067, 4067, ++ 4067, 4067, 4067, 4068, 4068, 4068, 4068, 4068, 4068, 4068, ++ 4068, 4068, 4068, 4068, 4068, 4068, 4068, 4068, 4068, 4068, ++ ++ 4068, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, ++ 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4070, ++ 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4070, ++ 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4071, 4071, 4071, + 4071, 4071, 4071, 4071, 4071, 4071, 4071, 4071, 4071, 4071, +- 4071, 4071, 4071, 4071, 4071, 4071, 4072, 53, 4072, 4072, +- 52, 51, 4072, 4072, 4072, 4072, 4072, 26, 4072, 4072, +- 4072, 4072, 4072, 4072, 4073, 4073, 4073, 4073, 4073, 4073, ++ 4071, 4071, 4071, 4071, 4071, 4072, 4072, 4072, 4072, 4072, ++ 4072, 4072, 4072, 4072, 4072, 4072, 4072, 4072, 4072, 4072, ++ 4072, 4072, 4072, 4073, 4073, 4073, 4073, 4073, 4073, 4073, + 4073, 4073, 4073, 4073, 4073, 4073, 4073, 4073, 4073, 4073, ++ 4073, 4074, 4074, 194, 4074, 4074, 4074, 4074, 4074, 4074, + +- 4073, 4073, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, +- 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, +- 4075, 25, 4075, 4075, 24, 23, 4075, 4075, 4075, 4075, +- 4075, 0, 4075, 4075, 4075, 4075, 4075, 4076, 4076, 4076, ++ 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4075, ++ 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4075, ++ 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4076, 4076, 4076, + 4076, 4076, 4076, 4076, 4076, 4076, 4076, 4076, 4076, 4076, + 4076, 4076, 4076, 4076, 4076, 4077, 4077, 4077, 4077, 4077, + 4077, 4077, 4077, 4077, 4077, 4077, 4077, 4077, 4077, 4077, + 4077, 4077, 4077, 4078, 4078, 4078, 4078, 4078, 4078, 4078, + 4078, 4078, 4078, 4078, 4078, 4078, 4078, 4078, 4078, 4078, +- 4078, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4079, ++ 4078, 4079, 182, 4079, 4079, 175, 172, 4079, 4079, 4079, ++ 4079, 4079, 165, 4079, 4079, 4079, 4079, 4079, 4079, 4080, + +- 0, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4080, +- 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4080, +- 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4081, 4081, 4081, +- 4081, 4081, 4081, 4081, 4081, 4081, 4081, 4081, 4081, 4081, +- 4081, 4081, 4081, 4081, 4081, 4082, 4082, 4082, 4082, 4082, ++ 164, 4080, 4080, 163, 154, 4080, 4080, 4080, 4080, 4080, ++ 152, 4080, 4080, 4080, 4080, 4080, 4080, 4081, 146, 4081, ++ 4081, 141, 117, 4081, 4081, 4081, 4081, 4081, 75, 4081, ++ 4081, 4081, 4081, 4081, 4082, 4082, 4082, 4082, 4082, 4082, + 4082, 4082, 4082, 4082, 4082, 4082, 4082, 4082, 4082, 4082, +- 4082, 4082, 4082, 4083, 4083, 4083, 4083, 4083, 4083, 4083, +- 4083, 4083, 4083, 4083, 4083, 4083, 4083, 4083, 4083, 4083, +- 4083, 4084, 4084, 0, 4084, 4084, 4084, 4084, 4084, 4084, +- 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4085, ++ 4082, 4082, 4083, 64, 4083, 4083, 63, 58, 4083, 4083, ++ 4083, 4083, 4083, 57, 4083, 4083, 4083, 4083, 4083, 4083, ++ 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, ++ 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4085, 56, ++ 4085, 4085, 55, 54, 4085, 4085, 4085, 4085, 4085, 53, + +- 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4085, +- 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4086, 4086, 4086, ++ 4085, 4085, 4085, 4085, 4085, 4085, 4086, 4086, 4086, 4086, + 4086, 4086, 4086, 4086, 4086, 4086, 4086, 4086, 4086, 4086, +- 4086, 4086, 4086, 4086, 4086, 4087, 4087, 4087, 4087, 4087, ++ 4086, 4086, 4086, 4086, 4087, 4087, 4087, 4087, 4087, 4087, + 4087, 4087, 4087, 4087, 4087, 4087, 4087, 4087, 4087, 4087, +- 4087, 4087, 4087, 4088, 0, 4088, 4088, 0, 0, 4088, +- 4088, 4088, 4088, 4088, 0, 4088, 4088, 4088, 4088, 4088, +- 4088, 4089, 0, 4089, 4089, 0, 0, 4089, 4089, 4089, +- 4089, 4089, 0, 4089, 4089, 4089, 4089, 4089, 4089, 4090, ++ 4087, 4087, 4088, 52, 4088, 4088, 51, 26, 4088, 4088, ++ 4088, 4088, 4088, 25, 4088, 4088, 4088, 4088, 4088, 4089, ++ 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4089, ++ 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4090, 4090, 4090, + 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4090, ++ 4090, 4090, 4090, 4090, 4090, 4091, 4091, 4091, 4091, 4091, + +- 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4091, 0, 4091, +- 4091, 0, 0, 4091, 4091, 4091, 4091, 4091, 0, 4091, +- 4091, 4091, 4091, 4091, 4091, 4092, 4092, 4092, 4092, 4092, +- 4092, 4092, 4092, 4092, 4092, 4092, 4092, 4092, 4092, 4092, +- 4092, 4092, 4092, 4093, 0, 4093, 4093, 0, 0, 4093, +- 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, ++ 4091, 4091, 4091, 4091, 4091, 4091, 4091, 4091, 4091, 4091, ++ 4091, 4091, 4091, 4092, 4092, 4092, 4092, 4092, 4092, 4092, ++ 4092, 4092, 24, 4092, 4092, 4092, 4092, 4092, 4092, 4092, ++ 4092, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, ++ 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4094, + 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, +- 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4095, 4095, ++ 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4095, 4095, 4095, + 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, +- 4095, 4095, 4095, 4095, 4095, 4095, 4096, 0, 4096, 4096, ++ 4095, 4095, 4095, 4095, 4095, 4096, 4096, 4096, 4096, 4096, ++ 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, + +- 0, 0, 4096, 4096, 4096, 0, 4096, 4096, 4096, 4096, +- 4096, 4096, 4096, 4096, 4097, 4097, 4097, 4097, 4097, 4097, +- 4097, 0, 4097, 0, 4097, 4097, 4097, 4097, 4097, 4097, +- 4097, 4097, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, +- 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, ++ 4096, 4096, 4096, 4097, 4097, 23, 4097, 4097, 4097, 4097, ++ 4097, 4097, 4097, 4097, 4097, 4097, 4097, 4097, 4097, 4097, ++ 4097, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, ++ 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4099, + 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, +- 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4100, 4100, ++ 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4100, 4100, 4100, + 4100, 4100, 4100, 4100, 4100, 4100, 4100, 4100, 4100, 4100, +- 4100, 4100, 4100, 4100, 4100, 4100, 4101, 4101, 4101, 4101, +- 4101, 4101, 4101, 4101, 4101, 4101, 4101, 4101, 4101, 4101, +- +- 4101, 4101, 4101, 4101, 4102, 4102, 0, 4102, 4102, 4102, +- 4102, 4102, 4102, 4102, 4102, 4102, 4102, 4102, 4102, 4102, +- 4102, 4102, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, +- 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, +- 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, +- 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4105, 0, +- 0, 4105, 0, 0, 4105, 4106, 0, 0, 0, 0, +- 0, 4106, 4106, 4106, 0, 4106, 4106, 4106, 4106, 4106, +- 4106, 4106, 4106, 4107, 4107, 4107, 4107, 4107, 4107, 4107, ++ 4100, 4100, 4100, 4100, 4100, 4101, 0, 4101, 4101, 0, ++ 0, 4101, 4101, 4101, 4101, 4101, 0, 4101, 4101, 4101, ++ 4101, 4101, 4101, 4102, 0, 4102, 4102, 0, 0, 4102, ++ ++ 4102, 4102, 4102, 4102, 0, 4102, 4102, 4102, 4102, 4102, ++ 4102, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, ++ 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4104, ++ 0, 4104, 4104, 0, 0, 4104, 4104, 4104, 4104, 4104, ++ 0, 4104, 4104, 4104, 4104, 4104, 4104, 4105, 4105, 4105, ++ 4105, 4105, 4105, 4105, 4105, 4105, 4105, 4105, 4105, 4105, ++ 4105, 4105, 4105, 4105, 4105, 4106, 0, 4106, 4106, 0, ++ 0, 4106, 4106, 4106, 4106, 4106, 4106, 4106, 4106, 4106, ++ 4106, 4106, 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, + 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, + +- 4107, 4108, 0, 0, 4108, 0, 4108, 4109, 4109, 4109, +- 4109, 4109, 4109, 4109, 4109, 4109, 4109, 4109, 4109, 4109, +- 4109, 4109, 4109, 4109, 4109, 4110, 0, 0, 4110, 4110, +- 0, 0, 4110, 0, 4110, 0, 4110, 4110, 4110, 4110, +- 4111, 4111, 4111, 4111, 4112, 4112, 0, 4112, 4112, 4112, ++ 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, ++ 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4109, 0, ++ 4109, 4109, 0, 0, 4109, 4109, 4109, 0, 4109, 4109, ++ 4109, 4109, 4109, 4109, 4109, 4109, 4110, 4110, 4110, 4110, ++ 4110, 4110, 4110, 0, 4110, 0, 4110, 4110, 4110, 4110, ++ 4110, 4110, 4110, 4110, 4111, 4111, 4111, 4111, 4111, 4111, ++ 4111, 4111, 4111, 4111, 4111, 4111, 4111, 4111, 4111, 4111, ++ 4111, 4111, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, + 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, +- 4112, 4112, 4113, 4113, 0, 4113, 4113, 4113, 4113, 4113, + 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, +- 4114, 0, 4114, 0, 4114, 4114, 4114, 4114, 4115, 4115, +- 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, + +- 4115, 4115, 4115, 4115, 4115, 4115, 4116, 4116, 4116, 4116, ++ 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4114, 4114, ++ 4114, 4114, 4114, 4114, 4114, 4114, 4114, 4114, 4114, 4114, ++ 4114, 4114, 4114, 4114, 4114, 4114, 4115, 4115, 0, 4115, ++ 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, ++ 4115, 4115, 4115, 4115, 4116, 4116, 4116, 4116, 4116, 4116, + 4116, 4116, 4116, 4116, 4116, 4116, 4116, 4116, 4116, 4116, +- 4116, 4116, 4116, 4116, 4117, 4117, 4117, 4117, 4117, 4117, ++ 4116, 4116, 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, + 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, +- 4117, 4117, 4118, 4118, 0, 0, 4118, 4118, 4118, 4118, +- 4118, 0, 4118, 4118, 4118, 4118, 4118, 4118, 4118, 4118, +- 4119, 0, 0, 4119, 4119, 0, 0, 4119, 0, 4119, +- 0, 4119, 4119, 4119, 4119, 4120, 4120, 4120, 4120, 4120, ++ 4118, 0, 0, 4118, 0, 0, 4118, 4119, 0, 0, ++ 0, 0, 0, 4119, 4119, 4119, 0, 4119, 4119, 4119, ++ ++ 4119, 4119, 4119, 4119, 4119, 4120, 4120, 4120, 4120, 4120, + 4120, 4120, 4120, 4120, 4120, 4120, 4120, 4120, 4120, 4120, +- 4120, 4120, 4120, 4121, 0, 4121, 4121, 0, 0, 4121, +- +- 4121, 4121, 4121, 4121, 4121, 4121, 4121, 4121, 4121, 4121, +- 4121, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, +- 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4123, +- 0, 0, 0, 0, 0, 4123, 4123, 4123, 0, 4123, +- 4123, 4123, 4123, 4123, 4123, 4123, 4123, 4124, 4124, 0, +- 4124, 4124, 4124, 4124, 4124, 4124, 4124, 4124, 4124, 4124, +- 4124, 4124, 4124, 4124, 4124, 4125, 4125, 0, 4125, 4125, ++ 4120, 4120, 4120, 4121, 0, 0, 4121, 0, 4121, 4122, ++ 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, ++ 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4123, 0, 0, ++ 4123, 4123, 0, 0, 4123, 0, 4123, 0, 4123, 4123, ++ 4123, 4123, 4124, 4124, 4124, 4124, 4125, 4125, 0, 4125, + 4125, 4125, 4125, 4125, 4125, 4125, 4125, 4125, 4125, 4125, +- 4125, 4125, 4125, 4126, 0, 0, 4126, 4126, 0, 0, +- 4126, 0, 4126, 0, 4126, 4126, 4126, 4126, 4127, 0, +- +- 0, 0, 0, 0, 4127, 4127, 4127, 0, 4127, 4127, +- 4127, 4127, 4127, 4127, 4127, 4127, 4128, 4128, 0, 4128, +- 4128, 0, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, +- 4128, 4128, 4128, 4129, 0, 4129, 0, 4129, 4129, 4129, +- 4129, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, +- 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4131, +- 0, 4131, 4131, 0, 0, 4131, 4131, 4131, 4131, 4131, +- 4131, 4131, 4131, 4131, 4131, 4131, 4131, 4132, 4132, 4132, +- 4132, 4132, 4132, 4132, 4132, 4132, 4132, 4132, 4132, 4132, +- 4132, 4132, 4132, 4132, 4132, 4133, 4133, 4133, 4133, 4133, ++ 4125, 4125, 4125, 4125, 4126, 4126, 0, 4126, 4126, 4126, ++ 4126, 4126, 4126, 4126, 4126, 4126, 4126, 4126, 4126, 4126, ++ ++ 4126, 4126, 4127, 0, 4127, 0, 4127, 4127, 4127, 4127, ++ 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, ++ 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4129, 4129, ++ 4129, 4129, 4129, 4129, 4129, 4129, 4129, 4129, 4129, 4129, ++ 4129, 4129, 4129, 4129, 4129, 4129, 4130, 4130, 4130, 4130, ++ 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, ++ 4130, 4130, 4130, 4130, 4131, 4131, 0, 0, 4131, 4131, ++ 4131, 4131, 4131, 0, 4131, 4131, 4131, 4131, 4131, 4131, ++ 4131, 4131, 4132, 0, 0, 4132, 4132, 0, 0, 4132, ++ 0, 4132, 0, 4132, 4132, 4132, 4132, 4133, 4133, 4133, + + 4133, 4133, 4133, 4133, 4133, 4133, 4133, 4133, 4133, 4133, +- 4133, 4133, 4133, 4134, 0, 0, 4134, 4134, 0, 0, +- 4134, 0, 4134, 0, 4134, 4134, 4134, 4134, 4135, 0, +- 4135, 0, 4135, 4135, 4135, 4135, 4136, 0, 0, 4136, +- 4136, 0, 0, 4136, 0, 4136, 0, 4136, 4136, 4136, +- 4136, 4137, 4137, 0, 4137, 4137, 4137, 4137, 4137, 4137, +- 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4138, 0, +- 4138, 4138, 0, 0, 4138, 4138, 4138, 4138, 4138, 4138, +- 4138, 4138, 4138, 4138, 4138, 4138, 4139, 4139, 4139, 4139, +- 4139, 4139, 4139, 4139, 4139, 4139, 4139, 4139, 4139, 4139, +- +- 4139, 4139, 4139, 4139, 4140, 4140, 4140, 4140, 4140, 4140, +- 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, +- 4140, 4140, 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, +- 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, +- 4142, 0, 4142, 4142, 0, 0, 4142, 4142, 4142, 4142, +- 4142, 4142, 4142, 4142, 4142, 4142, 4142, 4142, 4143, 4143, ++ 4133, 4133, 4133, 4133, 4133, 4134, 0, 4134, 4134, 0, ++ 0, 4134, 4134, 4134, 4134, 4134, 4134, 4134, 4134, 4134, ++ 4134, 4134, 4134, 4135, 4135, 4135, 4135, 4135, 4135, 4135, ++ 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4135, ++ 4135, 4136, 0, 0, 0, 0, 0, 4136, 4136, 4136, ++ 0, 4136, 4136, 4136, 4136, 4136, 4136, 4136, 4136, 4137, ++ 4137, 0, 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4137, ++ 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4138, 4138, 0, ++ 4138, 4138, 4138, 4138, 4138, 4138, 4138, 4138, 4138, 4138, ++ ++ 4138, 4138, 4138, 4138, 4138, 4139, 0, 0, 4139, 4139, ++ 0, 0, 4139, 0, 4139, 0, 4139, 4139, 4139, 4139, ++ 4140, 0, 0, 0, 0, 0, 4140, 4140, 4140, 0, ++ 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4141, 4141, ++ 0, 4141, 4141, 0, 4141, 4141, 4141, 4141, 4141, 4141, ++ 4141, 4141, 4141, 4141, 4141, 4142, 0, 4142, 0, 4142, ++ 4142, 4142, 4142, 4143, 4143, 4143, 4143, 4143, 4143, 4143, + 4143, 4143, 4143, 4143, 4143, 4143, 4143, 4143, 4143, 4143, +- 4143, 4143, 4143, 4143, 4143, 4143, 4144, 4144, 4144, 4144, +- 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, +- 4144, 4144, 4144, 4144, 4145, 4145, 0, 4145, 4145, 4145, ++ 4143, 4144, 0, 4144, 4144, 0, 0, 4144, 4144, 4144, ++ 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4145, + + 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4145, +- 4145, 4145, 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, ++ 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4146, 4146, 4146, + 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, +- 4147, 4147, 0, 4147, 4147, 4147, 4147, 4147, 4147, 4147, +- 4147, 4147, 4147, 4147, 4147, 4147, 4147, 4147, 4148, 4148, +- 4148, 4148, 4148, 4148, 4148, 4148, 4148, 4148, 4148, 4148, +- 4148, 4148, 4148, 4148, 4148, 4148, 4149, 0, 4149, 0, +- 4149, 4149, 4149, 4149, 4150, 0, 4150, 0, 4150, 4150, +- 4150, 4150, 4151, 0, 0, 4151, 0, 0, 0, 4151, +- 0, 4151, 0, 4151, 4151, 4151, 4151, 4152, 0, 0, +- +- 4152, 4152, 0, 0, 4152, 0, 4152, 0, 4152, 4152, +- 4152, 4152, 4153, 0, 0, 4153, 0, 4153, 0, 4153, +- 4153, 4153, 4153, 4154, 0, 4154, 0, 4154, 4154, 4154, +- 4154, 4155, 0, 4155, 0, 4155, 4155, 4155, 4155, 4156, +- 4156, 0, 4156, 4156, 0, 4156, 4156, 4156, 4156, 4156, +- 4156, 4156, 4156, 4156, 4156, 4156, 4157, 0, 0, 4157, +- 4157, 0, 0, 4157, 0, 4157, 0, 4157, 4157, 4157, +- 4157, 4158, 4158, 0, 4158, 4158, 0, 4158, 4158, 4158, +- 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4159, 4159, ++ 4146, 4146, 4146, 4146, 4146, 4147, 0, 0, 4147, 4147, ++ 0, 0, 4147, 0, 4147, 0, 4147, 4147, 4147, 4147, ++ 4148, 0, 4148, 0, 4148, 4148, 4148, 4148, 4149, 0, ++ 0, 4149, 4149, 0, 0, 4149, 0, 4149, 0, 4149, ++ 4149, 4149, 4149, 4150, 4150, 0, 4150, 4150, 4150, 4150, ++ 4150, 4150, 4150, 4150, 4150, 4150, 4150, 4150, 4150, 4150, ++ 4151, 0, 4151, 4151, 0, 0, 4151, 4151, 4151, 4151, ++ ++ 4151, 4151, 4151, 4151, 4151, 4151, 4151, 4151, 4152, 4152, ++ 4152, 4152, 4152, 4152, 4152, 4152, 4152, 4152, 4152, 4152, ++ 4152, 4152, 4152, 4152, 4152, 4152, 4153, 4153, 4153, 4153, ++ 4153, 4153, 4153, 4153, 4153, 4153, 4153, 4153, 4153, 4153, ++ 4153, 4153, 4153, 4153, 4154, 4154, 4154, 4154, 4154, 4154, ++ 4154, 4154, 4154, 4154, 4154, 4154, 4154, 4154, 4154, 4154, ++ 4154, 4154, 4155, 0, 4155, 4155, 0, 0, 4155, 4155, ++ 4155, 4155, 4155, 4155, 4155, 4155, 4155, 4155, 4155, 4155, ++ 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, ++ 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4157, 4157, ++ ++ 4157, 4157, 4157, 4157, 4157, 4157, 4157, 4157, 4157, 4157, ++ 4157, 4157, 4157, 4157, 4157, 4157, 4158, 4158, 0, 4158, ++ 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, ++ 4158, 4158, 4158, 4158, 4159, 4159, 4159, 4159, 4159, 4159, + 4159, 4159, 4159, 4159, 4159, 4159, 4159, 4159, 4159, 4159, +- +- 4159, 4159, 4159, 4159, 4159, 4159, 4160, 4160, 4160, 4160, ++ 4159, 4159, 4160, 4160, 0, 4160, 4160, 4160, 4160, 4160, + 4160, 4160, 4160, 4160, 4160, 4160, 4160, 4160, 4160, 4160, +- 4160, 4160, 4160, 4160, 4161, 4161, 4161, 4161, 4161, 4161, + 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, +- 4161, 4161, 4162, 0, 4162, 4162, 0, 0, 4162, 4162, +- 4162, 4162, 4162, 4162, 4162, 4162, 4162, 4162, 4162, 4162, +- 4163, 0, 4163, 4163, 0, 0, 4163, 4163, 4163, 4163, +- 4163, 4163, 4163, 4163, 4163, 4163, 4163, 4163, 4164, 4164, +- 4164, 4164, 4164, 4164, 4164, 4164, 4164, 4164, 4164, 4164, +- 4164, 4164, 4164, 4164, 4164, 4164, 4165, 4165, 4165, 4165, +- +- 4165, 4165, 4165, 4165, 4165, 4165, 4165, 4165, 4165, 4165, +- 4165, 4165, 4165, 4165, 4166, 4166, 4166, 4166, 4166, 4166, +- 4166, 4166, 4166, 4166, 4166, 4166, 4166, 4166, 4166, 4166, +- 4166, 4166, 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, +- 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, +- 4168, 0, 4168, 4168, 0, 0, 4168, 4168, 4168, 4168, +- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4169, 4169, +- 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, +- 4169, 4169, 4169, 4169, 4169, 4169, 4170, 4170, 4170, 4170, +- 4170, 4170, 4170, 4170, 4170, 4170, 4170, 4170, 4170, 4170, +- +- 4170, 4170, 4170, 4170, 4171, 4171, 4171, 4171, 4171, 4171, ++ 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4162, 0, ++ 4162, 0, 4162, 4162, 4162, 4162, 4163, 0, 4163, 0, ++ ++ 4163, 4163, 4163, 4163, 4164, 0, 0, 4164, 0, 0, ++ 0, 4164, 0, 4164, 0, 4164, 4164, 4164, 4164, 4165, ++ 0, 0, 4165, 4165, 0, 0, 4165, 0, 4165, 0, ++ 4165, 4165, 4165, 4165, 4166, 0, 0, 4166, 0, 4166, ++ 0, 4166, 4166, 4166, 4166, 4167, 0, 4167, 0, 4167, ++ 4167, 4167, 4167, 4168, 0, 4168, 0, 4168, 4168, 4168, ++ 4168, 4169, 4169, 0, 4169, 4169, 0, 4169, 4169, 4169, ++ 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4170, 0, ++ 0, 4170, 4170, 0, 0, 4170, 0, 4170, 0, 4170, ++ 4170, 4170, 4170, 4171, 4171, 0, 4171, 4171, 0, 4171, ++ + 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, +- 4171, 4171, 4172, 0, 4172, 4172, 0, 0, 4172, 4172, + 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, ++ 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4173, 4173, + 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, +- 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4174, 4174, ++ 4173, 4173, 4173, 4173, 4173, 4173, 4174, 4174, 4174, 4174, + 4174, 4174, 4174, 4174, 4174, 4174, 4174, 4174, 4174, 4174, +- 4174, 4174, 4174, 4174, 4174, 4174, 4175, 0, 0, 4175, +- 0, 4175, 0, 4175, 4175, 4175, 4175, 4176, 0, 4176, +- 0, 4176, 4176, 4176, 4176, 4177, 0, 4177, 0, 4177, +- +- 4177, 4177, 4177, 4178, 0, 4178, 0, 4178, 4178, 4178, +- 4178, 4179, 0, 0, 4179, 0, 4179, 0, 4179, 4179, +- 4179, 4179, 4180, 4180, 0, 4180, 4180, 0, 4180, 4180, +- 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4181, +- 0, 0, 4181, 4181, 0, 0, 4181, 0, 4181, 0, +- 4181, 4181, 4181, 4181, 4182, 0, 4182, 0, 4182, 4182, +- 4182, 4182, 4183, 0, 4183, 0, 4183, 4183, 4183, 4183, ++ 4174, 4174, 4174, 4174, 4175, 0, 4175, 4175, 0, 0, ++ 4175, 4175, 4175, 4175, 4175, 4175, 4175, 4175, 4175, 4175, ++ 4175, 4175, 4176, 0, 4176, 4176, 0, 0, 4176, 4176, ++ 4176, 4176, 4176, 4176, 4176, 4176, 4176, 4176, 4176, 4176, ++ ++ 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, ++ 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4178, 4178, ++ 4178, 4178, 4178, 4178, 4178, 4178, 4178, 4178, 4178, 4178, ++ 4178, 4178, 4178, 4178, 4178, 4178, 4179, 4179, 4179, 4179, ++ 4179, 4179, 4179, 4179, 4179, 4179, 4179, 4179, 4179, 4179, ++ 4179, 4179, 4179, 4179, 4180, 4180, 4180, 4180, 4180, 4180, ++ 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, ++ 4180, 4180, 4181, 0, 4181, 4181, 0, 0, 4181, 4181, ++ 4181, 4181, 4181, 4181, 4181, 4181, 4181, 4181, 4181, 4181, ++ 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, ++ ++ 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4183, 4183, ++ 4183, 4183, 4183, 4183, 4183, 4183, 4183, 4183, 4183, 4183, ++ 4183, 4183, 4183, 4183, 4183, 4183, 4184, 4184, 4184, 4184, + 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, +- 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4185, 4185, ++ 4184, 4184, 4184, 4184, 4185, 0, 4185, 4185, 0, 0, + 4185, 4185, 4185, 4185, 4185, 4185, 4185, 4185, 4185, 4185, +- +- 4185, 4185, 4185, 4185, 4185, 4185, 4186, 4186, 4186, 4186, ++ 4185, 4185, 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, + 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, +- 4186, 4186, 4186, 4186, 4187, 4187, 4187, 4187, 4187, 4187, + 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, +- 4187, 4187, 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, +- 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, +- 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, +- 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4190, 0, +- 4190, 4190, 0, 0, 4190, 4190, 4190, 4190, 4190, 4190, +- 4190, 4190, 4190, 4190, 4190, 4190, 4191, 4191, 4191, 4191, +- +- 4191, 4191, 4191, 4191, 4191, 4191, 4191, 4191, 4191, 4191, +- 4191, 4191, 4191, 4191, 4192, 4192, 4192, 4192, 4192, 4192, +- 4192, 4192, 4192, 4192, 4192, 4192, 4192, 4192, 4192, 4192, +- 4192, 4192, 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, ++ 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4188, 0, ++ ++ 0, 4188, 0, 4188, 0, 4188, 4188, 4188, 4188, 4189, ++ 0, 4189, 0, 4189, 4189, 4189, 4189, 4190, 0, 4190, ++ 0, 4190, 4190, 4190, 4190, 4191, 0, 4191, 0, 4191, ++ 4191, 4191, 4191, 4192, 0, 0, 4192, 0, 4192, 0, ++ 4192, 4192, 4192, 4192, 4193, 4193, 0, 4193, 4193, 0, + 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, +- 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, +- 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4195, 4195, +- 0, 4195, 4195, 0, 4195, 4195, 4195, 4195, 4195, 4195, +- 4195, 4195, 4195, 4195, 4195, 4196, 0, 0, 4196, 4196, +- 0, 0, 4196, 0, 4196, 0, 4196, 4196, 4196, 4196, +- +- 4197, 4197, 4197, 4197, 0, 4197, 4197, 4197, 4197, 4197, +- 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4198, 0, +- 0, 0, 0, 0, 4198, 4198, 4198, 0, 4198, 4198, +- 4198, 4198, 4198, 4198, 4198, 4198, 4199, 4199, 4199, 4199, ++ 4193, 4194, 0, 0, 4194, 4194, 0, 0, 4194, 0, ++ 4194, 0, 4194, 4194, 4194, 4194, 4195, 0, 4195, 0, ++ 4195, 4195, 4195, 4195, 4196, 0, 4196, 0, 4196, 4196, ++ 4196, 4196, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, ++ ++ 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, ++ 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, ++ 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4199, 4199, + 4199, 4199, 4199, 4199, 4199, 4199, 4199, 4199, 4199, 4199, +- 4199, 4199, 4199, 4199, 4200, 0, 4200, 0, 4200, 4200, +- 4200, 4200, 4201, 4201, 0, 4201, 4201, 0, 4201, 4201, +- 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4202, +- 0, 0, 4202, 4202, 0, 0, 0, 0, 0, 0, +- 4202, 4203, 4203, 0, 0, 0, 4203, 4203, 4203, 4203, +- +- 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4204, +- 4204, 0, 4204, 4204, 0, 4204, 4204, 4204, 4204, 4204, +- 4204, 4204, 4204, 4204, 4204, 4204, 4205, 4205, 0, 4205, +- 4205, 0, 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, +- 4205, 4205, 4205, 4206, 4206, 0, 4206, 4206, 4206, 4206, ++ 4199, 4199, 4199, 4199, 4199, 4199, 4200, 4200, 4200, 4200, ++ 4200, 4200, 4200, 4200, 4200, 4200, 4200, 4200, 4200, 4200, ++ 4200, 4200, 4200, 4200, 4201, 4201, 4201, 4201, 4201, 4201, ++ 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, ++ 4201, 4201, 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, ++ 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, ++ ++ 4203, 0, 4203, 4203, 0, 0, 4203, 4203, 4203, 4203, ++ 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4204, 4204, ++ 4204, 4204, 4204, 4204, 4204, 4204, 4204, 4204, 4204, 4204, ++ 4204, 4204, 4204, 4204, 4204, 4204, 4205, 4205, 4205, 4205, ++ 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, ++ 4205, 4205, 4205, 4205, 4206, 4206, 4206, 4206, 4206, 4206, + 4206, 4206, 4206, 4206, 4206, 4206, 4206, 4206, 4206, 4206, +- 4207, 4207, 0, 4207, 4207, 4207, 4207, 4207, 4207, 4207, +- 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4208, 0, 4208, +- 0, 4208, 0, 4208, 4208, 4208, 4208, 4209, 4209, 0, +- 4209, 4209, 0, 4209, 4209, 4209, 4209, 4209, 4209, 4209, ++ 4206, 4206, 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, ++ 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, ++ 4208, 4208, 0, 4208, 4208, 0, 4208, 4208, 4208, 4208, + +- 4209, 4209, 4209, 4209, 4210, 4210, 0, 4210, 4210, 0, ++ 4208, 4208, 4208, 4208, 4208, 4208, 4208, 4209, 0, 0, ++ 4209, 4209, 0, 0, 4209, 0, 4209, 0, 4209, 4209, ++ 4209, 4209, 4210, 4210, 4210, 4210, 0, 4210, 4210, 4210, + 4210, 4210, 4210, 4210, 4210, 4210, 4210, 4210, 4210, 4210, +- 4210, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, +- 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4212, +- 0, 4212, 0, 4212, 0, 4212, 4212, 4212, 4212, 4213, +- 4213, 0, 4213, 4213, 4213, 4213, 4213, 4213, 4213, 4213, +- 4213, 4213, 4213, 4213, 4213, 4213, 4213, 4214, 4214, 0, +- 4214, 4214, 0, 4214, 4214, 4214, 4214, 4214, 4214, 4214, +- 4214, 4214, 4214, 4214, 4215, 4215, 0, 0, 4215, 4215, +- 4215, 4215, 4215, 0, 4215, 4215, 4215, 4215, 4215, 4215, +- +- 4215, 4215, 4216, 4216, 0, 4216, 4216, 0, 4216, 4216, +- 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4217, +- 0, 0, 0, 0, 0, 4217, 4217, 4217, 0, 4217, +- 4217, 4217, 4217, 4217, 4217, 4217, 4217, 4218, 0, 0, +- 0, 0, 0, 4218, 4218, 4218, 0, 4218, 4218, 4218, +- 4218, 4218, 4218, 4218, 4218, 4219, 0, 0, 4219, 4219, +- 0, 0, 4219, 0, 4219, 0, 4219, 4219, 4219, 4219, +- 4220, 4220, 0, 4220, 4220, 0, 4220, 4220, 4220, 4220, +- 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4221, 0, 0, +- 0, 0, 0, 4221, 4221, 4221, 0, 4221, 4221, 4221, +- +- 4221, 4221, 4221, 4221, 4221, 4222, 0, 4222, 0, 4222, +- 4222, 4222, 4222, 4223, 4223, 0, 4223, 4223, 0, 4223, +- 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, ++ 4211, 0, 0, 0, 0, 0, 4211, 4211, 4211, 0, ++ 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4212, 4212, ++ 4212, 4212, 4212, 4212, 4212, 4212, 4212, 4212, 4212, 4212, ++ 4212, 4212, 4212, 4212, 4212, 4212, 4213, 0, 4213, 0, ++ 4213, 4213, 4213, 4213, 4214, 4214, 0, 4214, 4214, 0, ++ 4214, 4214, 4214, 4214, 4214, 4214, 4214, 4214, 4214, 4214, ++ ++ 4214, 4215, 0, 0, 4215, 4215, 0, 0, 0, 0, ++ 0, 0, 4215, 4216, 4216, 0, 0, 0, 4216, 4216, ++ 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, ++ 4216, 4217, 4217, 0, 4217, 4217, 0, 4217, 4217, 4217, ++ 4217, 4217, 4217, 4217, 4217, 4217, 4217, 4217, 4218, 4218, ++ 0, 4218, 4218, 0, 4218, 4218, 4218, 4218, 4218, 4218, ++ 4218, 4218, 4218, 4218, 4218, 4219, 4219, 0, 4219, 4219, ++ 4219, 4219, 4219, 4219, 4219, 4219, 4219, 4219, 4219, 4219, ++ 4219, 4219, 4220, 4220, 0, 4220, 4220, 4220, 4220, 4220, ++ 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4221, ++ ++ 0, 4221, 0, 4221, 0, 4221, 4221, 4221, 4221, 4222, ++ 4222, 0, 4222, 4222, 0, 4222, 4222, 4222, 4222, 4222, ++ 4222, 4222, 4222, 4222, 4222, 4222, 4223, 4223, 0, 4223, ++ 4223, 0, 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, ++ 4223, 4223, 4223, 4224, 4224, 4224, 4224, 4224, 4224, 4224, + 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, +- 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4225, 4225, +- 0, 4225, 4225, 0, 4225, 4225, 4225, 4225, 4225, 4225, +- 4225, 4225, 4225, 4225, 4225, 4226, 4226, 0, 0, 4226, +- 4226, 4226, 4226, 4226, 0, 4226, 4226, 4226, 4226, 4226, +- 4226, 4226, 4226, 4227, 4227, 0, 0, 4227, 4227, 4227, +- 4227, 4227, 0, 4227, 4227, 4227, 4227, 4227, 4227, 4227, +- +- 4227, 4228, 4228, 0, 4228, 4228, 0, 4228, 4228, 4228, +- 4228, 4228, 4228, 4228, 4228, 4228, 4228, 4228, 4229, 4229, +- 0, 4229, 4229, 0, 4229, 4229, 4229, 4229, 4229, 4229, +- 4229, 4229, 4229, 4229, 4229, 4230, 4230, 0, 0, 4230, +- 4230, 4230, 4230, 4230, 0, 4230, 4230, 4230, 4230, 4230, +- 4230, 4230, 4230, 4231, 4231, 0, 0, 4231, 4231, 4231, +- 4231, 4231, 0, 4231, 4231, 4231, 4231, 4231, 4231, 4231, +- 4231, 4232, 0, 4232, 0, 4232, 0, 4232, 4232, 4232, +- 4232, 4233, 4233, 0, 4233, 4233, 4233, 4233, 4233, 4233, +- 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4234, 4234, +- +- 0, 4234, 4234, 0, 4234, 4234, 4234, 4234, 4234, 4234, +- 4234, 4234, 4234, 4234, 4234, 4235, 4235, 0, 4235, 4235, +- 0, 4235, 4235, 4235, 4235, 4235, 4235, 4235, 4235, 4235, +- 4235, 4235, 4236, 0, 4236, 0, 4236, 0, 4236, 4236, +- 4236, 4236, 4237, 0, 0, 0, 0, 0, 4237, 4237, +- 4237, 0, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952 ++ 4224, 4225, 0, 4225, 0, 4225, 0, 4225, 4225, 4225, ++ 4225, 4226, 4226, 0, 4226, 4226, 4226, 4226, 4226, 4226, ++ 4226, 4226, 4226, 4226, 4226, 4226, 4226, 4226, 4226, 4227, ++ 4227, 0, 4227, 4227, 0, 4227, 4227, 4227, 4227, 4227, ++ ++ 4227, 4227, 4227, 4227, 4227, 4227, 4228, 4228, 0, 0, ++ 4228, 4228, 4228, 4228, 4228, 0, 4228, 4228, 4228, 4228, ++ 4228, 4228, 4228, 4228, 4229, 4229, 0, 4229, 4229, 0, ++ 4229, 4229, 4229, 4229, 4229, 4229, 4229, 4229, 4229, 4229, ++ 4229, 4230, 0, 0, 0, 0, 0, 4230, 4230, 4230, ++ 0, 4230, 4230, 4230, 4230, 4230, 4230, 4230, 4230, 4231, ++ 0, 0, 0, 0, 0, 4231, 4231, 4231, 0, 4231, ++ 4231, 4231, 4231, 4231, 4231, 4231, 4231, 4232, 0, 0, ++ 4232, 4232, 0, 0, 4232, 0, 4232, 0, 4232, 4232, ++ 4232, 4232, 4233, 4233, 0, 4233, 4233, 0, 4233, 4233, ++ ++ 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4234, ++ 0, 0, 0, 0, 0, 4234, 4234, 4234, 0, 4234, ++ 4234, 4234, 4234, 4234, 4234, 4234, 4234, 4235, 0, 4235, ++ 0, 4235, 4235, 4235, 4235, 4236, 4236, 0, 4236, 4236, ++ 0, 4236, 4236, 4236, 4236, 4236, 4236, 4236, 4236, 4236, ++ 4236, 4236, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, ++ 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, ++ 4238, 4238, 0, 4238, 4238, 0, 4238, 4238, 4238, 4238, ++ 4238, 4238, 4238, 4238, 4238, 4238, 4238, 4239, 4239, 0, ++ 0, 4239, 4239, 4239, 4239, 4239, 0, 4239, 4239, 4239, ++ ++ 4239, 4239, 4239, 4239, 4239, 4240, 4240, 0, 0, 4240, ++ 4240, 4240, 4240, 4240, 0, 4240, 4240, 4240, 4240, 4240, ++ 4240, 4240, 4240, 4241, 4241, 0, 4241, 4241, 0, 4241, ++ 4241, 4241, 4241, 4241, 4241, 4241, 4241, 4241, 4241, 4241, ++ 4242, 4242, 0, 4242, 4242, 0, 4242, 4242, 4242, 4242, ++ 4242, 4242, 4242, 4242, 4242, 4242, 4242, 4243, 4243, 0, ++ 0, 4243, 4243, 4243, 4243, 4243, 0, 4243, 4243, 4243, ++ 4243, 4243, 4243, 4243, 4243, 4244, 4244, 0, 0, 4244, ++ 4244, 4244, 4244, 4244, 0, 4244, 4244, 4244, 4244, 4244, ++ 4244, 4244, 4244, 4245, 0, 4245, 0, 4245, 0, 4245, ++ ++ 4245, 4245, 4245, 4246, 4246, 0, 4246, 4246, 4246, 4246, ++ 4246, 4246, 4246, 4246, 4246, 4246, 4246, 4246, 4246, 4246, ++ 4247, 4247, 0, 4247, 4247, 0, 4247, 4247, 4247, 4247, ++ 4247, 4247, 4247, 4247, 4247, 4247, 4247, 4248, 4248, 0, ++ 4248, 4248, 0, 4248, 4248, 4248, 4248, 4248, 4248, 4248, ++ 4248, 4248, 4248, 4248, 4249, 0, 4249, 0, 4249, 0, ++ 4249, 4249, 4249, 4249, 4250, 0, 0, 0, 0, 0, ++ 4250, 4250, 4250, 0, 4250, 4250, 4250, 4250, 4250, 4250, ++ 4250, 4250, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965 + } ; + + static yy_state_type yy_last_accepting_state; +@@ -5036,68 +5043,68 @@ static char *yy_last_accepting_cpos; + extern int yy_flex_debug; + int yy_flex_debug = 1; + +-static const flex_int16_t yy_rule_linenum[542] = ++static const flex_int16_t yy_rule_linenum[544] = + { 0, +- 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, +- 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, +- 526, 527, 529, 530, 531, 532, 533, 534, 535, 536, +- 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, +- 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, +- 557, 558, 559, 560, 561, 562, 564, 565, 568, 569, +- 570, 571, 572, 573, 574, 576, 577, 578, 579, 580, +- 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, +- 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, +- 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, +- +- 611, 612, 614, 615, 616, 617, 618, 619, 623, 628, +- 629, 634, 635, 636, 641, 642, 643, 648, 653, 654, +- 655, 660, 661, 665, 666, 667, 671, 672, 676, 677, +- 681, 682, 683, 687, 688, 692, 693, 698, 699, 700, +- 704, 708, 709, 717, 722, 723, 728, 729, 730, 739, +- 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, +- 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, +- 762, 763, 764, 765, 768, 769, 770, 771, 772, 773, +- 774, 775, 776, 778, 779, 780, 781, 782, 783, 784, +- 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, +- +- 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, +- 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, +- 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, +- 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, +- 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, +- 845, 846, 847, 848, 849, 850, 851, 852, 853, 855, +- 856, 857, 859, 860, 861, 862, 863, 864, 865, 866, +- 867, 868, 871, 875, 876, 877, 878, 879, 883, 884, +- 885, 886, 887, 888, 892, 893, 894, 895, 900, 901, +- 902, 903, 904, 905, 906, 907, 908, 909, 910, 911, +- +- 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, +- 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, +- 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, +- 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, +- 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, +- 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, +- 972, 973, 974, 975, 976, 977, 978, 979, 980, 981, +- 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, +- 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, +- 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, +- +- 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1023, +- 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1035, 1036, +- 1037, 1038, 1039, 1040, 1045, 1046, 1047, 1048, 1049, 1050, +- 1051, 1052, 1053, 1055, 1056, 1057, 1058, 1059, 1064, 1065, +- 1066, 1067, 1068, 1069, 1071, 1072, 1074, 1075, 1081, 1082, +- 1083, 1084, 1085, 1086, 1089, 1090, 1091, 1092, 1093, 1094, +- 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, +- 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, +- 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, +- 1128, 1130, 1131, 1136, 1140, 1144, 1145, 1149, 1150, 1153, +- +- 1154, 1158, 1159, 1163, 1164, 1168, 1169, 1174, 1176, 1177, +- 1178, 1179, 1181, 1182, 1183, 1184, 1186, 1187, 1188, 1189, +- 1191, 1193, 1194, 1196, 1197, 1198, 1199, 1201, 1206, 1207, +- 1208, 1212, 1213, 1214, 1219, 1221, 1222, 1223, 1242, 1269, +- 1299 ++ 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, ++ 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, ++ 527, 528, 530, 531, 532, 533, 534, 535, 536, 537, ++ 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, ++ 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, ++ 558, 559, 560, 561, 562, 563, 565, 566, 569, 570, ++ 571, 572, 573, 574, 575, 577, 578, 579, 580, 581, ++ 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, ++ 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, ++ 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, ++ ++ 612, 613, 615, 616, 617, 618, 619, 620, 624, 629, ++ 630, 635, 636, 637, 642, 643, 644, 649, 654, 655, ++ 656, 661, 662, 666, 667, 668, 672, 673, 677, 678, ++ 682, 683, 684, 688, 689, 693, 694, 699, 700, 701, ++ 705, 709, 710, 718, 723, 724, 729, 730, 731, 740, ++ 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, ++ 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, ++ 763, 764, 765, 766, 769, 770, 771, 772, 773, 774, ++ 775, 776, 777, 779, 780, 781, 782, 783, 784, 785, ++ 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, ++ ++ 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, ++ 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, ++ 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, ++ 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, ++ 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, ++ 846, 847, 848, 849, 850, 851, 852, 853, 854, 856, ++ 857, 858, 860, 861, 862, 863, 864, 865, 866, 867, ++ 868, 869, 872, 876, 877, 878, 879, 880, 884, 885, ++ 886, 887, 888, 889, 893, 894, 895, 896, 901, 902, ++ 903, 904, 905, 906, 907, 908, 909, 910, 911, 912, ++ ++ 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, ++ 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, ++ 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, ++ 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, ++ 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, ++ 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, ++ 973, 974, 975, 976, 977, 978, 979, 980, 981, 982, ++ 983, 984, 985, 986, 987, 988, 989, 990, 991, 992, ++ 993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002, ++ 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, ++ ++ 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, ++ 1023, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, ++ 1038, 1039, 1040, 1041, 1042, 1043, 1048, 1049, 1050, 1051, ++ 1052, 1053, 1054, 1055, 1056, 1058, 1059, 1060, 1061, 1062, ++ 1067, 1068, 1069, 1070, 1071, 1072, 1074, 1075, 1077, 1078, ++ 1084, 1085, 1086, 1087, 1088, 1089, 1092, 1093, 1094, 1095, ++ 1096, 1097, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, ++ 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, ++ 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, ++ 1129, 1130, 1131, 1133, 1134, 1139, 1143, 1147, 1148, 1152, ++ ++ 1153, 1156, 1157, 1161, 1162, 1166, 1167, 1171, 1172, 1177, ++ 1179, 1180, 1181, 1182, 1184, 1185, 1186, 1187, 1189, 1190, ++ 1191, 1192, 1194, 1196, 1197, 1199, 1200, 1201, 1202, 1204, ++ 1209, 1210, 1211, 1215, 1216, 1217, 1222, 1224, 1225, 1226, ++ 1245, 1272, 1302 + } ; + + /* The intent behind this definition is that it'll catch +@@ -5183,15 +5190,15 @@ static std::stack YY_PREVIOUS_STATE; + #define BEGIN_PREVIOUS() { BEGIN(YY_PREVIOUS_STATE.top()); YY_PREVIOUS_STATE.pop(); } + + // The location of the current token. +-#line 5187 "seclang-scanner.cc" ++#line 5194 "seclang-scanner.cc" + #define YY_NO_INPUT 1 + +-#line 493 "seclang-scanner.ll" ++#line 494 "seclang-scanner.ll" + // Code run each time a pattern is matched. + # define YY_USER_ACTION driver.loc.back()->columns (yyleng); + +-#line 5194 "seclang-scanner.cc" +-#line 5195 "seclang-scanner.cc" ++#line 5201 "seclang-scanner.cc" ++#line 5202 "seclang-scanner.cc" + + #define INITIAL 0 + #define EXPECTING_ACTION_PREDICATE_VARIABLE 1 +@@ -5505,15 +5512,15 @@ YY_DECL + + { + /* %% [7.0] user's declarations go here */ +-#line 498 "seclang-scanner.ll" ++#line 499 "seclang-scanner.ll" + + + +-#line 502 "seclang-scanner.ll" ++#line 503 "seclang-scanner.ll" + // Code run each time yylex is called. + driver.loc.back()->step(); + +-#line 5517 "seclang-scanner.cc" ++#line 5524 "seclang-scanner.cc" + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ + { +@@ -5542,13 +5549,13 @@ yy_match: + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 3953 ) ++ if ( yy_current_state >= 3966 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + ++yy_cp; + } +- while ( yy_current_state != 3952 ); ++ while ( yy_current_state != 3965 ); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); + +@@ -5567,13 +5574,13 @@ do_action: /* This label is used only to access EOF actions. */ + { + if ( yy_act == 0 ) + fprintf( stderr, "--scanner backing up\n" ); +- else if ( yy_act < 542 ) ++ else if ( yy_act < 544 ) + fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", + (long)yy_rule_linenum[yy_act], yytext ); +- else if ( yy_act == 542 ) ++ else if ( yy_act == 544 ) + fprintf( stderr, "--accepting default rule (\"%s\")\n", + yytext ); +- else if ( yy_act == 543 ) ++ else if ( yy_act == 545 ) + fprintf( stderr, "--(end of buffer or a NUL)\n" ); + else + fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); +@@ -5591,564 +5598,564 @@ do_action: /* This label is used only to access EOF actions. */ + + case 1: + YY_RULE_SETUP +-#line 506 "seclang-scanner.ll" ++#line 507 "seclang-scanner.ll" + { return p::make_ACTION_APPEND(yytext, *driver.loc.back()); } + YY_BREAK + case 2: + YY_RULE_SETUP +-#line 507 "seclang-scanner.ll" ++#line 508 "seclang-scanner.ll" + { return p::make_ACTION_BLOCK(yytext, *driver.loc.back()); } + YY_BREAK + case 3: + YY_RULE_SETUP +-#line 508 "seclang-scanner.ll" ++#line 509 "seclang-scanner.ll" + { return p::make_ACTION_CAPTURE(yytext, *driver.loc.back()); } + YY_BREAK + case 4: + YY_RULE_SETUP +-#line 509 "seclang-scanner.ll" ++#line 510 "seclang-scanner.ll" + { return p::make_ACTION_CHAIN(yytext, *driver.loc.back()); } + YY_BREAK + case 5: + YY_RULE_SETUP +-#line 510 "seclang-scanner.ll" ++#line 511 "seclang-scanner.ll" + { return p::make_ACTION_DENY(yytext, *driver.loc.back()); } + YY_BREAK + case 6: + YY_RULE_SETUP +-#line 511 "seclang-scanner.ll" ++#line 512 "seclang-scanner.ll" + { return p::make_ACTION_DEPRECATE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 7: + YY_RULE_SETUP +-#line 512 "seclang-scanner.ll" ++#line 513 "seclang-scanner.ll" + { return p::make_ACTION_DROP(yytext, *driver.loc.back()); } + YY_BREAK + case 8: + YY_RULE_SETUP +-#line 513 "seclang-scanner.ll" ++#line 514 "seclang-scanner.ll" + { return p::make_ACTION_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 9: + YY_RULE_SETUP +-#line 514 "seclang-scanner.ll" ++#line 515 "seclang-scanner.ll" + { return p::make_ACTION_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 10: + YY_RULE_SETUP +-#line 515 "seclang-scanner.ll" ++#line 516 "seclang-scanner.ll" + { return p::make_ACTION_MULTI_MATCH(yytext, *driver.loc.back()); } + YY_BREAK + case 11: + YY_RULE_SETUP +-#line 516 "seclang-scanner.ll" ++#line 517 "seclang-scanner.ll" + { return p::make_ACTION_NO_AUDIT_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 12: + YY_RULE_SETUP +-#line 517 "seclang-scanner.ll" ++#line 518 "seclang-scanner.ll" + { return p::make_ACTION_NO_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 13: + YY_RULE_SETUP +-#line 518 "seclang-scanner.ll" ++#line 519 "seclang-scanner.ll" + { return p::make_ACTION_PASS(yytext, *driver.loc.back()); } + YY_BREAK + case 14: + YY_RULE_SETUP +-#line 519 "seclang-scanner.ll" ++#line 520 "seclang-scanner.ll" + { return p::make_ACTION_PAUSE(yytext, *driver.loc.back()); } + YY_BREAK + case 15: + YY_RULE_SETUP +-#line 520 "seclang-scanner.ll" ++#line 521 "seclang-scanner.ll" + { return p::make_ACTION_PREPEND(yytext, *driver.loc.back()); } + YY_BREAK + case 16: + YY_RULE_SETUP +-#line 521 "seclang-scanner.ll" ++#line 522 "seclang-scanner.ll" + { return p::make_ACTION_PROXY(yytext, *driver.loc.back()); } + YY_BREAK + case 17: + YY_RULE_SETUP +-#line 522 "seclang-scanner.ll" ++#line 523 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_ARG(yytext, *driver.loc.back()); } + YY_BREAK + case 18: + YY_RULE_SETUP +-#line 523 "seclang-scanner.ll" ++#line 524 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_MATCHED(yytext, *driver.loc.back()); } + YY_BREAK + case 19: + YY_RULE_SETUP +-#line 524 "seclang-scanner.ll" ++#line 525 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_MATCHED_BYTES(yytext, *driver.loc.back()); } + YY_BREAK + case 20: + YY_RULE_SETUP +-#line 525 "seclang-scanner.ll" ++#line 526 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_REQUEST_HEADER(yytext, *driver.loc.back()); } + YY_BREAK + case 21: + YY_RULE_SETUP +-#line 526 "seclang-scanner.ll" ++#line 527 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_RESPONSE_HEADER(yytext, *driver.loc.back()); } + YY_BREAK + case 22: + YY_RULE_SETUP +-#line 527 "seclang-scanner.ll" ++#line 528 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETRSC(yytext, *driver.loc.back()); } + YY_BREAK + case 23: + YY_RULE_SETUP +-#line 529 "seclang-scanner.ll" ++#line 530 "seclang-scanner.ll" + { return p::make_ACTION_STATUS(yytext, *driver.loc.back()); } + YY_BREAK + case 24: + /* rule 24 can match eol */ + YY_RULE_SETUP +-#line 530 "seclang-scanner.ll" ++#line 531 "seclang-scanner.ll" + { return p::make_ACTION_ACCURACY(yytext, *driver.loc.back()); } + YY_BREAK + case 25: + /* rule 25 can match eol */ + YY_RULE_SETUP +-#line 531 "seclang-scanner.ll" ++#line 532 "seclang-scanner.ll" + { return p::make_ACTION_ACCURACY(yytext, *driver.loc.back()); } + YY_BREAK + case 26: + YY_RULE_SETUP +-#line 532 "seclang-scanner.ll" ++#line 533 "seclang-scanner.ll" + { return p::make_ACTION_ALLOW(yytext, *driver.loc.back()); } + YY_BREAK + case 27: + YY_RULE_SETUP +-#line 533 "seclang-scanner.ll" ++#line 534 "seclang-scanner.ll" + { return p::make_ACTION_AUDIT_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 28: + YY_RULE_SETUP +-#line 534 "seclang-scanner.ll" ++#line 535 "seclang-scanner.ll" + { return p::make_ACTION_CTL_AUDIT_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 29: + YY_RULE_SETUP +-#line 535 "seclang-scanner.ll" ++#line 536 "seclang-scanner.ll" + { return p::make_ACTION_CTL_AUDIT_LOG_PARTS(yytext, *driver.loc.back()); } + YY_BREAK + case 30: + YY_RULE_SETUP +-#line 536 "seclang-scanner.ll" ++#line 537 "seclang-scanner.ll" + { return p::make_ACTION_CTL_BDY_JSON(yytext, *driver.loc.back()); } + YY_BREAK + case 31: + YY_RULE_SETUP +-#line 537 "seclang-scanner.ll" ++#line 538 "seclang-scanner.ll" + { return p::make_ACTION_CTL_BDY_XML(yytext, *driver.loc.back()); } + YY_BREAK + case 32: + YY_RULE_SETUP +-#line 538 "seclang-scanner.ll" ++#line 539 "seclang-scanner.ll" + { return p::make_ACTION_CTL_BDY_URLENCODED(yytext, *driver.loc.back()); } + YY_BREAK + case 33: + YY_RULE_SETUP +-#line 539 "seclang-scanner.ll" ++#line 540 "seclang-scanner.ll" + { return p::make_ACTION_CTL_FORCE_REQ_BODY_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 34: + YY_RULE_SETUP +-#line 540 "seclang-scanner.ll" ++#line 541 "seclang-scanner.ll" + { return p::make_ACTION_CTL_REQUEST_BODY_ACCESS(yytext, *driver.loc.back()); } + YY_BREAK + case 35: + YY_RULE_SETUP +-#line 541 "seclang-scanner.ll" ++#line 542 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_ENGINE(*driver.loc.back()); } + YY_BREAK + case 36: + YY_RULE_SETUP +-#line 542 "seclang-scanner.ll" ++#line 543 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_BY_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 37: + YY_RULE_SETUP +-#line 543 "seclang-scanner.ll" ++#line 544 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_BY_TAG(yytext, *driver.loc.back()); } + YY_BREAK + case 38: + YY_RULE_SETUP +-#line 544 "seclang-scanner.ll" ++#line 545 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 39: + YY_RULE_SETUP +-#line 545 "seclang-scanner.ll" ++#line 546 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG(yytext, *driver.loc.back()); } + YY_BREAK + case 40: + /* rule 40 can match eol */ + YY_RULE_SETUP +-#line 546 "seclang-scanner.ll" ++#line 547 "seclang-scanner.ll" + { return p::make_ACTION_EXEC(yytext, *driver.loc.back()); } + YY_BREAK + case 41: + /* rule 41 can match eol */ + YY_RULE_SETUP +-#line 547 "seclang-scanner.ll" ++#line 548 "seclang-scanner.ll" + { return p::make_ACTION_EXEC(yytext, *driver.loc.back()); } + YY_BREAK + case 42: + /* rule 42 can match eol */ + YY_RULE_SETUP +-#line 548 "seclang-scanner.ll" ++#line 549 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 43: + /* rule 43 can match eol */ + YY_RULE_SETUP +-#line 549 "seclang-scanner.ll" ++#line 550 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 44: + /* rule 44 can match eol */ + YY_RULE_SETUP +-#line 550 "seclang-scanner.ll" ++#line 551 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 45: + /* rule 45 can match eol */ + YY_RULE_SETUP +-#line 551 "seclang-scanner.ll" ++#line 552 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 46: + YY_RULE_SETUP +-#line 552 "seclang-scanner.ll" ++#line 553 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_INITCOL(yytext, *driver.loc.back()); } + YY_BREAK + case 47: + /* rule 47 can match eol */ + YY_RULE_SETUP +-#line 553 "seclang-scanner.ll" ++#line 554 "seclang-scanner.ll" + { return p::make_ACTION_MATURITY(yytext, *driver.loc.back()); } + YY_BREAK + case 48: + /* rule 48 can match eol */ + YY_RULE_SETUP +-#line 554 "seclang-scanner.ll" ++#line 555 "seclang-scanner.ll" + { return p::make_ACTION_MATURITY(yytext, *driver.loc.back()); } + YY_BREAK + case 49: + YY_RULE_SETUP +-#line 555 "seclang-scanner.ll" ++#line 556 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_MSG(yytext, *driver.loc.back()); } + YY_BREAK + case 50: + YY_RULE_SETUP +-#line 556 "seclang-scanner.ll" ++#line 557 "seclang-scanner.ll" + { return p::make_ACTION_PHASE(yytext, *driver.loc.back()); } + YY_BREAK + case 51: + YY_RULE_SETUP +-#line 557 "seclang-scanner.ll" ++#line 558 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_REDIRECT(yytext, *driver.loc.back()); } + YY_BREAK + case 52: + /* rule 52 can match eol */ + YY_RULE_SETUP +-#line 558 "seclang-scanner.ll" ++#line 559 "seclang-scanner.ll" + { return p::make_ACTION_REV(yytext, *driver.loc.back()); } + YY_BREAK + case 53: + /* rule 53 can match eol */ + YY_RULE_SETUP +-#line 559 "seclang-scanner.ll" ++#line 560 "seclang-scanner.ll" + { return p::make_ACTION_REV(yytext, *driver.loc.back()); } + YY_BREAK + case 54: + YY_RULE_SETUP +-#line 560 "seclang-scanner.ll" ++#line 561 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETENV(yytext, *driver.loc.back()); } + YY_BREAK + case 55: + YY_RULE_SETUP +-#line 561 "seclang-scanner.ll" ++#line 562 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETSID(yytext, *driver.loc.back()); } + YY_BREAK + case 56: + YY_RULE_SETUP +-#line 562 "seclang-scanner.ll" ++#line 563 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETUID(yytext, *driver.loc.back()); } + YY_BREAK + case 57: + YY_RULE_SETUP +-#line 564 "seclang-scanner.ll" ++#line 565 "seclang-scanner.ll" + { BEGIN(SETVAR_ACTION_QUOTED); return p::make_ACTION_SETVAR(*driver.loc.back()); } + YY_BREAK + case 58: + YY_RULE_SETUP +-#line 565 "seclang-scanner.ll" ++#line 566 "seclang-scanner.ll" + { BEGIN(SETVAR_ACTION_NONQUOTED); return p::make_ACTION_SETVAR(*driver.loc.back()); } + YY_BREAK + case 59: + YY_RULE_SETUP +-#line 568 "seclang-scanner.ll" ++#line 569 "seclang-scanner.ll" + { return p::make_ACTION_SEVERITY(yytext, *driver.loc.back()); } + YY_BREAK + case 60: + YY_RULE_SETUP +-#line 569 "seclang-scanner.ll" ++#line 570 "seclang-scanner.ll" + { return p::make_ACTION_SEVERITY(yytext, *driver.loc.back()); } + YY_BREAK + case 61: + YY_RULE_SETUP +-#line 570 "seclang-scanner.ll" ++#line 571 "seclang-scanner.ll" + { return p::make_ACTION_SKIP_AFTER(yytext, *driver.loc.back()); } + YY_BREAK + case 62: + YY_RULE_SETUP +-#line 571 "seclang-scanner.ll" ++#line 572 "seclang-scanner.ll" + { return p::make_ACTION_SKIP(yytext, *driver.loc.back()); } + YY_BREAK + case 63: + YY_RULE_SETUP +-#line 572 "seclang-scanner.ll" ++#line 573 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_TAG(yytext, *driver.loc.back()); } + YY_BREAK + case 64: + /* rule 64 can match eol */ + YY_RULE_SETUP +-#line 573 "seclang-scanner.ll" ++#line 574 "seclang-scanner.ll" + { return p::make_ACTION_VER(yytext, *driver.loc.back()); } + YY_BREAK + case 65: + YY_RULE_SETUP +-#line 574 "seclang-scanner.ll" ++#line 575 "seclang-scanner.ll" + { return p::make_ACTION_XMLNS(yytext, *driver.loc.back()); } + YY_BREAK + case 66: + YY_RULE_SETUP +-#line 576 "seclang-scanner.ll" ++#line 577 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT(yytext, *driver.loc.back()); } + YY_BREAK + case 67: + YY_RULE_SETUP +-#line 577 "seclang-scanner.ll" ++#line 578 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT(yytext, *driver.loc.back()); } + YY_BREAK + case 68: + YY_RULE_SETUP +-#line 578 "seclang-scanner.ll" ++#line 579 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT(yytext, *driver.loc.back()); } + YY_BREAK + case 69: + YY_RULE_SETUP +-#line 579 "seclang-scanner.ll" ++#line 580 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_SQL_HEX_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 70: + YY_RULE_SETUP +-#line 580 "seclang-scanner.ll" ++#line 581 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_BASE_64_ENCODE(yytext, *driver.loc.back()); } + YY_BREAK + case 71: + YY_RULE_SETUP +-#line 581 "seclang-scanner.ll" ++#line 582 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_BASE_64_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 72: + YY_RULE_SETUP +-#line 582 "seclang-scanner.ll" ++#line 583 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT(yytext, *driver.loc.back()); } + YY_BREAK + case 73: + YY_RULE_SETUP +-#line 583 "seclang-scanner.ll" ++#line 584 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_CMD_LINE(yytext, *driver.loc.back()); } + YY_BREAK + case 74: + YY_RULE_SETUP +-#line 584 "seclang-scanner.ll" ++#line 585 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_SHA1(yytext, *driver.loc.back()); } + YY_BREAK + case 75: + YY_RULE_SETUP +-#line 585 "seclang-scanner.ll" ++#line 586 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_MD5(yytext, *driver.loc.back()); } + YY_BREAK + case 76: + YY_RULE_SETUP +-#line 586 "seclang-scanner.ll" ++#line 587 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 77: + YY_RULE_SETUP +-#line 587 "seclang-scanner.ll" ++#line 588 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_HEX_ENCODE(yytext, *driver.loc.back()); } + YY_BREAK + case 78: + YY_RULE_SETUP +-#line 588 "seclang-scanner.ll" ++#line 589 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_HEX_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 79: + YY_RULE_SETUP +-#line 589 "seclang-scanner.ll" ++#line 590 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_LOWERCASE(yytext, *driver.loc.back()); } + YY_BREAK + case 80: + YY_RULE_SETUP +-#line 590 "seclang-scanner.ll" ++#line 591 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_UPPERCASE(yytext, *driver.loc.back()); } + YY_BREAK + case 81: + YY_RULE_SETUP +-#line 591 "seclang-scanner.ll" ++#line 592 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_URL_ENCODE(yytext, *driver.loc.back()); } + YY_BREAK + case 82: + YY_RULE_SETUP +-#line 592 "seclang-scanner.ll" ++#line 593 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_URL_DECODE_UNI(yytext, *driver.loc.back()); } + YY_BREAK + case 83: + YY_RULE_SETUP +-#line 593 "seclang-scanner.ll" ++#line 594 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_URL_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 84: + YY_RULE_SETUP +-#line 594 "seclang-scanner.ll" ++#line 595 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_NONE(yytext, *driver.loc.back()); } + YY_BREAK + case 85: + YY_RULE_SETUP +-#line 595 "seclang-scanner.ll" ++#line 596 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE(yytext, *driver.loc.back()); } + YY_BREAK + case 86: + YY_RULE_SETUP +-#line 596 "seclang-scanner.ll" ++#line 597 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_WHITESPACE(yytext, *driver.loc.back()); } + YY_BREAK + case 87: + YY_RULE_SETUP +-#line 597 "seclang-scanner.ll" ++#line 598 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REPLACE_NULLS(yytext, *driver.loc.back()); } + YY_BREAK + case 88: + YY_RULE_SETUP +-#line 598 "seclang-scanner.ll" ++#line 599 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_NULLS(yytext, *driver.loc.back()); } + YY_BREAK + case 89: + YY_RULE_SETUP +-#line 599 "seclang-scanner.ll" ++#line 600 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 90: + YY_RULE_SETUP +-#line 600 "seclang-scanner.ll" ++#line 601 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_JS_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 91: + YY_RULE_SETUP +-#line 601 "seclang-scanner.ll" ++#line 602 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_CSS_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 92: + YY_RULE_SETUP +-#line 602 "seclang-scanner.ll" ++#line 603 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_TRIM(yytext, *driver.loc.back()); } + YY_BREAK + case 93: + YY_RULE_SETUP +-#line 603 "seclang-scanner.ll" ++#line 604 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_TRIM_LEFT(yytext, *driver.loc.back()); } + YY_BREAK + case 94: + YY_RULE_SETUP +-#line 604 "seclang-scanner.ll" ++#line 605 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_TRIM_RIGHT(yytext, *driver.loc.back()); } + YY_BREAK + case 95: + YY_RULE_SETUP +-#line 605 "seclang-scanner.ll" ++#line 606 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN(yytext, *driver.loc.back()); } + YY_BREAK + case 96: + YY_RULE_SETUP +-#line 606 "seclang-scanner.ll" ++#line 607 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_NORMALISE_PATH(yytext, *driver.loc.back()); } + YY_BREAK + case 97: + YY_RULE_SETUP +-#line 607 "seclang-scanner.ll" ++#line 608 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_LENGTH(yytext, *driver.loc.back()); } + YY_BREAK + case 98: + YY_RULE_SETUP +-#line 608 "seclang-scanner.ll" ++#line 609 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_UTF8_TO_UNICODE(yytext, *driver.loc.back()); } + YY_BREAK + case 99: + YY_RULE_SETUP +-#line 609 "seclang-scanner.ll" ++#line 610 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR(yytext, *driver.loc.back()); } + YY_BREAK + case 100: + YY_RULE_SETUP +-#line 610 "seclang-scanner.ll" ++#line 611 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_COMMENTS(yytext, *driver.loc.back()); } + YY_BREAK + case 101: + YY_RULE_SETUP +-#line 611 "seclang-scanner.ll" ++#line 612 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REPLACE_COMMENTS(yytext, *driver.loc.back()); } + YY_BREAK + case 102: + YY_RULE_SETUP +-#line 612 "seclang-scanner.ll" ++#line 613 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_LOG_DATA(yytext, *driver.loc.back()); } + YY_BREAK + case 103: + YY_RULE_SETUP +-#line 614 "seclang-scanner.ll" ++#line 615 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_DETC(yytext, *driver.loc.back()); } + YY_BREAK + case 104: + YY_RULE_SETUP +-#line 615 "seclang-scanner.ll" ++#line 616 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_OFF(yytext, *driver.loc.back()); } + YY_BREAK + case 105: + YY_RULE_SETUP +-#line 616 "seclang-scanner.ll" ++#line 617 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_ON(yytext, *driver.loc.back()); } + YY_BREAK + case 106: + YY_RULE_SETUP +-#line 617 "seclang-scanner.ll" ++#line 618 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_RELEVANT_ONLY(yytext, *driver.loc.back()); } + YY_BREAK + case 107: + /* rule 107 can match eol */ + YY_RULE_SETUP +-#line 618 "seclang-scanner.ll" ++#line 619 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 108: + /* rule 108 can match eol */ + YY_RULE_SETUP +-#line 619 "seclang-scanner.ll" ++#line 620 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 109: + YY_RULE_SETUP +-#line 623 "seclang-scanner.ll" ++#line 624 "seclang-scanner.ll" + { return p::make_COMMA(*driver.loc.back()); } + YY_BREAK + +@@ -6156,75 +6163,75 @@ YY_RULE_SETUP + case 110: + /* rule 110 can match eol */ + YY_RULE_SETUP +-#line 628 "seclang-scanner.ll" ++#line 629 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 111: + /* rule 111 can match eol */ + YY_RULE_SETUP +-#line 629 "seclang-scanner.ll" ++#line 630 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 112: + YY_RULE_SETUP +-#line 634 "seclang-scanner.ll" ++#line 635 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); } + YY_BREAK + case 113: + /* rule 113 can match eol */ + YY_RULE_SETUP +-#line 635 "seclang-scanner.ll" ++#line 636 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(1); } + YY_BREAK + case 114: + /* rule 114 can match eol */ + YY_RULE_SETUP +-#line 636 "seclang-scanner.ll" ++#line 637 "seclang-scanner.ll" + { BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 115: + YY_RULE_SETUP +-#line 641 "seclang-scanner.ll" ++#line 642 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); p::make_NEW_LINE(*driver.loc.back()); } + YY_BREAK + case 116: + /* rule 116 can match eol */ + YY_RULE_SETUP +-#line 642 "seclang-scanner.ll" ++#line 643 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(1); } + YY_BREAK + case 117: + /* rule 117 can match eol */ + YY_RULE_SETUP +-#line 643 "seclang-scanner.ll" ++#line 644 "seclang-scanner.ll" + { BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 118: + YY_RULE_SETUP +-#line 648 "seclang-scanner.ll" ++#line 649 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_ACTION); yyless(0); } + YY_BREAK + + + case 119: + YY_RULE_SETUP +-#line 653 "seclang-scanner.ll" ++#line 654 "seclang-scanner.ll" + { BEGIN(ACTION_PREDICATE_ENDS_WITH_QUOTE); } + YY_BREAK + case 120: + YY_RULE_SETUP +-#line 654 "seclang-scanner.ll" ++#line 655 "seclang-scanner.ll" + { BEGIN(ACTION_PREDICATE_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 121: + YY_RULE_SETUP +-#line 655 "seclang-scanner.ll" ++#line 656 "seclang-scanner.ll" + { BEGIN(ACTION_PREDICATE_ENDS_WITH_COMMA_OR_DOUBLE_QUOTE); yyless(0); } + YY_BREAK + +@@ -6232,116 +6239,116 @@ YY_RULE_SETUP + case 122: + /* rule 122 can match eol */ + YY_RULE_SETUP +-#line 660 "seclang-scanner.ll" ++#line 661 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 123: + /* rule 123 can match eol */ + YY_RULE_SETUP +-#line 661 "seclang-scanner.ll" ++#line 662 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 124: + YY_RULE_SETUP +-#line 665 "seclang-scanner.ll" ++#line 666 "seclang-scanner.ll" + { yyless(1); BEGIN_PREVIOUS(); } + YY_BREAK + case 125: + YY_RULE_SETUP +-#line 666 "seclang-scanner.ll" ++#line 667 "seclang-scanner.ll" + { BEGIN_PREVIOUS(); } + YY_BREAK + case 126: + YY_RULE_SETUP +-#line 667 "seclang-scanner.ll" ++#line 668 "seclang-scanner.ll" + { BEGIN_PREVIOUS(); } + YY_BREAK + + + case 127: + YY_RULE_SETUP +-#line 671 "seclang-scanner.ll" ++#line 672 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(yyleng); } + YY_BREAK + case 128: + /* rule 128 can match eol */ + YY_RULE_SETUP +-#line 672 "seclang-scanner.ll" ++#line 673 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 129: + YY_RULE_SETUP +-#line 676 "seclang-scanner.ll" ++#line 677 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(yyleng); } + YY_BREAK + case 130: + /* rule 130 can match eol */ + YY_RULE_SETUP +-#line 677 "seclang-scanner.ll" ++#line 678 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 131: + YY_RULE_SETUP +-#line 681 "seclang-scanner.ll" ++#line 682 "seclang-scanner.ll" + { yyless(0); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 132: + YY_RULE_SETUP +-#line 682 "seclang-scanner.ll" ++#line 683 "seclang-scanner.ll" + { yyless(0); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE);} + YY_BREAK + case 133: + /* rule 133 can match eol */ + YY_RULE_SETUP +-#line 683 "seclang-scanner.ll" ++#line 684 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 134: + YY_RULE_SETUP +-#line 687 "seclang-scanner.ll" ++#line 688 "seclang-scanner.ll" + { BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + case 135: + YY_RULE_SETUP +-#line 688 "seclang-scanner.ll" ++#line 689 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } + YY_BREAK + + + case 136: + YY_RULE_SETUP +-#line 692 "seclang-scanner.ll" ++#line 693 "seclang-scanner.ll" + { return p::make_NOT(*driver.loc.back()); } + YY_BREAK + case 137: + /* rule 137 can match eol */ + YY_RULE_SETUP +-#line 693 "seclang-scanner.ll" ++#line 694 "seclang-scanner.ll" + { BEGIN_ACTION_OPERATION(); yyless(0); } + YY_BREAK + + + case 138: + YY_RULE_SETUP +-#line 698 "seclang-scanner.ll" ++#line 699 "seclang-scanner.ll" + { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } + YY_BREAK + case 139: + YY_RULE_SETUP +-#line 699 "seclang-scanner.ll" ++#line 700 "seclang-scanner.ll" + { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } + YY_BREAK + case 140: + YY_RULE_SETUP +-#line 700 "seclang-scanner.ll" ++#line 701 "seclang-scanner.ll" + { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } + YY_BREAK + +@@ -6349,27 +6356,27 @@ YY_RULE_SETUP + case 141: + /* rule 141 can match eol */ + YY_RULE_SETUP +-#line 704 "seclang-scanner.ll" ++#line 705 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0);} + YY_BREAK + + + case 142: + YY_RULE_SETUP +-#line 708 "seclang-scanner.ll" ++#line 709 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 143: + /* rule 143 can match eol */ + YY_RULE_SETUP +-#line 709 "seclang-scanner.ll" ++#line 710 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_ACTION); yyless(0); } + YY_BREAK + + + case 144: + YY_RULE_SETUP +-#line 717 "seclang-scanner.ll" ++#line 718 "seclang-scanner.ll" + { BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + +@@ -6377,1995 +6384,1993 @@ YY_RULE_SETUP + case 145: + /* rule 145 can match eol */ + YY_RULE_SETUP +-#line 722 "seclang-scanner.ll" ++#line 723 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 146: + /* rule 146 can match eol */ + YY_RULE_SETUP +-#line 723 "seclang-scanner.ll" ++#line 724 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0); } + YY_BREAK + + + case 147: + YY_RULE_SETUP +-#line 728 "seclang-scanner.ll" ++#line 729 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 148: + /* rule 148 can match eol */ + YY_RULE_SETUP +-#line 729 "seclang-scanner.ll" ++#line 730 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 149: + /* rule 149 can match eol */ + YY_RULE_SETUP +-#line 730 "seclang-scanner.ll" ++#line 731 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0); } + YY_BREAK + + + case YY_STATE_EOF(FINISH_ACTIONS): +-#line 738 "seclang-scanner.ll" ++#line 739 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(0); p::make_NEW_LINE(*driver.loc.back()); } + YY_BREAK + case 150: + YY_RULE_SETUP +-#line 739 "seclang-scanner.ll" ++#line 740 "seclang-scanner.ll" + { BEGIN(INITIAL); } + YY_BREAK + + case 151: + /* rule 151 can match eol */ + YY_RULE_SETUP +-#line 742 "seclang-scanner.ll" ++#line 743 "seclang-scanner.ll" + { return p::make_CONFIG_COMPONENT_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); } + YY_BREAK + case 152: + /* rule 152 can match eol */ + YY_RULE_SETUP +-#line 743 "seclang-scanner.ll" ++#line 744 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_SERVER_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); } + YY_BREAK + case 153: + /* rule 153 can match eol */ + YY_RULE_SETUP +-#line 744 "seclang-scanner.ll" ++#line 745 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(strchr(yytext, ' ') + 2), *driver.loc.back()); } + YY_BREAK + case 154: + YY_RULE_SETUP +-#line 745 "seclang-scanner.ll" ++#line 746 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 155: + YY_RULE_SETUP +-#line 746 "seclang-scanner.ll" ++#line 747 "seclang-scanner.ll" + { return p::make_CONFIG_CONTENT_INJECTION(*driver.loc.back()); } + YY_BREAK + case 156: + YY_RULE_SETUP +-#line 747 "seclang-scanner.ll" ++#line 748 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR_MOD(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 157: + YY_RULE_SETUP +-#line 748 "seclang-scanner.ll" ++#line 749 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR_MOD(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 158: + YY_RULE_SETUP +-#line 749 "seclang-scanner.ll" ++#line 750 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 159: + YY_RULE_SETUP +-#line 750 "seclang-scanner.ll" ++#line 751 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 160: + YY_RULE_SETUP +-#line 751 "seclang-scanner.ll" ++#line 752 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_ARGUMENT_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 161: + YY_RULE_SETUP +-#line 752 "seclang-scanner.ll" ++#line 753 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_ARGUMENT_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 162: + YY_RULE_SETUP +-#line 753 "seclang-scanner.ll" ++#line 754 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_ENG(yytext, *driver.loc.back()); } + YY_BREAK + case 163: + YY_RULE_SETUP +-#line 754 "seclang-scanner.ll" ++#line 755 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_FLE_MOD(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 164: + YY_RULE_SETUP +-#line 755 "seclang-scanner.ll" ++#line 756 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG2(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 165: + YY_RULE_SETUP +-#line 756 "seclang-scanner.ll" ++#line 757 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG_P(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 166: + YY_RULE_SETUP +-#line 757 "seclang-scanner.ll" ++#line 758 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG_P(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 167: + YY_RULE_SETUP +-#line 758 "seclang-scanner.ll" ++#line 759 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 168: + YY_RULE_SETUP +-#line 759 "seclang-scanner.ll" ++#line 760 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG_FMT(*driver.loc.back()); } + YY_BREAK + case 169: + YY_RULE_SETUP +-#line 760 "seclang-scanner.ll" ++#line 761 "seclang-scanner.ll" + { return p::make_JSON(*driver.loc.back()); } + YY_BREAK + case 170: + YY_RULE_SETUP +-#line 761 "seclang-scanner.ll" ++#line 762 "seclang-scanner.ll" + { return p::make_NATIVE(*driver.loc.back()); } + YY_BREAK + case 171: + YY_RULE_SETUP +-#line 762 "seclang-scanner.ll" ++#line 763 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 172: + YY_RULE_SETUP +-#line 763 "seclang-scanner.ll" ++#line 764 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_STS(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 173: + YY_RULE_SETUP +-#line 764 "seclang-scanner.ll" ++#line 765 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_STS(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 174: + YY_RULE_SETUP +-#line 765 "seclang-scanner.ll" ++#line 766 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_TPE(yytext, *driver.loc.back()); } + YY_BREAK + case 175: + YY_RULE_SETUP +-#line 768 "seclang-scanner.ll" ++#line 769 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_DEBUG_LOG(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 176: + YY_RULE_SETUP +-#line 769 "seclang-scanner.ll" ++#line 770 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_DEBUG_LOG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 177: + YY_RULE_SETUP +-#line 770 "seclang-scanner.ll" ++#line 771 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_DEBUG_LVL(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 178: + YY_RULE_SETUP +-#line 771 "seclang-scanner.ll" ++#line 772 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_GEO_DB(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 179: + YY_RULE_SETUP +-#line 772 "seclang-scanner.ll" ++#line 773 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 180: + YY_RULE_SETUP +-#line 773 "seclang-scanner.ll" ++#line 774 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_PCRE_MATCH_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 181: + YY_RULE_SETUP +-#line 774 "seclang-scanner.ll" ++#line 775 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_ARGS_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 182: + YY_RULE_SETUP +-#line 775 "seclang-scanner.ll" ++#line 776 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 183: + YY_RULE_SETUP +-#line 776 "seclang-scanner.ll" ++#line 777 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 184: + YY_RULE_SETUP +-#line 778 "seclang-scanner.ll" ++#line 779 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_LIMIT_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 185: + YY_RULE_SETUP +-#line 779 "seclang-scanner.ll" ++#line 780 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 186: + YY_RULE_SETUP +-#line 780 "seclang-scanner.ll" ++#line 781 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 187: + YY_RULE_SETUP +-#line 781 "seclang-scanner.ll" ++#line 782 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY(yytext, *driver.loc.back()); } + YY_BREAK + case 188: + YY_RULE_SETUP +-#line 782 "seclang-scanner.ll" ++#line 783 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RES_BODY_LIMIT_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 189: + YY_RULE_SETUP +-#line 783 "seclang-scanner.ll" ++#line 784 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RES_BODY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 190: + YY_RULE_SETUP +-#line 784 "seclang-scanner.ll" ++#line 785 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RES_BODY(yytext, *driver.loc.back()); } + YY_BREAK + case 191: + YY_RULE_SETUP +-#line 785 "seclang-scanner.ll" ++#line 786 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RULE_ENG(yytext, *driver.loc.back()); } + YY_BREAK + case 192: + YY_RULE_SETUP +-#line 786 "seclang-scanner.ll" ++#line 787 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_SEC_MARKER(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 193: + YY_RULE_SETUP +-#line 787 "seclang-scanner.ll" ++#line 788 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_SEC_MARKER(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 194: + YY_RULE_SETUP +-#line 788 "seclang-scanner.ll" ++#line 789 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_UNICODE_MAP_FILE(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 195: + YY_RULE_SETUP +-#line 789 "seclang-scanner.ll" ++#line 790 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 196: + YY_RULE_SETUP +-#line 790 "seclang-scanner.ll" ++#line 791 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 197: + YY_RULE_SETUP +-#line 791 "seclang-scanner.ll" ++#line 792 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 198: + YY_RULE_SETUP +-#line 792 "seclang-scanner.ll" ++#line 793 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 199: + YY_RULE_SETUP +-#line 793 "seclang-scanner.ll" ++#line 794 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 200: + YY_RULE_SETUP +-#line 794 "seclang-scanner.ll" ++#line 795 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 201: + YY_RULE_SETUP +-#line 795 "seclang-scanner.ll" ++#line 796 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 202: + YY_RULE_SETUP +-#line 796 "seclang-scanner.ll" ++#line 797 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 203: + YY_RULE_SETUP +-#line 797 "seclang-scanner.ll" ++#line 798 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 204: + YY_RULE_SETUP +-#line 798 "seclang-scanner.ll" ++#line 799 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 205: + YY_RULE_SETUP +-#line 799 "seclang-scanner.ll" ++#line 800 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 206: + YY_RULE_SETUP +-#line 800 "seclang-scanner.ll" ++#line 801 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 207: + YY_RULE_SETUP +-#line 801 "seclang-scanner.ll" ++#line 802 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 208: + YY_RULE_SETUP +-#line 802 "seclang-scanner.ll" ++#line 803 "seclang-scanner.ll" + { return p::make_CONFIG_UPDLOAD_KEEP_FILES(yytext, *driver.loc.back()); } + YY_BREAK + case 209: + YY_RULE_SETUP +-#line 803 "seclang-scanner.ll" ++#line 804 "seclang-scanner.ll" + { return p::make_CONFIG_UPDLOAD_SAVE_TMP_FILES(yytext, *driver.loc.back()); } + YY_BREAK + case 210: + YY_RULE_SETUP +-#line 804 "seclang-scanner.ll" ++#line 805 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 211: + YY_RULE_SETUP +-#line 805 "seclang-scanner.ll" ++#line 806 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 212: + YY_RULE_SETUP +-#line 806 "seclang-scanner.ll" ++#line 807 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_FILE_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 213: + YY_RULE_SETUP +-#line 807 "seclang-scanner.ll" ++#line 808 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_FILE_MODE(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 214: + YY_RULE_SETUP +-#line 808 "seclang-scanner.ll" ++#line 809 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_ABORT(yytext, *driver.loc.back()); } + YY_BREAK + case 215: + YY_RULE_SETUP +-#line 809 "seclang-scanner.ll" ++#line 810 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_DETC(yytext, *driver.loc.back()); } + YY_BREAK + case 216: + YY_RULE_SETUP +-#line 810 "seclang-scanner.ll" ++#line 811 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_HTTPS(yytext, *driver.loc.back()); } + YY_BREAK + case 217: + YY_RULE_SETUP +-#line 811 "seclang-scanner.ll" ++#line 812 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_OFF(yytext, *driver.loc.back()); } + YY_BREAK + case 218: + YY_RULE_SETUP +-#line 812 "seclang-scanner.ll" ++#line 813 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_ON(yytext, *driver.loc.back()); } + YY_BREAK + case 219: + YY_RULE_SETUP +-#line 813 "seclang-scanner.ll" ++#line 814 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_PARALLEL(yytext, *driver.loc.back()); } + YY_BREAK + case 220: + YY_RULE_SETUP +-#line 814 "seclang-scanner.ll" ++#line 815 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_PROCESS_PARTIAL(yytext, *driver.loc.back()); } + YY_BREAK + case 221: + YY_RULE_SETUP +-#line 815 "seclang-scanner.ll" ++#line 816 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_REJECT(yytext, *driver.loc.back()); } + YY_BREAK + case 222: + YY_RULE_SETUP +-#line 816 "seclang-scanner.ll" ++#line 817 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_RELEVANT_ONLY(yytext, *driver.loc.back()); } + YY_BREAK + case 223: + YY_RULE_SETUP +-#line 817 "seclang-scanner.ll" ++#line 818 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_SERIAL(yytext, *driver.loc.back()); } + YY_BREAK + case 224: + YY_RULE_SETUP +-#line 818 "seclang-scanner.ll" ++#line 819 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_WARN(yytext, *driver.loc.back()); } + YY_BREAK + case 225: + YY_RULE_SETUP +-#line 819 "seclang-scanner.ll" ++#line 820 "seclang-scanner.ll" + { return p::make_CONFIG_XML_EXTERNAL_ENTITY(yytext, *driver.loc.back()); } + YY_BREAK + case 226: + YY_RULE_SETUP +-#line 820 "seclang-scanner.ll" ++#line 821 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_RESPONSE_BODY_MP(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 227: + YY_RULE_SETUP +-#line 821 "seclang-scanner.ll" ++#line 822 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR(*driver.loc.back()); } + YY_BREAK + case 228: + YY_RULE_SETUP +-#line 822 "seclang-scanner.ll" ++#line 823 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_ARG_SEP(yytext, *driver.loc.back()); } + YY_BREAK + case 229: + YY_RULE_SETUP +-#line 823 "seclang-scanner.ll" ++#line 824 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_COOKIE_FORMAT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 230: + YY_RULE_SETUP +-#line 824 "seclang-scanner.ll" ++#line 825 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_COOKIEV0_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 231: + YY_RULE_SETUP +-#line 825 "seclang-scanner.ll" ++#line 826 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_COOKIEV0_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 232: + YY_RULE_SETUP +-#line 826 "seclang-scanner.ll" ++#line 827 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_DATA_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 233: + YY_RULE_SETUP +-#line 827 "seclang-scanner.ll" ++#line 828 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_DATA_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 234: + YY_RULE_SETUP +-#line 828 "seclang-scanner.ll" ++#line 829 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_STATUS_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 235: + YY_RULE_SETUP +-#line 829 "seclang-scanner.ll" ++#line 830 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_TMP_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 236: + YY_RULE_SETUP +-#line 830 "seclang-scanner.ll" ++#line 831 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_TMP_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 237: + YY_RULE_SETUP +-#line 831 "seclang-scanner.ll" ++#line 832 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_DIRECTIVE_SECRULESCRIPT(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 238: + YY_RULE_SETUP +-#line 832 "seclang-scanner.ll" ++#line 833 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_DIRECTIVE_SECRULESCRIPT(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 239: + YY_RULE_SETUP +-#line 833 "seclang-scanner.ll" ++#line 834 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CACHE_TRANSFORMATIONS(yytext, *driver.loc.back()); } + YY_BREAK + case 240: + YY_RULE_SETUP +-#line 834 "seclang-scanner.ll" ++#line 835 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CHROOT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 241: + YY_RULE_SETUP +-#line 835 "seclang-scanner.ll" ++#line 836 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CHROOT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 242: + YY_RULE_SETUP +-#line 836 "seclang-scanner.ll" ++#line 837 "seclang-scanner.ll" + { return p::make_CONFIG_CONN_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 243: + YY_RULE_SETUP +-#line 837 "seclang-scanner.ll" ++#line 838 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 244: + YY_RULE_SETUP +-#line 838 "seclang-scanner.ll" ++#line 839 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_KEY(yytext, *driver.loc.back()); } + YY_BREAK + case 245: + YY_RULE_SETUP +-#line 839 "seclang-scanner.ll" ++#line 840 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_PARAM(yytext, *driver.loc.back()); } + YY_BREAK + case 246: + YY_RULE_SETUP +-#line 840 "seclang-scanner.ll" ++#line 841 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_METHOD_RX(yytext, *driver.loc.back()); } + YY_BREAK + case 247: + YY_RULE_SETUP +-#line 841 "seclang-scanner.ll" ++#line 842 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_METHOD_PM(yytext, *driver.loc.back()); } + YY_BREAK + case 248: + YY_RULE_SETUP +-#line 842 "seclang-scanner.ll" ++#line 843 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_GSB_DB(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 249: + YY_RULE_SETUP +-#line 843 "seclang-scanner.ll" ++#line 844 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_GSB_DB(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 250: + YY_RULE_SETUP +-#line 844 "seclang-scanner.ll" ++#line 845 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_GUARDIAN_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 251: + YY_RULE_SETUP +-#line 845 "seclang-scanner.ll" ++#line 846 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_INTERCEPT_ON_ERROR(yytext, *driver.loc.back()); } + YY_BREAK + case 252: + YY_RULE_SETUP +-#line 846 "seclang-scanner.ll" ++#line 847 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CONN_R_STATE_LIMIT(yytext, *driver.loc.back()); } + YY_BREAK + case 253: + YY_RULE_SETUP +-#line 847 "seclang-scanner.ll" ++#line 848 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CONN_W_STATE_LIMIT(yytext, *driver.loc.back()); } + YY_BREAK + case 254: + YY_RULE_SETUP +-#line 848 "seclang-scanner.ll" ++#line 849 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_SENSOR_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 255: + YY_RULE_SETUP +-#line 849 "seclang-scanner.ll" ++#line 850 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_INHERITANCE(yytext, *driver.loc.back()); } + YY_BREAK + case 256: + YY_RULE_SETUP +-#line 850 "seclang-scanner.ll" ++#line 851 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_PERF_TIME(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 257: + YY_RULE_SETUP +-#line 851 "seclang-scanner.ll" ++#line 852 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_STREAM_IN_BODY_INSPECTION(yytext, *driver.loc.back()); } + YY_BREAK + case 258: + YY_RULE_SETUP +-#line 852 "seclang-scanner.ll" ++#line 853 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION(yytext, *driver.loc.back()); } + YY_BREAK + case 259: + YY_RULE_SETUP +-#line 853 "seclang-scanner.ll" ++#line 854 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_DISABLE_BACKEND_COMPRESS(yytext, *driver.loc.back()); } + YY_BREAK + case 260: + YY_RULE_SETUP +-#line 855 "seclang-scanner.ll" ++#line 856 "seclang-scanner.ll" + { BEGIN(TRANSACTION_TO_VARIABLE); return p::make_DIRECTIVE(yytext, *driver.loc.back()); } + YY_BREAK + case 261: + YY_RULE_SETUP +-#line 856 "seclang-scanner.ll" ++#line 857 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_CONFIG_DIR_SEC_DEFAULT_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 262: + YY_RULE_SETUP +-#line 857 "seclang-scanner.ll" ++#line 858 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_CONFIG_DIR_SEC_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 263: + YY_RULE_SETUP +-#line 859 "seclang-scanner.ll" ++#line 860 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 264: + YY_RULE_SETUP +-#line 860 "seclang-scanner.ll" ++#line 861 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_COLLECTION_TIMEOUT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 265: + YY_RULE_SETUP +-#line 861 "seclang-scanner.ll" ++#line 862 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HTTP_BLKEY(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 266: + /* rule 266 can match eol */ + YY_RULE_SETUP +-#line 862 "seclang-scanner.ll" ++#line 863 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 267: + /* rule 267 can match eol */ + YY_RULE_SETUP +-#line 863 "seclang-scanner.ll" ++#line 864 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(COMMENT); } + YY_BREAK + case 268: + /* rule 268 can match eol */ + YY_RULE_SETUP +-#line 864 "seclang-scanner.ll" ++#line 865 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(COMMENT); } + YY_BREAK + case 269: + YY_RULE_SETUP +-#line 865 "seclang-scanner.ll" ++#line 866 "seclang-scanner.ll" + { driver.loc.back()->step(); /* comment, just ignore. */ } + YY_BREAK + case 270: + YY_RULE_SETUP +-#line 866 "seclang-scanner.ll" ++#line 867 "seclang-scanner.ll" + { driver.loc.back()->step(); /* carriage return, just ignore. */} + YY_BREAK + case 271: + YY_RULE_SETUP +-#line 867 "seclang-scanner.ll" ++#line 868 "seclang-scanner.ll" + { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } + YY_BREAK + case 272: + YY_RULE_SETUP +-#line 868 "seclang-scanner.ll" ++#line 869 "seclang-scanner.ll" + { return p::make_COMMA(*driver.loc.back()); } + YY_BREAK + + case 273: + YY_RULE_SETUP +-#line 871 "seclang-scanner.ll" ++#line 872 "seclang-scanner.ll" + { BEGIN(EXPECTING_VARIABLE); } + YY_BREAK + + + case 274: + YY_RULE_SETUP +-#line 875 "seclang-scanner.ll" ++#line 876 "seclang-scanner.ll" + { return p::make_PIPE(*driver.loc.back()); } + YY_BREAK + case 275: + YY_RULE_SETUP +-#line 876 "seclang-scanner.ll" ++#line 877 "seclang-scanner.ll" + { return p::make_PIPE(*driver.loc.back()); } + YY_BREAK + case 276: + YY_RULE_SETUP +-#line 877 "seclang-scanner.ll" ++#line 878 "seclang-scanner.ll" + { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } + YY_BREAK + case 277: + YY_RULE_SETUP +-#line 878 "seclang-scanner.ll" ++#line 879 "seclang-scanner.ll" + { return p::make_VAR_EXCLUSION(*driver.loc.back()); } + YY_BREAK + case 278: + YY_RULE_SETUP +-#line 879 "seclang-scanner.ll" ++#line 880 "seclang-scanner.ll" + { return p::make_VAR_COUNT(*driver.loc.back()); } + YY_BREAK + + + case 279: + YY_RULE_SETUP +-#line 883 "seclang-scanner.ll" ++#line 884 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 280: + YY_RULE_SETUP +-#line 884 "seclang-scanner.ll" ++#line 885 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 281: + /* rule 281 can match eol */ + YY_RULE_SETUP +-#line 885 "seclang-scanner.ll" ++#line 886 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 282: + /* rule 282 can match eol */ + YY_RULE_SETUP +-#line 886 "seclang-scanner.ll" ++#line 887 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 283: + /* rule 283 can match eol */ + YY_RULE_SETUP +-#line 887 "seclang-scanner.ll" ++#line 888 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 284: + /* rule 284 can match eol */ + YY_RULE_SETUP +-#line 888 "seclang-scanner.ll" ++#line 889 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + + + case 285: + YY_RULE_SETUP +-#line 892 "seclang-scanner.ll" ++#line 893 "seclang-scanner.ll" + { } + YY_BREAK + case 286: + YY_RULE_SETUP +-#line 893 "seclang-scanner.ll" ++#line 894 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 287: + /* rule 287 can match eol */ + YY_RULE_SETUP +-#line 894 "seclang-scanner.ll" ++#line 895 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 288: + /* rule 288 can match eol */ + YY_RULE_SETUP +-#line 895 "seclang-scanner.ll" ++#line 896 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + + + case 289: + YY_RULE_SETUP +-#line 900 "seclang-scanner.ll" ++#line 901 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } + YY_BREAK + case 290: + YY_RULE_SETUP +-#line 901 "seclang-scanner.ll" ++#line 902 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_COMBINED_SIZE(*driver.loc.back()); } + YY_BREAK + case 291: + YY_RULE_SETUP +-#line 902 "seclang-scanner.ll" ++#line 903 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_GET_NAMES(*driver.loc.back()); } + YY_BREAK + case 292: + YY_RULE_SETUP +-#line 903 "seclang-scanner.ll" ++#line 904 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_GET_NAMES(*driver.loc.back()); } + YY_BREAK + case 293: + YY_RULE_SETUP +-#line 904 "seclang-scanner.ll" ++#line 905 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_NAMES(*driver.loc.back()); } + YY_BREAK + case 294: + YY_RULE_SETUP +-#line 905 "seclang-scanner.ll" ++#line 906 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_NAMES(*driver.loc.back()); } + YY_BREAK + case 295: + YY_RULE_SETUP +-#line 906 "seclang-scanner.ll" ++#line 907 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_POST_NAMES(*driver.loc.back()); } + YY_BREAK + case 296: + YY_RULE_SETUP +-#line 907 "seclang-scanner.ll" ++#line 908 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_POST_NAMES(*driver.loc.back()); } + YY_BREAK + case 297: + YY_RULE_SETUP +-#line 908 "seclang-scanner.ll" ++#line 909 "seclang-scanner.ll" + { return p::make_VARIABLE_AUTH_TYPE(*driver.loc.back()); } + YY_BREAK + case 298: + YY_RULE_SETUP +-#line 909 "seclang-scanner.ll" ++#line 910 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_COMBINED_SIZE(*driver.loc.back()); } + YY_BREAK + case 299: + YY_RULE_SETUP +-#line 910 "seclang-scanner.ll" ++#line 911 "seclang-scanner.ll" + { return p::make_VARIABLE_FULL_REQUEST_LENGTH(*driver.loc.back()); } + YY_BREAK + case 300: + YY_RULE_SETUP +-#line 911 "seclang-scanner.ll" ++#line 912 "seclang-scanner.ll" + { return p::make_VARIABLE_FULL_REQUEST(*driver.loc.back()); } + YY_BREAK + case 301: + YY_RULE_SETUP +-#line 912 "seclang-scanner.ll" ++#line 913 "seclang-scanner.ll" + { return p::make_VARIABLE_INBOUND_DATA_ERROR(*driver.loc.back()); } + YY_BREAK + case 302: + YY_RULE_SETUP +-#line 913 "seclang-scanner.ll" ++#line 914 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VAR_NAME(*driver.loc.back()); } + YY_BREAK + case 303: + YY_RULE_SETUP +-#line 914 "seclang-scanner.ll" ++#line 915 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VAR(*driver.loc.back()); } + YY_BREAK + case 304: + YY_RULE_SETUP +-#line 915 "seclang-scanner.ll" ++#line 916 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_BOUNDARY_QUOTED(*driver.loc.back()); } + YY_BREAK + case 305: + YY_RULE_SETUP +-#line 916 "seclang-scanner.ll" ++#line 917 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE(*driver.loc.back()); } + YY_BREAK + case 306: + YY_RULE_SETUP +-#line 917 "seclang-scanner.ll" ++#line 918 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_CRLF_LF_LINES(*driver.loc.back()); } + YY_BREAK + case 307: + YY_RULE_SETUP +-#line 918 "seclang-scanner.ll" ++#line 919 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_DATA_AFTER(*driver.loc.back()); } + YY_BREAK + case 308: + YY_RULE_SETUP +-#line 919 "seclang-scanner.ll" ++#line 920 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_DATA_BEFORE(*driver.loc.back()); } + YY_BREAK + case 309: + YY_RULE_SETUP +-#line 920 "seclang-scanner.ll" ++#line 921 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED(*driver.loc.back()); } + YY_BREAK + case 310: + YY_RULE_SETUP +-#line 921 "seclang-scanner.ll" ++#line 922 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_FILENAME(*driver.loc.back()); } + YY_BREAK + case 311: + YY_RULE_SETUP +-#line 922 "seclang-scanner.ll" ++#line 923 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_FILENAME(*driver.loc.back()); } + YY_BREAK + case 312: + YY_RULE_SETUP +-#line 923 "seclang-scanner.ll" ++#line 924 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_HEADER_FOLDING(*driver.loc.back()); } + YY_BREAK + case 313: + YY_RULE_SETUP +-#line 924 "seclang-scanner.ll" ++#line 925 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_HEADER_FOLDING(*driver.loc.back()); } + YY_BREAK + case 314: + YY_RULE_SETUP +-#line 925 "seclang-scanner.ll" ++#line 926 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING(*driver.loc.back()); } + YY_BREAK + case 315: + YY_RULE_SETUP +-#line 926 "seclang-scanner.ll" ++#line 927 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_INVALID_PART(*driver.loc.back()); } + YY_BREAK + case 316: + YY_RULE_SETUP +-#line 927 "seclang-scanner.ll" ++#line 928 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_INVALID_QUOTING(*driver.loc.back()); } + YY_BREAK + case 317: + YY_RULE_SETUP +-#line 928 "seclang-scanner.ll" ++#line 929 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_LF_LINE(*driver.loc.back()); } + YY_BREAK + case 318: + YY_RULE_SETUP +-#line 929 "seclang-scanner.ll" ++#line 930 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_MISSING_SEMICOLON(*driver.loc.back()); } + YY_BREAK + case 319: + YY_RULE_SETUP +-#line 930 "seclang-scanner.ll" ++#line 931 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_SEMICOLON_MISSING(*driver.loc.back()); } + YY_BREAK + case 320: + YY_RULE_SETUP +-#line 931 "seclang-scanner.ll" ++#line 932 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_NAME(*driver.loc.back()); } + YY_BREAK + case 321: + YY_RULE_SETUP +-#line 932 "seclang-scanner.ll" ++#line 933 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_NAME(*driver.loc.back()); } + YY_BREAK + case 322: + YY_RULE_SETUP +-#line 933 "seclang-scanner.ll" ++#line 934 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_STRICT_ERROR(*driver.loc.back()); } + YY_BREAK + case 323: + YY_RULE_SETUP +-#line 934 "seclang-scanner.ll" ++#line 935 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY(*driver.loc.back()); } + YY_BREAK + case 324: + YY_RULE_SETUP +-#line 935 "seclang-scanner.ll" ++#line 936 "seclang-scanner.ll" + { return p::make_VARIABLE_OUTBOUND_DATA_ERROR(*driver.loc.back()); } + YY_BREAK + case 325: + YY_RULE_SETUP +-#line 936 "seclang-scanner.ll" ++#line 937 "seclang-scanner.ll" + { return p::make_VARIABLE_PATH_INFO(*driver.loc.back()); } + YY_BREAK + case 326: + YY_RULE_SETUP +-#line 937 "seclang-scanner.ll" ++#line 938 "seclang-scanner.ll" + { return p::make_VARIABLE_QUERY_STRING(*driver.loc.back()); } + YY_BREAK + case 327: + YY_RULE_SETUP +-#line 938 "seclang-scanner.ll" ++#line 939 "seclang-scanner.ll" + { return p::make_VARIABLE_REMOTE_ADDR(*driver.loc.back()); } + YY_BREAK + case 328: + YY_RULE_SETUP +-#line 939 "seclang-scanner.ll" ++#line 940 "seclang-scanner.ll" + { return p::make_VARIABLE_REMOTE_HOST(*driver.loc.back()); } + YY_BREAK + case 329: + YY_RULE_SETUP +-#line 940 "seclang-scanner.ll" ++#line 941 "seclang-scanner.ll" + { return p::make_VARIABLE_REMOTE_PORT(*driver.loc.back()); } + YY_BREAK + case 330: + YY_RULE_SETUP +-#line 941 "seclang-scanner.ll" ++#line 942 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_ERROR_MSG(*driver.loc.back()); } + YY_BREAK + case 331: + YY_RULE_SETUP +-#line 942 "seclang-scanner.ll" ++#line 943 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_ERROR(*driver.loc.back()); } + YY_BREAK + case 332: + YY_RULE_SETUP +-#line 943 "seclang-scanner.ll" ++#line 944 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG(*driver.loc.back()); } + YY_BREAK + case 333: + YY_RULE_SETUP +-#line 944 "seclang-scanner.ll" ++#line 945 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_PROCESSOR_ERROR(*driver.loc.back()); } + YY_BREAK + case 334: + YY_RULE_SETUP +-#line 945 "seclang-scanner.ll" ++#line 946 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_PROCESSOR(*driver.loc.back()); } + YY_BREAK + case 335: + YY_RULE_SETUP +-#line 946 "seclang-scanner.ll" ++#line 947 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_BASENAME(*driver.loc.back()); } + YY_BREAK + case 336: + YY_RULE_SETUP +-#line 947 "seclang-scanner.ll" ++#line 948 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_BODY_LENGTH(*driver.loc.back()); } + YY_BREAK + case 337: + YY_RULE_SETUP +-#line 948 "seclang-scanner.ll" ++#line 949 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_BODY(*driver.loc.back()); } + YY_BREAK + case 338: + YY_RULE_SETUP +-#line 949 "seclang-scanner.ll" ++#line 950 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_FILE_NAME(*driver.loc.back()); } + YY_BREAK + case 339: + YY_RULE_SETUP +-#line 950 "seclang-scanner.ll" ++#line 951 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 340: + YY_RULE_SETUP +-#line 951 "seclang-scanner.ll" ++#line 952 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 341: + YY_RULE_SETUP +-#line 952 "seclang-scanner.ll" ++#line 953 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_LINE(*driver.loc.back()); } + YY_BREAK + case 342: + YY_RULE_SETUP +-#line 953 "seclang-scanner.ll" ++#line 954 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_METHOD(*driver.loc.back()); } + YY_BREAK + case 343: + YY_RULE_SETUP +-#line 954 "seclang-scanner.ll" ++#line 955 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_PROTOCOL(*driver.loc.back()); } + YY_BREAK + case 344: + YY_RULE_SETUP +-#line 955 "seclang-scanner.ll" ++#line 956 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_URI_RAW(*driver.loc.back()); } + YY_BREAK + case 345: + YY_RULE_SETUP +-#line 956 "seclang-scanner.ll" ++#line 957 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_URI(*driver.loc.back()); } + YY_BREAK + case 346: + YY_RULE_SETUP +-#line 957 "seclang-scanner.ll" ++#line 958 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_BODY(*driver.loc.back()); } + YY_BREAK + case 347: + YY_RULE_SETUP +-#line 958 "seclang-scanner.ll" ++#line 959 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_CONTENT_LENGTH(*driver.loc.back()); } + YY_BREAK + case 348: + YY_RULE_SETUP +-#line 959 "seclang-scanner.ll" ++#line 960 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_CONTENT_TYPE(*driver.loc.back()); } + YY_BREAK + case 349: + YY_RULE_SETUP +-#line 960 "seclang-scanner.ll" ++#line 961 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 350: + YY_RULE_SETUP +-#line 961 "seclang-scanner.ll" ++#line 962 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RESPONSE_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 351: + YY_RULE_SETUP +-#line 962 "seclang-scanner.ll" ++#line 963 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_PROTOCOL(*driver.loc.back()); } + YY_BREAK + case 352: + YY_RULE_SETUP +-#line 963 "seclang-scanner.ll" ++#line 964 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_STATUS(*driver.loc.back()); } + YY_BREAK + case 353: + YY_RULE_SETUP +-#line 964 "seclang-scanner.ll" ++#line 965 "seclang-scanner.ll" + { return p::make_VARIABLE_SERVER_ADDR(*driver.loc.back()); } + YY_BREAK + case 354: + YY_RULE_SETUP +-#line 965 "seclang-scanner.ll" ++#line 966 "seclang-scanner.ll" + { return p::make_VARIABLE_SERVER_NAME(*driver.loc.back()); } + YY_BREAK + case 355: + YY_RULE_SETUP +-#line 966 "seclang-scanner.ll" ++#line 967 "seclang-scanner.ll" + { return p::make_VARIABLE_SERVER_PORT(*driver.loc.back()); } + YY_BREAK + case 356: + YY_RULE_SETUP +-#line 967 "seclang-scanner.ll" ++#line 968 "seclang-scanner.ll" + { return p::make_VARIABLE_SESSION_ID(*driver.loc.back()); } + YY_BREAK + case 357: + YY_RULE_SETUP +-#line 968 "seclang-scanner.ll" ++#line 969 "seclang-scanner.ll" + { return p::make_VARIABLE_UNIQUE_ID(*driver.loc.back()); } + YY_BREAK + case 358: + YY_RULE_SETUP +-#line 969 "seclang-scanner.ll" ++#line 970 "seclang-scanner.ll" + { return p::make_VARIABLE_URL_ENCODED_ERROR(*driver.loc.back()); } + YY_BREAK + case 359: + YY_RULE_SETUP +-#line 970 "seclang-scanner.ll" ++#line 971 "seclang-scanner.ll" + { return p::make_VARIABLE_USER_ID(*driver.loc.back()); } + YY_BREAK + case 360: + YY_RULE_SETUP +-#line 971 "seclang-scanner.ll" ++#line 972 "seclang-scanner.ll" + { return p::make_VARIABLE_WEB_APP_ID(*driver.loc.back()); } + YY_BREAK + case 361: + YY_RULE_SETUP +-#line 972 "seclang-scanner.ll" ++#line 973 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS(*driver.loc.back()); } + YY_BREAK + case 362: + YY_RULE_SETUP +-#line 973 "seclang-scanner.ll" ++#line 974 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS(*driver.loc.back()); } + YY_BREAK + case 363: + YY_RULE_SETUP +-#line 974 "seclang-scanner.ll" ++#line 975 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_GET(*driver.loc.back()); } + YY_BREAK + case 364: + YY_RULE_SETUP +-#line 975 "seclang-scanner.ll" ++#line 976 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_GET(*driver.loc.back()); } + YY_BREAK + case 365: + YY_RULE_SETUP +-#line 976 "seclang-scanner.ll" ++#line 977 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_POST(*driver.loc.back()); } + YY_BREAK + case 366: + YY_RULE_SETUP +-#line 977 "seclang-scanner.ll" ++#line 978 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_POST(*driver.loc.back()); } + YY_BREAK + case 367: + YY_RULE_SETUP +-#line 978 "seclang-scanner.ll" ++#line 979 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_SIZES(*driver.loc.back()); } + YY_BREAK + case 368: + YY_RULE_SETUP +-#line 979 "seclang-scanner.ll" ++#line 980 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_SIZES(*driver.loc.back()); } + YY_BREAK + case 369: + YY_RULE_SETUP +-#line 980 "seclang-scanner.ll" ++#line 981 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_NAMES(*driver.loc.back()); } + YY_BREAK + case 370: + YY_RULE_SETUP +-#line 981 "seclang-scanner.ll" ++#line 982 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_NAMES(*driver.loc.back()); } + YY_BREAK + case 371: + YY_RULE_SETUP +-#line 982 "seclang-scanner.ll" ++#line 983 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_TMP_CONTENT(*driver.loc.back()); } + YY_BREAK + case 372: + YY_RULE_SETUP +-#line 983 "seclang-scanner.ll" ++#line 984 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_CONTENT(*driver.loc.back()); } + YY_BREAK + case 373: + YY_RULE_SETUP +-#line 984 "seclang-scanner.ll" ++#line 985 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VARS_NAMES(*driver.loc.back()); } + YY_BREAK + case 374: + YY_RULE_SETUP +-#line 985 "seclang-scanner.ll" ++#line 986 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MATCHED_VARS_NAMES(*driver.loc.back()); } + YY_BREAK + case 375: + YY_RULE_SETUP +-#line 986 "seclang-scanner.ll" ++#line 987 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VARS(*driver.loc.back()); } + YY_BREAK + case 376: + YY_RULE_SETUP +-#line 987 "seclang-scanner.ll" ++#line 988 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MATCHED_VARS(*driver.loc.back()); } + YY_BREAK + case 377: + YY_RULE_SETUP +-#line 988 "seclang-scanner.ll" ++#line 989 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES(*driver.loc.back()); } + YY_BREAK + case 378: + YY_RULE_SETUP +-#line 989 "seclang-scanner.ll" ++#line 990 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES(*driver.loc.back()); } + YY_BREAK + case 379: + YY_RULE_SETUP +-#line 990 "seclang-scanner.ll" ++#line 991 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_COOKIES(*driver.loc.back()); } + YY_BREAK + case 380: + YY_RULE_SETUP +-#line 991 "seclang-scanner.ll" ++#line 992 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES(*driver.loc.back()); } + YY_BREAK + case 381: + YY_RULE_SETUP +-#line 992 "seclang-scanner.ll" ++#line 993 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_HEADERS(*driver.loc.back()); } + YY_BREAK + case 382: + YY_RULE_SETUP +-#line 993 "seclang-scanner.ll" ++#line 994 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_HEADERS(*driver.loc.back()); } + YY_BREAK + case 383: + YY_RULE_SETUP +-#line 994 "seclang-scanner.ll" ++#line 995 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_HEADERS(*driver.loc.back()); } + YY_BREAK + case 384: + YY_RULE_SETUP +-#line 995 "seclang-scanner.ll" ++#line 996 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RESPONSE_HEADERS(*driver.loc.back()); } + YY_BREAK + case 385: + YY_RULE_SETUP +-#line 996 "seclang-scanner.ll" ++#line 997 "seclang-scanner.ll" + { return p::make_VARIABLE_GEO(*driver.loc.back()); } + YY_BREAK + case 386: + YY_RULE_SETUP +-#line 997 "seclang-scanner.ll" ++#line 998 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_GEO(*driver.loc.back()); } + YY_BREAK + case 387: + YY_RULE_SETUP +-#line 998 "seclang-scanner.ll" ++#line 999 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } + YY_BREAK + case 388: + YY_RULE_SETUP +-#line 999 "seclang-scanner.ll" ++#line 1000 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } + YY_BREAK + case 389: + YY_RULE_SETUP +-#line 1000 "seclang-scanner.ll" +-{ return p::make_VARIABLE_RULE(*driver.loc.back()); } ++#line 1001 "seclang-scanner.ll" ++{ return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } + YY_BREAK + case 390: + YY_RULE_SETUP +-#line 1001 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RULE(*driver.loc.back()); } ++#line 1002 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } + YY_BREAK + case 391: + YY_RULE_SETUP +-#line 1002 "seclang-scanner.ll" +-{ return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } ++#line 1003 "seclang-scanner.ll" ++{ return p::make_VARIABLE_RULE(*driver.loc.back()); } + YY_BREAK + case 392: + YY_RULE_SETUP +-#line 1003 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } ++#line 1004 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RULE(*driver.loc.back()); } + YY_BREAK + case 393: + YY_RULE_SETUP +-#line 1004 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } ++#line 1005 "seclang-scanner.ll" ++{ return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } + YY_BREAK + case 394: + YY_RULE_SETUP +-#line 1005 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } ++#line 1006 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } + YY_BREAK + case 395: + YY_RULE_SETUP +-#line 1006 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } ++#line 1007 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } + YY_BREAK + case 396: + YY_RULE_SETUP +-#line 1007 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } ++#line 1008 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } + YY_BREAK + case 397: + YY_RULE_SETUP +-#line 1008 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_BLD(yytext, *driver.loc.back()); } ++#line 1009 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } + YY_BREAK + case 398: + YY_RULE_SETUP +-#line 1009 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_DUR(yytext, *driver.loc.back()); } ++#line 1010 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } + YY_BREAK + case 399: + YY_RULE_SETUP +-#line 1010 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_HSV(yytext, *driver.loc.back()); } ++#line 1011 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_BLD(yytext, *driver.loc.back()); } + YY_BREAK + case 400: + YY_RULE_SETUP +-#line 1011 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_REMOTE_USER(yytext, *driver.loc.back()); } ++#line 1012 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_DUR(yytext, *driver.loc.back()); } + YY_BREAK + case 401: + YY_RULE_SETUP +-#line 1012 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_DAY(yytext, *driver.loc.back()); } ++#line 1013 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_HSV(yytext, *driver.loc.back()); } + YY_BREAK + case 402: + YY_RULE_SETUP +-#line 1013 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_EPOCH(yytext, *driver.loc.back()); } ++#line 1014 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_REMOTE_USER(yytext, *driver.loc.back()); } + YY_BREAK + case 403: + YY_RULE_SETUP +-#line 1014 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_HOUR(yytext, *driver.loc.back()); } ++#line 1015 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_DAY(yytext, *driver.loc.back()); } + YY_BREAK + case 404: + YY_RULE_SETUP +-#line 1015 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_MIN(yytext, *driver.loc.back()); } ++#line 1016 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_EPOCH(yytext, *driver.loc.back()); } + YY_BREAK + case 405: + YY_RULE_SETUP +-#line 1016 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_MON(yytext, *driver.loc.back()); } ++#line 1017 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_HOUR(yytext, *driver.loc.back()); } + YY_BREAK + case 406: + YY_RULE_SETUP +-#line 1017 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_SEC(yytext, *driver.loc.back()); } ++#line 1018 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_MIN(yytext, *driver.loc.back()); } + YY_BREAK + case 407: + YY_RULE_SETUP +-#line 1018 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_YEAR(yytext, *driver.loc.back()); } ++#line 1019 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_MON(yytext, *driver.loc.back()); } + YY_BREAK + case 408: + YY_RULE_SETUP +-#line 1019 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME(yytext, *driver.loc.back()); } ++#line 1020 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_SEC(yytext, *driver.loc.back()); } + YY_BREAK + case 409: + YY_RULE_SETUP +-#line 1020 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_WDAY(yytext, *driver.loc.back()); } ++#line 1021 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_YEAR(yytext, *driver.loc.back()); } + YY_BREAK + case 410: + YY_RULE_SETUP +-#line 1023 "seclang-scanner.ll" +-{ driver.error (*driver.loc.back(), "Variable VARIABLE_WEBSERVER_ERROR_LOG is not supported by libModSecurity", ""); throw p::syntax_error(*driver.loc.back(), "");} ++#line 1022 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME(yytext, *driver.loc.back()); } + YY_BREAK + case 411: + YY_RULE_SETUP +-#line 1024 "seclang-scanner.ll" +-{ return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } ++#line 1023 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_WDAY(yytext, *driver.loc.back()); } + YY_BREAK + case 412: + YY_RULE_SETUP +-#line 1025 "seclang-scanner.ll" +-{ return p::make_VARIABLE_IP(*driver.loc.back()); } ++#line 1026 "seclang-scanner.ll" ++{ driver.error (*driver.loc.back(), "Variable VARIABLE_WEBSERVER_ERROR_LOG is not supported by libModSecurity", ""); throw p::syntax_error(*driver.loc.back(), "");} + YY_BREAK + case 413: + YY_RULE_SETUP +-#line 1026 "seclang-scanner.ll" +-{ return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } ++#line 1027 "seclang-scanner.ll" ++{ return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } + YY_BREAK + case 414: + YY_RULE_SETUP +-#line 1027 "seclang-scanner.ll" +-{ return p::make_VARIABLE_SESSION(*driver.loc.back()); } ++#line 1028 "seclang-scanner.ll" ++{ return p::make_VARIABLE_IP(*driver.loc.back()); } + YY_BREAK + case 415: + YY_RULE_SETUP +-#line 1028 "seclang-scanner.ll" +-{ return p::make_VARIABLE_STATUS(*driver.loc.back()); } ++#line 1029 "seclang-scanner.ll" ++{ return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } + YY_BREAK + case 416: + YY_RULE_SETUP +-#line 1029 "seclang-scanner.ll" +-{ return p::make_VARIABLE_STATUS_LINE(*driver.loc.back()); } ++#line 1030 "seclang-scanner.ll" ++{ return p::make_VARIABLE_SESSION(*driver.loc.back()); } + YY_BREAK + case 417: + YY_RULE_SETUP +-#line 1030 "seclang-scanner.ll" +-{ return p::make_VARIABLE_TX(*driver.loc.back()); } ++#line 1031 "seclang-scanner.ll" ++{ return p::make_VARIABLE_STATUS(*driver.loc.back()); } + YY_BREAK + case 418: + YY_RULE_SETUP +-#line 1031 "seclang-scanner.ll" +-{ return p::make_VARIABLE_USER(*driver.loc.back()); } ++#line 1032 "seclang-scanner.ll" ++{ return p::make_VARIABLE_STATUS_LINE(*driver.loc.back()); } + YY_BREAK +- +- + case 419: + YY_RULE_SETUP +-#line 1035 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } ++#line 1033 "seclang-scanner.ll" ++{ return p::make_VARIABLE_TX(*driver.loc.back()); } + YY_BREAK + case 420: + YY_RULE_SETUP +-#line 1036 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_IP(*driver.loc.back()); } ++#line 1034 "seclang-scanner.ll" ++{ return p::make_VARIABLE_USER(*driver.loc.back()); } + YY_BREAK ++ ++ + case 421: + YY_RULE_SETUP +-#line 1037 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } ++#line 1038 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } + YY_BREAK + case 422: + YY_RULE_SETUP +-#line 1038 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_SESSION(*driver.loc.back()); } ++#line 1039 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_IP(*driver.loc.back()); } + YY_BREAK + case 423: + YY_RULE_SETUP +-#line 1039 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_TX(*driver.loc.back()); } ++#line 1040 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } + YY_BREAK + case 424: + YY_RULE_SETUP +-#line 1040 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_USER(*driver.loc.back()); } ++#line 1041 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_SESSION(*driver.loc.back()); } + YY_BREAK +- +- + case 425: + YY_RULE_SETUP +-#line 1045 "seclang-scanner.ll" +-{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } ++#line 1042 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_TX(*driver.loc.back()); } + YY_BREAK + case 426: + YY_RULE_SETUP +-#line 1046 "seclang-scanner.ll" +-{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } ++#line 1043 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_USER(*driver.loc.back()); } + YY_BREAK ++ ++ + case 427: + YY_RULE_SETUP +-#line 1047 "seclang-scanner.ll" +-{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } ++#line 1048 "seclang-scanner.ll" ++{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } + YY_BREAK + case 428: +-/* rule 428 can match eol */ + YY_RULE_SETUP +-#line 1048 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1049 "seclang-scanner.ll" ++{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } + YY_BREAK + case 429: +-/* rule 429 can match eol */ + YY_RULE_SETUP +-#line 1049 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1050 "seclang-scanner.ll" ++{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } + YY_BREAK + case 430: + /* rule 430 can match eol */ + YY_RULE_SETUP +-#line 1050 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1051 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 431: + /* rule 431 can match eol */ + YY_RULE_SETUP +-#line 1051 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1052 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 432: + /* rule 432 can match eol */ + YY_RULE_SETUP +-#line 1052 "seclang-scanner.ll" +-{ yyless(yyleng - 1); BEGIN_PREVIOUS(); return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1053 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 433: + /* rule 433 can match eol */ + YY_RULE_SETUP +-#line 1053 "seclang-scanner.ll" +-{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1054 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 434: + /* rule 434 can match eol */ + YY_RULE_SETUP + #line 1055 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++{ yyless(yyleng - 1); BEGIN_PREVIOUS(); return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 435: + /* rule 435 can match eol */ + YY_RULE_SETUP + #line 1056 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 436: ++/* rule 436 can match eol */ + YY_RULE_SETUP +-#line 1057 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(0); } ++#line 1058 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 437: ++/* rule 437 can match eol */ + YY_RULE_SETUP +-#line 1058 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(0); } ++#line 1059 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 438: + YY_RULE_SETUP +-#line 1059 "seclang-scanner.ll" +-{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } ++#line 1060 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(0); } + YY_BREAK +- +- + case 439: +-/* rule 439 can match eol */ + YY_RULE_SETUP +-#line 1064 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1061 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(0); } + YY_BREAK + case 440: +-/* rule 440 can match eol */ + YY_RULE_SETUP +-#line 1065 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1062 "seclang-scanner.ll" ++{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } + YY_BREAK ++ ++ + case 441: + /* rule 441 can match eol */ + YY_RULE_SETUP +-#line 1066 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1067 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 442: + /* rule 442 can match eol */ + YY_RULE_SETUP +-#line 1067 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1068 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 443: + /* rule 443 can match eol */ + YY_RULE_SETUP +-#line 1068 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1069 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 444: + /* rule 444 can match eol */ + YY_RULE_SETUP +-#line 1069 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); return p::make_DICT_ELEMENT(yytext, *driver.loc.back()); } ++#line 1070 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 445: + /* rule 445 can match eol */ + YY_RULE_SETUP + #line 1071 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 446: + /* rule 446 can match eol */ + YY_RULE_SETUP + #line 1072 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++{ BEGIN_PREVIOUS(); return p::make_DICT_ELEMENT(yytext, *driver.loc.back()); } + YY_BREAK + case 447: ++/* rule 447 can match eol */ + YY_RULE_SETUP + #line 1074 "seclang-scanner.ll" +-{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 448: ++/* rule 448 can match eol */ + YY_RULE_SETUP + #line 1075 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++ YY_BREAK ++case 449: ++YY_RULE_SETUP ++#line 1077 "seclang-scanner.ll" ++{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } ++ YY_BREAK ++case 450: ++YY_RULE_SETUP ++#line 1078 "seclang-scanner.ll" + { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } + YY_BREAK + + +-case 449: ++case 451: + YY_RULE_SETUP +-#line 1081 "seclang-scanner.ll" ++#line 1084 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_GEOLOOKUP(*driver.loc.back()); } + YY_BREAK +-case 450: ++case 452: + YY_RULE_SETUP +-#line 1082 "seclang-scanner.ll" ++#line 1085 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_UNCONDITIONAL_MATCH(*driver.loc.back()); } + YY_BREAK +-case 451: ++case 453: + YY_RULE_SETUP +-#line 1083 "seclang-scanner.ll" ++#line 1086 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_SQLI(*driver.loc.back()); } + YY_BREAK +-case 452: ++case 454: + YY_RULE_SETUP +-#line 1084 "seclang-scanner.ll" ++#line 1087 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_XSS(*driver.loc.back()); } + YY_BREAK +-case 453: ++case 455: + YY_RULE_SETUP +-#line 1085 "seclang-scanner.ll" ++#line 1088 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_URL_ENCODING(*driver.loc.back()); } + YY_BREAK +-case 454: ++case 456: + YY_RULE_SETUP +-#line 1086 "seclang-scanner.ll" ++#line 1089 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_UTF8_ENCODING(*driver.loc.back()); } + YY_BREAK + + +-case 455: ++case 457: + YY_RULE_SETUP +-#line 1089 "seclang-scanner.ll" ++#line 1092 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_GEOLOOKUP(*driver.loc.back()); } + YY_BREAK +-case 456: ++case 458: + YY_RULE_SETUP +-#line 1090 "seclang-scanner.ll" ++#line 1093 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_UNCONDITIONAL_MATCH(*driver.loc.back()); } + YY_BREAK +-case 457: ++case 459: + YY_RULE_SETUP +-#line 1091 "seclang-scanner.ll" ++#line 1094 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_SQLI(*driver.loc.back()); } + YY_BREAK +-case 458: ++case 460: + YY_RULE_SETUP +-#line 1092 "seclang-scanner.ll" ++#line 1095 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_XSS(*driver.loc.back()); } + YY_BREAK +-case 459: ++case 461: + YY_RULE_SETUP +-#line 1093 "seclang-scanner.ll" ++#line 1096 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_URL_ENCODING(*driver.loc.back()); } + YY_BREAK +-case 460: ++case 462: + YY_RULE_SETUP +-#line 1094 "seclang-scanner.ll" ++#line 1097 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_UTF8_ENCODING(*driver.loc.back()); } + YY_BREAK + + +-case 461: +-YY_RULE_SETUP +-#line 1098 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_WITHIN(*driver.loc.back()); } +- YY_BREAK +-case 462: +-YY_RULE_SETUP +-#line 1099 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS_WORD(*driver.loc.back()); } +- YY_BREAK + case 463: + YY_RULE_SETUP +-#line 1100 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS(*driver.loc.back()); } ++#line 1101 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_WITHIN(*driver.loc.back()); } + YY_BREAK + case 464: + YY_RULE_SETUP +-#line 1101 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_ENDS_WITH(*driver.loc.back()); } ++#line 1102 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS_WORD(*driver.loc.back()); } + YY_BREAK + case 465: + YY_RULE_SETUP +-#line 1102 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_EQ(*driver.loc.back()); } ++#line 1103 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS(*driver.loc.back()); } + YY_BREAK + case 466: + YY_RULE_SETUP +-#line 1103 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_GE(*driver.loc.back()); } ++#line 1104 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_ENDS_WITH(*driver.loc.back()); } + YY_BREAK + case 467: + YY_RULE_SETUP +-#line 1104 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_GT(*driver.loc.back()); } ++#line 1105 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_EQ(*driver.loc.back()); } + YY_BREAK + case 468: + YY_RULE_SETUP +-#line 1105 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH_FROM_FILE(*driver.loc.back()); } ++#line 1106 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_GE(*driver.loc.back()); } + YY_BREAK + case 469: + YY_RULE_SETUP +-#line 1106 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH(*driver.loc.back()); } ++#line 1107 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_GT(*driver.loc.back()); } + YY_BREAK + case 470: + YY_RULE_SETUP +-#line 1107 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_LE(*driver.loc.back()); } ++#line 1108 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH_FROM_FILE(*driver.loc.back()); } + YY_BREAK + case 471: + YY_RULE_SETUP +-#line 1108 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_LT(*driver.loc.back()); } ++#line 1109 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH(*driver.loc.back()); } + YY_BREAK + case 472: + YY_RULE_SETUP +-#line 1109 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM_FROM_FILE(*driver.loc.back()); } ++#line 1110 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_LE(*driver.loc.back()); } + YY_BREAK + case 473: + YY_RULE_SETUP +-#line 1110 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM(*driver.loc.back()); } ++#line 1111 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_LT(*driver.loc.back()); } + YY_BREAK + case 474: + YY_RULE_SETUP +-#line 1111 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RBL( *driver.loc.back()); } ++#line 1112 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM_FROM_FILE(*driver.loc.back()); } + YY_BREAK + case 475: + YY_RULE_SETUP +-#line 1112 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX(*driver.loc.back()); } ++#line 1113 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM(*driver.loc.back()); } + YY_BREAK + case 476: + YY_RULE_SETUP +-#line 1113 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX_GLOBAL(*driver.loc.back()); } ++#line 1114 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RBL( *driver.loc.back()); } + YY_BREAK + case 477: + YY_RULE_SETUP +-#line 1114 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_EQ(*driver.loc.back()); } ++#line 1115 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX(*driver.loc.back()); } + YY_BREAK + case 478: + YY_RULE_SETUP +-#line 1115 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_MATCH(*driver.loc.back()); } ++#line 1116 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX_GLOBAL(*driver.loc.back()); } + YY_BREAK + case 479: + YY_RULE_SETUP +-#line 1116 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_BEGINS_WITH(*driver.loc.back()); } ++#line 1117 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_EQ(*driver.loc.back()); } + YY_BREAK + case 480: + YY_RULE_SETUP +-#line 1117 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_INSPECT_FILE(*driver.loc.back()); } ++#line 1118 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_MATCH(*driver.loc.back()); } + YY_BREAK + case 481: + YY_RULE_SETUP +-#line 1118 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_FUZZY_HASH(*driver.loc.back()); } ++#line 1119 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_BEGINS_WITH(*driver.loc.back()); } + YY_BREAK + case 482: + YY_RULE_SETUP +-#line 1119 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_BYTE_RANGE(*driver.loc.back()); } ++#line 1120 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_INSPECT_FILE(*driver.loc.back()); } + YY_BREAK + case 483: + YY_RULE_SETUP +-#line 1120 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_DTD(*driver.loc.back()); } ++#line 1121 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_FUZZY_HASH(*driver.loc.back()); } + YY_BREAK + case 484: + YY_RULE_SETUP +-#line 1121 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_HASH(*driver.loc.back()); } ++#line 1122 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_BYTE_RANGE(*driver.loc.back()); } + YY_BREAK + case 485: + YY_RULE_SETUP +-#line 1122 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_SCHEMA(*driver.loc.back()); } ++#line 1123 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_DTD(*driver.loc.back()); } + YY_BREAK + case 486: + YY_RULE_SETUP +-#line 1123 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CC(*driver.loc.back()); } ++#line 1124 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_HASH(*driver.loc.back()); } + YY_BREAK + case 487: + YY_RULE_SETUP +-#line 1124 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CPF(*driver.loc.back()); } ++#line 1125 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_SCHEMA(*driver.loc.back()); } + YY_BREAK + case 488: + YY_RULE_SETUP +-#line 1125 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SSN(*driver.loc.back()); } ++#line 1126 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CC(*driver.loc.back()); } + YY_BREAK + case 489: + YY_RULE_SETUP +-#line 1126 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SVNR(*driver.loc.back()); } ++#line 1127 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CPF(*driver.loc.back()); } + YY_BREAK + case 490: + YY_RULE_SETUP +-#line 1127 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_GSB_LOOKUP(*driver.loc.back()); } ++#line 1128 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SSN(*driver.loc.back()); } + YY_BREAK + case 491: + YY_RULE_SETUP +-#line 1128 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RSUB(*driver.loc.back()); } ++#line 1129 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SVNR(*driver.loc.back()); } + YY_BREAK + case 492: + YY_RULE_SETUP + #line 1130 "seclang-scanner.ll" +-{ return p::make_NOT(*driver.loc.back()); } ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_GSB_LOOKUP(*driver.loc.back()); } + YY_BREAK + case 493: + YY_RULE_SETUP + #line 1131 "seclang-scanner.ll" +-{ BEGIN_NO_OP_INFORMED(); yyless(0); } ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RSUB(*driver.loc.back()); } + YY_BREAK +- +- + case 494: + YY_RULE_SETUP +-#line 1136 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_SPACE); } ++#line 1133 "seclang-scanner.ll" ++{ return p::make_NOT(*driver.loc.back()); } + YY_BREAK +- +- + case 495: + YY_RULE_SETUP +-#line 1140 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_QUOTE); } ++#line 1134 "seclang-scanner.ll" ++{ BEGIN_NO_OP_INFORMED(); yyless(0); } + YY_BREAK + + + case 496: + YY_RULE_SETUP +-#line 1144 "seclang-scanner.ll" +-{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } ++#line 1139 "seclang-scanner.ll" ++{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_SPACE); } + YY_BREAK ++ ++ + case 497: +-/* rule 497 can match eol */ + YY_RULE_SETUP +-#line 1145 "seclang-scanner.ll" +-{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1143 "seclang-scanner.ll" ++{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_QUOTE); } + YY_BREAK + + + case 498: + YY_RULE_SETUP +-#line 1149 "seclang-scanner.ll" ++#line 1147 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 499: + /* rule 499 can match eol */ + YY_RULE_SETUP +-#line 1150 "seclang-scanner.ll" ++#line 1148 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 500: + YY_RULE_SETUP +-#line 1153 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } ++#line 1152 "seclang-scanner.ll" ++{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 501: ++/* rule 501 can match eol */ + YY_RULE_SETUP +-#line 1154 "seclang-scanner.ll" +-{ BEGIN(LEXING_ERROR); yyless(0); } ++#line 1153 "seclang-scanner.ll" ++{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 502: + YY_RULE_SETUP +-#line 1158 "seclang-scanner.ll" +-{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } ++#line 1156 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + case 503: +-/* rule 503 can match eol */ + YY_RULE_SETUP +-#line 1159 "seclang-scanner.ll" +-{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1157 "seclang-scanner.ll" ++{ BEGIN(LEXING_ERROR); yyless(0); } + YY_BREAK + + + case 504: + YY_RULE_SETUP +-#line 1163 "seclang-scanner.ll" ++#line 1161 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 505: + /* rule 505 can match eol */ + YY_RULE_SETUP +-#line 1164 "seclang-scanner.ll" ++#line 1162 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 506: + YY_RULE_SETUP +-#line 1168 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } ++#line 1166 "seclang-scanner.ll" ++{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 507: ++/* rule 507 can match eol */ + YY_RULE_SETUP +-#line 1169 "seclang-scanner.ll" +-{ BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } ++#line 1167 "seclang-scanner.ll" ++{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 508: + YY_RULE_SETUP +-#line 1174 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++#line 1171 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + case 509: +-/* rule 509 can match eol */ + YY_RULE_SETUP +-#line 1176 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++#line 1172 "seclang-scanner.ll" ++{ BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } + YY_BREAK ++ ++ + case 510: +-/* rule 510 can match eol */ + YY_RULE_SETUP + #line 1177 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 511: + /* rule 511 can match eol */ + YY_RULE_SETUP +-#line 1178 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++#line 1179 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 512: + /* rule 512 can match eol */ + YY_RULE_SETUP +-#line 1179 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++#line 1180 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 513: + /* rule 513 can match eol */ + YY_RULE_SETUP + #line 1181 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 514: + /* rule 514 can match eol */ + YY_RULE_SETUP + #line 1182 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 515: + /* rule 515 can match eol */ + YY_RULE_SETUP +-#line 1183 "seclang-scanner.ll" ++#line 1184 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 516: + /* rule 516 can match eol */ + YY_RULE_SETUP +-#line 1184 "seclang-scanner.ll" ++#line 1185 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 517: + /* rule 517 can match eol */ + YY_RULE_SETUP + #line 1186 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 518: + /* rule 518 can match eol */ + YY_RULE_SETUP + #line 1187 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 519: + /* rule 519 can match eol */ + YY_RULE_SETUP +-#line 1188 "seclang-scanner.ll" ++#line 1189 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 520: + /* rule 520 can match eol */ + YY_RULE_SETUP +-#line 1189 "seclang-scanner.ll" ++#line 1190 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 521: ++/* rule 521 can match eol */ + YY_RULE_SETUP + #line 1191 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 522: + /* rule 522 can match eol */ + YY_RULE_SETUP +-#line 1193 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++#line 1192 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 523: +-/* rule 523 can match eol */ + YY_RULE_SETUP + #line 1194 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 524: + /* rule 524 can match eol */ +@@ -8382,78 +8387,90 @@ YY_RULE_SETUP + case 526: + /* rule 526 can match eol */ + YY_RULE_SETUP +-#line 1198 "seclang-scanner.ll" ++#line 1199 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 527: + /* rule 527 can match eol */ + YY_RULE_SETUP +-#line 1199 "seclang-scanner.ll" ++#line 1200 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 528: ++/* rule 528 can match eol */ + YY_RULE_SETUP + #line 1201 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK +- +- + case 529: ++/* rule 529 can match eol */ + YY_RULE_SETUP +-#line 1206 "seclang-scanner.ll" +-{ } ++#line 1202 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 530: +-/* rule 530 can match eol */ + YY_RULE_SETUP +-#line 1207 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); } ++#line 1204 "seclang-scanner.ll" ++{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK ++ ++ + case 531: +-/* rule 531 can match eol */ + YY_RULE_SETUP +-#line 1208 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); } ++#line 1209 "seclang-scanner.ll" ++{ } + YY_BREAK +- +- + case 532: + /* rule 532 can match eol */ + YY_RULE_SETUP +-#line 1212 "seclang-scanner.ll" ++#line 1210 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 533: + /* rule 533 can match eol */ + YY_RULE_SETUP +-#line 1213 "seclang-scanner.ll" ++#line 1211 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK ++ ++ + case 534: + /* rule 534 can match eol */ + YY_RULE_SETUP +-#line 1214 "seclang-scanner.ll" +-{ BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } ++#line 1215 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK +- + case 535: ++/* rule 535 can match eol */ + YY_RULE_SETUP +-#line 1219 "seclang-scanner.ll" +-{ BEGIN(LEXING_ERROR); yyless(0); } ++#line 1216 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 536: ++/* rule 536 can match eol */ + YY_RULE_SETUP +-#line 1221 "seclang-scanner.ll" +-{ driver.error (*driver.loc.back(), "Invalid input: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++#line 1217 "seclang-scanner.ll" ++{ BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK ++ + case 537: + YY_RULE_SETUP + #line 1222 "seclang-scanner.ll" +-{ driver.error (*driver.loc.back(), "Expecting an action, got: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++{ BEGIN(LEXING_ERROR); yyless(0); } + YY_BREAK + case 538: + YY_RULE_SETUP +-#line 1223 "seclang-scanner.ll" ++#line 1224 "seclang-scanner.ll" ++{ driver.error (*driver.loc.back(), "Invalid input: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++ YY_BREAK ++case 539: ++YY_RULE_SETUP ++#line 1225 "seclang-scanner.ll" ++{ driver.error (*driver.loc.back(), "Expecting an action, got: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++ YY_BREAK ++case 540: ++YY_RULE_SETUP ++#line 1226 "seclang-scanner.ll" + { driver.error (*driver.loc.back(), "Expecting a variable, got: : ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } + YY_BREAK + case YY_STATE_EOF(INITIAL): +@@ -8492,7 +8509,7 @@ case YY_STATE_EOF(SETVAR_ACTION_QUOTED): + case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_COLLECTION_ELEM): + case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_OPERATION): + case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_CONTENT): +-#line 1226 "seclang-scanner.ll" ++#line 1229 "seclang-scanner.ll" + { + if (yyin) { + fclose(yyin); +@@ -8508,9 +8525,9 @@ case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_CONTENT): + delete l; + } + YY_BREAK +-case 539: ++case 541: + YY_RULE_SETUP +-#line 1242 "seclang-scanner.ll" ++#line 1245 "seclang-scanner.ll" + { + std::string err; + const char *file = strchr(yytext, ' ') + 1; +@@ -8538,9 +8555,9 @@ YY_RULE_SETUP + } + } + YY_BREAK +-case 540: ++case 542: + YY_RULE_SETUP +-#line 1269 "seclang-scanner.ll" ++#line 1272 "seclang-scanner.ll" + { + std::string err; + const char *file = strchr(yytext, ' ') + 1; +@@ -8571,10 +8588,10 @@ YY_RULE_SETUP + free(f); + } + YY_BREAK +-case 541: +-/* rule 541 can match eol */ ++case 543: ++/* rule 543 can match eol */ + YY_RULE_SETUP +-#line 1299 "seclang-scanner.ll" ++#line 1302 "seclang-scanner.ll" + { + HttpsClient c; + std::string key; +@@ -8610,12 +8627,12 @@ YY_RULE_SETUP + yy_scan_string(c.content.c_str()); + } + YY_BREAK +-case 542: ++case 544: + YY_RULE_SETUP +-#line 1335 "seclang-scanner.ll" ++#line 1338 "seclang-scanner.ll" + ECHO; + YY_BREAK +-#line 8619 "seclang-scanner.cc" ++#line 8636 "seclang-scanner.cc" + + case YY_END_OF_BUFFER: + { +@@ -8934,7 +8951,7 @@ static int yy_get_next_buffer (void) + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 3953 ) ++ if ( yy_current_state >= 3966 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; +@@ -8967,11 +8984,11 @@ static int yy_get_next_buffer (void) + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 3953 ) ++ if ( yy_current_state >= 3966 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; +- yy_is_jam = (yy_current_state == 3952); ++ yy_is_jam = (yy_current_state == 3965); + + return yy_is_jam ? 0 : yy_current_state; + } +@@ -9720,7 +9737,7 @@ void yyfree (void * ptr ) + + /* %ok-for-header */ + +-#line 1335 "seclang-scanner.ll" ++#line 1338 "seclang-scanner.ll" + + + namespace modsecurity { +diff --git a/src/parser/seclang-scanner.ll b/src/parser/seclang-scanner.ll +index 8f26cd6f..4cb12685 100755 +--- a/src/parser/seclang-scanner.ll ++++ b/src/parser/seclang-scanner.ll +@@ -253,6 +253,7 @@ VARIABLE_REQUEST_HEADERS (?i:REQUEST_HEADERS) + VARIABLE_RESPONSE_HEADERS (?i:RESPONSE_HEADERS) + VARIABLE_GEO (?i:GEO) + VARIABLE_REQUEST_COOKIES_NAMES (?i:REQUEST_COOKIES_NAMES) ++VARIABLE_MULTIPART_PART_HEADERS (?i:MULTIPART_PART_HEADERS) + VARIABLE_RULE (?i:RULE) + VARIABLE_SESSION (?i:(SESSION)) + VARIABLE_IP (?i:(IP)) +@@ -996,6 +997,8 @@ EQUALS_MINUS (?i:=\-) + {VARIABLE_GEO}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_GEO(*driver.loc.back()); } + {VARIABLE_REQUEST_COOKIES_NAMES} { return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } + {VARIABLE_REQUEST_COOKIES_NAMES}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } ++{VARIABLE_MULTIPART_PART_HEADERS} { return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } ++{VARIABLE_MULTIPART_PART_HEADERS}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } + {VARIABLE_RULE} { return p::make_VARIABLE_RULE(*driver.loc.back()); } + {VARIABLE_RULE}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RULE(*driver.loc.back()); } + {VARIABLE_FILES_TMP_NAMES} { return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } +diff --git a/src/request_body_processor/multipart.cc b/src/request_body_processor/multipart.cc +index 310b7bcb..5686725b 100644 +--- a/src/request_body_processor/multipart.cc ++++ b/src/request_body_processor/multipart.cc +@@ -102,8 +102,11 @@ Multipart::Multipart(const std::string &header, Transaction *transaction) + m_bufptr(NULL), + m_bufleft(0), + m_buf_offset(0), ++ m_crlf_state(0), ++ m_crlf_state_buf_end(0), + m_mpp(NULL), + m_mpp_state(0), ++ m_mpp_substate_part_data_read(0), + m_reserve{0}, + m_seen_data(0), + m_is_complete(0), +@@ -504,6 +507,8 @@ int Multipart::process_part_data(std::string *error, size_t offset) { + char localreserve[2] = { '\0', '\0' }; /* initialized to quiet warning */ + int bytes_reserved = 0; + ++ m_mpp_substate_part_data_read = 1; ++ + /* Preserve some bytes for later. */ + if (((MULTIPART_BUF_SIZE - m_bufleft) >= 1) && (*(p - 1) == '\n')) { + if (((MULTIPART_BUF_SIZE - m_bufleft) >= 2) && (*(p - 2) == '\r')) { +@@ -697,6 +702,7 @@ int Multipart::process_part_header(std::string *error, int offset) { + + /* Check for nul bytes. */ + len = MULTIPART_BUF_SIZE - m_bufleft; ++ int len_without_termination = len - 1; + for (i = 0; i < len; i++) { + if (m_buf[i] == '\0') { + ms_dbg_a(m_transaction, 1, +@@ -714,6 +720,7 @@ int Multipart::process_part_header(std::string *error, int offset) { + if (len > 1) { + if (m_buf[len - 2] == '\r') { + m_flag_crlf_line = 1; ++ len_without_termination--; + } else { + m_flag_lf_line = 1; + } +@@ -727,6 +734,13 @@ int Multipart::process_part_header(std::string *error, int offset) { + std::string header_value(""); + int rc; + ++ /* record the previous completed header */ ++ if (!m_mpp->m_last_header_line.empty()) { ++ m_mpp->m_header_lines.push_back(std::make_pair( ++ offset-m_mpp->m_last_header_line.length(), m_mpp->m_last_header_line)); ++ m_mpp->m_last_header_line.assign(""); ++ } ++ + if (m_mpp->m_headers.count("Content-Disposition") == 0) { + ms_dbg_a(m_transaction, 1, + "Multipart: Part missing Content-Disposition header."); +@@ -787,6 +801,7 @@ int Multipart::process_part_header(std::string *error, int offset) { + } + + m_mpp_state = 1; ++ m_mpp_substate_part_data_read = 0; + m_mpp->m_last_header_name.assign(""); + } else { /* Header line. */ + if (isspace(m_buf[0])) { +@@ -848,12 +863,21 @@ int Multipart::process_part_header(std::string *error, int offset) { + error->assign("Multipart: Part header too long."); + return false; + } ++ ++ m_mpp->m_last_header_line = m_mpp->m_last_header_name + ": " + new_value; + } else { + char *data; + std::string header_value; + std::string header_name; + /* new header */ + ++ /* record the previous completed header */ ++ if (!m_mpp->m_last_header_line.empty()) { ++ m_mpp->m_header_lines.push_back(std::make_pair( ++ offset-m_mpp->m_last_header_line.length(), m_mpp->m_last_header_line)); ++ m_mpp->m_last_header_line.assign(""); ++ } ++ + data = m_buf; + while ((*data != ':') && (*data != '\0')) { + data++; +@@ -910,6 +934,11 @@ int Multipart::process_part_header(std::string *error, int offset) { + ms_dbg_a(m_transaction, 9, + "Multipart: Added part header \"" + header_name \ + + "\" \"" + header_value + "\"."); ++ if (len_without_termination > 0) { ++ m_mpp->m_last_header_line.assign(m_buf); ++ } else { ++ m_mpp->m_last_header_line.assign(""); ++ } + } + } + +@@ -920,6 +949,13 @@ int Multipart::process_part_header(std::string *error, int offset) { + int Multipart::process_boundary(int last_part) { + /* if there was a part being built finish it */ + if (m_mpp != NULL) { ++ /* record all the part header lines from the part into the transaction collection */ ++ for (const auto& header_line : m_mpp->m_header_lines) { ++ m_transaction->m_variableMultipartPartHeaders.set(m_mpp->m_name, ++ header_line.second, header_line.first); ++ ms_dbg_a(m_transaction, 9, "Multipart: Added part header line:" + header_line.second ); ++ } ++ + /* close the temp file */ + if ((m_mpp->m_type == MULTIPART_FILE) && (m_mpp->m_tmp_file) + && (m_mpp->m_tmp_file->isValid())) { +@@ -972,6 +1008,7 @@ int Multipart::process_boundary(int last_part) { + m_mpp = new MultipartPart(); + + m_mpp_state = 0; ++ m_mpp_substate_part_data_read = 0; + + m_reserve[0] = 0; + m_reserve[1] = 0; +@@ -1099,6 +1136,33 @@ int Multipart::multipart_complete(std::string *error) { + m_boundary.size()) == 0) + && (*(m_buf + 2 + m_boundary.size()) == '-') + && (*(m_buf + 2 + m_boundary.size() + 1) == '-')) { ++ // these next two checks may result in repeating work from earlier in this fn ++ // ignore the duplication for now to minimize refactoring ++ if ((m_crlf_state_buf_end == 2) && (m_flag_lf_line != 1)) { ++ m_flag_lf_line = 1; ++ m_transaction->m_variableMultipartLFLine.set(std::to_string(m_flag_lf_line), ++ m_transaction->m_variableOffset); ++ m_transaction->m_variableMultipartCrlfLFLines.set(std::to_string(m_flag_crlf_line && m_flag_lf_line), ++ m_transaction->m_variableOffset); ++ if (m_flag_crlf_line && m_flag_lf_line) { ++ ms_dbg_a(m_transaction, 4, "Multipart: Warning: mixed line endings used (CRLF/LF)."); ++ } else if (m_flag_lf_line) { ++ ms_dbg_a(m_transaction, 4, "Multipart: Warning: incorrect line endings used (LF)."); ++ } ++ m_transaction->m_variableMultipartStrictError.set( ++ std::to_string(m_flag_lf_line) , m_transaction->m_variableOffset); ++ } ++ if ((m_mpp_substate_part_data_read == 0) && (m_flag_invalid_part != 1)) { ++ // it looks like the final boundary, but it's where part data should begin ++ m_flag_invalid_part = 1; ++ ms_dbg_a(m_transaction, 3, "Multipart: Invalid part (data contains final boundary)"); ++ m_transaction->m_variableMultipartStrictError.set( ++ std::to_string(m_flag_invalid_part) , m_transaction->m_variableOffset); ++ m_transaction->m_variableMultipartInvalidPart.set(std::to_string(m_flag_invalid_part), ++ m_transaction->m_variableOffset); ++ ms_dbg_a(m_transaction, 4, "Multipart: Warning: invalid part parsing."); ++ } ++ + /* Looks like the final boundary - process it. */ + if (process_boundary(1 /* final */) < 0) { + m_flag_error = 1; +@@ -1493,70 +1557,80 @@ bool Multipart::process(const std::string& data, std::string *error, + if ((strlen(m_buf) >= m_boundary.size() + 2) + && (strncmp(m_buf + 2, m_boundary.c_str(), + m_boundary.size()) == 0)) { +- char *boundary_end = m_buf + 2 + m_boundary.size(); +- /* if it match, AND there was a matched boundary at least, +- set the m_flag_unmatched_boundary flag to 2 +- this indicates that there were an opened boundary, which +- matches the reference, and here is the final boundary. +- The flag will differ from 0, so the previous rules ("!@eq 0") +- will catch all "errors", without any modification, but we can +- use the new, permission mode with "@eq 1" +- */ +- if (m_boundary_count > 0) { +- m_flag_unmatched_boundary = 2; +- } +- int is_final = 0; ++ if (m_crlf_state_buf_end == 2) { ++ m_flag_lf_line = 1; ++ } ++ if ((m_mpp_substate_part_data_read == 0) && (m_boundary_count > 0)) { ++ /* string matches our boundary, but it's where part data should begin */ ++ m_flag_invalid_part = 1; ++ ms_dbg_a(m_transaction, 3, "Multipart: Invalid part (data contains boundary)"); + +- /* Is this the final boundary? */ +- if ((*boundary_end == '-') +- && (*(boundary_end + 1)== '-')) { +- is_final = 1; +- boundary_end += 2; ++ } else { ++ char *boundary_end = m_buf + 2 + m_boundary.size(); ++ /* if it match, AND there was a matched boundary at least, ++ set the m_flag_unmatched_boundary flag to 2 ++ this indicates that there were an opened boundary, which ++ matches the reference, and here is the final boundary. ++ The flag will differ from 0, so the previous rules ("!@eq 0") ++ will catch all "errors", without any modification, but we can ++ use the new, permission mode with "@eq 1" ++ */ ++ if (m_boundary_count > 0) { ++ m_flag_unmatched_boundary = 2; ++ } ++ int is_final = 0; ++ ++ /* Is this the final boundary? */ ++ if ((*boundary_end == '-') ++ && (*(boundary_end + 1)== '-')) { ++ is_final = 1; ++ boundary_end += 2; ++ ++ if (m_is_complete != 0) { ++ m_flag_error = 1; ++ ms_dbg_a(m_transaction, 4, ++ "Multipart: Invalid boundary " \ ++ "(final duplicate)."); ++ ++ error->assign("Multipart: Invalid boundary " \ ++ "(final duplicate)."); ++ return false; ++ } ++ } + +- if (m_is_complete != 0) { +- m_flag_error = 1; +- ms_dbg_a(m_transaction, 4, +- "Multipart: Invalid boundary " \ +- "(final duplicate)."); ++ /* Allow for CRLF and LF line endings. */ ++ if (((*boundary_end == '\r') ++ && (*(boundary_end + 1) == '\n') ++ && (*(boundary_end + 2) == '\0')) ++ || ((*boundary_end == '\n') ++ && (*(boundary_end + 1) == '\0'))) { ++ if (*boundary_end == '\n') { ++ m_flag_lf_line = 1; ++ } else { ++ m_flag_crlf_line = 1; ++ } + +- error->assign("Multipart: Invalid boundary " \ +- "(final duplicate)."); +- return false; +- } +- } ++ if (process_boundary((is_final ? 1 : 0)) < 0) { ++ m_flag_error = true; ++ return false; ++ } + +- /* Allow for CRLF and LF line endings. */ +- if (((*boundary_end == '\r') +- && (*(boundary_end + 1) == '\n') +- && (*(boundary_end + 2) == '\0')) +- || ((*boundary_end == '\n') +- && (*(boundary_end + 1) == '\0'))) { +- if (*boundary_end == '\n') { +- m_flag_lf_line = 1; +- } else { +- m_flag_crlf_line = 1; +- } ++ if (is_final) { ++ m_is_complete = 1; ++ } + +- if (process_boundary((is_final ? 1 : 0)) < 0) { +- m_flag_error = true; ++ processed_as_boundary = 1; ++ m_boundary_count++; ++ } else { ++ /* error */ ++ m_flag_error = 1; ++ ms_dbg_a(m_transaction, 4, ++ "Multipart: Invalid boundary: " \ ++ + std::string(m_buf)); ++ error->assign("Multipart: Invalid boundary: " \ ++ + std::string(m_buf)); + return false; + } +- +- if (is_final) { +- m_is_complete = 1; +- } +- +- processed_as_boundary = 1; +- m_boundary_count++; +- } else { +- /* error */ +- m_flag_error = 1; +- ms_dbg_a(m_transaction, 4, +- "Multipart: Invalid boundary: " \ +- + std::string(m_buf)); +- error->assign("Multipart: Invalid boundary: " \ +- + std::string(m_buf)); +- return false; + } + } else { /* It looks like a boundary but */ + /* we couldn't match it. */ +@@ -1667,8 +1741,25 @@ bool Multipart::process(const std::string& data, std::string *error, + m_bufptr = m_buf; + m_bufleft = MULTIPART_BUF_SIZE; + m_buf_contains_line = (c == 0x0a) ? 1 : 0; ++ ++ if (c == 0x0a) { ++ if (m_crlf_state == 1) { ++ m_crlf_state = 3; ++ } else { ++ m_crlf_state = 2; ++ } ++ } ++ m_crlf_state_buf_end = m_crlf_state; ++ + } + ++ if (c == 0x0d) { ++ m_crlf_state = 1; ++ } else if (c != 0x0a) { ++ m_crlf_state = 0; ++ } ++ ++ + if ((m_is_complete) && (inleft != 0)) { + m_flag_data_after = 1; + ms_dbg_a(m_transaction, 4, +diff --git a/src/request_body_processor/multipart.h b/src/request_body_processor/multipart.h +index 185656e7..bfada4b9 100644 +--- a/src/request_body_processor/multipart.h ++++ b/src/request_body_processor/multipart.h +@@ -138,6 +138,9 @@ class MultipartPart { + std::string m_last_header_name; + std::unordered_map, + MyHash, MyEqual> m_headers; ++ std::string m_last_header_line; ++ std::vector> m_header_lines; ++ + + unsigned int m_offset; + unsigned int m_length; +@@ -186,6 +189,15 @@ class Multipart { + + unsigned int m_buf_offset; + ++ /* line ending status seen immediately before current position. ++ * 0 = neither LF nor CR; 1 = prev char CR; 2 = prev char LF alone; ++ * 3 = prev two chars were CRLF ++ */ ++ int m_crlf_state; ++ ++ /* crlf_state at end of previous buffer */ ++ int m_crlf_state_buf_end; ++ + /* pointer that keeps track of a part while + * it is being built + */ +@@ -197,6 +209,14 @@ class Multipart { + */ + int m_mpp_state; + ++ /* part parsing substate; if mpp_state is 1 (collecting ++ * data), then for this variable: ++ * 0 means we have not yet read any data between the ++ * post-headers blank line and the next boundary ++ * 1 means we have read at some data after that blank line ++ */ ++ int m_mpp_substate_part_data_read; ++ + /* because of the way this parsing algorithm + * works we hold back the last two bytes of + * each data chunk so that we can discard it +diff --git a/src/variables/multipart_part_headers.h b/src/variables/multipart_part_headers.h +new file mode 100644 +index 00000000..9af328eb +--- /dev/null ++++ b/src/variables/multipart_part_headers.h +@@ -0,0 +1,40 @@ ++/* ++ * ModSecurity, http://www.modsecurity.org/ ++ * Copyright (c) 2022 Trustwave Holdings, Inc. (http://www.trustwave.com/) ++ * ++ * You may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * If any of the files related to licensing are missing or if you have any ++ * other questions related to licensing please contact Trustwave Holdings, Inc. ++ * directly using the email address security at modsecurity.org. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#ifndef SRC_VARIABLES_MULTIPART_PART_HEADERS_H_ ++#define SRC_VARIABLES_MULTIPART_PART_HEADERS_H_ ++ ++#include "src/variables/variable.h" ++ ++namespace modsecurity { ++ ++class Transaction; ++namespace variables { ++ ++ ++DEFINE_VARIABLE_DICT(MultipartPartHeaders, MULTIPART_PART_HEADERS, ++ m_variableMultipartPartHeaders) ++ ++ ++} // namespace variables ++} // namespace modsecurity ++ ++#endif // SRC_VARIABLES_MULTIPART_PART_HEADERS_H_ +diff --git a/test/cppcheck_suppressions.txt b/test/cppcheck_suppressions.txt +index 5a8eb58a..1f455e7d 100644 +--- a/test/cppcheck_suppressions.txt ++++ b/test/cppcheck_suppressions.txt +@@ -54,7 +54,7 @@ duplicateBranch:src/request_body_processor/multipart.cc:93 + danglingTempReference:src/modsecurity.cc:206 + knownConditionTrueFalse:src/operators/validate_url_encoding.cc:77 + knownConditionTrueFalse:src/operators/verify_svnr.cc:87 +-rethrowNoCurrentException:headers/modsecurity/transaction.h:307 ++rethrowNoCurrentException:headers/modsecurity/transaction.h:309 + rethrowNoCurrentException:src/rule_with_actions.cc:123 + ctunullpointer:src/rule_with_actions.cc:237 + ctunullpointer:src/rule_with_operator.cc:135 +diff --git a/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json b/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json +new file mode 100644 +index 00000000..6caf58f0 +--- /dev/null ++++ b/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json +@@ -0,0 +1,166 @@ ++[ ++ { ++ "enabled":1, ++ "version_min":300000, ++ "title":"Testing Variables :: MULTIPART_PART_HEADERS (all headers)", ++ "client":{ ++ "ip":"200.249.12.31", ++ "port":123 ++ }, ++ "server":{ ++ "ip":"200.249.12.31", ++ "port":80 ++ }, ++ "request":{ ++ "headers":{ ++ "Host":"localhost", ++ "User-Agent":"curl/7.38.0", ++ "Accept":"*/*", ++ "Content-Length":"330", ++ "Content-Type":"multipart/form-data; boundary=-----------------------------69343412719991675451336310646", ++ "Expect":"100-continue" ++ }, ++ "uri":"/", ++ "method":"POST", ++ "body":[ ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm1", ++ "Content-Type: image/jpeg", ++ "", ++ "1", ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm2", ++ "", ++ "2", ++ "-------------------------------69343412719991675451336310646--" ++ ] ++ }, ++ "response":{ ++ "headers":{ ++ "Date":"Mon, 13 Jul 2015 20:02:41 GMT", ++ "Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT", ++ "Content-Type":"text/html" ++ }, ++ "body":[ ++ "no need." ++ ] ++ }, ++ "expected":{ ++ "http_code": 403, ++ "debug_log":"Variable: MULTIPART_PART_HEADERS:parm1.*Rule returned 1" ++ }, ++ "rules":[ ++ "SecRuleEngine On", ++ "SecRule MULTIPART_PART_HEADERS \"@rx content-type:.*jpeg\" \"phase:2,deny,status:403,id:500074,t:lowercase\"" ++ ] ++ }, ++ { ++ "enabled":1, ++ "version_min":300000, ++ "title":"Testing Variables :: MULTIPART_PART_HEADERS (specific header - match)", ++ "client":{ ++ "ip":"200.249.12.31", ++ "port":123 ++ }, ++ "server":{ ++ "ip":"200.249.12.31", ++ "port":80 ++ }, ++ "request":{ ++ "headers":{ ++ "Host":"localhost", ++ "User-Agent":"curl/7.38.0", ++ "Accept":"*/*", ++ "Content-Length":"330", ++ "Content-Type":"multipart/form-data; boundary=-----------------------------69343412719991675451336310646", ++ "Expect":"100-continue" ++ }, ++ "uri":"/", ++ "method":"POST", ++ "body":[ ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm1", ++ "Content-Type: image/jpeg", ++ "", ++ "1", ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm2", ++ "", ++ "2", ++ "-------------------------------69343412719991675451336310646--" ++ ] ++ }, ++ "response":{ ++ "headers":{ ++ "Date":"Mon, 13 Jul 2015 20:02:41 GMT", ++ "Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT", ++ "Content-Type":"text/html" ++ }, ++ "body":[ ++ "no need." ++ ] ++ }, ++ "expected":{ ++ "http_code": 403, ++ "debug_log":"Variable: MULTIPART_PART_HEADERS:parm1.*Rule returned 1" ++ }, ++ "rules":[ ++ "SecRuleEngine On", ++ "SecRule MULTIPART_PART_HEADERS:parm1 \"@rx content-type:.*jpeg\" \"phase:2,deny,status:403,id:500074,t:lowercase\"" ++ ] ++ }, ++ { ++ "enabled":1, ++ "version_min":300000, ++ "title":"Testing Variables :: MULTIPART_PART_HEADERS (specific header - no match)", ++ "client":{ ++ "ip":"200.249.12.31", ++ "port":123 ++ }, ++ "server":{ ++ "ip":"200.249.12.31", ++ "port":80 ++ }, ++ "request":{ ++ "headers":{ ++ "Host":"localhost", ++ "User-Agent":"curl/7.38.0", ++ "Accept":"*/*", ++ "Content-Length":"330", ++ "Content-Type":"multipart/form-data; boundary=-----------------------------69343412719991675451336310646", ++ "Expect":"100-continue" ++ }, ++ "uri":"/", ++ "method":"POST", ++ "body":[ ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm1", ++ "Content-Type: image/jpeg", ++ "", ++ "1", ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm2", ++ "", ++ "2", ++ "-------------------------------69343412719991675451336310646--" ++ ] ++ }, ++ "response":{ ++ "headers":{ ++ "Date":"Mon, 13 Jul 2015 20:02:41 GMT", ++ "Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT", ++ "Content-Type":"text/html" ++ }, ++ "body":[ ++ "no need." ++ ] ++ }, ++ "expected":{ ++ "http_code": 200 ++ }, ++ "rules":[ ++ "SecRuleEngine On", ++ "SecRule MULTIPART_PART_HEADERS:parm2 \"@rx content-type:.*jpeg\" \"phase:2,deny,status:403,id:500074,t:lowercase\"" ++ ] ++ } ++] +-- +2.37.2 + diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 916ba8fbcb..1fd11034a0 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -15,6 +15,9 @@ LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity # We're patching build/libmaxmind.m4 and build/pcre.m4 LIBMODSECURITY_AUTORECONF = YES +#0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch +LIBMODSECURITY_IGNORE_CVES += CVE-2022-48279 + LIBMODSECURITY_DEPENDENCIES = pcre2 LIBMODSECURITY_CONF_OPTS = \ --without-pcre \ -- 2.37.2 From frank.vanbever at mind.be Mon Feb 20 15:46:29 2023 From: frank.vanbever at mind.be (Frank Vanbever) Date: Mon, 20 Feb 2023 16:46:29 +0100 Subject: [Buildroot] [PATCH 2022.11.x 1/1] package/libmodsecurity: fix CVE-2022-48279 Message-ID: <20230220154629.58424-1-frank.vanbever@mind.be> In ModSecurity before 2.9.6 and 3.x before 3.0.8, HTTP multipart requests were incorrectly parsed and could bypass the Web Application Firewall. NOTE: this is related to CVE-2022-39956 but can be considered independent changes to the ModSecurity (C language) codebase. Signed-off-by: Frank Vanbever --- ...g-fixes-and-new-MULTIPART_PART_HEADE.patch | 19602 ++++++++++++++++ package/libmodsecurity/libmodsecurity.mk | 3 + 2 files changed, 19605 insertions(+) create mode 100644 package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch diff --git a/package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch b/package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch new file mode 100644 index 0000000000..ebecea983e --- /dev/null +++ b/package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch @@ -0,0 +1,19602 @@ +From 1abda9e196ff9db978efba3ad770f9a74ae00444 Mon Sep 17 00:00:00 2001 +From: Martin Vierula +Date: Wed, 7 Sep 2022 06:29:20 -0700 +Subject: [PATCH] Multipart parsing fixes and new MULTIPART_PART_HEADERS + collection + +Signed-off-by: Frank Vanbever +--- + CHANGES | 5 + + Makefile.am | 1 + + headers/modsecurity/transaction.h | 2 + + src/parser/seclang-parser.cc | 3226 +++---- + src/parser/seclang-parser.hh | 1342 +-- + src/parser/seclang-parser.yy | 14 + + src/parser/seclang-scanner.cc | 7767 +++++++++-------- + src/parser/seclang-scanner.ll | 3 + + src/request_body_processor/multipart.cc | 205 +- + src/request_body_processor/multipart.h | 20 + + src/variables/multipart_part_headers.h | 40 + + test/cppcheck_suppressions.txt | 2 +- + .../variable-MULTIPART_PART_HEADERS.json | 166 + + 13 files changed, 6606 insertions(+), 6187 deletions(-) + create mode 100644 src/variables/multipart_part_headers.h + create mode 100644 test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json + +diff --git a/CHANGES b/CHANGES +index 2f9cec67..94dcc218 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -1,3 +1,8 @@ ++v3.0.8 backports ++-------------------- ++ - Multipart parsing fixes and new MULTIPART_PART_HEADERS collection ++ [Issue #2795 - @terjanq, @martinhsv] ++ + v3.0.7 - 2022-May-30 + -------------------- + +diff --git a/Makefile.am b/Makefile.am +index 93c3de01..17eb62b0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -225,6 +225,7 @@ TESTS+=test/test-cases/regression/variable-MULTIPART_CRLF_LF_LINES.json + TESTS+=test/test-cases/regression/variable-MULTIPART_FILENAME.json + TESTS+=test/test-cases/regression/variable-MULTIPART_INVALID_HEADER_FOLDING.json + TESTS+=test/test-cases/regression/variable-MULTIPART_NAME.json ++TESTS+=test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json + TESTS+=test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json + TESTS+=test/test-cases/regression/variable-MULTIPART_UNMATCHED_BOUNDARY.json + TESTS+=test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json +diff --git a/headers/modsecurity/transaction.h b/headers/modsecurity/transaction.h +index 194b544c..4244ddd3 100644 +--- a/headers/modsecurity/transaction.h ++++ b/headers/modsecurity/transaction.h +@@ -201,6 +201,7 @@ class TransactionAnchoredVariables { + m_variableGeo(t, "GEO"), + m_variableRequestCookiesNames(t, "REQUEST_COOKIES_NAMES"), + m_variableFilesTmpNames(t, "FILES_TMPNAMES"), ++ m_variableMultipartPartHeaders(t, "MULTIPART_PART_HEADERS"), + m_variableOffset(0), + m_variableArgsNames("ARGS_NAMES", &m_variableArgs), + m_variableArgsGetNames("ARGS_GET_NAMES", &m_variableArgsGet), +@@ -282,6 +283,7 @@ class TransactionAnchoredVariables { + AnchoredSetVariable m_variableGeo; + AnchoredSetVariable m_variableRequestCookiesNames; + AnchoredSetVariable m_variableFilesTmpNames; ++ AnchoredSetVariable m_variableMultipartPartHeaders; + + int m_variableOffset; + +diff --git a/src/parser/seclang-parser.cc b/src/parser/seclang-parser.cc +index 98af1904..c8423b36 100644 +--- a/src/parser/seclang-parser.cc ++++ b/src/parser/seclang-parser.cc +@@ -42,7 +42,7 @@ + + + // Unqualified %code blocks. +-#line 326 "seclang-parser.yy" ++#line 327 "seclang-parser.yy" + + #include "src/parser/driver.h" + +@@ -1318,7 +1318,7 @@ namespace yy { + + + // User initialization code. +-#line 319 "seclang-parser.yy" ++#line 320 "seclang-parser.yy" + { + // Initialize the initial location. + yyla.location.begin.filename = yyla.location.end.filename = new std::string(driver.file); +@@ -1690,7 +1690,7 @@ namespace yy { + switch (yyn) + { + case 2: // input: "end of file" +-#line 713 "seclang-parser.yy" ++#line 715 "seclang-parser.yy" + { + return 0; + } +@@ -1698,7 +1698,7 @@ namespace yy { + break; + + case 6: // audit_log: "CONFIG_DIR_AUDIT_DIR_MOD" +-#line 726 "seclang-parser.yy" ++#line 728 "seclang-parser.yy" + { + driver.m_auditLog->setStorageDirMode(strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 8)); + } +@@ -1706,7 +1706,7 @@ namespace yy { + break; + + case 7: // audit_log: "CONFIG_DIR_AUDIT_DIR" +-#line 732 "seclang-parser.yy" ++#line 734 "seclang-parser.yy" + { + driver.m_auditLog->setStorageDir(yystack_[0].value.as < std::string > ()); + } +@@ -1714,7 +1714,7 @@ namespace yy { + break; + + case 8: // audit_log: "CONFIG_DIR_AUDIT_ENG" "CONFIG_VALUE_RELEVANT_ONLY" +-#line 738 "seclang-parser.yy" ++#line 740 "seclang-parser.yy" + { + driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::RelevantOnlyAuditLogStatus); + } +@@ -1722,7 +1722,7 @@ namespace yy { + break; + + case 9: // audit_log: "CONFIG_DIR_AUDIT_ENG" "CONFIG_VALUE_OFF" +-#line 742 "seclang-parser.yy" ++#line 744 "seclang-parser.yy" + { + driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::OffAuditLogStatus); + } +@@ -1730,7 +1730,7 @@ namespace yy { + break; + + case 10: // audit_log: "CONFIG_DIR_AUDIT_ENG" "CONFIG_VALUE_ON" +-#line 746 "seclang-parser.yy" ++#line 748 "seclang-parser.yy" + { + driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::OnAuditLogStatus); + } +@@ -1738,7 +1738,7 @@ namespace yy { + break; + + case 11: // audit_log: "CONFIG_DIR_AUDIT_FLE_MOD" +-#line 752 "seclang-parser.yy" ++#line 754 "seclang-parser.yy" + { + driver.m_auditLog->setFileMode(strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 8)); + } +@@ -1746,7 +1746,7 @@ namespace yy { + break; + + case 12: // audit_log: "CONFIG_DIR_AUDIT_LOG2" +-#line 758 "seclang-parser.yy" ++#line 760 "seclang-parser.yy" + { + driver.m_auditLog->setFilePath2(yystack_[0].value.as < std::string > ()); + } +@@ -1754,7 +1754,7 @@ namespace yy { + break; + + case 13: // audit_log: "CONFIG_DIR_AUDIT_LOG_P" +-#line 764 "seclang-parser.yy" ++#line 766 "seclang-parser.yy" + { + driver.m_auditLog->setParts(yystack_[0].value.as < std::string > ()); + } +@@ -1762,7 +1762,7 @@ namespace yy { + break; + + case 14: // audit_log: "CONFIG_DIR_AUDIT_LOG" +-#line 770 "seclang-parser.yy" ++#line 772 "seclang-parser.yy" + { + driver.m_auditLog->setFilePath1(yystack_[0].value.as < std::string > ()); + } +@@ -1770,7 +1770,7 @@ namespace yy { + break; + + case 15: // audit_log: CONFIG_DIR_AUDIT_LOG_FMT JSON +-#line 775 "seclang-parser.yy" ++#line 777 "seclang-parser.yy" + { + driver.m_auditLog->setFormat(modsecurity::audit_log::AuditLog::JSONAuditLogFormat); + } +@@ -1778,7 +1778,7 @@ namespace yy { + break; + + case 16: // audit_log: CONFIG_DIR_AUDIT_LOG_FMT NATIVE +-#line 780 "seclang-parser.yy" ++#line 782 "seclang-parser.yy" + { + driver.m_auditLog->setFormat(modsecurity::audit_log::AuditLog::NativeAuditLogFormat); + } +@@ -1786,7 +1786,7 @@ namespace yy { + break; + + case 17: // audit_log: "CONFIG_DIR_AUDIT_STS" +-#line 786 "seclang-parser.yy" ++#line 788 "seclang-parser.yy" + { + std::string relevant_status(yystack_[0].value.as < std::string > ()); + driver.m_auditLog->setRelevantStatus(relevant_status); +@@ -1795,7 +1795,7 @@ namespace yy { + break; + + case 18: // audit_log: "CONFIG_DIR_AUDIT_TPE" "CONFIG_VALUE_SERIAL" +-#line 793 "seclang-parser.yy" ++#line 795 "seclang-parser.yy" + { + driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::SerialAuditLogType); + } +@@ -1803,7 +1803,7 @@ namespace yy { + break; + + case 19: // audit_log: "CONFIG_DIR_AUDIT_TPE" "CONFIG_VALUE_PARALLEL" +-#line 797 "seclang-parser.yy" ++#line 799 "seclang-parser.yy" + { + driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::ParallelAuditLogType); + } +@@ -1811,7 +1811,7 @@ namespace yy { + break; + + case 20: // audit_log: "CONFIG_DIR_AUDIT_TPE" "CONFIG_VALUE_HTTPS" +-#line 801 "seclang-parser.yy" ++#line 803 "seclang-parser.yy" + { + driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::HttpsAuditLogType); + } +@@ -1819,7 +1819,7 @@ namespace yy { + break; + + case 21: // audit_log: "CONFIG_UPDLOAD_KEEP_FILES" "CONFIG_VALUE_ON" +-#line 807 "seclang-parser.yy" ++#line 809 "seclang-parser.yy" + { + driver.m_uploadKeepFiles = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -1827,7 +1827,7 @@ namespace yy { + break; + + case 22: // audit_log: "CONFIG_UPDLOAD_KEEP_FILES" "CONFIG_VALUE_OFF" +-#line 811 "seclang-parser.yy" ++#line 813 "seclang-parser.yy" + { + driver.m_uploadKeepFiles = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -1835,7 +1835,7 @@ namespace yy { + break; + + case 23: // audit_log: "CONFIG_UPDLOAD_KEEP_FILES" "CONFIG_VALUE_RELEVANT_ONLY" +-#line 815 "seclang-parser.yy" ++#line 817 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecUploadKeepFiles RelevantOnly is not currently supported. Accepted values are On or Off"); + YYERROR; +@@ -1844,7 +1844,7 @@ namespace yy { + break; + + case 24: // audit_log: "CONFIG_UPLOAD_FILE_LIMIT" +-#line 820 "seclang-parser.yy" ++#line 822 "seclang-parser.yy" + { + driver.m_uploadFileLimit.m_set = true; + driver.m_uploadFileLimit.m_value = strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 10); +@@ -1853,7 +1853,7 @@ namespace yy { + break; + + case 25: // audit_log: "CONFIG_UPLOAD_FILE_MODE" +-#line 825 "seclang-parser.yy" ++#line 827 "seclang-parser.yy" + { + driver.m_uploadFileMode.m_set = true; + driver.m_uploadFileMode.m_value = strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 8); +@@ -1862,7 +1862,7 @@ namespace yy { + break; + + case 26: // audit_log: "CONFIG_UPLOAD_DIR" +-#line 830 "seclang-parser.yy" ++#line 832 "seclang-parser.yy" + { + driver.m_uploadDirectory.m_set = true; + driver.m_uploadDirectory.m_value = yystack_[0].value.as < std::string > (); +@@ -1871,7 +1871,7 @@ namespace yy { + break; + + case 27: // audit_log: "CONFIG_UPDLOAD_SAVE_TMP_FILES" "CONFIG_VALUE_ON" +-#line 835 "seclang-parser.yy" ++#line 837 "seclang-parser.yy" + { + driver.m_tmpSaveUploadedFiles = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -1879,7 +1879,7 @@ namespace yy { + break; + + case 28: // audit_log: "CONFIG_UPDLOAD_SAVE_TMP_FILES" "CONFIG_VALUE_OFF" +-#line 839 "seclang-parser.yy" ++#line 841 "seclang-parser.yy" + { + driver.m_tmpSaveUploadedFiles = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -1887,7 +1887,7 @@ namespace yy { + break; + + case 29: // actions: "QUOTATION_MARK" actions_may_quoted "QUOTATION_MARK" +-#line 846 "seclang-parser.yy" ++#line 848 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[1].value.as < std::unique_ptr > > > ()); + } +@@ -1895,7 +1895,7 @@ namespace yy { + break; + + case 30: // actions: actions_may_quoted +-#line 850 "seclang-parser.yy" ++#line 852 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[0].value.as < std::unique_ptr > > > ()); + } +@@ -1903,7 +1903,7 @@ namespace yy { + break; + + case 31: // actions_may_quoted: actions_may_quoted "," act +-#line 857 "seclang-parser.yy" ++#line 859 "seclang-parser.yy" + { + ACTION_INIT(yystack_[0].value.as < std::unique_ptr > (), yystack_[3].location) + yystack_[2].value.as < std::unique_ptr > > > ()->push_back(std::move(yystack_[0].value.as < std::unique_ptr > ())); +@@ -1913,7 +1913,7 @@ namespace yy { + break; + + case 32: // actions_may_quoted: act +-#line 863 "seclang-parser.yy" ++#line 865 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + ACTION_INIT(yystack_[0].value.as < std::unique_ptr > (), yystack_[1].location) +@@ -1924,7 +1924,7 @@ namespace yy { + break; + + case 33: // op: op_before_init +-#line 873 "seclang-parser.yy" ++#line 875 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[0].value.as < std::unique_ptr > ()); + std::string error; +@@ -1937,7 +1937,7 @@ namespace yy { + break; + + case 34: // op: "NOT" op_before_init +-#line 882 "seclang-parser.yy" ++#line 884 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[0].value.as < std::unique_ptr > ()); + yylhs.value.as < std::unique_ptr > ()->m_negation = true; +@@ -1951,7 +1951,7 @@ namespace yy { + break; + + case 35: // op: run_time_string +-#line 892 "seclang-parser.yy" ++#line 894 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + std::string error; +@@ -1964,7 +1964,7 @@ namespace yy { + break; + + case 36: // op: "NOT" run_time_string +-#line 901 "seclang-parser.yy" ++#line 903 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + yylhs.value.as < std::unique_ptr > ()->m_negation = true; +@@ -1978,7 +1978,7 @@ namespace yy { + break; + + case 37: // op_before_init: "OPERATOR_UNCONDITIONAL_MATCH" +-#line 914 "seclang-parser.yy" ++#line 916 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::UnconditionalMatch()); + } +@@ -1986,7 +1986,7 @@ namespace yy { + break; + + case 38: // op_before_init: "OPERATOR_DETECT_SQLI" +-#line 918 "seclang-parser.yy" ++#line 920 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::DetectSQLi()); + } +@@ -1994,7 +1994,7 @@ namespace yy { + break; + + case 39: // op_before_init: "OPERATOR_DETECT_XSS" +-#line 922 "seclang-parser.yy" ++#line 924 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::DetectXSS()); + } +@@ -2002,7 +2002,7 @@ namespace yy { + break; + + case 40: // op_before_init: "OPERATOR_VALIDATE_URL_ENCODING" +-#line 926 "seclang-parser.yy" ++#line 928 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateUrlEncoding()); + } +@@ -2010,7 +2010,7 @@ namespace yy { + break; + + case 41: // op_before_init: "OPERATOR_VALIDATE_UTF8_ENCODING" +-#line 930 "seclang-parser.yy" ++#line 932 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateUtf8Encoding()); + } +@@ -2018,7 +2018,7 @@ namespace yy { + break; + + case 42: // op_before_init: "OPERATOR_INSPECT_FILE" run_time_string +-#line 934 "seclang-parser.yy" ++#line 936 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::InspectFile(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2026,7 +2026,7 @@ namespace yy { + break; + + case 43: // op_before_init: "OPERATOR_FUZZY_HASH" run_time_string +-#line 938 "seclang-parser.yy" ++#line 940 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::FuzzyHash(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2034,7 +2034,7 @@ namespace yy { + break; + + case 44: // op_before_init: "OPERATOR_VALIDATE_BYTE_RANGE" run_time_string +-#line 942 "seclang-parser.yy" ++#line 944 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateByteRange(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2042,7 +2042,7 @@ namespace yy { + break; + + case 45: // op_before_init: "OPERATOR_VALIDATE_DTD" run_time_string +-#line 946 "seclang-parser.yy" ++#line 948 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateDTD(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2050,7 +2050,7 @@ namespace yy { + break; + + case 46: // op_before_init: "OPERATOR_VALIDATE_HASH" run_time_string +-#line 950 "seclang-parser.yy" ++#line 952 "seclang-parser.yy" + { + /* $$ = new operators::ValidateHash($1); */ + OPERATOR_NOT_SUPPORTED("ValidateHash", yystack_[2].location); +@@ -2059,7 +2059,7 @@ namespace yy { + break; + + case 47: // op_before_init: "OPERATOR_VALIDATE_SCHEMA" run_time_string +-#line 955 "seclang-parser.yy" ++#line 957 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateSchema(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2067,7 +2067,7 @@ namespace yy { + break; + + case 48: // op_before_init: "OPERATOR_VERIFY_CC" run_time_string +-#line 959 "seclang-parser.yy" ++#line 961 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifyCC(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2075,7 +2075,7 @@ namespace yy { + break; + + case 49: // op_before_init: "OPERATOR_VERIFY_CPF" run_time_string +-#line 963 "seclang-parser.yy" ++#line 965 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifyCPF(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2083,7 +2083,7 @@ namespace yy { + break; + + case 50: // op_before_init: "OPERATOR_VERIFY_SSN" run_time_string +-#line 967 "seclang-parser.yy" ++#line 969 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifySSN(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2091,7 +2091,7 @@ namespace yy { + break; + + case 51: // op_before_init: "OPERATOR_VERIFY_SVNR" run_time_string +-#line 971 "seclang-parser.yy" ++#line 973 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifySVNR(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2099,7 +2099,7 @@ namespace yy { + break; + + case 52: // op_before_init: "OPERATOR_GSB_LOOKUP" run_time_string +-#line 975 "seclang-parser.yy" ++#line 977 "seclang-parser.yy" + { + /* $$ = new operators::GsbLookup($1); */ + OPERATOR_NOT_SUPPORTED("GsbLookup", yystack_[2].location); +@@ -2108,7 +2108,7 @@ namespace yy { + break; + + case 53: // op_before_init: "OPERATOR_RSUB" run_time_string +-#line 980 "seclang-parser.yy" ++#line 982 "seclang-parser.yy" + { + /* $$ = new operators::Rsub($1); */ + OPERATOR_NOT_SUPPORTED("Rsub", yystack_[2].location); +@@ -2117,7 +2117,7 @@ namespace yy { + break; + + case 54: // op_before_init: "OPERATOR_WITHIN" run_time_string +-#line 985 "seclang-parser.yy" ++#line 987 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Within(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2125,7 +2125,7 @@ namespace yy { + break; + + case 55: // op_before_init: "OPERATOR_CONTAINS_WORD" run_time_string +-#line 989 "seclang-parser.yy" ++#line 991 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ContainsWord(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2133,7 +2133,7 @@ namespace yy { + break; + + case 56: // op_before_init: "OPERATOR_CONTAINS" run_time_string +-#line 993 "seclang-parser.yy" ++#line 995 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Contains(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2141,7 +2141,7 @@ namespace yy { + break; + + case 57: // op_before_init: "OPERATOR_ENDS_WITH" run_time_string +-#line 997 "seclang-parser.yy" ++#line 999 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::EndsWith(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2149,7 +2149,7 @@ namespace yy { + break; + + case 58: // op_before_init: "OPERATOR_EQ" run_time_string +-#line 1001 "seclang-parser.yy" ++#line 1003 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Eq(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2157,7 +2157,7 @@ namespace yy { + break; + + case 59: // op_before_init: "OPERATOR_GE" run_time_string +-#line 1005 "seclang-parser.yy" ++#line 1007 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Ge(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2165,7 +2165,7 @@ namespace yy { + break; + + case 60: // op_before_init: "OPERATOR_GT" run_time_string +-#line 1009 "seclang-parser.yy" ++#line 1011 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Gt(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2173,7 +2173,7 @@ namespace yy { + break; + + case 61: // op_before_init: "OPERATOR_IP_MATCH_FROM_FILE" run_time_string +-#line 1013 "seclang-parser.yy" ++#line 1015 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::IpMatchF(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2181,7 +2181,7 @@ namespace yy { + break; + + case 62: // op_before_init: "OPERATOR_IP_MATCH" run_time_string +-#line 1017 "seclang-parser.yy" ++#line 1019 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::IpMatch(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2189,7 +2189,7 @@ namespace yy { + break; + + case 63: // op_before_init: "OPERATOR_LE" run_time_string +-#line 1021 "seclang-parser.yy" ++#line 1023 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Le(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2197,7 +2197,7 @@ namespace yy { + break; + + case 64: // op_before_init: "OPERATOR_LT" run_time_string +-#line 1025 "seclang-parser.yy" ++#line 1027 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Lt(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2205,7 +2205,7 @@ namespace yy { + break; + + case 65: // op_before_init: "OPERATOR_PM_FROM_FILE" run_time_string +-#line 1029 "seclang-parser.yy" ++#line 1031 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::PmFromFile(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2213,7 +2213,7 @@ namespace yy { + break; + + case 66: // op_before_init: "OPERATOR_PM" run_time_string +-#line 1033 "seclang-parser.yy" ++#line 1035 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Pm(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2221,7 +2221,7 @@ namespace yy { + break; + + case 67: // op_before_init: "OPERATOR_RBL" run_time_string +-#line 1037 "seclang-parser.yy" ++#line 1039 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rbl(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2229,7 +2229,7 @@ namespace yy { + break; + + case 68: // op_before_init: "OPERATOR_RX" run_time_string +-#line 1041 "seclang-parser.yy" ++#line 1043 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2237,7 +2237,7 @@ namespace yy { + break; + + case 69: // op_before_init: "OPERATOR_RX_GLOBAL" run_time_string +-#line 1045 "seclang-parser.yy" ++#line 1047 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::RxGlobal(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2245,7 +2245,7 @@ namespace yy { + break; + + case 70: // op_before_init: "OPERATOR_STR_EQ" run_time_string +-#line 1049 "seclang-parser.yy" ++#line 1051 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::StrEq(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2253,7 +2253,7 @@ namespace yy { + break; + + case 71: // op_before_init: "OPERATOR_STR_MATCH" run_time_string +-#line 1053 "seclang-parser.yy" ++#line 1055 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::StrMatch(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2261,7 +2261,7 @@ namespace yy { + break; + + case 72: // op_before_init: "OPERATOR_BEGINS_WITH" run_time_string +-#line 1057 "seclang-parser.yy" ++#line 1059 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::BeginsWith(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2269,7 +2269,7 @@ namespace yy { + break; + + case 73: // op_before_init: "OPERATOR_GEOLOOKUP" +-#line 1061 "seclang-parser.yy" ++#line 1063 "seclang-parser.yy" + { + #if defined(WITH_GEOIP) or defined(WITH_MAXMIND) + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::GeoLookup()); +@@ -2284,7 +2284,7 @@ namespace yy { + break; + + case 75: // expression: "DIRECTIVE" variables op actions +-#line 1076 "seclang-parser.yy" ++#line 1078 "seclang-parser.yy" + { + std::vector *a = new std::vector(); + std::vector *t = new std::vector(); +@@ -2318,7 +2318,7 @@ namespace yy { + break; + + case 76: // expression: "DIRECTIVE" variables op +-#line 1106 "seclang-parser.yy" ++#line 1108 "seclang-parser.yy" + { + variables::Variables *v = new variables::Variables(); + for (auto &i : *yystack_[1].value.as < std::unique_ptr > > > ().get()) { +@@ -2341,7 +2341,7 @@ namespace yy { + break; + + case 77: // expression: "CONFIG_DIR_SEC_ACTION" actions +-#line 1125 "seclang-parser.yy" ++#line 1127 "seclang-parser.yy" + { + std::vector *a = new std::vector(); + std::vector *t = new std::vector(); +@@ -2364,7 +2364,7 @@ namespace yy { + break; + + case 78: // expression: "DIRECTIVE_SECRULESCRIPT" actions +-#line 1144 "seclang-parser.yy" ++#line 1146 "seclang-parser.yy" + { + std::string err; + std::vector *a = new std::vector(); +@@ -2396,7 +2396,7 @@ namespace yy { + break; + + case 79: // expression: "CONFIG_DIR_SEC_DEFAULT_ACTION" actions +-#line 1172 "seclang-parser.yy" ++#line 1174 "seclang-parser.yy" + { + bool hasDisruptive = false; + std::vector *actions = new std::vector(); +@@ -2457,7 +2457,7 @@ namespace yy { + break; + + case 80: // expression: "CONFIG_DIR_SEC_MARKER" +-#line 1229 "seclang-parser.yy" ++#line 1231 "seclang-parser.yy" + { + driver.addSecMarker(modsecurity::utils::string::removeBracketsIfNeeded(yystack_[0].value.as < std::string > ()), + /* file name */ std::unique_ptr(new std::string(*yystack_[0].location.end.filename)), +@@ -2468,7 +2468,7 @@ namespace yy { + break; + + case 81: // expression: "CONFIG_DIR_RULE_ENG" "CONFIG_VALUE_OFF" +-#line 1236 "seclang-parser.yy" ++#line 1238 "seclang-parser.yy" + { + driver.m_secRuleEngine = modsecurity::RulesSet::DisabledRuleEngine; + } +@@ -2476,7 +2476,7 @@ namespace yy { + break; + + case 82: // expression: "CONFIG_DIR_RULE_ENG" "CONFIG_VALUE_ON" +-#line 1240 "seclang-parser.yy" ++#line 1242 "seclang-parser.yy" + { + driver.m_secRuleEngine = modsecurity::RulesSet::EnabledRuleEngine; + } +@@ -2484,7 +2484,7 @@ namespace yy { + break; + + case 83: // expression: "CONFIG_DIR_RULE_ENG" "CONFIG_VALUE_DETC" +-#line 1244 "seclang-parser.yy" ++#line 1246 "seclang-parser.yy" + { + driver.m_secRuleEngine = modsecurity::RulesSet::DetectionOnlyRuleEngine; + } +@@ -2492,7 +2492,7 @@ namespace yy { + break; + + case 84: // expression: "CONFIG_DIR_REQ_BODY" "CONFIG_VALUE_ON" +-#line 1248 "seclang-parser.yy" ++#line 1250 "seclang-parser.yy" + { + driver.m_secRequestBodyAccess = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -2500,7 +2500,7 @@ namespace yy { + break; + + case 85: // expression: "CONFIG_DIR_REQ_BODY" "CONFIG_VALUE_OFF" +-#line 1252 "seclang-parser.yy" ++#line 1254 "seclang-parser.yy" + { + driver.m_secRequestBodyAccess = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -2508,7 +2508,7 @@ namespace yy { + break; + + case 86: // expression: "CONFIG_DIR_RES_BODY" "CONFIG_VALUE_ON" +-#line 1256 "seclang-parser.yy" ++#line 1258 "seclang-parser.yy" + { + driver.m_secResponseBodyAccess = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -2516,7 +2516,7 @@ namespace yy { + break; + + case 87: // expression: "CONFIG_DIR_RES_BODY" "CONFIG_VALUE_OFF" +-#line 1260 "seclang-parser.yy" ++#line 1262 "seclang-parser.yy" + { + driver.m_secResponseBodyAccess = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -2524,7 +2524,7 @@ namespace yy { + break; + + case 88: // expression: "CONFIG_SEC_ARGUMENT_SEPARATOR" +-#line 1264 "seclang-parser.yy" ++#line 1266 "seclang-parser.yy" + { + if (yystack_[0].value.as < std::string > ().length() != 1) { + driver.error(yystack_[1].location, "Argument separator should be set to a single character."); +@@ -2537,7 +2537,7 @@ namespace yy { + break; + + case 89: // expression: "CONFIG_COMPONENT_SIG" +-#line 1273 "seclang-parser.yy" ++#line 1275 "seclang-parser.yy" + { + driver.m_components.push_back(yystack_[0].value.as < std::string > ()); + } +@@ -2545,7 +2545,7 @@ namespace yy { + break; + + case 90: // expression: "CONFIG_CONN_ENGINE" "CONFIG_VALUE_ON" +-#line 1277 "seclang-parser.yy" ++#line 1279 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecConnEngine is not yet supported."); + YYERROR; +@@ -2554,14 +2554,14 @@ namespace yy { + break; + + case 91: // expression: "CONFIG_CONN_ENGINE" "CONFIG_VALUE_OFF" +-#line 1282 "seclang-parser.yy" ++#line 1284 "seclang-parser.yy" + { + } + #line 2561 "seclang-parser.cc" + break; + + case 92: // expression: "CONFIG_SEC_WEB_APP_ID" +-#line 1285 "seclang-parser.yy" ++#line 1287 "seclang-parser.yy" + { + driver.m_secWebAppId.m_value = yystack_[0].value.as < std::string > (); + driver.m_secWebAppId.m_set = true; +@@ -2570,7 +2570,7 @@ namespace yy { + break; + + case 93: // expression: "CONFIG_SEC_SERVER_SIG" +-#line 1290 "seclang-parser.yy" ++#line 1292 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecServerSignature is not supported."); + YYERROR; +@@ -2579,7 +2579,7 @@ namespace yy { + break; + + case 94: // expression: "CONFIG_SEC_CACHE_TRANSFORMATIONS" +-#line 1295 "seclang-parser.yy" ++#line 1297 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecCacheTransformations is not supported."); + YYERROR; +@@ -2588,7 +2588,7 @@ namespace yy { + break; + + case 95: // expression: "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" "CONFIG_VALUE_ON" +-#line 1300 "seclang-parser.yy" ++#line 1302 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecDisableBackendCompression is not supported."); + YYERROR; +@@ -2597,14 +2597,14 @@ namespace yy { + break; + + case 96: // expression: "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" "CONFIG_VALUE_OFF" +-#line 1305 "seclang-parser.yy" ++#line 1307 "seclang-parser.yy" + { + } + #line 2604 "seclang-parser.cc" + break; + + case 97: // expression: "CONFIG_CONTENT_INJECTION" "CONFIG_VALUE_ON" +-#line 1308 "seclang-parser.yy" ++#line 1310 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecContentInjection is not yet supported."); + YYERROR; +@@ -2613,14 +2613,14 @@ namespace yy { + break; + + case 98: // expression: "CONFIG_CONTENT_INJECTION" "CONFIG_VALUE_OFF" +-#line 1313 "seclang-parser.yy" ++#line 1315 "seclang-parser.yy" + { + } + #line 2620 "seclang-parser.cc" + break; + + case 99: // expression: "CONFIG_SEC_CHROOT_DIR" +-#line 1316 "seclang-parser.yy" ++#line 1318 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecChrootDir is not supported."); + YYERROR; +@@ -2629,7 +2629,7 @@ namespace yy { + break; + + case 100: // expression: "CONFIG_SEC_HASH_ENGINE" "CONFIG_VALUE_ON" +-#line 1321 "seclang-parser.yy" ++#line 1323 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecHashEngine is not yet supported."); + YYERROR; +@@ -2638,14 +2638,14 @@ namespace yy { + break; + + case 101: // expression: "CONFIG_SEC_HASH_ENGINE" "CONFIG_VALUE_OFF" +-#line 1326 "seclang-parser.yy" ++#line 1328 "seclang-parser.yy" + { + } + #line 2645 "seclang-parser.cc" + break; + + case 102: // expression: "CONFIG_SEC_HASH_KEY" +-#line 1329 "seclang-parser.yy" ++#line 1331 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashKey is not yet supported."); + YYERROR; +@@ -2654,7 +2654,7 @@ namespace yy { + break; + + case 103: // expression: "CONFIG_SEC_HASH_PARAM" +-#line 1334 "seclang-parser.yy" ++#line 1336 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashParam is not yet supported."); + YYERROR; +@@ -2663,7 +2663,7 @@ namespace yy { + break; + + case 104: // expression: "CONFIG_SEC_HASH_METHOD_RX" +-#line 1339 "seclang-parser.yy" ++#line 1341 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashMethodRx is not yet supported."); + YYERROR; +@@ -2672,7 +2672,7 @@ namespace yy { + break; + + case 105: // expression: "CONFIG_SEC_HASH_METHOD_PM" +-#line 1344 "seclang-parser.yy" ++#line 1346 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashMethodPm is not yet supported."); + YYERROR; +@@ -2681,7 +2681,7 @@ namespace yy { + break; + + case 106: // expression: "CONFIG_DIR_GSB_DB" +-#line 1349 "seclang-parser.yy" ++#line 1351 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecGsbLookupDb is not supported."); + YYERROR; +@@ -2690,7 +2690,7 @@ namespace yy { + break; + + case 107: // expression: "CONFIG_SEC_GUARDIAN_LOG" +-#line 1354 "seclang-parser.yy" ++#line 1356 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecGuardianLog is not supported."); + YYERROR; +@@ -2699,7 +2699,7 @@ namespace yy { + break; + + case 108: // expression: "CONFIG_SEC_INTERCEPT_ON_ERROR" "CONFIG_VALUE_ON" +-#line 1359 "seclang-parser.yy" ++#line 1361 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecInterceptOnError is not yet supported."); + YYERROR; +@@ -2708,14 +2708,14 @@ namespace yy { + break; + + case 109: // expression: "CONFIG_SEC_INTERCEPT_ON_ERROR" "CONFIG_VALUE_OFF" +-#line 1364 "seclang-parser.yy" ++#line 1366 "seclang-parser.yy" + { + } + #line 2715 "seclang-parser.cc" + break; + + case 110: // expression: "CONFIG_SEC_CONN_R_STATE_LIMIT" +-#line 1367 "seclang-parser.yy" ++#line 1369 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecConnReadStateLimit is not yet supported."); + YYERROR; +@@ -2724,7 +2724,7 @@ namespace yy { + break; + + case 111: // expression: "CONFIG_SEC_CONN_W_STATE_LIMIT" +-#line 1372 "seclang-parser.yy" ++#line 1374 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecConnWriteStateLimit is not yet supported."); + YYERROR; +@@ -2733,7 +2733,7 @@ namespace yy { + break; + + case 112: // expression: "CONFIG_SEC_SENSOR_ID" +-#line 1377 "seclang-parser.yy" ++#line 1379 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecSensorId is not yet supported."); + YYERROR; +@@ -2742,7 +2742,7 @@ namespace yy { + break; + + case 113: // expression: "CONFIG_SEC_RULE_INHERITANCE" "CONFIG_VALUE_ON" +-#line 1382 "seclang-parser.yy" ++#line 1384 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecRuleInheritance is not yet supported."); + YYERROR; +@@ -2751,14 +2751,14 @@ namespace yy { + break; + + case 114: // expression: "CONFIG_SEC_RULE_INHERITANCE" "CONFIG_VALUE_OFF" +-#line 1387 "seclang-parser.yy" ++#line 1389 "seclang-parser.yy" + { + } + #line 2758 "seclang-parser.cc" + break; + + case 115: // expression: "CONFIG_SEC_RULE_PERF_TIME" +-#line 1390 "seclang-parser.yy" ++#line 1392 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecRulePerfTime is not yet supported."); + YYERROR; +@@ -2767,7 +2767,7 @@ namespace yy { + break; + + case 116: // expression: "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" +-#line 1395 "seclang-parser.yy" ++#line 1397 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecStreamInBodyInspection is not supported."); + YYERROR; +@@ -2776,7 +2776,7 @@ namespace yy { + break; + + case 117: // expression: "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" +-#line 1400 "seclang-parser.yy" ++#line 1402 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecStreamOutBodyInspection is not supported."); + YYERROR; +@@ -2785,7 +2785,7 @@ namespace yy { + break; + + case 118: // expression: "CONFIG_SEC_RULE_REMOVE_BY_ID" +-#line 1405 "seclang-parser.yy" ++#line 1407 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.load(yystack_[0].value.as < std::string > (), &error) == false) { +@@ -2802,7 +2802,7 @@ namespace yy { + break; + + case 119: // expression: "CONFIG_SEC_RULE_REMOVE_BY_TAG" +-#line 1418 "seclang-parser.yy" ++#line 1420 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadRemoveRuleByTag(yystack_[0].value.as < std::string > (), &error) == false) { +@@ -2819,7 +2819,7 @@ namespace yy { + break; + + case 120: // expression: "CONFIG_SEC_RULE_REMOVE_BY_MSG" +-#line 1431 "seclang-parser.yy" ++#line 1433 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadRemoveRuleByMsg(yystack_[0].value.as < std::string > (), &error) == false) { +@@ -2836,7 +2836,7 @@ namespace yy { + break; + + case 121: // expression: "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" variables_pre_process +-#line 1444 "seclang-parser.yy" ++#line 1446 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadUpdateTargetByTag(yystack_[1].value.as < std::string > (), std::move(yystack_[0].value.as < std::unique_ptr > > > ()), &error) == false) { +@@ -2853,7 +2853,7 @@ namespace yy { + break; + + case 122: // expression: "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" variables_pre_process +-#line 1457 "seclang-parser.yy" ++#line 1459 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadUpdateTargetByMsg(yystack_[1].value.as < std::string > (), std::move(yystack_[0].value.as < std::unique_ptr > > > ()), &error) == false) { +@@ -2870,7 +2870,7 @@ namespace yy { + break; + + case 123: // expression: "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" variables_pre_process +-#line 1470 "seclang-parser.yy" ++#line 1472 "seclang-parser.yy" + { + std::string error; + double ruleId; +@@ -2900,7 +2900,7 @@ namespace yy { + break; + + case 124: // expression: "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" actions +-#line 1496 "seclang-parser.yy" ++#line 1498 "seclang-parser.yy" + { + std::string error; + double ruleId; +@@ -2931,7 +2931,7 @@ namespace yy { + break; + + case 125: // expression: "CONFIG_DIR_DEBUG_LVL" +-#line 1524 "seclang-parser.yy" ++#line 1526 "seclang-parser.yy" + { + if (driver.m_debugLog != NULL) { + driver.m_debugLog->setDebugLogLevel(atoi(yystack_[0].value.as < std::string > ().c_str())); +@@ -2947,7 +2947,7 @@ namespace yy { + break; + + case 126: // expression: "CONFIG_DIR_DEBUG_LOG" +-#line 1536 "seclang-parser.yy" ++#line 1538 "seclang-parser.yy" + { + if (driver.m_debugLog != NULL) { + std::string error; +@@ -2970,7 +2970,7 @@ namespace yy { + break; + + case 127: // expression: "CONFIG_DIR_GEO_DB" +-#line 1556 "seclang-parser.yy" ++#line 1558 "seclang-parser.yy" + { + #if defined(WITH_GEOIP) or defined(WITH_MAXMIND) + std::string err; +@@ -3001,7 +3001,7 @@ namespace yy { + break; + + case 128: // expression: "CONFIG_DIR_ARGS_LIMIT" +-#line 1583 "seclang-parser.yy" ++#line 1585 "seclang-parser.yy" + { + driver.m_argumentsLimit.m_set = true; + driver.m_argumentsLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3010,7 +3010,7 @@ namespace yy { + break; + + case 129: // expression: "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" +-#line 1588 "seclang-parser.yy" ++#line 1590 "seclang-parser.yy" + { + driver.m_requestBodyJsonDepthLimit.m_set = true; + driver.m_requestBodyJsonDepthLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3019,7 +3019,7 @@ namespace yy { + break; + + case 130: // expression: "CONFIG_DIR_REQ_BODY_LIMIT" +-#line 1594 "seclang-parser.yy" ++#line 1596 "seclang-parser.yy" + { + driver.m_requestBodyLimit.m_set = true; + driver.m_requestBodyLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3028,7 +3028,7 @@ namespace yy { + break; + + case 131: // expression: "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" +-#line 1599 "seclang-parser.yy" ++#line 1601 "seclang-parser.yy" + { + driver.m_requestBodyNoFilesLimit.m_set = true; + driver.m_requestBodyNoFilesLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3037,7 +3037,7 @@ namespace yy { + break; + + case 132: // expression: "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" +-#line 1604 "seclang-parser.yy" ++#line 1606 "seclang-parser.yy" + { + std::stringstream ss; + ss << "As of ModSecurity version 3.0, SecRequestBodyInMemoryLimit is no longer "; +@@ -3050,7 +3050,7 @@ namespace yy { + break; + + case 133: // expression: "CONFIG_DIR_RES_BODY_LIMIT" +-#line 1613 "seclang-parser.yy" ++#line 1615 "seclang-parser.yy" + { + driver.m_responseBodyLimit.m_set = true; + driver.m_responseBodyLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3059,7 +3059,7 @@ namespace yy { + break; + + case 134: // expression: "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" "CONFIG_VALUE_PROCESS_PARTIAL" +-#line 1618 "seclang-parser.yy" ++#line 1620 "seclang-parser.yy" + { + driver.m_requestBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::ProcessPartialBodyLimitAction; + } +@@ -3067,7 +3067,7 @@ namespace yy { + break; + + case 135: // expression: "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" "CONFIG_VALUE_REJECT" +-#line 1622 "seclang-parser.yy" ++#line 1624 "seclang-parser.yy" + { + driver.m_requestBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::RejectBodyLimitAction; + } +@@ -3075,7 +3075,7 @@ namespace yy { + break; + + case 136: // expression: "CONFIG_DIR_RES_BODY_LIMIT_ACTION" "CONFIG_VALUE_PROCESS_PARTIAL" +-#line 1626 "seclang-parser.yy" ++#line 1628 "seclang-parser.yy" + { + driver.m_responseBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::ProcessPartialBodyLimitAction; + } +@@ -3083,7 +3083,7 @@ namespace yy { + break; + + case 137: // expression: "CONFIG_DIR_RES_BODY_LIMIT_ACTION" "CONFIG_VALUE_REJECT" +-#line 1630 "seclang-parser.yy" ++#line 1632 "seclang-parser.yy" + { + driver.m_responseBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::RejectBodyLimitAction; + } +@@ -3091,7 +3091,7 @@ namespace yy { + break; + + case 138: // expression: "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" "CONFIG_VALUE_ABORT" +-#line 1634 "seclang-parser.yy" ++#line 1636 "seclang-parser.yy" + { + driver.m_remoteRulesActionOnFailed = RulesSet::OnFailedRemoteRulesAction::AbortOnFailedRemoteRulesAction; + } +@@ -3099,7 +3099,7 @@ namespace yy { + break; + + case 139: // expression: "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" "CONFIG_VALUE_WARN" +-#line 1638 "seclang-parser.yy" ++#line 1640 "seclang-parser.yy" + { + driver.m_remoteRulesActionOnFailed = RulesSet::OnFailedRemoteRulesAction::WarnOnFailedRemoteRulesAction; + } +@@ -3107,7 +3107,7 @@ namespace yy { + break; + + case 142: // expression: "CONGIG_DIR_RESPONSE_BODY_MP" +-#line 1652 "seclang-parser.yy" ++#line 1654 "seclang-parser.yy" + { + std::istringstream buf(yystack_[0].value.as < std::string > ()); + std::istream_iterator beg(buf), end; +@@ -3123,7 +3123,7 @@ namespace yy { + break; + + case 143: // expression: "CONGIG_DIR_RESPONSE_BODY_MP_CLEAR" +-#line 1664 "seclang-parser.yy" ++#line 1666 "seclang-parser.yy" + { + driver.m_responseBodyTypeToBeInspected.m_set = true; + driver.m_responseBodyTypeToBeInspected.m_clear = true; +@@ -3133,7 +3133,7 @@ namespace yy { + break; + + case 144: // expression: "CONFIG_XML_EXTERNAL_ENTITY" "CONFIG_VALUE_OFF" +-#line 1670 "seclang-parser.yy" ++#line 1672 "seclang-parser.yy" + { + driver.m_secXMLExternalEntity = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -3141,7 +3141,7 @@ namespace yy { + break; + + case 145: // expression: "CONFIG_XML_EXTERNAL_ENTITY" "CONFIG_VALUE_ON" +-#line 1674 "seclang-parser.yy" ++#line 1676 "seclang-parser.yy" + { + driver.m_secXMLExternalEntity = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -3149,7 +3149,7 @@ namespace yy { + break; + + case 146: // expression: "CONGIG_DIR_SEC_TMP_DIR" +-#line 1678 "seclang-parser.yy" ++#line 1680 "seclang-parser.yy" + { + /* Parser error disabled to avoid breaking default installations with modsecurity.conf-recommended + std::stringstream ss; +@@ -3164,7 +3164,7 @@ namespace yy { + break; + + case 149: // expression: "CONGIG_DIR_SEC_COOKIE_FORMAT" +-#line 1699 "seclang-parser.yy" ++#line 1701 "seclang-parser.yy" + { + if (atoi(yystack_[0].value.as < std::string > ().c_str()) == 1) { + driver.error(yystack_[1].location, "SecCookieFormat 1 is not yet supported."); +@@ -3175,7 +3175,7 @@ namespace yy { + break; + + case 150: // expression: "CONFIG_SEC_COOKIEV0_SEPARATOR" +-#line 1706 "seclang-parser.yy" ++#line 1708 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecCookieV0Separator is not yet supported."); + YYERROR; +@@ -3184,7 +3184,7 @@ namespace yy { + break; + + case 152: // expression: "CONFIG_DIR_UNICODE_MAP_FILE" +-#line 1716 "seclang-parser.yy" ++#line 1718 "seclang-parser.yy" + { + std::string error; + std::vector param; +@@ -3242,7 +3242,7 @@ namespace yy { + break; + + case 153: // expression: "CONFIG_SEC_COLLECTION_TIMEOUT" +-#line 1770 "seclang-parser.yy" ++#line 1772 "seclang-parser.yy" + { + /* Parser error disabled to avoid breaking default CRS installations with crs-setup.conf-recommended + driver.error(@0, "SecCollectionTimeout is not yet supported."); +@@ -3253,7 +3253,7 @@ namespace yy { + break; + + case 154: // expression: "CONFIG_SEC_HTTP_BLKEY" +-#line 1777 "seclang-parser.yy" ++#line 1779 "seclang-parser.yy" + { + driver.m_httpblKey.m_set = true; + driver.m_httpblKey.m_value = yystack_[0].value.as < std::string > (); +@@ -3262,7 +3262,7 @@ namespace yy { + break; + + case 155: // variables: variables_pre_process +-#line 1785 "seclang-parser.yy" ++#line 1787 "seclang-parser.yy" + { + std::unique_ptr > > originalList = std::move(yystack_[0].value.as < std::unique_ptr > > > ()); + std::unique_ptr>> newList(new std::vector>()); +@@ -3300,7 +3300,7 @@ namespace yy { + break; + + case 156: // variables_pre_process: variables_may_be_quoted +-#line 1822 "seclang-parser.yy" ++#line 1824 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[0].value.as < std::unique_ptr > > > ()); + } +@@ -3308,7 +3308,7 @@ namespace yy { + break; + + case 157: // variables_pre_process: "QUOTATION_MARK" variables_may_be_quoted "QUOTATION_MARK" +-#line 1826 "seclang-parser.yy" ++#line 1828 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[1].value.as < std::unique_ptr > > > ()); + } +@@ -3316,7 +3316,7 @@ namespace yy { + break; + + case 158: // variables_may_be_quoted: variables_may_be_quoted PIPE var +-#line 1833 "seclang-parser.yy" ++#line 1835 "seclang-parser.yy" + { + yystack_[2].value.as < std::unique_ptr > > > ()->push_back(std::move(yystack_[0].value.as < std::unique_ptr > ())); + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[2].value.as < std::unique_ptr > > > ()); +@@ -3325,7 +3325,7 @@ namespace yy { + break; + + case 159: // variables_may_be_quoted: variables_may_be_quoted PIPE VAR_EXCLUSION var +-#line 1838 "seclang-parser.yy" ++#line 1840 "seclang-parser.yy" + { + std::unique_ptr c(new VariableModificatorExclusion(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + yystack_[3].value.as < std::unique_ptr > > > ()->push_back(std::move(c)); +@@ -3335,7 +3335,7 @@ namespace yy { + break; + + case 160: // variables_may_be_quoted: variables_may_be_quoted PIPE VAR_COUNT var +-#line 1844 "seclang-parser.yy" ++#line 1846 "seclang-parser.yy" + { + std::unique_ptr c(new VariableModificatorCount(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + yystack_[3].value.as < std::unique_ptr > > > ()->push_back(std::move(c)); +@@ -3345,7 +3345,7 @@ namespace yy { + break; + + case 161: // variables_may_be_quoted: var +-#line 1850 "seclang-parser.yy" ++#line 1852 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + b->push_back(std::move(yystack_[0].value.as < std::unique_ptr > ())); +@@ -3355,7 +3355,7 @@ namespace yy { + break; + + case 162: // variables_may_be_quoted: VAR_EXCLUSION var +-#line 1856 "seclang-parser.yy" ++#line 1858 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + std::unique_ptr c(new VariableModificatorExclusion(std::move(yystack_[0].value.as < std::unique_ptr > ()))); +@@ -3366,7 +3366,7 @@ namespace yy { + break; + + case 163: // variables_may_be_quoted: VAR_COUNT var +-#line 1863 "seclang-parser.yy" ++#line 1865 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + std::unique_ptr c(new VariableModificatorCount(std::move(yystack_[0].value.as < std::unique_ptr > ()))); +@@ -3377,7 +3377,7 @@ namespace yy { + break; + + case 164: // var: VARIABLE_ARGS "Dictionary element" +-#line 1873 "seclang-parser.yy" ++#line 1875 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Args_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3385,7 +3385,7 @@ namespace yy { + break; + + case 165: // var: VARIABLE_ARGS "Dictionary element, selected by regexp" +-#line 1877 "seclang-parser.yy" ++#line 1879 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Args_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3393,7 +3393,7 @@ namespace yy { + break; + + case 166: // var: VARIABLE_ARGS +-#line 1881 "seclang-parser.yy" ++#line 1883 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Args_NoDictElement()); + } +@@ -3401,7 +3401,7 @@ namespace yy { + break; + + case 167: // var: VARIABLE_ARGS_POST "Dictionary element" +-#line 1885 "seclang-parser.yy" ++#line 1887 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPost_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3409,7 +3409,7 @@ namespace yy { + break; + + case 168: // var: VARIABLE_ARGS_POST "Dictionary element, selected by regexp" +-#line 1889 "seclang-parser.yy" ++#line 1891 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPost_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3417,7 +3417,7 @@ namespace yy { + break; + + case 169: // var: VARIABLE_ARGS_POST +-#line 1893 "seclang-parser.yy" ++#line 1895 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPost_NoDictElement()); + } +@@ -3425,7 +3425,7 @@ namespace yy { + break; + + case 170: // var: VARIABLE_ARGS_GET "Dictionary element" +-#line 1897 "seclang-parser.yy" ++#line 1899 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGet_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3433,7 +3433,7 @@ namespace yy { + break; + + case 171: // var: VARIABLE_ARGS_GET "Dictionary element, selected by regexp" +-#line 1901 "seclang-parser.yy" ++#line 1903 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGet_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3441,7 +3441,7 @@ namespace yy { + break; + + case 172: // var: VARIABLE_ARGS_GET +-#line 1905 "seclang-parser.yy" ++#line 1907 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGet_NoDictElement()); + } +@@ -3449,7 +3449,7 @@ namespace yy { + break; + + case 173: // var: VARIABLE_FILES_SIZES "Dictionary element" +-#line 1909 "seclang-parser.yy" ++#line 1911 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesSizes_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3457,7 +3457,7 @@ namespace yy { + break; + + case 174: // var: VARIABLE_FILES_SIZES "Dictionary element, selected by regexp" +-#line 1913 "seclang-parser.yy" ++#line 1915 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesSizes_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3465,7 +3465,7 @@ namespace yy { + break; + + case 175: // var: VARIABLE_FILES_SIZES +-#line 1917 "seclang-parser.yy" ++#line 1919 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesSizes_NoDictElement()); + } +@@ -3473,7 +3473,7 @@ namespace yy { + break; + + case 176: // var: VARIABLE_FILES_NAMES "Dictionary element" +-#line 1921 "seclang-parser.yy" ++#line 1923 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesNames_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3481,7 +3481,7 @@ namespace yy { + break; + + case 177: // var: VARIABLE_FILES_NAMES "Dictionary element, selected by regexp" +-#line 1925 "seclang-parser.yy" ++#line 1927 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3489,7 +3489,7 @@ namespace yy { + break; + + case 178: // var: VARIABLE_FILES_NAMES +-#line 1929 "seclang-parser.yy" ++#line 1931 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesNames_NoDictElement()); + } +@@ -3497,7 +3497,7 @@ namespace yy { + break; + + case 179: // var: VARIABLE_FILES_TMP_CONTENT "Dictionary element" +-#line 1933 "seclang-parser.yy" ++#line 1935 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpContent_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3505,7 +3505,7 @@ namespace yy { + break; + + case 180: // var: VARIABLE_FILES_TMP_CONTENT "Dictionary element, selected by regexp" +-#line 1937 "seclang-parser.yy" ++#line 1939 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpContent_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3513,7 +3513,7 @@ namespace yy { + break; + + case 181: // var: VARIABLE_FILES_TMP_CONTENT +-#line 1941 "seclang-parser.yy" ++#line 1943 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpContent_NoDictElement()); + } +@@ -3521,7 +3521,7 @@ namespace yy { + break; + + case 182: // var: VARIABLE_MULTIPART_FILENAME "Dictionary element" +-#line 1945 "seclang-parser.yy" ++#line 1947 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartFileName_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3529,7 +3529,7 @@ namespace yy { + break; + + case 183: // var: VARIABLE_MULTIPART_FILENAME "Dictionary element, selected by regexp" +-#line 1949 "seclang-parser.yy" ++#line 1951 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartFileName_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3537,7 +3537,7 @@ namespace yy { + break; + + case 184: // var: VARIABLE_MULTIPART_FILENAME +-#line 1953 "seclang-parser.yy" ++#line 1955 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartFileName_NoDictElement()); + } +@@ -3545,7 +3545,7 @@ namespace yy { + break; + + case 185: // var: VARIABLE_MULTIPART_NAME "Dictionary element" +-#line 1957 "seclang-parser.yy" ++#line 1959 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartName_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3553,7 +3553,7 @@ namespace yy { + break; + + case 186: // var: VARIABLE_MULTIPART_NAME "Dictionary element, selected by regexp" +-#line 1961 "seclang-parser.yy" ++#line 1963 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartName_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3561,7 +3561,7 @@ namespace yy { + break; + + case 187: // var: VARIABLE_MULTIPART_NAME +-#line 1965 "seclang-parser.yy" ++#line 1967 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartName_NoDictElement()); + } +@@ -3569,7 +3569,7 @@ namespace yy { + break; + + case 188: // var: VARIABLE_MATCHED_VARS_NAMES "Dictionary element" +-#line 1969 "seclang-parser.yy" ++#line 1971 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarsNames_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3577,7 +3577,7 @@ namespace yy { + break; + + case 189: // var: VARIABLE_MATCHED_VARS_NAMES "Dictionary element, selected by regexp" +-#line 1973 "seclang-parser.yy" ++#line 1975 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarsNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3585,7 +3585,7 @@ namespace yy { + break; + + case 190: // var: VARIABLE_MATCHED_VARS_NAMES +-#line 1977 "seclang-parser.yy" ++#line 1979 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarsNames_NoDictElement()); + } +@@ -3593,7 +3593,7 @@ namespace yy { + break; + + case 191: // var: VARIABLE_MATCHED_VARS "Dictionary element" +-#line 1981 "seclang-parser.yy" ++#line 1983 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVars_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3601,7 +3601,7 @@ namespace yy { + break; + + case 192: // var: VARIABLE_MATCHED_VARS "Dictionary element, selected by regexp" +-#line 1985 "seclang-parser.yy" ++#line 1987 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVars_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3609,7 +3609,7 @@ namespace yy { + break; + + case 193: // var: VARIABLE_MATCHED_VARS +-#line 1989 "seclang-parser.yy" ++#line 1991 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVars_NoDictElement()); + } +@@ -3617,7 +3617,7 @@ namespace yy { + break; + + case 194: // var: VARIABLE_FILES "Dictionary element" +-#line 1993 "seclang-parser.yy" ++#line 1995 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Files_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3625,7 +3625,7 @@ namespace yy { + break; + + case 195: // var: VARIABLE_FILES "Dictionary element, selected by regexp" +-#line 1997 "seclang-parser.yy" ++#line 1999 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Files_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3633,7 +3633,7 @@ namespace yy { + break; + + case 196: // var: VARIABLE_FILES +-#line 2001 "seclang-parser.yy" ++#line 2003 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Files_NoDictElement()); + } +@@ -3641,7 +3641,7 @@ namespace yy { + break; + + case 197: // var: VARIABLE_REQUEST_COOKIES "Dictionary element" +-#line 2005 "seclang-parser.yy" ++#line 2007 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookies_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3649,7 +3649,7 @@ namespace yy { + break; + + case 198: // var: VARIABLE_REQUEST_COOKIES "Dictionary element, selected by regexp" +-#line 2009 "seclang-parser.yy" ++#line 2011 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookies_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3657,7 +3657,7 @@ namespace yy { + break; + + case 199: // var: VARIABLE_REQUEST_COOKIES +-#line 2013 "seclang-parser.yy" ++#line 2015 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookies_NoDictElement()); + } +@@ -3665,7 +3665,7 @@ namespace yy { + break; + + case 200: // var: VARIABLE_REQUEST_HEADERS "Dictionary element" +-#line 2017 "seclang-parser.yy" ++#line 2019 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeaders_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3673,7 +3673,7 @@ namespace yy { + break; + + case 201: // var: VARIABLE_REQUEST_HEADERS "Dictionary element, selected by regexp" +-#line 2021 "seclang-parser.yy" ++#line 2023 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeaders_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3681,7 +3681,7 @@ namespace yy { + break; + + case 202: // var: VARIABLE_REQUEST_HEADERS +-#line 2025 "seclang-parser.yy" ++#line 2027 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeaders_NoDictElement()); + } +@@ -3689,7 +3689,7 @@ namespace yy { + break; + + case 203: // var: VARIABLE_RESPONSE_HEADERS "Dictionary element" +-#line 2029 "seclang-parser.yy" ++#line 2031 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeaders_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3697,7 +3697,7 @@ namespace yy { + break; + + case 204: // var: VARIABLE_RESPONSE_HEADERS "Dictionary element, selected by regexp" +-#line 2033 "seclang-parser.yy" ++#line 2035 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeaders_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3705,7 +3705,7 @@ namespace yy { + break; + + case 205: // var: VARIABLE_RESPONSE_HEADERS +-#line 2037 "seclang-parser.yy" ++#line 2039 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeaders_NoDictElement()); + } +@@ -3713,7 +3713,7 @@ namespace yy { + break; + + case 206: // var: VARIABLE_GEO "Dictionary element" +-#line 2041 "seclang-parser.yy" ++#line 2043 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Geo_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3721,7 +3721,7 @@ namespace yy { + break; + + case 207: // var: VARIABLE_GEO "Dictionary element, selected by regexp" +-#line 2045 "seclang-parser.yy" ++#line 2047 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Geo_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3729,7 +3729,7 @@ namespace yy { + break; + + case 208: // var: VARIABLE_GEO +-#line 2049 "seclang-parser.yy" ++#line 2051 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Geo_NoDictElement()); + } +@@ -3737,7 +3737,7 @@ namespace yy { + break; + + case 209: // var: VARIABLE_REQUEST_COOKIES_NAMES "Dictionary element" +-#line 2053 "seclang-parser.yy" ++#line 2055 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookiesNames_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3745,7 +3745,7 @@ namespace yy { + break; + + case 210: // var: VARIABLE_REQUEST_COOKIES_NAMES "Dictionary element, selected by regexp" +-#line 2057 "seclang-parser.yy" ++#line 2059 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookiesNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3753,1905 +3753,1929 @@ namespace yy { + break; + + case 211: // var: VARIABLE_REQUEST_COOKIES_NAMES +-#line 2061 "seclang-parser.yy" ++#line 2063 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookiesNames_NoDictElement()); + } + #line 3761 "seclang-parser.cc" + break; + +- case 212: // var: VARIABLE_RULE "Dictionary element" +-#line 2065 "seclang-parser.yy" ++ case 212: // var: VARIABLE_MULTIPART_PART_HEADERS "Dictionary element" ++#line 2067 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartPartHeaders_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3769 "seclang-parser.cc" + break; + +- case 213: // var: VARIABLE_RULE "Dictionary element, selected by regexp" +-#line 2069 "seclang-parser.yy" ++ case 213: // var: VARIABLE_MULTIPART_PART_HEADERS "Dictionary element, selected by regexp" ++#line 2071 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartPartHeaders_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3777 "seclang-parser.cc" + break; + +- case 214: // var: VARIABLE_RULE +-#line 2073 "seclang-parser.yy" ++ case 214: // var: VARIABLE_MULTIPART_PART_HEADERS ++#line 2075 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartPartHeaders_NoDictElement()); + } + #line 3785 "seclang-parser.cc" + break; + +- case 215: // var: "RUN_TIME_VAR_ENV" "Dictionary element" +-#line 2077 "seclang-parser.yy" ++ case 215: // var: VARIABLE_RULE "Dictionary element" ++#line 2079 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3793 "seclang-parser.cc" + break; + +- case 216: // var: "RUN_TIME_VAR_ENV" "Dictionary element, selected by regexp" +-#line 2081 "seclang-parser.yy" ++ case 216: // var: VARIABLE_RULE "Dictionary element, selected by regexp" ++#line 2083 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3801 "seclang-parser.cc" + break; + +- case 217: // var: "RUN_TIME_VAR_ENV" +-#line 2085 "seclang-parser.yy" ++ case 217: // var: VARIABLE_RULE ++#line 2087 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV")); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_NoDictElement()); + } + #line 3809 "seclang-parser.cc" + break; + +- case 218: // var: "RUN_TIME_VAR_XML" "Dictionary element" +-#line 2089 "seclang-parser.yy" ++ case 218: // var: "RUN_TIME_VAR_ENV" "Dictionary element" ++#line 2091 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); + } + #line 3817 "seclang-parser.cc" + break; + +- case 219: // var: "RUN_TIME_VAR_XML" "Dictionary element, selected by regexp" +-#line 2093 "seclang-parser.yy" ++ case 219: // var: "RUN_TIME_VAR_ENV" "Dictionary element, selected by regexp" ++#line 2095 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); + } + #line 3825 "seclang-parser.cc" + break; + +- case 220: // var: "RUN_TIME_VAR_XML" +-#line 2097 "seclang-parser.yy" ++ case 220: // var: "RUN_TIME_VAR_ENV" ++#line 2099 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV")); + } + #line 3833 "seclang-parser.cc" + break; + +- case 221: // var: "FILES_TMPNAMES" "Dictionary element" +-#line 2101 "seclang-parser.yy" ++ case 221: // var: "RUN_TIME_VAR_XML" "Dictionary element" ++#line 2103 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); + } + #line 3841 "seclang-parser.cc" + break; + +- case 222: // var: "FILES_TMPNAMES" "Dictionary element, selected by regexp" +-#line 2105 "seclang-parser.yy" ++ case 222: // var: "RUN_TIME_VAR_XML" "Dictionary element, selected by regexp" ++#line 2107 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); + } + #line 3849 "seclang-parser.cc" + break; + +- case 223: // var: "FILES_TMPNAMES" +-#line 2109 "seclang-parser.yy" ++ case 223: // var: "RUN_TIME_VAR_XML" ++#line 2111 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML_NoDictElement()); + } + #line 3857 "seclang-parser.cc" + break; + +- case 224: // var: "RESOURCE" run_time_string +-#line 2113 "seclang-parser.yy" ++ case 224: // var: "FILES_TMPNAMES" "Dictionary element" ++#line 2115 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3865 "seclang-parser.cc" + break; + +- case 225: // var: "RESOURCE" "Dictionary element" +-#line 2117 "seclang-parser.yy" ++ case 225: // var: "FILES_TMPNAMES" "Dictionary element, selected by regexp" ++#line 2119 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3873 "seclang-parser.cc" + break; + +- case 226: // var: "RESOURCE" "Dictionary element, selected by regexp" +-#line 2121 "seclang-parser.yy" ++ case 226: // var: "FILES_TMPNAMES" ++#line 2123 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_NoDictElement()); + } + #line 3881 "seclang-parser.cc" + break; + +- case 227: // var: "RESOURCE" +-#line 2125 "seclang-parser.yy" ++ case 227: // var: "RESOURCE" run_time_string ++#line 2127 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3889 "seclang-parser.cc" + break; + +- case 228: // var: "VARIABLE_IP" run_time_string +-#line 2129 "seclang-parser.yy" ++ case 228: // var: "RESOURCE" "Dictionary element" ++#line 2131 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3897 "seclang-parser.cc" + break; + +- case 229: // var: "VARIABLE_IP" "Dictionary element" +-#line 2133 "seclang-parser.yy" ++ case 229: // var: "RESOURCE" "Dictionary element, selected by regexp" ++#line 2135 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3905 "seclang-parser.cc" + break; + +- case 230: // var: "VARIABLE_IP" "Dictionary element, selected by regexp" +-#line 2137 "seclang-parser.yy" ++ case 230: // var: "RESOURCE" ++#line 2139 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_NoDictElement()); + } + #line 3913 "seclang-parser.cc" + break; + +- case 231: // var: "VARIABLE_IP" +-#line 2141 "seclang-parser.yy" ++ case 231: // var: "VARIABLE_IP" run_time_string ++#line 2143 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3921 "seclang-parser.cc" + break; + +- case 232: // var: "VARIABLE_GLOBAL" run_time_string +-#line 2145 "seclang-parser.yy" ++ case 232: // var: "VARIABLE_IP" "Dictionary element" ++#line 2147 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3929 "seclang-parser.cc" + break; + +- case 233: // var: "VARIABLE_GLOBAL" "Dictionary element" +-#line 2149 "seclang-parser.yy" ++ case 233: // var: "VARIABLE_IP" "Dictionary element, selected by regexp" ++#line 2151 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3937 "seclang-parser.cc" + break; + +- case 234: // var: "VARIABLE_GLOBAL" "Dictionary element, selected by regexp" +-#line 2153 "seclang-parser.yy" ++ case 234: // var: "VARIABLE_IP" ++#line 2155 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_NoDictElement()); + } + #line 3945 "seclang-parser.cc" + break; + +- case 235: // var: "VARIABLE_GLOBAL" +-#line 2157 "seclang-parser.yy" ++ case 235: // var: "VARIABLE_GLOBAL" run_time_string ++#line 2159 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3953 "seclang-parser.cc" + break; + +- case 236: // var: "VARIABLE_USER" run_time_string +-#line 2161 "seclang-parser.yy" ++ case 236: // var: "VARIABLE_GLOBAL" "Dictionary element" ++#line 2163 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3961 "seclang-parser.cc" + break; + +- case 237: // var: "VARIABLE_USER" "Dictionary element" +-#line 2165 "seclang-parser.yy" ++ case 237: // var: "VARIABLE_GLOBAL" "Dictionary element, selected by regexp" ++#line 2167 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3969 "seclang-parser.cc" + break; + +- case 238: // var: "VARIABLE_USER" "Dictionary element, selected by regexp" +-#line 2169 "seclang-parser.yy" ++ case 238: // var: "VARIABLE_GLOBAL" ++#line 2171 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_NoDictElement()); + } + #line 3977 "seclang-parser.cc" + break; + +- case 239: // var: "VARIABLE_USER" +-#line 2173 "seclang-parser.yy" ++ case 239: // var: "VARIABLE_USER" run_time_string ++#line 2175 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3985 "seclang-parser.cc" + break; + +- case 240: // var: "VARIABLE_TX" run_time_string +-#line 2177 "seclang-parser.yy" ++ case 240: // var: "VARIABLE_USER" "Dictionary element" ++#line 2179 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3993 "seclang-parser.cc" + break; + +- case 241: // var: "VARIABLE_TX" "Dictionary element" +-#line 2181 "seclang-parser.yy" ++ case 241: // var: "VARIABLE_USER" "Dictionary element, selected by regexp" ++#line 2183 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4001 "seclang-parser.cc" + break; + +- case 242: // var: "VARIABLE_TX" "Dictionary element, selected by regexp" +-#line 2185 "seclang-parser.yy" ++ case 242: // var: "VARIABLE_USER" ++#line 2187 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_NoDictElement()); + } + #line 4009 "seclang-parser.cc" + break; + +- case 243: // var: "VARIABLE_TX" +-#line 2189 "seclang-parser.yy" ++ case 243: // var: "VARIABLE_TX" run_time_string ++#line 2191 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 4017 "seclang-parser.cc" + break; + +- case 244: // var: "VARIABLE_SESSION" run_time_string +-#line 2193 "seclang-parser.yy" ++ case 244: // var: "VARIABLE_TX" "Dictionary element" ++#line 2195 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4025 "seclang-parser.cc" + break; + +- case 245: // var: "VARIABLE_SESSION" "Dictionary element" +-#line 2197 "seclang-parser.yy" ++ case 245: // var: "VARIABLE_TX" "Dictionary element, selected by regexp" ++#line 2199 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4033 "seclang-parser.cc" + break; + +- case 246: // var: "VARIABLE_SESSION" "Dictionary element, selected by regexp" +-#line 2201 "seclang-parser.yy" ++ case 246: // var: "VARIABLE_TX" ++#line 2203 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_NoDictElement()); + } + #line 4041 "seclang-parser.cc" + break; + +- case 247: // var: "VARIABLE_SESSION" +-#line 2205 "seclang-parser.yy" ++ case 247: // var: "VARIABLE_SESSION" run_time_string ++#line 2207 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 4049 "seclang-parser.cc" + break; + +- case 248: // var: "Variable ARGS_NAMES" "Dictionary element" +-#line 2209 "seclang-parser.yy" ++ case 248: // var: "VARIABLE_SESSION" "Dictionary element" ++#line 2211 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4057 "seclang-parser.cc" + break; + +- case 249: // var: "Variable ARGS_NAMES" "Dictionary element, selected by regexp" +-#line 2213 "seclang-parser.yy" ++ case 249: // var: "VARIABLE_SESSION" "Dictionary element, selected by regexp" ++#line 2215 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4065 "seclang-parser.cc" + break; + +- case 250: // var: "Variable ARGS_NAMES" +-#line 2217 "seclang-parser.yy" ++ case 250: // var: "VARIABLE_SESSION" ++#line 2219 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_NoDictElement()); + } + #line 4073 "seclang-parser.cc" + break; + +- case 251: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element" +-#line 2221 "seclang-parser.yy" ++ case 251: // var: "Variable ARGS_NAMES" "Dictionary element" ++#line 2223 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4081 "seclang-parser.cc" + break; + +- case 252: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element, selected by regexp" +-#line 2225 "seclang-parser.yy" ++ case 252: // var: "Variable ARGS_NAMES" "Dictionary element, selected by regexp" ++#line 2227 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4089 "seclang-parser.cc" + break; + +- case 253: // var: VARIABLE_ARGS_GET_NAMES +-#line 2229 "seclang-parser.yy" ++ case 253: // var: "Variable ARGS_NAMES" ++#line 2231 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_NoDictElement()); + } + #line 4097 "seclang-parser.cc" + break; + +- case 254: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element" +-#line 2234 "seclang-parser.yy" ++ case 254: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element" ++#line 2235 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4105 "seclang-parser.cc" + break; + +- case 255: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element, selected by regexp" +-#line 2238 "seclang-parser.yy" ++ case 255: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element, selected by regexp" ++#line 2239 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4113 "seclang-parser.cc" + break; + +- case 256: // var: VARIABLE_ARGS_POST_NAMES +-#line 2242 "seclang-parser.yy" ++ case 256: // var: VARIABLE_ARGS_GET_NAMES ++#line 2243 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_NoDictElement()); + } + #line 4121 "seclang-parser.cc" + break; + +- case 257: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element" +-#line 2247 "seclang-parser.yy" ++ case 257: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element" ++#line 2248 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4129 "seclang-parser.cc" + break; + +- case 258: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element, selected by regexp" +-#line 2251 "seclang-parser.yy" ++ case 258: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element, selected by regexp" ++#line 2252 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4137 "seclang-parser.cc" + break; + +- case 259: // var: VARIABLE_REQUEST_HEADERS_NAMES +-#line 2255 "seclang-parser.yy" ++ case 259: // var: VARIABLE_ARGS_POST_NAMES ++#line 2256 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_NoDictElement()); + } + #line 4145 "seclang-parser.cc" + break; + +- case 260: // var: VARIABLE_RESPONSE_CONTENT_TYPE +-#line 2260 "seclang-parser.yy" ++ case 260: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element" ++#line 2261 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentType()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4153 "seclang-parser.cc" + break; + +- case 261: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element" ++ case 261: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element, selected by regexp" + #line 2265 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4161 "seclang-parser.cc" + break; + +- case 262: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element, selected by regexp" ++ case 262: // var: VARIABLE_REQUEST_HEADERS_NAMES + #line 2269 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_NoDictElement()); + } + #line 4169 "seclang-parser.cc" + break; + +- case 263: // var: VARIABLE_RESPONSE_HEADERS_NAMES +-#line 2273 "seclang-parser.yy" ++ case 263: // var: VARIABLE_RESPONSE_CONTENT_TYPE ++#line 2274 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentType()); + } + #line 4177 "seclang-parser.cc" + break; + +- case 264: // var: VARIABLE_ARGS_COMBINED_SIZE +-#line 2277 "seclang-parser.yy" ++ case 264: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element" ++#line 2279 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsCombinedSize()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4185 "seclang-parser.cc" + break; + +- case 265: // var: "AUTH_TYPE" +-#line 2281 "seclang-parser.yy" ++ case 265: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element, selected by regexp" ++#line 2283 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::AuthType()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4193 "seclang-parser.cc" + break; + +- case 266: // var: "FILES_COMBINED_SIZE" +-#line 2285 "seclang-parser.yy" ++ case 266: // var: VARIABLE_RESPONSE_HEADERS_NAMES ++#line 2287 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesCombinedSize()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_NoDictElement()); + } + #line 4201 "seclang-parser.cc" + break; + +- case 267: // var: "FULL_REQUEST" +-#line 2289 "seclang-parser.yy" ++ case 267: // var: VARIABLE_ARGS_COMBINED_SIZE ++#line 2291 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequest()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsCombinedSize()); + } + #line 4209 "seclang-parser.cc" + break; + +- case 268: // var: "FULL_REQUEST_LENGTH" +-#line 2293 "seclang-parser.yy" ++ case 268: // var: "AUTH_TYPE" ++#line 2295 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequestLength()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::AuthType()); + } + #line 4217 "seclang-parser.cc" + break; + +- case 269: // var: "INBOUND_DATA_ERROR" +-#line 2297 "seclang-parser.yy" ++ case 269: // var: "FILES_COMBINED_SIZE" ++#line 2299 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::InboundDataError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesCombinedSize()); + } + #line 4225 "seclang-parser.cc" + break; + +- case 270: // var: "MATCHED_VAR" +-#line 2301 "seclang-parser.yy" ++ case 270: // var: "FULL_REQUEST" ++#line 2303 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVar()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequest()); + } + #line 4233 "seclang-parser.cc" + break; + +- case 271: // var: "MATCHED_VAR_NAME" +-#line 2305 "seclang-parser.yy" ++ case 271: // var: "FULL_REQUEST_LENGTH" ++#line 2307 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarName()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequestLength()); + } + #line 4241 "seclang-parser.cc" + break; + +- case 272: // var: VARIABLE_MULTIPART_BOUNDARY_QUOTED +-#line 2309 "seclang-parser.yy" ++ case 272: // var: "INBOUND_DATA_ERROR" ++#line 2311 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryQuoted()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::InboundDataError()); + } + #line 4249 "seclang-parser.cc" + break; + +- case 273: // var: VARIABLE_MULTIPART_BOUNDARY_WHITESPACE +-#line 2313 "seclang-parser.yy" ++ case 273: // var: "MATCHED_VAR" ++#line 2315 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryWhiteSpace()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVar()); + } + #line 4257 "seclang-parser.cc" + break; + +- case 274: // var: "MULTIPART_CRLF_LF_LINES" +-#line 2317 "seclang-parser.yy" ++ case 274: // var: "MATCHED_VAR_NAME" ++#line 2319 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartCrlfLFLines()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarName()); + } + #line 4265 "seclang-parser.cc" + break; + +- case 275: // var: "MULTIPART_DATA_AFTER" +-#line 2321 "seclang-parser.yy" ++ case 275: // var: VARIABLE_MULTIPART_BOUNDARY_QUOTED ++#line 2323 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateAfter()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryQuoted()); + } + #line 4273 "seclang-parser.cc" + break; + +- case 276: // var: VARIABLE_MULTIPART_DATA_BEFORE +-#line 2325 "seclang-parser.yy" ++ case 276: // var: VARIABLE_MULTIPART_BOUNDARY_WHITESPACE ++#line 2327 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateBefore()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryWhiteSpace()); + } + #line 4281 "seclang-parser.cc" + break; + +- case 277: // var: "MULTIPART_FILE_LIMIT_EXCEEDED" +-#line 2329 "seclang-parser.yy" ++ case 277: // var: "MULTIPART_CRLF_LF_LINES" ++#line 2331 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartFileLimitExceeded()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartCrlfLFLines()); + } + #line 4289 "seclang-parser.cc" + break; + +- case 278: // var: "MULTIPART_HEADER_FOLDING" +-#line 2333 "seclang-parser.yy" ++ case 278: // var: "MULTIPART_DATA_AFTER" ++#line 2335 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartHeaderFolding()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateAfter()); + } + #line 4297 "seclang-parser.cc" + break; + +- case 279: // var: "MULTIPART_INVALID_HEADER_FOLDING" +-#line 2337 "seclang-parser.yy" ++ case 279: // var: VARIABLE_MULTIPART_DATA_BEFORE ++#line 2339 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidHeaderFolding()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateBefore()); + } + #line 4305 "seclang-parser.cc" + break; + +- case 280: // var: VARIABLE_MULTIPART_INVALID_PART +-#line 2341 "seclang-parser.yy" ++ case 280: // var: "MULTIPART_FILE_LIMIT_EXCEEDED" ++#line 2343 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidPart()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartFileLimitExceeded()); + } + #line 4313 "seclang-parser.cc" + break; + +- case 281: // var: "MULTIPART_INVALID_QUOTING" +-#line 2345 "seclang-parser.yy" ++ case 281: // var: "MULTIPART_HEADER_FOLDING" ++#line 2347 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidQuoting()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartHeaderFolding()); + } + #line 4321 "seclang-parser.cc" + break; + +- case 282: // var: VARIABLE_MULTIPART_LF_LINE +-#line 2349 "seclang-parser.yy" ++ case 282: // var: "MULTIPART_INVALID_HEADER_FOLDING" ++#line 2351 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartLFLine()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidHeaderFolding()); + } + #line 4329 "seclang-parser.cc" + break; + +- case 283: // var: VARIABLE_MULTIPART_MISSING_SEMICOLON +-#line 2353 "seclang-parser.yy" ++ case 283: // var: VARIABLE_MULTIPART_INVALID_PART ++#line 2355 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidPart()); + } + #line 4337 "seclang-parser.cc" + break; + +- case 284: // var: VARIABLE_MULTIPART_SEMICOLON_MISSING +-#line 2357 "seclang-parser.yy" ++ case 284: // var: "MULTIPART_INVALID_QUOTING" ++#line 2359 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidQuoting()); + } + #line 4345 "seclang-parser.cc" + break; + +- case 285: // var: "MULTIPART_STRICT_ERROR" +-#line 2361 "seclang-parser.yy" ++ case 285: // var: VARIABLE_MULTIPART_LF_LINE ++#line 2363 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartStrictError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartLFLine()); + } + #line 4353 "seclang-parser.cc" + break; + +- case 286: // var: "MULTIPART_UNMATCHED_BOUNDARY" +-#line 2365 "seclang-parser.yy" ++ case 286: // var: VARIABLE_MULTIPART_MISSING_SEMICOLON ++#line 2367 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartUnmatchedBoundary()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); + } + #line 4361 "seclang-parser.cc" + break; + +- case 287: // var: "OUTBOUND_DATA_ERROR" +-#line 2369 "seclang-parser.yy" ++ case 287: // var: VARIABLE_MULTIPART_SEMICOLON_MISSING ++#line 2371 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::OutboundDataError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); + } + #line 4369 "seclang-parser.cc" + break; + +- case 288: // var: "PATH_INFO" +-#line 2373 "seclang-parser.yy" ++ case 288: // var: "MULTIPART_STRICT_ERROR" ++#line 2375 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::PathInfo()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartStrictError()); + } + #line 4377 "seclang-parser.cc" + break; + +- case 289: // var: "QUERY_STRING" +-#line 2377 "seclang-parser.yy" ++ case 289: // var: "MULTIPART_UNMATCHED_BOUNDARY" ++#line 2379 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::QueryString()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartUnmatchedBoundary()); + } + #line 4385 "seclang-parser.cc" + break; + +- case 290: // var: "REMOTE_ADDR" +-#line 2381 "seclang-parser.yy" ++ case 290: // var: "OUTBOUND_DATA_ERROR" ++#line 2383 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteAddr()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::OutboundDataError()); + } + #line 4393 "seclang-parser.cc" + break; + +- case 291: // var: "REMOTE_HOST" +-#line 2385 "seclang-parser.yy" ++ case 291: // var: "PATH_INFO" ++#line 2387 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteHost()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::PathInfo()); + } + #line 4401 "seclang-parser.cc" + break; + +- case 292: // var: "REMOTE_PORT" +-#line 2389 "seclang-parser.yy" ++ case 292: // var: "QUERY_STRING" ++#line 2391 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemotePort()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::QueryString()); + } + #line 4409 "seclang-parser.cc" + break; + +- case 293: // var: "REQBODY_ERROR" +-#line 2393 "seclang-parser.yy" ++ case 293: // var: "REMOTE_ADDR" ++#line 2395 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteAddr()); + } + #line 4417 "seclang-parser.cc" + break; + +- case 294: // var: "REQBODY_ERROR_MSG" +-#line 2397 "seclang-parser.yy" ++ case 294: // var: "REMOTE_HOST" ++#line 2399 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyErrorMsg()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteHost()); + } + #line 4425 "seclang-parser.cc" + break; + +- case 295: // var: "REQBODY_PROCESSOR" +-#line 2401 "seclang-parser.yy" ++ case 295: // var: "REMOTE_PORT" ++#line 2403 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessor()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemotePort()); + } + #line 4433 "seclang-parser.cc" + break; + +- case 296: // var: "REQBODY_PROCESSOR_ERROR" +-#line 2405 "seclang-parser.yy" ++ case 296: // var: "REQBODY_ERROR" ++#line 2407 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyError()); + } + #line 4441 "seclang-parser.cc" + break; + +- case 297: // var: "REQBODY_PROCESSOR_ERROR_MSG" +-#line 2409 "seclang-parser.yy" ++ case 297: // var: "REQBODY_ERROR_MSG" ++#line 2411 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorErrorMsg()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyErrorMsg()); + } + #line 4449 "seclang-parser.cc" + break; + +- case 298: // var: "REQUEST_BASENAME" +-#line 2413 "seclang-parser.yy" ++ case 298: // var: "REQBODY_PROCESSOR" ++#line 2415 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBasename()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessor()); + } + #line 4457 "seclang-parser.cc" + break; + +- case 299: // var: "REQUEST_BODY" +-#line 2417 "seclang-parser.yy" ++ case 299: // var: "REQBODY_PROCESSOR_ERROR" ++#line 2419 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBody()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorError()); + } + #line 4465 "seclang-parser.cc" + break; + +- case 300: // var: "REQUEST_BODY_LENGTH" +-#line 2421 "seclang-parser.yy" ++ case 300: // var: "REQBODY_PROCESSOR_ERROR_MSG" ++#line 2423 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBodyLength()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorErrorMsg()); + } + #line 4473 "seclang-parser.cc" + break; + +- case 301: // var: "REQUEST_FILENAME" +-#line 2425 "seclang-parser.yy" ++ case 301: // var: "REQUEST_BASENAME" ++#line 2427 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestFilename()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBasename()); + } + #line 4481 "seclang-parser.cc" + break; + +- case 302: // var: "REQUEST_LINE" +-#line 2429 "seclang-parser.yy" ++ case 302: // var: "REQUEST_BODY" ++#line 2431 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestLine()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBody()); + } + #line 4489 "seclang-parser.cc" + break; + +- case 303: // var: "REQUEST_METHOD" +-#line 2433 "seclang-parser.yy" ++ case 303: // var: "REQUEST_BODY_LENGTH" ++#line 2435 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestMethod()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBodyLength()); + } + #line 4497 "seclang-parser.cc" + break; + +- case 304: // var: "REQUEST_PROTOCOL" +-#line 2437 "seclang-parser.yy" ++ case 304: // var: "REQUEST_FILENAME" ++#line 2439 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestProtocol()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestFilename()); + } + #line 4505 "seclang-parser.cc" + break; + +- case 305: // var: "REQUEST_URI" +-#line 2441 "seclang-parser.yy" ++ case 305: // var: "REQUEST_LINE" ++#line 2443 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURI()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestLine()); + } + #line 4513 "seclang-parser.cc" + break; + +- case 306: // var: "REQUEST_URI_RAW" +-#line 2445 "seclang-parser.yy" ++ case 306: // var: "REQUEST_METHOD" ++#line 2447 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURIRaw()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestMethod()); + } + #line 4521 "seclang-parser.cc" + break; + +- case 307: // var: "RESPONSE_BODY" +-#line 2449 "seclang-parser.yy" ++ case 307: // var: "REQUEST_PROTOCOL" ++#line 2451 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseBody()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestProtocol()); + } + #line 4529 "seclang-parser.cc" + break; + +- case 308: // var: "RESPONSE_CONTENT_LENGTH" +-#line 2453 "seclang-parser.yy" ++ case 308: // var: "REQUEST_URI" ++#line 2455 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentLength()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURI()); + } + #line 4537 "seclang-parser.cc" + break; + +- case 309: // var: "RESPONSE_PROTOCOL" +-#line 2457 "seclang-parser.yy" ++ case 309: // var: "REQUEST_URI_RAW" ++#line 2459 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseProtocol()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURIRaw()); + } + #line 4545 "seclang-parser.cc" + break; + +- case 310: // var: "RESPONSE_STATUS" +-#line 2461 "seclang-parser.yy" ++ case 310: // var: "RESPONSE_BODY" ++#line 2463 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseStatus()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseBody()); + } + #line 4553 "seclang-parser.cc" + break; + +- case 311: // var: "SERVER_ADDR" +-#line 2465 "seclang-parser.yy" ++ case 311: // var: "RESPONSE_CONTENT_LENGTH" ++#line 2467 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerAddr()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentLength()); + } + #line 4561 "seclang-parser.cc" + break; + +- case 312: // var: "SERVER_NAME" +-#line 2469 "seclang-parser.yy" ++ case 312: // var: "RESPONSE_PROTOCOL" ++#line 2471 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerName()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseProtocol()); + } + #line 4569 "seclang-parser.cc" + break; + +- case 313: // var: "SERVER_PORT" +-#line 2473 "seclang-parser.yy" ++ case 313: // var: "RESPONSE_STATUS" ++#line 2475 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerPort()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseStatus()); + } + #line 4577 "seclang-parser.cc" + break; + +- case 314: // var: "SESSIONID" +-#line 2477 "seclang-parser.yy" ++ case 314: // var: "SERVER_ADDR" ++#line 2479 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::SessionID()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerAddr()); + } + #line 4585 "seclang-parser.cc" + break; + +- case 315: // var: "UNIQUE_ID" +-#line 2481 "seclang-parser.yy" ++ case 315: // var: "SERVER_NAME" ++#line 2483 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UniqueID()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerName()); + } + #line 4593 "seclang-parser.cc" + break; + +- case 316: // var: "URLENCODED_ERROR" +-#line 2485 "seclang-parser.yy" ++ case 316: // var: "SERVER_PORT" ++#line 2487 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UrlEncodedError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerPort()); + } + #line 4601 "seclang-parser.cc" + break; + +- case 317: // var: "USERID" +-#line 2489 "seclang-parser.yy" ++ case 317: // var: "SESSIONID" ++#line 2491 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UserID()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::SessionID()); + } + #line 4609 "seclang-parser.cc" + break; + +- case 318: // var: "VARIABLE_STATUS" +-#line 2493 "seclang-parser.yy" ++ case 318: // var: "UNIQUE_ID" ++#line 2495 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UniqueID()); + } + #line 4617 "seclang-parser.cc" + break; + +- case 319: // var: "VARIABLE_STATUS_LINE" +-#line 2497 "seclang-parser.yy" ++ case 319: // var: "URLENCODED_ERROR" ++#line 2499 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UrlEncodedError()); + } + #line 4625 "seclang-parser.cc" + break; + +- case 320: // var: "WEBAPPID" +-#line 2501 "seclang-parser.yy" ++ case 320: // var: "USERID" ++#line 2503 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::WebAppId()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UserID()); + } + #line 4633 "seclang-parser.cc" + break; + +- case 321: // var: "RUN_TIME_VAR_DUR" +-#line 2505 "seclang-parser.yy" ++ case 321: // var: "VARIABLE_STATUS" ++#line 2507 "seclang-parser.yy" ++ { ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ } ++#line 4641 "seclang-parser.cc" ++ break; ++ ++ case 322: // var: "VARIABLE_STATUS_LINE" ++#line 2511 "seclang-parser.yy" ++ { ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ } ++#line 4649 "seclang-parser.cc" ++ break; ++ ++ case 323: // var: "WEBAPPID" ++#line 2515 "seclang-parser.yy" ++ { ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::WebAppId()); ++ } ++#line 4657 "seclang-parser.cc" ++ break; ++ ++ case 324: // var: "RUN_TIME_VAR_DUR" ++#line 2519 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new Duration(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4644 "seclang-parser.cc" ++#line 4668 "seclang-parser.cc" + break; + +- case 322: // var: "RUN_TIME_VAR_BLD" +-#line 2513 "seclang-parser.yy" ++ case 325: // var: "RUN_TIME_VAR_BLD" ++#line 2527 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new ModsecBuild(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4655 "seclang-parser.cc" ++#line 4679 "seclang-parser.cc" + break; + +- case 323: // var: "RUN_TIME_VAR_HSV" +-#line 2520 "seclang-parser.yy" ++ case 326: // var: "RUN_TIME_VAR_HSV" ++#line 2534 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new HighestSeverity(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4666 "seclang-parser.cc" ++#line 4690 "seclang-parser.cc" + break; + +- case 324: // var: "RUN_TIME_VAR_REMOTE_USER" +-#line 2527 "seclang-parser.yy" ++ case 327: // var: "RUN_TIME_VAR_REMOTE_USER" ++#line 2541 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new RemoteUser(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4677 "seclang-parser.cc" ++#line 4701 "seclang-parser.cc" + break; + +- case 325: // var: "RUN_TIME_VAR_TIME" +-#line 2534 "seclang-parser.yy" ++ case 328: // var: "RUN_TIME_VAR_TIME" ++#line 2548 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new Time(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4688 "seclang-parser.cc" ++#line 4712 "seclang-parser.cc" + break; + +- case 326: // var: "RUN_TIME_VAR_TIME_DAY" +-#line 2541 "seclang-parser.yy" ++ case 329: // var: "RUN_TIME_VAR_TIME_DAY" ++#line 2555 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeDay(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4699 "seclang-parser.cc" ++#line 4723 "seclang-parser.cc" + break; + +- case 327: // var: "RUN_TIME_VAR_TIME_EPOCH" +-#line 2548 "seclang-parser.yy" ++ case 330: // var: "RUN_TIME_VAR_TIME_EPOCH" ++#line 2562 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeEpoch(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4710 "seclang-parser.cc" ++#line 4734 "seclang-parser.cc" + break; + +- case 328: // var: "RUN_TIME_VAR_TIME_HOUR" +-#line 2555 "seclang-parser.yy" ++ case 331: // var: "RUN_TIME_VAR_TIME_HOUR" ++#line 2569 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeHour(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4721 "seclang-parser.cc" ++#line 4745 "seclang-parser.cc" + break; + +- case 329: // var: "RUN_TIME_VAR_TIME_MIN" +-#line 2562 "seclang-parser.yy" ++ case 332: // var: "RUN_TIME_VAR_TIME_MIN" ++#line 2576 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeMin(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4732 "seclang-parser.cc" ++#line 4756 "seclang-parser.cc" + break; + +- case 330: // var: "RUN_TIME_VAR_TIME_MON" +-#line 2569 "seclang-parser.yy" ++ case 333: // var: "RUN_TIME_VAR_TIME_MON" ++#line 2583 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeMon(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4743 "seclang-parser.cc" ++#line 4767 "seclang-parser.cc" + break; + +- case 331: // var: "RUN_TIME_VAR_TIME_SEC" +-#line 2576 "seclang-parser.yy" ++ case 334: // var: "RUN_TIME_VAR_TIME_SEC" ++#line 2590 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeSec(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4754 "seclang-parser.cc" ++#line 4778 "seclang-parser.cc" + break; + +- case 332: // var: "RUN_TIME_VAR_TIME_WDAY" +-#line 2583 "seclang-parser.yy" ++ case 335: // var: "RUN_TIME_VAR_TIME_WDAY" ++#line 2597 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeWDay(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4765 "seclang-parser.cc" ++#line 4789 "seclang-parser.cc" + break; + +- case 333: // var: "RUN_TIME_VAR_TIME_YEAR" +-#line 2590 "seclang-parser.yy" ++ case 336: // var: "RUN_TIME_VAR_TIME_YEAR" ++#line 2604 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeYear(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4776 "seclang-parser.cc" ++#line 4800 "seclang-parser.cc" + break; + +- case 334: // act: "Accuracy" +-#line 2600 "seclang-parser.yy" ++ case 337: // act: "Accuracy" ++#line 2614 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Accuracy(yystack_[0].value.as < std::string > ())); + } +-#line 4784 "seclang-parser.cc" ++#line 4808 "seclang-parser.cc" + break; + +- case 335: // act: "Allow" +-#line 2604 "seclang-parser.yy" ++ case 338: // act: "Allow" ++#line 2618 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Allow(yystack_[0].value.as < std::string > ())); + } +-#line 4792 "seclang-parser.cc" ++#line 4816 "seclang-parser.cc" + break; + +- case 336: // act: "Append" +-#line 2608 "seclang-parser.yy" ++ case 339: // act: "Append" ++#line 2622 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Append", yystack_[1].location); + } +-#line 4800 "seclang-parser.cc" ++#line 4824 "seclang-parser.cc" + break; + +- case 337: // act: "AuditLog" +-#line 2612 "seclang-parser.yy" ++ case 340: // act: "AuditLog" ++#line 2626 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::AuditLog(yystack_[0].value.as < std::string > ())); + } +-#line 4808 "seclang-parser.cc" ++#line 4832 "seclang-parser.cc" + break; + +- case 338: // act: "Block" +-#line 2616 "seclang-parser.yy" ++ case 341: // act: "Block" ++#line 2630 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Block(yystack_[0].value.as < std::string > ())); + } +-#line 4816 "seclang-parser.cc" ++#line 4840 "seclang-parser.cc" + break; + +- case 339: // act: "Capture" +-#line 2620 "seclang-parser.yy" ++ case 342: // act: "Capture" ++#line 2634 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Capture(yystack_[0].value.as < std::string > ())); + } +-#line 4824 "seclang-parser.cc" ++#line 4848 "seclang-parser.cc" + break; + +- case 340: // act: "Chain" +-#line 2624 "seclang-parser.yy" ++ case 343: // act: "Chain" ++#line 2638 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Chain(yystack_[0].value.as < std::string > ())); + } +-#line 4832 "seclang-parser.cc" ++#line 4856 "seclang-parser.cc" + break; + +- case 341: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_ON" +-#line 2628 "seclang-parser.yy" ++ case 344: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_ON" ++#line 2642 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditEngine("ctl:auditengine=on")); + driver.m_auditLog->setCtlAuditEngineActive(); + } +-#line 4841 "seclang-parser.cc" ++#line 4865 "seclang-parser.cc" + break; + +- case 342: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_OFF" +-#line 2633 "seclang-parser.yy" ++ case 345: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_OFF" ++#line 2647 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditEngine("ctl:auditengine=off")); + } +-#line 4849 "seclang-parser.cc" ++#line 4873 "seclang-parser.cc" + break; + +- case 343: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_RELEVANT_ONLY" +-#line 2637 "seclang-parser.yy" ++ case 346: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_RELEVANT_ONLY" ++#line 2651 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditEngine("ctl:auditengine=relevantonly")); + driver.m_auditLog->setCtlAuditEngineActive(); + } +-#line 4858 "seclang-parser.cc" ++#line 4882 "seclang-parser.cc" + break; + +- case 344: // act: "ACTION_CTL_AUDIT_LOG_PARTS" +-#line 2642 "seclang-parser.yy" ++ case 347: // act: "ACTION_CTL_AUDIT_LOG_PARTS" ++#line 2656 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditLogParts(yystack_[0].value.as < std::string > ())); + } +-#line 4866 "seclang-parser.cc" ++#line 4890 "seclang-parser.cc" + break; + +- case 345: // act: "ACTION_CTL_BDY_JSON" +-#line 2646 "seclang-parser.yy" ++ case 348: // act: "ACTION_CTL_BDY_JSON" ++#line 2660 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyProcessorJSON(yystack_[0].value.as < std::string > ())); + } +-#line 4874 "seclang-parser.cc" ++#line 4898 "seclang-parser.cc" + break; + +- case 346: // act: "ACTION_CTL_BDY_XML" +-#line 2650 "seclang-parser.yy" ++ case 349: // act: "ACTION_CTL_BDY_XML" ++#line 2664 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyProcessorXML(yystack_[0].value.as < std::string > ())); + } +-#line 4882 "seclang-parser.cc" ++#line 4906 "seclang-parser.cc" + break; + +- case 347: // act: "ACTION_CTL_BDY_URLENCODED" +-#line 2654 "seclang-parser.yy" ++ case 350: // act: "ACTION_CTL_BDY_URLENCODED" ++#line 2668 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyProcessorURLENCODED(yystack_[0].value.as < std::string > ())); + } +-#line 4890 "seclang-parser.cc" ++#line 4914 "seclang-parser.cc" + break; + +- case 348: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_ON" +-#line 2658 "seclang-parser.yy" ++ case 351: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_ON" ++#line 2672 "seclang-parser.yy" + { + //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0); + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Action(yystack_[1].value.as < std::string > ())); + } +-#line 4899 "seclang-parser.cc" ++#line 4923 "seclang-parser.cc" + break; + +- case 349: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_OFF" +-#line 2663 "seclang-parser.yy" ++ case 352: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_OFF" ++#line 2677 "seclang-parser.yy" + { + //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0); + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Action(yystack_[1].value.as < std::string > ())); + } +-#line 4908 "seclang-parser.cc" ++#line 4932 "seclang-parser.cc" + break; + +- case 350: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_ON" +-#line 2668 "seclang-parser.yy" ++ case 353: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_ON" ++#line 2682 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyAccess(yystack_[1].value.as < std::string > () + "true")); + } +-#line 4916 "seclang-parser.cc" ++#line 4940 "seclang-parser.cc" + break; + +- case 351: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_OFF" +-#line 2672 "seclang-parser.yy" ++ case 354: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_OFF" ++#line 2686 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyAccess(yystack_[1].value.as < std::string > () + "false")); + } +-#line 4924 "seclang-parser.cc" ++#line 4948 "seclang-parser.cc" + break; + +- case 352: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_ON" +-#line 2676 "seclang-parser.yy" ++ case 355: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_ON" ++#line 2690 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=on")); + } +-#line 4932 "seclang-parser.cc" ++#line 4956 "seclang-parser.cc" + break; + +- case 353: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_OFF" +-#line 2680 "seclang-parser.yy" ++ case 356: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_OFF" ++#line 2694 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=off")); + } +-#line 4940 "seclang-parser.cc" ++#line 4964 "seclang-parser.cc" + break; + +- case 354: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_DETC" +-#line 2684 "seclang-parser.yy" ++ case 357: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_DETC" ++#line 2698 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=detectiononly")); + } +-#line 4948 "seclang-parser.cc" ++#line 4972 "seclang-parser.cc" + break; + +- case 355: // act: "ACTION_CTL_RULE_REMOVE_BY_ID" +-#line 2688 "seclang-parser.yy" ++ case 358: // act: "ACTION_CTL_RULE_REMOVE_BY_ID" ++#line 2702 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveById(yystack_[0].value.as < std::string > ())); + } +-#line 4956 "seclang-parser.cc" ++#line 4980 "seclang-parser.cc" + break; + +- case 356: // act: "ACTION_CTL_RULE_REMOVE_BY_TAG" +-#line 2692 "seclang-parser.yy" ++ case 359: // act: "ACTION_CTL_RULE_REMOVE_BY_TAG" ++#line 2706 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveByTag(yystack_[0].value.as < std::string > ())); + } +-#line 4964 "seclang-parser.cc" ++#line 4988 "seclang-parser.cc" + break; + +- case 357: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" +-#line 2696 "seclang-parser.yy" ++ case 360: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" ++#line 2710 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveTargetById(yystack_[0].value.as < std::string > ())); + } +-#line 4972 "seclang-parser.cc" ++#line 4996 "seclang-parser.cc" + break; + +- case 358: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" +-#line 2700 "seclang-parser.yy" ++ case 361: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" ++#line 2714 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveTargetByTag(yystack_[0].value.as < std::string > ())); + } +-#line 4980 "seclang-parser.cc" ++#line 5004 "seclang-parser.cc" + break; + +- case 359: // act: "Deny" +-#line 2704 "seclang-parser.yy" ++ case 362: // act: "Deny" ++#line 2718 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Deny(yystack_[0].value.as < std::string > ())); + } +-#line 4988 "seclang-parser.cc" ++#line 5012 "seclang-parser.cc" + break; + +- case 360: // act: "DeprecateVar" +-#line 2708 "seclang-parser.yy" ++ case 363: // act: "DeprecateVar" ++#line 2722 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("DeprecateVar", yystack_[1].location); + } +-#line 4996 "seclang-parser.cc" ++#line 5020 "seclang-parser.cc" + break; + +- case 361: // act: "Drop" +-#line 2712 "seclang-parser.yy" ++ case 364: // act: "Drop" ++#line 2726 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Drop(yystack_[0].value.as < std::string > ())); + } +-#line 5004 "seclang-parser.cc" ++#line 5028 "seclang-parser.cc" + break; + +- case 362: // act: "Exec" +-#line 2716 "seclang-parser.yy" ++ case 365: // act: "Exec" ++#line 2730 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Exec(yystack_[0].value.as < std::string > ())); + } +-#line 5012 "seclang-parser.cc" ++#line 5036 "seclang-parser.cc" + break; + +- case 363: // act: "ExpireVar" +-#line 2720 "seclang-parser.yy" ++ case 366: // act: "ExpireVar" ++#line 2734 "seclang-parser.yy" + { + //ACTION_NOT_SUPPORTED("ExpireVar", @0); + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Action(yystack_[0].value.as < std::string > ())); + } +-#line 5021 "seclang-parser.cc" ++#line 5045 "seclang-parser.cc" + break; + +- case 364: // act: "Id" +-#line 2725 "seclang-parser.yy" ++ case 367: // act: "Id" ++#line 2739 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::RuleId(yystack_[0].value.as < std::string > ())); + } +-#line 5029 "seclang-parser.cc" ++#line 5053 "seclang-parser.cc" + break; + +- case 365: // act: "InitCol" run_time_string +-#line 2729 "seclang-parser.yy" ++ case 368: // act: "InitCol" run_time_string ++#line 2743 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::InitCol(yystack_[1].value.as < std::string > (), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5037 "seclang-parser.cc" ++#line 5061 "seclang-parser.cc" + break; + +- case 366: // act: "LogData" run_time_string +-#line 2733 "seclang-parser.yy" ++ case 369: // act: "LogData" run_time_string ++#line 2747 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::LogData(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5045 "seclang-parser.cc" ++#line 5069 "seclang-parser.cc" + break; + +- case 367: // act: "Log" +-#line 2737 "seclang-parser.yy" ++ case 370: // act: "Log" ++#line 2751 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Log(yystack_[0].value.as < std::string > ())); + } +-#line 5053 "seclang-parser.cc" ++#line 5077 "seclang-parser.cc" + break; + +- case 368: // act: "Maturity" +-#line 2741 "seclang-parser.yy" ++ case 371: // act: "Maturity" ++#line 2755 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Maturity(yystack_[0].value.as < std::string > ())); + } +-#line 5061 "seclang-parser.cc" ++#line 5085 "seclang-parser.cc" + break; + +- case 369: // act: "Msg" run_time_string +-#line 2745 "seclang-parser.yy" ++ case 372: // act: "Msg" run_time_string ++#line 2759 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Msg(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5069 "seclang-parser.cc" ++#line 5093 "seclang-parser.cc" + break; + +- case 370: // act: "MultiMatch" +-#line 2749 "seclang-parser.yy" ++ case 373: // act: "MultiMatch" ++#line 2763 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::MultiMatch(yystack_[0].value.as < std::string > ())); + } +-#line 5077 "seclang-parser.cc" ++#line 5101 "seclang-parser.cc" + break; + +- case 371: // act: "NoAuditLog" +-#line 2753 "seclang-parser.yy" ++ case 374: // act: "NoAuditLog" ++#line 2767 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::NoAuditLog(yystack_[0].value.as < std::string > ())); + } +-#line 5085 "seclang-parser.cc" ++#line 5109 "seclang-parser.cc" + break; + +- case 372: // act: "NoLog" +-#line 2757 "seclang-parser.yy" ++ case 375: // act: "NoLog" ++#line 2771 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::NoLog(yystack_[0].value.as < std::string > ())); + } +-#line 5093 "seclang-parser.cc" ++#line 5117 "seclang-parser.cc" + break; + +- case 373: // act: "Pass" +-#line 2761 "seclang-parser.yy" ++ case 376: // act: "Pass" ++#line 2775 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Pass(yystack_[0].value.as < std::string > ())); + } +-#line 5101 "seclang-parser.cc" ++#line 5125 "seclang-parser.cc" + break; + +- case 374: // act: "Pause" +-#line 2765 "seclang-parser.yy" ++ case 377: // act: "Pause" ++#line 2779 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Pause", yystack_[1].location); + } +-#line 5109 "seclang-parser.cc" ++#line 5133 "seclang-parser.cc" + break; + +- case 375: // act: "Phase" +-#line 2769 "seclang-parser.yy" ++ case 378: // act: "Phase" ++#line 2783 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Phase(yystack_[0].value.as < std::string > ())); + } +-#line 5117 "seclang-parser.cc" ++#line 5141 "seclang-parser.cc" + break; + +- case 376: // act: "Prepend" +-#line 2773 "seclang-parser.yy" ++ case 379: // act: "Prepend" ++#line 2787 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Prepend", yystack_[1].location); + } +-#line 5125 "seclang-parser.cc" ++#line 5149 "seclang-parser.cc" + break; + +- case 377: // act: "Proxy" +-#line 2777 "seclang-parser.yy" ++ case 380: // act: "Proxy" ++#line 2791 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Proxy", yystack_[1].location); + } +-#line 5133 "seclang-parser.cc" ++#line 5157 "seclang-parser.cc" + break; + +- case 378: // act: "Redirect" run_time_string +-#line 2781 "seclang-parser.yy" ++ case 381: // act: "Redirect" run_time_string ++#line 2795 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Redirect(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5141 "seclang-parser.cc" ++#line 5165 "seclang-parser.cc" + break; + +- case 379: // act: "Rev" +-#line 2785 "seclang-parser.yy" ++ case 382: // act: "Rev" ++#line 2799 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Rev(yystack_[0].value.as < std::string > ())); + } +-#line 5149 "seclang-parser.cc" ++#line 5173 "seclang-parser.cc" + break; + +- case 380: // act: "SanitiseArg" +-#line 2789 "seclang-parser.yy" ++ case 383: // act: "SanitiseArg" ++#line 2803 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseArg", yystack_[1].location); + } +-#line 5157 "seclang-parser.cc" ++#line 5181 "seclang-parser.cc" + break; + +- case 381: // act: "SanitiseMatched" +-#line 2793 "seclang-parser.yy" ++ case 384: // act: "SanitiseMatched" ++#line 2807 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseMatched", yystack_[1].location); + } +-#line 5165 "seclang-parser.cc" ++#line 5189 "seclang-parser.cc" + break; + +- case 382: // act: "SanitiseMatchedBytes" +-#line 2797 "seclang-parser.yy" ++ case 385: // act: "SanitiseMatchedBytes" ++#line 2811 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseMatchedBytes", yystack_[1].location); + } +-#line 5173 "seclang-parser.cc" ++#line 5197 "seclang-parser.cc" + break; + +- case 383: // act: "SanitiseRequestHeader" +-#line 2801 "seclang-parser.yy" ++ case 386: // act: "SanitiseRequestHeader" ++#line 2815 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseRequestHeader", yystack_[1].location); + } +-#line 5181 "seclang-parser.cc" ++#line 5205 "seclang-parser.cc" + break; + +- case 384: // act: "SanitiseResponseHeader" +-#line 2805 "seclang-parser.yy" ++ case 387: // act: "SanitiseResponseHeader" ++#line 2819 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseResponseHeader", yystack_[1].location); + } +-#line 5189 "seclang-parser.cc" ++#line 5213 "seclang-parser.cc" + break; + +- case 385: // act: "SetEnv" run_time_string +-#line 2809 "seclang-parser.yy" ++ case 388: // act: "SetEnv" run_time_string ++#line 2823 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetENV(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5197 "seclang-parser.cc" ++#line 5221 "seclang-parser.cc" + break; + +- case 386: // act: "SetRsc" run_time_string +-#line 2813 "seclang-parser.yy" ++ case 389: // act: "SetRsc" run_time_string ++#line 2827 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetRSC(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5205 "seclang-parser.cc" ++#line 5229 "seclang-parser.cc" + break; + +- case 387: // act: "SetSid" run_time_string +-#line 2817 "seclang-parser.yy" ++ case 390: // act: "SetSid" run_time_string ++#line 2831 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetSID(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5213 "seclang-parser.cc" ++#line 5237 "seclang-parser.cc" + break; + +- case 388: // act: "SetUID" run_time_string +-#line 2821 "seclang-parser.yy" ++ case 391: // act: "SetUID" run_time_string ++#line 2835 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetUID(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5221 "seclang-parser.cc" ++#line 5245 "seclang-parser.cc" + break; + +- case 389: // act: "SetVar" setvar_action +-#line 2825 "seclang-parser.yy" ++ case 392: // act: "SetVar" setvar_action ++#line 2839 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[0].value.as < std::unique_ptr > ()); + } +-#line 5229 "seclang-parser.cc" ++#line 5253 "seclang-parser.cc" + break; + +- case 390: // act: "Severity" +-#line 2829 "seclang-parser.yy" ++ case 393: // act: "Severity" ++#line 2843 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Severity(yystack_[0].value.as < std::string > ())); + } +-#line 5237 "seclang-parser.cc" ++#line 5261 "seclang-parser.cc" + break; + +- case 391: // act: "Skip" +-#line 2833 "seclang-parser.yy" ++ case 394: // act: "Skip" ++#line 2847 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Skip(yystack_[0].value.as < std::string > ())); + } +-#line 5245 "seclang-parser.cc" ++#line 5269 "seclang-parser.cc" + break; + +- case 392: // act: "SkipAfter" +-#line 2837 "seclang-parser.yy" ++ case 395: // act: "SkipAfter" ++#line 2851 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SkipAfter(yystack_[0].value.as < std::string > ())); + } +-#line 5253 "seclang-parser.cc" ++#line 5277 "seclang-parser.cc" + break; + +- case 393: // act: "Status" +-#line 2841 "seclang-parser.yy" ++ case 396: // act: "Status" ++#line 2855 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::data::Status(yystack_[0].value.as < std::string > ())); + } +-#line 5261 "seclang-parser.cc" ++#line 5285 "seclang-parser.cc" + break; + +- case 394: // act: "Tag" run_time_string +-#line 2845 "seclang-parser.yy" ++ case 397: // act: "Tag" run_time_string ++#line 2859 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Tag(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5269 "seclang-parser.cc" ++#line 5293 "seclang-parser.cc" + break; + +- case 395: // act: "Ver" +-#line 2849 "seclang-parser.yy" ++ case 398: // act: "Ver" ++#line 2863 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Ver(yystack_[0].value.as < std::string > ())); + } +-#line 5277 "seclang-parser.cc" ++#line 5301 "seclang-parser.cc" + break; + +- case 396: // act: "xmlns" +-#line 2853 "seclang-parser.yy" ++ case 399: // act: "xmlns" ++#line 2867 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::XmlNS(yystack_[0].value.as < std::string > ())); + } +-#line 5285 "seclang-parser.cc" ++#line 5309 "seclang-parser.cc" + break; + +- case 397: // act: "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" +-#line 2857 "seclang-parser.yy" ++ case 400: // act: "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" ++#line 2871 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ParityZero7bit(yystack_[0].value.as < std::string > ())); + } +-#line 5293 "seclang-parser.cc" ++#line 5317 "seclang-parser.cc" + break; + +- case 398: // act: "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" +-#line 2861 "seclang-parser.yy" ++ case 401: // act: "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" ++#line 2875 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ParityOdd7bit(yystack_[0].value.as < std::string > ())); + } +-#line 5301 "seclang-parser.cc" ++#line 5325 "seclang-parser.cc" + break; + +- case 399: // act: "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" +-#line 2865 "seclang-parser.yy" ++ case 402: // act: "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" ++#line 2879 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ParityEven7bit(yystack_[0].value.as < std::string > ())); + } +-#line 5309 "seclang-parser.cc" ++#line 5333 "seclang-parser.cc" + break; + +- case 400: // act: "ACTION_TRANSFORMATION_SQL_HEX_DECODE" +-#line 2869 "seclang-parser.yy" ++ case 403: // act: "ACTION_TRANSFORMATION_SQL_HEX_DECODE" ++#line 2883 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::SqlHexDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5317 "seclang-parser.cc" ++#line 5341 "seclang-parser.cc" + break; + +- case 401: // act: "ACTION_TRANSFORMATION_BASE_64_ENCODE" +-#line 2873 "seclang-parser.yy" ++ case 404: // act: "ACTION_TRANSFORMATION_BASE_64_ENCODE" ++#line 2887 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Base64Encode(yystack_[0].value.as < std::string > ())); + } +-#line 5325 "seclang-parser.cc" ++#line 5349 "seclang-parser.cc" + break; + +- case 402: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE" +-#line 2877 "seclang-parser.yy" ++ case 405: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE" ++#line 2891 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Base64Decode(yystack_[0].value.as < std::string > ())); + } +-#line 5333 "seclang-parser.cc" ++#line 5357 "seclang-parser.cc" + break; + +- case 403: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" +-#line 2881 "seclang-parser.yy" ++ case 406: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" ++#line 2895 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Base64DecodeExt(yystack_[0].value.as < std::string > ())); + } +-#line 5341 "seclang-parser.cc" ++#line 5365 "seclang-parser.cc" + break; + +- case 404: // act: "ACTION_TRANSFORMATION_CMD_LINE" +-#line 2885 "seclang-parser.yy" ++ case 407: // act: "ACTION_TRANSFORMATION_CMD_LINE" ++#line 2899 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::CmdLine(yystack_[0].value.as < std::string > ())); + } +-#line 5349 "seclang-parser.cc" ++#line 5373 "seclang-parser.cc" + break; + +- case 405: // act: "ACTION_TRANSFORMATION_SHA1" +-#line 2889 "seclang-parser.yy" ++ case 408: // act: "ACTION_TRANSFORMATION_SHA1" ++#line 2903 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Sha1(yystack_[0].value.as < std::string > ())); + } +-#line 5357 "seclang-parser.cc" ++#line 5381 "seclang-parser.cc" + break; + +- case 406: // act: "ACTION_TRANSFORMATION_MD5" +-#line 2893 "seclang-parser.yy" ++ case 409: // act: "ACTION_TRANSFORMATION_MD5" ++#line 2907 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Md5(yystack_[0].value.as < std::string > ())); + } +-#line 5365 "seclang-parser.cc" ++#line 5389 "seclang-parser.cc" + break; + +- case 407: // act: "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" +-#line 2897 "seclang-parser.yy" ++ case 410: // act: "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" ++#line 2911 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::EscapeSeqDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5373 "seclang-parser.cc" ++#line 5397 "seclang-parser.cc" + break; + +- case 408: // act: "ACTION_TRANSFORMATION_HEX_ENCODE" +-#line 2901 "seclang-parser.yy" ++ case 411: // act: "ACTION_TRANSFORMATION_HEX_ENCODE" ++#line 2915 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::HexEncode(yystack_[0].value.as < std::string > ())); + } +-#line 5381 "seclang-parser.cc" ++#line 5405 "seclang-parser.cc" + break; + +- case 409: // act: "ACTION_TRANSFORMATION_HEX_DECODE" +-#line 2905 "seclang-parser.yy" ++ case 412: // act: "ACTION_TRANSFORMATION_HEX_DECODE" ++#line 2919 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::HexDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5389 "seclang-parser.cc" ++#line 5413 "seclang-parser.cc" + break; + +- case 410: // act: "ACTION_TRANSFORMATION_LOWERCASE" +-#line 2909 "seclang-parser.yy" ++ case 413: // act: "ACTION_TRANSFORMATION_LOWERCASE" ++#line 2923 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::LowerCase(yystack_[0].value.as < std::string > ())); + } +-#line 5397 "seclang-parser.cc" ++#line 5421 "seclang-parser.cc" + break; + +- case 411: // act: "ACTION_TRANSFORMATION_UPPERCASE" +-#line 2913 "seclang-parser.yy" ++ case 414: // act: "ACTION_TRANSFORMATION_UPPERCASE" ++#line 2927 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UpperCase(yystack_[0].value.as < std::string > ())); + } +-#line 5405 "seclang-parser.cc" ++#line 5429 "seclang-parser.cc" + break; + +- case 412: // act: "ACTION_TRANSFORMATION_URL_DECODE_UNI" +-#line 2917 "seclang-parser.yy" ++ case 415: // act: "ACTION_TRANSFORMATION_URL_DECODE_UNI" ++#line 2931 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UrlDecodeUni(yystack_[0].value.as < std::string > ())); + } +-#line 5413 "seclang-parser.cc" ++#line 5437 "seclang-parser.cc" + break; + +- case 413: // act: "ACTION_TRANSFORMATION_URL_DECODE" +-#line 2921 "seclang-parser.yy" ++ case 416: // act: "ACTION_TRANSFORMATION_URL_DECODE" ++#line 2935 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UrlDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5421 "seclang-parser.cc" ++#line 5445 "seclang-parser.cc" + break; + +- case 414: // act: "ACTION_TRANSFORMATION_URL_ENCODE" +-#line 2925 "seclang-parser.yy" ++ case 417: // act: "ACTION_TRANSFORMATION_URL_ENCODE" ++#line 2939 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UrlEncode(yystack_[0].value.as < std::string > ())); + } +-#line 5429 "seclang-parser.cc" ++#line 5453 "seclang-parser.cc" + break; + +- case 415: // act: "ACTION_TRANSFORMATION_NONE" +-#line 2929 "seclang-parser.yy" ++ case 418: // act: "ACTION_TRANSFORMATION_NONE" ++#line 2943 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::None(yystack_[0].value.as < std::string > ())); + } +-#line 5437 "seclang-parser.cc" ++#line 5461 "seclang-parser.cc" + break; + +- case 416: // act: "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" +-#line 2933 "seclang-parser.yy" ++ case 419: // act: "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" ++#line 2947 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::CompressWhitespace(yystack_[0].value.as < std::string > ())); + } +-#line 5445 "seclang-parser.cc" ++#line 5469 "seclang-parser.cc" + break; + +- case 417: // act: "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" +-#line 2937 "seclang-parser.yy" ++ case 420: // act: "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" ++#line 2951 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveWhitespace(yystack_[0].value.as < std::string > ())); + } +-#line 5453 "seclang-parser.cc" ++#line 5477 "seclang-parser.cc" + break; + +- case 418: // act: "ACTION_TRANSFORMATION_REPLACE_NULLS" +-#line 2941 "seclang-parser.yy" ++ case 421: // act: "ACTION_TRANSFORMATION_REPLACE_NULLS" ++#line 2955 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ReplaceNulls(yystack_[0].value.as < std::string > ())); + } +-#line 5461 "seclang-parser.cc" ++#line 5485 "seclang-parser.cc" + break; + +- case 419: // act: "ACTION_TRANSFORMATION_REMOVE_NULLS" +-#line 2945 "seclang-parser.yy" ++ case 422: // act: "ACTION_TRANSFORMATION_REMOVE_NULLS" ++#line 2959 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveNulls(yystack_[0].value.as < std::string > ())); + } +-#line 5469 "seclang-parser.cc" ++#line 5493 "seclang-parser.cc" + break; + +- case 420: // act: "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" +-#line 2949 "seclang-parser.yy" ++ case 423: // act: "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" ++#line 2963 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::HtmlEntityDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5477 "seclang-parser.cc" ++#line 5501 "seclang-parser.cc" + break; + +- case 421: // act: "ACTION_TRANSFORMATION_JS_DECODE" +-#line 2953 "seclang-parser.yy" ++ case 424: // act: "ACTION_TRANSFORMATION_JS_DECODE" ++#line 2967 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::JsDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5485 "seclang-parser.cc" ++#line 5509 "seclang-parser.cc" + break; + +- case 422: // act: "ACTION_TRANSFORMATION_CSS_DECODE" +-#line 2957 "seclang-parser.yy" ++ case 425: // act: "ACTION_TRANSFORMATION_CSS_DECODE" ++#line 2971 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::CssDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5493 "seclang-parser.cc" ++#line 5517 "seclang-parser.cc" + break; + +- case 423: // act: "ACTION_TRANSFORMATION_TRIM" +-#line 2961 "seclang-parser.yy" ++ case 426: // act: "ACTION_TRANSFORMATION_TRIM" ++#line 2975 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Trim(yystack_[0].value.as < std::string > ())); + } +-#line 5501 "seclang-parser.cc" ++#line 5525 "seclang-parser.cc" + break; + +- case 424: // act: "ACTION_TRANSFORMATION_TRIM_LEFT" +-#line 2965 "seclang-parser.yy" ++ case 427: // act: "ACTION_TRANSFORMATION_TRIM_LEFT" ++#line 2979 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::TrimLeft(yystack_[0].value.as < std::string > ())); + } +-#line 5509 "seclang-parser.cc" ++#line 5533 "seclang-parser.cc" + break; + +- case 425: // act: "ACTION_TRANSFORMATION_TRIM_RIGHT" +-#line 2969 "seclang-parser.yy" ++ case 428: // act: "ACTION_TRANSFORMATION_TRIM_RIGHT" ++#line 2983 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::TrimRight(yystack_[0].value.as < std::string > ())); + } +-#line 5517 "seclang-parser.cc" ++#line 5541 "seclang-parser.cc" + break; + +- case 426: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" +-#line 2973 "seclang-parser.yy" ++ case 429: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" ++#line 2987 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::NormalisePathWin(yystack_[0].value.as < std::string > ())); + } +-#line 5525 "seclang-parser.cc" ++#line 5549 "seclang-parser.cc" + break; + +- case 427: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH" +-#line 2977 "seclang-parser.yy" ++ case 430: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH" ++#line 2991 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::NormalisePath(yystack_[0].value.as < std::string > ())); + } +-#line 5533 "seclang-parser.cc" ++#line 5557 "seclang-parser.cc" + break; + +- case 428: // act: "ACTION_TRANSFORMATION_LENGTH" +-#line 2981 "seclang-parser.yy" ++ case 431: // act: "ACTION_TRANSFORMATION_LENGTH" ++#line 2995 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Length(yystack_[0].value.as < std::string > ())); + } +-#line 5541 "seclang-parser.cc" ++#line 5565 "seclang-parser.cc" + break; + +- case 429: // act: "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" +-#line 2985 "seclang-parser.yy" ++ case 432: // act: "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" ++#line 2999 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Utf8ToUnicode(yystack_[0].value.as < std::string > ())); + } +-#line 5549 "seclang-parser.cc" ++#line 5573 "seclang-parser.cc" + break; + +- case 430: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" +-#line 2989 "seclang-parser.yy" ++ case 433: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" ++#line 3003 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveCommentsChar(yystack_[0].value.as < std::string > ())); + } +-#line 5557 "seclang-parser.cc" ++#line 5581 "seclang-parser.cc" + break; + +- case 431: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS" +-#line 2993 "seclang-parser.yy" ++ case 434: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS" ++#line 3007 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveComments(yystack_[0].value.as < std::string > ())); + } +-#line 5565 "seclang-parser.cc" ++#line 5589 "seclang-parser.cc" + break; + +- case 432: // act: "ACTION_TRANSFORMATION_REPLACE_COMMENTS" +-#line 2997 "seclang-parser.yy" ++ case 435: // act: "ACTION_TRANSFORMATION_REPLACE_COMMENTS" ++#line 3011 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ReplaceComments(yystack_[0].value.as < std::string > ())); + } +-#line 5573 "seclang-parser.cc" ++#line 5597 "seclang-parser.cc" + break; + +- case 433: // setvar_action: "NOT" var +-#line 3004 "seclang-parser.yy" ++ case 436: // setvar_action: "NOT" var ++#line 3018 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::unsetOperation, std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5581 "seclang-parser.cc" ++#line 5605 "seclang-parser.cc" + break; + +- case 434: // setvar_action: var +-#line 3008 "seclang-parser.yy" ++ case 437: // setvar_action: var ++#line 3022 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::setToOneOperation, std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5589 "seclang-parser.cc" ++#line 5613 "seclang-parser.cc" + break; + +- case 435: // setvar_action: var SETVAR_OPERATION_EQUALS run_time_string +-#line 3012 "seclang-parser.yy" ++ case 438: // setvar_action: var SETVAR_OPERATION_EQUALS run_time_string ++#line 3026 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::setOperation, std::move(yystack_[2].value.as < std::unique_ptr > ()), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5597 "seclang-parser.cc" ++#line 5621 "seclang-parser.cc" + break; + +- case 436: // setvar_action: var SETVAR_OPERATION_EQUALS_PLUS run_time_string +-#line 3016 "seclang-parser.yy" ++ case 439: // setvar_action: var SETVAR_OPERATION_EQUALS_PLUS run_time_string ++#line 3030 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::sumAndSetOperation, std::move(yystack_[2].value.as < std::unique_ptr > ()), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5605 "seclang-parser.cc" ++#line 5629 "seclang-parser.cc" + break; + +- case 437: // setvar_action: var SETVAR_OPERATION_EQUALS_MINUS run_time_string +-#line 3020 "seclang-parser.yy" ++ case 440: // setvar_action: var SETVAR_OPERATION_EQUALS_MINUS run_time_string ++#line 3034 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::substractAndSetOperation, std::move(yystack_[2].value.as < std::unique_ptr > ()), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5613 "seclang-parser.cc" ++#line 5637 "seclang-parser.cc" + break; + +- case 438: // run_time_string: run_time_string "FREE_TEXT_QUOTE_MACRO_EXPANSION" +-#line 3027 "seclang-parser.yy" ++ case 441: // run_time_string: run_time_string "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++#line 3041 "seclang-parser.yy" + { + yystack_[1].value.as < std::unique_ptr > ()->appendText(yystack_[0].value.as < std::string > ()); + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[1].value.as < std::unique_ptr > ()); + } +-#line 5622 "seclang-parser.cc" ++#line 5646 "seclang-parser.cc" + break; + +- case 439: // run_time_string: run_time_string var +-#line 3032 "seclang-parser.yy" ++ case 442: // run_time_string: run_time_string var ++#line 3046 "seclang-parser.yy" + { + yystack_[1].value.as < std::unique_ptr > ()->appendVar(std::move(yystack_[0].value.as < std::unique_ptr > ())); + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[1].value.as < std::unique_ptr > ()); + } +-#line 5631 "seclang-parser.cc" ++#line 5655 "seclang-parser.cc" + break; + +- case 440: // run_time_string: "FREE_TEXT_QUOTE_MACRO_EXPANSION" +-#line 3037 "seclang-parser.yy" ++ case 443: // run_time_string: "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++#line 3051 "seclang-parser.yy" + { + std::unique_ptr r(new RunTimeString()); + r->appendText(yystack_[0].value.as < std::string > ()); + yylhs.value.as < std::unique_ptr > () = std::move(r); + } +-#line 5641 "seclang-parser.cc" ++#line 5665 "seclang-parser.cc" + break; + +- case 441: // run_time_string: var +-#line 3043 "seclang-parser.yy" ++ case 444: // run_time_string: var ++#line 3057 "seclang-parser.yy" + { + std::unique_ptr r(new RunTimeString()); + r->appendVar(std::move(yystack_[0].value.as < std::unique_ptr > ())); + yylhs.value.as < std::unique_ptr > () = std::move(r); + } +-#line 5651 "seclang-parser.cc" ++#line 5675 "seclang-parser.cc" + break; + + +-#line 5655 "seclang-parser.cc" ++#line 5679 "seclang-parser.cc" + + default: + break; +@@ -6000,66 +6024,67 @@ namespace yy { + } + + +- const short seclang_parser::yypact_ninf_ = -413; ++ const short seclang_parser::yypact_ninf_ = -402; + + const signed char seclang_parser::yytable_ninf_ = -1; + + const short + seclang_parser::yypact_[] = + { +- 2507, -413, -256, -413, -91, -413, -251, -413, -413, -413, +- -413, -413, -275, -413, -413, -413, -413, -413, -290, -413, +- -413, -413, -249, -158, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -155, +- -413, -413, -156, -413, -148, -413, -149, -144, -413, -283, +- 2855, 2855, -413, -413, -413, -413, -142, -300, -413, -413, +- -413, 1149, 1149, 1149, 2855, -269, -133, -413, -413, -413, +- -131, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- 1149, 2855, 2668, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, 2125, -261, -413, -413, -413, +- -413, -413, -413, -413, -267, -413, -413, -413, -413, -129, +- -127, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, 2219, -413, 2219, -413, 2219, -413, -413, -413, -413, +- -413, -413, -413, -413, 2219, -413, -413, -413, -413, -413, +- -413, 2219, 2219, 2219, 2219, -413, -413, -413, -413, 2219, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, 3038, -413, +- 2, -413, -413, -413, -413, -413, -413, 2550, 2550, -161, +- -159, -157, -154, -152, -150, -147, -145, -143, -140, -138, +- -136, -132, -130, -128, -126, -413, -124, -122, -120, -118, +- -413, -413, -116, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -114, -413, +- -413, -413, -413, -413, 49, -413, -413, -413, -112, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, 457, 546, 635, 969, 1058, -110, -108, 1482, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, 4, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, 1662, -413, -413, -413, -413, +- 2550, -53, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, 3, 3038, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, 2324, -413, -413, -413, -413, 2324, +- -413, -413, 2324, -413, -413, 2324, -413, -413, 2324, -413, +- -413, 2324, -413, -413, -413, -413, 8, 1573, 1993, 2219, +- 2219, 2219, -413, -413, 2219, 2219, 2219, -413, 2219, 2219, +- 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, +- 2219, 2219, 2219, 2219, -413, 2219, 2219, 2219, 2219, -413, +- -413, 2219, 2219, 2219, 2219, 2219, 2855, -413, 2324, -413, +- 2219, 2219, 2219, -413, -413, -413, -413, -413, 2550, 2550, +- -413, -413, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, -413, 2324, 2324, 2324, -413, -413 ++ 2776, -402, -277, -402, -100, -402, -157, -402, -402, -402, ++ -402, -402, -292, -402, -402, -402, -402, -402, -274, -402, ++ -402, -402, -155, -153, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -149, ++ -402, -402, -150, -402, -145, -402, -146, -135, -402, -284, ++ -90, -90, -402, -402, -402, -402, -133, -301, -402, -402, ++ -402, 1492, 1492, 1492, -90, -271, -131, -402, -402, -402, ++ -129, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ 1492, -90, 2920, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, 2340, -259, -402, -402, -402, ++ -402, -402, -402, -402, -265, -402, -402, -402, -402, -127, ++ -125, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, 2473, -402, 2473, -402, 2473, -402, -402, -402, -402, ++ -402, -402, -402, -402, 2473, -402, -402, -402, -402, -402, ++ -402, 2473, 2473, 2473, 2473, -402, -402, -402, -402, 2473, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, 3107, -402, ++ 2, -402, -402, -402, -402, -402, -402, 2672, 2672, -159, ++ -156, -154, -152, -148, -142, -140, -138, -134, -132, -130, ++ -128, -126, -124, -122, -120, -118, -402, -116, -114, -112, ++ -110, -402, -402, -108, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -104, ++ -402, -402, -402, -402, -402, 460, -402, -402, -402, -102, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, 550, 640, 975, 1065, 1155, -99, -97, 1584, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, 16, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, 2008, -402, -402, -402, ++ -402, 2672, -50, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 3, 3107, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, 2563, -402, -402, ++ -402, -402, 2563, -402, -402, 2563, -402, -402, 2563, -402, ++ -402, 2563, -402, -402, 2563, -402, -402, -402, -402, 8, ++ 1676, 2141, 2473, 2473, 2473, -402, -402, 2473, 2473, 2473, ++ -402, 2473, 2473, 2473, 2473, 2473, 2473, 2473, 2473, 2473, ++ 2473, 2473, 2473, 2473, 2473, 2473, 2473, -402, 2473, 2473, ++ 2473, 2473, -402, -402, 2473, 2473, 2473, 2473, 2473, -90, ++ -402, 2563, -402, 2473, 2473, 2473, -402, -402, -402, -402, ++ -402, 2672, 2672, -402, -402, 2563, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 2563, 2563, -402, 2563, 2563, ++ 2563, -402, -402 + }; + + const short +@@ -6076,216 +6101,218 @@ namespace yy { + 0, 0, 0, 4, 74, 5, 98, 97, 15, 16, + 91, 90, 9, 10, 8, 20, 19, 18, 96, 95, + 101, 100, 85, 84, 134, 135, 87, 86, 136, 137, +- 114, 113, 83, 81, 82, 0, 0, 334, 335, 336, +- 337, 338, 339, 340, 0, 344, 345, 346, 347, 0, +- 0, 355, 356, 357, 358, 359, 360, 361, 362, 363, +- 364, 0, 367, 0, 368, 0, 370, 371, 372, 373, +- 374, 375, 376, 377, 0, 379, 380, 381, 382, 383, +- 384, 0, 0, 0, 0, 390, 391, 392, 393, 0, +- 401, 402, 403, 404, 416, 422, 407, 408, 409, 420, +- 421, 428, 410, 406, 415, 427, 426, 399, 398, 397, +- 431, 430, 419, 417, 432, 418, 405, 400, 423, 424, +- 425, 411, 414, 413, 412, 429, 395, 396, 0, 77, ++ 114, 113, 83, 81, 82, 0, 0, 337, 338, 339, ++ 340, 341, 342, 343, 0, 347, 348, 349, 350, 0, ++ 0, 358, 359, 360, 361, 362, 363, 364, 365, 366, ++ 367, 0, 370, 0, 371, 0, 373, 374, 375, 376, ++ 377, 378, 379, 380, 0, 382, 383, 384, 385, 386, ++ 387, 0, 0, 0, 0, 393, 394, 395, 396, 0, ++ 404, 405, 406, 407, 419, 425, 410, 411, 412, 423, ++ 424, 431, 413, 409, 418, 430, 429, 402, 401, 400, ++ 434, 433, 422, 420, 435, 421, 408, 403, 426, 427, ++ 428, 414, 417, 416, 415, 432, 398, 399, 0, 77, + 30, 32, 79, 109, 108, 138, 139, 0, 0, 166, + 169, 172, 175, 178, 181, 184, 187, 190, 193, 196, +- 199, 202, 205, 208, 211, 264, 253, 214, 250, 256, +- 265, 266, 223, 267, 268, 269, 270, 271, 272, 273, +- 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, +- 284, 285, 286, 287, 288, 289, 290, 291, 292, 294, +- 293, 297, 296, 295, 298, 300, 299, 301, 259, 302, +- 303, 304, 306, 305, 227, 307, 308, 260, 263, 309, +- 310, 311, 312, 313, 314, 315, 316, 317, 320, 318, +- 319, 231, 235, 243, 247, 239, 217, 220, 0, 322, +- 321, 323, 324, 325, 326, 327, 328, 329, 330, 331, +- 332, 333, 121, 156, 161, 122, 123, 124, 22, 21, +- 23, 28, 27, 144, 145, 0, 155, 78, 1, 3, +- 0, 434, 389, 354, 353, 352, 342, 341, 343, 349, +- 348, 351, 350, 440, 441, 365, 366, 369, 378, 385, +- 386, 387, 388, 394, 0, 0, 163, 162, 164, 165, +- 167, 168, 170, 171, 173, 174, 176, 177, 179, 180, +- 182, 183, 185, 186, 188, 189, 191, 192, 194, 195, +- 197, 198, 200, 201, 203, 204, 206, 207, 209, 210, +- 251, 252, 212, 213, 248, 249, 254, 255, 221, 222, +- 257, 258, 225, 226, 224, 261, 262, 229, 230, 228, +- 233, 234, 232, 241, 242, 240, 245, 246, 244, 237, +- 238, 236, 215, 216, 218, 219, 0, 0, 0, 0, +- 0, 0, 38, 39, 0, 0, 0, 73, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 37, 0, 0, 0, 0, 40, +- 41, 0, 0, 0, 0, 0, 76, 33, 35, 433, +- 0, 0, 0, 438, 439, 29, 31, 157, 0, 0, +- 158, 34, 36, 72, 56, 55, 57, 58, 43, 59, +- 52, 60, 42, 61, 62, 63, 64, 65, 66, 67, +- 53, 68, 69, 70, 71, 44, 45, 46, 47, 48, +- 49, 50, 51, 54, 75, 435, 436, 437, 160, 159 ++ 199, 202, 205, 208, 211, 214, 267, 256, 217, 253, ++ 259, 268, 269, 226, 270, 271, 272, 273, 274, 275, ++ 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, ++ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, ++ 297, 296, 300, 299, 298, 301, 303, 302, 304, 262, ++ 305, 306, 307, 309, 308, 230, 310, 311, 263, 266, ++ 312, 313, 314, 315, 316, 317, 318, 319, 320, 323, ++ 321, 322, 234, 238, 246, 250, 242, 220, 223, 0, ++ 325, 324, 326, 327, 328, 329, 330, 331, 332, 333, ++ 334, 335, 336, 121, 156, 161, 122, 123, 124, 22, ++ 21, 23, 28, 27, 144, 145, 0, 155, 78, 1, ++ 3, 0, 437, 392, 357, 356, 355, 345, 344, 346, ++ 352, 351, 354, 353, 443, 444, 368, 369, 372, 381, ++ 388, 389, 390, 391, 397, 0, 0, 163, 162, 164, ++ 165, 167, 168, 170, 171, 173, 174, 176, 177, 179, ++ 180, 182, 183, 185, 186, 188, 189, 191, 192, 194, ++ 195, 197, 198, 200, 201, 203, 204, 206, 207, 209, ++ 210, 212, 213, 254, 255, 215, 216, 251, 252, 257, ++ 258, 224, 225, 260, 261, 228, 229, 227, 264, 265, ++ 232, 233, 231, 236, 237, 235, 244, 245, 243, 248, ++ 249, 247, 240, 241, 239, 218, 219, 221, 222, 0, ++ 0, 0, 0, 0, 0, 38, 39, 0, 0, 0, ++ 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, ++ 0, 0, 40, 41, 0, 0, 0, 0, 0, 76, ++ 33, 35, 436, 0, 0, 0, 441, 442, 29, 31, ++ 157, 0, 0, 158, 34, 36, 72, 56, 55, 57, ++ 58, 43, 59, 52, 60, 42, 61, 62, 63, 64, ++ 65, 66, 67, 53, 68, 69, 70, 71, 44, 45, ++ 46, 47, 48, 49, 50, 51, 54, 75, 438, 439, ++ 440, 160, 159 + }; + + const short + seclang_parser::yypgoto_[] = + { +- -413, -413, -70, -413, -47, -192, -413, -412, -413, -413, +- -55, -153, -61, -332, -413, -134 ++ -402, -402, -74, -402, -47, -170, -402, -401, -402, -402, ++ -51, -254, -61, -316, -402, -136 + }; + + const short + seclang_parser::yydefgoto_[] = + { +- -1, 82, 83, 84, 209, 210, 476, 477, 85, 335, +- 322, 323, 354, 211, 342, 355 ++ -1, 82, 83, 84, 209, 210, 479, 480, 85, 336, ++ 323, 324, 355, 211, 343, 356 + }; + + const short + seclang_parser::yytable_[] = + { +- 324, 324, 324, 215, 212, 365, 365, 325, 326, 356, +- 437, 357, 339, 216, 437, 95, 364, 327, 96, 324, +- 358, 112, 97, 113, 114, 336, 491, 359, 360, 361, +- 362, 92, 93, 486, 337, 363, 94, 328, 329, 346, +- 347, 0, 330, 343, 348, 344, 345, 480, 481, 482, +- 86, 87, 88, 89, 341, 90, 91, 98, 99, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 100, 101, +- 414, 102, 103, 104, 105, 436, 366, 367, 106, 107, +- 108, 109, 110, 111, 213, 214, 0, 419, 422, 425, +- 428, 431, 0, 331, 332, 333, 334, 349, 350, 351, +- 352, 368, 369, 370, 371, 372, 373, 0, 374, 375, +- 376, 377, 378, 379, 0, 380, 381, 382, 383, 384, +- 385, 478, 386, 387, 388, 389, 390, 391, 0, 0, +- 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, +- 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, +- 415, 416, 432, 433, 434, 435, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 324, 0, 0, ++ 325, 325, 325, 215, 212, 366, 366, 357, 340, 358, ++ 115, 326, 327, 216, 440, 92, 93, 328, 359, 325, ++ 94, 112, 440, 113, 114, 360, 361, 362, 363, 337, ++ 86, 87, 95, 364, 338, 96, 329, 330, 365, 97, ++ 494, 331, 347, 348, 88, 89, 344, 349, 345, 346, ++ 489, 483, 484, 485, 342, 439, 116, 117, 118, 119, ++ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, ++ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, ++ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, ++ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, ++ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, ++ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, ++ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, ++ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, ++ 200, 201, 202, 203, 204, 205, 206, 207, 0, 417, ++ 90, 91, 98, 99, 100, 101, 367, 368, 102, 103, ++ 104, 105, 106, 107, 108, 109, 422, 425, 428, 431, ++ 434, 0, 110, 111, 213, 214, 332, 333, 334, 335, ++ 350, 351, 352, 353, 369, 370, 0, 371, 372, 373, ++ 374, 375, 376, 0, 0, 377, 378, 0, 0, 0, ++ 481, 379, 380, 381, 382, 383, 384, 0, 0, 385, ++ 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, ++ 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, ++ 406, 407, 408, 409, 410, 411, 412, 0, 208, 413, ++ 414, 418, 419, 0, 435, 436, 437, 438, 325, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 479, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 0, 492, 493, 494, 495, 0, 0, +- 496, 497, 498, 0, 499, 500, 501, 502, 503, 504, +- 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, +- 485, 515, 516, 517, 518, 487, 0, 519, 520, 521, +- 522, 523, 0, 0, 0, 0, 525, 526, 527, 0, +- 0, 0, 0, 484, 0, 0, 0, 0, 484, 0, +- 0, 484, 0, 0, 484, 0, 0, 484, 0, 0, +- 484, 0, 0, 0, 0, 353, 490, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, +- 0, 412, 413, 0, 0, 0, 0, 0, 0, 0, ++ 482, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 0, 495, 496, 497, 498, 0, ++ 0, 499, 500, 501, 0, 502, 503, 504, 505, 506, ++ 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, ++ 517, 488, 518, 519, 520, 521, 490, 0, 522, 523, ++ 524, 525, 526, 0, 0, 0, 0, 528, 529, 530, ++ 0, 0, 0, 0, 0, 0, 487, 0, 0, 0, ++ 0, 487, 0, 0, 487, 0, 0, 487, 0, 0, ++ 487, 0, 0, 487, 0, 0, 0, 0, 0, 493, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 484, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 528, 529, 524, +- 0, 484, 484, 484, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 484, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 484, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 0, 484, 484, 484, 219, 220, 221, +- 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, +- 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, +- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, +- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, +- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, +- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, +- 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, +- 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, +- 302, 303, 304, 305, 306, 307, 219, 220, 221, 222, +- 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, +- 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, +- 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, +- 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, +- 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, +- 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, +- 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, +- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, +- 303, 304, 305, 306, 307, 219, 220, 221, 222, 223, +- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, +- 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, +- 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, +- 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, +- 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, +- 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, +- 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, +- 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, +- 304, 305, 306, 307, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 487, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 531, 532, 527, 0, 487, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 487, 487, 0, 487, 487, 487, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 353, 0, 309, 310, 311, 312, 313, +- 314, 315, 316, 317, 318, 319, 320, 321, 0, 417, +- 418, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 354, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 0, 415, 416, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 353, 0, 309, 310, 311, 312, 313, 314, +- 315, 316, 317, 318, 319, 320, 321, 0, 420, 421, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 354, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 0, 420, 421, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 353, 0, 309, 310, 311, 312, 313, 314, 315, +- 316, 317, 318, 319, 320, 321, 0, 423, 424, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 219, 220, +- 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, +- 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, +- 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, +- 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, +- 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, +- 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, +- 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, +- 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, +- 301, 302, 303, 304, 305, 306, 307, 217, 218, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 354, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 0, 423, 424, 219, 220, 221, 222, 223, ++ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, ++ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 304, 305, 306, 307, 308, 219, 220, 221, 222, 223, ++ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, ++ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 304, 305, 306, 307, 308, 219, 220, 221, 222, 223, ++ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, ++ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 304, 305, 306, 307, 308, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 353, 0, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, +- 0, 426, 427, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 354, 0, 310, 311, 312, 313, 314, 315, ++ 316, 317, 318, 319, 320, 321, 322, 0, 426, 427, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 353, 0, 309, 310, 311, 312, +- 313, 314, 315, 316, 317, 318, 319, 320, 321, 0, +- 429, 430, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 354, 0, 310, 311, 312, 313, 314, 315, ++ 316, 317, 318, 319, 320, 321, 322, 0, 429, 430, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 308, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 354, 0, 310, 311, 312, 313, 314, 315, ++ 316, 317, 318, 319, 320, 321, 322, 0, 432, 433, + 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, + 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, + 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, +@@ -6295,31 +6322,31 @@ namespace yy { + 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, +- 307, 488, 489, 219, 220, 221, 222, 223, 224, 225, +- 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, +- 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, +- 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, +- 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, +- 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, +- 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, +- 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, +- 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, +- 306, 307, 219, 220, 221, 222, 223, 224, 225, 226, +- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, +- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, +- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, +- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, +- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, +- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, +- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, +- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, +- 307, 0, 0, 0, 0, 438, 439, 440, 441, 442, +- 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, +- 453, 454, 455, 456, 457, 458, 459, 0, 460, 461, +- 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, +- 472, 473, 474, 475, 0, 0, 0, 0, 0, 0, ++ 307, 308, 217, 218, 219, 220, 221, 222, 223, 224, ++ 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, ++ 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, ++ 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, ++ 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, ++ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, ++ 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, ++ 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, ++ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, ++ 305, 306, 307, 308, 491, 492, 219, 220, 221, 222, ++ 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, ++ 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, ++ 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, ++ 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, ++ 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, ++ 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, ++ 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, ++ 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, ++ 303, 304, 305, 306, 307, 308, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, +- 319, 320, 321, 0, 0, 0, 0, 0, 0, 0, ++ 319, 320, 321, 322, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -6327,17 +6354,64 @@ namespace yy { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 309, 310, 311, 312, 313, 314, 315, 316, 317, +- 318, 319, 320, 321, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 310, 311, 312, 313, 314, 315, 316, ++ 317, 318, 319, 320, 321, 322, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 353, 0, +- 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, +- 319, 320, 321, 219, 220, 221, 222, 223, 224, 225, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 310, 311, 312, 313, 314, ++ 315, 316, 317, 318, 319, 320, 321, 322, 219, 220, ++ 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, ++ 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, ++ 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, ++ 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, ++ 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, ++ 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, ++ 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, ++ 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, ++ 301, 302, 303, 304, 305, 306, 307, 308, 0, 0, ++ 0, 0, 441, 442, 443, 444, 445, 446, 447, 448, ++ 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, ++ 459, 460, 461, 462, 0, 463, 464, 465, 466, 467, ++ 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, ++ 478, 219, 220, 221, 222, 223, 224, 225, 226, 227, ++ 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, ++ 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, ++ 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, ++ 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, ++ 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, ++ 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, ++ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, ++ 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, ++ 308, 0, 0, 0, 0, 0, 442, 443, 444, 445, ++ 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, ++ 456, 457, 458, 459, 460, 461, 462, 0, 463, 464, ++ 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, ++ 475, 476, 477, 478, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 354, 0, 310, 311, 312, ++ 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, ++ 0, 0, 0, 0, 341, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 354, 0, ++ 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, ++ 320, 321, 322, 219, 220, 221, 222, 223, 224, 225, + 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, + 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, + 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, +@@ -6346,116 +6420,75 @@ namespace yy { + 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, + 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, + 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, +- 306, 307, 0, 0, 0, 0, 0, 439, 440, 441, +- 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, +- 452, 453, 454, 455, 456, 457, 458, 459, 0, 460, +- 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, +- 471, 472, 473, 474, 475, 219, 220, 221, 222, 223, +- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, +- 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, +- 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, +- 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, +- 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, +- 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, +- 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, +- 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, +- 304, 305, 306, 307, 0, 0, 0, 0, 340, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 0, 353, +- 0, 309, 310, 311, 312, 313, 314, 315, 316, 317, +- 318, 319, 320, 321, 219, 220, 221, 222, 223, 224, +- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, +- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, +- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, +- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, +- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, +- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, +- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, +- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, +- 305, 306, 307, 0, 0, 0, 0, 0, 0, 0, ++ 306, 307, 308, 219, 220, 221, 222, 223, 224, 225, ++ 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, ++ 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, ++ 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, ++ 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, ++ 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, ++ 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, ++ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, ++ 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, ++ 306, 307, 308, 0, 0, 0, 0, 0, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 219, 220, 221, 222, 223, 224, 225, 226, ++ 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, ++ 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, ++ 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, ++ 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, ++ 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, ++ 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, ++ 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, ++ 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, ++ 307, 308, 0, 0, 0, 0, 1, 0, 0, 0, ++ 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 354, 0, 310, 311, 312, 313, 314, 315, 316, 317, ++ 318, 319, 320, 321, 322, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 309, 310, 311, 312, 313, 314, 315, +- 316, 317, 318, 319, 320, 321, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, +- 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 353, 0, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, +- 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, +- 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, +- 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, +- 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, +- 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, +- 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, +- 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, +- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, +- 299, 300, 301, 302, 303, 304, 305, 306, 307, 4, +- 483, 0, 309, 310, 311, 312, 313, 314, 315, 316, +- 317, 318, 319, 320, 321, 0, 0, 0, 338, 0, +- 0, 0, 2, 3, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 486, 0, 310, 311, 312, 313, 314, 315, 316, 317, ++ 318, 319, 320, 321, 322, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, ++ 339, 0, 0, 0, 2, 3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 5, 6, 7, 8, 9, 10, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 310, 311, 312, 313, 314, 315, 316, 317, 318, ++ 319, 320, 321, 322, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 0, 54, 55, 56, 57, 58, 59, ++ 51, 52, 53, 4, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, +- 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 309, 310, +- 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, +- 321, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 5, 6, 7, 8, 9, +- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, +- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, +- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, +- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, +- 50, 51, 52, 53, 115, 54, 55, 56, 57, 58, +- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, +- 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 70, 71, 72, 73, 74, 75, 76, 77, +- 78, 79, 80, 81, 0, 0, 0, 0, 0, 0, +- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, +- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, +- 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, +- 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, +- 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, +- 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, +- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, +- 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, +- 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, +- 206, 207, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 115, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 208, 116, 117, 118, 119, 120, 121, 122, ++ 0, 0, 0, 0, 0, 0, 0, 0, 5, 6, ++ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ++ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, ++ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, ++ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ++ 47, 48, 49, 50, 51, 52, 53, 115, 54, 55, ++ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, ++ 66, 67, 68, 69, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 0, 0, 0, ++ 0, 0, 0, 116, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, +@@ -6470,155 +6503,156 @@ namespace yy { + const short + seclang_parser::yycheck_[] = + { +- 61, 62, 63, 303, 51, 3, 3, 62, 63, 143, +- 6, 145, 82, 313, 6, 305, 208, 64, 308, 80, +- 154, 304, 312, 306, 307, 80, 438, 161, 162, 163, +- 164, 306, 307, 365, 81, 169, 311, 306, 307, 306, +- 307, -1, 311, 304, 311, 306, 307, 100, 101, 102, +- 306, 307, 143, 144, 115, 306, 307, 306, 307, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, 306, 307, +- 284, 306, 307, 309, 310, 308, 217, 218, 306, 307, +- 309, 310, 306, 307, 306, 307, -1, 301, 302, 303, +- 304, 305, -1, 306, 307, 306, 307, 306, 307, 306, +- 307, 342, 343, 342, 343, 342, 343, -1, 342, 343, +- 342, 343, 342, 343, -1, 342, 343, 342, 343, 342, +- 343, 335, 342, 343, 342, 343, 342, 343, -1, -1, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 308, -1, -1, ++ 61, 62, 63, 304, 51, 3, 3, 143, 82, 145, ++ 100, 62, 63, 314, 6, 307, 308, 64, 154, 80, ++ 312, 305, 6, 307, 308, 161, 162, 163, 164, 80, ++ 307, 308, 306, 169, 81, 309, 307, 308, 208, 313, ++ 441, 312, 307, 308, 144, 145, 305, 312, 307, 308, ++ 366, 101, 102, 103, 115, 309, 146, 147, 148, 149, ++ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, ++ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, ++ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, ++ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, ++ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, ++ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, ++ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, ++ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, ++ 230, 231, 232, 233, 234, 235, 236, 237, -1, 285, ++ 307, 308, 307, 308, 307, 308, 217, 218, 307, 308, ++ 310, 311, 307, 308, 310, 311, 302, 303, 304, 305, ++ 306, -1, 307, 308, 307, 308, 307, 308, 307, 308, ++ 307, 308, 307, 308, 343, 344, -1, 343, 344, 343, ++ 344, 343, 344, -1, -1, 343, 344, -1, -1, -1, ++ 336, 343, 344, 343, 344, 343, 344, -1, -1, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, -1, 328, 343, ++ 344, 343, 344, -1, 343, 344, 343, 344, 309, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, -1, 340, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, 355, 356, 357, 358, 359, 360, +- 361, 362, 363, -1, 438, 439, 440, 441, -1, -1, +- 444, 445, 446, -1, 448, 449, 450, 451, 452, 453, +- 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, +- 327, 465, 466, 467, 468, 327, -1, 471, 472, 473, +- 474, 475, -1, -1, -1, -1, 480, 481, 482, -1, +- -1, -1, -1, 414, -1, -1, -1, -1, 419, -1, ++ 341, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 356, 357, 358, 359, 360, ++ 361, 362, 363, 364, -1, 441, 442, 443, 444, -1, ++ -1, 447, 448, 449, -1, 451, 452, 453, 454, 455, ++ 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, ++ 466, 328, 468, 469, 470, 471, 328, -1, 474, 475, ++ 476, 477, 478, -1, -1, -1, -1, 483, 484, 485, ++ -1, -1, -1, -1, -1, -1, 417, -1, -1, -1, + -1, 422, -1, -1, 425, -1, -1, 428, -1, -1, +- 431, -1, -1, -1, -1, 326, 437, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, +- -1, 342, 343, -1, -1, -1, -1, -1, -1, -1, ++ 431, -1, -1, 434, -1, -1, -1, -1, -1, 440, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 478, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 488, 489, 476, +- -1, 492, 493, 494, 495, 496, 497, 498, 499, 500, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 481, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 491, 492, 479, -1, 495, 496, 497, 498, 499, 500, + 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, + 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, +- 521, 522, 523, -1, 525, 526, 527, 10, 11, 12, +- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, +- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, +- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, +- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, +- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, +- 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, +- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, +- 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, +- 93, 94, 95, 96, 97, 98, 10, 11, 12, 13, +- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, +- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, +- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, +- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, +- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, +- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, +- 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, +- 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, +- 94, 95, 96, 97, 98, 10, 11, 12, 13, 14, +- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, +- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, +- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, +- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, +- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, +- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, +- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, +- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, +- 95, 96, 97, 98, -1, -1, -1, -1, -1, -1, ++ 521, 522, 523, 524, 525, 526, -1, 528, 529, 530, ++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ++ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ++ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, ++ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, ++ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ++ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ++ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ++ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, ++ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, ++ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ++ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ++ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ++ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, ++ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, ++ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ++ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, 326, -1, 328, 329, 330, 331, 332, +- 333, 334, 335, 336, 337, 338, 339, 340, -1, 342, +- 343, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, 327, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, -1, 343, 344, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, 326, -1, 328, 329, 330, 331, 332, 333, +- 334, 335, 336, 337, 338, 339, 340, -1, 342, 343, ++ -1, -1, -1, -1, -1, -1, -1, 327, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, -1, 343, 344, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, 327, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, -1, 343, 344, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, ++ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, ++ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, ++ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, ++ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, ++ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, ++ 95, 96, 97, 98, 99, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, ++ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, ++ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, ++ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, ++ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, ++ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, ++ 95, 96, 97, 98, 99, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, ++ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, ++ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, ++ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, ++ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, ++ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, ++ 95, 96, 97, 98, 99, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 326, -1, 328, 329, 330, 331, 332, 333, 334, +- 335, 336, 337, 338, 339, 340, -1, 342, 343, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, 10, 11, +- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, +- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, +- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, +- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, +- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, +- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, +- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, +- 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, +- 92, 93, 94, 95, 96, 97, 98, 8, 9, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, 327, -1, 329, 330, 331, 332, 333, 334, ++ 335, 336, 337, 338, 339, 340, 341, -1, 343, 344, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 326, -1, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, +- -1, 342, 343, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, 326, -1, 328, 329, 330, 331, +- 332, 333, 334, 335, 336, 337, 338, 339, 340, -1, +- 342, 343, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, 327, -1, 329, 330, 331, 332, 333, 334, ++ 335, 336, 337, 338, 339, 340, 341, -1, 343, 344, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, 327, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, 327, -1, 329, 330, 331, 332, 333, 334, ++ 335, 336, 337, 338, 339, 340, 341, -1, 343, 344, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, +@@ -6628,104 +6662,82 @@ namespace yy { + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, +- 98, 8, 9, 10, 11, 12, 13, 14, 15, 16, +- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, +- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, +- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, +- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, +- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, +- 97, 98, 10, 11, 12, 13, 14, 15, 16, 17, +- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, +- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, +- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, +- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, +- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, +- 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, +- 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, +- 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, +- 98, -1, -1, -1, -1, 103, 104, 105, 106, 107, +- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, +- 118, 119, 120, 121, 122, 123, 124, -1, 126, 127, +- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, +- 138, 139, 140, 141, -1, -1, -1, -1, -1, -1, +- 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, +- 338, 339, 340, -1, -1, -1, -1, -1, -1, -1, ++ 98, 99, 8, 9, 10, 11, 12, 13, 14, 15, ++ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, ++ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, ++ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, ++ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, ++ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, ++ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ++ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, ++ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, ++ 96, 97, 98, 99, 8, 9, 10, 11, 12, 13, ++ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, ++ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, ++ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, ++ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, ++ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, ++ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ++ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, ++ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, ++ 94, 95, 96, 97, 98, 99, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, ++ 338, 339, 340, 341, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 328, 329, 330, 331, 332, 333, 334, 335, 336, +- 337, 338, 339, 340, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, 329, 330, 331, 332, 333, 334, 335, ++ 336, 337, 338, 339, 340, 341, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, 326, -1, +- 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, +- 338, 339, 340, 10, 11, 12, 13, 14, 15, 16, +- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, +- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, +- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, +- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, +- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, +- 97, 98, -1, -1, -1, -1, -1, 104, 105, 106, +- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, +- 117, 118, 119, 120, 121, 122, 123, 124, -1, 126, +- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, +- 137, 138, 139, 140, 141, 10, 11, 12, 13, 14, +- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, +- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, +- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, +- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, +- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, +- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, +- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, +- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, +- 95, 96, 97, 98, -1, -1, -1, -1, 103, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, -1, 326, +- -1, 328, 329, 330, 331, 332, 333, 334, 335, 336, +- 337, 338, 339, 340, 10, 11, 12, 13, 14, 15, +- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, +- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, +- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, +- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, +- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, +- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, +- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, +- 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, +- 96, 97, 98, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, 328, 329, 330, 331, 332, 333, 334, +- 335, 336, 337, 338, 339, 340, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, +- -1, 4, 5, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 329, 330, 331, 332, 333, ++ 334, 335, 336, 337, 338, 339, 340, 341, 10, 11, ++ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, ++ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, ++ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, ++ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, ++ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, ++ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, ++ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ++ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, ++ 92, 93, 94, 95, 96, 97, 98, 99, -1, -1, ++ -1, -1, 104, 105, 106, 107, 108, 109, 110, 111, ++ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, ++ 122, 123, 124, 125, -1, 127, 128, 129, 130, 131, ++ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, ++ 142, 10, 11, 12, 13, 14, 15, 16, 17, 18, ++ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, ++ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, ++ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, ++ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, ++ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, ++ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, ++ 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, ++ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, ++ 99, -1, -1, -1, -1, -1, 105, 106, 107, 108, ++ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, ++ 119, 120, 121, 122, 123, 124, 125, -1, 127, 128, ++ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, ++ 139, 140, 141, 142, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 326, -1, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 327, -1, 329, 330, 331, ++ 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, +@@ -6734,97 +6746,125 @@ namespace yy { + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, +- 90, 91, 92, 93, 94, 95, 96, 97, 98, 142, +- 326, -1, 328, 329, 330, 331, 332, 333, 334, 335, +- 336, 337, 338, 339, 340, -1, -1, -1, 0, -1, +- -1, -1, 4, 5, -1, -1, -1, -1, -1, -1, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ++ -1, -1, -1, -1, 104, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, 327, -1, ++ 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, ++ 339, 340, 341, 10, 11, 12, 13, 14, 15, 16, ++ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, ++ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, ++ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ++ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, ++ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, ++ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ++ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, ++ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, ++ 97, 98, 99, 10, 11, 12, 13, 14, 15, 16, ++ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, ++ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, ++ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ++ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, ++ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, ++ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ++ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, ++ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, ++ 97, 98, 99, -1, -1, -1, -1, -1, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, 10, 11, 12, 13, 14, 15, 16, 17, ++ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, ++ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, ++ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, ++ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, ++ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, ++ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ++ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, ++ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, ++ 98, 99, -1, -1, -1, -1, 0, -1, -1, -1, ++ 4, 5, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 327, -1, 329, 330, 331, 332, 333, 334, 335, 336, ++ 337, 338, 339, 340, 341, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, 237, 238, 239, 240, 241, 242, +- 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, +- 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, +- 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, +- 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, +- 283, 284, 285, -1, 287, 288, 289, 290, 291, 292, +- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, +- 142, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 314, 315, 316, 317, 318, 319, 320, 321, 322, +- 323, 324, 325, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 327, -1, 329, 330, 331, 332, 333, 334, 335, 336, ++ 337, 338, 339, 340, 341, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, 143, ++ 0, -1, -1, -1, 4, 5, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, 328, 329, +- 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, +- 340, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 237, 238, 239, 240, 241, +- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, +- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, +- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, +- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, +- 282, 283, 284, 285, 99, 287, 288, 289, 290, 291, +- 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, +- 302, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, 314, 315, 316, 317, 318, 319, 320, 321, +- 322, 323, 324, 325, -1, -1, -1, -1, -1, -1, +- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, +- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, +- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, +- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, +- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, +- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, +- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, +- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, +- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, +- 235, 236, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, 329, 330, 331, 332, 333, 334, 335, 336, 337, ++ 338, 339, 340, 341, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 143, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, 315, 316, 317, 318, 319, 320, 321, 322, 323, ++ 324, 325, 326, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, 327, 145, 146, 147, 148, 149, 150, 151, +- 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, +- 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, +- 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, +- 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, +- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, +- 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, +- 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, +- 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, +- 232, 233, 234, 235, 236 ++ -1, -1, -1, -1, -1, -1, -1, -1, 238, 239, ++ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, ++ 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, ++ 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, ++ 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, ++ 280, 281, 282, 283, 284, 285, 286, 100, 288, 289, ++ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, ++ 300, 301, 302, 303, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 315, 316, 317, 318, 319, ++ 320, 321, 322, 323, 324, 325, 326, -1, -1, -1, ++ -1, -1, -1, 146, 147, 148, 149, 150, 151, 152, ++ 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, ++ 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, ++ 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, ++ 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, ++ 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, ++ 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, ++ 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, ++ 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, ++ 233, 234, 235, 236, 237 + }; + + const short + seclang_parser::yystos_[] = + { +- 0, 0, 4, 5, 142, 237, 238, 239, 240, 241, +- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, +- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, +- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, +- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, +- 282, 283, 284, 285, 287, 288, 289, 290, 291, 292, +- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, +- 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, +- 324, 325, 345, 346, 347, 352, 306, 307, 143, 144, +- 306, 307, 306, 307, 311, 305, 308, 312, 306, 307, +- 306, 307, 306, 307, 309, 310, 306, 307, 309, 310, +- 306, 307, 304, 306, 307, 99, 145, 146, 147, 148, +- 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, +- 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, +- 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, +- 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, +- 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, +- 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, +- 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, +- 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, +- 229, 230, 231, 232, 233, 234, 235, 236, 327, 348, +- 349, 357, 348, 306, 307, 303, 313, 8, 9, 10, ++ 0, 0, 4, 5, 143, 238, 239, 240, 241, 242, ++ 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, ++ 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, ++ 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, ++ 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, ++ 283, 284, 285, 286, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, ++ 325, 326, 346, 347, 348, 353, 307, 308, 144, 145, ++ 307, 308, 307, 308, 312, 306, 309, 313, 307, 308, ++ 307, 308, 307, 308, 310, 311, 307, 308, 310, 311, ++ 307, 308, 305, 307, 308, 100, 146, 147, 148, 149, ++ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, ++ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, ++ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, ++ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, ++ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, ++ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, ++ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, ++ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, ++ 230, 231, 232, 233, 234, 235, 236, 237, 328, 349, ++ 350, 358, 349, 307, 308, 304, 314, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +@@ -6833,67 +6873,51 @@ namespace yy { + 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, 327, 328, ++ 91, 92, 93, 94, 95, 96, 97, 98, 99, 328, + 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, +- 339, 340, 354, 355, 356, 354, 354, 348, 306, 307, +- 311, 306, 307, 306, 307, 353, 354, 348, 0, 346, +- 103, 356, 358, 304, 306, 307, 306, 307, 311, 306, +- 307, 306, 307, 326, 356, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 349, 3, 356, 356, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 359, 342, 343, 342, 343, 359, +- 342, 343, 359, 342, 343, 359, 342, 343, 359, 342, +- 343, 359, 342, 343, 342, 343, 355, 6, 103, 104, +- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, +- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, +- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, +- 136, 137, 138, 139, 140, 141, 350, 351, 359, 356, +- 100, 101, 102, 326, 356, 327, 357, 327, 8, 9, +- 356, 351, 359, 359, 359, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 359, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 359, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 348, 359, 359, 359, 356, 356 ++ 339, 340, 341, 355, 356, 357, 355, 355, 349, 307, ++ 308, 312, 307, 308, 307, 308, 354, 355, 349, 0, ++ 347, 104, 357, 359, 305, 307, 308, 307, 308, 312, ++ 307, 308, 307, 308, 327, 357, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 350, 3, 357, 357, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 360, 343, 344, ++ 343, 344, 360, 343, 344, 360, 343, 344, 360, 343, ++ 344, 360, 343, 344, 360, 343, 344, 343, 344, 356, ++ 6, 104, 105, 106, 107, 108, 109, 110, 111, 112, ++ 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, ++ 123, 124, 125, 127, 128, 129, 130, 131, 132, 133, ++ 134, 135, 136, 137, 138, 139, 140, 141, 142, 351, ++ 352, 360, 357, 101, 102, 103, 327, 357, 328, 358, ++ 328, 8, 9, 357, 352, 360, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 360, 360, 349, 360, 360, ++ 360, 357, 357 + }; + + const short + seclang_parser::yyr1_[] = + { +- 0, 344, 345, 345, 345, 346, 347, 347, 347, 347, +- 347, 347, 347, 347, 347, 347, 347, 347, 347, 347, +- 347, 347, 347, 347, 347, 347, 347, 347, 347, 348, +- 348, 349, 349, 350, 350, 350, 350, 351, 351, 351, +- 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, +- 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, +- 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, +- 351, 351, 351, 351, 352, 352, 352, 352, 352, 352, ++ 0, 345, 346, 346, 346, 347, 348, 348, 348, 348, ++ 348, 348, 348, 348, 348, 348, 348, 348, 348, 348, ++ 348, 348, 348, 348, 348, 348, 348, 348, 348, 349, ++ 349, 350, 350, 351, 351, 351, 351, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 353, 354, 354, 355, 355, +- 355, 355, 355, 355, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 352, 352, 352, 352, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 354, 355, 355, 356, 356, + 356, 356, 356, 356, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, +@@ -6904,8 +6928,25 @@ namespace yy { + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, +- 357, 357, 357, 358, 358, 358, 358, 358, 359, 359, +- 359, 359 ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 359, 359, 359, 359, ++ 359, 360, 360, 360, 360 + }; + + const signed char +@@ -6933,11 +6974,11 @@ namespace yy { + 1, 2, 2, 1, 2, 2, 1, 2, 2, 1, + 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, + 2, 1, 2, 2, 1, 2, 2, 1, 2, 2, +- 1, 2, 2, 1, 2, 2, 2, 1, 2, 2, +- 2, 1, 2, 2, 2, 1, 2, 2, 2, 1, +- 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, ++ 1, 2, 2, 1, 2, 2, 1, 2, 2, 2, ++ 1, 2, 2, 2, 1, 2, 2, 2, 1, 2, ++ 2, 2, 1, 2, 2, 2, 1, 2, 2, 2, + 1, 2, 2, 1, 2, 2, 1, 2, 2, 1, +- 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, ++ 2, 2, 1, 1, 2, 2, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +@@ -6945,17 +6986,17 @@ namespace yy { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +- 1, 2, 2, 2, 1, 1, 1, 1, 2, 2, +- 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, +- 1, 1, 1, 1, 1, 2, 2, 1, 1, 2, +- 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, +- 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, +- 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, ++ 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, ++ 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, ++ 1, 2, 1, 1, 1, 1, 1, 1, 2, 2, ++ 2, 2, 2, 1, 1, 1, 1, 2, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +- 1, 1, 1, 2, 1, 3, 3, 3, 2, 2, +- 1, 1 ++ 1, 1, 1, 1, 1, 1, 2, 1, 3, 3, ++ 3, 2, 2, 1, 1 + }; + + +@@ -6974,11 +7015,12 @@ namespace yy { + "VARIABLE_MATCHED_VARS_NAMES", "VARIABLE_MATCHED_VARS", "VARIABLE_FILES", + "VARIABLE_REQUEST_COOKIES", "VARIABLE_REQUEST_HEADERS", + "VARIABLE_RESPONSE_HEADERS", "VARIABLE_GEO", +- "VARIABLE_REQUEST_COOKIES_NAMES", "VARIABLE_ARGS_COMBINED_SIZE", +- "VARIABLE_ARGS_GET_NAMES", "VARIABLE_RULE", "\"Variable ARGS_NAMES\"", +- "VARIABLE_ARGS_POST_NAMES", "\"AUTH_TYPE\"", "\"FILES_COMBINED_SIZE\"", +- "\"FILES_TMPNAMES\"", "\"FULL_REQUEST\"", "\"FULL_REQUEST_LENGTH\"", +- "\"INBOUND_DATA_ERROR\"", "\"MATCHED_VAR\"", "\"MATCHED_VAR_NAME\"", ++ "VARIABLE_REQUEST_COOKIES_NAMES", "VARIABLE_MULTIPART_PART_HEADERS", ++ "VARIABLE_ARGS_COMBINED_SIZE", "VARIABLE_ARGS_GET_NAMES", ++ "VARIABLE_RULE", "\"Variable ARGS_NAMES\"", "VARIABLE_ARGS_POST_NAMES", ++ "\"AUTH_TYPE\"", "\"FILES_COMBINED_SIZE\"", "\"FILES_TMPNAMES\"", ++ "\"FULL_REQUEST\"", "\"FULL_REQUEST_LENGTH\"", "\"INBOUND_DATA_ERROR\"", ++ "\"MATCHED_VAR\"", "\"MATCHED_VAR_NAME\"", + "VARIABLE_MULTIPART_BOUNDARY_QUOTED", + "VARIABLE_MULTIPART_BOUNDARY_WHITESPACE", "\"MULTIPART_CRLF_LF_LINES\"", + "\"MULTIPART_DATA_AFTER\"", "VARIABLE_MULTIPART_DATA_BEFORE", +@@ -7147,51 +7189,51 @@ namespace yy { + const short + seclang_parser::yyrline_[] = + { +- 0, 712, 712, 716, 717, 720, 725, 731, 737, 741, +- 745, 751, 757, 763, 769, 774, 779, 785, 792, 796, +- 800, 806, 810, 814, 819, 824, 829, 834, 838, 845, +- 849, 856, 862, 872, 881, 891, 900, 913, 917, 921, +- 925, 929, 933, 937, 941, 945, 949, 954, 958, 962, +- 966, 970, 974, 979, 984, 988, 992, 996, 1000, 1004, +- 1008, 1012, 1016, 1020, 1024, 1028, 1032, 1036, 1040, 1044, +- 1048, 1052, 1056, 1060, 1074, 1075, 1105, 1124, 1143, 1171, +- 1228, 1235, 1239, 1243, 1247, 1251, 1255, 1259, 1263, 1272, +- 1276, 1281, 1284, 1289, 1294, 1299, 1304, 1307, 1312, 1315, +- 1320, 1325, 1328, 1333, 1338, 1343, 1348, 1353, 1358, 1363, +- 1366, 1371, 1376, 1381, 1386, 1389, 1394, 1399, 1404, 1417, +- 1430, 1443, 1456, 1469, 1495, 1523, 1535, 1555, 1582, 1587, +- 1593, 1598, 1603, 1612, 1617, 1621, 1625, 1629, 1633, 1637, +- 1641, 1646, 1651, 1663, 1669, 1673, 1677, 1688, 1697, 1698, +- 1705, 1710, 1715, 1769, 1776, 1784, 1821, 1825, 1832, 1837, +- 1843, 1849, 1855, 1862, 1872, 1876, 1880, 1884, 1888, 1892, +- 1896, 1900, 1904, 1908, 1912, 1916, 1920, 1924, 1928, 1932, +- 1936, 1940, 1944, 1948, 1952, 1956, 1960, 1964, 1968, 1972, +- 1976, 1980, 1984, 1988, 1992, 1996, 2000, 2004, 2008, 2012, +- 2016, 2020, 2024, 2028, 2032, 2036, 2040, 2044, 2048, 2052, +- 2056, 2060, 2064, 2068, 2072, 2076, 2080, 2084, 2088, 2092, +- 2096, 2100, 2104, 2108, 2112, 2116, 2120, 2124, 2128, 2132, +- 2136, 2140, 2144, 2148, 2152, 2156, 2160, 2164, 2168, 2172, +- 2176, 2180, 2184, 2188, 2192, 2196, 2200, 2204, 2208, 2212, +- 2216, 2220, 2224, 2228, 2233, 2237, 2241, 2246, 2250, 2254, +- 2259, 2264, 2268, 2272, 2276, 2280, 2284, 2288, 2292, 2296, +- 2300, 2304, 2308, 2312, 2316, 2320, 2324, 2328, 2332, 2336, +- 2340, 2344, 2348, 2352, 2356, 2360, 2364, 2368, 2372, 2376, +- 2380, 2384, 2388, 2392, 2396, 2400, 2404, 2408, 2412, 2416, +- 2420, 2424, 2428, 2432, 2436, 2440, 2444, 2448, 2452, 2456, +- 2460, 2464, 2468, 2472, 2476, 2480, 2484, 2488, 2492, 2496, +- 2500, 2504, 2512, 2519, 2526, 2533, 2540, 2547, 2554, 2561, +- 2568, 2575, 2582, 2589, 2599, 2603, 2607, 2611, 2615, 2619, +- 2623, 2627, 2632, 2636, 2641, 2645, 2649, 2653, 2657, 2662, +- 2667, 2671, 2675, 2679, 2683, 2687, 2691, 2695, 2699, 2703, +- 2707, 2711, 2715, 2719, 2724, 2728, 2732, 2736, 2740, 2744, +- 2748, 2752, 2756, 2760, 2764, 2768, 2772, 2776, 2780, 2784, +- 2788, 2792, 2796, 2800, 2804, 2808, 2812, 2816, 2820, 2824, +- 2828, 2832, 2836, 2840, 2844, 2848, 2852, 2856, 2860, 2864, +- 2868, 2872, 2876, 2880, 2884, 2888, 2892, 2896, 2900, 2904, +- 2908, 2912, 2916, 2920, 2924, 2928, 2932, 2936, 2940, 2944, +- 2948, 2952, 2956, 2960, 2964, 2968, 2972, 2976, 2980, 2984, +- 2988, 2992, 2996, 3003, 3007, 3011, 3015, 3019, 3026, 3031, +- 3036, 3042 ++ 0, 714, 714, 718, 719, 722, 727, 733, 739, 743, ++ 747, 753, 759, 765, 771, 776, 781, 787, 794, 798, ++ 802, 808, 812, 816, 821, 826, 831, 836, 840, 847, ++ 851, 858, 864, 874, 883, 893, 902, 915, 919, 923, ++ 927, 931, 935, 939, 943, 947, 951, 956, 960, 964, ++ 968, 972, 976, 981, 986, 990, 994, 998, 1002, 1006, ++ 1010, 1014, 1018, 1022, 1026, 1030, 1034, 1038, 1042, 1046, ++ 1050, 1054, 1058, 1062, 1076, 1077, 1107, 1126, 1145, 1173, ++ 1230, 1237, 1241, 1245, 1249, 1253, 1257, 1261, 1265, 1274, ++ 1278, 1283, 1286, 1291, 1296, 1301, 1306, 1309, 1314, 1317, ++ 1322, 1327, 1330, 1335, 1340, 1345, 1350, 1355, 1360, 1365, ++ 1368, 1373, 1378, 1383, 1388, 1391, 1396, 1401, 1406, 1419, ++ 1432, 1445, 1458, 1471, 1497, 1525, 1537, 1557, 1584, 1589, ++ 1595, 1600, 1605, 1614, 1619, 1623, 1627, 1631, 1635, 1639, ++ 1643, 1648, 1653, 1665, 1671, 1675, 1679, 1690, 1699, 1700, ++ 1707, 1712, 1717, 1771, 1778, 1786, 1823, 1827, 1834, 1839, ++ 1845, 1851, 1857, 1864, 1874, 1878, 1882, 1886, 1890, 1894, ++ 1898, 1902, 1906, 1910, 1914, 1918, 1922, 1926, 1930, 1934, ++ 1938, 1942, 1946, 1950, 1954, 1958, 1962, 1966, 1970, 1974, ++ 1978, 1982, 1986, 1990, 1994, 1998, 2002, 2006, 2010, 2014, ++ 2018, 2022, 2026, 2030, 2034, 2038, 2042, 2046, 2050, 2054, ++ 2058, 2062, 2066, 2070, 2074, 2078, 2082, 2086, 2090, 2094, ++ 2098, 2102, 2106, 2110, 2114, 2118, 2122, 2126, 2130, 2134, ++ 2138, 2142, 2146, 2150, 2154, 2158, 2162, 2166, 2170, 2174, ++ 2178, 2182, 2186, 2190, 2194, 2198, 2202, 2206, 2210, 2214, ++ 2218, 2222, 2226, 2230, 2234, 2238, 2242, 2247, 2251, 2255, ++ 2260, 2264, 2268, 2273, 2278, 2282, 2286, 2290, 2294, 2298, ++ 2302, 2306, 2310, 2314, 2318, 2322, 2326, 2330, 2334, 2338, ++ 2342, 2346, 2350, 2354, 2358, 2362, 2366, 2370, 2374, 2378, ++ 2382, 2386, 2390, 2394, 2398, 2402, 2406, 2410, 2414, 2418, ++ 2422, 2426, 2430, 2434, 2438, 2442, 2446, 2450, 2454, 2458, ++ 2462, 2466, 2470, 2474, 2478, 2482, 2486, 2490, 2494, 2498, ++ 2502, 2506, 2510, 2514, 2518, 2526, 2533, 2540, 2547, 2554, ++ 2561, 2568, 2575, 2582, 2589, 2596, 2603, 2613, 2617, 2621, ++ 2625, 2629, 2633, 2637, 2641, 2646, 2650, 2655, 2659, 2663, ++ 2667, 2671, 2676, 2681, 2685, 2689, 2693, 2697, 2701, 2705, ++ 2709, 2713, 2717, 2721, 2725, 2729, 2733, 2738, 2742, 2746, ++ 2750, 2754, 2758, 2762, 2766, 2770, 2774, 2778, 2782, 2786, ++ 2790, 2794, 2798, 2802, 2806, 2810, 2814, 2818, 2822, 2826, ++ 2830, 2834, 2838, 2842, 2846, 2850, 2854, 2858, 2862, 2866, ++ 2870, 2874, 2878, 2882, 2886, 2890, 2894, 2898, 2902, 2906, ++ 2910, 2914, 2918, 2922, 2926, 2930, 2934, 2938, 2942, 2946, ++ 2950, 2954, 2958, 2962, 2966, 2970, 2974, 2978, 2982, 2986, ++ 2990, 2994, 2998, 3002, 3006, 3010, 3017, 3021, 3025, 3029, ++ 3033, 3040, 3045, 3050, 3056 + }; + + void +@@ -7223,9 +7265,9 @@ namespace yy { + + + } // yy +-#line 7227 "seclang-parser.cc" ++#line 7269 "seclang-parser.cc" + +-#line 3049 "seclang-parser.yy" ++#line 3063 "seclang-parser.yy" + + + void yy::seclang_parser::error (const location_type& l, const std::string& m) { +diff --git a/src/parser/seclang-parser.hh b/src/parser/seclang-parser.hh +index 8cdbe22e..360ae8c3 100644 +--- a/src/parser/seclang-parser.hh ++++ b/src/parser/seclang-parser.hh +@@ -256,6 +256,7 @@ class Driver; + #include "src/variables/request_body_length.h" + #include "src/variables/request_cookies.h" + #include "src/variables/request_cookies_names.h" ++#include "src/variables/multipart_part_headers.h" + #include "src/variables/request_file_name.h" + #include "src/variables/request_headers.h" + #include "src/variables/request_headers_names.h" +@@ -351,7 +352,7 @@ using namespace modsecurity::operators; + a = std::move(c); + + +-#line 355 "seclang-parser.hh" ++#line 356 "seclang-parser.hh" + + # include + # include // std::abort +@@ -485,7 +486,7 @@ using namespace modsecurity::operators; + #endif + + namespace yy { +-#line 489 "seclang-parser.hh" ++#line 490 "seclang-parser.hh" + + + +@@ -995,324 +996,325 @@ namespace yy { + TOK_VARIABLE_RESPONSE_HEADERS = 278, // VARIABLE_RESPONSE_HEADERS + TOK_VARIABLE_GEO = 279, // VARIABLE_GEO + TOK_VARIABLE_REQUEST_COOKIES_NAMES = 280, // VARIABLE_REQUEST_COOKIES_NAMES +- TOK_VARIABLE_ARGS_COMBINED_SIZE = 281, // VARIABLE_ARGS_COMBINED_SIZE +- TOK_VARIABLE_ARGS_GET_NAMES = 282, // VARIABLE_ARGS_GET_NAMES +- TOK_VARIABLE_RULE = 283, // VARIABLE_RULE +- TOK_VARIABLE_ARGS_NAMES = 284, // "Variable ARGS_NAMES" +- TOK_VARIABLE_ARGS_POST_NAMES = 285, // VARIABLE_ARGS_POST_NAMES +- TOK_VARIABLE_AUTH_TYPE = 286, // "AUTH_TYPE" +- TOK_VARIABLE_FILES_COMBINED_SIZE = 287, // "FILES_COMBINED_SIZE" +- TOK_VARIABLE_FILES_TMP_NAMES = 288, // "FILES_TMPNAMES" +- TOK_VARIABLE_FULL_REQUEST = 289, // "FULL_REQUEST" +- TOK_VARIABLE_FULL_REQUEST_LENGTH = 290, // "FULL_REQUEST_LENGTH" +- TOK_VARIABLE_INBOUND_DATA_ERROR = 291, // "INBOUND_DATA_ERROR" +- TOK_VARIABLE_MATCHED_VAR = 292, // "MATCHED_VAR" +- TOK_VARIABLE_MATCHED_VAR_NAME = 293, // "MATCHED_VAR_NAME" +- TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 294, // VARIABLE_MULTIPART_BOUNDARY_QUOTED +- TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 295, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE +- TOK_VARIABLE_MULTIPART_CRLF_LF_LINES = 296, // "MULTIPART_CRLF_LF_LINES" +- TOK_VARIABLE_MULTIPART_DATA_AFTER = 297, // "MULTIPART_DATA_AFTER" +- TOK_VARIABLE_MULTIPART_DATA_BEFORE = 298, // VARIABLE_MULTIPART_DATA_BEFORE +- TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 299, // "MULTIPART_FILE_LIMIT_EXCEEDED" +- TOK_VARIABLE_MULTIPART_HEADER_FOLDING = 300, // "MULTIPART_HEADER_FOLDING" +- TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 301, // "MULTIPART_INVALID_HEADER_FOLDING" +- TOK_VARIABLE_MULTIPART_INVALID_PART = 302, // VARIABLE_MULTIPART_INVALID_PART +- TOK_VARIABLE_MULTIPART_INVALID_QUOTING = 303, // "MULTIPART_INVALID_QUOTING" +- TOK_VARIABLE_MULTIPART_LF_LINE = 304, // VARIABLE_MULTIPART_LF_LINE +- TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON = 305, // VARIABLE_MULTIPART_MISSING_SEMICOLON +- TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING = 306, // VARIABLE_MULTIPART_SEMICOLON_MISSING +- TOK_VARIABLE_MULTIPART_STRICT_ERROR = 307, // "MULTIPART_STRICT_ERROR" +- TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 308, // "MULTIPART_UNMATCHED_BOUNDARY" +- TOK_VARIABLE_OUTBOUND_DATA_ERROR = 309, // "OUTBOUND_DATA_ERROR" +- TOK_VARIABLE_PATH_INFO = 310, // "PATH_INFO" +- TOK_VARIABLE_QUERY_STRING = 311, // "QUERY_STRING" +- TOK_VARIABLE_REMOTE_ADDR = 312, // "REMOTE_ADDR" +- TOK_VARIABLE_REMOTE_HOST = 313, // "REMOTE_HOST" +- TOK_VARIABLE_REMOTE_PORT = 314, // "REMOTE_PORT" +- TOK_VARIABLE_REQBODY_ERROR_MSG = 315, // "REQBODY_ERROR_MSG" +- TOK_VARIABLE_REQBODY_ERROR = 316, // "REQBODY_ERROR" +- TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 317, // "REQBODY_PROCESSOR_ERROR_MSG" +- TOK_VARIABLE_REQBODY_PROCESSOR_ERROR = 318, // "REQBODY_PROCESSOR_ERROR" +- TOK_VARIABLE_REQBODY_PROCESSOR = 319, // "REQBODY_PROCESSOR" +- TOK_VARIABLE_REQUEST_BASENAME = 320, // "REQUEST_BASENAME" +- TOK_VARIABLE_REQUEST_BODY_LENGTH = 321, // "REQUEST_BODY_LENGTH" +- TOK_VARIABLE_REQUEST_BODY = 322, // "REQUEST_BODY" +- TOK_VARIABLE_REQUEST_FILE_NAME = 323, // "REQUEST_FILENAME" +- TOK_VARIABLE_REQUEST_HEADERS_NAMES = 324, // VARIABLE_REQUEST_HEADERS_NAMES +- TOK_VARIABLE_REQUEST_LINE = 325, // "REQUEST_LINE" +- TOK_VARIABLE_REQUEST_METHOD = 326, // "REQUEST_METHOD" +- TOK_VARIABLE_REQUEST_PROTOCOL = 327, // "REQUEST_PROTOCOL" +- TOK_VARIABLE_REQUEST_URI_RAW = 328, // "REQUEST_URI_RAW" +- TOK_VARIABLE_REQUEST_URI = 329, // "REQUEST_URI" +- TOK_VARIABLE_RESOURCE = 330, // "RESOURCE" +- TOK_VARIABLE_RESPONSE_BODY = 331, // "RESPONSE_BODY" +- TOK_VARIABLE_RESPONSE_CONTENT_LENGTH = 332, // "RESPONSE_CONTENT_LENGTH" +- TOK_VARIABLE_RESPONSE_CONTENT_TYPE = 333, // VARIABLE_RESPONSE_CONTENT_TYPE +- TOK_VARIABLE_RESPONSE_HEADERS_NAMES = 334, // VARIABLE_RESPONSE_HEADERS_NAMES +- TOK_VARIABLE_RESPONSE_PROTOCOL = 335, // "RESPONSE_PROTOCOL" +- TOK_VARIABLE_RESPONSE_STATUS = 336, // "RESPONSE_STATUS" +- TOK_VARIABLE_SERVER_ADDR = 337, // "SERVER_ADDR" +- TOK_VARIABLE_SERVER_NAME = 338, // "SERVER_NAME" +- TOK_VARIABLE_SERVER_PORT = 339, // "SERVER_PORT" +- TOK_VARIABLE_SESSION_ID = 340, // "SESSIONID" +- TOK_VARIABLE_UNIQUE_ID = 341, // "UNIQUE_ID" +- TOK_VARIABLE_URL_ENCODED_ERROR = 342, // "URLENCODED_ERROR" +- TOK_VARIABLE_USER_ID = 343, // "USERID" +- TOK_VARIABLE_WEB_APP_ID = 344, // "WEBAPPID" +- TOK_VARIABLE_STATUS = 345, // "VARIABLE_STATUS" +- TOK_VARIABLE_STATUS_LINE = 346, // "VARIABLE_STATUS_LINE" +- TOK_VARIABLE_IP = 347, // "VARIABLE_IP" +- TOK_VARIABLE_GLOBAL = 348, // "VARIABLE_GLOBAL" +- TOK_VARIABLE_TX = 349, // "VARIABLE_TX" +- TOK_VARIABLE_SESSION = 350, // "VARIABLE_SESSION" +- TOK_VARIABLE_USER = 351, // "VARIABLE_USER" +- TOK_RUN_TIME_VAR_ENV = 352, // "RUN_TIME_VAR_ENV" +- TOK_RUN_TIME_VAR_XML = 353, // "RUN_TIME_VAR_XML" +- TOK_ACTION_SETVAR = 354, // "SetVar" +- TOK_SETVAR_OPERATION_EQUALS = 355, // SETVAR_OPERATION_EQUALS +- TOK_SETVAR_OPERATION_EQUALS_PLUS = 356, // SETVAR_OPERATION_EQUALS_PLUS +- TOK_SETVAR_OPERATION_EQUALS_MINUS = 357, // SETVAR_OPERATION_EQUALS_MINUS +- TOK_NOT = 358, // "NOT" +- TOK_OPERATOR_BEGINS_WITH = 359, // "OPERATOR_BEGINS_WITH" +- TOK_OPERATOR_CONTAINS = 360, // "OPERATOR_CONTAINS" +- TOK_OPERATOR_CONTAINS_WORD = 361, // "OPERATOR_CONTAINS_WORD" +- TOK_OPERATOR_DETECT_SQLI = 362, // "OPERATOR_DETECT_SQLI" +- TOK_OPERATOR_DETECT_XSS = 363, // "OPERATOR_DETECT_XSS" +- TOK_OPERATOR_ENDS_WITH = 364, // "OPERATOR_ENDS_WITH" +- TOK_OPERATOR_EQ = 365, // "OPERATOR_EQ" +- TOK_OPERATOR_FUZZY_HASH = 366, // "OPERATOR_FUZZY_HASH" +- TOK_OPERATOR_GEOLOOKUP = 367, // "OPERATOR_GEOLOOKUP" +- TOK_OPERATOR_GE = 368, // "OPERATOR_GE" +- TOK_OPERATOR_GSB_LOOKUP = 369, // "OPERATOR_GSB_LOOKUP" +- TOK_OPERATOR_GT = 370, // "OPERATOR_GT" +- TOK_OPERATOR_INSPECT_FILE = 371, // "OPERATOR_INSPECT_FILE" +- TOK_OPERATOR_IP_MATCH_FROM_FILE = 372, // "OPERATOR_IP_MATCH_FROM_FILE" +- TOK_OPERATOR_IP_MATCH = 373, // "OPERATOR_IP_MATCH" +- TOK_OPERATOR_LE = 374, // "OPERATOR_LE" +- TOK_OPERATOR_LT = 375, // "OPERATOR_LT" +- TOK_OPERATOR_PM_FROM_FILE = 376, // "OPERATOR_PM_FROM_FILE" +- TOK_OPERATOR_PM = 377, // "OPERATOR_PM" +- TOK_OPERATOR_RBL = 378, // "OPERATOR_RBL" +- TOK_OPERATOR_RSUB = 379, // "OPERATOR_RSUB" +- TOK_OPERATOR_RX_CONTENT_ONLY = 380, // "Operator RX (content only)" +- TOK_OPERATOR_RX = 381, // "OPERATOR_RX" +- TOK_OPERATOR_RX_GLOBAL = 382, // "OPERATOR_RX_GLOBAL" +- TOK_OPERATOR_STR_EQ = 383, // "OPERATOR_STR_EQ" +- TOK_OPERATOR_STR_MATCH = 384, // "OPERATOR_STR_MATCH" +- TOK_OPERATOR_UNCONDITIONAL_MATCH = 385, // "OPERATOR_UNCONDITIONAL_MATCH" +- TOK_OPERATOR_VALIDATE_BYTE_RANGE = 386, // "OPERATOR_VALIDATE_BYTE_RANGE" +- TOK_OPERATOR_VALIDATE_DTD = 387, // "OPERATOR_VALIDATE_DTD" +- TOK_OPERATOR_VALIDATE_HASH = 388, // "OPERATOR_VALIDATE_HASH" +- TOK_OPERATOR_VALIDATE_SCHEMA = 389, // "OPERATOR_VALIDATE_SCHEMA" +- TOK_OPERATOR_VALIDATE_URL_ENCODING = 390, // "OPERATOR_VALIDATE_URL_ENCODING" +- TOK_OPERATOR_VALIDATE_UTF8_ENCODING = 391, // "OPERATOR_VALIDATE_UTF8_ENCODING" +- TOK_OPERATOR_VERIFY_CC = 392, // "OPERATOR_VERIFY_CC" +- TOK_OPERATOR_VERIFY_CPF = 393, // "OPERATOR_VERIFY_CPF" +- TOK_OPERATOR_VERIFY_SSN = 394, // "OPERATOR_VERIFY_SSN" +- TOK_OPERATOR_VERIFY_SVNR = 395, // "OPERATOR_VERIFY_SVNR" +- TOK_OPERATOR_WITHIN = 396, // "OPERATOR_WITHIN" +- TOK_CONFIG_DIR_AUDIT_LOG_FMT = 397, // CONFIG_DIR_AUDIT_LOG_FMT +- TOK_JSON = 398, // JSON +- TOK_NATIVE = 399, // NATIVE +- TOK_ACTION_CTL_RULE_ENGINE = 400, // "ACTION_CTL_RULE_ENGINE" +- TOK_ACTION_ACCURACY = 401, // "Accuracy" +- TOK_ACTION_ALLOW = 402, // "Allow" +- TOK_ACTION_APPEND = 403, // "Append" +- TOK_ACTION_AUDIT_LOG = 404, // "AuditLog" +- TOK_ACTION_BLOCK = 405, // "Block" +- TOK_ACTION_CAPTURE = 406, // "Capture" +- TOK_ACTION_CHAIN = 407, // "Chain" +- TOK_ACTION_CTL_AUDIT_ENGINE = 408, // "ACTION_CTL_AUDIT_ENGINE" +- TOK_ACTION_CTL_AUDIT_LOG_PARTS = 409, // "ACTION_CTL_AUDIT_LOG_PARTS" +- TOK_ACTION_CTL_BDY_JSON = 410, // "ACTION_CTL_BDY_JSON" +- TOK_ACTION_CTL_BDY_XML = 411, // "ACTION_CTL_BDY_XML" +- TOK_ACTION_CTL_BDY_URLENCODED = 412, // "ACTION_CTL_BDY_URLENCODED" +- TOK_ACTION_CTL_FORCE_REQ_BODY_VAR = 413, // "ACTION_CTL_FORCE_REQ_BODY_VAR" +- TOK_ACTION_CTL_REQUEST_BODY_ACCESS = 414, // "ACTION_CTL_REQUEST_BODY_ACCESS" +- TOK_ACTION_CTL_RULE_REMOVE_BY_ID = 415, // "ACTION_CTL_RULE_REMOVE_BY_ID" +- TOK_ACTION_CTL_RULE_REMOVE_BY_TAG = 416, // "ACTION_CTL_RULE_REMOVE_BY_TAG" +- TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 417, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" +- TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 418, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" +- TOK_ACTION_DENY = 419, // "Deny" +- TOK_ACTION_DEPRECATE_VAR = 420, // "DeprecateVar" +- TOK_ACTION_DROP = 421, // "Drop" +- TOK_ACTION_EXEC = 422, // "Exec" +- TOK_ACTION_EXPIRE_VAR = 423, // "ExpireVar" +- TOK_ACTION_ID = 424, // "Id" +- TOK_ACTION_INITCOL = 425, // "InitCol" +- TOK_ACTION_LOG = 426, // "Log" +- TOK_ACTION_LOG_DATA = 427, // "LogData" +- TOK_ACTION_MATURITY = 428, // "Maturity" +- TOK_ACTION_MSG = 429, // "Msg" +- TOK_ACTION_MULTI_MATCH = 430, // "MultiMatch" +- TOK_ACTION_NO_AUDIT_LOG = 431, // "NoAuditLog" +- TOK_ACTION_NO_LOG = 432, // "NoLog" +- TOK_ACTION_PASS = 433, // "Pass" +- TOK_ACTION_PAUSE = 434, // "Pause" +- TOK_ACTION_PHASE = 435, // "Phase" +- TOK_ACTION_PREPEND = 436, // "Prepend" +- TOK_ACTION_PROXY = 437, // "Proxy" +- TOK_ACTION_REDIRECT = 438, // "Redirect" +- TOK_ACTION_REV = 439, // "Rev" +- TOK_ACTION_SANITISE_ARG = 440, // "SanitiseArg" +- TOK_ACTION_SANITISE_MATCHED = 441, // "SanitiseMatched" +- TOK_ACTION_SANITISE_MATCHED_BYTES = 442, // "SanitiseMatchedBytes" +- TOK_ACTION_SANITISE_REQUEST_HEADER = 443, // "SanitiseRequestHeader" +- TOK_ACTION_SANITISE_RESPONSE_HEADER = 444, // "SanitiseResponseHeader" +- TOK_ACTION_SETENV = 445, // "SetEnv" +- TOK_ACTION_SETRSC = 446, // "SetRsc" +- TOK_ACTION_SETSID = 447, // "SetSid" +- TOK_ACTION_SETUID = 448, // "SetUID" +- TOK_ACTION_SEVERITY = 449, // "Severity" +- TOK_ACTION_SKIP = 450, // "Skip" +- TOK_ACTION_SKIP_AFTER = 451, // "SkipAfter" +- TOK_ACTION_STATUS = 452, // "Status" +- TOK_ACTION_TAG = 453, // "Tag" +- TOK_ACTION_TRANSFORMATION_BASE_64_ENCODE = 454, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" +- TOK_ACTION_TRANSFORMATION_BASE_64_DECODE = 455, // "ACTION_TRANSFORMATION_BASE_64_DECODE" +- TOK_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 456, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" +- TOK_ACTION_TRANSFORMATION_CMD_LINE = 457, // "ACTION_TRANSFORMATION_CMD_LINE" +- TOK_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 458, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" +- TOK_ACTION_TRANSFORMATION_CSS_DECODE = 459, // "ACTION_TRANSFORMATION_CSS_DECODE" +- TOK_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 460, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" +- TOK_ACTION_TRANSFORMATION_HEX_ENCODE = 461, // "ACTION_TRANSFORMATION_HEX_ENCODE" +- TOK_ACTION_TRANSFORMATION_HEX_DECODE = 462, // "ACTION_TRANSFORMATION_HEX_DECODE" +- TOK_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 463, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" +- TOK_ACTION_TRANSFORMATION_JS_DECODE = 464, // "ACTION_TRANSFORMATION_JS_DECODE" +- TOK_ACTION_TRANSFORMATION_LENGTH = 465, // "ACTION_TRANSFORMATION_LENGTH" +- TOK_ACTION_TRANSFORMATION_LOWERCASE = 466, // "ACTION_TRANSFORMATION_LOWERCASE" +- TOK_ACTION_TRANSFORMATION_MD5 = 467, // "ACTION_TRANSFORMATION_MD5" +- TOK_ACTION_TRANSFORMATION_NONE = 468, // "ACTION_TRANSFORMATION_NONE" +- TOK_ACTION_TRANSFORMATION_NORMALISE_PATH = 469, // "ACTION_TRANSFORMATION_NORMALISE_PATH" +- TOK_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 470, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" +- TOK_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 471, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" +- TOK_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 472, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" +- TOK_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 473, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" +- TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 474, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" +- TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 475, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" +- TOK_ACTION_TRANSFORMATION_REMOVE_NULLS = 476, // "ACTION_TRANSFORMATION_REMOVE_NULLS" +- TOK_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 477, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" +- TOK_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 478, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" +- TOK_ACTION_TRANSFORMATION_REPLACE_NULLS = 479, // "ACTION_TRANSFORMATION_REPLACE_NULLS" +- TOK_ACTION_TRANSFORMATION_SHA1 = 480, // "ACTION_TRANSFORMATION_SHA1" +- TOK_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 481, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" +- TOK_ACTION_TRANSFORMATION_TRIM = 482, // "ACTION_TRANSFORMATION_TRIM" +- TOK_ACTION_TRANSFORMATION_TRIM_LEFT = 483, // "ACTION_TRANSFORMATION_TRIM_LEFT" +- TOK_ACTION_TRANSFORMATION_TRIM_RIGHT = 484, // "ACTION_TRANSFORMATION_TRIM_RIGHT" +- TOK_ACTION_TRANSFORMATION_UPPERCASE = 485, // "ACTION_TRANSFORMATION_UPPERCASE" +- TOK_ACTION_TRANSFORMATION_URL_ENCODE = 486, // "ACTION_TRANSFORMATION_URL_ENCODE" +- TOK_ACTION_TRANSFORMATION_URL_DECODE = 487, // "ACTION_TRANSFORMATION_URL_DECODE" +- TOK_ACTION_TRANSFORMATION_URL_DECODE_UNI = 488, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" +- TOK_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 489, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" +- TOK_ACTION_VER = 490, // "Ver" +- TOK_ACTION_XMLNS = 491, // "xmlns" +- TOK_CONFIG_COMPONENT_SIG = 492, // "CONFIG_COMPONENT_SIG" +- TOK_CONFIG_CONN_ENGINE = 493, // "CONFIG_CONN_ENGINE" +- TOK_CONFIG_SEC_ARGUMENT_SEPARATOR = 494, // "CONFIG_SEC_ARGUMENT_SEPARATOR" +- TOK_CONFIG_SEC_WEB_APP_ID = 495, // "CONFIG_SEC_WEB_APP_ID" +- TOK_CONFIG_SEC_SERVER_SIG = 496, // "CONFIG_SEC_SERVER_SIG" +- TOK_CONFIG_DIR_AUDIT_DIR = 497, // "CONFIG_DIR_AUDIT_DIR" +- TOK_CONFIG_DIR_AUDIT_DIR_MOD = 498, // "CONFIG_DIR_AUDIT_DIR_MOD" +- TOK_CONFIG_DIR_AUDIT_ENG = 499, // "CONFIG_DIR_AUDIT_ENG" +- TOK_CONFIG_DIR_AUDIT_FLE_MOD = 500, // "CONFIG_DIR_AUDIT_FLE_MOD" +- TOK_CONFIG_DIR_AUDIT_LOG = 501, // "CONFIG_DIR_AUDIT_LOG" +- TOK_CONFIG_DIR_AUDIT_LOG2 = 502, // "CONFIG_DIR_AUDIT_LOG2" +- TOK_CONFIG_DIR_AUDIT_LOG_P = 503, // "CONFIG_DIR_AUDIT_LOG_P" +- TOK_CONFIG_DIR_AUDIT_STS = 504, // "CONFIG_DIR_AUDIT_STS" +- TOK_CONFIG_DIR_AUDIT_TPE = 505, // "CONFIG_DIR_AUDIT_TPE" +- TOK_CONFIG_DIR_DEBUG_LOG = 506, // "CONFIG_DIR_DEBUG_LOG" +- TOK_CONFIG_DIR_DEBUG_LVL = 507, // "CONFIG_DIR_DEBUG_LVL" +- TOK_CONFIG_SEC_CACHE_TRANSFORMATIONS = 508, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" +- TOK_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 509, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" +- TOK_CONFIG_SEC_HASH_ENGINE = 510, // "CONFIG_SEC_HASH_ENGINE" +- TOK_CONFIG_SEC_HASH_KEY = 511, // "CONFIG_SEC_HASH_KEY" +- TOK_CONFIG_SEC_HASH_PARAM = 512, // "CONFIG_SEC_HASH_PARAM" +- TOK_CONFIG_SEC_HASH_METHOD_RX = 513, // "CONFIG_SEC_HASH_METHOD_RX" +- TOK_CONFIG_SEC_HASH_METHOD_PM = 514, // "CONFIG_SEC_HASH_METHOD_PM" +- TOK_CONFIG_SEC_CHROOT_DIR = 515, // "CONFIG_SEC_CHROOT_DIR" +- TOK_CONFIG_DIR_GEO_DB = 516, // "CONFIG_DIR_GEO_DB" +- TOK_CONFIG_DIR_GSB_DB = 517, // "CONFIG_DIR_GSB_DB" +- TOK_CONFIG_SEC_GUARDIAN_LOG = 518, // "CONFIG_SEC_GUARDIAN_LOG" +- TOK_CONFIG_DIR_PCRE_MATCH_LIMIT = 519, // "CONFIG_DIR_PCRE_MATCH_LIMIT" +- TOK_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 520, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" +- TOK_CONFIG_SEC_CONN_R_STATE_LIMIT = 521, // "CONFIG_SEC_CONN_R_STATE_LIMIT" +- TOK_CONFIG_SEC_CONN_W_STATE_LIMIT = 522, // "CONFIG_SEC_CONN_W_STATE_LIMIT" +- TOK_CONFIG_SEC_SENSOR_ID = 523, // "CONFIG_SEC_SENSOR_ID" +- TOK_CONFIG_DIR_ARGS_LIMIT = 524, // "CONFIG_DIR_ARGS_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 525, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY = 526, // "CONFIG_DIR_REQ_BODY" +- TOK_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 527, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY_LIMIT = 528, // "CONFIG_DIR_REQ_BODY_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 529, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" +- TOK_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 530, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" +- TOK_CONFIG_DIR_RES_BODY = 531, // "CONFIG_DIR_RES_BODY" +- TOK_CONFIG_DIR_RES_BODY_LIMIT = 532, // "CONFIG_DIR_RES_BODY_LIMIT" +- TOK_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 533, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" +- TOK_CONFIG_SEC_RULE_INHERITANCE = 534, // "CONFIG_SEC_RULE_INHERITANCE" +- TOK_CONFIG_SEC_RULE_PERF_TIME = 535, // "CONFIG_SEC_RULE_PERF_TIME" +- TOK_CONFIG_DIR_RULE_ENG = 536, // "CONFIG_DIR_RULE_ENG" +- TOK_CONFIG_DIR_SEC_ACTION = 537, // "CONFIG_DIR_SEC_ACTION" +- TOK_CONFIG_DIR_SEC_DEFAULT_ACTION = 538, // "CONFIG_DIR_SEC_DEFAULT_ACTION" +- TOK_CONFIG_DIR_SEC_MARKER = 539, // "CONFIG_DIR_SEC_MARKER" +- TOK_CONFIG_DIR_UNICODE_MAP_FILE = 540, // "CONFIG_DIR_UNICODE_MAP_FILE" +- TOK_CONFIG_DIR_UNICODE_CODE_PAGE = 541, // "CONFIG_DIR_UNICODE_CODE_PAGE" +- TOK_CONFIG_SEC_COLLECTION_TIMEOUT = 542, // "CONFIG_SEC_COLLECTION_TIMEOUT" +- TOK_CONFIG_SEC_HTTP_BLKEY = 543, // "CONFIG_SEC_HTTP_BLKEY" +- TOK_CONFIG_SEC_INTERCEPT_ON_ERROR = 544, // "CONFIG_SEC_INTERCEPT_ON_ERROR" +- TOK_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 545, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" +- TOK_CONFIG_SEC_RULE_REMOVE_BY_ID = 546, // "CONFIG_SEC_RULE_REMOVE_BY_ID" +- TOK_CONFIG_SEC_RULE_REMOVE_BY_MSG = 547, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" +- TOK_CONFIG_SEC_RULE_REMOVE_BY_TAG = 548, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" +- TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 549, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" +- TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 550, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" +- TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 551, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" +- TOK_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 552, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" +- TOK_CONFIG_UPDLOAD_KEEP_FILES = 553, // "CONFIG_UPDLOAD_KEEP_FILES" +- TOK_CONFIG_UPDLOAD_SAVE_TMP_FILES = 554, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" +- TOK_CONFIG_UPLOAD_DIR = 555, // "CONFIG_UPLOAD_DIR" +- TOK_CONFIG_UPLOAD_FILE_LIMIT = 556, // "CONFIG_UPLOAD_FILE_LIMIT" +- TOK_CONFIG_UPLOAD_FILE_MODE = 557, // "CONFIG_UPLOAD_FILE_MODE" +- TOK_CONFIG_VALUE_ABORT = 558, // "CONFIG_VALUE_ABORT" +- TOK_CONFIG_VALUE_DETC = 559, // "CONFIG_VALUE_DETC" +- TOK_CONFIG_VALUE_HTTPS = 560, // "CONFIG_VALUE_HTTPS" +- TOK_CONFIG_VALUE_OFF = 561, // "CONFIG_VALUE_OFF" +- TOK_CONFIG_VALUE_ON = 562, // "CONFIG_VALUE_ON" +- TOK_CONFIG_VALUE_PARALLEL = 563, // "CONFIG_VALUE_PARALLEL" +- TOK_CONFIG_VALUE_PROCESS_PARTIAL = 564, // "CONFIG_VALUE_PROCESS_PARTIAL" +- TOK_CONFIG_VALUE_REJECT = 565, // "CONFIG_VALUE_REJECT" +- TOK_CONFIG_VALUE_RELEVANT_ONLY = 566, // "CONFIG_VALUE_RELEVANT_ONLY" +- TOK_CONFIG_VALUE_SERIAL = 567, // "CONFIG_VALUE_SERIAL" +- TOK_CONFIG_VALUE_WARN = 568, // "CONFIG_VALUE_WARN" +- TOK_CONFIG_XML_EXTERNAL_ENTITY = 569, // "CONFIG_XML_EXTERNAL_ENTITY" +- TOK_CONGIG_DIR_RESPONSE_BODY_MP = 570, // "CONGIG_DIR_RESPONSE_BODY_MP" +- TOK_CONGIG_DIR_SEC_ARG_SEP = 571, // "CONGIG_DIR_SEC_ARG_SEP" +- TOK_CONGIG_DIR_SEC_COOKIE_FORMAT = 572, // "CONGIG_DIR_SEC_COOKIE_FORMAT" +- TOK_CONFIG_SEC_COOKIEV0_SEPARATOR = 573, // "CONFIG_SEC_COOKIEV0_SEPARATOR" +- TOK_CONGIG_DIR_SEC_DATA_DIR = 574, // "CONGIG_DIR_SEC_DATA_DIR" +- TOK_CONGIG_DIR_SEC_STATUS_ENGINE = 575, // "CONGIG_DIR_SEC_STATUS_ENGINE" +- TOK_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 576, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" +- TOK_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 577, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" +- TOK_CONGIG_DIR_SEC_TMP_DIR = 578, // "CONGIG_DIR_SEC_TMP_DIR" +- TOK_DIRECTIVE = 579, // "DIRECTIVE" +- TOK_DIRECTIVE_SECRULESCRIPT = 580, // "DIRECTIVE_SECRULESCRIPT" +- TOK_FREE_TEXT_QUOTE_MACRO_EXPANSION = 581, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" +- TOK_QUOTATION_MARK = 582, // "QUOTATION_MARK" +- TOK_RUN_TIME_VAR_BLD = 583, // "RUN_TIME_VAR_BLD" +- TOK_RUN_TIME_VAR_DUR = 584, // "RUN_TIME_VAR_DUR" +- TOK_RUN_TIME_VAR_HSV = 585, // "RUN_TIME_VAR_HSV" +- TOK_RUN_TIME_VAR_REMOTE_USER = 586, // "RUN_TIME_VAR_REMOTE_USER" +- TOK_RUN_TIME_VAR_TIME = 587, // "RUN_TIME_VAR_TIME" +- TOK_RUN_TIME_VAR_TIME_DAY = 588, // "RUN_TIME_VAR_TIME_DAY" +- TOK_RUN_TIME_VAR_TIME_EPOCH = 589, // "RUN_TIME_VAR_TIME_EPOCH" +- TOK_RUN_TIME_VAR_TIME_HOUR = 590, // "RUN_TIME_VAR_TIME_HOUR" +- TOK_RUN_TIME_VAR_TIME_MIN = 591, // "RUN_TIME_VAR_TIME_MIN" +- TOK_RUN_TIME_VAR_TIME_MON = 592, // "RUN_TIME_VAR_TIME_MON" +- TOK_RUN_TIME_VAR_TIME_SEC = 593, // "RUN_TIME_VAR_TIME_SEC" +- TOK_RUN_TIME_VAR_TIME_WDAY = 594, // "RUN_TIME_VAR_TIME_WDAY" +- TOK_RUN_TIME_VAR_TIME_YEAR = 595, // "RUN_TIME_VAR_TIME_YEAR" +- TOK_VARIABLE = 596, // "VARIABLE" +- TOK_DICT_ELEMENT = 597, // "Dictionary element" +- TOK_DICT_ELEMENT_REGEXP = 598 // "Dictionary element, selected by regexp" ++ TOK_VARIABLE_MULTIPART_PART_HEADERS = 281, // VARIABLE_MULTIPART_PART_HEADERS ++ TOK_VARIABLE_ARGS_COMBINED_SIZE = 282, // VARIABLE_ARGS_COMBINED_SIZE ++ TOK_VARIABLE_ARGS_GET_NAMES = 283, // VARIABLE_ARGS_GET_NAMES ++ TOK_VARIABLE_RULE = 284, // VARIABLE_RULE ++ TOK_VARIABLE_ARGS_NAMES = 285, // "Variable ARGS_NAMES" ++ TOK_VARIABLE_ARGS_POST_NAMES = 286, // VARIABLE_ARGS_POST_NAMES ++ TOK_VARIABLE_AUTH_TYPE = 287, // "AUTH_TYPE" ++ TOK_VARIABLE_FILES_COMBINED_SIZE = 288, // "FILES_COMBINED_SIZE" ++ TOK_VARIABLE_FILES_TMP_NAMES = 289, // "FILES_TMPNAMES" ++ TOK_VARIABLE_FULL_REQUEST = 290, // "FULL_REQUEST" ++ TOK_VARIABLE_FULL_REQUEST_LENGTH = 291, // "FULL_REQUEST_LENGTH" ++ TOK_VARIABLE_INBOUND_DATA_ERROR = 292, // "INBOUND_DATA_ERROR" ++ TOK_VARIABLE_MATCHED_VAR = 293, // "MATCHED_VAR" ++ TOK_VARIABLE_MATCHED_VAR_NAME = 294, // "MATCHED_VAR_NAME" ++ TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 295, // VARIABLE_MULTIPART_BOUNDARY_QUOTED ++ TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 296, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE ++ TOK_VARIABLE_MULTIPART_CRLF_LF_LINES = 297, // "MULTIPART_CRLF_LF_LINES" ++ TOK_VARIABLE_MULTIPART_DATA_AFTER = 298, // "MULTIPART_DATA_AFTER" ++ TOK_VARIABLE_MULTIPART_DATA_BEFORE = 299, // VARIABLE_MULTIPART_DATA_BEFORE ++ TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 300, // "MULTIPART_FILE_LIMIT_EXCEEDED" ++ TOK_VARIABLE_MULTIPART_HEADER_FOLDING = 301, // "MULTIPART_HEADER_FOLDING" ++ TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 302, // "MULTIPART_INVALID_HEADER_FOLDING" ++ TOK_VARIABLE_MULTIPART_INVALID_PART = 303, // VARIABLE_MULTIPART_INVALID_PART ++ TOK_VARIABLE_MULTIPART_INVALID_QUOTING = 304, // "MULTIPART_INVALID_QUOTING" ++ TOK_VARIABLE_MULTIPART_LF_LINE = 305, // VARIABLE_MULTIPART_LF_LINE ++ TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON = 306, // VARIABLE_MULTIPART_MISSING_SEMICOLON ++ TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING = 307, // VARIABLE_MULTIPART_SEMICOLON_MISSING ++ TOK_VARIABLE_MULTIPART_STRICT_ERROR = 308, // "MULTIPART_STRICT_ERROR" ++ TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 309, // "MULTIPART_UNMATCHED_BOUNDARY" ++ TOK_VARIABLE_OUTBOUND_DATA_ERROR = 310, // "OUTBOUND_DATA_ERROR" ++ TOK_VARIABLE_PATH_INFO = 311, // "PATH_INFO" ++ TOK_VARIABLE_QUERY_STRING = 312, // "QUERY_STRING" ++ TOK_VARIABLE_REMOTE_ADDR = 313, // "REMOTE_ADDR" ++ TOK_VARIABLE_REMOTE_HOST = 314, // "REMOTE_HOST" ++ TOK_VARIABLE_REMOTE_PORT = 315, // "REMOTE_PORT" ++ TOK_VARIABLE_REQBODY_ERROR_MSG = 316, // "REQBODY_ERROR_MSG" ++ TOK_VARIABLE_REQBODY_ERROR = 317, // "REQBODY_ERROR" ++ TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 318, // "REQBODY_PROCESSOR_ERROR_MSG" ++ TOK_VARIABLE_REQBODY_PROCESSOR_ERROR = 319, // "REQBODY_PROCESSOR_ERROR" ++ TOK_VARIABLE_REQBODY_PROCESSOR = 320, // "REQBODY_PROCESSOR" ++ TOK_VARIABLE_REQUEST_BASENAME = 321, // "REQUEST_BASENAME" ++ TOK_VARIABLE_REQUEST_BODY_LENGTH = 322, // "REQUEST_BODY_LENGTH" ++ TOK_VARIABLE_REQUEST_BODY = 323, // "REQUEST_BODY" ++ TOK_VARIABLE_REQUEST_FILE_NAME = 324, // "REQUEST_FILENAME" ++ TOK_VARIABLE_REQUEST_HEADERS_NAMES = 325, // VARIABLE_REQUEST_HEADERS_NAMES ++ TOK_VARIABLE_REQUEST_LINE = 326, // "REQUEST_LINE" ++ TOK_VARIABLE_REQUEST_METHOD = 327, // "REQUEST_METHOD" ++ TOK_VARIABLE_REQUEST_PROTOCOL = 328, // "REQUEST_PROTOCOL" ++ TOK_VARIABLE_REQUEST_URI_RAW = 329, // "REQUEST_URI_RAW" ++ TOK_VARIABLE_REQUEST_URI = 330, // "REQUEST_URI" ++ TOK_VARIABLE_RESOURCE = 331, // "RESOURCE" ++ TOK_VARIABLE_RESPONSE_BODY = 332, // "RESPONSE_BODY" ++ TOK_VARIABLE_RESPONSE_CONTENT_LENGTH = 333, // "RESPONSE_CONTENT_LENGTH" ++ TOK_VARIABLE_RESPONSE_CONTENT_TYPE = 334, // VARIABLE_RESPONSE_CONTENT_TYPE ++ TOK_VARIABLE_RESPONSE_HEADERS_NAMES = 335, // VARIABLE_RESPONSE_HEADERS_NAMES ++ TOK_VARIABLE_RESPONSE_PROTOCOL = 336, // "RESPONSE_PROTOCOL" ++ TOK_VARIABLE_RESPONSE_STATUS = 337, // "RESPONSE_STATUS" ++ TOK_VARIABLE_SERVER_ADDR = 338, // "SERVER_ADDR" ++ TOK_VARIABLE_SERVER_NAME = 339, // "SERVER_NAME" ++ TOK_VARIABLE_SERVER_PORT = 340, // "SERVER_PORT" ++ TOK_VARIABLE_SESSION_ID = 341, // "SESSIONID" ++ TOK_VARIABLE_UNIQUE_ID = 342, // "UNIQUE_ID" ++ TOK_VARIABLE_URL_ENCODED_ERROR = 343, // "URLENCODED_ERROR" ++ TOK_VARIABLE_USER_ID = 344, // "USERID" ++ TOK_VARIABLE_WEB_APP_ID = 345, // "WEBAPPID" ++ TOK_VARIABLE_STATUS = 346, // "VARIABLE_STATUS" ++ TOK_VARIABLE_STATUS_LINE = 347, // "VARIABLE_STATUS_LINE" ++ TOK_VARIABLE_IP = 348, // "VARIABLE_IP" ++ TOK_VARIABLE_GLOBAL = 349, // "VARIABLE_GLOBAL" ++ TOK_VARIABLE_TX = 350, // "VARIABLE_TX" ++ TOK_VARIABLE_SESSION = 351, // "VARIABLE_SESSION" ++ TOK_VARIABLE_USER = 352, // "VARIABLE_USER" ++ TOK_RUN_TIME_VAR_ENV = 353, // "RUN_TIME_VAR_ENV" ++ TOK_RUN_TIME_VAR_XML = 354, // "RUN_TIME_VAR_XML" ++ TOK_ACTION_SETVAR = 355, // "SetVar" ++ TOK_SETVAR_OPERATION_EQUALS = 356, // SETVAR_OPERATION_EQUALS ++ TOK_SETVAR_OPERATION_EQUALS_PLUS = 357, // SETVAR_OPERATION_EQUALS_PLUS ++ TOK_SETVAR_OPERATION_EQUALS_MINUS = 358, // SETVAR_OPERATION_EQUALS_MINUS ++ TOK_NOT = 359, // "NOT" ++ TOK_OPERATOR_BEGINS_WITH = 360, // "OPERATOR_BEGINS_WITH" ++ TOK_OPERATOR_CONTAINS = 361, // "OPERATOR_CONTAINS" ++ TOK_OPERATOR_CONTAINS_WORD = 362, // "OPERATOR_CONTAINS_WORD" ++ TOK_OPERATOR_DETECT_SQLI = 363, // "OPERATOR_DETECT_SQLI" ++ TOK_OPERATOR_DETECT_XSS = 364, // "OPERATOR_DETECT_XSS" ++ TOK_OPERATOR_ENDS_WITH = 365, // "OPERATOR_ENDS_WITH" ++ TOK_OPERATOR_EQ = 366, // "OPERATOR_EQ" ++ TOK_OPERATOR_FUZZY_HASH = 367, // "OPERATOR_FUZZY_HASH" ++ TOK_OPERATOR_GEOLOOKUP = 368, // "OPERATOR_GEOLOOKUP" ++ TOK_OPERATOR_GE = 369, // "OPERATOR_GE" ++ TOK_OPERATOR_GSB_LOOKUP = 370, // "OPERATOR_GSB_LOOKUP" ++ TOK_OPERATOR_GT = 371, // "OPERATOR_GT" ++ TOK_OPERATOR_INSPECT_FILE = 372, // "OPERATOR_INSPECT_FILE" ++ TOK_OPERATOR_IP_MATCH_FROM_FILE = 373, // "OPERATOR_IP_MATCH_FROM_FILE" ++ TOK_OPERATOR_IP_MATCH = 374, // "OPERATOR_IP_MATCH" ++ TOK_OPERATOR_LE = 375, // "OPERATOR_LE" ++ TOK_OPERATOR_LT = 376, // "OPERATOR_LT" ++ TOK_OPERATOR_PM_FROM_FILE = 377, // "OPERATOR_PM_FROM_FILE" ++ TOK_OPERATOR_PM = 378, // "OPERATOR_PM" ++ TOK_OPERATOR_RBL = 379, // "OPERATOR_RBL" ++ TOK_OPERATOR_RSUB = 380, // "OPERATOR_RSUB" ++ TOK_OPERATOR_RX_CONTENT_ONLY = 381, // "Operator RX (content only)" ++ TOK_OPERATOR_RX = 382, // "OPERATOR_RX" ++ TOK_OPERATOR_RX_GLOBAL = 383, // "OPERATOR_RX_GLOBAL" ++ TOK_OPERATOR_STR_EQ = 384, // "OPERATOR_STR_EQ" ++ TOK_OPERATOR_STR_MATCH = 385, // "OPERATOR_STR_MATCH" ++ TOK_OPERATOR_UNCONDITIONAL_MATCH = 386, // "OPERATOR_UNCONDITIONAL_MATCH" ++ TOK_OPERATOR_VALIDATE_BYTE_RANGE = 387, // "OPERATOR_VALIDATE_BYTE_RANGE" ++ TOK_OPERATOR_VALIDATE_DTD = 388, // "OPERATOR_VALIDATE_DTD" ++ TOK_OPERATOR_VALIDATE_HASH = 389, // "OPERATOR_VALIDATE_HASH" ++ TOK_OPERATOR_VALIDATE_SCHEMA = 390, // "OPERATOR_VALIDATE_SCHEMA" ++ TOK_OPERATOR_VALIDATE_URL_ENCODING = 391, // "OPERATOR_VALIDATE_URL_ENCODING" ++ TOK_OPERATOR_VALIDATE_UTF8_ENCODING = 392, // "OPERATOR_VALIDATE_UTF8_ENCODING" ++ TOK_OPERATOR_VERIFY_CC = 393, // "OPERATOR_VERIFY_CC" ++ TOK_OPERATOR_VERIFY_CPF = 394, // "OPERATOR_VERIFY_CPF" ++ TOK_OPERATOR_VERIFY_SSN = 395, // "OPERATOR_VERIFY_SSN" ++ TOK_OPERATOR_VERIFY_SVNR = 396, // "OPERATOR_VERIFY_SVNR" ++ TOK_OPERATOR_WITHIN = 397, // "OPERATOR_WITHIN" ++ TOK_CONFIG_DIR_AUDIT_LOG_FMT = 398, // CONFIG_DIR_AUDIT_LOG_FMT ++ TOK_JSON = 399, // JSON ++ TOK_NATIVE = 400, // NATIVE ++ TOK_ACTION_CTL_RULE_ENGINE = 401, // "ACTION_CTL_RULE_ENGINE" ++ TOK_ACTION_ACCURACY = 402, // "Accuracy" ++ TOK_ACTION_ALLOW = 403, // "Allow" ++ TOK_ACTION_APPEND = 404, // "Append" ++ TOK_ACTION_AUDIT_LOG = 405, // "AuditLog" ++ TOK_ACTION_BLOCK = 406, // "Block" ++ TOK_ACTION_CAPTURE = 407, // "Capture" ++ TOK_ACTION_CHAIN = 408, // "Chain" ++ TOK_ACTION_CTL_AUDIT_ENGINE = 409, // "ACTION_CTL_AUDIT_ENGINE" ++ TOK_ACTION_CTL_AUDIT_LOG_PARTS = 410, // "ACTION_CTL_AUDIT_LOG_PARTS" ++ TOK_ACTION_CTL_BDY_JSON = 411, // "ACTION_CTL_BDY_JSON" ++ TOK_ACTION_CTL_BDY_XML = 412, // "ACTION_CTL_BDY_XML" ++ TOK_ACTION_CTL_BDY_URLENCODED = 413, // "ACTION_CTL_BDY_URLENCODED" ++ TOK_ACTION_CTL_FORCE_REQ_BODY_VAR = 414, // "ACTION_CTL_FORCE_REQ_BODY_VAR" ++ TOK_ACTION_CTL_REQUEST_BODY_ACCESS = 415, // "ACTION_CTL_REQUEST_BODY_ACCESS" ++ TOK_ACTION_CTL_RULE_REMOVE_BY_ID = 416, // "ACTION_CTL_RULE_REMOVE_BY_ID" ++ TOK_ACTION_CTL_RULE_REMOVE_BY_TAG = 417, // "ACTION_CTL_RULE_REMOVE_BY_TAG" ++ TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 418, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" ++ TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 419, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" ++ TOK_ACTION_DENY = 420, // "Deny" ++ TOK_ACTION_DEPRECATE_VAR = 421, // "DeprecateVar" ++ TOK_ACTION_DROP = 422, // "Drop" ++ TOK_ACTION_EXEC = 423, // "Exec" ++ TOK_ACTION_EXPIRE_VAR = 424, // "ExpireVar" ++ TOK_ACTION_ID = 425, // "Id" ++ TOK_ACTION_INITCOL = 426, // "InitCol" ++ TOK_ACTION_LOG = 427, // "Log" ++ TOK_ACTION_LOG_DATA = 428, // "LogData" ++ TOK_ACTION_MATURITY = 429, // "Maturity" ++ TOK_ACTION_MSG = 430, // "Msg" ++ TOK_ACTION_MULTI_MATCH = 431, // "MultiMatch" ++ TOK_ACTION_NO_AUDIT_LOG = 432, // "NoAuditLog" ++ TOK_ACTION_NO_LOG = 433, // "NoLog" ++ TOK_ACTION_PASS = 434, // "Pass" ++ TOK_ACTION_PAUSE = 435, // "Pause" ++ TOK_ACTION_PHASE = 436, // "Phase" ++ TOK_ACTION_PREPEND = 437, // "Prepend" ++ TOK_ACTION_PROXY = 438, // "Proxy" ++ TOK_ACTION_REDIRECT = 439, // "Redirect" ++ TOK_ACTION_REV = 440, // "Rev" ++ TOK_ACTION_SANITISE_ARG = 441, // "SanitiseArg" ++ TOK_ACTION_SANITISE_MATCHED = 442, // "SanitiseMatched" ++ TOK_ACTION_SANITISE_MATCHED_BYTES = 443, // "SanitiseMatchedBytes" ++ TOK_ACTION_SANITISE_REQUEST_HEADER = 444, // "SanitiseRequestHeader" ++ TOK_ACTION_SANITISE_RESPONSE_HEADER = 445, // "SanitiseResponseHeader" ++ TOK_ACTION_SETENV = 446, // "SetEnv" ++ TOK_ACTION_SETRSC = 447, // "SetRsc" ++ TOK_ACTION_SETSID = 448, // "SetSid" ++ TOK_ACTION_SETUID = 449, // "SetUID" ++ TOK_ACTION_SEVERITY = 450, // "Severity" ++ TOK_ACTION_SKIP = 451, // "Skip" ++ TOK_ACTION_SKIP_AFTER = 452, // "SkipAfter" ++ TOK_ACTION_STATUS = 453, // "Status" ++ TOK_ACTION_TAG = 454, // "Tag" ++ TOK_ACTION_TRANSFORMATION_BASE_64_ENCODE = 455, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" ++ TOK_ACTION_TRANSFORMATION_BASE_64_DECODE = 456, // "ACTION_TRANSFORMATION_BASE_64_DECODE" ++ TOK_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 457, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" ++ TOK_ACTION_TRANSFORMATION_CMD_LINE = 458, // "ACTION_TRANSFORMATION_CMD_LINE" ++ TOK_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 459, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" ++ TOK_ACTION_TRANSFORMATION_CSS_DECODE = 460, // "ACTION_TRANSFORMATION_CSS_DECODE" ++ TOK_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 461, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" ++ TOK_ACTION_TRANSFORMATION_HEX_ENCODE = 462, // "ACTION_TRANSFORMATION_HEX_ENCODE" ++ TOK_ACTION_TRANSFORMATION_HEX_DECODE = 463, // "ACTION_TRANSFORMATION_HEX_DECODE" ++ TOK_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 464, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" ++ TOK_ACTION_TRANSFORMATION_JS_DECODE = 465, // "ACTION_TRANSFORMATION_JS_DECODE" ++ TOK_ACTION_TRANSFORMATION_LENGTH = 466, // "ACTION_TRANSFORMATION_LENGTH" ++ TOK_ACTION_TRANSFORMATION_LOWERCASE = 467, // "ACTION_TRANSFORMATION_LOWERCASE" ++ TOK_ACTION_TRANSFORMATION_MD5 = 468, // "ACTION_TRANSFORMATION_MD5" ++ TOK_ACTION_TRANSFORMATION_NONE = 469, // "ACTION_TRANSFORMATION_NONE" ++ TOK_ACTION_TRANSFORMATION_NORMALISE_PATH = 470, // "ACTION_TRANSFORMATION_NORMALISE_PATH" ++ TOK_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 471, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" ++ TOK_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 472, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" ++ TOK_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 473, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" ++ TOK_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 474, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" ++ TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 475, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" ++ TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 476, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" ++ TOK_ACTION_TRANSFORMATION_REMOVE_NULLS = 477, // "ACTION_TRANSFORMATION_REMOVE_NULLS" ++ TOK_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 478, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" ++ TOK_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 479, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" ++ TOK_ACTION_TRANSFORMATION_REPLACE_NULLS = 480, // "ACTION_TRANSFORMATION_REPLACE_NULLS" ++ TOK_ACTION_TRANSFORMATION_SHA1 = 481, // "ACTION_TRANSFORMATION_SHA1" ++ TOK_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 482, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" ++ TOK_ACTION_TRANSFORMATION_TRIM = 483, // "ACTION_TRANSFORMATION_TRIM" ++ TOK_ACTION_TRANSFORMATION_TRIM_LEFT = 484, // "ACTION_TRANSFORMATION_TRIM_LEFT" ++ TOK_ACTION_TRANSFORMATION_TRIM_RIGHT = 485, // "ACTION_TRANSFORMATION_TRIM_RIGHT" ++ TOK_ACTION_TRANSFORMATION_UPPERCASE = 486, // "ACTION_TRANSFORMATION_UPPERCASE" ++ TOK_ACTION_TRANSFORMATION_URL_ENCODE = 487, // "ACTION_TRANSFORMATION_URL_ENCODE" ++ TOK_ACTION_TRANSFORMATION_URL_DECODE = 488, // "ACTION_TRANSFORMATION_URL_DECODE" ++ TOK_ACTION_TRANSFORMATION_URL_DECODE_UNI = 489, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" ++ TOK_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 490, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" ++ TOK_ACTION_VER = 491, // "Ver" ++ TOK_ACTION_XMLNS = 492, // "xmlns" ++ TOK_CONFIG_COMPONENT_SIG = 493, // "CONFIG_COMPONENT_SIG" ++ TOK_CONFIG_CONN_ENGINE = 494, // "CONFIG_CONN_ENGINE" ++ TOK_CONFIG_SEC_ARGUMENT_SEPARATOR = 495, // "CONFIG_SEC_ARGUMENT_SEPARATOR" ++ TOK_CONFIG_SEC_WEB_APP_ID = 496, // "CONFIG_SEC_WEB_APP_ID" ++ TOK_CONFIG_SEC_SERVER_SIG = 497, // "CONFIG_SEC_SERVER_SIG" ++ TOK_CONFIG_DIR_AUDIT_DIR = 498, // "CONFIG_DIR_AUDIT_DIR" ++ TOK_CONFIG_DIR_AUDIT_DIR_MOD = 499, // "CONFIG_DIR_AUDIT_DIR_MOD" ++ TOK_CONFIG_DIR_AUDIT_ENG = 500, // "CONFIG_DIR_AUDIT_ENG" ++ TOK_CONFIG_DIR_AUDIT_FLE_MOD = 501, // "CONFIG_DIR_AUDIT_FLE_MOD" ++ TOK_CONFIG_DIR_AUDIT_LOG = 502, // "CONFIG_DIR_AUDIT_LOG" ++ TOK_CONFIG_DIR_AUDIT_LOG2 = 503, // "CONFIG_DIR_AUDIT_LOG2" ++ TOK_CONFIG_DIR_AUDIT_LOG_P = 504, // "CONFIG_DIR_AUDIT_LOG_P" ++ TOK_CONFIG_DIR_AUDIT_STS = 505, // "CONFIG_DIR_AUDIT_STS" ++ TOK_CONFIG_DIR_AUDIT_TPE = 506, // "CONFIG_DIR_AUDIT_TPE" ++ TOK_CONFIG_DIR_DEBUG_LOG = 507, // "CONFIG_DIR_DEBUG_LOG" ++ TOK_CONFIG_DIR_DEBUG_LVL = 508, // "CONFIG_DIR_DEBUG_LVL" ++ TOK_CONFIG_SEC_CACHE_TRANSFORMATIONS = 509, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" ++ TOK_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 510, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" ++ TOK_CONFIG_SEC_HASH_ENGINE = 511, // "CONFIG_SEC_HASH_ENGINE" ++ TOK_CONFIG_SEC_HASH_KEY = 512, // "CONFIG_SEC_HASH_KEY" ++ TOK_CONFIG_SEC_HASH_PARAM = 513, // "CONFIG_SEC_HASH_PARAM" ++ TOK_CONFIG_SEC_HASH_METHOD_RX = 514, // "CONFIG_SEC_HASH_METHOD_RX" ++ TOK_CONFIG_SEC_HASH_METHOD_PM = 515, // "CONFIG_SEC_HASH_METHOD_PM" ++ TOK_CONFIG_SEC_CHROOT_DIR = 516, // "CONFIG_SEC_CHROOT_DIR" ++ TOK_CONFIG_DIR_GEO_DB = 517, // "CONFIG_DIR_GEO_DB" ++ TOK_CONFIG_DIR_GSB_DB = 518, // "CONFIG_DIR_GSB_DB" ++ TOK_CONFIG_SEC_GUARDIAN_LOG = 519, // "CONFIG_SEC_GUARDIAN_LOG" ++ TOK_CONFIG_DIR_PCRE_MATCH_LIMIT = 520, // "CONFIG_DIR_PCRE_MATCH_LIMIT" ++ TOK_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 521, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" ++ TOK_CONFIG_SEC_CONN_R_STATE_LIMIT = 522, // "CONFIG_SEC_CONN_R_STATE_LIMIT" ++ TOK_CONFIG_SEC_CONN_W_STATE_LIMIT = 523, // "CONFIG_SEC_CONN_W_STATE_LIMIT" ++ TOK_CONFIG_SEC_SENSOR_ID = 524, // "CONFIG_SEC_SENSOR_ID" ++ TOK_CONFIG_DIR_ARGS_LIMIT = 525, // "CONFIG_DIR_ARGS_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 526, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY = 527, // "CONFIG_DIR_REQ_BODY" ++ TOK_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 528, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY_LIMIT = 529, // "CONFIG_DIR_REQ_BODY_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 530, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" ++ TOK_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 531, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" ++ TOK_CONFIG_DIR_RES_BODY = 532, // "CONFIG_DIR_RES_BODY" ++ TOK_CONFIG_DIR_RES_BODY_LIMIT = 533, // "CONFIG_DIR_RES_BODY_LIMIT" ++ TOK_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 534, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" ++ TOK_CONFIG_SEC_RULE_INHERITANCE = 535, // "CONFIG_SEC_RULE_INHERITANCE" ++ TOK_CONFIG_SEC_RULE_PERF_TIME = 536, // "CONFIG_SEC_RULE_PERF_TIME" ++ TOK_CONFIG_DIR_RULE_ENG = 537, // "CONFIG_DIR_RULE_ENG" ++ TOK_CONFIG_DIR_SEC_ACTION = 538, // "CONFIG_DIR_SEC_ACTION" ++ TOK_CONFIG_DIR_SEC_DEFAULT_ACTION = 539, // "CONFIG_DIR_SEC_DEFAULT_ACTION" ++ TOK_CONFIG_DIR_SEC_MARKER = 540, // "CONFIG_DIR_SEC_MARKER" ++ TOK_CONFIG_DIR_UNICODE_MAP_FILE = 541, // "CONFIG_DIR_UNICODE_MAP_FILE" ++ TOK_CONFIG_DIR_UNICODE_CODE_PAGE = 542, // "CONFIG_DIR_UNICODE_CODE_PAGE" ++ TOK_CONFIG_SEC_COLLECTION_TIMEOUT = 543, // "CONFIG_SEC_COLLECTION_TIMEOUT" ++ TOK_CONFIG_SEC_HTTP_BLKEY = 544, // "CONFIG_SEC_HTTP_BLKEY" ++ TOK_CONFIG_SEC_INTERCEPT_ON_ERROR = 545, // "CONFIG_SEC_INTERCEPT_ON_ERROR" ++ TOK_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 546, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" ++ TOK_CONFIG_SEC_RULE_REMOVE_BY_ID = 547, // "CONFIG_SEC_RULE_REMOVE_BY_ID" ++ TOK_CONFIG_SEC_RULE_REMOVE_BY_MSG = 548, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" ++ TOK_CONFIG_SEC_RULE_REMOVE_BY_TAG = 549, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" ++ TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 550, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" ++ TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 551, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" ++ TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 552, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" ++ TOK_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 553, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" ++ TOK_CONFIG_UPDLOAD_KEEP_FILES = 554, // "CONFIG_UPDLOAD_KEEP_FILES" ++ TOK_CONFIG_UPDLOAD_SAVE_TMP_FILES = 555, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" ++ TOK_CONFIG_UPLOAD_DIR = 556, // "CONFIG_UPLOAD_DIR" ++ TOK_CONFIG_UPLOAD_FILE_LIMIT = 557, // "CONFIG_UPLOAD_FILE_LIMIT" ++ TOK_CONFIG_UPLOAD_FILE_MODE = 558, // "CONFIG_UPLOAD_FILE_MODE" ++ TOK_CONFIG_VALUE_ABORT = 559, // "CONFIG_VALUE_ABORT" ++ TOK_CONFIG_VALUE_DETC = 560, // "CONFIG_VALUE_DETC" ++ TOK_CONFIG_VALUE_HTTPS = 561, // "CONFIG_VALUE_HTTPS" ++ TOK_CONFIG_VALUE_OFF = 562, // "CONFIG_VALUE_OFF" ++ TOK_CONFIG_VALUE_ON = 563, // "CONFIG_VALUE_ON" ++ TOK_CONFIG_VALUE_PARALLEL = 564, // "CONFIG_VALUE_PARALLEL" ++ TOK_CONFIG_VALUE_PROCESS_PARTIAL = 565, // "CONFIG_VALUE_PROCESS_PARTIAL" ++ TOK_CONFIG_VALUE_REJECT = 566, // "CONFIG_VALUE_REJECT" ++ TOK_CONFIG_VALUE_RELEVANT_ONLY = 567, // "CONFIG_VALUE_RELEVANT_ONLY" ++ TOK_CONFIG_VALUE_SERIAL = 568, // "CONFIG_VALUE_SERIAL" ++ TOK_CONFIG_VALUE_WARN = 569, // "CONFIG_VALUE_WARN" ++ TOK_CONFIG_XML_EXTERNAL_ENTITY = 570, // "CONFIG_XML_EXTERNAL_ENTITY" ++ TOK_CONGIG_DIR_RESPONSE_BODY_MP = 571, // "CONGIG_DIR_RESPONSE_BODY_MP" ++ TOK_CONGIG_DIR_SEC_ARG_SEP = 572, // "CONGIG_DIR_SEC_ARG_SEP" ++ TOK_CONGIG_DIR_SEC_COOKIE_FORMAT = 573, // "CONGIG_DIR_SEC_COOKIE_FORMAT" ++ TOK_CONFIG_SEC_COOKIEV0_SEPARATOR = 574, // "CONFIG_SEC_COOKIEV0_SEPARATOR" ++ TOK_CONGIG_DIR_SEC_DATA_DIR = 575, // "CONGIG_DIR_SEC_DATA_DIR" ++ TOK_CONGIG_DIR_SEC_STATUS_ENGINE = 576, // "CONGIG_DIR_SEC_STATUS_ENGINE" ++ TOK_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 577, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" ++ TOK_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 578, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" ++ TOK_CONGIG_DIR_SEC_TMP_DIR = 579, // "CONGIG_DIR_SEC_TMP_DIR" ++ TOK_DIRECTIVE = 580, // "DIRECTIVE" ++ TOK_DIRECTIVE_SECRULESCRIPT = 581, // "DIRECTIVE_SECRULESCRIPT" ++ TOK_FREE_TEXT_QUOTE_MACRO_EXPANSION = 582, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++ TOK_QUOTATION_MARK = 583, // "QUOTATION_MARK" ++ TOK_RUN_TIME_VAR_BLD = 584, // "RUN_TIME_VAR_BLD" ++ TOK_RUN_TIME_VAR_DUR = 585, // "RUN_TIME_VAR_DUR" ++ TOK_RUN_TIME_VAR_HSV = 586, // "RUN_TIME_VAR_HSV" ++ TOK_RUN_TIME_VAR_REMOTE_USER = 587, // "RUN_TIME_VAR_REMOTE_USER" ++ TOK_RUN_TIME_VAR_TIME = 588, // "RUN_TIME_VAR_TIME" ++ TOK_RUN_TIME_VAR_TIME_DAY = 589, // "RUN_TIME_VAR_TIME_DAY" ++ TOK_RUN_TIME_VAR_TIME_EPOCH = 590, // "RUN_TIME_VAR_TIME_EPOCH" ++ TOK_RUN_TIME_VAR_TIME_HOUR = 591, // "RUN_TIME_VAR_TIME_HOUR" ++ TOK_RUN_TIME_VAR_TIME_MIN = 592, // "RUN_TIME_VAR_TIME_MIN" ++ TOK_RUN_TIME_VAR_TIME_MON = 593, // "RUN_TIME_VAR_TIME_MON" ++ TOK_RUN_TIME_VAR_TIME_SEC = 594, // "RUN_TIME_VAR_TIME_SEC" ++ TOK_RUN_TIME_VAR_TIME_WDAY = 595, // "RUN_TIME_VAR_TIME_WDAY" ++ TOK_RUN_TIME_VAR_TIME_YEAR = 596, // "RUN_TIME_VAR_TIME_YEAR" ++ TOK_VARIABLE = 597, // "VARIABLE" ++ TOK_DICT_ELEMENT = 598, // "Dictionary element" ++ TOK_DICT_ELEMENT_REGEXP = 599 // "Dictionary element, selected by regexp" + }; + /// Backward compatibility alias (Bison 3.6). + typedef token_kind_type yytokentype; +@@ -1329,7 +1331,7 @@ namespace yy { + { + enum symbol_kind_type + { +- YYNTOKENS = 344, ///< Number of tokens. ++ YYNTOKENS = 345, ///< Number of tokens. + S_YYEMPTY = -2, + S_YYEOF = 0, // "end of file" + S_YYerror = 1, // error +@@ -1357,340 +1359,341 @@ namespace yy { + S_VARIABLE_RESPONSE_HEADERS = 23, // VARIABLE_RESPONSE_HEADERS + S_VARIABLE_GEO = 24, // VARIABLE_GEO + S_VARIABLE_REQUEST_COOKIES_NAMES = 25, // VARIABLE_REQUEST_COOKIES_NAMES +- S_VARIABLE_ARGS_COMBINED_SIZE = 26, // VARIABLE_ARGS_COMBINED_SIZE +- S_VARIABLE_ARGS_GET_NAMES = 27, // VARIABLE_ARGS_GET_NAMES +- S_VARIABLE_RULE = 28, // VARIABLE_RULE +- S_VARIABLE_ARGS_NAMES = 29, // "Variable ARGS_NAMES" +- S_VARIABLE_ARGS_POST_NAMES = 30, // VARIABLE_ARGS_POST_NAMES +- S_VARIABLE_AUTH_TYPE = 31, // "AUTH_TYPE" +- S_VARIABLE_FILES_COMBINED_SIZE = 32, // "FILES_COMBINED_SIZE" +- S_VARIABLE_FILES_TMP_NAMES = 33, // "FILES_TMPNAMES" +- S_VARIABLE_FULL_REQUEST = 34, // "FULL_REQUEST" +- S_VARIABLE_FULL_REQUEST_LENGTH = 35, // "FULL_REQUEST_LENGTH" +- S_VARIABLE_INBOUND_DATA_ERROR = 36, // "INBOUND_DATA_ERROR" +- S_VARIABLE_MATCHED_VAR = 37, // "MATCHED_VAR" +- S_VARIABLE_MATCHED_VAR_NAME = 38, // "MATCHED_VAR_NAME" +- S_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 39, // VARIABLE_MULTIPART_BOUNDARY_QUOTED +- S_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 40, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE +- S_VARIABLE_MULTIPART_CRLF_LF_LINES = 41, // "MULTIPART_CRLF_LF_LINES" +- S_VARIABLE_MULTIPART_DATA_AFTER = 42, // "MULTIPART_DATA_AFTER" +- S_VARIABLE_MULTIPART_DATA_BEFORE = 43, // VARIABLE_MULTIPART_DATA_BEFORE +- S_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 44, // "MULTIPART_FILE_LIMIT_EXCEEDED" +- S_VARIABLE_MULTIPART_HEADER_FOLDING = 45, // "MULTIPART_HEADER_FOLDING" +- S_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 46, // "MULTIPART_INVALID_HEADER_FOLDING" +- S_VARIABLE_MULTIPART_INVALID_PART = 47, // VARIABLE_MULTIPART_INVALID_PART +- S_VARIABLE_MULTIPART_INVALID_QUOTING = 48, // "MULTIPART_INVALID_QUOTING" +- S_VARIABLE_MULTIPART_LF_LINE = 49, // VARIABLE_MULTIPART_LF_LINE +- S_VARIABLE_MULTIPART_MISSING_SEMICOLON = 50, // VARIABLE_MULTIPART_MISSING_SEMICOLON +- S_VARIABLE_MULTIPART_SEMICOLON_MISSING = 51, // VARIABLE_MULTIPART_SEMICOLON_MISSING +- S_VARIABLE_MULTIPART_STRICT_ERROR = 52, // "MULTIPART_STRICT_ERROR" +- S_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 53, // "MULTIPART_UNMATCHED_BOUNDARY" +- S_VARIABLE_OUTBOUND_DATA_ERROR = 54, // "OUTBOUND_DATA_ERROR" +- S_VARIABLE_PATH_INFO = 55, // "PATH_INFO" +- S_VARIABLE_QUERY_STRING = 56, // "QUERY_STRING" +- S_VARIABLE_REMOTE_ADDR = 57, // "REMOTE_ADDR" +- S_VARIABLE_REMOTE_HOST = 58, // "REMOTE_HOST" +- S_VARIABLE_REMOTE_PORT = 59, // "REMOTE_PORT" +- S_VARIABLE_REQBODY_ERROR_MSG = 60, // "REQBODY_ERROR_MSG" +- S_VARIABLE_REQBODY_ERROR = 61, // "REQBODY_ERROR" +- S_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 62, // "REQBODY_PROCESSOR_ERROR_MSG" +- S_VARIABLE_REQBODY_PROCESSOR_ERROR = 63, // "REQBODY_PROCESSOR_ERROR" +- S_VARIABLE_REQBODY_PROCESSOR = 64, // "REQBODY_PROCESSOR" +- S_VARIABLE_REQUEST_BASENAME = 65, // "REQUEST_BASENAME" +- S_VARIABLE_REQUEST_BODY_LENGTH = 66, // "REQUEST_BODY_LENGTH" +- S_VARIABLE_REQUEST_BODY = 67, // "REQUEST_BODY" +- S_VARIABLE_REQUEST_FILE_NAME = 68, // "REQUEST_FILENAME" +- S_VARIABLE_REQUEST_HEADERS_NAMES = 69, // VARIABLE_REQUEST_HEADERS_NAMES +- S_VARIABLE_REQUEST_LINE = 70, // "REQUEST_LINE" +- S_VARIABLE_REQUEST_METHOD = 71, // "REQUEST_METHOD" +- S_VARIABLE_REQUEST_PROTOCOL = 72, // "REQUEST_PROTOCOL" +- S_VARIABLE_REQUEST_URI_RAW = 73, // "REQUEST_URI_RAW" +- S_VARIABLE_REQUEST_URI = 74, // "REQUEST_URI" +- S_VARIABLE_RESOURCE = 75, // "RESOURCE" +- S_VARIABLE_RESPONSE_BODY = 76, // "RESPONSE_BODY" +- S_VARIABLE_RESPONSE_CONTENT_LENGTH = 77, // "RESPONSE_CONTENT_LENGTH" +- S_VARIABLE_RESPONSE_CONTENT_TYPE = 78, // VARIABLE_RESPONSE_CONTENT_TYPE +- S_VARIABLE_RESPONSE_HEADERS_NAMES = 79, // VARIABLE_RESPONSE_HEADERS_NAMES +- S_VARIABLE_RESPONSE_PROTOCOL = 80, // "RESPONSE_PROTOCOL" +- S_VARIABLE_RESPONSE_STATUS = 81, // "RESPONSE_STATUS" +- S_VARIABLE_SERVER_ADDR = 82, // "SERVER_ADDR" +- S_VARIABLE_SERVER_NAME = 83, // "SERVER_NAME" +- S_VARIABLE_SERVER_PORT = 84, // "SERVER_PORT" +- S_VARIABLE_SESSION_ID = 85, // "SESSIONID" +- S_VARIABLE_UNIQUE_ID = 86, // "UNIQUE_ID" +- S_VARIABLE_URL_ENCODED_ERROR = 87, // "URLENCODED_ERROR" +- S_VARIABLE_USER_ID = 88, // "USERID" +- S_VARIABLE_WEB_APP_ID = 89, // "WEBAPPID" +- S_VARIABLE_STATUS = 90, // "VARIABLE_STATUS" +- S_VARIABLE_STATUS_LINE = 91, // "VARIABLE_STATUS_LINE" +- S_VARIABLE_IP = 92, // "VARIABLE_IP" +- S_VARIABLE_GLOBAL = 93, // "VARIABLE_GLOBAL" +- S_VARIABLE_TX = 94, // "VARIABLE_TX" +- S_VARIABLE_SESSION = 95, // "VARIABLE_SESSION" +- S_VARIABLE_USER = 96, // "VARIABLE_USER" +- S_RUN_TIME_VAR_ENV = 97, // "RUN_TIME_VAR_ENV" +- S_RUN_TIME_VAR_XML = 98, // "RUN_TIME_VAR_XML" +- S_ACTION_SETVAR = 99, // "SetVar" +- S_SETVAR_OPERATION_EQUALS = 100, // SETVAR_OPERATION_EQUALS +- S_SETVAR_OPERATION_EQUALS_PLUS = 101, // SETVAR_OPERATION_EQUALS_PLUS +- S_SETVAR_OPERATION_EQUALS_MINUS = 102, // SETVAR_OPERATION_EQUALS_MINUS +- S_NOT = 103, // "NOT" +- S_OPERATOR_BEGINS_WITH = 104, // "OPERATOR_BEGINS_WITH" +- S_OPERATOR_CONTAINS = 105, // "OPERATOR_CONTAINS" +- S_OPERATOR_CONTAINS_WORD = 106, // "OPERATOR_CONTAINS_WORD" +- S_OPERATOR_DETECT_SQLI = 107, // "OPERATOR_DETECT_SQLI" +- S_OPERATOR_DETECT_XSS = 108, // "OPERATOR_DETECT_XSS" +- S_OPERATOR_ENDS_WITH = 109, // "OPERATOR_ENDS_WITH" +- S_OPERATOR_EQ = 110, // "OPERATOR_EQ" +- S_OPERATOR_FUZZY_HASH = 111, // "OPERATOR_FUZZY_HASH" +- S_OPERATOR_GEOLOOKUP = 112, // "OPERATOR_GEOLOOKUP" +- S_OPERATOR_GE = 113, // "OPERATOR_GE" +- S_OPERATOR_GSB_LOOKUP = 114, // "OPERATOR_GSB_LOOKUP" +- S_OPERATOR_GT = 115, // "OPERATOR_GT" +- S_OPERATOR_INSPECT_FILE = 116, // "OPERATOR_INSPECT_FILE" +- S_OPERATOR_IP_MATCH_FROM_FILE = 117, // "OPERATOR_IP_MATCH_FROM_FILE" +- S_OPERATOR_IP_MATCH = 118, // "OPERATOR_IP_MATCH" +- S_OPERATOR_LE = 119, // "OPERATOR_LE" +- S_OPERATOR_LT = 120, // "OPERATOR_LT" +- S_OPERATOR_PM_FROM_FILE = 121, // "OPERATOR_PM_FROM_FILE" +- S_OPERATOR_PM = 122, // "OPERATOR_PM" +- S_OPERATOR_RBL = 123, // "OPERATOR_RBL" +- S_OPERATOR_RSUB = 124, // "OPERATOR_RSUB" +- S_OPERATOR_RX_CONTENT_ONLY = 125, // "Operator RX (content only)" +- S_OPERATOR_RX = 126, // "OPERATOR_RX" +- S_OPERATOR_RX_GLOBAL = 127, // "OPERATOR_RX_GLOBAL" +- S_OPERATOR_STR_EQ = 128, // "OPERATOR_STR_EQ" +- S_OPERATOR_STR_MATCH = 129, // "OPERATOR_STR_MATCH" +- S_OPERATOR_UNCONDITIONAL_MATCH = 130, // "OPERATOR_UNCONDITIONAL_MATCH" +- S_OPERATOR_VALIDATE_BYTE_RANGE = 131, // "OPERATOR_VALIDATE_BYTE_RANGE" +- S_OPERATOR_VALIDATE_DTD = 132, // "OPERATOR_VALIDATE_DTD" +- S_OPERATOR_VALIDATE_HASH = 133, // "OPERATOR_VALIDATE_HASH" +- S_OPERATOR_VALIDATE_SCHEMA = 134, // "OPERATOR_VALIDATE_SCHEMA" +- S_OPERATOR_VALIDATE_URL_ENCODING = 135, // "OPERATOR_VALIDATE_URL_ENCODING" +- S_OPERATOR_VALIDATE_UTF8_ENCODING = 136, // "OPERATOR_VALIDATE_UTF8_ENCODING" +- S_OPERATOR_VERIFY_CC = 137, // "OPERATOR_VERIFY_CC" +- S_OPERATOR_VERIFY_CPF = 138, // "OPERATOR_VERIFY_CPF" +- S_OPERATOR_VERIFY_SSN = 139, // "OPERATOR_VERIFY_SSN" +- S_OPERATOR_VERIFY_SVNR = 140, // "OPERATOR_VERIFY_SVNR" +- S_OPERATOR_WITHIN = 141, // "OPERATOR_WITHIN" +- S_CONFIG_DIR_AUDIT_LOG_FMT = 142, // CONFIG_DIR_AUDIT_LOG_FMT +- S_JSON = 143, // JSON +- S_NATIVE = 144, // NATIVE +- S_ACTION_CTL_RULE_ENGINE = 145, // "ACTION_CTL_RULE_ENGINE" +- S_ACTION_ACCURACY = 146, // "Accuracy" +- S_ACTION_ALLOW = 147, // "Allow" +- S_ACTION_APPEND = 148, // "Append" +- S_ACTION_AUDIT_LOG = 149, // "AuditLog" +- S_ACTION_BLOCK = 150, // "Block" +- S_ACTION_CAPTURE = 151, // "Capture" +- S_ACTION_CHAIN = 152, // "Chain" +- S_ACTION_CTL_AUDIT_ENGINE = 153, // "ACTION_CTL_AUDIT_ENGINE" +- S_ACTION_CTL_AUDIT_LOG_PARTS = 154, // "ACTION_CTL_AUDIT_LOG_PARTS" +- S_ACTION_CTL_BDY_JSON = 155, // "ACTION_CTL_BDY_JSON" +- S_ACTION_CTL_BDY_XML = 156, // "ACTION_CTL_BDY_XML" +- S_ACTION_CTL_BDY_URLENCODED = 157, // "ACTION_CTL_BDY_URLENCODED" +- S_ACTION_CTL_FORCE_REQ_BODY_VAR = 158, // "ACTION_CTL_FORCE_REQ_BODY_VAR" +- S_ACTION_CTL_REQUEST_BODY_ACCESS = 159, // "ACTION_CTL_REQUEST_BODY_ACCESS" +- S_ACTION_CTL_RULE_REMOVE_BY_ID = 160, // "ACTION_CTL_RULE_REMOVE_BY_ID" +- S_ACTION_CTL_RULE_REMOVE_BY_TAG = 161, // "ACTION_CTL_RULE_REMOVE_BY_TAG" +- S_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 162, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" +- S_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 163, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" +- S_ACTION_DENY = 164, // "Deny" +- S_ACTION_DEPRECATE_VAR = 165, // "DeprecateVar" +- S_ACTION_DROP = 166, // "Drop" +- S_ACTION_EXEC = 167, // "Exec" +- S_ACTION_EXPIRE_VAR = 168, // "ExpireVar" +- S_ACTION_ID = 169, // "Id" +- S_ACTION_INITCOL = 170, // "InitCol" +- S_ACTION_LOG = 171, // "Log" +- S_ACTION_LOG_DATA = 172, // "LogData" +- S_ACTION_MATURITY = 173, // "Maturity" +- S_ACTION_MSG = 174, // "Msg" +- S_ACTION_MULTI_MATCH = 175, // "MultiMatch" +- S_ACTION_NO_AUDIT_LOG = 176, // "NoAuditLog" +- S_ACTION_NO_LOG = 177, // "NoLog" +- S_ACTION_PASS = 178, // "Pass" +- S_ACTION_PAUSE = 179, // "Pause" +- S_ACTION_PHASE = 180, // "Phase" +- S_ACTION_PREPEND = 181, // "Prepend" +- S_ACTION_PROXY = 182, // "Proxy" +- S_ACTION_REDIRECT = 183, // "Redirect" +- S_ACTION_REV = 184, // "Rev" +- S_ACTION_SANITISE_ARG = 185, // "SanitiseArg" +- S_ACTION_SANITISE_MATCHED = 186, // "SanitiseMatched" +- S_ACTION_SANITISE_MATCHED_BYTES = 187, // "SanitiseMatchedBytes" +- S_ACTION_SANITISE_REQUEST_HEADER = 188, // "SanitiseRequestHeader" +- S_ACTION_SANITISE_RESPONSE_HEADER = 189, // "SanitiseResponseHeader" +- S_ACTION_SETENV = 190, // "SetEnv" +- S_ACTION_SETRSC = 191, // "SetRsc" +- S_ACTION_SETSID = 192, // "SetSid" +- S_ACTION_SETUID = 193, // "SetUID" +- S_ACTION_SEVERITY = 194, // "Severity" +- S_ACTION_SKIP = 195, // "Skip" +- S_ACTION_SKIP_AFTER = 196, // "SkipAfter" +- S_ACTION_STATUS = 197, // "Status" +- S_ACTION_TAG = 198, // "Tag" +- S_ACTION_TRANSFORMATION_BASE_64_ENCODE = 199, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" +- S_ACTION_TRANSFORMATION_BASE_64_DECODE = 200, // "ACTION_TRANSFORMATION_BASE_64_DECODE" +- S_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 201, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" +- S_ACTION_TRANSFORMATION_CMD_LINE = 202, // "ACTION_TRANSFORMATION_CMD_LINE" +- S_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 203, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" +- S_ACTION_TRANSFORMATION_CSS_DECODE = 204, // "ACTION_TRANSFORMATION_CSS_DECODE" +- S_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 205, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" +- S_ACTION_TRANSFORMATION_HEX_ENCODE = 206, // "ACTION_TRANSFORMATION_HEX_ENCODE" +- S_ACTION_TRANSFORMATION_HEX_DECODE = 207, // "ACTION_TRANSFORMATION_HEX_DECODE" +- S_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 208, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" +- S_ACTION_TRANSFORMATION_JS_DECODE = 209, // "ACTION_TRANSFORMATION_JS_DECODE" +- S_ACTION_TRANSFORMATION_LENGTH = 210, // "ACTION_TRANSFORMATION_LENGTH" +- S_ACTION_TRANSFORMATION_LOWERCASE = 211, // "ACTION_TRANSFORMATION_LOWERCASE" +- S_ACTION_TRANSFORMATION_MD5 = 212, // "ACTION_TRANSFORMATION_MD5" +- S_ACTION_TRANSFORMATION_NONE = 213, // "ACTION_TRANSFORMATION_NONE" +- S_ACTION_TRANSFORMATION_NORMALISE_PATH = 214, // "ACTION_TRANSFORMATION_NORMALISE_PATH" +- S_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 215, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" +- S_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 216, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" +- S_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 217, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" +- S_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 218, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" +- S_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 219, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" +- S_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 220, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" +- S_ACTION_TRANSFORMATION_REMOVE_NULLS = 221, // "ACTION_TRANSFORMATION_REMOVE_NULLS" +- S_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 222, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" +- S_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 223, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" +- S_ACTION_TRANSFORMATION_REPLACE_NULLS = 224, // "ACTION_TRANSFORMATION_REPLACE_NULLS" +- S_ACTION_TRANSFORMATION_SHA1 = 225, // "ACTION_TRANSFORMATION_SHA1" +- S_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 226, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" +- S_ACTION_TRANSFORMATION_TRIM = 227, // "ACTION_TRANSFORMATION_TRIM" +- S_ACTION_TRANSFORMATION_TRIM_LEFT = 228, // "ACTION_TRANSFORMATION_TRIM_LEFT" +- S_ACTION_TRANSFORMATION_TRIM_RIGHT = 229, // "ACTION_TRANSFORMATION_TRIM_RIGHT" +- S_ACTION_TRANSFORMATION_UPPERCASE = 230, // "ACTION_TRANSFORMATION_UPPERCASE" +- S_ACTION_TRANSFORMATION_URL_ENCODE = 231, // "ACTION_TRANSFORMATION_URL_ENCODE" +- S_ACTION_TRANSFORMATION_URL_DECODE = 232, // "ACTION_TRANSFORMATION_URL_DECODE" +- S_ACTION_TRANSFORMATION_URL_DECODE_UNI = 233, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" +- S_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 234, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" +- S_ACTION_VER = 235, // "Ver" +- S_ACTION_XMLNS = 236, // "xmlns" +- S_CONFIG_COMPONENT_SIG = 237, // "CONFIG_COMPONENT_SIG" +- S_CONFIG_CONN_ENGINE = 238, // "CONFIG_CONN_ENGINE" +- S_CONFIG_SEC_ARGUMENT_SEPARATOR = 239, // "CONFIG_SEC_ARGUMENT_SEPARATOR" +- S_CONFIG_SEC_WEB_APP_ID = 240, // "CONFIG_SEC_WEB_APP_ID" +- S_CONFIG_SEC_SERVER_SIG = 241, // "CONFIG_SEC_SERVER_SIG" +- S_CONFIG_DIR_AUDIT_DIR = 242, // "CONFIG_DIR_AUDIT_DIR" +- S_CONFIG_DIR_AUDIT_DIR_MOD = 243, // "CONFIG_DIR_AUDIT_DIR_MOD" +- S_CONFIG_DIR_AUDIT_ENG = 244, // "CONFIG_DIR_AUDIT_ENG" +- S_CONFIG_DIR_AUDIT_FLE_MOD = 245, // "CONFIG_DIR_AUDIT_FLE_MOD" +- S_CONFIG_DIR_AUDIT_LOG = 246, // "CONFIG_DIR_AUDIT_LOG" +- S_CONFIG_DIR_AUDIT_LOG2 = 247, // "CONFIG_DIR_AUDIT_LOG2" +- S_CONFIG_DIR_AUDIT_LOG_P = 248, // "CONFIG_DIR_AUDIT_LOG_P" +- S_CONFIG_DIR_AUDIT_STS = 249, // "CONFIG_DIR_AUDIT_STS" +- S_CONFIG_DIR_AUDIT_TPE = 250, // "CONFIG_DIR_AUDIT_TPE" +- S_CONFIG_DIR_DEBUG_LOG = 251, // "CONFIG_DIR_DEBUG_LOG" +- S_CONFIG_DIR_DEBUG_LVL = 252, // "CONFIG_DIR_DEBUG_LVL" +- S_CONFIG_SEC_CACHE_TRANSFORMATIONS = 253, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" +- S_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 254, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" +- S_CONFIG_SEC_HASH_ENGINE = 255, // "CONFIG_SEC_HASH_ENGINE" +- S_CONFIG_SEC_HASH_KEY = 256, // "CONFIG_SEC_HASH_KEY" +- S_CONFIG_SEC_HASH_PARAM = 257, // "CONFIG_SEC_HASH_PARAM" +- S_CONFIG_SEC_HASH_METHOD_RX = 258, // "CONFIG_SEC_HASH_METHOD_RX" +- S_CONFIG_SEC_HASH_METHOD_PM = 259, // "CONFIG_SEC_HASH_METHOD_PM" +- S_CONFIG_SEC_CHROOT_DIR = 260, // "CONFIG_SEC_CHROOT_DIR" +- S_CONFIG_DIR_GEO_DB = 261, // "CONFIG_DIR_GEO_DB" +- S_CONFIG_DIR_GSB_DB = 262, // "CONFIG_DIR_GSB_DB" +- S_CONFIG_SEC_GUARDIAN_LOG = 263, // "CONFIG_SEC_GUARDIAN_LOG" +- S_CONFIG_DIR_PCRE_MATCH_LIMIT = 264, // "CONFIG_DIR_PCRE_MATCH_LIMIT" +- S_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 265, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" +- S_CONFIG_SEC_CONN_R_STATE_LIMIT = 266, // "CONFIG_SEC_CONN_R_STATE_LIMIT" +- S_CONFIG_SEC_CONN_W_STATE_LIMIT = 267, // "CONFIG_SEC_CONN_W_STATE_LIMIT" +- S_CONFIG_SEC_SENSOR_ID = 268, // "CONFIG_SEC_SENSOR_ID" +- S_CONFIG_DIR_ARGS_LIMIT = 269, // "CONFIG_DIR_ARGS_LIMIT" +- S_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 270, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" +- S_CONFIG_DIR_REQ_BODY = 271, // "CONFIG_DIR_REQ_BODY" +- S_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 272, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" +- S_CONFIG_DIR_REQ_BODY_LIMIT = 273, // "CONFIG_DIR_REQ_BODY_LIMIT" +- S_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 274, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" +- S_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 275, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" +- S_CONFIG_DIR_RES_BODY = 276, // "CONFIG_DIR_RES_BODY" +- S_CONFIG_DIR_RES_BODY_LIMIT = 277, // "CONFIG_DIR_RES_BODY_LIMIT" +- S_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 278, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" +- S_CONFIG_SEC_RULE_INHERITANCE = 279, // "CONFIG_SEC_RULE_INHERITANCE" +- S_CONFIG_SEC_RULE_PERF_TIME = 280, // "CONFIG_SEC_RULE_PERF_TIME" +- S_CONFIG_DIR_RULE_ENG = 281, // "CONFIG_DIR_RULE_ENG" +- S_CONFIG_DIR_SEC_ACTION = 282, // "CONFIG_DIR_SEC_ACTION" +- S_CONFIG_DIR_SEC_DEFAULT_ACTION = 283, // "CONFIG_DIR_SEC_DEFAULT_ACTION" +- S_CONFIG_DIR_SEC_MARKER = 284, // "CONFIG_DIR_SEC_MARKER" +- S_CONFIG_DIR_UNICODE_MAP_FILE = 285, // "CONFIG_DIR_UNICODE_MAP_FILE" +- S_CONFIG_DIR_UNICODE_CODE_PAGE = 286, // "CONFIG_DIR_UNICODE_CODE_PAGE" +- S_CONFIG_SEC_COLLECTION_TIMEOUT = 287, // "CONFIG_SEC_COLLECTION_TIMEOUT" +- S_CONFIG_SEC_HTTP_BLKEY = 288, // "CONFIG_SEC_HTTP_BLKEY" +- S_CONFIG_SEC_INTERCEPT_ON_ERROR = 289, // "CONFIG_SEC_INTERCEPT_ON_ERROR" +- S_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 290, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" +- S_CONFIG_SEC_RULE_REMOVE_BY_ID = 291, // "CONFIG_SEC_RULE_REMOVE_BY_ID" +- S_CONFIG_SEC_RULE_REMOVE_BY_MSG = 292, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" +- S_CONFIG_SEC_RULE_REMOVE_BY_TAG = 293, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" +- S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 294, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" +- S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 295, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" +- S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 296, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" +- S_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 297, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" +- S_CONFIG_UPDLOAD_KEEP_FILES = 298, // "CONFIG_UPDLOAD_KEEP_FILES" +- S_CONFIG_UPDLOAD_SAVE_TMP_FILES = 299, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" +- S_CONFIG_UPLOAD_DIR = 300, // "CONFIG_UPLOAD_DIR" +- S_CONFIG_UPLOAD_FILE_LIMIT = 301, // "CONFIG_UPLOAD_FILE_LIMIT" +- S_CONFIG_UPLOAD_FILE_MODE = 302, // "CONFIG_UPLOAD_FILE_MODE" +- S_CONFIG_VALUE_ABORT = 303, // "CONFIG_VALUE_ABORT" +- S_CONFIG_VALUE_DETC = 304, // "CONFIG_VALUE_DETC" +- S_CONFIG_VALUE_HTTPS = 305, // "CONFIG_VALUE_HTTPS" +- S_CONFIG_VALUE_OFF = 306, // "CONFIG_VALUE_OFF" +- S_CONFIG_VALUE_ON = 307, // "CONFIG_VALUE_ON" +- S_CONFIG_VALUE_PARALLEL = 308, // "CONFIG_VALUE_PARALLEL" +- S_CONFIG_VALUE_PROCESS_PARTIAL = 309, // "CONFIG_VALUE_PROCESS_PARTIAL" +- S_CONFIG_VALUE_REJECT = 310, // "CONFIG_VALUE_REJECT" +- S_CONFIG_VALUE_RELEVANT_ONLY = 311, // "CONFIG_VALUE_RELEVANT_ONLY" +- S_CONFIG_VALUE_SERIAL = 312, // "CONFIG_VALUE_SERIAL" +- S_CONFIG_VALUE_WARN = 313, // "CONFIG_VALUE_WARN" +- S_CONFIG_XML_EXTERNAL_ENTITY = 314, // "CONFIG_XML_EXTERNAL_ENTITY" +- S_CONGIG_DIR_RESPONSE_BODY_MP = 315, // "CONGIG_DIR_RESPONSE_BODY_MP" +- S_CONGIG_DIR_SEC_ARG_SEP = 316, // "CONGIG_DIR_SEC_ARG_SEP" +- S_CONGIG_DIR_SEC_COOKIE_FORMAT = 317, // "CONGIG_DIR_SEC_COOKIE_FORMAT" +- S_CONFIG_SEC_COOKIEV0_SEPARATOR = 318, // "CONFIG_SEC_COOKIEV0_SEPARATOR" +- S_CONGIG_DIR_SEC_DATA_DIR = 319, // "CONGIG_DIR_SEC_DATA_DIR" +- S_CONGIG_DIR_SEC_STATUS_ENGINE = 320, // "CONGIG_DIR_SEC_STATUS_ENGINE" +- S_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 321, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" +- S_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 322, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" +- S_CONGIG_DIR_SEC_TMP_DIR = 323, // "CONGIG_DIR_SEC_TMP_DIR" +- S_DIRECTIVE = 324, // "DIRECTIVE" +- S_DIRECTIVE_SECRULESCRIPT = 325, // "DIRECTIVE_SECRULESCRIPT" +- S_FREE_TEXT_QUOTE_MACRO_EXPANSION = 326, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" +- S_QUOTATION_MARK = 327, // "QUOTATION_MARK" +- S_RUN_TIME_VAR_BLD = 328, // "RUN_TIME_VAR_BLD" +- S_RUN_TIME_VAR_DUR = 329, // "RUN_TIME_VAR_DUR" +- S_RUN_TIME_VAR_HSV = 330, // "RUN_TIME_VAR_HSV" +- S_RUN_TIME_VAR_REMOTE_USER = 331, // "RUN_TIME_VAR_REMOTE_USER" +- S_RUN_TIME_VAR_TIME = 332, // "RUN_TIME_VAR_TIME" +- S_RUN_TIME_VAR_TIME_DAY = 333, // "RUN_TIME_VAR_TIME_DAY" +- S_RUN_TIME_VAR_TIME_EPOCH = 334, // "RUN_TIME_VAR_TIME_EPOCH" +- S_RUN_TIME_VAR_TIME_HOUR = 335, // "RUN_TIME_VAR_TIME_HOUR" +- S_RUN_TIME_VAR_TIME_MIN = 336, // "RUN_TIME_VAR_TIME_MIN" +- S_RUN_TIME_VAR_TIME_MON = 337, // "RUN_TIME_VAR_TIME_MON" +- S_RUN_TIME_VAR_TIME_SEC = 338, // "RUN_TIME_VAR_TIME_SEC" +- S_RUN_TIME_VAR_TIME_WDAY = 339, // "RUN_TIME_VAR_TIME_WDAY" +- S_RUN_TIME_VAR_TIME_YEAR = 340, // "RUN_TIME_VAR_TIME_YEAR" +- S_VARIABLE = 341, // "VARIABLE" +- S_DICT_ELEMENT = 342, // "Dictionary element" +- S_DICT_ELEMENT_REGEXP = 343, // "Dictionary element, selected by regexp" +- S_YYACCEPT = 344, // $accept +- S_input = 345, // input +- S_line = 346, // line +- S_audit_log = 347, // audit_log +- S_actions = 348, // actions +- S_actions_may_quoted = 349, // actions_may_quoted +- S_op = 350, // op +- S_op_before_init = 351, // op_before_init +- S_expression = 352, // expression +- S_variables = 353, // variables +- S_variables_pre_process = 354, // variables_pre_process +- S_variables_may_be_quoted = 355, // variables_may_be_quoted +- S_var = 356, // var +- S_act = 357, // act +- S_setvar_action = 358, // setvar_action +- S_run_time_string = 359 // run_time_string ++ S_VARIABLE_MULTIPART_PART_HEADERS = 26, // VARIABLE_MULTIPART_PART_HEADERS ++ S_VARIABLE_ARGS_COMBINED_SIZE = 27, // VARIABLE_ARGS_COMBINED_SIZE ++ S_VARIABLE_ARGS_GET_NAMES = 28, // VARIABLE_ARGS_GET_NAMES ++ S_VARIABLE_RULE = 29, // VARIABLE_RULE ++ S_VARIABLE_ARGS_NAMES = 30, // "Variable ARGS_NAMES" ++ S_VARIABLE_ARGS_POST_NAMES = 31, // VARIABLE_ARGS_POST_NAMES ++ S_VARIABLE_AUTH_TYPE = 32, // "AUTH_TYPE" ++ S_VARIABLE_FILES_COMBINED_SIZE = 33, // "FILES_COMBINED_SIZE" ++ S_VARIABLE_FILES_TMP_NAMES = 34, // "FILES_TMPNAMES" ++ S_VARIABLE_FULL_REQUEST = 35, // "FULL_REQUEST" ++ S_VARIABLE_FULL_REQUEST_LENGTH = 36, // "FULL_REQUEST_LENGTH" ++ S_VARIABLE_INBOUND_DATA_ERROR = 37, // "INBOUND_DATA_ERROR" ++ S_VARIABLE_MATCHED_VAR = 38, // "MATCHED_VAR" ++ S_VARIABLE_MATCHED_VAR_NAME = 39, // "MATCHED_VAR_NAME" ++ S_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 40, // VARIABLE_MULTIPART_BOUNDARY_QUOTED ++ S_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 41, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE ++ S_VARIABLE_MULTIPART_CRLF_LF_LINES = 42, // "MULTIPART_CRLF_LF_LINES" ++ S_VARIABLE_MULTIPART_DATA_AFTER = 43, // "MULTIPART_DATA_AFTER" ++ S_VARIABLE_MULTIPART_DATA_BEFORE = 44, // VARIABLE_MULTIPART_DATA_BEFORE ++ S_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 45, // "MULTIPART_FILE_LIMIT_EXCEEDED" ++ S_VARIABLE_MULTIPART_HEADER_FOLDING = 46, // "MULTIPART_HEADER_FOLDING" ++ S_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 47, // "MULTIPART_INVALID_HEADER_FOLDING" ++ S_VARIABLE_MULTIPART_INVALID_PART = 48, // VARIABLE_MULTIPART_INVALID_PART ++ S_VARIABLE_MULTIPART_INVALID_QUOTING = 49, // "MULTIPART_INVALID_QUOTING" ++ S_VARIABLE_MULTIPART_LF_LINE = 50, // VARIABLE_MULTIPART_LF_LINE ++ S_VARIABLE_MULTIPART_MISSING_SEMICOLON = 51, // VARIABLE_MULTIPART_MISSING_SEMICOLON ++ S_VARIABLE_MULTIPART_SEMICOLON_MISSING = 52, // VARIABLE_MULTIPART_SEMICOLON_MISSING ++ S_VARIABLE_MULTIPART_STRICT_ERROR = 53, // "MULTIPART_STRICT_ERROR" ++ S_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 54, // "MULTIPART_UNMATCHED_BOUNDARY" ++ S_VARIABLE_OUTBOUND_DATA_ERROR = 55, // "OUTBOUND_DATA_ERROR" ++ S_VARIABLE_PATH_INFO = 56, // "PATH_INFO" ++ S_VARIABLE_QUERY_STRING = 57, // "QUERY_STRING" ++ S_VARIABLE_REMOTE_ADDR = 58, // "REMOTE_ADDR" ++ S_VARIABLE_REMOTE_HOST = 59, // "REMOTE_HOST" ++ S_VARIABLE_REMOTE_PORT = 60, // "REMOTE_PORT" ++ S_VARIABLE_REQBODY_ERROR_MSG = 61, // "REQBODY_ERROR_MSG" ++ S_VARIABLE_REQBODY_ERROR = 62, // "REQBODY_ERROR" ++ S_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 63, // "REQBODY_PROCESSOR_ERROR_MSG" ++ S_VARIABLE_REQBODY_PROCESSOR_ERROR = 64, // "REQBODY_PROCESSOR_ERROR" ++ S_VARIABLE_REQBODY_PROCESSOR = 65, // "REQBODY_PROCESSOR" ++ S_VARIABLE_REQUEST_BASENAME = 66, // "REQUEST_BASENAME" ++ S_VARIABLE_REQUEST_BODY_LENGTH = 67, // "REQUEST_BODY_LENGTH" ++ S_VARIABLE_REQUEST_BODY = 68, // "REQUEST_BODY" ++ S_VARIABLE_REQUEST_FILE_NAME = 69, // "REQUEST_FILENAME" ++ S_VARIABLE_REQUEST_HEADERS_NAMES = 70, // VARIABLE_REQUEST_HEADERS_NAMES ++ S_VARIABLE_REQUEST_LINE = 71, // "REQUEST_LINE" ++ S_VARIABLE_REQUEST_METHOD = 72, // "REQUEST_METHOD" ++ S_VARIABLE_REQUEST_PROTOCOL = 73, // "REQUEST_PROTOCOL" ++ S_VARIABLE_REQUEST_URI_RAW = 74, // "REQUEST_URI_RAW" ++ S_VARIABLE_REQUEST_URI = 75, // "REQUEST_URI" ++ S_VARIABLE_RESOURCE = 76, // "RESOURCE" ++ S_VARIABLE_RESPONSE_BODY = 77, // "RESPONSE_BODY" ++ S_VARIABLE_RESPONSE_CONTENT_LENGTH = 78, // "RESPONSE_CONTENT_LENGTH" ++ S_VARIABLE_RESPONSE_CONTENT_TYPE = 79, // VARIABLE_RESPONSE_CONTENT_TYPE ++ S_VARIABLE_RESPONSE_HEADERS_NAMES = 80, // VARIABLE_RESPONSE_HEADERS_NAMES ++ S_VARIABLE_RESPONSE_PROTOCOL = 81, // "RESPONSE_PROTOCOL" ++ S_VARIABLE_RESPONSE_STATUS = 82, // "RESPONSE_STATUS" ++ S_VARIABLE_SERVER_ADDR = 83, // "SERVER_ADDR" ++ S_VARIABLE_SERVER_NAME = 84, // "SERVER_NAME" ++ S_VARIABLE_SERVER_PORT = 85, // "SERVER_PORT" ++ S_VARIABLE_SESSION_ID = 86, // "SESSIONID" ++ S_VARIABLE_UNIQUE_ID = 87, // "UNIQUE_ID" ++ S_VARIABLE_URL_ENCODED_ERROR = 88, // "URLENCODED_ERROR" ++ S_VARIABLE_USER_ID = 89, // "USERID" ++ S_VARIABLE_WEB_APP_ID = 90, // "WEBAPPID" ++ S_VARIABLE_STATUS = 91, // "VARIABLE_STATUS" ++ S_VARIABLE_STATUS_LINE = 92, // "VARIABLE_STATUS_LINE" ++ S_VARIABLE_IP = 93, // "VARIABLE_IP" ++ S_VARIABLE_GLOBAL = 94, // "VARIABLE_GLOBAL" ++ S_VARIABLE_TX = 95, // "VARIABLE_TX" ++ S_VARIABLE_SESSION = 96, // "VARIABLE_SESSION" ++ S_VARIABLE_USER = 97, // "VARIABLE_USER" ++ S_RUN_TIME_VAR_ENV = 98, // "RUN_TIME_VAR_ENV" ++ S_RUN_TIME_VAR_XML = 99, // "RUN_TIME_VAR_XML" ++ S_ACTION_SETVAR = 100, // "SetVar" ++ S_SETVAR_OPERATION_EQUALS = 101, // SETVAR_OPERATION_EQUALS ++ S_SETVAR_OPERATION_EQUALS_PLUS = 102, // SETVAR_OPERATION_EQUALS_PLUS ++ S_SETVAR_OPERATION_EQUALS_MINUS = 103, // SETVAR_OPERATION_EQUALS_MINUS ++ S_NOT = 104, // "NOT" ++ S_OPERATOR_BEGINS_WITH = 105, // "OPERATOR_BEGINS_WITH" ++ S_OPERATOR_CONTAINS = 106, // "OPERATOR_CONTAINS" ++ S_OPERATOR_CONTAINS_WORD = 107, // "OPERATOR_CONTAINS_WORD" ++ S_OPERATOR_DETECT_SQLI = 108, // "OPERATOR_DETECT_SQLI" ++ S_OPERATOR_DETECT_XSS = 109, // "OPERATOR_DETECT_XSS" ++ S_OPERATOR_ENDS_WITH = 110, // "OPERATOR_ENDS_WITH" ++ S_OPERATOR_EQ = 111, // "OPERATOR_EQ" ++ S_OPERATOR_FUZZY_HASH = 112, // "OPERATOR_FUZZY_HASH" ++ S_OPERATOR_GEOLOOKUP = 113, // "OPERATOR_GEOLOOKUP" ++ S_OPERATOR_GE = 114, // "OPERATOR_GE" ++ S_OPERATOR_GSB_LOOKUP = 115, // "OPERATOR_GSB_LOOKUP" ++ S_OPERATOR_GT = 116, // "OPERATOR_GT" ++ S_OPERATOR_INSPECT_FILE = 117, // "OPERATOR_INSPECT_FILE" ++ S_OPERATOR_IP_MATCH_FROM_FILE = 118, // "OPERATOR_IP_MATCH_FROM_FILE" ++ S_OPERATOR_IP_MATCH = 119, // "OPERATOR_IP_MATCH" ++ S_OPERATOR_LE = 120, // "OPERATOR_LE" ++ S_OPERATOR_LT = 121, // "OPERATOR_LT" ++ S_OPERATOR_PM_FROM_FILE = 122, // "OPERATOR_PM_FROM_FILE" ++ S_OPERATOR_PM = 123, // "OPERATOR_PM" ++ S_OPERATOR_RBL = 124, // "OPERATOR_RBL" ++ S_OPERATOR_RSUB = 125, // "OPERATOR_RSUB" ++ S_OPERATOR_RX_CONTENT_ONLY = 126, // "Operator RX (content only)" ++ S_OPERATOR_RX = 127, // "OPERATOR_RX" ++ S_OPERATOR_RX_GLOBAL = 128, // "OPERATOR_RX_GLOBAL" ++ S_OPERATOR_STR_EQ = 129, // "OPERATOR_STR_EQ" ++ S_OPERATOR_STR_MATCH = 130, // "OPERATOR_STR_MATCH" ++ S_OPERATOR_UNCONDITIONAL_MATCH = 131, // "OPERATOR_UNCONDITIONAL_MATCH" ++ S_OPERATOR_VALIDATE_BYTE_RANGE = 132, // "OPERATOR_VALIDATE_BYTE_RANGE" ++ S_OPERATOR_VALIDATE_DTD = 133, // "OPERATOR_VALIDATE_DTD" ++ S_OPERATOR_VALIDATE_HASH = 134, // "OPERATOR_VALIDATE_HASH" ++ S_OPERATOR_VALIDATE_SCHEMA = 135, // "OPERATOR_VALIDATE_SCHEMA" ++ S_OPERATOR_VALIDATE_URL_ENCODING = 136, // "OPERATOR_VALIDATE_URL_ENCODING" ++ S_OPERATOR_VALIDATE_UTF8_ENCODING = 137, // "OPERATOR_VALIDATE_UTF8_ENCODING" ++ S_OPERATOR_VERIFY_CC = 138, // "OPERATOR_VERIFY_CC" ++ S_OPERATOR_VERIFY_CPF = 139, // "OPERATOR_VERIFY_CPF" ++ S_OPERATOR_VERIFY_SSN = 140, // "OPERATOR_VERIFY_SSN" ++ S_OPERATOR_VERIFY_SVNR = 141, // "OPERATOR_VERIFY_SVNR" ++ S_OPERATOR_WITHIN = 142, // "OPERATOR_WITHIN" ++ S_CONFIG_DIR_AUDIT_LOG_FMT = 143, // CONFIG_DIR_AUDIT_LOG_FMT ++ S_JSON = 144, // JSON ++ S_NATIVE = 145, // NATIVE ++ S_ACTION_CTL_RULE_ENGINE = 146, // "ACTION_CTL_RULE_ENGINE" ++ S_ACTION_ACCURACY = 147, // "Accuracy" ++ S_ACTION_ALLOW = 148, // "Allow" ++ S_ACTION_APPEND = 149, // "Append" ++ S_ACTION_AUDIT_LOG = 150, // "AuditLog" ++ S_ACTION_BLOCK = 151, // "Block" ++ S_ACTION_CAPTURE = 152, // "Capture" ++ S_ACTION_CHAIN = 153, // "Chain" ++ S_ACTION_CTL_AUDIT_ENGINE = 154, // "ACTION_CTL_AUDIT_ENGINE" ++ S_ACTION_CTL_AUDIT_LOG_PARTS = 155, // "ACTION_CTL_AUDIT_LOG_PARTS" ++ S_ACTION_CTL_BDY_JSON = 156, // "ACTION_CTL_BDY_JSON" ++ S_ACTION_CTL_BDY_XML = 157, // "ACTION_CTL_BDY_XML" ++ S_ACTION_CTL_BDY_URLENCODED = 158, // "ACTION_CTL_BDY_URLENCODED" ++ S_ACTION_CTL_FORCE_REQ_BODY_VAR = 159, // "ACTION_CTL_FORCE_REQ_BODY_VAR" ++ S_ACTION_CTL_REQUEST_BODY_ACCESS = 160, // "ACTION_CTL_REQUEST_BODY_ACCESS" ++ S_ACTION_CTL_RULE_REMOVE_BY_ID = 161, // "ACTION_CTL_RULE_REMOVE_BY_ID" ++ S_ACTION_CTL_RULE_REMOVE_BY_TAG = 162, // "ACTION_CTL_RULE_REMOVE_BY_TAG" ++ S_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 163, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" ++ S_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 164, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" ++ S_ACTION_DENY = 165, // "Deny" ++ S_ACTION_DEPRECATE_VAR = 166, // "DeprecateVar" ++ S_ACTION_DROP = 167, // "Drop" ++ S_ACTION_EXEC = 168, // "Exec" ++ S_ACTION_EXPIRE_VAR = 169, // "ExpireVar" ++ S_ACTION_ID = 170, // "Id" ++ S_ACTION_INITCOL = 171, // "InitCol" ++ S_ACTION_LOG = 172, // "Log" ++ S_ACTION_LOG_DATA = 173, // "LogData" ++ S_ACTION_MATURITY = 174, // "Maturity" ++ S_ACTION_MSG = 175, // "Msg" ++ S_ACTION_MULTI_MATCH = 176, // "MultiMatch" ++ S_ACTION_NO_AUDIT_LOG = 177, // "NoAuditLog" ++ S_ACTION_NO_LOG = 178, // "NoLog" ++ S_ACTION_PASS = 179, // "Pass" ++ S_ACTION_PAUSE = 180, // "Pause" ++ S_ACTION_PHASE = 181, // "Phase" ++ S_ACTION_PREPEND = 182, // "Prepend" ++ S_ACTION_PROXY = 183, // "Proxy" ++ S_ACTION_REDIRECT = 184, // "Redirect" ++ S_ACTION_REV = 185, // "Rev" ++ S_ACTION_SANITISE_ARG = 186, // "SanitiseArg" ++ S_ACTION_SANITISE_MATCHED = 187, // "SanitiseMatched" ++ S_ACTION_SANITISE_MATCHED_BYTES = 188, // "SanitiseMatchedBytes" ++ S_ACTION_SANITISE_REQUEST_HEADER = 189, // "SanitiseRequestHeader" ++ S_ACTION_SANITISE_RESPONSE_HEADER = 190, // "SanitiseResponseHeader" ++ S_ACTION_SETENV = 191, // "SetEnv" ++ S_ACTION_SETRSC = 192, // "SetRsc" ++ S_ACTION_SETSID = 193, // "SetSid" ++ S_ACTION_SETUID = 194, // "SetUID" ++ S_ACTION_SEVERITY = 195, // "Severity" ++ S_ACTION_SKIP = 196, // "Skip" ++ S_ACTION_SKIP_AFTER = 197, // "SkipAfter" ++ S_ACTION_STATUS = 198, // "Status" ++ S_ACTION_TAG = 199, // "Tag" ++ S_ACTION_TRANSFORMATION_BASE_64_ENCODE = 200, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" ++ S_ACTION_TRANSFORMATION_BASE_64_DECODE = 201, // "ACTION_TRANSFORMATION_BASE_64_DECODE" ++ S_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 202, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" ++ S_ACTION_TRANSFORMATION_CMD_LINE = 203, // "ACTION_TRANSFORMATION_CMD_LINE" ++ S_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 204, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" ++ S_ACTION_TRANSFORMATION_CSS_DECODE = 205, // "ACTION_TRANSFORMATION_CSS_DECODE" ++ S_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 206, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" ++ S_ACTION_TRANSFORMATION_HEX_ENCODE = 207, // "ACTION_TRANSFORMATION_HEX_ENCODE" ++ S_ACTION_TRANSFORMATION_HEX_DECODE = 208, // "ACTION_TRANSFORMATION_HEX_DECODE" ++ S_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 209, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" ++ S_ACTION_TRANSFORMATION_JS_DECODE = 210, // "ACTION_TRANSFORMATION_JS_DECODE" ++ S_ACTION_TRANSFORMATION_LENGTH = 211, // "ACTION_TRANSFORMATION_LENGTH" ++ S_ACTION_TRANSFORMATION_LOWERCASE = 212, // "ACTION_TRANSFORMATION_LOWERCASE" ++ S_ACTION_TRANSFORMATION_MD5 = 213, // "ACTION_TRANSFORMATION_MD5" ++ S_ACTION_TRANSFORMATION_NONE = 214, // "ACTION_TRANSFORMATION_NONE" ++ S_ACTION_TRANSFORMATION_NORMALISE_PATH = 215, // "ACTION_TRANSFORMATION_NORMALISE_PATH" ++ S_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 216, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" ++ S_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 217, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" ++ S_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 218, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" ++ S_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 219, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" ++ S_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 220, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" ++ S_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 221, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" ++ S_ACTION_TRANSFORMATION_REMOVE_NULLS = 222, // "ACTION_TRANSFORMATION_REMOVE_NULLS" ++ S_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 223, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" ++ S_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 224, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" ++ S_ACTION_TRANSFORMATION_REPLACE_NULLS = 225, // "ACTION_TRANSFORMATION_REPLACE_NULLS" ++ S_ACTION_TRANSFORMATION_SHA1 = 226, // "ACTION_TRANSFORMATION_SHA1" ++ S_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 227, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" ++ S_ACTION_TRANSFORMATION_TRIM = 228, // "ACTION_TRANSFORMATION_TRIM" ++ S_ACTION_TRANSFORMATION_TRIM_LEFT = 229, // "ACTION_TRANSFORMATION_TRIM_LEFT" ++ S_ACTION_TRANSFORMATION_TRIM_RIGHT = 230, // "ACTION_TRANSFORMATION_TRIM_RIGHT" ++ S_ACTION_TRANSFORMATION_UPPERCASE = 231, // "ACTION_TRANSFORMATION_UPPERCASE" ++ S_ACTION_TRANSFORMATION_URL_ENCODE = 232, // "ACTION_TRANSFORMATION_URL_ENCODE" ++ S_ACTION_TRANSFORMATION_URL_DECODE = 233, // "ACTION_TRANSFORMATION_URL_DECODE" ++ S_ACTION_TRANSFORMATION_URL_DECODE_UNI = 234, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" ++ S_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 235, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" ++ S_ACTION_VER = 236, // "Ver" ++ S_ACTION_XMLNS = 237, // "xmlns" ++ S_CONFIG_COMPONENT_SIG = 238, // "CONFIG_COMPONENT_SIG" ++ S_CONFIG_CONN_ENGINE = 239, // "CONFIG_CONN_ENGINE" ++ S_CONFIG_SEC_ARGUMENT_SEPARATOR = 240, // "CONFIG_SEC_ARGUMENT_SEPARATOR" ++ S_CONFIG_SEC_WEB_APP_ID = 241, // "CONFIG_SEC_WEB_APP_ID" ++ S_CONFIG_SEC_SERVER_SIG = 242, // "CONFIG_SEC_SERVER_SIG" ++ S_CONFIG_DIR_AUDIT_DIR = 243, // "CONFIG_DIR_AUDIT_DIR" ++ S_CONFIG_DIR_AUDIT_DIR_MOD = 244, // "CONFIG_DIR_AUDIT_DIR_MOD" ++ S_CONFIG_DIR_AUDIT_ENG = 245, // "CONFIG_DIR_AUDIT_ENG" ++ S_CONFIG_DIR_AUDIT_FLE_MOD = 246, // "CONFIG_DIR_AUDIT_FLE_MOD" ++ S_CONFIG_DIR_AUDIT_LOG = 247, // "CONFIG_DIR_AUDIT_LOG" ++ S_CONFIG_DIR_AUDIT_LOG2 = 248, // "CONFIG_DIR_AUDIT_LOG2" ++ S_CONFIG_DIR_AUDIT_LOG_P = 249, // "CONFIG_DIR_AUDIT_LOG_P" ++ S_CONFIG_DIR_AUDIT_STS = 250, // "CONFIG_DIR_AUDIT_STS" ++ S_CONFIG_DIR_AUDIT_TPE = 251, // "CONFIG_DIR_AUDIT_TPE" ++ S_CONFIG_DIR_DEBUG_LOG = 252, // "CONFIG_DIR_DEBUG_LOG" ++ S_CONFIG_DIR_DEBUG_LVL = 253, // "CONFIG_DIR_DEBUG_LVL" ++ S_CONFIG_SEC_CACHE_TRANSFORMATIONS = 254, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" ++ S_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 255, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" ++ S_CONFIG_SEC_HASH_ENGINE = 256, // "CONFIG_SEC_HASH_ENGINE" ++ S_CONFIG_SEC_HASH_KEY = 257, // "CONFIG_SEC_HASH_KEY" ++ S_CONFIG_SEC_HASH_PARAM = 258, // "CONFIG_SEC_HASH_PARAM" ++ S_CONFIG_SEC_HASH_METHOD_RX = 259, // "CONFIG_SEC_HASH_METHOD_RX" ++ S_CONFIG_SEC_HASH_METHOD_PM = 260, // "CONFIG_SEC_HASH_METHOD_PM" ++ S_CONFIG_SEC_CHROOT_DIR = 261, // "CONFIG_SEC_CHROOT_DIR" ++ S_CONFIG_DIR_GEO_DB = 262, // "CONFIG_DIR_GEO_DB" ++ S_CONFIG_DIR_GSB_DB = 263, // "CONFIG_DIR_GSB_DB" ++ S_CONFIG_SEC_GUARDIAN_LOG = 264, // "CONFIG_SEC_GUARDIAN_LOG" ++ S_CONFIG_DIR_PCRE_MATCH_LIMIT = 265, // "CONFIG_DIR_PCRE_MATCH_LIMIT" ++ S_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 266, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" ++ S_CONFIG_SEC_CONN_R_STATE_LIMIT = 267, // "CONFIG_SEC_CONN_R_STATE_LIMIT" ++ S_CONFIG_SEC_CONN_W_STATE_LIMIT = 268, // "CONFIG_SEC_CONN_W_STATE_LIMIT" ++ S_CONFIG_SEC_SENSOR_ID = 269, // "CONFIG_SEC_SENSOR_ID" ++ S_CONFIG_DIR_ARGS_LIMIT = 270, // "CONFIG_DIR_ARGS_LIMIT" ++ S_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 271, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" ++ S_CONFIG_DIR_REQ_BODY = 272, // "CONFIG_DIR_REQ_BODY" ++ S_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 273, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" ++ S_CONFIG_DIR_REQ_BODY_LIMIT = 274, // "CONFIG_DIR_REQ_BODY_LIMIT" ++ S_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 275, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" ++ S_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 276, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" ++ S_CONFIG_DIR_RES_BODY = 277, // "CONFIG_DIR_RES_BODY" ++ S_CONFIG_DIR_RES_BODY_LIMIT = 278, // "CONFIG_DIR_RES_BODY_LIMIT" ++ S_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 279, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" ++ S_CONFIG_SEC_RULE_INHERITANCE = 280, // "CONFIG_SEC_RULE_INHERITANCE" ++ S_CONFIG_SEC_RULE_PERF_TIME = 281, // "CONFIG_SEC_RULE_PERF_TIME" ++ S_CONFIG_DIR_RULE_ENG = 282, // "CONFIG_DIR_RULE_ENG" ++ S_CONFIG_DIR_SEC_ACTION = 283, // "CONFIG_DIR_SEC_ACTION" ++ S_CONFIG_DIR_SEC_DEFAULT_ACTION = 284, // "CONFIG_DIR_SEC_DEFAULT_ACTION" ++ S_CONFIG_DIR_SEC_MARKER = 285, // "CONFIG_DIR_SEC_MARKER" ++ S_CONFIG_DIR_UNICODE_MAP_FILE = 286, // "CONFIG_DIR_UNICODE_MAP_FILE" ++ S_CONFIG_DIR_UNICODE_CODE_PAGE = 287, // "CONFIG_DIR_UNICODE_CODE_PAGE" ++ S_CONFIG_SEC_COLLECTION_TIMEOUT = 288, // "CONFIG_SEC_COLLECTION_TIMEOUT" ++ S_CONFIG_SEC_HTTP_BLKEY = 289, // "CONFIG_SEC_HTTP_BLKEY" ++ S_CONFIG_SEC_INTERCEPT_ON_ERROR = 290, // "CONFIG_SEC_INTERCEPT_ON_ERROR" ++ S_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 291, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" ++ S_CONFIG_SEC_RULE_REMOVE_BY_ID = 292, // "CONFIG_SEC_RULE_REMOVE_BY_ID" ++ S_CONFIG_SEC_RULE_REMOVE_BY_MSG = 293, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" ++ S_CONFIG_SEC_RULE_REMOVE_BY_TAG = 294, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" ++ S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 295, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" ++ S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 296, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" ++ S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 297, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" ++ S_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 298, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" ++ S_CONFIG_UPDLOAD_KEEP_FILES = 299, // "CONFIG_UPDLOAD_KEEP_FILES" ++ S_CONFIG_UPDLOAD_SAVE_TMP_FILES = 300, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" ++ S_CONFIG_UPLOAD_DIR = 301, // "CONFIG_UPLOAD_DIR" ++ S_CONFIG_UPLOAD_FILE_LIMIT = 302, // "CONFIG_UPLOAD_FILE_LIMIT" ++ S_CONFIG_UPLOAD_FILE_MODE = 303, // "CONFIG_UPLOAD_FILE_MODE" ++ S_CONFIG_VALUE_ABORT = 304, // "CONFIG_VALUE_ABORT" ++ S_CONFIG_VALUE_DETC = 305, // "CONFIG_VALUE_DETC" ++ S_CONFIG_VALUE_HTTPS = 306, // "CONFIG_VALUE_HTTPS" ++ S_CONFIG_VALUE_OFF = 307, // "CONFIG_VALUE_OFF" ++ S_CONFIG_VALUE_ON = 308, // "CONFIG_VALUE_ON" ++ S_CONFIG_VALUE_PARALLEL = 309, // "CONFIG_VALUE_PARALLEL" ++ S_CONFIG_VALUE_PROCESS_PARTIAL = 310, // "CONFIG_VALUE_PROCESS_PARTIAL" ++ S_CONFIG_VALUE_REJECT = 311, // "CONFIG_VALUE_REJECT" ++ S_CONFIG_VALUE_RELEVANT_ONLY = 312, // "CONFIG_VALUE_RELEVANT_ONLY" ++ S_CONFIG_VALUE_SERIAL = 313, // "CONFIG_VALUE_SERIAL" ++ S_CONFIG_VALUE_WARN = 314, // "CONFIG_VALUE_WARN" ++ S_CONFIG_XML_EXTERNAL_ENTITY = 315, // "CONFIG_XML_EXTERNAL_ENTITY" ++ S_CONGIG_DIR_RESPONSE_BODY_MP = 316, // "CONGIG_DIR_RESPONSE_BODY_MP" ++ S_CONGIG_DIR_SEC_ARG_SEP = 317, // "CONGIG_DIR_SEC_ARG_SEP" ++ S_CONGIG_DIR_SEC_COOKIE_FORMAT = 318, // "CONGIG_DIR_SEC_COOKIE_FORMAT" ++ S_CONFIG_SEC_COOKIEV0_SEPARATOR = 319, // "CONFIG_SEC_COOKIEV0_SEPARATOR" ++ S_CONGIG_DIR_SEC_DATA_DIR = 320, // "CONGIG_DIR_SEC_DATA_DIR" ++ S_CONGIG_DIR_SEC_STATUS_ENGINE = 321, // "CONGIG_DIR_SEC_STATUS_ENGINE" ++ S_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 322, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" ++ S_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 323, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" ++ S_CONGIG_DIR_SEC_TMP_DIR = 324, // "CONGIG_DIR_SEC_TMP_DIR" ++ S_DIRECTIVE = 325, // "DIRECTIVE" ++ S_DIRECTIVE_SECRULESCRIPT = 326, // "DIRECTIVE_SECRULESCRIPT" ++ S_FREE_TEXT_QUOTE_MACRO_EXPANSION = 327, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++ S_QUOTATION_MARK = 328, // "QUOTATION_MARK" ++ S_RUN_TIME_VAR_BLD = 329, // "RUN_TIME_VAR_BLD" ++ S_RUN_TIME_VAR_DUR = 330, // "RUN_TIME_VAR_DUR" ++ S_RUN_TIME_VAR_HSV = 331, // "RUN_TIME_VAR_HSV" ++ S_RUN_TIME_VAR_REMOTE_USER = 332, // "RUN_TIME_VAR_REMOTE_USER" ++ S_RUN_TIME_VAR_TIME = 333, // "RUN_TIME_VAR_TIME" ++ S_RUN_TIME_VAR_TIME_DAY = 334, // "RUN_TIME_VAR_TIME_DAY" ++ S_RUN_TIME_VAR_TIME_EPOCH = 335, // "RUN_TIME_VAR_TIME_EPOCH" ++ S_RUN_TIME_VAR_TIME_HOUR = 336, // "RUN_TIME_VAR_TIME_HOUR" ++ S_RUN_TIME_VAR_TIME_MIN = 337, // "RUN_TIME_VAR_TIME_MIN" ++ S_RUN_TIME_VAR_TIME_MON = 338, // "RUN_TIME_VAR_TIME_MON" ++ S_RUN_TIME_VAR_TIME_SEC = 339, // "RUN_TIME_VAR_TIME_SEC" ++ S_RUN_TIME_VAR_TIME_WDAY = 340, // "RUN_TIME_VAR_TIME_WDAY" ++ S_RUN_TIME_VAR_TIME_YEAR = 341, // "RUN_TIME_VAR_TIME_YEAR" ++ S_VARIABLE = 342, // "VARIABLE" ++ S_DICT_ELEMENT = 343, // "Dictionary element" ++ S_DICT_ELEMENT_REGEXP = 344, // "Dictionary element, selected by regexp" ++ S_YYACCEPT = 345, // $accept ++ S_input = 346, // input ++ S_line = 347, // line ++ S_audit_log = 348, // audit_log ++ S_actions = 349, // actions ++ S_actions_may_quoted = 350, // actions_may_quoted ++ S_op = 351, // op ++ S_op_before_init = 352, // op_before_init ++ S_expression = 353, // expression ++ S_variables = 354, // variables ++ S_variables_pre_process = 355, // variables_pre_process ++ S_variables_may_be_quoted = 356, // variables_may_be_quoted ++ S_var = 357, // var ++ S_act = 358, // act ++ S_setvar_action = 359, // setvar_action ++ S_run_time_string = 360 // run_time_string + }; + }; + +@@ -2413,13 +2416,13 @@ switch (yykind) + symbol_type (int tok, location_type l) + : super_type(token_type (tok), std::move (l)) + { +- YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); ++ YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_MULTIPART_PART_HEADERS || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); + } + #else + symbol_type (int tok, const location_type& l) + : super_type(token_type (tok), l) + { +- YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); ++ YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_MULTIPART_PART_HEADERS || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); + } + #endif + #if 201103L <= YY_CPLUSPLUS +@@ -2873,6 +2876,21 @@ switch (yykind) + return symbol_type (token::TOK_VARIABLE_REQUEST_COOKIES_NAMES, l); + } + #endif ++#if 201103L <= YY_CPLUSPLUS ++ static ++ symbol_type ++ make_VARIABLE_MULTIPART_PART_HEADERS (location_type l) ++ { ++ return symbol_type (token::TOK_VARIABLE_MULTIPART_PART_HEADERS, std::move (l)); ++ } ++#else ++ static ++ symbol_type ++ make_VARIABLE_MULTIPART_PART_HEADERS (const location_type& l) ++ { ++ return symbol_type (token::TOK_VARIABLE_MULTIPART_PART_HEADERS, l); ++ } ++#endif + #if 201103L <= YY_CPLUSPLUS + static + symbol_type +@@ -7973,9 +7991,9 @@ switch (yykind) + /// Constants. + enum + { +- yylast_ = 3274, ///< Last index in yytable_. ++ yylast_ = 3344, ///< Last index in yytable_. + yynnts_ = 16, ///< Number of nonterminal symbols. +- yyfinal_ = 338 ///< Termination state number. ++ yyfinal_ = 339 ///< Termination state number. + }; + + +@@ -8053,10 +8071,10 @@ switch (yykind) + 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, + 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, + 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, +- 335, 336, 337, 338, 339, 340, 341, 342, 343 ++ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344 + }; + // Last valid token kind. +- const int code_max = 598; ++ const int code_max = 599; + + if (t <= 0) + return symbol_kind::S_YYEOF; +@@ -8626,7 +8644,7 @@ switch (yykind) + } + + } // yy +-#line 8630 "seclang-parser.hh" ++#line 8648 "seclang-parser.hh" + + + +diff --git a/src/parser/seclang-parser.yy b/src/parser/seclang-parser.yy +index 0cbbee08..332a30d1 100644 +--- a/src/parser/seclang-parser.yy ++++ b/src/parser/seclang-parser.yy +@@ -217,6 +217,7 @@ class Driver; + #include "src/variables/request_body_length.h" + #include "src/variables/request_cookies.h" + #include "src/variables/request_cookies_names.h" ++#include "src/variables/multipart_part_headers.h" + #include "src/variables/request_file_name.h" + #include "src/variables/request_headers.h" + #include "src/variables/request_headers_names.h" +@@ -352,6 +353,7 @@ using namespace modsecurity::operators; + VARIABLE_RESPONSE_HEADERS + VARIABLE_GEO + VARIABLE_REQUEST_COOKIES_NAMES ++ VARIABLE_MULTIPART_PART_HEADERS + VARIABLE_ARGS_COMBINED_SIZE + VARIABLE_ARGS_GET_NAMES + VARIABLE_RULE +@@ -2061,6 +2063,18 @@ var: + { + VARIABLE_CONTAINER($$, new variables::RequestCookiesNames_NoDictElement()); + } ++ | VARIABLE_MULTIPART_PART_HEADERS DICT_ELEMENT ++ { ++ VARIABLE_CONTAINER($$, new variables::MultipartPartHeaders_DictElement($2)); ++ } ++ | VARIABLE_MULTIPART_PART_HEADERS DICT_ELEMENT_REGEXP ++ { ++ VARIABLE_CONTAINER($$, new variables::MultipartPartHeaders_DictElementRegexp($2)); ++ } ++ | VARIABLE_MULTIPART_PART_HEADERS ++ { ++ VARIABLE_CONTAINER($$, new variables::MultipartPartHeaders_NoDictElement()); ++ } + | VARIABLE_RULE DICT_ELEMENT + { + VARIABLE_CONTAINER($$, new variables::Rule_DictElement($2)); +diff --git a/src/parser/seclang-scanner.cc b/src/parser/seclang-scanner.cc +index 99fd50ca..3aa6f520 100644 +--- a/src/parser/seclang-scanner.cc ++++ b/src/parser/seclang-scanner.cc +@@ -433,8 +433,8 @@ static void yynoreturn yy_fatal_error ( const char* msg ); + /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\ + (yy_c_buf_p) = yy_cp; + /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ +-#define YY_NUM_RULES 542 +-#define YY_END_OF_BUFFER 543 ++#define YY_NUM_RULES 544 ++#define YY_END_OF_BUFFER 545 + /* This struct is not used in this scanner, + but its presence is necessary. */ + struct yy_trans_info +@@ -442,7 +442,7 @@ struct yy_trans_info + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +-static const flex_int16_t yy_accept[3953] = ++static const flex_int16_t yy_accept[3966] = + { 0, + 0, 0, 0, 0, 273, 273, 281, 281, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -451,108 +451,108 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 285, 285, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 543, 535, 529, 266, 270, 271, +- 269, 272, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 535, 535, 289, 289, 542, 289, 289, ++ 0, 0, 0, 0, 545, 537, 531, 266, 270, 271, ++ 269, 272, 537, 537, 537, 537, 537, 537, 537, 537, ++ 537, 537, 537, 537, 537, 289, 289, 544, 289, 289, + + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 126, 273, 279, 281, +- 283, 277, 276, 278, 275, 281, 274, 493, 493, 492, +- 493, 493, 493, 121, 120, 119, 128, 128, 128, 135, ++ 283, 277, 276, 278, 275, 281, 274, 495, 495, 494, ++ 495, 495, 495, 121, 120, 119, 128, 128, 128, 135, + 127, 128, 130, 130, 130, 129, 135, 130, 133, 133, +- 133, 132, 135, 131, 133, 534, 534, 534, 542, 495, +- 494, 444, 447, 542, 447, 444, 444, 444, 433, 433, +- 433, 436, 438, 433, 437, 433, 427, 433, 503, 503, +- 503, 502, 507, 503, 505, 505, 505, 504, 507, 505, ++ 133, 132, 135, 131, 133, 536, 536, 536, 544, 497, ++ 496, 446, 449, 544, 449, 446, 446, 446, 435, 435, ++ 435, 438, 440, 435, 439, 435, 429, 435, 505, 505, ++ 505, 504, 509, 505, 507, 507, 507, 506, 509, 507, + 118, 118, 110, 118, 115, 109, 118, 118, 118, 118, + + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, +- 118, 118, 118, 118, 113, 118, 112, 542, 512, 542, +- 508, 521, 542, 285, 286, 542, 499, 499, 498, 501, +- 499, 497, 497, 496, 501, 497, 150, 536, 537, 538, ++ 118, 118, 118, 118, 113, 118, 112, 544, 514, 544, ++ 510, 523, 544, 285, 286, 544, 501, 501, 500, 503, ++ 501, 499, 499, 498, 503, 499, 150, 538, 539, 540, + 137, 136, 137, 137, 137, 137, 137, 137, 141, 140, + 145, 146, 146, 145, 143, 142, 140, 148, 149, 149, +- 147, 148, 529, 266, 0, 269, 269, 269, 0, 0, ++ 147, 148, 531, 266, 0, 269, 269, 269, 0, 0, + 0, 0, 0, 0, 0, 0, 218, 0, 0, 0, +- 0, 0, 530, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 412, 0, 0, 0, ++ 0, 0, 532, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 414, 0, 0, 0, + +- 0, 0, 0, 0, 0, 0, 0, 0, 417, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 419, 0, + 0, 0, 0, 0, 122, 0, 125, 273, 279, 281, +- 283, 280, 281, 282, 283, 284, 529, 0, 0, 0, ++ 283, 280, 281, 282, 283, 284, 531, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 128, 0, 128, 128, 128, + 0, 134, 122, 128, 128, 130, 0, 0, 130, 130, + 130, 0, 130, 122, 130, 133, 0, 0, 133, 133, +- 133, 0, 133, 122, 133, 534, 534, 534, 0, 532, +- 534, 444, 0, 444, 0, 444, 444, 0, 444, 444, +- 433, 0, 0, 432, 433, 433, 433, 0, 433, 506, +- +- 433, 433, 0, 432, 0, 433, 425, 426, 433, 433, +- 503, 0, 0, 503, 503, 503, 0, 503, 122, 503, +- 505, 0, 505, 505, 0, 505, 0, 0, 122, 505, +- 505, 0, 110, 0, 109, 0, 111, 115, 116, 0, ++ 133, 0, 133, 122, 133, 536, 536, 536, 0, 534, ++ 536, 446, 0, 446, 0, 446, 446, 0, 446, 446, ++ 435, 0, 0, 434, 435, 435, 435, 0, 435, 508, ++ ++ 435, 435, 0, 434, 0, 435, 427, 428, 435, 435, ++ 505, 0, 0, 505, 505, 505, 0, 505, 122, 505, ++ 507, 0, 507, 507, 0, 507, 0, 0, 122, 507, ++ 507, 0, 110, 0, 109, 0, 111, 115, 116, 0, + 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 105, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 107, 0, 0, 113, 0, 114, 112, +- 112, 0, 512, 0, 521, 0, 512, 510, 520, 0, +- 508, 521, 0, 0, 528, 0, 511, 0, 285, 286, ++ 112, 0, 514, 0, 523, 0, 514, 512, 522, 0, ++ 510, 523, 0, 0, 530, 0, 513, 0, 285, 286, + +- 0, 286, 0, 0, 499, 0, 499, 0, 500, 499, +- 497, 0, 0, 497, 0, 497, 536, 537, 538, 0, ++ 0, 286, 0, 0, 501, 0, 501, 0, 502, 501, ++ 499, 0, 0, 499, 0, 499, 538, 539, 540, 0, + 0, 0, 0, 0, 0, 138, 139, 145, 0, 0, + 145, 0, 145, 144, 148, 0, 0, 148, 0, 148, + 269, 0, 0, 0, 0, 0, 0, 0, 217, 0, +- 0, 0, 0, 0, 0, 0, 530, 531, 0, 0, +- 0, 395, 0, 0, 385, 0, 0, 0, 420, 0, ++ 0, 0, 0, 0, 0, 0, 532, 533, 0, 0, ++ 0, 397, 0, 0, 385, 0, 0, 0, 422, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 423, 0, 0, 0, 0, 393, 122, +- 123, 124, 0, 0, 0, 0, 465, 0, 466, 0, ++ 0, 0, 0, 425, 0, 0, 0, 0, 395, 122, ++ 123, 124, 0, 0, 0, 0, 467, 0, 468, 0, + +- 467, 0, 0, 470, 471, 473, 0, 0, 475, 0, +- 0, 0, 0, 0, 0, 466, 0, 0, 0, 128, ++ 469, 0, 0, 472, 473, 475, 0, 0, 477, 0, ++ 0, 0, 0, 0, 0, 468, 0, 0, 0, 128, + 0, 0, 122, 123, 0, 130, 0, 0, 122, 123, +- 0, 133, 0, 0, 122, 123, 532, 533, 444, 0, +- 444, 0, 439, 0, 439, 0, 444, 0, 433, 0, +- 0, 433, 0, 432, 0, 433, 433, 433, 433, 433, +- 0, 0, 0, 0, 433, 433, 433, 0, 503, 0, +- 0, 122, 123, 0, 505, 0, 0, 122, 122, 123, ++ 0, 133, 0, 0, 122, 123, 534, 535, 446, 0, ++ 446, 0, 441, 0, 441, 0, 446, 0, 435, 0, ++ 0, 435, 0, 434, 0, 435, 435, 435, 435, 435, ++ 0, 0, 0, 0, 435, 435, 435, 0, 505, 0, ++ 0, 122, 123, 0, 507, 0, 0, 122, 122, 123, + 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, + + 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 107, 108, 510, 520, 516, 519, 0, +- 523, 0, 0, 528, 0, 0, 511, 509, 518, 0, +- 0, 287, 0, 0, 499, 0, 0, 0, 497, 0, ++ 0, 0, 0, 107, 108, 512, 522, 518, 521, 0, ++ 525, 0, 0, 530, 0, 0, 513, 511, 520, 0, ++ 0, 287, 0, 0, 501, 0, 0, 0, 499, 0, + 0, 0, 0, 0, 0, 0, 145, 0, 0, 0, + 148, 0, 0, 269, 0, 0, 0, 0, 0, 169, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 224, 531, 361, 0, 0, 396, 0, 0, 386, 0, ++ 224, 533, 361, 0, 0, 398, 0, 0, 386, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 389, 0, 0, 0, 408, 0, 0, +- 418, 0, 0, 394, 123, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 472, 474, 0, 0, 0, 0, ++ 0, 0, 0, 391, 0, 0, 0, 410, 0, 0, ++ 420, 0, 0, 396, 123, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 474, 476, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 128, 0, 123, +- 130, 0, 123, 133, 0, 123, 533, 444, 0, 0, +- 0, 0, 444, 0, 0, 440, 445, 441, 440, 445, +- 441, 433, 0, 433, 433, 433, 0, 433, 0, 0, +- 0, 0, 433, 0, 432, 0, 433, 433, 428, 434, ++ 130, 0, 123, 133, 0, 123, 535, 446, 0, 0, ++ 0, 0, 446, 0, 0, 442, 447, 443, 442, 447, ++ 443, 435, 0, 435, 435, 435, 0, 435, 0, 0, ++ 0, 0, 435, 0, 434, 0, 435, 435, 430, 436, + +- 429, 428, 434, 429, 0, 0, 433, 433, 503, 0, +- 123, 505, 0, 123, 123, 0, 0, 0, 0, 0, ++ 431, 430, 436, 431, 0, 0, 435, 435, 505, 0, ++ 123, 507, 0, 123, 123, 0, 0, 0, 0, 0, + 0, 0, 0, 5, 0, 0, 7, 0, 0, 0, + 8, 0, 0, 0, 49, 0, 0, 0, 13, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 63, 0, 0, 108, 516, +- 519, 515, 523, 0, 526, 0, 0, 522, 0, 0, +- 509, 518, 514, 517, 287, 0, 288, 499, 0, 497, ++ 0, 0, 0, 0, 0, 63, 0, 0, 108, 518, ++ 521, 517, 525, 0, 528, 0, 0, 524, 0, 0, ++ 511, 520, 516, 519, 287, 0, 288, 501, 0, 499, + + 0, 0, 0, 0, 0, 145, 0, 148, 0, 269, + 269, 214, 0, 0, 216, 0, 0, 0, 0, 0, +@@ -560,75 +560,75 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 362, 0, + 0, 0, 377, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 390, 0, +- 0, 0, 0, 0, 0, 424, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 491, ++ 0, 0, 0, 0, 0, 0, 0, 0, 392, 0, ++ 0, 0, 0, 0, 0, 426, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 493, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 0, 0, 0, 0, 0, 0, 0, 442, 442, 442, +- 0, 0, 430, 430, 0, 0, 0, 433, 433, 0, +- 430, 0, 433, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 444, 444, 444, ++ 0, 0, 432, 432, 0, 0, 0, 435, 435, 0, ++ 432, 0, 435, 0, 0, 0, 0, 0, 0, 0, + 26, 0, 0, 2, 0, 4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, + 14, 0, 0, 16, 0, 0, 53, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 75, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 515, 526, 0, 527, 522, 0, 524, 0, ++ 0, 0, 517, 528, 0, 529, 524, 0, 526, 0, + +- 514, 517, 513, 288, 0, 0, 0, 0, 0, 0, ++ 516, 519, 515, 288, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 269, 269, 0, 0, 0, + 170, 0, 0, 221, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, +- 0, 0, 0, 0, 0, 0, 378, 0, 0, 411, ++ 0, 0, 0, 0, 0, 0, 378, 0, 0, 413, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 415, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 417, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 359, 0, 0, 0, 0, + +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 477, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 446, +- 443, 446, 443, 435, 431, 435, 431, 0, 430, 0, +- 0, 0, 433, 0, 0, 0, 1, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 479, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 448, ++ 445, 448, 445, 437, 433, 437, 433, 0, 432, 0, ++ 0, 0, 435, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 41, 41, 0, 8, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 84, 0, 0, 0, 0, 74, 0, 92, 0, 0, +- 0, 0, 0, 0, 0, 0, 527, 524, 0, 525, ++ 0, 0, 0, 0, 0, 0, 529, 526, 0, 527, + +- 513, 0, 0, 0, 269, 269, 0, 0, 0, 0, ++ 515, 0, 0, 0, 269, 269, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 260, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 419, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 421, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 414, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 416, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 0, 0, 0, 461, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 463, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, + 0, 0, 41, 0, 41, 41, 0, 0, 0, 0, + 0, 0, 0, 50, 0, 0, 15, 0, 0, 52, + 0, 54, 22, 55, 56, 58, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 64, 0, 0, 65, 525, 0, 0, 269, 269, ++ 0, 64, 0, 0, 65, 527, 0, 0, 269, 269, + 0, 0, 0, 219, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 363, 0, 0, 0, 398, 0, 0, ++ 0, 0, 0, 363, 0, 0, 0, 400, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 413, 0, 0, +- 0, 0, 422, 0, 0, 401, 0, 0, 404, 405, +- 406, 0, 0, 0, 0, 360, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 469, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 415, 0, 0, ++ 0, 0, 424, 0, 0, 403, 0, 0, 406, 407, ++ 408, 0, 0, 0, 0, 360, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 471, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 27, 0, 0, 0, 0, 0, 0, +@@ -637,7 +637,7 @@ static const flex_int16_t yy_accept[3953] = + 57, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 97, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 64, 0, 269, 269, +- 0, 0, 0, 0, 539, 0, 0, 262, 0, 0, ++ 0, 0, 0, 0, 541, 0, 0, 262, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -646,10 +646,10 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 364, 0, 0, 365, 297, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 325, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 421, 0, 0, +- 0, 0, 356, 0, 0, 403, 409, 407, 357, 0, +- 0, 0, 463, 0, 0, 464, 0, 0, 0, 0, +- 468, 0, 476, 478, 0, 0, 486, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 423, 0, 0, ++ 0, 0, 356, 0, 0, 405, 411, 409, 357, 0, ++ 0, 0, 465, 0, 0, 466, 0, 0, 0, 0, ++ 470, 0, 478, 480, 0, 0, 488, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 40, 0, 40, 0, 0, + +@@ -668,9 +668,9 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 402, 0, 0, 0, +- 0, 0, 0, 481, 0, 490, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 487, 488, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 404, 0, 0, 0, ++ 0, 0, 0, 483, 0, 492, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 489, 490, 0, 0, 0, + 0, 0, 0, 25, 0, 25, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 46, 48, 0, + 48, 10, 11, 0, 0, 0, 0, 0, 0, 0, +@@ -679,7 +679,7 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 93, 0, 0, 0, 0, +- 0, 269, 0, 267, 267, 267, 267, 267, 0, 540, ++ 0, 269, 0, 267, 267, 267, 267, 267, 0, 542, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 193, 0, 0, +@@ -689,196 +689,197 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 294, 0, 0, 369, 367, + 0, 0, 0, 0, 0, 303, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 327, 328, 329, 400, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 345, 0, 0, 0, 0, 0, +- 353, 354, 355, 416, 0, 0, 479, 0, 0, 452, +- 449, 0, 0, 472, 0, 0, 0, 0, 0, 0, +- 0, 489, 0, 0, 458, 0, 455, 0, 0, 0, +- 0, 25, 0, 0, 0, 26, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 44, 44, 0, 0, 48, ++ 0, 327, 328, 329, 402, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 345, 0, 0, 0, 0, ++ 0, 353, 354, 355, 418, 0, 0, 481, 0, 0, ++ 454, 451, 0, 0, 474, 0, 0, 0, 0, 0, ++ 0, 0, 491, 0, 0, 460, 0, 457, 0, 0, ++ 0, 0, 25, 0, 0, 0, 26, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 44, 44, 0, 0, ++ ++ 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 61, 0, 0, 0, 91, 0, 78, 77, ++ 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 94, 80, 83, 81, 0, 269, 269, ++ 0, 0, 0, 0, 222, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 232, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 245, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, ++ 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 370, 368, 0, ++ 0, 300, 0, 0, 375, 0, 399, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 61, 0, 0, 0, 91, 0, 78, 77, 0, +- 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 94, 80, 83, 81, 0, 269, 269, 0, +- 0, 0, 0, 222, 0, 0, 0, 0, 0, 0, ++ 0, 326, 0, 0, 0, 337, 0, 0, 0, 341, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 232, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 245, 0, 0, 0, 0, ++ 0, 453, 482, 0, 0, 0, 485, 0, 0, 0, ++ 0, 0, 459, 0, 0, 0, 0, 24, 0, 0, ++ 24, 0, 0, 0, 0, 0, 0, 0, 0, 6, + +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, ++ 0, 44, 44, 0, 44, 0, 44, 44, 0, 0, ++ 47, 0, 0, 47, 0, 0, 0, 0, 0, 0, ++ 0, 0, 106, 0, 0, 0, 59, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 370, 368, 0, 0, +- 300, 0, 0, 375, 0, 397, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 326, +- 0, 0, 0, 337, 0, 0, 0, 341, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 451, +- 480, 0, 0, 0, 483, 0, 0, 0, 0, 0, +- 457, 0, 0, 0, 0, 24, 0, 0, 24, 0, +- 0, 0, 0, 0, 0, 0, 0, 6, 0, 44, +- +- 44, 0, 44, 0, 44, 44, 0, 0, 47, 0, +- 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, +- 106, 0, 0, 0, 59, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 268, +- 268, 268, 268, 268, 215, 0, 0, 0, 0, 0, +- 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 242, 0, 0, 0, 0, 0, 0, +- 0, 175, 0, 0, 0, 0, 0, 0, 243, 0, +- +- 0, 0, 192, 0, 0, 0, 0, 191, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 236, 0, 0, +- 0, 0, 0, 154, 154, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 376, 0, 0, 0, ++ 0, 268, 268, 268, 268, 268, 215, 0, 0, 0, ++ 0, 0, 167, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 242, 0, 0, 0, 0, ++ 0, 0, 0, 175, 0, 0, 0, 0, 0, 0, ++ ++ 243, 0, 0, 0, 192, 0, 0, 0, 0, 191, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 236, ++ 0, 0, 0, 0, 0, 154, 154, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 376, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 331, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 346, 0, 0, 0, 0, 0, 0, 462, +- 0, 0, 0, 484, 0, 0, 0, 0, 0, 0, +- 24, 25, 26, 0, 0, 0, 0, 0, 0, 103, +- 44, 43, 44, 44, 43, 0, 0, 44, 43, 0, +- +- 0, 44, 43, 44, 44, 45, 47, 48, 0, 0, +- 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, ++ 0, 0, 0, 0, 0, 331, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 346, 0, 0, 0, 0, ++ 0, 0, 464, 0, 0, 0, 486, 0, 0, 0, ++ 0, 0, 0, 24, 25, 26, 0, 0, 0, 0, ++ 0, 0, 103, 44, 43, 44, 44, 43, 0, 0, ++ ++ 44, 43, 0, 0, 44, 43, 44, 44, 45, 47, ++ 48, 0, 0, 0, 50, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 88, 0, 0, 0, 0, 0, 0, +- 220, 0, 0, 162, 0, 164, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 240, 0, 0, 0, 0, +- 0, 0, 0, 233, 0, 0, 0, 0, 0, 0, +- 250, 0, 0, 265, 265, 0, 0, 0, 0, 0, ++ 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 88, 0, 0, 0, ++ 0, 0, 0, 220, 0, 0, 162, 0, 164, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 240, 0, ++ 0, 0, 0, 0, 0, 0, 233, 0, 0, 0, ++ 0, 0, 0, 250, 0, 0, 265, 265, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 0, 0, 0, 210, 0, 0, 0, 0, 0, 0, +- 0, 0, 291, 0, 0, 391, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 210, 0, 0, 0, ++ 0, 0, 0, 0, 0, 291, 0, 0, 393, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 321, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 342, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 321, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 342, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 44, 0, 43, +- 0, 44, 44, 43, 0, 43, 0, 0, 43, 0, +- 0, 45, 43, 45, 45, 43, 0, 44, 43, 44, +- 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 44, 0, 43, 0, 44, 44, 43, 0, 43, ++ 0, 0, 43, 0, 0, 45, 43, 45, 45, 43, ++ 0, 44, 43, 44, 0, 0, 0, 0, 50, 0, + +- 0, 0, 0, 0, 0, 0, 60, 0, 60, 0, +- 60, 0, 0, 71, 70, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 87, 69, 82, 0, +- 0, 0, 171, 0, 0, 0, 0, 0, 0, 174, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, +- 0, 0, 0, 0, 0, 247, 246, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 237, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 153, 0, 0, 0, 0, 292, +- 295, 0, 392, 0, 0, 0, 0, 0, 0, 0, +- +- 0, 0, 0, 0, 0, 0, 0, 0, 320, 0, +- 0, 0, 0, 0, 0, 0, 0, 379, 0, 381, +- 0, 344, 0, 0, 0, 352, 0, 0, 0, 0, +- 0, 485, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 35, 0, 0, 42, 44, 42, 0, 44, 42, +- 0, 0, 42, 44, 0, 42, 0, 42, 45, 45, +- 42, 45, 26, 0, 18, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, +- 0, 0, 96, 96, 0, 67, 0, 0, 0, 0, +- 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- +- 241, 0, 0, 0, 0, 0, 0, 0, 0, 261, +- 0, 178, 178, 0, 248, 0, 0, 0, 0, 0, ++ 60, 0, 60, 0, 60, 0, 0, 71, 70, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 87, 69, 82, 0, 0, 0, 171, 0, 0, 0, ++ 0, 0, 0, 174, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 176, 0, 0, 0, 0, 0, 247, ++ 246, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 237, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 153, 0, ++ 0, 0, 0, 292, 295, 0, 394, 0, 0, 0, ++ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 320, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 379, 0, 381, 0, 344, 0, 0, 0, ++ 352, 0, 0, 0, 0, 0, 487, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 35, 0, 0, 42, ++ 44, 42, 0, 44, 42, 0, 0, 42, 44, 0, ++ 42, 0, 42, 45, 45, 42, 45, 26, 0, 18, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 211, 0, 0, 0, 153, 0, 0, 296, 0, +- 0, 0, 399, 0, 0, 302, 0, 0, 0, 0, ++ 0, 60, 0, 0, 0, 0, 0, 96, 96, 0, ++ 67, 0, 0, 0, 0, 98, 0, 0, 0, 0, ++ ++ 0, 0, 0, 0, 0, 241, 0, 0, 0, 0, ++ 0, 0, 0, 0, 261, 0, 178, 178, 0, 248, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 211, 0, 0, 0, ++ 153, 0, 0, 296, 0, 0, 0, 401, 0, 0, ++ 302, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 335, 0, ++ 380, 0, 338, 382, 0, 343, 0, 383, 0, 358, ++ 0, 470, 0, 0, 0, 0, 0, 0, 0, 28, ++ ++ 0, 0, 0, 0, 0, 0, 42, 42, 0, 42, ++ 0, 44, 0, 42, 45, 43, 45, 45, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, ++ 0, 0, 0, 0, 68, 66, 100, 0, 0, 0, ++ 0, 0, 0, 168, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 229, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 256, 0, 0, 0, 238, 0, 0, 0, 234, ++ 234, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0, ++ ++ 0, 0, 0, 317, 0, 0, 0, 0, 0, 0, ++ 330, 334, 0, 0, 0, 0, 384, 0, 351, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 335, 0, 380, 0, 338, 382, 0, 343, +- 0, 383, 0, 358, 0, 468, 0, 0, 0, 0, +- 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, +- +- 42, 42, 0, 42, 0, 44, 0, 42, 45, 43, +- 45, 45, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 60, 0, 0, 0, 0, 0, 0, 68, 66, +- 100, 0, 0, 0, 0, 0, 0, 168, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 229, 0, 0, ++ 0, 0, 0, 0, 43, 43, 45, 45, 43, 45, ++ 0, 0, 0, 0, 0, 0, 60, 0, 72, 0, ++ 76, 0, 0, 0, 0, 0, 101, 0, 0, 0, ++ 0, 0, 165, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 177, 0, 249, 0, 0, 0, 543, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 256, 0, 0, 0, 238, +- 0, 0, 0, 234, 234, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 371, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 317, 0, 0, +- +- 0, 0, 0, 330, 334, 0, 0, 0, 0, 384, +- 0, 351, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 43, 43, 45, +- 45, 43, 45, 0, 0, 0, 0, 0, 0, 60, +- 0, 72, 0, 76, 0, 0, 0, 0, 0, 101, +- 0, 0, 0, 0, 0, 165, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 177, 0, 249, 0, 0, +- 0, 541, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 208, 0, 290, 0, 372, 0, +- +- 301, 373, 0, 0, 0, 0, 311, 0, 0, 0, ++ ++ 0, 208, 0, 290, 0, 372, 0, 301, 373, 0, ++ 0, 0, 0, 311, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 482, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, +- 0, 0, 0, 60, 0, 89, 95, 95, 0, 86, +- 0, 181, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 155, 0, 0, 251, 180, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 195, 195, 0, ++ 0, 0, 484, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, ++ 0, 60, 0, 89, 95, 95, 0, 86, 0, 181, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 213, 0, 298, 299, 374, 0, 0, 0, 0, 310, ++ 155, 0, 0, 251, 180, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 195, 195, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 213, 0, + +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 324, +- 0, 336, 0, 0, 0, 0, 0, 410, 0, 0, ++ 298, 299, 374, 0, 0, 0, 0, 310, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 324, 0, ++ 336, 0, 0, 0, 0, 0, 412, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 156, +- 0, 166, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 187, 0, 0, 0, 0, 0, 0, +- 0, 0, 196, 196, 0, 198, 198, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 212, 225, 0, 0, +- 0, 307, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 450, 0, +- +- 0, 0, 456, 0, 0, 29, 0, 0, 0, 36, ++ 0, 0, 0, 0, 0, 0, 0, 0, 156, 0, ++ 166, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 187, 0, 0, 0, 0, 0, 0, 0, ++ 0, 196, 196, 0, 198, 198, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 212, 225, 0, 0, 0, ++ 307, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ ++ 0, 0, 0, 0, 0, 0, 0, 0, 452, 0, ++ 0, 0, 458, 0, 0, 29, 0, 0, 0, 36, + 0, 0, 19, 0, 0, 85, 99, 0, 0, 163, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 185, 0, 0, 190, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 194, 0, 0, 0, 308, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 387, 339, 0, 348, 0, +- 453, 0, 0, 459, 0, 0, 0, 0, 37, 0, +- 20, 0, 161, 228, 228, 0, 161, 157, 0, 0, +- 0, 264, 0, 252, 0, 231, 0, 0, 0, 0, +- +- 0, 0, 0, 0, 189, 0, 0, 197, 199, 0, +- 0, 0, 0, 152, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 315, 0, 0, 0, 322, +- 0, 0, 388, 340, 0, 349, 454, 0, 460, 0, +- 34, 0, 0, 21, 0, 0, 0, 158, 0, 0, +- 253, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 152, 0, 0, 209, 0, +- 0, 306, 0, 0, 0, 0, 0, 0, 0, 333, +- 347, 350, 0, 0, 0, 0, 160, 0, 0, 239, +- 0, 0, 0, 230, 0, 0, 263, 0, 0, 0, +- ++ 0, 0, 0, 0, 0, 0, 387, 339, 0, 348, ++ 0, 455, 0, 0, 461, 0, 0, 0, 0, 37, ++ 0, 20, 0, 161, 228, 228, 0, 161, 157, 0, ++ ++ 0, 0, 264, 0, 252, 0, 231, 0, 0, 0, ++ 0, 0, 0, 0, 0, 189, 0, 0, 197, 199, ++ 0, 0, 0, 0, 152, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 315, 0, 0, 389, ++ 0, 322, 0, 0, 388, 340, 0, 349, 456, 0, ++ 462, 0, 34, 0, 0, 21, 0, 0, 0, 158, ++ 0, 0, 253, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 152, 0, 0, ++ 209, 0, 0, 306, 0, 0, 0, 0, 0, 390, ++ 0, 0, 333, 347, 350, 0, 0, 0, 0, 160, ++ ++ 0, 0, 239, 0, 0, 0, 230, 0, 0, 263, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 312, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 159, 151, ++ 0, 0, 0, 0, 0, 0, 184, 0, 0, 226, ++ 226, 0, 207, 0, 205, 0, 0, 0, 257, 0, ++ 304, 0, 0, 0, 316, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 151, 0, 0, 0, 0, 0, ++ 188, 0, 0, 0, 203, 0, 201, 0, 258, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 312, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 159, 151, 0, 0, 0, +- 0, 0, 0, 184, 0, 0, 226, 226, 0, 207, +- 0, 205, 0, 0, 0, 257, 0, 304, 0, 0, +- 0, 316, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 151, 0, 0, 0, 0, 0, 188, 0, 0, +- 0, 203, 0, 201, 0, 258, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 38, 0, 172, +- 172, 0, 0, 0, 0, 0, 0, 0, 206, 204, +- +- 0, 0, 0, 0, 0, 318, 319, 0, 332, 0, +- 0, 0, 0, 39, 0, 259, 179, 0, 0, 186, +- 0, 202, 200, 0, 0, 0, 323, 0, 0, 0, +- 31, 173, 183, 0, 227, 305, 309, 0, 33, 30, +- 0, 182, 0, 0, 0, 0, 314, 0, 0, 0, +- 32, 0 ++ ++ 38, 0, 172, 172, 0, 0, 0, 0, 0, 0, ++ 0, 206, 204, 0, 0, 0, 0, 0, 318, 319, ++ 0, 332, 0, 0, 0, 0, 39, 0, 259, 179, ++ 0, 0, 186, 0, 202, 200, 0, 0, 0, 323, ++ 0, 0, 0, 31, 173, 183, 0, 227, 305, 309, ++ 0, 33, 30, 0, 182, 0, 0, 0, 0, 314, ++ 0, 0, 0, 32, 0 + } ; + + static const YY_CHAR yy_ec[256] = +@@ -926,953 +927,955 @@ static const YY_CHAR yy_meta[88] = + 15, 15, 15, 15, 17, 18, 1 + } ; + +-static const flex_int16_t yy_base[4238] = ++static const flex_int16_t yy_base[4251] = + { 0, + 0, 80, 161, 0, 4, 8, 14, 247, 21, 87, + 101, 254, 25, 40, 53, 261, 265, 275, 284, 290, +- 94, 304,11621,11620,11617,11573, 324, 347, 365, 383, ++ 94, 304,11801,11718,11649,11643, 324, 347, 365, 383, + 413, 434, 314, 448, 335, 397, 505, 0, 457, 464, + 591, 597, 603, 609, 419, 425, 271, 298, 102, 612, +- 11569,11568,11565,11539,11533,11532,11529,11504, 614, 622, +- 0, 0,11472,11471, 428, 611, 646, 668, 0, 0, +- 57, 79, 620, 627,11497,14261, 673,14261,14261,14261, +- 308,14261, 4, 25, 59, 52, 71, 72, 96, 279, +- 315, 97, 220, 271, 8,14261, 443,14261, 655, 269, ++ 11644,11641,11597,11591,11590,11587,11561,11555, 614, 622, ++ 0, 0,11528,11525, 428, 611, 646, 668, 0, 0, ++ 57, 79, 620, 627,11529,14283, 673,14283,14283,14283, ++ 308,14283, 4, 25, 59, 52, 71, 72, 96, 279, ++ 315, 97, 220, 271, 8,14283, 443,14283, 655, 269, + + 312, 578, 673, 330, 429, 681, 327, 358, 368, 686, +- 679, 699, 707, 421, 422, 38,11479, 133, 765, 771, +- 783,14261,14261,14261,14261, 789,14261,14261, 631,14261, +- 815, 76, 764,14261,14261,14261, 278, 798, 348, 417, +- 11426, 801, 372, 829, 752,11425, 540, 814, 855, 895, +- 883,11422, 546,11414, 904, 830, 901,14261, 913,14261, +- 14261, 918,11408,11407,11404, 924, 957, 964, 934, 980, +- 991,11315, 601, 1012,11109, 1024, 725, 1042, 770, 1054, +- 831,11103, 625, 1063, 645, 978, 802, 867, 663, 1072, +- 14261, 1081,14261,11156, 484, 475, 1047, 719, 764, 874, ++ 679, 699, 707, 421, 422, 38,11513, 133, 765, 771, ++ 783,14283,14283,14283,14283, 789,14283,14283, 631,14283, ++ 815, 76, 764,14283,14283,14283, 278, 798, 348, 417, ++ 11465, 801, 372, 829, 752,11462, 540, 814, 855, 895, ++ 883,11454, 546,11448, 904, 830, 901,14283, 913,14283, ++ 14283, 918,11447,11444,11436, 924, 957, 964, 934, 980, ++ 991,11430, 601, 1012,11429, 1024, 725, 1042, 770, 1054, ++ 831,11426, 625, 1063, 645, 978, 802, 867, 663, 1072, ++ 14283, 1081,14283,11391, 484, 475, 1047, 719, 764, 874, + + 717, 940, 752, 1056, 800, 953, 1064, 818, 1059, 917, +- 821, 885, 405, 1139,14261,11153, 1143, 1147, 476, 309, +- 1153, 1159, 410, 1011, 490, 493, 1096, 1114,11055, 911, +- 1122, 1124, 1129,11049, 943, 1158,14261, 0, 0, 0, +- 14261,14261, 990, 1017, 1053, 1062, 1105, 1118,14261, 120, +- 1162,11048, 1113, 1168,14261,14261, 282, 1178,11045, 1116, +- 10966, 1199, 1200,14261, 495, 0, 1187,10954, 1135, 1140, +- 1144, 1149, 1180, 1172, 1168, 1184,14261, 1173, 1178, 1184, +- 1199, 1182, 636,11013, 1229, 620, 1196, 1187, 1190, 1187, ++ 821, 885, 405, 1139,14283,11185, 1143, 1147, 476, 309, ++ 1153, 1159, 410, 1011, 490, 493, 1096, 1114,11125, 911, ++ 1122, 1124, 1129,11124, 943, 1158,14283, 0, 0, 0, ++ 14283,14283, 990, 1017, 1053, 1062, 1105, 1118,14283, 120, ++ 1162,11121, 1113, 1168,14283,14283, 282, 1178,11077, 1116, ++ 11071, 1199, 1200,14283, 495, 0, 1187,11064, 1135, 1140, ++ 1144, 1149, 1180, 1172, 1168, 1184,14283, 1173, 1178, 1184, ++ 1199, 1182, 636,11121, 1229, 620, 1196, 1187, 1190, 1187, + 1198, 1200, 1198, 1199, 1213, 1221, 297, 1205, 1225, 1220, + + 1213, 1214, 1234, 1230, 1232, 1236, 1245, 1237, 735, 1243, +- 1246, 1254, 1261, 1252, 641,11010,10902, 642, 1321, 1327, +- 1333,14261, 1293,14261, 1304,14261, 1294, 1279, 1270, 1283, ++ 1246, 1254, 1261, 1252, 641,11042,10954, 642, 1321, 1327, ++ 1333,14283, 1293,14283, 1304,14283, 1294, 1279, 1270, 1283, + 1297, 1268, 1304, 1311, 1298, 1302, 1317, 1302, 1314, 1328, +- 1321, 1329, 1354, 1321, 1339, 920,10924, 670, 1395, 1405, +- 1400,14261, 1409, 1410, 1406, 1416,10923,10920, 998, 1423, +- 1431, 1417, 1429, 1435, 1440, 1439,10912,10906, 1391, 1454, +- 1467, 1448, 1468, 1474, 1484, 1498, 1504,14261, 1510, 933, +- 1514, 1525,10905, 1518,10952, 1541, 1561, 346, 1578, 1584, +- 1585,10777,10773, 1609, 1527, 1624, 1642, 1500, 1648,14261, +- +- 1673, 1677, 1615, 1707, 842, 1708,14261,14261, 1733, 1739, +- 1488,10737,10687, 1005, 1722, 1549, 1633, 1684, 1745, 1701, +- 1568,10669, 1172, 1751, 1671, 1599, 1664, 1605, 1764, 1767, +- 1734, 1780,14261,10705, 949, 816,14261, 1784,14261,10701, ++ 1321, 1329, 1354, 1321, 1339, 920,10981, 670, 1395, 1405, ++ 1400,14283, 1409, 1410, 1406, 1416,10978,10952, 998, 1423, ++ 1431, 1417, 1429, 1435, 1440, 1439,10946,10945, 1391, 1454, ++ 1467, 1448, 1468, 1474, 1484, 1498, 1504,14283, 1510, 933, ++ 1514, 1525,10942, 1518,10984, 1541, 1561, 346, 1578, 1584, ++ 1585,10928,10927, 1609, 1527, 1624, 1642, 1500, 1648,14283, ++ ++ 1673, 1677, 1615, 1707, 842, 1708,14283,14283, 1733, 1739, ++ 1488,10924,10799, 1005, 1722, 1549, 1633, 1684, 1745, 1701, ++ 1568,10795, 1172, 1751, 1671, 1599, 1664, 1605, 1764, 1767, ++ 1734, 1780,14283,10813, 949, 816,14283, 1784,14283,10763, + 1463, 1335, 1402, 1444, 1474, 1477, 1503, 1529, 1581, 1753, +- 1658, 1746,10604, 1734, 1739, 1728, 1761, 1758, 1774, 1771, +- 14261, 1761, 1780, 1778, 1780, 1771, 1767, 1779, 1798, 1829, +- 1793, 1800, 1811, 1533,10589, 1880,14261,10583,14261, 1907, +- 1911, 1915, 1567, 701, 1921, 1075, 1691, 1560, 1847,10582, ++ 1658, 1746,10720, 1734, 1739, 1728, 1761, 1758, 1774, 1771, ++ 14283, 1761, 1780, 1778, 1780, 1771, 1767, 1779, 1798, 1829, ++ 1793, 1800, 1811, 1533,10727, 1880,14283,10723,14283, 1907, ++ 1911, 1915, 1567, 701, 1921, 1075, 1691, 1560, 1847,10651, + 1927, 1936, 1861, 898, 1755, 1100, 1886, 1035, 1940, 1854, + +- 1110, 1931, 1944,10579, 1943,10468, 1293, 1945,14261, 1947, +- 1949,10428,10422, 1428, 1951, 1953, 0, 0, 0, 1825, +- 1030, 1825, 1905, 1476, 1927,14261,14261, 1959,10421,10418, +- 1960, 1963, 1970,14261, 2011,10343,10307, 1976, 1984, 2022, +- 10235, 1931, 1948, 1952, 1957, 1969, 1970, 1980,14261, 1991, ++ 1110, 1931, 1944,10611, 1943,10551, 1293, 1945,14283, 1947, ++ 1949,10550,10547, 1428, 1951, 1953, 0, 0, 0, 1825, ++ 1030, 1825, 1905, 1476, 1927,14283,14283, 1959,10490,10450, ++ 1960, 1963, 1970,14283, 2011,10444,10443, 1976, 1984, 2022, ++ 10436, 1931, 1948, 1952, 1957, 1969, 1970, 1980,14283, 1991, + 1991, 1990, 1993, 2049, 1991, 1991, 1993, 2041, 1987, 2000, +- 2013, 1633, 2010, 2006, 1669, 2017, 2019, 2016,14261, 2029, ++ 2013, 1633, 2010, 2006, 1669, 2017, 2019, 2016,14283, 2029, + 2016, 2028, 2049, 2046, 2043, 2049, 2073, 2072, 2066, 2052, +- 2058, 2063, 2086,14261, 2087, 2101, 2089, 2107, 1948, 2065, +- 2069,14261, 2102, 2096, 2092, 2109,14261, 2088, 2102, 2116, ++ 2058, 2063, 2086,14283, 2087, 2101, 2089, 2107, 1948, 2065, ++ 2069,14283, 2102, 2096, 2092, 2109,14283, 2088, 2102, 2116, + +- 14261, 2101, 2108,14261,14261, 2117, 2112, 2104, 2120, 2110, ++ 14283, 2101, 2108,14283,14283, 2117, 2112, 2104, 2120, 2110, + 2126, 2118, 2113, 2113, 2119, 2128, 2141, 2135, 2123, 2180, +- 10121,10131, 2194, 2205,10113, 2188, 9761, 9370, 2209, 2216, +- 9369, 2215, 9340, 9367, 2226, 2233, 2198, 2207, 2250, 2175, +- 2273, 856, 2282, 9405, 2224, 1994, 2291, 9365, 2306, 9336, +- 9363, 2369, 2242, 2378, 2206, 2387, 2399, 2422, 2431, 2456, +- 9401, 2259, 2285, 2413, 2482, 2491, 2500, 9361, 2260, 9332, +- 9359, 2351, 2365, 2197, 2276, 9330, 9357, 2452, 2329, 2467, +- 14261, 2250, 2259, 2277, 2276, 2286, 2272, 2284, 9385, 2269, +- 2278, 2303, 2336, 2358, 2356, 2511, 2375, 2405, 2396, 9384, +- +- 2398, 2399, 2407,14261, 2437, 2441, 2442, 2470, 2467, 2483, +- 2490, 9383, 2487, 2510, 2492, 2482, 2491, 2512, 2521, 2497, ++ 10337,10329, 2194, 2205,10261, 2188,10143,10153, 2209, 2216, ++ 10135, 2215, 9783, 9392, 2226, 2233, 2198, 2207, 2250, 2175, ++ 2273, 856, 2282, 9430, 2224, 1994, 2291, 9390, 2306, 9361, ++ 9388, 2369, 2242, 2378, 2206, 2387, 2399, 2422, 2431, 2456, ++ 9426, 2259, 2285, 2413, 2482, 2491, 2500, 9386, 2260, 9357, ++ 9384, 2351, 2365, 2197, 2276, 9355, 9382, 2452, 2329, 2467, ++ 14283, 2250, 2259, 2277, 2276, 2286, 2272, 2284, 9410, 2269, ++ 2278, 2303, 2336, 2358, 2356, 2511, 2375, 2405, 2396, 9409, ++ ++ 2398, 2399, 2407,14283, 2437, 2441, 2442, 2470, 2467, 2483, ++ 2490, 9408, 2487, 2510, 2492, 2482, 2491, 2512, 2521, 2497, + 2517, 2498, 2537, 2517, 2515, 2532, 2530, 2538, 2529, 2551, +- 9382, 9381, 2534, 2254, 2303, 2339, 2607, 2344, 2613, 2614, +- 2360, 2621, 9405, 2398, 2628, 1372, 2629, 2579, 2635, 9404, +- 2636, 2606, 2642, 2539, 2597, 9321, 9348, 9347, 2638, 9318, +- 9345, 2590, 2587, 2590, 2598, 9310, 2646, 9281, 9308, 9306, +- 2656, 9277, 9293, 92, 2601, 2601, 2622, 2609, 2608,14261, ++ 9407, 9406, 2534, 2254, 2303, 2339, 2607, 2344, 2613, 2614, ++ 2360, 2621, 9430, 2398, 2628, 1372, 2629, 2579, 2635, 9429, ++ 2636, 2606, 2642, 2539, 2597, 9346, 9373, 9372, 2638, 9343, ++ 9370, 2590, 2587, 2590, 2598, 9369, 2646, 9340, 9367, 9332, ++ 2656, 9303, 9330, 92, 2601, 2601, 2622, 2609, 2608,14283, + 2610, 2622, 2630, 2636, 2618, 2640, 2651, 2669, 2671, 2668, + 2633, 2650, 2651, 2672, 2676, 2659, 2685, 2679, 2672, 2690, + +- 14261, 2735, 2716, 9255, 2675,14261, 2689, 9254,14261, 2710, +- 2710, 2696, 2714, 2720, 2717, 2713, 9251, 2705, 2711, 2717, +- 2728, 2713, 2720, 2241, 2732, 2729, 2719, 9246, 2720, 2728, +- 2777, 2730, 2743,14261, 2777, 2742, 2735, 2752, 2748, 2745, +- 2760, 2761, 2761, 2777, 2762,14261, 2779, 2770, 2779, 2772, ++ 14283, 2735, 2716, 9327, 2675,14283, 2689, 9326,14283, 2710, ++ 2710, 2696, 2714, 2720, 2717, 2713, 9314, 2705, 2711, 2717, ++ 2728, 2713, 2720, 2241, 2732, 2729, 2719, 9277, 2720, 2728, ++ 2777, 2730, 2743,14283, 2777, 2742, 2735, 2752, 2748, 2745, ++ 2760, 2761, 2761, 2777, 2762,14283, 2779, 2770, 2779, 2772, + 2779, 2780, 2782, 2786, 2781, 2779, 2787, 1723, 2822, 2851, + 2402, 2848, 2855, 2818, 2857, 2866, 2864, 2875, 947, 2825, +- 2852, 9240, 2892, 42, 2865, 9199, 916, 9195,14261, 9230, +- 14261, 2891, 2886, 2915, 2924, 2945, 1309, 2975, 2873, 2927, +- 9223, 2968, 2993, 2989, 3033, 1837, 3037, 3058, 3046, 1847, ++ 2852, 9316, 2892, 42, 2865, 9276, 916, 9274,14283, 9312, ++ 14283, 2891, 2886, 2915, 2924, 2945, 1309, 2975, 2873, 2927, ++ 9309, 2968, 2993, 2989, 3033, 1837, 3037, 3058, 3046, 1847, + +- 3057,14261, 9222,14261, 989, 1878, 3090, 3094, 2817, 2909, ++ 3057,14283, 9308,14283, 989, 1878, 3090, 3094, 2817, 2909, + 3014, 2831, 2908, 2966, 2884, 2852, 2911, 2945, 2949, 2965, +- 2958, 2985, 3062,14261, 3048, 3051,14261, 9125, 3037, 3108, +- 3133, 3055, 3058, 3070,14261, 3081, 3088, 3099,14261, 3102, +- 3104, 3105, 3086, 3094, 3091, 8916, 3094, 3101, 3100, 3122, ++ 2958, 2985, 3062,14283, 3048, 3051,14283, 9249, 3037, 3108, ++ 3133, 3055, 3058, 3070,14283, 3081, 3088, 3099,14283, 3102, ++ 3104, 3105, 3086, 3094, 3091, 9264, 3094, 3101, 3100, 3122, + 3123, 3132, 3118, 3147, 3123, 3130, 3146, 3138, 3133, 3150, +- 3130, 3142, 3152, 3143, 3135, 8902, 3148, 3145, 3152, 3166, +- 3157, 3161, 3155, 3161, 3168,14261, 8855, 3156, 2949, 3010, +- 3075, 3028, 3076, 3232, 3217, 3233, 3239, 3240, 3245, 8863, ++ 3130, 3142, 3152, 3143, 3135, 9245, 3148, 3145, 3152, 3166, ++ 3157, 3161, 3155, 3161, 3168,14283, 9096, 3156, 2949, 3010, ++ 3075, 3028, 3076, 3232, 3217, 3233, 3239, 3240, 3245, 9063, + 3246, 3251, 3252, 3257, 3258, 3263, 3264, 2957, 3262, 3220, + +- 3264, 3224, 3210, 3234, 2907, 3269, 3265, 3275, 3268, 8804, +- 8705,14261, 3232, 3231,14261, 3252, 3253, 3250, 3246, 3246, ++ 3264, 3224, 3210, 3234, 2907, 3269, 3265, 3275, 3268, 8881, ++ 8857,14283, 3232, 3231,14283, 3252, 3253, 3250, 3246, 3246, + 3268, 3250, 3265, 3269, 3272, 3258, 3268, 3257, 3310, 3266, + 3272, 3297, 3305, 3288, 3294, 3297, 3300, 3301, 3307, 3309, +- 3311, 3321, 3307, 3319, 3318, 3329, 3320, 3321,14261, 3359, ++ 3311, 3321, 3307, 3319, 3318, 3329, 3320, 3321,14283, 3359, + 3316, 3328, 3376, 3323, 3331, 3336, 3354, 3365, 3369, 3361, +- 3357, 3370, 8622, 3375, 3377, 3363, 3366, 3371,14261, 3368, +- 3372, 3369, 3413, 3386, 3389,14261, 3391, 3381, 3381, 3388, +- 3410, 3419, 3401, 3403, 3414, 3416, 3428, 3414, 3420,14261, ++ 3357, 3370, 8865, 3375, 3377, 3363, 3366, 3371,14283, 3368, ++ 3372, 3369, 3413, 3386, 3389,14283, 3391, 3381, 3381, 3388, ++ 3410, 3419, 3401, 3403, 3414, 3416, 3428, 3414, 3420,14283, + 3422, 3423, 3440, 3428, 3439, 3438, 3438, 3445, 3436, 3439, + +- 3451, 3431, 8594, 8617, 8575, 8602, 8543, 3505, 3499, 1508, +- 8563, 8534, 3517, 3500, 3479, 3485, 1344, 3526, 3538, 3539, +- 3592, 3571, 3604, 3541, 3613, 8501, 8433, 3469, 8431, 3499, +- 8486, 3513, 3510,14261, 3512,14261, 3526, 3556, 3573, 3580, +- 3567, 8443, 3588, 3660, 3580, 3576, 3588, 3587, 3593,14261, +- 14261, 8426, 3590,14261, 3600, 3606, 8436, 0, 3599, 3587, ++ 3451, 3431, 8836, 8860, 8778, 8788, 8753, 3505, 3499, 1508, ++ 8725, 8688, 3517, 3500, 3479, 3485, 1344, 3526, 3538, 3539, ++ 3592, 3571, 3604, 3541, 3613, 8706, 8656, 3469, 8610, 3499, ++ 8666, 3513, 3510,14283, 3512,14283, 3526, 3556, 3573, 3580, ++ 3567, 8638, 3588, 3660, 3580, 3576, 3588, 3587, 3593,14283, ++ 14283, 8550, 3590,14283, 3600, 3606, 8565, 0, 3599, 3587, + 3607, 3609, 3612, 3599, 3609, 3669, 3633, 3624, 3642, 3656, +- 3654, 3668, 3672, 3672, 3662, 3673, 3672, 3675,14261, 3676, +- 3669, 3674, 3669, 3673, 8418, 3678, 3674, 3683, 3685, 8385, +- 18, 8345, 3561, 3567, 3577, 3585, 3654, 3720, 3719, 3747, ++ 3654, 3668, 3672, 3672, 3662, 3673, 3672, 3675,14283, 3676, ++ 3669, 3674, 3669, 3673, 8512, 3678, 3674, 3683, 3685, 8453, ++ 18, 8431, 3561, 3567, 3577, 3585, 3654, 3720, 3719, 3747, + +- 3748, 3753, 3754, 3759, 3666, 8286, 8299, 8259, 3687, 3714, +- 3718, 8285, 8233, 8244, 8145, 8148, 8155, 3717, 3727, 3732, +- 14261, 3733, 3720,14261, 3726, 3732, 3721, 3734, 3736, 3730, ++ 3748, 3753, 3754, 3759, 3666, 8319, 8259, 8173, 3687, 3714, ++ 3718, 8200, 8158, 8147, 8094, 8062, 8031, 3717, 3727, 3732, ++ 14283, 3733, 3720,14283, 3726, 3732, 3721, 3734, 3736, 3730, + 3734, 3731, 3734, 3738, 3749, 3730, 3751, 3752, 3743, 3744, + 3739, 3750, 3743, 3757, 3777, 3784, 3776, 3771, 3777, 3789, +- 3776, 3774, 3777, 3793, 3795, 3797, 3786, 3801, 3798,14261, +- 3789, 3800, 3805, 3792, 3783, 3794,14261, 3835, 3806, 2941, +- 3792, 3809, 3811, 8166, 3817, 3830, 3831, 3828, 8052, 3823, +- 3830, 3848, 3833, 8047, 3839, 8046, 3855, 3841, 3843, 3850, +- 3855, 3857, 3857, 8038, 3848,14261, 3855, 3845, 3849, 3860, ++ 3776, 3774, 3777, 3793, 3795, 3797, 3786, 3801, 3798,14283, ++ 3789, 3800, 3805, 3792, 3783, 3794,14283, 3835, 3806, 2941, ++ 3792, 3809, 3811, 7988, 3817, 3830, 3831, 3828, 7987, 3823, ++ 3830, 3848, 3833, 7986, 3839, 7834, 3855, 3841, 3843, 3850, ++ 3855, 3857, 3857, 7822, 3848,14283, 3855, 3845, 3849, 3860, + +- 3850, 3862, 3866, 3879, 3885, 3898, 3900, 3891, 3903,14261, ++ 3850, 3862, 3866, 3879, 3885, 3898, 3900, 3891, 3903,14283, + 3886, 3903, 3907, 3884, 3896, 3891, 3897, 3909, 3913, 3927, +- 2307, 1689, 8052, 3928, 3971, 1903, 8033, 3964, 2395, 3989, +- 1749, 2447, 4015, 3931, 3914, 3955,14261, 3906, 3942, 3946, +- 3939, 3948, 3956, 3973, 3967, 0, 4033, 3957,14261, 3969, +- 3988, 3974, 4005, 3991, 4031, 4008, 4016, 4009, 8026, 4005, +- 7994, 7851, 7846, 7839, 7838, 4005, 4072, 4006, 7778, 7774, ++ 2307, 1689, 7858, 3928, 3971, 1903, 7803, 3964, 2395, 3989, ++ 1749, 2447, 4015, 3931, 3914, 3955,14283, 3906, 3942, 3946, ++ 3939, 3948, 3956, 3973, 3967, 0, 4033, 3957,14283, 3969, ++ 3988, 3974, 4005, 3991, 4031, 4008, 4016, 4009, 7787, 4005, ++ 7769, 7762, 7749, 7745, 7703, 4005, 4072, 4006, 7602, 7599, + 4018, 4010, 4024, 4014, 4026, 4030, 4041, 4045, 4030, 4052, +- 14261, 4072, 4055, 4057, 4079,14261, 4076, 4070, 4065, 4079, +- 4071, 4066, 966, 7741, 2483, 0, 3948, 3952, 4060, 3997, ++ 14283, 4072, 4055, 4057, 4079,14283, 4076, 4070, 4065, 4079, ++ 4071, 4066, 966, 7528, 2483, 0, 3948, 3952, 4060, 3997, + +- 4061, 3276, 4084, 4075, 7722, 7709, 4085, 4076, 4066, 4080, ++ 4061, 3276, 4084, 4075, 7431, 7418, 4085, 4076, 4066, 4080, + 4077, 4074, 4080, 4083, 4077, 4094, 4085, 4097, 4089, 4121, + 4100, 4097, 4125, 4124, 4114, 4134, 4122, 4123, 4136, 4136, + 4140, 4125, 4140, 4133, 4128, 4145, 4136, 4176, 4140, 4151, + 4137, 4159, 4152, 4161, 4167, 4186, 4175, 4169, 4183, 4178, +- 4186, 4181, 4185, 4188, 4188, 4203, 4196, 4193, 4190,14261, +- 7684, 7676, 7507, 4206, 4193, 4208, 4208, 4196, 4237, 7415, +- 7396, 4213, 4232, 4240, 4261, 4231, 4222, 4234, 4229, 4237, ++ 4186, 4181, 4185, 4188, 4188, 4203, 4196, 4193, 4190,14283, ++ 7341, 7128, 7122, 4206, 4193, 4208, 4208, 4196, 4237, 7115, ++ 7106, 4213, 4232, 4240, 4261, 4231, 4222, 4234, 4229, 4237, + 4238, 4252, 4256, 4259, 4252, 4258, 4259, 4259, 4244, 4254, + 4275, 4252, 4273, 4265, 4276, 4273, 4289, 4295, 4302, 4302, + +- 4297, 4287, 4305,14261, 4290, 4299, 4302, 4292, 4325, 4361, +- 4371, 4291, 4309, 4314, 4316,14261, 4317, 4325, 4309, 4345, +- 4335, 4342, 4389, 2971, 7361, 4390, 4362, 7378, 7372, 4343, +- 4349, 4361, 4374, 4413, 4369, 4382,14261, 4373, 4374,14261, +- 4390,14261,14261,14261,14261, 7368, 4374, 4395, 4440, 7351, ++ 4297, 4287, 4305,14283, 4290, 4299, 4302, 4292, 4325, 4361, ++ 4371, 4291, 4309, 4314, 4316,14283, 4317, 4325, 4309, 4345, ++ 4335, 4342, 4389, 2971, 7086, 4390, 4362, 7114, 7110, 4343, ++ 4349, 4361, 4374, 4413, 4369, 4382,14283, 4373, 4374,14283, ++ 4390,14283,14283,14283,14283, 7085, 4374, 4395, 4440, 7064, + 4397, 4408, 4416, 4419, 4422, 4423, 4424, 4425, 4434, 4440, + 4432, 4420, 4441, 4445, 4425, 4445, 4442, 4452, 4453, 4454, +- 4443, 7114, 4350, 7145, 0, 4404, 4454, 4477, 7058, 2002, +- 4446, 4447, 4490,14261, 4462, 4454, 4466, 4476, 4487, 4462, ++ 4443, 7013, 4350, 7050, 0, 4404, 4454, 4477, 6983, 2002, ++ 4446, 4447, 4490,14283, 4462, 4454, 4466, 4476, 4487, 4462, + 4470, 4490, 4480, 4481, 4491, 4480, 4486, 4496, 4493, 4491, + + 4492, 4493, 4491, 4492, 4502, 4498, 4508, 4509, 4514, 4504, + 4514, 4501, 4524, 4531, 4518, 4524, 4532, 4534, 4544, 4545, + 4548, 4536, 4536, 4537, 4537, 4544, 4540, 4537, 4556, 4557, +- 4546, 4543, 4565, 4583, 4563, 4549, 4566,14261, 4559, 4560, +- 4549, 4576, 4572, 4575, 4594, 4580, 4583, 4585, 7068, 4591, +- 4589, 4604, 4594, 4595, 4593, 4608, 4651, 4627, 7064, 4611, +- 4615, 4602,14261, 4614, 4610,14261, 4620, 4609,14261,14261, +- 14261, 4603, 4624, 4644, 4644,14261, 4632, 4649, 4641, 4644, ++ 4546, 4543, 4565, 4583, 4563, 4549, 4566,14283, 4559, 4560, ++ 4549, 4576, 4572, 4575, 4594, 4580, 4583, 4585, 6732, 4591, ++ 4589, 4604, 4594, 4595, 4593, 4608, 4651, 4627, 6708, 4611, ++ 4615, 4602,14283, 4614, 4610,14283, 4620, 4609,14283,14283, ++ 14283, 4603, 4624, 4644, 4644,14283, 4632, 4649, 4641, 4644, + 4643, 4657, 4647, 4647, 4648, 4665, 4667, 4665, 4663, 4671, + 4660, 4678, 4701, 4687, 4667, 4679, 4684, 4690, 4708, 4726, + +- 7090, 4714, 4699,14261, 4698, 4714, 4715, 4717, 4716, 4709, +- 7053, 4780, 7020, 4742, 7040, 4707, 0,14261, 7007, 4725, +- 4715, 4782, 4716, 4731, 4735, 4735, 4763, 7005, 4745, 4782, +- 14261, 7003, 4743, 4823, 4789, 4791, 4778, 4783, 4780, 4786, +- 4787, 4783, 4800,14261, 4804, 4797, 4830, 4834, 4831, 4834, +- 4833, 4833, 4840, 4827, 4828, 4823, 4827, 4860, 6660, 6636, +- 6432, 4826, 4834, 0, 4815, 4832, 4837,14261, 4838, 4839, ++ 6716, 4714, 4699,14283, 4698, 4714, 4715, 4717, 4716, 4709, ++ 6682, 4780, 6678, 4742, 6711, 4707, 0,14283, 6668, 4725, ++ 4715, 4782, 4716, 4731, 4735, 4735, 4763, 6490, 4745, 4782, ++ 14283, 6475, 4743, 4823, 4789, 4791, 4778, 4783, 4780, 4786, ++ 4787, 4783, 4800,14283, 4804, 4797, 4830, 4834, 4831, 4834, ++ 4833, 4833, 4840, 4827, 4828, 4823, 4827, 4860, 6311, 6300, ++ 6295, 4826, 4834, 0, 4815, 4832, 4837,14283, 4838, 4839, + 4840, 4841, 4856, 4841, 4857, 4868, 4881, 4877, 4871, 4886, + 4875, 4879, 4875, 4891, 4886, 4887, 4898, 4893, 4876, 4882, + 4886, 4894, 4901, 4937, 4887, 4893, 4893, 4896, 4909, 4909, + + 4900, 4918, 4919, 4934, 4931, 4923, 4942, 4939, 4977, 4945, +- 4946, 4949, 4947, 4952, 4949,14261, 4947, 4943, 4976,14261, +- 4962, 4962, 4964, 4959, 4966, 4967, 4976, 4979, 4982, 6306, +- 4989,14261, 4985, 4992, 4979, 4984, 4998, 4988, 4989, 5008, +- 4995, 5002, 5007, 5004, 5009, 4997, 4998,14261, 5044, 5013, +- 5007, 5007,14261, 5013, 5020,14261,14261,14261,14261, 5025, +- 6293, 5013, 5013, 5037, 5031,14261, 5046, 5042, 5043, 5053, +- 5047, 5054,14261,14261, 5058, 5077,14261, 5063, 5057, 5058, ++ 4946, 4949, 4947, 4952, 4949,14283, 4947, 4943, 4976,14283, ++ 4962, 4962, 4964, 4959, 4966, 4967, 4976, 4979, 4982, 6199, ++ 4989,14283, 4985, 4992, 4979, 4984, 4998, 4988, 4989, 5008, ++ 4995, 5002, 5007, 5004, 5009, 4997, 4998,14283, 5044, 5013, ++ 5007, 5007,14283, 5013, 5020,14283,14283,14283,14283, 5025, ++ 6091, 5013, 5013, 5037, 5031,14283, 5046, 5042, 5043, 5053, ++ 5047, 5054,14283,14283, 5058, 5077,14283, 5063, 5057, 5058, + 5061, 5057, 5067, 5075, 5106, 5088, 5070, 5071, 5111, 5084, +- 5084, 5091, 5101, 5096, 5104, 5177, 6317, 5139, 5140, 6218, ++ 5084, 5091, 5101, 5096, 5104, 5177, 6132, 5139, 5140, 6108, + +- 6110, 5146, 5121, 5125,14261, 5128, 5136, 5124, 5133, 5127, +- 5134,14261, 5142, 5140, 5160, 5159, 5223, 6095, 5165, 5158, +- 14261, 5155, 5171, 5174, 5176, 5177, 5173, 5178, 5174, 5175, ++ 6059, 5146, 5121, 5125,14283, 5128, 5136, 5124, 5133, 5127, ++ 5134,14283, 5142, 5140, 5160, 5159, 5223, 5994, 5165, 5158, ++ 14283, 5155, 5171, 5174, 5176, 5177, 5173, 5178, 5174, 5175, + 5173, 5193, 5201, 5215, 5210, 5225, 5233, 5230, 5218, 5231, +- 5221, 5237, 5238, 5229, 2600, 5933, 5276, 5920, 5304,14261, +- 5230, 5788, 5225, 5241, 5237, 5255, 5273, 5281, 5274, 5275, +- 5272, 5278, 5284, 5269, 5282, 5277, 5772, 5213, 5286, 5293, +- 5293, 5275, 5276, 5284, 5290,14261, 5292, 5300, 5297, 5288, ++ 5221, 5237, 5238, 5229, 2600, 5963, 5276, 5961, 5304,14283, ++ 5230, 5977, 5225, 5241, 5237, 5255, 5273, 5281, 5274, 5275, ++ 5272, 5278, 5284, 5269, 5282, 5277, 5787, 5213, 5286, 5293, ++ 5293, 5275, 5276, 5284, 5290,14283, 5292, 5300, 5297, 5288, + 5361, 5303, 5286, 5307, 5308, 5309, 5334, 5334, 5327, 5334, + 5343, 5341, 5338, 5334, 5335, 5329, 5379, 5331, 5340, 5346, + +- 5348, 5353, 5355, 5342, 5347, 5361, 5376,14261, 5350, 5356, ++ 5348, 5353, 5355, 5342, 5347, 5361, 5376,14283, 5350, 5356, + 5347, 5350, 5378, 5379, 5365, 5369, 5375, 5378, 5386, 5425, +- 5401, 5390, 5390, 5393, 5394, 5397, 5399, 5405, 5402, 5418, +- 5410, 5423, 5439, 5433, 5431, 5437, 5445, 5443, 5445, 5459, +- 5451, 5450, 5453, 5468, 5456, 5472,14261, 5721, 5473, 5473, +- 5468, 5475, 5742,14261, 5655,14261, 5473, 5472, 5484, 5475, +- 5466, 5473, 5493, 5492, 5482,14261,14261, 5478, 5494, 1035, +- 1169, 5492, 5490, 5163, 5532, 5534, 5515, 5520, 5512, 5512, +- 5524, 5512, 5527, 5524, 5538, 5526, 5214,14261, 5551, 5559, +- 5560,14261,14261, 5536, 5525, 5524, 5530, 5538, 5544, 5536, +- +- 5540, 5549, 5543, 5547, 5606, 5669, 5564, 5567, 5583, 5599, +- 5576, 5578, 5604, 0, 5603, 5605, 5591, 5614, 5605, 5618, +- 5619, 5605,14261, 5621, 5622, 5623, 5636, 5640, 5628, 5636, +- 5655, 5659, 5655, 5650, 5670,14261, 5655, 5671, 5673, 5674, +- 5671, 5562, 5556, 5709, 1883, 5658, 5714, 5717, 5680,14261, +- 5684, 5669, 5678, 5691, 5773, 5688, 5687, 5694, 5690, 5697, +- 5693, 5709, 5701, 5700, 5700, 5428, 5741, 5720, 5723, 5710, +- 5711, 5717, 5717, 5717, 5721, 5710, 5730, 5434, 0, 5748, +- 5746, 5751, 5765, 5754, 5751, 5750, 5749, 5756, 5753, 0, +- 5767, 5768, 5774, 5760, 0, 5810, 5767, 5787, 5772, 5794, +- +- 5804, 5838, 5798, 5809, 5802,14261, 5821, 5809, 5571, 5583, +- 5811, 5810, 5806, 5822, 5827, 5810, 5826, 5816, 5814, 5832, +- 5826, 5831, 5825, 5835, 5835, 5844, 5842, 5832, 5828, 5842, +- 14261,14261,14261,14261, 5850, 5863, 5863, 5845, 5860, 5873, +- 5875, 5875, 5873, 5862, 5554, 5879, 5870, 5884, 5871, 5886, +- 14261,14261,14261,14261, 5883, 5871,14261, 5873, 5575,14261, +- 14261, 5887, 5882,14261, 5883, 5880, 5897, 5883, 5895, 5892, +- 5899,14261, 1446, 1625,14261, 2350,14261, 5904, 5909, 5916, +- 5391, 5389, 5942, 5374, 5944,14261, 5908, 5927, 5928, 5919, +- 5935, 5929, 5924, 5922, 5930, 250, 5976, 5400, 5278, 5164, +- +- 5959, 5160, 5961, 5935, 5940, 5947, 5939, 5942, 5938, 5945, +- 5949,14261, 5973, 5956, 5962, 6001, 5967, 5963, 5984, 5995, +- 5985, 5985, 6000, 6005, 6002, 6010, 6009, 5997, 6010, 5998, +- 6001, 0, 6005, 6006, 6014,14261, 6019,14261,14261, 5999, +- 14261, 6009, 6010, 6016, 5181, 6016, 6019, 6021, 6014, 6022, +- 6025, 6030,14261,14261, 6034,14261, 6053, 5112, 6094, 5005, +- 6099, 6032, 6063,14261, 6063, 6056, 6104, 6105, 6069, 6073, +- 6085, 6082, 6069, 6065, 6072, 6122, 6081, 6080, 6095, 6081, +- 6083, 6094, 6092, 6102, 0, 6136, 6162, 6107, 6100, 6119, +- 6120, 6121, 6116, 6133, 6138,14261, 6171, 6129, 4814, 6133, +- +- 6142, 6145, 6136, 6149, 6146, 6147, 6152, 6138, 6155, 0, +- 6147, 6153, 6148, 6162, 4808, 6153, 6151, 6196, 6164, 6158, +- 6224, 6175, 6174, 6175, 6168, 6182,14261,14261, 6189, 6184, +- 4756, 6182, 4738, 6216, 6191,14261, 6186, 6198, 6191, 6200, +- 6212, 6195, 4726, 6199, 6206, 6207, 6203, 6210, 6223,14261, +- 6207, 6222, 6215, 4611, 6221, 6217, 6227,14261, 6219, 6221, +- 6219, 6217, 6223, 6246, 6234, 6236, 6243, 6245, 6262,14261, +- 14261, 6261, 6267, 6264,14261, 6264, 6268, 6269, 4392, 2671, +- 14261, 6274, 6271, 4385, 4371, 4190, 6295, 4171, 6297, 6298, +- 6261, 6274, 6269, 6265, 6272, 6274, 6268,14261, 6267, 4036, +- +- 6351, 6311, 6313, 6355, 6367, 6371, 3982, 3980, 3899, 6324, +- 3943, 6335, 6337, 6293, 3936, 6310, 6317, 6334, 6325, 6328, +- 14261, 6347, 6353, 6345,14261, 6356, 6354, 6363, 6362, 6350, +- 6365, 6352, 6356, 6358, 6357, 6358, 6362, 6366, 6369, 6376, +- 6373, 6386, 6388, 6388, 6396, 6399, 6405, 6409, 3814, 6409, +- 3707, 6409, 6397, 6412, 6406, 6409, 6418, 6409, 6409, 3607, +- 6455,14261, 3600, 6460,14261, 6414, 6420, 6428, 6435, 0, +- 0, 6333, 6423, 6431, 6428, 6430, 6441, 6440, 6440, 6451, +- 6486, 6440, 6453,14261, 6465, 6447, 6465, 6471, 6457, 3643, +- 0, 0, 6453, 6468, 6467, 6477, 6478, 6479,14261, 6473, +- +- 6521, 6478,14261, 6490, 6485, 6484, 6506,14261, 6491, 6499, +- 6511, 6543, 6515, 6520, 6508, 6519, 6509,14261, 6510, 6520, +- 6556, 6517, 6528, 0, 6570, 1544, 6524, 3586, 6524, 6541, +- 6544, 6536, 6536, 6547, 6551, 6556,14261, 6551, 6565, 6553, +- 6562, 6568, 6565, 6568, 6572, 6563, 6558, 6573, 6570, 6571, +- 6580, 3535, 3523, 6563, 6584, 6574, 6585, 6590, 6574, 6595, +- 6599, 6603,14261, 6606, 6607, 6600, 6595, 6599, 6606,14261, +- 6613, 6611, 6606,14261, 6612, 6612, 6623, 6617, 6617, 6628, +- 6652, 6653,14261, 6622, 6636, 6633, 6637, 6637, 6641,14261, +- 3546, 6663, 6696, 6700, 3468, 6685, 6694, 6701, 6661, 6719, +- +- 6731, 6754, 652, 6760, 6766, 3506, 6665, 6707, 6680, 6677, +- 6686,14261, 6711, 6714, 6703, 6710, 6710, 6720, 6728, 6736, +- 6740, 6742, 6751, 6747, 6742, 6754, 6757, 6759, 6749,14261, +- 6766, 6761, 6766, 6767, 6753, 6771, 6770, 6756, 6758, 6777, +- 6771, 6782, 6772,14261, 6777, 6800, 6790, 6805, 6802, 6809, +- 14261, 6814, 6803,14261, 3497, 0, 6804, 6813, 6806, 6800, +- 6816, 6804, 6818, 6810, 0, 0, 6817, 6820, 6808, 6828, +- 6827, 6811, 6831,14261, 3416, 6829, 6820, 6831, 6683, 6735, +- 14261, 6827, 6818, 0, 6739, 6847, 6848, 6890, 6865, 6842, +- 6868, 6866, 6847, 6901, 6878, 6881, 6863, 6879, 6860, 6882, +- +- 6886, 6879, 0, 0, 6881, 6876, 6883, 1551, 3362, 3034, +- 6888, 6879, 6711, 6882, 3348, 6919, 6899, 6903, 6902, 6905, +- 6924, 6914, 6924, 3240, 3233, 6916, 6926, 6921, 6925, 6926, +- 6950, 6935, 6936, 6920, 6936, 6929, 6924, 6932, 6941, 6928, +- 6936, 6933,14261, 6939, 6934, 6946, 6946, 6962, 6953, 6961, +- 6960, 6967, 6968, 6982, 6983, 6983, 6973, 6976, 6987, 6977, +- 7012, 6990, 6978, 6978, 6973, 3220, 7000, 7056, 7017, 749, +- 7060, 7068, 7079, 7091, 3231, 3179, 7047, 7070, 7076, 7078, +- 1915, 7109, 942, 7127, 7138, 7139, 7147, 6735, 7158, 7170, +- 7045, 3206, 3205, 7003,14261, 7017, 7014, 7038, 7045, 7061, +- +- 7072, 7082, 7082, 3113, 7122, 7122,14261, 7129,14261, 7129, +- 14261, 7134, 7130, 7143,14261, 7144, 7135, 7148, 7148, 7150, +- 7152, 7143, 7155, 7148, 7154, 7157,14261,14261,14261, 7168, +- 7157, 7171,14261, 7166, 7169, 7182, 7168, 7166, 7189,14261, +- 7175, 3117, 7181, 7181, 7195, 7182, 7184, 7038, 7187,14261, +- 7194, 7193, 7198, 7242, 7252,14261,14261, 7195, 7210, 0, +- 7219, 7222, 7212, 7212, 7227, 7222, 7237, 7225, 7270, 7242, +- 0, 7286, 7223, 7226, 7225, 7285, 7243, 7231, 7264, 7257, +- 3100, 7257, 7269, 7263, 3002, 3311, 3029, 7262, 7272,14261, +- 7084, 7263,14261, 7271, 7272, 7262, 7270, 7276, 7286, 7291, +- +- 7281, 7293, 7298, 7288, 7284, 7296, 7292, 7293,14261, 7293, +- 7291, 7309, 7300, 7305, 7310, 7321, 7315, 7344, 7327, 7350, +- 7326,14261, 7321, 7324, 7330,14261, 7329, 2968, 7344, 7350, +- 7341,14261, 7341, 7355, 7358, 7346, 7359, 2991, 7343, 7344, +- 7364,14261, 7342, 7367, 1445, 7422, 2883, 7399, 7400, 7375, +- 7428, 7434, 7440, 7459, 2890, 7419, 7438, 2039, 7463, 7447, +- 7475, 7494,14261, 2872, 7412, 7415, 7423, 2765, 7450, 2682, +- 7449, 2660, 7454, 7449, 7463, 7454,14261, 7463, 7448, 7454, +- 7471, 7462, 7455, 7457, 7463,14261, 7464, 7466, 7487, 7469, +- 14261, 7493, 7475, 7493, 7484, 7484, 7535, 7508, 7507, 7502, +- +- 14261, 7513, 7518, 7508, 7519, 7517, 7566, 7535, 7556,14261, +- 7535, 0, 7558, 0, 7593, 7526, 7525, 2612, 7540, 7547, +- 7538, 7538, 7553, 7563, 7568, 7565, 7566, 7573, 7616, 7582, +- 7568, 7588, 2576, 7581, 7585, 7575, 7608, 7581, 7587, 7593, +- 7595,14261, 7592, 7611, 7614, 4759, 7602, 7599,14261, 7618, +- 7610, 7624,14261, 7617, 7628,14261, 7616, 7629, 7630, 7632, +- 7625, 7630, 2425, 7636, 7636, 7635, 7631, 2424, 7637, 7628, +- 7641, 7631,14261, 7644,14261, 7638,14261,14261, 7640,14261, +- 2387, 7685, 7644,14261, 7645,14261, 7655, 7671, 7677, 7671, +- 7667, 7684, 7674,14261, 7671, 7689, 7689, 7675, 7685, 7677, +- +- 7725, 7726, 2880, 7755, 7759, 7763, 7729, 7788, 7789, 2931, +- 7819, 7820, 7673, 7696, 7731, 7743, 7733, 2418, 7742, 7738, +- 7748,14261, 7735, 7741, 7775, 7777, 7775, 7780,14261,14261, +- 7790, 7795, 7780, 7780, 7610, 7798, 7802,14261, 7848, 7793, +- 7805, 7810, 7798, 7794, 7813, 7812, 7814, 7869, 7820, 7881, +- 7848, 2414, 7839, 7873, 0, 7843, 7862, 7864, 7866, 7872, +- 7875, 7882, 7873, 7874, 7883, 7909, 7724, 7882, 7883,14261, +- 7877, 7888, 7889, 0, 7771, 7877, 7893, 7906, 7858, 7891, +- 7951, 7906, 7918, 7923, 7903, 7432, 7910, 7913, 7913, 7908, +- 2315, 7914, 7930, 7932, 7927, 7935, 2192,14261, 2188, 7927, +- +- 7938, 7939, 7930,14261, 2176, 7926, 7946, 7947, 7965,14261, +- 7936,14261, 7936, 7949, 7949, 7954, 7962, 7964, 7972, 7979, +- 2198, 7969, 7983, 7972, 7984, 7988, 7983, 8021, 8020, 8050, +- 8015, 8051, 8069, 7981, 8009, 8019, 8018, 8028, 2208,14261, +- 8009,14261, 8036,14261, 8034, 8028, 8029, 8037, 8048,14261, +- 8040, 8097, 8032, 8051, 8096, 8107, 8037, 8091, 8099, 8099, +- 8100, 8111, 8116, 8112, 8112, 8145, 8113,14261, 8111, 8171, +- 8125, 0, 8130, 8125, 8132, 8146, 8131, 8157, 8165, 8162, +- 8169,14261, 8088, 8089, 8104, 8161, 8156, 8205, 8165, 8163, +- 8177, 8212, 8213, 8233,14261, 8166,14261, 8184,14261, 8182, +- +- 14261, 7542, 2155, 8179, 8187, 8178, 7845, 8197, 8192, 8223, +- 8194, 8201, 8198, 8228, 8215, 8231, 8229, 8225, 8229, 8240, +- 8221, 8246, 8241, 8241,14261, 8236, 8242, 8244, 8239, 8245, +- 8271, 8252, 8253, 8259, 2165, 8256, 8264, 8317, 8267, 8279, +- 8284, 2063, 8262,14261, 8290,14261,14261,14261, 8294,14261, +- 8278, 8339, 8365, 8326, 8362, 8291, 8308, 8309, 8299, 8302, +- 8313, 8312,14261, 8331, 8338,14261, 8400, 8349, 8371, 8356, +- 8361, 8373, 8409, 8378, 8366, 8366, 8367, 0, 8331, 8332, +- 8444, 8396, 8397, 8445, 8395, 8385, 8396, 2064, 8333, 8459, +- 8450, 8382,14261,14261,14261, 8413, 8400, 8414, 8439,14261, +- +- 8439, 8449, 8457, 8462, 8444, 8461, 2002, 8449, 1997,14261, +- 8450,14261, 8464, 8465, 8457, 8456, 8460,14261, 1966, 8467, +- 8461, 3532, 8469, 8463, 8505, 8467, 8498, 8513, 0, 1807, +- 8499, 8502, 8517, 8519, 1759, 8519, 8507, 8506, 8543, 8565, +- 8591,14261, 8521, 8524, 8528, 8507, 8539, 8528, 8555, 8508, +- 8549, 8546, 8548,14261, 8555, 8558, 8619, 8572, 8558, 8559, +- 8625, 8554, 1709, 8645, 0, 1652, 8646, 0, 8574, 8579, +- 5041, 8616, 8619, 8613, 8666, 8676, 8685,14261, 8615, 8675, +- 8670,14261, 8680, 1579, 8682, 8686, 8670, 8674, 8677, 8678, +- 8677, 8691, 8676, 8676, 8677, 8690, 8693, 8694,14261, 1374, +- +- 8693, 3983,14261, 4005, 8694, 8729, 8719, 8723, 8724, 0, +- 0, 8742,14261, 8727, 8741,14261,14261, 8775, 8786, 8713, +- 8755, 8554, 8743, 8814, 8555, 0, 8739, 8656, 8744, 8746, +- 8756, 8741, 8747, 8823, 8748, 8785,14261, 8849, 8795, 8783, +- 1313, 1065, 8791, 8838, 7557, 1008, 7972, 8781, 8799, 8817, +- 8873, 8817, 8824, 8844,14261, 8847, 8844, 8850, 8835, 8836, +- 8848, 8850, 8853, 8857, 8858, 8214, 8425, 8854,14261, 8857, +- 14261, 989, 4343,14261, 4654, 8877, 914, 8869, 0, 8864, +- 14261, 8872, 8920, 8935, 0, 0, 0,14261, 8871, 8662, +- 8874, 8933, 8663, 0, 0, 8776, 0, 8898, 8889, 8896, +- +- 8901, 8906, 8906, 8923, 8955, 8913, 8929,14261,14261, 8931, +- 8933, 8919, 8939, 879, 8105, 876, 8944, 8934, 8936, 8936, +- 8937, 8939, 8935, 8950, 8962,14261, 8960, 8967, 8952,14261, +- 8951, 8955,14261,14261, 8966, 8836,14261, 4752,14261, 8957, +- 14261, 8962, 8969,14261, 830, 8958, 0, 9036, 0, 9003, +- 0, 743, 8969, 8981, 8979, 8985, 8984, 8989, 8996, 9001, +- 9040, 8670, 8671, 9007, 9012, 9043, 9008, 9016,14261, 9021, +- 9022,14261, 9025, 9022, 9015, 9020, 9020, 9017, 9025, 670, +- 14261,14261, 9031, 9023, 9039, 9043,14261, 9026, 602, 0, +- 9054, 447, 9069,14261, 9029, 9034,14261, 9037, 9043, 9044, +- +- 9051, 9050, 8786, 9063, 9107, 9120, 8816, 9126, 9060, 9060, +- 9079, 9066, 9084,14261, 436, 9083, 9079, 9090, 9096, 9091, +- 9104, 461, 367, 9099, 9135,14261, 330, 9131, 366, 9100, +- 9098, 9105, 9102,14261, 9096, 9106, 0, 9149, 9110, 9154, +- 0, 9164, 0, 9174, 9180,14261, 9111,14261, 9119, 9133, +- 9139,14261, 9132, 9140, 9155, 9140, 9158, 9155, 0, 315, +- 9192, 9153, 9146, 9196, 9142, 9161, 9202,14261, 9167, 262, +- 254, 9206, 0, 9219, 0,14261, 9184, 9182, 9177, 9181, +- 9190, 9181, 9194, 9190, 9184, 9187, 9193, 0, 0, 143, +- 9240, 0, 9194, 9249, 9244, 9189, 9260, 9246,14261,14261, +- +- 138, 109, 9245, 9253, 9247,14261,14261, 9235,14261, 9256, +- 9247, 9251, 9252, 0, 43,14261, 9276, 9305, 9306, 9314, +- 9266,14261,14261, 9280, 9289, 9310,14261, 6, 9301, 9311, +- 14261,14261, 9333, 9359,14261,14261,14261, 9308,14261,14261, +- 9304, 9368, 9305, 9335, 9332, 9325,14261, 9337, 9365, 9367, +- 14261,14261, 9429, 9447, 9465, 9483, 9501, 9519, 9537, 9555, +- 9573, 9591, 9609, 9627, 9645, 9663, 9681, 9699, 9717, 9735, +- 9753, 9771, 9789, 9807, 9825, 9843, 9861, 9879, 9897, 9915, +- 9933, 9951, 9969, 9987,10005,10023,10041,10059,10077,10095, +- 10113,10131,10149,10167,10185,10203,10221,10239,10257,10275, +- +- 10293,10311,10329,10347,10365,10383,10401,10419,10437,10455, +- 10473,10490,10508,10526,10544,10562,10580,10597,10615,10633, +- 10651,10669,10687,10705,10723,10741,10759,10777,10795,10813, +- 10831,10849,10867,10885,10903,10921,10939,10957,10975,10993, +- 11011,11028,11046,11064,11082,11100,11118,11136,11154,11171, +- 11189,11207,11225,11243,11261,11279,11297,11315,11333,11351, +- 11369,11387,11405,11423,11441,11459,11477,11495,11512,11530, +- 11548,11566,11584,11602,11620,11637,11655,11673,11691,11709, +- 11727,11745,11763,11781,11799,11817,11835,11853,11871,11889, +- 11907,11925,11943,11960,11978,11996,12014,12032,12050,12068, +- +- 12086,12104,12122,12140,12151,12165,12183,12191,12207,12224, +- 12228,12244,12262,12272,12288,12306,12324,12342,12359,12375, +- 12393,12411,12429,12447,12465,12482,12498,12516,12525,12541, +- 12559,12577,12595,12612,12620,12635,12651,12668,12686,12704, +- 12722,12740,12758,12776,12794,12812,12830,12848,12858,12866, +- 12881,12896,12907,12915,12923,12939,12955,12971,12988,13006, +- 13024,13042,13060,13078,13096,13114,13132,13150,13168,13186, +- 13204,13222,13240,13258,13271,13279,13287,13295,13306,13322, +- 13338,13346,13354,13370,13388,13406,13424,13442,13460,13478, +- 13496,13514,13532,13550,13568,13584,13600,13618,13636,13646, +- +- 13662,13678,13691,13709,13726,13743,13760,13771,13787,13804, +- 13821,13833,13849,13867,13884,13902,13919,13937,13954,13970, +- 13987,13997,14013,14030,14048,14065,14083,14101,14118,14135, +- 14153,14165,14181,14198,14215,14226,14242 ++ 5401, 5390, 5390, 5394, 5395, 5399, 5402, 5406, 5403, 5421, ++ 5420, 5428, 5446, 5437, 5432, 5439, 5449, 5445, 5449, 5465, ++ 5453, 5453, 5458, 5472, 5458, 5476,14283, 5734, 5478, 5476, ++ 5470, 5478, 5785,14283, 5753,14283, 5477, 5475, 5486, 5478, ++ 5469, 5475, 5495, 5494, 5482,14283,14283, 5485, 5498, 1035, ++ 1169, 5493, 5496, 5163, 5528, 5538, 5521, 5524, 5518, 5518, ++ 5529, 5518, 5532, 5527, 5540, 5529, 5214,14283, 5545, 5555, ++ 5563,14283,14283, 5539, 5528, 5527, 5533, 5541, 5546, 5537, ++ ++ 5541, 5549, 5538, 5566, 5625, 5602, 5547, 5555, 5598, 5591, ++ 5591, 5592, 5607, 0, 5607, 5609, 5600, 5619, 5608, 5622, ++ 5636, 5622,14283, 5638, 5639, 5640, 5641, 5643, 5631, 5637, ++ 5647, 5651, 5646, 5642, 5661,14283, 5645, 5661, 5663, 5674, ++ 5671, 5684, 5579, 5709, 1883, 5712, 5725, 5728, 5678,14283, ++ 5686, 5678, 5685, 5696, 5784, 5692, 5691, 5695, 5692, 5699, ++ 5695, 5710, 5702, 5699, 5700, 5428, 5749, 5717, 5721, 5709, ++ 5710, 5717, 5716, 5720, 5733, 5724, 5731, 5434, 0, 5756, ++ 5753, 5751, 5765, 5754, 5751, 5750, 5749, 5757, 5758, 0, ++ 5773, 5774, 5780, 5763, 0, 5441, 5768, 5784, 5768, 5775, ++ ++ 5786, 5845, 5791, 5802, 5808,14283, 5821, 5809, 5602, 5838, ++ 5811, 5811, 5807, 5824, 5833, 5818, 5834, 5824, 5822, 5840, ++ 5833, 5838, 5830, 5839, 5838, 5847, 5852, 5854, 5842, 5838, ++ 5853,14283,14283,14283,14283, 5846, 5860, 5859, 5852, 5867, ++ 5874, 5876, 5877, 5875, 5865, 5574, 5886, 5879, 5893, 5880, ++ 5895,14283,14283,14283,14283, 5892, 5880,14283, 5881, 5613, ++ 14283,14283, 5895, 5888,14283, 5889, 5884, 5905, 5893, 5906, ++ 5903, 5910,14283, 1446, 1625,14283, 2350,14283, 5903, 5907, ++ 5914, 5543, 5537, 5745, 5536, 5948,14283, 5914, 5927, 5928, ++ 5919, 5936, 5930, 5926, 5928, 5937, 250, 5983, 5402, 5372, ++ ++ 5278, 5968, 5164, 5969, 5943, 5948, 5951, 5942, 5945, 5951, ++ 5957, 5947,14283, 5970, 5955, 5962, 6023, 5967, 5965, 5988, ++ 5984, 5980, 5988, 6007, 6004, 6014, 6022, 6021, 6009, 6022, ++ 6009, 6014, 0, 6018, 6019, 6027,14283, 6034,14283,14283, ++ 6014,14283, 6024, 6025, 6028, 5191, 6028, 6031, 6033, 6026, ++ 6034, 6036, 6034,14283,14283, 6029,14283, 6050, 5150, 6107, ++ 5112, 6111, 6034, 6063,14283, 6083, 6051, 6014, 6119, 6076, ++ 6081, 6088, 6092, 6078, 6074, 6081, 6129, 6088, 6084, 6100, ++ 6087, 6089, 6099, 6098, 6107, 0, 6169, 6170, 6110, 6100, ++ 6119, 6125, 6128, 6136, 6147, 6150,14283, 6183, 6141, 5055, ++ ++ 6147, 6156, 6158, 6148, 6159, 6156, 6157, 6162, 6148, 6164, ++ 0, 6156, 6162, 6157, 6171, 4814, 6162, 6159, 6206, 6171, ++ 6161, 6211, 6184, 6202, 6202, 6195, 6204,14283,14283, 6205, ++ 6197, 4757, 6194, 4756, 6227, 6201,14283, 6195, 6205, 6198, ++ 6207, 6219, 6199, 4738, 6203, 6210, 6206, 6213, 6210, 6216, ++ 6229,14283, 6213, 6227, 6219, 4726, 6232, 6228, 6248,14283, ++ 6247, 6248, 6246, 6240, 6246, 6263, 6248, 6251, 6254, 6255, ++ 6270,14283,14283, 6269, 6275, 6272,14283, 6270, 6274, 6275, ++ 4642, 2671,14283, 6281, 6278, 4392, 4400, 4326, 6302, 4235, ++ 6303, 6304, 6267, 6279, 6273, 6276, 6283, 6295, 6290,14283, ++ ++ 6288, 4168, 6361, 6336, 6329, 6367, 6373, 6382, 4036, 3985, ++ 3935, 6338, 3944, 6341, 6342, 6305, 3943, 6315, 6337, 6345, ++ 6341, 6351,14283, 6363, 6368, 6359,14283, 6370, 6367, 6375, ++ 6373, 6364, 6377, 6364, 6367, 6368, 6367, 6369, 6373, 6377, ++ 6378, 6386, 6382, 6393, 6403, 6399, 6411, 6413, 6421, 6425, ++ 3922, 6425, 3814, 6423, 6410, 6425, 6418, 6420, 6429, 6420, ++ 6422, 3676, 6466,14283, 3607, 6474,14283, 6428, 6426, 6434, ++ 6443, 0, 0, 6491, 6433, 6440, 6435, 6446, 6455, 6454, ++ 6456, 6468, 6510, 6455, 6468,14283, 6477, 6463, 6479, 6485, ++ 6473, 3650, 0, 0, 6468, 6482, 6483, 6494, 6496, 6492, ++ ++ 14283, 6491, 6538, 6490,14283, 6506, 6501, 6496, 6519,14283, ++ 6505, 6515, 6527, 6558, 6530, 6533, 6522, 6534, 6524,14283, ++ 6525, 6535, 6570, 6542, 6538, 0, 6586, 1544, 6534, 3592, ++ 6533, 6555, 6561, 6551, 6551, 6561, 6566, 6571,14283, 6563, ++ 6578, 6567, 6578, 6584, 6581, 6583, 6588, 6578, 6572, 6587, ++ 6574, 6586, 6587, 6596, 3586, 3535, 6581, 6601, 6594, 6603, ++ 6609, 6593, 6612, 6618, 6625,14283, 6622, 6624, 6616, 6611, ++ 6615, 6620,14283, 6628, 6628, 6623,14283, 6629, 6629, 6640, ++ 6634, 6633, 6643, 6668, 6669,14283, 6638, 6652, 6651, 6654, ++ 6657, 6659,14283, 3566, 6692, 6722, 6726, 3504, 6690, 6701, ++ ++ 6703, 6679, 6738, 6752, 6758, 652, 6770, 6789, 3510, 6685, ++ 6705, 6709, 6698, 6703,14283, 6721, 6726, 6720, 6734, 6738, ++ 6738, 6741, 6745, 6753, 6755, 6763, 6759, 6755, 6768, 6771, ++ 6773, 6763,14283, 6779, 6774, 6782, 6784, 6772, 6790, 6789, ++ 6775, 6779, 6800, 6795, 6805, 6798,14283, 6794, 6809, 6799, ++ 6814, 6815, 6821,14283, 6825, 6815,14283, 3514, 0, 6816, ++ 6826, 6820, 6814, 6831, 6819, 6833, 6824, 0, 0, 6834, ++ 6837, 6825, 6847, 6846, 6830, 6850,14283, 3497, 6850, 6843, ++ 6855, 6707, 6766,14283, 6850, 6844, 0, 6909, 6864, 6857, ++ 6899, 6892, 6850, 6879, 6877, 6860, 6915, 6886, 6893, 6875, ++ ++ 6894, 6875, 6903, 6908, 6902, 0, 0, 6903, 6899, 6906, ++ 1551, 3366, 3034, 6911, 6899, 6123, 6900, 3361, 6334, 6915, ++ 6919, 6905, 6908, 6930, 6923, 6934, 3348, 3240, 6927, 6940, ++ 6937, 6941, 6942, 6969, 3233, 6954, 6955, 6940, 6956, 6949, ++ 6944, 6952, 6963, 6951, 6958, 6953,14283, 6959, 6952, 6962, ++ 6962, 6978, 6963, 6968, 6966, 6975, 6979, 6993, 6994, 6994, ++ 6987, 6992, 7003, 6993, 7031, 7009, 6998, 6998, 6993, 3220, ++ 7017, 7077, 7039, 749, 7078, 7096, 7097, 7108, 3231, 3179, ++ 7057, 7088, 7093, 7104, 1915, 7134, 942, 7155, 7164, 7170, ++ 7176, 7042, 7185, 7196, 7061, 3206, 3205, 7031,14283, 7057, ++ ++ 7043, 7075, 7077, 7089, 7093, 7094, 7092, 3113, 7141, 7146, ++ 14283, 7156,14283, 7159,14283, 7160, 7152, 7169,14283, 7171, ++ 7162, 7176, 7172, 7177, 7177, 7168, 7180, 7170, 7180, 7184, ++ 14283,14283,14283, 7194, 7182, 7192,14283, 7191, 7196, 7209, ++ 7192, 7193, 7218,14283, 7202, 3117, 7208, 7208, 7220, 7210, ++ 7211, 7056, 7214,14283, 7221, 7221, 7222, 7076, 7269,14283, ++ 14283, 7222, 7233, 0, 7244, 7248, 7238, 7235, 7246, 7241, ++ 7264, 7243, 7127, 7258, 0, 7297, 7242, 7248, 7254, 7142, ++ 7272, 7261, 7283, 7276, 3100, 7276, 7287, 7280, 3002, 3311, ++ 3029, 7282, 7288,14283, 7043, 7279,14283, 7286, 7287, 7277, ++ ++ 7289, 7295, 7305, 7310, 7300, 7320, 7312, 7306, 7305, 7318, ++ 7317, 7318,14283, 7325, 7319, 7317, 7339, 7325, 7325, 7330, ++ 7342, 7334, 7365, 7348, 7369, 7342,14283, 7337, 7339, 7349, ++ 14283, 7348, 2968, 7363, 7373, 7363,14283, 7363, 7376, 7379, ++ 7368, 7381, 2991, 7367, 7368, 7388,14283, 7365, 7390, 1445, ++ 7448, 2883, 7427, 7136, 7400, 7459, 7463, 7471, 7489, 2890, ++ 7440, 7460, 2039, 7507, 7413, 7519, 7525,14283, 2872, 7398, ++ 7393, 7416, 2765, 7421, 2682, 7432, 2660, 7445, 7441, 7456, ++ 7463,14283, 7473, 7457, 7474, 7491, 7484, 7480, 7488, 7492, ++ 14283, 7493, 7495, 7514, 7497,14283, 7518, 7500, 7518, 7510, ++ ++ 7506, 7438, 7527, 7522, 7517,14283, 7527, 7532, 7523, 7531, ++ 7528, 7587, 7537, 7488,14283, 7540, 0, 7497, 0, 7596, ++ 7549, 7549, 2612, 7561, 7571, 7562, 7570, 7573, 7581, 7585, ++ 7580, 7581, 7588, 7632, 7588, 7586, 7605, 2576, 7599, 7602, ++ 7592, 7501, 7597, 7603, 7625, 7626,14283, 7623, 7630, 7636, ++ 4759, 7622, 7617,14283, 7635, 7625, 7639,14283, 7632, 7643, ++ 14283, 7631, 7644, 7645, 7647, 7640, 7645, 2425, 7651, 7651, ++ 7650, 7656, 7650, 2424, 7656, 7647, 7659, 7649,14283, 7661, ++ 14283, 7672,14283,14283, 7673,14283, 2387, 7701, 7679,14283, ++ 7685,14283, 7678, 7693, 7698, 7688, 7684, 7701, 7691,14283, ++ ++ 7688, 7706, 7706, 7692, 7702, 7694, 7769, 7760, 2880, 7780, ++ 7781, 7789, 7766, 7800, 7801, 2931, 7820, 7838, 7692, 7716, ++ 7762, 7780, 7770, 2418, 7782, 7778, 7791,14283, 7781, 7787, ++ 7799, 7802, 7802, 7805,14283,14283, 7818, 7821, 7806, 7806, ++ 7621, 7825, 7829,14283, 7741, 7821, 7831, 7837, 7825, 7821, ++ 7834, 7832, 7830, 7885, 7835, 7895, 7890, 2414, 7879, 7884, ++ 0, 7883, 7891, 7892, 7884, 7890, 7891, 7898, 7890, 7891, ++ 7900, 7917, 7748, 7908, 7909,14283, 7902, 7913, 7914, 0, ++ 7752, 7901, 7920, 7931, 7876, 7916, 7885, 7918, 7929, 7934, ++ 7914, 7416, 7921, 7924, 7930, 7925, 2315, 7931, 7946, 7948, ++ ++ 7941, 7949, 2192,14283, 2188, 7955, 7942, 7953, 7954, 7945, ++ 14283, 2176, 7941, 7970, 7971, 7978,14283, 7959,14283, 7959, ++ 7972, 7971, 7982, 7988, 7990, 7985, 7991, 2198, 7981, 7994, ++ 7990, 8002, 8006, 8001, 8055, 8029, 8066, 8027, 8067, 8078, ++ 7997, 8028, 8026, 8034, 8044, 2208,14283, 8033,14283, 8060, ++ 14283, 8057, 8050, 8053, 8060, 8064,14283, 8055, 8127, 8038, ++ 8067, 8124, 8135, 8053, 8072, 8058, 8058, 8059, 8068, 8074, ++ 8070, 8070, 8162, 8072,14283, 8129, 8188, 8143, 0, 8161, ++ 8145, 8152, 8162, 8147, 8156, 8164, 8161, 8166,14283, 8116, ++ 8214, 8216, 8158, 8153, 8230, 8171, 8184, 8198, 8234, 8235, ++ ++ 8244,14283, 8194,14283, 8212,14283, 8210,14283, 8116, 2155, ++ 8208, 8216, 8207, 8225, 8215, 8210, 8239, 8207, 8225, 8216, ++ 8225, 8240, 8233, 8254, 8252, 8248, 8249, 8258, 8239, 8264, ++ 8259, 8259,14283, 8254, 8260, 8262, 8259, 8265, 8292, 8273, ++ 8275, 8278, 2165, 8275, 8280, 8339, 8294, 8296, 8302, 2063, ++ 8279,14283, 8303,14283,14283,14283, 8306,14283, 8294, 8360, ++ 8386, 8236, 8383, 8296, 8308, 8309, 8299, 8318, 8328, 8326, ++ 14283, 8323, 8329,14283, 8406, 8341, 8401, 8386, 8391, 8402, ++ 8436, 8405, 8393, 8393, 8394, 0, 8348, 8396, 8443, 8414, ++ 8415, 8447, 8416, 8407, 8416, 2064, 8350, 8480, 8467, 8401, ++ ++ 14283,14283,14283, 8461, 8430, 8448, 8450,14283, 8459, 8468, ++ 8476, 8481, 8462, 8480, 8481, 2002, 8469, 1997,14283, 8470, ++ 14283, 8484, 8485, 8477, 8476, 8480,14283, 1966, 8488, 8483, ++ 3532, 8491, 8485, 8527, 8497, 8505, 8534, 0, 1807, 8520, ++ 8522, 8537, 8539, 1759, 8539, 8527, 8354, 8565, 8585, 8611, ++ 14283, 8543, 8546, 8550, 8358, 8561, 8564, 8576, 8387, 8571, ++ 8567, 8569,14283, 8572, 8579, 8639, 8593, 8578, 8579, 8647, ++ 8574, 1709, 8471, 0, 1652, 8528, 0, 8584, 8585, 5041, ++ 8618, 8634, 8628, 8666, 8694, 8703,14283, 8621, 8635, 8630, ++ 14283, 8640, 1579, 8642, 8646, 8632, 8636, 8639, 8635, 8641, ++ ++ 8662, 8699, 8684, 8684, 8685, 8699, 8702, 8703,14283, 1374, ++ 8702, 3983,14283, 4005, 8703, 8713, 8690, 8694, 8706, 0, ++ 0, 8724,14283, 8709, 8723,14283,14283, 8772, 8771, 8780, ++ 8749, 8455, 8737, 8808, 8456, 0, 8738, 8574, 8741, 8763, ++ 8773, 8759, 8765, 8799, 8786, 8795,14283, 8847, 8814, 8802, ++ 1313, 1065, 8811, 8812, 7572, 1008, 7574, 8803, 8821, 8821, ++ 8872, 8812, 8820, 8825,14283, 8826, 8841, 8852, 8850, 8851, ++ 8863, 8854, 8865, 8857, 8861, 8862, 8449, 8892, 8860,14283, ++ 8862,14283, 989, 4343,14283, 4654, 8881, 914, 8864, 0, ++ 8860,14283, 8868, 8943, 8947, 0, 0, 0,14283, 8868, ++ ++ 8839, 8876, 8944, 8917, 0, 0, 8954, 0, 8892, 8908, ++ 8915, 8930, 8935, 8935, 8936, 8957, 8936, 8952,14283,14283, ++ 8955, 8956, 8942, 8961, 879, 8986, 876, 8955, 8945, 8947, ++ 8947, 8948, 8950, 8950, 8962, 8972,14283, 8969, 8976, 8909, ++ 8961,14283, 8960, 8964,14283,14283, 8975, 8988,14283, 4752, ++ 14283, 8973,14283, 8983, 8992,14283, 830, 8979, 0, 9043, ++ 0, 9037, 0, 743, 8997, 9008, 9007, 9013, 9011, 9009, ++ 9012, 9018, 9058, 8529, 8770, 9024, 9025, 9057, 9020, 9028, ++ 14283, 9033, 9034,14283, 9038, 9035, 9025, 9032, 9032,14283, ++ 9029, 9040, 670,14283,14283, 9048, 9040, 9057, 9061,14283, ++ ++ 9049, 602, 0, 9079, 447, 9095,14283, 9054, 9064,14283, ++ 9067, 9072, 9069, 9078, 9073, 9119, 9089, 9123, 9127, 9138, ++ 9142, 9079, 9082, 9099, 9093, 9113,14283, 436, 9112, 9111, ++ 9115, 9122, 9114, 9127, 461, 367, 9122, 9158,14283, 330, ++ 9155, 366, 9125, 9121, 9127, 9124,14283, 9118, 9125, 0, ++ 9169, 9130, 9173, 0, 9196, 0, 9197, 9203,14283, 9135, ++ 14283, 9137, 9153, 9153,14283, 9145, 9147, 9175, 9160, 9181, ++ 9174, 0, 315, 9219, 9166, 9170, 9225, 9170, 9183, 9227, ++ 14283, 9196, 262, 254, 9231, 0, 9242, 0,14283, 9204, ++ 9205, 9195, 9201, 9209, 9203, 9215, 9212, 9206, 9209, 9215, ++ ++ 0, 0, 143, 9259, 0, 9216, 9270, 9260, 9220, 9282, ++ 9240,14283,14283, 138, 109, 9267, 9275, 9269,14283,14283, ++ 9257,14283, 9278, 9269, 9273, 9274, 0, 43,14283, 9298, ++ 9327, 9276, 9336, 9288,14283,14283, 9302, 9311, 9332,14283, ++ 6, 9323, 9333,14283,14283, 9355, 9381,14283,14283,14283, ++ 9330,14283,14283, 9326, 9390, 9327, 9357, 9354, 9347,14283, ++ 9359, 9387, 9389,14283,14283, 9451, 9469, 9487, 9505, 9523, ++ 9541, 9559, 9577, 9595, 9613, 9631, 9649, 9667, 9685, 9703, ++ 9721, 9739, 9757, 9775, 9793, 9811, 9829, 9847, 9865, 9883, ++ 9901, 9919, 9937, 9955, 9973, 9991,10009,10027,10045,10063, ++ ++ 10081,10099,10117,10135,10153,10171,10189,10207,10225,10243, ++ 10261,10279,10297,10315,10333,10351,10369,10387,10405,10423, ++ 10441,10459,10477,10495,10512,10530,10548,10566,10584,10602, ++ 10619,10637,10655,10673,10691,10709,10727,10745,10763,10781, ++ 10799,10817,10835,10853,10871,10889,10907,10925,10943,10961, ++ 10979,10997,11015,11033,11050,11068,11086,11104,11122,11140, ++ 11158,11176,11193,11211,11229,11247,11265,11283,11301,11319, ++ 11337,11355,11373,11391,11409,11427,11445,11463,11481,11499, ++ 11517,11534,11552,11570,11588,11606,11624,11642,11659,11677, ++ 11695,11713,11731,11749,11767,11785,11803,11821,11839,11857, ++ ++ 11875,11893,11911,11929,11947,11965,11982,12000,12018,12036, ++ 12054,12072,12090,12108,12126,12144,12162,12173,12187,12205, ++ 12213,12229,12246,12250,12266,12284,12294,12310,12328,12346, ++ 12364,12381,12397,12415,12433,12451,12469,12487,12504,12520, ++ 12538,12547,12563,12581,12599,12617,12634,12642,12657,12673, ++ 12690,12708,12726,12744,12762,12780,12798,12816,12834,12852, ++ 12870,12880,12888,12903,12918,12929,12937,12945,12961,12977, ++ 12993,13010,13028,13046,13064,13082,13100,13118,13136,13154, ++ 13172,13190,13208,13226,13244,13262,13280,13293,13301,13309, ++ 13317,13328,13344,13360,13368,13376,13392,13410,13428,13446, ++ ++ 13464,13482,13500,13518,13536,13554,13572,13590,13606,13622, ++ 13640,13658,13668,13684,13700,13713,13731,13748,13765,13782, ++ 13793,13809,13826,13843,13855,13871,13889,13906,13924,13941, ++ 13959,13976,13992,14009,14019,14035,14052,14070,14087,14105, ++ 14123,14140,14157,14175,14187,14203,14220,14237,14248,14264 + } ; + +-static const flex_int16_t yy_def[4238] = ++static const flex_int16_t yy_def[4251] = + { 0, +- 3953, 3953, 3952, 3, 3954, 3954, 3, 3, 3955, 3955, +- 3955, 3955, 3956, 3956, 3957, 3957, 3958, 3958, 3959, 3959, +- 3960, 3960, 3954, 3954, 3954, 3954, 3961, 3961, 3962, 3962, +- 3962, 3962, 3963, 3963, 3964, 3964, 3952, 37, 37, 37, +- 3954, 3954, 3954, 3954, 3954, 3954, 3965, 3965, 3966, 3966, +- 3967, 3967, 3968, 3968, 3969, 3969, 3970, 3970, 3971, 3971, +- 3954, 3954, 3972, 3972, 3973, 3973, 3971, 3971, 3954, 3954, +- 3974, 3974, 3975, 3975, 3952, 3952, 3952, 3952, 3952, 3952, +- 3976, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 131, 3952, 3952, 3952, 3977, 3977, 3977, 3952, +- 3952, 3977, 3978, 3978, 3978, 3952, 3979, 3978, 3980, 3980, +- 3980, 3952, 3981, 3952, 3980, 3982, 3982, 3952, 3982, 3952, +- 3952, 3983, 3952, 3952, 3952, 3983, 3984, 3983, 3985, 3985, +- 3985, 3952, 3986, 3985, 3952, 3987, 3952, 3985, 3988, 3988, +- 3988, 3952, 3989, 3988, 3990, 3990, 3990, 3952, 3952, 3990, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3991, 3991, 3952, 3952, +- 3991, 3992, 3992, 3952, 3993, 3992, 3952, 3994, 3995, 3996, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3997, 3952, 3998, 3997, 3952, 3952, 3952, 3999, 3952, 4000, +- 3952, 3999, 3952, 3952, 3952, 4001, 4001, 4001, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4002, 3952, 4002, 4002, 4002, +- 3952, 3952, 4002, 4002, 4002, 4003, 3952, 4004, 4003, 4003, +- 4003, 3952, 4003, 4003, 4003, 4005, 3952, 4006, 4005, 4005, +- 4005, 3952, 4005, 4005, 4005, 4007, 4007, 3952, 4007, 3952, +- 4007, 4008, 3952, 4008, 3952, 4009, 4010, 4011, 4010, 4008, +- 4012, 3952, 4013, 4012, 4012, 4012, 4012, 3952, 4012, 3952, +- +- 4014, 4015, 4016, 4015, 4017, 4015, 3952, 3952, 4012, 4012, +- 4018, 3952, 4019, 4018, 4018, 4018, 3952, 4018, 4018, 4018, +- 4020, 3952, 4020, 4020, 3952, 4020, 3952, 3952, 4020, 4020, +- 4020, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 4021, 3952, 4021, 3952, 3952, 4021, +- 4022, 3952, 4023, 4022, 3952, 4022, 4024, 4025, 4026, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4027, 3952, 4028, +- 4027, 3952, 4027, 3952, 4029, 3952, 4030, 4029, 3952, 4029, +- 4031, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4032, +- 3952, 3952, 4032, 4032, 4033, 4034, 3952, 3952, 4034, 4034, +- 4035, 4036, 3952, 3952, 4036, 4036, 3952, 3952, 4037, 4038, +- 4037, 4039, 4040, 4041, 4041, 4041, 4040, 4042, 4043, 3952, +- 3952, 4044, 4045, 4044, 4046, 4044, 4047, 4048, 4048, 4048, +- 4049, 4049, 4049, 4050, 4048, 4043, 4043, 4051, 4052, 3952, +- 3952, 4052, 4052, 3952, 4053, 3952, 3952, 4053, 3952, 4053, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4054, 3952, 3952, 4055, 4056, 3952, +- 3952, 3952, 3952, 3952, 3952, 4057, 4058, 3952, 3952, 4059, +- 4060, 3952, 3952, 4061, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4062, 3952, 4062, +- 4063, 3952, 4063, 4064, 3952, 4064, 3952, 4065, 4066, 4066, +- 4066, 4067, 4065, 4067, 4067, 3952, 4068, 3952, 3952, 4068, +- 3952, 4043, 3952, 4069, 4069, 4069, 4070, 4071, 4070, 4070, +- 4072, 4073, 4069, 4074, 4071, 4072, 4071, 4071, 4043, 4075, +- +- 4043, 3952, 4075, 3952, 4075, 4075, 4076, 4043, 4077, 3952, +- 4077, 4078, 3952, 4078, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4079, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4080, 3952, 4081, +- +- 3952, 3952, 3952, 3952, 3952, 4082, 3952, 4083, 3952, 4084, +- 4084, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 4085, 3952, 4086, 3952, 4087, 4088, 4089, +- 4090, 3952, 4069, 4091, 4091, 4091, 4072, 4069, 4071, 4072, +- 4071, 4092, 4071, 4093, 4094, 4095, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4096, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4079, 4097, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4098, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 4099, 3952, 3952, 3952, +- 3952, 4100, 3952, 4101, 3952, 4102, 4102, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4088, +- 4089, 4088, 4089, 4091, 4071, 4091, 4072, 4091, 4072, 4103, +- 4072, 4072, 4071, 4093, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4096, 4104, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4105, 3952, 3952, 3952, 4097, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4098, 3952, 4098, 4106, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 4102, 4102, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4091, 4072, +- 4092, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4104, 4107, 4096, 4104, 3952, 3952, 3952, 3952, +- 3952, 3952, 4108, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4098, 3952, 4106, 3952, 3952, 3952, 4102, 4109, +- 3952, 3952, 4110, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4072, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4096, 4104, 3952, 4107, 4096, 3952, 4111, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4098, 3952, 4102, 4112, +- 4113, 3952, 3952, 4114, 4110, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4115, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4104, 3952, 4107, 4107, 3952, +- +- 4111, 4116, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4117, 4112, 4112, 4113, 4113, 3952, +- 3952, 4114, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4118, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4119, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4115, 4120, 4115, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4121, 3952, 4116, 4122, +- 4116, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4123, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4124, 4125, 4112, 3952, 4112, 4113, 4113, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4126, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4118, 4127, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4128, +- 3952, 3952, 3952, 3952, 4129, 4119, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4115, 4120, 3952, 4120, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4121, 4130, 4131, 3952, 4116, +- +- 4122, 3952, 4122, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4123, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4124, 4132, 4125, +- 4133, 3952, 3952, 3952, 3952, 3952, 4134, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4135, 4126, 4136, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4127, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4128, +- 3952, 3952, 3952, 3952, 4129, 3952, 3952, 3952, 3952, 3952, +- 4137, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4120, 3952, 4115, 4120, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4138, +- +- 4130, 4139, 4121, 4140, 4141, 4130, 4142, 3952, 3952, 4143, +- 3952, 4144, 4143, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4145, +- 4146, 3952, 4147, 4148, 3952, 3952, 3952, 3952, 3952, 4149, +- 4150, 4151, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4152, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4153, +- 4154, 4155, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 4156, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4157, 3952, 3952, 4158, 4158, 4159, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4160, 4161, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4162, 4163, 4164, 4165, 3952, 4166, 4167, 4163, 4168, 4169, +- +- 4170, 4171, 4162, 4164, 4171, 4172, 4173, 4174, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4175, 4176, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4177, 4178, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4179, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4180, 4180, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4181, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 4182, 4183, 3952, 3952, 3952, 4184, 3952, 4184, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4185, 3952, 3952, 3952, 3952, 3952, 3952, 4164, 4186, 4162, +- 4187, 4164, 4164, 4188, 3952, 3952, 4186, 4186, 4189, 4189, +- 4190, 4191, 4172, 4191, 4191, 4192, 4192, 4162, 4193, 4193, +- 4194, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4177, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4195, 4196, 3952, 3952, 3952, 3952, 4197, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4198, 4181, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4182, 3952, 3952, 3952, 3952, 4184, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4162, 4164, 3952, 4186, 4162, 4190, +- 4191, 4187, 4193, 4164, 3952, 4189, 4186, 4172, 4191, 4172, +- 4199, 4191, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4195, 4195, 4200, 4196, 3952, 3952, 4197, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4198, 3952, 3952, 3952, 4201, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4184, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 4164, 4186, 4190, 4187, 4187, 4193, 4189, 4191, 4199, 4172, +- 4191, 4199, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4202, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4200, 3952, 3952, 4203, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4201, 4201, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4164, 4186, 4199, +- 4172, 4191, 4199, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4203, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4204, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4205, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4199, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4204, 4204, 4206, +- 4207, 3952, 3952, 3952, 3952, 3952, 3952, 4205, 4205, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4208, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4206, 4206, 4209, 4207, 4207, 4210, 3952, 3952, +- 4211, 3952, 3952, 3952, 4205, 4205, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4208, +- 4212, 3952, 3952, 3952, 3952, 3952, 3952, 4213, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4214, 3952, 4215, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4209, 4210, 3952, 3952, 4211, 3952, 4211, 3952, 3952, 3952, +- 4205, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4212, 3952, +- 3952, 3952, 4213, 4213, 4216, 4217, 4218, 3952, 3952, 4219, +- 3952, 3952, 3952, 4214, 4220, 4215, 4221, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4211, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4217, 3952, 4222, 4219, 4223, 4224, +- 4220, 4221, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4211, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4222, 4223, +- 4224, 3952, 4224, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 4225, 3952, 4226, 4227, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4224, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4225, 4225, 3952, 4226, +- 4228, 4227, 4229, 4230, 4231, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4232, 3952, +- 4233, 4224, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4228, +- 4229, 4230, 4234, 4231, 4235, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4232, 4236, 4233, +- 4233, 4237, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 4234, 4235, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4236, 4237, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 0, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952 ++ 3966, 3966, 3965, 3, 3967, 3967, 3, 3, 3968, 3968, ++ 3968, 3968, 3969, 3969, 3970, 3970, 3971, 3971, 3972, 3972, ++ 3973, 3973, 3967, 3967, 3967, 3967, 3974, 3974, 3975, 3975, ++ 3975, 3975, 3976, 3976, 3977, 3977, 3965, 37, 37, 37, ++ 3967, 3967, 3967, 3967, 3967, 3967, 3978, 3978, 3979, 3979, ++ 3980, 3980, 3981, 3981, 3982, 3982, 3983, 3983, 3984, 3984, ++ 3967, 3967, 3985, 3985, 3986, 3986, 3984, 3984, 3967, 3967, ++ 3987, 3987, 3988, 3988, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3989, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 131, 3965, 3965, 3965, 3990, 3990, 3990, 3965, ++ 3965, 3990, 3991, 3991, 3991, 3965, 3992, 3991, 3993, 3993, ++ 3993, 3965, 3994, 3965, 3993, 3995, 3995, 3965, 3995, 3965, ++ 3965, 3996, 3965, 3965, 3965, 3996, 3997, 3996, 3998, 3998, ++ 3998, 3965, 3999, 3998, 3965, 4000, 3965, 3998, 4001, 4001, ++ 4001, 3965, 4002, 4001, 4003, 4003, 4003, 3965, 3965, 4003, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4004, 4004, 3965, 3965, ++ 4004, 4005, 4005, 3965, 4006, 4005, 3965, 4007, 4008, 4009, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4010, 3965, 4011, 4010, 3965, 3965, 3965, 4012, 3965, 4013, ++ 3965, 4012, 3965, 3965, 3965, 4014, 4014, 4014, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4015, 3965, 4015, 4015, 4015, ++ 3965, 3965, 4015, 4015, 4015, 4016, 3965, 4017, 4016, 4016, ++ 4016, 3965, 4016, 4016, 4016, 4018, 3965, 4019, 4018, 4018, ++ 4018, 3965, 4018, 4018, 4018, 4020, 4020, 3965, 4020, 3965, ++ 4020, 4021, 3965, 4021, 3965, 4022, 4023, 4024, 4023, 4021, ++ 4025, 3965, 4026, 4025, 4025, 4025, 4025, 3965, 4025, 3965, ++ ++ 4027, 4028, 4029, 4028, 4030, 4028, 3965, 3965, 4025, 4025, ++ 4031, 3965, 4032, 4031, 4031, 4031, 3965, 4031, 4031, 4031, ++ 4033, 3965, 4033, 4033, 3965, 4033, 3965, 3965, 4033, 4033, ++ 4033, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 4034, 3965, 4034, 3965, 3965, 4034, ++ 4035, 3965, 4036, 4035, 3965, 4035, 4037, 4038, 4039, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4040, 3965, 4041, ++ 4040, 3965, 4040, 3965, 4042, 3965, 4043, 4042, 3965, 4042, ++ 4044, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4045, ++ 3965, 3965, 4045, 4045, 4046, 4047, 3965, 3965, 4047, 4047, ++ 4048, 4049, 3965, 3965, 4049, 4049, 3965, 3965, 4050, 4051, ++ 4050, 4052, 4053, 4054, 4054, 4054, 4053, 4055, 4056, 3965, ++ 3965, 4057, 4058, 4057, 4059, 4057, 4060, 4061, 4061, 4061, ++ 4062, 4062, 4062, 4063, 4061, 4056, 4056, 4064, 4065, 3965, ++ 3965, 4065, 4065, 3965, 4066, 3965, 3965, 4066, 3965, 4066, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4067, 3965, 3965, 4068, 4069, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4070, 4071, 3965, 3965, 4072, ++ 4073, 3965, 3965, 4074, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4075, 3965, 4075, ++ 4076, 3965, 4076, 4077, 3965, 4077, 3965, 4078, 4079, 4079, ++ 4079, 4080, 4078, 4080, 4080, 3965, 4081, 3965, 3965, 4081, ++ 3965, 4056, 3965, 4082, 4082, 4082, 4083, 4084, 4083, 4083, ++ 4085, 4086, 4082, 4087, 4084, 4085, 4084, 4084, 4056, 4088, ++ ++ 4056, 3965, 4088, 3965, 4088, 4088, 4089, 4056, 4090, 3965, ++ 4090, 4091, 3965, 4091, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4092, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4093, 3965, 4094, ++ ++ 3965, 3965, 3965, 3965, 3965, 4095, 3965, 4096, 3965, 4097, ++ 4097, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 4098, 3965, 4099, 3965, 4100, 4101, 4102, ++ 4103, 3965, 4082, 4104, 4104, 4104, 4085, 4082, 4084, 4085, ++ 4084, 4105, 4084, 4106, 4107, 4108, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4109, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4092, 4110, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4111, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 4112, 3965, 3965, 3965, ++ 3965, 4113, 3965, 4114, 3965, 4115, 4115, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4101, ++ 4102, 4101, 4102, 4104, 4084, 4104, 4085, 4104, 4085, 4116, ++ 4085, 4085, 4084, 4106, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4109, 4117, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4118, 3965, 3965, 3965, 4110, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4111, 3965, 4111, 4119, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 4115, 4115, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4104, 4085, ++ 4105, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4117, 4120, 4109, 4117, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4121, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4111, 3965, 4119, 3965, 3965, 3965, 4115, 4122, ++ 3965, 3965, 4123, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4085, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4109, 4117, 3965, 4120, 4109, 3965, 4124, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4111, 3965, 4115, 4125, ++ 4126, 3965, 3965, 4127, 4123, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4128, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4117, 3965, 4120, 4120, 3965, ++ ++ 4124, 4129, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4130, 4125, 4125, 4126, 4126, 3965, ++ 3965, 4127, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4131, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4132, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4128, 4133, 4128, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4134, 3965, 4129, 4135, ++ 4129, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4136, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4137, 4138, 4125, 3965, 4125, 4126, 4126, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4139, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4131, 4140, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4141, ++ 3965, 3965, 3965, 3965, 4142, 4132, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4128, 4133, 3965, 4133, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4134, 4143, 4144, 3965, ++ ++ 4129, 4135, 3965, 4135, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4136, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4137, 4145, ++ 4138, 4146, 3965, 3965, 3965, 3965, 3965, 4147, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4148, 4139, 4149, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4140, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4141, 3965, 3965, 3965, 3965, 4142, 3965, 3965, 3965, 3965, ++ 3965, 4150, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4133, 3965, ++ 4128, 4133, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 4151, 4143, 4152, 4134, 4153, 4154, 4143, 4155, 3965, ++ 3965, 4156, 3965, 4157, 4156, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4158, 4159, 3965, 4160, 4161, 3965, 3965, 3965, 3965, ++ 3965, 4162, 4163, 4164, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4165, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4166, 4167, 4168, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 4169, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4170, 3965, 3965, 4171, 4171, 4172, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4173, 4174, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4175, 4176, 4177, 4178, 3965, 4179, 4180, ++ ++ 4176, 4181, 4182, 4183, 4184, 4175, 4177, 4184, 4185, 4186, ++ 4187, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4188, 4189, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4190, 4191, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4192, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4193, 4193, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4194, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 4195, 4196, 3965, 3965, 3965, ++ 4197, 3965, 4197, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4198, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4177, 4199, 4175, 4200, 4177, 4177, 4201, 3965, 3965, ++ 4199, 4199, 4202, 4202, 4203, 4204, 4185, 4204, 4204, 4205, ++ 4205, 4175, 4206, 4206, 4207, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4190, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4208, 4209, 3965, ++ 3965, 3965, 3965, 4210, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4211, 4194, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4195, 3965, 3965, 3965, 3965, 4197, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4175, ++ 4177, 3965, 4199, 4175, 4203, 4204, 4200, 4206, 4177, 3965, ++ 4202, 4199, 4185, 4204, 4185, 4212, 4204, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4208, 4208, 4213, 4209, ++ 3965, 3965, 4210, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4211, 3965, 3965, ++ 3965, 4214, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4197, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 4177, 4199, 4203, 4200, ++ 4200, 4206, 4202, 4204, 4212, 4185, 4204, 4212, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4215, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4213, 3965, 3965, ++ 4216, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4214, ++ 4214, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4177, 4199, 4212, 4185, 4204, 4212, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4216, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4217, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4218, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4212, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4217, 4217, 4219, 4220, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4218, 4218, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4221, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4219, 4219, 4222, 4220, 4220, 4223, 3965, 3965, 4224, ++ 3965, 3965, 3965, 4218, 4218, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4221, ++ 4225, 3965, 3965, 3965, 3965, 3965, 3965, 4226, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4227, 3965, 4228, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4222, 4223, 3965, 3965, 4224, 3965, 4224, 3965, 3965, 3965, ++ 4218, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4225, ++ 3965, 3965, 3965, 4226, 4226, 4229, 4230, 4231, 3965, 3965, ++ ++ 4232, 3965, 3965, 3965, 4227, 4233, 4228, 4234, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4224, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4230, 3965, 4235, 4232, ++ 4236, 4237, 4233, 4234, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4224, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 4235, 4236, 4237, 3965, 4237, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4238, 3965, 4239, 4240, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4237, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4238, ++ 4238, 3965, 4239, 4241, 4240, 4242, 4243, 4244, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4245, 3965, 4246, 4237, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4241, 4242, 4243, 4247, 4244, 4248, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 4245, 4249, 4246, 4246, 4250, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4247, 4248, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4249, 4250, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 0, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965 + } ; + +-static const flex_int16_t yy_nxt[14349] = ++static const flex_int16_t yy_nxt[14371] = + { 0, +- 3952, 77, 78, 79, 77, 118, 80, 81, 118, 118, +- 283, 284, 118, 3952, 82, 119, 120, 121, 119, 122, +- 123, 3952, 129, 98, 124, 129, 130, 98, 125, 1394, +- 83, 135, 84, 85, 3939, 269, 136, 86, 87, 88, +- 315, 316, 98, 89, 90, 91, 135, 92, 93, 3932, ++ 3965, 77, 78, 79, 77, 118, 80, 81, 118, 118, ++ 283, 284, 118, 3965, 82, 119, 120, 121, 119, 122, ++ 123, 3965, 129, 98, 124, 129, 130, 98, 125, 1394, ++ 83, 135, 84, 85, 3952, 269, 136, 86, 87, 88, ++ 315, 316, 98, 89, 90, 91, 135, 92, 93, 3945, + 131, 136, 94, 1110, 138, 139, 95, 138, 83, 874, + 84, 85, 140, 269, 141, 86, 87, 88, 256, 270, + 126, 89, 90, 91, 1395, 92, 93, 132, 283, 284, +@@ -1880,10 +1883,10 @@ static const flex_int16_t yy_nxt[14349] = + 256, 129, 130, 271, 82, 157, 158, 270, 157, 127, + + 96, 272, 129, 98, 233, 129, 130, 257, 234, 142, +- 83, 235, 84, 85, 273, 3923, 131, 86, 87, 88, ++ 83, 235, 84, 85, 273, 3936, 131, 86, 87, 88, + 274, 271, 1010, 89, 90, 91, 275, 92, 93, 272, + 133, 280, 94, 526, 318, 527, 95, 318, 83, 1011, +- 84, 85, 273, 132, 3922, 86, 87, 88, 274, 3952, ++ 84, 85, 273, 132, 3935, 86, 87, 88, 274, 3965, + 159, 89, 90, 91, 275, 92, 93, 132, 236, 280, + 94, 96, 97, 98, 96, 97, 96, 96, 96, 96, + 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, +@@ -1896,8 +1899,8 @@ static const flex_int16_t yy_nxt[14349] = + 96, 106, 96, 107, 108, 109, 110, 111, 112, 113, + 96, 114, 115, 96, 96, 96, 96, 117, 119, 120, + 121, 119, 122, 123, 281, 129, 98, 124, 129, 130, +- 3900, 125, 138, 139, 2298, 138, 144, 145, 3899, 144, +- 140, 146, 141, 228, 147, 229, 144, 145, 2500, 144, ++ 3913, 125, 138, 139, 2299, 138, 144, 145, 3912, 144, ++ 140, 146, 141, 228, 147, 229, 144, 145, 2502, 144, + 230, 146, 281, 133, 147, 150, 151, 347, 150, 347, + 152, 150, 151, 153, 150, 526, 152, 527, 154, 153, + +@@ -1905,12 +1908,12 @@ static const flex_int16_t yy_nxt[14349] = + 132, 489, 267, 569, 276, 180, 181, 142, 180, 289, + 182, 148, 277, 183, 569, 163, 164, 231, 163, 282, + 165, 148, 127, 96, 348, 166, 186, 187, 163, 188, +- 155, 167, 276, 3889, 189, 278, 155, 289, 163, 164, ++ 155, 167, 276, 3902, 189, 278, 155, 289, 163, 164, + 277, 163, 163, 165, 231, 290, 268, 347, 166, 347, + 159, 163, 279, 645, 167, 490, 170, 171, 295, 170, +- 184, 172, 3793, 278, 173, 163, 174, 301, 357, 175, +- 168, 358, 176, 290, 170, 171, 3829, 170, 302, 172, +- 279, 190, 173, 177, 174, 3859, 295, 175, 186, 187, ++ 184, 172, 3806, 278, 173, 163, 174, 301, 357, 175, ++ 168, 358, 176, 290, 170, 171, 3842, 170, 302, 172, ++ 279, 190, 173, 177, 174, 3872, 295, 175, 186, 187, + + 176, 188, 646, 168, 348, 301, 189, 474, 475, 163, + 163, 177, 497, 498, 170, 171, 302, 170, 303, 172, +@@ -1920,10 +1923,10 @@ static const flex_int16_t yy_nxt[14349] = + 181, 176, 180, 190, 182, 313, 252, 183, 214, 215, + 216, 217, 177, 191, 314, 214, 215, 216, 217, 178, + 191, 191, 296, 351, 297, 226, 441, 487, 191, 441, +- 487, 226, 488, 313, 254, 438, 439, 440, 438, 3858, +- 178, 502, 314, 3851, 502, 503, 504, 283, 284, 286, ++ 487, 226, 488, 313, 254, 438, 439, 440, 438, 3871, ++ 178, 502, 314, 3864, 502, 503, 504, 283, 284, 286, + +- 296, 352, 297, 3829, 184, 191, 192, 193, 194, 192, ++ 296, 352, 297, 3842, 184, 191, 192, 193, 194, 192, + 191, 195, 191, 191, 191, 191, 191, 191, 191, 196, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 197, 198, 199, 200, 201, +@@ -1934,58 +1937,58 @@ static const flex_int16_t yy_nxt[14349] = + 208, 209, 210, 191, 211, 191, 212, 191, 191, 191, + 191, 191, 218, 219, 220, 221, 359, 222, 218, 219, + +- 220, 221, 369, 222, 218, 219, 220, 221, 3826, 222, ++ 220, 221, 369, 222, 218, 219, 220, 221, 3839, 222, + 218, 219, 220, 221, 233, 222, 291, 252, 234, 242, + 253, 235, 315, 316, 352, 252, 259, 242, 292, 260, + 352, 261, 327, 259, 259, 327, 260, 557, 261, 252, + 557, 259, 590, 318, 291, 590, 318, 223, 259, 422, + 243, 242, 244, 223, 422, 259, 292, 395, 243, 223, +- 244, 245, 246, 247, 248, 223, 2298, 254, 236, 245, ++ 244, 245, 246, 247, 248, 223, 2299, 254, 236, 245, + 246, 247, 248, 242, 263, 264, 262, 263, 243, 619, + 244, 414, 243, 262, 244, 400, 243, 265, 244, 245, + 246, 247, 248, 245, 246, 247, 248, 245, 246, 247, + +- 248, 423, 287, 489, 243, 288, 244, 293, 2888, 400, ++ 248, 423, 287, 489, 243, 288, 244, 293, 2892, 400, + 243, 298, 244, 306, 294, 245, 246, 247, 248, 428, +- 304, 245, 246, 247, 248, 299, 620, 3820, 307, 265, ++ 304, 245, 246, 247, 248, 299, 620, 3833, 307, 265, + 287, 300, 243, 288, 244, 293, 305, 308, 407, 298, +- 408, 306, 294, 245, 246, 247, 248, 400, 304, 3794, ++ 408, 306, 294, 245, 246, 247, 248, 400, 304, 3807, + 310, 584, 309, 299, 311, 312, 307, 490, 357, 300, +- 446, 358, 584, 2298, 305, 308, 319, 320, 321, 319, ++ 446, 358, 584, 2299, 305, 308, 319, 320, 321, 319, + 452, 322, 323, 320, 321, 323, 412, 324, 310, 413, + 309, 398, 311, 312, 325, 321, 321, 325, 446, 326, + 323, 320, 321, 323, 447, 324, 455, 342, 452, 349, + +- 343, 448, 349, 353, 354, 3049, 422, 347, 359, 347, ++ 343, 448, 349, 353, 354, 3054, 422, 347, 359, 347, + 347, 422, 347, 449, 344, 345, 364, 365, 474, 475, + 357, 320, 447, 358, 455, 342, 414, 320, 343, 448, +- 360, 377, 378, 360, 377, 357, 3787, 412, 358, 321, ++ 360, 377, 378, 360, 377, 357, 3800, 412, 358, 321, + 413, 449, 344, 345, 459, 320, 328, 329, 330, 331, + 332, 333, 465, 334, 350, 472, 335, 355, 423, 662, + 336, 367, 337, 338, 368, 339, 340, 341, 285, 367, + 363, 285, 459, 874, 328, 329, 330, 331, 332, 333, +- 465, 334, 3647, 472, 335, 361, 379, 414, 336, 367, ++ 465, 334, 3657, 472, 335, 361, 379, 414, 336, 367, + 337, 338, 368, 339, 340, 341, 370, 367, 663, 370, + + 742, 367, 377, 378, 368, 377, 374, 375, 450, 367, + 367, 369, 875, 368, 377, 380, 381, 377, 367, 383, + 383, 451, 383, 427, 383, 383, 383, 473, 383, 347, +- 383, 347, 383, 645, 637, 3716, 450, 637, 383, 369, +- 392, 386, 3741, 393, 470, 394, 383, 471, 392, 451, +- 441, 371, 383, 441, 743, 473, 2298, 379, 383, 388, ++ 383, 347, 383, 645, 637, 3727, 450, 637, 383, 369, ++ 392, 386, 3753, 393, 470, 394, 383, 471, 392, 451, ++ 441, 371, 383, 441, 743, 473, 2299, 379, 383, 388, + 373, 383, 392, 383, 870, 383, 383, 508, 383, 379, + 383, 388, 646, 453, 384, 471, 348, 1572, 383, 424, + 384, 396, 425, 454, 396, 383, 392, 422, 460, 393, +- 395, 394, 383, 3737, 392, 509, 461, 392, 3060, 514, ++ 395, 394, 383, 3749, 392, 509, 461, 392, 3065, 514, + + 393, 453, 394, 383, 383, 392, 662, 625, 392, 383, + 383, 454, 499, 389, 668, 499, 460, 500, 392, 392, + 390, 393, 1573, 394, 461, 391, 392, 509, 391, 401, +- 392, 520, 872, 403, 426, 404, 397, 749, 405, 2274, +- 392, 2275, 383, 388, 409, 410, 569, 395, 392, 383, ++ 392, 520, 872, 403, 426, 404, 397, 749, 405, 2275, ++ 392, 2276, 383, 388, 409, 410, 569, 395, 392, 383, + 383, 393, 392, 394, 626, 415, 392, 569, 415, 520, +- 412, 669, 521, 413, 3716, 419, 420, 501, 395, 412, +- 392, 3709, 413, 659, 429, 430, 422, 497, 498, 442, ++ 412, 669, 521, 413, 3727, 419, 420, 501, 395, 412, ++ 392, 3720, 413, 659, 429, 430, 422, 497, 498, 442, + 406, 422, 432, 433, 434, 432, 456, 522, 443, 466, + 521, 750, 444, 467, 462, 435, 523, 445, 399, 468, + +@@ -1996,7 +1999,7 @@ static const flex_int16_t yy_nxt[14349] = + 476, 477, 478, 476, 480, 477, 478, 481, 482, 483, + 484, 482, 507, 485, 482, 483, 484, 491, 524, 485, + 492, 493, 494, 492, 512, 495, 525, 513, 529, 531, +- 507, 530, 538, 2276, 529, 2277, 529, 530, 510, 542, ++ 507, 530, 538, 2277, 529, 2278, 529, 530, 510, 542, + 514, 674, 529, 543, 536, 514, 524, 537, 267, 536, + 529, 267, 536, 544, 525, 436, 529, 534, 545, 436, + +@@ -2012,13 +2015,13 @@ static const flex_int16_t yy_nxt[14349] = + 573, 574, 588, 589, 323, 327, 575, 323, 327, 324, + + 576, 579, 754, 582, 577, 325, 578, 583, 325, 585, +- 326, 580, 581, 593, 594, 586, 587, 595, 598, 3708, ++ 326, 580, 581, 593, 594, 586, 587, 595, 598, 3719, + 588, 589, 319, 320, 321, 319, 889, 322, 323, 320, + 321, 323, 604, 324, 325, 321, 321, 325, 599, 326, + 596, 593, 594, 597, 606, 595, 598, 605, 607, 755, + 265, 610, 600, 601, 602, 1329, 603, 611, 612, 614, + 604, 1117, 613, 615, 617, 608, 599, 682, 596, 618, +- 609, 597, 606, 613, 989, 605, 607, 320, 3671, 610, ++ 609, 597, 606, 613, 989, 605, 607, 320, 3682, 610, + 600, 601, 602, 320, 603, 611, 612, 614, 616, 321, + 613, 615, 617, 608, 891, 682, 349, 618, 609, 349, + +@@ -2027,49 +2030,49 @@ static const flex_int16_t yy_nxt[14349] = + 347, 347, 357, 363, 360, 358, 627, 360, 990, 357, + 600, 601, 358, 364, 365, 357, 629, 758, 358, 629, + 625, 357, 630, 683, 358, 367, 357, 632, 368, 358, +- 2480, 350, 2481, 367, 373, 370, 622, 633, 370, 2298, ++ 2482, 350, 2483, 367, 373, 370, 622, 633, 370, 2299, + 367, 620, 355, 368, 441, 348, 348, 441, 367, 374, + 375, 683, 359, 628, 367, 635, 631, 368, 635, 361, + 367, 367, 367, 368, 759, 363, 636, 626, 367, 684, + 367, 359, 584, 368, 412, 369, 359, 413, 367, 377, + +- 378, 3049, 377, 584, 634, 377, 378, 685, 377, 650, ++ 378, 3054, 377, 584, 634, 377, 378, 685, 377, 650, + 371, 377, 380, 381, 377, 377, 638, 684, 377, 383, + 383, 686, 383, 632, 373, 874, 383, 383, 399, 383, + 369, 383, 383, 392, 734, 685, 648, 734, 394, 383, + 369, 392, 383, 640, 414, 383, 383, 383, 687, 686, +- 2809, 419, 420, 383, 379, 640, 651, 2985, 668, 688, ++ 2812, 419, 420, 383, 379, 640, 651, 2989, 668, 688, + 379, 736, 383, 388, 736, 383, 379, 383, 487, 383, + 379, 487, 422, 488, 390, 388, 687, 422, 643, 383, + 388, 384, 383, 649, 382, 383, 383, 688, 383, 383, + 383, 392, 388, 1323, 393, 643, 394, 641, 383, 392, + +- 2810, 429, 430, 383, 383, 669, 383, 2986, 674, 431, ++ 2813, 429, 430, 383, 383, 669, 383, 2990, 674, 431, + 383, 383, 383, 392, 676, 392, 399, 389, 393, 399, +- 394, 399, 689, 392, 423, 396, 642, 640, 396, 2274, +- 392, 2275, 660, 393, 647, 394, 3656, 392, 392, 418, ++ 394, 399, 689, 392, 423, 396, 642, 640, 396, 2275, ++ 392, 2276, 660, 393, 647, 394, 3666, 392, 392, 418, + 390, 395, 670, 399, 409, 410, 383, 388, 392, 806, +- 689, 648, 392, 394, 392, 675, 392, 393, 3952, 394, ++ 689, 648, 392, 394, 392, 675, 392, 393, 3965, 394, + 806, 677, 392, 383, 388, 395, 315, 316, 431, 383, + 383, 406, 285, 676, 391, 285, 392, 391, 391, 392, + 397, 391, 653, 392, 654, 809, 403, 655, 404, 671, + 412, 405, 487, 413, 658, 487, 809, 488, 649, 661, + + 399, 392, 693, 673, 399, 392, 870, 412, 391, 391, +- 413, 391, 391, 392, 392, 3952, 403, 664, 404, 404, ++ 413, 391, 391, 392, 392, 3965, 403, 664, 404, 404, + 677, 405, 405, 415, 658, 658, 415, 427, 412, 656, + 693, 413, 1102, 406, 666, 392, 391, 666, 422, 392, + 418, 667, 393, 422, 394, 392, 672, 392, 393, 672, + 394, 412, 424, 392, 413, 425, 744, 414, 657, 744, + 422, 392, 391, 406, 665, 678, 1117, 392, 679, 680, +- 2525, 422, 697, 422, 872, 698, 422, 699, 416, 620, ++ 2527, 422, 697, 422, 872, 698, 422, 699, 416, 620, + 694, 432, 433, 434, 432, 438, 439, 440, 438, 395, + 431, 695, 391, 391, 435, 395, 690, 700, 691, 701, + + 697, 414, 692, 698, 702, 699, 704, 426, 694, 705, + 707, 706, 708, 710, 713, 703, 714, 716, 715, 695, + 423, 711, 709, 423, 690, 700, 691, 701, 717, 731, +- 692, 712, 702, 888, 704, 3611, 436, 705, 707, 706, ++ 692, 712, 702, 888, 704, 3621, 436, 705, 707, 706, + 708, 710, 713, 703, 714, 716, 715, 732, 737, 711, + 709, 737, 733, 738, 1117, 502, 717, 731, 502, 712, + 718, 719, 740, 720, 662, 740, 721, 741, 722, 762, +@@ -2079,12 +2082,12 @@ static const flex_int16_t yy_nxt[14349] = + + 725, 763, 726, 663, 727, 728, 729, 730, 480, 477, + 478, 480, 480, 477, 478, 481, 482, 483, 484, 482, +- 889, 485, 492, 493, 494, 492, 2887, 495, 482, 483, ++ 889, 485, 492, 493, 494, 492, 2891, 495, 482, 483, + 484, 491, 502, 485, 1124, 502, 436, 492, 493, 494, +- 492, 499, 495, 2507, 499, 751, 500, 506, 751, 510, ++ 492, 499, 495, 2509, 499, 751, 500, 506, 751, 510, + 752, 506, 506, 764, 756, 512, 506, 516, 513, 512, + 760, 765, 513, 436, 834, 529, 529, 436, 530, 766, +- 3599, 486, 768, 529, 529, 834, 529, 496, 775, 530, ++ 3609, 486, 768, 529, 529, 834, 529, 496, 775, 530, + 776, 764, 536, 486, 529, 770, 777, 529, 891, 765, + 536, 533, 496, 772, 557, 540, 501, 557, 529, 507, + +@@ -2093,11 +2096,11 @@ static const flex_int16_t yy_nxt[14349] = + 537, 782, 536, 783, 784, 536, 533, 785, 536, 800, + 778, 537, 771, 536, 801, 803, 536, 804, 779, 536, + 773, 780, 802, 805, 807, 802, 781, 808, 810, 782, +- 536, 783, 784, 2298, 3592, 785, 811, 800, 266, 3590, +- 812, 813, 801, 803, 814, 804, 590, 538, 3575, 590, +- 835, 805, 807, 835, 2525, 808, 810, 815, 540, 786, ++ 536, 783, 784, 2299, 3602, 785, 811, 800, 266, 3600, ++ 812, 813, 801, 803, 814, 804, 590, 538, 3584, 590, ++ 835, 805, 807, 835, 2527, 808, 810, 815, 540, 786, + 816, 787, 788, 817, 811, 789, 790, 791, 812, 813, +- 818, 792, 814, 819, 793, 3060, 794, 795, 796, 797, ++ 818, 792, 814, 819, 793, 3065, 794, 795, 796, 797, + + 824, 798, 799, 825, 820, 815, 826, 786, 816, 787, + 788, 817, 827, 789, 790, 791, 822, 823, 818, 792, +@@ -2108,13 +2111,13 @@ static const flex_int16_t yy_nxt[14349] = + 852, 829, 853, 830, 831, 832, 836, 837, 854, 838, + 839, 840, 855, 856, 841, 842, 857, 843, 844, 351, + 845, 846, 847, 833, 848, 849, 850, 851, 852, 347, +- 853, 347, 870, 3529, 357, 623, 854, 358, 623, 637, ++ 853, 347, 870, 3538, 357, 623, 854, 358, 623, 637, + + 855, 856, 637, 347, 857, 347, 860, 355, 867, 860, +- 629, 867, 3496, 629, 347, 357, 347, 863, 358, 2525, +- 863, 367, 357, 889, 368, 358, 3431, 635, 879, 367, +- 635, 871, 367, 3416, 866, 368, 858, 866, 880, 367, +- 367, 645, 368, 399, 861, 3411, 399, 367, 399, 3410, ++ 629, 867, 3504, 629, 347, 357, 347, 863, 358, 2527, ++ 863, 367, 357, 889, 368, 358, 3439, 635, 879, 367, ++ 635, 871, 367, 3424, 866, 368, 858, 866, 880, 367, ++ 367, 645, 368, 399, 861, 3418, 399, 367, 399, 3417, + 348, 383, 640, 428, 383, 734, 383, 1069, 734, 886, + 872, 348, 890, 902, 640, 359, 412, 868, 1069, 413, + 399, 864, 359, 903, 383, 640, 662, 383, 383, 382, +@@ -2126,21 +2129,21 @@ static const flex_int16_t yy_nxt[14349] = + 392, 921, 922, 924, 874, 925, 887, 888, 916, 873, + 590, 917, 912, 590, 392, 642, 640, 926, 389, 918, + 736, 906, 919, 736, 904, 980, 920, 647, 980, 921, +- 922, 924, 672, 925, 2276, 672, 2277, 412, 642, 640, ++ 922, 924, 672, 925, 2277, 672, 2278, 412, 642, 640, + 413, 983, 882, 875, 983, 926, 911, 878, 388, 911, +- 391, 412, 3404, 391, 413, 392, 383, 388, 653, 391, ++ 391, 412, 3411, 391, 413, 392, 383, 388, 653, 391, + 654, 927, 391, 655, 392, 428, 884, 653, 391, 654, + 928, 391, 655, 392, 929, 884, 892, 392, 654, 744, + + 391, 655, 744, 391, 884, 392, 392, 414, 894, 927, + 895, 1104, 1117, 896, 399, 391, 897, 399, 928, 399, +- 3368, 414, 929, 391, 932, 656, 899, 392, 392, 2525, ++ 3375, 414, 929, 391, 932, 656, 899, 392, 392, 2527, + 660, 403, 391, 404, 656, 391, 900, 392, 933, 658, +- 403, 399, 404, 893, 3309, 405, 934, 936, 658, 937, ++ 403, 399, 404, 893, 3316, 405, 934, 936, 658, 937, + 392, 938, 932, 678, 657, 898, 679, 391, 626, 392, + 899, 422, 392, 657, 1117, 403, 933, 404, 914, 406, + 900, 915, 657, 658, 934, 936, 422, 937, 406, 938, +- 1327, 3301, 3296, 391, 392, 939, 391, 659, 392, 940, ++ 1327, 3308, 3302, 391, 392, 939, 391, 659, 392, 940, + 941, 403, 666, 404, 1572, 666, 405, 392, 399, 658, + + 393, 908, 394, 1510, 908, 392, 392, 901, 423, 393, +@@ -2151,19 +2154,19 @@ static const flex_int16_t yy_nxt[14349] = + 966, 961, 945, 947, 953, 954, 395, 949, 950, 967, + 951, 952, 968, 957, 969, 958, 962, 391, 955, 959, + 956, 964, 948, 960, 963, 970, 972, 978, 966, 961, +- 991, 965, 3270, 991, 971, 949, 950, 967, 951, 952, ++ 991, 965, 3276, 991, 971, 949, 950, 967, 951, 952, + 968, 957, 969, 958, 962, 508, 973, 959, 974, 964, + + 975, 506, 2143, 970, 972, 978, 506, 995, 737, 965, +- 995, 737, 971, 738, 981, 740, 3255, 981, 740, 982, ++ 995, 737, 971, 738, 981, 740, 3261, 981, 740, 982, + 741, 1002, 984, 510, 973, 984, 974, 985, 975, 987, + 747, 1003, 987, 747, 988, 748, 992, 751, 1004, 992, + 751, 993, 752, 996, 512, 1005, 996, 513, 997, 1002, + 1012, 1013, 529, 998, 1014, 530, 266, 1015, 1016, 1003, + 529, 1017, 536, 1018, 1019, 537, 1004, 536, 1020, 1021, +- 536, 2525, 1022, 1005, 529, 2480, 1036, 2481, 1012, 1013, ++ 536, 2527, 1022, 1005, 529, 2482, 1036, 2483, 1012, 1013, + 1037, 1025, 1014, 1038, 536, 1015, 1016, 1023, 1026, 1017, +- 1024, 1018, 1019, 2525, 1000, 1027, 1020, 1021, 1034, 1028, ++ 1024, 1018, 1019, 2527, 1000, 1027, 1020, 1021, 1034, 1028, + + 1022, 1043, 1006, 1029, 1036, 1031, 1039, 1030, 1037, 1025, + 1041, 1038, 1008, 1046, 1047, 1023, 1026, 1035, 1024, 1032, +@@ -2172,7 +2175,7 @@ static const flex_int16_t yy_nxt[14349] = + 1055, 1046, 1047, 1049, 1056, 1035, 1057, 1032, 1048, 1033, + 1040, 1058, 1052, 1042, 1059, 1060, 1044, 1061, 1045, 1063, + 1064, 1065, 1066, 1067, 1068, 1053, 1070, 1071, 1055, 1072, +- 1074, 1075, 1056, 1050, 1057, 1078, 2525, 1079, 835, 1058, ++ 1074, 1075, 1056, 1050, 1057, 1078, 2527, 1079, 835, 1058, + 1080, 835, 1059, 1060, 1081, 1061, 1082, 1063, 1064, 1065, + 1066, 1067, 1068, 1076, 1070, 1071, 1083, 1072, 1074, 1075, + +@@ -2185,33 +2188,33 @@ static const flex_int16_t yy_nxt[14349] = + 347, 357, 347, 373, 358, 867, 1107, 866, 867, 870, + 866, 390, 367, 669, 632, 368, 383, 640, 622, 383, + 367, 383, 874, 1905, 1114, 835, 1108, 675, 835, 640, +- 889, 3205, 868, 383, 640, 1112, 383, 392, 383, 1130, ++ 889, 3211, 868, 383, 640, 1112, 383, 392, 383, 1130, + +- 1111, 3057, 394, 383, 628, 392, 640, 348, 2507, 868, ++ 1111, 3062, 394, 383, 628, 392, 640, 348, 2509, 868, + 872, 359, 431, 634, 399, 418, 391, 1129, 1127, 391, + 383, 392, 369, 1076, 653, 391, 1113, 1130, 391, 655, +- 392, 641, 884, 653, 1076, 654, 1115, 872, 655, 3055, +- 428, 884, 651, 392, 889, 2298, 391, 649, 873, 391, ++ 392, 641, 884, 653, 1076, 654, 1115, 872, 655, 3060, ++ 428, 884, 651, 392, 889, 2299, 391, 649, 873, 391, + 979, 392, 392, 979, 653, 399, 1113, 1460, 891, 655, + 642, 640, 884, 1131, 677, 671, 1205, 914, 1460, 399, + 915, 656, 399, 392, 399, 422, 391, 642, 640, 391, +- 885, 392, 1713, 1116, 894, 886, 895, 3331, 1132, 896, ++ 885, 392, 1713, 1116, 894, 886, 895, 3338, 1132, 896, + 399, 1131, 897, 399, 391, 399, 399, 391, 1133, 392, + + 657, 885, 653, 392, 654, 1134, 1119, 655, 1135, 657, +- 884, 980, 891, 755, 980, 911, 1132, 399, 911, 3194, +- 412, 392, 423, 413, 656, 3185, 1133, 1714, 1136, 1193, +- 657, 888, 1193, 1134, 391, 2810, 1135, 391, 391, 392, +- 2985, 391, 894, 392, 895, 898, 894, 896, 1121, 1118, +- 897, 896, 392, 888, 897, 393, 1136, 394, 2987, 391, ++ 884, 980, 891, 755, 980, 911, 1132, 399, 911, 3200, ++ 412, 392, 423, 413, 656, 3191, 1133, 1714, 1136, 1193, ++ 657, 888, 1193, 1134, 391, 2813, 1135, 391, 391, 392, ++ 2989, 391, 894, 392, 895, 898, 894, 896, 1121, 1118, ++ 897, 896, 392, 888, 897, 393, 1136, 394, 2991, 391, + 392, 392, 391, 392, 392, 392, 393, 1122, 394, 895, + 414, 392, 896, 891, 392, 897, 981, 983, 657, 981, + 983, 982, 1140, 1141, 1143, 392, 391, 1145, 1146, 898, +- 2810, 391, 1137, 898, 391, 908, 392, 1138, 908, 1125, ++ 2813, 391, 1137, 898, 391, 908, 392, 1138, 908, 1125, + +- 392, 404, 395, 393, 405, 394, 3142, 658, 392, 1139, ++ 392, 404, 395, 393, 405, 394, 3147, 658, 392, 1139, + 1140, 1141, 1143, 395, 1123, 1145, 1146, 1147, 391, 1148, +- 1137, 1149, 392, 3101, 2525, 1138, 1144, 1144, 1144, 1144, ++ 1137, 1149, 392, 3106, 2527, 1138, 1144, 1144, 1144, 1144, + 1144, 1144, 1144, 1144, 1144, 1150, 1151, 1139, 1152, 1153, + 1154, 1155, 1156, 1159, 1160, 1147, 665, 1148, 1161, 1149, + 395, 931, 931, 931, 931, 931, 931, 931, 931, 931, +@@ -2221,30 +2224,30 @@ static const flex_int16_t yy_nxt[14349] = + 1164, 1180, 1182, 1165, 1183, 1181, 1185, 1184, 1186, 1187, + + 1188, 1168, 1189, 1190, 1192, 1167, 1169, 1170, 1171, 1172, +- 1173, 1174, 1175, 1176, 1177, 1178, 3063, 1905, 1194, 1180, ++ 1173, 1174, 1175, 1176, 1177, 1178, 3068, 1905, 1194, 1180, + 1182, 1194, 1183, 1181, 1185, 1184, 1186, 1187, 1188, 1207, +- 1189, 1190, 1192, 984, 1195, 3055, 984, 1195, 985, 1196, +- 987, 1197, 2880, 987, 1197, 988, 1198, 991, 3042, 1198, ++ 1189, 1190, 1192, 984, 1195, 3060, 984, 1195, 985, 1196, ++ 987, 1197, 2884, 987, 1197, 988, 1198, 991, 3047, 1198, + 991, 1199, 992, 1201, 1209, 992, 1201, 993, 1202, 995, + 1210, 1202, 995, 1203, 996, 1204, 510, 996, 1204, 997, + 516, 1206, 1211, 1208, 1213, 529, 759, 1215, 1212, 1218, + 1219, 536, 1209, 529, 1214, 1220, 536, 1221, 1210, 536, +- 3002, 1222, 1460, 533, 1223, 1224, 540, 3001, 1225, 1226, ++ 3014, 1222, 1460, 533, 1223, 1224, 540, 3006, 1225, 1226, + + 1211, 1227, 1228, 1460, 1229, 1230, 1235, 1218, 1219, 1231, +- 1232, 1233, 1234, 1220, 1238, 1221, 1239, 3146, 757, 1222, ++ 1232, 1233, 1234, 1220, 1238, 1221, 1239, 3151, 757, 1222, + 761, 769, 1223, 1224, 773, 767, 1225, 1226, 1240, 1227, + 1228, 771, 1229, 1230, 1235, 1241, 1242, 1231, 1232, 1233, + 1234, 1236, 1238, 1243, 1239, 1237, 1244, 1245, 1246, 1247, + 1250, 1253, 1255, 1248, 1251, 1249, 1240, 1256, 1252, 1257, +- 1258, 1259, 1260, 1241, 1242, 1265, 1266, 2810, 1254, 1236, ++ 1258, 1259, 1260, 1241, 1242, 1265, 1266, 2813, 1254, 1236, + 1269, 1243, 1270, 1237, 1244, 1245, 1246, 1247, 1250, 1253, + 1255, 1248, 1251, 1249, 1271, 1256, 1252, 1257, 1258, 1259, + 1260, 1261, 1267, 1265, 1266, 1262, 1254, 1272, 1269, 1273, + +- 1270, 1274, 1263, 1267, 1264, 2992, 1275, 1276, 1277, 1279, +- 1280, 1281, 1271, 1282, 1283, 1284, 1285, 1286, 2987, 1261, +- 1294, 1295, 2950, 1262, 1296, 1272, 1297, 1273, 1298, 1274, ++ 1270, 1274, 1263, 1267, 1264, 3005, 1275, 1276, 1277, 1279, ++ 1280, 1281, 1271, 1282, 1283, 1284, 1285, 1286, 2996, 1261, ++ 1294, 1295, 2991, 1262, 1296, 1272, 1297, 1273, 1298, 1274, + 1263, 1299, 1264, 1268, 1275, 1276, 1277, 1279, 1280, 1281, + 1300, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1294, 1295, + 1289, 1301, 1296, 1302, 1297, 1290, 1298, 1303, 1304, 1299, +@@ -2253,24 +2256,24 @@ static const flex_int16_t yy_nxt[14349] = + 1317, 1302, 1318, 1290, 1319, 1303, 1304, 351, 1305, 1291, + 1306, 1307, 1308, 1292, 1309, 1293, 889, 1310, 1311, 1312, + +- 1313, 1314, 889, 2933, 1315, 1316, 383, 640, 1317, 383, ++ 1313, 1314, 889, 2954, 1315, 1316, 383, 640, 1317, 383, + 1318, 383, 1319, 1322, 1326, 355, 870, 889, 391, 1320, +- 2298, 391, 868, 392, 2875, 428, 653, 391, 654, 1335, +- 391, 1324, 392, 383, 884, 1330, 3602, 654, 3603, 391, ++ 2937, 391, 868, 392, 2299, 428, 653, 391, 654, 1335, ++ 391, 1324, 392, 383, 884, 1330, 3612, 654, 3613, 391, + 655, 1328, 391, 884, 392, 392, 1337, 894, 1331, 1121, + 1334, 1338, 896, 431, 391, 897, 1117, 1335, 662, 1339, +- 2298, 641, 1193, 885, 891, 1193, 392, 399, 1194, 399, ++ 2879, 641, 1193, 885, 891, 1193, 392, 399, 1194, 399, + 891, 1194, 399, 656, 1337, 399, 1340, 399, 1195, 1338, +- 2836, 1195, 893, 1196, 1323, 1327, 1397, 1339, 1119, 1397, +- 1321, 640, 2835, 391, 888, 1332, 391, 906, 392, 399, ++ 2299, 1195, 893, 1196, 1323, 1327, 1397, 1339, 1119, 1397, ++ 1321, 640, 2840, 391, 888, 1332, 391, 906, 392, 399, + + 1341, 894, 1325, 895, 1340, 391, 896, 1342, 391, 897, + 392, 657, 1344, 894, 399, 895, 1345, 399, 896, 399, + 392, 897, 1348, 1343, 1350, 1351, 1352, 898, 1341, 1353, + 660, 1354, 392, 1356, 1357, 1342, 1358, 1360, 1361, 1362, +- 1344, 399, 1363, 2812, 1345, 1364, 1365, 1366, 898, 2774, +- 1348, 1343, 1350, 1351, 1352, 1197, 2361, 1353, 1197, 1354, +- 1333, 1356, 1357, 2359, 1358, 1360, 1361, 1362, 1368, 406, ++ 1344, 399, 1363, 2839, 1345, 1364, 1365, 1366, 898, 2815, ++ 1348, 1343, 1350, 1351, 1352, 1197, 2777, 1353, 1197, 1354, ++ 1333, 1356, 1357, 2362, 1358, 1360, 1361, 1362, 1368, 406, + 1363, 1349, 1369, 1364, 1365, 1366, 1370, 1325, 1144, 1144, + 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1367, 1367, 1367, + 1367, 1367, 1367, 1367, 1367, 1367, 1368, 1371, 399, 1372, +@@ -2278,7 +2281,7 @@ static const flex_int16_t yy_nxt[14349] = + 1369, 1373, 1374, 1377, 1370, 1375, 1376, 1378, 1379, 1380, + 1381, 1382, 1383, 1384, 1385, 1387, 1388, 1389, 1390, 1391, + 1398, 1198, 508, 1398, 1198, 1371, 1199, 1372, 1402, 1373, +- 1374, 1377, 2742, 1375, 1376, 1378, 1379, 1380, 1381, 1382, ++ 1374, 1377, 2360, 1375, 1376, 1378, 1379, 1380, 1381, 1382, + 1383, 1384, 1385, 1387, 1388, 1389, 1390, 1391, 1399, 1201, + 510, 1399, 1201, 1400, 1202, 1401, 1402, 1202, 1401, 1203, + 1204, 1403, 1404, 1204, 1407, 1408, 1409, 1410, 1411, 1412, +@@ -2289,7 +2292,7 @@ static const flex_int16_t yy_nxt[14349] = + 1415, 1416, 1417, 1418, 1419, 1420, 1422, 1423, 1424, 1425, + 1426, 1421, 1427, 1428, 1429, 1430, 1431, 1433, 1434, 1432, + 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1445, +- 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 2740, ++ 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 2745, + 1459, 1461, 1462, 1444, 1463, 1433, 1434, 1465, 1435, 1436, + 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1445, 1446, 1447, + 1448, 1449, 1450, 1451, 1452, 1453, 1454, 1455, 1459, 1461, +@@ -2301,19 +2304,19 @@ static const flex_int16_t yy_nxt[14349] = + 1475, 1457, 1458, 1477, 1478, 1479, 1480, 1482, 1483, 1484, + 1486, 1487, 1481, 1494, 1488, 1489, 1490, 1491, 1492, 1495, + 1496, 1493, 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, +- 1505, 1506, 1507, 1508, 870, 889, 1512, 2683, 662, 1397, +- 1515, 1494, 1397, 1398, 2513, 2511, 1398, 1495, 1496, 3952, ++ 1505, 1506, 1507, 1508, 870, 889, 1512, 2743, 662, 1397, ++ 1515, 1494, 1397, 1398, 2686, 2515, 1398, 1495, 1496, 3965, + 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, + 1507, 1508, 391, 1509, 1512, 391, 1516, 392, 1515, 1517, +- 894, 889, 895, 871, 890, 896, 1518, 3602, 897, 3603, +- 399, 2091, 399, 399, 1519, 399, 2298, 1520, 1576, 392, ++ 894, 889, 895, 871, 890, 896, 1518, 3612, 897, 3613, ++ 399, 2513, 399, 399, 1519, 399, 2091, 1520, 1576, 392, + +- 1513, 1576, 1514, 1521, 1516, 1522, 886, 1517, 1527, 3673, +- 1528, 3674, 872, 891, 1518, 659, 391, 399, 1529, 391, ++ 1513, 1576, 1514, 1521, 1516, 1522, 886, 1517, 1527, 3684, ++ 1528, 3685, 872, 891, 1518, 659, 391, 399, 1529, 391, + 1116, 392, 1519, 1530, 1511, 1520, 895, 898, 1513, 896, + 1514, 1521, 897, 1522, 1524, 1531, 1527, 1524, 1528, 1524, + 1532, 1537, 1533, 391, 1525, 656, 1529, 1524, 1538, 891, +- 2298, 1530, 1539, 1541, 1547, 1548, 1551, 1552, 1553, 1554, ++ 2299, 1530, 1539, 1541, 1547, 1548, 1551, 1552, 1553, 1554, + 1555, 1399, 1401, 1531, 1399, 1401, 1400, 1583, 1532, 1537, + 1583, 1123, 1535, 1556, 888, 1557, 1538, 1558, 1536, 1559, + 1539, 1541, 1547, 1548, 1551, 1552, 1553, 1554, 1555, 1526, +@@ -2327,14 +2330,14 @@ static const flex_int16_t yy_nxt[14349] = + 1585, 1586, 1587, 1588, 1589, 1594, 1590, 1591, 1599, 1592, + 1600, 1593, 1597, 1598, 1601, 1602, 1603, 1604, 1595, 1605, + 1606, 1610, 1611, 1596, 1612, 1613, 1607, 1614, 1608, 1615, +- 1616, 1609, 2490, 1594, 1623, 1624, 1599, 1625, 1600, 1626, ++ 1616, 1609, 2299, 1594, 1623, 1624, 1599, 1625, 1600, 1626, + 1627, 1628, 1601, 1602, 1603, 1604, 1595, 1605, 1606, 1610, + + 1611, 1596, 1612, 1613, 1607, 1614, 1608, 1615, 1616, 1609, + 1617, 1629, 1623, 1624, 1618, 1625, 1630, 1626, 1627, 1628, + 1631, 1619, 1632, 1620, 1621, 1633, 1622, 1634, 1635, 1636, + 1637, 1638, 1639, 1640, 1641, 1642, 1643, 1647, 1617, 1629, +- 1648, 1649, 1618, 1650, 1630, 1651, 2488, 1658, 1631, 1619, ++ 1648, 1649, 1618, 1650, 1630, 1651, 2492, 1658, 1631, 1619, + 1632, 1620, 1621, 1633, 1622, 1634, 1635, 1636, 1637, 1638, + 1639, 1640, 1641, 1642, 1643, 1647, 1659, 1652, 1648, 1649, + 1660, 1650, 1665, 1651, 1653, 1658, 1666, 1663, 1667, 1668, +@@ -2345,15 +2348,15 @@ static const flex_int16_t yy_nxt[14349] = + 1654, 1661, 1671, 1662, 1672, 1655, 1685, 1673, 1674, 1675, + 1676, 1677, 1686, 1680, 1678, 1679, 1687, 1664, 1681, 1682, + 1688, 1683, 1689, 1684, 1690, 1691, 1692, 1693, 1695, 1697, +- 1698, 1699, 889, 1696, 1685, 1701, 1702, 3673, 1703, 3674, ++ 1698, 1699, 889, 1696, 1685, 1701, 1702, 3684, 1703, 3685, + 1686, 1680, 1704, 1694, 1687, 1705, 1681, 1706, 1688, 1707, + 1689, 1757, 1690, 1691, 1692, 1693, 1695, 1697, 1698, 1699, + 1700, 1696, 399, 1701, 1702, 399, 1703, 399, 1117, 1708, +- 1704, 1694, 2076, 1705, 1709, 1706, 1710, 1707, 1119, 399, ++ 1704, 1694, 2490, 1705, 1709, 1706, 1710, 1707, 1119, 399, + 1524, 1524, 1716, 1524, 1524, 1524, 1524, 1719, 1720, 399, + + 1711, 1711, 1721, 1524, 1524, 1576, 1395, 1708, 1576, 885, +- 891, 2680, 1709, 1726, 1710, 1723, 1727, 1332, 2677, 1724, ++ 891, 2076, 1709, 1726, 1710, 1723, 1727, 1332, 2683, 1724, + 1716, 1725, 1728, 1729, 1730, 1719, 1720, 898, 1732, 1733, + 1721, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, + 1736, 1726, 1737, 1723, 1727, 1712, 1526, 1724, 1738, 1725, +@@ -2379,8 +2382,8 @@ static const flex_int16_t yy_nxt[14349] = + 1814, 1824, 1825, 1826, 1815, 1818, 1819, 1827, 1820, 1821, + 1822, 1828, 1823, 1829, 1830, 1832, 1833, 1834, 1835, 1836, + 1817, 1837, 1838, 1848, 1850, 1851, 1852, 1853, 1854, 1824, +- 1825, 1826, 1855, 1839, 1848, 1827, 1856, 1857, 3738, 1828, +- 3739, 1829, 1830, 1832, 1833, 1834, 1835, 1836, 2656, 1837, ++ 1825, 1826, 1855, 1839, 1848, 1827, 1856, 1857, 3750, 1828, ++ 3751, 1829, 1830, 1832, 1833, 1834, 1835, 1836, 2680, 1837, + 1838, 1858, 1850, 1851, 1852, 1853, 1854, 1859, 1860, 1861, + 1855, 1839, 1840, 1841, 1856, 1857, 1842, 1862, 1843, 1863, + 1864, 1865, 1844, 1845, 1866, 1867, 1846, 1868, 1869, 1858, +@@ -2390,15 +2393,15 @@ static const flex_int16_t yy_nxt[14349] = + 1844, 1845, 1866, 1867, 1846, 1868, 1869, 1882, 1870, 1847, + 1871, 1872, 1873, 1877, 1883, 1879, 1874, 1875, 1880, 1884, + 1876, 1881, 1885, 1117, 1887, 1888, 1878, 1889, 1890, 1891, +- 1894, 1892, 1895, 1898, 1900, 1882, 3738, 1903, 3739, 1904, +- 1906, 1877, 1883, 1879, 1893, 2985, 1880, 1884, 1907, 1908, ++ 1894, 1892, 1895, 1898, 1900, 1882, 3750, 1903, 3751, 1904, ++ 1906, 1877, 1883, 1879, 1893, 2989, 1880, 1884, 1907, 1908, + 1885, 1909, 1887, 1888, 1878, 1889, 1890, 1891, 1894, 1892, +- 1895, 1524, 1900, 2646, 1524, 1903, 1524, 1904, 1906, 1913, +- 1918, 1896, 1893, 1905, 1524, 2636, 1907, 1908, 1899, 1909, ++ 1895, 1524, 1900, 2659, 1524, 1903, 1524, 1904, 1906, 1913, ++ 1918, 1896, 1893, 1905, 1524, 2648, 1907, 1908, 1899, 1909, + + 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1910, +- 888, 1911, 1914, 2634, 2618, 2986, 3952, 1913, 1918, 3952, +- 2603, 3952, 1919, 1920, 1915, 1921, 1922, 1923, 1924, 1916, ++ 888, 1911, 1914, 2638, 2636, 2990, 3965, 1913, 1918, 3965, ++ 2620, 3965, 1919, 1920, 1915, 1921, 1922, 1923, 1924, 1916, + 1925, 1926, 1927, 1928, 1929, 1930, 1526, 1910, 1572, 1911, + 1914, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, + 1919, 1920, 1915, 1921, 1922, 1923, 1924, 1916, 1925, 1926, +@@ -2422,12 +2425,12 @@ static const flex_int16_t yy_nxt[14349] = + 2000, 1996, 2001, 2003, 2004, 2005, 2014, 2002, 2006, 2007, + 2019, 2010, 2021, 2022, 2011, 2023, 2012, 2024, 2015, 2016, + 2013, 2025, 2026, 2009, 2017, 2027, 2028, 2018, 2029, 2031, +- 2032, 2033, 2034, 2035, 2036, 2037, 2043, 3646, 2019, 2044, ++ 2032, 2033, 2034, 2035, 2036, 2037, 2043, 3656, 2019, 2044, + 2021, 2022, 2030, 2023, 2045, 2024, 2046, 2047, 2048, 2025, +- 2026, 2361, 2050, 2027, 2028, 2051, 2029, 2031, 2032, 2033, ++ 2026, 2605, 2050, 2027, 2028, 2051, 2029, 2031, 2032, 2033, + 2034, 2035, 2036, 2037, 2043, 2038, 2039, 2044, 2052, 2053, + 2030, 2040, 2045, 2054, 2046, 2047, 2048, 2055, 2056, 2041, +- 2050, 2057, 2042, 2051, 2058, 2059, 2060, 3647, 2066, 2075, ++ 2050, 2057, 2042, 2051, 2058, 2059, 2060, 3657, 2066, 2075, + + 2067, 2068, 2069, 2038, 2039, 2070, 2052, 2053, 2061, 2040, + 2062, 2054, 2071, 2072, 2063, 2055, 2056, 2041, 2077, 2057, +@@ -2435,14 +2438,14 @@ static const flex_int16_t yy_nxt[14349] = + 2069, 2081, 2082, 2070, 2083, 2084, 2061, 2061, 2062, 2062, + 2071, 2072, 2063, 2063, 2076, 2079, 2077, 2085, 2086, 2078, + 1713, 1713, 2080, 2064, 2064, 2065, 2073, 2090, 2092, 2081, +- 2082, 2093, 2083, 2084, 2094, 2061, 2095, 2062, 2359, 2098, +- 2096, 2063, 2097, 2079, 2281, 2085, 2086, 2099, 1524, 2100, ++ 2082, 2093, 2083, 2084, 2094, 2061, 2095, 2062, 2362, 2098, ++ 2096, 2063, 2097, 2079, 2282, 2085, 2086, 2099, 1524, 2100, + 2080, 1524, 2064, 1524, 2073, 2101, 2092, 2102, 1711, 2093, + 2103, 1524, 2094, 2104, 2095, 1714, 1899, 2098, 2096, 2115, + +- 2097, 2116, 2091, 2117, 2118, 2099, 2550, 2100, 2119, 2120, +- 2121, 2122, 2123, 2101, 2166, 2102, 2511, 2166, 2103, 2282, +- 2091, 2104, 2124, 2125, 2127, 2297, 2128, 2115, 2298, 2116, ++ 2097, 2116, 2091, 2117, 2118, 2099, 2360, 2100, 2119, 2120, ++ 2121, 2122, 2123, 2101, 2166, 2102, 2552, 2166, 2103, 2283, ++ 2513, 2104, 2124, 2125, 2127, 2298, 2128, 2115, 2299, 2116, + 2126, 2117, 2118, 1712, 2105, 2129, 2119, 2120, 2121, 2122, + 2123, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, + 2124, 2125, 2127, 2107, 2128, 2108, 2109, 2110, 2126, 2130, +@@ -2454,7 +2457,7 @@ static const flex_int16_t yy_nxt[14349] = + 2141, 2149, 2151, 2113, 2134, 2147, 2145, 2148, 2147, 2155, + 2152, 2156, 2157, 2158, 2153, 2159, 2160, 2161, 2162, 2154, + 2163, 2164, 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, +- 2175, 2176, 1947, 2177, 2508, 2180, 2181, 2155, 2182, 2156, ++ 2175, 2176, 1947, 2177, 2091, 2180, 2181, 2155, 2182, 2156, + 2157, 2158, 2183, 2159, 2160, 2161, 2162, 2184, 2163, 2164, + 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, + 1949, 2177, 1981, 2180, 2181, 1981, 2182, 2179, 2185, 2186, +@@ -2464,997 +2467,999 @@ static const flex_int16_t yy_nxt[14349] = + + 2188, 2189, 2190, 2206, 2191, 2192, 2193, 2194, 2211, 2197, + 2198, 2212, 2199, 2213, 2200, 2201, 2202, 2203, 2204, 2205, +- 2214, 2207, 2208, 2209, 2215, 2216, 2210, 2217, 2507, 2166, +- 2488, 2229, 2166, 2230, 2385, 3952, 2211, 2231, 3952, 2212, +- 3952, 2213, 2232, 2233, 2234, 2076, 2235, 2485, 2214, 2236, +- 2237, 2238, 2215, 2216, 2239, 2217, 2218, 2219, 2220, 2229, +- 2221, 2230, 2222, 2223, 2240, 2231, 2224, 2225, 2226, 2241, +- 2232, 2233, 2234, 2227, 2235, 2228, 2242, 2236, 2237, 2238, ++ 2214, 2207, 2208, 2209, 2215, 2216, 2210, 2217, 2510, 2166, ++ 2509, 2230, 2166, 2231, 2386, 3965, 2211, 2232, 3965, 2212, ++ 3965, 2213, 3965, 2233, 2234, 3965, 2235, 3965, 2214, 2236, ++ 2237, 2238, 2215, 2216, 2239, 2217, 2218, 2219, 2220, 2230, ++ 2221, 2231, 2222, 2223, 2240, 2232, 2224, 2225, 2226, 2241, ++ 2227, 2233, 2234, 2228, 2235, 2229, 2242, 2236, 2237, 2238, + 2243, 2244, 2239, 2245, 2218, 2219, 2220, 2246, 2221, 2247, +- 2222, 2223, 2240, 2248, 2224, 2225, 2226, 2241, 2249, 2250, +- +- 2251, 2227, 2252, 2228, 2242, 2253, 2254, 2256, 2243, 2244, +- 2257, 2245, 2258, 2259, 2262, 2246, 2263, 2247, 2264, 2265, +- 2266, 2248, 2267, 2268, 2269, 2272, 2249, 2250, 2251, 2270, +- 2252, 2271, 2273, 2253, 2254, 2256, 2278, 2279, 2257, 2280, +- 2258, 2259, 2262, 2284, 2263, 2281, 2264, 2265, 2266, 2286, +- 2267, 2268, 2269, 2272, 2287, 2288, 2289, 2270, 2290, 2271, +- 2273, 2291, 2299, 2292, 2278, 2279, 2293, 2280, 2294, 2295, +- 2302, 2299, 2304, 2305, 2306, 2307, 2308, 2286, 2309, 2470, +- 2310, 2311, 2287, 2288, 2289, 2312, 2290, 2427, 2285, 2291, +- 2076, 2292, 2313, 2314, 2293, 2315, 2294, 2295, 2427, 2428, +- +- 2304, 2305, 2306, 2307, 2308, 2324, 2309, 2300, 2310, 2311, +- 2428, 2461, 2361, 2312, 2325, 2303, 2091, 2326, 2359, 2329, +- 2313, 2314, 2330, 2315, 2316, 2316, 2316, 2316, 2316, 2316, +- 2316, 2316, 2316, 2324, 2331, 2333, 2317, 2334, 2318, 2319, +- 2320, 2327, 2325, 2335, 2321, 2326, 2328, 2329, 2336, 2322, +- 2330, 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2323, 2261, +- 2145, 2146, 2331, 2333, 2317, 2334, 2318, 2319, 2320, 2327, +- 2344, 2335, 2321, 2345, 2328, 2346, 2336, 2322, 2347, 2337, +- 2338, 2339, 2340, 2341, 2342, 2343, 2323, 2106, 2106, 2106, +- 2106, 2106, 2106, 2106, 2106, 2106, 2348, 2349, 2344, 2350, +- +- 2351, 2345, 2352, 2346, 2353, 2354, 2347, 2355, 2356, 2357, +- 2144, 2145, 2146, 2144, 1947, 2147, 2145, 2148, 2147, 2145, +- 2148, 2362, 2363, 2364, 2348, 2349, 2365, 2350, 2351, 2366, +- 2352, 2375, 2353, 2354, 2376, 2355, 2356, 2357, 2377, 2378, +- 2379, 2380, 2387, 2381, 2382, 2387, 2260, 2383, 2384, 2362, +- 2363, 2364, 2389, 2390, 2365, 2391, 2392, 2366, 2393, 2375, +- 2394, 2395, 2376, 2396, 2397, 1947, 2377, 2378, 2379, 2380, +- 1949, 2381, 2382, 1949, 2367, 2383, 2384, 2367, 2255, 2398, +- 2389, 2390, 2388, 2391, 2392, 2400, 2393, 2401, 2394, 2395, +- 2165, 2396, 2397, 2368, 2150, 2402, 2403, 2404, 2405, 2406, +- +- 2407, 2408, 2409, 2411, 2412, 2413, 2369, 2398, 2370, 2414, +- 2388, 3952, 2416, 2400, 3952, 2401, 3952, 2417, 2371, 2418, +- 2372, 2373, 2374, 2402, 2403, 2404, 2405, 2406, 2407, 2408, +- 2409, 2411, 2412, 2413, 2369, 2419, 2370, 2414, 2420, 2421, +- 2416, 2422, 2421, 2423, 2424, 2417, 2371, 2418, 2372, 2373, +- 2374, 2425, 2426, 2429, 2430, 2431, 2432, 2433, 2434, 2436, +- 2437, 2438, 2439, 2419, 2440, 2441, 2420, 2435, 2442, 2422, +- 2443, 2423, 2424, 2444, 2445, 2448, 2446, 2449, 2450, 2425, +- 2426, 2429, 2430, 2431, 2432, 2433, 2434, 2436, 2437, 2438, +- 2439, 2447, 2440, 2441, 2451, 2452, 2442, 2453, 2443, 2454, +- +- 2455, 2444, 2445, 2448, 2446, 2449, 2450, 2456, 2457, 2458, +- 2459, 2460, 2462, 2463, 2464, 2465, 2466, 2467, 2468, 2447, +- 2469, 2471, 2451, 2452, 2472, 2453, 2473, 2454, 2455, 2474, +- 2475, 2476, 2477, 2478, 2479, 2456, 2457, 2458, 2459, 2460, +- 2462, 2463, 2464, 2465, 2466, 2467, 2468, 2482, 2469, 2471, +- 2483, 2484, 2472, 2486, 2473, 2489, 2491, 2474, 2475, 2476, +- 2477, 2478, 2479, 2492, 2493, 2494, 2495, 2496, 2497, 2498, +- 2509, 2499, 2512, 2514, 2515, 2482, 1949, 2502, 2483, 2484, +- 2502, 2516, 2502, 2517, 2491, 2518, 2519, 2503, 2520, 1947, +- 2504, 2492, 2493, 2494, 2495, 2496, 2497, 2498, 2487, 2499, +- +- 2490, 2514, 2515, 2521, 2505, 2522, 2523, 2524, 2526, 2516, +- 2527, 2517, 2525, 2518, 2519, 2510, 2520, 2513, 2528, 2316, +- 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2531, 2532, +- 2533, 2521, 2506, 2522, 2523, 2524, 2526, 2529, 2527, 2534, +- 2535, 2536, 2530, 2537, 2538, 2539, 2528, 2540, 2541, 2542, +- 2543, 2544, 2545, 2546, 2547, 2548, 2531, 2532, 2533, 2549, +- 2551, 2552, 2553, 2554, 2555, 2529, 2556, 2534, 2535, 2536, +- 2530, 2537, 2538, 2539, 2557, 2540, 2541, 2542, 2543, 2544, +- 2545, 2546, 2547, 2548, 2558, 2559, 2565, 2549, 2551, 2552, +- 2553, 2554, 2555, 2566, 2556, 2561, 2562, 2567, 2561, 2569, +- +- 2564, 2562, 2557, 2564, 2568, 2367, 2572, 2573, 2367, 2572, +- 2570, 2574, 2558, 2559, 2565, 2576, 2577, 2575, 2578, 2579, +- 2580, 2566, 2114, 2581, 2582, 2567, 2581, 2569, 2583, 2584, +- 2585, 2586, 2568, 2587, 2588, 2573, 2589, 3952, 2088, 2574, +- 3952, 2593, 3952, 2576, 2577, 2575, 2578, 2579, 2580, 2594, +- 2359, 2595, 2582, 2596, 2597, 2361, 2583, 2584, 2585, 2586, +- 2598, 2587, 2588, 2387, 2589, 2358, 2387, 2599, 2591, 2593, +- 2360, 2600, 2601, 2602, 2604, 2601, 2605, 2594, 2606, 2595, +- 2607, 2596, 2597, 2608, 2609, 2610, 2611, 2612, 2598, 2613, +- 2614, 2615, 2616, 2617, 2619, 2599, 2620, 2621, 2622, 2600, +- +- 2621, 2602, 2604, 2623, 2605, 2627, 2606, 2628, 2607, 2629, +- 2630, 2608, 2609, 2610, 2611, 2612, 2631, 2613, 2614, 2615, +- 2616, 2617, 2619, 2632, 2620, 2625, 2622, 2633, 2625, 2635, +- 2626, 2623, 2637, 2627, 2639, 2628, 2640, 2629, 2630, 2641, +- 2642, 2643, 2644, 2637, 2631, 2087, 2645, 2647, 2648, 2649, +- 2650, 2632, 2651, 2652, 2653, 2633, 2654, 2635, 2655, 2657, +- 2658, 2659, 2639, 2660, 2640, 2661, 2662, 2641, 2642, 2643, +- 2644, 2663, 2664, 2638, 2645, 2647, 2648, 2649, 2650, 2665, +- 2651, 2652, 2653, 2666, 2654, 2667, 2655, 2657, 2658, 2659, +- 2668, 2660, 2669, 2661, 2662, 2670, 2671, 2672, 2673, 2663, +- +- 2664, 2674, 2675, 2676, 2678, 2679, 2681, 2665, 2281, 2486, +- 2683, 2666, 2684, 2667, 2685, 2686, 2687, 2688, 2668, 2689, +- 2669, 2690, 2695, 2670, 2671, 2672, 2673, 2298, 1899, 2674, +- 2675, 2676, 2678, 2679, 2572, 2707, 2709, 2572, 2683, 2696, +- 2684, 2500, 2685, 2686, 2687, 2688, 2299, 2689, 2509, 2690, +- 2049, 2490, 2502, 2682, 2490, 2502, 2502, 2502, 2710, 2502, +- 2711, 2502, 2692, 2020, 2709, 2504, 2699, 2697, 2502, 2698, +- 2712, 2502, 2502, 2502, 1905, 2502, 2713, 2502, 2703, 2693, +- 2513, 2504, 2692, 2700, 2714, 2504, 2710, 2715, 2711, 2716, +- 2717, 2708, 2718, 2513, 2719, 2704, 2720, 2721, 2712, 2693, +- +- 2722, 2723, 1905, 2724, 2713, 2725, 2726, 2694, 2727, 2728, +- 2729, 2701, 2714, 2730, 2731, 2715, 2732, 2716, 2717, 2733, +- 2718, 2734, 2719, 2705, 2720, 2721, 2735, 2506, 2722, 2723, +- 2736, 2724, 2737, 2725, 2726, 2738, 2727, 2728, 2729, 2739, +- 2741, 2730, 2731, 2743, 2732, 2744, 2745, 2733, 2746, 2734, +- 2747, 2748, 2749, 2750, 2735, 2751, 2561, 2562, 2736, 2561, +- 2737, 2564, 2562, 2738, 2564, 2752, 2753, 2739, 2741, 2754, +- 2757, 2743, 2758, 2744, 2745, 2759, 2746, 2760, 2747, 2748, +- 2749, 2750, 2761, 2751, 2762, 2763, 2764, 2581, 1949, 2767, +- 2581, 2768, 2765, 2752, 2753, 2769, 2770, 2754, 2757, 2771, +- +- 2758, 2772, 2773, 2759, 2776, 2760, 2777, 2778, 2779, 2780, +- 2761, 2359, 2762, 2763, 2764, 2781, 2361, 2767, 2782, 2768, +- 2783, 2786, 2785, 2769, 2770, 2785, 2358, 2771, 2787, 2772, +- 2773, 2360, 2776, 2788, 2777, 2778, 2779, 2780, 2789, 2790, +- 2791, 2792, 2793, 2781, 2794, 2795, 2782, 2794, 2783, 2786, +- 2797, 2798, 2799, 2800, 2801, 2802, 2787, 2621, 2805, 2806, +- 2621, 2788, 2803, 2807, 2796, 2811, 2789, 2790, 2791, 2792, +- 2793, 2625, 2813, 2795, 2625, 2814, 2626, 2815, 2797, 2798, +- 2799, 2800, 2801, 2802, 2816, 2817, 2805, 2806, 2818, 2819, +- 2820, 2807, 2796, 2811, 2821, 2822, 2823, 2824, 2825, 2826, +- +- 2813, 2827, 2828, 2814, 2829, 2815, 2830, 2831, 2832, 2833, +- 2834, 2837, 2816, 2817, 2838, 2839, 2818, 2819, 2820, 2840, +- 2841, 2842, 2821, 2822, 2823, 2824, 2825, 2826, 2843, 2827, +- 2828, 2844, 2829, 2845, 2830, 2831, 2832, 2833, 2834, 2837, +- 2846, 2847, 2838, 2839, 2848, 2849, 2850, 2840, 2841, 2842, +- 2851, 2852, 2853, 2854, 2855, 2856, 2843, 2857, 2858, 2844, +- 2859, 2845, 2860, 2486, 2861, 2862, 2863, 2864, 2846, 2847, +- 2865, 2866, 2848, 2849, 2850, 2867, 2509, 2298, 2851, 2852, +- 2853, 2854, 2855, 2856, 2954, 2857, 2858, 2954, 2859, 2507, +- 2860, 2500, 1947, 2862, 2863, 2864, 2876, 2869, 2865, 2866, +- +- 2869, 2502, 2869, 2867, 2502, 2879, 2502, 2870, 2487, 2076, +- 2871, 2874, 2506, 2877, 2504, 2298, 2892, 2881, 2891, 2698, +- 2869, 2510, 2696, 2869, 2872, 2869, 2893, 2990, 2693, 2500, +- 2883, 1945, 2502, 2871, 2894, 2502, 2955, 2502, 2990, 2955, +- 2785, 2878, 2886, 2785, 2892, 2895, 2890, 2884, 2896, 2298, +- 2880, 2897, 2873, 2898, 2893, 2502, 2506, 2899, 2502, 2700, +- 2502, 2869, 2894, 2091, 2869, 2703, 2869, 2502, 2504, 2900, +- 2502, 2870, 2502, 2895, 2871, 2885, 2896, 2889, 2901, 2897, +- 2504, 2898, 2704, 2902, 2903, 2899, 2904, 2887, 2872, 2905, +- 2906, 2907, 2908, 2909, 2704, 2910, 2911, 2900, 2912, 2913, +- +- 2914, 2915, 2916, 2917, 2918, 2919, 2901, 2920, 2921, 2922, +- 2705, 2902, 2903, 2923, 2904, 2924, 2873, 2905, 2906, 2907, +- 2908, 2909, 2890, 2910, 2911, 2925, 2912, 2913, 2914, 2915, +- 2916, 2917, 2918, 2919, 2926, 2920, 2921, 2922, 2927, 2928, +- 2929, 2923, 2930, 2924, 2931, 2932, 2934, 2935, 2936, 2937, +- 2938, 2939, 2940, 2925, 2941, 2943, 2944, 2945, 2946, 2947, +- 2948, 2949, 2926, 2951, 2952, 2953, 2927, 2928, 2929, 2956, +- 2930, 2957, 2931, 2932, 2934, 2935, 2936, 2937, 2938, 2939, +- 2940, 2958, 2941, 2943, 2944, 2945, 2946, 2947, 2948, 2949, +- 2959, 2951, 2952, 2953, 2960, 2962, 2967, 2956, 2968, 2957, +- +- 2969, 2970, 2794, 2963, 2964, 2794, 2965, 2971, 2966, 2958, +- 2973, 2974, 2975, 2976, 2977, 2978, 2979, 2980, 2959, 2982, +- 2983, 2984, 2988, 2962, 2967, 2961, 2968, 2989, 2969, 2970, +- 2991, 2963, 2964, 2994, 2965, 2993, 2966, 2995, 2973, 2974, +- 2975, 2976, 2977, 2978, 2979, 2980, 2993, 2982, 2983, 2984, +- 2988, 2996, 2997, 2961, 2998, 2989, 2999, 3000, 2991, 3003, +- 3005, 2994, 3006, 3007, 3008, 2995, 3009, 3010, 3011, 3012, +- 3013, 3014, 3015, 3004, 3016, 3017, 3018, 3009, 3019, 2996, +- 2997, 3020, 2998, 3021, 2999, 3000, 3022, 3003, 3005, 3023, +- 3006, 3007, 3008, 3024, 3025, 3010, 3011, 3012, 3013, 3014, +- +- 3015, 3026, 3016, 3017, 3018, 3027, 3019, 3028, 3029, 3020, +- 3030, 3021, 3031, 3032, 3022, 3033, 3034, 3023, 3035, 3036, +- 3037, 3024, 3025, 2486, 3038, 3039, 3040, 3041, 3047, 3026, +- 1917, 3043, 1912, 3027, 1902, 3028, 3029, 3064, 3030, 3107, +- 3031, 3032, 3107, 3033, 3034, 2877, 3035, 3036, 3037, 3044, +- 3065, 1526, 3038, 3039, 3040, 3041, 2509, 2869, 3047, 3043, +- 2869, 2869, 2869, 3066, 2869, 3064, 2869, 3045, 2285, 2869, +- 2871, 3050, 2869, 3048, 2869, 2877, 1897, 3044, 3065, 3045, +- 2869, 3056, 2871, 2869, 2872, 2869, 3067, 2695, 3051, 2695, +- 3053, 3066, 2502, 2871, 3068, 2502, 2872, 2502, 2877, 3069, +- +- 3149, 2303, 2692, 3048, 2696, 2504, 2696, 2872, 3070, 1715, +- 2869, 3149, 3046, 2869, 3067, 2869, 3052, 1886, 3071, 2693, +- 3058, 1849, 3068, 2871, 3046, 1831, 3057, 3069, 2869, 3072, +- 1759, 2869, 2697, 2869, 2880, 3054, 3070, 2884, 3058, 2869, +- 2502, 2871, 2869, 2502, 2869, 2502, 3071, 2694, 2502, 3061, +- 2699, 2502, 2871, 2502, 3073, 2884, 1395, 3072, 2699, 2502, +- 3074, 3075, 2502, 3076, 2502, 3059, 2884, 2700, 3077, 2703, +- 1574, 2502, 2504, 3078, 2502, 2700, 2502, 3079, 3080, 3081, +- 3082, 2703, 3073, 3059, 2504, 3083, 2704, 3084, 3074, 3075, +- 3085, 3076, 3086, 3087, 3062, 2701, 3077, 3088, 2704, 3089, +- +- 3090, 3078, 3091, 2887, 3092, 3079, 3080, 3081, 3082, 3093, +- 3094, 3095, 3096, 3083, 2705, 3084, 3097, 3098, 3085, 3099, +- 3086, 3087, 3100, 3102, 3103, 3088, 2890, 3089, 3090, 3104, +- 3091, 3105, 3092, 3106, 3108, 3109, 3110, 3093, 3094, 3095, +- 3096, 3111, 3116, 3113, 3097, 3098, 3113, 3099, 3117, 3119, +- 3100, 3102, 3103, 2955, 3120, 3121, 2955, 3104, 3114, 3105, +- 3122, 3106, 3108, 3109, 3110, 3123, 3124, 3125, 3128, 3111, +- 3116, 3129, 3134, 3135, 3129, 3136, 3117, 3119, 3126, 3127, +- 3130, 3138, 3120, 3121, 3131, 3139, 3137, 3952, 3122, 3137, +- 3952, 3132, 3952, 3123, 3124, 3125, 3128, 3140, 3141, 3143, +- +- 3134, 3135, 3144, 3136, 3145, 3147, 3126, 3127, 3130, 3138, +- 3148, 3150, 3131, 3139, 3151, 3152, 3153, 3154, 3155, 3132, +- 3156, 3157, 3158, 3159, 3160, 3140, 3141, 3143, 3161, 3162, +- 3144, 3163, 3145, 3147, 3164, 3165, 3166, 3167, 3148, 3150, +- 3168, 3169, 3151, 3152, 3153, 3154, 3155, 3170, 3156, 3157, +- 3158, 3159, 3160, 3171, 3172, 3173, 3161, 3162, 3174, 3163, +- 3175, 3177, 3164, 3165, 3166, 3167, 3178, 3180, 3168, 3169, +- 3181, 3175, 3182, 1735, 3183, 3170, 3184, 3178, 3186, 1731, +- 3187, 3171, 3172, 3173, 3188, 3189, 3174, 3190, 3191, 3177, +- 3192, 3193, 3195, 3196, 3197, 3180, 3199, 3200, 3181, 1718, +- +- 3182, 3176, 3183, 2507, 3184, 1717, 3186, 3179, 3187, 3198, +- 3202, 3054, 3188, 3189, 2298, 3190, 3191, 1715, 3192, 3193, +- 3195, 3196, 3197, 2869, 3199, 3200, 2869, 2877, 2869, 2869, +- 2695, 3203, 2869, 3201, 2869, 2869, 2871, 3198, 2869, 3058, +- 2869, 2502, 2871, 3213, 2502, 3204, 2502, 2696, 3399, 3047, +- 2872, 2703, 3214, 1657, 2504, 3057, 2884, 3215, 3062, 3399, +- 2869, 2298, 3051, 2869, 2869, 2869, 2877, 2869, 2704, 2869, +- 3045, 3213, 1656, 2871, 3208, 3207, 2502, 2871, 3054, 2502, +- 3214, 2502, 3216, 3217, 3059, 3215, 3210, 2872, 3218, 2504, +- 3205, 2884, 3219, 3220, 3057, 2869, 3206, 3221, 2869, 3222, +- +- 2869, 3223, 3224, 3211, 3225, 3058, 3226, 3227, 2871, 3228, +- 3216, 3217, 3229, 3230, 3231, 3054, 3218, 3232, 3233, 3062, +- 3219, 3220, 2884, 3234, 3235, 3221, 3236, 3222, 3237, 3223, +- 3224, 3212, 3225, 3238, 3226, 3227, 3239, 3228, 3240, 3239, +- 3229, 3230, 3231, 3241, 3242, 3232, 3233, 3243, 3244, 3245, +- 3062, 3234, 3235, 3246, 3236, 3247, 3237, 3250, 3495, 3113, +- 3250, 3238, 3113, 3714, 1646, 3249, 3240, 3107, 3251, 3495, +- 3107, 3241, 3242, 3253, 3254, 3243, 3244, 3245, 3256, 3257, +- 3258, 3246, 3259, 3247, 3248, 3248, 3248, 3248, 3248, 3248, +- 3248, 3248, 3248, 3249, 3952, 3260, 3251, 3952, 3261, 3952, +- +- 3262, 3253, 3254, 3263, 3264, 3265, 3256, 3257, 3258, 3275, +- 3259, 3352, 3275, 3715, 3352, 3267, 3268, 3129, 3269, 3271, +- 3129, 3272, 3273, 3260, 3276, 3277, 3261, 3278, 3262, 3279, +- 3280, 3263, 3264, 3265, 3266, 3266, 3266, 3266, 3266, 3266, +- 3266, 3266, 3266, 3267, 3268, 3281, 3269, 3271, 3282, 3272, +- 3273, 3283, 3276, 3277, 3284, 3278, 3285, 3279, 3280, 3286, +- 3287, 3288, 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3297, +- 3298, 3299, 3300, 3281, 3302, 3303, 3282, 3304, 3305, 3283, +- 3306, 3307, 3284, 3308, 3285, 3312, 3313, 3286, 3287, 3288, +- 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3297, 3298, 3299, +- +- 3300, 3310, 3302, 3303, 3314, 3304, 3305, 3315, 3306, 3307, +- 3316, 3308, 3310, 3312, 3313, 3317, 3318, 3319, 3320, 3321, +- 3322, 3323, 3324, 3325, 3327, 3383, 2869, 3334, 3383, 2869, +- 3335, 2869, 3314, 1645, 3326, 3315, 3045, 3047, 3316, 2871, +- 3329, 1644, 3311, 3317, 3318, 3319, 3320, 3321, 3322, 3323, +- 3324, 3325, 3327, 2872, 2877, 3334, 2869, 2696, 3335, 2869, +- 2869, 2869, 3326, 2869, 2502, 2869, 3050, 2502, 3336, 2502, +- 3050, 1580, 3275, 3337, 3328, 3275, 3338, 2504, 3339, 3340, +- 3341, 3046, 3048, 3051, 3342, 2880, 3343, 3051, 1579, 2869, +- 2502, 2704, 2869, 2502, 2869, 2502, 3336, 1574, 1550, 3058, +- +- 3210, 3337, 2871, 2504, 3338, 1549, 3339, 3340, 3341, 3344, +- 3345, 3052, 3342, 3346, 3343, 3205, 2884, 3211, 3347, 2890, +- 2869, 2502, 3348, 2869, 2502, 2869, 2502, 3349, 3350, 3351, +- 2883, 3332, 3353, 2871, 2504, 3354, 3357, 3344, 3345, 3358, +- 3359, 3346, 3360, 3361, 3059, 3330, 3347, 2884, 3211, 3239, +- 3348, 3362, 3239, 3363, 3355, 3349, 3350, 3351, 3364, 3392, +- 3353, 3500, 3392, 3354, 3357, 1546, 1545, 3358, 3359, 3365, +- 3360, 3361, 3500, 1544, 3370, 2885, 3333, 3370, 1543, 3362, +- 3367, 3363, 3250, 3369, 3373, 3250, 3364, 3248, 3248, 3248, +- 3248, 3248, 3248, 3248, 3248, 3248, 3374, 3365, 3375, 3366, +- +- 3366, 3366, 3366, 3366, 3366, 3366, 3366, 3366, 3367, 3376, +- 3377, 3369, 3373, 3378, 3379, 3380, 3381, 3382, 3384, 3385, +- 3371, 3386, 3387, 3388, 3374, 3389, 3375, 3266, 3266, 3266, +- 3266, 3266, 3266, 3266, 3266, 3266, 3390, 3376, 3377, 3391, +- 3393, 3378, 3379, 3380, 3381, 3382, 3384, 3385, 3371, 3386, +- 3387, 3388, 3394, 3389, 3395, 3394, 3396, 3397, 3398, 3400, +- 3401, 3402, 3403, 3405, 3390, 3406, 3407, 3391, 3393, 3408, +- 3409, 3412, 3413, 3414, 3415, 3417, 3418, 3419, 3714, 3422, +- 3423, 3424, 3395, 3425, 3396, 3397, 3398, 3400, 3401, 3402, +- 3403, 3405, 3426, 3406, 3407, 3427, 3428, 3408, 3409, 3412, +- +- 3413, 3414, 3415, 3417, 3418, 3419, 3420, 3422, 3423, 3424, +- 3429, 3425, 3430, 3432, 3421, 3433, 3434, 3435, 3436, 3437, +- 3426, 1542, 2869, 3427, 3428, 2869, 3333, 2869, 3647, 2298, +- 3439, 3047, 3045, 3453, 3420, 2871, 3453, 1540, 3429, 3440, +- 3430, 3432, 3421, 3433, 3434, 3435, 3436, 3437, 2877, 2872, +- 1117, 2502, 2869, 3441, 2502, 2869, 2502, 2869, 3439, 3442, +- 3443, 3438, 3058, 3444, 2504, 2871, 3445, 3440, 3446, 874, +- 2502, 3447, 3448, 2502, 3449, 2502, 2878, 2873, 3211, 2884, +- 3210, 3441, 3450, 2504, 3451, 3454, 3456, 3442, 3443, 3479, +- 3480, 3444, 3479, 3480, 3445, 1485, 3446, 3211, 3352, 3447, +- +- 3448, 3352, 3449, 1476, 1474, 3481, 3333, 2885, 3481, 1469, +- 3450, 3766, 3451, 3454, 3456, 3452, 3452, 3452, 3452, 3452, +- 3452, 3452, 3452, 3452, 3457, 3333, 3455, 3455, 3455, 3455, +- 3455, 3455, 3455, 3455, 3455, 3455, 3455, 3356, 3356, 3356, +- 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3458, 3459, +- 3460, 3455, 3457, 3461, 3462, 3463, 3464, 3465, 3466, 3468, +- 3469, 3647, 3356, 3366, 3366, 3366, 3366, 3366, 3366, 3366, +- 3366, 3366, 3370, 3470, 3471, 3370, 3458, 3459, 3460, 3472, +- 3473, 3461, 3462, 3463, 3464, 3465, 3466, 3468, 3469, 3467, +- 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3474, 3475, +- +- 3476, 3470, 3471, 3477, 3482, 3483, 3484, 3472, 3473, 3484, +- 3485, 3486, 3487, 3489, 3490, 3492, 3489, 3490, 3493, 3494, +- 3497, 3498, 3499, 1464, 1406, 1405, 3474, 3475, 3476, 540, +- 3733, 3477, 3482, 3483, 3394, 3501, 3502, 3394, 3485, 3486, +- 3487, 3733, 3506, 3492, 3507, 3508, 3493, 3494, 3497, 3498, +- 3499, 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3491, +- 3503, 3509, 3510, 3501, 3502, 3511, 3512, 3513, 3504, 3505, +- 3506, 3514, 3507, 3508, 3515, 3516, 3517, 3518, 3519, 3520, +- 3521, 3522, 3523, 3524, 3525, 3526, 3525, 3527, 3503, 3509, +- 3510, 3528, 3530, 3511, 3512, 3513, 3504, 3505, 3531, 3514, +- +- 538, 3532, 3515, 3516, 3517, 3518, 3519, 3520, 3521, 3522, +- 3523, 3524, 3533, 3526, 3534, 3527, 3535, 533, 2502, 3528, +- 3530, 2502, 3536, 2502, 3537, 3538, 3531, 3541, 3210, 3532, +- 3541, 2504, 3479, 3564, 3489, 3479, 3564, 3576, 3565, 3543, +- 3533, 531, 3534, 516, 3535, 3211, 3544, 3545, 3546, 3547, +- 3536, 3548, 3537, 3538, 3549, 514, 3525, 3452, 3452, 3452, +- 3452, 3452, 3452, 3452, 3452, 3452, 3453, 3543, 3542, 3453, +- 510, 3539, 1396, 3330, 3544, 3545, 3546, 3547, 3550, 3548, +- 3551, 3552, 3549, 3540, 3540, 3540, 3540, 3540, 3540, 3540, +- 3540, 3540, 3455, 3455, 3455, 3455, 3455, 3455, 3455, 3455, +- +- 3455, 3455, 3455, 3553, 3554, 3555, 3550, 3556, 3551, 3552, +- 3557, 1392, 3559, 3557, 3560, 3561, 3562, 3455, 3467, 3467, +- 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3569, 3570, 3572, +- 3573, 3553, 3554, 3555, 3574, 3556, 3578, 1386, 3581, 3558, +- 3559, 3734, 3560, 3561, 3562, 3567, 3484, 3952, 3567, 3484, +- 3568, 3571, 3734, 1355, 1347, 3569, 3570, 3572, 3573, 3579, +- 3490, 3582, 3574, 3490, 3578, 3580, 3581, 3558, 3491, 3491, +- 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3577, 3577, 3577, +- 3577, 3577, 3577, 3577, 3577, 3577, 3583, 3579, 3584, 3582, +- 3585, 3586, 3587, 3580, 3588, 3589, 3591, 3593, 3594, 3595, +- +- 3596, 3597, 3598, 3600, 3601, 3604, 3605, 3618, 3624, 3628, +- 3618, 3624, 3628, 1336, 3583, 431, 3584, 418, 3585, 3586, +- 3587, 3607, 3588, 3589, 3591, 3593, 3594, 3595, 3596, 3597, +- 3598, 3600, 3601, 3604, 3605, 3606, 3606, 3606, 3606, 3606, +- 3606, 3606, 3606, 3606, 3606, 3606, 3608, 3609, 3612, 3607, +- 3613, 3614, 3615, 3616, 3617, 3690, 3693, 414, 3690, 3693, +- 3606, 3619, 3619, 3619, 3619, 3619, 3619, 3619, 3619, 3619, +- 3621, 3622, 3623, 3625, 3608, 3609, 3612, 3626, 3613, 3614, +- 3615, 3616, 3617, 3540, 3540, 3540, 3540, 3540, 3540, 3540, +- 3540, 3540, 3541, 3627, 3629, 3541, 3630, 3631, 3621, 3622, +- +- 3623, 3625, 3632, 3633, 3635, 3626, 3636, 3637, 3640, 3620, +- 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 399, 395, +- 3557, 3627, 3629, 3557, 3630, 3631, 3638, 373, 3643, 3638, +- 3632, 3633, 3635, 3644, 3636, 3637, 3640, 3634, 3634, 3634, +- 3634, 3634, 3634, 3634, 3634, 3634, 3564, 3567, 3648, 3564, +- 3567, 3565, 3568, 3649, 3650, 3639, 3643, 3628, 369, 363, +- 3628, 3644, 3697, 3690, 3693, 3652, 3690, 3693, 3747, 3750, +- 3575, 3805, 3806, 359, 3805, 3806, 3648, 3489, 355, 1278, +- 3576, 3649, 3650, 3639, 3651, 3651, 3651, 3651, 3651, 3651, +- 3651, 3651, 3651, 3652, 3651, 3651, 3651, 3651, 3651, 3651, +- +- 3651, 3651, 3651, 3577, 3577, 3577, 3577, 3577, 3577, 3577, +- 3577, 3577, 3653, 3654, 3655, 3657, 3658, 3659, 3660, 3661, +- 3662, 3663, 3664, 3665, 3666, 3667, 3668, 3669, 3670, 3672, +- 3675, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, +- 3653, 3654, 3655, 3657, 3658, 3659, 3660, 3661, 3662, 3663, +- 3664, 3665, 3666, 3667, 3668, 3669, 3670, 3672, 3675, 3606, +- 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, +- 3676, 3677, 3678, 3680, 3681, 3682, 3684, 3952, 3685, 3684, +- 3952, 3686, 3952, 1217, 3606, 3689, 3691, 3838, 3695, 3685, +- 3838, 3698, 3688, 3699, 3700, 3701, 3702, 3703, 3676, 3677, +- +- 3678, 3680, 3681, 3682, 3619, 3619, 3619, 3619, 3619, 3619, +- 3619, 3619, 3619, 3689, 3691, 3624, 3695, 3844, 3624, 3698, +- 3844, 3699, 3700, 3701, 3702, 3703, 3704, 3706, 3707, 3710, +- 3717, 3718, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, +- 3692, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, +- 3638, 3719, 3782, 3638, 3704, 3706, 3707, 3710, 3717, 3718, +- 3687, 3720, 3721, 3782, 1216, 1200, 1191, 3705, 3705, 3705, +- 3705, 3705, 3705, 3705, 3705, 3705, 3711, 3575, 3722, 3719, +- 3712, 3723, 3724, 3725, 3726, 3727, 3728, 3713, 3729, 3720, +- 3721, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, +- +- 3730, 3731, 3732, 3735, 3711, 3736, 3722, 3740, 3712, 3723, +- 3724, 3725, 3726, 3727, 3728, 3713, 3729, 3742, 3743, 3744, +- 3746, 3685, 3749, 3685, 3685, 1179, 3952, 1158, 3730, 3731, +- 3732, 3735, 3753, 3736, 3685, 3740, 3684, 3754, 3685, 3684, +- 3755, 3686, 3756, 3757, 3758, 3742, 3743, 3744, 3746, 3685, +- 3749, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, +- 3753, 3759, 3760, 3761, 3762, 3754, 3763, 3764, 3755, 3765, +- 3756, 3757, 3758, 3705, 3705, 3705, 3705, 3705, 3705, 3705, +- 3705, 3705, 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3759, +- 3760, 3761, 3762, 3774, 3763, 3764, 3775, 3765, 3776, 3777, +- +- 3778, 3779, 3780, 3781, 3783, 3687, 3784, 3785, 3788, 3792, +- 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3795, 3786, 3796, +- 3687, 3774, 3797, 3798, 3775, 3799, 3776, 3777, 3778, 3779, +- 3780, 3781, 3783, 3800, 3784, 3785, 3788, 3952, 3801, 3802, +- 3952, 3803, 3952, 3807, 3803, 3795, 3786, 3796, 3808, 3714, +- 3797, 3798, 3809, 3799, 3810, 3811, 3812, 3813, 3814, 3793, +- 3827, 3800, 3815, 3816, 3817, 3818, 3801, 3802, 3819, 3821, +- 3822, 3807, 3823, 3824, 3825, 3827, 3808, 3830, 3831, 3832, +- 3809, 3833, 3810, 3811, 3812, 3813, 3814, 3834, 3804, 3835, +- 3815, 3816, 3817, 3818, 3836, 3839, 3819, 3821, 3822, 3715, +- +- 3823, 3824, 3825, 3846, 3847, 3830, 3831, 3832, 3805, 3833, +- 3828, 3805, 3848, 3841, 3849, 3834, 3804, 3835, 3850, 3852, +- 3853, 3806, 3836, 3839, 3806, 3793, 3843, 3845, 3854, 3855, +- 3845, 3846, 3847, 3856, 3857, 3860, 3861, 3862, 3863, 3861, +- 3848, 3864, 3849, 3865, 3866, 3867, 3850, 3852, 3853, 3868, +- 3838, 3869, 1142, 3838, 3876, 3952, 3854, 3855, 3952, 3827, +- 3952, 3856, 3857, 3860, 3877, 3952, 3863, 3878, 3952, 3864, +- 3952, 3865, 3866, 3867, 3879, 3844, 3880, 3868, 3844, 3869, +- 3873, 3845, 3876, 3881, 3845, 3882, 3875, 3793, 3883, 3884, +- 3893, 3895, 3877, 3891, 3885, 3878, 3891, 3894, 3892, 3896, +- +- 3894, 3898, 3879, 3897, 3880, 3886, 3897, 3952, 3887, 3828, +- 3952, 3881, 3952, 3882, 3903, 3904, 3883, 3884, 3893, 3895, +- 3952, 3905, 3885, 3952, 3906, 3952, 3907, 3896, 3908, 3898, +- 3909, 3910, 3911, 3886, 3912, 3913, 3887, 3916, 3919, 662, +- 1117, 3891, 3903, 3904, 3891, 3918, 3892, 645, 3918, 3905, +- 3894, 385, 3906, 3894, 3907, 385, 3908, 874, 3909, 3910, +- 3911, 3897, 3912, 3913, 3897, 3916, 3919, 3917, 3917, 3917, +- 3917, 3917, 3917, 3917, 3917, 3917, 3921, 3924, 3920, 3920, +- 3920, 3920, 3920, 3920, 3920, 3920, 3920, 3925, 3926, 3927, +- 3928, 3929, 3930, 3931, 3917, 3917, 3917, 3917, 3917, 3917, +- +- 3917, 3917, 3917, 1073, 3921, 3924, 3918, 3934, 1062, 3918, +- 3934, 1054, 1051, 3935, 3936, 3925, 3926, 3927, 3928, 3929, +- 3930, 3931, 3937, 3933, 3933, 3933, 3933, 3933, 3933, 3933, +- 3933, 3933, 3920, 3920, 3920, 3920, 3920, 3920, 3920, 3920, +- 3920, 3935, 3936, 3938, 3940, 3941, 3943, 3944, 3945, 1009, +- 3937, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, +- 3934, 540, 538, 3934, 1007, 533, 531, 3946, 3947, 3948, +- 3949, 3938, 3940, 3941, 3943, 3944, 3945, 3942, 3942, 3942, +- 3942, 3942, 3942, 3942, 3942, 3942, 3942, 3942, 3942, 3942, +- 3942, 3942, 3942, 3942, 3942, 3946, 3947, 3948, 3949, 3950, +- +- 3951, 1001, 516, 514, 999, 510, 994, 986, 977, 976, +- 946, 935, 923, 913, 431, 910, 418, 414, 662, 883, +- 399, 395, 645, 865, 373, 369, 862, 3950, 3951, 76, +- 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, +- 76, 76, 76, 76, 76, 76, 76, 98, 98, 98, ++ 2222, 2223, 2240, 2248, 2224, 2225, 2226, 2241, 2227, 2249, ++ ++ 2250, 2228, 2251, 2229, 2242, 2252, 2253, 2254, 2243, 2244, ++ 2255, 2245, 2257, 2258, 2259, 2246, 2260, 2247, 2263, 2264, ++ 2265, 2248, 2266, 2267, 2268, 2269, 2270, 2249, 2250, 2271, ++ 2251, 2272, 2273, 2252, 2253, 2254, 2274, 2279, 2255, 2285, ++ 2257, 2258, 2259, 2280, 2260, 2281, 2263, 2264, 2265, 2282, ++ 2266, 2267, 2268, 2269, 2270, 2287, 2300, 2271, 2288, 2272, ++ 2273, 2289, 2290, 2291, 2274, 2279, 2303, 2292, 2293, 2294, ++ 2295, 2280, 2296, 2281, 2300, 2305, 2306, 2307, 2308, 2309, ++ 2310, 2311, 2312, 2287, 2286, 2313, 2288, 2314, 2325, 2289, ++ 2290, 2291, 2490, 2076, 2076, 2292, 2293, 2294, 2295, 2487, ++ ++ 2296, 2301, 2326, 2305, 2306, 2307, 2308, 2309, 2310, 2311, ++ 2312, 2304, 2315, 2313, 2316, 2314, 2325, 2472, 2428, 2091, ++ 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2428, ++ 2326, 2463, 2327, 2328, 2330, 2362, 2331, 2332, 2329, 2334, ++ 2315, 2335, 2316, 2317, 2317, 2317, 2317, 2317, 2317, 2317, ++ 2317, 2317, 2336, 2337, 2338, 2318, 2339, 2319, 2320, 2321, ++ 2327, 2328, 2330, 2322, 2331, 2332, 2329, 2334, 2323, 2335, ++ 2340, 2341, 2342, 2343, 2344, 2345, 2346, 2324, 2347, 2348, ++ 2336, 2337, 2338, 2318, 2339, 2319, 2320, 2321, 2349, 2350, ++ 2351, 2322, 2352, 2353, 2354, 2355, 2323, 2356, 2340, 2341, ++ ++ 2342, 2343, 2344, 2345, 2346, 2324, 2347, 2348, 2357, 2358, ++ 2144, 2145, 2146, 2144, 2145, 2146, 2349, 2350, 2351, 2363, ++ 2352, 2353, 2354, 2355, 2364, 2356, 2147, 2145, 2148, 2147, ++ 2145, 2148, 2365, 2366, 2367, 2376, 2357, 2358, 2377, 2378, ++ 2360, 2379, 2380, 2381, 2382, 2383, 2384, 2363, 2385, 2390, ++ 2388, 2391, 2364, 2388, 2392, 2393, 2488, 2262, 2394, 2395, ++ 2365, 2366, 2367, 2376, 2396, 1947, 2377, 2378, 1947, 2379, ++ 2380, 2381, 2382, 2383, 2384, 2397, 2385, 2390, 2398, 2391, ++ 2399, 1949, 2392, 2393, 1949, 2368, 2394, 2395, 2368, 2261, ++ 2389, 2256, 2396, 2401, 2402, 2403, 2404, 2405, 2406, 2407, ++ ++ 2408, 2489, 2409, 2397, 2369, 2165, 2398, 2410, 2399, 2412, ++ 2413, 2414, 2415, 2417, 2418, 2419, 2420, 2370, 2389, 2371, ++ 2421, 2401, 2402, 2403, 2404, 2405, 2406, 2407, 2408, 2372, ++ 2409, 2373, 2374, 2375, 2423, 2410, 2424, 2412, 2413, 2414, ++ 2415, 2417, 2418, 2419, 2420, 2370, 2422, 2371, 2421, 2422, ++ 2425, 2426, 2427, 2430, 2429, 2431, 2432, 2372, 2433, 2373, ++ 2374, 2375, 2423, 2434, 2424, 2429, 2435, 2437, 2438, 2439, ++ 2440, 2441, 2442, 2443, 2444, 2436, 2445, 2446, 2425, 2426, ++ 2427, 2430, 2447, 2431, 2432, 2450, 2433, 2451, 2448, 2452, ++ 2453, 2434, 2454, 2455, 2435, 2437, 2438, 2439, 2440, 2441, ++ ++ 2442, 2443, 2444, 2449, 2445, 2446, 2456, 2457, 2458, 2459, ++ 2447, 2460, 2461, 2450, 2462, 2451, 2448, 2452, 2453, 2464, ++ 2454, 2455, 2465, 2466, 2467, 2468, 2469, 2470, 2471, 2473, ++ 2474, 2449, 2475, 2476, 2456, 2457, 2458, 2459, 2477, 2460, ++ 2461, 2478, 2462, 2479, 2480, 2481, 2484, 2464, 2485, 2486, ++ 2465, 2466, 2467, 2468, 2469, 2470, 2471, 2473, 2474, 2491, ++ 2475, 2476, 2493, 2494, 2495, 2496, 2477, 2497, 2498, 2478, ++ 2499, 2479, 2480, 2481, 2484, 2500, 2485, 2486, 2501, 2511, ++ 2514, 2516, 2517, 2150, 2504, 2518, 2519, 2504, 2520, 2504, ++ 2493, 2494, 2495, 2496, 2505, 2497, 2498, 2506, 2499, 2521, ++ ++ 2522, 2523, 2524, 2500, 2492, 2525, 2501, 2526, 2528, 2516, ++ 2517, 2507, 2529, 2518, 2519, 2368, 2520, 1949, 2368, 1947, ++ 2572, 2114, 2530, 2533, 2512, 2515, 2531, 2521, 2522, 2523, ++ 2524, 2532, 2534, 2525, 2527, 2526, 2528, 2535, 2536, 2508, ++ 2529, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, ++ 2530, 2533, 2537, 2538, 2531, 2539, 2540, 2541, 2542, 2532, ++ 2534, 2543, 2544, 2545, 2546, 2535, 2536, 2547, 2548, 2549, ++ 2550, 2551, 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, ++ 2537, 2538, 2561, 2539, 2540, 2541, 2542, 2088, 2567, 2543, ++ 2544, 2545, 2546, 2568, 2571, 2547, 2548, 2549, 2550, 2551, ++ ++ 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, 2563, 2564, ++ 2561, 2563, 2566, 2564, 2575, 2566, 2567, 2569, 2578, 2576, ++ 2574, 2568, 2571, 2574, 2570, 2577, 2579, 2580, 2581, 2582, ++ 2583, 2584, 2585, 2583, 2586, 2087, 2587, 2588, 2589, 2994, ++ 2590, 2591, 2575, 1899, 2595, 2569, 2578, 2576, 2049, 2596, ++ 2994, 2597, 2570, 2577, 2579, 2580, 2581, 2582, 2598, 2584, ++ 2585, 2599, 2586, 2360, 2587, 2588, 2589, 2362, 2590, 2591, ++ 3965, 2388, 2595, 3965, 2388, 3965, 2593, 2596, 2359, 2597, ++ 2600, 2601, 2361, 2602, 2603, 2604, 2598, 2603, 2606, 2599, ++ 2607, 2608, 2609, 2610, 2611, 2612, 2613, 2614, 2615, 2616, ++ ++ 2617, 2618, 2619, 2621, 2622, 2624, 2625, 2623, 2600, 2601, ++ 2623, 2602, 2627, 2604, 2629, 2627, 2606, 2628, 2607, 2608, ++ 2609, 2610, 2611, 2612, 2613, 2614, 2615, 2616, 2617, 2618, ++ 2619, 2621, 2622, 2624, 2625, 2630, 2631, 2632, 2633, 2634, ++ 2635, 2637, 2629, 2639, 2641, 2642, 2643, 2644, 2645, 2646, ++ 2647, 2649, 2650, 2651, 2639, 2652, 2020, 2653, 2654, 2655, ++ 2656, 2657, 2658, 2630, 2631, 2632, 2633, 2634, 2635, 2637, ++ 2660, 2661, 2641, 2642, 2643, 2644, 2645, 2646, 2647, 2649, ++ 2650, 2651, 2662, 2652, 2640, 2653, 2654, 2655, 2656, 2657, ++ 2658, 2663, 2664, 2665, 2666, 2667, 2668, 2669, 2660, 2661, ++ ++ 2670, 2671, 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, ++ 2662, 2681, 2682, 2684, 2282, 2488, 2686, 2687, 2688, 2663, ++ 2664, 2665, 2666, 2667, 2668, 2669, 2689, 2690, 2670, 2671, ++ 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, 2691, 2681, ++ 2682, 2692, 2693, 2299, 2686, 2687, 2688, 2698, 2712, 2710, ++ 2997, 1949, 2300, 2511, 2689, 2690, 1947, 2502, 2492, 2685, ++ 2492, 2997, 2504, 2713, 2699, 2504, 2691, 2504, 2504, 2692, ++ 2693, 2504, 2695, 2504, 2504, 2506, 2712, 2504, 2702, 2504, ++ 2714, 2715, 1945, 2504, 2706, 2701, 2504, 2506, 2504, 2696, ++ 1905, 2713, 2700, 2695, 2515, 2703, 2506, 2711, 2515, 2716, ++ ++ 2717, 2707, 2718, 2719, 2720, 2721, 2722, 2723, 2714, 2715, ++ 2696, 2724, 2725, 2726, 2727, 2728, 2729, 2697, 1905, 2730, ++ 2731, 2732, 2733, 2704, 2734, 2735, 2736, 2716, 2717, 2708, ++ 2718, 2719, 2720, 2721, 2722, 2723, 2737, 2738, 2508, 2724, ++ 2725, 2726, 2727, 2728, 2729, 2739, 2740, 2730, 2731, 2732, ++ 2733, 2741, 2734, 2735, 2736, 2742, 2744, 2746, 2747, 2748, ++ 2749, 2750, 2751, 2752, 2737, 2738, 2753, 2563, 2564, 2754, ++ 2563, 2755, 2756, 2739, 2740, 2566, 2564, 2757, 2566, 2741, ++ 2760, 2761, 2762, 2742, 2744, 2746, 2747, 2748, 2749, 2750, ++ 2751, 2752, 2574, 2763, 2753, 2574, 2764, 2754, 2765, 2755, ++ ++ 2756, 2766, 1917, 2767, 2770, 2757, 2771, 2772, 2760, 2761, ++ 2762, 2583, 2773, 2774, 2583, 2775, 2768, 1912, 2776, 2779, ++ 2780, 2763, 2360, 2781, 2764, 2782, 2765, 2783, 2784, 2766, ++ 2362, 2767, 2770, 2789, 2771, 2772, 2785, 2359, 2786, 2788, ++ 2773, 2774, 2788, 2775, 2790, 2361, 2776, 2779, 2780, 2791, ++ 2792, 2781, 2793, 2782, 2794, 2783, 2784, 2795, 2796, 2797, ++ 2798, 2789, 2797, 2800, 2785, 2801, 2786, 2802, 2803, 2804, ++ 2805, 2623, 2790, 2810, 2623, 2814, 2806, 2791, 2792, 2799, ++ 2793, 2816, 2794, 2808, 2809, 2795, 2796, 2627, 2798, 2817, ++ 2627, 2800, 2628, 2801, 2818, 2802, 2803, 2804, 2805, 2819, ++ ++ 2820, 2810, 2821, 2814, 2822, 2823, 2824, 2799, 2825, 2816, ++ 2826, 2808, 2809, 2827, 2828, 2829, 2830, 2817, 2831, 2832, ++ 2833, 2834, 2818, 2835, 2836, 2837, 2838, 2819, 2820, 2841, ++ 2821, 2842, 2822, 2823, 2824, 2843, 2825, 2844, 2826, 2845, ++ 2846, 2827, 2828, 2829, 2830, 2847, 2831, 2832, 2833, 2834, ++ 2848, 2835, 2836, 2837, 2838, 2849, 2850, 2841, 2851, 2842, ++ 2852, 2853, 2854, 2843, 2855, 2844, 2856, 2845, 2846, 2857, ++ 2858, 2859, 2860, 2847, 2861, 2862, 2863, 2864, 2848, 2488, ++ 2865, 2866, 2867, 2849, 2850, 2868, 2851, 2869, 2852, 2853, ++ 2854, 2870, 2855, 2871, 2856, 1902, 2511, 2857, 2858, 2859, ++ ++ 2860, 2880, 2861, 2862, 2863, 2864, 2299, 2509, 2958, 2866, ++ 2867, 2958, 2883, 2868, 2508, 2869, 2895, 2299, 2881, 2870, ++ 2502, 2871, 1526, 2873, 2489, 2076, 2873, 2504, 2873, 2699, ++ 2504, 2502, 2504, 2874, 1897, 2885, 2875, 2878, 1715, 2873, ++ 2506, 2512, 2873, 1886, 2873, 2896, 2882, 2897, 2701, 2887, ++ 2876, 2898, 2875, 2504, 2696, 2899, 2504, 2884, 2504, 2504, ++ 2900, 2091, 2504, 2890, 2504, 1849, 2888, 2959, 2901, 2706, ++ 2959, 2873, 2506, 2896, 2873, 2897, 2873, 2902, 2877, 2898, ++ 2703, 2874, 2508, 2899, 2875, 2903, 2707, 2904, 2900, 1831, ++ 2504, 2905, 2906, 2504, 2889, 2504, 2901, 2907, 2876, 2908, ++ ++ 2893, 2909, 2910, 2506, 2911, 2902, 2912, 2913, 2891, 2914, ++ 2915, 2916, 2917, 2903, 2708, 2904, 2918, 2707, 2919, 2905, ++ 2906, 2920, 2921, 2922, 2923, 2907, 2877, 2908, 2924, 2909, ++ 2910, 2925, 2911, 2926, 2912, 2913, 2927, 2914, 2915, 2916, ++ 2917, 2928, 2929, 2930, 2918, 2894, 2919, 2931, 2932, 2920, ++ 2921, 2922, 2923, 2933, 2934, 2935, 2924, 2936, 2938, 2925, ++ 2939, 2926, 2940, 2941, 2927, 2942, 2943, 2944, 2945, 2928, ++ 2929, 2930, 2947, 2948, 2949, 2931, 2932, 2950, 2951, 2952, ++ 2953, 2933, 2934, 2935, 2955, 2936, 2938, 2956, 2939, 2957, ++ 2940, 2941, 2960, 2942, 2943, 2944, 2945, 2961, 2962, 2963, ++ ++ 2947, 2948, 2949, 2964, 2971, 2950, 2951, 2952, 2953, 2972, ++ 2788, 2973, 2955, 2788, 2974, 2956, 2797, 2957, 2977, 2797, ++ 2960, 2975, 2966, 2978, 2979, 2961, 2962, 2963, 2980, 2981, ++ 2967, 2968, 2971, 2969, 2965, 2970, 2982, 2972, 2983, 2973, ++ 2984, 2986, 2974, 2987, 2988, 2992, 2977, 2993, 2995, 2998, ++ 2966, 2978, 2979, 2999, 3000, 3001, 2980, 2981, 2967, 2968, ++ 3002, 2969, 2965, 2970, 2982, 3003, 2983, 3004, 2984, 2986, ++ 3007, 2987, 2988, 2992, 3009, 2993, 2995, 2998, 3010, 3011, ++ 3012, 2999, 3000, 3001, 3008, 3013, 3015, 3016, 3002, 3017, ++ 3018, 3019, 3020, 3003, 3021, 3004, 3013, 3022, 3007, 3023, ++ ++ 3024, 3025, 3009, 3026, 3027, 3028, 3010, 3011, 3012, 3029, ++ 3030, 3031, 3032, 3033, 3015, 3016, 3034, 3017, 3018, 3019, ++ 3020, 3035, 3021, 3036, 3037, 3022, 3038, 3023, 3024, 3025, ++ 3039, 3026, 3027, 3028, 3040, 3041, 3042, 3029, 3030, 3031, ++ 3032, 3033, 2488, 3043, 3034, 3044, 3045, 3046, 3048, 3035, ++ 3052, 3036, 3037, 2894, 3038, 1759, 2299, 3112, 3039, 3154, ++ 3112, 1395, 3040, 3041, 3042, 3069, 3049, 2881, 3052, 1574, ++ 3154, 3043, 2511, 3044, 3045, 3046, 3048, 3118, 2873, 2873, ++ 3118, 2873, 2873, 2873, 2873, 2881, 1735, 2286, 3050, 3055, ++ 3070, 2875, 3071, 3069, 3049, 3053, 1731, 2873, 2873, 3061, ++ ++ 2873, 2873, 2873, 2873, 2698, 2876, 3056, 3050, 3058, 2504, ++ 2875, 2875, 2504, 3053, 2504, 2698, 2881, 2304, 3070, 2695, ++ 3071, 2699, 2506, 3072, 2876, 2876, 3073, 3074, 3134, 3075, ++ 3076, 3134, 2699, 3051, 3057, 2873, 2696, 1718, 2873, 3077, ++ 2873, 1717, 1715, 3142, 3062, 3063, 3142, 3059, 2875, 2700, ++ 2299, 3072, 3051, 3059, 3073, 3074, 2873, 3075, 3076, 2873, ++ 2884, 2873, 2888, 1657, 2697, 2873, 3063, 3077, 2873, 2875, ++ 2873, 2504, 1656, 3078, 2504, 3066, 2504, 2504, 2875, 1646, ++ 2504, 2702, 2504, 2888, 3079, 1645, 2504, 2702, 3080, 2504, ++ 3064, 2504, 2888, 3081, 3082, 3083, 2706, 2504, 2703, 2506, ++ ++ 2504, 3078, 2504, 3084, 2703, 3085, 3086, 2706, 3087, 3088, ++ 2506, 3064, 3079, 2707, 3089, 3090, 3080, 3091, 3092, 3093, ++ 3067, 3081, 3082, 3083, 2707, 3094, 2704, 3095, 3096, 3097, ++ 3098, 3084, 2891, 3085, 3086, 3099, 3087, 3088, 3100, 3101, ++ 3102, 2708, 3089, 3090, 3103, 3091, 3092, 3093, 3104, 3105, ++ 3107, 3108, 2894, 3094, 3109, 3095, 3096, 3097, 3098, 3110, ++ 3111, 3113, 3114, 3099, 3115, 3116, 3100, 3101, 3102, 3121, ++ 2959, 3122, 3103, 2959, 3124, 3119, 3104, 3105, 3107, 3108, ++ 3125, 3126, 3109, 3127, 3128, 3129, 3133, 3110, 3111, 3113, ++ 3114, 3139, 3115, 3116, 3130, 3140, 3135, 3121, 3965, 3122, ++ ++ 3136, 3965, 3124, 3965, 3141, 3131, 3132, 3137, 3125, 3126, ++ 3143, 3127, 3128, 3129, 3133, 3144, 3145, 3146, 3148, 3139, ++ 3149, 3150, 3130, 3140, 3135, 3152, 3153, 3155, 3136, 3156, ++ 3157, 3158, 3141, 3131, 3132, 3137, 3159, 3160, 3143, 3161, ++ 3162, 3163, 3166, 3144, 3145, 3146, 3148, 3167, 3149, 3150, ++ 3164, 3165, 3168, 3152, 3153, 3155, 3169, 3156, 3157, 3158, ++ 3170, 3171, 3172, 3173, 3159, 3160, 3174, 3161, 3162, 3163, ++ 3166, 3175, 3176, 3177, 3178, 3167, 3179, 3180, 3164, 3165, ++ 3168, 3181, 3183, 3186, 3169, 3184, 3187, 3188, 3170, 3171, ++ 3172, 3173, 3181, 3189, 3174, 3190, 3184, 3192, 1644, 3175, ++ ++ 3176, 3177, 3178, 3193, 3179, 3180, 3194, 3195, 3196, 3197, ++ 3183, 3186, 3198, 3199, 3187, 3188, 3201, 3202, 3203, 3205, ++ 3206, 3189, 3182, 3190, 3067, 3192, 3185, 2299, 2509, 3219, ++ 3220, 3193, 3406, 3204, 3194, 3195, 3196, 3197, 3208, 3245, ++ 3198, 3199, 3245, 3406, 3201, 3202, 3203, 3205, 3206, 2873, ++ 3221, 2698, 2873, 3222, 2873, 2881, 3209, 3219, 3220, 3207, ++ 2873, 3204, 2875, 2873, 2873, 2873, 3223, 2873, 2699, 2873, ++ 3063, 3052, 2504, 2875, 3210, 2504, 2876, 2504, 3221, 3224, ++ 1580, 3222, 2706, 3062, 3225, 2506, 3226, 2888, 2881, 3256, ++ 2873, 3056, 3256, 2873, 3223, 2873, 3213, 1579, 3118, 2707, ++ ++ 3050, 3118, 3281, 2875, 3059, 3281, 3227, 3224, 2873, 3228, ++ 3229, 2873, 3225, 2873, 3226, 3064, 3062, 2876, 3214, 3211, ++ 2504, 2875, 3230, 2504, 3231, 2504, 2873, 3212, 3232, 2873, ++ 3216, 2873, 3233, 2506, 3227, 2888, 3063, 3228, 3229, 2875, ++ 3234, 3235, 3236, 3237, 3238, 3059, 3239, 3217, 3240, 3241, ++ 3230, 3242, 3231, 2888, 3243, 3244, 3232, 3246, 3247, 3248, ++ 3233, 3249, 3250, 3067, 3251, 3252, 3253, 3255, 3234, 3235, ++ 3236, 3237, 3238, 3257, 3239, 3218, 3240, 3241, 3725, 3242, ++ 3725, 3067, 3243, 3244, 1574, 3246, 3247, 3248, 3112, 3249, ++ 3250, 3112, 3251, 3252, 3253, 3255, 3259, 3965, 3260, 3262, ++ ++ 3965, 3257, 3965, 3263, 3264, 3254, 3254, 3254, 3254, 3254, ++ 3254, 3254, 3254, 3254, 3265, 3266, 3267, 3268, 3269, 3270, ++ 3271, 3273, 3359, 1550, 3259, 3359, 3260, 3262, 3726, 1549, ++ 3657, 3263, 3264, 3134, 3274, 3275, 3134, 3277, 3278, 3279, ++ 3282, 3283, 3265, 3266, 3267, 3268, 3269, 3270, 3271, 3273, ++ 3272, 3272, 3272, 3272, 3272, 3272, 3272, 3272, 3272, 3284, ++ 3285, 3286, 3274, 3275, 3287, 3277, 3278, 3279, 3282, 3283, ++ 3288, 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3296, 3297, ++ 3298, 3299, 3300, 3301, 3303, 3304, 3305, 3284, 3285, 3286, ++ 3306, 3307, 3287, 3309, 3310, 3311, 3312, 3313, 3288, 3289, ++ ++ 3290, 3291, 3292, 3293, 3294, 3295, 3296, 3297, 3298, 3299, ++ 3300, 3301, 3303, 3304, 3305, 3314, 3315, 3317, 3306, 3307, ++ 3319, 3309, 3310, 3311, 3312, 3313, 3320, 3321, 3317, 3322, ++ 1546, 3323, 3324, 3325, 3326, 3327, 3328, 3329, 3330, 3331, ++ 3332, 3334, 3245, 3314, 3315, 3245, 3341, 3362, 3319, 3390, ++ 3342, 3333, 3390, 3281, 3320, 3321, 3281, 3322, 3318, 3323, ++ 3324, 3325, 3326, 3327, 3328, 3329, 3330, 3331, 3332, 3334, ++ 2873, 3052, 1545, 2873, 3341, 2873, 1544, 3336, 3342, 3333, ++ 3050, 2873, 2873, 2875, 2873, 2873, 2873, 2873, 2881, 1543, ++ 2504, 3055, 3055, 2504, 2699, 2504, 1542, 2876, 1540, 3343, ++ ++ 3335, 2873, 2504, 2506, 2873, 2504, 2873, 2504, 3056, 3056, ++ 3344, 3063, 3216, 3345, 2875, 2506, 3053, 2707, 3346, 3347, ++ 1117, 2873, 2884, 3348, 2873, 3051, 2873, 3343, 2888, 3217, ++ 3349, 2887, 3350, 3351, 2875, 3352, 3057, 3211, 3344, 2504, ++ 3353, 3345, 2504, 3354, 2504, 2894, 3346, 3347, 2888, 3339, ++ 3355, 3348, 2506, 3356, 3357, 3358, 3064, 3337, 3349, 3360, ++ 3350, 3351, 3361, 3352, 3364, 3365, 3217, 3366, 3353, 3367, ++ 3368, 3354, 3369, 3370, 3371, 874, 2889, 3399, 3355, 1485, ++ 3399, 3356, 3357, 3358, 3372, 3377, 3401, 3360, 3377, 3401, ++ 3361, 1476, 3364, 3365, 3340, 3366, 3256, 3367, 3368, 3256, ++ ++ 3369, 3370, 3371, 3254, 3254, 3254, 3254, 3254, 3254, 3254, ++ 3254, 3254, 3372, 3373, 3373, 3373, 3373, 3373, 3373, 3373, ++ 3373, 3373, 3374, 3376, 3380, 3381, 3382, 3383, 3384, 3385, ++ 3386, 3378, 3387, 3388, 3389, 3272, 3272, 3272, 3272, 3272, ++ 3272, 3272, 3272, 3272, 3391, 3392, 3393, 3394, 3395, 3396, ++ 3374, 3376, 3380, 3381, 3382, 3383, 3384, 3385, 3386, 3378, ++ 3387, 3388, 3389, 3397, 3398, 3400, 3402, 3403, 3404, 3405, ++ 3407, 3408, 3391, 3392, 3393, 3394, 3395, 3396, 3409, 3410, ++ 3412, 3413, 3414, 3415, 3416, 3419, 3420, 3421, 3422, 3423, ++ 3425, 3397, 3398, 3400, 3402, 3403, 3404, 3405, 3407, 3408, ++ ++ 3426, 3427, 3430, 3431, 3432, 3433, 3409, 3410, 3412, 3413, ++ 3414, 3415, 3416, 3419, 3420, 3421, 3422, 3423, 3425, 3428, ++ 3434, 3435, 3436, 3437, 3438, 3440, 3441, 3429, 3426, 3427, ++ 3430, 3431, 3432, 3433, 3442, 3443, 3444, 3445, 3340, 3461, ++ 3052, 2299, 3461, 1474, 1469, 1464, 3447, 3428, 3434, 3435, ++ 3436, 3437, 3438, 3440, 3441, 3429, 2873, 2881, 3448, 2873, ++ 3449, 2873, 3442, 3443, 3444, 3445, 3050, 2504, 2873, 2875, ++ 2504, 2873, 2504, 2873, 3447, 3450, 3451, 3446, 3063, 2504, ++ 2506, 2875, 2504, 2876, 2504, 2882, 3448, 3452, 3449, 3216, ++ 3453, 3454, 2506, 3455, 3217, 2888, 3456, 3457, 3458, 3459, ++ ++ 1406, 3462, 3464, 3450, 3451, 3465, 3217, 3466, 3467, 3468, ++ 3469, 2877, 3470, 3471, 3472, 3452, 3473, 3487, 3453, 3454, ++ 3487, 3455, 3340, 2889, 3456, 3457, 3458, 3459, 3359, 3462, ++ 3464, 3359, 3503, 3465, 3340, 3466, 3467, 3468, 3469, 1405, ++ 3470, 3471, 3472, 3503, 3473, 3460, 3460, 3460, 3460, 3460, ++ 3460, 3460, 3460, 3460, 3463, 3463, 3463, 3463, 3463, 3463, ++ 3463, 3463, 3463, 3463, 3463, 3363, 3363, 3363, 3363, 3363, ++ 3363, 3363, 3363, 3363, 3363, 3363, 3474, 3476, 540, 3463, ++ 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3377, ++ 3363, 3477, 3377, 3478, 3479, 3480, 3481, 3482, 3483, 3484, ++ ++ 3485, 3490, 3491, 538, 3474, 3476, 3475, 3475, 3475, 3475, ++ 3475, 3475, 3475, 3475, 3475, 3488, 3493, 3489, 3488, 3477, ++ 3489, 3478, 3479, 3480, 3481, 3482, 3483, 3484, 3485, 3490, ++ 3491, 3492, 3494, 3495, 3492, 3497, 3498, 3550, 3497, 3498, ++ 3550, 3508, 533, 3500, 3493, 3401, 3501, 3502, 3401, 3505, ++ 3506, 3507, 3508, 3509, 3510, 3514, 531, 516, 3515, 3516, ++ 3494, 3495, 3499, 3499, 3499, 3499, 3499, 3499, 3499, 3499, ++ 3499, 3500, 3517, 3518, 3501, 3502, 3511, 3505, 3506, 3507, ++ 3519, 3509, 3510, 3514, 3512, 3513, 3515, 3516, 3520, 3521, ++ 3522, 3523, 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, ++ ++ 3517, 3518, 3532, 3533, 3511, 3534, 3535, 3534, 3519, 3536, ++ 3537, 3539, 3512, 3513, 3540, 514, 3520, 3521, 3522, 3523, ++ 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, 3541, 3542, ++ 3532, 3533, 3543, 3544, 3535, 3545, 3546, 3536, 3537, 3539, ++ 2504, 3547, 3540, 2504, 3552, 2504, 3553, 3554, 3555, 3487, ++ 3216, 3497, 3487, 2506, 3585, 3628, 3541, 3542, 3628, 3634, ++ 3543, 3544, 3634, 3545, 3546, 3556, 3557, 3217, 3558, 3547, ++ 3559, 3560, 3552, 3561, 3553, 3554, 3555, 3534, 3460, 3460, ++ 3460, 3460, 3460, 3460, 3460, 3460, 3460, 3461, 3638, 3551, ++ 3461, 3638, 3548, 3556, 3557, 3337, 3558, 3573, 3559, 3560, ++ ++ 3573, 3561, 3574, 510, 3549, 3549, 3549, 3549, 3549, 3549, ++ 3549, 3549, 3549, 3463, 3463, 3463, 3463, 3463, 3463, 3463, ++ 3463, 3463, 3463, 3463, 3475, 3475, 3475, 3475, 3475, 3475, ++ 3475, 3475, 3475, 3562, 3563, 3564, 3565, 3566, 3463, 3568, ++ 3566, 3569, 3570, 3571, 3576, 3578, 3579, 3576, 3492, 3577, ++ 3581, 3492, 3582, 3580, 3583, 3587, 3701, 3704, 1396, 3701, ++ 3704, 3562, 3563, 3564, 3565, 3745, 3567, 3568, 3590, 3569, ++ 3570, 3571, 3573, 3578, 3579, 3573, 3745, 3574, 3581, 1392, ++ 3582, 3498, 3583, 3587, 3498, 3499, 3499, 3499, 3499, 3499, ++ 3499, 3499, 3499, 3499, 3567, 3591, 3590, 3592, 3586, 3586, ++ ++ 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3588, 3593, 3594, ++ 3595, 3596, 3597, 3589, 3598, 3599, 3601, 3603, 3604, 3605, ++ 3606, 3607, 3608, 3591, 3610, 3592, 3611, 3614, 3615, 3576, ++ 3818, 1386, 3576, 3818, 3577, 3588, 3593, 3594, 3595, 3596, ++ 3597, 3589, 3598, 3599, 3601, 3603, 3604, 3605, 3606, 3607, ++ 3608, 3617, 3610, 3618, 3611, 3614, 3615, 3616, 3616, 3616, ++ 3616, 3616, 3616, 3616, 3616, 3616, 3616, 3616, 3619, 3622, ++ 3623, 3624, 3625, 3626, 3627, 3638, 3965, 1355, 3638, 3617, ++ 3708, 3618, 3616, 3629, 3629, 3629, 3629, 3629, 3629, 3629, ++ 3629, 3629, 3631, 3632, 3633, 3635, 3619, 3622, 3623, 3624, ++ ++ 3625, 3626, 3627, 3549, 3549, 3549, 3549, 3549, 3549, 3549, ++ 3549, 3549, 3550, 3636, 3637, 3550, 3639, 3640, 3641, 3642, ++ 3631, 3632, 3633, 3635, 3643, 3645, 3646, 3647, 3650, 3630, ++ 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3653, 3654, ++ 3566, 3636, 3637, 3566, 3639, 3640, 3641, 3642, 3648, 1347, ++ 3658, 3648, 3643, 3645, 3646, 3647, 3650, 3644, 3644, 3644, ++ 3644, 3644, 3644, 3644, 3644, 3644, 3653, 3654, 3659, 3660, ++ 3584, 3662, 3663, 3664, 3665, 3667, 3668, 3649, 3658, 3669, ++ 3670, 3671, 3672, 3673, 3661, 3661, 3661, 3661, 3661, 3661, ++ 3661, 3661, 3661, 1336, 431, 3497, 3659, 3660, 3585, 3662, ++ ++ 3663, 3664, 3665, 3667, 3668, 3649, 3674, 3669, 3670, 3671, ++ 3672, 3673, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, ++ 3661, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, ++ 3675, 3676, 3677, 3678, 3674, 3679, 3680, 3681, 3683, 3686, ++ 418, 3687, 3688, 3616, 3616, 3616, 3616, 3616, 3616, 3616, ++ 3616, 3616, 3616, 3616, 3689, 3691, 3692, 3693, 3675, 3676, ++ 3677, 3678, 414, 3679, 3680, 3681, 3683, 3686, 3616, 3687, ++ 3688, 3819, 399, 3695, 3819, 3696, 3695, 3699, 3697, 3700, ++ 3702, 395, 3689, 3691, 3692, 3693, 3696, 3706, 3709, 3629, ++ 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3630, 3630, ++ ++ 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3700, 3702, 3634, ++ 3710, 3711, 3634, 3712, 3713, 3706, 3709, 3644, 3644, 3644, ++ 3644, 3644, 3644, 3644, 3644, 3644, 3703, 3703, 3703, 3703, ++ 3703, 3703, 3703, 3703, 3703, 3714, 3715, 373, 3710, 3711, ++ 3701, 3712, 3713, 3701, 369, 3759, 3717, 3718, 3648, 3721, ++ 3722, 3648, 3728, 3729, 3723, 3730, 3731, 3698, 3732, 3733, ++ 3734, 3724, 363, 3714, 3715, 3716, 3716, 3716, 3716, 3716, ++ 3716, 3716, 3716, 3716, 3717, 3718, 3584, 3721, 3722, 3735, ++ 3728, 3729, 3723, 3730, 3731, 3736, 3732, 3733, 3734, 3724, ++ 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3737, ++ ++ 3738, 3739, 3740, 3741, 3742, 3743, 3744, 3735, 3746, 3747, ++ 3748, 3752, 3754, 3736, 3755, 3756, 359, 3758, 3704, 3746, ++ 355, 3704, 1278, 3762, 3761, 3790, 3765, 3737, 3738, 3739, ++ 3740, 3741, 3742, 3743, 3744, 1217, 3790, 3747, 3748, 3752, ++ 3754, 1216, 3755, 3756, 3696, 3758, 3696, 3696, 3695, 3965, ++ 3696, 3695, 3761, 3697, 3765, 3965, 3766, 3696, 3965, 3767, ++ 3965, 3696, 3703, 3703, 3703, 3703, 3703, 3703, 3703, 3703, ++ 3703, 3768, 3769, 3770, 3771, 3716, 3716, 3716, 3716, 3716, ++ 3716, 3716, 3716, 3716, 3766, 3772, 3773, 3767, 3774, 3775, ++ 3776, 3777, 3778, 3779, 3780, 3781, 3782, 3783, 3784, 3768, ++ ++ 3769, 3770, 3771, 3785, 3795, 3786, 3787, 3788, 3789, 3791, ++ 3792, 3793, 3794, 3772, 3773, 3795, 3774, 3775, 3776, 3777, ++ 3796, 3779, 3780, 3781, 3782, 3783, 3784, 3797, 3698, 3801, ++ 3798, 3785, 3698, 3786, 3787, 3788, 3789, 3791, 3792, 3793, ++ 3794, 3799, 3657, 3805, 3965, 3808, 3809, 3965, 3796, 3965, ++ 3810, 3811, 3812, 3813, 3814, 3797, 3815, 3801, 3798, 3816, ++ 3820, 3821, 3816, 3725, 3822, 1200, 3823, 3824, 3825, 3799, ++ 3826, 3827, 3828, 3808, 3809, 3829, 3830, 3831, 3810, 3811, ++ 3812, 3813, 3814, 3832, 3815, 3840, 3834, 3835, 3820, 3821, ++ 3836, 3837, 3822, 3806, 3823, 3824, 3825, 3838, 3826, 3827, ++ ++ 3828, 3840, 3843, 3829, 3830, 3831, 3817, 1191, 3844, 3845, ++ 3846, 3832, 3847, 3726, 3834, 3835, 3848, 3849, 3836, 3837, ++ 3851, 3852, 3859, 3851, 3818, 3838, 3860, 3818, 3819, 3854, ++ 3843, 3819, 3861, 3856, 3817, 3841, 3844, 3845, 3846, 3857, ++ 3847, 3862, 3857, 3858, 3848, 3849, 3858, 3863, 3865, 3852, ++ 3859, 3806, 3866, 3867, 3860, 3868, 3869, 3870, 3873, 3874, ++ 3861, 3875, 3874, 3876, 3877, 3878, 3879, 3880, 3881, 3862, ++ 3851, 3882, 3840, 3851, 3965, 3863, 3865, 3965, 3889, 3965, ++ 3866, 3867, 3890, 3868, 3869, 3870, 3873, 3891, 3892, 3893, ++ 3894, 3876, 3877, 3878, 3879, 3880, 3881, 3965, 3857, 3882, ++ ++ 3965, 3857, 3965, 3886, 3858, 3895, 3889, 3858, 3896, 3888, ++ 3890, 3806, 3897, 3898, 3906, 3891, 3892, 3893, 3894, 3908, ++ 3904, 3909, 3841, 3904, 3899, 3905, 3907, 3900, 3910, 3907, ++ 3911, 3910, 3965, 3895, 3916, 3965, 3896, 3965, 3917, 3918, ++ 3897, 3898, 3906, 3965, 3919, 3920, 3965, 3908, 3965, 3909, ++ 3921, 3922, 3899, 3923, 3924, 3900, 3925, 3926, 3911, 3929, ++ 3904, 3931, 3916, 3904, 3931, 3905, 3917, 3918, 1179, 3932, ++ 3934, 3907, 3919, 3920, 3907, 1158, 1142, 3947, 3921, 3922, ++ 3947, 3923, 3924, 3910, 3925, 3926, 3910, 3929, 3930, 3930, ++ 3930, 3930, 3930, 3930, 3930, 3930, 3930, 3932, 3934, 3937, ++ ++ 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3938, ++ 3939, 3940, 3941, 3942, 3943, 3944, 3930, 3930, 3930, 3930, ++ 3930, 3930, 3930, 3930, 3930, 662, 1117, 3937, 3931, 645, ++ 385, 3931, 385, 874, 1073, 3948, 3949, 3938, 3939, 3940, ++ 3941, 3942, 3943, 3944, 3950, 3946, 3946, 3946, 3946, 3946, ++ 3946, 3946, 3946, 3946, 3933, 3933, 3933, 3933, 3933, 3933, ++ 3933, 3933, 3933, 3948, 3949, 3951, 3953, 3954, 3956, 3957, ++ 3958, 1062, 3950, 3946, 3946, 3946, 3946, 3946, 3946, 3946, ++ 3946, 3946, 3947, 1054, 1051, 3947, 1009, 540, 538, 3959, ++ 3960, 3961, 3962, 3951, 3953, 3954, 3956, 3957, 3958, 3955, ++ ++ 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, ++ 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3959, 3960, 3961, ++ 3962, 3963, 3964, 1007, 533, 531, 1001, 516, 514, 999, ++ 510, 994, 986, 977, 976, 946, 935, 923, 913, 431, ++ 910, 418, 414, 662, 883, 399, 395, 645, 865, 3963, ++ 3964, 76, 76, 76, 76, 76, 76, 76, 76, 76, ++ 76, 76, 76, 76, 76, 76, 76, 76, 76, 98, + 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, +- 98, 98, 98, 98, 98, 128, 128, 128, 128, 128, ++ 98, 98, 98, 98, 98, 98, 98, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, +- 128, 128, 128, 134, 134, 134, 134, 134, 134, 134, +- 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, + +- 134, 137, 137, 137, 137, 137, 137, 137, 137, 137, +- 137, 137, 137, 137, 137, 137, 137, 137, 137, 143, +- 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, +- 143, 143, 143, 143, 143, 143, 143, 149, 149, 149, ++ 128, 128, 128, 128, 128, 134, 134, 134, 134, 134, ++ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, ++ 134, 134, 134, 137, 137, 137, 137, 137, 137, 137, ++ 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, ++ 137, 143, 143, 143, 143, 143, 143, 143, 143, 143, ++ 143, 143, 143, 143, 143, 143, 143, 143, 143, 149, + 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, +- 149, 149, 149, 149, 149, 156, 156, 156, 156, 156, ++ 149, 149, 149, 149, 149, 149, 149, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, +- 156, 156, 156, 162, 162, 162, 162, 162, 162, 162, +- 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, +- 162, 169, 169, 169, 169, 169, 169, 169, 169, 169, ++ 156, 156, 156, 156, 156, 162, 162, 162, 162, 162, + +- 169, 169, 169, 169, 169, 169, 169, 169, 169, 179, +- 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, +- 179, 179, 179, 179, 179, 179, 179, 185, 185, 185, ++ 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, ++ 162, 162, 162, 169, 169, 169, 169, 169, 169, 169, ++ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, ++ 169, 179, 179, 179, 179, 179, 179, 179, 179, 179, ++ 179, 179, 179, 179, 179, 179, 179, 179, 179, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, +- 185, 185, 185, 185, 185, 227, 227, 227, 227, 227, ++ 185, 185, 185, 185, 185, 185, 185, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, +- 227, 227, 227, 232, 232, 232, 232, 232, 232, 232, ++ 227, 227, 227, 227, 227, 232, 232, 232, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, +- 232, 237, 237, 237, 237, 237, 237, 237, 237, 237, +- 237, 237, 237, 237, 237, 237, 237, 237, 237, 238, + +- 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, +- 238, 238, 238, 238, 238, 238, 238, 239, 239, 239, ++ 232, 232, 232, 237, 237, 237, 237, 237, 237, 237, ++ 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, ++ 237, 238, 238, 238, 238, 238, 238, 238, 238, 238, ++ 238, 238, 238, 238, 238, 238, 238, 238, 238, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, +- 239, 239, 239, 239, 239, 240, 240, 240, 240, 240, ++ 239, 239, 239, 239, 239, 239, 239, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, +- 240, 240, 240, 241, 241, 241, 241, 241, 241, 241, ++ 240, 240, 240, 240, 240, 241, 241, 241, 241, 241, + 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, +- 241, 249, 249, 249, 249, 249, 249, 249, 249, 249, +- 249, 249, 249, 249, 249, 249, 249, 249, 249, 251, +- 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, ++ 241, 241, 241, 249, 249, 249, 249, 249, 249, 249, + +- 251, 251, 251, 251, 251, 251, 251, 255, 255, 255, ++ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, ++ 249, 251, 251, 251, 251, 251, 251, 251, 251, 251, ++ 251, 251, 251, 251, 251, 251, 251, 251, 251, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, +- 255, 255, 255, 255, 255, 258, 258, 258, 258, 258, ++ 255, 255, 255, 255, 255, 255, 255, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, +- 258, 258, 258, 266, 266, 363, 266, 266, 266, 266, ++ 258, 258, 258, 258, 258, 266, 266, 373, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 346, 346, 346, 346, 346, 346, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 363, 363, 363, ++ 266, 266, 266, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, + ++ 346, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 356, 356, 356, 356, 356, 356, 356, 356, 356, 363, + 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 363, 363, 366, 366, 366, 366, 366, ++ 363, 363, 363, 363, 363, 363, 363, 366, 366, 366, + 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 366, 366, 373, 373, 373, 373, 373, 373, 373, ++ 366, 366, 366, 366, 366, 373, 373, 373, 373, 373, + 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, +- 373, 376, 376, 376, 376, 376, 376, 376, 376, 376, +- 376, 376, 376, 376, 376, 376, 376, 376, 376, 382, +- 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, +- 382, 382, 382, 382, 382, 382, 382, 387, 387, 387, +- 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, ++ 373, 373, 373, 376, 376, 376, 376, 376, 376, 376, ++ 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, ++ 376, 382, 382, 382, 382, 382, 382, 382, 382, 382, + +- 387, 387, 387, 387, 387, 391, 391, 391, 391, 391, ++ 382, 382, 382, 382, 382, 382, 382, 382, 382, 387, ++ 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, ++ 387, 387, 387, 387, 387, 387, 387, 391, 391, 391, + 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, +- 391, 391, 391, 399, 399, 399, 399, 399, 399, 399, ++ 391, 391, 391, 391, 391, 399, 399, 399, 399, 399, + 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- 399, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 402, 402, 402, 402, 402, 402, 402, 411, +- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 411, 411, 411, 411, 418, 418, 418, +- 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, +- 418, 418, 418, 418, 418, 421, 421, 421, 421, 421, ++ 399, 399, 399, 402, 402, 402, 402, 402, 402, 402, ++ 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, ++ 402, 411, 411, 411, 411, 411, 411, 411, 411, 411, ++ 411, 411, 411, 411, 411, 411, 411, 411, 411, 418, + ++ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 418, 418, 418, 418, 418, 418, 418, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 421, 421, 505, 505, 505, 505, 505, 505, 505, ++ 421, 421, 421, 421, 421, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 511, 511, 511, 511, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 517, 517, 359, +- 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, +- 517, 517, 517, 517, 517, 518, 518, 859, 518, 518, +- 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, ++ 505, 505, 505, 511, 511, 511, 511, 511, 511, 511, ++ 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, ++ 511, 516, 516, 516, 516, 516, 516, 516, 516, 516, ++ 516, 516, 516, 516, 516, 516, 516, 516, 516, 517, ++ 517, 369, 517, 517, 517, 517, 517, 517, 517, 517, + +- 518, 518, 518, 519, 519, 355, 519, 519, 519, 519, ++ 517, 517, 517, 517, 517, 517, 517, 518, 518, 862, ++ 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, ++ 518, 518, 518, 518, 518, 519, 519, 363, 519, 519, + 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, +- 519, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 528, 528, 528, 528, 528, 528, 533, +- 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 533, 533, 533, 533, 535, 535, 535, ++ 519, 519, 519, 528, 528, 528, 528, 528, 528, 528, ++ 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, ++ 528, 533, 533, 533, 533, 533, 533, 533, 533, 533, ++ 533, 533, 533, 533, 533, 533, 533, 533, 533, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 535, 535, 540, 540, 540, 540, 540, +- 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, +- 540, 540, 540, 266, 266, 774, 266, 266, 266, 266, ++ 535, 535, 535, 535, 535, 535, 535, 540, 540, 540, + ++ 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, ++ 540, 540, 540, 540, 540, 266, 266, 359, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 346, 346, 346, 346, 346, 346, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 363, 363, 363, ++ 266, 266, 266, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 346, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 356, 356, 356, 356, 356, 356, 356, 356, 356, 363, + 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 538, 363, 366, 366, 366, 366, 366, ++ 363, 363, 363, 363, 363, 859, 363, 366, 366, 366, + 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 366, 366, 373, 373, 373, 373, 373, 373, 373, +- 373, 373, 373, 373, 373, 373, 373, 373, 373, 539, + +- 373, 376, 376, 376, 376, 376, 376, 376, 376, 376, +- 376, 376, 376, 376, 376, 376, 376, 376, 376, 382, +- 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, +- 382, 382, 382, 382, 382, 382, 382, 639, 639, 639, ++ 366, 366, 366, 366, 366, 373, 373, 373, 373, 373, ++ 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, ++ 373, 355, 373, 376, 376, 376, 376, 376, 376, 376, ++ 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, ++ 376, 382, 382, 382, 382, 382, 382, 382, 382, 382, ++ 382, 382, 382, 382, 382, 382, 382, 382, 382, 639, + 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 639, 639, 387, 387, 387, 387, 387, ++ 639, 639, 639, 639, 639, 639, 639, 387, 387, 387, + 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, +- 387, 387, 387, 644, 531, 644, 644, 532, 514, 644, +- 644, 644, 644, 644, 515, 644, 644, 644, 644, 644, +- 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, ++ 387, 387, 387, 387, 387, 644, 774, 644, 644, 538, + +- 391, 391, 391, 391, 391, 391, 391, 391, 399, 399, ++ 539, 644, 644, 644, 644, 644, 531, 644, 644, 644, ++ 644, 644, 391, 391, 391, 391, 391, 391, 391, 391, ++ 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, + 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- 399, 399, 399, 399, 508, 399, 652, 652, 652, 652, ++ 399, 399, 399, 399, 399, 399, 532, 399, 652, 652, + 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, +- 652, 652, 652, 652, 402, 402, 402, 402, 402, 402, ++ 652, 652, 652, 652, 652, 652, 402, 402, 402, 402, + 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 659, 659, 659, 659, 659, 659, 659, 659, ++ 402, 402, 402, 402, 659, 659, 659, 659, 659, 659, + 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, +- 661, 753, 661, 661, 739, 479, 661, 661, 661, 661, +- 661, 735, 661, 661, 661, 661, 661, 411, 411, 411, + ++ 659, 659, 661, 514, 661, 661, 515, 508, 661, 661, ++ 661, 661, 661, 753, 661, 661, 661, 661, 661, 411, + 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 411, 411, 418, 418, 418, 418, 418, ++ 411, 411, 411, 411, 411, 411, 411, 418, 418, 418, + 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, +- 418, 696, 418, 421, 421, 421, 421, 421, 421, 421, ++ 418, 418, 418, 739, 418, 421, 421, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 505, 505, 505, 505, 505, 505, 505, 505, 511, +- 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 511, 511, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, ++ 421, 421, 421, 505, 505, 505, 505, 505, 505, 505, ++ 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, ++ 505, 511, 511, 511, 511, 511, 511, 511, 511, 511, + +- 516, 516, 516, 681, 516, 517, 517, 437, 517, 517, ++ 511, 511, 511, 511, 511, 511, 511, 511, 511, 516, ++ 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, ++ 516, 516, 516, 516, 516, 479, 516, 517, 517, 735, + 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, +- 517, 517, 517, 518, 518, 428, 518, 518, 518, 518, ++ 517, 517, 517, 517, 517, 518, 518, 696, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, +- 518, 519, 519, 414, 519, 519, 519, 519, 519, 519, +- 519, 519, 519, 519, 519, 519, 519, 519, 519, 528, +- 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 528, 528, 528, 528, 533, 533, 533, +- 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 417, 533, 535, 535, 535, 535, 535, ++ 518, 518, 518, 519, 519, 681, 519, 519, 519, 519, ++ 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, ++ 519, 528, 528, 528, 528, 528, 528, 528, 528, 528, ++ 528, 528, 528, 528, 528, 528, 528, 528, 528, 533, + ++ 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, ++ 533, 533, 533, 533, 533, 437, 533, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 540, 540, 540, 540, 540, 540, 540, +- 540, 540, 540, 540, 540, 540, 540, 540, 540, 395, +- 540, 266, 266, 398, 266, 266, 266, 266, 266, 266, +- 266, 266, 266, 266, 266, 266, 266, 266, 266, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 363, 363, 363, ++ 535, 535, 535, 535, 535, 540, 540, 540, 540, 540, ++ 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, ++ 540, 428, 540, 266, 266, 414, 266, 266, 266, 266, ++ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, ++ 266, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 363, + 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 363, 363, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, + +- 356, 356, 356, 373, 373, 373, 373, 373, 373, 373, ++ 363, 363, 363, 363, 363, 363, 363, 356, 356, 356, ++ 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 356, 356, 356, 356, 356, 373, 373, 373, 373, 373, + 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, +- 373, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 366, 366, 366, 366, 366, 366, 366, 366, 639, +- 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 639, 639, 639, 639, 869, 390, 869, +- 869, 385, 369, 869, 869, 869, 869, 869, 372, 869, +- 869, 869, 869, 869, 869, 872, 359, 872, 872, 362, +- 351, 872, 872, 872, 872, 872, 592, 872, 872, 872, +- 872, 872, 872, 387, 387, 387, 387, 387, 387, 387, ++ 373, 373, 373, 366, 366, 366, 366, 366, 366, 366, ++ 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, ++ 366, 639, 639, 639, 639, 639, 639, 639, 639, 639, ++ 639, 639, 639, 639, 639, 639, 639, 639, 639, 869, ++ 417, 869, 869, 395, 398, 869, 869, 869, 869, 869, ++ 390, 869, 869, 869, 869, 869, 869, 872, 385, 872, + ++ 872, 369, 372, 872, 872, 872, 872, 872, 359, 872, ++ 872, 872, 872, 872, 872, 387, 387, 387, 387, 387, + 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, +- 387, 644, 591, 644, 644, 558, 541, 644, 644, 644, +- 644, 644, 539, 644, 644, 644, 644, 644, 399, 399, ++ 387, 387, 387, 644, 362, 644, 644, 351, 592, 644, ++ 644, 644, 644, 644, 591, 644, 644, 644, 644, 644, + 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- 399, 399, 399, 399, 399, 399, 391, 391, 391, 391, ++ 399, 399, 399, 399, 399, 399, 399, 399, 391, 391, + 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, +- 391, 391, 391, 391, 652, 652, 652, 652, 652, 652, ++ 391, 391, 391, 391, 391, 391, 652, 652, 652, 652, + 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, +- 652, 652, 885, 885, 885, 885, 885, 885, 885, 885, +- 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, + +- 887, 539, 887, 887, 532, 515, 887, 887, 887, 887, +- 887, 508, 887, 887, 887, 887, 887, 887, 657, 657, ++ 652, 652, 652, 652, 885, 885, 885, 885, 885, 885, ++ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 885, 885, 887, 558, 887, 887, 541, 539, 887, 887, ++ 887, 887, 887, 539, 887, 887, 887, 887, 887, 887, + 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, +- 657, 657, 657, 657, 657, 657, 402, 402, 402, 402, ++ 657, 657, 657, 657, 657, 657, 657, 657, 402, 402, + 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 402, 402, 661, 479, 661, 661, 437, 417, +- 661, 661, 661, 661, 661, 398, 661, 661, 661, 661, +- 661, 659, 659, 659, 659, 659, 659, 659, 659, 659, +- 659, 659, 659, 659, 659, 659, 659, 659, 659, 418, +- 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 402, 402, 402, 402, 402, 402, 661, 532, 661, 661, ++ 515, 508, 661, 661, 661, 661, 661, 479, 661, 661, ++ 661, 661, 661, 659, 659, 659, 659, 659, 659, 659, + +- 418, 418, 418, 418, 418, 418, 418, 411, 411, 411, ++ 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, ++ 659, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 418, 418, 418, 418, 418, 418, 418, 418, 418, 411, + 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 411, 411, 421, 421, 421, 421, 421, ++ 411, 411, 411, 411, 411, 411, 411, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 421, 421, 505, 505, 505, 505, 505, 505, 505, ++ 421, 421, 421, 421, 421, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 516, 516, 516, 516, 516, 516, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 516, 511, +- 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 511, 511, 533, 533, 533, ++ 505, 505, 505, 516, 516, 516, 516, 516, 516, 516, ++ 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, + ++ 516, 511, 511, 511, 511, 511, 511, 511, 511, 511, ++ 511, 511, 511, 511, 511, 511, 511, 511, 511, 533, + 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 533, 533, 528, 528, 528, 528, 528, ++ 533, 533, 533, 533, 533, 533, 533, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 540, 540, 540, 540, 540, 540, 540, ++ 528, 528, 528, 528, 528, 540, 540, 540, 540, 540, + 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, +- 540, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 535, 535, 535, 535, 535, 535, 266, +- 266, 398, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 266, 266, 266, 266, 266, 266, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 540, 540, 540, 535, 535, 535, 535, 535, 535, 535, ++ 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, ++ 535, 266, 266, 437, 266, 266, 266, 266, 266, 266, + +- 346, 346, 346, 346, 346, 356, 356, 356, 356, 356, ++ 266, 266, 266, 266, 266, 266, 266, 266, 266, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 356, 356, 356, + 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 366, 366, 366, 366, 366, 366, 366, ++ 356, 356, 356, 356, 356, 366, 366, 366, 366, 366, + 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 639, 639, 639, 639, 639, 639, 869, +- 385, 869, 869, 385, 385, 869, 869, 869, 869, 869, +- 372, 869, 869, 869, 869, 869, 869, 872, 372, 872, +- 872, 362, 351, 872, 872, 872, 872, 872, 317, 872, +- 872, 872, 872, 872, 872, 644, 3952, 644, 644, 250, ++ 366, 366, 366, 639, 639, 639, 639, 639, 639, 639, ++ 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, ++ 639, 869, 417, 869, 869, 398, 398, 869, 869, 869, ++ 869, 869, 385, 869, 869, 869, 869, 869, 869, 872, + +- 250, 644, 644, 644, 644, 644, 98, 644, 644, 644, +- 644, 644, 652, 652, 652, 652, 652, 652, 652, 652, ++ 385, 872, 872, 385, 372, 872, 872, 872, 872, 872, ++ 372, 872, 872, 872, 872, 872, 872, 644, 362, 644, ++ 644, 351, 317, 644, 644, 644, 644, 644, 3965, 644, ++ 644, 644, 644, 644, 652, 652, 652, 652, 652, 652, + 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, +- 887, 98, 887, 887, 98, 98, 887, 887, 887, 887, +- 887, 98, 887, 887, 887, 887, 887, 887, 657, 657, ++ 652, 652, 887, 250, 887, 887, 250, 98, 887, 887, ++ 887, 887, 887, 98, 887, 887, 887, 887, 887, 887, + 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, +- 657, 657, 657, 657, 657, 657, 891, 98, 891, 891, +- 98, 98, 891, 891, 891, 891, 891, 161, 891, 891, +- 891, 891, 891, 891, 885, 885, 885, 885, 885, 885, +- 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 657, 657, 657, 657, 657, 657, 657, 657, 891, 98, ++ 891, 891, 98, 98, 891, 891, 891, 891, 891, 98, + +- 885, 885, 888, 888, 888, 888, 888, 888, 888, 888, ++ 891, 891, 891, 891, 891, 891, 885, 885, 885, 885, ++ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 885, 885, 885, 885, 888, 888, 888, 888, 888, 888, + 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, +- 661, 161, 661, 661, 160, 160, 661, 661, 661, 661, +- 661, 3952, 661, 661, 661, 661, 661, 402, 402, 402, ++ 888, 888, 661, 98, 661, 661, 98, 161, 661, 661, ++ 661, 661, 661, 161, 661, 661, 661, 661, 661, 402, + 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 402, 402, 402, 411, 411, 411, 411, 411, ++ 402, 402, 402, 402, 402, 402, 402, 411, 411, 411, + 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 421, 421, 421, 421, 421, 421, 421, +- 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, ++ 411, 411, 411, 411, 411, 421, 421, 421, 421, 421, + +- 3952, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 505, +- 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 505, 505, 505, 505, 505, 505, 511, 511, 511, ++ 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, ++ 421, 421, 421, 1157, 1157, 1157, 1157, 1157, 1157, 1157, ++ 1157, 1157, 160, 1157, 1157, 1157, 1157, 1157, 1157, 1157, ++ 1157, 505, 505, 505, 505, 505, 505, 505, 505, 505, ++ 505, 505, 505, 505, 505, 505, 505, 505, 505, 511, + 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 528, 528, 528, 528, 528, ++ 511, 511, 511, 511, 511, 511, 511, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 535, 535, 535, 535, 535, 535, 535, ++ 528, 528, 528, 528, 528, 535, 535, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 266, 266, 3952, 266, 266, 266, 266, 266, 266, +- 266, 266, 266, 266, 266, 266, 266, 266, 266, 363, + +- 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 363, 363, 363, 363, 373, 373, 373, ++ 535, 535, 535, 266, 266, 160, 266, 266, 266, 266, ++ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, ++ 266, 363, 363, 363, 363, 363, 363, 363, 363, 363, ++ 363, 363, 363, 363, 363, 363, 363, 363, 363, 373, + 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, +- 373, 373, 373, 373, 373, 639, 639, 639, 639, 639, ++ 373, 373, 373, 373, 373, 373, 373, 639, 639, 639, + 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 869, 3952, 869, 869, 3952, 3952, 869, +- 869, 869, 869, 869, 3952, 869, 869, 869, 869, 869, +- 869, 872, 3952, 872, 872, 3952, 3952, 872, 872, 872, +- 872, 872, 3952, 872, 872, 872, 872, 872, 872, 399, +- 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- +- 399, 399, 399, 399, 399, 399, 399, 887, 3952, 887, +- 887, 3952, 3952, 887, 887, 887, 887, 887, 3952, 887, +- 887, 887, 887, 887, 887, 888, 888, 888, 888, 888, ++ 639, 639, 639, 639, 639, 869, 3965, 869, 869, 3965, ++ 3965, 869, 869, 869, 869, 869, 3965, 869, 869, 869, ++ 869, 869, 869, 872, 3965, 872, 872, 3965, 3965, 872, ++ ++ 872, 872, 872, 872, 3965, 872, 872, 872, 872, 872, ++ 872, 399, 399, 399, 399, 399, 399, 399, 399, 399, ++ 399, 399, 399, 399, 399, 399, 399, 399, 399, 887, ++ 3965, 887, 887, 3965, 3965, 887, 887, 887, 887, 887, ++ 3965, 887, 887, 887, 887, 887, 887, 888, 888, 888, + 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, +- 888, 888, 888, 661, 3952, 661, 661, 3952, 3952, 661, +- 661, 661, 661, 661, 661, 661, 661, 661, 661, 661, ++ 888, 888, 888, 888, 888, 661, 3965, 661, 661, 3965, ++ 3965, 661, 661, 661, 661, 661, 661, 661, 661, 661, ++ 661, 661, 659, 659, 659, 659, 659, 659, 659, 659, + 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, +- 659, 659, 659, 659, 659, 659, 659, 659, 418, 418, +- 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, +- 418, 418, 418, 418, 418, 418, 1346, 3952, 1346, 1346, + +- 3952, 3952, 1346, 1346, 1346, 3952, 1346, 1346, 1346, 1346, +- 1346, 1346, 1346, 1346, 1359, 1359, 1359, 1359, 1359, 1359, +- 1359, 3952, 1359, 3952, 1359, 1359, 1359, 1359, 1359, 1359, +- 1359, 1359, 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, ++ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 418, 418, 418, 418, 418, 418, 418, 418, 1346, 3965, ++ 1346, 1346, 3965, 3965, 1346, 1346, 1346, 3965, 1346, 1346, ++ 1346, 1346, 1346, 1346, 1346, 1346, 1359, 1359, 1359, 1359, ++ 1359, 1359, 1359, 3965, 1359, 3965, 1359, 1359, 1359, 1359, ++ 1359, 1359, 1359, 1359, 1393, 1393, 1393, 1393, 1393, 1393, + 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, ++ 1393, 1393, 516, 516, 516, 516, 516, 516, 516, 516, + 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 533, 533, + 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 533, 533, 533, 540, 540, 540, 540, +- 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, + +- 540, 540, 540, 540, 266, 266, 3952, 266, 266, 266, ++ 533, 533, 533, 533, 533, 533, 533, 533, 540, 540, ++ 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, ++ 540, 540, 540, 540, 540, 540, 266, 266, 3965, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 266, 885, 885, 885, 885, 885, 885, 885, 885, ++ 266, 266, 266, 266, 885, 885, 885, 885, 885, 885, + 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 885, 885, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, + 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, +- 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1534, 3952, +- 3952, 1534, 3952, 3952, 1534, 1575, 3952, 3952, 3952, 3952, +- 3952, 1575, 1575, 1575, 3952, 1575, 1575, 1575, 1575, 1575, +- 1575, 1575, 1575, 1524, 1524, 1524, 1524, 1524, 1524, 1524, +- 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, ++ 1534, 3965, 3965, 1534, 3965, 3965, 1534, 1575, 3965, 3965, ++ 3965, 3965, 3965, 1575, 1575, 1575, 3965, 1575, 1575, 1575, + +- 1524, 1722, 3952, 3952, 1722, 3952, 1722, 1760, 1760, 1760, ++ 1575, 1575, 1575, 1575, 1575, 1524, 1524, 1524, 1524, 1524, ++ 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, ++ 1524, 1524, 1524, 1722, 3965, 3965, 1722, 3965, 1722, 1760, + 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, +- 1760, 1760, 1760, 1760, 1760, 1765, 3952, 3952, 1765, 1765, +- 3952, 3952, 1765, 3952, 1765, 3952, 1765, 1765, 1765, 1765, +- 1901, 1901, 1901, 1901, 1946, 1946, 3952, 1946, 1946, 1946, ++ 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1765, 3965, 3965, ++ 1765, 1765, 3965, 3965, 1765, 3965, 1765, 3965, 1765, 1765, ++ 1765, 1765, 1901, 1901, 1901, 1901, 1946, 1946, 3965, 1946, + 1946, 1946, 1946, 1946, 1946, 1946, 1946, 1946, 1946, 1946, +- 1946, 1946, 1948, 1948, 3952, 1948, 1948, 1948, 1948, 1948, ++ 1946, 1946, 1946, 1946, 1948, 1948, 3965, 1948, 1948, 1948, + 1948, 1948, 1948, 1948, 1948, 1948, 1948, 1948, 1948, 1948, +- 1952, 3952, 1952, 3952, 1952, 1952, 1952, 1952, 2074, 2074, +- 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, + +- 2074, 2074, 2074, 2074, 2074, 2074, 2089, 2089, 2089, 2089, ++ 1948, 1948, 1952, 3965, 1952, 3965, 1952, 1952, 1952, 1952, ++ 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, ++ 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2089, 2089, + 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, +- 2089, 2089, 2089, 2089, 2142, 2142, 2142, 2142, 2142, 2142, ++ 2089, 2089, 2089, 2089, 2089, 2089, 2142, 2142, 2142, 2142, + 2142, 2142, 2142, 2142, 2142, 2142, 2142, 2142, 2142, 2142, +- 2142, 2142, 2178, 2178, 3952, 3952, 2178, 2178, 2178, 2178, +- 2178, 3952, 2178, 2178, 2178, 2178, 2178, 2178, 2178, 2178, +- 2196, 3952, 3952, 2196, 2196, 3952, 3952, 2196, 3952, 2196, +- 3952, 2196, 2196, 2196, 2196, 2283, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2296, 3952, 2296, 2296, 3952, 3952, 2296, +- +- 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, +- 2296, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2332, +- 3952, 3952, 3952, 3952, 3952, 2332, 2332, 2332, 3952, 2332, +- 2332, 2332, 2332, 2332, 2332, 2332, 2332, 2358, 2358, 3952, +- 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, +- 2358, 2358, 2358, 2358, 2358, 2360, 2360, 3952, 2360, 2360, +- 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, +- 2360, 2360, 2360, 2386, 3952, 3952, 2386, 2386, 3952, 3952, +- 2386, 3952, 2386, 3952, 2386, 2386, 2386, 2386, 2399, 3952, +- +- 3952, 3952, 3952, 3952, 2399, 2399, 2399, 3952, 2399, 2399, +- 2399, 2399, 2399, 2399, 2399, 2399, 2410, 2410, 3952, 2410, +- 2410, 3952, 2410, 2410, 2410, 2410, 2410, 2410, 2410, 2410, +- 2410, 2410, 2410, 2415, 3952, 2415, 3952, 2415, 2415, 2415, +- 2415, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2298, +- 3952, 2298, 2298, 3952, 3952, 2298, 2298, 2298, 2298, 2298, +- 2298, 2298, 2298, 2298, 2298, 2298, 2298, 2560, 2560, 2560, +- 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, +- 2560, 2560, 2560, 2560, 2560, 2563, 2563, 2563, 2563, 2563, +- +- 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, +- 2563, 2563, 2563, 2571, 3952, 3952, 2571, 2571, 3952, 3952, +- 2571, 3952, 2571, 3952, 2571, 2571, 2571, 2571, 2590, 3952, +- 2590, 3952, 2590, 2590, 2590, 2590, 2592, 3952, 3952, 2592, +- 2592, 3952, 3952, 2592, 3952, 2592, 3952, 2592, 2592, 2592, +- 2592, 2624, 2624, 3952, 2624, 2624, 2624, 2624, 2624, 2624, +- 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2691, 3952, +- 2691, 2691, 3952, 3952, 2691, 2691, 2691, 2691, 2691, 2691, +- 2691, 2691, 2691, 2691, 2691, 2691, 2502, 2502, 2502, 2502, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- +- 2502, 2502, 2502, 2502, 2504, 2504, 2504, 2504, 2504, 2504, ++ 2142, 2142, 2142, 2142, 2178, 2178, 3965, 3965, 2178, 2178, ++ 2178, 2178, 2178, 3965, 2178, 2178, 2178, 2178, 2178, 2178, ++ 2178, 2178, 2196, 3965, 3965, 2196, 2196, 3965, 3965, 2196, ++ 3965, 2196, 3965, 2196, 2196, 2196, 2196, 2284, 2284, 2284, ++ ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2297, 3965, 2297, 2297, 3965, ++ 3965, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, ++ 2297, 2297, 2297, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2333, 3965, 3965, 3965, 3965, 3965, 2333, 2333, 2333, ++ 3965, 2333, 2333, 2333, 2333, 2333, 2333, 2333, 2333, 2359, ++ 2359, 3965, 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, ++ 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2361, 2361, 3965, ++ 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, ++ ++ 2361, 2361, 2361, 2361, 2361, 2387, 3965, 3965, 2387, 2387, ++ 3965, 3965, 2387, 3965, 2387, 3965, 2387, 2387, 2387, 2387, ++ 2400, 3965, 3965, 3965, 3965, 3965, 2400, 2400, 2400, 3965, ++ 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2411, 2411, ++ 3965, 2411, 2411, 3965, 2411, 2411, 2411, 2411, 2411, 2411, ++ 2411, 2411, 2411, 2411, 2411, 2416, 3965, 2416, 3965, 2416, ++ 2416, 2416, 2416, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2299, 3965, 2299, 2299, 3965, 3965, 2299, 2299, 2299, ++ 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2562, ++ ++ 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, ++ 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2565, 2565, 2565, ++ 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, ++ 2565, 2565, 2565, 2565, 2565, 2573, 3965, 3965, 2573, 2573, ++ 3965, 3965, 2573, 3965, 2573, 3965, 2573, 2573, 2573, 2573, ++ 2592, 3965, 2592, 3965, 2592, 2592, 2592, 2592, 2594, 3965, ++ 3965, 2594, 2594, 3965, 3965, 2594, 3965, 2594, 3965, 2594, ++ 2594, 2594, 2594, 2626, 2626, 3965, 2626, 2626, 2626, 2626, ++ 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, ++ 2694, 3965, 2694, 2694, 3965, 3965, 2694, 2694, 2694, 2694, ++ ++ 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2504, 2504, + 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, +- 2504, 2504, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2706, 3952, 2706, 2706, 3952, 3952, 2706, 2706, 2706, 2706, +- 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2089, 2089, 2089, 2089, ++ 2504, 2504, 2504, 2504, 2504, 2504, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2709, 3965, 2709, 2709, 3965, 3965, 2709, 2709, ++ 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2089, 2089, ++ + 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, +- 2089, 2089, 2089, 2089, 2358, 2358, 3952, 2358, 2358, 2358, +- +- 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, +- 2358, 2358, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, +- 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, +- 2360, 2360, 3952, 2360, 2360, 2360, 2360, 2360, 2360, 2360, +- 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2563, 2563, +- 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, +- 2563, 2563, 2563, 2563, 2563, 2563, 2755, 3952, 2755, 3952, +- 2755, 2755, 2755, 2755, 2571, 3952, 2571, 3952, 2571, 2571, +- 2571, 2571, 2756, 3952, 3952, 2756, 3952, 3952, 3952, 2756, +- 3952, 2756, 3952, 2756, 2756, 2756, 2756, 2766, 3952, 3952, +- +- 2766, 2766, 3952, 3952, 2766, 3952, 2766, 3952, 2766, 2766, +- 2766, 2766, 2590, 3952, 3952, 2590, 3952, 2590, 3952, 2590, +- 2590, 2590, 2590, 2775, 3952, 2775, 3952, 2775, 2775, 2775, +- 2775, 2592, 3952, 2592, 3952, 2592, 2592, 2592, 2592, 2784, +- 2784, 3952, 2784, 2784, 3952, 2784, 2784, 2784, 2784, 2784, +- 2784, 2784, 2784, 2784, 2784, 2784, 2804, 3952, 3952, 2804, +- 2804, 3952, 3952, 2804, 3952, 2804, 3952, 2804, 2804, 2804, +- 2804, 2624, 2624, 3952, 2624, 2624, 3952, 2624, 2624, 2624, +- 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2808, 2808, +- 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, +- +- 2808, 2808, 2808, 2808, 2808, 2808, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2283, 2074, 2074, 2074, 2074, 2074, 2074, ++ 2089, 2089, 2089, 2089, 2089, 2089, 2359, 2359, 3965, 2359, ++ 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, ++ 2359, 2359, 2359, 2359, 2562, 2562, 2562, 2562, 2562, 2562, ++ 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, ++ 2562, 2562, 2361, 2361, 3965, 2361, 2361, 2361, 2361, 2361, ++ 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, ++ 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, ++ 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2758, 3965, ++ 2758, 3965, 2758, 2758, 2758, 2758, 2573, 3965, 2573, 3965, ++ ++ 2573, 2573, 2573, 2573, 2759, 3965, 3965, 2759, 3965, 3965, ++ 3965, 2759, 3965, 2759, 3965, 2759, 2759, 2759, 2759, 2769, ++ 3965, 3965, 2769, 2769, 3965, 3965, 2769, 3965, 2769, 3965, ++ 2769, 2769, 2769, 2769, 2592, 3965, 3965, 2592, 3965, 2592, ++ 3965, 2592, 2592, 2592, 2592, 2778, 3965, 2778, 3965, 2778, ++ 2778, 2778, 2778, 2594, 3965, 2594, 3965, 2594, 2594, 2594, ++ 2594, 2787, 2787, 3965, 2787, 2787, 3965, 2787, 2787, 2787, ++ 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2807, 3965, ++ 3965, 2807, 2807, 3965, 3965, 2807, 3965, 2807, 3965, 2807, ++ 2807, 2807, 2807, 2626, 2626, 3965, 2626, 2626, 3965, 2626, ++ ++ 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, ++ 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, ++ 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2074, 2074, 2074, 2074, + 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, +- 2074, 2074, 2691, 3952, 2691, 2691, 3952, 3952, 2691, 2691, +- 2691, 2691, 2691, 2691, 2691, 2691, 2691, 2691, 2691, 2691, +- 2296, 3952, 2296, 2296, 3952, 3952, 2296, 2296, 2296, 2296, +- 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2868, 2868, +- 2868, 2868, 2868, 2868, 2868, 2868, 2868, 2868, 2868, 2868, +- 2868, 2868, 2868, 2868, 2868, 2868, 2501, 2501, 2501, 2501, +- +- 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2501, 2501, 2501, 2501, 2869, 2869, 2869, 2869, 2869, 2869, +- 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, +- 2869, 2869, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- 2298, 3952, 2298, 2298, 3952, 3952, 2298, 2298, 2298, 2298, +- 2298, 2298, 2298, 2298, 2298, 2298, 2298, 2298, 2882, 2882, +- 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, +- 2882, 2882, 2882, 2882, 2882, 2882, 2504, 2504, 2504, 2504, ++ 2074, 2074, 2074, 2074, 2694, 3965, 2694, 2694, 3965, 3965, ++ 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, ++ 2694, 2694, 2297, 3965, 2297, 2297, 3965, 3965, 2297, 2297, ++ 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, ++ ++ 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, ++ 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2873, 2873, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2504, 2504, 2504, 2504, 2504, 2504, + 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, +- +- 2504, 2504, 2504, 2504, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2706, 3952, 2706, 2706, 3952, 3952, 2706, 2706, +- 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2089, 2089, ++ 2504, 2504, 2299, 3965, 2299, 2299, 3965, 3965, 2299, 2299, ++ 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, ++ 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, ++ ++ 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2709, 3965, 2709, 2709, 3965, 3965, ++ 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, ++ 2709, 2709, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, + 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, +- 2089, 2089, 2089, 2089, 2089, 2089, 2755, 3952, 3952, 2755, +- 3952, 2755, 3952, 2755, 2755, 2755, 2755, 2756, 3952, 2756, +- 3952, 2756, 2756, 2756, 2756, 2942, 3952, 2942, 3952, 2942, +- +- 2942, 2942, 2942, 2766, 3952, 2766, 3952, 2766, 2766, 2766, +- 2766, 2775, 3952, 3952, 2775, 3952, 2775, 3952, 2775, 2775, +- 2775, 2775, 2784, 2784, 3952, 2784, 2784, 3952, 2784, 2784, +- 2784, 2784, 2784, 2784, 2784, 2784, 2784, 2784, 2784, 2972, +- 3952, 3952, 2972, 2972, 3952, 3952, 2972, 3952, 2972, 3952, +- 2972, 2972, 2972, 2972, 2981, 3952, 2981, 3952, 2981, 2981, +- 2981, 2981, 2804, 3952, 2804, 3952, 2804, 2804, 2804, 2804, +- 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, +- 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2283, 2283, +- 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, +- +- 2283, 2283, 2283, 2283, 2283, 2283, 2869, 2869, 2869, 2869, +- 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, +- 2869, 2869, 2869, 2869, 2871, 2871, 2871, 2871, 2871, 2871, +- 2871, 2871, 2871, 2871, 2871, 2871, 2871, 2871, 2871, 2871, +- 2871, 2871, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2298, 3952, +- 2298, 2298, 3952, 3952, 2298, 2298, 2298, 2298, 2298, 2298, +- 2298, 2298, 2298, 2298, 2298, 2298, 2882, 2882, 2882, 2882, +- +- 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, +- 2882, 2882, 2882, 2882, 2504, 2504, 2504, 2504, 2504, 2504, ++ 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2758, 3965, ++ ++ 3965, 2758, 3965, 2758, 3965, 2758, 2758, 2758, 2758, 2759, ++ 3965, 2759, 3965, 2759, 2759, 2759, 2759, 2946, 3965, 2946, ++ 3965, 2946, 2946, 2946, 2946, 2769, 3965, 2769, 3965, 2769, ++ 2769, 2769, 2769, 2778, 3965, 3965, 2778, 3965, 2778, 3965, ++ 2778, 2778, 2778, 2778, 2787, 2787, 3965, 2787, 2787, 3965, ++ 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, ++ 2787, 2976, 3965, 3965, 2976, 2976, 3965, 3965, 2976, 3965, ++ 2976, 3965, 2976, 2976, 2976, 2976, 2985, 3965, 2985, 3965, ++ 2985, 2985, 2985, 2985, 2807, 3965, 2807, 3965, 2807, 2807, ++ 2807, 2807, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, ++ ++ 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2873, 2873, 2875, 2875, 2875, 2875, ++ 2875, 2875, 2875, 2875, 2875, 2875, 2875, 2875, 2875, 2875, ++ 2875, 2875, 2875, 2875, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, + 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, +- 2504, 2504, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 3112, 3112, +- 3952, 3112, 3112, 3952, 3112, 3112, 3112, 3112, 3112, 3112, +- 3112, 3112, 3112, 3112, 3112, 3115, 3952, 3952, 3115, 3115, +- 3952, 3952, 3115, 3952, 3115, 3952, 3115, 3115, 3115, 3115, +- +- 3118, 3118, 3118, 3118, 3952, 3118, 3118, 3118, 3118, 3118, +- 3118, 3118, 3118, 3118, 3118, 3118, 3118, 3118, 3133, 3952, +- 3952, 3952, 3952, 3952, 3133, 3133, 3133, 3952, 3133, 3133, +- 3133, 3133, 3133, 3133, 3133, 3133, 3209, 3209, 3209, 3209, +- 3209, 3209, 3209, 3209, 3209, 3209, 3209, 3209, 3209, 3209, +- 3209, 3209, 3209, 3209, 3252, 3952, 3252, 3952, 3252, 3252, +- 3252, 3252, 3274, 3274, 3952, 3274, 3274, 3952, 3274, 3274, +- 3274, 3274, 3274, 3274, 3274, 3274, 3274, 3274, 3274, 3356, +- 3952, 3952, 3356, 3356, 3952, 3952, 3952, 3952, 3952, 3952, +- 3356, 3372, 3372, 3952, 3952, 3952, 3372, 3372, 3372, 3372, +- +- 3372, 3372, 3372, 3372, 3372, 3372, 3372, 3372, 3372, 3478, +- 3478, 3952, 3478, 3478, 3952, 3478, 3478, 3478, 3478, 3478, +- 3478, 3478, 3478, 3478, 3478, 3478, 3488, 3488, 3952, 3488, +- 3488, 3952, 3488, 3488, 3488, 3488, 3488, 3488, 3488, 3488, +- 3488, 3488, 3488, 3563, 3563, 3952, 3563, 3563, 3563, 3563, +- 3563, 3563, 3563, 3563, 3563, 3563, 3563, 3563, 3563, 3563, +- 3566, 3566, 3952, 3566, 3566, 3566, 3566, 3566, 3566, 3566, +- 3566, 3566, 3566, 3566, 3566, 3566, 3566, 3610, 3952, 3610, +- 3952, 3610, 3952, 3610, 3610, 3610, 3610, 3641, 3641, 3952, +- 3641, 3641, 3952, 3641, 3641, 3641, 3641, 3641, 3641, 3641, +- +- 3641, 3641, 3641, 3641, 3642, 3642, 3952, 3642, 3642, 3952, +- 3642, 3642, 3642, 3642, 3642, 3642, 3642, 3642, 3642, 3642, +- 3642, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, +- 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3679, +- 3952, 3679, 3952, 3679, 3952, 3679, 3679, 3679, 3679, 3683, +- 3683, 3952, 3683, 3683, 3683, 3683, 3683, 3683, 3683, 3683, +- 3683, 3683, 3683, 3683, 3683, 3683, 3683, 3694, 3694, 3952, +- 3694, 3694, 3952, 3694, 3694, 3694, 3694, 3694, 3694, 3694, +- 3694, 3694, 3694, 3694, 3696, 3696, 3952, 3952, 3696, 3696, +- 3696, 3696, 3696, 3952, 3696, 3696, 3696, 3696, 3696, 3696, +- +- 3696, 3696, 3685, 3685, 3952, 3685, 3685, 3952, 3685, 3685, +- 3685, 3685, 3685, 3685, 3685, 3685, 3685, 3685, 3685, 3745, +- 3952, 3952, 3952, 3952, 3952, 3745, 3745, 3745, 3952, 3745, +- 3745, 3745, 3745, 3745, 3745, 3745, 3745, 3687, 3952, 3952, +- 3952, 3952, 3952, 3687, 3687, 3687, 3952, 3687, 3687, 3687, +- 3687, 3687, 3687, 3687, 3687, 3748, 3952, 3952, 3748, 3748, +- 3952, 3952, 3748, 3952, 3748, 3952, 3748, 3748, 3748, 3748, +- 3751, 3751, 3952, 3751, 3751, 3952, 3751, 3751, 3751, 3751, +- 3751, 3751, 3751, 3751, 3751, 3751, 3751, 3752, 3952, 3952, +- 3952, 3952, 3952, 3752, 3752, 3752, 3952, 3752, 3752, 3752, +- +- 3752, 3752, 3752, 3752, 3752, 3789, 3952, 3789, 3952, 3789, +- 3789, 3789, 3789, 3790, 3790, 3952, 3790, 3790, 3952, 3790, +- 3790, 3790, 3790, 3790, 3790, 3790, 3790, 3790, 3790, 3790, +- 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, +- 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3837, 3837, +- 3952, 3837, 3837, 3952, 3837, 3837, 3837, 3837, 3837, 3837, +- 3837, 3837, 3837, 3837, 3837, 3840, 3840, 3952, 3952, 3840, +- 3840, 3840, 3840, 3840, 3952, 3840, 3840, 3840, 3840, 3840, +- 3840, 3840, 3840, 3842, 3842, 3952, 3952, 3842, 3842, 3842, +- 3842, 3842, 3952, 3842, 3842, 3842, 3842, 3842, 3842, 3842, +- +- 3842, 3870, 3870, 3952, 3870, 3870, 3952, 3870, 3870, 3870, +- 3870, 3870, 3870, 3870, 3870, 3870, 3870, 3870, 3871, 3871, +- 3952, 3871, 3871, 3952, 3871, 3871, 3871, 3871, 3871, 3871, +- 3871, 3871, 3871, 3871, 3871, 3872, 3872, 3952, 3952, 3872, +- 3872, 3872, 3872, 3872, 3952, 3872, 3872, 3872, 3872, 3872, +- 3872, 3872, 3872, 3874, 3874, 3952, 3952, 3874, 3874, 3874, +- 3874, 3874, 3952, 3874, 3874, 3874, 3874, 3874, 3874, 3874, +- 3874, 3888, 3952, 3888, 3952, 3888, 3952, 3888, 3888, 3888, +- 3888, 3890, 3890, 3952, 3890, 3890, 3890, 3890, 3890, 3890, +- 3890, 3890, 3890, 3890, 3890, 3890, 3890, 3890, 3901, 3901, +- +- 3952, 3901, 3901, 3952, 3901, 3901, 3901, 3901, 3901, 3901, +- 3901, 3901, 3901, 3901, 3901, 3902, 3902, 3952, 3902, 3902, +- 3952, 3902, 3902, 3902, 3902, 3902, 3902, 3902, 3902, 3902, +- 3902, 3902, 3914, 3952, 3914, 3952, 3914, 3952, 3914, 3914, +- 3914, 3914, 3915, 3952, 3952, 3952, 3952, 3952, 3915, 3915, +- 3915, 3952, 3915, 3915, 3915, 3915, 3915, 3915, 3915, 3915, +- 75, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952 ++ ++ 2299, 3965, 2299, 2299, 3965, 3965, 2299, 2299, 2299, 2299, ++ 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2886, 2886, ++ 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, ++ 2886, 2886, 2886, 2886, 2886, 2886, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 3117, 3117, 3965, 3117, 3117, 3965, 3117, 3117, 3117, 3117, ++ ++ 3117, 3117, 3117, 3117, 3117, 3117, 3117, 3120, 3965, 3965, ++ 3120, 3120, 3965, 3965, 3120, 3965, 3120, 3965, 3120, 3120, ++ 3120, 3120, 3123, 3123, 3123, 3123, 3965, 3123, 3123, 3123, ++ 3123, 3123, 3123, 3123, 3123, 3123, 3123, 3123, 3123, 3123, ++ 3138, 3965, 3965, 3965, 3965, 3965, 3138, 3138, 3138, 3965, ++ 3138, 3138, 3138, 3138, 3138, 3138, 3138, 3138, 3215, 3215, ++ 3215, 3215, 3215, 3215, 3215, 3215, 3215, 3215, 3215, 3215, ++ 3215, 3215, 3215, 3215, 3215, 3215, 3258, 3965, 3258, 3965, ++ 3258, 3258, 3258, 3258, 3280, 3280, 3965, 3280, 3280, 3965, ++ 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, ++ ++ 3280, 3363, 3965, 3965, 3363, 3363, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3363, 3379, 3379, 3965, 3965, 3965, 3379, 3379, ++ 3379, 3379, 3379, 3379, 3379, 3379, 3379, 3379, 3379, 3379, ++ 3379, 3486, 3486, 3965, 3486, 3486, 3965, 3486, 3486, 3486, ++ 3486, 3486, 3486, 3486, 3486, 3486, 3486, 3486, 3496, 3496, ++ 3965, 3496, 3496, 3965, 3496, 3496, 3496, 3496, 3496, 3496, ++ 3496, 3496, 3496, 3496, 3496, 3572, 3572, 3965, 3572, 3572, ++ 3572, 3572, 3572, 3572, 3572, 3572, 3572, 3572, 3572, 3572, ++ 3572, 3572, 3575, 3575, 3965, 3575, 3575, 3575, 3575, 3575, ++ 3575, 3575, 3575, 3575, 3575, 3575, 3575, 3575, 3575, 3620, ++ ++ 3965, 3620, 3965, 3620, 3965, 3620, 3620, 3620, 3620, 3651, ++ 3651, 3965, 3651, 3651, 3965, 3651, 3651, 3651, 3651, 3651, ++ 3651, 3651, 3651, 3651, 3651, 3651, 3652, 3652, 3965, 3652, ++ 3652, 3965, 3652, 3652, 3652, 3652, 3652, 3652, 3652, 3652, ++ 3652, 3652, 3652, 3655, 3655, 3655, 3655, 3655, 3655, 3655, ++ 3655, 3655, 3655, 3655, 3655, 3655, 3655, 3655, 3655, 3655, ++ 3655, 3690, 3965, 3690, 3965, 3690, 3965, 3690, 3690, 3690, ++ 3690, 3694, 3694, 3965, 3694, 3694, 3694, 3694, 3694, 3694, ++ 3694, 3694, 3694, 3694, 3694, 3694, 3694, 3694, 3694, 3705, ++ 3705, 3965, 3705, 3705, 3965, 3705, 3705, 3705, 3705, 3705, ++ ++ 3705, 3705, 3705, 3705, 3705, 3705, 3707, 3707, 3965, 3965, ++ 3707, 3707, 3707, 3707, 3707, 3965, 3707, 3707, 3707, 3707, ++ 3707, 3707, 3707, 3707, 3696, 3696, 3965, 3696, 3696, 3965, ++ 3696, 3696, 3696, 3696, 3696, 3696, 3696, 3696, 3696, 3696, ++ 3696, 3757, 3965, 3965, 3965, 3965, 3965, 3757, 3757, 3757, ++ 3965, 3757, 3757, 3757, 3757, 3757, 3757, 3757, 3757, 3698, ++ 3965, 3965, 3965, 3965, 3965, 3698, 3698, 3698, 3965, 3698, ++ 3698, 3698, 3698, 3698, 3698, 3698, 3698, 3760, 3965, 3965, ++ 3760, 3760, 3965, 3965, 3760, 3965, 3760, 3965, 3760, 3760, ++ 3760, 3760, 3763, 3763, 3965, 3763, 3763, 3965, 3763, 3763, ++ ++ 3763, 3763, 3763, 3763, 3763, 3763, 3763, 3763, 3763, 3764, ++ 3965, 3965, 3965, 3965, 3965, 3764, 3764, 3764, 3965, 3764, ++ 3764, 3764, 3764, 3764, 3764, 3764, 3764, 3802, 3965, 3802, ++ 3965, 3802, 3802, 3802, 3802, 3803, 3803, 3965, 3803, 3803, ++ 3965, 3803, 3803, 3803, 3803, 3803, 3803, 3803, 3803, 3803, ++ 3803, 3803, 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, ++ 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, ++ 3850, 3850, 3965, 3850, 3850, 3965, 3850, 3850, 3850, 3850, ++ 3850, 3850, 3850, 3850, 3850, 3850, 3850, 3853, 3853, 3965, ++ 3965, 3853, 3853, 3853, 3853, 3853, 3965, 3853, 3853, 3853, ++ ++ 3853, 3853, 3853, 3853, 3853, 3855, 3855, 3965, 3965, 3855, ++ 3855, 3855, 3855, 3855, 3965, 3855, 3855, 3855, 3855, 3855, ++ 3855, 3855, 3855, 3883, 3883, 3965, 3883, 3883, 3965, 3883, ++ 3883, 3883, 3883, 3883, 3883, 3883, 3883, 3883, 3883, 3883, ++ 3884, 3884, 3965, 3884, 3884, 3965, 3884, 3884, 3884, 3884, ++ 3884, 3884, 3884, 3884, 3884, 3884, 3884, 3885, 3885, 3965, ++ 3965, 3885, 3885, 3885, 3885, 3885, 3965, 3885, 3885, 3885, ++ 3885, 3885, 3885, 3885, 3885, 3887, 3887, 3965, 3965, 3887, ++ 3887, 3887, 3887, 3887, 3965, 3887, 3887, 3887, 3887, 3887, ++ 3887, 3887, 3887, 3901, 3965, 3901, 3965, 3901, 3965, 3901, ++ ++ 3901, 3901, 3901, 3903, 3903, 3965, 3903, 3903, 3903, 3903, ++ 3903, 3903, 3903, 3903, 3903, 3903, 3903, 3903, 3903, 3903, ++ 3914, 3914, 3965, 3914, 3914, 3965, 3914, 3914, 3914, 3914, ++ 3914, 3914, 3914, 3914, 3914, 3914, 3914, 3915, 3915, 3965, ++ 3915, 3915, 3965, 3915, 3915, 3915, 3915, 3915, 3915, 3915, ++ 3915, 3915, 3915, 3915, 3927, 3965, 3927, 3965, 3927, 3965, ++ 3927, 3927, 3927, 3927, 3928, 3965, 3965, 3965, 3965, 3965, ++ 3928, 3928, 3928, 3965, 3928, 3928, 3928, 3928, 3928, 3928, ++ 3928, 3928, 75, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965 + } ; + +-static const flex_int16_t yy_chk[14349] = ++static const flex_int16_t yy_chk[14371] = + { 0, + 0, 1, 1, 1, 1, 5, 1, 1, 5, 6, + 95, 95, 6, 0, 1, 7, 7, 7, 7, 7, + 7, 0, 9, 9, 7, 9, 9, 13, 7, 1191, +- 1, 13, 1, 1, 3928, 83, 13, 1, 1, 1, +- 116, 116, 14, 1, 1, 1, 14, 1, 1, 3915, ++ 1, 13, 1, 1, 3941, 83, 13, 1, 1, 1, ++ 116, 116, 14, 1, 1, 1, 14, 1, 1, 3928, + 9, 14, 1, 874, 15, 15, 1, 15, 1, 874, + 1, 1, 15, 83, 15, 1, 1, 1, 71, 84, + 7, 1, 1, 1, 1191, 1, 1, 9, 132, 132, +@@ -3462,10 +3467,10 @@ static const flex_int16_t yy_chk[14349] = + 72, 10, 10, 85, 2, 21, 21, 84, 21, 7, + + 7, 86, 11, 11, 49, 11, 11, 72, 49, 15, +- 2, 49, 2, 2, 87, 3902, 10, 2, 2, 2, ++ 2, 49, 2, 2, 87, 3915, 10, 2, 2, 2, + 88, 85, 774, 2, 2, 2, 89, 2, 2, 86, + 11, 92, 2, 250, 118, 250, 2, 118, 2, 774, +- 2, 2, 87, 10, 3901, 2, 2, 2, 88, 3890, ++ 2, 2, 87, 10, 3914, 2, 2, 2, 88, 3903, + 21, 2, 2, 2, 89, 2, 2, 11, 49, 92, + 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, +@@ -3478,8 +3483,8 @@ static const flex_int16_t yy_chk[14349] = + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 8, 8, + 8, 8, 8, 8, 93, 12, 12, 8, 12, 12, +- 3871, 8, 16, 16, 2296, 16, 17, 17, 3870, 17, +- 16, 17, 16, 47, 17, 47, 18, 18, 2296, 18, ++ 3884, 8, 16, 16, 2297, 16, 17, 17, 3883, 17, ++ 16, 17, 16, 47, 17, 47, 18, 18, 2297, 18, + 47, 18, 93, 12, 18, 19, 19, 137, 19, 137, + 19, 20, 20, 19, 20, 257, 20, 257, 19, 20, + +@@ -3487,12 +3492,12 @@ static const flex_int16_t yy_chk[14349] = + 12, 220, 81, 297, 90, 33, 33, 16, 33, 100, + 33, 17, 90, 33, 297, 27, 27, 47, 27, 94, + 27, 18, 8, 8, 137, 27, 35, 35, 27, 35, +- 19, 27, 90, 3860, 35, 91, 20, 100, 28, 28, ++ 19, 27, 90, 3873, 35, 91, 20, 100, 28, 28, + 90, 28, 27, 28, 48, 101, 81, 139, 28, 139, + 22, 28, 91, 388, 28, 220, 29, 29, 104, 29, +- 33, 29, 3829, 91, 29, 28, 29, 107, 143, 29, +- 27, 143, 29, 101, 30, 30, 3827, 30, 108, 30, +- 91, 35, 30, 29, 30, 3823, 104, 30, 36, 36, ++ 33, 29, 3842, 91, 29, 28, 29, 107, 143, 29, ++ 27, 143, 29, 101, 30, 30, 3840, 30, 108, 30, ++ 91, 35, 30, 29, 30, 3836, 104, 30, 36, 36, + + 30, 36, 388, 28, 139, 107, 36, 213, 213, 27, + 27, 30, 223, 223, 31, 31, 108, 31, 109, 31, +@@ -3502,10 +3507,10 @@ static const flex_int16_t yy_chk[14349] = + 34, 32, 34, 36, 34, 114, 65, 34, 39, 39, + 39, 39, 32, 39, 115, 40, 40, 40, 40, 31, + 40, 39, 105, 140, 105, 45, 196, 219, 40, 196, +- 219, 46, 219, 114, 65, 195, 195, 195, 195, 3822, +- 32, 225, 115, 3815, 225, 226, 226, 265, 265, 97, ++ 219, 46, 219, 114, 65, 195, 195, 195, 195, 3835, ++ 32, 225, 115, 3828, 225, 226, 226, 265, 265, 97, + +- 105, 140, 105, 3792, 34, 37, 37, 37, 37, 37, ++ 105, 140, 105, 3805, 34, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, +@@ -3516,49 +3521,49 @@ static const flex_int16_t yy_chk[14349] = + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 41, 41, 41, 41, 147, 41, 42, 42, + +- 42, 42, 153, 42, 43, 43, 43, 43, 3789, 43, ++ 42, 42, 153, 42, 43, 43, 43, 43, 3802, 43, + 44, 44, 44, 44, 50, 44, 102, 66, 50, 59, + 66, 50, 286, 286, 147, 66, 73, 60, 102, 73, + 153, 73, 129, 74, 73, 129, 74, 283, 74, 66, + 283, 74, 315, 318, 102, 315, 318, 41, 73, 185, + 59, 67, 59, 42, 185, 74, 102, 173, 60, 43, +- 60, 59, 59, 59, 59, 44, 2703, 66, 50, 60, ++ 60, 59, 59, 59, 59, 44, 2706, 66, 50, 60, + 60, 60, 60, 68, 77, 77, 73, 77, 59, 348, + 59, 183, 67, 74, 67, 173, 60, 129, 60, 59, + 59, 59, 59, 67, 67, 67, 67, 60, 60, 60, + +- 60, 185, 99, 484, 68, 99, 68, 103, 2703, 183, ++ 60, 185, 99, 484, 68, 99, 68, 103, 2706, 183, + 67, 106, 67, 111, 103, 68, 68, 68, 68, 189, +- 110, 67, 67, 67, 67, 106, 348, 3780, 111, 77, ++ 110, 67, 67, 67, 67, 106, 348, 3793, 111, 77, + 99, 106, 68, 99, 68, 103, 110, 112, 177, 106, +- 177, 111, 103, 68, 68, 68, 68, 189, 110, 3752, ++ 177, 111, 103, 68, 68, 68, 68, 189, 110, 3764, + 113, 309, 112, 106, 113, 113, 111, 484, 145, 106, +- 198, 145, 309, 2870, 110, 112, 119, 119, 119, 119, ++ 198, 145, 309, 2874, 110, 112, 119, 119, 119, 119, + 201, 119, 120, 120, 120, 120, 179, 120, 113, 179, + 112, 177, 113, 113, 121, 121, 121, 121, 198, 121, + 126, 126, 126, 126, 199, 126, 203, 133, 201, 138, + +- 133, 199, 138, 142, 142, 2870, 187, 138, 145, 138, ++ 133, 199, 138, 142, 142, 2874, 187, 138, 145, 138, + 142, 187, 142, 199, 133, 133, 148, 148, 436, 436, + 148, 119, 199, 148, 203, 133, 179, 120, 133, 199, +- 144, 156, 156, 144, 156, 144, 3745, 181, 144, 121, ++ 144, 156, 156, 144, 156, 144, 3757, 181, 144, 121, + 181, 199, 133, 133, 205, 126, 131, 131, 131, 131, + 131, 131, 208, 131, 138, 211, 131, 142, 187, 405, + 131, 149, 131, 131, 149, 131, 131, 131, 188, 149, + 148, 188, 205, 642, 131, 131, 131, 131, 131, 131, +- 208, 131, 3716, 211, 131, 144, 156, 181, 131, 151, ++ 208, 131, 3727, 211, 131, 144, 156, 181, 131, 151, + 131, 131, 151, 131, 131, 131, 150, 151, 405, 150, + + 494, 150, 157, 157, 150, 157, 155, 155, 200, 150, + 155, 149, 642, 155, 159, 159, 159, 159, 155, 162, + 162, 200, 162, 188, 162, 166, 166, 212, 166, 346, +- 166, 346, 162, 877, 380, 3714, 200, 380, 166, 151, +- 169, 166, 3677, 169, 210, 169, 162, 210, 169, 200, +- 435, 150, 166, 435, 494, 212, 2883, 157, 167, 167, ++ 166, 346, 162, 877, 380, 3725, 200, 380, 166, 151, ++ 169, 166, 3688, 169, 210, 169, 162, 210, 169, 200, ++ 435, 150, 166, 435, 494, 212, 2887, 157, 167, 167, + 155, 167, 169, 167, 869, 168, 168, 230, 168, 159, + 168, 167, 877, 202, 162, 210, 346, 1393, 168, 186, + 166, 170, 186, 202, 170, 167, 170, 186, 206, 170, +- 169, 170, 168, 3672, 170, 230, 206, 171, 2883, 235, ++ 169, 170, 168, 3683, 170, 230, 206, 171, 2887, 235, + + 171, 202, 171, 162, 162, 171, 905, 359, 170, 166, + 166, 202, 224, 167, 414, 224, 206, 224, 174, 171, +@@ -3566,8 +3571,8 @@ static const flex_int16_t yy_chk[14349] = + 176, 243, 869, 176, 186, 176, 170, 498, 176, 2070, + 174, 2070, 167, 167, 178, 178, 521, 171, 178, 168, + 168, 178, 176, 178, 359, 180, 178, 521, 180, 243, +- 180, 414, 244, 180, 3646, 184, 184, 224, 174, 184, +- 178, 3642, 184, 905, 190, 190, 190, 486, 486, 197, ++ 180, 414, 244, 180, 3656, 184, 184, 224, 174, 184, ++ 178, 3652, 184, 905, 190, 190, 190, 486, 486, 197, + 176, 190, 192, 192, 192, 192, 204, 245, 197, 209, + 244, 498, 197, 209, 207, 192, 246, 197, 178, 209, + +@@ -3594,13 +3599,13 @@ static const flex_int16_t yy_chk[14349] = + 301, 302, 313, 314, 323, 327, 303, 323, 327, 323, + + 304, 305, 507, 307, 304, 325, 304, 308, 325, 310, +- 325, 306, 306, 328, 329, 311, 312, 330, 332, 3641, ++ 325, 306, 306, 328, 329, 311, 312, 330, 332, 3651, + 313, 314, 319, 319, 319, 319, 887, 319, 320, 320, + 320, 320, 335, 320, 321, 321, 321, 321, 333, 321, + 331, 328, 329, 331, 336, 330, 332, 335, 337, 507, + 327, 338, 333, 333, 334, 1117, 334, 339, 340, 341, + 335, 1117, 340, 342, 344, 337, 333, 442, 331, 345, +- 337, 331, 336, 345, 746, 335, 337, 319, 3600, 338, ++ 337, 331, 336, 345, 746, 335, 337, 319, 3610, 338, + 333, 333, 334, 320, 334, 339, 340, 341, 343, 321, + 340, 342, 344, 337, 887, 442, 349, 345, 337, 349, + +@@ -3609,49 +3614,49 @@ static const flex_int16_t yy_chk[14349] = + 353, 354, 356, 362, 360, 356, 362, 360, 746, 360, + 343, 343, 360, 361, 361, 363, 364, 514, 363, 364, + 361, 364, 365, 443, 364, 366, 365, 369, 366, 365, +- 2273, 349, 2273, 366, 372, 370, 351, 372, 370, 3045, ++ 2274, 349, 2274, 366, 372, 370, 351, 372, 370, 3050, + 370, 350, 355, 370, 441, 353, 354, 441, 370, 371, + 371, 443, 356, 362, 373, 374, 371, 373, 374, 360, + 374, 371, 373, 374, 514, 363, 375, 361, 374, 444, + 375, 364, 524, 375, 411, 366, 365, 411, 375, 376, + +- 376, 3045, 376, 524, 372, 377, 377, 445, 377, 398, ++ 376, 3050, 376, 524, 372, 377, 377, 445, 377, 398, + 370, 379, 379, 379, 379, 381, 381, 444, 381, 384, + 384, 446, 384, 371, 373, 1110, 382, 382, 398, 382, + 374, 382, 384, 395, 474, 445, 395, 474, 395, 382, + 375, 395, 386, 386, 411, 386, 384, 386, 447, 446, +- 2626, 416, 416, 382, 376, 386, 398, 2808, 416, 448, ++ 2628, 416, 416, 382, 376, 386, 398, 2811, 416, 448, + 377, 488, 387, 387, 488, 387, 379, 387, 483, 386, + 381, 483, 421, 483, 384, 387, 447, 421, 387, 389, + 389, 382, 389, 395, 389, 390, 390, 448, 390, 387, + 390, 391, 389, 1110, 391, 389, 391, 386, 390, 391, + +- 2626, 426, 426, 384, 384, 416, 389, 2808, 426, 428, ++ 2628, 426, 426, 384, 384, 416, 389, 2811, 426, 428, + 382, 382, 390, 391, 428, 394, 403, 387, 394, 403, +- 394, 403, 449, 394, 421, 396, 386, 386, 396, 2274, +- 396, 2274, 403, 396, 389, 396, 3584, 394, 396, 417, ++ 394, 403, 449, 394, 421, 396, 386, 386, 396, 2275, ++ 396, 2275, 403, 396, 389, 396, 3593, 394, 396, 417, + 390, 391, 417, 403, 397, 397, 387, 387, 397, 562, +- 449, 397, 396, 397, 399, 426, 397, 399, 3566, 399, ++ 449, 397, 396, 397, 399, 426, 397, 399, 3575, 399, + 562, 428, 399, 389, 389, 394, 427, 427, 427, 390, + 390, 403, 425, 427, 401, 425, 399, 401, 402, 401, + 396, 402, 401, 402, 401, 565, 402, 401, 402, 417, + 418, 402, 487, 418, 402, 487, 565, 487, 397, 403, + + 403, 401, 451, 420, 399, 402, 1322, 420, 404, 406, +- 420, 404, 406, 404, 406, 3563, 404, 406, 404, 406, ++ 420, 404, 406, 404, 406, 3572, 404, 406, 404, 406, + 427, 404, 406, 415, 404, 406, 415, 425, 415, 401, + 451, 415, 858, 402, 409, 404, 406, 409, 431, 409, + 418, 410, 409, 431, 409, 410, 419, 409, 410, 419, + 410, 419, 424, 410, 419, 424, 495, 420, 401, 495, + 424, 409, 402, 404, 406, 429, 1331, 410, 429, 430, +- 3535, 430, 454, 429, 1322, 455, 430, 456, 415, 858, ++ 3544, 430, 454, 429, 1322, 455, 430, 456, 415, 858, + 452, 432, 432, 432, 432, 438, 438, 438, 438, 409, + 431, 452, 404, 406, 432, 410, 450, 457, 450, 458, + + 454, 419, 450, 455, 459, 456, 460, 424, 452, 462, + 463, 462, 464, 465, 466, 459, 467, 468, 467, 452, + 429, 465, 464, 430, 450, 457, 450, 458, 469, 471, +- 450, 465, 459, 1331, 460, 3530, 432, 462, 463, 462, ++ 450, 465, 459, 1331, 460, 3539, 432, 462, 463, 462, + 464, 465, 466, 459, 467, 468, 467, 472, 489, 465, + 464, 489, 473, 489, 896, 500, 469, 471, 500, 465, + 470, 470, 493, 470, 900, 493, 470, 493, 470, 520, +@@ -3661,12 +3666,12 @@ static const flex_int16_t yy_chk[14349] = + + 470, 522, 470, 900, 470, 470, 470, 470, 480, 480, + 480, 480, 481, 481, 481, 481, 482, 482, 482, 482, +- 1326, 482, 485, 485, 485, 485, 2881, 485, 491, 491, ++ 1326, 482, 485, 485, 485, 485, 2885, 485, 491, 491, + 491, 491, 502, 491, 906, 502, 476, 492, 492, 492, +- 492, 499, 492, 2881, 499, 503, 499, 505, 503, 508, ++ 492, 499, 492, 2885, 499, 503, 499, 505, 503, 508, + 503, 510, 505, 523, 508, 511, 510, 515, 511, 516, + 515, 525, 516, 480, 589, 528, 531, 481, 528, 531, +- 3519, 482, 532, 528, 531, 589, 533, 485, 542, 533, ++ 3528, 482, 532, 528, 531, 589, 533, 485, 542, 533, + 543, 523, 538, 491, 533, 538, 544, 528, 1326, 525, + 538, 532, 492, 539, 557, 539, 499, 557, 533, 505, + +@@ -3675,11 +3680,11 @@ static const flex_int16_t yy_chk[14349] = + 535, 550, 535, 551, 552, 535, 533, 553, 540, 555, + 545, 540, 538, 540, 556, 559, 540, 560, 546, 535, + 539, 547, 558, 561, 563, 558, 548, 564, 566, 550, +- 540, 551, 552, 3058, 3509, 553, 567, 555, 1580, 3507, +- 568, 570, 556, 559, 571, 560, 590, 535, 3488, 590, +- 591, 561, 563, 591, 3442, 564, 566, 572, 540, 554, ++ 540, 551, 552, 3063, 3518, 553, 567, 555, 1580, 3516, ++ 568, 570, 556, 559, 571, 560, 590, 535, 3496, 590, ++ 591, 561, 563, 591, 3450, 564, 566, 572, 540, 554, + 573, 554, 554, 574, 567, 554, 554, 554, 568, 570, +- 575, 554, 571, 576, 554, 3058, 554, 554, 554, 554, ++ 575, 554, 571, 576, 554, 3063, 554, 554, 554, 554, + + 579, 554, 554, 580, 577, 572, 581, 554, 573, 554, + 554, 574, 582, 554, 554, 554, 578, 578, 575, 554, +@@ -3690,13 +3695,13 @@ static const flex_int16_t yy_chk[14349] = + 613, 585, 614, 586, 587, 588, 593, 594, 615, 595, + 596, 598, 616, 617, 599, 600, 618, 602, 603, 619, + 606, 607, 608, 588, 609, 610, 611, 612, 613, 620, +- 614, 620, 640, 3435, 626, 623, 615, 626, 623, 637, ++ 614, 620, 640, 3443, 626, 623, 615, 626, 623, 637, + + 616, 617, 637, 623, 618, 623, 624, 619, 638, 624, +- 629, 638, 3403, 629, 624, 629, 624, 630, 629, 3339, +- 630, 632, 630, 655, 632, 630, 3321, 635, 645, 632, +- 635, 640, 635, 3305, 636, 635, 620, 636, 645, 636, +- 635, 645, 636, 653, 626, 3299, 653, 636, 653, 3297, ++ 629, 638, 3410, 629, 624, 629, 624, 630, 629, 3346, ++ 630, 632, 630, 655, 632, 630, 3328, 635, 645, 632, ++ 635, 640, 635, 3312, 636, 635, 620, 636, 645, 636, ++ 635, 645, 636, 653, 626, 3305, 653, 636, 653, 3303, + 623, 639, 639, 674, 639, 734, 639, 824, 734, 653, + 640, 624, 655, 662, 639, 629, 669, 639, 824, 669, + 653, 632, 630, 662, 641, 641, 662, 641, 639, 641, +@@ -3708,21 +3713,21 @@ static const flex_int16_t yy_chk[14349] = + 649, 687, 688, 690, 1321, 691, 653, 653, 682, 641, + 679, 683, 675, 679, 649, 639, 639, 692, 643, 684, + 736, 663, 685, 736, 662, 738, 686, 647, 738, 687, +- 688, 690, 672, 691, 2276, 672, 2276, 672, 641, 641, ++ 688, 690, 672, 691, 2277, 672, 2277, 672, 641, 641, + 672, 741, 649, 1321, 741, 692, 673, 643, 643, 673, +- 652, 673, 3291, 652, 673, 652, 647, 647, 652, 654, ++ 652, 673, 3297, 652, 673, 652, 647, 647, 652, 654, + 652, 693, 654, 652, 654, 679, 652, 654, 656, 654, + 694, 656, 654, 656, 695, 654, 656, 652, 656, 744, + + 657, 656, 744, 657, 656, 657, 654, 672, 657, 693, + 657, 861, 1329, 657, 664, 656, 657, 664, 694, 664, +- 3252, 673, 695, 658, 697, 652, 658, 657, 658, 3218, ++ 3258, 673, 695, 658, 697, 652, 658, 657, 658, 3224, + 664, 658, 659, 658, 654, 659, 658, 659, 698, 658, +- 659, 664, 659, 656, 3181, 659, 699, 701, 659, 702, ++ 659, 664, 659, 656, 3187, 659, 699, 701, 659, 702, + 658, 703, 697, 678, 652, 657, 678, 660, 861, 659, + 660, 678, 660, 654, 1332, 660, 698, 660, 680, 664, + 660, 680, 656, 660, 699, 701, 680, 702, 658, 703, +- 1329, 3168, 3163, 665, 660, 705, 665, 659, 665, 706, ++ 1329, 3174, 3168, 665, 660, 705, 665, 659, 665, 706, + 707, 665, 666, 665, 1395, 666, 665, 666, 664, 665, + + 666, 667, 666, 1332, 667, 666, 667, 658, 678, 667, +@@ -3733,19 +3738,19 @@ static const flex_int16_t yy_chk[14349] = + 724, 721, 711, 713, 715, 716, 667, 714, 714, 725, + 714, 714, 726, 719, 727, 719, 721, 665, 717, 719, + 718, 723, 714, 720, 722, 728, 729, 733, 724, 721, +- 748, 723, 3133, 748, 728, 714, 714, 725, 714, 714, ++ 748, 723, 3138, 748, 728, 714, 714, 725, 714, 714, + 726, 719, 727, 719, 721, 754, 730, 719, 730, 723, + + 730, 755, 1945, 728, 729, 733, 755, 752, 737, 723, +- 752, 737, 728, 737, 739, 740, 3118, 739, 740, 739, ++ 752, 737, 728, 737, 739, 740, 3123, 739, 740, 739, + 740, 762, 742, 754, 730, 742, 730, 742, 730, 745, + 747, 763, 745, 747, 745, 747, 749, 751, 764, 749, + 751, 749, 751, 753, 759, 765, 753, 759, 753, 762, + 775, 776, 767, 755, 777, 767, 1945, 778, 779, 763, + 767, 781, 771, 782, 783, 771, 764, 771, 784, 785, +- 771, 3072, 786, 765, 767, 2480, 791, 2480, 775, 776, ++ 771, 3077, 786, 765, 767, 2482, 791, 2482, 775, 776, + 792, 787, 777, 793, 771, 778, 779, 786, 787, 781, +- 786, 782, 783, 3070, 759, 787, 784, 785, 790, 788, ++ 786, 782, 783, 3075, 759, 787, 784, 785, 790, 788, + + 786, 796, 767, 788, 791, 789, 794, 788, 792, 787, + 795, 793, 771, 798, 799, 786, 787, 790, 786, 789, +@@ -3754,7 +3759,7 @@ static const flex_int16_t yy_chk[14349] = + 810, 798, 799, 803, 811, 790, 812, 789, 800, 789, + 794, 813, 805, 795, 814, 815, 797, 816, 797, 818, + 819, 820, 821, 822, 823, 807, 825, 826, 810, 827, +- 829, 830, 811, 803, 812, 832, 3068, 833, 835, 813, ++ 829, 830, 811, 803, 812, 832, 3073, 833, 835, 813, + 836, 835, 814, 815, 837, 816, 838, 818, 819, 820, + 821, 822, 823, 831, 825, 826, 839, 827, 829, 830, + +@@ -3766,34 +3771,34 @@ static const flex_int16_t yy_chk[14349] = + 855, 856, 860, 857, 862, 860, 863, 862, 871, 863, + 860, 863, 860, 865, 863, 867, 865, 866, 867, 871, + 866, 875, 866, 909, 864, 866, 868, 868, 859, 868, +- 866, 868, 875, 3064, 889, 915, 868, 912, 915, 868, +- 889, 3203, 868, 873, 873, 883, 873, 882, 873, 916, ++ 866, 868, 875, 3069, 889, 915, 868, 912, 915, 868, ++ 889, 3209, 868, 873, 873, 883, 873, 882, 873, 916, + +- 882, 3055, 882, 868, 862, 882, 873, 860, 3203, 873, ++ 882, 3060, 882, 868, 862, 882, 873, 860, 3209, 873, + 870, 863, 913, 865, 883, 910, 884, 913, 910, 884, + 873, 884, 866, 1005, 884, 885, 884, 916, 885, 884, +- 885, 868, 884, 885, 1005, 885, 890, 871, 885, 3047, +- 915, 885, 883, 884, 890, 3210, 886, 882, 873, 886, ++ 885, 868, 884, 885, 1005, 885, 890, 871, 885, 3052, ++ 915, 885, 883, 884, 890, 3216, 886, 882, 873, 886, + 979, 886, 885, 979, 886, 890, 886, 1270, 889, 886, + 868, 868, 886, 917, 913, 910, 998, 914, 1270, 892, + 914, 884, 892, 886, 892, 914, 888, 873, 873, 888, +- 885, 888, 1524, 890, 888, 892, 888, 3210, 918, 888, ++ 885, 888, 1524, 890, 888, 892, 888, 3216, 918, 888, + 894, 917, 888, 894, 893, 894, 892, 893, 919, 893, + + 884, 886, 893, 888, 893, 920, 894, 893, 921, 885, +- 893, 980, 890, 998, 980, 911, 918, 894, 911, 3038, +- 911, 893, 914, 911, 892, 3028, 919, 1524, 922, 982, +- 886, 888, 982, 920, 895, 2987, 921, 895, 897, 895, +- 2810, 897, 895, 897, 895, 894, 897, 895, 897, 893, +- 895, 897, 899, 892, 897, 899, 922, 899, 2985, 898, ++ 893, 980, 890, 998, 980, 911, 918, 894, 911, 3043, ++ 911, 893, 914, 911, 892, 3033, 919, 1524, 922, 982, ++ 886, 888, 982, 920, 895, 2991, 921, 895, 897, 895, ++ 2813, 897, 895, 897, 895, 894, 897, 895, 897, 893, ++ 895, 897, 899, 892, 897, 899, 922, 899, 2989, 898, + 899, 895, 898, 901, 898, 897, 901, 898, 901, 898, + 911, 901, 898, 894, 899, 898, 981, 983, 893, 981, + 983, 981, 925, 926, 929, 901, 898, 932, 933, 895, +- 2810, 907, 923, 897, 907, 908, 907, 923, 908, 907, ++ 2813, 907, 923, 897, 907, 908, 907, 923, 908, 907, + +- 908, 907, 899, 908, 907, 908, 2981, 907, 908, 923, ++ 908, 907, 899, 908, 907, 908, 2985, 907, 908, 923, + 925, 926, 929, 901, 898, 932, 933, 934, 907, 936, +- 923, 937, 908, 2942, 2904, 923, 930, 930, 930, 930, ++ 923, 937, 908, 2946, 2908, 923, 930, 930, 930, 930, + 930, 930, 930, 930, 930, 938, 940, 923, 941, 942, + 943, 944, 945, 947, 948, 934, 907, 936, 949, 937, + 908, 931, 931, 931, 931, 931, 931, 931, 931, 931, +@@ -3803,30 +3808,30 @@ static const flex_int16_t yy_chk[14349] = + 952, 967, 968, 953, 969, 967, 970, 969, 971, 972, + + 973, 955, 974, 975, 978, 954, 956, 957, 958, 959, +- 960, 961, 962, 963, 964, 965, 2893, 2892, 985, 967, ++ 960, 961, 962, 963, 964, 965, 2897, 2896, 985, 967, + 968, 985, 969, 967, 970, 969, 971, 972, 973, 1000, +- 974, 975, 978, 984, 986, 2876, 984, 986, 984, 986, +- 987, 988, 2875, 987, 988, 987, 989, 991, 2866, 989, ++ 974, 975, 978, 984, 986, 2880, 984, 986, 984, 986, ++ 987, 988, 2879, 987, 988, 987, 989, 991, 2870, 989, + 991, 989, 992, 993, 1002, 992, 993, 992, 994, 995, + 1003, 994, 995, 994, 996, 997, 999, 996, 997, 996, + 1001, 999, 1004, 1001, 1007, 1006, 1000, 1009, 1006, 1013, + 1014, 1008, 1002, 1006, 1008, 1016, 1008, 1017, 1003, 1008, +- 2825, 1018, 1402, 1007, 1019, 1020, 1009, 2824, 1021, 1022, ++ 2835, 1018, 1402, 1007, 1019, 1020, 1009, 2828, 1021, 1022, + + 1004, 1023, 1024, 1402, 1025, 1026, 1028, 1013, 1014, 1027, +- 1027, 1027, 1027, 1016, 1030, 1017, 1031, 2986, 999, 1018, ++ 1027, 1027, 1027, 1016, 1030, 1017, 1031, 2990, 999, 1018, + 1001, 1007, 1019, 1020, 1009, 1006, 1021, 1022, 1032, 1023, + 1024, 1008, 1025, 1026, 1028, 1033, 1034, 1027, 1027, 1027, + 1027, 1029, 1030, 1035, 1031, 1029, 1036, 1037, 1038, 1039, + 1040, 1042, 1043, 1039, 1041, 1039, 1032, 1044, 1041, 1045, +- 1046, 1047, 1048, 1033, 1034, 1051, 1052, 2986, 1042, 1029, ++ 1046, 1047, 1048, 1033, 1034, 1051, 1052, 2990, 1042, 1029, + 1054, 1035, 1055, 1029, 1036, 1037, 1038, 1039, 1040, 1042, + 1043, 1039, 1041, 1039, 1056, 1044, 1041, 1045, 1046, 1047, + 1048, 1050, 1053, 1051, 1052, 1050, 1042, 1057, 1054, 1058, + +- 1055, 1059, 1050, 1053, 1050, 2815, 1060, 1061, 1062, 1064, +- 1065, 1066, 1056, 1067, 1068, 1070, 1071, 1072, 2809, 1050, +- 1074, 1075, 2775, 1050, 1077, 1057, 1078, 1058, 1079, 1059, ++ 1055, 1059, 1050, 1053, 1050, 2827, 1060, 1061, 1062, 1064, ++ 1065, 1066, 1056, 1067, 1068, 1070, 1071, 1072, 2818, 1050, ++ 1074, 1075, 2812, 1050, 1077, 1057, 1078, 1058, 1079, 1059, + 1050, 1080, 1050, 1053, 1060, 1061, 1062, 1064, 1065, 1066, + 1081, 1067, 1068, 1070, 1071, 1072, 1073, 1073, 1074, 1075, + 1073, 1082, 1077, 1083, 1078, 1073, 1079, 1084, 1085, 1080, +@@ -3835,24 +3840,24 @@ static const flex_int16_t yy_chk[14349] = + 1099, 1083, 1100, 1073, 1101, 1084, 1085, 1102, 1086, 1073, + 1087, 1088, 1089, 1073, 1091, 1073, 1115, 1092, 1093, 1094, + +- 1095, 1096, 1116, 2755, 1097, 1098, 1108, 1108, 1099, 1108, ++ 1095, 1096, 1116, 2778, 1097, 1098, 1108, 1108, 1099, 1108, + 1100, 1108, 1101, 1109, 1114, 1102, 1109, 1114, 1113, 1108, +- 2706, 1113, 1108, 1113, 2695, 1128, 1113, 1118, 1113, 1130, +- 1118, 1113, 1118, 1108, 1113, 1118, 3522, 1118, 3522, 1119, ++ 2758, 1113, 1108, 1113, 2709, 1128, 1113, 1118, 1113, 1130, ++ 1118, 1113, 1118, 1108, 1113, 1118, 3531, 1118, 3531, 1119, + 1118, 1116, 1119, 1118, 1119, 1113, 1132, 1119, 1120, 1119, + 1124, 1133, 1119, 1128, 1118, 1119, 1120, 1130, 1124, 1135, +- 2691, 1108, 1193, 1115, 1115, 1193, 1119, 1120, 1194, 1124, ++ 2698, 1108, 1193, 1115, 1115, 1193, 1119, 1120, 1194, 1124, + 1116, 1194, 1122, 1113, 1132, 1122, 1137, 1122, 1195, 1133, +- 2653, 1195, 1118, 1195, 1109, 1114, 1196, 1135, 1122, 1196, +- 1108, 1108, 2652, 1121, 1119, 1120, 1121, 1124, 1121, 1122, ++ 2694, 1195, 1118, 1195, 1109, 1114, 1196, 1135, 1122, 1196, ++ 1108, 1108, 2656, 1121, 1119, 1120, 1121, 1124, 1121, 1122, + + 1138, 1121, 1113, 1121, 1137, 1123, 1121, 1139, 1123, 1121, + 1123, 1118, 1140, 1123, 1125, 1123, 1141, 1125, 1123, 1125, + 1121, 1123, 1143, 1139, 1145, 1146, 1147, 1122, 1138, 1148, + 1125, 1149, 1123, 1153, 1155, 1139, 1156, 1159, 1160, 1161, +- 1140, 1125, 1162, 2628, 1141, 1163, 1164, 1165, 1121, 2590, +- 1143, 1139, 1145, 1146, 1147, 1197, 2563, 1148, 1197, 1149, +- 1123, 1153, 1155, 2560, 1156, 1159, 1160, 1161, 1167, 1125, ++ 1140, 1125, 1162, 2655, 1141, 1163, 1164, 1165, 1121, 2630, ++ 1143, 1139, 1145, 1146, 1147, 1197, 2592, 1148, 1197, 1149, ++ 1123, 1153, 1155, 2565, 1156, 1159, 1160, 1161, 1167, 1125, + 1162, 1144, 1168, 1163, 1164, 1165, 1169, 1121, 1144, 1144, + 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1166, 1166, 1166, + 1166, 1166, 1166, 1166, 1166, 1166, 1167, 1170, 1125, 1171, +@@ -3860,7 +3865,7 @@ static const flex_int16_t yy_chk[14349] = + 1168, 1172, 1173, 1175, 1169, 1174, 1174, 1176, 1177, 1178, + 1180, 1181, 1182, 1183, 1184, 1186, 1187, 1188, 1189, 1189, + 1199, 1198, 1205, 1199, 1198, 1170, 1198, 1171, 1209, 1172, +- 1173, 1175, 2551, 1174, 1174, 1176, 1177, 1178, 1180, 1181, ++ 1173, 1175, 2562, 1174, 1174, 1176, 1177, 1178, 1180, 1181, + 1182, 1183, 1184, 1186, 1187, 1188, 1189, 1189, 1200, 1201, + 1205, 1200, 1201, 1200, 1202, 1203, 1209, 1202, 1203, 1202, + 1204, 1210, 1211, 1204, 1218, 1219, 1220, 1222, 1223, 1225, +@@ -3871,7 +3876,7 @@ static const flex_int16_t yy_chk[14349] = + 1228, 1229, 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237, + 1238, 1233, 1239, 1240, 1241, 1242, 1243, 1245, 1246, 1244, + 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, +- 1257, 1258, 1259, 1261, 1262, 1263, 1264, 1265, 1266, 2549, ++ 1257, 1258, 1259, 1261, 1262, 1263, 1264, 1265, 1266, 2553, + 1269, 1271, 1272, 1255, 1273, 1245, 1246, 1275, 1247, 1248, + 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258, + 1259, 1261, 1262, 1263, 1264, 1265, 1266, 1268, 1269, 1271, +@@ -3883,19 +3888,19 @@ static const flex_int16_t yy_chk[14349] = + 1285, 1268, 1268, 1287, 1288, 1289, 1290, 1291, 1292, 1293, + 1295, 1297, 1290, 1304, 1298, 1299, 1300, 1301, 1302, 1305, + 1306, 1303, 1307, 1308, 1309, 1311, 1312, 1313, 1314, 1315, +- 1316, 1317, 1318, 1319, 1320, 1324, 1335, 2515, 1334, 1397, +- 1338, 1304, 1397, 1398, 2511, 2509, 1398, 1305, 1306, 1334, ++ 1316, 1317, 1318, 1319, 1320, 1324, 1335, 2551, 1334, 1397, ++ 1338, 1304, 1397, 1398, 2517, 2513, 1398, 1305, 1306, 1334, + 1307, 1308, 1309, 1311, 1312, 1313, 1314, 1315, 1316, 1317, + 1318, 1319, 1325, 1328, 1335, 1325, 1339, 1325, 1338, 1340, +- 1325, 1328, 1325, 1320, 1324, 1325, 1341, 3602, 1325, 3602, +- 1330, 2508, 1328, 1330, 1342, 1330, 2507, 1343, 1400, 1325, ++ 1325, 1328, 1325, 1320, 1324, 1325, 1341, 3612, 1325, 3612, ++ 1330, 2511, 1328, 1330, 1342, 1330, 2510, 1343, 1400, 1325, + +- 1336, 1400, 1336, 1344, 1339, 1345, 1330, 1340, 1348, 3604, +- 1350, 3604, 1320, 1324, 1341, 1334, 1333, 1330, 1351, 1333, ++ 1336, 1400, 1336, 1344, 1339, 1345, 1330, 1340, 1348, 3614, ++ 1350, 3614, 1320, 1324, 1341, 1334, 1333, 1330, 1351, 1333, + 1328, 1333, 1342, 1352, 1333, 1343, 1333, 1325, 1336, 1333, + 1336, 1344, 1333, 1345, 1347, 1353, 1348, 1347, 1350, 1347, + 1354, 1356, 1355, 1333, 1347, 1330, 1351, 1347, 1357, 1328, +- 2500, 1352, 1358, 1360, 1366, 1368, 1371, 1372, 1373, 1374, ++ 2509, 1352, 1358, 1360, 1366, 1368, 1371, 1372, 1373, 1374, + 1375, 1399, 1401, 1353, 1399, 1401, 1399, 1409, 1354, 1356, + 1409, 1333, 1355, 1376, 1330, 1377, 1357, 1378, 1355, 1379, + 1358, 1360, 1366, 1368, 1371, 1372, 1373, 1374, 1375, 1347, +@@ -3909,14 +3914,14 @@ static const flex_int16_t yy_chk[14349] = + 1411, 1412, 1413, 1414, 1415, 1420, 1416, 1417, 1423, 1418, + 1424, 1419, 1421, 1422, 1425, 1426, 1427, 1428, 1420, 1429, + 1430, 1431, 1432, 1420, 1433, 1434, 1430, 1435, 1430, 1436, +- 1437, 1430, 2488, 1420, 1439, 1440, 1423, 1441, 1424, 1442, ++ 1437, 1430, 2502, 1420, 1439, 1440, 1423, 1441, 1424, 1442, + 1443, 1444, 1425, 1426, 1427, 1428, 1420, 1429, 1430, 1431, + + 1432, 1420, 1433, 1434, 1430, 1435, 1430, 1436, 1437, 1430, + 1438, 1445, 1439, 1440, 1438, 1441, 1446, 1442, 1443, 1444, + 1447, 1438, 1448, 1438, 1438, 1449, 1438, 1450, 1451, 1452, + 1453, 1454, 1455, 1456, 1457, 1458, 1459, 1464, 1438, 1445, +- 1465, 1466, 1438, 1467, 1446, 1468, 2486, 1472, 1447, 1438, ++ 1465, 1466, 1438, 1467, 1446, 1468, 2490, 1472, 1447, 1438, + 1448, 1438, 1438, 1449, 1438, 1450, 1451, 1452, 1453, 1454, + 1455, 1456, 1457, 1458, 1459, 1464, 1473, 1469, 1465, 1466, + 1474, 1467, 1476, 1468, 1469, 1472, 1477, 1475, 1478, 1479, +@@ -3927,15 +3932,15 @@ static const flex_int16_t yy_chk[14349] = + 1469, 1474, 1482, 1474, 1483, 1469, 1495, 1484, 1485, 1486, + 1487, 1488, 1496, 1491, 1489, 1490, 1497, 1475, 1491, 1492, + 1498, 1493, 1499, 1494, 1500, 1501, 1502, 1503, 1505, 1506, +- 1507, 1508, 1509, 1505, 1495, 1512, 1513, 3673, 1514, 3673, ++ 1507, 1508, 1509, 1505, 1495, 1512, 1513, 3684, 1514, 3684, + 1496, 1491, 1515, 1503, 1497, 1517, 1491, 1518, 1498, 1519, + 1499, 1573, 1500, 1501, 1502, 1503, 1505, 1506, 1507, 1508, + 1510, 1505, 1511, 1512, 1513, 1511, 1514, 1511, 1510, 1520, +- 1515, 1503, 2485, 1517, 1521, 1518, 1522, 1519, 1511, 1510, ++ 1515, 1503, 2488, 1517, 1521, 1518, 1522, 1519, 1511, 1510, + 1523, 1526, 1527, 1523, 1526, 1523, 1526, 1530, 1531, 1511, + + 1523, 1526, 1532, 1523, 1526, 1576, 1573, 1520, 1576, 1509, +- 1509, 2484, 1521, 1535, 1522, 1533, 1536, 1510, 2479, 1533, ++ 1509, 2487, 1521, 1535, 1522, 1533, 1536, 1510, 2486, 1533, + 1527, 1533, 1538, 1539, 1541, 1530, 1531, 1511, 1547, 1548, + 1532, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, + 1551, 1535, 1552, 1533, 1536, 1523, 1526, 1533, 1553, 1533, +@@ -3961,8 +3966,8 @@ static const flex_int16_t yy_chk[14349] = + 1632, 1642, 1643, 1644, 1633, 1635, 1636, 1645, 1637, 1639, + 1640, 1646, 1641, 1647, 1648, 1650, 1651, 1652, 1653, 1654, + 1634, 1655, 1656, 1658, 1660, 1661, 1662, 1664, 1665, 1642, +- 1643, 1644, 1667, 1656, 1658, 1645, 1668, 1672, 3675, 1646, +- 3675, 1647, 1648, 1650, 1651, 1652, 1653, 1654, 2454, 1655, ++ 1643, 1644, 1667, 1656, 1658, 1645, 1668, 1672, 3686, 1646, ++ 3686, 1647, 1648, 1650, 1651, 1652, 1653, 1654, 2481, 1655, + 1656, 1673, 1660, 1661, 1662, 1664, 1665, 1674, 1675, 1677, + 1667, 1656, 1657, 1657, 1668, 1672, 1657, 1678, 1657, 1679, + 1680, 1681, 1657, 1657, 1682, 1683, 1657, 1684, 1685, 1673, +@@ -3972,15 +3977,15 @@ static const flex_int16_t yy_chk[14349] = + 1657, 1657, 1682, 1683, 1657, 1684, 1685, 1696, 1686, 1657, + 1687, 1688, 1689, 1693, 1697, 1694, 1690, 1691, 1694, 1698, + 1692, 1695, 1699, 1700, 1702, 1703, 1693, 1705, 1706, 1707, +- 1709, 1708, 1710, 1714, 1716, 1696, 3738, 1720, 3738, 1721, +- 1723, 1693, 1697, 1694, 1708, 3146, 1694, 1698, 1724, 1725, ++ 1709, 1708, 1710, 1714, 1716, 1696, 3750, 1720, 3750, 1721, ++ 1723, 1693, 1697, 1694, 1708, 3151, 1694, 1698, 1724, 1725, + 1699, 1726, 1702, 1703, 1693, 1705, 1706, 1707, 1709, 1708, +- 1710, 1712, 1716, 2443, 1712, 1720, 1712, 1721, 1723, 1729, +- 1733, 1712, 1708, 1722, 1712, 2433, 1724, 1725, 1714, 1726, ++ 1710, 1712, 1716, 2456, 1712, 1720, 1712, 1721, 1723, 1729, ++ 1733, 1712, 1708, 1722, 1712, 2444, 1724, 1725, 1714, 1726, + + 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1727, +- 1700, 1727, 1730, 2431, 2415, 3146, 1765, 1729, 1733, 1765, +- 2399, 1765, 1735, 1735, 1730, 1736, 1737, 1738, 1739, 1730, ++ 1700, 1727, 1730, 2434, 2432, 3151, 1765, 1729, 1733, 1765, ++ 2416, 1765, 1735, 1735, 1730, 1736, 1737, 1738, 1739, 1730, + 1740, 1741, 1742, 1743, 1745, 1746, 1712, 1727, 1757, 1727, + 1730, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, + 1735, 1735, 1730, 1736, 1737, 1738, 1739, 1730, 1740, 1741, +@@ -4004,12 +4009,12 @@ static const flex_int16_t yy_chk[14349] = + 1812, 1808, 1812, 1813, 1814, 1815, 1824, 1812, 1817, 1818, + 1829, 1821, 1831, 1833, 1822, 1834, 1823, 1835, 1825, 1826, + 1824, 1836, 1837, 1819, 1827, 1838, 1839, 1828, 1840, 1841, +- 1842, 1843, 1844, 1845, 1846, 1847, 1850, 3571, 1829, 1851, ++ 1842, 1843, 1844, 1845, 1846, 1847, 1850, 3580, 1829, 1851, + 1831, 1833, 1840, 1834, 1852, 1835, 1854, 1855, 1860, 1836, +- 1837, 2360, 1862, 1838, 1839, 1863, 1840, 1841, 1842, 1843, ++ 1837, 2400, 1862, 1838, 1839, 1863, 1840, 1841, 1842, 1843, + 1844, 1845, 1846, 1847, 1850, 1849, 1849, 1851, 1864, 1865, + 1840, 1849, 1852, 1867, 1854, 1855, 1860, 1868, 1869, 1849, +- 1862, 1870, 1849, 1863, 1871, 1872, 1875, 3571, 1878, 1886, ++ 1862, 1870, 1849, 1863, 1871, 1872, 1875, 3580, 1878, 1886, + + 1879, 1880, 1881, 1849, 1849, 1882, 1864, 1865, 1876, 1849, + 1876, 1867, 1883, 1884, 1876, 1868, 1869, 1849, 1887, 1870, +@@ -4017,14 +4022,14 @@ static const flex_int16_t yy_chk[14349] = + 1881, 1890, 1891, 1882, 1892, 1893, 1876, 1885, 1876, 1885, + 1883, 1884, 1876, 1885, 1886, 1889, 1887, 1894, 1895, 1888, + 1898, 1899, 1889, 1876, 1885, 1876, 1885, 1902, 1903, 1890, +- 1891, 1904, 1892, 1893, 1906, 1885, 1907, 1885, 2358, 1909, ++ 1891, 1904, 1892, 1893, 1906, 1885, 1907, 1885, 2361, 1909, + 1908, 1885, 1908, 1889, 2074, 1894, 1895, 1910, 1896, 1911, + 1889, 1896, 1885, 1896, 1885, 1913, 1903, 1914, 1896, 1904, + 1915, 1896, 1906, 1916, 1907, 1898, 1899, 1909, 1908, 1919, + +- 1908, 1920, 1902, 1922, 1923, 1910, 2345, 1911, 1924, 1925, +- 1926, 1927, 1928, 1913, 1968, 1914, 2302, 1968, 1915, 2074, +- 2300, 1916, 1929, 1930, 1931, 2087, 1932, 1919, 2087, 1920, ++ 1908, 1920, 1902, 1922, 1923, 1910, 2359, 1911, 1924, 1925, ++ 1926, 1927, 1928, 1913, 1968, 1914, 2346, 1968, 1915, 2074, ++ 2303, 1916, 1929, 1930, 1931, 2087, 1932, 1919, 2087, 1920, + 1930, 1922, 1923, 1896, 1917, 1933, 1924, 1925, 1926, 1927, + 1928, 1917, 1917, 1917, 1917, 1917, 1917, 1917, 1917, 1917, + 1929, 1930, 1931, 1917, 1932, 1917, 1917, 1917, 1930, 1934, +@@ -4036,7 +4041,7 @@ static const flex_int16_t yy_chk[14349] = + 1944, 1951, 1953, 1917, 1937, 1949, 1949, 1949, 1949, 1957, + 1954, 1958, 1959, 1960, 1955, 1961, 1962, 1963, 1964, 1956, + 1965, 1966, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1977, +- 1978, 1979, 1947, 1980, 2299, 1982, 1983, 1957, 1984, 1958, ++ 1978, 1979, 1947, 1980, 2301, 1982, 1983, 1957, 1984, 1958, + 1959, 1960, 1985, 1961, 1962, 1963, 1964, 1986, 1965, 1966, + 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1977, 1978, 1979, + 1949, 1980, 1981, 1982, 1983, 1981, 1984, 1981, 1987, 1988, +@@ -4046,988 +4051,990 @@ static const flex_int16_t yy_chk[14349] = + + 1990, 1991, 1992, 2007, 1993, 1994, 1995, 1996, 2013, 1998, + 1999, 2014, 2000, 2015, 2001, 2002, 2003, 2004, 2005, 2006, +- 2016, 2009, 2010, 2011, 2017, 2018, 2012, 2019, 2298, 2166, +- 2284, 2021, 2166, 2022, 2166, 2178, 2013, 2023, 2178, 2014, +- 2178, 2015, 2024, 2025, 2026, 2282, 2027, 2281, 2016, 2028, +- 2029, 2030, 2017, 2018, 2031, 2019, 2020, 2020, 2020, 2021, +- 2020, 2022, 2020, 2020, 2032, 2023, 2020, 2020, 2020, 2033, +- 2024, 2025, 2026, 2020, 2027, 2020, 2034, 2028, 2029, 2030, +- 2035, 2036, 2031, 2037, 2020, 2020, 2020, 2038, 2020, 2039, +- 2020, 2020, 2032, 2040, 2020, 2020, 2020, 2033, 2041, 2042, +- +- 2043, 2020, 2044, 2020, 2034, 2045, 2046, 2049, 2035, 2036, +- 2050, 2037, 2051, 2052, 2057, 2038, 2058, 2039, 2059, 2060, +- 2061, 2040, 2062, 2063, 2064, 2068, 2041, 2042, 2043, 2065, +- 2044, 2065, 2069, 2045, 2046, 2049, 2072, 2073, 2050, 2073, +- 2051, 2052, 2057, 2075, 2058, 2076, 2059, 2060, 2061, 2077, +- 2062, 2063, 2064, 2068, 2078, 2079, 2080, 2065, 2081, 2065, +- 2069, 2082, 2089, 2083, 2072, 2073, 2084, 2073, 2085, 2086, +- 2090, 2091, 2094, 2095, 2096, 2097, 2098, 2077, 2099, 2259, +- 2100, 2101, 2078, 2079, 2080, 2102, 2081, 2209, 2075, 2082, +- 2076, 2083, 2103, 2104, 2084, 2104, 2085, 2086, 2209, 2210, +- +- 2094, 2095, 2096, 2097, 2098, 2107, 2099, 2089, 2100, 2101, +- 2210, 2245, 2143, 2102, 2108, 2090, 2091, 2109, 2142, 2111, +- 2103, 2104, 2112, 2104, 2105, 2105, 2105, 2105, 2105, 2105, +- 2105, 2105, 2105, 2107, 2113, 2115, 2105, 2116, 2105, 2105, +- 2105, 2110, 2108, 2117, 2105, 2109, 2110, 2111, 2118, 2105, +- 2112, 2119, 2120, 2121, 2122, 2124, 2125, 2126, 2105, 2055, +- 2146, 2146, 2113, 2115, 2105, 2116, 2105, 2105, 2105, 2110, +- 2127, 2117, 2105, 2128, 2110, 2129, 2118, 2105, 2130, 2119, +- 2120, 2121, 2122, 2124, 2125, 2126, 2105, 2106, 2106, 2106, +- 2106, 2106, 2106, 2106, 2106, 2106, 2131, 2132, 2127, 2133, +- +- 2134, 2128, 2135, 2129, 2137, 2138, 2130, 2139, 2140, 2141, +- 2144, 2144, 2144, 2144, 2146, 2147, 2147, 2147, 2147, 2148, +- 2148, 2149, 2151, 2152, 2131, 2132, 2153, 2133, 2134, 2154, +- 2135, 2156, 2137, 2138, 2157, 2139, 2140, 2141, 2158, 2159, +- 2160, 2161, 2167, 2162, 2163, 2167, 2053, 2164, 2165, 2149, +- 2151, 2152, 2168, 2169, 2153, 2170, 2171, 2154, 2172, 2156, +- 2173, 2174, 2157, 2175, 2176, 2144, 2158, 2159, 2160, 2161, +- 2147, 2162, 2163, 2148, 2155, 2164, 2165, 2155, 2048, 2177, +- 2168, 2169, 2167, 2170, 2171, 2180, 2172, 2181, 2173, 2174, +- 1967, 2175, 2176, 2155, 1952, 2182, 2183, 2184, 2185, 2186, +- +- 2187, 2188, 2189, 2191, 2192, 2193, 2155, 2177, 2155, 2194, +- 2167, 2196, 2197, 2180, 2196, 2181, 2196, 2198, 2155, 2199, +- 2155, 2155, 2155, 2182, 2183, 2184, 2185, 2186, 2187, 2188, +- 2189, 2191, 2192, 2193, 2155, 2200, 2155, 2194, 2201, 2202, +- 2197, 2203, 2202, 2204, 2205, 2198, 2155, 2199, 2155, 2155, +- 2155, 2207, 2208, 2211, 2212, 2213, 2214, 2215, 2216, 2217, +- 2218, 2219, 2220, 2200, 2221, 2222, 2201, 2216, 2223, 2203, +- 2224, 2204, 2205, 2225, 2226, 2228, 2227, 2229, 2230, 2207, +- 2208, 2211, 2212, 2213, 2214, 2215, 2216, 2217, 2218, 2219, +- 2220, 2227, 2221, 2222, 2235, 2236, 2223, 2237, 2224, 2238, +- +- 2239, 2225, 2226, 2228, 2227, 2229, 2230, 2240, 2241, 2242, +- 2243, 2244, 2246, 2247, 2248, 2249, 2250, 2255, 2256, 2227, +- 2258, 2262, 2235, 2236, 2263, 2237, 2265, 2238, 2239, 2266, +- 2267, 2268, 2269, 2270, 2271, 2240, 2241, 2242, 2243, 2244, +- 2246, 2247, 2248, 2249, 2250, 2255, 2256, 2278, 2258, 2262, +- 2279, 2280, 2263, 2283, 2265, 2285, 2287, 2266, 2267, 2268, +- 2269, 2270, 2271, 2288, 2289, 2290, 2291, 2292, 2293, 2294, +- 2301, 2295, 2303, 2304, 2305, 2278, 1948, 2297, 2279, 2280, +- 2297, 2306, 2297, 2307, 2287, 2308, 2309, 2297, 2310, 1946, +- 2297, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2283, 2295, +- +- 2285, 2304, 2305, 2311, 2297, 2313, 2314, 2315, 2317, 2306, +- 2318, 2307, 2316, 2308, 2309, 2301, 2310, 2303, 2319, 2316, +- 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2321, 2322, +- 2323, 2311, 2297, 2313, 2314, 2315, 2317, 2320, 2318, 2324, +- 2325, 2326, 2320, 2327, 2328, 2329, 2319, 2330, 2331, 2333, +- 2334, 2335, 2337, 2340, 2342, 2343, 2321, 2322, 2323, 2344, +- 2346, 2347, 2348, 2349, 2350, 2320, 2351, 2324, 2325, 2326, +- 2320, 2327, 2328, 2329, 2352, 2330, 2331, 2333, 2334, 2335, +- 2337, 2340, 2342, 2343, 2355, 2357, 2362, 2344, 2346, 2347, +- 2348, 2349, 2350, 2363, 2351, 2359, 2359, 2365, 2359, 2366, +- +- 2361, 2361, 2352, 2361, 2365, 2367, 2368, 2369, 2367, 2368, +- 2367, 2370, 2355, 2357, 2362, 2371, 2372, 2370, 2373, 2374, +- 2375, 2363, 1918, 2376, 2377, 2365, 2376, 2366, 2378, 2379, +- 2380, 2381, 2365, 2382, 2383, 2369, 2384, 2386, 1901, 2370, +- 2386, 2388, 2386, 2371, 2372, 2370, 2373, 2374, 2375, 2389, +- 2359, 2390, 2377, 2391, 2392, 2361, 2378, 2379, 2380, 2381, +- 2393, 2382, 2383, 2387, 2384, 2359, 2387, 2394, 2387, 2388, +- 2361, 2395, 2397, 2398, 2400, 2397, 2401, 2389, 2402, 2390, +- 2403, 2391, 2392, 2404, 2405, 2406, 2407, 2408, 2393, 2409, +- 2411, 2412, 2413, 2414, 2416, 2394, 2417, 2418, 2419, 2395, +- +- 2418, 2398, 2400, 2420, 2401, 2422, 2402, 2423, 2403, 2424, +- 2425, 2404, 2405, 2406, 2407, 2408, 2426, 2409, 2411, 2412, +- 2413, 2414, 2416, 2429, 2417, 2421, 2419, 2430, 2421, 2432, +- 2421, 2420, 2434, 2422, 2435, 2423, 2437, 2424, 2425, 2438, +- 2439, 2440, 2441, 2434, 2426, 1900, 2442, 2444, 2445, 2446, +- 2447, 2429, 2448, 2449, 2451, 2430, 2452, 2432, 2453, 2455, +- 2456, 2457, 2435, 2459, 2437, 2460, 2461, 2438, 2439, 2440, +- 2441, 2462, 2463, 2434, 2442, 2444, 2445, 2446, 2447, 2464, +- 2448, 2449, 2451, 2465, 2452, 2466, 2453, 2455, 2456, 2457, +- 2467, 2459, 2468, 2460, 2461, 2469, 2472, 2473, 2474, 2462, +- +- 2463, 2476, 2477, 2478, 2482, 2483, 2487, 2464, 2489, 2490, +- 2491, 2465, 2492, 2466, 2493, 2494, 2495, 2496, 2467, 2497, +- 2468, 2499, 2502, 2469, 2472, 2473, 2474, 2503, 1897, 2476, +- 2477, 2478, 2482, 2483, 2572, 2510, 2514, 2572, 2491, 2502, +- 2492, 2503, 2493, 2494, 2495, 2496, 2512, 2497, 2513, 2499, +- 1861, 2487, 2501, 2489, 2490, 2501, 2504, 2501, 2516, 2504, +- 2517, 2504, 2501, 1830, 2514, 2501, 2504, 2502, 2505, 2503, +- 2518, 2505, 2506, 2505, 2519, 2506, 2520, 2506, 2505, 2501, +- 2510, 2505, 2506, 2504, 2522, 2506, 2516, 2523, 2517, 2524, +- 2526, 2512, 2527, 2513, 2528, 2505, 2529, 2530, 2518, 2506, +- +- 2531, 2532, 2519, 2533, 2520, 2534, 2535, 2501, 2536, 2537, +- 2538, 2504, 2522, 2539, 2540, 2523, 2541, 2524, 2526, 2542, +- 2527, 2543, 2528, 2505, 2529, 2530, 2544, 2506, 2531, 2532, +- 2545, 2533, 2546, 2534, 2535, 2547, 2536, 2537, 2538, 2548, +- 2550, 2539, 2540, 2552, 2541, 2553, 2554, 2542, 2555, 2543, +- 2556, 2557, 2558, 2559, 2544, 2566, 2561, 2561, 2545, 2561, +- 2546, 2564, 2564, 2547, 2564, 2567, 2568, 2548, 2550, 2569, +- 2573, 2552, 2574, 2553, 2554, 2575, 2555, 2576, 2556, 2557, +- 2558, 2559, 2577, 2566, 2578, 2579, 2580, 2581, 1761, 2582, +- 2581, 2583, 2581, 2567, 2568, 2585, 2586, 2569, 2573, 2587, +- +- 2574, 2588, 2589, 2575, 2593, 2576, 2594, 2595, 2596, 2597, +- 2577, 2561, 2578, 2579, 2580, 2598, 2564, 2582, 2600, 2583, +- 2600, 2602, 2601, 2585, 2586, 2601, 2561, 2587, 2604, 2588, +- 2589, 2564, 2593, 2605, 2594, 2595, 2596, 2597, 2606, 2607, +- 2609, 2610, 2611, 2598, 2612, 2613, 2600, 2612, 2600, 2602, +- 2614, 2615, 2616, 2617, 2619, 2620, 2604, 2621, 2622, 2622, +- 2621, 2605, 2621, 2623, 2613, 2627, 2606, 2607, 2609, 2610, +- 2611, 2625, 2629, 2613, 2625, 2630, 2625, 2631, 2614, 2615, +- 2616, 2617, 2619, 2620, 2632, 2633, 2622, 2622, 2634, 2635, +- 2636, 2623, 2613, 2627, 2638, 2639, 2640, 2641, 2642, 2643, +- +- 2629, 2644, 2645, 2630, 2646, 2631, 2647, 2648, 2649, 2650, +- 2651, 2654, 2632, 2633, 2655, 2656, 2634, 2635, 2636, 2657, +- 2658, 2659, 2638, 2639, 2640, 2641, 2642, 2643, 2660, 2644, +- 2645, 2661, 2646, 2662, 2647, 2648, 2649, 2650, 2651, 2654, +- 2664, 2665, 2655, 2656, 2666, 2667, 2668, 2657, 2658, 2659, +- 2669, 2671, 2672, 2673, 2675, 2676, 2660, 2677, 2678, 2661, +- 2679, 2662, 2680, 2681, 2682, 2684, 2685, 2686, 2664, 2665, +- 2687, 2688, 2666, 2667, 2668, 2689, 2707, 2692, 2669, 2671, +- 2672, 2673, 2675, 2676, 2779, 2677, 2678, 2779, 2679, 2699, +- 2680, 2692, 1760, 2684, 2685, 2686, 2696, 2693, 2687, 2688, +- +- 2693, 2694, 2693, 2689, 2694, 2697, 2694, 2693, 2681, 2682, +- 2693, 2694, 2698, 2696, 2694, 2698, 2709, 2699, 2708, 2692, +- 2700, 2707, 2697, 2700, 2693, 2700, 2710, 2813, 2694, 2698, +- 2700, 1759, 2701, 2700, 2711, 2701, 2780, 2701, 2813, 2780, +- 2785, 2696, 2701, 2785, 2709, 2713, 2888, 2700, 2714, 2888, +- 2697, 2715, 2693, 2716, 2710, 2702, 2694, 2717, 2702, 2701, +- 2702, 2704, 2711, 2708, 2704, 2702, 2704, 2705, 2702, 2718, +- 2705, 2704, 2705, 2713, 2704, 2700, 2714, 2705, 2719, 2715, +- 2705, 2716, 2702, 2720, 2721, 2717, 2722, 2701, 2704, 2723, +- 2724, 2725, 2726, 2727, 2705, 2728, 2729, 2718, 2731, 2732, +- +- 2733, 2734, 2735, 2736, 2737, 2738, 2719, 2739, 2740, 2741, +- 2702, 2720, 2721, 2742, 2722, 2743, 2704, 2723, 2724, 2725, +- 2726, 2727, 2705, 2728, 2729, 2745, 2731, 2732, 2733, 2734, +- 2735, 2736, 2737, 2738, 2746, 2739, 2740, 2741, 2747, 2748, +- 2749, 2742, 2750, 2743, 2752, 2753, 2757, 2758, 2759, 2760, +- 2761, 2762, 2763, 2745, 2764, 2767, 2768, 2769, 2770, 2771, +- 2772, 2773, 2746, 2776, 2777, 2778, 2747, 2748, 2749, 2782, +- 2750, 2783, 2752, 2753, 2757, 2758, 2759, 2760, 2761, 2762, +- 2763, 2786, 2764, 2767, 2768, 2769, 2770, 2771, 2772, 2773, +- 2787, 2776, 2777, 2778, 2788, 2789, 2790, 2782, 2791, 2783, +- +- 2792, 2793, 2794, 2789, 2789, 2794, 2789, 2794, 2789, 2786, +- 2795, 2796, 2797, 2798, 2799, 2800, 2801, 2802, 2787, 2805, +- 2806, 2807, 2811, 2789, 2790, 2788, 2791, 2812, 2792, 2793, +- 2814, 2789, 2789, 2817, 2789, 2816, 2789, 2818, 2795, 2796, +- 2797, 2798, 2799, 2800, 2801, 2802, 2816, 2805, 2806, 2807, +- 2811, 2819, 2820, 2788, 2821, 2812, 2822, 2823, 2814, 2826, +- 2827, 2817, 2828, 2829, 2830, 2818, 2831, 2832, 2833, 2834, +- 2835, 2836, 2837, 2826, 2838, 2839, 2840, 2831, 2841, 2819, +- 2820, 2842, 2821, 2844, 2822, 2823, 2845, 2826, 2827, 2846, +- 2828, 2829, 2830, 2847, 2848, 2832, 2833, 2834, 2835, 2836, +- +- 2837, 2849, 2838, 2839, 2840, 2850, 2841, 2851, 2852, 2842, +- 2853, 2844, 2854, 2855, 2845, 2856, 2857, 2846, 2858, 2859, +- 2860, 2847, 2848, 2861, 2862, 2863, 2864, 2865, 2869, 2849, +- 1732, 2867, 1728, 2850, 1719, 2851, 2852, 2894, 2853, 2948, +- 2854, 2855, 2948, 2856, 2857, 2869, 2858, 2859, 2860, 2867, +- 2896, 1715, 2862, 2863, 2864, 2865, 2891, 2868, 2877, 2867, +- 2868, 2871, 2868, 2897, 2871, 2894, 2871, 2868, 2861, 2872, +- 2868, 2871, 2872, 2869, 2872, 2877, 1713, 2867, 2896, 2872, +- 2873, 2878, 2872, 2873, 2868, 2873, 2898, 2879, 2871, 2880, +- 2873, 2897, 2874, 2873, 2899, 2874, 2872, 2874, 2878, 2900, +- +- 2991, 2891, 2874, 2877, 2879, 2874, 2880, 2873, 2901, 1711, +- 2882, 2991, 2868, 2882, 2898, 2882, 2871, 1701, 2902, 2874, +- 2882, 1659, 2899, 2882, 2872, 1649, 2878, 2900, 2884, 2903, +- 1579, 2884, 2879, 2884, 2880, 2873, 2901, 2882, 2884, 2885, +- 2886, 2884, 2885, 2886, 2885, 2886, 2902, 2874, 2887, 2885, +- 2886, 2887, 2885, 2887, 2905, 2884, 1574, 2903, 2887, 2889, +- 2906, 2908, 2889, 2910, 2889, 2882, 2885, 2886, 2912, 2889, +- 1572, 2890, 2889, 2913, 2890, 2887, 2890, 2914, 2916, 2917, +- 2918, 2890, 2905, 2884, 2890, 2919, 2889, 2920, 2906, 2908, +- 2921, 2910, 2922, 2923, 2885, 2886, 2912, 2924, 2890, 2925, +- +- 2926, 2913, 2930, 2887, 2931, 2914, 2916, 2917, 2918, 2932, +- 2934, 2935, 2936, 2919, 2889, 2920, 2937, 2938, 2921, 2939, +- 2922, 2923, 2941, 2943, 2944, 2924, 2890, 2925, 2926, 2945, +- 2930, 2946, 2931, 2947, 2949, 2951, 2952, 2932, 2934, 2935, +- 2936, 2953, 2958, 2954, 2937, 2938, 2954, 2939, 2959, 2961, +- 2941, 2943, 2944, 2955, 2962, 2963, 2955, 2945, 2955, 2946, +- 2964, 2947, 2949, 2951, 2952, 2965, 2966, 2967, 2968, 2953, +- 2958, 2969, 2973, 2974, 2969, 2975, 2959, 2961, 2967, 2967, +- 2970, 2977, 2962, 2963, 2970, 2978, 2976, 2972, 2964, 2976, +- 2972, 2970, 2972, 2965, 2966, 2967, 2968, 2979, 2980, 2982, +- +- 2973, 2974, 2983, 2975, 2984, 2988, 2967, 2967, 2970, 2977, +- 2989, 2992, 2970, 2978, 2994, 2995, 2996, 2997, 2998, 2970, +- 2999, 3000, 3001, 3002, 3002, 2979, 2980, 2982, 3003, 3004, +- 2983, 3005, 2984, 2988, 3006, 3007, 3008, 3010, 2989, 2992, +- 3011, 3012, 2994, 2995, 2996, 2997, 2998, 3013, 2999, 3000, +- 3001, 3002, 3002, 3014, 3015, 3016, 3003, 3004, 3017, 3005, +- 3018, 3019, 3006, 3007, 3008, 3010, 3020, 3021, 3011, 3012, +- 3023, 3018, 3024, 1550, 3025, 3013, 3027, 3020, 3029, 1546, +- 3030, 3014, 3015, 3016, 3031, 3033, 3017, 3034, 3035, 3019, +- 3036, 3037, 3039, 3040, 3041, 3021, 3043, 3044, 3023, 1529, +- +- 3024, 3018, 3025, 3050, 3027, 1528, 3029, 3020, 3030, 3041, +- 3048, 3049, 3031, 3033, 3049, 3034, 3035, 1525, 3036, 3037, +- 3039, 3040, 3041, 3046, 3043, 3044, 3046, 3048, 3046, 3051, +- 3056, 3050, 3051, 3046, 3051, 3052, 3046, 3041, 3052, 3051, +- 3052, 3053, 3051, 3065, 3053, 3052, 3053, 3056, 3286, 3057, +- 3046, 3053, 3066, 1471, 3053, 3048, 3051, 3067, 3060, 3286, +- 3054, 3060, 3052, 3054, 3059, 3054, 3057, 3059, 3053, 3059, +- 3054, 3065, 1470, 3054, 3059, 3056, 3061, 3059, 3046, 3061, +- 3066, 3061, 3069, 3071, 3051, 3067, 3061, 3054, 3073, 3061, +- 3052, 3059, 3074, 3075, 3057, 3062, 3053, 3076, 3062, 3078, +- +- 3062, 3079, 3080, 3061, 3081, 3062, 3082, 3083, 3062, 3084, +- 3069, 3071, 3085, 3087, 3088, 3054, 3073, 3089, 3090, 3059, +- 3074, 3075, 3062, 3092, 3093, 3076, 3094, 3078, 3095, 3079, +- 3080, 3061, 3081, 3096, 3082, 3083, 3097, 3084, 3098, 3097, +- 3085, 3087, 3088, 3099, 3100, 3089, 3090, 3102, 3103, 3104, +- 3062, 3092, 3093, 3105, 3094, 3106, 3095, 3109, 3402, 3113, +- 3109, 3096, 3113, 3645, 1463, 3108, 3098, 3107, 3111, 3402, +- 3107, 3099, 3100, 3116, 3117, 3102, 3103, 3104, 3119, 3120, +- 3121, 3105, 3122, 3106, 3107, 3107, 3107, 3107, 3107, 3107, +- 3107, 3107, 3107, 3108, 3115, 3123, 3111, 3115, 3124, 3115, +- +- 3125, 3116, 3117, 3126, 3127, 3128, 3119, 3120, 3121, 3137, +- 3122, 3235, 3137, 3645, 3235, 3130, 3131, 3129, 3132, 3134, +- 3129, 3135, 3136, 3123, 3138, 3139, 3124, 3140, 3125, 3141, +- 3143, 3126, 3127, 3128, 3129, 3129, 3129, 3129, 3129, 3129, +- 3129, 3129, 3129, 3130, 3131, 3144, 3132, 3134, 3145, 3135, +- 3136, 3147, 3138, 3139, 3148, 3140, 3150, 3141, 3143, 3151, +- 3152, 3154, 3155, 3157, 3158, 3159, 3160, 3161, 3162, 3164, +- 3165, 3166, 3167, 3144, 3169, 3170, 3145, 3171, 3172, 3147, +- 3174, 3176, 3148, 3179, 3150, 3183, 3185, 3151, 3152, 3154, +- 3155, 3157, 3158, 3159, 3160, 3161, 3162, 3164, 3165, 3166, +- +- 3167, 3182, 3169, 3170, 3187, 3171, 3172, 3188, 3174, 3176, +- 3189, 3179, 3182, 3183, 3185, 3190, 3191, 3192, 3193, 3195, +- 3196, 3197, 3198, 3199, 3200, 3267, 3201, 3213, 3267, 3201, +- 3214, 3201, 3187, 1462, 3199, 3188, 3201, 3202, 3189, 3201, +- 3207, 1461, 3182, 3190, 3191, 3192, 3193, 3195, 3196, 3197, +- 3198, 3199, 3200, 3201, 3202, 3213, 3204, 3207, 3214, 3204, +- 3205, 3204, 3199, 3205, 3206, 3205, 3204, 3206, 3215, 3206, +- 3205, 1406, 3275, 3216, 3206, 3275, 3217, 3206, 3219, 3220, +- 3221, 3201, 3202, 3204, 3223, 3207, 3224, 3205, 1405, 3208, +- 3209, 3206, 3208, 3209, 3208, 3209, 3215, 1394, 1370, 3208, +- +- 3209, 3216, 3208, 3209, 3217, 1369, 3219, 3220, 3221, 3225, +- 3226, 3204, 3223, 3227, 3224, 3205, 3208, 3209, 3228, 3206, +- 3211, 3212, 3231, 3211, 3212, 3211, 3212, 3232, 3233, 3234, +- 3211, 3212, 3236, 3211, 3212, 3237, 3240, 3225, 3226, 3241, +- 3242, 3227, 3243, 3244, 3208, 3209, 3228, 3211, 3212, 3239, +- 3231, 3245, 3239, 3246, 3239, 3232, 3233, 3234, 3247, 3279, +- 3236, 3407, 3279, 3237, 3240, 1365, 1364, 3241, 3242, 3249, +- 3243, 3244, 3407, 1363, 3254, 3211, 3212, 3254, 1362, 3245, +- 3251, 3246, 3250, 3253, 3256, 3250, 3247, 3248, 3248, 3248, +- 3248, 3248, 3248, 3248, 3248, 3248, 3257, 3249, 3258, 3250, +- +- 3250, 3250, 3250, 3250, 3250, 3250, 3250, 3250, 3251, 3259, +- 3260, 3253, 3256, 3261, 3262, 3263, 3264, 3265, 3268, 3269, +- 3254, 3271, 3272, 3273, 3257, 3276, 3258, 3266, 3266, 3266, +- 3266, 3266, 3266, 3266, 3266, 3266, 3277, 3259, 3260, 3278, +- 3280, 3261, 3262, 3263, 3264, 3265, 3268, 3269, 3254, 3271, +- 3272, 3273, 3281, 3276, 3282, 3281, 3283, 3284, 3285, 3287, +- 3288, 3289, 3290, 3292, 3277, 3293, 3294, 3278, 3280, 3295, +- 3296, 3300, 3301, 3302, 3303, 3306, 3307, 3308, 3647, 3311, +- 3313, 3314, 3282, 3315, 3283, 3284, 3285, 3287, 3288, 3289, +- 3290, 3292, 3316, 3293, 3294, 3317, 3318, 3295, 3296, 3300, +- +- 3301, 3302, 3303, 3306, 3307, 3308, 3309, 3311, 3313, 3314, +- 3319, 3315, 3320, 3322, 3309, 3323, 3324, 3325, 3326, 3327, +- 3316, 1361, 3328, 3317, 3318, 3328, 3331, 3328, 3647, 3331, +- 3334, 3329, 3328, 3353, 3309, 3328, 3353, 1359, 3319, 3335, +- 3320, 3322, 3309, 3323, 3324, 3325, 3326, 3327, 3329, 3328, +- 1327, 3330, 3332, 3336, 3330, 3332, 3330, 3332, 3334, 3337, +- 3338, 3330, 3332, 3341, 3330, 3332, 3343, 3335, 3345, 1323, +- 3333, 3346, 3347, 3333, 3348, 3333, 3329, 3328, 3330, 3332, +- 3333, 3336, 3349, 3333, 3351, 3354, 3357, 3337, 3338, 3383, +- 3384, 3341, 3383, 3384, 3343, 1294, 3345, 3333, 3352, 3346, +- +- 3347, 3352, 3348, 1286, 1284, 3385, 3330, 3332, 3385, 1279, +- 3349, 3715, 3351, 3354, 3357, 3352, 3352, 3352, 3352, 3352, +- 3352, 3352, 3352, 3352, 3358, 3333, 3355, 3355, 3355, 3355, +- 3355, 3355, 3355, 3355, 3355, 3355, 3355, 3356, 3356, 3356, +- 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3359, 3360, +- 3361, 3355, 3358, 3362, 3363, 3364, 3365, 3367, 3369, 3371, +- 3373, 3715, 3356, 3366, 3366, 3366, 3366, 3366, 3366, 3366, +- 3366, 3366, 3370, 3374, 3375, 3370, 3359, 3360, 3361, 3376, +- 3377, 3362, 3363, 3364, 3365, 3367, 3369, 3371, 3373, 3370, +- 3370, 3370, 3370, 3370, 3370, 3370, 3370, 3370, 3378, 3379, +- +- 3380, 3374, 3375, 3381, 3386, 3387, 3388, 3376, 3377, 3388, +- 3389, 3390, 3391, 3392, 3393, 3396, 3392, 3393, 3398, 3400, +- 3404, 3405, 3406, 1274, 1217, 1216, 3378, 3379, 3380, 1215, +- 3666, 3381, 3386, 3387, 3394, 3408, 3409, 3394, 3389, 3390, +- 3391, 3666, 3411, 3396, 3412, 3413, 3398, 3400, 3404, 3405, +- 3406, 3394, 3394, 3394, 3394, 3394, 3394, 3394, 3394, 3394, +- 3410, 3414, 3415, 3408, 3409, 3416, 3417, 3418, 3410, 3410, +- 3411, 3419, 3412, 3413, 3420, 3421, 3422, 3423, 3424, 3426, +- 3427, 3428, 3429, 3430, 3431, 3432, 3431, 3433, 3410, 3414, +- 3415, 3434, 3436, 3416, 3417, 3418, 3410, 3410, 3437, 3419, +- +- 1214, 3439, 3420, 3421, 3422, 3423, 3424, 3426, 3427, 3428, +- 3429, 3430, 3440, 3432, 3441, 3433, 3443, 1213, 3438, 3434, +- 3436, 3438, 3445, 3438, 3449, 3451, 3437, 3454, 3438, 3439, +- 3454, 3438, 3479, 3480, 3489, 3479, 3480, 3489, 3480, 3456, +- 3440, 1212, 3441, 1208, 3443, 3438, 3457, 3458, 3459, 3460, +- 3445, 3461, 3449, 3451, 3462, 1207, 3431, 3452, 3452, 3452, +- 3452, 3452, 3452, 3452, 3452, 3452, 3453, 3456, 3455, 3453, +- 1206, 3453, 1192, 3438, 3457, 3458, 3459, 3460, 3464, 3461, +- 3465, 3468, 3462, 3453, 3453, 3453, 3453, 3453, 3453, 3453, +- 3453, 3453, 3455, 3455, 3455, 3455, 3455, 3455, 3455, 3455, +- +- 3455, 3455, 3455, 3469, 3470, 3471, 3464, 3472, 3465, 3468, +- 3473, 1190, 3474, 3473, 3475, 3476, 3477, 3455, 3467, 3467, +- 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3482, 3483, 3485, +- 3486, 3469, 3470, 3471, 3487, 3472, 3492, 1185, 3497, 3473, +- 3474, 3667, 3475, 3476, 3477, 3481, 3484, 1157, 3481, 3484, +- 3481, 3484, 3667, 1152, 1142, 3482, 3483, 3485, 3486, 3496, +- 3490, 3498, 3487, 3490, 3492, 3496, 3497, 3473, 3491, 3491, +- 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3490, 3490, 3490, +- 3490, 3490, 3490, 3490, 3490, 3490, 3499, 3496, 3501, 3498, +- 3502, 3503, 3504, 3496, 3505, 3506, 3508, 3511, 3513, 3514, +- +- 3515, 3516, 3517, 3520, 3521, 3523, 3524, 3538, 3546, 3550, +- 3538, 3546, 3550, 1131, 3499, 1129, 3501, 1127, 3502, 3503, +- 3504, 3526, 3505, 3506, 3508, 3511, 3513, 3514, 3515, 3516, +- 3517, 3520, 3521, 3523, 3524, 3525, 3525, 3525, 3525, 3525, +- 3525, 3525, 3525, 3525, 3525, 3525, 3527, 3528, 3531, 3526, +- 3532, 3533, 3534, 3536, 3537, 3622, 3625, 1126, 3622, 3625, +- 3525, 3539, 3539, 3539, 3539, 3539, 3539, 3539, 3539, 3539, +- 3543, 3544, 3545, 3547, 3527, 3528, 3531, 3548, 3532, 3533, +- 3534, 3536, 3537, 3540, 3540, 3540, 3540, 3540, 3540, 3540, +- 3540, 3540, 3541, 3549, 3551, 3541, 3552, 3553, 3543, 3544, +- +- 3545, 3547, 3555, 3556, 3558, 3548, 3559, 3560, 3562, 3541, +- 3541, 3541, 3541, 3541, 3541, 3541, 3541, 3541, 1112, 1111, +- 3557, 3549, 3551, 3557, 3552, 3553, 3561, 1107, 3569, 3561, +- 3555, 3556, 3558, 3570, 3559, 3560, 3562, 3557, 3557, 3557, +- 3557, 3557, 3557, 3557, 3557, 3557, 3564, 3567, 3572, 3564, +- 3567, 3564, 3567, 3573, 3574, 3561, 3569, 3628, 1106, 1105, +- 3628, 3570, 3628, 3690, 3693, 3579, 3690, 3693, 3690, 3693, +- 3575, 3762, 3763, 1104, 3762, 3763, 3572, 3576, 1103, 1063, +- 3576, 3573, 3574, 3561, 3575, 3575, 3575, 3575, 3575, 3575, +- 3575, 3575, 3575, 3579, 3576, 3576, 3576, 3576, 3576, 3576, +- +- 3576, 3576, 3576, 3577, 3577, 3577, 3577, 3577, 3577, 3577, +- 3577, 3577, 3580, 3581, 3583, 3585, 3586, 3587, 3588, 3589, +- 3590, 3591, 3592, 3593, 3594, 3595, 3596, 3597, 3598, 3601, +- 3605, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, +- 3580, 3581, 3583, 3585, 3586, 3587, 3588, 3589, 3590, 3591, +- 3592, 3593, 3594, 3595, 3596, 3597, 3598, 3601, 3605, 3606, +- 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, +- 3607, 3608, 3609, 3612, 3614, 3615, 3618, 3696, 3618, 3618, +- 3696, 3618, 3696, 1011, 3606, 3621, 3623, 3803, 3627, 3618, +- 3803, 3629, 3619, 3630, 3631, 3632, 3633, 3635, 3607, 3608, +- +- 3609, 3612, 3614, 3615, 3619, 3619, 3619, 3619, 3619, 3619, +- 3619, 3619, 3619, 3621, 3623, 3624, 3627, 3807, 3624, 3629, +- 3807, 3630, 3631, 3632, 3633, 3635, 3636, 3639, 3640, 3643, +- 3648, 3649, 3624, 3624, 3624, 3624, 3624, 3624, 3624, 3624, +- 3624, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, +- 3638, 3650, 3736, 3638, 3636, 3639, 3640, 3643, 3648, 3649, +- 3618, 3652, 3653, 3736, 1010, 990, 977, 3638, 3638, 3638, +- 3638, 3638, 3638, 3638, 3638, 3638, 3644, 3651, 3654, 3650, +- 3644, 3656, 3657, 3658, 3659, 3660, 3661, 3644, 3662, 3652, +- 3653, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, +- +- 3663, 3664, 3665, 3668, 3644, 3670, 3654, 3676, 3644, 3656, +- 3657, 3658, 3659, 3660, 3661, 3644, 3662, 3678, 3680, 3682, +- 3689, 3683, 3691, 3683, 3683, 966, 3683, 946, 3663, 3664, +- 3665, 3668, 3698, 3670, 3683, 3676, 3684, 3699, 3684, 3684, +- 3700, 3684, 3701, 3702, 3703, 3678, 3680, 3682, 3689, 3684, +- 3691, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, +- 3698, 3704, 3706, 3707, 3710, 3699, 3711, 3712, 3700, 3713, +- 3701, 3702, 3703, 3705, 3705, 3705, 3705, 3705, 3705, 3705, +- 3705, 3705, 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3704, +- 3706, 3707, 3710, 3724, 3711, 3712, 3725, 3713, 3727, 3728, +- +- 3729, 3731, 3732, 3735, 3740, 3683, 3742, 3743, 3746, 3750, +- 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3753, 3743, 3754, +- 3684, 3724, 3755, 3756, 3725, 3757, 3727, 3728, 3729, 3731, +- 3732, 3735, 3740, 3758, 3742, 3743, 3746, 3748, 3759, 3760, +- 3748, 3761, 3748, 3764, 3761, 3753, 3743, 3754, 3765, 3766, +- 3755, 3756, 3767, 3757, 3768, 3770, 3771, 3773, 3774, 3750, +- 3791, 3758, 3775, 3776, 3777, 3778, 3759, 3760, 3779, 3783, +- 3784, 3764, 3785, 3786, 3788, 3793, 3765, 3795, 3796, 3798, +- 3767, 3799, 3768, 3770, 3771, 3773, 3774, 3800, 3761, 3801, +- 3775, 3776, 3777, 3778, 3802, 3804, 3779, 3783, 3784, 3766, +- +- 3785, 3786, 3788, 3809, 3810, 3795, 3796, 3798, 3805, 3799, +- 3791, 3805, 3811, 3805, 3812, 3800, 3761, 3801, 3813, 3816, +- 3817, 3806, 3802, 3804, 3806, 3793, 3806, 3808, 3818, 3819, +- 3808, 3809, 3810, 3820, 3821, 3824, 3825, 3828, 3830, 3825, +- 3811, 3831, 3812, 3832, 3833, 3835, 3813, 3816, 3817, 3836, +- 3838, 3839, 928, 3838, 3847, 3840, 3818, 3819, 3840, 3862, +- 3840, 3820, 3821, 3824, 3849, 3842, 3830, 3850, 3842, 3831, +- 3842, 3832, 3833, 3835, 3851, 3844, 3853, 3836, 3844, 3839, +- 3844, 3845, 3847, 3854, 3845, 3855, 3845, 3828, 3856, 3857, +- 3863, 3865, 3849, 3861, 3858, 3850, 3861, 3864, 3861, 3866, +- +- 3864, 3869, 3851, 3867, 3853, 3858, 3867, 3872, 3858, 3862, +- 3872, 3854, 3872, 3855, 3877, 3878, 3856, 3857, 3863, 3865, +- 3874, 3879, 3858, 3874, 3880, 3874, 3881, 3866, 3882, 3869, +- 3883, 3884, 3885, 3858, 3886, 3887, 3858, 3893, 3896, 903, +- 891, 3891, 3877, 3878, 3891, 3895, 3891, 880, 3895, 3879, +- 3894, 878, 3880, 3894, 3881, 876, 3882, 872, 3883, 3884, +- 3885, 3897, 3886, 3887, 3897, 3893, 3896, 3894, 3894, 3894, +- 3894, 3894, 3894, 3894, 3894, 3894, 3898, 3903, 3897, 3897, +- 3897, 3897, 3897, 3897, 3897, 3897, 3897, 3904, 3905, 3908, +- 3910, 3911, 3912, 3913, 3917, 3917, 3917, 3917, 3917, 3917, +- +- 3917, 3917, 3917, 828, 3898, 3903, 3918, 3919, 817, 3918, +- 3919, 808, 804, 3921, 3924, 3904, 3905, 3908, 3910, 3911, +- 3912, 3913, 3925, 3918, 3918, 3918, 3918, 3918, 3918, 3918, +- 3918, 3918, 3920, 3920, 3920, 3920, 3920, 3920, 3920, 3920, +- 3920, 3921, 3924, 3926, 3929, 3930, 3938, 3941, 3943, 773, +- 3925, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, +- 3934, 772, 770, 3934, 769, 768, 766, 3944, 3945, 3946, +- 3948, 3926, 3929, 3930, 3938, 3941, 3943, 3934, 3934, 3934, +- 3934, 3934, 3934, 3934, 3934, 3934, 3942, 3942, 3942, 3942, +- 3942, 3942, 3942, 3942, 3942, 3944, 3945, 3946, 3948, 3949, +- +- 3950, 761, 760, 758, 757, 756, 750, 743, 732, 731, +- 712, 700, 689, 677, 676, 671, 670, 668, 661, 651, +- 650, 648, 644, 634, 633, 631, 628, 3949, 3950, 3953, +- 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3953, +- 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3954, 3954, 3954, +- 3954, 3954, 3954, 3954, 3954, 3954, 3954, 3954, 3954, 3954, +- 3954, 3954, 3954, 3954, 3954, 3955, 3955, 3955, 3955, 3955, +- 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, +- 3955, 3955, 3955, 3956, 3956, 3956, 3956, 3956, 3956, 3956, +- 3956, 3956, 3956, 3956, 3956, 3956, 3956, 3956, 3956, 3956, +- +- 3956, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, +- 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3958, +- 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3958, +- 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3959, 3959, 3959, +- 3959, 3959, 3959, 3959, 3959, 3959, 3959, 3959, 3959, 3959, +- 3959, 3959, 3959, 3959, 3959, 3960, 3960, 3960, 3960, 3960, +- 3960, 3960, 3960, 3960, 3960, 3960, 3960, 3960, 3960, 3960, +- 3960, 3960, 3960, 3961, 3961, 3961, 3961, 3961, 3961, 3961, +- 3961, 3961, 3961, 3961, 3961, 3961, 3961, 3961, 3961, 3961, +- 3961, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, +- +- 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3963, +- 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3963, +- 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3964, 3964, 3964, +- 3964, 3964, 3964, 3964, 3964, 3964, 3964, 3964, 3964, 3964, +- 3964, 3964, 3964, 3964, 3964, 3965, 3965, 3965, 3965, 3965, +- 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, +- 3965, 3965, 3965, 3966, 3966, 3966, 3966, 3966, 3966, 3966, +- 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, +- 3966, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, +- 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3968, +- ++ 2016, 2009, 2010, 2011, 2017, 2018, 2012, 2019, 2300, 2166, ++ 2299, 2021, 2166, 2022, 2166, 2178, 2013, 2023, 2178, 2014, ++ 2178, 2015, 2196, 2024, 2025, 2196, 2026, 2196, 2016, 2027, ++ 2028, 2029, 2017, 2018, 2030, 2019, 2020, 2020, 2020, 2021, ++ 2020, 2022, 2020, 2020, 2031, 2023, 2020, 2020, 2020, 2032, ++ 2020, 2024, 2025, 2020, 2026, 2020, 2033, 2027, 2028, 2029, ++ 2034, 2035, 2030, 2036, 2020, 2020, 2020, 2037, 2020, 2038, ++ 2020, 2020, 2031, 2039, 2020, 2020, 2020, 2032, 2020, 2040, ++ ++ 2041, 2020, 2042, 2020, 2033, 2043, 2044, 2045, 2034, 2035, ++ 2046, 2036, 2049, 2050, 2051, 2037, 2052, 2038, 2057, 2058, ++ 2059, 2039, 2060, 2061, 2062, 2063, 2064, 2040, 2041, 2065, ++ 2042, 2065, 2068, 2043, 2044, 2045, 2069, 2072, 2046, 2075, ++ 2049, 2050, 2051, 2073, 2052, 2073, 2057, 2058, 2059, 2076, ++ 2060, 2061, 2062, 2063, 2064, 2077, 2089, 2065, 2078, 2065, ++ 2068, 2079, 2080, 2081, 2069, 2072, 2090, 2082, 2083, 2084, ++ 2085, 2073, 2086, 2073, 2091, 2094, 2095, 2096, 2097, 2098, ++ 2099, 2100, 2101, 2077, 2075, 2102, 2078, 2103, 2107, 2079, ++ 2080, 2081, 2285, 2283, 2076, 2082, 2083, 2084, 2085, 2282, ++ ++ 2086, 2089, 2108, 2094, 2095, 2096, 2097, 2098, 2099, 2100, ++ 2101, 2090, 2104, 2102, 2104, 2103, 2107, 2260, 2209, 2091, ++ 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2209, ++ 2108, 2246, 2109, 2110, 2111, 2143, 2112, 2113, 2110, 2115, ++ 2104, 2116, 2104, 2105, 2105, 2105, 2105, 2105, 2105, 2105, ++ 2105, 2105, 2117, 2118, 2119, 2105, 2120, 2105, 2105, 2105, ++ 2109, 2110, 2111, 2105, 2112, 2113, 2110, 2115, 2105, 2116, ++ 2121, 2122, 2124, 2125, 2126, 2127, 2128, 2105, 2129, 2130, ++ 2117, 2118, 2119, 2105, 2120, 2105, 2105, 2105, 2131, 2132, ++ 2133, 2105, 2134, 2135, 2137, 2138, 2105, 2139, 2121, 2122, ++ ++ 2124, 2125, 2126, 2127, 2128, 2105, 2129, 2130, 2140, 2141, ++ 2144, 2144, 2144, 2144, 2146, 2146, 2131, 2132, 2133, 2149, ++ 2134, 2135, 2137, 2138, 2151, 2139, 2147, 2147, 2147, 2147, ++ 2148, 2148, 2152, 2153, 2154, 2156, 2140, 2141, 2157, 2158, ++ 2142, 2159, 2160, 2161, 2162, 2163, 2164, 2149, 2165, 2168, ++ 2167, 2169, 2151, 2167, 2170, 2171, 2284, 2055, 2172, 2173, ++ 2152, 2153, 2154, 2156, 2174, 2144, 2157, 2158, 2146, 2159, ++ 2160, 2161, 2162, 2163, 2164, 2175, 2165, 2168, 2176, 2169, ++ 2177, 2147, 2170, 2171, 2148, 2155, 2172, 2173, 2155, 2053, ++ 2167, 2048, 2174, 2180, 2181, 2182, 2183, 2184, 2185, 2186, ++ ++ 2187, 2284, 2188, 2175, 2155, 1967, 2176, 2189, 2177, 2191, ++ 2192, 2193, 2194, 2197, 2198, 2199, 2200, 2155, 2167, 2155, ++ 2201, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2155, ++ 2188, 2155, 2155, 2155, 2203, 2189, 2204, 2191, 2192, 2193, ++ 2194, 2197, 2198, 2199, 2200, 2155, 2202, 2155, 2201, 2202, ++ 2205, 2207, 2208, 2211, 2210, 2212, 2213, 2155, 2214, 2155, ++ 2155, 2155, 2203, 2215, 2204, 2210, 2216, 2217, 2218, 2219, ++ 2220, 2221, 2222, 2223, 2224, 2216, 2225, 2226, 2205, 2207, ++ 2208, 2211, 2227, 2212, 2213, 2229, 2214, 2230, 2228, 2231, ++ 2236, 2215, 2237, 2238, 2216, 2217, 2218, 2219, 2220, 2221, ++ ++ 2222, 2223, 2224, 2228, 2225, 2226, 2239, 2240, 2241, 2242, ++ 2227, 2243, 2244, 2229, 2245, 2230, 2228, 2231, 2236, 2247, ++ 2237, 2238, 2248, 2249, 2250, 2251, 2256, 2257, 2259, 2263, ++ 2264, 2228, 2266, 2267, 2239, 2240, 2241, 2242, 2268, 2243, ++ 2244, 2269, 2245, 2270, 2271, 2272, 2279, 2247, 2280, 2281, ++ 2248, 2249, 2250, 2251, 2256, 2257, 2259, 2263, 2264, 2286, ++ 2266, 2267, 2288, 2289, 2290, 2291, 2268, 2292, 2293, 2269, ++ 2294, 2270, 2271, 2272, 2279, 2295, 2280, 2281, 2296, 2302, ++ 2304, 2305, 2306, 1952, 2298, 2307, 2308, 2298, 2309, 2298, ++ 2288, 2289, 2290, 2291, 2298, 2292, 2293, 2298, 2294, 2310, ++ ++ 2311, 2312, 2314, 2295, 2286, 2315, 2296, 2316, 2318, 2305, ++ 2306, 2298, 2319, 2307, 2308, 2368, 2309, 1948, 2368, 1946, ++ 2368, 1918, 2320, 2322, 2302, 2304, 2321, 2310, 2311, 2312, ++ 2314, 2321, 2323, 2315, 2317, 2316, 2318, 2324, 2325, 2298, ++ 2319, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, ++ 2320, 2322, 2326, 2327, 2321, 2328, 2329, 2330, 2331, 2321, ++ 2323, 2332, 2334, 2335, 2336, 2324, 2325, 2338, 2341, 2343, ++ 2344, 2345, 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2356, ++ 2326, 2327, 2358, 2328, 2329, 2330, 2331, 1901, 2363, 2332, ++ 2334, 2335, 2336, 2364, 2367, 2338, 2341, 2343, 2344, 2345, ++ ++ 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2356, 2360, 2360, ++ 2358, 2360, 2362, 2362, 2370, 2362, 2363, 2366, 2372, 2371, ++ 2369, 2364, 2367, 2369, 2366, 2371, 2373, 2374, 2375, 2376, ++ 2377, 2378, 2379, 2377, 2380, 1900, 2381, 2382, 2383, 2816, ++ 2384, 2385, 2370, 1897, 2389, 2366, 2372, 2371, 1861, 2390, ++ 2816, 2391, 2366, 2371, 2373, 2374, 2375, 2376, 2392, 2378, ++ 2379, 2393, 2380, 2360, 2381, 2382, 2383, 2362, 2384, 2385, ++ 2387, 2388, 2389, 2387, 2388, 2387, 2388, 2390, 2360, 2391, ++ 2394, 2395, 2362, 2396, 2398, 2399, 2392, 2398, 2401, 2393, ++ 2402, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 2410, 2412, ++ ++ 2413, 2414, 2415, 2417, 2418, 2420, 2421, 2419, 2394, 2395, ++ 2419, 2396, 2422, 2399, 2423, 2422, 2401, 2422, 2402, 2403, ++ 2404, 2405, 2406, 2407, 2408, 2409, 2410, 2412, 2413, 2414, ++ 2415, 2417, 2418, 2420, 2421, 2424, 2425, 2426, 2427, 2430, ++ 2431, 2433, 2423, 2435, 2436, 2438, 2439, 2440, 2441, 2442, ++ 2443, 2445, 2446, 2447, 2435, 2448, 1830, 2449, 2450, 2451, ++ 2453, 2454, 2455, 2424, 2425, 2426, 2427, 2430, 2431, 2433, ++ 2457, 2458, 2436, 2438, 2439, 2440, 2441, 2442, 2443, 2445, ++ 2446, 2447, 2459, 2448, 2435, 2449, 2450, 2451, 2453, 2454, ++ 2455, 2461, 2462, 2463, 2464, 2465, 2466, 2467, 2457, 2458, ++ ++ 2468, 2469, 2470, 2471, 2474, 2475, 2476, 2478, 2479, 2480, ++ 2459, 2484, 2485, 2489, 2491, 2492, 2493, 2494, 2495, 2461, ++ 2462, 2463, 2464, 2465, 2466, 2467, 2496, 2497, 2468, 2469, ++ 2470, 2471, 2474, 2475, 2476, 2478, 2479, 2480, 2498, 2484, ++ 2485, 2499, 2501, 2505, 2493, 2494, 2495, 2504, 2516, 2512, ++ 2819, 1761, 2514, 2515, 2496, 2497, 1760, 2505, 2489, 2491, ++ 2492, 2819, 2503, 2518, 2504, 2503, 2498, 2503, 2506, 2499, ++ 2501, 2506, 2503, 2506, 2507, 2503, 2516, 2507, 2506, 2507, ++ 2519, 2520, 1759, 2508, 2507, 2505, 2508, 2507, 2508, 2503, ++ 2521, 2518, 2504, 2508, 2512, 2506, 2508, 2514, 2515, 2522, ++ ++ 2524, 2507, 2525, 2526, 2528, 2529, 2530, 2531, 2519, 2520, ++ 2508, 2532, 2533, 2534, 2535, 2536, 2537, 2503, 2521, 2538, ++ 2539, 2540, 2541, 2506, 2542, 2543, 2544, 2522, 2524, 2507, ++ 2525, 2526, 2528, 2529, 2530, 2531, 2545, 2546, 2508, 2532, ++ 2533, 2534, 2535, 2536, 2537, 2547, 2548, 2538, 2539, 2540, ++ 2541, 2549, 2542, 2543, 2544, 2550, 2552, 2554, 2555, 2556, ++ 2557, 2558, 2559, 2560, 2545, 2546, 2561, 2563, 2563, 2568, ++ 2563, 2569, 2570, 2547, 2548, 2566, 2566, 2571, 2566, 2549, ++ 2575, 2576, 2577, 2550, 2552, 2554, 2555, 2556, 2557, 2558, ++ 2559, 2560, 2574, 2578, 2561, 2574, 2579, 2568, 2580, 2569, ++ ++ 2570, 2581, 1732, 2582, 2584, 2571, 2585, 2587, 2575, 2576, ++ 2577, 2583, 2588, 2589, 2583, 2590, 2583, 1728, 2591, 2595, ++ 2596, 2578, 2563, 2597, 2579, 2598, 2580, 2599, 2600, 2581, ++ 2566, 2582, 2584, 2604, 2585, 2587, 2602, 2563, 2602, 2603, ++ 2588, 2589, 2603, 2590, 2606, 2566, 2591, 2595, 2596, 2607, ++ 2608, 2597, 2609, 2598, 2611, 2599, 2600, 2612, 2613, 2614, ++ 2615, 2604, 2614, 2616, 2602, 2617, 2602, 2618, 2619, 2621, ++ 2622, 2623, 2606, 2625, 2623, 2629, 2623, 2607, 2608, 2615, ++ 2609, 2631, 2611, 2624, 2624, 2612, 2613, 2627, 2615, 2632, ++ 2627, 2616, 2627, 2617, 2633, 2618, 2619, 2621, 2622, 2634, ++ ++ 2635, 2625, 2636, 2629, 2637, 2638, 2640, 2615, 2641, 2631, ++ 2642, 2624, 2624, 2643, 2644, 2645, 2646, 2632, 2647, 2648, ++ 2649, 2650, 2633, 2651, 2652, 2653, 2654, 2634, 2635, 2657, ++ 2636, 2658, 2637, 2638, 2640, 2659, 2641, 2660, 2642, 2661, ++ 2662, 2643, 2644, 2645, 2646, 2663, 2647, 2648, 2649, 2650, ++ 2664, 2651, 2652, 2653, 2654, 2665, 2667, 2657, 2668, 2658, ++ 2669, 2670, 2671, 2659, 2672, 2660, 2674, 2661, 2662, 2675, ++ 2676, 2678, 2679, 2663, 2680, 2681, 2682, 2683, 2664, 2684, ++ 2685, 2687, 2688, 2665, 2667, 2689, 2668, 2690, 2669, 2670, ++ 2671, 2691, 2672, 2692, 2674, 1719, 2710, 2675, 2676, 2678, ++ ++ 2679, 2699, 2680, 2681, 2682, 2683, 2695, 2702, 2782, 2687, ++ 2688, 2782, 2700, 2689, 2701, 2690, 2711, 2701, 2699, 2691, ++ 2695, 2692, 1715, 2696, 2684, 2685, 2696, 2697, 2696, 2700, ++ 2697, 2701, 2697, 2696, 1713, 2702, 2696, 2697, 1711, 2703, ++ 2697, 2710, 2703, 1701, 2703, 2712, 2699, 2713, 2695, 2703, ++ 2696, 2714, 2703, 2704, 2697, 2716, 2704, 2700, 2704, 2705, ++ 2717, 2711, 2705, 2704, 2705, 1659, 2703, 2783, 2718, 2705, ++ 2783, 2707, 2705, 2712, 2707, 2713, 2707, 2719, 2696, 2714, ++ 2704, 2707, 2697, 2716, 2707, 2720, 2705, 2721, 2717, 1649, ++ 2708, 2722, 2723, 2708, 2703, 2708, 2718, 2724, 2707, 2725, ++ ++ 2708, 2726, 2727, 2708, 2728, 2719, 2729, 2730, 2704, 2731, ++ 2732, 2734, 2735, 2720, 2705, 2721, 2736, 2708, 2737, 2722, ++ 2723, 2738, 2739, 2740, 2741, 2724, 2707, 2725, 2742, 2726, ++ 2727, 2743, 2728, 2744, 2729, 2730, 2745, 2731, 2732, 2734, ++ 2735, 2746, 2748, 2749, 2736, 2708, 2737, 2750, 2751, 2738, ++ 2739, 2740, 2741, 2752, 2753, 2755, 2742, 2756, 2760, 2743, ++ 2761, 2744, 2762, 2763, 2745, 2764, 2765, 2766, 2767, 2746, ++ 2748, 2749, 2770, 2771, 2772, 2750, 2751, 2773, 2774, 2775, ++ 2776, 2752, 2753, 2755, 2779, 2756, 2760, 2780, 2761, 2781, ++ 2762, 2763, 2785, 2764, 2765, 2766, 2767, 2786, 2789, 2790, ++ ++ 2770, 2771, 2772, 2791, 2793, 2773, 2774, 2775, 2776, 2794, ++ 2788, 2795, 2779, 2788, 2796, 2780, 2797, 2781, 2798, 2797, ++ 2785, 2797, 2792, 2799, 2800, 2786, 2789, 2790, 2801, 2802, ++ 2792, 2792, 2793, 2792, 2791, 2792, 2803, 2794, 2804, 2795, ++ 2805, 2808, 2796, 2809, 2810, 2814, 2798, 2815, 2817, 2820, ++ 2792, 2799, 2800, 2821, 2822, 2823, 2801, 2802, 2792, 2792, ++ 2824, 2792, 2791, 2792, 2803, 2825, 2804, 2826, 2805, 2808, ++ 2829, 2809, 2810, 2814, 2830, 2815, 2817, 2820, 2831, 2832, ++ 2833, 2821, 2822, 2823, 2829, 2834, 2836, 2837, 2824, 2838, ++ 2839, 2840, 2841, 2825, 2842, 2826, 2834, 2843, 2829, 2844, ++ ++ 2845, 2846, 2830, 2848, 2849, 2850, 2831, 2832, 2833, 2851, ++ 2852, 2853, 2854, 2855, 2836, 2837, 2856, 2838, 2839, 2840, ++ 2841, 2857, 2842, 2858, 2859, 2843, 2860, 2844, 2845, 2846, ++ 2861, 2848, 2849, 2850, 2862, 2863, 2864, 2851, 2852, 2853, ++ 2854, 2855, 2865, 2866, 2856, 2867, 2868, 2869, 2871, 2857, ++ 2873, 2858, 2859, 2892, 2860, 1579, 2892, 2952, 2861, 2995, ++ 2952, 1574, 2862, 2863, 2864, 2898, 2871, 2873, 2881, 1572, ++ 2995, 2866, 2895, 2867, 2868, 2869, 2871, 2958, 2872, 2875, ++ 2958, 2872, 2875, 2872, 2875, 2881, 1550, 2865, 2872, 2875, ++ 2900, 2872, 2901, 2898, 2871, 2873, 1546, 2876, 2877, 2882, ++ ++ 2876, 2877, 2876, 2877, 2883, 2872, 2875, 2876, 2877, 2878, ++ 2876, 2877, 2878, 2881, 2878, 2884, 2882, 2895, 2900, 2878, ++ 2901, 2883, 2878, 2902, 2876, 2877, 2903, 2904, 2973, 2905, ++ 2906, 2973, 2884, 2872, 2875, 2886, 2878, 1529, 2886, 2907, ++ 2886, 1528, 1525, 2980, 2882, 2886, 2980, 3054, 2886, 2883, ++ 3054, 2902, 2876, 2877, 2903, 2904, 2888, 2905, 2906, 2888, ++ 2884, 2888, 2886, 1471, 2878, 2889, 2888, 2907, 2889, 2888, ++ 2889, 2890, 1470, 2909, 2890, 2889, 2890, 2891, 2889, 1463, ++ 2891, 2890, 2891, 2888, 2910, 1462, 2893, 2891, 2912, 2893, ++ 2886, 2893, 2889, 2914, 2916, 2917, 2893, 2894, 2890, 2893, ++ ++ 2894, 2909, 2894, 2918, 2891, 2920, 2921, 2894, 2922, 2923, ++ 2894, 2888, 2910, 2893, 2924, 2925, 2912, 2926, 2927, 2928, ++ 2889, 2914, 2916, 2917, 2894, 2929, 2890, 2930, 2934, 2935, ++ 2936, 2918, 2891, 2920, 2921, 2938, 2922, 2923, 2939, 2940, ++ 2941, 2893, 2924, 2925, 2942, 2926, 2927, 2928, 2943, 2945, ++ 2947, 2948, 2894, 2929, 2949, 2930, 2934, 2935, 2936, 2950, ++ 2951, 2953, 2955, 2938, 2956, 2957, 2939, 2940, 2941, 2962, ++ 2959, 2963, 2942, 2959, 2965, 2959, 2943, 2945, 2947, 2948, ++ 2966, 2967, 2949, 2968, 2969, 2970, 2972, 2950, 2951, 2953, ++ 2955, 2977, 2956, 2957, 2971, 2978, 2974, 2962, 2976, 2963, ++ ++ 2974, 2976, 2965, 2976, 2979, 2971, 2971, 2974, 2966, 2967, ++ 2981, 2968, 2969, 2970, 2972, 2982, 2983, 2984, 2986, 2977, ++ 2987, 2988, 2971, 2978, 2974, 2992, 2993, 2996, 2974, 2998, ++ 2999, 3000, 2979, 2971, 2971, 2974, 3001, 3002, 2981, 3003, ++ 3004, 3005, 3007, 2982, 2983, 2984, 2986, 3008, 2987, 2988, ++ 3006, 3006, 3009, 2992, 2993, 2996, 3010, 2998, 2999, 3000, ++ 3011, 3012, 3014, 3015, 3001, 3002, 3016, 3003, 3004, 3005, ++ 3007, 3017, 3018, 3019, 3020, 3008, 3021, 3022, 3006, 3006, ++ 3009, 3023, 3024, 3026, 3010, 3025, 3028, 3029, 3011, 3012, ++ 3014, 3015, 3023, 3030, 3016, 3032, 3025, 3034, 1461, 3017, ++ ++ 3018, 3019, 3020, 3035, 3021, 3022, 3036, 3038, 3039, 3040, ++ 3024, 3026, 3041, 3042, 3028, 3029, 3044, 3045, 3046, 3048, ++ 3049, 3030, 3023, 3032, 3065, 3034, 3025, 3065, 3055, 3070, ++ 3071, 3035, 3292, 3046, 3036, 3038, 3039, 3040, 3053, 3102, ++ 3041, 3042, 3102, 3292, 3044, 3045, 3046, 3048, 3049, 3051, ++ 3072, 3061, 3051, 3074, 3051, 3053, 3055, 3070, 3071, 3051, ++ 3056, 3046, 3051, 3056, 3057, 3056, 3076, 3057, 3061, 3057, ++ 3056, 3062, 3058, 3056, 3057, 3058, 3051, 3058, 3072, 3078, ++ 1406, 3074, 3058, 3053, 3079, 3058, 3080, 3056, 3062, 3114, ++ 3059, 3057, 3114, 3059, 3076, 3059, 3061, 1405, 3118, 3058, ++ ++ 3059, 3118, 3142, 3059, 3051, 3142, 3081, 3078, 3064, 3083, ++ 3084, 3064, 3079, 3064, 3080, 3056, 3062, 3059, 3064, 3057, ++ 3066, 3064, 3085, 3066, 3086, 3066, 3067, 3058, 3087, 3067, ++ 3066, 3067, 3088, 3066, 3081, 3064, 3067, 3083, 3084, 3067, ++ 3089, 3090, 3092, 3093, 3094, 3059, 3095, 3066, 3097, 3098, ++ 3085, 3099, 3086, 3067, 3100, 3101, 3087, 3103, 3104, 3105, ++ 3088, 3107, 3108, 3064, 3109, 3110, 3111, 3113, 3089, 3090, ++ 3092, 3093, 3094, 3116, 3095, 3066, 3097, 3098, 3655, 3099, ++ 3657, 3067, 3100, 3101, 1394, 3103, 3104, 3105, 3112, 3107, ++ 3108, 3112, 3109, 3110, 3111, 3113, 3121, 3120, 3122, 3124, ++ ++ 3120, 3116, 3120, 3125, 3126, 3112, 3112, 3112, 3112, 3112, ++ 3112, 3112, 3112, 3112, 3127, 3128, 3129, 3130, 3131, 3132, ++ 3133, 3135, 3241, 1370, 3121, 3241, 3122, 3124, 3655, 1369, ++ 3657, 3125, 3126, 3134, 3136, 3137, 3134, 3139, 3140, 3141, ++ 3143, 3144, 3127, 3128, 3129, 3130, 3131, 3132, 3133, 3135, ++ 3134, 3134, 3134, 3134, 3134, 3134, 3134, 3134, 3134, 3145, ++ 3146, 3148, 3136, 3137, 3149, 3139, 3140, 3141, 3143, 3144, ++ 3150, 3152, 3153, 3155, 3156, 3157, 3159, 3160, 3162, 3163, ++ 3164, 3165, 3166, 3167, 3169, 3170, 3171, 3145, 3146, 3148, ++ 3172, 3173, 3149, 3175, 3176, 3177, 3178, 3180, 3150, 3152, ++ ++ 3153, 3155, 3156, 3157, 3159, 3160, 3162, 3163, 3164, 3165, ++ 3166, 3167, 3169, 3170, 3171, 3182, 3185, 3188, 3172, 3173, ++ 3189, 3175, 3176, 3177, 3178, 3180, 3191, 3193, 3188, 3194, ++ 1365, 3195, 3196, 3197, 3198, 3199, 3201, 3202, 3203, 3204, ++ 3205, 3206, 3245, 3182, 3185, 3245, 3219, 3245, 3189, 3273, ++ 3220, 3205, 3273, 3281, 3191, 3193, 3281, 3194, 3188, 3195, ++ 3196, 3197, 3198, 3199, 3201, 3202, 3203, 3204, 3205, 3206, ++ 3207, 3208, 1364, 3207, 3219, 3207, 1363, 3213, 3220, 3205, ++ 3207, 3210, 3211, 3207, 3210, 3211, 3210, 3211, 3208, 1362, ++ 3212, 3210, 3211, 3212, 3213, 3212, 1361, 3207, 1359, 3221, ++ ++ 3212, 3214, 3215, 3212, 3214, 3215, 3214, 3215, 3210, 3211, ++ 3222, 3214, 3215, 3223, 3214, 3215, 3208, 3212, 3225, 3226, ++ 1327, 3217, 3213, 3227, 3217, 3207, 3217, 3221, 3214, 3215, ++ 3229, 3217, 3230, 3231, 3217, 3232, 3210, 3211, 3222, 3218, ++ 3233, 3223, 3218, 3234, 3218, 3212, 3225, 3226, 3217, 3218, ++ 3237, 3227, 3218, 3238, 3239, 3240, 3214, 3215, 3229, 3242, ++ 3230, 3231, 3243, 3232, 3246, 3247, 3218, 3248, 3233, 3249, ++ 3250, 3234, 3251, 3252, 3253, 1323, 3217, 3285, 3237, 1294, ++ 3285, 3238, 3239, 3240, 3255, 3260, 3287, 3242, 3260, 3287, ++ 3243, 1286, 3246, 3247, 3218, 3248, 3256, 3249, 3250, 3256, ++ ++ 3251, 3252, 3253, 3254, 3254, 3254, 3254, 3254, 3254, 3254, ++ 3254, 3254, 3255, 3256, 3256, 3256, 3256, 3256, 3256, 3256, ++ 3256, 3256, 3257, 3259, 3262, 3263, 3264, 3265, 3266, 3267, ++ 3268, 3260, 3269, 3270, 3271, 3272, 3272, 3272, 3272, 3272, ++ 3272, 3272, 3272, 3272, 3274, 3275, 3277, 3278, 3279, 3282, ++ 3257, 3259, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 3260, ++ 3269, 3270, 3271, 3283, 3284, 3286, 3288, 3289, 3290, 3291, ++ 3293, 3294, 3274, 3275, 3277, 3278, 3279, 3282, 3295, 3296, ++ 3298, 3299, 3300, 3301, 3302, 3306, 3307, 3308, 3309, 3310, ++ 3313, 3283, 3284, 3286, 3288, 3289, 3290, 3291, 3293, 3294, ++ ++ 3314, 3315, 3318, 3320, 3321, 3322, 3295, 3296, 3298, 3299, ++ 3300, 3301, 3302, 3306, 3307, 3308, 3309, 3310, 3313, 3316, ++ 3323, 3324, 3325, 3326, 3327, 3329, 3330, 3316, 3314, 3315, ++ 3318, 3320, 3321, 3322, 3331, 3332, 3333, 3334, 3338, 3360, ++ 3336, 3338, 3360, 1284, 1279, 1274, 3341, 3316, 3323, 3324, ++ 3325, 3326, 3327, 3329, 3330, 3316, 3335, 3336, 3342, 3335, ++ 3343, 3335, 3331, 3332, 3333, 3334, 3335, 3337, 3339, 3335, ++ 3337, 3339, 3337, 3339, 3341, 3344, 3345, 3337, 3339, 3340, ++ 3337, 3339, 3340, 3335, 3340, 3336, 3342, 3348, 3343, 3340, ++ 3350, 3352, 3340, 3353, 3337, 3339, 3354, 3355, 3356, 3358, ++ ++ 1217, 3361, 3364, 3344, 3345, 3365, 3340, 3366, 3367, 3368, ++ 3369, 3335, 3370, 3371, 3372, 3348, 3374, 3390, 3350, 3352, ++ 3390, 3353, 3337, 3339, 3354, 3355, 3356, 3358, 3359, 3361, ++ 3364, 3359, 3409, 3365, 3340, 3366, 3367, 3368, 3369, 1216, ++ 3370, 3371, 3372, 3409, 3374, 3359, 3359, 3359, 3359, 3359, ++ 3359, 3359, 3359, 3359, 3362, 3362, 3362, 3362, 3362, 3362, ++ 3362, 3362, 3362, 3362, 3362, 3363, 3363, 3363, 3363, 3363, ++ 3363, 3363, 3363, 3363, 3363, 3363, 3376, 3378, 1215, 3362, ++ 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3377, ++ 3363, 3380, 3377, 3381, 3382, 3383, 3384, 3385, 3386, 3387, ++ ++ 3388, 3393, 3394, 1214, 3376, 3378, 3377, 3377, 3377, 3377, ++ 3377, 3377, 3377, 3377, 3377, 3391, 3396, 3392, 3391, 3380, ++ 3392, 3381, 3382, 3383, 3384, 3385, 3386, 3387, 3388, 3393, ++ 3394, 3395, 3397, 3398, 3395, 3399, 3400, 3462, 3399, 3400, ++ 3462, 3414, 1213, 3403, 3396, 3401, 3405, 3407, 3401, 3411, ++ 3412, 3413, 3414, 3415, 3416, 3418, 1212, 1208, 3419, 3420, ++ 3397, 3398, 3401, 3401, 3401, 3401, 3401, 3401, 3401, 3401, ++ 3401, 3403, 3421, 3422, 3405, 3407, 3417, 3411, 3412, 3413, ++ 3423, 3415, 3416, 3418, 3417, 3417, 3419, 3420, 3424, 3425, ++ 3426, 3427, 3428, 3429, 3430, 3431, 3432, 3434, 3435, 3436, ++ ++ 3421, 3422, 3437, 3438, 3417, 3439, 3440, 3439, 3423, 3441, ++ 3442, 3444, 3417, 3417, 3445, 1207, 3424, 3425, 3426, 3427, ++ 3428, 3429, 3430, 3431, 3432, 3434, 3435, 3436, 3447, 3448, ++ 3437, 3438, 3449, 3451, 3440, 3453, 3457, 3441, 3442, 3444, ++ 3446, 3459, 3445, 3446, 3464, 3446, 3465, 3466, 3467, 3487, ++ 3446, 3497, 3487, 3446, 3497, 3547, 3447, 3448, 3547, 3555, ++ 3449, 3451, 3555, 3453, 3457, 3468, 3469, 3446, 3470, 3459, ++ 3472, 3473, 3464, 3476, 3465, 3466, 3467, 3439, 3460, 3460, ++ 3460, 3460, 3460, 3460, 3460, 3460, 3460, 3461, 3559, 3463, ++ 3461, 3559, 3461, 3468, 3469, 3446, 3470, 3488, 3472, 3473, ++ ++ 3488, 3476, 3488, 1206, 3461, 3461, 3461, 3461, 3461, 3461, ++ 3461, 3461, 3461, 3463, 3463, 3463, 3463, 3463, 3463, 3463, ++ 3463, 3463, 3463, 3463, 3475, 3475, 3475, 3475, 3475, 3475, ++ 3475, 3475, 3475, 3477, 3478, 3479, 3480, 3481, 3463, 3482, ++ 3481, 3483, 3484, 3485, 3489, 3490, 3491, 3489, 3492, 3489, ++ 3493, 3492, 3494, 3492, 3495, 3500, 3632, 3635, 1192, 3632, ++ 3635, 3477, 3478, 3479, 3480, 3677, 3481, 3482, 3505, 3483, ++ 3484, 3485, 3573, 3490, 3491, 3573, 3677, 3573, 3493, 1190, ++ 3494, 3498, 3495, 3500, 3498, 3499, 3499, 3499, 3499, 3499, ++ 3499, 3499, 3499, 3499, 3481, 3506, 3505, 3507, 3498, 3498, ++ ++ 3498, 3498, 3498, 3498, 3498, 3498, 3498, 3504, 3509, 3510, ++ 3511, 3512, 3513, 3504, 3514, 3515, 3517, 3520, 3522, 3523, ++ 3524, 3525, 3526, 3506, 3529, 3507, 3530, 3532, 3533, 3576, ++ 3774, 1185, 3576, 3774, 3576, 3504, 3509, 3510, 3511, 3512, ++ 3513, 3504, 3514, 3515, 3517, 3520, 3522, 3523, 3524, 3525, ++ 3526, 3535, 3529, 3536, 3530, 3532, 3533, 3534, 3534, 3534, ++ 3534, 3534, 3534, 3534, 3534, 3534, 3534, 3534, 3537, 3540, ++ 3541, 3542, 3543, 3545, 3546, 3638, 1157, 1152, 3638, 3535, ++ 3638, 3536, 3534, 3548, 3548, 3548, 3548, 3548, 3548, 3548, ++ 3548, 3548, 3552, 3553, 3554, 3556, 3537, 3540, 3541, 3542, ++ ++ 3543, 3545, 3546, 3549, 3549, 3549, 3549, 3549, 3549, 3549, ++ 3549, 3549, 3550, 3557, 3558, 3550, 3560, 3561, 3562, 3564, ++ 3552, 3553, 3554, 3556, 3565, 3567, 3568, 3569, 3571, 3550, ++ 3550, 3550, 3550, 3550, 3550, 3550, 3550, 3550, 3578, 3579, ++ 3566, 3557, 3558, 3566, 3560, 3561, 3562, 3564, 3570, 1142, ++ 3581, 3570, 3565, 3567, 3568, 3569, 3571, 3566, 3566, 3566, ++ 3566, 3566, 3566, 3566, 3566, 3566, 3578, 3579, 3582, 3583, ++ 3584, 3588, 3589, 3590, 3592, 3594, 3595, 3570, 3581, 3596, ++ 3597, 3598, 3599, 3600, 3584, 3584, 3584, 3584, 3584, 3584, ++ 3584, 3584, 3584, 1131, 1129, 3585, 3582, 3583, 3585, 3588, ++ ++ 3589, 3590, 3592, 3594, 3595, 3570, 3601, 3596, 3597, 3598, ++ 3599, 3600, 3585, 3585, 3585, 3585, 3585, 3585, 3585, 3585, ++ 3585, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, ++ 3602, 3603, 3604, 3605, 3601, 3606, 3607, 3608, 3611, 3615, ++ 1127, 3617, 3618, 3616, 3616, 3616, 3616, 3616, 3616, 3616, ++ 3616, 3616, 3616, 3616, 3619, 3622, 3624, 3625, 3602, 3603, ++ 3604, 3605, 1126, 3606, 3607, 3608, 3611, 3615, 3616, 3617, ++ 3618, 3775, 1112, 3628, 3775, 3628, 3628, 3629, 3628, 3631, ++ 3633, 1111, 3619, 3622, 3624, 3625, 3628, 3637, 3639, 3629, ++ 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3630, 3630, ++ ++ 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3631, 3633, 3634, ++ 3640, 3641, 3634, 3642, 3643, 3637, 3639, 3644, 3644, 3644, ++ 3644, 3644, 3644, 3644, 3644, 3644, 3634, 3634, 3634, 3634, ++ 3634, 3634, 3634, 3634, 3634, 3645, 3646, 1107, 3640, 3641, ++ 3701, 3642, 3643, 3701, 1106, 3701, 3649, 3650, 3648, 3653, ++ 3654, 3648, 3658, 3659, 3654, 3660, 3662, 3628, 3663, 3664, ++ 3666, 3654, 1105, 3645, 3646, 3648, 3648, 3648, 3648, 3648, ++ 3648, 3648, 3648, 3648, 3649, 3650, 3661, 3653, 3654, 3667, ++ 3658, 3659, 3654, 3660, 3662, 3668, 3663, 3664, 3666, 3654, ++ 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3669, ++ ++ 3670, 3671, 3672, 3673, 3674, 3675, 3676, 3667, 3678, 3679, ++ 3681, 3687, 3689, 3668, 3691, 3693, 1104, 3700, 3704, 3678, ++ 1103, 3704, 1063, 3704, 3702, 3740, 3709, 3669, 3670, 3671, ++ 3672, 3673, 3674, 3675, 3676, 1011, 3740, 3679, 3681, 3687, ++ 3689, 1010, 3691, 3693, 3694, 3700, 3694, 3694, 3695, 3694, ++ 3695, 3695, 3702, 3695, 3709, 3707, 3710, 3694, 3707, 3711, ++ 3707, 3695, 3703, 3703, 3703, 3703, 3703, 3703, 3703, 3703, ++ 3703, 3712, 3713, 3714, 3715, 3716, 3716, 3716, 3716, 3716, ++ 3716, 3716, 3716, 3716, 3710, 3717, 3718, 3711, 3721, 3722, ++ 3723, 3724, 3726, 3728, 3729, 3730, 3731, 3732, 3733, 3712, ++ ++ 3713, 3714, 3715, 3734, 3748, 3735, 3736, 3738, 3739, 3741, ++ 3743, 3744, 3747, 3717, 3718, 3748, 3721, 3722, 3723, 3724, ++ 3752, 3728, 3729, 3730, 3731, 3732, 3733, 3754, 3694, 3758, ++ 3755, 3734, 3695, 3735, 3736, 3738, 3739, 3741, 3743, 3744, ++ 3747, 3755, 3726, 3762, 3760, 3765, 3766, 3760, 3752, 3760, ++ 3767, 3768, 3769, 3770, 3771, 3754, 3772, 3758, 3755, 3773, ++ 3776, 3777, 3773, 3778, 3779, 990, 3780, 3782, 3783, 3755, ++ 3785, 3786, 3787, 3765, 3766, 3788, 3789, 3791, 3767, 3768, ++ 3769, 3770, 3771, 3792, 3772, 3804, 3796, 3797, 3776, 3777, ++ 3798, 3799, 3779, 3762, 3780, 3782, 3783, 3801, 3785, 3786, ++ ++ 3787, 3806, 3808, 3788, 3789, 3791, 3773, 977, 3809, 3811, ++ 3812, 3792, 3813, 3778, 3796, 3797, 3814, 3815, 3798, 3799, ++ 3816, 3817, 3822, 3816, 3818, 3801, 3823, 3818, 3819, 3818, ++ 3808, 3819, 3824, 3819, 3773, 3804, 3809, 3811, 3812, 3820, ++ 3813, 3825, 3820, 3821, 3814, 3815, 3821, 3826, 3829, 3817, ++ 3822, 3806, 3830, 3831, 3823, 3832, 3833, 3834, 3837, 3838, ++ 3824, 3841, 3838, 3843, 3844, 3845, 3846, 3848, 3849, 3825, ++ 3851, 3852, 3875, 3851, 3853, 3826, 3829, 3853, 3860, 3853, ++ 3830, 3831, 3862, 3832, 3833, 3834, 3837, 3863, 3864, 3866, ++ 3867, 3843, 3844, 3845, 3846, 3848, 3849, 3855, 3857, 3852, ++ ++ 3855, 3857, 3855, 3857, 3858, 3868, 3860, 3858, 3869, 3858, ++ 3862, 3841, 3870, 3871, 3876, 3863, 3864, 3866, 3867, 3878, ++ 3874, 3879, 3875, 3874, 3871, 3874, 3877, 3871, 3880, 3877, ++ 3882, 3880, 3885, 3868, 3890, 3885, 3869, 3885, 3891, 3892, ++ 3870, 3871, 3876, 3887, 3893, 3894, 3887, 3878, 3887, 3879, ++ 3895, 3896, 3871, 3897, 3898, 3871, 3899, 3900, 3882, 3906, ++ 3904, 3908, 3890, 3904, 3908, 3904, 3891, 3892, 966, 3909, ++ 3911, 3907, 3893, 3894, 3907, 946, 928, 3932, 3895, 3896, ++ 3932, 3897, 3898, 3910, 3899, 3900, 3910, 3906, 3907, 3907, ++ 3907, 3907, 3907, 3907, 3907, 3907, 3907, 3909, 3911, 3916, ++ ++ 3910, 3910, 3910, 3910, 3910, 3910, 3910, 3910, 3910, 3917, ++ 3918, 3921, 3923, 3924, 3925, 3926, 3930, 3930, 3930, 3930, ++ 3930, 3930, 3930, 3930, 3930, 903, 891, 3916, 3931, 880, ++ 878, 3931, 876, 872, 828, 3934, 3937, 3917, 3918, 3921, ++ 3923, 3924, 3925, 3926, 3938, 3931, 3931, 3931, 3931, 3931, ++ 3931, 3931, 3931, 3931, 3933, 3933, 3933, 3933, 3933, 3933, ++ 3933, 3933, 3933, 3934, 3937, 3939, 3942, 3943, 3951, 3954, ++ 3956, 817, 3938, 3946, 3946, 3946, 3946, 3946, 3946, 3946, ++ 3946, 3946, 3947, 808, 804, 3947, 773, 772, 770, 3957, ++ 3958, 3959, 3961, 3939, 3942, 3943, 3951, 3954, 3956, 3947, ++ ++ 3947, 3947, 3947, 3947, 3947, 3947, 3947, 3947, 3955, 3955, ++ 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3957, 3958, 3959, ++ 3961, 3962, 3963, 769, 768, 766, 761, 760, 758, 757, ++ 756, 750, 743, 732, 731, 712, 700, 689, 677, 676, ++ 671, 670, 668, 661, 651, 650, 648, 644, 634, 3962, ++ 3963, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, ++ 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3967, ++ 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, ++ 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3968, 3968, 3968, + 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3968, +- 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3969, 3969, 3969, ++ ++ 3968, 3968, 3968, 3968, 3968, 3969, 3969, 3969, 3969, 3969, + 3969, 3969, 3969, 3969, 3969, 3969, 3969, 3969, 3969, 3969, +- 3969, 3969, 3969, 3969, 3969, 3970, 3970, 3970, 3970, 3970, ++ 3969, 3969, 3969, 3970, 3970, 3970, 3970, 3970, 3970, 3970, + 3970, 3970, 3970, 3970, 3970, 3970, 3970, 3970, 3970, 3970, +- 3970, 3970, 3970, 3971, 3971, 3971, 3971, 3971, 3971, 3971, +- 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, +- 3971, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, +- 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3973, ++ 3970, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, ++ 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3972, ++ 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, ++ 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3973, 3973, 3973, + 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3973, ++ 3973, 3973, 3973, 3973, 3973, 3974, 3974, 3974, 3974, 3974, + +- 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3974, 3974, 3974, + 3974, 3974, 3974, 3974, 3974, 3974, 3974, 3974, 3974, 3974, +- 3974, 3974, 3974, 3974, 3974, 3975, 3975, 3975, 3975, 3975, ++ 3974, 3974, 3974, 3975, 3975, 3975, 3975, 3975, 3975, 3975, + 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, +- 3975, 3975, 3975, 3976, 3976, 627, 3976, 3976, 3976, 3976, +- 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, +- 3976, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, +- 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3978, ++ 3975, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, ++ 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3977, ++ 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, ++ 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3978, 3978, 3978, + 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3978, +- 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3979, 3979, 3979, +- ++ 3978, 3978, 3978, 3978, 3978, 3979, 3979, 3979, 3979, 3979, + 3979, 3979, 3979, 3979, 3979, 3979, 3979, 3979, 3979, 3979, +- 3979, 3979, 3979, 3979, 3979, 3980, 3980, 3980, 3980, 3980, ++ ++ 3979, 3979, 3979, 3980, 3980, 3980, 3980, 3980, 3980, 3980, + 3980, 3980, 3980, 3980, 3980, 3980, 3980, 3980, 3980, 3980, +- 3980, 3980, 3980, 3981, 3981, 3981, 3981, 3981, 3981, 3981, +- 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, +- 3981, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, +- 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3983, ++ 3980, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, ++ 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3982, ++ 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, ++ 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3983, 3983, 3983, + 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, +- 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3984, 3984, 3984, ++ 3983, 3983, 3983, 3983, 3983, 3984, 3984, 3984, 3984, 3984, + 3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, ++ 3984, 3984, 3984, 3985, 3985, 3985, 3985, 3985, 3985, 3985, + +- 3984, 3984, 3984, 3984, 3984, 3985, 3985, 3985, 3985, 3985, + 3985, 3985, 3985, 3985, 3985, 3985, 3985, 3985, 3985, 3985, +- 3985, 3985, 3985, 3986, 3986, 3986, 3986, 3986, 3986, 3986, +- 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, +- 3986, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, +- 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3988, ++ 3985, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, ++ 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3987, ++ 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, ++ 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3988, 3988, 3988, + 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3988, +- 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3989, 3989, 3989, ++ 3988, 3988, 3988, 3988, 3988, 3989, 3989, 633, 3989, 3989, + 3989, 3989, 3989, 3989, 3989, 3989, 3989, 3989, 3989, 3989, +- 3989, 3989, 3989, 3989, 3989, 3990, 3990, 3990, 3990, 3990, +- ++ 3989, 3989, 3989, 3990, 3990, 3990, 3990, 3990, 3990, 3990, + 3990, 3990, 3990, 3990, 3990, 3990, 3990, 3990, 3990, 3990, +- 3990, 3990, 3990, 3991, 3991, 3991, 3991, 3991, 3991, 3991, +- 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, +- 3991, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, +- 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3993, ++ ++ 3990, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, ++ 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3992, ++ 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, ++ 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3993, 3993, 3993, + 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3993, +- 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3994, 3994, 625, ++ 3993, 3993, 3993, 3993, 3993, 3994, 3994, 3994, 3994, 3994, + 3994, 3994, 3994, 3994, 3994, 3994, 3994, 3994, 3994, 3994, +- 3994, 3994, 3994, 3994, 3994, 3995, 3995, 622, 3995, 3995, ++ 3994, 3994, 3994, 3995, 3995, 3995, 3995, 3995, 3995, 3995, + 3995, 3995, 3995, 3995, 3995, 3995, 3995, 3995, 3995, 3995, ++ 3995, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, + +- 3995, 3995, 3995, 3996, 3996, 621, 3996, 3996, 3996, 3996, +- 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, +- 3996, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, +- 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3998, ++ 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3997, ++ 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, ++ 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3998, 3998, 3998, + 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3998, +- 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3999, 3999, 3999, ++ 3998, 3998, 3998, 3998, 3998, 3999, 3999, 3999, 3999, 3999, + 3999, 3999, 3999, 3999, 3999, 3999, 3999, 3999, 3999, 3999, +- 3999, 3999, 3999, 3999, 3999, 4000, 4000, 4000, 4000, 4000, ++ 3999, 3999, 3999, 4000, 4000, 4000, 4000, 4000, 4000, 4000, + 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, +- 4000, 4000, 4000, 4001, 4001, 541, 4001, 4001, 4001, 4001, ++ 4000, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, ++ 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4002, + +- 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, +- 4001, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, +- 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4003, ++ 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, ++ 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4003, 4003, 4003, + 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4003, +- 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4004, 4004, 4004, ++ 4003, 4003, 4003, 4003, 4003, 4004, 4004, 4004, 4004, 4004, + 4004, 4004, 4004, 4004, 4004, 4004, 4004, 4004, 4004, 4004, +- 4004, 4004, 4004, 537, 4004, 4005, 4005, 4005, 4005, 4005, ++ 4004, 4004, 4004, 4005, 4005, 4005, 4005, 4005, 4005, 4005, + 4005, 4005, 4005, 4005, 4005, 4005, 4005, 4005, 4005, 4005, +- 4005, 4005, 4005, 4006, 4006, 4006, 4006, 4006, 4006, 4006, +- 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 536, ++ 4005, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, ++ 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4007, ++ 4007, 631, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, + +- 4006, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, +- 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4008, ++ 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4008, 4008, 628, + 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4008, +- 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4009, 4009, 4009, ++ 4008, 4008, 4008, 4008, 4008, 4009, 4009, 627, 4009, 4009, + 4009, 4009, 4009, 4009, 4009, 4009, 4009, 4009, 4009, 4009, +- 4009, 4009, 4009, 4009, 4009, 4010, 4010, 4010, 4010, 4010, ++ 4009, 4009, 4009, 4010, 4010, 4010, 4010, 4010, 4010, 4010, + 4010, 4010, 4010, 4010, 4010, 4010, 4010, 4010, 4010, 4010, +- 4010, 4010, 4010, 4011, 530, 4011, 4011, 529, 513, 4011, +- 4011, 4011, 4011, 4011, 512, 4011, 4011, 4011, 4011, 4011, ++ 4010, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, ++ 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4012, + 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, ++ 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4013, 4013, 4013, + +- 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4013, 4013, + 4013, 4013, 4013, 4013, 4013, 4013, 4013, 4013, 4013, 4013, +- 4013, 4013, 4013, 4013, 506, 4013, 4014, 4014, 4014, 4014, ++ 4013, 4013, 4013, 4013, 4013, 4014, 4014, 625, 4014, 4014, + 4014, 4014, 4014, 4014, 4014, 4014, 4014, 4014, 4014, 4014, +- 4014, 4014, 4014, 4014, 4015, 4015, 4015, 4015, 4015, 4015, ++ 4014, 4014, 4014, 4015, 4015, 4015, 4015, 4015, 4015, 4015, + 4015, 4015, 4015, 4015, 4015, 4015, 4015, 4015, 4015, 4015, +- 4015, 4015, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, +- 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, +- 4017, 504, 4017, 4017, 490, 478, 4017, 4017, 4017, 4017, +- 4017, 475, 4017, 4017, 4017, 4017, 4017, 4018, 4018, 4018, +- ++ 4015, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, ++ 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4017, ++ 4017, 4017, 4017, 4017, 4017, 4017, 4017, 4017, 4017, 4017, ++ 4017, 4017, 4017, 4017, 4017, 622, 4017, 4018, 4018, 4018, + 4018, 4018, 4018, 4018, 4018, 4018, 4018, 4018, 4018, 4018, ++ + 4018, 4018, 4018, 4018, 4018, 4019, 4019, 4019, 4019, 4019, + 4019, 4019, 4019, 4019, 4019, 4019, 4019, 4019, 4019, 4019, +- 4019, 453, 4019, 4020, 4020, 4020, 4020, 4020, 4020, 4020, ++ 4019, 621, 4019, 4020, 4020, 4020, 4020, 4020, 4020, 4020, + 4020, 4020, 4020, 4020, 4020, 4020, 4020, 4020, 4020, 4020, + 4020, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, + 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4022, + 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4022, + 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4023, 4023, 4023, + 4023, 4023, 4023, 4023, 4023, 4023, 4023, 4023, 4023, 4023, ++ 4023, 4023, 4023, 4023, 4023, 4024, 541, 4024, 4024, 537, + +- 4023, 4023, 4023, 440, 4023, 4024, 4024, 434, 4024, 4024, +- 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, +- 4024, 4024, 4024, 4025, 4025, 422, 4025, 4025, 4025, 4025, ++ 536, 4024, 4024, 4024, 4024, 4024, 530, 4024, 4024, 4024, ++ 4024, 4024, 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, + 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, +- 4025, 4026, 4026, 413, 4026, 4026, 4026, 4026, 4026, 4026, +- 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4027, ++ 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, ++ 4026, 4026, 4026, 4026, 4026, 4026, 529, 4026, 4027, 4027, + 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4027, +- 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4028, 4028, 4028, ++ 4027, 4027, 4027, 4027, 4027, 4027, 4028, 4028, 4028, 4028, + 4028, 4028, 4028, 4028, 4028, 4028, 4028, 4028, 4028, 4028, +- 4028, 4028, 4028, 412, 4028, 4029, 4029, 4029, 4029, 4029, +- ++ 4028, 4028, 4028, 4028, 4029, 4029, 4029, 4029, 4029, 4029, + 4029, 4029, 4029, 4029, 4029, 4029, 4029, 4029, 4029, 4029, +- 4029, 4029, 4029, 4030, 4030, 4030, 4030, 4030, 4030, 4030, +- 4030, 4030, 4030, 4030, 4030, 4030, 4030, 4030, 4030, 393, +- 4030, 4031, 4031, 392, 4031, 4031, 4031, 4031, 4031, 4031, +- 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4032, ++ ++ 4029, 4029, 4030, 513, 4030, 4030, 512, 506, 4030, 4030, ++ 4030, 4030, 4030, 504, 4030, 4030, 4030, 4030, 4030, 4031, ++ 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, ++ 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4032, 4032, 4032, + 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4032, +- 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4033, 4033, 4033, ++ 4032, 4032, 4032, 490, 4032, 4033, 4033, 4033, 4033, 4033, + 4033, 4033, 4033, 4033, 4033, 4033, 4033, 4033, 4033, 4033, +- 4033, 4033, 4033, 4033, 4033, 4034, 4034, 4034, 4034, 4034, ++ 4033, 4033, 4033, 4034, 4034, 4034, 4034, 4034, 4034, 4034, + 4034, 4034, 4034, 4034, 4034, 4034, 4034, 4034, 4034, 4034, ++ 4034, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, + +- 4034, 4034, 4034, 4035, 4035, 4035, 4035, 4035, 4035, 4035, +- 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, +- 4035, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, +- 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4037, ++ 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4036, ++ 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, ++ 4036, 4036, 4036, 4036, 4036, 478, 4036, 4037, 4037, 475, + 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4037, +- 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4038, 385, 4038, +- 4038, 383, 368, 4038, 4038, 4038, 4038, 4038, 367, 4038, +- 4038, 4038, 4038, 4038, 4038, 4039, 358, 4039, 4039, 357, +- 347, 4039, 4039, 4039, 4039, 4039, 317, 4039, 4039, 4039, +- 4039, 4039, 4039, 4040, 4040, 4040, 4040, 4040, 4040, 4040, +- +- 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, +- 4040, 4041, 316, 4041, 4041, 284, 268, 4041, 4041, 4041, +- 4041, 4041, 261, 4041, 4041, 4041, 4041, 4041, 4042, 4042, ++ 4037, 4037, 4037, 4037, 4037, 4038, 4038, 453, 4038, 4038, ++ 4038, 4038, 4038, 4038, 4038, 4038, 4038, 4038, 4038, 4038, ++ 4038, 4038, 4038, 4039, 4039, 440, 4039, 4039, 4039, 4039, ++ 4039, 4039, 4039, 4039, 4039, 4039, 4039, 4039, 4039, 4039, ++ 4039, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, ++ 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4041, ++ ++ 4041, 4041, 4041, 4041, 4041, 4041, 4041, 4041, 4041, 4041, ++ 4041, 4041, 4041, 4041, 4041, 434, 4041, 4042, 4042, 4042, + 4042, 4042, 4042, 4042, 4042, 4042, 4042, 4042, 4042, 4042, +- 4042, 4042, 4042, 4042, 4042, 4042, 4043, 4043, 4043, 4043, ++ 4042, 4042, 4042, 4042, 4042, 4043, 4043, 4043, 4043, 4043, + 4043, 4043, 4043, 4043, 4043, 4043, 4043, 4043, 4043, 4043, +- 4043, 4043, 4043, 4043, 4044, 4044, 4044, 4044, 4044, 4044, ++ 4043, 422, 4043, 4044, 4044, 413, 4044, 4044, 4044, 4044, + 4044, 4044, 4044, 4044, 4044, 4044, 4044, 4044, 4044, 4044, +- 4044, 4044, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, +- 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, ++ 4044, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, ++ 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4046, ++ 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4046, + +- 4046, 259, 4046, 4046, 252, 234, 4046, 4046, 4046, 4046, +- 4046, 229, 4046, 4046, 4046, 4046, 4046, 4046, 4047, 4047, ++ 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4047, 4047, 4047, + 4047, 4047, 4047, 4047, 4047, 4047, 4047, 4047, 4047, 4047, +- 4047, 4047, 4047, 4047, 4047, 4047, 4048, 4048, 4048, 4048, ++ 4047, 4047, 4047, 4047, 4047, 4048, 4048, 4048, 4048, 4048, + 4048, 4048, 4048, 4048, 4048, 4048, 4048, 4048, 4048, 4048, +- 4048, 4048, 4048, 4048, 4049, 216, 4049, 4049, 194, 182, +- 4049, 4049, 4049, 4049, 4049, 175, 4049, 4049, 4049, 4049, ++ 4048, 4048, 4048, 4049, 4049, 4049, 4049, 4049, 4049, 4049, ++ 4049, 4049, 4049, 4049, 4049, 4049, 4049, 4049, 4049, 4049, + 4049, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, + 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4051, +- 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4051, ++ 412, 4051, 4051, 393, 392, 4051, 4051, 4051, 4051, 4051, ++ 385, 4051, 4051, 4051, 4051, 4051, 4051, 4052, 383, 4052, + +- 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4052, 4052, 4052, +- 4052, 4052, 4052, 4052, 4052, 4052, 4052, 4052, 4052, 4052, ++ 4052, 368, 367, 4052, 4052, 4052, 4052, 4052, 358, 4052, + 4052, 4052, 4052, 4052, 4052, 4053, 4053, 4053, 4053, 4053, + 4053, 4053, 4053, 4053, 4053, 4053, 4053, 4053, 4053, 4053, +- 4053, 4053, 4053, 4054, 4054, 4054, 4054, 4054, 4054, 4054, +- 4054, 4054, 4054, 4054, 4054, 4054, 4054, 4054, 4054, 4054, +- 4054, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, +- 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4056, ++ 4053, 4053, 4053, 4054, 357, 4054, 4054, 347, 317, 4054, ++ 4054, 4054, 4054, 4054, 316, 4054, 4054, 4054, 4054, 4054, ++ 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, ++ 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4056, 4056, + 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4056, +- 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4057, 4057, 4057, +- ++ 4056, 4056, 4056, 4056, 4056, 4056, 4057, 4057, 4057, 4057, + 4057, 4057, 4057, 4057, 4057, 4057, 4057, 4057, 4057, 4057, +- 4057, 4057, 4057, 4057, 4057, 4058, 4058, 4058, 4058, 4058, ++ ++ 4057, 4057, 4057, 4057, 4058, 4058, 4058, 4058, 4058, 4058, + 4058, 4058, 4058, 4058, 4058, 4058, 4058, 4058, 4058, 4058, +- 4058, 4058, 4058, 4059, 4059, 4059, 4059, 4059, 4059, 4059, +- 4059, 4059, 4059, 4059, 4059, 4059, 4059, 4059, 4059, 4059, +- 4059, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, +- 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4061, +- 4061, 172, 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, +- 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4062, 4062, 4062, +- 4062, 4062, 4062, 4062, 4062, 4062, 4062, 4062, 4062, 4062, +- +- 4062, 4062, 4062, 4062, 4062, 4063, 4063, 4063, 4063, 4063, ++ 4058, 4058, 4059, 284, 4059, 4059, 268, 261, 4059, 4059, ++ 4059, 4059, 4059, 259, 4059, 4059, 4059, 4059, 4059, 4059, ++ 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, ++ 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4061, 4061, ++ 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, ++ 4061, 4061, 4061, 4061, 4061, 4061, 4062, 252, 4062, 4062, ++ 234, 229, 4062, 4062, 4062, 4062, 4062, 216, 4062, 4062, ++ 4062, 4062, 4062, 4063, 4063, 4063, 4063, 4063, 4063, 4063, ++ + 4063, 4063, 4063, 4063, 4063, 4063, 4063, 4063, 4063, 4063, +- 4063, 4063, 4063, 4064, 4064, 4064, 4064, 4064, 4064, 4064, +- 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, +- 4064, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, +- 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4066, +- 165, 4066, 4066, 164, 163, 4066, 4066, 4066, 4066, 4066, +- 154, 4066, 4066, 4066, 4066, 4066, 4066, 4067, 152, 4067, +- 4067, 146, 141, 4067, 4067, 4067, 4067, 4067, 117, 4067, +- 4067, 4067, 4067, 4067, 4067, 4068, 75, 4068, 4068, 64, +- +- 63, 4068, 4068, 4068, 4068, 4068, 58, 4068, 4068, 4068, +- 4068, 4068, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, +- 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, +- 4070, 57, 4070, 4070, 56, 55, 4070, 4070, 4070, 4070, +- 4070, 54, 4070, 4070, 4070, 4070, 4070, 4070, 4071, 4071, ++ 4063, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, ++ 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4065, ++ 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, ++ 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4066, 4066, 4066, ++ 4066, 4066, 4066, 4066, 4066, 4066, 4066, 4066, 4066, 4066, ++ 4066, 4066, 4066, 4066, 4066, 4067, 4067, 4067, 4067, 4067, ++ 4067, 4067, 4067, 4067, 4067, 4067, 4067, 4067, 4067, 4067, ++ 4067, 4067, 4067, 4068, 4068, 4068, 4068, 4068, 4068, 4068, ++ 4068, 4068, 4068, 4068, 4068, 4068, 4068, 4068, 4068, 4068, ++ ++ 4068, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, ++ 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4070, ++ 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4070, ++ 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4071, 4071, 4071, + 4071, 4071, 4071, 4071, 4071, 4071, 4071, 4071, 4071, 4071, +- 4071, 4071, 4071, 4071, 4071, 4071, 4072, 53, 4072, 4072, +- 52, 51, 4072, 4072, 4072, 4072, 4072, 26, 4072, 4072, +- 4072, 4072, 4072, 4072, 4073, 4073, 4073, 4073, 4073, 4073, ++ 4071, 4071, 4071, 4071, 4071, 4072, 4072, 4072, 4072, 4072, ++ 4072, 4072, 4072, 4072, 4072, 4072, 4072, 4072, 4072, 4072, ++ 4072, 4072, 4072, 4073, 4073, 4073, 4073, 4073, 4073, 4073, + 4073, 4073, 4073, 4073, 4073, 4073, 4073, 4073, 4073, 4073, ++ 4073, 4074, 4074, 194, 4074, 4074, 4074, 4074, 4074, 4074, + +- 4073, 4073, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, +- 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, +- 4075, 25, 4075, 4075, 24, 23, 4075, 4075, 4075, 4075, +- 4075, 0, 4075, 4075, 4075, 4075, 4075, 4076, 4076, 4076, ++ 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4075, ++ 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4075, ++ 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4076, 4076, 4076, + 4076, 4076, 4076, 4076, 4076, 4076, 4076, 4076, 4076, 4076, + 4076, 4076, 4076, 4076, 4076, 4077, 4077, 4077, 4077, 4077, + 4077, 4077, 4077, 4077, 4077, 4077, 4077, 4077, 4077, 4077, + 4077, 4077, 4077, 4078, 4078, 4078, 4078, 4078, 4078, 4078, + 4078, 4078, 4078, 4078, 4078, 4078, 4078, 4078, 4078, 4078, +- 4078, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4079, ++ 4078, 4079, 182, 4079, 4079, 175, 172, 4079, 4079, 4079, ++ 4079, 4079, 165, 4079, 4079, 4079, 4079, 4079, 4079, 4080, + +- 0, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4080, +- 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4080, +- 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4081, 4081, 4081, +- 4081, 4081, 4081, 4081, 4081, 4081, 4081, 4081, 4081, 4081, +- 4081, 4081, 4081, 4081, 4081, 4082, 4082, 4082, 4082, 4082, ++ 164, 4080, 4080, 163, 154, 4080, 4080, 4080, 4080, 4080, ++ 152, 4080, 4080, 4080, 4080, 4080, 4080, 4081, 146, 4081, ++ 4081, 141, 117, 4081, 4081, 4081, 4081, 4081, 75, 4081, ++ 4081, 4081, 4081, 4081, 4082, 4082, 4082, 4082, 4082, 4082, + 4082, 4082, 4082, 4082, 4082, 4082, 4082, 4082, 4082, 4082, +- 4082, 4082, 4082, 4083, 4083, 4083, 4083, 4083, 4083, 4083, +- 4083, 4083, 4083, 4083, 4083, 4083, 4083, 4083, 4083, 4083, +- 4083, 4084, 4084, 0, 4084, 4084, 4084, 4084, 4084, 4084, +- 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4085, ++ 4082, 4082, 4083, 64, 4083, 4083, 63, 58, 4083, 4083, ++ 4083, 4083, 4083, 57, 4083, 4083, 4083, 4083, 4083, 4083, ++ 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, ++ 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4085, 56, ++ 4085, 4085, 55, 54, 4085, 4085, 4085, 4085, 4085, 53, + +- 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4085, +- 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4086, 4086, 4086, ++ 4085, 4085, 4085, 4085, 4085, 4085, 4086, 4086, 4086, 4086, + 4086, 4086, 4086, 4086, 4086, 4086, 4086, 4086, 4086, 4086, +- 4086, 4086, 4086, 4086, 4086, 4087, 4087, 4087, 4087, 4087, ++ 4086, 4086, 4086, 4086, 4087, 4087, 4087, 4087, 4087, 4087, + 4087, 4087, 4087, 4087, 4087, 4087, 4087, 4087, 4087, 4087, +- 4087, 4087, 4087, 4088, 0, 4088, 4088, 0, 0, 4088, +- 4088, 4088, 4088, 4088, 0, 4088, 4088, 4088, 4088, 4088, +- 4088, 4089, 0, 4089, 4089, 0, 0, 4089, 4089, 4089, +- 4089, 4089, 0, 4089, 4089, 4089, 4089, 4089, 4089, 4090, ++ 4087, 4087, 4088, 52, 4088, 4088, 51, 26, 4088, 4088, ++ 4088, 4088, 4088, 25, 4088, 4088, 4088, 4088, 4088, 4089, ++ 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4089, ++ 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4090, 4090, 4090, + 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4090, ++ 4090, 4090, 4090, 4090, 4090, 4091, 4091, 4091, 4091, 4091, + +- 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4091, 0, 4091, +- 4091, 0, 0, 4091, 4091, 4091, 4091, 4091, 0, 4091, +- 4091, 4091, 4091, 4091, 4091, 4092, 4092, 4092, 4092, 4092, +- 4092, 4092, 4092, 4092, 4092, 4092, 4092, 4092, 4092, 4092, +- 4092, 4092, 4092, 4093, 0, 4093, 4093, 0, 0, 4093, +- 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, ++ 4091, 4091, 4091, 4091, 4091, 4091, 4091, 4091, 4091, 4091, ++ 4091, 4091, 4091, 4092, 4092, 4092, 4092, 4092, 4092, 4092, ++ 4092, 4092, 24, 4092, 4092, 4092, 4092, 4092, 4092, 4092, ++ 4092, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, ++ 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4094, + 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, +- 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4095, 4095, ++ 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4095, 4095, 4095, + 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, +- 4095, 4095, 4095, 4095, 4095, 4095, 4096, 0, 4096, 4096, ++ 4095, 4095, 4095, 4095, 4095, 4096, 4096, 4096, 4096, 4096, ++ 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, + +- 0, 0, 4096, 4096, 4096, 0, 4096, 4096, 4096, 4096, +- 4096, 4096, 4096, 4096, 4097, 4097, 4097, 4097, 4097, 4097, +- 4097, 0, 4097, 0, 4097, 4097, 4097, 4097, 4097, 4097, +- 4097, 4097, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, +- 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, ++ 4096, 4096, 4096, 4097, 4097, 23, 4097, 4097, 4097, 4097, ++ 4097, 4097, 4097, 4097, 4097, 4097, 4097, 4097, 4097, 4097, ++ 4097, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, ++ 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4099, + 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, +- 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4100, 4100, ++ 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4100, 4100, 4100, + 4100, 4100, 4100, 4100, 4100, 4100, 4100, 4100, 4100, 4100, +- 4100, 4100, 4100, 4100, 4100, 4100, 4101, 4101, 4101, 4101, +- 4101, 4101, 4101, 4101, 4101, 4101, 4101, 4101, 4101, 4101, +- +- 4101, 4101, 4101, 4101, 4102, 4102, 0, 4102, 4102, 4102, +- 4102, 4102, 4102, 4102, 4102, 4102, 4102, 4102, 4102, 4102, +- 4102, 4102, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, +- 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, +- 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, +- 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4105, 0, +- 0, 4105, 0, 0, 4105, 4106, 0, 0, 0, 0, +- 0, 4106, 4106, 4106, 0, 4106, 4106, 4106, 4106, 4106, +- 4106, 4106, 4106, 4107, 4107, 4107, 4107, 4107, 4107, 4107, ++ 4100, 4100, 4100, 4100, 4100, 4101, 0, 4101, 4101, 0, ++ 0, 4101, 4101, 4101, 4101, 4101, 0, 4101, 4101, 4101, ++ 4101, 4101, 4101, 4102, 0, 4102, 4102, 0, 0, 4102, ++ ++ 4102, 4102, 4102, 4102, 0, 4102, 4102, 4102, 4102, 4102, ++ 4102, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, ++ 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4104, ++ 0, 4104, 4104, 0, 0, 4104, 4104, 4104, 4104, 4104, ++ 0, 4104, 4104, 4104, 4104, 4104, 4104, 4105, 4105, 4105, ++ 4105, 4105, 4105, 4105, 4105, 4105, 4105, 4105, 4105, 4105, ++ 4105, 4105, 4105, 4105, 4105, 4106, 0, 4106, 4106, 0, ++ 0, 4106, 4106, 4106, 4106, 4106, 4106, 4106, 4106, 4106, ++ 4106, 4106, 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, + 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, + +- 4107, 4108, 0, 0, 4108, 0, 4108, 4109, 4109, 4109, +- 4109, 4109, 4109, 4109, 4109, 4109, 4109, 4109, 4109, 4109, +- 4109, 4109, 4109, 4109, 4109, 4110, 0, 0, 4110, 4110, +- 0, 0, 4110, 0, 4110, 0, 4110, 4110, 4110, 4110, +- 4111, 4111, 4111, 4111, 4112, 4112, 0, 4112, 4112, 4112, ++ 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, ++ 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4109, 0, ++ 4109, 4109, 0, 0, 4109, 4109, 4109, 0, 4109, 4109, ++ 4109, 4109, 4109, 4109, 4109, 4109, 4110, 4110, 4110, 4110, ++ 4110, 4110, 4110, 0, 4110, 0, 4110, 4110, 4110, 4110, ++ 4110, 4110, 4110, 4110, 4111, 4111, 4111, 4111, 4111, 4111, ++ 4111, 4111, 4111, 4111, 4111, 4111, 4111, 4111, 4111, 4111, ++ 4111, 4111, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, + 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, +- 4112, 4112, 4113, 4113, 0, 4113, 4113, 4113, 4113, 4113, + 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, +- 4114, 0, 4114, 0, 4114, 4114, 4114, 4114, 4115, 4115, +- 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, + +- 4115, 4115, 4115, 4115, 4115, 4115, 4116, 4116, 4116, 4116, ++ 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4114, 4114, ++ 4114, 4114, 4114, 4114, 4114, 4114, 4114, 4114, 4114, 4114, ++ 4114, 4114, 4114, 4114, 4114, 4114, 4115, 4115, 0, 4115, ++ 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, ++ 4115, 4115, 4115, 4115, 4116, 4116, 4116, 4116, 4116, 4116, + 4116, 4116, 4116, 4116, 4116, 4116, 4116, 4116, 4116, 4116, +- 4116, 4116, 4116, 4116, 4117, 4117, 4117, 4117, 4117, 4117, ++ 4116, 4116, 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, + 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, +- 4117, 4117, 4118, 4118, 0, 0, 4118, 4118, 4118, 4118, +- 4118, 0, 4118, 4118, 4118, 4118, 4118, 4118, 4118, 4118, +- 4119, 0, 0, 4119, 4119, 0, 0, 4119, 0, 4119, +- 0, 4119, 4119, 4119, 4119, 4120, 4120, 4120, 4120, 4120, ++ 4118, 0, 0, 4118, 0, 0, 4118, 4119, 0, 0, ++ 0, 0, 0, 4119, 4119, 4119, 0, 4119, 4119, 4119, ++ ++ 4119, 4119, 4119, 4119, 4119, 4120, 4120, 4120, 4120, 4120, + 4120, 4120, 4120, 4120, 4120, 4120, 4120, 4120, 4120, 4120, +- 4120, 4120, 4120, 4121, 0, 4121, 4121, 0, 0, 4121, +- +- 4121, 4121, 4121, 4121, 4121, 4121, 4121, 4121, 4121, 4121, +- 4121, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, +- 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4123, +- 0, 0, 0, 0, 0, 4123, 4123, 4123, 0, 4123, +- 4123, 4123, 4123, 4123, 4123, 4123, 4123, 4124, 4124, 0, +- 4124, 4124, 4124, 4124, 4124, 4124, 4124, 4124, 4124, 4124, +- 4124, 4124, 4124, 4124, 4124, 4125, 4125, 0, 4125, 4125, ++ 4120, 4120, 4120, 4121, 0, 0, 4121, 0, 4121, 4122, ++ 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, ++ 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4123, 0, 0, ++ 4123, 4123, 0, 0, 4123, 0, 4123, 0, 4123, 4123, ++ 4123, 4123, 4124, 4124, 4124, 4124, 4125, 4125, 0, 4125, + 4125, 4125, 4125, 4125, 4125, 4125, 4125, 4125, 4125, 4125, +- 4125, 4125, 4125, 4126, 0, 0, 4126, 4126, 0, 0, +- 4126, 0, 4126, 0, 4126, 4126, 4126, 4126, 4127, 0, +- +- 0, 0, 0, 0, 4127, 4127, 4127, 0, 4127, 4127, +- 4127, 4127, 4127, 4127, 4127, 4127, 4128, 4128, 0, 4128, +- 4128, 0, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, +- 4128, 4128, 4128, 4129, 0, 4129, 0, 4129, 4129, 4129, +- 4129, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, +- 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4131, +- 0, 4131, 4131, 0, 0, 4131, 4131, 4131, 4131, 4131, +- 4131, 4131, 4131, 4131, 4131, 4131, 4131, 4132, 4132, 4132, +- 4132, 4132, 4132, 4132, 4132, 4132, 4132, 4132, 4132, 4132, +- 4132, 4132, 4132, 4132, 4132, 4133, 4133, 4133, 4133, 4133, ++ 4125, 4125, 4125, 4125, 4126, 4126, 0, 4126, 4126, 4126, ++ 4126, 4126, 4126, 4126, 4126, 4126, 4126, 4126, 4126, 4126, ++ ++ 4126, 4126, 4127, 0, 4127, 0, 4127, 4127, 4127, 4127, ++ 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, ++ 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4129, 4129, ++ 4129, 4129, 4129, 4129, 4129, 4129, 4129, 4129, 4129, 4129, ++ 4129, 4129, 4129, 4129, 4129, 4129, 4130, 4130, 4130, 4130, ++ 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, ++ 4130, 4130, 4130, 4130, 4131, 4131, 0, 0, 4131, 4131, ++ 4131, 4131, 4131, 0, 4131, 4131, 4131, 4131, 4131, 4131, ++ 4131, 4131, 4132, 0, 0, 4132, 4132, 0, 0, 4132, ++ 0, 4132, 0, 4132, 4132, 4132, 4132, 4133, 4133, 4133, + + 4133, 4133, 4133, 4133, 4133, 4133, 4133, 4133, 4133, 4133, +- 4133, 4133, 4133, 4134, 0, 0, 4134, 4134, 0, 0, +- 4134, 0, 4134, 0, 4134, 4134, 4134, 4134, 4135, 0, +- 4135, 0, 4135, 4135, 4135, 4135, 4136, 0, 0, 4136, +- 4136, 0, 0, 4136, 0, 4136, 0, 4136, 4136, 4136, +- 4136, 4137, 4137, 0, 4137, 4137, 4137, 4137, 4137, 4137, +- 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4138, 0, +- 4138, 4138, 0, 0, 4138, 4138, 4138, 4138, 4138, 4138, +- 4138, 4138, 4138, 4138, 4138, 4138, 4139, 4139, 4139, 4139, +- 4139, 4139, 4139, 4139, 4139, 4139, 4139, 4139, 4139, 4139, +- +- 4139, 4139, 4139, 4139, 4140, 4140, 4140, 4140, 4140, 4140, +- 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, +- 4140, 4140, 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, +- 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, +- 4142, 0, 4142, 4142, 0, 0, 4142, 4142, 4142, 4142, +- 4142, 4142, 4142, 4142, 4142, 4142, 4142, 4142, 4143, 4143, ++ 4133, 4133, 4133, 4133, 4133, 4134, 0, 4134, 4134, 0, ++ 0, 4134, 4134, 4134, 4134, 4134, 4134, 4134, 4134, 4134, ++ 4134, 4134, 4134, 4135, 4135, 4135, 4135, 4135, 4135, 4135, ++ 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4135, ++ 4135, 4136, 0, 0, 0, 0, 0, 4136, 4136, 4136, ++ 0, 4136, 4136, 4136, 4136, 4136, 4136, 4136, 4136, 4137, ++ 4137, 0, 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4137, ++ 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4138, 4138, 0, ++ 4138, 4138, 4138, 4138, 4138, 4138, 4138, 4138, 4138, 4138, ++ ++ 4138, 4138, 4138, 4138, 4138, 4139, 0, 0, 4139, 4139, ++ 0, 0, 4139, 0, 4139, 0, 4139, 4139, 4139, 4139, ++ 4140, 0, 0, 0, 0, 0, 4140, 4140, 4140, 0, ++ 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4141, 4141, ++ 0, 4141, 4141, 0, 4141, 4141, 4141, 4141, 4141, 4141, ++ 4141, 4141, 4141, 4141, 4141, 4142, 0, 4142, 0, 4142, ++ 4142, 4142, 4142, 4143, 4143, 4143, 4143, 4143, 4143, 4143, + 4143, 4143, 4143, 4143, 4143, 4143, 4143, 4143, 4143, 4143, +- 4143, 4143, 4143, 4143, 4143, 4143, 4144, 4144, 4144, 4144, +- 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, +- 4144, 4144, 4144, 4144, 4145, 4145, 0, 4145, 4145, 4145, ++ 4143, 4144, 0, 4144, 4144, 0, 0, 4144, 4144, 4144, ++ 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4145, + + 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4145, +- 4145, 4145, 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, ++ 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4146, 4146, 4146, + 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, +- 4147, 4147, 0, 4147, 4147, 4147, 4147, 4147, 4147, 4147, +- 4147, 4147, 4147, 4147, 4147, 4147, 4147, 4147, 4148, 4148, +- 4148, 4148, 4148, 4148, 4148, 4148, 4148, 4148, 4148, 4148, +- 4148, 4148, 4148, 4148, 4148, 4148, 4149, 0, 4149, 0, +- 4149, 4149, 4149, 4149, 4150, 0, 4150, 0, 4150, 4150, +- 4150, 4150, 4151, 0, 0, 4151, 0, 0, 0, 4151, +- 0, 4151, 0, 4151, 4151, 4151, 4151, 4152, 0, 0, +- +- 4152, 4152, 0, 0, 4152, 0, 4152, 0, 4152, 4152, +- 4152, 4152, 4153, 0, 0, 4153, 0, 4153, 0, 4153, +- 4153, 4153, 4153, 4154, 0, 4154, 0, 4154, 4154, 4154, +- 4154, 4155, 0, 4155, 0, 4155, 4155, 4155, 4155, 4156, +- 4156, 0, 4156, 4156, 0, 4156, 4156, 4156, 4156, 4156, +- 4156, 4156, 4156, 4156, 4156, 4156, 4157, 0, 0, 4157, +- 4157, 0, 0, 4157, 0, 4157, 0, 4157, 4157, 4157, +- 4157, 4158, 4158, 0, 4158, 4158, 0, 4158, 4158, 4158, +- 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4159, 4159, ++ 4146, 4146, 4146, 4146, 4146, 4147, 0, 0, 4147, 4147, ++ 0, 0, 4147, 0, 4147, 0, 4147, 4147, 4147, 4147, ++ 4148, 0, 4148, 0, 4148, 4148, 4148, 4148, 4149, 0, ++ 0, 4149, 4149, 0, 0, 4149, 0, 4149, 0, 4149, ++ 4149, 4149, 4149, 4150, 4150, 0, 4150, 4150, 4150, 4150, ++ 4150, 4150, 4150, 4150, 4150, 4150, 4150, 4150, 4150, 4150, ++ 4151, 0, 4151, 4151, 0, 0, 4151, 4151, 4151, 4151, ++ ++ 4151, 4151, 4151, 4151, 4151, 4151, 4151, 4151, 4152, 4152, ++ 4152, 4152, 4152, 4152, 4152, 4152, 4152, 4152, 4152, 4152, ++ 4152, 4152, 4152, 4152, 4152, 4152, 4153, 4153, 4153, 4153, ++ 4153, 4153, 4153, 4153, 4153, 4153, 4153, 4153, 4153, 4153, ++ 4153, 4153, 4153, 4153, 4154, 4154, 4154, 4154, 4154, 4154, ++ 4154, 4154, 4154, 4154, 4154, 4154, 4154, 4154, 4154, 4154, ++ 4154, 4154, 4155, 0, 4155, 4155, 0, 0, 4155, 4155, ++ 4155, 4155, 4155, 4155, 4155, 4155, 4155, 4155, 4155, 4155, ++ 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, ++ 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4157, 4157, ++ ++ 4157, 4157, 4157, 4157, 4157, 4157, 4157, 4157, 4157, 4157, ++ 4157, 4157, 4157, 4157, 4157, 4157, 4158, 4158, 0, 4158, ++ 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, ++ 4158, 4158, 4158, 4158, 4159, 4159, 4159, 4159, 4159, 4159, + 4159, 4159, 4159, 4159, 4159, 4159, 4159, 4159, 4159, 4159, +- +- 4159, 4159, 4159, 4159, 4159, 4159, 4160, 4160, 4160, 4160, ++ 4159, 4159, 4160, 4160, 0, 4160, 4160, 4160, 4160, 4160, + 4160, 4160, 4160, 4160, 4160, 4160, 4160, 4160, 4160, 4160, +- 4160, 4160, 4160, 4160, 4161, 4161, 4161, 4161, 4161, 4161, + 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, +- 4161, 4161, 4162, 0, 4162, 4162, 0, 0, 4162, 4162, +- 4162, 4162, 4162, 4162, 4162, 4162, 4162, 4162, 4162, 4162, +- 4163, 0, 4163, 4163, 0, 0, 4163, 4163, 4163, 4163, +- 4163, 4163, 4163, 4163, 4163, 4163, 4163, 4163, 4164, 4164, +- 4164, 4164, 4164, 4164, 4164, 4164, 4164, 4164, 4164, 4164, +- 4164, 4164, 4164, 4164, 4164, 4164, 4165, 4165, 4165, 4165, +- +- 4165, 4165, 4165, 4165, 4165, 4165, 4165, 4165, 4165, 4165, +- 4165, 4165, 4165, 4165, 4166, 4166, 4166, 4166, 4166, 4166, +- 4166, 4166, 4166, 4166, 4166, 4166, 4166, 4166, 4166, 4166, +- 4166, 4166, 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, +- 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, +- 4168, 0, 4168, 4168, 0, 0, 4168, 4168, 4168, 4168, +- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4169, 4169, +- 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, +- 4169, 4169, 4169, 4169, 4169, 4169, 4170, 4170, 4170, 4170, +- 4170, 4170, 4170, 4170, 4170, 4170, 4170, 4170, 4170, 4170, +- +- 4170, 4170, 4170, 4170, 4171, 4171, 4171, 4171, 4171, 4171, ++ 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4162, 0, ++ 4162, 0, 4162, 4162, 4162, 4162, 4163, 0, 4163, 0, ++ ++ 4163, 4163, 4163, 4163, 4164, 0, 0, 4164, 0, 0, ++ 0, 4164, 0, 4164, 0, 4164, 4164, 4164, 4164, 4165, ++ 0, 0, 4165, 4165, 0, 0, 4165, 0, 4165, 0, ++ 4165, 4165, 4165, 4165, 4166, 0, 0, 4166, 0, 4166, ++ 0, 4166, 4166, 4166, 4166, 4167, 0, 4167, 0, 4167, ++ 4167, 4167, 4167, 4168, 0, 4168, 0, 4168, 4168, 4168, ++ 4168, 4169, 4169, 0, 4169, 4169, 0, 4169, 4169, 4169, ++ 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4170, 0, ++ 0, 4170, 4170, 0, 0, 4170, 0, 4170, 0, 4170, ++ 4170, 4170, 4170, 4171, 4171, 0, 4171, 4171, 0, 4171, ++ + 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, +- 4171, 4171, 4172, 0, 4172, 4172, 0, 0, 4172, 4172, + 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, ++ 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4173, 4173, + 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, +- 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4174, 4174, ++ 4173, 4173, 4173, 4173, 4173, 4173, 4174, 4174, 4174, 4174, + 4174, 4174, 4174, 4174, 4174, 4174, 4174, 4174, 4174, 4174, +- 4174, 4174, 4174, 4174, 4174, 4174, 4175, 0, 0, 4175, +- 0, 4175, 0, 4175, 4175, 4175, 4175, 4176, 0, 4176, +- 0, 4176, 4176, 4176, 4176, 4177, 0, 4177, 0, 4177, +- +- 4177, 4177, 4177, 4178, 0, 4178, 0, 4178, 4178, 4178, +- 4178, 4179, 0, 0, 4179, 0, 4179, 0, 4179, 4179, +- 4179, 4179, 4180, 4180, 0, 4180, 4180, 0, 4180, 4180, +- 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4181, +- 0, 0, 4181, 4181, 0, 0, 4181, 0, 4181, 0, +- 4181, 4181, 4181, 4181, 4182, 0, 4182, 0, 4182, 4182, +- 4182, 4182, 4183, 0, 4183, 0, 4183, 4183, 4183, 4183, ++ 4174, 4174, 4174, 4174, 4175, 0, 4175, 4175, 0, 0, ++ 4175, 4175, 4175, 4175, 4175, 4175, 4175, 4175, 4175, 4175, ++ 4175, 4175, 4176, 0, 4176, 4176, 0, 0, 4176, 4176, ++ 4176, 4176, 4176, 4176, 4176, 4176, 4176, 4176, 4176, 4176, ++ ++ 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, ++ 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4178, 4178, ++ 4178, 4178, 4178, 4178, 4178, 4178, 4178, 4178, 4178, 4178, ++ 4178, 4178, 4178, 4178, 4178, 4178, 4179, 4179, 4179, 4179, ++ 4179, 4179, 4179, 4179, 4179, 4179, 4179, 4179, 4179, 4179, ++ 4179, 4179, 4179, 4179, 4180, 4180, 4180, 4180, 4180, 4180, ++ 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, ++ 4180, 4180, 4181, 0, 4181, 4181, 0, 0, 4181, 4181, ++ 4181, 4181, 4181, 4181, 4181, 4181, 4181, 4181, 4181, 4181, ++ 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, ++ ++ 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4183, 4183, ++ 4183, 4183, 4183, 4183, 4183, 4183, 4183, 4183, 4183, 4183, ++ 4183, 4183, 4183, 4183, 4183, 4183, 4184, 4184, 4184, 4184, + 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, +- 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4185, 4185, ++ 4184, 4184, 4184, 4184, 4185, 0, 4185, 4185, 0, 0, + 4185, 4185, 4185, 4185, 4185, 4185, 4185, 4185, 4185, 4185, +- +- 4185, 4185, 4185, 4185, 4185, 4185, 4186, 4186, 4186, 4186, ++ 4185, 4185, 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, + 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, +- 4186, 4186, 4186, 4186, 4187, 4187, 4187, 4187, 4187, 4187, + 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, +- 4187, 4187, 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, +- 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, +- 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, +- 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4190, 0, +- 4190, 4190, 0, 0, 4190, 4190, 4190, 4190, 4190, 4190, +- 4190, 4190, 4190, 4190, 4190, 4190, 4191, 4191, 4191, 4191, +- +- 4191, 4191, 4191, 4191, 4191, 4191, 4191, 4191, 4191, 4191, +- 4191, 4191, 4191, 4191, 4192, 4192, 4192, 4192, 4192, 4192, +- 4192, 4192, 4192, 4192, 4192, 4192, 4192, 4192, 4192, 4192, +- 4192, 4192, 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, ++ 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4188, 0, ++ ++ 0, 4188, 0, 4188, 0, 4188, 4188, 4188, 4188, 4189, ++ 0, 4189, 0, 4189, 4189, 4189, 4189, 4190, 0, 4190, ++ 0, 4190, 4190, 4190, 4190, 4191, 0, 4191, 0, 4191, ++ 4191, 4191, 4191, 4192, 0, 0, 4192, 0, 4192, 0, ++ 4192, 4192, 4192, 4192, 4193, 4193, 0, 4193, 4193, 0, + 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, +- 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, +- 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4195, 4195, +- 0, 4195, 4195, 0, 4195, 4195, 4195, 4195, 4195, 4195, +- 4195, 4195, 4195, 4195, 4195, 4196, 0, 0, 4196, 4196, +- 0, 0, 4196, 0, 4196, 0, 4196, 4196, 4196, 4196, +- +- 4197, 4197, 4197, 4197, 0, 4197, 4197, 4197, 4197, 4197, +- 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4198, 0, +- 0, 0, 0, 0, 4198, 4198, 4198, 0, 4198, 4198, +- 4198, 4198, 4198, 4198, 4198, 4198, 4199, 4199, 4199, 4199, ++ 4193, 4194, 0, 0, 4194, 4194, 0, 0, 4194, 0, ++ 4194, 0, 4194, 4194, 4194, 4194, 4195, 0, 4195, 0, ++ 4195, 4195, 4195, 4195, 4196, 0, 4196, 0, 4196, 4196, ++ 4196, 4196, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, ++ ++ 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, ++ 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, ++ 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4199, 4199, + 4199, 4199, 4199, 4199, 4199, 4199, 4199, 4199, 4199, 4199, +- 4199, 4199, 4199, 4199, 4200, 0, 4200, 0, 4200, 4200, +- 4200, 4200, 4201, 4201, 0, 4201, 4201, 0, 4201, 4201, +- 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4202, +- 0, 0, 4202, 4202, 0, 0, 0, 0, 0, 0, +- 4202, 4203, 4203, 0, 0, 0, 4203, 4203, 4203, 4203, +- +- 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4204, +- 4204, 0, 4204, 4204, 0, 4204, 4204, 4204, 4204, 4204, +- 4204, 4204, 4204, 4204, 4204, 4204, 4205, 4205, 0, 4205, +- 4205, 0, 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, +- 4205, 4205, 4205, 4206, 4206, 0, 4206, 4206, 4206, 4206, ++ 4199, 4199, 4199, 4199, 4199, 4199, 4200, 4200, 4200, 4200, ++ 4200, 4200, 4200, 4200, 4200, 4200, 4200, 4200, 4200, 4200, ++ 4200, 4200, 4200, 4200, 4201, 4201, 4201, 4201, 4201, 4201, ++ 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, ++ 4201, 4201, 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, ++ 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, ++ ++ 4203, 0, 4203, 4203, 0, 0, 4203, 4203, 4203, 4203, ++ 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4204, 4204, ++ 4204, 4204, 4204, 4204, 4204, 4204, 4204, 4204, 4204, 4204, ++ 4204, 4204, 4204, 4204, 4204, 4204, 4205, 4205, 4205, 4205, ++ 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, ++ 4205, 4205, 4205, 4205, 4206, 4206, 4206, 4206, 4206, 4206, + 4206, 4206, 4206, 4206, 4206, 4206, 4206, 4206, 4206, 4206, +- 4207, 4207, 0, 4207, 4207, 4207, 4207, 4207, 4207, 4207, +- 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4208, 0, 4208, +- 0, 4208, 0, 4208, 4208, 4208, 4208, 4209, 4209, 0, +- 4209, 4209, 0, 4209, 4209, 4209, 4209, 4209, 4209, 4209, ++ 4206, 4206, 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, ++ 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, ++ 4208, 4208, 0, 4208, 4208, 0, 4208, 4208, 4208, 4208, + +- 4209, 4209, 4209, 4209, 4210, 4210, 0, 4210, 4210, 0, ++ 4208, 4208, 4208, 4208, 4208, 4208, 4208, 4209, 0, 0, ++ 4209, 4209, 0, 0, 4209, 0, 4209, 0, 4209, 4209, ++ 4209, 4209, 4210, 4210, 4210, 4210, 0, 4210, 4210, 4210, + 4210, 4210, 4210, 4210, 4210, 4210, 4210, 4210, 4210, 4210, +- 4210, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, +- 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4212, +- 0, 4212, 0, 4212, 0, 4212, 4212, 4212, 4212, 4213, +- 4213, 0, 4213, 4213, 4213, 4213, 4213, 4213, 4213, 4213, +- 4213, 4213, 4213, 4213, 4213, 4213, 4213, 4214, 4214, 0, +- 4214, 4214, 0, 4214, 4214, 4214, 4214, 4214, 4214, 4214, +- 4214, 4214, 4214, 4214, 4215, 4215, 0, 0, 4215, 4215, +- 4215, 4215, 4215, 0, 4215, 4215, 4215, 4215, 4215, 4215, +- +- 4215, 4215, 4216, 4216, 0, 4216, 4216, 0, 4216, 4216, +- 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4217, +- 0, 0, 0, 0, 0, 4217, 4217, 4217, 0, 4217, +- 4217, 4217, 4217, 4217, 4217, 4217, 4217, 4218, 0, 0, +- 0, 0, 0, 4218, 4218, 4218, 0, 4218, 4218, 4218, +- 4218, 4218, 4218, 4218, 4218, 4219, 0, 0, 4219, 4219, +- 0, 0, 4219, 0, 4219, 0, 4219, 4219, 4219, 4219, +- 4220, 4220, 0, 4220, 4220, 0, 4220, 4220, 4220, 4220, +- 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4221, 0, 0, +- 0, 0, 0, 4221, 4221, 4221, 0, 4221, 4221, 4221, +- +- 4221, 4221, 4221, 4221, 4221, 4222, 0, 4222, 0, 4222, +- 4222, 4222, 4222, 4223, 4223, 0, 4223, 4223, 0, 4223, +- 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, ++ 4211, 0, 0, 0, 0, 0, 4211, 4211, 4211, 0, ++ 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4212, 4212, ++ 4212, 4212, 4212, 4212, 4212, 4212, 4212, 4212, 4212, 4212, ++ 4212, 4212, 4212, 4212, 4212, 4212, 4213, 0, 4213, 0, ++ 4213, 4213, 4213, 4213, 4214, 4214, 0, 4214, 4214, 0, ++ 4214, 4214, 4214, 4214, 4214, 4214, 4214, 4214, 4214, 4214, ++ ++ 4214, 4215, 0, 0, 4215, 4215, 0, 0, 0, 0, ++ 0, 0, 4215, 4216, 4216, 0, 0, 0, 4216, 4216, ++ 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, ++ 4216, 4217, 4217, 0, 4217, 4217, 0, 4217, 4217, 4217, ++ 4217, 4217, 4217, 4217, 4217, 4217, 4217, 4217, 4218, 4218, ++ 0, 4218, 4218, 0, 4218, 4218, 4218, 4218, 4218, 4218, ++ 4218, 4218, 4218, 4218, 4218, 4219, 4219, 0, 4219, 4219, ++ 4219, 4219, 4219, 4219, 4219, 4219, 4219, 4219, 4219, 4219, ++ 4219, 4219, 4220, 4220, 0, 4220, 4220, 4220, 4220, 4220, ++ 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4221, ++ ++ 0, 4221, 0, 4221, 0, 4221, 4221, 4221, 4221, 4222, ++ 4222, 0, 4222, 4222, 0, 4222, 4222, 4222, 4222, 4222, ++ 4222, 4222, 4222, 4222, 4222, 4222, 4223, 4223, 0, 4223, ++ 4223, 0, 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, ++ 4223, 4223, 4223, 4224, 4224, 4224, 4224, 4224, 4224, 4224, + 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, +- 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4225, 4225, +- 0, 4225, 4225, 0, 4225, 4225, 4225, 4225, 4225, 4225, +- 4225, 4225, 4225, 4225, 4225, 4226, 4226, 0, 0, 4226, +- 4226, 4226, 4226, 4226, 0, 4226, 4226, 4226, 4226, 4226, +- 4226, 4226, 4226, 4227, 4227, 0, 0, 4227, 4227, 4227, +- 4227, 4227, 0, 4227, 4227, 4227, 4227, 4227, 4227, 4227, +- +- 4227, 4228, 4228, 0, 4228, 4228, 0, 4228, 4228, 4228, +- 4228, 4228, 4228, 4228, 4228, 4228, 4228, 4228, 4229, 4229, +- 0, 4229, 4229, 0, 4229, 4229, 4229, 4229, 4229, 4229, +- 4229, 4229, 4229, 4229, 4229, 4230, 4230, 0, 0, 4230, +- 4230, 4230, 4230, 4230, 0, 4230, 4230, 4230, 4230, 4230, +- 4230, 4230, 4230, 4231, 4231, 0, 0, 4231, 4231, 4231, +- 4231, 4231, 0, 4231, 4231, 4231, 4231, 4231, 4231, 4231, +- 4231, 4232, 0, 4232, 0, 4232, 0, 4232, 4232, 4232, +- 4232, 4233, 4233, 0, 4233, 4233, 4233, 4233, 4233, 4233, +- 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4234, 4234, +- +- 0, 4234, 4234, 0, 4234, 4234, 4234, 4234, 4234, 4234, +- 4234, 4234, 4234, 4234, 4234, 4235, 4235, 0, 4235, 4235, +- 0, 4235, 4235, 4235, 4235, 4235, 4235, 4235, 4235, 4235, +- 4235, 4235, 4236, 0, 4236, 0, 4236, 0, 4236, 4236, +- 4236, 4236, 4237, 0, 0, 0, 0, 0, 4237, 4237, +- 4237, 0, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952 ++ 4224, 4225, 0, 4225, 0, 4225, 0, 4225, 4225, 4225, ++ 4225, 4226, 4226, 0, 4226, 4226, 4226, 4226, 4226, 4226, ++ 4226, 4226, 4226, 4226, 4226, 4226, 4226, 4226, 4226, 4227, ++ 4227, 0, 4227, 4227, 0, 4227, 4227, 4227, 4227, 4227, ++ ++ 4227, 4227, 4227, 4227, 4227, 4227, 4228, 4228, 0, 0, ++ 4228, 4228, 4228, 4228, 4228, 0, 4228, 4228, 4228, 4228, ++ 4228, 4228, 4228, 4228, 4229, 4229, 0, 4229, 4229, 0, ++ 4229, 4229, 4229, 4229, 4229, 4229, 4229, 4229, 4229, 4229, ++ 4229, 4230, 0, 0, 0, 0, 0, 4230, 4230, 4230, ++ 0, 4230, 4230, 4230, 4230, 4230, 4230, 4230, 4230, 4231, ++ 0, 0, 0, 0, 0, 4231, 4231, 4231, 0, 4231, ++ 4231, 4231, 4231, 4231, 4231, 4231, 4231, 4232, 0, 0, ++ 4232, 4232, 0, 0, 4232, 0, 4232, 0, 4232, 4232, ++ 4232, 4232, 4233, 4233, 0, 4233, 4233, 0, 4233, 4233, ++ ++ 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4234, ++ 0, 0, 0, 0, 0, 4234, 4234, 4234, 0, 4234, ++ 4234, 4234, 4234, 4234, 4234, 4234, 4234, 4235, 0, 4235, ++ 0, 4235, 4235, 4235, 4235, 4236, 4236, 0, 4236, 4236, ++ 0, 4236, 4236, 4236, 4236, 4236, 4236, 4236, 4236, 4236, ++ 4236, 4236, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, ++ 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, ++ 4238, 4238, 0, 4238, 4238, 0, 4238, 4238, 4238, 4238, ++ 4238, 4238, 4238, 4238, 4238, 4238, 4238, 4239, 4239, 0, ++ 0, 4239, 4239, 4239, 4239, 4239, 0, 4239, 4239, 4239, ++ ++ 4239, 4239, 4239, 4239, 4239, 4240, 4240, 0, 0, 4240, ++ 4240, 4240, 4240, 4240, 0, 4240, 4240, 4240, 4240, 4240, ++ 4240, 4240, 4240, 4241, 4241, 0, 4241, 4241, 0, 4241, ++ 4241, 4241, 4241, 4241, 4241, 4241, 4241, 4241, 4241, 4241, ++ 4242, 4242, 0, 4242, 4242, 0, 4242, 4242, 4242, 4242, ++ 4242, 4242, 4242, 4242, 4242, 4242, 4242, 4243, 4243, 0, ++ 0, 4243, 4243, 4243, 4243, 4243, 0, 4243, 4243, 4243, ++ 4243, 4243, 4243, 4243, 4243, 4244, 4244, 0, 0, 4244, ++ 4244, 4244, 4244, 4244, 0, 4244, 4244, 4244, 4244, 4244, ++ 4244, 4244, 4244, 4245, 0, 4245, 0, 4245, 0, 4245, ++ ++ 4245, 4245, 4245, 4246, 4246, 0, 4246, 4246, 4246, 4246, ++ 4246, 4246, 4246, 4246, 4246, 4246, 4246, 4246, 4246, 4246, ++ 4247, 4247, 0, 4247, 4247, 0, 4247, 4247, 4247, 4247, ++ 4247, 4247, 4247, 4247, 4247, 4247, 4247, 4248, 4248, 0, ++ 4248, 4248, 0, 4248, 4248, 4248, 4248, 4248, 4248, 4248, ++ 4248, 4248, 4248, 4248, 4249, 0, 4249, 0, 4249, 0, ++ 4249, 4249, 4249, 4249, 4250, 0, 0, 0, 0, 0, ++ 4250, 4250, 4250, 0, 4250, 4250, 4250, 4250, 4250, 4250, ++ 4250, 4250, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965 + } ; + + static yy_state_type yy_last_accepting_state; +@@ -5036,68 +5043,68 @@ static char *yy_last_accepting_cpos; + extern int yy_flex_debug; + int yy_flex_debug = 1; + +-static const flex_int16_t yy_rule_linenum[542] = ++static const flex_int16_t yy_rule_linenum[544] = + { 0, +- 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, +- 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, +- 526, 527, 529, 530, 531, 532, 533, 534, 535, 536, +- 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, +- 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, +- 557, 558, 559, 560, 561, 562, 564, 565, 568, 569, +- 570, 571, 572, 573, 574, 576, 577, 578, 579, 580, +- 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, +- 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, +- 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, +- +- 611, 612, 614, 615, 616, 617, 618, 619, 623, 628, +- 629, 634, 635, 636, 641, 642, 643, 648, 653, 654, +- 655, 660, 661, 665, 666, 667, 671, 672, 676, 677, +- 681, 682, 683, 687, 688, 692, 693, 698, 699, 700, +- 704, 708, 709, 717, 722, 723, 728, 729, 730, 739, +- 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, +- 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, +- 762, 763, 764, 765, 768, 769, 770, 771, 772, 773, +- 774, 775, 776, 778, 779, 780, 781, 782, 783, 784, +- 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, +- +- 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, +- 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, +- 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, +- 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, +- 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, +- 845, 846, 847, 848, 849, 850, 851, 852, 853, 855, +- 856, 857, 859, 860, 861, 862, 863, 864, 865, 866, +- 867, 868, 871, 875, 876, 877, 878, 879, 883, 884, +- 885, 886, 887, 888, 892, 893, 894, 895, 900, 901, +- 902, 903, 904, 905, 906, 907, 908, 909, 910, 911, +- +- 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, +- 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, +- 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, +- 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, +- 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, +- 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, +- 972, 973, 974, 975, 976, 977, 978, 979, 980, 981, +- 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, +- 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, +- 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, +- +- 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1023, +- 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1035, 1036, +- 1037, 1038, 1039, 1040, 1045, 1046, 1047, 1048, 1049, 1050, +- 1051, 1052, 1053, 1055, 1056, 1057, 1058, 1059, 1064, 1065, +- 1066, 1067, 1068, 1069, 1071, 1072, 1074, 1075, 1081, 1082, +- 1083, 1084, 1085, 1086, 1089, 1090, 1091, 1092, 1093, 1094, +- 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, +- 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, +- 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, +- 1128, 1130, 1131, 1136, 1140, 1144, 1145, 1149, 1150, 1153, +- +- 1154, 1158, 1159, 1163, 1164, 1168, 1169, 1174, 1176, 1177, +- 1178, 1179, 1181, 1182, 1183, 1184, 1186, 1187, 1188, 1189, +- 1191, 1193, 1194, 1196, 1197, 1198, 1199, 1201, 1206, 1207, +- 1208, 1212, 1213, 1214, 1219, 1221, 1222, 1223, 1242, 1269, +- 1299 ++ 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, ++ 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, ++ 527, 528, 530, 531, 532, 533, 534, 535, 536, 537, ++ 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, ++ 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, ++ 558, 559, 560, 561, 562, 563, 565, 566, 569, 570, ++ 571, 572, 573, 574, 575, 577, 578, 579, 580, 581, ++ 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, ++ 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, ++ 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, ++ ++ 612, 613, 615, 616, 617, 618, 619, 620, 624, 629, ++ 630, 635, 636, 637, 642, 643, 644, 649, 654, 655, ++ 656, 661, 662, 666, 667, 668, 672, 673, 677, 678, ++ 682, 683, 684, 688, 689, 693, 694, 699, 700, 701, ++ 705, 709, 710, 718, 723, 724, 729, 730, 731, 740, ++ 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, ++ 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, ++ 763, 764, 765, 766, 769, 770, 771, 772, 773, 774, ++ 775, 776, 777, 779, 780, 781, 782, 783, 784, 785, ++ 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, ++ ++ 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, ++ 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, ++ 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, ++ 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, ++ 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, ++ 846, 847, 848, 849, 850, 851, 852, 853, 854, 856, ++ 857, 858, 860, 861, 862, 863, 864, 865, 866, 867, ++ 868, 869, 872, 876, 877, 878, 879, 880, 884, 885, ++ 886, 887, 888, 889, 893, 894, 895, 896, 901, 902, ++ 903, 904, 905, 906, 907, 908, 909, 910, 911, 912, ++ ++ 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, ++ 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, ++ 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, ++ 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, ++ 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, ++ 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, ++ 973, 974, 975, 976, 977, 978, 979, 980, 981, 982, ++ 983, 984, 985, 986, 987, 988, 989, 990, 991, 992, ++ 993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002, ++ 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, ++ ++ 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, ++ 1023, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, ++ 1038, 1039, 1040, 1041, 1042, 1043, 1048, 1049, 1050, 1051, ++ 1052, 1053, 1054, 1055, 1056, 1058, 1059, 1060, 1061, 1062, ++ 1067, 1068, 1069, 1070, 1071, 1072, 1074, 1075, 1077, 1078, ++ 1084, 1085, 1086, 1087, 1088, 1089, 1092, 1093, 1094, 1095, ++ 1096, 1097, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, ++ 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, ++ 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, ++ 1129, 1130, 1131, 1133, 1134, 1139, 1143, 1147, 1148, 1152, ++ ++ 1153, 1156, 1157, 1161, 1162, 1166, 1167, 1171, 1172, 1177, ++ 1179, 1180, 1181, 1182, 1184, 1185, 1186, 1187, 1189, 1190, ++ 1191, 1192, 1194, 1196, 1197, 1199, 1200, 1201, 1202, 1204, ++ 1209, 1210, 1211, 1215, 1216, 1217, 1222, 1224, 1225, 1226, ++ 1245, 1272, 1302 + } ; + + /* The intent behind this definition is that it'll catch +@@ -5183,15 +5190,15 @@ static std::stack YY_PREVIOUS_STATE; + #define BEGIN_PREVIOUS() { BEGIN(YY_PREVIOUS_STATE.top()); YY_PREVIOUS_STATE.pop(); } + + // The location of the current token. +-#line 5187 "seclang-scanner.cc" ++#line 5194 "seclang-scanner.cc" + #define YY_NO_INPUT 1 + +-#line 493 "seclang-scanner.ll" ++#line 494 "seclang-scanner.ll" + // Code run each time a pattern is matched. + # define YY_USER_ACTION driver.loc.back()->columns (yyleng); + +-#line 5194 "seclang-scanner.cc" +-#line 5195 "seclang-scanner.cc" ++#line 5201 "seclang-scanner.cc" ++#line 5202 "seclang-scanner.cc" + + #define INITIAL 0 + #define EXPECTING_ACTION_PREDICATE_VARIABLE 1 +@@ -5505,15 +5512,15 @@ YY_DECL + + { + /* %% [7.0] user's declarations go here */ +-#line 498 "seclang-scanner.ll" ++#line 499 "seclang-scanner.ll" + + + +-#line 502 "seclang-scanner.ll" ++#line 503 "seclang-scanner.ll" + // Code run each time yylex is called. + driver.loc.back()->step(); + +-#line 5517 "seclang-scanner.cc" ++#line 5524 "seclang-scanner.cc" + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ + { +@@ -5542,13 +5549,13 @@ yy_match: + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 3953 ) ++ if ( yy_current_state >= 3966 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + ++yy_cp; + } +- while ( yy_current_state != 3952 ); ++ while ( yy_current_state != 3965 ); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); + +@@ -5567,13 +5574,13 @@ do_action: /* This label is used only to access EOF actions. */ + { + if ( yy_act == 0 ) + fprintf( stderr, "--scanner backing up\n" ); +- else if ( yy_act < 542 ) ++ else if ( yy_act < 544 ) + fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", + (long)yy_rule_linenum[yy_act], yytext ); +- else if ( yy_act == 542 ) ++ else if ( yy_act == 544 ) + fprintf( stderr, "--accepting default rule (\"%s\")\n", + yytext ); +- else if ( yy_act == 543 ) ++ else if ( yy_act == 545 ) + fprintf( stderr, "--(end of buffer or a NUL)\n" ); + else + fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); +@@ -5591,564 +5598,564 @@ do_action: /* This label is used only to access EOF actions. */ + + case 1: + YY_RULE_SETUP +-#line 506 "seclang-scanner.ll" ++#line 507 "seclang-scanner.ll" + { return p::make_ACTION_APPEND(yytext, *driver.loc.back()); } + YY_BREAK + case 2: + YY_RULE_SETUP +-#line 507 "seclang-scanner.ll" ++#line 508 "seclang-scanner.ll" + { return p::make_ACTION_BLOCK(yytext, *driver.loc.back()); } + YY_BREAK + case 3: + YY_RULE_SETUP +-#line 508 "seclang-scanner.ll" ++#line 509 "seclang-scanner.ll" + { return p::make_ACTION_CAPTURE(yytext, *driver.loc.back()); } + YY_BREAK + case 4: + YY_RULE_SETUP +-#line 509 "seclang-scanner.ll" ++#line 510 "seclang-scanner.ll" + { return p::make_ACTION_CHAIN(yytext, *driver.loc.back()); } + YY_BREAK + case 5: + YY_RULE_SETUP +-#line 510 "seclang-scanner.ll" ++#line 511 "seclang-scanner.ll" + { return p::make_ACTION_DENY(yytext, *driver.loc.back()); } + YY_BREAK + case 6: + YY_RULE_SETUP +-#line 511 "seclang-scanner.ll" ++#line 512 "seclang-scanner.ll" + { return p::make_ACTION_DEPRECATE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 7: + YY_RULE_SETUP +-#line 512 "seclang-scanner.ll" ++#line 513 "seclang-scanner.ll" + { return p::make_ACTION_DROP(yytext, *driver.loc.back()); } + YY_BREAK + case 8: + YY_RULE_SETUP +-#line 513 "seclang-scanner.ll" ++#line 514 "seclang-scanner.ll" + { return p::make_ACTION_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 9: + YY_RULE_SETUP +-#line 514 "seclang-scanner.ll" ++#line 515 "seclang-scanner.ll" + { return p::make_ACTION_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 10: + YY_RULE_SETUP +-#line 515 "seclang-scanner.ll" ++#line 516 "seclang-scanner.ll" + { return p::make_ACTION_MULTI_MATCH(yytext, *driver.loc.back()); } + YY_BREAK + case 11: + YY_RULE_SETUP +-#line 516 "seclang-scanner.ll" ++#line 517 "seclang-scanner.ll" + { return p::make_ACTION_NO_AUDIT_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 12: + YY_RULE_SETUP +-#line 517 "seclang-scanner.ll" ++#line 518 "seclang-scanner.ll" + { return p::make_ACTION_NO_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 13: + YY_RULE_SETUP +-#line 518 "seclang-scanner.ll" ++#line 519 "seclang-scanner.ll" + { return p::make_ACTION_PASS(yytext, *driver.loc.back()); } + YY_BREAK + case 14: + YY_RULE_SETUP +-#line 519 "seclang-scanner.ll" ++#line 520 "seclang-scanner.ll" + { return p::make_ACTION_PAUSE(yytext, *driver.loc.back()); } + YY_BREAK + case 15: + YY_RULE_SETUP +-#line 520 "seclang-scanner.ll" ++#line 521 "seclang-scanner.ll" + { return p::make_ACTION_PREPEND(yytext, *driver.loc.back()); } + YY_BREAK + case 16: + YY_RULE_SETUP +-#line 521 "seclang-scanner.ll" ++#line 522 "seclang-scanner.ll" + { return p::make_ACTION_PROXY(yytext, *driver.loc.back()); } + YY_BREAK + case 17: + YY_RULE_SETUP +-#line 522 "seclang-scanner.ll" ++#line 523 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_ARG(yytext, *driver.loc.back()); } + YY_BREAK + case 18: + YY_RULE_SETUP +-#line 523 "seclang-scanner.ll" ++#line 524 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_MATCHED(yytext, *driver.loc.back()); } + YY_BREAK + case 19: + YY_RULE_SETUP +-#line 524 "seclang-scanner.ll" ++#line 525 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_MATCHED_BYTES(yytext, *driver.loc.back()); } + YY_BREAK + case 20: + YY_RULE_SETUP +-#line 525 "seclang-scanner.ll" ++#line 526 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_REQUEST_HEADER(yytext, *driver.loc.back()); } + YY_BREAK + case 21: + YY_RULE_SETUP +-#line 526 "seclang-scanner.ll" ++#line 527 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_RESPONSE_HEADER(yytext, *driver.loc.back()); } + YY_BREAK + case 22: + YY_RULE_SETUP +-#line 527 "seclang-scanner.ll" ++#line 528 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETRSC(yytext, *driver.loc.back()); } + YY_BREAK + case 23: + YY_RULE_SETUP +-#line 529 "seclang-scanner.ll" ++#line 530 "seclang-scanner.ll" + { return p::make_ACTION_STATUS(yytext, *driver.loc.back()); } + YY_BREAK + case 24: + /* rule 24 can match eol */ + YY_RULE_SETUP +-#line 530 "seclang-scanner.ll" ++#line 531 "seclang-scanner.ll" + { return p::make_ACTION_ACCURACY(yytext, *driver.loc.back()); } + YY_BREAK + case 25: + /* rule 25 can match eol */ + YY_RULE_SETUP +-#line 531 "seclang-scanner.ll" ++#line 532 "seclang-scanner.ll" + { return p::make_ACTION_ACCURACY(yytext, *driver.loc.back()); } + YY_BREAK + case 26: + YY_RULE_SETUP +-#line 532 "seclang-scanner.ll" ++#line 533 "seclang-scanner.ll" + { return p::make_ACTION_ALLOW(yytext, *driver.loc.back()); } + YY_BREAK + case 27: + YY_RULE_SETUP +-#line 533 "seclang-scanner.ll" ++#line 534 "seclang-scanner.ll" + { return p::make_ACTION_AUDIT_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 28: + YY_RULE_SETUP +-#line 534 "seclang-scanner.ll" ++#line 535 "seclang-scanner.ll" + { return p::make_ACTION_CTL_AUDIT_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 29: + YY_RULE_SETUP +-#line 535 "seclang-scanner.ll" ++#line 536 "seclang-scanner.ll" + { return p::make_ACTION_CTL_AUDIT_LOG_PARTS(yytext, *driver.loc.back()); } + YY_BREAK + case 30: + YY_RULE_SETUP +-#line 536 "seclang-scanner.ll" ++#line 537 "seclang-scanner.ll" + { return p::make_ACTION_CTL_BDY_JSON(yytext, *driver.loc.back()); } + YY_BREAK + case 31: + YY_RULE_SETUP +-#line 537 "seclang-scanner.ll" ++#line 538 "seclang-scanner.ll" + { return p::make_ACTION_CTL_BDY_XML(yytext, *driver.loc.back()); } + YY_BREAK + case 32: + YY_RULE_SETUP +-#line 538 "seclang-scanner.ll" ++#line 539 "seclang-scanner.ll" + { return p::make_ACTION_CTL_BDY_URLENCODED(yytext, *driver.loc.back()); } + YY_BREAK + case 33: + YY_RULE_SETUP +-#line 539 "seclang-scanner.ll" ++#line 540 "seclang-scanner.ll" + { return p::make_ACTION_CTL_FORCE_REQ_BODY_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 34: + YY_RULE_SETUP +-#line 540 "seclang-scanner.ll" ++#line 541 "seclang-scanner.ll" + { return p::make_ACTION_CTL_REQUEST_BODY_ACCESS(yytext, *driver.loc.back()); } + YY_BREAK + case 35: + YY_RULE_SETUP +-#line 541 "seclang-scanner.ll" ++#line 542 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_ENGINE(*driver.loc.back()); } + YY_BREAK + case 36: + YY_RULE_SETUP +-#line 542 "seclang-scanner.ll" ++#line 543 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_BY_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 37: + YY_RULE_SETUP +-#line 543 "seclang-scanner.ll" ++#line 544 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_BY_TAG(yytext, *driver.loc.back()); } + YY_BREAK + case 38: + YY_RULE_SETUP +-#line 544 "seclang-scanner.ll" ++#line 545 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 39: + YY_RULE_SETUP +-#line 545 "seclang-scanner.ll" ++#line 546 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG(yytext, *driver.loc.back()); } + YY_BREAK + case 40: + /* rule 40 can match eol */ + YY_RULE_SETUP +-#line 546 "seclang-scanner.ll" ++#line 547 "seclang-scanner.ll" + { return p::make_ACTION_EXEC(yytext, *driver.loc.back()); } + YY_BREAK + case 41: + /* rule 41 can match eol */ + YY_RULE_SETUP +-#line 547 "seclang-scanner.ll" ++#line 548 "seclang-scanner.ll" + { return p::make_ACTION_EXEC(yytext, *driver.loc.back()); } + YY_BREAK + case 42: + /* rule 42 can match eol */ + YY_RULE_SETUP +-#line 548 "seclang-scanner.ll" ++#line 549 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 43: + /* rule 43 can match eol */ + YY_RULE_SETUP +-#line 549 "seclang-scanner.ll" ++#line 550 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 44: + /* rule 44 can match eol */ + YY_RULE_SETUP +-#line 550 "seclang-scanner.ll" ++#line 551 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 45: + /* rule 45 can match eol */ + YY_RULE_SETUP +-#line 551 "seclang-scanner.ll" ++#line 552 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 46: + YY_RULE_SETUP +-#line 552 "seclang-scanner.ll" ++#line 553 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_INITCOL(yytext, *driver.loc.back()); } + YY_BREAK + case 47: + /* rule 47 can match eol */ + YY_RULE_SETUP +-#line 553 "seclang-scanner.ll" ++#line 554 "seclang-scanner.ll" + { return p::make_ACTION_MATURITY(yytext, *driver.loc.back()); } + YY_BREAK + case 48: + /* rule 48 can match eol */ + YY_RULE_SETUP +-#line 554 "seclang-scanner.ll" ++#line 555 "seclang-scanner.ll" + { return p::make_ACTION_MATURITY(yytext, *driver.loc.back()); } + YY_BREAK + case 49: + YY_RULE_SETUP +-#line 555 "seclang-scanner.ll" ++#line 556 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_MSG(yytext, *driver.loc.back()); } + YY_BREAK + case 50: + YY_RULE_SETUP +-#line 556 "seclang-scanner.ll" ++#line 557 "seclang-scanner.ll" + { return p::make_ACTION_PHASE(yytext, *driver.loc.back()); } + YY_BREAK + case 51: + YY_RULE_SETUP +-#line 557 "seclang-scanner.ll" ++#line 558 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_REDIRECT(yytext, *driver.loc.back()); } + YY_BREAK + case 52: + /* rule 52 can match eol */ + YY_RULE_SETUP +-#line 558 "seclang-scanner.ll" ++#line 559 "seclang-scanner.ll" + { return p::make_ACTION_REV(yytext, *driver.loc.back()); } + YY_BREAK + case 53: + /* rule 53 can match eol */ + YY_RULE_SETUP +-#line 559 "seclang-scanner.ll" ++#line 560 "seclang-scanner.ll" + { return p::make_ACTION_REV(yytext, *driver.loc.back()); } + YY_BREAK + case 54: + YY_RULE_SETUP +-#line 560 "seclang-scanner.ll" ++#line 561 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETENV(yytext, *driver.loc.back()); } + YY_BREAK + case 55: + YY_RULE_SETUP +-#line 561 "seclang-scanner.ll" ++#line 562 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETSID(yytext, *driver.loc.back()); } + YY_BREAK + case 56: + YY_RULE_SETUP +-#line 562 "seclang-scanner.ll" ++#line 563 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETUID(yytext, *driver.loc.back()); } + YY_BREAK + case 57: + YY_RULE_SETUP +-#line 564 "seclang-scanner.ll" ++#line 565 "seclang-scanner.ll" + { BEGIN(SETVAR_ACTION_QUOTED); return p::make_ACTION_SETVAR(*driver.loc.back()); } + YY_BREAK + case 58: + YY_RULE_SETUP +-#line 565 "seclang-scanner.ll" ++#line 566 "seclang-scanner.ll" + { BEGIN(SETVAR_ACTION_NONQUOTED); return p::make_ACTION_SETVAR(*driver.loc.back()); } + YY_BREAK + case 59: + YY_RULE_SETUP +-#line 568 "seclang-scanner.ll" ++#line 569 "seclang-scanner.ll" + { return p::make_ACTION_SEVERITY(yytext, *driver.loc.back()); } + YY_BREAK + case 60: + YY_RULE_SETUP +-#line 569 "seclang-scanner.ll" ++#line 570 "seclang-scanner.ll" + { return p::make_ACTION_SEVERITY(yytext, *driver.loc.back()); } + YY_BREAK + case 61: + YY_RULE_SETUP +-#line 570 "seclang-scanner.ll" ++#line 571 "seclang-scanner.ll" + { return p::make_ACTION_SKIP_AFTER(yytext, *driver.loc.back()); } + YY_BREAK + case 62: + YY_RULE_SETUP +-#line 571 "seclang-scanner.ll" ++#line 572 "seclang-scanner.ll" + { return p::make_ACTION_SKIP(yytext, *driver.loc.back()); } + YY_BREAK + case 63: + YY_RULE_SETUP +-#line 572 "seclang-scanner.ll" ++#line 573 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_TAG(yytext, *driver.loc.back()); } + YY_BREAK + case 64: + /* rule 64 can match eol */ + YY_RULE_SETUP +-#line 573 "seclang-scanner.ll" ++#line 574 "seclang-scanner.ll" + { return p::make_ACTION_VER(yytext, *driver.loc.back()); } + YY_BREAK + case 65: + YY_RULE_SETUP +-#line 574 "seclang-scanner.ll" ++#line 575 "seclang-scanner.ll" + { return p::make_ACTION_XMLNS(yytext, *driver.loc.back()); } + YY_BREAK + case 66: + YY_RULE_SETUP +-#line 576 "seclang-scanner.ll" ++#line 577 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT(yytext, *driver.loc.back()); } + YY_BREAK + case 67: + YY_RULE_SETUP +-#line 577 "seclang-scanner.ll" ++#line 578 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT(yytext, *driver.loc.back()); } + YY_BREAK + case 68: + YY_RULE_SETUP +-#line 578 "seclang-scanner.ll" ++#line 579 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT(yytext, *driver.loc.back()); } + YY_BREAK + case 69: + YY_RULE_SETUP +-#line 579 "seclang-scanner.ll" ++#line 580 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_SQL_HEX_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 70: + YY_RULE_SETUP +-#line 580 "seclang-scanner.ll" ++#line 581 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_BASE_64_ENCODE(yytext, *driver.loc.back()); } + YY_BREAK + case 71: + YY_RULE_SETUP +-#line 581 "seclang-scanner.ll" ++#line 582 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_BASE_64_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 72: + YY_RULE_SETUP +-#line 582 "seclang-scanner.ll" ++#line 583 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT(yytext, *driver.loc.back()); } + YY_BREAK + case 73: + YY_RULE_SETUP +-#line 583 "seclang-scanner.ll" ++#line 584 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_CMD_LINE(yytext, *driver.loc.back()); } + YY_BREAK + case 74: + YY_RULE_SETUP +-#line 584 "seclang-scanner.ll" ++#line 585 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_SHA1(yytext, *driver.loc.back()); } + YY_BREAK + case 75: + YY_RULE_SETUP +-#line 585 "seclang-scanner.ll" ++#line 586 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_MD5(yytext, *driver.loc.back()); } + YY_BREAK + case 76: + YY_RULE_SETUP +-#line 586 "seclang-scanner.ll" ++#line 587 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 77: + YY_RULE_SETUP +-#line 587 "seclang-scanner.ll" ++#line 588 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_HEX_ENCODE(yytext, *driver.loc.back()); } + YY_BREAK + case 78: + YY_RULE_SETUP +-#line 588 "seclang-scanner.ll" ++#line 589 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_HEX_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 79: + YY_RULE_SETUP +-#line 589 "seclang-scanner.ll" ++#line 590 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_LOWERCASE(yytext, *driver.loc.back()); } + YY_BREAK + case 80: + YY_RULE_SETUP +-#line 590 "seclang-scanner.ll" ++#line 591 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_UPPERCASE(yytext, *driver.loc.back()); } + YY_BREAK + case 81: + YY_RULE_SETUP +-#line 591 "seclang-scanner.ll" ++#line 592 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_URL_ENCODE(yytext, *driver.loc.back()); } + YY_BREAK + case 82: + YY_RULE_SETUP +-#line 592 "seclang-scanner.ll" ++#line 593 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_URL_DECODE_UNI(yytext, *driver.loc.back()); } + YY_BREAK + case 83: + YY_RULE_SETUP +-#line 593 "seclang-scanner.ll" ++#line 594 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_URL_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 84: + YY_RULE_SETUP +-#line 594 "seclang-scanner.ll" ++#line 595 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_NONE(yytext, *driver.loc.back()); } + YY_BREAK + case 85: + YY_RULE_SETUP +-#line 595 "seclang-scanner.ll" ++#line 596 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE(yytext, *driver.loc.back()); } + YY_BREAK + case 86: + YY_RULE_SETUP +-#line 596 "seclang-scanner.ll" ++#line 597 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_WHITESPACE(yytext, *driver.loc.back()); } + YY_BREAK + case 87: + YY_RULE_SETUP +-#line 597 "seclang-scanner.ll" ++#line 598 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REPLACE_NULLS(yytext, *driver.loc.back()); } + YY_BREAK + case 88: + YY_RULE_SETUP +-#line 598 "seclang-scanner.ll" ++#line 599 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_NULLS(yytext, *driver.loc.back()); } + YY_BREAK + case 89: + YY_RULE_SETUP +-#line 599 "seclang-scanner.ll" ++#line 600 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 90: + YY_RULE_SETUP +-#line 600 "seclang-scanner.ll" ++#line 601 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_JS_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 91: + YY_RULE_SETUP +-#line 601 "seclang-scanner.ll" ++#line 602 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_CSS_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 92: + YY_RULE_SETUP +-#line 602 "seclang-scanner.ll" ++#line 603 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_TRIM(yytext, *driver.loc.back()); } + YY_BREAK + case 93: + YY_RULE_SETUP +-#line 603 "seclang-scanner.ll" ++#line 604 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_TRIM_LEFT(yytext, *driver.loc.back()); } + YY_BREAK + case 94: + YY_RULE_SETUP +-#line 604 "seclang-scanner.ll" ++#line 605 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_TRIM_RIGHT(yytext, *driver.loc.back()); } + YY_BREAK + case 95: + YY_RULE_SETUP +-#line 605 "seclang-scanner.ll" ++#line 606 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN(yytext, *driver.loc.back()); } + YY_BREAK + case 96: + YY_RULE_SETUP +-#line 606 "seclang-scanner.ll" ++#line 607 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_NORMALISE_PATH(yytext, *driver.loc.back()); } + YY_BREAK + case 97: + YY_RULE_SETUP +-#line 607 "seclang-scanner.ll" ++#line 608 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_LENGTH(yytext, *driver.loc.back()); } + YY_BREAK + case 98: + YY_RULE_SETUP +-#line 608 "seclang-scanner.ll" ++#line 609 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_UTF8_TO_UNICODE(yytext, *driver.loc.back()); } + YY_BREAK + case 99: + YY_RULE_SETUP +-#line 609 "seclang-scanner.ll" ++#line 610 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR(yytext, *driver.loc.back()); } + YY_BREAK + case 100: + YY_RULE_SETUP +-#line 610 "seclang-scanner.ll" ++#line 611 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_COMMENTS(yytext, *driver.loc.back()); } + YY_BREAK + case 101: + YY_RULE_SETUP +-#line 611 "seclang-scanner.ll" ++#line 612 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REPLACE_COMMENTS(yytext, *driver.loc.back()); } + YY_BREAK + case 102: + YY_RULE_SETUP +-#line 612 "seclang-scanner.ll" ++#line 613 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_LOG_DATA(yytext, *driver.loc.back()); } + YY_BREAK + case 103: + YY_RULE_SETUP +-#line 614 "seclang-scanner.ll" ++#line 615 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_DETC(yytext, *driver.loc.back()); } + YY_BREAK + case 104: + YY_RULE_SETUP +-#line 615 "seclang-scanner.ll" ++#line 616 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_OFF(yytext, *driver.loc.back()); } + YY_BREAK + case 105: + YY_RULE_SETUP +-#line 616 "seclang-scanner.ll" ++#line 617 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_ON(yytext, *driver.loc.back()); } + YY_BREAK + case 106: + YY_RULE_SETUP +-#line 617 "seclang-scanner.ll" ++#line 618 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_RELEVANT_ONLY(yytext, *driver.loc.back()); } + YY_BREAK + case 107: + /* rule 107 can match eol */ + YY_RULE_SETUP +-#line 618 "seclang-scanner.ll" ++#line 619 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 108: + /* rule 108 can match eol */ + YY_RULE_SETUP +-#line 619 "seclang-scanner.ll" ++#line 620 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 109: + YY_RULE_SETUP +-#line 623 "seclang-scanner.ll" ++#line 624 "seclang-scanner.ll" + { return p::make_COMMA(*driver.loc.back()); } + YY_BREAK + +@@ -6156,75 +6163,75 @@ YY_RULE_SETUP + case 110: + /* rule 110 can match eol */ + YY_RULE_SETUP +-#line 628 "seclang-scanner.ll" ++#line 629 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 111: + /* rule 111 can match eol */ + YY_RULE_SETUP +-#line 629 "seclang-scanner.ll" ++#line 630 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 112: + YY_RULE_SETUP +-#line 634 "seclang-scanner.ll" ++#line 635 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); } + YY_BREAK + case 113: + /* rule 113 can match eol */ + YY_RULE_SETUP +-#line 635 "seclang-scanner.ll" ++#line 636 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(1); } + YY_BREAK + case 114: + /* rule 114 can match eol */ + YY_RULE_SETUP +-#line 636 "seclang-scanner.ll" ++#line 637 "seclang-scanner.ll" + { BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 115: + YY_RULE_SETUP +-#line 641 "seclang-scanner.ll" ++#line 642 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); p::make_NEW_LINE(*driver.loc.back()); } + YY_BREAK + case 116: + /* rule 116 can match eol */ + YY_RULE_SETUP +-#line 642 "seclang-scanner.ll" ++#line 643 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(1); } + YY_BREAK + case 117: + /* rule 117 can match eol */ + YY_RULE_SETUP +-#line 643 "seclang-scanner.ll" ++#line 644 "seclang-scanner.ll" + { BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 118: + YY_RULE_SETUP +-#line 648 "seclang-scanner.ll" ++#line 649 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_ACTION); yyless(0); } + YY_BREAK + + + case 119: + YY_RULE_SETUP +-#line 653 "seclang-scanner.ll" ++#line 654 "seclang-scanner.ll" + { BEGIN(ACTION_PREDICATE_ENDS_WITH_QUOTE); } + YY_BREAK + case 120: + YY_RULE_SETUP +-#line 654 "seclang-scanner.ll" ++#line 655 "seclang-scanner.ll" + { BEGIN(ACTION_PREDICATE_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 121: + YY_RULE_SETUP +-#line 655 "seclang-scanner.ll" ++#line 656 "seclang-scanner.ll" + { BEGIN(ACTION_PREDICATE_ENDS_WITH_COMMA_OR_DOUBLE_QUOTE); yyless(0); } + YY_BREAK + +@@ -6232,116 +6239,116 @@ YY_RULE_SETUP + case 122: + /* rule 122 can match eol */ + YY_RULE_SETUP +-#line 660 "seclang-scanner.ll" ++#line 661 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 123: + /* rule 123 can match eol */ + YY_RULE_SETUP +-#line 661 "seclang-scanner.ll" ++#line 662 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 124: + YY_RULE_SETUP +-#line 665 "seclang-scanner.ll" ++#line 666 "seclang-scanner.ll" + { yyless(1); BEGIN_PREVIOUS(); } + YY_BREAK + case 125: + YY_RULE_SETUP +-#line 666 "seclang-scanner.ll" ++#line 667 "seclang-scanner.ll" + { BEGIN_PREVIOUS(); } + YY_BREAK + case 126: + YY_RULE_SETUP +-#line 667 "seclang-scanner.ll" ++#line 668 "seclang-scanner.ll" + { BEGIN_PREVIOUS(); } + YY_BREAK + + + case 127: + YY_RULE_SETUP +-#line 671 "seclang-scanner.ll" ++#line 672 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(yyleng); } + YY_BREAK + case 128: + /* rule 128 can match eol */ + YY_RULE_SETUP +-#line 672 "seclang-scanner.ll" ++#line 673 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 129: + YY_RULE_SETUP +-#line 676 "seclang-scanner.ll" ++#line 677 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(yyleng); } + YY_BREAK + case 130: + /* rule 130 can match eol */ + YY_RULE_SETUP +-#line 677 "seclang-scanner.ll" ++#line 678 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 131: + YY_RULE_SETUP +-#line 681 "seclang-scanner.ll" ++#line 682 "seclang-scanner.ll" + { yyless(0); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 132: + YY_RULE_SETUP +-#line 682 "seclang-scanner.ll" ++#line 683 "seclang-scanner.ll" + { yyless(0); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE);} + YY_BREAK + case 133: + /* rule 133 can match eol */ + YY_RULE_SETUP +-#line 683 "seclang-scanner.ll" ++#line 684 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 134: + YY_RULE_SETUP +-#line 687 "seclang-scanner.ll" ++#line 688 "seclang-scanner.ll" + { BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + case 135: + YY_RULE_SETUP +-#line 688 "seclang-scanner.ll" ++#line 689 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } + YY_BREAK + + + case 136: + YY_RULE_SETUP +-#line 692 "seclang-scanner.ll" ++#line 693 "seclang-scanner.ll" + { return p::make_NOT(*driver.loc.back()); } + YY_BREAK + case 137: + /* rule 137 can match eol */ + YY_RULE_SETUP +-#line 693 "seclang-scanner.ll" ++#line 694 "seclang-scanner.ll" + { BEGIN_ACTION_OPERATION(); yyless(0); } + YY_BREAK + + + case 138: + YY_RULE_SETUP +-#line 698 "seclang-scanner.ll" ++#line 699 "seclang-scanner.ll" + { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } + YY_BREAK + case 139: + YY_RULE_SETUP +-#line 699 "seclang-scanner.ll" ++#line 700 "seclang-scanner.ll" + { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } + YY_BREAK + case 140: + YY_RULE_SETUP +-#line 700 "seclang-scanner.ll" ++#line 701 "seclang-scanner.ll" + { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } + YY_BREAK + +@@ -6349,27 +6356,27 @@ YY_RULE_SETUP + case 141: + /* rule 141 can match eol */ + YY_RULE_SETUP +-#line 704 "seclang-scanner.ll" ++#line 705 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0);} + YY_BREAK + + + case 142: + YY_RULE_SETUP +-#line 708 "seclang-scanner.ll" ++#line 709 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 143: + /* rule 143 can match eol */ + YY_RULE_SETUP +-#line 709 "seclang-scanner.ll" ++#line 710 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_ACTION); yyless(0); } + YY_BREAK + + + case 144: + YY_RULE_SETUP +-#line 717 "seclang-scanner.ll" ++#line 718 "seclang-scanner.ll" + { BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + +@@ -6377,1995 +6384,1993 @@ YY_RULE_SETUP + case 145: + /* rule 145 can match eol */ + YY_RULE_SETUP +-#line 722 "seclang-scanner.ll" ++#line 723 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 146: + /* rule 146 can match eol */ + YY_RULE_SETUP +-#line 723 "seclang-scanner.ll" ++#line 724 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0); } + YY_BREAK + + + case 147: + YY_RULE_SETUP +-#line 728 "seclang-scanner.ll" ++#line 729 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 148: + /* rule 148 can match eol */ + YY_RULE_SETUP +-#line 729 "seclang-scanner.ll" ++#line 730 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 149: + /* rule 149 can match eol */ + YY_RULE_SETUP +-#line 730 "seclang-scanner.ll" ++#line 731 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0); } + YY_BREAK + + + case YY_STATE_EOF(FINISH_ACTIONS): +-#line 738 "seclang-scanner.ll" ++#line 739 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(0); p::make_NEW_LINE(*driver.loc.back()); } + YY_BREAK + case 150: + YY_RULE_SETUP +-#line 739 "seclang-scanner.ll" ++#line 740 "seclang-scanner.ll" + { BEGIN(INITIAL); } + YY_BREAK + + case 151: + /* rule 151 can match eol */ + YY_RULE_SETUP +-#line 742 "seclang-scanner.ll" ++#line 743 "seclang-scanner.ll" + { return p::make_CONFIG_COMPONENT_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); } + YY_BREAK + case 152: + /* rule 152 can match eol */ + YY_RULE_SETUP +-#line 743 "seclang-scanner.ll" ++#line 744 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_SERVER_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); } + YY_BREAK + case 153: + /* rule 153 can match eol */ + YY_RULE_SETUP +-#line 744 "seclang-scanner.ll" ++#line 745 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(strchr(yytext, ' ') + 2), *driver.loc.back()); } + YY_BREAK + case 154: + YY_RULE_SETUP +-#line 745 "seclang-scanner.ll" ++#line 746 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 155: + YY_RULE_SETUP +-#line 746 "seclang-scanner.ll" ++#line 747 "seclang-scanner.ll" + { return p::make_CONFIG_CONTENT_INJECTION(*driver.loc.back()); } + YY_BREAK + case 156: + YY_RULE_SETUP +-#line 747 "seclang-scanner.ll" ++#line 748 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR_MOD(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 157: + YY_RULE_SETUP +-#line 748 "seclang-scanner.ll" ++#line 749 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR_MOD(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 158: + YY_RULE_SETUP +-#line 749 "seclang-scanner.ll" ++#line 750 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 159: + YY_RULE_SETUP +-#line 750 "seclang-scanner.ll" ++#line 751 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 160: + YY_RULE_SETUP +-#line 751 "seclang-scanner.ll" ++#line 752 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_ARGUMENT_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 161: + YY_RULE_SETUP +-#line 752 "seclang-scanner.ll" ++#line 753 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_ARGUMENT_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 162: + YY_RULE_SETUP +-#line 753 "seclang-scanner.ll" ++#line 754 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_ENG(yytext, *driver.loc.back()); } + YY_BREAK + case 163: + YY_RULE_SETUP +-#line 754 "seclang-scanner.ll" ++#line 755 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_FLE_MOD(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 164: + YY_RULE_SETUP +-#line 755 "seclang-scanner.ll" ++#line 756 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG2(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 165: + YY_RULE_SETUP +-#line 756 "seclang-scanner.ll" ++#line 757 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG_P(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 166: + YY_RULE_SETUP +-#line 757 "seclang-scanner.ll" ++#line 758 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG_P(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 167: + YY_RULE_SETUP +-#line 758 "seclang-scanner.ll" ++#line 759 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 168: + YY_RULE_SETUP +-#line 759 "seclang-scanner.ll" ++#line 760 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG_FMT(*driver.loc.back()); } + YY_BREAK + case 169: + YY_RULE_SETUP +-#line 760 "seclang-scanner.ll" ++#line 761 "seclang-scanner.ll" + { return p::make_JSON(*driver.loc.back()); } + YY_BREAK + case 170: + YY_RULE_SETUP +-#line 761 "seclang-scanner.ll" ++#line 762 "seclang-scanner.ll" + { return p::make_NATIVE(*driver.loc.back()); } + YY_BREAK + case 171: + YY_RULE_SETUP +-#line 762 "seclang-scanner.ll" ++#line 763 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 172: + YY_RULE_SETUP +-#line 763 "seclang-scanner.ll" ++#line 764 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_STS(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 173: + YY_RULE_SETUP +-#line 764 "seclang-scanner.ll" ++#line 765 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_STS(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 174: + YY_RULE_SETUP +-#line 765 "seclang-scanner.ll" ++#line 766 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_TPE(yytext, *driver.loc.back()); } + YY_BREAK + case 175: + YY_RULE_SETUP +-#line 768 "seclang-scanner.ll" ++#line 769 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_DEBUG_LOG(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 176: + YY_RULE_SETUP +-#line 769 "seclang-scanner.ll" ++#line 770 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_DEBUG_LOG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 177: + YY_RULE_SETUP +-#line 770 "seclang-scanner.ll" ++#line 771 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_DEBUG_LVL(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 178: + YY_RULE_SETUP +-#line 771 "seclang-scanner.ll" ++#line 772 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_GEO_DB(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 179: + YY_RULE_SETUP +-#line 772 "seclang-scanner.ll" ++#line 773 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 180: + YY_RULE_SETUP +-#line 773 "seclang-scanner.ll" ++#line 774 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_PCRE_MATCH_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 181: + YY_RULE_SETUP +-#line 774 "seclang-scanner.ll" ++#line 775 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_ARGS_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 182: + YY_RULE_SETUP +-#line 775 "seclang-scanner.ll" ++#line 776 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 183: + YY_RULE_SETUP +-#line 776 "seclang-scanner.ll" ++#line 777 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 184: + YY_RULE_SETUP +-#line 778 "seclang-scanner.ll" ++#line 779 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_LIMIT_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 185: + YY_RULE_SETUP +-#line 779 "seclang-scanner.ll" ++#line 780 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 186: + YY_RULE_SETUP +-#line 780 "seclang-scanner.ll" ++#line 781 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 187: + YY_RULE_SETUP +-#line 781 "seclang-scanner.ll" ++#line 782 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY(yytext, *driver.loc.back()); } + YY_BREAK + case 188: + YY_RULE_SETUP +-#line 782 "seclang-scanner.ll" ++#line 783 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RES_BODY_LIMIT_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 189: + YY_RULE_SETUP +-#line 783 "seclang-scanner.ll" ++#line 784 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RES_BODY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 190: + YY_RULE_SETUP +-#line 784 "seclang-scanner.ll" ++#line 785 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RES_BODY(yytext, *driver.loc.back()); } + YY_BREAK + case 191: + YY_RULE_SETUP +-#line 785 "seclang-scanner.ll" ++#line 786 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RULE_ENG(yytext, *driver.loc.back()); } + YY_BREAK + case 192: + YY_RULE_SETUP +-#line 786 "seclang-scanner.ll" ++#line 787 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_SEC_MARKER(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 193: + YY_RULE_SETUP +-#line 787 "seclang-scanner.ll" ++#line 788 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_SEC_MARKER(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 194: + YY_RULE_SETUP +-#line 788 "seclang-scanner.ll" ++#line 789 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_UNICODE_MAP_FILE(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 195: + YY_RULE_SETUP +-#line 789 "seclang-scanner.ll" ++#line 790 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 196: + YY_RULE_SETUP +-#line 790 "seclang-scanner.ll" ++#line 791 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 197: + YY_RULE_SETUP +-#line 791 "seclang-scanner.ll" ++#line 792 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 198: + YY_RULE_SETUP +-#line 792 "seclang-scanner.ll" ++#line 793 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 199: + YY_RULE_SETUP +-#line 793 "seclang-scanner.ll" ++#line 794 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 200: + YY_RULE_SETUP +-#line 794 "seclang-scanner.ll" ++#line 795 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 201: + YY_RULE_SETUP +-#line 795 "seclang-scanner.ll" ++#line 796 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 202: + YY_RULE_SETUP +-#line 796 "seclang-scanner.ll" ++#line 797 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 203: + YY_RULE_SETUP +-#line 797 "seclang-scanner.ll" ++#line 798 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 204: + YY_RULE_SETUP +-#line 798 "seclang-scanner.ll" ++#line 799 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 205: + YY_RULE_SETUP +-#line 799 "seclang-scanner.ll" ++#line 800 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 206: + YY_RULE_SETUP +-#line 800 "seclang-scanner.ll" ++#line 801 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 207: + YY_RULE_SETUP +-#line 801 "seclang-scanner.ll" ++#line 802 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 208: + YY_RULE_SETUP +-#line 802 "seclang-scanner.ll" ++#line 803 "seclang-scanner.ll" + { return p::make_CONFIG_UPDLOAD_KEEP_FILES(yytext, *driver.loc.back()); } + YY_BREAK + case 209: + YY_RULE_SETUP +-#line 803 "seclang-scanner.ll" ++#line 804 "seclang-scanner.ll" + { return p::make_CONFIG_UPDLOAD_SAVE_TMP_FILES(yytext, *driver.loc.back()); } + YY_BREAK + case 210: + YY_RULE_SETUP +-#line 804 "seclang-scanner.ll" ++#line 805 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 211: + YY_RULE_SETUP +-#line 805 "seclang-scanner.ll" ++#line 806 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 212: + YY_RULE_SETUP +-#line 806 "seclang-scanner.ll" ++#line 807 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_FILE_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 213: + YY_RULE_SETUP +-#line 807 "seclang-scanner.ll" ++#line 808 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_FILE_MODE(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 214: + YY_RULE_SETUP +-#line 808 "seclang-scanner.ll" ++#line 809 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_ABORT(yytext, *driver.loc.back()); } + YY_BREAK + case 215: + YY_RULE_SETUP +-#line 809 "seclang-scanner.ll" ++#line 810 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_DETC(yytext, *driver.loc.back()); } + YY_BREAK + case 216: + YY_RULE_SETUP +-#line 810 "seclang-scanner.ll" ++#line 811 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_HTTPS(yytext, *driver.loc.back()); } + YY_BREAK + case 217: + YY_RULE_SETUP +-#line 811 "seclang-scanner.ll" ++#line 812 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_OFF(yytext, *driver.loc.back()); } + YY_BREAK + case 218: + YY_RULE_SETUP +-#line 812 "seclang-scanner.ll" ++#line 813 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_ON(yytext, *driver.loc.back()); } + YY_BREAK + case 219: + YY_RULE_SETUP +-#line 813 "seclang-scanner.ll" ++#line 814 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_PARALLEL(yytext, *driver.loc.back()); } + YY_BREAK + case 220: + YY_RULE_SETUP +-#line 814 "seclang-scanner.ll" ++#line 815 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_PROCESS_PARTIAL(yytext, *driver.loc.back()); } + YY_BREAK + case 221: + YY_RULE_SETUP +-#line 815 "seclang-scanner.ll" ++#line 816 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_REJECT(yytext, *driver.loc.back()); } + YY_BREAK + case 222: + YY_RULE_SETUP +-#line 816 "seclang-scanner.ll" ++#line 817 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_RELEVANT_ONLY(yytext, *driver.loc.back()); } + YY_BREAK + case 223: + YY_RULE_SETUP +-#line 817 "seclang-scanner.ll" ++#line 818 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_SERIAL(yytext, *driver.loc.back()); } + YY_BREAK + case 224: + YY_RULE_SETUP +-#line 818 "seclang-scanner.ll" ++#line 819 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_WARN(yytext, *driver.loc.back()); } + YY_BREAK + case 225: + YY_RULE_SETUP +-#line 819 "seclang-scanner.ll" ++#line 820 "seclang-scanner.ll" + { return p::make_CONFIG_XML_EXTERNAL_ENTITY(yytext, *driver.loc.back()); } + YY_BREAK + case 226: + YY_RULE_SETUP +-#line 820 "seclang-scanner.ll" ++#line 821 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_RESPONSE_BODY_MP(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 227: + YY_RULE_SETUP +-#line 821 "seclang-scanner.ll" ++#line 822 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR(*driver.loc.back()); } + YY_BREAK + case 228: + YY_RULE_SETUP +-#line 822 "seclang-scanner.ll" ++#line 823 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_ARG_SEP(yytext, *driver.loc.back()); } + YY_BREAK + case 229: + YY_RULE_SETUP +-#line 823 "seclang-scanner.ll" ++#line 824 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_COOKIE_FORMAT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 230: + YY_RULE_SETUP +-#line 824 "seclang-scanner.ll" ++#line 825 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_COOKIEV0_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 231: + YY_RULE_SETUP +-#line 825 "seclang-scanner.ll" ++#line 826 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_COOKIEV0_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 232: + YY_RULE_SETUP +-#line 826 "seclang-scanner.ll" ++#line 827 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_DATA_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 233: + YY_RULE_SETUP +-#line 827 "seclang-scanner.ll" ++#line 828 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_DATA_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 234: + YY_RULE_SETUP +-#line 828 "seclang-scanner.ll" ++#line 829 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_STATUS_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 235: + YY_RULE_SETUP +-#line 829 "seclang-scanner.ll" ++#line 830 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_TMP_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 236: + YY_RULE_SETUP +-#line 830 "seclang-scanner.ll" ++#line 831 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_TMP_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 237: + YY_RULE_SETUP +-#line 831 "seclang-scanner.ll" ++#line 832 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_DIRECTIVE_SECRULESCRIPT(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 238: + YY_RULE_SETUP +-#line 832 "seclang-scanner.ll" ++#line 833 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_DIRECTIVE_SECRULESCRIPT(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 239: + YY_RULE_SETUP +-#line 833 "seclang-scanner.ll" ++#line 834 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CACHE_TRANSFORMATIONS(yytext, *driver.loc.back()); } + YY_BREAK + case 240: + YY_RULE_SETUP +-#line 834 "seclang-scanner.ll" ++#line 835 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CHROOT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 241: + YY_RULE_SETUP +-#line 835 "seclang-scanner.ll" ++#line 836 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CHROOT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 242: + YY_RULE_SETUP +-#line 836 "seclang-scanner.ll" ++#line 837 "seclang-scanner.ll" + { return p::make_CONFIG_CONN_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 243: + YY_RULE_SETUP +-#line 837 "seclang-scanner.ll" ++#line 838 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 244: + YY_RULE_SETUP +-#line 838 "seclang-scanner.ll" ++#line 839 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_KEY(yytext, *driver.loc.back()); } + YY_BREAK + case 245: + YY_RULE_SETUP +-#line 839 "seclang-scanner.ll" ++#line 840 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_PARAM(yytext, *driver.loc.back()); } + YY_BREAK + case 246: + YY_RULE_SETUP +-#line 840 "seclang-scanner.ll" ++#line 841 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_METHOD_RX(yytext, *driver.loc.back()); } + YY_BREAK + case 247: + YY_RULE_SETUP +-#line 841 "seclang-scanner.ll" ++#line 842 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_METHOD_PM(yytext, *driver.loc.back()); } + YY_BREAK + case 248: + YY_RULE_SETUP +-#line 842 "seclang-scanner.ll" ++#line 843 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_GSB_DB(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 249: + YY_RULE_SETUP +-#line 843 "seclang-scanner.ll" ++#line 844 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_GSB_DB(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 250: + YY_RULE_SETUP +-#line 844 "seclang-scanner.ll" ++#line 845 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_GUARDIAN_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 251: + YY_RULE_SETUP +-#line 845 "seclang-scanner.ll" ++#line 846 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_INTERCEPT_ON_ERROR(yytext, *driver.loc.back()); } + YY_BREAK + case 252: + YY_RULE_SETUP +-#line 846 "seclang-scanner.ll" ++#line 847 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CONN_R_STATE_LIMIT(yytext, *driver.loc.back()); } + YY_BREAK + case 253: + YY_RULE_SETUP +-#line 847 "seclang-scanner.ll" ++#line 848 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CONN_W_STATE_LIMIT(yytext, *driver.loc.back()); } + YY_BREAK + case 254: + YY_RULE_SETUP +-#line 848 "seclang-scanner.ll" ++#line 849 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_SENSOR_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 255: + YY_RULE_SETUP +-#line 849 "seclang-scanner.ll" ++#line 850 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_INHERITANCE(yytext, *driver.loc.back()); } + YY_BREAK + case 256: + YY_RULE_SETUP +-#line 850 "seclang-scanner.ll" ++#line 851 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_PERF_TIME(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 257: + YY_RULE_SETUP +-#line 851 "seclang-scanner.ll" ++#line 852 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_STREAM_IN_BODY_INSPECTION(yytext, *driver.loc.back()); } + YY_BREAK + case 258: + YY_RULE_SETUP +-#line 852 "seclang-scanner.ll" ++#line 853 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION(yytext, *driver.loc.back()); } + YY_BREAK + case 259: + YY_RULE_SETUP +-#line 853 "seclang-scanner.ll" ++#line 854 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_DISABLE_BACKEND_COMPRESS(yytext, *driver.loc.back()); } + YY_BREAK + case 260: + YY_RULE_SETUP +-#line 855 "seclang-scanner.ll" ++#line 856 "seclang-scanner.ll" + { BEGIN(TRANSACTION_TO_VARIABLE); return p::make_DIRECTIVE(yytext, *driver.loc.back()); } + YY_BREAK + case 261: + YY_RULE_SETUP +-#line 856 "seclang-scanner.ll" ++#line 857 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_CONFIG_DIR_SEC_DEFAULT_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 262: + YY_RULE_SETUP +-#line 857 "seclang-scanner.ll" ++#line 858 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_CONFIG_DIR_SEC_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 263: + YY_RULE_SETUP +-#line 859 "seclang-scanner.ll" ++#line 860 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 264: + YY_RULE_SETUP +-#line 860 "seclang-scanner.ll" ++#line 861 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_COLLECTION_TIMEOUT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 265: + YY_RULE_SETUP +-#line 861 "seclang-scanner.ll" ++#line 862 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HTTP_BLKEY(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 266: + /* rule 266 can match eol */ + YY_RULE_SETUP +-#line 862 "seclang-scanner.ll" ++#line 863 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 267: + /* rule 267 can match eol */ + YY_RULE_SETUP +-#line 863 "seclang-scanner.ll" ++#line 864 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(COMMENT); } + YY_BREAK + case 268: + /* rule 268 can match eol */ + YY_RULE_SETUP +-#line 864 "seclang-scanner.ll" ++#line 865 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(COMMENT); } + YY_BREAK + case 269: + YY_RULE_SETUP +-#line 865 "seclang-scanner.ll" ++#line 866 "seclang-scanner.ll" + { driver.loc.back()->step(); /* comment, just ignore. */ } + YY_BREAK + case 270: + YY_RULE_SETUP +-#line 866 "seclang-scanner.ll" ++#line 867 "seclang-scanner.ll" + { driver.loc.back()->step(); /* carriage return, just ignore. */} + YY_BREAK + case 271: + YY_RULE_SETUP +-#line 867 "seclang-scanner.ll" ++#line 868 "seclang-scanner.ll" + { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } + YY_BREAK + case 272: + YY_RULE_SETUP +-#line 868 "seclang-scanner.ll" ++#line 869 "seclang-scanner.ll" + { return p::make_COMMA(*driver.loc.back()); } + YY_BREAK + + case 273: + YY_RULE_SETUP +-#line 871 "seclang-scanner.ll" ++#line 872 "seclang-scanner.ll" + { BEGIN(EXPECTING_VARIABLE); } + YY_BREAK + + + case 274: + YY_RULE_SETUP +-#line 875 "seclang-scanner.ll" ++#line 876 "seclang-scanner.ll" + { return p::make_PIPE(*driver.loc.back()); } + YY_BREAK + case 275: + YY_RULE_SETUP +-#line 876 "seclang-scanner.ll" ++#line 877 "seclang-scanner.ll" + { return p::make_PIPE(*driver.loc.back()); } + YY_BREAK + case 276: + YY_RULE_SETUP +-#line 877 "seclang-scanner.ll" ++#line 878 "seclang-scanner.ll" + { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } + YY_BREAK + case 277: + YY_RULE_SETUP +-#line 878 "seclang-scanner.ll" ++#line 879 "seclang-scanner.ll" + { return p::make_VAR_EXCLUSION(*driver.loc.back()); } + YY_BREAK + case 278: + YY_RULE_SETUP +-#line 879 "seclang-scanner.ll" ++#line 880 "seclang-scanner.ll" + { return p::make_VAR_COUNT(*driver.loc.back()); } + YY_BREAK + + + case 279: + YY_RULE_SETUP +-#line 883 "seclang-scanner.ll" ++#line 884 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 280: + YY_RULE_SETUP +-#line 884 "seclang-scanner.ll" ++#line 885 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 281: + /* rule 281 can match eol */ + YY_RULE_SETUP +-#line 885 "seclang-scanner.ll" ++#line 886 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 282: + /* rule 282 can match eol */ + YY_RULE_SETUP +-#line 886 "seclang-scanner.ll" ++#line 887 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 283: + /* rule 283 can match eol */ + YY_RULE_SETUP +-#line 887 "seclang-scanner.ll" ++#line 888 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 284: + /* rule 284 can match eol */ + YY_RULE_SETUP +-#line 888 "seclang-scanner.ll" ++#line 889 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + + + case 285: + YY_RULE_SETUP +-#line 892 "seclang-scanner.ll" ++#line 893 "seclang-scanner.ll" + { } + YY_BREAK + case 286: + YY_RULE_SETUP +-#line 893 "seclang-scanner.ll" ++#line 894 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 287: + /* rule 287 can match eol */ + YY_RULE_SETUP +-#line 894 "seclang-scanner.ll" ++#line 895 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 288: + /* rule 288 can match eol */ + YY_RULE_SETUP +-#line 895 "seclang-scanner.ll" ++#line 896 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + + + case 289: + YY_RULE_SETUP +-#line 900 "seclang-scanner.ll" ++#line 901 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } + YY_BREAK + case 290: + YY_RULE_SETUP +-#line 901 "seclang-scanner.ll" ++#line 902 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_COMBINED_SIZE(*driver.loc.back()); } + YY_BREAK + case 291: + YY_RULE_SETUP +-#line 902 "seclang-scanner.ll" ++#line 903 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_GET_NAMES(*driver.loc.back()); } + YY_BREAK + case 292: + YY_RULE_SETUP +-#line 903 "seclang-scanner.ll" ++#line 904 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_GET_NAMES(*driver.loc.back()); } + YY_BREAK + case 293: + YY_RULE_SETUP +-#line 904 "seclang-scanner.ll" ++#line 905 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_NAMES(*driver.loc.back()); } + YY_BREAK + case 294: + YY_RULE_SETUP +-#line 905 "seclang-scanner.ll" ++#line 906 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_NAMES(*driver.loc.back()); } + YY_BREAK + case 295: + YY_RULE_SETUP +-#line 906 "seclang-scanner.ll" ++#line 907 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_POST_NAMES(*driver.loc.back()); } + YY_BREAK + case 296: + YY_RULE_SETUP +-#line 907 "seclang-scanner.ll" ++#line 908 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_POST_NAMES(*driver.loc.back()); } + YY_BREAK + case 297: + YY_RULE_SETUP +-#line 908 "seclang-scanner.ll" ++#line 909 "seclang-scanner.ll" + { return p::make_VARIABLE_AUTH_TYPE(*driver.loc.back()); } + YY_BREAK + case 298: + YY_RULE_SETUP +-#line 909 "seclang-scanner.ll" ++#line 910 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_COMBINED_SIZE(*driver.loc.back()); } + YY_BREAK + case 299: + YY_RULE_SETUP +-#line 910 "seclang-scanner.ll" ++#line 911 "seclang-scanner.ll" + { return p::make_VARIABLE_FULL_REQUEST_LENGTH(*driver.loc.back()); } + YY_BREAK + case 300: + YY_RULE_SETUP +-#line 911 "seclang-scanner.ll" ++#line 912 "seclang-scanner.ll" + { return p::make_VARIABLE_FULL_REQUEST(*driver.loc.back()); } + YY_BREAK + case 301: + YY_RULE_SETUP +-#line 912 "seclang-scanner.ll" ++#line 913 "seclang-scanner.ll" + { return p::make_VARIABLE_INBOUND_DATA_ERROR(*driver.loc.back()); } + YY_BREAK + case 302: + YY_RULE_SETUP +-#line 913 "seclang-scanner.ll" ++#line 914 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VAR_NAME(*driver.loc.back()); } + YY_BREAK + case 303: + YY_RULE_SETUP +-#line 914 "seclang-scanner.ll" ++#line 915 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VAR(*driver.loc.back()); } + YY_BREAK + case 304: + YY_RULE_SETUP +-#line 915 "seclang-scanner.ll" ++#line 916 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_BOUNDARY_QUOTED(*driver.loc.back()); } + YY_BREAK + case 305: + YY_RULE_SETUP +-#line 916 "seclang-scanner.ll" ++#line 917 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE(*driver.loc.back()); } + YY_BREAK + case 306: + YY_RULE_SETUP +-#line 917 "seclang-scanner.ll" ++#line 918 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_CRLF_LF_LINES(*driver.loc.back()); } + YY_BREAK + case 307: + YY_RULE_SETUP +-#line 918 "seclang-scanner.ll" ++#line 919 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_DATA_AFTER(*driver.loc.back()); } + YY_BREAK + case 308: + YY_RULE_SETUP +-#line 919 "seclang-scanner.ll" ++#line 920 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_DATA_BEFORE(*driver.loc.back()); } + YY_BREAK + case 309: + YY_RULE_SETUP +-#line 920 "seclang-scanner.ll" ++#line 921 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED(*driver.loc.back()); } + YY_BREAK + case 310: + YY_RULE_SETUP +-#line 921 "seclang-scanner.ll" ++#line 922 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_FILENAME(*driver.loc.back()); } + YY_BREAK + case 311: + YY_RULE_SETUP +-#line 922 "seclang-scanner.ll" ++#line 923 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_FILENAME(*driver.loc.back()); } + YY_BREAK + case 312: + YY_RULE_SETUP +-#line 923 "seclang-scanner.ll" ++#line 924 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_HEADER_FOLDING(*driver.loc.back()); } + YY_BREAK + case 313: + YY_RULE_SETUP +-#line 924 "seclang-scanner.ll" ++#line 925 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_HEADER_FOLDING(*driver.loc.back()); } + YY_BREAK + case 314: + YY_RULE_SETUP +-#line 925 "seclang-scanner.ll" ++#line 926 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING(*driver.loc.back()); } + YY_BREAK + case 315: + YY_RULE_SETUP +-#line 926 "seclang-scanner.ll" ++#line 927 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_INVALID_PART(*driver.loc.back()); } + YY_BREAK + case 316: + YY_RULE_SETUP +-#line 927 "seclang-scanner.ll" ++#line 928 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_INVALID_QUOTING(*driver.loc.back()); } + YY_BREAK + case 317: + YY_RULE_SETUP +-#line 928 "seclang-scanner.ll" ++#line 929 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_LF_LINE(*driver.loc.back()); } + YY_BREAK + case 318: + YY_RULE_SETUP +-#line 929 "seclang-scanner.ll" ++#line 930 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_MISSING_SEMICOLON(*driver.loc.back()); } + YY_BREAK + case 319: + YY_RULE_SETUP +-#line 930 "seclang-scanner.ll" ++#line 931 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_SEMICOLON_MISSING(*driver.loc.back()); } + YY_BREAK + case 320: + YY_RULE_SETUP +-#line 931 "seclang-scanner.ll" ++#line 932 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_NAME(*driver.loc.back()); } + YY_BREAK + case 321: + YY_RULE_SETUP +-#line 932 "seclang-scanner.ll" ++#line 933 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_NAME(*driver.loc.back()); } + YY_BREAK + case 322: + YY_RULE_SETUP +-#line 933 "seclang-scanner.ll" ++#line 934 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_STRICT_ERROR(*driver.loc.back()); } + YY_BREAK + case 323: + YY_RULE_SETUP +-#line 934 "seclang-scanner.ll" ++#line 935 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY(*driver.loc.back()); } + YY_BREAK + case 324: + YY_RULE_SETUP +-#line 935 "seclang-scanner.ll" ++#line 936 "seclang-scanner.ll" + { return p::make_VARIABLE_OUTBOUND_DATA_ERROR(*driver.loc.back()); } + YY_BREAK + case 325: + YY_RULE_SETUP +-#line 936 "seclang-scanner.ll" ++#line 937 "seclang-scanner.ll" + { return p::make_VARIABLE_PATH_INFO(*driver.loc.back()); } + YY_BREAK + case 326: + YY_RULE_SETUP +-#line 937 "seclang-scanner.ll" ++#line 938 "seclang-scanner.ll" + { return p::make_VARIABLE_QUERY_STRING(*driver.loc.back()); } + YY_BREAK + case 327: + YY_RULE_SETUP +-#line 938 "seclang-scanner.ll" ++#line 939 "seclang-scanner.ll" + { return p::make_VARIABLE_REMOTE_ADDR(*driver.loc.back()); } + YY_BREAK + case 328: + YY_RULE_SETUP +-#line 939 "seclang-scanner.ll" ++#line 940 "seclang-scanner.ll" + { return p::make_VARIABLE_REMOTE_HOST(*driver.loc.back()); } + YY_BREAK + case 329: + YY_RULE_SETUP +-#line 940 "seclang-scanner.ll" ++#line 941 "seclang-scanner.ll" + { return p::make_VARIABLE_REMOTE_PORT(*driver.loc.back()); } + YY_BREAK + case 330: + YY_RULE_SETUP +-#line 941 "seclang-scanner.ll" ++#line 942 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_ERROR_MSG(*driver.loc.back()); } + YY_BREAK + case 331: + YY_RULE_SETUP +-#line 942 "seclang-scanner.ll" ++#line 943 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_ERROR(*driver.loc.back()); } + YY_BREAK + case 332: + YY_RULE_SETUP +-#line 943 "seclang-scanner.ll" ++#line 944 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG(*driver.loc.back()); } + YY_BREAK + case 333: + YY_RULE_SETUP +-#line 944 "seclang-scanner.ll" ++#line 945 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_PROCESSOR_ERROR(*driver.loc.back()); } + YY_BREAK + case 334: + YY_RULE_SETUP +-#line 945 "seclang-scanner.ll" ++#line 946 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_PROCESSOR(*driver.loc.back()); } + YY_BREAK + case 335: + YY_RULE_SETUP +-#line 946 "seclang-scanner.ll" ++#line 947 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_BASENAME(*driver.loc.back()); } + YY_BREAK + case 336: + YY_RULE_SETUP +-#line 947 "seclang-scanner.ll" ++#line 948 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_BODY_LENGTH(*driver.loc.back()); } + YY_BREAK + case 337: + YY_RULE_SETUP +-#line 948 "seclang-scanner.ll" ++#line 949 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_BODY(*driver.loc.back()); } + YY_BREAK + case 338: + YY_RULE_SETUP +-#line 949 "seclang-scanner.ll" ++#line 950 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_FILE_NAME(*driver.loc.back()); } + YY_BREAK + case 339: + YY_RULE_SETUP +-#line 950 "seclang-scanner.ll" ++#line 951 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 340: + YY_RULE_SETUP +-#line 951 "seclang-scanner.ll" ++#line 952 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 341: + YY_RULE_SETUP +-#line 952 "seclang-scanner.ll" ++#line 953 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_LINE(*driver.loc.back()); } + YY_BREAK + case 342: + YY_RULE_SETUP +-#line 953 "seclang-scanner.ll" ++#line 954 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_METHOD(*driver.loc.back()); } + YY_BREAK + case 343: + YY_RULE_SETUP +-#line 954 "seclang-scanner.ll" ++#line 955 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_PROTOCOL(*driver.loc.back()); } + YY_BREAK + case 344: + YY_RULE_SETUP +-#line 955 "seclang-scanner.ll" ++#line 956 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_URI_RAW(*driver.loc.back()); } + YY_BREAK + case 345: + YY_RULE_SETUP +-#line 956 "seclang-scanner.ll" ++#line 957 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_URI(*driver.loc.back()); } + YY_BREAK + case 346: + YY_RULE_SETUP +-#line 957 "seclang-scanner.ll" ++#line 958 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_BODY(*driver.loc.back()); } + YY_BREAK + case 347: + YY_RULE_SETUP +-#line 958 "seclang-scanner.ll" ++#line 959 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_CONTENT_LENGTH(*driver.loc.back()); } + YY_BREAK + case 348: + YY_RULE_SETUP +-#line 959 "seclang-scanner.ll" ++#line 960 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_CONTENT_TYPE(*driver.loc.back()); } + YY_BREAK + case 349: + YY_RULE_SETUP +-#line 960 "seclang-scanner.ll" ++#line 961 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 350: + YY_RULE_SETUP +-#line 961 "seclang-scanner.ll" ++#line 962 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RESPONSE_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 351: + YY_RULE_SETUP +-#line 962 "seclang-scanner.ll" ++#line 963 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_PROTOCOL(*driver.loc.back()); } + YY_BREAK + case 352: + YY_RULE_SETUP +-#line 963 "seclang-scanner.ll" ++#line 964 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_STATUS(*driver.loc.back()); } + YY_BREAK + case 353: + YY_RULE_SETUP +-#line 964 "seclang-scanner.ll" ++#line 965 "seclang-scanner.ll" + { return p::make_VARIABLE_SERVER_ADDR(*driver.loc.back()); } + YY_BREAK + case 354: + YY_RULE_SETUP +-#line 965 "seclang-scanner.ll" ++#line 966 "seclang-scanner.ll" + { return p::make_VARIABLE_SERVER_NAME(*driver.loc.back()); } + YY_BREAK + case 355: + YY_RULE_SETUP +-#line 966 "seclang-scanner.ll" ++#line 967 "seclang-scanner.ll" + { return p::make_VARIABLE_SERVER_PORT(*driver.loc.back()); } + YY_BREAK + case 356: + YY_RULE_SETUP +-#line 967 "seclang-scanner.ll" ++#line 968 "seclang-scanner.ll" + { return p::make_VARIABLE_SESSION_ID(*driver.loc.back()); } + YY_BREAK + case 357: + YY_RULE_SETUP +-#line 968 "seclang-scanner.ll" ++#line 969 "seclang-scanner.ll" + { return p::make_VARIABLE_UNIQUE_ID(*driver.loc.back()); } + YY_BREAK + case 358: + YY_RULE_SETUP +-#line 969 "seclang-scanner.ll" ++#line 970 "seclang-scanner.ll" + { return p::make_VARIABLE_URL_ENCODED_ERROR(*driver.loc.back()); } + YY_BREAK + case 359: + YY_RULE_SETUP +-#line 970 "seclang-scanner.ll" ++#line 971 "seclang-scanner.ll" + { return p::make_VARIABLE_USER_ID(*driver.loc.back()); } + YY_BREAK + case 360: + YY_RULE_SETUP +-#line 971 "seclang-scanner.ll" ++#line 972 "seclang-scanner.ll" + { return p::make_VARIABLE_WEB_APP_ID(*driver.loc.back()); } + YY_BREAK + case 361: + YY_RULE_SETUP +-#line 972 "seclang-scanner.ll" ++#line 973 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS(*driver.loc.back()); } + YY_BREAK + case 362: + YY_RULE_SETUP +-#line 973 "seclang-scanner.ll" ++#line 974 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS(*driver.loc.back()); } + YY_BREAK + case 363: + YY_RULE_SETUP +-#line 974 "seclang-scanner.ll" ++#line 975 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_GET(*driver.loc.back()); } + YY_BREAK + case 364: + YY_RULE_SETUP +-#line 975 "seclang-scanner.ll" ++#line 976 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_GET(*driver.loc.back()); } + YY_BREAK + case 365: + YY_RULE_SETUP +-#line 976 "seclang-scanner.ll" ++#line 977 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_POST(*driver.loc.back()); } + YY_BREAK + case 366: + YY_RULE_SETUP +-#line 977 "seclang-scanner.ll" ++#line 978 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_POST(*driver.loc.back()); } + YY_BREAK + case 367: + YY_RULE_SETUP +-#line 978 "seclang-scanner.ll" ++#line 979 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_SIZES(*driver.loc.back()); } + YY_BREAK + case 368: + YY_RULE_SETUP +-#line 979 "seclang-scanner.ll" ++#line 980 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_SIZES(*driver.loc.back()); } + YY_BREAK + case 369: + YY_RULE_SETUP +-#line 980 "seclang-scanner.ll" ++#line 981 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_NAMES(*driver.loc.back()); } + YY_BREAK + case 370: + YY_RULE_SETUP +-#line 981 "seclang-scanner.ll" ++#line 982 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_NAMES(*driver.loc.back()); } + YY_BREAK + case 371: + YY_RULE_SETUP +-#line 982 "seclang-scanner.ll" ++#line 983 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_TMP_CONTENT(*driver.loc.back()); } + YY_BREAK + case 372: + YY_RULE_SETUP +-#line 983 "seclang-scanner.ll" ++#line 984 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_CONTENT(*driver.loc.back()); } + YY_BREAK + case 373: + YY_RULE_SETUP +-#line 984 "seclang-scanner.ll" ++#line 985 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VARS_NAMES(*driver.loc.back()); } + YY_BREAK + case 374: + YY_RULE_SETUP +-#line 985 "seclang-scanner.ll" ++#line 986 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MATCHED_VARS_NAMES(*driver.loc.back()); } + YY_BREAK + case 375: + YY_RULE_SETUP +-#line 986 "seclang-scanner.ll" ++#line 987 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VARS(*driver.loc.back()); } + YY_BREAK + case 376: + YY_RULE_SETUP +-#line 987 "seclang-scanner.ll" ++#line 988 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MATCHED_VARS(*driver.loc.back()); } + YY_BREAK + case 377: + YY_RULE_SETUP +-#line 988 "seclang-scanner.ll" ++#line 989 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES(*driver.loc.back()); } + YY_BREAK + case 378: + YY_RULE_SETUP +-#line 989 "seclang-scanner.ll" ++#line 990 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES(*driver.loc.back()); } + YY_BREAK + case 379: + YY_RULE_SETUP +-#line 990 "seclang-scanner.ll" ++#line 991 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_COOKIES(*driver.loc.back()); } + YY_BREAK + case 380: + YY_RULE_SETUP +-#line 991 "seclang-scanner.ll" ++#line 992 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES(*driver.loc.back()); } + YY_BREAK + case 381: + YY_RULE_SETUP +-#line 992 "seclang-scanner.ll" ++#line 993 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_HEADERS(*driver.loc.back()); } + YY_BREAK + case 382: + YY_RULE_SETUP +-#line 993 "seclang-scanner.ll" ++#line 994 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_HEADERS(*driver.loc.back()); } + YY_BREAK + case 383: + YY_RULE_SETUP +-#line 994 "seclang-scanner.ll" ++#line 995 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_HEADERS(*driver.loc.back()); } + YY_BREAK + case 384: + YY_RULE_SETUP +-#line 995 "seclang-scanner.ll" ++#line 996 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RESPONSE_HEADERS(*driver.loc.back()); } + YY_BREAK + case 385: + YY_RULE_SETUP +-#line 996 "seclang-scanner.ll" ++#line 997 "seclang-scanner.ll" + { return p::make_VARIABLE_GEO(*driver.loc.back()); } + YY_BREAK + case 386: + YY_RULE_SETUP +-#line 997 "seclang-scanner.ll" ++#line 998 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_GEO(*driver.loc.back()); } + YY_BREAK + case 387: + YY_RULE_SETUP +-#line 998 "seclang-scanner.ll" ++#line 999 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } + YY_BREAK + case 388: + YY_RULE_SETUP +-#line 999 "seclang-scanner.ll" ++#line 1000 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } + YY_BREAK + case 389: + YY_RULE_SETUP +-#line 1000 "seclang-scanner.ll" +-{ return p::make_VARIABLE_RULE(*driver.loc.back()); } ++#line 1001 "seclang-scanner.ll" ++{ return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } + YY_BREAK + case 390: + YY_RULE_SETUP +-#line 1001 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RULE(*driver.loc.back()); } ++#line 1002 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } + YY_BREAK + case 391: + YY_RULE_SETUP +-#line 1002 "seclang-scanner.ll" +-{ return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } ++#line 1003 "seclang-scanner.ll" ++{ return p::make_VARIABLE_RULE(*driver.loc.back()); } + YY_BREAK + case 392: + YY_RULE_SETUP +-#line 1003 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } ++#line 1004 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RULE(*driver.loc.back()); } + YY_BREAK + case 393: + YY_RULE_SETUP +-#line 1004 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } ++#line 1005 "seclang-scanner.ll" ++{ return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } + YY_BREAK + case 394: + YY_RULE_SETUP +-#line 1005 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } ++#line 1006 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } + YY_BREAK + case 395: + YY_RULE_SETUP +-#line 1006 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } ++#line 1007 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } + YY_BREAK + case 396: + YY_RULE_SETUP +-#line 1007 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } ++#line 1008 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } + YY_BREAK + case 397: + YY_RULE_SETUP +-#line 1008 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_BLD(yytext, *driver.loc.back()); } ++#line 1009 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } + YY_BREAK + case 398: + YY_RULE_SETUP +-#line 1009 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_DUR(yytext, *driver.loc.back()); } ++#line 1010 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } + YY_BREAK + case 399: + YY_RULE_SETUP +-#line 1010 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_HSV(yytext, *driver.loc.back()); } ++#line 1011 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_BLD(yytext, *driver.loc.back()); } + YY_BREAK + case 400: + YY_RULE_SETUP +-#line 1011 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_REMOTE_USER(yytext, *driver.loc.back()); } ++#line 1012 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_DUR(yytext, *driver.loc.back()); } + YY_BREAK + case 401: + YY_RULE_SETUP +-#line 1012 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_DAY(yytext, *driver.loc.back()); } ++#line 1013 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_HSV(yytext, *driver.loc.back()); } + YY_BREAK + case 402: + YY_RULE_SETUP +-#line 1013 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_EPOCH(yytext, *driver.loc.back()); } ++#line 1014 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_REMOTE_USER(yytext, *driver.loc.back()); } + YY_BREAK + case 403: + YY_RULE_SETUP +-#line 1014 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_HOUR(yytext, *driver.loc.back()); } ++#line 1015 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_DAY(yytext, *driver.loc.back()); } + YY_BREAK + case 404: + YY_RULE_SETUP +-#line 1015 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_MIN(yytext, *driver.loc.back()); } ++#line 1016 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_EPOCH(yytext, *driver.loc.back()); } + YY_BREAK + case 405: + YY_RULE_SETUP +-#line 1016 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_MON(yytext, *driver.loc.back()); } ++#line 1017 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_HOUR(yytext, *driver.loc.back()); } + YY_BREAK + case 406: + YY_RULE_SETUP +-#line 1017 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_SEC(yytext, *driver.loc.back()); } ++#line 1018 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_MIN(yytext, *driver.loc.back()); } + YY_BREAK + case 407: + YY_RULE_SETUP +-#line 1018 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_YEAR(yytext, *driver.loc.back()); } ++#line 1019 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_MON(yytext, *driver.loc.back()); } + YY_BREAK + case 408: + YY_RULE_SETUP +-#line 1019 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME(yytext, *driver.loc.back()); } ++#line 1020 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_SEC(yytext, *driver.loc.back()); } + YY_BREAK + case 409: + YY_RULE_SETUP +-#line 1020 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_WDAY(yytext, *driver.loc.back()); } ++#line 1021 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_YEAR(yytext, *driver.loc.back()); } + YY_BREAK + case 410: + YY_RULE_SETUP +-#line 1023 "seclang-scanner.ll" +-{ driver.error (*driver.loc.back(), "Variable VARIABLE_WEBSERVER_ERROR_LOG is not supported by libModSecurity", ""); throw p::syntax_error(*driver.loc.back(), "");} ++#line 1022 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME(yytext, *driver.loc.back()); } + YY_BREAK + case 411: + YY_RULE_SETUP +-#line 1024 "seclang-scanner.ll" +-{ return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } ++#line 1023 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_WDAY(yytext, *driver.loc.back()); } + YY_BREAK + case 412: + YY_RULE_SETUP +-#line 1025 "seclang-scanner.ll" +-{ return p::make_VARIABLE_IP(*driver.loc.back()); } ++#line 1026 "seclang-scanner.ll" ++{ driver.error (*driver.loc.back(), "Variable VARIABLE_WEBSERVER_ERROR_LOG is not supported by libModSecurity", ""); throw p::syntax_error(*driver.loc.back(), "");} + YY_BREAK + case 413: + YY_RULE_SETUP +-#line 1026 "seclang-scanner.ll" +-{ return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } ++#line 1027 "seclang-scanner.ll" ++{ return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } + YY_BREAK + case 414: + YY_RULE_SETUP +-#line 1027 "seclang-scanner.ll" +-{ return p::make_VARIABLE_SESSION(*driver.loc.back()); } ++#line 1028 "seclang-scanner.ll" ++{ return p::make_VARIABLE_IP(*driver.loc.back()); } + YY_BREAK + case 415: + YY_RULE_SETUP +-#line 1028 "seclang-scanner.ll" +-{ return p::make_VARIABLE_STATUS(*driver.loc.back()); } ++#line 1029 "seclang-scanner.ll" ++{ return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } + YY_BREAK + case 416: + YY_RULE_SETUP +-#line 1029 "seclang-scanner.ll" +-{ return p::make_VARIABLE_STATUS_LINE(*driver.loc.back()); } ++#line 1030 "seclang-scanner.ll" ++{ return p::make_VARIABLE_SESSION(*driver.loc.back()); } + YY_BREAK + case 417: + YY_RULE_SETUP +-#line 1030 "seclang-scanner.ll" +-{ return p::make_VARIABLE_TX(*driver.loc.back()); } ++#line 1031 "seclang-scanner.ll" ++{ return p::make_VARIABLE_STATUS(*driver.loc.back()); } + YY_BREAK + case 418: + YY_RULE_SETUP +-#line 1031 "seclang-scanner.ll" +-{ return p::make_VARIABLE_USER(*driver.loc.back()); } ++#line 1032 "seclang-scanner.ll" ++{ return p::make_VARIABLE_STATUS_LINE(*driver.loc.back()); } + YY_BREAK +- +- + case 419: + YY_RULE_SETUP +-#line 1035 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } ++#line 1033 "seclang-scanner.ll" ++{ return p::make_VARIABLE_TX(*driver.loc.back()); } + YY_BREAK + case 420: + YY_RULE_SETUP +-#line 1036 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_IP(*driver.loc.back()); } ++#line 1034 "seclang-scanner.ll" ++{ return p::make_VARIABLE_USER(*driver.loc.back()); } + YY_BREAK ++ ++ + case 421: + YY_RULE_SETUP +-#line 1037 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } ++#line 1038 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } + YY_BREAK + case 422: + YY_RULE_SETUP +-#line 1038 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_SESSION(*driver.loc.back()); } ++#line 1039 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_IP(*driver.loc.back()); } + YY_BREAK + case 423: + YY_RULE_SETUP +-#line 1039 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_TX(*driver.loc.back()); } ++#line 1040 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } + YY_BREAK + case 424: + YY_RULE_SETUP +-#line 1040 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_USER(*driver.loc.back()); } ++#line 1041 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_SESSION(*driver.loc.back()); } + YY_BREAK +- +- + case 425: + YY_RULE_SETUP +-#line 1045 "seclang-scanner.ll" +-{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } ++#line 1042 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_TX(*driver.loc.back()); } + YY_BREAK + case 426: + YY_RULE_SETUP +-#line 1046 "seclang-scanner.ll" +-{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } ++#line 1043 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_USER(*driver.loc.back()); } + YY_BREAK ++ ++ + case 427: + YY_RULE_SETUP +-#line 1047 "seclang-scanner.ll" +-{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } ++#line 1048 "seclang-scanner.ll" ++{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } + YY_BREAK + case 428: +-/* rule 428 can match eol */ + YY_RULE_SETUP +-#line 1048 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1049 "seclang-scanner.ll" ++{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } + YY_BREAK + case 429: +-/* rule 429 can match eol */ + YY_RULE_SETUP +-#line 1049 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1050 "seclang-scanner.ll" ++{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } + YY_BREAK + case 430: + /* rule 430 can match eol */ + YY_RULE_SETUP +-#line 1050 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1051 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 431: + /* rule 431 can match eol */ + YY_RULE_SETUP +-#line 1051 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1052 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 432: + /* rule 432 can match eol */ + YY_RULE_SETUP +-#line 1052 "seclang-scanner.ll" +-{ yyless(yyleng - 1); BEGIN_PREVIOUS(); return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1053 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 433: + /* rule 433 can match eol */ + YY_RULE_SETUP +-#line 1053 "seclang-scanner.ll" +-{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1054 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 434: + /* rule 434 can match eol */ + YY_RULE_SETUP + #line 1055 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++{ yyless(yyleng - 1); BEGIN_PREVIOUS(); return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 435: + /* rule 435 can match eol */ + YY_RULE_SETUP + #line 1056 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 436: ++/* rule 436 can match eol */ + YY_RULE_SETUP +-#line 1057 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(0); } ++#line 1058 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 437: ++/* rule 437 can match eol */ + YY_RULE_SETUP +-#line 1058 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(0); } ++#line 1059 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 438: + YY_RULE_SETUP +-#line 1059 "seclang-scanner.ll" +-{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } ++#line 1060 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(0); } + YY_BREAK +- +- + case 439: +-/* rule 439 can match eol */ + YY_RULE_SETUP +-#line 1064 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1061 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(0); } + YY_BREAK + case 440: +-/* rule 440 can match eol */ + YY_RULE_SETUP +-#line 1065 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1062 "seclang-scanner.ll" ++{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } + YY_BREAK ++ ++ + case 441: + /* rule 441 can match eol */ + YY_RULE_SETUP +-#line 1066 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1067 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 442: + /* rule 442 can match eol */ + YY_RULE_SETUP +-#line 1067 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1068 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 443: + /* rule 443 can match eol */ + YY_RULE_SETUP +-#line 1068 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1069 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 444: + /* rule 444 can match eol */ + YY_RULE_SETUP +-#line 1069 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); return p::make_DICT_ELEMENT(yytext, *driver.loc.back()); } ++#line 1070 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 445: + /* rule 445 can match eol */ + YY_RULE_SETUP + #line 1071 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 446: + /* rule 446 can match eol */ + YY_RULE_SETUP + #line 1072 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++{ BEGIN_PREVIOUS(); return p::make_DICT_ELEMENT(yytext, *driver.loc.back()); } + YY_BREAK + case 447: ++/* rule 447 can match eol */ + YY_RULE_SETUP + #line 1074 "seclang-scanner.ll" +-{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 448: ++/* rule 448 can match eol */ + YY_RULE_SETUP + #line 1075 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++ YY_BREAK ++case 449: ++YY_RULE_SETUP ++#line 1077 "seclang-scanner.ll" ++{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } ++ YY_BREAK ++case 450: ++YY_RULE_SETUP ++#line 1078 "seclang-scanner.ll" + { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } + YY_BREAK + + +-case 449: ++case 451: + YY_RULE_SETUP +-#line 1081 "seclang-scanner.ll" ++#line 1084 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_GEOLOOKUP(*driver.loc.back()); } + YY_BREAK +-case 450: ++case 452: + YY_RULE_SETUP +-#line 1082 "seclang-scanner.ll" ++#line 1085 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_UNCONDITIONAL_MATCH(*driver.loc.back()); } + YY_BREAK +-case 451: ++case 453: + YY_RULE_SETUP +-#line 1083 "seclang-scanner.ll" ++#line 1086 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_SQLI(*driver.loc.back()); } + YY_BREAK +-case 452: ++case 454: + YY_RULE_SETUP +-#line 1084 "seclang-scanner.ll" ++#line 1087 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_XSS(*driver.loc.back()); } + YY_BREAK +-case 453: ++case 455: + YY_RULE_SETUP +-#line 1085 "seclang-scanner.ll" ++#line 1088 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_URL_ENCODING(*driver.loc.back()); } + YY_BREAK +-case 454: ++case 456: + YY_RULE_SETUP +-#line 1086 "seclang-scanner.ll" ++#line 1089 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_UTF8_ENCODING(*driver.loc.back()); } + YY_BREAK + + +-case 455: ++case 457: + YY_RULE_SETUP +-#line 1089 "seclang-scanner.ll" ++#line 1092 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_GEOLOOKUP(*driver.loc.back()); } + YY_BREAK +-case 456: ++case 458: + YY_RULE_SETUP +-#line 1090 "seclang-scanner.ll" ++#line 1093 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_UNCONDITIONAL_MATCH(*driver.loc.back()); } + YY_BREAK +-case 457: ++case 459: + YY_RULE_SETUP +-#line 1091 "seclang-scanner.ll" ++#line 1094 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_SQLI(*driver.loc.back()); } + YY_BREAK +-case 458: ++case 460: + YY_RULE_SETUP +-#line 1092 "seclang-scanner.ll" ++#line 1095 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_XSS(*driver.loc.back()); } + YY_BREAK +-case 459: ++case 461: + YY_RULE_SETUP +-#line 1093 "seclang-scanner.ll" ++#line 1096 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_URL_ENCODING(*driver.loc.back()); } + YY_BREAK +-case 460: ++case 462: + YY_RULE_SETUP +-#line 1094 "seclang-scanner.ll" ++#line 1097 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_UTF8_ENCODING(*driver.loc.back()); } + YY_BREAK + + +-case 461: +-YY_RULE_SETUP +-#line 1098 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_WITHIN(*driver.loc.back()); } +- YY_BREAK +-case 462: +-YY_RULE_SETUP +-#line 1099 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS_WORD(*driver.loc.back()); } +- YY_BREAK + case 463: + YY_RULE_SETUP +-#line 1100 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS(*driver.loc.back()); } ++#line 1101 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_WITHIN(*driver.loc.back()); } + YY_BREAK + case 464: + YY_RULE_SETUP +-#line 1101 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_ENDS_WITH(*driver.loc.back()); } ++#line 1102 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS_WORD(*driver.loc.back()); } + YY_BREAK + case 465: + YY_RULE_SETUP +-#line 1102 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_EQ(*driver.loc.back()); } ++#line 1103 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS(*driver.loc.back()); } + YY_BREAK + case 466: + YY_RULE_SETUP +-#line 1103 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_GE(*driver.loc.back()); } ++#line 1104 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_ENDS_WITH(*driver.loc.back()); } + YY_BREAK + case 467: + YY_RULE_SETUP +-#line 1104 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_GT(*driver.loc.back()); } ++#line 1105 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_EQ(*driver.loc.back()); } + YY_BREAK + case 468: + YY_RULE_SETUP +-#line 1105 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH_FROM_FILE(*driver.loc.back()); } ++#line 1106 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_GE(*driver.loc.back()); } + YY_BREAK + case 469: + YY_RULE_SETUP +-#line 1106 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH(*driver.loc.back()); } ++#line 1107 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_GT(*driver.loc.back()); } + YY_BREAK + case 470: + YY_RULE_SETUP +-#line 1107 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_LE(*driver.loc.back()); } ++#line 1108 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH_FROM_FILE(*driver.loc.back()); } + YY_BREAK + case 471: + YY_RULE_SETUP +-#line 1108 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_LT(*driver.loc.back()); } ++#line 1109 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH(*driver.loc.back()); } + YY_BREAK + case 472: + YY_RULE_SETUP +-#line 1109 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM_FROM_FILE(*driver.loc.back()); } ++#line 1110 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_LE(*driver.loc.back()); } + YY_BREAK + case 473: + YY_RULE_SETUP +-#line 1110 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM(*driver.loc.back()); } ++#line 1111 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_LT(*driver.loc.back()); } + YY_BREAK + case 474: + YY_RULE_SETUP +-#line 1111 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RBL( *driver.loc.back()); } ++#line 1112 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM_FROM_FILE(*driver.loc.back()); } + YY_BREAK + case 475: + YY_RULE_SETUP +-#line 1112 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX(*driver.loc.back()); } ++#line 1113 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM(*driver.loc.back()); } + YY_BREAK + case 476: + YY_RULE_SETUP +-#line 1113 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX_GLOBAL(*driver.loc.back()); } ++#line 1114 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RBL( *driver.loc.back()); } + YY_BREAK + case 477: + YY_RULE_SETUP +-#line 1114 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_EQ(*driver.loc.back()); } ++#line 1115 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX(*driver.loc.back()); } + YY_BREAK + case 478: + YY_RULE_SETUP +-#line 1115 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_MATCH(*driver.loc.back()); } ++#line 1116 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX_GLOBAL(*driver.loc.back()); } + YY_BREAK + case 479: + YY_RULE_SETUP +-#line 1116 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_BEGINS_WITH(*driver.loc.back()); } ++#line 1117 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_EQ(*driver.loc.back()); } + YY_BREAK + case 480: + YY_RULE_SETUP +-#line 1117 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_INSPECT_FILE(*driver.loc.back()); } ++#line 1118 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_MATCH(*driver.loc.back()); } + YY_BREAK + case 481: + YY_RULE_SETUP +-#line 1118 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_FUZZY_HASH(*driver.loc.back()); } ++#line 1119 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_BEGINS_WITH(*driver.loc.back()); } + YY_BREAK + case 482: + YY_RULE_SETUP +-#line 1119 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_BYTE_RANGE(*driver.loc.back()); } ++#line 1120 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_INSPECT_FILE(*driver.loc.back()); } + YY_BREAK + case 483: + YY_RULE_SETUP +-#line 1120 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_DTD(*driver.loc.back()); } ++#line 1121 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_FUZZY_HASH(*driver.loc.back()); } + YY_BREAK + case 484: + YY_RULE_SETUP +-#line 1121 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_HASH(*driver.loc.back()); } ++#line 1122 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_BYTE_RANGE(*driver.loc.back()); } + YY_BREAK + case 485: + YY_RULE_SETUP +-#line 1122 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_SCHEMA(*driver.loc.back()); } ++#line 1123 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_DTD(*driver.loc.back()); } + YY_BREAK + case 486: + YY_RULE_SETUP +-#line 1123 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CC(*driver.loc.back()); } ++#line 1124 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_HASH(*driver.loc.back()); } + YY_BREAK + case 487: + YY_RULE_SETUP +-#line 1124 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CPF(*driver.loc.back()); } ++#line 1125 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_SCHEMA(*driver.loc.back()); } + YY_BREAK + case 488: + YY_RULE_SETUP +-#line 1125 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SSN(*driver.loc.back()); } ++#line 1126 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CC(*driver.loc.back()); } + YY_BREAK + case 489: + YY_RULE_SETUP +-#line 1126 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SVNR(*driver.loc.back()); } ++#line 1127 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CPF(*driver.loc.back()); } + YY_BREAK + case 490: + YY_RULE_SETUP +-#line 1127 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_GSB_LOOKUP(*driver.loc.back()); } ++#line 1128 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SSN(*driver.loc.back()); } + YY_BREAK + case 491: + YY_RULE_SETUP +-#line 1128 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RSUB(*driver.loc.back()); } ++#line 1129 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SVNR(*driver.loc.back()); } + YY_BREAK + case 492: + YY_RULE_SETUP + #line 1130 "seclang-scanner.ll" +-{ return p::make_NOT(*driver.loc.back()); } ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_GSB_LOOKUP(*driver.loc.back()); } + YY_BREAK + case 493: + YY_RULE_SETUP + #line 1131 "seclang-scanner.ll" +-{ BEGIN_NO_OP_INFORMED(); yyless(0); } ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RSUB(*driver.loc.back()); } + YY_BREAK +- +- + case 494: + YY_RULE_SETUP +-#line 1136 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_SPACE); } ++#line 1133 "seclang-scanner.ll" ++{ return p::make_NOT(*driver.loc.back()); } + YY_BREAK +- +- + case 495: + YY_RULE_SETUP +-#line 1140 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_QUOTE); } ++#line 1134 "seclang-scanner.ll" ++{ BEGIN_NO_OP_INFORMED(); yyless(0); } + YY_BREAK + + + case 496: + YY_RULE_SETUP +-#line 1144 "seclang-scanner.ll" +-{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } ++#line 1139 "seclang-scanner.ll" ++{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_SPACE); } + YY_BREAK ++ ++ + case 497: +-/* rule 497 can match eol */ + YY_RULE_SETUP +-#line 1145 "seclang-scanner.ll" +-{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1143 "seclang-scanner.ll" ++{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_QUOTE); } + YY_BREAK + + + case 498: + YY_RULE_SETUP +-#line 1149 "seclang-scanner.ll" ++#line 1147 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 499: + /* rule 499 can match eol */ + YY_RULE_SETUP +-#line 1150 "seclang-scanner.ll" ++#line 1148 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 500: + YY_RULE_SETUP +-#line 1153 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } ++#line 1152 "seclang-scanner.ll" ++{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 501: ++/* rule 501 can match eol */ + YY_RULE_SETUP +-#line 1154 "seclang-scanner.ll" +-{ BEGIN(LEXING_ERROR); yyless(0); } ++#line 1153 "seclang-scanner.ll" ++{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 502: + YY_RULE_SETUP +-#line 1158 "seclang-scanner.ll" +-{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } ++#line 1156 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + case 503: +-/* rule 503 can match eol */ + YY_RULE_SETUP +-#line 1159 "seclang-scanner.ll" +-{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1157 "seclang-scanner.ll" ++{ BEGIN(LEXING_ERROR); yyless(0); } + YY_BREAK + + + case 504: + YY_RULE_SETUP +-#line 1163 "seclang-scanner.ll" ++#line 1161 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 505: + /* rule 505 can match eol */ + YY_RULE_SETUP +-#line 1164 "seclang-scanner.ll" ++#line 1162 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 506: + YY_RULE_SETUP +-#line 1168 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } ++#line 1166 "seclang-scanner.ll" ++{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 507: ++/* rule 507 can match eol */ + YY_RULE_SETUP +-#line 1169 "seclang-scanner.ll" +-{ BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } ++#line 1167 "seclang-scanner.ll" ++{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 508: + YY_RULE_SETUP +-#line 1174 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++#line 1171 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + case 509: +-/* rule 509 can match eol */ + YY_RULE_SETUP +-#line 1176 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++#line 1172 "seclang-scanner.ll" ++{ BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } + YY_BREAK ++ ++ + case 510: +-/* rule 510 can match eol */ + YY_RULE_SETUP + #line 1177 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 511: + /* rule 511 can match eol */ + YY_RULE_SETUP +-#line 1178 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++#line 1179 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 512: + /* rule 512 can match eol */ + YY_RULE_SETUP +-#line 1179 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++#line 1180 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 513: + /* rule 513 can match eol */ + YY_RULE_SETUP + #line 1181 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 514: + /* rule 514 can match eol */ + YY_RULE_SETUP + #line 1182 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 515: + /* rule 515 can match eol */ + YY_RULE_SETUP +-#line 1183 "seclang-scanner.ll" ++#line 1184 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 516: + /* rule 516 can match eol */ + YY_RULE_SETUP +-#line 1184 "seclang-scanner.ll" ++#line 1185 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 517: + /* rule 517 can match eol */ + YY_RULE_SETUP + #line 1186 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 518: + /* rule 518 can match eol */ + YY_RULE_SETUP + #line 1187 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 519: + /* rule 519 can match eol */ + YY_RULE_SETUP +-#line 1188 "seclang-scanner.ll" ++#line 1189 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 520: + /* rule 520 can match eol */ + YY_RULE_SETUP +-#line 1189 "seclang-scanner.ll" ++#line 1190 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 521: ++/* rule 521 can match eol */ + YY_RULE_SETUP + #line 1191 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 522: + /* rule 522 can match eol */ + YY_RULE_SETUP +-#line 1193 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++#line 1192 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 523: +-/* rule 523 can match eol */ + YY_RULE_SETUP + #line 1194 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 524: + /* rule 524 can match eol */ +@@ -8382,78 +8387,90 @@ YY_RULE_SETUP + case 526: + /* rule 526 can match eol */ + YY_RULE_SETUP +-#line 1198 "seclang-scanner.ll" ++#line 1199 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 527: + /* rule 527 can match eol */ + YY_RULE_SETUP +-#line 1199 "seclang-scanner.ll" ++#line 1200 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 528: ++/* rule 528 can match eol */ + YY_RULE_SETUP + #line 1201 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK +- +- + case 529: ++/* rule 529 can match eol */ + YY_RULE_SETUP +-#line 1206 "seclang-scanner.ll" +-{ } ++#line 1202 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 530: +-/* rule 530 can match eol */ + YY_RULE_SETUP +-#line 1207 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); } ++#line 1204 "seclang-scanner.ll" ++{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK ++ ++ + case 531: +-/* rule 531 can match eol */ + YY_RULE_SETUP +-#line 1208 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); } ++#line 1209 "seclang-scanner.ll" ++{ } + YY_BREAK +- +- + case 532: + /* rule 532 can match eol */ + YY_RULE_SETUP +-#line 1212 "seclang-scanner.ll" ++#line 1210 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 533: + /* rule 533 can match eol */ + YY_RULE_SETUP +-#line 1213 "seclang-scanner.ll" ++#line 1211 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK ++ ++ + case 534: + /* rule 534 can match eol */ + YY_RULE_SETUP +-#line 1214 "seclang-scanner.ll" +-{ BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } ++#line 1215 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK +- + case 535: ++/* rule 535 can match eol */ + YY_RULE_SETUP +-#line 1219 "seclang-scanner.ll" +-{ BEGIN(LEXING_ERROR); yyless(0); } ++#line 1216 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 536: ++/* rule 536 can match eol */ + YY_RULE_SETUP +-#line 1221 "seclang-scanner.ll" +-{ driver.error (*driver.loc.back(), "Invalid input: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++#line 1217 "seclang-scanner.ll" ++{ BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK ++ + case 537: + YY_RULE_SETUP + #line 1222 "seclang-scanner.ll" +-{ driver.error (*driver.loc.back(), "Expecting an action, got: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++{ BEGIN(LEXING_ERROR); yyless(0); } + YY_BREAK + case 538: + YY_RULE_SETUP +-#line 1223 "seclang-scanner.ll" ++#line 1224 "seclang-scanner.ll" ++{ driver.error (*driver.loc.back(), "Invalid input: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++ YY_BREAK ++case 539: ++YY_RULE_SETUP ++#line 1225 "seclang-scanner.ll" ++{ driver.error (*driver.loc.back(), "Expecting an action, got: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++ YY_BREAK ++case 540: ++YY_RULE_SETUP ++#line 1226 "seclang-scanner.ll" + { driver.error (*driver.loc.back(), "Expecting a variable, got: : ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } + YY_BREAK + case YY_STATE_EOF(INITIAL): +@@ -8492,7 +8509,7 @@ case YY_STATE_EOF(SETVAR_ACTION_QUOTED): + case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_COLLECTION_ELEM): + case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_OPERATION): + case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_CONTENT): +-#line 1226 "seclang-scanner.ll" ++#line 1229 "seclang-scanner.ll" + { + if (yyin) { + fclose(yyin); +@@ -8508,9 +8525,9 @@ case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_CONTENT): + delete l; + } + YY_BREAK +-case 539: ++case 541: + YY_RULE_SETUP +-#line 1242 "seclang-scanner.ll" ++#line 1245 "seclang-scanner.ll" + { + std::string err; + const char *file = strchr(yytext, ' ') + 1; +@@ -8538,9 +8555,9 @@ YY_RULE_SETUP + } + } + YY_BREAK +-case 540: ++case 542: + YY_RULE_SETUP +-#line 1269 "seclang-scanner.ll" ++#line 1272 "seclang-scanner.ll" + { + std::string err; + const char *file = strchr(yytext, ' ') + 1; +@@ -8571,10 +8588,10 @@ YY_RULE_SETUP + free(f); + } + YY_BREAK +-case 541: +-/* rule 541 can match eol */ ++case 543: ++/* rule 543 can match eol */ + YY_RULE_SETUP +-#line 1299 "seclang-scanner.ll" ++#line 1302 "seclang-scanner.ll" + { + HttpsClient c; + std::string key; +@@ -8610,12 +8627,12 @@ YY_RULE_SETUP + yy_scan_string(c.content.c_str()); + } + YY_BREAK +-case 542: ++case 544: + YY_RULE_SETUP +-#line 1335 "seclang-scanner.ll" ++#line 1338 "seclang-scanner.ll" + ECHO; + YY_BREAK +-#line 8619 "seclang-scanner.cc" ++#line 8636 "seclang-scanner.cc" + + case YY_END_OF_BUFFER: + { +@@ -8934,7 +8951,7 @@ static int yy_get_next_buffer (void) + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 3953 ) ++ if ( yy_current_state >= 3966 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; +@@ -8967,11 +8984,11 @@ static int yy_get_next_buffer (void) + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 3953 ) ++ if ( yy_current_state >= 3966 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; +- yy_is_jam = (yy_current_state == 3952); ++ yy_is_jam = (yy_current_state == 3965); + + return yy_is_jam ? 0 : yy_current_state; + } +@@ -9720,7 +9737,7 @@ void yyfree (void * ptr ) + + /* %ok-for-header */ + +-#line 1335 "seclang-scanner.ll" ++#line 1338 "seclang-scanner.ll" + + + namespace modsecurity { +diff --git a/src/parser/seclang-scanner.ll b/src/parser/seclang-scanner.ll +index 8f26cd6f..4cb12685 100755 +--- a/src/parser/seclang-scanner.ll ++++ b/src/parser/seclang-scanner.ll +@@ -253,6 +253,7 @@ VARIABLE_REQUEST_HEADERS (?i:REQUEST_HEADERS) + VARIABLE_RESPONSE_HEADERS (?i:RESPONSE_HEADERS) + VARIABLE_GEO (?i:GEO) + VARIABLE_REQUEST_COOKIES_NAMES (?i:REQUEST_COOKIES_NAMES) ++VARIABLE_MULTIPART_PART_HEADERS (?i:MULTIPART_PART_HEADERS) + VARIABLE_RULE (?i:RULE) + VARIABLE_SESSION (?i:(SESSION)) + VARIABLE_IP (?i:(IP)) +@@ -996,6 +997,8 @@ EQUALS_MINUS (?i:=\-) + {VARIABLE_GEO}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_GEO(*driver.loc.back()); } + {VARIABLE_REQUEST_COOKIES_NAMES} { return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } + {VARIABLE_REQUEST_COOKIES_NAMES}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } ++{VARIABLE_MULTIPART_PART_HEADERS} { return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } ++{VARIABLE_MULTIPART_PART_HEADERS}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } + {VARIABLE_RULE} { return p::make_VARIABLE_RULE(*driver.loc.back()); } + {VARIABLE_RULE}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RULE(*driver.loc.back()); } + {VARIABLE_FILES_TMP_NAMES} { return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } +diff --git a/src/request_body_processor/multipart.cc b/src/request_body_processor/multipart.cc +index 310b7bcb..5686725b 100644 +--- a/src/request_body_processor/multipart.cc ++++ b/src/request_body_processor/multipart.cc +@@ -102,8 +102,11 @@ Multipart::Multipart(const std::string &header, Transaction *transaction) + m_bufptr(NULL), + m_bufleft(0), + m_buf_offset(0), ++ m_crlf_state(0), ++ m_crlf_state_buf_end(0), + m_mpp(NULL), + m_mpp_state(0), ++ m_mpp_substate_part_data_read(0), + m_reserve{0}, + m_seen_data(0), + m_is_complete(0), +@@ -504,6 +507,8 @@ int Multipart::process_part_data(std::string *error, size_t offset) { + char localreserve[2] = { '\0', '\0' }; /* initialized to quiet warning */ + int bytes_reserved = 0; + ++ m_mpp_substate_part_data_read = 1; ++ + /* Preserve some bytes for later. */ + if (((MULTIPART_BUF_SIZE - m_bufleft) >= 1) && (*(p - 1) == '\n')) { + if (((MULTIPART_BUF_SIZE - m_bufleft) >= 2) && (*(p - 2) == '\r')) { +@@ -697,6 +702,7 @@ int Multipart::process_part_header(std::string *error, int offset) { + + /* Check for nul bytes. */ + len = MULTIPART_BUF_SIZE - m_bufleft; ++ int len_without_termination = len - 1; + for (i = 0; i < len; i++) { + if (m_buf[i] == '\0') { + ms_dbg_a(m_transaction, 1, +@@ -714,6 +720,7 @@ int Multipart::process_part_header(std::string *error, int offset) { + if (len > 1) { + if (m_buf[len - 2] == '\r') { + m_flag_crlf_line = 1; ++ len_without_termination--; + } else { + m_flag_lf_line = 1; + } +@@ -727,6 +734,13 @@ int Multipart::process_part_header(std::string *error, int offset) { + std::string header_value(""); + int rc; + ++ /* record the previous completed header */ ++ if (!m_mpp->m_last_header_line.empty()) { ++ m_mpp->m_header_lines.push_back(std::make_pair( ++ offset-m_mpp->m_last_header_line.length(), m_mpp->m_last_header_line)); ++ m_mpp->m_last_header_line.assign(""); ++ } ++ + if (m_mpp->m_headers.count("Content-Disposition") == 0) { + ms_dbg_a(m_transaction, 1, + "Multipart: Part missing Content-Disposition header."); +@@ -787,6 +801,7 @@ int Multipart::process_part_header(std::string *error, int offset) { + } + + m_mpp_state = 1; ++ m_mpp_substate_part_data_read = 0; + m_mpp->m_last_header_name.assign(""); + } else { /* Header line. */ + if (isspace(m_buf[0])) { +@@ -848,12 +863,21 @@ int Multipart::process_part_header(std::string *error, int offset) { + error->assign("Multipart: Part header too long."); + return false; + } ++ ++ m_mpp->m_last_header_line = m_mpp->m_last_header_name + ": " + new_value; + } else { + char *data; + std::string header_value; + std::string header_name; + /* new header */ + ++ /* record the previous completed header */ ++ if (!m_mpp->m_last_header_line.empty()) { ++ m_mpp->m_header_lines.push_back(std::make_pair( ++ offset-m_mpp->m_last_header_line.length(), m_mpp->m_last_header_line)); ++ m_mpp->m_last_header_line.assign(""); ++ } ++ + data = m_buf; + while ((*data != ':') && (*data != '\0')) { + data++; +@@ -910,6 +934,11 @@ int Multipart::process_part_header(std::string *error, int offset) { + ms_dbg_a(m_transaction, 9, + "Multipart: Added part header \"" + header_name \ + + "\" \"" + header_value + "\"."); ++ if (len_without_termination > 0) { ++ m_mpp->m_last_header_line.assign(m_buf); ++ } else { ++ m_mpp->m_last_header_line.assign(""); ++ } + } + } + +@@ -920,6 +949,13 @@ int Multipart::process_part_header(std::string *error, int offset) { + int Multipart::process_boundary(int last_part) { + /* if there was a part being built finish it */ + if (m_mpp != NULL) { ++ /* record all the part header lines from the part into the transaction collection */ ++ for (const auto& header_line : m_mpp->m_header_lines) { ++ m_transaction->m_variableMultipartPartHeaders.set(m_mpp->m_name, ++ header_line.second, header_line.first); ++ ms_dbg_a(m_transaction, 9, "Multipart: Added part header line:" + header_line.second ); ++ } ++ + /* close the temp file */ + if ((m_mpp->m_type == MULTIPART_FILE) && (m_mpp->m_tmp_file) + && (m_mpp->m_tmp_file->isValid())) { +@@ -972,6 +1008,7 @@ int Multipart::process_boundary(int last_part) { + m_mpp = new MultipartPart(); + + m_mpp_state = 0; ++ m_mpp_substate_part_data_read = 0; + + m_reserve[0] = 0; + m_reserve[1] = 0; +@@ -1099,6 +1136,33 @@ int Multipart::multipart_complete(std::string *error) { + m_boundary.size()) == 0) + && (*(m_buf + 2 + m_boundary.size()) == '-') + && (*(m_buf + 2 + m_boundary.size() + 1) == '-')) { ++ // these next two checks may result in repeating work from earlier in this fn ++ // ignore the duplication for now to minimize refactoring ++ if ((m_crlf_state_buf_end == 2) && (m_flag_lf_line != 1)) { ++ m_flag_lf_line = 1; ++ m_transaction->m_variableMultipartLFLine.set(std::to_string(m_flag_lf_line), ++ m_transaction->m_variableOffset); ++ m_transaction->m_variableMultipartCrlfLFLines.set(std::to_string(m_flag_crlf_line && m_flag_lf_line), ++ m_transaction->m_variableOffset); ++ if (m_flag_crlf_line && m_flag_lf_line) { ++ ms_dbg_a(m_transaction, 4, "Multipart: Warning: mixed line endings used (CRLF/LF)."); ++ } else if (m_flag_lf_line) { ++ ms_dbg_a(m_transaction, 4, "Multipart: Warning: incorrect line endings used (LF)."); ++ } ++ m_transaction->m_variableMultipartStrictError.set( ++ std::to_string(m_flag_lf_line) , m_transaction->m_variableOffset); ++ } ++ if ((m_mpp_substate_part_data_read == 0) && (m_flag_invalid_part != 1)) { ++ // it looks like the final boundary, but it's where part data should begin ++ m_flag_invalid_part = 1; ++ ms_dbg_a(m_transaction, 3, "Multipart: Invalid part (data contains final boundary)"); ++ m_transaction->m_variableMultipartStrictError.set( ++ std::to_string(m_flag_invalid_part) , m_transaction->m_variableOffset); ++ m_transaction->m_variableMultipartInvalidPart.set(std::to_string(m_flag_invalid_part), ++ m_transaction->m_variableOffset); ++ ms_dbg_a(m_transaction, 4, "Multipart: Warning: invalid part parsing."); ++ } ++ + /* Looks like the final boundary - process it. */ + if (process_boundary(1 /* final */) < 0) { + m_flag_error = 1; +@@ -1493,70 +1557,80 @@ bool Multipart::process(const std::string& data, std::string *error, + if ((strlen(m_buf) >= m_boundary.size() + 2) + && (strncmp(m_buf + 2, m_boundary.c_str(), + m_boundary.size()) == 0)) { +- char *boundary_end = m_buf + 2 + m_boundary.size(); +- /* if it match, AND there was a matched boundary at least, +- set the m_flag_unmatched_boundary flag to 2 +- this indicates that there were an opened boundary, which +- matches the reference, and here is the final boundary. +- The flag will differ from 0, so the previous rules ("!@eq 0") +- will catch all "errors", without any modification, but we can +- use the new, permission mode with "@eq 1" +- */ +- if (m_boundary_count > 0) { +- m_flag_unmatched_boundary = 2; +- } +- int is_final = 0; ++ if (m_crlf_state_buf_end == 2) { ++ m_flag_lf_line = 1; ++ } ++ if ((m_mpp_substate_part_data_read == 0) && (m_boundary_count > 0)) { ++ /* string matches our boundary, but it's where part data should begin */ ++ m_flag_invalid_part = 1; ++ ms_dbg_a(m_transaction, 3, "Multipart: Invalid part (data contains boundary)"); + +- /* Is this the final boundary? */ +- if ((*boundary_end == '-') +- && (*(boundary_end + 1)== '-')) { +- is_final = 1; +- boundary_end += 2; ++ } else { ++ char *boundary_end = m_buf + 2 + m_boundary.size(); ++ /* if it match, AND there was a matched boundary at least, ++ set the m_flag_unmatched_boundary flag to 2 ++ this indicates that there were an opened boundary, which ++ matches the reference, and here is the final boundary. ++ The flag will differ from 0, so the previous rules ("!@eq 0") ++ will catch all "errors", without any modification, but we can ++ use the new, permission mode with "@eq 1" ++ */ ++ if (m_boundary_count > 0) { ++ m_flag_unmatched_boundary = 2; ++ } ++ int is_final = 0; ++ ++ /* Is this the final boundary? */ ++ if ((*boundary_end == '-') ++ && (*(boundary_end + 1)== '-')) { ++ is_final = 1; ++ boundary_end += 2; ++ ++ if (m_is_complete != 0) { ++ m_flag_error = 1; ++ ms_dbg_a(m_transaction, 4, ++ "Multipart: Invalid boundary " \ ++ "(final duplicate)."); ++ ++ error->assign("Multipart: Invalid boundary " \ ++ "(final duplicate)."); ++ return false; ++ } ++ } + +- if (m_is_complete != 0) { +- m_flag_error = 1; +- ms_dbg_a(m_transaction, 4, +- "Multipart: Invalid boundary " \ +- "(final duplicate)."); ++ /* Allow for CRLF and LF line endings. */ ++ if (((*boundary_end == '\r') ++ && (*(boundary_end + 1) == '\n') ++ && (*(boundary_end + 2) == '\0')) ++ || ((*boundary_end == '\n') ++ && (*(boundary_end + 1) == '\0'))) { ++ if (*boundary_end == '\n') { ++ m_flag_lf_line = 1; ++ } else { ++ m_flag_crlf_line = 1; ++ } + +- error->assign("Multipart: Invalid boundary " \ +- "(final duplicate)."); +- return false; +- } +- } ++ if (process_boundary((is_final ? 1 : 0)) < 0) { ++ m_flag_error = true; ++ return false; ++ } + +- /* Allow for CRLF and LF line endings. */ +- if (((*boundary_end == '\r') +- && (*(boundary_end + 1) == '\n') +- && (*(boundary_end + 2) == '\0')) +- || ((*boundary_end == '\n') +- && (*(boundary_end + 1) == '\0'))) { +- if (*boundary_end == '\n') { +- m_flag_lf_line = 1; +- } else { +- m_flag_crlf_line = 1; +- } ++ if (is_final) { ++ m_is_complete = 1; ++ } + +- if (process_boundary((is_final ? 1 : 0)) < 0) { +- m_flag_error = true; ++ processed_as_boundary = 1; ++ m_boundary_count++; ++ } else { ++ /* error */ ++ m_flag_error = 1; ++ ms_dbg_a(m_transaction, 4, ++ "Multipart: Invalid boundary: " \ ++ + std::string(m_buf)); ++ error->assign("Multipart: Invalid boundary: " \ ++ + std::string(m_buf)); + return false; + } +- +- if (is_final) { +- m_is_complete = 1; +- } +- +- processed_as_boundary = 1; +- m_boundary_count++; +- } else { +- /* error */ +- m_flag_error = 1; +- ms_dbg_a(m_transaction, 4, +- "Multipart: Invalid boundary: " \ +- + std::string(m_buf)); +- error->assign("Multipart: Invalid boundary: " \ +- + std::string(m_buf)); +- return false; + } + } else { /* It looks like a boundary but */ + /* we couldn't match it. */ +@@ -1667,8 +1741,25 @@ bool Multipart::process(const std::string& data, std::string *error, + m_bufptr = m_buf; + m_bufleft = MULTIPART_BUF_SIZE; + m_buf_contains_line = (c == 0x0a) ? 1 : 0; ++ ++ if (c == 0x0a) { ++ if (m_crlf_state == 1) { ++ m_crlf_state = 3; ++ } else { ++ m_crlf_state = 2; ++ } ++ } ++ m_crlf_state_buf_end = m_crlf_state; ++ + } + ++ if (c == 0x0d) { ++ m_crlf_state = 1; ++ } else if (c != 0x0a) { ++ m_crlf_state = 0; ++ } ++ ++ + if ((m_is_complete) && (inleft != 0)) { + m_flag_data_after = 1; + ms_dbg_a(m_transaction, 4, +diff --git a/src/request_body_processor/multipart.h b/src/request_body_processor/multipart.h +index 185656e7..bfada4b9 100644 +--- a/src/request_body_processor/multipart.h ++++ b/src/request_body_processor/multipart.h +@@ -138,6 +138,9 @@ class MultipartPart { + std::string m_last_header_name; + std::unordered_map, + MyHash, MyEqual> m_headers; ++ std::string m_last_header_line; ++ std::vector> m_header_lines; ++ + + unsigned int m_offset; + unsigned int m_length; +@@ -186,6 +189,15 @@ class Multipart { + + unsigned int m_buf_offset; + ++ /* line ending status seen immediately before current position. ++ * 0 = neither LF nor CR; 1 = prev char CR; 2 = prev char LF alone; ++ * 3 = prev two chars were CRLF ++ */ ++ int m_crlf_state; ++ ++ /* crlf_state at end of previous buffer */ ++ int m_crlf_state_buf_end; ++ + /* pointer that keeps track of a part while + * it is being built + */ +@@ -197,6 +209,14 @@ class Multipart { + */ + int m_mpp_state; + ++ /* part parsing substate; if mpp_state is 1 (collecting ++ * data), then for this variable: ++ * 0 means we have not yet read any data between the ++ * post-headers blank line and the next boundary ++ * 1 means we have read at some data after that blank line ++ */ ++ int m_mpp_substate_part_data_read; ++ + /* because of the way this parsing algorithm + * works we hold back the last two bytes of + * each data chunk so that we can discard it +diff --git a/src/variables/multipart_part_headers.h b/src/variables/multipart_part_headers.h +new file mode 100644 +index 00000000..9af328eb +--- /dev/null ++++ b/src/variables/multipart_part_headers.h +@@ -0,0 +1,40 @@ ++/* ++ * ModSecurity, http://www.modsecurity.org/ ++ * Copyright (c) 2022 Trustwave Holdings, Inc. (http://www.trustwave.com/) ++ * ++ * You may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * If any of the files related to licensing are missing or if you have any ++ * other questions related to licensing please contact Trustwave Holdings, Inc. ++ * directly using the email address security at modsecurity.org. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#ifndef SRC_VARIABLES_MULTIPART_PART_HEADERS_H_ ++#define SRC_VARIABLES_MULTIPART_PART_HEADERS_H_ ++ ++#include "src/variables/variable.h" ++ ++namespace modsecurity { ++ ++class Transaction; ++namespace variables { ++ ++ ++DEFINE_VARIABLE_DICT(MultipartPartHeaders, MULTIPART_PART_HEADERS, ++ m_variableMultipartPartHeaders) ++ ++ ++} // namespace variables ++} // namespace modsecurity ++ ++#endif // SRC_VARIABLES_MULTIPART_PART_HEADERS_H_ +diff --git a/test/cppcheck_suppressions.txt b/test/cppcheck_suppressions.txt +index 5a8eb58a..1f455e7d 100644 +--- a/test/cppcheck_suppressions.txt ++++ b/test/cppcheck_suppressions.txt +@@ -54,7 +54,7 @@ duplicateBranch:src/request_body_processor/multipart.cc:93 + danglingTempReference:src/modsecurity.cc:206 + knownConditionTrueFalse:src/operators/validate_url_encoding.cc:77 + knownConditionTrueFalse:src/operators/verify_svnr.cc:87 +-rethrowNoCurrentException:headers/modsecurity/transaction.h:307 ++rethrowNoCurrentException:headers/modsecurity/transaction.h:309 + rethrowNoCurrentException:src/rule_with_actions.cc:123 + ctunullpointer:src/rule_with_actions.cc:237 + ctunullpointer:src/rule_with_operator.cc:135 +diff --git a/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json b/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json +new file mode 100644 +index 00000000..6caf58f0 +--- /dev/null ++++ b/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json +@@ -0,0 +1,166 @@ ++[ ++ { ++ "enabled":1, ++ "version_min":300000, ++ "title":"Testing Variables :: MULTIPART_PART_HEADERS (all headers)", ++ "client":{ ++ "ip":"200.249.12.31", ++ "port":123 ++ }, ++ "server":{ ++ "ip":"200.249.12.31", ++ "port":80 ++ }, ++ "request":{ ++ "headers":{ ++ "Host":"localhost", ++ "User-Agent":"curl/7.38.0", ++ "Accept":"*/*", ++ "Content-Length":"330", ++ "Content-Type":"multipart/form-data; boundary=-----------------------------69343412719991675451336310646", ++ "Expect":"100-continue" ++ }, ++ "uri":"/", ++ "method":"POST", ++ "body":[ ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm1", ++ "Content-Type: image/jpeg", ++ "", ++ "1", ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm2", ++ "", ++ "2", ++ "-------------------------------69343412719991675451336310646--" ++ ] ++ }, ++ "response":{ ++ "headers":{ ++ "Date":"Mon, 13 Jul 2015 20:02:41 GMT", ++ "Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT", ++ "Content-Type":"text/html" ++ }, ++ "body":[ ++ "no need." ++ ] ++ }, ++ "expected":{ ++ "http_code": 403, ++ "debug_log":"Variable: MULTIPART_PART_HEADERS:parm1.*Rule returned 1" ++ }, ++ "rules":[ ++ "SecRuleEngine On", ++ "SecRule MULTIPART_PART_HEADERS \"@rx content-type:.*jpeg\" \"phase:2,deny,status:403,id:500074,t:lowercase\"" ++ ] ++ }, ++ { ++ "enabled":1, ++ "version_min":300000, ++ "title":"Testing Variables :: MULTIPART_PART_HEADERS (specific header - match)", ++ "client":{ ++ "ip":"200.249.12.31", ++ "port":123 ++ }, ++ "server":{ ++ "ip":"200.249.12.31", ++ "port":80 ++ }, ++ "request":{ ++ "headers":{ ++ "Host":"localhost", ++ "User-Agent":"curl/7.38.0", ++ "Accept":"*/*", ++ "Content-Length":"330", ++ "Content-Type":"multipart/form-data; boundary=-----------------------------69343412719991675451336310646", ++ "Expect":"100-continue" ++ }, ++ "uri":"/", ++ "method":"POST", ++ "body":[ ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm1", ++ "Content-Type: image/jpeg", ++ "", ++ "1", ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm2", ++ "", ++ "2", ++ "-------------------------------69343412719991675451336310646--" ++ ] ++ }, ++ "response":{ ++ "headers":{ ++ "Date":"Mon, 13 Jul 2015 20:02:41 GMT", ++ "Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT", ++ "Content-Type":"text/html" ++ }, ++ "body":[ ++ "no need." ++ ] ++ }, ++ "expected":{ ++ "http_code": 403, ++ "debug_log":"Variable: MULTIPART_PART_HEADERS:parm1.*Rule returned 1" ++ }, ++ "rules":[ ++ "SecRuleEngine On", ++ "SecRule MULTIPART_PART_HEADERS:parm1 \"@rx content-type:.*jpeg\" \"phase:2,deny,status:403,id:500074,t:lowercase\"" ++ ] ++ }, ++ { ++ "enabled":1, ++ "version_min":300000, ++ "title":"Testing Variables :: MULTIPART_PART_HEADERS (specific header - no match)", ++ "client":{ ++ "ip":"200.249.12.31", ++ "port":123 ++ }, ++ "server":{ ++ "ip":"200.249.12.31", ++ "port":80 ++ }, ++ "request":{ ++ "headers":{ ++ "Host":"localhost", ++ "User-Agent":"curl/7.38.0", ++ "Accept":"*/*", ++ "Content-Length":"330", ++ "Content-Type":"multipart/form-data; boundary=-----------------------------69343412719991675451336310646", ++ "Expect":"100-continue" ++ }, ++ "uri":"/", ++ "method":"POST", ++ "body":[ ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm1", ++ "Content-Type: image/jpeg", ++ "", ++ "1", ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm2", ++ "", ++ "2", ++ "-------------------------------69343412719991675451336310646--" ++ ] ++ }, ++ "response":{ ++ "headers":{ ++ "Date":"Mon, 13 Jul 2015 20:02:41 GMT", ++ "Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT", ++ "Content-Type":"text/html" ++ }, ++ "body":[ ++ "no need." ++ ] ++ }, ++ "expected":{ ++ "http_code": 200 ++ }, ++ "rules":[ ++ "SecRuleEngine On", ++ "SecRule MULTIPART_PART_HEADERS:parm2 \"@rx content-type:.*jpeg\" \"phase:2,deny,status:403,id:500074,t:lowercase\"" ++ ] ++ } ++] +-- +2.37.2 + diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 916ba8fbcb..1fd11034a0 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -15,6 +15,9 @@ LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity # We're patching build/libmaxmind.m4 and build/pcre.m4 LIBMODSECURITY_AUTORECONF = YES +#0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch +LIBMODSECURITY_IGNORE_CVES += CVE-2022-48279 + LIBMODSECURITY_DEPENDENCIES = pcre2 LIBMODSECURITY_CONF_OPTS = \ --without-pcre \ -- 2.37.2 From thomas.petazzoni at bootlin.com Mon Feb 27 07:39:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 27 Feb 2023 07:39:43 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-26 Message-ID: <20230227073951.3E47E4017B@smtp2.osuosl.org> Hello, Autobuild statistics for 2023-02-26 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 11 | 13 | 0 | 24 | master | 141 | 126 | 0 | 267 | next | 22 | 18 | 0 | 40 | Classification of failures by reason for master ----------------------------------------------- elfutils-0.186 | 8 host-go-1.19.6 | 6 glibc-2.36-81-g4f4d7a13edfd... | 5 host-binutils-2.38 | 5 libgcrypt-1.10.1 | 5 host-binutils-2.39 | 4 linux-6.1.11 | 4 olsr-0.9.8 | 4 unknown | 4 busybox-1.36.0 | 3 host-pahole-1.24 | 3 libglib2-2.72.3 | 3 libgpg-error-1.46 | 3 fs/ubifs/ubifs.mk:49: /home... | 2 host-rust-1.67.0 | 2 json-c-0.16 | 2 linux-5.10.162-cip24-rt10 | 2 mxs-bootlets-10.12.01 | 2 open62541-v1.3.4 | 2 package/multipath-tools/mul... | 2 perl-5.36.0 | 2 php-xdebug-3.0.4 | 2 tbb-2021.5.0 | 2 uccp420wlan-6.9.1 | 2 bat-0.19.0 | 1 brltty-6.5 | 1 coremark-1.01 | 1 docker-cli-23.0.0 | 1 f2fs-tools-1.15.0 | 1 file-5.43 | 1 fontconfig-2.13.1 | 1 freeradius-client-1.1.7 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/romfs/romfs.mk:32: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gdal-3.5.2 | 1 gerbera-1.10.0 | 1 gobject-introspection-1.72.0 | 1 host-binutils-2.37 | 1 host-gcc-initial-11.3.0 | 1 host-runc-1.1.4 | 1 lapack-3.10.1 | 1 libndp-1.8 | 1 libunwind-1.6.2 | 1 linux-tools | 1 ltp-testsuite-20220930 | 1 lttng-modules-2.13.7 | 1 network-manager-1.40.10 | 1 openssh-9.1p1 | 1 pcm-tools-202110 | 1 proxychains-ng-4.16 | 1 rdma-core-44.0 | 1 rtl8189es-e58bd86c9d9408c64... | 1 rtty-8.1.0 | 1 sdl-1.2.15 | 1 speechd-0.11.4 | 1 toolchain-external-codescap... | 1 uboot-tools-2021.07 | 1 valgrind-3.19.0 | 1 wolfssl-5.5.3 | 1 xenomai-3.0.10 | 1 xvisor-0.3.1 | 1 xwayland-22.1.8 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/d359c5a1caf9cc039089908e4d8bcdda87c302c0 | powerpc | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/f076937123d7c1fc2c95d86f655a77347f603837 | mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/33ff4d87eb24387c3ccdb6f5d4c1717fea91d668 | ORPH mipsel | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/65d3005aaafab5382faac6f734f1befd30103d0a | ORPH arm | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/d662c8ac62fdacd3b68813bc6ecbc83e07faad6f | ORPH microblaze | coremark-1.01 | NOK | http://autobuild.buildroot.net/results/77982ac868a4120034bc9762f56b59d17cf1098d | x86_64 | docker-cli-23.0.0 | NOK | http://autobuild.buildroot.net/results/02079f0795a75d31f62435da5ccd7a76093b0973 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/6892399294f0b4c320b1f2a1022f88f1eace357c | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/8508ccea4bf86f1716413e210f004f493090f619 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/0d6b4518a922ef0e455678e4f88769692d98890c | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/cd4e83a2ac30cfdc3a163c12369db0e518470484 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/4ea3f9deb2798588540d821553957849b946caed | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/63315a676850a536f1db20391b5ccb2b5057473f | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/71d15219c9afdadc69f93e9ff72d2a8fdfcd4135 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/eb63ad1a920ddcc3d3519f9cf892122de5c31906 | ORPH or1k | f2fs-tools-1.15.0 | NOK | http://autobuild.buildroot.net/results/085c91b0d6b1f6ac297b82c899b1e1e0816386ac | i686 | file-5.43 | NOK | http://autobuild.buildroot.net/results/80166602d01819ba98f1702133d2e77e304585d8 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/53b801c69eaae50321520ce2bb2395de65e926cb | ORPH riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/2d40fec0a8bc7dd32c6ccc6237d4265d2d42db31 | powerpc64le | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/961ccfa10ad3f5f957d132ae87e6db2902723430 | aarch64_be | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/a1d5dddf3f5c516884c83a9097e5fbe40f61d58e | or1k | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/ba53e1eaf0aa3dfce16d35425b0cc8fa987f5a5a | i686 | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/f1371c23e36095c133a7cc9eb0ba4320e40d88f0 | s390x | fs/romfs/romfs.mk:32: /home... | NOK | http://autobuild.buildroot.net/results/1eaec44366a0fe5500143eb2aadcb3f3f331b8c4 | powerpc64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/95b7154e5c84471925b9cbe274e354b1e96873e4 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/200e0b33c5a587fb4b82eeab1276b24c3c39e6e5 | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/4581cb327e67c95f4e7853ea72d964ffacb21142 | sparc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/c0e70b73a8e314bb378d29729a21fb63fba035c3 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/238ec09c67adb4b62a1a62d74de434eb50dce9d2 | aarch64_be | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/0255fbd68afd0f16f67b4839d55e0e97b96f9449 | sparc | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/5f0947a0ac3308aacecd5e26a8728aeeaf8fcae9 | s390x | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/7d01d09c87f862c15228d4beec2cc43de2aa4e2c | mipsel | gdal-3.5.2 | NOK | http://autobuild.buildroot.net/results/aa2a88990a07e551c40efb0c2180768add600c4f | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/74a44ed2c0084424ca570d0b4a1a20384c79446e | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/953b1dc17928312899add4ba2cbc10b3374d8f3e | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/82d963fcd42c94311807a7d6e403c3d754fb829a | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/7f90adc63443f3ba289e37dd464bdad9e0c1cbbd | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/214c4956a2a4d7289927766ee218ac395d39cd15 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/9c9f1ea06306ac22655fbbd0c10f4aedd9808b6b | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/994cc64adf1541555174c5b97bb2e1bb4eea4dc9 | ORPH mips | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/2820e59c856c1c09de87ca19704e1cc312b28b8a | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/71aa317e1a85c36e98ff093bff25a676c372c608 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/b80593bee3e88954b62d02dcd2e82c86ba658ab0 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/33314415a06359cd4b62134b6c9c46fdc150c0f9 | mips64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/4de4252a4a648efc44d993a48689c838c32c92b9 | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/b9d49a1c7d26b79bb284f2ce8fc138a74bb63e3e | mipsel | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/a21a612f348e2a22b2c0ca78b061bb1b2d5c4b11 | i586 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/2f8da7b66c10de49ec9a52f58fa9007936d5b160 | powerpc64le | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/66748b53d289631c7687b6a5303efe61e3c31b1e | i586 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/23193bb4e3914d47e940e612b844f1e0c7e44e82 | mipsel | host-gcc-initial-11.3.0 | NOK | http://autobuild.buildroot.net/results/7f6ccfb1ec81bae4d6a8d20bfdd1a9ea95bec3e1 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/c58d6adafd4e7c77900b0dbaccecc55053e95eea | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/4f73da6a223866cb00309972b4a4dd89ae01d78e | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/415671041898b7f3c004cff741a900b3b8a4efee | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/5a410867816999f5298a8449dd2816d64b06415d | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/df9ee852d7bf23c7895d76008b08854a24fa11d7 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/8e85d20b784a1e2669c379151fa4ad852bc88463 | microblaze | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8f5771975ee505b7bb379a9b08eac90f690eac90 | riscv32 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/3d128590ace2c3f21e27d10b2f2c19bfc3fdeafc | i686 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/93c6d914d829fcb49e93cb032dd9d6aed97ea860 | sparc | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/e3aad73680a4806362b08fd65354007fb688859d | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/7bfe53685e47be73609bfdf1ab770e6b7982706f | i686 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/3e915f01567c053f75b081ff0c74364227bb7743 | or1k | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/2f9cfe5d4fba663b6695e5642eb41c8ea326ed67 | riscv64 | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/550f4622f3d0a30200ecc143cb68e4b2ed7ee725 | sh4 | lapack-3.10.1 | NOK | http://autobuild.buildroot.net/results/bc71780512d0f1e05788da8b26929a786e1c25f3 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/a702fa5d95b0274e0ae8b0e477078cf6623e65fe | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/614af65fbe8a1df790f236ca94cdb822d04c8fc8 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/886d48c551b5904ccb8e10b844858ec844a48264 | ORPH armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/14ff1f9ca7e0d34c35d451a59df1885cfd4158f7 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/c7a04604bfb94d876c7b5cbdc175b1ba05f5678d | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/127a957748ad0824f3e032090af04d36ff5f27e0 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/52c16b1e14a2f9aaa619aabc61975ba7409f0c83 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/059b92bcb5f6beade6236e0b0cd30b5a69ea0a95 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/65ce1988c4e9441f3db585fd772d6b092153dbe1 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/bdf82d021efdea3753de180a8d0e625e83bc684b | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/18d22d95960f1f71c120df578690adf6ea8f25f2 | ORPH riscv64 | libndp-1.8 | NOK | http://autobuild.buildroot.net/results/926441b7c388f0b066dea33ec20446fcb59a1a3f | aarch64 | libunwind-1.6.2 | NOK | http://autobuild.buildroot.net/results/f45c7f173948da11826f963da36706ee1dd59079 | ORPH m68k | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/1816df3d96663533c631a9a5f50725636392c6fc | ORPH sh4a | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/861acab636500e95ef27f4312468416d51269171 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/b031d4da2cfe3f868e64142aa17f0a280352b216 | ORPH x86_64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/d40d84a0312896d45f8bd27b7d6e41e721b0f7d0 | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/1f379e543df574be186058ae254eb6d887b1ea88 | ORPH mips64el | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/516b08976d6524b8f8866ac677ff7466bf632ee4 | ORPH mips64 | linux-tools | NOK | http://autobuild.buildroot.net/results/48a1b4c520c041167e609c0526e92d891b4c823c | ORPH i586 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/b53e3e8f46a458fd8f7064637f7565470f8951e1 | powerpc64le | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/0f0ef3ae623afec9bbc2266eae44494ba7225a37 | arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/14e73676aa57e28fe6e6a0de42ceae46b4cedd7f | ORPH arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/2ae073556bb77fa5292bf022ea394fb86d530c2b | ORPH mipsel | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/e0c98ca5ca147a8825b5cc1dc9ca22f224fd7ca0 | ORPH sh4 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/fa7ae8c9d3f0f52ab20351b202bbd2481b15eea4 | ORPH arm | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/68f85e1c2815337185d209169d2a7dea4303dc79 | ORPH sh4eb | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/8e1981743807ac7b333489a7cf3b32149276f3e3 | ORPH mips64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/e7fb9304ea4561744d2f81c8047bcefc0007e6a9 | ORPH nios2 | open62541-v1.3.4 | NOK | http://autobuild.buildroot.net/results/8030da7146c423fa9d9fbd18dcb7180e6b2fe069 | ORPH nios2 | open62541-v1.3.4 | NOK | http://autobuild.buildroot.net/results/4a16f9d34b684fea9c60056c50b55407a97bbe5b | ORPH m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/4cf5f51f1eb440153638336d631b1300db1fb6cd | ORPH aarch64 | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/54ca43da642e30d7d561f28ab5d4af752d87f012 | aarch64_be | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/a4cb0c48e2cc97dfff2404dceb9d499d8a9fa9aa | x86_64 | pcm-tools-202110 | NOK | http://autobuild.buildroot.net/results/d28ef7b5056d588c8a54d07e1129038a1798761b | ORPH sh4 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/8f4ee06771b98fec61cb3df63cdceed9cb8074e3 | arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/709930e2fa55f1dbc0018a925879df47e1c9304a | powerpc64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/d21f58f6caf0e272df2a67f34b83208a81e995de | mipsel | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/ad26dc42ede5b75cec059c2ad34e094fca8d8b76 | mips64 | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/e9ca1f8b089697d912e06956b6a4a2bc9cd94bd2 | ORPH armeb | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/55966526989e3d4d9a8317f4fab7cc63a04cafeb | powerpc64 | rtl8189es-e58bd86c9d9408c64... | NOK | http://autobuild.buildroot.net/results/45efdb0806d0bb2f7d542be80ed02bf2dc080df4 | sparc | rtty-8.1.0 | NOK | http://autobuild.buildroot.net/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 | sh4eb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/e06f83566565c2a6483dad3a777d6da114e2eb65 | ORPH armeb | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/6cc9fe329adc8d2c68e6cb0a529fa0ccca48a290 | i686 | tbb-2021.5.0 | NOK | http://autobuild.buildroot.net/results/8689491f079f93ea5cc61db0ec868d1d604c66e6 | i686 | tbb-2021.5.0 | NOK | http://autobuild.buildroot.net/results/07914c6525af1be58e27c0cfc1d538a667faddb0 | mips | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/39576cd8c81426fdaf1c27ea627130e9784335c2 | ORPH mips64el | uboot-tools-2021.07 | NOK | http://autobuild.buildroot.net/results/b6bf5f32c3fa444446664816c5bf0f56695cb749 | ORPH powerpc64 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/ebc38a28b7e20d76dc486442a9e0688562a351c4 | powerpc64 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/7cd7151e390b8f7a0df3e647fe4cd5d6319a830b | or1k | unknown | NOK | http://autobuild.buildroot.net/results/4b209774b62cb83385ca695f72155ea0d6d4a4a9 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/23f0341c41a3a518f11b001385b07189e5797ef3 | mips | unknown | NOK | http://autobuild.buildroot.net/results/0672553db5de0278033cb0b21b3769bba52e3d61 | arc | unknown | NOK | http://autobuild.buildroot.net/results/31377a9222ec38eeaa9a192cf7c6829bbf4032f4 | mips64el | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/7fe3d35e3c2099e0eecee1e2e5fded86ffbf340b | ORPH mips | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/19cbf934ca1c01533cf9ab079139abbacc8be322 | aarch64 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/5b97496b2d8d8accb6cf778309a699a19709d93d | riscv32 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/a15579974043d92c36f12e1135b27b31923d40b1 | aarch64_be | xwayland-22.1.8 | NOK | http://autobuild.buildroot.net/results/cccc8f97d452ed2adbcbc4624f159a00287a3d38 | Classification of failures by reason for next --------------------------------------------- host-pahole-1.24 | 3 gobject-introspection-1.72.0 | 2 unknown | 2 android-tools-4.2.2+git2013... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 glibc-2.36-81-g4f4d7a13edfd... | 1 gqrx-2.14.4 | 1 host-go-1.19.6 | 1 libglib2-2.72.3 | 1 mutt-2.2.9 | 1 optee-client-3.19.0 | 1 package/network-manager/net... | 1 sdl-1.2.15 | 1 xenomai-3.0.10 | 1 Detail of failures for next --------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/4b1ea99ebde09867f580fc6985396526421c152f | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/7c472d586194fb97d1f4cae112199747ec14f5fc | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/fac0583002f3dd32543578060fed53c3eb2fc3bc | or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/354fc7a4a787a803e47f2b4f48e8f71307476b25 | ORPH mips | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/4e4686a01a5e207f4c4b6c813f75bb05abaf2002 | ORPH or1k | gqrx-2.14.4 | NOK | http://autobuild.buildroot.net/results/cc9f87441fdcf0389370a3640deacc465124b2d5 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/563d7d6afc195bfcae6ce8f38dbfb613e5ef4c33 | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/e14ebad94a79da7ece47d3b3957a0b698cb9fae1 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/f84cf0126d124c3537fc59d42138c6a8918bb2dd | sh4aeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/af8997da46d37a0e98f5ef22a95b03968c2e7d56 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/03013da54101cf827cf85dcf6ca1358913bc29c7 | mips64 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/5ebb752c146d841f9c622d7e0b55cf187fffc954 | arc | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/1c11e7e2f05098d967b1c8e25da92f47de9278ed | sparc64 | package/network-manager/net... | NOK | http://autobuild.buildroot.net/results/fec307b784010fc66217242f61476657739e663b | sh4eb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/09473f4ad5266c965989a29f1b008b72da1e10a8 | ORPH powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/cfca1ea2b0ab2b28517fe5f7540d0d0330348ac7 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/a8177ad3d3081fafa85bdfb64380b599ee015dee | microblazeel | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/5c7eaae71114f366b04221467b67f72731dd4241 | Classification of failures by reason for 2022.11.x -------------------------------------------------- python-numpy-1.23.4 | 2 boost-1.80.0 | 1 gcr-3.40.0 | 1 gdb-11.2 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 host-go-1.19.5 | 1 libgcrypt-1.10.1 | 1 libglib2-2.72.3 | 1 lttng-modules-2.13.1 | 1 mongodb-4.2.18 | 1 ssdp-responder-1.8 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/eb2c9d92c347a38d85ead3ecb411ff46ae51f96f | x86_64 | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/07cc3be53e1db3c98c5efa0bdc5485ed54305fcf | ORPH xtensa | gdb-11.2 | NOK | http://autobuild.buildroot.net/results/fc5232659678d6e4790d19a96bcca49acd3cc33a | ORPH powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/ed89a3cd01a42468eeafe27305e5a2a61188de7b | mips | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/715ae2ad9a290e13131d4e0935660cedb2dbb2f6 | ORPH mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/54613237d55470a4945d021fdef2816b33220df0 | i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/cf4977f46017cdccded71ede2b1f8ecd2e79c077 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/a1ee19f9fe9b6a09c2502f3117971d6223f33ff0 | aarch64 | lttng-modules-2.13.1 | NOK | http://autobuild.buildroot.net/results/197699b3bbd6ca2be332878116761b81df7dbd58 | aarch64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/9433845c0225e45e6784566e0772474f6be3a576 | aarch64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/bcd17aa6925bd6f17db0d33ba0d29a577c67d215 | aarch64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/68023d341e85884ee11df18cd5ad0b074fb5dbb1 | x86_64 | ssdp-responder-1.8 | NOK | http://autobuild.buildroot.net/results/f405dece0413e6935172a28446c294c8ab37be90 | Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.6 | 7.0.11 | ORPH acpica | DISTRO | https://release-monitoring.org/project/00018 | 20220331 | 20222010 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 43 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.5.4 | 4.6.0 | alfred | DISTRO | https://release-monitoring.org/project/241870 | 2022.1 | 2023.0 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 13.0.0_r31 | angularjs | DISTRO | https://release-monitoring.org/project/21321 | 1.8.2 | 1.8.3 | apitrace | DISTRO | https://release-monitoring.org/project/06170 | 10.0 | 11.1 | apr | DISTRO | https://release-monitoring.org/project/00095 | 1.7.0 | 1.7.2 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 12.0.1 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.29.1 | 20.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.46.0 | atkmm | DISTRO | https://release-monitoring.org/project/07962 | 2.36.1 | 2.36.2 | atop | DISTRO | https://release-monitoring.org/project/00135 | 2.8.0 | 2.8.1 | audit | DISTRO | https://release-monitoring.org/project/15225 | 3.0.7 | 3.1 | autoconf-archive | DISTRO | https://release-monitoring.org/project/00142 | 2022.09.03 | 2023.02.20 | ORPH avocado | DISTRO | https://release-monitoring.org/project/13385 | 98.0 | 100.1 | avrdude | DISTRO | https://release-monitoring.org/project/10751 | 6.4 | 7.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_07_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.12.2 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 20.10.26 | 20.10.29 | bat | DISTRO | https://release-monitoring.org/project/241901 | 0.19.0 | 0.22.1 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2023.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2022.3 | 2023.0 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.8.2 | 1.9.0 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.2.25 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.2.25 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.2.25 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.5 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.38 | 2.40 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.11 | 2.0.12 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 24.0.1 | bluez5_utils | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bluez5_utils-headers | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH boost | DISTRO | https://release-monitoring.org/project/06845 | 1.80.0 | 1.81.0 | bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.2.3 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.16.2 | 6.1.3 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.21 | 3.25 | cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.8 | cairomm | DISTRO | https://release-monitoring.org/project/07959 | 1.16.1 | 1.16.2 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.5.0 | 1.5.2 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 3.9.1 | 4.2.1 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.15 | 7.0 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.18.0 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.8 | 1.0.1 | clang | DISTRO | https://release-monitoring.org/project/11811 | 11.1.0 | 15.0.7 | cli11 | DISTRO | https://release-monitoring.org/project/20578 | 2.3.1 | 2.3.2 | clinfo | DISTRO | https://release-monitoring.org/project/10503 | 3.0.21.02.21 | 3.0.23.01.25 | cloop | DISTRO | https://release-monitoring.org/project/21332 | 3.14.1.3 | 3.14.1.3+... | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.22.3 | 3.25.2 | collectl | DISTRO | https://release-monitoring.org/project/00330 | 4.3.2 | 4.3.8 | compiler-rt | GUESS | https://release-monitoring.org/project/17705 | 11.1.0 | 900 | ORPH containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.6.16 | 1.6.18 | crucible | DISTRO | https://release-monitoring.org/project/267616 | 2022.05.25 | 2022.12.06 | crudini | DISTRO | https://release-monitoring.org/project/21669 | 0.9.3 | 0.9.4 | crun | DISTRO | https://release-monitoring.org/project/96792 | 1.7.2 | 1.8 | cryptopp | DISTRO | https://release-monitoring.org/project/14487 | 8.6.0 | 8.7.0 | cukinia | DISTRO | https://release-monitoring.org/project/138119 | 0.6.0 | 0.6.1 | ORPH cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.16 | 1.28.17 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.7.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | dado | DISTRO | https://release-monitoring.org/project/58442 | 1.8.3-1 | 2.1.0-1 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.9 | 3.0.11 | dash | DISTRO | https://release-monitoring.org/project/00394 | 0.5.11.5 | 0.5.12 | ORPH datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.13.2 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.3.4 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.2.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.4.0 | dav1d | DISTRO | https://release-monitoring.org/project/18920 | 1.0.0 | 1.1.0 | dbus | DISTRO | https://release-monitoring.org/project/05356 | 1.12.24 | 1.14.6 | ORPH dbus-broker | DISTRO | https://release-monitoring.org/project/271475 | 32 | 33 | dbus-python | DISTRO | https://release-monitoring.org/project/00402 | 1.2.18 | 1.3.2 | ORPH dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH ddrescue | DISTRO | https://release-monitoring.org/project/00410 | 1.26 | 1.27 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.20.0 | 1.20.1 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20220117 | 1.3-20230209 | ORPH diffutils | DISTRO | https://release-monitoring.org/project/00436 | 3.8 | 3.9 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 23.0.0 | 23.0.1 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 2.15.1 | 2.16.0 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 23.0.0 | 23.0.1 | domoticz | DISTRO | https://release-monitoring.org/project/21342 | 2022.2 | 2023.1 | dos2unix | DISTRO | https://release-monitoring.org/project/00453 | 7.4.3 | 7.4.4 | dracut | DISTRO | https://release-monitoring.org/project/10627 | 057 | 059 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.21.4 | 9.23.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH dtc | DISTRO | https://release-monitoring.org/project/16911 | 1.6.1 | 1.7.0 | dust | DISTRO | https://release-monitoring.org/project/141344 | 0.8.1 | 0.8.4 | ORPH e2fsprogs | DISTRO | https://release-monitoring.org/project/00646 | 1.46.5 | 1.47.0 | ORPH easy-rsa | DISTRO | https://release-monitoring.org/project/17770 | 3.1.1 | 3.1.2 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.18 | 1.19 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202211 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.1 | 1.26.3 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 21.12 | 23.01 | elfutils | DISTRO | https://release-monitoring.org/project/05679 | 0.186 | 0.188 | ORPH empty | DISTRO | https://release-monitoring.org/project/20564 | 0.6.22b | 0.6.23c | ORPH enchant | DISTRO | https://release-monitoring.org/project/06601 | 2.3.3 | 2.3.4 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.1 | 0.25.4 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 25.2.3 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.21 | 1.0.22 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.11.1 | 1.11.5 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.9.1 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.16 | 1.0.22 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.29 | 1.0.30 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.14 | 1.0.15 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.10 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.8 | 1.0.9 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.47 | 1.0.49 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.27 | 1.0.29 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.47 | 1.2.7 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.13 | 1.1.16 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.23 | 1.0.25 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.5.6 | 1.6.1 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.32 | 1.0.36 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.12 | 1.0.15 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.10 | 1.0.12 | ethtool | DISTRO | https://release-monitoring.org/project/00763 | 6.1 | 6.2 | ORPH execline | DISTRO | https://release-monitoring.org/project/05482 | 2.9.0.1 | 2.9.2.1 | exiv2 | DISTRO | https://release-monitoring.org/project/00769 | 0.27.5 | 0.27.6 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.30.1 | 1.31 | ORPH feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.9.1 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.35 | 6.4.37 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.3 | 5.1.2 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH file | DISTRO | https://release-monitoring.org/project/00807 | 5.43 | 5.44 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.33 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.21.2 | flashrom | DISTRO | https://release-monitoring.org/project/10202 | 1.2.1 | 1.3.0 | flatbuffers | DISTRO | https://release-monitoring.org/project/16642 | 2.0.8 | 23.1.21 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.4 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fmc | GUESS | https://release-monitoring.org/project/145761 | LSDK-21.08 | 0.2.0 | ORPH font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 6.3.0 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.14.2 | ORPH freeradius-server | DISTRO | https://release-monitoring.org/project/00853 | 3.2.0 | 3.2.2 | freetype | DISTRO | https://release-monitoring.org/project/00854 | 2.12.1 | 2.13.0 | fscryptctl | DISTRO | https://release-monitoring.org/project/270981 | 1.0.0 | 1.1.0 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 22.09.00 | 23.01.00 | gawk | DISTRO | https://release-monitoring.org/project/00868 | 5.2.0 | 5.2.1 | ORPH gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 4.0.0 | ORPH gdal | DISTRO | https://release-monitoring.org/project/00881 | 3.5.2 | 3.6.2 | gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.5.5 | 2.6.2 | gerbera | DISTRO | https://release-monitoring.org/project/18420 | 1.10.0 | 1.12.1 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.56.1 | 10.0.0 | gitlab-runner | DISTRO | https://release-monitoring.org/project/11337 | 15.5.0 | 15.9.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.1 | 2.74.0 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.74.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.10.4.0 | 3.10.5.1 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.8 | 3.8.0 | ORPH go | DISTRO | https://release-monitoring.org/project/01227 | 1.19.6 | 1.20.1 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.72.0 | 1.74.0 | ORPH gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.9 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 7.1.0 | ORPH grantlee | DISTRO | https://release-monitoring.org/project/21448 | 5.2.0 | 5.3.1 | graphicsmagick | DISTRO | https://release-monitoring.org/project/01248 | 1.3.38 | 1.3.40 | grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.51.1 | 1.52.1 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 43.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gssdp | DISTRO | https://release-monitoring.org/project/01262 | 1.4.0.1 | 1.6.2 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.1.0 | gst1-shark | DISTRO | https://release-monitoring.org/project/21854 | v0.7.5 | 0.8.1 | gtest | DISTRO | https://release-monitoring.org/project/18290 | 1.12.1 | 1.13.0 | gtkmm3 | DISTRO | https://release-monitoring.org/project/311572 | 3.22.0 | 3.24.7 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.6.2 | guile | DISTRO | https://release-monitoring.org/project/01277 | 3.0.8 | 3.0.9 | gupnp | DISTRO | https://release-monitoring.org/project/01281 | 1.4.3 | 1.6.3 | gupnp-av | DISTRO | https://release-monitoring.org/project/01282 | 0.14.0 | 0.14.1 | gupnp-tools | DISTRO | https://release-monitoring.org/project/01284 | 0.10.3 | 0.12.0 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.50.3 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.6.5 | 2.7.3 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 5.3.1 | 7.0.1 | heimdal | DISTRO | https://release-monitoring.org/project/01307 | 7.7.1 | 7.8.0 | ORPH hiawatha | DISTRO | https://release-monitoring.org/project/13375 | 11.2 | 11.3 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.13.1 | ORPH hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.22.10 | ORPH htop | DISTRO | https://release-monitoring.org/project/01332 | 3.2.1 | 3.2.2 | ORPH htpdate | DISTRO | https://release-monitoring.org/project/132187 | 1.3.6 | 1.3.7 | hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.365 | 0.367 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.8.0 | 2.9.0 | hyperfine | DISTRO | https://release-monitoring.org/project/18526 | 1.14.0 | 1.15.0 | ORPH i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.43.0 | 2.46.1 | ibm-sw-tpm2 | DISTRO | https://release-monitoring.org/project/18952 | 1661 | 1682 | icu | DISTRO | https://release-monitoring.org/project/16134 | 70-1 | 72-1 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.41 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-51 | 7.1.0-62 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.10.0 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.6.0 | ORPH intel-gmmlib | DISTRO | https://release-monitoring.org/project/20342 | 22.3.3 | 22.3.4 | intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 23.1.0 | 23.1.2 | intel-mediasdk | DISTRO | https://release-monitoring.org/project/21814 | 23.1.0 | 23.1.2 | intel-microcode | DISTRO | https://release-monitoring.org/project/20614 | 20221108 | 20230214 | iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.493 | 3.494 | iperf3 | DISTRO | https://release-monitoring.org/project/01389 | 3.12 | 3.13 | ORPH iproute2 | DISTRO | https://release-monitoring.org/project/01392 | 6.1.0 | 6.2.0 | ipset | DISTRO | https://release-monitoring.org/project/01393 | 7.16 | 7.17 | irqbalance | DISTRO | https://release-monitoring.org/project/01402 | 1.9.0 | 1.9.2 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | irssi | DISTRO | https://release-monitoring.org/project/01404 | 1.4.2 | 1.4.3 | jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.21 | 1.9.22 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 1.1.1 | 1.1.2 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 4.0.0 | jimtcl | DISTRO | https://release-monitoring.org/project/01459 | 0.81 | 0.82 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.6 | 1.9 | jpeg-turbo | DISTRO | https://release-monitoring.org/project/01648 | 2.1.4 | 2.1.5.1 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.13.1 | 1.13.2 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.2 | jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.10.0 | 3.10.1 | kexec | DISTRO | https://release-monitoring.org/project/12689 | 2.0.25 | 2.0.26 | ORPH kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kodi | DISTRO | https://release-monitoring.org/project/20547 | 19.5-Matrix | 20.0-Nexus | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.7-Ma... | 21.0.1-Omega | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.3-Ma... | 20.5.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-jsonschemabuilder | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.4-Ma... | 21.0.0-Omega | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.5-Ma... | 21.0.0-Omega | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.1-Ma... | 20.5.0-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.6-Ma... | 20.6.1-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.3.0-Ma... | 21.1.1-Omega | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.11-M... | 20.3.2-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.6-Ma... | 20.4.0-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.3.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.4.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.3.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.4-Ma... | 20.3.1-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 21.1.1-Omega | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.5-Ma... | 20.4.0-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.1-Ma... | 21.1.1-Omega | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.3.1-Ma... | 21.1.0-Omega | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.16-M... | 20.3.6-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-texturepacker | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.2.0-Ma... | 20.3.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.2-Ma... | 20.1.1-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.3-Ma... | 20.2.1-Nexus | ksmbd-tools | DISTRO | https://release-monitoring.org/project/241856 | 3.4.6 | 3.4.7 | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 2.1.0 | 2.2.0 | lapack | DISTRO | https://release-monitoring.org/project/01534 | 3.10.1 | 3.11.0 | leafpad | DISTRO | https://release-monitoring.org/project/01544 | 0.8.18.1 | 0.8.19 | ORPH lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.3 | 0.3.95 | leptonica | DISTRO | https://release-monitoring.org/project/01549 | 1.82.0 | 1.83.0 | less | DISTRO | https://release-monitoring.org/project/01550 | 590 | 628 | ORPH libabseil-cpp | DISTRO | https://release-monitoring.org/project/115295 | 20220623.1 | 20230125.1 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libass | DISTRO | https://release-monitoring.org/project/01560 | 0.17.0 | 0.17.1 | libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.26 | 2.28-1 | ORPH libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.7 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.65 | 2.67 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 3.0.0 | libcurl | DISTRO | https://release-monitoring.org/project/00381 | 7.88.0 | 7.88.1 | libdeflate | DISTRO | https://release-monitoring.org/project/242778 | 1.15 | 1.17 | libdnet | DISTRO | https://release-monitoring.org/project/06308 | 1.16.1 | 1.16.3 | ORPH libebml | DISTRO | https://release-monitoring.org/project/07879 | 1.4.2 | 1.4.4 | libedit | DISTRO | https://release-monitoring.org/project/01599 | 20210910-3.1 | 20221030-3.1 | libevdev | DISTRO | https://release-monitoring.org/project/20540 | 1.12.1 | 1.13.0 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.14.0 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgit2 | DISTRO | https://release-monitoring.org/project/01627 | 1.5.1 | 1.6.1 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.40.0 | ORPH libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.72.3 | 2.74.6 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.4.0 | 1.6.0 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.17.1 | 1.18.0 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.30 | ORPH libgpiod | DISTRO | https://release-monitoring.org/project/20640 | 1.6.3 | 1.6.4 | ORPH libgsasl | DISTRO | https://release-monitoring.org/project/01563 | 1.10.0 | 2.2.0 | ORPH libgsm | DISTRO | https://release-monitoring.org/project/12587 | 1.0.19 | 1.0.22 | libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.8.3 | libhtp | DISTRO | https://release-monitoring.org/project/01632 | 0.5.40 | 0.5.42 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.40 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.16 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.17 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.2 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.20.1 | 1.22.1 | libjxl | DISTRO | https://release-monitoring.org/project/232764 | 0.7.0 | 0.8.1 | liblinear | DISTRO | https://release-monitoring.org/project/21363 | 2.45 | 2.46 | libmatroska | DISTRO | https://release-monitoring.org/project/01657 | 1.6.3 | 1.7.1 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.14 | 0.12.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.8 | 3.1.10 | libmodplug | DISTRO | https://release-monitoring.org/project/05669 | d1b97ed | 0.8.9.0 | ORPH libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.11 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.2 | ORPH libnftnl | DISTRO | https://release-monitoring.org/project/01681 | 1.2.3 | 1.2.4 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.2.2 | 5.0.1 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.14 | libpam-tacplus | DISTRO | https://release-monitoring.org/project/20537 | 1.6.1 | 1.7.0 | ORPH libpcap | DISTRO | https://release-monitoring.org/project/01702 | 1.10.2 | 1.10.3 | libpeas | DISTRO | https://release-monitoring.org/project/06871 | 1.32.0 | 1.34.0 | ORPH libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.7.4 | libqrtr-glib | DISTRO | https://release-monitoring.org/project/192056 | 1.0.0 | 1.2.2 | librelp | DISTRO | https://release-monitoring.org/project/01713 | 1.10.0 | 1.11.0 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.54.5 | librsync | DISTRO | https://release-monitoring.org/project/06309 | 2.3.2 | 2.3.4 | librtas | DISTRO | https://release-monitoring.org/project/10717 | 2.0.3 | 2.0.4 | ORPH libselinux | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.5 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsolv | DISTRO | https://release-monitoring.org/project/07908 | 0.7.22 | 0.7.23 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.2 | 3.2.2 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.2 | 2.5.0 | libtalloc | DISTRO | https://release-monitoring.org/project/01733 | 2.3.4 | 2.4.0 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH libtool | DISTRO | https://release-monitoring.org/project/01741 | 2.4.6 | 2.4.7 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.8 | libucl | DISTRO | https://release-monitoring.org/project/21371 | 0.8.1 | 0.8.2 | libupnp | DISTRO | https://release-monitoring.org/project/21315 | 1.14.13 | 1.14.15 | libupnpp | DISTRO | https://release-monitoring.org/project/15849 | 0.21.0 | 0.22.4 | ORPH liburcu | DISTRO | https://release-monitoring.org/project/07134 | 0.13.2 | 0.14.0 | liburing | DISTRO | https://release-monitoring.org/project/230185 | 2.2 | 2.3 | libv4l | DISTRO | https://release-monitoring.org/project/09998 | 1.22.1 | 1.24.1 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.14.1 | libvirt | DISTRO | https://release-monitoring.org/project/13830 | 7.10.0 | 9.0.0 | libvpx | DISTRO | https://release-monitoring.org/project/11083 | 1.12.0 | 1.13.0 | libwpe | DISTRO | https://release-monitoring.org/project/17789 | 1.14.0 | 1.14.1 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.29 | 4.4.33 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.4.0 | 1.5.0 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.54.06 | lightning | DISTRO | https://release-monitoring.org/project/01816 | 2.2.0 | 2.2.1 | lilv | DISTRO | https://release-monitoring.org/project/01818 | 0.24.12 | 0.24.20 | links | DISTRO | https://release-monitoring.org/project/01822 | 2.26 | 2.28 | ORPH linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.11 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20221214 | 20230210 | liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.4.0 | 1.5.0 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2023.01.19 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.15 | 1.0.16 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.13.0 | 1.0.0 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.20.1 | 3.21.0 | ORPH lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | lsof | DISTRO | https://release-monitoring.org/project/01844 | 4.96.5 | 4.98.0 | ORPH ltp-testsuite | DISTRO | https://release-monitoring.org/project/21502 | 20220930 | 20230127 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.6 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.11 | lttng-libust | DISTRO | https://release-monitoring.org/project/07135 | 2.13.1 | 2.13.5 | lttng-modules | DISTRO | https://release-monitoring.org/project/07141 | 2.13.7 | 2.13.8 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.8 | 2.13.9 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luarocks | DISTRO | https://release-monitoring.org/project/01856 | 3.9.1 | 3.9.2 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.43.0-0 | 1.44.2-1 | ORPH luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.13.0 | 2.14.0 | ORPH lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.19 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzma-alone | DISTRO | https://release-monitoring.org/project/242840 | 9.22 | 2201 | ORPH lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.4.1 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.36 | 11.0.1 | ORPH mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.2 | 3.3.0 | mc | DISTRO | https://release-monitoring.org/project/01954 | 4.8.28 | 4.8.29 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.6.0 | 0.1.6.2 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.2.25 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.17 | 1.6.18 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 6.10 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 22.3.5 | 23.0.0 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 22.3.5 | 23.0.0 | meson | DISTRO | https://release-monitoring.org/project/06472 | 1.0.0 | 1.0.1 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.46.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | minizip | DISTRO | https://release-monitoring.org/project/301509 | 3.0.7 | 3.0.8 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2022.12 | 2023.02 | moby-buildkit | DISTRO | https://release-monitoring.org/project/20836 | 0.11.2 | 0.11.3 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.20.4 | 1.21.2 | modsecurity2 | DISTRO | https://release-monitoring.org/project/68638 | 2.9.7 | 3.0.8 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 6.2.0 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.8 | 7.9 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.33.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.182 | 6.12.0.190 | mp4v2 | DISTRO | https://release-monitoring.org/project/98413 | 2.1.1 | 2.1.2 | ORPH mpc | DISTRO | https://release-monitoring.org/project/01667 | 1.2.1 | 1.3.1 | ORPH mpfr | DISTRO | https://release-monitoring.org/project/02019 | 4.1.1 | 4.2.0 | ORPH mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.31.2 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.35.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 5.0.0 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.22 | 1.8.23 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.38 | 4.0.42 | ORPH nanomsg | DISTRO | https://release-monitoring.org/project/14540 | 1.1.5 | 1.2 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.18 | 2.2.2 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.3-20221224 | 6.4-20230225 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.32.4 | 0.32.5 | ORPH netatalk | DISTRO | https://release-monitoring.org/project/02063 | 3.1.13 | 3.1.14 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | 1.218 | 1.219 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.33.1 | 1.38.1 | network-manager | DISTRO | https://release-monitoring.org/project/21197 | 1.42.0 | 1.42.2 | ORPH newt | DISTRO | https://release-monitoring.org/project/15129 | 0.52.21 | 0.52.23 | ORPH nftables | DISTRO | https://release-monitoring.org/project/02082 | 1.0.5 | 1.0.6 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.52.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.22.1 | 1.23.3 | ninja | DISTRO | https://release-monitoring.org/project/02089 | 1.11.1.g9... | 1.11.1 | nmap | DISTRO | https://release-monitoring.org/project/02096 | 7.92 | 7.93 | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 16.18.1 | 19.7.0 | noip | DISTRO | https://release-monitoring.org/project/21539 | 2.1.9 | 3.0.0 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.151 | 390.157 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 525.89.02 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 2.3 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.34 | 2.0 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.6.2 | ola | DISTRO | https://release-monitoring.org/project/08354 | 0.10.8 | 0.10.9 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.3.4 | 1.3.5 | ORPH openal | DISTRO | https://release-monitoring.org/project/08172 | 1.22.0 | 1.23.0 | ORPH opencl-clhpp | DISTRO | https://release-monitoring.org/project/271141 | 2.0.16 | 2023.02.06 | opencore-amr | DISTRO | https://release-monitoring.org/project/21548 | 0.1.5 | 0.1.6 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.19 | 4.7.0 | opencv4 | DISTRO | https://release-monitoring.org/project/06615 | 4.6.0 | 4.7.0 | openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.18+10 | 21+11 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.1.4 | 4.1.5 | openocd | DISTRO | https://release-monitoring.org/project/02557 | 0.11.0 | 0.12.0 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.46 | opensc | DISTRO | https://release-monitoring.org/project/02559 | 0.22.0 | 0.23.0 | openssh | DISTRO | https://release-monitoring.org/project/02565 | 9.1p1 | 9.2p1 | ORPH openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 11.3.5-18... | 12.1.5 | openvpn | DISTRO | https://release-monitoring.org/project/02567 | 2.5.7 | 2.6.0 | ORPH opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.6.1 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.19.0 | 3.20.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.19.0 | 3.20.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.19.0 | 3.20.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.19.0 | 3.20.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.32 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.2.25 | ORPH osm2pgsql | DISTRO | https://release-monitoring.org/project/02575 | 1.8.0 | 1.8.1 | paho-mqtt-c | DISTRO | https://release-monitoring.org/project/21375 | 1.3.11 | 1.3.12 | pango | DISTRO | https://release-monitoring.org/project/11783 | 1.50.12 | 1.50.13 | ORPH pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.1 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.13 | 0.17.2 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.7 | ORPH pciutils | DISTRO | https://release-monitoring.org/project/02605 | 3.8.0 | 3.9.0 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202302 | ORPH pdbg | DISTRO | https://release-monitoring.org/project/21378 | 3.5 | 3.6 | perl-class-method-modifiers | DISTRO | https://release-monitoring.org/project/06735 | 2.13 | 2.14 | perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.89 | 6.90 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-file-sharedir-install | DISTRO | https://release-monitoring.org/project/11851 | 0.13 | 0.14 | perl-gdgraph | DISTRO | https://release-monitoring.org/project/09187 | 1.54 | 1.56 | perl-html-parser | DISTRO | https://release-monitoring.org/project/02967 | 3.80 | 3.81 | perl-http-daemon | DISTRO | https://release-monitoring.org/project/02975 | 6.14 | 6.16 | perl-image-exiftool | DISTRO | https://release-monitoring.org/project/06175 | 12.50 | 12.57 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.080 | 2.081 | perl-json-maybexs | DISTRO | https://release-monitoring.org/project/11953 | 1.004003 | 1.004004 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20220520 | 1.20230212 | perl-mime-tools | DISTRO | https://release-monitoring.org/project/11809 | 5.509 | 5.510 | perl-mojolicious-plugin-aut... | DISTRO | https://release-monitoring.org/project/21729 | 1.37 | 1.39 | perl-moo | DISTRO | https://release-monitoring.org/project/03123 | 2.005004 | 2.005005 | perl-net-ssh2 | DISTRO | https://release-monitoring.org/project/03163 | 0.72 | 0.73 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.93_01 | 1.92 | perl-package-stash | DISTRO | https://release-monitoring.org/project/11885 | 0.39 | 0.40 | perl-plack | DISTRO | https://release-monitoring.org/project/06578 | 1.0048 | 1.0050 | perl-sub-install | DISTRO | https://release-monitoring.org/project/03345 | 0.928 | 0.929 | perl-sub-quote | DISTRO | https://release-monitoring.org/project/12678 | 2.006006 | 2.006008 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-type-tiny | DISTRO | https://release-monitoring.org/project/14406 | 1.012004 | 2.002001 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0208 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.22 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-memcached | DISTRO | https://release-monitoring.org/project/17400 | 3.1.5 | 3.2.0 | ORPH php-pam | DISTRO | https://release-monitoring.org/project/241707 | 2.2.3 | 2.2.4 | php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.2.0 | pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.65 | 0.3.66 | pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.9.4 | ORPH pngquant | DISTRO | https://release-monitoring.org/project/03674 | 2.17.0 | 3.0.1 | poco | DISTRO | https://release-monitoring.org/project/05418 | 1.12.2 | 1.12.4 | policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 22.10.0 | 23.02.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.10 | 1.3.11 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.15 | privoxy | DISTRO | https://release-monitoring.org/project/03712 | 3.0.33 | 3.0.34 | ORPH procps-ng | DISTRO | https://release-monitoring.org/project/03708 | 3.3.17 | 4.0.3 | ORPH proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 9.1.1 | prosody | DISTRO | https://release-monitoring.org/project/03709 | 0.11.14 | 0.12.3 | protobuf | DISTRO | https://release-monitoring.org/project/03715 | 21.12 | 22.0 | pru-software-support | DISTRO | https://release-monitoring.org/project/21825 | 6.0.1 | 6.1.0 | psmisc | DISTRO | https://release-monitoring.org/project/03721 | 23.5 | 23.6 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH putty | DISTRO | https://release-monitoring.org/project/05749 | 0.76 | 0.78 | python-aexpect | DISTRO | https://release-monitoring.org/project/12442 | 1.6.4 | 1.7.0 | python-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.5.1 | 0.6.0 | python-aiofiles | DISTRO | https://release-monitoring.org/project/12743 | 22.1.0 | 23.1.0 | python-aiohttp | DISTRO | https://release-monitoring.org/project/06713 | 3.8.3 | 3.8.4 | python-aiohttp-jinja2 | DISTRO | https://release-monitoring.org/project/21247 | 1.5 | 1.5.1 | python-alembic | DISTRO | https://release-monitoring.org/project/03766 | 1.9.1 | 1.9.4 | python-argh | DISTRO | https://release-monitoring.org/project/09299 | 0.26.2 | 0.28.1 | python-async-lru | DISTRO | https://release-monitoring.org/project/56566 | 1.0.3 | 2.0.2 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 22.12.1 | 23.1.2 | python-beautifulsoup4 | DISTRO | https://release-monitoring.org/project/03779 | 4.11.1 | 4.11.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.26.45 | 1.26.79 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.29.45 | 1.29.79 | python-bottle | DISTRO | https://release-monitoring.org/project/11101 | 0.12.23 | 0.12.24 | python-bsdiff4 | DISTRO | https://release-monitoring.org/project/44268 | 1.2.2 | 1.2.3 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.6.1 | python-dbus-fast | DISTRO | https://release-monitoring.org/project/287975 | 1.84.0 | 1.84.2 | python-dnspython | DISTRO | https://release-monitoring.org/project/13190 | 2.2.1 | 2.3.0 | python-dtschema | DISTRO | https://release-monitoring.org/project/100908 | 2022.12 | 2023.1 | python-esptool | DISTRO | https://release-monitoring.org/project/11619 | 4.4 | 4.5 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 2.2.2 | 2.2.3 | python-flask-babel | DISTRO | https://release-monitoring.org/project/20024 | 2.0.0 | 3.0.1 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 3.0.2 | 3.0.3 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 1.0.1 | 1.1.1 | python-flatbuffers | DISTRO | https://release-monitoring.org/project/85010 | 2.0.7 | 23.1.21 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.31 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.10 | python-hatchling | DISTRO | https://release-monitoring.org/project/185085 | 1.12.2 | 1.13.0 | python-hiredis | DISTRO | https://release-monitoring.org/project/12002 | 2.0.0 | 2.2.2 | python-iptables | DISTRO | https://release-monitoring.org/project/11475 | 1.0.0 | 1.0.1 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 8.8.0 | 8.10.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-jaraco-functools | DISTRO | https://release-monitoring.org/project/20165 | 3.5.2 | 3.6.0 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.6 | 2.4.8 | python-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.1.1 | 2.1.2 | python-marshmallow-sqlalchemy | DISTRO | https://release-monitoring.org/project/50566 | 0.28.1 | 0.28.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.7.0 | python-maturin | DISTRO | https://release-monitoring.org/project/42653 | 0.14.13 | 0.14.14 | python-mbstrdecoder | DISTRO | https://release-monitoring.org/project/21702 | 1.1.1 | 1.1.2 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 2.0.4 | 2.0.5 | python-modbus-tk | DISTRO | https://release-monitoring.org/project/22813 | 1.1.2 | 1.1.3 | python-mpd2 | DISTRO | https://release-monitoring.org/project/19721 | 3.0.5 | 3.1.0 | python-mypy-extensions | DISTRO | https://release-monitoring.org/project/23367 | 0.4.3 | 1.0.0 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.23.5 | 1.24.2 | python-orjson | DISTRO | https://release-monitoring.org/project/31737 | 3.8.4 | 3.8.6 | python-packaging | DISTRO | https://release-monitoring.org/project/11718 | 22.0 | 23.0 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.12.0 | 3.0.0 | python-pathspec | DISTRO | https://release-monitoring.org/project/15607 | 0.10.3 | 0.11.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.11.0 | 5.11.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 22.3.1 | 23.0.1 | python-prompt-toolkit | DISTRO | https://release-monitoring.org/project/08742 | 3.0.36 | 3.0.37 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 21.12 | 22.0 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.16.0 | 3.17 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.10.4 | 1.10.5 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.3 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 3.0.2 | 3.1.3 | python-pypa-build | DISTRO | https://release-monitoring.org/project/132276 | 0.9.0 | 0.10.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.15.6 | 5.15.9 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.7.3 | 0.7.5 | python-pysmb | DISTRO | https://release-monitoring.org/project/21589 | 1.2.9 | 1.2.9.1 | python-pyspnego | DISTRO | https://release-monitoring.org/project/107092 | 0.7.0 | 0.8.0 | python-pytest | DISTRO | https://release-monitoring.org/project/03765 | 7.2.0 | 7.2.1 | python-pythran | DISTRO | https://release-monitoring.org/project/21140 | 0.12.0 | 0.12.1 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2022.7 | 2022.7.1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 24.0.1 | 25.0.0b1 | python-qrcode | DISTRO | https://release-monitoring.org/project/20011 | 7.3.1 | 7.4.2 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 4.4.0 | 4.5.1 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.28.1 | 2.28.2 | python-rtoml | DISTRO | https://release-monitoring.org/project/62048 | 0.8.0 | 0.9.0 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-scipy | DISTRO | https://release-monitoring.org/project/04768 | 1.8.1 | 1.10.1 | python-selenium | DISTRO | https://release-monitoring.org/project/05645 | 4.8.0 | 4.8.2 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.12.1 | 1.15.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 65.6.3 | 67.4.0 | python-sh | DISTRO | https://release-monitoring.org/project/10429 | 1.14.3 | 2.0.2 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.18.1 | 3.18.3 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.19.25 | 6.7.7 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.3.2.post1 | 2.4 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.4.42 | 2.0.4 | python-systemd | DISTRO | https://release-monitoring.org/project/07314 | 234 | 235 | python-tabledata | DISTRO | https://release-monitoring.org/project/21613 | 1.3.0 | 1.3.1 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 5.2.0 | 5.2.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.4 | 1.1.6 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.8.0 | 5.9.0 | python-txaio | DISTRO | https://release-monitoring.org/project/07202 | 22.2.1 | 23.1.1 | python-txtorcon | DISTRO | https://release-monitoring.org/project/19661 | 22.0.0 | 23.0.0 | python-typeguard | DISTRO | https://release-monitoring.org/project/38819 | 2.13.3 | 3.0.0b2 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 4.4.0 | 4.5.0 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.13 | 1.26.14 | python-watchdog | DISTRO | https://release-monitoring.org/project/05341 | 2.2.1 | 2.3.0 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.2.5 | 0.2.6 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 57.2 | 58.0b1 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.23.0 | 2.23.1 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 1.4.2 | 1.5.1 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 2.2.2 | 2.2.3 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.32 | 0.33 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.6 | 3.0.8 | python-zc-lockfile | DISTRO | https://release-monitoring.org/project/04100 | 2.0 | 3.0 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.39.4 | 0.47.3 | python-zlmdb | DISTRO | https://release-monitoring.org/project/66674 | 22.6.1 | 23.1.1 | qcom-db410c-firmware | DISTRO | https://release-monitoring.org/project/235382 | 1034.2.1 | 1036.1 | qlibc | DISTRO | https://release-monitoring.org/project/21737 | 2.4.7 | 2.4.8 | ORPH qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 11.3.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.38.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.8 | 6.4.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.3 | 1.4 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-c | DISTRO | https://release-monitoring.org/project/13768 | 0.11.0 | 0.13.0 | ragel | DISTRO | https://release-monitoring.org/project/12105 | 6.10 | 7.0.4 | ORPH ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | raspberrypi-usbboot | DISTRO | https://release-monitoring.org/project/115700 | 2021.07.01 | 20221215-... | ORPH redis | DISTRO | https://release-monitoring.org/project/04181 | 7.0.7 | 7.0.8 | refpolicy | DISTRO | https://release-monitoring.org/project/21663 | 2.20220106 | 2.20221101 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.5 | 2.0.1 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 7.9.2 | rrdtool | DISTRO | https://release-monitoring.org/project/04214 | 1.7.2 | 1.8.0 | ORPH rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2204.1 | 8.2302.0 | ORPH rt-tests | DISTRO | https://release-monitoring.org/project/59450 | 2.4 | 2.5 | rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.1.0 | ruby | DISTRO | https://release-monitoring.org/project/04223 | 3.1.3 | 3.2.1 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.42.1 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.11.1.2 | 2.11.3.0 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.4 | 2.3.5.5 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.8.0 | 1.1.0.0 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.6.0.0 | 2.6.1.2 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.5.1.1 | 2.5.1.3 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.5.0 | 2.3.0.1 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.3.2 | 0.5.4.1 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.12 | 4.17.5 | sane-backends | DISTRO | https://release-monitoring.org/project/04760 | 1.1.1 | 1.2.1 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.4.0 | sdl2_image | DISTRO | https://release-monitoring.org/project/04781 | 2.6.2 | 2.6.3 | sdl2_mixer | DISTRO | https://release-monitoring.org/project/04782 | 2.0.4 | 2.6.3 | ORPH sdl2_net | DISTRO | https://release-monitoring.org/project/04783 | 2.0.1 | 2.2.0 | ORPH sdl2_ttf | DISTRO | https://release-monitoring.org/project/04784 | 2.20.1 | 2.20.2 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdl_sound | DISTRO | https://release-monitoring.org/project/10262 | 1.0.3 | 2.0.1 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | selinux-python | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.5 | semodule-utils | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.5 | ORPH sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 2.8.0 | 2.13.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.6.0 | ser2net | DISTRO | https://release-monitoring.org/project/21655 | 4.3.8 | 4.3.11 | serd | DISTRO | https://release-monitoring.org/project/230531 | 0.30.14 | 0.30.16 | setools | DISTRO | https://release-monitoring.org/project/08951 | 4.4.0 | 4.4.1 | ORPH shairport-sync | DISTRO | https://release-monitoring.org/project/21384 | 3.3.9 | 4.1.1 | ORPH shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.2 | ORPH shim | DISTRO | https://release-monitoring.org/project/10719 | 15.4 | 15.7 | signal-estimator | DISTRO | https://release-monitoring.org/project/284559 | v0.0.4 | 0.0.5 | ORPH sispmctl | DISTRO | https://release-monitoring.org/project/21653 | 4.9 | 4.10 | skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.12.0.1 | 2.13.1.0 | snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.10 | 3.5.0 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.40.0 | 3.1.56.0 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.12 | 1.13.14 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sord | DISTRO | https://release-monitoring.org/project/230536 | 0.16.12 | 0.16.14 | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | spawn-fcgi | DISTRO | https://release-monitoring.org/project/05388 | 1.6.4 | 1.6.5 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice | DISTRO | https://release-monitoring.org/project/04871 | 0.15.0 | 0.15.1 | sqlcipher | DISTRO | https://release-monitoring.org/project/11213 | 4.5.1 | 4.5.3 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.40.1 | 3.41.0 | sshpass | DISTRO | https://release-monitoring.org/project/12961 | 1.09 | 1.10 | start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.21 | ORPH strace | DISTRO | https://release-monitoring.org/project/04897 | 6.1 | 6.2 | stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.5 | 1.0.7 | stress-ng | DISTRO | https://release-monitoring.org/project/12538 | 0.13.05 | 0.15.04 | strongswan | DISTRO | https://release-monitoring.org/project/04899 | 5.9.8 | 5.9.9 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.65 | 5.68 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.5 | ORPH suricata | DISTRO | https://release-monitoring.org/project/10925 | 6.0.6 | 6.0.10 | sway | DISTRO | https://release-monitoring.org/project/11497 | 1.7 | 1.8.1 | synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.29.3 | 0.30.2 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.38.1 | 4.0.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.46.0 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.6.1 | 12.6.2 | ORPH system-config-printer | DISTRO | https://release-monitoring.org/project/08855 | 1.5.15 | 1.5.18 | ORPH systemd | DISTRO | https://release-monitoring.org/project/05440 | 252.4 | 253 | systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.04 | ORPH tbb | DISTRO | https://release-monitoring.org/project/08217 | 2021.5.0 | 2021.8.0 | tcl | DISTRO | https://release-monitoring.org/project/04941 | 8.6.12 | 8.6.13 | ORPH tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | ORPH tcllib | DISTRO | https://release-monitoring.org/project/04943 | 1.20 | 1.21 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.4.2 | 4.4.3 | ORPH terminology | DISTRO | https://release-monitoring.org/project/04951 | 1.12.1 | 1.13.0 | tesseract-ocr | DISTRO | https://release-monitoring.org/project/04954 | 5.0.1 | 5.3.0 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.5.1 | 2.5.2 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.18.0 | ORPH timescaledb | DISTRO | https://release-monitoring.org/project/17545 | 2.9.3 | 2.10.0 | tinifier | DISTRO | https://release-monitoring.org/project/241900 | 3.4.0 | 4.1.0 | tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20220801 | 20230101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tio | DISTRO | https://release-monitoring.org/project/20587 | 1.47 | 2.5 | tk | DISTRO | https://release-monitoring.org/project/11426 | 8.6.12 | 8.6.13 | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 3.0.0 | ORPH tpm2-pkcs11 | DISTRO | https://release-monitoring.org/project/18777 | 1.8.0 | 1.9.0 | tpm2-tools | DISTRO | https://release-monitoring.org/project/12841 | 5.2 | 5.5 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.1.0 | 4.0.1 | ORPH trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | 2.9.7 | 3.1.6 | traceroute | DISTRO | https://release-monitoring.org/project/14877 | 2.1.0 | 2.1.2 | transmission | DISTRO | https://release-monitoring.org/project/05002 | 3.00 | 4.0.1 | tree | DISTRO | https://release-monitoring.org/project/05006 | 2.0.2 | 2.1.0 | tzdata | DISTRO | https://release-monitoring.org/project/05021 | 2022f | 2022g | uacme | DISTRO | https://release-monitoring.org/project/22795 | 1.7.3 | 1.7.4 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2023.01 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.12 | 0.13.1 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 4.3.0.0 | 4.4.0.0 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 3.2 | ORPH unrar | DISTRO | https://release-monitoring.org/project/13306 | 6.1.7 | 6.2.6 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.7.2 | ORPH upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.19 | 1.90.0 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.56.4 | ORPH valgrind | DISTRO | https://release-monitoring.org/project/13639 | 3.19.0 | 3.20.0 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.7 | 1.0 | ORPH vdr | DISTRO | https://release-monitoring.org/project/05069 | 2.6.3 | 2.6.4 | vim | DISTRO | https://release-monitoring.org/project/05092 | 9.0.1260 | 9.0.1355 | ORPH vis-network | DISTRO | https://release-monitoring.org/project/270536 | 9.1.0 | 9.1.4 | volk | DISTRO | https://release-monitoring.org/project/147733 | 2.5.2 | 3.0.0 | vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vte | DISTRO | https://release-monitoring.org/project/10895 | 0.66.2 | 0.70.3 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.45 | 3.2.47 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.242 | ORPH waf | DISTRO | https://release-monitoring.org/project/05116 | 2.0.24 | 2.0.25 | wavpack | DISTRO | https://release-monitoring.org/project/05121 | 5.5.0 | 5.6.0 | ORPH waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 1.0.0 | webp | DISTRO | https://release-monitoring.org/project/01761 | 1.2.4 | 1.3.0 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH weston | DISTRO | https://release-monitoring.org/project/13745 | 10.0.1 | 11.0.1 | whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.14 | 5.5.15 | wine | DISTRO | https://release-monitoring.org/project/05134 | 8.0 | 8.2 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.8 | 0.4.13 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.15.1 | 0.16.2 | wtfutil | DISTRO | https://release-monitoring.org/project/243189 | 0.41.0 | 0.43.0 | xapian | DISTRO | https://release-monitoring.org/project/15919 | 1.4.19 | 1.4.22 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20230201 | xdata_xbitmaps | DISTRO | https://release-monitoring.org/project/13645 | 1.1.2 | 1.1.3 | xdata_xcursor-themes | DISTRO | https://release-monitoring.org/project/15905 | 1.0.6 | 1.0.7 | xdriver_xf86-video-amdgpu | DISTRO | https://release-monitoring.org/project/15900 | 22.0.0 | 23.0.0 | xdriver_xf86-video-ark | DISTRO | https://release-monitoring.org/project/21712 | 0.7.5 | 0.7.6 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.5 | 4.17.0 | xfsprogs | DISTRO | https://release-monitoring.org/project/05188 | 5.14.2 | 6.1.1 | ORPH xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.37 | 2.38 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 6.03 | 6.06.1 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.22 | 3.23 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 376 | 379 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.1 | 0.3.2 | xz | DISTRO | https://release-monitoring.org/project/05277 | 5.2.10 | 5.4.1 | ORPH yad | DISTRO | https://release-monitoring.org/project/05280 | 0.40.0 | 12.3 | zchunk | DISTRO | https://release-monitoring.org/project/178035 | 1.2.2 | 1.3.0 | zeek | DISTRO | https://release-monitoring.org/project/267106 | 4.1.1 | 5.1.3 | zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.1.7 | 2.1.9 | zic | DISTRO | https://release-monitoring.org/project/16905 | 2022f | 2022g | zxing-cpp | DISTRO | https://release-monitoring.org/project/101246 | 1.4.0 | 2.0.0 | Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 containerd | CVE-2023-25153 | https://security-tracker.debian.org/tracker/CVE-2023-25153 containerd | CVE-2023-25173 | https://security-tracker.debian.org/tracker/CVE-2023-25173 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2023-25725 | https://security-tracker.debian.org/tracker/CVE-2023-25725 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nodejs | CVE-2023-23936 | https://security-tracker.debian.org/tracker/CVE-2023-23936 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-ipython | CVE-2023-24816 | https://security-tracker.debian.org/tracker/CVE-2023-24816 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-werkzeug | CVE-2023-23934 | https://security-tracker.debian.org/tracker/CVE-2023-23934 python-werkzeug | CVE-2023-25577 | https://security-tracker.debian.org/tracker/CVE-2023-25577 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 speechd | CVE-2001-0956 | https://security-tracker.debian.org/tracker/CVE-2001-0956 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the 'next' branch -------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 containerd | CVE-2023-25153 | https://security-tracker.debian.org/tracker/CVE-2023-25153 containerd | CVE-2023-25173 | https://security-tracker.debian.org/tracker/CVE-2023-25173 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2023-25725 | https://security-tracker.debian.org/tracker/CVE-2023-25725 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nodejs | CVE-2023-23936 | https://security-tracker.debian.org/tracker/CVE-2023-23936 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-ipython | CVE-2023-24816 | https://security-tracker.debian.org/tracker/CVE-2023-24816 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-werkzeug | CVE-2023-23934 | https://security-tracker.debian.org/tracker/CVE-2023-23934 python-werkzeug | CVE-2023-25577 | https://security-tracker.debian.org/tracker/CVE-2023-25577 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 shadow | CVE-2013-4235 | https://security-tracker.debian.org/tracker/CVE-2013-4235 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 speechd | CVE-2001-0956 | https://security-tracker.debian.org/tracker/CVE-2001-0956 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 containerd | CVE-2023-25153 | https://security-tracker.debian.org/tracker/CVE-2023-25153 containerd | CVE-2023-25173 | https://security-tracker.debian.org/tracker/CVE-2023-25173 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dropbear | CVE-2021-36369 | https://security-tracker.debian.org/tracker/CVE-2021-36369 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 git | CVE-2023-22490 | https://security-tracker.debian.org/tracker/CVE-2023-22490 git | CVE-2023-22743 | https://security-tracker.debian.org/tracker/CVE-2023-22743 git | CVE-2023-23946 | https://security-tracker.debian.org/tracker/CVE-2023-23946 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-3998 | https://security-tracker.debian.org/tracker/CVE-2021-3998 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2021-3981 | https://security-tracker.debian.org/tracker/CVE-2021-3981 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2022-0711 | https://security-tracker.debian.org/tracker/CVE-2022-0711 haproxy | CVE-2023-25725 | https://security-tracker.debian.org/tracker/CVE-2023-25725 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 less | CVE-2022-46663 | https://security-tracker.debian.org/tracker/CVE-2022-46663 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libbpf | CVE-2021-45940 | https://security-tracker.debian.org/tracker/CVE-2021-45940 libbpf | CVE-2021-45941 | https://security-tracker.debian.org/tracker/CVE-2021-45941 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libopenssl | CVE-2022-4304 | https://security-tracker.debian.org/tracker/CVE-2022-4304 libopenssl | CVE-2022-4450 | https://security-tracker.debian.org/tracker/CVE-2022-4450 libopenssl | CVE-2023-0215 | https://security-tracker.debian.org/tracker/CVE-2023-0215 libopenssl | CVE-2023-0286 | https://security-tracker.debian.org/tracker/CVE-2023-0286 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libxslt | CVE-2022-29824 | https://security-tracker.debian.org/tracker/CVE-2022-29824 lighttpd | CVE-2022-41556 | https://security-tracker.debian.org/tracker/CVE-2022-41556 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mender | CVE-2022-29555 | https://security-tracker.debian.org/tracker/CVE-2022-29555 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 nodejs | CVE-2022-35256 | https://security-tracker.debian.org/tracker/CVE-2022-35256 nodejs | CVE-2022-43548 | https://security-tracker.debian.org/tracker/CVE-2022-43548 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 patchelf | CVE-2022-44940 | https://security-tracker.debian.org/tracker/CVE-2022-44940 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php | CVE-2023-0568 | https://security-tracker.debian.org/tracker/CVE-2023-0568 php | CVE-2023-0662 | https://security-tracker.debian.org/tracker/CVE-2023-0662 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 proftpd | CVE-2021-46854 | https://security-tracker.debian.org/tracker/CVE-2021-46854 python-aiohttp | CVE-2022-33124 | https://security-tracker.debian.org/tracker/CVE-2022-33124 python-cryptography | CVE-2023-23931 | https://security-tracker.debian.org/tracker/CVE-2023-23931 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-django | CVE-2023-24580 | https://security-tracker.debian.org/tracker/CVE-2023-24580 python-ipython | CVE-2023-24816 | https://security-tracker.debian.org/tracker/CVE-2023-24816 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-45198 | https://security-tracker.debian.org/tracker/CVE-2022-45198 python-pillow | CVE-2022-45199 | https://security-tracker.debian.org/tracker/CVE-2022-45199 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pyjwt | CVE-2022-29217 | https://security-tracker.debian.org/tracker/CVE-2022-29217 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python-web2py | CVE-2022-33146 | https://security-tracker.debian.org/tracker/CVE-2022-33146 python-werkzeug | CVE-2022-29361 | https://security-tracker.debian.org/tracker/CVE-2022-29361 python-werkzeug | CVE-2023-23934 | https://security-tracker.debian.org/tracker/CVE-2023-23934 python-werkzeug | CVE-2023-25577 | https://security-tracker.debian.org/tracker/CVE-2023-25577 python3 | CVE-2022-42919 | https://security-tracker.debian.org/tracker/CVE-2022-42919 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3611 | https://security-tracker.debian.org/tracker/CVE-2021-3611 qemu | CVE-2021-3750 | https://security-tracker.debian.org/tracker/CVE-2021-3750 qemu | CVE-2021-3929 | https://security-tracker.debian.org/tracker/CVE-2021-3929 qemu | CVE-2021-3947 | https://security-tracker.debian.org/tracker/CVE-2021-3947 qemu | CVE-2021-4158 | https://security-tracker.debian.org/tracker/CVE-2021-4158 qemu | CVE-2021-4206 | https://security-tracker.debian.org/tracker/CVE-2021-4206 qemu | CVE-2021-4207 | https://security-tracker.debian.org/tracker/CVE-2021-4207 qemu | CVE-2022-0358 | https://security-tracker.debian.org/tracker/CVE-2022-0358 qemu | CVE-2022-26353 | https://security-tracker.debian.org/tracker/CVE-2022-26353 qemu | CVE-2022-26354 | https://security-tracker.debian.org/tracker/CVE-2022-26354 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-35414 | https://security-tracker.debian.org/tracker/CVE-2022-35414 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 rabbitmq-server | CVE-2021-22116 | https://security-tracker.debian.org/tracker/CVE-2021-22116 rabbitmq-server | CVE-2021-22117 | https://security-tracker.debian.org/tracker/CVE-2021-22117 rabbitmq-server | CVE-2021-32718 | https://security-tracker.debian.org/tracker/CVE-2021-32718 rabbitmq-server | CVE-2021-32719 | https://security-tracker.debian.org/tracker/CVE-2021-32719 rabbitmq-server | CVE-2022-31008 | https://security-tracker.debian.org/tracker/CVE-2022-31008 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 rpm | CVE-2021-3521 | https://security-tracker.debian.org/tracker/CVE-2021-3521 rpm | CVE-2021-35937 | https://security-tracker.debian.org/tracker/CVE-2021-35937 rpm | CVE-2021-35938 | https://security-tracker.debian.org/tracker/CVE-2021-35938 rpm | CVE-2021-35939 | https://security-tracker.debian.org/tracker/CVE-2021-35939 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unbound | CVE-2022-30698 | https://security-tracker.debian.org/tracker/CVE-2022-30698 unbound | CVE-2022-30699 | https://security-tracker.debian.org/tracker/CVE-2022-30699 unbound | CVE-2022-3204 | https://security-tracker.debian.org/tracker/CVE-2022-3204 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 usbguard | CVE-2019-25058 | https://security-tracker.debian.org/tracker/CVE-2019-25058 wavpack | CVE-2022-2476 | https://security-tracker.debian.org/tracker/CVE-2022-2476 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xerces | CVE-2018-1311 | https://security-tracker.debian.org/tracker/CVE-2018-1311 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 containerd | CVE-2023-25153 | https://security-tracker.debian.org/tracker/CVE-2023-25153 containerd | CVE-2023-25173 | https://security-tracker.debian.org/tracker/CVE-2023-25173 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 git | CVE-2023-22490 | https://security-tracker.debian.org/tracker/CVE-2023-22490 git | CVE-2023-22743 | https://security-tracker.debian.org/tracker/CVE-2023-22743 git | CVE-2023-23946 | https://security-tracker.debian.org/tracker/CVE-2023-23946 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2023-25725 | https://security-tracker.debian.org/tracker/CVE-2023-25725 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 less | CVE-2022-46663 | https://security-tracker.debian.org/tracker/CVE-2022-46663 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libopenssl | CVE-2022-4304 | https://security-tracker.debian.org/tracker/CVE-2022-4304 libopenssl | CVE-2022-4450 | https://security-tracker.debian.org/tracker/CVE-2022-4450 libopenssl | CVE-2023-0215 | https://security-tracker.debian.org/tracker/CVE-2023-0215 libopenssl | CVE-2023-0286 | https://security-tracker.debian.org/tracker/CVE-2023-0286 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 nodejs | CVE-2023-23936 | https://security-tracker.debian.org/tracker/CVE-2023-23936 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php | CVE-2023-0568 | https://security-tracker.debian.org/tracker/CVE-2023-0568 php | CVE-2023-0662 | https://security-tracker.debian.org/tracker/CVE-2023-0662 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-cryptography | CVE-2023-23931 | https://security-tracker.debian.org/tracker/CVE-2023-23931 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-django | CVE-2023-24580 | https://security-tracker.debian.org/tracker/CVE-2023-24580 python-ipython | CVE-2023-24816 | https://security-tracker.debian.org/tracker/CVE-2023-24816 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python-werkzeug | CVE-2023-23934 | https://security-tracker.debian.org/tracker/CVE-2023-23934 python-werkzeug | CVE-2023-25577 | https://security-tracker.debian.org/tracker/CVE-2023-25577 python3 | CVE-2022-42919 | https://security-tracker.debian.org/tracker/CVE-2022-42919 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 timescaledb | CVE-2023-25149 | https://security-tracker.debian.org/tracker/CVE-2023-25149 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xerces | CVE-2018-1311 | https://security-tracker.debian.org/tracker/CVE-2018-1311 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From d.lang at abatec.at Mon Feb 27 08:46:13 2023 From: d.lang at abatec.at (Lang Daniel) Date: Mon, 27 Feb 2023 08:46:13 +0000 Subject: [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: Signed-off-by: Daniel Lang --- 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 11dc5cce07..5cbef197ab 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.14" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" 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 52eb534b40..f45b244e6b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz +sha256 a27076011efec7ad11e9ed0644f512c34cab4c5ed5ba42cfe71c83fabebe810d linux-6.1.14.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz -sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz -sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz +sha256 348d974c143fdef8517ec703fdaa24bade12a49047848be92cb9e3253b19ef98 linux-5.15.96.tar.xz +sha256 a2b51876befb8cc35724ed62820845f2b387d471a6cf46e8eedd0b6cb595825f linux-5.10.170.tar.xz +sha256 5a1e5754b4f2a4fe73b119d810ecda2ce07ecfb6f6cbbd16547c9ecd30b97627 linux-5.4.233.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz -sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz +sha256 4e1c1555c306874e0477d1af282d04a4efb285121456ab3f79519c92e406b701 linux-4.14.307.tar.xz +sha256 64a265a193c9e3e14d1397278e2348386ef6d6043af76d693c0fbbafed345ca8 linux-4.19.274.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 18c179ec8d..ae40520c51 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -384,12 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.305" if BR2_KERNEL_HEADERS_4_14 - default "4.19.272" if BR2_KERNEL_HEADERS_4_19 - default "5.4.231" if BR2_KERNEL_HEADERS_5_4 - default "5.10.167" if BR2_KERNEL_HEADERS_5_10 - default "5.15.93" if BR2_KERNEL_HEADERS_5_15 - default "6.1.11" if BR2_KERNEL_HEADERS_6_1 + default "4.14.307" if BR2_KERNEL_HEADERS_4_14 + default "4.19.274" if BR2_KERNEL_HEADERS_4_19 + default "5.4.233" if BR2_KERNEL_HEADERS_5_4 + default "5.10.170" if BR2_KERNEL_HEADERS_5_10 + default "5.15.96" if BR2_KERNEL_HEADERS_5_15 + default "6.1.14" if BR2_KERNEL_HEADERS_6_1 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.25.1 From d.lang at abatec.at Mon Feb 27 08:46:25 2023 From: d.lang at abatec.at (Lang Daniel) Date: Mon, 27 Feb 2023 08:46:25 +0000 Subject: [Buildroot] [PATCH 3/3] linux: bump _KERNEL_LATEST_VERSION to 6.2 Message-ID: Signed-off-by: Daniel Lang --- linux/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 5cbef197ab..495fc48997 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,8 +28,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.1)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.2)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.162-cip24)" @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.2.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ -- 2.25.1 From d.lang at abatec.at Mon Feb 27 08:46:19 2023 From: d.lang at abatec.at (Lang Daniel) Date: Mon, 27 Feb 2023 08:46:19 +0000 Subject: [Buildroot] [PATCH 2/3] {toolchain, linux-headers}: add support for 6.2 headers Message-ID: Signed-off-by: Daniel Lang --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index f45b244e6b..75f1342313 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 2fcc07e1c90ea4ce148f50f9beeb0dca0b6e4b379a768de8abc7a4a26f252534 linux-6.2.1.tar.xz sha256 a27076011efec7ad11e9ed0644f512c34cab4c5ed5ba42cfe71c83fabebe810d linux-6.1.14.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 348d974c143fdef8517ec703fdaa24bade12a49047848be92cb9e3253b19ef98 linux-5.15.96.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ae40520c51..9b4fa2bb12 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_1 + default BR2_KERNEL_HEADERS_6_2 help Select the kernel version to get headers from. @@ -48,6 +48,10 @@ config BR2_KERNEL_HEADERS_5_15 config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + +config BR2_KERNEL_HEADERS_6_2 + bool "Linux 6.2.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -125,8 +129,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_2 + bool "6.2.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1 - bool "6.1.x or later" + bool "6.1.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0 @@ -390,6 +398,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.170" if BR2_KERNEL_HEADERS_5_10 default "5.15.96" if BR2_KERNEL_HEADERS_5_15 default "6.1.14" if BR2_KERNEL_HEADERS_6_1 + default "6.2.1" if BR2_KERNEL_HEADERS_6_2 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 \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 08e4ccad9e..80b2dbde4d 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -600,6 +600,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -613,6 +617,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 default "6.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 default "6.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 default "5.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 1c39334ddd..8f3905b8d7 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -127,8 +127,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_2 + bool "6.2.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_1 - bool "6.1.x or later" + bool "6.1.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_0 -- 2.25.1 From thomas at devoogdt.com Mon Feb 27 10:39:54 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:39:54 +0100 Subject: [Buildroot] [PATCH v2 1/3] pkg-cmake: add option to select the Ninja generator In-Reply-To: <20230224111509.2434694-3-thomas.devoogdt@barco.com> References: <20230224111509.2434694-3-thomas.devoogdt@barco.com> Message-ID: <20230227103956.128236-1-thomas.devoogdt@barco.com> E.g. Commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 can now be replaced by: WEBKITGTK_CMAKE_NINJA = YES Packages that are selecting Ninja (or overtime another generator), should also use the _BUILD_{ENV,OPTS} variables iso the _MAKE variables. No _INSTALL{,_STAGING,_TARGET}_OPTS used so far: $ grep '_INSTALL_OPTS' $(grep -rl "cmake-package" package/*/*.mk) $ grep '_INSTALL_STAGING_OPTS' $(grep -rl "cmake-package" package/*/*.mk) $ grep '_INSTALL_TARGET_OPTS' $(grep -rl "cmake-package" package/*/*.mk) The _MAKE_{ENV,OPTS} are translated to _BUILD_{ENV,OPTS}: $ grep '_MAKE_ENV =' $(grep -rl "cmake-package" package/*/*.mk) > package/netopeer2/netopeer2.mk:NETOPEER2_MAKE_ENV = \ > package/racehound/racehound.mk:RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) $ grep '_MAKE_OPTS =' $(grep -rl "cmake-package" package/*/*.mk) > package/mariadb/mariadb.mk:HOST_MARIADB_MAKE_OPTS = import_executables > package/zeek/zeek.mk:HOST_ZEEK_MAKE_OPTS = binpac bifcl Only "musepack" seems to overwrite MAKE to enforce -j1, so replace it: $ grep '_MAKE =' $(grep -rl "cmake-package" package/*/*.mk) > package/musepack/musepack.mk:MUSEPACK_MAKE = $(MAKE1) Signed-off-by: Thomas Devoogdt --- v2: made generator use more generic, other generators can now easily be added if required --- package/musepack/musepack.mk | 2 +- package/netopeer2/netopeer2.mk | 2 +- package/pkg-cmake.mk | 26 ++++++++++++++------------ package/racehound/racehound.mk | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk index fc66c684a5..d4dd08df36 100644 --- a/package/musepack/musepack.mk +++ b/package/musepack/musepack.mk @@ -9,7 +9,7 @@ MUSEPACK_SITE = http://files.musepack.net/source MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz MUSEPACK_DEPENDENCIES = libcuefile libreplaygain MUSEPACK_INSTALL_STAGING = YES -MUSEPACK_MAKE = $(MAKE1) +MUSEPACK_BUILD_OPTS = -j1 MUSEPACK_LICENSE = BSD-3-Clause (*mpcdec), LGPL-2.1+ (*mpcenc) MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 47fcd31acd..2ebb23eccd 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -24,7 +24,7 @@ NETOPEER2_CONF_OPTS = \ # affected mutualy. NETOPEER2_SYSREPO_SHM_PREFIX = sr_buildroot$(subst /,_,$(CONFIG_DIR))_netopeer2 -NETOPEER2_MAKE_ENV = \ +NETOPEER2_BUILD_ENV = \ SYSREPOCTL_EXECUTABLE=$(HOST_DIR)/bin/sysrepoctl \ SYSREPO_SHM_PREFIX=$(NETOPEER2_SYSREPO_SHM_PREFIX) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 8c375779cb..205a93db5f 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -51,11 +51,6 @@ endif define inner-cmake-package -$(2)_MAKE ?= $$(MAKE) -$(2)_INSTALL_OPTS ?= install -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast - $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES @@ -65,6 +60,13 @@ else $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build endif +ifeq ($$($(3)_CMAKE_NINJA),YES) +$(2)_DEPENDENCIES += host-ninja +$(2)_GENERATOR = "Ninja" +else +$(2)_GENERATOR = "Unix Makefiles" +endif + # # Configure step. Only define it if not already defined by the package # .mk file. And take care of the differences between host and target @@ -88,7 +90,7 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ @@ -119,7 +121,7 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -166,11 +168,11 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) $$(BUILD_OPTS) $$($$(PKG)_BUILD_OPTS) endef else define $(2)_BUILD_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) $$(BUILD_OPTS) $$($$(PKG)_BUILD_OPTS) endef endif endif @@ -181,7 +183,7 @@ endif # ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) endef endif @@ -191,7 +193,7 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(STAGING_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_STAGING_OPTS) endef endif @@ -201,7 +203,7 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(TARGET_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_TARGET_OPTS) endef endif diff --git a/package/racehound/racehound.mk b/package/racehound/racehound.mk index 6499e166d8..f63bb233f6 100644 --- a/package/racehound/racehound.mk +++ b/package/racehound/racehound.mk @@ -22,6 +22,6 @@ RACEHOUND_CONF_OPTS += \ -DKBUILD_VERSION_STRING=$(LINUX_VERSION_PROBED) # cross compile environment for linux kernel module -RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) +RACEHOUND_BUILD_ENV = $(LINUX_MAKE_FLAGS) $(eval $(cmake-package)) -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:39:55 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:39:55 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/webkitgtk: use the CMAKE_NINJA flag In-Reply-To: <20230227103956.128236-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-3-thomas.devoogdt@barco.com> <20230227103956.128236-1-thomas.devoogdt@barco.com> Message-ID: <20230227103956.128236-2-thomas.devoogdt@barco.com> Replaces: commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 Author: Peter Korsgaard Date: Thu Feb 9 18:07:05 2023 +0100 package/webkitgtk: Build with ninja Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Devoogdt --- package/webkitgtk/webkitgtk.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 3263f7fea0..b43f97f0ca 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -13,6 +13,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk +WEBKITGTK_CMAKE_NINJA = YES WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 @@ -139,23 +140,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# webkitgtk needs cmake >= 3.20 when not building with ninja, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WEBKITGTK_CONF_OPTS += -GNinja -WEBKITGTK_DEPENDENCIES += host-ninja - -define WEBKITGTK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - $(eval $(cmake-package)) -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:39:56 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:39:56 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/wpewebkit: use the CMAKE_NINJA flag In-Reply-To: <20230227103956.128236-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-3-thomas.devoogdt@barco.com> <20230227103956.128236-1-thomas.devoogdt@barco.com> Message-ID: <20230227103956.128236-3-thomas.devoogdt@barco.com> Replaces: commit 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd Author: Peter Korsgaard Date: Thu Feb 9 18:07:06 2023 +0100 package/wpewebkit: Build with ninja Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Devoogdt --- package/wpewebkit/wpewebkit.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 48e5c2f8cd..c1b5dee121 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -14,6 +14,7 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit +WPEWEBKIT_CMAKE_NINJA = YES WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo @@ -103,23 +104,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# wpewebkit needs cmake >= 3.20 when building with the make backend, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WPEWEBKIT_CONF_OPTS += -GNinja -WPEWEBKIT_DEPENDENCIES += host-ninja - -define WPEWEBKIT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - $(eval $(cmake-package)) -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:58:34 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:58:34 +0100 Subject: [Buildroot] [PATCH v5 1/5] package/at-spi2-core: bump to version 2.47.1 Message-ID: <20230227105838.358916-1-thomas.devoogdt@barco.com> From: Daniel Lang https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_47_1/NEWS - X11 is now optional. - libxml2 is no longer optional. - atk and at-spi2-atk have been merged into at-spi2-core. - atk introspection option added. Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) v5: rebased + grouped patches --- package/at-spi2-core/Config.in | 8 ++------ package/at-spi2-core/at-spi2-core.hash | 4 ++-- package/at-spi2-core/at-spi2-core.mk | 20 +++++++++++++++++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/package/at-spi2-core/Config.in b/package/at-spi2-core/Config.in index f56c5b93c4..1f6c421777 100644 --- a/package/at-spi2-core/Config.in +++ b/package/at-spi2-core/Config.in @@ -1,12 +1,12 @@ config BR2_PACKAGE_AT_SPI2_CORE bool "at-spi2-core" - depends on BR2_PACKAGE_XORG7 # xlib-libxtst depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2 depends on BR2_USE_MMU # glib2 depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_XORG7 # optionally for X11 help The At-Spi2 Core package is a part of the GNOME Accessibility Project. It provides a Service Provider @@ -19,7 +19,3 @@ config BR2_PACKAGE_AT_SPI2_CORE comment "at-spi2-core needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -comment "at-spi2-core depends on X.org" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_XORG7 diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index 764e4c3661..4531bf396c 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum -sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz +# From https://download.gnome.org/sources/at-spi2-core/2.47/at-spi2-core-2.47.1.sha256sum +sha256 c6ba7c160434edebf09d2936933569c936f6ec972301766f2bdac5a4d418153c at-spi2-core-2.47.1.tar.xz # locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index f0b019c0ed..e98e779884 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -4,17 +4,31 @@ # ################################################################################ -AT_SPI2_CORE_VERSION_MAJOR = 2.36 -AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 +AT_SPI2_CORE_VERSION_MAJOR = 2.47 +AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).1 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) AT_SPI2_CORE_LICENSE = LGPL-2.1+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES -AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \ +AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 libxml2 \ $(TARGET_NLS_DEPENDENCIES) AT_SPI2_CORE_CONF_OPTS = -Ddbus_daemon=/usr/bin/dbus-daemon +ifeq ($(BR2_PACKAGE_XORG7),y) +AT_SPI2_CORE_CONF_OPTS += -Dx11=enabled +AT_SPI2_CORE_DEPENDENCIES += xlib_libXtst +else +AT_SPI2_CORE_CONF_OPTS += -Dx11=disabled +endif + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +AT_SPI2_CORE_CONF_OPTS += -Dintrospection=enabled +AT_SPI2_CORE_DEPENDENCIES += gobject-introspection +else +AT_SPI2_CORE_CONF_OPTS += -Dintrospection=disabled +endif + AT_SPI2_CORE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) $(eval $(meson-package)) -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:58:35 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:58:35 +0100 Subject: [Buildroot] [PATCH v5 2/5] package/at-spi2-atk: remove package In-Reply-To: <20230227105838.358916-1-thomas.devoogdt@barco.com> References: <20230227105838.358916-1-thomas.devoogdt@barco.com> Message-ID: <20230227105838.358916-2-thomas.devoogdt@barco.com> From: Daniel Lang at-spi2-atk has been merged into at-spi2-core with version 2.45.1. https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_45_1/NEWS https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78 Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) v5: rebased + grouped patches --- Config.in.legacy | 7 +++ DEVELOPERS | 1 - package/Config.in | 1 - .../0001-meson-add-tests-option.patch | 43 ------------------- package/at-spi2-atk/Config.in | 22 ---------- package/at-spi2-atk/at-spi2-atk.hash | 5 --- package/at-spi2-atk/at-spi2-atk.mk | 19 -------- 7 files changed, 7 insertions(+), 91 deletions(-) delete mode 100644 package/at-spi2-atk/0001-meson-add-tests-option.patch delete mode 100644 package/at-spi2-atk/Config.in delete mode 100644 package/at-spi2-atk/at-spi2-atk.hash delete mode 100644 package/at-spi2-atk/at-spi2-atk.mk diff --git a/Config.in.legacy b/Config.in.legacy index 381e1e3a8c..b303677d3f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_AT_SPI2_ATK + bool "at-spi2-atk removed" + select BR2_LEGACY + select BR2_PACKAGE_AT_SPI2_CORE + help + at-spi2-atk is now part of at-spi2-core. + config BR2_PACKAGE_UCCP420WLAN bool "uccp420wlan removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 6256576e02..9530c4cfb2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1612,7 +1612,6 @@ F: support/testing/tests/package/test_avocado.py F: support/testing/tests/package/test_python_aexpect.py N: Joseph Kogut -F: package/at-spi2-atk/ F: package/at-spi2-core/ F: package/clang/ F: package/earlyoom/ diff --git a/package/Config.in b/package/Config.in index 3ace25c665..42173fa2b1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1552,7 +1552,6 @@ endmenu menu "Graphics" source "package/assimp/Config.in" - source "package/at-spi2-atk/Config.in" source "package/at-spi2-core/Config.in" source "package/atk/Config.in" source "package/atkmm/Config.in" diff --git a/package/at-spi2-atk/0001-meson-add-tests-option.patch b/package/at-spi2-atk/0001-meson-add-tests-option.patch deleted file mode 100644 index 3a2aefa090..0000000000 --- a/package/at-spi2-atk/0001-meson-add-tests-option.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 466d04a57b32417dbf2d5e818af1b7593af5f802 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 May 2020 10:29:36 +0200 -Subject: [PATCH] meson: add tests option - -Add tests option to allow the user to build at-spi2-atk without tests, -it is especially useful as one of the test requires libxml-2.0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/at-spi2-atk/-/merge_requests/22] ---- - meson.build | 4 +++- - meson_options.txt | 4 ++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9fce5d6..61bc93d 100644 ---- a/meson.build -+++ b/meson.build -@@ -61,4 +61,6 @@ install_data('at-spi2-atk.desktop', - - subdir('droute') - subdir('atk-adaptor') --subdir('tests') -+if get_option('tests') -+ subdir('tests') -+endif -diff --git a/meson_options.txt b/meson_options.txt -index 24c9228..a4abdc2 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -2,3 +2,7 @@ option('disable_p2p', - description: 'Disable peer-to-peer DBus connections', - type: 'boolean', - value: false) -+option('tests', -+ description: 'Whether to build tests', -+ type: 'boolean', -+ value: true) --- -2.26.2 - diff --git a/package/at-spi2-atk/Config.in b/package/at-spi2-atk/Config.in deleted file mode 100644 index 9a7cfde0af..0000000000 --- a/package/at-spi2-atk/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_AT_SPI2_ATK - bool "at-spi2-atk" - depends on BR2_PACKAGE_XORG7 # at-spi2-core - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_USE_WCHAR # glib2 - select BR2_PACKAGE_ATK - select BR2_PACKAGE_AT_SPI2_CORE - select BR2_PACKAGE_LIBGLIB2 - help - The At-Spi2 Atk package contains a library that bridges - ATK to At-Spi2 D-Bus service. - - https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/ - -comment "at-spi2-atk needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -comment "at-spi2-atk depends on X.org" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_XORG7 diff --git a/package/at-spi2-atk/at-spi2-atk.hash b/package/at-spi2-atk/at-spi2-atk.hash deleted file mode 100644 index 9c564c32af..0000000000 --- a/package/at-spi2-atk/at-spi2-atk.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.sha256sum -sha256 901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0 at-spi2-atk-2.34.2.tar.xz - -# locally calculated -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-atk/at-spi2-atk.mk b/package/at-spi2-atk/at-spi2-atk.mk deleted file mode 100644 index 232b577230..0000000000 --- a/package/at-spi2-atk/at-spi2-atk.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# at-spi2-atk -# -################################################################################ - -AT_SPI2_ATK_VERSION_MAJOR = 2.34 -AT_SPI2_ATK_VERSION = $(AT_SPI2_ATK_VERSION_MAJOR).2 -AT_SPI2_ATK_SOURCE = at-spi2-atk-$(AT_SPI2_ATK_VERSION).tar.xz -AT_SPI2_ATK_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) -AT_SPI2_ATK_LICENSE = LGPL-2.1+ -AT_SPI2_ATK_LICENSE_FILES = COPYING -AT_SPI2_ATK_CPE_ID_VENDOR = gnome -AT_SPI2_ATK_INSTALL_STAGING = YES -AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf -AT_SPI2_ATK_CONF_OPTS = -Dtests=false - -$(eval $(meson-package)) -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:58:36 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:58:36 +0100 Subject: [Buildroot] [PATCH v5 3/5] package/atk: remove package In-Reply-To: <20230227105838.358916-1-thomas.devoogdt@barco.com> References: <20230227105838.358916-1-thomas.devoogdt@barco.com> Message-ID: <20230227105838.358916-3-thomas.devoogdt@barco.com> From: Daniel Lang atk has been merged into at-spi2-core with version 2.45.1. https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_45_1/NEWS https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78 Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) v5: rebased + grouped patches --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/atk/Config.in | 14 -------------- package/atk/atk.hash | 5 ----- package/atk/atk.mk | 25 ------------------------- package/atkmm/Config.in | 8 ++++---- package/atkmm/atkmm.mk | 2 +- package/libglade/Config.in | 2 +- package/libglade/libglade.mk | 2 +- package/libgtk2/Config.in | 2 +- package/libgtk2/libgtk2.mk | 2 +- package/libgtk3/Config.in | 2 +- package/libgtk3/libgtk3.mk | 2 +- 13 files changed, 18 insertions(+), 56 deletions(-) delete mode 100644 package/atk/Config.in delete mode 100644 package/atk/atk.hash delete mode 100644 package/atk/atk.mk diff --git a/Config.in.legacy b/Config.in.legacy index b303677d3f..2d3b1d41ea 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_ATK + bool "atk removed" + select BR2_LEGACY + select BR2_PACKAGE_AT_SPI2_CORE + help + atk is now part of at-spi2-core. + config BR2_PACKAGE_AT_SPI2_ATK bool "at-spi2-atk removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 42173fa2b1..3891f5abdd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1553,7 +1553,6 @@ endmenu menu "Graphics" source "package/assimp/Config.in" source "package/at-spi2-core/Config.in" - source "package/atk/Config.in" source "package/atkmm/Config.in" source "package/bayer2rgb-neon/Config.in" source "package/bullet/Config.in" diff --git a/package/atk/Config.in b/package/atk/Config.in deleted file mode 100644 index d9371b879b..0000000000 --- a/package/atk/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_ATK - bool "atk" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - The ATK accessibility toolkit, needed to build GTK+-2.x. - - https://gitlab.gnome.org/GNOME/atk - -comment "atk needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/atk/atk.hash b/package/atk/atk.hash deleted file mode 100644 index d8cd69ff1f..0000000000 --- a/package/atk/atk.hash +++ /dev/null @@ -1,5 +0,0 @@ -# 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 deleted file mode 100644 index 2820fb486d..0000000000 --- a/package/atk/atk.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# atk -# -################################################################################ - -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) -ATK_LICENSE = LGPL-2.0+ -ATK_LICENSE_FILES = COPYING -ATK_INSTALL_STAGING = YES -ATK_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) - -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -ATK_CONF_OPTS += -Dintrospection=true -ATK_DEPENDENCIES += gobject-introspection -else -ATK_CONF_OPTS += -Dintrospection=false -endif - -ATK_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) - -$(eval $(meson-package)) diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in index aa58f8d593..f6f2ca8fc2 100644 --- a/package/atkmm/Config.in +++ b/package/atkmm/Config.in @@ -2,10 +2,10 @@ config BR2_PACKAGE_ATKMM bool "atkmm" depends on BR2_INSTALL_LIBSTDCPP # glibmm depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc - depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 - depends on BR2_USE_MMU # atk/glibmm -> libglib2 - depends on BR2_USE_WCHAR # atk/glibmm -> libglib2 - select BR2_PACKAGE_ATK + depends on BR2_TOOLCHAIN_HAS_THREADS # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_MMU # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_WCHAR # at-spi2-core/glibmm -> libglib2 + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_GLIBMM select BR2_PACKAGE_LIBSIGC diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk index 7ceb87b047..da763c8386 100644 --- a/package/atkmm/atkmm.mk +++ b/package/atkmm/atkmm.mk @@ -11,6 +11,6 @@ ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR) ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) ATKMM_LICENSE_FILES = COPYING COPYING.tools ATKMM_INSTALL_STAGING = YES -ATKMM_DEPENDENCIES = atk glibmm libsigc host-pkgconf +ATKMM_DEPENDENCIES = at-spi2-core glibmm libsigc host-pkgconf $(eval $(meson-package)) diff --git a/package/libglade/Config.in b/package/libglade/Config.in index c97c9becd2..8d0d26f159 100644 --- a/package/libglade/Config.in +++ b/package/libglade/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBGLADE depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_LIBXML2 help Libglade allows you to load glade interface files in a program diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk index 21aed60605..af73d8bd00 100644 --- a/package/libglade/libglade.mk +++ b/package/libglade/libglade.mk @@ -9,7 +9,7 @@ LIBGLADE_VERSION = $(LIBGLADE_VERSION_MAJOR).4 LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2 LIBGLADE_SITE = https://download.gnome.org/sources/libglade/$(LIBGLADE_VERSION_MAJOR) LIBGLADE_INSTALL_STAGING = YES -LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2 +LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 at-spi2-core libxml2 LIBGLADE_LICENSE = LGPL-2.0+ LIBGLADE_LICENSE_FILES = COPYING diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index c75c37fb63..f2888b2f51 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 859925e8d3..608c263e4d 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -23,7 +23,7 @@ LIBGTK2_CONF_ENV = \ LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no -LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk \ +LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango at-spi2-core \ gdk-pixbuf $(TARGET_NLS_DEPENDENCIES) LIBGTK2_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS) diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 82ca68d2da..34b8d49eb3 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -23,7 +23,7 @@ config BR2_PACKAGE_LIBGTK3 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 283c129cef..2821c7eb52 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -14,7 +14,7 @@ LIBGTK3_CPE_ID_VENDOR = gnome LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \ +LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 at-spi2-core libglib2 cairo pango \ gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:58:37 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:58:37 +0100 Subject: [Buildroot] [PATCH v5 4/5] package/libgtk3: re-enable atk-bridge In-Reply-To: <20230227105838.358916-1-thomas.devoogdt@barco.com> References: <20230227105838.358916-1-thomas.devoogdt@barco.com> Message-ID: <20230227105838.358916-4-thomas.devoogdt@barco.com> The at-spi2-core and at-spi2-atk were merged, and are now built by default, so this patch is no longer required. Signed-off-by: Thomas Devoogdt --- v5: added re-enable atk-bridge patch to the package/at-spi2-core: bump to version 2.47.1 group --- package/libgtk3/0001-disable-atk-bridge.patch | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch deleted file mode 100644 index f3e9bff2ba..0000000000 --- a/package/libgtk3/0001-disable-atk-bridge.patch +++ /dev/null @@ -1,41 +0,0 @@ -Remove atk-bridge support. - -atk-bridge doesn't seem useful for now in Buildroot and requires to -add two new packages just for it: at-spi2-core and at-spi2-atk. - -Signed-off-by: Hadrien Boutteville - ---- a/gtk/a11y/gtkaccessibility.c -+++ b/gtk/a11y/gtkaccessibility.c -@@ -37,10 +37,6 @@ - #include - #include - --#ifdef GDK_WINDOWING_X11 --#include --#endif -- - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, - guint n_param_values, - const GValue *param_values, -@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) - _gtk_accessibility_override_atk_util (); - do_window_event_initialization (); - --#ifdef GDK_WINDOWING_X11 -- atk_bridge_adaptor_init (NULL, NULL); --#endif -- - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); - } ---- a/meson.build -+++ b/meson.build -@@ -564,7 +564,7 @@ if x11_enabled - xfixes_dep = dependency('xfixes', required: false) - xcomposite_dep = dependency('xcomposite', required: false) - fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) -- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) -+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) - - backend_immodules += ['xim'] - -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:58:38 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:58:38 +0100 Subject: [Buildroot] [PATCH v5 5/5] package/libgtk3: fix update-icon-cache on empty directory In-Reply-To: <20230227105838.358916-1-thomas.devoogdt@barco.com> References: <20230227105838.358916-1-thomas.devoogdt@barco.com> Message-ID: <20230227105838.358916-5-thomas.devoogdt@barco.com> If both, hicolor-icon-theme (selected by libgtk3-demo) and adwaita-icon-theme is not selected, then the /usr/share/icons folder is empty, causing find to fail. Signed-off-by: Thomas Devoogdt --- v5: - Fixed indentation. - Grouped patches. --- package/libgtk3/libgtk3.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 2821c7eb52..191e28dda6 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -146,8 +146,9 @@ endef # Create icon-theme.cache for each of the icon directories/themes # It's not strictly necessary but speeds up lookups define LIBGTK3_UPDATE_ICON_CACHE - find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ - -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; + [ ! -d $(TARGET_DIR)/usr/share/icons ] || \ + find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ + -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; endef LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE -- 2.39.2 From sebastien.szymanski at armadeus.com Mon Feb 27 10:22:40 2023 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Mon, 27 Feb 2023 11:22:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/glmark2: bump to version 2023.01 Message-ID: <20230227102240.30064-1-sebastien.szymanski@armadeus.com> Convert the package to a meson package as recommanded by upstream. Drop no more needed patchs. Fixes: http://autobuild.buildroot.net/results/b32/b3245c4ee8e0b3592b09e0bc57bc0928018936c2 Signed-off-by: S?bastien Szymanski --- ...find_program-to-find-wayland-scanner.patch | 50 ------------------- ...ibmatrix-Add-missing-utility-include.patch | 30 ----------- package/glmark2/glmark2.hash | 2 +- package/glmark2/glmark2.mk | 11 ++-- 4 files changed, 5 insertions(+), 88 deletions(-) delete mode 100644 package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch delete mode 100644 package/glmark2/0002-libmatrix-Add-missing-utility-include.patch diff --git a/package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch b/package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch deleted file mode 100644 index 681f0c679463..000000000000 --- a/package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 303d5c4fef1760ede5786bc62c7012dd7ae93722 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 8 Nov 2020 23:46:49 +0100 -Subject: [PATCH] wscript: use find_program to find wayland-scanner - -Use find_program instead of check_cfg to find wayland-scanner. This will -fix the following build failure when cross-compiling: - -[ 3/73] Compiling doc/glmark2.1.in -/bin/sh: 1: /usr/bin/wayland-scanner: not found - -Fixes: - - http://autobuild.buildroot.org/results//361dc40e558e2646cb93f405c7b1f621d400fea3 - -Signed-off-by: Fabrice Fontaine ---- - src/wscript_build | 2 +- - wscript | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/wscript_build b/src/wscript_build -index bbe7a77..ed3e8d6 100644 ---- a/src/wscript_build -+++ b/src/wscript_build -@@ -51,7 +51,7 @@ else: - - if 'WAYLAND_SCANNER_wayland_scanner' in bld.env.keys(): - def wayland_scanner_cmd(arg, src): -- return '%s %s < %s > ${TGT}' % (bld.env['WAYLAND_SCANNER_wayland_scanner'], arg, src) -+ return '%s %s < %s > ${TGT}' % (bld.env['WAYLAND_SCANNER_wayland_scanner'][0], arg, src) - - def wayland_proto_src_path(proto, ver): - wp_dir = bld.env['WAYLAND_PROTOCOLS_pkgdatadir'] -diff --git a/wscript b/wscript -index e09fa78..fe2494f 100644 ---- a/wscript -+++ b/wscript -@@ -227,8 +227,7 @@ def configure_linux(ctx): - # wayland-protocols >= 1.12 required for xdg-shell stable - ctx.check_cfg(package = 'wayland-protocols', atleast_version = '1.12', - variables = ['pkgdatadir'], uselib_store = 'WAYLAND_PROTOCOLS') -- ctx.check_cfg(package = 'wayland-scanner', variables = ['wayland_scanner'], -- uselib_store = 'WAYLAND_SCANNER') -+ ctx.find_program('wayland-scanner', var = 'WAYLAND_SCANNER_wayland_scanner') - - # Prepend CXX flags so that they can be overriden by the - # CXXFLAGS environment variable --- -2.28.0 - diff --git a/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch b/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch deleted file mode 100644 index 65b6183867f8..000000000000 --- a/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d1ca3f53c96dc8a4048b17dc16147a8fac782d4a Mon Sep 17 00:00:00 2001 -From: Alexandros Frantzis -Date: Mon, 14 Feb 2022 13:54:09 +0200 -Subject: [PATCH] libmatrix: Add missing include - -Fixes compilation with GCC 12. - -Fixes #169 -[Paul: backport upstream d1ca3f53c96dc8a4048b17dc16147a8fac782d4a] -Signed-off-by: Paul Cercueil ---- - - src/libmatrix/program.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h -index f95b470..1c9de08 100644 ---- a/src/libmatrix/program.h -+++ b/src/libmatrix/program.h -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include "mat.h" - - // Simple shader container. Abstracts all of the OpenGL bits, but leaves --- -2.35.1 - diff --git a/package/glmark2/glmark2.hash b/package/glmark2/glmark2.hash index 84058197701f..5b1d13b46812 100644 --- a/package/glmark2/glmark2.hash +++ b/package/glmark2/glmark2.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 12aef3ce80406bc723542979b9818886a28d0a4c93f62379eaadfd830974790d glmark2-06e78b67702b5413335ecdf1ae816da9c20f6ed9.tar.gz +sha256 8fece3fc323b643644a525be163dc4931a4189971eda1de8ad4c1712c5db3d67 glmark2-2023.01.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 16fbc228292bd774b263b212ae422c524cbf3b2078bcf21b22f8bdd4373be617 COPYING.SGI diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index bac9d9ff6fc2..0fc466aff37e 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -4,15 +4,12 @@ # ################################################################################ -GLMARK2_VERSION = 06e78b67702b5413335ecdf1ae816da9c20f6ed9 +GLMARK2_VERSION = 2023.01 GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION)) GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng -# The bundled waf script is too old for >= python3.11 -GLMARK2_NEEDS_EXTERNAL_WAF = YES - ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y) GLMARK2_DEPENDENCIES += libdrm libgbm libgles udev GLMARK2_FLAVORS += drm-glesv2 @@ -44,7 +41,7 @@ GLMARK2_FLAVORS += wayland-gl endif GLMARK2_CONF_OPTS += \ - --prefix=/usr \ - --with-flavors=$(subst $(space),$(comma),$(GLMARK2_FLAVORS)) + -Dflavors=$(subst $(space),$(comma),$(GLMARK2_FLAVORS)) \ + --prefix=/usr -$(eval $(waf-package)) +$(eval $(meson-package)) -- 2.39.2 From marcus.hoffmann at othermo.de Mon Feb 27 14:25:06 2023 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Mon, 27 Feb 2023 15:25:06 +0100 Subject: [Buildroot] [git commit] package/sudo: fix SUDO_ENABLE_SUDO_GROUP_RULE following version bump In-Reply-To: <20220718215158.C299083CCF@busybox.osuosl.org> References: <20220718215158.C299083CCF@busybox.osuosl.org> Message-ID: Hi Peter, the needs to be backported to 2022.11.x and 2022.02.x Best, Marcus On 19.07.22 00:05, Yann E.MORIN wrote: > commit: https://git.buildroot.net/buildroot/commit/?id=079fccdee5a2a10fc8275094512b8423548ea147 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > > Since the version bump of sudo to v1.9.11p2 in commit 9b7f8da96b, the > sed magic in SUDO_ENABLE_SUDO_GROUP_RULE no longer does its job, due > to a slight change in the example sudoers file provided by upstream > sudo. > > This commit fixes the regexp to match the new sudoers file. > > Fixes bug #14891 (https://bugs.busybox.net/show_bug.cgi?id=14891) > > Reported-by: Matthias Hardt > Signed-off-by: Thomas Petazzoni > Signed-off-by: Yann E. MORIN > --- > package/sudo/sudo.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk > index 2b9ba76a51..4f9fdb4b2c 100644 > --- a/package/sudo/sudo.mk > +++ b/package/sudo/sudo.mk > @@ -80,7 +80,7 @@ define SUDO_USERS > endef > > define SUDO_ENABLE_SUDO_GROUP_RULE > - $(SED) '/^# \%sudo\tALL=(ALL) ALL/s/^# //' $(TARGET_DIR)/etc/sudoers > + $(SED) '/^# \%sudo\tALL=(ALL:ALL) ALL/s/^# //' $(TARGET_DIR)/etc/sudoers > endef > SUDO_POST_INSTALL_TARGET_HOOKS += SUDO_ENABLE_SUDO_GROUP_RULE > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot ________________________________ othermo GmbH | Sitz der Gesellschaft: Alzenau | Amtsgericht Aschaffenburg: HRB 14783 | USt-IdNr.: DE319977978 | Gesch?ftsf?hrung: Dr. Dennis Metz. From peter at korsgaard.com Mon Feb 27 14:39:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:39:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: fix build without NPTL In-Reply-To: <20230226120732.39710-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 13:07:32 +0100") References: <20230226120732.39710-1-fontaine.fabrice@gmail.com> Message-ID: <87zg8znpf4.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without NPTL raised since the addition > of the package in commit 1e64fa2956171cdc9d6e6c8896b4b589ce573513: > /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': > /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: > error: 'pthread_spin_init' was not declared in this scope; did you > mean 'pthread_cond_init'? > 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) > | ^~~~~~~~~~~~~~~~~ > | pthread_cond_init > Fixes: > - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:39:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:39:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xwayland: xlib_libxshmfence is mandatory In-Reply-To: <20230226122336.49814-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 13:23:36 +0100") References: <20230226122336.49814-1-fontaine.fabrice@gmail.com> Message-ID: <87v8jnnpds.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > xlib_libxshmfence is mandatory, not optional, since the addition of the > package in commit 05c3177493aa8447d5cb568c8c13e0c09eded18b: > ../miext/sync/misyncshm.c:36:10: fatal error: X11/xshmfence.h: No such file or directory > 36 | #include > | ^~~~~~~~~~~~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/cccc8f97d452ed2adbcbc4624f159a00287a3d38 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:40:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:40:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-werkzeug: security bump to version 2.2.3 In-Reply-To: <20230226131048.75813-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 14:10:48 +0100") References: <20230226131048.75813-1-fontaine.fabrice@gmail.com> Message-ID: <87r0ubnpde.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-23934 and CVE-2023-25577 > https://github.com/pallets/werkzeug/security/advisories/GHSA-px8h-6qxv-m22q > https://github.com/pallets/werkzeug/security/advisories/GHSA-xg9f-g7g7-2323 > https://werkzeug.palletsprojects.com/en/2.2.x/changes/#version-2-2-3 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:40:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:40:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/bind: security bump to version 9.16.38 In-Reply-To: <20230226132026.82185-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 14:20:26 +0100") References: <20230226132026.82185-1-fontaine.fabrice@gmail.com> Message-ID: <87mt4znpc6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2022-3094, CVE-2022-3736 and CVE-2022-3924 > - Update hash of COPYRIGHT (year updated with > https://gitlab.isc.org/isc-projects/bind9/-/commit/1a5d707f52282117c9912a27dcc89f2ec412577a) > https://downloads.isc.org/isc/bind9/9.16.38/doc/arm/html/notes.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:43:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:43:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-m2crypto: fix CVE-2020-25657 In-Reply-To: <20230226132747.86908-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 14:27:47 +0100") References: <20230226132747.86908-1-fontaine.fabrice@gmail.com> Message-ID: <87ilfnnp7a.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > A flaw was found in all released versions of m2crypto, where they are > vulnerable to Bleichenbacher timing attacks in the RSA decryption API > via the timed processing of valid PKCS#1 v1.5 Ciphertext. The highest > threat from this vulnerability is to confidentiality. > Signed-off-by: Fabrice Fontaine Annoying that this is still not in a released version :/ Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:44:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:44:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/haproxy: security bump to version 2.6.9 In-Reply-To: <20230226133357.97330-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 14:33:57 +0100") References: <20230226133357.97330-1-fontaine.fabrice@gmail.com> Message-ID: <87edqbnp63.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-25725 > https://www.mail-archive.com/haproxy at formilux.org/msg43229.html > https://www.mail-archive.com/haproxy at formilux.org/msg43224.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:45:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:45:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/tiff: fix CVE-2022-48281 In-Reply-To: <20230226133946.102275-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 14:39:46 +0100") References: <20230226133946.102275-1-fontaine.fabrice@gmail.com> Message-ID: <87a60znp53.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > processCropSelections in tools/tiffcrop.c in LibTIFF through 4.5.0 has a > heap-based buffer overflow (e.g., "WRITE of size 307203") via a crafted > TIFF image. > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:47:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:47:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpjsip: fix CVE-2022-235{3, 4}7 In-Reply-To: <20230226135503.112605-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 14:55:03 +0100") References: <20230226135503.112605-1-fontaine.fabrice@gmail.com> Message-ID: <875ybnnp1x.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/pjsip/pjproject/security/advisories/GHSA-9pfh-r8x4-w26w > https://github.com/pjsip/pjproject/security/advisories/GHSA-cxwq-5g9x-x7fr > Signed-off-by: Fabrice Fontaine > --- > ...ull-request-from-GHSA-9pfh-r8x4-w26w.patch | 99 +++++++++++++++++++ > package/libpjsip/libpjsip.mk | 6 ++ > 2 files changed, 105 insertions(+) > create mode 100644 package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch .. > +# 0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch > +LIBPJSIP_IGNORE_CVES += CVE-2022-23537 > + > +# 0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch > +LIBPJSIP_IGNORE_CVES += CVE-2022-23547 Did you forget to git add the patch for 0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch? -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:47:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:47:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/proxychains-ng: set -fPIC In-Reply-To: <20230226154421.47285-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 16:44:21 +0100") References: <20230226154421.47285-1-fontaine.fabrice@gmail.com> Message-ID: <871qmbnp0s.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Set -fPIC to avoid the following build failure with some architectures > such as mips or aarch64 raised since bump to version 4.14 in commit > 35953d1e61aa8581be09c9dca39365955b10590e and > https://github.com/rofl0r/proxychains-ng/commit/35a674bdbc294730429a1007c9e7ce01e65b49b5: > checking what's the option to use in linker to set library name ... > cannot find an option to set library name > Fixes: > - http://autobuild.buildroot.org/results/8ed1481e29321ed3da40251f700cb3bd66f62c94 > - http://autobuild.buildroot.org/results/fd01df6eb9a37257894740d44a33eece9123355a > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:49:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:49:17 +0100 Subject: [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series In-Reply-To: (Lang Daniel via buildroot's message of "Mon, 27 Feb 2023 08:46:13 +0000") References: Message-ID: <87wn43madu.fsf@dell.be.48ers.dk> >>>>> "Lang" == Lang Daniel via buildroot writes: > Signed-off-by: Daniel Lang Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:50:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:50:01 +0100 Subject: [Buildroot] [PATCH 3/3] linux: bump _KERNEL_LATEST_VERSION to 6.2 In-Reply-To: (Lang Daniel via buildroot's message of "Mon, 27 Feb 2023 08:46:25 +0000") References: Message-ID: <87sfermacm.fsf@dell.be.48ers.dk> >>>>> "Lang" == Lang Daniel via buildroot writes: > Signed-off-by: Daniel Lang > --- > linux/Config.in | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > diff --git a/linux/Config.in b/linux/Config.in > index 5cbef197ab..495fc48997 100644 > --- a/linux/Config.in > +++ b/linux/Config.in > @@ -28,8 +28,8 @@ choice > prompt "Kernel version" > config BR2_LINUX_KERNEL_LATEST_VERSION > - bool "Latest version (6.1)" > - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 if BR2_KERNEL_HEADERS_AS_KERNEL > + bool "Latest version (6.2)" > + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 if BR2_KERNEL_HEADERS_AS_KERNEL Given that 6.1 is a LTS kernel I would prefer to wait with patch 2+3 until after 2023.02 is released (E.G. in a few days). -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:57:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:57:22 +0100 Subject: [Buildroot] [Help] Building from a private PyPi server In-Reply-To: (Alberto Fahrenkrog's message of "Mon, 27 Feb 2023 00:17:25 +0000") References: Message-ID: <87o7pfma0d.fsf@dell.be.48ers.dk> >>>>> "Alberto" == Alberto Fahrenkrog writes: > Hello all, > In our company we have custom Python packages stored in a private PyPi > server. To install them we simply add the --extra-index-url in our > requirements.txt file when using pip. Are you aware of the security issues with --extra-index-url? https://github.com/pypa/pip/issues/9612 > The packages are also available for manual download from the server, > however all URLs to any .tar.gz file are in the form > https://git.ourserver.com/packages/pypi/package-name/version-number/files/1234. This > leads me to the following options (I think): > * Try to get Buildroot to use the private PyPi server. I had a look > at the "scanpypi" script and it generated the .mk and .in files for a > regular PyPi package, but I could not find a way to tell scanpypi to > use an extra url or private pypi address scanpypi is indeed hard coded to use pypi and their JSON API (https://pypi.org/pypi/{pkg}/json), so not trivial to use with a local repo. Do your private server expose the same API? If so, I guess we could add an argument to scanpypi to use a custom URI instead of pypi.org. > * Find a way, using wget, to download the package from the address > above. Unfortunately I've had no luck with that yet. With the command: > wget > https://ourserver.com/-/packages/pypi/package-name/version_nr/files/5525 Notice: You have an additional /-/ compared to the URL above. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 13:41:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 14:41:21 +0100 Subject: [Buildroot] [git commit] package/gdal: fix build without NPTL Message-ID: <20230227145800.6D29686BEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93f5ba38533edb66e9446086266da6f9be904a80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without NPTL raised since the addition of the package in commit 1e64fa2956171cdc9d6e6c8896b4b589ce573513: /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: error: 'pthread_spin_init' was not declared in this scope; did you mean 'pthread_cond_init'? 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) | ^~~~~~~~~~~~~~~~~ | pthread_cond_init Fixes: - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../gdal/0001-fix-uclibc-build-without-NPTL.patch | 102 +++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/package/gdal/0001-fix-uclibc-build-without-NPTL.patch b/package/gdal/0001-fix-uclibc-build-without-NPTL.patch new file mode 100644 index 0000000000..6ecbfc7f95 --- /dev/null +++ b/package/gdal/0001-fix-uclibc-build-without-NPTL.patch @@ -0,0 +1,102 @@ +From 0d3ee8a7661dcd85a9d7b636124af32de8d1b2f1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 11:31:23 +0100 +Subject: [PATCH] fix uclibc build without NPTL + +Check for pthread_spin_lock instead of pthread_spin_lock_t to avoid the +following uclibc build failure: + +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: error: 'pthread_spin_init' was not declared in this scope; did you mean 'pthread_cond_init'? + 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) + | ^~~~~~~~~~~~~~~~~ + | pthread_cond_init +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'int CPLAcquireSpinLock(CPLSpinLock*)': +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2283:12: error: 'pthread_spin_lock' was not declared in this scope; did you mean 'pthread_spinlock_t'? + 2283 | return pthread_spin_lock( &(psSpin->spin) ) == 0; + | ^~~~~~~~~~~~~~~~~ + | pthread_spinlock_t + +Fixes: + - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OSGeo/gdal/pull/7318] +--- + cmake/helpers/configure.cmake | 4 ++-- + cmake/template/cpl_config.h.in | 4 ++-- + port/cpl_config.h.in | 4 ++-- + port/cpl_multiproc.cpp | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/cmake/helpers/configure.cmake b/cmake/helpers/configure.cmake +index 08549df434..62a4f636ba 100644 +--- a/cmake/helpers/configure.cmake ++++ b/cmake/helpers/configure.cmake +@@ -110,9 +110,9 @@ else () + " + #define _GNU_SOURCE + #include +- int main() { pthread_spinlock_t spin; return 1; } ++ int main() { pthread_spinlock_t spin; return pthread_spin_lock(&spin); } + " +- HAVE_PTHREAD_SPINLOCK) ++ HAVE_PTHREAD_SPIN_LOCK) + + check_c_source_compiles( + " +diff --git a/cmake/template/cpl_config.h.in b/cmake/template/cpl_config.h.in +index cfa7da94aa..d1fd80bda9 100644 +--- a/cmake/template/cpl_config.h.in ++++ b/cmake/template/cpl_config.h.in +@@ -61,8 +61,8 @@ + /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ + #cmakedefine HAVE_PTHREAD_MUTEX_ADAPTIVE_NP 1 + +-/* Define to 1 if you have the `pthread_spinlock_t' type. */ +-#cmakedefine HAVE_PTHREAD_SPINLOCK 1 ++/* Define to 1 if you have the `pthread_spin_lock' function. */ ++#cmakedefine HAVE_PTHREAD_SPIN_LOCK 1 + + /* Define to 1 if you have the `pthread_atfork' function. */ + #cmakedefine HAVE_PTHREAD_ATFORK 1 +diff --git a/port/cpl_config.h.in b/port/cpl_config.h.in +index ea28efb3f0..09a48f242d 100644 +--- a/port/cpl_config.h.in ++++ b/port/cpl_config.h.in +@@ -51,8 +51,8 @@ + /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ + #undef HAVE_PTHREAD_MUTEX_ADAPTIVE_NP + +-/* Define to 1 if you have the `pthread_spinlock_t' type. */ +-#undef HAVE_PTHREAD_SPINLOCK ++/* Define to 1 if you have the `pthread_spin_lock' function. */ ++#undef HAVE_PTHREAD_SPIN_LOCK + + /* Define to 1 if you have the 5 args `mremap' function. */ + #undef HAVE_5ARGS_MREMAP +diff --git a/port/cpl_multiproc.cpp b/port/cpl_multiproc.cpp +index 7f5bcd9127..474ff5bb29 100644 +--- a/port/cpl_multiproc.cpp ++++ b/port/cpl_multiproc.cpp +@@ -2232,7 +2232,7 @@ void CPLCleanupTLS() + /* CPLCreateSpinLock() */ + /************************************************************************/ + +-#if defined(HAVE_PTHREAD_SPINLOCK) ++#if defined(HAVE_PTHREAD_SPIN_LOCK) + #define HAVE_SPINLOCK_IMPL + + struct _CPLSpinLock +@@ -2310,7 +2310,7 @@ void CPLDestroySpinLock(CPLSpinLock *psSpin) + pthread_spin_destroy(&(psSpin->spin)); + free(psSpin); + } +-#endif // HAVE_PTHREAD_SPINLOCK ++#endif // HAVE_PTHREAD_SPIN_LOCK + + #endif // def CPL_MULTIPROC_PTHREAD + +-- +2.39.1 + From peter at korsgaard.com Mon Feb 27 14:40:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:40:46 +0100 Subject: [Buildroot] [git commit] package/bind: security bump to version 9.16.38 Message-ID: <20230227145800.A832586BEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7abc9a0554cc1c1bbc1ad4273622024020fa2c7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fix CVE-2022-3094, CVE-2022-3736 and CVE-2022-3924 - Update hash of COPYRIGHT (year updated with https://gitlab.isc.org/isc-projects/bind9/-/commit/1a5d707f52282117c9912a27dcc89f2ec412577a) https://downloads.isc.org/isc/bind9/9.16.38/doc/arm/html/notes.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 6 +++--- package/bind/bind.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index d41a9bbc5e..32804b5ce0 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.16.33/bind-9.16.33.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.38/bind-9.16.38.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 ec4fbea4b2e368d1824971509e33fa159224ad14b436034c6bcd46104c328d91 bind-9.16.33.tar.xz -sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT +sha256 8df44c9d9a84a28ab8b49d55f3c33b624b90ef8f6a8b9ee6a4c33cc17c14c50f bind-9.16.38.tar.xz +sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 2f83a6276e..70987a9823 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.33 +BIND_VERSION = 9.16.38 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. From peter at korsgaard.com Mon Feb 27 14:40:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:40:09 +0100 Subject: [Buildroot] [git commit] package/python-werkzeug: security bump to version 2.2.3 Message-ID: <20230227145800.9495C86BF4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=da5d2adf572f9b89b6ea82f9548bd4dfba7482ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2023-23934 and CVE-2023-25577 https://github.com/pallets/werkzeug/security/advisories/GHSA-px8h-6qxv-m22q https://github.com/pallets/werkzeug/security/advisories/GHSA-xg9f-g7g7-2323 https://werkzeug.palletsprojects.com/en/2.2.x/changes/#version-2-2-3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-werkzeug/python-werkzeug.hash | 6 +++--- package/python-werkzeug/python-werkzeug.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash index 13b95bc448..0b60a40066 100644 --- a/package/python-werkzeug/python-werkzeug.hash +++ b/package/python-werkzeug/python-werkzeug.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/Werkzeug/json -md5 9d7e50c5bb3a9fc12823b5faf374b90e Werkzeug-2.2.2.tar.gz -sha256 7ea2d48322cc7c0f8b3a215ed73eabd7b5d75d0b50e31ab006286ccff9e00b8f Werkzeug-2.2.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/werkzeug/json +md5 28c3ec6a4b1ce8f06c85612c1dfa351a Werkzeug-2.2.3.tar.gz +sha256 2e1ccc9417d4da358b9de6f174e3ac094391ea1d4fbef2d667865d819dfd0afe Werkzeug-2.2.3.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk index 3ebae3c165..0dd27d145f 100644 --- a/package/python-werkzeug/python-werkzeug.mk +++ b/package/python-werkzeug/python-werkzeug.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 2.2.2 +PYTHON_WERKZEUG_VERSION = 2.2.3 PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/f8/c1/1c8e539f040acd80f844c69a5ef8e2fccdf8b442dabb969e497b55d544e1 +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/02/3c/baaebf3235c87d61d6593467056d5a8fba7c75ac838b8d100a5e64eba7a0 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst From peter at korsgaard.com Mon Feb 27 14:44:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:44:50 +0100 Subject: [Buildroot] [git commit] package/tiff: fix CVE-2022-48281 Message-ID: <20230227145800.DBFFA86BEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7ae47f0c68607a90e6a65cbfff5bfb3007b019d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master processCropSelections in tools/tiffcrop.c in LibTIFF through 4.5.0 has a heap-based buffer overflow (e.g., "WRITE of size 307203") via a crafted TIFF image. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...p-Correct-simple-copy-paste-error-Fix-488.patch | 28 ++++++++++++++++++++++ package/tiff/tiff.mk | 3 +++ 2 files changed, 31 insertions(+) diff --git a/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch b/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch new file mode 100644 index 0000000000..73c0d10ffc --- /dev/null +++ b/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch @@ -0,0 +1,28 @@ +From 97d65859bc29ee334012e9c73022d8a8e55ed586 Mon Sep 17 00:00:00 2001 +From: Su Laus +Date: Sat, 21 Jan 2023 15:58:10 +0000 +Subject: [PATCH] tiffcrop: Correct simple copy paste error. Fix #488. + +[Retrieved from: +https://gitlab.com/libtiff/libtiff/-/commit/97d65859bc29ee334012e9c73022d8a8e55ed586] +Signed-off-by: Fabrice Fontaine +--- + tools/tiffcrop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c +index 14fa18da..7db69883 100644 +--- a/tools/tiffcrop.c ++++ b/tools/tiffcrop.c +@@ -8591,7 +8591,7 @@ static int processCropSelections(struct image_data *image, + cropsize + NUM_BUFF_OVERSIZE_BYTES); + else + { +- prev_cropsize = seg_buffs[0].size; ++ prev_cropsize = seg_buffs[i].size; + if (prev_cropsize < cropsize) + { + next_buff = _TIFFrealloc( +-- +GitLab + diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index e7de51ea1e..f9754a4b49 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -12,6 +12,9 @@ TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES +# 0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch +TIFF_IGNORE_CVES += CVE-2022-48281 + # webp has a (optional) dependency on tiff, so we can't have webp # support in tiff, or that would create a circular dependency. TIFF_CONF_OPTS = \ From peter at korsgaard.com Mon Feb 27 14:39:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:39:28 +0100 Subject: [Buildroot] [git commit] package/x11r7/xwayland: xlib_libxshmfence is mandatory Message-ID: <20230227145800.80B4A86BF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=daf01a38be705ada7ce3e083f096d424ead5544c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master xlib_libxshmfence is mandatory, not optional, since the addition of the package in commit 05c3177493aa8447d5cb568c8c13e0c09eded18b: ../miext/sync/misyncshm.c:36:10: fatal error: X11/xshmfence.h: No such file or directory 36 | #include | ^~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/cccc8f97d452ed2adbcbc4624f159a00287a3d38 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/weston/Config.in | 4 ++++ package/wlroots/Config.in | 4 ++++ package/x11r7/xwayland/Config.in | 5 +++++ package/x11r7/xwayland/xwayland.mk | 5 +++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 09119edaaa..d5dbf27bbd 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -114,6 +114,8 @@ config BR2_PACKAGE_WESTON_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 @@ -125,6 +127,8 @@ comment "XWayland support needs libepoxy and X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS # Weston needs at least one shell; this can be one of the bundled ones, diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index b2d3f3c3b1..fb23e9069c 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -47,6 +47,8 @@ config BR2_PACKAGE_WLROOTS_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XCB_UTIL_WM select BR2_PACKAGE_XWAYLAND @@ -58,6 +60,8 @@ comment "XWayland support needs X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS endif diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in index 4f14f2cc36..241ab73ad3 100644 --- a/package/x11r7/xwayland/Config.in +++ b/package/x11r7/xwayland/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_XWAYLAND # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. + depends on !BR2_RISCV_32 # xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_WAYLAND @@ -14,6 +16,7 @@ config BR2_PACKAGE_XWAYLAND select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XLIB_LIBXKBFILE select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXSHMFENCE select BR2_PACKAGE_XLIB_XTRANS select BR2_PACKAGE_XORGPROTO help @@ -23,4 +26,6 @@ config BR2_PACKAGE_XWAYLAND comment "xwayland needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 174b440b07..7aef1156d3 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -18,6 +18,7 @@ XWAYLAND_DEPENDENCIES = \ xlib_libXfont2 \ xlib_libxkbfile \ xlib_libXrandr \ + xlib_libxshmfence \ xlib_xtrans \ xorgproto XWAYLAND_CONF_OPTS = \ @@ -77,9 +78,9 @@ XWAYLAND_CONF_OPTS += -Dsha1=libsha1 XWAYLAND_DEPENDENCIES += libsha1 endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_LIBDRM),yy) +ifeq ($(BR2_PACKAGE_LIBDRM),y) XWAYLAND_CONF_OPTS += -Ddri3=true -XWAYLAND_DEPENDENCIES += xlib_libxshmfence libdrm +XWAYLAND_DEPENDENCIES += libdrm else XWAYLAND_CONF_OPTS += -Ddri3=false endif From peter at korsgaard.com Mon Feb 27 14:47:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:47:41 +0100 Subject: [Buildroot] [git commit] package/proxychains-ng: set -fPIC Message-ID: <20230227145800.ED1EE86BF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=441b859a1e3a5b2a6bbbc8990f67c33913aa2385 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set -fPIC to avoid the following build failure with some architectures such as mips or aarch64 raised since bump to version 4.14 in commit 35953d1e61aa8581be09c9dca39365955b10590e and https://github.com/rofl0r/proxychains-ng/commit/35a674bdbc294730429a1007c9e7ce01e65b49b5: checking what's the option to use in linker to set library name ... cannot find an option to set library name Fixes: - http://autobuild.buildroot.org/results/8ed1481e29321ed3da40251f700cb3bd66f62c94 - http://autobuild.buildroot.org/results/fd01df6eb9a37257894740d44a33eece9123355a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/proxychains-ng/proxychains-ng.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk index c4d487c7db..beb8909088 100644 --- a/package/proxychains-ng/proxychains-ng.mk +++ b/package/proxychains-ng/proxychains-ng.mk @@ -13,7 +13,8 @@ PROXYCHAINS_NG_CPE_ID_VENDOR = proxychains-ng_project define PROXYCHAINS_NG_CONFIGURE_CMDS cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) ./configure --prefix=/usr --sysconfdir=/etc + $(TARGET_CONFIGURE_OPTS) CPPFLAGS="$(TARGET_CPPFLAGS) -fPIC" \ + ./configure --prefix=/usr --sysconfdir=/etc endef define PROXYCHAINS_NG_BUILD_CMDS From peter at korsgaard.com Mon Feb 27 14:44:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:44:26 +0100 Subject: [Buildroot] [git commit] package/haproxy: security bump to version 2.6.9 Message-ID: <20230227145800.CB35186BF4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af9e64f120dc6a060e98bb0915c8b6b34d644896 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2023-25725 https://www.mail-archive.com/haproxy at formilux.org/msg43229.html https://www.mail-archive.com/haproxy at formilux.org/msg43224.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 2cd8ff1806..f5540ee44a 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.5.tar.gz.sha256 -sha256 ce9e19ebfcdd43e51af8a6090f1df8d512d972ddf742fa648a643bbb19056605 haproxy-2.6.5.tar.gz +# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.9.tar.gz.sha256 +sha256 f01a1c5f465dc1b5cd175d0b28b98beb4dfe82b5b5b63ddcc68d1df433641701 haproxy-2.6.9.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 c37508f63b..012c1dfdb6 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.6 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).5 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).9 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 Feb 27 14:48:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:48:43 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230227145801.06C4A86BEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=159df6a531676021607ea26309b994c68e5e501d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Daniel Lang 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 11dc5cce07..5cbef197ab 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.14" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" 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 52eb534b40..f45b244e6b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz +sha256 a27076011efec7ad11e9ed0644f512c34cab4c5ed5ba42cfe71c83fabebe810d linux-6.1.14.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz -sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz -sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz +sha256 348d974c143fdef8517ec703fdaa24bade12a49047848be92cb9e3253b19ef98 linux-5.15.96.tar.xz +sha256 a2b51876befb8cc35724ed62820845f2b387d471a6cf46e8eedd0b6cb595825f linux-5.10.170.tar.xz +sha256 5a1e5754b4f2a4fe73b119d810ecda2ce07ecfb6f6cbbd16547c9ecd30b97627 linux-5.4.233.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz -sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz +sha256 4e1c1555c306874e0477d1af282d04a4efb285121456ab3f79519c92e406b701 linux-4.14.307.tar.xz +sha256 64a265a193c9e3e14d1397278e2348386ef6d6043af76d693c0fbbafed345ca8 linux-4.19.274.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 18c179ec8d..ae40520c51 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -384,12 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.305" if BR2_KERNEL_HEADERS_4_14 - default "4.19.272" if BR2_KERNEL_HEADERS_4_19 - default "5.4.231" if BR2_KERNEL_HEADERS_5_4 - default "5.10.167" if BR2_KERNEL_HEADERS_5_10 - default "5.15.93" if BR2_KERNEL_HEADERS_5_15 - default "6.1.11" if BR2_KERNEL_HEADERS_6_1 + default "4.14.307" if BR2_KERNEL_HEADERS_4_14 + default "4.19.274" if BR2_KERNEL_HEADERS_4_19 + default "5.4.233" if BR2_KERNEL_HEADERS_5_4 + default "5.10.170" if BR2_KERNEL_HEADERS_5_10 + default "5.15.96" if BR2_KERNEL_HEADERS_5_15 + default "6.1.14" if BR2_KERNEL_HEADERS_6_1 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 Mon Feb 27 14:41:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:41:21 +0100 Subject: [Buildroot] [git commit] package/python-m2crypto: fix CVE-2020-25657 Message-ID: <20230227145800.B740F86BF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a86d44a3eb009d3deb5b558f7ccb0870eb877c6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A flaw was found in all released versions of m2crypto, where they are vulnerable to Bleichenbacher timing attacks in the RSA decryption API via the timed processing of valid PKCS#1 v1.5 Ciphertext. The highest threat from this vulnerability is to confidentiality. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-in-the-RSA-decryption-API-CVE-2020-25657.patch | 174 +++++++++++++++++++++ package/python-m2crypto/python-m2crypto.mk | 3 + 2 files changed, 177 insertions(+) diff --git a/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch b/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch new file mode 100644 index 0000000000..68200b7d9b --- /dev/null +++ b/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch @@ -0,0 +1,174 @@ +From 84c53958def0f510e92119fca14d74f94215827a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= +Date: Tue, 28 Jun 2022 21:17:01 +0200 +Subject: [PATCH] Mitigate the Bleichenbacher timing attacks in the RSA + decryption API (CVE-2020-25657) + +Fixes #282 + +[Retrieved from: +https://gitlab.com/m2crypto/m2crypto/-/commit/84c53958def0f510e92119fca14d74f94215827a] +Signed-off-by: Fabrice Fontaine +--- + src/SWIG/_m2crypto_wrap.c | 20 ++++++++++++-------- + src/SWIG/_rsa.i | 20 ++++++++++++-------- + tests/test_rsa.py | 15 +++++++-------- + 3 files changed, 31 insertions(+), 24 deletions(-) + +diff --git a/src/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c +index aba9eb6d..a9f30da9 100644 +--- a/src/SWIG/_m2crypto_wrap.c ++++ b/src/SWIG/_m2crypto_wrap.c +@@ -7040,9 +7040,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7070,9 +7071,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7097,9 +7099,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7124,9 +7127,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); + +diff --git a/src/SWIG/_rsa.i b/src/SWIG/_rsa.i +index bc714e01..1377b8be 100644 +--- a/src/SWIG/_rsa.i ++++ b/src/SWIG/_rsa.i +@@ -239,9 +239,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -269,9 +270,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -296,9 +298,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -323,9 +326,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); + +diff --git a/tests/test_rsa.py b/tests/test_rsa.py +index 7bb3af75..5e75d681 100644 +--- a/tests/test_rsa.py ++++ b/tests/test_rsa.py +@@ -109,8 +109,9 @@ class RSATestCase(unittest.TestCase): + # The other paddings. + for padding in self.s_padding_nok: + p = getattr(RSA, padding) +- with self.assertRaises(RSA.RSAError): +- priv.private_encrypt(self.data, p) ++ # Exception disabled as a part of mitigation against CVE-2020-25657 ++ # with self.assertRaises(RSA.RSAError): ++ priv.private_encrypt(self.data, p) + # Type-check the data to be encrypted. + with self.assertRaises(TypeError): + priv.private_encrypt(self.gen_callback, RSA.pkcs1_padding) +@@ -127,10 +128,12 @@ class RSATestCase(unittest.TestCase): + self.assertEqual(ptxt, self.data) + + # no_padding +- with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): +- priv.public_encrypt(self.data, RSA.no_padding) ++ # Exception disabled as a part of mitigation against CVE-2020-25657 ++ # with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): ++ priv.public_encrypt(self.data, RSA.no_padding) + + # Type-check the data to be encrypted. ++ # Exception disabled as a part of mitigation against CVE-2020-25657 + with self.assertRaises(TypeError): + priv.public_encrypt(self.gen_callback, RSA.pkcs1_padding) + +@@ -146,10 +149,6 @@ class RSATestCase(unittest.TestCase): + b'\000\000\000\003\001\000\001') # aka 65537 aka 0xf4 + with self.assertRaises(RSA.RSAError): + setattr(rsa, 'e', '\000\000\000\003\001\000\001') +- with self.assertRaises(RSA.RSAError): +- rsa.private_encrypt(1) +- with self.assertRaises(RSA.RSAError): +- rsa.private_decrypt(1) + assert rsa.check_key() + + def test_loadpub_bad(self): +-- +GitLab + diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 02ad76d3f4..3c28fa3b0d 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -15,4 +15,7 @@ PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr +# 0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch +PYTHON_M2CRYPTO_IGNORE_CVES += CVE-2020-25657 + $(eval $(python-package)) From peter at korsgaard.com Mon Feb 27 15:12:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:12:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcm-tools: needs NPTL In-Reply-To: <20230226120636.39100-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 13:06:36 +0100") References: <20230226120636.39100-1-fontaine.fabrice@gmail.com> Message-ID: <87k003m9bl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > pcm-tools needs NPTL since its addition in commit > 60eb2cec80e5258a0c43090f539749606744e182: > cpucounters.cpp: In constructor 'pcm::TemporalThreadAffinity::TemporalThreadAffinity(pcm::uint32, bool)': > cpucounters.cpp:252:9: error: 'pthread_getaffinity_np' was not declared in this scope; did you mean 'sched_getaffinity'? > 252 | pthread_getaffinity_np(pthread_self(), set_size, old_affinity); > | ^~~~~~~~~~~~~~~~~~~~~~ > | sched_getaffinity > Fixes: > - http://autobuild.buildroot.org/results/8bbf9c36af332bbf5e7c1abcbb594a0b231ef97e > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 15:12:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:12:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/php-xdebug: bump to version 3.2.0 In-Reply-To: <20230226102223.325041-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 11:22:23 +0100") References: <20230226102223.325041-1-fontaine.fabrice@gmail.com> Message-ID: <87fsarm9an.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Use official tarball > - This bump will fix the following build failure raised since bump of > php to version 8.2.1 in commit > 90ab065162a35b8aa2c429903e3d59d4ad2c0d7f: > checking Check for supported PHP versions... configure: error: not supported. Need a PHP version >= 7.2.0 and < 8.2.0 (found 8.2.1) > https://xdebug.org/announcements/2022-12-08 > https://xdebug.org/updates#x_3_2_0 > Fixes: > - http://autobuild.buildroot.org/results/092a6d388fc6801c109eb46635e8df80d06a803e > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 15:12:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:12:06 +0100 Subject: [Buildroot] [git commit] package/pcm-tools: needs NPTL Message-ID: <20230227151305.3DA9286BFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d74f85c97d21461a5a23b27eb682c1157875bdb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master pcm-tools needs NPTL since its addition in commit 60eb2cec80e5258a0c43090f539749606744e182: cpucounters.cpp: In constructor 'pcm::TemporalThreadAffinity::TemporalThreadAffinity(pcm::uint32, bool)': cpucounters.cpp:252:9: error: 'pthread_getaffinity_np' was not declared in this scope; did you mean 'sched_getaffinity'? 252 | pthread_getaffinity_np(pthread_self(), set_size, old_affinity); | ^~~~~~~~~~~~~~~~~~~~~~ | sched_getaffinity Fixes: - http://autobuild.buildroot.org/results/8bbf9c36af332bbf5e7c1abcbb594a0b231ef97e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/pcm-tools/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/pcm-tools/Config.in b/package/pcm-tools/Config.in index ca9719dc5f..6bf05f32d7 100644 --- a/package/pcm-tools/Config.in +++ b/package/pcm-tools/Config.in @@ -1,11 +1,13 @@ -comment "pcm-tools needs a toolchain w/ C++" +comment "pcm-tools needs a toolchain w/ C++, NPTL" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_INSTALL_LIBSTDCPP + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL config BR2_PACKAGE_PCM_TOOLS bool "pcm-tools" depends on BR2_i386 || BR2_x86_64 depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_HWDATA select BR2_PACKAGE_HWDATA_PCI_IDS help From peter at korsgaard.com Mon Feb 27 15:12:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:12:32 +0100 Subject: [Buildroot] [git commit] package/php-xdebug: bump to version 3.2.0 Message-ID: <20230227151305.4B47686C01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8280400fbadde09e51ccff312d7a4ef6a386f589 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Use official tarball - This bump will fix the following build failure raised since bump of php to version 8.2.1 in commit 90ab065162a35b8aa2c429903e3d59d4ad2c0d7f: checking Check for supported PHP versions... configure: error: not supported. Need a PHP version >= 7.2.0 and < 8.2.0 (found 8.2.1) https://xdebug.org/announcements/2022-12-08 https://xdebug.org/updates#x_3_2_0 Fixes: - http://autobuild.buildroot.org/results/092a6d388fc6801c109eb46635e8df80d06a803e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/php-xdebug/php-xdebug.hash | 2 +- package/php-xdebug/php-xdebug.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/php-xdebug/php-xdebug.hash b/package/php-xdebug/php-xdebug.hash index 72bfac67ce..fa92ee82ed 100644 --- a/package/php-xdebug/php-xdebug.hash +++ b/package/php-xdebug/php-xdebug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7e4f28fc65c8b535de43b6d2ec57429476a6de1d53c4d440a9108ae8d28e01f4 php-xdebug-3.0.4.tar.gz +sha256 7769b20eecdadf5fbe9f582512c10b394fb575b6f7a8c3a3a82db6883e0032b7 xdebug-3.2.0.tgz sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272 LICENSE diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk index 18ebc32592..9429d4afee 100644 --- a/package/php-xdebug/php-xdebug.mk +++ b/package/php-xdebug/php-xdebug.mk @@ -4,8 +4,9 @@ # ################################################################################ -PHP_XDEBUG_VERSION = 3.0.4 -PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION)) +PHP_XDEBUG_VERSION = 3.2.0 +PHP_XDEBUG_SOURCE = xdebug-$(PHP_XDEBUG_VERSION).tgz +PHP_XDEBUG_SITE = https://xdebug.org/files PHP_XDEBUG_INSTALL_STAGING = YES PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like) PHP_XDEBUG_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 27 15:13:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:13:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/flac: drop unrecognized option In-Reply-To: <20230225232217.27171-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 00:22:17 +0100") References: <20230225232217.27171-1-fontaine.fabrice@gmail.com> Message-ID: <87bklfm99e.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > xmms-plugin has been dropped since version 1.4.2 and > https://github.com/xiph/flac/commit/8fbeff238c41464fe220cd23c45861c9302d1172 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 15:13:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:13:17 +0100 Subject: [Buildroot] [git commit] package/flac: drop unrecognized option Message-ID: <20230227151507.0A0A586C04@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99d9dc1ad87796be17c4cdc9a1ac72d1b31c111b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master xmms-plugin has been dropped since version 1.4.2 and https://github.com/xiph/flac/commit/8fbeff238c41464fe220cd23c45861c9302d1172 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/flac/flac.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/flac/flac.mk b/package/flac/flac.mk index ebb4778521..595c2379b0 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -17,7 +17,6 @@ FLAC_CONF_OPTS = \ $(if $(BR2_POWERPC_CPU_HAS_ALTIVEC),--enable-altivec,--disable-altivec) \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ $(if $(BR2_POWERPC_CPU_HAS_VSX),--enable-vsx,--disable-vsx) \ - --disable-xmms-plugin \ --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) From peter at korsgaard.com Mon Feb 27 15:23:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:23:49 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add boot-wrapper-aarch64 handling In-Reply-To: <20230225225031.9260-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 25 Feb 2023 23:50:31 +0100") References: <20230225225031.9260-1-fontaine.fabrice@gmail.com> Message-ID: <877cw3m8sa.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since the addition of the package > in commit 7689b72e00fd4d8c017880004e83a1c79144ab7b: > configure: error: Could not find DTB file: > /home/autobuild/autobuild/instance-9/output-1/build/linux-6.1.9/arch/arm64/boot/dts/.dtb > Fixes: > - http://autobuild.buildroot.org/results/44287ccc8cc9767704642919e6d928d1f57b436d > Signed-off-by: Fabrice Fontaine > --- > utils/genrandconfig | 4 ++++ > 1 file changed, 4 insertions(+) > diff --git a/utils/genrandconfig b/utils/genrandconfig > index a3d98119c7..ca465547d8 100755 > --- a/utils/genrandconfig > +++ b/utils/genrandconfig > @@ -487,6 +487,10 @@ def fixup_config(sysinfo, configfile): > 'BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n' in configlines: > return False Hmm, this doesn't match current code? Manually fixed up and committed, thanks. > + if 'BR2_TARGET_BOOT_WRAPPER_AARCH64=y\n' in configlines and \ > + 'BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS=""\n' in configlines: > + return False > + > if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ > 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: > return False > -- > 2.39.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 15:22:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:22:54 +0100 Subject: [Buildroot] [git commit] utils/genrandconfig: add boot-wrapper-aarch64 handling Message-ID: <20230227152416.6AC3E86C09@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad4982d18e66ec909b0c906768d233fd8d4a1be0 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 7689b72e00fd4d8c017880004e83a1c79144ab7b: configure: error: Could not find DTB file: /home/autobuild/autobuild/instance-9/output-1/build/linux-6.1.9/arch/arm64/boot/dts/.dtb Fixes: - http://autobuild.buildroot.org/results/44287ccc8cc9767704642919e6d928d1f57b436d Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 6ec398851a..2b0baedf31 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -492,6 +492,10 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_BAREBOX_USE_DEFCONFIG=y\n') configlines.remove('BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n') + if 'BR2_TARGET_BOOT_WRAPPER_AARCH64=y\n' in configlines and \ + 'BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS=""\n' in configlines: + return False + if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: return False From peter at korsgaard.com Mon Feb 27 15:36:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:36:46 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/sudo: fix SUDO_ENABLE_SUDO_GROUP_RULE following version bump Message-ID: <20230227153748.2F3A586C1D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35ddf2f7707d33c8272fddeb2a0fae5647ed8426 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Since the version bump of sudo to v1.9.11p2 in commit 9b7f8da96b, the sed magic in SUDO_ENABLE_SUDO_GROUP_RULE no longer does its job, due to a slight change in the example sudoers file provided by upstream sudo. This commit fixes the regexp to match the new sudoers file. Fixes bug #14891 (https://bugs.busybox.net/show_bug.cgi?id=14891) Reported-by: Matthias Hardt Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit 079fccdee5a2a10fc8275094512b8423548ea147) Signed-off-by: Peter Korsgaard --- package/sudo/sudo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 8bf1ce5e9c..c4eaafa6b1 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -82,7 +82,7 @@ define SUDO_USERS endef define SUDO_ENABLE_SUDO_GROUP_RULE - $(SED) '/^# \%sudo\tALL=(ALL) ALL/s/^# //' $(TARGET_DIR)/etc/sudoers + $(SED) '/^# \%sudo\tALL=(ALL:ALL) ALL/s/^# //' $(TARGET_DIR)/etc/sudoers endef SUDO_POST_INSTALL_TARGET_HOOKS += SUDO_ENABLE_SUDO_GROUP_RULE From peter at korsgaard.com Mon Feb 27 15:38:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:38:05 +0100 Subject: [Buildroot] [git commit] package/sudo: fix SUDO_ENABLE_SUDO_GROUP_RULE following version bump In-Reply-To: (Marcus Hoffmann's message of "Mon, 27 Feb 2023 15:25:06 +0100") References: <20220718215158.C299083CCF@busybox.osuosl.org> Message-ID: <87356rm84i.fsf@dell.be.48ers.dk> >>>>> "Marcus" == Marcus Hoffmann writes: > Hi Peter, > the needs to be backported to 2022.11.x and 2022.02.x This is a commit from July 2022, so it is already in 2022.11.x (and 2022.08.x): git branch --contains 079fccdee5a2a10fc8275094512b8423548ea147|grep '2022\.' 2022.08.x 2022.11.x But it was indeed missed from 2022.02.x: git shortlog 2022.02..2022.02.x -- package/sudo Fabrice Fontaine (2): package/sudo: fix CVE-2022-43995 package/sudo: bump to version 1.9.11p2 Francois Perrad (1): package/sudo: bump to version 1.9.12p1 Nuno Gon?alves (2): packages/sudo: explicitly set with-tzdir packages/sudo: explicitly set enable-tmpfiles.d Yair Ben-Avraham (1): package/sudo: security bump to version 1.9.12p2 So I have cherry-picked it now, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 16:02:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:02:41 +0100 Subject: [Buildroot] [PATCH] package/rtl8723bu: fix module installation In-Reply-To: <20230225210357.1449825-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sat, 25 Feb 2023 22:03:57 +0100") References: <20230225210357.1449825-1-giulio.benetti@benettiengineering.com> Message-ID: <87wn43ksf2.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > At the moment module is build but not installed to target/. To fix this > let's bump package to 2023-02-18 version on master branch to fix module > installation. > Signed-off-by: Giulio Benetti Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 16:03:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:03:42 +0100 Subject: [Buildroot] [PATCH 1/1] boot/mxs-bootlets: fix build without any bootstream In-Reply-To: <20230225231419.22342-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 00:14:19 +0100") References: <20230225231419.22342-1-fontaine.fabrice@gmail.com> Message-ID: <87sferksdd.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since the addition of the package > in commit 2a636d15217cd326b4546e7017538c7a9e9d399c: > sed -i 's,[^ > *]power_prep.*;,\tpower_prep="/home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/power_prep/power_prep";,' > /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/ > sed: couldn't edit /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/: not a regular file > Fixes: > - http://autobuild.buildroot.org/results/b4b26f6b02fd1991f46eba5db240e5050b96d333 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 16:04:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:04:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtty: fix openssl static build with -latomic In-Reply-To: <20230226195315.1184297-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 20:53:15 +0100") References: <20230226195315.1184297-1-fontaine.fabrice@gmail.com> Message-ID: <87o7pfksc6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following openssl static build failure with -latomic raised > since bump to version 8.1.0 in commit > 7e608885a2df51ba77378f210f4c0e8cb59d5b8b: > /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: > /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): > in function `ssl_cert_free': > ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' > Fixes: > - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 16:00:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:00:33 +0100 Subject: [Buildroot] [git commit] package/rtl8723bu: fix module installation Message-ID: <20230227160515.DEB7586C3A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df83b6fb1404826cc6dbc154c5b4b5cb5a94c1ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master At the moment module is build but not installed to target/. To fix this let's bump package to 2023-02-18 version on master branch to fix module installation. Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 6a28c34773..bc3b8fc727 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 21372b654886c6d100f46636d7807428698bd618e00db1b8b49cfc3037e46d10 rtl8723bu-f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255.tar.gz +sha256 d0db523f256795d8f3284fa2ec03855f231747ede8337e878bc096325b965654 rtl8723bu-92c19318cb54ef96c2cfb4a22b2c98eb512812d8.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index af1ac9454e..ad9bb9a462 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255 +RTL8723BU_VERSION = 92c19318cb54ef96c2cfb4a22b2c98eb512812d8 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) From peter at korsgaard.com Mon Feb 27 16:03:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:03:15 +0100 Subject: [Buildroot] [git commit] boot/mxs-bootlets: fix build without any bootstream Message-ID: <20230227160515.E92BD86C3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c4435190773195fc5d1a97f819e1160f4bd52ca 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 2a636d15217cd326b4546e7017538c7a9e9d399c: sed -i 's,[^ *]power_prep.*;,\tpower_prep="/home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/power_prep/power_prep";,' /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/ sed: couldn't edit /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/: not a regular file Fixes: - http://autobuild.buildroot.org/results/b4b26f6b02fd1991f46eba5db240e5050b96d333 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- boot/mxs-bootlets/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in index b3e392afa8..8f9334b610 100644 --- a/boot/mxs-bootlets/Config.in +++ b/boot/mxs-bootlets/Config.in @@ -1,6 +1,8 @@ config BR2_TARGET_MXS_BOOTLETS bool "mxs-bootlets" depends on BR2_arm + depends on BR2_TARGET_BAREBOX || BR2_LINUX_KERNEL || \ + BR2_TARGET_UBOOT help Stage1 bootloaders for Freescale iMX23/iMX28 SoCs From peter at korsgaard.com Mon Feb 27 16:04:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:04:16 +0100 Subject: [Buildroot] [git commit] package/rtty: fix openssl static build with -latomic Message-ID: <20230227160516.0093C86C3C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3aa7821d77386b597c7c63d9bdafa3278df60c36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following openssl static build failure with -latomic raised since bump to version 8.1.0 in commit 7e608885a2df51ba77378f210f4c0e8cb59d5b8b: /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...1-CMakeLists.txt-prefer-pkg_check_modules.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch new file mode 100644 index 0000000000..3714050445 --- /dev/null +++ b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch @@ -0,0 +1,40 @@ +From 565c003ac412c9b0fa39d208d4a911f4300477c3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 20:39:11 +0100 +Subject: [PATCH] CMakeLists.txt: prefer pkg_check_modules + +Prefer pkg_check_modules over find_package to avoid the following static +build failure with openssl and -latomic: + +/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': +ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' + +Fixes: + - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zhaojh329/ssl/pull/4] +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ssl/CMakeLists.txt b/src/ssl/CMakeLists.txt +index 4868bf7..36488c7 100644 +--- a/src/ssl/CMakeLists.txt ++++ b/src/ssl/CMakeLists.txt +@@ -14,10 +14,10 @@ endif() + + find_package(PkgConfig QUIET) + +-find_package(OpenSSL) ++pkg_check_modules(OPENSSL openssl) + + if (NOT OPENSSL_FOUND) +- pkg_check_modules(OPENSSL openssl) ++ find_package(OpenSSL) + endif() + + find_package(WolfSSL) +-- +2.39.1 + From fontaine.fabrice at gmail.com Mon Feb 27 16:08:22 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 27 Feb 2023 17:08:22 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/libpjsip: fix CVE-2022-235{3, 4}7 Message-ID: <20230227160822.1552039-1-fontaine.fabrice@gmail.com> https://github.com/pjsip/pjproject/security/advisories/GHSA-9pfh-r8x4-w26w https://github.com/pjsip/pjproject/security/advisories/GHSA-cxwq-5g9x-x7fr Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Peter Korsgaard): - Add missing patch ...ull-request-from-GHSA-9pfh-r8x4-w26w.patch | 99 +++++++++++++++++++ ...ull-request-from-GHSA-cxwq-5g9x-x7fr.patch | 54 ++++++++++ package/libpjsip/libpjsip.mk | 6 ++ 3 files changed, 159 insertions(+) create mode 100644 package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch create mode 100644 package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch diff --git a/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch new file mode 100644 index 0000000000..01e1878189 --- /dev/null +++ b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch @@ -0,0 +1,99 @@ +From d8440f4d711a654b511f50f79c0445b26f9dd1e1 Mon Sep 17 00:00:00 2001 +From: Nanang Izzuddin +Date: Tue, 20 Dec 2022 11:39:12 +0700 +Subject: [PATCH] Merge pull request from GHSA-9pfh-r8x4-w26w + +* Fix buffer overread in STUN message decoder + +* Updates based on comments + +[Retrieved from: +https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1] +Signed-off-by: Fabrice Fontaine +--- + pjnath/include/pjnath/stun_msg.h | 4 ++++ + pjnath/src/pjnath/stun_msg.c | 14 +++++++++++--- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h +index b52f95c586..e49f096f3a 100644 +--- a/pjnath/include/pjnath/stun_msg.h ++++ b/pjnath/include/pjnath/stun_msg.h +@@ -442,6 +442,7 @@ typedef enum pj_stun_status + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_msg_hdr + { + /** +@@ -473,6 +474,7 @@ typedef struct pj_stun_msg_hdr + pj_uint8_t tsx_id[12]; + + } pj_stun_msg_hdr; ++#pragma pack() + + + /** +@@ -490,6 +492,7 @@ typedef struct pj_stun_msg_hdr + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_attr_hdr + { + /** +@@ -506,6 +509,7 @@ typedef struct pj_stun_attr_hdr + pj_uint16_t length; + + } pj_stun_attr_hdr; ++#pragma pack() + + + /** +diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c +index 3def6b3eac..e904a0ba47 100644 +--- a/pjnath/src/pjnath/stun_msg.c ++++ b/pjnath/src/pjnath/stun_msg.c +@@ -746,7 +746,7 @@ PJ_DEF(int) pj_stun_set_padding_char(int chr) + + #define INIT_ATTR(a,t,l) (a)->hdr.type=(pj_uint16_t)(t), \ + (a)->hdr.length=(pj_uint16_t)(l) +-#define ATTR_HDR_LEN 4 ++#define ATTR_HDR_LEN sizeof(pj_stun_attr_hdr) + + static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos) + { +@@ -2327,6 +2327,14 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + status = pj_stun_msg_check(pdu, pdu_len, options); + if (status != PJ_SUCCESS) + return status; ++ } else { ++ /* For safety, verify packet length at least */ ++ pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20; ++ if (msg_len > pdu_len || ++ ((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len)) ++ { ++ return PJNATH_EINSTUNMSGLEN; ++ } + } + + /* Create the message, copy the header, and convert to host byte order */ +@@ -2345,7 +2353,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + p_response = NULL; + + /* Parse attributes */ +- while (pdu_len >= 4) { ++ while (pdu_len >= ATTR_HDR_LEN) { + unsigned attr_type, attr_val_len; + const struct attr_desc *adesc; + +@@ -2357,7 +2365,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + attr_val_len = (attr_val_len + 3) & (~3); + + /* Check length */ +- if (pdu_len < attr_val_len) { ++ if (pdu_len < attr_val_len + ATTR_HDR_LEN) { + pj_str_t err_msg; + char err_msg_buf[80]; + diff --git a/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch b/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch new file mode 100644 index 0000000000..82249a2076 --- /dev/null +++ b/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch @@ -0,0 +1,54 @@ +From bc4812d31a67d5e2f973fbfaf950d6118226cf36 Mon Sep 17 00:00:00 2001 +From: sauwming +Date: Fri, 23 Dec 2022 15:05:28 +0800 +Subject: [PATCH] Merge pull request from GHSA-cxwq-5g9x-x7fr + +* Fixed heap buffer overflow when parsing STUN errcode attribute + +* Also fixed uint parsing + +[Retrieved from: +https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36] +Signed-off-by: Fabrice Fontaine +--- + pjnath/src/pjnath/stun_msg.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c +index c6b0bdd284..b55d29849a 100644 +--- a/pjnath/src/pjnath/stun_msg.c ++++ b/pjnath/src/pjnath/stun_msg.c +@@ -1438,12 +1438,12 @@ static pj_status_t decode_uint_attr(pj_pool_t *pool, + attr = PJ_POOL_ZALLOC_T(pool, pj_stun_uint_attr); + GETATTRHDR(buf, &attr->hdr); + +- attr->value = GETVAL32H(buf, 4); +- + /* Check that the attribute length is valid */ + if (attr->hdr.length != 4) + return PJNATH_ESTUNINATTRLEN; + ++ attr->value = GETVAL32H(buf, 4); ++ + /* Done */ + *p_attr = attr; + +@@ -1757,14 +1757,15 @@ static pj_status_t decode_errcode_attr(pj_pool_t *pool, + attr = PJ_POOL_ZALLOC_T(pool, pj_stun_errcode_attr); + GETATTRHDR(buf, &attr->hdr); + ++ /* Check that the attribute length is valid */ ++ if (attr->hdr.length < 4) ++ return PJNATH_ESTUNINATTRLEN; ++ + attr->err_code = buf[6] * 100 + buf[7]; + + /* Get pointer to the string in the message */ + value.ptr = ((char*)buf + ATTR_HDR_LEN + 4); + value.slen = attr->hdr.length - 4; +- /* Make sure the length is never negative */ +- if (value.slen < 0) +- value.slen = 0; + + /* Copy the string to the attribute */ + pj_strdup(pool, &attr->reason, &value); diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 5cc0423f5d..24db641446 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -15,6 +15,12 @@ LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) +# 0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch +LIBPJSIP_IGNORE_CVES += CVE-2022-23537 + +# 0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch +LIBPJSIP_IGNORE_CVES += CVE-2022-23547 + LIBPJSIP_CFLAGS = $(TARGET_CFLAGS) -DPJ_HAS_IPV6=1 # relocation truncated to fit: R_68K_GOT16O -- 2.39.1 From peter at korsgaard.com Mon Feb 27 16:10:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:10:39 +0100 Subject: [Buildroot] [PATCH] package/libcurl: bump version to 7.88.1 Message-ID: <20230227161040.2239744-1-peter@korsgaard.com> Bugfix release fixing a number of issues introduced in 7.88.0: https://curl.se/changes.html#7_88_1 https://daniel.haxx.se/blog/2023/02/20/7-88-1-the-second-final-one/ Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 714b02acb0..32b3d0b5e2 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.88.0.tar.xz.asc +# https://curl.se/download/curl-7.88.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f curl-7.88.1.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index eb481e4782..1a1594a45e 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.88.0 +LIBCURL_VERSION = 7.88.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ -- 2.30.2 From peter at korsgaard.com Mon Feb 27 16:43:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:43:10 +0100 Subject: [Buildroot] [git commit] Update for 2023.02-rc2 Message-ID: <20230227164344.AB76386C46@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=debec267fc41b1b0ff3e23cbc06d3d4186bd466a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 20 ++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 52 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 21e349f3a8..04b49a94cb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,23 @@ +2023.02-rc2, released February 27th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: asterisk, at91dataflashboot, bind, + efivar, erlang, flac, fluent-bit, freerdp, gcc, gdal, gerbera, + gnuradio, gqrx, haproxy, hawktracer, imx-gpu-g2d, + intel-gmmlib, libarchive, libblockdev, libcamera-apps, libjxl, + libmodsecurity, libsigrokdecode, lightning, lirc-tools, + lttng-babeltrace, modem-manager, modsecurity2, + multipath-tools, mutt, mxs-bootlets, netsurf, network-manager, + nginx-naxsi, ntpsec, opensbi, optee-client, pcm-tools, + php-xdebug, pistache, postgresql, proxychains-ng, + python-m2crypto, python-numpy, python-webargs, + python-werkzeug, rtl8723bu, rtty, speechd, sudo, systemd, + tiff, tmux, wilc-driver, wpa_supplicant, xerces, + xtables-addons, xwayland, zabbix + + Removed packages: uccp420wlan + 2023.02-rc1, released February 20th, 2023 Numerous package updates and many (62) new packages. diff --git a/Makefile b/Makefile index c97086c09c..8edc90ac50 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02-rc1 +export BR2_VERSION := 2023.02-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1676923000 +BR2_VERSION_EPOCH = 1677516000 # 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 a6b9a9a7c4..12f967db14 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@ -

    Latest release candidate: 2023.02-rc1

    +

    Latest release candidate: 2023.02-rc2

    - +
    - +
    -

    buildroot-2023.02-rc1.tar.gz

    -

    PGP signature

    +

    buildroot-2023.02-rc2.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2023.02-rc1.tar.xz

    -

    PGP signature

    +

    buildroot-2023.02-rc2.tar.xz

    +

    PGP signature

    diff --git a/docs/website/news.html b/docs/website/news.html index 8acf454052..0f8bd26702 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

    News

      +
    • +
      +
      +
      +

      2023.02-rc2 released

      +

      27 February 2023

      +
      +
      +

      2023.02-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

      + +

      Head to the downloads page to pick up the + 2023.02-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • +
    • From peter at korsgaard.com Mon Feb 27 16:50:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:50:22 +0100 Subject: [Buildroot] Buildroot 2023.02-rc2 released Message-ID: <87k003kq7l.fsf@dell.be.48ers.dk> Hi, Buildroot 2023.02-rc2 is released - Go download it at: http://buildroot.net/downloads/buildroot-2023.02-rc2.tar.gz or http://buildroot.net/downloads/buildroot-2023.02-rc2.tar.xz Or get it from Git: git://git.buildroot.net/buildroot Later than hoped, but here is another release candidate. Please give it a spin and report any problems to the mailing list or bug tracker. Many thanks to the people contributing to this release: git shortlog -sn 2023.02-rc1.. 72 Fabrice Fontaine 2 Giulio Benetti 1 Alexander Egorenkov 1 Heiko Thiery 1 Julien Olivain 1 Lang Daniel 1 Marcus Folkesson 1 Maxim Kochetkov 1 Peter Korsgaard 1 Sergey Matyukevich 1 S?bastien Szymanski 1 Thomas Petazzoni For more details, see the CHANGES file: http://git.buildroot.net/buildroot/plain/CHANGES?id=2023.02-rc2 Expect the final 2023.02 release by the end of the week. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Mon Feb 27 17:15:48 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 27 Feb 2023 18:15:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: disable with header-only pugixml Message-ID: <20230227171548.140054-1-fontaine.fabrice@gmail.com> Fix the following build failure with header-only pugixml raised since commit cc3a4a7b1de7b158354c650d234339e8a969a730: /home/thomas/autobuild/instance-2/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.4.0/../../../../nios2-buildroot-linux-gnu/bin/ld: CMakeFiles/gerbera.dir/src/main.cc.o: in function `ConfigGenerator::~ConfigGenerator()': /home/thomas/autobuild/instance-2/output-1/build/gerbera-1.10.0/src/config/config_generator.h:33: undefined reference to `pugi::xml_document::~xml_document()' Fixes: - http://autobuild.buildroot.org/results/800537a1ef5f48d24c20aad7a9c96c56dfdc77f5 Signed-off-by: Fabrice Fontaine --- package/gerbera/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gerbera/Config.in b/package/gerbera/Config.in index 46a163ec78..e1f09e6780 100644 --- a/package/gerbera/Config.in +++ b/package/gerbera/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_GERBERA depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # fmt + depends on !BR2_PACKAGE_PUGIXML_HEADER_ONLY select BR2_PACKAGE_FMT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBUPNP if !BR2_PACKAGE_LIBNPUPNP @@ -32,3 +33,6 @@ comment "gerbera needs a toolchain w/ C++, dynamic library, threads, wchar, gcc depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_8 + +comment "gerbera can't be built with header-only pugixml" + depends on BR2_PACKAGE_PUGIXML_HEADER_ONLY -- 2.39.1 From ju.o at free.fr Mon Feb 27 20:53:33 2023 From: ju.o at free.fr (Julien Olivain) Date: Mon, 27 Feb 2023 21:53:33 +0100 Subject: [Buildroot] [PATCH next 1/2] support/testing/tests/package/test_stress_ng.py: new runtime test Message-ID: <20230227205334.497405-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- Patch tested on top of branch next at commit b793f3a with command: python3 -m flake8 support/testing/tests/package/test_stress_ng.py [no-output] --- DEVELOPERS | 1 + .../testing/tests/package/test_stress_ng.py | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 support/testing/tests/package/test_stress_ng.py diff --git a/DEVELOPERS b/DEVELOPERS index d052e59122..f00614468f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1732,6 +1732,7 @@ F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ +F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_z3.py F: support/testing/tests/package/test_z3/ diff --git a/support/testing/tests/package/test_stress_ng.py b/support/testing/tests/package/test_stress_ng.py new file mode 100644 index 0000000000..12fd6ec9e6 --- /dev/null +++ b/support/testing/tests/package/test_stress_ng.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestStressNG(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_STRESS_NG=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("stress-ng --version") + self.assertRunOk("stress-ng --cpu 1 --timeout 3") -- 2.39.2 From ju.o at free.fr Mon Feb 27 20:53:34 2023 From: ju.o at free.fr (Julien Olivain) Date: Mon, 27 Feb 2023 21:53:34 +0100 Subject: [Buildroot] [PATCH next 2/2] package/stress-ng: bump to version V0.15.04 In-Reply-To: <20230227205334.497405-1-ju.o@free.fr> References: <20230227205334.497405-1-ju.o@free.fr> Message-ID: <20230227205334.497405-2-ju.o@free.fr> This commit dropped the patch, included upstream in: https://github.com/ColinIanKing/stress-ng/commit/5d419c790e648c7a2f96f34ed1b93b326f725545 which was included in V0.14.04. Three patches are also introduced to fix build issues (all upstream not but not yet in version). Also, this new version now depends on BR2_TOOLCHAIN_HAS_SYNC_4. Finally, a new _MAKE_FLAGS is introduced to prevent the package to modify too much its CFLAGS. For change log since V0.13.05, see: - https://github.com/ColinIanKing/stress-ng/blob/V0.15.04/debian/changelog or commit logs: - https://github.com/ColinIanKing/stress-ng/commits/V0.15.04 Signed-off-by: Julien Olivain --- Patch tested on top of branch next at commit b793f3a with commands: make check-package ... 0 warnings generated support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_stress_ng ... OK utils/test-pkg -a -p stress-ng arm-aarch64 [ 1/45]: OK bootlin-aarch64-glibc [ 2/45]: OK bootlin-arcle-hs38-uclibc [ 3/45]: SKIPPED bootlin-armv5-uclibc [ 4/45]: OK bootlin-armv7-glibc [ 5/45]: OK bootlin-armv7m-uclibc [ 6/45]: SKIPPED bootlin-armv7-musl [ 7/45]: OK bootlin-m68k-5208-uclibc [ 8/45]: SKIPPED bootlin-m68k-68040-uclibc [ 9/45]: OK bootlin-microblazeel-uclibc [10/45]: OK bootlin-mipsel32r6-glibc [11/45]: OK bootlin-mipsel-uclibc [12/45]: OK bootlin-nios2-glibc [13/45]: SKIPPED bootlin-openrisc-uclibc [14/45]: OK bootlin-powerpc64le-power8-glibc [15/45]: OK bootlin-powerpc-e500mc-uclibc [16/45]: OK bootlin-riscv32-glibc [17/45]: OK bootlin-riscv64-glibc [18/45]: OK bootlin-riscv64-musl [19/45]: OK bootlin-s390x-z13-glibc [20/45]: OK bootlin-sh4-uclibc [21/45]: OK bootlin-sparc64-glibc [22/45]: OK bootlin-sparc-uclibc [23/45]: SKIPPED bootlin-x86-64-glibc [24/45]: OK bootlin-x86-64-musl [25/45]: OK bootlin-x86-64-uclibc [26/45]: OK bootlin-xtensa-uclibc [27/45]: OK br-arm-basic [28/45]: OK br-arm-full-nothread [29/45]: OK br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [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]: OK 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-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: SKIPPED 45 builds, 6 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- ...1-Makefile-fix-build-with-kernel-5.6.patch | 60 -------------- ...build-with-HAVE_SYSCALL-or-__NR_mmap.patch | 54 +++++++++++++ ...002-stress-regs-fix-build-on-riscv32.patch | 43 ++++++++++ ...introduce-PRESERVE_CFLAGS-build-flag.patch | 78 +++++++++++++++++++ package/stress-ng/Config.in | 2 + package/stress-ng/stress-ng.hash | 2 +- package/stress-ng/stress-ng.mk | 7 +- 7 files changed, 183 insertions(+), 63 deletions(-) delete mode 100644 package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch create mode 100644 package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch create mode 100644 package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch create mode 100644 package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch diff --git a/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch b/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch deleted file mode 100644 index 4c62da3241..0000000000 --- a/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5d419c790e648c7a2f96f34ed1b93b326f725545 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 13 Aug 2022 17:17:05 +0200 -Subject: [PATCH] Makefile: fix build with kernel < 5.6 - -Fix the following build failure with kernel >= 5.1 and < 5.5 (i.e. -before -https://github.com/torvalds/linux/commit/9e3aa61ae3e01ce1ce6361a41ef725e1f4d1d2bf) -raised since version 0.11.21 and -https://github.com/ColinIanKing/stress-ng/commit/3d6fccdbe53d0cbcb75dd4b91571aaaae7ee1ad4: - -In file included from stress-io-uring.c:26: -io-uring.h:1:9: error: macro names must be identifiers - 1 | #define #define HAVE_IORING_OP_NOP 0 - | ^ - -Moreover, IORING_OP_FALLOCATE is not available before kernel 5.6 and -https://github.com/torvalds/linux/commit/d63d1b5edb7b832210bfde587ba9e7549fa064eb - -Fixes: - - http://autobuild.buildroot.org/results/1bf3f2bbc849bdce531d56b1024fa87f0c1ae667 - -Signed-off-by: Fabrice Fontaine -[Retrieved (and backported) from -https://github.com/ColinIanKing/stress-ng/commit/5d419c790e648c7a2f96f34ed1b93b326f725545] ---- - Makefile | 2 +- - stress-io-uring.c | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 2f9cc9918..ee17ae08b 100644 ---- a/Makefile -+++ b/Makefile -@@ -528,7 +528,7 @@ stress-personality.c: personality.h - # - io-uring.h: - $(V)$(CPP) $(CFLAGS) core-io-uring.c | $(GREP) IORING_OP | sed 's/,//' | \ -- sed 's/IORING_OP_/#define HAVE_IORING_OP_/' > io-uring.h -+ sed 's/.*\(IORING_OP_.*\)/#define HAVE_\1/' > io-uring.h - $(Q)echo "MK io-uring.h" - - stress-io-uring.c: io-uring.h -diff --git a/stress-io-uring.c b/stress-io-uring.c -index ab9fd0749..84f463611 100644 ---- a/stress-io-uring.c -+++ b/stress-io-uring.c -@@ -311,7 +311,11 @@ static inline int stress_io_uring_complete( - break; - - cqe = &cring->cqes[head & *submit->cq_ring.ring_mask]; -- if ((cqe->res < 0) && (opcode != IORING_OP_FALLOCATE)) { -+ if ((cqe->res < 0) -+#ifdef HAVE_IORING_OP_FALLOCATE -+ && (opcode != IORING_OP_FALLOCATE) -+#endif -+ ) { - const int err = abs(cqe->res); - - /* Silently ignore EOPNOTSUPP completion errors */ diff --git a/package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch b/package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch new file mode 100644 index 0000000000..41a2647133 --- /dev/null +++ b/package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch @@ -0,0 +1,54 @@ +From 625dd7e458e6aa488f7dd4764e4a62b6fbf79a9d Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Thu, 23 Feb 2023 21:54:16 +0100 +Subject: [PATCH] stress-mmap: fix build with HAVE_SYSCALL or __NR_mmap2 is + undefined + +Commit afae500a added macro tests for defined(HAVE_SYSCALL) and +system call numbers. + +More specifically, in stress-mmap.c, function mmap2_try() was defined +only if __NR_mmap2 is defined. See: +https://github.com/ColinIanKing/stress-ng/commit/afae500a23b198b9df421ad0fd9270fcdf65c3fb#diff-ffb0db2473f6c5e1b93dd33bce389ee836671a628fff9f903d097733f7ddfc9c + +This commit forgot to replicate the same test when the mmap2_try() +function is used later at: +https://github.com/ColinIanKing/stress-ng/blob/50f3ef2560e928c4694894be0bb652e663af5076/stress-mmap.c#L754 + +When HAVE_SYSCALL or __NR_mmap2 is undefined, compilation fails with: + + stress-mmap.c: In function 'stress_mmap': + stress-mmap.c:809:31: error: 'mmap2_try' undeclared (first use in this function); did you mean 'mmap_prot'? + context.mmap = (mmap_func_t)mmap2_try; + ^~~~~~~~~ + mmap_prot + stress-mmap.c:809:31: note: each undeclared identifier is reported only once for each function it appears in + +This patch fixes this issue. + +Upstream-reference: +https://github.com/ColinIanKing/stress-ng/commit/3da49180fdfa8a70307569202ed9431f5295913e + +Signed-off-by: Julien Olivain +--- + stress-mmap.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/stress-mmap.c b/stress-mmap.c +index cf343078..68f5a9b8 100644 +--- a/stress-mmap.c ++++ b/stress-mmap.c +@@ -805,7 +805,9 @@ static int stress_mmap(const stress_args_t *args) + context.mmap_file = true; + + if (mmap_mmap2) { +-#if defined(HAVE_MMAP2) ++#if defined(HAVE_MMAP2) && \ ++ defined(HAVE_SYSCALL) && \ ++ defined(__NR_mmap2) + context.mmap = (mmap_func_t)mmap2_try; + #else + if (args->instance == 0) +-- +2.39.2 + diff --git a/package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch b/package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch new file mode 100644 index 0000000000..cb2a507bfd --- /dev/null +++ b/package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch @@ -0,0 +1,43 @@ +From 40309f5d313524f4189f4ef158920391e92e226d Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Thu, 23 Feb 2023 21:38:25 +0100 +Subject: [PATCH] stress-regs: fix build on riscv32 + +RISC-V register test routine is using 64bit registers only. +When compiling on 32bit RISC-V, compilation fails with output: + + stress-regs.c: In function 'stress_regs_helper': + stress-regs.c:485:27: error: register specified for 's1' isn't suitable for data type + 485 | register uint64_t s1 __asm__("s1") = v; + | ^~ + stress-regs.c:495:27: error: register specified for 's11' isn't suitable for data type + 495 | register uint64_t s11 __asm__("s11") = s1 ^ 0xa5a5a5a5a5a5a5a5ULL; + | ^~~ + +This patch fix this issue by protecting the stress_regs_helper() +function with an additional test, to restrict to 64bit. + +Upstream-reference: +https://github.com/ColinIanKing/stress-ng/commit/6c335ac3abba535e79ddbddf34591ef5b9ee0a96 + +Signed-off-by: Julien Olivain +--- + stress-regs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/stress-regs.c b/stress-regs.c +index 4d4d32d2..0ffac4d1 100644 +--- a/stress-regs.c ++++ b/stress-regs.c +@@ -473,7 +473,7 @@ do { \ + } + #endif + +-#if defined(STRESS_ARCH_RISCV) ++#if defined(STRESS_ARCH_RISCV) && (__riscv_xlen == 64) + + #define STRESS_REGS_HELPER + /* +-- +2.39.2 + diff --git a/package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch b/package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch new file mode 100644 index 0000000000..beb5429dc1 --- /dev/null +++ b/package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch @@ -0,0 +1,78 @@ +From d3ab0bad6afc2e8f4be70fe38dd24788f1b3d4be Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 24 Feb 2023 21:11:30 +0100 +Subject: [PATCH] Makefile: introduce PRESERVE_CFLAGS build flag + +The stress-ng Makefile includes many nice environment auto-detection +features to adjust compilation flags. This is very convenient in +many compilation use-cases. However, in some other specific cross +compilation environments, those automatic CFLAGS adjustments may +create compilation failures. + +For example, commit c00e695ed5 added -fstack-protector-strong if the +compiler recognize the flag. In some situations, for example a gcc +toolchain based on uClibc-ng without stack-protector libssp +enabled, gcc will recognize the option. Then, the Makefile adds the +option to CFLAGS, and the compilation/link fails at link time with an +error like: + + /toolchain/arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lssp_nonshared: No such file or directory + /toolchain/arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lssp: No such file or directory + +stress-ng is included in the Buildroot build system [1] [2], which +supports many architectures and toolchain configurations. This build +system carefully controls its CFLAGS. In such a case, it is +preferable for a package to avoid changing compilation flags. + +This patch introduces the PRESERVE_CFLAGS Makefile variable which will +disable those CFLAGS adjustments, if set to 1. The current build +behavior is preserved if unset. + +Upstream-reference: +https://github.com/ColinIanKing/stress-ng/commit/3d87d50561505a5a79008c01e35fc2e100000160 + +[1] https://buildroot.org/ +[2] https://git.buildroot.org/buildroot/tree/package/stress-ng?h=2022.11.1 + +Signed-off-by: Julien Olivain +--- + Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Makefile b/Makefile +index 7a969aba..35151d74 100644 +--- a/Makefile ++++ b/Makefile +@@ -45,6 +45,7 @@ endif + # Test for hardening flags and apply them if applicable + # + MACHINE = $(shell uname -m) ++ifneq ($(PRESERVE_CFLAGS),1) + ifneq ($(MACHINE),$(filter $(MACHINE),alpha parisc)) + ifeq ($(shell $(CC) $(CFLAGS) -fstack-protector-strong -E -xc /dev/null > /dev/null 2>& 1 && echo 1),1) + CFLAGS += -fstack-protector-strong +@@ -58,6 +59,7 @@ ifeq ($(shell $(CC) $(CFLAGS) -D_FORTIFY_SOURCE=2 -E -xc /dev/null > /dev/null 2 + CFLAGS += -D_FORTIFY_SOURCE=2 + endif + endif ++endif + + # + # Expected build warnings +@@ -83,11 +85,13 @@ PRE_V= + PRE_Q=@# + endif + ++ifneq ($(PRESERVE_CFLAGS),1) + ifeq ($(findstring icc,$(CC)),icc) + CFLAGS += -no-inline-max-size -no-inline-max-total-size + CFLAGS += -axAVX,CORE-AVX2,CORE-AVX-I,CORE-AVX512,SSE2,SSE3,SSSE3,SSE4.1,SSE4.2,SANDYBRIDGE,SKYLAKE,SKYLAKE-AVX512,TIGERLAKE,SAPPHIRERAPIDS + CFLAGS += -ip -falign-loops -funroll-loops -ansi-alias -fma -qoverride-limits + endif ++endif + + #ifeq ($(findstring clang,$(CC)),clang) + #CFLAGS += -Weverything +-- +2.39.2 + diff --git a/package/stress-ng/Config.in b/package/stress-ng/Config.in index 839cbb1cc0..918c3db194 100644 --- a/package/stress-ng/Config.in +++ b/package/stress-ng/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_STRESS_NG bool "stress-ng" depends on BR2_USE_MMU # fork() # perf.c needs PERF_COUNT_HW_REF_CPU_CYCLES + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 and ARC depends on !BR2_nios2 @@ -16,5 +17,6 @@ config BR2_PACKAGE_STRESS_NG comment "stress-ng needs a toolchain w/ headers >= 3.3" depends on !BR2_nios2 && !BR2_arc + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash index 2e3f998769..5b967d2b95 100644 --- a/package/stress-ng/stress-ng.hash +++ b/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3de49e1100866634f549e99c1644283d0cde817b844a69dcf7f80afa2227d350 stress-ng-0.13.05.tar.gz +sha256 92922b979b5ca6ee05b03fd792c32a0b25a01fea6161b418b5e672c64ffb549f stress-ng-0.15.04.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 0b2287c7fb..28116b455d 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -4,11 +4,14 @@ # ################################################################################ -STRESS_NG_VERSION = 0.13.05 +STRESS_NG_VERSION = 0.15.04 STRESS_NG_SITE = $(call github,ColinIanKing,stress-ng,V$(STRESS_NG_VERSION)) STRESS_NG_LICENSE = GPL-2.0+ STRESS_NG_LICENSE_FILES = COPYING +STRESS_NG_MAKE_FLAGS = \ + PRESERVE_CFLAGS=1 + ifeq ($(BR2_PACKAGE_LIBBSD),y) STRESS_NG_DEPENDENCIES += libbsd endif @@ -18,7 +21,7 @@ STRESS_NG_DEPENDENCIES += keyutils endif define STRESS_NG_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(STRESS_NG_MAKE_FLAGS) endef # Don't use make install otherwise stress-ng will be rebuild without -- 2.39.2 From ps.report at gmx.net Mon Feb 27 21:08:23 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 27 Feb 2023 22:08:23 +0100 Subject: [Buildroot] [PATCH v1] package/speechd: fix gettext version mismatch Message-ID: <20230227210823.10437-1-ps.report@gmx.net> - fix gettext version mismatch in case of BR2_SYSTEM_ENABLE_NLS and BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-gnu" by setting SPEECHD_GETTEXTIZE Fixes: - http://autobuild.buildroot.net/results/283333290c5adb48d0c6e592b3261992537f92d3 Making all in po *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.19 but the autoconf macros are from gettext version 0.20 Signed-off-by: Peter Seiderer --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index dee94a6752..ec62980986 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -11,6 +11,7 @@ SPEECHD_LICENSE_FILES = COPYING.GPL-2 COPYING.GPL-3 COPYING.LGPL SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES +SPEECHD_GETTEXTIZE = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" SPEECHD_CONF_OPTS = --without-kali -- 2.39.2 From vfazio at xes-inc.com Mon Feb 27 21:17:40 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Mon, 27 Feb 2023 21:17:40 +0000 Subject: [Buildroot] [PATCH v1] package/speechd: fix gettext version mismatch Message-ID: Peter, > -----Original Message----- > From: buildroot On Behalf Of Peter > Seiderer > Sent: Monday, February 27, 2023 3:08 PM > To: buildroot at buildroot.org > Subject: [External] - [Buildroot] [PATCH v1] package/speechd: fix gettext > version mismatch > > - fix gettext version mismatch in case of BR2_SYSTEM_ENABLE_NLS and > BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-gnu" by setting > SPEECHD_GETTEXTIZE > > Fixes: > > - > http://autobuild.buildroot.net/results/283333290c5adb48d0c6e592b3261992 > 537f92d3 > > Making all in po > *** error: gettext infrastructure mismatch: using a Makefile.in.in from > gettext version 0.19 but the autoconf macros are from gettext version 0.20 > > Signed-off-by: Peter Seiderer > --- > package/speechd/speechd.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk > index dee94a6752..ec62980986 100644 > --- a/package/speechd/speechd.mk > +++ b/package/speechd/speechd.mk > @@ -11,6 +11,7 @@ SPEECHD_LICENSE_FILES = COPYING.GPL-2 > COPYING.GPL-3 COPYING.LGPL SPEECHD_INSTALL_STAGING = YES # > speechd source code is released without configure script > SPEECHD_AUTORECONF = YES > +SPEECHD_GETTEXTIZE = YES I wonder if this will actually be necessary after https://patchwork.ozlabs.org/project/buildroot/list/?series=343029 Can you test to see if it's still a problem after applying the series and using autopoint? Otherwise I'll try to find some time to test your patch with autopoint to see if there's still an issue. > SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile > SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" > SPEECHD_CONF_OPTS = --without-kali > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > CAUTION: This email originated from outside of the organization. Do not click > links or open attachments unless you recognize the sender and know the > content is safe. From ps.report at gmx.net Mon Feb 27 21:41:13 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 27 Feb 2023 22:41:13 +0100 Subject: [Buildroot] [PATCH v1] package/speechd: fix gettext version mismatch In-Reply-To: References: Message-ID: <20230227224113.0eb16910@gmx.net> Hello Vincent, On Mon, 27 Feb 2023 21:17:40 +0000, Vincent Fazio wrote: > Peter, > > > -----Original Message----- > > From: buildroot On Behalf Of Peter > > Seiderer > > Sent: Monday, February 27, 2023 3:08 PM > > To: buildroot at buildroot.org > > Subject: [External] - [Buildroot] [PATCH v1] package/speechd: fix gettext > > version mismatch > > > > - fix gettext version mismatch in case of BR2_SYSTEM_ENABLE_NLS and > > BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-gnu" by setting > > SPEECHD_GETTEXTIZE > > > > Fixes: > > > > - > > http://autobuild.buildroot.net/results/283333290c5adb48d0c6e592b3261992 > > 537f92d3 > > > > Making all in po > > *** error: gettext infrastructure mismatch: using a Makefile.in.in from > > gettext version 0.19 but the autoconf macros are from gettext version 0.20 > > > > Signed-off-by: Peter Seiderer > > --- > > package/speechd/speechd.mk | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk > > index dee94a6752..ec62980986 100644 > > --- a/package/speechd/speechd.mk > > +++ b/package/speechd/speechd.mk > > @@ -11,6 +11,7 @@ SPEECHD_LICENSE_FILES = COPYING.GPL-2 > > COPYING.GPL-3 COPYING.LGPL SPEECHD_INSTALL_STAGING = YES # > > speechd source code is released without configure script > > SPEECHD_AUTORECONF = YES > > +SPEECHD_GETTEXTIZE = YES > > I wonder if this will actually be necessary after https://patchwork.ozlabs.org/project/buildroot/list/?series=343029 > > Can you test to see if it's still a problem after applying the series and using autopoint? Yes, already on my ToDo list ;-), in the meantime (and for master branch/2023.2) this minimal patch... > Otherwise I'll try to find some time to test your patch with autopoint to see if there's still an issue. Thanks for taking a look at it... Regards, Peter > > > SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile > > SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" > > SPEECHD_CONF_OPTS = --without-kali > > -- > > 2.39.2 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > CAUTION: This email originated from outside of the organization. Do not click > > links or open attachments unless you recognize the sender and know the > > content is safe. > From ps.report at gmx.net Mon Feb 27 21:42:20 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 27 Feb 2023 22:42:20 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/speechd: add default configure options In-Reply-To: <20230227214220.12101-1-ps.report@gmx.net> References: <20230227214220.12101-1-ps.report@gmx.net> Message-ID: <20230227214220.12101-2-ps.report@gmx.net> - add default configure options for all optional speechd features/ output modules (disable all with additional library dependencies, enable oss) Signed-off-by: Peter Seiderer --- package/speechd/speechd.mk | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index b545863035..5944ea3a28 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -14,7 +14,22 @@ SPEECHD_AUTORECONF = YES SPEECHD_GETTEXTIZE = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" -SPEECHD_CONF_OPTS = --without-kali +SPEECHD_CONF_OPTS = \ + --disable-python \ + --without-espeak \ + --without-espeak-ng \ + --without-flite \ + --without-ibmtts \ + --without-voxin \ + --without-ivona \ + --without-pico \ + --without-baratinoo \ + --without-kali \ + --without-pulse \ + --without-libao \ + --without-alsa \ + --with-oss \ + --without-nas # fix missing config.rpath (needed for autoreconf) in the codebase define SPEECHD_TOUCH_CONFIG_RPATH -- 2.39.2 From ps.report at gmx.net Mon Feb 27 21:42:19 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 27 Feb 2023 22:42:19 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/speechd: fix libltdl enable/disable configure option Message-ID: <20230227214220.12101-1-ps.report@gmx.net> - libltdl usage is configured by --disable/enable-ltdl (see configure.ac 'AC_ARG_ENABLE([ltdl], [...])') Fixes: configure: WARNING: unrecognized options: [...] --with-libltdl Signed-off-by: Peter Seiderer --- package/speechd/speechd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index ec62980986..b545863035 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -24,9 +24,9 @@ SPEECHD_PRE_CONFIGURE_HOOKS += SPEECHD_TOUCH_CONFIG_RPATH ifeq ($(BR2_PACKAGE_LIBTOOL),y) SPEECHD_DEPENDENCIES += libtool -SPEECHD_CONF_OPTS += --with-libltdl +SPEECHD_CONF_OPTS += --enable-ltdl else -SPEECHD_CONF_OPTS += --without-libltdl +SPEECHD_CONF_OPTS += --disable-ltdl endif define SPEECHD_INSTALL_INIT_SYSTEMD -- 2.39.2 From ps.report at gmx.net Mon Feb 27 21:56:00 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 27 Feb 2023 22:56:00 +0100 Subject: [Buildroot] [PATCH v1] package/speechd: fix gettext version mismatch In-Reply-To: <20230227224113.0eb16910@gmx.net> References: <20230227224113.0eb16910@gmx.net> Message-ID: <20230227225600.786e1389@gmx.net> Hello Vincent, On Mon, 27 Feb 2023 22:41:13 +0100, Peter Seiderer wrote: > Hello Vincent, > > On Mon, 27 Feb 2023 21:17:40 +0000, Vincent Fazio wrote: > > > Peter, > > > > > -----Original Message----- > > > From: buildroot On Behalf Of Peter > > > Seiderer > > > Sent: Monday, February 27, 2023 3:08 PM > > > To: buildroot at buildroot.org > > > Subject: [External] - [Buildroot] [PATCH v1] package/speechd: fix gettext > > > version mismatch > > > > > > - fix gettext version mismatch in case of BR2_SYSTEM_ENABLE_NLS and > > > BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-gnu" by setting > > > SPEECHD_GETTEXTIZE > > > > > > Fixes: > > > > > > - > > > http://autobuild.buildroot.net/results/283333290c5adb48d0c6e592b3261992 > > > 537f92d3 > > > > > > Making all in po > > > *** error: gettext infrastructure mismatch: using a Makefile.in.in from > > > gettext version 0.19 but the autoconf macros are from gettext version 0.20 > > > > > > Signed-off-by: Peter Seiderer > > > --- > > > package/speechd/speechd.mk | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk > > > index dee94a6752..ec62980986 100644 > > > --- a/package/speechd/speechd.mk > > > +++ b/package/speechd/speechd.mk > > > @@ -11,6 +11,7 @@ SPEECHD_LICENSE_FILES = COPYING.GPL-2 > > > COPYING.GPL-3 COPYING.LGPL SPEECHD_INSTALL_STAGING = YES # > > > speechd source code is released without configure script > > > SPEECHD_AUTORECONF = YES > > > +SPEECHD_GETTEXTIZE = YES > > > > I wonder if this will actually be necessary after https://patchwork.ozlabs.org/project/buildroot/list/?series=343029 > > > > Can you test to see if it's still a problem after applying the series and using autopoint? package/speechd needs 'SPEECHD_AUTOPOINT = YES'... Regards, Peter > > Yes, already on my ToDo list ;-), in the meantime (and for master branch/2023.2) this minimal patch... > > > Otherwise I'll try to find some time to test your patch with autopoint to see if there's still an issue. > > Thanks for taking a look at it... > > Regards, > Peter > > > > > > SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile > > > SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" > > > SPEECHD_CONF_OPTS = --without-kali > > > -- > > > 2.39.2 > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > CAUTION: This email originated from outside of the organization. Do not click > > > links or open attachments unless you recognize the sender and know the > > > content is safe. > > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From stefan at agner.ch Tue Feb 28 07:15:02 2023 From: stefan at agner.ch (Stefan Agner) Date: Tue, 28 Feb 2023 08:15:02 +0100 Subject: [Buildroot] [PATCH] rtl8812au-aircrack-ng: bump to latest rev d98018 Message-ID: <893660729815cb737418892a77d27ba089a6cbde.1677568448.git.stefan@agner.ch> Fixes build against kernel 6.1.x. Signed-off-by: Stefan Agner --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index bc3a926314..cdf5f3b4e2 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eed4888da9cfdc0f83ad3335beaf73af33ce0796b0a2637aeec102d47e1eb8f0 rtl8812au-aircrack-ng-e7a4a390ccbdd768411e1b2a8922c47837f76b47.tar.gz +sha256 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index 45a6ce5729..ab3ebe2077 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = e7a4a390ccbdd768411e1b2a8922c47837f76b47 +RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE -- 2.39.1 From stefan at agner.ch Tue Feb 28 07:19:28 2023 From: stefan at agner.ch (Stefan Agner) Date: Tue, 28 Feb 2023 08:19:28 +0100 Subject: [Buildroot] [PATCH v2] package/dbus-broker: bump to release 33 In-Reply-To: <20230221094329.79cf0b8e@windsurf> References: <29cebb7af48c3652e440c61cc90fafa4fe3f8046.1676300324.git.stefan@agner.ch> <20230221094329.79cf0b8e@windsurf> Message-ID: On 2023-02-21 09:43, Thomas Petazzoni wrote: > Hello Stefan, > > On Mon, 13 Feb 2023 15:58:57 +0100 > Stefan Agner wrote: > >> This release contains mostly a bugfixes, with some improvements around >> error handling for unimplemented functionality and resiliency against >> runtime changes of dbus service-files. >> >> Signed-off-by: Stefan Agner > > Thanks a lot for the update. However see below for a comment. > >> --- >> package/dbus-broker/dbus-broker.hash | 6 +++--- >> package/dbus-broker/dbus-broker.mk | 2 +- >> 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash >> index f6c2cbe160..06c8f229b7 100644 >> --- a/package/dbus-broker/dbus-broker.hash >> +++ b/package/dbus-broker/dbus-broker.hash >> @@ -1,5 +1,5 @@ >> # Locally calculated >> -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz >> +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz >> sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE >> sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS >> sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md >> @@ -11,7 +11,7 @@ sha256 23f24eeaaded5fedd6e7840b6f7b73838f9a4e2112ad6a12fe1ef958f73d0214 subpro >> sha256 05113a24aca4c537819dd0d91b95b13edb85bea4b6a77a6d9269becb397ed374 subprojects/libcrbtree-3/README.md >> sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS >> sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md >> -sha256 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 subprojects/libcstdaux-1/AUTHORS >> -sha256 7c4b6c325b0bc02150089112f65132ee999b0f44500b73d1fc06d96c93161037 subprojects/libcstdaux-1/README.md >> +sha256 e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 subprojects/libcstdaux-1/AUTHORS >> +sha256 92006886d7f28894fef08bf97e35ef52147067bd3c4d4d6381da7c59f9901dae subprojects/libcstdaux-1/README.md > > When there are changes in the license files, we need to have a short > explanation in the commit log about these. Indeed, if we simply > "blindly" update the hashes, then having those hashes in the first > place is completely useless: the whole point of having hashes for > license files is to detect changes in the license files, analyze them > and justify if they require or not a change in how the licensing of the > package is described in Buildroot. Sure that makes sense. I checked license and posted a summary in a email response to v1. I missed adding this to the commit message. Will do and resend v3. -- Stefan > > Could you resend with an updated commit message that explain the > changes in the license files? Even if they are minimal/trivial, having > this explanation in the commit log will help the reviewers/maintainers > to make sure the changes in those license files have been verified. > > Thanks a lot! > > Thomas From stefan at agner.ch Tue Feb 28 07:20:36 2023 From: stefan at agner.ch (Stefan Agner) Date: Tue, 28 Feb 2023 08:20:36 +0100 Subject: [Buildroot] [PATCH v3] package/dbus-broker: bump to release 33 Message-ID: This release contains mostly a bugfixes, with some improvements around error handling for unimplemented functionality and resiliency against runtime changes of dbus service-files. Also update hashes of license files. There was no change in license, the hashes changed due to copyright date bump and additional authors listend in the same files. Signed-off-by: Stefan Agner --- Changes in v2: - Update license hashes Changes in v3: - Updated commit message to reflect reasons of license hash changes package/dbus-broker/dbus-broker.hash | 6 +++--- package/dbus-broker/dbus-broker.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash index f6c2cbe160..06c8f229b7 100644 --- a/package/dbus-broker/dbus-broker.hash +++ b/package/dbus-broker/dbus-broker.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md @@ -11,7 +11,7 @@ sha256 23f24eeaaded5fedd6e7840b6f7b73838f9a4e2112ad6a12fe1ef958f73d0214 subpro sha256 05113a24aca4c537819dd0d91b95b13edb85bea4b6a77a6d9269becb397ed374 subprojects/libcrbtree-3/README.md sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md -sha256 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 subprojects/libcstdaux-1/AUTHORS -sha256 7c4b6c325b0bc02150089112f65132ee999b0f44500b73d1fc06d96c93161037 subprojects/libcstdaux-1/README.md +sha256 e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 subprojects/libcstdaux-1/AUTHORS +sha256 92006886d7f28894fef08bf97e35ef52147067bd3c4d4d6381da7c59f9901dae subprojects/libcstdaux-1/README.md sha256 7e660796fea0400a1a9a539226c345b3c656a745a334e323e33258de7864e985 subprojects/libcutf8-1/AUTHORS sha256 106099cc1c488cbf8911f56da7977a955f6b27a7bb5b815985e59d9fae0e6fe7 subprojects/libcutf8-1/README.md diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index e82b79220d..c4e3679a2e 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_BROKER_VERSION = 32 +DBUS_BROKER_VERSION = 33 DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) -- 2.39.1 From thomas.petazzoni at bootlin.com Tue Feb 28 07:36:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 28 Feb 2023 07:36:58 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-27 Message-ID: <20230228073704.9CD9741824@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-27 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 10 | 9 | 0 | 19 | master | 140 | 126 | 1 | 267 | next | 12 | 17 | 0 | 29 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 11 host-binutils-2.38 | 9 host-go-1.19.6 | 8 glibc-2.36-81-g4f4d7a13edfd... | 7 linux-6.1.11 | 5 host-gdb-arc-2020.09-releas... | 4 libglib2-2.72.3 | 4 busybox-1.36.0 | 3 gerbera-1.10.0 | 3 host-rust-1.67.0 | 3 speechd-0.11.4 | 3 unknown | 3 brltty-6.5 | 2 host-gcc-final-11.3.0 | 2 host-pahole-1.24 | 2 ocf-linux-20171122 | 2 php-8.2.3 | 2 xenomai-3.0.10 | 2 assimp-5.2.5 | 1 bat-0.19.0 | 1 boost-1.80.0 | 1 check-0.15.2 | 1 dahdi-linux-3.2.0 | 1 ding-libs-0.6.2 | 1 dust-0.8.1 | 1 elfutils-0.186 | 1 freeradius-client-1.1.7 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/romfs/romfs.mk:32: /home... | 1 fs/ubi/ubi.mk:51: /tmp/inst... | 1 fs/ubi/ubi.mk:51: /tmp/inst... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gmp-6.2.1 | 1 gobject-introspection | 1 host-binutils-2.39 | 1 janet-1.26.0 | 1 jq-a17dd3248a666d01be75f6b1... | 1 libcap-ng-0.8.3 | 1 libfreeimage-3.18.0 | 1 libglvnd-1.4.0 | 1 libgpg-error-1.46 | 1 liblog4c-localtime-1.0 | 1 librsvg-2.50.7 | 1 libsigsegv-2.14 | 1 linux-5.10.162-cip24 | 1 linux-5.10.162-cip24-rt10 | 1 mariadb-10.3.36 | 1 micropython-1.19.1 | 1 network-manager-1.40.10 | 1 nodejs-16.18.1 | 1 olsr-0.9.8 | 1 package/multipath-tools/mul... | 1 pv-1.6.20 | 1 python-pyicu-2.10.2 | 1 quickjs-2021-03-27 | 1 rtl_433-22.11 | 1 rtty-8.1.0 | 1 sdl-1.2.15 | 1 valgrind-3.19.0 | 1 wolfssl-5.5.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/0b31c2ea3146bbe4f920f2de6ff1b583de0def62 | ORPH armeb | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/303a52e057dcca8afbbadc5a0aaa56b3f5ab5aaf | arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/5ed6380225146076acdea63b7b91fd02bee729dc | or1k | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/7d3bffd18470d35d960260d31cbf4005da216228 | microblazeel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/0c4ec33fe58fc251193d7eb71ffe53104de552fb | mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/504b7ea0dac9d031d638bd42340456325d6e9bc2 | ORPH mips64 | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/653640c27cc188020d2c1c298920cbaeadf03f92 | ORPH mips64 | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/f1919fa68fa571cf28a43929644c6932448fc1af | ORPH riscv32 | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/a20472e7959611da4699bdf7b9188e12c5b17c42 | ORPH mips | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/45b76a2ee84a3b8efa640bc4ac3c0d8044a18e0a | arceb | ding-libs-0.6.2 | NOK | http://autobuild.buildroot.net/results/f9eb3616c84e618e96a3ea37afce041cf7f81e04 | mipsel | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/25d97014b4b135e03262db3aa6ec786450c7cbbe | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/92af2d956385b58442e0596ef32ad3eea83b3d1d | ORPH riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/318e281c6d51186b68de60396c80ae3331ca1547 | sh4 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/3a6742d4a13aaf126cc7fd9bbebff0b1b6ec47ab | sparc64 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/3f85fe0e8b7d68ca1b5d4bf406daec63075c2862 | aarch64_be | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/dd0b73d20d7ee8dffa2a57c1fe84e9afac18e411 | x86_64 | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/f025d59d68fd3e7800125557c69b06fa5c85a72d | mips64 | fs/romfs/romfs.mk:32: /home... | NOK | http://autobuild.buildroot.net/results/cd91373053f44842624113da575a4957695c6c16 | x86_64 | fs/ubi/ubi.mk:51: /tmp/inst... | NOK | http://autobuild.buildroot.net/results/51b670ecdeeb9da060e078e52f917e75111c442f | mipsel | fs/ubi/ubi.mk:51: /tmp/inst... | NOK | http://autobuild.buildroot.net/results/24db2b3cef191980ead66afc33d7e0db18a77ff8 | arc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/412e156fc90bfcd5ced425a471d54f1cdcce2294 | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/766c2785b1ea9257bd032903fc2a356ff91657f7 | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/2a579c74e3320f28ef9754eccdaac82e10e677e5 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/fcf5ef5f6dcf8ac42be9b7eaa29a3ced8009d01d | sparc64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/c959ade5661aa9bd4f2871689259e31156a4a2fa | arceb | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/61873d2cd37b847bbfd379ea2c7cf4c0e0a983f4 | microblaze | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/74f7668f770f00fda03d73ef796d04cc6a3004a4 | microblaze | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/a7388f3cbe4a3da8f0e946240f7f020230874c5f | nios2 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/800537a1ef5f48d24c20aad7a9c96c56dfdc77f5 | microblazeel | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/5d1a9420174669758f121ce65d82e1cdaadab32d | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/61b8ee4f12ccd9a8de3e10a186914654f23ce263 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/1aa55feb9084ae7a06a46186b52b8aad1d1550ae | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/5b1fe0affa022ab63360ca21e62899b1c1ab1d6e | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/8ff20e3924e7a74bd7eec7b148723d41f4df378f | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/3e3ad96fc41f3cdf61fd3f49355be72f5364d564 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/dfd4a36489ceb2308d938fa5ab9494b2410c3d1d | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e7991c5f723b3eb38492f76d95abfe6bc0a2a8fd | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/45b06d3f503fbb4a79085fe0d75f88e72fb28980 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/d90a301050bd3a2e41a9d0358fbb672b102da2a9 | ORPH microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/a0cb43d96adc2295f01c99a6d2664b4fd2c75d7e | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/55eca1317844bf086456fd4433568131a08f6648 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d05e127654650383a257632c355bdb2c3153a43b | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/21676a787feb7615da7551d405ce21941e4c683b | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/9f4056e998915526e7e672c41fca79c88ed5284d | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/6ed048bab1b7458351a9dab5718360548c197a9b | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3dbcbe663e3749df3de7a79c0d6d861d98d85f60 | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/01534f2702f13e461228e16d49b117755b36e01d | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/79e44d02448c9972a0da5d67c5e44c46b742544e | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/662828c78252a08a439f49094b3864d69a72840b | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1b504d9e59b198d162c1d68f5d69903d15dd0b50 | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8317a20de677ced230746fc3dd9b2c59e0e6e0a0 | ORPH riscv64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/98b0354f79bda17963b8d34f0bee943997a9c6fc | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/f5baf343f35647fe0f3538424b80c1112ada888b | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2eaa4d369f2fadfced04e0e64fb9a9fa9cfdc61c | riscv32 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/d38528872616095fc3711a00beb32b2240b54cb3 | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/ece3252739724b2b5194fe4d7177dabe82e7c685 | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e272b8c04b690e7b6cbefa8e544e6c04be6ad7c9 | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/0ad6925c7e9d04c20bb5bf30dd1dcdb2d414b4ca | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6ba2be938f0328f55b7881422befc18e5a6bcf5c | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/af5626937b105c38bb98351083cf87694da94462 | or1k | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/4adf05014c19f778cae85e788c3650f7e3114125 | microblazeel | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/a8b14ab09aa89b2685f4ce9276b366707e10df75 | microblaze | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/8af90ef250cefb841ba7e01a2fd1d528cf01303e | arceb | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/002f6984edfb5ec29e6ef335fe8c38c9dfb324c5 | ORPH arceb | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/1d4ae1ae6cb8fc0acd1aced5c4b604f1302564d1 | ORPH arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/7af065d52405646b8d2c748ca6a0ced7683bc726 | ORPH arceb | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/fe03bdfa2ace6d707ad5d1071fae144d67fd073a | ORPH i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/d85a6eeb3ca789707c0d932adaffb744f8bc1367 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/a54726c45255f82a97ffc77c7050f0119c4852db | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/71fa137ecb92d4700e575594d5b6d4e5bb84d0b0 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/5d42c30dab698991fb4630e4cea23bbac73b8bde | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/6df838997647751b0aabdb9a7a8053b20b399932 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/0c04360fd7738d72010f75ce3d06dc20f49cda89 | riscv64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/1eb5d8baf1315b8ed69db9d4fb304c5e6fdf3e73 | aarch64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/62e559c3460318f5145f9cc479d75a3d128c1192 | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/f42dbded483737dea00ba7befa5c0bc6a6a19368 | i686 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/63f72cb4e81fe02dd35371796e611086a44a2735 | sparc64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/4727cfc9f17c66171950e8667ee7ab64f8c0dceb | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/f98f5ff1d568b9adaffd88597162bd240268fb48 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/46d5dc7ec4824e9b00c1b65c5db24a38a90c026c | m68k | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/f8ffb30f68847ed022fb457aae791d44787d663f | arc | jq-a17dd3248a666d01be75f6b1... | NOK | http://autobuild.buildroot.net/results/723adb73385154f3581fa50fc3e0fa1b0884769b | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/a295eae916cf7b372215b56d9bd7b6d1d2a63d86 | microblaze | libfreeimage-3.18.0 | NOK | http://autobuild.buildroot.net/results/1a4f3b8c9ca09442d961469d84e79818237f2b94 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/0b68ad01c772e766cafac08e79c78f4f95fd9817 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/9c91808550eedc49b87bd38c407bab37f1e574a4 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/d383d4de3fc2b2b7ec297c57f0afce430a5dec1a | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/9c07c36d20f9cc21f080d6b84ffbe6bb3e2256d8 | xtensa | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/8ca4ffd1c7d53fc93878d99f8769ac65f9c1740d | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/997b56b898791b4cb2775204292c5681a85ec938 | ORPH riscv64 | liblog4c-localtime-1.0 | NOK | http://autobuild.buildroot.net/results/f1f3a364f32d763e3cb15cc83ac6209c8738837a | arm | librsvg-2.50.7 | NOK | http://autobuild.buildroot.net/results/526e6f737a4800fe1e89ff41a898956915c8569a | powerpc | libsigsegv-2.14 | NOK | http://autobuild.buildroot.net/results/7810ac09e0294713b06a76f885c4c72b17100683 | sh4a | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/829b940836dde1d44ae6c9ee22b255c05ef7d47a | ORPH nios2 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/700e3c152309fa7012faa072e1accc44f94116f1 | ORPH sh4aeb | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/13ad9549335cfc8f33cee1687439dde766c4e947 | ORPH sh4aeb | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/877178f84d52a8d3a42f1d0dd83cf7e005b2a9bf | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/78d071d6fe74c73053e49f405b94972abef5ce11 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/7fd4b000759872f87dfafb958a2678f25e2e0448 | ORPH mipsel | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/62eccbb3075b71423816e19eb5d3d862253eec03 | ORPH sparc | mariadb-10.3.36 | NOK | http://autobuild.buildroot.net/results/189b534f704fdcaa7862f2d6da2f1473d2ff6612 | ORPH aarch64 | micropython-1.19.1 | NOK | http://autobuild.buildroot.net/results/51c20df596b29d85914e867f5887fa5f129c89fd | sparc64 | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/fdbf3577392812313605b5789edc608794591bc4 | ORPH x86_64 | nodejs-16.18.1 | NOK | http://autobuild.buildroot.net/results/07ff63bd149bd82a0bd1a4d0bb0d303c57c9f6f0 | i686 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/ab7388d1ccc31494927ca8b97bc3f8b2c1187909 | ORPH microblazeel | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/8e1bca2aacf2729c524abbb1ce795dbd71c5943c | ORPH powerpc64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/9b5d238c8e16f870fd39cdc97d1da025285fa352 | ORPH s390x | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/07855dab478627179adf0db01251445987b3e0ed | or1k | php-8.2.3 | NOK | http://autobuild.buildroot.net/results/849c0dad1dba4ca681e97d8b971b5691a7cde784 | microblaze | php-8.2.3 | NOK | http://autobuild.buildroot.net/results/87116d89f464003c24c5513ae76cb15888e3999e | armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/496994c1dd23b57df9fd6ddb5aa1de582705473d | ORPH nios2 | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/7fdff57a34a298524d2b4953c8b167cd37c1944c | sh4 | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/2d0e9bb746ecb3c0c3c1ba4878c98bfc4df5caca | mips64 | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/870543fe722313ffe111723593405a77eef5aad9 | arc | rtty-8.1.0 | NOK | http://autobuild.buildroot.net/results/d57d39d97fd83e9fe5a5936d5e8466bbbcf8600b | sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/85a85d4af3d102a26783b24abf163bb3cffe9391 | ORPH sparc64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/40202c8aeaf4a5e288dd775f9fce1b24bdc49bb6 | sparc64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/aa0579e226dfc03825c65c3f5c0ba0c10f770150 | aarch64_be | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/3778e4313e24a6178bc14d64989afc62f3fb4873 | armeb | unknown | NOK | http://autobuild.buildroot.net/results/19ec82de7dd5d9beb5bff9a4940eac0f492a530c | m68k | unknown | NOK | http://autobuild.buildroot.net/results/597365593180b0d54912f9e378deaf463c181791 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/7882d4dea44338752ae8b662c0fd5b8d23a20977 | mips64el | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/ddec98cc29362ef24d1f8ca5ae423f34e98c00aa | ORPH mips | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/bfdf24da8cf308594ace32ab7476dad993142ac8 | i686 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/ee7d25b225faf85c27f92cd4191a0c5bc5644efc | microblazeel | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/e8863c2d4e6ce66ce18e44d4d05ccc5650fb99e6 | Classification of failures by reason for next --------------------------------------------- unknown | 5 host-rust-1.67.1 | 2 flare-engine-1.14 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 host-binutils-2.39 | 1 host-pahole-1.24 | 1 python-numpy-1.23.5 | 1 quickjs-2021-03-27 | 1 sdl-1.2.15 | 1 uccp420wlan-6.9.1 | 1 uqmi-0a19b5b77140465c29e2af... | 1 xfsprogs-5.14.2 | 1 Detail of failures for next --------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | flare-engine-1.14 | NOK | http://autobuild.buildroot.net/results/2b9bb464fec978742039c3d39a1b28a407cc4899 | arceb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/675c89e453080b12d8f21de69328388cd92829d5 | mips64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/e900eb185ea8bd4da3ede894c307f2a4283296c4 | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ca35da5847f83496ee1822d54d879952275870d2 | armeb | host-rust-1.67.1 | NOK | http://autobuild.buildroot.net/results/03855d38f05bf7db4fb4ee4a15419ecdb3ed844c | powerpc64le | host-rust-1.67.1 | NOK | http://autobuild.buildroot.net/results/b7f2e18fc0d38963bb2370e031ecbb1a127c2abb | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/08570937efb670d6e07d8fb3041d12a8a500e83d | sh4 | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/6d5a75eba935645c3583eed984ae11509a93ae4f | sh4eb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/1e4a65f104f753323ec866cdc71f76201507f7d0 | ORPH powerpc64le | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/c7b0770de372320993b1c0904d3cc09c5999b827 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/8cd8ef2f8c3a1e0c0043796ba86a87ccf075a9c8 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/4605b1715abf2631dd16b33fe559601c01dcc0f7 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/15b1f1a265670171d3c43637d3301b99569b56dd | sh4a | unknown | NOK | http://autobuild.buildroot.net/results/c416118f7e31a00f9be7d37bc5d130f88d2df9b9 | arceb | unknown | NOK | http://autobuild.buildroot.net/results/e4025ce4a1649cf22ec52304aac4f5aa41963c5b | mipsel | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/0783e6cdccf42974aacba7ca8af8cff08415e6b9 | ORPH nios2 | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/fc9fd74d1316691542f88db0b4c5f0d6ccbad332 | ORPH Classification of failures by reason for 2022.11.x -------------------------------------------------- libglib2-2.72.3 | 3 cppcms-2.0.0-beta2 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 gobject-introspection-1.72.0 | 1 host-go-1.19.5 | 1 host-pahole-1.24 | 1 python3-3.10.8 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | cppcms-2.0.0-beta2 | NOK | http://autobuild.buildroot.net/results/9f172c94e40f8589f35d6ed3cfc6904d70029533 | ORPH sh4eb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/79c29bc148bf0f5230cc1588523d8a101f08ecc5 | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0df44b17065fe16401596b00a6a41bd86cdde9bb | ORPH mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f2369ddf4f5ca88deda282f617993101da3affc4 | xtensa | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/b7b5b9664385738676164afd686e294bd1ec06ca | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/6e5a41de985484468b9b0c7393f1d43eb520a6d7 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/308376d18371c3ac240bff588268f78d9286eeb5 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/f7fc989bd14d17808524f71a2d226eef469ad43b | x86_64 | python3-3.10.8 | NOK | http://autobuild.buildroot.net/results/4c1ae2654aaae264457264c2491aeedf331b5ae8 | -- http://autobuild.buildroot.net From Alberto.Fahrenkrog at rigtechnologies.com.au Tue Feb 28 07:43:48 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Tue, 28 Feb 2023 07:43:48 +0000 Subject: [Buildroot] [Help] Building from a private PyPi server In-Reply-To: <87o7pfma0d.fsf@dell.be.48ers.dk> References: <87o7pfma0d.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, I believe the API used (JSON) is the same (similar?), I can confirm with one of my colleagues. Is scanpypi written in C or Python? I could have a look at the code. I don't know where the source is, but I'll look it up. The typo was accidental (below), the fact is that even manually using wget I have not yet figured out how to read from the link, also something I will follow up with my colleague. I wasn't aware of the --extra-index-url, I'll pass that information along to our software guys. I found a workaround to get it to work, using our repos directly. I need to sort some things out with our software department, but I'm making progress in the right direction. Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: Peter Korsgaard Sent: Monday, February 27, 2023 10:57 PM To: Alberto Fahrenkrog Cc: buildroot at buildroot.org Subject: Re: [Help] Building from a private PyPi server >>>>> "Alberto" == Alberto Fahrenkrog writes: > Hello all, > In our company we have custom Python packages stored in a private PyPi > server. To install them we simply add the --extra-index-url in our > requirements.txt file when using pip. Are you aware of the security issues with --extra-index-url? https://github.com/pypa/pip/issues/9612 > The packages are also available for manual download from the server, > however all URLs to any .tar.gz file are in the form > https://git.ourserver.com/packages/pypi/package-name/version-number/files/1234. This > leads me to the following options (I think): > * Try to get Buildroot to use the private PyPi server. I had a look > at the "scanpypi" script and it generated the .mk and .in files for a > regular PyPi package, but I could not find a way to tell scanpypi to > use an extra url or private pypi address scanpypi is indeed hard coded to use pypi and their JSON API (https://pypi.org/pypi/{pkg}/json), so not trivial to use with a local repo. Do your private server expose the same API? If so, I guess we could add an argument to scanpypi to use a custom URI instead of pypi.org. > * Find a way, using wget, to download the package from the address > above. Unfortunately I've had no luck with that yet. With the command: > wget > https://ourserver.com/-/packages/pypi/package-name/version_nr/files/5525 Notice: You have an additional /-/ compared to the URL above. -- Bye, Peter Korsgaard -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image520031.png Type: image/png Size: 14270 bytes Desc: image520031.png URL: From stefan at agner.ch Tue Feb 28 07:44:40 2023 From: stefan at agner.ch (Stefan Agner) Date: Tue, 28 Feb 2023 08:44:40 +0100 Subject: [Buildroot] [PATCH] package/linux-firmware: Add Broadcom BNX2 firmware Message-ID: <1c5a072be17f6aeb1ff9f39d506141ed8024d7bf.1677570263.git.stefan@agner.ch> Signed-off-by: Stefan Agner --- package/linux-firmware/Config.in | 7 ++++++- package/linux-firmware/linux-firmware.mk | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 4b415a7da2..72a5bcddcd 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -449,8 +449,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3 Firmware files for Broadcom Tigon3 ethernet cards (tigon) -config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X +config BR2_PACKAGE_LINUX_FIRMWARE_BNX2 bool "Broadcom NetXtremeII" + help + Firmware files for Broadcom NetXtreme ethernet cards (bnx2) + +config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X + bool "Broadcom NetXtremeII 10Gb" help Firmware files for Broadcom NetXtreme 10Gb ethernet cards (bnx2x) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 9d9d12bd5f..36b8fbbe91 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -527,6 +527,12 @@ LINUX_FIRMWARE_FILES += tigon/* # which is installed unconditionally endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2),y) +LINUX_FIRMWARE_FILES += bnx2/* +# No license file; the license is in the file WHENCE +# which is installed unconditionally +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X),y) LINUX_FIRMWARE_FILES += bnx2x/* # No license file; the license is in the file WHENCE -- 2.39.1 From stefan at agner.ch Tue Feb 28 07:53:28 2023 From: stefan at agner.ch (Stefan Agner) Date: Tue, 28 Feb 2023 08:53:28 +0100 Subject: [Buildroot] [PATCH] package/iptables: add option to use iptables with nf_tables backend In-Reply-To: References: <330af443072a1a0716c5890eb87216a6bfbe99e7.1669645942.git.stefan@agner.ch> Message-ID: <155bdecc9b001d1d078cb9e313f53a63@agner.ch> Anything I can help to get this patch merged? -- Stefan On 2023-01-25 09:33, Stefan Agner wrote: > Any thoughts on this patch? > > -- > Stefan > > On 2022-11-28 15:33, Stefan Agner wrote: >> Add a configuration option to let the iptables and ip6tables symlinks >> point to the nf_tables variant. >> >> Signed-off-by: Stefan Agner >> --- >> package/iptables/Config.in | 5 +++++ >> package/iptables/iptables.mk | 9 +++++++++ >> 2 files changed, 14 insertions(+) >> >> diff --git a/package/iptables/Config.in b/package/iptables/Config.in >> index e6b12603e0..ec7fbb7eea 100644 >> --- a/package/iptables/Config.in >> +++ b/package/iptables/Config.in >> @@ -24,6 +24,11 @@ config BR2_PACKAGE_IPTABLES_NFTABLES >> help >> Build nftables compat utilities. >> >> +config BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT >> + bool "nftables compat as default" >> + help >> + Use nftables compat utilities by default for iptables/ip6tables. >> + >> comment "nftables compat needs a toolchain w/ wchar, dynamic library, >> headers >= 3.12" >> depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ >> !BR2_USE_WCHAR || BR2_STATIC_LIBS >> diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk >> index a6143677d1..b53ae928af 100644 >> --- a/package/iptables/iptables.mk >> +++ b/package/iptables/iptables.mk >> @@ -49,6 +49,15 @@ else >> IPTABLES_CONF_OPTS += --disable-bpf-compiler --disable-nfsynproxy >> endif >> >> +ifeq ($(BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT),y) >> +define IPTABLES_INSTALL_SYMLINK >> + ln -fs xtables-nft-multi $(TARGET_DIR)/usr/sbin/iptables >> + ln -fs xtables-nft-multi $(TARGET_DIR)/usr/sbin/ip6tables >> +endef >> + >> +IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_INSTALL_SYMLINK >> +endif >> + >> define IPTABLES_LINUX_CONFIG_FIXUPS >> $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) >> $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) From stefan at agner.ch Tue Feb 28 07:55:23 2023 From: stefan at agner.ch (Stefan Agner) Date: Tue, 28 Feb 2023 08:55:23 +0100 Subject: [Buildroot] [PATCH] rtl8812au-aircrack-ng: bump to latest rev d98018 In-Reply-To: <893660729815cb737418892a77d27ba089a6cbde.1677568448.git.stefan@agner.ch> References: <893660729815cb737418892a77d27ba089a6cbde.1677568448.git.stefan@agner.ch> Message-ID: <1186bf5ba2b8379429686a77858c683f@agner.ch> On 2023-02-28 08:15, Stefan Agner wrote: > Fixes build against kernel 6.1.x. Please ignore this patch, the same change got merged two weeks ago. -- Stefan > > Signed-off-by: Stefan Agner > --- > package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- > package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash > b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash > index bc3a926314..cdf5f3b4e2 100644 > --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash > +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 > eed4888da9cfdc0f83ad3335beaf73af33ce0796b0a2637aeec102d47e1eb8f0 > rtl8812au-aircrack-ng-e7a4a390ccbdd768411e1b2a8922c47837f76b47.tar.gz > +sha256 > 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f > rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.tar.gz > sha256 > 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 > LICENSE > diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk > b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk > index 45a6ce5729..ab3ebe2077 100644 > --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk > +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk > @@ -4,7 +4,7 @@ > # > > ################################################################################ > > -RTL8812AU_AIRCRACK_NG_VERSION = e7a4a390ccbdd768411e1b2a8922c47837f76b47 > +RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e > RTL8812AU_AIRCRACK_NG_SITE = $(call > github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) > RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 > RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE From peter at korsgaard.com Tue Feb 28 09:37:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 10:37:09 +0100 Subject: [Buildroot] [Help] Building from a private PyPi server In-Reply-To: (Alberto Fahrenkrog's message of "Tue, 28 Feb 2023 07:43:48 +0000") References: <87o7pfma0d.fsf@dell.be.48ers.dk> Message-ID: <87fsaqku62.fsf@dell.be.48ers.dk> >>>>> "Alberto" == Alberto Fahrenkrog writes: > Hi Peter, > I believe the API used (JSON) is the same (similar?), I can confirm > with one of my colleagues. Is scanpypi written in C or Python? I could > have a look at the code. I don't know where the source is, but I'll > look it up. It is a python script, just have a look at utils/scanpypi. > The typo was accidental (below), the fact is that even manually using > wget I have not yet figured out how to read from the link, also > something I will follow up with my colleague. > I wasn't aware of the --extra-index-url, I'll pass that information > along to our software guys. > I found a workaround to get it to work, using our repos directly. I > need to sort some things out with our software department, but I'm > making progress in the right direction. OK. -- Bye, Peter Korsgaard From d.lang at abatec.at Tue Feb 28 09:48:21 2023 From: d.lang at abatec.at (Lang Daniel) Date: Tue, 28 Feb 2023 09:48:21 +0000 Subject: [Buildroot] [PATCH 1/1] package/paho-mqtt-c: security bump to version 1.3.12 Message-ID: Contains a fix for a possible race condition that can lead to use after free: https://github.com/eclipse/paho.mqtt.c/commit/911488a9f0fdad31c85ec86712be52587afdbbb8 https://github.com/eclipse/paho.mqtt.c/milestone/19?closed=1 https://github.com/eclipse/paho.mqtt.c/releases/tag/v1.3.12 Signed-off-by: Daniel Lang --- 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 1949abdf1a..529c538ff2 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 d7bba3f8b8978802e11e2b1f28e96e6b7f4ed5d8a268af52a4d3b1bcbd1db16b paho-mqtt-c-1.3.11.tar.gz +sha256 6a70a664ed3bbcc1eafdc45a5dc11f3ad70c9bac12a54c2f8cef15c0e7d0a93b paho-mqtt-c-1.3.12.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 30daf863ad..8d1fe009a7 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.11 +PAHO_MQTT_C_VERSION = 1.3.12 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.25.1 From mf at go-sys.de Tue Feb 28 12:41:51 2023 From: mf at go-sys.de (Michael Fischer) Date: Tue, 28 Feb 2023 13:41:51 +0100 Subject: [Buildroot] [PATCH] package/libcurl: bump version to 7.88.1 Message-ID: <20230228124151.16044-1-mf@go-sys.de> Changelog: https://curl.se/changes.html#7_88_1 Signed-off-by: Michael Fischer --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 714b02acb0..32b3d0b5e2 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.88.0.tar.xz.asc +# https://curl.se/download/curl-7.88.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f curl-7.88.1.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index eb481e4782..1a1594a45e 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.88.0 +LIBCURL_VERSION = 7.88.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ -- 2.20.1 From baruch at tkos.co.il Tue Feb 28 12:50:30 2023 From: baruch at tkos.co.il (Baruch Siach) Date: Tue, 28 Feb 2023 14:50:30 +0200 Subject: [Buildroot] [PATCH] package/libcurl: bump version to 7.88.1 In-Reply-To: <20230228124151.16044-1-mf@go-sys.de> References: <20230228124151.16044-1-mf@go-sys.de> Message-ID: <87h6v67y23.fsf@tarshish> Hi Michael, On Tue, Feb 28 2023, Michael Fischer wrote: > Changelog: https://curl.se/changes.html#7_88_1 > > Signed-off-by: Michael Fischer There is a pending patch from Peter K doing the same bump: http://patchwork.ozlabs.org/project/buildroot/patch/20230227161040.2239744-1-peter at korsgaard.com/ baruch > --- > package/libcurl/libcurl.hash | 4 ++-- > package/libcurl/libcurl.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash > index 714b02acb0..32b3d0b5e2 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.88.0.tar.xz.asc > +# https://curl.se/download/curl-7.88.1.tar.xz.asc > # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 > -sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz > +sha256 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f curl-7.88.1.tar.xz > sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index eb481e4782..1a1594a45e 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBCURL_VERSION = 7.88.0 > +LIBCURL_VERSION = 7.88.1 > 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 stephane.gonauer at 6wind.com Tue Feb 28 13:08:43 2023 From: stephane.gonauer at 6wind.com (=?iso-8859-1?Q?St=E9phane?= GONAUER) Date: Tue, 28 Feb 2023 14:08:43 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: <20230222232157.380b6109@windsurf> References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> <20230222232157.380b6109@windsurf> Message-ID: <20230228130843.GC32199@carcass.dev.6wind.com> Hello, On Wed, Feb 22, 2023 at 11:21:57PM +0100, Thomas Petazzoni via buildroot wrote: > On Sat, 24 Dec 2022 18:19:20 +0100 > Raphael Pavlidis wrote: > > > shadow provides utilities to deal with user accounts. > > > > The shadow package includes the necessary programs for converting UNIX > > password files to the shadow password format, plus programs for managing > > user and group accounts. Especially it is useful if rootless podman > > container should be used, which requires newuidmap and newgidmap. > > > > Co-authored-by: Nicolas Carrier > > [Nicolas.Carrier at orolia.com provided the test case] > > Signed-off-by: Raphael Pavlidis > > --- > > Changes v3 -> v4: > > - fix formatting issues in Config.in and shadow.mk. > > - bump to version 4.13. > > - add SHADOW_CPE_ID_VENDOR in shadow.mk. > > - add userdel in the setuid list. > > - fix typo in SHADOW_ACCOUNT_TOOLS_SETUID_PERMISSIONS. > > I have finally applied your patch. I fixed only two things: > > - Added a dependency on !BR2_STATIC_LIBS, because shadow uses > unconditionally > > - Fixed the Config.in comment that already existed that said "shared > libs", while we normally use "dynamic library". > > With those changes, applied to our next branch. Thanks! > > Thomas I am testing shadow package and I think there may be a compatibility issue. I rebuilt qemu_x86_64_defconfig where I added the following packages : BR2_PACKAGE_LINUX_PAM=y BR2_INIT_SYSTEMD=y BR2_PACKAGE_SHADOW=y There is no way to log into the image. Welcome to Buildroot buildroot login: root Login incorrect buildroot login: One possible clue I find in the target folder is that a system-auth is referenced but not found in target/etc/pam.d /output/target/etc/pam.d$ grep system * chfn:password include system-auth chsh:password include system-auth groupmems:password include system-auth login:auth include system-auth login:account include system-auth login:password include system-auth login:session include system-auth passwd:auth include system-auth passwd:account include system-auth passwd:password include system-auth /output/target/etc/pam.d$ ls -l total 24 -rw-r--r-- 1 gonauer users 103 Feb 28 09:23 chfn -rw-r--r-- 1 gonauer users 103 Feb 28 09:23 chsh -rw-r--r-- 1 gonauer users 103 Feb 28 09:23 groupmems -rw-r--r-- 1 gonauer users 438 Feb 28 09:23 login -rw-r--r-- 1 gonauer users 120 Feb 27 18:11 other -rw-r--r-- 1 gonauer users 97 Feb 28 09:23 passwd system-auth is found in target/usr/share/factory/etc/pam.d/system-auth /output/target$ find . -name system-auth ./usr/share/factory/etc/pam.d/system-auth I haven't been able to boot the image without login to further debug the issue. My whole .config can be found at the end of this email I'm interested in getting this configuration working. What could be done to better understand the issue and/or fix it ? Best Regards, St?phane GONAUER ----8<------ # # Automatically generated file; DO NOT EDIT. # Buildroot 2023.02-rc1-29-g463d0dd494 Configuration # BR2_HAVE_DOT_CONFIG=y BR2_HOST_GCC_AT_LEAST_4_9=y BR2_HOST_GCC_AT_LEAST_5=y BR2_HOST_GCC_AT_LEAST_6=y BR2_HOST_GCC_AT_LEAST_7=y BR2_HOST_GCC_AT_LEAST_8=y BR2_NEEDS_HOST_UTF8_LOCALE=y # # Target options # BR2_ARCH_IS_64=y BR2_USE_MMU=y # BR2_arcle is not set # BR2_arceb is not set # BR2_arm is not set # BR2_armeb is not set # BR2_aarch64 is not set # BR2_aarch64_be is not set # BR2_i386 is not set # BR2_m68k is not set # BR2_microblazeel is not set # BR2_microblazebe is not set # BR2_mips is not set # BR2_mipsel is not set # BR2_mips64 is not set # BR2_mips64el is not set # BR2_nios2 is not set # BR2_or1k is not set # BR2_powerpc is not set # BR2_powerpc64 is not set # BR2_powerpc64le is not set # BR2_riscv is not set # BR2_s390x is not set # BR2_sh is not set # BR2_sparc is not set # BR2_sparc64 is not set BR2_x86_64=y # BR2_xtensa is not set BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT=y BR2_ARCH="x86_64" BR2_NORMALIZED_ARCH="x86_64" BR2_ENDIAN="LITTLE" BR2_GCC_TARGET_ARCH="x86-64" BR2_BINFMT_SUPPORTS_SHARED=y BR2_READELF_ARCH_NAME="Advanced Micro Devices X86-64" BR2_X86_CPU_HAS_MMX=y BR2_X86_CPU_HAS_SSE=y BR2_X86_CPU_HAS_SSE2=y BR2_x86_x86_64=y # BR2_x86_x86_64_v2 is not set # BR2_x86_x86_64_v3 is not set # BR2_x86_x86_64_v4 is not set # BR2_x86_nocona is not set # BR2_x86_core2 is not set # BR2_x86_corei7 is not set # BR2_x86_nehalem is not set # BR2_x86_westmere is not set # BR2_x86_corei7_avx is not set # BR2_x86_sandybridge is not set # BR2_x86_core_avx2 is not set # BR2_x86_haswell is not set # BR2_x86_broadwell is not set # BR2_x86_skylake is not set # BR2_x86_atom is not set # BR2_x86_bonnell is not set # BR2_x86_silvermont is not set # BR2_x86_goldmont is not set # BR2_x86_goldmont_plus is not set # BR2_x86_tremont is not set # BR2_x86_skylake_avx512 is not set # BR2_x86_cannonlake is not set # BR2_x86_icelake_client is not set # BR2_x86_icelake_server is not set # BR2_x86_cascadelake is not set # BR2_x86_cooperlake is not set # BR2_x86_tigerlake is not set # BR2_x86_sapphirerapids is not set # BR2_x86_alderlake is not set # BR2_x86_rocketlake is not set # BR2_x86_opteron is not set # BR2_x86_opteron_sse3 is not set # BR2_x86_barcelona is not set # BR2_x86_jaguar is not set # BR2_x86_steamroller is not set BR2_BINFMT_ELF=y # # Toolchain # BR2_TOOLCHAIN=y BR2_TOOLCHAIN_USES_GLIBC=y BR2_TOOLCHAIN_BUILDROOT=y # BR2_TOOLCHAIN_EXTERNAL is not set # # Toolchain Buildroot Options # BR2_TOOLCHAIN_BUILDROOT_VENDOR="buildroot" # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # BR2_TOOLCHAIN_BUILDROOT_MUSL is not set BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc" # # Kernel Header Options # BR2_KERNEL_HEADERS_AS_KERNEL=y # BR2_KERNEL_HEADERS_4_14 is not set # BR2_KERNEL_HEADERS_4_19 is not set # BR2_KERNEL_HEADERS_5_4 is not set # BR2_KERNEL_HEADERS_5_10 is not set # BR2_KERNEL_HEADERS_5_15 is not set # BR2_KERNEL_HEADERS_6_1 is not set # BR2_KERNEL_HEADERS_VERSION is not set # BR2_KERNEL_HEADERS_CUSTOM_TARBALL is not set # BR2_KERNEL_HEADERS_CUSTOM_GIT is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_18 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16 is not set BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_5 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_0 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_16 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_15 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_11 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_8 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_7 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_6 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_5 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_3 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_2 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_1 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD is not set BR2_PACKAGE_LINUX_HEADERS=y BR2_PACKAGE_MUSL_ARCH_SUPPORTS=y BR2_PACKAGE_MUSL_SUPPORTS=y BR2_PACKAGE_UCLIBC_ARCH_SUPPORTS=y BR2_PACKAGE_UCLIBC_SUPPORTS=y BR2_PACKAGE_GLIBC_ARCH_SUPPORTS=y BR2_PACKAGE_GLIBC_SUPPORTS=y # # Glibc Options # BR2_PACKAGE_GLIBC=y # BR2_PACKAGE_GLIBC_KERNEL_COMPAT is not set # BR2_PACKAGE_GLIBC_UTILS is not set # # Binutils Options # BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI=y # BR2_BINUTILS_VERSION_2_37_X is not set BR2_BINUTILS_VERSION_2_38_X=y # BR2_BINUTILS_VERSION_2_39_X is not set BR2_BINUTILS_VERSION="2.38" BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="" # # GCC Options # # BR2_GCC_VERSION_10_X is not set BR2_GCC_VERSION_11_X=y # BR2_GCC_VERSION_12_X is not set BR2_GCC_SUPPORTS_DLANG=y BR2_GCC_VERSION="11.3.0" BR2_EXTRA_GCC_CONFIG_OPTIONS="" # BR2_TOOLCHAIN_BUILDROOT_CXX is not set # BR2_TOOLCHAIN_BUILDROOT_FORTRAN is not set # BR2_TOOLCHAIN_BUILDROOT_DLANG is not set # BR2_GCC_ENABLE_OPENMP is not set # BR2_GCC_ENABLE_GRAPHITE is not set BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS=y # # Host GDB Options # # BR2_PACKAGE_HOST_GDB is not set # # Toolchain Generic Options # BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS=y BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK=y BR2_USE_WCHAR=y BR2_ENABLE_LOCALE=y BR2_TOOLCHAIN_HAS_THREADS=y BR2_TOOLCHAIN_HAS_THREADS_DEBUG=y BR2_TOOLCHAIN_HAS_THREADS_NPTL=y BR2_TOOLCHAIN_HAS_SSP=y BR2_TOOLCHAIN_HAS_SSP_STRONG=y BR2_TOOLCHAIN_HAS_UCONTEXT=y BR2_TOOLCHAIN_SUPPORTS_PIE=y # BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY is not set BR2_TOOLCHAIN_EXTRA_LIBS="" BR2_TOOLCHAIN_HAS_FULL_GETTEXT=y BR2_TARGET_OPTIMIZATION="" BR2_TARGET_LDFLAGS="" BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15=y BR2_TOOLCHAIN_HEADERS_AT_LEAST="5.15" BR2_TOOLCHAIN_GCC_AT_LEAST_4_3=y BR2_TOOLCHAIN_GCC_AT_LEAST_4_4=y BR2_TOOLCHAIN_GCC_AT_LEAST_4_5=y BR2_TOOLCHAIN_GCC_AT_LEAST_4_6=y BR2_TOOLCHAIN_GCC_AT_LEAST_4_7=y BR2_TOOLCHAIN_GCC_AT_LEAST_4_8=y BR2_TOOLCHAIN_GCC_AT_LEAST_4_9=y BR2_TOOLCHAIN_GCC_AT_LEAST_5=y BR2_TOOLCHAIN_GCC_AT_LEAST_6=y BR2_TOOLCHAIN_GCC_AT_LEAST_7=y BR2_TOOLCHAIN_GCC_AT_LEAST_8=y BR2_TOOLCHAIN_GCC_AT_LEAST_9=y BR2_TOOLCHAIN_GCC_AT_LEAST_10=y BR2_TOOLCHAIN_GCC_AT_LEAST_11=y BR2_TOOLCHAIN_GCC_AT_LEAST="11" BR2_TOOLCHAIN_HAS_MNAN_OPTION=y BR2_TOOLCHAIN_HAS_SYNC_1=y BR2_TOOLCHAIN_HAS_SYNC_2=y BR2_TOOLCHAIN_HAS_SYNC_4=y BR2_TOOLCHAIN_HAS_SYNC_8=y BR2_TOOLCHAIN_HAS_LIBATOMIC=y BR2_TOOLCHAIN_HAS_ATOMIC=y BR2_TOOLCHAIN_HAS_LIBQUADMATH=y # # Build options # # # Commands # BR2_WGET="wget --passive-ftp -nd -t 3" BR2_SVN="svn --non-interactive" BR2_BZR="bzr" BR2_GIT="git" BR2_CVS="cvs" BR2_LOCALFILES="cp" BR2_SCP="scp" BR2_SFTP="sftp" BR2_HG="hg" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_XZCAT="xzcat" BR2_LZCAT="lzip -d -c" BR2_TAR_OPTIONS="" BR2_DEFCONFIG="/home/gonauer/dev/buildroot/configs/qemu_x86_64_defconfig" BR2_DL_DIR="$(TOPDIR)/dl" BR2_HOST_DIR="$(BASE_DIR)/host" # # Mirrors and Download locations # BR2_PRIMARY_SITE="" BR2_BACKUP_SITE="http://sources.buildroot.net" BR2_KERNEL_MIRROR="https://cdn.kernel.org/pub" BR2_GNU_MIRROR="http://ftpmirror.gnu.org" BR2_LUAROCKS_MIRROR="http://rocks.moonscript.org" BR2_CPAN_MIRROR="https://cpan.metacpan.org" BR2_JLEVEL=0 # BR2_CCACHE is not set # BR2_ENABLE_DEBUG is not set # BR2_ENABLE_RUNTIME_DEBUG is not set BR2_STRIP_strip=y BR2_STRIP_EXCLUDE_FILES="" BR2_STRIP_EXCLUDE_DIRS="" # BR2_OPTIMIZE_0 is not set # BR2_OPTIMIZE_1 is not set # BR2_OPTIMIZE_2 is not set # BR2_OPTIMIZE_3 is not set # BR2_OPTIMIZE_G is not set BR2_OPTIMIZE_S=y # BR2_OPTIMIZE_FAST is not set # BR2_ENABLE_LTO is not set # # static only needs a toolchain w/ uclibc or musl # BR2_SHARED_LIBS=y # BR2_SHARED_STATIC_LIBS is not set BR2_PACKAGE_OVERRIDE_FILE="$(CONFIG_DIR)/local.mk" BR2_GLOBAL_PATCH_DIR="" # # Advanced # # BR2_FORCE_HOST_BUILD is not set # BR2_REPRODUCIBLE is not set # BR2_PER_PACKAGE_DIRECTORIES is not set # # Security Hardening Options # BR2_PIC_PIE_ARCH_SUPPORTS=y BR2_PIC_PIE=y # BR2_SSP_NONE is not set # BR2_SSP_REGULAR is not set BR2_SSP_STRONG=y # BR2_SSP_ALL is not set BR2_SSP_OPTION="-fstack-protector-strong" # BR2_RELRO_NONE is not set # BR2_RELRO_PARTIAL is not set BR2_RELRO_FULL=y BR2_FORTIFY_SOURCE_ARCH_SUPPORTS=y # BR2_FORTIFY_SOURCE_NONE is not set BR2_FORTIFY_SOURCE_1=y # BR2_FORTIFY_SOURCE_2 is not set # # System configuration # BR2_ROOTFS_SKELETON_DEFAULT=y # BR2_ROOTFS_SKELETON_CUSTOM is not set BR2_TARGET_GENERIC_HOSTNAME="buildroot" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot" BR2_TARGET_GENERIC_PASSWD_SHA256=y # BR2_TARGET_GENERIC_PASSWD_SHA512 is not set BR2_TARGET_GENERIC_PASSWD_METHOD="sha-256" # BR2_INIT_BUSYBOX is not set # BR2_INIT_SYSV is not set # BR2_INIT_OPENRC is not set BR2_INIT_SYSTEMD=y # BR2_INIT_NONE is not set BR2_INIT_SYSTEMD_POPULATE_TMPFILES=y BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET="multi-user.target" # # /dev management using udev (from systemd) # BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt" # BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES is not set BR2_ROOTFS_MERGED_USR=y BR2_TARGET_ENABLE_ROOT_LOGIN=y BR2_TARGET_GENERIC_ROOT_PASSWD="" BR2_SYSTEM_BIN_SH_BUSYBOX=y # BR2_SYSTEM_BIN_SH_BASH is not set # BR2_SYSTEM_BIN_SH_DASH is not set # BR2_SYSTEM_BIN_SH_MKSH is not set # BR2_SYSTEM_BIN_SH_ZSH is not set # BR2_SYSTEM_BIN_SH_NONE is not set BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="console" BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP=y # BR2_TARGET_GENERIC_GETTY_BAUDRATE_9600 is not set # BR2_TARGET_GENERIC_GETTY_BAUDRATE_19200 is not set # BR2_TARGET_GENERIC_GETTY_BAUDRATE_38400 is not set # BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600 is not set # BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200 is not set BR2_TARGET_GENERIC_GETTY_BAUDRATE="0" BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y BR2_SYSTEM_DHCP="eth0" BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin" BR2_ENABLE_LOCALE_PURGE=y BR2_ENABLE_LOCALE_WHITELIST="C en_US" BR2_GENERATE_LOCALE="" # BR2_SYSTEM_ENABLE_NLS is not set BR2_TARGET_TZ_INFO=y BR2_TARGET_TZ_ZONELIST="default" BR2_TARGET_LOCALTIME="Etc/UTC" BR2_ROOTFS_USERS_TABLES="" BR2_ROOTFS_OVERLAY="" BR2_ROOTFS_PRE_BUILD_SCRIPT="" BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" BR2_ROOTFS_POST_FAKEROOT_SCRIPT="" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # # Kernel # BR2_LINUX_KERNEL=y # BR2_LINUX_KERNEL_LATEST_VERSION is not set # BR2_LINUX_KERNEL_LATEST_CIP_VERSION is not set # BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION is not set BR2_LINUX_KERNEL_CUSTOM_VERSION=y # BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set # BR2_LINUX_KERNEL_CUSTOM_GIT is not set # BR2_LINUX_KERNEL_CUSTOM_HG is not set # BR2_LINUX_KERNEL_CUSTOM_SVN is not set BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" BR2_LINUX_KERNEL_VERSION="5.15.18" BR2_LINUX_KERNEL_PATCH="" # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set # BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG is not set BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="" BR2_LINUX_KERNEL_CUSTOM_LOGO_PATH="" BR2_LINUX_KERNEL_BZIMAGE=y # BR2_LINUX_KERNEL_VMLINUX is not set # BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM is not set BR2_LINUX_KERNEL_GZIP=y # BR2_LINUX_KERNEL_LZ4 is not set # BR2_LINUX_KERNEL_LZMA is not set # BR2_LINUX_KERNEL_LZO is not set # BR2_LINUX_KERNEL_XZ is not set # BR2_LINUX_KERNEL_ZSTD is not set # BR2_LINUX_KERNEL_DTS_SUPPORT is not set # BR2_LINUX_KERNEL_INSTALL_TARGET is not set # BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL is not set BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE is not set # # Linux Kernel Extensions # # BR2_LINUX_KERNEL_EXT_XENOMAI is not set # BR2_LINUX_KERNEL_EXT_RTAI is not set # BR2_LINUX_KERNEL_EXT_EV3DEV_LINUX_DRIVERS is not set # BR2_LINUX_KERNEL_EXT_FBTFT is not set # BR2_LINUX_KERNEL_EXT_AUFS is not set # # Linux Kernel Tools # # BR2_PACKAGE_LINUX_TOOLS_CPUPOWER is not set # BR2_PACKAGE_LINUX_TOOLS_GPIO is not set # BR2_PACKAGE_LINUX_TOOLS_IIO is not set # BR2_PACKAGE_LINUX_TOOLS_PCI is not set # BR2_PACKAGE_LINUX_TOOLS_PERF is not set # BR2_PACKAGE_LINUX_TOOLS_SELFTESTS is not set # BR2_PACKAGE_LINUX_TOOLS_TMON is not set # BR2_PACKAGE_LINUX_TOOLS_HV is not set # # Target packages # BR2_PACKAGE_BUSYBOX=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="" BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y # BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES is not set # BR2_PACKAGE_BUSYBOX_WATCHDOG is not set BR2_PACKAGE_SKELETON=y BR2_PACKAGE_HAS_SKELETON=y BR2_PACKAGE_PROVIDES_SKELETON="skeleton-init-systemd" BR2_PACKAGE_SKELETON_INIT_COMMON=y BR2_PACKAGE_SKELETON_INIT_SYSTEMD=y # # Audio and video applications # # BR2_PACKAGE_ALSA_UTILS is not set # BR2_PACKAGE_ATEST is not set # BR2_PACKAGE_AUMIX is not set # BR2_PACKAGE_BLUEZ_ALSA is not set # BR2_PACKAGE_DVBLAST is not set # BR2_PACKAGE_DVDAUTHOR is not set # # dvdrw-tools needs a toolchain w/ threads, C++, wchar # # # espeak needs a toolchain w/ C++, wchar, threads, dynamic library # # BR2_PACKAGE_FAAD2 is not set BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS=y # BR2_PACKAGE_FFMPEG is not set # BR2_PACKAGE_FLAC is not set # BR2_PACKAGE_FLITE is not set # BR2_PACKAGE_FLUID_SOUNDFONT is not set # # fluidsynth needs a toolchain w/ threads, wchar, dynamic library, C++ # # BR2_PACKAGE_GMRENDER_RESURRECT is not set # BR2_PACKAGE_GSTREAMER1 is not set # BR2_PACKAGE_JACK1 is not set # # jack2 needs a toolchain w/ threads, C++, dynamic library # BR2_PACKAGE_KODI_ARCH_SUPPORTS=y # # kodi needs python3 w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.9 # # # kodi needs udev support for gbm # # # kodi needs an OpenGL EGL backend with OpenGL or GLES support # # BR2_PACKAGE_LAME is not set # BR2_PACKAGE_MADPLAY is not set # BR2_PACKAGE_MIMIC is not set # BR2_PACKAGE_MINIMODEM is not set # BR2_PACKAGE_MIRACLECAST is not set BR2_PACKAGE_MJPEGTOOLS_SIMD_SUPPORT=y # # mjpegtools needs a toolchain w/ C++, threads # # # modplugtools needs a toolchain w/ C++ # # BR2_PACKAGE_MOTION is not set # # mpd needs a toolchain w/ C++, threads, wchar, gcc >= 8, host gcc >= 8 # # BR2_PACKAGE_MPD_MPC is not set # BR2_PACKAGE_MPG123 is not set # # mpv needs a toolchain w/ C++, threads, gcc >= 4.9 # # BR2_PACKAGE_MULTICAT is not set # BR2_PACKAGE_MUSEPACK is not set # # ncmpc needs a toolchain w/ C++, wchar, threads, gcc >= 10 # # BR2_PACKAGE_OPUS_TOOLS is not set # BR2_PACKAGE_PIPEWIRE is not set BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC=y # BR2_PACKAGE_PULSEAUDIO is not set # BR2_PACKAGE_SOX is not set # BR2_PACKAGE_SPEECHD is not set # BR2_PACKAGE_SQUEEZELITE is not set # BR2_PACKAGE_TINYCOMPRESS is not set # # tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.9 # # BR2_PACKAGE_TSTOOLS is not set # BR2_PACKAGE_TWOLAME is not set # BR2_PACKAGE_UDPXY is not set # # upmpdcli needs a toolchain w/ C++, NPTL, gcc >= 4.9 # # # v4l2grab needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0 # # BR2_PACKAGE_V4L2LOOPBACK is not set # # vlc needs a toolchain w/ C++, dynamic library, wchar, threads, gcc >= 4.9, headers >= 3.7 # # BR2_PACKAGE_VORBIS_TOOLS is not set # BR2_PACKAGE_WAVPACK is not set # BR2_PACKAGE_YAVTA is not set # BR2_PACKAGE_YMPD is not set # # zynaddsubfx needs a toolchain w/ C++11 and threads # # # Compressors and decompressors # # BR2_PACKAGE_BROTLI is not set # BR2_PACKAGE_BZIP2 is not set # BR2_PACKAGE_GZIP is not set # # lrzip needs a toolchain w/ wchar, threads, C++ # # # lzip needs a toolchain w/ C++ # # BR2_PACKAGE_LZOP is not set # # p7zip needs a toolchain w/ threads, wchar, C++ # # BR2_PACKAGE_PIGZ is not set # BR2_PACKAGE_PIXZ is not set # # unrar needs a toolchain w/ C++, wchar, threads # # BR2_PACKAGE_UNZIP is not set # BR2_PACKAGE_XZ is not set # BR2_PACKAGE_ZIP is not set # BR2_PACKAGE_ZSTD is not set # # Debugging, profiling and benchmark # # BR2_PACKAGE_BABELTRACE2 is not set # BR2_PACKAGE_BLKTRACE is not set # # bonnie++ needs a toolchain w/ C++ # BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS=y # BR2_PACKAGE_BPFTOOL is not set # BR2_PACKAGE_CACHE_CALIBRATOR is not set # # clinfo needs an OpenCL provider # # # clpeak needs an OpenCL provider, a toolchain w/ C++, gcc >= 4.8 # # BR2_PACKAGE_COREMARK is not set # BR2_PACKAGE_COREMARK_PRO is not set # # dacapo needs OpenJDK # BR2_PACKAGE_DELVE_ARCH_SUPPORTS=y # BR2_PACKAGE_DELVE is not set # BR2_PACKAGE_DHRYSTONE is not set # BR2_PACKAGE_DIEHARDER is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_DROPWATCH is not set # BR2_PACKAGE_DSTAT is not set # BR2_PACKAGE_DT is not set # # duma needs a toolchain w/ C++, threads, dynamic library # # BR2_PACKAGE_FIO is not set BR2_PACKAGE_FWTS_ARCH_SUPPORTS=y # BR2_PACKAGE_FWTS is not set BR2_PACKAGE_GDB_ARCH_SUPPORTS=y # # gdb/gdbserver >= 8.x needs a toolchain w/ C++, gcc >= 4.8 # BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y # # google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++, gcc >= 4.8 # # BR2_PACKAGE_HYPERFINE is not set # BR2_PACKAGE_IOZONE is not set # BR2_PACKAGE_KEXEC is not set # BR2_PACKAGE_KMEMD is not set BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS=y # BR2_PACKAGE_KVM_UNIT_TESTS is not set # BR2_PACKAGE_LATENCYTOP is not set # BR2_PACKAGE_LIBBPF is not set # BR2_PACKAGE_LMBENCH is not set # BR2_PACKAGE_LSOF is not set BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS=y # BR2_PACKAGE_LTP_TESTSUITE is not set BR2_PACKAGE_LTRACE_ARCH_SUPPORTS=y # BR2_PACKAGE_LTRACE is not set # BR2_PACKAGE_LTTNG_BABELTRACE is not set # BR2_PACKAGE_LTTNG_MODULES is not set # BR2_PACKAGE_LTTNG_TOOLS is not set # BR2_PACKAGE_MBW is not set # BR2_PACKAGE_MCELOG is not set # BR2_PACKAGE_MEMSTAT is not set # BR2_PACKAGE_NETPERF is not set # BR2_PACKAGE_NETSNIFF_NG is not set # BR2_PACKAGE_NMON is not set BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS=y # # oprofile needs a toolchain w/ C++, wchar # # BR2_PACKAGE_PAX_UTILS is not set # # pcm-tools needs a toolchain w/ C++ # BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS=y # BR2_PACKAGE_PERFTEST is not set BR2_PACKAGE_PLY_ARCH_SUPPORTS=y # BR2_PACKAGE_PLY is not set # BR2_PACKAGE_POKE is not set # BR2_PACKAGE_PV is not set # # racehound needs a uClibc or glibc toolchain w/ C++, wchar, dynamic library, threads # # BR2_PACKAGE_RAMSMP is not set # BR2_PACKAGE_RAMSPEED is not set # BR2_PACKAGE_RT_TESTS is not set # # rwmem needs a toolchain w/ C++, wchar, gcc >= 5 # # # sentry-native needs a glibc toolchain with w/ wchar, thread, C++, gcc >= 4.8 # # # signal-estimator needs a toochain w/ C++, threads, gcc >= 7 # # BR2_PACKAGE_SPIDEV_TEST is not set # BR2_PACKAGE_STRACE is not set # BR2_PACKAGE_STRESS is not set # BR2_PACKAGE_STRESS_NG is not set # # sysdig needs a glibc toolchain w/ C++, threads, gcc >= 5, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built # # BR2_PACKAGE_SYSPROF is not set # BR2_PACKAGE_TCF_AGENT is not set BR2_PACKAGE_TCF_AGENT_ARCH="x86_64" BR2_PACKAGE_TCF_AGENT_ARCH_SUPPORTS=y # BR2_PACKAGE_TINYMEMBENCH is not set # BR2_PACKAGE_TRACE_CMD is not set BR2_PACKAGE_TRINITY_ARCH_SUPPORTS=y # BR2_PACKAGE_TRINITY is not set # BR2_PACKAGE_UCLIBC_NG_TEST is not set BR2_PACKAGE_UFTRACE_ARCH_SUPPORTS=y # BR2_PACKAGE_UFTRACE is not set BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS=y # BR2_PACKAGE_VALGRIND is not set # BR2_PACKAGE_VMTOUCH is not set # BR2_PACKAGE_WHETSTONE is not set # # Development tools # # BR2_PACKAGE_AVOCADO is not set # BR2_PACKAGE_BINUTILS is not set # BR2_PACKAGE_BITWISE is not set # BR2_PACKAGE_BSDIFF is not set # BR2_PACKAGE_BUSTLE is not set # BR2_PACKAGE_CHECK is not set BR2_PACKAGE_CMAKE_ARCH_SUPPORTS=y # # ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, NPTL # # # cppunit needs a toolchain w/ C++, dynamic library # # BR2_PACKAGE_CUKINIA is not set # BR2_PACKAGE_CUNIT is not set # BR2_PACKAGE_CVS is not set # # cxxtest needs a toolchain w/ C++ support # # BR2_PACKAGE_DIFFUTILS is not set # BR2_PACKAGE_DOS2UNIX is not set # BR2_PACKAGE_FINDUTILS is not set BR2_PACKAGE_FLEX=y # BR2_PACKAGE_GAWK is not set # BR2_PACKAGE_GETTEXT is not set BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-tiny" # BR2_PACKAGE_GIT is not set # # git-crypt needs a toolchain w/ C++, gcc >= 4.9 # # # gperf needs a toolchain w/ C++ # # BR2_PACKAGE_GREP is not set # BR2_PACKAGE_JO is not set # BR2_PACKAGE_JQ is not set # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_MAKE is not set # BR2_PACKAGE_MAWK is not set # BR2_PACKAGE_PATCH is not set # BR2_PACKAGE_PKGCONF is not set # BR2_PACKAGE_RIPGREP is not set # BR2_PACKAGE_SED is not set # BR2_PACKAGE_SUBVERSION is not set # BR2_PACKAGE_TREE is not set # BR2_PACKAGE_YASM is not set # # Filesystem and flash utilities # # BR2_PACKAGE_ABOOTIMG is not set # BR2_PACKAGE_AUFS_UTIL is not set # BR2_PACKAGE_AUTOFS is not set # BR2_PACKAGE_BTRFS_PROGS is not set # BR2_PACKAGE_CIFS_UTILS is not set # BR2_PACKAGE_CPIO is not set # BR2_PACKAGE_CRAMFS is not set # BR2_PACKAGE_CURLFTPFS is not set # BR2_PACKAGE_DAVFS2 is not set # BR2_PACKAGE_DOSFSTOOLS is not set # BR2_PACKAGE_DUST is not set # BR2_PACKAGE_E2FSPROGS is not set # BR2_PACKAGE_E2TOOLS is not set # BR2_PACKAGE_ECRYPTFS_UTILS is not set # BR2_PACKAGE_EROFS_UTILS is not set # BR2_PACKAGE_EXFAT is not set # BR2_PACKAGE_EXFAT_UTILS is not set # BR2_PACKAGE_EXFATPROGS is not set # BR2_PACKAGE_F2FS_TOOLS is not set # BR2_PACKAGE_FIRMWARE_UTILS is not set # BR2_PACKAGE_FLASHBENCH is not set # BR2_PACKAGE_FSCRYPTCTL is not set # BR2_PACKAGE_FUSE_OVERLAYFS is not set # BR2_PACKAGE_FWUP is not set # BR2_PACKAGE_GENEXT2FS is not set # BR2_PACKAGE_GENPART is not set # BR2_PACKAGE_GENROMFS is not set # BR2_PACKAGE_GOCRYPTFS is not set # BR2_PACKAGE_IMX_USB_LOADER is not set # BR2_PACKAGE_MMC_UTILS is not set # BR2_PACKAGE_MTD is not set # BR2_PACKAGE_MTOOLS is not set # BR2_PACKAGE_NFS_UTILS is not set # BR2_PACKAGE_NILFS_UTILS is not set # BR2_PACKAGE_NTFS_3G is not set # BR2_PACKAGE_SP_OOPS_EXTRACT is not set # BR2_PACKAGE_SQUASHFS is not set # BR2_PACKAGE_SSHFS is not set # BR2_PACKAGE_UDFTOOLS is not set # BR2_PACKAGE_UNIONFS is not set # BR2_PACKAGE_XFSPROGS is not set # BR2_PACKAGE_ZEROFREE is not set # BR2_PACKAGE_ZFS is not set # # Fonts, cursors, icons, sounds and themes # # # Cursors # # BR2_PACKAGE_COMIX_CURSORS is not set # BR2_PACKAGE_OBSIDIAN_CURSORS is not set # # Fonts # # BR2_PACKAGE_BITSTREAM_VERA is not set # BR2_PACKAGE_CANTARELL is not set # BR2_PACKAGE_DEJAVU is not set # BR2_PACKAGE_FONT_AWESOME is not set # BR2_PACKAGE_GHOSTSCRIPT_FONTS is not set # BR2_PACKAGE_INCONSOLATA is not set # BR2_PACKAGE_LIBERATION is not set # BR2_PACKAGE_WQY_ZENHEI is not set # # Icons # # BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS is not set # BR2_PACKAGE_HICOLOR_ICON_THEME is not set # # Sounds # # BR2_PACKAGE_SOUND_THEME_BOREALIS is not set # BR2_PACKAGE_SOUND_THEME_FREEDESKTOP is not set # # Themes # # # Games # # BR2_PACKAGE_ASCII_INVADERS is not set # BR2_PACKAGE_CHOCOLATE_DOOM is not set # # flare-engine needs a toolchain w/ C++, dynamic library # # BR2_PACKAGE_FROTZ is not set # # gnuchess needs a toolchain w/ C++, threads # # BR2_PACKAGE_LBREAKOUT2 is not set # BR2_PACKAGE_LTRIS is not set # # minetest needs a toolchain w/ C++, gcc >= 5.1, threads # # BR2_PACKAGE_OPENTYRIAN is not set # BR2_PACKAGE_PRBOOM is not set # BR2_PACKAGE_SL is not set # # solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.9, NPTL, dynamic library, and luajit or lua 5.1 # # # stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 7 # # BR2_PACKAGE_XORCURSES is not set # # Graphic libraries and applications (graphic/text) # # # Graphic applications # # # cage needs udev, EGL w/ Wayland backend and OpenGL ES support # # # cog needs wpewebkit and a toolchain w/ threads # # BR2_PACKAGE_FSWEBCAM is not set # BR2_PACKAGE_GHOSTSCRIPT is not set # # glmark2 needs a toolchain w/ C++, gcc >= 4.9 # # # glslsandbox-player needs openGL ES and EGL driver # # BR2_PACKAGE_GNUPLOT is not set # BR2_PACKAGE_JHEAD is not set # # kmscube needs EGL, GBM and OpenGL ES, and a toolchain w/ thread support # # # libva-utils needs a toolchain w/ C++, threads, dynamic library # BR2_PACKAGE_MIDORI_ARCH_SUPPORTS=y # # midori needs a glibc toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 8 # # # midori needs libgtk3 w/ X11 or wayland backend # BR2_PACKAGE_NETSURF_ARCH_SUPPORTS=y # BR2_PACKAGE_NETSURF is not set # BR2_PACKAGE_PNGQUANT is not set # BR2_PACKAGE_RRDTOOL is not set # # stellarium needs Qt5 and an OpenGL provider # # # sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support # # # sway needs a toolchain w/ wchar, threads, C++, dynamic library, gcc >= 4.9 # # # tesseract-ocr needs a toolchain w/ threads, C++, gcc >= 7, dynamic library, wchar # # BR2_PACKAGE_TINIFIER is not set # # Graphic libraries # # # cegui needs a toolchain w/ C++, threads, dynamic library, wchar, gcc >= 5 # # # directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5, dynamic library # # # efl needs a toolchain w/ C++, dynamic library, gcc >= 4.9, host gcc >= 4.9, threads, wchar # # BR2_PACKAGE_FB_TEST_APP is not set # BR2_PACKAGE_FBDUMP is not set # BR2_PACKAGE_FBGRAB is not set # BR2_PACKAGE_FBSET is not set # # fbterm needs a toolchain w/ C++, wchar, locale # # BR2_PACKAGE_FBV is not set # # freerdp needs a toolchain w/ wchar, dynamic library, threads, C++ # # BR2_PACKAGE_GRAPHICSMAGICK is not set # BR2_PACKAGE_IMAGEMAGICK is not set # BR2_PACKAGE_LIBGLVND is not set # BR2_PACKAGE_LINUX_FUSION is not set # # mesa3d needs a toolchain w/ C++, NPTL, dynamic library # # # ocrad needs a toolchain w/ C++ # # # ogre needs a toolchain w/ C++, dynamic library, gcc >= 4.8, threads, wchar # # BR2_PACKAGE_PSPLASH is not set # BR2_PACKAGE_SDL is not set # BR2_PACKAGE_SDL2 is not set # BR2_PACKAGE_VULKAN_HEADERS is not set # # Other GUIs # BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y # # Qt5 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library # BR2_PACKAGE_QT6_ARCH_SUPPORTS=y # # qt6 needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, host gcc >= 8 # # # tekui needs a Lua interpreter and a toolchain w/ threads, dynamic library # # BR2_PACKAGE_WESTON is not set # BR2_PACKAGE_XORG7 is not set # # apitrace needs a toolchain w/ C++, wchar, dynamic library, threads, gcc >= 7 # # # mupdf needs a toolchain w/ C++, gcc >= 4.9 # # # vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 10 # # # vte needs an OpenGL or an OpenGL-EGL/wayland backend # # BR2_PACKAGE_XKEYBOARD_CONFIG is not set # # Hardware handling # # # Firmware # # BR2_PACKAGE_ARMBIAN_FIRMWARE is not set # BR2_PACKAGE_B43_FIRMWARE is not set # BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI is not set # BR2_PACKAGE_LINUX_FIRMWARE is not set # BR2_PACKAGE_MURATA_CYW_FW is not set # BR2_PACKAGE_ODROIDC2_FIRMWARE is not set # BR2_PACKAGE_QCOM_DB410C_FIRMWARE is not set # BR2_PACKAGE_RCW_SMARC_SAL28 is not set # BR2_PACKAGE_UX500_FIRMWARE is not set # BR2_PACKAGE_WILC1000_FIRMWARE is not set # BR2_PACKAGE_WILC3000_FIRMWARE is not set # BR2_PACKAGE_WILINK_BT_FIRMWARE is not set # BR2_PACKAGE_ZD1211_FIRMWARE is not set # BR2_PACKAGE_18XX_TI_UTILS is not set # BR2_PACKAGE_ACPICA is not set # BR2_PACKAGE_ACPID is not set # # acpitool needs a toolchain w/ threads, C++, dynamic library # # BR2_PACKAGE_AER_INJECT is not set # BR2_PACKAGE_ALTERA_STAPL is not set # # apcupsd needs a toolchain w/ C++, threads # # BR2_PACKAGE_AVRDUDE is not set # BR2_PACKAGE_BCACHE_TOOLS is not set # BR2_PACKAGE_BIOSDEVNAME is not set # BR2_PACKAGE_BRICKD is not set # BR2_PACKAGE_BRLTTY is not set # # cc-tool needs a toolchain w/ C++, threads, wchar, gcc >= 4.9 # # BR2_PACKAGE_CDRKIT is not set # BR2_PACKAGE_CRUCIBLE is not set # BR2_PACKAGE_CRYPTSETUP is not set # BR2_PACKAGE_CWIID is not set # BR2_PACKAGE_DAHDI_LINUX is not set # BR2_PACKAGE_DAHDI_TOOLS is not set BR2_PACKAGE_DBUS=y # BR2_PACKAGE_DBUS_BROKER is not set # # dbus-c++ needs a uClibc or glibc toolchain w/ C++, threads # # # dbus-cxx needs a toolchain w/ C++, threads, gcc >= 7 and dynamic library support # # BR2_PACKAGE_DBUS_GLIB is not set # BR2_PACKAGE_DBUS_TRIGGERD is not set # BR2_PACKAGE_DFU_UTIL is not set # BR2_PACKAGE_DMIDECODE is not set # BR2_PACKAGE_DMRAID is not set # BR2_PACKAGE_DT_UTILS is not set # BR2_PACKAGE_DTBOCFG is not set # BR2_PACKAGE_DTV_SCAN_TABLES is not set # BR2_PACKAGE_DUMP1090 is not set # BR2_PACKAGE_DVB_APPS is not set # BR2_PACKAGE_DVBSNOOP is not set BR2_PACKAGE_PROVIDES_UDEV="systemd" # # eudev needs eudev /dev management # # BR2_PACKAGE_EVEMU is not set # BR2_PACKAGE_EVTEST is not set # BR2_PACKAGE_FAN_CTRL is not set # BR2_PACKAGE_FCONFIG is not set BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS=y # BR2_PACKAGE_FLASHROM is not set # BR2_PACKAGE_FMTOOLS is not set # BR2_PACKAGE_FREEIPMI is not set # BR2_PACKAGE_FXLOAD is not set # BR2_PACKAGE_GPM is not set # BR2_PACKAGE_GPSD is not set # # gptfdisk needs a toolchain w/ C++ # # BR2_PACKAGE_GVFS is not set # BR2_PACKAGE_HDDTEMP is not set # BR2_PACKAGE_HDPARM is not set # BR2_PACKAGE_HWDATA is not set # BR2_PACKAGE_HWLOC is not set # BR2_PACKAGE_I2C_TOOLS is not set # BR2_PACKAGE_I7Z is not set # BR2_PACKAGE_INPUT_EVENT_DAEMON is not set # BR2_PACKAGE_INTEL_MICROCODE is not set # BR2_PACKAGE_IPMITOOL is not set # BR2_PACKAGE_IPMIUTIL is not set # BR2_PACKAGE_IRDA_UTILS is not set # BR2_PACKAGE_IUCODE_TOOL is not set # BR2_PACKAGE_KBD is not set # BR2_PACKAGE_LCDPROC is not set # # libiec61850 needs a toolchain w/ C++, threads, dynamic library # # BR2_PACKAGE_LIBMANETTE is not set # BR2_PACKAGE_LIBUBOOTENV is not set # BR2_PACKAGE_LIBUIO is not set # BR2_PACKAGE_LINUX_BACKPORTS is not set # BR2_PACKAGE_LINUX_SERIAL_TEST is not set # BR2_PACKAGE_LINUXCONSOLETOOLS is not set # # lirc-tools needs a toolchain w/ threads, dynamic library, C++ # # BR2_PACKAGE_LM_SENSORS is not set # # lshw needs a toolchain w/ C++, wchar # # BR2_PACKAGE_LSSCSI is not set # BR2_PACKAGE_LSUIO is not set # BR2_PACKAGE_LUKSMETA is not set # BR2_PACKAGE_LVM2 is not set # BR2_PACKAGE_MBPFAN is not set # BR2_PACKAGE_MDADM is not set # BR2_PACKAGE_MDEVD is not set # BR2_PACKAGE_MDIO_TOOLS is not set # BR2_PACKAGE_MEMTEST86 is not set # BR2_PACKAGE_MEMTESTER is not set # BR2_PACKAGE_MEMTOOL is not set # BR2_PACKAGE_MINICOM is not set # BR2_PACKAGE_MSR_TOOLS is not set # BR2_PACKAGE_NANOCOM is not set # BR2_PACKAGE_NEARD is not set # BR2_PACKAGE_NVIDIA_DRIVER is not set # BR2_PACKAGE_NVIDIA_MODPROBE is not set # BR2_PACKAGE_NVME is not set # BR2_PACKAGE_OFONO is not set # # ola needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8 # # BR2_PACKAGE_OPEN2300 is not set # # openfpgaloader needs a toolchain w/ threads, C++, gcc >= 4.9 # # BR2_PACKAGE_OPENIPMI is not set # BR2_PACKAGE_OPENOCD is not set # # openpowerlink needs a toolchain w/ C++, threads # # BR2_PACKAGE_PARTED is not set # BR2_PACKAGE_PCIUTILS is not set # BR2_PACKAGE_PDBG is not set # BR2_PACKAGE_PICOCOM is not set # # powertop needs a toolchain w/ C++, threads, wchar # # BR2_PACKAGE_PPS_TOOLS is not set # BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE is not set # BR2_PACKAGE_RASPI_GPIO is not set # BR2_PACKAGE_RDMA_CORE is not set # BR2_PACKAGE_READ_EDID is not set # BR2_PACKAGE_RNG_TOOLS is not set # BR2_PACKAGE_RS485CONF is not set # BR2_PACKAGE_RTC_TOOLS is not set # BR2_PACKAGE_RTL8188EU is not set # BR2_PACKAGE_RTL8189ES is not set # BR2_PACKAGE_RTL8189FS is not set # BR2_PACKAGE_RTL8192EU is not set # BR2_PACKAGE_RTL8723BU is not set # BR2_PACKAGE_RTL8723DS is not set # BR2_PACKAGE_RTL8723DS_BT is not set # BR2_PACKAGE_RTL8812AU_AIRCRACK_NG is not set # BR2_PACKAGE_RTL8821AU is not set # BR2_PACKAGE_RTL8821CU is not set # BR2_PACKAGE_SANE_BACKENDS is not set # BR2_PACKAGE_SDPARM is not set BR2_PACKAGE_SEDUTIL_ARCH_SUPPORTS=y # # sedutil needs a toolchain w/ C++, gcc >= 4.8, headers >= 3.12 # # BR2_PACKAGE_SETSERIAL is not set # BR2_PACKAGE_SG3_UTILS is not set # BR2_PACKAGE_SIGROK_CLI is not set # BR2_PACKAGE_SISPMCTL is not set # # smartmontools needs a toolchain w/ C++ # # BR2_PACKAGE_SMSTOOLS3 is not set # BR2_PACKAGE_SPI_TOOLS is not set # BR2_PACKAGE_SREDIRD is not set # BR2_PACKAGE_STATSERIAL is not set # BR2_PACKAGE_STM32FLASH is not set # BR2_PACKAGE_SYSSTAT is not set # # targetcli-fb depends on Python # # BR2_PACKAGE_TI_UIM is not set # BR2_PACKAGE_TI_UTILS is not set # BR2_PACKAGE_TIO is not set # BR2_PACKAGE_TRIGGERHAPPY is not set # BR2_PACKAGE_UBOOT_TOOLS is not set # BR2_PACKAGE_UBUS is not set # BR2_PACKAGE_UCCP420WLAN is not set BR2_PACKAGE_HAS_UDEV=y # BR2_PACKAGE_UDISKS is not set # BR2_PACKAGE_UHUBCTL is not set # BR2_PACKAGE_UMTPRD is not set # BR2_PACKAGE_UPOWER is not set # BR2_PACKAGE_USB_MODESWITCH is not set # BR2_PACKAGE_USB_MODESWITCH_DATA is not set # # usbguard needs a toolchain w/ C++, threads, dynamic library, gcc >= 8 # # BR2_PACKAGE_USBMOUNT is not set # BR2_PACKAGE_USBUTILS is not set # BR2_PACKAGE_W_SCAN is not set # BR2_PACKAGE_WILC_DRIVER is not set # BR2_PACKAGE_WIPE is not set # BR2_PACKAGE_XORRISO is not set # # Interpreter languages and scripting # # BR2_PACKAGE_4TH is not set # BR2_PACKAGE_ENSCRIPT is not set BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS=y BR2_PACKAGE_ERLANG_ARCH_SUPPORTS=y # BR2_PACKAGE_ERLANG is not set # BR2_PACKAGE_EXECLINE is not set # BR2_PACKAGE_FICL is not set BR2_PACKAGE_GAUCHE_ARCH_SUPPORTS=y # BR2_PACKAGE_GAUCHE is not set # BR2_PACKAGE_GUILE is not set # BR2_PACKAGE_HASERL is not set # BR2_PACKAGE_JANET is not set # BR2_PACKAGE_JIMTCL is not set # BR2_PACKAGE_LUA is not set BR2_PACKAGE_PROVIDES_HOST_LUAINTERPRETER="host-lua" BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS=y # BR2_PACKAGE_LUAJIT is not set # BR2_PACKAGE_MICROPYTHON is not set # BR2_PACKAGE_MOARVM is not set BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS=y BR2_PACKAGE_MONO_ARCH_SUPPORTS=y # # mono needs a toolchain w/ C++, NPTL, dynamic library # BR2_PACKAGE_NODEJS_ARCH_SUPPORTS=y # # nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 7, wchar, host gcc >= 8 # # # octave needs a toolchain w/ C++ and fortran, gcc >= 4.8 # BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS=y BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS=y # # openjdk needs X.Org # # # openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads, C++, gcc >= 4.9, host gcc >= 4.9 # # BR2_PACKAGE_PERL is not set BR2_PACKAGE_PHP_ARCH_SUPPORTS=y # BR2_PACKAGE_PHP is not set # BR2_PACKAGE_PYTHON3 is not set # BR2_PACKAGE_QUICKJS is not set # BR2_PACKAGE_RUBY is not set # BR2_PACKAGE_TCL is not set # # Libraries # # # Audio/Sound # # BR2_PACKAGE_ALSA_LIB is not set # # alure needs a toolchain w/ C++, gcc >= 4.9, NPTL, wchar # # BR2_PACKAGE_AUBIO is not set # BR2_PACKAGE_BCG729 is not set # # caps needs a toolchain w/ C++, dynamic library # BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS=y # # fdk-aac needs a toolchain w/ C++ # # BR2_PACKAGE_LIBAO is not set # # asplib needs a toolchain w/ C++ # # BR2_PACKAGE_LIBBROADVOICE is not set # BR2_PACKAGE_LIBCDAUDIO is not set # BR2_PACKAGE_LIBCDDB is not set # BR2_PACKAGE_LIBCDIO is not set # BR2_PACKAGE_LIBCDIO_PARANOIA is not set # BR2_PACKAGE_LIBCODEC2 is not set # BR2_PACKAGE_LIBCUE is not set # BR2_PACKAGE_LIBCUEFILE is not set # BR2_PACKAGE_LIBEBUR128 is not set # BR2_PACKAGE_LIBG7221 is not set # BR2_PACKAGE_LIBGSM is not set # BR2_PACKAGE_LIBID3TAG is not set # BR2_PACKAGE_LIBILBC is not set # BR2_PACKAGE_LIBLO is not set # BR2_PACKAGE_LIBMAD is not set # # libmodplug needs a toolchain w/ C++ # # BR2_PACKAGE_LIBMPD is not set # BR2_PACKAGE_LIBMPDCLIENT is not set # BR2_PACKAGE_LIBREPLAYGAIN is not set # BR2_PACKAGE_LIBSAMPLERATE is not set # # libsidplay2 needs a toolchain w/ C++ # # BR2_PACKAGE_LIBSILK is not set # BR2_PACKAGE_LIBSNDFILE is not set # # libsoundtouch needs a toolchain w/ C++ # # BR2_PACKAGE_LIBSOXR is not set # BR2_PACKAGE_LIBVORBIS is not set # BR2_PACKAGE_LILV is not set # BR2_PACKAGE_LV2 is not set # # mp4v2 needs a toolchain w/ C++ # BR2_PACKAGE_OPENAL_ARCH_SUPPORTS=y # # openal needs a toolchain w/ NPTL, C++, gcc >= 4.9 # # # opencore-amr needs a toolchain w/ C++ # # BR2_PACKAGE_OPUS is not set # BR2_PACKAGE_OPUSFILE is not set # BR2_PACKAGE_PORTAUDIO is not set # BR2_PACKAGE_SBC is not set # BR2_PACKAGE_SPANDSP is not set # BR2_PACKAGE_SPEEX is not set # BR2_PACKAGE_SPEEXDSP is not set # BR2_PACKAGE_SRATOM is not set # # taglib needs a toolchain w/ C++, wchar # # BR2_PACKAGE_TINYALSA is not set # BR2_PACKAGE_TREMOR is not set # BR2_PACKAGE_VO_AACENC is not set BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS=y # # webrtc-audio-processing needs a toolchain w/ C++, NPTL, gcc >= 4.8 # # # Compression and decompression # # BR2_PACKAGE_LIBARCHIVE is not set # BR2_PACKAGE_LIBDEFLATE is not set # BR2_PACKAGE_LIBMSPACK is not set # # libsquish needs a toolchain w/ C++ # # BR2_PACKAGE_LIBZIP is not set # BR2_PACKAGE_LZ4 is not set # BR2_PACKAGE_LZO is not set # BR2_PACKAGE_MINIZIP is not set # BR2_PACKAGE_MINIZIP_ZLIB is not set # # snappy needs a toolchain w/ C++ # # BR2_PACKAGE_SZIP is not set # BR2_PACKAGE_ZCHUNK is not set BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS=y # BR2_PACKAGE_ZLIB is not set BR2_PACKAGE_PROVIDES_HOST_ZLIB="host-libzlib" # BR2_PACKAGE_ZZIPLIB is not set # # Crypto # # BR2_PACKAGE_BEARSSL is not set # BR2_PACKAGE_BEECRYPT is not set BR2_PACKAGE_BOTAN_ARCH_SUPPORTS=y # # botan needs a toolchain w/ C++, threads, gcc >= 4.8 # # BR2_PACKAGE_CA_CERTIFICATES is not set # BR2_PACKAGE_CRYPTODEV is not set # # cryptopp needs a toolchain w/ C++, dynamic library, wchar # # BR2_PACKAGE_GCR is not set # BR2_PACKAGE_GNUTLS is not set # BR2_PACKAGE_LIBARGON2 is not set # BR2_PACKAGE_LIBASSUAN is not set # BR2_PACKAGE_LIBB2 is not set # BR2_PACKAGE_LIBGCRYPT is not set BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBGPG_ERROR is not set BR2_PACKAGE_LIBGPG_ERROR_SYSCFG="x86_64-unknown-linux-gnu" # BR2_PACKAGE_LIBGPGME is not set # BR2_PACKAGE_LIBKCAPI is not set # BR2_PACKAGE_LIBKSBA is not set # BR2_PACKAGE_LIBMD is not set # BR2_PACKAGE_LIBMHASH is not set # BR2_PACKAGE_LIBNSS is not set # # libolm needs a toolchain w/ C++, gcc >= 4.8 # # BR2_PACKAGE_LIBP11 is not set # BR2_PACKAGE_LIBSCRYPT is not set # BR2_PACKAGE_LIBSECRET is not set # BR2_PACKAGE_LIBSHA1 is not set # BR2_PACKAGE_LIBSODIUM is not set # BR2_PACKAGE_LIBSSH is not set # BR2_PACKAGE_LIBSSH2 is not set # BR2_PACKAGE_LIBTOMCRYPT is not set # BR2_PACKAGE_LIBUECC is not set # BR2_PACKAGE_LIBXCRYPT is not set # BR2_PACKAGE_MBEDTLS is not set # BR2_PACKAGE_NETTLE is not set # BR2_PACKAGE_OPENSSL is not set BR2_PACKAGE_PROVIDES_HOST_OPENSSL="host-libopenssl" # BR2_PACKAGE_PKCS11_HELPER is not set # BR2_PACKAGE_RHASH is not set # BR2_PACKAGE_TINYDTLS is not set # BR2_PACKAGE_TPM2_PKCS11 is not set # BR2_PACKAGE_TPM2_TSS is not set # BR2_PACKAGE_TROUSERS is not set # BR2_PACKAGE_USTREAM_SSL is not set # BR2_PACKAGE_WOLFSSL is not set # BR2_PACKAGE_WOLFTPM is not set # # Database # # BR2_PACKAGE_BERKELEYDB is not set # BR2_PACKAGE_GDBM is not set # BR2_PACKAGE_HIREDIS is not set # # kompexsqlite needs a toolchain w/ C++, wchar, threads, dynamic library # # # leveldb needs a toolchain w/ C++, threads, gcc >= 4.8 # # BR2_PACKAGE_LIBDBI is not set # BR2_PACKAGE_LIBDBI_DRIVERS is not set # BR2_PACKAGE_LIBGIT2 is not set # BR2_PACKAGE_LIBMDBX is not set # # libodb needs a toolchain w/ C++, threads # BR2_PACKAGE_MONGODB_ARCH_SUPPORTS=y # # mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 7 # # # mysql needs a toolchain w/ C++, threads # # BR2_PACKAGE_POSTGRESQL is not set # BR2_PACKAGE_REDIS is not set BR2_PACKAGE_ROCKSDB_ARCH_SUPPORTS=y # # rocksdb needs a toolchain w/ C++, threads, wchar, gcc >= 4.8 # # BR2_PACKAGE_SQLCIPHER is not set # BR2_PACKAGE_SQLITE is not set # BR2_PACKAGE_UNIXODBC is not set # # Filesystem # # BR2_PACKAGE_GAMIN is not set # BR2_PACKAGE_LIBCONFIG is not set # BR2_PACKAGE_LIBCONFUSE is not set # BR2_PACKAGE_LIBFUSE is not set # BR2_PACKAGE_LIBFUSE3 is not set # BR2_PACKAGE_LIBLOCKFILE is not set # BR2_PACKAGE_LIBNFS is not set # BR2_PACKAGE_LIBSYSFS is not set # BR2_PACKAGE_LOCKDEV is not set # # physfs needs a toolchain w/ C++, threads # # # Graphics # # # assimp needs a toolchain w/ C++, wchar # # # at-spi2-atk depends on X.org # # # at-spi2-core depends on X.org # # BR2_PACKAGE_ATK is not set # # atkmm needs a toolchain w/ C++, wchar, threads, gcc >= 7 # # # bullet needs a toolchain w/ C++, dynamic library, threads, wchar # # BR2_PACKAGE_CAIRO is not set # # cairomm needs a toolchain w/ C++, wchar, threads, gcc >= 7 # # # chipmunk needs an OpenGL backend # # # exempi needs a toolchain w/ C++, dynamic library, threads, wchar # # # exiv2 needs a uClibc or glibc toolchain w/ C++, wchar, dynamic library, threads # # BR2_PACKAGE_FONTCONFIG is not set # BR2_PACKAGE_FREETYPE is not set # BR2_PACKAGE_GD is not set # BR2_PACKAGE_GDK_PIXBUF is not set # BR2_PACKAGE_GIFLIB is not set # # granite needs libgtk3 and a toolchain w/ wchar, threads, gcc >= 4.9 # # # graphite2 needs a toolchain w/ C++ # # # gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 7 # # # harfbuzz needs a toolchain w/ C++, gcc >= 4.9 # # BR2_PACKAGE_IJS is not set # BR2_PACKAGE_IMLIB2 is not set # # intel-gmmlib needs a toolchain w/ dynamic library, C++ # # # intel-mediadriver needs a toolchain w/ dynamic library, C++, NPTL # # # intel-mediasdk needs a toolchain w/ dynamic library, C++, NPTL # # # irrlicht needs a toolchain w/ C++ # # BR2_PACKAGE_JASPER is not set # BR2_PACKAGE_JBIG2DEC is not set BR2_PACKAGE_JPEG_SIMD_SUPPORT=y # BR2_PACKAGE_JPEG is not set # # kms++ needs a toolchain w/ threads, C++, gcc >= 4.8, headers >= 4.11, wchar # # BR2_PACKAGE_LCMS2 is not set # # lensfun needs a toolchain w/ C++, threads, wchar # # BR2_PACKAGE_LEPTONICA is not set # BR2_PACKAGE_LIBART is not set # BR2_PACKAGE_LIBDMTX is not set # BR2_PACKAGE_LIBDRM is not set # # libepoxy needs an OpenGL and/or OpenGL EGL backend # # BR2_PACKAGE_LIBEXIF is not set # # libfm needs X.org and a toolchain w/ wchar, threads, C++, gcc >= 4.9 # # BR2_PACKAGE_LIBFM_EXTRA is not set # # libfreeglut depends on X.org and needs an OpenGL backend # # # libfreeimage needs a toolchain w/ C++, dynamic library, wchar # # # libgeotiff needs a toolchain w/ C++, gcc >= 4.7, threads, wchar # # # libglew depends on X.org and needs an OpenGL backend # # # libglfw depends on X.org or Wayland and an OpenGL or GLES backend # # # libglu needs an OpenGL backend # # BR2_PACKAGE_LIBGTA is not set # # libgtk3 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9 # # # libgtk3 needs an OpenGL or an OpenGL-EGL/wayland backend # # # libjxl needs a toolchain with C++, threads, gcc >= 7, dynamic library # # BR2_PACKAGE_LIBMEDIAART is not set # BR2_PACKAGE_LIBMNG is not set # BR2_PACKAGE_LIBPNG is not set # BR2_PACKAGE_LIBQRENCODE is not set # # libraw needs a toolchain w/ C++ # # # librsvg needs a toolchain w/ wchar, threads, C++, gcc >= 4.9 # # BR2_PACKAGE_LIBSVG is not set # BR2_PACKAGE_LIBSVG_CAIRO is not set # BR2_PACKAGE_LIBSVGTINY is not set # BR2_PACKAGE_LIBVA is not set # BR2_PACKAGE_LIBVA_INTEL_DRIVER is not set # # libvips needs a toolchain w/ wchar, threads, C++ # # # libwpe needs a toolchain w/ C++, dynamic library and an OpenEGL-capable backend # # BR2_PACKAGE_MENU_CACHE is not set # # opencv3 needs a toolchain w/ C++, NPTL, wchar, dynamic library # # # opencv4 needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 4.8 # # BR2_PACKAGE_OPENJPEG is not set # # pango needs a toolchain w/ wchar, threads, C++, gcc >= 4.9 # # # pangomm needs a toolchain w/ C++, wchar, threads, gcc >= 7 # # BR2_PACKAGE_PIXMAN is not set # # poppler needs a toolchain w/ wchar, C++, threads, dynamic library, gcc >= 7 # # BR2_PACKAGE_STB is not set # BR2_PACKAGE_TIFF is not set # BR2_PACKAGE_WAYLAND is not set BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS=y # # webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9 # # BR2_PACKAGE_WEBP is not set # # wlroots needs udev, EGL w/ Wayland backend and OpenGL ES support # # # woff2 needs a toolchain w/ C++ # # # wpebackend-fdo needs a toolchain w/ C++, wchar, threads, dynamic library and an OpenEGL-capable Wayland backend # BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS=y # # wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9 # # # wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend # # # zbar needs a toolchain w/ threads, C++ and headers >= 3.0 # # # zxing-cpp needs a toolchain w/ C++, wchar, dynamic library # # # Hardware handling # # BR2_PACKAGE_ACSCCID is not set # BR2_PACKAGE_C_PERIPHERY is not set # BR2_PACKAGE_CCID is not set # BR2_PACKAGE_DTC is not set BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS=y # BR2_PACKAGE_GNU_EFI is not set # BR2_PACKAGE_HACKRF is not set # BR2_PACKAGE_HIDAPI is not set # BR2_PACKAGE_JITTERENTROPY_LIBRARY is not set # # lcdapi needs a toolchain w/ C++, threads # # # let-me-create needs a toolchain w/ C++, threads, dynamic library # # BR2_PACKAGE_LIBAIO is not set # BR2_PACKAGE_LIBATASMART is not set # BR2_PACKAGE_LIBBLOCKDEV is not set # # libcec needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.7 # # BR2_PACKAGE_LIBFREEFARE is not set # BR2_PACKAGE_LIBFTDI is not set # BR2_PACKAGE_LIBFTDI1 is not set # BR2_PACKAGE_LIBGPHOTO2 is not set # BR2_PACKAGE_LIBGPIOD is not set # BR2_PACKAGE_LIBGUDEV is not set # BR2_PACKAGE_LIBHID is not set # BR2_PACKAGE_LIBIIO is not set # BR2_PACKAGE_LIBINPUT is not set # BR2_PACKAGE_LIBIQRF is not set # BR2_PACKAGE_LIBLLCP is not set # BR2_PACKAGE_LIBMBIM is not set # BR2_PACKAGE_LIBNFC is not set # BR2_PACKAGE_LIBPCIACCESS is not set # BR2_PACKAGE_LIBPHIDGET is not set # BR2_PACKAGE_LIBPRI is not set # BR2_PACKAGE_LIBQMI is not set # BR2_PACKAGE_LIBQRTR_GLIB is not set # BR2_PACKAGE_LIBRAW1394 is not set # BR2_PACKAGE_LIBRTLSDR is not set # # libserial needs a toolchain w/ C++, gcc >= 5, threads, wchar # # BR2_PACKAGE_LIBSERIALPORT is not set # BR2_PACKAGE_LIBSIGROK is not set # BR2_PACKAGE_LIBSIGROKDECODE is not set # BR2_PACKAGE_LIBSOC is not set # BR2_PACKAGE_LIBSS7 is not set # BR2_PACKAGE_LIBUSB is not set # BR2_PACKAGE_LIBUSBGX is not set # # libv4l needs a toolchain w/ threads, C++ and headers >= 3.0 # # BR2_PACKAGE_LIBXKBCOMMON is not set BR2_PACKAGE_MRAA_ARCH_SUPPORTS=y # BR2_PACKAGE_MRAA is not set # BR2_PACKAGE_MTDEV is not set # BR2_PACKAGE_NEARDAL is not set # BR2_PACKAGE_OPENSC is not set # BR2_PACKAGE_OWFS is not set # BR2_PACKAGE_PCSC_LITE is not set # BR2_PACKAGE_TSLIB is not set # # uhd needs a toolchain w/ C++, NPTL, wchar, dynamic library # # # urg needs a toolchain w/ C++ # # # Javascript # # BR2_PACKAGE_ANGULARJS is not set # BR2_PACKAGE_BOOTSTRAP is not set # BR2_PACKAGE_CHARTJS is not set # BR2_PACKAGE_DATATABLES is not set # BR2_PACKAGE_DUKTAPE is not set # BR2_PACKAGE_EXPLORERCANVAS is not set # BR2_PACKAGE_FLOT is not set # BR2_PACKAGE_FORGE is not set # BR2_PACKAGE_JQUERY is not set # BR2_PACKAGE_JSMIN is not set # BR2_PACKAGE_JSON_JAVASCRIPT is not set # BR2_PACKAGE_JSZIP is not set # BR2_PACKAGE_OPENLAYERS is not set # BR2_PACKAGE_POPPERJS is not set # BR2_PACKAGE_VIS_NETWORK is not set # BR2_PACKAGE_VUEJS is not set # # JSON/XML # # # benejson needs a toolchain w/ C++ # # BR2_PACKAGE_CJSON is not set BR2_PACKAGE_EXPAT=y # BR2_PACKAGE_JANSSON is not set # BR2_PACKAGE_JOSE is not set # BR2_PACKAGE_JSMN is not set # BR2_PACKAGE_JSON_C is not set # # json-for-modern-cpp needs a toolchain w/ C++, gcc >= 4.9 # # BR2_PACKAGE_JSON_GLIB is not set # # jsoncpp needs a toolchain w/ C++, gcc >= 4.7 # # BR2_PACKAGE_LIBBSON is not set # BR2_PACKAGE_LIBFASTJSON is not set # # libjson needs a toolchain w/ C++ # # BR2_PACKAGE_LIBROXML is not set # BR2_PACKAGE_LIBUCL is not set # BR2_PACKAGE_LIBXML2 is not set # # libxml++ needs a toolchain w/ C++, wchar, threads, gcc >= 7 # # BR2_PACKAGE_LIBXMLRPC is not set # BR2_PACKAGE_LIBXSLT is not set # BR2_PACKAGE_LIBYAML is not set # BR2_PACKAGE_MXML is not set # # pugixml needs a toolchain w/ C++ # # # rapidjson needs a toolchain w/ C++ # # BR2_PACKAGE_RAPIDXML is not set # BR2_PACKAGE_RAPTOR is not set # BR2_PACKAGE_SERD is not set # BR2_PACKAGE_SORD is not set # # tinyxml needs a toolchain w/ C++ # # # tinyxml2 needs a toolchain w/ C++ # # # valijson needs a toolchain w/ C++ # # # xerces-c++ needs a toolchain w/ C++, dynamic library, wchar # # # xml-security-c needs a toolchain w/ C++, wchar, dynamic library, threads, gcc >= 4.7 # # BR2_PACKAGE_YAJL is not set # # yaml-cpp needs a toolchain w/ C++, gcc >= 4.7 # # # Logging # # # glog needs a toolchain w/ C++ # # # hawktracer needs a toolchain w/ C++, gcc >= 4.8 # # BR2_PACKAGE_LIBLOG4C_LOCALTIME is not set # BR2_PACKAGE_LIBLOGGING is not set # # log4cplus needs a toolchain w/ C++, wchar, threads, gcc >= 4.8 # # # log4cpp needs a toolchain w/ C++, threads # # # log4cxx needs a toolchain w/ C++, threads, dynamic library # # # log4qt needs qt5 # # # opentracing-cpp needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8 # # # spdlog needs a toolchain w/ C++, threads, wchar # # # ulog needs a toolchain w/ C++, threads # # BR2_PACKAGE_ZLOG is not set # # Multimedia # # # bento4 support needs a toolchain with C++ # # BR2_PACKAGE_BITSTREAM is not set # BR2_PACKAGE_DAV1D is not set # # kvazaar needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBAACS is not set # # libass needs a toolchain w/ C++, gcc >= 4.9 # # BR2_PACKAGE_LIBBDPLUS is not set # BR2_PACKAGE_LIBBLURAY is not set BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS=y # # libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8 # # # libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8 # # BR2_PACKAGE_LIBDVBCSA is not set # BR2_PACKAGE_LIBDVBPSI is not set # # libdvbsi++ needs a toolchain w/ C++, wchar, threads # # BR2_PACKAGE_LIBDVDCSS is not set # BR2_PACKAGE_LIBDVDNAV is not set # BR2_PACKAGE_LIBDVDREAD is not set # # libebml needs a toolchain w/ C++, wchar # # BR2_PACKAGE_LIBHDHOMERUN is not set # # libmatroska needs a toolchain w/ C++, wchar # # BR2_PACKAGE_LIBMMS is not set # BR2_PACKAGE_LIBMPEG2 is not set # BR2_PACKAGE_LIBOGG is not set # BR2_PACKAGE_LIBOPENAPTX is not set BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS=y # # libopenh264 needs a toolchain w/ C++, dynamic library, threads # # BR2_PACKAGE_LIBOPUSENC is not set # BR2_PACKAGE_LIBTHEORA is not set # BR2_PACKAGE_LIBUDFREAD is not set # BR2_PACKAGE_LIBVPX is not set # # libyuv needs a toolchain w/ C++, dynamic library # # # live555 needs a toolchain w/ C++ # # # mediastreamer needs a toolchain w/ threads, C++, dynamic library, gcc >= 5 # # BR2_PACKAGE_X264 is not set # # x265 needs a toolchain w/ C++, threads, dynamic library # # # Networking # # # agent++ needs a toolchain w/ threads, C++, dynamic library # # # azmq needs a toolchain w/ C++11, wchar and threads # # # azure-iot-sdk-c needs a toolchain w/ C++, NPTL and wchar # # BR2_PACKAGE_BATMAN_ADV is not set # # belle-sip needs a toolchain w/ threads, C++, dynamic library, wchar # # BR2_PACKAGE_C_ARES is not set # BR2_PACKAGE_CGIC is not set # BR2_PACKAGE_CNI_PLUGINS is not set # # cppzmq needs a toolchain w/ C++, threads # # # curlpp needs a toolchain w/ C++, dynamic library # # # czmq needs a toolchain w/ C++, threads # # BR2_PACKAGE_DAQ is not set # BR2_PACKAGE_DAQ3 is not set # BR2_PACKAGE_DAVICI is not set # BR2_PACKAGE_DHT is not set # BR2_PACKAGE_ENET is not set # # filemq needs a toolchain w/ C++, threads # # BR2_PACKAGE_FLICKCURL is not set # BR2_PACKAGE_FREERADIUS_CLIENT is not set # BR2_PACKAGE_GENSIO is not set # BR2_PACKAGE_GEOIP is not set # BR2_PACKAGE_GLIB_NETWORKING is not set # # grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 5 # # BR2_PACKAGE_GSSDP is not set # BR2_PACKAGE_GUPNP is not set # BR2_PACKAGE_GUPNP_AV is not set # BR2_PACKAGE_GUPNP_DLNA is not set # # ibrcommon needs a toolchain w/ C++, threads # # # ibrdtn needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBCGI is not set # # libcgicc needs a toolchain w/ C++ # # BR2_PACKAGE_LIBCOAP is not set # # libcpprestsdk needs a toolchain w/ NPTL, C++, wchar, locale # # BR2_PACKAGE_LIBCURL is not set # BR2_PACKAGE_LIBDNET is not set # BR2_PACKAGE_LIBEXOSIP2 is not set # BR2_PACKAGE_LIBEST is not set # BR2_PACKAGE_LIBFCGI is not set # BR2_PACKAGE_LIBGSASL is not set # BR2_PACKAGE_LIBHTP is not set # BR2_PACKAGE_LIBHTTPPARSER is not set # # libhttpserver needs a toolchain w/ C++, threads, gcc >= 5 # # BR2_PACKAGE_LIBIDN is not set # BR2_PACKAGE_LIBIDN2 is not set # BR2_PACKAGE_LIBISCSI is not set # BR2_PACKAGE_LIBKRB5 is not set # BR2_PACKAGE_LIBLDNS is not set # BR2_PACKAGE_LIBMAXMINDDB is not set # BR2_PACKAGE_LIBMBUS is not set # # libmemcached needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBMICROHTTPD is not set # BR2_PACKAGE_LIBMINIUPNPC is not set # BR2_PACKAGE_LIBMNL is not set # BR2_PACKAGE_LIBMODBUS is not set # # libmodsecurity needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBNATPMP is not set # BR2_PACKAGE_LIBNDP is not set # BR2_PACKAGE_LIBNET is not set # BR2_PACKAGE_LIBNETCONF2 is not set # BR2_PACKAGE_LIBNETFILTER_ACCT is not set # BR2_PACKAGE_LIBNETFILTER_CONNTRACK is not set # BR2_PACKAGE_LIBNETFILTER_CTHELPER is not set # BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT is not set # BR2_PACKAGE_LIBNETFILTER_LOG is not set # BR2_PACKAGE_LIBNETFILTER_QUEUE is not set # BR2_PACKAGE_LIBNFNETLINK is not set # BR2_PACKAGE_LIBNFTNL is not set # BR2_PACKAGE_LIBNICE is not set # BR2_PACKAGE_LIBNIDS is not set # BR2_PACKAGE_LIBNL is not set # # libnpupnp needs a toolchain w/ C++, threads, gcc >= 4.9 # # BR2_PACKAGE_LIBOAUTH is not set # BR2_PACKAGE_LIBOPING is not set # BR2_PACKAGE_LIBOSIP2 is not set # BR2_PACKAGE_LIBPAGEKITE is not set # BR2_PACKAGE_LIBPCAP is not set # # libpjsip needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBPSL is not set # BR2_PACKAGE_LIBRELP is not set # BR2_PACKAGE_LIBRSYNC is not set # BR2_PACKAGE_LIBSHAIRPLAY is not set # BR2_PACKAGE_LIBSHOUT is not set # BR2_PACKAGE_LIBSOCKETCAN is not set # BR2_PACKAGE_LIBSOUP is not set # BR2_PACKAGE_LIBSRTP is not set # BR2_PACKAGE_LIBSTROPHE is not set # BR2_PACKAGE_LIBTEAM is not set # BR2_PACKAGE_LIBTELNET is not set # BR2_PACKAGE_LIBTIRPC is not set # # libtorrent needs a toolchain w/ C++, threads # # # libtorrent-rasterbar needs a toolchain w/ C++, threads, wchar, gcc >= 4.9 # # BR2_PACKAGE_LIBUEV is not set # BR2_PACKAGE_LIBUHTTPD is not set # # libuhttpd needs a toolchain w/ gcc >= 4.9 # # BR2_PACKAGE_LIBUPNP is not set # # libupnpp needs a toolchain w/ C++, threads, gcc >= 4.9 # # BR2_PACKAGE_LIBURIPARSER is not set # # libutp support needs a toolchain with C++ # # BR2_PACKAGE_LIBUWSC is not set # BR2_PACKAGE_LIBVNCSERVER is not set # BR2_PACKAGE_LIBWEBSOCK is not set # BR2_PACKAGE_LIBWEBSOCKETS is not set # BR2_PACKAGE_LIBYANG is not set # BR2_PACKAGE_LKSCTP_TOOLS is not set # BR2_PACKAGE_MBUFFER is not set # BR2_PACKAGE_MONGOOSE is not set # BR2_PACKAGE_NANOMSG is not set # BR2_PACKAGE_NEON is not set # # netopeer2 needs a toolchain w/ gcc >= 4.8, C++, threads, dynamic library # # BR2_PACKAGE_NGHTTP2 is not set # # norm needs a toolchain w/ C++, threads, dynamic library # # BR2_PACKAGE_NSS_PAM_LDAPD is not set # # omniORB needs a toolchain w/ C++, threads # # BR2_PACKAGE_OPEN_ISNS is not set # BR2_PACKAGE_OPEN62541 is not set # BR2_PACKAGE_OPENLDAP is not set # # openmpi needs a toolchain w/ dynamic library, NPTL, wchar, C++ # # BR2_PACKAGE_OPENPGM is not set # # openzwave needs a toolchain w/ C++, dynamic library, NPTL, wchar # # # ortp needs a toolchain w/ C++, threads # # BR2_PACKAGE_PAHO_MQTT_C is not set # # paho-mqtt-cpp needs a toolchain w/ threads, C++ # # # pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597 # # BR2_PACKAGE_QDECODER is not set # # qpid-proton needs a toolchain w/ C++, dynamic library, threads # # BR2_PACKAGE_RABBITMQ_C is not set # # resiprocate needs a toolchain w/ C++, threads, wchar # # # restclient-cpp needs a toolchain w/ C++, gcc >= 4.8 # # BR2_PACKAGE_RTMPDUMP is not set # BR2_PACKAGE_SIPROXD is not set # BR2_PACKAGE_SLIRP is not set # BR2_PACKAGE_SLIRP4NETNS is not set # # snmp++ needs a toolchain w/ threads, C++, dynamic library # # BR2_PACKAGE_SOFIA_SIP is not set # BR2_PACKAGE_SSCEP is not set # # sysrepo needs a toolchain w/ C++, NPTL, dynamic library, gcc >= 4.8 # # # thrift needs a toolchain w/ C++, wchar, threads # # BR2_PACKAGE_USBREDIR is not set # # wampcc needs a toolchain w/ C++, NPTL, dynamic library # # # websocketpp needs a toolchain w/ C++ and gcc >= 4.8 # # # zeromq needs a toolchain w/ C++, threads # # # zmqpp needs a toolchain w/ C++, threads, gcc >= 4.7 # # # zyre needs a toolchain w/ C++, threads # # # Other # # # ACE needs a glibc toolchain, dynamic library, C++, gcc >= 4.8 # # BR2_PACKAGE_APR is not set # BR2_PACKAGE_APR_UTIL is not set # # armadillo needs a toolchain w/ fortran, C++ # # # atf needs a toolchain w/ C++ # # BR2_PACKAGE_AVRO_C is not set # # bctoolbox needs a toolchain w/ C++, threads # # BR2_PACKAGE_BDWGC is not set # # belr needs a toolchain w/ threads, C++ # # # boost needs a toolchain w/ C++, threads, wchar # # # c-capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic, ucontext and not gcc bug 64735 # # # capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic, ucontext and not gcc bug 64735 # # # catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 5 # # # cctz needs a toolchain w/ C++, threads, gcc >= 4.8 # # # cereal needs a toolchain w/ C++, gcc >= 4.7, threads, wchar # # # clang needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5 # # BR2_PACKAGE_CMOCKA is not set # # cppcms needs a toolchain w/ C++, NPTL, wchar, dynamic library # # BR2_PACKAGE_CRACKLIB is not set # # dawgdic needs a toolchain w/ C++, gcc >= 4.6 # # BR2_PACKAGE_DING_LIBS is not set # BR2_PACKAGE_DOTCONF is not set # # double-conversion needs a toolchain w/ C++ # # # eigen needs a toolchain w/ C++ # # BR2_PACKAGE_ELFUTILS is not set # BR2_PACKAGE_ELL is not set # BR2_PACKAGE_FFTW is not set # # flann needs a toolchain w/ C++, dynamic library # # # flatbuffers needs a toolchain w/ C++, gcc >= 4.7 # # BR2_PACKAGE_FLATCC is not set # BR2_PACKAGE_FXDIV is not set # BR2_PACKAGE_GCONF is not set # # gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar # # # gflags needs a toolchain w/ C++ # # # gli needs a toolchain w/ C++ # # # glibmm needs a toolchain w/ C++, wchar, threads, gcc >= 7 # # # glm needs a toolchain w/ C++ # # BR2_PACKAGE_GMP is not set BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS=y # # gobject-introspection needs python3 # # BR2_PACKAGE_GSL is not set # # gtest needs a toolchain w/ C++, wchar, threads, gcc >= 5 # # BR2_PACKAGE_GUMBO_PARSER is not set # # highway needs a toolchain w/ C++, gcc >= 7 # BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS=y # BR2_PACKAGE_JEMALLOC is not set BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y # # lapack/blas needs a toolchain w/ fortran # BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y # # libabseil-cpp needs a toolchain w/ gcc >= 4.9, C++, threads, dynamic library # # BR2_PACKAGE_LIBARGTABLE2 is not set BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBATOMIC_OPS is not set # BR2_PACKAGE_LIBAVL is not set # BR2_PACKAGE_LIBB64 is not set # BR2_PACKAGE_LIBBACKTRACE is not set BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBBSD is not set # BR2_PACKAGE_LIBBYTESIZE is not set BR2_PACKAGE_LIBCAP=y # BR2_PACKAGE_LIBCAP_TOOLS is not set # BR2_PACKAGE_LIBCAP_NG is not set # # libcgroup needs a glibc toolchain w/ C++ # # BR2_PACKAGE_LIBCLC is not set # BR2_PACKAGE_LIBCORRECT is not set # # libcrossguid needs a toolchain w/ C++, gcc >= 4.7 # # BR2_PACKAGE_LIBCSV is not set # BR2_PACKAGE_LIBDAEMON is not set # BR2_PACKAGE_LIBDILL is not set BR2_PACKAGE_LIBEASTL_ARCH_SUPPORTS=y # # libeastl needs a toolchain w/ C++, threads, gcc >= 4.9 # # BR2_PACKAGE_LIBEE is not set # BR2_PACKAGE_LIBEV is not set # BR2_PACKAGE_LIBEVDEV is not set # BR2_PACKAGE_LIBEVENT is not set # # libexecinfo needs a musl or uclibc toolchain w/ dynamic library # # BR2_PACKAGE_LIBFFI is not set # # libfutils needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBGEE is not set # # libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 27597 # # BR2_PACKAGE_LIBGLIB2 is not set # BR2_PACKAGE_LIBGLOB is not set # # libical needs a toolchain w/ C++, dynamic library, wchar # # BR2_PACKAGE_LIBITE is not set # # libks needs a toolchain w/ C++, NPTL, dynamic library # # # liblinear needs a toolchain w/ C++ # # # libloki needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBNPTH is not set BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT=y # BR2_PACKAGE_LIBNSPR is not set # # libosmium needs a toolchain w/ C++, wchar, threads, gcc >= 4.7 # # # libpeas needs python3 # # BR2_PACKAGE_LIBPFM4 is not set # # libplist needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBPTHREAD_STUBS is not set # BR2_PACKAGE_LIBPTHSEM is not set # BR2_PACKAGE_LIBPWQUALITY is not set # BR2_PACKAGE_LIBQB is not set BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBSECCOMP is not set # # libshdata needs a toolchain w/ C++, threads # # # libsigc++ needs a toolchain w/ C++, gcc >= 7 # BR2_PACKAGE_LIBSIGSEGV_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBSIGSEGV is not set # BR2_PACKAGE_LIBSOLV is not set # # libspatialindex needs a toolchain w/ C++, gcc >= 4.7 # # BR2_PACKAGE_LIBTALLOC is not set # BR2_PACKAGE_LIBTASN1 is not set # BR2_PACKAGE_LIBTOMMATH is not set # BR2_PACKAGE_LIBTPL is not set # BR2_PACKAGE_LIBUBOX is not set # BR2_PACKAGE_LIBUCI is not set BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBUNWIND is not set BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBURCU is not set # BR2_PACKAGE_LIBURING is not set # BR2_PACKAGE_LIBUV is not set # BR2_PACKAGE_LIGHTNING is not set BR2_PACKAGE_LINUX_PAM=y # # linux-pam plugins # # BR2_PACKAGE_LIBPAM_NFC is not set # BR2_PACKAGE_LIBPAM_RADIUS_AUTH is not set # BR2_PACKAGE_LIBPAM_TACPLUS is not set # BR2_PACKAGE_LIQUID_DSP is not set BR2_PACKAGE_LLVM_ARCH_SUPPORTS=y BR2_PACKAGE_LLVM_TARGET_ARCH="X86" # # llvm needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5 # # BR2_PACKAGE_LTTNG_LIBUST is not set # BR2_PACKAGE_MATIO is not set # BR2_PACKAGE_MPC is not set # BR2_PACKAGE_MPDECIMAL is not set # BR2_PACKAGE_MPFR is not set # BR2_PACKAGE_MPIR is not set # # msgpack needs a toolchain w/ C++ # # BR2_PACKAGE_NEON_2_SSE is not set # BR2_PACKAGE_ORC is not set # BR2_PACKAGE_P11_KIT is not set BR2_PACKAGE_POCO_ARCH_SUPPORTS=y # # poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w/ C++14 # BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS=y BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS=y # # protobuf needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8 # # # protobuf-c needs a toolchain w/ C++, threads # # # protozero needs a toolchain w/ C++, gcc >= 4.7 # # # qhull needs a toolchain w/ C++, gcc >= 4.4 # # BR2_PACKAGE_QLIBC is not set # BR2_PACKAGE_REPROC is not set # # riemann-c-client needs a toolchain w/ C++, threads # # # shapelib needs a toolchain w/ C++, threads # # BR2_PACKAGE_SKALIBS is not set # BR2_PACKAGE_SPHINXBASE is not set # # tbb needs a glibc or musl toolchain w/ dynamic library, threads, C++ # # BR2_PACKAGE_TINYCBOR is not set # # tl-expected needs a toolchain w/ C++, gcc >= 4.8 # BR2_PACKAGE_TZDATA=y # # uvw needs a toolchain w/ NPTL, dynamic library, C++, gcc >= 7 # # # volk needs a toolchain w/ C++, NPTL, wchar, dynamic library # # # xapian needs a toolchain w/ C++ # # # Security # # BR2_PACKAGE_LIBAPPARMOR is not set # BR2_PACKAGE_LIBSELINUX is not set # BR2_PACKAGE_LIBSEMANAGE is not set # BR2_PACKAGE_LIBSEPOL is not set # BR2_PACKAGE_SAFECLIB is not set # # softhsm2 needs a toolchain w/ C++, threads, gcc >= 4.8 and dynamic library support # # # Text and terminal handling # # BR2_PACKAGE_AUGEAS is not set # # cli11 needs a toolchain w/ C++, gcc >= 4.8 # # # docopt-cpp needs a toolchain w/ C++, gcc >= 4.7 # # # enchant needs a toolchain w/ C++, threads, wchar # # # fmt needs a toolchain w/ C++, wchar # # BR2_PACKAGE_FSTRCMP is not set # # icu needs a toolchain w/ C++, wchar, threads, gcc >= 4.9, host gcc >= 4.9 # # BR2_PACKAGE_INIH is not set # BR2_PACKAGE_LIBCLI is not set # BR2_PACKAGE_LIBEDIT is not set # BR2_PACKAGE_LIBENCA is not set # BR2_PACKAGE_LIBESTR is not set # BR2_PACKAGE_LIBFRIBIDI is not set # BR2_PACKAGE_LIBUNIBREAK is not set # BR2_PACKAGE_LIBUNISTRING is not set # BR2_PACKAGE_LINENOISE is not set # BR2_PACKAGE_NCURSES is not set # BR2_PACKAGE_NEWT is not set # BR2_PACKAGE_ONIGURUMA is not set # BR2_PACKAGE_PCRE is not set # BR2_PACKAGE_PCRE2 is not set # BR2_PACKAGE_POPT is not set # # re2 needs a toolchain w/ C++, threads, gcc >= 4.8 # # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_SLANG is not set # # tclap needs a toolchain w/ C++ # # # termcolor needs a toolchain w/ C++, gcc >= 4.8 # # BR2_PACKAGE_UTF8PROC is not set # # Mail # # BR2_PACKAGE_DOVECOT is not set # BR2_PACKAGE_EXIM is not set # BR2_PACKAGE_FETCHMAIL is not set # BR2_PACKAGE_HEIRLOOM_MAILX is not set # BR2_PACKAGE_LIBESMTP is not set # BR2_PACKAGE_MSMTP is not set # BR2_PACKAGE_MUTT is not set # # Miscellaneous # # BR2_PACKAGE_AESPIPE is not set # BR2_PACKAGE_BC is not set BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS=y # # bitcoin needs a toolchain w/ C++, threads, wchar # # # clamav needs a toolchain w/ C++, dynamic library, threads, wchar # # BR2_PACKAGE_COLLECTD is not set # BR2_PACKAGE_COLLECTL is not set # # domoticz needs lua 5.3 and a toolchain w/ C++, gcc >= 6, NPTL, wchar, dynamic library # # BR2_PACKAGE_EMPTY is not set # BR2_PACKAGE_GITLAB_RUNNER is not set # # gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 8 # # BR2_PACKAGE_GOOGLEFONTDIRECTORY is not set # # gqrx needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8 # # # gqrx needs qt5 # # BR2_PACKAGE_GSETTINGS_DESKTOP_SCHEMAS is not set # BR2_PACKAGE_HAVEGED is not set # BR2_PACKAGE_LINUX_SYSCALL_SUPPORT is not set # BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO is not set # BR2_PACKAGE_NETDATA is not set # # proj needs a toolchain w/ C++, gcc >= 4.7, threads, wchar # BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y # BR2_PACKAGE_QEMU is not set # # qpdf needs a toolchain w/ C++, gcc >= 5 # # BR2_PACKAGE_RTL_433 is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set # # sunwait needs a toolchain w/ C++ # # # taskd needs a toolchain w/ C++, wchar, dynamic library # BR2_PACKAGE_XMRIG_ARCH_SUPPORTS=y # # xmrig needs a glibc or musl toolchain w/ NPTL, dynamic library, C++ # # BR2_PACKAGE_XUTIL_UTIL_MACROS is not set BR2_PACKAGE_Z3_ARCH_SUPPORTS=y # # Networking applications # # # aircrack-ng needs a toolchain w/ dynamic library, threads, C++ # # BR2_PACKAGE_ALFRED is not set # BR2_PACKAGE_AOETOOLS is not set # BR2_PACKAGE_APACHE is not set # BR2_PACKAGE_ARGUS is not set # BR2_PACKAGE_ARP_SCAN is not set # BR2_PACKAGE_ARPTABLES is not set # # asterisk needs a glibc or uClibc toolchain w/ C++, dynamic library, threads, wchar # # BR2_PACKAGE_ATFTP is not set # BR2_PACKAGE_AVAHI is not set # BR2_PACKAGE_AXEL is not set # BR2_PACKAGE_BABELD is not set # BR2_PACKAGE_BANDWIDTHD is not set # BR2_PACKAGE_BATCTL is not set # # bcusdk needs a toolchain w/ C++ # # BR2_PACKAGE_BIND is not set # BR2_PACKAGE_BIRD is not set # BR2_PACKAGE_BLUEZ5_UTILS is not set # BR2_PACKAGE_BMON is not set # BR2_PACKAGE_BMX7 is not set # # boinc needs a toolchain w/ dynamic library, C++, threads, gcc >= 4.8 # # BR2_PACKAGE_BRCM_PATCHRAM_PLUS is not set # BR2_PACKAGE_BRIDGE_UTILS is not set # BR2_PACKAGE_BWM_NG is not set # BR2_PACKAGE_C_ICAP is not set # BR2_PACKAGE_CAN_UTILS is not set # # cannelloni needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8 # # BR2_PACKAGE_CASYNC is not set # BR2_PACKAGE_CFM is not set # BR2_PACKAGE_CHRONY is not set # BR2_PACKAGE_CIVETWEB is not set # BR2_PACKAGE_CONNMAN is not set # # connman-gtk needs libgtk3 and a glibc or uClibc toolchain w/ wchar, threads, resolver, dynamic library # # BR2_PACKAGE_CONNTRACK_TOOLS is not set # BR2_PACKAGE_CORKSCREW is not set # BR2_PACKAGE_CRDA is not set # # ctorrent needs a toolchain w/ C++ # # # cups needs a toolchain w/ C++, threads # # # cups-filters needs a toolchain w/ wchar, C++, threads and dynamic library, gcc >= 5 # # BR2_PACKAGE_DANTE is not set # BR2_PACKAGE_DARKHTTPD is not set # BR2_PACKAGE_DEHYDRATED is not set # BR2_PACKAGE_DHCP is not set # BR2_PACKAGE_DHCPCD is not set # BR2_PACKAGE_DHCPDUMP is not set # BR2_PACKAGE_DNSMASQ is not set # BR2_PACKAGE_DRBD_UTILS is not set # BR2_PACKAGE_DROPBEAR is not set # BR2_PACKAGE_EASYFRAMES is not set # BR2_PACKAGE_EBTABLES is not set # # ejabberd needs erlang, toolchain w/ C++ # # BR2_PACKAGE_ETHTOOL is not set # BR2_PACKAGE_FAIFA is not set # BR2_PACKAGE_FASTD is not set # BR2_PACKAGE_FCGIWRAP is not set # BR2_PACKAGE_FLANNEL is not set # BR2_PACKAGE_FPING is not set # BR2_PACKAGE_FREERADIUS_SERVER is not set # # freeswitch needs a toolchain w/ C++, dynamic library, threads, wchar # # BR2_PACKAGE_FRR is not set # # gerbera needs a toolchain w/ C++, dynamic library, threads, wchar, gcc >= 8 # # BR2_PACKAGE_GESFTPSERVER is not set # # gloox needs a toolchain w/ C++ # # BR2_PACKAGE_GLORYTUN is not set # # gupnp-tools needs libgtk3 # # # hans needs a toolchain w/ C++ # BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS=y # BR2_PACKAGE_HAPROXY is not set # BR2_PACKAGE_HIAWATHA is not set # BR2_PACKAGE_HOSTAPD is not set # BR2_PACKAGE_HTPDATE is not set # BR2_PACKAGE_HTTPING is not set # # i2pd needs a toolchain w/ C++, NPTL, wchar # # # ibrdtn-tools needs a toolchain w/ C++, threads # # # ibrdtnd needs a toolchain w/ C++, threads # # BR2_PACKAGE_IFENSLAVE is not set # BR2_PACKAGE_IFMETRIC is not set # BR2_PACKAGE_IFPLUGD is not set # BR2_PACKAGE_IFTOP is not set # BR2_PACKAGE_IFUPDOWN is not set # BR2_PACKAGE_IGD2_FOR_LINUX is not set # BR2_PACKAGE_IGH_ETHERCAT is not set # BR2_PACKAGE_IGMPPROXY is not set # BR2_PACKAGE_INADYN is not set # BR2_PACKAGE_IODINE is not set # BR2_PACKAGE_IPCALC is not set # # iperf needs a toolchain w/ C++ # # BR2_PACKAGE_IPERF3 is not set # BR2_PACKAGE_IPROUTE2 is not set # BR2_PACKAGE_IPSET is not set # BR2_PACKAGE_IPTABLES is not set # BR2_PACKAGE_IPTRAF_NG is not set # BR2_PACKAGE_IPUTILS is not set # BR2_PACKAGE_IRSSI is not set # BR2_PACKAGE_IW is not set # BR2_PACKAGE_IWD is not set # BR2_PACKAGE_JANUS_GATEWAY is not set # BR2_PACKAGE_KEEPALIVED is not set # # kismet needs a toolchain w/ threads, C++, gcc >= 5 # # BR2_PACKAGE_KNOCK is not set # BR2_PACKAGE_KSMBD_TOOLS is not set # BR2_PACKAGE_LEAFNODE2 is not set # BR2_PACKAGE_LFT is not set # # lftp requires a toolchain w/ C++, wchar # # BR2_PACKAGE_LIGHTTPD is not set # # linknx needs a toolchain w/ C++ # # BR2_PACKAGE_LINKS is not set # # linphone needs a toolchain w/ threads, C++, dynamic library, wchar, gcc >= 5 # # BR2_PACKAGE_LINUX_ZIGBEE is not set # BR2_PACKAGE_LINUXPTP is not set # BR2_PACKAGE_LLDPD is not set # BR2_PACKAGE_LRZSZ is not set # BR2_PACKAGE_LYNX is not set # BR2_PACKAGE_MACCHANGER is not set # BR2_PACKAGE_MEMCACHED is not set # BR2_PACKAGE_MII_DIAG is not set # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MINIDLNA is not set # BR2_PACKAGE_MINISSDPD is not set # BR2_PACKAGE_MJPG_STREAMER is not set # BR2_PACKAGE_MODEM_MANAGER is not set BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS=y # # mongrel2 needs a uClibc or glibc toolchain w/ C++, threads, dynamic library # # # mosh needs a toolchain w/ C++, threads, dynamic library, wchar, gcc >= 4.8 # # BR2_PACKAGE_MOSQUITTO is not set # BR2_PACKAGE_MROUTED is not set # BR2_PACKAGE_MRP is not set # BR2_PACKAGE_MSTPD is not set # BR2_PACKAGE_MTR is not set # BR2_PACKAGE_NBD is not set # BR2_PACKAGE_NCFTP is not set # BR2_PACKAGE_NDISC6 is not set # BR2_PACKAGE_NET_TOOLS is not set # BR2_PACKAGE_NETATALK is not set # BR2_PACKAGE_NETCALC is not set # BR2_PACKAGE_NETCAT is not set # BR2_PACKAGE_NETCAT_OPENBSD is not set # BR2_PACKAGE_NETPLUG is not set # BR2_PACKAGE_NETSNMP is not set # BR2_PACKAGE_NETSTAT_NAT is not set # BR2_PACKAGE_NETWORK_MANAGER is not set # BR2_PACKAGE_NETWORKD_DISPATCHER is not set # BR2_PACKAGE_NFACCT is not set # BR2_PACKAGE_NFTABLES is not set # BR2_PACKAGE_NGINX is not set # BR2_PACKAGE_NGIRCD is not set # BR2_PACKAGE_NGREP is not set # # nload needs a toolchain w/ C++ # # # nmap-nmap needs a toolchain w/ C++, threads # # BR2_PACKAGE_NOIP is not set # BR2_PACKAGE_NTP is not set # BR2_PACKAGE_NTPSEC is not set # BR2_PACKAGE_NUTTCP is not set # BR2_PACKAGE_ODHCP6C is not set # BR2_PACKAGE_ODHCPLOC is not set # BR2_PACKAGE_OLSR is not set # BR2_PACKAGE_OPEN_ISCSI is not set # BR2_PACKAGE_OPEN_LLDP is not set # BR2_PACKAGE_OPEN_PLC_UTILS is not set # BR2_PACKAGE_OPENNTPD is not set # BR2_PACKAGE_OPENOBEX is not set # BR2_PACKAGE_OPENRESOLV is not set # BR2_PACKAGE_OPENSSH is not set # BR2_PACKAGE_OPENSWAN is not set # BR2_PACKAGE_OPENVPN is not set # BR2_PACKAGE_P910ND is not set # BR2_PACKAGE_PARPROUTED is not set # BR2_PACKAGE_PHIDGETWEBSERVICE is not set # BR2_PACKAGE_PHYTOOL is not set # BR2_PACKAGE_PIMD is not set # BR2_PACKAGE_PIXIEWPS is not set # BR2_PACKAGE_POUND is not set # BR2_PACKAGE_PPPD is not set # BR2_PACKAGE_PPTP_LINUX is not set # BR2_PACKAGE_PRIVOXY is not set # BR2_PACKAGE_PROFTPD is not set # # prosody needs the lua interpreter, dynamic library # # BR2_PACKAGE_PROXYCHAINS_NG is not set # BR2_PACKAGE_PTPD is not set # BR2_PACKAGE_PTPD2 is not set # BR2_PACKAGE_PURE_FTPD is not set # BR2_PACKAGE_PUTTY is not set # BR2_PACKAGE_QUAGGA is not set # BR2_PACKAGE_RADVD is not set # BR2_PACKAGE_REAVER is not set # BR2_PACKAGE_REDIR is not set # BR2_PACKAGE_RP_PPPOE is not set # BR2_PACKAGE_RPCBIND is not set # BR2_PACKAGE_RSH_REDONE is not set # BR2_PACKAGE_RSYNC is not set # # rtorrent needs a toolchain w/ C++, threads, wchar, gcc >= 4.9 # # BR2_PACKAGE_RTPTOOLS is not set # BR2_PACKAGE_S6_DNS is not set # BR2_PACKAGE_S6_NETWORKING is not set # BR2_PACKAGE_SAMBA4 is not set # # sconeserver needs a toolchain with dynamic library, C++, NPTL # # BR2_PACKAGE_SER2NET is not set # BR2_PACKAGE_SHADOWSOCKS_LIBEV is not set # # shairport-sync needs a toolchain w/ C++, NPTL # # BR2_PACKAGE_SHELLINABOX is not set # BR2_PACKAGE_SMCROUTE is not set # BR2_PACKAGE_SNGREP is not set # BR2_PACKAGE_SNORT is not set # # snort3 needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.9 # # BR2_PACKAGE_SOCAT is not set # BR2_PACKAGE_SOCKETCAND is not set # BR2_PACKAGE_SOFTETHER is not set # BR2_PACKAGE_SPAWN_FCGI is not set # # spice server needs a toolchain w/ wchar, threads, C++ # # BR2_PACKAGE_SPICE_PROTOCOL is not set # # squid needs a toolchain w/ C++, threads, gcc >= 4.8 not affected by bug 64735 # # BR2_PACKAGE_SSDP_RESPONDER is not set # BR2_PACKAGE_SSHGUARD is not set # BR2_PACKAGE_SSHPASS is not set # BR2_PACKAGE_SSLH is not set # BR2_PACKAGE_STRONGSWAN is not set # BR2_PACKAGE_STUNNEL is not set # BR2_PACKAGE_SURICATA is not set # BR2_PACKAGE_TCPDUMP is not set # BR2_PACKAGE_TCPING is not set # BR2_PACKAGE_TCPREPLAY is not set # BR2_PACKAGE_TFTPD is not set # BR2_PACKAGE_THTTPD is not set # BR2_PACKAGE_TINC is not set # BR2_PACKAGE_TINYPROXY is not set # BR2_PACKAGE_TINYSSH is not set # BR2_PACKAGE_TOR is not set # BR2_PACKAGE_TRACEROUTE is not set # BR2_PACKAGE_TRANSMISSION is not set # BR2_PACKAGE_TUNCTL is not set # BR2_PACKAGE_TVHEADEND is not set # BR2_PACKAGE_UACME is not set # BR2_PACKAGE_UDPCAST is not set # BR2_PACKAGE_UFTP is not set # BR2_PACKAGE_UHTTPD is not set # BR2_PACKAGE_ULOGD is not set # BR2_PACKAGE_UNBOUND is not set # BR2_PACKAGE_UQMI is not set # BR2_PACKAGE_UREDIR is not set # BR2_PACKAGE_USHARE is not set # BR2_PACKAGE_USSP_PUSH is not set # BR2_PACKAGE_VDE2 is not set # # vdr needs a toolchain w/ C++, dynamic library, NPTL, wchar, headers >= 3.9 # # BR2_PACKAGE_VNSTAT is not set # BR2_PACKAGE_VPNC is not set # BR2_PACKAGE_VSFTPD is not set # BR2_PACKAGE_VTUN is not set # BR2_PACKAGE_WAVEMON is not set # BR2_PACKAGE_WGET is not set # BR2_PACKAGE_WHOIS is not set # BR2_PACKAGE_WIREGUARD_TOOLS is not set # BR2_PACKAGE_WIRELESS_REGDB is not set # BR2_PACKAGE_WIRELESS_TOOLS is not set # # wireshark needs a toolchain w/ wchar, threads, dynamic library, C++ # # BR2_PACKAGE_WPA_SUPPLICANT is not set # BR2_PACKAGE_WPAN_TOOLS is not set # BR2_PACKAGE_XINETD is not set # BR2_PACKAGE_XL2TP is not set # BR2_PACKAGE_XTABLES_ADDONS is not set # BR2_PACKAGE_ZABBIX is not set # # zeek needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 7 # # # znc needs a toolchain w/ C++, dynamic library, gcc >= 4.8, threads # # # Package managers # # # ------------------------------------------------------- # # # Please note: # # # - Buildroot does *not* generate binary packages, # # # - Buildroot does *not* install any package database. # # # * # # # It is up to you to provide those by yourself if you # # # want to use any of those package managers. # # # * # # # See the manual: # # # http://buildroot.org/manual.html#faq-no-binary-packages # # # ------------------------------------------------------- # # BR2_PACKAGE_OPKG is not set # BR2_PACKAGE_OPKG_UTILS is not set # # rpm needs a toolchain w/ dynamic library, threads and lua >= 5.3 # # # Real-Time # BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS=y # BR2_PACKAGE_XENOMAI is not set # # Security # # # apparmor needs a toolchain w/ headers >= 3.16, threads, C++ # # BR2_PACKAGE_CHECKPOLICY is not set # BR2_PACKAGE_IMA_EVM_UTILS is not set # BR2_PACKAGE_OPTEE_BENCHMARK is not set # BR2_PACKAGE_OPTEE_CLIENT is not set # BR2_PACKAGE_PAXTEST is not set # BR2_PACKAGE_POLICYCOREUTILS is not set # BR2_PACKAGE_REFPOLICY is not set # BR2_PACKAGE_RESTORECOND is not set # BR2_PACKAGE_SELINUX_PYTHON is not set # BR2_PACKAGE_SEMODULE_UTILS is not set # # setools needs python3 # # # Shell and utilities # # # Shells # # BR2_PACKAGE_BASH is not set # BR2_PACKAGE_DASH is not set # BR2_PACKAGE_MKSH is not set # BR2_PACKAGE_ZSH is not set # # Utilities # # BR2_PACKAGE_APG is not set # BR2_PACKAGE_AT is not set # BR2_PACKAGE_CATATONIT is not set # BR2_PACKAGE_CCRYPT is not set # BR2_PACKAGE_DIALOG is not set # BR2_PACKAGE_DTACH is not set # BR2_PACKAGE_EASY_RSA is not set # BR2_PACKAGE_FILE is not set # BR2_PACKAGE_GNUPG is not set BR2_PACKAGE_GNUPG2_DEPENDS=y # BR2_PACKAGE_GNUPG2 is not set # BR2_PACKAGE_INOTIFY_TOOLS is not set # BR2_PACKAGE_LOCKFILE_PROGS is not set # BR2_PACKAGE_LOGROTATE is not set # BR2_PACKAGE_LOGSURFER is not set # BR2_PACKAGE_NEOFETCH is not set # BR2_PACKAGE_PDMENU is not set # BR2_PACKAGE_PINENTRY is not set # BR2_PACKAGE_QPRINT is not set # BR2_PACKAGE_RANGER is not set # BR2_PACKAGE_RTTY is not set # BR2_PACKAGE_SCREEN is not set # BR2_PACKAGE_SCREENFETCH is not set # BR2_PACKAGE_SEXPECT is not set # BR2_PACKAGE_SUDO is not set # BR2_PACKAGE_TIME is not set # BR2_PACKAGE_TINI is not set # BR2_PACKAGE_TMUX is not set # BR2_PACKAGE_TTYD is not set # BR2_PACKAGE_WHICH is not set # BR2_PACKAGE_WTFUTIL is not set # BR2_PACKAGE_XMLSTARLET is not set # BR2_PACKAGE_XXHASH is not set # BR2_PACKAGE_YTREE is not set # # System tools # # BR2_PACKAGE_ACL is not set # BR2_PACKAGE_ANDROID_TOOLS is not set # BR2_PACKAGE_ATOP is not set # BR2_PACKAGE_ATTR is not set BR2_PACKAGE_AUDIT_ARCH_SUPPORTS=y # BR2_PACKAGE_AUDIT is not set # BR2_PACKAGE_BALENA_ENGINE is not set # BR2_PACKAGE_BUBBLEWRAP is not set # # circus needs Python 3 and a toolchain w/ C++, threads # # BR2_PACKAGE_CONTAINERD is not set # BR2_PACKAGE_COREUTILS is not set # BR2_PACKAGE_CPULIMIT is not set # BR2_PACKAGE_CPULOAD is not set # BR2_PACKAGE_CRUN is not set # BR2_PACKAGE_DAEMON is not set # BR2_PACKAGE_DC3DD is not set # BR2_PACKAGE_DCRON is not set # # ddrescue needs a toolchain w/ C++ # # BR2_PACKAGE_DEBIANUTILS is not set # BR2_PACKAGE_DOCKER_CLI is not set # # docker-compose needs docker-cli and a toolchain w/ threads # # BR2_PACKAGE_DOCKER_ENGINE is not set # BR2_PACKAGE_EARLYOOM is not set # BR2_PACKAGE_EFIBOOTMGR is not set BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS=y # BR2_PACKAGE_EFIVAR is not set # BR2_PACKAGE_EMBIGGEN_DISK is not set # BR2_PACKAGE_EMLOG is not set # BR2_PACKAGE_FLUENT_BIT is not set # BR2_PACKAGE_FTOP is not set # BR2_PACKAGE_GETENT is not set # BR2_PACKAGE_GKRELLM is not set # BR2_PACKAGE_HTOP is not set # BR2_PACKAGE_IBM_SW_TPM2 is not set # # iotop depends on python3 # # BR2_PACKAGE_IPRUTILS is not set # BR2_PACKAGE_IRQBALANCE is not set # BR2_PACKAGE_JAILHOUSE is not set # BR2_PACKAGE_KEYUTILS is not set BR2_PACKAGE_KMOD=y BR2_PACKAGE_KMOD_TOOLS=y # BR2_PACKAGE_KVMTOOL is not set # BR2_PACKAGE_LIBOSTREE is not set BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBVIRT is not set # BR2_PACKAGE_LXC is not set BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS=y # BR2_PACKAGE_MAKEDUMPFILE is not set # BR2_PACKAGE_MENDER is not set # BR2_PACKAGE_MENDER_CONNECT is not set # BR2_PACKAGE_MFOC is not set # BR2_PACKAGE_MOBY_BUILDKIT is not set # BR2_PACKAGE_MONIT is not set # BR2_PACKAGE_MULTIPATH_TOOLS is not set # BR2_PACKAGE_NCDU is not set # BR2_PACKAGE_NERDCTL is not set # # netifrc needs openrc as init system # # BR2_PACKAGE_NUMACTL is not set # # nut needs a toolchain w/ C++ # BR2_PACKAGE_OPENVMTOOLS_ARCH_SUPPORTS=y # BR2_PACKAGE_OPENVMTOOLS is not set # BR2_PACKAGE_PAMTESTER is not set # BR2_PACKAGE_POLKIT is not set # BR2_PACKAGE_PROCPS_NG is not set # BR2_PACKAGE_PROCRANK_LINUX is not set # BR2_PACKAGE_PSMISC is not set # BR2_PACKAGE_PWGEN is not set # BR2_PACKAGE_QUOTA is not set # BR2_PACKAGE_QUOTATOOL is not set # BR2_PACKAGE_RAUC is not set # BR2_PACKAGE_RSYSLOG is not set # BR2_PACKAGE_RUNC is not set # BR2_PACKAGE_S6 is not set # BR2_PACKAGE_S6_LINUX_INIT is not set # BR2_PACKAGE_S6_LINUX_UTILS is not set # BR2_PACKAGE_S6_PORTABLE_UTILS is not set # BR2_PACKAGE_S6_RC is not set # BR2_PACKAGE_SCRUB is not set # BR2_PACKAGE_SCRYPT is not set # # sdbus-c++ needs systemd and a toolchain w/ C++, gcc >= 7 # # # sdbusplus needs systemd and a toolchain w/ C++, gcc >= 7 # # BR2_PACKAGE_SEATD is not set BR2_PACKAGE_SHADOW=y # BR2_PACKAGE_SHADOW_SHADOWGRP is not set # BR2_PACKAGE_SHADOW_ACCOUNT_TOOLS_SETUID is not set # BR2_PACKAGE_SHADOW_UTMPX is not set # BR2_PACKAGE_SHADOW_SUBORDINATE_IDS is not set BR2_PACKAGE_SHADOW_SHA_CRYPT=y # BR2_PACKAGE_SHADOW_BCRYPT is not set # BR2_PACKAGE_SHADOW_YESCRYPT is not set # BR2_PACKAGE_SMACK is not set # BR2_PACKAGE_START_STOP_DAEMON is not set # # supervisor needs a python interpreter # # BR2_PACKAGE_SWUPDATE is not set # BR2_PACKAGE_SYSKLOGD is not set # BR2_PACKAGE_SYSLOG_NG is not set BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS=y BR2_PACKAGE_SYSTEMD=y # BR2_PACKAGE_SYSTEMD_BOOT is not set # BR2_PACKAGE_SYSTEMD_INITRD is not set # BR2_PACKAGE_SYSTEMD_KERNELINSTALL is not set # BR2_PACKAGE_SYSTEMD_ANALYZE is not set # BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE is not set # BR2_PACKAGE_SYSTEMD_BACKLIGHT is not set # BR2_PACKAGE_SYSTEMD_BINFMT is not set # BR2_PACKAGE_SYSTEMD_COREDUMP is not set BR2_PACKAGE_SYSTEMD_PSTORE=y # BR2_PACKAGE_SYSTEMD_FIRSTBOOT is not set # BR2_PACKAGE_SYSTEMD_HIBERNATE is not set # BR2_PACKAGE_SYSTEMD_HOMED is not set BR2_PACKAGE_SYSTEMD_HOSTNAMED=y BR2_PACKAGE_SYSTEMD_HWDB=y # BR2_PACKAGE_SYSTEMD_IMPORTD is not set # BR2_PACKAGE_SYSTEMD_CATALOGDB is not set # BR2_PACKAGE_SYSTEMD_LOCALED is not set BR2_PACKAGE_SYSTEMD_LOGIND=y # BR2_PACKAGE_SYSTEMD_MACHINED is not set BR2_PACKAGE_SYSTEMD_MYHOSTNAME=y BR2_PACKAGE_SYSTEMD_NETWORKD=y # BR2_PACKAGE_SYSTEMD_OOMD is not set # BR2_PACKAGE_SYSTEMD_POLKIT is not set # BR2_PACKAGE_SYSTEMD_PORTABLED is not set # BR2_PACKAGE_SYSTEMD_QUOTACHECK is not set # BR2_PACKAGE_SYSTEMD_RANDOMSEED is not set # BR2_PACKAGE_SYSTEMD_REPART is not set BR2_PACKAGE_SYSTEMD_RESOLVED=y # BR2_PACKAGE_SYSTEMD_RFKILL is not set # BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT is not set # BR2_PACKAGE_SYSTEMD_SYSEXT is not set # BR2_PACKAGE_SYSTEMD_SYSUPDATE is not set # BR2_PACKAGE_SYSTEMD_SYSUSERS is not set BR2_PACKAGE_SYSTEMD_TIMEDATED=y BR2_PACKAGE_SYSTEMD_TIMESYNCD=y # BR2_PACKAGE_SYSTEMD_USERDB is not set # BR2_PACKAGE_SYSTEMD_UTMP is not set BR2_PACKAGE_SYSTEMD_VCONSOLE=y BR2_PACKAGE_SYSTEMD_BOOTCHART_ARCH_SUPPORTS=y # BR2_PACKAGE_SYSTEMD_BOOTCHART is not set # BR2_PACKAGE_TAR is not set # BR2_PACKAGE_TEALDEER is not set # # thermald needs a toolchain w/ C++, wchar, threads # # BR2_PACKAGE_TPM_TOOLS is not set # BR2_PACKAGE_TPM2_ABRMD is not set # BR2_PACKAGE_TPM2_TOOLS is not set # BR2_PACKAGE_TPM2_TOTP is not set # BR2_PACKAGE_UNSCD is not set BR2_PACKAGE_UTIL_LINUX=y BR2_PACKAGE_UTIL_LINUX_LIBS=y BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y # BR2_PACKAGE_UTIL_LINUX_LIBFDISK is not set BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y # BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS is not set BR2_PACKAGE_UTIL_LINUX_LIBUUID=y # BR2_PACKAGE_UTIL_LINUX_BINARIES is not set BR2_PACKAGE_UTIL_LINUX_AGETTY=y # BR2_PACKAGE_UTIL_LINUX_BFS is not set # BR2_PACKAGE_UTIL_LINUX_CAL is not set # BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH is not set # BR2_PACKAGE_UTIL_LINUX_CHMEM is not set # BR2_PACKAGE_UTIL_LINUX_CRAMFS is not set # BR2_PACKAGE_UTIL_LINUX_EJECT is not set # BR2_PACKAGE_UTIL_LINUX_FALLOCATE is not set # BR2_PACKAGE_UTIL_LINUX_FDFORMAT is not set BR2_PACKAGE_UTIL_LINUX_FSCK=y # BR2_PACKAGE_UTIL_LINUX_HARDLINK is not set # BR2_PACKAGE_UTIL_LINUX_HWCLOCK is not set # BR2_PACKAGE_UTIL_LINUX_IPCMK is not set # BR2_PACKAGE_UTIL_LINUX_IPCRM is not set # BR2_PACKAGE_UTIL_LINUX_IPCS is not set # BR2_PACKAGE_UTIL_LINUX_IRQTOP is not set # BR2_PACKAGE_UTIL_LINUX_KILL is not set # BR2_PACKAGE_UTIL_LINUX_LAST is not set # BR2_PACKAGE_UTIL_LINUX_LINE is not set # BR2_PACKAGE_UTIL_LINUX_LOGGER is not set # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set # BR2_PACKAGE_UTIL_LINUX_LOSETUP is not set # BR2_PACKAGE_UTIL_LINUX_LSFD is not set # BR2_PACKAGE_UTIL_LINUX_LSLOGINS is not set # BR2_PACKAGE_UTIL_LINUX_LSMEM is not set # BR2_PACKAGE_UTIL_LINUX_MESG is not set # BR2_PACKAGE_UTIL_LINUX_MINIX is not set # BR2_PACKAGE_UTIL_LINUX_MORE is not set BR2_PACKAGE_UTIL_LINUX_MOUNT=y # BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT is not set # BR2_PACKAGE_UTIL_LINUX_NEWGRP is not set # BR2_PACKAGE_UTIL_LINUX_NOLOGIN is not set # BR2_PACKAGE_UTIL_LINUX_NSENTER is not set # BR2_PACKAGE_UTIL_LINUX_PG is not set # BR2_PACKAGE_UTIL_LINUX_PARTX is not set # BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT is not set # # raw needs a toolchain w/ headers < 5.14 # # BR2_PACKAGE_UTIL_LINUX_RENAME is not set # BR2_PACKAGE_UTIL_LINUX_RFKILL is not set # BR2_PACKAGE_UTIL_LINUX_RUNUSER is not set # BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS is not set # BR2_PACKAGE_UTIL_LINUX_SETPRIV is not set # BR2_PACKAGE_UTIL_LINUX_SETTERM is not set # BR2_PACKAGE_UTIL_LINUX_SU is not set # BR2_PACKAGE_UTIL_LINUX_SULOGIN is not set # BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT is not set # BR2_PACKAGE_UTIL_LINUX_TUNELP is not set # BR2_PACKAGE_UTIL_LINUX_UL is not set # BR2_PACKAGE_UTIL_LINUX_UNSHARE is not set # BR2_PACKAGE_UTIL_LINUX_UTMPDUMP is not set # BR2_PACKAGE_UTIL_LINUX_UUIDD is not set # BR2_PACKAGE_UTIL_LINUX_VIPW is not set # BR2_PACKAGE_UTIL_LINUX_WALL is not set # BR2_PACKAGE_UTIL_LINUX_WIPEFS is not set # BR2_PACKAGE_UTIL_LINUX_WDCTL is not set # BR2_PACKAGE_UTIL_LINUX_WRITE is not set # BR2_PACKAGE_UTIL_LINUX_ZRAMCTL is not set # BR2_PACKAGE_WATCHDOG is not set # BR2_PACKAGE_WATCHDOGD is not set # BR2_PACKAGE_XDG_DBUS_PROXY is not set BR2_PACKAGE_XVISOR_ARCH_SUPPORTS=y # BR2_PACKAGE_XVISOR is not set # # Text editors and viewers # # BR2_PACKAGE_BAT is not set # BR2_PACKAGE_ED is not set # BR2_PACKAGE_JOE is not set # BR2_PACKAGE_LESS is not set # BR2_PACKAGE_MC is not set # BR2_PACKAGE_MG is not set # BR2_PACKAGE_MOST is not set # BR2_PACKAGE_NANO is not set # BR2_PACKAGE_UEMACS is not set # BR2_PACKAGE_VIM is not set # # Filesystem images # # BR2_TARGET_ROOTFS_AXFS is not set # BR2_TARGET_ROOTFS_BTRFS is not set # BR2_TARGET_ROOTFS_CLOOP is not set # BR2_TARGET_ROOTFS_CPIO is not set # BR2_TARGET_ROOTFS_CRAMFS is not set # BR2_TARGET_ROOTFS_EROFS is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_2=y # BR2_TARGET_ROOTFS_EXT2_2r0 is not set BR2_TARGET_ROOTFS_EXT2_2r1=y # BR2_TARGET_ROOTFS_EXT2_3 is not set # BR2_TARGET_ROOTFS_EXT2_4 is not set BR2_TARGET_ROOTFS_EXT2_GEN=2 BR2_TARGET_ROOTFS_EXT2_REV=1 BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" BR2_TARGET_ROOTFS_EXT2_SIZE="60M" BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_INODE_SIZE=256 BR2_TARGET_ROOTFS_EXT2_RESBLKS=5 BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit" BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZ4 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set # BR2_TARGET_ROOTFS_EXT2_LZO is not set # BR2_TARGET_ROOTFS_EXT2_XZ is not set # BR2_TARGET_ROOTFS_EXT2_ZSTD is not set # BR2_TARGET_ROOTFS_F2FS is not set # BR2_TARGET_ROOTFS_INITRAMFS is not set # # iso image needs a Linux kernel and either grub2 or isolinux to be built # # BR2_TARGET_ROOTFS_JFFS2 is not set # BR2_TARGET_ROOTFS_OCI is not set # BR2_TARGET_ROOTFS_ROMFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set # BR2_TARGET_ROOTFS_UBI is not set # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_YAFFS2 is not set # # Bootloaders # # BR2_TARGET_BAREBOX is not set BR2_TARGET_EDK2_ARCH_SUPPORTS=y # BR2_TARGET_EDK2 is not set BR2_TARGET_GRUB2_ARCH_SUPPORTS=y # BR2_TARGET_GRUB2 is not set BR2_PACKAGE_SHIM_ARCH_SUPPORTS=y # BR2_TARGET_SHIM is not set # BR2_TARGET_SYSLINUX is not set # BR2_TARGET_UBOOT is not set # # Host utilities # # BR2_PACKAGE_HOST_ABOOTIMG is not set # BR2_PACKAGE_HOST_AESPIPE is not set # BR2_PACKAGE_HOST_AGENT_PROXY is not set # BR2_PACKAGE_HOST_ANDROID_TOOLS is not set # BR2_PACKAGE_HOST_ASN1C is not set # BR2_PACKAGE_HOST_BABELTRACE2 is not set # BR2_PACKAGE_HOST_BMAP_TOOLS is not set # BR2_PACKAGE_HOST_BOOTGEN is not set # BR2_PACKAGE_HOST_BTRFS_PROGS is not set # BR2_PACKAGE_HOST_CHECKPOLICY is not set # BR2_PACKAGE_HOST_CHECKSEC is not set # BR2_PACKAGE_HOST_CMAKE is not set # BR2_PACKAGE_HOST_CRAMFS is not set # BR2_PACKAGE_HOST_CRUDINI is not set # BR2_PACKAGE_HOST_CRYPTSETUP is not set # BR2_PACKAGE_HOST_DBUS_PYTHON is not set # BR2_PACKAGE_HOST_DELVE is not set # BR2_PACKAGE_HOST_DFU_UTIL is not set # BR2_PACKAGE_HOST_DOS2UNIX is not set # BR2_PACKAGE_HOST_DOSFSTOOLS is not set # BR2_PACKAGE_HOST_DOXYGEN is not set # BR2_PACKAGE_HOST_DTC is not set BR2_PACKAGE_HOST_E2FSPROGS=y # BR2_PACKAGE_HOST_E2TOOLS is not set # BR2_PACKAGE_HOST_ENVIRONMENT_SETUP is not set # BR2_PACKAGE_HOST_EROFS_UTILS is not set # BR2_PACKAGE_HOST_EXFATPROGS is not set # BR2_PACKAGE_HOST_F2FS_TOOLS is not set # BR2_PACKAGE_HOST_FAKETIME is not set # BR2_PACKAGE_HOST_FATCAT is not set # BR2_PACKAGE_HOST_FIRMWARE_UTILS is not set # BR2_PACKAGE_HOST_FWUP is not set # BR2_PACKAGE_HOST_GENEXT2FS is not set # BR2_PACKAGE_HOST_GENIMAGE is not set # BR2_PACKAGE_HOST_GENPART is not set # BR2_PACKAGE_HOST_GNUPG is not set BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS=y BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y # BR2_PACKAGE_HOST_GPTFDISK is not set # BR2_PACKAGE_HOST_IMAGEMAGICK is not set # BR2_PACKAGE_HOST_IMX_MKIMAGE is not set # BR2_PACKAGE_HOST_JQ is not set # BR2_PACKAGE_HOST_JSMIN is not set BR2_PACKAGE_HOST_KMOD=y # BR2_PACKAGE_HOST_KMOD_GZ is not set # BR2_PACKAGE_HOST_KMOD_ZSTD is not set # BR2_PACKAGE_HOST_KMOD_XZ is not set # BR2_PACKAGE_HOST_LIBP11 is not set # BR2_PACKAGE_HOST_LLD is not set # BR2_PACKAGE_HOST_LPC3250LOADER is not set # BR2_PACKAGE_HOST_LTTNG_BABELTRACE is not set # BR2_PACKAGE_HOST_LZMA_ALONE is not set # BR2_PACKAGE_HOST_MENDER_ARTIFACT is not set # BR2_PACKAGE_HOST_MESON_TOOLS is not set # BR2_PACKAGE_HOST_MKPASSWD is not set # BR2_PACKAGE_HOST_MOBY_BUILDKIT is not set # BR2_PACKAGE_HOST_MOSQUITTO is not set # BR2_PACKAGE_HOST_MTD is not set # BR2_PACKAGE_HOST_MTOOLS is not set # BR2_PACKAGE_HOST_NODEJS is not set # BR2_PACKAGE_HOST_ODB is not set # BR2_PACKAGE_HOST_OPENOCD is not set # BR2_PACKAGE_HOST_OPKG_UTILS is not set # BR2_PACKAGE_HOST_PAHOLE is not set # BR2_PACKAGE_HOST_PARTED is not set BR2_PACKAGE_HOST_PATCHELF=y # BR2_PACKAGE_HOST_PIGZ is not set # BR2_PACKAGE_HOST_PKGCONF is not set # BR2_PACKAGE_HOST_PWGEN is not set # BR2_PACKAGE_HOST_PYTHON_CYTHON is not set # BR2_PACKAGE_HOST_PYTHON_GREENLET is not set # BR2_PACKAGE_HOST_PYTHON_INIPARSE is not set # BR2_PACKAGE_HOST_PYTHON_LXML is not set # BR2_PACKAGE_HOST_PYTHON_PYYAML is not set # BR2_PACKAGE_HOST_PYTHON_SIX is not set # BR2_PACKAGE_HOST_PYTHON_XLRD is not set # BR2_PACKAGE_HOST_PYTHON3 is not set BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_QEMU=y # # Emulators selection # BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y # BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE is not set # BR2_PACKAGE_HOST_QEMU_VDE2 is not set # BR2_PACKAGE_HOST_QEMU_VIRTFS is not set # BR2_PACKAGE_HOST_QEMU_USB is not set # BR2_PACKAGE_HOST_QORIQ_RCW is not set # BR2_PACKAGE_HOST_RAUC is not set # BR2_PACKAGE_HOST_RISCV_ISA_SIM is not set # BR2_PACKAGE_HOST_RUNC is not set BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS=y BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_RUSTC_ARCH="x86_64" # BR2_PACKAGE_HOST_RUSTC is not set BR2_PACKAGE_PROVIDES_HOST_RUSTC="host-rust-bin" # BR2_PACKAGE_HOST_SAM_BA is not set # BR2_PACKAGE_HOST_SDBUSPLUS is not set # BR2_PACKAGE_HOST_SENTRY_CLI is not set # BR2_PACKAGE_HOST_SLOCI_IMAGE is not set # BR2_PACKAGE_HOST_SQUASHFS is not set # BR2_PACKAGE_HOST_SWIG is not set BR2_PACKAGE_HOST_SYSTEMD=y # BR2_PACKAGE_HOST_UBOOT_TOOLS is not set BR2_PACKAGE_HOST_UTIL_LINUX=y # BR2_PACKAGE_HOST_UTP_COM is not set # BR2_PACKAGE_HOST_UUU is not set # BR2_PACKAGE_HOST_VBOOT_UTILS is not set # BR2_PACKAGE_HOST_XORRISO is not set # BR2_PACKAGE_HOST_ZIP is not set # BR2_PACKAGE_HOST_ZSTD is not set # # Legacy config options # # # Legacy options removed in 2023.02 # # BR2_KERNEL_HEADERS_6_0 is not set # BR2_KERNEL_HEADERS_4_9 is not set # BR2_PACKAGE_DOCKER_PROXY is not set # BR2_PACKAGE_PYTHON_BUNCH is not set # BR2_TARGET_GUMMIBOOT is not set # BR2_PACKAGE_IPUTILS_NINFOD is not set # BR2_PACKAGE_IPUTILS_RARPD is not set # BR2_PACKAGE_IPUTILS_RDISC is not set # BR2_PACKAGE_IPUTILS_RDISC_SERVER is not set # BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX is not set # BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE is not set # BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT is not set # BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 is not set # BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV is not set BR2_PACKAGE_QEMU_CUSTOM_TARGETS="" # BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD is not set # BR2_TARGET_SUN20I_D1_SPL is not set # BR2_PACKAGE_PYTHON_M2R is not set # BR2_PACKAGE_MESA3D_XVMC is not set # BR2_KERNEL_HEADERS_5_19 is not set # BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA is not set # BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT is not set # BR2_PACKAGE_USBREDIR_SERVER is not set # # Legacy options removed in 2022.11 # # BR2_PACKAGE_RABBITMQ_SERVER is not set # BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 is not set # BR2_PACKAGE_LIBDCADEC is not set # BR2_KERNEL_HEADERS_5_17 is not set # BR2_iwmmxt is not set # BR2_PACKAGE_UHD_N230 is not set # BR2_PACKAGE_UHD_RFNOC is not set # BR2_PACKAGE_GPSD_OLDSTYLE is not set # BR2_GDB_VERSION_9_2 is not set # # Legacy options removed in 2022.08 # # BR2_ECLIPSE_REGISTER is not set # BR2_csky is not set # BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 is not set # BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 is not set # BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU is not set # BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON is not set # BR2_GCC_VERSION_9_X is not set # BR2_PACKAGE_PHP_EXT_WDDX is not set # BR2_nds32 is not set # BR2_PACKAGE_RTL8723BS is not set # # Legacy options removed in 2022.05 # # BR2_PACKAGE_KTAP is not set # BR2_KERNEL_HEADERS_5_16 is not set # BR2_KERNEL_HEADERS_4_4 is not set # BR2_BINUTILS_VERSION_2_32_X is not set # BR2_sh2a is not set # BR2_BINUTILS_VERSION_2_35_X is not set # BR2_PACKAGE_BOOST_LAYOUT_TAGGED is not set # BR2_PACKAGE_BOOST_LAYOUT_VERSIONED is not set # # Legacy options removed in 2022.02 # BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS="" # BR2_PACKAGE_LIBCURL_LIBNSS is not set # BR2_PACKAGE_WESTON_DEFAULT_FBDEV is not set # BR2_PACKAGE_WESTON_FBDEV is not set # BR2_PACKAGE_PYTHON_PYCLI is not set # BR2_PACKAGE_LINUX_TOOLS_BPFTOOL is not set # BR2_TARGET_UBOOT_NEEDS_PYTHON2 is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS is not set # BR2_PACKAGE_PYTHON_FUNCTOOLS32 is not set # BR2_PACKAGE_PYTHON_ENUM34 is not set # BR2_PACKAGE_PYTHON_ENUM is not set # BR2_PACKAGE_PYTHON_DIALOG is not set # BR2_PACKAGE_PYTHON_CONFIGOBJ is not set # BR2_PACKAGE_PYTHON_YIELDFROM is not set # BR2_PACKAGE_PYTHON_TYPING is not set # BR2_PACKAGE_PYTHON_SUBPROCESS32 is not set # BR2_PACKAGE_PYTHON_SINGLEDISPATCH is not set # BR2_PACKAGE_PYTHON_PYRO is not set # BR2_PACKAGE_PYTHON_PYPCAP is not set # BR2_PACKAGE_PYTHON_PATHLIB2 is not set # BR2_PACKAGE_PYTHON_PAM is not set # BR2_PACKAGE_PYTHON_NFC is not set # BR2_PACKAGE_PYTHON_MAD is not set # BR2_PACKAGE_PYTHON_IPADDRESS is not set # BR2_PACKAGE_PYTHON_IPADDR is not set # BR2_PACKAGE_PYTHON_ID3 is not set # BR2_PACKAGE_PYTHON_FUTURES is not set # BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME is not set # BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE is not set # BR2_PACKAGE_PYTHON_BACKPORTS_ABC is not set # BR2_PACKAGE_PYTHON is not set # BR2_TARGET_UBOOT_ZYNQ_IMAGE is not set # BR2_PACKAGE_HOST_GDB_PYTHON is not set # BR2_PACKAGE_GSTREAMER1_MM is not set # BR2_KERNEL_HEADERS_5_14 is not set # BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE is not set # BR2_PACKAGE_CIVETWEB_WITH_LUA is not set # BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER is not set # BR2_PACKAGE_SUNXI_MALI_MAINLINE is not set # BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 is not set # BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 is not set # BR2_PACKAGE_QT5WEBKIT_EXAMPLES is not set # BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE is not set # BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE is not set # BR2_PACKAGE_IPUTILS_TFTPD is not set # BR2_PACKAGE_IPUTILS_TRACEROUTE6 is not set # BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE is not set # BR2_PACKAGE_MPD_UPNP is not set # # Legacy options removed in 2021.11 # # BR2_OPENJDK_VERSION_LTS is not set # BR2_OPENJDK_VERSION_LATEST is not set # BR2_PACKAGE_MPD_TIDAL is not set # BR2_PACKAGE_MROUTED_RSRR is not set # BR2_BINUTILS_VERSION_CSKY is not set # BR2_GCC_VERSION_CSKY is not set # BR2_PACKAGE_CANFESTIVAL is not set # BR2_PACKAGE_NMAP_NDIFF is not set # BR2_GDB_VERSION_8_3 is not set # BR2_PACKAGE_PYTHON_MELD3 is not set # BR2_PACKAGE_STRONGSWAN_EAP is not set # BR2_PACKAGE_GNURADIO_PAGER is not set # BR2_KERNEL_HEADERS_5_11 is not set # BR2_KERNEL_HEADERS_5_12 is not set # BR2_KERNEL_HEADERS_5_13 is not set # # Legacy options removed in 2021.08 # BR2_TARGET_GRUB2_BUILTIN_MODULES="" BR2_TARGET_GRUB2_BUILTIN_CONFIG="" # BR2_PACKAGE_LIBMCRYPT is not set # BR2_PACKAGE_MCRYPT is not set # BR2_PACKAGE_PHP_EXT_MCRYPT is not set # BR2_BINUTILS_VERSION_2_34_X is not set # BR2_PACKAGE_LIBSOIL is not set # BR2_PACKAGE_CLAPACK is not set # BR2_PACKAGE_SPIDERMONKEY is not set # BR2_PACKAGE_KODI_LIBVA is not set # BR2_PACKAGE_PYTHON_COHERENCE is not set # BR2_PACKAGE_PHP_EXT_XMLRPC is not set # BR2_GCC_VERSION_8_X is not set # # Legacy options removed in 2021.05 # # BR2_PACKAGE_UDISKS_LVM2 is not set # BR2_PACKAGE_LVM2_APP_LIBRARY is not set # BR2_PACKAGE_LVM2_LVMETAD is not set # BR2_PACKAGE_MONKEY is not set # BR2_PACKAGE_DOCKER_CONTAINERD is not set # BR2_PACKAGE_IOSTAT is not set # BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE is not set # BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV is not set # BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD is not set # BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE is not set # BR2_PACKAGE_MESA3D_OSMESA_CLASSIC is not set # BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST is not set # BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH is not set # # Legacy options removed in 2021.02 # # BR2_PACKAGE_MPD_AUDIOFILE is not set # BR2_PACKAGE_AUDIOFILE is not set # BR2_BINUTILS_VERSION_2_33_X is not set # BR2_PACKAGE_LIBUPNP18 is not set # BR2_PACKAGE_BOA is not set # BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA is not set # BR2_GDB_VERSION_8_2 is not set # BR2_PACKAGE_HOST_RCW is not set # BR2_KERNEL_HEADERS_5_9 is not set # BR2_KERNEL_HEADERS_5_8 is not set # BR2_powerpc_601 is not set # BR2_PACKAGE_TI_SGX_LIBGBM is not set # BR2_PACKAGE_IPSEC_TOOLS is not set # # Legacy options removed in 2020.11 # # BR2_PACKAGE_GPSD_FIXED_PORT_SPEED is not set # BR2_PACKAGE_GPSD_RECONFIGURE is not set # BR2_PACKAGE_GPSD_CONTROLSEND is not set # BR2_PACKAGE_OPENCV is not set # BR2_PACKAGE_LIBCROCO is not set # BR2_PACKAGE_BELLAGIO is not set # BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY is not set # BR2_TARGET_UBOOT_BOOT_SCRIPT is not set # BR2_TARGET_UBOOT_ENVIMAGE is not set # BR2_PACKAGE_KISMET_CLIENT is not set # BR2_PACKAGE_KISMET_DRONE is not set # BR2_GCC_VERSION_7_X is not set # BR2_PACKAGE_GST1_VALIDATE is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF is not set # BR2_PACKAGE_GQVIEW is not set # BR2_PACKAGE_WESTON_IMX is not set # BR2_KERNEL_HEADERS_5_7 is not set # BR2_PACKAGE_TINYHTTPD is not set # BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX is not set # BR2_PACKAGE_AMD_CATALYST is not set # BR2_PACKAGE_NVIDIA_TEGRA23 is not set # BR2_GDB_VERSION_8_1 is not set # # Legacy options removed in 2020.08 # # BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 is not set # BR2_KERNEL_HEADERS_5_6 is not set # BR2_KERNEL_HEADERS_5_5 is not set # BR2_BINUTILS_VERSION_2_31_X is not set # BR2_PACKAGE_KODI_PERIPHERAL_STEAMCONTROLLER is not set # # Legacy options removed in 2020.05 # # BR2_PACKAGE_WIRINGPI is not set # BR2_PACKAGE_PYTHON_PYCRYPTO is not set # BR2_PACKAGE_MTDEV2TUIO is not set # BR2_PACKAGE_EZXML is not set # BR2_PACKAGE_COLLECTD_LVM is not set # BR2_PACKAGE_PYTHON_PYASN is not set # BR2_PACKAGE_PYTHON_PYASN_MODULES is not set # BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174 is not set # BR2_PACKAGE_QT5CANVAS3D is not set # BR2_PACKAGE_KODI_LIBTHEORA is not set # BR2_PACKAGE_CEGUI06 is not set # BR2_GCC_VERSION_5_X is not set # # Legacy options removed in 2020.02 # # BR2_PACKAGE_JAMVM is not set # BR2_PACKAGE_CLASSPATH is not set # BR2_PACKAGE_QT5_VERSION_5_6 is not set # BR2_PACKAGE_CURL is not set # BR2_PACKAGE_GSTREAMER is not set # BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS is not set # BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_NV_SAMPLE_APPS is not set # BR2_PACKAGE_FREERDP_GSTREAMER is not set # BR2_PACKAGE_OPENCV3_WITH_GSTREAMER is not set # BR2_PACKAGE_OPENCV_WITH_GSTREAMER is not set # BR2_PACKAGE_LIBPLAYER is not set # BR2_GCC_VERSION_OR1K is not set # BR2_PACKAGE_BLUEZ_UTILS is not set # BR2_PACKAGE_GADGETFS_TEST is not set # BR2_PACKAGE_FIS is not set BR2_PACKAGE_REFPOLICY_POLICY_VERSION="" # BR2_PACKAGE_CELT051 is not set # BR2_PACKAGE_WIREGUARD is not set # BR2_PACKAGE_PERL_NET_PING is not set # BR2_PACKAGE_PERL_MIME_BASE64 is not set # BR2_PACKAGE_PERL_DIGEST_MD5 is not set # BR2_PACKAGE_ERLANG_P1_ICONV is not set # BR2_KERNEL_HEADERS_5_3 is not set # BR2_PACKAGE_PYTHON_SCAPY3K is not set # BR2_BINUTILS_VERSION_2_30_X is not set # BR2_PACKAGE_RPI_USERLAND_START_VCFILED is not set # BR2_PACKAGE_TI_SGX_KM_AM335X is not set # BR2_PACKAGE_TI_SGX_KM_AM437X is not set # BR2_PACKAGE_TI_SGX_KM_AM4430 is not set # BR2_PACKAGE_TI_SGX_KM_AM5430 is not set # # Legacy options removed in 2019.11 # # BR2_PACKAGE_OPENVMTOOLS_PROCPS is not set # BR2_PACKAGE_ALLJOYN is not set # BR2_PACKAGE_ALLJOYN_BASE is not set # BR2_PACKAGE_ALLJOYN_BASE_CONTROLPANEL is not set # BR2_PACKAGE_ALLJOYN_BASE_NOTIFICATION is not set # BR2_PACKAGE_ALLJOYN_BASE_ONBOARDING is not set # BR2_PACKAGE_ALLJOYN_TCL_BASE is not set # BR2_PACKAGE_ALLJOYN_TCL is not set BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS="" # BR2_PACKAGE_PYTHON_PYSNMP_APPS is not set # BR2_KERNEL_HEADERS_5_2 is not set # BR2_TARGET_RISCV_PK is not set # BR2_PACKAGE_SQLITE_STAT3 is not set # BR2_KERNEL_HEADERS_5_1 is not set # BR2_PACKAGE_DEVMEM2 is not set # BR2_PACKAGE_USTR is not set # BR2_PACKAGE_KODI_SCREENSAVER_PLANESTATE is not set # BR2_PACKAGE_KODI_VISUALISATION_WAVEFORHUE is not set # BR2_PACKAGE_KODI_AUDIODECODER_OPUS is not set # BR2_PACKAGE_MESA3D_OSMESA is not set # BR2_PACKAGE_HOSTAPD_DRIVER_RTW is not set # BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW is not set # BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD is not set # # Legacy options removed in 2019.08 # # BR2_TARGET_TS4800_MBRBOOT is not set # BR2_PACKAGE_LIBAMCODEC is not set # BR2_PACKAGE_ODROID_SCRIPTS is not set # BR2_PACKAGE_ODROID_MALI is not set # BR2_PACKAGE_KODI_PLATFORM_AML is not set # BR2_GCC_VERSION_6_X is not set # BR2_GCC_VERSION_4_9_X is not set # BR2_GDB_VERSION_7_12 is not set # BR2_PACKAGE_XAPP_MKFONTDIR is not set # BR2_GDB_VERSION_8_0 is not set # BR2_KERNEL_HEADERS_4_20 is not set # BR2_KERNEL_HEADERS_5_0 is not set # # Legacy options removed in 2019.05 # # BR2_CSKY_DSP is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IQA is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD is not set # BR2_PACKAGE_LUNIT is not set # BR2_PACKAGE_FFMPEG_FFSERVER is not set # BR2_PACKAGE_LIBUMP is not set # BR2_PACKAGE_SUNXI_MALI is not set # BR2_BINUTILS_VERSION_2_29_X is not set # BR2_BINUTILS_VERSION_2_28_X is not set # BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK is not set # # Legacy options removed in 2019.02 # # BR2_PACKAGE_QT is not set # BR2_PACKAGE_QTUIO is not set # BR2_PACKAGE_PINENTRY_QT4 is not set # BR2_PACKAGE_POPPLER_QT is not set # BR2_PACKAGE_OPENCV3_WITH_QT is not set # BR2_PACKAGE_OPENCV_WITH_QT is not set # BR2_PACKAGE_AMD_CATALYST_CCCLE is not set # BR2_PACKAGE_SDL_QTOPIA is not set # BR2_PACKAGE_PYTHON_PYQT is not set # BR2_PACKAGE_LUACRYPTO is not set # BR2_PACKAGE_TN5250 is not set # BR2_PACKAGE_BOOST_SIGNALS is not set # BR2_PACKAGE_FFTW_PRECISION_SINGLE is not set # BR2_PACKAGE_FFTW_PRECISION_DOUBLE is not set # BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE is not set # BR2_PACKAGE_FFTW_PRECISION_QUAD is not set # BR2_PACKAGE_LUA_5_2 is not set # BR2_TARGET_GENERIC_PASSWD_MD5 is not set # # Legacy options removed in 2018.11 # # BR2_TARGET_XLOADER is not set # BR2_PACKAGE_TIDSP_BINARIES is not set # BR2_PACKAGE_DSP_TOOLS is not set # BR2_PACKAGE_GST_DSP is not set # BR2_PACKAGE_BOOTUTILS is not set # BR2_PACKAGE_EXPEDITE is not set # BR2_PACKAGE_MESA3D_OPENGL_TEXTURE_FLOAT is not set # BR2_KERNEL_HEADERS_4_10 is not set # BR2_KERNEL_HEADERS_4_11 is not set # BR2_KERNEL_HEADERS_4_12 is not set # BR2_KERNEL_HEADERS_4_13 is not set # BR2_KERNEL_HEADERS_4_15 is not set # BR2_KERNEL_HEADERS_4_17 is not set # BR2_PACKAGE_LIBNFTNL_XML is not set # BR2_KERNEL_HEADERS_3_2 is not set # BR2_KERNEL_HEADERS_4_1 is not set # BR2_KERNEL_HEADERS_4_16 is not set # BR2_KERNEL_HEADERS_4_18 is not set # # Legacy options removed in 2018.08 # # BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT is not set # BR2_PACKAGE_XPROTO_APPLEWMPROTO is not set # BR2_PACKAGE_XPROTO_BIGREQSPROTO is not set # BR2_PACKAGE_XPROTO_COMPOSITEPROTO is not set # BR2_PACKAGE_XPROTO_DAMAGEPROTO is not set # BR2_PACKAGE_XPROTO_DMXPROTO is not set # BR2_PACKAGE_XPROTO_DRI2PROTO is not set # BR2_PACKAGE_XPROTO_DRI3PROTO is not set # BR2_PACKAGE_XPROTO_FIXESPROTO is not set # BR2_PACKAGE_XPROTO_FONTCACHEPROTO is not set # BR2_PACKAGE_XPROTO_FONTSPROTO is not set # BR2_PACKAGE_XPROTO_GLPROTO is not set # BR2_PACKAGE_XPROTO_INPUTPROTO is not set # BR2_PACKAGE_XPROTO_KBPROTO is not set # BR2_PACKAGE_XPROTO_PRESENTPROTO is not set # BR2_PACKAGE_XPROTO_RANDRPROTO is not set # BR2_PACKAGE_XPROTO_RECORDPROTO is not set # BR2_PACKAGE_XPROTO_RENDERPROTO is not set # BR2_PACKAGE_XPROTO_RESOURCEPROTO is not set # BR2_PACKAGE_XPROTO_SCRNSAVERPROTO is not set # BR2_PACKAGE_XPROTO_VIDEOPROTO is not set # BR2_PACKAGE_XPROTO_WINDOWSWMPROTO is not set # BR2_PACKAGE_XPROTO_XCMISCPROTO is not set # BR2_PACKAGE_XPROTO_XEXTPROTO is not set # BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO is not set # BR2_PACKAGE_XPROTO_XF86DGAPROTO is not set # BR2_PACKAGE_XPROTO_XF86DRIPROTO is not set # BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO is not set # BR2_PACKAGE_XPROTO_XINERAMAPROTO is not set # BR2_PACKAGE_XPROTO_XPROTO is not set # BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLES2 is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLX is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11 is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_DISPMANX is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER is not set # BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME is not set # BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123 is not set # BR2_GDB_VERSION_7_11 is not set # BR2_GDB_VERSION_7_10 is not set # # Legacy options removed in 2018.05 # # BR2_PACKAGE_MEDIAART_BACKEND_NONE is not set # BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF is not set # BR2_PACKAGE_MEDIAART_BACKEND_QT is not set # BR2_PACKAGE_TI_SGX_AM335X is not set # BR2_PACKAGE_TI_SGX_AM437X is not set # BR2_PACKAGE_TI_SGX_AM4430 is not set # BR2_PACKAGE_TI_SGX_AM5430 is not set # BR2_PACKAGE_JANUS_AUDIO_BRIDGE is not set # BR2_PACKAGE_JANUS_ECHO_TEST is not set # BR2_PACKAGE_JANUS_RECORDPLAY is not set # BR2_PACKAGE_JANUS_SIP_GATEWAY is not set # BR2_PACKAGE_JANUS_STREAMING is not set # BR2_PACKAGE_JANUS_TEXT_ROOM is not set # BR2_PACKAGE_JANUS_VIDEO_CALL is not set # BR2_PACKAGE_JANUS_VIDEO_ROOM is not set # BR2_PACKAGE_JANUS_MQTT is not set # BR2_PACKAGE_JANUS_RABBITMQ is not set # BR2_PACKAGE_JANUS_REST is not set # BR2_PACKAGE_JANUS_UNIX_SOCKETS is not set # BR2_PACKAGE_JANUS_WEBSOCKETS is not set # BR2_PACKAGE_IPSEC_SECCTX_DISABLE is not set # BR2_PACKAGE_IPSEC_SECCTX_ENABLE is not set # BR2_PACKAGE_IPSEC_SECCTX_KERNEL is not set # BR2_PACKAGE_LIBTFDI_CPP is not set # BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE is not set # BR2_PACKAGE_JQUERY_UI_THEME_BLITZER is not set # BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO is not set # BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE is not set # BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV is not set # BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT is not set # BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE is not set # BR2_PACKAGE_JQUERY_UI_THEME_FLICK is not set # BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS is not set # BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY is not set # BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG is not set # BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC is not set # BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST is not set # BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER is not set # BR2_PACKAGE_JQUERY_UI_THEME_REDMOND is not set # BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS is not set # BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET is not set # BR2_PACKAGE_JQUERY_UI_THEME_START is not set # BR2_PACKAGE_JQUERY_UI_THEME_SUNNY is not set # BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE is not set # BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC is not set # BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS is not set # BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS is not set # BR2_PACKAGE_JQUERY_UI_THEME_VADER is not set # BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH is not set # BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI is not set # BR2_PACKAGE_BLUEZ5_PLUGINS_NFC is not set # BR2_PACKAGE_BLUEZ5_PLUGINS_SAP is not set # BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS is not set # BR2_PACKAGE_TRANSMISSION_REMOTE is not set # BR2_PACKAGE_LIBKCAPI_APPS is not set # BR2_PACKAGE_MPLAYER is not set # BR2_PACKAGE_MPLAYER_MPLAYER is not set # BR2_PACKAGE_MPLAYER_MENCODER is not set # BR2_PACKAGE_LIBPLAYER_MPLAYER is not set # BR2_PACKAGE_IQVLINUX is not set # BR2_BINFMT_FLAT_SEP_DATA is not set # BR2_bfin is not set # BR2_PACKAGE_KODI_ADSP_BASIC is not set # BR2_PACKAGE_KODI_ADSP_FREESURROUND is not set # # Legacy options removed in 2018.02 # # BR2_KERNEL_HEADERS_3_4 is not set # BR2_KERNEL_HEADERS_3_10 is not set # BR2_KERNEL_HEADERS_3_12 is not set # BR2_BINUTILS_VERSION_2_27_X is not set # BR2_PACKAGE_EEPROG is not set # BR2_PACKAGE_GNUPG2_GPGV2 is not set # BR2_PACKAGE_IMX_GPU_VIV_APITRACE is not set # BR2_PACKAGE_IMX_GPU_VIV_G2D is not set # # Legacy options removed in 2017.11 # # BR2_PACKAGE_RFKILL is not set # BR2_PACKAGE_UTIL_LINUX_RESET is not set # BR2_PACKAGE_POLICYCOREUTILS_AUDIT2ALLOW is not set # BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND is not set # BR2_PACKAGE_SEPOLGEN is not set # BR2_PACKAGE_OPENOBEX_BLUEZ is not set # BR2_PACKAGE_OPENOBEX_LIBUSB is not set # BR2_PACKAGE_OPENOBEX_APPS is not set # BR2_PACKAGE_OPENOBEX_SYSLOG is not set # BR2_PACKAGE_OPENOBEX_DUMP is not set # BR2_PACKAGE_AICCU is not set # BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS is not set # # Legacy options removed in 2017.08 # # BR2_TARGET_GRUB is not set # BR2_PACKAGE_SIMICSFS is not set # BR2_BINUTILS_VERSION_2_26_X is not set BR2_XTENSA_OVERLAY_DIR="" BR2_XTENSA_CUSTOM_NAME="" # BR2_PACKAGE_HOST_MKE2IMG is not set BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES=0 # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDXAPARSE is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DATAURISRC is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DCCP is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MVE is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NUVDEMUX is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PATCHDETECT is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOMEASURE is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_APEXSINK is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL is not set # BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD is not set # BR2_STRIP_none is not set # BR2_PACKAGE_BEECRYPT_CPP is not set # BR2_PACKAGE_SPICE_CLIENT is not set # BR2_PACKAGE_SPICE_GUI is not set # BR2_PACKAGE_SPICE_TUNNEL is not set # BR2_PACKAGE_INPUT_TOOLS is not set # BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH is not set # BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set # BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set # BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH is not set # BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 is not set # BR2_GCC_VERSION_4_8_X is not set # # Legacy options removed in 2017.05 # # BR2_PACKAGE_SUNXI_MALI_R2P4 is not set # BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT is not set # BR2_PACKAGE_NODEJS_MODULES_EXPRESS is not set # BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL is not set # BR2_PACKAGE_OPENOCD_FT2XXX is not set # BR2_PACKAGE_KODI_RTMPDUMP is not set # BR2_PACKAGE_KODI_VISUALISATION_FOUNTAIN is not set # BR2_PACKAGE_PORTMAP is not set # BR2_BINUTILS_VERSION_2_25_X is not set # BR2_TOOLCHAIN_BUILDROOT_INET_RPC is not set BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS=0 # BR2_PACKAGE_SYSTEMD_KDBUS is not set # BR2_PACKAGE_POLARSSL is not set # BR2_NBD_CLIENT is not set # BR2_NBD_SERVER is not set # BR2_PACKAGE_GMOCK is not set # BR2_KERNEL_HEADERS_4_8 is not set # BR2_KERNEL_HEADERS_3_18 is not set # BR2_GLIBC_VERSION_2_22 is not set # # Legacy options removed in 2017.02 # # BR2_PACKAGE_PERL_DB_FILE is not set # BR2_KERNEL_HEADERS_4_7 is not set # BR2_KERNEL_HEADERS_4_6 is not set # BR2_KERNEL_HEADERS_4_5 is not set # BR2_KERNEL_HEADERS_3_14 is not set # BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS is not set # BR2_UCLIBC_INSTALL_TEST_SUITE is not set # BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX is not set # BR2_PACKAGE_MAKEDEVS is not set # BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A is not set # BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE is not set # BR2_PACKAGE_SNOWBALL_HDMISERVICE is not set # BR2_PACKAGE_SNOWBALL_INIT is not set # BR2_GDB_VERSION_7_9 is not set # # Legacy options removed in 2016.11 # # BR2_PACKAGE_PHP_SAPI_CLI_CGI is not set # BR2_PACKAGE_PHP_SAPI_CLI_FPM is not set # BR2_PACKAGE_WVSTREAMS is not set # BR2_PACKAGE_WVDIAL is not set # BR2_PACKAGE_WEBKITGTK24 is not set # BR2_PACKAGE_TORSMO is not set # BR2_PACKAGE_SSTRIP is not set # BR2_KERNEL_HEADERS_4_3 is not set # BR2_KERNEL_HEADERS_4_2 is not set # BR2_PACKAGE_KODI_ADDON_XVDR is not set # BR2_PACKAGE_IPKG is not set # BR2_GCC_VERSION_4_7_X is not set # BR2_BINUTILS_VERSION_2_24_X is not set # BR2_PACKAGE_WESTON_RPI is not set # BR2_LINUX_KERNEL_TOOL_CPUPOWER is not set # BR2_LINUX_KERNEL_TOOL_PERF is not set # BR2_LINUX_KERNEL_TOOL_SELFTESTS is not set # BR2_GCC_VERSION_4_8_ARC is not set # BR2_KERNEL_HEADERS_4_0 is not set # BR2_KERNEL_HEADERS_3_19 is not set # BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS is not set # BR2_PACKAGE_ELEMENTARY is not set # BR2_LINUX_KERNEL_CUSTOM_LOCAL is not set # # Legacy options removed in 2016.08 # # BR2_PACKAGE_EFL_JP2K is not set # BR2_PACKAGE_SYSTEMD_COMPAT is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIVEADDER is not set # BR2_PACKAGE_LIBFSLVPUWRAP is not set # BR2_PACKAGE_LIBFSLPARSER is not set # BR2_PACKAGE_LIBFSLCODEC is not set # BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE_FIT_SIGNATURE_SUPPORT is not set # BR2_PTHREADS_OLD is not set # BR2_BINUTILS_VERSION_2_23_X is not set # BR2_TOOLCHAIN_BUILDROOT_EGLIBC is not set # BR2_GDB_VERSION_7_8 is not set # # Legacy options removed in 2016.05 # # BR2_PACKAGE_OPENVPN_CRYPTO_POLARSSL is not set # BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPG123 is not set # BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC is not set # BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC_E500V2 is not set # BR2_x86_i386 is not set # BR2_PACKAGE_QT5QUICK1 is not set BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" # BR2_PACKAGE_XDRIVER_XF86_INPUT_VOID is not set # BR2_KERNEL_HEADERS_3_17 is not set # BR2_GDB_VERSION_7_7 is not set # BR2_PACKAGE_FOOMATIC_FILTERS is not set # BR2_PACKAGE_SAMBA is not set # BR2_PACKAGE_KODI_WAVPACK is not set # BR2_PACKAGE_KODI_RSXS is not set # BR2_PACKAGE_KODI_GOOM is not set # BR2_PACKAGE_SYSTEMD_ALL_EXTRAS is not set # BR2_GCC_VERSION_4_5_X is not set # BR2_PACKAGE_SQLITE_READLINE is not set # # Legacy options removed in 2016.02 # # BR2_PACKAGE_DOVECOT_BZIP2 is not set # BR2_PACKAGE_DOVECOT_ZLIB is not set # BR2_PACKAGE_E2FSPROGS_FINDFS is not set # BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL is not set # BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE is not set # BR2_PACKAGE_OPENPOWERLINK_LIBPCAP is not set # BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set # BR2_PACKAGE_CUPS_PDFTOPS is not set # BR2_KERNEL_HEADERS_3_16 is not set # BR2_PACKAGE_PYTHON_PYXML is not set # BR2_ENABLE_SSP is not set # BR2_PACKAGE_DIRECTFB_CLE266 is not set # BR2_PACKAGE_DIRECTFB_UNICHROME is not set # BR2_PACKAGE_LIBELEMENTARY is not set # BR2_PACKAGE_LIBEINA is not set # BR2_PACKAGE_LIBEET is not set # BR2_PACKAGE_LIBEVAS is not set # BR2_PACKAGE_LIBECORE is not set # BR2_PACKAGE_LIBEDBUS is not set # BR2_PACKAGE_LIBEFREET is not set # BR2_PACKAGE_LIBEIO is not set # BR2_PACKAGE_LIBEMBRYO is not set # BR2_PACKAGE_LIBEDJE is not set # BR2_PACKAGE_LIBETHUMB is not set # BR2_PACKAGE_INFOZIP is not set # BR2_BR2_PACKAGE_NODEJS_0_10_X is not set # BR2_BR2_PACKAGE_NODEJS_0_12_X is not set # BR2_BR2_PACKAGE_NODEJS_4_X is not set # # Legacy options removed in 2015.11 # # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REAL is not set # BR2_PACKAGE_MEDIA_CTL is not set # BR2_PACKAGE_SCHIFRA is not set # BR2_PACKAGE_ZXING is not set # BR2_PACKAGE_BLACKBOX is not set # BR2_KERNEL_HEADERS_3_0 is not set # BR2_KERNEL_HEADERS_3_11 is not set # BR2_KERNEL_HEADERS_3_13 is not set # BR2_KERNEL_HEADERS_3_15 is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_BLTLOAD is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_CPULOAD is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_DATABUFFER is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_DIOLOAD is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_DRIVERTEST is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_FIRE is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_FLIP is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_FONTS is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_INPUT is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_JOYSTICK is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_KNUCKLES is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_LAYER is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX_WATER is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_NETLOAD is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_PALETTE is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_PARTICLE is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_PORTER is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_STRESS is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_TEXTURE is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO_PARTICLE is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW is not set # BR2_PACKAGE_KOBS_NG is not set # BR2_PACKAGE_SAWMAN is not set # BR2_PACKAGE_DIVINE is not set # # Legacy options removed in 2015.08 # # BR2_PACKAGE_KODI_PVR_ADDONS is not set # BR2_BINUTILS_VERSION_2_23_2 is not set # BR2_BINUTILS_VERSION_2_24 is not set # BR2_BINUTILS_VERSION_2_25 is not set # BR2_PACKAGE_PERF is not set # BR2_BINUTILS_VERSION_2_22 is not set # BR2_PACKAGE_GPU_VIV_BIN_MX6Q is not set # BR2_TARGET_UBOOT_NETWORK is not set From stephane.gonauer at 6wind.com Tue Feb 28 14:38:23 2023 From: stephane.gonauer at 6wind.com (stephane gonauer) Date: Tue, 28 Feb 2023 15:38:23 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: <20230228130843.GC32199@carcass.dev.6wind.com> References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> <20230222232157.380b6109@windsurf> <20230228130843.GC32199@carcass.dev.6wind.com> Message-ID: Hi, Le mar. 28 f?vr. 2023 ? 14:09, St?phane GONAUER a ?crit : > > > With those changes, applied to our next branch. Thanks! > > > > Thomas > > > I am testing shadow package and I think there may be a compatibility issue. > I rebuilt qemu_x86_64_defconfig where I added the following packages : > > BR2_PACKAGE_LINUX_PAM=y > BR2_INIT_SYSTEMD=y > BR2_PACKAGE_SHADOW=y > > > # BR2_TARGET_UBOOT_NETWORK is not set The issue can be reproduce with a simpler configuration. Enabling both BR2_PACKAGE_LINUX_PAM and BR2_PACKAGE_SHADOW breaks the login. Here follow a defconfig that reproduces the issue : /etc/pam.d reference a system-auth that is not present anywhere in the build directory. This might be the root cause but I'm not sure how to properly test. --------------- uildroot/configs$ cat qemu_x86_64_defconfig BR2_x86_64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_PER_PACKAGE_DIRECTORIES=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_LINUX_PAM=y BR2_PACKAGE_SHADOW=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From peter at korsgaard.com Tue Feb 28 14:40:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 15:40:09 +0100 Subject: [Buildroot] [PATCH] package/libcurl: bump version to 7.88.1 In-Reply-To: <20230227161040.2239744-1-peter@korsgaard.com> (Peter Korsgaard's message of "Mon, 27 Feb 2023 17:10:39 +0100") References: <20230227161040.2239744-1-peter@korsgaard.com> Message-ID: <87bkldlupi.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Bugfix release fixing a number of issues introduced in 7.88.0: > https://curl.se/changes.html#7_88_1 > https://daniel.haxx.se/blog/2023/02/20/7-88-1-the-second-final-one/ > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 14:41:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 15:41:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/paho-mqtt-c: security bump to version 1.3.12 In-Reply-To: (Lang Daniel via buildroot's message of "Tue, 28 Feb 2023 09:48:21 +0000") References: Message-ID: <877cw1luni.fsf@dell.be.48ers.dk> >>>>> "Lang" == Lang Daniel via buildroot writes: > Contains a fix for a possible race condition that can lead to use after > free: > https://github.com/eclipse/paho.mqtt.c/commit/911488a9f0fdad31c85ec86712be52587afdbbb8 > https://github.com/eclipse/paho.mqtt.c/milestone/19?closed=1 > https://github.com/eclipse/paho.mqtt.c/releases/tag/v1.3.12 > Signed-off-by: Daniel Lang Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 14:39:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 15:39:46 +0100 Subject: [Buildroot] [git commit] package/libcurl: bump version to 7.88.1 Message-ID: <20230228144147.B32EB86C72@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb566be8dc0e3a36270fe76d669fe51379d498f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bugfix release fixing a number of issues introduced in 7.88.0: https://curl.se/changes.html#7_88_1 https://daniel.haxx.se/blog/2023/02/20/7-88-1-the-second-final-one/ Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 714b02acb0..32b3d0b5e2 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.88.0.tar.xz.asc +# https://curl.se/download/curl-7.88.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f curl-7.88.1.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index eb481e4782..1a1594a45e 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.88.0 +LIBCURL_VERSION = 7.88.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From peter at korsgaard.com Tue Feb 28 14:40:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 15:40:02 +0100 Subject: [Buildroot] [git commit] package/paho-mqtt-c: security bump to version 1.3.12 Message-ID: <20230228144147.BDC0986C45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc9acffa8a9263c51a66a54b4f2ff39421365b80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Contains a fix for a possible race condition that can lead to use after free: https://github.com/eclipse/paho.mqtt.c/commit/911488a9f0fdad31c85ec86712be52587afdbbb8 https://github.com/eclipse/paho.mqtt.c/milestone/19?closed=1 https://github.com/eclipse/paho.mqtt.c/releases/tag/v1.3.12 Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- 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 1949abdf1a..529c538ff2 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 d7bba3f8b8978802e11e2b1f28e96e6b7f4ed5d8a268af52a4d3b1bcbd1db16b paho-mqtt-c-1.3.11.tar.gz +sha256 6a70a664ed3bbcc1eafdc45a5dc11f3ad70c9bac12a54c2f8cef15c0e7d0a93b paho-mqtt-c-1.3.12.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 30daf863ad..8d1fe009a7 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.11 +PAHO_MQTT_C_VERSION = 1.3.12 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 From peter at korsgaard.com Tue Feb 28 14:41:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 15:41:51 +0100 Subject: [Buildroot] [PATCH] package/libcurl: bump version to 7.88.1 In-Reply-To: <87h6v67y23.fsf@tarshish> (Baruch Siach via buildroot's message of "Tue, 28 Feb 2023 14:50:30 +0200") References: <20230228124151.16044-1-mf@go-sys.de> <87h6v67y23.fsf@tarshish> Message-ID: <87356plumo.fsf@dell.be.48ers.dk> >>>>> "Baruch" == Baruch Siach via buildroot writes: > Hi Michael, > On Tue, Feb 28 2023, Michael Fischer wrote: >> Changelog: https://curl.se/changes.html#7_88_1 >> >> Signed-off-by: Michael Fischer > There is a pending patch from Peter K doing the same bump: > http://patchwork.ozlabs.org/project/buildroot/patch/20230227161040.2239744-1-peter at korsgaard.com/ yes, applied that and marked this as superseeded. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:05:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:05:10 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/libpjsip: fix CVE-2022-235{3, 4}7 In-Reply-To: <20230227160822.1552039-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 27 Feb 2023 17:08:22 +0100") References: <20230227160822.1552039-1-fontaine.fabrice@gmail.com> Message-ID: <87y1ohkezd.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/pjsip/pjproject/security/advisories/GHSA-9pfh-r8x4-w26w > https://github.com/pjsip/pjproject/security/advisories/GHSA-cxwq-5g9x-x7fr > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Peter Korsgaard): > - Add missing patch Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:04:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:04:56 +0100 Subject: [Buildroot] [git commit] package/libpjsip: fix CVE-2022-235{3, 4}7 Message-ID: <20230228150514.DA75A86C7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26344644eebca5cde9b02be849d29e38d5885741 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/pjsip/pjproject/security/advisories/GHSA-9pfh-r8x4-w26w https://github.com/pjsip/pjproject/security/advisories/GHSA-cxwq-5g9x-x7fr Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...rge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch | 99 ++++++++++++++++++++++ ...rge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch | 54 ++++++++++++ package/libpjsip/libpjsip.mk | 6 ++ 3 files changed, 159 insertions(+) diff --git a/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch new file mode 100644 index 0000000000..01e1878189 --- /dev/null +++ b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch @@ -0,0 +1,99 @@ +From d8440f4d711a654b511f50f79c0445b26f9dd1e1 Mon Sep 17 00:00:00 2001 +From: Nanang Izzuddin +Date: Tue, 20 Dec 2022 11:39:12 +0700 +Subject: [PATCH] Merge pull request from GHSA-9pfh-r8x4-w26w + +* Fix buffer overread in STUN message decoder + +* Updates based on comments + +[Retrieved from: +https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1] +Signed-off-by: Fabrice Fontaine +--- + pjnath/include/pjnath/stun_msg.h | 4 ++++ + pjnath/src/pjnath/stun_msg.c | 14 +++++++++++--- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h +index b52f95c586..e49f096f3a 100644 +--- a/pjnath/include/pjnath/stun_msg.h ++++ b/pjnath/include/pjnath/stun_msg.h +@@ -442,6 +442,7 @@ typedef enum pj_stun_status + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_msg_hdr + { + /** +@@ -473,6 +474,7 @@ typedef struct pj_stun_msg_hdr + pj_uint8_t tsx_id[12]; + + } pj_stun_msg_hdr; ++#pragma pack() + + + /** +@@ -490,6 +492,7 @@ typedef struct pj_stun_msg_hdr + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_attr_hdr + { + /** +@@ -506,6 +509,7 @@ typedef struct pj_stun_attr_hdr + pj_uint16_t length; + + } pj_stun_attr_hdr; ++#pragma pack() + + + /** +diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c +index 3def6b3eac..e904a0ba47 100644 +--- a/pjnath/src/pjnath/stun_msg.c ++++ b/pjnath/src/pjnath/stun_msg.c +@@ -746,7 +746,7 @@ PJ_DEF(int) pj_stun_set_padding_char(int chr) + + #define INIT_ATTR(a,t,l) (a)->hdr.type=(pj_uint16_t)(t), \ + (a)->hdr.length=(pj_uint16_t)(l) +-#define ATTR_HDR_LEN 4 ++#define ATTR_HDR_LEN sizeof(pj_stun_attr_hdr) + + static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos) + { +@@ -2327,6 +2327,14 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + status = pj_stun_msg_check(pdu, pdu_len, options); + if (status != PJ_SUCCESS) + return status; ++ } else { ++ /* For safety, verify packet length at least */ ++ pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20; ++ if (msg_len > pdu_len || ++ ((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len)) ++ { ++ return PJNATH_EINSTUNMSGLEN; ++ } + } + + /* Create the message, copy the header, and convert to host byte order */ +@@ -2345,7 +2353,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + p_response = NULL; + + /* Parse attributes */ +- while (pdu_len >= 4) { ++ while (pdu_len >= ATTR_HDR_LEN) { + unsigned attr_type, attr_val_len; + const struct attr_desc *adesc; + +@@ -2357,7 +2365,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + attr_val_len = (attr_val_len + 3) & (~3); + + /* Check length */ +- if (pdu_len < attr_val_len) { ++ if (pdu_len < attr_val_len + ATTR_HDR_LEN) { + pj_str_t err_msg; + char err_msg_buf[80]; + diff --git a/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch b/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch new file mode 100644 index 0000000000..82249a2076 --- /dev/null +++ b/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch @@ -0,0 +1,54 @@ +From bc4812d31a67d5e2f973fbfaf950d6118226cf36 Mon Sep 17 00:00:00 2001 +From: sauwming +Date: Fri, 23 Dec 2022 15:05:28 +0800 +Subject: [PATCH] Merge pull request from GHSA-cxwq-5g9x-x7fr + +* Fixed heap buffer overflow when parsing STUN errcode attribute + +* Also fixed uint parsing + +[Retrieved from: +https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36] +Signed-off-by: Fabrice Fontaine +--- + pjnath/src/pjnath/stun_msg.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c +index c6b0bdd284..b55d29849a 100644 +--- a/pjnath/src/pjnath/stun_msg.c ++++ b/pjnath/src/pjnath/stun_msg.c +@@ -1438,12 +1438,12 @@ static pj_status_t decode_uint_attr(pj_pool_t *pool, + attr = PJ_POOL_ZALLOC_T(pool, pj_stun_uint_attr); + GETATTRHDR(buf, &attr->hdr); + +- attr->value = GETVAL32H(buf, 4); +- + /* Check that the attribute length is valid */ + if (attr->hdr.length != 4) + return PJNATH_ESTUNINATTRLEN; + ++ attr->value = GETVAL32H(buf, 4); ++ + /* Done */ + *p_attr = attr; + +@@ -1757,14 +1757,15 @@ static pj_status_t decode_errcode_attr(pj_pool_t *pool, + attr = PJ_POOL_ZALLOC_T(pool, pj_stun_errcode_attr); + GETATTRHDR(buf, &attr->hdr); + ++ /* Check that the attribute length is valid */ ++ if (attr->hdr.length < 4) ++ return PJNATH_ESTUNINATTRLEN; ++ + attr->err_code = buf[6] * 100 + buf[7]; + + /* Get pointer to the string in the message */ + value.ptr = ((char*)buf + ATTR_HDR_LEN + 4); + value.slen = attr->hdr.length - 4; +- /* Make sure the length is never negative */ +- if (value.slen < 0) +- value.slen = 0; + + /* Copy the string to the attribute */ + pj_strdup(pool, &attr->reason, &value); diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 5cc0423f5d..24db641446 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -15,6 +15,12 @@ LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) +# 0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch +LIBPJSIP_IGNORE_CVES += CVE-2022-23537 + +# 0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch +LIBPJSIP_IGNORE_CVES += CVE-2022-23547 + LIBPJSIP_CFLAGS = $(TARGET_CFLAGS) -DPJ_HAS_IPV6=1 # relocation truncated to fit: R_68K_GOT16O From peter at korsgaard.com Tue Feb 28 15:29:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:29:37 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: silence gcc plugin test In-Reply-To: <20230207172450.921B78430F@busybox.osuosl.org> (Peter Korsgaard's message of "Tue, 7 Feb 2023 18:24:10 +0100") References: <20230207172450.921B78430F@busybox.osuosl.org> Message-ID: <87ttz5kdum.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=4fbd2f6d2cf26225f73f584c3a0cacb1b2476f5f > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The gcc plugin test was not using the -q option to grep causing it to print > the line to stdout, so fix that. > While we're at it, adjust the locale check to use grep -q instead of > redirecting to /dev/null for consistency with the other checks. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From john at metanate.com Tue Feb 28 15:33:10 2023 From: john at metanate.com (John Keeping) Date: Tue, 28 Feb 2023 15:33:10 +0000 Subject: [Buildroot] [PATCH v2 1/3] pkg-cmake: add option to select the Ninja generator In-Reply-To: <20230227103956.128236-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-3-thomas.devoogdt@barco.com> <20230227103956.128236-1-thomas.devoogdt@barco.com> Message-ID: On Mon, Feb 27, 2023 at 11:39:54AM +0100, Thomas Devoogdt wrote: > E.g. Commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 can now be replaced by: > WEBKITGTK_CMAKE_NINJA = YES > > Packages that are selecting Ninja (or overtime another generator), > should also use the _BUILD_{ENV,OPTS} variables iso the _MAKE variables. > > No _INSTALL{,_STAGING,_TARGET}_OPTS used so far: > > $ grep '_INSTALL_OPTS' $(grep -rl "cmake-package" package/*/*.mk) > $ grep '_INSTALL_STAGING_OPTS' $(grep -rl "cmake-package" package/*/*.mk) > $ grep '_INSTALL_TARGET_OPTS' $(grep -rl "cmake-package" package/*/*.mk) > > The _MAKE_{ENV,OPTS} are translated to _BUILD_{ENV,OPTS}: > > $ grep '_MAKE_ENV =' $(grep -rl "cmake-package" package/*/*.mk) > > > package/netopeer2/netopeer2.mk:NETOPEER2_MAKE_ENV = \ > > package/racehound/racehound.mk:RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) > > $ grep '_MAKE_OPTS =' $(grep -rl "cmake-package" package/*/*.mk) This misses package/gdal/gdal.mk which does '_MAKE_OPTS +='. > > package/mariadb/mariadb.mk:HOST_MARIADB_MAKE_OPTS = import_executables > > package/zeek/zeek.mk:HOST_ZEEK_MAKE_OPTS = binpac bifcl > > Only "musepack" seems to overwrite MAKE to enforce -j1, so replace it: > > $ grep '_MAKE =' $(grep -rl "cmake-package" package/*/*.mk) > > > package/musepack/musepack.mk:MUSEPACK_MAKE = $(MAKE1) > > Signed-off-by: Thomas Devoogdt > --- > v2: made generator use more generic, other generators can now easily be added if required > --- > package/musepack/musepack.mk | 2 +- > package/netopeer2/netopeer2.mk | 2 +- > package/pkg-cmake.mk | 26 ++++++++++++++------------ > package/racehound/racehound.mk | 2 +- > 4 files changed, 17 insertions(+), 15 deletions(-) > > diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk > index fc66c684a5..d4dd08df36 100644 > --- a/package/musepack/musepack.mk > +++ b/package/musepack/musepack.mk > @@ -9,7 +9,7 @@ MUSEPACK_SITE = http://files.musepack.net/source > MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz > MUSEPACK_DEPENDENCIES = libcuefile libreplaygain > MUSEPACK_INSTALL_STAGING = YES > -MUSEPACK_MAKE = $(MAKE1) > +MUSEPACK_BUILD_OPTS = -j1 > MUSEPACK_LICENSE = BSD-3-Clause (*mpcdec), LGPL-2.1+ (*mpcenc) > MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c > > diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk > index 47fcd31acd..2ebb23eccd 100644 > --- a/package/netopeer2/netopeer2.mk > +++ b/package/netopeer2/netopeer2.mk > @@ -24,7 +24,7 @@ NETOPEER2_CONF_OPTS = \ > # affected mutualy. > NETOPEER2_SYSREPO_SHM_PREFIX = sr_buildroot$(subst /,_,$(CONFIG_DIR))_netopeer2 > > -NETOPEER2_MAKE_ENV = \ > +NETOPEER2_BUILD_ENV = \ > SYSREPOCTL_EXECUTABLE=$(HOST_DIR)/bin/sysrepoctl \ > SYSREPO_SHM_PREFIX=$(NETOPEER2_SYSREPO_SHM_PREFIX) > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > index 8c375779cb..205a93db5f 100644 > --- a/package/pkg-cmake.mk > +++ b/package/pkg-cmake.mk > @@ -51,11 +51,6 @@ endif > > define inner-cmake-package > > -$(2)_MAKE ?= $$(MAKE) > -$(2)_INSTALL_OPTS ?= install > -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast > -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast > - > $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES > > > @@ -65,6 +60,13 @@ else > $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build > endif > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +$(2)_DEPENDENCIES += host-ninja > +$(2)_GENERATOR = "Ninja" > +else > +$(2)_GENERATOR = "Unix Makefiles" > +endif > + > # > # Configure step. Only define it if not already defined by the package > # .mk file. And take care of the differences between host and target > @@ -88,7 +90,7 @@ define $(2)_CONFIGURE_CMDS > rm -f CMakeCache.txt && \ > PATH=$$(BR_PATH) \ > $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > - -G"Unix Makefiles" \ > + -G$$($$(PKG)_GENERATOR) \ > -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ > -DCMAKE_INSTALL_PREFIX="/usr" \ > -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ > @@ -119,7 +121,7 @@ define $(2)_CONFIGURE_CMDS > PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ > $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > - -G"Unix Makefiles" \ > + -G$$($$(PKG)_GENERATOR) \ > -DCMAKE_INSTALL_SO_NO_EXE=0 \ > -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ > -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ > @@ -166,11 +168,11 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) > ifndef $(2)_BUILD_CMDS > ifeq ($(4),target) > define $(2)_BUILD_CMDS > - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) > + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) $$(BUILD_OPTS) $$($$(PKG)_BUILD_OPTS) Where is $$(BUILD_OPTS) set? As far as I can see this is not needed. > endef > else > define $(2)_BUILD_CMDS > - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) > + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) $$(BUILD_OPTS) $$($$(PKG)_BUILD_OPTS) > endef > endif > endif > @@ -181,7 +183,7 @@ endif > # > ifndef $(2)_INSTALL_CMDS > define $(2)_INSTALL_CMDS > - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) > + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) > endef > endif > > @@ -191,7 +193,7 @@ endif > # > ifndef $(2)_INSTALL_STAGING_CMDS > define $(2)_INSTALL_STAGING_CMDS > - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) > + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(STAGING_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_STAGING_OPTS) > endef > endif > > @@ -201,7 +203,7 @@ endif > # > ifndef $(2)_INSTALL_TARGET_CMDS > define $(2)_INSTALL_TARGET_CMDS > - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) > + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(TARGET_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_TARGET_OPTS) > endef > endif > > diff --git a/package/racehound/racehound.mk b/package/racehound/racehound.mk > index 6499e166d8..f63bb233f6 100644 > --- a/package/racehound/racehound.mk > +++ b/package/racehound/racehound.mk > @@ -22,6 +22,6 @@ RACEHOUND_CONF_OPTS += \ > -DKBUILD_VERSION_STRING=$(LINUX_VERSION_PROBED) > > # cross compile environment for linux kernel module > -RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) > +RACEHOUND_BUILD_ENV = $(LINUX_MAKE_FLAGS) > > $(eval $(cmake-package)) > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Tue Feb 28 15:34:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:34:08 +0100 Subject: [Buildroot] [PATCH] package/wolfssl: Disable broken asm implementations on 32-bit Arm In-Reply-To: <20230207223932.696d9190@windsurf> (Thomas Petazzoni via buildroot's message of "Tue, 7 Feb 2023 22:39:32 +0100") References: <20220614192445.2390329-1-ben.hutchings@mind.be> <20230207223932.696d9190@windsurf> Message-ID: <87pm9tkdn3.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > Hello Ben, > On Tue, 14 Jun 2022 21:24:45 +0200 > Ben Hutchings wrote: >> wolfSSL has ARMv8-A assembly implementations of some functions for >> both A64 and A32 ISAs. However, some of the A32 versions use r11, >> which is usually not allowed: >> >> wolfcrypt/src/port/arm/armv8-aes.c: In function 'wc_AesCbcEncrypt': >> wolfcrypt/src/port/arm/armv8-aes.c:3303:5: error: fp cannot be used in 'asm' here >> 3303 | } >> | ^ >> >> That can be fixed by adding the compiler flag -fomit-frame-pointer, >> but then there is another failure: >> >> /tmp/ccV19DQV.s: Assembler messages: >> /tmp/ccV19DQV.s:248: Error: first transfer register must be even -- `ldrd r11,r10,[r14,#4*14]' >> make[3]: *** [Makefile:5858: wolfcrypt/src/port/arm/src_libwolfssl_la-armv8-chacha.lo] Error 1 >> >> This is definitely not a valid instruction in A32, which suggests that >> this code isn't being tested at all upstream. So disable it here. >> >> Signed-off-by: Ben Hutchings >> --- >> package/wolfssl/wolfssl.mk | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) > Thanks, I finally applied your patch, after adding a reference to the > autobuilder failure it is fixing. I also pushed two other patches to > fix other wolfssl build failures: > https://gitlab.com/buildroot.org/buildroot/-/commit/36b8c9494b56b877fea62f17926f747c7c7bfb8d > https://gitlab.com/buildroot.org/buildroot/-/commit/f79a9c775ff0a59027f274a237d98b5f8d31c022 > https://gitlab.com/buildroot.org/buildroot/-/commit/d8dc5315eb712eca0a5cbf793a6714a47ab6e57e All 3 committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:28:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:28:31 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: silence gcc plugin test Message-ID: <20230228153524.3052086C93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1174407c5f6759e960b20c0e89ee6bae3820ebb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The gcc plugin test was not using the -q option to grep causing it to print the line to stdout, so fix that. While we're at it, adjust the locale check to use grep -q instead of redirecting to /dev/null for consistency with the other checks. Signed-off-by: Peter Korsgaard (cherry picked from commit 4fbd2f6d2cf26225f73f584c3a0cacb1b2476f5f) Signed-off-by: Peter Korsgaard --- 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 cd0e900ff6..3822f0ca0e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -203,7 +203,7 @@ if [ "${PATCH_MAJOR}" -lt 2 ] || [ "${PATCH_MAJOR}" -eq 2 -a "${PATCH_MINOR}" -l exit 1; fi -if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then +if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then if ! which locale > /dev/null ; then echo echo "You need locale support on your build machine to build a toolchain supporting locales" @@ -263,7 +263,7 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then fi fi -if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then +if grep -q ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then if ! echo "#include " | $HOSTCXX_NOCCACHE -I$($HOSTCXX_NOCCACHE -print-file-name=plugin)/include -x c++ -c - -o /dev/null ; then echo echo "Your Buildroot configuration needs a host compiler capable of building gcc plugins." From peter at korsgaard.com Tue Feb 28 15:32:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:32:29 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/wolfssl: handle ARM Thumb situation Message-ID: <20230228153524.467CF86CA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34c193e697a45ad41d7e6e5590f4372a6ad7f92a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x By default on ARM32, wolfssl uses assembly instructions that are not supported on Thumb (original Thumb, not Thumb 2), causing a build failure: /tmp/ccgn33X7.s:299: Error: selected processor does not support `umlal r4,r5,r10,ip' in Thumb mode /tmp/ccgn33X7.s:386: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' /tmp/ccgn33X7.s:387: Error: unshifted register required -- `adc r3,r3,#0' /tmp/ccgn33X7.s:395: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' Fix that by passing --with-arm-target=thumb, which tells wolfssl to use a different set of assembly routines. Fixes: http://autobuild.buildroot.net/results/907/907a5967439c3157c426023b0be1e613092d7bfe/ Signed-off-by: Thomas Petazzoni (cherry picked from commit f79a9c775ff0a59027f274a237d98b5f8d31c022) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index f415e11bb5..8f6cba56ec 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -43,4 +43,8 @@ else WOLFSSL_CONF_OPTS += --disable-armasm endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +WOLFSSL_CONF_OPTS += --with-arm-target=thumb +endif + $(eval $(autotools-package)) From peter at korsgaard.com Tue Feb 28 15:32:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:32:05 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/wolfssl: disable broken asm implementations on 32-bit Arm Message-ID: <20230228153524.3B0D786C94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aca885d9ef93a06516c59ea5d2f511145e0a1605 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x wolfSSL has ARMv8-A assembly implementations of some functions for both A64 and A32 ISAs. However, some of the A32 versions use r11, which is usually not allowed: wolfcrypt/src/port/arm/armv8-aes.c: In function 'wc_AesCbcEncrypt': wolfcrypt/src/port/arm/armv8-aes.c:3303:5: error: fp cannot be used in 'asm' here 3303 | } | ^ That can be fixed by adding the compiler flag -fomit-frame-pointer, but then there is another failure: /tmp/ccV19DQV.s: Assembler messages: /tmp/ccV19DQV.s:248: Error: first transfer register must be even -- `ldrd r11,r10,[r14,#4*14]' make[3]: *** [Makefile:5858: wolfcrypt/src/port/arm/src_libwolfssl_la-armv8-chacha.lo] Error 1 This is definitely not a valid instruction in A32, which suggests that this code isn't being tested at all upstream. So disable it here. Fixes: http://autobuild.buildroot.net/results/502/502a2b217845eb290c1961d4740b032462f8ae53/ Signed-off-by: Ben Hutchings Signed-off-by: Thomas Petazzoni (cherry picked from commit 36b8c9494b56b877fea62f17926f747c7c7bfb8d) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index cd3acd9411..f415e11bb5 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -33,14 +33,12 @@ WOLFSSL_CONF_OPTS += --disable-sslv3 endif # enable ARMv8 hardware acceleration -ifeq ($(BR2_ARM_CPU_ARMV8A),y) +ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm # the flag -mstrict-align is needed to prevent build errors caused by # some inline assembly in parts of the AES structure using the "m" # constraint -ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -mstrict-align" -endif else WOLFSSL_CONF_OPTS += --disable-armasm endif From peter at korsgaard.com Tue Feb 28 15:33:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:33:36 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/wolfssl: disable assembly when not supported Message-ID: <20230228153524.51C5486CA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=348b2e25df76b9a603639dc9a99c03442ab673e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x wolfssl contains some assembly code and its configure.ac script enables the assembly code depending on the CPU architecture. However, the detection logic is not sufficient and leads to using the assembly code in situation where it should not. Here are two examples: - As soon as the architecture is mips64/mips64el, it uses assembly code, but that assembly code is not mips64r6 compatible. - As soon as the architecture is RISC-V, it uses assembly code, but that assembly code uses multiplication instructions, without paying attention that the "M" extension may not be available in the RISC-V CPU instruction set. In order to avoid this, we introduce a BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS hidden boolean to decide when to enable/disable assembly code. We set an initial value with the supported CPU architectures, with the exclusion of the problematic cases described above. It is pretty likely that this variable will need tuning progressively, as it is difficult to determine which CPU variants exactly are supported by the assembly code in wolfssl. Fixes: - MIPS64 case: http://autobuild.buildroot.net/results/43e/43ee1a457cbeb986d958c9a70cac0676377661c0/ - RISC-V case: http://autobuild.buildroot.net/results/f05/f056ebe7749a69994afba39a9d4967e2774c45ea/ Signed-off-by: Thomas Petazzoni (cherry picked from commit d8dc5315eb712eca0a5cbf793a6714a47ab6e57e) Signed-off-by: Peter Korsgaard --- package/wolfssl/Config.in | 12 ++++++++++++ package/wolfssl/wolfssl.mk | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/package/wolfssl/Config.in b/package/wolfssl/Config.in index 3a97125e8d..c41bdb6888 100644 --- a/package/wolfssl/Config.in +++ b/package/wolfssl/Config.in @@ -1,3 +1,15 @@ +config BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm || BR2_armeb + default y if BR2_powerpc + default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_mips64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64el && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips || BR2_mipsel + default y if BR2_riscv && BR2_RISCV_ISA_RVM + default y if BR2_s390x + config BR2_PACKAGE_WOLFSSL bool "wolfssl" depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 8f6cba56ec..9f06bb1b4b 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -32,6 +32,12 @@ else WOLFSSL_CONF_OPTS += --disable-sslv3 endif +ifeq ($(BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS),y) +WOLFSSL_CONF_OPTS += --enable-asm +else +WOLFSSL_CONF_OPTS += --disable-asm +endif + # enable ARMv8 hardware acceleration ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm From peter at korsgaard.com Tue Feb 28 15:33:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:33:08 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wolfssl: disable broken asm implementations on 32-bit Arm Message-ID: <20230228153629.2175586CCB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4070181b570640876d1966015cac22757ab50e7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x wolfSSL has ARMv8-A assembly implementations of some functions for both A64 and A32 ISAs. However, some of the A32 versions use r11, which is usually not allowed: wolfcrypt/src/port/arm/armv8-aes.c: In function 'wc_AesCbcEncrypt': wolfcrypt/src/port/arm/armv8-aes.c:3303:5: error: fp cannot be used in 'asm' here 3303 | } | ^ That can be fixed by adding the compiler flag -fomit-frame-pointer, but then there is another failure: /tmp/ccV19DQV.s: Assembler messages: /tmp/ccV19DQV.s:248: Error: first transfer register must be even -- `ldrd r11,r10,[r14,#4*14]' make[3]: *** [Makefile:5858: wolfcrypt/src/port/arm/src_libwolfssl_la-armv8-chacha.lo] Error 1 This is definitely not a valid instruction in A32, which suggests that this code isn't being tested at all upstream. So disable it here. Fixes: http://autobuild.buildroot.net/results/502/502a2b217845eb290c1961d4740b032462f8ae53/ Signed-off-by: Ben Hutchings Signed-off-by: Thomas Petazzoni (cherry picked from commit 36b8c9494b56b877fea62f17926f747c7c7bfb8d) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index cd3acd9411..f415e11bb5 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -33,14 +33,12 @@ WOLFSSL_CONF_OPTS += --disable-sslv3 endif # enable ARMv8 hardware acceleration -ifeq ($(BR2_ARM_CPU_ARMV8A),y) +ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm # the flag -mstrict-align is needed to prevent build errors caused by # some inline assembly in parts of the AES structure using the "m" # constraint -ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -mstrict-align" -endif else WOLFSSL_CONF_OPTS += --disable-armasm endif From peter at korsgaard.com Tue Feb 28 15:28:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:28:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: silence gcc plugin test Message-ID: <20230228153629.136C686CC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f21a9f61c59bf1110b051fcbc73f3dcd9bea32ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The gcc plugin test was not using the -q option to grep causing it to print the line to stdout, so fix that. While we're at it, adjust the locale check to use grep -q instead of redirecting to /dev/null for consistency with the other checks. Signed-off-by: Peter Korsgaard (cherry picked from commit 4fbd2f6d2cf26225f73f584c3a0cacb1b2476f5f) Signed-off-by: Peter Korsgaard --- 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 cd0e900ff6..3822f0ca0e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -203,7 +203,7 @@ if [ "${PATCH_MAJOR}" -lt 2 ] || [ "${PATCH_MAJOR}" -eq 2 -a "${PATCH_MINOR}" -l exit 1; fi -if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then +if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then if ! which locale > /dev/null ; then echo echo "You need locale support on your build machine to build a toolchain supporting locales" @@ -263,7 +263,7 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then fi fi -if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then +if grep -q ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then if ! echo "#include " | $HOSTCXX_NOCCACHE -I$($HOSTCXX_NOCCACHE -print-file-name=plugin)/include -x c++ -c - -o /dev/null ; then echo echo "Your Buildroot configuration needs a host compiler capable of building gcc plugins." From peter at korsgaard.com Tue Feb 28 15:33:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:33:13 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wolfssl: handle ARM Thumb situation Message-ID: <20230228153629.2F57186CCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3430a8c853cce5cab1c7bb7a9975fd494b3e1ee8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x By default on ARM32, wolfssl uses assembly instructions that are not supported on Thumb (original Thumb, not Thumb 2), causing a build failure: /tmp/ccgn33X7.s:299: Error: selected processor does not support `umlal r4,r5,r10,ip' in Thumb mode /tmp/ccgn33X7.s:386: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' /tmp/ccgn33X7.s:387: Error: unshifted register required -- `adc r3,r3,#0' /tmp/ccgn33X7.s:395: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' Fix that by passing --with-arm-target=thumb, which tells wolfssl to use a different set of assembly routines. Fixes: http://autobuild.buildroot.net/results/907/907a5967439c3157c426023b0be1e613092d7bfe/ Signed-off-by: Thomas Petazzoni (cherry picked from commit f79a9c775ff0a59027f274a237d98b5f8d31c022) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index f415e11bb5..8f6cba56ec 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -43,4 +43,8 @@ else WOLFSSL_CONF_OPTS += --disable-armasm endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +WOLFSSL_CONF_OPTS += --with-arm-target=thumb +endif + $(eval $(autotools-package)) From peter at korsgaard.com Tue Feb 28 15:33:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:33:30 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wolfssl: disable assembly when not supported Message-ID: <20230228153629.3A93586CCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f176b6fa3708fd27740a69d6c31411439c2be08d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x wolfssl contains some assembly code and its configure.ac script enables the assembly code depending on the CPU architecture. However, the detection logic is not sufficient and leads to using the assembly code in situation where it should not. Here are two examples: - As soon as the architecture is mips64/mips64el, it uses assembly code, but that assembly code is not mips64r6 compatible. - As soon as the architecture is RISC-V, it uses assembly code, but that assembly code uses multiplication instructions, without paying attention that the "M" extension may not be available in the RISC-V CPU instruction set. In order to avoid this, we introduce a BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS hidden boolean to decide when to enable/disable assembly code. We set an initial value with the supported CPU architectures, with the exclusion of the problematic cases described above. It is pretty likely that this variable will need tuning progressively, as it is difficult to determine which CPU variants exactly are supported by the assembly code in wolfssl. Fixes: - MIPS64 case: http://autobuild.buildroot.net/results/43e/43ee1a457cbeb986d958c9a70cac0676377661c0/ - RISC-V case: http://autobuild.buildroot.net/results/f05/f056ebe7749a69994afba39a9d4967e2774c45ea/ Signed-off-by: Thomas Petazzoni (cherry picked from commit d8dc5315eb712eca0a5cbf793a6714a47ab6e57e) Signed-off-by: Peter Korsgaard --- package/wolfssl/Config.in | 12 ++++++++++++ package/wolfssl/wolfssl.mk | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/package/wolfssl/Config.in b/package/wolfssl/Config.in index 3a97125e8d..c41bdb6888 100644 --- a/package/wolfssl/Config.in +++ b/package/wolfssl/Config.in @@ -1,3 +1,15 @@ +config BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm || BR2_armeb + default y if BR2_powerpc + default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_mips64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64el && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips || BR2_mipsel + default y if BR2_riscv && BR2_RISCV_ISA_RVM + default y if BR2_s390x + config BR2_PACKAGE_WOLFSSL bool "wolfssl" depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 8f6cba56ec..9f06bb1b4b 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -32,6 +32,12 @@ else WOLFSSL_CONF_OPTS += --disable-sslv3 endif +ifeq ($(BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS),y) +WOLFSSL_CONF_OPTS += --enable-asm +else +WOLFSSL_CONF_OPTS += --disable-asm +endif + # enable ARMv8 hardware acceleration ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm From peter at korsgaard.com Tue Feb 28 15:48:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:48:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/xz: patch configure due to microblaze patch In-Reply-To: <87sffg41s5.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Wed, 08 Feb 2023 16:25:46 +0100") References: <20230208142358.2721276-1-vfazio@xes-inc.com> <87sffg41s5.fsf@dell.be.48ers.dk> Message-ID: <87lekhkczr.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Vincent" == Vincent Fazio writes: >> Commit bed21bb9b added a patch to change configure.ac but failed to >> update configure which caused build failures due to the timestamp >> difference between configure and configure.ac and the makefile attempting >> to run aclocal. >> XZ_AUTORECONF = YES creates a circular dependency where the host >> autotools need host-xz which also gets patched. Because of this, we need >> to patch xz's configure script manually. >> While we're doing this, correct the language in the commit body of the >> patch, remove a stray whitespace, and fix the offset for configure.ac >> Fixes: bed21bb9b ("package/xz: fix microblaze compiles") >> Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685// >> Signed-off-by: Vincent Fazio > This unfortunately still doesn't work as autoreconf is also triggered if > configure.ac is newer than Makefile.in, so I dropped the patching of > configure.ac which isn't strictly needed and committed, thanks. Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:48:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:48:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/xz: fix microblaze compiles In-Reply-To: <20230207170303.2508780-1-vfazio@xes-inc.com> (Vincent Fazio's message of "Tue, 7 Feb 2023 11:03:03 -0600") References: <20230207170303.2508780-1-vfazio@xes-inc.com> Message-ID: <87h6v5kcze.fsf@dell.be.48ers.dk> >>>>> "Vincent" == Vincent Fazio writes: > From: Vincent Fazio > Patch xz to check if __attribute__((symver ..)) is supported via a > compile check during configure. > Fixes: > http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// > Signed-off-by: Vincent Fazio Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:52:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:52:07 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring In-Reply-To: <20230207170040.3503236-1-peter@korsgaard.com> (Peter Korsgaard's message of "Tue, 7 Feb 2023 18:00:39 +0100") References: <20230207170040.3503236-1-peter@korsgaard.com> Message-ID: <87cz5tkct4.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > The vendoring done for cargo / go packages (may) need git, so ensure we > check for it in dependencies, similar to how it is done for packages > directly using git. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:47:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:47:00 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/xz: patch configure due to microblaze patch Message-ID: <20230228155307.6159B86CED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f3e133330d96946ceede50d745c8e80487dffd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit bed21bb9b added a patch to change configure.ac but failed to update configure which caused build failures due to the timestamp difference between configure and configure.ac and the makefile attempting to run aclocal. XZ_AUTORECONF = YES creates a circular dependency where the host autotools need host-xz which also gets patched. Because of this, we need to patch xz's configure script manually and NOT patch configure.ac so its timestamp stays older than Makefile.in. While we're doing this, correct the language in the commit body of the patch, remove a stray whitespace, and fix the offset for configure.ac Fixes: bed21bb9b ("package/xz: fix microblaze compiles") Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685/ Signed-off-by: Vincent Fazio [Peter: Only patch configure] Signed-off-by: Peter Korsgaard (cherry picked from commit e5a83df8da04f5854c2e248e23dea3af620954cd) Signed-off-by: Peter Korsgaard --- .../xz/0001-Detect-symver-attribute-support.patch | 71 ++++++++++++---------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch index 9ec43ea7a0..462fa9d86b 100644 --- a/package/xz/0001-Detect-symver-attribute-support.patch +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -1,11 +1,11 @@ -From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From f0e0e8bd08b4d4e7c89a5a3b7d9a3c083f7e5432 Mon Sep 17 00:00:00 2001 From: Vincent Fazio -Date: Tue, 7 Feb 2023 08:51:24 -0600 +Date: Wed, 8 Feb 2023 12:58:37 +0000 Subject: [PATCH] Detect symver attribute support -On non-ELF platforms, such as microblaze, builds will fail when trying -to add symver information because __attribute__((symver ..)) is not -supported even though __has_attribute(__symver__) returns true. +On Microblaze, builds will fail when trying to add symver information +because __attribute__((symver ..)) is not supported even though +__has_attribute(__symver__) returns true. Support for symver needs to be detected via a compile test since __has_attribute can report false positives [0]. @@ -18,33 +18,16 @@ it is supported and define a variable to advertise support. Upstream: https://github.com/tukaani-project/xz/pull/32 Signed-off-by: Thomas Petazzoni Signed-off-by: Vincent Fazio +[Peter: patch configure instead of configure.ac so autoreconf isn't +triggered at build time] +Signed-off-by: Peter Korsgaard --- - configure.ac | 9 +++++++++ - src/liblzma/common/common.h | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) + configure | 15 +++++++++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 5ad5589..08c623a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -791,6 +791,15 @@ else - time with Libtool if neither --with-pic nor - --without-pic is used). This define must be - used together with liblzma_linux.map.]) -+ OLD_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE( -+ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } -+ ])], -+ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], -+ [Define to 1 if GCC supports the symver attribute])], -+ []) -+ CFLAGS="$OLD_CFLAGS" - ;; - *) - enable_symbol_versions=generic diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h -index 11fec52..1d2ef9c 100644 +index 671d3bc..27b56ee 100644 --- a/src/liblzma/common/common.h +++ b/src/liblzma/common/common.h @@ -76,7 +76,7 @@ @@ -52,10 +35,36 @@ index 11fec52..1d2ef9c 100644 // is available. This should be far more reliable than looking at compiler // version macros as nowadays especially __GNUC__ is defined by many compilers. -# if lzma_has_attribute(__symver__) -+# if defined(HAVE_SYMVER_ATTRIBUTE) ++# if defined(HAVE_SYMVER_ATTRIBUTE) # define LZMA_SYMVER_API(extnamever, type, intname) \ extern __attribute__((__symver__(extnamever))) \ LZMA_API(type) intname +diff --git a/configure b/configure +index ff0eed5..e685b30 100755 +--- a/configure ++++ b/configure +@@ -16687,6 +16687,21 @@ printf "%s\n" "" >&6; } + + printf "%s\n" "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h + ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO" ++then : ++ ++printf "%s\n" "#define HAVE_SYMVER_ATTRIBUTE 1" >>confdefs.h ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic -- -2.25.1 +2.34.1 From peter at korsgaard.com Tue Feb 28 15:46:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:46:55 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/xz: fix microblaze compiles Message-ID: <20230228155307.53B5886CE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0407c5ed01f8b4e0ddb8f0f6132c18c758e61f7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Patch xz to check if __attribute__((symver ..)) is supported via a compile check during configure. Fixes: http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni (cherry picked from commit bed21bb9b462bece7cd1b9741643aa553ced4d35) Signed-off-by: Peter Korsgaard --- .../xz/0001-Detect-symver-attribute-support.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch new file mode 100644 index 0000000000..9ec43ea7a0 --- /dev/null +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -0,0 +1,61 @@ +From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 08:51:24 -0600 +Subject: [PATCH] Detect symver attribute support + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://github.com/tukaani-project/xz/pull/32 +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vincent Fazio +--- + configure.ac | 9 +++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5ad5589..08c623a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -791,6 +791,15 @@ else + time with Libtool if neither --with-pic nor + --without-pic is used). This define must be + used together with liblzma_linux.map.]) ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE( ++ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ])], ++ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], ++ [Define to 1 if GCC supports the symver attribute])], ++ []) ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic +diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h +index 11fec52..1d2ef9c 100644 +--- a/src/liblzma/common/common.h ++++ b/src/liblzma/common/common.h +@@ -76,7 +76,7 @@ + // too (which doesn't support __symver__) so use it to detect if __symver__ + // is available. This should be far more reliable than looking at compiler + // version macros as nowadays especially __GNUC__ is defined by many compilers. +-# if lzma_has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define LZMA_SYMVER_API(extnamever, type, intname) \ + extern __attribute__((__symver__(extnamever))) \ + LZMA_API(type) intname +-- +2.25.1 + From peter at korsgaard.com Tue Feb 28 15:52:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:52:46 +0100 Subject: [Buildroot] [PATCH 2/2] support/dependencies/dependencies.sh: ensure git is >= 2.0.0 for vendoring In-Reply-To: <20230207170040.3503236-2-peter@korsgaard.com> (Peter Korsgaard's message of "Tue, 7 Feb 2023 18:00:40 +0100") References: <20230207170040.3503236-1-peter@korsgaard.com> <20230207170040.3503236-2-peter@korsgaard.com> Message-ID: <878rghkcs1.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > The go vendoring fails on CentOS 7 (which uses git 1.8.3.1) with errors > related to shallow clones: > make docker-compose-source > .. > go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 > github.com/docker/compose/v2/pkg/mocks imports > github.com/theupdateframework/notary/client imports > github.com/docker/go/canonical/json: github.com/docker/go at v1.5.1-1.0.20160303222718-d30aec9fd63c: invalid pseudo-version: git fetch --unshallow -f origin in /home/jacmet/source/buildroot-mirror/output/host/share/go-path/pkg/mod/cache/vcs/48fbd2dfabec81f4c93170677bfc89087d4bec07a2d08f6ca5ce3d17962677ee: exit status 128: > fatal: git fetch-pack: expected shallow list > make[1]: *** [/home/jacmet/source/buildroot-mirror/output/build/docker-compose-2.15.1/.stamp_downloaded] Error 1 > It works with git 2.0.0 (released May 2014, included in Debian 8), so check > for >= 2.0.0 with logic similar to the GNU patch version check. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:51:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:51:31 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring Message-ID: <20230228155307.6CC6F86CEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d62b7f7f91ca6fa1bd761fca183a17131ceef751 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The vendoring done for cargo / go packages (may) need git, so ensure we check for it in dependencies, similar to how it is done for packages directly using git. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 8c8ee42bbe6ebb7f20978b06a581c42733197ae2) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f9c0ea71e1..31a8006216 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1250,6 +1250,13 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD +# cargo/go vendoring (may) need git +ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),cargo) +DL_TOOLS_DEPENDENCIES += git +else ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),go) +DL_TOOLS_DEPENDENCIES += git +endif + DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. From peter at korsgaard.com Tue Feb 28 15:46:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:46:51 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/xz: bump to version 5.2.10 Message-ID: <20230228155307.48B3D86CE8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=10ae94b6bbfac57c23508129b942f052f0797dce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit be3a6bf2e7130b084ec4ed65274ff7c4bf67510c) Signed-off-by: Peter Korsgaard --- package/xz/xz.hash | 3 ++- package/xz/xz.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 3aa68791fd..1153e02b4d 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,5 +1,6 @@ # Locally calculated after checking pgp signature -sha256 b65f1d0c2708e57716f4dd2216989a73847ac6fdb4168ffceb155767e22b834b xz-5.2.7.tar.bz2 +# https://tukaani.org/xz/xz-5.2.10.tar.bz2.sig +sha256 01b71df61521d9da698ce3c33148bff06a131628ff037398c09482f3a26e5408 xz-5.2.10.tar.bz2 # Hash for license files sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 004eea94b2..0120d23b85 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.2.7 +XZ_VERSION = 5.2.10 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 15:52:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:52:23 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: ensure git is >= 2.0.0 for vendoring Message-ID: <20230228155307.7899086CE8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=004660e84fa30d8fa033015f452b6ad807622afc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The go vendoring fails on CentOS 7 (which uses git 1.8.3.1) with errors related to shallow clones: make docker-compose-source .. go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 github.com/docker/compose/v2/pkg/mocks imports github.com/theupdateframework/notary/client imports github.com/docker/go/canonical/json: github.com/docker/go at v1.5.1-1.0.20160303222718-d30aec9fd63c: invalid pseudo-version: git fetch --unshallow -f origin in /home/jacmet/source/buildroot-mirror/output/host/share/go-path/pkg/mod/cache/vcs/48fbd2dfabec81f4c93170677bfc89087d4bec07a2d08f6ca5ce3d17962677ee: exit status 128: fatal: git fetch-pack: expected shallow list make[1]: *** [/home/jacmet/source/buildroot-mirror/output/build/docker-compose-2.15.1/.stamp_downloaded] Error 1 It works with git 2.0.0 (released May 2014, included in Debian 8), so check for >= 2.0.0 with logic similar to the GNU patch version check. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit f229564c36ec64c1f1292b7281ae0bd33840d7a4) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 3822f0ca0e..89ed3c9df9 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -183,6 +183,16 @@ for prog in perl tar wget cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do echo " xargs is usually part of the findutils package in your distribution" fi fi + + # we need git >= 2.0.0 for shallow clones / vendoring + if test $prog = "git" ; then + GIT_VERSION="$(git --version | sed -n 's/^git version \(.*\)/\1/p')" + GIT_MAJOR="$(echo "${GIT_VERSION}" | cut -d . -f 1)" + if [ "${GIT_MAJOR}" -lt 2 ]; then + echo "You have git '${GIT_VERSION}' installed. Git >= 2.0.0 is required" + exit 1 + fi + fi done if test "${missing_progs}" = "yes" ; then From thomas at devoogdt.com Tue Feb 28 15:55:26 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 28 Feb 2023 16:55:26 +0100 Subject: [Buildroot] [PATCH v3 1/3] pkg-cmake: add option to select the Ninja generator In-Reply-To: References: Message-ID: <20230228155528.2430203-1-thomas.devoogdt@barco.com> E.g. Commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 can now be replaced by: WEBKITGTK_CMAKE_NINJA = YES Packages that are selecting Ninja (or overtime another generator), should also use the _BUILD_{ENV,OPTS} variables iso the _MAKE variables. No _INSTALL{,_STAGING,_TARGET}_OPTS used so far: $ grep '_INSTALL_OPTS' $(grep -rl "cmake-package" package/*/*.mk) $ grep '_INSTALL_STAGING_OPTS' $(grep -rl "cmake-package" package/*/*.mk) $ grep '_INSTALL_TARGET_OPTS' $(grep -rl "cmake-package" package/*/*.mk) The _MAKE_{ENV,OPTS} are translated to _BUILD_{ENV,OPTS}: $ grep '_MAKE_ENV =' $(grep -rl "cmake-package" package/*/*.mk) > package/netopeer2/netopeer2.mk:NETOPEER2_MAKE_ENV = \ > package/racehound/racehound.mk:RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) $ grep '_MAKE_OPTS =' $(grep -rl "cmake-package" package/*/*.mk) > package/mariadb/mariadb.mk:HOST_MARIADB_MAKE_OPTS = import_executables > package/zeek/zeek.mk:HOST_ZEEK_MAKE_OPTS = binpac bifcl Only "musepack" seems to overwrite MAKE to enforce -j1, so replace it: $ grep '_MAKE =' $(grep -rl "cmake-package" package/*/*.mk) > package/musepack/musepack.mk:MUSEPACK_MAKE = $(MAKE1) Signed-off-by: Thomas Devoogdt --- v2: - made generator use more generic, other generators can now easily be added if required v3: - add _GENERATOR_PROGRAM - add _GENERATOR_PARALLEL for make - dropped BUILD_OPTS - fix gdal.mk --- package/gdal/gdal.mk | 2 +- package/musepack/musepack.mk | 2 +- package/netopeer2/netopeer2.mk | 2 +- package/pkg-cmake.mk | 31 +++++++++++++++++++------------ package/racehound/racehound.mk | 2 +- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index a3b11c53af..d8ce623283 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -19,7 +19,7 @@ GDAL_SUPPORTS_IN_SOURCE_BUILD = NO # autotools in gdal. We need to force 'make' to use the Makefile, # which is generated by CMake. GNUmakefile and autoconf are dropped in # 3.6 so this can be dropped in future version. -GDAL_MAKE_OPTS += -f Makefile +GDAL_BUILD_OPTS += -f Makefile # gdal at its core only needs host-pkgconf, libgeotiff, proj and tiff # but since by default mrf driver support is enabled, it also needs diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk index fc66c684a5..d4dd08df36 100644 --- a/package/musepack/musepack.mk +++ b/package/musepack/musepack.mk @@ -9,7 +9,7 @@ MUSEPACK_SITE = http://files.musepack.net/source MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz MUSEPACK_DEPENDENCIES = libcuefile libreplaygain MUSEPACK_INSTALL_STAGING = YES -MUSEPACK_MAKE = $(MAKE1) +MUSEPACK_BUILD_OPTS = -j1 MUSEPACK_LICENSE = BSD-3-Clause (*mpcdec), LGPL-2.1+ (*mpcenc) MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 47fcd31acd..2ebb23eccd 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -24,7 +24,7 @@ NETOPEER2_CONF_OPTS = \ # affected mutualy. NETOPEER2_SYSREPO_SHM_PREFIX = sr_buildroot$(subst /,_,$(CONFIG_DIR))_netopeer2 -NETOPEER2_MAKE_ENV = \ +NETOPEER2_BUILD_ENV = \ SYSREPOCTL_EXECUTABLE=$(HOST_DIR)/bin/sysrepoctl \ SYSREPO_SHM_PREFIX=$(NETOPEER2_SYSREPO_SHM_PREFIX) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 8c375779cb..5f5988beb8 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -51,11 +51,6 @@ endif define inner-cmake-package -$(2)_MAKE ?= $$(MAKE) -$(2)_INSTALL_OPTS ?= install -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast - $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES @@ -65,6 +60,16 @@ else $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build endif +ifeq ($$($(3)_CMAKE_NINJA),YES) +$(2)_DEPENDENCIES += host-ninja +$(2)_GENERATOR = "Ninja" +$(2)_GENERATOR_PROGRAM = $(HOST_DIR)/bin/ninja +else +$(2)_GENERATOR = "Unix Makefiles" +$(2)_GENERATOR_PROGRAM = $(firstword $(BR2_MAKE)) +$(2)_GENERATOR_PARALLEL = -j$(PARALLEL_JOBS) +endif + # # Configure step. Only define it if not already defined by the package # .mk file. And take care of the differences between host and target @@ -88,7 +93,8 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ + -DCMAKE_MAKE_PROGRAM="$$($$(PKG)_GENERATOR_PROGRAM)" \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ @@ -119,7 +125,8 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ + -DCMAKE_MAKE_PROGRAM="$$($$(PKG)_GENERATOR_PROGRAM)" \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -166,11 +173,11 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) $$($$(PKG)_GENERATOR_PARALLEL) $$($$(PKG)_BUILD_OPTS) endef else define $(2)_BUILD_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) $$($$(PKG)_GENERATOR_PARALLEL) $$($$(PKG)_BUILD_OPTS) endef endif endif @@ -181,7 +188,7 @@ endif # ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) endef endif @@ -191,7 +198,7 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(STAGING_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_STAGING_OPTS) endef endif @@ -201,7 +208,7 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(TARGET_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_TARGET_OPTS) endef endif diff --git a/package/racehound/racehound.mk b/package/racehound/racehound.mk index 6499e166d8..f63bb233f6 100644 --- a/package/racehound/racehound.mk +++ b/package/racehound/racehound.mk @@ -22,6 +22,6 @@ RACEHOUND_CONF_OPTS += \ -DKBUILD_VERSION_STRING=$(LINUX_VERSION_PROBED) # cross compile environment for linux kernel module -RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) +RACEHOUND_BUILD_ENV = $(LINUX_MAKE_FLAGS) $(eval $(cmake-package)) -- 2.39.2 From thomas at devoogdt.com Tue Feb 28 15:55:27 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 28 Feb 2023 16:55:27 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/webkitgtk: use the CMAKE_NINJA flag In-Reply-To: <20230228155528.2430203-1-thomas.devoogdt@barco.com> References: <20230228155528.2430203-1-thomas.devoogdt@barco.com> Message-ID: <20230228155528.2430203-2-thomas.devoogdt@barco.com> Replaces: commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 Author: Peter Korsgaard Date: Thu Feb 9 18:07:05 2023 +0100 package/webkitgtk: Build with ninja Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Devoogdt --- package/webkitgtk/webkitgtk.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 3263f7fea0..b43f97f0ca 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -13,6 +13,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk +WEBKITGTK_CMAKE_NINJA = YES WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 @@ -139,23 +140,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# webkitgtk needs cmake >= 3.20 when not building with ninja, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WEBKITGTK_CONF_OPTS += -GNinja -WEBKITGTK_DEPENDENCIES += host-ninja - -define WEBKITGTK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - $(eval $(cmake-package)) -- 2.39.2 From thomas at devoogdt.com Tue Feb 28 15:55:28 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 28 Feb 2023 16:55:28 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/wpewebkit: use the CMAKE_NINJA flag In-Reply-To: <20230228155528.2430203-1-thomas.devoogdt@barco.com> References: <20230228155528.2430203-1-thomas.devoogdt@barco.com> Message-ID: <20230228155528.2430203-3-thomas.devoogdt@barco.com> Replaces: commit 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd Author: Peter Korsgaard Date: Thu Feb 9 18:07:06 2023 +0100 package/wpewebkit: Build with ninja Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Devoogdt --- package/wpewebkit/wpewebkit.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 48e5c2f8cd..c1b5dee121 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -14,6 +14,7 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit +WPEWEBKIT_CMAKE_NINJA = YES WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo @@ -103,23 +104,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# wpewebkit needs cmake >= 3.20 when building with the make backend, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WPEWEBKIT_CONF_OPTS += -GNinja -WPEWEBKIT_DEPENDENCIES += host-ninja - -define WPEWEBKIT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - $(eval $(cmake-package)) -- 2.39.2 From mail at jens-maus.de Tue Feb 28 15:48:51 2023 From: mail at jens-maus.de (Jens Maus) Date: Tue, 28 Feb 2023 16:48:51 +0100 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.4 In-Reply-To: <20230220205242.72DA9828C8@busybox.osuosl.org> References: <20230220205242.72DA9828C8@busybox.osuosl.org> Message-ID: Sorry if replying to this mail does not seem to be appropriate, but I just tested the latest Buildroot 2023.02-rc2 version and noticed that the builds of the mesa3d package immediately stopped working because in 22.3.x version of mesa3d the ?glslangValidator? tool seem to be a new dependency of mesa3d and the Buildroot package does not install this host tool itself (no gaslang-tools package), thus the build fails if the build host itself does not have this build tool installed. See here: ? cut here ? make[1]: Entering directory '/home/maus/projekte/thinroot-NUCs/thinroot/buildroot-2023.02-rc2' >>> mesa3d 22.3.4 Building PATH="/home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/host/bin:/home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/host/sbin:/home/maus/bin:/usr/local/bin:/usr/local/petlib/bin:/home/maus/bin:/home/maus/bin:/usr/local/bin:/usr/local/petlib/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/usr/local/cuda/bin:/opt/thinlinc/bin:/usr/local/cuda/bin" PYTHONNOUSERSITE=y /home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/host/bin/ninja -C /home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/build/mesa3d-22.3.4//build ninja: Entering directory `/home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/build/mesa3d-22.3.4//build' [3/845] Generating src/intel/vulkan/float64_spv.h with a custom command FAILED: src/intel/vulkan/float64_spv.h /home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/host/bin/python3 ../src/util/glsl2spirv.py ../src/compiler/glsl/float64.glsl src/intel/vulkan/float64_spv.h --create-entry main --vn float64_spv_source --glsl-version 450 -Olib Traceback (most recent call last): File "/home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/build/mesa3d-22.3.4/build/../src/util/glsl2spirv.py", line 175, in main() File "/home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/build/mesa3d-22.3.4/build/../src/util/glsl2spirv.py", line 171, in main process_file(args) File "/home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/build/mesa3d-22.3.4/build/../src/util/glsl2spirv.py", line 160, in process_file raise ShaderCompileError(message.strip()) ShaderCompileError: /bin/sh: 1: glslangValidator: not found [6/845] Compiling C object src/intel/vulkan/libanv_per_hw_ver90.a.p/genX_blorp_exec.c.o ninja: build stopped: subcommand failed. make[2]: *** [package/pkg-generic.mk:293: /home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/build/mesa3d-22.3.4/.stamp_built] Error 1 make[1]: *** [Makefile:82: _all] Error 2 make[1]: Leaving directory '/home/maus/projekte/thinroot-NUCs/thinroot/buildroot-2023.02-rc2' ? cut here ? Best Regards, Jens > Am 28.01.2023 um 22:45 schrieb Thomas Petazzoni via buildroot : > > commit: https://git.buildroot.net/buildroot/commit/?id=08b680f6718746eeabf2b4a18111a0991744cda3 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next > > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.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 c1765c3eaa..03bf635816 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 = 22.3.3 > +MESA3D_HEADERS_VERSION = 22.3.4 > 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 c2ceaa6ead..e4de997f0e 100644 > --- a/package/mesa3d/mesa3d.hash > +++ b/package/mesa3d/mesa3d.hash > @@ -1,5 +1,5 @@ > -# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000699.html > -sha256 bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922 mesa-22.3.3.tar.xz > -sha512 dcf166bc7c80e6ad09337e0188219e5ea4bdc558bc4b4ca35ce30d5421568f6b5328e5508b3175a2696521214e466354d8652ade22468ce448d9f61d5709c8a1 mesa-22.3.3.tar.xz > +# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html > +sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz > +sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz > # License > sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index 9fa2c05230..cf2352a355 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 = 22.3.3 > +MESA3D_VERSION = 22.3.4 > MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz > MESA3D_SITE = https://archive.mesa3d.org > MESA3D_LICENSE = MIT, SGI, Khronos > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Jens Maus, Dresden/Germany http://jens-maus.de/ From peter at korsgaard.com Tue Feb 28 15:47:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:47:18 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/xz: bump to version 5.2.10 Message-ID: <20230228155909.3047486D0D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5d7c229e43c95309692c33c5830a39cf5e2799a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit be3a6bf2e7130b084ec4ed65274ff7c4bf67510c) Signed-off-by: Peter Korsgaard --- package/xz/xz.hash | 3 ++- package/xz/xz.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 3aa68791fd..1153e02b4d 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,5 +1,6 @@ # Locally calculated after checking pgp signature -sha256 b65f1d0c2708e57716f4dd2216989a73847ac6fdb4168ffceb155767e22b834b xz-5.2.7.tar.bz2 +# https://tukaani.org/xz/xz-5.2.10.tar.bz2.sig +sha256 01b71df61521d9da698ce3c33148bff06a131628ff037398c09482f3a26e5408 xz-5.2.10.tar.bz2 # Hash for license files sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 004eea94b2..0120d23b85 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.2.7 +XZ_VERSION = 5.2.10 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 15:47:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:47:13 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/xz: bump to version 5.2.7 Message-ID: <20230228155909.2517286D0B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36f98b644c7d7376fdb6f3815f284cf8fff9ea14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Drop patch (already in version) https://git.tukaani.org/?p=xz.git;a=blob;f=NEWS;h=0205423e79ce8297102096b0fc8b030ddf5b2023;hb=d24a57b7fc7e5e9267b84367cb0788d3acf7f569 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 3ac7d91c874ae9212ae8aee400a194356e301169) Signed-off-by: Peter Korsgaard --- package/xz/xz.hash | 3 +-- package/xz/xz.mk | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 9577e98e80..3aa68791fd 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,6 +1,5 @@ # Locally calculated after checking pgp signature -sha256 5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df xz-5.2.5.tar.bz2 -sha256 98c6cb1042284fe704ec30083f3fc87364ce9ed2ea51f62bbb0ee9d3448717ec xzgrep-ZDI-CAN-16587.patch +sha256 b65f1d0c2708e57716f4dd2216989a73847ac6fdb4168ffceb155767e22b834b xz-5.2.7.tar.bz2 # Hash for license files sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING diff --git a/package/xz/xz.mk b/package/xz/xz.mk index cdb01e06a9..004eea94b2 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.2.5 +XZ_VERSION = 5.2.7 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES @@ -13,10 +13,6 @@ XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+ XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani -XZ_PATCH = xzgrep-ZDI-CAN-16587.patch -# xzgrep-ZDI-CAN-16587.patch -XZ_IGNORE_CVES += CVE-2022-1271 - ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) XZ_CONF_OPTS += --enable-threads else From peter at korsgaard.com Tue Feb 28 15:47:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:47:23 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/xz: fix microblaze compiles Message-ID: <20230228155909.3AFA186D0E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f260466243b3a87b11e6af3eb85b767a95f582f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Patch xz to check if __attribute__((symver ..)) is supported via a compile check during configure. Fixes: http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni (cherry picked from commit bed21bb9b462bece7cd1b9741643aa553ced4d35) Signed-off-by: Peter Korsgaard --- .../xz/0001-Detect-symver-attribute-support.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch new file mode 100644 index 0000000000..9ec43ea7a0 --- /dev/null +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -0,0 +1,61 @@ +From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 08:51:24 -0600 +Subject: [PATCH] Detect symver attribute support + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://github.com/tukaani-project/xz/pull/32 +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vincent Fazio +--- + configure.ac | 9 +++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5ad5589..08c623a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -791,6 +791,15 @@ else + time with Libtool if neither --with-pic nor + --without-pic is used). This define must be + used together with liblzma_linux.map.]) ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE( ++ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ])], ++ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], ++ [Define to 1 if GCC supports the symver attribute])], ++ []) ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic +diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h +index 11fec52..1d2ef9c 100644 +--- a/src/liblzma/common/common.h ++++ b/src/liblzma/common/common.h +@@ -76,7 +76,7 @@ + // too (which doesn't support __symver__) so use it to detect if __symver__ + // is available. This should be far more reliable than looking at compiler + // version macros as nowadays especially __GNUC__ is defined by many compilers. +-# if lzma_has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define LZMA_SYMVER_API(extnamever, type, intname) \ + extern __attribute__((__symver__(extnamever))) \ + LZMA_API(type) intname +-- +2.25.1 + From peter at korsgaard.com Tue Feb 28 15:51:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:51:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring Message-ID: <20230228155909.5124286D0B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ace092f8f372c6e68a05e93ca24831e0af73e8ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The vendoring done for cargo / go packages (may) need git, so ensure we check for it in dependencies, similar to how it is done for packages directly using git. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 8c8ee42bbe6ebb7f20978b06a581c42733197ae2) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6c3b64b4c8..a9b923fcbc 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1250,6 +1250,13 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD +# cargo/go vendoring (may) need git +ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),cargo) +DL_TOOLS_DEPENDENCIES += git +else ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),go) +DL_TOOLS_DEPENDENCIES += git +endif + DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. From peter at korsgaard.com Tue Feb 28 15:47:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:47:31 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/xz: patch configure due to microblaze patch Message-ID: <20230228155909.4533B86D10@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30f7426bce3fc340d3970d2e5e9e798257611466 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit bed21bb9b added a patch to change configure.ac but failed to update configure which caused build failures due to the timestamp difference between configure and configure.ac and the makefile attempting to run aclocal. XZ_AUTORECONF = YES creates a circular dependency where the host autotools need host-xz which also gets patched. Because of this, we need to patch xz's configure script manually and NOT patch configure.ac so its timestamp stays older than Makefile.in. While we're doing this, correct the language in the commit body of the patch, remove a stray whitespace, and fix the offset for configure.ac Fixes: bed21bb9b ("package/xz: fix microblaze compiles") Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685/ Signed-off-by: Vincent Fazio [Peter: Only patch configure] Signed-off-by: Peter Korsgaard (cherry picked from commit e5a83df8da04f5854c2e248e23dea3af620954cd) Signed-off-by: Peter Korsgaard --- .../xz/0001-Detect-symver-attribute-support.patch | 71 ++++++++++++---------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch index 9ec43ea7a0..462fa9d86b 100644 --- a/package/xz/0001-Detect-symver-attribute-support.patch +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -1,11 +1,11 @@ -From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From f0e0e8bd08b4d4e7c89a5a3b7d9a3c083f7e5432 Mon Sep 17 00:00:00 2001 From: Vincent Fazio -Date: Tue, 7 Feb 2023 08:51:24 -0600 +Date: Wed, 8 Feb 2023 12:58:37 +0000 Subject: [PATCH] Detect symver attribute support -On non-ELF platforms, such as microblaze, builds will fail when trying -to add symver information because __attribute__((symver ..)) is not -supported even though __has_attribute(__symver__) returns true. +On Microblaze, builds will fail when trying to add symver information +because __attribute__((symver ..)) is not supported even though +__has_attribute(__symver__) returns true. Support for symver needs to be detected via a compile test since __has_attribute can report false positives [0]. @@ -18,33 +18,16 @@ it is supported and define a variable to advertise support. Upstream: https://github.com/tukaani-project/xz/pull/32 Signed-off-by: Thomas Petazzoni Signed-off-by: Vincent Fazio +[Peter: patch configure instead of configure.ac so autoreconf isn't +triggered at build time] +Signed-off-by: Peter Korsgaard --- - configure.ac | 9 +++++++++ - src/liblzma/common/common.h | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) + configure | 15 +++++++++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 5ad5589..08c623a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -791,6 +791,15 @@ else - time with Libtool if neither --with-pic nor - --without-pic is used). This define must be - used together with liblzma_linux.map.]) -+ OLD_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE( -+ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } -+ ])], -+ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], -+ [Define to 1 if GCC supports the symver attribute])], -+ []) -+ CFLAGS="$OLD_CFLAGS" - ;; - *) - enable_symbol_versions=generic diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h -index 11fec52..1d2ef9c 100644 +index 671d3bc..27b56ee 100644 --- a/src/liblzma/common/common.h +++ b/src/liblzma/common/common.h @@ -76,7 +76,7 @@ @@ -52,10 +35,36 @@ index 11fec52..1d2ef9c 100644 // is available. This should be far more reliable than looking at compiler // version macros as nowadays especially __GNUC__ is defined by many compilers. -# if lzma_has_attribute(__symver__) -+# if defined(HAVE_SYMVER_ATTRIBUTE) ++# if defined(HAVE_SYMVER_ATTRIBUTE) # define LZMA_SYMVER_API(extnamever, type, intname) \ extern __attribute__((__symver__(extnamever))) \ LZMA_API(type) intname +diff --git a/configure b/configure +index ff0eed5..e685b30 100755 +--- a/configure ++++ b/configure +@@ -16687,6 +16687,21 @@ printf "%s\n" "" >&6; } + + printf "%s\n" "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h + ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO" ++then : ++ ++printf "%s\n" "#define HAVE_SYMVER_ATTRIBUTE 1" >>confdefs.h ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic -- -2.25.1 +2.34.1 From peter at korsgaard.com Tue Feb 28 15:52:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:52:38 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: ensure git is >= 2.0.0 for vendoring Message-ID: <20230228155909.5C38D86D0D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff9115673eb413e300aa7cb7e868413489d9024a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The go vendoring fails on CentOS 7 (which uses git 1.8.3.1) with errors related to shallow clones: make docker-compose-source .. go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 github.com/docker/compose/v2/pkg/mocks imports github.com/theupdateframework/notary/client imports github.com/docker/go/canonical/json: github.com/docker/go at v1.5.1-1.0.20160303222718-d30aec9fd63c: invalid pseudo-version: git fetch --unshallow -f origin in /home/jacmet/source/buildroot-mirror/output/host/share/go-path/pkg/mod/cache/vcs/48fbd2dfabec81f4c93170677bfc89087d4bec07a2d08f6ca5ce3d17962677ee: exit status 128: fatal: git fetch-pack: expected shallow list make[1]: *** [/home/jacmet/source/buildroot-mirror/output/build/docker-compose-2.15.1/.stamp_downloaded] Error 1 It works with git 2.0.0 (released May 2014, included in Debian 8), so check for >= 2.0.0 with logic similar to the GNU patch version check. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit f229564c36ec64c1f1292b7281ae0bd33840d7a4) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 3822f0ca0e..89ed3c9df9 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -183,6 +183,16 @@ for prog in perl tar wget cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do echo " xargs is usually part of the findutils package in your distribution" fi fi + + # we need git >= 2.0.0 for shallow clones / vendoring + if test $prog = "git" ; then + GIT_VERSION="$(git --version | sed -n 's/^git version \(.*\)/\1/p')" + GIT_MAJOR="$(echo "${GIT_VERSION}" | cut -d . -f 1)" + if [ "${GIT_MAJOR}" -lt 2 ]; then + echo "You have git '${GIT_VERSION}' installed. Git >= 2.0.0 is required" + exit 1 + fi + fi done if test "${missing_progs}" = "yes" ; then From peter at korsgaard.com Tue Feb 28 16:10:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:10:31 +0100 Subject: [Buildroot] [PATCH] package/libressl: security bump to version 3.6.2 In-Reply-To: <20230208075300.15464-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 8 Feb 2023 08:53:00 +0100") References: <20230208075300.15464-1-francois.perrad@gadz.org> Message-ID: <871qm9kbyg.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > security fix: > A malicious certificate revocation list or timestamp response token > would allow an attacker to read arbitrary memory. > Signed-off-by: Francois Perrad Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 16:12:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:12:30 +0100 Subject: [Buildroot] [git commit] utils/brmake: fix shellcheck errors In-Reply-To: <20230208142851.D0048846E3@busybox.osuosl.org> (Arnout Vandecappelle's message of "Wed, 8 Feb 2023 15:28:28 +0100") References: <20230208142851.D0048846E3@busybox.osuosl.org> Message-ID: <87wn41ixap.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > commit: https://git.buildroot.net/buildroot/commit/?id=dc364c6ae65d3167409380b8883123a55270b18d > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > In utils/brmake line 6: > local found ret start d h m mf > ^---^ SC2034: found appears unused. Verify use (or export if used externally). > In utils/brmake line 16: >> >( while read line; do > ^--^ SC2162: read without -r will mangle backslashes. > For both, the suggestions from shellcheck can be applied. > Signed-off-by: Arnout Vandecappelle Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 16:14:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:14:42 +0100 Subject: [Buildroot] [PATCH 1/1] boot/afboot-stm32: disable stack-protector In-Reply-To: <20230208165605.73b2b986@windsurf> (Thomas Petazzoni via buildroot's message of "Wed, 8 Feb 2023 16:56:05 +0100") References: <20221231101451.521367-1-fontaine.fabrice@gmail.com> <20230208165605.73b2b986@windsurf> Message-ID: <87sfepix71.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Sat, 31 Dec 2022 11:14:51 +0100 > Fabrice Fontaine wrote: >> Disable stack-protector to avoid the following build failure: >> >> /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld >> -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf >> stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o >> /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: >> stm32f469i-disco.o: in function `main': >> stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' >> /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: >> stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference >> to `__stack_chk_fail' >> /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: >> stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference >> to `__stack_chk_guard' >> >> Fixes: >> - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 >> >> Signed-off-by: Fabrice Fontaine >> --- >> ...003-Makefile-disable-stack-protector.patch | 36 +++++++++++++++++++ >> 1 file changed, 36 insertions(+) >> create mode 100644 boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch > Applied to master, thanks. Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 16:15:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:15:40 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: security bump to version 1.1.1t In-Reply-To: <20230208162534.28581-1-ps.report@gmx.net> (Peter Seiderer's message of "Wed, 8 Feb 2023 17:25:34 +0100") References: <20230208162534.28581-1-ps.report@gmx.net> Message-ID: <87o7pdix5f.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Changelog (for details see [1] and [2]): > Changes between 1.1.1s and 1.1.1t [7 Feb 2023] > *) Fixed X.400 address type confusion in X.509 GeneralName. > There is a type confusion vulnerability relating to X.400 address processing > inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING > but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This > vulnerability may allow an attacker who can provide a certificate chain and > CRL (neither of which need have a valid signature) to pass arbitrary > pointers to a memcmp call, creating a possible read primitive, subject to > some constraints. Refer to the advisory for more information. Thanks to > David Benjamin for discovering this issue. (CVE-2023-0286) > This issue has been fixed by changing the public header file definition of > GENERAL_NAME so that x400Address reflects the implementation. It was not > possible for any existing application to successfully use the existing > definition; however, if any application references the x400Address field > (e.g. in dead code), note that the type of this field has changed. There is > no ABI change. > [Hugo Landau] > *) Fixed Use-after-free following BIO_new_NDEF. > The public API function BIO_new_NDEF is a helper function used for > streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL > to support the SMIME, CMS and PKCS7 streaming capabilities, but may also > be called directly by end user applications. > The function receives a BIO from the caller, prepends a new BIO_f_asn1 > filter BIO onto the front of it to form a BIO chain, and then returns > the new head of the BIO chain to the caller. Under certain conditions, > for example if a CMS recipient public key is invalid, the new filter BIO > is freed and the function returns a NULL result indicating a failure. > However, in this case, the BIO chain is not properly cleaned up and the > BIO passed by the caller still retains internal pointers to the previously > freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO > then a use-after-free will occur. This will most likely result in a crash. > (CVE-2023-0215) > [Viktor Dukhovni, Matt Caswell] > *) Fixed Double free after calling PEM_read_bio_ex. > The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and > decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload > data. If the function succeeds then the "name_out", "header" and "data" > arguments are populated with pointers to buffers containing the relevant > decoded data. The caller is responsible for freeing those buffers. It is > possible to construct a PEM file that results in 0 bytes of payload data. > In this case PEM_read_bio_ex() will return a failure code but will populate > the header argument with a pointer to a buffer that has already been freed. > If the caller also frees this buffer then a double free will occur. This > will most likely lead to a crash. > The functions PEM_read_bio() and PEM_read() are simple wrappers around > PEM_read_bio_ex() and therefore these functions are also directly affected. > These functions are also called indirectly by a number of other OpenSSL > functions including PEM_X509_INFO_read_bio_ex() and > SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL > internal uses of these functions are not vulnerable because the caller does > not free the header argument if PEM_read_bio_ex() returns a failure code. > (CVE-2022-4450) > [Kurt Roeckx, Matt Caswell] > *) Fixed Timing Oracle in RSA Decryption. > A timing based side channel exists in the OpenSSL RSA Decryption > implementation which could be sufficient to recover a plaintext across > a network in a Bleichenbacher style attack. To achieve a successful > decryption an attacker would have to be able to send a very large number > of trial messages for decryption. The vulnerability affects all RSA padding > modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. > (CVE-2022-4304) > [Dmitry Belyavsky, Hubert Kario] > Changes between 1.1.1r and 1.1.1s [1 Nov 2022] > *) Fixed a regression introduced in 1.1.1r version not refreshing the > certificate data to be signed before signing the certificate. > [Gibeom Gwon] > Changes between 1.1.1q and 1.1.1r [11 Oct 2022] > *) Fixed the linux-mips64 Configure target which was missing the > SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that > platform. > [Adam Joseph] > *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was > causing incorrect results in some cases as a result. > [Paul Dale] > *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to > report correct results in some cases > [Matt Caswell] > *) Fixed a regression introduced in 1.1.1o for re-signing certificates with > different key sizes > [Todd Short] > *) Added the loongarch64 target > [Shi Pujin] > *) Fixed a DRBG seed propagation thread safety issue > [Bernd Edlinger] > *) Fixed a memory leak in tls13_generate_secret > [Bernd Edlinger] > *) Fixed reported performance degradation on aarch64. Restored the > implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid > 32-bit lane assignment in CTR mode") for 64bit targets only, since it is > reportedly 2-17% slower and the silicon errata only affects 32bit targets. > The new algorithm is still used for 32 bit targets. > [Bernd Edlinger] > *) Added a missing header for memcmp that caused compilation failure on some > platforms > [Gregor Jasny] > [1] https://www.openssl.org/news/cl111.txt > [2] https://www.openssl.org/news/vulnerabilities.html > Signed-off-by: Peter Seiderer Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 16:16:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:16:32 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: update e-mail for Frank Vanbever In-Reply-To: <20230208164447.A0B178477B@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Wed, 8 Feb 2023 17:43:31 +0100") References: <20230208164447.A0B178477B@busybox.osuosl.org> Message-ID: <87h6v5ix3z.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=416213be39c6adb860a9d3e85f0a634139c27cac > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Signed-off-by: Frank Vanbever > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 16:12:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:12:08 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] utils/brmake: fix shellcheck errors Message-ID: <20230228161657.CF48D86D40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6444c034e31f359bfb33a4333994861a87f7fab0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x In utils/brmake line 6: local found ret start d h m mf ^---^ SC2034: found appears unused. Verify use (or export if used externally). In utils/brmake line 16: > >( while read line; do ^--^ SC2162: read without -r will mangle backslashes. For both, the suggestions from shellcheck can be applied. Signed-off-by: Arnout Vandecappelle (cherry picked from commit dc364c6ae65d3167409380b8883123a55270b18d) Signed-off-by: Peter Korsgaard --- utils/brmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/brmake b/utils/brmake index e30119dd10..70dfb6cdc8 100755 --- a/utils/brmake +++ b/utils/brmake @@ -3,7 +3,7 @@ # License: WTFPL, https://spdx.org/licenses/WTFPL.html main() { - local found ret start d h m mf + local ret start d h m mf if ! which unbuffer >/dev/null 2>&1; then printf "you need to install 'unbuffer' (from package expect or expect-dev)\n" >&2 @@ -13,7 +13,7 @@ main() { start=${SECONDS} ( exec 2>&1; unbuffer make "${@}"; ) \ - > >( while read line; do + > >( while read -r line; do printf "%(%Y-%m-%dT%H:%M:%S)T %s\n" -1 "${line}" done \ |tee -a br.log \ From peter at korsgaard.com Tue Feb 28 16:16:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:16:24 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] DEVELOPERS: update e-mail for Frank Vanbever Message-ID: <20230228161657.F29FA86D47@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5e528e048c44e6abbd0ac52d044cbc1a083d1f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni (cherry picked from commit 416213be39c6adb860a9d3e85f0a634139c27cac) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1ff3c6e5dc..3c4bcdb223 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1027,7 +1027,7 @@ F: package/ucl/ F: package/upx/ F: package/zxing-cpp/ -N: Frank Vanbever +N: Frank Vanbever F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ From peter at korsgaard.com Tue Feb 28 16:15:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:15:19 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/libopenssl: security bump to version 1.1.1t Message-ID: <20230228161658.AB33186D47@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d50aa1b2c82f8f5f3b4081b393ed183701cdfa0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Changelog (for details see [1] and [2]): Changes between 1.1.1s and 1.1.1t [7 Feb 2023] *) Fixed X.400 address type confusion in X.509 GeneralName. There is a type confusion vulnerability relating to X.400 address processing inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This vulnerability may allow an attacker who can provide a certificate chain and CRL (neither of which need have a valid signature) to pass arbitrary pointers to a memcmp call, creating a possible read primitive, subject to some constraints. Refer to the advisory for more information. Thanks to David Benjamin for discovering this issue. (CVE-2023-0286) This issue has been fixed by changing the public header file definition of GENERAL_NAME so that x400Address reflects the implementation. It was not possible for any existing application to successfully use the existing definition; however, if any application references the x400Address field (e.g. in dead code), note that the type of this field has changed. There is no ABI change. [Hugo Landau] *) Fixed Use-after-free following BIO_new_NDEF. The public API function BIO_new_NDEF is a helper function used for streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL to support the SMIME, CMS and PKCS7 streaming capabilities, but may also be called directly by end user applications. The function receives a BIO from the caller, prepends a new BIO_f_asn1 filter BIO onto the front of it to form a BIO chain, and then returns the new head of the BIO chain to the caller. Under certain conditions, for example if a CMS recipient public key is invalid, the new filter BIO is freed and the function returns a NULL result indicating a failure. However, in this case, the BIO chain is not properly cleaned up and the BIO passed by the caller still retains internal pointers to the previously freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO then a use-after-free will occur. This will most likely result in a crash. (CVE-2023-0215) [Viktor Dukhovni, Matt Caswell] *) Fixed Double free after calling PEM_read_bio_ex. The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload data. If the function succeeds then the "name_out", "header" and "data" arguments are populated with pointers to buffers containing the relevant decoded data. The caller is responsible for freeing those buffers. It is possible to construct a PEM file that results in 0 bytes of payload data. In this case PEM_read_bio_ex() will return a failure code but will populate the header argument with a pointer to a buffer that has already been freed. If the caller also frees this buffer then a double free will occur. This will most likely lead to a crash. The functions PEM_read_bio() and PEM_read() are simple wrappers around PEM_read_bio_ex() and therefore these functions are also directly affected. These functions are also called indirectly by a number of other OpenSSL functions including PEM_X509_INFO_read_bio_ex() and SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL internal uses of these functions are not vulnerable because the caller does not free the header argument if PEM_read_bio_ex() returns a failure code. (CVE-2022-4450) [Kurt Roeckx, Matt Caswell] *) Fixed Timing Oracle in RSA Decryption. A timing based side channel exists in the OpenSSL RSA Decryption implementation which could be sufficient to recover a plaintext across a network in a Bleichenbacher style attack. To achieve a successful decryption an attacker would have to be able to send a very large number of trial messages for decryption. The vulnerability affects all RSA padding modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. (CVE-2022-4304) [Dmitry Belyavsky, Hubert Kario] Changes between 1.1.1r and 1.1.1s [1 Nov 2022] *) Fixed a regression introduced in 1.1.1r version not refreshing the certificate data to be signed before signing the certificate. [Gibeom Gwon] Changes between 1.1.1q and 1.1.1r [11 Oct 2022] *) Fixed the linux-mips64 Configure target which was missing the SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that platform. [Adam Joseph] *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was causing incorrect results in some cases as a result. [Paul Dale] *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to report correct results in some cases [Matt Caswell] *) Fixed a regression introduced in 1.1.1o for re-signing certificates with different key sizes [Todd Short] *) Added the loongarch64 target [Shi Pujin] *) Fixed a DRBG seed propagation thread safety issue [Bernd Edlinger] *) Fixed a memory leak in tls13_generate_secret [Bernd Edlinger] *) Fixed reported performance degradation on aarch64. Restored the implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid 32-bit lane assignment in CTR mode") for 64bit targets only, since it is reportedly 2-17% slower and the silicon errata only affects 32bit targets. The new algorithm is still used for 32 bit targets. [Bernd Edlinger] *) Added a missing header for memcmp that caused compilation failure on some platforms [Gregor Jasny] [1] https://www.openssl.org/news/cl111.txt [2] https://www.openssl.org/news/vulnerabilities.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 040896bd4338f7ca419766578db49af154b762c7) 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 8457df6c0a..ebc56b11dd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1q.tar.gz.sha256 -sha256 d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca openssl-1.1.1q.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 +sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index fc22c20467..6e84f06175 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1q +LIBOPENSSL_VERSION = 1.1.1t LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Tue Feb 28 16:00:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:00:13 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/libressl: security bump to version 3.6.2 Message-ID: <20230228161658.8C78E86D40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13702acd003f951069c57fa1028c7b93c10c7394 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x security fix: A malicious certificate revocation list or timestamp response token would allow an attacker to read arbitrary memory. Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 02f80f5c224a1d8830fab48ae0c19a9e28f2c082) 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 0988e6a36d..907b9cdd06 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 acfac61316e93b919c28d62d53037ca734de85c46b4d703f19fd8395cf006774 libressl-3.6.1.tar.gz +sha256 4be80fff073746cf50b4a8e5babe2795acae98c6b132a9e02519b445dfbfd033 libressl-3.6.2.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 8fd7bccbc4..b5fae7e26e 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.6.1 +LIBRESSL_VERSION = 3.6.2 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 Tue Feb 28 16:15:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:15:13 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libopenssl: security bump to version 1.1.1t Message-ID: <20230228161657.E7FEA86D45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbff67534b32f8cbdad108ded4df0aacbfa42e0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Changelog (for details see [1] and [2]): Changes between 1.1.1s and 1.1.1t [7 Feb 2023] *) Fixed X.400 address type confusion in X.509 GeneralName. There is a type confusion vulnerability relating to X.400 address processing inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This vulnerability may allow an attacker who can provide a certificate chain and CRL (neither of which need have a valid signature) to pass arbitrary pointers to a memcmp call, creating a possible read primitive, subject to some constraints. Refer to the advisory for more information. Thanks to David Benjamin for discovering this issue. (CVE-2023-0286) This issue has been fixed by changing the public header file definition of GENERAL_NAME so that x400Address reflects the implementation. It was not possible for any existing application to successfully use the existing definition; however, if any application references the x400Address field (e.g. in dead code), note that the type of this field has changed. There is no ABI change. [Hugo Landau] *) Fixed Use-after-free following BIO_new_NDEF. The public API function BIO_new_NDEF is a helper function used for streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL to support the SMIME, CMS and PKCS7 streaming capabilities, but may also be called directly by end user applications. The function receives a BIO from the caller, prepends a new BIO_f_asn1 filter BIO onto the front of it to form a BIO chain, and then returns the new head of the BIO chain to the caller. Under certain conditions, for example if a CMS recipient public key is invalid, the new filter BIO is freed and the function returns a NULL result indicating a failure. However, in this case, the BIO chain is not properly cleaned up and the BIO passed by the caller still retains internal pointers to the previously freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO then a use-after-free will occur. This will most likely result in a crash. (CVE-2023-0215) [Viktor Dukhovni, Matt Caswell] *) Fixed Double free after calling PEM_read_bio_ex. The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload data. If the function succeeds then the "name_out", "header" and "data" arguments are populated with pointers to buffers containing the relevant decoded data. The caller is responsible for freeing those buffers. It is possible to construct a PEM file that results in 0 bytes of payload data. In this case PEM_read_bio_ex() will return a failure code but will populate the header argument with a pointer to a buffer that has already been freed. If the caller also frees this buffer then a double free will occur. This will most likely lead to a crash. The functions PEM_read_bio() and PEM_read() are simple wrappers around PEM_read_bio_ex() and therefore these functions are also directly affected. These functions are also called indirectly by a number of other OpenSSL functions including PEM_X509_INFO_read_bio_ex() and SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL internal uses of these functions are not vulnerable because the caller does not free the header argument if PEM_read_bio_ex() returns a failure code. (CVE-2022-4450) [Kurt Roeckx, Matt Caswell] *) Fixed Timing Oracle in RSA Decryption. A timing based side channel exists in the OpenSSL RSA Decryption implementation which could be sufficient to recover a plaintext across a network in a Bleichenbacher style attack. To achieve a successful decryption an attacker would have to be able to send a very large number of trial messages for decryption. The vulnerability affects all RSA padding modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. (CVE-2022-4304) [Dmitry Belyavsky, Hubert Kario] Changes between 1.1.1r and 1.1.1s [1 Nov 2022] *) Fixed a regression introduced in 1.1.1r version not refreshing the certificate data to be signed before signing the certificate. [Gibeom Gwon] Changes between 1.1.1q and 1.1.1r [11 Oct 2022] *) Fixed the linux-mips64 Configure target which was missing the SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that platform. [Adam Joseph] *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was causing incorrect results in some cases as a result. [Paul Dale] *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to report correct results in some cases [Matt Caswell] *) Fixed a regression introduced in 1.1.1o for re-signing certificates with different key sizes [Todd Short] *) Added the loongarch64 target [Shi Pujin] *) Fixed a DRBG seed propagation thread safety issue [Bernd Edlinger] *) Fixed a memory leak in tls13_generate_secret [Bernd Edlinger] *) Fixed reported performance degradation on aarch64. Restored the implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid 32-bit lane assignment in CTR mode") for 64bit targets only, since it is reportedly 2-17% slower and the silicon errata only affects 32bit targets. The new algorithm is still used for 32 bit targets. [Bernd Edlinger] *) Added a missing header for memcmp that caused compilation failure on some platforms [Gregor Jasny] [1] https://www.openssl.org/news/cl111.txt [2] https://www.openssl.org/news/vulnerabilities.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 040896bd4338f7ca419766578db49af154b762c7) 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 8457df6c0a..ebc56b11dd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1q.tar.gz.sha256 -sha256 d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca openssl-1.1.1q.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 +sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index fc22c20467..6e84f06175 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1q +LIBOPENSSL_VERSION = 1.1.1t LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Tue Feb 28 16:14:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:14:32 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] boot/afboot-stm32: disable stack-protector Message-ID: <20230228161657.DA55686D42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b97988c0e5acaead9b18790cad8b96092efa56f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Disable stack-protector to avoid the following build failure: /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c33a133704166d602090b0b0d394aa9428e6acd4) Signed-off-by: Peter Korsgaard --- .../0003-Makefile-disable-stack-protector.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch new file mode 100644 index 0000000000..27a81b45d5 --- /dev/null +++ b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch @@ -0,0 +1,36 @@ +From d65b07d6fe438e760fdbc33a8e42650a27d5b417 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 11:09:38 +0100 +Subject: [PATCH] Makefile: disable stack-protector + +Disable stack-protector to avoid the following build failure: + +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': +stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 8f42be1..8da7a25 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ CFLAGS := -mthumb -mcpu=cortex-m4 + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Os -std=gnu99 -Wall + CFLAGS += -fno-builtin ++CFLAGS += -fno-stack-protector + LINKERFLAGS := --gc-sections + + obj-y += gpio.o mpu.o qspi.o start_kernel.o +-- +2.35.1 + From peter at korsgaard.com Tue Feb 28 16:12:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:12:19 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] utils/brmake: fix shellcheck errors Message-ID: <20230228161658.961C486D42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76f2ec3f3dff67bdf4c89eb541d09ad964808f67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x In utils/brmake line 6: local found ret start d h m mf ^---^ SC2034: found appears unused. Verify use (or export if used externally). In utils/brmake line 16: > >( while read line; do ^--^ SC2162: read without -r will mangle backslashes. For both, the suggestions from shellcheck can be applied. Signed-off-by: Arnout Vandecappelle (cherry picked from commit dc364c6ae65d3167409380b8883123a55270b18d) Signed-off-by: Peter Korsgaard --- utils/brmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/brmake b/utils/brmake index e30119dd10..70dfb6cdc8 100755 --- a/utils/brmake +++ b/utils/brmake @@ -3,7 +3,7 @@ # License: WTFPL, https://spdx.org/licenses/WTFPL.html main() { - local found ret start d h m mf + local ret start d h m mf if ! which unbuffer >/dev/null 2>&1; then printf "you need to install 'unbuffer' (from package expect or expect-dev)\n" >&2 @@ -13,7 +13,7 @@ main() { start=${SECONDS} ( exec 2>&1; unbuffer make "${@}"; ) \ - > >( while read line; do + > >( while read -r line; do printf "%(%Y-%m-%dT%H:%M:%S)T %s\n" -1 "${line}" done \ |tee -a br.log \ From peter at korsgaard.com Tue Feb 28 16:16:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:16:17 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] DEVELOPERS: update e-mail for Frank Vanbever Message-ID: <20230228161658.B715386D40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ad9e059909f3b1cb463a48d7986a0f2776b8f53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni (cherry picked from commit 416213be39c6adb860a9d3e85f0a634139c27cac) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 7df31b1fdb..4647b1429e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1070,7 +1070,7 @@ F: package/ucl/ F: package/upx/ F: package/zxing-cpp/ -N: Frank Vanbever +N: Frank Vanbever F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ From peter at korsgaard.com Tue Feb 28 16:13:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:13:52 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] boot/afboot-stm32: disable stack-protector Message-ID: <20230228161658.9FC4786D45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80a82c28962ed243801f98bf23bf99f155b053e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Disable stack-protector to avoid the following build failure: /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c33a133704166d602090b0b0d394aa9428e6acd4) Signed-off-by: Peter Korsgaard --- .../0003-Makefile-disable-stack-protector.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch new file mode 100644 index 0000000000..27a81b45d5 --- /dev/null +++ b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch @@ -0,0 +1,36 @@ +From d65b07d6fe438e760fdbc33a8e42650a27d5b417 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 11:09:38 +0100 +Subject: [PATCH] Makefile: disable stack-protector + +Disable stack-protector to avoid the following build failure: + +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': +stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 8f42be1..8da7a25 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ CFLAGS := -mthumb -mcpu=cortex-m4 + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Os -std=gnu99 -Wall + CFLAGS += -fno-builtin ++CFLAGS += -fno-stack-protector + LINKERFLAGS := --gc-sections + + obj-y += gpio.o mpu.o qspi.o start_kernel.o +-- +2.35.1 + From peter at korsgaard.com Tue Feb 28 16:18:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:18:54 +0100 Subject: [Buildroot] [PATCH] package/rtl8723ds: change CFLAGS approach In-Reply-To: <20230208202816.3089d72d@windsurf> (Thomas Petazzoni via buildroot's message of "Wed, 8 Feb 2023 20:28:16 +0100") References: <20221213211313.735422-1-giulio.benetti@benettiengineering.com> <20230208202816.3089d72d@windsurf> Message-ID: <87cz5tix01.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Tue, 13 Dec 2022 22:13:13 +0100 > Giulio Benetti wrote: >> Instead of undefine endiannes CFLAGS let's change approach. >> Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default >> involving the endianness to be set to little. This way we can set the >> CFLAGS according to architecture with some default define like: >> -DCONFIG_IOCTL_CFG80211 >> -DRTW_USE_CFG80211_STA_EVENT >> -Wno-error >> >> Suggested-by: Arnout Vandecappelle >> Signed-off-by: Giulio Benetti >> --- >> package/rtl8723ds/rtl8723ds.mk | 9 +++++---- >> 1 file changed, 5 insertions(+), 4 deletions(-) > Applied to master, thanks. Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 16:18:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:18:23 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/rtl8723ds: change CFLAGS approach Message-ID: <20230228161909.58CA986D47@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e157c87919e6fbe6ad102ab3268045eec8bd3b74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Instead of undefining endiannes CFLAGS let's change the approach. Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default involving the endianness to be set to little. This way we can set the CFLAGS according to architecture with some default define like: -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -Wno-error Suggested-by: Arnout Vandecappelle Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 672544148b3cafa1cda47cd6e4b88210fc693e14) Signed-off-by: Peter Korsgaard --- package/rtl8723ds/rtl8723ds.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 7e27fa75ea..f303a24041 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -8,12 +8,14 @@ RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 -# Undefine the hardcoded CONFIG_LITTLE_ENDIAN -RTL8723DS_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN -# Set endianness -RTL8723DS_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN +RTL8723DS_USER_EXTRA_CLAGS = \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error RTL8723DS_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_I386_PC=n \ CONFIG_RTL8723DS=m \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) \ From raphael.pavlidis at gmail.com Tue Feb 28 16:51:17 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Tue, 28 Feb 2023 17:51:17 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> <20230222232157.380b6109@windsurf> <20230228130843.GC32199@carcass.dev.6wind.com> Message-ID: <886d6be9-94ba-2bc9-5583-4c9400bf3a76@gmail.com> Hi Stephane, On 28.02.23 15:38, stephane gonauer wrote: > Hi, > [SNIP] > > The issue can be reproduce with a simpler configuration. Enabling both > BR2_PACKAGE_LINUX_PAM and BR2_PACKAGE_SHADOW breaks the login. > Here follow a defconfig that reproduces the issue : Does it only happens if BR2_PACKAGE_LINUX_PAM **and** BR2_PACKAGE_SHADOW is enabled? > > /etc/pam.d reference a system-auth that is not present anywhere in the > build directory. This might be the root cause but I'm not sure how to > properly test. If system-auth is only located in /usr/share/factory/etc/pam.d/ and not also in /etc/pam.d/ during boot then something is wrong with the systemd-tmpfiles service. > > --------------- > uildroot/configs$ cat qemu_x86_64_defconfig > BR2_x86_64=y [SNIP] I am not so fit in qemu. Can you provide me the qemu command, so I can reproduce it, please? Thanks, Raphael Pavlidis From stephane.gonauer at 6wind.com Tue Feb 28 17:03:20 2023 From: stephane.gonauer at 6wind.com (stephane gonauer) Date: Tue, 28 Feb 2023 18:03:20 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: <886d6be9-94ba-2bc9-5583-4c9400bf3a76@gmail.com> References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> <20230222232157.380b6109@windsurf> <20230228130843.GC32199@carcass.dev.6wind.com> <886d6be9-94ba-2bc9-5583-4c9400bf3a76@gmail.com> Message-ID: Hi, Yes it also occurs with BR2_PACKAGE_LINUX_PAM **and** BR2_PACKAGE_SHADOW shadow doesn't install /etc/pam.d/system-auth Manually adding the one issued from systemd into the target folder solves the issue. What would be the good way to go ? Adding a patch that installs a system-auth to the shadow package ? And then what should be its content ? The same as the systemd file ? St?phane Le mar. 28 f?vr. 2023 ? 17:51, Raphael Pavlidis a ?crit : > > Hi Stephane, > > On 28.02.23 15:38, stephane gonauer wrote: > > Hi, > > > [SNIP] > > > > The issue can be reproduce with a simpler configuration. Enabling both > > BR2_PACKAGE_LINUX_PAM and BR2_PACKAGE_SHADOW breaks the login. > > Here follow a defconfig that reproduces the issue : > > Does it only happens if BR2_PACKAGE_LINUX_PAM **and** BR2_PACKAGE_SHADOW > is enabled? > > > > > /etc/pam.d reference a system-auth that is not present anywhere in the > > build directory. This might be the root cause but I'm not sure how to > > properly test. > > If system-auth is only located in /usr/share/factory/etc/pam.d/ and not > also in /etc/pam.d/ during boot then something is wrong with the > systemd-tmpfiles service. > > > > > --------------- > > uildroot/configs$ cat qemu_x86_64_defconfig > > BR2_x86_64=y > [SNIP] > > I am not so fit in qemu. Can you provide me the qemu command, so I can > reproduce it, please? > > > Thanks, > Raphael Pavlidis From stephane.gonauer at 6wind.com Tue Feb 28 17:10:17 2023 From: stephane.gonauer at 6wind.com (stephane gonauer) Date: Tue, 28 Feb 2023 18:10:17 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> <20230222232157.380b6109@windsurf> <20230228130843.GC32199@carcass.dev.6wind.com> <886d6be9-94ba-2bc9-5583-4c9400bf3a76@gmail.com> Message-ID: Hi, If my previous email is not clear : - qemu_x86_64_defconfig + BR2_PACKAGE_SHADOW -> works - qemu_x86_64_defconfig + BR2_PACKAGE_SHADOW + BR2_PACKAGE_LINUX_PAM -> fails and there is no "system-auth" file anywhere in the build - qemu_x86_64_defconfig + BR2_PACKAGE_SHADOW + BR2_PACKAGE_LINUX_PAM + BR2_INIT_SYSTEMD-> fails, system-auth is not in /etc/pam.d in the target folder. I don't know what happen at runtime (because I cannot login) in that case I also find target/usr/share/factory/etc/pam.d/system-auth Do you think with/without systemd case should be fixed differently ? In any case the missing file seems to be /etc/pam.d/system-auth. St?phane Le mar. 28 f?vr. 2023 ? 18:03, stephane gonauer a ?crit : > > Hi, > > Yes it also occurs with BR2_PACKAGE_LINUX_PAM **and** BR2_PACKAGE_SHADOW > shadow doesn't install /etc/pam.d/system-auth > > Manually adding the one issued from systemd into the target folder > solves the issue. > > What would be the good way to go ? > Adding a patch that installs a system-auth to the shadow package ? And > then what should be its content ? The same as the systemd file ? > > St?phane > > Le mar. 28 f?vr. 2023 ? 17:51, Raphael Pavlidis > a ?crit : > > > > Hi Stephane, > > > > On 28.02.23 15:38, stephane gonauer wrote: > > > Hi, > > > > > [SNIP] > > > > > > The issue can be reproduce with a simpler configuration. Enabling both > > > BR2_PACKAGE_LINUX_PAM and BR2_PACKAGE_SHADOW breaks the login. > > > Here follow a defconfig that reproduces the issue : > > > > Does it only happens if BR2_PACKAGE_LINUX_PAM **and** BR2_PACKAGE_SHADOW > > is enabled? > > > > > > > > /etc/pam.d reference a system-auth that is not present anywhere in the > > > build directory. This might be the root cause but I'm not sure how to > > > properly test. > > > > If system-auth is only located in /usr/share/factory/etc/pam.d/ and not > > also in /etc/pam.d/ during boot then something is wrong with the > > systemd-tmpfiles service. > > > > > > > > --------------- > > > uildroot/configs$ cat qemu_x86_64_defconfig > > > BR2_x86_64=y > > [SNIP] > > > > I am not so fit in qemu. Can you provide me the qemu command, so I can > > reproduce it, please? > > > > > > Thanks, > > Raphael Pavlidis From peter at korsgaard.com Tue Feb 28 20:10:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:10:37 +0100 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: Build with ninja In-Reply-To: <20230209170707.4066903-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 9 Feb 2023 18:07:05 +0100") References: <20230209170707.4066903-1-peter@korsgaard.com> Message-ID: <878rghim9u.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Webkitgtk needs cmake >= 3.20 when building with the make backend since > webkitgtk 3.8.0. > Cmake 3.20 is above our minimal version in > support/dependencies/check-host-cmake.mk, so this breaks builds on hosts > with cmake >= 3.18 < 3.20 - So use the ninja backend instead. > https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 20:10:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:10:43 +0100 Subject: [Buildroot] [PATCH 2/2] package/wpewebkit: Build with ninja In-Reply-To: <20230209170707.4066903-2-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 9 Feb 2023 18:07:06 +0100") References: <20230209170707.4066903-1-peter@korsgaard.com> <20230209170707.4066903-2-peter@korsgaard.com> Message-ID: <874jr5im9o.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Wpewebkit needs cmake >= 3.20 when building with the make backend since > wpewebkit 3.8.0. > Cmake 3.20 is above our minimal version in > support/dependencies/check-host-cmake.mk, so this breaks builds on hosts > with cmake >= 3.18 < 3.20 - So use the ninja backend instead. > https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 17:34:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:34:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/webkitgtk: security bump to version 2.38.4 Message-ID: <20230228201056.0E26186D8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79a25cdeee1f2f0712103f9719d254c2f1564ec7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://webkitgtk.org/2023/02/02/webkitgtk2.38.4-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit ca203080d132d44fc0b62148066b85cce66628fa) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index eff7f5c18f..34fd19d3de 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums -md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz -sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz -sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums +md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz +sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz +sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 1c8ad31176..cc80ad8649 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.3 +WEBKITGTK_VERSION = 2.38.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 17:33:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:33:51 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/webkitgtk: security bump to version 2.38.3 Message-ID: <20230228201056.04D3586D8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7fafc34c8953c5abd93c79495e03f20d4820dd18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Bugfix release, with a security patch for CVE-2022-42799, CVE-2022-42823, CVE-2022-42824, CVE-2022-42852, CVE-2022-42856, CVE-2022-42863, CVE-2022-42867, CVE-2022-46691, CVE-2022-46692, CVE-2022-46698, CVE-2022-46699 and CVE-2022-46700. Release notes: https://webkitgtk.org/2022/10/20/webkitgtk2.38.1-released.html https://webkitgtk.org/2022/11/04/webkitgtk2.38.2-released.html https://webkitgtk.org/2022/12/22/webkitgtk2.38.3-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2022-0010.html https://webkitgtk.org/security/WSA-2022-0011.html Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard (cherry picked from commit d64a089a64aff7c8cbf197beea460d644646243d) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index c2512be9c6..eff7f5c18f 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.0.tar.xz.sums -md5 a69cd8fc05f7299458b4faf1bc99b875 webkitgtk-2.38.0.tar.xz -sha1 6dcb65b8dc56c52f086bfeecfca7920e9cc78348 webkitgtk-2.38.0.tar.xz -sha256 f9ce6375a3b6e1329b0b609f46921e2627dc7ad6224b37b967ab2ea643bc0fbd webkitgtk-2.38.0.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums +md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz +sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz +sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 69e96e33c6..1c8ad31176 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.0 +WEBKITGTK_VERSION = 2.38.3 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 17:34:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:34:14 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/webkitgtk: Build with ninja Message-ID: <20230228201056.174EF86D90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5934348516e1c72fd5ab4f1a91c7503e67c3d079 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard (cherry picked from commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index cc80ad8649..1cefc3a472 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -133,4 +133,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# webkitgtk needs cmake >= 3.20 when not building with ninja, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WEBKITGTK_CONF_OPTS += -GNinja +WEBKITGTK_DEPENDENCIES += host-ninja + +define WEBKITGTK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + $(eval $(cmake-package)) From peter at korsgaard.com Tue Feb 28 17:36:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:36:03 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wpewebkit: security bump to version 2.38.4 Message-ID: <20230228201056.354AD86D8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4dfc6797e845678fff52bd7f2f16a2ce7f0af68f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.4.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit 02ace135ee0d31d30021cd000d0594bb6360ca94) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index ccd928b3df..dcd082e045 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums -md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz -sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz -sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums +md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz +sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz +sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b2bbc0301b..54f37fd702 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.3 +WPEWEBKIT_VERSION = 2.38.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 17:35:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:35:52 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wpewebkit: security bump to version 2.38.3 Message-ID: <20230228201056.2BA3A86D91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a5776f1a89e6e6e5fb833116f97af8bccc509a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Bugfix release, with security fixes for CVE-2022-42852, CVE-2022-42856, CVE-2022-42867, CVE-2022-46691, CVE-2022-46692, CVE-2022-46698, CVE-2022-46699, CVE-2022-46700, CVE-2022-42823, and CVE-2022-42799. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.3.html https://wpewebkit.org/release/wpewebkit-2.38.2.html https://wpewebkit.org/release/wpewebkit-2.38.1.html Accompanying security advisories: https://wpewebkit.org/security/WSA-2022-0011.html https://wpewebkit.org/security/WSA-2022-0010.html Additionally, the update brings in important bug fixes for the Bubblewrap sandbox support, scrolling in certain web sites, multimedia playback, and build fixes. Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit d8bbc215f5b6c978e9506927675181bbda06567f) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 5dd64b34b7..ccd928b3df 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.0.tar.xz.sums -md5 e0e6b98c86351c39e41da475afc50780 wpewebkit-2.38.0.tar.xz -sha1 66e6dd1c285a21ce50370fb4d60332838d801663 wpewebkit-2.38.0.tar.xz -sha256 e653e12eca63e6371c06d4cd9efcd5492db67f7d9ef324fd5d8668b1151e72b2 wpewebkit-2.38.0.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums +md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz +sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz +sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 001c701ee9..b2bbc0301b 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.0 +WPEWEBKIT_VERSION = 2.38.3 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 17:35:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:35:32 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wpewebkit: bump to version 2.38.0 Message-ID: <20230228201056.214B686D8D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08c10193ec536ddd10d32dbcfc67f91f3d75951c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Update to a new major release which brings in improvements and a few new features. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.0.html This release also includes security fixes for CVE-2022-32886, CVE-2022-32891, and CVE-2022-32912. Accompanying security advisory: https://wpewebkit.org/security/WSA-2022-0009.html Both building documentation and support for gobject-introspection have been added in this release. Version 2.38.0 also introduces a new WebRTC implementation based on GstWebRTC. Options for them are explicitly left disabled to keep the configuration as it was, and may be enabled in follow-up patches. Lastly, the SILENCE_CROSS_COMPILATION_NOTICES option removed because it no longer exists. The patch that fixes the build on 32-bit ARM targets is also updated for the 2.38 release series. Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit 917f05975f9c60eca92988ea9974de55a9e91e44) Signed-off-by: Peter Korsgaard --- ...NEON.cpp-fails-to-build-NEON-fast-path-se.patch | 30 ++++++++++++++++------ package/wpewebkit/wpewebkit.hash | 8 +++--- package/wpewebkit/wpewebkit.mk | 8 +++--- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch index b61909b2ac..ea1676abb6 100644 --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch @@ -1,4 +1,4 @@ -From 59c9e3a4aeb4753be97b3817d106816d9a4ebe73 Mon Sep 17 00:00:00 2001 +From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 11:19:06 +0300 Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems @@ -35,15 +35,28 @@ left for a follow-up fix. Signed-off-by: Adrian Perez de Castro [Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182] --- + Source/WebCore/Sources.txt | 1 + .../cpu/arm/filters/FELightingNEON.cpp | 4 +- - .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- + .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- .../graphics/filters/DistantLightSource.h | 4 ++ .../platform/graphics/filters/FELighting.h | 7 --- .../graphics/filters/PointLightSource.h | 4 ++ .../graphics/filters/SpotLightSource.h | 4 ++ .../software/FELightingSoftwareApplier.h | 16 ++++++ - 7 files changed, 56 insertions(+), 35 deletions(-) + 8 files changed, 58 insertions(+), 36 deletions(-) +diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt +index 8ce3510fe1a8..efd56bcb8746 100644 +--- a/Source/WebCore/Sources.txt ++++ b/Source/WebCore/Sources.txt +@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp + platform/graphics/WOFFFileFormat.cpp + platform/graphics/WidthIterator.cpp + platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp ++platform/graphics/cpu/arm/filters/FELightingNEON.cpp + platform/graphics/displaylists/DisplayList.cpp + platform/graphics/displaylists/DisplayListDrawingContext.cpp + platform/graphics/displaylists/DisplayListItems.cpp diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp index f6ff8c20a5a8..42a97ffc5372 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp @@ -67,7 +80,7 @@ index f6ff8c20a5a8..42a97ffc5372 100644 // Calling a powf function from the assembly code would require to save // and reload a lot of NEON registers. Since the base is in range [0..1] diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index b17c603d40d3..e4629cda0b7c 100644 +index b17c603d40d3..c6d17f573eca 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h @@ -24,14 +24,15 @@ @@ -98,9 +111,10 @@ index b17c603d40d3..e4629cda0b7c 100644 { - alignas(16) FELightingFloatArgumentsForNeon floatArguments; - FELightingPaintingDataForNeon neonData = { +- data.pixels->data(), + WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; + WebCore::FELightingPaintingDataForNeon neonData = { - data.pixels->data(), ++ data.pixels->bytes(), 1, - data.widthDecreasedByOne - 1, - data.heightDecreasedByOne - 1, @@ -244,7 +258,7 @@ index 0c073bc13f8c..e0db00545c17 100644 float m_surfaceScale; float m_diffuseConstant; diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h -index 5c9c7fb783e6..e53aa012ac1c 100644 +index 126b3b2350f6..d906db21aa9c 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ @@ -259,7 +273,7 @@ index 5c9c7fb783e6..e53aa012ac1c 100644 class PointLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h -index 04e331ec4ec0..763c8d400b00 100644 +index 641b205f986d..64380d9b6eb8 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ @@ -274,7 +288,7 @@ index 04e331ec4ec0..763c8d400b00 100644 class SpotLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h -index 3875b0a4b5de..6d3864aafb9a 100644 +index c974d92115ff..e2896660cfbd 100644 --- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h @@ -36,6 +36,7 @@ diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 9c8beecf2e..5dd64b34b7 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.36.8.tar.xz.sums -md5 939dc646bb6652fde9a5b6512c17fc58 wpewebkit-2.36.8.tar.xz -sha1 f45936c578f7dcfbb6064e87da6c098efe093e68 wpewebkit-2.36.8.tar.xz -sha256 8d42a349c910b2d0961b8d34fecef29cec3d21e3af5977346c90026692dc75eb wpewebkit-2.36.8.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.0.tar.xz.sums +md5 e0e6b98c86351c39e41da475afc50780 wpewebkit-2.38.0.tar.xz +sha1 66e6dd1c285a21ce50370fb4d60332838d801663 wpewebkit-2.38.0.tar.xz +sha256 e653e12eca63e6371c06d4cd9efcd5492db67f7d9ef324fd5d8668b1151e72b2 wpewebkit-2.38.0.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 0ff8204519..001c701ee9 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.36.8 +WPEWEBKIT_VERSION = 2.38.0 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -22,9 +22,11 @@ WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ -DENABLE_ACCESSIBILITY=OFF \ -DENABLE_API_TESTS=OFF \ + -DENABLE_DOCUMENTATION=OFF \ + -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=OFF \ - -DUSE_SOUP2=ON \ - -DSILENCE_CROSS_COMPILATION_NOTICES=ON + -DENABLE_WEB_RTC=OFF \ + -DUSE_SOUP2=ON ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) WPEWEBKIT_CONF_OPTS += \ From peter at korsgaard.com Tue Feb 28 17:36:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:36:10 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wpewebkit: Build with ninja Message-ID: <20230228201056.3EC8386D8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5048dfff7c72660d9e7fc934713ed43849fb6c4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard (cherry picked from commit 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 54f37fd702..b9c2fef395 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -103,4 +103,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# wpewebkit needs cmake >= 3.20 when building with the make backend, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WPEWEBKIT_CONF_OPTS += -GNinja +WPEWEBKIT_DEPENDENCIES += host-ninja + +define WPEWEBKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + $(eval $(cmake-package)) From peter at korsgaard.com Tue Feb 28 17:32:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:32:35 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/webkitgtk: bump to version 2.38.0 Message-ID: <20230228201055.EEE7686D8D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba4de93b333c6e7f8578171d4b9a28dbbd5abd7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Update to a new major release which brings in improvements and a few new features. Release notes: https://webkitgtk.org/2022/09/16/webkitgtk2.38.0-released.html This release also includes security fixes for CVE-2022-32886, CVE-2022-32891, and CVE-2022-32912. Accompanying security advisory: https://webkitgtk.org/security/WSA-2022-0009.html The CMake option to build the documentation has been renamed from ENABLE_GTK_DOC to ENABLE_DOCUMENTATION, therefore update the build recipe accordingly. Option USE_LIBNOTIFY is no longer available, as WebKit now uses the notification portal D-Bus API directly without relying on libnotify. Lastly, version 2.38.0 introduces a new WebRTC implementation based on GstWebRTC which is left disabled for now to keep the existing status quo (WebRTC not available), and adding an option to enable it can be done in a follow-up patch. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit ce4b87be82d13d3a042b4e78fe5835f3c8ddc29d) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 7c6d7d65b5..c2512be9c6 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.36.7.tar.xz.sums -md5 466351cf35e4f742590919380b5dee93 webkitgtk-2.36.7.tar.xz -sha1 36078148b6e0ef002f0279b25b1caf173f851ac8 webkitgtk-2.36.7.tar.xz -sha256 0c260cf2b32f0481d017670dfed1b61e554967cd067195606c9f9eb5fe731743 webkitgtk-2.36.7.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.0.tar.xz.sums +md5 a69cd8fc05f7299458b4faf1bc99b875 webkitgtk-2.38.0.tar.xz +sha1 6dcb65b8dc56c52f086bfeecfca7920e9cc78348 webkitgtk-2.38.0.tar.xz +sha256 f9ce6375a3b6e1329b0b609f46921e2627dc7ad6224b37b967ab2ea643bc0fbd webkitgtk-2.38.0.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index d1c517452d..69e96e33c6 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.36.7 +WEBKITGTK_VERSION = 2.38.0 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -19,12 +19,12 @@ WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \ WEBKITGTK_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ -DENABLE_GAMEPAD=OFF \ + -DENABLE_DOCUMENTATION=OFF \ -DENABLE_GEOLOCATION=OFF \ - -DENABLE_GTKDOC=OFF \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ + -DENABLE_WEB_RTC=OFF \ -DPORT=GTK \ - -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ -DUSE_SOUP2=ON \ From peter at korsgaard.com Tue Feb 28 16:23:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:23:41 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/webkitgtk: Build with ninja Message-ID: <20230228201209.1CFC186D98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f27eea92640b6e0e75196c983085a2e61fbaf551 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard (cherry picked from commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b1bca7b88a..22845af8b4 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -139,4 +139,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# webkitgtk needs cmake >= 3.20 when not building with ninja, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WEBKITGTK_CONF_OPTS += -GNinja +WEBKITGTK_DEPENDENCIES += host-ninja + +define WEBKITGTK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + $(eval $(cmake-package)) From peter at korsgaard.com Tue Feb 28 16:23:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:23:58 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/wpewebkit: Build with ninja Message-ID: <20230228201209.3068686D99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d80c54ba7bfad405a472d47330b91ebe417b5af9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard (cherry picked from commit 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b2bbc0301b..8ddee503e0 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -103,4 +103,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# wpewebkit needs cmake >= 3.20 when building with the make backend, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WPEWEBKIT_CONF_OPTS += -GNinja +WPEWEBKIT_DEPENDENCIES += host-ninja + +define WPEWEBKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + $(eval $(cmake-package)) From peter at korsgaard.com Tue Feb 28 20:21:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:21:06 +0100 Subject: [Buildroot] [git commit] configs/asus_tinker_rk3288: fix boot by prepending tpl to spl+u-boot In-Reply-To: <20230210223129.C431885174@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Fri, 10 Feb 2023 23:29:10 +0100") References: <20230210223129.C431885174@busybox.osuosl.org> Message-ID: <87ttz5h77x.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=e738d5b7251918a62922f3f3b6491b642f9ec182 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > During the last U-boot version bump it's not been noted that the TPL > was not prepended to SPL anymore preventing the board to boot, so > let's copy TPL to the image folder, prepend it to u-boot-spl-dtb.bin > and place it at offset 32KB, where RK3288 bootrom expects to find > it. Let's also place u-boot-dtb separated from SPL at offset 8M, where > the SPL expects it to find it. > Signed-off-by: Giulio Benetti > Signed-off-by: Thomas Petazzoni This is presumably the case since commit cb3b484505d6e1 (configs/asus_tinker_rk3288: bump to Linux kernel 5.14.13 and u-boot 2021.10), so committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 20:22:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:22:34 +0100 Subject: [Buildroot] [git commit] board/asus/tinker: rename label linux-next to linux in extlinux.conf In-Reply-To: <20230210223129.CE5C585178@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Fri, 10 Feb 2023 23:30:08 +0100") References: <20230210223129.CE5C585178@busybox.osuosl.org> Message-ID: <87pm9th75h.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=d4b46bc3c6997e32050b332d7578f0cb289b57be > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > We're not using next branch so let's rename label linux-next to linux. > Signed-off-by: Giulio Benetti > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From ju.o at free.fr Tue Feb 28 20:27:20 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 28 Feb 2023 21:27:20 +0100 Subject: [Buildroot] [PATCH next 1/1] package/openmpi: bump to version 4.1.5 Message-ID: <20230228202720.6762-1-ju.o@free.fr> For change log, see: https://github.com/open-mpi/ompi/blob/v4.1.5/NEWS#L61 Signed-off-by: Julien Olivain --- Patch tested on branch next at commit b793f3a with commands: make check-package ... 0 warnings generated utils/test-pkg -a -p openmpi arm-aarch64 [ 1/45]: OK bootlin-aarch64-glibc [ 2/45]: OK bootlin-arcle-hs38-uclibc [ 3/45]: OK bootlin-armv5-uclibc [ 4/45]: OK bootlin-armv7-glibc [ 5/45]: OK bootlin-armv7m-uclibc [ 6/45]: SKIPPED bootlin-armv7-musl [ 7/45]: OK bootlin-m68k-5208-uclibc [ 8/45]: SKIPPED bootlin-m68k-68040-uclibc [ 9/45]: OK bootlin-microblazeel-uclibc [10/45]: OK bootlin-mipsel32r6-glibc [11/45]: OK bootlin-mipsel-uclibc [12/45]: OK bootlin-nios2-glibc [13/45]: OK bootlin-openrisc-uclibc [14/45]: OK bootlin-powerpc64le-power8-glibc [15/45]: OK bootlin-powerpc-e500mc-uclibc [16/45]: OK bootlin-riscv32-glibc [17/45]: OK bootlin-riscv64-glibc [18/45]: OK bootlin-riscv64-musl [19/45]: OK bootlin-s390x-z13-glibc [20/45]: OK bootlin-sh4-uclibc [21/45]: OK bootlin-sparc64-glibc [22/45]: OK bootlin-sparc-uclibc [23/45]: SKIPPED bootlin-x86-64-glibc [24/45]: OK bootlin-x86-64-musl [25/45]: OK bootlin-x86-64-uclibc [26/45]: OK bootlin-xtensa-uclibc [27/45]: OK br-arm-basic [28/45]: SKIPPED br-arm-full-nothread [29/45]: SKIPPED br-arm-full-static [30/45]: SKIPPED br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [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-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 7 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/openmpi/openmpi.hash | 6 +++--- package/openmpi/openmpi.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openmpi/openmpi.hash b/package/openmpi/openmpi.hash index 745ed7c580..567ffe4833 100644 --- a/package/openmpi/openmpi.hash +++ b/package/openmpi/openmpi.hash @@ -1,6 +1,6 @@ # From: https://www.open-mpi.org/software/ompi/v4.1/ -md5 f057e12aabaf7dd5a6a658180fca404e openmpi-4.1.4.tar.bz2 -sha1 357c61a8e06e103d987c0e4a054e8780a034c8b1 openmpi-4.1.4.tar.bz2 -sha256 92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d openmpi-4.1.4.tar.bz2 +md5 bb045df2d600744c2231c78b31a20da3 openmpi-4.1.5.tar.bz2 +sha1 eba2e6f9ee0c39fbca0a8cf53a79c9ed29643284 openmpi-4.1.5.tar.bz2 +sha256 a640986bc257389dd379886fdae6264c8cfa56bc98b71ce3ae3dfbd8ce61dbe3 openmpi-4.1.5.tar.bz2 # Locally computed sha256 2db71de9577ebfe15c186605844c470dcecd3717f4ef0118c9440d801c0f58f8 LICENSE diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index f14b55ced5..82a4b3eb1c 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -5,7 +5,7 @@ ################################################################################ OPENMPI_VERSION_MAJOR = 4.1 -OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).4 +OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).5 OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2 OPENMPI_LICENSE = BSD-3-Clause @@ -15,7 +15,7 @@ OPENMPI_INSTALL_STAGING = YES # The macro searching for IME (Infinite Memory Engine) filesystem # brings "-I/usr/local/include" in the CPPFLAGS, even if not # found. This makes the configuration fail. See: -# https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 +# https://github.com/open-mpi/ompi/blob/v4.1.5/config/ompi_check_ime.m4#L35 # Disable explicitly to avoid the issue. OPENMPI_CONF_OPTS = --without-ime -- 2.39.2 From peter at korsgaard.com Tue Feb 28 20:34:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:34:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/ssdp-responder; drop systemd unit installation, not needed In-Reply-To: <20230210184704.3381562-1-troglobit@gmail.com> (Joachim Wiberg's message of "Fri, 10 Feb 2023 19:47:04 +0100") References: <20230210184704.3381562-1-troglobit@gmail.com> Message-ID: <87lekhh6l0.fsf@dell.be.48ers.dk> >>>>> "Joachim" == Joachim Wiberg writes: > When systemd is enabled the ssdp-responder build system already installs > the unit file, with the correct name, so we can safely drop this. > This fixes the recurring autobuilder problems that cropped up the last > week+ or so after fixing the spelling error in 6e0ba6b. > - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 > - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 > - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 > - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 > - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 > Signed-off-by: Joachim Wiberg Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 20:34:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:34:30 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/ssdp-responder; drop systemd unit installation, not needed Message-ID: <20230228203520.8342F86DB0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d613d478ee2e4f16cf68e508451d1a26a7a612a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x When systemd is enabled the ssdp-responder build system already installs the unit file, with the correct name, so we can safely drop this. This fixes the recurring autobuilder problems that cropped up the last week+ or so after fixing the spelling error in 6e0ba6b. - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni (cherry picked from commit d6e3d36a85f19acedd2ed58f5b8616dbf24f57a4) Signed-off-by: Peter Korsgaard --- package/ssdp-responder/ssdp-responder.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index d878e3c629..9b477e48cc 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,9 +25,4 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service -endef - $(eval $(autotools-package)) From peter at korsgaard.com Tue Feb 28 20:21:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:21:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] configs/asus_tinker_rk3288: fix boot by prepending tpl to spl+u-boot Message-ID: <20230228203520.6C6E686DAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=305b06687d312159deeb162d3288d0e9e47c7a16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x During the last U-boot version bump it's not been noted that the TPL was not prepended to SPL anymore preventing the board to boot, so let's copy TPL to the image folder, prepend it to u-boot-spl-dtb.bin and place it at offset 32KB, where RK3288 bootrom expects to find it. Let's also place u-boot-dtb separated from SPL at offset 8M, where the SPL expects it to find it. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit e738d5b7251918a62922f3f3b6491b642f9ec182) Signed-off-by: Peter Korsgaard --- board/asus/tinker/genimage.cfg | 11 +++++++++-- board/asus/tinker/post-build.sh | 4 ++-- configs/asus_tinker_rk3288_defconfig | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/board/asus/tinker/genimage.cfg b/board/asus/tinker/genimage.cfg index a4b1e8d608..fa7fd734f2 100644 --- a/board/asus/tinker/genimage.cfg +++ b/board/asus/tinker/genimage.cfg @@ -2,12 +2,19 @@ image sdcard.img { hdimage { } - partition u-boot-spl-dtb { + partition u-boot-tpl-spl-dtb { in-partition-table = "no" - image = "u-boot-spl-dtb.img" + image = "u-boot-tpl-spl-dtb.img" offset = 32K } + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 8M + size = 30M + } + partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/asus/tinker/post-build.sh b/board/asus/tinker/post-build.sh index 8108ed83ff..ffbbcdeb58 100755 --- a/board/asus/tinker/post-build.sh +++ b/board/asus/tinker/post-build.sh @@ -3,7 +3,7 @@ MKIMAGE=$HOST_DIR/bin/mkimage BOARD_DIR="$(dirname $0)" -$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img -cat $BINARIES_DIR/u-boot-dtb.bin >> $BINARIES_DIR/u-boot-spl-dtb.img +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl-dtb.bin > $BINARIES_DIR/u-boot-tpl-spl-dtb.img install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 6963fa939f..02b340a7f1 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y From peter at korsgaard.com Tue Feb 28 20:22:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:22:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] board/asus/tinker: rename label linux-next to linux in extlinux.conf Message-ID: <20230228203520.76EB586DAF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72697a95c72d02cf852a1f59d9d48351deff2f08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x We're not using next branch so let's rename label linux-next to linux. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit d4b46bc3c6997e32050b332d7578f0cb289b57be) Signed-off-by: Peter Korsgaard --- board/asus/tinker/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf index 136af0debd..bb96ddb893 100644 --- a/board/asus/tinker/extlinux.conf +++ b/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ -label Tinker linux-next +label Tinker linux kernel /boot/uImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait From peter at korsgaard.com Tue Feb 28 20:22:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:22:15 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] board/asus/tinker: rename label linux-next to linux in extlinux.conf Message-ID: <20230228203626.AF86686DBA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00bc11c84f85363679bf79f52c048eb5c1752416 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x We're not using next branch so let's rename label linux-next to linux. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit d4b46bc3c6997e32050b332d7578f0cb289b57be) Signed-off-by: Peter Korsgaard --- board/asus/tinker/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf index 136af0debd..bb96ddb893 100644 --- a/board/asus/tinker/extlinux.conf +++ b/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ -label Tinker linux-next +label Tinker linux kernel /boot/uImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait From peter at korsgaard.com Tue Feb 28 20:15:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:15:03 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] configs/asus_tinker_rk3288: fix boot by prepending tpl to spl+u-boot Message-ID: <20230228203626.A60C086DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a31551e52ac74366786d943541b889bf33eba14f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x During the last U-boot version bump it's not been noted that the TPL was not prepended to SPL anymore preventing the board to boot, so let's copy TPL to the image folder, prepend it to u-boot-spl-dtb.bin and place it at offset 32KB, where RK3288 bootrom expects to find it. Let's also place u-boot-dtb separated from SPL at offset 8M, where the SPL expects it to find it. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit e738d5b7251918a62922f3f3b6491b642f9ec182) Signed-off-by: Peter Korsgaard --- board/asus/tinker/genimage.cfg | 11 +++++++++-- board/asus/tinker/post-build.sh | 4 ++-- configs/asus_tinker_rk3288_defconfig | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/board/asus/tinker/genimage.cfg b/board/asus/tinker/genimage.cfg index a4b1e8d608..fa7fd734f2 100644 --- a/board/asus/tinker/genimage.cfg +++ b/board/asus/tinker/genimage.cfg @@ -2,12 +2,19 @@ image sdcard.img { hdimage { } - partition u-boot-spl-dtb { + partition u-boot-tpl-spl-dtb { in-partition-table = "no" - image = "u-boot-spl-dtb.img" + image = "u-boot-tpl-spl-dtb.img" offset = 32K } + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 8M + size = 30M + } + partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/asus/tinker/post-build.sh b/board/asus/tinker/post-build.sh index 8108ed83ff..ffbbcdeb58 100755 --- a/board/asus/tinker/post-build.sh +++ b/board/asus/tinker/post-build.sh @@ -3,7 +3,7 @@ MKIMAGE=$HOST_DIR/bin/mkimage BOARD_DIR="$(dirname $0)" -$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img -cat $BINARIES_DIR/u-boot-dtb.bin >> $BINARIES_DIR/u-boot-spl-dtb.img +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl-dtb.bin > $BINARIES_DIR/u-boot-tpl-spl-dtb.img install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 6963fa939f..02b340a7f1 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y From peter at korsgaard.com Tue Feb 28 20:31:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:31:08 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/ssdp-responder; drop systemd unit installation, not needed Message-ID: <20230228203626.B8FA386DBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25b3c5ecb6c5043676f3bed8a5923279989994c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x When systemd is enabled the ssdp-responder build system already installs the unit file, with the correct name, so we can safely drop this. This fixes the recurring autobuilder problems that cropped up the last week+ or so after fixing the spelling error in 6e0ba6b. - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni (cherry picked from commit d6e3d36a85f19acedd2ed58f5b8616dbf24f57a4) Signed-off-by: Peter Korsgaard --- package/ssdp-responder/ssdp-responder.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index d878e3c629..9b477e48cc 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,9 +25,4 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service -endef - $(eval $(autotools-package)) From raphael.pavlidis at gmail.com Tue Feb 28 20:38:57 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Tue, 28 Feb 2023 21:38:57 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> <20230222232157.380b6109@windsurf> <20230228130843.GC32199@carcass.dev.6wind.com> <886d6be9-94ba-2bc9-5583-4c9400bf3a76@gmail.com> Message-ID: <16816a3d-c62a-c1e9-9409-78541956b1ba@gmail.com> Hi Stephane, On 28.02.23 18:10, stephane gonauer wrote: > Hi, > > If my previous email is not clear : > > - qemu_x86_64_defconfig + BR2_PACKAGE_SHADOW -> works > - qemu_x86_64_defconfig + BR2_PACKAGE_SHADOW + BR2_PACKAGE_LINUX_PAM > -> fails and there is no "system-auth" file anywhere in the build > - qemu_x86_64_defconfig + BR2_PACKAGE_SHADOW + BR2_PACKAGE_LINUX_PAM > + BR2_INIT_SYSTEMD-> fails, system-auth is not in /etc/pam.d in the > target folder. I don't know what happen at runtime (because I cannot > login) in that case I also find > target/usr/share/factory/etc/pam.d/system-auth Thanks for the clarification. > > Do you think with/without systemd case should be fixed differently ? > In any case the missing file seems to be /etc/pam.d/system-auth. Yes, the file is present with systemd, but it is not copied during boot by systemd-tmpfiles.service. > > St?phane > [SNIP] Would you like to tell me, which command you are using with QEMU? I would like to check, what happened (if I find the time to). Thanks, Raphael Pavlidis From peter at korsgaard.com Tue Feb 28 20:39:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:39:06 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/wpewebkit: security bump to version 2.38.4 Message-ID: <20230228204338.A1DB786DC3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4313220d768a359ff1c688c19dd1d6a2f37322e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.4.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit 02ace135ee0d31d30021cd000d0594bb6360ca94) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index ccd928b3df..dcd082e045 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums -md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz -sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz -sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums +md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz +sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz +sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 8ddee503e0..b9c2fef395 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.3 +WPEWEBKIT_VERSION = 2.38.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 20:38:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:38:45 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/webkitgtk: security bump to version 2.38.4 Message-ID: <20230228204338.97D5786DC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c486d4fa4a53c28e83f28af7e6e6ecd855ba9a7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://webkitgtk.org/2023/02/02/webkitgtk2.38.4-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit ca203080d132d44fc0b62148066b85cce66628fa) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index eff7f5c18f..34fd19d3de 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums -md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz -sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz -sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums +md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz +sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz +sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 22845af8b4..a6974db926 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.3 +WEBKITGTK_VERSION = 2.38.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 20:47:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:47:36 +0100 Subject: [Buildroot] [git commit] package/nodejs: add patch to adjust default NodeJS search path In-Reply-To: <20230210231402.BA856852D1@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 11 Feb 2023 00:11:29 +0100") References: <20230210231402.BA856852D1@busybox.osuosl.org> Message-ID: <87h6v5h5zr.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=0de216f95fc28c57cc430f39f011d5f88ead083b > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > By default, NodeJS searches global modules in /usr/lib/node, but NPM > installs them in /usr/lib/node_modules/. Therefore by default, if one > installs modules with BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL, they are > not accessible by NodeJS, unless by passing a > NODE_PATH=/usr/lib/node_modules/ variable. Since this is not obvious, > and it's nicer when things work out of the box, we simply patch NodeJS > to look for modules at the right place. > See > https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package > for some discussions on this topic. > Signed-off-by: Thomas Petazzoni > Reviewed-by: Romain Naour > Signed-off-by: Yann E. MORIN Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 20:56:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:56:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 In-Reply-To: <20230211183142.397167-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 11 Feb 2023 19:31:42 +0100") References: <20230211183142.397167-1-bernd.kuhls@t-online.de> Message-ID: <87cz5th5k4.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003321.html > Fixes CVE-2023-0494: > https://lists.x.org/archives/xorg-announce/2023-February/003320.html > Signed-off-by: Bernd Kuhls Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 21:05:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:05:43 +0100 Subject: [Buildroot] [PATCH] support/dependencies/dependencies.sh: require diagnostics perl package for mosh In-Reply-To: <20230210150456.4535-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 10 Feb 2023 16:04:56 +0100") References: <20230210150456.4535-1-peter@korsgaard.com> Message-ID: <878rghh55k.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ > scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: > make[3]: Entering directory > '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' > perl -Mdiagnostics -c ./mosh.pl > Can't locate diagnostics.pm in @INC (you may need to install the > diagnostics module) (@INC contains: > /home/buildroot/autobuild/instance-2/output-1/host/lib/perl > /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 > /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl > /usr/lib64/perl5 /usr/share/perl5). > BEGIN failed--compilation aborted. > So add a check for it in dependencies.sh similar to the other perl modules. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 21:13:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:13:55 +0100 Subject: [Buildroot] [PATCH 1/2] support/download: catch post-process errors In-Reply-To: <20230210223143.1060114-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Fri, 10 Feb 2023 23:31:42 +0100") References: <20230210223143.1060114-1-yann.morin.1998@free.fr> Message-ID: <874jr5h4rw.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Currently, when the post-process helper fails while downloading from > upstream, there is no fallback to the backup mirror. > In case the post-process helper fails, we mut consider that to be a > download failure, so we must bail out as if the download backend itself > did fail, but we fail to do so. > Duplicate the logic we have for the download helper: if the post-process > helper fails, remove the downloaded stuff, and continue on to the next > URI, which will ultimately hit the backup mirror (if one has been > configured). > Reported-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From bernd.kuhls at t-online.de Tue Feb 28 21:22:15 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 28 Feb 2023 22:22:15 +0100 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.4 References: <20230220205242.72DA9828C8@busybox.osuosl.org> Message-ID: Am Tue, 28 Feb 2023 16:48:51 +0100 schrieb Jens Maus via buildroot: > Sorry if replying to this mail does not seem to be appropriate, but I > just tested the latest Buildroot 2023.02-rc2 version and noticed that > the builds of the mesa3d package immediately stopped working because in > 22.3.x version of mesa3d the ?glslangValidator? tool seem to be a new > dependency of mesa3d and the Buildroot package does not install this > host tool itself (no gaslang-tools package), thus the build fails if the > build host itself does not have this build tool installed. Hi Jens, do these patches fix the problem? http://patchwork.ozlabs.org/project/buildroot/list/?series=333585 Regards, Bernd From peter at korsgaard.com Tue Feb 28 20:45:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:45:45 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/nodejs: add patch to adjust default NodeJS search path Message-ID: <20230228212455.1765086DDA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d326dc09d6b119454a09b383ae08d1a6986c28d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x By default, NodeJS searches global modules in /usr/lib/node, but NPM installs them in /usr/lib/node_modules/. Therefore by default, if one installs modules with BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL, they are not accessible by NodeJS, unless by passing a NODE_PATH=/usr/lib/node_modules/ variable. Since this is not obvious, and it's nicer when things work out of the box, we simply patch NodeJS to look for modules at the right place. See https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package for some discussions on this topic. Signed-off-by: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 0de216f95fc28c57cc430f39f011d5f88ead083b) Signed-off-by: Peter Korsgaard --- ...l-modules-cjs-loader.js-adjust-default-pa.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch new file mode 100644 index 0000000000..5b93998e5e --- /dev/null +++ b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch @@ -0,0 +1,36 @@ +From a31425bdfcb5d695ab25c3d295898326784cffec Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 25 Sep 2022 11:10:06 +0200 +Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to + search modules + +NPM installs modules in /usr/lib/node_modules/, but by default NodeJS +searches for them only in /usr/lib/node/. We could also set the +NODE_PATH environment variable, but it is more convienient to have +NodeJS configured by default to find modules where they are installed. + +This issue is discussed at +https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package. + +Signed-off-by: Thomas Petazzoni +--- + lib/internal/modules/cjs/loader.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js +index f1971c40a4..5fe3884156 100644 +--- a/lib/internal/modules/cjs/loader.js ++++ b/lib/internal/modules/cjs/loader.js +@@ -1261,7 +1261,8 @@ Module._initPaths = function() { + path.resolve(process.execPath, '..') : + path.resolve(process.execPath, '..', '..'); + +- const paths = [path.resolve(prefixDir, 'lib', 'node')]; ++ const paths = [path.resolve(prefixDir, 'lib', 'node'), ++ path.resolve(prefixDir, 'lib', 'node_modules')]; + + if (homeDir) { + ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); +-- +2.37.3 + From peter at korsgaard.com Tue Feb 28 20:55:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:55:39 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 Message-ID: <20230228212455.2166B86DDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a2b638bc58b76aa9e4f347191bf10b68bcc3c0c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003321.html Fixes CVE-2023-0494: https://lists.x.org/archives/xorg-announce/2023-February/003320.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit d8f0c02574b485e3250030d8cbf5c057ced578a7) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 0c3c807ff3..e2a2a251c3 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003310.html -sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz -sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003321.html +sha256 d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb xorg-server-21.1.7.tar.xz +sha512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5 xorg-server-21.1.7.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 04eb5e90b7..33b35b7979 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.6 +XSERVER_XORG_SERVER_VERSION = 21.1.7 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From peter at korsgaard.com Tue Feb 28 21:12:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:12:21 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/download: catch post-process errors Message-ID: <20230228212455.3672B86DDD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f8b83f5e4ff3484fc39987652c31e1847ac1725 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes: http://autobuild.buildroot.net/results/12a/12a63ae177fe3ed0c9a1ef2fa01870f334f36b0f/ Currently, when the post-process helper fails while downloading from upstream, there is no fallback to the backup mirror. In case the post-process helper fails, we must consider that to be a download failure, so we must bail out as if the download backend itself did fail, but we fail to do so. Duplicate the logic we have for the download helper: if the post-process helper fails, remove the downloaded stuff, and continue on to the next URI, which will ultimately hit the backup mirror (if one has been configured). Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit a39116b5dba6cf0695620e2ba5302f21fa80a4a5) Signed-off-by: Peter Korsgaard --- support/download/dl-wrapper | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 09a6ac1f1a..1e8d6058f6 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -138,9 +138,15 @@ main() { fi if [ -n "${post_process}" ] ; then - "${OLDPWD}/support/download/${post_process}-post-process" \ - -o "${tmpf}" \ - -n "${raw_base_name}" + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + then + # cd back to keep path coherence + cd "${OLDPWD}" + rm -rf "${tmpd}" + continue + fi fi # cd back to free the temp-dir, so we can remove it later From peter at korsgaard.com Tue Feb 28 20:57:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:57:18 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: require diagnostics perl package for mosh Message-ID: <20230228212455.2C31886DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57a66d1f60a8b585555299dac705e091c890a857 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes: http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' perl -Mdiagnostics -c ./mosh.pl Can't locate diagnostics.pm in @INC (you may need to install the diagnostics module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5). BEGIN failed--compilation aborted. So add a check for it in dependencies.sh similar to the other perl modules. Signed-off-by: Peter Korsgaard (cherry picked from commit 5be2d9bb621e3f3aa552516c8887a7821ed62788) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 89ed3c9df9..70e951a7e6 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -290,6 +290,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules diagnostics" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From peter at korsgaard.com Tue Feb 28 20:57:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:57:09 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: require diagnostics perl package for mosh Message-ID: <20230228212610.3FB9E86DEB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=470dd91a5a7fa04993656c099ec17ab91f85e3b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes: http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' perl -Mdiagnostics -c ./mosh.pl Can't locate diagnostics.pm in @INC (you may need to install the diagnostics module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5). BEGIN failed--compilation aborted. So add a check for it in dependencies.sh similar to the other perl modules. Signed-off-by: Peter Korsgaard (cherry picked from commit 5be2d9bb621e3f3aa552516c8887a7821ed62788) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 89ed3c9df9..70e951a7e6 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -290,6 +290,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules diagnostics" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From peter at korsgaard.com Tue Feb 28 21:09:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:09:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/download: catch post-process errors Message-ID: <20230228212610.4A75886DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f9cbe8bc85ac6234c628c1a8ca04bda796fb7d0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes: http://autobuild.buildroot.net/results/12a/12a63ae177fe3ed0c9a1ef2fa01870f334f36b0f/ Currently, when the post-process helper fails while downloading from upstream, there is no fallback to the backup mirror. In case the post-process helper fails, we must consider that to be a download failure, so we must bail out as if the download backend itself did fail, but we fail to do so. Duplicate the logic we have for the download helper: if the post-process helper fails, remove the downloaded stuff, and continue on to the next URI, which will ultimately hit the backup mirror (if one has been configured). Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit a39116b5dba6cf0695620e2ba5302f21fa80a4a5) Signed-off-by: Peter Korsgaard --- support/download/dl-wrapper | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 09a6ac1f1a..1e8d6058f6 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -138,9 +138,15 @@ main() { fi if [ -n "${post_process}" ] ; then - "${OLDPWD}/support/download/${post_process}-post-process" \ - -o "${tmpf}" \ - -n "${raw_base_name}" + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + then + # cd back to keep path coherence + cd "${OLDPWD}" + rm -rf "${tmpd}" + continue + fi fi # cd back to free the temp-dir, so we can remove it later From peter at korsgaard.com Tue Feb 28 20:56:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:56:05 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 Message-ID: <20230228212610.3517886DEA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d48b5b3652a1c724a4c04d97ab35f4c1484a9785 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003321.html Fixes CVE-2023-0494: https://lists.x.org/archives/xorg-announce/2023-February/003320.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit d8f0c02574b485e3250030d8cbf5c057ced578a7) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 0c3c807ff3..e2a2a251c3 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003310.html -sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz -sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003321.html +sha256 d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb xorg-server-21.1.7.tar.xz +sha512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5 xorg-server-21.1.7.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 04eb5e90b7..33b35b7979 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.6 +XSERVER_XORG_SERVER_VERSION = 21.1.7 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From peter at korsgaard.com Tue Feb 28 21:32:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:32:57 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/zabbix: fix BR2_SHARED_STATIC_LIBS In-Reply-To: <20230212124421.17787-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 12 Feb 2023 13:44:21 +0100") References: <20230212124421.17787-1-fontaine.fabrice@gmail.com> Message-ID: <87zg8xfpbq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > zabbix uses custom --enable-{static,shared} options, instead of standard > libtool directives resulting in the following build failure with openssl > or libcurl: > configure:13132: > /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -Ofast -g0 > -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -rdynamic -static > -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib > conftest.c -lssl -lcrypto -lm >&5 > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: > /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): > in function `dlfcn_globallookup': > dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked > applications requires at runtime the shared libraries from the glibc > version used for linking > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: > /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): > in function `BIO_lookup_ex': > b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically > linked applications requires at runtime the shared libraries from the > glibc version used for linking > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: > /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): > in function `BIO_gethostbyname': > b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically > linked applications requires at runtime the shared libraries from the > glibc version used for linking > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: > /tmp/cceWHjDi.o: in function `main': > conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' > [...] > configure: error: OpenSSL library libssl or libcrypto not found > --- > configure:15199: checking for main in -lz > configure:15219: > /home/autobuild/autobuild/instance-13/output-1/host/bin/s390x-buildroot-linux-gnu-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 > -I/home/autobuild/autobuild/instance-13/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -rdynamic -static > -L/home/autobuild/autobuild/instance-13/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib > conftest.c -lz -lm >&5 > /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/10.3.0/../../../../s390x-buildroot-linux-gnu/bin/ld: > cannot find -lz > collect2: error: ld returned 1 exit status > [...] > configure: error: static library z required for linking libcurl not found > Fixes: > - http://autobuild.buildroot.org/results/c05230d13fa0538323bb77e8f35533e6dd02453f > - http://autobuild.buildroot.org/results/cc947038510e16417298b381521f226f7c45f986 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Update commit log and comment Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 21:31:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:31:28 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/zabbix: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230228214026.9640486DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4621c597416b75ca60f9b61270dca5fe26181652 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x zabbix uses custom --enable-{static,shared} options, instead of standard libtool directives resulting in the following build failure with openssl or libcurl: configure:13132: /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib conftest.c -lssl -lcrypto -lm >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): in function `dlfcn_globallookup': dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): in function `BIO_lookup_ex': b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): in function `BIO_gethostbyname': b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /tmp/cceWHjDi.o: in function `main': conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' [...] configure: error: OpenSSL library libssl or libcrypto not found Signed-off-by: Yann E. MORIN (cherry picked from commit 895686180fa73a23f2e4e9ee374618fa259a79ce) Signed-off-by: Peter Korsgaard --- package/zabbix/zabbix.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index adc54028ad..e00d693ba5 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -125,6 +125,13 @@ endif endif # BR2_PACKAGE_ZABBIX_SERVER +# zabbix uses custom --enable-{static,shared} options, instead of +# standard libtool directives resulting in a build failure with libcurl +# or openssl. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ZABBIX_CONF_OPTS += --disable-static +endif + define ZABBIX_INSTALL_INIT_SYSTEMD $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ From peter at korsgaard.com Tue Feb 28 21:32:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:32:08 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zabbix: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230228214133.EE0B686DF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=160d949f05137dcf280c20efeca6d832f034c5bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x zabbix uses custom --enable-{static,shared} options, instead of standard libtool directives resulting in the following build failure with openssl or libcurl: configure:13132: /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib conftest.c -lssl -lcrypto -lm >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): in function `dlfcn_globallookup': dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): in function `BIO_lookup_ex': b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): in function `BIO_gethostbyname': b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /tmp/cceWHjDi.o: in function `main': conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' [...] configure: error: OpenSSL library libssl or libcrypto not found Signed-off-by: Yann E. MORIN (cherry picked from commit 895686180fa73a23f2e4e9ee374618fa259a79ce) Signed-off-by: Peter Korsgaard --- package/zabbix/zabbix.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index adc54028ad..e00d693ba5 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -125,6 +125,13 @@ endif endif # BR2_PACKAGE_ZABBIX_SERVER +# zabbix uses custom --enable-{static,shared} options, instead of +# standard libtool directives resulting in a build failure with libcurl +# or openssl. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ZABBIX_CONF_OPTS += --disable-static +endif + define ZABBIX_INSTALL_INIT_SYSTEMD $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ From fontaine.fabrice at gmail.com Tue Feb 28 22:07:39 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 28 Feb 2023 23:07:39 +0100 Subject: [Buildroot] [PATCH 1/3] package/proftpd: add libidn2 optional dependency Message-ID: <20230228220741.54827-1-fontaine.fabrice@gmail.com> libidn2 is an optional dependency which is enabled by default since version 1.3.8 and https://github.com/proftpd/proftpd/commit/5f61ac028e0930e7de9ea2a00864ccb6dc048f64 Signed-off-by: Fabrice Fontaine --- package/proftpd/proftpd.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 8e7d108c9e..d3b6308185 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -27,6 +27,10 @@ PROFTPD_CONF_OPTS = \ --with-gnu-ld \ --without-openssl-cmdline +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +PROFTPD_DEPENDENCIES += libidn2 +endif + ifeq ($(BR2_PACKAGE_PROFTPD_MOD_CAP),y) PROFTPD_CONF_OPTS += --enable-cap PROFTPD_DEPENDENCIES += libcap -- 2.39.1 From fontaine.fabrice at gmail.com Tue Feb 28 22:07:40 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 28 Feb 2023 23:07:40 +0100 Subject: [Buildroot] [PATCH 2/3] package/proftpd: add pcre2 optional dependency In-Reply-To: <20230228220741.54827-1-fontaine.fabrice@gmail.com> References: <20230228220741.54827-1-fontaine.fabrice@gmail.com> Message-ID: <20230228220741.54827-2-fontaine.fabrice@gmail.com> pcre2 is an optional dependency since version 1.3.8 and https://github.com/proftpd/proftpd/commit/e63cf016f574890c4096d587b8b1f55d87ac05d5 Signed-off-by: Fabrice Fontaine --- package/proftpd/proftpd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index d3b6308185..398155222d 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -31,6 +31,13 @@ ifeq ($(BR2_PACKAGE_LIBIDN2),y) PROFTPD_DEPENDENCIES += libidn2 endif +ifeq ($(BR2_PACKAGE_PCRE2),y) +PROFTPD_CONF_OPTS += --enable-pcre2 +PROFTPD_DEPENDENCIES += pcre2 +else +PROFTPD_CONF_OPTS += --disable-pcre2 +endif + ifeq ($(BR2_PACKAGE_PROFTPD_MOD_CAP),y) PROFTPD_CONF_OPTS += --enable-cap PROFTPD_DEPENDENCIES += libcap -- 2.39.1 From fontaine.fabrice at gmail.com Tue Feb 28 22:07:41 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 28 Feb 2023 23:07:41 +0100 Subject: [Buildroot] [PATCH 3/3] package/proftpd: needs dynamic library In-Reply-To: <20230228220741.54827-1-fontaine.fabrice@gmail.com> References: <20230228220741.54827-1-fontaine.fabrice@gmail.com> Message-ID: <20230228220741.54827-3-fontaine.fabrice@gmail.com> proftpd doesn't build statically because it does not use pkg-config to retrieve its dependencies since its addition in commit 5d173ec4122b89857e6d93fc337311b1f87631c9: /tmp/instance-13/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: /tmp/instance-13/output-1/host/arc-buildroot-linux-uclibc/sysroot/usr/lib/libidn2.a(libunistring_la-striconveh.o): in function `iconv_carefully_1': buildroot/build/libidn2-2.3.4/unistring/striconveh.c:233: undefined reference to `libiconv' [...] /tmp/instance-5/output-1/host/lib/gcc/arceb-buildroot-linux-uclibc/10.2.0/../../../../arceb-buildroot-linux-uclibc/bin/ld: /tmp/instance-5/output-1/host/arceb-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(bio_lib.o): in function `BIO_free': bio_lib.c:(.text+0x3f2): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/09f3f37b63dc68d31b18816b818df86fa3be095c - http://autobuild.buildroot.org/results/2aba5297206e44dc086c3138ace70e85739196f3 Signed-off-by: Fabrice Fontaine --- package/proftpd/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in index 33ad2cea54..8ac1da3fed 100644 --- a/package/proftpd/Config.in +++ b/package/proftpd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PROFTPD bool "proftpd" depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS help ProFTPD, a highly configurable FTP server. @@ -105,3 +106,7 @@ config BR2_PACKAGE_PROFTPD_BUFFER_SIZE 0 uses the default size of 1024. endif + +comment "proftpd needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS -- 2.39.1 From ps.report at gmx.net Tue Feb 28 22:16:25 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 28 Feb 2023 23:16:25 +0100 Subject: [Buildroot] [PATCH v1] package/apr: security bump version to 1.7.2 Message-ID: <20230228221625.32577-1-ps.report@gmx.net> - remove 0001-cross-compile.patch (superseeded by upstream commit [1]) - rename 0002-sys-param-h.patch to 0001-sys-param-h.patch - remove 0003-Merge-r1887279-from-trunk.patch (from upstream [2]) - remove 0004-apr-1.7.0-CVE-2021-35940.patch (superseeded by upstream commit [3], remove APR_IGNORE_CVES accordingly) - set new configure option '--disable-sctp' (no libsctp provided by buildroot) - set new 'ac_cv_strerror_r_rc_int' explicitly to no (default for cross compile) - set new 'ac_cv_mmap__dev_zero' explicitly to yes - revert two upstream commits ([4], [5]) to fix apr-util build, fails otherwise because of some path mismatch where to find apr_rules.mk copied to apr-util-1.6.3/build/rules.mk, fixes: Makefile:50: .../build/apr-util-1.6.3/build/rules.mk: No such file or directory For details see [6]. [1] https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a [2] https://github.com/apache/apr/commit/0a763c5e500f4304b7c534fae0fad430d64982e8 [3] https://github.com/apache/apr/commit/e0be630b681fac7b8b5e2f2e402a8e18a147f966 [4] https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1 [5] https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c [6] https://downloads.apache.org/apr/CHANGES-APR-1.7 Signed-off-by: Peter Seiderer --- package/apr/0001-cross-compile.patch | 58 --------- ...s-param-h.patch => 0001-sys-param-h.patch} | 0 ...r1872164.-Fix-the-name-of-libtool-wh.patch | 30 +++++ .../apr/0003-Merge-r1887279-from-trunk.patch | 69 ----------- ...Add-the-ability-to-cross-compile-APR.patch | 112 ++++++++++++++++++ .../apr/0004-apr-1.7.0-CVE-2021-35940.patch | 57 --------- package/apr/apr.hash | 4 +- package/apr/apr.mk | 7 +- 8 files changed, 148 insertions(+), 189 deletions(-) delete mode 100644 package/apr/0001-cross-compile.patch rename package/apr/{0002-sys-param-h.patch => 0001-sys-param-h.patch} (100%) create mode 100644 package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch delete mode 100644 package/apr/0003-Merge-r1887279-from-trunk.patch create mode 100644 package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch delete mode 100644 package/apr/0004-apr-1.7.0-CVE-2021-35940.patch diff --git a/package/apr/0001-cross-compile.patch b/package/apr/0001-cross-compile.patch deleted file mode 100644 index 559ebb74ba..0000000000 --- a/package/apr/0001-cross-compile.patch +++ /dev/null @@ -1,58 +0,0 @@ -Fix cross-compilation - -Patch was backported from Apache httpd: -http://svn.apache.org/viewvc?view=revision&revision=1327907 -http://svn.apache.org/viewvc?view=revision&revision=1328390 -http://svn.apache.org/viewvc?view=revision&revision=1328714 - -Patch submitted upstream: -https://issues.apache.org/bugzilla/show_bug.cgi?id=57058 - -Signed-off-by: Bernd Kuhls - -diff -uNr apr-1.5.1.org/configure.in apr-1.5.1/configure.in ---- apr-1.5.1.org/configure.in 2014-01-25 16:17:29.000000000 +0100 -+++ apr-1.5.1/configure.in 2014-10-05 11:20:40.080746760 +0200 -@@ -118,6 +118,16 @@ - echo "Configuring APR library" - echo "Platform: $host" - -+dnl In case of cross compilation we set CC_FOR_BUILD to cc unless -+dnl we got already CC_FOR_BUILD from environment. -+if test "x${build_alias}" != "x${host_alias}"; then -+ if test "x${CC_FOR_BUILD}" = "x"; then -+ CC_FOR_BUILD=cc -+ fi -+fi -+AC_SUBST(CC_FOR_BUILD) -+AC_SUBST(CFLAGS_FOR_BUILD) -+ - dnl Some initial steps for configuration. We setup the default directory - dnl and which files are to be configured. - -diff -uNr apr-1.5.1.org/Makefile.in apr-1.5.1/Makefile.in ---- apr-1.5.1.org/Makefile.in 2014-03-17 16:10:26.000000000 +0100 -+++ apr-1.5.1/Makefile.in 2014-10-05 11:22:53.031070519 +0200 -@@ -8,6 +8,8 @@ - # APR (Apache Portable Runtime) library Makefile. - # - CPP = @CPP@ -+CC_FOR_BUILD = @CC_FOR_BUILD@ -+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ - - # get substituted into some targets - APR_MAJOR_VERSION=@APR_MAJOR_VERSION@ -@@ -134,8 +134,13 @@ - $(APR_MKDIR) tools - $(LT_COMPILE) - -+ifdef CC_FOR_BUILD -+tools/gen_test_char at EXEEXT@: tools/gen_test_char.c $(LOCAL_LIBS) -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $< -+else - tools/gen_test_char at EXEEXT@: $(OBJECTS_gen_test_char) - $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) -+endif - - include/private/apr_escape_test_char.h: tools/gen_test_char at EXEEXT@ - $(APR_MKDIR) include/private diff --git a/package/apr/0002-sys-param-h.patch b/package/apr/0001-sys-param-h.patch similarity index 100% rename from package/apr/0002-sys-param-h.patch rename to package/apr/0001-sys-param-h.patch diff --git a/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch b/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch new file mode 100644 index 0000000000..f80db1cb6b --- /dev/null +++ b/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch @@ -0,0 +1,30 @@ +From 0aa7e33372b479a26e5f04dfc4801e24573a8737 Mon Sep 17 00:00:00 2001 +From: Graham Leggett +Date: Wed, 1 Jan 2020 10:43:39 +0000 +Subject: [PATCH] Revert: Backport r1872164. Fix the name of libtool when + cross compiling. + +git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x at 1872165 13f79535-47bb-0310-9956-ffa450edef68 + +[Revert upstream commit https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1] +Signed-off-by: Peter Seiderer +--- + apr-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apr-config.in b/apr-config.in +index bed47ca..4873fc0 100644 +--- a/apr-config.in ++++ b/apr-config.in +@@ -246,7 +246,7 @@ while test $# -gt 0; do + if test "$location" = "installed"; then + echo "${installbuilddir}/libtool" + elif test "$location" = "crosscompile"; then +- echo "$APR_TARGET_DIR/${installbuilddir}/libtool" ++ echo "$APR_TARGET_DIR/${installbuilddir}/build" + else + echo "$APR_BUILD_DIR/libtool" + fi +-- +2.39.2 + diff --git a/package/apr/0003-Merge-r1887279-from-trunk.patch b/package/apr/0003-Merge-r1887279-from-trunk.patch deleted file mode 100644 index 444b9d2b06..0000000000 --- a/package/apr/0003-Merge-r1887279-from-trunk.patch +++ /dev/null @@ -1,69 +0,0 @@ -From a15958a37a06f71c42c690278f9c958b93b7ee20 Mon Sep 17 00:00:00 2001 -From: Yann Ylavic -Date: Thu, 11 Mar 2021 14:10:21 +0000 -Subject: [PATCH] Merge r1887279 from trunk: - -build/apr_common.m4: avoid explicit inclusion of "confdefs.h" - -The failure is observed on `autoconf-2.69d` (soon to be released -as `autoconf-2.70`). There `int64_t` detection fails as: - -$ autoreconf && ./configure -checking whether int64_t and int use fmt %d... no -checking whether int64_t and long use fmt %ld... no -checking whether int64_t and long long use fmt %lld... no -configure: error: could not determine the string function for int64_t -``` - -This happens because `./configure` always stumbles on warning: - -configure:3350: gcc -c -g -O2 -Werror conftest.c >&5 -In file included from conftest.c:31: -confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror] - 22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 - | - -It's triggered by double inclusion of `"confdefs.h"` contents: -explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly -via `AC_LANG_SOURCE` use. - -To fix it and avoid having to define `main()` declaration the change -uses `AC_LANG_PROGRAM` instead. - -Tested on both `autoconf-2.69` and `autoconf-2.69d`. - - -Github: closes #25 -Submitted by: Sergei Trofimovich -Reviewed by: ylavic - - -git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x at 1887485 13f79535-47bb-0310-9956-ffa450edef68 - -[Retrieved from: -https://github.com/apache/apr/commit/0a763c5e500f4304b7c534fae0fad430d64982e8] -Signed-off-by: Fabrice Fontaine ---- - build/apr_common.m4 | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/build/apr_common.m4 b/build/apr_common.m4 -index 297dd32cf75..b67a8608abe 100644 ---- a/build/apr_common.m4 -+++ b/build/apr_common.m4 -@@ -467,13 +467,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], - CFLAGS="$CFLAGS -Werror" - fi - AC_COMPILE_IFELSE( -- [AC_LANG_SOURCE( -- [#include "confdefs.h" -- ] -- [[$1]] -- [int main(int argc, const char *const *argv) {] -+ [AC_LANG_PROGRAM( -+ [[$1]], - [[$2]] -- [ return 0; }] - )], [CFLAGS=$apr_save_CFLAGS - $3], [CFLAGS=$apr_save_CFLAGS - $4]) diff --git a/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch b/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch new file mode 100644 index 0000000000..ad250d4427 --- /dev/null +++ b/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch @@ -0,0 +1,112 @@ +From ed1daed074fba0dabff825e63525d751b6bb7b8d Mon Sep 17 00:00:00 2001 +From: Graham Leggett +Date: Tue, 31 Dec 2019 21:26:02 +0000 +Subject: [PATCH] Revert: Add the ability to cross compile APR. + +git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x at 1872147 13f79535-47bb-0310-9956-ffa450edef68 + +[Revert upstream commit https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c] +Signed-off-by: Peter Seiderer +--- + CHANGES | 2 -- + apr-config.in | 22 ---------------------- + 2 files changed, 24 deletions(-) + +diff --git a/CHANGES b/CHANGES +index 71b2f0e..e751c90 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -56,8 +56,6 @@ Changes for APR 1.7.1 + *) Don't try to use PROC_PTHREAD by default when cross compiling. + [Yann Ylavic] + +- *) Add the ability to cross compile APR. [Graham Leggett] +- + *) While cross-compiling, the tools/gen_test_char could not + be executed at build time, use AX_PROG_CC_FOR_BUILD to + build native tools/gen_test_char +diff --git a/apr-config.in b/apr-config.in +index 4873fc0..84b4073 100644 +--- a/apr-config.in ++++ b/apr-config.in +@@ -48,14 +48,6 @@ APR_LIBNAME="@APR_LIBNAME@" + # NOTE: the following line is modified during 'make install': alter with care! + location=@APR_CONFIG_LOCATION@ + +-# absolute path, but not installed path - we're cross compiling +-case "$0" in +- "${bindir}/"*) ;; +- "/"*) location=crosscompile; +- APR_TARGET_DIR=${0%${bindir}/apr-${APR_MAJOR_VERSION}-config} ;; +- *) ;; +-esac +- + show_usage() + { + cat << EOF +@@ -101,8 +93,6 @@ fi + + if test "$location" = "installed"; then + LA_FILE="$libdir/lib${APR_LIBNAME}.la" +-elif test "$location" = "crosscompile"; then +- LA_FILE="$APR_TARGET_DIR/$libdir/lib${APR_LIBNAME}.la" + else + LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la" + fi +@@ -132,8 +122,6 @@ while test $# -gt 0; do + --includedir) + if test "$location" = "installed"; then + flags="$includedir" +- elif test "$location" = "crosscompile"; then +- flags="$APR_TARGET_DIR/$includedir" + elif test "$location" = "source"; then + flags="$APR_SOURCE_DIR/include" + else +@@ -166,8 +154,6 @@ while test $# -gt 0; do + --includes) + if test "$location" = "installed"; then + flags="$flags -I$includedir $EXTRA_INCLUDES" +- elif test "$location" = "crosscompile"; then +- flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES" + elif test "$location" = "source"; then + flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" + else +@@ -182,8 +168,6 @@ while test $# -gt 0; do + --installbuilddir) + if test "$location" = "installed"; then + echo "${installbuilddir}" +- elif test "$location" = "crosscompile"; then +- echo "$APR_TARGET_DIR/${installbuilddir}" + elif test "$location" = "source"; then + echo "$APR_SOURCE_DIR/build" + else +@@ -200,8 +184,6 @@ while test $# -gt 0; do + if test "$location" = "installed"; then + ### avoid using -L if libdir is a "standard" location like /usr/lib + flags="$flags -L$libdir -l${APR_LIBNAME}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}" + else + ### this surely can't work since the library is in .libs? + flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" +@@ -219,8 +201,6 @@ while test $# -gt 0; do + # Since the user is specifying they are linking with libtool, we + # *know* that -R will be recognized by libtool. + flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}" + else + flags="$flags $LA_FILE" + fi +@@ -245,8 +225,6 @@ while test $# -gt 0; do + --apr-libtool) + if test "$location" = "installed"; then + echo "${installbuilddir}/libtool" +- elif test "$location" = "crosscompile"; then +- echo "$APR_TARGET_DIR/${installbuilddir}/build" + else + echo "$APR_BUILD_DIR/libtool" + fi +-- +2.39.2 + 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 deleted file mode 100644 index b065a3330a..0000000000 --- a/package/apr/0004-apr-1.7.0-CVE-2021-35940.patch +++ /dev/null @@ -1,57 +0,0 @@ - -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.hash b/package/apr/apr.hash index d7739d7ed3..96f43d3710 100644 --- a/package/apr/apr.hash +++ b/package/apr/apr.hash @@ -1,4 +1,4 @@ -# From http://archive.apache.org/dist/apr/apr-1.7.0.tar.bz2.sha256 -sha256 e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea apr-1.7.0.tar.bz2 +# From https://archive.apache.org/dist/apr/apr-1.7.2.tar.bz2.sha256 +sha256 75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e apr-1.7.2.tar.bz2 # Locally calculated sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE diff --git a/package/apr/apr.mk b/package/apr/apr.mk index 77217ccbb3..bdc5e915c6 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -4,7 +4,7 @@ # ################################################################################ -APR_VERSION = 1.7.0 +APR_VERSION = 1.7.2 APR_SOURCE = apr-$(APR_VERSION).tar.bz2 APR_SITE = https://archive.apache.org/dist/apr APR_LICENSE = Apache-2.0 @@ -16,8 +16,7 @@ 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 +APR_CONF_OPTS = --disable-sctp # avoid apr_hints.m4 by setting apr_preload_done=yes and set # the needed CFLAGS on our own (avoids '-D_REENTRANT' in case @@ -32,6 +31,7 @@ APR_CONF_ENV = \ CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ CFLAGS="$(APR_CFLAGS)" \ ac_cv_file__dev_zero=yes \ + ac_cv_mmap__dev_zero=yes \ ac_cv_func_setpgrp_void=yes \ apr_cv_process_shared_works=yes \ apr_cv_mutex_robust_shared=no \ @@ -39,6 +39,7 @@ APR_CONF_ENV = \ ac_cv_sizeof_struct_iovec=8 \ ac_cv_sizeof_pid_t=4 \ ac_cv_struct_rlimit=yes \ + ac_cv_strerror_r_rc_int=no \ ac_cv_o_nonblock_inherited=no \ apr_cv_mutex_recursive=yes \ apr_cv_epoll=yes \ -- 2.39.2 From fontaine.fabrice at gmail.com Tue Feb 28 22:16:24 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 28 Feb 2023 23:16:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/pugixml: drop header-only option Message-ID: <20230228221624.59583-1-fontaine.fabrice@gmail.com> Header-only option raises the following build failure with gerbera since commit cc3a4a7b1de7b158354c650d234339e8a969a730: /home/thomas/autobuild/instance-2/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.4.0/../../../../nios2-buildroot-linux-gnu/bin/ld: CMakeFiles/gerbera.dir/src/main.cc.o: in function `ConfigGenerator::~ConfigGenerator()': /home/thomas/autobuild/instance-2/output-1/build/gerbera-1.10.0/src/config/config_generator.h:33: undefined reference to `pugi::xml_document::~xml_document()' This build failure can't be fixed by adding a !BR2_PACKAGE_PUGIXML_HEADER_ONLY dependency as it will create the following recursive dependency: package/gerbera/Config.in:1:error: recursive dependency detected! package/gerbera/Config.in:1: symbol BR2_PACKAGE_GERBERA depends on BR2_PACKAGE_PUGIXML_HEADER_ONLY package/pugixml/Config.in:42: symbol BR2_PACKAGE_PUGIXML_HEADER_ONLY depends on BR2_PACKAGE_PUGIXML package/pugixml/Config.in:1: symbol BR2_PACKAGE_PUGIXML is selected by BR2_PACKAGE_GERBERA Moreover, commit 48b2e50eb8df36e3e3ab18692bd9e0dde3b38702 stated that "Compact and header-only modes are not strictly needed for our use case, but we did the work anyway and may be useful for someone else." So dropping header-only seems to be the right approach Fixes: - http://autobuild.buildroot.org/results/800537a1ef5f48d24c20aad7a9c96c56dfdc77f5 Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 6 ++++++ package/pugixml/Config.in | 9 --------- package/pugixml/pugixml.mk | 4 ---- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 381e1e3a8c..a31543d5fa 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_PUGIXML_HEADER_ONLY + bool "pugixml header-only removed" + select BR2_LEGACY + help + The header-only version raises a build failure with gerbera. + config BR2_PACKAGE_UCCP420WLAN bool "uccp420wlan removed" select BR2_LEGACY diff --git a/package/pugixml/Config.in b/package/pugixml/Config.in index 6b7d2e3259..d5a3cb3ebb 100644 --- a/package/pugixml/Config.in +++ b/package/pugixml/Config.in @@ -39,15 +39,6 @@ config BR2_PACKAGE_PUGIXML_COMPACT http://pugixml.org/docs/manual.html#dom.memory.compact -config BR2_PACKAGE_PUGIXML_HEADER_ONLY - bool "Enable header-only version" - help - All source code for pugixml will be included in every - translation unit that includes pugixml.hpp. This is how most - of Boost and STL libraries work. - - http://pugixml.org/docs/manual.html#install.building.header - endif comment "pugixml needs a toolchain w/ C++" diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index c8d59f0864..415227a40a 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -31,10 +31,6 @@ endif PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG HOST_PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG -ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) -PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY -endif - PUGIXML_CONF_OPTS += -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" HOST_PUGIXML_CONF_OPTS += \ -- 2.39.1 From stefan at agner.ch Tue Feb 28 23:55:47 2023 From: stefan at agner.ch (Stefan Agner) Date: Wed, 1 Mar 2023 00:55:47 +0100 Subject: [Buildroot] [PATCH] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.66 Message-ID: <674d788fda128807b203f3b1d8b407b5bb85948b.1677628527.git.stefan@agner.ch> bluez 5.66 contains various fixes and initial support for Basic Audio Profile and Volume Control Profile. Signed-off-by: Stefan Agner --- package/bluez5_utils-headers/bluez5_utils-headers.mk | 2 +- package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 565511120f..8ca3764935 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.65 +BLUEZ5_UTILS_HEADERS_VERSION = 5.66 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/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index e0c9f3cdb9..9467647592 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 2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4 bluez-5.65.tar.xz +sha256 39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574 bluez-5.66.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 76070dc3a9..4059b34556 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.65 +BLUEZ5_UTILS_VERSION = 5.66 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES -- 2.39.1 From james.hilliard1 at gmail.com Wed Feb 1 00:02:48 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 17:02:48 -0700 Subject: [Buildroot] [PATCH 1/1] package/neon-2-sse: bump to version 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f Message-ID: <20230201000248.1104432-1-james.hilliard1@gmail.com> Drop patch which is now upstream. Signed-off-by: James Hilliard --- .../neon-2-sse/0001-Fix-cmake-languages.patch | 40 ------------------- package/neon-2-sse/neon-2-sse.hash | 2 +- package/neon-2-sse/neon-2-sse.mk | 2 +- 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 package/neon-2-sse/0001-Fix-cmake-languages.patch diff --git a/package/neon-2-sse/0001-Fix-cmake-languages.patch b/package/neon-2-sse/0001-Fix-cmake-languages.patch deleted file mode 100644 index e0becb1ffa..0000000000 --- a/package/neon-2-sse/0001-Fix-cmake-languages.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 186ec82e033d8c718d760d14945535a9d7e160fd Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sun, 29 Jan 2023 21:00:27 -0700 -Subject: [PATCH] Fix cmake languages - -When no language is set cmake defaults to C and CXX, since we support -C by itself we should set the project language to C so that we don't -get a compiler error when building without a CXX toolchain. - -Fixes: -CMake Error at CMakeLists.txt:5 (project): - No CMAKE_CXX_COMPILER could be found. - - Tell CMake where to find the compiler by setting either the environment - variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path - to the compiler, or to the compiler name if it is in the PATH. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/intel/ARM_NEON_2_x86_SSE/pull/62] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e4b8980..8f58e79 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,7 +2,7 @@ - # Modification: Copyright (C) 2017 David Hirvonen - - cmake_minimum_required(VERSION 3.0) --project(NEON_2_SSE VERSION 1.0.0) -+project(NEON_2_SSE VERSION 1.0.0 LANGUAGES C) - - add_library(${PROJECT_NAME} INTERFACE) - --- -2.34.1 - diff --git a/package/neon-2-sse/neon-2-sse.hash b/package/neon-2-sse/neon-2-sse.hash index ded20d58f5..f964d2fa61 100644 --- a/package/neon-2-sse/neon-2-sse.hash +++ b/package/neon-2-sse/neon-2-sse.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 019fbc7ec25860070a1d90e12686fc160cfb33e22aa063c80f52b363f1361e9d neon-2-sse-a15b489e1222b2087007546b4912e21293ea86ff.tar.gz +sha256 4567ca8c8cbc8ce0ea3ddb9dc0f158707eb85c631cb400fd7010cd299cdc5377 neon-2-sse-097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f.tar.gz # License files, locally calculated sha256 7022f51b439a5915e933ecc270c83e24ca0cb2cceeb08b0132dcd4dbb03ed2dc LICENSE diff --git a/package/neon-2-sse/neon-2-sse.mk b/package/neon-2-sse/neon-2-sse.mk index 3e87c62e21..ee6f5446b6 100644 --- a/package/neon-2-sse/neon-2-sse.mk +++ b/package/neon-2-sse/neon-2-sse.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEON_2_SSE_VERSION = a15b489e1222b2087007546b4912e21293ea86ff +NEON_2_SSE_VERSION = 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f NEON_2_SSE_SITE = $(call github,intel,ARM_NEON_2_x86_SSE,$(NEON_2_SSE_VERSION)) NEON_2_SSE_LICENSE = BSD-2-Clause NEON_2_SSE_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 02:37:55 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 19:37:55 -0700 Subject: [Buildroot] [PATCH 1/2] package/ell: bump to version 0.56 Message-ID: <20230201023756.1418443-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 68832c3201..c0f1731676 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 a7d0df846af839bbea1b80f292166371070328854b3fa785b5c607fe600552ad ell-0.53.tar.xz +sha256 58eb8b2b64087f7479d5db6a830a0656c536d93e5f11d4c9a4443ce8760a1b63 ell-0.56.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index b27d6feb65..994b0e19f0 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.53 +ELL_VERSION = 0.56 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 02:37:56 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 19:37:56 -0700 Subject: [Buildroot] [PATCH 2/2] package/iwd: bump to version 2.2 In-Reply-To: <20230201023756.1418443-1-james.hilliard1@gmail.com> References: <20230201023756.1418443-1-james.hilliard1@gmail.com> Message-ID: <20230201023756.1418443-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 e7971cd637..be048b3da6 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 9fd13512dc27d83efb8d341f7df98f5488f70131686021fcd0d93fc97af013b8 iwd-1.30.tar.xz +sha256 dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570 iwd-2.2.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 5ffbde334e..b0a2f6e9ed 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.30 +IWD_VERSION = 2.2 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:46 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:46 -0700 Subject: [Buildroot] [PATCH 01/13] package/libnice: bump to version 0.1.21 Message-ID: <20230201051658.383420-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/libnice/libnice.hash | 2 +- package/libnice/libnice.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnice/libnice.hash b/package/libnice/libnice.hash index 83b28a9ad9..cf6d825f83 100644 --- a/package/libnice/libnice.hash +++ b/package/libnice/libnice.hash @@ -1,5 +1,5 @@ # Locally computed after checking pgp signature -sha256 6747af710998cf708a2e8ceef51cccd181373d94201dd4b8d40797a070ed47cc libnice-0.1.19.tar.gz +sha256 72e73a2acf20f59093e21d5601606e405873503eb35f346fa621de23e99b3b39 libnice-0.1.21.tar.gz # Hash for license files: sha256 9246b2ee8b1db30cf03d5d9719ad8bb5edce1cadc85f8cfef319c23d24d950b5 COPYING diff --git a/package/libnice/libnice.mk b/package/libnice/libnice.mk index 2b223bedd3..56ee35e452 100644 --- a/package/libnice/libnice.mk +++ b/package/libnice/libnice.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNICE_VERSION = 0.1.19 -LIBNICE_SITE = http://nice.freedesktop.org/releases +LIBNICE_VERSION = 0.1.21 +LIBNICE_SITE = https://libnice.freedesktop.org/releases LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL LIBNICE_DEPENDENCIES = libglib2 host-pkgconf -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:47 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:47 -0700 Subject: [Buildroot] [PATCH 02/13] package/gstreamer1: bump to version 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 5fb52606fe..db0ed5bede 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.4.tar.xz.sha256sum -sha256 67c1edf8c3c339cda5dde85f4f7b953bb9607c2d13ae970e2491c5c4c055ef5f gstreamer-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.0.tar.xz.sha256sum +sha256 78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09 gstreamer-1.22.0.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 16c016b145..09d1a10ce7 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.20.4 +GSTREAMER1_VERSION = 1.22.0 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:49 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:49 -0700 Subject: [Buildroot] [PATCH 04/13] package/gst1-plugins-good: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-4-james.hilliard1@gmail.com> Add new xingmux config option. Signed-off-by: James Hilliard --- package/gstreamer1/gst1-plugins-good/Config.in | 5 +++++ .../gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in index 67df206eea..d7ec16e800 100644 --- a/package/gstreamer1/gst1-plugins-good/Config.in +++ b/package/gstreamer1/gst1-plugins-good/Config.in @@ -246,6 +246,11 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE help Parse a .wav file into raw audio +config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX + bool "xingmux" + help + Add XING tags to mpeg audio files + config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M bool "y4m" help diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index b30c512878..3e219faad8 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.4.tar.xz.sha256sum -sha256 b16130fbe632fa8547c2147a0ef575b0140fb521065c5cb121c72ddbd23b64da gst-plugins-good-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.0.tar.xz.sha256sum +sha256 582e617271e7f314d1a2211e3e3856ae2e4303c8c0d6114e9c4a5ea5719294b0 gst-plugins-good-1.22.0.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 cc7bab5824..93c2328bda 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.4 +GST1_PLUGINS_GOOD_VERSION = 1.22.0 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 @@ -324,6 +324,12 @@ else GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavparse=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX),y) +GST1_PLUGINS_GOOD_CONF_OPTS += -Dxingmux=enabled +else +GST1_PLUGINS_GOOD_CONF_OPTS += -Dxingmux=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dy4m=enabled else -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:50 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:50 -0700 Subject: [Buildroot] [PATCH 05/13] package/gst1-plugins-bad: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-5-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 c8789a707d..90b3a18982 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.4.tar.xz.sha256sum -sha256 a1a3f53b3604d9a04fdd0bf9a1a616c3d2dab5320489e9ecee1178e81e33a16a gst-plugins-bad-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.0.tar.xz.sha256sum +sha256 3c9d9300f5f4fb3e3d36009379d1fb6d9ecd79c1a135df742b8a68417dd663a1 gst-plugins-bad-1.22.0.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 14710a2501..8f11ce6b37 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.4 +GST1_PLUGINS_BAD_VERSION = 1.22.0 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.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:48 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:48 -0700 Subject: [Buildroot] [PATCH 03/13] package/gst1-plugins-base: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-3-james.hilliard1@gmail.com> The videoconvert and videoscale plugins have been combined into the new videoconvertscale plugin. Rework config options using videoconvert/videoscale to use the new videoconvertscale option. Signed-off-by: James Hilliard --- Config.in.legacy | 14 ++++++++++++++ package/gstreamer1/gst1-plugins-base/Config.in | 13 ++++--------- .../gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- .../gst1-plugins-base/gst1-plugins-base.mk | 14 ++++---------- .../gstreamer1-editing-services/Config.in | 3 +-- package/webkitgtk/Config.in | 3 +-- package/wpewebkit/Config.in | 3 +-- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 41c5fdefb3..3fff2b1ddd 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,20 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + bool "videoscale removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoscale option has been combined with videoconvert. + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT + bool "videoconvert removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoconvert option has been combined with videoscale. + config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 bool "imx-gpu-viv X11 output has been removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in index bd4ee0b994..df10774ac7 100644 --- a/package/gstreamer1/gst1-plugins-base/Config.in +++ b/package/gstreamer1/gst1-plugins-base/Config.in @@ -59,10 +59,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING help various encoding-related elements -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - bool "videoconvert" +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + bool "videoconvertscale (mandatory for video playback)" + default y help - Colorspace conversion + Colorspace conversion, resizes video config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO bool "gio" @@ -123,12 +124,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE help Adjusts video frames -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE - bool "videoscale (mandatory for video playback)" - default y - help - Resizes video - config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME bool "volume (mandatory for audio playback)" default y diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 5c729d832f..bac4f8398a 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.4.tar.xz.sha256sum -sha256 8d181b7abe4caf23ee9f9ec5b4d3e232640452464e39495bfffb6d776fc97225 gst-plugins-base-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.0.tar.xz.sha256sum +sha256 f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d gst-plugins-base-1.22.0.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 d225cdf910..7d509331fe 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.4 +GST1_PLUGINS_BASE_VERSION = 1.22.0 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 @@ -147,10 +147,10 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dencoding=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y) -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=enabled +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE),y) +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvertscale=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=disabled +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvertscale=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO),y) @@ -219,12 +219,6 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dvideorate=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y) -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=enabled -else -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME),y) GST1_PLUGINS_BASE_CONF_OPTS += -Dvolume=enabled else diff --git a/package/gstreamer1/gstreamer1-editing-services/Config.in b/package/gstreamer1/gstreamer1-editing-services/Config.in index 9c41e8142b..e824781d47 100644 --- a/package/gstreamer1/gstreamer1-editing-services/Config.in +++ b/package/gstreamer1/gstreamer1-editing-services/Config.in @@ -6,9 +6,8 @@ config BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE # runtime - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT # runtime + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC # runtime - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME # runtime select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE # runtime help diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index cafe497491..dc5d738dae 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -104,8 +104,7 @@ config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 04ed40bd92..7a8dc557c3 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -97,8 +97,7 @@ config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:51 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:51 -0700 Subject: [Buildroot] [PATCH 06/13] package/gst1-plugins-ugly: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-6-james.hilliard1@gmail.com> Remove xingmux config option which has been moved to the gst1-plugins-good package. Signed-off-by: James Hilliard --- Config.in.legacy | 7 +++++++ package/gstreamer1/gst1-plugins-ugly/Config.in | 5 ----- .../gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 8 +------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3fff2b1ddd..1c5af2652a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX + bool "xingmux moved" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX + help + The xingmux option has been moved to gst1-plugins-good. + config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE bool "videoscale removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in index ba19989892..54766ffa8c 100644 --- a/package/gstreamer1/gst1-plugins-ugly/Config.in +++ b/package/gstreamer1/gst1-plugins-ugly/Config.in @@ -26,11 +26,6 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB help DVD subtitle parser and decoder -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX - bool "xingmux" - help - Add XING tags to mpeg audio files - config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA bool "realmedia" help diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 4ec29e6894..21579216df 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.4.tar.xz.sha256sum -sha256 5c9ec6bab96517e438b3f9bae0ceb84d3436f3da9bbe180cf4d28e32a7251b59 gst-plugins-ugly-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz.sha256sum +sha256 a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c gst-plugins-ugly-1.22.0.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 20382719c3..9f16fa3da8 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.4 +GST1_PLUGINS_UGLY_VERSION = 1.22.0 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 @@ -51,12 +51,6 @@ else GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=enabled -else -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=enabled else -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:52 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:52 -0700 Subject: [Buildroot] [PATCH 07/13] package/gst1-devtools: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-7-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 fc504a2c12..46480445ab 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.4.tar.xz.sha256sum -sha256 82a293600273f4dd3eed567aae510ca0c7d629c3807788b00e6cdbd1d2459a84 gst-devtools-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.0.tar.xz.sha256sum +sha256 4d21fee5c15f2877c0b1f6c2da0cdba67ce7caab2c199ab27e91a1394d5ba195 gst-devtools-1.22.0.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 fbb04c92ef..8fd3321d9e 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.4 +GST1_DEVTOOLS_VERSION = 1.22.0 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.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:53 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:53 -0700 Subject: [Buildroot] [PATCH 08/13] package/gst1-libav: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-8-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 78f5b5bb07..c2c58ab2fe 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.4.tar.xz.sha256sum -sha256 04ccbdd58fb31dd94098da599209834a0e7661638c5703381dd0a862c56fc532 gst-libav-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.0.tar.xz.sha256sum +sha256 0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1 gst-libav-1.22.0.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index a867af5147..d4b3873af1 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.4 +GST1_LIBAV_VERSION = 1.22.0 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.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:54 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:54 -0700 Subject: [Buildroot] [PATCH 09/13] package/gst1-vaapi: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-9-james.hilliard1@gmail.com> Update config option names and dependency requirements. Signed-off-by: James Hilliard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 37 +++++++++++++++---- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 5baaa4dfb7..6dec625c93 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.4.tar.xz.sha256sum -sha256 ab12596144c05506e9782374c5d2cdfb3069fca89908d6de360d947bb77fd06a gstreamer-vaapi-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.0.tar.xz.sha256sum +sha256 593ccad19f88e5fa29f40f98356c007806bd535828707b1406944d16a90bdff5 gstreamer-vaapi-1.22.0.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 bd6c16be3e..3d9eb91ffb 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.4 +GST1_VAAPI_VERSION = 1.22.0 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+ @@ -18,19 +18,40 @@ GST1_VAAPI_DEPENDENCIES += \ libdrm GST1_VAAPI_CONF_OPTS += \ - -Dwith_drm=yes \ - -Dwith_x11=no \ - -Dwith_glx=no \ - -Dwith_wayland=no \ - -Dwith_egl=no \ + -Ddrm=enabled \ + -Degl=enabled \ -Dexamples=disabled \ -Dtests=disabled \ -Ddoc=disabled ifeq ($(BR2_PACKAGE_GST1_VAAPI_ENCODERS),y) -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=yes +GST1_VAAPI_CONF_OPTS += -Dencoders=enabled else -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=no +GST1_VAAPI_CONF_OPTS += -Dencoders=disabled +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) +GST1_VAAPI_CONF_OPTS += -Degl=enabled +GST1_VAAPI_DEPENDENCIES += libegl +else +GST1_VAAPI_CONF_OPTS += -Degl=disabled +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +GST1_VAAPI_CONF_OPTS += -Dwayland=enabled +else +GST1_VAAPI_CONF_OPTS += -Dwayland=disabled +endif + +ifeq ($(BR2_PACKAGE_XORG7),y) +GST1_VAAPI_CONF_OPTS += -Dx11=enabled +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +GST1_VAAPI_CONF_OPTS += -Dglx=enabled +else +GST1_VAAPI_CONF_OPTS += -Dglx=disabled +endif +else +GST1_VAAPI_CONF_OPTS += -Dx11=disabled -Dglx=disabled endif $(eval $(meson-package)) -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:57 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:57 -0700 Subject: [Buildroot] [PATCH 12/13] package/gst-omx: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-12-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 140ad626f7..51ea74a0cb 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.4.tar.xz.sha256sum -sha256 70ddd485e2dcab79070164d61ad2ff3a63e15a1d7abf9075d86eb77762b0edfd gst-omx-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.0.tar.xz.sha256sum +sha256 dbc951a99af532380e599aa8acd9e1385fdb299b46b5868cd2be4230ad888341 gst-omx-1.22.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index d644c44995..6f7168279b 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.4 +GST_OMX_VERSION = 1.22.0 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:55 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:55 -0700 Subject: [Buildroot] [PATCH 10/13] package/gst1-rtsp-server: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-10-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 b6a31f8796..f37e7bb292 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.4.tar.xz.sha256sum -sha256 88d9ef634e59aeb8cc183ad5ae444557c5a88dd49d833b9072bc6e1fae6a3d7d gst-rtsp-server-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.0.tar.xz.sha256sum +sha256 aea24eeb59ee5fadfac355de2f7cecb51966c3e147e5ad7cfb4c314f1a4086ed gst-rtsp-server-1.22.0.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 0b18c1fcf8..6b4bd49fde 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.4 +GST1_RTSP_SERVER_VERSION = 1.22.0 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.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:56 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:56 -0700 Subject: [Buildroot] [PATCH 11/13] package/gstreamer1-editing-services: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-11-james.hilliard1@gmail.com> Add a patch fixing an incorrect gstreamer-validate-1.0 dependency name. Signed-off-by: James Hilliard --- ...treamer-validate-1.0-dependency-name.patch | 35 +++++++++++++++++++ .../gstreamer1-editing-services.hash | 4 +-- .../gstreamer1-editing-services.mk | 2 +- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch diff --git a/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch b/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch new file mode 100644 index 0000000000..6c190d3727 --- /dev/null +++ b/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch @@ -0,0 +1,35 @@ +From c3edd999195445319ea619b6d719d7743f5b560d Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 31 Jan 2023 21:38:09 -0700 +Subject: [PATCH] Fix gstreamer-validate-1.0 dependency name + +The gst-devtools project generates gstreamer-validate-1.0.pc, this +must match the dependency in gst-editing-services for detection +to work properly. + +Fixes: +Run-time dependency gst-validate-1.0 found: NO (tried pkgconfig and cmake) + +Signed-off-by: James Hilliard +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3859] +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index bdc47f5d8b..b949f55317 100644 +--- a/meson.build ++++ b/meson.build +@@ -110,7 +110,7 @@ if host_machine.system() != 'windows' + endif + gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, + fallback : ['gstreamer', 'gst_controller_dep']) +-gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : get_option('validate'), ++gstvalidate_dep = dependency('gstreamer-validate-1.0', version : gst_req, required : get_option('validate'), + fallback : ['gst-devtools', 'validate_dep']) + + gio_dep = dependency('gio-2.0', version: glib_req) +-- +2.34.1 + diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 308596d7cd..bd5dcfdbaf 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.4.tar.xz.sha256sum -sha256 aa03e983af5d79c1befffe3575b034e60960619a96bf877447cb73c28016fc41 gst-editing-services-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.0.tar.xz.sha256sum +sha256 2a23856379af03586b66c193910fa8bb963024580bc2337c7405578dc077aa79 gst-editing-services-1.22.0.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 77feb15991..0ae9205c3b 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.4 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.0 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.34.1 From james.hilliard1 at gmail.com Wed Feb 1 05:16:58 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 31 Jan 2023 22:16:58 -0700 Subject: [Buildroot] [PATCH 13/13] package/gst1-python: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <20230201051658.383420-13-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 adb116ac4c..128a739c2c 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.4.tar.xz.sha256sum -sha256 5eb4136d03e2a495f4499c8b2e6d9d3e7b5e73c5a8b8acf9213d57bc6a7bd3c1 gst-python-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.0.tar.xz.sha256sum +sha256 6c63ad364ca4617eb2cbb3975ab26c66760eb3c7a6adf5be69f99c11e21ef3a5 gst-python-1.22.0.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index feb2de718a..2fc268b0ac 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.4 +GST1_PYTHON_VERSION = 1.22.0 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.34.1 From KAMenyaev at sberdevices.ru Wed Feb 1 06:00:01 2023 From: KAMenyaev at sberdevices.ru (KAMenyaev at sberdevices.ru) Date: Wed, 1 Feb 2023 09:00:01 +0300 Subject: [Buildroot] [PATCH 1/1] package/tinyalsa: add option to enable utility tools Message-ID: <20230201060001.134150-1-KAMenyaev@sberdevices.ru> From: Konstantin Menyaev Add option to enable useful tools, like tinyplay, tinymix, etc. Signed-off-by: Konstantin Menyaev --- package/tinyalsa/Config.in | 9 +++++++++ package/tinyalsa/tinyalsa.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/tinyalsa/Config.in b/package/tinyalsa/Config.in index d9ce22c8a7..b4d4aeb276 100644 --- a/package/tinyalsa/Config.in +++ b/package/tinyalsa/Config.in @@ -13,5 +13,14 @@ config BR2_PACKAGE_TINYALSA https://github.com/tinyalsa/tinyalsa +if BR2_PACKAGE_TINYALSA + +config BR2_PACKAGE_TINYALSA_TOOLS + bool "tinyalsa tools" + help + Build utility tools (tinyplay, tinycap, tinymix, tinypcminfo) + +endif #BR2_PACKAGE_TINYALSA + comment "tinyalsa needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index b5c39e35d6..fe6d373ec8 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -9,6 +9,12 @@ TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3-Clause TINYALSA_LICENSE_FILES = NOTICE TINYALSA_INSTALL_STAGING = YES -TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled +TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled + +ifeq ($(BR2_PACKAGE_TINYALSA_TOOLS),y) +TINYALSA_CONF_OPTS += -Dutils=enabled +else +TINYALSA_CONF_OPTS += -Dutils=disabled +endif $(eval $(meson-package)) -- 2.39.1 From thomas.petazzoni at bootlin.com Wed Feb 1 07:00:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 01 Feb 2023 07:00:28 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-01-31 Message-ID: <20230201070035.450A160E4B@smtp3.osuosl.org> Hello, Autobuild statistics for 2023-01-31 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 5 | 2 | 0 | 7 | 2022.11.x | 14 | 22 | 0 | 36 | master | 202 | 303 | 0 | 505 | Classification of failures by reason for master ----------------------------------------------- host-fwup-1.9.1 | 24 fwup-1.9.1 | 21 fluent-bit-2.0.8 | 20 libfuse3-3.13.0 | 13 bash-5.2.15 | 11 host-binutils-2.38 | 9 norm-1.5.8 | 8 unknown | 8 host-pahole-1.24 | 7 elfutils-0.186 | 6 jack2-1.9.21 | 6 xz-5.2.10 | 6 gerbera-1.10.0 | 5 host-go-1.19.5 | 5 host-rust-1.66.1 | 5 janet-1.26.0 | 5 libglib2-2.72.3 | 5 linux-6.1.5 | 5 opkg-0.4.5 | 5 xxhash-0.8.1 | 5 dahdi-linux-3.2.0 | 4 dmalloc-5.6.5 | 4 gobject-introspection-1.72.0 | 4 pixz-1.0.7 | 4 wolfssl-5.5.3 | 4 fxdiv-63058eff77e11aa15bf53... | 3 glibc-2.36-81-g4f4d7a13edfd... | 3 host-binutils-2.39 | 3 mobile-broadband-provider-i... | 3 nerdctl-1.0.0 | 3 ntp-4.2.8p15 | 3 python-bcrypt-4.0.1 | 3 python-cryptography-39.0.0 | 3 qemu-7.2.0 | 3 assimp-5.2.5 | 2 cairo-1.16.0 | 2 f2fs-tools-1.15.0 | 2 gvfs-1.48.1 | 2 host-binutils-2.37 | 2 host-gcc-final-10.4.0 | 2 host-sentry-cli-2.8.0 | 2 libcamera-apps-1.1.0 | 2 libostree-2022.7 | 2 linux-5.10.145-cip17 | 2 ltp-testsuite-20220930 | 2 optee-client-3.19.0 | 2 perl-5.36.0 | 2 python-numpy-1.23.5 | 2 zeek-4.1.1 | 2 bind-9.16.33 | 1 binutils-arc-2020.09-release | 1 bird-2.0.11 | 1 coreutils-9.1 | 1 dbus-cxx-2.3.1 | 1 dhcp-4.4.3-P1 | 1 edk2-edk2-stable202208 | 1 efivar-38 | 1 frr-8.4.2 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fwts-22.09.00 | 1 gmp-6.2.1 | 1 gnuradio-3.10.4.0 | 1 google-breakpad-c85eb4a59b6... | 1 host-delve-1.20.0 | 1 host-gdb-arc-2020.09-releas... | 1 host-python-maturin-0.14.9 | 1 host-runc-1.1.4 | 1 ipmitool-1_8_19 | 1 jemalloc-5.3.0 | 1 json-c-0.16 | 1 libcap-ng-0.8.3 | 1 libdeflate-1.15 | 1 libgpg-error-1.46 | 1 libmad-0.15.1b | 1 libvorbis-1.3.7 | 1 liquid-dsp-1.4.0 | 1 lpc32xxcdl-2.11 | 1 matio-1.5.23 | 1 multipath-tools-0.9.4 | 1 musl-1.2.3 | 1 mutt-2.2.9 | 1 neon-2-sse-a15b489e1222b208... | 1 pcre2-10.42 | 1 rsync-3.2.7 | 1 rtl8723ds-bt-14cedf3a9fec1a... | 1 sexpect-2.3.14 | 1 traceroute-2.1.0 | 1 uclibc-1.0.42 | 1 ulog-0389d243352255f6182326... | 1 valgrind-3.19.0 | 1 vlc-3.0.18 | 1 xenomai-3.0.10 | 1 xfsprogs-5.14.2 | 1 zabbix-5.4.9 | 1 zlib-ng-2.0.6 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/c03a7ea4fa911768517c671cf8911dd1e583d418 | ORPH mips | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/8185261a1f11beec862de86e1d5e0576bb7efd8c | ORPH mips | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/7f300f0b35c79ea2299be9c405c6e2d005bee83e | ORPH mips | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/cfbd6319263686801f111223058060d153a3211a | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/94b7350e8d9443f636de2897fa3653fca120e4aa | ORPH arceb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/484e88878c809d18363e9c5848ffa86d6793a977 | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/2eb76c4f23519ac853e3f832726d23f1a96b3a53 | ORPH xtensa | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/86d9900c9060fa3df2a126f2f8b9f4722eda72e7 | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/14c5411ac5936204fcc26b56bb67c95e9583adfa | ORPH microblaze | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/b9f741ed1073385bb5ff10dabbea30d2c6430700 | ORPH x86_64 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/5fbc831620e72cb901765031491786015a1f5a5a | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/2de7c92214648809a267f0e74e7691aea4c4b09d | ORPH microblazeel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/402039a5ee4d23cb8634191bde3590723432c9de | ORPH sh4aeb | bind-9.16.33 | NOK | http://autobuild.buildroot.net/results/80c1754c1e500970cfb81bf71221409856533913 | ORPH arc | binutils-arc-2020.09-release | NOK | http://autobuild.buildroot.net/results/006a934a15abbac13d80f97f710e484d8fc6367f | arc | bird-2.0.11 | NOK | http://autobuild.buildroot.net/results/16c7d44b86b6cff4707cfc0ec111197f7e728b79 | powerpc | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/9f82169a3a8bc883af21cdb60f2c44450e340721 | powerpc | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/41f9ff89593f7fd5c8727bd355e1cd4e735f549a | sh4a | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/e76e2a32c6c1ced860b8d6b2bad35506642d037b | ORPH x86_64 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/06607b1d142b4bfcaf31980f9255407637c73661 | aarch64_be | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/c762b04dee0d0552efdd7c6de22d8159cd9fc41b | mips64el | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/ef817fa147298e51a3be004546426ca4951bfd19 | powerpc64le | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/407265f845c1acc9f2bf46bc346fe7aa9f75f024 | or1k | dbus-cxx-2.3.1 | NOK | http://autobuild.buildroot.net/results/61ac1cecfc5af2261ff7dca3f4931b13a29f4a0a | sh4 | dhcp-4.4.3-P1 | NOK | http://autobuild.buildroot.net/results/155bc9f83a0c0f2a08c1396f949e87f207b8aefa | ORPH i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/418b63ce6f2a29247ba04675b748b2dfcd8a6eda | ORPH i586 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/eb8f9e26e4a63716ff8ed66e486f93209943b98c | ORPH i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/161c08abe4cfaaa08b8598b06677d2b2b1cb64a0 | ORPH i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/37cbdd461bcdef2ed507ea56f799219b4af5342e | ORPH x86_64 | edk2-edk2-stable202208 | NOK | http://autobuild.buildroot.net/results/c8b319ccdd2b515be6805b3d2abad30711205d00 | aarch64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/6f5fa4e67763439f64260685fe6862c99130cb14 | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/cb4b5d18591d8bfa53460fea45ff69708cb165cd | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/c454a24a97c1a0b9ded4143549ec73c974ca0694 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/b12c739a37525469de2ed97cccc99c402047b49e | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3f81aa51cf204372e06400c0b65be7d398b4e9b5 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/2893e59bb2b5d7260ca486ba8a7fbc685ddba5f9 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/01a9852f28639a03f781a7390c7c0090f76a48b1 | ORPH or1k | f2fs-tools-1.15.0 | NOK | http://autobuild.buildroot.net/results/8fbd9c9d98de1bfa095f782aea6c9f8751c5c9c3 | or1k | f2fs-tools-1.15.0 | NOK | http://autobuild.buildroot.net/results/86f83e04be0e89e9153d205bfff7d530084e37ea | aarch64 | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/755b705c3b4fae5fbe5ac7d0b0ec707518f1b51f | sh4aeb | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/596e1793170d57372b6b109d825d1576ddef24ed | sh4 | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/a03d3fef83f5ddb560201d4824f1a0d18cbbf777 | mips64 | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/291161e513081e693dfd11d4c636bbcbc81115ed | microblaze | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/a5d92b6a1a6960917639ae501073ac5288d9b025 | mips64el | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/d182ac02ce84109d5a695d3f02e3376dc41958c2 | armeb | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/7c5a2b5a4425e4d6ce7720ba295176a16d142cf4 | armeb | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/d200442c7ad5bbcaad811edee9d2a5c0771f6336 | sparc64 | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/46404ea2d3f3491b5e69e21c96519a48c84f0720 | mipsel | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/5a0ecf2311988034801be0393aaa4656277e9770 | arm | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/75ff8cb73b98652937535d56924ef49b353339f5 | arm | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/f5dee7623bc8af19dcdc3fc6c642b0174538e3fc | armeb | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/2fe2a33ef5f973f4ea116a02153b83d6a4f9dae5 | aarch64_be | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/f8faaf1498dd44c594fb8f3a61890727bc4f2bd1 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/55c18476212c34d2e066ae51fc911af13e433ab6 | mips | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/c413e1b5e8ab44d8a7ede7d70a03767b3ff1b63d | powerpc64le | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/f40dea7e9e82151128142e60572e534683e31c05 | microblazeel | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/85312092b0ca251f74690f37088a6bad322de793 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/cde4de57aebfcdf1636332c25a109d0266af2884 | armeb | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/cee20b9ef5ad030948a994553d089b2445149454 | xtensa | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/c6e167ae05153917b8afc421221bce262d03976e | sparc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/4e386d11379e8472369087b9b0fecdd24b4892cb | mipsel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/68cd935e4c60b7944ae511e1dbed31eca187c946 | aarch64 | fwts-22.09.00 | NOK | http://autobuild.buildroot.net/results/96d6f4c0f9d2201b03cf468a3d593fd05c5d8268 | arm | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e0eacc4bb6abff040c1d1f16925bd672949e1d16 | arm | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e51895e530c4a931b0fc4bb97c2d11c8edebc18f | sparc64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/c7fc39552b35155e522c0f867fdba1f9edb6a27d | mips64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/9cc600c5f88ff449a0cd2294d15302c0b18bead2 | powerpc64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/b206a8d9e778dcc313f4fd834a49c567ab449bab | armeb | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8f1111c5d2c1366ff29f7d0132a994a4b822dca0 | x86_64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3bc94f4d3345e7cc76ab59600c101b57b5abf63a | mipsel | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/bac9a84dafb33a77c5f893e5c3f7f5dc53c7f0ea | or1k | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7e99a7c1583a8a63415d0ef5b2bab550c1826e61 | mips64el | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/41d7a7aa16c5c92eb328444e012b36576e85703c | m68k | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/bb1e8345778e60be18d7c7e1b3361922a05974e7 | sparc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/a983490ae8c4c15781712f3b0cd0781410281fbc | mips64el | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ffa0b7f5f80b97994204c9857b1554b788cbdcbf | powerpc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/2fc295ded2a5e6b95e8e81a0942f90db5eb3cffd | powerpc64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/b7725765e6348730444ff84fa6a3357037ba11b5 | nios2 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/4718dae608e51e92a6411199a8358ad102968ba5 | riscv32 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/b9777fffdea5354db36f8d2ce3e06352b72611ca | aarch64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/6a75c8561f528da5dd6fda3dd2e34184a4517e22 | powerpc64le | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/2c7b225b1cc5d4924fa635147a09f8c2c2ef2129 | microblaze | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/2fa5a0b6401cc8f789ee8a11efe4a79789684df4 | aarch64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/4d1c45e161a49b39d914f33bb65cb8f2609f8b84 | mipsel | fxdiv-63058eff77e11aa15bf53... | NOK | http://autobuild.buildroot.net/results/a9db782dd3610058dfb5c44db2fa8b719b12000b | mips64el | fxdiv-63058eff77e11aa15bf53... | NOK | http://autobuild.buildroot.net/results/18eb0f3e1a5a7fb389c9ad1bbed2db78fc36245b | x86_64 | fxdiv-63058eff77e11aa15bf53... | NOK | http://autobuild.buildroot.net/results/627574e02fe878390b12c2a100672247f450261d | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/b4e57afe4096280f247a2886ad3de40fcb5c360f | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/12e146565a394255f6b428e6b9b4f6a9312ed338 | mipsel | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/b9fa61f9b0ebacbe70ca8359aa62dc3a91964e46 | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/20b73fc190c275d39ce52bfe59ea280c74c4bdc8 | m68k | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/b5d47a707efe96923b9e3a606f5caa1c5475d4c0 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e680edc4c8d2686fa4de42594fae90a467b88707 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/86e5ffee1b1ad2b85f4248886dd9f637342b101a | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/559848cbc50f0c3ee555d63eabaa5195cec9fb39 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/7bc8476f8a19b671597fe86c771deeaad269923f | ORPH i686 | gnuradio-3.10.4.0 | NOK | http://autobuild.buildroot.net/results/af0152a233cc0242f862b6093f52eb0b9e315522 | s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/ce3eeca32b8e1d2de431bb782c2e9adc3c0f749c | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2c0ffbd97486abe6fe3cfc6e87a528f8f5f3acfc | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d385f8a7dd00e28c0e1c7b05399f676ca62ada35 | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/aa337b0b9441b7d3b898509b4f2e23f6dc6f644b | ORPH arm | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/01bf701a48497c803211d7b2ce1eb466c1d35992 | mips64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/9609a528cd923353a6291229b5bdacecc61f0fb5 | ORPH mipsel | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/69bdc07b4114844179b3a331fbcae0be856ae4c8 | ORPH mips64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/e6654f796dae6aa768b32e5468e66c54d9351557 | sh4a | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/78498e0380577ab0d2acf308c241734860089e8a | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/9597684ed8fca90f927cf50782fcbb00bee13fc3 | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/c35f738eb3ce5159582b1afd2b9ca0f0a5af6b1c | mips64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/3beed9ecb68aaf30a891830f385834585e58a41c | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/aed5958d7ebbabf84de49a265b8c82f53dcd3de2 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/92aaff832805f746480b1733c05120298296b8ed | powerpc64le | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/7eb518eefdb990f42546ef628d334a4027cd7454 | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/69eb00656616f5eb813648f3d7f1fbde778ce9ab | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e50ab2ac80b64a30e28de6e0b8b7734cac17d520 | aarch64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/443ce7edb7d306ec536a845e29bed45686e905f3 | sparc | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/345866ada537aaebe3a1e201116af3ec56cb9d81 | or1k | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/d73dd5a654452358032271f77768023cf55a2b7d | mips64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/90ad28fd811fb40085463d37720f9903b9be64d2 | arm | host-delve-1.20.0 | NOK | http://autobuild.buildroot.net/results/e95359a068f3a3e7e3d80acc6fbd28f2e3e25a2b | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/5b072c4a35624ec393269d5ade3e4537a39a22c0 | nios2 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ca727d5c3a2404cc9cac3e252a92390c309519ba | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/a6cfa358f35a4b15f81637533c35367f94bdf808 | arc | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7f8b9ef35e122adbf0cca6c1b14d69cb47a6e347 | m68k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/1d9adb870f284eff7178342056d48aff1fc547e2 | riscv32 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d2b832f53025944a286bd027ad96b98269448d52 | microblazeel | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/6fd287c6b348140ffab2b1ba18a02ebf8f25daad | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3c5c9b083e129d87d6ae5630997157eee1bba582 | mips | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/6dae5cc73aca865a98862e984a5dd0ae67527387 | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e1cd7c42eb4daec6dcfe2cb1a444c3f64e56d7cf | xtensa | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/5b93dce8773ff6ccf0ff6479ca3d57da23eb468e | powerpc64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7d9ee9d53781c0934fb37d934df36b1cfd836048 | mips64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/63445e8a46fff99e317c07660c735f0416d699d4 | powerpc64le | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/1bd75b7b5e0e7ef1c8e930e0c397480109b837f1 | sparc | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/508ff798da6402bd9f69243c247f49977778504f | aarch64_be | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/0032fb377ae46ed2622aba323f19a33f89733d51 | arm | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/354cdfb6c6ffc9a502552a4265cf8ddaf68d63f5 | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/dceed1ff73b97b960bf09047578cfe1f617fa2a6 | armeb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/b39d04e1580b688b03c5dc3274306a7cb5c91757 | m68k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/38d94f950bbb633a1183c4a782042f0d3780e9a6 | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/6e9d85e2436e9df0d130c611dd237f7d20554051 | powerpc64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/dfd3641bbbdf1e9daf563025330b878e692f7dc2 | m68k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/132cf1a204516d62926bad10ffdb7761ad11fbbe | arm | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8d98ed784fae0791139a5197116db3095e4cb076 | arceb | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/3dd43a444b04d08cde2f83d284d2a0ea61d93c26 | microblaze | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/0d62bac24bc8b2bf2df9213dff93f75ecfc3517a | arceb | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/012b815627a12b899dea8b035e20a56d52e12090 | ORPH mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/dc1867046a2a08e7aa728f5fc067a73a2f7def0f | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f88237b44c5eed0a0e0098ab8b7178350519b18f | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/d6c7b97a2486635a86ee95a570c3fb0e017e7120 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/14181a41583d4346f3c4bda969c83df01fa777ec | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/a16228fb62d0a501c63359597cb4f66b8a1b57eb | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/dfa0d2e94f91b33e81cff6e83d49f2a757163155 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1da1e44f0042fe0345d3e4cf830d30fcdf84e9c7 | xtensa | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/334b39ea40fc685f64ca7b4c7c25c2a7abe728ba | mipsel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/cc4123e8028e7dafe8c779eb6300fb054c24c8cf | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2bd2633902a3bb826079129160fa49dbbd8381d5 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/6379adee5bcc4a41aadb4a7de34c24ad73fb2f98 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/a5ece21a2742db8c82f0472f630942ad39f6b5a1 | aarch64 | host-python-maturin-0.14.9 | NOK | http://autobuild.buildroot.net/results/cc6f8e31fb5f04f171f9258fef179a4fdaf27f27 | mips64 | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/ed11c2ce668c163bd6c544eaca3195bef5a8678a | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/25ea6048fde3bfd99c4ebcf12763c9c8c6ff1c44 | mipsel | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/47799a8edc2884fb348f78b75951682562845575 | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/11c9f67112069c696c7119499f921358e7ccb22f | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/a3b5c4996ca7efdb4b0482173d3323b4d5676eef | mips | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/32b83a5be46d2c51f528975f262980d0cd205bb8 | mips | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/c3628adfb15b33e9c2b7a74ccb591a793c98921c | powerpc64le | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/511abdc17256a5ecee67a0fc4c6a9565d197324c | or1k | ipmitool-1_8_19 | NOK | http://autobuild.buildroot.net/results/e440999aa09534b54b219a48d06da4d2f216d39b | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/5d60808f99088909e517c4e58f1961c0c83493e0 | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/a6495af7dc754dff8c9a262d7910de7ef298244d | s390x | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/d1884b4d235928da03dfdf67feec09f509dc9185 | aarch64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/2696f42d77c3f8826a8f1670464b7cf4b8651a2a | mipsel | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/581cfe21191507485473c546338c7b6d281715ca | microblaze | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/a77633d016cf477d411689c0434ff7ed97da37ed | xtensa | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/8a64759ca41b1bfd0c3579c83889ec33eb785751 | powerpc64 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/6444e8ef17925fb2eea36c4b16ae63df7eead802 | riscv32 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/fc63ef9e7df62502bb5320392a3c25f5c6b7a96f | sh4eb | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/cc32d715239b30819b122dc2cd6c82ab95d946e8 | riscv64 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/caa24d0142e8bd3e1b19f2c38f825da13508eef5 | sh4 | jemalloc-5.3.0 | NOK | http://autobuild.buildroot.net/results/5fd46593dbfd5d480456a7f9962afd29ed0c2fde | riscv64 | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/041ed53d3237b86856dd488cb68132905dd793fd | armeb | libcamera-apps-1.1.0 | NOK | http://autobuild.buildroot.net/results/656121dfc7822788ed70c66952c0f7590c152a4e | mipsel | libcamera-apps-1.1.0 | NOK | http://autobuild.buildroot.net/results/1867412523ba300058f52dece43dea66ec15f0f3 | or1k | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/0edca16eebe44e343b55e3e8f9233fa79001baed | arm | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/f3b857f4d412d6b083badb2dd5abb7b1af2553bc | or1k | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/14c0d75a88bfdcd2ff663dc5932567fc89a8e58a | aarch64 | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/8e1adbb1bab7804900d764a0c6286e544b499781 | or1k | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/6dba0e45632efaa6155e2dd19393801074ada31f | sparc64 | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/e095278f89a00e4e20198110fa3748f04071698a | powerpc | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/6568aab407338d5ab929d44988ee58f488f2b660 | powerpc64le | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/1687c1f48c672e849ac1ab8c9fa9afed6d3f03ab | mips64el | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/d582522b25cc0257003f006cb8be1f08e0d6d503 | microblazeel | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/28f9b3f89918f71f7d00734c3c62ffed57e64397 | mipsel | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/80a5f9b02f8c754b8e4bf2ec3d55bdb333a54f36 | microblaze | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/3926f89af855ad70aa4fc04469916ba26ccd2c88 | mips64 | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/a984d275d949e8dc989870d2d2b6f6c7168d52bb | or1k | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/80613c2cc051f43f238139c4e115b5104db69bd4 | powerpc | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/17fd5dad2e3c384b99d6abe7ba44a3cac72edff1 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/aec1a4eda207fa890aeba82e6cb0541346413eab | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/1d3e8cc2f8a8d3e0b5c6cfc0d75ce7f459932125 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/822b53542ec4c5d5dfef099c3e33e7dcd1c072e6 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/004ee39278690f11415c2bd4496b93d1eed747f8 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/4277d67aa70524fbe12896a7349a8c72826ed8ec | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/5fd97c464fde422d4fef525a15be76de55e39f51 | ORPH arm | libmad-0.15.1b | NOK | http://autobuild.buildroot.net/results/a7dce0abea1b54cda8b544d4b13e11839d1e8c78 | ORPH aarch64_be | libostree-2022.7 | NOK | http://autobuild.buildroot.net/results/b30090b5d9cff1eaf1aad31ba628e224b15f9139 | arm | libostree-2022.7 | NOK | http://autobuild.buildroot.net/results/af6402b749b51f112508eec019be4f7b63866f97 | powerpc | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/e42892e58d2393e06304fae28ca7943cf9e5d00a | mips64 | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/c89823649ee4c685c07f0501fa2664d2d11843ce | ORPH powerpc | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/e10f54118d18d5a82e9731fc1a9977e2f6db5b94 | ORPH sh4a | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/ecb3514459642e751b3a19a49b941c4f242d1c56 | ORPH m68k | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/31887e1f8f1acfaa1984d30eb4c28c732b091c7d | ORPH sh4aeb | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/b7c2fff8cc8cec3019af8c4392dfcf1c52473233 | ORPH sh4a | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/33c3e39a85fa6826d228444893caaffbbbb37402 | ORPH arceb | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/ace40dfcb8565e50704115aa74772bc69bc83c79 | ORPH arm | liquid-dsp-1.4.0 | NOK | http://autobuild.buildroot.net/results/63a6812fe41f72a59d1c78e5e9b5d876686ee121 | arm | lpc32xxcdl-2.11 | NOK | http://autobuild.buildroot.net/results/acfc7f3e3a160847a7b534753d695037d18c6c87 | ORPH x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/9038dce0d99f2ec90f7ad3b0b8b9f7bace675f59 | sparc64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/9ac8c48d90d77d1c0bead213d9f888a9c8ea06b6 | nios2 | matio-1.5.23 | NOK | http://autobuild.buildroot.net/results/0e0ca9839030c564e7deeca0ee0c8af865c5152b | mips64el | mobile-broadband-provider-i... | NOK | http://autobuild.buildroot.net/results/f15cfa9202610a097b820e7221297ef70a903d82 | ORPH sh4aeb | mobile-broadband-provider-i... | NOK | http://autobuild.buildroot.net/results/8b5783bc03a6d29aa84385ca9d94f33487bd7edf | ORPH or1k | mobile-broadband-provider-i... | NOK | http://autobuild.buildroot.net/results/24cee463eb6f8c60b60f50137c28a119be382520 | ORPH mips64el | multipath-tools-0.9.4 | NOK | http://autobuild.buildroot.net/results/0e692f898762c47b019765c5c9143c62e32991c2 | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/c50f0459c426b0447eab524f887c07451ed2b597 | mips | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/bdcb0338362acf5a9f3006430318c282b92e74b4 | i686 | neon-2-sse-a15b489e1222b208... | NOK | http://autobuild.buildroot.net/results/42944d8151f5ed8927a6e3a853d5fc272f582c88 | aarch64 | nerdctl-1.0.0 | NOK | http://autobuild.buildroot.net/results/ba46ba63883c3beaf12fc3597404d813fd0fbd04 | s390x | nerdctl-1.0.0 | NOK | http://autobuild.buildroot.net/results/75e21f2d9525c6a93edbd3d2a331b241e51647f1 | i686 | nerdctl-1.0.0 | NOK | http://autobuild.buildroot.net/results/51fddb12c234a148b4c65ca12f8f8cc2792583be | powerpc64le | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/f3ef7d3c76b3100221a81f4796c6469254fe7f78 | ORPH x86_64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/bd1e6871410818377b371fa06d7d60328f15f56d | ORPH microblaze | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/06290e81856d6261eed5281a55bf790f747ecafc | ORPH nios2 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/7aefe63fc39522c9cdabf5fd0c01f8e6b676311c | ORPH riscv32 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/80f666c32d3d7948991056fa7d47b5bd8b0e7e6c | ORPH arm | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/37b7cb6c1edf7f855b5cbc1d43ac9670f3ecaa2f | ORPH x86_64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/d69d19fb6a152dfa334bd31cfa3165117cf83dc1 | ORPH arm | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/4e3983ce16e3ba3b3e450655fd592d902ddd5538 | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/88b41b56a0ecaf8cdcb57ce6d662f414c9c02ab9 | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/a743d25c0dc7bdd8a5d4ae09e463e03ecc1883ec | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/7cbafad6a1c3db5875aef428d0a061384bfad653 | ORPH or1k | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/f091ac470349e7dd1541531242bfc32b26c16296 | ORPH aarch64 | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/acf8f819a5012b400ea7ae7a7907e63665e3fe89 | ORPH xtensa | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/501831f12f61023c1abc513669b6f139a33ab01c | ORPH or1k | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/e9570f2b50401e828dbdd96e94332b198dd74571 | ORPH sh4eb | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/3e7cbaab4a1cba524b97e9b2e61bdf670c5a85e0 | ORPH arc | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/3ba001ab11be72d543819672d9cc267f461730e3 | m68k | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/c5083dc21bdd060c88b6b7ba6ddf105c9c73698e | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/2b332116b0cabc903c9b6920c6cf0eb2dc8bd4da | ORPH arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/13f50641633cd3eec5e27b727d9a85cfa04692e9 | arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/cdbb22d0a0b9aef983c858360cf0d4ebdd809cc2 | mips64el | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/ae5218c718387fda9f230c2e715d2d8c93146a85 | or1k | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/22a1d6c845d400c59663f1775dea5a2c9684b34c | aarch64 | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/3e7f8e15796c9817e4466ac464f3eafc1964ec05 | arm | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/99acd3d9d9f5b26e755db855de86baec448d758f | powerpc64le | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/be2c3d7092c22f460c8814e00a8409b4cf841f16 | s390x | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/09a3967aa00590d959670a9fe9299a4dcad40c0c | mips64el | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/75df240787d4aefeb46854132c1b13d0b14b1e18 | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/851e3204e82a811158d68b6c91e4ce0231c2c190 | aarch64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/fa23843ff36c22b345046a9e7b540387fae41448 | s390x | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/d4dc81c724dff9a390c8808bd9ed808964aed5bd | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/479cd4d4666bc2fe38146c41926bb0b543bf9354 | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/4e1b69071f1b383e0f2709d46b3246d0eb66c288 | x86_64 | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/9082ee10057b1535412aa79c9f07350ba4e53c40 | mips | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/fbdd688d520e61b855a7cdc7163ec97b63df1643 | i586 | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/161aa74118eee19328eab5c8d0839fbceb2dae60 | arc | rsync-3.2.7 | NOK | http://autobuild.buildroot.net/results/3fbf5a40ed48b172f6001c6c0a1286fa4e68fed9 | armeb | rtl8723ds-bt-14cedf3a9fec1a... | NOK | http://autobuild.buildroot.net/results/69c74d13e374bd1d3645a17e89325061b2676a18 | riscv64 | sexpect-2.3.14 | NOK | http://autobuild.buildroot.net/results/a2b69fdf67d520aa4d2718bd688d88d102842cdf | microblazeel | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/d6173a2968db8e388e0e3aa0bb0711641328d18f | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/93b2a05680744179833f75ce160f033577743e5b | i686 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/6311c8a54aed28e77eb215d2fda49f30e1252b22 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/4f06c8f178c3e3cd4dfea25bd97282616e020271 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/2fd4999737f00cf2e43d1722c4de83a1aea32a4e | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/b9c6a302a5dca72e4fd36ecaa27b8a0e5e26baed | or1k | unknown | NOK | http://autobuild.buildroot.net/results/bc4a0ddc67e3f784a62a112f28705e3c2677d326 | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/4a3de4f5780c83e08d51d3f462672d3d96c8e850 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/4b726acb248fd5e9d89637f8a4b490bf2abe99dd | or1k | unknown | NOK | http://autobuild.buildroot.net/results/7eb3d8faf48d95d1b041fd415e7b080c87d8e1d8 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/20f545de615f15c2b70a37e5d54737d8b8f7b146 | mips64el | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/6f83c9d29ff7ef62f90d5a6470e23b8938e76f5b | ORPH microblazeel | vlc-3.0.18 | NOK | http://autobuild.buildroot.net/results/21b9cb0f406ad6c7bd9562e888d96a31d4db1d0b | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/b13d188223f1871ab0d0c3eacb975ee947343201 | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/9129a0b4b2d20a9af47c42c637ff3fff6eb3c5bf | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/6234fba149330e1596547a1b9fbd1ba39e6fd00c | riscv32 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/ead914c2aebbfaa7ed6f77c30a860858a9b0b1d8 | sh4 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/817f92e38edd58d954c0e44e3a842a616aed5fc2 | mips | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/f6c2e790915c9302cb0e283f1555beaf0149c2f7 | ORPH microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/bcd8c34ab7dfd17aaad56d1e1e9d83c1c8946eb2 | ORPH microblaze | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/df5ad3070f25af0df76d02d23b1d4e52822dcbe9 | ORPH x86_64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/9a0d3dca015d41d92f1231d4b2c03cb15f10c3d4 | ORPH or1k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/0c84ea1a838fd3f97917eba868e37f8c446ce36f | ORPH mips64el | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/9004e0e19df6fc4acaab764c40d01ae2117264a0 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/e0423b31666f3f0806566043b893621b8eab8bbc | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/3bb60cbf372458b47d2285efa1bdc2bb647bf6b0 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/4aad8e248d480cf8b738987454f5b3b653bd2fbe | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/cdcfcccac9059c41bbf15c80543263045d3ebd3a | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/3f8fdf4a938fdfdd260bc03341f5982a96ddd754 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/6850a352d9738f8e48373f8d6ea85981a9e55a62 | ORPH nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/3ae937f5da099e18f255ea9a3d505a74cc7ccd4e | sparc64 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/52b761778df3e16efc68623a6b37b2f06c75d1bb | sparc64 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/da67bce743c49bd8bffa01dc43e2fbccfd687696 | arm | zlib-ng-2.0.6 | NOK | http://autobuild.buildroot.net/results/11ebc3bf1b59d15afeaeb0cd1bd769b2a0727542 | ORPH Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 1 unknown | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/8d2044a60020d8d0dbbf85896c0116bfa33d222d | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/b01cc19a6f646eb6a644c3232a7328f07dda13d9 | Classification of failures by reason for 2022.11.x -------------------------------------------------- xxhash-0.8.1 | 3 host-pahole-1.24 | 2 linux-6.0.19 | 2 efivar-38 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 fstrcmp-0.7.D001 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 gocryptfs-2.2.1 | 1 host-go-1.19.5 | 1 janus-gateway-1.0.3 | 1 kmod-30 | 1 libdeflate-1.15 | 1 mender-3.4.0 | 1 rtl8189es-e58bd86c9d9408c64... | 1 xenomai-3.0.10 | 1 xz-5.2.7 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | efivar-38 | NOK | http://autobuild.buildroot.net/results/dc0e9b4dc72c90fdc6db7e5158e3f408a00fc601 | x86_64 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/cd84fcd65ff841fc62b77eac7e2d83389bf0838a | powerpc | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/2019a42cbec6dde7d1e4b152a2afafa5e637bd00 | arm | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/3d5e7adbace9bae9fd379c2ef8b30f740777ee11 | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/367e6435b482030994a06c33dd7039c60c1a3a26 | x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f64bcbefa901fc5e8f8fa6376aa0f5a179c26ff1 | ORPH s390x | gocryptfs-2.2.1 | NOK | http://autobuild.buildroot.net/results/b0b59a545ecd9fc2e3d09e898fcccb622171312c | aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/7622e8d9a829b998bef621b045fd379b8f6870e2 | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/5b470415ca78411ae258f07636caad2c9a3065d9 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8de60a3347b819c0cc59a3962c115617132fa01d | mips64el | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/4232fe51254d0f30455f92520ff2cfea6079aa6d | arceb | kmod-30 | NOK | http://autobuild.buildroot.net/results/5fa05646e9d3b2c6d482538cf687abac4c32bc49 | arm | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/6abfe47238e27325734cfe86173cc08fb8e7fb16 | s390x | linux-6.0.19 | NOK | http://autobuild.buildroot.net/results/202fc154c67375aec40be5e2c61895944fac34b1 | ORPH nios2 | linux-6.0.19 | NOK | http://autobuild.buildroot.net/results/962096b3718f0aa2b069c07606b2a5c5acc578dc | ORPH powerpc64le | mender-3.4.0 | NOK | http://autobuild.buildroot.net/results/a47bb16272d033af1297d64cf4a451f5b5b383b3 | powerpc64le | rtl8189es-e58bd86c9d9408c64... | NOK | http://autobuild.buildroot.net/results/40ee78819899aa854cb5384a2f4aa37704384e41 | sh4eb | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/d5c6f066203ff0570c2aa9b3083d3007fd6001d7 | microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/e26207da8ab45597af56bc0cf28a03c808df573f | ORPH aarch64_be | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/0276bae5e9e36731d2a64a3de16449832ee2e08b | ORPH mips64el | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/2c62ce81ea5dcdde4db97c97d3a2f15a27f18815 | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/c0ffe026640564d8445753ed2626b5fbe76c15a6 | ORPH Gitlab CI results for 2023-01-31 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestAarch64Pages64kGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971547 | ORPH TestAarch64Pages64kMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971548 | ORPH TestAarch64Pages64kuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971549 | ORPH TestCheckPackage | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971783 | TestClangCompilerRT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971359 | ORPH TestCpioDracutMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971301 | ORPH TestCrudiniPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971360 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971361 | ORPH TestDropbear | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971362 | ORPH TestDtbocfg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971363 | ORPH TestExecline | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971364 | ORPH TestExt2r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971308 | ORPH ...rch64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971559 | ORPH ...tlinAarch64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971561 | ORPH ...arch64MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971562 | ORPH ...otlinAarch64MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971564 | ORPH ...ch64UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971566 | ORPH ...linAarch64UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971567 | ORPH ...h64beGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971569 | ORPH ...inAarch64beGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971570 | ORPH ...64beUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971571 | ORPH ...nAarch64beUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971572 | ORPH ...750dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971573 | ORPH ...nArcle750dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971574 | ORPH ...ehs38GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971575 | ORPH ...inArclehs38GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971576 | ORPH ...hs38UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971578 | ORPH ...nArclehs38UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971579 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971581 | ORPH ...mebv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971582 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971584 | ORPH ...rmebv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971585 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971587 | ORPH ...ebv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971588 | ORPH ...5eabiGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971590 | ORPH ...inArmv5eabiGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971591 | ORPH ...v5eabiMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971592 | ORPH ...linArmv5eabiMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971595 | ORPH ...eabiUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971597 | ORPH ...nArmv5eabiUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971599 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971602 | ORPH ...Armv6eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971605 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971606 | ORPH ...nArmv6eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971607 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971608 | ORPH ...rmv6eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971609 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971610 | ORPH ...Armv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971611 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971612 | ORPH ...nArmv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971613 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971614 | ORPH ...rmv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971615 | ORPH ...mv7mUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971616 | ORPH ...tlinArmv7mUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971617 | ORPH ...8xxxUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971618 | ORPH ...nM68k68xxxUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971619 | ORPH ...fireUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971620 | ORPH ...8kcoldfireUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971621 | ORPH ...azebeGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971622 | ORPH ...icroblazebeGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971623 | ORPH ...lazebeMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971624 | ORPH ...MicroblazebeMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971625 | ORPH ...zebeUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971626 | ORPH ...croblazebeUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971627 | ORPH ...azeelGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971628 | ORPH ...icroblazeelGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971629 | ORPH ...lazeelMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971630 | ORPH ...MicroblazeelMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971631 | ORPH ...zeelUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971632 | ORPH ...croblazeelUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971633 | ORPH ...ips32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971634 | ORPH ...otlinMips32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971635 | ORPH ...Mips32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971636 | ORPH ...ootlinMips32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971638 | ORPH ...ps32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971639 | ORPH ...tlinMips32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971640 | ORPH ...s32elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971641 | ORPH ...linMips32elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971642 | ORPH ...ps32elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971643 | ORPH ...tlinMips32elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971644 | ORPH ...32elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971645 | ORPH ...inMips32elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971646 | ORPH ...2r5elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971648 | ORPH ...nMips32r5elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971649 | ORPH ...32r5elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971650 | ORPH ...inMips32r5elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971651 | ORPH ...r5elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971652 | ORPH ...Mips32r5elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971653 | ORPH ...2r6elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971655 | ORPH ...nMips32r6elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971657 | ORPH ...32r6elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971658 | ORPH ...inMips32r6elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971659 | ORPH ...r6elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971661 | ORPH ...Mips32r6elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971663 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971664 | ORPH ...Mips64eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971665 | ORPH ...4eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971666 | ORPH ...nMips64eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971667 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971668 | ORPH ...ips64eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971669 | ORPH ...64n32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971670 | ORPH ...inMips64n32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971671 | ORPH ...s64n32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971673 | ORPH ...linMips64n32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971675 | ORPH ...4n32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971676 | ORPH ...nMips64n32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971677 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971678 | ORPH ...ps64r6eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971679 | ORPH ...6eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971680 | ORPH ...ips64r6eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971681 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971682 | ORPH ...s64r6eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971683 | ORPH ...Nios2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971684 | ORPH ...ootlinNios2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971685 | ORPH ...enriscMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971686 | ORPH ...tlinOpenriscMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971687 | ORPH ...riscUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971688 | ORPH ...inOpenriscUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971689 | ORPH ...440fpGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971690 | ORPH ...owerpc440fpGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971691 | ORPH ...c440fpMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971692 | ORPH ...Powerpc440fpMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971693 | ORPH ...40fpUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971694 | ORPH ...werpc440fpUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971695 | ORPH ...e5500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971696 | ORPH ...erpc64e5500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971697 | ORPH ...e6500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971698 | ORPH ...erpc64e6500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971699 | ORPH ...4e6500MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971700 | ORPH ...werpc64e6500MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971701 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971702 | ORPH ...c64lepower8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971703 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971704 | ORPH ...pc64lepower8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971705 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971706 | ORPH ...rpc64power8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971707 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971708 | ORPH ...erpc64power8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971709 | ORPH ...300c3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971710 | ORPH ...werpce300c3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971711 | ORPH ...e300c3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971712 | ORPH ...owerpce300c3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971713 | ORPH ...00c3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971714 | ORPH ...erpce300c3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971715 | ORPH ...500mcGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971716 | ORPH ...werpce500mcGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971717 | ORPH ...e500mcMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971718 | ORPH ...owerpce500mcMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971719 | ORPH ...00mcUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971720 | ORPH ...erpce500mcUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971721 | ORPH ...lp32dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971722 | ORPH ...lp64dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971723 | ORPH ...iscv64lp64dGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971725 | ORPH ...4lp64dMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971726 | ORPH ...Riscv64lp64dMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971727 | ORPH ...p64dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971728 | ORPH ...scv64lp64dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971729 | ORPH ...0xz13GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971730 | ORPH ...linS390xz13GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971731 | ORPH ...Shsh4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971732 | ORPH ...ootlinShsh4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971733 | ORPH ...nShsh4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971734 | ORPH ...BootlinShsh4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971736 | ORPH ...hsh4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971737 | ORPH ...otlinShsh4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971739 | ORPH ...h4aebGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971740 | ORPH ...linShsh4aebGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971741 | ORPH ...sh4aebMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971742 | ORPH ...tlinShsh4aebMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971743 | ORPH ...arc64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971744 | ORPH ...tlinSparc64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971745 | ORPH ...rcv8UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971746 | ORPH ...linSparcv8UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971747 | ORPH ...X8664GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971748 | ORPH ...ootlinX8664GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971749 | ORPH ...nX8664MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971750 | ORPH ...BootlinX8664MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971751 | ORPH ...8664UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971752 | ORPH ...otlinX8664UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971753 | ORPH ...orei7GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971754 | ORPH ...X8664corei7GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971755 | ORPH ...corei7MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971756 | ORPH ...nX8664corei7MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971757 | ORPH ...rei7UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971758 | ORPH ...8664corei7UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971759 | ORPH ...664v2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971760 | ORPH ...8664v2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971761 | ORPH ...64v2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971762 | ORPH ...664v3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971763 | ORPH ...8664v3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971764 | ORPH ...64v3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971765 | ORPH ...664v4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971766 | ORPH ...8664v4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971767 | ORPH ...64v4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971768 | ORPH ...core2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971769 | ORPH ...linX86core2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971770 | ORPH ...6core2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971771 | ORPH ...tlinX86core2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971772 | ORPH ...ore2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971773 | ORPH ...inX86core2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971774 | ORPH ...6i686GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971775 | ORPH ...tlinX86i686GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971776 | ORPH ...86i686MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971777 | ORPH ...otlinX86i686MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971778 | ORPH ...i686UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971779 | ORPH ...linX86i686UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971780 | ORPH ...lx60UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971781 | ORPH ...Xtensalx60UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971782 | ORPH ...ToolchainBuildrootMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971550 | ORPH ...olchainBuildrootuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971551 | ORPH ...xternalToolchainCCache | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971553 | ORPH ...ernalToolchainCtngMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971554 | ORPH ...rnalToolchainLinaroArm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971555 | ORPH ...ToolchainSourceryArmv4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971556 | ORPH ...ToolchainSourceryArmv5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971557 | ORPH ...ToolchainSourceryArmv7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971558 | ORPH TestGdbArc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971365 | ORPH TestGdbFullTarget | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971366 | ORPH ...GdbHostOnlyAllFeatures | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971367 | ORPH TestGdbHostOnlyDefault | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971368 | ORPH TestGdbserverOnly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971369 | ORPH TestGetDevelopers | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971784 | ORPH TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971370 | ORPH TestGst1Python | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971371 | ORPH TestHWLoc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971372 | ORPH TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971373 | ORPH ...ystemSystemdRoNetworkd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971347 | ORPH ...so9660SyslinuxExternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971325 | ORPH TestLibshdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971375 | ORPH TestLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971380 | ORPH TestLuaHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971393 | ORPH TestLuaInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971395 | ORPH TestLuaLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971376 | ORPH TestLuaLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971378 | ORPH TestLuaLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971382 | ORPH TestLuaLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971384 | ORPH TestLuaLuaCffi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971386 | ORPH TestLuaLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971387 | ORPH TestLuaLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971407 | ORPH TestLuaLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971409 | ORPH TestLuaLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971391 | ORPH TestLuaLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971411 | ORPH TestLuaLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971399 | ORPH TestLuaLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971415 | ORPH TestLuaLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971401 | ORPH TestLuaLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971417 | ORPH TestLuaLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971419 | ORPH TestLuaLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971389 | ORPH TestLuaLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971413 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971421 | ORPH TestLuaLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971405 | ORPH TestLuaLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971397 | ORPH TestLuaLzlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971426 | ORPH TestLuaRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971528 | ORPH TestLuaUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971403 | ORPH TestLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971381 | ORPH TestLuajitHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971394 | ORPH TestLuajitInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971396 | ORPH TestLuajitLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971377 | ORPH TestLuajitLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971379 | ORPH TestLuajitLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971383 | ORPH TestLuajitLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971385 | ORPH TestLuajitLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971388 | ORPH TestLuajitLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971408 | ORPH TestLuajitLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971410 | ORPH TestLuajitLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971392 | ORPH TestLuajitLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971412 | ORPH TestLuajitLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971400 | ORPH TestLuajitLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971416 | ORPH TestLuajitLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971402 | ORPH TestLuajitLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971418 | ORPH TestLuajitLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971420 | ORPH TestLuajitLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971390 | ORPH TestLuajitLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971414 | ORPH TestLuajitLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971422 | ORPH TestLuajitLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971406 | ORPH TestLuajitLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971398 | ORPH TestLuajitRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971529 | ORPH TestLuajitTurbolua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971540 | ORPH TestLuajitUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971404 | ORPH TestLuvi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971424 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971425 | ORPH TestMender | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971427 | ORPH TestMsrTools | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971428 | ORPH TestNcdu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971429 | ORPH TestNetdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971430 | ORPH TestNoTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971289 | ORPH TestOctave | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971431 | ORPH TestOla | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971432 | ORPH TestOpenJdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971433 | ORPH TestOpenSshGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971434 | ORPH TestOpenSshuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971435 | ORPH TestOpkg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971436 | ORPH TestPerl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971437 | ORPH TestPerlClassLoad | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971438 | ORPH TestPerlDBDmysql | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971439 | ORPH TestPerlEncodeDetect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971440 | ORPH TestPerlGDGraph | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971441 | ORPH TestPerlHTMLParser | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971442 | ORPH TestPerlIOSocketMulticast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971443 | ORPH TestPerlIOSocketSSL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971444 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971446 | ORPH TestPerlMailDKIM | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971447 | ORPH TestPerlX10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971448 | ORPH TestPerlXMLLibXML | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971449 | ORPH TestPerllibwwwperl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971445 | ORPH TestPhpApcu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971450 | ORPH TestPhpLuaLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971451 | ORPH TestPhpLuaLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971452 | ORPH TestPhpPam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971453 | ORPH TestPhpPeclDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971454 | ORPH TestPixz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971455 | ORPH TestPolkitInitd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971456 | ORPH TestPolkitSystemd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971457 | ORPH TestProsodyLua51 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971459 | ORPH TestProsodyLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971460 | ORPH TestPyNdiff | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971509 | ORPH TestPython3Py | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971461 | ORPH TestPython3PyPyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971463 | ORPH TestPython3Pyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971464 | ORPH TestPythonAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971469 | ORPH TestPythonAvro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971473 | ORPH TestPythonPahoMQTT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971503 | ORPH TestPythonPy3Aexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971466 | ORPH TestPythonPy3Argh | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971467 | ORPH TestPythonPy3Attrs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971468 | ORPH TestPythonPy3Autobahn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971471 | ORPH TestPythonPy3Automat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971472 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971474 | ORPH TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971475 | ORPH TestPythonPy3Botocore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971476 | ORPH TestPythonPy3Can | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971477 | ORPH TestPythonPy3Cbor | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971478 | ORPH TestPythonPy3Click | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971479 | ORPH TestPythonPy3Colorzero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971480 | ORPH TestPythonPy3Constantly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971481 | ORPH TestPythonPy3Construct | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971482 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971483 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971484 | ORPH TestPythonPy3DBusFast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971485 | ORPH TestPythonPy3DBusNext | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971486 | ORPH TestPythonPy3Dicttoxml2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971487 | ORPH TestPythonPy3Distro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971488 | ORPH TestPythonPy3Django | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971489 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971490 | ORPH TestPythonPy3Flask | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971491 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971492 | ORPH TestPythonPy3Git | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971493 | ORPH TestPythonPy3Gitdb2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971494 | ORPH TestPythonPy3GnuPG | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971495 | ORPH TestPythonPy3Gobject | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971496 | ORPH TestPythonPy3Gpiozero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971497 | ORPH TestPythonPy3Incremental | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971498 | ORPH TestPythonPy3Iptables | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971499 | ORPH TestPythonPy3Jmespath | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971500 | ORPH TestPythonPy3Libftdi1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971374 | ORPH TestPythonPy3Munch | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971501 | ORPH TestPythonPy3Passlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971504 | ORPH TestPythonPy3Pexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971505 | ORPH TestPythonPy3PyAlsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971506 | ORPH TestPythonPy3Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971508 | ORPH TestPythonPy3Pytest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971510 | ORPH ...PythonPy3PytestAsyncio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971511 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971512 | ORPH TestPythonPy3Qrcode | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971513 | ORPH TestPythonPy3RSA | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971515 | ORPH TestPythonPy3RpiGpio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971514 | ORPH TestPythonPy3S3transfer | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971517 | ORPH TestPythonPy3SciPy | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971518 | ORPH ...thonPy3ServiceIdentity | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971519 | ORPH TestPythonPy3Smmap2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971520 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971521 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971522 | ORPH TestPythonPy3Txaio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971523 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971524 | ORPH TestPythonPy3Ubjson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971525 | ORPH ...y3UnitTestXmlReporting | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971526 | ORPH TestPythonPy3rtoml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971516 | ORPH TestPythonPybind | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971507 | ORPH TestRedis | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971527 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971530 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971531 | ORPH TestS6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971532 | ORPH TestS6Networking | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971533 | ORPH TestS6PortableUtils | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971534 | ORPH TestS6Rc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971536 | ORPH TestSudo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971537 | ORPH TestSyslogNg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971538 | ORPH TestTmux | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971539 | ORPH TestUbi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971334 | ORPH TestUbootOpensslPkgConfig | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971541 | ORPH TestZ3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971542 | ORPH TestZerofree | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971543 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971544 | ORPH TestZfsMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971545 | ORPH TestZfsUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3679971546 | ORPH -- http://autobuild.buildroot.net From peter at korsgaard.com Wed Feb 1 07:23:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 01 Feb 2023 08:23:29 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/fluent-bit: needs arch support and C++ for wasm In-Reply-To: <20230130121930.3472747-3-thomas@devoogdt.com> (Thomas Devoogdt's message of "Mon, 30 Jan 2023 13:19:30 +0100") References: <20230130121930.3472747-1-thomas@devoogdt.com> <20230130121930.3472747-3-thomas@devoogdt.com> Message-ID: <87357p4zny.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > From: Thomas Devoogdt > See: > https://github.com/fluent/fluent-bit/tree/master/lib/wasm-micro-runtime-WAMR-1.1.1#supported-architectures-and-platforms > MIPS & RISCV32 are mentioned in the supported list, > but that seems to be wrong, so excluded those. > Fixes: > - http://autobuild.buildroot.org/results/dfb/dfb8f71d7e016cdfd3beb4b8196081898bd49ae2/build-end.log > - http://autobuild.buildroot.org/results/ecf/ecfe7b67af68cd7f397a50360900cd9a7afc830e/build-end.log > Signed-off-by: Thomas Devoogdt > --- > package/fluent-bit/Config.in | 15 +++++++++++++++ > package/fluent-bit/fluent-bit.mk | 6 ++++++ > 2 files changed, 21 insertions(+) > diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in > index 11ceb55d4f..50437cab60 100644 > --- a/package/fluent-bit/Config.in > +++ b/package/fluent-bit/Config.in > @@ -10,3 +10,18 @@ config BR2_PACKAGE_FLUENT_BIT > comment "fluent-bit needs a glibc toolchain" > depends on !BR2_TOOLCHAIN_USES_GLIBC > + > +if BR2_PACKAGE_FLUENT_BIT > + > +config BR2_PACKAGE_FLUENT_BIT_WASM > + bool "Build with WASM runtime support" > + depends on BR2_INSTALL_LIBSTDCPP > + # see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms > + default y if BR2_arc > + default y if BR2_arm || BR2_armeb > + default y if BR2_aarch64 || BR2_aarch64_be > + default y if BR2_i386 || BR2_x86_64 > + default y if BR2_RISCV_64 > + default y if BR2_xtensa I know that Yann suggested this, but it doesn't work. We cannot mix the arch dependencies like this with an option with a prompt, because the user can still manually enable the option on an unsupported architecture. You were also missing some help text and I think this "filters written in WASM" feature is quite unlikely to be used, so I changed it to default off with: config BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS bool # see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms default y if BR2_arc default y if BR2_arm || BR2_armeb default y if BR2_aarch64 || BR2_aarch64_be default y if BR2_i386 || BR2_x86_64 default y if BR2_RISCV_64 default y if BR2_xtensa config BR2_PACKAGE_FLUENT_BIT_WASM bool "wasm runtime support" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS help Support for WASM-based plugins. And committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 1 07:22:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 1 Feb 2023 08:22:25 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: needs arch support and C++ for wasm Message-ID: <20230201072406.6992D82DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aff4317797c34c78747f4c6c5ee8d9a1bc0ae270 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See: https://github.com/fluent/fluent-bit/tree/master/lib/wasm-micro-runtime-WAMR-1.1.1#supported-architectures-and-platforms MIPS & RISCV32 are mentioned in the supported list, but that seems to be wrong, so excluded those. Fixes: - http://autobuild.buildroot.org/results/dfb/dfb8f71d7e016cdfd3beb4b8196081898bd49ae2/build-end.log - http://autobuild.buildroot.org/results/ecf/ecfe7b67af68cd7f397a50360900cd9a7afc830e/build-end.log Signed-off-by: Thomas Devoogdt [Peter: Move arch dependency to _WASM_ARCH_SUPPORTS blind option, add help text, use normal style for prompt and fix indentation] Signed-off-by: Peter Korsgaard --- package/fluent-bit/Config.in | 21 +++++++++++++++++++++ package/fluent-bit/fluent-bit.mk | 6 ++++++ 2 files changed, 27 insertions(+) diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 11ceb55d4f..6c2299e695 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -8,5 +8,26 @@ config BR2_PACKAGE_FLUENT_BIT https://github.com/fluent/fluent-bit +if BR2_PACKAGE_FLUENT_BIT + +config BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + bool + # see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms + default y if BR2_arc + default y if BR2_arm || BR2_armeb + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + default y if BR2_RISCV_64 + default y if BR2_xtensa + +config BR2_PACKAGE_FLUENT_BIT_WASM + bool "wasm runtime support" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + help + Support for WASM-based plugins. + +endif + comment "fluent-bit needs a glibc toolchain" depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index c84042a0fa..6e9a33e02e 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -17,6 +17,12 @@ FLUENT_BIT_CONF_OPTS += \ -DFLB_CHUNK_TRACE=No \ -DFLB_BACKTRACE=No +ifeq ($(BR2_PACKAGE_FLUENT_BIT_WASM),y) +FLUENT_BIT_CONF_OPTS += -DFLB_WASM=Yes +else +FLUENT_BIT_CONF_OPTS += -DFLB_WASM=No +endif + ifeq ($(BR2_PACKAGE_LUAJIT),y) FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=Yes FLUENT_BIT_DEPENDENCIES += luajit From thomas at devoogdt.com Wed Feb 1 07:37:35 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 1 Feb 2023 08:37:35 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/fluent-bit: needs arch support and C++ for wasm In-Reply-To: <87357p4zny.fsf@dell.be.48ers.dk> References: <20230130121930.3472747-1-thomas@devoogdt.com> <20230130121930.3472747-3-thomas@devoogdt.com> <87357p4zny.fsf@dell.be.48ers.dk> Message-ID: Hi, There was indeed a reason why I first did it otherwise, I was a little bit confused at first, but the solution with a blind option indeed seems to be the only right solution. Thx for fixing this up! kr, Thomas Devoogdt Op wo 1 feb. 2023 om 08:23 schreef Peter Korsgaard : > > >>>>> "Thomas" == Thomas Devoogdt writes: > > > From: Thomas Devoogdt > > See: > > https://github.com/fluent/fluent-bit/tree/master/lib/wasm-micro-runtime-WAMR-1.1.1#supported-architectures-and-platforms > > > MIPS & RISCV32 are mentioned in the supported list, > > but that seems to be wrong, so excluded those. > > > Fixes: > > - http://autobuild.buildroot.org/results/dfb/dfb8f71d7e016cdfd3beb4b8196081898bd49ae2/build-end.log > > - http://autobuild.buildroot.org/results/ecf/ecfe7b67af68cd7f397a50360900cd9a7afc830e/build-end.log > > > Signed-off-by: Thomas Devoogdt > > --- > > package/fluent-bit/Config.in | 15 +++++++++++++++ > > package/fluent-bit/fluent-bit.mk | 6 ++++++ > > 2 files changed, 21 insertions(+) > > > diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in > > index 11ceb55d4f..50437cab60 100644 > > --- a/package/fluent-bit/Config.in > > +++ b/package/fluent-bit/Config.in > > @@ -10,3 +10,18 @@ config BR2_PACKAGE_FLUENT_BIT > > > comment "fluent-bit needs a glibc toolchain" > > depends on !BR2_TOOLCHAIN_USES_GLIBC > > + > > +if BR2_PACKAGE_FLUENT_BIT > > + > > +config BR2_PACKAGE_FLUENT_BIT_WASM > > + bool "Build with WASM runtime support" > > + depends on BR2_INSTALL_LIBSTDCPP > > + # see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms > > + default y if BR2_arc > > + default y if BR2_arm || BR2_armeb > > + default y if BR2_aarch64 || BR2_aarch64_be > > + default y if BR2_i386 || BR2_x86_64 > > + default y if BR2_RISCV_64 > > + default y if BR2_xtensa > > I know that Yann suggested this, but it doesn't work. We cannot mix the > arch dependencies like this with an option with a prompt, because the > user can still manually enable the option on an unsupported > architecture. > > You were also missing some help text and I think this "filters written > in WASM" feature is quite unlikely to be used, so I changed it to > default off with: > > config BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS > bool > # see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms > default y if BR2_arc > default y if BR2_arm || BR2_armeb > default y if BR2_aarch64 || BR2_aarch64_be > default y if BR2_i386 || BR2_x86_64 > default y if BR2_RISCV_64 > default y if BR2_xtensa > > config BR2_PACKAGE_FLUENT_BIT_WASM > bool "wasm runtime support" > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS > help > Support for WASM-based plugins. > > And committed, thanks. > > -- > Bye, Peter Korsgaard From baruch at tkos.co.il Wed Feb 1 08:29:54 2023 From: baruch at tkos.co.il (Baruch Siach) Date: Wed, 1 Feb 2023 10:29:54 +0200 Subject: [Buildroot] [PATCH] package/sexpect: requires MMU Message-ID: <00c897a75f46008a2e4ddfa3a17eeef7641420a6.1675240194.git.baruch@tkos.co.il> Disable when MMU is not available for target. Fixes: http://autobuild.buildroot.net/results/a2b69fdf67d520aa4d2718bd688d88d102842cdf Signed-off-by: Baruch Siach --- package/sexpect/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sexpect/Config.in b/package/sexpect/Config.in index bdf5c3bbf59c..e558af26f0a6 100644 --- a/package/sexpect/Config.in +++ b/package/sexpect/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SEXPECT bool "sexpect" + depends on BR2_USE_MMU # fork() help sexpect is another implementation of Expect which is specifically designed for Shell scripts -- 2.39.1 From fperrad at gmail.com Wed Feb 1 09:02:24 2023 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 1 Feb 2023 10:02:24 +0100 Subject: [Buildroot] [PATCH] package/luaposix: bump to version 36.1 Message-ID: <20230201090224.17033-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/luaposix/luaposix.hash | 2 +- package/luaposix/luaposix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash index fc0b5fa74..2d54a6901 100644 --- a/package/luaposix/luaposix.hash +++ b/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e0fcb4996f76aa49ae3e5edf69978171091e3d69d5de5589d591d227f8a427c1 luaposix-36.0.tar.gz +sha256 7944c2b4fbcef0667d407302740d87645325e751fd8d819f2b253c5d9ad0d497 luaposix-36.1.tar.gz sha256 ea0fdaae50b0d31a81c2c99f4354264783c71043fd40522feaa40eecc069599b LICENSE diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index 1a537defc..d17c8188b 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 36.0 +LUAPOSIX_VERSION = 36.1 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE -- 2.37.2 From proud4124 at gmail.com Wed Feb 1 19:31:43 2023 From: proud4124 at gmail.com (Takashi Yasuda) Date: Wed, 1 Feb 2023 19:31:43 +0000 Subject: [Buildroot] libc testsuite Message-ID: Hi all, I'm looking for the alternative to in-tree glibc testsuite [1] to test the libc installed on my board, especially for comparing the stabilities of glibc, musl, and uclibc, regardless of the architecture. I found the uclibc-ng-test [2], but it seems to be no longer actively maintained, so the test cases may be outdated. Is there a more reliable option? Thanks, Yasuda [1] https://github.com/bminor/glibc/blob/master/scripts/evaluate-test.sh [2] https://github.com/wbx-github/uclibc-ng-test -------------- next part -------------- An HTML attachment was scrubbed... URL: From laurent at vivier.eu Wed Feb 1 13:46:06 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 14:46:06 +0100 Subject: [Buildroot] [PATCH v9 0/3] package: add petitboot to use with qemu-system-m68k Message-ID: <20230201134609.2040073-1-laurent@vivier.eu> qemu-system-m68k has introduced in v6.0 a new pure virtual machine that is now supported by linux v5.19. The goal of this series is to provide petitboot as an embedded bootloader for it (like it is for the IBM POWER machine). The first patch introduces petitboot package, the second patch the configuration to build buildroot with petitboot for the QEMU machine. You can test it with: qemu-system-m68k -M virt -kernel images/vmlinux \ -initrd images/rootfs.cpio.xz \ -append "console=ttyGF0" --nographic Signed-off-by: Laurent Vivier v9: - remove dependency on BR2_PACKAGE_PS3_UTILS - Add Thomas' Rb - rebase v8: - use linux.fragment rather than linux.config - rebase v7: - set BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y - fix errors reported by check-package - add gitlab testing (C?dric) - update boot-qemu-image.py to support petitboot v6: - rebase v5: - remove BR2_CCACHE_DIR, BR2_PACKAGE_DTC and BR2_PACKAGE_DTC_PROGRAMS v4: - address Thomas' comments - remove petitboot-mtd config as libflash is not available v3: v2: v1: - first version, I messed up with list subscription and git-publish... Laurent Vivier (3): package: add petitboot board/qemu/m68k-virt: Add virt-m68k linux config support/scripts/boot-qemu-image.py: manage petitboot interface DEVELOPERS | 5 ++ board/qemu/m68k-virt/linux.fragment | 21 ++++++ board/qemu/m68k-virt/readme.txt | 5 ++ configs/qemu_m68k_virt_petitboot_defconfig | 31 ++++++++ package/Config.in | 1 + package/kexec/Config.in | 2 +- package/petitboot/63-md-raid-arrays.rules | 41 +++++++++++ package/petitboot/65-md-incremental.rules | 69 ++++++++++++++++++ package/petitboot/66-add-sg-module.rules | 2 + package/petitboot/Config.in | 23 ++++++ package/petitboot/S14silence-console | 9 +++ package/petitboot/S15pb-discover | 38 ++++++++++ package/petitboot/fs-overlay/etc/inittab | 34 +++++++++ package/petitboot/fs-overlay/etc/locale | 1 + package/petitboot/fs-overlay/init | 8 ++ package/petitboot/kexec-restart | 8 ++ package/petitboot/petitboot-console-ui.rules | 6 ++ package/petitboot/petitboot.hash | 2 + package/petitboot/petitboot.mk | 77 ++++++++++++++++++++ package/petitboot/removable-event-poll.rules | 4 + package/petitboot/shell_config | 19 +++++ package/petitboot/shell_profile | 2 + support/scripts/boot-qemu-image.py | 13 +++- 23 files changed, 417 insertions(+), 4 deletions(-) create mode 100644 board/qemu/m68k-virt/linux.fragment create mode 100644 board/qemu/m68k-virt/readme.txt create mode 100644 configs/qemu_m68k_virt_petitboot_defconfig create mode 100644 package/petitboot/63-md-raid-arrays.rules create mode 100644 package/petitboot/65-md-incremental.rules create mode 100644 package/petitboot/66-add-sg-module.rules create mode 100644 package/petitboot/Config.in create mode 100755 package/petitboot/S14silence-console create mode 100755 package/petitboot/S15pb-discover create mode 100644 package/petitboot/fs-overlay/etc/inittab create mode 100644 package/petitboot/fs-overlay/etc/locale create mode 100755 package/petitboot/fs-overlay/init create mode 100755 package/petitboot/kexec-restart create mode 100644 package/petitboot/petitboot-console-ui.rules create mode 100644 package/petitboot/petitboot.hash create mode 100644 package/petitboot/petitboot.mk create mode 100644 package/petitboot/removable-event-poll.rules create mode 100644 package/petitboot/shell_config create mode 100755 package/petitboot/shell_profile -- 2.39.1 From laurent at vivier.eu Wed Feb 1 13:46:07 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 14:46:07 +0100 Subject: [Buildroot] [PATCH v9 1/3] package: add petitboot In-Reply-To: <20230201134609.2040073-1-laurent@vivier.eu> References: <20230201134609.2040073-1-laurent@vivier.eu> Message-ID: <20230201134609.2040073-2-laurent@vivier.eu> from https://github.com/glevand/petitboot--buildroot Updated to work with m68k architecture rather than PlayStation3 (focused on qemu-system-m68k virt machine) Signed-off-by: Laurent Vivier --- DEVELOPERS | 3 + package/Config.in | 1 + package/kexec/Config.in | 2 +- package/petitboot/63-md-raid-arrays.rules | 41 +++++++++++ package/petitboot/65-md-incremental.rules | 69 ++++++++++++++++++ package/petitboot/66-add-sg-module.rules | 2 + package/petitboot/Config.in | 23 ++++++ package/petitboot/S14silence-console | 9 +++ package/petitboot/S15pb-discover | 38 ++++++++++ package/petitboot/fs-overlay/etc/inittab | 34 +++++++++ package/petitboot/fs-overlay/etc/locale | 1 + package/petitboot/fs-overlay/init | 8 ++ package/petitboot/kexec-restart | 8 ++ package/petitboot/petitboot-console-ui.rules | 6 ++ package/petitboot/petitboot.hash | 2 + package/petitboot/petitboot.mk | 77 ++++++++++++++++++++ package/petitboot/removable-event-poll.rules | 4 + package/petitboot/shell_config | 19 +++++ package/petitboot/shell_profile | 2 + 19 files changed, 348 insertions(+), 1 deletion(-) create mode 100644 package/petitboot/63-md-raid-arrays.rules create mode 100644 package/petitboot/65-md-incremental.rules create mode 100644 package/petitboot/66-add-sg-module.rules create mode 100644 package/petitboot/Config.in create mode 100755 package/petitboot/S14silence-console create mode 100755 package/petitboot/S15pb-discover create mode 100644 package/petitboot/fs-overlay/etc/inittab create mode 100644 package/petitboot/fs-overlay/etc/locale create mode 100755 package/petitboot/fs-overlay/init create mode 100755 package/petitboot/kexec-restart create mode 100644 package/petitboot/petitboot-console-ui.rules create mode 100644 package/petitboot/petitboot.hash create mode 100644 package/petitboot/petitboot.mk create mode 100644 package/petitboot/removable-event-poll.rules create mode 100644 package/petitboot/shell_config create mode 100755 package/petitboot/shell_profile diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577f1..d56e4643eaf8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1766,6 +1766,9 @@ F: package/aircrack-ng/ N: Laurent Charpentier F: package/open-lldp/ +N: Laurent Vivier +F: package/petitboot/ + N: Lee Jones F: boot/afboot-stm32/ diff --git a/package/Config.in b/package/Config.in index 83fddf316f75..c3641ea91c6b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2654,6 +2654,7 @@ menu "System tools" source "package/openrc/Config.in" source "package/openvmtools/Config.in" source "package/pamtester/Config.in" + source "package/petitboot/Config.in" source "package/polkit/Config.in" source "package/powerpc-utils/Config.in" source "package/procps-ng/Config.in" diff --git a/package/kexec/Config.in b/package/kexec/Config.in index 90a7bc2672bd..092a80b171fc 100644 --- a/package/kexec/Config.in +++ b/package/kexec/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_KEXEC depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x + BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x || BR2_m68k help Kexec is a user space utility for loading another kernel and asking the currently running kernel to do something with diff --git a/package/petitboot/63-md-raid-arrays.rules b/package/petitboot/63-md-raid-arrays.rules new file mode 100644 index 000000000000..92aec36e69d4 --- /dev/null +++ b/package/petitboot/63-md-raid-arrays.rules @@ -0,0 +1,41 @@ +# do not edit this file, it will be overwritten on update + +SUBSYSTEM!="block", GOTO="md_end" + +# handle md arrays +ACTION!="add|change", GOTO="md_end" +KERNEL!="md*", GOTO="md_end" + +# partitions have no md/{array_state,metadata_version}, but should not +# for that reason be ignored. +ENV{DEVTYPE}=="partition", GOTO="md_ignore_state" + +# container devices have a metadata version of e.g. 'external:ddf' and +# never leave state 'inactive' +ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state" +TEST!="md/array_state", ENV{SYSTEMD_READY}="0", GOTO="md_end" +ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end" +LABEL="md_ignore_state" + +IMPORT{program}="/sbin/mdadm --detail --export $devnode" +ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace" +ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}" +ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}" +ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace" +ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n" +ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n" +ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n" + +IMPORT{builtin}="blkid" +OPTIONS+="link_priority=100" +OPTIONS+="watch" +ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" +ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" + +ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service" + +# Tell systemd to run mdmon for our container, if we need it. +ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c" +ENV{MD_MON_THIS}=="?*", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service" + +LABEL="md_end" diff --git a/package/petitboot/65-md-incremental.rules b/package/petitboot/65-md-incremental.rules new file mode 100644 index 000000000000..153d12fe6f7e --- /dev/null +++ b/package/petitboot/65-md-incremental.rules @@ -0,0 +1,69 @@ +# This file causes block devices with Linux RAID (mdadm) signatures to +# automatically cause mdadm to be run. +# See udev(8) for syntax + +# Don't process any events if anaconda is running as anaconda brings up +# raid devices manually +ENV{ANACONDA}=="?*", GOTO="md_end" + +# Also don't process disks that are slated to be a multipath device +ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="md_end" + +# We process add events on block devices (since they are ready as soon as +# they are added to the system), but we must process change events as well +# on any dm devices (like LUKS partitions or LVM logical volumes) and on +# md devices because both of these first get added, then get brought live +# and trigger a change event. The reason we don't process change events +# on bare hard disks is because if you stop all arrays on a disk, then +# run fdisk on the disk to change the partitions, when fdisk exits it +# triggers a change event, and we want to wait until all the fdisks on +# all member disks are done before we do anything. Unfortunately, we have +# no way of knowing that, so we just have to let those arrays be brought +# up manually after fdisk has been run on all of the disks. + +# First, process all add events (md and dm devices will not really do +# anything here, just regular disks, and this also won't get any imsm +# array members either) +SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="linux_raid_member", \ + RUN+="/sbin/mdadm -I --export $env{DEVNAME}" + +# Next, check to make sure the BIOS raid stuff wasn't turned off via cmdline +IMPORT{cmdline}="noiswmd" +IMPORT{cmdline}="nodmraid" +ENV{noiswmd}=="?*", GOTO="md_imsm_inc_end" +ENV{nodmraid}=="?*", GOTO="md_imsm_inc_end" +SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="isw_raid_member", \ + RUN+="/sbin/mdadm -I $env{DEVNAME}" +LABEL="md_imsm_inc_end" + +SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}=="?*", \ + RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}" +SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}!="?*", \ + RUN+="/sbin/mdadm -If $name" + +# Next make sure that this isn't a dm device we should skip for some reason +ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="dm_change_end" +ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="dm_change_end" +ENV{DM_SUSPENDED}=="1", GOTO="dm_change_end" +KERNEL=="dm-*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \ + ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}" +LABEL="dm_change_end" + +# Finally catch any nested md raid arrays. If we brought up an md raid +# array that's part of another md raid array, it won't be ready to be used +# until the change event that occurs when it becomes live +KERNEL=="md*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \ + ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}" + +# In case the initramfs only started some of the arrays in our container, +# run incremental assembly on the container itself. Note: we ran mdadm +# on the container in 64-md-raid.rules, and that's how the MD_LEVEL +# environment variable is already set. If that disappears from the other +# file, we will need to add this line into the middle of the next rule: +# IMPORT{program}="/sbin/mdadm -D --export $tempnode", \ + +SUBSYSTEM=="block", ACTION=="add|change", KERNEL=="md*", \ + ENV{MD_LEVEL}=="container", RUN+="/sbin/mdadm -I $env{DEVNAME}" + + +LABEL="md_end" diff --git a/package/petitboot/66-add-sg-module.rules b/package/petitboot/66-add-sg-module.rules new file mode 100644 index 000000000000..ae18d28c570e --- /dev/null +++ b/package/petitboot/66-add-sg-module.rules @@ -0,0 +1,2 @@ +# load modules to scsi disks, if they aren't in kernel +SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg" diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in new file mode 100644 index 000000000000..d87f9d2450a0 --- /dev/null +++ b/package/petitboot/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_PETITBOOT + bool "petitboot" + # petitboot needs udev /dev management + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_TARGET_PANEL + select BR2_PACKAGE_NCURSES_TARGET_FORM + select BR2_PACKAGE_NCURSES_TARGET_MENU + # run-time dependency only + select BR2_PACKAGE_KEXEC_LITE if !BR2_PACKAGE_KEXEC + # run-time dependency only + select BR2_PACKAGE_POWERPC_UTILS if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + # run-time dependency only + select BR2_PACKAGE_NVME if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + help + Petitboot is a small kexec-based bootloader + + http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html + +comment "petitboot requires udev to be enabled" + depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/petitboot/S14silence-console b/package/petitboot/S14silence-console new file mode 100755 index 000000000000..2ce6b39f427b --- /dev/null +++ b/package/petitboot/S14silence-console @@ -0,0 +1,9 @@ +#!/bin/sh + +case "$1" in + start) + echo 1 1 1 1 > /proc/sys/kernel/printk + ;; +esac + +exit 0 diff --git a/package/petitboot/S15pb-discover b/package/petitboot/S15pb-discover new file mode 100755 index 000000000000..9d9ec57de3f0 --- /dev/null +++ b/package/petitboot/S15pb-discover @@ -0,0 +1,38 @@ +#!/bin/sh + +LOGFILE=/var/log/petitboot/pb-discover.log +PIDFILE=/var/run/petitboot.pid + +PATH=/usr/bin:/usr/sbin:/bin:/sbin +export PATH + +verbose= +if pb-config debug | grep -q enabled +then + verbose=-v +fi + +case "$1" in + start) + ulimit -c unlimited + mkdir -p -m 0775 $(dirname $LOGFILE) + mkdir -p -m 0775 /var/petitboot + # Set permissions for normal users + chown -R root:petitgroup $(dirname $LOGFILE) + chown -R root:petitgroup /var/petitboot + + export $(cat /etc/locale) + pb-discover -l $LOGFILE $verbose & + echo $! > $PIDFILE + ;; + stop) + pid=$(cat $PIDFILE) + [ -n "$pid" ] && kill -TERM $pid + ;; + *) + echo "Usage: $0 {start|stop}" + exit 1 + ;; +esac + +exit 0 diff --git a/package/petitboot/fs-overlay/etc/inittab b/package/petitboot/fs-overlay/etc/inittab new file mode 100644 index 000000000000..1f503d5d56f7 --- /dev/null +++ b/package/petitboot/fs-overlay/etc/inittab @@ -0,0 +1,34 @@ +# /etc/inittab +# +# Copyright (C) 2001 Erik Andersen +# +# Note: BusyBox init doesn't support runlevels. The runlevels field is +# completely ignored by BusyBox init. If you want runlevels, use +# sysvinit. +# +# Format for each entry: ::: +# +# id == tty to run on, or empty for /dev/console +# runlevels == ignored +# action == one of sysinit, respawn, askfirst, wait, and once +# process == program to run + +# Startup the system +::sysinit:/bin/mount -t proc proc /proc +::sysinit:/bin/mount -o remount,rw / # REMOUNT_ROOTFS_RW +::sysinit:/bin/mkdir -p /dev/pts +::sysinit:/bin/mkdir -p /dev/shm +::sysinit:/bin/mount -a +::sysinit:/bin/hostname -F /etc/hostname +# now run any rc scripts +::sysinit:/etc/init.d/rcS +::sysinit:/sbin/petitboot-nc +# Stuff to do for the 3-finger salute +::ctrlaltdel:/sbin/reboot + +# Stuff to do before rebooting +::shutdown:/etc/init.d/rcK +::shutdown:/bin/umount -a -r +::shutdown:/sbin/swapoff -a + +::restart:/usr/sbin/kexec-restart diff --git a/package/petitboot/fs-overlay/etc/locale b/package/petitboot/fs-overlay/etc/locale new file mode 100644 index 000000000000..655683630776 --- /dev/null +++ b/package/petitboot/fs-overlay/etc/locale @@ -0,0 +1 @@ +LANG=en_US.utf-8 diff --git a/package/petitboot/fs-overlay/init b/package/petitboot/fs-overlay/init new file mode 100755 index 000000000000..1e56178db162 --- /dev/null +++ b/package/petitboot/fs-overlay/init @@ -0,0 +1,8 @@ +#!/bin/sh +# devtmpfs does not get automounted for initramfs +/bin/mount -t devtmpfs devtmpfs /dev +exec 0/dev/console +exec 2>/dev/console +exec /sbin/init "$@" + diff --git a/package/petitboot/kexec-restart b/package/petitboot/kexec-restart new file mode 100755 index 000000000000..0175e76df4cd --- /dev/null +++ b/package/petitboot/kexec-restart @@ -0,0 +1,8 @@ +#!/bin/sh + +/usr/sbin/kexec -f -e + +while : +do + sleep 1 +done diff --git a/package/petitboot/petitboot-console-ui.rules b/package/petitboot/petitboot-console-ui.rules new file mode 100644 index 000000000000..cbf1b7e1d765 --- /dev/null +++ b/package/petitboot/petitboot-console-ui.rules @@ -0,0 +1,6 @@ + +# spawn a petitboot UI on common user-visible interface devices +SUBSYSTEM=="tty", KERNEL=="ttyGF*", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" +SUBSYSTEM=="tty", KERNEL=="hvc*", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" +SUBSYSTEM=="tty", KERNEL=="tty0", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" +SUBSYSTEM=="tty", KERNEL=="ttyS*", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" diff --git a/package/petitboot/petitboot.hash b/package/petitboot/petitboot.hash new file mode 100644 index 000000000000..ccb58eed0e34 --- /dev/null +++ b/package/petitboot/petitboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 b42ae4fb2a81e9cf68f727c3f54c6312788c654bd97628ec9ba61b19a68990e6 petitboot-v1.13.tar.gz diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk new file mode 100644 index 000000000000..b04710a535d3 --- /dev/null +++ b/package/petitboot/petitboot.mk @@ -0,0 +1,77 @@ +################################################################################ +# +# petitboot +# +################################################################################ + +PETITBOOT_VERSION = v1.13 +PETITBOOT_SITE ?= https://github.com/open-power/petitboot/releases/download/$(PETITBOOT_VERSION) +PETITBOOT_DEPENDENCIES = elfutils ncurses udev host-bison host-flex lvm2 +PETITBOOT_LICENSE = GPLv2 +PETITBOOT_LICENSE_FILES = COPYING + +PETITBOOT_CONF_OPTS += --with-ncurses --without-twin-x11 --without-twin-fbdev \ + --localstatedir=/var \ + --enable-crypt \ + HOST_PROG_KEXEC=/usr/sbin/kexec \ + HOST_PROG_SHUTDOWN=/usr/sbin/kexec-restart \ + $(if $(BR2_PACKAGE_BUSYBOX),--with-tftp=busybox --enable-busybox) + +ifdef PETITBOOT_DEBUG +PETITBOOT_CONF_OPTS += --enable-debug +endif + +ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) +PETITBOOT_CONF_OPTS += --with-ncursesw MENU_LIB=-lmenuw FORM_LIB=-lformw +endif + +define PETITBOOT_POST_INSTALL + $(INSTALL) -D -m 0755 $(@D)/utils/bb-kexec-reboot \ + $(TARGET_DIR)/usr/libexec/petitboot + $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/petitboot/boot.d + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/01-create-default-dtb \ + $(TARGET_DIR)/etc/petitboot/boot.d/ + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ + $(TARGET_DIR)/etc/petitboot/boot.d/ + + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S14silence-console \ + $(TARGET_DIR)/etc/init.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S15pb-discover \ + $(TARGET_DIR)/etc/init.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/kexec-restart \ + $(TARGET_DIR)/usr/sbin/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/petitboot-console-ui.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/removable-event-poll.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/63-md-raid-arrays.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/65-md-incremental.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/66-add-sg-module.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + + ln -sf /usr/sbin/pb-udhcpc \ + $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ + + mkdir -p $(TARGET_DIR)/home/petituser + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/shell_profile \ + $(TARGET_DIR)/home/petituser/.profile + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/shell_config \ + $(TARGET_DIR)/home/petituser/.shrc + + $(MAKE) -C $(@D)/po DESTDIR=$(TARGET_DIR) install +endef + +define PETITBOOT_POST_INSTALL_DTB + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/30-dtb-updates \ + $(TARGET_DIR)/etc/petitboot/boot.d/ +endef + +PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL + +ifeq ($(BR2_PACKAGE_DTC),y) +PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL_DTB +endif + +$(eval $(autotools-package)) diff --git a/package/petitboot/removable-event-poll.rules b/package/petitboot/removable-event-poll.rules new file mode 100644 index 000000000000..b736aef6101f --- /dev/null +++ b/package/petitboot/removable-event-poll.rules @@ -0,0 +1,4 @@ + +# petitboot needs notification for media change events on removable devices, +# which we only get if we've set the poll_msecs sysfs attribute. +ACTION!="remove", ATTR{removable}=="1", ATTR{events_poll_msecs}="2000" diff --git a/package/petitboot/shell_config b/package/petitboot/shell_config new file mode 100644 index 000000000000..59337ff53039 --- /dev/null +++ b/package/petitboot/shell_config @@ -0,0 +1,19 @@ +#!bin/sh + +reset + +echo "Exiting petitboot. Type 'exit' to return." +echo "You may run 'pb-sos' to gather diagnostic data" + +if [[ "$(id -u)" != "0" ]]; then + echo "" | sudo -S /bin/true 2&>1 >> /dev/null + if [[ $? = 0 ]]; then + echo "No password set, running as root. You may set a password in the System Configuration screen." + sudo -i + sudo -K + exit + fi + export PS1='$ ' +else + export PS1='# ' +fi diff --git a/package/petitboot/shell_profile b/package/petitboot/shell_profile new file mode 100755 index 000000000000..40062b423b79 --- /dev/null +++ b/package/petitboot/shell_profile @@ -0,0 +1,2 @@ +export ENV="/home/petituser/.shrc" +/usr/libexec/petitboot/pb-console -- 2.39.1 From laurent at vivier.eu Wed Feb 1 13:46:08 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 14:46:08 +0100 Subject: [Buildroot] [PATCH v9 2/3] board/qemu/m68k-virt: Add virt-m68k linux config In-Reply-To: <20230201134609.2040073-1-laurent@vivier.eu> References: <20230201134609.2040073-1-laurent@vivier.eu> Message-ID: <20230201134609.2040073-3-laurent@vivier.eu> Build a 5.19 (first version with the m68k virt machine) kernel for "qemu-system-m68k -M virt" machine. Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth --- DEVELOPERS | 2 ++ board/qemu/m68k-virt/linux.fragment | 21 +++++++++++++++++ board/qemu/m68k-virt/readme.txt | 5 +++++ configs/qemu_m68k_virt_petitboot_defconfig | 26 ++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 board/qemu/m68k-virt/linux.fragment create mode 100644 board/qemu/m68k-virt/readme.txt create mode 100644 configs/qemu_m68k_virt_petitboot_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index d56e4643eaf8..9db1568422a8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1768,6 +1768,8 @@ F: package/open-lldp/ N: Laurent Vivier F: package/petitboot/ +F: board/qemu/m68k-virt/ +F: configs/qemu_m68k_virt_petitboot_defconfig N: Lee Jones F: boot/afboot-stm32/ diff --git a/board/qemu/m68k-virt/linux.fragment b/board/qemu/m68k-virt/linux.fragment new file mode 100644 index 000000000000..49416982601c --- /dev/null +++ b/board/qemu/m68k-virt/linux.fragment @@ -0,0 +1,21 @@ +CONFIG_BLK_DEV_INITRD=y +CONFIG_KEXEC=y +CONFIG_BOOTINFO_PROC=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_MD=y +CONFIG_MD_LINEAR=y +CONFIG_MD_MULTIPATH=y +CONFIG_MD_FAULTY=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_UNSTRIPED=y +CONFIG_DM_CRYPT=y +CONFIG_DM_SNAPSHOT=y +CONFIG_DM_THIN_PROVISIONING=y +CONFIG_DM_CACHE=y +CONFIG_DM_WRITECACHE=y +CONFIG_DM_EBS=y +CONFIG_DM_ERA=y +CONFIG_DM_CLONE=y +CONFIG_DM_MIRROR=y +CONFIG_DM_RAID=y +CONFIG_DM_ZERO=y diff --git a/board/qemu/m68k-virt/readme.txt b/board/qemu/m68k-virt/readme.txt new file mode 100644 index 000000000000..714b74c70ea1 --- /dev/null +++ b/board/qemu/m68k-virt/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + + qemu-system-m68k -M virt -kernel output/images/vmlinux -initrd output/images/rootfs.cpio.xz -append "console=ttyGF0" --nographic # qemu_m68k_virt_petitboot_defconfig + +The petiboot menu will appear in the terminal where QEMU has been started. diff --git a/configs/qemu_m68k_virt_petitboot_defconfig b/configs/qemu_m68k_virt_petitboot_defconfig new file mode 100644 index 000000000000..b3497c12b46b --- /dev/null +++ b/configs/qemu_m68k_virt_petitboot_defconfig @@ -0,0 +1,26 @@ +BR2_m68k=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_CCACHE=y +BR2_RELRO_NONE=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Petitboot" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_ROOTFS_MERGED_USR=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyGF0" +BR2_ROOTFS_OVERLAY="package/petitboot/fs-overlay" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" +BR2_LINUX_KERNEL_DEFCONFIG="virt" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/m68k-virt/linux.fragment" +BR2_LINUX_KERNEL_XZ=y +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KEXEC=y +BR2_PACKAGE_KEXEC_ZLIB=y +BR2_PACKAGE_ETHTOOL=y +BR2_PACKAGE_NET_TOOLS=y +BR2_PACKAGE_NETCAT=y +BR2_PACKAGE_RSYNC=y +BR2_PACKAGE_PETITBOOT=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_XZ=y -- 2.39.1 From laurent at vivier.eu Wed Feb 1 13:46:09 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 14:46:09 +0100 Subject: [Buildroot] [PATCH v9 3/3] support/scripts/boot-qemu-image.py: manage petitboot interface In-Reply-To: <20230201134609.2040073-1-laurent@vivier.eu> References: <20230201134609.2040073-1-laurent@vivier.eu> Message-ID: <20230201134609.2040073-4-laurent@vivier.eu> Petitboot doesn't start a shell but a GUI. Manage the menu to switch to the shell. Use "poweroff -f" as we don't have init Enable the test for qemu_m68K_virt. Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth --- configs/qemu_m68k_virt_petitboot_defconfig | 5 +++++ support/scripts/boot-qemu-image.py | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/configs/qemu_m68k_virt_petitboot_defconfig b/configs/qemu_m68k_virt_petitboot_defconfig index b3497c12b46b..cb63a2deeed4 100644 --- a/configs/qemu_m68k_virt_petitboot_defconfig +++ b/configs/qemu_m68k_virt_petitboot_defconfig @@ -8,6 +8,8 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_MERGED_USR=y BR2_TARGET_GENERIC_GETTY_PORT="ttyGF0" BR2_ROOTFS_OVERLAY="package/petitboot/fs-overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" @@ -24,3 +26,6 @@ BR2_PACKAGE_RSYNC=y BR2_PACKAGE_PETITBOOT=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_XZ=y +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/support/scripts/boot-qemu-image.py b/support/scripts/boot-qemu-image.py index ba50ea69ee9a..8dd3b4c654e1 100755 --- a/support/scripts/boot-qemu-image.py +++ b/support/scripts/boot-qemu-image.py @@ -36,7 +36,7 @@ def main(): time.sleep(1) try: - child.expect(["buildroot login:"], timeout=600) + idx = child.expect(["buildroot login:", "Exit to shell"], timeout=600) except pexpect.EOF as e: # Some emulations require a fork of qemu-system, which may be # missing on the system, and is not provided by Buildroot. @@ -55,7 +55,11 @@ def main(): print("System did not boot in time, exiting.") sys.exit(1) - child.sendline("root\r") + if idx == 0: + child.sendline("root\r") + elif idx == 1: + time.sleep(1) + child.sendline("\r") try: child.expect(["# "], timeout=600) @@ -66,7 +70,10 @@ def main(): print("Timeout while waiting for shell") sys.exit(1) - child.sendline("poweroff\r") + if idx == 0: + child.sendline("poweroff\r") + elif idx == 1: + child.sendline("poweroff -f\r") try: child.expect(["System halted"], timeout=600) -- 2.39.1 From kjroland75 at hotmail.com Wed Feb 1 15:57:52 2023 From: kjroland75 at hotmail.com (Kenneth Roland) Date: Wed, 1 Feb 2023 15:57:52 +0000 Subject: [Buildroot] Libarchive always throws an error when building In-Reply-To: References: Message-ID: Hello Buildroot team, I guess this is my way of submitting a bug report, here goes. Current .config is attached, but renamed as buildroot.config as I couldn't get Dolphin (KDE) to show the hidden file. This project of mine was to build an ISO for an old Thinkpad that would act as a reciever from https://github.com/badaix/snapcast, but I couldn't find anything useful on this libarchive error. "libarchive-dev" is installed on the host using "apt install". You guys probably know how to recreate this, but the host is just a Debian netinst, no DE, and then git installed. Installed dependencies as of https://medium.com/@hungryspider/building-custom-linux-for-raspberry-pi-using-buildroot-f81efc7aa817, cloned the Buildroot repo from Github, " make pc_x86_64_bios_defconfig", and then replaced the .config file generated by the one I used the first time (was sanity/dependancy checking). Ran make, which ran for about a good 30-45 mins until it stopped and I saw the libarchive error. Host info (uname -a) Linux blackbox 6.0.0-0.deb11.6-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.0.12-1~bpo11+1 (2022-12-19) x86_64 GNU/Linux ```checking whether the /mnt/hdd/buildroot/output/host/bin/x86_64-buildroot-linux-gnu-gcc linker (/mnt/hdd/buildroot/output/host/bin/x86_64-buildroot-linux-gnu-ld -m elf_ x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking pkg-config is at least version 0.20... yes checking for LIBARCHIVE... no configure: error: Package requirements (libarchive) were not met: Package 'iconv', required by 'libarchive', not found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables LIBARCHIVE_CFLAGS and LIBARCHIVE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. make: *** [package/pkg-generic.mk:283: /mnt/hdd/buildroot/output/build/opkg-0.4.5/.stamp_configured] Error 1``` [https://miro.medium.com/max/1200/0*6J1fXBTEsPODw5I5] Building custom Linux for Raspberry Pi using Buildroot Connect the USB end of the USB to Serial cable to your computer and open the serial port using a serial terminal software such as Gtkterm with baud rate set to 115200 . medium.com ? ? ? [https://opengraph.githubassets.com/39abea8770e3ae33931f8598335f8b3b04f8a288fcc7e7f4579cf2ea74afbb37/badaix/snapcast] GitHub - badaix/snapcast: Synchronous multiroom audio player Installation from source. Please follow this guide to build Snapcast for. Linux; FreeBSD; macOS; Android; OpenWrt; Buildroot; Raspberry Pi; Windows; SnapOS. The bravest among you may be interested in SnapOS, a small and fast-booting "just enough" OS to run Snapcast as an appliance.. There is a guide (with the necessary buildfiles) available to build SnapOS, which comes in two flavors: github.com ? ? ? ? -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: buildroot.config Type: application/octet-stream Size: 136246 bytes Desc: buildroot.config URL: From fontaine.fabrice at gmail.com Wed Feb 1 17:35:17 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 1 Feb 2023 18:35:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/rng-tools: bump to version 6.16 In-Reply-To: <20230130205603.GA3864@scaer> References: <20230114161002.35480-1-fontaine.fabrice@gmail.com> <20230130205603.GA3864@scaer> Message-ID: Hi Yann, Le lun. 30 janv. 2023 ? 21:56, Yann E. MORIN a ?crit : > Fabrice, All, > > On 2023-01-14 17:10 +0100, Fabrice Fontaine spake thusly: > > https://github.com/nhorman/rng-tools/releases/tag/v6.16 > [--SNIP--] > > diff --git a/package/rng-tools/rng-tools.hash > b/package/rng-tools/rng-tools.hash > > index be2ee13969..4c86791267 100644 > > --- a/package/rng-tools/rng-tools.hash > > +++ b/package/rng-tools/rng-tools.hash > > @@ -1,3 +1,3 @@ > > # Locally computed > > -sha256 > bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a > rng-tools-6.15.tar.gz > > +sha256 > 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 > rng-tools-6.16.tar.gz > > This hash does not match here, and we've had a report on IRC that it > does not work either. In both cases, we get this hash instead: > 8e518d45be68f42d0873732a9ac3ecfe0f10c4a9bd5d5f44180a49be8ebda96f > > Can you check on your side, how you ended up with 17666...90894? > I see that there is, only, one autobuilder failure. However, I retested again on a fresh tarball and 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 is the correct sha256 for https://github.com/nhorman/rng-tools/archive/v6.16/rng-tools-6.16.tar.gz. > Regards, > Yann E. MORIN. > > > sha256 > 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > > diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/ > rng-tools.mk > > index f736193a23..3e565103e4 100644 > > --- a/package/rng-tools/rng-tools.mk > > +++ b/package/rng-tools/rng-tools.mk > > @@ -4,14 +4,14 @@ > > # > > > ################################################################################ > > > > -RNG_TOOLS_VERSION = 6.15 > > +RNG_TOOLS_VERSION = 6.16 > > RNG_TOOLS_SITE = $(call > github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) > > RNG_TOOLS_LICENSE = GPL-2.0 > > RNG_TOOLS_LICENSE_FILES = COPYING > > RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project > > RNG_TOOLS_SELINUX_MODULES = rngd > > > > -RNG_TOOLS_DEPENDENCIES = host-pkgconf openssl > > +RNG_TOOLS_DEPENDENCIES = host-pkgconf libcap openssl > > # From git > > RNG_TOOLS_AUTORECONF = YES > > > > @@ -45,6 +45,13 @@ else > > RNG_TOOLS_CONF_OPTS += --without-nistbeacon > > endif > > > > +ifeq ($(BR2_PACKAGE_RNG_TOOLS_QRYPT),y) > > +RNG_TOOLS_DEPENDENCIES += jansson libcurl > > +RNG_TOOLS_CONF_OPTS += --with-qrypt > > +else > > +RNG_TOOLS_CONF_OPTS += --without-qrypt > > +endif > > + > > define RNG_TOOLS_INSTALL_INIT_SYSV > > $(INSTALL) -D -m 755 package/rng-tools/S21rngd \ > > $(TARGET_DIR)/etc/init.d/S21rngd > > -- > > 2.39.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. | > > '------------------------------^-------^------------------^--------------------' > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From ps.report at gmx.net Wed Feb 1 17:41:54 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 1 Feb 2023 18:41:54 +0100 Subject: [Buildroot] Libarchive always throws an error when building In-Reply-To: References: Message-ID: <20230201184154.2c7e2680@gmx.net> Hello Roland, On Wed, 1 Feb 2023 15:57:52 +0000, Kenneth Roland wrote: > Hello Buildroot team, > I guess this is my way of submitting a bug report, here goes. > > Current .config is attached, but renamed as buildroot.config as I couldn't get Dolphin (KDE) to show the hidden file. This project of mine was to build an ISO for an old Thinkpad that would act as a reciever from https://github.com/badaix/snapcast, but I couldn't find anything useful on this libarchive error. "libarchive-dev" is installed on the host using "apt install". You guys probably know how to recreate this, but the host is just a Debian netinst, no DE, and then git installed. Installed dependencies as of https://medium.com/@hungryspider/building-custom-linux-for-raspberry-pi-using-buildroot-f81efc7aa817, cloned the Buildroot repo from Github, " make pc_x86_64_bios_defconfig", and then replaced the .config file generated by the one I used the first time (was sanity/dependancy checking). Ran make, which ran for about a good 30-45 mins until it stopped and I saw the libarchive error. > > Host info (uname -a) > Linux blackbox 6.0.0-0.deb11.6-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.0.12-1~bpo11+1 (2022-12-19) x86_64 GNU/Linux > > ```checking whether the /mnt/hdd/buildroot/output/host/bin/x86_64-buildroot-linux-gnu-gcc linker (/mnt/hdd/buildroot/output/host/bin/x86_64-buildroot-linux-gnu-ld -m elf_ > x86_64) supports shared libraries... yes > checking whether -lc should be explicitly linked in... no > checking dynamic linker characteristics... GNU/Linux ld.so > checking how to hardcode library paths into programs... immediate > checking whether stripping libraries is possible... yes > checking if libtool supports shared libraries... yes > checking whether to build shared libraries... yes > checking whether to build static libraries... no > checking pkg-config is at least version 0.20... yes > checking for LIBARCHIVE... no > configure: error: Package requirements (libarchive) were not met: > > Package 'iconv', required by 'libarchive', not found > > Consider adjusting the PKG_CONFIG_PATH environment variable if you > installed software in a non-standard prefix. > > Alternatively, you may set the environment variables LIBARCHIVE_CFLAGS > and LIBARCHIVE_LIBS to avoid the need to call pkg-config. > See the pkg-config man page for more details. > make: *** [package/pkg-generic.mk:283: /mnt/hdd/buildroot/output/build/opkg-0.4.5/.stamp_configured] Error 1``` From host/x86_64-buildroot-linux-gnu/sysroot/usr/lib/pkgconfig/libarchive.pc: [...] Requires.private: iconv libssl libcrypto From build/libarchive-3.6.2/configure.ac: AC_ARG_WITH([iconv], AS_HELP_STRING([--without-iconv], [Don't try to link against iconv])) And with the following local buildroot patch: diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cfc148d01d..02cca9cee9 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -70,7 +70,7 @@ endif ifeq ($(BR2_PACKAGE_LIBICONV),y) LIBARCHIVE_DEPENDENCIES += libiconv else -LIBARCHIVE_CONF_OPTS += --without-libiconv-prefix +LIBARCHIVE_CONF_OPTS += --without-libiconv-prefix --without-iconv endif ifeq ($(BR2_PACKAGE_LIBXML2),y) The opkg package builds without errors (after re-build of the libarchive package)... Regards, Peter > > [https://miro.medium.com/max/1200/0*6J1fXBTEsPODw5I5] > Building custom Linux for Raspberry Pi using Buildroot > Connect the USB end of the USB to Serial cable to your computer and open the serial port using a serial terminal software such as Gtkterm with baud rate set to 115200 . > medium.com > ? > ? > ? > > > [https://opengraph.githubassets.com/39abea8770e3ae33931f8598335f8b3b04f8a288fcc7e7f4579cf2ea74afbb37/badaix/snapcast] > GitHub - badaix/snapcast: Synchronous multiroom audio player > Installation from source. Please follow this guide to build Snapcast for. Linux; FreeBSD; macOS; Android; OpenWrt; Buildroot; Raspberry Pi; Windows; SnapOS. The bravest among you may be interested in SnapOS, a small and fast-booting "just enough" OS to run Snapcast as an appliance.. There is a guide (with the necessary buildfiles) available to build SnapOS, which comes in two flavors: > github.com > ? > ? > ? > ? > > From ps.report at gmx.net Wed Feb 1 17:45:15 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 1 Feb 2023 18:45:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/rng-tools: bump to version 6.16 In-Reply-To: References: <20230114161002.35480-1-fontaine.fabrice@gmail.com> <20230130205603.GA3864@scaer> Message-ID: <20230201184515.0e6a9a53@gmx.net> Hello *, On Wed, 1 Feb 2023 18:35:17 +0100, Fabrice Fontaine wrote: > Hi Yann, > > Le lun. 30 janv. 2023 ? 21:56, Yann E. MORIN a > ?crit : > > > Fabrice, All, > > > > On 2023-01-14 17:10 +0100, Fabrice Fontaine spake thusly: > > > https://github.com/nhorman/rng-tools/releases/tag/v6.16 > > [--SNIP--] > > > diff --git a/package/rng-tools/rng-tools.hash > > b/package/rng-tools/rng-tools.hash > > > index be2ee13969..4c86791267 100644 > > > --- a/package/rng-tools/rng-tools.hash > > > +++ b/package/rng-tools/rng-tools.hash > > > @@ -1,3 +1,3 @@ > > > # Locally computed > > > -sha256 > > bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a > > rng-tools-6.15.tar.gz > > > +sha256 > > 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 > > rng-tools-6.16.tar.gz > > > > This hash does not match here, and we've had a report on IRC that it > > does not work either. In both cases, we get this hash instead: > > 8e518d45be68f42d0873732a9ac3ecfe0f10c4a9bd5d5f44180a49be8ebda96f > > > > Can you check on your side, how you ended up with 17666...90894? > > > > I see that there is, only, one autobuilder failure. > However, I retested again on a fresh tarball and > 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 is the > correct sha256 for > https://github.com/nhorman/rng-tools/archive/v6.16/rng-tools-6.16.tar.gz. See https://github.blog/changelog/2023-01-30-git-archive-checksums-may-change/ for an possible explanation for the download hash diffs... Regards, Peter > > > > Regards, > > Yann E. MORIN. > > > > > sha256 > > 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > > > diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/ > > rng-tools.mk > > > index f736193a23..3e565103e4 100644 > > > --- a/package/rng-tools/rng-tools.mk > > > +++ b/package/rng-tools/rng-tools.mk > > > @@ -4,14 +4,14 @@ > > > # > > > > > ################################################################################ > > > > > > -RNG_TOOLS_VERSION = 6.15 > > > +RNG_TOOLS_VERSION = 6.16 > > > RNG_TOOLS_SITE = $(call > > github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) > > > RNG_TOOLS_LICENSE = GPL-2.0 > > > RNG_TOOLS_LICENSE_FILES = COPYING > > > RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project > > > RNG_TOOLS_SELINUX_MODULES = rngd > > > > > > -RNG_TOOLS_DEPENDENCIES = host-pkgconf openssl > > > +RNG_TOOLS_DEPENDENCIES = host-pkgconf libcap openssl > > > # From git > > > RNG_TOOLS_AUTORECONF = YES > > > > > > @@ -45,6 +45,13 @@ else > > > RNG_TOOLS_CONF_OPTS += --without-nistbeacon > > > endif > > > > > > +ifeq ($(BR2_PACKAGE_RNG_TOOLS_QRYPT),y) > > > +RNG_TOOLS_DEPENDENCIES += jansson libcurl > > > +RNG_TOOLS_CONF_OPTS += --with-qrypt > > > +else > > > +RNG_TOOLS_CONF_OPTS += --without-qrypt > > > +endif > > > + > > > define RNG_TOOLS_INSTALL_INIT_SYSV > > > $(INSTALL) -D -m 755 package/rng-tools/S21rngd \ > > > $(TARGET_DIR)/etc/init.d/S21rngd > > > -- > > > 2.39.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. | > > > > '------------------------------^-------^------------------^--------------------' > > > > Best Regards, > > Fabrice From ps.report at gmx.net Wed Feb 1 18:04:50 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 1 Feb 2023 19:04:50 +0100 Subject: [Buildroot] Libarchive always throws an error when building In-Reply-To: <20230201184154.2c7e2680@gmx.net> References: <20230201184154.2c7e2680@gmx.net> Message-ID: <20230201190450.4636771a@gmx.net> Hello *, On Wed, 1 Feb 2023 18:41:54 +0100, Peter Seiderer wrote: > Hello Roland, > > On Wed, 1 Feb 2023 15:57:52 +0000, Kenneth Roland wrote: > > > Hello Buildroot team, > > I guess this is my way of submitting a bug report, here goes. > > > > Current .config is attached, but renamed as buildroot.config as I couldn't get Dolphin (KDE) to show the hidden file. This project of mine was to build an ISO for an old Thinkpad that would act as a reciever from https://github.com/badaix/snapcast, but I couldn't find anything useful on this libarchive error. "libarchive-dev" is installed on the host using "apt install". You guys probably know how to recreate this, but the host is just a Debian netinst, no DE, and then git installed. Installed dependencies as of https://medium.com/@hungryspider/building-custom-linux-for-raspberry-pi-using-buildroot-f81efc7aa817, cloned the Buildroot repo from Github, " make pc_x86_64_bios_defconfig", and then replaced the .config file generated by the one I used the first time (was sanity/dependancy checking). Ran make, which ran for about a good 30-45 mins until it stopped and I saw the libarchive error. > > > > Host info (uname -a) > > Linux blackbox 6.0.0-0.deb11.6-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.0.12-1~bpo11+1 (2022-12-19) x86_64 GNU/Linux > > > > ```checking whether the /mnt/hdd/buildroot/output/host/bin/x86_64-buildroot-linux-gnu-gcc linker (/mnt/hdd/buildroot/output/host/bin/x86_64-buildroot-linux-gnu-ld -m elf_ > > x86_64) supports shared libraries... yes > > checking whether -lc should be explicitly linked in... no > > checking dynamic linker characteristics... GNU/Linux ld.so > > checking how to hardcode library paths into programs... immediate > > checking whether stripping libraries is possible... yes > > checking if libtool supports shared libraries... yes > > checking whether to build shared libraries... yes > > checking whether to build static libraries... no > > checking pkg-config is at least version 0.20... yes > > checking for LIBARCHIVE... no > > configure: error: Package requirements (libarchive) were not met: > > > > Package 'iconv', required by 'libarchive', not found > > > > Consider adjusting the PKG_CONFIG_PATH environment variable if you > > installed software in a non-standard prefix. > > > > Alternatively, you may set the environment variables LIBARCHIVE_CFLAGS > > and LIBARCHIVE_LIBS to avoid the need to call pkg-config. > > See the pkg-config man page for more details. > > make: *** [package/pkg-generic.mk:283: /mnt/hdd/buildroot/output/build/opkg-0.4.5/.stamp_configured] Error 1``` > > From host/x86_64-buildroot-linux-gnu/sysroot/usr/lib/pkgconfig/libarchive.pc: > > [...] > Requires.private: iconv libssl libcrypto > > > From build/libarchive-3.6.2/configure.ac: > > AC_ARG_WITH([iconv], > AS_HELP_STRING([--without-iconv], [Don't try to link against iconv])) > > > And with the following local buildroot patch: > > diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk > index cfc148d01d..02cca9cee9 100644 > --- a/package/libarchive/libarchive.mk > +++ b/package/libarchive/libarchive.mk > @@ -70,7 +70,7 @@ endif > ifeq ($(BR2_PACKAGE_LIBICONV),y) > LIBARCHIVE_DEPENDENCIES += libiconv > else > -LIBARCHIVE_CONF_OPTS += --without-libiconv-prefix > +LIBARCHIVE_CONF_OPTS += --without-libiconv-prefix --without-iconv > endif But the right fix should be this [1] libarchive upstream commit (untested)... Regards, Peter [1] https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 > > ifeq ($(BR2_PACKAGE_LIBXML2),y) > > > The opkg package builds without errors (after re-build of the libarchive package)... > > Regards, > Peter > > > > > > [https://miro.medium.com/max/1200/0*6J1fXBTEsPODw5I5] > > Building custom Linux for Raspberry Pi using Buildroot > > Connect the USB end of the USB to Serial cable to your computer and open the serial port using a serial terminal software such as Gtkterm with baud rate set to 115200 . > > medium.com > > ? > > ? > > ? > > > > > > [https://opengraph.githubassets.com/39abea8770e3ae33931f8598335f8b3b04f8a288fcc7e7f4579cf2ea74afbb37/badaix/snapcast] > > GitHub - badaix/snapcast: Synchronous multiroom audio player > > Installation from source. Please follow this guide to build Snapcast for. Linux; FreeBSD; macOS; Android; OpenWrt; Buildroot; Raspberry Pi; Windows; SnapOS. The bravest among you may be interested in SnapOS, a small and fast-booting "just enough" OS to run Snapcast as an appliance.. There is a guide (with the necessary buildfiles) available to build SnapOS, which comes in two flavors: > > github.com > > ? > > ? > > ? > > ? > > > > > From bernd.kuhls at t-online.de Wed Feb 1 18:10:05 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 1 Feb 2023 19:10:05 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libarchive: Only add "iconv" to the .pc file if needed Message-ID: <20230201181005.731564-1-bernd.kuhls@t-online.de> Fix the following build failure with fwup raised since bump to version 3.6.2 in commit 380341b249175382691f268de4b41d3843ff0acc and https://github.com/libarchive/libarchive/commit/a83f3d327aefe8d628230f326621b014d82f55b4 checking for pkg-config... /tmp/instance-19/output-1/host/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for ARCHIVE... no configure: error: Requires libarchive. Libarchive must be built with zlib support. Fixes: http://autobuild.buildroot.net/results/f5d/f5d549fb4f08156ba5952ce75926f7fd2242bfdf/ Signed-off-by: Bernd Kuhls --- v2: added dependency to host-pkgconf to fix autoconf error ...y-add-iconv-to-the-pc-file-if-needed.patch | 44 +++++++++++++++++++ package/libarchive/libarchive.mk | 4 ++ 2 files changed, 48 insertions(+) create mode 100644 package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch new file mode 100644 index 0000000000..c93944f789 --- /dev/null +++ b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch @@ -0,0 +1,44 @@ +From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 +From: Peter Pentchev +Date: Thu, 29 Dec 2022 00:04:40 +0200 +Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) + +Hi, + +Thanks for writing and maintaining libarchive! + +What do you think about this trivial change that does not add "iconv" to +the pkg-config file's list of required packages unless it is actually +needed? On at least Debian GNU/Linux systems, the iconv(3) function is +part of the system C library and there is no Debian package that +installs an iconv.pc file, so I had to make this change to the Debian +package of libarchive. + +Thanks again, and keep up the great work! + +G'luck, +Peter + +Downloaded from upstream commit: +https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99bff20d1..e2715cfde 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then + AC_CHECK_HEADERS([localcharset.h]) + am_save_LIBS="$LIBS" + LIBS="${LIBS} ${LIBICONV}" +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" ++ if test -n "$LIBICONV"; then ++ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" ++ fi + AC_CHECK_FUNCS([locale_charset]) + LIBS="${am_save_LIBS}" + if test "x$ac_cv_func_locale_charset" != "xyes"; then diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cfc148d01d..cd7c13fbed 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -11,6 +11,10 @@ LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING LIBARCHIVE_CPE_ID_VENDOR = libarchive +# We're patching configure.ac +LIBARCHIVE_AUTORECONF = YES +# needed for autoreconf +LIBARCHIVE_DEPENDENCIES += host-pkgconf ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) -- 2.39.1 From nerv at dawncrow.de Wed Feb 1 19:27:11 2023 From: nerv at dawncrow.de (=?UTF-8?q?Andr=C3=A9=20Zwing?=) Date: Wed, 1 Feb 2023 20:27:11 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: Remove openal from my list Message-ID: <20230201192711.1632095-1-nerv@dawncrow.de> Signed-off-by: Andr? Zwing --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577..d526451ca3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -133,7 +133,6 @@ F: boot/ti-k3-r5-loader/ N: Andr? Zwing F: package/libkrb5/ -F: package/openal/ F: package/p7zip/ F: package/wine/ -- 2.25.1 From kjroland75 at hotmail.com Wed Feb 1 19:27:35 2023 From: kjroland75 at hotmail.com (Kenneth Roland) Date: Wed, 1 Feb 2023 19:27:35 +0000 Subject: [Buildroot] Libarchive always throws an error when building In-Reply-To: <20230201190450.4636771a@gmx.net> References: <20230201184154.2c7e2680@gmx.net> <20230201190450.4636771a@gmx.net> Message-ID: Hello Peter, After applying the patch you mentioned, as well as installing libssl-dev, I now have this error. ?```checking whether the /mnt/hdd/sct/output/host/bin/aarch64-buildroot-linux-gnu-gcc linker (/mnt/hdd/sct/output/host/bin/aarch64-buildroot-linux-gnu-ld) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking pkg-config is at least version 0.20... /mnt/hdd/sct/output/host/bin/pkgconf: error while loading shared libraries: libpkgconf.so.3: cannot open shared object file: No such file or directory no checking for LIBARCHIVE... no configure: error: in `/mnt/hdd/sct/output/build/opkg-0.4.5': configure: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. Alternatively, you may set the environment variables LIBARCHIVE_CFLAGS and LIBARCHIVE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See `config.log' for more details make: *** [package/pkg-generic.mk:283: /mnt/hdd/sct/output/build/opkg-0.4.5/.stamp_configured] Error 1``` From a quick search, libpkgconf.so.3 is found on RPM systems, which isn't the case here, but somehow it has something to do with pkg-config being too old. Do I need to update my path, and if so, is that the bash file found in my user's home folder? Or is there another patch I can apply? Thanks, Kenneth -------------- next part -------------- An HTML attachment was scrubbed... URL: From nerv at dawncrow.de Wed Feb 1 19:21:57 2023 From: nerv at dawncrow.de (=?UTF-8?q?Andr=C3=A9=20Zwing?=) Date: Wed, 1 Feb 2023 20:21:57 +0100 Subject: [Buildroot] [PATCH] package/wine: bump to version 8.0 Message-ID: <20230201192157.1631613-1-nerv@dawncrow.de> Multiple library checks are obsolete, either due to removal or due to built-in solutions. License file changed due to update of copyright year. Signed-off-by: Andr? Zwing --- ...a-avoid-mpg123-functions-with-suffix.patch | 21 ----------- ...d-avoid-mpg123-functions-with-suffix.patch | 21 ----------- package/wine/wine.hash | 4 +-- package/wine/wine.mk | 35 ++----------------- 4 files changed, 5 insertions(+), 76 deletions(-) delete mode 100644 package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch delete mode 100644 package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch diff --git a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch b/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 8332db4b38..0000000000 --- a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 75b70efdaa2d4baa064271098878b79f66df155f -Author: Andr? Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - l3codeca.acm: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/75b70efdaa2d4baa064271098878b79f66df155f] -Signed-off-by: Andr? Zwing - -diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in -index 451794b2624..31765766d4e 100644 ---- a/dlls/l3codeca.acm/Makefile.in -+++ b/dlls/l3codeca.acm/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = l3codeca.acm - IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mpegl3.c diff --git a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch b/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 16f2ba2898..0000000000 --- a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 8d441659f7c7ae359e06a99e7abaae57792356a0 -Author: Andr? Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - mp3dmod: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/8d441659f7c7ae359e06a99e7abaae57792356a0] -Signed-off-by: Andr? Zwing - -diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in -index dabbb1dfeae..3ba343a4d34 100644 ---- a/dlls/mp3dmod/Makefile.in -+++ b/dlls/mp3dmod/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = mp3dmod.dll - IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mp3dmod.c diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 9a7a1c342a..b87964da12 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 5b43e27d5c085cb18f97394e46180310d5eef7c1d91c6895432a3889b2de086b wine-7.0.tar.xz +sha256 0272c20938f8721ae4510afaa8b36037457dd57661e4d664231079b9e91c792e wine-8.0.tar.xz # Locally calculated sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB -sha256 7c360930e51d56c8fa12fe1df8ed348ac77a9ad73f9582a303919469399b3ce4 LICENSE +sha256 793d045546467c8f49e35fbd6e02859e57e78f8bb53571e8200bffd0e966dfa8 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index a1c65bef4e..a629bf0dd6 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 7.0 +WINE_VERSION = 8.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/7.0 +WINE_SITE = https://dl.winehq.org/wine/source/8.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_CPE_ID_VENDOR = winehq @@ -27,7 +27,6 @@ WINE_CONF_OPTS = \ --without-mingw \ --without-opencl \ --without-oss \ - --without-vkd3d \ --without-vulkan # Wine uses a wrapper around gcc, and uses the value of --host to @@ -131,20 +130,6 @@ else WINE_CONF_OPTS += --without-v4l2 endif -ifeq ($(BR2_PACKAGE_OPENAL),y) -WINE_CONF_OPTS += --with-openal -WINE_DEPENDENCIES += openal -else -WINE_CONF_OPTS += --without-openal -endif - -ifeq ($(BR2_PACKAGE_OPENLDAP),y) -WINE_CONF_OPTS += --with-ldap -WINE_DEPENDENCIES += openldap -else -WINE_CONF_OPTS += --without-ldap -endif - ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) WINE_CONF_OPTS += --with-osmesa WINE_DEPENDENCIES += mesa3d @@ -266,19 +251,8 @@ endif # Wine only needs the host tools to be built, so cut-down the # build time by building just what we need. -HOST_WINE_TOOLS = \ - tools \ - tools/sfnt2fon \ - tools/widl \ - tools/winebuild \ - tools/winegcc \ - tools/wmc \ - tools/wrc - define HOST_WINE_BUILD_CMDS - $(foreach t, $(HOST_WINE_TOOLS), - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/$(t) - ) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) __tooldeps__ endef # Wine only needs its host variant to be built, not that it is @@ -304,10 +278,8 @@ HOST_WINE_CONF_OPTS += \ --without-gssapi \ --without-gstreamer \ --without-krb5 \ - --without-ldap \ --without-mingw \ --without-netapi \ - --without-openal \ --without-opencl \ --without-opengl \ --without-osmesa \ @@ -318,7 +290,6 @@ HOST_WINE_CONF_OPTS += \ --without-sdl \ --without-usb \ --without-v4l2 \ - --without-vkd3d \ --without-vulkan \ --without-x \ --without-xcomposite \ -- 2.25.1 From gsmecher at threespeedlogic.com Wed Feb 1 19:59:56 2023 From: gsmecher at threespeedlogic.com (Graeme Smecher) Date: Wed, 1 Feb 2023 11:59:56 -0800 Subject: [Buildroot] [PATCH 1/1] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. Message-ID: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from buildroot into the linux tree, these .dts files are copied to arch/arm64/boot. Unfortunately, the post-image.sh script expects to find them in arch/arm64/boot/xilinx. This patch does not require the xilinx/ prefix to be present when symlinking the device-tree to system.dtb where u-boot expects to find it. Signed-off-by: Graeme Smecher --- board/zynqmp/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index ed6dbe188c..c5de2db820 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -5,7 +5,7 @@ # devicetree listed in the config. FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ ${BR2_CONFIG}) [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -- 2.35.1 From huth at tuxfamily.org Wed Feb 1 20:38:20 2023 From: huth at tuxfamily.org (Thomas Huth) Date: Wed, 1 Feb 2023 21:38:20 +0100 Subject: [Buildroot] [PATCH v9 1/3] package: add petitboot In-Reply-To: <20230201134609.2040073-2-laurent@vivier.eu> References: <20230201134609.2040073-1-laurent@vivier.eu> <20230201134609.2040073-2-laurent@vivier.eu> Message-ID: <20230201213820.7c66aa8c@tuxfamily.org> Am Wed, 1 Feb 2023 14:46:07 +0100 schrieb Laurent Vivier : > from https://github.com/glevand/petitboot--buildroot > > Updated to work with m68k architecture rather than PlayStation3 > (focused on qemu-system-m68k virt machine) > > Signed-off-by: Laurent Vivier > --- ... > diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk > new file mode 100644 > index 000000000000..b04710a535d3 > --- /dev/null > +++ b/package/petitboot/petitboot.mk > @@ -0,0 +1,77 @@ > +################################################################################ > +# > +# petitboot > +# > +################################################################################ > + > +PETITBOOT_VERSION = v1.13 > +PETITBOOT_SITE ?= https://github.com/open-power/petitboot/releases/download/$(PETITBOOT_VERSION) > +PETITBOOT_DEPENDENCIES = elfutils ncurses udev host-bison host-flex lvm2 > +PETITBOOT_LICENSE = GPLv2 Sorry for not noticing this in my last review ... but looking at the other packages, I think this should be "GPL-2.0" instead of "GPLv2" nowadays? Apart from that, patch looks fine to me know, so with that changed: Reviewed-by: Thomas Huth From laurent at vivier.eu Wed Feb 1 20:48:45 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 21:48:45 +0100 Subject: [Buildroot] [PATCH v10 0/3] package: add petitboot to use with qemu-system-m68k Message-ID: <20230201204848.2099336-1-laurent@vivier.eu> qemu-system-m68k has introduced in v6.0 a new pure virtual machine that is now supported by linux v5.19. The goal of this series is to provide petitboot as an embedded bootloader for it (like it is for the IBM POWER machine). The first patch introduces petitboot package, the second patch the configuration to build buildroot with petitboot for the QEMU machine. You can test it with: qemu-system-m68k -M virt -kernel images/vmlinux \ -initrd images/rootfs.cpio.xz \ -append "console=ttyGF0" --nographic Signed-off-by: Laurent Vivier v10: - set PETITBOOT_LICENSE to GPL-2.0 v9: - remove dependency on BR2_PACKAGE_PS3_UTILS - Add Thomas' Rb - rebase v8: - use linux.fragment rather than linux.config - rebase v7: - set BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y - fix errors reported by check-package - add gitlab testing (C?dric) - update boot-qemu-image.py to support petitboot v6: - rebase v5: - remove BR2_CCACHE_DIR, BR2_PACKAGE_DTC and BR2_PACKAGE_DTC_PROGRAMS v4: - address Thomas' comments - remove petitboot-mtd config as libflash is not available v3: v2: v1: - first version, I messed up with list subscription and git-publish... Laurent Vivier (3): package: add petitboot board/qemu/m68k-virt: Add virt-m68k linux config support/scripts/boot-qemu-image.py: manage petitboot interface DEVELOPERS | 5 ++ board/qemu/m68k-virt/linux.fragment | 21 ++++++ board/qemu/m68k-virt/readme.txt | 5 ++ configs/qemu_m68k_virt_petitboot_defconfig | 31 ++++++++ package/Config.in | 1 + package/kexec/Config.in | 2 +- package/petitboot/63-md-raid-arrays.rules | 41 +++++++++++ package/petitboot/65-md-incremental.rules | 69 ++++++++++++++++++ package/petitboot/66-add-sg-module.rules | 2 + package/petitboot/Config.in | 23 ++++++ package/petitboot/S14silence-console | 9 +++ package/petitboot/S15pb-discover | 38 ++++++++++ package/petitboot/fs-overlay/etc/inittab | 34 +++++++++ package/petitboot/fs-overlay/etc/locale | 1 + package/petitboot/fs-overlay/init | 8 ++ package/petitboot/kexec-restart | 8 ++ package/petitboot/petitboot-console-ui.rules | 6 ++ package/petitboot/petitboot.hash | 2 + package/petitboot/petitboot.mk | 77 ++++++++++++++++++++ package/petitboot/removable-event-poll.rules | 4 + package/petitboot/shell_config | 19 +++++ package/petitboot/shell_profile | 2 + support/scripts/boot-qemu-image.py | 13 +++- 23 files changed, 417 insertions(+), 4 deletions(-) create mode 100644 board/qemu/m68k-virt/linux.fragment create mode 100644 board/qemu/m68k-virt/readme.txt create mode 100644 configs/qemu_m68k_virt_petitboot_defconfig create mode 100644 package/petitboot/63-md-raid-arrays.rules create mode 100644 package/petitboot/65-md-incremental.rules create mode 100644 package/petitboot/66-add-sg-module.rules create mode 100644 package/petitboot/Config.in create mode 100755 package/petitboot/S14silence-console create mode 100755 package/petitboot/S15pb-discover create mode 100644 package/petitboot/fs-overlay/etc/inittab create mode 100644 package/petitboot/fs-overlay/etc/locale create mode 100755 package/petitboot/fs-overlay/init create mode 100755 package/petitboot/kexec-restart create mode 100644 package/petitboot/petitboot-console-ui.rules create mode 100644 package/petitboot/petitboot.hash create mode 100644 package/petitboot/petitboot.mk create mode 100644 package/petitboot/removable-event-poll.rules create mode 100644 package/petitboot/shell_config create mode 100755 package/petitboot/shell_profile -- 2.39.1 From laurent at vivier.eu Wed Feb 1 20:48:47 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 21:48:47 +0100 Subject: [Buildroot] [PATCH v10 2/3] board/qemu/m68k-virt: Add virt-m68k linux config In-Reply-To: <20230201204848.2099336-1-laurent@vivier.eu> References: <20230201204848.2099336-1-laurent@vivier.eu> Message-ID: <20230201204848.2099336-3-laurent@vivier.eu> Build a 5.19 (first version with the m68k virt machine) kernel for "qemu-system-m68k -M virt" machine. Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth --- DEVELOPERS | 2 ++ board/qemu/m68k-virt/linux.fragment | 21 +++++++++++++++++ board/qemu/m68k-virt/readme.txt | 5 +++++ configs/qemu_m68k_virt_petitboot_defconfig | 26 ++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 board/qemu/m68k-virt/linux.fragment create mode 100644 board/qemu/m68k-virt/readme.txt create mode 100644 configs/qemu_m68k_virt_petitboot_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index d56e4643eaf8..9db1568422a8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1768,6 +1768,8 @@ F: package/open-lldp/ N: Laurent Vivier F: package/petitboot/ +F: board/qemu/m68k-virt/ +F: configs/qemu_m68k_virt_petitboot_defconfig N: Lee Jones F: boot/afboot-stm32/ diff --git a/board/qemu/m68k-virt/linux.fragment b/board/qemu/m68k-virt/linux.fragment new file mode 100644 index 000000000000..49416982601c --- /dev/null +++ b/board/qemu/m68k-virt/linux.fragment @@ -0,0 +1,21 @@ +CONFIG_BLK_DEV_INITRD=y +CONFIG_KEXEC=y +CONFIG_BOOTINFO_PROC=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_MD=y +CONFIG_MD_LINEAR=y +CONFIG_MD_MULTIPATH=y +CONFIG_MD_FAULTY=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_UNSTRIPED=y +CONFIG_DM_CRYPT=y +CONFIG_DM_SNAPSHOT=y +CONFIG_DM_THIN_PROVISIONING=y +CONFIG_DM_CACHE=y +CONFIG_DM_WRITECACHE=y +CONFIG_DM_EBS=y +CONFIG_DM_ERA=y +CONFIG_DM_CLONE=y +CONFIG_DM_MIRROR=y +CONFIG_DM_RAID=y +CONFIG_DM_ZERO=y diff --git a/board/qemu/m68k-virt/readme.txt b/board/qemu/m68k-virt/readme.txt new file mode 100644 index 000000000000..714b74c70ea1 --- /dev/null +++ b/board/qemu/m68k-virt/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + + qemu-system-m68k -M virt -kernel output/images/vmlinux -initrd output/images/rootfs.cpio.xz -append "console=ttyGF0" --nographic # qemu_m68k_virt_petitboot_defconfig + +The petiboot menu will appear in the terminal where QEMU has been started. diff --git a/configs/qemu_m68k_virt_petitboot_defconfig b/configs/qemu_m68k_virt_petitboot_defconfig new file mode 100644 index 000000000000..b3497c12b46b --- /dev/null +++ b/configs/qemu_m68k_virt_petitboot_defconfig @@ -0,0 +1,26 @@ +BR2_m68k=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_CCACHE=y +BR2_RELRO_NONE=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Petitboot" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_ROOTFS_MERGED_USR=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyGF0" +BR2_ROOTFS_OVERLAY="package/petitboot/fs-overlay" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" +BR2_LINUX_KERNEL_DEFCONFIG="virt" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/m68k-virt/linux.fragment" +BR2_LINUX_KERNEL_XZ=y +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KEXEC=y +BR2_PACKAGE_KEXEC_ZLIB=y +BR2_PACKAGE_ETHTOOL=y +BR2_PACKAGE_NET_TOOLS=y +BR2_PACKAGE_NETCAT=y +BR2_PACKAGE_RSYNC=y +BR2_PACKAGE_PETITBOOT=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_XZ=y -- 2.39.1 From laurent at vivier.eu Wed Feb 1 20:48:48 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 21:48:48 +0100 Subject: [Buildroot] [PATCH v10 3/3] support/scripts/boot-qemu-image.py: manage petitboot interface In-Reply-To: <20230201204848.2099336-1-laurent@vivier.eu> References: <20230201204848.2099336-1-laurent@vivier.eu> Message-ID: <20230201204848.2099336-4-laurent@vivier.eu> Petitboot doesn't start a shell but a GUI. Manage the menu to switch to the shell. Use "poweroff -f" as we don't have init Enable the test for qemu_m68K_virt. Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth --- configs/qemu_m68k_virt_petitboot_defconfig | 5 +++++ support/scripts/boot-qemu-image.py | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/configs/qemu_m68k_virt_petitboot_defconfig b/configs/qemu_m68k_virt_petitboot_defconfig index b3497c12b46b..cb63a2deeed4 100644 --- a/configs/qemu_m68k_virt_petitboot_defconfig +++ b/configs/qemu_m68k_virt_petitboot_defconfig @@ -8,6 +8,8 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_MERGED_USR=y BR2_TARGET_GENERIC_GETTY_PORT="ttyGF0" BR2_ROOTFS_OVERLAY="package/petitboot/fs-overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" @@ -24,3 +26,6 @@ BR2_PACKAGE_RSYNC=y BR2_PACKAGE_PETITBOOT=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_XZ=y +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/support/scripts/boot-qemu-image.py b/support/scripts/boot-qemu-image.py index ba50ea69ee9a..8dd3b4c654e1 100755 --- a/support/scripts/boot-qemu-image.py +++ b/support/scripts/boot-qemu-image.py @@ -36,7 +36,7 @@ def main(): time.sleep(1) try: - child.expect(["buildroot login:"], timeout=600) + idx = child.expect(["buildroot login:", "Exit to shell"], timeout=600) except pexpect.EOF as e: # Some emulations require a fork of qemu-system, which may be # missing on the system, and is not provided by Buildroot. @@ -55,7 +55,11 @@ def main(): print("System did not boot in time, exiting.") sys.exit(1) - child.sendline("root\r") + if idx == 0: + child.sendline("root\r") + elif idx == 1: + time.sleep(1) + child.sendline("\r") try: child.expect(["# "], timeout=600) @@ -66,7 +70,10 @@ def main(): print("Timeout while waiting for shell") sys.exit(1) - child.sendline("poweroff\r") + if idx == 0: + child.sendline("poweroff\r") + elif idx == 1: + child.sendline("poweroff -f\r") try: child.expect(["System halted"], timeout=600) -- 2.39.1 From laurent at vivier.eu Wed Feb 1 20:48:46 2023 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 1 Feb 2023 21:48:46 +0100 Subject: [Buildroot] [PATCH v10 1/3] package: add petitboot In-Reply-To: <20230201204848.2099336-1-laurent@vivier.eu> References: <20230201204848.2099336-1-laurent@vivier.eu> Message-ID: <20230201204848.2099336-2-laurent@vivier.eu> from https://github.com/glevand/petitboot--buildroot Updated to work with m68k architecture rather than PlayStation3 (focused on qemu-system-m68k virt machine) Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth --- DEVELOPERS | 3 + package/Config.in | 1 + package/kexec/Config.in | 2 +- package/petitboot/63-md-raid-arrays.rules | 41 +++++++++++ package/petitboot/65-md-incremental.rules | 69 ++++++++++++++++++ package/petitboot/66-add-sg-module.rules | 2 + package/petitboot/Config.in | 23 ++++++ package/petitboot/S14silence-console | 9 +++ package/petitboot/S15pb-discover | 38 ++++++++++ package/petitboot/fs-overlay/etc/inittab | 34 +++++++++ package/petitboot/fs-overlay/etc/locale | 1 + package/petitboot/fs-overlay/init | 8 ++ package/petitboot/kexec-restart | 8 ++ package/petitboot/petitboot-console-ui.rules | 6 ++ package/petitboot/petitboot.hash | 2 + package/petitboot/petitboot.mk | 77 ++++++++++++++++++++ package/petitboot/removable-event-poll.rules | 4 + package/petitboot/shell_config | 19 +++++ package/petitboot/shell_profile | 2 + 19 files changed, 348 insertions(+), 1 deletion(-) create mode 100644 package/petitboot/63-md-raid-arrays.rules create mode 100644 package/petitboot/65-md-incremental.rules create mode 100644 package/petitboot/66-add-sg-module.rules create mode 100644 package/petitboot/Config.in create mode 100755 package/petitboot/S14silence-console create mode 100755 package/petitboot/S15pb-discover create mode 100644 package/petitboot/fs-overlay/etc/inittab create mode 100644 package/petitboot/fs-overlay/etc/locale create mode 100755 package/petitboot/fs-overlay/init create mode 100755 package/petitboot/kexec-restart create mode 100644 package/petitboot/petitboot-console-ui.rules create mode 100644 package/petitboot/petitboot.hash create mode 100644 package/petitboot/petitboot.mk create mode 100644 package/petitboot/removable-event-poll.rules create mode 100644 package/petitboot/shell_config create mode 100755 package/petitboot/shell_profile diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577f1..d56e4643eaf8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1766,6 +1766,9 @@ F: package/aircrack-ng/ N: Laurent Charpentier F: package/open-lldp/ +N: Laurent Vivier +F: package/petitboot/ + N: Lee Jones F: boot/afboot-stm32/ diff --git a/package/Config.in b/package/Config.in index 83fddf316f75..c3641ea91c6b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2654,6 +2654,7 @@ menu "System tools" source "package/openrc/Config.in" source "package/openvmtools/Config.in" source "package/pamtester/Config.in" + source "package/petitboot/Config.in" source "package/polkit/Config.in" source "package/powerpc-utils/Config.in" source "package/procps-ng/Config.in" diff --git a/package/kexec/Config.in b/package/kexec/Config.in index 90a7bc2672bd..092a80b171fc 100644 --- a/package/kexec/Config.in +++ b/package/kexec/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_KEXEC depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x + BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x || BR2_m68k help Kexec is a user space utility for loading another kernel and asking the currently running kernel to do something with diff --git a/package/petitboot/63-md-raid-arrays.rules b/package/petitboot/63-md-raid-arrays.rules new file mode 100644 index 000000000000..92aec36e69d4 --- /dev/null +++ b/package/petitboot/63-md-raid-arrays.rules @@ -0,0 +1,41 @@ +# do not edit this file, it will be overwritten on update + +SUBSYSTEM!="block", GOTO="md_end" + +# handle md arrays +ACTION!="add|change", GOTO="md_end" +KERNEL!="md*", GOTO="md_end" + +# partitions have no md/{array_state,metadata_version}, but should not +# for that reason be ignored. +ENV{DEVTYPE}=="partition", GOTO="md_ignore_state" + +# container devices have a metadata version of e.g. 'external:ddf' and +# never leave state 'inactive' +ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state" +TEST!="md/array_state", ENV{SYSTEMD_READY}="0", GOTO="md_end" +ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end" +LABEL="md_ignore_state" + +IMPORT{program}="/sbin/mdadm --detail --export $devnode" +ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace" +ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}" +ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}" +ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace" +ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n" +ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n" +ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n" + +IMPORT{builtin}="blkid" +OPTIONS+="link_priority=100" +OPTIONS+="watch" +ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" +ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" + +ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service" + +# Tell systemd to run mdmon for our container, if we need it. +ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c" +ENV{MD_MON_THIS}=="?*", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service" + +LABEL="md_end" diff --git a/package/petitboot/65-md-incremental.rules b/package/petitboot/65-md-incremental.rules new file mode 100644 index 000000000000..153d12fe6f7e --- /dev/null +++ b/package/petitboot/65-md-incremental.rules @@ -0,0 +1,69 @@ +# This file causes block devices with Linux RAID (mdadm) signatures to +# automatically cause mdadm to be run. +# See udev(8) for syntax + +# Don't process any events if anaconda is running as anaconda brings up +# raid devices manually +ENV{ANACONDA}=="?*", GOTO="md_end" + +# Also don't process disks that are slated to be a multipath device +ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="md_end" + +# We process add events on block devices (since they are ready as soon as +# they are added to the system), but we must process change events as well +# on any dm devices (like LUKS partitions or LVM logical volumes) and on +# md devices because both of these first get added, then get brought live +# and trigger a change event. The reason we don't process change events +# on bare hard disks is because if you stop all arrays on a disk, then +# run fdisk on the disk to change the partitions, when fdisk exits it +# triggers a change event, and we want to wait until all the fdisks on +# all member disks are done before we do anything. Unfortunately, we have +# no way of knowing that, so we just have to let those arrays be brought +# up manually after fdisk has been run on all of the disks. + +# First, process all add events (md and dm devices will not really do +# anything here, just regular disks, and this also won't get any imsm +# array members either) +SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="linux_raid_member", \ + RUN+="/sbin/mdadm -I --export $env{DEVNAME}" + +# Next, check to make sure the BIOS raid stuff wasn't turned off via cmdline +IMPORT{cmdline}="noiswmd" +IMPORT{cmdline}="nodmraid" +ENV{noiswmd}=="?*", GOTO="md_imsm_inc_end" +ENV{nodmraid}=="?*", GOTO="md_imsm_inc_end" +SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="isw_raid_member", \ + RUN+="/sbin/mdadm -I $env{DEVNAME}" +LABEL="md_imsm_inc_end" + +SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}=="?*", \ + RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}" +SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}!="?*", \ + RUN+="/sbin/mdadm -If $name" + +# Next make sure that this isn't a dm device we should skip for some reason +ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="dm_change_end" +ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="dm_change_end" +ENV{DM_SUSPENDED}=="1", GOTO="dm_change_end" +KERNEL=="dm-*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \ + ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}" +LABEL="dm_change_end" + +# Finally catch any nested md raid arrays. If we brought up an md raid +# array that's part of another md raid array, it won't be ready to be used +# until the change event that occurs when it becomes live +KERNEL=="md*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \ + ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}" + +# In case the initramfs only started some of the arrays in our container, +# run incremental assembly on the container itself. Note: we ran mdadm +# on the container in 64-md-raid.rules, and that's how the MD_LEVEL +# environment variable is already set. If that disappears from the other +# file, we will need to add this line into the middle of the next rule: +# IMPORT{program}="/sbin/mdadm -D --export $tempnode", \ + +SUBSYSTEM=="block", ACTION=="add|change", KERNEL=="md*", \ + ENV{MD_LEVEL}=="container", RUN+="/sbin/mdadm -I $env{DEVNAME}" + + +LABEL="md_end" diff --git a/package/petitboot/66-add-sg-module.rules b/package/petitboot/66-add-sg-module.rules new file mode 100644 index 000000000000..ae18d28c570e --- /dev/null +++ b/package/petitboot/66-add-sg-module.rules @@ -0,0 +1,2 @@ +# load modules to scsi disks, if they aren't in kernel +SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg" diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in new file mode 100644 index 000000000000..d87f9d2450a0 --- /dev/null +++ b/package/petitboot/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_PETITBOOT + bool "petitboot" + # petitboot needs udev /dev management + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_TARGET_PANEL + select BR2_PACKAGE_NCURSES_TARGET_FORM + select BR2_PACKAGE_NCURSES_TARGET_MENU + # run-time dependency only + select BR2_PACKAGE_KEXEC_LITE if !BR2_PACKAGE_KEXEC + # run-time dependency only + select BR2_PACKAGE_POWERPC_UTILS if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + # run-time dependency only + select BR2_PACKAGE_NVME if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + help + Petitboot is a small kexec-based bootloader + + http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html + +comment "petitboot requires udev to be enabled" + depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/petitboot/S14silence-console b/package/petitboot/S14silence-console new file mode 100755 index 000000000000..2ce6b39f427b --- /dev/null +++ b/package/petitboot/S14silence-console @@ -0,0 +1,9 @@ +#!/bin/sh + +case "$1" in + start) + echo 1 1 1 1 > /proc/sys/kernel/printk + ;; +esac + +exit 0 diff --git a/package/petitboot/S15pb-discover b/package/petitboot/S15pb-discover new file mode 100755 index 000000000000..9d9ec57de3f0 --- /dev/null +++ b/package/petitboot/S15pb-discover @@ -0,0 +1,38 @@ +#!/bin/sh + +LOGFILE=/var/log/petitboot/pb-discover.log +PIDFILE=/var/run/petitboot.pid + +PATH=/usr/bin:/usr/sbin:/bin:/sbin +export PATH + +verbose= +if pb-config debug | grep -q enabled +then + verbose=-v +fi + +case "$1" in + start) + ulimit -c unlimited + mkdir -p -m 0775 $(dirname $LOGFILE) + mkdir -p -m 0775 /var/petitboot + # Set permissions for normal users + chown -R root:petitgroup $(dirname $LOGFILE) + chown -R root:petitgroup /var/petitboot + + export $(cat /etc/locale) + pb-discover -l $LOGFILE $verbose & + echo $! > $PIDFILE + ;; + stop) + pid=$(cat $PIDFILE) + [ -n "$pid" ] && kill -TERM $pid + ;; + *) + echo "Usage: $0 {start|stop}" + exit 1 + ;; +esac + +exit 0 diff --git a/package/petitboot/fs-overlay/etc/inittab b/package/petitboot/fs-overlay/etc/inittab new file mode 100644 index 000000000000..1f503d5d56f7 --- /dev/null +++ b/package/petitboot/fs-overlay/etc/inittab @@ -0,0 +1,34 @@ +# /etc/inittab +# +# Copyright (C) 2001 Erik Andersen +# +# Note: BusyBox init doesn't support runlevels. The runlevels field is +# completely ignored by BusyBox init. If you want runlevels, use +# sysvinit. +# +# Format for each entry: ::: +# +# id == tty to run on, or empty for /dev/console +# runlevels == ignored +# action == one of sysinit, respawn, askfirst, wait, and once +# process == program to run + +# Startup the system +::sysinit:/bin/mount -t proc proc /proc +::sysinit:/bin/mount -o remount,rw / # REMOUNT_ROOTFS_RW +::sysinit:/bin/mkdir -p /dev/pts +::sysinit:/bin/mkdir -p /dev/shm +::sysinit:/bin/mount -a +::sysinit:/bin/hostname -F /etc/hostname +# now run any rc scripts +::sysinit:/etc/init.d/rcS +::sysinit:/sbin/petitboot-nc +# Stuff to do for the 3-finger salute +::ctrlaltdel:/sbin/reboot + +# Stuff to do before rebooting +::shutdown:/etc/init.d/rcK +::shutdown:/bin/umount -a -r +::shutdown:/sbin/swapoff -a + +::restart:/usr/sbin/kexec-restart diff --git a/package/petitboot/fs-overlay/etc/locale b/package/petitboot/fs-overlay/etc/locale new file mode 100644 index 000000000000..655683630776 --- /dev/null +++ b/package/petitboot/fs-overlay/etc/locale @@ -0,0 +1 @@ +LANG=en_US.utf-8 diff --git a/package/petitboot/fs-overlay/init b/package/petitboot/fs-overlay/init new file mode 100755 index 000000000000..1e56178db162 --- /dev/null +++ b/package/petitboot/fs-overlay/init @@ -0,0 +1,8 @@ +#!/bin/sh +# devtmpfs does not get automounted for initramfs +/bin/mount -t devtmpfs devtmpfs /dev +exec 0/dev/console +exec 2>/dev/console +exec /sbin/init "$@" + diff --git a/package/petitboot/kexec-restart b/package/petitboot/kexec-restart new file mode 100755 index 000000000000..0175e76df4cd --- /dev/null +++ b/package/petitboot/kexec-restart @@ -0,0 +1,8 @@ +#!/bin/sh + +/usr/sbin/kexec -f -e + +while : +do + sleep 1 +done diff --git a/package/petitboot/petitboot-console-ui.rules b/package/petitboot/petitboot-console-ui.rules new file mode 100644 index 000000000000..cbf1b7e1d765 --- /dev/null +++ b/package/petitboot/petitboot-console-ui.rules @@ -0,0 +1,6 @@ + +# spawn a petitboot UI on common user-visible interface devices +SUBSYSTEM=="tty", KERNEL=="ttyGF*", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" +SUBSYSTEM=="tty", KERNEL=="hvc*", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" +SUBSYSTEM=="tty", KERNEL=="tty0", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" +SUBSYSTEM=="tty", KERNEL=="ttyS*", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i $name linux" diff --git a/package/petitboot/petitboot.hash b/package/petitboot/petitboot.hash new file mode 100644 index 000000000000..ccb58eed0e34 --- /dev/null +++ b/package/petitboot/petitboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 b42ae4fb2a81e9cf68f727c3f54c6312788c654bd97628ec9ba61b19a68990e6 petitboot-v1.13.tar.gz diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk new file mode 100644 index 000000000000..f7f54850ee04 --- /dev/null +++ b/package/petitboot/petitboot.mk @@ -0,0 +1,77 @@ +################################################################################ +# +# petitboot +# +################################################################################ + +PETITBOOT_VERSION = v1.13 +PETITBOOT_SITE ?= https://github.com/open-power/petitboot/releases/download/$(PETITBOOT_VERSION) +PETITBOOT_DEPENDENCIES = elfutils ncurses udev host-bison host-flex lvm2 +PETITBOOT_LICENSE = GPL-2.0 +PETITBOOT_LICENSE_FILES = COPYING + +PETITBOOT_CONF_OPTS += --with-ncurses --without-twin-x11 --without-twin-fbdev \ + --localstatedir=/var \ + --enable-crypt \ + HOST_PROG_KEXEC=/usr/sbin/kexec \ + HOST_PROG_SHUTDOWN=/usr/sbin/kexec-restart \ + $(if $(BR2_PACKAGE_BUSYBOX),--with-tftp=busybox --enable-busybox) + +ifdef PETITBOOT_DEBUG +PETITBOOT_CONF_OPTS += --enable-debug +endif + +ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) +PETITBOOT_CONF_OPTS += --with-ncursesw MENU_LIB=-lmenuw FORM_LIB=-lformw +endif + +define PETITBOOT_POST_INSTALL + $(INSTALL) -D -m 0755 $(@D)/utils/bb-kexec-reboot \ + $(TARGET_DIR)/usr/libexec/petitboot + $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/petitboot/boot.d + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/01-create-default-dtb \ + $(TARGET_DIR)/etc/petitboot/boot.d/ + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ + $(TARGET_DIR)/etc/petitboot/boot.d/ + + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S14silence-console \ + $(TARGET_DIR)/etc/init.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S15pb-discover \ + $(TARGET_DIR)/etc/init.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/kexec-restart \ + $(TARGET_DIR)/usr/sbin/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/petitboot-console-ui.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/removable-event-poll.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/63-md-raid-arrays.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/65-md-incremental.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/66-add-sg-module.rules \ + $(TARGET_DIR)/etc/udev/rules.d/ + + ln -sf /usr/sbin/pb-udhcpc \ + $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ + + mkdir -p $(TARGET_DIR)/home/petituser + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/shell_profile \ + $(TARGET_DIR)/home/petituser/.profile + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/shell_config \ + $(TARGET_DIR)/home/petituser/.shrc + + $(MAKE) -C $(@D)/po DESTDIR=$(TARGET_DIR) install +endef + +define PETITBOOT_POST_INSTALL_DTB + $(INSTALL) -D -m 0755 $(@D)/utils/hooks/30-dtb-updates \ + $(TARGET_DIR)/etc/petitboot/boot.d/ +endef + +PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL + +ifeq ($(BR2_PACKAGE_DTC),y) +PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL_DTB +endif + +$(eval $(autotools-package)) diff --git a/package/petitboot/removable-event-poll.rules b/package/petitboot/removable-event-poll.rules new file mode 100644 index 000000000000..b736aef6101f --- /dev/null +++ b/package/petitboot/removable-event-poll.rules @@ -0,0 +1,4 @@ + +# petitboot needs notification for media change events on removable devices, +# which we only get if we've set the poll_msecs sysfs attribute. +ACTION!="remove", ATTR{removable}=="1", ATTR{events_poll_msecs}="2000" diff --git a/package/petitboot/shell_config b/package/petitboot/shell_config new file mode 100644 index 000000000000..59337ff53039 --- /dev/null +++ b/package/petitboot/shell_config @@ -0,0 +1,19 @@ +#!bin/sh + +reset + +echo "Exiting petitboot. Type 'exit' to return." +echo "You may run 'pb-sos' to gather diagnostic data" + +if [[ "$(id -u)" != "0" ]]; then + echo "" | sudo -S /bin/true 2&>1 >> /dev/null + if [[ $? = 0 ]]; then + echo "No password set, running as root. You may set a password in the System Configuration screen." + sudo -i + sudo -K + exit + fi + export PS1='$ ' +else + export PS1='# ' +fi diff --git a/package/petitboot/shell_profile b/package/petitboot/shell_profile new file mode 100755 index 000000000000..40062b423b79 --- /dev/null +++ b/package/petitboot/shell_profile @@ -0,0 +1,2 @@ +export ENV="/home/petituser/.shrc" +/usr/libexec/petitboot/pb-console -- 2.39.1 From luca.ceresoli at bootlin.com Wed Feb 1 21:52:37 2023 From: luca.ceresoli at bootlin.com (Luca Ceresoli) Date: Wed, 1 Feb 2023 22:52:37 +0100 Subject: [Buildroot] [PATCH 1/1] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. In-Reply-To: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> References: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> Message-ID: <20230201225237.0fb5dacb@booty> Hi Graeme, On Wed, 1 Feb 2023 11:59:56 -0800 Graeme Smecher wrote: > If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > buildroot into the linux tree, these .dts files are copied to > arch/arm64/boot. Unfortunately, the post-image.sh script expects to find > them in arch/arm64/boot/xilinx. > > This patch does not require the xilinx/ prefix to be present when > symlinking the device-tree to system.dtb where u-boot expects to find > it. > > Signed-off-by: Graeme Smecher > --- > board/zynqmp/post-image.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh > index ed6dbe188c..c5de2db820 100755 > --- a/board/zynqmp/post-image.sh > +++ b/board/zynqmp/post-image.sh > @@ -5,7 +5,7 @@ > # devicetree listed in the config. > > FIRST_DT=$(sed -nr \ > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ I think the following simpler change would also work. Can you check that please? - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\2|p' \ -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From gsmecher at threespeedlogic.com Wed Feb 1 22:16:47 2023 From: gsmecher at threespeedlogic.com (Graeme Smecher) Date: Wed, 1 Feb 2023 14:16:47 -0800 Subject: [Buildroot] [PATCH 1/1] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. In-Reply-To: <20230201225237.0fb5dacb@booty> References: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> <20230201225237.0fb5dacb@booty> Message-ID: Hi Luca, On 2023-02-01 13:52, Luca Ceresoli wrote: > Hi Graeme, > > On Wed, 1 Feb 2023 11:59:56 -0800 > Graeme Smecher wrote: > >> If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from >> buildroot into the linux tree, these .dts files are copied to >> arch/arm64/boot. Unfortunately, the post-image.sh script expects to find >> them in arch/arm64/boot/xilinx. >> >> This patch does not require the xilinx/ prefix to be present when >> symlinking the device-tree to system.dtb where u-boot expects to find >> it. >> >> Signed-off-by: Graeme Smecher >> --- >> board/zynqmp/post-image.sh | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh >> index ed6dbe188c..c5de2db820 100755 >> --- a/board/zynqmp/post-image.sh >> +++ b/board/zynqmp/post-image.sh >> @@ -5,7 +5,7 @@ >> # devicetree listed in the config. >> >> FIRST_DT=$(sed -nr \ >> - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ >> + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ > > I think the following simpler change would also work. Can you check > that please? > > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\2|p' \ Assuming you intended \1, not \2 here - this suggestion breaks behaviour for a couple of defconfigs in the tree. If I run the ZCU106 defconfig through this regexp, I get: $ cat configs/zynqmp_zcu106_defconfig | sed -nr -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\1|p' xilinx/zynqmp-zcu106-revA ...this creates a dangling symlink in output/images (system.dtb -> xilinx/zynqmp-zcu106-revA.dtb). The right behaviour is to strip any prefixes that exist, without requiring any. Something like: - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(.*/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ This is less Xilinx-specific, although it seems a tad greedy. best, Graeme From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:36 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:36 +0100 Subject: [Buildroot] [PATCH 2/7] configs/olimex_a13_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-3-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/olimex_a13_olinuxino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a13_olinuxino_defconfig b/configs/olimex_a13_olinuxino_defconfig index 6d25d7d0a1..8469ce1fd0 100644 --- a/configs/olimex_a13_olinuxino_defconfig +++ b/configs/olimex_a13_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a13-olinuxino" @@ -15,7 +15,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A13-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -28,7 +28,7 @@ BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:40 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:40 +0100 Subject: [Buildroot] [PATCH 6/7] configs/olimex_a33_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-7-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/olimex_a33_olinuxino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a33_olinuxino_defconfig b/configs/olimex_a33_olinuxino_defconfig index cdbc63efe1..35398ac6da 100644 --- a/configs/olimex_a33_olinuxino_defconfig +++ b/configs/olimex_a33_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a7=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="A33-olinuxino" @@ -15,7 +15,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A33-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -31,7 +31,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a33_olinuxino/boot # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:37 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:37 +0100 Subject: [Buildroot] [PATCH 3/7] configs/olimex_a20_olinuxino_lime2_defconfig: bump Linux to 6.1.9 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-4-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/olimex_a20_olinuxino_lime2_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index a0ebcaed66..50a0986ab2 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.15 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:41 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:41 +0100 Subject: [Buildroot] [PATCH 7/7] configs/olimex_a64_olinuxino_defconfig: bump Linux to 6.1.9, U-Boot to 2023.01 and ATF to v2.8 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-8-giulio.benetti@benettiengineering.com> Linux 6.1.9 installs more modules and this makes rootfs size to increase and the default 60M size is not enough. So let's expand rootfs size to 120M. Signed-off-by: Giulio Benetti --- configs/olimex_a64_olinuxino_defconfig | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configs/olimex_a64_olinuxino_defconfig b/configs/olimex_a64_olinuxino_defconfig index 53e8c2ece5..dd445e8ce0 100644 --- a/configs/olimex_a64_olinuxino_defconfig +++ b/configs/olimex_a64_olinuxino_defconfig @@ -2,13 +2,13 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.8" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -16,7 +16,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="a64-olinuxino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -33,7 +33,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-olinuxino" @@ -43,6 +43,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_GENERIC_ISSUE="Welcome to Olimex A64-OLinuXino" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:34 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:34 +0100 Subject: [Buildroot] [PATCH 0/7] Bump Linux, U-boot and ATF versions for olimex_a* boards Message-ID: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> I could not test the changes on Olinuxino A10 and Olinuxino A20 Lime2 because I don't have those boards. But A13 works correctly and it's very similar to A10, while A20 Lime2 has only a different topology of DDR3 and it's been upstreamed for long time so I think it's reasonable to commit the entire patchset. Giulio Giulio Benetti (7): configs/olimex_a10_olinuxino_lime_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 configs/olimex_a13_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 configs/olimex_a20_olinuxino_lime2_defconfig: bump Linux to 6.1.9 configs/olimex_a20_olinuxino_lime_defconfig: bump Linux to 6.1.9 configs/olimex_a20_olinuxino_micro_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 configs/olimex_a33_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 configs/olimex_a64_olinuxino_defconfig: bump Linux to 6.1.9, U-Boot to 2023.01 and ATF to v2.8 configs/olimex_a10_olinuxino_lime_defconfig | 8 ++++---- configs/olimex_a13_olinuxino_defconfig | 8 ++++---- configs/olimex_a20_olinuxino_lime2_defconfig | 6 +++--- configs/olimex_a20_olinuxino_lime_defconfig | 6 +++--- configs/olimex_a20_olinuxino_micro_defconfig | 8 ++++---- configs/olimex_a33_olinuxino_defconfig | 8 ++++---- configs/olimex_a64_olinuxino_defconfig | 11 ++++++----- 7 files changed, 28 insertions(+), 27 deletions(-) -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:38 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:38 +0100 Subject: [Buildroot] [PATCH 4/7] configs/olimex_a20_olinuxino_lime_defconfig: bump Linux to 6.1.9 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-5-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/olimex_a20_olinuxino_lime_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index f685d19421..25ecf31146 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.15 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:35 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:35 +0100 Subject: [Buildroot] [PATCH 1/7] configs/olimex_a10_olinuxino_lime_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/olimex_a10_olinuxino_lime_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a10_olinuxino_lime_defconfig b/configs/olimex_a10_olinuxino_lime_defconfig index d0e00301f7..9c454b1915 100644 --- a/configs/olimex_a10_olinuxino_lime_defconfig +++ b/configs/olimex_a10_olinuxino_lime_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a10-olinuxino" @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a10_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -33,7 +33,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A10-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 1 22:32:39 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 1 Feb 2023 23:32:39 +0100 Subject: [Buildroot] [PATCH 5/7] configs/olimex_a20_olinuxino_micro_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230201223241.3867678-6-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/olimex_a20_olinuxino_micro_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index 1394c0b8b8..a7a6eb51a0 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-micro" @@ -33,7 +33,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino_MICRO" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -- 2.34.1 From bernd.kuhls at t-online.de Wed Feb 1 22:51:04 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 1 Feb 2023 23:51:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: fix build error with newer mesa3d Message-ID: <20230201225104.3433262-1-bernd.kuhls@t-online.de> Fixes build error: output/build/kodi-19.5-Matrix/xbmc/windowing/X11/GLContextEGL.h:16:10: fatal error: EGL/eglextchromium.h: No such file or directory 16 | #include introduced by mesa3d 22.3 with this commit https://gitlab.freedesktop.org/mesa/mesa/-/commit/f5bb9dd738ace274c97507adea073b6c609469b2 using this defconfig BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls --- package/kodi/0005-Fix-EGL-build.patch | 58 +++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 package/kodi/0005-Fix-EGL-build.patch diff --git a/package/kodi/0005-Fix-EGL-build.patch b/package/kodi/0005-Fix-EGL-build.patch new file mode 100644 index 0000000000..cefa8cbdb4 --- /dev/null +++ b/package/kodi/0005-Fix-EGL-build.patch @@ -0,0 +1,58 @@ +From 3fed131284b53b0e42c87c672f02dc3e91e40b22 Mon Sep 17 00:00:00 2001 +From: Alan Swanson +Date: Mon, 19 Dec 2022 21:28:13 +0200 +Subject: [PATCH] Work around Mesa eglchromium.h removal + +I have polished Alan's snippet to buildable state and tested +on Kodi from Debian sid. + +Backported EGL fix from upstream commit: +https://github.com/xbmc/xbmc/commit/2968130023ea6ee4327119dc969758840c4a5941 + +Signed-off-by: Vasyl Gello +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindEGL.cmake | 6 ++++++ + xbmc/windowing/X11/GLContextEGL.h | 4 ++++ + 2 files changed, 10 insertions(+) + +diff --git a/cmake/modules/FindEGL.cmake b/cmake/modules/FindEGL.cmake +index b00fe08a25f95..a68a8db901222 100644 +--- a/cmake/modules/FindEGL.cmake ++++ b/cmake/modules/FindEGL.cmake +@@ -9,6 +9,7 @@ + # EGL_INCLUDE_DIRS - the EGL include directory + # EGL_LIBRARIES - the EGL libraries + # EGL_DEFINITIONS - the EGL definitions ++# HAVE_EGLEXTANGLE - if eglext_angle.h exists else use eglextchromium.h + # + # and the following imported targets:: + # +@@ -35,6 +36,11 @@ if(EGL_FOUND) + set(EGL_LIBRARIES ${EGL_LIBRARY}) + set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR}) + set(EGL_DEFINITIONS -DHAS_EGL=1) ++ include(CheckIncludeFiles) ++ check_include_files("EGL/egl.h;EGL/eglext.h;EGL/eglext_angle.h" HAVE_EGLEXTANGLE) ++ if(HAVE_EGLEXTANGLE) ++ list(APPEND EGL_DEFINITIONS "-DHAVE_EGLEXTANGLE=1") ++ endif() + + if(NOT TARGET EGL::EGL) + add_library(EGL::EGL UNKNOWN IMPORTED) +diff --git a/xbmc/windowing/X11/GLContextEGL.h b/xbmc/windowing/X11/GLContextEGL.h +index 99a6a9024e8c6..afea0b7c43eac 100644 +--- a/xbmc/windowing/X11/GLContextEGL.h ++++ b/xbmc/windowing/X11/GLContextEGL.h +@@ -13,7 +13,11 @@ + #include "threads/CriticalSection.h" + + #include ++#ifdef HAVE_EGLEXTANGLE ++#include ++#else + #include ++#endif + #include + + class CGLContextEGL : public CGLContext -- 2.39.1 From thomas.petazzoni at bootlin.com Thu Feb 2 06:45:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 02 Feb 2023 06:45:07 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-01 Message-ID: <20230202064514.8A14641A37@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-01 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 3 | 2 | 0 | 5 | 2022.11.x | 14 | 19 | 0 | 33 | master | 172 | 335 | 3 | 510 | Classification of failures by reason for master ----------------------------------------------- host-fwup-1.9.1 | 28 fwup-1.9.1 | 18 xz-5.2.10 | 17 jack2-1.9.21 | 16 host-go-1.19.5 | 11 norm-1.5.8 | 10 libfuse3-3.13.0 | 8 opkg-0.4.5 | 8 bash-5.2.15 | 7 fluent-bit-2.0.8 | 7 gvfs-1.48.1 | 7 host-binutils-2.38 | 7 linux-6.1.5 | 7 host-pahole-1.24 | 6 python-bunch-1.0.1 | 6 xxhash-0.8.1 | 6 gerbera-1.10.0 | 5 glibc-2.36-81-g4f4d7a13edfd... | 5 gobject-introspection-1.72.0 | 5 libglib2-2.72.3 | 5 libgpg-error-1.46 | 5 dahdi-linux-3.2.0 | 4 host-binutils-2.37 | 4 host-sentry-cli-2.8.0 | 4 libcap-ng-0.8.3 | 4 libgcrypt-1.10.1 | 4 pixz-1.0.7 | 4 python-bcrypt-4.0.1 | 4 unknown | 4 wolfssl-5.5.3 | 4 zabbix-5.4.9 | 4 brltty-6.5 | 3 elfutils-0.186 | 3 fontconfig-2.13.1 | 3 freeradius-client-1.1.7 | 3 gobject-introspection | 3 host-rust-1.66.1 | 3 nerdctl-1.0.0 | 3 bat-0.19.0 | 2 google-breakpad-c85eb4a59b6... | 2 host-binutils-2.39 | 2 hyperfine-1.14.0 | 2 linux-5.10.145-cip17 | 2 mongodb-4.2.18 | 2 netsurf-3.10 | 2 ntp-4.2.8p15 | 2 pcre2-10.42 | 2 python-cryptography-39.0.0 | 2 traceroute-2.1.0 | 2 uqmi-0a19b5b77140465c29e2af... | 2 acpid-2.0.34 | 1 afboot-stm32-3566acd582e553... | 1 alsa-lib-1.2.8 | 1 apparmor-3.1.2 | 1 berkeleydb-5.3.28 | 1 bird-2.0.11 | 1 boost-1.80.0 | 1 btrfs-progs-5.16.2 | 1 crun-1.7.2 | 1 efivar-38 | 1 fftw-quad-3.3.8 | 1 flac-1.4.2 | 1 flann-1.9.2 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 fs/ubi/ubi.mk:51: /tmp/inst... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 glmark2-06e78b67702b5413335... | 1 glog-0.6.0 | 1 gummiboot-2bcd919c681c952eb... | 1 host-gcc-final-10.4.0 | 1 host-gcc-final-11.3.0 | 1 host-gcc-initial-12.2.0 | 1 host-python-maturin-0.14.9 | 1 kexec-2.0.25 | 1 kmod-30 | 1 libndp-1.8 | 1 libnss-3.87 | 1 libvorbis-1.3.7 | 1 linux-fusion-9.0.3 | 1 lirc-tools-0.10.2 | 1 ltp-testsuite-20220930 | 1 lttng-babeltrace-1.5.7 | 1 lttng-modules-2.13.7 | 1 lxc-5.0.2 | 1 ocf-linux-20171122 | 1 open62541-v1.3.4 | 1 openvmtools-11.3.5-18557794 | 1 pixman-0.42.2 | 1 postgresql-15.1 | 1 python-numpy-1.23.5 | 1 python-orjson-3.8.4 | 1 python-pyicu-2.10.2 | 1 quickjs-2021-03-27 | 1 uccp420wlan-6.9.1 | 1 uclibc-1.0.42 | 1 vdr-2.6.3 | 1 xdriver_xf86-video-geode-2.... | 1 xfsprogs-5.14.2 | 1 xvisor-0.3.1 | 1 zip-3.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/8d4e01c43ed62fa33327975abdcc37f8b17743e4 | ORPH arm | afboot-stm32-3566acd582e553... | NOK | http://autobuild.buildroot.net/results/c08330c410abc384b008c923a7e0736fce5d968a | or1k | alsa-lib-1.2.8 | NOK | http://autobuild.buildroot.net/results/02b21fd211bf4266028b72eb024df86bbb6d038c | arceb | apparmor-3.1.2 | NOK | http://autobuild.buildroot.net/results/b4fe1287b42076c1d2b82da306f61d0b0d9e6479 | arceb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/dc81ba14f0cac9c70ec7e5beb7c16f0d2d6d4c86 | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/7ce2f336f8ede2eebfb2b8ba7d0405c89980464d | ORPH mips | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/d25c36fa0f32e56a4f9db8ed21bd98ca59920787 | ORPH powerpc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/4f8da8a51ef877cdfaf6ab4fb936a22636bef5e1 | ORPH mips64el | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/1f319789a87e055bbd074b020193b67adab4ac56 | ORPH xtensa | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/d40e87855a4b44fb207ddfec9183aca1336ed4d5 | ORPH powerpc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/34bd798693455de1e569a8136da7cb3a697a19fd | ORPH x86_64 | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/3566a772ef76c31f5d427f968269b99adb0750bf | mips | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/da25d808283e0ee099dad2ab7ca797c6ba0eb3b9 | sh4 | berkeleydb-5.3.28 | NOK | http://autobuild.buildroot.net/results/f5083d1f8b98f923de8160aa89855733e10a7063 | ORPH arm | bird-2.0.11 | NOK | http://autobuild.buildroot.net/results/e2bbd0ca1fddaa71f223712be8e2e63f31ca2da1 | arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/392bd89315f4a5062558e647f77a3a5238c1a63e | mipsel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/65b12428267b52a1368abef45779e63fd7a15af4 | mips | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/4339a830c763ed2efdc28b90e9f7a45438dfac9d | microblazeel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/3eb49c8c41963ce22b94c179223129818e3ff03b | or1k | btrfs-progs-5.16.2 | NOK | http://autobuild.buildroot.net/results/52a39ff69d2db9866ee3fc65567bdb9fb2181602 | ORPH mipsel | crun-1.7.2 | NOK | http://autobuild.buildroot.net/results/f7a7ddd433437fa778950281af04643d7db972c3 | sparc64 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/1bbc2b3eec84e1fc0686c1f148471d396d5b0898 | armeb | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/20021f9b71e0ea4692d44f7c7070c15b394ffab1 | riscv64 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/a0fea114fd79971c4ce4a4512cbce4d5923feaa3 | s390x | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/c3a799a4e9874dc850d086ce61ca215eb45cb4f6 | aarch64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/1ba67891df0499237f315a59a3220a4078d9b62b | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/636b86910612560769e19ca6df5c74c291758525 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/92c347d5cebb2cde9f91730748abf6b06380f0a0 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/96fd22c7cdedb7d02a560f46cfc298b7c9208023 | ORPH powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/fd7aaabef32184afe0826e21d81b492935ccd5ee | ORPH sh4aeb | flac-1.4.2 | NOK | http://autobuild.buildroot.net/results/620eaa2419ae69dec66e02be13a2eb50a2b3af83 | mips64el | flann-1.9.2 | NOK | http://autobuild.buildroot.net/results/5dcc29a942368cb4c0eb12c21b5c12fc877eded7 | aarch64_be | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/db4dca11d2186c6aa1fc47bc7f34cad69a02acd3 | powerpc64le | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/7c0b6cd07d623c6dfa552634b57856c2faf3c5e2 | aarch64_be | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/55b1f8d587a10357c228ff3c4313675239be9d21 | powerpc64 | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/2fc0a32d52be56525edaffcf7ec461c834e90854 | aarch64 | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/620b062db8a331f86a218e5b3b80395500f09435 | aarch64_be | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/f0514c217fd5cb4d6f07bb8bd7aaf71e3e9b50cb | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/df9901b7b52c7933e6a4ef4503f80e336e0e299e | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/0f303a32561b33aaa1dbb9c469333b9777180f13 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/8c829744f7991d8dfd7447b70cdd61e5478ef9f9 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/aeb4cb12ff37e96e036ab93bf15703e7753bbea2 | ORPH riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/25fbee9c28e5b3f114b06da35f1f0b0a8db44195 | riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/3c2d0281cb26676ee4581c6fc4f747c0959309f9 | riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/6afb37875b282c3475e420d9a3d424dafb80cb08 | arc | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/dcdd3b4cae74c4c0ca155e7db83db9032c35fdda | mipsel | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/c3bab75326a425786798079ce330f5724dff0cc5 | mips | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/faa2cc501565a6d81f43b905feb0ecb25eea7a7e | mips | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/ef488b35ef95912ad209ed062a998eb976055b29 | mips64 | fs/ubi/ubi.mk:51: /tmp/inst... | NOK | http://autobuild.buildroot.net/results/ec6f6e7e9b643534ed37f41ecd27df0e7ddae731 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/dd412baf8f9312c42b59076bae1e85a60264461f | powerpc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/19494f7dc0d460eaed1b2006ef19a2e082d47ba7 | or1k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/ca536d3ccba15f8f57af23d6e15aaa23bd7824db | mips64el | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/b7e81ee0800602e08cb323b3a7cc64e720365052 | or1k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/f49e42e64e610d37a06fb6941558d28e561089c5 | mips64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/0ef5021be1cb43728dd3e155fb547d926cd57152 | s390x | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/4a21636890fce1750ed285436fc5cdfb47d90b65 | nios2 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/47c578e74e70ce22781bb05caf6712a43ef16ed8 | microblaze | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d8f0dde87b56d9a9756f27b1288aff0996684adc | powerpc64le | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/9e5c4ea12c1a6acacfe17d8bc2d0ff3499e86298 | xtensa | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7a9efd870165569a783f297475b2553824cbcb4d | sparc64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/84b2e3e8bff331435e63e1e4a4ab6c699bad62b6 | mips64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/b0e976bff8076fa5d50b2c1600111ab0ea8e3dc5 | aarch64_be | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/110fb35d4c9c022d600381106c7296385086d71e | aarch64_be | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/317507c834edbad4379f2f9b1913d0507dbeb6ff | i686 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ffefc92bd86d606ff1dcefc3c2710b1a88a04b6a | nios2 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7c92d4618440c66764bbbcbf1c9637f77f848571 | x86_64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/75800541af18fca312cdc1bed32b6e2a18d34bcd | nios2 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ec81ad75862dd9e25a4464a535af5a484cb67f5f | mips64el | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/38185fa177eb5cc4905bec7760cb7bb4e4de3851 | arm | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8214d7a33b1cb25d72450a429d2b933539a3b419 | arc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/4f61473b4c68ce907109a05d1ed0cf3b14de97eb | arc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/fb424825c21330b8a87703c3cbcd68c48810b100 | sh4a | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3b9d83a0f9d8c346aaf6900aea206952466d1685 | mips64el | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8fe00f5a7b474d2f27dfc4f989e281e2c34d5dbd | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/b033bb5f06ead6bf623cb54d576c7a9dcabad148 | nios2 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/0732ccc310aa52d32b569e72733efe14ff61acb8 | mips64el | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/a7ceaa8cf8d0a50f5790fa2c0d96a99f4e3b876f | sh4 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/990d0286c3f63d93fb6f09f15511c9ee04ca1b9b | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/838a4f0141c238e3391927ac08c23e79209cefc1 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/13db1f6bd84eecd70cca022e0543611d328346f5 | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/c1b0bb58c952bdcd0d6b63de3fc10385ea7e0b9a | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/490523b6260273d2e00a1bea66d2d4c49cbe501b | powerpc64 | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/f01bd5b70a53313bef6e0500d2120ad58b3a5c97 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/52daa688b341e28f8ded613665e359a72031e714 | aarch64 | glmark2-06e78b67702b5413335... | NOK | http://autobuild.buildroot.net/results/bbd90f11975b691f694412a6fc3446f37dd7c0aa | riscv64 | glog-0.6.0 | NOK | http://autobuild.buildroot.net/results/49b6f8268a91e2392e880ce52b7f892ef41a0b55 | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/e9106719c92cff325040720e94ecf384e59f76e6 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/29730d4d341516f15a1f5dc5ded2419318b34ccd | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/d10553b4f92bc297a633bab4772aca5994860ea6 | nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/561d47cfe7a27ed0e25985aca39980ac69a43223 | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d616444a34ed8879fc1d61e7fe87545b49da7cf2 | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f686adec0283da6c72076fe13cdbc5c1811ba5e4 | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/58c0fb46c87e76a44fac1f3d2927d3ea8295b4fa | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/e2e7ab69578cfbe3074baf2f94fc5e2c7cdc6e1e | ORPH arm | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/b6e2cd511f913ebc626f7eadc0e2496c9f2977dc | mipsel | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/c3fb2f019663741947b0888cca9ab2f1309ab01c | i586 | gummiboot-2bcd919c681c952eb... | NOK | http://autobuild.buildroot.net/results/b503ea7341d4e865ec9f288922d3063f08f8ea67 | mipsel | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/53816e64ab18541cb78c7cef62dda5873267f042 | ORPH s390x | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/58246cc30cdb3e278597e9b63b58d5dab64280a8 | ORPH nios2 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/7da35f6fac6df78ae91c840ef32af9a5f5d5a62f | ORPH x86_64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/daa230ffb7536175990669cfb95aae71b176e764 | ORPH powerpc64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/9ad4b3eabb1cfcd56a124bf5d0d42fd51d8234ef | ORPH sparc64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/115a27158ab16bd0f82c311849507610bd70e096 | ORPH powerpc64le | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/44463cd74d0b617c3aa246a6ed16f00a37ce25af | ORPH arceb | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/95a23561fff47cfaf91e0b5162b4300a8acc6698 | mips64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/64acd43cc8ca29ce1ea7df518118bde6e7d02309 | xtensa | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/04cc6ad0b397e790c1d8932d7506a775edfb1bee | sh4a | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/bcddcee118610404fe919172f70ad77c8bbb8782 | or1k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2da7f810282f4e0832179b8df9a4f8808f0afcad | mipsel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/12c0f087748437dfda94414d10180fd7723afec5 | riscv32 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/4b72e625c98bc61c07db63ad47b74024ee69d7c6 | sparc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/4d2af7a3894ef38c661bc34c778824712c1add29 | mipsel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/baa72f384a0765e12b065663c1fea62d3e18aa27 | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6ada8e68fd706498aeac323d3972d20e6b62cde8 | aarch64_be | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/ef3f25bbd04d65f1bf9b6f8cb25fea97a80046d8 | powerpc | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/958fc489eb7ca7cf1551e77fd001a6bf7024bfdd | powerpc | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/ceca9b5ceff75442c7605e0edd269b3a15ffea86 | x86_64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/5dce05289e7961861d9b62d670a035aeaaa5f3ac | microblazeel | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/5fc0aa211fcba67a8a067c6d98963c8f518d34f5 | xtensa | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/15219ce297be728b824b8afd1e4c3ecdf8624b26 | or1k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/0e167421afda575d421e5b75a02fe3cb2e4cfabe | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/f5ac81272c40b6401d39fb83a2dbd58e9d5b7c60 | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/fb3624fbe4e5229da498740b0bc8e0d3cfc4fa33 | riscv32 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/a31edccedc11487dfa20f278d105c137f24b6247 | sh4a | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/002b603eeb8380d29d0b8b0f3793293f67d165a2 | mips64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/af1d596f53dd88c0976eeca6be0c1860b8b5b893 | or1k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/87187c6882a4d516a6582be13a7db25e38a774fd | i686 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/6d17ba1217af25bc031cb47aa0dbc7fb835ca2af | or1k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3cb5befc7c49f14321ddf575246007c220a44d74 | m68k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e265ba753c441f6ae60075042e66e75b9073a9a4 | arc | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/29f0cabfe8c94fae0766c911175ae565d20c705c | arceb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7514e3556b4112a75047f55ab2b44de407828a5c | sh4a | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e729b881ec8301b7e78988eb2e2262c88f9b3d1b | sh4 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d9cb94c8003026c7d21e8882a34b7b6ba30c821b | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/6c241f285208eedd646875ff38af4cab20c48f10 | powerpc64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3bdd030ecd1fd69693b4d7619ca96eb2cd87cee7 | x86_64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/0ea27cb5dcc21884618dc50bd6c213aec8da38fb | arc | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d70e0d4a0fa805baa376fcd72142be8271a2bfa3 | riscv32 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ff24569c9c25df649eaa282f78cf4111a16165b3 | mipsel | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/2a7b0ff05e3420b0374b7dc25b5f9ab56194717f | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/eb34fbaaf8d71aa5cc4674ee12842e2e40e28f6b | mips | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/4bb36cf80ba1820881edd22f809d2bcb720862f4 | armeb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e23676808ed36f0ade5ad531b89357e30b73af5b | mips | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/c75aadf1a4132496ab64622b79593f4c41cd8196 | x86_64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ba7373995cfdbc3b53667e457e8661633816ad95 | riscv32 | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/f9db426c5f9ef48e742b92851ca587dc6f82da33 | microblazeel | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/941abe8a57fc3a59059d7fc69e1e585552541fa2 | arceb | host-gcc-initial-12.2.0 | NOK | http://autobuild.buildroot.net/results/655b9a44a07014d274238644846ff7c3e39a1b71 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/ba8fa7af8352cd65a3a9d6927c8d40f6c01f2321 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/8e52dd78f29ae2e9352aca3f6c4209a35456d63a | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/d01dce5e7dbf8063f71a62006c8e676fc629ff05 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/9d9f8ecedd25c29798f9c50cbda9789897f50922 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f5e7f9b585da2f6002d0d38a126339fe1ebe55e8 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/d15e504fddc5c77a6861f4c3b3b9c7ff624d5e97 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/bf01a959c5608bde5c1efc0082733c20a7a17ba4 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/a65bc23a8cda34b8c1e365432aafab1c23f84579 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/9db632607f4333469a3fcfb160147e47dbeaf475 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/799ef3267ab3bc357f40b721be968c58ae318b47 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/a6ed60544ffb0225a93e5fec397cba1b0528a0c1 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/aa2f23a6d551190df62eb26e6c135aa2bf1cce61 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/6993cd6183c6c33e9803bcaf8c8ca732e024e1dd | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/be14569c54b60a56ab37ac464fb86d128e5137ef | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8ca78ce116774286933c440fa8b00459a1f57fbc | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/42dfec5afcc34e54e8ee8dacb9fa0f0e3f5b7ce3 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c830eecb134dbead9003014dd93c17c8b0c3e569 | sparc64 | host-python-maturin-0.14.9 | NOK | http://autobuild.buildroot.net/results/23f802d3d7ba96939d36916bc4dcaedaf8eea4be | armeb | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/d864e592014c24a5f1dd096fdec240d83e5c414a | armeb | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/cb4711005dd0766b5f80d2a815bee131400d0e61 | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/202b42ca3c1a25ed8c1d05fb97e06b2be11d4483 | mips64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/ec92ce423e04caec00328d55f81455625b732879 | xtensa | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/f8b48dd47d5d6ce912b9dce66b8fa30956b6e5fe | arceb | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/57fed06f3cdd73436c81969aa98c86aae6ad128f | or1k | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/54cc389fee1ca34ab6455aed1c084fc743e1133b | powerpc64le | hyperfine-1.14.0 | NOK | http://autobuild.buildroot.net/results/3eb0fa2dee6cbfbeae1f9640d399c362637801e5 | ORPH x86_64 | hyperfine-1.14.0 | NOK | http://autobuild.buildroot.net/results/bb4190b8af3fbfc66b6a8537e0a1ff7b8e46ca37 | ORPH mips64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/68f7eec804e3159cbe90064691d1c7d53a0d62bf | mips64el | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/35ff103afa7315ba9c1ea35f5b3fd509dda3bf9f | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/c82551eaa62a293731ad1626c8d599d58bb63a39 | powerpc64le | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/c802c405966fad34548454d3860ab02e84671f34 | mips | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/de7c4851dc333df14ba9e2cef095e4a2d38a3fe6 | powerpc64le | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/925d3000fee3ded8407766d2caf25357d1a370c5 | s390x | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/66a60e106e578464db8d22433738380a39790a03 | mips | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/ab0c68a7a4d7df7861f7a28b3126ff2ec851e316 | aarch64_be | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/a1eebcf786cc0af943ca5157bfdf975ccf40be43 | arm | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/4d9fb7d913aae1d321acd2c73b86c4c19eb58475 | or1k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/2869b35a031faa9f05e172dda4baebb75e23d590 | powerpc64le | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/60b12ca955739be9f49de1b52970e49163cda226 | microblaze | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/e50cfaa56bc7d29d21d30c57e4f677757fc6ccb0 | powerpc64le | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/42cedb4d394ce1120334a2e5a3da4b4647ac12c5 | powerpc | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/e591241b7c7a51ad4a4c08593c9f7699ed73108d | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/c46508633c74395ae1dc3b6e4cdeed9210a657d8 | armeb | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/27b3dff6575099e8e8f36bbf8283a551d0d20a91 | ORPH armeb | kmod-30 | NOK | http://autobuild.buildroot.net/results/40647bed164a8ad535b900fdf5d09d600ced6f3c | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/a9dd7e93994557fc267843fc4dfb542d914fd81a | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/6540f81fb4108b52a542d459bef7b466d5c36c6f | or1k | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/bad686930c52d2132dfae5965e168eada32232fc | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/a35e190e5f2e90b79e1365000359b851b5932a1a | or1k | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/5843f77eacf0c6a2f94c4854a19fa912faeeca6b | mips | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/a019fca7a6feef0e20922d37b5bf45529176bdeb | i686 | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/af8160be7d79690e8a7fe3c92bd6ceb22fad1695 | sh4eb | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/b745ebcaf36a2ea8b34c8bf07e068324de1820b9 | powerpc64le | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/49d2dbd03f4691e59094dbae1488180cd2c47e97 | powerpc64le | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/856b295d5e94e15bd510cd6165b0636d1ca4bd60 | i686 | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/19dd0243b3bc8c82914a852694ea75d802ef08ff | powerpc64le | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/3938e6ba878fa2e12ebd52e4b5e34ddadc3ffdc1 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/04b2c0044dd33f9457e480eac7c84e188a0bd7c8 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/5e3afca87208aa77e8edae9470aaa1fb7080c8d7 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/8059ae7fc5065dc7fb3e198d7de1ca537a1e9e00 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/854704351646a6929dbfef19bfb55824f18d2b6f | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/8e64223a4cb96e4e6c7b579646e27e23d09adfe5 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/892349acf9a72a36100edf5e6bf9fb8a6436a258 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/5b8adf7ac81928c3071d29a602b90fc22fd20b0b | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/d99f1b042e1a7cbb09056468380007e9c1234ddd | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/2ae46deb5f11b03d64709b702108313da523ab43 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/a16b3deffd616a0cd9b10eb962f82aa0c724cdba | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/f13e988c2e40653a5608914595bb073a63ae65e0 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/26fb07ca54892a413a65a3bc0dc8809605a4133b | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/57034f1cf3c997d67445d8527a89c084c459dfd2 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/f808d9a4fa13b39430633daa91b2e45b9f468113 | ORPH riscv64 | libndp-1.8 | NOK | http://autobuild.buildroot.net/results/4dea0f50d6c3f884762be9fd7debfdf7f133123a | sh4a | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/9d18bd99f66699e1a7e0785160ffdb15adc38222 | powerpc | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/dab159120e693856917b5294dd0e1da80de35351 | sh4a | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/08d22bb5d3cb8f94b8a14e556f3f92dd879b4394 | ORPH mipsel | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/8fd031cf2df528538973350da4653fb4fc0a3ee6 | ORPH mips | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/dd32e27f7a9355e454d5f09ce39369344f93d1e3 | ORPH powerpc | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/b6b5f6daf9732e125cd3023ba7870225430410ed | ORPH sh4a | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/52034975dfdd11d2e0cb7969bb395f00dbedad09 | ORPH mipsel | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/3835d604569739ad985fefb61642fb1f4c9ca488 | ORPH mips | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/62405e4b74fa93aa2327249ac5c60b37c7e37d32 | ORPH mips64el | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/d2fe49dffed2eae712f261a785963f6b86b79bed | ORPH mips | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/68b992424c4c5b9bda864088437aa726dab06efb | ORPH sparc64 | linux-fusion-9.0.3 | NOK | http://autobuild.buildroot.net/results/8668b0debd4d6db3067044be7b5d08189ff8e617 | ORPH powerpc | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/c1e72d7e71e0e75f36b6f2a4607310ff084be1cd | ORPH x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/2d369d8b8a669e902bdc479961a43010264230d3 | arceb | lttng-babeltrace-1.5.7 | NOK | http://autobuild.buildroot.net/results/e0e41ca10d8a847fadfbd9455d463a0d57b27bef | microblazeel | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/b08b0c138d344bfbff18eb9f411d1357dab6fcb7 | aarch64_be | lxc-5.0.2 | NOK | http://autobuild.buildroot.net/results/c7d8b6361275f0a8aa01e78814dfa19a84bde547 | aarch64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/59dee59117659369e4bd5e296bf2825abd2bf72b | aarch64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/ebf4151aac9718255f979015cf849cca754a2c51 | aarch64 | nerdctl-1.0.0 | NOK | http://autobuild.buildroot.net/results/a7c5f28f9e6cf8da7026bab5c2284fc4fc7e89f7 | arm | nerdctl-1.0.0 | NOK | http://autobuild.buildroot.net/results/eaf0c6649b5663be911145622a306473849b2d0d | powerpc64le | nerdctl-1.0.0 | NOK | http://autobuild.buildroot.net/results/bad88cf7ac3ea53e28ba6e16e5a374f5fe1a0da2 | mips64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/3c9f872868fca60f947b35593ea5135531334a43 | nios2 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/c29a210bfb3377f1c873981123ad8da91532a2ff | i586 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/8600d58e2656ef0ec2c562c8676b98d59c5d73f4 | ORPH microblazeel | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/de7028cea50e329fa27131fad2c48f4ba1dacda3 | ORPH riscv64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/da7154b2a0dcd21474d92c451c6463be4d755776 | ORPH sparc64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/d87331619ad6f837c6b8ae0cd516fb1aff72618e | ORPH nios2 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/12b76abb7d5df113656bc892b48edcaef105a6e3 | ORPH arm | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/a7d2eeab76b1391e5733ef09dac751655b005a6c | ORPH sparc | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/197d98d06024806887621fdcffb3eb4bd7031ef6 | ORPH x86_64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/4e9f9aaeaee2b228fb53aa84094c881b9ce9aa20 | ORPH m68k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/859e7f4ab19806cd21dac1e097da2e0448926831 | ORPH m68k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/3dfbe85fdd1e7a1bc8a132d925abe47f7a4bc7c4 | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/1a1016e7aa77f5608f66c4344541c220e31fbd3b | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/352911fba22bca1353b335772c70d1ffa75f3860 | ORPH powerpc64le | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/af7e6b185b932f0bfac9c113e9c4d129fd5d1faa | ORPH nios2 | open62541-v1.3.4 | NOK | http://autobuild.buildroot.net/results/2b3bf9142d1de0a1f500ba53b82b52248458e32f | ORPH x86_64 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/ecbe8f9244ba0764eae2f3db0007415b320f22bd | mipsel | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/29d5d20660318620befb78af3be06896d4a70e99 | ORPH powerpc64 | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/b844d753f5d1969e941e2a865c7ff760fde37d9c | ORPH aarch64_be | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/7cc3bceddd4ba016164d31d2718138c43cb8b976 | ORPH sparc64 | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/5dc839d26b34824f78311c5e745d51209f7a1987 | ORPH s390x | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/9a54d6267fb69657bf994f77a1193c37dff01066 | ORPH powerpc64 | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/f604b2e3cdc0b8d8fcdfc847a3b2c8904fff649c | ORPH powerpc | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/87d5ebbe2db2358da05751c087e31b8528d8b0e7 | ORPH m68k | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/3c0cb8ff764fb97c9d0498a4d58857351b659676 | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/c0143efe721bbbabb2f612a0db82b63064d6a7ae | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/117760f1157cad340e3021dfdbd770d5e6d0face | ORPH arm | pixman-0.42.2 | NOK | http://autobuild.buildroot.net/results/ef78c43674aea0fc7d8194fbed6bf35c50105844 | sh4a | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/359f12c8cdd3666e8658db0aa2fe1e3ae516db25 | sparc | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/ec2736b0ff7fd5f1237420472b8aa10b83d012c2 | mips64el | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/cf85b5e16809b32e0953c4f97f8fb1eeedcecddd | sparc | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/472fd0a7e739a547cd3e5795eeadf666ee41d5c8 | sh4a | postgresql-15.1 | NOK | http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a | powerpc | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/6745e1ccf8707ce7893a6f9db6d42649b6b9f0e6 | x86_64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/a3911b9240c2e4465187dc1588071807d2e552b9 | s390x | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/9b5bfbe43caffc3160f62600f15e13a0cd4deaf5 | powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/57f80cdec8b5efb8bccbf7fc75465a9bb1b61a2f | powerpc64 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/fb179701f35ce0b92ac1fca8eb377d48bb8dd889 | armeb | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/accbb9c3c6adb2cabfec82af148a0b4d0ee2ebea | nios2 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/362db3810c48e46551271acd23363dd80f6f8b6c | nios2 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/4528413f52358f6c466f24cddbac5b56e677b042 | aarch64 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/64c53ee81df6567063d38bfd92b259b49cb1ea7e | s390x | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/0b24235b4df2fc7bdb4e4da7c43f3eabba591b61 | sparc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/634697dba427bbf8b1c009f4f118d88b56c6477a | x86_64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/dd5bf18fb3bbe24293d2a0230fa1c8c7780fa739 | mips | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/a3e9984f816dc459dd180cd8aabd6ea090b3a748 | mips | python-orjson-3.8.4 | NOK | http://autobuild.buildroot.net/results/7291d123479411e632b8380f0045a18814dc23ae | arc | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/fb97a98cb6779c4976a9203f8c4d87e002cda3d9 | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/e404152462c16d5471cc9be35fa7a941a490f66b | or1k | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/a17749f0b78eda4f4fdb4442e52567e45609878c | i686 | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/a62d899eb0ae6f104ee3b4af7ba9ff774fa6aada | sparc64 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/35b8790bb9ddd180b191da49d7ad20eb84f89495 | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/17734790285de49b67f0712ab6e0e41b0738669b | m68k | unknown | NOK | http://autobuild.buildroot.net/results/ddda24c6899c2d9fbbbb1578c6ab49c5d8091b48 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/493914a77ad443181c49b223157ca4f12e7af49b | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/423bc0739904c9a2ce63744cc3a31bd9f8205555 | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/ad99454be8f4b5327a3b727692e85d7c657bb84c | xtensa | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/93640e438729259cb8033ccfb656a60ba234d878 | ORPH sparc64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/4ea5c7051c65487f2fc8935430aca19167a37e01 | ORPH or1k | vdr-2.6.3 | NOK | http://autobuild.buildroot.net/results/135c05445b314ff24bddf197ee1dd99b74b8f5ce | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/5a8d253b09f68028ba47f8d19de27f1d131b1734 | riscv32 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/d04a3109ab0fcbdeef789a6bae6211d7a2374320 | mips | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/4e70be2d2c161094cf33f161d784a212b7c21bea | armeb | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/7fc95c043573c92d76dad539183dbb7168591d08 | i686 | xdriver_xf86-video-geode-2.... | NOK | http://autobuild.buildroot.net/results/d1dae8c7ba9dc82fbbcc5914ea3b378e48304617 | mipsel | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/602eb6874b9c8c67a0cbe0ce07b16b652e69a1e3 | ORPH x86_64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/27266075215b44e41c12aa9b925028b08a089bfd | mips64el | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/6be47f1f9957170e834625f13e2d01dc4b0d1c7e | ORPH arm | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/0fc774f5538e682278f161c59ddfa9cfaedd9212 | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/82ae36bf03c1cb8fd192100e77c28c65e50dd954 | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/fb957653db5bd2a83ac4c13f3a1640ddaee3bc23 | ORPH mipsel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/37b528c1cab64063c93c5e5229fc2a62bdc4c3b2 | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/a11e3250a57115a25ca6b41777572b7a27b17247 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/26cd3a80fb8208af25b22c8e2f7decec700f0a37 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/12585ac99ee541b648d93fb5e1821c7cd07f8003 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/5762fcfc8cba26b97836f792392f1d1b46634d47 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/2f3a453718ff970c05379280c25a38eadbde3ba0 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/c3ec9830f40989ca627c6affd1a444410f4173a0 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/9e591e0c8fafc896ec9e5e186b6422eed6ce5aab | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/78992aa9ae6b1691c374873701d7c77445262d98 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/0af3e80d8be9db4c4e97b6cd9d90bd73b9c6d2ae | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/b1e0f0617bf1cf1e2e8e3732131eb17b06fbf449 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/9d306ab41666c88945982091404c1d7bfe1df9de | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/cb341041361d0901cb564594618f1e1cc734dc58 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/46daa2e92eaceda60d9916dd35d240d7692c4d96 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/52fd3cb7e5d11f476a9ccd192bf186d18147d74d | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/8cf2280a058136d1096eb140381a4afdd3369500 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/c03dce385b6b120851e59147d3189860a463174d | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/86a0815bb605d9ba3ec2d4cd8bb3c4b3a533da9a | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/75977d059e01d17012a84d96bdcce74c4fc8d9e3 | ORPH nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/a0786eeca53356adf3223fcfb5967ca0a93d99aa | arm | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/e1c07778116c5a1cb764f9a900b3d5ca312c88d7 | i686 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/efcdb62725ee6494d7925d07f3eb2e31693042a9 | riscv64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/56573730fa06e95a9bbce0c6501bdf27edbcb872 | armeb | zip-3.0 | NOK | http://autobuild.buildroot.net/results/a10b59d2c896e361d74611e07fb5f03efd93a09e | Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 1 poppler-22.10.0 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/49f02a7e56d269e20a6b637683ce3c88975be111 | xtensa | poppler-22.10.0 | NOK | http://autobuild.buildroot.net/results/ed27829893ba138098f70d409869e78a1cdaf186 | Classification of failures by reason for 2022.11.x -------------------------------------------------- python-numpy-1.23.4 | 3 xxhash-0.8.1 | 2 efivar-38 | 1 fdk-aac-2.0.2 | 1 frr-8.3.1 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 hawktracer-2ec19d7192334414... | 1 host-binutils-2.37 | 1 janus-gateway-1.0.3 | 1 libvorbis-1.3.7 | 1 lpc32xxcdl-2.11 | 1 lttng-modules-2.13.1 | 1 mender-3.4.0 | 1 qemu-7.1.0 | 1 rauc-1.8 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | efivar-38 | NOK | http://autobuild.buildroot.net/results/fc15df0450babf29414d7e0ffc99eff448a891fd | mipsel | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/b60c706ec3e45c61121ea5c43b96de9e7a203dff | arc | frr-8.3.1 | NOK | http://autobuild.buildroot.net/results/a282c5d458f1646d1180c159f79a11475ddf8a2e | arceb | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/e485cf1b4452d1b7d2d9ec799d2c3cc4db2176dd | powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/247e3c486c7b833545ba06623adb6fa2d2b2af49 | ORPH mips64el | hawktracer-2ec19d7192334414... | NOK | http://autobuild.buildroot.net/results/4f29df86fb21c6812960b44250e0a752c2848492 | mipsel | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/0863cdf354e9ba55a47b18c5560eb8327fcf965e | aarch64_be | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/bcfb4e5b59a53be237ac3a5060f47179d3040532 | powerpc | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/b21f42543575c82cb42a47f99530e04a626f4a9a | armeb | lpc32xxcdl-2.11 | NOK | http://autobuild.buildroot.net/results/c5b25a89447a078da003987c271346074412da12 | ORPH or1k | lttng-modules-2.13.1 | NOK | http://autobuild.buildroot.net/results/4c19083735070eb3c16f160ed1cb599a81c46a79 | s390x | mender-3.4.0 | NOK | http://autobuild.buildroot.net/results/6cb111afdbf1f711ba16af5403556b19a0c772f4 | aarch64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/4836b72161e14b73165ad8c1ba08d9c09ca621fb | aarch64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/a50f3eb6463e0ebc141f6f2c4e1f00cd7e5a1d3b | mipsel | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/ac0bd4f2c1c795c86a5757d5af08cda3fcf8fe07 | riscv32 | qemu-7.1.0 | NOK | http://autobuild.buildroot.net/results/d61681a1760ccef534d4a7c41e96cef3d89e9fad | powerpc | rauc-1.8 | NOK | http://autobuild.buildroot.net/results/da171c2a14700f21980f72a231986af966db20fc | armeb | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/f12e1cf38ab29f46be593cee365e55fef9d9227d | ORPH mipsel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/dbf3919a595e18415e658f34e3af56932b5129b3 | ORPH -- http://autobuild.buildroot.net From thomas at devoogdt.com Thu Feb 2 07:15:17 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 2 Feb 2023 08:15:17 +0100 Subject: [Buildroot] [PATCH] package/fluent-bit: add support for non glibc toolchain Message-ID: <20230202071518.3961314-1-thomas@devoogdt.com> From: Thomas Devoogdt - require threads and dynamic library support - require sync_4 support - provide fts.h trough musl-fts 'static_assert()' is not available if no C++ toolchain or no glibc is used, so add two patches to fix this Signed-off-by: Thomas Devoogdt --- .../0002-lib-c-ares-fixup-static_assert.patch | 56 +++++++++++++++++++ .../0003-lib-cfl-fixup-static_assert.patch | 33 +++++++++++ package/fluent-bit/Config.in | 10 +++- package/fluent-bit/fluent-bit.mk | 11 +++- 4 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch create mode 100644 package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch No idea if there is an interest in uClibc or musl-enabled toolchains regarding buildroot? I was able to compile fluent-bit for most of the supported platforms with a limited amount of changes. I had to create two patches in two libs. One (cfl) was already upstreamed, and added the link to it. The other (c-ares) should be fixed by the m4 bump. I guess that fluent-bit will bump those sub-libs over time, so we can drop these patches. arm-aarch64 [ 1/44]: OK bootlin-aarch64-glibc [ 2/44]: OK bootlin-arcle-hs38-uclibc [ 3/44]: OK bootlin-armv5-uclibc [ 4/44]: OK bootlin-armv7-glibc [ 5/44]: OK bootlin-armv7m-uclibc [ 6/44]: SKIPPED bootlin-armv7-musl [ 7/44]: OK bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED bootlin-m68k-68040-uclibc [ 9/44]: OK bootlin-microblazeel-uclibc [10/44]: OK bootlin-mipsel32r6-glibc [11/44]: OK bootlin-mipsel-uclibc [12/44]: OK bootlin-nios2-glibc [13/44]: OK bootlin-openrisc-uclibc [14/44]: OK bootlin-powerpc64le-power8-glibc [15/44]: OK bootlin-powerpc-e500mc-uclibc [16/44]: OK bootlin-riscv32-glibc [17/44]: OK bootlin-riscv64-glibc [18/44]: OK bootlin-riscv64-musl [19/44]: OK bootlin-sh4-uclibc [20/44]: OK bootlin-sparc64-glibc [21/44]: OK bootlin-sparc-uclibc [22/44]: SKIPPED bootlin-x86-64-glibc [23/44]: OK bootlin-x86-64-musl [24/44]: OK bootlin-x86-64-uclibc [25/44]: OK bootlin-xtensa-uclibc [26/44]: OK br-arm-basic [27/44]: OK br-arm-full-nothread [28/44]: SKIPPED br-arm-full-static [29/44]: SKIPPED br-i386-pentium4-full [30/44]: OK br-i386-pentium-mmx-musl [31/44]: OK br-mips64-n64-full [32/44]: OK br-mips64r6-el-hf-glibc [33/44]: OK br-powerpc-603e-basic-cpp [34/44]: OK br-powerpc64-power7-glibc [35/44]: OK linaro-aarch64-be [36/44]: OK linaro-aarch64 [37/44]: OK linaro-arm [38/44]: OK sourcery-arm-armv4t [39/44]: OK sourcery-arm [40/44]: OK sourcery-arm-thumb2 [41/44]: OK sourcery-mips64 [42/44]: OK sourcery-mips [43/44]: OK sourcery-nios2 [44/44]: OK 44 builds, 5 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed diff --git a/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch new file mode 100644 index 0000000000..de5d0d06a8 --- /dev/null +++ b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch @@ -0,0 +1,56 @@ +From aca354ae22c55fa6051d04a9f674fe0825443a94 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:26:56 +0100 +Subject: [PATCH] lib: c-ares: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/c-ares/c-ares/issues/504 + +Signed-off-by: Thomas Devoogdt +--- + lib/c-ares-1.18.1/configure | 4 ++++ + lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/lib/c-ares-1.18.1/configure b/lib/c-ares-1.18.1/configure +index 737f0a0dd..b99b7ed49 100755 +--- a/lib/c-ares-1.18.1/configure ++++ b/lib/c-ares-1.18.1/configure +@@ -6316,6 +6316,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +@@ -6393,6 +6395,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +diff --git a/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 b/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 +index 229de3091..fe4a11c67 100644 +--- a/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 ++++ b/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 +@@ -37,6 +37,9 @@ + #serial 9 + + m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ ++ ++#define static_assert _Static_assert ++ + template + struct check + { +-- +2.39.0 + diff --git a/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch b/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch new file mode 100644 index 0000000000..7b99a8e4de --- /dev/null +++ b/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch @@ -0,0 +1,33 @@ +From 8d17fc961fef2e88f4c8fa2316af925d5466ca4d Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:38:15 +0100 +Subject: [PATCH] lib: cfl: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 + +Signed-off-by: Thomas Devoogdt +--- + lib/cfl/lib/xxhash/xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/cfl/lib/xxhash/xxhash.h b/lib/cfl/lib/xxhash/xxhash.h +index 08ab79457..511c4d12b 100644 +--- a/lib/cfl/lib/xxhash/xxhash.h ++++ b/lib/cfl/lib/xxhash/xxhash.h +@@ -1546,8 +1546,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else +-- +2.39.0 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 6c2299e695..f53eacb447 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_FLUENT_BIT bool "fluent-bit" - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_STATIC_LIBS # dlfcn.h + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBYAML help @@ -29,5 +32,6 @@ config BR2_PACKAGE_FLUENT_BIT_WASM endif -comment "fluent-bit needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC +comment "fluent-bit needs a toolchain w/ threads, dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 6e9a33e02e..151afc34aa 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -47,12 +47,19 @@ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +FLUENT_BIT_DEPENDENCIES += musl-fts +FLUENT_BIT_LINKER_FLAGS += -lfts +endif + # Uses __atomic_compare_exchange_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS=-latomic +FLUENT_BIT_LINKER_FLAGS += -latomic endif +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LINKER_FLAGS)" + define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ $(TARGET_DIR)/etc/init.d/S99fluent-bit -- 2.39.0 From thomas at devoogdt.com Thu Feb 2 07:15:18 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 2 Feb 2023 08:15:18 +0100 Subject: [Buildroot] [PATCH] package/fluent-bit: add support for non glibc toolchain In-Reply-To: <20230202071518.3961314-1-thomas@devoogdt.com> References: <20230202071518.3961314-1-thomas@devoogdt.com> Message-ID: <20230202071518.3961314-2-thomas@devoogdt.com> From: Thomas Devoogdt - require threads and dynamic library support - require sync_4 support - provide fts.h trough musl-fts static_assert is not available if no C++ toolchain or no glibc is used, so add two patches to fix this Signed-off-by: Thomas Devoogdt --- .../0002-lib-c-ares-fixup-static_assert.patch | 56 +++++++++++++++++++ .../0003-lib-cfl-fixup-static_assert.patch | 33 +++++++++++ package/fluent-bit/Config.in | 10 +++- package/fluent-bit/fluent-bit.mk | 11 +++- 4 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch create mode 100644 package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch No idea if there is interrese arm-aarch64 [ 1/44]: OK bootlin-aarch64-glibc [ 2/44]: OK bootlin-arcle-hs38-uclibc [ 3/44]: OK bootlin-armv5-uclibc [ 4/44]: OK bootlin-armv7-glibc [ 5/44]: OK bootlin-armv7m-uclibc [ 6/44]: SKIPPED bootlin-armv7-musl [ 7/44]: OK bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED bootlin-m68k-68040-uclibc [ 9/44]: OK bootlin-microblazeel-uclibc [10/44]: OK bootlin-mipsel32r6-glibc [11/44]: OK bootlin-mipsel-uclibc [12/44]: OK bootlin-nios2-glibc [13/44]: OK bootlin-openrisc-uclibc [14/44]: OK bootlin-powerpc64le-power8-glibc [15/44]: OK bootlin-powerpc-e500mc-uclibc [16/44]: OK bootlin-riscv32-glibc [17/44]: OK bootlin-riscv64-glibc [18/44]: OK bootlin-riscv64-musl [19/44]: OK bootlin-sh4-uclibc [20/44]: OK bootlin-sparc64-glibc [21/44]: OK bootlin-sparc-uclibc [22/44]: SKIPPED bootlin-x86-64-glibc [23/44]: OK bootlin-x86-64-musl [24/44]: OK bootlin-x86-64-uclibc [25/44]: OK bootlin-xtensa-uclibc [26/44]: OK br-arm-basic [27/44]: OK br-arm-full-nothread [28/44]: SKIPPED br-arm-full-static [29/44]: SKIPPED br-i386-pentium4-full [30/44]: OK br-i386-pentium-mmx-musl [31/44]: OK br-mips64-n64-full [32/44]: OK br-mips64r6-el-hf-glibc [33/44]: OK br-powerpc-603e-basic-cpp [34/44]: OK br-powerpc64-power7-glibc [35/44]: OK linaro-aarch64-be [36/44]: OK linaro-aarch64 [37/44]: OK linaro-arm [38/44]: OK sourcery-arm-armv4t [39/44]: OK sourcery-arm [40/44]: OK sourcery-arm-thumb2 [41/44]: OK sourcery-mips64 [42/44]: OK sourcery-mips [43/44]: OK sourcery-nios2 [44/44]: OK 44 builds, 5 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed diff --git a/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch new file mode 100644 index 0000000000..de5d0d06a8 --- /dev/null +++ b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch @@ -0,0 +1,56 @@ +From aca354ae22c55fa6051d04a9f674fe0825443a94 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:26:56 +0100 +Subject: [PATCH] lib: c-ares: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/c-ares/c-ares/issues/504 + +Signed-off-by: Thomas Devoogdt +--- + lib/c-ares-1.18.1/configure | 4 ++++ + lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/lib/c-ares-1.18.1/configure b/lib/c-ares-1.18.1/configure +index 737f0a0dd..b99b7ed49 100755 +--- a/lib/c-ares-1.18.1/configure ++++ b/lib/c-ares-1.18.1/configure +@@ -6316,6 +6316,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +@@ -6393,6 +6395,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +diff --git a/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 b/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 +index 229de3091..fe4a11c67 100644 +--- a/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 ++++ b/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 +@@ -37,6 +37,9 @@ + #serial 9 + + m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ ++ ++#define static_assert _Static_assert ++ + template + struct check + { +-- +2.39.0 + diff --git a/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch b/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch new file mode 100644 index 0000000000..7b99a8e4de --- /dev/null +++ b/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch @@ -0,0 +1,33 @@ +From 8d17fc961fef2e88f4c8fa2316af925d5466ca4d Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:38:15 +0100 +Subject: [PATCH] lib: cfl: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 + +Signed-off-by: Thomas Devoogdt +--- + lib/cfl/lib/xxhash/xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/cfl/lib/xxhash/xxhash.h b/lib/cfl/lib/xxhash/xxhash.h +index 08ab79457..511c4d12b 100644 +--- a/lib/cfl/lib/xxhash/xxhash.h ++++ b/lib/cfl/lib/xxhash/xxhash.h +@@ -1546,8 +1546,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else +-- +2.39.0 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 6c2299e695..f53eacb447 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_FLUENT_BIT bool "fluent-bit" - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_STATIC_LIBS # dlfcn.h + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBYAML help @@ -29,5 +32,6 @@ config BR2_PACKAGE_FLUENT_BIT_WASM endif -comment "fluent-bit needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC +comment "fluent-bit needs a toolchain w/ threads, dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 6e9a33e02e..151afc34aa 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -47,12 +47,19 @@ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +FLUENT_BIT_DEPENDENCIES += musl-fts +FLUENT_BIT_LINKER_FLAGS += -lfts +endif + # Uses __atomic_compare_exchange_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS=-latomic +FLUENT_BIT_LINKER_FLAGS += -latomic endif +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LINKER_FLAGS)" + define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ $(TARGET_DIR)/etc/init.d/S99fluent-bit -- 2.39.0 From luca.ceresoli at bootlin.com Thu Feb 2 08:21:20 2023 From: luca.ceresoli at bootlin.com (Luca Ceresoli) Date: Thu, 2 Feb 2023 09:21:20 +0100 Subject: [Buildroot] [PATCH 1/1] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. In-Reply-To: References: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> <20230201225237.0fb5dacb@booty> Message-ID: <20230202092120.319d6b00@booty> Hi Graeme, On Wed, 1 Feb 2023 14:16:47 -0800 Graeme Smecher wrote: > Hi Luca, > > On 2023-02-01 13:52, Luca Ceresoli wrote: > > Hi Graeme, > > > > On Wed, 1 Feb 2023 11:59:56 -0800 > > Graeme Smecher wrote: > > > >> If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > >> buildroot into the linux tree, these .dts files are copied to > >> arch/arm64/boot. Unfortunately, the post-image.sh script expects to find > >> them in arch/arm64/boot/xilinx. > >> > >> This patch does not require the xilinx/ prefix to be present when > >> symlinking the device-tree to system.dtb where u-boot expects to find > >> it. > >> > >> Signed-off-by: Graeme Smecher > >> --- > >> board/zynqmp/post-image.sh | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh > >> index ed6dbe188c..c5de2db820 100755 > >> --- a/board/zynqmp/post-image.sh > >> +++ b/board/zynqmp/post-image.sh > >> @@ -5,7 +5,7 @@ > >> # devicetree listed in the config. > >> > >> FIRST_DT=$(sed -nr \ > >> - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > >> + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ > > > > I think the following simpler change would also work. Can you check > > that please? > > > > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > > + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\2|p' \ > > Assuming you intended \1, not \2 here - this suggestion breaks behaviour for a couple of defconfigs in the tree. If I run the ZCU106 defconfig through this regexp, I get: > > $ cat configs/zynqmp_zcu106_defconfig | sed -nr -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\1|p' > xilinx/zynqmp-zcu106-revA > > ...this creates a dangling symlink in output/images (system.dtb -> xilinx/zynqmp-zcu106-revA.dtb). Right. > The right behaviour is to strip any prefixes that exist, without requiring any. Something like: > > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(.*/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ > > This is less Xilinx-specific, although it seems a tad greedy. Yes, better keeping the xilinx prefix as this is a xilinx-specific script anyway. Reviewed-by: Luca Ceresoli -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From christian at paral.in Thu Feb 2 08:49:50 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 00:49:50 -0800 Subject: [Buildroot] Go 1.20 changes required in Buildroot In-Reply-To: References: Message-ID: Hi all, Go 1.20 includes a change which breaks our build infra for go in Buildroot: https://go.dev/doc/go1.20#bootstrap The minimum required version of go-bootstrap is now go 1.17.13 or later. Otherwise the build fails with this error: building_Go_requires_Go_1_17_13_or_later As Go 1.4 was the previous version that could be compiled with C, there is now no way to bootstrap go with a C compiler. ... unless a process like this is used: - build host-go-bootstrap-1.4-20170531 - build host-go-bootstrap-1.19.5 with go1.4-bootstrap - build host-go-1.20 with host-go-bootstrap-1.19.5 ... which could be viable for Buildroot, at least for now. Previous discussion on this: https://lore.kernel.org/all/20220525234312.643dfc03 at windsurf/T/ An existing patch is still Pending Review which fixes a separate but related issue: we cannot build go-bootstrap-1.4 on arm64. The proposed fix above would still not work correctly on arm64. That patch linked above fixes this issue by using a Go compiler installed on the host machine (/usr/bin/go) to bootstrap host-go in that case. I'll send a patch soon which upgrades to go1.20 using the above 3-stage bootstrap process. It's not pretty, but it will work for now. A potentially cleaner solution would be to bootstrap with gccgo, or depend on the host Go binaries to bootstrap (as linked above), or to download pre-compiled binaries to bootstrap. Best regards, Christian Stewart ---------- Forwarded message --------- From: 'Michael Knyszek' via golang-nuts Date: Wed, Feb 1, 2023 at 11:36 AM Subject: [go-nuts] Go 1.20 is released To: Cc: golang-dev , golang-nuts Hello gophers, We have just released Go 1.20. To find out what has changed in Go 1.20, read the release notes: https://go.dev/doc/go1.20 You can download binary and source distributions from our download page: https://go.dev/dl/#go1.20 If you have Go installed already, an easy way to try go1.20 is by using the go command: $ go install golang.org/dl/go1.20 at latest $ go1.20 download To compile from source using a Git clone, update to the release with git checkout go1.20 and build as usual. Thanks to everyone who contributed to the release! Cheers, Michael, Matthew, and Dmitri for the Go team From christian at paral.in Thu Feb 2 10:55:43 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 02:55:43 -0800 Subject: [Buildroot] [PATCH v1 2/3] package/go: bump to version 1.20 In-Reply-To: <20230202105544.315452-1-christian@paral.in> References: <20230202105544.315452-1-christian@paral.in> Message-ID: <20230202105544.315452-2-christian@paral.in> The latest Go release, version 1.20, arrives six months after Go 1.19. Most of its changes are in the implementation of the toolchain, runtime, and libraries. https://go.dev/doc/go1.20 Signed-off-by: Christian Stewart --- ...03-runtime-support-riscv64-SV57-mode.patch | 65 ------------------- package/go/Config.in.host | 2 +- package/go/go.hash | 2 +- package/go/go.mk | 4 +- 4 files changed, 4 insertions(+), 69 deletions(-) delete mode 100644 package/go/0003-runtime-support-riscv64-SV57-mode.patch diff --git a/package/go/0003-runtime-support-riscv64-SV57-mode.patch b/package/go/0003-runtime-support-riscv64-SV57-mode.patch deleted file mode 100644 index f51c2ca093..0000000000 --- a/package/go/0003-runtime-support-riscv64-SV57-mode.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6618c7af436488fa12018cdcd31eeedb3a698745 Mon Sep 17 00:00:00 2001 -From: Dmitry Vyukov -Date: Fri, 27 May 2022 18:55:35 +0200 -Subject: [PATCH] runtime: support riscv64 SV57 mode - -Riscv64 has SV57 mode when user-space VA is 56 bits. -Linux kernel recently got support for this mode and Go binaries started crashing as: - -runtime: lfstack.push invalid packing: node=0xffffff5908a940 cnt=0x1 -packed=0xffff5908a9400001 -> node=0xffff5908a940 - -Adjust lfstack code to use only 8 top bits of pointers on riscv64. - -For context see: -https://groups.google.com/g/syzkaller-bugs/c/lU0GQTZoNQQ/m/O_c3vmE3AAAJ - -Update #54104 - -Change-Id: Ib5d3d6a79c0c6eddf11618d73fcc8bc1832a9c25 -Signed-off-by: Christian Stewart ---- - -Upstream: https://go-review.googlesource.com/c/go/+/409055/4 ---- - src/runtime/lfstack_64bit.go | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/runtime/lfstack_64bit.go b/src/runtime/lfstack_64bit.go -index 154130cf63..39fa647b9e 100644 ---- a/src/runtime/lfstack_64bit.go -+++ b/src/runtime/lfstack_64bit.go -@@ -36,12 +36,21 @@ const ( - // We use one bit to distinguish between the two ranges. - aixAddrBits = 57 - aixCntBits = 64 - aixAddrBits + 3 -+ -+ // Riscv64 SV57 mode gives 56 bits of userspace VA. -+ // lfstack code supports it, but broader support for SV57 mode is incomplete, -+ // and there may be other issues (see #54104). -+ riscv64AddrBits = 56 -+ riscv64CntBits = 64 - riscv64AddrBits + 3 - ) - - func lfstackPack(node *lfnode, cnt uintptr) uint64 { - if GOARCH == "ppc64" && GOOS == "aix" { - return uint64(uintptr(unsafe.Pointer(node)))<<(64-aixAddrBits) | uint64(cnt&(1<> aixCntBits << 3) | 0xa<<56))) - } -+ if GOARCH == "riscv64" { -+ return (*lfnode)(unsafe.Pointer(uintptr(val >> riscv64CntBits << 3))) -+ } - return (*lfnode)(unsafe.Pointer(uintptr(val >> cntBits << 3))) - } --- -2.35.1 - diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 43cb62309d..b87b862cec 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,9 +2,9 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS # See https://go.dev/doc/install/source#environment # See src/go/build/syslist.go for the list of supported architectures - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ || BR2_mips64 || BR2_mips64el || BR2_riscv || BR2_s390x diff --git a/package/go/go.hash b/package/go/go.hash index 4c22f0f274..204e508fc3 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 3a29ff0421beaf6329292b8a46311c9fbf06c800077ceddef5fb7f8d5b1ace33 go1.20.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index b0dd002712..18d3a80212 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.5 +GO_VERSION = 1.20 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -151,7 +151,7 @@ define HOST_GO_INSTALL_CMDS cp -a $(@D)/lib $(HOST_GO_ROOT)/ mkdir -p $(HOST_GO_ROOT)/pkg - cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ + cp -a $(@D)/pkg/include $(HOST_GO_ROOT)/pkg/ cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ # https://golang.org/issue/2775 -- 2.39.1 From christian at paral.in Thu Feb 2 10:55:42 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 02:55:42 -0800 Subject: [Buildroot] [PATCH v1 1/3] package/go-bootstrap: split into two stages: go1.4 and go1.19.5 Message-ID: <20230202105544.315452-1-christian@paral.in> Go 1.20 will require a minimum version of go 1.17.13 to bootstrap. https://go.dev/doc/go1.20#bootstrap As Go 1.4 was the previous version that could be compiled with C, there is now no way to bootstrap go with a C compiler, unless we use a two-stage bootstrap: - build host-go-bootstrap-1.4-20170531 - build host-go-bootstrap-1.19.5 with host-go-bootstrap-1.4-20170531 - build host-go-1.20 with host-go-bootstrap-1.19.5 This is implemented in this commit first, before upgrading host-go to 1.20. Note: the .patch files from package/go version 1.19.x are not necessary for package/go-bootstrap-stage2 and have not been included there. Discussion of possible alternate approaches for future use: https://lore.kernel.org/all/CA+h8R2rtcynkCBsz=_9yANOEguyPCOcQDj8_ns+cv8RS8+8t9A at mail.gmail.com/ https://lore.kernel.org/all/20220525234312.643dfc03 at windsurf/T/ Signed-off-by: Christian Stewart --- DEVELOPERS | 2 + package/Config.in.host | 3 +- package/go-bootstrap-stage1/Config.in.host | 6 ++ .../go-bootstrap-stage1.hash} | 0 .../go-bootstrap-stage1.mk | 46 +++++++++++++++ package/go-bootstrap-stage2/Config.in.host | 4 ++ .../go-bootstrap-stage2.hash | 3 + .../go-bootstrap-stage2.mk | 56 +++++++++++++++++++ package/go-bootstrap/Config.in.host | 7 --- package/go-bootstrap/go-bootstrap.mk | 50 ----------------- package/go/Config.in.host | 6 +- package/go/go.mk | 9 ++- 12 files changed, 127 insertions(+), 65 deletions(-) create mode 100644 package/go-bootstrap-stage1/Config.in.host rename package/{go-bootstrap/go-bootstrap.hash => go-bootstrap-stage1/go-bootstrap-stage1.hash} (100%) create mode 100644 package/go-bootstrap-stage1/go-bootstrap-stage1.mk create mode 100644 package/go-bootstrap-stage2/Config.in.host create mode 100644 package/go-bootstrap-stage2/go-bootstrap-stage2.hash create mode 100644 package/go-bootstrap-stage2/go-bootstrap-stage2.mk delete mode 100644 package/go-bootstrap/Config.in.host delete mode 100644 package/go-bootstrap/go-bootstrap.mk diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577..16119b008a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -549,6 +549,8 @@ F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ +F: package/go-bootstrap-stage1/ +F: package/go-bootstrap-stage2/ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ diff --git a/package/Config.in.host b/package/Config.in.host index b76bea60d0..6374547b39 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -39,7 +39,8 @@ menu "Host utilities" source "package/genpart/Config.in.host" source "package/gnupg/Config.in.host" source "package/go/Config.in.host" - source "package/go-bootstrap/Config.in.host" + source "package/go-bootstrap-stage1/Config.in.host" + source "package/go-bootstrap-stage2/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imagemagick/Config.in.host" diff --git a/package/go-bootstrap-stage1/Config.in.host b/package/go-bootstrap-stage1/Config.in.host new file mode 100644 index 0000000000..56a743caf9 --- /dev/null +++ b/package/go-bootstrap-stage1/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS + bool + # See src/cmd/dist/unix.c for the list of supported architectures + default y if BR2_HOSTARCH = "x86" + default y if BR2_HOSTARCH = "x86_64" + default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.hash b/package/go-bootstrap-stage1/go-bootstrap-stage1.hash similarity index 100% rename from package/go-bootstrap/go-bootstrap.hash rename to package/go-bootstrap-stage1/go-bootstrap-stage1.hash diff --git a/package/go-bootstrap-stage1/go-bootstrap-stage1.mk b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk new file mode 100644 index 0000000000..77e7046cd7 --- /dev/null +++ b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# go-bootstrap-stage1 +# +################################################################################ + +# Use last C-based Go compiler: v1.4.x +# See https://golang.org/doc/install/source#bootstrapFromSource +GO_BOOTSTRAP_STAGE1_VERSION = 1.4-bootstrap-20171003 +GO_BOOTSTRAP_STAGE1_SITE = https://dl.google.com/go +GO_BOOTSTRAP_STAGE1_SOURCE = go$(GO_BOOTSTRAP_STAGE1_VERSION).tar.gz + +GO_BOOTSTRAP_STAGE1_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE1_LICENSE_FILES = LICENSE + +# The toolchain is needed for HOSTCC_NOCACHE used to compile the Go compiler. +HOST_GO_BOOTSTRAP_STAGE1_DEPENDENCIES = toolchain + +HOST_GO_BOOTSTRAP_STAGE1_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE1_VERSION) + +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV = \ + GOOS=linux \ + GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_STAGE1_ROOT)" \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + CC=$(HOSTCC_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE1_BUILD_CMDS + cd $(@D)/src && $(HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV) ./make.bash +endef + +define HOST_GO_BOOTSTRAP_STAGE1_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + + # https://golang.org/issue/2775 + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap-stage2/Config.in.host b/package/go-bootstrap-stage2/Config.in.host new file mode 100644 index 0000000000..967ddaed1d --- /dev/null +++ b/package/go-bootstrap-stage2/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash new file mode 100644 index 0000000000..4c22f0f274 --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash @@ -0,0 +1,3 @@ +# From https://go.dev/dl +sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk new file mode 100644 index 0000000000..da2e1f4f46 --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -0,0 +1,56 @@ +################################################################################ +# +# go-bootstrap-stage2 +# +################################################################################ + +GO_BOOTSTRAP_STAGE2_VERSION = 1.19.5 +GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang +GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz + +GO_BOOTSTRAP_STAGE2_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE2_LICENSE_FILES = LICENSE + +# Use go-bootstrap-stage1 to bootstrap. +HOST_GO_BOOTSTRAP_STAGE2_DEPENDENCIES = host-go-bootstrap-stage1 +HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_BOOTSTRAP_ROOT) + +HOST_GO_BOOTSTRAP_STAGE2_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE2_VERSION) + +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV = \ + GO111MODULE=off \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE1_ROOT) \ + GOROOT_FINAL=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + GOOS=linux \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE2_BUILD_CMDS + cd $(@D)/src && \ + $(HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) +endef + +define HOST_GO_BOOTSTRAP_STAGE2_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ + + mkdir -p $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg + cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + cp -a $(@D)/pkg/tool $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + + # https://golang.org/issue/2775 + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ + + # Set all file timestamps to prevent the go compiler from rebuilding any + # built in packages when programs are built. + find $(HOST_GO_BOOTSTRAP_STAGE2_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap/Config.in.host b/package/go-bootstrap/Config.in.host deleted file mode 100644 index fab80d24b4..0000000000 --- a/package/go-bootstrap/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS - bool - # See src/cmd/dist/unix.c for the list of support - # architectures - default y if BR2_HOSTARCH = "x86" - default y if BR2_HOSTARCH = "x86_64" - default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.mk b/package/go-bootstrap/go-bootstrap.mk deleted file mode 100644 index 71696a1540..0000000000 --- a/package/go-bootstrap/go-bootstrap.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# go-bootstrap -# -################################################################################ - -# Use last C-based Go compiler: v1.4.x -# See https://golang.org/doc/install/source#bootstrapFromSource -GO_BOOTSTRAP_VERSION = 1.4-bootstrap-20171003 -GO_BOOTSTRAP_SITE = https://dl.google.com/go -GO_BOOTSTRAP_SOURCE = go$(GO_BOOTSTRAP_VERSION).tar.gz - -GO_BOOTSTRAP_LICENSE = BSD-3-Clause -GO_BOOTSTRAP_LICENSE_FILES = LICENSE - -# To build programs that need cgo support the toolchain needs to be -# available, so the toolchain is not needed to build host-go-bootstrap -# itself, but needed by other packages that depend on -# host-go-bootstrap. -HOST_GO_BOOTSTRAP_DEPENDENCIES = toolchain - -HOST_GO_BOOTSTRAP_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_VERSION) - -# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE -# here. See https://github.com/golang/go/issues/11685. -HOST_GO_BOOTSTRAP_MAKE_ENV = \ - GOOS=linux \ - GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_ROOT)" \ - GOROOT="$(@D)" \ - GOBIN="$(@D)/bin" \ - CC=$(HOSTCC_NOCCACHE) \ - CGO_ENABLED=0 - -define HOST_GO_BOOTSTRAP_BUILD_CMDS - cd $(@D)/src && $(HOST_GO_BOOTSTRAP_MAKE_ENV) ./make.bash -endef - -define HOST_GO_BOOTSTRAP_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_ROOT)/bin/go - $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_ROOT)/bin/gofmt - - cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_ROOT)/ - cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_ROOT)/ - - # There is a known issue which requires the go sources to be installed - # https://golang.org/issue/2775 - cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_ROOT)/ -endef - -$(eval $(host-generic-package)) diff --git a/package/go/Config.in.host b/package/go/Config.in.host index ded02d3b3a..43cb62309d 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,7 +2,9 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + # See https://go.dev/doc/install/source#environment + # See src/go/build/syslist.go for the list of supported architectures + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ || BR2_mips64 || BR2_mips64el || BR2_riscv || BR2_s390x @@ -28,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go/go.mk b/package/go/go.mk index c38ae0b99c..b0dd002712 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -12,7 +12,7 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap +HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -121,12 +121,12 @@ HOST_GO_HOST_ENV = \ CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \ CGO_LDFLAGS="$(HOST_LDFLAGS)" -# The go build system is not compatible with ccache, so use -# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_ROOT) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -154,7 +154,6 @@ define HOST_GO_INSTALL_CMDS cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ - # There is a known issue which requires the go sources to be installed # https://golang.org/issue/2775 cp -a $(@D)/src $(HOST_GO_ROOT)/ -- 2.39.1 From christian at paral.in Thu Feb 2 10:55:44 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 02:55:44 -0800 Subject: [Buildroot] [PATCH v1 3/3] package/go: use host compiler when go-bootstrap unsupported In-Reply-To: <20230202105544.315452-1-christian@paral.in> References: <20230202105544.315452-1-christian@paral.in> Message-ID: <20230202105544.315452-3-christian@paral.in> All Go compiler versions > 1.4.x (old) are written in Go, and require a existing compiled Go version to use to build from source. https://golang.org/doc/install/source#bootstrapFromSource The process for "bootstrapping" the Go compiler in Buildroot is: 1. Compile a C/C++ cross-compiler (gcc) as the host toolchain. 2. Build go-bootstrap-stage1 (which is Go 1.4.x and written in C) 3. Build go-bootstrap-stage2 (which is Go 1.19.x and written in Go) 3. Build go 1.20 (written in Go) using go-bootstrap-stage2. go-bootstrap-stage1 does not work on 64-bit arm. The Go 1.4.x bootstrap compiler is compatible with x86, x86_64, and arm (32 bit) only. This patch adds a fallback to require a host Go compiler to build host-go when BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS is not set. Signed-off-by: Christian Stewart --- v1 -> v2: - thanks Thomas for the review & suggestions - added NEEDS_HOST_GO boolean - added dependency checks to support/dependencies/dependencies.sh - removed unnecessary changes to go-bootstrap package v2 -> v3: - add dependency on toolchain if Cgo is enabled v3 -> v4: - updates for go1.20 - updates for go-bootstrap-stage{1,2} Signed-off-by: Christian Stewart --- Config.in | 4 ++++ package/go-bootstrap-stage2/go-bootstrap-stage2.mk | 2 +- package/go/Config.in.host | 2 +- package/go/go.mk | 14 ++++++++++++-- support/dependencies/dependencies.sh | 4 ++++ 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Config.in b/Config.in index 86699f58c6..c53757f671 100644 --- a/Config.in +++ b/Config.in @@ -58,6 +58,10 @@ config BR2_HOST_GCC_AT_LEAST_9 # When adding new entries above, be sure to update # the HOSTCC_MAX_VERSION variable in the Makefile. +# Hidden boolean selected if bootstrapping Go w/ GCC is not supported. +config BR2_NEEDS_HOST_GO + bool + # Hidden boolean selected by packages in need of Java in order to build # (example: kodi) config BR2_NEEDS_HOST_JAVA diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk index da2e1f4f46..421342ee02 100644 --- a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -13,7 +13,7 @@ GO_BOOTSTRAP_STAGE2_LICENSE_FILES = LICENSE # Use go-bootstrap-stage1 to bootstrap. HOST_GO_BOOTSTRAP_STAGE2_DEPENDENCIES = host-go-bootstrap-stage1 -HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_BOOTSTRAP_ROOT) +HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_BOOTSTRAP_ROOT) HOST_GO_BOOTSTRAP_STAGE2_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE2_VERSION) diff --git a/package/go/Config.in.host b/package/go/Config.in.host index b87b862cec..7f049ff1ae 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -30,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + select BR2_NEEDS_HOST_GO if !BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go/go.mk b/package/go/go.mk index 18d3a80212..9dcc9321f9 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -12,7 +12,6 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -109,6 +108,11 @@ else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS HOST_GO_CGO_ENABLED = 1 endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +ifeq ($(HOST_GO_CGO_ENABLED),1) +# For cgo support the toolchain needs to be available. +HOST_GO_DEPENDENCIES += toolchain +endif + # For the convenience of host golang packages HOST_GO_HOST_ENV = \ $(HOST_GO_COMMON_ENV) \ @@ -126,7 +130,6 @@ HOST_GO_HOST_ENV = \ HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -136,6 +139,13 @@ HOST_GO_MAKE_ENV = \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ $(HOST_GO_CROSS_ENV) +# Use the Go compiler bootstrapped by Buildroot if available. +# Otherwise, use the host Go compiler. +ifeq ($(BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS),y) +HOST_GO_DEPENDENCIES += host-go-bootstrap-stage2 +HOST_GO_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) +endif + define HOST_GO_BUILD_CMDS cd $(@D)/src && \ $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 4b5012b807..89a8f6adc0 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -207,6 +207,10 @@ if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then fi fi +if grep -q ^BR2_NEEDS_HOST_GO=y $BR2_CONFIG ; then + check_prog_host "go" +fi + if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then check_prog_host "java" JAVA_GCJ=$(java -version 2>&1 | grep gcj) -- 2.39.1 From luca.ceresoli at bootlin.com Thu Feb 2 11:29:43 2023 From: luca.ceresoli at bootlin.com (Luca Ceresoli) Date: Thu, 2 Feb 2023 12:29:43 +0100 Subject: [Buildroot] [PATCH 5/7] configs/olimex_a20_olinuxino_micro_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 In-Reply-To: <20230201223241.3867678-6-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> <20230201223241.3867678-6-giulio.benetti@benettiengineering.com> Message-ID: <20230202122943.3c2851d7@booty> Hi Giulio, On Wed, 1 Feb 2023 23:32:39 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Thanks, this was a good opportunity to remove the dust from my Mini and power it on once again! For this patch: Tested-by: Luca Ceresoli For the whole series: Reviewed-by: Luca Ceresoli -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From christian at paral.in Thu Feb 2 13:08:37 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:08:37 -0800 Subject: [Buildroot] [PATCH v1 1/3] package/go-bootstrap: split into two stages: go1.4 and go1.19.5 In-Reply-To: <20230202105544.315452-1-christian@paral.in> References: <20230202105544.315452-1-christian@paral.in> Message-ID: Hi all, On Thu, Feb 2, 2023 at 2:55 AM Christian Stewart wrote: > +# Use go-bootstrap-stage1 to bootstrap. > +HOST_GO_BOOTSTRAP_STAGE2_DEPENDENCIES = host-go-bootstrap-stage1 > +HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_BOOTSTRAP_ROOT) This HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV += line should be dropped (it's overwritten below in the file). Thanks, Christian Stewart From christian at paral.in Thu Feb 2 13:13:52 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:13:52 -0800 Subject: [Buildroot] [PATCH v1 1/3] package/docker-engine: bump version to v23.0.0 Message-ID: <20230202131354.1193243-1-christian@paral.in> This update requires a workaround for the non-standard vendor/ structure in the docker-engine repository, which has an invalid vendor/modules.txt file. Removing the vendor/modules.txt file fixes the build error. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 The go download post-process script uses go mod init to create the go.mod file which specifies a language version of go1.16 on default. Use go mod edit to adjust the go.mod file to the required minimum version go1.19 for generic types. https://github.com/moby/moby/releases/tag/v23.0.0 Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d15b1359cb..670cbd414b 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 2a9b72ca78..9c193a29a5 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.22 +DOCKER_ENGINE_VERSION = 23.0.0 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -62,6 +62,19 @@ else DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs endif +# update the go module version to go1.19 +# docker-engine does not use go modules +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_ENGINE_CONFIGURE_CMDS + if [ -f $(@D)/vendor/modules.txt ]; then \ + rm $(@D)/vendor/modules.txt; \ + fi + cd $(@D); \ + $(HOST_GO_HOST_ENV) $(DOCKER_ENGINE_GO_ENV) \ + $(GO_BIN) mod edit -go=1.19 go.mod +endef + DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD -- 2.39.1 From christian at paral.in Thu Feb 2 13:13:53 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:13:53 -0800 Subject: [Buildroot] [PATCH v1 2/3] package/docker-proxy: drop package In-Reply-To: <20230202131354.1193243-1-christian@paral.in> References: <20230202131354.1193243-1-christian@paral.in> Message-ID: <20230202131354.1193243-2-christian@paral.in> The docker-proxy binary (libnetwork) has been merged into the docker-engine source (moby). Drop the docker-proxy package and add cmd/docker-proxy as a build target of docker-engine instead. https://github.com/moby/libnetwork/commit/563fe8e248f3afac75a270f693f38bdc3eea7bf3 Signed-off-by: Christian Stewart --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/docker-engine/Config.in | 1 - package/docker-engine/docker-engine.mk | 2 +- package/docker-proxy/Config.in | 19 ------------------- package/docker-proxy/docker-proxy.hash | 3 --- package/docker-proxy/docker-proxy.mk | 21 --------------------- 8 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 package/docker-proxy/Config.in delete mode 100644 package/docker-proxy/docker-proxy.hash delete mode 100644 package/docker-proxy/docker-proxy.mk diff --git a/Config.in.legacy b/Config.in.legacy index 41c5fdefb3..75099f4404 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy removed" + select BR2_LEGACY + select BR2_PACKAGE_DOCKER_ENGINE + help + docker-proxy has been dropped by upstream since version + 563fe8. it has been merged into docker-engine (moby). + config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 bool "imx-gpu-viv X11 output has been removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577..7d4f9aa6fe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -545,7 +545,6 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-compose/ F: package/docker-engine/ -F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ diff --git a/package/Config.in b/package/Config.in index 83fddf316f..dc460ca852 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2615,7 +2615,6 @@ menu "System tools" source "package/docker-cli/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" - source "package/docker-proxy/Config.in" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 1f0efb8fcc..b5a356eab9 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_USE_MMU # containerd select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency - select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency help Docker is a platform to build, ship, diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 9c193a29a5..2ea2f0a45d 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -24,7 +24,7 @@ DOCKER_ENGINE_LDFLAGS = \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs -DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_ENGINE_DEPENDENCIES += libapparmor diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in deleted file mode 100644 index 7e40536537..0000000000 --- a/package/docker-proxy/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_DOCKER_PROXY - bool "docker-proxy" - 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 - help - Libnetwork is a Container Network Model that provides a - consistent programming interface and the required network - abstractions for applications. - - This package provides docker-proxy, a run-time dependency of - Docker. - - https://github.com/docker/libnetwork - -comment "docker-proxy needs a 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_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash deleted file mode 100644 index 63296f14c1..0000000000 --- a/package/docker-proxy/docker-proxy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 05bf95637bae134d12d02bd7a7854cd0c768e6fccb662c2c64523f05b997b204 docker-proxy-f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk deleted file mode 100644 index fe7982e8f6..0000000000 --- a/package/docker-proxy/docker-proxy.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# docker-proxy -# -################################################################################ - -DOCKER_PROXY_VERSION = f6ccccb1c082a432c2a5814aaedaca56af33d9ea -DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) - -DOCKER_PROXY_LICENSE = Apache-2.0 -DOCKER_PROXY_LICENSE_FILES = LICENSE - -DOCKER_PROXY_DEPENDENCIES = host-pkgconf - -DOCKER_PROXY_BUILD_TARGETS = cmd/proxy - -define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy -endef - -$(eval $(golang-package)) -- 2.39.1 From christian at paral.in Thu Feb 2 13:13:54 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:13:54 -0800 Subject: [Buildroot] [PATCH v1 3/3] package/docker-cli: bump version to v23.0.0 In-Reply-To: <20230202131354.1193243-1-christian@paral.in> References: <20230202131354.1193243-1-christian@paral.in> Message-ID: <20230202131354.1193243-3-christian@paral.in> This update requires a workaround for the non-standard vendor/ structure in the docker-engine repository, which has an invalid vendor/modules.txt file. Removing the vendor/modules.txt file fixes the build error. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 The go download post-process script uses go mod init to create the go.mod file which specifies a language version of go1.16 on default. Use go mod edit to adjust the go.mod file to the required minimum version go1.19 for generic types. https://github.com/moby/moby/releases/tag/v23.0.0 Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.hash | 3 ++- package/docker-cli/docker-cli.mk | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index c6db95f9b3..253efd4001 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz +# Locally calculated +sha256 3379d06cd6177832b91f4796c680b6bf15c7895773448716b4c3c5253f611d1b docker-cli-23.0.0.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index cb44c68c1b..3b155b5675 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.22 +DOCKER_CLI_VERSION = 23.0.0 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 @@ -29,6 +29,19 @@ DOCKER_CLI_TAGS += osusergo netgo DOCKER_CLI_GO_ENV = CGO_ENABLED=no endif +# update the go module version to go1.19 +# docker-cli does not use go modules +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_CONFIGURE_CMDS + if [ -f $(@D)/vendor/modules.txt ]; then \ + rm $(@D)/vendor/modules.txt; \ + fi + cd $(@D); \ + $(HOST_GO_HOST_ENV) $(DOCKER_CLI_GO_ENV) \ + $(GO_BIN) mod edit -go=1.19 go.mod +endef + DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) $(eval $(golang-package)) -- 2.39.1 From christian at paral.in Thu Feb 2 13:26:50 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:26:50 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/balena-engine: bump to version 20.10.26 Message-ID: <20230202132650.1537778-1-christian@paral.in> This update requires a workaround for the non-standard vendor/ structure in the balena-engine repository, which has an invalid vendor/modules.txt file. Removing the vendor/modules.txt file fixes the build error. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 The go download post-process script uses go mod init to create the go.mod file which specifies a language version of go1.16 on default. Use go mod edit to adjust the go.mod file to the required minimum version go1.19 for generic types used by docker-engine. (Fixes a build error). Remove the vendor/archive sub-tree (fixes a build error) because Go no longer allows having duplicate packages in GOPATH and GOROOT. vendor/archive/tar cannot be in vendor/ because it exists in the standard library. Remove it from vendor/. https://github.com/balena-os/balena-engine/releases/tag/v20.10.26 Signed-off-by: Christian Stewart --- package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 4adb8ce561..6a92a40cc8 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz +sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index ecfb62bfbf..3b8b2f9ac6 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 20.10.21 +BALENA_ENGINE_VERSION = 20.10.26 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 @@ -34,6 +34,18 @@ BALENA_ENGINE_TAGS = \ BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine +# remove the conflicting vendor/modules.txt +# remove the conflicting vendor/archive (not allowed in go1.20) +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define BALENA_ENGINE_CONFIGURE_CMDS + if [ -f $(@D)/vendor/modules.txt ]; then \ + rm $(@D)/vendor/modules.txt; \ + fi + if [ -d $(@D)/vendor/archive ]; then \ + rm -rf $(@D)/vendor/archive; \ + fi +endef + ifeq ($(BR2_INIT_SYSTEMD),y) BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald -- 2.39.1 From christian at paral.in Thu Feb 2 13:31:51 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:31:51 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/cni-plugins: bump version to 1.2.0 Message-ID: <20230202133151.1671576-1-christian@paral.in> Adds new device driver main/dummy and various bug fixes/cleanups. https://github.com/containernetworking/plugins/releases/tag/v1.2.0 Signed-off-by: Christian Stewart --- package/cni-plugins/cni-plugins.hash | 2 +- package/cni-plugins/cni-plugins.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/cni-plugins/cni-plugins.hash b/package/cni-plugins/cni-plugins.hash index fc3b5a7ead..0c3e07c91c 100644 --- a/package/cni-plugins/cni-plugins.hash +++ b/package/cni-plugins/cni-plugins.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c86c44877c47f69cd23611e22029ab26b613f620195b76b3ec20f589367a7962 cni-plugins-1.1.1.tar.gz +sha256 f3496ddda9c7770a0b695b67ae7ee80a4ee331ac2745af4830054b81627f79b7 cni-plugins-1.2.0.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/cni-plugins/cni-plugins.mk b/package/cni-plugins/cni-plugins.mk index b30937095a..be02c2ff45 100644 --- a/package/cni-plugins/cni-plugins.mk +++ b/package/cni-plugins/cni-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_VERSION = 1.1.1 +CNI_PLUGINS_VERSION = 1.2.0 CNI_PLUGINS_SITE = $(call github,containernetworking,plugins,v$(CNI_PLUGINS_VERSION)) CNI_PLUGINS_LICENSE = Apache-2.0 CNI_PLUGINS_LICENSE_FILES = LICENSE @@ -12,6 +12,7 @@ CNI_PLUGINS_LICENSE_FILES = LICENSE CNI_PLUGINS_BUILD_TARGETS = \ plugins/ipam/dhcp \ plugins/main/bridge \ + plugins/main/dummy \ plugins/main/host-device \ plugins/main/ipvlan \ plugins/main/loopback \ -- 2.39.1 From christian at paral.in Thu Feb 2 13:34:53 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:34:53 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/containerd: bump to version 1.6.16 Message-ID: <20230202133453.1747150-1-christian@paral.in> Bugfixes and improvements. https://github.com/containerd/containerd/releases/tag/v1.6.16 Signed-off-by: Christian Stewart --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 04a29949d7..16474089d1 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 b86e5c42f58b8348422c972513ff49783c0d505ed84e498d0d0245c5992e4320 containerd-1.6.12.tar.gz +sha256 e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a containerd-1.6.16.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 192175800c..c27e538a30 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.12 +CONTAINERD_VERSION = 1.6.16 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE -- 2.39.1 From neal.frager at amd.com Thu Feb 2 13:38:17 2023 From: neal.frager at amd.com (Neal Frager) Date: Thu, 2 Feb 2023 13:38:17 +0000 Subject: [Buildroot] [PATCH v1 1/1] board/versal/post-image.sh: do not require xilinx/ prefix for .dts files Message-ID: <20230202133817.56293-1-neal.frager@amd.com> If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from buildroot into the linux tree, these .dts files are copied to arch/arm64/boot. Unfortunately, the post-image.sh script expects to find them in arch/arm64/boot/xilinx. This patch does not require the xilinx/ prefix to be present when symlinking the device-tree to system.dtb where u-boot expects to find it. It is effectively applying the below patch for zynqmp to versal as well: https://patchwork.ozlabs.org/project/buildroot/patch/20230201195956.1758827-1-gsmecher at threespeedlogic.com/ Signed-off-by: Neal Frager --- board/versal/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh index f45f29a155..92e65ed3b7 100755 --- a/board/versal/post-image.sh +++ b/board/versal/post-image.sh @@ -5,7 +5,7 @@ # devicetree listed in the config. FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ ${BR2_CONFIG}) [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb -- 2.17.1 From neal.frager at amd.com Thu Feb 2 13:40:17 2023 From: neal.frager at amd.com (Frager, Neal) Date: Thu, 2 Feb 2023 13:40:17 +0000 Subject: [Buildroot] [PATCH 1/1] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. In-Reply-To: <20230202092120.319d6b00@booty> References: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> <20230201225237.0fb5dacb@booty> <20230202092120.319d6b00@booty> Message-ID: Hi Graeme, > Hi Luca, > > On 2023-02-01 13:52, Luca Ceresoli wrote: > > Hi Graeme, > > > > On Wed, 1 Feb 2023 11:59:56 -0800 > > Graeme Smecher wrote: > > > >> If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > >> buildroot into the linux tree, these .dts files are copied to > >> arch/arm64/boot. Unfortunately, the post-image.sh script expects to > >> find them in arch/arm64/boot/xilinx. > >> > >> This patch does not require the xilinx/ prefix to be present when > >> symlinking the device-tree to system.dtb where u-boot expects to > >> find it. > >> > >> Signed-off-by: Graeme Smecher > >> --- > >> board/zynqmp/post-image.sh | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/board/zynqmp/post-image.sh > >> b/board/zynqmp/post-image.sh index ed6dbe188c..c5de2db820 100755 > >> --- a/board/zynqmp/post-image.sh > >> +++ b/board/zynqmp/post-image.sh > >> @@ -5,7 +5,7 @@ > >> # devicetree listed in the config. > >> > >> FIRST_DT=$(sed -nr \ > >> - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > >> + -e > >> + 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\. > >> + ]*).*"$|\2|p' \ > > > > I think the following simpler change would also work. Can you check > > that please? > > > > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > > + -e > > + 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\2| > > + p' \ > > Assuming you intended \1, not \2 here - this suggestion breaks behaviour for a couple of defconfigs in the tree. If I run the ZCU106 defconfig through this regexp, I get: > > $ cat configs/zynqmp_zcu106_defconfig | sed -nr -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="([-_/[:alnum:]\\.]*).*"$|\1|p' > xilinx/zynqmp-zcu106-revA > > ...this creates a dangling symlink in output/images (system.dtb -> xilinx/zynqmp-zcu106-revA.dtb). > Right. > The right behaviour is to strip any prefixes that exist, without requiring any. Something like: > > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > + -e > + 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(.*/)?([-_/[:alnum:]\\.]*).*"$ > + |\2|p' \ > > This is less Xilinx-specific, although it seems a tad greedy. > Yes, better keeping the xilinx prefix as this is a xilinx-specific script anyway. > Reviewed-by: Luca Ceresoli Thank you for your patch. Reviewed-by: Neal Frager Best regards, Neal Frager AMD From christian at paral.in Thu Feb 2 13:41:49 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:41:49 -0800 Subject: [Buildroot] [PATCH 1/1] package/docker-compose: security bump version to 2.15.1 Message-ID: <20230202134149.1864294-1-christian@paral.in> Fix CVE-2022-27664 and CVE-2022-32149 high-risk vulnerability. Many other bugfixes, enhancements, and improvements. https://github.com/docker/compose/releases/tag/v2.15.1 Signed-off-by: Christian Stewart --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 7a7ab5f110..2c924d5080 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5cbf6cd1dd8ce98c5e2d62ca7f622e96abce444979b8e8852b033213a98e2049 docker-compose-2.14.0.tar.gz +sha256 346571ca487bf3f4b3dc9caeadc88a645354b0e098fa60f350249ec35ab3f240 docker-compose-2.15.1.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index ef9ee97196..3bced8bb7b 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.14.0 +DOCKER_COMPOSE_VERSION = 2.15.1 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE -- 2.39.1 From christian at paral.in Thu Feb 2 13:46:23 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:46:23 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/moby-buildkit: bump to version 0.11.2 Message-ID: <20230202134623.1912767-1-christian@paral.in> https://github.com/moby/buildkit/releases/tag/v0.11.2 Signed-off-by: Christian Stewart --- 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 43ee1b12c9..ef927636d9 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5ffe5a2d11736719649dae962461f66df394ae4cc1e58294e5f2bd4d4632d9d0 moby-buildkit-0.10.6.tar.gz +sha256 b1746575f37715a8a2f2df5bab77ea081ba8436854e241792702109fc9e3653d moby-buildkit-0.11.2.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 59d68a7dca..a25f676710 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.10.6 +MOBY_BUILDKIT_VERSION = 0.11.2 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE -- 2.39.1 From christian at paral.in Thu Feb 2 13:51:01 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 05:51:01 -0800 Subject: [Buildroot] [PATCH 1/1] package/nerdctl: bump version to 1.2.0 Message-ID: <20230202135101.1949947-1-christian@paral.in> https://github.com/containerd/nerdctl/releases/tag/v1.2.0 Signed-off-by: Christian Stewart --- package/nerdctl/nerdctl.hash | 2 +- package/nerdctl/nerdctl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash index e253fb74b2..8f2c678198 100644 --- a/package/nerdctl/nerdctl.hash +++ b/package/nerdctl/nerdctl.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 ae468c65480e9c6679e0dd23d466b723e7f19bff779d4e2e0fa4629be343af2a nerdctl-1.0.0.tar.gz +sha256 08a84b9481b37dbd8cc6f955dbec0c18a1934bcffeb135fd5d2dc23987152b7c nerdctl-1.2.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk index fdf60cb189..7556bcc391 100644 --- a/package/nerdctl/nerdctl.mk +++ b/package/nerdctl/nerdctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NERDCTL_VERSION = 1.0.0 +NERDCTL_VERSION = 1.2.0 NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) NERDCTL_LICENSE = Apache-2.0 -- 2.39.1 From arnout at mind.be Thu Feb 2 15:27:43 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 2 Feb 2023 16:27:43 +0100 Subject: [Buildroot] [PATCH] package/python-pytest: remove runtime dependency on python-toml Message-ID: <20230202152743.3916949-1-arnout@mind.be> Since version 7.2 [1], with Python 3.11+ pytest no longer uses tomli to parse pyproject.toml but instead uses tomllib which is part of Python itself [2]. Note that toml was replaced with tomli in version 7.0, so the dependency was anyway incorrect. Note that tomllib is unconditionally installed as part of Python 3.11, there is no PYTHON3_LIBTOML option or anything like that that needs to be selected. [1] https://docs.pytest.org/en/latest/changelog.html#pytest-7-2-0-2022-10-23 [2] https://github.com/pytest-dev/pytest/pull/9741 Signed-off-by: Arnout Vandecappelle --- I can't be bother with sending a patch changing toml to tomli for 2022.11 - it's going EOL in two months anyway, and apparently nobody noticed... --- package/python-pytest/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in index c3956c76d2..9bbc9ea2d2 100644 --- a/package/python-pytest/Config.in +++ b/package/python-pytest/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_PYTEST select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_PLUGGY # runtime select BR2_PACKAGE_PYTHON_PY # runtime - select BR2_PACKAGE_PYTHON_TOML # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help pytest is a framework that makes building simple and scalable -- 2.39.1 From giulio.benetti at benettiengineering.com Thu Feb 2 15:42:39 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 2 Feb 2023 16:42:39 +0100 Subject: [Buildroot] [PATCH 2/2] package/postgresql: work around gcc bug 43744 In-Reply-To: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> References: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> Message-ID: <20230202154239.325711-2-giulio.benetti@benettiengineering.com> Package postgresql suffers from gcc bug 43744 other than 85180, so let's work around disabling compiler optimization for this gcc bug too. Fixes: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a Signed-off-by: Giulio Benetti --- package/postgresql/postgresql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 5313e03b12..2ffcac6595 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -101,7 +101,7 @@ endif POSTGRESQL_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_43744)$(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),) POSTGRESQL_CFLAGS += -O0 endif -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 2 15:42:38 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 2 Feb 2023 16:42:38 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain/Config.in: extend gcc bug 43744 to every sh architecture Message-ID: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 544b423001..01215e0e96 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -115,7 +115,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_43744 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 - depends on BR2_sh4 + depends on BR2_sh # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63261. This bug no # longer exists in gcc 8.x. -- 2.34.1 From bernd.kuhls at t-online.de Thu Feb 2 19:25:26 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 2 Feb 2023 20:25:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.19.0 Message-ID: <20230202192526.30357-1-bernd.kuhls@t-online.de> Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls --- 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 3c50faf23f..781e089de8 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f97fe20248e0eb452f77e9b69f2fb1510b852152b3af4f9a8b20680c854888d1 xmrig-6.18.1.tar.gz +sha256 772f947058e5b89ca9bf34128487def47796870b547439a9b0524ddd1899420c xmrig-6.19.0.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index ca5bcecfbe..f345ba9cf9 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.18.1 +XMRIG_VERSION = 6.19.0 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE -- 2.39.1 From ju.o at free.fr Thu Feb 2 20:20:01 2023 From: ju.o at free.fr (Julien Olivain) Date: Thu, 2 Feb 2023 21:20:01 +0100 Subject: [Buildroot] [PATCH v6 1/2] package/rdma-core: new package Message-ID: <20230202202002.3272959-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 Tested-by: Shamraiz Ashraf Signed-off-by: Julien Olivain --- Changes v5 -> v6: - Update rdma-core from v43.0 to v44.0 - Removed the patch in v5, now included upstream - Update kernel in test from 5.15.80 to 5.15.91 Changes v4 -> v5: - Update rdma-core from v42.0 to v43.0 Also add a patch to fix an issue introduced in v43.0 - Update kernel in test from 5.15.68 to 5.15.80 - v5 patch series now includes the perftest package Changes v3 -> v4: - Update kernel in test from 5.15.61 to 5.15.68 - Included Thomas' review comments: - Moved linux-rdma.fragment to test directory - Updated test script to reflect new file location - Fixed typo in readme.txt - Add a comment in Config.in describing when the "rdma" command is needed. Changes v2 -> v3: - Update package version from 41.0 to 42.0 - Update kernel in test from 5.15.48 to 5.15.61 Changes v1 -> v2: - Update package version from 39.0 to 41.0 - Add test_rdma_core.py entry to DEVELOPERS file - Update kernel in test from 5.15.30 to 5.15.48 - Moved Config.in rdma comment in main pkg description --- Tested on branch master at commit aff4317 with commands: make check-package ... 0 warnings generated python3 -m flake8 support/testing/tests/package/test_rdma_core.py [no-output] support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_rdma_core.TestRdmaCore ... OK ./utils/test-pkg -a -p rdma-core arm-aarch64 [ 1/44]: OK bootlin-aarch64-glibc [ 2/44]: OK bootlin-arcle-hs38-uclibc [ 3/44]: OK bootlin-armv5-uclibc [ 4/44]: OK bootlin-armv7-glibc [ 5/44]: OK bootlin-armv7m-uclibc [ 6/44]: SKIPPED bootlin-armv7-musl [ 7/44]: OK bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED bootlin-m68k-68040-uclibc [ 9/44]: OK bootlin-microblazeel-uclibc [10/44]: OK bootlin-mipsel32r6-glibc [11/44]: OK bootlin-mipsel-uclibc [12/44]: OK bootlin-nios2-glibc [13/44]: OK bootlin-openrisc-uclibc [14/44]: OK bootlin-powerpc64le-power8-glibc [15/44]: OK bootlin-powerpc-e500mc-uclibc [16/44]: OK bootlin-riscv32-glibc [17/44]: OK bootlin-riscv64-glibc [18/44]: OK bootlin-riscv64-musl [19/44]: OK bootlin-sh4-uclibc [20/44]: OK bootlin-sparc64-glibc [21/44]: OK bootlin-sparc-uclibc [22/44]: SKIPPED bootlin-x86-64-glibc [23/44]: OK bootlin-x86-64-musl [24/44]: OK bootlin-x86-64-uclibc [25/44]: OK bootlin-xtensa-uclibc [26/44]: OK br-arm-basic [27/44]: OK br-arm-full-nothread [28/44]: SKIPPED br-arm-full-static [29/44]: SKIPPED br-i386-pentium4-full [30/44]: OK br-i386-pentium-mmx-musl [31/44]: OK br-mips64-n64-full [32/44]: OK br-mips64r6-el-hf-glibc [33/44]: OK br-powerpc-603e-basic-cpp [34/44]: OK br-powerpc64-power7-glibc [35/44]: OK linaro-aarch64-be [36/44]: OK linaro-aarch64 [37/44]: OK linaro-arm [38/44]: OK sourcery-arm-armv4t [39/44]: OK sourcery-arm [40/44]: OK sourcery-arm-thumb2 [41/44]: OK sourcery-mips64 [42/44]: OK sourcery-mips [43/44]: OK sourcery-nios2 [44/44]: OK 44 builds, 5 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- DEVELOPERS | 3 + package/Config.in | 1 + package/rdma-core/Config.in | 22 ++++++ package/rdma-core/rdma-core.hash | 5 ++ package/rdma-core/rdma-core.mk | 24 ++++++ package/rdma-core/readme.txt | 75 +++++++++++++++++++ .../testing/tests/package/test_rdma_core.py | 43 +++++++++++ .../test_rdma_core/linux-rdma.fragment | 9 +++ 8 files changed, 182 insertions(+) create mode 100644 package/rdma-core/Config.in 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 create mode 100644 support/testing/tests/package/test_rdma_core/linux-rdma.fragment diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577..5eb746f8b4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1696,6 +1696,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/tinycompress/ F: package/z3/ @@ -1711,6 +1712,8 @@ F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_rdma_core.py +F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py N: Julien Viard de Galbert diff --git a/package/Config.in b/package/Config.in index 83fddf316f..1f6db14d56 100644 --- a/package/Config.in +++ b/package/Config.in @@ -573,6 +573,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..437cf903ac --- /dev/null +++ b/package/rdma-core/Config.in @@ -0,0 +1,22 @@ +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. + + Note: The 'rdma' utility program is provided by the + 'iproute2' package, when compiled with the package 'libmnl' + also selected. This program is needed to configure + InfiniBand and RDMA networks from the command line. + + https://github.com/linux-rdma/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/rdma-core.hash b/package/rdma-core/rdma-core.hash new file mode 100644 index 0000000000..1aff44f7f4 --- /dev/null +++ b/package/rdma-core/rdma-core.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 4a2eec55b37ac25f25e7680a372f71c1781c23808542bd31fb68dc0448b8cba2 rdma-core-44.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..885821bf98 --- /dev/null +++ b/package/rdma-core/rdma-core.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# rdma-core +# +################################################################################ + +RDMA_CORE_VERSION = 44.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..9a95226ef4 --- /dev/null +++ b/package/rdma-core/readme.txt @@ -0,0 +1,75 @@ +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 configuration, 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). The Kernel +config fragment file used for package test can be used as a starting +point. See: + + support/testing/tests/package/test_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 -d 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..614fb51f48 --- /dev/null +++ b/support/testing/tests/package/test_rdma_core.py @@ -0,0 +1,43 @@ +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.91" + 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="{}" + 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 + """.format( + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") + ) + + 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") diff --git a/support/testing/tests/package/test_rdma_core/linux-rdma.fragment b/support/testing/tests/package/test_rdma_core/linux-rdma.fragment new file mode 100644 index 0000000000..e305f27e62 --- /dev/null +++ b/support/testing/tests/package/test_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 -- 2.39.1 From ju.o at free.fr Thu Feb 2 20:20:02 2023 From: ju.o at free.fr (Julien Olivain) Date: Thu, 2 Feb 2023 21:20:02 +0100 Subject: [Buildroot] [PATCH v6 2/2] package/perftest: new package In-Reply-To: <20230202202002.3272959-1-ju.o@free.fr> References: <20230202202002.3272959-1-ju.o@free.fr> Message-ID: <20230202202002.3272959-2-ju.o@free.fr> Open Fabrics Performance Tests. This is a collection of tests written over uverbs intended for use as a performance micro-benchmark. The tests may be used for HW or SW tuning as well as for functional testing. https://github.com/linux-rdma/perftest Tested-by: Shamraiz Ashraf Signed-off-by: Julien Olivain --- Changes v5 -> v6: - Update perftest from version 4.5-0.18 to 4.5-0.20 - Update kernel in test from 5.15.80 to 5.15.91 - Add perftest entries in DEVELOPERS file Changes v1 -> v5: - introduce perftest package in v5 patch series --- Tested on branch main at commit aff4317 with commands: make check-package ... 0 warnings generated python3 -m flake8 support/testing/tests/package/test_perftest.py [no-output] support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_perftest.TestPerftest ... OK ./utils/test-pkg -a -p perftest arm-aarch64 [ 1/44]: OK bootlin-aarch64-glibc [ 2/44]: OK bootlin-arcle-hs38-uclibc [ 3/44]: SKIPPED bootlin-armv5-uclibc [ 4/44]: SKIPPED bootlin-armv7-glibc [ 5/44]: OK bootlin-armv7m-uclibc [ 6/44]: SKIPPED bootlin-armv7-musl [ 7/44]: SKIPPED bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED bootlin-m68k-68040-uclibc [ 9/44]: SKIPPED bootlin-microblazeel-uclibc [10/44]: SKIPPED bootlin-mipsel32r6-glibc [11/44]: SKIPPED bootlin-mipsel-uclibc [12/44]: SKIPPED bootlin-nios2-glibc [13/44]: SKIPPED bootlin-openrisc-uclibc [14/44]: SKIPPED bootlin-powerpc64le-power8-glibc [15/44]: OK bootlin-powerpc-e500mc-uclibc [16/44]: OK bootlin-riscv32-glibc [17/44]: OK bootlin-riscv64-glibc [18/44]: OK bootlin-riscv64-musl [19/44]: SKIPPED bootlin-sh4-uclibc [20/44]: SKIPPED bootlin-sparc64-glibc [21/44]: OK bootlin-sparc-uclibc [22/44]: SKIPPED bootlin-x86-64-glibc [23/44]: OK bootlin-x86-64-musl [24/44]: SKIPPED bootlin-x86-64-uclibc [25/44]: OK bootlin-xtensa-uclibc [26/44]: SKIPPED br-arm-basic [27/44]: SKIPPED br-arm-full-nothread [28/44]: SKIPPED br-arm-full-static [29/44]: SKIPPED br-i386-pentium4-full [30/44]: OK br-i386-pentium-mmx-musl [31/44]: SKIPPED br-mips64-n64-full [32/44]: SKIPPED br-mips64r6-el-hf-glibc [33/44]: SKIPPED br-powerpc-603e-basic-cpp [34/44]: OK br-powerpc64-power7-glibc [35/44]: OK linaro-aarch64-be [36/44]: SKIPPED linaro-aarch64 [37/44]: OK linaro-arm [38/44]: OK sourcery-arm-armv4t [39/44]: SKIPPED sourcery-arm [40/44]: SKIPPED sourcery-arm-thumb2 [41/44]: OK sourcery-mips64 [42/44]: SKIPPED sourcery-mips [43/44]: SKIPPED sourcery-nios2 [44/44]: SKIPPED 44 builds, 28 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- DEVELOPERS | 2 + package/Config.in | 1 + package/perftest/Config.in | 41 ++++++++++++++++ package/perftest/perftest.hash | 3 ++ package/perftest/perftest.mk | 15 ++++++ .../testing/tests/package/test_perftest.py | 48 +++++++++++++++++++ 6 files changed, 110 insertions(+) create mode 100644 package/perftest/Config.in create mode 100644 package/perftest/perftest.hash create mode 100644 package/perftest/perftest.mk create mode 100644 support/testing/tests/package/test_perftest.py diff --git a/DEVELOPERS b/DEVELOPERS index 5eb746f8b4..7abfbe3c44 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1692,6 +1692,7 @@ F: package/gnupg2/ F: package/glslsandbox-player/ F: package/octave/ F: package/ola/ +F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ @@ -1709,6 +1710,7 @@ F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ +F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py diff --git a/package/Config.in b/package/Config.in index 1f6db14d56..f32209db95 100644 --- a/package/Config.in +++ b/package/Config.in @@ -133,6 +133,7 @@ menu "Debugging, profiling and benchmark" source "package/oprofile/Config.in" source "package/pax-utils/Config.in" source "package/pcm-tools/Config.in" + source "package/perftest/Config.in" source "package/piglit/Config.in" source "package/ply/Config.in" source "package/poke/Config.in" diff --git a/package/perftest/Config.in b/package/perftest/Config.in new file mode 100644 index 0000000000..9b2e46e64a --- /dev/null +++ b/package/perftest/Config.in @@ -0,0 +1,41 @@ +config BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS + bool + # Accurate cycle measurement in perftest is implemented for a + # limited set of architectures, see: + # https://github.com/linux-rdma/perftest/blob/v4.5-0.20/src/get_clock.h + # Note: the package has also a fallback to use "asm/timex.h" + # from the Kernel, in + # "$(LINUX_DIR)/arch/$(KERNEL_ARCH)/include". It is not + # reflected here as this path is not well tested. + default y if BR2_i386 || BR2_x86_64 + default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 && !BR2_ARM_CPU_ARMV6 + default y if BR2_aarch64 + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x + default y if BR2_sparc || BR2_sparc64 + default y if BR2_riscv + +config BR2_PACKAGE_PERFTEST + bool "perftest" + depends on BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS # rdma-core + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # rdma-core + depends on BR2_TOOLCHAIN_HAS_THREADS + # musl does not define sysconf(_SC_LEVEL1_DCACHE_LINESIZE) + depends on !BR2_TOOLCHAIN_USES_MUSL + depends on BR2_USE_MMU # rdma-core + select BR2_PACKAGE_PCIUTILS + select BR2_PACKAGE_RDMA_CORE # libibverbs, librdmacm, libibumad + help + Open Fabrics Performance Tests. + + This is a collection of tests written over uverbs intended + for use as a performance micro-benchmark. The tests may be + used for HW or SW tuning as well as for functional testing. + + https://github.com/linux-rdma/perftest + +comment "perftest 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/perftest/perftest.hash b/package/perftest/perftest.hash new file mode 100644 index 0000000000..4333231c44 --- /dev/null +++ b/package/perftest/perftest.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 32e667dac1c0dd41a3951c5a54b961a8e28db5d9478caea2dfc268a312968c99 perftest-4.5-0.20.tar.gz +sha256 763adb7d5094f2127b026adea8701f042d28d4b1f6fb8b6e828989227a9cf7f5 COPYING diff --git a/package/perftest/perftest.mk b/package/perftest/perftest.mk new file mode 100644 index 0000000000..7ad20d0974 --- /dev/null +++ b/package/perftest/perftest.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# perftest +# +################################################################################ + +PERFTEST_VERSION = 4.5-0.20 +PERFTEST_SITE = $(call github,linux-rdma,perftest,v$(PERFTEST_VERSION)) +PERFTEST_LICENSE = GPL-2.0 or BSD-2-Clause +PERFTEST_LICENSE_FILES = COPYING +PERFTEST_DEPENDENCIES = pciutils rdma-core +# Fetched from Github, with no configure script +PERFTEST_AUTORECONF = YES + +$(eval $(autotools-package)) diff --git a/support/testing/tests/package/test_perftest.py b/support/testing/tests/package/test_perftest.py new file mode 100644 index 0000000000..680b70d784 --- /dev/null +++ b/support/testing/tests/package/test_perftest.py @@ -0,0 +1,48 @@ +import os + +import infra.basetest + + +class TestPerftest(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.91" + 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="{}" + 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 + BR2_PACKAGE_PERFTEST=y + """.format( + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") + ) + + 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("ip link set dev eth0 up") + self.assertRunOk("rdma link add rxe0 type rxe netdev eth0") + + # start a server + self.assertRunOk("ib_read_bw > /dev/null 2>&1 &") + + # start a client + self.assertRunOk("sleep 1 && ib_read_bw 127.0.0.1") -- 2.39.1 From ps.report at gmx.net Thu Feb 2 20:41:16 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 2 Feb 2023 21:41:16 +0100 Subject: [Buildroot] Libarchive always throws an error when building In-Reply-To: References: <20230201184154.2c7e2680@gmx.net> <20230201190450.4636771a@gmx.net> Message-ID: <20230202214116.2478d971@gmx.net> Hello Roland, On Wed, 1 Feb 2023 19:27:35 +0000, Kenneth Roland wrote: > Hello Peter, > After applying the patch you mentioned, as well as installing libssl-dev, I now have this error. Host installed packages are ignored by the buildroot system, never do this... > > > ?```checking whether the /mnt/hdd/sct/output/host/bin/aarch64-buildroot-linux-gnu-gcc linker (/mnt/hdd/sct/output/host/bin/aarch64-buildroot-linux-gnu-ld) supports shared libraries... yes > checking whether -lc should be explicitly linked in... no > checking dynamic linker characteristics... GNU/Linux ld.so > checking how to hardcode library paths into programs... immediate > checking whether stripping libraries is possible... yes > checking if libtool supports shared libraries... yes > checking whether to build shared libraries... yes > checking whether to build static libraries... no > checking pkg-config is at least version 0.20... /mnt/hdd/sct/output/host/bin/pkgconf: error while loading shared libraries: libpkgconf.so.3: cannot open shared object file: No such file or directory > no > checking for LIBARCHIVE... no > configure: error: in `/mnt/hdd/sct/output/build/opkg-0.4.5': > configure: error: The pkg-config script could not be found or is too old. Make sure it > is in your PATH or set the PKG_CONFIG environment variable to the full > path to pkg-config. > > Alternatively, you may set the environment variables LIBARCHIVE_CFLAGS > and LIBARCHIVE_LIBS to avoid the need to call pkg-config. > See the pkg-config man page for more details. > > To get pkg-config, see . > See `config.log' for more details > make: *** [package/pkg-generic.mk:283: /mnt/hdd/sct/output/build/opkg-0.4.5/.stamp_configured] Error 1``` See the proper patch from Bernd Kuhls (including AUTORECONF and host-pkagconf dependency): http://lists.busybox.net/pipermail/buildroot/2023-February/660921.html https://patchwork.ozlabs.org/project/buildroot/patch/20230201181005.731564-1-bernd.kuhls at t-online.de/ Regards, Peter > > > From a quick search, libpkgconf.so.3 is found on RPM systems, which isn't the case here, but somehow it has something to do with pkg-config being too old. Do I need to update my path, and if so, is that the bash file found in my user's home folder? Or is there another patch I can apply? Thanks, > Kenneth From ps.report at gmx.net Thu Feb 2 20:46:55 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 2 Feb 2023 21:46:55 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libarchive: Only add "iconv" to the .pc file if needed In-Reply-To: <20230201181005.731564-1-bernd.kuhls@t-online.de> References: <20230201181005.731564-1-bernd.kuhls@t-online.de> Message-ID: <20230202214655.11ccfccf@gmx.net> On Wed, 1 Feb 2023 19:10:05 +0100, Bernd Kuhls wrote: > Fix the following build failure with fwup raised since bump to version > 3.6.2 in commit 380341b249175382691f268de4b41d3843ff0acc and > https://github.com/libarchive/libarchive/commit/a83f3d327aefe8d628230f326621b014d82f55b4 > > checking for pkg-config... /tmp/instance-19/output-1/host/bin/pkg-config > checking pkg-config is at least version 0.9.0... yes > checking for ARCHIVE... no > configure: error: Requires libarchive. Libarchive must be built with zlib support. > > Fixes: > http://autobuild.buildroot.net/results/f5d/f5d549fb4f08156ba5952ce75926f7fd2242bfdf/ And some opkg autobuild failures: http://autobuild.buildroot.net/results/3c0cb8ff764fb97c9d0498a4d58857351b659676/ http://autobuild.buildroot.net/results/87d5ebbe2db2358da05751c087e31b8528d8b0e7/ http://autobuild.buildroot.net/results/f604b2e3cdc0b8d8fcdfc847a3b2c8904fff649c/ http://autobuild.buildroot.net/results/9a54d6267fb69657bf994f77a1193c37dff01066/ http://autobuild.buildroot.net/results/5dc839d26b34824f78311c5e745d51209f7a1987/ http://autobuild.buildroot.net/results/7cc3bceddd4ba016164d31d2718138c43cb8b976/ http://autobuild.buildroot.net/results/b844d753f5d1969e941e2a865c7ff760fde37d9c/ http://autobuild.buildroot.net/results/29d5d20660318620befb78af3be06896d4a70e99/ Regards, Peter > > Signed-off-by: Bernd Kuhls > --- > v2: added dependency to host-pkgconf to fix autoconf error > > ...y-add-iconv-to-the-pc-file-if-needed.patch | 44 +++++++++++++++++++ > package/libarchive/libarchive.mk | 4 ++ > 2 files changed, 48 insertions(+) > create mode 100644 package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > > diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > new file mode 100644 > index 0000000000..c93944f789 > --- /dev/null > +++ b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > @@ -0,0 +1,44 @@ > +From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 > +From: Peter Pentchev > +Date: Thu, 29 Dec 2022 00:04:40 +0200 > +Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) > + > +Hi, > + > +Thanks for writing and maintaining libarchive! > + > +What do you think about this trivial change that does not add "iconv" to > +the pkg-config file's list of required packages unless it is actually > +needed? On at least Debian GNU/Linux systems, the iconv(3) function is > +part of the system C library and there is no Debian package that > +installs an iconv.pc file, so I had to make this change to the Debian > +package of libarchive. > + > +Thanks again, and keep up the great work! > + > +G'luck, > +Peter > + > +Downloaded from upstream commit: > +https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 > + > +Signed-off-by: Bernd Kuhls > +--- > + configure.ac | 4 +++- > + 1 file changed, 3 insertions(+), 1 deletion(-) > + > +diff --git a/configure.ac b/configure.ac > +index 99bff20d1..e2715cfde 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then > + AC_CHECK_HEADERS([localcharset.h]) > + am_save_LIBS="$LIBS" > + LIBS="${LIBS} ${LIBICONV}" > +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" > ++ if test -n "$LIBICONV"; then > ++ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" > ++ fi > + AC_CHECK_FUNCS([locale_charset]) > + LIBS="${am_save_LIBS}" > + if test "x$ac_cv_func_locale_charset" != "xyes"; then > diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk > index cfc148d01d..cd7c13fbed 100644 > --- a/package/libarchive/libarchive.mk > +++ b/package/libarchive/libarchive.mk > @@ -11,6 +11,10 @@ LIBARCHIVE_INSTALL_STAGING = YES > LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 > LIBARCHIVE_LICENSE_FILES = COPYING > LIBARCHIVE_CPE_ID_VENDOR = libarchive > +# We're patching configure.ac > +LIBARCHIVE_AUTORECONF = YES > +# needed for autoreconf > +LIBARCHIVE_DEPENDENCIES += host-pkgconf > > ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) > ifeq ($(BR2_STATIC_LIBS),y) From peter at korsgaard.com Thu Feb 2 21:04:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 2 Feb 2023 22:04:32 +0100 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230202210432.2998354-1-peter@korsgaard.com> 4.9.x / 6.0.x is now EOL. 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 e18b515311..a0e9286bd3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.5" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 157f267a9d..927172e8fa 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 bc7f6d9a8a8bbe9a723e82346bba94b58d926f78bfba106b21e041e0290076fc linux-6.1.5.tar.xz +sha256 d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b linux-6.1.9.tar.xz sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e7359bd2935b54fe8bb821cf748591c36a95bed019e752d3e4d5803d9da1ccb4 linux-5.15.87.tar.xz -sha256 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 linux-5.10.162.tar.xz -sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz +sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz +sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz +sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz -sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz +sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz +sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1ad9fffcd3..3a5207e0b6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -397,13 +397,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.302" if BR2_KERNEL_HEADERS_4_14 - default "4.19.269" if BR2_KERNEL_HEADERS_4_19 - default "5.4.228" if BR2_KERNEL_HEADERS_5_4 - default "5.10.162" if BR2_KERNEL_HEADERS_5_10 - default "5.15.87" if BR2_KERNEL_HEADERS_5_15 + default "4.14.304" if BR2_KERNEL_HEADERS_4_14 + default "4.19.271" if BR2_KERNEL_HEADERS_4_19 + default "5.4.230" if BR2_KERNEL_HEADERS_5_4 + default "5.10.166" if BR2_KERNEL_HEADERS_5_10 + default "5.15.91" if BR2_KERNEL_HEADERS_5_15 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 - default "6.1.5" if BR2_KERNEL_HEADERS_6_1 + default "6.1.9" if BR2_KERNEL_HEADERS_6_1 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 christian at paral.in Fri Feb 3 02:05:59 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 18:05:59 -0800 Subject: [Buildroot] [PATCH v1 1/3] package/docker-engine: bump version to v23.0.0 In-Reply-To: <20230202131354.1193243-1-christian@paral.in> References: <20230202131354.1193243-1-christian@paral.in> Message-ID: Hi all, Upon further testing I've discovered some bugs/quirks with this new Docker version and will need to investigate a bit further before we merge this. Marked as RFC on Patchwork for now. I'd still appreciate your thoughts on dropping docker-proxy as well as any objections to the CONFIGURE workaround to fix the Go modules issue. Thanks, Christian Stewart On Thu, Feb 2, 2023 at 5:13 AM Christian Stewart wrote: > > This update requires a workaround for the non-standard vendor/ structure in the > docker-engine repository, which has an invalid vendor/modules.txt file. > > Removing the vendor/modules.txt file fixes the build error. > > Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > > The go download post-process script uses go mod init to create the go.mod file > which specifies a language version of go1.16 on default. Use go mod edit to > adjust the go.mod file to the required minimum version go1.19 for generic types. > > https://github.com/moby/moby/releases/tag/v23.0.0 > > Signed-off-by: Christian Stewart > --- > package/docker-engine/docker-engine.hash | 2 +- > package/docker-engine/docker-engine.mk | 15 ++++++++++++++- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash > index d15b1359cb..670cbd414b 100644 > --- a/package/docker-engine/docker-engine.hash > +++ b/package/docker-engine/docker-engine.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz > +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk > index 2a9b72ca78..9c193a29a5 100644 > --- a/package/docker-engine/docker-engine.mk > +++ b/package/docker-engine/docker-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DOCKER_ENGINE_VERSION = 20.10.22 > +DOCKER_ENGINE_VERSION = 23.0.0 > DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) > > DOCKER_ENGINE_LICENSE = Apache-2.0 > @@ -62,6 +62,19 @@ else > DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs > endif > > +# update the go module version to go1.19 > +# docker-engine does not use go modules > +# remove the conflicting vendor/modules.txt > +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > +define DOCKER_ENGINE_CONFIGURE_CMDS > + if [ -f $(@D)/vendor/modules.txt ]; then \ > + rm $(@D)/vendor/modules.txt; \ > + fi > + cd $(@D); \ > + $(HOST_GO_HOST_ENV) $(DOCKER_ENGINE_GO_ENV) \ > + $(GO_BIN) mod edit -go=1.19 go.mod > +endef > + > DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) > > define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD > -- > 2.39.1 > From bugzilla at busybox.net Fri Feb 3 02:22:42 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 03 Feb 2023 02:22:42 +0000 Subject: [Buildroot] [Bug 15311] New: App crashes in function QQmlPropertyCache::property(int) const on ARM 64bit Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15311 Bug ID: 15311 Summary: App crashes in function QQmlPropertyCache::property(int) const on ARM 64bit Product: buildroot Version: 2022.11.1 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: 1183341255 at qq.com CC: buildroot at uclibc.org Target Milestone: --- We use the gcc11 compiler to compile the qt5webview module. The compilation is normal. This error occurs when running the sample minibrowser of qt5vebview, resulting in crash. It is found that the gcc11 compiler is faulty by searching. The gcc10 compiler returns to normal. We hope to run on the gcc11 compiler, so we need to solve this bug. Specific bug information can be viewed here:https://bugreports.qt.io/browse/QTBUG-99545 -- You are receiving this mail because: You are on the CC list for the bug. From christian at paral.in Fri Feb 3 03:44:40 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 19:44:40 -0800 Subject: [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16 Message-ID: <20230203034443.326513-1-christian@paral.in> Bugfixes and improvements. We now install the containerd.service systemd unit. https://github.com/containerd/containerd/releases/tag/v1.6.16 Signed-off-by: Christian Stewart --- v1 -> v2: - install containerd systemd unit (now required by docker-engine and others) Signed-off-by: Christian Stewart --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 04a29949d7..16474089d1 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 b86e5c42f58b8348422c972513ff49783c0d505ed84e498d0d0245c5992e4320 containerd-1.6.12.tar.gz +sha256 e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a containerd-1.6.16.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 192175800c..4a0d6ec38b 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.12 +CONTAINERD_VERSION = 1.6.16 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE @@ -41,4 +41,10 @@ else CONTAINERD_TAGS += no_btrfs endif +define CONTAINERD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/containerd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/containerd.service + $(SED) 's,/usr/local/bin,/usr/bin,g' $(TARGET_DIR)/usr/lib/systemd/system/containerd.service +endef + $(eval $(golang-package)) -- 2.39.1 From christian at paral.in Fri Feb 3 03:44:41 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 19:44:41 -0800 Subject: [Buildroot] [PATCH v2 2/4] package/docker-engine: bump version to v23.0.0 In-Reply-To: <20230203034443.326513-1-christian@paral.in> References: <20230203034443.326513-1-christian@paral.in> Message-ID: <20230203034443.326513-2-christian@paral.in> This update requires a workaround for the non-standard vendor/ structure in the docker-engine repository, which has an invalid vendor/modules.txt file. Removing the vendor/modules.txt file fixes the build error. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 The go download post-process script uses go mod init to create the go.mod file which specifies a language version of go1.16 on default. Use go mod edit to adjust the go.mod file to the required minimum version go1.19 for generic types used by docker-engine. (Fixes a build error). Note that this changes the go.mod language version and is not required to be equal to the current Go tool version. Note that as of v23.0.0 docker-engine expects containerd to be started by systemd if --containerd= flag is set in dockerd.service, whereas in previous versions containerd was started by the docker daemon as a sub-process. There is no sysv unit for containerd, but this is OK: in the Docker sysv init file S60dockerd, we do not set the --containerd flag. The docker daemon will start containerd as a sub-process automatically due to the absence of this flag. Signed-off-by: Christian Stewart --- v1 -> v2: - clarify commit message about containerd.service and sysv compat - fix formatting in S60dockerd - bundle commit into a series with required containerd changes Signed-off-by: Christian Stewart --- package/docker-engine/S60dockerd | 2 +- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 16 +++++++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/package/docker-engine/S60dockerd b/package/docker-engine/S60dockerd index def8bea149..7591f9fe66 100644 --- a/package/docker-engine/S60dockerd +++ b/package/docker-engine/S60dockerd @@ -10,7 +10,7 @@ DAEMON_ARGS="" do_start() { echo -n "Starting $NAME: " start-stop-daemon --start --quiet --background --make-pidfile \ - --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \ + --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \ && echo "OK" || echo "FAIL" } diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d15b1359cb..670cbd414b 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 2a9b72ca78..208688cc43 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.22 +DOCKER_ENGINE_VERSION = 23.0.0 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -40,6 +40,7 @@ ifeq ($(BR2_INIT_SYSTEMD),y) DOCKER_ENGINE_DEPENDENCIES += systemd DOCKER_ENGINE_TAGS += systemd journald endif + ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y) DOCKER_ENGINE_TAGS += experimental endif @@ -62,6 +63,19 @@ else DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs endif +# update the go module version to go1.19 +# docker-engine does not use go modules +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_ENGINE_CONFIGURE_CMDS + if [ -f $(@D)/vendor/modules.txt ]; then \ + rm $(@D)/vendor/modules.txt; \ + fi + cd $(@D); \ + $(HOST_GO_HOST_ENV) $(DOCKER_ENGINE_GO_ENV) \ + $(GO_BIN) mod edit -go=1.19 go.mod +endef + DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD -- 2.39.1 From christian at paral.in Fri Feb 3 03:44:42 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 19:44:42 -0800 Subject: [Buildroot] [PATCH v2 3/4] package/docker-proxy: drop package In-Reply-To: <20230203034443.326513-1-christian@paral.in> References: <20230203034443.326513-1-christian@paral.in> Message-ID: <20230203034443.326513-3-christian@paral.in> The docker-proxy binary (libnetwork) has been merged into the docker-engine source (moby). Drop the docker-proxy package and add cmd/docker-proxy as a build target of docker-engine instead. https://github.com/moby/libnetwork/commit/563fe8e248f3afac75a270f693f38bdc3eea7bf3 Signed-off-by: Christian Stewart --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/docker-engine/Config.in | 1 - package/docker-engine/docker-engine.mk | 2 +- package/docker-proxy/Config.in | 19 ------------------- package/docker-proxy/docker-proxy.hash | 3 --- package/docker-proxy/docker-proxy.mk | 21 --------------------- 8 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 package/docker-proxy/Config.in delete mode 100644 package/docker-proxy/docker-proxy.hash delete mode 100644 package/docker-proxy/docker-proxy.mk diff --git a/Config.in.legacy b/Config.in.legacy index 41c5fdefb3..75099f4404 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy removed" + select BR2_LEGACY + select BR2_PACKAGE_DOCKER_ENGINE + help + docker-proxy has been dropped by upstream since version + 563fe8. it has been merged into docker-engine (moby). + config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 bool "imx-gpu-viv X11 output has been removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577..7d4f9aa6fe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -545,7 +545,6 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-compose/ F: package/docker-engine/ -F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ diff --git a/package/Config.in b/package/Config.in index 83fddf316f..dc460ca852 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2615,7 +2615,6 @@ menu "System tools" source "package/docker-cli/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" - source "package/docker-proxy/Config.in" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 1f0efb8fcc..b5a356eab9 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_USE_MMU # containerd select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency - select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency help Docker is a platform to build, ship, diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 208688cc43..68855dc926 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -24,7 +24,7 @@ DOCKER_ENGINE_LDFLAGS = \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs -DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_ENGINE_DEPENDENCIES += libapparmor diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in deleted file mode 100644 index 7e40536537..0000000000 --- a/package/docker-proxy/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_DOCKER_PROXY - bool "docker-proxy" - 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 - help - Libnetwork is a Container Network Model that provides a - consistent programming interface and the required network - abstractions for applications. - - This package provides docker-proxy, a run-time dependency of - Docker. - - https://github.com/docker/libnetwork - -comment "docker-proxy needs a 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_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash deleted file mode 100644 index 63296f14c1..0000000000 --- a/package/docker-proxy/docker-proxy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 05bf95637bae134d12d02bd7a7854cd0c768e6fccb662c2c64523f05b997b204 docker-proxy-f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk deleted file mode 100644 index fe7982e8f6..0000000000 --- a/package/docker-proxy/docker-proxy.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# docker-proxy -# -################################################################################ - -DOCKER_PROXY_VERSION = f6ccccb1c082a432c2a5814aaedaca56af33d9ea -DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) - -DOCKER_PROXY_LICENSE = Apache-2.0 -DOCKER_PROXY_LICENSE_FILES = LICENSE - -DOCKER_PROXY_DEPENDENCIES = host-pkgconf - -DOCKER_PROXY_BUILD_TARGETS = cmd/proxy - -define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy -endef - -$(eval $(golang-package)) -- 2.39.1 From christian at paral.in Fri Feb 3 03:44:43 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 19:44:43 -0800 Subject: [Buildroot] [PATCH v2 4/4] package/docker-cli: bump version to v23.0.0 In-Reply-To: <20230203034443.326513-1-christian@paral.in> References: <20230203034443.326513-1-christian@paral.in> Message-ID: <20230203034443.326513-4-christian@paral.in> This update requires a workaround for the non-standard vendor/ structure in the docker-engine repository, which has an invalid vendor/modules.txt file. Removing the vendor/modules.txt file fixes the build error. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 The go download post-process script uses go mod init to create the go.mod file which specifies a language version of go1.16 on default. Use go mod edit to adjust the go.mod file to the required minimum version go1.19 for generic types used by docker-engine. (Fixes a build error). Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index c6db95f9b3..ff981be963 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz +sha256 3379d06cd6177832b91f4796c680b6bf15c7895773448716b4c3c5253f611d1b docker-cli-23.0.0.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index cb44c68c1b..3b155b5675 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.22 +DOCKER_CLI_VERSION = 23.0.0 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 @@ -29,6 +29,19 @@ DOCKER_CLI_TAGS += osusergo netgo DOCKER_CLI_GO_ENV = CGO_ENABLED=no endif +# update the go module version to go1.19 +# docker-cli does not use go modules +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_CONFIGURE_CMDS + if [ -f $(@D)/vendor/modules.txt ]; then \ + rm $(@D)/vendor/modules.txt; \ + fi + cd $(@D); \ + $(HOST_GO_HOST_ENV) $(DOCKER_CLI_GO_ENV) \ + $(GO_BIN) mod edit -go=1.19 go.mod +endef + DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) $(eval $(golang-package)) -- 2.39.1 From thomas.petazzoni at bootlin.com Fri Feb 3 06:45:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 03 Feb 2023 06:45:54 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-02 Message-ID: <20230203064600.916B6611F1@smtp3.osuosl.org> Hello, Autobuild statistics for 2023-02-02 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 7 | 2 | 0 | 9 | 2022.11.x | 13 | 20 | 0 | 33 | master | 177 | 303 | 1 | 481 | Classification of failures by reason for master ----------------------------------------------- host-fwup-1.9.1 | 22 fwup-1.9.1 | 20 bash-5.2.15 | 17 host-go-1.19.5 | 15 host-pahole-1.24 | 9 host-binutils-2.38 | 8 linux-6.1.5 | 8 opkg-0.4.5 | 8 jack2-1.9.21 | 7 libglib2-2.72.3 | 7 xz-5.2.10 | 7 dahdi-linux-3.2.0 | 6 gobject-introspection-1.72.0 | 6 host-sentry-cli-2.8.0 | 6 pixz-1.0.7 | 6 glibc-2.36-81-g4f4d7a13edfd... | 5 libgpg-error-1.46 | 4 norm-1.5.8 | 4 perl-5.36.0 | 4 python-bcrypt-4.0.1 | 4 python-numpy-1.23.5 | 4 uclibc-1.0.42 | 4 xxhash-0.8.1 | 4 acpid-2.0.34 | 3 efivar-38 | 3 fluent-bit-2.0.8 | 3 host-rust-1.66.1 | 3 libnss-3.87 | 3 ltp-testsuite-20220930 | 3 unknown | 3 bat-0.19.0 | 2 brltty-6.5 | 2 elfutils-0.186 | 2 fontconfig-2.13.1 | 2 fs/ubifs/ubifs.mk:49: /home... | 2 gerbera-1.10.0 | 2 gmp-6.2.1 | 2 gvfs-1.48.1 | 2 host-binutils-2.37 | 2 host-binutils-2.39 | 2 json-c-0.16 | 2 libfuse3-3.13.0 | 2 libgcrypt-1.10.1 | 2 mpv-0.33.1 | 2 mutt-2.2.9 | 2 optee-client-3.19.0 | 2 python-cryptography-39.0.0 | 2 ulog-0389d243352255f6182326... | 2 wolfssl-5.5.3 | 2 android-tools-4.2.2+git2013... | 1 avro-c-1.11.1 | 1 boost-1.80.0 | 1 bullet-3.21 | 1 cairo-1.16.0 | 1 cni-plugins-1.1.1 | 1 dash-0.5.11.5 | 1 dawgdic-16ac537ba9883ff01b6... | 1 dropbear-2022.83 | 1 erlang-22.3.4.22 | 1 frr-8.4.2 | 1 fs/btrfs/btrfs.mk:55: /home... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 glibmm-2.68.2 | 1 gobject-introspection | 1 gummiboot-2bcd919c681c952eb... | 1 host-python-maturin-0.14.9 | 1 imx-alsa-plugins-rel_imx_4.... | 1 kexec-2.0.25 | 1 kvmtool-f77d646ba01d04be5aa... | 1 libblockdev-2.26 | 1 libcamera-apps-1.1.0 | 1 libcap-ng-0.8.3 | 1 libsigrok-0.5.2 | 1 libxml2-2.10.3 | 1 linux-5.10.145-cip17 | 1 linux-5.10.145-cip17-rt7 | 1 liquid-dsp-1.4.0 | 1 lirc-tools-0.10.2 | 1 mariadb-10.3.36 | 1 matio-1.5.23 | 1 mesa3d-22.3.4 | 1 mxs-bootlets-10.12.01 | 1 ne10-1.2.1 | 1 netsurf-3.10 | 1 nginx-1.22.1 | 1 numactl-2.0.16 | 1 nut-2.8.0 | 1 pcre2-10.42 | 1 pcsc-lite-1.9.9 | 1 python-bunch-1.0.1 | 1 quickjs-2021-03-27 | 1 rtl_433-22.11 | 1 skalibs-2.12.0.1 | 1 ssdp-responder-1.9 | 1 strongswan-5.9.8 | 1 tealdeer-1.6.1 | 1 ti-k3-r5-loader-2022.10 | 1 tor-0.4.7.13 | 1 traceroute-2.1.0 | 1 uccp420wlan-6.9.1 | 1 uqmi-0a19b5b77140465c29e2af... | 1 valgrind-3.19.0 | 1 xenomai-3.0.10 | 1 zeek-4.1.1 | 1 zeromq-4.3.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/53e0b30cadbad90ef8ba61c39b5dd054dadc5a32 | ORPH mips64 | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/6af089a8aa7c9282f3642ae92b1b298df4af09c0 | ORPH mips64 | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/47b173c02f26e63c14ef1b686c808076cb9466c4 | ORPH mips64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/281acf637b1b33000b507a773e9dd90f0978d0cf | mips64 | avro-c-1.11.1 | NOK | http://autobuild.buildroot.net/results/74bd5cecfface38bef3b6a175c978ec20aac68b0 | or1k | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/a293eb0b947f041dd6214f6dda03b53d4b4cb22c | ORPH microblaze | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/87fcd26cd983d4716f8efb6b7b5f53343c57fc17 | ORPH mips64el | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/22575c04d9b1dd81f0fce43775dbe2c9cecb9c53 | ORPH microblazeel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/aa1257ee7fe1dd18be8bc10fb9de402ca1cdb911 | ORPH armeb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/a12f274360e466ec3ba1768dc44d02fe8b430466 | ORPH armeb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/e95dceeb340dd928c9dab302a687dda89f8d4af8 | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/d24d0a4b814d4d18a0e6872cf19d7ed30938fce4 | ORPH x86_64 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/c94e58a995bbc6bf8f8b170b3d19713fa115dc34 | ORPH arceb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/e2d1cdc259214a71ac404f14341997dcaa0ba6e6 | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/8ab3ed1e1269da43f5ea2d0c6fa69890e8027df1 | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/1cce17834935a8230106979b44da1bab21858e21 | ORPH microblaze | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/0adf8ebe5079aed0b1e7d8eaca49e6c910ca7e43 | ORPH x86_64 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/b0e5fcab9eeb799e31bca27fcb7280b728349bc6 | ORPH mips64 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/12e9aa42938e9c881a93bc1c4c9024b8c642df18 | ORPH arceb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/0ff34b89455edba5bdceee1a7cc322c7cfeb59f8 | ORPH x86_64 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/f8cb91f7f9ac6a46bb2ecfc22c1e42cf699f28d3 | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/f1f806af2f46e97b05f932bc0799c265c5138faf | ORPH armeb | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/a25f60dccfb2ad56114b0f6802e15403e75b229e | arm | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/9d940b5d5d9488c741c7bee8f426daffbeeea044 | arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/64d963395cf0383003e68c3c5f4f4a587f0d6c46 | powerpc64le | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/1a4d57fa7ecfc1111e2c24742cc346b073fb69d6 | microblazeel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/837ca4f9ab76b582136cfb517b16924af14a80a3 | nios2 | bullet-3.21 | NOK | http://autobuild.buildroot.net/results/97b9aad5a2c1cb80d9efb0e5f39d3143a8a61651 | armeb | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/dfffc0d5d48beaabe2cfa23d23857abb576efb6b | i586 | cni-plugins-1.1.1 | NOK | http://autobuild.buildroot.net/results/59fe4e0cea93abe0553ac2d717ab6219bb8ed656 | i686 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/c0bd0bced08c698d91bf61cef4a99067a278bcc3 | sparc | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/90c6a4e6fd1c442e4bb04d3a65217e654397c048 | microblaze | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/3eaac933918bf3c2c57e502dc8d75e2f5f117a93 | powerpc64le | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/9b7ad88e8c8f013d438214838bfb6647266afe5c | mips | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/f6d8ebbc5f8294ce16b07fedc05853e97cd931d2 | aarch64_be | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/e6b7fd62f4fdec8fcf2c2e0e9990a4ac5c0e2782 | xtensa | dash-0.5.11.5 | NOK | http://autobuild.buildroot.net/results/5eb61c6b77f5ef71d5c99a353174f4dc133ea0d2 | ORPH arceb | dawgdic-16ac537ba9883ff01b6... | NOK | http://autobuild.buildroot.net/results/2355ab9b9a8594463e195d9657df41f9a3c72c64 | riscv64 | dropbear-2022.83 | NOK | http://autobuild.buildroot.net/results/edbc6b915292abfba42fc7fcadc2eff1c8dd6e1e | mips64el | efivar-38 | NOK | http://autobuild.buildroot.net/results/2270f2ad58838327b823fbbe73a35efe9b00c1b4 | i586 | efivar-38 | NOK | http://autobuild.buildroot.net/results/06697fd7e5b94c441f3110878899894583886f4e | i586 | efivar-38 | NOK | http://autobuild.buildroot.net/results/552d66a4eb07e429a53bf934a79ba46671401936 | or1k | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/6237714cd398b9b02e0dc2d4989fa1570ffe1727 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/660dceb10059b3acdee0b4ac219fa9574f0cd40c | ORPH arm | erlang-22.3.4.22 | NOK | http://autobuild.buildroot.net/results/522ea05bbc4fe86d2aba0feeca31092ec3769018 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/11dd5ddf9ab3cfd1464a212f4e3d923832d53462 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/176b6784b0bcdb7601fc4b3cf1f11de6893c7774 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/94d5729c9903f7502f510fd8297a19dfbc69e83d | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/f9a5063e4f0ef728b256904187431ef697e04b35 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/3309bce201343d2fcde39ab567300d8c21a7fff9 | ORPH xtensa | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/b4aada606d4fa21810edb3f2dc98586c1c26dd44 | aarch64_be | fs/btrfs/btrfs.mk:55: /home... | NOK | http://autobuild.buildroot.net/results/4c07315debc15b962fbe8e3ff976f4bd910d971b | arc | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/8711babc34893c7b84975af9b744195f49a48c59 | sparc64 | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/84f13b28ba1060193b00197523c2bc6d0ef24b84 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/843cfe86c2c5410459f4ce7f712966e9cfffc416 | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/c8138825a83ae817b2dac35666e63dddbfb5c21b | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/6b96f0042c91e72796217145cf06439bf9e10200 | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/be0ebf20cdf812a5b8b5f99c1bf6590899395588 | i686 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/7c48c6105e9027a56733d5e1905596b63429bf66 | x86_64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/9af74db4d661817044618cadb621ba0485fd1ecc | powerpc64le | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/62c226fde28e10cc5d6d31aa9493e9d5976d95ad | s390x | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/a4ca1236e5a9821df869e27f0c40b0eced8685d3 | sh4eb | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/b911daee3dea4ac6e995e6e88723358979dea6ae | mips | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/cbd13691742c7e47dc9dcf7949291673c9adf4e7 | x86_64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/1f085427d8aae5a27802ca36b0ec2733fbdff825 | powerpc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/9a18a4b30a35e266215a7c2cd22f736305ab8378 | mips | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/47e4d8e1adce3d1dee3bcf5aa72584bab4292262 | powerpc64le | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/098b24dbf46ab84f16f4b20e4bedc264da71fb58 | s390x | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/1887f0f1827df1e3f087f3ae7461225f39d7392b | or1k | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/cce845a2cc819146813a2373c3cb00448d23c599 | or1k | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/cee80983cff8ce48494921e8ba2c3805c31714eb | or1k | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/4e777772b0182a7cba18df83d880fa97eb984b40 | i686 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/919dc2b0655b2c2673b8adc3aabb426a195a02f5 | sparc64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/01716279ea72338955735f10fd648e4b75f56853 | nios2 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7802a390003a774fc44c731d11097c241e0dfee8 | mipsel | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/49a8e09ac94be96f2fce16c8f3304e54a35de9d2 | powerpc64 | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d4154ff57a7c7a108eabc31211146a36a4f7b4a8 | or1k | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/23ec98ef13be7d1135f4013173677fbd52ad0b95 | powerpc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/4388cf0935dd6e7bb65a7c3124a65d5c8f6f8773 | m68k | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/783fdab1db8cdeef0d14b49a1c720886fd28e661 | riscv32 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/f602dfc777ee5c4bf3f8e026494cb2ccf0a0cdc8 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/4d35bc19aab3c6f6255fbb2570e17ebcfa104706 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/4cdcc6e3c184a9237e9b735b80681a0cf79ba82a | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e0394a4cc156a9c7be939f2668e1efe31d76e3fb | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/bad3ececba126be3d16683502ee56ccea5e0b502 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/15113526c20d696b5e3f0872f6a36a6052986edc | or1k | glibmm-2.68.2 | NOK | http://autobuild.buildroot.net/results/4fc9392d9e0188810fe5171c6860fecd2479d448 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/ddf47166d8ec2d5631d2dd81f039342d1315279e | ORPH riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/ab11c696d7dcccbd67166533e25702203f8cb56f | ORPH microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/84b8e3da76df77beb48851f5e9192db121a7e18c | s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/77e040aec694fd84b85411d63dbeacb91dfee583 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/bf6d606fb63cf35e24f3d160a01e37a8eb67e9e5 | ORPH mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/eddf60932c365d4681444ff5e905cec42dc52e72 | ORPH mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/555338315f339a02670efc26b656a79211a62c1f | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d65ba69aa60feb8f06e0b63db327faf6d7295327 | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/4e955fc1bf97545d0afb05de1180fd9c778b7546 | ORPH x86_64 | gummiboot-2bcd919c681c952eb... | NOK | http://autobuild.buildroot.net/results/08e4d20b0b08a5f18f0c1bd9cb78ee73ba4f4b74 | powerpc64le | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/4c8a8a94f7b2267668687f8bdbb37d9847ad50ae | ORPH sparc64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/b0dd50a74961d05c26666012ebb135ebdade4209 | ORPH armeb | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/a726deb23014b79b15b9ea88c84e042180c9ed79 | sparc64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/033e72d9310aadbcc8928b520a986f36f23b48e0 | powerpc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/4c91c9ee2b55f49512f147701d9fcdbccf34982c | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/9cb54fe163c1cac8e02be547e38e2095746b96d7 | powerpc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/08db32f899885389b8616aab603b693f69ed7cfc | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/a015ab14cdf0bda5c42ec08f9d5412f43ee4c24d | mips64el | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/da406ca810d6f26dfccfe6a75424139891e12cd3 | xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/7869d45d5feac72bbac6d16c144a8fe1b5439b1a | aarch64_be | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e0320dbc6c92e1ff9c9b87b8e6eee7bf4db56436 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/8e88624c74be9ad469622db0b70d612c825f32eb | arm | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/730e7c627342ee124f5b484a65140c2d27f65d00 | sparc | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/9e3fa76c6ff58f33e4a261321a6ba2b7382c537a | sparc | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d7b9520a38c7a0fae66f6542c1609200cc68a387 | powerpc64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/fdd8db662d71caad02327eefd9639a9a860c149e | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/06d46aa0eec7e16c2da589e58f1eff259d80d61e | aarch64_be | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3b3e5f761353e552f45679fc23b356e9ac2938ba | sparc64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ce510c4eb688aa494c0369b2c0b8fd986f8e7c90 | sh4eb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/c3cdce9556d6634bf8b82e5fcc68b0783ddc8f73 | aarch64_be | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/9380740a77790050c4e60aae63b8b64fdcda1c8d | powerpc64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/d7d29be7fea7b2e8a0c5c0237946c0635100fea9 | armeb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/48d2b3d9ef0dc3b9c8c3c897c268dc08d2b0be81 | mips64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/beeb5c43be33b1e422d4b2327a799d52256bbfea | sh4eb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/ff80790070b92c4f31f9c19ba80a9e7ba0d4a7d1 | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/a68071c232b02a2d79f2876785ae8880704e5827 | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/acb1e9001f713774230b5906a0912c7351a850cf | aarch64_be | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/3620ece383636433c06c58434819a1f83187935e | arceb | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8426a0579d1ea17ac86785b68686a3cf46323415 | m68k | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/cc91fe25469926b33db0c51dab438df9e545eb64 | arm | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8f6a0e1fc284c88e5e2cda1a2f94aa721de359c6 | s390x | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/0dd6abbd3db05ffade67e4191df78278f5f4b0ce | aarch64 | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/622ae6f478a1f43353d65ab6b86c6de390d128c4 | arm | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/da479d92663dfa6bc5857cce37da19f4b44e73b5 | powerpc64le | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/7376c031953911f71cd974ecbc09bb6ee8ed9a90 | mips64el | host-fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/e130aba82bed51a357cb7cc9ad833c0cc23d91fd | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/95119aecf6ee7220aa2858cfd9d619714cf2bffd | powerpc64le | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/5703061f1b6e722a07555df3d89d65772e820eb4 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/6ed8ffd00f5711875a5c9c770fa4f3f364a9fe47 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/5a5c52b909cea51e2328548ad7f13f81bcdac589 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/2c01f058487a149cdab1a71e2fc586dec6a498e5 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/6a4cd44bea1259ad2819d6cb9dc6e1236952da9f | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f9e4fc8522a7719418307f46192147c48cb65eae | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/c72a0d61d9aa3f4c85d352173cdc1527ecdb479b | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/c32c08909766e46ebee7fa13d980540a2ef4c5a0 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/cae9be44b101a5fb6c34bf2d00f155194c7039da | aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/46499c8d4e787688cf882262413ff2e69c21998e | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/516ab16d0bb3b81a2ddf1615a01038aca1e98fd1 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/42c784ae9df9d0b3a1680da312a77a8a170df1bc | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/c26e08ce27e87c888d01e3ac7c4d07adce3c97cd | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/2713fd690a69b7f463fbbbca1f172c60d1e7d78d | riscv32 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/efb274fdfa01509dfb0f26943a3f93053d754dc6 | microblazeel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/b8497ce2b8a871e4ac91b7506908beec3125288e | arceb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/dc49a91fffbee276c4d2668b4cdb1fae48e670a3 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ad6f218301a23e9bff85c7fd1d74d3fe8260f892 | sh4a | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/167c14e13ccb13e002efed461d46cf74c7e3ab52 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/bb9ea1ebcb81a0b87215822ec3b9bf704b4ffb8d | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/b2d06fcd51c7e2a8e7535c1ebf21befd2f923009 | sh4eb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/3f0d13f5a72d7edbaf9f59e14823276a4c51a937 | s390x | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/9a94a8f5946f0f3b61ca00f07848ec5ba2395983 | sparc64 | host-python-maturin-0.14.9 | NOK | http://autobuild.buildroot.net/results/03ae6e2c838e149bfee196ee3a734059365f6c2b | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/01e8c0bd1634d303156f0558eeac0ae98d0022ae | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/a5a8b9c939aa6b4d247c88744202f13cc47bc8ca | armeb | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/fc017d7e3e131b026c0fcf72f7f6d375d6d83d4e | m68k | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/4bd9603ad1478a41d4f00b5a467daf0321139c6d | nios2 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/91290f39fb1207879167c698cfa6eb99b502aa30 | mips64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/b59963f9706a55a20acbbb89b107622512576958 | arceb | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/cf9752ce97b850c9f84092849941b330e941400a | x86_64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/61ff0273c309fcb2d5535f002161558bdf802ea9 | armeb | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/efb7bf2bbdee51920effcde954de272db9ed3329 | arm | imx-alsa-plugins-rel_imx_4.... | NOK | http://autobuild.buildroot.net/results/f2b8b1b180b9dc4447df28903c98dcec77cef2a9 | mipsel | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/0077dd7f1d873b4f96db74298a76987fae25f159 | microblazeel | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/e73d087842ebf01caaf8970892aef915ac1a0749 | arm | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/6cb8eb1be2ad2f70ac883cc63cd8641229045daf | mips | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/3cb86b316fe01ad705c4ad8094cd7832b0d311d1 | x86_64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/e07f11c3102d3af7c896bab58e5c860a9b09e565 | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/3e26b3dfad9a518614035bcaa162dbda5221d408 | mips | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/7ec3e206a4d7ce8dbc3839900a2d3d91fab230e0 | or1k | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/ba96ba0c08cb4a8fa4fe3580a06b36719a0a9cf5 | riscv64 | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/3fb052dad3c8a2c934a0c50eb5ed5ef33375d9bd | armeb | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/7ce4e8dc541ad977e31c357ee8d962ad99feea18 | ORPH x86_64 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/f0dba05a8384fff66838b6f851e7697e48fe5f1f | x86_64 | libblockdev-2.26 | NOK | http://autobuild.buildroot.net/results/6e1c532935157024f42e1180a25c39938b3998d1 | ORPH powerpc64 | libcamera-apps-1.1.0 | NOK | http://autobuild.buildroot.net/results/519d002311dc345c1c2713302770bb6386e828d0 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/90744e59992d197dcd9e8d1e3f80ad5cd9e8b7f3 | arm | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/f9ce4e2c73101f1430615e9cad727fe38f70a65a | or1k | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/780c6b01b830d10fce248c5698c8ba60de7748f5 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/767abddd528b0432499161405c6e8335e742d9ab | ORPH armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/e23d4c60fb6bbf58f763167541800a8811f82393 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/b072ad3747cfa59c08fe7ee740225caa4744e87f | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/d7b7a78b72f2c374942fc3689c8e1bc5cd3ab171 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/59b5676ac11b3ac5d21c6ee33f075dbd55fee1f9 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/b34b0b3979544e2987da3f3f5d36ce54da957c17 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/5ae8fe64fc331be06c922291b4de7203bb3622b7 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/6de0507bbd9c1d366eccd6ffa579dcc614294b6c | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/2a83f7dbc8536c4da50fd327538cf0b908ce9ee2 | aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/c52052eebdb5a3e70f553dc5670957fade8c52ec | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/64f5ec7a1fefdb84c68d0dc3717e05bc5b96a8da | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/be4454bf0de2beb1365fe1019dac5c500b37c9b5 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/05f6e682437a813db4fe2b4984f73216623f9ec7 | ORPH mips | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/379d1d09740f713ef0e596046d4457594532b1e0 | mips64el | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/6c142e9881c3d4ed3be8437bd1b93f2fd1ad7dd3 | or1k | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/7dc4efe8ccc401afccc6489921d54af8836be2cd | arceb | libsigrok-0.5.2 | NOK | http://autobuild.buildroot.net/results/1efd80d0c3fb99bbb6babb1936e493ca3ad60ce8 | ORPH xtensa | libxml2-2.10.3 | NOK | http://autobuild.buildroot.net/results/5d342f639a2b633f32a23e8c41456bdd34536b3c | mips64 | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/e118ec23b32e9ca1f2da2c5c49d276d50c49d31b | ORPH microblazeel | linux-5.10.145-cip17-rt7 | NOK | http://autobuild.buildroot.net/results/39acd8bcb5878d51b321c1ff06c592206ac90626 | ORPH sh4a | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/32148c0f682c2570d47d94c489f701d588d8ba27 | ORPH mips64 | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/7966d155b6413412d8da8ef2331a26f597883591 | ORPH powerpc | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/750d9cd28e508daf1223f34141c2dc2cb05001b5 | ORPH mips64el | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/edb09f032211ca0443884978c7ae775b43d71ee5 | ORPH arc | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/17e6c3f5e0ff1b27a3b05636caf85586efa386d2 | ORPH aarch64_be | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/dafb02e0057a58dbfe3db83016b6b707026eea03 | ORPH sh4aeb | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/4b7e2c0ca0d0ae1fcb5aae7d1ba880282e4b7300 | ORPH mips | linux-6.1.5 | NOK | http://autobuild.buildroot.net/results/170bed47540bbd662a8c3b533988e8512301f317 | ORPH arm | liquid-dsp-1.4.0 | NOK | http://autobuild.buildroot.net/results/3e80c7395318b41cf3f9d42bf26d668ce5d6a5ad | aarch64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/baf7ab819ed03df4a680755942b6031db89368f0 | ORPH sh4a | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/48dea60ea7f9023e99758f60cd4b19d739906d1d | sparc64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/96b2e7790210f3f3423a08efe8fad713f850fcb7 | powerpc64le | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/712d3ca61744a015a24b590b4e1474a31a9998ba | sparc | mariadb-10.3.36 | NOK | http://autobuild.buildroot.net/results/f5057a2250b7a1da6f0154e3666dd76fa75fa85b | ORPH nios2 | matio-1.5.23 | NOK | http://autobuild.buildroot.net/results/e54b0ba74300beeb4c77a9a1603704dd30d3e031 | arm | mesa3d-22.3.4 | NOK | http://autobuild.buildroot.net/results/346f19c3934f07e1ff7b41ddc6c4f85d75d77f36 | aarch64_be | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/5323370552b56e13f40e36b5225402b612143c7d | powerpc64le | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/ad04e9a278e61bf09de392e365bee14952fe71e8 | aarch64_be | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/4d27d19625a36eeaa332cf0441afb693d86b335f | sh4a | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/0680dbc95601fcd8cdf07b926ea5e9be2079c7bf | arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/777416852771e3d7a267cdd82d370f3b55ddf45b | ORPH aarch64 | ne10-1.2.1 | NOK | http://autobuild.buildroot.net/results/086f350ebef0ec3821aa1c1133a867dd4e36526c | powerpc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/eb72214017fe27757d8bbf4503a5d6a22819a6f5 | arm | nginx-1.22.1 | NOK | http://autobuild.buildroot.net/results/f3886cfb12826e97a485853109f0042a232b2982 | arm | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/68cc8463e86128688b62e5b42fe81e07381acd34 | ORPH aarch64_be | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/103987c98ce190316740dc158992b980036aabac | ORPH powerpc | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/a5c71d8cd429647769b1ed1411442661728270b2 | ORPH powerpc64le | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/fed396a3458f8a979ec6131235bb1afc50c22759 | ORPH or1k | numactl-2.0.16 | NOK | http://autobuild.buildroot.net/results/a9103623601cbb591d4b3fd66e5843a2cd16ad2b | mips64el | nut-2.8.0 | NOK | http://autobuild.buildroot.net/results/2bc4bb6a56e5b27228f9a55611ba8c13e29a8b9c | powerpc64le | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/308b275f9fea3f4f97f0f7cf7b390fd9647c3092 | ORPH powerpc64 | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/77187cf59f24a52c25883a858958a1973fe918a6 | ORPH mipsel | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/8f0d0e33c495c828f53bc9e32ed3e48ace72824f | ORPH mips64 | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/425f9c25e27f46dd181467c888208b810102e862 | ORPH microblazeel | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/f51c3e84d569ca6dfdfc2cefe5c4de9bdbc4f538 | ORPH powerpc64le | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/47a83c43d54b4176fd52a77176aab5d14faefbea | ORPH or1k | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/95843e6b1e277b1917386abb3b0c427c09f93767 | ORPH mipsel | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/b8fb1775d38410d8b4f3843ee3c729f6bfb3a638 | ORPH powerpc | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/11157897a8d2f8a1a74c55a637d5edac1bfed7a1 | m68k | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/e0b710a814f36fcce8da04371dd71787192e1d6a | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/64227df570d310ac5fbd2c2764ce632528181796 | ORPH or1k | pcsc-lite-1.9.9 | NOK | http://autobuild.buildroot.net/results/7519c9a90154eae0b4608c7877bb5784daf5ddc1 | ORPH arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/be1f4a62ecfc7e65ea7b64e8ef15579d9814d284 | or1k | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/08d87e0d0ef0223b2f8f2a59b13de24c97c42c7d | sparc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/56ca27b88420e160e5702dbe301dbbcea5370bbc | arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/99f01b4a582b5470a59e9d1bb20133e500d6f771 | aarch64 | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/fa70a585833059e6d229a295226b33784c0f2027 | aarch64 | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/8d54c99573431b43a73364074f33811c6998c89a | i686 | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/7b9892d5a05b58c596ae7d5944ec8cb2388ed103 | arm | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/5facf207784fa0e4605723093db462a719f1c54b | arm | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/c53ee5b2e111167061ec299e2aa6f91d7d90e315 | arm | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/c9db861e206437a533c05ad98cfdda6b3602394d | powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/c91d21e7bd1221a3bc1804c59200def5d3748e52 | mips | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/5835817d60eb9779ba7fb81892426e3e30762827 | powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/e8ebef4bf8c387b1679f01cea721f5a3dec3ad1b | i686 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/5322a673fb003e6ec45cb61310664d7427c885e1 | powerpc64 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/10c2cf51430a4f88ce0b225f8480c591fdcbbb0d | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/f549699d2fbbbd402e06dd20383981ad33e59dff | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/0289903ba4cb519df4b0e7469b3a1a30cad6a8e9 | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/7dddebdce5e5055601c9f4e807786f1a5e967bd1 | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/8ac8803c7427800c7875c82eb62d8e85726612fe | i686 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/0c9aac1f48676256e43d1f3d9b1ccd4748d03b2b | sh4aeb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/ddc542c393ac8c3ddeb809c62e47202271c4dc68 | microblaze | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/37ec7133862a1492af93e12661575068acf29c48 | aarch64_be | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/6bde94a026c1f4e2a147632a1f9939f66da9cafe | or1k | skalibs-2.12.0.1 | NOK | http://autobuild.buildroot.net/results/725bce7ef61c02f082be0ae99638b1c29e656de3 | nios2 | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 | aarch64 | strongswan-5.9.8 | NOK | http://autobuild.buildroot.net/results/3e7907d9d3863119e73723518caa4f0f46bf67a1 | x86_64 | tealdeer-1.6.1 | NOK | http://autobuild.buildroot.net/results/8fcbc18e67185e900a1f547e7e4386008d21a90c | aarch64 | ti-k3-r5-loader-2022.10 | NOK | http://autobuild.buildroot.net/results/855773ae975e8998dae1a693ca096f6fbd35c0dc | xtensa | tor-0.4.7.13 | NOK | http://autobuild.buildroot.net/results/6f102f1f5891b10ade216dbf37e17651d2b00fae | or1k | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/0c12d537d6ff03171c8deee72f22a4b75183951f | nios2 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/3e0717088d08379369acd8a29bfc792c9cf61e70 | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/372bd8c54d35dd5239508c71093f1d4643aa7cdc | powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/89a3b7cbfd68bcb8600da412673838f67f89dd83 | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/8731d747a4ad48e3be10358fd31b16bea74fce97 | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/d80b2827c1906c6147fd898067fb6202be37605e | sparc64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/d9325c522f97fdc74c07f3364394b2c40867cf28 | powerpc64le | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/1733ead45aac547b567e43653ec99e7fb7a2a7c1 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/11a6de30174bba0b22b43b182b9247154f10f990 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/df626f4b14e481b5e178af374f613d8fdeb6bca8 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/b58130b694382d75d70053537b8db642abb6d015 | sparc64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/58faaf660abef33af9fd2913728404323953554b | ORPH mips64 | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/5c333196b795e75c42dc42b749d56c61feca4331 | ORPH riscv32 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/0b32b8fc1b0ce5b15b94dc2b79ffc4d90e078676 | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/907a5967439c3157c426023b0be1e613092d7bfe | i686 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/d63e688833fa523a5dd9265bbf41089188d478c3 | microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/72fe77edf6194ca8d7f827310547a9c72da8c7dc | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/7ccfb9514a36fc5f2ea3df5f77fb2872faf5cbca | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/efa25b6d773fc6ea3c022b5910126896372edd60 | ORPH x86_64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/ed0ec16494004d116d80b274203fe17526a2ee03 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/90fbc288564d74eae2adec6796e279a152d80282 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/b7f221f8057edad91bce8f049ecc2771234ce25a | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/7841d9eac4a22b6017eacda8ed7b257581cbb805 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/a858628274d12478992407fd10a116572588828c | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/ea3f545bdd059f98ae077a781fca26d16ae1bdc7 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/76ecd71355c43b94fe127ae0c09de437fcda6fca | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/fc7cea1b65babdb6c07160d2adf69205dd5f442e | ORPH m68k | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/9120ecc67f77c4316cf57114a2e0c0efc4d07863 | aarch64 | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/33849e7481cb8050c876673e102cc85c09825d5e | Classification of failures by reason for 2022.02.x -------------------------------------------------- host-delve-1.8.0 | 1 janus-gateway-0.11.6 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/3ea7d6491ed7e7f7f4ff8599ec5dd7130dc6fd60 | sparc | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/1f49e42cd33a9dc9d75108e3c2c39b6d997f65be | Classification of failures by reason for 2022.11.x -------------------------------------------------- host-pahole-1.24 | 3 glibc-2.36-66-ga1dc0be03c9d... | 2 fs/ubifs/ubifs.mk:49: /home... | 1 gerbera-1.10.0 | 1 host-binutils-2.38 | 1 host-go-1.19.5 | 1 libglib2-2.72.3 | 1 libnss-3.84 | 1 lirc-tools-0.10.2 | 1 mpv-0.33.1 | 1 perl-5.34.1 | 1 python-cryptography-38.0.1 | 1 qemu-7.1.0 | 1 quickjs-2021-03-27 | 1 uboot-tools-2021.07 | 1 unknown | 1 zabbix-5.4.9 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/f29599f7ccbe6889b60d250086e1a6b3e6b51945 | i686 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/61b1856af8c1b6711409639796a123c8d5e910b1 | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/4807000643acaeb282277d3a128e32ce6404b853 | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/379db648e34b99f05a194f47ba42bf8d52439df8 | i686 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/f5ae3184e376ee858415c479ff0e7b7721294d6e | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/3717aa01d531610fa09aa6c7a33795dd36031ecc | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/54c6f8385b0ad0111c00dc693772583c99bac4d2 | microblazeel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1c7884d635c9a3e39b6c0e2ae4055f16d257548b | arc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/caf24a1c7a0284e1533b7d08846cf3c81889f266 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/19450e40df046eb154a2c6207ddd2d851f474c08 | mipsel | libnss-3.84 | NOK | http://autobuild.buildroot.net/results/ae4356cfb58ace8a7687ae2d7382a26acfad47c0 | mipsel | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/9ddffaf1d0bc2a99b255fec853b35294be977521 | ORPH x86_64 | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/79970b5e43daf76e63fa5c3ce56a0e78ccc6016f | mips64 | perl-5.34.1 | NOK | http://autobuild.buildroot.net/results/56665e5cbfaab9de3dc1d5640a4adf8c3be9e6c7 | mips | python-cryptography-38.0.1 | NOK | http://autobuild.buildroot.net/results/2abbb66a923e8a86b9fa01c740d16e7d84d91376 | riscv32 | qemu-7.1.0 | NOK | http://autobuild.buildroot.net/results/3008696b7272f61040bd0b2812586a2e215151b3 | or1k | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/1ce0158686a5e60fa5143493b91e771a8b39ebd3 | sparc | uboot-tools-2021.07 | NOK | http://autobuild.buildroot.net/results/6fdd9fcd5741ec828a4c57c3292c09e3103f625e | or1k | unknown | NOK | http://autobuild.buildroot.net/results/81bafbe77abe2c38cf28f5733981de22472ba84d | s390x | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/74b7ac08ecfc18e9ca9b9526a5267d6f32681d09 | -- http://autobuild.buildroot.net From peter at korsgaard.com Fri Feb 3 07:28:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:28:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-compose: security bump version to 2.15.1 In-Reply-To: <20230202134149.1864294-1-christian@paral.in> (Christian Stewart's message of "Thu, 2 Feb 2023 05:41:49 -0800") References: <20230202134149.1864294-1-christian@paral.in> Message-ID: <87sffn2onv.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Fix CVE-2022-27664 and CVE-2022-32149 high-risk vulnerability. > Many other bugfixes, enhancements, and improvements. > https://github.com/docker/compose/releases/tag/v2.15.1 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 3 07:28:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:28:55 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/containerd: bump to version 1.6.16 In-Reply-To: <20230202133453.1747150-1-christian@paral.in> (Christian Stewart's message of "Thu, 2 Feb 2023 05:34:53 -0800") References: <20230202133453.1747150-1-christian@paral.in> Message-ID: <87o7qb2onc.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Bugfixes and improvements. > https://github.com/containerd/containerd/releases/tag/v1.6.16 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From buildroot at heine.tech Fri Feb 3 07:29:33 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Fri, 03 Feb 2023 08:29:33 +0100 Subject: [Buildroot] =?utf-8?b?Pz09P3V0Zi04P3E/IFthdXRvYnVpbGQuYnVpbGRy?= =?utf-8?q?oot=2Enet=5D_Your_daily_results_for_2023-02-02?= Message-ID: <66d07-63dcb800-3-60a2a380@15361192> Hi Thomas, On Friday, February 03, 2023 07:45 CET, Thomas Petazzoni wrote: > Hello, > > Build failures related to your packages: > > arch | reason | url > -------------+--------------------------------+--------------------------------------------------------------------------------- > arc | boost-1.80.0 | http://autobuild.buildroot.net/results/64d963395cf0383003e68c3c5f4f4a587f0d6c46 > I submitted a patch for this a while back. I think it got lost. Care to take a look? https://patchwork.ozlabs.org/project/buildroot/patch/20221223133401.97844-1-buildroot at heine.tech/ Regards, Michael From peter at korsgaard.com Fri Feb 3 07:30:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:30:14 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/cni-plugins: bump version to 1.2.0 In-Reply-To: <20230202133151.1671576-1-christian@paral.in> (Christian Stewart's message of "Thu, 2 Feb 2023 05:31:51 -0800") References: <20230202133151.1671576-1-christian@paral.in> Message-ID: <87k00z2ol5.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Adds new device driver main/dummy and various bug fixes/cleanups. > https://github.com/containernetworking/plugins/releases/tag/v1.2.0 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 3 07:30:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:30:40 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/moby-buildkit: bump to version 0.11.2 In-Reply-To: <20230202134623.1912767-1-christian@paral.in> (Christian Stewart's message of "Thu, 2 Feb 2023 05:46:23 -0800") References: <20230202134623.1912767-1-christian@paral.in> Message-ID: <87fsbn2okf.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > https://github.com/moby/buildkit/releases/tag/v0.11.2 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 3 07:31:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:31:34 +0100 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series In-Reply-To: <20230202210432.2998354-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 2 Feb 2023 22:04:32 +0100") References: <20230202210432.2998354-1-peter@korsgaard.com> Message-ID: <87bkmb2oix.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > 4.9.x / 6.0.x is now EOL. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From christian at paral.in Fri Feb 3 07:37:55 2023 From: christian at paral.in (Christian Stewart) Date: Thu, 2 Feb 2023 23:37:55 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/containerd: bump to version 1.6.16 In-Reply-To: <87o7qb2onc.fsf@dell.be.48ers.dk> References: <20230202133453.1747150-1-christian@paral.in> <87o7qb2onc.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, I also sent a v2 of this series which adds the containerd.service for systemd. Thanks & best, Christian On Thu, Feb 2, 2023, 11:28 PM Peter Korsgaard wrote: > >>>>> "Christian" == Christian Stewart writes: > > > Bugfixes and improvements. > > https://github.com/containerd/containerd/releases/tag/v1.6.16 > > > Signed-off-by: Christian Stewart > > Committed, thanks. > > -- > Bye, Peter Korsgaard -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Fri Feb 3 07:39:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:39:16 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/containerd: bump to version 1.6.16 In-Reply-To: <20230203034443.326513-1-christian@paral.in> (Christian Stewart's message of "Thu, 2 Feb 2023 19:44:40 -0800") References: <20230203034443.326513-1-christian@paral.in> Message-ID: <877cwz2o63.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Bugfixes and improvements. > We now install the containerd.service systemd unit. > https://github.com/containerd/containerd/releases/tag/v1.6.16 > Signed-off-by: Christian Stewart > --- > v1 -> v2: > - install containerd systemd unit (now required by docker-engine and others) > Signed-off-by: Christian Stewart Sorry, this is the commit I've applied, not v1. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 3 07:39:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 03 Feb 2023 08:39:49 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/containerd: bump to version 1.6.16 In-Reply-To: (Christian Stewart's message of "Thu, 2 Feb 2023 23:37:55 -0800") References: <20230202133453.1747150-1-christian@paral.in> <87o7qb2onc.fsf@dell.be.48ers.dk> Message-ID: <87357n2o56.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Hi Peter, > I also sent a v2 of this series which adds the containerd.service for > systemd. Yes, that is the one I have applied, not v1. Sorry about the confusion. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 3 07:26:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 3 Feb 2023 08:26:52 +0100 Subject: [Buildroot] [git commit] package/docker-compose: security bump version to 2.15.1 Message-ID: <20230203074021.3870A83610@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67c92fbd5004a750e6af253dd1eba4c3f669ef42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-27664 and CVE-2022-32149 high-risk vulnerability. Many other bugfixes, enhancements, and improvements. https://github.com/docker/compose/releases/tag/v2.15.1 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 7a7ab5f110..2c924d5080 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5cbf6cd1dd8ce98c5e2d62ca7f622e96abce444979b8e8852b033213a98e2049 docker-compose-2.14.0.tar.gz +sha256 346571ca487bf3f4b3dc9caeadc88a645354b0e098fa60f350249ec35ab3f240 docker-compose-2.15.1.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index ef9ee97196..3bced8bb7b 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.14.0 +DOCKER_COMPOSE_VERSION = 2.15.1 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Feb 3 07:32:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 3 Feb 2023 08:32:00 +0100 Subject: [Buildroot] [git commit] package/moby-buildkit: bump to version 0.11.2 Message-ID: <20230203074021.50F5C83612@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c7c179e9a50b908b14aa2dd2f11c5df5a42109a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/moby/buildkit/releases/tag/v0.11.2 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- 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 43ee1b12c9..ef927636d9 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5ffe5a2d11736719649dae962461f66df394ae4cc1e58294e5f2bd4d4632d9d0 moby-buildkit-0.10.6.tar.gz +sha256 b1746575f37715a8a2f2df5bab77ea081ba8436854e241792702109fc9e3653d moby-buildkit-0.11.2.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 59d68a7dca..a25f676710 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.10.6 +MOBY_BUILDKIT_VERSION = 0.11.2 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Feb 3 07:32:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 3 Feb 2023 08:32:00 +0100 Subject: [Buildroot] [git commit] package/cni-plugins: bump version to 1.2.0 Message-ID: <20230203074021.42F2383611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb6410b09b339a372e1cc9b9f09901635ebdf406 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Adds new device driver main/dummy and various bug fixes/cleanups. https://github.com/containernetworking/plugins/releases/tag/v1.2.0 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/cni-plugins/cni-plugins.hash | 2 +- package/cni-plugins/cni-plugins.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/cni-plugins/cni-plugins.hash b/package/cni-plugins/cni-plugins.hash index fc3b5a7ead..0c3e07c91c 100644 --- a/package/cni-plugins/cni-plugins.hash +++ b/package/cni-plugins/cni-plugins.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c86c44877c47f69cd23611e22029ab26b613f620195b76b3ec20f589367a7962 cni-plugins-1.1.1.tar.gz +sha256 f3496ddda9c7770a0b695b67ae7ee80a4ee331ac2745af4830054b81627f79b7 cni-plugins-1.2.0.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/cni-plugins/cni-plugins.mk b/package/cni-plugins/cni-plugins.mk index b30937095a..be02c2ff45 100644 --- a/package/cni-plugins/cni-plugins.mk +++ b/package/cni-plugins/cni-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_VERSION = 1.1.1 +CNI_PLUGINS_VERSION = 1.2.0 CNI_PLUGINS_SITE = $(call github,containernetworking,plugins,v$(CNI_PLUGINS_VERSION)) CNI_PLUGINS_LICENSE = Apache-2.0 CNI_PLUGINS_LICENSE_FILES = LICENSE @@ -12,6 +12,7 @@ CNI_PLUGINS_LICENSE_FILES = LICENSE CNI_PLUGINS_BUILD_TARGETS = \ plugins/ipam/dhcp \ plugins/main/bridge \ + plugins/main/dummy \ plugins/main/host-device \ plugins/main/ipvlan \ plugins/main/loopback \ From peter at korsgaard.com Fri Feb 3 07:32:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 3 Feb 2023 08:32:09 +0100 Subject: [Buildroot] [git commit] package/containerd: bump to version 1.6.16 Message-ID: <20230203074021.7D0E683611@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7ea83dd2df315ba4f492a9ef6b24152ba4cc4f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bugfixes and improvements. We now install the containerd.service systemd unit. https://github.com/containerd/containerd/releases/tag/v1.6.16 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 04a29949d7..16474089d1 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 b86e5c42f58b8348422c972513ff49783c0d505ed84e498d0d0245c5992e4320 containerd-1.6.12.tar.gz +sha256 e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a containerd-1.6.16.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 192175800c..4a0d6ec38b 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.12 +CONTAINERD_VERSION = 1.6.16 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE @@ -41,4 +41,10 @@ else CONTAINERD_TAGS += no_btrfs endif +define CONTAINERD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/containerd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/containerd.service + $(SED) 's,/usr/local/bin,/usr/bin,g' $(TARGET_DIR)/usr/lib/systemd/system/containerd.service +endef + $(eval $(golang-package)) From peter at korsgaard.com Fri Feb 3 07:32:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 3 Feb 2023 08:32:00 +0100 Subject: [Buildroot] [git commit] package/nerdctl: bump version to 1.2.0 Message-ID: <20230203074021.61BC983616@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02658dcc01f62aef26045affe37d21e6d3250256 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/containerd/nerdctl/releases/tag/v1.2.0 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/nerdctl/nerdctl.hash | 2 +- package/nerdctl/nerdctl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash index e253fb74b2..8f2c678198 100644 --- a/package/nerdctl/nerdctl.hash +++ b/package/nerdctl/nerdctl.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 ae468c65480e9c6679e0dd23d466b723e7f19bff779d4e2e0fa4629be343af2a nerdctl-1.0.0.tar.gz +sha256 08a84b9481b37dbd8cc6f955dbec0c18a1934bcffeb135fd5d2dc23987152b7c nerdctl-1.2.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk index fdf60cb189..7556bcc391 100644 --- a/package/nerdctl/nerdctl.mk +++ b/package/nerdctl/nerdctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NERDCTL_VERSION = 1.0.0 +NERDCTL_VERSION = 1.2.0 NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) NERDCTL_LICENSE = Apache-2.0 From peter at korsgaard.com Fri Feb 3 07:32:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 3 Feb 2023 08:32:00 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230203074021.6F44C82DD2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=def789059af78cd65294cafa4288cb41691e86c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 4.9.x / 6.0.x is now EOL. 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 e18b515311..a0e9286bd3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.5" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 157f267a9d..927172e8fa 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 bc7f6d9a8a8bbe9a723e82346bba94b58d926f78bfba106b21e041e0290076fc linux-6.1.5.tar.xz +sha256 d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b linux-6.1.9.tar.xz sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e7359bd2935b54fe8bb821cf748591c36a95bed019e752d3e4d5803d9da1ccb4 linux-5.15.87.tar.xz -sha256 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 linux-5.10.162.tar.xz -sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz +sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz +sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz +sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz -sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz +sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz +sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1ad9fffcd3..3a5207e0b6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -397,13 +397,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.302" if BR2_KERNEL_HEADERS_4_14 - default "4.19.269" if BR2_KERNEL_HEADERS_4_19 - default "5.4.228" if BR2_KERNEL_HEADERS_5_4 - default "5.10.162" if BR2_KERNEL_HEADERS_5_10 - default "5.15.87" if BR2_KERNEL_HEADERS_5_15 + default "4.14.304" if BR2_KERNEL_HEADERS_4_14 + default "4.19.271" if BR2_KERNEL_HEADERS_4_19 + default "5.4.230" if BR2_KERNEL_HEADERS_5_4 + default "5.10.166" if BR2_KERNEL_HEADERS_5_10 + default "5.15.91" if BR2_KERNEL_HEADERS_5_15 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 - default "6.1.5" if BR2_KERNEL_HEADERS_6_1 + default "6.1.9" if BR2_KERNEL_HEADERS_6_1 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 luca.ceresoli at bootlin.com Fri Feb 3 07:47:43 2023 From: luca.ceresoli at bootlin.com (Luca Ceresoli) Date: Fri, 3 Feb 2023 08:47:43 +0100 Subject: [Buildroot] [PATCH v1 1/1] board/versal/post-image.sh: do not require xilinx/ prefix for .dts files In-Reply-To: <20230202133817.56293-1-neal.frager@amd.com> References: <20230202133817.56293-1-neal.frager@amd.com> Message-ID: <20230203084743.0c49f73c@booty> Hi Neal, On Thu, 2 Feb 2023 13:38:17 +0000 Neal Frager wrote: > If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > buildroot into the linux tree, these .dts files are copied to > arch/arm64/boot. Unfortunately, the post-image.sh script expects to find > them in arch/arm64/boot/xilinx. > > This patch does not require the xilinx/ prefix to be present when > symlinking the device-tree to system.dtb where u-boot expects to find > it. > > It is effectively applying the below patch for zynqmp to versal as well: > https://patchwork.ozlabs.org/project/buildroot/patch/20230201195956.1758827-1-gsmecher at threespeedlogic.com/ > > Signed-off-by: Neal Frager > --- > board/versal/post-image.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh > index f45f29a155..92e65ed3b7 100755 > --- a/board/versal/post-image.sh > +++ b/board/versal/post-image.sh > @@ -5,7 +5,7 @@ > # devicetree listed in the config. > > FIRST_DT=$(sed -nr \ > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ Reviewed-by: Luca Ceresoli -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From stefan at agner.ch Fri Feb 3 10:46:45 2023 From: stefan at agner.ch (Stefan Agner) Date: Fri, 3 Feb 2023 11:46:45 +0100 Subject: [Buildroot] [PATCH] package/dbus-broker: bump to release 33 Message-ID: <175cc1e7e72602b9c0e8d6b761cf72b375383189.1675421166.git.stefan@agner.ch> This release contains mostly a bugfixes, with some improvements around error handling for unimplemented functionality and resiliency against runtime changes of dbus service-files. Signed-off-by: Stefan Agner --- package/dbus-broker/dbus-broker.hash | 2 +- package/dbus-broker/dbus-broker.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash index f6c2cbe160..89b27ddddc 100644 --- a/package/dbus-broker/dbus-broker.hash +++ b/package/dbus-broker/dbus-broker.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index e82b79220d..c4e3679a2e 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_BROKER_VERSION = 32 +DBUS_BROKER_VERSION = 33 DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) -- 2.39.1 From buildroot at busybox.net Fri Feb 3 10:42:52 2023 From: buildroot at busybox.net (busybox.net) Date: 3 Feb 2023 02:42:52 -0800 Subject: [Buildroot] buildroot@busybox.net have 3 Pending incoming emails Message-ID: <20230203024252.8E7A851294F844A4@busybox.net> An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Fri Feb 3 16:20:41 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 03 Feb 2023 16:20:41 +0000 Subject: [Buildroot] [Bug 15316] New: xscreensaver should check if linux-pam is enabled Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15316 Bug ID: 15316 Summary: xscreensaver should check if linux-pam is enabled Product: buildroot Version: 2022.11.1 Hardware: All OS: Linux Status: NEW Severity: trivial Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: jbittner.br.bugs at gmail.com CC: buildroot at uclibc.org Target Milestone: --- At present, xscreensaver needs to be setuid root to read /etc/shadow to handle login verification for screen locking. By having xscreensaver check if linux-pam is enabled and adding --with-pam to ./configure, screen locking can be enabled without setuid. Note: the relevant utility from linux-pam, unix_chkpwd *DOES* need to be setuid root -- You are receiving this mail because: You are on the CC list for the bug. From aperez at igalia.com Fri Feb 3 21:24:17 2023 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 3 Feb 2023 23:24:17 +0200 Subject: [Buildroot] [PATCH 1/1] package/webkitgtk: security bump to version 2.38.4 Message-ID: <20230203212417.874198-1-aperez@igalia.com> Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://webkitgtk.org/2023/02/02/webkitgtk2.38.4-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index eff7f5c18f..34fd19d3de 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums -md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz -sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz -sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums +md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz +sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz +sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b1bca7b88a..b42ac3b644 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.3 +WEBKITGTK_VERSION = 2.38.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES -- 2.39.1 From aperez at igalia.com Fri Feb 3 23:04:55 2023 From: aperez at igalia.com (Adrian Perez de Castro) Date: Sat, 4 Feb 2023 01:04:55 +0200 Subject: [Buildroot] [PATCH] package/wpewebkit: security bump to version 2.38.4 Message-ID: <20230203230455.1566166-1-aperez@igalia.com> Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.4.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index ccd928b3df..dcd082e045 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums -md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz -sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz -sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums +md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz +sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz +sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 4c50ed9955..34ee405de1 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.3 +WPEWEBKIT_VERSION = 2.38.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES -- 2.39.1 From yann.morin.1998 at free.fr Sat Feb 4 11:46:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 12:46:01 +0100 Subject: [Buildroot] [git commit] package/webkitgtk: security bump to version 2.38.4 Message-ID: <20230204114805.49FAE82B38@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca203080d132d44fc0b62148066b85cce66628fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://webkitgtk.org/2023/02/02/webkitgtk2.38.4-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index eff7f5c18f..34fd19d3de 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums -md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz -sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz -sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums +md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz +sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz +sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b1bca7b88a..b42ac3b644 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.3 +WEBKITGTK_VERSION = 2.38.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Sat Feb 4 11:46:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 12:46:04 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: security bump to version 2.38.4 Message-ID: <20230204114805.53C0C82AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02ace135ee0d31d30021cd000d0594bb6360ca94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.4.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index ccd928b3df..dcd082e045 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums -md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz -sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz -sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums +md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz +sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz +sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b2bbc0301b..54f37fd702 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.3 +WPEWEBKIT_VERSION = 2.38.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Sat Feb 4 11:49:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 12:49:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/webkitgtk: security bump to version 2.38.4 In-Reply-To: <20230203212417.874198-1-aperez@igalia.com> References: <20230203212417.874198-1-aperez@igalia.com> Message-ID: <20230204114900.GA14083@scaer> Adrian, All On 2023-02-03 23:24 +0200, Adrian Perez de Castro spake thusly: > Bugfix release, with many security fixes, including (but not limited to) > patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. > > Release notes: > > https://webkitgtk.org/2023/02/02/webkitgtk2.38.4-released.html > > Accompanying security advisory: > > https://webkitgtk.org/security/WSA-2023-0001.html > > Signed-off-by: Adrian Perez de Castro Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/webkitgtk/webkitgtk.hash | 8 ++++---- > package/webkitgtk/webkitgtk.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > index eff7f5c18f..34fd19d3de 100644 > --- a/package/webkitgtk/webkitgtk.hash > +++ b/package/webkitgtk/webkitgtk.hash > @@ -1,7 +1,7 @@ > -# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums > -md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz > -sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz > -sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz > +# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums > +md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz > +sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz > +sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz > > # Hashes for license files: > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > index b1bca7b88a..b42ac3b644 100644 > --- a/package/webkitgtk/webkitgtk.mk > +++ b/package/webkitgtk/webkitgtk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WEBKITGTK_VERSION = 2.38.3 > +WEBKITGTK_VERSION = 2.38.4 > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > WEBKITGTK_INSTALL_STAGING = YES > -- > 2.39.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 Feb 4 11:49:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 12:49:15 +0100 Subject: [Buildroot] [PATCH] package/wpewebkit: security bump to version 2.38.4 In-Reply-To: <20230203230455.1566166-1-aperez@igalia.com> References: <20230203230455.1566166-1-aperez@igalia.com> Message-ID: <20230204114915.GB14083@scaer> Adrian, All, On 2023-02-04 01:04 +0200, Adrian Perez de Castro spake thusly: > Bugfix release, with many security fixes, including (but not limited to) > patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. > > Release notes: > > https://wpewebkit.org/release/wpewebkit-2.38.4.html > > Accompanying security advisory: > > https://wpewebkit.org/security/WSA-2023-0001.html > > Signed-off-by: Adrian Perez de Castro Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/wpewebkit/wpewebkit.hash | 8 ++++---- > package/wpewebkit/wpewebkit.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash > index ccd928b3df..dcd082e045 100644 > --- a/package/wpewebkit/wpewebkit.hash > +++ b/package/wpewebkit/wpewebkit.hash > @@ -1,7 +1,7 @@ > -# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums > -md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz > -sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz > -sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz > +# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums > +md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz > +sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz > +sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz > > # Hashes for license files: > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk > index 4c50ed9955..34ee405de1 100644 > --- a/package/wpewebkit/wpewebkit.mk > +++ b/package/wpewebkit/wpewebkit.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WPEWEBKIT_VERSION = 2.38.3 > +WPEWEBKIT_VERSION = 2.38.4 > WPEWEBKIT_SITE = http://www.wpewebkit.org/releases > WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz > WPEWEBKIT_INSTALL_STAGING = YES > -- > 2.39.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 Feb 4 11:52:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 12:52:12 +0100 Subject: [Buildroot] [PATCH] package/dbus-broker: bump to release 33 In-Reply-To: <175cc1e7e72602b9c0e8d6b761cf72b375383189.1675421166.git.stefan@agner.ch> References: <175cc1e7e72602b9c0e8d6b761cf72b375383189.1675421166.git.stefan@agner.ch> Message-ID: <20230204115212.GC14083@scaer> Stefan, All, On 2023-02-03 11:46 +0100, Stefan Agner spake thusly: > This release contains mostly a bugfixes, with some improvements around > error handling for unimplemented functionality and resiliency against > runtime changes of dbus service-files. > > Signed-off-by: Stefan Agner > --- > package/dbus-broker/dbus-broker.hash | 2 +- > package/dbus-broker/dbus-broker.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash > index f6c2cbe160..89b27ddddc 100644 > --- a/package/dbus-broker/dbus-broker.hash > +++ b/package/dbus-broker/dbus-broker.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz > +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz > sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE > sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS > sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md Unfortunately, there are issues with licensing info: $ make dbus-broker-legal-info [...] ERROR: subprojects/libcstdaux-1/AUTHORS has wrong sha256 hash: ERROR: expected: 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 ERROR: got : e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 ERROR: Incomplete download, or man-in-the-middle (MITM) attack make[1]: *** [package/dbus-broker/dbus-broker.mk:71: dbus-broker-legal-info] Error 1 make: *** [Makefile:23: _all] Error 2 Can you look into that and resubmit the bump, please? Regards, Yann E. MORIN. > diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk > index e82b79220d..c4e3679a2e 100644 > --- a/package/dbus-broker/dbus-broker.mk > +++ b/package/dbus-broker/dbus-broker.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DBUS_BROKER_VERSION = 32 > +DBUS_BROKER_VERSION = 33 > DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz > DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) > > -- > 2.39.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 Feb 4 12:56:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 13:56:11 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/docker-engine: bump version to v23.0.0 In-Reply-To: <20230203034443.326513-2-christian@paral.in> References: <20230203034443.326513-1-christian@paral.in> <20230203034443.326513-2-christian@paral.in> Message-ID: <20230204125611.GD14083@scaer> Christian, All, On 2023-02-02 19:44 -0800, Christian Stewart via buildroot spake thusly: > This update requires a workaround for the non-standard vendor/ structure in the > docker-engine repository, which has an invalid vendor/modules.txt file. > > Removing the vendor/modules.txt file fixes the build error. > > Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > > The go download post-process script uses go mod init to create the go.mod file > which specifies a language version of go1.16 on default. Use go mod edit to > adjust the go.mod file to the required minimum version go1.19 for generic types > used by docker-engine. (Fixes a build error). Note that this changes the go.mod > language version and is not required to be equal to the current Go tool version. > > Note that as of v23.0.0 docker-engine expects containerd to be started by > systemd if --containerd= flag is set in dockerd.service, whereas in previous > versions containerd was started by the docker daemon as a sub-process. > > There is no sysv unit for containerd, but this is OK: in the Docker sysv init > file S60dockerd, we do not set the --containerd flag. The docker daemon will > start containerd as a sub-process automatically due to the absence of this flag. > > Signed-off-by: Christian Stewart > > --- > > v1 -> v2: > > - clarify commit message about containerd.service and sysv compat > - fix formatting in S60dockerd > - bundle commit into a series with required containerd changes > > Signed-off-by: Christian Stewart > --- > package/docker-engine/S60dockerd | 2 +- > package/docker-engine/docker-engine.hash | 2 +- > package/docker-engine/docker-engine.mk | 16 +++++++++++++++- > 3 files changed, 17 insertions(+), 3 deletions(-) > > diff --git a/package/docker-engine/S60dockerd b/package/docker-engine/S60dockerd > index def8bea149..7591f9fe66 100644 > --- a/package/docker-engine/S60dockerd > +++ b/package/docker-engine/S60dockerd > @@ -10,7 +10,7 @@ DAEMON_ARGS="" > do_start() { > echo -n "Starting $NAME: " > start-stop-daemon --start --quiet --background --make-pidfile \ > - --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \ > + --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \ TAB-to-space conversion. Although I personally prefer that, that is not the road we've decided to go down in Buildroot, see for reference: package/busybox/S01syslogd In any case, fixing/converting can adshouldbe done in its own patch. (You missed the TAB on line 35, by the way.) > && echo "OK" || echo "FAIL" > } > > diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash > index d15b1359cb..670cbd414b 100644 > --- a/package/docker-engine/docker-engine.hash > +++ b/package/docker-engine/docker-engine.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz > +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk > index 2a9b72ca78..208688cc43 100644 > --- a/package/docker-engine/docker-engine.mk > +++ b/package/docker-engine/docker-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DOCKER_ENGINE_VERSION = 20.10.22 > +DOCKER_ENGINE_VERSION = 23.0.0 > DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) > > DOCKER_ENGINE_LICENSE = Apache-2.0 > @@ -40,6 +40,7 @@ ifeq ($(BR2_INIT_SYSTEMD),y) > DOCKER_ENGINE_DEPENDENCIES += systemd > DOCKER_ENGINE_TAGS += systemd journald > endif > + Spurious empty line, although it does make the code look nicer. Maybe move that with the sysv-init refactoring/cleanup? > ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y) > DOCKER_ENGINE_TAGS += experimental > endif > @@ -62,6 +63,19 @@ else > DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs > endif > > +# update the go module version to go1.19 > +# docker-engine does not use go modules > +# remove the conflicting vendor/modules.txt > +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > +define DOCKER_ENGINE_CONFIGURE_CMDS > + if [ -f $(@D)/vendor/modules.txt ]; then \ > + rm $(@D)/vendor/modules.txt; \ > + fi No need to test for the presence of a file to remove it; just forcibly remove it: rm -f $(@D)/vendor/modules.txt Regards, Yann E. MORIN. > + cd $(@D); \ > + $(HOST_GO_HOST_ENV) $(DOCKER_ENGINE_GO_ENV) \ > + $(GO_BIN) mod edit -go=1.19 go.mod > +endef > + > DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) > > define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD > -- > 2.39.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 sorganov at gmail.com Sat Feb 4 13:47:09 2023 From: sorganov at gmail.com (Sergey Organov) Date: Sat, 4 Feb 2023 16:47:09 +0300 Subject: [Buildroot] [PATCH] package/openvpn: get rid of -e in S60openvpn shebang Message-ID: <20230204134709.4160596-1-sorganov@gmail.com> The -e switch makes the script terminate on error from start-stop-daemon, rendering unreachable the code that checks the exit status. There is no need in the -e switch in the first place either, as the script takes care of errors handling. Signed-off-by: Sergey Organov --- package/openvpn/S60openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn index f097cf11ec..00156c80db 100644 --- a/package/openvpn/S60openvpn +++ b/package/openvpn/S60openvpn @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # # Original version by Robert Leslie # , edited by iwj and cs base-commit: c7ea83dd2df315ba4f492a9ef6b24152ba4cc4f3 -- 2.30.1 From peter at korsgaard.com Sat Feb 4 14:01:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 04 Feb 2023 15:01:48 +0100 Subject: [Buildroot] [PATCH 1/2] package/ell: bump to version 0.56 In-Reply-To: <20230201023756.1418443-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 19:37:55 -0700") References: <20230201023756.1418443-1-james.hilliard1@gmail.com> Message-ID: <87tu011qcz.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 14:03:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 04 Feb 2023 15:03:35 +0100 Subject: [Buildroot] [PATCH 2/2] package/iwd: bump to version 2.2 In-Reply-To: <20230201023756.1418443-2-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 19:37:56 -0700") References: <20230201023756.1418443-1-james.hilliard1@gmail.com> <20230201023756.1418443-2-james.hilliard1@gmail.com> Message-ID: <87pmap1qa0.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. There looks to be a 2.3 release available with some bugfixes. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 14:00:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 15:00:06 +0100 Subject: [Buildroot] [git commit] package/ell: bump to version 0.56 Message-ID: <20230204140414.9F79483242@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=607eafa2cd0656929db4bc8a743b28b0c48df8e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 68832c3201..c0f1731676 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 a7d0df846af839bbea1b80f292166371070328854b3fa785b5c607fe600552ad ell-0.53.tar.xz +sha256 58eb8b2b64087f7479d5db6a830a0656c536d93e5f11d4c9a4443ce8760a1b63 ell-0.56.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index b27d6feb65..994b0e19f0 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.53 +ELL_VERSION = 0.56 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 Sat Feb 4 14:00:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 15:00:18 +0100 Subject: [Buildroot] [git commit] package/iwd: bump to version 2.2 Message-ID: <20230204140414.A897D82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13de1138f89909890e945b6e433e64ebbaab01ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 e7971cd637..be048b3da6 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 9fd13512dc27d83efb8d341f7df98f5488f70131686021fcd0d93fc97af013b8 iwd-1.30.tar.xz +sha256 dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570 iwd-2.2.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 5ffbde334e..b0a2f6e9ed 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.30 +IWD_VERSION = 2.2 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Sat Feb 4 14:30:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 15:30:48 +0100 Subject: [Buildroot] [git commit] package/openvpn: get rid of -e in S60openvpn shebang Message-ID: <20230204143633.76B5E83483@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=28ca1da23433d58112304c191c319ac11edc5d77 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The -e switch makes the script terminate on error from start-stop-daemon, rendering unreachable the code that checks the exit status. There is no need in the -e switch in the first place either, as the script takes care of errors handling. Signed-off-by: Sergey Organov Signed-off-by: Yann E. MORIN --- package/openvpn/S60openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn index f097cf11ec..00156c80db 100644 --- a/package/openvpn/S60openvpn +++ b/package/openvpn/S60openvpn @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # # Original version by Robert Leslie # , edited by iwj and cs From yann.morin.1998 at free.fr Sat Feb 4 14:39:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 15:39:48 +0100 Subject: [Buildroot] [PATCH] package/openvpn: get rid of -e in S60openvpn shebang In-Reply-To: <20230204134709.4160596-1-sorganov@gmail.com> References: <20230204134709.4160596-1-sorganov@gmail.com> Message-ID: <20230204143948.GB24755@scaer> Sergey, All, On 2023-02-04 16:47 +0300, Sergey Organov spake thusly: > The -e switch makes the script terminate on error from > start-stop-daemon, rendering unreachable the code that checks the exit > status. > > There is no need in the -e switch in the first place either, as the > script takes care of errors handling. > > Signed-off-by: Sergey Organov Applied to master, thanks. However, this script has a lot of coding style issues: $ ./utils/check-package package/openvpn/S60openvpn:14: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/openvpn/S60openvpn:15: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/openvpn/S60openvpn:16: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/openvpn/S60openvpn:17: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/openvpn/S60openvpn:18: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/openvpn/S60openvpn:21: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) [...] package/openvpn/S60openvpn:0: DAEMON variable not defined (http://nightly.buildroot.org/#adding-packages-start-script) Could you look into bringing this old script up to today's standards, please? Regards, Yann E. MORIN. > --- > package/openvpn/S60openvpn | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn > index f097cf11ec..00156c80db 100644 > --- a/package/openvpn/S60openvpn > +++ b/package/openvpn/S60openvpn > @@ -1,4 +1,4 @@ > -#!/bin/sh -e > +#!/bin/sh > # > # Original version by Robert Leslie > # , edited by iwj and cs > > base-commit: c7ea83dd2df315ba4f492a9ef6b24152ba4cc4f3 > -- > 2.30.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 Feb 4 14:52:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 15:52:57 +0100 Subject: [Buildroot] [git commit] package/libarchive: Only add "iconv" to the .pc file if needed Message-ID: <20230204145402.EDB69835C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9525bc7e64e8f44c31ab9dfd3f516ecb35982429 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with fwup raised since bump to version 3.6.2 in commit 380341b249175382691f268de4b41d3843ff0acc and https://github.com/libarchive/libarchive/commit/a83f3d327aefe8d628230f326621b014d82f55b4 checking for pkg-config... /tmp/instance-19/output-1/host/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for ARCHIVE... no configure: error: Requires libarchive. Libarchive must be built with zlib support. Fixes: http://autobuild.buildroot.net/results/f5d/f5d549fb4f08156ba5952ce75926f7fd2242bfdf/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...1-Only-add-iconv-to-the-pc-file-if-needed.patch | 44 ++++++++++++++++++++++ package/libarchive/libarchive.mk | 4 ++ 2 files changed, 48 insertions(+) diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch new file mode 100644 index 0000000000..c93944f789 --- /dev/null +++ b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch @@ -0,0 +1,44 @@ +From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 +From: Peter Pentchev +Date: Thu, 29 Dec 2022 00:04:40 +0200 +Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) + +Hi, + +Thanks for writing and maintaining libarchive! + +What do you think about this trivial change that does not add "iconv" to +the pkg-config file's list of required packages unless it is actually +needed? On at least Debian GNU/Linux systems, the iconv(3) function is +part of the system C library and there is no Debian package that +installs an iconv.pc file, so I had to make this change to the Debian +package of libarchive. + +Thanks again, and keep up the great work! + +G'luck, +Peter + +Downloaded from upstream commit: +https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99bff20d1..e2715cfde 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then + AC_CHECK_HEADERS([localcharset.h]) + am_save_LIBS="$LIBS" + LIBS="${LIBS} ${LIBICONV}" +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" ++ if test -n "$LIBICONV"; then ++ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" ++ fi + AC_CHECK_FUNCS([locale_charset]) + LIBS="${am_save_LIBS}" + if test "x$ac_cv_func_locale_charset" != "xyes"; then diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cfc148d01d..cd7c13fbed 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -11,6 +11,10 @@ LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING LIBARCHIVE_CPE_ID_VENDOR = libarchive +# We're patching configure.ac +LIBARCHIVE_AUTORECONF = YES +# needed for autoreconf +LIBARCHIVE_DEPENDENCIES += host-pkgconf ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) From yann.morin.1998 at free.fr Sat Feb 4 14:54:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 15:54:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: do not add iconv for Requires.private In-Reply-To: References: <20221218130225.353325-1-fontaine.fabrice__19944.8251792759$1671368580$gmane$org@gmail.com> Message-ID: <20230204145438.GC24755@scaer> Fabrice, All, On 2022-12-29 18:53 +0100, Bernd Kuhls spake thusly: > Am Sun, 18 Dec 2022 14:02:25 +0100 schrieb Fabrice Fontaine: > > > Fix the following build failure with fwup raised since bump to version > > 3.6.2 in commit 380341b249175382691f268de4b41d3843ff0acc and > > https://github.com/libarchive/libarchive/commit/ > a83f3d327aefe8d628230f326621b014d82f55b4: > > > > checking for pkg-config... /tmp/instance-19/output-1/host/bin/pkg-config > > checking pkg-config is at least version 0.9.0... yes checking for > > ARCHIVE... no configure: error: Requires libarchive. Libarchive must be > > built with zlib support. > > Hi, > > upstream committed a different fix: > http://patchwork.ozlabs.org/project/buildroot/patch/ > 20221229175254.224876-1-bernd.kuhls at t-online.de/ I have applied that patch from Bernd instead, 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 Sat Feb 4 14:55:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 4 Feb 2023 15:55:14 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libarchive: Only add "iconv" to the .pc file if needed In-Reply-To: <20230201181005.731564-1-bernd.kuhls@t-online.de> References: <20230201181005.731564-1-bernd.kuhls@t-online.de> Message-ID: <20230204145514.GD24755@scaer> Bernd, All, On 2023-02-01 19:10 +0100, Bernd Kuhls spake thusly: > Fix the following build failure with fwup raised since bump to version > 3.6.2 in commit 380341b249175382691f268de4b41d3843ff0acc and > https://github.com/libarchive/libarchive/commit/a83f3d327aefe8d628230f326621b014d82f55b4 > > checking for pkg-config... /tmp/instance-19/output-1/host/bin/pkg-config > checking pkg-config is at least version 0.9.0... yes > checking for ARCHIVE... no > configure: error: Requires libarchive. Libarchive must be built with zlib support. > > Fixes: > http://autobuild.buildroot.net/results/f5d/f5d549fb4f08156ba5952ce75926f7fd2242bfdf/ > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > v2: added dependency to host-pkgconf to fix autoconf error > > ...y-add-iconv-to-the-pc-file-if-needed.patch | 44 +++++++++++++++++++ > package/libarchive/libarchive.mk | 4 ++ > 2 files changed, 48 insertions(+) > create mode 100644 package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > > diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > new file mode 100644 > index 0000000000..c93944f789 > --- /dev/null > +++ b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > @@ -0,0 +1,44 @@ > +From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 > +From: Peter Pentchev > +Date: Thu, 29 Dec 2022 00:04:40 +0200 > +Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) > + > +Hi, > + > +Thanks for writing and maintaining libarchive! > + > +What do you think about this trivial change that does not add "iconv" to > +the pkg-config file's list of required packages unless it is actually > +needed? On at least Debian GNU/Linux systems, the iconv(3) function is > +part of the system C library and there is no Debian package that > +installs an iconv.pc file, so I had to make this change to the Debian > +package of libarchive. > + > +Thanks again, and keep up the great work! > + > +G'luck, > +Peter > + > +Downloaded from upstream commit: > +https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 > + > +Signed-off-by: Bernd Kuhls > +--- > + configure.ac | 4 +++- > + 1 file changed, 3 insertions(+), 1 deletion(-) > + > +diff --git a/configure.ac b/configure.ac > +index 99bff20d1..e2715cfde 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then > + AC_CHECK_HEADERS([localcharset.h]) > + am_save_LIBS="$LIBS" > + LIBS="${LIBS} ${LIBICONV}" > +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" > ++ if test -n "$LIBICONV"; then > ++ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" > ++ fi > + AC_CHECK_FUNCS([locale_charset]) > + LIBS="${am_save_LIBS}" > + if test "x$ac_cv_func_locale_charset" != "xyes"; then > diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk > index cfc148d01d..cd7c13fbed 100644 > --- a/package/libarchive/libarchive.mk > +++ b/package/libarchive/libarchive.mk > @@ -11,6 +11,10 @@ LIBARCHIVE_INSTALL_STAGING = YES > LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 > LIBARCHIVE_LICENSE_FILES = COPYING > LIBARCHIVE_CPE_ID_VENDOR = libarchive > +# We're patching configure.ac > +LIBARCHIVE_AUTORECONF = YES > +# needed for autoreconf > +LIBARCHIVE_DEPENDENCIES += host-pkgconf > > ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) > ifeq ($(BR2_STATIC_LIBS),y) > -- > 2.39.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 ryanbarnett3 at gmail.com Sat Feb 4 19:54:27 2023 From: ryanbarnett3 at gmail.com (Ryan Barnett) Date: Sat, 4 Feb 2023 13:54:27 -0600 Subject: [Buildroot] [PATCH] package/python-pytest: remove runtime dependency on python-toml In-Reply-To: <20230202152743.3916949-1-arnout@mind.be> References: <20230202152743.3916949-1-arnout@mind.be> Message-ID: On Thu, Feb 2, 2023 at 9:28 AM Arnout Vandecappelle wrote: > > Since version 7.2 [1], with Python 3.11+ pytest no longer uses tomli to > parse pyproject.toml but instead uses tomllib which is part of Python > itself [2]. Note that toml was replaced with tomli in version 7.0, so > the dependency was anyway incorrect. > > Note that tomllib is unconditionally installed as part of Python 3.11, > there is no PYTHON3_LIBTOML option or anything like that that needs to > be selected. > > [1] https://docs.pytest.org/en/latest/changelog.html#pytest-7-2-0-2022-10-23 > [2] https://github.com/pytest-dev/pytest/pull/9741 > > Signed-off-by: Arnout Vandecappelle Reviewed-by: Ryan Barnett > --- > I can't be bother with sending a patch changing toml to tomli for > 2022.11 - it's going EOL in two months anyway, and apparently nobody > noticed... > --- > package/python-pytest/Config.in | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in > index c3956c76d2..9bbc9ea2d2 100644 > --- a/package/python-pytest/Config.in > +++ b/package/python-pytest/Config.in > @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_PYTEST > select BR2_PACKAGE_PYTHON_PACKAGING # runtime > select BR2_PACKAGE_PYTHON_PLUGGY # runtime > select BR2_PACKAGE_PYTHON_PY # runtime > - select BR2_PACKAGE_PYTHON_TOML # runtime > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > help > pytest is a framework that makes building simple and scalable > -- > 2.39.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Sat Feb 4 20:37:50 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 4 Feb 2023 21:37:50 +0100 Subject: [Buildroot] [PATCH] package/libfuse3: bump to version 3.13.1 Message-ID: <20230204203750.513283-1-giulio.benetti@benettiengineering.com> Fixes: http://autobuild.buildroot.net/results/a98/a984d275d949e8dc989870d2d2b6f6c7168d52bb/ Signed-off-by: Giulio Benetti --- package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index 691bfbc9d6..f697f4ad3f 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 224544214204eb348b548d6faa7a9bc91b053aacfc92e8b5da3f478c76ae4a03 libfuse3-3.13.0.tar.gz +sha256 96399b09b91bc717a9e96ffea660d611e6a342547c1abd4d0e858b3dca9d5a13 libfuse3-3.13.1.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index d94f7d3d3a..a2e9775868 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.13.0 +LIBFUSE3_VERSION = 3.13.1 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Sat Feb 4 20:40:50 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 4 Feb 2023 21:40:50 +0100 Subject: [Buildroot] [PATCH] package/libfuse3: fix build failure due to missing __off64_t in musl In-Reply-To: <20230131153608.434059-1-giulio.benetti@benettiengineering.com> References: <20230131153608.434059-1-giulio.benetti@benettiengineering.com> Message-ID: This patch is superseded by this one: https://patchwork.ozlabs.org/project/buildroot/patch/20230204203750.513283-1-giulio.benetti at benettiengineering.com/ Best regards -- Giulio Benetti Benetti Engineering sas On 31/01/23 16:36, Giulio Benetti wrote: > Add upstream patch[0] that substitute __off64_t with off64_t that is > present in glibc, uclibc and musl. > > [0]: https://github.com/libfuse/libfuse/commit/19d95c0e701076407dc1f3cfd39e12e28b332927 > > Fixes: > http://autobuild.buildroot.net/results/a98/a984d275d949e8dc989870d2d2b6f6c7168d52bb/ > > Signed-off-by: Giulio Benetti > --- > .../0001-use-off_t-over-__off64_t.patch | 56 +++++++++++++++++++ > 1 file changed, 56 insertions(+) > create mode 100644 package/libfuse3/0001-use-off_t-over-__off64_t.patch > > diff --git a/package/libfuse3/0001-use-off_t-over-__off64_t.patch b/package/libfuse3/0001-use-off_t-over-__off64_t.patch > new file mode 100644 > index 0000000000..ce29ba0f44 > --- /dev/null > +++ b/package/libfuse3/0001-use-off_t-over-__off64_t.patch > @@ -0,0 +1,56 @@ > +From 19d95c0e701076407dc1f3cfd39e12e28b332927 Mon Sep 17 00:00:00 2001 > +From: psykose > +Date: Sat, 14 Jan 2023 21:31:56 +0000 > +Subject: [PATCH] use off_t over __off64_t > + > +when -D_FILE_OFFSET_BITS=64 is defined, the off_t type is 64 bits wide > +already. the fuse_common.h header already checks for this, and errors > +when it is not, so be consistent with all the other uses of off_t. > + > +some libcs like musl do not have a 32-bit off_t type, and don't define > +__off64_t. > + > +Signed-off-by: Giulio Benetti > +--- > + example/hello_ll_uds.c | 4 ++-- > + include/fuse_lowlevel.h | 8 ++++---- > + 2 files changed, 6 insertions(+), 6 deletions(-) > + > +diff --git a/example/hello_ll_uds.c b/example/hello_ll_uds.c > +index c1f64d7..f291fed 100644 > +--- a/example/hello_ll_uds.c > ++++ b/example/hello_ll_uds.c > +@@ -277,8 +277,8 @@ static ssize_t stream_read(int fd, void *buf, size_t buf_len, void *userdata) { > + return (res == -1) ? res : (res + prev_res); > + } > + > +-static ssize_t stream_splice_send(int fdin, __off64_t *offin, int fdout, > +- __off64_t *offout, size_t len, > ++static ssize_t stream_splice_send(int fdin, off_t *offin, int fdout, > ++ off_t *offout, size_t len, > + unsigned int flags, void *userdata) { > + (void)userdata; > + > +diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h > +index ff0d966..96088d7 100644 > +--- a/include/fuse_lowlevel.h > ++++ b/include/fuse_lowlevel.h > +@@ -130,11 +130,11 @@ struct fuse_forget_data { > + struct fuse_custom_io { > + ssize_t (*writev)(int fd, struct iovec *iov, int count, void *userdata); > + ssize_t (*read)(int fd, void *buf, size_t buf_len, void *userdata); > +- ssize_t (*splice_receive)(int fdin, __off64_t *offin, int fdout, > +- __off64_t *offout, size_t len, > ++ ssize_t (*splice_receive)(int fdin, off_t *offin, int fdout, > ++ off_t *offout, size_t len, > + unsigned int flags, void *userdata); > +- ssize_t (*splice_send)(int fdin, __off64_t *offin, int fdout, > +- __off64_t *offout, size_t len, > ++ ssize_t (*splice_send)(int fdin, off_t *offin, int fdout, > ++ off_t *offout, size_t len, > + unsigned int flags, void *userdata); > + }; > + > +-- > +2.34.1 > + From sorganov at gmail.com Sat Feb 4 20:52:21 2023 From: sorganov at gmail.com (Sergey Organov) Date: Sat, 04 Feb 2023 23:52:21 +0300 Subject: [Buildroot] [PATCH] package/openvpn: get rid of -e in S60openvpn shebang In-Reply-To: <20230204143948.GB24755@scaer> (Yann E. MORIN's message of "Sat, 4 Feb 2023 15:39:48 +0100") References: <20230204134709.4160596-1-sorganov@gmail.com> <20230204143948.GB24755@scaer> Message-ID: <875ych17cq.fsf@osv.gnss.ru> "Yann E. MORIN" writes: > Sergey, All, > > On 2023-02-04 16:47 +0300, Sergey Organov spake thusly: >> The -e switch makes the script terminate on error from >> start-stop-daemon, rendering unreachable the code that checks the exit >> status. >> >> There is no need in the -e switch in the first place either, as the >> script takes care of errors handling. >> >> Signed-off-by: Sergey Organov > > Applied to master, thanks. Thank you in turn! > > However, this script has a lot of coding style issues: > > $ ./utils/check-package > package/openvpn/S60openvpn:14: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) > package/openvpn/S60openvpn:15: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) > package/openvpn/S60openvpn:16: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) > package/openvpn/S60openvpn:17: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) > package/openvpn/S60openvpn:18: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) > package/openvpn/S60openvpn:21: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) > [...] > package/openvpn/S60openvpn:0: DAEMON variable not defined (http://nightly.buildroot.org/#adding-packages-start-script) > > Could you look into bringing this old script up to today's standards, > please? Sorry, probably not me, as I'm currently using rather old buildroot version, and it'd be problematic for me to check such changes against the mainline. Best regards, -- Sergey Organov From peter at korsgaard.com Sat Feb 4 22:33:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 04 Feb 2023 23:33:03 +0100 Subject: [Buildroot] [PATCH] package/sexpect: requires MMU In-Reply-To: <00c897a75f46008a2e4ddfa3a17eeef7641420a6.1675240194.git.baruch@tkos.co.il> (Baruch Siach via buildroot's message of "Wed, 1 Feb 2023 10:29:54 +0200") References: <00c897a75f46008a2e4ddfa3a17eeef7641420a6.1675240194.git.baruch@tkos.co.il> Message-ID: <87leld12ow.fsf@dell.be.48ers.dk> >>>>> "Baruch" == Baruch Siach via buildroot writes: > Disable when MMU is not available for target. > Fixes: > http://autobuild.buildroot.net/results/a2b69fdf67d520aa4d2718bd688d88d102842cdf > Signed-off-by: Baruch Siach Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 22:33:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 04 Feb 2023 23:33:03 +0100 Subject: [Buildroot] [PATCH] package/sexpect: requires MMU In-Reply-To: <00c897a75f46008a2e4ddfa3a17eeef7641420a6.1675240194.git.baruch@tkos.co.il> (Baruch Siach via buildroot's message of "Wed, 1 Feb 2023 10:29:54 +0200") References: <00c897a75f46008a2e4ddfa3a17eeef7641420a6.1675240194.git.baruch@tkos.co.il> Message-ID: <87leld12ow.fsf@dell.be.48ers.dk> >>>>> "Baruch" == Baruch Siach via buildroot writes: > Disable when MMU is not available for target. > Fixes: > http://autobuild.buildroot.net/results/a2b69fdf67d520aa4d2718bd688d88d102842cdf > Signed-off-by: Baruch Siach Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 22:35:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 04 Feb 2023 23:35:23 +0100 Subject: [Buildroot] [PATCH] package/luaposix: bump to version 36.1 In-Reply-To: <20230201090224.17033-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 1 Feb 2023 10:02:24 +0100") References: <20230201090224.17033-1-francois.perrad@gadz.org> Message-ID: <87cz6p12l0.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > Signed-off-by: Francois Perrad Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 22:32:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:32:40 +0100 Subject: [Buildroot] [git commit] package/sexpect: requires MMU Message-ID: <20230204223549.8A9C8836A3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9717b303683ba7ec035de004c6f2ddd195d07808 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable when MMU is not available for target. Fixes: http://autobuild.buildroot.net/results/a2b69fdf67d520aa4d2718bd688d88d102842cdf Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/sexpect/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sexpect/Config.in b/package/sexpect/Config.in index bdf5c3bbf5..e558af26f0 100644 --- a/package/sexpect/Config.in +++ b/package/sexpect/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SEXPECT bool "sexpect" + depends on BR2_USE_MMU # fork() help sexpect is another implementation of Expect which is specifically designed for Shell scripts From peter at korsgaard.com Sat Feb 4 22:33:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:33:17 +0100 Subject: [Buildroot] [git commit] package/luaposix: bump to version 36.1 Message-ID: <20230204223549.932BB835AB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2c3e8ea8b2107ac514baddaed97921112a90cb7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/luaposix/luaposix.hash | 2 +- package/luaposix/luaposix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash index fc0b5fa747..2d54a6901e 100644 --- a/package/luaposix/luaposix.hash +++ b/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e0fcb4996f76aa49ae3e5edf69978171091e3d69d5de5589d591d227f8a427c1 luaposix-36.0.tar.gz +sha256 7944c2b4fbcef0667d407302740d87645325e751fd8d819f2b253c5d9ad0d497 luaposix-36.1.tar.gz sha256 ea0fdaae50b0d31a81c2c99f4354264783c71043fd40522feaa40eecc069599b LICENSE diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index 1a537defc4..d17c8188b5 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 36.0 +LUAPOSIX_VERSION = 36.1 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Feb 4 22:43:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 04 Feb 2023 23:43:43 +0100 Subject: [Buildroot] [PATCH 01/13] package/libnice: bump to version 0.1.21 In-Reply-To: <20230201051658.383420-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:46 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> Message-ID: <878rhd1274.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:18:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:18:41 +0100 Subject: [Buildroot] [PATCH 02/13] package/gstreamer1: bump to version 1.22.0 In-Reply-To: <20230201051658.383420-2-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:47 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-2-james.hilliard1@gmail.com> Message-ID: <874js110ku.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:18:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:18:47 +0100 Subject: [Buildroot] [PATCH 04/13] package/gst1-plugins-good: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-4-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:49 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-4-james.hilliard1@gmail.com> Message-ID: <87zg9tyq7c.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Add new xingmux config option. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:18:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:18:50 +0100 Subject: [Buildroot] [PATCH 05/13] package/gst1-plugins-bad: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-5-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:50 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-5-james.hilliard1@gmail.com> Message-ID: <87v8khyq79.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:18:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:18:56 +0100 Subject: [Buildroot] [PATCH 03/13] package/gst1-plugins-base: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-3-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:48 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-3-james.hilliard1@gmail.com> Message-ID: <87r0v5yq73.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > The videoconvert and videoscale plugins have been combined into > the new videoconvertscale plugin. > Rework config options using videoconvert/videoscale to use the new > videoconvertscale option. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:19:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:01 +0100 Subject: [Buildroot] [PATCH 06/13] package/gst1-plugins-ugly: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-6-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:51 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-6-james.hilliard1@gmail.com> Message-ID: <87mt5tyq6y.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Remove xingmux config option which has been moved to the > gst1-plugins-good package. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:19:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:08 +0100 Subject: [Buildroot] [PATCH 08/13] package/gst1-libav: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-8-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:53 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-8-james.hilliard1@gmail.com> Message-ID: <87edr5yq6r.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:19:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:04 +0100 Subject: [Buildroot] [PATCH 07/13] package/gst1-devtools: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-7-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:52 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-7-james.hilliard1@gmail.com> Message-ID: <87ilghyq6v.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:19:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:22 +0100 Subject: [Buildroot] [PATCH 09/13] package/gst1-vaapi: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-9-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:54 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-9-james.hilliard1@gmail.com> Message-ID: <87a61tyq6d.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Update config option names and dependency requirements. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:19:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:25 +0100 Subject: [Buildroot] [PATCH 12/13] package/gst-omx: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-12-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:57 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-12-james.hilliard1@gmail.com> Message-ID: <875ychyq6a.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 22:42:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:42:23 +0100 Subject: [Buildroot] [git commit] package/libnice: bump to version 0.1.21 Message-ID: <20230204231934.37FA0836A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c392e8b76f73d2b8ebfba2117ed6b03d902b8243 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/libnice/libnice.hash | 2 +- package/libnice/libnice.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnice/libnice.hash b/package/libnice/libnice.hash index 83b28a9ad9..cf6d825f83 100644 --- a/package/libnice/libnice.hash +++ b/package/libnice/libnice.hash @@ -1,5 +1,5 @@ # Locally computed after checking pgp signature -sha256 6747af710998cf708a2e8ceef51cccd181373d94201dd4b8d40797a070ed47cc libnice-0.1.19.tar.gz +sha256 72e73a2acf20f59093e21d5601606e405873503eb35f346fa621de23e99b3b39 libnice-0.1.21.tar.gz # Hash for license files: sha256 9246b2ee8b1db30cf03d5d9719ad8bb5edce1cadc85f8cfef319c23d24d950b5 COPYING diff --git a/package/libnice/libnice.mk b/package/libnice/libnice.mk index 2b223bedd3..56ee35e452 100644 --- a/package/libnice/libnice.mk +++ b/package/libnice/libnice.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNICE_VERSION = 0.1.19 -LIBNICE_SITE = http://nice.freedesktop.org/releases +LIBNICE_VERSION = 0.1.21 +LIBNICE_SITE = https://libnice.freedesktop.org/releases LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL LIBNICE_DEPENDENCIES = libglib2 host-pkgconf From peter at korsgaard.com Sat Feb 4 22:50:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:50:54 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bad: bump version to 1.22.0 Message-ID: <20230204231934.67545836A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=895840edd2784492d9b7066330b43842b703343b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 c8789a707d..90b3a18982 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.4.tar.xz.sha256sum -sha256 a1a3f53b3604d9a04fdd0bf9a1a616c3d2dab5320489e9ecee1178e81e33a16a gst-plugins-bad-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.0.tar.xz.sha256sum +sha256 3c9d9300f5f4fb3e3d36009379d1fb6d9ecd79c1a135df742b8a68417dd663a1 gst-plugins-bad-1.22.0.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 14710a2501..8f11ce6b37 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.4 +GST1_PLUGINS_BAD_VERSION = 1.22.0 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 Sat Feb 4 22:51:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:51:14 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-ugly: bump version to 1.22.0 Message-ID: <20230204231934.74341836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f1fef1499427d508363c29920468e8f5a495709 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove xingmux config option which has been moved to the gst1-plugins-good package. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ package/gstreamer1/gst1-plugins-ugly/Config.in | 5 ----- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 8 +------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3fff2b1ddd..1c5af2652a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX + bool "xingmux moved" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX + help + The xingmux option has been moved to gst1-plugins-good. + config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE bool "videoscale removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in index ba19989892..54766ffa8c 100644 --- a/package/gstreamer1/gst1-plugins-ugly/Config.in +++ b/package/gstreamer1/gst1-plugins-ugly/Config.in @@ -26,11 +26,6 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB help DVD subtitle parser and decoder -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX - bool "xingmux" - help - Add XING tags to mpeg audio files - config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA bool "realmedia" help diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 4ec29e6894..21579216df 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.4.tar.xz.sha256sum -sha256 5c9ec6bab96517e438b3f9bae0ceb84d3436f3da9bbe180cf4d28e32a7251b59 gst-plugins-ugly-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz.sha256sum +sha256 a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c gst-plugins-ugly-1.22.0.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 20382719c3..9f16fa3da8 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.4 +GST1_PLUGINS_UGLY_VERSION = 1.22.0 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 @@ -51,12 +51,6 @@ else GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=enabled -else -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=enabled else From peter at korsgaard.com Sat Feb 4 23:05:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:05:47 +0100 Subject: [Buildroot] [git commit] package/gst1-libav: bump version to 1.22.0 Message-ID: <20230204231934.89D37836B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e8f9b34f336da6c50bb7f854f8b3921b31d3398 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 78f5b5bb07..c2c58ab2fe 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.4.tar.xz.sha256sum -sha256 04ccbdd58fb31dd94098da599209834a0e7661638c5703381dd0a862c56fc532 gst-libav-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.0.tar.xz.sha256sum +sha256 0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1 gst-libav-1.22.0.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index a867af5147..d4b3873af1 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.4 +GST1_LIBAV_VERSION = 1.22.0 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 Sat Feb 4 22:44:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:44:03 +0100 Subject: [Buildroot] [git commit] package/gstreamer1: bump to version 1.22.0 Message-ID: <20230204231934.42FDF836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e30ce907d58e5f675704545599ca77ce2035acd2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 5fb52606fe..db0ed5bede 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.4.tar.xz.sha256sum -sha256 67c1edf8c3c339cda5dde85f4f7b953bb9607c2d13ae970e2491c5c4c055ef5f gstreamer-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.0.tar.xz.sha256sum +sha256 78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09 gstreamer-1.22.0.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 16c016b145..09d1a10ce7 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.20.4 +GSTREAMER1_VERSION = 1.22.0 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 4 23:06:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:06:00 +0100 Subject: [Buildroot] [git commit] package/gst1-vaapi: bump version to 1.22.0 Message-ID: <20230204231934.93ABC836A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33d4c226e582f6c0086431c4d9154e462cb3cf34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update config option names and dependency requirements. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 37 +++++++++++++++++++++------ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 5baaa4dfb7..6dec625c93 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.4.tar.xz.sha256sum -sha256 ab12596144c05506e9782374c5d2cdfb3069fca89908d6de360d947bb77fd06a gstreamer-vaapi-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.0.tar.xz.sha256sum +sha256 593ccad19f88e5fa29f40f98356c007806bd535828707b1406944d16a90bdff5 gstreamer-vaapi-1.22.0.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 bd6c16be3e..3d9eb91ffb 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.4 +GST1_VAAPI_VERSION = 1.22.0 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+ @@ -18,19 +18,40 @@ GST1_VAAPI_DEPENDENCIES += \ libdrm GST1_VAAPI_CONF_OPTS += \ - -Dwith_drm=yes \ - -Dwith_x11=no \ - -Dwith_glx=no \ - -Dwith_wayland=no \ - -Dwith_egl=no \ + -Ddrm=enabled \ + -Degl=enabled \ -Dexamples=disabled \ -Dtests=disabled \ -Ddoc=disabled ifeq ($(BR2_PACKAGE_GST1_VAAPI_ENCODERS),y) -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=yes +GST1_VAAPI_CONF_OPTS += -Dencoders=enabled else -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=no +GST1_VAAPI_CONF_OPTS += -Dencoders=disabled +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) +GST1_VAAPI_CONF_OPTS += -Degl=enabled +GST1_VAAPI_DEPENDENCIES += libegl +else +GST1_VAAPI_CONF_OPTS += -Degl=disabled +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +GST1_VAAPI_CONF_OPTS += -Dwayland=enabled +else +GST1_VAAPI_CONF_OPTS += -Dwayland=disabled +endif + +ifeq ($(BR2_PACKAGE_XORG7),y) +GST1_VAAPI_CONF_OPTS += -Dx11=enabled +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +GST1_VAAPI_CONF_OPTS += -Dglx=enabled +else +GST1_VAAPI_CONF_OPTS += -Dglx=disabled +endif +else +GST1_VAAPI_CONF_OPTS += -Dx11=disabled -Dglx=disabled endif $(eval $(meson-package)) From peter at korsgaard.com Sat Feb 4 23:06:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:06:39 +0100 Subject: [Buildroot] [git commit] package/gst1-rtsp-server: bump version to 1.22.0 Message-ID: <20230204231934.9D6F9836A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbca109741661d39d7eeaf7ea0e2f25ecbd3bfb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 b6a31f8796..f37e7bb292 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.4.tar.xz.sha256sum -sha256 88d9ef634e59aeb8cc183ad5ae444557c5a88dd49d833b9072bc6e1fae6a3d7d gst-rtsp-server-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.0.tar.xz.sha256sum +sha256 aea24eeb59ee5fadfac355de2f7cecb51966c3e147e5ad7cfb4c314f1a4086ed gst-rtsp-server-1.22.0.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 0b18c1fcf8..6b4bd49fde 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.4 +GST1_RTSP_SERVER_VERSION = 1.22.0 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 Sat Feb 4 23:07:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:07:18 +0100 Subject: [Buildroot] [git commit] package/gstreamer1-editing-services: bump version to 1.22.0 Message-ID: <20230204231934.A6DC2836A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abfea72d452b1279244f4cc33c2919ea32719306 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a patch fixing an incorrect gstreamer-validate-1.0 dependency name. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...ix-gstreamer-validate-1.0-dependency-name.patch | 35 ++++++++++++++++++++++ .../gstreamer1-editing-services.hash | 4 +-- .../gstreamer1-editing-services.mk | 2 +- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch b/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch new file mode 100644 index 0000000000..6c190d3727 --- /dev/null +++ b/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch @@ -0,0 +1,35 @@ +From c3edd999195445319ea619b6d719d7743f5b560d Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 31 Jan 2023 21:38:09 -0700 +Subject: [PATCH] Fix gstreamer-validate-1.0 dependency name + +The gst-devtools project generates gstreamer-validate-1.0.pc, this +must match the dependency in gst-editing-services for detection +to work properly. + +Fixes: +Run-time dependency gst-validate-1.0 found: NO (tried pkgconfig and cmake) + +Signed-off-by: James Hilliard +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3859] +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index bdc47f5d8b..b949f55317 100644 +--- a/meson.build ++++ b/meson.build +@@ -110,7 +110,7 @@ if host_machine.system() != 'windows' + endif + gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, + fallback : ['gstreamer', 'gst_controller_dep']) +-gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : get_option('validate'), ++gstvalidate_dep = dependency('gstreamer-validate-1.0', version : gst_req, required : get_option('validate'), + fallback : ['gst-devtools', 'validate_dep']) + + gio_dep = dependency('gio-2.0', version: glib_req) +-- +2.34.1 + diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 308596d7cd..bd5dcfdbaf 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.4.tar.xz.sha256sum -sha256 aa03e983af5d79c1befffe3575b034e60960619a96bf877447cb73c28016fc41 gst-editing-services-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.0.tar.xz.sha256sum +sha256 2a23856379af03586b66c193910fa8bb963024580bc2337c7405578dc077aa79 gst-editing-services-1.22.0.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 77feb15991..0ae9205c3b 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.4 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.0 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 Sat Feb 4 23:05:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:05:15 +0100 Subject: [Buildroot] [git commit] package/gst1-devtools: bump version to 1.22.0 Message-ID: <20230204231934.80256836A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=538277d63c80c7099920869ef4f97f0c5b738f77 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 fc504a2c12..46480445ab 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.4.tar.xz.sha256sum -sha256 82a293600273f4dd3eed567aae510ca0c7d629c3807788b00e6cdbd1d2459a84 gst-devtools-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.0.tar.xz.sha256sum +sha256 4d21fee5c15f2877c0b1f6c2da0cdba67ce7caab2c199ab27e91a1394d5ba195 gst-devtools-1.22.0.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 fbb04c92ef..8fd3321d9e 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.4 +GST1_DEVTOOLS_VERSION = 1.22.0 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 Sat Feb 4 22:48:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:48:41 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-good: bump version to 1.22.0 Message-ID: <20230204231934.5D3E4836AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d019b4c061e1ba1dc08ac680996e022720fcf097 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new xingmux config option. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/Config.in | 5 +++++ package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in index 67df206eea..d7ec16e800 100644 --- a/package/gstreamer1/gst1-plugins-good/Config.in +++ b/package/gstreamer1/gst1-plugins-good/Config.in @@ -246,6 +246,11 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE help Parse a .wav file into raw audio +config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX + bool "xingmux" + help + Add XING tags to mpeg audio files + config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M bool "y4m" help diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index b30c512878..3e219faad8 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.4.tar.xz.sha256sum -sha256 b16130fbe632fa8547c2147a0ef575b0140fb521065c5cb121c72ddbd23b64da gst-plugins-good-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.0.tar.xz.sha256sum +sha256 582e617271e7f314d1a2211e3e3856ae2e4303c8c0d6114e9c4a5ea5719294b0 gst-plugins-good-1.22.0.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 cc7bab5824..93c2328bda 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.4 +GST1_PLUGINS_GOOD_VERSION = 1.22.0 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 @@ -324,6 +324,12 @@ else GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavparse=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX),y) +GST1_PLUGINS_GOOD_CONF_OPTS += -Dxingmux=enabled +else +GST1_PLUGINS_GOOD_CONF_OPTS += -Dxingmux=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dy4m=enabled else From peter at korsgaard.com Sat Feb 4 23:18:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:18:10 +0100 Subject: [Buildroot] [git commit] package/gst-omx: bump version to 1.22.0 Message-ID: <20230204231934.B04FA836AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd333b414005f1191dd03908df1964fae19b2ec2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 140ad626f7..51ea74a0cb 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.4.tar.xz.sha256sum -sha256 70ddd485e2dcab79070164d61ad2ff3a63e15a1d7abf9075d86eb77762b0edfd gst-omx-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.0.tar.xz.sha256sum +sha256 dbc951a99af532380e599aa8acd9e1385fdb299b46b5868cd2be4230ad888341 gst-omx-1.22.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index d644c44995..6f7168279b 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.4 +GST_OMX_VERSION = 1.22.0 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 Sat Feb 4 23:18:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 00:18:24 +0100 Subject: [Buildroot] [git commit] package/gst1-python: bump version to 1.22.0 Message-ID: <20230204231934.B9D97836A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b53e11f2ec049002a4c3c2829aaa0e7a31551f1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard 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 adb116ac4c..128a739c2c 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.4.tar.xz.sha256sum -sha256 5eb4136d03e2a495f4499c8b2e6d9d3e7b5e73c5a8b8acf9213d57bc6a7bd3c1 gst-python-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.0.tar.xz.sha256sum +sha256 6c63ad364ca4617eb2cbb3975ab26c66760eb3c7a6adf5be69f99c11e21ef3a5 gst-python-1.22.0.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index feb2de718a..2fc268b0ac 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.4 +GST1_PYTHON_VERSION = 1.22.0 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 Sat Feb 4 23:19:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:30 +0100 Subject: [Buildroot] [PATCH 10/13] package/gst1-rtsp-server: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-10-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:55 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-10-james.hilliard1@gmail.com> Message-ID: <871qn5yq65.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 22:47:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 4 Feb 2023 23:47:30 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-base: bump version to 1.22.0 Message-ID: <20230204231934.4FEB9836A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dde95c589767fe995f338d34a3ea9e5e8743c6d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The videoconvert and videoscale plugins have been combined into the new videoconvertscale plugin. Rework config options using videoconvert/videoscale to use the new videoconvertscale option. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- Config.in.legacy | 14 ++++++++++++++ package/gstreamer1/gst1-plugins-base/Config.in | 13 ++++--------- .../gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 14 ++++---------- package/gstreamer1/gstreamer1-editing-services/Config.in | 3 +-- package/webkitgtk/Config.in | 3 +-- package/wpewebkit/Config.in | 3 +-- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 41c5fdefb3..3fff2b1ddd 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,20 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + bool "videoscale removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoscale option has been combined with videoconvert. + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT + bool "videoconvert removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoconvert option has been combined with videoscale. + config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 bool "imx-gpu-viv X11 output has been removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in index bd4ee0b994..df10774ac7 100644 --- a/package/gstreamer1/gst1-plugins-base/Config.in +++ b/package/gstreamer1/gst1-plugins-base/Config.in @@ -59,10 +59,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING help various encoding-related elements -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - bool "videoconvert" +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + bool "videoconvertscale (mandatory for video playback)" + default y help - Colorspace conversion + Colorspace conversion, resizes video config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO bool "gio" @@ -123,12 +124,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE help Adjusts video frames -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE - bool "videoscale (mandatory for video playback)" - default y - help - Resizes video - config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME bool "volume (mandatory for audio playback)" default y diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 5c729d832f..bac4f8398a 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.4.tar.xz.sha256sum -sha256 8d181b7abe4caf23ee9f9ec5b4d3e232640452464e39495bfffb6d776fc97225 gst-plugins-base-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.0.tar.xz.sha256sum +sha256 f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d gst-plugins-base-1.22.0.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 d225cdf910..7d509331fe 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.4 +GST1_PLUGINS_BASE_VERSION = 1.22.0 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 @@ -147,10 +147,10 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dencoding=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y) -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=enabled +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE),y) +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvertscale=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=disabled +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvertscale=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO),y) @@ -219,12 +219,6 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dvideorate=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y) -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=enabled -else -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME),y) GST1_PLUGINS_BASE_CONF_OPTS += -Dvolume=enabled else diff --git a/package/gstreamer1/gstreamer1-editing-services/Config.in b/package/gstreamer1/gstreamer1-editing-services/Config.in index 9c41e8142b..e824781d47 100644 --- a/package/gstreamer1/gstreamer1-editing-services/Config.in +++ b/package/gstreamer1/gstreamer1-editing-services/Config.in @@ -6,9 +6,8 @@ config BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE # runtime - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT # runtime + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC # runtime - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME # runtime select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE # runtime help diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index cafe497491..dc5d738dae 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -104,8 +104,7 @@ config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 04ed40bd92..7a8dc557c3 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -97,8 +97,7 @@ config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX From peter at korsgaard.com Sat Feb 4 23:19:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:35 +0100 Subject: [Buildroot] [PATCH 11/13] package/gstreamer1-editing-services: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-11-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:56 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-11-james.hilliard1@gmail.com> Message-ID: <87wn4xxblk.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Add a patch fixing an incorrect gstreamer-validate-1.0 dependency > name. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 4 23:19:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 00:19:39 +0100 Subject: [Buildroot] [PATCH 13/13] package/gst1-python: bump version to 1.22.0 In-Reply-To: <20230201051658.383420-13-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 22:16:58 -0700") References: <20230201051658.383420-1-james.hilliard1@gmail.com> <20230201051658.383420-13-james.hilliard1@gmail.com> Message-ID: <87sfflxblg.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Sun Feb 5 02:37:09 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 4 Feb 2023 19:37:09 -0700 Subject: [Buildroot] [PATCH 1/1] package/gst1-vaapi: fix x11 dependencies Message-ID: <20230205023709.799349-1-james.hilliard1@gmail.com> The x11 feature needs libx11 and libxrandr support. Select and depend on these when x11 is enabled. Fixes: gst1-vaapi-1.22.0/meson.build:96:0: ERROR: Dependency "xrandr" not found, tried pkgconfig and cmake Signed-off-by: James Hilliard --- package/gstreamer1/gst1-vaapi/Config.in | 2 ++ package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in index ade8b83a5f..a1062097ed 100644 --- a/package/gstreamer1/gst1-vaapi/Config.in +++ b/package/gstreamer1/gst1-vaapi/Config.in @@ -8,6 +8,8 @@ config BR2_PACKAGE_GST1_VAAPI select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help gstreamer-vaapi consists in a collection of VA-API based plugins for GStreamer and helper libraries. diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 3d9eb91ffb..9533cdf2b6 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -43,8 +43,9 @@ else GST1_VAAPI_CONF_OPTS += -Dwayland=disabled endif -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy) GST1_VAAPI_CONF_OPTS += -Dx11=enabled +GST1_VAAPI_DEPENDENCIES += xlib_libX11 xlib_libXrandr ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) GST1_VAAPI_CONF_OPTS += -Dglx=enabled else -- 2.34.1 From james.hilliard1 at gmail.com Sun Feb 5 04:22:32 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 4 Feb 2023 21:22:32 -0700 Subject: [Buildroot] [PATCH 1/1] package/gst1-plugins-bad: add new va option Message-ID: <20230205042232.1014672-1-james.hilliard1@gmail.com> This option enables va plugin support. These plugins are vaapi based encoders/decoders that are eventually intended to replace the legacy vaapi plugins. Details: https://gstreamer.freedesktop.org/documentation/va/index.html Signed-off-by: James Hilliard --- package/gstreamer1/gst1-plugins-bad/Config.in | 11 +++++++++++ .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index bcb4cb1545..1e89cd124f 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -629,6 +629,17 @@ comment "uvch264 needs a toolchain w/ threads, wchar, gcc >= 4.9" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA + bool "va" + depends on !BR2_STATIC_LIBS # libva + depends on BR2_TOOLCHAIN_HAS_THREADS # libva + select BR2_PACKAGE_LIBVA + help + VA-API new plugin + +comment "va needs a toolchain w/ threads, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC bool "voaacenc" select BR2_PACKAGE_VO_AACENC diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 8f11ce6b37..dfe1f1c9eb 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -745,6 +745,16 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Duvch264=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dva=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += libva +ifeq ($(BR2_PACKAGE_LIBDRM),y) +GST1_PLUGINS_BAD_DEPENDENCIES += libdrm +endif +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dva=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dvoaacenc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += vo-aacenc -- 2.34.1 From bernd.kuhls at t-online.de Sun Feb 5 08:16:17 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 5 Feb 2023 09:16:17 +0100 Subject: [Buildroot] [PATCH 3/3] package/freeswitch: security bump version to 1.10.9 In-Reply-To: <20230205081617.113018-1-bernd.kuhls@t-online.de> References: <20230205081617.113018-1-bernd.kuhls@t-online.de> Message-ID: <20230205081617.113018-3-bernd.kuhls@t-online.de> Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 Upstream removed zrtp support: https://github.com/signalwire/freeswitch/pull/1848 Signed-off-by: Bernd Kuhls --- Upstream release notes declares: "This is an important release containing security fixes and stability improvements." without mentioning any CVEs. package/freeswitch/freeswitch.hash | 5 ++--- package/freeswitch/freeswitch.mk | 11 +---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 18a36ff23c..3518d60b49 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,11 +1,10 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.8.-release.tar.xz.sha256 -sha256 1176b26b2f463de2980e5be953f81ced94d23c784452bd41e086d3933a88be5f freeswitch-1.10.8.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.9.-release.tar.xz.sha256 +sha256 f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 freeswitch-1.10.9.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 6234dd8e97..7497cc4964 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.8 +FREESWITCH_VERSION = 1.10.9 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -81,15 +81,6 @@ FREESWITCH_CONF_OPTS = \ --without-python \ --disable-system-xmlrpc-c -# zrtp supports a limited set of archs, sparc support is also broken due -# to a broken ld call by gcc, see libs/libzrtp/include/zrtp_config.h -ifeq ($(BR2_i386)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le)$(BR2_x86_64),y) -FREESWITCH_LICENSE_FILES += libs/libzrtp/src/zrtp_legal.c -FREESWITCH_CONF_OPTS += --enable-zrtp -else -FREESWITCH_CONF_OPTS += --disable-zrtp -endif - # Enable optional modules FREESWITCH_ENABLED_MODULES += \ applications/mod_avmd \ -- 2.39.1 From bernd.kuhls at t-online.de Sun Feb 5 08:16:15 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 5 Feb 2023 09:16:15 +0100 Subject: [Buildroot] [PATCH 1/3] package/libks: bump version to 1.8.2 Message-ID: <20230205081617.113018-1-bernd.kuhls@t-online.de> Needed for upcoming bump of freeswitch to version 1.10.9. 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 d4ad7ebbbc..dba442bdd2 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz +sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index 4aca5c5c4c..c4f0cd5c78 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.8.0 +LIBKS_VERSION = 1.8.2 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright -- 2.39.1 From bernd.kuhls at t-online.de Sun Feb 5 08:16:16 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 5 Feb 2023 09:16:16 +0100 Subject: [Buildroot] [PATCH 2/3] package/sofia-sip: bump version to 1.13.12 In-Reply-To: <20230205081617.113018-1-bernd.kuhls@t-online.de> References: <20230205081617.113018-1-bernd.kuhls@t-online.de> Message-ID: <20230205081617.113018-2-bernd.kuhls@t-online.de> Switch to github helper due to lack of upstream-provided tarball. Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 776136bb15..4617725571 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 daf75c41408c559c2d58a8fd4d39be4a8ff5144bc1db220d4dbc28deeed6670a sofia-sip-1.13.9-f6ee306084.tar.gz +sha256 03dda8653367501b7b1188a6b6513416902372e27475553de9318ee89ac390ff sofia-sip-1.13.12.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 9071d964e4..59c365365b 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,10 +4,11 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.9 -SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-f6ee306084.tar.gz -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip +SOFIA_SIP_VERSION = 1.13.12 +SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION)) SOFIA_SIP_INSTALL_STAGING = YES +# Fetched from github, no pre-generated configure script provided +SOFIA_SIP_AUTORECONF = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS -- 2.39.1 From br015 at umbiko.net Sun Feb 5 08:20:15 2023 From: br015 at umbiko.net (Andreas Ziegler) Date: Sun, 05 Feb 2023 09:20:15 +0100 Subject: [Buildroot] [PATCH 1/4] package/libtraceevent: new package In-Reply-To: References: Message-ID: Hi Maxime, libtraceevent and libtracefs are libraries, thus should be positioned under "Target packages" -> "Libraries". Introducing a "Debugging, profiling and benchmark" category here would probably be appropriate. Tested successfully on x86_64 hardware. Kind regards, Andreas On 2023-01-30 18:44, Maxime Chevallier wrote: > > Introduce the libtraceevent library, that used to be bundled with the > trace-cmd tool. This library is now used by several tools and libraries > such as trace-cmd, libtracefs and rtla. > > This package tries to install libraries in /usr/local/lib by default, > hence the redefinition of the "prefix" variable, so that the library > gets installed in "/usr/lib" instead. > > The same applies to the pkgconfig handling of the proved Makefile, > which > installs the .pc files in the /usr/local area by default, hence the > redefinition of the pkgconfig_dir to either the correct directory > within the > staging area, or to empty value for the target to avoid installing the > .pc > in that case. > > Signed-off-by: Maxime Chevallier > --- > DEVELOPERS | 3 +++ > package/Config.in | 1 + > package/libtraceevent/Config.in | 9 +++++++ > package/libtraceevent/libtraceevent.mk | 33 ++++++++++++++++++++++++++ > 4 files changed, 46 insertions(+) > create mode 100644 package/libtraceevent/Config.in > create mode 100644 package/libtraceevent/libtraceevent.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 706ee80ece..fcf05e0aa0 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2106,6 +2106,9 @@ F: package/postgresql/ > F: package/protozero/ > F: package/timescaledb/ > > +N: Maxime Chevallier > +F: package/libtraceevent/ > + > N: Michael Durrant > F: board/arcturus/ > F: configs/arcturus_ucp1020_defconfig > diff --git a/package/Config.in b/package/Config.in > index 83fddf316f..2f0e6dcb18 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -117,6 +117,7 @@ menu "Debugging, profiling and benchmark" > source "package/kyua/Config.in" > source "package/latencytop/Config.in" > source "package/libbpf/Config.in" > + source "package/libtraceevent/Config.in" > source "package/lmbench/Config.in" > source "package/lsof/Config.in" > source "package/ltp-testsuite/Config.in" > diff --git a/package/libtraceevent/Config.in > b/package/libtraceevent/Config.in > new file mode 100644 > index 0000000000..d351e3b4de > --- /dev/null > +++ b/package/libtraceevent/Config.in > @@ -0,0 +1,9 @@ > +config BR2_PACKAGE_LIBTRACEEVENT > + bool "libtraceevent" > + help > + libtraceevent is a library that interfaces with the ftrace > + subsystem in the linux kernel. > + It used to be bundled directly in the trace-cmd > + tool, but it was eventually extracted so that it can be used > + by multiple other tools and libraries, such as libtracefs and > + rtla. From br015 at umbiko.net Sun Feb 5 08:22:56 2023 From: br015 at umbiko.net (Andreas Ziegler) Date: Sun, 05 Feb 2023 09:22:56 +0100 Subject: [Buildroot] [PATCH 3/4] package/linux-tools: add rtla In-Reply-To: References: Message-ID: Hi Maxime, I was able to build RTLA after some adaptions, see below. On 2023-01-30 18:44, Maxime Chevallier wrote: > > The RealTime Linux Analysis tool includes a set of commands that relies > on the osnoise and timerlat tracers from the ftrace kernel subsystem, > allowing to analyze the lantency sources coming from the hardware and > the kernel itself. > > This tool was introduced in v5.17, and relies on libtracefs and > libtraceevent, although libtraceevent itself is already a dependency > for > libtracefs. > > Signed-off-by: Maxime Chevallier > --- > DEVELOPERS | 1 + > package/linux-tools/Config.in | 10 +++++++ > package/linux-tools/linux-tool-rtla.mk.in | 32 +++++++++++++++++++++++ > 3 files changed, 43 insertions(+) > create mode 100644 package/linux-tools/linux-tool-rtla.mk.in > > diff --git a/DEVELOPERS b/DEVELOPERS > index fe7194f817..8f459c796a 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2109,6 +2109,7 @@ F: package/timescaledb/ > N: Maxime Chevallier > F: package/libtraceevent/ > F: package/libtracefs > +F: package/linux-tools/linux-tool-rtla.mk.in > > N: Michael Durrant > F: board/arcturus/ > diff --git a/package/linux-tools/Config.in > b/package/linux-tools/Config.in > index 8a0b6d5802..186392b816 100644 > --- a/package/linux-tools/Config.in > +++ b/package/linux-tools/Config.in > @@ -102,6 +102,16 @@ config > BR2_PACKAGE_LINUX_TOOLS_PERF_NEEDS_HOST_PYTHON3 > > endif > > +config BR2_PACKAGE_LINUX_TOOLS_RTLA > + bool "rtla" Since a version dependency exists, you might add: depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 > + select BR2_PACKAGE_LINUX_TOOLS > + select BR2_PACKAGE_LIBTRACEFS > + help > + Linux 5.17 and later has 2 new tracers, osnoise and timerlat. > + There tracers allow performing latency analysis, for which > + the rtla tool provides wrapper commands to visualize and > + extrace latency traces and reports. > + > config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS > bool"selftests" > depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash > diff --git a/package/linux-tools/linux-tool-rtla.mk.in > b/package/linux-tools/linux-tool-rtla.mk.in > new file mode 100644 > index 0000000000..a736e3b785 > --- /dev/null > +++ b/package/linux-tools/linux-tool-rtla.mk.in > @@ -0,0 +1,32 @@ > +################################################################################ > +# > +# rtla > +# > +################################################################################ > + > +LINUX_TOOLS += rtla > + > +RTLA_DEPENDENCIES = host-pkgconf libtracefs RTLA needs some kernel features; better to include them here, saves time experimenting: # linux kernel needs FTRACE, TIMERLAT_TRACER, HIST_TRIGGERS for RTLA to work ifeq ($(BR2_PACKAGE_LINUX_TOOLS_RTLA),y) define RTLA_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_FTRACE) $(call KCONFIG_ENABLE_OPT,CONFIG_TIMERLAT_TRACER) $(call KCONFIG_ENABLE_OPT,CONFIG_HIST_TRIGGERS) endef endif > +RTLA_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ > + CC=$(TARGET_CC) \ > + LDFLAGS="$(TARGET_LDFLAGS)" \ > + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig > + The RTLA Makefile unconditionally compiles with stack smashing protection; linking fails on builds configured without this feature: # adapted from linux-tool-tmon.mk.in ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) define RTLA_DISABLE_STACK_PROTECTOR $(SED) 's/-fstack-protector.* //' $(LINUX_DIR)/tools/tracing/rtla/Makefile endef endif > +define RTLA_BUILD_CMDS > + $(Q)if ! grep install $(LINUX_DIR)/tools/tracing/rtla/Makefile > >/dev/null 2>&1 ; then \ > + echo "Your kernel version is too old and does not implement the rtla > tool." ; \ > + echo "At least kernel 5.17 must be used." ; \ > + exit 1 ; \ > + fi > + $(RTLA_DISABLE_STACK_PROTECTOR) > + $(TARGET_MAKE_ENV) \ > + $(MAKE) $(RTLA_MAKE_OPTS) \ > + -C $(LINUX_DIR)/tools/tracing rtla > +endef > + > +define RTLA_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/tracing \ > + $(RTLA_MAKE_OPTS) \ > + DESTDIR=$(TARGET_DIR) \ > + rtla_install > +endef rtla_install fails with: Makefile:34: *** NOTICE: rst2man required to generate man pages. Stop. because it tries to build and install man pages also. Better to use a custom install command: # The rtla_install target tries to create and install manpages, # which terminates with an error and cannot be disabled define RTLA_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(LINUX_DIR)/tools/tracing/rtla/rtla \ $(TARGET_DIR)/usr/bin/rtla endef Kind regards, Andreas > -- > 2.39.1 From peter at korsgaard.com Sun Feb 5 09:01:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 10:01:42 +0100 Subject: [Buildroot] [PATCH 3/3] package/freeswitch: security bump version to 1.10.9 In-Reply-To: <20230205081617.113018-3-bernd.kuhls@t-online.de> References: <20230205081617.113018-1-bernd.kuhls@t-online.de> <20230205081617.113018-3-bernd.kuhls@t-online.de> Message-ID: On 05/02/2023 09.16, Bernd Kuhls wrote: > Release notes: > https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 > > Upstream removed zrtp support: > https://github.com/signalwire/freeswitch/pull/1848 > > Signed-off-by: Bernd Kuhls Fixed the checkpatch warning and applied, thanks; package/freeswitch/freeswitch.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 08:53:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 09:53:53 +0100 Subject: [Buildroot] [git commit] package/freeswitch: security bump version to 1.10.9 Message-ID: <20230205090205.CD8F4836B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46683dd4a6e65b5ae3188440e9ae8eaf055d9a85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 Upstream removed zrtp support: https://github.com/signalwire/freeswitch/pull/1848 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/freeswitch/freeswitch.hash | 5 ++--- package/freeswitch/freeswitch.mk | 11 +---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 18a36ff23c..3497a3283f 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,11 +1,10 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.8.-release.tar.xz.sha256 -sha256 1176b26b2f463de2980e5be953f81ced94d23c784452bd41e086d3933a88be5f freeswitch-1.10.8.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.9.-release.tar.xz.sha256 +sha256 f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 freeswitch-1.10.9.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 6234dd8e97..7497cc4964 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.8 +FREESWITCH_VERSION = 1.10.9 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -81,15 +81,6 @@ FREESWITCH_CONF_OPTS = \ --without-python \ --disable-system-xmlrpc-c -# zrtp supports a limited set of archs, sparc support is also broken due -# to a broken ld call by gcc, see libs/libzrtp/include/zrtp_config.h -ifeq ($(BR2_i386)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le)$(BR2_x86_64),y) -FREESWITCH_LICENSE_FILES += libs/libzrtp/src/zrtp_legal.c -FREESWITCH_CONF_OPTS += --enable-zrtp -else -FREESWITCH_CONF_OPTS += --disable-zrtp -endif - # Enable optional modules FREESWITCH_ENABLED_MODULES += \ applications/mod_avmd \ From yann.morin.1998 at free.fr Sun Feb 5 10:15:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 11:15:57 +0100 Subject: [Buildroot] [PATCH 3/3] package/freeswitch: security bump version to 1.10.9 In-Reply-To: References: <20230205081617.113018-1-bernd.kuhls@t-online.de> <20230205081617.113018-3-bernd.kuhls@t-online.de> Message-ID: <20230205101557.GA2960@scaer> Peter, All, On 2023-02-05 10:01 +0100, Peter Korsgaard spake thusly: > On 05/02/2023 09.16, Bernd Kuhls wrote: > >Release notes: > >https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 > > > >Upstream removed zrtp support: > >https://github.com/signalwire/freeswitch/pull/1848 > > > >Signed-off-by: Bernd Kuhls > > Fixed the checkpatch warning and applied, thanks; You only applied this patch 3/3, but patches 1/3 and 2/3 (likbks and sofia-sip bumps) are marked as being needed first. So I've applied them now. Bernd, it would have been nice that the patch bumping freeswitch would mention that it has a dependency on newer libks and sofia-sip versions. Indeed, if the freeswitch bump is backported to a maintenance branch, them the two other bumps will have to be backported too, and if that is not mentioned in the commit log, that will not be obvious to notice. Regards, Yann E. MORIN. > package/freeswitch/freeswitch.hash:2: separation does not match expectation > (http://nightly.buildroot.org/#adding-packages-hash > > -- > Bye, Peter Korsgaard > > _______________________________________________ > 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 Feb 5 10:16:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 11:16:15 +0100 Subject: [Buildroot] [git commit] package/libks: bump version to 1.8.2 Message-ID: <20230205101810.8142E836ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e09e7987b986d01e86e4ec45319e2dd5945259c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- 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 d4ad7ebbbc..dba442bdd2 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz +sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index 4aca5c5c4c..c4f0cd5c78 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.8.0 +LIBKS_VERSION = 1.8.2 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright From yann.morin.1998 at free.fr Sun Feb 5 10:16:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 11:16:19 +0100 Subject: [Buildroot] [git commit] package/sofia-sip: bump version to 1.13.12 Message-ID: <20230205101810.8BBE8836EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8bb962724e3a76112b7c374ae6a1c4521f97cc65 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to github helper due to lack of upstream-provided tarball. Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 776136bb15..4617725571 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 daf75c41408c559c2d58a8fd4d39be4a8ff5144bc1db220d4dbc28deeed6670a sofia-sip-1.13.9-f6ee306084.tar.gz +sha256 03dda8653367501b7b1188a6b6513416902372e27475553de9318ee89ac390ff sofia-sip-1.13.12.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 9071d964e4..59c365365b 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,10 +4,11 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.9 -SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-f6ee306084.tar.gz -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip +SOFIA_SIP_VERSION = 1.13.12 +SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION)) SOFIA_SIP_INSTALL_STAGING = YES +# Fetched from github, no pre-generated configure script provided +SOFIA_SIP_AUTORECONF = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS From yann.morin.1998 at free.fr Sun Feb 5 10:18:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 11:18:55 +0100 Subject: [Buildroot] [PATCH 1/3] package/libks: bump version to 1.8.2 In-Reply-To: <20230205081617.113018-1-bernd.kuhls@t-online.de> References: <20230205081617.113018-1-bernd.kuhls@t-online.de> Message-ID: <20230205101855.GB2960@scaer> Bernd, All, On 2023-02-05 09:16 +0100, Bernd Kuhls spake thusly: > Needed for upcoming bump of freeswitch to version 1.10.9. Please also mention that in the package that actually requires the bump. > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 d4ad7ebbbc..dba442bdd2 100644 > --- a/package/libks/libks.hash > +++ b/package/libks/libks.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz > +sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz > sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright > diff --git a/package/libks/libks.mk b/package/libks/libks.mk > index 4aca5c5c4c..c4f0cd5c78 100644 > --- a/package/libks/libks.mk > +++ b/package/libks/libks.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBKS_VERSION = 1.8.0 > +LIBKS_VERSION = 1.8.2 > LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) > LIBKS_LICENSE = MIT > LIBKS_LICENSE_FILES = copyright > -- > 2.39.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 Feb 5 10:19:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 11:19:10 +0100 Subject: [Buildroot] [PATCH 2/3] package/sofia-sip: bump version to 1.13.12 In-Reply-To: <20230205081617.113018-2-bernd.kuhls@t-online.de> References: <20230205081617.113018-1-bernd.kuhls@t-online.de> <20230205081617.113018-2-bernd.kuhls@t-online.de> Message-ID: <20230205101910.GC2960@scaer> Bernd, All, On 2023-02-05 09:16 +0100, Bernd Kuhls spake thusly: > Switch to github helper due to lack of upstream-provided tarball. > > Needed for upcoming bump of freeswitch to version 1.10.9. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/sofia-sip/sofia-sip.hash | 2 +- > package/sofia-sip/sofia-sip.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash > index 776136bb15..4617725571 100644 > --- a/package/sofia-sip/sofia-sip.hash > +++ b/package/sofia-sip/sofia-sip.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 daf75c41408c559c2d58a8fd4d39be4a8ff5144bc1db220d4dbc28deeed6670a sofia-sip-1.13.9-f6ee306084.tar.gz > +sha256 03dda8653367501b7b1188a6b6513416902372e27475553de9318ee89ac390ff sofia-sip-1.13.12.tar.gz > sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING > sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS > diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk > index 9071d964e4..59c365365b 100644 > --- a/package/sofia-sip/sofia-sip.mk > +++ b/package/sofia-sip/sofia-sip.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -SOFIA_SIP_VERSION = 1.13.9 > -SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-f6ee306084.tar.gz > -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip > +SOFIA_SIP_VERSION = 1.13.12 > +SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION)) > SOFIA_SIP_INSTALL_STAGING = YES > +# Fetched from github, no pre-generated configure script provided > +SOFIA_SIP_AUTORECONF = YES > SOFIA_SIP_DEPENDENCIES = host-pkgconf > SOFIA_SIP_LICENSE = LGPL-2.1+ > SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS > -- > 2.39.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 Feb 5 10:45:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 11:45:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: security bump to version 2.38.3 In-Reply-To: <20230117135943.2893779-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Tue, 17 Jan 2023 15:59:43 +0200") References: <20230117135943.2893779-1-aperez@igalia.com> Message-ID: <87o7q8xue3.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > Bugfix release, with security fixes for CVE-2022-42852, CVE-2022-42856, > CVE-2022-42867, CVE-2022-46691, CVE-2022-46692, CVE-2022-46698, > CVE-2022-46699, CVE-2022-46700, CVE-2022-42823, and CVE-2022-42799. > Release notes: > https://wpewebkit.org/release/wpewebkit-2.38.3.html > https://wpewebkit.org/release/wpewebkit-2.38.2.html > https://wpewebkit.org/release/wpewebkit-2.38.1.html > Accompanying security advisories: > https://wpewebkit.org/security/WSA-2022-0011.html > https://wpewebkit.org/security/WSA-2022-0010.html > Additionally, the update brings in important bug fixes for the > Bubblewrap sandbox support, scrolling in certain web sites, multimedia > playback, and build fixes. > Signed-off-by: Adrian Perez de Castro Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 10:49:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 11:49:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xlib_libXpm: security bump version to 3.5.15 In-Reply-To: <20230117200707.2730524-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 17 Jan 2023 21:07:07 +0100") References: <20230117200707.2730524-1-bernd.kuhls@t-online.de> Message-ID: <87k00wxu8j.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-January/003313.html > Fixes CVE-2022-4883, CVE-2022-44617 & CVE-2022-46285: > https://lists.x.org/archives/xorg-announce/2023-January/003312.html > Updated license hash due to upstream commit: > https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/501494c6c68a84114fdd0b44d4b67ef9cde776c9 > Added configure option to disable compressed pixmaps support: > https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/4841039e5385f264d12757903894f47c64f59361 > Signed-off-by: Bernd Kuhls Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 10:48:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 11:48:58 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/x11r7/xlib_libXpm: security bump version to 3.5.15 Message-ID: <20230205104925.3665D7FEC8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe8c4143f77b1037a2391963cd379d2eea906444 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003313.html Fixes CVE-2022-4883, CVE-2022-44617 & CVE-2022-46285: https://lists.x.org/archives/xorg-announce/2023-January/003312.html Updated license hash due to upstream commit: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/501494c6c68a84114fdd0b44d4b67ef9cde776c9 Added configure option to disable compressed pixmaps support: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/4841039e5385f264d12757903894f47c64f59361 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit a0dfd717f3ff888b4ab6d8c40bb6a01a939370cb) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 8 ++++---- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index 9ccfb4c8de..733c404543 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003261.html -sha256 f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2 libXpm-3.5.14.tar.xz -sha512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-January/003313.html +sha256 60bb906c5c317a6db863e39b69c4a83fdbd2ae2154fcf47640f8fefc9fdfd1c1 libXpm-3.5.15.tar.xz +sha512 955d716fcea2c9d868ab941c56f017b39bfa0f47fd2904e9b04c6a9be17f23f8b8c906da9c90a89a789f1f399d419641705ff5b6f9921820e34d4807c7a1992f libXpm-3.5.15.tar.xz # Locally calculated -sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING +sha256 a80d706759624a04aa90fd62bc644a360fc3d72e08dcbfb129f167c11ca285de COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 417dcfec38..970ec93407 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.14 +XLIB_LIBXPM_VERSION = 3.5.15 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT @@ -16,6 +16,7 @@ XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(TARGET_NLS_DEPENDENCIES) XLIB_LIBXPM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +XLIB_LIBXPM_CONF_OPTS = --disable-open-zfile ifeq ($(BR2_SYSTEM_ENABLE_NLS),) XLIB_LIBXPM_CONF_ENV += ac_cv_search_gettext=no From peter at korsgaard.com Sun Feb 5 10:48:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 11:48:52 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/x11r7/xlib_libXpm: bump version to 3.5.14 Message-ID: <20230205104925.277F98370A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c9c714a24a3f7f47ac9a5e7913c6feaac59a4295 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x https://lists.x.org/archives/xorg-announce/2022-November/003261.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 7d2fff78049392f2dae82f5ea9f5a0dbac225f4d) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 8 +++----- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index edfdaab335..9ccfb4c8de 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,8 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-December/003034.html -md5 6f0ecf8d103d528cfc803aa475137afa libXpm-3.5.13.tar.bz2 -sha1 38b1a2728adb49f4e255aba1530f51789815ffc4 libXpm-3.5.13.tar.bz2 -sha256 9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25 libXpm-3.5.13.tar.bz2 -sha512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5 libXpm-3.5.13.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003261.html +sha256 f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2 libXpm-3.5.14.tar.xz +sha512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz # Locally calculated sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 7b645dc9e6..417dcfec38 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.13 -XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2 -XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXPM_VERSION = 3.5.14 +XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz +XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project From peter at korsgaard.com Sun Feb 5 10:47:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 11:47:25 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/x11r7/xlib_libXpm: bump version to 3.5.14 Message-ID: <20230205105119.D25DA83734@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2724f705c3ad766d31551ddcc56b7e73081f6551 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x https://lists.x.org/archives/xorg-announce/2022-November/003261.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 7d2fff78049392f2dae82f5ea9f5a0dbac225f4d) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 8 +++----- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index edfdaab335..9ccfb4c8de 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,8 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-December/003034.html -md5 6f0ecf8d103d528cfc803aa475137afa libXpm-3.5.13.tar.bz2 -sha1 38b1a2728adb49f4e255aba1530f51789815ffc4 libXpm-3.5.13.tar.bz2 -sha256 9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25 libXpm-3.5.13.tar.bz2 -sha512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5 libXpm-3.5.13.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003261.html +sha256 f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2 libXpm-3.5.14.tar.xz +sha512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz # Locally calculated sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 7b645dc9e6..417dcfec38 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.13 -XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2 -XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXPM_VERSION = 3.5.14 +XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz +XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project From peter at korsgaard.com Sun Feb 5 10:48:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 11:48:23 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/x11r7/xlib_libXpm: security bump version to 3.5.15 Message-ID: <20230205105119.DC05E83735@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db058b26f0694742a12381e2075ef297cdff076c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003313.html Fixes CVE-2022-4883, CVE-2022-44617 & CVE-2022-46285: https://lists.x.org/archives/xorg-announce/2023-January/003312.html Updated license hash due to upstream commit: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/501494c6c68a84114fdd0b44d4b67ef9cde776c9 Added configure option to disable compressed pixmaps support: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/4841039e5385f264d12757903894f47c64f59361 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit a0dfd717f3ff888b4ab6d8c40bb6a01a939370cb) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 8 ++++---- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index 9ccfb4c8de..733c404543 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003261.html -sha256 f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2 libXpm-3.5.14.tar.xz -sha512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-January/003313.html +sha256 60bb906c5c317a6db863e39b69c4a83fdbd2ae2154fcf47640f8fefc9fdfd1c1 libXpm-3.5.15.tar.xz +sha512 955d716fcea2c9d868ab941c56f017b39bfa0f47fd2904e9b04c6a9be17f23f8b8c906da9c90a89a789f1f399d419641705ff5b6f9921820e34d4807c7a1992f libXpm-3.5.15.tar.xz # Locally calculated -sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING +sha256 a80d706759624a04aa90fd62bc644a360fc3d72e08dcbfb129f167c11ca285de COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 417dcfec38..970ec93407 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.14 +XLIB_LIBXPM_VERSION = 3.5.15 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT @@ -16,6 +16,7 @@ XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(TARGET_NLS_DEPENDENCIES) XLIB_LIBXPM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +XLIB_LIBXPM_CONF_OPTS = --disable-open-zfile ifeq ($(BR2_SYSTEM_ENABLE_NLS),) XLIB_LIBXPM_CONF_ENV += ac_cv_search_gettext=no From peter at korsgaard.com Sun Feb 5 10:53:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 11:53:37 +0100 Subject: [Buildroot] [PATCH 3/3] package/freeswitch: security bump version to 1.10.9 In-Reply-To: <20230205101557.GA2960@scaer> (Yann E. MORIN's message of "Sun, 5 Feb 2023 11:15:57 +0100") References: <20230205081617.113018-1-bernd.kuhls@t-online.de> <20230205081617.113018-3-bernd.kuhls@t-online.de> <20230205101557.GA2960@scaer> Message-ID: <87fsbkxu1a.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > On 2023-02-05 10:01 +0100, Peter Korsgaard spake thusly: >> On 05/02/2023 09.16, Bernd Kuhls wrote: >> >Release notes: >> >https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 >> > >> >Upstream removed zrtp support: >> >https://github.com/signalwire/freeswitch/pull/1848 >> > >> >Signed-off-by: Bernd Kuhls >> >> Fixed the checkpatch warning and applied, thanks; > You only applied this patch 3/3, but patches 1/3 and 2/3 (likbks and > sofia-sip bumps) are marked as being needed first. So I've applied them > now. Ups, thanks for fixing it! > Bernd, it would have been nice that the patch bumping freeswitch would > mention that it has a dependency on newer libks and sofia-sip versions. > Indeed, if the freeswitch bump is backported to a maintenance branch, > them the two other bumps will have to be backported too, and if that is > not mentioned in the commit log, that will not be obvious to notice. Yes please! -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 12:07:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 13:07:48 +0100 Subject: [Buildroot] [PATCH v1] package/git: bump version to 2.39.1 In-Reply-To: <87v8l1abjx.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Fri, 20 Jan 2023 08:51:30 +0100") References: <20230118213517.5946-1-ps.report@gmx.net> <87v8l1abjx.fsf@dell.be.48ers.dk> Message-ID: <87bkm8xqln.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Peter" == Peter Seiderer writes: >> - fixes CVE-2022-41903 and CVE-2022-23521 >> For details see [1]. >> [1] https://lore.kernel.org/git/xmqq7cxl9h0i.fsf at gitster.g/ >> Signed-off-by: Peter Seiderer > Committed after adjusting the summary to make it clear that this is a > security bump, thanks. For 2022.02.x / 2022.11.x I have instead bumped to 2.31.6, which contains the same security fixes. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 12:05:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 13:05:42 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/git: security bump to version 2.31.6 Message-ID: <20230205120807.9F59D8373B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=486eae3194824239eab90a71c61be4154ec1a0c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes the following security issues: * CVE-2022-41903: git log has the ability to display commits using an arbitrary format with its --format specifiers. This functionality is also exposed to git archive via the export-subst gitattribute. When processing the padding operators (e.g., %<(, %<|(, %>(, %>>(, or %><( ), an integer overflow can occur in pretty.c::format_and_pad_commit() where a size_t is improperly stored as an int, and then added as an offset to a subsequent memcpy() call. This overflow can be triggered directly by a user running a command which invokes the commit formatting machinery (e.g., git log --format=...). It may also be triggered indirectly through git archive via the export-subst mechanism, which expands format specifiers inside of files within the repository during a git archive. This integer overflow can result in arbitrary heap writes, which may result in remote code execution. * CVE-2022-23521: gitattributes are a mechanism to allow defining attributes for paths. These attributes can be defined by adding a `.gitattributes` file to the repository, which contains a set of file patterns and the attributes that should be set for paths matching this pattern. When parsing gitattributes, multiple integer overflows can occur when there is a huge number of path patterns, a huge number of attributes for a single pattern, or when the declared attribute names are huge. These overflows can be triggered via a crafted `.gitattributes` file that may be part of the commit history. Git silently splits lines longer than 2KB when parsing gitattributes from a file, but not when parsing them from the index. Consequentially, the failure mode depends on whether the file exists in the working tree, the index or both. This integer overflow can result in arbitrary heap reads and writes, which may result in remote code execution. Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index af09ea817b..9a472b49ec 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 dbc80f88d36fcde2c7acaaa9343cfab0f56effe9aee60e5eb00f3f36b8a619b4 git-2.31.5.tar.xz +sha256 e0fa851e4ccb990c57793a3cfcbf7c8981fbacab175025ea15db9ecd57434cee git-2.31.6.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 653b4f46ad..0b4e93a8b6 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.31.5 +GIT_VERSION = 2.31.6 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From peter at korsgaard.com Sun Feb 5 12:04:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 13:04:18 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/git: security bump to version 2.31.6 Message-ID: <20230205120921.091E58373F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70485003c5a6e8a3508760db46a98d2d9b20df2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes the following security issues: * CVE-2022-41903: git log has the ability to display commits using an arbitrary format with its --format specifiers. This functionality is also exposed to git archive via the export-subst gitattribute. When processing the padding operators (e.g., %<(, %<|(, %>(, %>>(, or %><( ), an integer overflow can occur in pretty.c::format_and_pad_commit() where a size_t is improperly stored as an int, and then added as an offset to a subsequent memcpy() call. This overflow can be triggered directly by a user running a command which invokes the commit formatting machinery (e.g., git log --format=...). It may also be triggered indirectly through git archive via the export-subst mechanism, which expands format specifiers inside of files within the repository during a git archive. This integer overflow can result in arbitrary heap writes, which may result in remote code execution. * CVE-2022-23521: gitattributes are a mechanism to allow defining attributes for paths. These attributes can be defined by adding a `.gitattributes` file to the repository, which contains a set of file patterns and the attributes that should be set for paths matching this pattern. When parsing gitattributes, multiple integer overflows can occur when there is a huge number of path patterns, a huge number of attributes for a single pattern, or when the declared attribute names are huge. These overflows can be triggered via a crafted `.gitattributes` file that may be part of the commit history. Git silently splits lines longer than 2KB when parsing gitattributes from a file, but not when parsing them from the index. Consequentially, the failure mode depends on whether the file exists in the working tree, the index or both. This integer overflow can result in arbitrary heap reads and writes, which may result in remote code execution. Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index af09ea817b..9a472b49ec 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 dbc80f88d36fcde2c7acaaa9343cfab0f56effe9aee60e5eb00f3f36b8a619b4 git-2.31.5.tar.xz +sha256 e0fa851e4ccb990c57793a3cfcbf7c8981fbacab175025ea15db9ecd57434cee git-2.31.6.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 653b4f46ad..0b4e93a8b6 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.31.5 +GIT_VERSION = 2.31.6 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From thomas.petazzoni at bootlin.com Sun Feb 5 12:15:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:15:59 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain/Config.in: extend gcc bug 43744 to every sh architecture In-Reply-To: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> References: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> Message-ID: <20230205131559.6f79944f@windsurf> On Thu, 2 Feb 2023 16:42:38 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti It would be nice to have a non-empty commit log, which explains which other CPU is affected by the bug, and perhaps a defconfig that exhibits the issue, or something like that. Thanks a lot! 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 Sun Feb 5 12:15:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:15:54 +0100 Subject: [Buildroot] [git commit] package/gst1-vaapi: fix x11 dependencies Message-ID: <20230205121750.52D3A83747@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2e1b425a810981c3394426f09842518d9ee445ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The x11 feature needs libx11 and libxrandr support. Select and depend on these when x11 is enabled. Fixes: gst1-vaapi-1.22.0/meson.build:96:0: ERROR: Dependency "xrandr" not found, tried pkgconfig and cmake Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-vaapi/Config.in | 2 ++ package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in index ade8b83a5f..a1062097ed 100644 --- a/package/gstreamer1/gst1-vaapi/Config.in +++ b/package/gstreamer1/gst1-vaapi/Config.in @@ -8,6 +8,8 @@ config BR2_PACKAGE_GST1_VAAPI select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help gstreamer-vaapi consists in a collection of VA-API based plugins for GStreamer and helper libraries. diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 3d9eb91ffb..9533cdf2b6 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -43,8 +43,9 @@ else GST1_VAAPI_CONF_OPTS += -Dwayland=disabled endif -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy) GST1_VAAPI_CONF_OPTS += -Dx11=enabled +GST1_VAAPI_DEPENDENCIES += xlib_libX11 xlib_libXrandr ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) GST1_VAAPI_CONF_OPTS += -Dglx=enabled else From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:48 +0100 Subject: [Buildroot] [git commit] configs/olimex_a10_olinuxino_lime_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230205121914.5CB3C8376E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f54c7ffce70d583dbd85718f23d1bd7b18a0a744 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a10_olinuxino_lime_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a10_olinuxino_lime_defconfig b/configs/olimex_a10_olinuxino_lime_defconfig index d0e00301f7..9c454b1915 100644 --- a/configs/olimex_a10_olinuxino_lime_defconfig +++ b/configs/olimex_a10_olinuxino_lime_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a10-olinuxino" @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a10_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -33,7 +33,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A10-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:52 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino_micro_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230205121914.896AB8376E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f23405b39a850b54c61b719bf7d079664d773fc6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_micro_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index 1394c0b8b8..a7a6eb51a0 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-micro" @@ -33,7 +33,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino_MICRO" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:51 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino_lime_defconfig: bump Linux to 6.1.9 Message-ID: <20230205121914.7CC6283772@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e624207495b25403ad370d595ebb37fad3f74176 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index f685d19421..25ecf31146 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.15 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:49 +0100 Subject: [Buildroot] [git commit] configs/olimex_a13_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230205121914.662B38376F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b85b4d21d96f232b09b27eaf70a869c5bf66a30 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a13_olinuxino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a13_olinuxino_defconfig b/configs/olimex_a13_olinuxino_defconfig index 6d25d7d0a1..8469ce1fd0 100644 --- a/configs/olimex_a13_olinuxino_defconfig +++ b/configs/olimex_a13_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a13-olinuxino" @@ -15,7 +15,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A13-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -28,7 +28,7 @@ BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:53 +0100 Subject: [Buildroot] [git commit] configs/olimex_a33_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230205121914.944028376F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4ac41042515944eafb892c8c26ea3b940211136 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a33_olinuxino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a33_olinuxino_defconfig b/configs/olimex_a33_olinuxino_defconfig index cdbc63efe1..35398ac6da 100644 --- a/configs/olimex_a33_olinuxino_defconfig +++ b/configs/olimex_a33_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a7=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="A33-olinuxino" @@ -15,7 +15,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A33-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -31,7 +31,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a33_olinuxino/boot # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:50 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino_lime2_defconfig: bump Linux to 6.1.9 Message-ID: <20230205121914.7267A83771@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=720d30f9d29327e326916457bb74eeeb976b3ff1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime2_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index a0ebcaed66..50a0986ab2 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.15 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" From thomas.petazzoni at bootlin.com Sun Feb 5 12:18:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:18:54 +0100 Subject: [Buildroot] [git commit] configs/olimex_a64_olinuxino_defconfig: bump Linux to 6.1.9, U-Boot to 2023.01 and ATF to v2.8 Message-ID: <20230205121914.9E5EB83771@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3d7f7a73bb025152e6594ab812a2bfa893851f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Linux 6.1.9 installs more modules and this makes rootfs size to increase and the default 60M size is not enough. So let's expand rootfs size to 120M. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a64_olinuxino_defconfig | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configs/olimex_a64_olinuxino_defconfig b/configs/olimex_a64_olinuxino_defconfig index 53e8c2ece5..dd445e8ce0 100644 --- a/configs/olimex_a64_olinuxino_defconfig +++ b/configs/olimex_a64_olinuxino_defconfig @@ -2,13 +2,13 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.8" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -16,7 +16,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="a64-olinuxino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -33,7 +33,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-olinuxino" @@ -43,6 +43,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_GENERIC_ISSUE="Welcome to Olimex A64-OLinuXino" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From thomas.petazzoni at bootlin.com Sun Feb 5 12:19:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:19:37 +0100 Subject: [Buildroot] [PATCH 0/7] Bump Linux, U-boot and ATF versions for olimex_a* boards In-Reply-To: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> References: <20230201223241.3867678-1-giulio.benetti@benettiengineering.com> Message-ID: <20230205131937.05c15418@windsurf> On Wed, 1 Feb 2023 23:32:34 +0100 Giulio Benetti wrote: > Giulio Benetti (7): > configs/olimex_a10_olinuxino_lime_defconfig: bump Linux to 6.1.9 and > U-Boot to 2023.01 > configs/olimex_a13_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot > to 2023.01 > configs/olimex_a20_olinuxino_lime2_defconfig: bump Linux to 6.1.9 > configs/olimex_a20_olinuxino_lime_defconfig: bump Linux to 6.1.9 > configs/olimex_a20_olinuxino_micro_defconfig: bump Linux to 6.1.9 and > U-Boot to 2023.01 > configs/olimex_a33_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot > to 2023.01 > configs/olimex_a64_olinuxino_defconfig: bump Linux to 6.1.9, U-Boot to > 2023.01 and ATF to v2.8 All applied, thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 5 12:20:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:20:53 +0100 Subject: [Buildroot] [PATCH 1/1] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. In-Reply-To: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> References: <20230201195956.1758827-1-gsmecher@threespeedlogic.com> Message-ID: <20230205132053.740a7efe@windsurf> On Wed, 1 Feb 2023 11:59:56 -0800 Graeme Smecher wrote: > If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > buildroot into the linux tree, these .dts files are copied to > arch/arm64/boot. Unfortunately, the post-image.sh script expects to find > them in arch/arm64/boot/xilinx. > > This patch does not require the xilinx/ prefix to be present when > symlinking the device-tree to system.dtb where u-boot expects to find > it. > > Signed-off-by: Graeme Smecher > --- > board/zynqmp/post-image.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 5 12:20:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:20:58 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: Remove openal from my list In-Reply-To: <20230201192711.1632095-1-nerv@dawncrow.de> References: <20230201192711.1632095-1-nerv@dawncrow.de> Message-ID: <20230205132058.0411cb56@windsurf> On Wed, 1 Feb 2023 20:27:11 +0100 Andr? Zwing wrote: > Signed-off-by: Andr? Zwing > --- > DEVELOPERS | 1 - > 1 file changed, 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 5 12:20:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:20:45 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: Remove openal from my list Message-ID: <20230205122112.D634D8377B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c8cda8c94e00dc4571a6ad1b3f9c1c617a63873 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Andr?? Zwing Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index e19087c577..d526451ca3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -133,7 +133,6 @@ F: boot/ti-k3-r5-loader/ N: Andr?? Zwing F: package/libkrb5/ -F: package/openal/ F: package/p7zip/ F: package/wine/ From thomas.petazzoni at bootlin.com Sun Feb 5 12:20:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:20:46 +0100 Subject: [Buildroot] [git commit] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. Message-ID: <20230205122112.DF1208377C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70477e5fee6e92b1d783257a8b3e57a78007438e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from buildroot into the linux tree, these .dts files are copied to arch/arm64/boot. Unfortunately, the post-image.sh script expects to find them in arch/arm64/boot/xilinx. This patch does not require the xilinx/ prefix to be present when symlinking the device-tree to system.dtb where u-boot expects to find it. Signed-off-by: Graeme Smecher Reviewed-by: Luca Ceresoli Reviewed-by: Neal Frager Signed-off-by: Thomas Petazzoni --- board/zynqmp/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index ed6dbe188c..c5de2db820 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -5,7 +5,7 @@ # devicetree listed in the config. FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ ${BR2_CONFIG}) [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb From thomas.petazzoni at bootlin.com Sun Feb 5 12:24:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:24:10 +0100 Subject: [Buildroot] [git commit] board/versal/post-image.sh: do not require xilinx/ prefix for .dts files Message-ID: <20230205122418.ABFA383782@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=122c85985f199f48f02c5fbd411111629023fc37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from buildroot into the linux tree, these .dts files are copied to arch/arm64/boot. Unfortunately, the post-image.sh script expects to find them in arch/arm64/boot/xilinx. This patch does not require the xilinx/ prefix to be present when symlinking the device-tree to system.dtb where u-boot expects to find it. It is effectively applying the below patch for zynqmp to versal as well: https://patchwork.ozlabs.org/project/buildroot/patch/20230201195956.1758827-1-gsmecher at threespeedlogic.com/ Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- board/versal/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh index f45f29a155..92e65ed3b7 100755 --- a/board/versal/post-image.sh +++ b/board/versal/post-image.sh @@ -5,7 +5,7 @@ # devicetree listed in the config. FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ ${BR2_CONFIG}) [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb From thomas.petazzoni at bootlin.com Sun Feb 5 12:24:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:24:20 +0100 Subject: [Buildroot] [PATCH v1 1/1] board/versal/post-image.sh: do not require xilinx/ prefix for .dts files In-Reply-To: <20230202133817.56293-1-neal.frager@amd.com> References: <20230202133817.56293-1-neal.frager@amd.com> Message-ID: <20230205132420.6a559edd@windsurf> On Thu, 2 Feb 2023 13:38:17 +0000 Neal Frager via buildroot wrote: > If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > buildroot into the linux tree, these .dts files are copied to > arch/arm64/boot. Unfortunately, the post-image.sh script expects to find > them in arch/arm64/boot/xilinx. > > This patch does not require the xilinx/ prefix to be present when > symlinking the device-tree to system.dtb where u-boot expects to find > it. > > It is effectively applying the below patch for zynqmp to versal as well: > https://patchwork.ozlabs.org/project/buildroot/patch/20230201195956.1758827-1-gsmecher at threespeedlogic.com/ > > Signed-off-by: Neal Frager > --- > board/versal/post-image.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 5 12:28:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 13:28:07 +0100 Subject: [Buildroot] [git commit] package/python-pytest: remove runtime dependency on python-toml Message-ID: <20230205122816.34E968378B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f802249c6227fa1b7299e59d8fff43b98cb2106d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since version 7.2 [1], with Python 3.11+ pytest no longer uses tomli to parse pyproject.toml but instead uses tomllib which is part of Python itself [2]. Note that toml was replaced with tomli in version 7.0, so the dependency was anyway incorrect. Note that tomllib is unconditionally installed as part of Python 3.11, there is no PYTHON3_LIBTOML option or anything like that that needs to be selected. [1] https://docs.pytest.org/en/latest/changelog.html#pytest-7-2-0-2022-10-23 [2] https://github.com/pytest-dev/pytest/pull/9741 Signed-off-by: Arnout Vandecappelle Reviewed-by: Ryan Barnett Signed-off-by: Thomas Petazzoni --- package/python-pytest/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in index c3956c76d2..9bbc9ea2d2 100644 --- a/package/python-pytest/Config.in +++ b/package/python-pytest/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_PYTEST select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_PLUGGY # runtime select BR2_PACKAGE_PYTHON_PY # runtime - select BR2_PACKAGE_PYTHON_TOML # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help pytest is a framework that makes building simple and scalable From yann.morin.1998 at free.fr Sun Feb 5 12:29:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:29:22 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bad: add new va option Message-ID: <20230205122936.6936483798@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f291a384388a4d48c118b68fb25affb868fb280 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This option enables va plugin support. These plugins are vaapi based encoders/decoders that are eventually intended to replace the legacy vaapi plugins. Details: https://gstreamer.freedesktop.org/documentation/va/index.html Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-bad/Config.in | 11 +++++++++++ package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index bcb4cb1545..1e89cd124f 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -629,6 +629,17 @@ comment "uvch264 needs a toolchain w/ threads, wchar, gcc >= 4.9" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA + bool "va" + depends on !BR2_STATIC_LIBS # libva + depends on BR2_TOOLCHAIN_HAS_THREADS # libva + select BR2_PACKAGE_LIBVA + help + VA-API new plugin + +comment "va needs a toolchain w/ threads, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC bool "voaacenc" select BR2_PACKAGE_VO_AACENC diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 8f11ce6b37..dfe1f1c9eb 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -745,6 +745,16 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Duvch264=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dva=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += libva +ifeq ($(BR2_PACKAGE_LIBDRM),y) +GST1_PLUGINS_BAD_DEPENDENCIES += libdrm +endif +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dva=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dvoaacenc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += vo-aacenc From peter at korsgaard.com Sun Feb 5 12:31:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 13:31:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/ssdp-responder: fix misspelled define directive In-Reply-To: <20230123051808.2213859-1-troglobit@gmail.com> (Joachim Wiberg's message of "Mon, 23 Jan 2023 06:18:07 +0100") References: <20230123051808.2213859-1-troglobit@gmail.com> Message-ID: <877cwwxpik.fsf@dell.be.48ers.dk> >>>>> "Joachim" == Joachim Wiberg writes: > Signed-off-by: Joachim Wiberg Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 12:31:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 13:31:03 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/ssdp-responder: fix misspelled define directive Message-ID: <20230205123151.D641C837A1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=03c15062c33a92145ef28d71819ce52adb8851fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN (cherry picked from commit 6e0ba6bfc2d28a8079d336a18cc50f0825952ec2) Signed-off-by: Peter Korsgaard --- package/ssdp-responder/ssdp-responder.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index 3fee4c2006..d878e3c629 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,7 +25,7 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP-RESPONDER_INSTALL_INIT_SYSTEMD +define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service endef From peter at korsgaard.com Sun Feb 5 12:30:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 13:30:51 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/ssdp-responder: fix misspelled define directive Message-ID: <20230205123313.371E2837A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3909dfbb818c8fc25def5c136fa8d4620f7f4a1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN (cherry picked from commit 6e0ba6bfc2d28a8079d336a18cc50f0825952ec2) Signed-off-by: Peter Korsgaard --- package/ssdp-responder/ssdp-responder.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index 3fee4c2006..d878e3c629 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,7 +25,7 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP-RESPONDER_INSTALL_INIT_SYSTEMD +define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service endef From yann.morin.1998 at free.fr Sun Feb 5 12:32:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:32:48 +0100 Subject: [Buildroot] [git commit] package/libfuse3: bump to version 3.13.1 Message-ID: <20230205123440.72299837B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b439a721e0e74e3e97ee10a89853ab6a4b8a627 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/a98/a984d275d949e8dc989870d2d2b6f6c7168d52bb/ Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index 691bfbc9d6..f697f4ad3f 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 224544214204eb348b548d6faa7a9bc91b053aacfc92e8b5da3f478c76ae4a03 libfuse3-3.13.0.tar.gz +sha256 96399b09b91bc717a9e96ffea660d611e6a342547c1abd4d0e858b3dca9d5a13 libfuse3-3.13.1.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index d94f7d3d3a..a2e9775868 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.13.0 +LIBFUSE3_VERSION = 3.13.1 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sun Feb 5 12:36:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:36:06 +0100 Subject: [Buildroot] [PATCH] package/libfuse3: bump to version 3.13.1 In-Reply-To: <20230204203750.513283-1-giulio.benetti@benettiengineering.com> References: <20230204203750.513283-1-giulio.benetti@benettiengineering.com> Message-ID: <20230205123606.GD2960@scaer> Giulio, All, On 2023-02-04 21:37 +0100, Giulio Benetti spake thusly: > Fixes: > http://autobuild.buildroot.net/results/a98/a984d275d949e8dc989870d2d2b6f6c7168d52bb/ > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libfuse3/libfuse3.hash | 2 +- > package/libfuse3/libfuse3.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash > index 691bfbc9d6..f697f4ad3f 100644 > --- a/package/libfuse3/libfuse3.hash > +++ b/package/libfuse3/libfuse3.hash > @@ -1,3 +1,3 @@ > # Locally calculated sha256 checksums > -sha256 224544214204eb348b548d6faa7a9bc91b053aacfc92e8b5da3f478c76ae4a03 libfuse3-3.13.0.tar.gz > +sha256 96399b09b91bc717a9e96ffea660d611e6a342547c1abd4d0e858b3dca9d5a13 libfuse3-3.13.1.tar.gz > sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE > diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk > index d94f7d3d3a..a2e9775868 100644 > --- a/package/libfuse3/libfuse3.mk > +++ b/package/libfuse3/libfuse3.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBFUSE3_VERSION = 3.13.0 > +LIBFUSE3_VERSION = 3.13.1 > LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) > LIBFUSE3_LICENSE = LGPL-2.1 > LIBFUSE3_LICENSE_FILES = LICENSE > -- > 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 Feb 5 12:36:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:36:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/gst1-plugins-bad: add new va option In-Reply-To: <20230205042232.1014672-1-james.hilliard1@gmail.com> References: <20230205042232.1014672-1-james.hilliard1@gmail.com> Message-ID: <20230205123623.GE2960@scaer> James, All, On 2023-02-04 21:22 -0700, James Hilliard spake thusly: > This option enables va plugin support. > > These plugins are vaapi based encoders/decoders that are eventually > intended to replace the legacy vaapi plugins. > > Details: > https://gstreamer.freedesktop.org/documentation/va/index.html > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gstreamer1/gst1-plugins-bad/Config.in | 11 +++++++++++ > .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 10 ++++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in > index bcb4cb1545..1e89cd124f 100644 > --- a/package/gstreamer1/gst1-plugins-bad/Config.in > +++ b/package/gstreamer1/gst1-plugins-bad/Config.in > @@ -629,6 +629,17 @@ comment "uvch264 needs a toolchain w/ threads, wchar, gcc >= 4.9" > depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > > +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA > + bool "va" > + depends on !BR2_STATIC_LIBS # libva > + depends on BR2_TOOLCHAIN_HAS_THREADS # libva > + select BR2_PACKAGE_LIBVA > + help > + VA-API new plugin > + > +comment "va needs a toolchain w/ threads, dynamic library" > + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS > + > config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC > bool "voaacenc" > select BR2_PACKAGE_VO_AACENC > diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk > index 8f11ce6b37..dfe1f1c9eb 100644 > --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk > +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk > @@ -745,6 +745,16 @@ else > GST1_PLUGINS_BAD_CONF_OPTS += -Duvch264=disabled > endif > > +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA),y) > +GST1_PLUGINS_BAD_CONF_OPTS += -Dva=enabled > +GST1_PLUGINS_BAD_DEPENDENCIES += libva > +ifeq ($(BR2_PACKAGE_LIBDRM),y) > +GST1_PLUGINS_BAD_DEPENDENCIES += libdrm > +endif > +else > +GST1_PLUGINS_BAD_CONF_OPTS += -Dva=disabled > +endif > + > ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC),y) > GST1_PLUGINS_BAD_CONF_OPTS += -Dvoaacenc=enabled > GST1_PLUGINS_BAD_DEPENDENCIES += vo-aacenc > -- > 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 Feb 5 12:36:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:36:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/gst1-vaapi: fix x11 dependencies In-Reply-To: <20230205023709.799349-1-james.hilliard1@gmail.com> References: <20230205023709.799349-1-james.hilliard1@gmail.com> Message-ID: <20230205123644.GF2960@scaer> James, All, On 2023-02-04 19:37 -0700, James Hilliard spake thusly: > The x11 feature needs libx11 and libxrandr support. > > Select and depend on these when x11 is enabled. > > Fixes: > gst1-vaapi-1.22.0/meson.build:96:0: ERROR: Dependency "xrandr" not found, tried pkgconfig and cmake > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gstreamer1/gst1-vaapi/Config.in | 2 ++ > package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 3 ++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in > index ade8b83a5f..a1062097ed 100644 > --- a/package/gstreamer1/gst1-vaapi/Config.in > +++ b/package/gstreamer1/gst1-vaapi/Config.in > @@ -8,6 +8,8 @@ config BR2_PACKAGE_GST1_VAAPI > select BR2_PACKAGE_LIBDRM > select BR2_PACKAGE_GST1_PLUGINS_BASE > select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers > + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 > help > gstreamer-vaapi consists in a collection of VA-API based > plugins for GStreamer and helper libraries. > diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk > index 3d9eb91ffb..9533cdf2b6 100644 > --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk > +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk > @@ -43,8 +43,9 @@ else > GST1_VAAPI_CONF_OPTS += -Dwayland=disabled > endif > > -ifeq ($(BR2_PACKAGE_XORG7),y) > +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy) > GST1_VAAPI_CONF_OPTS += -Dx11=enabled > +GST1_VAAPI_DEPENDENCIES += xlib_libX11 xlib_libXrandr > ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) > GST1_VAAPI_CONF_OPTS += -Dglx=enabled > else > -- > 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 Feb 5 12:40:49 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 13:40:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: add CPE variables Message-ID: <20230205124049.5139-1-fontaine.fabrice@gmail.com> cpe:2.3:a:treasuredata:fluent_bit is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atreasuredata%3Afluent_bit Signed-off-by: Fabrice Fontaine --- package/fluent-bit/fluent-bit.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 6e9a33e02e..879437e5f4 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -8,6 +8,8 @@ FLUENT_BIT_VERSION = 2.0.8 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE +FLUENT_BIT_CPE_ID_VENDOR = treasuredata +FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl FLUENT_BIT_CONF_OPTS += \ -- 2.39.0 From yann.morin.1998 at free.fr Sun Feb 5 12:51:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:51:13 +0100 Subject: [Buildroot] [git commit] package/rdma-core: new package Message-ID: <20230205125237.A6202837ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is the userspace components for the Linux Kernel's drivers/infiniband subsystem. https://github.com/linux-rdma/rdma-core Tested-by: Shamraiz Ashraf Signed-off-by: Julien Olivain [yann.morin.1998 at free.fr: - select iproute2 as it provides the 'rdma' utility ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 + package/Config.in | 1 + package/rdma-core/Config.in | 20 ++++++ package/rdma-core/rdma-core.hash | 5 ++ package/rdma-core/rdma-core.mk | 24 +++++++ package/rdma-core/readme.txt | 75 ++++++++++++++++++++++ support/testing/tests/package/test_rdma_core.py | 43 +++++++++++++ .../package/test_rdma_core/linux-rdma.fragment | 9 +++ 8 files changed, 180 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d526451ca3..73905748ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1695,6 +1695,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/tinycompress/ F: package/z3/ @@ -1710,6 +1711,8 @@ F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_rdma_core.py +F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py N: Julien Viard de Galbert diff --git a/package/Config.in b/package/Config.in index 83fddf316f..1f6db14d56 100644 --- a/package/Config.in +++ b/package/Config.in @@ -573,6 +573,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..59f5ef63ae --- /dev/null +++ b/package/rdma-core/Config.in @@ -0,0 +1,20 @@ +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_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_IPROUTE2 # runtime + 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 + +comment "rdma-core needs a toolchain w/ headers >= 3.4, threads, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \ + || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash new file mode 100644 index 0000000000..1aff44f7f4 --- /dev/null +++ b/package/rdma-core/rdma-core.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 4a2eec55b37ac25f25e7680a372f71c1781c23808542bd31fb68dc0448b8cba2 rdma-core-44.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..885821bf98 --- /dev/null +++ b/package/rdma-core/rdma-core.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# rdma-core +# +################################################################################ + +RDMA_CORE_VERSION = 44.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..9a95226ef4 --- /dev/null +++ b/package/rdma-core/readme.txt @@ -0,0 +1,75 @@ +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 configuration, 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). The Kernel +config fragment file used for package test can be used as a starting +point. See: + + support/testing/tests/package/test_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 -d 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..614fb51f48 --- /dev/null +++ b/support/testing/tests/package/test_rdma_core.py @@ -0,0 +1,43 @@ +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.91" + 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="{}" + 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 + """.format( + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") + ) + + 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") diff --git a/support/testing/tests/package/test_rdma_core/linux-rdma.fragment b/support/testing/tests/package/test_rdma_core/linux-rdma.fragment new file mode 100644 index 0000000000..e305f27e62 --- /dev/null +++ b/support/testing/tests/package/test_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 From yann.morin.1998 at free.fr Sun Feb 5 12:54:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 13:54:16 +0100 Subject: [Buildroot] [PATCH v6 1/2] package/rdma-core: new package In-Reply-To: <20230202202002.3272959-1-ju.o@free.fr> References: <20230202202002.3272959-1-ju.o@free.fr> Message-ID: <20230205125416.GG2960@scaer> Julien, All, On 2023-02-02 21:20 +0100, Julien Olivain spake thusly: > This is the userspace components for the Linux Kernel's > drivers/infiniband subsystem. > > https://github.com/linux-rdma/rdma-core > > Tested-by: Shamraiz Ashraf > Signed-off-by: Julien Olivain > --- [--SNIP--] > diff --git a/package/rdma-core/Config.in b/package/rdma-core/Config.in > new file mode 100644 > index 0000000000..437cf903ac > --- /dev/null > +++ b/package/rdma-core/Config.in > @@ -0,0 +1,22 @@ > +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. > + > + Note: The 'rdma' utility program is provided by the > + 'iproute2' package, when compiled with the package 'libmnl' > + also selected. This program is needed to configure > + InfiniBand and RDMA networks from the command line. Since it requires that utility from iproute2, I added a select (and appropriate dependencies),and dropped that comment. Applied to master, thanks. Regards, Yann E. MORIN. > + https://github.com/linux-rdma/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/rdma-core.hash b/package/rdma-core/rdma-core.hash > new file mode 100644 > index 0000000000..1aff44f7f4 > --- /dev/null > +++ b/package/rdma-core/rdma-core.hash > @@ -0,0 +1,5 @@ > +# Locally calculated > +sha256 4a2eec55b37ac25f25e7680a372f71c1781c23808542bd31fb68dc0448b8cba2 rdma-core-44.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..885821bf98 > --- /dev/null > +++ b/package/rdma-core/rdma-core.mk > @@ -0,0 +1,24 @@ > +################################################################################ > +# > +# rdma-core > +# > +################################################################################ > + > +RDMA_CORE_VERSION = 44.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..9a95226ef4 > --- /dev/null > +++ b/package/rdma-core/readme.txt > @@ -0,0 +1,75 @@ > +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 configuration, 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). The Kernel > +config fragment file used for package test can be used as a starting > +point. See: > + > + support/testing/tests/package/test_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 -d 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..614fb51f48 > --- /dev/null > +++ b/support/testing/tests/package/test_rdma_core.py > @@ -0,0 +1,43 @@ > +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.91" > + 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="{}" > + 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 > + """.format( > + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") > + ) > + > + 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") > diff --git a/support/testing/tests/package/test_rdma_core/linux-rdma.fragment b/support/testing/tests/package/test_rdma_core/linux-rdma.fragment > new file mode 100644 > index 0000000000..e305f27e62 > --- /dev/null > +++ b/support/testing/tests/package/test_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 > -- > 2.39.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 ju.o at free.fr Sun Feb 5 13:03:55 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 5 Feb 2023 14:03:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/z3: bump to version 4.12.1 Message-ID: <20230205130355.797050-1-ju.o@free.fr> For change log since v4.12.0, see: - https://github.com/Z3Prover/z3/releases/tag/z3-4.12.1 Signed-off-by: Julien Olivain --- Patch tested on branch master at commit 8bb9627 with commands: make check-package ... 0 warnings generated support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_z3 ... OK ./utils/test-pkg -p z3 ... 6 builds, 4 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/z3/z3.hash | 2 +- package/z3/z3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/z3/z3.hash b/package/z3/z3.hash index 517e2f4923..8a511c3fe5 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5f575f0a3950760436217da1cc1a714569b6d4f664a75bb6775876328cf0a580 z3-4.12.0.tar.gz +sha256 a3735fabf00e1341adcc70394993c05fd3e2ae167a3e9bb46045e33084eb64a3 z3-4.12.1.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index ecd79325dc..45c412ad12 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.12.0 +Z3_VERSION = 4.12.1 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 5 13:06:00 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 14:06:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/opusfile: fix CVE-2022-47021 Message-ID: <20230205130600.18051-1-fontaine.fabrice@gmail.com> A null pointer dereference issue was discovered in functions op_get_data and op_open1 in opusfile.c in xiph opusfile 0.9 thru 0.12 allows attackers to cause denial of service or other unspecified impacts. Signed-off-by: Fabrice Fontaine --- ...ocation-failure-from-ogg_sync_buffer.patch | 44 +++++++++++++++++++ package/opusfile/opusfile.mk | 3 ++ 2 files changed, 47 insertions(+) create mode 100644 package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch diff --git a/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch new file mode 100644 index 0000000000..2ef08502ab --- /dev/null +++ b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch @@ -0,0 +1,44 @@ +From 0a4cd796df5b030cb866f3f4a5e41a4b92caddf5 Mon Sep 17 00:00:00 2001 +From: Ralph Giles +Date: Tue, 6 Sep 2022 19:04:31 -0700 +Subject: [PATCH] Propagate allocation failure from ogg_sync_buffer. + +Instead of segfault, report OP_EFAULT if ogg_sync_buffer returns +a null pointer. This allows more graceful recovery by the caller +in the unlikely event of a fallible ogg_malloc call. + +We do check the return value elsewhere in the code, so the new +checks make the code more consistent. + +Thanks to https://github.com/xiph/opusfile/issues/36 for reporting. + +Signed-off-by: Timothy B. Terriberry +Signed-off-by: Mark Harris + +[Retrieved from: +https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5] +Signed-off-by: Fabrice Fontaine +--- + src/opusfile.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/opusfile.c b/src/opusfile.c +index ca219b2..3c3c81e 100644 +--- a/src/opusfile.c ++++ b/src/opusfile.c +@@ -148,6 +148,7 @@ static int op_get_data(OggOpusFile *_of,int _nbytes){ + int nbytes; + OP_ASSERT(_nbytes>0); + buffer=(unsigned char *)ogg_sync_buffer(&_of->oy,_nbytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + nbytes=(int)(*_of->callbacks.read)(_of->stream,buffer,_nbytes); + OP_ASSERT(nbytes<=_nbytes); + if(OP_LIKELY(nbytes>0))ogg_sync_wrote(&_of->oy,nbytes); +@@ -1527,6 +1528,7 @@ static int op_open1(OggOpusFile *_of, + if(_initial_bytes>0){ + char *buffer; + buffer=ogg_sync_buffer(&_of->oy,(long)_initial_bytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + memcpy(buffer,_initial_data,_initial_bytes*sizeof(*buffer)); + ogg_sync_wrote(&_of->oy,(long)_initial_bytes); + } diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk index 72ae82e801..63553a81e7 100644 --- a/package/opusfile/opusfile.mk +++ b/package/opusfile/opusfile.mk @@ -11,6 +11,9 @@ OPUSFILE_LICENSE = BSD-3-Clause OPUSFILE_LICENSE_FILES = COPYING OPUSFILE_INSTALL_STAGING = YES +# 0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch +OPUSFILE_IGNORE_CVES += CVE-2022-47021 + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPUSFILE_DEPENDENCIES += openssl else -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 5 13:23:07 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 14:23:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: add utf8proc optional dependency Message-ID: <20230205132307.41753-1-fontaine.fabrice@gmail.com> utf8proc is an optional dependency since version 2.3 and https://github.com/tmux/tmux/commit/6c94774b70f72952c4c512e4aa59a207ca1c34f2 Signed-off-by: Fabrice Fontaine --- package/tmux/tmux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 281b7d8ee6..b1c0af1a83 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -11,6 +11,13 @@ TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_UTF8PROC),y) +TMUX_DEPENDENCIES += utf8proc +TMUX_CONF_OPTS += --enable-utf8proc +else +TMUX_CONF_OPTS += --disable-utf8proc +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 5 14:00:02 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 15:00:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/modsecurity2: security bump to version 2.9.7 Message-ID: <20230205140002.154492-1-fontaine.fabrice@gmail.com> - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads in ModSecurity before 2.9.7 may allow for Web Application Firewall bypasses and buffer overflows on the Web Application Firewall when executing rules that read the FILES_TMP_CONTENT collection. - host-pkgconf is mandatory and used to find libxml2 since https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 - pcre2 is supported since: https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES Signed-off-by: Fabrice Fontaine --- package/modsecurity2/Config.in | 2 +- package/modsecurity2/modsecurity2.hash | 4 ++-- package/modsecurity2/modsecurity2.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in index 2870386a99..fb1bfc960e 100644 --- a/package/modsecurity2/Config.in +++ b/package/modsecurity2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_MODSECURITY2 bool "modsecurity2" depends on BR2_PACKAGE_APACHE select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help ModSecurity is an open source, cross-platform web application firewall (WAF) module. Known as the "Swiss Army Knife" of diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash index a19f4823a8..2c77ffd830 100644 --- a/package/modsecurity2/modsecurity2.hash +++ b/package/modsecurity2/modsecurity2.hash @@ -1,5 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.5/modsecurity-2.9.5.tar.gz.sha256 -sha256 e2bfc8cd8b8de1e21f054d310543373ea5d89adbd96784e832be0da3e4dc149e modsecurity-2.9.5.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz.sha256 +sha256 2a28fcfccfef21581486f98d8d5fe0397499749b8380f60ec7bb1c08478e1839 modsecurity-2.9.7.tar.gz # Locally computed sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index a1ad8fe5bc..c251291e64 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODSECURITY2_VERSION = 2.9.5 +MODSECURITY2_VERSION = 2.9.7 MODSECURITY2_SOURCE = modsecurity-$(MODSECURITY2_VERSION).tar.gz MODSECURITY2_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) MODSECURITY2_LICENSE = Apache-2.0 @@ -12,11 +12,10 @@ MODSECURITY2_LICENSE_FILES = LICENSE MODSECURITY2_CPE_ID_VENDOR = trustwave MODSECURITY2_CPE_ID_PRODUCT = modsecurity MODSECURITY2_INSTALL_STAGING = YES -MODSECURITY2_DEPENDENCIES = apache libxml2 pcre +MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 MODSECURITY2_CONF_OPTS = \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ - --with-libxml=$(STAGING_DIR)/usr \ + --with-pcre2=$(STAGING_DIR)/usr/bin/pcre2-config \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ --with-apu=$(STAGING_DIR)/usr/bin/apu-1-config \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ -- 2.39.0 From thomas.petazzoni at bootlin.com Sun Feb 5 14:00:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 15:00:23 +0100 Subject: [Buildroot] [PATCH] toolchain: make paranoid check of library/header paths unconditional In-Reply-To: <20221107214903.1565321-1-yann.morin.1998@free.fr> References: <20221107214903.1565321-1-yann.morin.1998@free.fr> Message-ID: <20230205150023.105dfc14@windsurf> On Mon, 7 Nov 2022 22:49:03 +0100 "Yann E. MORIN" wrote: > When we introduced support for the paranoid check of unsafe libraries > and headers path with commit 4ac8f78d3771 (Add option for paranoid > unsafe path checking) back in 2014, we made it optional, as we expected > that would break quite a few packages. > > Now, almost 8 years later, we only have three packages that explicitly > reference the option (dillo, gnuradio, and libtalloc), either in a patch > or in their .mk. > > The option has been enabled by default since 2016, with 61c8854cef2a > (toolchain: enable paranoid unsafe path check by default), and that has > not triggered many build failures in a while. > > The minimal defconfig used by test-pkg has also had it enabled as of > b6c98b3549d8 (minimal.config: add BR2_COMPILER_PARANOID_UNSAFE_PATH=y) > in 2017. > > It is time to make that globally unconditional now. > > There is still a remnant, in our binutils patches. As our toolchain may > get used outside of Buildroot, people may got the expectation that path > poisoning is only a warning, so we keep the current behaviour. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Romain Naour > --- > Config.in | 18 ------------------ > package/Makefile.in | 3 +-- > support/config-fragments/minimal.config | 1 - > toolchain/toolchain-wrapper.c | 21 ++++----------------- > 4 files changed, 5 insertions(+), 38 deletions(-) Acked-by: Thomas Petazzoni Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sun Feb 5 14:06:02 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 15:06:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/upx: security bump to version 4.0.2 Message-ID: <20230205140602.161881-1-fontaine.fabrice@gmail.com> Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to cause a denial of service (abort) via a crafted file. Fix CVE-2023-23457: A Segmentation fault was found in UPX in PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a crafted input file allows invalid memory address access that could lead to a denial of service. https://github.com/upx/upx/blob/v4.0.2/NEWS Signed-off-by: Fabrice Fontaine --- package/upx/upx.hash | 2 +- package/upx/upx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 9f7c40c819..7c24906152 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz +sha256 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f upx-4.0.2-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index ef346b2310..6018b0a63d 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPX_VERSION = 4.0.1 +UPX_VERSION = 4.0.2 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ -- 2.39.0 From yann.morin.1998 at free.fr Sun Feb 5 14:03:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:03:50 +0100 Subject: [Buildroot] [git commit] package/perftest: new package Message-ID: <20230205140752.DD7F383829@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4ecefa3ccbe29b1e047c97a995a7c966a191583 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Open Fabrics Performance Tests. This is a collection of tests written over uverbs intended for use as a performance micro-benchmark. The tests may be used for HW or SW tuning as well as for functional testing. https://github.com/linux-rdma/perftest Tested-by: Shamraiz Ashraf Signed-off-by: Julien Olivain [yann.morin.1998 at free.fr - move all arch-related dependencies to _ARCH_SUPPORTS - include musl condition in comment and its dependnecies ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/perftest/Config.in | 41 ++++++++++++++++++++++ package/perftest/perftest.hash | 3 ++ package/perftest/perftest.mk | 15 ++++++++ support/testing/tests/package/test_perftest.py | 48 ++++++++++++++++++++++++++ 6 files changed, 110 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 73905748ce..3eb7fba339 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1691,6 +1691,7 @@ F: package/gnupg2/ F: package/glslsandbox-player/ F: package/octave/ F: package/ola/ +F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ @@ -1708,6 +1709,7 @@ F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ +F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py diff --git a/package/Config.in b/package/Config.in index 1f6db14d56..f32209db95 100644 --- a/package/Config.in +++ b/package/Config.in @@ -133,6 +133,7 @@ menu "Debugging, profiling and benchmark" source "package/oprofile/Config.in" source "package/pax-utils/Config.in" source "package/pcm-tools/Config.in" + source "package/perftest/Config.in" source "package/piglit/Config.in" source "package/ply/Config.in" source "package/poke/Config.in" diff --git a/package/perftest/Config.in b/package/perftest/Config.in new file mode 100644 index 0000000000..25cd1a9b8d --- /dev/null +++ b/package/perftest/Config.in @@ -0,0 +1,41 @@ +config BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS + bool + # Accurate cycle measurement in perftest is implemented for a + # limited set of architectures, see: + # https://github.com/linux-rdma/perftest/blob/v4.5-0.20/src/get_clock.h + # Note: the package has also a fallback to use "asm/timex.h" + # from the Kernel, in + # "$(LINUX_DIR)/arch/$(KERNEL_ARCH)/include". It is not + # reflected here as this path is not well tested. + default y if BR2_i386 || BR2_x86_64 + default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 && !BR2_ARM_CPU_ARMV6 + default y if BR2_aarch64 + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x + default y if BR2_sparc || BR2_sparc64 + default y if BR2_riscv + depends on BR2_USE_MMU # rdma-core + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # rdma-core + +config BR2_PACKAGE_PERFTEST + bool "perftest" + depends on BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS # rdma-core + # musl does not define sysconf(_SC_LEVEL1_DCACHE_LINESIZE) + depends on !BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_PCIUTILS + select BR2_PACKAGE_RDMA_CORE + help + Open Fabrics Performance Tests. + + This is a collection of tests written over uverbs intended + for use as a performance micro-benchmark. The tests may be + used for HW or SW tuning as well as for functional testing. + + https://github.com/linux-rdma/perftest + +comment "perftest needs a glibc or uClibc toolchain w/ threads, dynamic library" + depends on BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ + || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/perftest/perftest.hash b/package/perftest/perftest.hash new file mode 100644 index 0000000000..4333231c44 --- /dev/null +++ b/package/perftest/perftest.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 32e667dac1c0dd41a3951c5a54b961a8e28db5d9478caea2dfc268a312968c99 perftest-4.5-0.20.tar.gz +sha256 763adb7d5094f2127b026adea8701f042d28d4b1f6fb8b6e828989227a9cf7f5 COPYING diff --git a/package/perftest/perftest.mk b/package/perftest/perftest.mk new file mode 100644 index 0000000000..7ad20d0974 --- /dev/null +++ b/package/perftest/perftest.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# perftest +# +################################################################################ + +PERFTEST_VERSION = 4.5-0.20 +PERFTEST_SITE = $(call github,linux-rdma,perftest,v$(PERFTEST_VERSION)) +PERFTEST_LICENSE = GPL-2.0 or BSD-2-Clause +PERFTEST_LICENSE_FILES = COPYING +PERFTEST_DEPENDENCIES = pciutils rdma-core +# Fetched from Github, with no configure script +PERFTEST_AUTORECONF = YES + +$(eval $(autotools-package)) diff --git a/support/testing/tests/package/test_perftest.py b/support/testing/tests/package/test_perftest.py new file mode 100644 index 0000000000..680b70d784 --- /dev/null +++ b/support/testing/tests/package/test_perftest.py @@ -0,0 +1,48 @@ +import os + +import infra.basetest + + +class TestPerftest(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.91" + 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="{}" + 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 + BR2_PACKAGE_PERFTEST=y + """.format( + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") + ) + + 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("ip link set dev eth0 up") + self.assertRunOk("rdma link add rxe0 type rxe netdev eth0") + + # start a server + self.assertRunOk("ib_read_bw > /dev/null 2>&1 &") + + # start a client + self.assertRunOk("sleep 1 && ib_read_bw 127.0.0.1") From yann.morin.1998 at free.fr Sun Feb 5 14:09:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:09:05 +0100 Subject: [Buildroot] [PATCH v6 2/2] package/perftest: new package In-Reply-To: <20230202202002.3272959-2-ju.o@free.fr> References: <20230202202002.3272959-1-ju.o@free.fr> <20230202202002.3272959-2-ju.o@free.fr> Message-ID: <20230205140905.GH2960@scaer> Julien, All, On 2023-02-02 21:20 +0100, Julien Olivain spake thusly: > Open Fabrics Performance Tests. > > This is a collection of tests written over uverbs intended > for use as a performance micro-benchmark. The tests may be > used for HW or SW tuning as well as for functional testing. > > https://github.com/linux-rdma/perftest > > Tested-by: Shamraiz Ashraf > Signed-off-by: Julien Olivain Applied to master, thanks. I however did a few cleanups: - move all arch-related dependencies to _ARCH_SUPPORTS - include musl condition in comment and its dependnecies Regards, Yann E. MORIN. > --- > Changes v5 -> v6: > - Update perftest from version 4.5-0.18 to 4.5-0.20 > - Update kernel in test from 5.15.80 to 5.15.91 > - Add perftest entries in DEVELOPERS file > > Changes v1 -> v5: > - introduce perftest package in v5 patch series > --- > Tested on branch main at commit aff4317 with commands: > > make check-package > ... > 0 warnings generated > > python3 -m flake8 support/testing/tests/package/test_perftest.py > [no-output] > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_perftest.TestPerftest > ... > OK > > ./utils/test-pkg -a -p perftest > arm-aarch64 [ 1/44]: OK > bootlin-aarch64-glibc [ 2/44]: OK > bootlin-arcle-hs38-uclibc [ 3/44]: SKIPPED > bootlin-armv5-uclibc [ 4/44]: SKIPPED > bootlin-armv7-glibc [ 5/44]: OK > bootlin-armv7m-uclibc [ 6/44]: SKIPPED > bootlin-armv7-musl [ 7/44]: SKIPPED > bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED > bootlin-m68k-68040-uclibc [ 9/44]: SKIPPED > bootlin-microblazeel-uclibc [10/44]: SKIPPED > bootlin-mipsel32r6-glibc [11/44]: SKIPPED > bootlin-mipsel-uclibc [12/44]: SKIPPED > bootlin-nios2-glibc [13/44]: SKIPPED > bootlin-openrisc-uclibc [14/44]: SKIPPED > bootlin-powerpc64le-power8-glibc [15/44]: OK > bootlin-powerpc-e500mc-uclibc [16/44]: OK > bootlin-riscv32-glibc [17/44]: OK > bootlin-riscv64-glibc [18/44]: OK > bootlin-riscv64-musl [19/44]: SKIPPED > bootlin-sh4-uclibc [20/44]: SKIPPED > bootlin-sparc64-glibc [21/44]: OK > bootlin-sparc-uclibc [22/44]: SKIPPED > bootlin-x86-64-glibc [23/44]: OK > bootlin-x86-64-musl [24/44]: SKIPPED > bootlin-x86-64-uclibc [25/44]: OK > bootlin-xtensa-uclibc [26/44]: SKIPPED > br-arm-basic [27/44]: SKIPPED > br-arm-full-nothread [28/44]: SKIPPED > br-arm-full-static [29/44]: SKIPPED > br-i386-pentium4-full [30/44]: OK > br-i386-pentium-mmx-musl [31/44]: SKIPPED > br-mips64-n64-full [32/44]: SKIPPED > br-mips64r6-el-hf-glibc [33/44]: SKIPPED > br-powerpc-603e-basic-cpp [34/44]: OK > br-powerpc64-power7-glibc [35/44]: OK > linaro-aarch64-be [36/44]: SKIPPED > linaro-aarch64 [37/44]: OK > linaro-arm [38/44]: OK > sourcery-arm-armv4t [39/44]: SKIPPED > sourcery-arm [40/44]: SKIPPED > sourcery-arm-thumb2 [41/44]: OK > sourcery-mips64 [42/44]: SKIPPED > sourcery-mips [43/44]: SKIPPED > sourcery-nios2 [44/44]: SKIPPED > 44 builds, 28 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > --- > DEVELOPERS | 2 + > package/Config.in | 1 + > package/perftest/Config.in | 41 ++++++++++++++++ > package/perftest/perftest.hash | 3 ++ > package/perftest/perftest.mk | 15 ++++++ > .../testing/tests/package/test_perftest.py | 48 +++++++++++++++++++ > 6 files changed, 110 insertions(+) > create mode 100644 package/perftest/Config.in > create mode 100644 package/perftest/perftest.hash > create mode 100644 package/perftest/perftest.mk > create mode 100644 support/testing/tests/package/test_perftest.py > > diff --git a/DEVELOPERS b/DEVELOPERS > index 5eb746f8b4..7abfbe3c44 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1692,6 +1692,7 @@ F: package/gnupg2/ > F: package/glslsandbox-player/ > F: package/octave/ > F: package/ola/ > +F: package/perftest/ > F: package/ptm2human/ > F: package/python-distro/ > F: package/python-gnupg/ > @@ -1709,6 +1710,7 @@ F: support/testing/tests/package/test_ncdu.py > F: support/testing/tests/package/test_octave.py > F: support/testing/tests/package/test_ola.py > F: support/testing/tests/package/test_ola/ > +F: support/testing/tests/package/test_perftest.py > F: support/testing/tests/package/test_python_distro.py > F: support/testing/tests/package/test_python_gnupg.py > F: support/testing/tests/package/test_python_pyalsa.py > diff --git a/package/Config.in b/package/Config.in > index 1f6db14d56..f32209db95 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -133,6 +133,7 @@ menu "Debugging, profiling and benchmark" > source "package/oprofile/Config.in" > source "package/pax-utils/Config.in" > source "package/pcm-tools/Config.in" > + source "package/perftest/Config.in" > source "package/piglit/Config.in" > source "package/ply/Config.in" > source "package/poke/Config.in" > diff --git a/package/perftest/Config.in b/package/perftest/Config.in > new file mode 100644 > index 0000000000..9b2e46e64a > --- /dev/null > +++ b/package/perftest/Config.in > @@ -0,0 +1,41 @@ > +config BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS > + bool > + # Accurate cycle measurement in perftest is implemented for a > + # limited set of architectures, see: > + # https://github.com/linux-rdma/perftest/blob/v4.5-0.20/src/get_clock.h > + # Note: the package has also a fallback to use "asm/timex.h" > + # from the Kernel, in > + # "$(LINUX_DIR)/arch/$(KERNEL_ARCH)/include". It is not > + # reflected here as this path is not well tested. > + default y if BR2_i386 || BR2_x86_64 > + default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 && !BR2_ARM_CPU_ARMV6 > + default y if BR2_aarch64 > + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le > + default y if BR2_s390x > + default y if BR2_sparc || BR2_sparc64 > + default y if BR2_riscv > + > +config BR2_PACKAGE_PERFTEST > + bool "perftest" > + depends on BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS > + depends on !BR2_STATIC_LIBS # rdma-core > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # rdma-core > + depends on BR2_TOOLCHAIN_HAS_THREADS > + # musl does not define sysconf(_SC_LEVEL1_DCACHE_LINESIZE) > + depends on !BR2_TOOLCHAIN_USES_MUSL > + depends on BR2_USE_MMU # rdma-core > + select BR2_PACKAGE_PCIUTILS > + select BR2_PACKAGE_RDMA_CORE # libibverbs, librdmacm, libibumad > + help > + Open Fabrics Performance Tests. > + > + This is a collection of tests written over uverbs intended > + for use as a performance micro-benchmark. The tests may be > + used for HW or SW tuning as well as for functional testing. > + > + https://github.com/linux-rdma/perftest > + > +comment "perftest 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/perftest/perftest.hash b/package/perftest/perftest.hash > new file mode 100644 > index 0000000000..4333231c44 > --- /dev/null > +++ b/package/perftest/perftest.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 32e667dac1c0dd41a3951c5a54b961a8e28db5d9478caea2dfc268a312968c99 perftest-4.5-0.20.tar.gz > +sha256 763adb7d5094f2127b026adea8701f042d28d4b1f6fb8b6e828989227a9cf7f5 COPYING > diff --git a/package/perftest/perftest.mk b/package/perftest/perftest.mk > new file mode 100644 > index 0000000000..7ad20d0974 > --- /dev/null > +++ b/package/perftest/perftest.mk > @@ -0,0 +1,15 @@ > +################################################################################ > +# > +# perftest > +# > +################################################################################ > + > +PERFTEST_VERSION = 4.5-0.20 > +PERFTEST_SITE = $(call github,linux-rdma,perftest,v$(PERFTEST_VERSION)) > +PERFTEST_LICENSE = GPL-2.0 or BSD-2-Clause > +PERFTEST_LICENSE_FILES = COPYING > +PERFTEST_DEPENDENCIES = pciutils rdma-core > +# Fetched from Github, with no configure script > +PERFTEST_AUTORECONF = YES > + > +$(eval $(autotools-package)) > diff --git a/support/testing/tests/package/test_perftest.py b/support/testing/tests/package/test_perftest.py > new file mode 100644 > index 0000000000..680b70d784 > --- /dev/null > +++ b/support/testing/tests/package/test_perftest.py > @@ -0,0 +1,48 @@ > +import os > + > +import infra.basetest > + > + > +class TestPerftest(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.91" > + 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="{}" > + 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 > + BR2_PACKAGE_PERFTEST=y > + """.format( > + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") > + ) > + > + 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("ip link set dev eth0 up") > + self.assertRunOk("rdma link add rxe0 type rxe netdev eth0") > + > + # start a server > + self.assertRunOk("ib_read_bw > /dev/null 2>&1 &") > + > + # start a client > + self.assertRunOk("sleep 1 && ib_read_bw 127.0.0.1") > -- > 2.39.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 Feb 5 14:11:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:11:25 +0100 Subject: [Buildroot] [git commit] toolchain: make paranoid check of library/header paths unconditional Message-ID: <20230205141216.418DC83837@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93e7fc3e53bff9db971f3ae951d93d3bd1a39d1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When we introduced support for the paranoid check of unsafe libraries and headers path with commit 4ac8f78d3771 (Add option for paranoid unsafe path checking) back in 2014, we made it optional, as we expected that would break quite a few packages. Now, almost 8 years later, we only have three packages that explicitly reference the option (dillo, gnuradio, and libtalloc), either in a patch or in their .mk. The option has been enabled by default since 2016, with 61c8854cef2a (toolchain: enable paranoid unsafe path check by default), and that has not triggered many build failures in a while. The minimal defconfig used by test-pkg has also had it enabled as of b6c98b3549d8 (minimal.config: add BR2_COMPILER_PARANOID_UNSAFE_PATH=y) in 2017. It is time to make that globally unconditional now. There is still a remnant, in our binutils patches. As our toolchain may get used outside of Buildroot, people may got the expectation that path poisoning is only a warning, so we keep the current behaviour. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Romain Naour Acked-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- Config.in | 18 ------------------ package/Makefile.in | 3 +-- support/config-fragments/minimal.config | 1 - toolchain/toolchain-wrapper.c | 21 ++++----------------- 4 files changed, 5 insertions(+), 38 deletions(-) diff --git a/Config.in b/Config.in index 86699f58c6..0d7641633c 100644 --- a/Config.in +++ b/Config.in @@ -685,24 +685,6 @@ config BR2_GLOBAL_PATCH_DIR menu "Advanced" -config BR2_COMPILER_PARANOID_UNSAFE_PATH - bool "paranoid check of library/header paths" - default y - help - By default, when this option is disabled, when the Buildroot - cross-compiler will encounter an unsafe library or header path - (such as /usr/include, or /usr/lib), the compiler will display - a warning. - - By enabling this option, this warning is turned into an error, - which will completely abort the build when such unsafe paths - are encountered. - - Note that this mechanism is available for both the internal - toolchain (through the toolchain wrapper and binutils patches) - and external toolchain backends (through the toolchain - wrapper). - config BR2_FORCE_HOST_BUILD bool "Force the building of host dependencies" help diff --git a/package/Makefile.in b/package/Makefile.in index 7f1b00ba24..d70aded82b 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -426,9 +426,8 @@ else ifeq ($(BR2_SHARED_STATIC_LIBS),y) SHARED_STATIC_LIBS_OPTS = --enable-static --enable-shared endif -ifeq ($(BR2_COMPILER_PARANOID_UNSAFE_PATH),y) +# Used by our binutils patches. export BR_COMPILER_PARANOID_UNSAFE_PATH=enabled -endif include package/pkg-download.mk include package/pkg-autotools.mk diff --git a/support/config-fragments/minimal.config b/support/config-fragments/minimal.config index 71344e2c69..3430fcce11 100644 --- a/support/config-fragments/minimal.config +++ b/support/config-fragments/minimal.config @@ -4,5 +4,4 @@ BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set # BR2_TARGET_ROOTFS_TAR is not set -BR2_COMPILER_PARANOID_UNSAFE_PATH=y BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 37b24dd24a..4c08e97237 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -154,12 +154,9 @@ static const struct str_len_s unsafe_opts[] = { * or separated (e.g. -I /foo/bar). In the first case, we need only print * the argument as it already contains the path (arg_has_path), while in * the second case we need to print both (!arg_has_path). - * - * If paranoid, exit in error instead of just printing a warning. */ static void check_unsafe_path(const char *arg, const char *path, - int paranoid, int arg_has_path) { const struct str_len_s *p; @@ -168,14 +165,12 @@ static void check_unsafe_path(const char *arg, if (strncmp(path, p->str, p->len)) continue; fprintf(stderr, - "%s: %s: unsafe header/library path used in cross-compilation: '%s%s%s'\n", + "%s: ERROR: unsafe header/library path used in cross-compilation: '%s%s%s'\n", program_invocation_short_name, - paranoid ? "ERROR" : "WARNING", arg, arg_has_path ? "" : "' '", /* close single-quote, space, open single-quote */ arg_has_path ? "" : path); /* so that arg and path are properly quoted. */ - if (paranoid) - exit(1); + exit(1); } } @@ -250,8 +245,6 @@ int main(int argc, char **argv) char *progpath = argv[0]; char *basename; char *env_debug; - char *paranoid_wrapper; - int paranoid; int ret, i, count = 0, debug = 0, found_shared = 0; /* Debug the wrapper to see arguments it was called with. @@ -470,12 +463,6 @@ int main(int argc, char **argv) #endif } - paranoid_wrapper = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); - if (paranoid_wrapper && strlen(paranoid_wrapper) > 0) - paranoid = 1; - else - paranoid = 0; - /* Check for unsafe library and header paths */ for (i = 1; i < argc; i++) { const struct str_len_s *opt; @@ -492,9 +479,9 @@ int main(int argc, char **argv) i++; if (i == argc) break; - check_unsafe_path(argv[i-1], argv[i], paranoid, 0); + check_unsafe_path(argv[i-1], argv[i], 0); } else - check_unsafe_path(argv[i], argv[i] + opt->len, paranoid, 1); + check_unsafe_path(argv[i], argv[i] + opt->len, 1); } } From yann.morin.1998 at free.fr Sun Feb 5 14:12:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:12:42 +0100 Subject: [Buildroot] [PATCH] toolchain: make paranoid check of library/header paths unconditional In-Reply-To: <20230205150023.105dfc14@windsurf> References: <20221107214903.1565321-1-yann.morin.1998@free.fr> <20230205150023.105dfc14@windsurf> Message-ID: <20230205141242.GI2960@scaer> All, On 2023-02-05 15:00 +0100, Thomas Petazzoni via buildroot spake thusly: > On Mon, 7 Nov 2022 22:49:03 +0100 > "Yann E. MORIN" wrote: > > When we introduced support for the paranoid check of unsafe libraries > > and headers path with commit 4ac8f78d3771 (Add option for paranoid > > unsafe path checking) back in 2014, we made it optional, as we expected > > that would break quite a few packages. [--SNIP--] > > It is time to make that globally unconditional now. > > > > There is still a remnant, in our binutils patches. As our toolchain may > > get used outside of Buildroot, people may got the expectation that path > > poisoning is only a warning, so we keep the current behaviour. > > > > Signed-off-by: Yann E. MORIN > > Cc: Thomas Petazzoni > > Cc: Romain Naour > > --- > > Config.in | 18 ------------------ > > package/Makefile.in | 3 +-- > > support/config-fragments/minimal.config | 1 - > > toolchain/toolchain-wrapper.c | 21 ++++----------------- > > 4 files changed, 5 insertions(+), 38 deletions(-) > > Acked-by: Thomas Petazzoni Applied to master, 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 thomas.petazzoni at bootlin.com Sun Feb 5 14:13:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 15:13:15 +0100 Subject: [Buildroot] [git commit] package/elf2flt: fix error when building gdb for target on m68k Message-ID: <20230205141346.2F75283842@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6f15e85b3ac58ba1d387ea86945d3fabf4f8990 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Thomas reported that m68k fails to build when enabling BR2_PACKAGE_GDB. It fails when building gdb for the target with the following error: elf2flt: ERROR: text=0x3c826 overlaps data=0x256e0 ? It turns out that the gdb binary has another problematic input section (.gcc_except_table), which causes elf2flt to try to append to the .text output section, after it has already moved on with appending sections to the .data output section. elf2flt cannot append to a previous output section once it has moved on to another output section. Update the existing elf2flt patch to also add an exception for .gcc_except_table. Reported-by: Thomas Petazzoni Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni --- ...-fatal-error-regression-on-m68k-xtensa-ri.patch | 47 +++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch index 278709cb1c..616bbc891f 100644 --- a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch +++ b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch @@ -1,8 +1,7 @@ -From 65ac5f9e69cfb989d970da74c41e478774d29be5 Mon Sep 17 00:00:00 2001 +From a8c9f650b82109abf7aa730f298ea5182ed62613 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 9 Aug 2022 21:06:05 +0200 -Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, - riscv64 +Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64 Commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") changed the condition of which input sections that should be included @@ -12,16 +11,15 @@ to: ((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == (SEC_DATA | SEC_READONLY | SEC_RELOC)) -On ARM, the .eh_frame input section does not have the SEC_RELOC flag -set, so this specific change had no effect on ARM. +On ARM, the .eh_frame input section does not have the SEC_RELOC flag set, +so on ARM, this change caused .eh_frame to move from .text to .data. -However, on e.g. m68k and riscv64, the .eh_frame input section does -have the SEC_RELOC flag set, which means that after commit ba379d08bb78 -("elf2flt: fix for segfault on some ARM ELFs"), read-only relocation -data sections were placed in .text output section, instead of .data -output section. +However, on e.g. m68k, xtensa and riscv64, the .eh_frame input section +does have the SEC_RELOC flag set, which means that the change in +commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") +caused .eh_frame to move in an opposite way, i.e. from .data to .text. -This will result in a fatal error on m68k, xtensa and riscv64: +This resulted in a fatal error on m68k, xtensa and riscv64: ERROR: text=0x3bab8 overlaps data=0x33f60 ? This is because elf2flt cannot append to .text after .data has been @@ -36,21 +34,26 @@ to .text after .data has been appended to (which will require elf2flt to move/relocate everything that has already been appended to .data, since the virtual addresses are contiguous). -However, for now, add an exception for m68k, xtensa and riscv64 -(specifically for the problematic input section, .eh_frame), so that we -get the same behavior as older elf2flt releases, where we put read-only -relocation data in .data, which was working perfectly fine. +However, for now, add an exception for input sections which have all +three flags SEC_DATA, SEC_READONLY, and SEC_RELOC set, and which have a +name equal to a problematic input section (.eh_frame, .gcc_except_table). +That way, we get the same behavior as older elf2flt releases for m68k, +xtensa and riscv64, where we put read-only relocation data in .data, +which was working perfectly fine. + +This exception will not change any behavior on ARM, as the .eh_frame +input section does not have flag SEC_RELOC set. Signed-off-by: Niklas Cassel --- - elf2flt.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) + elf2flt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/elf2flt.c b/elf2flt.c -index 9c32f9a..a680c89 100644 +index e0d7891..39d035f 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -340,8 +340,15 @@ compare_relocs (const void *pa, const void *pb) +@@ -341,8 +341,13 @@ compare_relocs (const void *pa, const void *pb) static bool ro_reloc_data_section_should_be_in_text(asection *s) { @@ -58,10 +61,8 @@ index 9c32f9a..a680c89 100644 - (SEC_DATA | SEC_READONLY | SEC_RELOC); + if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == + (SEC_DATA | SEC_READONLY | SEC_RELOC)) { -+#if defined(TARGET_m68k) || defined(TARGET_riscv64) || defined(TARGET_xtensa) -+ if (!strcmp(".eh_frame", s->name)) ++ if (!strcmp(".eh_frame", s->name) || !strcmp(".gcc_except_table", s->name)) + return false; -+#endif + return true; + } + return false; @@ -69,5 +70,5 @@ index 9c32f9a..a680c89 100644 static uint32_t * -- -2.37.1 +2.39.0 From thomas.petazzoni at bootlin.com Sun Feb 5 14:15:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 15:15:02 +0100 Subject: [Buildroot] [PATCH] package/elf2flt: fix error when building gdb for target on m68k In-Reply-To: <20230117153503.2075602-1-niklas.cassel@wdc.com> References: <20230117153503.2075602-1-niklas.cassel@wdc.com> Message-ID: <20230205151502.07fd434d@windsurf> Hello Niklas, On Tue, 17 Jan 2023 16:35:03 +0100 Niklas Cassel via buildroot wrote: > Thomas reported that m68k fails to build when enabling BR2_PACKAGE_GDB. > > It fails when building gdb for the target with the following error: > elf2flt: ERROR: text=0x3c826 overlaps data=0x256e0 ? > > It turns out that the gdb binary has another problematic input section > (.gcc_except_table), which causes elf2flt to try to append to the .text > output section, after it has already moved on with appending sections > to the .data output section. > > elf2flt cannot append to a previous output section once it has moved on > to another output section. > > Update the existing elf2flt patch to also add an exception for > .gcc_except_table. > > Reported-by: Thomas Petazzoni > Signed-off-by: Niklas Cassel > --- > ...l-error-regression-on-m68k-xtensa-ri.patch | 47 ++++++++++--------- > 1 file changed, 24 insertions(+), 23 deletions(-) Many, many thanks for looking into this. It's a bit annoying that those special sections have to be special-cased. Hopefully this will not encounter too many of those special cases. In the mean time, I've applied your patch to master. Thanks again! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 5 14:17:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 5 Feb 2023 15:17:51 +0100 Subject: [Buildroot] [PATCH 1/2] package/lzop: provide a patch to allow overriding of modification time In-Reply-To: <20230119121004.3416962-2-casey@xogium.me> References: <20230119121004.3416962-1-casey@xogium.me> <20230119121004.3416962-2-casey@xogium.me> Message-ID: <20230205151751.2173e6de@windsurf> Hello, On Thu, 19 Jan 2023 13:10:03 +0100 Casey Reeves wrote: > This patch allows lzop to override the modification time using > $SOURCE_DATE_EPOCH. > The original patch written by Florian B?uerle is for lzop 1.04, and > hence needed to be backported to the 1.03 release buildroot is making > use of. Any reason why we're not using lzop 1.04 ? Maybe we should bump lzop 1.04 first ? > --- /dev/null > +++ b/package/lzop/0003-allow-overriding-modification-time.patch > @@ -0,0 +1,46 @@ > +From d3717065d4b4dd7dfa88ebc154185ce752127e93 Mon Sep 17 00:00:00 2001 > +From: Casey Reeves > +Date: Thu, 19 Jan 2023 10:06:31 +0100 > +Subject: [PATCH] allow overriding modification time Could you preserve the authorship of the original patch at https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch ? Your patch is pretty much exactly the same, so we really want to keep the original authorship. The patch should still carry your Signed-off-by and a reference to where the original patch was found. Thanks! 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 Sun Feb 5 14:24:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:24:34 +0100 Subject: [Buildroot] [git commit] package/opusfile: fix CVE-2022-47021 Message-ID: <20230205142502.3323483840@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae65870e652088dd65ca41d63304893d1d4443a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A null pointer dereference issue was discovered in functions op_get_data and op_open1 in opusfile.c in xiph opusfile 0.9 thru 0.12 allows attackers to cause denial of service or other unspecified impacts. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...e-allocation-failure-from-ogg_sync_buffer.patch | 44 ++++++++++++++++++++++ package/opusfile/opusfile.mk | 3 ++ 2 files changed, 47 insertions(+) diff --git a/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch new file mode 100644 index 0000000000..2ef08502ab --- /dev/null +++ b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch @@ -0,0 +1,44 @@ +From 0a4cd796df5b030cb866f3f4a5e41a4b92caddf5 Mon Sep 17 00:00:00 2001 +From: Ralph Giles +Date: Tue, 6 Sep 2022 19:04:31 -0700 +Subject: [PATCH] Propagate allocation failure from ogg_sync_buffer. + +Instead of segfault, report OP_EFAULT if ogg_sync_buffer returns +a null pointer. This allows more graceful recovery by the caller +in the unlikely event of a fallible ogg_malloc call. + +We do check the return value elsewhere in the code, so the new +checks make the code more consistent. + +Thanks to https://github.com/xiph/opusfile/issues/36 for reporting. + +Signed-off-by: Timothy B. Terriberry +Signed-off-by: Mark Harris + +[Retrieved from: +https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5] +Signed-off-by: Fabrice Fontaine +--- + src/opusfile.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/opusfile.c b/src/opusfile.c +index ca219b2..3c3c81e 100644 +--- a/src/opusfile.c ++++ b/src/opusfile.c +@@ -148,6 +148,7 @@ static int op_get_data(OggOpusFile *_of,int _nbytes){ + int nbytes; + OP_ASSERT(_nbytes>0); + buffer=(unsigned char *)ogg_sync_buffer(&_of->oy,_nbytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + nbytes=(int)(*_of->callbacks.read)(_of->stream,buffer,_nbytes); + OP_ASSERT(nbytes<=_nbytes); + if(OP_LIKELY(nbytes>0))ogg_sync_wrote(&_of->oy,nbytes); +@@ -1527,6 +1528,7 @@ static int op_open1(OggOpusFile *_of, + if(_initial_bytes>0){ + char *buffer; + buffer=ogg_sync_buffer(&_of->oy,(long)_initial_bytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + memcpy(buffer,_initial_data,_initial_bytes*sizeof(*buffer)); + ogg_sync_wrote(&_of->oy,(long)_initial_bytes); + } diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk index 72ae82e801..63553a81e7 100644 --- a/package/opusfile/opusfile.mk +++ b/package/opusfile/opusfile.mk @@ -11,6 +11,9 @@ OPUSFILE_LICENSE = BSD-3-Clause OPUSFILE_LICENSE_FILES = COPYING OPUSFILE_INSTALL_STAGING = YES +# 0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch +OPUSFILE_IGNORE_CVES += CVE-2022-47021 + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPUSFILE_DEPENDENCIES += openssl else From yann.morin.1998 at free.fr Sun Feb 5 14:24:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:24:30 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: add CPE variables Message-ID: <20230205142502.294968387B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=32602f9cbb7ec0e0beca5ea0d69671ff41d46323 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:treasuredata:fluent_bit is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atreasuredata%3Afluent_bit Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/fluent-bit/fluent-bit.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 6e9a33e02e..879437e5f4 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -8,6 +8,8 @@ FLUENT_BIT_VERSION = 2.0.8 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE +FLUENT_BIT_CPE_ID_VENDOR = treasuredata +FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl FLUENT_BIT_CONF_OPTS += \ From yann.morin.1998 at free.fr Sun Feb 5 14:24:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:24:43 +0100 Subject: [Buildroot] [git commit] package/upx: security bump to version 4.0.2 Message-ID: <20230205142502.4A34A8388E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02befac8f9404ae30d0d090221d21a8460c82ec7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to cause a denial of service (abort) via a crafted file. Fix CVE-2023-23457: A Segmentation fault was found in UPX in PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a crafted input file allows invalid memory address access that could lead to a denial of service. https://github.com/upx/upx/blob/v4.0.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/upx/upx.hash | 2 +- package/upx/upx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 9f7c40c819..7c24906152 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz +sha256 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f upx-4.0.2-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index ef346b2310..6018b0a63d 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPX_VERSION = 4.0.1 +UPX_VERSION = 4.0.2 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ From yann.morin.1998 at free.fr Sun Feb 5 14:24:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:24:39 +0100 Subject: [Buildroot] [git commit] package/modsecurity2: security bump to version 2.9.7 Message-ID: <20230205142502.3EDC683883@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42e34cf10f9eb037aa8c48a4fb9e8f521901b983 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads in ModSecurity before 2.9.7 may allow for Web Application Firewall bypasses and buffer overflows on the Web Application Firewall when executing rules that read the FILES_TMP_CONTENT collection. - host-pkgconf is mandatory and used to find libxml2 since https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 - pcre2 is supported since: https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modsecurity2/Config.in | 2 +- package/modsecurity2/modsecurity2.hash | 4 ++-- package/modsecurity2/modsecurity2.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in index 2870386a99..fb1bfc960e 100644 --- a/package/modsecurity2/Config.in +++ b/package/modsecurity2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_MODSECURITY2 bool "modsecurity2" depends on BR2_PACKAGE_APACHE select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help ModSecurity is an open source, cross-platform web application firewall (WAF) module. Known as the "Swiss Army Knife" of diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash index a19f4823a8..2c77ffd830 100644 --- a/package/modsecurity2/modsecurity2.hash +++ b/package/modsecurity2/modsecurity2.hash @@ -1,5 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.5/modsecurity-2.9.5.tar.gz.sha256 -sha256 e2bfc8cd8b8de1e21f054d310543373ea5d89adbd96784e832be0da3e4dc149e modsecurity-2.9.5.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz.sha256 +sha256 2a28fcfccfef21581486f98d8d5fe0397499749b8380f60ec7bb1c08478e1839 modsecurity-2.9.7.tar.gz # Locally computed sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index a1ad8fe5bc..c251291e64 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODSECURITY2_VERSION = 2.9.5 +MODSECURITY2_VERSION = 2.9.7 MODSECURITY2_SOURCE = modsecurity-$(MODSECURITY2_VERSION).tar.gz MODSECURITY2_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) MODSECURITY2_LICENSE = Apache-2.0 @@ -12,11 +12,10 @@ MODSECURITY2_LICENSE_FILES = LICENSE MODSECURITY2_CPE_ID_VENDOR = trustwave MODSECURITY2_CPE_ID_PRODUCT = modsecurity MODSECURITY2_INSTALL_STAGING = YES -MODSECURITY2_DEPENDENCIES = apache libxml2 pcre +MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 MODSECURITY2_CONF_OPTS = \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ - --with-libxml=$(STAGING_DIR)/usr \ + --with-pcre2=$(STAGING_DIR)/usr/bin/pcre2-config \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ --with-apu=$(STAGING_DIR)/usr/bin/apu-1-config \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ From fontaine.fabrice at gmail.com Sun Feb 5 14:25:43 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 15:25:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 4.0.3 Message-ID: <20230205142543.285695-1-fontaine.fabrice@gmail.com> Fix CVE-2023-0411, CVE-2023-0412, CVE-2023-0413, CVE-2023-0414, CVE-2023-0415, CVE-2023-0416 and CVE-2023-0417 https://www.wireshark.org/security/wnpa-sec-2023-01 https://www.wireshark.org/security/wnpa-sec-2023-02 https://www.wireshark.org/security/wnpa-sec-2023-03 https://www.wireshark.org/security/wnpa-sec-2023-04 https://www.wireshark.org/security/wnpa-sec-2023-05 https://www.wireshark.org/security/wnpa-sec-2023-06 https://www.wireshark.org/security/wnpa-sec-2023-07 https://www.wireshark.org/docs/relnotes/wireshark-4.0.3.html Signed-off-by: Fabrice Fontaine --- 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 e9026b8caa..7128b560ae 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-4.0.2.txt -sha1 0127180ff18515b086fe5603f767f53ddaa64c1a wireshark-4.0.2.tar.xz -sha256 f35915699f2f9b28ddb211202d40ec8984e5834d3c911483144a4984ba44411d wireshark-4.0.2.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.3.txt +sha1 243b0057cfe6d447662e81b5646110aaf8b63c81 wireshark-4.0.3.tar.xz +sha256 6c51e15bcc0afb93734e686dbff354ffd159f570bd2904bcbbad6f3feb7e9511 wireshark-4.0.3.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index e2a424ef0f..12c36575df 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.0.2 +WIRESHARK_VERSION = 4.0.3 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license -- 2.39.0 From yann.morin.1998 at free.fr Sun Feb 5 14:27:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:27:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/upx: security bump to version 4.0.2 In-Reply-To: <20230205140602.161881-1-fontaine.fabrice@gmail.com> References: <20230205140602.161881-1-fontaine.fabrice@gmail.com> Message-ID: <20230205142705.GJ2960@scaer> Fabrice, All, On 2023-02-05 15:06 +0100, Fabrice Fontaine spake thusly: > Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in > UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to > cause a denial of service (abort) via a crafted file. > > Fix CVE-2023-23457: A Segmentation fault was found in UPX in > PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a > crafted input file allows invalid memory address access that could lead > to a denial of service. > > https://github.com/upx/upx/blob/v4.0.2/NEWS > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/upx/upx.hash | 2 +- > package/upx/upx.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/upx/upx.hash b/package/upx/upx.hash > index 9f7c40c819..7c24906152 100644 > --- a/package/upx/upx.hash > +++ b/package/upx/upx.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz > +sha256 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f upx-4.0.2-src.tar.xz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/upx/upx.mk b/package/upx/upx.mk > index ef346b2310..6018b0a63d 100644 > --- a/package/upx/upx.mk > +++ b/package/upx/upx.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -UPX_VERSION = 4.0.1 > +UPX_VERSION = 4.0.2 > UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) > UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz > UPX_LICENSE = GPL-2.0+ > -- > 2.39.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 Feb 5 14:27:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:27:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/modsecurity2: security bump to version 2.9.7 In-Reply-To: <20230205140002.154492-1-fontaine.fabrice@gmail.com> References: <20230205140002.154492-1-fontaine.fabrice@gmail.com> Message-ID: <20230205142740.GK2960@scaer> Fabrice, All, On 2023-02-05 15:00 +0100, Fabrice Fontaine spake thusly: > - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads > in ModSecurity before 2.9.7 may allow for Web Application Firewall > bypasses and buffer overflows on the Web Application Firewall when > executing rules that read the FILES_TMP_CONTENT collection. > - host-pkgconf is mandatory and used to find libxml2 since > https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 > - pcre2 is supported since: > https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 > > https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/modsecurity2/Config.in | 2 +- > package/modsecurity2/modsecurity2.hash | 4 ++-- > package/modsecurity2/modsecurity2.mk | 7 +++---- > 3 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in > index 2870386a99..fb1bfc960e 100644 > --- a/package/modsecurity2/Config.in > +++ b/package/modsecurity2/Config.in > @@ -2,7 +2,7 @@ config BR2_PACKAGE_MODSECURITY2 > bool "modsecurity2" > depends on BR2_PACKAGE_APACHE > select BR2_PACKAGE_LIBXML2 > - select BR2_PACKAGE_PCRE > + select BR2_PACKAGE_PCRE2 > help > ModSecurity is an open source, cross-platform web application > firewall (WAF) module. Known as the "Swiss Army Knife" of > diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash > index a19f4823a8..2c77ffd830 100644 > --- a/package/modsecurity2/modsecurity2.hash > +++ b/package/modsecurity2/modsecurity2.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.5/modsecurity-2.9.5.tar.gz.sha256 > -sha256 e2bfc8cd8b8de1e21f054d310543373ea5d89adbd96784e832be0da3e4dc149e modsecurity-2.9.5.tar.gz > +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz.sha256 > +sha256 2a28fcfccfef21581486f98d8d5fe0397499749b8380f60ec7bb1c08478e1839 modsecurity-2.9.7.tar.gz > > # Locally computed > sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE > diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk > index a1ad8fe5bc..c251291e64 100644 > --- a/package/modsecurity2/modsecurity2.mk > +++ b/package/modsecurity2/modsecurity2.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MODSECURITY2_VERSION = 2.9.5 > +MODSECURITY2_VERSION = 2.9.7 > MODSECURITY2_SOURCE = modsecurity-$(MODSECURITY2_VERSION).tar.gz > MODSECURITY2_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) > MODSECURITY2_LICENSE = Apache-2.0 > @@ -12,11 +12,10 @@ MODSECURITY2_LICENSE_FILES = LICENSE > MODSECURITY2_CPE_ID_VENDOR = trustwave > MODSECURITY2_CPE_ID_PRODUCT = modsecurity > MODSECURITY2_INSTALL_STAGING = YES > -MODSECURITY2_DEPENDENCIES = apache libxml2 pcre > +MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 > > MODSECURITY2_CONF_OPTS = \ > - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ > - --with-libxml=$(STAGING_DIR)/usr \ > + --with-pcre2=$(STAGING_DIR)/usr/bin/pcre2-config \ > --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ > --with-apu=$(STAGING_DIR)/usr/bin/apu-1-config \ > --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ > -- > 2.39.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 Feb 5 14:28:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:28:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/opusfile: fix CVE-2022-47021 In-Reply-To: <20230205130600.18051-1-fontaine.fabrice@gmail.com> References: <20230205130600.18051-1-fontaine.fabrice@gmail.com> Message-ID: <20230205142844.GL2960@scaer> Fabrice, All, On 2023-02-05 14:06 +0100, Fabrice Fontaine spake thusly: > A null pointer dereference issue was discovered in functions op_get_data > and op_open1 in opusfile.c in xiph opusfile 0.9 thru 0.12 allows > attackers to cause denial of service or other unspecified impacts. > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...ocation-failure-from-ogg_sync_buffer.patch | 44 +++++++++++++++++++ > package/opusfile/opusfile.mk | 3 ++ > 2 files changed, 47 insertions(+) > create mode 100644 package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch > > diff --git a/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch > new file mode 100644 > index 0000000000..2ef08502ab > --- /dev/null > +++ b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch > @@ -0,0 +1,44 @@ > +From 0a4cd796df5b030cb866f3f4a5e41a4b92caddf5 Mon Sep 17 00:00:00 2001 > +From: Ralph Giles > +Date: Tue, 6 Sep 2022 19:04:31 -0700 > +Subject: [PATCH] Propagate allocation failure from ogg_sync_buffer. > + > +Instead of segfault, report OP_EFAULT if ogg_sync_buffer returns > +a null pointer. This allows more graceful recovery by the caller > +in the unlikely event of a fallible ogg_malloc call. > + > +We do check the return value elsewhere in the code, so the new > +checks make the code more consistent. > + > +Thanks to https://github.com/xiph/opusfile/issues/36 for reporting. > + > +Signed-off-by: Timothy B. Terriberry > +Signed-off-by: Mark Harris > + > +[Retrieved from: > +https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5] > +Signed-off-by: Fabrice Fontaine > +--- > + src/opusfile.c | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/src/opusfile.c b/src/opusfile.c > +index ca219b2..3c3c81e 100644 > +--- a/src/opusfile.c > ++++ b/src/opusfile.c > +@@ -148,6 +148,7 @@ static int op_get_data(OggOpusFile *_of,int _nbytes){ > + int nbytes; > + OP_ASSERT(_nbytes>0); > + buffer=(unsigned char *)ogg_sync_buffer(&_of->oy,_nbytes); > ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; > + nbytes=(int)(*_of->callbacks.read)(_of->stream,buffer,_nbytes); > + OP_ASSERT(nbytes<=_nbytes); > + if(OP_LIKELY(nbytes>0))ogg_sync_wrote(&_of->oy,nbytes); > +@@ -1527,6 +1528,7 @@ static int op_open1(OggOpusFile *_of, > + if(_initial_bytes>0){ > + char *buffer; > + buffer=ogg_sync_buffer(&_of->oy,(long)_initial_bytes); > ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; > + memcpy(buffer,_initial_data,_initial_bytes*sizeof(*buffer)); > + ogg_sync_wrote(&_of->oy,(long)_initial_bytes); > + } > diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk > index 72ae82e801..63553a81e7 100644 > --- a/package/opusfile/opusfile.mk > +++ b/package/opusfile/opusfile.mk > @@ -11,6 +11,9 @@ OPUSFILE_LICENSE = BSD-3-Clause > OPUSFILE_LICENSE_FILES = COPYING > OPUSFILE_INSTALL_STAGING = YES > > +# 0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch > +OPUSFILE_IGNORE_CVES += CVE-2022-47021 > + > ifeq ($(BR2_PACKAGE_OPENSSL),y) > OPUSFILE_DEPENDENCIES += openssl > else > -- > 2.39.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 Feb 5 14:31:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:31:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: add CPE variables In-Reply-To: <20230205124049.5139-1-fontaine.fabrice@gmail.com> References: <20230205124049.5139-1-fontaine.fabrice@gmail.com> Message-ID: <20230205143152.GM2960@scaer> Fabrice, All, On 2023-02-05 13:40 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:treasuredata:fluent_bit is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atreasuredata%3Afluent_bit Even though it's not obvious from the github repository, I checked and indeed Treasure Data is the original "editor" for fluentbit. > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/fluent-bit/fluent-bit.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk > index 6e9a33e02e..879437e5f4 100644 > --- a/package/fluent-bit/fluent-bit.mk > +++ b/package/fluent-bit/fluent-bit.mk > @@ -8,6 +8,8 @@ FLUENT_BIT_VERSION = 2.0.8 > FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) > FLUENT_BIT_LICENSE = Apache-2.0 > FLUENT_BIT_LICENSE_FILES = LICENSE > +FLUENT_BIT_CPE_ID_VENDOR = treasuredata > +FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit > FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl > > FLUENT_BIT_CONF_OPTS += \ > -- > 2.39.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 Feb 5 14:37:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:37:50 +0100 Subject: [Buildroot] [git commit] package/wireshark: security bump to version 4.0.3 Message-ID: <20230205143927.C4FA7838A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce2ac1fecfdd61c01bb34984624f2d37fea91f91 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2023-0411, CVE-2023-0412, CVE-2023-0413, CVE-2023-0414, CVE-2023-0415, CVE-2023-0416 and CVE-2023-0417 https://www.wireshark.org/security/wnpa-sec-2023-01 https://www.wireshark.org/security/wnpa-sec-2023-02 https://www.wireshark.org/security/wnpa-sec-2023-03 https://www.wireshark.org/security/wnpa-sec-2023-04 https://www.wireshark.org/security/wnpa-sec-2023-05 https://www.wireshark.org/security/wnpa-sec-2023-06 https://www.wireshark.org/security/wnpa-sec-2023-07 https://www.wireshark.org/docs/relnotes/wireshark-4.0.3.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- 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 e9026b8caa..7128b560ae 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-4.0.2.txt -sha1 0127180ff18515b086fe5603f767f53ddaa64c1a wireshark-4.0.2.tar.xz -sha256 f35915699f2f9b28ddb211202d40ec8984e5834d3c911483144a4984ba44411d wireshark-4.0.2.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.3.txt +sha1 243b0057cfe6d447662e81b5646110aaf8b63c81 wireshark-4.0.3.tar.xz +sha256 6c51e15bcc0afb93734e686dbff354ffd159f570bd2904bcbbad6f3feb7e9511 wireshark-4.0.3.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index e2a424ef0f..12c36575df 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.0.2 +WIRESHARK_VERSION = 4.0.3 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From yann.morin.1998 at free.fr Sun Feb 5 14:39:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:39:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 4.0.3 In-Reply-To: <20230205142543.285695-1-fontaine.fabrice@gmail.com> References: <20230205142543.285695-1-fontaine.fabrice@gmail.com> Message-ID: <20230205143944.GN2960@scaer> Fabrice, All, On 2023-02-05 15:25 +0100, Fabrice Fontaine spake thusly: > Fix CVE-2023-0411, CVE-2023-0412, CVE-2023-0413, CVE-2023-0414, > CVE-2023-0415, CVE-2023-0416 and CVE-2023-0417 > > https://www.wireshark.org/security/wnpa-sec-2023-01 > https://www.wireshark.org/security/wnpa-sec-2023-02 > https://www.wireshark.org/security/wnpa-sec-2023-03 > https://www.wireshark.org/security/wnpa-sec-2023-04 > https://www.wireshark.org/security/wnpa-sec-2023-05 > https://www.wireshark.org/security/wnpa-sec-2023-06 > https://www.wireshark.org/security/wnpa-sec-2023-07 > > https://www.wireshark.org/docs/relnotes/wireshark-4.0.3.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 e9026b8caa..7128b560ae 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-4.0.2.txt > -sha1 0127180ff18515b086fe5603f767f53ddaa64c1a wireshark-4.0.2.tar.xz > -sha256 f35915699f2f9b28ddb211202d40ec8984e5834d3c911483144a4984ba44411d wireshark-4.0.2.tar.xz > +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.3.txt > +sha1 243b0057cfe6d447662e81b5646110aaf8b63c81 wireshark-4.0.3.tar.xz > +sha256 6c51e15bcc0afb93734e686dbff354ffd159f570bd2904bcbbad6f3feb7e9511 wireshark-4.0.3.tar.xz > > # Locally calculated > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk > index e2a424ef0f..12c36575df 100644 > --- a/package/wireshark/wireshark.mk > +++ b/package/wireshark/wireshark.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WIRESHARK_VERSION = 4.0.2 > +WIRESHARK_VERSION = 4.0.3 > WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz > WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions > WIRESHARK_LICENSE = wireshark license > -- > 2.39.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 Feb 5 14:42:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:42:05 +0100 Subject: [Buildroot] [git commit] package/tmux: add utf8proc optional dependency Message-ID: <20230205144220.73E8F838AE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f618aa388535181c281c85e2b5264532de4ef0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master utf8proc is an optional dependency since version 2.3 and https://github.com/tmux/tmux/commit/6c94774b70f72952c4c512e4aa59a207ca1c34f2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/tmux/tmux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 281b7d8ee6..b1c0af1a83 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -11,6 +11,13 @@ TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_UTF8PROC),y) +TMUX_DEPENDENCIES += utf8proc +TMUX_CONF_OPTS += --enable-utf8proc +else +TMUX_CONF_OPTS += --disable-utf8proc +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS From yann.morin.1998 at free.fr Sun Feb 5 14:42:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:42:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: add utf8proc optional dependency In-Reply-To: <20230205132307.41753-1-fontaine.fabrice@gmail.com> References: <20230205132307.41753-1-fontaine.fabrice@gmail.com> Message-ID: <20230205144242.GO2960@scaer> Fabrice, All, On 2023-02-05 14:23 +0100, Fabrice Fontaine spake thusly: > utf8proc is an optional dependency since version 2.3 and > https://github.com/tmux/tmux/commit/6c94774b70f72952c4c512e4aa59a207ca1c34f2 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/tmux/tmux.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk > index 281b7d8ee6..b1c0af1a83 100644 > --- a/package/tmux/tmux.mk > +++ b/package/tmux/tmux.mk > @@ -11,6 +11,13 @@ TMUX_LICENSE_FILES = COPYING > TMUX_CPE_ID_VENDOR = tmux_project > TMUX_DEPENDENCIES = libevent ncurses host-pkgconf > > +ifeq ($(BR2_PACKAGE_UTF8PROC),y) > +TMUX_DEPENDENCIES += utf8proc > +TMUX_CONF_OPTS += --enable-utf8proc > +else > +TMUX_CONF_OPTS += --disable-utf8proc > +endif > + > # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear > # can reject the user connection. See man shells. > define TMUX_ADD_TMUX_TO_SHELLS > -- > 2.39.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 Feb 5 14:42:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:42:56 +0100 Subject: [Buildroot] [git commit] package/z3: bump to version 4.12.1 Message-ID: <20230205144323.6CEC9838B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a7b1b913e756358b40359115c12fff241d4ca92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For change log since v4.12.0, see: - https://github.com/Z3Prover/z3/releases/tag/z3-4.12.1 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/z3/z3.hash | 2 +- package/z3/z3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/z3/z3.hash b/package/z3/z3.hash index 517e2f4923..8a511c3fe5 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5f575f0a3950760436217da1cc1a714569b6d4f664a75bb6775876328cf0a580 z3-4.12.0.tar.gz +sha256 a3735fabf00e1341adcc70394993c05fd3e2ae167a3e9bb46045e33084eb64a3 z3-4.12.1.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index ecd79325dc..45c412ad12 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.12.0 +Z3_VERSION = 4.12.1 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Sun Feb 5 14:43:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 15:43:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/z3: bump to version 4.12.1 In-Reply-To: <20230205130355.797050-1-ju.o@free.fr> References: <20230205130355.797050-1-ju.o@free.fr> Message-ID: <20230205144340.GP2960@scaer> Julien, All, On 2023-02-05 14:03 +0100, Julien Olivain spake thusly: > For change log since v4.12.0, see: > - https://github.com/Z3Prover/z3/releases/tag/z3-4.12.1 > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > Patch tested on branch master at commit 8bb9627 with commands: > > make check-package > ... > 0 warnings generated > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_z3 > ... > OK > > ./utils/test-pkg -p z3 > ... > 6 builds, 4 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > --- > package/z3/z3.hash | 2 +- > package/z3/z3.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/z3/z3.hash b/package/z3/z3.hash > index 517e2f4923..8a511c3fe5 100644 > --- a/package/z3/z3.hash > +++ b/package/z3/z3.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 5f575f0a3950760436217da1cc1a714569b6d4f664a75bb6775876328cf0a580 z3-4.12.0.tar.gz > +sha256 a3735fabf00e1341adcc70394993c05fd3e2ae167a3e9bb46045e33084eb64a3 z3-4.12.1.tar.gz > sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt > diff --git a/package/z3/z3.mk b/package/z3/z3.mk > index ecd79325dc..45c412ad12 100644 > --- a/package/z3/z3.mk > +++ b/package/z3/z3.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -Z3_VERSION = 4.12.0 > +Z3_VERSION = 4.12.1 > Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) > Z3_LICENSE = MIT > Z3_LICENSE_FILES = LICENSE.txt > -- > 2.39.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 Feb 5 14:50:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 15:50:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix openssl dependency Message-ID: <20230205145036.654667-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: Makefile:576: *** libopenssl is in the dependency chain of fluent-bit that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Fixes: - http://autobuild.buildroot.org/results/9c3b8e19063f7587877fdb0598739b55abccb3e8 Signed-off-by: Fabrice Fontaine --- package/fluent-bit/fluent-bit.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 879437e5f4..13077e53cc 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -10,7 +10,7 @@ FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit -FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl +FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 5 14:55:32 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 5 Feb 2023 15:55:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: bump to version 3.3a Message-ID: <20230205145532.659422-1-fontaine.fabrice@gmail.com> systemd is an optional dependency since https://github.com/tmux/tmux/commit/fc7f1e7acb3539a43df46136e971f770515e0b0d https://github.com/tmux/tmux/blob/3.3a/CHANGES Signed-off-by: Fabrice Fontaine --- package/tmux/tmux.hash | 2 +- package/tmux/tmux.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index 75538e09ae..b5c0fe58d0 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386 tmux-3.1c.tar.gz +sha256 e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f tmux-3.3a.tar.gz sha256 c031bd37f464c534277814f6aa38686fa023d094261d57fd2545ad592bb53ccd COPYING diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index b1c0af1a83..47ee9b16ca 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,13 +4,20 @@ # ################################################################################ -TMUX_VERSION = 3.1c +TMUX_VERSION = 3.3a TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +TMUX_DEPENDENCIES += systemd +TMUX_CONF_OPTS += --enable-systemd +else +TMUX_CONF_OPTS += --disable-systemd +endif + ifeq ($(BR2_PACKAGE_UTF8PROC),y) TMUX_DEPENDENCIES += utf8proc TMUX_CONF_OPTS += --enable-utf8proc -- 2.39.0 From yann.morin.1998 at free.fr Sun Feb 5 15:02:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 16:02:31 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: fix openssl dependency Message-ID: <20230205150429.0640A838BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78e3637dd26766976d09e5d8286613f67975f8d6 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 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: Makefile:576: *** libopenssl is in the dependency chain of fluent-bit that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Fixes: - http://autobuild.buildroot.org/results/9c3b8e19063f7587877fdb0598739b55abccb3e8 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/fluent-bit/fluent-bit.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 879437e5f4..13077e53cc 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -10,7 +10,7 @@ FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit -FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl +FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ From yann.morin.1998 at free.fr Sun Feb 5 15:04:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 16:04:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix openssl dependency In-Reply-To: <20230205145036.654667-1-fontaine.fabrice@gmail.com> References: <20230205145036.654667-1-fontaine.fabrice@gmail.com> Message-ID: <20230205150459.GQ2960@scaer> Fabrice, All, On 2023-02-05 15:50 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since the addition of the package > in commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: > > Makefile:576: *** libopenssl is in the dependency chain of fluent-bit that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. > > Fixes: > - http://autobuild.buildroot.org/results/9c3b8e19063f7587877fdb0598739b55abccb3e8 > > Signed-off-by: Fabrice Fontaine Nice catch, applied to master, thanks. Regards, Yann E. MORIN. > --- > package/fluent-bit/fluent-bit.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk > index 879437e5f4..13077e53cc 100644 > --- a/package/fluent-bit/fluent-bit.mk > +++ b/package/fluent-bit/fluent-bit.mk > @@ -10,7 +10,7 @@ FLUENT_BIT_LICENSE = Apache-2.0 > FLUENT_BIT_LICENSE_FILES = LICENSE > FLUENT_BIT_CPE_ID_VENDOR = treasuredata > FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit > -FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl > +FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl > > FLUENT_BIT_CONF_OPTS += \ > -DFLB_DEBUG=No \ > -- > 2.39.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 Feb 5 15:21:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 16:21:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.19.0 In-Reply-To: <20230202192526.30357-1-bernd.kuhls@t-online.de> References: <20230202192526.30357-1-bernd.kuhls@t-online.de> Message-ID: <20230205152108.GR2960@scaer> Bernd, All, On 2023-02-02 20:25 +0100, Bernd Kuhls spake thusly: > Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 3c50faf23f..781e089de8 100644 > --- a/package/xmrig/xmrig.hash > +++ b/package/xmrig/xmrig.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 f97fe20248e0eb452f77e9b69f2fb1510b852152b3af4f9a8b20680c854888d1 xmrig-6.18.1.tar.gz > +sha256 772f947058e5b89ca9bf34128487def47796870b547439a9b0524ddd1899420c xmrig-6.19.0.tar.gz > sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE > diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk > index ca5bcecfbe..f345ba9cf9 100644 > --- a/package/xmrig/xmrig.mk > +++ b/package/xmrig/xmrig.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -XMRIG_VERSION = 6.18.1 > +XMRIG_VERSION = 6.19.0 > XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) > XMRIG_LICENSE = GPL-3.0+ > XMRIG_LICENSE_FILES = LICENSE > -- > 2.39.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 Feb 5 15:35:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 5 Feb 2023 16:35:52 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/balena-engine: bump to version 20.10.26 In-Reply-To: <20230202132650.1537778-1-christian@paral.in> References: <20230202132650.1537778-1-christian@paral.in> Message-ID: <20230205153552.GS2960@scaer> Christian, All, On 2023-02-02 05:26 -0800, Christian Stewart via buildroot spake thusly: > This update requires a workaround for the non-standard vendor/ structure in the > balena-engine repository, which has an invalid vendor/modules.txt file. > > Removing the vendor/modules.txt file fixes the build error. > > Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > > The go download post-process script uses go mod init to create the go.mod file That's not correct. The download go-post-process script does not run that command at all. Furthermore, in the case of the balena-engine package, the go-post-process script actually does absolutely nothing at all. Indeed, it will notice that the vendor/ directory already exists, and thus will exit early: 17 # Already vendored tarball, nothing to do 18 if tar tf "${output}" | grep -q "^[^/]*/vendor" ; then 19 exit 0 20 fi 21 22 post_process_unpack "${base_name}" "${output}" 23 24 # Do the Go vendoring 25 pushd "${base_name}" > /dev/null 26 27 if [ ! -f go.mod ]; then 28 echo "ERROR: no vendor/ folder and no go.mod, aborting" 29 exit 1 30 fi 31 32 go mod vendor -v -modcacherw 33 popd > /dev/null 34 35 post_process_repack $(pwd) "${base_name}" "${output}" Furthermore, for balena-engine, this all works because it is not using the go-mod infra, and despite this uses a populated vendor/ directory. So, we're not running the vendoring as it is already done, and we can thus delete the problematic file. So, you'll have to reword/rework the explanations. Note that this also applies to your other patches touching the docker-related packages, notably "package/docker-engine: bump version to v23.0.0", so I'll mark the rest of that series as changes requested too. Regards, Yann E. MORIN. > which specifies a language version of go1.16 on default. Use go mod edit to > adjust the go.mod file to the required minimum version go1.19 for generic types > used by docker-engine. (Fixes a build error). > > Remove the vendor/archive sub-tree (fixes a build error) because Go no longer > allows having duplicate packages in GOPATH and GOROOT. vendor/archive/tar cannot > be in vendor/ because it exists in the standard library. Remove it from vendor/. > > https://github.com/balena-os/balena-engine/releases/tag/v20.10.26 > > Signed-off-by: Christian Stewart > --- > package/balena-engine/balena-engine.hash | 2 +- > package/balena-engine/balena-engine.mk | 14 +++++++++++++- > 2 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash > index 4adb8ce561..6a92a40cc8 100644 > --- a/package/balena-engine/balena-engine.hash > +++ b/package/balena-engine/balena-engine.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz > +sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk > index ecfb62bfbf..3b8b2f9ac6 100644 > --- a/package/balena-engine/balena-engine.mk > +++ b/package/balena-engine/balena-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BALENA_ENGINE_VERSION = 20.10.21 > +BALENA_ENGINE_VERSION = 20.10.26 > BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) > > BALENA_ENGINE_LICENSE = Apache-2.0 > @@ -34,6 +34,18 @@ BALENA_ENGINE_TAGS = \ > > BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine > > +# remove the conflicting vendor/modules.txt > +# remove the conflicting vendor/archive (not allowed in go1.20) > +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > +define BALENA_ENGINE_CONFIGURE_CMDS > + if [ -f $(@D)/vendor/modules.txt ]; then \ > + rm $(@D)/vendor/modules.txt; \ No need to test if a file exists before removing it; just unconditionally delete it: rm -f $(@D)/vendor/modules.txt > + fi > + if [ -d $(@D)/vendor/archive ]; then \ > + rm -rf $(@D)/vendor/archive; \ Ditto, just delete the directory without checking whether it exists. Regards, Yann E. MORIN. > + fi > +endef > + > ifeq ($(BR2_INIT_SYSTEMD),y) > BALENA_ENGINE_DEPENDENCIES += systemd > BALENA_ENGINE_TAGS += journald > -- > 2.39.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 Feb 5 17:09:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 05 Feb 2023 18:09:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgit2: security bump to 1.5.1 In-Reply-To: <20230124125528.5801-1-nicolas.cavallari@green-communications.fr> (Nicolas Cavallari's message of "Tue, 24 Jan 2023 13:55:28 +0100") References: <20230124125528.5801-1-nicolas.cavallari@green-communications.fr> Message-ID: <87357kxcnj.fsf@dell.be.48ers.dk> >>>>> "Nicolas" == Nicolas Cavallari writes: > Fixes CVE-2023-22742: when compiled with BR2_PACKAGE_LIBSSH2, > libgit2 fails to verify SSH keys by default. > https://github.com/libgit2/libgit2/blob/v1.5.1/docs/changelog.md > Signed-off-by: Nicolas Cavallari Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 17:08:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 18:08:31 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgit2: link with -latomic if needed Message-ID: <20230205170914.D23A2838DE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b1a7b69abcc65517a443de986b5e249d30e9696 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x libgit2 is currently a library without any reverse dependencies so the missing atomic symbols do not cause build failures yet. libgit2 uses the atomics intrinsics on gcc >= 4.7 and the sync intrinsics on previous gcc versions. Since gcc 4.9 is the new minimum, ignore the sync intrinsics requirements. The next version of libgit2 will also build a binary, which will expose the problem. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni (cherry picked from commit e992a3e7712f6f87fcbddb1844a5cbf51a1d82bb) Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 3f1e6e1593..9b5e2b897d 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -44,4 +44,9 @@ else LIBGIT2_CONF_OPTS += -DUSE_HTTPS=OFF endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBGIT2_CONF_OPTS += \ + -DCMAKE_SHARED_LINKER_FLAGS=-latomic +endif + $(eval $(cmake-package)) From peter at korsgaard.com Sun Feb 5 17:08:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 18:08:39 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgit2: bump to 1.5.0 Message-ID: <20230205170914.DD29B838DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a7e02bdfd7e7175f7f55673a1b1563ab8b1633e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x It includes an option to build a command line program that can be used to replace git in simple cases. The upcoming sha256 repository support made them steal the sha256 code from RFC6234, hence the license change. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni (cherry picked from commit 7c8e34f4d20598a6536a6d63b6c4a97eb3b794cf) Signed-off-by: Peter Korsgaard --- package/libgit2/Config.in | 10 ++++++++++ package/libgit2/libgit2.hash | 4 ++-- package/libgit2/libgit2.mk | 16 ++++++++++++++-- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/package/libgit2/Config.in b/package/libgit2/Config.in index a6a9728ff0..5d28f054f2 100644 --- a/package/libgit2/Config.in +++ b/package/libgit2/Config.in @@ -12,3 +12,13 @@ config BR2_PACKAGE_LIBGIT2 comment "libgit2 needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + +if BR2_PACKAGE_LIBGIT2 + +config BR2_PACKAGE_LIBGIT2_CLI + bool "enable command line interface (git2_cli)" + help + Enable a command-line interface for libgit2. + It aims to be git-compatible. + +endif diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 3b5837f789..fb760fd4cc 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f48b961e463a9e4e7e7e58b21a0fb5a9b2a1d24d9ba4d15870a0c9b8ad965163 libgit2-1.4.3.tar.gz -sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING +sha256 8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e libgit2-1.5.0.tar.gz +sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 9b5e2b897d..9409011eb4 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,9 +4,14 @@ # ################################################################################ -LIBGIT2_VERSION = 1.4.3 +LIBGIT2_VERSION = 1.5.0 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) +LIBGIT2_LICENSE = \ + GPL-2.0 with linking exception, \ + MIT (sha1), \ + BSD-3-Clause (sha256), \ + wildmatch license (wildmatch), \ + CC0-1.0 (xoroshiro256) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES @@ -44,8 +49,15 @@ else LIBGIT2_CONF_OPTS += -DUSE_HTTPS=OFF endif +ifeq ($(BR2_PACKAGE_LIBGIT2_CLI),y) +LIBGIT2_CONF_OPTS += -DBUILD_CLI=ON +else +LIBGIT2_CONF_OPTS += -DBUILD_CLI=OFF +endif + ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) LIBGIT2_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS=-latomic \ -DCMAKE_SHARED_LINKER_FLAGS=-latomic endif From peter at korsgaard.com Sun Feb 5 17:08:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 18:08:25 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgit2: bump version to 1.4.3 Message-ID: <20230205170914.C3A01838DD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89c63ae8724354fada0894792b1bde0eb9e57759 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x git added restrictions on config files to fix CVE 2022-24765. libgit2 adopted these changes for compatibility reasons, even if the vuln is not exploitable in libgit2. https://github.com/libgit2/libgit2/releases/tag/v1.4.3 Signed-off-by: Nicolas Cavallari Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 01ee7f84fb9da338d36fbaad3cf8a07391a843d3) Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index ada411ea22..3b5837f789 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 901c2b4492976b86477569502a41c31b274b69adc177149c02099ea88404ef19 libgit2-1.4.2.tar.gz +sha256 f48b961e463a9e4e7e7e58b21a0fb5a9b2a1d24d9ba4d15870a0c9b8ad965163 libgit2-1.4.3.tar.gz sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index e94dd9c370..3f1e6e1593 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.4.2 +LIBGIT2_VERSION = 1.4.3 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) LIBGIT2_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 5 17:08:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 18:08:47 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgit2: security bump to 1.5.1 Message-ID: <20230205170914.E787F838DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66cec4d25c48d8acdd6d85b4ea176a0cbac91501 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes CVE-2023-22742: when compiled with BR2_PACKAGE_LIBSSH2, libgit2 fails to verify SSH keys by default. https://github.com/libgit2/libgit2/blob/v1.5.1/docs/changelog.md Signed-off-by: Nicolas Cavallari Signed-off-by: Peter Korsgaard (cherry picked from commit cc47da516cf5b76752d63361a8a7579d93e6fbbb) Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index fb760fd4cc..e834525df5 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e libgit2-1.5.0.tar.gz +sha256 7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88 libgit2-1.5.1.tar.gz sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 9409011eb4..c962c8030f 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.5.0 +LIBGIT2_VERSION = 1.5.1 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From peter at korsgaard.com Sun Feb 5 17:08:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 18:08:19 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgit2: bump version to 1.4.2 Message-ID: <20230205170914.B73C9838DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0683331971cf50ce7b071278e0ecd05253fffe51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x 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) (cherry picked from commit ba8c268e00bce6cbcb2d7d29143a34afaa5fdc46) Signed-off-by: Peter Korsgaard --- 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 peter at korsgaard.com Sun Feb 5 17:07:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 18:07:09 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/libgit2: security bump to 1.5.1 Message-ID: <20230205171024.9D017838E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b25f3d1723a35e1dffcfcb0168367697ba20e2b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes CVE-2023-22742: when compiled with BR2_PACKAGE_LIBSSH2, libgit2 fails to verify SSH keys by default. https://github.com/libgit2/libgit2/blob/v1.5.1/docs/changelog.md Signed-off-by: Nicolas Cavallari Signed-off-by: Peter Korsgaard (cherry picked from commit cc47da516cf5b76752d63361a8a7579d93e6fbbb) Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index fb760fd4cc..e834525df5 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e libgit2-1.5.0.tar.gz +sha256 7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88 libgit2-1.5.1.tar.gz sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 9409011eb4..c962c8030f 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.5.0 +LIBGIT2_VERSION = 1.5.1 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From giulio.benetti at benettiengineering.com Sun Feb 5 21:25:21 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 5 Feb 2023 22:25:21 +0100 Subject: [Buildroot] [PATCH v2] toolchain/Config.in: extend gcc bug 43744 to every sh architecture In-Reply-To: <20230205131559.6f79944f@windsurf> References: <20230205131559.6f79944f@windsurf> Message-ID: <20230205212521.903480-1-giulio.benetti@benettiengineering.com> Gcc bug 43744 affects seems to affect all SH family because it already affects: 1) sh4, here you can find a buildroot defconfig that fails to build: http://autobuild.buildroot.net/results/1db/1db6c59c98e3c09fa13277076ee2fbe7967f1f6b/defconfig 2) sh4a, here you can find a buildroot defconfig that fails to build: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a/defconfig Note also that gcc bugzilla entry reports the bug for SH and not for sub-architectures: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43744 So let's extend the bug to BR2_sh to match the entire SH architecture. Signed-off-by: Giulio Benetti --- V1->V2: * add a commit log with details about gcc bug 43744 as pointed by Thomas Petazzoni --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 544b423001..01215e0e96 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -115,7 +115,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_43744 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 - depends on BR2_sh4 + depends on BR2_sh # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63261. This bug no # longer exists in gcc 8.x. -- 2.34.1 From dario.binacchi at amarulasolutions.com Sun Feb 5 21:41:31 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 5 Feb 2023 22:41:31 +0100 Subject: [Buildroot] [PATCH 1/2] configs/beaglebone: bump Linux version to 5.10.145-ti-r54 Message-ID: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> The previous version failed to boot from sd card with a log reported by the document [1]. In my case it always failed, a 100% failure against 75% reported by the document. Instead of adding the patch to fix the problem, I preferred to update the kernel version as suggested by the document itself. Tested on beaglebone black. [1] https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 Signed-off-by: Dario Binacchi --- configs/beaglebone_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 639b491e9746..dff7dea422ee 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.145-ti-r54)/linux-5.10.145-ti-r54.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" -- 2.32.0 From dario.binacchi at amarulasolutions.com Sun Feb 5 21:41:32 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 5 Feb 2023 22:41:32 +0100 Subject: [Buildroot] [PATCH 2/2] configs/beaglebone: bump U-Boot version to 2022.10 In-Reply-To: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> References: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> Message-ID: <20230205214132.6941-2-dario.binacchi@amarulasolutions.com> Starting from version 2021.10 only distro booting is supported, as reported by commit ff8f277e9121 ("ti: am335x_evm: Switch to DISTRO_BOOT only"). The patch allows to update U-Boot to versions later than 2021.10. Tested on beaglebone black. Signed-off-by: Dario Binacchi --- board/beaglebone/extlinux.conf | 4 ++++ board/beaglebone/genimage.cfg | 1 + board/beaglebone/post-build.sh | 2 ++ configs/beaglebone_defconfig | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 board/beaglebone/extlinux.conf diff --git a/board/beaglebone/extlinux.conf b/board/beaglebone/extlinux.conf new file mode 100644 index 000000000000..4a08c9dedad9 --- /dev/null +++ b/board/beaglebone/extlinux.conf @@ -0,0 +1,4 @@ +label beaglebone-buildroot + kernel /zImage + fdtdir / + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait \ No newline at end of file diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index 987d20507551..4b026fda8431 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -12,6 +12,7 @@ image boot.vfat { "am335x-bonegreen.dtb", "am335x-boneblack-wireless.dtb", "am335x-bonegreen-wireless.dtb", + "extlinux" } } diff --git a/board/beaglebone/post-build.sh b/board/beaglebone/post-build.sh index ffdd19138c7f..b7afd92ffeae 100755 --- a/board/beaglebone/post-build.sh +++ b/board/beaglebone/post-build.sh @@ -2,3 +2,5 @@ BOARD_DIR="$(dirname $0)" cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index dff7dea422ee..0207916d0166 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -34,7 +34,7 @@ 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="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set -- 2.32.0 From peter at korsgaard.com Sun Feb 5 23:00:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 00:00:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: security bump to version 5.0.2 In-Reply-To: <20230120192846.7362-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 20 Jan 2023 20:28:46 +0100") References: <20230120192846.7362-1-fontaine.fabrice@gmail.com> Message-ID: <87y1pbwwdl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2022-47952: lxc-user-nic in lxc through 5.0.1 is installed > setuid root, and may allow local users to infer whether any file > exists, even within a protected directory tree, because "Failed to > open" often indicates that a file does not exist, whereas "does not > refer to a network namespace path" often indicates that a file exists. > NOTE: this is different from CVE-2018-6556 because the CVE-2018-6556 > fix design was based on the premise that "we will report back to the > user that the open() failed but the user has no way of knowing why it > failed"; however, in many realistic cases, there are no plausible > reasons for failing except that the file does not exist. > - Drop patches (already in version) > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x, thanks. I see that there isn't a new 4.0.x release. Do you know if 4.0.x is also vulnerable to this issue? -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 22:44:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 5 Feb 2023 23:44:05 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/lxc: security bump to version 5.0.2 Message-ID: <20230205230055.0D87C838EB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4631f48fe79aa83d352fb5eb254f39ea54926ba6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x - Fix CVE-2022-47952: lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may allow local users to infer whether any file exists, even within a protected directory tree, because "Failed to open" often indicates that a file does not exist, whereas "does not refer to a network namespace path" often indicates that a file exists. NOTE: this is different from CVE-2018-6556 because the CVE-2018-6556 fix design was based on the premise that "we will report back to the user that the open() failed but the user has no way of knowing why it failed"; however, in many realistic cases, there are no plausible reasons for failing except that the file does not exist. - Drop patches (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit cd7bfba252095ffaf93d22c7379b409bbdf64d46) Signed-off-by: Peter Korsgaard --- ...etect-where-struct-mount_attr-is-declared.patch | 186 --------------------- ...ll_method_async-to-replace-the-asyncv-one.patch | 47 ------ ...003-build-detect-sys-pidfd.h-availability.patch | 55 ------ package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 5 files changed, 2 insertions(+), 290 deletions(-) diff --git a/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch b/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch deleted file mode 100644 index 8de7adcc56..0000000000 --- a/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch +++ /dev/null @@ -1,186 +0,0 @@ -From c1115e1503bf955c97f4cf3b925a6a9f619764c3 Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Tue, 9 Aug 2022 16:14:25 +0200 -Subject: [PATCH] build: detect where struct mount_attr is declared - -Fixes: #4176 -Signed-off-by: Christian Brauner (Microsoft) -[Retrieved from: -https://github.com/lxc/lxc/commit/c1115e1503bf955c97f4cf3b925a6a9f619764c3] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 30 ++++++++++++++++++++++++++++-- - src/lxc/conf.c | 6 +++--- - src/lxc/conf.h | 2 +- - src/lxc/mount_utils.c | 6 +++--- - src/lxc/syscall_wrappers.h | 12 ++++++++++-- - 5 files changed, 45 insertions(+), 11 deletions(-) - -diff --git a/meson.build b/meson.build -index a145faf069..f679aabbc8 100644 ---- a/meson.build -+++ b/meson.build -@@ -590,7 +590,6 @@ decl_headers = ''' - foreach decl: [ - '__aligned_u64', - 'struct clone_args', -- 'struct mount_attr', - 'struct open_how', - 'struct rtnl_link_stats64', - ] -@@ -610,7 +609,6 @@ foreach tuple: [ - ['struct seccomp_notif_sizes'], - ['struct clone_args'], - ['__aligned_u64'], -- ['struct mount_attr'], - ['struct open_how'], - ['struct rtnl_link_stats64'], - ] -@@ -630,6 +628,34 @@ foreach tuple: [ - endif - endforeach - -+## Types. -+decl_headers = ''' -+#include -+''' -+ -+# We get -1 if the size cannot be determined -+if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 -+ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), true) -+ found_types += 'struct mount_attr (sys/mount.h)' -+else -+ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) -+ missing_types += 'struct mount_attr (sys/mount.h)' -+endif -+ -+## Types. -+decl_headers = ''' -+#include -+''' -+ -+# We get -1 if the size cannot be determined -+if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 -+ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), true) -+ found_types += 'struct mount_attr (linux/mount.h)' -+else -+ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), false) -+ missing_types += 'struct mount_attr (linux/mount.h)' -+endif -+ - ## Headers. - foreach ident: [ - ['bpf', '''#include -diff --git a/src/lxc/conf.c b/src/lxc/conf.c -index ffbe74c2f6..4193cd07f5 100644 ---- a/src/lxc/conf.c -+++ b/src/lxc/conf.c -@@ -2885,7 +2885,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) - struct lxc_mount_options opts = {}; - int dfd_from; - const char *source_relative, *target_relative; -- struct lxc_mount_attr attr = {}; -+ struct mount_attr attr = {}; - - ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts); - if (ret < 0) -@@ -3005,7 +3005,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) - - /* Set propagation mount options. */ - if (opts.attr.propagation) { -- attr = (struct lxc_mount_attr) { -+ attr = (struct mount_attr) { - .propagation = opts.attr.propagation, - }; - -@@ -4109,7 +4109,7 @@ int lxc_idmapped_mounts_parent(struct lxc_handler *handler) - - for (;;) { - __do_close int fd_from = -EBADF, fd_userns = -EBADF; -- struct lxc_mount_attr attr = {}; -+ struct mount_attr attr = {}; - struct lxc_mount_options opts = {}; - ssize_t ret; - -diff --git a/src/lxc/conf.h b/src/lxc/conf.h -index 7dc2f15b60..772479f9e1 100644 ---- a/src/lxc/conf.h -+++ b/src/lxc/conf.h -@@ -223,7 +223,7 @@ struct lxc_mount_options { - unsigned long mnt_flags; - unsigned long prop_flags; - char *data; -- struct lxc_mount_attr attr; -+ struct mount_attr attr; - char *raw_options; - }; - -diff --git a/src/lxc/mount_utils.c b/src/lxc/mount_utils.c -index bba75f933c..88dd73ee36 100644 ---- a/src/lxc/mount_utils.c -+++ b/src/lxc/mount_utils.c -@@ -31,7 +31,7 @@ lxc_log_define(mount_utils, lxc); - * setting in @attr_set, but must also specify MOUNT_ATTR__ATIME in the - * @attr_clr field. - */ --static inline void set_atime(struct lxc_mount_attr *attr) -+static inline void set_atime(struct mount_attr *attr) - { - switch (attr->attr_set & MOUNT_ATTR__ATIME) { - case MOUNT_ATTR_RELATIME: -@@ -272,7 +272,7 @@ int create_detached_idmapped_mount(const char *path, int userns_fd, - { - __do_close int fd_tree_from = -EBADF; - unsigned int open_tree_flags = OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC; -- struct lxc_mount_attr attr = { -+ struct mount_attr attr = { - .attr_set = MOUNT_ATTR_IDMAP | attr_set, - .attr_clr = attr_clr, - .userns_fd = userns_fd, -@@ -335,7 +335,7 @@ int __fd_bind_mount(int dfd_from, const char *path_from, __u64 o_flags_from, - __u64 attr_clr, __u64 propagation, int userns_fd, - bool recursive) - { -- struct lxc_mount_attr attr = { -+ struct mount_attr attr = { - .attr_set = attr_set, - .attr_clr = attr_clr, - .propagation = propagation, -diff --git a/src/lxc/syscall_wrappers.h b/src/lxc/syscall_wrappers.h -index a5e98b565c..c8a7d0c7b7 100644 ---- a/src/lxc/syscall_wrappers.h -+++ b/src/lxc/syscall_wrappers.h -@@ -18,6 +18,12 @@ - #include "macro.h" - #include "syscall_numbers.h" - -+#if HAVE_STRUCT_MOUNT_ATTR -+#include -+#elif HAVE_UAPI_STRUCT_MOUNT_ATTR -+#include -+#endif -+ - #ifdef HAVE_LINUX_MEMFD_H - #include - #endif -@@ -210,16 +216,18 @@ extern int fsmount(int fs_fd, unsigned int flags, unsigned int attr_flags); - /* - * mount_setattr() - */ --struct lxc_mount_attr { -+#if !HAVE_STRUCT_MOUNT_ATTR && !HAVE_UAPI_STRUCT_MOUNT_ATTR -+struct mount_attr { - __u64 attr_set; - __u64 attr_clr; - __u64 propagation; - __u64 userns_fd; - }; -+#endif - - #if !HAVE_MOUNT_SETATTR - static inline int mount_setattr(int dfd, const char *path, unsigned int flags, -- struct lxc_mount_attr *attr, size_t size) -+ struct mount_attr *attr, size_t size) - { - return syscall(__NR_mount_setattr, dfd, path, flags, attr, size); - } diff --git a/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch b/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch deleted file mode 100644 index 22013cb363..0000000000 --- a/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Thu, 25 Aug 2022 05:45:53 -0700 -Subject: [PATCH] use sd_bus_call_method_async to replace the asyncv one - -The sd_bus_call_method_asyncv's 10th parameter is of type -va_list and supplying NULL when invoking it causes compilation -error. Just replace it with the async one. - -Signed-off-by: Chen Qi -[Retrieved from: -https://github.com/lxc/lxc/commit/b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 4 ++-- - src/lxc/cgroups/cgfsng.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 21955a0504..f8bdcf4e83 100644 ---- a/meson.build -+++ b/meson.build -@@ -295,9 +295,9 @@ if not want_sd_bus.disabled() - has_sd_bus = false - endif - -- if not cc.has_function('sd_bus_call_method_asyncv', prefix: '#include ', dependencies: libsystemd) -+ if not cc.has_function('sd_bus_call_method_async', prefix: '#include ', dependencies: libsystemd) - if not sd_bus_optional -- error('libsystemd misses required sd_bus_call_method_asyncv function') -+ error('libsystemd misses required sd_bus_call_method_async function') - endif - - has_sd_bus = false -diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c -index 8a3615893f..d90e5385e1 100644 ---- a/src/lxc/cgroups/cgfsng.c -+++ b/src/lxc/cgroups/cgfsng.c -@@ -1232,7 +1232,7 @@ static int unpriv_systemd_create_scope(struct cgroup_ops *ops, struct lxc_conf * - if (r < 0) - return log_error(SYSTEMD_SCOPE_FAILED, "Failed to connect to user bus: %s", strerror(-r)); - -- r = sd_bus_call_method_asyncv(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL, NULL); -+ r = sd_bus_call_method_async(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL); - if (r < 0) - return log_error(SYSTEMD_SCOPE_FAILED, "Failed to subscribe to signals: %s", strerror(-r)); - diff --git a/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch b/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch deleted file mode 100644 index 3aa598407f..0000000000 --- a/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ef1e0607b82e27350c2d677d649c6a0a9693fd40 Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Tue, 9 Aug 2022 16:27:40 +0200 -Subject: [PATCH] build: detect sys/pidfd.h availability - -Fixes: #4176 -Signed-off-by: Christian Brauner (Microsoft) - -[Retrieved from: -https://github.com/lxc/lxc/commit/ef1e0607b82e27350c2d677d649c6a0a9693fd40] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 1 + - src/lxc/process_utils.h | 6 ++++++ - 2 files changed, 7 insertions(+) - -diff --git a/meson.build b/meson.build -index f679aabbc8..e999542336 100644 ---- a/meson.build -+++ b/meson.build -@@ -735,6 +735,7 @@ foreach tuple: [ - ['sys/resource.h'], - ['sys/memfd.h'], - ['sys/personality.h'], -+ ['sys/pidfd.h'], - ['sys/signalfd.h'], - ['sys/timerfd.h'], - ['pty.h'], -diff --git a/src/lxc/process_utils.h b/src/lxc/process_utils.h -index 9c15b15741..ed84741d0e 100644 ---- a/src/lxc/process_utils.h -+++ b/src/lxc/process_utils.h -@@ -15,6 +15,10 @@ - #include - #include - -+#if HAVE_SYS_PIDFD_H -+#include -+#endif -+ - #include "compiler.h" - #include "syscall_numbers.h" - -@@ -136,9 +140,11 @@ - #endif - - /* waitid */ -+#if !HAVE_SYS_PIDFD_H - #ifndef P_PIDFD - #define P_PIDFD 3 - #endif -+#endif - - #ifndef CLONE_ARGS_SIZE_VER0 - #define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index c18e062cc1..2dd983a361 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d8195423bb1e206f8521d24b6cde4789f043960c7cf065990a9cf741dcfd4222 lxc-5.0.1.tar.gz +sha256 bea08d2e49efcee34fa58acd2bc95c0adc64d291c07f4cfaf4ac1d8ac5a36f45 lxc-5.0.2.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index e1639c5f15..4a4d3a6212 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 5.0.1 +LXC_VERSION = 5.0.2 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 Sun Feb 5 23:01:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 00:01:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-future: security bump to version 0.18.3 In-Reply-To: <20230120192952.8159-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 20 Jan 2023 20:29:52 +0100") References: <20230120192952.8159-1-fontaine.fabrice@gmail.com> Message-ID: <87ttzzwwbw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-40899: An issue discovered in Python Charmers Future 0.18.2 > and earlier allows remote attackers to cause a denial of service via > crafted Set-Cookie header from malicious web server. > https://github.com/PythonCharmers/python-future/releases/tag/v0.18.3 > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 5 23:01:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 00:01:29 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/python-future: security bump to version 0.18.3 Message-ID: <20230205230240.EDF41838F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2284f82eca1d1ca61c0e4d54b67590f6a6090e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix CVE-2022-40899: An issue discovered in Python Charmers Future 0.18.2 and earlier allows remote attackers to cause a denial of service via crafted Set-Cookie header from malicious web server. https://github.com/PythonCharmers/python-future/releases/tag/v0.18.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 51eb81ddcf340457cff13286fd1aa04082c4903a) Signed-off-by: Peter Korsgaard --- package/python-future/python-future.hash | 6 +++--- package/python-future/python-future.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-future/python-future.hash b/package/python-future/python-future.hash index 4fb5d2a2d7..3b2bbb0212 100644 --- a/package/python-future/python-future.hash +++ b/package/python-future/python-future.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.python.org/pypi/future/json -md5 e4579c836b9c025872efe230f6270349 future-0.18.2.tar.gz -sha256 b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d future-0.18.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/future/json +md5 dedcb70d14b23388670d54145aab8be4 future-0.18.3.tar.gz +sha256 34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307 future-0.18.3.tar.gz # Locally computed sha256 checksums sha256 916e561392d48471b9c23437f56e2652f320cb3b119ceaa162edf41016f746b9 LICENSE.txt diff --git a/package/python-future/python-future.mk b/package/python-future/python-future.mk index 76f32180ac..57bf13d83b 100644 --- a/package/python-future/python-future.mk +++ b/package/python-future/python-future.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FUTURE_VERSION = 0.18.2 +PYTHON_FUTURE_VERSION = 0.18.3 PYTHON_FUTURE_SOURCE = future-$(PYTHON_FUTURE_VERSION).tar.gz -PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/45/0b/38b06fd9b92dc2b68d58b75f900e97884c45bedd2ff83203d933cf5851c9 +PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/8f/2e/cf6accf7415237d6faeeebdc7832023c90e0282aa16fd3263db0eb4715ec PYTHON_FUTURE_SETUP_TYPE = setuptools PYTHON_FUTURE_LICENSE = MIT PYTHON_FUTURE_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Sun Feb 5 23:01:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 00:01:10 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/python-future: security bump to version 0.18.3 Message-ID: <20230205230241.46236838F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14e35225d8e314c4ded7799843fb80de8e182e28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fix CVE-2022-40899: An issue discovered in Python Charmers Future 0.18.2 and earlier allows remote attackers to cause a denial of service via crafted Set-Cookie header from malicious web server. https://github.com/PythonCharmers/python-future/releases/tag/v0.18.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 51eb81ddcf340457cff13286fd1aa04082c4903a) Signed-off-by: Peter Korsgaard --- package/python-future/python-future.hash | 6 +++--- package/python-future/python-future.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-future/python-future.hash b/package/python-future/python-future.hash index 4fb5d2a2d7..3b2bbb0212 100644 --- a/package/python-future/python-future.hash +++ b/package/python-future/python-future.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.python.org/pypi/future/json -md5 e4579c836b9c025872efe230f6270349 future-0.18.2.tar.gz -sha256 b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d future-0.18.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/future/json +md5 dedcb70d14b23388670d54145aab8be4 future-0.18.3.tar.gz +sha256 34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307 future-0.18.3.tar.gz # Locally computed sha256 checksums sha256 916e561392d48471b9c23437f56e2652f320cb3b119ceaa162edf41016f746b9 LICENSE.txt diff --git a/package/python-future/python-future.mk b/package/python-future/python-future.mk index 76f32180ac..57bf13d83b 100644 --- a/package/python-future/python-future.mk +++ b/package/python-future/python-future.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FUTURE_VERSION = 0.18.2 +PYTHON_FUTURE_VERSION = 0.18.3 PYTHON_FUTURE_SOURCE = future-$(PYTHON_FUTURE_VERSION).tar.gz -PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/45/0b/38b06fd9b92dc2b68d58b75f900e97884c45bedd2ff83203d933cf5851c9 +PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/8f/2e/cf6accf7415237d6faeeebdc7832023c90e0282aa16fd3263db0eb4715ec PYTHON_FUTURE_SETUP_TYPE = setuptools PYTHON_FUTURE_LICENSE = MIT PYTHON_FUTURE_LICENSE_FILES = LICENSE.txt From fancp2007 at gmail.com Mon Feb 6 00:20:22 2023 From: fancp2007 at gmail.com (Scott Fan) Date: Mon, 6 Feb 2023 08:20:22 +0800 Subject: [Buildroot] [PATCH 1/2] configs/beaglebone: bump Linux version to 5.10.145-ti-r54 In-Reply-To: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> References: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> Message-ID: Could you test it with kernel 5.10.162-ti-r56 ? https://github.com/beagleboard/linux/releases/tag/5.10.162-ti-r56 Scott Fan On Mon, Feb 6, 2023 at 5:42 AM Dario Binacchi < dario.binacchi at amarulasolutions.com> wrote: > The previous version failed to boot from sd card with a log reported by > the document [1]. In my case it always failed, a 100% failure against > 75% reported by the document. > > Instead of adding the patch to fix the problem, I preferred to update > the kernel version as suggested by the document itself. > > Tested on beaglebone black. > > [1] > https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 > Signed-off-by > : > Dario Binacchi > --- > configs/beaglebone_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig > index 639b491e9746..dff7dea422ee 100644 > --- a/configs/beaglebone_defconfig > +++ b/configs/beaglebone_defconfig > @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c > board/beaglebone/genimage.cfg" > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call > github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call > github,beagleboard,linux,5.10.145-ti-r54)/linux-5.10.145-ti-r54.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack > am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless > am335x-bonegreen-wireless" > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From christian at paral.in Mon Feb 6 05:11:06 2023 From: christian at paral.in (Christian Stewart) Date: Sun, 5 Feb 2023 21:11:06 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/balena-engine: bump to version 20.10.26 In-Reply-To: <20230205153552.GS2960@scaer> References: <20230202132650.1537778-1-christian@paral.in> <20230205153552.GS2960@scaer> Message-ID: Yann, On Sun, Feb 5, 2023, 7:36 AM Yann E. MORIN wrote: > Christian, All, > > On 2023-02-02 05:26 -0800, Christian Stewart via buildroot spake thusly: > > This update requires a workaround for the non-standard vendor/ structure > in the > > balena-engine repository, which has an invalid vendor/modules.txt file. > > > > Removing the vendor/modules.txt file fixes the build error. > > > > Reference: > https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > > > > The go download post-process script uses go mod init to create the > go.mod file > > That's not correct. The download go-post-process script does not run > that command at all. > My mistake, I had a commit in my working branch that adds go mod init if the go.mod doesn't exist. Thanks, Christian > -------------- next part -------------- An HTML attachment was scrubbed... URL: From me at stevenhay.com Mon Feb 6 05:27:12 2023 From: me at stevenhay.com (=?UTF-8?B?yo7JkEggx53KjMedyodT?=) Date: Mon, 6 Feb 2023 00:27:12 -0500 Subject: [Buildroot] [PATCH 2/2] support/scripts/graph-depends allow for forward and reverse depends on same graph In-Reply-To: <20230123231224.3772679-2-me@stevenhay.com> References: <20230123231224.3772679-2-me@stevenhay.com> Message-ID: All, Wanted to bump this email thread to see what we think of the second part (the meat) of this patch. On 1/23/23 6:12 PM, Steve Hay wrote: > The current implementation of buildroot depe dependency graphing > either does forward- or reverse-dependency traversal. > > This patch enables buildroot to graph forward and reverse dependencies on the > graph for the same package: (Diagram Credit: Yann E. MORRIN) > > $ make pkg-d-graph-both-depends > > pkg A -. .-> pkg E > \ / > pkg B ----> pkg D ----> pkg F > / \ > pkg C -' '-> pkg G > > In the above example a single graph shows pkg {A,B,C} are needed > by pkg D, and pkg D is a dependency of pkg {E,F,G}. > > The variables DEPTH and RDEPTH can be passed into the graphing functions to > specify the maximum depths of direct and reverse dependencies to control graph > size. > > Makefile documentation is also updated. > > Signed-off-by: Steve Hay > > --- > Changes v1 -> v2: > - Enhanced patch description. (Yann) > - Added Makefile documentation. (Yann) > - Completed the implementation of graph-both-depends. (Yann) > - Added ability to control depth of the generated graph. > - Ensured both forward and reverse dependencies are checked for --check-only case. (Yann) > --- > Makefile | 7 ++++ > package/pkg-generic.mk | 7 +++- > support/scripts/graph-depends | 69 ++++++++++++++++++++++------------- > 3 files changed, 55 insertions(+), 28 deletions(-) > > diff --git a/Makefile b/Makefile > index 8517d563d5..e47544fd42 100644 > --- a/Makefile > +++ b/Makefile > @@ -1163,7 +1163,14 @@ help: > @echo ' -show-recursive-rdepends' > @echo ' - Recursively list packages which have as a dependency' > @echo ' -graph-depends - Generate a graph of '\''s dependencies' > + @echo ' DEPTH, if set on the command line, is used to specify maximum' > + @echo ' depth to graph dependencies.' > @echo ' -graph-rdepends - Generate a graph of '\''s reverse dependencies' > + @echo ' RDEPTH, if set on the command line, is used to specify maximum' > + @echo ' depth to graph reverse dependencies.' > + @echo ' -graph-both-depends' > + @echo ' - Generate a graph of both '\''s forward and' > + @echo ' reverse dependencies. DEPTH and RDEPTH work as described above.' > @echo ' -dirclean - Remove build directory' > @echo ' -reconfigure - Restart the build from the configure step' > @echo ' -rebuild - Restart the build from the build step' > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 2f8ba39edf..6ddb304a12 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -1031,10 +1031,13 @@ $(1)-show-info: > $$(info $$(call clean-json,{ $$(call json-info,$(2)) })) > > $(1)-graph-depends: graph-depends-requirements > - $(call pkg-graph-depends,$(1),--direct) > + $(call pkg-graph-depends,$(1),--direct --depth $(or $(DEPTH),0)) > > $(1)-graph-rdepends: graph-depends-requirements > - $(call pkg-graph-depends,$(1),--reverse) > + $(call pkg-graph-depends,$(1),--reverse --rdepth $(or $(RDEPTH),0)) > + > +$(1)-graph-both-depends: graph-depends-requirements > + $(call pkg-graph-depends,$(1),--direct --reverse --depth $(or $(DEPTH),0) --rdepth $(or $(RDEPTH),0)) > > $(1)-all-source: $(1)-source > $(1)-all-source: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-source) > diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends > index 3e3373950f..0285afb46d 100755 > --- a/support/scripts/graph-depends > +++ b/support/scripts/graph-depends > @@ -159,11 +159,11 @@ def check_circular_deps(deps): > > # This functions trims down the dependency list of all packages. > # It applies in sequence all the dependency-elimination methods. > -def remove_extra_deps(deps, rootpkg, transitive, arrow_dir): > +def remove_extra_deps(deps, rootpkg, transitive, direct): > # For the direct dependencies, find and eliminate mandatory > # deps, and add them to the root package. Don't do it for a > # reverse graph, because mandatory deps are only direct deps. > - if arrow_dir == "forward": > + if direct: > for pkg in list(deps.keys()): > if not pkg == rootpkg: > for d in get_mandatory_deps(pkg, deps): > @@ -197,14 +197,16 @@ def print_attrs(outfile, pkg, pkg_type, pkg_version, depth, colors): > outfile.write("%s [color=%s,style=filled]\n" % (name, color)) > > > + > # Print the dependency graph of a package > def print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, > - arrow_dir, draw_graph, depth, max_depth, pkg, colors, done_deps=None): > + direct, draw_graph, depth, max_depth, pkg, colors, done_deps=None): > if done_deps is None: > done_deps = [] > if pkg in done_deps: > return > done_deps.append(pkg) > + > if draw_graph: > print_attrs(outfile, pkg, dict_types[pkg], dict_versions[pkg], depth, colors) > elif depth != 0: > @@ -231,9 +233,12 @@ def print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exc > break > if add: > if draw_graph: > - outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(pkg), pkg_node_name(d), arrow_dir)) > + if direct: > + outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(pkg), pkg_node_name(d), "forward")) > + else: > + outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(d), pkg_node_name(pkg), "forward")) > print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, > - arrow_dir, draw_graph, depth + 1, max_depth, d, colors, done_deps) > + direct, draw_graph, depth + 1, max_depth, d, colors, done_deps) > > > def parse_args(): > @@ -246,6 +251,8 @@ def parse_args(): > help="Graph the dependencies of PACKAGE") > parser.add_argument("--depth", '-d', metavar="DEPTH", dest="depth", type=int, default=0, > help="Limit the dependency graph to DEPTH levels; 0 means no limit.") > + parser.add_argument("--rdepth", metavar="RDEPTH", dest="rdepth", type=int, default=0, > + help="Limit the dependency graph to DEPTH levels; 0 means no limit.") > parser.add_argument("--stop-on", "-s", metavar="PACKAGE", dest="stop_list", action="append", > help="Do not graph past this package (can be given multiple times)." + > " Can be a package name or a glob, " + > @@ -265,9 +272,9 @@ def parse_args(): > default=False) > parser.add_argument("--no-transitive", dest="transitive", action='store_false', > help="Draw (do not draw) transitive dependencies") > - parser.add_argument("--direct", dest="direct", action='store_true', default=True, > + parser.add_argument("--direct", dest="direct", action='store_true', default=False, > help="Draw direct dependencies (the default)") > - parser.add_argument("--reverse", dest="direct", action='store_false', > + parser.add_argument("--reverse", dest="reverse", action='store_true', default=False, > help="Draw reverse dependencies") > parser.add_argument("--quiet", '-q', dest="quiet", action='store_true', > help="Quiet") > @@ -292,6 +299,9 @@ def main(): > sys.exit(1) > outfile = open(args.outfile, "w") > > + if not args.direct and not args.reverse: # select default direct if none is specified. > + args.direct = True > + > if args.package is None: > mode = MODE_FULL > rootpkg = 'all' > @@ -312,13 +322,9 @@ def main(): > if args.exclude_mandatory: > exclude_list += MANDATORY_DEPS > > - if args.direct: > - arrow_dir = "forward" > - else: > - if mode == MODE_FULL: > - logging.error("--reverse needs a package") > - sys.exit(1) > - arrow_dir = "back" > + if args.reverse and mode == MODE_FULL: > + logging.error("--reverse needs a package") > + sys.exit(1) > > draw_graph = not args.flat_list > > @@ -330,23 +336,34 @@ def main(): > logging.error("Error: incorrect color list '%s'" % args.colors) > sys.exit(1) > > - deps, rdeps, dict_types, dict_versions = brpkgutil.get_dependency_tree() > - dict_deps = deps if args.direct else rdeps > - > - check_circular_deps(dict_deps) > - if check_only: > - sys.exit(0) > - > - dict_deps = remove_extra_deps(dict_deps, rootpkg, args.transitive, arrow_dir) > > # Start printing the graph data > - if draw_graph: > + if not check_only and draw_graph: > outfile.write("digraph G {\n") > > - print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, > - arrow_dir, draw_graph, 0, args.depth, rootpkg, colors) > + deps, rdeps, dict_types, dict_versions = brpkgutil.get_dependency_tree() > > - if draw_graph: > + # forward > + if args.direct: > + dict_deps = deps > + direct = True > + check_circular_deps(dict_deps) > + if not check_only: > + dict_deps = remove_extra_deps(dict_deps, rootpkg, args.transitive, direct) > + print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, > + direct, draw_graph, 0, args.depth, rootpkg, colors) > + > + # reverse > + if args.reverse: > + dict_deps = rdeps > + direct = False > + check_circular_deps(dict_deps) > + if not check_only: > + dict_deps = remove_extra_deps(dict_deps, rootpkg, args.transitive, direct) > + print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, > + direct, draw_graph, 0, args.rdepth, rootpkg, colors) > + > + if not check_only and draw_graph: > outfile.write("}\n") > else: > outfile.write("\n") From maxime.chevallier at bootlin.com Mon Feb 6 07:34:45 2023 From: maxime.chevallier at bootlin.com (Maxime Chevallier) Date: Mon, 6 Feb 2023 08:34:45 +0100 Subject: [Buildroot] [PATCH 1/4] package/libtraceevent: new package In-Reply-To: References: Message-ID: <20230206083445.4ad1e510@pc-7.home> Hello Andreas, On Sun, 05 Feb 2023 09:20:15 +0100 Andreas Ziegler wrote: > Hi Maxime, > > libtraceevent and libtracefs are libraries, thus should be positioned > under "Target packages" -> "Libraries". Oops my bad, I should have put them there indeed. > Introducing a "Debugging, profiling and benchmark" category here > would probably be appropriate. Good idea ! > Tested successfully on x86_64 hardware. Thanks a lot ! I'll respin with the proposed changes then. Best regards, Maxime > Kind regards, > Andreas > > On 2023-01-30 18:44, Maxime Chevallier wrote: > > > > Introduce the libtraceevent library, that used to be bundled with > > the trace-cmd tool. This library is now used by several tools and > > libraries such as trace-cmd, libtracefs and rtla. > > > > This package tries to install libraries in /usr/local/lib by > > default, hence the redefinition of the "prefix" variable, so that > > the library gets installed in "/usr/lib" instead. > > > > The same applies to the pkgconfig handling of the proved Makefile, > > which > > installs the .pc files in the /usr/local area by default, hence the > > redefinition of the pkgconfig_dir to either the correct directory > > within the > > staging area, or to empty value for the target to avoid installing > > the .pc > > in that case. > > > > Signed-off-by: Maxime Chevallier > > --- > > DEVELOPERS | 3 +++ > > package/Config.in | 1 + > > package/libtraceevent/Config.in | 9 +++++++ > > package/libtraceevent/libtraceevent.mk | 33 > > ++++++++++++++++++++++++++ 4 files changed, 46 insertions(+) > > create mode 100644 package/libtraceevent/Config.in > > create mode 100644 package/libtraceevent/libtraceevent.mk > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index 706ee80ece..fcf05e0aa0 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -2106,6 +2106,9 @@ F: package/postgresql/ > > F: package/protozero/ > > F: package/timescaledb/ > > > > +N: Maxime Chevallier > > +F: package/libtraceevent/ > > + > > N: Michael Durrant > > F: board/arcturus/ > > F: configs/arcturus_ucp1020_defconfig > > diff --git a/package/Config.in b/package/Config.in > > index 83fddf316f..2f0e6dcb18 100644 > > --- a/package/Config.in > > +++ b/package/Config.in > > @@ -117,6 +117,7 @@ menu "Debugging, profiling and benchmark" > > source "package/kyua/Config.in" > > source "package/latencytop/Config.in" > > source "package/libbpf/Config.in" > > + source "package/libtraceevent/Config.in" > > source "package/lmbench/Config.in" > > source "package/lsof/Config.in" > > source "package/ltp-testsuite/Config.in" > > diff --git a/package/libtraceevent/Config.in > > b/package/libtraceevent/Config.in > > new file mode 100644 > > index 0000000000..d351e3b4de > > --- /dev/null > > +++ b/package/libtraceevent/Config.in > > @@ -0,0 +1,9 @@ > > +config BR2_PACKAGE_LIBTRACEEVENT > > + bool "libtraceevent" > > + help > > + libtraceevent is a library that interfaces with the > > ftrace > > + subsystem in the linux kernel. > > + It used to be bundled directly in the trace-cmd > > + tool, but it was eventually extracted so that it can be > > used > > + by multiple other tools and libraries, such as > > libtracefs and > > + rtla. From maxime.chevallier at bootlin.com Mon Feb 6 07:39:31 2023 From: maxime.chevallier at bootlin.com (Maxime Chevallier) Date: Mon, 6 Feb 2023 08:39:31 +0100 Subject: [Buildroot] [PATCH 3/4] package/linux-tools: add rtla In-Reply-To: References: Message-ID: <20230206083931.759b3ee3@pc-7.home> Hello Andreas, On Sun, 05 Feb 2023 09:22:56 +0100 Andreas Ziegler wrote: > Hi Maxime, > > I was able to build RTLA after some adaptions, see below. Thanks for the effort, I appreciate ! > On 2023-01-30 18:44, Maxime Chevallier wrote: > > > > The RealTime Linux Analysis tool includes a set of commands that > > relies on the osnoise and timerlat tracers from the ftrace kernel > > subsystem, allowing to analyze the lantency sources coming from the > > hardware and the kernel itself. > > > > This tool was introduced in v5.17, and relies on libtracefs and > > libtraceevent, although libtraceevent itself is already a > > dependency for > > libtracefs. > > > > Signed-off-by: Maxime Chevallier > > --- > > DEVELOPERS | 1 + > > package/linux-tools/Config.in | 10 +++++++ > > package/linux-tools/linux-tool-rtla.mk.in | 32 > > +++++++++++++++++++++++ 3 files changed, 43 insertions(+) > > create mode 100644 package/linux-tools/linux-tool-rtla.mk.in > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index fe7194f817..8f459c796a 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -2109,6 +2109,7 @@ F: package/timescaledb/ > > N: Maxime Chevallier > > F: package/libtraceevent/ > > F: package/libtracefs > > +F: package/linux-tools/linux-tool-rtla.mk.in > > > > N: Michael Durrant > > F: board/arcturus/ > > diff --git a/package/linux-tools/Config.in > > b/package/linux-tools/Config.in > > index 8a0b6d5802..186392b816 100644 > > --- a/package/linux-tools/Config.in > > +++ b/package/linux-tools/Config.in > > @@ -102,6 +102,16 @@ config > > BR2_PACKAGE_LINUX_TOOLS_PERF_NEEDS_HOST_PYTHON3 > > > > endif > > > > +config BR2_PACKAGE_LINUX_TOOLS_RTLA > > + bool "rtla" > > Since a version dependency exists, you might add: > depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 Good call ! > > + select BR2_PACKAGE_LINUX_TOOLS > > + select BR2_PACKAGE_LIBTRACEFS > > + help > > + Linux 5.17 and later has 2 new tracers, osnoise and > > timerlat. > > + There tracers allow performing latency analysis, for > > which > > + the rtla tool provides wrapper commands to visualize and > > + extrace latency traces and reports. > > + > > config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS > > bool"selftests" > > depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash > > diff --git a/package/linux-tools/linux-tool-rtla.mk.in > > b/package/linux-tools/linux-tool-rtla.mk.in > > new file mode 100644 > > index 0000000000..a736e3b785 > > --- /dev/null > > +++ b/package/linux-tools/linux-tool-rtla.mk.in > > @@ -0,0 +1,32 @@ > > +################################################################################ > > +# > > +# rtla > > +# > > +################################################################################ > > + > > +LINUX_TOOLS += rtla > > + > > +RTLA_DEPENDENCIES = host-pkgconf libtracefs > > RTLA needs some kernel features; better to include them here, saves > time experimenting: > > # linux kernel needs FTRACE, TIMERLAT_TRACER, HIST_TRIGGERS for RTLA > to work > ifeq ($(BR2_PACKAGE_LINUX_TOOLS_RTLA),y) > define RTLA_LINUX_CONFIG_FIXUPS > $(call KCONFIG_ENABLE_OPT,CONFIG_FTRACE) > $(call KCONFIG_ENABLE_OPT,CONFIG_TIMERLAT_TRACER) > $(call KCONFIG_ENABLE_OPT,CONFIG_HIST_TRIGGERS) > endef > endif Oh I wasn't aware that we could enable kernel options that way. I'll include them in the v2, along with CONFIG_OSNOISE_TRACER that is also required. > > +RTLA_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ > > + CC=$(TARGET_CC) \ > > + LDFLAGS="$(TARGET_LDFLAGS)" \ > > + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig > > + > > The RTLA Makefile unconditionally compiles with stack smashing > protection; linking fails on builds configured without this feature: > > # adapted from linux-tool-tmon.mk.in > ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) > define RTLA_DISABLE_STACK_PROTECTOR > $(SED) 's/-fstack-protector.* //' > $(LINUX_DIR)/tools/tracing/rtla/Makefile > endef > endif Good catch too, I didn't see that. > > +define RTLA_BUILD_CMDS > > + $(Q)if ! grep install > > $(LINUX_DIR)/tools/tracing/rtla/Makefile > > >/dev/null 2>&1 ; then \ > > + echo "Your kernel version is too old and does not > > implement the rtla tool." ; \ > > + echo "At least kernel 5.17 must be used." ; \ > > + exit 1 ; \ > > + fi > > + > > $(RTLA_DISABLE_STACK_PROTECTOR) > > > + $(TARGET_MAKE_ENV) \ > > + $(MAKE) $(RTLA_MAKE_OPTS) \ > > + -C $(LINUX_DIR)/tools/tracing rtla > > +endef > > + > > +define RTLA_INSTALL_TARGET_CMDS > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/tracing \ > > + $(RTLA_MAKE_OPTS) \ > > + DESTDIR=$(TARGET_DIR) \ > > + rtla_install > > +endef > > rtla_install fails with: > Makefile:34: *** NOTICE: rst2man required to generate man pages. > Stop. because it tries to build and install man pages also. Better to > use a custom install command: > > # The rtla_install target tries to create and install manpages, > # which terminates with an error and cannot be disabled > define RTLA_INSTALL_TARGET_CMDS > $(INSTALL) -m 0755 -D $(LINUX_DIR)/tools/tracing/rtla/rtla \ > $(TARGET_DIR)/usr/bin/rtla > endef Ok makes sense as well :) Thanks a lot for the review, tests and fixes ! Maxime > Kind regards, > Andreas > > > -- > > 2.39.1 From fontaine.fabrice at gmail.com Mon Feb 6 08:12:22 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 6 Feb 2023 09:12:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: security bump to version 5.0.2 In-Reply-To: <87y1pbwwdl.fsf@dell.be.48ers.dk> References: <20230120192846.7362-1-fontaine.fabrice@gmail.com> <87y1pbwwdl.fsf@dell.be.48ers.dk> Message-ID: Hello, Le lun. 6 f?vr. 2023 ? 00:00, Peter Korsgaard a ?crit : > >>>>> "Fabrice" == Fabrice Fontaine writes: > > > - Fix CVE-2022-47952: lxc-user-nic in lxc through 5.0.1 is installed > > setuid root, and may allow local users to infer whether any file > > exists, even within a protected directory tree, because "Failed to > > open" often indicates that a file does not exist, whereas "does not > > refer to a network namespace path" often indicates that a file exists. > > NOTE: this is different from CVE-2018-6556 because the CVE-2018-6556 > > fix design was based on the premise that "we will report back to the > > user that the open() failed but the user has no way of knowing why it > > failed"; however, in many realistic cases, there are no plausible > > reasons for failing except that the file does not exist. > > - Drop patches (already in version) > > > Signed-off-by: Fabrice Fontaine > > Committed to 2022.11.x, thanks. > > I see that there isn't a new 4.0.x release. Do you know if 4.0.x is also > vulnerable to this issue? > To my understanding 4.0.x is also vulnerable. https://github.com/lxc/lxc/commit/1b0469530d7a38b8f8990e114b52530d1bf7f3b8 should be backported. > > -- > Bye, Peter Korsgaard > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Mon Feb 6 06:48:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 06 Feb 2023 06:48:05 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-05 Message-ID: <20230206064813.9B98D81587@smtp1.osuosl.org> Hello, Autobuild statistics for 2023-02-05 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 4 | 2 | 0 | 6 | 2022.11.x | 10 | 8 | 0 | 18 | master | 151 | 190 | 2 | 343 | Classification of failures by reason for master ----------------------------------------------- host-sentry-cli-2.8.0 | 9 host-pahole-1.24 | 8 norm-1.5.8 | 8 host-binutils-2.38 | 7 xz-5.2.10 | 7 libgcrypt-1.10.1 | 6 linux-6.1.9 | 6 xxhash-0.8.1 | 6 libfuse3-3.13.0 | 5 python-numpy-1.23.5 | 5 unknown | 5 bash-5.2.15 | 4 gerbera-1.10.0 | 4 host-binutils-2.39 | 4 host-go-1.19.5 | 4 jack2-1.9.21 | 4 dmalloc-5.6.5 | 3 fontconfig-2.13.1 | 3 glibc-2.36-81-g4f4d7a13edfd... | 3 gobject-introspection-1.72.0 | 3 libglib2-2.72.3 | 3 libgpg-error-1.46 | 3 python-bunch-1.0.1 | 3 python-cryptography-39.0.0 | 3 cairo-1.16.0 | 2 dahdi-linux-3.2.0 | 2 fdk-aac-2.0.2 | 2 gobject-introspection | 2 host-binutils-2.37 | 2 host-rust-1.66.1 | 2 libcap-ng-0.8.3 | 2 linux-5.10.145-cip17 | 2 optee-client-3.19.0 | 2 sdl-1.2.15 | 2 ssdp-responder-1.9 | 2 uccp420wlan-6.9.1 | 2 zabbix-5.4.9 | 2 apcupsd-3.14.14 | 1 assimp-5.2.5 | 1 avro-c-1.11.1 | 1 brltty-6.5 | 1 btrfs-progs-5.16.2 | 1 efivar-38 | 1 elfutils-0.186 | 1 file-5.43 | 1 flann-1.9.2 | 1 frr-8.4.2 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gdb-11.2 | 1 gdb-12.1 | 1 google-breakpad-c85eb4a59b6... | 1 gst1-plugins-bad-1.22.0 | 1 host-gcc-final-12.2.0 | 1 host-libarchive-3.6.2 | 1 json-c-0.16 | 1 libcamera-v0.0.3 | 1 libdeflate-1.15 | 1 libnss-3.87 | 1 libusb-1.0.26 | 1 linux-5.10.145-cip17-rt7 | 1 ltp-testsuite-20220930 | 1 luaossl-20220711-0 | 1 lxc-5.0.2 | 1 mongodb-4.2.18 | 1 nginx-1.22.1 | 1 ntp-4.2.8p15 | 1 ocf-linux-20171122 | 1 openssh-9.1p1 | 1 opus-1.3.1 | 1 pv-1.6.20 | 1 python-bcrypt-4.0.1 | 1 qemu-7.2.0 | 1 quickjs-2021-03-27 | 1 reaver-1.6.6 | 1 rtl8192eu-94bce7798bbb18de6... | 1 sysrepo-2.2.12 | 1 toolchain-external-codescap... | 1 uclibc-1.0.42 | 1 uclibc-ng-test-6790eafe897b... | 1 v4l2loopback-0.12.7 | 1 valgrind-3.19.0 | 1 xlib_libX11-1.8.3 | 1 xvisor-0.3.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/3832c21085e76b9665ed4fe75624306060d0c002 | mips64el | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/3b392951da8677740607f73338a5bece2cf10259 | ORPH arm | avro-c-1.11.1 | NOK | http://autobuild.buildroot.net/results/987b14bc901e7180a48c2035a2821742ef8c0916 | i686 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/d8649a9dd3a52e530683c898047a967b490eec12 | ORPH xtensa | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/1cb032cf506d9e01743f9670c7fafd817e25a97c | ORPH i686 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/10d8f9d0fe5d97127f9a1d0bf479046b9e12b225 | ORPH m68k | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/f48a929c2739ab6d60666058e06801e197fc8964 | ORPH mipsel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/c5d2e20abe527198a04c765712f1df985ef5e5d1 | or1k | btrfs-progs-5.16.2 | NOK | http://autobuild.buildroot.net/results/794ac9108b5f2eaa86b4972c2de7ccd46058e904 | ORPH xtensa | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/aaa0322c0abdfd607a53e1930c2bec490fb2b91d | aarch64 | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/435fd155486527fee8bd30ebad016339c8f2a588 | i686 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/e480672a234b3b0b5ab5b3a4be159a02822d40dd | riscv32 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/ad6cd06bcb2dceedce4a13bc91f06085bfa147d2 | i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/2c5d7ec02909fb6b8ebc715f1c60ee58febce47f | ORPH powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/e0ce7b79036ba3d3b7900a52ee43aa9f06762467 | ORPH powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/1c707222000653b5ba4a3f36d035eb7048276b4a | ORPH aarch64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/af198e32b6856d63f78c61a5ca5a8edaeea2316b | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/cc0292a4fc02ef18c16d95472c1afc76955f73fd | ORPH mips | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/eeca556a608d0dffb685b0eca6c15239297eca50 | mips | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/cf1073e00b83a39874d2d4cf743e71cc5d098805 | mips | file-5.43 | NOK | http://autobuild.buildroot.net/results/d44a730c32c8da5ae664521ce4d565dc77c8f499 | ORPH arm | flann-1.9.2 | NOK | http://autobuild.buildroot.net/results/da16a49d2d369746fc06efcb2babc5c9b32b866d | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/7daecb1688eb7214c4557ce1024bb028784901a1 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/b40bcdbbc322cdb16d1c4d9db9481bfd58d9d850 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/8e35acb503c0eeac01b52587bb7526a7cfdf0647 | ORPH xtensa | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/4d889b1ce86f71d066811f0e05dec2fef3fabf92 | or1k | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/ae01ee4ebf8bc2bbffea52236ccd0a121f3c436b | mips | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/0d8827576461ef6efaed98429443862a9b9cb604 | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/58596249090f2b2ea1ea53fd14c6d40978cefa9c | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/037b272e8c5ec1934fa8737f36a5e8a693c38fd6 | mipsel | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/f22bd07edab4fab8ce26dfb0370d38010b54524e | arm | gdb-11.2 | NOK | http://autobuild.buildroot.net/results/1a956256f5bd5df7f8f392c1d79dd68138993ca2 | ORPH or1k | gdb-12.1 | NOK | http://autobuild.buildroot.net/results/87426441a1e224766ce058c09928703a30974a25 | ORPH armeb | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/0099c1b1196b552351e7cacf925fcfc80b5d256b | mips64el | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/091a699816c4ee08205761ffc3540713fac0a23e | sparc64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/b1c729d9bd773bbee6f38cbb577f6b7b2351cca1 | xtensa | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/90cc79c560fced58497fed9d95a849ae517e579b | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/ec9a7aae2e32d38c39e5c1b7c4651e7515890112 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/61e09ff86380a9f03715d28f5e6c25a6db664c07 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/c3d626e048a1cb30b802aea40f3b827ff0883e19 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/d763904f84668d04cafa8b7bd8daf07034a94e0f | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/277fa0b59d6d9700f3b476f6bfe60687aa5f3a81 | microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0cc842dce82a9d1a7fbfeb4a90b12563872d28c9 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/a305cbd2c00264cd2e03b14256a30b18542561c3 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1b21440e836a55453d137ca34fa5f72504e6fafe | ORPH mips | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/b3dc6c793cf99c1bf8a28d30be45033620cd6de4 | mips | gst1-plugins-bad-1.22.0 | NOK | http://autobuild.buildroot.net/results/d70e31761cff8f6cf39785b2da8d9102b3ec03a5 | ORPH microblaze | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/04057155d39af416cce807b1886e525af9b2c4c3 | mips64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/37e8e89809525ae0c8e1435320e95b6930600936 | i686 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/ce52bc61d2fcf18b3fd793b070e6f1174747706a | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/40b1ddbeaddfe62b683216237603d6ab9cdbc7db | sparc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/af7e8d6786a4efbbf5aafb327ad265afc86f20a8 | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6fb2e6d61324044f45d0d8e556466081e4d304ca | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/19223dcd22c299c9dd76ac6f2fbf2059f9277c67 | armeb | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/07c0c75efb056a7e03d1c458d231a47d95328cf4 | sparc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/c3a5a51d9d1f2d4e7e6658781031577ec057b6de | powerpc64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/bce42afe933c576735dcce149b328a9414cfad06 | aarch64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/d76b13b3ced94d2deac45cc48e0956e6ccbbad83 | nios2 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/abaf8096af73d2366615e65025d51c319095a98d | aarch64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/17ef5e0d68dced6cb1d82047c8299909b3dac8b7 | microblazeel | host-gcc-final-12.2.0 | NOK | http://autobuild.buildroot.net/results/0f6a5af8708f3dd48e3a88b74e977d43a2cf4320 | powerpc64le | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/bb6841ed3924a7097836bd26e97d43e4849239c4 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/2388a38a8ecbac494ffa8a14f73faa15199e32cf | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/2781982e8cb013a95e624bd53dd6313e8c6d895c | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/587b7f06cf598b5cbfb6007f503de8c0732b8590 | xtensa | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/03417616aeb6f78a74ef30d84c90e94c7447ab8e | microblazeel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/0979d0e6df6f2f3b67ce948f654950d3060abca2 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8d840685051a600acd4fb527a51f226555a90c4b | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1acc37eca729ecfc57000249db48b99ba99301d3 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/309912b3ade150ba6eb2b0f3300fa3eeb89ff65d | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c5eda5e31b73e5b9a52b27028db1a86190e7b11a | arceb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/bb0917d255b1636fa78cd99c8043211a738f7e33 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/370eb758b38f13bd6f51f89ef6c94718c632f425 | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/04e40ee7ba838eaac8d7fce0ef84c9e2d83940cb | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/7b2e6ef33e47f85908d562042d5e0815aa42ca8f | aarch64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/eb69113bf18912632058d958cba95845a6abe35f | xtensa | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/459f31f842c7dc9f9e36835cfd6182698125dc38 | s390x | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/42ba8bdcdc271ab88cd0737b0ab2eace51353687 | microblazeel | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/fde8ad38cdf510f280a842cee7570dcc01897167 | mips | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/bbf1366a0b723d3dfd5679c03e36c4c3c3aeb538 | arm | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/4699b885c683d014c281935feaff5219096a2794 | armeb | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/8f88e4664407d6c85d17db185411fb6f081b643b | x86_64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/f969a5f654e20923056830531a59c1c310c418df | powerpc64le | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/032bb50f1bce3734199b4b1bef2e646764d3c5f6 | mips64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/3829916afe08915bd59d62425bd7f645b352b932 | mips64el | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/3458b86ae002b9112d96eed55e5d0cae879f57b2 | mips64el | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/605e52c6de5cca6783d4a1d679605160cc2515e4 | mips64el | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/d57bf1299c6c22e546180d6f5b5b48ee13a24b4b | powerpc | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/07ce27491d81a58ed737336cfb724a57bc9804ed | or1k | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/c6e3068fb40ad0e0dc2294023f9650664d2364b3 | arc | libcamera-v0.0.3 | NOK | http://autobuild.buildroot.net/results/8636f7c12684cb69c0f8e67aad933b46585ea4e5 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/cc77bfc19479dc8ef706c81a5f46cb322f1ae886 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/7fb1d5c255247bd857e1256f5c58f3282a8b0b99 | arm | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/5d48a382ed025446e5e0a6c5a817a672a0ca918b | or1k | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/0fc8e2525402545265d8c73f285b2eb9d0877bff | powerpc64le | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/7a96fc5e9e5f16d9a857036da3ee866c64896cae | mips64el | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/7b9cf69328ff68244c9d4fc100101c5b209d332c | x86_64 | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/64183c8264f5937b0bd1cb34d6cab1794ea0a75a | sh4a | libfuse3-3.13.0 | NOK | http://autobuild.buildroot.net/results/28466fd93ff40073d2e929b9b77a033c30e2cb8c | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/7ee72221e3de1b8f3e1cbf42ce200ea0d4c199ca | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/d3967cccf472b4f2e9f716ee4b3c787e0ba6a587 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/c4ffd86ec73ef2757fd6708dd5be42f04b9975a2 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/80a46b03c4eb2c2deb6f8ac7c39d5fdd955142c7 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/b3bc43f46eebefebe615ab5c7226c4379b3d1146 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/a59cb3b33b01e7fda7cdfdffbe634a8e3c7f2c4f | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/ffe7dc310c2d502386d4e68ff3d09819f0750c3c | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/3a80d80ef05742c6b1b0e3a007ae6d88a5873af9 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/3b66a55f2b87761b498b749325781faf298a1f98 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/1773b4399427cc3fffbf98b0a6e010769422f94e | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/f189bd3f656bc3b5e561f2201eca9e12f868f249 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/e84f1f57e5b6bf5a5575bc0bc0899db9016f4c81 | ORPH mipsel | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/3b19d4c49b2fa3d7d1a2c6d28245f8c0da1379c2 | or1k | libusb-1.0.26 | NOK | http://autobuild.buildroot.net/results/a7acfc486325f3fb130f4f3003ea99693d3d1147 | mips64el | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/7598abe2a7989d051d3e3df979933de173e1e65b | ORPH mips64el | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/973bfab0f642b1e0f59dc52b08173cd3d55b873f | ORPH sh4eb | linux-5.10.145-cip17-rt7 | NOK | http://autobuild.buildroot.net/results/e6c1835585b88e90e925083aad64dc7e0e655b8c | ORPH mipsel | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/090aa793b9c8e3f16a579c115f910497bd08ba2a | ORPH s390x | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/e2e33d29ee661b3ef8f33582a49383c8a5258f26 | ORPH powerpc | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/26806b0b0d11a87fbab3724eb6c275cccf653c62 | ORPH powerpc | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/b872d0648b3361c7757dc8e6d05338fadff9947b | ORPH mips64el | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/ca1e25396b6771fcf873abf8e191caadbc13ab0a | ORPH mips | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/768eef80d45a116d3777b5ecb3adac2204887d93 | ORPH sh4aeb | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/8533505a9c57d14f07ab2653ae7a5dc9d87a24ed | mips64 | luaossl-20220711-0 | NOK | http://autobuild.buildroot.net/results/99fa02f9f5c30b73eaf5c39cffc6186fddd06d8b | aarch64_be | lxc-5.0.2 | NOK | http://autobuild.buildroot.net/results/24744227b60482cc23722ed97c6a8252f7b1cff9 | x86_64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/4dfdab874db6c131c53281073b6b58c9b11901d5 | aarch64_be | nginx-1.22.1 | NOK | http://autobuild.buildroot.net/results/502ad9e7c43c5063570df4be1de98a5337e1fd62 | x86_64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/4db61be83e36e80ee7cd5e0f4bb2430d9519bcd1 | ORPH powerpc64le | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/b99af474df5011cc442082cddd002a1c6df1adea | ORPH or1k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/f3c236942d13443c564585ad6e5105bf9a1e8907 | ORPH aarch64_be | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/c12640f2b7416ccbcd153552f34095bb3c27fdea | ORPH powerpc64le | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/bdac7e1d91e8d287c190d41d26928674cb2cd1cf | ORPH arm | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/139bcd6e45cdd9ccc02d790348baff5e2c960910 | ORPH nios2 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/11f6b5c24eb451dd42ac7ab8d1ea055491752bbe | ORPH s390x | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/93104b6cb419c96733862bbebcd17df35f8c731c | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/8518b300aea3b95b6e51936722431f2c7f39e80b | ORPH mips64el | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/a05ff6e7346ded81b51068da3e5662d2084142b0 | ORPH m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/7e27e0260c7d5ae78563e71358868db0a475b061 | ORPH m68k | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/194d24815391641a040098c7de43cdf8362087b1 | arm | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/50f080175a712c305e8a05c26638baf10d165c49 | armeb | opus-1.3.1 | NOK | http://autobuild.buildroot.net/results/0b2fbaae3cd4cbb1a12ae2b71a944dbd400a01b1 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/81d6fe0b72aace546ad0e5c38ca1cf7b89d018a9 | ORPH powerpc64le | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/35c50b0658a886cee240b64234df68920d7b63a3 | arm | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/8181a52415c1fc20ec3ee14fb52fa031c3faa454 | powerpc64le | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/0ff85bd3ea1ffd895173611a95a36acb4f8953b5 | sparc | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/529bf997ef153fd73531e9d1b174495a7aa60a75 | arm | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/ad03fed3920482a850b3514b7cdbdf198b1a7b3d | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/f4a33c7026a02444aa5056b42e9e1c24662772f6 | mipsel | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/f28c8e813e1b0ac0dc171d6b957afe62ba078bbf | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/cc871b20ac3862223d5020a9a616eff22a302a3d | armeb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/726de085dea6b96fe0db57c2ecc5a40d686524e3 | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/40e49899712a723ad425fa56c101826148daa875 | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/afe370554ff1c2f375fdd373c0eac4f5c36a5d91 | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/1fc275b905ceea815c410d61e91de24963d17a63 | mipsel | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/27bec47e903a40c2aea451799c47f510a6524c16 | microblaze | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/87c7420e7a0bb20ca60e7842b3e8bf350e18557b | arc | reaver-1.6.6 | NOK | http://autobuild.buildroot.net/results/16a6e489bf4ff4ebccbf1897330708176054c869 | s390x | rtl8192eu-94bce7798bbb18de6... | NOK | http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2 | sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/0346bd37797e3e163f16f9d34190cd31cb3a5910 | ORPH sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/f462772aed8a85a04024442250072c5e0d78b8c4 | ORPH sh4a | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 | arc | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 | riscv32 | sysrepo-2.2.12 | NOK | http://autobuild.buildroot.net/results/3ecca1a33cbd65626267faa66f2c9892d2bc9f84 | mips64 | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/5355693ed45527c909a32691dc5d4c310eedbb48 | ORPH powerpc64le | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/a83c1e774c86b02df62cd8095382cfa6d8e2cf1c | ORPH aarch64_be | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/73b7de4994414c00ab103913e94d8fdcac72df3d | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/6aff5a8fe919ba64c184f8ba0d130de983250e66 | arm | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/02895ef56d5bc2c2d9dc2a6409c7b8e54a5b4c4f | arc | unknown | NOK | http://autobuild.buildroot.net/results/1d2446347e769d1ed81064032e413348bf57ca66 | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/9c3b8e19063f7587877fdb0598739b55abccb3e8 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/ffdd7cabff753f9446209d9544fc7e9808408042 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/6a066355c24c526a4aea5ba7ad70b18265d3999a | mips | unknown | NOK | http://autobuild.buildroot.net/results/2477c64c0d71b71a8f912fee80a7af6e76f47543 | powerpc64 | v4l2loopback-0.12.7 | NOK | http://autobuild.buildroot.net/results/6364f0688191662c50e9fc3e4efe0ba9140db39c | powerpc | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/4368c6148e79798f58aab97e945c5104e5761b06 | ORPH arm | xlib_libX11-1.8.3 | NOK | http://autobuild.buildroot.net/results/2f6ada73c2eff5c9390603d9e0b7901338068c9d | aarch64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/6fd3fc9d6f83954b02d604847ee7d2bbda77f412 | microblaze | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/a9473c9c39617831b988b92162d1c893cf724de5 | ORPH microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/6274f687793a097728dba444bf51bc44ff9832e0 | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/e277ce10904d50c0e524ea19f2c7f1cfe5fc05d5 | ORPH microblaze | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/dbc6f4cc09a58e0630903a9312b61c9038008166 | ORPH arm | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/4933d7332a277d5778e0a6062940d4ff7361b7e0 | ORPH mips64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/8fe4b97d488428edc01bd13d4e21b49daeb1b204 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/ac244b973a41f0942acf7a9ca1cba9091014b7b1 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/054257846d5fbb467a782fea1e2be594c7bdb098 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/ede695a1e2535b84f3e5f14515bb8e04c3eb3901 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/cb1f97bca1e3dc294377406dbea35d1c58226b49 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/531663887997ee8a37fe773b3dfcffa326b0e08a | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/332f446f3bb5e6627300b04a77af07cd91797817 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/681297952cff21b0e0ca4bafd7a1ba753586470f | ORPH s390x | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/c7aa6a823da12dd2db2a1295a40ede8811a4b2b4 | powerpc64le | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/2582d2d2082f12668a4abc22f39f1d1dbcc432c8 | Classification of failures by reason for 2022.02.x -------------------------------------------------- host-go-1.18.9 | 1 unknown | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | host-go-1.18.9 | NOK | http://autobuild.buildroot.net/results/6d8308e9d6868f078596834488578b8f0850a820 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/909362085c67a98983fcb90f767e02e95c944f6f | Classification of failures by reason for 2022.11.x -------------------------------------------------- gobject-introspection-1.72.0 | 1 host-go-1.19.5 | 1 host-pahole-1.24 | 1 quickjs-2021-03-27 | 1 tcf-agent-1.7.0 | 1 unknown | 1 xz-5.2.7 | 1 zabbix-5.4.9 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1a86140e3d594707e4a5c094abb0b48fb9f1437a | ORPH mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/44d224648f4bf96e01b18f4d0b33a56f5fd65520 | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/977c6264a97fcef185aa82ca23955d78026943ce | or1k | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2 | microblazeel | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/26ed04dd9b667b9e59244013121a2a1a0ea7f391 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/302ec571766997a06d71c5924de2c93823446e8b | microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/37c927b01e98e9d5a2d241ae4d74d9d9524b03f5 | ORPH aarch64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/e09e7e9f361322c0c077f211b4d39e4768ca0569 | Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.6 | 7.0.11 | acpica | DISTRO | https://release-monitoring.org/project/00018 | 20220331 | 20222010 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 43 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.5.4 | 4.6.0 | alfred | DISTRO | https://release-monitoring.org/project/241870 | 2022.1 | 2023.0 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 13.0.0_r24 | angularjs | DISTRO | https://release-monitoring.org/project/21321 | 1.8.2 | 1.8.3 | apitrace | DISTRO | https://release-monitoring.org/project/06170 | 10.0 | 11.1 | apr | DISTRO | https://release-monitoring.org/project/00095 | 1.7.0 | 1.7.2 | apr-util | DISTRO | https://release-monitoring.org/project/00096 | 1.6.1 | 1.6.3 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 11.4.3 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.29.1 | 20.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.46.0 | atkmm | DISTRO | https://release-monitoring.org/project/07962 | 2.36.1 | 2.36.2 | atop | DISTRO | https://release-monitoring.org/project/00135 | 2.8.0 | 2.8.1 | audit | DISTRO | https://release-monitoring.org/project/15225 | 3.0.7 | 3.0.9 | avocado | DISTRO | https://release-monitoring.org/project/13385 | 98.0 | 100.1 | avrdude | DISTRO | https://release-monitoring.org/project/10751 | 6.4 | 7.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_07_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.12.1 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 20.10.21 | 20.10.26 | bat | DISTRO | https://release-monitoring.org/project/241901 | 0.19.0 | 0.22.1 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2023.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2022.3 | 2023.0 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.2.16 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.2.16 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.2.16 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.5 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.38 | 2.40 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.11 | 2.0.12 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 24.0.1 | bluez5_utils | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bluez5_utils-headers | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH boost | DISTRO | https://release-monitoring.org/project/06845 | 1.80.0 | 1.81.0 | bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.2.3 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.16.2 | 6.1.3 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.21 | 3.25 | busybox | DISTRO | https://release-monitoring.org/project/00230 | 1.35.0 | 1.36.0 | ORPH cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.8 | cairomm | DISTRO | https://release-monitoring.org/project/07959 | 1.16.1 | 1.16.2 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.7.4 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.5.0 | 1.5.2 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 3.9.1 | 4.2.0 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.15 | 7.0 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.18.0 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.7 | 1.0.0 | clang | DISTRO | https://release-monitoring.org/project/11811 | 11.1.0 | 15.0.7 | clinfo | DISTRO | https://release-monitoring.org/project/10503 | 3.0.21.02.21 | 3.0.23.01.25 | cloop | DISTRO | https://release-monitoring.org/project/21332 | 3.14.1.3 | 3.14.1.3+... | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.22.3 | 3.25.2 | collectl | DISTRO | https://release-monitoring.org/project/00330 | 4.3.2 | 4.3.7 | compiler-rt | GUESS | https://release-monitoring.org/project/17705 | 11.1.0 | 900 | crucible | DISTRO | https://release-monitoring.org/project/267616 | 2022.05.25 | 2022.12.06 | crudini | DISTRO | https://release-monitoring.org/project/21669 | 0.9.3 | 0.9.4 | crun | DISTRO | https://release-monitoring.org/project/96792 | 1.7.2 | 1.8 | cryptopp | DISTRO | https://release-monitoring.org/project/14487 | 8.6.0 | 8.7.0 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.16 | 1.28.17 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.7.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | dado | DISTRO | https://release-monitoring.org/project/58442 | 1.8.3-1 | 2.1.0-1 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.9 | 3.0.10 | dash | DISTRO | https://release-monitoring.org/project/00394 | 0.5.11.5 | 0.5.12 | ORPH datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.13.2 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.3.4 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.2.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.4.0 | dbus | DISTRO | https://release-monitoring.org/project/05356 | 1.12.24 | 1.14.4 | ORPH dbus-broker | DISTRO | https://release-monitoring.org/project/271475 | 32 | 33 | dbus-python | DISTRO | https://release-monitoring.org/project/00402 | 1.2.18 | 1.3.2 | ORPH dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH ddrescue | DISTRO | https://release-monitoring.org/project/00410 | 1.26 | 1.27 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.20.0 | 1.20.1 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20220117 | 1.3-20221229 | ORPH diffutils | DISTRO | https://release-monitoring.org/project/00436 | 3.8 | 3.9 | ORPH dnsmasq | DISTRO | https://release-monitoring.org/project/00444 | 2.88 | 2.89 | docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 20.10.22 | 23.0.0 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 20.10.22 | 23.0.0 | dracut | DISTRO | https://release-monitoring.org/project/10627 | 057 | 059 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.21.4 | 9.23.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH dust | DISTRO | https://release-monitoring.org/project/141344 | 0.8.1 | 0.8.4 | ORPH e2fsprogs | DISTRO | https://release-monitoring.org/project/00646 | 1.46.5 | 1.46.6 | ORPH easy-rsa | DISTRO | https://release-monitoring.org/project/17770 | 3.1.1 | 3.1.2 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.18 | 1.19 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202211 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.1 | 1.26.3 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 21.12 | 23.01 | elfutils | DISTRO | https://release-monitoring.org/project/05679 | 0.186 | 0.188 | ORPH elixir | DISTRO | https://release-monitoring.org/project/00673 | 1.9.4 | 1.14.3 | empty | DISTRO | https://release-monitoring.org/project/20564 | 0.6.22b | 0.6.23c | ORPH enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.1 | 0.25.4 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 25.2.2 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.21 | 1.0.22 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.11.1 | 1.11.5 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.9.1 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.16 | 1.0.22 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.29 | 1.0.30 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.14 | 1.0.15 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.10 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.8 | 1.0.9 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.47 | 1.0.49 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.27 | 1.0.29 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.47 | 1.2.7 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.13 | 1.1.16 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.23 | 1.0.25 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.5.6 | 1.6.1 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.32 | 1.0.36 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.12 | 1.0.15 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.10 | 1.0.12 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.9.0.1 | 2.9.1.0 | exiv2 | DISTRO | https://release-monitoring.org/project/00769 | 0.27.5 | 0.27.6 | feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.9.1 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.35 | 6.4.36 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.3 | 5.1.2 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH file | DISTRO | https://release-monitoring.org/project/00807 | 5.43 | 5.44 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.33 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.21.0 | flashrom | DISTRO | https://release-monitoring.org/project/10202 | 1.2.1 | 1.3.0 | flatbuffers | DISTRO | https://release-monitoring.org/project/16642 | 2.0.8 | 23.1.21 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.4 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fluent-bit | DISTRO | https://release-monitoring.org/project/267335 | 2.0.8 | 2.0.9 | fmc | GUESS | https://release-monitoring.org/project/145761 | LSDK-21.08 | 0.2.0 | font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 6.2.1 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.14.2 | ORPH freeradius-server | DISTRO | https://release-monitoring.org/project/00853 | 3.2.0 | 3.2.1 | fscryptctl | DISTRO | https://release-monitoring.org/project/270981 | 1.0.0 | 1.1.0 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 22.09.00 | 23.01.00 | gawk | DISTRO | https://release-monitoring.org/project/00868 | 5.2.0 | 5.2.1 | ORPH gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 4.0.0 | ORPH gdal | DISTRO | https://release-monitoring.org/project/00881 | 3.5.1 | 3.6.2 | gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.5.5 | 2.6.2 | gerbera | DISTRO | https://release-monitoring.org/project/18420 | 1.10.0 | 1.12.1 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.56.1 | 10.0.0 | gitlab-runner | DISTRO | https://release-monitoring.org/project/11337 | 15.5.0 | 15.8.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.1 | 2.74.0 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.74.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnupg2 | DISTRO | https://release-monitoring.org/project/01215 | 2.3.8 | 2.4.0 | gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.10.4.0 | 3.10.5.1 | go | DISTRO | https://release-monitoring.org/project/01227 | 1.19.5 | 1.20 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.72.0 | 1.74.0 | ORPH gpsd | DISTRO | https://release-monitoring.org/project/06846 | 3.24 | 3.25 | gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.9 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 7.1.0 | ORPH grantlee | DISTRO | https://release-monitoring.org/project/21448 | 5.2.0 | 5.3.1 | graphicsmagick | DISTRO | https://release-monitoring.org/project/01248 | 1.3.38 | 1.3.40 | grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.51.1 | 1.52.0 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 43.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gssdp | DISTRO | https://release-monitoring.org/project/01262 | 1.4.0.1 | 1.6.2 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.1.0 | gst1-shark | DISTRO | https://release-monitoring.org/project/21854 | v0.7.5 | 0.8.1 | gstd | DISTRO | https://release-monitoring.org/project/235022 | 0.14.0 | 0.15.0 | ORPH gtest | DISTRO | https://release-monitoring.org/project/18290 | 1.12.1 | 1.13.0 | gtkmm3 | DISTRO | https://release-monitoring.org/project/311572 | 3.22.0 | 3.24.7 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.6.2 | guile | DISTRO | https://release-monitoring.org/project/01277 | 3.0.8 | 3.0.9 | gupnp | DISTRO | https://release-monitoring.org/project/01281 | 1.4.3 | 1.6.3 | gupnp-av | DISTRO | https://release-monitoring.org/project/01282 | 0.14.0 | 0.14.1 | gupnp-tools | DISTRO | https://release-monitoring.org/project/01284 | 0.10.3 | 0.12.0 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.50.3 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2022.09.1 | 2023.01.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.6.5 | 2.7.2 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 5.3.1 | 6.0.0 | heimdal | DISTRO | https://release-monitoring.org/project/01307 | 7.7.1 | 7.8.0 | ORPH hiawatha | DISTRO | https://release-monitoring.org/project/13375 | 11.2 | 11.3 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.13.1 | ORPH hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.22.10 | ORPH htop | DISTRO | https://release-monitoring.org/project/01332 | 3.2.1 | 3.2.2 | ORPH htpdate | DISTRO | https://release-monitoring.org/project/132187 | 1.3.6 | 1.3.7 | hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.365 | 0.367 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.8.0 | 2.9.0 | hyperfine | DISTRO | https://release-monitoring.org/project/18526 | 1.14.0 | 1.15.0 | ORPH i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.43.0 | 2.45.1 | ibm-sw-tpm2 | DISTRO | https://release-monitoring.org/project/18952 | 1661 | 1682 | icu | DISTRO | https://release-monitoring.org/project/16134 | 70-1 | 72-1 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.41 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-51 | 7.1.0-60 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.10.0 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.6.0 | ORPH intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 22.6.6 | 23.1.0 | intel-mediasdk | DISTRO | https://release-monitoring.org/project/21814 | 22.6.5 | 23.1.0 | iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.493 | 3.494 | ipset | DISTRO | https://release-monitoring.org/project/01393 | 7.16 | 7.17 | iputils | DISTRO | https://release-monitoring.org/project/01395 | 20211215 | 20221126 | irqbalance | DISTRO | https://release-monitoring.org/project/01402 | 1.9.0 | 1.9.2 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | irssi | DISTRO | https://release-monitoring.org/project/01404 | 1.4.2 | 1.4.3 | iwd | DISTRO | https://release-monitoring.org/project/18380 | 2.2 | 2.3 | ORPH jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.21 | 1.9.22 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 1.1.1 | 1.1.2 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 4.0.0 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.6 | 1.9 | jpeg-turbo | DISTRO | https://release-monitoring.org/project/01648 | 2.1.4 | 2.1.5 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.13.1 | 1.13.2 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.2 | jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.10.0 | 3.10.1 | kexec | DISTRO | https://release-monitoring.org/project/12689 | 2.0.25 | 2.0.26 | ORPH kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.102.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.102.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.102.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.102.0 | kodi | DISTRO | https://release-monitoring.org/project/20547 | 19.5-Matrix | 20.0-Nexus | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.7-Ma... | 20.3.2-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.3-Ma... | 20.5.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-jsonschemabuilder | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.4-Ma... | 20.1.3-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.5-Ma... | 20.1.3-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.1-Ma... | 20.5.0-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.6-Ma... | 20.6.0-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.2.2-Ma... | 20.6.1-Nexus | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.11-M... | 20.3.1-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.6-Ma... | 20.4.0-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.3.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.4.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.3.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.4-Ma... | 20.3.1-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 20.3.0-Nexus | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.5-Ma... | 20.4.0-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.1-Ma... | 20.4.2-Nexus | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.3.1-Ma... | 20.6.1-Nexus | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.16-M... | 20.3.4-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-texturepacker | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.2.0-Ma... | 20.2.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.2-Ma... | 20.1.1-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.3-Ma... | 20.2.1-Nexus | ksmbd-tools | DISTRO | https://release-monitoring.org/project/241856 | 3.4.6 | 3.4.7 | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 2.1.0 | 2.2.0 | lapack | DISTRO | https://release-monitoring.org/project/01534 | 3.10.1 | 3.11.0 | leafpad | DISTRO | https://release-monitoring.org/project/01544 | 0.8.18.1 | 0.8.19 | ORPH lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.3 | 0.3.95 | leptonica | DISTRO | https://release-monitoring.org/project/01549 | 1.82.0 | 1.83.0 | less | DISTRO | https://release-monitoring.org/project/01550 | 590 | 608 | ORPH libabseil-cpp | DISTRO | https://release-monitoring.org/project/115295 | 20220623.1 | 20230125.0 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libass | DISTRO | https://release-monitoring.org/project/01560 | 0.16.0 | 0.17.0 | libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.26 | 2.28-1 | ORPH libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.7 | libcamera | GUESS | https://release-monitoring.org/project/301902 | v0.0.3 | 0.0.4 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.65 | 2.67 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 3.0.0 | libdeflate | DISTRO | https://release-monitoring.org/project/242778 | 1.15 | 1.17 | libdnet | DISTRO | https://release-monitoring.org/project/06308 | 1.16.1 | 1.16.3 | ORPH libebml | DISTRO | https://release-monitoring.org/project/07879 | 1.4.2 | 1.4.4 | libedit | DISTRO | https://release-monitoring.org/project/01599 | 20210910-3.1 | 20221030-3.1 | libevdev | DISTRO | https://release-monitoring.org/project/20540 | 1.12.1 | 1.13.0 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.13.1 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.40.0 | ORPH libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.72.3 | 2.74.5 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.4.0 | 1.6.0 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.17.1 | 1.18.0 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.30 | ORPH libgsasl | DISTRO | https://release-monitoring.org/project/01563 | 1.10.0 | 2.2.0 | ORPH libgsm | DISTRO | https://release-monitoring.org/project/12587 | 1.0.19 | 1.0.22 | libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.8.3 | libgtk3 | DISTRO | https://release-monitoring.org/project/311549 | 3.24.35 | 3.24.36 | libhtp | DISTRO | https://release-monitoring.org/project/01632 | 0.5.40 | 0.5.42 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.40 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.16 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.17 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.2 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.20.1 | 1.22.1 | libmatroska | DISTRO | https://release-monitoring.org/project/01657 | 1.6.3 | 1.7.1 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.13 | 0.12.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.8 | 3.1.10 | libmodplug | DISTRO | https://release-monitoring.org/project/05669 | d1b97ed | 0.8.9.0 | ORPH libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.9.1 | libnetconf2 | DISTRO | https://release-monitoring.org/project/31639 | 2.1.25 | 2.1.28 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.2 | ORPH libnftnl | DISTRO | https://release-monitoring.org/project/01681 | 1.2.3 | 1.2.4 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.2.2 | 5.0.0 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.14 | libopenssl | DISTRO | https://release-monitoring.org/project/20333 | 1.1.1q | 1.1.1s | libpam-tacplus | DISTRO | https://release-monitoring.org/project/20537 | 1.6.1 | 1.7.0 | ORPH libpcap | DISTRO | https://release-monitoring.org/project/01702 | 1.10.2 | 1.10.3 | libpeas | DISTRO | https://release-monitoring.org/project/06871 | 1.32.0 | 1.34.0 | ORPH libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.7.4 | libqrtr-glib | DISTRO | https://release-monitoring.org/project/192056 | 1.0.0 | 1.2.2 | librelp | DISTRO | https://release-monitoring.org/project/01713 | 1.10.0 | 1.11.0 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.54.5 | librtas | DISTRO | https://release-monitoring.org/project/10717 | 2.0.3 | 2.0.4 | ORPH libselinux | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.2 | 3.2.2 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.2 | 2.5.0 | libtalloc | DISTRO | https://release-monitoring.org/project/01733 | 2.3.4 | 2.4.0 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH libtool | DISTRO | https://release-monitoring.org/project/01741 | 2.4.6 | 2.4.7 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.8 | libucl | DISTRO | https://release-monitoring.org/project/21371 | 0.8.1 | 0.8.2 | libupnp | DISTRO | https://release-monitoring.org/project/21315 | 1.14.13 | 1.14.15 | libupnpp | DISTRO | https://release-monitoring.org/project/15849 | 0.21.0 | 0.22.4 | ORPH liburing | DISTRO | https://release-monitoring.org/project/230185 | 2.2 | 2.3 | libva-utils | DISTRO | https://release-monitoring.org/project/16334 | 2.16.0 | 2.17.1 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.14.1 | libvirt | DISTRO | https://release-monitoring.org/project/13830 | 7.10.0 | 9.0.0 | libwpe | DISTRO | https://release-monitoring.org/project/17789 | 1.14.0 | 1.14.1 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.29 | 4.4.33 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.4.0 | 1.5.0 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.54.06 | libyang | DISTRO | https://release-monitoring.org/project/18554 | 2.1.4 | 2.1.30 | lighttpd | DISTRO | https://release-monitoring.org/project/01817 | 1.4.67 | 1.4.68 | lilv | DISTRO | https://release-monitoring.org/project/01818 | 0.24.12 | 0.24.20 | links | DISTRO | https://release-monitoring.org/project/01822 | 2.26 | 2.28 | ORPH linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.1.63 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20221214 | 20230117 | liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.4.0 | 1.5.0 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2023.01.19 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.15 | 1.0.16 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.13.0 | 1.0.0 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.20.1 | 3.21.0 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | lsof | DISTRO | https://release-monitoring.org/project/01844 | 4.96.5 | 4.98.0 | ORPH ltp-testsuite | DISTRO | https://release-monitoring.org/project/21502 | 20220930 | 20230127 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.6 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.11 | lttng-libust | DISTRO | https://release-monitoring.org/project/07135 | 2.13.1 | 2.13.5 | lttng-modules | DISTRO | https://release-monitoring.org/project/07141 | 2.13.7 | 2.13.8 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.8 | 2.13.9 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luarocks | DISTRO | https://release-monitoring.org/project/01856 | 3.9.1 | 3.9.2 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.43.0-0 | 1.44.2-1 | ORPH luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.13.0 | 2.14.0 | ORPH lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.18 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzma-alone | DISTRO | https://release-monitoring.org/project/242840 | 9.22 | 2201 | ORPH lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.4 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.36 | 10.11.1 | ORPH mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.2 | 3.3.0 | mc | DISTRO | https://release-monitoring.org/project/01954 | 4.8.28 | 4.8.29 | mcelog | DISTRO | https://release-monitoring.org/project/08093 | 189 | 191 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.6.0 | 0.1.6.1 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.2.16 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.17 | 1.6.18 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 6.10 | mesa3d-demos | DISTRO | https://release-monitoring.org/project/16781 | 8.4.0 | 8.5.0 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.46.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | minizip | DISTRO | https://release-monitoring.org/project/301509 | 3.0.7 | 3.0.8 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.20.4 | 1.21.2 | modsecurity2 | DISTRO | https://release-monitoring.org/project/68638 | 2.9.7 | 3.0.8 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 6.2.0 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.8 | 7.9 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.32.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.182 | 6.12.0.190 | mpc | DISTRO | https://release-monitoring.org/project/01667 | 1.2.1 | 1.3.1 | ORPH mpd | DISTRO | https://release-monitoring.org/project/14864 | 0.23.11 | 0.23.12 | mpfr | DISTRO | https://release-monitoring.org/project/02019 | 4.1.1 | 4.2.0 | ORPH mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.31.2 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.35.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 5.0.0 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.22 | 1.8.23 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.38 | 4.0.42 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.18 | 2.2.2 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.3-20221224 | 6.4-20230128 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.32.4 | 0.32.5 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | 1.218 | 1.219 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.33.1 | 1.37.1 | netopeer2 | DISTRO | https://release-monitoring.org/project/114978 | 2.1.42 | 2.1.49 | network-manager | DISTRO | https://release-monitoring.org/project/21197 | 1.40.10 | 1.40.12 | ORPH networkd-dispatcher | DISTRO | https://release-monitoring.org/project/242008 | 2.2.3 | 2.2.4 | newt | DISTRO | https://release-monitoring.org/project/15129 | 0.52.21 | 0.52.23 | ORPH nftables | DISTRO | https://release-monitoring.org/project/02082 | 1.0.5 | 1.0.6 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.51.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.22.1 | 1.23.3 | nginx-modsecurity | DISTRO | https://release-monitoring.org/project/68639 | 1.0.2 | 1.0.3 | ninja | DISTRO | https://release-monitoring.org/project/02089 | 1.11.1.g9... | 1.11.1 | nmap | DISTRO | https://release-monitoring.org/project/02096 | 7.92 | 7.93 | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 16.18.1 | 19.6.0 | noip | DISTRO | https://release-monitoring.org/project/21539 | 2.1.9 | 3.0.0 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.151 | 390.157 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 525.85.05 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 2.3 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.34 | 2.0 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.6.1 | openal | DISTRO | https://release-monitoring.org/project/08172 | 1.22.0 | 1.23.0 | ORPH opencl-clhpp | DISTRO | https://release-monitoring.org/project/271141 | 2.0.16 | 2022.09.30 | opencore-amr | DISTRO | https://release-monitoring.org/project/21548 | 0.1.5 | 0.1.6 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.17 | 4.7.0 | opencv4 | DISTRO | https://release-monitoring.org/project/06615 | 4.6.0 | 4.7.0 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.10.0 | openipmi | DISTRO | https://release-monitoring.org/project/02549 | 2.0.32 | 2.0.33 | ORPH openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.14.1+1 | 21+8 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.4 | ORPH openocd | DISTRO | https://release-monitoring.org/project/02557 | 0.11.0 | 0.12.0 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.46 | opensc | DISTRO | https://release-monitoring.org/project/02559 | 0.22.0 | 0.23.0 | openssh | DISTRO | https://release-monitoring.org/project/02565 | 9.1p1 | 9.2p1 | ORPH openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 11.3.5-18... | 12.1.5 | openvpn | DISTRO | https://release-monitoring.org/project/02567 | 2.5.7 | 2.6.0 | ORPH opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.6.1 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.19.0 | 3.20.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.19.0 | 3.20.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.19.0 | 3.20.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.19.0 | 3.20.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.32 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.2.16 | ORPH osm2pgsql | DISTRO | https://release-monitoring.org/project/02575 | 1.7.2 | 1.8.0 | paho-mqtt-c | DISTRO | https://release-monitoring.org/project/21375 | 1.3.11 | 1.3.12 | pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.1 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.13 | 0.17.2 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.7 | ORPH pciutils | DISTRO | https://release-monitoring.org/project/02605 | 3.8.0 | 3.9.0 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202212 | ORPH pdbg | DISTRO | https://release-monitoring.org/project/21378 | 3.5 | 3.6 | perl-class-method-modifiers | DISTRO | https://release-monitoring.org/project/06735 | 2.13 | 2.14 | perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.89 | 6.90 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-file-sharedir-install | DISTRO | https://release-monitoring.org/project/11851 | 0.13 | 0.14 | perl-gdgraph | DISTRO | https://release-monitoring.org/project/09187 | 1.54 | 1.56 | perl-html-parser | DISTRO | https://release-monitoring.org/project/02967 | 3.80 | 3.81 | perl-image-exiftool | DISTRO | https://release-monitoring.org/project/06175 | 12.50 | 12.55 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.080 | 2.081 | perl-json-maybexs | DISTRO | https://release-monitoring.org/project/11953 | 1.004003 | 1.004004 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20200824 | 1.20220520 | perl-mime-tools | DISTRO | https://release-monitoring.org/project/11809 | 5.509 | 5.510 | perl-mojolicious-plugin-aut... | DISTRO | https://release-monitoring.org/project/21729 | 1.37 | 1.39 | perl-moo | DISTRO | https://release-monitoring.org/project/03123 | 2.005004 | 2.005005 | perl-net-ssh2 | DISTRO | https://release-monitoring.org/project/03163 | 0.72 | 0.73 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.93_01 | 1.92 | perl-package-stash | DISTRO | https://release-monitoring.org/project/11885 | 0.39 | 0.40 | perl-plack | DISTRO | https://release-monitoring.org/project/06578 | 1.0048 | 1.0050 | perl-sub-install | DISTRO | https://release-monitoring.org/project/03345 | 0.928 | 0.929 | perl-sub-quote | DISTRO | https://release-monitoring.org/project/12678 | 2.006006 | 2.006008 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-type-tiny | DISTRO | https://release-monitoring.org/project/14406 | 1.012004 | 2.002001 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0208 | php | DISTRO | https://release-monitoring.org/project/03627 | 8.1.14 | 8.2.2 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.22 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-memcached | DISTRO | https://release-monitoring.org/project/17400 | 3.1.5 | 3.2.0 | ORPH php-pam | DISTRO | https://release-monitoring.org/project/241707 | 2.2.3 | 2.2.4 | php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.2.0 | pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.62 | 0.3.65 | pipewire-media-session | DISTRO | https://release-monitoring.org/project/236416 | 0.4.1 | 0.4.2 | ORPH pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.9.4 | ORPH pngquant | DISTRO | https://release-monitoring.org/project/03674 | 2.17.0 | 2.18.0 | poco | DISTRO | https://release-monitoring.org/project/05418 | 1.12.2 | 1.12.4 | poke | DISTRO | https://release-monitoring.org/project/179926 | 2.4 | 3.0 | ORPH policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 22.10.0 | 23.02.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.10 | 1.3.11 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.15 | privoxy | DISTRO | https://release-monitoring.org/project/03712 | 3.0.33 | 3.0.34 | ORPH procps-ng | DISTRO | https://release-monitoring.org/project/03708 | 3.3.17 | 4.0.2 | ORPH proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 9.1.1 | prosody | DISTRO | https://release-monitoring.org/project/03709 | 0.11.14 | 0.12.2 | pru-software-support | DISTRO | https://release-monitoring.org/project/21825 | 6.0.1 | 6.1.0 | psmisc | DISTRO | https://release-monitoring.org/project/03721 | 23.5 | 23.6 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH putty | DISTRO | https://release-monitoring.org/project/05749 | 0.76 | 0.78 | python-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.5.1 | 0.6.0 | python-aiohttp-jinja2 | DISTRO | https://release-monitoring.org/project/21247 | 1.5 | 1.5.1 | python-alembic | DISTRO | https://release-monitoring.org/project/03766 | 1.9.1 | 1.9.2 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 22.12.1 | 23.1.1 | python-beautifulsoup4 | DISTRO | https://release-monitoring.org/project/03779 | 4.11.1 | 4.11.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.26.45 | 1.26.64 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.29.45 | 1.29.64 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.6.1 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 4.1.5 | 4.1.6 | python-dnspython | DISTRO | https://release-monitoring.org/project/13190 | 2.2.1 | 2.3.0 | python-dtschema | DISTRO | https://release-monitoring.org/project/100908 | 2022.12 | 2023.1 | python-flask-babel | DISTRO | https://release-monitoring.org/project/20024 | 2.0.0 | 3.0.1 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 3.0.2 | 3.0.3 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 1.0.1 | 1.1.1 | python-flatbuffers | DISTRO | https://release-monitoring.org/project/85010 | 2.0.7 | 23.1.21 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.30 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.10 | python-hiredis | DISTRO | https://release-monitoring.org/project/12002 | 2.0.0 | 2.2.1 | python-iptables | DISTRO | https://release-monitoring.org/project/11475 | 1.0.0 | 1.0.1 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 8.8.0 | 8.9.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.6 | 2.4.7 | python-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.1.1 | 2.1.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.6.3 | python-maturin | DISTRO | https://release-monitoring.org/project/42653 | 0.14.9 | 0.14.12 | python-mbstrdecoder | DISTRO | https://release-monitoring.org/project/21702 | 1.1.1 | 1.1.2 | python-mypy-extensions | DISTRO | https://release-monitoring.org/project/23367 | 0.4.3 | 1.0.0 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.23.5 | 1.24.2 | python-orjson | DISTRO | https://release-monitoring.org/project/31737 | 3.8.4 | 3.8.5 | python-packaging | DISTRO | https://release-monitoring.org/project/11718 | 22.0 | 23.0 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.12.0 | 3.0.0 | python-pathspec | DISTRO | https://release-monitoring.org/project/15607 | 0.10.3 | 0.11.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.11.0 | 5.11.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 22.3.1 | 23.0 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.16.0 | 3.17 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.2 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 3.0.2 | 3.1.2 | python-pypa-build | DISTRO | https://release-monitoring.org/project/132276 | 0.9.0 | 0.10.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.15.6 | 5.15.8 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.7.3 | 0.7.4 | python-pysmb | DISTRO | https://release-monitoring.org/project/21589 | 1.2.9 | 1.2.9.1 | python-pytest | DISTRO | https://release-monitoring.org/project/03765 | 7.2.0 | 7.2.1 | python-pythran | DISTRO | https://release-monitoring.org/project/21140 | 0.12.0 | 0.12.1 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2022.7 | 2022.7.1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 24.0.1 | 25.0.0b1 | python-qrcode | DISTRO | https://release-monitoring.org/project/20011 | 7.3.1 | 7.4.2 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 4.4.0 | 4.4.2 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.28.1 | 2.28.2 | python-rtoml | DISTRO | https://release-monitoring.org/project/62048 | 0.8.0 | 0.9.0 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-scipy | DISTRO | https://release-monitoring.org/project/04768 | 1.8.1 | 1.10.0 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.12.1 | 1.14.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 65.6.3 | 67.1.0 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.18.1 | 3.18.3 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.19.25 | 6.7.6 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.4.42 | 2.0.1 | python-systemd | DISTRO | https://release-monitoring.org/project/07314 | 234 | 235 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 5.2.0 | 5.2.1 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.8.0 | 5.9.0 | python-txaio | DISTRO | https://release-monitoring.org/project/07202 | 22.2.1 | 23.1.1 | python-typeguard | DISTRO | https://release-monitoring.org/project/38819 | 2.13.3 | 3.0.0b2 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.13 | 1.26.14 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.2.5 | 0.2.6 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 57.2 | 58.0b1 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.23.0 | 2.23.1 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 1.4.2 | 1.5.1 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.32 | 0.33 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.6 | 3.0.8 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.39.4 | 0.47.1 | python-zlmdb | DISTRO | https://release-monitoring.org/project/66674 | 22.6.1 | 23.1.1 | qcom-db410c-firmware | DISTRO | https://release-monitoring.org/project/235382 | 1034.2.1 | 1036.1 | qlibc | DISTRO | https://release-monitoring.org/project/21737 | 2.4.7 | 2.4.8 | ORPH qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 11.2.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.38.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.8 | 6.4.2 | qt6base | DISTRO | https://release-monitoring.org/project/07927 | 6.4.0 | 6.4.2 | qt6serialport | DISTRO | https://release-monitoring.org/project/07927 | 6.4.0 | 6.4.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.3 | 1.4 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-c | DISTRO | https://release-monitoring.org/project/13768 | 0.11.0 | 0.12.0 | ragel | DISTRO | https://release-monitoring.org/project/12105 | 6.10 | 7.0.4 | ORPH ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | raspberrypi-usbboot | DISTRO | https://release-monitoring.org/project/115700 | 2021.07.01 | 20221215-... | ORPH re2 | DISTRO | https://release-monitoring.org/project/10500 | 2022-12-01 | 2023-02-01 | redis | DISTRO | https://release-monitoring.org/project/04181 | 7.0.7 | 7.0.8 | refpolicy | DISTRO | https://release-monitoring.org/project/21663 | 2.20220106 | 2.20221101 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.5 | 2.0.1 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 7.9.2 | rrdtool | DISTRO | https://release-monitoring.org/project/04214 | 1.7.2 | 1.8.0 | ORPH rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2204.1 | 8.2212.0 | rt-tests | DISTRO | https://release-monitoring.org/project/59450 | 2.4 | 2.5 | rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.1.0 | ruby | DISTRO | https://release-monitoring.org/project/04223 | 3.1.3 | 3.2.0 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.66.1 | 1.67.0 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.66.1 | 1.67.0 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.42.0 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.11.1.2 | 2.11.2.0 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.4 | 2.3.5.5 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.8.0 | 1.0.8.1 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.6.0.0 | 2.6.0.1 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.5.1.1 | 2.5.1.2 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.5.0 | 2.2.5.1 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.3.2 | 0.5.3.3 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.12 | 4.17.5 | sane-backends | DISTRO | https://release-monitoring.org/project/04760 | 1.1.1 | 1.2.1 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.4.0 | sdl2_mixer | DISTRO | https://release-monitoring.org/project/04782 | 2.0.4 | 2.6.2 | ORPH sdl2_net | DISTRO | https://release-monitoring.org/project/04783 | 2.0.1 | 2.2.0 | ORPH sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdl_sound | DISTRO | https://release-monitoring.org/project/10262 | 1.0.3 | 2.0.1 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | selinux-python | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | semodule-utils | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | ORPH sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 2.8.0 | 2.12.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.5.4 | ser2net | DISTRO | https://release-monitoring.org/project/21655 | 4.3.8 | 4.3.11 | serd | DISTRO | https://release-monitoring.org/project/230531 | 0.30.14 | 0.30.16 | shairport-sync | DISTRO | https://release-monitoring.org/project/21384 | 3.3.9 | 4.1.1 | ORPH shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.2 | ORPH shim | DISTRO | https://release-monitoring.org/project/10719 | 15.4 | 15.7 | sispmctl | DISTRO | https://release-monitoring.org/project/21653 | 4.9 | 4.10 | skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.12.0.1 | 2.13.0.0 | snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.10 | 3.5.0 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.40.0 | 3.1.53.0 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sord | DISTRO | https://release-monitoring.org/project/230536 | 0.16.12 | 0.16.14 | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | spawn-fcgi | DISTRO | https://release-monitoring.org/project/05388 | 1.6.4 | 1.6.5 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice | DISTRO | https://release-monitoring.org/project/04871 | 0.15.0 | 0.15.1 | sqlcipher | DISTRO | https://release-monitoring.org/project/11213 | 4.5.1 | 4.5.3 | start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.19 | ORPH stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.5 | 1.0.7 | stress-ng | DISTRO | https://release-monitoring.org/project/12538 | 0.13.05 | 0.15.03 | strongswan | DISTRO | https://release-monitoring.org/project/04899 | 5.9.8 | 5.9.9 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.65 | 5.67 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.5 | ORPH suricata | DISTRO | https://release-monitoring.org/project/10925 | 6.0.6 | 6.0.10 | synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.29.3 | 0.30.2 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.38.1 | 4.0.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.46.0 | sysrepo | DISTRO | https://release-monitoring.org/project/34820 | 2.2.12 | 2.2.36 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.6.1 | 12.6.2 | ORPH system-config-printer | DISTRO | https://release-monitoring.org/project/08855 | 1.5.15 | 1.5.18 | ORPH systemd | DISTRO | https://release-monitoring.org/project/05440 | 250.8 | 252 | systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.04 | ORPH tbb | DISTRO | https://release-monitoring.org/project/08217 | 2021.5.0 | 2021.7.0 | tcl | DISTRO | https://release-monitoring.org/project/04941 | 8.6.12 | 8.6.13 | ORPH tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | tcllib | DISTRO | https://release-monitoring.org/project/04943 | 1.20 | 1.21 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.4.2 | 4.4.3 | ORPH terminology | DISTRO | https://release-monitoring.org/project/04951 | 1.12.1 | 1.13.0 | tesseract-ocr | DISTRO | https://release-monitoring.org/project/04954 | 5.0.1 | 5.3.0 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.5 | 2.5.2 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.17.0 | ORPH timescaledb | DISTRO | https://release-monitoring.org/project/17545 | 2.9.1 | 2.9.2 | tinifier | DISTRO | https://release-monitoring.org/project/241900 | 3.4.0 | 4.0.1 | tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20220801 | 20230101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tio | DISTRO | https://release-monitoring.org/project/20587 | 1.47 | 2.5 | tk | DISTRO | https://release-monitoring.org/project/11426 | 8.6.12 | 8.6.13 | tmux | DISTRO | https://release-monitoring.org/project/04980 | 3.1c | 3.3a | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 3.0.0 | ORPH tpm2-pkcs11 | DISTRO | https://release-monitoring.org/project/18777 | 1.8.0 | 1.9.0 | tpm2-tools | DISTRO | https://release-monitoring.org/project/12841 | 5.2 | 5.4 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.1.0 | 4.0.1 | ORPH trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | 2.9.7 | 3.1.6 | traceroute | DISTRO | https://release-monitoring.org/project/14877 | 2.1.0 | 2.1.1 | tree | DISTRO | https://release-monitoring.org/project/05006 | 2.0.2 | 2.1.0 | tzdata | DISTRO | https://release-monitoring.org/project/05021 | 2022f | 2022g | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2023.01 | uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.12 | 0.13.1 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 4.3.0.0 | 4.4.0.0 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 3.2 | unrar | DISTRO | https://release-monitoring.org/project/13306 | 6.1.7 | 6.2.5 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.7.1 | ORPH upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.19 | 0.99.20 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH uuu | DISTRO | https://release-monitoring.org/project/259328 | 1.5.11 | 1.5.21 | vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.56.3 | ORPH valgrind | DISTRO | https://release-monitoring.org/project/13639 | 3.19.0 | 3.20.0 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.7 | 1.0 | vis-network | DISTRO | https://release-monitoring.org/project/270536 | 9.1.0 | 9.1.2 | volk | DISTRO | https://release-monitoring.org/project/147733 | 2.5.2 | 3.0.0 | vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vte | DISTRO | https://release-monitoring.org/project/10895 | 0.66.2 | 0.70.2 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.45 | 3.2.47 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.240 | ORPH waf | DISTRO | https://release-monitoring.org/project/05116 | 2.0.24 | 2.0.25 | wavpack | DISTRO | https://release-monitoring.org/project/05121 | 5.5.0 | 5.6.0 | ORPH waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 1.0.0 | webp | DISTRO | https://release-monitoring.org/project/01761 | 1.2.4 | 1.3.0 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH weston | DISTRO | https://release-monitoring.org/project/13745 | 10.0.1 | 11.0.1 | whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.14 | 5.5.15 | wine | DISTRO | https://release-monitoring.org/project/05134 | 7.0 | 8.1 | wireless-regdb | DISTRO | https://release-monitoring.org/project/15257 | 2022.02.18 | 2022.08.12 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.8 | 0.4.13 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.15.1 | 0.16.1 | wtfutil | DISTRO | https://release-monitoring.org/project/243189 | 0.41.0 | 0.42.0 | xapian | DISTRO | https://release-monitoring.org/project/15919 | 1.4.19 | 1.4.22 | xapp_beforelight | DISTRO | https://release-monitoring.org/project/21724 | 1.0.5 | 1.0.6 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20230201 | xapp_xvidtune | DISTRO | https://release-monitoring.org/project/14952 | 1.0.3 | 1.0.4 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.5 | 4.17.0 | xfsprogs | DISTRO | https://release-monitoring.org/project/05188 | 5.14.2 | 6.1.1 | ORPH xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.37 | 2.38 | xlib_libX11 | DISTRO | https://release-monitoring.org/project/01764 | 1.8.3 | 1.8.4 | xmrig | DISTRO | https://release-monitoring.org/project/17499 | 6.18.1 | 6.19.0 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 6.03 | 6.06.1 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.22 | 3.23 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 376 | 378 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.1 | 0.3.2 | xz | DISTRO | https://release-monitoring.org/project/05277 | 5.2.10 | 5.4.1 | ORPH yad | DISTRO | https://release-monitoring.org/project/05280 | 0.40.0 | 12.3 | zabbix | DISTRO | https://release-monitoring.org/project/05492 | 5.4.9 | 6.2.7 | zchunk | DISTRO | https://release-monitoring.org/project/178035 | 1.2.2 | 1.2.3 | zeek | DISTRO | https://release-monitoring.org/project/267106 | 4.1.1 | 5.1.2 | zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.1.7 | 2.1.9 | zic | DISTRO | https://release-monitoring.org/project/16905 | 2022f | 2022g | Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 ffmpeg | CVE-2022-3965 | https://security-tracker.debian.org/tracker/CVE-2022-3965 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 nasm | CVE-2022-46457 | https://security-tracker.debian.org/tracker/CVE-2022-46457 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tmux | CVE-2022-47016 | https://security-tracker.debian.org/tracker/CVE-2022-47016 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dropbear | CVE-2021-36369 | https://security-tracker.debian.org/tracker/CVE-2021-36369 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 ffmpeg | CVE-2022-3965 | https://security-tracker.debian.org/tracker/CVE-2022-3965 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-3998 | https://security-tracker.debian.org/tracker/CVE-2021-3998 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2021-3981 | https://security-tracker.debian.org/tracker/CVE-2021-3981 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2022-0711 | https://security-tracker.debian.org/tracker/CVE-2022-0711 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libbpf | CVE-2021-45940 | https://security-tracker.debian.org/tracker/CVE-2021-45940 libbpf | CVE-2021-45941 | https://security-tracker.debian.org/tracker/CVE-2021-45941 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libxslt | CVE-2022-29824 | https://security-tracker.debian.org/tracker/CVE-2022-29824 lighttpd | CVE-2022-41556 | https://security-tracker.debian.org/tracker/CVE-2022-41556 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 lxc | CVE-2022-47952 | https://security-tracker.debian.org/tracker/CVE-2022-47952 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mender | CVE-2022-29555 | https://security-tracker.debian.org/tracker/CVE-2022-29555 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 modsecurity2 | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 modsecurity2 | CVE-2023-24021 | https://security-tracker.debian.org/tracker/CVE-2023-24021 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 nodejs | CVE-2022-35256 | https://security-tracker.debian.org/tracker/CVE-2022-35256 nodejs | CVE-2022-43548 | https://security-tracker.debian.org/tracker/CVE-2022-43548 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 opusfile | CVE-2022-47021 | https://security-tracker.debian.org/tracker/CVE-2022-47021 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 patchelf | CVE-2022-44940 | https://security-tracker.debian.org/tracker/CVE-2022-44940 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 proftpd | CVE-2021-46854 | https://security-tracker.debian.org/tracker/CVE-2021-46854 python-aiohttp | CVE-2022-33124 | https://security-tracker.debian.org/tracker/CVE-2022-33124 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-45198 | https://security-tracker.debian.org/tracker/CVE-2022-45198 python-pillow | CVE-2022-45199 | https://security-tracker.debian.org/tracker/CVE-2022-45199 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pyjwt | CVE-2022-29217 | https://security-tracker.debian.org/tracker/CVE-2022-29217 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python-web2py | CVE-2022-33146 | https://security-tracker.debian.org/tracker/CVE-2022-33146 python-werkzeug | CVE-2022-29361 | https://security-tracker.debian.org/tracker/CVE-2022-29361 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3611 | https://security-tracker.debian.org/tracker/CVE-2021-3611 qemu | CVE-2021-3750 | https://security-tracker.debian.org/tracker/CVE-2021-3750 qemu | CVE-2021-3929 | https://security-tracker.debian.org/tracker/CVE-2021-3929 qemu | CVE-2021-3947 | https://security-tracker.debian.org/tracker/CVE-2021-3947 qemu | CVE-2021-4158 | https://security-tracker.debian.org/tracker/CVE-2021-4158 qemu | CVE-2021-4206 | https://security-tracker.debian.org/tracker/CVE-2021-4206 qemu | CVE-2021-4207 | https://security-tracker.debian.org/tracker/CVE-2021-4207 qemu | CVE-2022-0358 | https://security-tracker.debian.org/tracker/CVE-2022-0358 qemu | CVE-2022-26353 | https://security-tracker.debian.org/tracker/CVE-2022-26353 qemu | CVE-2022-26354 | https://security-tracker.debian.org/tracker/CVE-2022-26354 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-35414 | https://security-tracker.debian.org/tracker/CVE-2022-35414 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 rabbitmq-server | CVE-2021-22116 | https://security-tracker.debian.org/tracker/CVE-2021-22116 rabbitmq-server | CVE-2021-22117 | https://security-tracker.debian.org/tracker/CVE-2021-22117 rabbitmq-server | CVE-2021-32718 | https://security-tracker.debian.org/tracker/CVE-2021-32718 rabbitmq-server | CVE-2021-32719 | https://security-tracker.debian.org/tracker/CVE-2021-32719 rabbitmq-server | CVE-2022-31008 | https://security-tracker.debian.org/tracker/CVE-2022-31008 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 rpm | CVE-2021-3521 | https://security-tracker.debian.org/tracker/CVE-2021-3521 rpm | CVE-2021-35937 | https://security-tracker.debian.org/tracker/CVE-2021-35937 rpm | CVE-2021-35938 | https://security-tracker.debian.org/tracker/CVE-2021-35938 rpm | CVE-2021-35939 | https://security-tracker.debian.org/tracker/CVE-2021-35939 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 sdl2 | CVE-2022-4743 | https://security-tracker.debian.org/tracker/CVE-2022-4743 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 sofia-sip | CVE-2023-22741 | https://security-tracker.debian.org/tracker/CVE-2023-22741 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tmux | CVE-2022-47016 | https://security-tracker.debian.org/tracker/CVE-2022-47016 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unbound | CVE-2022-30698 | https://security-tracker.debian.org/tracker/CVE-2022-30698 unbound | CVE-2022-30699 | https://security-tracker.debian.org/tracker/CVE-2022-30699 unbound | CVE-2022-3204 | https://security-tracker.debian.org/tracker/CVE-2022-3204 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 usbguard | CVE-2019-25058 | https://security-tracker.debian.org/tracker/CVE-2019-25058 vim | CVE-2023-0049 | https://security-tracker.debian.org/tracker/CVE-2023-0049 vim | CVE-2023-0051 | https://security-tracker.debian.org/tracker/CVE-2023-0051 vim | CVE-2023-0054 | https://security-tracker.debian.org/tracker/CVE-2023-0054 vim | CVE-2023-0288 | https://security-tracker.debian.org/tracker/CVE-2023-0288 vim | CVE-2023-0433 | https://security-tracker.debian.org/tracker/CVE-2023-0433 wavpack | CVE-2022-2476 | https://security-tracker.debian.org/tracker/CVE-2022-2476 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 ffmpeg | CVE-2022-3965 | https://security-tracker.debian.org/tracker/CVE-2022-3965 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 modsecurity2 | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 modsecurity2 | CVE-2023-24021 | https://security-tracker.debian.org/tracker/CVE-2023-24021 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 opusfile | CVE-2022-47021 | https://security-tracker.debian.org/tracker/CVE-2022-47021 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 sdl2 | CVE-2022-4743 | https://security-tracker.debian.org/tracker/CVE-2022-4743 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 sofia-sip | CVE-2023-22741 | https://security-tracker.debian.org/tracker/CVE-2023-22741 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tmux | CVE-2022-47016 | https://security-tracker.debian.org/tracker/CVE-2022-47016 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 vim | CVE-2023-0049 | https://security-tracker.debian.org/tracker/CVE-2023-0049 vim | CVE-2023-0051 | https://security-tracker.debian.org/tracker/CVE-2023-0051 vim | CVE-2023-0054 | https://security-tracker.debian.org/tracker/CVE-2023-0054 vim | CVE-2023-0288 | https://security-tracker.debian.org/tracker/CVE-2023-0288 vim | CVE-2023-0433 | https://security-tracker.debian.org/tracker/CVE-2023-0433 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From peter at korsgaard.com Mon Feb 6 08:32:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 09:32:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: fix build with libressl >= 3.5.0 In-Reply-To: <20230115182724.377966-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 15 Jan 2023 19:27:24 +0100") References: <20230115182724.377966-1-fontaine.fabrice@gmail.com> Message-ID: <87wn4vdwjf.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with libressl raised since bump to > version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: > In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: > /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': > /tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} > 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) > | ^~ > Fixes: > - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 08:26:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 09:26:47 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/mariadb: fix build with libressl >= 3.5.0 Message-ID: <20230206083307.030578390C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a542730884998f5f421617c76b238ab4a67d17b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fix the following build failure with libressl raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': /tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) | ^~ Fixes: - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 22e926e9af915303180d35b5c41ea5fbf411d753) Signed-off-by: Peter Korsgaard --- ...sl_compat.h-fix-build-with-libressl-3.5.0.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch b/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 0000000000..fd3e6e6607 --- /dev/null +++ b/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,39 @@ +From 79ed770a37c8669390a58a4485dd8f5565fe2497 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 15 Jan 2023 19:12:05 +0100 +Subject: [PATCH] include/ssl_compat.h: fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: +/tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': +/tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} + 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/MariaDB/server/pull/2435] +--- + include/ssl_compat.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/ssl_compat.h b/include/ssl_compat.h +index 664f3aac87c..3678e5fa084 100644 +--- a/include/ssl_compat.h ++++ b/include/ssl_compat.h +@@ -19,7 +19,8 @@ + /* OpenSSL version specific definitions */ + #if defined(OPENSSL_VERSION_NUMBER) + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ ++ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + #define HAVE_OPENSSL11 1 + #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) + #define ERR_remove_state(X) ERR_clear_error() +-- +2.39.0 + From thomas.petazzoni at bootlin.com Mon Feb 6 08:34:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 09:34:39 +0100 Subject: [Buildroot] [git commit] package/xxhash: use MOREFLAGS instead of overriding CFLAGS Message-ID: <20230206083621.0D5EB83950@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfef88762d19b2fd8f99b55cee5c9ebaf986e1c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set MOREFLAGS instead of overriding CFLAGS to avoid the following build failure raised since commit 94b66fb49cd57d0863245fbe0a3dc0833e76aad0: /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /tmp/ccabb8cF.o: relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC Fixes: - http://autobuild.buildroot.org/results/953133575d8c13266f1450fa545e70e4a518508d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xxhash/xxhash.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 40e3c2696c..75d375a2fa 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -28,8 +28,7 @@ endif define XXHASH_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - CFLAGS="$(TARGET_CFLAGS) -DXXH_NO_INLINE_HINTS" \ - $(XXHASH_TARGETS) + MOREFLAGS=-DXXH_NO_INLINE_HINTS $(XXHASH_TARGETS) endef define XXHASH_INSTALL_STAGING_CMDS From peter at korsgaard.com Mon Feb 6 08:41:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 09:41:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: security bump to version 5.0.2 In-Reply-To: (Fabrice Fontaine's message of "Mon, 6 Feb 2023 09:12:22 +0100") References: <20230120192846.7362-1-fontaine.fabrice@gmail.com> <87y1pbwwdl.fsf@dell.be.48ers.dk> Message-ID: <87sffjdw37.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: Hi, >> Committed to 2022.11.x, thanks. >> >> I see that there isn't a new 4.0.x release. Do you know if 4.0.x is also >> vulnerable to this issue? >> > To my understanding 4.0.x is also vulnerable. > https://github.com/lxc/lxc/commit/1b0469530d7a38b8f8990e114b52530d1bf7f3b8 > should be backported. Ok, thanks. Will you send a patch for 2022.02.x? -- Bye, Peter Korsgaard From dario.binacchi at amarulasolutions.com Mon Feb 6 08:45:51 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Mon, 6 Feb 2023 09:45:51 +0100 Subject: [Buildroot] [PATCH 1/2] configs/beaglebone: bump Linux version to 5.10.145-ti-r54 In-Reply-To: References: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> Message-ID: Hi Scott, On Mon, Feb 6, 2023 at 1:20 AM Scott Fan wrote: > > Could you test it with kernel 5.10.162-ti-r56 ? > > https://github.com/beagleboard/linux/releases/tag/5.10.162-ti-r56 Thanks for your suggestion, I will test with kernel 5.10.162-ti-r56 kernel. Thanks and regards, Dario > > Scott Fan > > > On Mon, Feb 6, 2023 at 5:42 AM Dario Binacchi wrote: >> >> The previous version failed to boot from sd card with a log reported by >> the document [1]. In my case it always failed, a 100% failure against >> 75% reported by the document. >> >> Instead of adding the patch to fix the problem, I preferred to update >> the kernel version as suggested by the document itself. >> >> Tested on beaglebone black. >> >> [1] https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 >> Signed-off-by: Dario Binacchi >> --- >> configs/beaglebone_defconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig >> index 639b491e9746..dff7dea422ee 100644 >> --- a/configs/beaglebone_defconfig >> +++ b/configs/beaglebone_defconfig >> @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" >> # Kernel >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_TARBALL=y >> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" >> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.145-ti-r54)/linux-5.10.145-ti-r54.tar.gz" >> BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" >> BR2_LINUX_KERNEL_DTS_SUPPORT=y >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" >> -- >> 2.32.0 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From thomas.petazzoni at bootlin.com Mon Feb 6 08:47:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 09:47:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/xxhash: set MOREFLAGS In-Reply-To: <20230119184846.3693-1-fontaine.fabrice@gmail.com> References: <20230119184846.3693-1-fontaine.fabrice@gmail.com> Message-ID: <20230206094727.07b2902b@windsurf> On Thu, 19 Jan 2023 19:48:46 +0100 Fabrice Fontaine wrote: > Set MOREFLAGS instead of overriding CFLAGS to avoid the following build > failure raised since commit 94b66fb49cd57d0863245fbe0a3dc0833e76aad0: > > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /tmp/ccabb8cF.o: relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC > > Fixes: > - http://autobuild.buildroot.org/results/953133575d8c13266f1450fa545e70e4a518508d > > Signed-off-by: Fabrice Fontaine > --- > package/xxhash/xxhash.mk | 3 +-- > 1 file changed, 1 insertion(+), 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 Mon Feb 6 08:50:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 09:50:15 +0100 Subject: [Buildroot] [git commit] boot/barebox: pass required environment variables for reproducible build Message-ID: <20230206085219.40B8283958@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c90bd74ebb264ccc925f10a142ccd82ef63a4601 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Barebox makes use of the same variables as the linux kernel does for handling reproducible build -- KBUILD_BUILD_HOST, KBUILD_BUILD_TIMESTAMP, KBUILD_BUILD_USER. This patch sets the proper variables based on linux/linux.mk, and passes them to the make invocation when building, to ensure a reproducible build is possible when BR2_REPRODUCIBLE is enabled. Signed-off-by: Casey Reeves Signed-off-by: Thomas Petazzoni --- boot/barebox/barebox.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index da151d3c25..90be8c1ecc 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -74,6 +74,13 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) +ifeq ($(BR2_REPRODUCIBLE),y) +$(1)_MAKE_ENV += \ + KBUILD_BUILD_USER=buildroot \ + KBUILD_BUILD_HOST=buildroot \ + KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" +endif + ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) $(1)_KCONFIG_DEFCONFIG = $$(call qstrip,$$(BR2_TARGET_$(1)_BOARD_DEFCONFIG))_defconfig else ifeq ($$(BR2_TARGET_$(1)_USE_CUSTOM_CONFIG),y) @@ -121,7 +128,7 @@ endef define $(1)_BUILD_CMDS $$($(1)_BUILD_BAREBOXENV_CMDS) - $$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) + $$($(1)_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) $$($(1)_BUILD_CUSTOM_ENV) endef From thomas.petazzoni at bootlin.com Mon Feb 6 08:54:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 09:54:04 +0100 Subject: [Buildroot] [PATCH 2/2] boot/barebox: pass required environment variables for reproducible build In-Reply-To: <20230119121004.3416962-3-casey@xogium.me> References: <20230119121004.3416962-1-casey@xogium.me> <20230119121004.3416962-3-casey@xogium.me> Message-ID: <20230206095404.3662d995@windsurf> On Thu, 19 Jan 2023 13:10:04 +0100 Casey Reeves wrote: > Barebox makes use of the same variables as the linux kernel does for > handling reproducible build -- KBUILD_BUILD_HOST, > KBUILD_BUILD_TIMESTAMP, KBUILD_BUILD_USER. This patch sets the proper > variables based on linux/linux.mk, and passes them to the make > invocation when building, to ensure a reproducible build is possible > when BR2_REPRODUCIBLE is enabled. > > Signed-off-by: Casey Reeves > --- > boot/barebox/barebox.mk | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 08:54:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 09:54:21 +0100 Subject: [Buildroot] [git commit] package/libcamera-apps: bump to version 1.1.1 Message-ID: <20230206085501.335CC83967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80d98cd2a1c0eeb5c3083b3265c4f3221d1cb3c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- package/libcamera-apps/libcamera-apps.hash | 2 +- package/libcamera-apps/libcamera-apps.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash index cc2d3b6926..fbb3150cb5 100644 --- a/package/libcamera-apps/libcamera-apps.hash +++ b/package/libcamera-apps/libcamera-apps.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2d895ad5d11a6004b1e84eb8d486d5dca64dda1b41e0f4f3f87904666f249e3e libcamera-apps-1.1.0.tar.gz +sha256 c05e29e02da05fa92739941295d96dcb93324805f7b348ad182e7e29e7e0c520 libcamera-apps-1.1.1.tar.gz sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index a5d9227250..290ee9a026 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAMERA_APPS_VERSION = 1.1.0 +LIBCAMERA_APPS_VERSION = 1.1.1 LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,v$(LIBCAMERA_APPS_VERSION)) LIBCAMERA_APPS_LICENSE = BSD-2-Clause LIBCAMERA_APPS_LICENSE_FILES = license.txt From thomas.petazzoni at bootlin.com Mon Feb 6 08:55:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 09:55:01 +0100 Subject: [Buildroot] [PATCH] package/libcamera-apps: bump to version 1.1.1 In-Reply-To: <20230131132327.636417-1-marcus.folkesson@gmail.com> References: <20230131132327.636417-1-marcus.folkesson@gmail.com> Message-ID: <20230206095501.5519ddd1@windsurf> On Tue, 31 Jan 2023 14:23:27 +0100 Marcus Folkesson wrote: > Signed-off-by: Marcus Folkesson > --- > package/libcamera-apps/libcamera-apps.hash | 2 +- > package/libcamera-apps/libcamera-apps.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 Mon Feb 6 09:14:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 10:14:11 +0100 Subject: [Buildroot] [git commit] package/libcamera-apps: fix overflow conversion error Message-ID: <20230206092728.87DAF83972@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bbf8d89810479d2cc4777b84f3cc49bc3548d868 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Upstream commit: https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861 Fixes: - http://autobuild.buildroot.net/results/758631a9fcd62835844f78914a36dfb579e7beba/ Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- ...ore-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch b/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch new file mode 100644 index 0000000000..fbd1d2d4ba --- /dev/null +++ b/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch @@ -0,0 +1,35 @@ +From a65682a97e19f96b86aeceb3ca3befb1687e3861 Mon Sep 17 00:00:00 2001 +From: Marcus Folkesson +Date: Tue, 31 Jan 2023 09:14:15 +0100 +Subject: [PATCH] core: pass VIDIOC_QUERYCAP as unsigned long + +VIDIOC_QUARYCAP is an unsigned long and should be passed as one. + +Get rid of the following error: +core/libcamera_app.cpp:33:22: error: overflow in conversion from 'long unsigned int' to 'int' changes value from '2154321408' to '-2140645888' [-Werror=overflow] + 33 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); + +Upstream: https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861 +Signed-off-by: Marcus Folkesson +--- + core/libcamera_app.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/core/libcamera_app.cpp b/core/libcamera_app.cpp +index 04696fb..8cb6563 100644 +--- a/core/libcamera_app.cpp ++++ b/core/libcamera_app.cpp +@@ -30,7 +30,9 @@ static void check_camera_stack() + return; + + v4l2_capability caps; +- int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); ++ unsigned long request = VIDIOC_QUERYCAP; ++ ++ int ret = ioctl(fd, request, &caps); + close(fd); + + if (ret < 0 || strcmp((char *)caps.driver, "bm2835 mmal")) +-- +2.38.1 + From arnout at mind.be Mon Feb 6 09:28:39 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 10:28:39 +0100 Subject: [Buildroot] Development flow to track .config In-Reply-To: References: Message-ID: <562fd1af-139a-1aa8-4c71-bd7c6a001fe3@mind.be> On 31/01/2023 22:36, Edgar Bonet wrote: > Hello! > > Ramon Crichlow wrote: >> Is the following flow best practice? If not please suggest a better one. >> >> 1. Make a change to .config using make menuconfig >> 2. Diff the change between .config and .config.old >> 3. Edit abc_defconfig to mirror the changes in step 2 >> 4. Commit abc_defconfig > > Not sure it's the best, but here is what I do: > > 1. git switch -c 'my-custom-branch' > 2. make some_board_defconfig > 3. make nconfig # or your preferred variant of menuconfig, save and exit > 4. make savedefconfig # this will save the relevant changes to some_board_defconfig If you want to start from scratch instead of an existing defconfig, or if you want to save with a different filename, you can use make savedefconfig BR2_DEFCONFIG=/path/to/defconfig/file Regards, Arnout > 5. git commit -a -m 'My custom changes to some_board_defconfig' > > Best regards, > > Edgar. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Mon Feb 6 09:28:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 10:28:02 +0100 Subject: [Buildroot] [git commit] toolchain/Config.in: extend gcc bug 43744 to every sh architecture Message-ID: <20230206092943.645F78397B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee7cf14b5188aca5f17dd38ab0b6673d5789942b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Gcc bug 43744 affects seems to affect all SH family because it already affects: 1) sh4, here you can find a buildroot defconfig that fails to build: http://autobuild.buildroot.net/results/1db/1db6c59c98e3c09fa13277076ee2fbe7967f1f6b/defconfig 2) sh4a, here you can find a buildroot defconfig that fails to build: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a/defconfig Note also that gcc bugzilla entry reports the bug for SH and not for sub-architectures: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43744 So let's extend the bug to BR2_sh to match the entire SH architecture. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 544b423001..01215e0e96 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -115,7 +115,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_43744 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 - depends on BR2_sh4 + depends on BR2_sh # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63261. This bug no # longer exists in gcc 8.x. From thomas.petazzoni at bootlin.com Mon Feb 6 09:46:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 10:46:21 +0100 Subject: [Buildroot] [PATCH] package/libcamera-apps: fix overflow conversion error In-Reply-To: <20230131133626.638374-1-marcus.folkesson@gmail.com> References: <20230131133626.638374-1-marcus.folkesson@gmail.com> Message-ID: <20230206104621.5445bec9@windsurf> On Tue, 31 Jan 2023 14:36:26 +0100 Marcus Folkesson wrote: > Upstream commit: > https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861 > > Fixes: > - http://autobuild.buildroot.net/results/758631a9fcd62835844f78914a36dfb579e7beba/ > > Signed-off-by: Marcus Folkesson > --- > ...ass-VIDIOC_QUERYCAP-as-unsigned-long.patch | 34 +++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch Applied to master after adding a link to the upstream commit in the patch itself. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 09:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 10:46:35 +0100 Subject: [Buildroot] [PATCH v2] toolchain/Config.in: extend gcc bug 43744 to every sh architecture In-Reply-To: <20230205212521.903480-1-giulio.benetti@benettiengineering.com> References: <20230205131559.6f79944f@windsurf> <20230205212521.903480-1-giulio.benetti@benettiengineering.com> Message-ID: <20230206104635.3032742a@windsurf> On Sun, 5 Feb 2023 22:25:21 +0100 Giulio Benetti wrote: > Gcc bug 43744 affects seems to affect all SH family because it already > affects: > 1) sh4, here you can find a buildroot defconfig that fails to build: > http://autobuild.buildroot.net/results/1db/1db6c59c98e3c09fa13277076ee2fbe7967f1f6b/defconfig > 2) sh4a, here you can find a buildroot defconfig that fails to build: > http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a/defconfig > Note also that gcc bugzilla entry reports the bug for SH and not for > sub-architectures: > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43744 > > So let's extend the bug to BR2_sh to match the entire SH architecture. > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * add a commit log with details about gcc bug 43744 as pointed by Thomas Petazzoni > --- > toolchain/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 09:51:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 10:51:28 +0100 Subject: [Buildroot] [git commit] docs/website: fixing js for the new feed source Message-ID: <20230206095233.BB95C83988@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca97c78ee0e069c70b8fa051012ea02c911dbf2d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Feed source is moved to a local atom file available on the web server to remove further problems with unreliable feed sources. Moving the feed required a bit of refactor of the load_activity function so it won't download two times te same url. This change requires a cron job like this enabled on the website: * * * * * wget -O new.atom https://lore.kernel.org/buildroot/new.atom Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- docs/website/js/buildroot.js | 70 +++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/docs/website/js/buildroot.js b/docs/website/js/buildroot.js index bf80f11d7a..288e3e745c 100644 --- a/docs/website/js/buildroot.js +++ b/docs/website/js/buildroot.js @@ -1,39 +1,50 @@ -function load_activity(feedurl, divid) { - let container = document.getElementById(divid); +function display_activity(result, activity) { + let loaded = 0; + let nb_display = 8; + let container; + if (result==null) return; + for (let i = 0; i < result.feed.entry.length; i++) { + let entry = result.feed.entry[i]; + if (activity==="commit" && entry.title.toString().indexOf("git commit") !== -1) { + container = document.getElementById("commit-activity"); + } else if (activity==="mailing-list" && entry.title.toString().indexOf("git commit") === -1) { + container = document.getElementById("mailing-list-activity"); + } else { + continue; + } + loaded += 1 + if (loaded > nb_display) + break; + let div = document.createElement("p"); + let link = document.createElement("a"); + let d = new Date(entry.updated); + let data = '[' + d.toLocaleDateString() + '] ' + entry.title; + let text = document.createTextNode(data); + link.appendChild(text); + link.title = entry.title; + link.href = entry.link._href; + div.appendChild(link); + container.appendChild(div); + } + for (let i = 0; i < (nb_display - loaded); i++) { + container.appendChild(document.createElement("p")); + } +} + +function load_activity(feedurl) { $.ajax({ - url: "https://cors-anywhere.herokuapp.com/" + feedurl + url: feedurl }) .done(function(data){ let x2js = new X2JS(); let result = x2js.xml_str2json(data.documentElement.outerHTML); - let loaded = 0; - let nb_display = 8; - if (result==null) return; - for (let i = 0; i < result.feed.entry.length; i++) { - let entry = result.feed.entry[i]; - if (entry.title.indexOf("git commit") !== -1) - continue; - loaded += 1; - if (loaded > nb_display) - break; - let div = document.createElement("p"); - let link = document.createElement("a"); - let d = new Date(entry.published); - let data = '[' + d.toLocaleDateString() + '] ' + entry.title; - let text = document.createTextNode(data); - link.appendChild(text); - link.title = entry.title; - link.href = entry.link._href; - div.appendChild(link); - container.appendChild(div); - } - let empty = nb_display - loaded; - for (let i = 0; i < empty; i++) { - container.appendChild(document.createElement("p")); - } + display_activity(result, "commit"); + display_activity(result, "mailing-list"); }); } + + function google_analytics() { let _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-21761074-1']); @@ -86,8 +97,7 @@ jQuery(document).ready(function($) { url = url.split(/[\\/]/).pop(); $('.nav a[href="/' + url + '"]').parent().addClass('active'); - load_activity("http://buildroot-busybox.2317881.n4.nabble.com/Buildroot-busybox-ft2.xml", "mailing-list-activity"); - load_activity("http://git.buildroot.org/buildroot/atom/?h=master", "commit-activity"); + load_activity("/new.atom"); $('#slides').html('') }); From peter at korsgaard.com Mon Feb 6 09:59:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 10:59:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongoose: fix build with gcc 4.8 In-Reply-To: <20230114170738.1101463-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 14 Jan 2023 18:07:38 +0100") References: <20230114170738.1101463-1-fontaine.fabrice@gmail.com> Message-ID: <87mt5rdsif.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with gcc 4.8 raised since bump to > version 7.8 in commit f9e51e1150f59962577358b3da5c390ca4749291: > /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c: In function 'mg_iotest': > /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c:4484:3: error: 'for' loop initial declarations are only allowed in C99 mode > for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) { > ^ > Fixes: > - http://autobuild.buildroot.org/results/c538c6d8e87e4e24097c9878ee15083802276505 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From heiko.thiery at gmail.com Mon Feb 6 09:59:24 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 6 Feb 2023 10:59:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/iputils: bump version to 20221126 In-Reply-To: <20221126003807.462157-1-pevik@seznam.cz> References: <20221126003807.462157-1-pevik@seznam.cz> Message-ID: Hi Petr, Am Sa., 26. Nov. 2022 um 01:38 Uhr schrieb Petr Vorel : > > From: Petr Vorel > > This release removed: ninfod, rarpd, rdisc > => add entries to Config.in.legacy. > > LICENSE file got updated (just to use SPDX) > => update checksum. > > Signed-off-by: Petr Vorel Reviewed-by: Heiko Thiery > --- > Config.in.legacy | 24 ++++++++++++++++++++++++ > package/iputils/Config.in | 25 ------------------------- > package/iputils/iputils.hash | 6 +++--- > package/iputils/iputils.mk | 9 ++------- > 4 files changed, 29 insertions(+), 35 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index b3c35d6b07..6d20092ca4 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,30 @@ endif > > comment "Legacy options removed in 2022.11" > > +config BR2_PACKAGE_IPUTILS_NINFOD > + bool "iputils 20221126 removed ninfod" > + select BR2_LEGACY > + help > + iputils 20221126 removed ninfod. > + > +config BR2_PACKAGE_IPUTILS_RARPD > + bool "iputils 20221126 removed rarpd" > + select BR2_LEGACY > + help > + iputils 20221126 removed rarpd. > + > +config BR2_PACKAGE_IPUTILS_RDISC > + bool "iputils 20221126 removed rdisc" > + select BR2_LEGACY > + help > + iputils 20221126 removed rdisc. > + > +config BR2_PACKAGE_IPUTILS_RDISC_SERVER > + bool "iputils 20221126 removed rdisc" > + select BR2_LEGACY > + help > + iputils 20221126 removed rdisc. > + > config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 > bool "libopenssl rc5 was never enabled" > select BR2_LEGACY > diff --git a/package/iputils/Config.in b/package/iputils/Config.in > index 1a8b555570..ec7bc5418d 100644 > --- a/package/iputils/Config.in > +++ b/package/iputils/Config.in > @@ -28,37 +28,12 @@ config BR2_PACKAGE_IPUTILS_PING > help > Installs ping. > > -config BR2_PACKAGE_IPUTILS_RARPD > - bool "rarpd" > - help > - Installs rarpd. > - > -config BR2_PACKAGE_IPUTILS_RDISC > - bool "rdisc" > - default y > - help > - Installs rdisc. > - > -config BR2_PACKAGE_IPUTILS_RDISC_SERVER > - bool "rdisc (server code)" > - default y > - depends on BR2_PACKAGE_IPUTILS_RDISC > - help > - Builds rdisc with server code. > - > config BR2_PACKAGE_IPUTILS_TRACEPATH > bool "tracepath" > default y > help > Installs tracepath. > > -config BR2_PACKAGE_IPUTILS_NINFOD > - bool "ninfod" > - default y > - depends on BR2_TOOLCHAIN_HAS_THREADS # ninfod requires > - help > - Installs ninfod. > - > comment "ninfod needs a toolchain w/ threads" > depends on !BR2_TOOLCHAIN_HAS_THREADS > > diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash > index db52d990f2..ea23f27f3c 100644 > --- a/package/iputils/iputils.hash > +++ b/package/iputils/iputils.hash > @@ -1,6 +1,6 @@ > -# https://github.com/iputils/iputils/releases/download/20211215/sha256sum.asc > -sha256 b6f67fc705490673ff4471d006221b4a2f1b1180b929d9fefd771352621ccedf iputils-20211215.tar.gz > +# https://github.com/iputils/iputils/releases/download/20221126/sha256sum.asc > +sha256 745ea711fe06d5c57d470d21acce3c3ab866eb6afb69379a16c6d60b89bd4311 iputils-20221126.tar.gz > # Locally computed > -sha256 973281334c2da6364fa6bdc44c1f0f8d60d80d73c782982ffc5d53b0a31aa042 LICENSE > +sha256 2c9f29d982c48665c30b3adaf400c048988fd256eb91c691e351eb3b6a8b2036 LICENSE > sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/LICENSE.GPL2 > diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk > index 84059de330..fe4468ec19 100644 > --- a/package/iputils/iputils.mk > +++ b/package/iputils/iputils.mk > @@ -11,7 +11,7 @@ > # and IPv6 updates. > # http://www.spinics.net/lists/netdev/msg279881.html > > -IPUTILS_VERSION = 20211215 > +IPUTILS_VERSION = 20221126 > IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) > IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause > IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 > @@ -21,19 +21,14 @@ IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) > # Selectively build binaries > IPUTILS_CONF_OPTS += \ > -DBUILD_CLOCKDIFF=$(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),true,false) \ > - -DBUILD_RARPD=$(if $(BR2_PACKAGE_IPUTILS_RARPD),true,false) \ > - -DBUILD_RDISC=$(if $(BR2_PACKAGE_IPUTILS_RDISC),true,false) \ > - -DENABLE_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \ > -DBUILD_TRACEPATH=$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),true,false) \ > - -DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) \ > -DSKIP_TESTS=true > > # Selectively select the appropriate SELinux refpolicy modules > IPUTILS_SELINUX_MODULES = \ > $(if $(BR2_PACKAGE_IPUTILS_ARPING),netutils) \ > $(if $(BR2_PACKAGE_IPUTILS_PING),netutils) \ > - $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) \ > - $(if $(BR2_PACKAGE_IPUTILS_RDISC),rdisc) > + $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) > > # > # arping > -- > 2.38.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Mon Feb 6 09:59:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 10:59:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/gpsd: bump to version 3.25 In-Reply-To: <20230114181556.1371822-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 14 Jan 2023 19:15:56 +0100") References: <20230114181556.1371822-1-fontaine.fabrice@gmail.com> Message-ID: <87ilgfdsgw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patch (not needed anymore) > https://gitlab.com/gpsd/gpsd/-/blob/release-3.25/NEWS > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 10:01:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:01:01 +0100 Subject: [Buildroot] [git commit] package/mongoose: fix build with gcc 4.8 Message-ID: <20230206100111.44810839C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6139aeacd847487a296f1c7b8a9d302d678cd8ab 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 7.8 in commit f9e51e1150f59962577358b3da5c390ca4749291: /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c: In function 'mg_iotest': /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c:4484:3: error: 'for' loop initial declarations are only allowed in C99 mode for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) { ^ Fixes: - http://autobuild.buildroot.org/results/c538c6d8e87e4e24097c9878ee15083802276505 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mongoose/mongoose.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 8d06ed4689..0693f7553a 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -13,7 +13,7 @@ MONGOOSE_INSTALL_STAGING = YES # static library MONGOOSE_INSTALL_TARGET = NO -MONGOOSE_CFLAGS = $(TARGET_CFLAGS) +MONGOOSE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGOOSE_DEPENDENCIES += openssl From peter at korsgaard.com Mon Feb 6 10:01:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:01:01 +0100 Subject: [Buildroot] [git commit] package/gpsd: bump to version 3.25 Message-ID: <20230206100111.4FD34839F0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c7fece853f3def9a425eccc384b9dacb1010051 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (not needed anymore) https://gitlab.com/gpsd/gpsd/-/blob/release-3.25/NEWS Signed-off-by: Fabrice Fontaine Tested-by: Yann E. MORIN Acked-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- package/gpsd/0001-gpsctl-fix-yodaification.patch | 44 ------------------------ package/gpsd/gpsd.hash | 2 +- package/gpsd/gpsd.mk | 2 +- 3 files changed, 2 insertions(+), 46 deletions(-) diff --git a/package/gpsd/0001-gpsctl-fix-yodaification.patch b/package/gpsd/0001-gpsctl-fix-yodaification.patch deleted file mode 100644 index 753ff300eb..0000000000 --- a/package/gpsd/0001-gpsctl-fix-yodaification.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 72ae7ce646792b07061cbbb31ed47f55a1d2422c Mon Sep 17 00:00:00 2001 -Message-Id: <72ae7ce646792b07061cbbb31ed47f55a1d2422c.1663075350.git.yann.morin at orange.com> -From: "Yann E. MORIN" -Date: Tue, 13 Sep 2022 15:10:48 +0200 -Subject: [PATCH] gpsctl: fix yodaification - -Commit d5a672abd98a (gpsctl.c: Style tweaks. Yoda style, braces, // -comments.) claimed "No functional changes", but mis-treated a comparison -when it was converted to yoda-style (simplified diff): - - - if (write(gpsdata->gps_fd, buf, strlen(buf)) <= 0) { - + if (0 <= write(gpsdata->gps_fd, buf, strlen(buf))) { - -As one may notice, the comparison operator was not reversed while the -operands were. - -This got silently fixed in commit 3219ab9f6a89 (gpsctl.c: First cut at ---ship sending commands to running gpsd.) but this is completely -unrelated. - -Fix that comparison. - -Signed-off-by: Yann E. MORIN -Upstream status: not applicable as already fixed. ---- - gpsctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gpsctl.c b/gpsctl.c -index cb342af87..ef59a6622 100644 ---- a/gpsctl.c -+++ b/gpsctl.c -@@ -96,7 +96,7 @@ static bool gps_query(struct gps_data_t *gpsdata, - if ('\n' != buf[strnlen(buf, sizeof(buf) - 1) - 1]) { - (void)strlcat(buf, "\n", sizeof(buf)); - } -- if (0 <= write(gpsdata->gps_fd, buf, strnlen(buf, sizeof(buf)))) { -+ if (0 >= write(gpsdata->gps_fd, buf, strnlen(buf, sizeof(buf)))) { - GPSD_LOG(LOG_ERROR, &context.errout, "gps_query(), write failed\n"); - return false; - } --- -2.25.1 - diff --git a/package/gpsd/gpsd.hash b/package/gpsd/gpsd.hash index f415c3af0f..15e1181ed9 100644 --- a/package/gpsd/gpsd.hash +++ b/package/gpsd/gpsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c gpsd-3.24.tar.gz +sha256 b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2 gpsd-3.25.tar.gz sha256 fdf339997bbca9eaf507476b82fbcac608fc39a3d89b86b51e16db4c9f933716 COPYING diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 961ebde649..d7425513fd 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSD_VERSION = 3.24 +GPSD_VERSION = 3.25 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-2-Clause GPSD_LICENSE_FILES = COPYING From james.hilliard1 at gmail.com Mon Feb 6 10:02:10 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 03:02:10 -0700 Subject: [Buildroot] [PATCH 1/1] package/iwd: bump to version 2.3 Message-ID: <20230206100210.1220585-1-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 be048b3da6..1647f93d9e 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 dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570 iwd-2.2.tar.xz +sha256 b0506d797a8bfb88f3c3eeea5e49dcf4ee8e6cef118f57c118e587eeb377ac64 iwd-2.3.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index b0a2f6e9ed..c54031b102 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 2.2 +IWD_VERSION = 2.3 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Feb 6 10:02:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:02:10 +0100 Subject: [Buildroot] [PATCH] docs/website: fixing js for the new feed source In-Reply-To: <20220925160320.80027-1-angelo@amarulasolutions.com> References: <20220925160320.80027-1-angelo@amarulasolutions.com> Message-ID: <20230206110210.235520f6@windsurf> On Sun, 25 Sep 2022 18:03:20 +0200 Angelo Compagnucci wrote: > Feed source is moved to a local atom file available on the web server to > remove further problems with unreliable feed sources. > Moving the feed required a bit of refactor of the load_activity function > so it won't download two times te same url. > > This change requires a cron job like this enabled on the website: > * * * * * wget -O new.atom https://lore.kernel.org/buildroot/new.atom > > Signed-off-by: Angelo Compagnucci > --- > docs/website/js/buildroot.js | 70 ++++++++++++++++++++---------------- > 1 file changed, 40 insertions(+), 30 deletions(-) Finally applied, now that the cronjob is in place on the server! Thanks a lot for your contribution and patience! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 6 10:03:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:03:10 +0100 Subject: [Buildroot] [next] package/thermald: bump to 2.5.1 In-Reply-To: <20221127141926.1976657-1-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 11:19:26 -0300") References: <20221127141926.1976657-1-ricardo.martincoski@gmail.com> Message-ID: <87edr3dsbl.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > README.txt states only these changes: > - Static analysis fixes > - Missing init, which causes skipping of conditions in a Dell system > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 6 10:02:53 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 11:02:53 +0100 Subject: [Buildroot] [git commit] package/yajl: explicitly request a tag in _SITE Message-ID: <20230206100315.9B99A839FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5be76a39d3a0c21d6f3ceeab0889edc3cec9f2f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The yajl repository has both a branch and a tag names 2.1.0. Because of this, when we use the usual github URL [1], github doesn't return a tarball but rather an ASCII string: the given path has multiple possibilities: #, # This obviously (and fortunately) leads to a hash check failure. To make sure we get the tag and not the branch, we should use a URL that explicitly asks for refs/tags/2.1.0 [2]. We can't change VERSION to include refs/tags, because that also affects the _SOURCE default, the contents of the tarball, the CPE ID and the release-monitoring access. Therefore, add the refs/tags/ prefix to the github helper call. [1] https://github.com/lloyd/yajl/archive/2.1.0/yajl-2.1.0.tar.gz [1] https://github.com/lloyd/yajl/archive/refs/tags/2.1.0/yajl-2.1.0.tar.gz Signed-off-by: Arnout Vandecappelle --- package/yajl/yajl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index 1fb16f50e9..d14a68b402 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -5,7 +5,7 @@ ################################################################################ YAJL_VERSION = 2.1.0 -YAJL_SITE = $(call github,lloyd,yajl,$(YAJL_VERSION)) +YAJL_SITE = $(call github,lloyd,yajl,refs/tags/$(YAJL_VERSION)) YAJL_INSTALL_STAGING = YES YAJL_LICENSE = ISC YAJL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 6 10:03:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:03:19 +0100 Subject: [Buildroot] [git commit] package/thermald: bump to 2.5.1 Message-ID: <20230206100434.5DF8283A2B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11d98385f56e61e2928707f056c001ceec5d06e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master README.txt states only these changes: - Static analysis fixes - Missing init, which causes skipping of conditions in a Dell system Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/thermald/thermald.hash | 2 +- package/thermald/thermald.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/thermald/thermald.hash b/package/thermald/thermald.hash index eceff77d37..9693813ca9 100644 --- a/package/thermald/thermald.hash +++ b/package/thermald/thermald.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e6515678ce8ff37978a453e1617a087a40ba3a31809a42c1768b6f816e564cc9 thermald-2.5.tar.gz +sha256 75c165df45b3d09c904d314c8c19789158e9538f46e3d2b606457dc631eb3af5 thermald-2.5.1.tar.gz sha256 e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d COPYING diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk index 38f6b5a00f..fd0246745f 100644 --- a/package/thermald/thermald.mk +++ b/package/thermald/thermald.mk @@ -4,7 +4,7 @@ # ################################################################################ -THERMALD_VERSION = 2.5 +THERMALD_VERSION = 2.5.1 THERMALD_SITE = $(call github,intel,thermal_daemon,v$(THERMALD_VERSION)) # fetched from Github, with no configure script THERMALD_AUTORECONF = YES From heiko.thiery at gmail.com Mon Feb 6 10:09:07 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 6 Feb 2023 11:09:07 +0100 Subject: [Buildroot] [PATCH 2/2] package/crudini: add host-crudini In-Reply-To: <20220920232154.1219792-2-KAMenyaev@sberdevices.ru> References: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> <20220920232154.1219792-2-KAMenyaev@sberdevices.ru> Message-ID: Hi, Am Mi., 21. Sept. 2022 um 01:24 Uhr schrieb Konstantin Menyaev via buildroot : > > From: Konstantin Menyaev > > Make the host variant of crudini package. This can be useful in > post-{build,image} scripts. > > Signed-off-by: Konstantin Menyaev Reviewed-by: Heiko Thiery > --- > package/Config.in.host | 1 + > package/crudini/Config.in.host | 9 +++++++++ > package/crudini/crudini.mk | 1 + > 3 files changed, 11 insertions(+) > create mode 100644 package/crudini/Config.in.host > > diff --git a/package/Config.in.host b/package/Config.in.host > index fb805577d1..055e846e39 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -12,6 +12,7 @@ menu "Host utilities" > source "package/checksec/Config.in.host" > source "package/cmake/Config.in.host" > source "package/cramfs/Config.in.host" > + source "package/crudini/Config.in.host" > source "package/cryptsetup/Config.in.host" > source "package/dbus-python/Config.in.host" > source "package/delve/Config.in.host" > diff --git a/package/crudini/Config.in.host b/package/crudini/Config.in.host > new file mode 100644 > index 0000000000..5e0040883f > --- /dev/null > +++ b/package/crudini/Config.in.host > @@ -0,0 +1,9 @@ > +config BR2_PACKAGE_HOST_CRUDINI > + bool "host crudini" > + depends on BR2_PACKAGE_HOST_PYTHON3 > + select BR2_PACKAGE_HOST_PYTHON_INIPARSE # runtime > + help > + A utility for handling ini files from the command line and > + shell scripts > + > + https://pypi.python.org/pypi/crudini > diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk > index 7141e2b2a0..c376c5f777 100644 > --- a/package/crudini/crudini.mk > +++ b/package/crudini/crudini.mk > @@ -11,3 +11,4 @@ CRUDINI_LICENSE = GPL-2.0 > CRUDINI_LICENSE_FILES = COPYING > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.37.3 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From heiko.thiery at gmail.com Mon Feb 6 10:12:00 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 6 Feb 2023 11:12:00 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-iniparse: add host-python-iniparse In-Reply-To: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> References: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> Message-ID: Hi, Am Mi., 21. Sept. 2022 um 01:24 Uhr schrieb : > > From: Konstantin Menyaev > > Make the host variant of python-iniparse > as host-crudini dependency. > > Signed-off-by: Konstantin Menyaev Reviewed-by: Heiko Thiery > --- > package/Config.in.host | 1 + > package/python-iniparse/Config.in.host | 11 +++++++++++ > package/python-iniparse/python-iniparse.mk | 1 + > 3 files changed, 13 insertions(+) > create mode 100644 package/python-iniparse/Config.in.host > > diff --git a/package/Config.in.host b/package/Config.in.host > index f437ef680c..fb805577d1 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -72,6 +72,7 @@ menu "Host utilities" > source "package/pkgconf/Config.in.host" > source "package/pru-software-support/Config.in.host" > source "package/pwgen/Config.in.host" > + source "package/python-iniparse/Config.in.host > source "package/python-cython/Config.in.host" > source "package/python-greenlet/Config.in.host" > source "package/python-kflash/Config.in.host" > diff --git a/package/python-iniparse/Config.in.host b/package/python-iniparse/Config.in.host > new file mode 100644 > index 0000000000..e93022e815 > --- /dev/null > +++ b/package/python-iniparse/Config.in.host > @@ -0,0 +1,11 @@ > +config BR2_PACKAGE_HOST_PYTHON_INIPARSE > + bool "host python-iniparse" > + select BR2_PACKAGE_HOST_PYTHON_SIX # runtime > + help > + iniparse is an INI parser for Python which is API compatible > + with the standard library's ConfigParser, preserves > + structure of INI files (order of sections & options, > + indentation, comments, and blank lines are preserved when > + data is updated), and is more convenient to use. > + > + https://pypi.python.org/pypi/iniparse > diff --git a/package/python-iniparse/python-iniparse.mk b/package/python-iniparse/python-iniparse.mk > index d31a490bd8..e76987d1e9 100644 > --- a/package/python-iniparse/python-iniparse.mk > +++ b/package/python-iniparse/python-iniparse.mk > @@ -12,3 +12,4 @@ PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE > PYTHON_INIPARSE_SETUP_TYPE = setuptools > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.37.3 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Mon Feb 6 10:17:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:17:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/iwd: bump to version 2.3 In-Reply-To: <20230206100210.1220585-1-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 6 Feb 2023 03:02:10 -0700") References: <20230206100210.1220585-1-james.hilliard1@gmail.com> Message-ID: <87a61rdrnt.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 10:17:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:17:15 +0100 Subject: [Buildroot] [git commit] package/iwd: bump to version 2.3 Message-ID: <20230206101742.CFC8083A3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6929c0cdd944c86b0affbe04cf72c2c0398da64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 be048b3da6..1647f93d9e 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 dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570 iwd-2.2.tar.xz +sha256 b0506d797a8bfb88f3c3eeea5e49dcf4ee8e6cef118f57c118e587eeb377ac64 iwd-2.3.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index b0a2f6e9ed..c54031b102 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 2.2 +IWD_VERSION = 2.3 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 Mon Feb 6 10:19:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:19:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: bump to version 3.3a In-Reply-To: <20230205145532.659422-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 5 Feb 2023 15:55:32 +0100") References: <20230205145532.659422-1-fontaine.fabrice@gmail.com> Message-ID: <875ycfdrjv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > systemd is an optional dependency since > https://github.com/tmux/tmux/commit/fc7f1e7acb3539a43df46136e971f770515e0b0d > https://github.com/tmux/tmux/blob/3.3a/CHANGES > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 10:20:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:20:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.19.0 In-Reply-To: <20230205152108.GR2960@scaer> (Yann E. MORIN's message of "Sun, 5 Feb 2023 16:21:08 +0100") References: <20230202192526.30357-1-bernd.kuhls@t-online.de> <20230205152108.GR2960@scaer> Message-ID: <871qn3dri1.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Bernd, All, > On 2023-02-02 20:25 +0100, Bernd Kuhls spake thusly: >> Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md >> >> Signed-off-by: Bernd Kuhls > Applied to master, thanks. Looks like that wasn't done after all, but now I've committed it - Thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 10:19:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:19:44 +0100 Subject: [Buildroot] [git commit] package/xmrig: bump version to 6.19.0 Message-ID: <20230206102110.8813B83A68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67ceef8affcb0300efcabab886e9819f56351fd6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 3c50faf23f..781e089de8 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f97fe20248e0eb452f77e9b69f2fb1510b852152b3af4f9a8b20680c854888d1 xmrig-6.18.1.tar.gz +sha256 772f947058e5b89ca9bf34128487def47796870b547439a9b0524ddd1899420c xmrig-6.19.0.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index ca5bcecfbe..f345ba9cf9 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.18.1 +XMRIG_VERSION = 6.19.0 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 6 10:19:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:19:32 +0100 Subject: [Buildroot] [git commit] package/tmux: bump to version 3.3a Message-ID: <20230206102110.7DEE483A66@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e279599d255a79c08ef20b97b96eb248689d52a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master systemd is an optional dependency since https://github.com/tmux/tmux/commit/fc7f1e7acb3539a43df46136e971f770515e0b0d https://github.com/tmux/tmux/blob/3.3a/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tmux/tmux.hash | 2 +- package/tmux/tmux.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index 75538e09ae..b5c0fe58d0 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386 tmux-3.1c.tar.gz +sha256 e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f tmux-3.3a.tar.gz sha256 c031bd37f464c534277814f6aa38686fa023d094261d57fd2545ad592bb53ccd COPYING diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index b1c0af1a83..47ee9b16ca 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,13 +4,20 @@ # ################################################################################ -TMUX_VERSION = 3.1c +TMUX_VERSION = 3.3a TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +TMUX_DEPENDENCIES += systemd +TMUX_CONF_OPTS += --enable-systemd +else +TMUX_CONF_OPTS += --disable-systemd +endif + ifeq ($(BR2_PACKAGE_UTF8PROC),y) TMUX_DEPENDENCIES += utf8proc TMUX_CONF_OPTS += --enable-utf8proc From angelo at amarulasolutions.com Mon Feb 6 10:22:35 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 11:22:35 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.162-cip24 Message-ID: <20230206102235.63667-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- linux/Config.in | 8 ++++---- linux/linux.hash | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index a0e9286bd3..774f1e0975 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -32,7 +32,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.145-cip17)" + bool "Latest CIP SLTS version (5.10.162-cip24)" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL help CIP launched in the spring of 2016 to address the needs of @@ -52,7 +52,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.145-cip17-rt7)" + bool "Latest CIP RT SLTS version (5.10.162-cip24-rt10)" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL help Same as the CIP version, but this is the PREEMPT_RT realtime @@ -129,8 +129,8 @@ endif config BR2_LINUX_KERNEL_VERSION string default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION - default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.145-cip17-rt7" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "5.10.162-cip24-rt10" 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 927172e8fa..e88abe5bb8 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,8 +10,8 @@ sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux- sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed -sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz -sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz +sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz +sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING -- 2.25.1 From peter at korsgaard.com Mon Feb 6 10:23:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:23:28 +0100 Subject: [Buildroot] [next 01/25] *: fix typo for separate(d|) in text In-Reply-To: <20221127130739.1862398-2-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:15 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-2-ricardo.martincoski@gmail.com> Message-ID: <87v8kfcctb.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > seperate is a common misspelling of separate > Fix all the typos in the tree that are not related to patch files. > CHANGES > seperate -> separate, in the list of changes > Config.in.legacy > seperate -> separate, in option name and help texts > package/leafnode2/leafnode2.mk > seperate -> separate, in a comment > system/Config.in > seperated -> separated, in a help text > Cc: Bernd Kuhls > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 10:24:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:24:08 +0100 Subject: [Buildroot] [next 02/25] package, legacy: fix typo for "daemon" on help text In-Reply-To: <20221127130739.1862398-3-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:16 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-3-ricardo.martincoski@gmail.com> Message-ID: <87r0v3ccs7.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > deamon -> daemon > At same time, in Config.in.legacy fix other typos in the same help text: > spae -> space > monolitic -> monolithic > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 10:26:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 11:26:27 +0100 Subject: [Buildroot] [next 03/25] Config.in.legacy: fix typo on BR2_PACKAGE_MEDIAART_BACKEND_QT In-Reply-To: <20221127130739.1862398-4-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:17 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-4-ricardo.martincoski@gmail.com> Message-ID: <87mt5rccoc.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Currently using this minimal .config: > BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF=y > triggers: > *** Legacy options removed in 2018.05 *** > [ ] libmediaart none backend option renamed (NEW) > [*] libmediaart gdk-pixbuf backend option renamed > [*] libmediaart qt backend option renamed > Commit "8553b39887 libmediaart: rename options to have proper prefix", > part of the 2018.05 release had a copy&paste error. > As stated in the beginning of the file: > The oldest symbols will be removed again after about two years. > But while we carry these legacy symbols, let's fix the typo. > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski > --- > NOTE: Maybe it is time to drop old legacy symbols again? > If so, some patches in this series can be dropped. Possibly, but they don't really cause a big maintenance issue, so I've left them for now. Committed, thanks. > --- > Config.in.legacy | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/Config.in.legacy b/Config.in.legacy > index 4eff5b55d6..9ce1004b0c 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -2594,7 +2594,7 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF > BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to > BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF > -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF > +config BR2_PACKAGE_MEDIAART_BACKEND_QT > bool "libmediaart qt backend option renamed" > select BR2_LEGACY > help > -- > 2.34.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From heiko.thiery at gmail.com Mon Feb 6 10:35:24 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 6 Feb 2023 11:35:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/netopeer2: fix sysv init script, does not start In-Reply-To: <20230131142003.1354787-1-troglobit@gmail.com> References: <20230131142003.1354787-1-troglobit@gmail.com> Message-ID: Hi Joachim, Am Di., 31. Jan. 2023 um 15:20 Uhr schrieb Joachim Wiberg : > > - The netopeer server forks to background by default, no need for '-b' > - The path to the daemon is /usr/sbin, not /usr/bin > > Signed-off-by: Joachim Wiberg Acked-by: Heiko Thiery > --- > package/netopeer2/S52netopeer2 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/netopeer2/S52netopeer2 b/package/netopeer2/S52netopeer2 > index cf53a8f109..cadd6b9feb 100644 > --- a/package/netopeer2/S52netopeer2 > +++ b/package/netopeer2/S52netopeer2 > @@ -8,7 +8,7 @@ NETOPEER2_SERVER_ARGS="" > start() { > printf 'Starting %s: ' "$DAEMON" > > - start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ > + start-stop-daemon -S -q -p $PIDFILE -x "/usr/sbin/$DAEMON" \ > -- $NETOPEER2_SERVER_ARGS > status=$? > if [ "$status" -eq 0 ]; then > -- > 2.34.1 > From angelo at amarulasolutions.com Mon Feb 6 10:45:59 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 11:45:59 +0100 Subject: [Buildroot] [PATCH] docs/website: better recent commits/discussions output Message-ID: <20230206104559.86803-1-angelo@amarulasolutions.com> Removing the "[Buildroot]" and the "Re:" from messages title to have a cleaner look on the "news" boxes. Signed-off-by: Angelo Compagnucci --- docs/website/js/buildroot.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/website/js/buildroot.js b/docs/website/js/buildroot.js index 288e3e745c..b2975fb609 100644 --- a/docs/website/js/buildroot.js +++ b/docs/website/js/buildroot.js @@ -19,6 +19,8 @@ function display_activity(result, activity) { let link = document.createElement("a"); let d = new Date(entry.updated); let data = '[' + d.toLocaleDateString() + '] ' + entry.title; + data = data.replace("Re: ",""); + data = data.replace("[Buildroot] ",""); let text = document.createTextNode(data); link.appendChild(text); link.title = entry.title; -- 2.25.1 From peter at korsgaard.com Mon Feb 6 10:22:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:22:17 +0100 Subject: [Buildroot] [git commit] *: fix typo for separate(d|) in text Message-ID: <20230206105450.32C5E83371@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4092d2a3546c1edfcb27f9d00fd4e7cac9878d2f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master seperate is a common misspelling of separate Fix all the typos in the tree that are not related to patch files. CHANGES seperate -> separate, in the list of changes Config.in.legacy seperate -> separate, in option name and help texts package/leafnode2/leafnode2.mk seperate -> separate, in a comment system/Config.in seperated -> separated, in a help text Cc: Bernd Kuhls Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- CHANGES | 4 ++-- Config.in.legacy | 6 +++--- package/leafnode2/leafnode2.mk | 2 +- system/Config.in | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index dbf62e5a63..9fd8b31350 100644 --- a/CHANGES +++ b/CHANGES @@ -7737,7 +7737,7 @@ Architecture: Default to bf532 CPU variant for blackfin, Fix flat one memory region support for m68k and disable flat - seperate data support because of compatibility issues. + separate data support because of compatibility issues. Defconfigs: Minnowboard and Raspberrypi: Fix errors with post-build scripts when systemd is used. @@ -8273,7 +8273,7 @@ Minor fixes. - Merged/seperate /usr handling is now also performed for + Merged/separate /usr handling is now also performed for staging so cross-gdb / gdbserver can find the libraries. Updated/fixed packages: autossh, conntrack-tools, dcron, diff --git a/Config.in.legacy b/Config.in.legacy index 1c5af2652a..e95460f82b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -3346,7 +3346,7 @@ config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND select BR2_PACKAGE_RESTORECOND help The policycoreutils package no longer offers restorecond - as a option. This package has been moved into a seperate + as a option. This package has been moved into a separate package maintained by the SELinux maintainers. config BR2_PACKAGE_SEPOLGEN @@ -3940,7 +3940,7 @@ config BR2_GDB_VERSION_7_9 comment "Legacy options removed in 2016.11" config BR2_PACKAGE_PHP_SAPI_CLI_CGI - bool "PHP CGI and CLI options are now seperate" + bool "PHP CGI and CLI options are now separate" select BR2_PACKAGE_PHP_SAPI_CLI select BR2_PACKAGE_PHP_SAPI_CGI select BR2_LEGACY @@ -4970,7 +4970,7 @@ config BR2_PACKAGE_KODI_PVR_ADDONS select BR2_PACKAGE_KODI_PVR_VUPLUS select BR2_PACKAGE_KODI_PVR_WMC help - Kodi PVR addon was split into seperate modules + Kodi PVR addon was split into separate modules config BR2_BINUTILS_VERSION_2_23_2 bool "binutils 2.23 option renamed" diff --git a/package/leafnode2/leafnode2.mk b/package/leafnode2/leafnode2.mk index a02aad4302..e82ca2e1ee 100644 --- a/package/leafnode2/leafnode2.mk +++ b/package/leafnode2/leafnode2.mk @@ -23,7 +23,7 @@ LEAFNODE2_CONF_OPTS = \ --enable-runas-user=root # Leafnode2 needs the host version of b_sortnl during -# compilation. Instead of creating a seperate host package and +# compilation. Instead of creating a separate host package and # installing b_sortnl to $(HOST_DIR) this binary is compiled # on-the-fly, host-pcre is needed for this define LEAFNODE2_BUILD_SORTNL_TOOL diff --git a/system/Config.in b/system/Config.in index 806a747315..731dceaa17 100644 --- a/system/Config.in +++ b/system/Config.in @@ -483,7 +483,7 @@ config BR2_ENABLE_LOCALE_WHITELIST default "C en_US" depends on BR2_ENABLE_LOCALE_PURGE help - Whitespace seperated list of locales to allow on target. + Whitespace separated list of locales to allow on target. Locales not listed here will be removed from the target. See 'locale -a' on your host for a list of locales available on your build host, or have a look in /usr/share/locale in From peter at korsgaard.com Mon Feb 6 10:24:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:24:31 +0100 Subject: [Buildroot] [git commit] Config.in.legacy: fix typo on BR2_PACKAGE_MEDIAART_BACKEND_QT Message-ID: <20230206105450.4BD4D83530@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=316e149611a761db04171ee6141048d9057183c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently using this minimal .config: BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF=y triggers: *** Legacy options removed in 2018.05 *** [ ] libmediaart none backend option renamed (NEW) [*] libmediaart gdk-pixbuf backend option renamed [*] libmediaart qt backend option renamed Commit "8553b39887 libmediaart: rename options to have proper prefix", part of the 2018.05 release had a copy&paste error. As stated in the beginning of the file: The oldest symbols will be removed again after about two years. But while we carry these legacy symbols, let's fix the typo. Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 4d82a54208..e5cfcea8fa 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2700,7 +2700,7 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF +config BR2_PACKAGE_MEDIAART_BACKEND_QT bool "libmediaart qt backend option renamed" select BR2_LEGACY help From peter at korsgaard.com Mon Feb 6 10:23:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:23:43 +0100 Subject: [Buildroot] [git commit] package, legacy: fix typo for "daemon" on help text Message-ID: <20230206105450.3F1918347B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a9feaabbce4f21dd2a688d35a5027cb0e2a7a22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master deamon -> daemon At same time, in Config.in.legacy fix other typos in the same help text: spae -> space monolitic -> monolithic Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 4 ++-- package/ngircd/Config.in | 2 +- package/rp-pppoe/Config.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e95460f82b..4d82a54208 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4430,8 +4430,8 @@ config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - - a monolitic user space library - - a user spae deamon driver + - a monolithic user space library + - a user space daemon driver config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" diff --git a/package/ngircd/Config.in b/package/ngircd/Config.in index 9b3d430922..1e93a5702c 100644 --- a/package/ngircd/Config.in +++ b/package/ngircd/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_NGIRCD bool "ngircd" depends on BR2_USE_MMU # fork() help - Next Generation IRC server deamon. + Next Generation IRC server daemon. http://ngircd.barton.de diff --git a/package/rp-pppoe/Config.in b/package/rp-pppoe/Config.in index 2ac81cbb2d..6ff005a1e1 100644 --- a/package/rp-pppoe/Config.in +++ b/package/rp-pppoe/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_RP_PPPOE select BR2_PACKAGE_PPPD help An implementation of the Point-to-point protocol over - Ethernet. Has userspace client and server deamons. You + Ethernet. Has userspace client and server daemons. You likely only need this package if you are implementing the pppoe server that will service other pppoe client devices. Otherwise the normal client functionality already From peter at korsgaard.com Mon Feb 6 10:26:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:26:41 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib: warn about redefined config Message-ID: <20230206105450.57344835C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bbda72743d39df29dfc91e0f52be02b2d465f6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Warn the developer in the case the same config is declared more than once in the same Config.in file. But take into account the conditional code that lets the config be visible and warn only when it is declared more than once in the same conditions. For instance, do not warn for: if BR2_PACKAGE_BUSYBOX config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_config.py | 38 ++++++++++++++++ utils/checkpackagelib/test_lib_config.py | 78 ++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index b05831f2c3..f26ca0d898 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -233,3 +233,41 @@ class Indent(_CheckFunction): return ["{}:{}: should not be indented" .format(self.filename, lineno), text] + + +class RedefinedConfig(_CheckFunction): + CONFIG = re.compile(r"^\s*(menu|)config\s+(BR2_\w+)\b") + IF = re.compile(r"^\s*if\s+([^#]*)\b") + ENDIF = re.compile(r"^\s*endif\b") + + def before(self): + self.configs = {} + self.conditional = [] + + def check_line(self, lineno, text): + if _empty_or_comment(text) or _part_of_help_text(text): + return + + m = self.IF.search(text) + if m is not None: + condition = m.group(1) + self.conditional.append(condition) + return + + m = self.ENDIF.search(text) + if m is not None: + self.conditional.pop() + return + + m = self.CONFIG.search(text) + if m is None: + return + config = m.group(2) + + key = (config, ' AND '.join(self.conditional)) + if key in self.configs.keys(): + previous_line = self.configs[key] + return ["{}:{}: config {} redeclared (previous line: {})" + .format(self.filename, lineno, config, previous_line), + text] + self.configs[key] = lineno diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py index 91a549adf2..474d17105e 100644 --- a/utils/checkpackagelib/test_lib_config.py +++ b/utils/checkpackagelib/test_lib_config.py @@ -385,3 +385,81 @@ Indent = [ def test_Indent(testname, filename, string, expected): warnings = util.check_file(m.Indent, filename, string) assert warnings == expected + + +RedefinedConfig = [ + ('no redefinition', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO_BAR\n' + 'bool "foo"\n', + []), + ('no conditional', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('three times', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:3: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n'], + ['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('same conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:6: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:8: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('not equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if !BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', RedefinedConfig) +def test_RedefinedConfig(testname, filename, string, expected): + warnings = util.check_file(m.RedefinedConfig, filename, string) + assert warnings == expected From yann.morin.1998 at free.fr Mon Feb 6 10:56:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 11:56:49 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-iniparse: add host-python-iniparse In-Reply-To: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> References: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> Message-ID: <20230206105649.GA3565@scaer> Konstantin, All, On 2022-09-21 02:21 +0300, KAMenyaev at sberdevices.ru spake thusly: > From: Konstantin Menyaev > > Make the host variant of python-iniparse > as host-crudini dependency. I added a note why we need a Config.in.host entry (usually, for libs, we do not add one, but here we must slect pythn-six, which has one). > Signed-off-by: Konstantin Menyaev > --- [--SNIP--] > diff --git a/package/Config.in.host b/package/Config.in.host > index f437ef680c..fb805577d1 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -72,6 +72,7 @@ menu "Host utilities" > source "package/pkgconf/Config.in.host" > source "package/pru-software-support/Config.in.host" > source "package/pwgen/Config.in.host" > + source "package/python-iniparse/Config.in.host I reordered this in alphabetical order. Applied to master, thanks. Regards, Yann E. MORIN. > source "package/python-cython/Config.in.host" > source "package/python-greenlet/Config.in.host" > source "package/python-kflash/Config.in.host" > diff --git a/package/python-iniparse/Config.in.host b/package/python-iniparse/Config.in.host > new file mode 100644 > index 0000000000..e93022e815 > --- /dev/null > +++ b/package/python-iniparse/Config.in.host > @@ -0,0 +1,11 @@ > +config BR2_PACKAGE_HOST_PYTHON_INIPARSE > + bool "host python-iniparse" > + select BR2_PACKAGE_HOST_PYTHON_SIX # runtime > + help > + iniparse is an INI parser for Python which is API compatible > + with the standard library's ConfigParser, preserves > + structure of INI files (order of sections & options, > + indentation, comments, and blank lines are preserved when > + data is updated), and is more convenient to use. > + > + https://pypi.python.org/pypi/iniparse > diff --git a/package/python-iniparse/python-iniparse.mk b/package/python-iniparse/python-iniparse.mk > index d31a490bd8..e76987d1e9 100644 > --- a/package/python-iniparse/python-iniparse.mk > +++ b/package/python-iniparse/python-iniparse.mk > @@ -12,3 +12,4 @@ PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE > PYTHON_INIPARSE_SETUP_TYPE = setuptools > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.37.3 > > _______________________________________________ > 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 sebastian.weyer at smile.fr Mon Feb 6 10:57:11 2023 From: sebastian.weyer at smile.fr (Sebastian WEYER) Date: Mon, 6 Feb 2023 11:57:11 +0100 Subject: [Buildroot] [PATCH] Makefile: fix build when $(O) ends in _defconfig In-Reply-To: <20230122090947.1369673-1-yann.morin.1998@free.fr> References: <20230122090947.1369673-1-yann.morin.1998@free.fr> Message-ID: <038b530f-18f1-fd5e-f926-32e73d434a63@smile.fr> Hi all, On 22/01/2023 10:09, Yann E. MORIN wrote: > Commit e6195c53041f (Makefile: fix use of many br2-external trees) fixed > a slowdown with many br2-external trees. In doing so, it changed the > type of the %_defconfig rule: the stem is no longer present in the > prerequisites, so it changes from a pattern rule to an implicit pattern > rule [0]. > > It is not unusual to name the build directory after the defconfig that > is being built, so we may end up with a build directory named > meh_defconfig. Before e6195c53041f, the pattern rule would not match > [1], but now it does, which causes somewhat-cryptic build failures: > > Makefile:1015: *** "Can't find /some/path/meh_defconfig". Stop. > > The issue is that we have this set of rules and assignments (elided and > reordered for legibility): > > all: world > world: target-post-image > target-post-image: staging-finalize > staging-finalize: $(STAGING_DIR_SYMLINK) > $(STAGING_DIR_SYMLINK): | $(BASE_DIR) > BASE_DIR := $(CANONICAL_O) > CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) > > So, there is a rule that (eventually) has a dependency on $(O), but we > have no rule that provides it explicitly, so the %_defconfig rule kicks > in, with the stem as "/some/path/meh". When the loop searches all the > ".../configs/" directories for a file named ".../configs/%_defconfig", > it actually lookes for a file named ".../configs//some/path/meh_defconfig" > and that indeed never matches anything. > > The solution is to provide an actual rule for $(BASE_DIR), so that the > implicit rule does not kick in. > > [0] Terminology and behaviour in make is hard, so the terms we used here > may be wrong or incorrectly used, and/or the explanations for the > behavious be wrong or incomplete... Still, the reasoning stands, and > the root cause is the removal of the stem in the RHS of the rule > (adding one back does fix the issue). > > [1] not sure how the prerequisite was solved before e6195c53041f, > though... > > Fixes: e6195c53041f > > Reported-by: Romain Naour > Signed-off-by: Yann E. MORIN > Cc: Nevo Hed > Cc: Peter Korsgaard > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 8517d563d5..f39af5eae9 100644 > --- a/Makefile > +++ b/Makefile > @@ -1042,7 +1042,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile > > # staging and target directories do NOT list these as > # dependencies anywhere else > -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): > +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): > @mkdir -p $@ > > # outputmakefile generates a Makefile in the output directory, if using a I first verified that the build fails when the output folder's name ends in "_defconfig" with "make O=./test/second_defconfig qemu_aarch64_virt_defconfig" followed by "make O=./test/second_defconfig". I then applied the patch and redid "make O=./test/second_defconfig" and verified that the build succeeded. Tested-by: Sebastian Weyer Best regards, Sebastian From thomas.petazzoni at bootlin.com Mon Feb 6 10:57:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:57:08 +0100 Subject: [Buildroot] [git commit] boot/barebox: use $$ instead of $ where needed Message-ID: <20230206105723.71FF4838DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75c313816eb526fe09a6baab8b327279e01be5ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") caused the build to generate a spurious error message due to the $(shell ... date -d @$(SOURCE_DATE_EPOCH)) command being executed even when BR2_REPRODUCIBLE was disabled. This is due to the fact that variable references must be done using $$ within macros. This commit fixes that for the two variables that we are referencing in the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601. Signed-off-by: Thomas Petazzoni --- boot/barebox/barebox.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 90be8c1ecc..a0cfaffe09 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -74,11 +74,11 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) -ifeq ($(BR2_REPRODUCIBLE),y) +ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From thomas.petazzoni at bootlin.com Mon Feb 6 10:57:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:57:08 +0100 Subject: [Buildroot] [git commit] package/libunibreak: new package Message-ID: <20230206105723.6847E838DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=014180011d4333a73857bbd327c5c2aef7f4b43e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Introduced as optional dependency with libass 0.17.0. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libunibreak/Config.in | 8 ++++++++ package/libunibreak/libunibreak.hash | 3 +++ package/libunibreak/libunibreak.mk | 13 +++++++++++++ 5 files changed, 26 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3eb7fba339..97c28fbdd8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -395,6 +395,7 @@ F: package/libsndfile/ F: package/libsoundtouch/ F: package/libsquish/ F: package/libudfread/ +F: package/libunibreak/ F: package/liburiparser/ F: package/libutp/ F: package/libva/ diff --git a/package/Config.in b/package/Config.in index f32209db95..7817b51fc2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2157,6 +2157,7 @@ menu "Text and terminal handling" source "package/libestr/Config.in" source "package/libfribidi/Config.in" source "package/libiconv/Config.in" + source "package/libunibreak/Config.in" source "package/libunistring/Config.in" source "package/linenoise/Config.in" source "package/ncurses/Config.in" diff --git a/package/libunibreak/Config.in b/package/libunibreak/Config.in new file mode 100644 index 0000000000..101d621fd6 --- /dev/null +++ b/package/libunibreak/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBUNIBREAK + bool "libunibreak" + help + libunibreak is an implementation of the line breaking and word + breaking algorithms as described in Unicode Standard Annex 14 + and Unicode Standard Annex 29. + + https://github.com/adah1972/libunibreak diff --git a/package/libunibreak/libunibreak.hash b/package/libunibreak/libunibreak.hash new file mode 100644 index 0000000000..bb85f21cdc --- /dev/null +++ b/package/libunibreak/libunibreak.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 dd1a92d4c5646aa0e457ff41d89812ec5243863be6c20bbcb5ee380f3dd78377 libunibreak-5.1.tar.gz +sha256 0c57e2ec42ece17791a75d2f9b2f8e0663181be008667a507f765b3ef22522db LICENCE diff --git a/package/libunibreak/libunibreak.mk b/package/libunibreak/libunibreak.mk new file mode 100644 index 0000000000..fa52116c1f --- /dev/null +++ b/package/libunibreak/libunibreak.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# libunibreak +# +################################################################################ + +LIBUNIBREAK_VERSION = 5.1 +LIBUNIBREAK_SITE = https://github.com/adah1972/libunibreak/releases/download/libunibreak_$(subst .,_,$(LIBUNIBREAK_VERSION)) +LIBUNIBREAK_INSTALL_STAGING = YES +LIBUNIBREAK_LICENSE = Zlib +LIBUNIBREAK_LICENSE_FILES = LICENCE + +$(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 6 10:57:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:57:08 +0100 Subject: [Buildroot] [git commit] boot/barebox: explicitly set the timezone for the kbuild timestamp Message-ID: <20230206105723.7A6F7838E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11e75ecbf092420f00f0fc88a7183d5d99887ff1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This adjusts the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") to explicitly set the timezone when calculating KBUILD_BUILD_TIMESTAMP, like is already done in linux/linux.mk. Signed-off-by: Thomas Petazzoni --- boot/barebox/barebox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index a0cfaffe09..d7bcafe436 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -78,7 +78,7 @@ ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C TZ='UTC' date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From thomas.petazzoni at bootlin.com Mon Feb 6 10:57:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:57:29 +0100 Subject: [Buildroot] [git commit] package/libass: bump version to 0.17.0 Message-ID: <20230206105838.BA67783967@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06646238303b974e4bce81143a6c022fdf790568 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/libass/libass/releases/tag/0.17.0 Added new optional dependency to libunibreak introduced by this bump. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libass/libass.hash | 2 +- package/libass/libass.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/libass/libass.hash b/package/libass/libass.hash index b8952a4730..beb7639b1f 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5dbde9e22339119cf8eed59eea6c623a0746ef5a90b689e68a090109078e3c08 libass-0.16.0.tar.xz +sha256 971e2e1db59d440f88516dcd1187108419a370e64863f70687da599fdf66cc1a libass-0.17.0.tar.xz sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING diff --git a/package/libass/libass.mk b/package/libass/libass.mk index 4ba812e3fc..1cc8310312 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.16.0 +LIBASS_VERSION = 0.17.0 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. @@ -33,4 +33,11 @@ else LIBASS_CONF_OPTS += --disable-fontconfig --disable-require-system-font-provider endif +ifeq ($(BR2_PACKAGE_LIBUNIBREAK),y) +LIBASS_DEPENDENCIES += libunibreak +LIBASS_CONF_OPTS += --enable-libunibreak +else +LIBASS_CONF_OPTS += --disable-libunibreak +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 6 10:59:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:59:22 +0100 Subject: [Buildroot] [PATCH 1/2] package/libunibreak: new package In-Reply-To: <20221212202728.1531746-1-bernd.kuhls@t-online.de> References: <20221212202728.1531746-1-bernd.kuhls@t-online.de> Message-ID: <20230206115922.5aaad8c4@windsurf> On Mon, 12 Dec 2022 21:27:27 +0100 Bernd Kuhls wrote: > Introduced as optional dependency with libass 0.17.0. > > Signed-off-by: Bernd Kuhls > --- > Build-tested using this defconfig Both patches applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 10:59:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:59:31 +0100 Subject: [Buildroot] [PATCH] docs/website: better recent commits/discussions output In-Reply-To: <20230206104559.86803-1-angelo@amarulasolutions.com> References: <20230206104559.86803-1-angelo@amarulasolutions.com> Message-ID: <20230206115931.1d15fc7e@windsurf> On Mon, 6 Feb 2023 11:45:59 +0100 Angelo Compagnucci wrote: > Removing the "[Buildroot]" and the "Re:" from messages title to have a > cleaner look on the "news" boxes. > > Signed-off-by: Angelo Compagnucci > --- > docs/website/js/buildroot.js | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 10:59:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:59:03 +0100 Subject: [Buildroot] [git commit] docs/website: better recent commits/discussions output Message-ID: <20230206110019.9F06883987@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=101b05a37479c31e397cdabad06e346665c93eba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removing the "[Buildroot]" and the "Re:" from messages title to have a cleaner look on the "news" boxes. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- docs/website/js/buildroot.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/website/js/buildroot.js b/docs/website/js/buildroot.js index 288e3e745c..b2975fb609 100644 --- a/docs/website/js/buildroot.js +++ b/docs/website/js/buildroot.js @@ -19,6 +19,8 @@ function display_activity(result, activity) { let link = document.createElement("a"); let d = new Date(entry.updated); let data = '[' + d.toLocaleDateString() + '] ' + entry.title; + data = data.replace("Re: ",""); + data = data.replace("[Buildroot] ",""); let text = document.createTextNode(data); link.appendChild(text); link.title = entry.title; From yann.morin.1998 at free.fr Mon Feb 6 11:01:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:01:10 +0100 Subject: [Buildroot] [PATCH 2/2] package/crudini: add host-crudini In-Reply-To: <20220920232154.1219792-2-KAMenyaev@sberdevices.ru> References: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> <20220920232154.1219792-2-KAMenyaev@sberdevices.ru> Message-ID: <20230206110110.GB3565@scaer> Konstantin, All, On 2022-09-21 02:21 +0300, Konstantin Menyaev via buildroot spake thusly: > From: Konstantin Menyaev > > Make the host variant of crudini package. This can be useful in > post-{build,image} scripts. > > Signed-off-by: Konstantin Menyaev > --- [--SNIP--] > diff --git a/package/crudini/Config.in.host b/package/crudini/Config.in.host > new file mode 100644 > index 0000000000..5e0040883f > --- /dev/null > +++ b/package/crudini/Config.in.host > @@ -0,0 +1,9 @@ > +config BR2_PACKAGE_HOST_CRUDINI > + bool "host crudini" > + depends on BR2_PACKAGE_HOST_PYTHON3 I've changed that to a select, like allthe other host packages that need host python3, and applied to master, thanks. Regards, Yann E. MORIN. > + select BR2_PACKAGE_HOST_PYTHON_INIPARSE # runtime > + help > + A utility for handling ini files from the command line and > + shell scripts > + > + https://pypi.python.org/pypi/crudini > diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk > index 7141e2b2a0..c376c5f777 100644 > --- a/package/crudini/crudini.mk > +++ b/package/crudini/crudini.mk > @@ -11,3 +11,4 @@ CRUDINI_LICENSE = GPL-2.0 > CRUDINI_LICENSE_FILES = COPYING > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.37.3 > > _______________________________________________ > 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 Mon Feb 6 11:00:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:00:14 +0100 Subject: [Buildroot] [git commit] package/python-iniparse: add host-python-iniparse Message-ID: <20230206110133.7C8DA83A8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87af250c0e136bf8751e1fc8a6196f9b25a0b64e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Make the host variant of python-iniparse as host-crudini dependency. Note: usually, we would not have needed to add a Config.in.host, because it is jsut a library, but since there is an Config.in.host for python-six, we need to select it, so we need an host entry. Signed-off-by: Konstantin Menyaev Reviewed-by: Heiko Thiery [yann.morin.1998 at free.fr: - add the note - reorder alphabetically ] Signed-off-by: Yann E. MORIN --- package/Config.in.host | 1 + package/python-iniparse/Config.in.host | 11 +++++++++++ package/python-iniparse/python-iniparse.mk | 1 + 3 files changed, 13 insertions(+) diff --git a/package/Config.in.host b/package/Config.in.host index b76bea60d0..0f612d7872 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -77,6 +77,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python-cython/Config.in.host" source "package/python-greenlet/Config.in.host" + source "package/python-iniparse/Config.in.host source "package/python-kflash/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-pyyaml/Config.in.host" diff --git a/package/python-iniparse/Config.in.host b/package/python-iniparse/Config.in.host new file mode 100644 index 0000000000..e93022e815 --- /dev/null +++ b/package/python-iniparse/Config.in.host @@ -0,0 +1,11 @@ +config BR2_PACKAGE_HOST_PYTHON_INIPARSE + bool "host python-iniparse" + select BR2_PACKAGE_HOST_PYTHON_SIX # runtime + help + iniparse is an INI parser for Python which is API compatible + with the standard library's ConfigParser, preserves + structure of INI files (order of sections & options, + indentation, comments, and blank lines are preserved when + data is updated), and is more convenient to use. + + https://pypi.python.org/pypi/iniparse diff --git a/package/python-iniparse/python-iniparse.mk b/package/python-iniparse/python-iniparse.mk index d31a490bd8..e76987d1e9 100644 --- a/package/python-iniparse/python-iniparse.mk +++ b/package/python-iniparse/python-iniparse.mk @@ -12,3 +12,4 @@ PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE PYTHON_INIPARSE_SETUP_TYPE = setuptools $(eval $(python-package)) +$(eval $(host-python-package)) From yann.morin.1998 at free.fr Mon Feb 6 11:00:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:00:14 +0100 Subject: [Buildroot] [git commit] package/crudini: add host-crudini Message-ID: <20230206110133.8ABC883A90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c96b2b21f7aedd78094fd009f03d8f82361e5105 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Make the host variant of crudini package. This can be useful in post-{build,image} scripts. Signed-off-by: Konstantin Menyaev Reviewed-by: Heiko Thiery [yann.morin.1998 at free.fr: select python3, don't depend on it] Signed-off-by: Yann E. MORIN --- package/Config.in.host | 1 + package/crudini/Config.in.host | 9 +++++++++ package/crudini/crudini.mk | 1 + 3 files changed, 11 insertions(+) diff --git a/package/Config.in.host b/package/Config.in.host index 0f612d7872..8d28f426d1 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -14,6 +14,7 @@ menu "Host utilities" source "package/checksec/Config.in.host" source "package/cmake/Config.in.host" source "package/cramfs/Config.in.host" + source "package/crudini/Config.in.host" source "package/cryptsetup/Config.in.host" source "package/dbus-python/Config.in.host" source "package/delve/Config.in.host" diff --git a/package/crudini/Config.in.host b/package/crudini/Config.in.host new file mode 100644 index 0000000000..4e77095627 --- /dev/null +++ b/package/crudini/Config.in.host @@ -0,0 +1,9 @@ +config BR2_PACKAGE_HOST_CRUDINI + bool "host crudini" + select BR2_PACKAGE_HOST_PYTHON3 + select BR2_PACKAGE_HOST_PYTHON_INIPARSE # runtime + help + A utility for handling ini files from the command line and + shell scripts + + https://pypi.python.org/pypi/crudini diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk index 7141e2b2a0..c376c5f777 100644 --- a/package/crudini/crudini.mk +++ b/package/crudini/crudini.mk @@ -11,3 +11,4 @@ CRUDINI_LICENSE = GPL-2.0 CRUDINI_LICENSE_FILES = COPYING $(eval $(python-package)) +$(eval $(host-python-package)) From peter at korsgaard.com Mon Feb 6 11:03:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:03:21 +0100 Subject: [Buildroot] [next 04/25] utils/checkpackagelib: warn about redefined config In-Reply-To: <20221127130739.1862398-5-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:18 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-5-ricardo.martincoski@gmail.com> Message-ID: <87ilgfcayu.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Warn the developer in the case the same config is declared more than > once in the same Config.in file. > But take into account the conditional code that lets the config be > visible and warn only when it is declared more than once in the same > conditions. > For instance, do not warn for: > if BR2_PACKAGE_BUSYBOX > config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > endif > if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else > config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > endif > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:04:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:04:28 +0100 Subject: [Buildroot] [next 05/25] support/scripts/generate-gitlab-ci-yml: improve test-pkg support In-Reply-To: <20221127130739.1862398-6-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:19 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-6-ricardo.martincoski@gmail.com> Message-ID: <87edr3cawz.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Following the example of test-pkg config described in commit > "12c7a05da1 utils/test-pkg: add gitlab-ci support" to test a defconfig > fragment that contains a disabled option is currently possible, but > it do requires one to change the git config core.commentChart so the > lines starting with "#" are not discarded by git when creating/editing > the commit message. > For instance, without the indentation the 3rd line below would be > excluded from the commit message when the editor is closed: > test-pkg config: > SOME_OPTION=y > # OTHER_OPTION is not set > SOME_VARIABLE="some value" > Requiring to change git configs is not very nice. > So make the developer's life easier by changing the sed expression to > remove indentation with spaces from a defconfig fragment found on a > commit message. > For instance these lines become valid and generate a defconfig fragment > without the indentation of one space to be tested in GitLab CI: > test-pkg config: > SOME_OPTION=y > # OTHER_OPTION is not set > SOME_VARIABLE="some value" > Signed-off-by: Ricardo Martincoski > --- > Example usage: > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704846763 Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:04:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:04:51 +0100 Subject: [Buildroot] [next 06/25] package/fwts: use ifeq instead of ifdef In-Reply-To: <20221127130739.1862398-7-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:20 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-7-ricardo.martincoski@gmail.com> Message-ID: <87a61rcawc.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The conditional code using ifdef was added in 2018 and works as > expected. > But there is no reason to use ifdef instead of ifeq. > For consistence, switch to use ifeq like almost all packages already do. > Cc: Arnout Vandecappelle > Cc: Erico Nunes > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:06:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:06:08 +0100 Subject: [Buildroot] [next 07/25] package/live555: fix build config with locale In-Reply-To: <20221127130739.1862398-8-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:21 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-8-ricardo.martincoski@gmail.com> Message-ID: <875ycfcau7.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Using current conditional code, added in 2014: > ifndef ($(BR2_ENABLE_LOCALE),y) > LIVE555_CFLAGS += -DLOCALE_NOT_USED > endif > the define LOCALE_NOT_USED is always passed on CFLAGS, because there is > no symbol with following names defined: > "(y,y)" -> not defined when BR2_ENABLE_LOCALE=y > "(,y)" -> not defined when BR2_ENABLE_LOCALE is not set > So fix the typo, switching ifndef to ifneq. > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 6 11:07:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 12:07:12 +0100 Subject: [Buildroot] [git commit] boot/optee-os: add out-of-source OPTEE-OS device tree support Message-ID: <20230206110722.81C6B83A9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46306d135e5aab14073eece713d38e8c827c58ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Similarly to U-Boot, this patch adds the ability to copy in and build out-of-source device tree sources during an OPTEE-OS build. To build the external device tree source file, the OP-TEE OS configuration must refer to it with the CFG_EMBED_DTB_SOURCE_FILE option and no platform flavor needs to be specified. Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- boot/optee-os/Config.in | 11 +++++++++++ boot/optee-os/optee-os.mk | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 8bcce22306..617ff93c44 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -130,6 +130,17 @@ config BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR Value for the optional PLATFORM_FLAVOR build directive provided to OP-TEE OS. +config BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH + string "Device Tree Source file paths" + help + Space-separated list of paths to device tree source files + that will be copied to core/arch/arm/dts/ before starting the + build. + + To use this device tree source file, the OP-TEE OS configuration + must refer to it with the CFG_EMBED_DTB_SOURCE_FILE option and + no platform flavor needs to be specified. + config BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES string "Additional build variables" help diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 38b0d367ef..33b4e2e1ab 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -84,6 +84,8 @@ endif OPTEE_OS_IMAGE_FILES = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CORE_IMAGES)) +OPTEE_OS_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH)) + ifeq ($(BR2_TARGET_OPTEE_OS_CORE),y) define OPTEE_OS_BUILD_CORE $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) O=$(OPTEE_OS_BUILDDIR_OUT) \ @@ -120,6 +122,9 @@ endef endif # BR2_TARGET_OPTEE_OS_SDK define OPTEE_OS_BUILD_CMDS + $(if $(OPTEE_OS_CUSTOM_DTS_PATH), + cp -f $(OPTEE_OS_CUSTOM_DTS_PATH) $(@D)/core/arch/arm/dts/ + ) $(OPTEE_OS_BUILD_CORE) $(OPTEE_OS_BUILD_SDK) endef From peter at korsgaard.com Mon Feb 6 11:07:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:07:44 +0100 Subject: [Buildroot] [next 08/25] package/pugixml: unconditionally set BUILD_DEFINES In-Reply-To: <20221127130739.1862398-9-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:22 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-9-ricardo.martincoski@gmail.com> Message-ID: <871qn3carj.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The ifdef construct intended to avoid passing -DBUILD_DEFINES="" was > never needed, because even upstream version v1.9 used in 2019 when the > configuration options were added, can handle an empty string for > BUILD_DEFINES. > In fact an empty string is the default for v1.9 if it is not passed > during configure. > Also, the host variant already sets BUILD_DEFINES unconditionally. > So remove the unneeded conditional. > Cc: Arnout Vandecappelle > Cc: Theo Debrouwere > Signed-off-by: Ricardo Martincoski > --- > NOTE 1: > For versions starting from v1.11 this flag BUILD_DEFINES is ignored, but > it will be fixed in the next patch. > I had split into 2 patches because this first one applies to old > versions of the package too. Someone could theoretically decide to > backport to a local copy of buildroot 2020.05.x for instance. > NOTE 2: > It doesn't test much, since BUILD_DEFINES is ignored, but anyway: > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704554673 > 44 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > test-pkg config: > BR2_PACKAGE_PUGIXML=y Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:09:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:09:30 +0100 Subject: [Buildroot] [next 09/25] package/pugixml: fix configuration options In-Reply-To: <20221127130739.1862398-10-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:23 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-10-ricardo.martincoski@gmail.com> Message-ID: <87wn4vaw45.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit upstream 1c5a0bb32583fd294022e68e66b541bf6ff71a67 > ":sparkles: Update CMake to modern approach" removed all feature > toogles, so starting from release v1.11 any flag passed in BUILD_DEFINES > was completely ignored during the build. > Version 1.11.4 was in use in buildroot since February 2021. > Commit upstream 0f1e75a902ef1751dd63a67fe223b5e8daf4c7f1 > "Re-introduced the custom build defines" added PUGIXML_BUILD_DEFINES to > release v1.12, but BUILD_DEFINES is still completely ignored during the > build. > Version 1.12.1 is in use in buildroot since March 2022. > So switch the config options to use PUGIXML_BUILD_DEFINES instead of > BUILD_DEFINES. > Cc: Arnout Vandecappelle > Cc: Theo Debrouwere > Signed-off-by: Ricardo Martincoski > --- > NOTE 1: > The code below can be useful to verify the statements above, after > commenting some lines: > |PUGIXML_VERSION = 1.11.4 > |PUGIXML_VERSION = 1.10 > |PUGIXML_VERSION = 1.9 > |define PUGIXML_FORCE_BUILD_ERROR > | echo '#ifdef PUGIXML_COMPACT' >> $(@D)/src/pugixml.cpp > | echo '#error 111' >> $(@D)/src/pugixml.cpp > | echo '#else' >> $(@D)/src/pugixml.cpp > | echo '#error 222' >> $(@D)/src/pugixml.cpp > | echo '#endif' >> $(@D)/src/pugixml.cpp > |endef > |PUGIXML_POST_PATCH_HOOKS += PUGIXML_FORCE_BUILD_ERROR > |PUGIXML_BUILD_DEFINES += PUGIXML_COMPACT > |PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" > |PUGIXML_CONF_OPTS += -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" > |PUGIXML_CONF_OPTS += -DPUGIXML_COMPACT=ON > NOTE 2: > Current version for each branch: > $ git grep ^PUGIXML_VERSION \ > origin/next origin/master $(git branch -a | grep origin/202) \ > | sed -e 's,^remotes/,,g' -e 's,^origin/,,g' | sort > 2020.02.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2020.05.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.10 > 2020.08.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.10 > 2020.11.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2021.02.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2021.05.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2021.08.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2021.11.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2022.02.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.11.4 > 2022.05.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.12.1 > 2022.08.x:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.12.1 > master:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.12.1 > next:package/pugixml/pugixml.mk:PUGIXML_VERSION = 1.12.1 > NOTE 3: > local build tests to check size: > pugixml-compact/graphs/package-size-stats.csv:pugixml,165216,1.9q > pugixml-default/graphs/package-size-stats.csv:pugixml,152928,1.8q > pugixml-header-only/graphs/package-size-stats.csv:pugixml,13660,0.2 > pugixml-noxpath/graphs/package-size-stats.csv:pugixml,95532,1.1 > pugixml-compact/defconfig:BR2_x86_i686=y > pugixml-compact/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-compact/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-compact/defconfig:BR2_PACKAGE_PUGIXML_COMPACT=y > pugixml-default/defconfig:BR2_x86_i686=y > pugixml-default/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-default/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-header-only/defconfig:BR2_x86_i686=y > pugixml-header-only/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-header-only/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-header-only/defconfig:BR2_PACKAGE_PUGIXML_HEADER_ONLY=y > pugixml-noxpath/defconfig:BR2_x86_i686=y > pugixml-noxpath/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-noxpath/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-noxpath/defconfig:# BR2_PACKAGE_PUGIXML_XPATH_SUPPORT is not set > NOTE 4: > build tests on GitLab CI > test-pkg config 1: > BR2_PACKAGE_PUGIXML=y > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704564417 > 44 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > test-pkg config 2: > BR2_PACKAGE_PUGIXML=y > BR2_PACKAGE_PUGIXML_COMPACT=y > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704755515 > 44 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > test-pkg config 3: > BR2_PACKAGE_PUGIXML=y > # BR2_PACKAGE_PUGIXML_XPATH_SUPPORT is not set > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704849811 > 44 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > test-pkg config 4: > BR2_PACKAGE_PUGIXML=y > BR2_PACKAGE_PUGIXML_HEADER_ONLY=y > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704851087 > 44 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Committed, thanks. It's great with all these details! -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:12:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:12:04 +0100 Subject: [Buildroot] [next 10/25] package/pugixml: use explicit build options In-Reply-To: <20221127130739.1862398-11-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:24 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-11-ricardo.martincoski@gmail.com> Message-ID: <87sffjavzv.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit upstream 986b7ffd01aedcd4f2aa16e78e4cad9313b6d7b2 > "Add Cmake options for pugiconfig.hpp" added feature toogles to release > v1.12, including PUGIXML_NO_XPATH and PUGIXML_COMPACT. > Commit upstream 5f49f2c6575cc2b7d343f8d41581fe92d69d7b52 > "Mark advanced options and removed redundant ones" removed CMake > specific support for PUGIXML_HEADER_ONLY and PUGIXML_HAS_LONG_LONG, but > they can still be provided using PUGIXML_BUILD_DEFINES, starting from > release v1.12. > So use the explicit build options PUGIXML_NO_XPATH and PUGIXML_COMPACT, > but keep using PUGIXML_BUILD_DEFINES to set PUGIXML_HEADER_ONLY and > PUGIXML_HAS_LONG_LONG. > Cc: Arnout Vandecappelle > Cc: Theo Debrouwere > Signed-off-by: Ricardo Martincoski > --- > local build tests to check size: > pugixml-compact/graphs/package-size-stats.csv:pugixml,165216,1.9q > pugixml-default/graphs/package-size-stats.csv:pugixml,152928,1.8q > pugixml-header-only/graphs/package-size-stats.csv:pugixml,13660,0.2 > pugixml-noxpath/graphs/package-size-stats.csv:pugixml,95532,1.1 > pugixml-compact/defconfig:BR2_x86_i686=y > pugixml-compact/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-compact/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-compact/defconfig:BR2_PACKAGE_PUGIXML_COMPACT=y > pugixml-default/defconfig:BR2_x86_i686=y > pugixml-default/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-default/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-header-only/defconfig:BR2_x86_i686=y > pugixml-header-only/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-header-only/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-header-only/defconfig:BR2_PACKAGE_PUGIXML_HEADER_ONLY=y > pugixml-noxpath/defconfig:BR2_x86_i686=y > pugixml-noxpath/defconfig:BR2_TOOLCHAIN_EXTERNAL=y > pugixml-noxpath/defconfig:BR2_PACKAGE_PUGIXML=y > pugixml-noxpath/defconfig:# BR2_PACKAGE_PUGIXML_XPATH_SUPPORT is not set Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:13:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:13:10 +0100 Subject: [Buildroot] [next 11/25] package/busybox: add comment about variable override In-Reply-To: <20221127130739.1862398-12-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:25 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-12-ricardo.martincoski@gmail.com> Message-ID: <87o7q7avy1.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The same comment already exists for UCLIBC_CONFIG_FILE. > Both variables can be override from command-line, as described in the > manual, at section 'Environment variables'. > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 6 11:13:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 12:13:36 +0100 Subject: [Buildroot] [git commit] package/postgresql: work around gcc bug 43744 Message-ID: <20230206111414.3E8FD83AAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3def0679e3a424983354346eb517bbaa07b905df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Package postgresql suffers from gcc bug 43744 other than 85180, so let's work around disabling compiler optimization for this gcc bug too. Fixes: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 5313e03b12..2ffcac6595 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -101,7 +101,7 @@ endif POSTGRESQL_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_43744)$(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),) POSTGRESQL_CFLAGS += -O0 endif From peter at korsgaard.com Mon Feb 6 11:15:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:15:03 +0100 Subject: [Buildroot] [next 12/25] utils/checkpackagelib: warn about ifdef on .mk In-Reply-To: <20221127130739.1862398-13-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:26 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-13-ricardo.martincoski@gmail.com> Message-ID: <87k00vavuw.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > There are two legitimate cases to prefer ifdef over ifeq in package > recipes: command-line overrides are allowed for busybox and uclibc > configs. > Except for that, all package in tree already use ifeq, so warn the > developer adding/changing a package to use ifeq instead of ifdef, in > order to keep consistence across packages. > file.mk:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL > file.mk:5: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL > The difference between ifeq and ifdef is that ifdef doesn't expand > recursively. > Add comments to busybox and uclibc packages to avoid a warning in such > special cases. > Cc: Arnout Vandecappelle > Signed-off-by: Ricardo Martincoski > --- > NOTE 1: > I only state "all package in tree already use ifeq" because earlier in > the series other 3 (2 ifdef and 1 ifndef) uses were removed. Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 6 11:21:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 12:21:30 +0100 Subject: [Buildroot] [PATCH 2/2] package/postgresql: work around gcc bug 43744 In-Reply-To: <20230202154239.325711-2-giulio.benetti@benettiengineering.com> References: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> <20230202154239.325711-2-giulio.benetti@benettiengineering.com> Message-ID: <20230206122130.25893d8a@windsurf> Hello Giulio, On Thu, 2 Feb 2023 16:42:39 +0100 Giulio Benetti wrote: > Package postgresql suffers from gcc bug 43744 other than 85180, so let's > work around disabling compiler optimization for this gcc bug too. > > Fixes: > http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a > > Signed-off-by: Giulio Benetti > --- > package/postgresql/postgresql.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. However, you should have resent a v2 of this patch together with the v2 of the first patch. Never resend partial series, but instead always, always, always, always, always, always, always, always, always, always, always, always, always resend a full series, even if only one patch changed. Sending partial series is extremely confusing for the people reviewing/applying the patches. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 6 11:20:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:20:17 +0100 Subject: [Buildroot] [git commit] package/iputils: bump version to 20221126 Message-ID: <20230206112141.56B1983AC8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b89eff429d4e8ad447addd53fde629676e19b76c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This release removed: ninfod, rarpd, rdisc => add entries to Config.in.legacy. LICENSE file got updated (just to use SPDX) => update checksum. Signed-off-by: Petr Vorel Reviewed-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- Config.in.legacy | 24 ++++++++++++++++++++++++ package/iputils/Config.in | 25 ------------------------- package/iputils/iputils.hash | 6 +++--- package/iputils/iputils.mk | 9 ++------- 4 files changed, 29 insertions(+), 35 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e5cfcea8fa..94d6ce19f5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,30 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_IPUTILS_NINFOD + bool "iputils 20221126 removed ninfod" + select BR2_LEGACY + help + iputils 20221126 removed ninfod. + +config BR2_PACKAGE_IPUTILS_RARPD + bool "iputils 20221126 removed rarpd" + select BR2_LEGACY + help + iputils 20221126 removed rarpd. + +config BR2_PACKAGE_IPUTILS_RDISC + bool "iputils 20221126 removed rdisc" + select BR2_LEGACY + help + iputils 20221126 removed rdisc. + +config BR2_PACKAGE_IPUTILS_RDISC_SERVER + bool "iputils 20221126 removed rdisc" + select BR2_LEGACY + help + iputils 20221126 removed rdisc. + config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX bool "xingmux moved" select BR2_LEGACY diff --git a/package/iputils/Config.in b/package/iputils/Config.in index 1a8b555570..ec7bc5418d 100644 --- a/package/iputils/Config.in +++ b/package/iputils/Config.in @@ -28,37 +28,12 @@ config BR2_PACKAGE_IPUTILS_PING help Installs ping. -config BR2_PACKAGE_IPUTILS_RARPD - bool "rarpd" - help - Installs rarpd. - -config BR2_PACKAGE_IPUTILS_RDISC - bool "rdisc" - default y - help - Installs rdisc. - -config BR2_PACKAGE_IPUTILS_RDISC_SERVER - bool "rdisc (server code)" - default y - depends on BR2_PACKAGE_IPUTILS_RDISC - help - Builds rdisc with server code. - config BR2_PACKAGE_IPUTILS_TRACEPATH bool "tracepath" default y help Installs tracepath. -config BR2_PACKAGE_IPUTILS_NINFOD - bool "ninfod" - default y - depends on BR2_TOOLCHAIN_HAS_THREADS # ninfod requires - help - Installs ninfod. - comment "ninfod needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash index db52d990f2..ea23f27f3c 100644 --- a/package/iputils/iputils.hash +++ b/package/iputils/iputils.hash @@ -1,6 +1,6 @@ -# https://github.com/iputils/iputils/releases/download/20211215/sha256sum.asc -sha256 b6f67fc705490673ff4471d006221b4a2f1b1180b929d9fefd771352621ccedf iputils-20211215.tar.gz +# https://github.com/iputils/iputils/releases/download/20221126/sha256sum.asc +sha256 745ea711fe06d5c57d470d21acce3c3ab866eb6afb69379a16c6d60b89bd4311 iputils-20221126.tar.gz # Locally computed -sha256 973281334c2da6364fa6bdc44c1f0f8d60d80d73c782982ffc5d53b0a31aa042 LICENSE +sha256 2c9f29d982c48665c30b3adaf400c048988fd256eb91c691e351eb3b6a8b2036 LICENSE sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/LICENSE.GPL2 diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 84059de330..fe4468ec19 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -11,7 +11,7 @@ # and IPv6 updates. # http://www.spinics.net/lists/netdev/msg279881.html -IPUTILS_VERSION = 20211215 +IPUTILS_VERSION = 20221126 IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 @@ -21,19 +21,14 @@ IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # Selectively build binaries IPUTILS_CONF_OPTS += \ -DBUILD_CLOCKDIFF=$(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),true,false) \ - -DBUILD_RARPD=$(if $(BR2_PACKAGE_IPUTILS_RARPD),true,false) \ - -DBUILD_RDISC=$(if $(BR2_PACKAGE_IPUTILS_RDISC),true,false) \ - -DENABLE_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \ -DBUILD_TRACEPATH=$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),true,false) \ - -DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) \ -DSKIP_TESTS=true # Selectively select the appropriate SELinux refpolicy modules IPUTILS_SELINUX_MODULES = \ $(if $(BR2_PACKAGE_IPUTILS_ARPING),netutils) \ $(if $(BR2_PACKAGE_IPUTILS_PING),netutils) \ - $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) \ - $(if $(BR2_PACKAGE_IPUTILS_RDISC),rdisc) + $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) # # arping From yann.morin.1998 at free.fr Mon Feb 6 11:21:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:21:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/iputils: bump version to 20221126 In-Reply-To: <20221126003807.462157-1-pevik@seznam.cz> References: <20221126003807.462157-1-pevik@seznam.cz> Message-ID: <20230206112156.GC3565@scaer> Petr, All, On 2022-11-26 01:38 +0100, Petr Vorel spake thusly: > From: Petr Vorel > > This release removed: ninfod, rarpd, rdisc > => add entries to Config.in.legacy. > > LICENSE file got updated (just to use SPDX) > => update checksum. > > Signed-off-by: Petr Vorel Applied to master, thanks. Regards, Yann E. MORIN. > --- > Config.in.legacy | 24 ++++++++++++++++++++++++ > package/iputils/Config.in | 25 ------------------------- > package/iputils/iputils.hash | 6 +++--- > package/iputils/iputils.mk | 9 ++------- > 4 files changed, 29 insertions(+), 35 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index b3c35d6b07..6d20092ca4 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,30 @@ endif > > comment "Legacy options removed in 2022.11" > > +config BR2_PACKAGE_IPUTILS_NINFOD > + bool "iputils 20221126 removed ninfod" > + select BR2_LEGACY > + help > + iputils 20221126 removed ninfod. > + > +config BR2_PACKAGE_IPUTILS_RARPD > + bool "iputils 20221126 removed rarpd" > + select BR2_LEGACY > + help > + iputils 20221126 removed rarpd. > + > +config BR2_PACKAGE_IPUTILS_RDISC > + bool "iputils 20221126 removed rdisc" > + select BR2_LEGACY > + help > + iputils 20221126 removed rdisc. > + > +config BR2_PACKAGE_IPUTILS_RDISC_SERVER > + bool "iputils 20221126 removed rdisc" > + select BR2_LEGACY > + help > + iputils 20221126 removed rdisc. > + > config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 > bool "libopenssl rc5 was never enabled" > select BR2_LEGACY > diff --git a/package/iputils/Config.in b/package/iputils/Config.in > index 1a8b555570..ec7bc5418d 100644 > --- a/package/iputils/Config.in > +++ b/package/iputils/Config.in > @@ -28,37 +28,12 @@ config BR2_PACKAGE_IPUTILS_PING > help > Installs ping. > > -config BR2_PACKAGE_IPUTILS_RARPD > - bool "rarpd" > - help > - Installs rarpd. > - > -config BR2_PACKAGE_IPUTILS_RDISC > - bool "rdisc" > - default y > - help > - Installs rdisc. > - > -config BR2_PACKAGE_IPUTILS_RDISC_SERVER > - bool "rdisc (server code)" > - default y > - depends on BR2_PACKAGE_IPUTILS_RDISC > - help > - Builds rdisc with server code. > - > config BR2_PACKAGE_IPUTILS_TRACEPATH > bool "tracepath" > default y > help > Installs tracepath. > > -config BR2_PACKAGE_IPUTILS_NINFOD > - bool "ninfod" > - default y > - depends on BR2_TOOLCHAIN_HAS_THREADS # ninfod requires > - help > - Installs ninfod. > - > comment "ninfod needs a toolchain w/ threads" > depends on !BR2_TOOLCHAIN_HAS_THREADS > > diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash > index db52d990f2..ea23f27f3c 100644 > --- a/package/iputils/iputils.hash > +++ b/package/iputils/iputils.hash > @@ -1,6 +1,6 @@ > -# https://github.com/iputils/iputils/releases/download/20211215/sha256sum.asc > -sha256 b6f67fc705490673ff4471d006221b4a2f1b1180b929d9fefd771352621ccedf iputils-20211215.tar.gz > +# https://github.com/iputils/iputils/releases/download/20221126/sha256sum.asc > +sha256 745ea711fe06d5c57d470d21acce3c3ab866eb6afb69379a16c6d60b89bd4311 iputils-20221126.tar.gz > # Locally computed > -sha256 973281334c2da6364fa6bdc44c1f0f8d60d80d73c782982ffc5d53b0a31aa042 LICENSE > +sha256 2c9f29d982c48665c30b3adaf400c048988fd256eb91c691e351eb3b6a8b2036 LICENSE > sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/LICENSE.GPL2 > diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk > index 84059de330..fe4468ec19 100644 > --- a/package/iputils/iputils.mk > +++ b/package/iputils/iputils.mk > @@ -11,7 +11,7 @@ > # and IPv6 updates. > # http://www.spinics.net/lists/netdev/msg279881.html > > -IPUTILS_VERSION = 20211215 > +IPUTILS_VERSION = 20221126 > IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) > IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause > IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 > @@ -21,19 +21,14 @@ IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) > # Selectively build binaries > IPUTILS_CONF_OPTS += \ > -DBUILD_CLOCKDIFF=$(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),true,false) \ > - -DBUILD_RARPD=$(if $(BR2_PACKAGE_IPUTILS_RARPD),true,false) \ > - -DBUILD_RDISC=$(if $(BR2_PACKAGE_IPUTILS_RDISC),true,false) \ > - -DENABLE_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \ > -DBUILD_TRACEPATH=$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),true,false) \ > - -DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) \ > -DSKIP_TESTS=true > > # Selectively select the appropriate SELinux refpolicy modules > IPUTILS_SELINUX_MODULES = \ > $(if $(BR2_PACKAGE_IPUTILS_ARPING),netutils) \ > $(if $(BR2_PACKAGE_IPUTILS_PING),netutils) \ > - $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) \ > - $(if $(BR2_PACKAGE_IPUTILS_RDISC),rdisc) > + $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) > > # > # arping > -- > 2.38.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 Mon Feb 6 11:24:46 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 12:24:46 +0100 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: <2bdc57cb-e5c9-127d-dd3e-da4bb35f89f1@mind.be> Hi Alsey, Sorry for the extremely late feedback on this. There were a few issues with your contribution and I wasn't able to fix them up myself, so I marked the series as Changes Requested. See below for my comments. On 29/03/2022 23:54, 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 Please add an explanation in the commit log about where this range of supported architectures comes from. Also, I expect that on ARM and possibly powerpc there are tighter constraints than this. > +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 We also have armv7m and armv4 which are not covered here. > + 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 You can simplify BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS like this: config BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS bool default y depends on BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH != "" > + > +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 Again, please explain in the commit message where the glibc dependency comes from. > + select BR2_PACKAGE_LIBBSD Please include the libbsd dependencies (as far as they're not covered by the libdispatch dependencies themselves): depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd depends on BR2_USE_WCHAR # libbsd > + > + help > + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. Please wrap at 72 columns (where the tab counts as 8 spaces). utils/check-package will warn about this. > + > + http://swift.org Is there no URL specific to libdispatch? > + > +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 \ There is no C++ dependency in the package itself... > + || BR2_STATIC_LIBS || !BR2_USE_WCHAR > \ No newline at end of file Please add a newline at the end of the 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 Please add a hash for the license files. > 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) I guess this is a swift-specific fork of libdispatch? If yes, then the swift bit should probably still be in _VERSION, i.e. LIBDISPATH_VERSION = swift-5.6 Alternatively, the package should be named something like libdispatch-swift. > +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 clang and lld (if they're supposed to build for the target) need a dependency on BR2_PACKAGE_LLVM_ARCH_SUPPORTS and BR2_HOST_GCC_AT_LEAST_5 Also you should select BR2_PACKAGE_HOST_LLD in Config.in. > + > +LIBDISPATCH_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH)) > +LIBDISPATCH_CLANG_PATH = $(HOST_DIR)/bin It's not worth adding a variable for this, just use $(HOST_DIR)/bin directly below. > + > +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 Instead of defining this here, define it like that in LIBDISPATCH_TARGET_ARCH directly, i.e. include the unknown-linux-gnu* in BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH. > +endif > + > +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) > +LIBDISPATCH_EXTRA_FLAGS = -march=armv5te Not all our armv5 variants are armv5te I believe... > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),riscv64) > +LIBDISPATCH_EXTRA_FLAGS = -mno-relax -mabi=lp64 -march=rv64imac -mfloat-abi=soft Having to specify all of this sounds very very wrong. We define the ABI and arch elsewhere depending on config options, if you're overriding here it's not going to be compatible with libc. I'm not sure about the -mno-relax, that might be needed. But please document in the commit message why. > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mipsel) > +LIBDISPATCH_EXTRA_FLAGS = -msoft-float > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mips64el) > +LIBDISPATCH_EXTRA_FLAGS = -msoft-float Again, floating point ABI should be defined in our ABI definition or it's not going to be compatible. If it requires soft float, we need to depend on BR2_MIPS_SOFT_FLOAT in Config.in. -msoft-float and other ABI options are passed along by the toolchain wrapper, so if these are somehow needed in EXTRA_FLAGS after all, something somewhere is really broken. This needs to be analyzed and explained in detail. > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),powerpc) > +LIBDISPATCH_EXTRA_FLAGS = -mcpu=7400 We support many, many other powerpc CPUs, so please explain why this is needed and why it works on all other CPUs. > +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))" \ Please wrap this extremely long line. Also, since it's reused for CXX flags, it probably makes sense to define a variable for this. -fuse-ld should probably be given a full path to $(HOST_DIR)/bin/lld instead of relying on $PATH. --sysroot, -I, -B, -L options shouldn't be needed, they should already be part of the toolchain wrapper. However, the toolchain wrapper for clang is fairly recent and doesn't see that much use, so something may be missing there. Still, if there is a problem, it should probably be handled in the toolchain wrapper an not here. > + -DCMAKE_C_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ Again, --sysrot should already be handled by the toolchain wrapper. > + -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/ \ Doesn't the CMakeLists.txt have proper install commands? If not, please document in the commit message. Also, no need to cd, just do cp $(LIBDISPATCH_BUILDDIR)/*.so $(TARGET_DIR)/usr/lib/ Regards, Arnout > + ) > +endef > + > +$(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 6 11:26:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:26:29 +0100 Subject: [Buildroot] [next 13/25] toolchain/toolchain-buildroot: add comment about using virtual package infra In-Reply-To: <20221127130739.1862398-14-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:27 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-14-ricardo.martincoski@gmail.com> Message-ID: <87fsbjavbu.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "9a8ec9195c toolchain/toolchain-buildroot: migrate to virtual > package infrastructure" made the packages toolchain and > toolchain-buildroot to use the virtual package infra even they being > generic packages. > This works because on package/pkg-virtual.mk when a package do not > define neither _PROVIDES_ or _HAS_ symbols, only _IS_VIRTUAL is set to > YES and _VERSION and _SOURCE are set to empty before relaying the call > to inner-generic-package. > Add a comment explaining why the virtual package infra is used in these > cases. > Cc: Giulio Benetti > Cc: Romain Naour > Cc: Thomas De Schampheleire > Cc: Thomas Petazzoni > Cc: Yann E. MORIN > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 6 11:26:36 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 12:26:36 +0100 Subject: [Buildroot] [PATCH 3/4] package/libdispatch: add fix for 32-bit arm In-Reply-To: <20220329185059.943889-3-alseycmiller@gmail.com> References: <20220329185059.943889-1-alseycmiller@gmail.com> <20220329185059.943889-3-alseycmiller@gmail.com> Message-ID: Hi Alsey, This patch should be included in the first one. On 29/03/2022 20:50, Alsey Coleman Miller wrote: > 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 @@ Patches should be git formatted. They should have a full commit message that explains the issue, and a Signed-off-by. There should also be an upstream reference, or something like "Not applicable" and an explaantion why it's not applicable for upstream. Regards, Arnout > +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)) { From peter at korsgaard.com Mon Feb 6 11:26:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:26:59 +0100 Subject: [Buildroot] [next 14/25] boot/uboot: remove use of legacy xloader symbol In-Reply-To: <20221127130739.1862398-15-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:28 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-15-ricardo.martincoski@gmail.com> Message-ID: <87bkm7avb0.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "070b183d0c boot/xloader: remove package", from release 2018.11, > removed the package, but the symbol is still referenced. > Remove the reference to it. > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:27:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:27:39 +0100 Subject: [Buildroot] [next 15/25] system: remove use of legacy md5 option In-Reply-To: <20221127130739.1862398-16-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:29 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-16-ricardo.martincoski@gmail.com> Message-ID: <877cwvav9w.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "bf3626002f system cfg: remove mkpasswd MD5 format option", from > release 2019.02, moved the symbol to legacy handling, but the symbol is > still referenced. > Remove the reference to it. > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:29:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:29:34 +0100 Subject: [Buildroot] [next 16/25] package/linux-headers: remove bogus symbol BR2_PACKAGE_HOST_LINUX_HEADERS In-Reply-To: <20221127130739.1862398-17-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:30 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-17-ricardo.martincoski@gmail.com> Message-ID: <87zg9r9gm9.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The package host-linux-headers does not exist and there were never > references to this symbol in the tree, do drop it. > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Mon Feb 6 11:32:59 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 04:32:59 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-iniparse: add host-python-iniparse In-Reply-To: References: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> Message-ID: On Mon, Feb 6, 2023 at 3:12 AM Heiko Thiery wrote: > > Hi, > > Am Mi., 21. Sept. 2022 um 01:24 Uhr schrieb : > > > > From: Konstantin Menyaev > > > > Make the host variant of python-iniparse > > as host-crudini dependency. > > > > Signed-off-by: Konstantin Menyaev > > Reviewed-by: Heiko Thiery > > > --- > > package/Config.in.host | 1 + > > package/python-iniparse/Config.in.host | 11 +++++++++++ > > package/python-iniparse/python-iniparse.mk | 1 + > > 3 files changed, 13 insertions(+) > > create mode 100644 package/python-iniparse/Config.in.host > > > > diff --git a/package/Config.in.host b/package/Config.in.host > > index f437ef680c..fb805577d1 100644 > > --- a/package/Config.in.host > > +++ b/package/Config.in.host > > @@ -72,6 +72,7 @@ menu "Host utilities" > > source "package/pkgconf/Config.in.host" > > source "package/pru-software-support/Config.in.host" > > source "package/pwgen/Config.in.host" > > + source "package/python-iniparse/Config.in.host Missing a trailing quote: package/Config.in.host:81:warning: multi-line strings not supported > > source "package/python-cython/Config.in.host" > > source "package/python-greenlet/Config.in.host" > > source "package/python-kflash/Config.in.host" > > diff --git a/package/python-iniparse/Config.in.host b/package/python-iniparse/Config.in.host > > new file mode 100644 > > index 0000000000..e93022e815 > > --- /dev/null > > +++ b/package/python-iniparse/Config.in.host > > @@ -0,0 +1,11 @@ > > +config BR2_PACKAGE_HOST_PYTHON_INIPARSE > > + bool "host python-iniparse" > > + select BR2_PACKAGE_HOST_PYTHON_SIX # runtime > > + help > > + iniparse is an INI parser for Python which is API compatible > > + with the standard library's ConfigParser, preserves > > + structure of INI files (order of sections & options, > > + indentation, comments, and blank lines are preserved when > > + data is updated), and is more convenient to use. > > + > > + https://pypi.python.org/pypi/iniparse > > diff --git a/package/python-iniparse/python-iniparse.mk b/package/python-iniparse/python-iniparse.mk > > index d31a490bd8..e76987d1e9 100644 > > --- a/package/python-iniparse/python-iniparse.mk > > +++ b/package/python-iniparse/python-iniparse.mk > > @@ -12,3 +12,4 @@ PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE > > PYTHON_INIPARSE_SETUP_TYPE = setuptools > > > > $(eval $(python-package)) > > +$(eval $(host-python-package)) > > -- > > 2.37.3 > > > > _______________________________________________ > > 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 yann.morin.1998 at free.fr Mon Feb 6 11:34:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:34:35 +0100 Subject: [Buildroot] [git commit] package/netopeer2: fix sysv init script, does not start Message-ID: <20230206113452.65F3283AFC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ddc29708d3c82f2f6055b596e484a6d963a6eae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - The netopeer server forks to background by default, no need for '-b' - The path to the daemon is /usr/sbin, not /usr/bin Signed-off-by: Joachim Wiberg Acked-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- package/netopeer2/S52netopeer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netopeer2/S52netopeer2 b/package/netopeer2/S52netopeer2 index cf53a8f109..cadd6b9feb 100644 --- a/package/netopeer2/S52netopeer2 +++ b/package/netopeer2/S52netopeer2 @@ -8,7 +8,7 @@ NETOPEER2_SERVER_ARGS="" start() { printf 'Starting %s: ' "$DAEMON" - start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -p $PIDFILE -x "/usr/sbin/$DAEMON" \ -- $NETOPEER2_SERVER_ARGS status=$? if [ "$status" -eq 0 ]; then From yann.morin.1998 at free.fr Mon Feb 6 11:35:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:35:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/netopeer2: fix sysv init script, does not start In-Reply-To: <20230131142003.1354787-1-troglobit@gmail.com> References: <20230131142003.1354787-1-troglobit@gmail.com> Message-ID: <20230206113501.GD3565@scaer> Joachim, All, On 2023-01-31 15:20 +0100, Joachim Wiberg spake thusly: > - The netopeer server forks to background by default, no need for '-b' > - The path to the daemon is /usr/sbin, not /usr/bin > > Signed-off-by: Joachim Wiberg Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/netopeer2/S52netopeer2 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/netopeer2/S52netopeer2 b/package/netopeer2/S52netopeer2 > index cf53a8f109..cadd6b9feb 100644 > --- a/package/netopeer2/S52netopeer2 > +++ b/package/netopeer2/S52netopeer2 > @@ -8,7 +8,7 @@ NETOPEER2_SERVER_ARGS="" > start() { > printf 'Starting %s: ' "$DAEMON" > > - start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ > + start-stop-daemon -S -q -p $PIDFILE -x "/usr/sbin/$DAEMON" \ > -- $NETOPEER2_SERVER_ARGS > status=$? > if [ "$status" -eq 0 ]; then > -- > 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 Mon Feb 6 11:37:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:37:10 +0100 Subject: [Buildroot] [next 17/25] package/gitlab-runner: ensure use of LIBCURL_OPENSSL In-Reply-To: <20221127130739.1862398-18-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:31 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-18-ricardo.martincoski@gmail.com> Message-ID: <87v8kf9g9l.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Currently this minimal config is accepted while it shouldn't: > BR2_x86_i686=y > BR2_PACKAGE_BEARSSL=y > BR2_PACKAGE_LIBCURL_BEARSSL=y > BR2_PACKAGE_GITLAB_RUNNER=y > BR2_PACKAGE_GITLAB_RUNNER selects BR2_PACKAGE_LIBCURL_OPENSSL. > Kconfig does not enforce a select when the symbol selected is part of a > choice. See similar explanation on [1] and [2]. > Doing something similar to [3] and depending on the choice option > instead of selecting it would create a Kconfig recursive dependency. > Just dropping the ineffective select would keep the above defconfig > snippet as an accepted one. > Adding a comment to the menu, i.e.: > comment "gitlab-runner must use BR2_PACKAGE_LIBCURL_OPENSSL" > depends on BR2_PACKAGE_GITLAB_RUNNER > depends on !BR2_PACKAGE_LIBCURL_OPENSSL > could improve user experience but it also keeps the above defconfig > snippet as an accepted one. > So bail out the build when gitlab-runner is enabled and libcurl-openssl > is not selected, similar to what is done in [4]. > [1] "a44b1c1405 legacy: update the BR2_PREFER_STATIC_LIB option" > [2] "b1d5aa1bc2 package/qwt: Fix selecting OpenGL support in qt4" > [3] "9fc652a373 package/libmodsecurity: needs dynamic library with > libcurl and mbedtls" > [4] "fda53f0791 package/Makefile.in: add detection for the lack of C > library" > Cc: Marcin Niestroj > Cc: Romain Naour > Signed-off-by: Ricardo Martincoski The change as such is fine, but why does gitlab-runner really need the curl binary to use the openssl backend? Perhaps it is just about curl having HTTPS support? > --- > package/gitlab-runner/Config.in | 1 - > package/gitlab-runner/gitlab-runner.mk | 4 ++++ > 2 files changed, 4 insertions(+), 1 deletion(-) > diff --git a/package/gitlab-runner/Config.in b/package/gitlab-runner/Config.in > index 89e3e87b5c..5b8a6cacbe 100644 > --- a/package/gitlab-runner/Config.in > +++ b/package/gitlab-runner/Config.in > @@ -11,7 +11,6 @@ config BR2_PACKAGE_GITLAB_RUNNER > select BR2_PACKAGE_GIT # runtime > select BR2_PACKAGE_LIBCURL # runtime > select BR2_PACKAGE_LIBCURL_CURL # runtime > - select BR2_PACKAGE_LIBCURL_OPENSSL # runtime, for ca-certificates. > select BR2_PACKAGE_OPENSSL # runtime > select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL # runtime > select BR2_PACKAGE_LIBOPENSSL_BIN # runtime > diff --git a/package/gitlab-runner/gitlab-runner.mk b/package/gitlab-runner/gitlab-runner.mk > index c7c2da2fe1..c997785d90 100644 > --- a/package/gitlab-runner/gitlab-runner.mk > +++ b/package/gitlab-runner/gitlab-runner.mk > @@ -12,6 +12,10 @@ GITLAB_RUNNER_LICENSE_FILES = LICENSE > GITLAB_RUNNER_LDFLAGS = \ > -X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=$(GITLAB_RUNNER_VERSION) > +ifeq ($(BR2_PACKAGE_GITLAB_RUNNER):$(BR2_PACKAGE_LIBCURL_OPENSSL):$(BR_BUILDING),y::y) > +$(error gitlab-runner must use BR2_PACKAGE_LIBCURL_OPENSSL for ca-certificates at runtime) > +endif > + > # Don't run gitlab runner as root. > define GITLAB_RUNNER_USERS > gitlab-runner -1 gitlab-runner -1 * /var/run/dbus /bin/false - Gitlab Runner > -- > 2.34.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Mon Feb 6 11:36:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:36:56 +0100 Subject: [Buildroot] [git commit] package/Config.in.host: fix missing double-quote Message-ID: <20230206113824.B01DC83B1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3cab8f29eb9c7e573099a4a0e45f251e4f15f97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c96b2b21f7ae (package/python-iniparse: add host-python-iniparse) missed that. Reported-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in.host b/package/Config.in.host index 8d28f426d1..dcadbfdfc1 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -78,7 +78,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python-cython/Config.in.host" source "package/python-greenlet/Config.in.host" - source "package/python-iniparse/Config.in.host + source "package/python-iniparse/Config.in.host" source "package/python-kflash/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-pyyaml/Config.in.host" From yann.morin.1998 at free.fr Mon Feb 6 11:38:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:38:53 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-iniparse: add host-python-iniparse In-Reply-To: References: <20220920232154.1219792-1-KAMenyaev@sberdevices.ru> Message-ID: <20230206113853.GE3565@scaer> James, All, On 2023-02-06 04:32 -0700, James Hilliard spake thusly: > On Mon, Feb 6, 2023 at 3:12 AM Heiko Thiery wrote: > > Am Mi., 21. Sept. 2022 um 01:24 Uhr schrieb : [--SNIP--] > > > diff --git a/package/Config.in.host b/package/Config.in.host > > > index f437ef680c..fb805577d1 100644 > > > --- a/package/Config.in.host > > > +++ b/package/Config.in.host > > > @@ -72,6 +72,7 @@ menu "Host utilities" > > > source "package/pkgconf/Config.in.host" > > > source "package/pru-software-support/Config.in.host" > > > source "package/pwgen/Config.in.host" > > > + source "package/python-iniparse/Config.in.host > Missing a trailing quote: > package/Config.in.host:81:warning: multi-line strings not supported Fixed, 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 peter at korsgaard.com Mon Feb 6 11:45:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:45:58 +0100 Subject: [Buildroot] [next 18/25] package/openpowerlink: properly handle legacy options In-Reply-To: <20221127130739.1862398-19-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:32 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-19-ricardo.martincoski@gmail.com> Message-ID: <87r0v39fux.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "b1063a0136 package/openpowerlink: bump to v2.2.2" tried to add > legacy handling but the new symbols are part of a choice, and Kconfig > does not enforce the select of a option from a choice. > Update the legacy entry for 2016.02, following the example described in > the beginning of the file. > Cc: Romain Naour > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 11:48:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 12:48:08 +0100 Subject: [Buildroot] [next 19/25] package/gcc: properly handle legacy for renamed ARC option In-Reply-To: <20221127130739.1862398-20-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:33 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-20-ricardo.martincoski@gmail.com> Message-ID: <87mt5r9frb.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "50332a530b gcc: rename option for ARC gcc" tried to add legacy > handling but the new symbol is part of a choice, and Kconfig does not > enforce the select of a option from a choice. > Update the legacy entry for 2016.11, following the example described in > the beginning of the file. > Cc: Giulio Benetti > Cc: Romain Naour > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Mon Feb 6 12:03:59 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 05:03:59 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-pyproject-hooks: new package Message-ID: <20230206120400.3188421-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- .../python-pyproject-hooks.hash | 5 +++++ .../python-pyproject-hooks.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-pyproject-hooks/python-pyproject-hooks.hash create mode 100644 package/python-pyproject-hooks/python-pyproject-hooks.mk diff --git a/package/python-pyproject-hooks/python-pyproject-hooks.hash b/package/python-pyproject-hooks/python-pyproject-hooks.hash new file mode 100644 index 0000000000..9fdcd33596 --- /dev/null +++ b/package/python-pyproject-hooks/python-pyproject-hooks.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pyproject_hooks/json +md5 69b0b6de189bc04c3f9e304281765741 pyproject_hooks-1.0.0.tar.gz +sha256 f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5 pyproject_hooks-1.0.0.tar.gz +# Locally computed sha256 checksums +sha256 1b22b049b5267d6dfc23a67bf4a84d8ec04b9fdfb1a51d360e42b4342c8b4154 LICENSE diff --git a/package/python-pyproject-hooks/python-pyproject-hooks.mk b/package/python-pyproject-hooks/python-pyproject-hooks.mk new file mode 100644 index 0000000000..a42dbb0ab1 --- /dev/null +++ b/package/python-pyproject-hooks/python-pyproject-hooks.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyproject-hooks +# +################################################################################ + +PYTHON_PYPROJECT_HOOKS_VERSION = 1.0.0 +PYTHON_PYPROJECT_HOOKS_SOURCE = pyproject_hooks-$(PYTHON_PYPROJECT_HOOKS_VERSION).tar.gz +PYTHON_PYPROJECT_HOOKS_SITE = https://files.pythonhosted.org/packages/25/c1/374304b8407d3818f7025457b7366c8e07768377ce12edfe2aa58aa0f64c +PYTHON_PYPROJECT_HOOKS_SETUP_TYPE = flit-bootstrap +PYTHON_PYPROJECT_HOOKS_LICENSE = MIT +PYTHON_PYPROJECT_HOOKS_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 6 12:04:00 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 05:04:00 -0700 Subject: [Buildroot] [PATCH 2/2] package/python-pypa-build: bump to version 0.10.0 In-Reply-To: <20230206120400.3188421-1-james.hilliard1@gmail.com> References: <20230206120400.3188421-1-james.hilliard1@gmail.com> Message-ID: <20230206120400.3188421-2-james.hilliard1@gmail.com> Migrate to flit-bootstrap build backend. Remove no longer needed host-python-pep517 dependency. Add new host-python-pyproject-hooks dependency. Signed-off-by: James Hilliard --- package/python-pypa-build/python-pypa-build.hash | 4 ++-- package/python-pypa-build/python-pypa-build.mk | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pypa-build/python-pypa-build.hash b/package/python-pypa-build/python-pypa-build.hash index 4c02ee1dce..9da56f9f68 100644 --- a/package/python-pypa-build/python-pypa-build.hash +++ b/package/python-pypa-build/python-pypa-build.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/build/json -md5 f2dc1823b0eff7037e19be18e354b2f1 build-0.9.0.tar.gz -sha256 1a07724e891cbd898923145eb7752ee7653674c511378eb9c7691aab1612bc3c build-0.9.0.tar.gz +md5 742e7cd0a67455c1df90061b42088bd2 build-0.10.0.tar.gz +sha256 d5b71264afdb5951d6704482aac78de887c80691c52b88a9ad195983ca2c9269 build-0.10.0.tar.gz # Locally computed sha256 checksums sha256 aaf9a29ca5907971ccf07de025375db34539a8d5eeebce20b46099805722106f LICENSE diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk index adc124b074..d7c03323b7 100644 --- a/package/python-pypa-build/python-pypa-build.mk +++ b/package/python-pypa-build/python-pypa-build.mk @@ -4,14 +4,14 @@ # ################################################################################ -PYTHON_PYPA_BUILD_VERSION = 0.9.0 +PYTHON_PYPA_BUILD_VERSION = 0.10.0 PYTHON_PYPA_BUILD_SOURCE = build-$(PYTHON_PYPA_BUILD_VERSION).tar.gz -PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/0f/61/aaf43fbb36cc4308be8ac8088f52db9622b0dbf1f0880c1016ae6aa03f46 +PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/de/1c/fb62f81952f0e74c3fbf411261d1adbdd2d615c89a24b42d0fe44eb4bcf3 PYTHON_PYPA_BUILD_LICENSE = MIT PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE -PYTHON_PYPA_BUILD_SETUP_TYPE = setuptools +PYTHON_PYPA_BUILD_SETUP_TYPE = flit-bootstrap HOST_PYTHON_PYPA_BUILD_DEPENDENCIES = \ host-python-packaging \ - host-python-pep517 + host-python-pyproject-hooks $(eval $(host-python-package)) -- 2.34.1 From angelo at amarulasolutions.com Mon Feb 6 13:00:57 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 14:00:57 +0100 Subject: [Buildroot] [PATCH] package/qt6/qt6serialbus: new package Message-ID: <20230206130057.352443-1-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- v1->v2: * LICENSE/LICENSE_FILES: one per line * Selecting BR2_PACKAGE_QT6BASE_NETWORK to make the package compile, fixes "Failed to find required Qt component "Network"." package/qt6/Config.in | 1 + package/qt6/qt6serialbus/Config.in | 15 ++++++++ package/qt6/qt6serialbus/qt6serialbus.hash | 11 ++++++ package/qt6/qt6serialbus/qt6serialbus.mk | 45 ++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 package/qt6/qt6serialbus/Config.in create mode 100644 package/qt6/qt6serialbus/qt6serialbus.hash create mode 100644 package/qt6/qt6serialbus/qt6serialbus.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 4b2b9a1174..b0cc008df5 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -39,6 +39,7 @@ menuconfig BR2_PACKAGE_QT6 if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" endif diff --git a/package/qt6/qt6serialbus/Config.in b/package/qt6/qt6serialbus/Config.in new file mode 100644 index 0000000000..1f24310e61 --- /dev/null +++ b/package/qt6/qt6serialbus/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_QT6SERIALBUS + bool "qt6serialbus" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD + select BR2_PACKAGE_QT6SERIALPORT + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6serialbus module. + + https://doc.qt.io/qt-6/qtserialbus-index.html + +comment "qt6serialbus needs headers >= 3.6" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash new file mode 100644 index 0000000000..57b68f47e8 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -0,0 +1,11 @@ +# Downloaded from https://download.qt.io/archive/qt/6.4/6.4.0/submodules/qtserialbus-everywhere-src-6.4.0.tar.xz.sha256 +sha256 efca55677c12085a85b6c0e0f401332922ebc8226b18b7fc9bb9c0d48549ea91 qtserialbus-everywhere-src-6.4.0.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.mk b/package/qt6/qt6serialbus/qt6serialbus.mk new file mode 100644 index 0000000000..fe69119a58 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qt6serialbus +# +################################################################################ + +QT6SERIALBUS_VERSION = $(QT6_VERSION) +QT6SERIALBUS_SITE = $(QT6_SITE) +QT6SERIALBUS_SOURCE = qtserialbus-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALBUS_VERSION).tar.xz +QT6SERIALBUS_INSTALL_STAGING = YES +QT6SERIALBUS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SERIALBUS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6SERIALBUS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6SERIALBUS_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SERIALBUS_DEPENDENCIES = \ + qt6serialport + +define QT6SERIALBUS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) --prefix $(STAGING_DIR)/usr +endef + +define QT6SERIALBUS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) --prefix $(TARGET_DIR)/usr +endef + +$(eval $(cmake-package)) -- 2.25.1 From angelo at amarulasolutions.com Mon Feb 6 13:07:14 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 14:07:14 +0100 Subject: [Buildroot] [PATCH v2] package/qt6/qt6serialbus: new package Message-ID: <20230206130714.359599-1-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- v1->v2: * LICENSE/LICENSE_FILES: one per line * Selecting BR2_PACKAGE_QT6BASE_NETWORK to make the package compile, fixes "Failed to find required Qt component "Network"." package/qt6/Config.in | 1 + package/qt6/qt6serialbus/Config.in | 15 ++++++++ package/qt6/qt6serialbus/qt6serialbus.hash | 11 ++++++ package/qt6/qt6serialbus/qt6serialbus.mk | 45 ++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 package/qt6/qt6serialbus/Config.in create mode 100644 package/qt6/qt6serialbus/qt6serialbus.hash create mode 100644 package/qt6/qt6serialbus/qt6serialbus.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 4b2b9a1174..b0cc008df5 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -39,6 +39,7 @@ menuconfig BR2_PACKAGE_QT6 if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" endif diff --git a/package/qt6/qt6serialbus/Config.in b/package/qt6/qt6serialbus/Config.in new file mode 100644 index 0000000000..1f24310e61 --- /dev/null +++ b/package/qt6/qt6serialbus/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_QT6SERIALBUS + bool "qt6serialbus" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD + select BR2_PACKAGE_QT6SERIALPORT + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6serialbus module. + + https://doc.qt.io/qt-6/qtserialbus-index.html + +comment "qt6serialbus needs headers >= 3.6" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash new file mode 100644 index 0000000000..57b68f47e8 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -0,0 +1,11 @@ +# Downloaded from https://download.qt.io/archive/qt/6.4/6.4.0/submodules/qtserialbus-everywhere-src-6.4.0.tar.xz.sha256 +sha256 efca55677c12085a85b6c0e0f401332922ebc8226b18b7fc9bb9c0d48549ea91 qtserialbus-everywhere-src-6.4.0.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.mk b/package/qt6/qt6serialbus/qt6serialbus.mk new file mode 100644 index 0000000000..fe69119a58 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qt6serialbus +# +################################################################################ + +QT6SERIALBUS_VERSION = $(QT6_VERSION) +QT6SERIALBUS_SITE = $(QT6_SITE) +QT6SERIALBUS_SOURCE = qtserialbus-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALBUS_VERSION).tar.xz +QT6SERIALBUS_INSTALL_STAGING = YES +QT6SERIALBUS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SERIALBUS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6SERIALBUS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6SERIALBUS_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SERIALBUS_DEPENDENCIES = \ + qt6serialport + +define QT6SERIALBUS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) --prefix $(STAGING_DIR)/usr +endef + +define QT6SERIALBUS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) --prefix $(TARGET_DIR)/usr +endef + +$(eval $(cmake-package)) -- 2.25.1 From thomas.petazzoni at bootlin.com Mon Feb 6 13:19:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 14:19:30 +0100 Subject: [Buildroot] [git commit] boot/optee-os: rewrap Config.in help text to fix check-package warning Message-ID: <20230206131937.BD10883B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b42512f2f6c3957637d698de20c3930dfcd85e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: boot/optee-os/Config.in:140: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) which is a warning that was introduced by commit 46306d135e5aab14073eece713d38e8c827c58ae ("boot/optee-os: add out-of-source OPTEE-OS device tree support"). Signed-off-by: Thomas Petazzoni --- boot/optee-os/Config.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 617ff93c44..a3cb8390b4 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -134,12 +134,13 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH string "Device Tree Source file paths" help Space-separated list of paths to device tree source files - that will be copied to core/arch/arm/dts/ before starting the - build. + that will be copied to core/arch/arm/dts/ before starting + the build. - To use this device tree source file, the OP-TEE OS configuration - must refer to it with the CFG_EMBED_DTB_SOURCE_FILE option and - no platform flavor needs to be specified. + To use this device tree source file, the OP-TEE OS + configuration must refer to it with the + CFG_EMBED_DTB_SOURCE_FILE option and no platform flavor + needs to be specified. config BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES string "Additional build variables" From yann.morin.1998 at free.fr Mon Feb 6 13:21:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 14:21:42 +0100 Subject: [Buildroot] [git commit] Makefile: fix build when $(O) ends in _defconfig Message-ID: <20230206132157.2C13883B4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5bd2cafc326141eede4f917069ed21b6d38f88c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit e6195c53041f (Makefile: fix use of many br2-external trees) fixed a slowdown with many br2-external trees. In doing so, it changed the type of the %_defconfig rule: the stem is no longer present in the prerequisites, so it changes from a pattern rule to an implicit pattern rule [0]. It is not unusual to name the build directory after the defconfig that is being built, so we may end up with a build directory named meh_defconfig. Before e6195c53041f, the pattern rule would not match [1], but now it does, which causes somewhat-cryptic build failures: Makefile:1015: *** "Can't find /some/path/meh_defconfig". Stop. The issue is that we have this set of rules and assignments (elided and reordered for legibility): all: world world: target-post-image target-post-image: staging-finalize staging-finalize: $(STAGING_DIR_SYMLINK) $(STAGING_DIR_SYMLINK): | $(BASE_DIR) BASE_DIR := $(CANONICAL_O) CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) So, there is a rule that (eventually) has a dependency on $(O), but we have no rule that provides it explicitly, so the %_defconfig rule kicks in, with the stem as "/some/path/meh". When the loop searches all the ".../configs/" directories for a file named ".../configs/%_defconfig", it actually looks for a file named ".../configs//some/path/meh_defconfig" and that indeed never matches anything. The solution is to provide an actual rule for $(BASE_DIR), so that the implicit rule does not kick in. [0] Terminology and behaviour in make is hard, so the terms we used here may be wrong or incorrectly used, and/or the explanations for the behaviour be wrong or incomplete... Still, the reasoning stands, and the root cause is the removal of the stem in the RHS of the rule (adding one back does fix the issue). [1] not sure how the prerequisite was solved before e6195c53041f, though... Fixes: e6195c53041f Reported-by: Romain Naour Signed-off-by: Yann E. MORIN Cc: Nevo Hed Cc: Peter Korsgaard Tested-by: Sebastian Weyer Signed-off-by: Yann E. MORIN --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8517d563d5..f39af5eae9 100644 --- a/Makefile +++ b/Makefile @@ -1042,7 +1042,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile # staging and target directories do NOT list these as # dependencies anywhere else -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): @mkdir -p $@ # outputmakefile generates a Makefile in the output directory, if using a From peter at korsgaard.com Mon Feb 6 13:22:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 14:22:45 +0100 Subject: [Buildroot] [next 20/25] package/lua: properly handle legacy for removed version In-Reply-To: <20221127130739.1862398-21-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:34 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-21-ricardo.martincoski@gmail.com> Message-ID: <87ilgf9bdm.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "297613f1c7 package/lua: remove 5.2.x version" tried to add > legacy handling but the new symbols are part of a choice, and Kconfig > does not enforce the select of a option from a choice. > Update the legacy entry for 2019.02, following the example described in > the beginning of the file. > Cc: Francois Perrad > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 13:22:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:37 +0100 Subject: [Buildroot] [git commit] package/live555: fix build config with locale Message-ID: <20230206132305.0B35483C25@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=04a4b86a982e307268d660a38d231315134572fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Using current conditional code, added in 2014: ifndef ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif the define LOCALE_NOT_USED is always passed on CFLAGS, because there is no symbol with following names defined: "(y,y)" -> not defined when BR2_ENABLE_LOCALE=y "(,y)" -> not defined when BR2_ENABLE_LOCALE is not set So fix the typo, switching ifndef to ifneq. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/live555/live555.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/live555/live555.mk b/package/live555/live555.mk index effd4517cf..56ed705783 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -39,7 +39,7 @@ else LIVE555_CFLAGS += -DNO_OPENSSL endif -ifndef ($(BR2_ENABLE_LOCALE),y) +ifneq ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif From peter at korsgaard.com Mon Feb 6 13:22:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:37 +0100 Subject: [Buildroot] [git commit] package/pugixml: unconditionally set BUILD_DEFINES Message-ID: <20230206132305.14C1583C26@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01cb02cfaecb34fd7d413775673e78272c68f85f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The ifdef construct intended to avoid passing -DBUILD_DEFINES="" was never needed, because even upstream version v1.9 used in 2019 when the configuration options were added, can handle an empty string for BUILD_DEFINES. In fact an empty string is the default for v1.9 if it is not passed during configure. Also, the host variant already sets BUILD_DEFINES unconditionally. So remove the unneeded conditional. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index c796186827..7d4f47c6fa 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -29,9 +29,7 @@ ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif -ifdef PUGIXML_BUILD_DEFINES PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" -endif HOST_PUGIXML_CONF_OPTS += \ -DBUILD_PKGCONFIG=ON \ From peter at korsgaard.com Mon Feb 6 13:22:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:37 +0100 Subject: [Buildroot] [git commit] package/fwts: use ifeq instead of ifdef Message-ID: <20230206132305.01E5483C24@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6ae82531928662764536cadbe2d6f3c558e7de2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The conditional code using ifdef was added in 2018 and works as expected. But there is no reason to use ifdef instead of ifeq. For consistence, switch to use ifeq like almost all packages already do. Cc: Arnout Vandecappelle Cc: Erico Nunes Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/fwts/fwts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index b208aa0c14..f04c7a848f 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -15,7 +15,7 @@ FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) -ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE +ifeq ($(BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE),y) FWTS_MODULE_SUBDIRS = efi_runtime $(eval $(kernel-module)) endif From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/pugixml: fix configuration options Message-ID: <20230206132305.1FEBD83C23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc3a4a7b1de7b158354c650d234339e8a969a730 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit upstream 1c5a0bb32583fd294022e68e66b541bf6ff71a67 ":sparkles: Update CMake to modern approach" removed all feature toogles, so starting from release v1.11 any flag passed in BUILD_DEFINES was completely ignored during the build. Version 1.11.4 was in use in buildroot since February 2021. Commit upstream 0f1e75a902ef1751dd63a67fe223b5e8daf4c7f1 "Re-introduced the custom build defines" added PUGIXML_BUILD_DEFINES to release v1.12, but BUILD_DEFINES is still completely ignored during the build. Version 1.12.1 is in use in buildroot since March 2022. So switch the config options to use PUGIXML_BUILD_DEFINES instead of BUILD_DEFINES. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 7d4f47c6fa..1a915980a5 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -29,11 +29,11 @@ ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif -PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" +PUGIXML_CONF_OPTS += -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" HOST_PUGIXML_CONF_OPTS += \ -DBUILD_PKGCONFIG=ON \ - -DBUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" + -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" $(eval $(cmake-package)) $(eval $(host-cmake-package)) From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/busybox: add comment about variable override Message-ID: <20230206132305.3320283C24@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01c0fb3862bce6605881d9e32c29b5f7373bb2f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The same comment already exists for UCLIBC_CONFIG_FILE. Both variables can be override from command-line, as described in the manual, at section 'Environment variables'. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index ef628e90e9..0f14bf999d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -108,6 +108,8 @@ BUSYBOX_MAKE_OPTS = \ CONFIG_PREFIX="$(TARGET_DIR)" \ SKIP_STRIP=y +# specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config +# setting. ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/pugixml: use explicit build options Message-ID: <20230206132305.296DA83C28@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f043f928674e94687d1d3173394142271ca3d397 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit upstream 986b7ffd01aedcd4f2aa16e78e4cad9313b6d7b2 "Add Cmake options for pugiconfig.hpp" added feature toogles to release v1.12, including PUGIXML_NO_XPATH and PUGIXML_COMPACT. Commit upstream 5f49f2c6575cc2b7d343f8d41581fe92d69d7b52 "Mark advanced options and removed redundant ones" removed CMake specific support for PUGIXML_HEADER_ONLY and PUGIXML_HAS_LONG_LONG, but they can still be provided using PUGIXML_BUILD_DEFINES, starting from release v1.12. So use the explicit build options PUGIXML_NO_XPATH and PUGIXML_COMPACT, but keep using PUGIXML_BUILD_DEFINES to set PUGIXML_HEADER_ONLY and PUGIXML_HAS_LONG_LONG. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 1a915980a5..c8d59f0864 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -12,6 +12,18 @@ PUGIXML_CPE_ID_VENDOR = pugixml_project PUGIXML_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),y) +PUGIXML_CONF_OPTS += -DPUGIXML_NO_XPATH=OFF +else +PUGIXML_CONF_OPTS += -DPUGIXML_NO_XPATH=ON +endif + +ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y) +PUGIXML_CONF_OPTS += -DPUGIXML_COMPACT=ON +else +PUGIXML_CONF_OPTS += -DPUGIXML_COMPACT=OFF +endif + # Pugixml will automatically enable 'long long' support on C++11 compilers, # which means gcc 4.8+. As gcc always supports the 'long long' type, # force-enable this option to support older gcc versions. See also: @@ -19,12 +31,6 @@ PUGIXML_INSTALL_STAGING = YES PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG HOST_PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG -ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),) -PUGIXML_BUILD_DEFINES += PUGIXML_NO_XPATH -endif -ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y) -PUGIXML_BUILD_DEFINES += PUGIXML_COMPACT -endif ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-buildroot: add comment about using virtual package infra Message-ID: <20230206132305.4803983C23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abcecd737b198e8a1a48bf4533e5c2b8de8b8cf4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "9a8ec9195c toolchain/toolchain-buildroot: migrate to virtual package infrastructure" made the packages toolchain and toolchain-buildroot to use the virtual package infra even they being generic packages. This works because on package/pkg-virtual.mk when a package do not define neither _PROVIDES_ or _HAS_ symbols, only _IS_VIRTUAL is set to YES and _VERSION and _SOURCE are set to empty before relaying the call to inner-generic-package. Add a comment explaining why the virtual package infra is used in these cases. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Yann E. MORIN Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- toolchain/toolchain-buildroot/toolchain-buildroot.mk | 3 +++ toolchain/toolchain/toolchain.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk index b30cc332d2..6da64b7c77 100644 --- a/toolchain/toolchain-buildroot/toolchain-buildroot.mk +++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk @@ -14,4 +14,7 @@ TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-buildroot-virtual +# instead of toolchain-buildroot-undefined) $(eval $(virtual-package)) diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index 18f1dbea1a..ac60a7b248 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -47,4 +47,7 @@ endef TOOLCHAIN_POST_INSTALL_TARGET_HOOKS += TOOLCHAIN_GLIBC_COPY_NSSWITCH_FILE endif +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-virtual instead +# of toolchain-undefined) $(eval $(virtual-package)) From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib: warn about ifdef on .mk Message-ID: <20230206132305.3F27283C25@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29c9b4435503d1b3130ce37dcab88c89156b1481 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master There are two legitimate cases to prefer ifdef over ifeq in package recipes: command-line overrides are allowed for busybox and uclibc configs. Except for that, all package in tree already use ifeq, so warn the developer adding/changing a package to use ifeq instead of ifdef, in order to keep consistence across packages. file.mk:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL file.mk:5: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL The difference between ifeq and ifdef is that ifdef doesn't expand recursively. Add comments to busybox and uclibc packages to avoid a warning in such special cases. Cc: Arnout Vandecappelle Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 1 + package/uclibc/uclibc.mk | 1 + utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++ utils/checkpackagelib/test_lib_mk.py | 48 ++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 0f14bf999d..f8f9cb5616 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -110,6 +110,7 @@ BUSYBOX_MAKE_OPTS = \ # specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config # setting. +# check-package disable Ifdef ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 0ddf7dfa6d..125aa4cdcf 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -22,6 +22,7 @@ UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting. +# check-package disable Ifdef ifndef UCLIBC_CONFIG_FILE UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG)) endif diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index b50a19ac62..8adf844e9a 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -21,6 +21,24 @@ continue_conditional = ["elif", "else"] end_conditional = ["endif"] +class Ifdef(_CheckFunction): + IFDEF = re.compile(r"^\s*(else\s+|)(ifdef|ifndef)\s") + + def check_line(self, lineno, text): + m = self.IFDEF.search(text) + if m is None: + return + word = m.group(2) + if word == 'ifdef': + return ["{}:{}: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL" + .format(self.filename, lineno), + text] + else: + return ["{}:{}: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL" + .format(self.filename, lineno), + text] + + class Indent(_CheckFunction): COMMENT = re.compile(r"^\s*#") CONDITIONAL = re.compile(r"^\s*({})\s".format("|".join(start_conditional + end_conditional + continue_conditional))) diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 49fa216fcd..80a1736b4e 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -3,6 +3,54 @@ import checkpackagelib.test_util as util import checkpackagelib.lib_mk as m +Ifdef = [ + ('ignore commented line', + 'any', + '# ifdef\n', + []), + ('simple', + 'any', + '\n' + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n' + 'endif\n', + [['any:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n']]), + ('ignore indentation', + 'any', + ' ifdef FOO\n' + ' endif\n' + '\tifdef BAR\n' + 'endif\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + ' ifdef FOO\n'], + ['any:3: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + '\tifdef BAR\n']]), + ('typo', + 'any', + '\n' + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n' + 'endif\n', + [['any:2: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n']]), + ('else ifdef', + 'any', + 'else ifdef SYMBOL # comment\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'else ifdef SYMBOL # comment\n']]), + ('else ifndef', + 'any', + '\t else ifndef\t($(SYMBOL),y) # comment\n', + [['any:1: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + '\t else ifndef\t($(SYMBOL),y) # comment\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Ifdef) +def test_Ifdef(testname, filename, string, expected): + warnings = util.check_file(m.Ifdef, filename, string) + assert warnings == expected + + Indent = [ ('ignore comment at beginning of line', 'any', From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/linux-headers: remove bogus symbol BR2_PACKAGE_HOST_LINUX_HEADERS Message-ID: <20230206132305.6950B83C24@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=367bd65f3c216426e2fc21742dbff11ea8d896d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The package host-linux-headers does not exist and there were never references to this symbol in the tree, do drop it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3a5207e0b6..1146231e41 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -1,8 +1,5 @@ comment "Kernel Header Options" -config BR2_PACKAGE_HOST_LINUX_HEADERS - bool - choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL From peter at korsgaard.com Mon Feb 6 13:22:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:37 +0100 Subject: [Buildroot] [git commit] support/scripts/generate-gitlab-ci-yml: improve test-pkg support Message-ID: <20230206132304.ECBBF83C23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ad3ae14c52ed0aac872875ca7f87cdcf6942128 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Following the example of test-pkg config described in commit "12c7a05da1 utils/test-pkg: add gitlab-ci support" to test a defconfig fragment that contains a disabled option is currently possible, but it do requires one to change the git config core.commentChart so the lines starting with "#" are not discarded by git when creating/editing the commit message. For instance, without the indentation the 3rd line below would be excluded from the commit message when the editor is closed: test-pkg config: SOME_OPTION=y # OTHER_OPTION is not set SOME_VARIABLE="some value" Requiring to change git configs is not very nice. So make the developer's life easier by changing the sed expression to remove indentation with spaces from a defconfig fragment found on a commit message. For instance these lines become valid and generate a defconfig fragment without the indentation of one space to be tested in GitLab CI: test-pkg config: SOME_OPTION=y # OTHER_OPTION is not set SOME_VARIABLE="some value" Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- support/scripts/generate-gitlab-ci-yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index aa43aac019..27f586f1b6 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -91,7 +91,7 @@ gen_tests() { # Retrieve defconfig for test-pkg from the git commit message (if any) if grep -q -E '^test-pkg config:$' <<<"${CI_COMMIT_DESCRIPTION}"; then - sed -r -n -e '/^test-pkg config:$/{:a;n;p;ba;}' \ + sed -r -n -e '/^test-pkg config:$/{:a;n;s/^ +//;p;ba;}' \ <<<"${CI_COMMIT_DESCRIPTION}" \ >defconfig.frag if [ ! -s defconfig.frag ]; then From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/gcc: properly handle legacy for renamed ARC option Message-ID: <20230206132305.845AC83C23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb8f38891b16e5fb0f010c658b271e22670a1633 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "50332a530b gcc: rename option for ARC gcc" tried to add legacy handling but the new symbol is part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2016.11, following the example described in the beginning of the file. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 3 ++- package/gcc/Config.in.host | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 1a325f8139..73d8ab4ca7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4100,10 +4100,11 @@ config BR2_LINUX_KERNEL_TOOL_SELFTESTS config BR2_GCC_VERSION_4_8_ARC bool "gcc arc option renamed" select BR2_LEGACY - select BR2_GCC_VERSION_ARC help The option that selects the gcc version for the ARC architecture has been renamed to BR2_GCC_VERSION_ARC. +# Note: BR2_GCC_VERSION_4_8_ARC is still referenced from +# package/gcc/Config.in.host config BR2_KERNEL_HEADERS_4_0 bool "kernel headers version 4.0.x are no longer supported" diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index d7fedc9591..cd1b9fa46d 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -2,6 +2,7 @@ comment "GCC Options" choice prompt "GCC compiler Version" + default BR2_GCC_VERSION_ARC if BR2_GCC_VERSION_4_8_ARC # legacy default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_POWERPC_SPE if BR2_powerpc_SPE default BR2_GCC_VERSION_11_X From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/openpowerlink: properly handle legacy options Message-ID: <20230206132305.7620483C25@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1e4f3950719dd92a2456e2c45856f8cf5dc587e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "b1063a0136 package/openpowerlink: bump to v2.2.2" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2016.02, following the example described in the beginning of the file. Cc: Romain Naour Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/openpowerlink/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 94d6ce19f5..1a325f8139 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4443,19 +4443,21 @@ config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB help openpowerlink kernel modules are built if the kernel stack library is selected. +# Note: BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE is still referenced from +# package/openpowerlink/Config.in config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - a monolithic user space library - a user space daemon driver +# Note: BR2_PACKAGE_OPENPOWERLINK_LIBPCAP is still referenced from +# package/openpowerlink/Config.in config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in index 1a3dd62acd..ef59a04baf 100644 --- a/package/openpowerlink/Config.in +++ b/package/openpowerlink/Config.in @@ -38,6 +38,8 @@ endchoice choice prompt "stack type" + default BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB if BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE # legacy + default BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB if BR2_PACKAGE_OPENPOWERLINK_LIBPCAP # legacy config BR2_PACKAGE_OPENPOWERLINK_STACK_MONOLITHIC_USER_STACK_LIB bool "linked into application" From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] boot/uboot: remove use of legacy xloader symbol Message-ID: <20230206132305.51D8283C26@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b1b1763b754f8a25cf0f2a7fe05e53d256fe675 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "070b183d0c boot/xloader: remove package", from release 2018.11, removed the package, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 282418c3ed..f5c20f5168 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -450,7 +450,6 @@ endif config BR2_TARGET_UBOOT_SPL bool "Install U-Boot SPL binary image" - depends on !BR2_TARGET_XLOADER help Install the U-Boot SPL binary image to the images directory. From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] system: remove use of legacy md5 option Message-ID: <20230206132305.5DF9483C28@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=032cfbc716749869b185f83dab450ec47f969765 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "bf3626002f system cfg: remove mkpasswd MD5 format option", from release 2019.02, moved the symbol to legacy handling, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- system/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/system/Config.in b/system/Config.in index 731dceaa17..deb464f4d0 100644 --- a/system/Config.in +++ b/system/Config.in @@ -78,7 +78,6 @@ endchoice # Passwd encoding config BR2_TARGET_GENERIC_PASSWD_METHOD string - default "md5" if BR2_TARGET_GENERIC_PASSWD_MD5 default "sha-256" if BR2_TARGET_GENERIC_PASSWD_SHA256 default "sha-512" if BR2_TARGET_GENERIC_PASSWD_SHA512 From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit] package/lua: properly handle legacy for removed version Message-ID: <20230206132305.927F783C24@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f461543d9c0f8ea1586004e51561ba0a37b8aecf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "297613f1c7 package/lua: remove 5.2.x version" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2019.02, following the example described in the beginning of the file. Cc: Francois Perrad Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- package/lua/Config.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 73d8ab4ca7..22d7fbe4be 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2224,9 +2224,9 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD config BR2_PACKAGE_LUA_5_2 bool "Lua 5.2.x version removed" select BR2_LEGACY - select BR2_PACKAGE_LUA_5_3 help The Lua 5.2.x version was removed. +# Note: BR2_PACKAGE_LUA_5_2 is still referenced from package/lua/Config.in config BR2_TARGET_GENERIC_PASSWD_MD5 bool "target passwd md5 format support has been removed" diff --git a/package/lua/Config.in b/package/lua/Config.in index 456f3b8c12..888c34b21d 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER choice prompt "Lua Version" + default BR2_PACKAGE_LUA_5_3 if BR2_PACKAGE_LUA_5_2 # legacy default BR2_PACKAGE_LUA_5_4 help Select the version of Lua API/ABI you wish to use. From peter at korsgaard.com Mon Feb 6 13:25:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 14:25:08 +0100 Subject: [Buildroot] [next 21/25] package/ti-sgx-km: properly handle legacy for removed options In-Reply-To: <20221127130739.1862398-22-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:35 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-22-ricardo.martincoski@gmail.com> Message-ID: <87edr39b9n.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "c38b5566fe package/ti-sgx-{km, um, demos}: bump to latest TI > version", added in release 2020.02, removed some options that were > previously renamed in release 2018.05. > Update the legacy entry for 2018.05 and add the corresponding legacy > entries for 2020.02. > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 13:27:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 14:27:56 +0100 Subject: [Buildroot] [next 22/25] package/openjdk: properly handle legacy for renamed options In-Reply-To: <20221127130739.1862398-23-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:36 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-23-ricardo.martincoski@gmail.com> Message-ID: <87a61qappf.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "a610bf9967 package/openjdk{-bin}: bump version to 17.0.1+12" > tried to add legacy handling but the new symbols are part of a choice, > and Kconfig does not enforce the select of a option from a choice. > Update the legacy entry for 2021.11, following the example described in > the beginning of the file. > Cc: Tudor Holton > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 13:28:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 14:28:21 +0100 Subject: [Buildroot] [next 23/25] package/sunxi-mali-utgard: properly handle legacy for renamed options In-Reply-To: <20221127130739.1862398-24-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:37 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-24-ricardo.martincoski@gmail.com> Message-ID: <875yceapoq.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "6a7a652b14 package/sunxi-mali-utgard: rename from > sunxi-mali-mainline" tried to add legacy handling but the new symbols > are part of a choice, and Kconfig does not enforce the select of a > option from a choice. > Update the legacy entry for 2022.02, following the example described in > the beginning of the file. > Cc: Giulio Benetti > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 13:28:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 14:28:40 +0100 Subject: [Buildroot] [next 24/25] package/rpi-userland: fix typo for BR2_aarch64 In-Reply-To: <20221127130739.1862398-25-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:38 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-25-ricardo.martincoski@gmail.com> Message-ID: <871qn2apo7.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "59adb53c4c package/rpi-userland: add support for aarch64" > introduced a typo in the condition that shows a comment in menuconfig. > Fix the typo: BR2_arch64 -> BR2_aarch64 > Cc: Mahyar Koshkouei > Cc: Tim Gover > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 13:24:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:24:36 +0100 Subject: [Buildroot] [git commit] package/ti-sgx-km: properly handle legacy for removed options Message-ID: <20230206133023.7A68283C4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2661fe63990386cf2626ce1dd26919346ca86c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "c38b5566fe package/ti-sgx-{km, um, demos}: bump to latest TI version", added in release 2020.02, removed some options that were previously renamed in release 2018.05. Update the legacy entry for 2018.05 and add the corresponding legacy entries for 2020.02. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 66 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 22d7fbe4be..42dbe6ef5a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -1759,6 +1759,35 @@ config BR2_PACKAGE_RPI_USERLAND_START_VCFILED help The vcfiled support was removed upstream. +config BR2_PACKAGE_TI_SGX_KM_AM335X + bool "ti-sgx-km AM335X option removed" + select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM437X + bool "ti-sgx-km AM437X option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM4430 + bool "ti-sgx-km AM4430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM5430 + bool "ti-sgx-km AM5430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + comment "Legacy options removed in 2019.11" config BR2_PACKAGE_OPENVMTOOLS_PROCPS @@ -2732,45 +2761,34 @@ config BR2_PACKAGE_MEDIAART_BACKEND_QT BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_QT -# Note: BR2_PACKAGE_TI_SGX_AM335X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM335X - bool "ti-sgx-km AM335X option renamed" + bool "ti-sgx-km AM335X option removed" select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM335X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM335X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM437X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM437X - bool "ti-sgx-km AM437X option renamed" + bool "ti-sgx-km AM437X option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM437X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM437X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM4430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM4430 - bool "ti-sgx-km AM4430 option renamed" + bool "ti-sgx-km AM4430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM4430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM4430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM5430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM5430 - bool "ti-sgx-km AM5430 option renamed" + bool "ti-sgx-km AM5430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM5430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM5430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. config BR2_PACKAGE_JANUS_AUDIO_BRIDGE bool "janus-gateway audio-bridge option renamed" From peter at korsgaard.com Mon Feb 6 13:27:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:27:07 +0100 Subject: [Buildroot] [git commit] package/openjdk: properly handle legacy for renamed options Message-ID: <20230206133023.8A2E683C4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a97a4a74aa993b09b958639e2276e7f5cf7a75d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "a610bf9967 package/openjdk{-bin}: bump version to 17.0.1+12" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2021.11, following the example described in the beginning of the file. Cc: Tudor Holton Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/openjdk/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 42dbe6ef5a..53fe2f0b97 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -832,18 +832,20 @@ comment "Legacy options removed in 2021.11" config BR2_OPENJDK_VERSION_LTS bool "OpenJDK LTS version was renamed to OpenJDK 11" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_11 help The LTS version option was renamed to OpenJDK 11 to make it clear what LTS version is. +# Note: BR2_OPENJDK_VERSION_LTS is still referenced from +# package/openjdk/Config.in config BR2_OPENJDK_VERSION_LATEST bool "OpenJDK latest version (16.x) was removed" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_17 help OpenJDK 16.x is no longer mainted, so the option has been removed. Use OpenJDK 17.x instead. +# Note: BR2_OPENJDK_VERSION_LATEST is still referenced from +# package/openjdk/Config.in config BR2_PACKAGE_MPD_TIDAL bool "mpd tidal option removed" diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 8fbe51a27f..24a56e6b84 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -57,6 +57,8 @@ if BR2_PACKAGE_OPENJDK choice prompt "openjdk version" + default BR2_PACKAGE_OPENJDK_VERSION_11 if BR2_OPENJDK_VERSION_LTS # legacy + default BR2_PACKAGE_OPENJDK_VERSION_17 if BR2_OPENJDK_VERSION_LATEST # legacy default BR2_PACKAGE_OPENJDK_VERSION_17 help Select the version of OpenJDK you wish to use. From peter at korsgaard.com Mon Feb 6 13:28:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:28:08 +0100 Subject: [Buildroot] [git commit] package/sunxi-mali-utgard: properly handle legacy for renamed options Message-ID: <20230206133023.9A8CB83C4D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efc223abd4fe764f8af8238aec67e8cb700db45e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "6a7a652b14 package/sunxi-mali-utgard: rename from sunxi-mali-mainline" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2022.02, following the example described in the beginning of the file. Cc: Giulio Benetti Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/sunxi-mali-utgard/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 53fe2f0b97..4bfebe3f89 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -761,20 +761,22 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 bool "sunxi-mali-mainline-r6p2 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 bool "sunxi-mali-mainline-r8p1 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_QT5WEBKIT_EXAMPLES bool "qt5webkit-examples removed" diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in index ff49ea03f1..59ac21f5ab 100644 --- a/package/sunxi-mali-utgard/Config.in +++ b/package/sunxi-mali-utgard/Config.in @@ -20,6 +20,8 @@ config BR2_PACKAGE_PROVIDES_LIBGLES choice prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 # legacy + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 # legacy default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help Select the version of the userspace module. From peter at korsgaard.com Mon Feb 6 13:28:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:28:33 +0100 Subject: [Buildroot] [git commit] package/rpi-userland: fix typo for BR2_aarch64 Message-ID: <20230206133023.A7E1B83C4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3727229222f23d151a4991ef3db451df6362ce83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit "59adb53c4c package/rpi-userland: add support for aarch64" introduced a typo in the condition that shows a comment in menuconfig. Fix the typo: BR2_arch64 -> BR2_aarch64 Cc: Mahyar Koshkouei Cc: Tim Gover Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/rpi-userland/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in index cfb472808b..4219bdb9c4 100644 --- a/package/rpi-userland/Config.in +++ b/package/rpi-userland/Config.in @@ -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 || BR2_arch64 + depends on BR2_arm || BR2_aarch64 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS From peter at korsgaard.com Mon Feb 6 13:34:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 14:34:56 +0100 Subject: [Buildroot] [PATCH v2 5/7] package/python-wsproto: new package In-Reply-To: <20230129035232.2480871-5-james.hilliard1@gmail.com> (James Hilliard's message of "Sat, 28 Jan 2023 20:52:30 -0700") References: <20230129035232.2480871-1-james.hilliard1@gmail.com> <20230129035232.2480871-5-james.hilliard1@gmail.com> Message-ID: <87wn4u9atb.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: Hi, > +++ b/package/python-wsproto/Config.in > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_PYTHON_WSPROTO > + bool "python-wsproto" > + select BR2_PACKAGE_PYTHON_H11 # runtime Something missing - We do not have a python-h11 package? -- Bye, Peter Korsgaard From angelo at amarulasolutions.com Mon Feb 6 13:34:44 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 14:34:44 +0100 Subject: [Buildroot] [PATCH v1] package/qt6: bump version to 6.4.2 In-Reply-To: <20230107153156.26347-1-ps.report@gmx.net> References: <20230107153156.26347-1-ps.report@gmx.net> Message-ID: On Sat, Jan 7, 2023 at 4:32 PM Peter Seiderer wrote: > For details see [1] and [2]. > > [1] > https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.1/release-note.md > [2] > https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.2/release-note.md > > Signed-off-by: Peter Seiderer > Tested-by: Angelo Compagnucci > --- > package/qt6/qt6.mk | 2 +- > package/qt6/qt6base/qt6base.hash | 4 ++-- > package/qt6/qt6serialport/qt6serialport.hash | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk > index 575b2f826c..431bb8c9d3 100644 > --- a/package/qt6/qt6.mk > +++ b/package/qt6/qt6.mk > @@ -5,7 +5,7 @@ > > ################################################################################ > > QT6_VERSION_MAJOR = 6.4 > -QT6_VERSION = $(QT6_VERSION_MAJOR).0 > +QT6_VERSION = $(QT6_VERSION_MAJOR).2 > QT6_SOURCE_TARBALL_PREFIX = everywhere-src > QT6_SITE = > https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules > > diff --git a/package/qt6/qt6base/qt6base.hash > b/package/qt6/qt6base/qt6base.hash > index 6544a371c6..0c722ccded 100644 > --- a/package/qt6/qt6base/qt6base.hash > +++ b/package/qt6/qt6base/qt6base.hash > @@ -1,5 +1,5 @@ > -# Hash from: > https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtbase-everywhere-src-6.4.0.tar.xz.sha256 > -sha256 > > cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d > qtbase-everywhere-src-6.4.0.tar.xz > +# Hash from: > https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 > +sha256 > > a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d > qtbase-everywhere-src-6.4.2.tar.xz > > # Hashes for license files > sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb > LICENSES/Apache-2.0.txt > diff --git a/package/qt6/qt6serialport/qt6serialport.hash > b/package/qt6/qt6serialport/qt6serialport.hash > index 54a45681fa..1eaa3d6150 100644 > --- a/package/qt6/qt6serialport/qt6serialport.hash > +++ b/package/qt6/qt6serialport/qt6serialport.hash > @@ -1,5 +1,5 @@ > -# Hash from: > https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtserialport-everywhere-src-6.4.0.tar.xz.sha256 > -sha256 > > f148cc9e87ce2228e82bff7a64d9521339ece66c4c66aa43b91bac614f4a4483 > qtserialport-everywhere-src-6.4.0.tar.xz > +# Hash from: > https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialport-everywhere-src-6.4.2.tar.xz.sha256 > +sha256 > > 336d95919037800184b3c3de8ccb6f62954b20f3756c05adce8d5010504340fa > qtserialport-everywhere-src-6.4.2.tar.xz > > # Hashes for license files: > sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce > LICENSES/BSD-3-Clause.txt > -- > 2.39.0 > > _______________________________________________ > 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 giulio.benetti at benettiengineering.com Mon Feb 6 13:26:49 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 6 Feb 2023 14:26:49 +0100 Subject: [Buildroot] [PATCH 2/2] package/postgresql: work around gcc bug 43744 In-Reply-To: <20230206122130.25893d8a@windsurf> References: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> <20230202154239.325711-2-giulio.benetti@benettiengineering.com> <20230206122130.25893d8a@windsurf> Message-ID: <01702fdc-51b5-dcca-d822-e04d326dbd17@benettiengineering.com> Hello Thomas, On 06/02/23 12:21, Thomas Petazzoni via buildroot wrote: > Hello Giulio, > > On Thu, 2 Feb 2023 16:42:39 +0100 > Giulio Benetti wrote: > >> Package postgresql suffers from gcc bug 43744 other than 85180, so let's >> work around disabling compiler optimization for this gcc bug too. >> >> Fixes: >> http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a >> >> Signed-off-by: Giulio Benetti >> --- >> package/postgresql/postgresql.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Applied to master, thanks. However, you should have resent a v2 of this > patch together with the v2 of the first patch. Never resend partial > series, but instead always, always, always, always, always, always, > always, always, always, always, always, always, always resend a full > series, even if only one patch changed. Sending partial series is > extremely confusing for the people reviewing/applying the patches. You've pointed me this recently too :-/ Sorry! -- Giulio Benetti Benetti Engineering sas From angelo at amarulasolutions.com Mon Feb 6 13:38:36 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 14:38:36 +0100 Subject: [Buildroot] [PATCH v3] package/qt6/qt6serialbus: new package Message-ID: <20230206133836.412572-1-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- v2: * LICENSE/LICENSE_FILES: one per line * Selecting BR2_PACKAGE_QT6BASE_NETWORK to make the package compile, fixes: "Failed to find required Qt component "Network". v3: * Bumped to version 6.4.2 --- package/qt6/Config.in | 1 + package/qt6/qt6serialbus/Config.in | 15 ++++++++ package/qt6/qt6serialbus/qt6serialbus.hash | 11 ++++++ package/qt6/qt6serialbus/qt6serialbus.mk | 45 ++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 package/qt6/qt6serialbus/Config.in create mode 100644 package/qt6/qt6serialbus/qt6serialbus.hash create mode 100644 package/qt6/qt6serialbus/qt6serialbus.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 4b2b9a1174..b0cc008df5 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -39,6 +39,7 @@ menuconfig BR2_PACKAGE_QT6 if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" endif diff --git a/package/qt6/qt6serialbus/Config.in b/package/qt6/qt6serialbus/Config.in new file mode 100644 index 0000000000..1f24310e61 --- /dev/null +++ b/package/qt6/qt6serialbus/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_QT6SERIALBUS + bool "qt6serialbus" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD + select BR2_PACKAGE_QT6SERIALPORT + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6serialbus module. + + https://doc.qt.io/qt-6/qtserialbus-index.html + +comment "qt6serialbus needs headers >= 3.6" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash new file mode 100644 index 0000000000..be01f13363 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialbus-everywhere-src-6.4.2.tar.xz.sha256 +sha256 604013657c7327899aa50748deb4bcb5e545ab37ff4964795b9e6f617d48bf1b qtserialbus-everywhere-src-6.4.2.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.mk b/package/qt6/qt6serialbus/qt6serialbus.mk new file mode 100644 index 0000000000..fe69119a58 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qt6serialbus +# +################################################################################ + +QT6SERIALBUS_VERSION = $(QT6_VERSION) +QT6SERIALBUS_SITE = $(QT6_SITE) +QT6SERIALBUS_SOURCE = qtserialbus-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALBUS_VERSION).tar.xz +QT6SERIALBUS_INSTALL_STAGING = YES +QT6SERIALBUS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SERIALBUS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6SERIALBUS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6SERIALBUS_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SERIALBUS_DEPENDENCIES = \ + qt6serialport + +define QT6SERIALBUS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) --prefix $(STAGING_DIR)/usr +endef + +define QT6SERIALBUS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) --prefix $(TARGET_DIR)/usr +endef + +$(eval $(cmake-package)) -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Feb 6 13:31:49 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 6 Feb 2023 14:31:49 +0100 Subject: [Buildroot] [PATCH] package/rtl8192eu: disable package for s390x architecture Message-ID: <20230206133149.910237-1-giulio.benetti@benettiengineering.com> s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this package for this architecture. Fixes: http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2/ Signed-off-by: Giulio Benetti --- package/rtl8192eu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rtl8192eu/Config.in b/package/rtl8192eu/Config.in index 4d71b711c3..969ba090ce 100644 --- a/package/rtl8192eu/Config.in +++ b/package/rtl8192eu/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTL8192EU bool "rtl8192eu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help A standalone driver for the RTL8192EU USB Wi-Fi adapter. @@ -10,4 +11,5 @@ config BR2_PACKAGE_RTL8192EU https://github.com/clnhub/rtl8192eu-linux comment "rtl8192eu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL -- 2.34.1 From peter at korsgaard.com Mon Feb 6 13:40:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:40:32 +0100 Subject: [Buildroot] [git commit] Config.in.legacy: select BR2_LEGACY from _XF86_INPUT_KEYBOARD Message-ID: <20230206134318.D4F4483C4D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00410ab668833d822f645fffd782ce11253457b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 1100ead7b318 (package/x11r7/xdriver_xf86-input-keyboard: remove package) added a legacy symbol for BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD, but forgot to select BR2_LEGACY. Fix that. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 1 + 1 file changed, 1 insertion(+) diff --git a/Config.in.legacy b/Config.in.legacy index 4bfebe3f89..191a209eeb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -210,6 +210,7 @@ config BR2_PACKAGE_QEMU_CUSTOM_TARGETS_WRAP config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD bool "xf86-input-keyboard removed" + select BR2_LEGACY help The X.org keyboard input driver no longer support Linux. From james.hilliard1 at gmail.com Mon Feb 6 13:48:38 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 06:48:38 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-h11: new package Message-ID: <20230206134838.3397457-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-h11/Config.in | 7 +++++++ package/python-h11/python-h11.hash | 5 +++++ package/python-h11/python-h11.mk | 14 ++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/python-h11/Config.in create mode 100644 package/python-h11/python-h11.hash create mode 100644 package/python-h11/python-h11.mk diff --git a/DEVELOPERS b/DEVELOPERS index 97c28fbdd8..5d788ecebf 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1381,6 +1381,7 @@ F: package/python-flatbuffers/ F: package/python-fonttools/ F: package/python-frozenlist/ F: package/python-greenlet/ +F: package/python-h11/ F: package/python-hatchling/ F: package/python-hatch-fancy-pypi-readme/ F: package/python-hatch-vcs/ diff --git a/package/Config.in b/package/Config.in index 7817b51fc2..b6211f1102 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1071,6 +1071,7 @@ menu "External python modules" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" source "package/python-gunicorn/Config.in" + source "package/python-h11/Config.in" source "package/python-h2/Config.in" source "package/python-hiredis/Config.in" source "package/python-hpack/Config.in" diff --git a/package/python-h11/Config.in b/package/python-h11/Config.in new file mode 100644 index 0000000000..736620d782 --- /dev/null +++ b/package/python-h11/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_H11 + bool "python-h11" + help + A pure-Python, bring-your-own-I/O implementation of + HTTP/1.1. + + https://github.com/python-hyper/h11 diff --git a/package/python-h11/python-h11.hash b/package/python-h11/python-h11.hash new file mode 100644 index 0000000000..0c65a11d00 --- /dev/null +++ b/package/python-h11/python-h11.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/h11/json +md5 84c33fc0aa1f868928114c4d02c43dc2 h11-0.14.0.tar.gz +sha256 8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d h11-0.14.0.tar.gz +# Locally computed sha256 checksums +sha256 37db5bb85926db28a427a25867f10b1232003aea1be69ccb851138adb8e6f361 LICENSE.txt diff --git a/package/python-h11/python-h11.mk b/package/python-h11/python-h11.mk new file mode 100644 index 0000000000..d7dca5244b --- /dev/null +++ b/package/python-h11/python-h11.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-h11 +# +################################################################################ + +PYTHON_H11_VERSION = 0.14.0 +PYTHON_H11_SOURCE = h11-$(PYTHON_H11_VERSION).tar.gz +PYTHON_H11_SITE = https://files.pythonhosted.org/packages/f5/38/3af3d3633a34a3316095b39c8e8fb4853a28a536e55d347bd8d8e9a14b03 +PYTHON_H11_SETUP_TYPE = setuptools +PYTHON_H11_LICENSE = MIT +PYTHON_H11_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 6 13:49:29 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 06:49:29 -0700 Subject: [Buildroot] [PATCH v2 5/7] package/python-wsproto: new package In-Reply-To: <87wn4u9atb.fsf@dell.be.48ers.dk> References: <20230129035232.2480871-1-james.hilliard1@gmail.com> <20230129035232.2480871-5-james.hilliard1@gmail.com> <87wn4u9atb.fsf@dell.be.48ers.dk> Message-ID: On Mon, Feb 6, 2023 at 6:34 AM Peter Korsgaard wrote: > > >>>>> "James" == James Hilliard writes: > > Hi, > > > +++ b/package/python-wsproto/Config.in > > @@ -0,0 +1,7 @@ > > +config BR2_PACKAGE_PYTHON_WSPROTO > > + bool "python-wsproto" > > + select BR2_PACKAGE_PYTHON_H11 # runtime > > Something missing - We do not have a python-h11 package? Hmm, yeah, not sure why that didn't get sent before: https://patchwork.ozlabs.org/project/buildroot/patch/20230206134838.3397457-1-james.hilliard1 at gmail.com/ > > -- > Bye, Peter Korsgaard From angelo at amarulasolutions.com Mon Feb 6 14:21:41 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 6 Feb 2023 15:21:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt6: Add qmake functionality In-Reply-To: <20221103190446.3574423-1-jesseevg@gmail.com> References: <20221103190446.3574423-1-jesseevg@gmail.com> Message-ID: On Thu, Nov 3, 2022 at 8:05 PM Jesse Van Gavere wrote: > The qmake functionality had been missing due to the new host/target > build requirement, to get it working the main parts of the qt5 qmake > has been kept, we're still making our own device spec which we use to > run qmake with along with passing some additional device options for our > flags/cross-compiler the biggest difference is that where previously > qt.conf was used to fixup per-paths builds, this is now always > created with changed contents so qmake looks at the correct target > directories. > > A big thanks to Angelo Compagnucci for the encouragement and testing. > > Signed-off-by: Jesse Van Gavere > Tested-by: Angelo Compagnucci > --- > package/qt6/qt6.mk | 12 ++++++++++ > package/qt6/qt6base/qmake.conf.in | 36 +++++++++++++++++++++++++++++ > package/qt6/qt6base/qplatformdefs.h | 1 + > package/qt6/qt6base/qt.conf.in | 7 ++++++ > package/qt6/qt6base/qt6base.mk | 18 +++++++++++++++ > 5 files changed, 74 insertions(+) > create mode 100644 package/qt6/qt6base/qmake.conf.in > create mode 100644 package/qt6/qt6base/qplatformdefs.h > create mode 100644 package/qt6/qt6base/qt.conf.in > > diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk > index 575b2f826c..bd8fb0ab51 100644 > --- a/package/qt6/qt6.mk > +++ b/package/qt6/qt6.mk > @@ -10,3 +10,15 @@ QT6_SOURCE_TARBALL_PREFIX = everywhere-src > QT6_SITE = > https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules > > include $(sort $(wildcard package/qt6/*/*.mk)) > + > +# The file "qt.conf" can be used to override the hard-coded paths that are > +# compiled into the Qt library. We need it to make "qmake" relocatable due > +# to the host/target build and tweak the per-package install pathes > +define QT6_INSTALL_QT_CONF > + rm -f $(HOST_DIR)/bin/qt.conf > + sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" > \ > + $(QT6BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf > +endef > + > +# Variable for other Qt applications to use > +QT6_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ > diff --git a/package/qt6/qt6base/qmake.conf.in b/package/qt6/qt6base/ > qmake.conf.in > new file mode 100644 > index 0000000000..ebb8497d2d > --- /dev/null > +++ b/package/qt6/qt6base/qmake.conf.in > @@ -0,0 +1,36 @@ > +# Qt6 has a mechanism to support "device" profiles, so that people can > +# specify the compiler, compiler flags and so on for a specific device. > + > +# We leverage this mechanism in the Buildroot packaging of qt6 to > +# simplify cross-compilation: we have our own "device" definition, which > +# allows us to easily pass the cross-compiler paths and flags from our > +# qt6.mk. > + > +include(../common/linux_device_pre.conf) > + > +# modifications to g++-unix.conf > +QMAKE_CC = $${CROSS_COMPILE}gcc > +QMAKE_CXX = $${CROSS_COMPILE}g++ > +QMAKE_LINK = $${CROSS_COMPILE}g++ > + > +# modifications to gcc-base.conf > +QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} > +QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} > +# Remove all optimisation flags, we really only want our own. > +QMAKE_CFLAGS_OPTIMIZE = > +QMAKE_CFLAGS_OPTIMIZE_DEBUG = > +QMAKE_CFLAGS_OPTIMIZE_FULL = > +QMAKE_CFLAGS_OPTIMIZE_SIZE = > +QMAKE_CFLAGS_DEBUG = > +QMAKE_CXXFLAGS_DEBUG = > +QMAKE_CFLAGS_RELEASE = > +QMAKE_CXXFLAGS_RELEASE = > +CONFIG += nostrip > + > +QMAKE_LIBS += -lrt -lpthread -ldl > +QMAKE_CFLAGS_ISYSTEM = > + > + at EGLFS_DEVICE@ > + > +include(../common/linux_device_post.conf) > +load(qt_config) > diff --git a/package/qt6/qt6base/qplatformdefs.h > b/package/qt6/qt6base/qplatformdefs.h > new file mode 100644 > index 0000000000..99e9a27923 > --- /dev/null > +++ b/package/qt6/qt6base/qplatformdefs.h > @@ -0,0 +1 @@ > +#include "../../linux-g++/qplatformdefs.h" > diff --git a/package/qt6/qt6base/qt.conf.in b/package/qt6/qt6base/ > qt.conf.in > new file mode 100644 > index 0000000000..4842bcb462 > --- /dev/null > +++ b/package/qt6/qt6base/qt.conf.in > @@ -0,0 +1,7 @@ > +[Paths] > +Prefix=/usr > +HostPrefix=@@HOST_DIR@@ > +HostData=../target/usr > +Sysroot=@@STAGING_DIR@@ > +SysrootifyPrefix=true > +TargetSpec=devices/linux-buildroot-g++ > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/ > qt6base.mk > index b7ee6037f3..9e2f884e94 100644 > --- a/package/qt6/qt6base/qt6base.mk > +++ b/package/qt6/qt6base/qt6base.mk > @@ -35,6 +35,9 @@ QT6BASE_CONF_OPTS = \ > -DFEATURE_system_zlib=ON \ > -DFEATURE_system_libb2=ON > > +QT6BASE_CFLAGS = $(TARGET_CFLAGS) > +QT6BASE_CXXFLAGS = $(TARGET_CXXFLAGS) > + > # x86 optimization options. While we have a BR2_X86_CPU_HAS_AVX512, it > # is not clear yet how it maps to all the avx512* options of Qt, so we > # for now keeps them disabled. > @@ -215,5 +218,20 @@ else > QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF > endif > > +define QT6BASE_MAKE_BR_SPEC > + mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/ > + sed 's/@EGLFS_DEVICE@/$(QT6BASE_EGLFS_DEVICE)/g' \ > + $(QT6BASE_PKGDIR)/qmake.conf.in > \ > + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf > + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ > + $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h > +endef > + > +QT6BASE_CONF_OPTS += > -DQT_QMAKE_DEVICE_OPTIONS=CROSS_COMPILE="$(TARGET_CROSS)";BR_COMPILER_CFLAGS="$(QT6BASE_CFLAGS)";BR_COMPILER_CXXFLAGS="$(QT6BASE_CXX_FLAGS)" > + > +QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC > + > +QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF > + > $(eval $(cmake-package)) > $(eval $(host-cmake-package)) > -- > 2.34.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 peter at korsgaard.com Mon Feb 6 14:37:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 15:37:43 +0100 Subject: [Buildroot] [PATCH 1/3] package/freescale-imx/imx-gpu-viv: drop X11 output In-Reply-To: <20230114230028.46833cae@windsurf> (Thomas Petazzoni via buildroot's message of "Sat, 14 Jan 2023 23:00:28 +0100") References: <20230114230028.46833cae@windsurf> Message-ID: <87sffi97wo.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: Hi, >> It contains libraries and headers for GLES, OpenCL, and >> - OpenVG. It also contains a DRI plugin for X11. It also >> - contains a plugin for DirectFB-1.4.0, but that doesn't work >> + OpenVG. It also contains a plugin for DirectFB-1.4.0, >> + but that doesn't work >> together with buildroot's DirectFB version. > This paragraph should have been rewrapped after your change. > Other than that, looks good so I've applied. Of course, it might be > surprising for people who might be using X11 with OpenGL support on > i.MX platforms... but we're simply following the choice made by > upstream. I see we still have xf86-video-imx-viv which depends on the now removed BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 symbol, so I guess we should remove that package as well. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 6 14:54:38 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 15:54:38 +0100 Subject: [Buildroot] [git commit] utils/genrandconfig: migrate to asyncio subprocess calls Message-ID: <20230206145510.8122883C54@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=579b65b55234d298570e5191efb509905933eef5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since genrandconfig no longer appears to support python2 we can migrate the subprocess calls to use asyncio variants. This has the advantage of allowing for runners like autobuild-run to integrate directly into genrandconfig by calling the asyncio gen_config using importlib instead of having to run genrandconfig as a subprocess. Using asyncio is advantageous here as it eliminates the requirement for the runner to deal with blocking subprocess calls(by having to use threading for example). Also cleanup some unused functions/python2 compatibility shims. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- utils/genrandconfig | 85 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 29 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index b4ebb9a9be..b3576f8a51 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -19,24 +19,19 @@ # This script generates a random configuration for testing Buildroot. from binascii import hexlify -import contextlib +import asyncio import csv import os from random import randint -import subprocess import sys import traceback from distutils.version import StrictVersion import platform -if sys.hexversion >= 0x3000000: - import urllib.request as _urllib +if sys.version_info < (3, 8): + from asyncio import coroutine else: - import urllib2 as _urllib - - -def urlopen_closing(uri): - return contextlib.closing(_urllib.urlopen(uri)) + from types import coroutine class SystemInfo: @@ -65,6 +60,7 @@ class SystemInfo: # -- return None + @coroutine def has(self, prog): """Checks whether a program is available. Lazily evaluates missing entries. @@ -80,11 +76,13 @@ class SystemInfo: have_it = self.find_prog(prog) # java[c] needs special care if have_it and prog in ('java', 'javac'): - with open(os.devnull, "w") as devnull: - if subprocess.call("%s -version | grep gcj" % prog, - shell=True, - stdout=devnull, stderr=devnull) != 1: - have_it = False + proc = yield from asyncio.create_subprocess_shell( + "%s -version | grep gcj" % prog, + stdout=asyncio.subprocess.DEVNULL, + stderr=asyncio.subprocess.DEVNULL) + ret = yield from proc.wait() + if ret != 1: + have_it = False # -- self.progs[prog] = have_it return have_it @@ -161,6 +159,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): return configs + at coroutine def is_toolchain_usable(configfile, config): """Check if the toolchain is actually usable.""" @@ -181,7 +180,11 @@ def is_toolchain_usable(configfile, config): 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: - ldd_version_output = subprocess.check_output(['ldd', '--version']) + proc = yield from asyncio.create_subprocess_exec( + 'ldd', '--version', stdout=asyncio.subprocess.PIPE) + ldd_version_output, _ = yield from proc.communicate() + if proc.returncode: + return False glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] if StrictVersion('2.14') > StrictVersion(glibc_version): print("WARN: ignoring the Linaro ARM toolchains because too old host glibc", file=sys.stderr) @@ -190,6 +193,7 @@ def is_toolchain_usable(configfile, config): return True + at coroutine def fixup_config(sysinfo, configfile): """Finalize the configuration and reject any problematic combinations @@ -206,7 +210,8 @@ def fixup_config(sysinfo, configfile): BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not sysinfo.has("java"): + has_java = yield from sysinfo.has("java") + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: return False # The ctng toolchain is affected by PR58854 if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ @@ -649,6 +654,7 @@ def fixup_config(sysinfo, configfile): return True + at coroutine def gen_config(args): """Generate a new random configuration @@ -707,7 +713,8 @@ def gen_config(args): # Randomly enable BR2_REPRODUCIBLE 10% of times # also enable tar filesystem images for testing - if sysinfo.has("diffoscope") and randint(0, 10) == 0: + has_diffoscope = yield from sysinfo.has("diffoscope") + if has_diffoscope and randint(0, 10) == 0: configlines.append("BR2_REPRODUCIBLE=y\n") configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") @@ -721,10 +728,14 @@ def gen_config(args): with open(configfile, "w+") as configf: configf.writelines(configlines) - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "olddefconfig"]) + proc = yield from asyncio.create_subprocess_exec( + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") + ret = yield from proc.wait() + if ret: + return ret - if not is_toolchain_usable(configfile, toolchainconfig): + toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) + if not toolchain_usable: return 2 # Now, generate the random selection of packages, and fixup @@ -744,19 +755,31 @@ def gen_config(args): "KCONFIG_PROBABILITY=%d" % randint(1, 20), "randpackageconfig" if args.toolchains_csv else "randconfig" ] - subprocess.check_call(make_rand) + proc = yield from asyncio.create_subprocess_exec(*make_rand) + ret = yield from proc.wait() + if ret: + return ret - if fixup_config(sysinfo, configfile): + ret = yield from fixup_config(sysinfo, configfile) + if ret: break - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "olddefconfig"]) + proc = yield from asyncio.create_subprocess_exec( + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") + ret = yield from proc.wait() + if ret: + return ret - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "savedefconfig"]) + proc = yield from asyncio.create_subprocess_exec( + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") + ret = yield from proc.wait() + if ret: + return ret - return subprocess.call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "dependencies"]) + proc = yield from asyncio.create_subprocess_exec( + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") + ret = yield from proc.wait() + return ret if __name__ == '__main__': @@ -788,7 +811,11 @@ if __name__ == '__main__': args.outputdir = os.path.abspath(args.outputdir) try: - ret = gen_config(args) + if sys.version_info < (3, 7): + loop = asyncio.get_event_loop() + ret = loop.run_until_complete(gen_config(args)) + else: + ret = asyncio.run(gen_config(args)) except Exception: traceback.print_exc() parser.exit(1) From peter at korsgaard.com Mon Feb 6 14:56:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 15:56:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-h11: new package In-Reply-To: <20230206134838.3397457-1-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 6 Feb 2023 06:48:38 -0700") References: <20230206134838.3397457-1-james.hilliard1@gmail.com> Message-ID: <87o7q69723.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 6 14:56:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 15:56:50 +0100 Subject: [Buildroot] [PATCH 1/3] package/freescale-imx/imx-gpu-viv: drop X11 output In-Reply-To: <87sffi97wo.fsf@dell.be.48ers.dk> References: <20230114230028.46833cae@windsurf> <87sffi97wo.fsf@dell.be.48ers.dk> Message-ID: <20230206155650.79bafe2c@windsurf> On Mon, 06 Feb 2023 15:37:43 +0100 Peter Korsgaard wrote: > I see we still have xf86-video-imx-viv which depends on the now removed > BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 symbol, so I guess we should remove > that package as well. Gah, I did not notice that: indeed it should be removed as well. Daniel, will you cook some patch doing that? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Mon Feb 6 15:05:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 16:05:17 +0100 Subject: [Buildroot] [next 17/25] package/gitlab-runner: ensure use of LIBCURL_OPENSSL In-Reply-To: <87v8kf9g9l.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Mon, 06 Feb 2023 12:37:10 +0100") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-18-ricardo.martincoski@gmail.com> <87v8kf9g9l.fsf@dell.be.48ers.dk> Message-ID: <87k00u96mq.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Ricardo" == Ricardo Martincoski writes: >> Currently this minimal config is accepted while it shouldn't: >> BR2_x86_i686=y >> BR2_PACKAGE_BEARSSL=y >> BR2_PACKAGE_LIBCURL_BEARSSL=y >> BR2_PACKAGE_GITLAB_RUNNER=y >> BR2_PACKAGE_GITLAB_RUNNER selects BR2_PACKAGE_LIBCURL_OPENSSL. >> Kconfig does not enforce a select when the symbol selected is part of a >> choice. See similar explanation on [1] and [2]. >> Doing something similar to [3] and depending on the choice option >> instead of selecting it would create a Kconfig recursive dependency. >> Just dropping the ineffective select would keep the above defconfig >> snippet as an accepted one. >> Adding a comment to the menu, i.e.: >> comment "gitlab-runner must use BR2_PACKAGE_LIBCURL_OPENSSL" >> depends on BR2_PACKAGE_GITLAB_RUNNER >> depends on !BR2_PACKAGE_LIBCURL_OPENSSL >> could improve user experience but it also keeps the above defconfig >> snippet as an accepted one. >> So bail out the build when gitlab-runner is enabled and libcurl-openssl >> is not selected, similar to what is done in [4]. >> [1] "a44b1c1405 legacy: update the BR2_PREFER_STATIC_LIB option" >> [2] "b1d5aa1bc2 package/qwt: Fix selecting OpenGL support in qt4" >> [3] "9fc652a373 package/libmodsecurity: needs dynamic library with >> libcurl and mbedtls" >> [4] "fda53f0791 package/Makefile.in: add detection for the lack of C >> library" >> Cc: Marcin Niestroj >> Cc: Romain Naour >> Signed-off-by: Ricardo Martincoski > The change as such is fine, but why does gitlab-runner really need the > curl binary to use the openssl backend? Perhaps it is just about curl > having HTTPS support? A that is presumably what was meant I have instead changed it to use the BR2_PACKAGE_LIBCURL_FORCE_TLS option. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Mon Feb 6 15:08:47 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 08:08:47 -0700 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: switch to async/await format Message-ID: <20230206150847.3621475-1-james.hilliard1@gmail.com> This requires python 3.6 or newer but is a bit cleaner. Signed-off-by: James Hilliard --- utils/genrandconfig | 62 +++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index b3576f8a51..8947898d88 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -28,11 +28,6 @@ import traceback from distutils.version import StrictVersion import platform -if sys.version_info < (3, 8): - from asyncio import coroutine -else: - from types import coroutine - class SystemInfo: DEFAULT_NEEDED_PROGS = ["make", "git", "gcc", "timeout"] @@ -60,8 +55,7 @@ class SystemInfo: # -- return None - @coroutine - def has(self, prog): + async def has(self, prog): """Checks whether a program is available. Lazily evaluates missing entries. @@ -76,11 +70,11 @@ class SystemInfo: have_it = self.find_prog(prog) # java[c] needs special care if have_it and prog in ('java', 'javac'): - proc = yield from asyncio.create_subprocess_shell( + proc = await asyncio.create_subprocess_shell( "%s -version | grep gcj" % prog, stdout=asyncio.subprocess.DEVNULL, stderr=asyncio.subprocess.DEVNULL) - ret = yield from proc.wait() + ret = await proc.wait() if ret != 1: have_it = False # -- @@ -159,8 +153,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): return configs - at coroutine -def is_toolchain_usable(configfile, config): +async def is_toolchain_usable(configfile, config): """Check if the toolchain is actually usable.""" with open(configfile) as configf: @@ -180,9 +173,9 @@ def is_toolchain_usable(configfile, config): 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( 'ldd', '--version', stdout=asyncio.subprocess.PIPE) - ldd_version_output, _ = yield from proc.communicate() + ldd_version_output, _ = await proc.communicate() if proc.returncode: return False glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] @@ -193,8 +186,7 @@ def is_toolchain_usable(configfile, config): return True - at coroutine -def fixup_config(sysinfo, configfile): +async def fixup_config(sysinfo, configfile): """Finalize the configuration and reject any problematic combinations This function returns 'True' when the configuration has been @@ -210,8 +202,7 @@ def fixup_config(sysinfo, configfile): BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' - has_java = yield from sysinfo.has("java") - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not await sysinfo.has("java"): return False # The ctng toolchain is affected by PR58854 if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ @@ -654,8 +645,7 @@ def fixup_config(sysinfo, configfile): return True - at coroutine -def gen_config(args): +async def gen_config(args): """Generate a new random configuration This function generates the configuration, by choosing a random @@ -713,8 +703,7 @@ def gen_config(args): # Randomly enable BR2_REPRODUCIBLE 10% of times # also enable tar filesystem images for testing - has_diffoscope = yield from sysinfo.has("diffoscope") - if has_diffoscope and randint(0, 10) == 0: + if await sysinfo.has("diffoscope") and randint(0, 10) == 0: configlines.append("BR2_REPRODUCIBLE=y\n") configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") @@ -728,14 +717,13 @@ def gen_config(args): with open(configfile, "w+") as configf: configf.writelines(configlines) - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") - ret = yield from proc.wait() + ret = await proc.wait() if ret: return ret - toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) - if not toolchain_usable: + if not await is_toolchain_usable(configfile, toolchainconfig): return 2 # Now, generate the random selection of packages, and fixup @@ -749,37 +737,33 @@ def gen_config(args): file=sys.stderr) return 1 bounded_loop -= 1 - make_rand = [ + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), "KCONFIG_PROBABILITY=%d" % randint(1, 20), - "randpackageconfig" if args.toolchains_csv else "randconfig" - ] - proc = yield from asyncio.create_subprocess_exec(*make_rand) - ret = yield from proc.wait() + "randpackageconfig" if args.toolchains_csv else "randconfig") + ret = await proc.wait() if ret: return ret - ret = yield from fixup_config(sysinfo, configfile) - if ret: + if await fixup_config(sysinfo, configfile): break - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") - ret = yield from proc.wait() + ret = await proc.wait() if ret: return ret - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") - ret = yield from proc.wait() + ret = await proc.wait() if ret: return ret - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") - ret = yield from proc.wait() - return ret + return await proc.wait() if __name__ == '__main__': -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 6 15:12:53 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 08:12:53 -0700 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: allow overriding KCONFIG_PROBABILITY Message-ID: <20230206151253.3629954-1-james.hilliard1@gmail.com> Tweaking this variable should allow us to get better coverage of packages with larger dependency trees. Signed-off-by: James Hilliard --- Changes v1 -> v2: - rebase --- utils/genrandconfig | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index b3576f8a51..830b85e5c8 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -752,7 +752,7 @@ def gen_config(args): make_rand = [ "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), - "KCONFIG_PROBABILITY=%d" % randint(1, 20), + "KCONFIG_PROBABILITY=%d" % args.probability, "randpackageconfig" if args.toolchains_csv else "randconfig" ] proc = yield from asyncio.create_subprocess_exec(*make_rand) @@ -784,6 +784,21 @@ def gen_config(args): if __name__ == '__main__': import argparse + + class Range(argparse.Action): + def __init__(self, minimum=None, maximum=None, *args, **kwargs): + self.min = minimum + self.max = maximum + kwargs["metavar"] = "[%d-%d]" % (self.min, self.max) + super(Range, self).__init__(*args, **kwargs) + + def __call__(self, parser, namespace, value, option_string=None): + if not (self.min <= value <= self.max): + msg = 'invalid choice: %r (choose from [%d-%d])' % \ + (value, self.min, self.max) + raise argparse.ArgumentError(self, msg) + setattr(namespace, self.dest, value) + parser = argparse.ArgumentParser(description="Generate a random configuration") parser.add_argument("--outputdir", "-o", help="Output directory (relative to current directory)", @@ -791,6 +806,10 @@ if __name__ == '__main__': parser.add_argument("--buildrootdir", "-b", help="Buildroot directory (relative to current directory)", type=str, default='.') + parser.add_argument("--probability", "-p", + help="Override the KCONFIG_PROBABILITY value", + type=int, action=Range, minimum=0, maximum=100, + default=randint(1, 20)) toolchains_csv = parser.add_mutually_exclusive_group(required=False) toolchains_csv.add_argument("--toolchains-csv", -- 2.34.1 From marcus.folkesson at gmail.com Mon Feb 6 15:15:14 2023 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Mon, 6 Feb 2023 16:15:14 +0100 Subject: [Buildroot] [PATCH] package/libcamera: bump to version 0.0.4 Message-ID: <20230206151514.1579632-1-marcus.folkesson@gmail.com> Signed-off-by: Marcus Folkesson --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 033e318910..ea204aee98 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 d7100286616550aca487b46ae9de2a70bb471352a332b8214901b4148739990f libcamera-v0.0.3-br1.tar.gz +sha256 13e53b33652b16454264b6eff0a6f032aa9331f919b07b6d0e622917ed7f7dd8 libcamera-v0.0.4-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 8979a43aca..01c4cb2ff2 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = v0.0.3 +LIBCAMERA_VERSION = v0.0.4 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ -- 2.38.1 From quentin.schulz at theobroma-systems.com Mon Feb 6 15:18:33 2023 From: quentin.schulz at theobroma-systems.com (Quentin Schulz) Date: Mon, 6 Feb 2023 16:18:33 +0100 Subject: [Buildroot] [PATCH] package/libcamera: bump to version 0.0.4 In-Reply-To: <20230206151514.1579632-1-marcus.folkesson@gmail.com> References: <20230206151514.1579632-1-marcus.folkesson@gmail.com> Message-ID: Hi Marcus, On 2/6/23 16:15, Marcus Folkesson wrote: > Signed-off-by: Marcus Folkesson You beat me to it by like 5min.. I was just writing the commit log :) Reviewed-by: Quentin Schulz Thanks, Quentin From peter at korsgaard.com Mon Feb 6 15:30:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 16:30:10 +0100 Subject: [Buildroot] [next 25/25] utils/check-symbols: new script In-Reply-To: <20221127130739.1862398-26-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:39 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-26-ricardo.martincoski@gmail.com> Message-ID: <87fsbi95h9.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: Hi, > This script checks for inconsistencies on symbols declared in Config.in > and used in .mk files. > Currently it checks only symbols following the pattern BR2_\w+ . > The script first gets the list of all files in the repository (using git > ls-files like 'make check-flake8' already do). > Then it parses all relevant files, searching for symbol definitions and > usages, and add entries into a database. > At the end, the database is searched for inconsistencies: > - symbol that is part of "choice" and is referenced with "select"; > - legacy symbol being referenced in packages; > - legacy symbol being redefined in packages; > - symbol referenced but not defined; > - symbol defined but not referenced; > - legacy symbol that has a Note stating it is referenced by a package > (for legacy handling) but is referenced in the package without a > comment "# legacy"; > - legacy symbol that has a Note stating it is referenced by a package > but it is not actually referenced. > There is also a debug parameter --search that dumps any filename or > symbol entries from the database that matches a regexp. > Sample usages: > $ utils/check-symbols > $ utils/docker-run utils/check-symbols > $ utils/check-symbols --search 'GETTEXT\b|\/openssl' > At same time the script is created: > - add unit tests for it, they can be run using: > utils/docker-run python3 -m pytest -v utils/checksymbolslib/ > - add two more GitLab CI jobs: check-symbols (to check current tree > using the script) and check-check-symbols (to check the script against > its unit tests) Cool! It is somewhat annoying that it is separate from check-package, but given that it needs to work on all files and check-package doesn't, I indeed also cannot see a good way to fix that. We should probably add a small notice about it in the manual, E.G. in adding-packages-tips.txt. Care to send a patch for that? > +++ b/utils/check-symbols > @@ -0,0 +1,78 @@ > +#!/usr/bin/env python3 > + > +import argparse > +import os > +import sys > + > +import checksymbolslib.file as file > +from checksymbolslib.db import DB > + > + > +def parse_args(): > + parser = argparse.ArgumentParser() > + parser.add_argument('--search', action='store', default=None, > + help='print all symbols matching a given regular expression') > + return parser.parse_args() > + > + > +def change_current_dir(): > + base_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) > + os.chdir(base_dir) change_current_dir() is IMHO not a very clear name, so I've changed it to change_to_top_dir() instead. > + > + warnings = [] > + warnings += db.get_warnings_for_choices_selected() > + warnings += db.get_warnings_for_legacy_symbols_being_defined() > + warnings += db.get_warnings_for_legacy_symbols_being_used() > + warnings += db.get_warnings_for_symbols_with_legacy_note_and_no_comment_on_usage() > + warnings += db.get_warnings_for_symbols_with_legacy_note_and_no_usage() > + warnings += db.get_warnings_for_symbols_without_definition() > + warnings += db.get_warnings_for_symbols_without_usage() > + > + for filename, lineno, msg in sorted(warnings): > + print('{}:{}: {}'.format(filename, lineno, msg)) Warnings typically go to stderr, so I changed this to print to stderr. Committed with the above changes, thanks. Arnout/Thomas/Yann, please update your post-applypatch script to also run check-symbols. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 15:30:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:19 +0100 Subject: [Buildroot] [git commit] package/libvirt: drop reference to legacy BR2_PACKAGE_QEMU_CUSTOM_TARGETS Message-ID: <20230206153039.F112683C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01ce9e95eb4f7fb731b20f3973edd582d4640084 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 44be514b21fd9409 (package/qemu: refactor target emulator selection) dropped BR2_PACKAGE_QEMU_CUSTOM_TARGETS, but didn't remove the reference from libvirt. Fix that. Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index f0687cd5db..3f4fc70e62 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -73,7 +73,7 @@ config BR2_PACKAGE_LIBVIRT_QEMU select BR2_PACKAGE_HWDATA_PCI_IDS # libpciaccess select BR2_PACKAGE_LIBSECCOMP select BR2_PACKAGE_QEMU - select BR2_PACKAGE_QEMU_SYSTEM if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = "" + select BR2_PACKAGE_QEMU_SYSTEM select BR2_PACKAGE_YAJL help QEMU/KVM support From peter at korsgaard.com Mon Feb 6 15:30:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:20 +0100 Subject: [Buildroot] [git commit] package/gitlab-runner: use LIBCURL_FORCE_TLS to enforce TLS support in curl Message-ID: <20230206153040.1FC2B83CA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b95f7591bd83a0e483d2b6db49258d2ea8b44f3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master BR2_PACKAGE_LIBCURL_OPENSSL is part of a "choice" option so it cannot be selected. What seems to be really be needed is HTTPS support in curl, so use the blind LIBCURL_FORCE_TLS option instead (openssl is already selected). Signed-off-by: Peter Korsgaard --- package/gitlab-runner/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gitlab-runner/Config.in b/package/gitlab-runner/Config.in index 89e3e87b5c..4289613ab9 100644 --- a/package/gitlab-runner/Config.in +++ b/package/gitlab-runner/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_GITLAB_RUNNER select BR2_PACKAGE_GIT # runtime select BR2_PACKAGE_LIBCURL # runtime select BR2_PACKAGE_LIBCURL_CURL # runtime - select BR2_PACKAGE_LIBCURL_OPENSSL # runtime, for ca-certificates. + select BR2_PACKAGE_LIBCURL_FORCE_TLS # runtime select BR2_PACKAGE_OPENSSL # runtime select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL # runtime select BR2_PACKAGE_LIBOPENSSL_BIN # runtime From peter at korsgaard.com Mon Feb 6 15:30:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:20 +0100 Subject: [Buildroot] [git commit] package/python-h11: new package Message-ID: <20230206153040.1600183CA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71c132494062055bf07c23617a56f0b705dbe93b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-h11/Config.in | 7 +++++++ package/python-h11/python-h11.hash | 5 +++++ package/python-h11/python-h11.mk | 14 ++++++++++++++ 5 files changed, 28 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 6597225ac3..4c2352b617 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1380,6 +1380,7 @@ F: package/python-flatbuffers/ F: package/python-fonttools/ F: package/python-frozenlist/ F: package/python-greenlet/ +F: package/python-h11/ F: package/python-hatchling/ F: package/python-hatch-fancy-pypi-readme/ F: package/python-hatch-vcs/ diff --git a/package/Config.in b/package/Config.in index 7817b51fc2..b6211f1102 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1071,6 +1071,7 @@ menu "External python modules" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" source "package/python-gunicorn/Config.in" + source "package/python-h11/Config.in" source "package/python-h2/Config.in" source "package/python-hiredis/Config.in" source "package/python-hpack/Config.in" diff --git a/package/python-h11/Config.in b/package/python-h11/Config.in new file mode 100644 index 0000000000..736620d782 --- /dev/null +++ b/package/python-h11/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_H11 + bool "python-h11" + help + A pure-Python, bring-your-own-I/O implementation of + HTTP/1.1. + + https://github.com/python-hyper/h11 diff --git a/package/python-h11/python-h11.hash b/package/python-h11/python-h11.hash new file mode 100644 index 0000000000..0c65a11d00 --- /dev/null +++ b/package/python-h11/python-h11.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/h11/json +md5 84c33fc0aa1f868928114c4d02c43dc2 h11-0.14.0.tar.gz +sha256 8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d h11-0.14.0.tar.gz +# Locally computed sha256 checksums +sha256 37db5bb85926db28a427a25867f10b1232003aea1be69ccb851138adb8e6f361 LICENSE.txt diff --git a/package/python-h11/python-h11.mk b/package/python-h11/python-h11.mk new file mode 100644 index 0000000000..d7dca5244b --- /dev/null +++ b/package/python-h11/python-h11.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-h11 +# +################################################################################ + +PYTHON_H11_VERSION = 0.14.0 +PYTHON_H11_SOURCE = h11-$(PYTHON_H11_VERSION).tar.gz +PYTHON_H11_SITE = https://files.pythonhosted.org/packages/f5/38/3af3d3633a34a3316095b39c8e8fb4853a28a536e55d347bd8d8e9a14b03 +PYTHON_H11_SETUP_TYPE = setuptools +PYTHON_H11_LICENSE = MIT +PYTHON_H11_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From peter at korsgaard.com Mon Feb 6 15:30:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:20 +0100 Subject: [Buildroot] [git commit] utils/check-symbols: new script Message-ID: <20230206153040.300A183C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c5472ace2490b2db7f26a79d12b01a8bb5a42dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This script checks for inconsistencies on symbols declared in Config.in and used in .mk files. Currently it checks only symbols following the pattern BR2_\w+ . The script first gets the list of all files in the repository (using git ls-files like 'make check-flake8' already do). Then it parses all relevant files, searching for symbol definitions and usages, and add entries into a database. At the end, the database is searched for inconsistencies: - symbol that is part of "choice" and is referenced with "select"; - legacy symbol being referenced in packages; - legacy symbol being redefined in packages; - symbol referenced but not defined; - symbol defined but not referenced; - legacy symbol that has a Note stating it is referenced by a package (for legacy handling) but is referenced in the package without a comment "# legacy"; - legacy symbol that has a Note stating it is referenced by a package but it is not actually referenced. There is also a debug parameter --search that dumps any filename or symbol entries from the database that matches a regexp. Sample usages: $ utils/check-symbols $ utils/docker-run utils/check-symbols $ utils/check-symbols --search 'GETTEXT\b|\/openssl' At same time the script is created: - add unit tests for it, they can be run using: utils/docker-run python3 -m pytest -v utils/checksymbolslib/ - add two more GitLab CI jobs: check-symbols (to check current tree using the script) and check-check-symbols (to check the script against its unit tests) Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski [Peter: print warnings to stderr, rename change_current_dir() to change_to_top_dir()] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/misc/gitlab-ci.yml.in | 8 + support/scripts/generate-gitlab-ci-yml | 2 +- utils/check-symbols | 78 ++++++ utils/checksymbolslib/__init__.py | 0 utils/checksymbolslib/br.py | 140 +++++++++++ utils/checksymbolslib/db.py | 205 +++++++++++++++ utils/checksymbolslib/file.py | 83 +++++++ utils/checksymbolslib/kconfig.py | 139 +++++++++++ utils/checksymbolslib/makefile.py | 100 ++++++++ utils/checksymbolslib/test_db.py | 286 +++++++++++++++++++++ utils/checksymbolslib/test_file.py | 152 ++++++++++++ utils/checksymbolslib/test_kconfig.py | 438 +++++++++++++++++++++++++++++++++ utils/checksymbolslib/test_makefile.py | 304 +++++++++++++++++++++++ utils/checksymbolslib/test_util.py | 15 ++ 15 files changed, 1951 insertions(+), 1 deletion(-) Patch is too large, so refusing to show it From peter at korsgaard.com Mon Feb 6 15:30:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:20 +0100 Subject: [Buildroot] [git commit] package/xdriver_xf86-video-imx-viv: drop package Message-ID: <20230206153040.0A2CB83CA1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa7d11a2ad984930eb8e8830c44cbabebdcf8568 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 424f53ac0730 (package/freescale-imx/imx-gpu-viv: drop X11 output) dropped BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 which xdriver_xf86-video-imx-viv depends on, so the package is no longer selectable. So drop the package and add a legacy symbol for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 +++ DEVELOPERS | 2 - package/x11r7/Config.in | 1 - package/x11r7/xdriver_xf86-video-imx-viv/Config.in | 44 ---------------------- .../xdriver_xf86-video-imx-viv.hash | 3 -- .../xdriver_xf86-video-imx-viv.mk | 34 ----------------- 6 files changed, 6 insertions(+), 84 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 191a209eeb..8b7ecd840b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -197,6 +197,12 @@ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 help The X11 output was dropped by NXP. +config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV + bool "xf86-video-imx-viv has been removed" + select BR2_LEGACY + help + The X11 output was dropped by NXP. + config BR2_PACKAGE_QEMU_CUSTOM_TARGETS string "the QEMU specific targets option has been removed" help diff --git a/DEVELOPERS b/DEVELOPERS index 97c28fbdd8..6597225ac3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1106,7 +1106,6 @@ F: package/gstreamer1/gst1-imx/ F: package/libimxvpuapi/ F: package/mfgtools/ F: package/sshpass/ -F: package/x11r7/xdriver_xf86-video-imx-viv/ N: Geoff Levand F: package/flannel/ @@ -1487,7 +1486,6 @@ F: package/lxc/ F: package/strongswan/ F: package/wmctrl/ F: package/x11r7/xdriver_xf86-video-imx/ -F: package/x11r7/xdriver_xf86-video-imx-viv/ N: Jesse Van Gavere F: package/qt6/ diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 4d3613cf4d..365de34c98 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -165,7 +165,6 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdriver_xf86-video-geode/Config.in source package/x11r7/xdriver_xf86-video-i128/Config.in source package/x11r7/xdriver_xf86-video-imx/Config.in - source package/x11r7/xdriver_xf86-video-imx-viv/Config.in source package/x11r7/xdriver_xf86-video-intel/Config.in source package/x11r7/xdriver_xf86-video-mach64/Config.in source package/x11r7/xdriver_xf86-video-mga/Config.in diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in deleted file mode 100644 index 984f63d6d3..0000000000 --- a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in +++ /dev/null @@ -1,44 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV - bool "xf86-video-imx-viv" - depends on BR2_PACKAGE_HAS_LIBGL - depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - depends on BR2_PACKAGE_IMX_GPU_G2D - depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XORGPROTO - help - X.Org driver for iMX6 GPU (Vivante) - - Notice EGL and GLes2 APIs are correctly supported. This - driver should also be able to provide Desktop OpenGL - implementation but, this feature seems broken since quite - some time. - - To use this driver, add correct configuration to your - /etc/X11/xorg.conf: - - Section "Device" - [...] - Driver "vivante" - Option "vivante_fbdev" "/dev/fbX" - EndSection - - Don't forget to load galcore.ko and create /dev/galcore - before using this driver (else, Xorg will exit with an - obscure message like "Segmentation fault at address 0xc"). - -comment "xf86-video-imx-viv needs an OpenGL backend" - depends on BR2_arm - depends on !BR2_PACKAGE_HAS_LIBGL - depends on BR2_TOOLCHAIN_HAS_SYNC_1 - -comment "xf86-video-imx-viv depends on imx-gpu-viv with X11 output" - depends on BR2_arm - depends on !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - depends on BR2_TOOLCHAIN_HAS_SYNC_1 - -comment "xf86-video-imx-viv depends on imx-gpu-g2d" - depends on BR2_arm - depends on !BR2_PACKAGE_IMX_GPU_G2D - depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - depends on BR2_TOOLCHAIN_HAS_SYNC_1 diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash deleted file mode 100644 index b79c236478..0000000000 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 8fe1f57334b22926d4ff3b0b9fdf50af835a99cdfd0ad3ba6a604b226b723e89 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga.tar.gz -sha256 9d3e373f0440cc0c58853e963636a7c1ffda9308ec5f30ebe9adfb9c16a8a1e4 COPYING-MIT diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk deleted file mode 100644 index 3b346f323a..0000000000 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-imx-viv -# -################################################################################ - -XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = rel_imx_4.9.x_1.0.0_ga -XDRIVER_XF86_VIDEO_IMX_VIV_SITE = $(call github,nxp-imx,xf86-video-imx-vivante,$(XDRIVER_XF86_VIDEO_IMX_VIV_VERSION)) -XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv imx-gpu-g2d xserver_xorg-server \ - xorgproto libdrm -XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE = MIT -XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE_FILES = COPYING-MIT -XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING = YES -XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD = $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/EXA/src -f makefile.linux - -define XDRIVER_XF86_VIDEO_IMX_VIV_BUILD_CMDS - $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) sysroot=$(STAGING_DIR) \ - BUSID_HAS_NUMBER=1 BUILD_IN_YOCTO=1 XSERVER_GREATER_THAN_13=1 \ - CFLAGS="$(TARGET_CFLAGS)" -endef - -define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING_CMDS - $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) prefix=$(STAGING_DIR)/usr install - $(INSTALL) -D -m 644 $(@D)/EXA/src/vivante_gal/vivante_priv.h \ - $(STAGING_DIR)/usr/include/vivante_priv.h - $(INSTALL) -D -m 644 $(@D)/EXA/src/vivante_gal/vivante_gal.h \ - $(STAGING_DIR)/usr/include/vivante_gal.h -endef - -define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_TARGET_CMDS - $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) prefix=$(TARGET_DIR)/usr install -endef - -$(eval $(generic-package)) From romain.naour at smile.fr Mon Feb 6 15:53:58 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 16:53:58 +0100 Subject: [Buildroot] [PATCH v5 01/10] package/cpuinfo: new package In-Reply-To: <20230130002854.2300661-1-james.hilliard1@gmail.com> References: <20230130002854.2300661-1-james.hilliard1@gmail.com> Message-ID: <301bf244-5eb8-3903-3371-80de9a6810aa@smile.fr> Hello James, Le 30/01/2023 ? 01:28, James Hilliard a ?crit?: > From: Stefan Hager > > This package is required by tensorflow-lite. > > Add a patch removing cpp requirement when not building tests. > > Tested-by: Stefan Hager > Signed-off-by: Stefan Hager > Signed-off-by: James Hilliard > --- > Changes v4 -> v5: > - don't require cpp > Changes v2 -> v3: > - move to libraries->hardware handling > --- > DEVELOPERS | 3 ++ > package/Config.in | 1 + > ...nable-CXX-only-when-needed-for-tests.patch | 36 +++++++++++++++++++ > package/cpuinfo/Config.in | 8 +++++ > package/cpuinfo/cpuinfo.hash | 4 +++ > package/cpuinfo/cpuinfo.mk | 17 +++++++++ > 6 files changed, 69 insertions(+) > create mode 100644 package/cpuinfo/0001-Enable-CXX-only-when-needed-for-tests.patch > create mode 100644 package/cpuinfo/Config.in > create mode 100644 package/cpuinfo/cpuinfo.hash > create mode 100644 package/cpuinfo/cpuinfo.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 706ee80ece..53f1052b07 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2723,6 +2723,9 @@ F: package/libvpx/ > F: package/mesa3d-demos/ > F: package/ti-gfx/ > > +N: Stefan Hager > +F: package/cpuinfo/ > + > N: Stefan Ott > F: package/unbound/ > > diff --git a/package/Config.in b/package/Config.in > index 83fddf316f..3a07074b10 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1645,6 +1645,7 @@ menu "Hardware handling" > source "package/bcm2835/Config.in" > source "package/c-periphery/Config.in" > source "package/ccid/Config.in" > + source "package/cpuinfo/Config.in" > source "package/dtc/Config.in" > source "package/gnu-efi/Config.in" > source "package/hackrf/Config.in" > diff --git a/package/cpuinfo/0001-Enable-CXX-only-when-needed-for-tests.patch b/package/cpuinfo/0001-Enable-CXX-only-when-needed-for-tests.patch > new file mode 100644 > index 0000000000..ebd6ed36cd > --- /dev/null > +++ b/package/cpuinfo/0001-Enable-CXX-only-when-needed-for-tests.patch > @@ -0,0 +1,36 @@ > +From b1261baefd2bb9095af56859c1cac6b1166fb13f Mon Sep 17 00:00:00 2001 > +From: James Hilliard > +Date: Sun, 29 Jan 2023 16:55:08 -0700 > +Subject: [PATCH] Enable CXX only when needed for tests > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/pytorch/cpuinfo/pull/133] > +--- > + CMakeLists.txt | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index b2f9434..879c9fa 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR) > + # ---[ Setup project > + PROJECT( > + cpuinfo > +- LANGUAGES C CXX > ++ LANGUAGES C > + ) > + > + # ---[ Options. > +@@ -763,6 +763,7 @@ ENDIF() > + > + # ---[ cpuinfo unit tests > + IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_UNIT_TESTS) > ++ ENABLE_LANGUAGE(CXX) > + ADD_EXECUTABLE(init-test test/init.cc) > + CPUINFO_TARGET_ENABLE_CXX11(init-test) > + CPUINFO_TARGET_RUNTIME_LIBRARY(init-test) > +-- > +2.34.1 > + > diff --git a/package/cpuinfo/Config.in b/package/cpuinfo/Config.in > new file mode 100644 > index 0000000000..d3c3b08400 > --- /dev/null > +++ b/package/cpuinfo/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_CPUINFO > + bool "cpuinfo" Have you checked cpuinfo dependencies ? It seems XNNPack used by cpuinfo is 64bits architectures only: CMake Warning at CMakeLists.txt:69 (MESSAGE): Target processor architecture "l" is not supported in cpuinfo. cpuinfo will compile, but cpuinfo_initialize() will always fail. hint: https://github.com/NobuoTsukamoto/meta-tensorflow-lite/blob/main/recipes-tools/tensorflow-lite/tensorflow-lite-benchmark_2.11.0.bb#L33 And trigger a build issue on uClibc-ng due to missing header: cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:19:11: fatal error: sys/auxv.h: No such file or directory 19 | #include Also static build is not likely supported: cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:8:10: fatal error: dlfcn.h: No such file or directory 8 | #include Best regards, Romain > + help > + CPU INFOrmation library, cpuinfo is a library to detect > + essential for performance optimization information about > + host CPU. > + > + https://github.com/pytorch/cpuinfo > diff --git a/package/cpuinfo/cpuinfo.hash b/package/cpuinfo/cpuinfo.hash > new file mode 100644 > index 0000000000..c3f70fa90f > --- /dev/null > +++ b/package/cpuinfo/cpuinfo.hash > @@ -0,0 +1,4 @@ > +# Locally calculated > +sha256 0936848904943381b2c01321101614776e43d583840ee0f3ceeea1e3fb7405f7 cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57.tar.gz > +# License files, locally calculated > +sha256 8e7e60636c3aa0cb03571a1a841ce5697f9551ff92b3c426c2561613d15ade70 LICENSE > diff --git a/package/cpuinfo/cpuinfo.mk b/package/cpuinfo/cpuinfo.mk > new file mode 100644 > index 0000000000..ab6a0269ec > --- /dev/null > +++ b/package/cpuinfo/cpuinfo.mk > @@ -0,0 +1,17 @@ > +################################################################################ > +# > +# cpuinfo > +# > +################################################################################ > + > +CPUINFO_VERSION = de2fa78ebb431db98489e78603e4f77c1f6c5c57 > +CPUINFO_SITE = $(call github,pytorch,cpuinfo,$(CPUINFO_VERSION)) > +CPUINFO_LICENSE = BSD-2-Clause > +CPUINFO_LICENSE_FILES = LICENSE > +CPUINFO_INSTALL_STAGING = YES > +CPUINFO_CONF_OPTS = \ > + -DCPUINFO_BUILD_UNIT_TESTS=OFF \ > + -DCPUINFO_BUILD_MOCK_TESTS=OFF \ > + -DCPUINFO_BUILD_BENCHMARKS=OFF > + > +$(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 6 16:09:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 17:09:15 +0100 Subject: [Buildroot] [PATCH 1/3] package/freescale-imx/imx-gpu-viv: drop X11 output In-Reply-To: <20230206155650.79bafe2c@windsurf> (Thomas Petazzoni's message of "Mon, 6 Feb 2023 15:56:50 +0100") References: <20230114230028.46833cae@windsurf> <87sffi97wo.fsf@dell.be.48ers.dk> <20230206155650.79bafe2c@windsurf> Message-ID: <87bkm693o4.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > On Mon, 06 Feb 2023 15:37:43 +0100 > Peter Korsgaard wrote: >> I see we still have xf86-video-imx-viv which depends on the now removed >> BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 symbol, so I guess we should remove >> that package as well. > Gah, I did not notice that: indeed it should be removed as well. > Daniel, will you cook some patch doing that? I've already pushed a commit dropping the package. -- Bye, Peter Korsgaard From romain.naour at smile.fr Mon Feb 6 16:24:11 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 17:24:11 +0100 Subject: [Buildroot] [PATCH v5 01/10] package/cpuinfo: new package In-Reply-To: <301bf244-5eb8-3903-3371-80de9a6810aa@smile.fr> References: <20230130002854.2300661-1-james.hilliard1@gmail.com> <301bf244-5eb8-3903-3371-80de9a6810aa@smile.fr> Message-ID: <282c5a46-37ed-6c07-9b72-86133a71750a@smile.fr> Hello James, Le 06/02/2023 ? 16:53, Romain Naour a ?crit?: > Hello James, > > Le 30/01/2023 ? 01:28, James Hilliard a ?crit?: >> From: Stefan Hager >> >> This package is required by tensorflow-lite. >> >> Add a patch removing cpp requirement when not building tests. >> >> Tested-by: Stefan Hager >> Signed-off-by: Stefan Hager >> Signed-off-by: James Hilliard >> --- >> Changes v4 -> v5: >> - don't require cpp >> Changes v2 -> v3: >> - move to libraries->hardware handling >> --- [...] >> diff --git a/package/cpuinfo/Config.in b/package/cpuinfo/Config.in >> new file mode 100644 >> index 0000000000..d3c3b08400 >> --- /dev/null >> +++ b/package/cpuinfo/Config.in >> @@ -0,0 +1,8 @@ >> +config BR2_PACKAGE_CPUINFO >> + bool "cpuinfo" > > Have you checked cpuinfo dependencies ? > > It seems XNNPack used by cpuinfo is 64bits architectures only: > > CMake Warning at CMakeLists.txt:69 (MESSAGE): > Target processor architecture "l" is not supported in cpuinfo. cpuinfo > will compile, but cpuinfo_initialize() will always fail. > > hint: > https://github.com/NobuoTsukamoto/meta-tensorflow-lite/blob/main/recipes-tools/tensorflow-lite/tensorflow-lite-benchmark_2.11.0.bb#L33 > > And trigger a build issue on uClibc-ng due to missing header: > > cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:19:11: > fatal error: sys/auxv.h: No such file or directory > 19 | #include > > Also static build is not likely supported: > > cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:8:10: > fatal error: dlfcn.h: No such file or directory > 8 | #include Actually there is an architecture dependency: x86, x86_64, arm, aarch64. Also it requires threads support: https://github.com/pytorch/cpuinfo/blob/main/src/init.c#L24 Best regards, Romain > > Best regards, > Romain > From sebastian.weyer at smile.fr Mon Feb 6 16:30:05 2023 From: sebastian.weyer at smile.fr (Sebastian WEYER) Date: Mon, 6 Feb 2023 17:30:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.67.0 In-Reply-To: <20230131050319.2821287-1-james.hilliard1@gmail.com> References: <20230131050319.2821287-1-james.hilliard1@gmail.com> Message-ID: Hi all, On 31/01/2023 06:03, James Hilliard wrote: > Link to Rust 1.67.0 announcement: https://blog.rust-lang.org/2023/01/26/Rust-1.67.0.html > > Signed-off-by: James Hilliard > --- > package/rust-bin/rust-bin.hash | 252 ++++++++++++++++----------------- > package/rust-bin/rust-bin.mk | 2 +- > package/rust/rust.hash | 6 +- > package/rust/rust.mk | 2 +- > 4 files changed, 131 insertions(+), 131 deletions(-) > > diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash > index adf1799ad7..d00e6342e8 100644 > --- a/package/rust-bin/rust-bin.hash > +++ b/package/rust-bin/rust-bin.hash > @@ -1,129 +1,129 @@ > -# From https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc > -sha256 a1279760f91b3571733e0b0268128d143be2734916753900b5fe7b8ecc3c0900 rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc > -sha256 835b4e1b4d396674f7866a83b9a4f44db16fd12f01a7eaed527282b3700a9b92 rust-1.66.1-i686-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc > -sha256 c7349617c42274bf50f6e3662dfb4f6832a93780099c3bb510be1a5b93d04c37 rust-1.66.1-mips-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc > -sha256 fc38663870f0af47a27241d980ca886c3f7d432267920deb412ac8576bef68f0 rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc > -sha256 2b1a6c54db49a9e62d60cc96c1768f405e0f4c59d698186bf3a28a1bb017b6b5 rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc > -sha256 777d3a650448c15048710282388e90d10740540f570f5d17ed4a2dbdabb89552 rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc > -sha256 875bb310bae7c8c1d2d228a49aa4b547608b6c807ddc9ec44bc87272c77d869b rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc > -sha256 89164ccf75909b3d02bdcb787e33876cad87e55ab0e6239b030b4b6631ed356a rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc > -sha256 e83f9fc473072db23376783595a008cdd9b2f2e9b3be109e55939392864840eb rust-1.66.1-s390x-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc > -sha256 a201aa4595ec8015662b7103b1409a4787c6d1f1d540bb68746633527d855858 rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc > -sha256 9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24 rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc > -sha256 520ac446f20490685cc4d73192cfbb4c9b9e55c884aa4ae2b098e3a54d891de8 rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc > -sha256 42afd189ef64988f64976f767a734734bccd7c71e578780e902148c98226fa29 rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc > -sha256 506126773af9c3dacc506776a0b2e12fe6fa0c95eaf4f4ebb5cdbd335feb83fa rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.asc > -sha256 3d21b478fbf07bd27902bdd189e6988341f0c2c0108b538f926cea3031bc8ea6 rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.asc > -sha256 5282fc97111a7eafbead3463ed7bc0f3065332f21aec6a39a740157fe42f943a rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.asc > -sha256 0ebf0178bbe9c5572d1db89e190dee23aef0e2f667995abedbd66e33d0bd73ab rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.asc > -sha256 938e7442c21ea0895c44ec78fa718ea1d3abe32ed0425ed328c905e188af250e rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc > -sha256 bdc491f4c05669e7a3382b6bfdaeaa20e2cfa5ef553305df0e0d73729a45e6e4 rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.asc > -sha256 d75c6dc3c00d662b0d3f6ce7fde0f76057542edfbc97a20b29247842c8a711d2 rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.asc > -sha256 830285e5388081c68fac9dc955aa824a4d919b0e24eadc6e0b95b30103d79db9 rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.asc > -sha256 d720bd1e493f53797f90d83dbe6d52ecbe1ff3cae282f4b2e18c37fe92c9adf6 rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.asc > -sha256 90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17 rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.asc > -sha256 c4bab2d63223d0c6e63806082e30d8c38b37eefc10ee2e7380971e3012c00bca rust-std-1.66.1-i586-unknown-linux-musl.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.asc > -sha256 b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.asc > -sha256 52013329eb6697d94f5dce01dd509b4b93b473c18a3a2c05d0230b9dfeab14d1 rust-std-1.66.1-i686-unknown-linux-musl.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.asc > -sha256 e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568 rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.asc > -sha256 23f917eccaca59d4c911eb96d8ffefe86834dbcdf902c9ab6dad8558c31c4575 rust-std-1.66.1-mips-unknown-linux-musl.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc > -sha256 70d1406e0981d5d31c1d3f85c848bba0476e0ff6203e7706f66b4d2212f01b66 rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.asc > -sha256 0fd221d4b4205ce548e83f0e7416c8332eb12b64d5a43c0b3ed61e9f7d6edf13 rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc > -sha256 132d6d5750a877972ebc6f23e831f2ef3077465b2ab24ca645d32ea83c496fe3 rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.asc > -sha256 533f370368ac8b6192e1450289c64544ebf9cacc38c3a52ef6c0ecded7ee6fa5 rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc > -sha256 8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.asc > -sha256 d7028820888d0decde047a6e77b866e690532aa09522c9a23a3fbf8780a72257 rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc > -sha256 417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1 rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc > -sha256 7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35 rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc > -sha256 4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770 rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc > -sha256 776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc > -sha256 51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062 rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.asc > -sha256 3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927 rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc > -sha256 c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377 rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz > -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc > -sha256 a9710727ba28955deb7fbec799faed19486c9af3c7e3088ec6659a257515ffca rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc > +sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc > +sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc > +sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc > +sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc > +sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc > +sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc > +sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc > +sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc > +sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc > +sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc > +sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc > +sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc > +sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc > +sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc > +sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc > +sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc > +sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc > +sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc > +sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc > +sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc > +sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc > +sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc > +sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc > +sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc > +sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc > +sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc > +sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc > +sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc > +sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc > +sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc > +sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc > +sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc > +sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc > +sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc > +sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc > +sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc > +sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc > +sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc > +sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc > +sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc > +sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz > +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc > +sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz > # Locally generated > sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE > sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT > diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk > index 89009288f4..d62ce39cfc 100644 > --- a/package/rust-bin/rust-bin.mk > +++ b/package/rust-bin/rust-bin.mk > @@ -6,7 +6,7 @@ > > # When updating this version, check whether support/download/cargo-post-process > # still generates the same archives. > -RUST_BIN_VERSION = 1.66.1 > +RUST_BIN_VERSION = 1.67.0 > RUST_BIN_SITE = https://static.rust-lang.org/dist > RUST_BIN_LICENSE = Apache-2.0 or MIT > RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT > diff --git a/package/rust/rust.hash b/package/rust/rust.hash > index 545a452bf0..2a260ca64f 100644 > --- a/package/rust/rust.hash > +++ b/package/rust/rust.hash > @@ -1,6 +1,6 @@ > -# From https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.sha256 > -# Verified using https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc > -sha256 07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe rustc-1.66.1-src.tar.xz > +# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 > +# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc > +sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz > # Locally generated > sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE > sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT > diff --git a/package/rust/rust.mk b/package/rust/rust.mk > index 691683b492..d14ad3a3e7 100644 > --- a/package/rust/rust.mk > +++ b/package/rust/rust.mk > @@ -6,7 +6,7 @@ > > # When updating this version, check whether support/download/cargo-post-process > # still generates the same archives. > -RUST_VERSION = 1.66.1 > +RUST_VERSION = 1.67.0 > RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz > RUST_SITE = https://static.rust-lang.org/dist > RUST_LICENSE = Apache-2.0 or MIT I just tested rust-bin with the following command: ./support/testing/run-tests -o test-output -d test-dl/ -k tests.package.test_rust.TestRustBin and verified that it passes with the message "OK". Tested-by: Sebastian Weyer Best regards, Sebastian From james.hilliard1 at gmail.com Mon Feb 6 16:33:33 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 09:33:33 -0700 Subject: [Buildroot] [PATCH v5 01/10] package/cpuinfo: new package In-Reply-To: <282c5a46-37ed-6c07-9b72-86133a71750a@smile.fr> References: <20230130002854.2300661-1-james.hilliard1@gmail.com> <301bf244-5eb8-3903-3371-80de9a6810aa@smile.fr> <282c5a46-37ed-6c07-9b72-86133a71750a@smile.fr> Message-ID: On Mon, Feb 6, 2023 at 9:24 AM Romain Naour wrote: > > Hello James, > > Le 06/02/2023 ? 16:53, Romain Naour a ?crit : > > Hello James, > > > > Le 30/01/2023 ? 01:28, James Hilliard a ?crit : > >> From: Stefan Hager > >> > >> This package is required by tensorflow-lite. > >> > >> Add a patch removing cpp requirement when not building tests. > >> > >> Tested-by: Stefan Hager > >> Signed-off-by: Stefan Hager > >> Signed-off-by: James Hilliard > >> --- > >> Changes v4 -> v5: > >> - don't require cpp > >> Changes v2 -> v3: > >> - move to libraries->hardware handling > >> --- > > [...] > > >> diff --git a/package/cpuinfo/Config.in b/package/cpuinfo/Config.in > >> new file mode 100644 > >> index 0000000000..d3c3b08400 > >> --- /dev/null > >> +++ b/package/cpuinfo/Config.in > >> @@ -0,0 +1,8 @@ > >> +config BR2_PACKAGE_CPUINFO > >> + bool "cpuinfo" > > > > Have you checked cpuinfo dependencies ? > > > > It seems XNNPack used by cpuinfo is 64bits architectures only: > > > > CMake Warning at CMakeLists.txt:69 (MESSAGE): > > Target processor architecture "l" is not supported in cpuinfo. cpuinfo > > will compile, but cpuinfo_initialize() will always fail. > > > > hint: > > https://github.com/NobuoTsukamoto/meta-tensorflow-lite/blob/main/recipes-tools/tensorflow-lite/tensorflow-lite-benchmark_2.11.0.bb#L33 > > > > And trigger a build issue on uClibc-ng due to missing header: > > > > cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:19:11: > > fatal error: sys/auxv.h: No such file or directory > > 19 | #include > > > > Also static build is not likely supported: > > > > cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:8:10: > > fatal error: dlfcn.h: No such file or directory > > 8 | #include > > Actually there is an architecture dependency: x86, x86_64, arm, aarch64. > Also it requires threads support: > > https://github.com/pytorch/cpuinfo/blob/main/src/init.c#L24 Well...those architecture dependencies kinda look like runtime deps to me...a consuming application could call cpuinfo_initialize() with error handling and fallback to some other codepath automatically on failure. So probably we don't want to apply an architecture restriction unless there's an actual build failure. > > Best regards, > Romain > > > > > Best regards, > > Romain > > From arnout at mind.be Mon Feb 6 16:39:36 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 17:39:36 +0100 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: migrate to asyncio subprocess calls In-Reply-To: <20220413224004.1225568-1-james.hilliard1@gmail.com> References: <20220413224004.1225568-1-james.hilliard1@gmail.com> Message-ID: <50d6810c-888f-940e-50ac-13e4a8a1aa3c@mind.be> Hi James, On 14/04/2022 00:40, James Hilliard wrote: > Since genrandconfig no longer appears to support python2 we can > migrate the subprocess calls to use asyncio variants. > > This has the advantage of allowing for runners like autobuild-run to > integrate directly into genrandconfig by calling the asyncio > gen_config using importlib instead of having to run genrandconfig as > a subprocess. > > Using asyncio is advantageous here as it eliminates the requirement > for the runner to deal with blocking subprocess calls(by having to > use threading for example). > > Also cleanup some unused functions/python2 compatibility shims. > > Signed-off-by: James Hilliard I finally applied to master. Needed to resolve some conflicts, but otherwise no changes. I still do have a few comments though. > --- > Changes v1 -> v2: > - compatibility shims for python 3.4 and newer > --- > utils/genrandconfig | 94 +++++++++++++++++++++++++++++---------------- > 1 file changed, 61 insertions(+), 33 deletions(-) > > diff --git a/utils/genrandconfig b/utils/genrandconfig > index 59fe34e58d..aa82a41d5c 100755 > --- a/utils/genrandconfig > +++ b/utils/genrandconfig > @@ -18,23 +18,18 @@ > > # This script generates a random configuration for testing Buildroot. > > -import contextlib > +import asyncio > import csv > import os > from random import randint > -import subprocess > import sys > from distutils.version import StrictVersion > import platform > > -if sys.hexversion >= 0x3000000: > - import urllib.request as _urllib > +if sys.version_info < (3, 8): > + from asyncio import coroutine > else: > - import urllib2 as _urllib > - > - > -def urlopen_closing(uri): > - return contextlib.closing(_urllib.urlopen(uri)) > + from types import coroutine > > > class SystemInfo: > @@ -63,6 +58,7 @@ class SystemInfo: > # -- > return None > > + @coroutine > def has(self, prog): Isn't the usual way to use async def has(self, prog): ? Or does that mean something different? > """Checks whether a program is available. > Lazily evaluates missing entries. > @@ -78,11 +74,13 @@ class SystemInfo: > have_it = self.find_prog(prog) > # java[c] needs special care > if have_it and prog in ('java', 'javac'): > - with open(os.devnull, "w") as devnull: > - if subprocess.call("%s -version | grep gcj" % prog, > - shell=True, > - stdout=devnull, stderr=devnull) != 1: > - have_it = False > + proc = yield from asyncio.create_subprocess_shell( > + "%s -version | grep gcj" % prog, Perhaps we should also start using f-strings. That bumps the requirement to python 3.6 but I don't think it's unreasonable for genrandconfig. > + stdout=asyncio.subprocess.DEVNULL, > + stderr=asyncio.subprocess.DEVNULL) > + ret = yield from proc.wait() > + if ret != 1: > + have_it = False > # -- > self.progs[prog] = have_it > return have_it > @@ -159,6 +157,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): > return configs > > > + at coroutine > def is_toolchain_usable(configfile, config): > """Check if the toolchain is actually usable.""" > > @@ -179,8 +178,12 @@ def is_toolchain_usable(configfile, config): > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: > - ldd_version_output = subprocess.check_output(['ldd', '--version']) > - glibc_version = ldd_version_output.splitlines()[0].split()[-1] > + proc = yield from asyncio.create_subprocess_exec( > + 'ldd', '--version', stdout=asyncio.subprocess.PIPE) > + ldd_version_output, _ = yield from proc.communicate() > + if proc.returncode: > + return False > + glibc_version = ldd_version_output.splitlines()[0].split()[-1].decode('utf-8') The decode was already added in commit 12e4f7c5c43fb7b4db6d6548b9dbabb9c1b5f875 so I didn't modify this line. > if StrictVersion('2.14') > StrictVersion(glibc_version): > print("WARN: ignoring the Linaro ARM toolchains because too old host glibc", file=sys.stderr) > return False > @@ -188,6 +191,7 @@ def is_toolchain_usable(configfile, config): > return True > > > + at coroutine > def fixup_config(sysinfo, configfile): > """Finalize the configuration and reject any problematic combinations > > @@ -202,7 +206,8 @@ def fixup_config(sysinfo, configfile): > > BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' > > - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not sysinfo.has("java"): > + has_java = yield from sysinfo.has("java") > + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: > return False > # The ctng toolchain is affected by PR58854 > if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ > @@ -507,6 +512,7 @@ def fixup_config(sysinfo, configfile): > return True > > > + at coroutine > def gen_config(args): > """Generate a new random configuration > > @@ -565,7 +571,8 @@ def gen_config(args): > > # Randomly enable BR2_REPRODUCIBLE 10% of times > # also enable tar filesystem images for testing > - if sysinfo.has("diffoscope") and randint(0, 10) == 0: > + has_diffoscope = yield from sysinfo.has("diffoscope") > + if has_diffoscope and randint(0, 10) == 0: > configlines.append("BR2_REPRODUCIBLE=y\n") > configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") > > @@ -579,10 +586,14 @@ def gen_config(args): > with open(configfile, "w+") as configf: > configf.writelines(configlines) > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > - "olddefconfig"]) > + proc = yield from asyncio.create_subprocess_exec( > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > + ret = yield from proc.wait() > + if ret: > + return ret > > - if not is_toolchain_usable(configfile, toolchainconfig): > + toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) > + if not toolchain_usable: > return 2 > > # Now, generate the random selection of packages, and fixup > @@ -596,21 +607,34 @@ def gen_config(args): > file=sys.stderr) > return 1 > bounded_loop -= 1 > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > - "KCONFIG_PROBABILITY=%d" % randint(1, 20), > - "randpackageconfig" if args.toolchains_csv else "randconfig"]) > - > - if fixup_config(sysinfo, configfile): > + proc = yield from asyncio.create_subprocess_exec( > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > + "KCONFIG_PROBABILITY=%d" % randint(1, 20), > + "randpackageconfig" if args.toolchains_csv else "randconfig") This was refactored a bit, can you check if I fixed it up correctly? Regards, Arnout > + ret = yield from proc.wait() > + if ret: > + return ret > + > + ret = yield from fixup_config(sysinfo, configfile) > + if ret: > break > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > - "olddefconfig"]) > + proc = yield from asyncio.create_subprocess_exec( > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > + ret = yield from proc.wait() > + if ret: > + return ret > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > - "savedefconfig"]) > + proc = yield from asyncio.create_subprocess_exec( > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") > + ret = yield from proc.wait() > + if ret: > + return ret > > - return subprocess.call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > - "dependencies"]) > + proc = yield from asyncio.create_subprocess_exec( > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") > + ret = yield from proc.wait() > + return ret > > > if __name__ == '__main__': > @@ -642,7 +666,11 @@ if __name__ == '__main__': > args.outputdir = os.path.abspath(args.outputdir) > > try: > - ret = gen_config(args) > + if sys.version_info < (3, 7): > + loop = asyncio.get_event_loop() > + ret = loop.run_until_complete(gen_config(args)) > + else: > + ret = asyncio.run(gen_config(args)) > except Exception as e: > print(str(e), file=sys.stderr) > parser.exit(1) From james.hilliard1 at gmail.com Mon Feb 6 16:45:47 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 09:45:47 -0700 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: migrate to asyncio subprocess calls In-Reply-To: <50d6810c-888f-940e-50ac-13e4a8a1aa3c@mind.be> References: <20220413224004.1225568-1-james.hilliard1@gmail.com> <50d6810c-888f-940e-50ac-13e4a8a1aa3c@mind.be> Message-ID: On Mon, Feb 6, 2023 at 9:39 AM Arnout Vandecappelle wrote: > > Hi James, > > On 14/04/2022 00:40, James Hilliard wrote: > > Since genrandconfig no longer appears to support python2 we can > > migrate the subprocess calls to use asyncio variants. > > > > This has the advantage of allowing for runners like autobuild-run to > > integrate directly into genrandconfig by calling the asyncio > > gen_config using importlib instead of having to run genrandconfig as > > a subprocess. > > > > Using asyncio is advantageous here as it eliminates the requirement > > for the runner to deal with blocking subprocess calls(by having to > > use threading for example). > > > > Also cleanup some unused functions/python2 compatibility shims. > > > > Signed-off-by: James Hilliard > > I finally applied to master. Needed to resolve some conflicts, but otherwise > no changes. I still do have a few comments though. > > > --- > > Changes v1 -> v2: > > - compatibility shims for python 3.4 and newer > > --- > > utils/genrandconfig | 94 +++++++++++++++++++++++++++++---------------- > > 1 file changed, 61 insertions(+), 33 deletions(-) > > > > diff --git a/utils/genrandconfig b/utils/genrandconfig > > index 59fe34e58d..aa82a41d5c 100755 > > --- a/utils/genrandconfig > > +++ b/utils/genrandconfig > > @@ -18,23 +18,18 @@ > > > > # This script generates a random configuration for testing Buildroot. > > > > -import contextlib > > +import asyncio > > import csv > > import os > > from random import randint > > -import subprocess > > import sys > > from distutils.version import StrictVersion > > import platform > > > > -if sys.hexversion >= 0x3000000: > > - import urllib.request as _urllib > > +if sys.version_info < (3, 8): > > + from asyncio import coroutine > > else: > > - import urllib2 as _urllib > > - > > - > > -def urlopen_closing(uri): > > - return contextlib.closing(_urllib.urlopen(uri)) > > + from types import coroutine > > > > > > class SystemInfo: > > @@ -63,6 +58,7 @@ class SystemInfo: > > # -- > > return None > > > > + @coroutine > > def has(self, prog): > > Isn't the usual way to use > > async def has(self, prog): > > ? Or does that mean something different? Yeah, the weird style here was for python 3.4 compat, but if 3.6 is fine this should work: https://patchwork.ozlabs.org/project/buildroot/patch/20230206150847.3621475-1-james.hilliard1 at gmail.com/ > > > > """Checks whether a program is available. > > Lazily evaluates missing entries. > > @@ -78,11 +74,13 @@ class SystemInfo: > > have_it = self.find_prog(prog) > > # java[c] needs special care > > if have_it and prog in ('java', 'javac'): > > - with open(os.devnull, "w") as devnull: > > - if subprocess.call("%s -version | grep gcj" % prog, > > - shell=True, > > - stdout=devnull, stderr=devnull) != 1: > > - have_it = False > > + proc = yield from asyncio.create_subprocess_shell( > > + "%s -version | grep gcj" % prog, > > Perhaps we should also start using f-strings. That bumps the requirement to > python 3.6 but I don't think it's unreasonable for genrandconfig. Yeah, older than 3.6 starts getting pretty annoying. > > > + stdout=asyncio.subprocess.DEVNULL, > > + stderr=asyncio.subprocess.DEVNULL) > > + ret = yield from proc.wait() > > + if ret != 1: > > + have_it = False > > # -- > > self.progs[prog] = have_it > > return have_it > > @@ -159,6 +157,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): > > return configs > > > > > > + at coroutine > > def is_toolchain_usable(configfile, config): > > """Check if the toolchain is actually usable.""" > > > > @@ -179,8 +178,12 @@ def is_toolchain_usable(configfile, config): > > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ > > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ > > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: > > - ldd_version_output = subprocess.check_output(['ldd', '--version']) > > - glibc_version = ldd_version_output.splitlines()[0].split()[-1] > > + proc = yield from asyncio.create_subprocess_exec( > > + 'ldd', '--version', stdout=asyncio.subprocess.PIPE) > > + ldd_version_output, _ = yield from proc.communicate() > > + if proc.returncode: > > + return False > > + glibc_version = ldd_version_output.splitlines()[0].split()[-1].decode('utf-8') > > The decode was already added in commit > 12e4f7c5c43fb7b4db6d6548b9dbabb9c1b5f875 so I didn't modify this line. > > > if StrictVersion('2.14') > StrictVersion(glibc_version): > > print("WARN: ignoring the Linaro ARM toolchains because too old host glibc", file=sys.stderr) > > return False > > @@ -188,6 +191,7 @@ def is_toolchain_usable(configfile, config): > > return True > > > > > > + at coroutine > > def fixup_config(sysinfo, configfile): > > """Finalize the configuration and reject any problematic combinations > > > > @@ -202,7 +206,8 @@ def fixup_config(sysinfo, configfile): > > > > BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' > > > > - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not sysinfo.has("java"): > > + has_java = yield from sysinfo.has("java") > > + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: > > return False > > # The ctng toolchain is affected by PR58854 > > if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ > > @@ -507,6 +512,7 @@ def fixup_config(sysinfo, configfile): > > return True > > > > > > + at coroutine > > def gen_config(args): > > """Generate a new random configuration > > > > @@ -565,7 +571,8 @@ def gen_config(args): > > > > # Randomly enable BR2_REPRODUCIBLE 10% of times > > # also enable tar filesystem images for testing > > - if sysinfo.has("diffoscope") and randint(0, 10) == 0: > > + has_diffoscope = yield from sysinfo.has("diffoscope") > > + if has_diffoscope and randint(0, 10) == 0: > > configlines.append("BR2_REPRODUCIBLE=y\n") > > configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") > > > > @@ -579,10 +586,14 @@ def gen_config(args): > > with open(configfile, "w+") as configf: > > configf.writelines(configlines) > > > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > - "olddefconfig"]) > > + proc = yield from asyncio.create_subprocess_exec( > > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > > + ret = yield from proc.wait() > > + if ret: > > + return ret > > > > - if not is_toolchain_usable(configfile, toolchainconfig): > > + toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) > > + if not toolchain_usable: > > return 2 > > > > # Now, generate the random selection of packages, and fixup > > @@ -596,21 +607,34 @@ def gen_config(args): > > file=sys.stderr) > > return 1 > > bounded_loop -= 1 > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > - "KCONFIG_PROBABILITY=%d" % randint(1, 20), > > - "randpackageconfig" if args.toolchains_csv else "randconfig"]) > > - > > - if fixup_config(sysinfo, configfile): > > + proc = yield from asyncio.create_subprocess_exec( > > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > + "KCONFIG_PROBABILITY=%d" % randint(1, 20), > > + "randpackageconfig" if args.toolchains_csv else "randconfig") > > This was refactored a bit, can you check if I fixed it up correctly? Yeah, looks good from what I can tell. > > Regards, > Arnout > > > + ret = yield from proc.wait() > > + if ret: > > + return ret > > + > > + ret = yield from fixup_config(sysinfo, configfile) > > + if ret: > > break > > > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > - "olddefconfig"]) > > + proc = yield from asyncio.create_subprocess_exec( > > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > > + ret = yield from proc.wait() > > + if ret: > > + return ret > > > > - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > - "savedefconfig"]) > > + proc = yield from asyncio.create_subprocess_exec( > > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") > > + ret = yield from proc.wait() > > + if ret: > > + return ret > > > > - return subprocess.call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > - "dependencies"]) > > + proc = yield from asyncio.create_subprocess_exec( > > + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") > > + ret = yield from proc.wait() > > + return ret > > > > > > if __name__ == '__main__': > > @@ -642,7 +666,11 @@ if __name__ == '__main__': > > args.outputdir = os.path.abspath(args.outputdir) > > > > try: > > - ret = gen_config(args) > > + if sys.version_info < (3, 7): > > + loop = asyncio.get_event_loop() > > + ret = loop.run_until_complete(gen_config(args)) > > + else: > > + ret = asyncio.run(gen_config(args)) > > except Exception as e: > > print(str(e), file=sys.stderr) > > parser.exit(1) From john at metanate.com Mon Feb 6 16:26:17 2023 From: john at metanate.com (John Keeping) Date: Mon, 6 Feb 2023 16:26:17 +0000 Subject: [Buildroot] [PATCH] package/gcc/gcc-final: map debug prefix when reproducible Message-ID: <20230206162617.1907911-1-john@metanate.com> When building with BR2_REPRODUCIBLE the toolchain wrapper passes -fdebug-prefix-map for all packages that are built. But this doesn't affect the target libraries (like libgcc) built by GCC's build system. GCC 4.3 added a configure option to set the debug prefix map for these libraries, which is used here to avoid encoding potentially non-reproducible build paths into the debug data. Signed-off-by: John Keeping --- package/gcc/gcc-final/gcc-final.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index aa883beb7b..5f222a324c 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -108,6 +108,10 @@ else HOST_GCC_FINAL_CONF_OPTS += --disable-libgomp endif +ifeq ($(BR2_REPRODUCIBLE),y) +HOST_GCC_FINAL_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot +endif + # End with user-provided options, so that they can override previously # defined options. HOST_GCC_FINAL_CONF_OPTS += \ -- 2.39.1 From arnout at mind.be Mon Feb 6 16:50:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 6 Feb 2023 17:50:31 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: switch to async/await format In-Reply-To: <20230206150847.3621475-1-james.hilliard1@gmail.com> References: <20230206150847.3621475-1-james.hilliard1@gmail.com> Message-ID: <3edf52e1-0ba5-c8d0-8501-079a6e21abfe@mind.be> On 06/02/2023 16:08, James Hilliard wrote: > This requires python 3.6 or newer but is a bit cleaner. Does it? According to [1] "The async def type of coroutine was added in Python 3.5" Regards, Arnout [1] https://docs.python.org/3.5/library/asyncio-task.html#coroutines > > Signed-off-by: James Hilliard > --- > utils/genrandconfig | 62 +++++++++++++++++---------------------------- > 1 file changed, 23 insertions(+), 39 deletions(-) > > diff --git a/utils/genrandconfig b/utils/genrandconfig > index b3576f8a51..8947898d88 100755 > --- a/utils/genrandconfig > +++ b/utils/genrandconfig > @@ -28,11 +28,6 @@ import traceback > from distutils.version import StrictVersion > import platform > > -if sys.version_info < (3, 8): > - from asyncio import coroutine > -else: > - from types import coroutine > - > > class SystemInfo: > DEFAULT_NEEDED_PROGS = ["make", "git", "gcc", "timeout"] > @@ -60,8 +55,7 @@ class SystemInfo: > # -- > return None > > - @coroutine > - def has(self, prog): > + async def has(self, prog): > """Checks whether a program is available. > Lazily evaluates missing entries. > > @@ -76,11 +70,11 @@ class SystemInfo: > have_it = self.find_prog(prog) > # java[c] needs special care > if have_it and prog in ('java', 'javac'): > - proc = yield from asyncio.create_subprocess_shell( > + proc = await asyncio.create_subprocess_shell( > "%s -version | grep gcj" % prog, > stdout=asyncio.subprocess.DEVNULL, > stderr=asyncio.subprocess.DEVNULL) > - ret = yield from proc.wait() > + ret = await proc.wait() > if ret != 1: > have_it = False > # -- > @@ -159,8 +153,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): > return configs > > > - at coroutine > -def is_toolchain_usable(configfile, config): > +async def is_toolchain_usable(configfile, config): > """Check if the toolchain is actually usable.""" > > with open(configfile) as configf: > @@ -180,9 +173,9 @@ def is_toolchain_usable(configfile, config): > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: > - proc = yield from asyncio.create_subprocess_exec( > + proc = await asyncio.create_subprocess_exec( > 'ldd', '--version', stdout=asyncio.subprocess.PIPE) > - ldd_version_output, _ = yield from proc.communicate() > + ldd_version_output, _ = await proc.communicate() > if proc.returncode: > return False > glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] > @@ -193,8 +186,7 @@ def is_toolchain_usable(configfile, config): > return True > > > - at coroutine > -def fixup_config(sysinfo, configfile): > +async def fixup_config(sysinfo, configfile): > """Finalize the configuration and reject any problematic combinations > > This function returns 'True' when the configuration has been > @@ -210,8 +202,7 @@ def fixup_config(sysinfo, configfile): > > BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' > > - has_java = yield from sysinfo.has("java") > - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: > + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not await sysinfo.has("java"): > return False > # The ctng toolchain is affected by PR58854 > if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ > @@ -654,8 +645,7 @@ def fixup_config(sysinfo, configfile): > return True > > > - at coroutine > -def gen_config(args): > +async def gen_config(args): > """Generate a new random configuration > > This function generates the configuration, by choosing a random > @@ -713,8 +703,7 @@ def gen_config(args): > > # Randomly enable BR2_REPRODUCIBLE 10% of times > # also enable tar filesystem images for testing > - has_diffoscope = yield from sysinfo.has("diffoscope") > - if has_diffoscope and randint(0, 10) == 0: > + if await sysinfo.has("diffoscope") and randint(0, 10) == 0: > configlines.append("BR2_REPRODUCIBLE=y\n") > configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") > > @@ -728,14 +717,13 @@ def gen_config(args): > with open(configfile, "w+") as configf: > configf.writelines(configlines) > > - proc = yield from asyncio.create_subprocess_exec( > + proc = await asyncio.create_subprocess_exec( > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > - ret = yield from proc.wait() > + ret = await proc.wait() > if ret: > return ret > > - toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) > - if not toolchain_usable: > + if not await is_toolchain_usable(configfile, toolchainconfig): > return 2 > > # Now, generate the random selection of packages, and fixup > @@ -749,37 +737,33 @@ def gen_config(args): > file=sys.stderr) > return 1 > bounded_loop -= 1 > - make_rand = [ > + proc = await asyncio.create_subprocess_exec( > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), > "KCONFIG_PROBABILITY=%d" % randint(1, 20), > - "randpackageconfig" if args.toolchains_csv else "randconfig" > - ] > - proc = yield from asyncio.create_subprocess_exec(*make_rand) > - ret = yield from proc.wait() > + "randpackageconfig" if args.toolchains_csv else "randconfig") > + ret = await proc.wait() > if ret: > return ret > > - ret = yield from fixup_config(sysinfo, configfile) > - if ret: > + if await fixup_config(sysinfo, configfile): > break > > - proc = yield from asyncio.create_subprocess_exec( > + proc = await asyncio.create_subprocess_exec( > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > - ret = yield from proc.wait() > + ret = await proc.wait() > if ret: > return ret > > - proc = yield from asyncio.create_subprocess_exec( > + proc = await asyncio.create_subprocess_exec( > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") > - ret = yield from proc.wait() > + ret = await proc.wait() > if ret: > return ret > > - proc = yield from asyncio.create_subprocess_exec( > + proc = await asyncio.create_subprocess_exec( > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") > - ret = yield from proc.wait() > - return ret > + return await proc.wait() > > > if __name__ == '__main__': From peter at korsgaard.com Mon Feb 6 16:51:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 17:51:26 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.162-cip24 In-Reply-To: <20230206102235.63667-1-angelo@amarulasolutions.com> (Angelo Compagnucci's message of "Mon, 6 Feb 2023 11:22:35 +0100") References: <20230206102235.63667-1-angelo@amarulasolutions.com> Message-ID: <877cwu91pt.fsf@dell.be.48ers.dk> >>>>> "Angelo" == Angelo Compagnucci writes: > Signed-off-by: Angelo Compagnucci Committed, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Mon Feb 6 16:52:09 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 6 Feb 2023 09:52:09 -0700 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: switch to async/await format In-Reply-To: <3edf52e1-0ba5-c8d0-8501-079a6e21abfe@mind.be> References: <20230206150847.3621475-1-james.hilliard1@gmail.com> <3edf52e1-0ba5-c8d0-8501-079a6e21abfe@mind.be> Message-ID: On Mon, Feb 6, 2023 at 9:50 AM Arnout Vandecappelle wrote: > > > > On 06/02/2023 16:08, James Hilliard wrote: > > This requires python 3.6 or newer but is a bit cleaner. > > Does it? According to [1] > > "The async def type of coroutine was added in Python 3.5" Hmm, yeah, must have mixed that up with something else that needed 3.6. > > > Regards, > Arnout > > [1] https://docs.python.org/3.5/library/asyncio-task.html#coroutines > > > > > > Signed-off-by: James Hilliard > > --- > > utils/genrandconfig | 62 +++++++++++++++++---------------------------- > > 1 file changed, 23 insertions(+), 39 deletions(-) > > > > diff --git a/utils/genrandconfig b/utils/genrandconfig > > index b3576f8a51..8947898d88 100755 > > --- a/utils/genrandconfig > > +++ b/utils/genrandconfig > > @@ -28,11 +28,6 @@ import traceback > > from distutils.version import StrictVersion > > import platform > > > > -if sys.version_info < (3, 8): > > - from asyncio import coroutine > > -else: > > - from types import coroutine > > - > > > > class SystemInfo: > > DEFAULT_NEEDED_PROGS = ["make", "git", "gcc", "timeout"] > > @@ -60,8 +55,7 @@ class SystemInfo: > > # -- > > return None > > > > - @coroutine > > - def has(self, prog): > > + async def has(self, prog): > > """Checks whether a program is available. > > Lazily evaluates missing entries. > > > > @@ -76,11 +70,11 @@ class SystemInfo: > > have_it = self.find_prog(prog) > > # java[c] needs special care > > if have_it and prog in ('java', 'javac'): > > - proc = yield from asyncio.create_subprocess_shell( > > + proc = await asyncio.create_subprocess_shell( > > "%s -version | grep gcj" % prog, > > stdout=asyncio.subprocess.DEVNULL, > > stderr=asyncio.subprocess.DEVNULL) > > - ret = yield from proc.wait() > > + ret = await proc.wait() > > if ret != 1: > > have_it = False > > # -- > > @@ -159,8 +153,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): > > return configs > > > > > > - at coroutine > > -def is_toolchain_usable(configfile, config): > > +async def is_toolchain_usable(configfile, config): > > """Check if the toolchain is actually usable.""" > > > > with open(configfile) as configf: > > @@ -180,9 +173,9 @@ def is_toolchain_usable(configfile, config): > > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ > > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ > > 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: > > - proc = yield from asyncio.create_subprocess_exec( > > + proc = await asyncio.create_subprocess_exec( > > 'ldd', '--version', stdout=asyncio.subprocess.PIPE) > > - ldd_version_output, _ = yield from proc.communicate() > > + ldd_version_output, _ = await proc.communicate() > > if proc.returncode: > > return False > > glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] > > @@ -193,8 +186,7 @@ def is_toolchain_usable(configfile, config): > > return True > > > > > > - at coroutine > > -def fixup_config(sysinfo, configfile): > > +async def fixup_config(sysinfo, configfile): > > """Finalize the configuration and reject any problematic combinations > > > > This function returns 'True' when the configuration has been > > @@ -210,8 +202,7 @@ def fixup_config(sysinfo, configfile): > > > > BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' > > > > - has_java = yield from sysinfo.has("java") > > - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: > > + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not await sysinfo.has("java"): > > return False > > # The ctng toolchain is affected by PR58854 > > if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ > > @@ -654,8 +645,7 @@ def fixup_config(sysinfo, configfile): > > return True > > > > > > - at coroutine > > -def gen_config(args): > > +async def gen_config(args): > > """Generate a new random configuration > > > > This function generates the configuration, by choosing a random > > @@ -713,8 +703,7 @@ def gen_config(args): > > > > # Randomly enable BR2_REPRODUCIBLE 10% of times > > # also enable tar filesystem images for testing > > - has_diffoscope = yield from sysinfo.has("diffoscope") > > - if has_diffoscope and randint(0, 10) == 0: > > + if await sysinfo.has("diffoscope") and randint(0, 10) == 0: > > configlines.append("BR2_REPRODUCIBLE=y\n") > > configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") > > > > @@ -728,14 +717,13 @@ def gen_config(args): > > with open(configfile, "w+") as configf: > > configf.writelines(configlines) > > > > - proc = yield from asyncio.create_subprocess_exec( > > + proc = await asyncio.create_subprocess_exec( > > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > > - ret = yield from proc.wait() > > + ret = await proc.wait() > > if ret: > > return ret > > > > - toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) > > - if not toolchain_usable: > > + if not await is_toolchain_usable(configfile, toolchainconfig): > > return 2 > > > > # Now, generate the random selection of packages, and fixup > > @@ -749,37 +737,33 @@ def gen_config(args): > > file=sys.stderr) > > return 1 > > bounded_loop -= 1 > > - make_rand = [ > > + proc = await asyncio.create_subprocess_exec( > > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, > > "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), > > "KCONFIG_PROBABILITY=%d" % randint(1, 20), > > - "randpackageconfig" if args.toolchains_csv else "randconfig" > > - ] > > - proc = yield from asyncio.create_subprocess_exec(*make_rand) > > - ret = yield from proc.wait() > > + "randpackageconfig" if args.toolchains_csv else "randconfig") > > + ret = await proc.wait() > > if ret: > > return ret > > > > - ret = yield from fixup_config(sysinfo, configfile) > > - if ret: > > + if await fixup_config(sysinfo, configfile): > > break > > > > - proc = yield from asyncio.create_subprocess_exec( > > + proc = await asyncio.create_subprocess_exec( > > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") > > - ret = yield from proc.wait() > > + ret = await proc.wait() > > if ret: > > return ret > > > > - proc = yield from asyncio.create_subprocess_exec( > > + proc = await asyncio.create_subprocess_exec( > > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") > > - ret = yield from proc.wait() > > + ret = await proc.wait() > > if ret: > > return ret > > > > - proc = yield from asyncio.create_subprocess_exec( > > + proc = await asyncio.create_subprocess_exec( > > "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") > > - ret = yield from proc.wait() > > - return ret > > + return await proc.wait() > > > > > > if __name__ == '__main__': From peter at korsgaard.com Mon Feb 6 16:42:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 17:42:59 +0100 Subject: [Buildroot] [git commit] linux: bump CIP kernel to version 5.10.162-cip24 Message-ID: <20230206165239.1482B83CB4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3274404b361b8d243fa593391dc6a7c9c47b9961 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- linux/Config.in | 8 ++++---- linux/linux.hash | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index a0e9286bd3..774f1e0975 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -32,7 +32,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.145-cip17)" + bool "Latest CIP SLTS version (5.10.162-cip24)" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL help CIP launched in the spring of 2016 to address the needs of @@ -52,7 +52,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.145-cip17-rt7)" + bool "Latest CIP RT SLTS version (5.10.162-cip24-rt10)" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL help Same as the CIP version, but this is the PREEMPT_RT realtime @@ -129,8 +129,8 @@ endif config BR2_LINUX_KERNEL_VERSION string default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION - default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.145-cip17-rt7" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "5.10.162-cip24-rt10" 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 927172e8fa..e88abe5bb8 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,8 +10,8 @@ sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux- sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed -sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz -sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz +sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz +sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING From vfazio at xes-inc.com Mon Feb 6 13:36:09 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Mon, 6 Feb 2023 13:36:09 +0000 Subject: [Buildroot] [External] - [PATCH v2] boot/arm-trusted-firmware: Barebox available as BL33 In-Reply-To: <20230119185041.3430421-1-casey@xogium.me> References: <20230119183026.3428277-1-casey@xogium.me> <20230119185041.3430421-1-casey@xogium.me> Message-ID: Casey, > -----Original Message----- > From: buildroot On Behalf Of Casey > Reeves > Sent: Thursday, January 19, 2023 12:51 PM > To: buildroot at buildroot.org > Cc: Sergey Matyukevich > Subject: [External] - [Buildroot] [PATCH v2] boot/arm-trusted-firmware: > Barebox available as BL33 > > Since version 2022.04.0, Barebox now support a generic image built for > platforms, to be used as BL33 to generate FIP images. This patch makes it > available as choice of BL33 to be used with ATF and is based on the similar > work put into U-Boot as BL33. > > Signed-off-by: Casey Reeves > > --- > Changes v1 -> v2: > - fixed quoting issue in the default image name > --- > boot/arm-trusted-firmware/Config.in | 21 +++++++++++++++++++ > .../arm-trusted-firmware.mk | 6 ++++++ > 2 files changed, 27 insertions(+) > > diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted- > firmware/Config.in > index a9b9bbcc5a..cb54c6c9d8 100644 > --- a/boot/arm-trusted-firmware/Config.in > +++ b/boot/arm-trusted-firmware/Config.in > @@ -129,6 +129,27 @@ config > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE > > endchoice > > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 > + bool "Use Barebox as BL33" > + depends on BR2_TARGET_BAREBOX Does TFA allow multiple BL33 images to be defined? I don't see a guard if some other package such as U-Boot or EDK2 has been enabled as well. If only one image is supported but multiple images are supplied via BL33 on the make command line, is it last declared wins? > + help > + This option allows to embed the Barebox generic BL33 image in > + the ARM Trusted Firmware. It ensures that the Barebox package > + gets built before ATF, and that the appropriate BL33 > + variable pointing to the generic bl33 image is passed > + when building ATF. > + > +if BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 > + > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE > + string "Barebox BL33 image name" > + default "*-generic-bl33.img" > + help > + Name of the Barebox BL33 image to include in ATF, it must > + have been installed to BINARIES_DIR by the Barebox package. > + > +endif > + > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 > bool "Use U-Boot as BL33" > depends on BR2_TARGET_UBOOT > diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk > b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > index 1164c81410..648f62ed85 100644 > --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk > +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > @@ -105,6 +105,12 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += > AARCH32_SP=optee endif endif # > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE > > +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33),y) > +ARM_TRUSTED_FIRMWARE_BAREBOX_BIN = $(call > +qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE > )) > +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += > +BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_BAREBOX_BIN) > +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += barebox endif > + > ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33),y) > ARM_TRUSTED_FIRMWARE_DEPENDENCIES += edk2 # Since the flash > device name vary between platforms, we use the variable > -- > 2.39.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > CAUTION: This email originated from outside of the organization. Do not click > links or open attachments unless you recognize the sender and know the > content is safe. From fontaine.fabrice at gmail.com Mon Feb 6 17:15:44 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 6 Feb 2023 18:15:44 +0100 Subject: [Buildroot] [PATCH 2020.02.x] package/lxc: fix CVE-2022-47952 Message-ID: <20230206171544.35665-1-fontaine.fabrice@gmail.com> lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may allow local users to infer whether any file exists, even within a protected directory tree, because "Failed to open" often indicates that a file does not exist, whereas "does not refer to a network namespace path" often indicates that a file exists. NOTE: this is different from CVE-2018-6556 because the CVE-2018-6556 fix design was based on the premise that "we will report back to the user that the open() failed but the user has no way of knowing why it failed"; however, in many realistic cases, there are no plausible reasons for failing except that the file does not exist. Signed-off-by: Fabrice Fontaine --- ...ching-an-incoming-CVE-CVE-2022-47952.patch | 73 +++++++++++++++++++ package/lxc/lxc.mk | 3 + 2 files changed, 76 insertions(+) create mode 100644 package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch diff --git a/package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch b/package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch new file mode 100644 index 0000000000..071734848a --- /dev/null +++ b/package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch @@ -0,0 +1,73 @@ +From 1b0469530d7a38b8f8990e114b52530d1bf7f3b8 Mon Sep 17 00:00:00 2001 +From: Maher Azzouzi +Date: Sun, 25 Dec 2022 13:50:25 +0100 +Subject: [PATCH] Patching an incoming CVE (CVE-2022-47952) + +lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may +allow local users to infer whether any file exists, even within a +protected directory tree, because "Failed to open" often indicates +that a file does not exist, whereas "does not refer to a network +namespace path" often indicates that a file exists. NOTE: this is +different from CVE-2018-6556 because the CVE-2018-6556 fix design was +based on the premise that "we will report back to the user that the +open() failed but the user has no way of knowing why it failed"; +however, in many realistic cases, there are no plausible reasons for +failing except that the file does not exist. + +PoC: +> % ls /l +> ls: cannot open directory '/l': Permission denied +> % /usr/lib/x86_64-linux-gnu/lxc/lxc-user-nic delete lol lol /l/h/tt h h +> cmd/lxc_user_nic.c: 1096: main: Failed to open "/l/h/tt" <----- file does not exist. +> % /usr/lib/x86_64-linux-gnu/lxc/lxc-user-nic delete lol lol /l/h/t h h +> cmd/lxc_user_nic.c: 1101: main: Path "/l/h/t" does not refer to a network namespace path <---- file exist! + +Signed-off-by: MaherAzzouzi +Acked-by: Serge Hallyn + +[Retrieved from: +https://github.com/lxc/lxc/commit/1b0469530d7a38b8f8990e114b52530d1bf7f3b8] +Signed-off-by: Fabrice Fontaine +--- + src/lxc/cmd/lxc_user_nic.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +diff --git a/src/lxc/cmd/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c +index a91e2259d5..69bc6f17d1 100644 +--- a/src/lxc/cmd/lxc_user_nic.c ++++ b/src/lxc/cmd/lxc_user_nic.c +@@ -1085,20 +1085,17 @@ int main(int argc, char *argv[]) + } else if (request == LXC_USERNIC_DELETE) { + char opath[LXC_PROC_PID_FD_LEN]; + +- /* Open the path with O_PATH which will not trigger an actual +- * open(). Don't report an errno to the caller to not leak +- * information whether the path exists or not. +- * When stracing setuid is stripped so this is not a concern +- * either. +- */ ++ // Keep in mind CVE-2022-47952: It's crucial not to leak any ++ // information whether open() succeeded of failed. ++ + netns_fd = open(args.pid, O_PATH | O_CLOEXEC); + if (netns_fd < 0) { +- usernic_error("Failed to open \"%s\"\n", args.pid); ++ usernic_error("Failed while opening netns file for \"%s\"\n", args.pid); + _exit(EXIT_FAILURE); + } + + if (!fhas_fs_type(netns_fd, NSFS_MAGIC)) { +- usernic_error("Path \"%s\" does not refer to a network namespace path\n", args.pid); ++ usernic_error("Failed while opening netns file for \"%s\"\n", args.pid); + close(netns_fd); + _exit(EXIT_FAILURE); + } +@@ -1112,7 +1109,7 @@ int main(int argc, char *argv[]) + /* Now get an fd that we can use in setns() calls. */ + ret = open(opath, O_RDONLY | O_CLOEXEC); + if (ret < 0) { +- CMD_SYSERROR("Failed to open \"%s\"\n", args.pid); ++ CMD_SYSERROR("Failed while opening netns file for \"%s\"\n", args.pid); + close(netns_fd); + _exit(EXIT_FAILURE); + } diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 7994dffcf5..881869969d 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -13,6 +13,9 @@ LXC_INSTALL_STAGING = YES # We're patching configure.ac LXC_AUTORECONF = YES +# 0005-Patching-an-incoming-CVE-CVE-2022-47952.patch +LXC_IGNORE_CVES += CVE-2022-47952 + LXC_CONF_OPTS = \ --disable-apparmor \ --disable-examples \ -- 2.39.0 From romain.naour at smile.fr Mon Feb 6 18:13:54 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 19:13:54 +0100 Subject: [Buildroot] [PATCH v5 01/10] package/cpuinfo: new package In-Reply-To: References: <20230130002854.2300661-1-james.hilliard1@gmail.com> <301bf244-5eb8-3903-3371-80de9a6810aa@smile.fr> <282c5a46-37ed-6c07-9b72-86133a71750a@smile.fr> Message-ID: <1f8f6719-f816-b7a4-6837-840db623461a@smile.fr> Le 06/02/2023 ? 17:33, James Hilliard a ?crit?: > On Mon, Feb 6, 2023 at 9:24 AM Romain Naour wrote: >> >> Hello James, >> >> Le 06/02/2023 ? 16:53, Romain Naour a ?crit : >>> Hello James, >>> >>> Le 30/01/2023 ? 01:28, James Hilliard a ?crit : >>>> From: Stefan Hager >>>> >>>> This package is required by tensorflow-lite. >>>> >>>> Add a patch removing cpp requirement when not building tests. >>>> >>>> Tested-by: Stefan Hager >>>> Signed-off-by: Stefan Hager >>>> Signed-off-by: James Hilliard >>>> --- >>>> Changes v4 -> v5: >>>> - don't require cpp >>>> Changes v2 -> v3: >>>> - move to libraries->hardware handling >>>> --- >> >> [...] >> >>>> diff --git a/package/cpuinfo/Config.in b/package/cpuinfo/Config.in >>>> new file mode 100644 >>>> index 0000000000..d3c3b08400 >>>> --- /dev/null >>>> +++ b/package/cpuinfo/Config.in >>>> @@ -0,0 +1,8 @@ >>>> +config BR2_PACKAGE_CPUINFO >>>> + bool "cpuinfo" >>> >>> Have you checked cpuinfo dependencies ? >>> >>> It seems XNNPack used by cpuinfo is 64bits architectures only: >>> >>> CMake Warning at CMakeLists.txt:69 (MESSAGE): >>> Target processor architecture "l" is not supported in cpuinfo. cpuinfo >>> will compile, but cpuinfo_initialize() will always fail. >>> >>> hint: >>> https://github.com/NobuoTsukamoto/meta-tensorflow-lite/blob/main/recipes-tools/tensorflow-lite/tensorflow-lite-benchmark_2.11.0.bb#L33 >>> >>> And trigger a build issue on uClibc-ng due to missing header: >>> >>> cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:19:11: >>> fatal error: sys/auxv.h: No such file or directory >>> 19 | #include >>> >>> Also static build is not likely supported: >>> >>> cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57/src/arm/linux/hwcap.c:8:10: >>> fatal error: dlfcn.h: No such file or directory >>> 8 | #include >> >> Actually there is an architecture dependency: x86, x86_64, arm, aarch64. >> Also it requires threads support: >> >> https://github.com/pytorch/cpuinfo/blob/main/src/init.c#L24 > > Well...those architecture dependencies kinda look like runtime deps > to me...a consuming application could call cpuinfo_initialize() with > error handling and fallback to some other codepath automatically on > failure. > > So probably we don't want to apply an architecture restriction unless > there's an actual build failure. With the sourcery-arm-armv4t cpuinfo build will fail: CMake Warning at CMakeLists.txt:69 (MESSAGE): Target processor architecture "armv4l" is not supported in cpuinfo. cpuinfo will compile, but cpuinfo_initialize() will always fail. libcpuinfo.so: hidden symbol `cpuinfo_arm_linux_init' isn't defined The architecture support other than announced (arm,aarch64, x86 and x86_64) seems uncertain. In doubt, it seems to be legit to add architecture dependencies. Best regards, Romain > >> >> Best regards, >> Romain >> >>> >>> Best regards, >>> Romain >>> From romain.naour at smile.fr Mon Feb 6 18:38:20 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 19:38:20 +0100 Subject: [Buildroot] [PATCH v5 03/10] package/gemmlowp: new package In-Reply-To: <20230130002854.2300661-3-james.hilliard1@gmail.com> References: <20230130002854.2300661-1-james.hilliard1@gmail.com> <20230130002854.2300661-3-james.hilliard1@gmail.com> Message-ID: Hello James, Le 30/01/2023 ? 01:28, James Hilliard a ?crit?: > From: Stefan Hager > > This package is required by tensorflow-lite. > > Tested-by: Stefan Hager > Signed-off-by: Stefan Hager > Signed-off-by: James Hilliard > --- > Changes v4 -> v5: > - add comment indicating library is header only > Changes v2 -> v3: > - add C++11 dependency > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/gemmlowp/Config.in | 12 ++++++++++++ > package/gemmlowp/gemmlowp.hash | 4 ++++ > package/gemmlowp/gemmlowp.mk | 16 ++++++++++++++++ > 5 files changed, 34 insertions(+) > create mode 100644 package/gemmlowp/Config.in > create mode 100644 package/gemmlowp/gemmlowp.hash > create mode 100644 package/gemmlowp/gemmlowp.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 57d364012c..01e64e5fc5 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2725,6 +2725,7 @@ F: package/ti-gfx/ > > N: Stefan Hager > F: package/cpuinfo/ > +F: package/gemmlowp/ > F: package/ruy/ > > N: Stefan Ott > diff --git a/package/Config.in b/package/Config.in > index 0d3fd37796..8fd8f05bd6 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2018,6 +2018,7 @@ menu "Other" > source "package/fxdiv/Config.in" > source "package/gconf/Config.in" > source "package/gdal/Config.in" > + source "package/gemmlowp/Config.in" > source "package/gflags/Config.in" > source "package/gli/Config.in" > source "package/glibmm/Config.in" > diff --git a/package/gemmlowp/Config.in b/package/gemmlowp/Config.in > new file mode 100644 > index 0000000000..379450d1b0 > --- /dev/null > +++ b/package/gemmlowp/Config.in > @@ -0,0 +1,12 @@ > +config BR2_PACKAGE_GEMMLOWP > + bool "gemmlowp" > + depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 > + help > + Low-precision matrix multiplication. > + > + https://github.com/google/gemmlowp > + > +comment "gemmlowp needs a toolchain w/ C++11" > + depends on !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > diff --git a/package/gemmlowp/gemmlowp.hash b/package/gemmlowp/gemmlowp.hash > new file mode 100644 > index 0000000000..7c56a18bb6 > --- /dev/null > +++ b/package/gemmlowp/gemmlowp.hash > @@ -0,0 +1,4 @@ > +# Locally calculated > +sha256 cc8a22b6f071c3781e6b4b72654c89b1cdc198e72ebadebb17638eac205344c1 gemmlowp-08e4bb339e34017a0835269d4a37c4ea04d15a69.tar.gz > +# License files, locally calculated > +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/gemmlowp/gemmlowp.mk b/package/gemmlowp/gemmlowp.mk > new file mode 100644 > index 0000000000..9489dccbe5 > --- /dev/null > +++ b/package/gemmlowp/gemmlowp.mk > @@ -0,0 +1,16 @@ > +################################################################################ > +# > +# gemmlowp > +# > +################################################################################ > + > +GEMMLOWP_VERSION = 08e4bb339e34017a0835269d4a37c4ea04d15a69 > +GEMMLOWP_SITE = $(call github,google,gemmlowp,$(GEMMLOWP_VERSION)) > +GEMMLOWP_LICENSE = Apache-2.0 > +GEMMLOWP_LICENSE_FILES = LICENSE > +GEMMLOWP_INSTALL_STAGING = YES > +# Only installs a header > +GEMMLOWP_INSTALL_TARGET = NO Ok but libeight_bit_int_gemm.so is installed in staging. What can go wrong if something is linking against it ? Best regards, Romain > +GEMMLOWP_SUBDIR = contrib > + > +$(eval $(cmake-package)) From romain.naour at smile.fr Mon Feb 6 19:04:14 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 20:04:14 +0100 Subject: [Buildroot] [PATCH v5 04/10] package/pthreadpool: new package In-Reply-To: <20230130002854.2300661-4-james.hilliard1@gmail.com> References: <20230130002854.2300661-1-james.hilliard1@gmail.com> <20230130002854.2300661-4-james.hilliard1@gmail.com> Message-ID: <1232ab4c-793d-7777-4a55-1f6fa45fcf8b@smile.fr> Le 30/01/2023 ? 01:28, James Hilliard a ?crit?: > This package is required by tensorflow-lite. > > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/pthreadpool/Config.in | 8 +++++++ > package/pthreadpool/pthreadpool.hash | 4 ++++ > package/pthreadpool/pthreadpool.mk | 33 ++++++++++++++++++++++++++++ > 5 files changed, 47 insertions(+) > create mode 100644 package/pthreadpool/Config.in > create mode 100644 package/pthreadpool/pthreadpool.hash > create mode 100644 package/pthreadpool/pthreadpool.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 01e64e5fc5..6d25f44dcd 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2726,6 +2726,7 @@ F: package/ti-gfx/ > N: Stefan Hager > F: package/cpuinfo/ > F: package/gemmlowp/ > +F: package/pthreadpool/ > F: package/ruy/ > > N: Stefan Ott > diff --git a/package/Config.in b/package/Config.in > index 8fd8f05bd6..873aade1a6 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2118,6 +2118,7 @@ endif > source "package/protobuf/Config.in" > source "package/protobuf-c/Config.in" > source "package/protozero/Config.in" > + source "package/pthreadpool/Config.in" > source "package/qhull/Config.in" > source "package/qlibc/Config.in" > source "package/riemann-c-client/Config.in" > diff --git a/package/pthreadpool/Config.in b/package/pthreadpool/Config.in > new file mode 100644 > index 0000000000..194ae33f85 > --- /dev/null > +++ b/package/pthreadpool/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_PTHREADPOOL > + bool "pthreadpool" The CMakelists.txt requires C++ support: PROJECT(pthreadpool C CXX) Toolchain with threads support seems to be required: src/pthreads.c:#include src/threadpool-object.h:#include Best regards, Romain > + select BR2_PACKAGE_FXDIV > + help > + Pthreadpool is a portable and efficient thread pool > + implementation. > + > + https://github.com/Maratyszcza/pthreadpool > diff --git a/package/pthreadpool/pthreadpool.hash b/package/pthreadpool/pthreadpool.hash > new file mode 100644 > index 0000000000..164ac55390 > --- /dev/null > +++ b/package/pthreadpool/pthreadpool.hash > @@ -0,0 +1,4 @@ > +# Locally calculated > +sha256 ae75adb19807ea28582683b38dd4e79a6b287751452564b42e214bb21216ef14 pthreadpool-43edadc654d6283b4b6e45ba09a853181ae8e850.tar.gz > +# License files, locally calculated > +sha256 57814a606b4d0fb087d9a534919084b6c11b58a4174cb5a4aef200187780dc3a LICENSE > diff --git a/package/pthreadpool/pthreadpool.mk b/package/pthreadpool/pthreadpool.mk > new file mode 100644 > index 0000000000..4ef7949da2 > --- /dev/null > +++ b/package/pthreadpool/pthreadpool.mk > @@ -0,0 +1,33 @@ > +################################################################################ > +# > +# pthreadpool > +# > +################################################################################ > + > +PTHREADPOOL_VERSION = 43edadc654d6283b4b6e45ba09a853181ae8e850 > +PTHREADPOOL_SITE = $(call github,Maratyszcza,pthreadpool,$(PTHREADPOOL_VERSION)) > +PTHREADPOOL_LICENSE = BSD-2-Clause > +PTHREADPOOL_LICENSE_FILES = LICENSE > +PTHREADPOOL_INSTALL_STAGING = YES > +PTHREADPOOL_DEPENDENCIES = fxdiv > + > +PTHREADPOOL_CFLAGS = $(TARGET_CFLAGS) > +PTHREADPOOL_CXXFLAGS = $(TARGET_CXXFLAGS) > + > +ifeq ($(BR2_PACKAGE_CPUINFO),y) > +PTHREADPOOL_DEPENDENCIES += cpuinfo > +PTHREADPOOL_CFLAGS += -DPTHREADPOOL_USE_CPUINFO=1 > +PTHREADPOOL_CXXFLAGS += -DPTHREADPOOL_USE_CPUINFO=1 > +else > +PTHREADPOOL_CFLAGS += -DPTHREADPOOL_USE_CPUINFO=0 > +PTHREADPOOL_CXXFLAGS += -DPTHREADPOOL_USE_CPUINFO=0 > +endif > + > +PTHREADPOOL_CONF_OPTS = \ > + -DCMAKE_C_FLAGS="$(PTHREADPOOL_CFLAGS)" \ > + -DCMAKE_CXX_FLAGS="$(PTHREADPOOL_CXXFLAGS)" \ > + -DFXDIV_SOURCE_DIR="$(FXDIV_DIR)" \ > + -DPTHREADPOOL_BUILD_TESTS=OFF \ > + -DPTHREADPOOL_BUILD_BENCHMARKS=OFF > + > +$(eval $(cmake-package)) From romain.naour at smile.fr Mon Feb 6 20:25:03 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 21:25:03 +0100 Subject: [Buildroot] [PATCH] Config.in: introduce BR2_TIME_BITS_64 option for Y2038 compatibility In-Reply-To: <20221013163910.3c6d9c8f@windsurf> References: <20221012215008.2918444-1-thomas.petazzoni@bootlin.com> <5eebf7dee2a585f50a4e986c214677a157bfd22c.camel@calian.com> <20221013163910.3c6d9c8f@windsurf> Message-ID: <5d683c3c-1229-70e6-1736-ca01dd1a7159@smile.fr> Hello Thomas, Le 13/10/2022 ? 16:39, Thomas Petazzoni via buildroot a ?crit?: > On Wed, 12 Oct 2022 23:49:37 +0000 > Robert Hancock wrote: > >> There's some chance of software being broken by enabling this, with >> either a compile or runtime failure. For example, applications that >> assume sizeof(time_t) == sizeof(long) would work on 32-bit platforms >> with a 32-bit time and 64-bit platforms with a 64-bit time, but fail >> with a 64-bit time on 32-bit. I believe I've seen this when trying to >> build software with that option, so turning this on unconditionally >> might be unwise, unless some build tests of the supported packages >> have been done.. > > There will definitely be build testing: our autobuilders are testing > 24/7 random configurations of Buildroot. So as soon as we introduce > this option, there would be builds with BR2_TIME_BITS_64=y enabled, > which would raise build issues if there's any. > > Of course, the more tricky part are runtime issues, which are > essentially impossible to detect until someone runs into the problem. We already tried to enable BR2_TIME_BITS_64 back in March 2022 but we had to revert it due to build issues with packages like glibc: See: http://lists.busybox.net/pipermail/buildroot/2022-March/638105.html https://git.buildroot.net/buildroot/commit/?id=dd170f0cbad729dba4193b2b20e3de0a7010d485 I'll try to look again. Best regards, Romain > > Best regards, > > Thomas From petr.vorel at gmail.com Mon Feb 6 20:58:54 2023 From: petr.vorel at gmail.com (Petr Vorel) Date: Mon, 6 Feb 2023 21:58:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/iputils: bump version to 20221126 In-Reply-To: <20230206112156.GC3565@scaer> References: <20221126003807.462157-1-pevik@seznam.cz> <20230206112156.GC3565@scaer> Message-ID: Hi Yann, thanks a lot for merging. I completely forgot on this patch, I'm glad it was not lost in the queue. Kind regards, Petr From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit] Makefile: add target to update .checkpackageignore Message-ID: <20230206210854.71BC983CFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd28acc1e8085c15d12e233090550580dafe1f96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When a developer fixes an ignored warning from check-package, he/she needs to update .checkpackageignore By running './utils/docker-run make check-package' the developer receives a warning about this. Make that change easier to make, by adding a helper target on Makefile. Add an option --failed-only to check-package that generates output in the format: [ ...] This is the very same format used by check-package ignore file. Add the phony target .checkpackageignore So one can update the ignore file using: $ ./utils/docker-run make .checkpackageignore Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- Makefile | 5 +++++ utils/check-package | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f39af5eae9..817cfed13c 100644 --- a/Makefile +++ b/Makefile @@ -1261,6 +1261,11 @@ check-package: -a -not -name '*.orig' -a -not -name '*.rej' \ -exec ./utils/check-package --exclude=Sob {} + +.PHONY: .checkpackageignore +.checkpackageignore: + find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ + -exec ./utils/check-package --exclude=Sob --failed-only {} > .checkpackageignore + + include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) diff --git a/utils/check-package b/utils/check-package index f08e76b374..848311bac8 100755 --- a/utils/check-package +++ b/utils/check-package @@ -63,11 +63,17 @@ def parse_args(): help="do not run the specified functions (debug)") parser.add_argument("--dry-run", action="store_true", help="print the " "functions that would be called for each file (debug)") + parser.add_argument("--failed-only", action="store_true", help="print only" + " the name of the functions that failed (debug)") flags = parser.parse_args() flags.ignore_list = get_ignored_parsers_per_file(flags.intree_only, flags.ignore_filename) + if flags.failed_only: + flags.dry_run = False + flags.verbose = -1 + return flags @@ -221,6 +227,11 @@ def check_file_using_lib(fname): .format(fname, should_fail, flags.ignore_filename)) nwarnings += 1 + if flags.failed_only: + if len(failed) > 0: + f = " ".join(sorted(failed)) + print("{} {}".format(fname, f)) + return nwarnings, nlines @@ -259,7 +270,7 @@ def __main__(): print("{} lines processed".format(total_lines), file=sys.stderr) print("{} warnings generated".format(total_warnings), file=sys.stderr) - if total_warnings > 0: + if total_warnings > 0 and not flags.failed_only: sys.exit(1) From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit] docs/manual: check-package before submitting patch Message-ID: <20230206210854.8A21F83CFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efccb2a7dd909f8f9b316d809859b9434a2737b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add 'utils/docker-run make check-package' to the default workflow of submitting patches, just after the rebase and before using format-patch. Cc: Thomas De Schampheleire Cc: Romain Naour Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- docs/manual/contribute.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index e588c69be6..94f1c64496 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -294,6 +294,12 @@ $ git fetch --all --tags $ git rebase origin/master --------------------- +Now check the coding style for the changes you committed: + +--------------------- +$ utils/docker-run make check-package +--------------------- + Now, you are ready to generate then submit your patch set. To generate it, run: From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit] support/docker: add python3-magic Message-ID: <20230206210854.962E583CFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcd15aa08aab1e8292b93995c44dc765a9801632 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It will be needed by check-package to run checks according to the file type (the same determined by the command 'file'). Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index f54c31b54a..d775ae23e1 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -39,6 +39,7 @@ RUN apt-get install -y --no-install-recommends \ openssh-server \ python3 \ python3-flake8 \ + python3-magic \ python3-nose2 \ python3-pexpect \ python3-pytest \ From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit] Makefile: make check-package assume a git tree Message-ID: <20230206210854.7DF4D83D00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aeec8faf3189b5dde90c465a9b14897406b1fc08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ... just like check-flake8 already does. When a new check_function is added to check-package, often there are files in the tree that would generate warnings. An example is the Sob check_function for patch files: | $ ./utils/check-package --i Sob $(git ls-files) >/dev/null | 369301 lines processed | 46 warnings generated Currently these warnings are listed when calling check-package directly, and also at the output of pkg-stats, but the check_function does not run on 'make check-package' (that is used to catch regressions on GitLab CI 'check-package' job) until all warnings in the tree are fixed. This (theoretically) allows new .patch files be added without SoB, without the GitLab CI catching it. Since now check-package has an ignore file to list all warnings in the tree, that will eventually be fixed, there is no need to filter the files passed to check-package. So test all files in the tree when 'make check-package' is called. It brings following advantages; - any new check_function added to check-package takes place immediately for new files; - adding new check_functions is less traumatic to the developer doing this, since he/she does not need anymore to fix all warnings in the tree before the new check_function takes effect; - prevent regressions, e.g. ANY new .patch file must have SoB; - as a side-effect, print a single statistics line as output of 'make ckeck-package'. But just enabling the check would generate many warnings when 'make check-package' is called, so update the ignore file by using: $ ./utils/docker-run make .checkpackageignore Notice: in order to ensure reproducible results, one should run 'make check-package' and 'make .checkpackageignore' inside the docker image, otherwise a variation in shellcheck version (installed in the host) can produce different results. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 8 +-- 2 files changed, 183 insertions(+), 5 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index e69de29bb2..b1f2d99b99 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -0,0 +1,180 @@ +package/alsamixergui/0001-misc-fixes.patch Sob +package/am33x-cm3/S93-am335x-pm-firmware-load Variables +package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch Sob +package/apache/S50apache Indent Shellcheck Variables +package/at/S99at Indent Variables +package/audit/S02auditd Shellcheck Variables +package/avahi/S05avahi-setup.sh Indent Variables +package/avahi/S50avahi-daemon Indent Variables +package/babeld/S50babeld Indent Shellcheck Variables +package/bind/S81named Indent Shellcheck Variables +package/bluez5_utils/S40bluetooth NotExecutable Variables +package/boinc/S99boinc-client Indent Shellcheck Variables +package/brickd/S70brickd Indent Shellcheck Variables +package/brltty/S10brltty Indent Shellcheck Variables +package/busybox/S02sysctl Variables +package/busybox/S10mdev ConsecutiveEmptyLines Indent Shellcheck +package/busybox/S15watchdog Indent Variables +package/busybox/S50telnet Indent Shellcheck Variables +package/c-icap/S96cicap Indent Shellcheck Variables +package/cfm/S65cfm Indent Variables +package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables +package/chrony/S49chrony Indent Shellcheck Variables +package/connman/S45connman Variables +package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob +package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob +package/curlftpfs/0003-nocache-memleak-fix.patch Sob +package/dante/S50dante Indent Shellcheck Variables +package/darkhttpd/S50darkhttpd Indent Shellcheck Variables +package/dbus/S30dbus Indent Shellcheck TrailingSpace Variables +package/dcron/S90dcron Variables +package/dhcp/S80dhcp-relay Shellcheck Variables +package/dhcp/S80dhcp-server Shellcheck Variables +package/dhcpcd/S41dhcpcd Indent Variables +package/dhrystone/0001-cmdline-nruns.patch Sob +package/dhrystone/0002-HZ.patch Sob +package/dhrystone/0003-exit.patch Sob +package/dhrystone/0004-headers.patch Sob +package/dhrystone/0005-prototypes.patch Sob +package/directfb-examples/0001-remove-bzero.patch Sob +package/dmraid/S20dmraid Variables +package/dnsmasq/S80dnsmasq Shellcheck Variables +package/docker-engine/S60dockerd Indent Shellcheck Variables +package/domoticz/S99domoticz Shellcheck +package/dropbear/S50dropbear Indent Shellcheck Variables +package/earlyoom/S02earlyoom Indent Shellcheck +package/ejabberd/S50ejabberd Indent Shellcheck Variables +package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables +package/exim/S86exim Indent Variables +package/fail2ban/S60fail2ban Shellcheck Variables +package/fbv/0001-cross.patch Sob +package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob +package/fbv/0005-include.patch Sob +package/freescale-imx/imx-uuc/S80imx-uuc Indent Shellcheck Variables +package/frr/S50frr Shellcheck +package/gamin/0002-no-const-return.patch Sob +package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch Sob +package/genromfs/0001-build-system.patch Sob +package/gerbera/S99gerbera Indent +package/gpsd/S50gpsd Indent Shellcheck Variables +package/haveged/S21haveged Shellcheck Variables +package/htpdate/S43htpdate Shellcheck +package/i2pd/S99i2pd Indent Shellcheck Variables +package/ifplugd/0001-cross.patch Sob +package/ifplugd/0002-fix-headers.patch Sob +package/ifupdown-scripts/S40network EmptyLastLine Indent Shellcheck Variables +package/igd2-for-linux/S99upnpd Indent Shellcheck Variables +package/inadyn/S70inadyn Indent NotExecutable +package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Variables +package/iptables/S35iptables Shellcheck +package/irda-utils/0001-daemon.patch Sob +package/irda-utils/0002-nommu.patch Sob +package/irda-utils/0003-subdir.patch Sob +package/irqbalance/S13irqbalance Indent Shellcheck Variables +package/iucode-tool/S00iucode-tool Variables +package/iwd/S40iwd Shellcheck Variables +package/keyutils/0002-cifs.patch Sob +package/kodi/S50kodi Shellcheck Variables +package/libart/0001-art-config-cross.patch Sob +package/libcgicc/0001-disable-documentation-option.patch Sob +package/libfcgi/0002-disable-examples.patch Sob +package/libftdi/0001-pkgconfig_libusb.patch Sob +package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch Sob +package/libiio/S99iiod Shellcheck Variables +package/libmad/0001-mips-h-constraint-removal.patch Sob +package/lighttpd/S50lighttpd EmptyLastLine Indent Shellcheck Variables +package/linux-tools/S10hyperv Indent Variables +package/linuxptp/S65ptp4l Indent Shellcheck +package/linuxptp/S66phc2sys Indent Shellcheck +package/lirc-tools/S25lircd Indent Variables +package/lite/0001-dfbspy-stat.patch Sob +package/lite/0002-no-tests.patch Sob +package/lite/0003-pkg-config.patch Sob +package/lldpd/S60lldpd Indent Shellcheck Variables +package/lockfile-progs/0001-sus3v-legacy.patch Sob +package/madplay/0001-switch-to-new-alsa-api.patch Sob +package/mariadb/S97mysqld Indent Shellcheck Variables +package/mender-connect/S43mender-connect Shellcheck +package/mii-diag/0001-strchr.patch Sob +package/minidlna/S60minidlnad Indent Shellcheck Variables +package/minissdpd/S50minissdpd Indent Shellcheck Variables +package/modem-manager/S44modem-manager Shellcheck Variables +package/mosquitto/S50mosquitto Indent Shellcheck Variables +package/motion/S99motion Indent Shellcheck Variables +package/mpd/S95mpd Variables +package/mrouted/S41mrouted NotExecutable +package/mrp/S65mrp Indent Variables +package/multipath-tools/S60multipathd Shellcheck +package/neard/S53neard Indent Shellcheck Variables +package/netatalk/S50netatalk EmptyLastLine Indent Variables +package/netcat/0001-signed-bit-counting.patch Sob +package/netopeer2/S52netopeer2 Shellcheck Variables +package/netplug/0001-makefile-flags.patch Sob +package/netplug/S29netplug Indent Shellcheck Variables +package/netsnmp/S59snmpd Indent Shellcheck Variables +package/network-manager/S45network-manager ConsecutiveEmptyLines EmptyLastLine Shellcheck Variables +package/nfs-utils/S60nfs ConsecutiveEmptyLines Shellcheck Variables +package/nginx/S50nginx Indent Variables +package/nodm/S90nodm Indent Shellcheck Variables +package/nss-pam-ldapd/S45nslcd EmptyLastLine Indent Shellcheck Variables +package/ntp/S49ntp.in Variables +package/ofono/S46ofono Variables +package/olsr/S50olsr Indent Shellcheck Variables +package/openntpd/S49ntp Shellcheck Variables +package/openssh/S50sshd EmptyLastLine Indent Variables +package/openvpn/S60openvpn Indent Shellcheck Variables +package/oracle-mysql/S97mysqld Shellcheck Variables +package/owfs/S55owserver Shellcheck Variables +package/owfs/S60owfs Shellcheck Variables +package/pigpio/S50pigpio Shellcheck Variables +package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob +package/postgresql/S50postgresql Variables +package/procps-ng/S02sysctl Variables +package/proftpd/S50proftpd Indent Shellcheck Variables +package/prosody/S50prosody Indent Shellcheck Variables +package/ptpd/S65ptpd Indent Shellcheck Variables +package/ptpd2/S65ptpd2 Indent Shellcheck Variables +package/pulseaudio/S50pulseaudio ConsecutiveEmptyLines EmptyLastLine Indent Variables +package/python-web2py/S51web2py Shellcheck Variables +package/rdesktop/0001-8bit-colors.patch Sob +package/redis/S50redis Shellcheck Variables +package/restorecond/S02restorecond Shellcheck +package/rng-tools/S21rngd Shellcheck Variables +package/rpcbind/S30rpcbind EmptyLastLine Indent Variables +package/rubix/0002-misc-fixes.patch Sob +package/rygel/S99rygel Indent Shellcheck Variables +package/samba4/S91smb Indent Shellcheck Variables +package/seatd/S70seatd NotExecutable Variables +package/ser2net/S50ser2net Indent Shellcheck Variables +package/shairport-sync/S99shairport-sync Indent Shellcheck Variables +package/smcroute/S41smcroute Indent NotExecutable Variables +package/smstools3/S50smsd Shellcheck Variables +package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch Sob +package/squid/S97squid Indent Shellcheck Variables +package/sshguard/S49sshguard Indent +package/sslh/S35sslh Indent Shellcheck Variables +package/stunnel/S50stunnel Indent Shellcheck Variables +package/supervisor/S99supervisord Variables +package/suricata/S99suricata Shellcheck +package/sysrepo/S51sysrepo-plugind Indent Shellcheck +package/targetcli-fb/S50target Shellcheck Variables +package/tcf-agent/S55tcf-agent Shellcheck Variables +package/tftpd/S80tftpd-hpa Indent Shellcheck Variables +package/ti-gfx/S80ti-gfx Shellcheck Variables +package/ti-sgx-um/S80ti-sgx Variables +package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables +package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables +package/triggerhappy/S10triggerhappy Indent Shellcheck Variables +package/tvheadend/S99tvheadend Indent Shellcheck Variables +package/unbound/S70unbound Shellcheck +package/unscd/S46unscd Indent Shellcheck Variables +package/upmpdcli/S99upmpdcli Indent Shellcheck Variables +package/urandom-scripts/S20urandom Variables +package/usbguard/S20usbguard Indent Shellcheck Variables +package/vsftpd/S70vsftpd Indent Shellcheck Variables +package/watchdogd/S01watchdogd Indent NotExecutable +package/x11r7/xapp_xdm/S99xdm Indent Variables +package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob +package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob +package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob +package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables diff --git a/Makefile b/Makefile index 817cfed13c..49ee4ff119 100644 --- a/Makefile +++ b/Makefile @@ -1257,14 +1257,12 @@ check-flake8: | xargs -- python3 -m flake8 --statistics check-package: - find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ - -a -not -name '*.orig' -a -not -name '*.rej' \ - -exec ./utils/check-package --exclude=Sob {} + + $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` .PHONY: .checkpackageignore .checkpackageignore: - find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ - -exec ./utils/check-package --exclude=Sob --failed-only {} > .checkpackageignore + + $(Q)./utils/check-package --failed-only `git ls-tree -r --name-only HEAD` \ + > .checkpackageignore include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit] utils/check-package: decouple adding rules from fixing all intree files Message-ID: <20230206210854.598AC83CFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ddf4586b00a97c41c4ad4d50da4282c62940c05b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When a new check_function is added to check-package, often there are files in the tree that would generate warnings. An example is the Sob check_function for patch files: | $ ./utils/check-package --i Sob $(git ls-files) >/dev/null | 369301 lines processed | 46 warnings generated Currently these warnings are listed when calling check-package directly, and also at the output of pkg-stats, but the check_function does not run on 'make check-package' (that is used to catch regressions on GitLab CI 'check-package' job) until all warnings in the tree are fixed. This (theoretically) allows new .patch files be added without SoB, without the GitLab CI catching it. So add a way to check-package itself ignore current warnings, while still catching new files that do not follow that new check_function. Add a file named .checkpackageignore to the buildroot topdir. It contains the list of check_functions that are expected to fail for each given intree file tested by check-package. Each entries is in the format: [ ...] These are 2 examples of possible entries: package/initscripts/init.d/rcK ConsecutiveEmptyLines EmptyLastLine Shellcheck utils/test-pkg Shellcheck Keeping such a list allows us to have fine-grained control over which warning to ignore. In order to avoid this list to grow indefinitely, containing entries for files that are already fixed, make each entry an 'expected to fail' instead of just an 'ignore', and generate a warning if a check_function that was expect to fail for a given files does not generate that warning. Unfortunately one case that do not generate warning is an entry for a file that is deleted in a later commit. By default, all checks are applied. The --ignore-list option allows to specify a file that contains the list of warnings that should be ignored. The paths in the ignore file must be relative to the location of the ignore file itself, which means: - in the main Buildroot tree, the paths in the ignore file are relative to the root of the main Buildroot tree - in a BR2_EXTERNAL tree, if the ignore file is at the root of the BR2_EXTERNAL, the paths it contains must be relative to that root of the BR2_EXTERNAL This is one more step towards standardizing the use of just 'make check-package' before submitting patches to the list. Cc: Sen Hastings Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 0 utils/check-package | 78 ++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 62 insertions(+), 16 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/utils/check-package b/utils/check-package index f64daed84c..f08e76b374 100755 --- a/utils/check-package +++ b/utils/check-package @@ -19,6 +19,24 @@ VERBOSE_LEVEL_TO_SHOW_IGNORED_FILES = 3 flags = None # Command line arguments. +def get_ignored_parsers_per_file(intree_only, ignore_filename): + ignored = dict() + entry_base_dir = '' + + if not ignore_filename: + return ignored + + filename = os.path.abspath(ignore_filename) + entry_base_dir = os.path.join(os.path.dirname(filename)) + + with open(filename, "r") as f: + for line in f.readlines(): + filename, warnings_str = line.split(' ', 1) + warnings = warnings_str.split() + ignored[os.path.join(entry_base_dir, filename)] = warnings + return ignored + + def parse_args(): parser = argparse.ArgumentParser() @@ -29,6 +47,8 @@ def parse_args(): parser.add_argument("--br2-external", "-b", dest='intree_only', action="store_false", help="do not apply the pathname filters used for intree files") + parser.add_argument("--ignore-list", dest='ignore_filename', action="store", + help='override the default list of ignored warnings') parser.add_argument("--manual-url", action="store", default="http://nightly.buildroot.org/", @@ -44,7 +64,11 @@ def parse_args(): parser.add_argument("--dry-run", action="store_true", help="print the " "functions that would be called for each file (debug)") - return parser.parse_args() + flags = parser.parse_args() + + flags.ignore_list = get_ignored_parsers_per_file(flags.intree_only, flags.ignore_filename) + + return flags CONFIG_IN_FILENAME = re.compile(r"Config\.\S*$") @@ -120,21 +144,25 @@ def is_external_tool(m): return common_inspect_rules(m) -def print_warnings(warnings): +def print_warnings(warnings, xfail): # Avoid the need to use 'return []' at the end of every check function. if warnings is None: - return 0 # No warning generated. + return 0, 0 # No warning generated. + if xfail: + return 0, 1 # Warning not generated, fail expected for this file. for level, message in enumerate(warnings): if flags.verbose >= level: print(message.replace("\t", "< tab >").rstrip()) - return 1 # One more warning to count. + return 1, 1 # One more warning to count. def check_file_using_lib(fname): # Count number of warnings generated and lines processed. nwarnings = 0 nlines = 0 + xfail = flags.ignore_list.get(os.path.abspath(fname), []) + failed = set() lib = get_lib_from_filename(fname) if not lib: @@ -150,10 +178,13 @@ def check_file_using_lib(fname): print("{}: would run: {}".format(fname, functions_to_run)) return nwarnings, nlines - objects = [c[1](fname, flags.manual_url) for c in internal_functions] + objects = [[c[0], c[1](fname, flags.manual_url)] for c in internal_functions] - for cf in objects: - nwarnings += print_warnings(cf.before()) + for name, cf in objects: + warn, fail = print_warnings(cf.before(), name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn if six.PY3: f = open(fname, "r", errors="surrogateescape") else: @@ -161,19 +192,34 @@ def check_file_using_lib(fname): lastline = "" for lineno, text in enumerate(f.readlines()): nlines += 1 - for cf in objects: + for name, cf in objects: if cf.disable.search(lastline): continue - nwarnings += print_warnings(cf.check_line(lineno + 1, text)) + warn, fail = print_warnings(cf.check_line(lineno + 1, text), name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn lastline = text f.close() - for cf in objects: - nwarnings += print_warnings(cf.after()) - - tools = [c[1](fname) for c in external_tools] - - for tool in tools: - nwarnings += print_warnings(tool.run()) + for name, cf in objects: + warn, fail = print_warnings(cf.after(), name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn + + tools = [[c[0], c[1](fname)] for c in external_tools] + + for name, tool in tools: + warn, fail = print_warnings(tool.run(), name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn + + for should_fail in xfail: + if should_fail not in failed: + print("{}:0: {} was expected to fail, did you fixed the file and forgot to update {}?" + .format(fname, should_fail, flags.ignore_filename)) + nwarnings += 1 return nwarnings, nlines From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit] support/testing: test check-package ignore list Message-ID: <20230206210854.65D4F83CFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d631615eb1b833977003039626a0194589334f45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Extend test_check_package to also check the ignore list functionality. Check: - the entries in the ignore list use relative path; - an entry in the ignore list actually ignores the warning; - an outdated entry in the ignore list generates a warning by its own, preventing the ignoring list to grow indefinitely. For this to work, add 3 test fixtures, listing entries for an pre-existing file in the br2-external used in the test. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .../tests/utils/br2-external/.checkpackageignore | 1 + .../utils/br2-external/package/.checkpackageignore | 1 + .../package/.checkpackageignore_outdated | 1 + support/testing/tests/utils/test_check_package.py | 31 ++++++++++++++++++++++ 4 files changed, 34 insertions(+) diff --git a/support/testing/tests/utils/br2-external/.checkpackageignore b/support/testing/tests/utils/br2-external/.checkpackageignore new file mode 100644 index 0000000000..efb7680173 --- /dev/null +++ b/support/testing/tests/utils/br2-external/.checkpackageignore @@ -0,0 +1 @@ +package/external/external.mk PackageHeader diff --git a/support/testing/tests/utils/br2-external/package/.checkpackageignore b/support/testing/tests/utils/br2-external/package/.checkpackageignore new file mode 100644 index 0000000000..5f4a5e1187 --- /dev/null +++ b/support/testing/tests/utils/br2-external/package/.checkpackageignore @@ -0,0 +1 @@ +external/external.mk PackageHeader diff --git a/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated b/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated new file mode 100644 index 0000000000..1df59f3bed --- /dev/null +++ b/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated @@ -0,0 +1 @@ +external/external.mk Indent NewlineAtEof PackageHeader diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index c70ba02324..ce1998753c 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -75,6 +75,12 @@ class TestCheckPackage(unittest.TestCase): generated = int(stderr[1].split()[0]) self.assertGreater(generated, 0) + def assert_no_warnings_generated_for_file(self, stderr): + """Infer from check-package stderr if no warning was generated and fail otherwise.""" + self.assertIn("warnings generated", stderr[1], stderr) + generated = int(stderr[1].split()[0]) + self.assertEqual(generated, 0) + def test_run(self): """Test the various ways the script can be called in a simple top to bottom sequence.""" @@ -201,3 +207,28 @@ class TestCheckPackage(unittest.TestCase): self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) + + # br2-external with ignore list + topdir_path = infra.filepath("tests/utils/br2-external") + topdir_file = os.path.join(topdir_path, "package/external/external.mk") + subdir_path = infra.filepath("tests/utils/br2-external/package") + subdir_file = os.path.join(subdir_path, "external/external.mk") + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore", "-b", topdir_file], + self.WITH_UTILS_IN_PATH, topdir_path) + self.assert_file_was_processed(m) + self.assert_no_warnings_generated_for_file(m) + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore", "-b", subdir_file], + self.WITH_UTILS_IN_PATH, subdir_path) + self.assert_file_was_processed(m) + self.assert_no_warnings_generated_for_file(m) + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore_outdated", "-b", subdir_file], + self.WITH_UTILS_IN_PATH, subdir_path) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: Indent was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + .format(subdir_file), w) + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + .format(subdir_file), w) From thomas.petazzoni at bootlin.com Mon Feb 6 21:10:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:10:57 +0100 Subject: [Buildroot] [git commit] Makefile: check-package should use the ignore list Message-ID: <20230206211127.5B49983D02@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=394afb3c3b97ec4db28b19c27539c4d653f22e5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For now, we need to ignore a number of check-package warning checks. Signed-off-by: Thomas Petazzoni --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 49ee4ff119..4880b426b5 100644 --- a/Makefile +++ b/Makefile @@ -1257,7 +1257,8 @@ check-flake8: | xargs -- python3 -m flake8 --statistics check-package: - $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` + $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` \ + --ignore-list=$(TOPDIR)/.checkpackageignore .PHONY: .checkpackageignore .checkpackageignore: From thomas.petazzoni at bootlin.com Mon Feb 6 21:22:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:22:23 +0100 Subject: [Buildroot] [PATCH v2 01/14] utils/check-package: decouple adding rules from fixing all intree files In-Reply-To: <20220731193521.1217825-2-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-2-ricardo.martincoski@gmail.com> Message-ID: <20230206222223.7e0425d2@windsurf> On Sun, 31 Jul 2022 16:35:08 -0300 Ricardo Martincoski wrote: > When a new check_function is added to check-package, often there are > files in the tree that would generate warnings. > > An example is the Sob check_function for patch files: > | $ ./utils/check-package --i Sob $(git ls-files) >/dev/null > | 369301 lines processed > | 46 warnings generated > Currently these warnings are listed when calling check-package directly, > and also at the output of pkg-stats, but the check_function does not run > on 'make check-package' (that is used to catch regressions on GitLab CI > 'check-package' job) until all warnings in the tree are fixed. > This (theoretically) allows new .patch files be added without SoB, > without the GitLab CI catching it. > > So add a way to check-package itself ignore current warnings, while > still catching new files that do not follow that new check_function. > > Add a file named .checkpackageignore to the buildroot topdir. > It contains the list of check_functions that are expected to fail for > each given intree file tested by check-package. > Each entries is in the format: > [ ...] > > These are 2 examples of possible entries: > package/initscripts/init.d/rcK ConsecutiveEmptyLines EmptyLastLine Shellcheck > utils/test-pkg Shellcheck > > Keeping such a list allows us to have fine-grained control over which > warning to ignore. > > In order to avoid this list to grow indefinitely, containing entries for > files that are already fixed, make each entry an 'expected to fail' > instead of just an 'ignore', and generate a warning if a check_function > that was expect to fail for a given files does not generate that > warning. > Unfortunately one case that do not generate warning is an entry for a > file that is deleted in a later commit. > > Add also a new option --ignore-list that can be used: > - by pkg-stats > - by developers willing to reduce the intree ignore list > - by developers of br2-external trees that want its own ignore list > - for debug and tests purposes > > When using for a br2-external each entry in the ignore file is relative > to the directory that contains the ignore file. Since calling > check-package -b already uses relative paths to the directory it was > called from, when a developer wants a ignore file for a br2-external > he/she must call check-package from the directory that contains it. > For instance, with these files: > /path/to/br2-external/.checkpackageignore > /path/to/br2-external/package/mypackage/mypackage.mk > The file .checkpackageignore must contain entries in the format: > package/mypackage/mypackage.mk EmptyLastLine > and the developer must call check-package this way: > $ cd /path/to/br2-external/ && \ > /otherpath/to/check-package \ > --ignore-list=.checkpackageignore \ > -b package/mypackage/mypackage.mk > > This is one more step towards standardizing the use of just > 'make check-package' before submitting patches to the list. > > Cc: Sen Hastings > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - rename the patch We finally applied this, but we did one change: now by default check-package does not ignore any error. You have to explicitly pass it an ignore list for it to ignore some errors. This way by default check-package is noisy, and you need to do some action to silence some of the warnings. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:23:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:23:01 +0100 Subject: [Buildroot] [PATCH v2 02/14] support/testing: test check-package ignore list In-Reply-To: <20220731193521.1217825-3-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-3-ricardo.martincoski@gmail.com> Message-ID: <20230206222301.16570876@windsurf> On Sun, 31 Jul 2022 16:35:09 -0300 Ricardo Martincoski wrote: > Extend test_check_package to also check the ignore list functionality. > Check: > - the entries in the ignore list use relative path; > - an entry in the ignore list actually ignores the warning; > - an outdated entry in the ignore list generates a warning by its own, > preventing the ignoring list to grow indefinitely. > > For this to work, add 3 test fixtures, listing entries for an > pre-existing file in the br2-external used in the test. > > Signed-off-by: Ricardo Martincoski We adjusted the test cases to the changes we did on PATCH 01/14, and applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:23:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:23:07 +0100 Subject: [Buildroot] [PATCH v2 03/14] Makefile: add target to update .checkpackageignore In-Reply-To: <20220731193521.1217825-4-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-4-ricardo.martincoski@gmail.com> Message-ID: <20230206222307.74337e30@windsurf> On Sun, 31 Jul 2022 16:35:10 -0300 Ricardo Martincoski wrote: > When a developer fixes an ignored warning from check-package, he/she > needs to update .checkpackageignore > By running './utils/docker-run make check-package' the developer > receives a warning about this. > Make that change easier to make, by adding a helper target on Makefile. > > Add an option --failed-only to check-package that generates output in > the format: > [ ...] > This is the very same format used by check-package ignore file. > > Add the phony target .checkpackageignore > > So one can update the ignore file using: > $ ./utils/docker-run make .checkpackageignore > > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - on check-package, do not return error code when --failed-only is > used > - add a target to the makefile > - completely rewrite commit message, in order to clarify why it is > needed > --- > Makefile | 5 +++++ > utils/check-package | 13 ++++++++++++- > 2 files changed, 17 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:23:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:23:25 +0100 Subject: [Buildroot] [PATCH v2 04/14] Makefile: make check-package assume a git tree In-Reply-To: <20220731193521.1217825-5-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-5-ricardo.martincoski@gmail.com> Message-ID: <20230206222325.09201d23@windsurf> On Sun, 31 Jul 2022 16:35:11 -0300 Ricardo Martincoski wrote: > ... just like check-flake8 already does. > > When a new check_function is added to check-package, often there are > files in the tree that would generate warnings. > > An example is the Sob check_function for patch files: > | $ ./utils/check-package --i Sob $(git ls-files) >/dev/null > | 369301 lines processed > | 46 warnings generated > Currently these warnings are listed when calling check-package directly, > and also at the output of pkg-stats, but the check_function does not run > on 'make check-package' (that is used to catch regressions on GitLab CI > 'check-package' job) until all warnings in the tree are fixed. > This (theoretically) allows new .patch files be added without SoB, > without the GitLab CI catching it. > > Since now check-package has an ignore file to list all warnings in the > tree, that will eventually be fixed, there is no need to filter the > files passed to check-package. > So test all files in the tree when 'make check-package' is called. > It brings following advantages; > - any new check_function added to check-package takes place immediately > for new files; > - adding new check_functions is less traumatic to the developer doing > this, since he/she does not need anymore to fix all warnings in the > tree before the new check_function takes effect; > - prevent regressions, e.g. ANY new .patch file must have SoB; > - as a side-effect, print a single statistics line as output of > 'make ckeck-package'. > > But just enabling the check would generate many warnings when > 'make check-package' is called, so update the ignore file by using: > $ ./utils/docker-run make .checkpackageignore > > Notice: in order to ensure reproducible results, one should run 'make > check-package' and 'make .checkpackageignore' inside the docker image, > otherwise a variation in shellcheck version (installed in the host) can > produce different results. > > Signed-off-by: Ricardo Martincoski Applied to master after regenerating the ignore file, as requested, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:23:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:23:28 +0100 Subject: [Buildroot] [PATCH v2 05/14] docs/manual: check-package before submitting patch In-Reply-To: <20220731193521.1217825-6-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-6-ricardo.martincoski@gmail.com> Message-ID: <20230206222328.5b601f6d@windsurf> On Sun, 31 Jul 2022 16:35:12 -0300 Ricardo Martincoski wrote: > Add 'utils/docker-run make check-package' to the default workflow of > submitting patches, just after the rebase and before using format-patch. > > Cc: Thomas De Schampheleire > Cc: Romain Naour > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - since the automatic run inside docker was removed from the series, > use a 'good default' to newcomers, that ensures repdroducible > results, by mentioning to use docker-run > - add a small description of what check-package really does (Romain) > --- > docs/manual/contribute.txt | 6 ++++++ > 1 file changed, 6 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:24:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:24:08 +0100 Subject: [Buildroot] [PATCH v2 06/14] support/docker: add python3-magic In-Reply-To: <20220731193521.1217825-7-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-7-ricardo.martincoski@gmail.com> Message-ID: <20230206222408.7b238961@windsurf> On Sun, 31 Jul 2022 16:35:13 -0300 Ricardo Martincoski wrote: > It will be needed by check-package to run checks according to the file > type (the same determined by the command 'file'). > > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - none Applied to master, thanks. I stopped applying there, because we now need to regenerate the Docker container image, push it on the Gitlab CI registry, and update .gitlab-ci.yml. And I must say I have no idea how to do this :-) Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:26:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:26:24 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-bootlin: update to 2022.08 Message-ID: <20230206212649.6B32483D19@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=452365a385ef35e808eb2eb669d1e3227c7399dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit is the result of running support/scripts/gen-bootlin-toolchains now that 2022.08 toolchains have been made available. Signed-off-by: Thomas Petazzoni --- .../tests/toolchain/test_external_bootlin.py | 163 +++ .../toolchain-external-bootlin/Config.in.options | 1098 +++++++++++++------- .../toolchain-external-bootlin.hash | 798 +++++++------- .../toolchain-external-bootlin.mk | 454 ++++---- 4 files changed, 1547 insertions(+), 966 deletions(-) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Mon Feb 6 21:28:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:28:02 +0100 Subject: [Buildroot] [PATCH] toolchain/toolchain-external/toolchain-external-bootlin: update to 2022.08 In-Reply-To: <20220924205358.1489231-1-thomas.petazzoni@bootlin.com> References: <20220924205358.1489231-1-thomas.petazzoni@bootlin.com> Message-ID: <20230206222802.4e235104@windsurf> On Sat, 24 Sep 2022 22:53:58 +0200 Thomas Petazzoni wrote: > This commit is the result of running > support/scripts/gen-bootlin-toolchains now that 2022.08 toolchains > have been made available. > > Signed-off-by: Thomas Petazzoni > --- > .../tests/toolchain/test_external_bootlin.py | 163 +++ > .../Config.in.options | 1098 +++++++++++------ > .../toolchain-external-bootlin.hash | 798 ++++++------ > .../toolchain-external-bootlin.mk | 454 ++++--- > 4 files changed, 1547 insertions(+), 966 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:30:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:30:00 +0100 Subject: [Buildroot] [git commit] package/gdal: bump version to 3.5.2 Message-ID: <20230206213335.36B0E83D2D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f20611347fcce58f89f1fedf2cebaf8b2e077f67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Dominik Michael Rauh Signed-off-by: Thomas Petazzoni --- package/gdal/gdal.hash | 6 +++--- package/gdal/gdal.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gdal/gdal.hash b/package/gdal/gdal.hash index 826a7f0b45..ab77d7840d 100644 --- a/package/gdal/gdal.hash +++ b/package/gdal/gdal.hash @@ -1,6 +1,6 @@ -# md5 from: https://download.osgeo.org/gdal/3.5.1/gdal-3.5.1.tar.xz.md5, sha256 locally computed: -md5 4b7981efbeed69c06c79fb65d0a60d83 gdal-3.5.1.tar.xz -sha256 d12c30a9eacdeaab493c0d1c9f88eb337c9cbb5bb40744c751bdd5a5af166ab6 gdal-3.5.1.tar.xz +# md5 from: https://download.osgeo.org/gdal/3.5.2/gdal-3.5.2.tar.xz.md5, sha256 locally computed: +md5 821b3b0637ebada5d20dbefb2e3ec964 gdal-3.5.2.tar.xz +sha256 0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2 gdal-3.5.2.tar.xz # Hashes of license files: sha256 fac0116e799ca4de79b076ee04863b5e2b69541ea3664b9bb108c81a5355f16a LICENSE.TXT diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 2d6dff1a93..a3b11c53af 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -4,7 +4,7 @@ # ################################################################################ -GDAL_VERSION = 3.5.1 +GDAL_VERSION = 3.5.2 GDAL_SITE = https://download.osgeo.org/gdal/$(GDAL_VERSION) GDAL_SOURCE = gdal-$(GDAL_VERSION).tar.xz GDAL_LICENSE = MIT, many others From thomas.petazzoni at bootlin.com Mon Feb 6 21:34:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:34:05 +0100 Subject: [Buildroot] [PATCH v2] package/gdal: bump version to 3.5.2 In-Reply-To: <20220926185047.301080-1-dmrauh@posteo.de> References: <20220926185047.301080-1-dmrauh@posteo.de> Message-ID: <20230206223405.67ec0a5a@windsurf> On Mon, 26 Sep 2022 18:50:47 +0000 Dominik Michael Rauh wrote: > Signed-off-by: Dominik Michael Rauh > --- > Changes v1 -> v2: > - Fix commmit message Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:39:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:39:33 +0100 Subject: [Buildroot] [PATCH 0/2] dracut: extend support and tests (branch yem/dracut) In-Reply-To: References: Message-ID: <20230206223933.63f0a397@windsurf> On Tue, 20 Sep 2022 20:37:09 +0200 "Yann E. MORIN" wrote: > Yann E. MORIN (2): > fs/cpio: allow users to provide their own dracut modules > support/tests/cpio: extend runtime tests for extra dract modules Both finally applied. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Mon Feb 6 21:39:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 22:39:15 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require FindBin perl package for libopenssl Message-ID: <20230206213956.B167A83D34@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5aab8c59d5b310540105166e7b48faf3d5bd200b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/5d1/5d10f4f545dccf126e3f5b5efce777a393c5e7bc/ http://autobuild.buildroot.net/results/7c2/7c2df31c6eb34b68e460e092d8c262bdc6c8f25a/ The configure script of (host-)libopenssl needs the FindBin perl module on the host: Can't locate FindBin.pm in @INC (you may need to install the FindBin module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./Configure line 15. BEGIN failed--compilation aborted at ./Configure line 15. As this is needed for both libopenssl and host-libopenssl (which does not have a corresponding config symbol in the .config), we have to require it unconditionally. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 4b5012b807..afd30008e8 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -268,6 +268,7 @@ fi required_perl_modules="Data::Dumper" # Needed to build host-autoconf required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake +required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" From yann.morin.1998 at free.fr Mon Feb 6 21:40:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 22:40:10 +0100 Subject: [Buildroot] [git commit] boot/gummiboot: remove package Message-ID: <20230206214131.16EAC83D46@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=488a87514e21877d25d4f0a31bbb9f71bd839aab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The gummiboot package currently fails to build due to incompatibilies with recent versions of the gnu-efi code. It turns out that gummiboot has been marked deprecated/obsolete by its maintainer since July 2015: https://cgit.freedesktop.org/gummiboot/commit/?id=55df1539c9d330732e88bd196afee386db6e4a1d&utm_source=anzwix Indeed, gummiboot ended up being integrated as part of systemd as systemd-boot. While it made sense for a while to keep it as a separate standalone package, it is not possible to maintain it in Buildroot without an active upstream, and there are other options for simple EFI bootloaders these days. Therefore, let's retire this package. Fixes: http://autobuild.buildroot.net/results/5929104a868d2f69ec1b71e5e897b6d1ebf347cf/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- Config.in.legacy | 8 ++++ DEVELOPERS | 2 - boot/Config.in | 1 - ...-Allow-building-with-newer-glibc-versions.patch | 31 ------------- ...x-linking-for-non-host-compatible-targets.patch | 54 ---------------------- boot/gummiboot/Config.in | 24 ---------- boot/gummiboot/buildroot.conf | 4 -- boot/gummiboot/gummiboot.mk | 41 ---------------- boot/gummiboot/loader.conf | 2 - 9 files changed, 8 insertions(+), 159 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 8b7ecd840b..61686fdd11 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2023.02" +config BR2_TARGET_GUMMIBOOT + bool "gummiboot removed" + select BR2_LEGACY + help + gummiboot has been deprecated since 2015, with no further + updates. It became integrated into the systemd project as + systemd-boot. + config BR2_PACKAGE_IPUTILS_NINFOD bool "iputils 20221126 removed ninfod" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 50c681df2c..f8acf8776c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -845,7 +845,6 @@ N: Ernesto L. Williams Jr F: package/szip/ N: Esben Haabendal -F: boot/gummiboot/ F: package/python-kiwisolver/ N: Etienne Carriere @@ -2865,7 +2864,6 @@ F: boot/beaglev-ddrinit/ F: boot/beaglev-secondboot/ F: boot/boot-wrapper-aarch64/ F: boot/grub2/ -F: boot/gummiboot/ F: configs/beaglev_defconfig F: configs/stm32mp157c_dk2_defconfig F: package/android-tools/ diff --git a/boot/Config.in b/boot/Config.in index 2d4d077632..58366e035e 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -12,7 +12,6 @@ source "boot/binaries-marvell/Config.in" source "boot/boot-wrapper-aarch64/Config.in" source "boot/edk2/Config.in" source "boot/grub2/Config.in" -source "boot/gummiboot/Config.in" source "boot/lpc32xxcdl/Config.in" source "boot/mv-ddr-marvell/Config.in" source "boot/mxs-bootlets/Config.in" diff --git a/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch b/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch deleted file mode 100644 index b35cd499bc..0000000000 --- a/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 40ab4167b5a45c772304a879c71b47d54de3b0e3 Mon Sep 17 00:00:00 2001 -From: Esben Haabendal -Date: Wed, 20 Mar 2019 14:19:40 +0100 -Subject: [PATCH] Allow building with newer glibc versions - -Newer glibc versions does not include sys/sysmacros.h from sys/types.h -anymore. Including it unconditionally should be safe. - -See https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html for why -this was done. - -Signed-off-by: Esben Haabendal ---- - src/setup/setup.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/setup/setup.c b/src/setup/setup.c -index 6a4275a2ae36..53429375a146 100644 ---- a/src/setup/setup.c -+++ b/src/setup/setup.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #include "efivars.h" - --- -2.21.0 - diff --git a/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch b/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch deleted file mode 100644 index 7104a581e2..0000000000 --- a/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch +++ /dev/null @@ -1,54 +0,0 @@ -From fc05ced797b87286b8ec7303fe32bf200a072972 Mon Sep 17 00:00:00 2001 -From: Esben Haabendal -Date: Mon, 18 Mar 2019 11:14:31 +0100 -Subject: [PATCH] Fix linking for non-host compatible targets - -Without this, gummiboot build system will use host 'ld' when linking -target binary, which is obviously not a good idea. - -Signed-off-by: Esben Haabendal ---- - Makefile.am | 4 ++-- - configure.ac | 4 ++++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6568a355ed74..9051dd44edd9 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -142,7 +142,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) - $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ - - $(gummiboot_solib): $(gummiboot_objects) -- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(gummiboot_objects) \ -+ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(gummiboot_objects) \ - -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ - nm -D -u $@ | grep ' U ' && exit 1 || : - .DELETE_ON_ERROR: $(gummboot_solib) -@@ -177,7 +177,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) - $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ - - $(stub_solib): $(stub_objects) -- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(stub_objects) \ -+ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(stub_objects) \ - -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ - nm -D -u $@ | grep ' U ' && exit 1 || : - .DELETE_ON_ERROR: $(gummboot_solib) -diff --git a/configure.ac b/configure.ac -index 27bbe1d73396..b948696c220b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,6 +40,10 @@ dnl Don't try to use things like -std=c99 for efi compilation - EFI_CC=$CC - AC_SUBST([EFI_CC]) - -+dnl Allow specifying linker compatible with the compiler -+EFI_LD=$LD -+AC_SUBST([EFI_LD]) -+ - AC_PROG_CC_C99 - AM_PROG_CC_C_O - AC_PROG_GCC_TRADITIONAL --- -2.21.0 - diff --git a/boot/gummiboot/Config.in b/boot/gummiboot/Config.in deleted file mode 100644 index 1b5c4279f7..0000000000 --- a/boot/gummiboot/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_TARGET_GUMMIBOOT - bool "gummiboot" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS - select BR2_PACKAGE_GNU_EFI - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - help - gummiboot is a simple UEFI boot manager which executes - configured EFI images. The default entry is selected by a - configured pattern (glob) or an on-screen menu. - - gummiboot operates on the EFI System Partition (ESP) - only. Configuration file fragments, kernels, initrds, other - EFI images need to reside on the ESP. Linux kernels need to - be built with CONFIG_EFI_STUB to be able to be directly - executed as an EFI image. - - See the Grub2 help text for details on preparing an EFI - capable disk image using Gummiboot: the instructions are - exactly the same, except that the Gummiboot configuration - files will be located in /loader/ inside the EFI partition. - - http://freedesktop.org/wiki/Software/gummiboot/ diff --git a/boot/gummiboot/buildroot.conf b/boot/gummiboot/buildroot.conf deleted file mode 100644 index 8a6f02e56a..0000000000 --- a/boot/gummiboot/buildroot.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Buildroot -version 1 -linux /bzImage -options console=ttyS0 root=/dev/sda2 diff --git a/boot/gummiboot/gummiboot.mk b/boot/gummiboot/gummiboot.mk deleted file mode 100644 index eb1f3da78c..0000000000 --- a/boot/gummiboot/gummiboot.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# gummiboot -# -################################################################################ - -GUMMIBOOT_SITE = https://gitlab.freedesktop.org/archived-projects/gummiboot.git -GUMMIBOOT_SITE_METHOD = git -GUMMIBOOT_VERSION = 2bcd919c681c952eb867ef1bdb458f1bc49c2d55 -GUMMIBOOT_LICENSE = LGPL-2.1+ -GUMMIBOOT_LICENSE_FILES = LICENSE - -# The git archive does not have the autoconf/automake stuff generated. -GUMMIBOOT_AUTORECONF = YES -GUMMIBOOT_DEPENDENCIES = gnu-efi host-pkgconf util-linux -GUMMIBOOT_INSTALL_TARGET = NO -GUMMIBOOT_INSTALL_IMAGES = YES - -ifeq ($(BR2_i386),y) -GUMMIBOOT_IMGARCH = ia32 -else ifeq ($(BR2_x86_64),y) -GUMMIBOOT_IMGARCH = x64 -endif - -GUMMIBOOT_CONF_OPTS = \ - --host=$(BR2_ARCH) \ - --with-efi-libdir=$(STAGING_DIR)/usr/lib \ - --with-efi-ldsdir=$(STAGING_DIR)/usr/lib \ - --with-efi-includedir=$(STAGING_DIR)/usr/include \ - --disable-manpages - -define GUMMIBOOT_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/gummiboot$(GUMMIBOOT_IMGARCH).efi \ - $(BINARIES_DIR)/efi-part/EFI/BOOT/boot$(GUMMIBOOT_IMGARCH).efi - $(INSTALL) -D -m 0644 boot/gummiboot/loader.conf \ - $(BINARIES_DIR)/efi-part/loader/loader.conf - $(INSTALL) -D -m 0644 boot/gummiboot/buildroot.conf \ - $(BINARIES_DIR)/efi-part/loader/entries/buildroot.conf -endef - -$(eval $(autotools-package)) diff --git a/boot/gummiboot/loader.conf b/boot/gummiboot/loader.conf deleted file mode 100644 index 93b77b8f93..0000000000 --- a/boot/gummiboot/loader.conf +++ /dev/null @@ -1,2 +0,0 @@ -timeout 3 -default buildroot From thomas.petazzoni at bootlin.com Mon Feb 6 21:46:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:46:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/mesa3d-demos: bump version to 8.5.0 In-Reply-To: <20220920200521.18064-1-ju.o@free.fr> References: <20220920200521.18064-1-ju.o@free.fr> Message-ID: <20230206224630.72b8c2cc@windsurf> On Tue, 20 Sep 2022 22:05:21 +0200 Julien Olivain wrote: > The package build system changed from autotools to meson. Autotools > was deprecated in commit [1], which is included in this 8.5.0 > version. It was definitevely removed soon after, in commit [2]. > > The package patch file making libgl optional was fully rewritten > for meson. > > This patch also updates the old ftp _SITE url to the new https one, > published in the project README.rst file. See [3]. > > This patch also removes openvg and freetype2 dependencies, as their > support was removed in commit [4]. The 'gbm' option is removed, and > the option 'libdrm' is added. > > The md5 and sha1 entries in hash files are also removed, to keep only > sha256 and sha512 from the release announce email [5]. > > For change log, see the release announce [5]. > > [1] https://gitlab.freedesktop.org/mesa/demos/-/commit/2df8e9710834c3b42ce5cfb67b7662c110ab904e > [2] https://gitlab.freedesktop.org/mesa/demos/-/commit/abfead37587f1f2e124bdfcde755b6e90421b538 > [3] https://gitlab.freedesktop.org/mesa/demos/-/blob/mesa-demos-8.5.0/README.rst > [4] https://gitlab.freedesktop.org/mesa/demos/-/commit/e6d0d9a8682c544870fd41983ea2e0484b9767b1 > [5] https://lists.freedesktop.org/archives/mesa-announce/2022-May/000677.html > > Signed-off-by: Julien Olivain > --- > ...s-makes-opengl-an-optional-component.patch | 157 ++++++++++-------- > package/mesa3d-demos/mesa3d-demos.hash | 8 +- > package/mesa3d-demos/mesa3d-demos.mk | 56 +++---- > 3 files changed, 112 insertions(+), 109 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 6 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit] fs/cpio: allow users to provide their own dracut modules Message-ID: <20230206214646.576DE83DAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb6e466c102306cfcb1b459d91aa5440f6b8a621 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Dracut modules can only be looked for in HOST_DIR/lib/dracut/modules.d/ as dracut does not offer the possibility to look elsewhere. Installing files in HOST_DIR/ can do done either from a host-package, or via a post-built script; there is no overlay like there is for target/. This is a bit cumbersome. Additional modules are most probably developped in a relatively tight loop with the configuration files, so it makes sense to expose both close together. Add an option to the fs/cpio filesystem, so users can point to a list of modules to install. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Thierry Bultel Cc: Adam Duskett Signed-off-by: Thomas Petazzoni --- fs/cpio/Config.in | 5 +++++ fs/cpio/cpio.mk | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in index bec2d9dca2..4d38276c88 100644 --- a/fs/cpio/Config.in +++ b/fs/cpio/Config.in @@ -29,6 +29,11 @@ endchoice if BR2_TARGET_ROOTFS_CPIO_DRACUT +config BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES + string "extra dracut modules" + help + Space-separated list of directories containing dracut modules. + config BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES string "dracut configuration files" default "fs/cpio/dracut.conf" diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk index 061f4a18f1..00ab6a8f82 100644 --- a/fs/cpio/cpio.mk +++ b/fs/cpio/cpio.mk @@ -50,6 +50,13 @@ else ifeq ($(BR2_TARGET_ROOTFS_CPIO_DRACUT),y) ROOTFS_CPIO_DEPENDENCIES += host-dracut +ROOTFS_CPIO_DRACUT_MODULES = $(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES)) +ifeq ($(BR_BUILDING),y) +ifneq ($(words $(ROOTFS_CPIO_DRACUT_MODULES)),$(words $(sort $(notdir $(ROOTFS_CPIO_DRACUT_MODULES))))) +$(error No two dracut modules can have the same basename, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES setting) +endif +endif + ROOTFS_CPIO_DRACUT_CONF_FILES = $(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES)) ifeq ($(BR_BUILDING),y) ifeq ($(ROOTFS_CPIO_DRACUT_CONF_FILES),) @@ -68,11 +75,14 @@ ROOTFS_CPIO_OPTS += --no-kernel endif define ROOTFS_CPIO_CMD - mkdir -p $(ROOTFS_CPIO_DIR)/tmp $(ROOTFS_CPIO_DIR)/confdir + mkdir -p $(ROOTFS_CPIO_DIR)/tmp $(ROOTFS_CPIO_DIR)/confdir $(HOST_DIR)/lib/dracut/modules.d touch $(ROOTFS_CPIO_DIR)/empty-config $(foreach cfg,$(ROOTFS_CPIO_DRACUT_CONF_FILES), \ cp $(cfg) $(ROOTFS_CPIO_DIR)/confdir/$(notdir $(cfg)) ) + $(foreach m,$(ROOTFS_CPIO_DRACUT_MODULES), \ + cp -a $(m)/* $(HOST_DIR)/lib/dracut/modules.d/ + ) $(HOST_DIR)/bin/dracut \ $(ROOTFS_CPIO_OPTS) \ -c $(ROOTFS_CPIO_DIR)/empty-config \ From thomas.petazzoni at bootlin.com Mon Feb 6 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit] support/tests/cpio: extend runtime tests for extra dract modules Message-ID: <20230206214646.6272D83DAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=557c68fbd29551f4db6215ab03abfaaa54c6f78f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a basic module that installs a single file, to check that it is properly accounted for. Reported-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN Cc: Thierry Bultel Cc: Adam Duskett Signed-off-by: Thomas Petazzoni --- support/testing/tests/fs/test_cpio.py | 5 ++++- .../tests/fs/test_cpio/modules/99cramfs/module-setup.sh | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/fs/test_cpio.py b/support/testing/tests/fs/test_cpio.py index 8c0d357994..172af579bb 100644 --- a/support/testing/tests/fs/test_cpio.py +++ b/support/testing/tests/fs/test_cpio.py @@ -41,9 +41,11 @@ class TestCpioDracutBase(infra.basetest.BRTest): BR2_PACKAGE_PV=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_DRACUT=y + BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES="{}" BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES="{}" # BR2_TARGET_ROOTFS_TAR is not set - """.format(" ".join(["fs/cpio/dracut.conf", + """.format("support/testing/tests/fs/test_cpio/modules", + " ".join(["fs/cpio/dracut.conf", "support/testing/tests/fs/test_cpio/dracut-cramfs.conf"])) def check_dracut(self): @@ -57,6 +59,7 @@ class TestCpioDracutBase(infra.basetest.BRTest): self.assertEqual(out.find("bin/pv"), -1) # libz should be, because of cramfs self.assertNotEqual(out.find("usr/bin/mkcramfs"), -1) + self.assertNotEqual(out.find("usr/bin/cramfsck"), -1) self.assertNotEqual(out.find("usr/lib/libz.so"), -1) exit_code = boot_img(self.emulator, diff --git a/support/testing/tests/fs/test_cpio/modules/99cramfs/module-setup.sh b/support/testing/tests/fs/test_cpio/modules/99cramfs/module-setup.sh new file mode 100755 index 0000000000..60706c8bd9 --- /dev/null +++ b/support/testing/tests/fs/test_cpio/modules/99cramfs/module-setup.sh @@ -0,0 +1,11 @@ +check() { + return 0 +} + +depends() { + return 0 +} + +install() { + inst_multiple /usr/bin/cramfsck +} From thomas.petazzoni at bootlin.com Mon Feb 6 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit] package/mesa3d-demos: bump version to 8.5.0 Message-ID: <20230206214646.6C84983DB0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa75c4a3054e0cd3457f9e50deb1b9c06325c242 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The package build system changed from autotools to meson. Autotools was deprecated in commit [1], which is included in this 8.5.0 version. It was definitevely removed soon after, in commit [2]. The package patch file making libgl optional was fully rewritten for meson. This patch also updates the old ftp _SITE url to the new https one, published in the project README.rst file. See [3]. This patch also removes openvg and freetype2 dependencies, as their support was removed in commit [4]. The 'gbm' option is removed, and the option 'libdrm' is added. The md5 and sha1 entries in hash files are also removed, to keep only sha256 and sha512 from the release announce email [5]. For change log, see the release announce [5]. [1] https://gitlab.freedesktop.org/mesa/demos/-/commit/2df8e9710834c3b42ce5cfb67b7662c110ab904e [2] https://gitlab.freedesktop.org/mesa/demos/-/commit/abfead37587f1f2e124bdfcde755b6e90421b538 [3] https://gitlab.freedesktop.org/mesa/demos/-/blob/mesa-demos-8.5.0/README.rst [4] https://gitlab.freedesktop.org/mesa/demos/-/commit/e6d0d9a8682c544870fd41983ea2e0484b9767b1 [5] https://lists.freedesktop.org/archives/mesa-announce/2022-May/000677.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...-demos-makes-opengl-an-optional-component.patch | 157 +++++++++++---------- package/mesa3d-demos/mesa3d-demos.hash | 8 +- package/mesa3d-demos/mesa3d-demos.mk | 56 ++++---- 3 files changed, 112 insertions(+), 109 deletions(-) diff --git a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch index b328fca810..e51b6f1a2a 100644 --- a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch +++ b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch @@ -1,88 +1,101 @@ -From bb0ffae7164d296d32da24fa5499534de259169a Mon Sep 17 00:00:00 2001 -From: Spenser Gilliland -Date: Sat, 24 Feb 2018 11:36:17 +0100 +From 9ec9f7b4d0ef5e799ca4cc5103163e4630d184d8 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 16 Sep 2022 22:30:59 +0200 Subject: [PATCH] demos: makes opengl an optional component -Signed-off-by: Spenser Gilliland -[Romain: convert to git patch, rebase on 8.4.0] -Signed-off-by: Romain Naour +This patch is a port of [1] for the new meson build system. + +[1]. +https://git.busybox.net/buildroot/tree/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch?h=2022.08 + +Signed-off-by: Julien Olivain --- - configure.ac | 12 +++++++++++- - src/egl/opengl/Makefile.am | 2 ++ - src/util/Makefile.am | 2 ++ - 3 files changed, 15 insertions(+), 1 deletion(-) + meson.build | 19 ++++++++++++------- + meson_options.txt | 1 + + src/egl/meson.build | 5 ++++- + src/meson.build | 4 +++- + 4 files changed, 20 insertions(+), 9 deletions(-) -diff --git a/configure.ac b/configure.ac -index 0b5e9a76..24298c44 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -51,6 +51,14 @@ m4_ifndef([PKG_PROG_PKG_CONFIG], - ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])]) - PKG_PROG_PKG_CONFIG() +diff --git a/meson.build b/meson.build +index e1968fab..a15699d6 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,7 +38,10 @@ add_project_arguments( + dep_m = cc.find_library('m', required : false) + dep_winmm = cc.find_library('winmm', required : false) -+AC_ARG_ENABLE([gl], -+ [AS_HELP_STRING([--enable-gl], -+ [enable GL library @<:@default=no@:>@])], -+ [gl_enabled="$enableval"], -+ [gl_enabled=auto]) -+ -+if test "x$gl_enabled" != "xno"; then -+ - dnl Get the pkg-config definitions for libGL. We include a fallback - dnl path for GL implementation that don't provide a .pc file - PKG_CHECK_MODULES(GL, [gl], [], [ -@@ -112,6 +120,8 @@ PKG_CHECK_MODULES(GLU, [glu], [], - DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" - DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" +-dep_gl = dependency('gl') ++dep_gl = dependency('gl', required : get_option('gl')) ++if not dep_gl.found() ++ add_project_arguments('-DEGL_NO_X11=1', language: 'c') ++endif -+fi -+ - AC_ARG_ENABLE([egl], - [AS_HELP_STRING([--enable-egl], - [enable EGL library @<:@default=auto@:>@])], -@@ -302,7 +312,7 @@ AC_SUBST([MESA_GLAPI]) - AC_SUBST([WAYLAND_CFLAGS]) - AC_SUBST([WAYLAND_LIBS]) + dep_gles1 = dependency('glesv1_cm', required : get_option('gles1')) + dep_gles2 = dependency('glesv2', required : get_option('gles2')) +@@ -75,13 +78,15 @@ endif -- -+AM_CONDITIONAL(HAVE_GL, test "x$gl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") -diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am -index 6d184ff6..219ab850 100644 ---- a/src/egl/opengl/Makefile.am -+++ b/src/egl/opengl/Makefile.am -@@ -56,6 +56,7 @@ endif - endif + dep_threads = dependency('threads') - if HAVE_EGL -+if HAVE_GL - bin_PROGRAMS = \ - eglinfo - noinst_PROGRAMS = \ -@@ -64,6 +65,7 @@ noinst_PROGRAMS = \ - $(EGL_X11_DEMOS) \ - $(EGL_WL_DEMOS) +-dep_glu = dependency('glu', required : dep_x11.found()) +-if not dep_glu.found() +- _glu_name = 'GLU' +- if host_machine.system() == 'windows' +- _glu_name = 'glu32' ++if dep_gl.found() ++ dep_glu = dependency('glu', required : dep_x11.found()) ++ if not dep_glu.found() ++ _glu_name = 'GLU' ++ if host_machine.system() == 'windows' ++ _glu_name = 'glu32' ++ endif ++ dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h') + endif +- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h') endif + + # GBM is needed for EGL on KMS +diff --git a/meson_options.txt b/meson_options.txt +index ddadd2e3..f5405698 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,5 +1,6 @@ + option('with-glut', type : 'string') + option('egl', type : 'feature') ++option('gl', type : 'feature') + option('gles1', type : 'feature') + option('gles2', type : 'feature') + option('osmesa', type : 'feature') +diff --git a/src/egl/meson.build b/src/egl/meson.build +index d1846921..42bf8ecd 100644 +--- a/src/egl/meson.build ++++ b/src/egl/meson.build +@@ -19,7 +19,10 @@ + # SOFTWARE. + + subdir('eglut') +-subdir('opengl') ++ ++if dep_gl.found() ++ subdir('opengl') +endif - egltri_x11_SOURCES = egltri.c - eglgears_x11_SOURCES = eglgears.c -diff --git a/src/util/Makefile.am b/src/util/Makefile.am -index 759a293a..012b9c75 100644 ---- a/src/util/Makefile.am -+++ b/src/util/Makefile.am -@@ -27,7 +27,9 @@ AM_CFLAGS = \ - AM_LDFLAGS = \ - $(DEMO_LIBS) + if dep_gles1.found() + subdir('opengles1') +diff --git a/src/meson.build b/src/meson.build +index 39cac78d..7607c6de 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -20,7 +20,9 @@ + + subdir('glad') -+if HAVE_GL - noinst_LTLIBRARIES = libutil.la +-subdir('util') ++if dep_gl.found() ++ subdir('util') +endif - if HAVE_GLUT - AM_CFLAGS += \ + if dep_glut.found() + subdir('demos') -- -2.14.3 +2.37.3 diff --git a/package/mesa3d-demos/mesa3d-demos.hash b/package/mesa3d-demos/mesa3d-demos.hash index 8a4955f120..b0cfb88816 100644 --- a/package/mesa3d-demos/mesa3d-demos.hash +++ b/package/mesa3d-demos/mesa3d-demos.hash @@ -1,5 +1,3 @@ -# From https://lists.freedesktop.org/archives/mesa-dev/2018-February/186542.html -md5 6b65a02622765522176d00f553086fa3 mesa-demos-8.4.0.tar.bz2 -sha1 57ba892e919fa22ce3db9f25e7331a6fa33c652c mesa-demos-8.4.0.tar.bz2 -sha256 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d mesa-demos-8.4.0.tar.bz2 -sha512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957 mesa-demos-8.4.0.tar.bz2 +# From https://lists.freedesktop.org/archives/mesa-announce/2022-May/000677.html +sha256 cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1 mesa-demos-8.5.0.tar.bz2 +sha512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8 mesa-demos-8.5.0.tar.bz2 diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index 6b5262a2e9..5f7fe8e24d 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -4,77 +4,69 @@ # ################################################################################ -MESA3D_DEMOS_VERSION = 8.4.0 +MESA3D_DEMOS_VERSION = 8.5.0 MESA3D_DEMOS_SOURCE = mesa-demos-$(MESA3D_DEMOS_VERSION).tar.bz2 -MESA3D_DEMOS_SITE = ftp://ftp.freedesktop.org/pub/mesa/demos -# 0001-demos-makes-opengl-an-optional-component.patch -MESA3D_DEMOS_AUTORECONF = YES +MESA3D_DEMOS_SITE = https://archive.mesa3d.org/demos/$(MESA3D_DEMOS_VERSION) MESA3D_DEMOS_DEPENDENCIES = host-pkgconf MESA3D_DEMOS_LICENSE = MIT MESA3D_DEMOS_CONF_OPTS += \ - --disable-gles1 + -Dgles1=disabled ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy) MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext -MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11 +MESA3D_DEMOS_CONF_OPTS += -Dgl=enabled -Dx11=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-gl --disable-x11 +MESA3D_DEMOS_CONF_OPTS += -Dgl=disabled -Dx11=disabled endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) MESA3D_DEMOS_DEPENDENCIES += libegl -MESA3D_DEMOS_CONF_OPTS += --enable-egl +MESA3D_DEMOS_CONF_OPTS += -Degl=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-egl +MESA3D_DEMOS_CONF_OPTS += -Degl=disabled endif ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) MESA3D_DEMOS_DEPENDENCIES += libgles -MESA3D_DEMOS_CONF_OPTS += --enable-gles2 +MESA3D_DEMOS_CONF_OPTS += -Dgles2=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-gles2 +MESA3D_DEMOS_CONF_OPTS += -Dgles2=disabled endif -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -MESA3D_DEMOS_DEPENDENCIES += libopenvg -MESA3D_DEMOS_CONF_OPTS += --enable-vg +ifeq ($(BR2_PACKAGE_LIBDRM),y) +MESA3D_DEMOS_DEPENDENCIES += libdrm +MESA3D_DEMOS_CONF_OPTS += -Dlibdrm=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-vg +MESA3D_DEMOS_CONF_OPTS += -Dlibdrm=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) +# Meson search for gbm, but has no option to enable/disable it. See: +# https://gitlab.freedesktop.org/mesa/demos/-/blob/mesa-demos-8.5.0/meson.build#L88 +# We still add the dependency, if needed, to make sure it will always +# be detected. MESA3D_DEMOS_DEPENDENCIES += mesa3d -MESA3D_DEMOS_CONF_OPTS += --enable-gbm -else -MESA3D_DEMOS_CONF_OPTS += --disable-gbm -endif - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -MESA3D_DEMOS_DEPENDENCIES += freetype -MESA3D_DEMOS_CONF_OPTS += --enable-freetype2 -else -MESA3D_DEMOS_CONF_OPTS += --disable-freetype2 endif ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MESA3D_DEMOS_DEPENDENCIES += libfreeglut -MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr +MESA3D_DEMOS_CONF_OPTS += -Dwith-glut=$(STAGING_DIR)/usr # osmesa support depends on glut ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) -MESA3D_DEMOS_CONF_OPTS += --enable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif else -MESA3D_DEMOS_CONF_OPTS += --without-glut --disable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif ifeq ($(BR2_PACKAGE_WAYLAND),y) MESA3D_DEMOS_DEPENDENCIES += wayland -MESA3D_DEMOS_CONF_OPTS += --enable-wayland +MESA3D_DEMOS_CONF_OPTS += -Dwayland=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-wayland +MESA3D_DEMOS_CONF_OPTS += -Dwayland=disabled endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From yann.morin.1998 at free.fr Mon Feb 6 21:48:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 22:48:24 +0100 Subject: [Buildroot] [PATCH] boot/gummiboot: remove package In-Reply-To: <20220920064420.520074-1-thomas.petazzoni@bootlin.com> References: <20220920064420.520074-1-thomas.petazzoni@bootlin.com> Message-ID: <20230206214824.GA5062@scaer> Thomas, All, On 2022-09-20 08:44 +0200, Thomas Petazzoni spake thusly: > The gummiboot package currently fails to build due to incompatibilies > with recent versions of the gnu-efi code. > > It turns out that gummiboot has been marked deprecated/obsolete by its > maintainer since July 2015: > > https://cgit.freedesktop.org/gummiboot/commit/?id=55df1539c9d330732e88bd196afee386db6e4a1d&utm_source=anzwix > > Indeed, gummiboot ended up being integrated as part of systemd as > systemd-boot. While it made sense for a while to keep it as a separate > standalone package, it is not possible to maintain it in Buildroot > without an active upstream, and there are other options for simple EFI > bootloaders these days. > > Therefore, let's retire this package. > > Fixes: > > http://autobuild.buildroot.net/results/5929104a868d2f69ec1b71e5e897b6d1ebf347cf/ > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > Config.in.legacy | 8 +++ > DEVELOPERS | 2 - > boot/Config.in | 1 - > ...w-building-with-newer-glibc-versions.patch | 31 ----------- > ...king-for-non-host-compatible-targets.patch | 54 ------------------- > boot/gummiboot/Config.in | 24 --------- > boot/gummiboot/buildroot.conf | 4 -- > boot/gummiboot/gummiboot.mk | 41 -------------- > boot/gummiboot/loader.conf | 2 - > 9 files changed, 8 insertions(+), 159 deletions(-) > delete mode 100644 boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch > delete mode 100644 boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch > delete mode 100644 boot/gummiboot/Config.in > delete mode 100644 boot/gummiboot/buildroot.conf > delete mode 100644 boot/gummiboot/gummiboot.mk > delete mode 100644 boot/gummiboot/loader.conf > > diff --git a/Config.in.legacy b/Config.in.legacy > index 5f7274e84b..0114236841 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,14 @@ endif > > comment "Legacy options removed in 2022.11" > > +config BR2_TARGET_GUMMIBOOT > + bool "gummiboot removed" > + select BR2_LEGACY > + help > + gummiboot has been deprecated since 2015, with no further > + updates. It became integrated into the systemd project as > + systemd-boot. > + > config BR2_PACKAGE_GPSD_OLDSTYLE > bool "gpsd oldstyle removed" > select BR2_LEGACY > diff --git a/DEVELOPERS b/DEVELOPERS > index 14b91fca8d..b9005e6ef7 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -835,7 +835,6 @@ N: Ernesto L. Williams Jr > F: package/szip/ > > N: Esben Haabendal > -F: boot/gummiboot/ > F: package/python-kiwisolver/ > > N: Etienne Carriere > @@ -2884,7 +2883,6 @@ F: boot/beaglev-ddrinit/ > F: boot/beaglev-secondboot/ > F: boot/boot-wrapper-aarch64/ > F: boot/grub2/ > -F: boot/gummiboot/ > F: configs/beaglev_defconfig > F: configs/stm32mp157c_dk2_defconfig > F: package/android-tools/ > diff --git a/boot/Config.in b/boot/Config.in > index 40472ae07d..f53c8cd7d7 100644 > --- a/boot/Config.in > +++ b/boot/Config.in > @@ -12,7 +12,6 @@ source "boot/binaries-marvell/Config.in" > source "boot/boot-wrapper-aarch64/Config.in" > source "boot/edk2/Config.in" > source "boot/grub2/Config.in" > -source "boot/gummiboot/Config.in" > source "boot/lpc32xxcdl/Config.in" > source "boot/mv-ddr-marvell/Config.in" > source "boot/mxs-bootlets/Config.in" > diff --git a/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch b/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch > deleted file mode 100644 > index b35cd499bc..0000000000 > --- a/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From 40ab4167b5a45c772304a879c71b47d54de3b0e3 Mon Sep 17 00:00:00 2001 > -From: Esben Haabendal > -Date: Wed, 20 Mar 2019 14:19:40 +0100 > -Subject: [PATCH] Allow building with newer glibc versions > - > -Newer glibc versions does not include sys/sysmacros.h from sys/types.h > -anymore. Including it unconditionally should be safe. > - > -See https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html for why > -this was done. > - > -Signed-off-by: Esben Haabendal > ---- > - src/setup/setup.c | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/src/setup/setup.c b/src/setup/setup.c > -index 6a4275a2ae36..53429375a146 100644 > ---- a/src/setup/setup.c > -+++ b/src/setup/setup.c > -@@ -37,6 +37,7 @@ > - #include > - #include > - #include > -+#include > - > - #include "efivars.h" > - > --- > -2.21.0 > - > diff --git a/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch b/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch > deleted file mode 100644 > index 7104a581e2..0000000000 > --- a/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch > +++ /dev/null > @@ -1,54 +0,0 @@ > -From fc05ced797b87286b8ec7303fe32bf200a072972 Mon Sep 17 00:00:00 2001 > -From: Esben Haabendal > -Date: Mon, 18 Mar 2019 11:14:31 +0100 > -Subject: [PATCH] Fix linking for non-host compatible targets > - > -Without this, gummiboot build system will use host 'ld' when linking > -target binary, which is obviously not a good idea. > - > -Signed-off-by: Esben Haabendal > ---- > - Makefile.am | 4 ++-- > - configure.ac | 4 ++++ > - 2 files changed, 6 insertions(+), 2 deletions(-) > - > -diff --git a/Makefile.am b/Makefile.am > -index 6568a355ed74..9051dd44edd9 100644 > ---- a/Makefile.am > -+++ b/Makefile.am > -@@ -142,7 +142,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) > - $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ > - > - $(gummiboot_solib): $(gummiboot_objects) > -- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(gummiboot_objects) \ > -+ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(gummiboot_objects) \ > - -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ > - nm -D -u $@ | grep ' U ' && exit 1 || : > - .DELETE_ON_ERROR: $(gummboot_solib) > -@@ -177,7 +177,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) > - $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ > - > - $(stub_solib): $(stub_objects) > -- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(stub_objects) \ > -+ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(stub_objects) \ > - -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ > - nm -D -u $@ | grep ' U ' && exit 1 || : > - .DELETE_ON_ERROR: $(gummboot_solib) > -diff --git a/configure.ac b/configure.ac > -index 27bbe1d73396..b948696c220b 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -40,6 +40,10 @@ dnl Don't try to use things like -std=c99 for efi compilation > - EFI_CC=$CC > - AC_SUBST([EFI_CC]) > - > -+dnl Allow specifying linker compatible with the compiler > -+EFI_LD=$LD > -+AC_SUBST([EFI_LD]) > -+ > - AC_PROG_CC_C99 > - AM_PROG_CC_C_O > - AC_PROG_GCC_TRADITIONAL > --- > -2.21.0 > - > diff --git a/boot/gummiboot/Config.in b/boot/gummiboot/Config.in > deleted file mode 100644 > index 1b5c4279f7..0000000000 > --- a/boot/gummiboot/Config.in > +++ /dev/null > @@ -1,24 +0,0 @@ > -config BR2_TARGET_GUMMIBOOT > - bool "gummiboot" > - depends on BR2_i386 || BR2_x86_64 > - depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS > - select BR2_PACKAGE_GNU_EFI > - select BR2_PACKAGE_UTIL_LINUX > - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID > - help > - gummiboot is a simple UEFI boot manager which executes > - configured EFI images. The default entry is selected by a > - configured pattern (glob) or an on-screen menu. > - > - gummiboot operates on the EFI System Partition (ESP) > - only. Configuration file fragments, kernels, initrds, other > - EFI images need to reside on the ESP. Linux kernels need to > - be built with CONFIG_EFI_STUB to be able to be directly > - executed as an EFI image. > - > - See the Grub2 help text for details on preparing an EFI > - capable disk image using Gummiboot: the instructions are > - exactly the same, except that the Gummiboot configuration > - files will be located in /loader/ inside the EFI partition. > - > - http://freedesktop.org/wiki/Software/gummiboot/ > diff --git a/boot/gummiboot/buildroot.conf b/boot/gummiboot/buildroot.conf > deleted file mode 100644 > index 8a6f02e56a..0000000000 > --- a/boot/gummiboot/buildroot.conf > +++ /dev/null > @@ -1,4 +0,0 @@ > -title Buildroot > -version 1 > -linux /bzImage > -options console=ttyS0 root=/dev/sda2 > diff --git a/boot/gummiboot/gummiboot.mk b/boot/gummiboot/gummiboot.mk > deleted file mode 100644 > index eb1f3da78c..0000000000 > --- a/boot/gummiboot/gummiboot.mk > +++ /dev/null > @@ -1,41 +0,0 @@ > -################################################################################ > -# > -# gummiboot > -# > -################################################################################ > - > -GUMMIBOOT_SITE = https://gitlab.freedesktop.org/archived-projects/gummiboot.git > -GUMMIBOOT_SITE_METHOD = git > -GUMMIBOOT_VERSION = 2bcd919c681c952eb867ef1bdb458f1bc49c2d55 > -GUMMIBOOT_LICENSE = LGPL-2.1+ > -GUMMIBOOT_LICENSE_FILES = LICENSE > - > -# The git archive does not have the autoconf/automake stuff generated. > -GUMMIBOOT_AUTORECONF = YES > -GUMMIBOOT_DEPENDENCIES = gnu-efi host-pkgconf util-linux > -GUMMIBOOT_INSTALL_TARGET = NO > -GUMMIBOOT_INSTALL_IMAGES = YES > - > -ifeq ($(BR2_i386),y) > -GUMMIBOOT_IMGARCH = ia32 > -else ifeq ($(BR2_x86_64),y) > -GUMMIBOOT_IMGARCH = x64 > -endif > - > -GUMMIBOOT_CONF_OPTS = \ > - --host=$(BR2_ARCH) \ > - --with-efi-libdir=$(STAGING_DIR)/usr/lib \ > - --with-efi-ldsdir=$(STAGING_DIR)/usr/lib \ > - --with-efi-includedir=$(STAGING_DIR)/usr/include \ > - --disable-manpages > - > -define GUMMIBOOT_INSTALL_IMAGES_CMDS > - $(INSTALL) -D -m 0644 $(@D)/gummiboot$(GUMMIBOOT_IMGARCH).efi \ > - $(BINARIES_DIR)/efi-part/EFI/BOOT/boot$(GUMMIBOOT_IMGARCH).efi > - $(INSTALL) -D -m 0644 boot/gummiboot/loader.conf \ > - $(BINARIES_DIR)/efi-part/loader/loader.conf > - $(INSTALL) -D -m 0644 boot/gummiboot/buildroot.conf \ > - $(BINARIES_DIR)/efi-part/loader/entries/buildroot.conf > -endef > - > -$(eval $(autotools-package)) > diff --git a/boot/gummiboot/loader.conf b/boot/gummiboot/loader.conf > deleted file mode 100644 > index 93b77b8f93..0000000000 > --- a/boot/gummiboot/loader.conf > +++ /dev/null > @@ -1,2 +0,0 @@ > -timeout 3 > -default buildroot > -- > 2.37.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 thomas.petazzoni at bootlin.com Mon Feb 6 22:02:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 23:02:03 +0100 Subject: [Buildroot] [PATCH] configs/stm32f746g-disco: new defconfig In-Reply-To: References: Message-ID: <20230206230203.70e2dbd8@windsurf> On Thu, 22 Sep 2022 09:42:51 +0200 Waldemar Brodkorb wrote: > Add support for ST Microsystems STM32F746G-DISCO board. > See here for hardware details: > https://www.st.com/en/evaluation-tools/32f746gdiscovery.html > > The LCD and Ethernet are _not_ yet supported by Linux upstream. > The RAM is very limited, so the init script is stolen from the > RISCV noMMU systems to support booting to a shell without crashing. > > Signed-off-by: Waldemar Brodkorb Sorry for the very very slow feedback. It mostly looks good of course, but there are two things that bother me. One very small and easy to address, another not so difficult, but I'm not entirely sure how to address it. See below. > diff --git a/board/stmicroelectronics/stm32f746g-disco/rootfs_overlay/sbin/init b/board/stmicroelectronics/stm32f746g-disco/rootfs_overlay/sbin/init > new file mode 100755 > index 0000000000..1285fd4420 > --- /dev/null > +++ b/board/stmicroelectronics/stm32f746g-disco/rootfs_overlay/sbin/init > @@ -0,0 +1,41 @@ > +#!/bin/sh > + > +# This script replaces the default busybox init process to avoid having that > +# process staying alive and sleeping in the background, (uselessly) consuming > +# precious memory. [...] What bothers me is that board/canaan/k210-soc/rootfs_overlay/sbin/init is exactly the same script, so we're duplicating it. Can we do something about it? I'm not exactly sure. A minimal "init" package for noMMU systems maybe? Also, do you really need this minimal init? stm32f469_disco_sd_defconfig doesn't need it apparently. > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10-rc5" Can we switch to a non-rc version? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Mon Feb 6 22:05:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 23:05:46 +0100 Subject: [Buildroot] [PATCH 2020.02.x] package/lxc: fix CVE-2022-47952 In-Reply-To: <20230206171544.35665-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 6 Feb 2023 18:15:44 +0100") References: <20230206171544.35665-1-fontaine.fabrice@gmail.com> Message-ID: <87357i8n5x.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may > allow local users to infer whether any file exists, even within a > protected directory tree, because "Failed to open" often indicates that > a file does not exist, whereas "does not refer to a network namespace > path" often indicates that a file exists. NOTE: this is different from > CVE-2018-6556 because the CVE-2018-6556 fix design was based on the > premise that "we will report back to the user that the open() failed but > the user has no way of knowing why it failed"; however, in many > realistic cases, there are no plausible reasons for failing except that > the file does not exist. > Signed-off-by: Fabrice Fontaine It is 2022.02.x, not 2020.02.x ;) Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From romain.naour at smile.fr Mon Feb 6 22:06:01 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 23:06:01 +0100 Subject: [Buildroot] [PATCH] Config.in: introduce BR2_TIME_BITS_64 option for Y2038 compatibility In-Reply-To: <5d683c3c-1229-70e6-1736-ca01dd1a7159@smile.fr> References: <20221012215008.2918444-1-thomas.petazzoni@bootlin.com> <5eebf7dee2a585f50a4e986c214677a157bfd22c.camel@calian.com> <20221013163910.3c6d9c8f@windsurf> <5d683c3c-1229-70e6-1736-ca01dd1a7159@smile.fr> Message-ID: Le 06/02/2023 ? 21:25, Romain Naour a ?crit?: > Hello Thomas, > > Le 13/10/2022 ? 16:39, Thomas Petazzoni via buildroot a ?crit?: >> On Wed, 12 Oct 2022 23:49:37 +0000 >> Robert Hancock wrote: >> >>> There's some chance of software being broken by enabling this, with >>> either a compile or runtime failure. For example, applications that >>> assume sizeof(time_t) == sizeof(long) would work on 32-bit platforms >>> with a 32-bit time and 64-bit platforms with a 64-bit time, but fail >>> with a 64-bit time on 32-bit. I believe I've seen this when trying to >>> build software with that option, so turning this on unconditionally >>> might be unwise, unless some build tests of the supported packages >>> have been done.. >> >> There will definitely be build testing: our autobuilders are testing >> 24/7 random configurations of Buildroot. So as soon as we introduce >> this option, there would be builds with BR2_TIME_BITS_64=y enabled, >> which would raise build issues if there's any. >> >> Of course, the more tricky part are runtime issues, which are >> essentially impossible to detect until someone runs into the problem. > > We already tried to enable BR2_TIME_BITS_64 back in March 2022 but we had to > revert it due to build issues with packages like glibc: > > See: > http://lists.busybox.net/pipermail/buildroot/2022-March/638105.html > > https://git.buildroot.net/buildroot/commit/?id=dd170f0cbad729dba4193b2b20e3de0a7010d485 > > I'll try to look again. The issue has been reported to zlib upstream project back in 2019 [1] and a pull request has been sent by Khem Raj on 2 Jan 2023 [2]. Reading one of the comment about libreELEC project "2038 proof" [3] we can notice it requires a lot of patches in several packages: glibc: dont build target with _TIME_BITS or _FILE_OFFSET_BITS for arm? eventlircd: support -D_TIME_BITS=64 for 64-bit time lirc: support -D_TIME_BITS=64 for 64-bit time zlib: support -D_TIME_BITS=64 for 64-bit time dvb-apps: support-time-bits-64.patch tslib: support -D_TIME_BITS=64 for 64-bit time libretro-fbneo: dont build target with _TIME_BITS or _FILE_OFFSET_BIT? mariadb: dont build target with _TIME_BITS or _FILE_OFFSET_BITS for a? In the end, enabling -D_FILE_OFFSET_BITS=64 and -D_TIME_BITS=64" onto all packages has been reverted [4] since it introduced several regression. After making a lot of effort and spending a lot of time, the libreELEC maintainer just give up: "TBH I tink we should not pursue the 32bit userland Y2038 issue further until glibc comes up with a better solution that doesn't break ABIs. Moving to 64bit (rather realistic within the next 10 years) or to another libc (not so much realistic) are all better options than the mess glibc created - it purely worked for them but pretty much no one else and almost every distribution abandoned the glibc approach so I think we should do the same." Thoughts? [1] https://github.com/madler/zlib/issues/447 [2] https://github.com/madler/zlib/pull/764 [3] https://github.com/LibreELEC/LibreELEC.tv/pull/6727 [4] https://github.com/LibreELEC/LibreELEC.tv/pull/7173 Best regards, Romain > > Best regards, > Romain > > >> >> Best regards, >> >> Thomas > From thomas.petazzoni at bootlin.com Mon Feb 6 22:23:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 23:23:54 +0100 Subject: [Buildroot] [git commit] package/qt5: fix build failure due to libressl use Message-ID: <20230206222423.8231B83DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a94d39d693d84f96f996a6a3decfecc60a9625bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Qt5 only supports openssl, check [0] and [1]. So in qt5base.mk let's check if BR2_PACKAGE_LIBOPENSSL is enabled instead of BR2_PACKAGE_OPENSSL(that could be openssl or libressl) and for qt5enginio and qt5webkit let's select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of only BR2_PACKAGE_OPENSSL. This way we make sure that only openssl is selected and not libressl or other future openssl-like implementations. Fixes: http://autobuild.buildroot.net/results/a956b48b782dbaa055d7146360465e2493a809d9/ [0]: https://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support [1]: https://bugreports.qt.io/browse/QTBUG-68374 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base.mk | 4 ++-- package/qt5/qt5enginio/Config.in | 2 ++ package/qt5/qt5webkit/Config.in | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index a81892422c..efa0e16e9a 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -229,8 +229,8 @@ else QT5BASE_CONFIGURE_OPTS += -no-eglfs endif -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBOPENSSL),-openssl,-no-openssl) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBOPENSSL),openssl) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig) diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in index b738f0db7c..a1ac6f8ca0 100644 --- a/package/qt5/qt5enginio/Config.in +++ b/package/qt5/qt5enginio/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_QT5ENGINIO bool "qt5enginio" select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_NETWORK help diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 26c3897d1d..9b84ac5f96 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -16,6 +16,8 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS From peter at korsgaard.com Mon Feb 6 21:42:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 22:42:59 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/lxc: fix CVE-2022-47952 Message-ID: <20230206222423.03E0083DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=399ca20e6b73eaab94ce7ae1c8a4cde96e2c7b2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may allow local users to infer whether any file exists, even within a protected directory tree, because "Failed to open" often indicates that a file does not exist, whereas "does not refer to a network namespace path" often indicates that a file exists. NOTE: this is different from CVE-2018-6556 because the CVE-2018-6556 fix design was based on the premise that "we will report back to the user that the open() failed but the user has no way of knowing why it failed"; however, in many realistic cases, there are no plausible reasons for failing except that the file does not exist. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...5-Patching-an-incoming-CVE-CVE-2022-47952.patch | 73 ++++++++++++++++++++++ package/lxc/lxc.mk | 3 + 2 files changed, 76 insertions(+) diff --git a/package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch b/package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch new file mode 100644 index 0000000000..071734848a --- /dev/null +++ b/package/lxc/0005-Patching-an-incoming-CVE-CVE-2022-47952.patch @@ -0,0 +1,73 @@ +From 1b0469530d7a38b8f8990e114b52530d1bf7f3b8 Mon Sep 17 00:00:00 2001 +From: Maher Azzouzi +Date: Sun, 25 Dec 2022 13:50:25 +0100 +Subject: [PATCH] Patching an incoming CVE (CVE-2022-47952) + +lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may +allow local users to infer whether any file exists, even within a +protected directory tree, because "Failed to open" often indicates +that a file does not exist, whereas "does not refer to a network +namespace path" often indicates that a file exists. NOTE: this is +different from CVE-2018-6556 because the CVE-2018-6556 fix design was +based on the premise that "we will report back to the user that the +open() failed but the user has no way of knowing why it failed"; +however, in many realistic cases, there are no plausible reasons for +failing except that the file does not exist. + +PoC: +> % ls /l +> ls: cannot open directory '/l': Permission denied +> % /usr/lib/x86_64-linux-gnu/lxc/lxc-user-nic delete lol lol /l/h/tt h h +> cmd/lxc_user_nic.c: 1096: main: Failed to open "/l/h/tt" <----- file does not exist. +> % /usr/lib/x86_64-linux-gnu/lxc/lxc-user-nic delete lol lol /l/h/t h h +> cmd/lxc_user_nic.c: 1101: main: Path "/l/h/t" does not refer to a network namespace path <---- file exist! + +Signed-off-by: MaherAzzouzi +Acked-by: Serge Hallyn + +[Retrieved from: +https://github.com/lxc/lxc/commit/1b0469530d7a38b8f8990e114b52530d1bf7f3b8] +Signed-off-by: Fabrice Fontaine +--- + src/lxc/cmd/lxc_user_nic.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +diff --git a/src/lxc/cmd/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c +index a91e2259d5..69bc6f17d1 100644 +--- a/src/lxc/cmd/lxc_user_nic.c ++++ b/src/lxc/cmd/lxc_user_nic.c +@@ -1085,20 +1085,17 @@ int main(int argc, char *argv[]) + } else if (request == LXC_USERNIC_DELETE) { + char opath[LXC_PROC_PID_FD_LEN]; + +- /* Open the path with O_PATH which will not trigger an actual +- * open(). Don't report an errno to the caller to not leak +- * information whether the path exists or not. +- * When stracing setuid is stripped so this is not a concern +- * either. +- */ ++ // Keep in mind CVE-2022-47952: It's crucial not to leak any ++ // information whether open() succeeded of failed. ++ + netns_fd = open(args.pid, O_PATH | O_CLOEXEC); + if (netns_fd < 0) { +- usernic_error("Failed to open \"%s\"\n", args.pid); ++ usernic_error("Failed while opening netns file for \"%s\"\n", args.pid); + _exit(EXIT_FAILURE); + } + + if (!fhas_fs_type(netns_fd, NSFS_MAGIC)) { +- usernic_error("Path \"%s\" does not refer to a network namespace path\n", args.pid); ++ usernic_error("Failed while opening netns file for \"%s\"\n", args.pid); + close(netns_fd); + _exit(EXIT_FAILURE); + } +@@ -1112,7 +1109,7 @@ int main(int argc, char *argv[]) + /* Now get an fd that we can use in setns() calls. */ + ret = open(opath, O_RDONLY | O_CLOEXEC); + if (ret < 0) { +- CMD_SYSERROR("Failed to open \"%s\"\n", args.pid); ++ CMD_SYSERROR("Failed while opening netns file for \"%s\"\n", args.pid); + close(netns_fd); + _exit(EXIT_FAILURE); + } diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index cece27411e..8fdb6855d1 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -12,6 +12,9 @@ LXC_CPE_ID_VENDOR = linuxcontainers LXC_DEPENDENCIES = host-pkgconf LXC_INSTALL_STAGING = YES +# 0005-Patching-an-incoming-CVE-CVE-2022-47952.patch +LXC_IGNORE_CVES += CVE-2022-47952 + LXC_CONF_OPTS = \ --disable-apparmor \ --disable-examples \ From peter at korsgaard.com Mon Feb 6 22:32:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 06 Feb 2023 23:32:08 +0100 Subject: [Buildroot] [PATCH] package/libcamera: bump to version 0.0.4 In-Reply-To: <20230206151514.1579632-1-marcus.folkesson@gmail.com> (Marcus Folkesson's message of "Mon, 6 Feb 2023 16:15:14 +0100") References: <20230206151514.1579632-1-marcus.folkesson@gmail.com> Message-ID: <87y1pa77dj.fsf@dell.be.48ers.dk> >>>>> "Marcus" == Marcus Folkesson writes: > Signed-off-by: Marcus Folkesson Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 6 22:32:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 23:32:13 +0100 Subject: [Buildroot] [git commit] package/libcamera: bump to version 0.0.4 Message-ID: <20230206223222.2760883DF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce3d349384f4d80ed8fc50a82ff864bd5bcf6375 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Folkesson Reviewed-by: Quentin Schulz Signed-off-by: Peter Korsgaard --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 033e318910..ea204aee98 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 d7100286616550aca487b46ae9de2a70bb471352a332b8214901b4148739990f libcamera-v0.0.3-br1.tar.gz +sha256 13e53b33652b16454264b6eff0a6f032aa9331f919b07b6d0e622917ed7f7dd8 libcamera-v0.0.4-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 8979a43aca..01c4cb2ff2 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = v0.0.3 +LIBCAMERA_VERSION = v0.0.4 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ From thomas.petazzoni at bootlin.com Mon Feb 6 22:45:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 23:45:20 +0100 Subject: [Buildroot] [PATCH v2] package/qt5: fix build failure due to libressl use In-Reply-To: <20220929104648.324977-1-giulio.benetti@benettiengineering.com> References: <20220928205527.GH1419013@scaer> <20220929104648.324977-1-giulio.benetti@benettiengineering.com> Message-ID: <20230206234520.4a140264@windsurf> On Thu, 29 Sep 2022 12:46:48 +0200 Giulio Benetti wrote: > Qt5 only supports openssl, check [0] and [1]. So in qt5base.mk let's check > if BR2_PACKAGE_LIBOPENSSL is enabled instead of BR2_PACKAGE_OPENSSL(that > could be openssl or libressl) and for qt5enginio and qt5webkit let's select > BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of only BR2_PACKAGE_OPENSSL. > This way we make sure that only openssl is selected and not libressl or > other future openssl-like implementations. > > Fixes: > http://autobuild.buildroot.net/results/a956b48b782dbaa055d7146360465e2493a809d9/ > > [0]: https://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support > [1]: https://bugreports.qt.io/browse/QTBUG-68374 > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of BR2_PACKAGE_LIBOPENSSL > --- > package/qt5/qt5base/qt5base.mk | 4 ++-- > package/qt5/qt5enginio/Config.in | 1 + > package/qt5/qt5webkit/Config.in | 1 + > 3 files changed, 4 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Mon Feb 6 22:48:12 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 6 Feb 2023 23:48:12 +0100 Subject: [Buildroot] [PATCH] package/pkg-generic: ignore error when chmod'ing extracted source In-Reply-To: <20220616020353.497241-1-uwu@icenowy.me> References: <20220616020353.497241-1-uwu@icenowy.me> Message-ID: <350106ad-b8a0-9fbf-5fc2-cf41bd32a93b@smile.fr> Hello, Le 16/06/2022 ? 04:03, Icenowy Zheng a ?crit?: > The chmod command included in GNU coreutils 9.0 will exit with 1 when in > a recursive a symlink is met and the mode of both itself and its target > is retained; however this situation is usually expected (such kind of > symlink exists in, e.g., a newly extracted tarball of Linux kernel), > thus not a failure. > > Considering this chmod call is only kind of vanishing, ignore error for > it. Thanks for the report, it seems that GNU coreutils chmod 9.0 had a regression [1] that has been fixed in GNU coreutils 9.1. I'm not sure if we should apply this workaround now that coreutils is fixed. [1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=50784 Best regards, Romain > > Signed-off-by: Icenowy Zheng > --- > package/pkg-generic.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index b233b07548..03e4b029b3 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -216,7 +216,7 @@ $(BUILD_DIR)/%/.stamp_extracted: > $(Q)mkdir -p $(@D) > $($(PKG)_EXTRACT_CMDS) > # some packages have messed up permissions inside > - $(Q)chmod -R +rw $(@D) > + -$(Q)chmod -R +rw $(@D) > $(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep)) > @$(call step_end,extract) > $(Q)touch $@ From rcrichlow9000 at gmail.com Mon Feb 6 23:57:00 2023 From: rcrichlow9000 at gmail.com (Ramon Crichlow) Date: Mon, 6 Feb 2023 17:57:00 -0600 Subject: [Buildroot] lsblk not getting built Message-ID: I modified package/util-linux/util-linux.mk and Config.in to match the changes here : https://patchwork.ozlabs.org/project/buildroot/patch/20160225171433.7e200dfc at free-electrons.com/ Then I ran make menuconfig and enabled BR2_PACKAGE_UTIL_LINUX_LSBLK. No lsblk gets built or iinstalled. --enable-lsblk does appear in the build log so the flag is being set correctly. I am using the stm32mp157-dk1 configuration. #uname -a Linux buildroot 5.13.0 #1 SMP PREEMPT Sun Feb 5 19:20:00 CST 2023 armv7l GNU/Linux Regards, Ramon -------------- next part -------------- An HTML attachment was scrubbed... URL: From rcrichlow9000 at gmail.com Tue Feb 7 01:07:12 2023 From: rcrichlow9000 at gmail.com (Ramon Crichlow) Date: Mon, 6 Feb 2023 19:07:12 -0600 Subject: [Buildroot] lsblk not getting built In-Reply-To: References: Message-ID: I didn't have BR2_PACKAGE_UTIL_LINUX_BINARIES selected. On Mon, Feb 6, 2023 at 5:57 PM Ramon Crichlow wrote: > I modified package/util-linux/util-linux.mk and Config.in to match the > changes here : > https://patchwork.ozlabs.org/project/buildroot/patch/20160225171433.7e200dfc at free-electrons.com/ > Then I ran make menuconfig and enabled BR2_PACKAGE_UTIL_LINUX_LSBLK. > > No lsblk gets built or iinstalled. > > --enable-lsblk does appear in the build log so the flag is being set > correctly. > > I am using the stm32mp157-dk1 configuration. > > #uname -a > Linux buildroot 5.13.0 #1 SMP PREEMPT Sun Feb 5 19:20:00 CST 2023 armv7l > GNU/Linux > > Regards, > Ramon > -------------- next part -------------- An HTML attachment was scrubbed... URL: From christian at paral.in Tue Feb 7 04:30:08 2023 From: christian at paral.in (Christian Stewart) Date: Mon, 6 Feb 2023 20:30:08 -0800 Subject: [Buildroot] [PATCH v3 1/3] package/docker-engine: bump version to v23.0.0 Message-ID: <20230207043010.85696-1-christian@paral.in> docker-engine does not ship a go.mod file in the tarball: create one to tell the Go compiler the root import path prefix for the module and the language version. Note that the language version in go.mod is not required to be equal the version of the Go compiler. This update requires a workaround for the non-standard vendor/ structure in the docker-engine repository, which has an invalid vendor/modules.txt file. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 Note that as of v23.0.0 docker-engine expects containerd to be started by systemd if --containerd= flag is set in dockerd.service, whereas in previous versions containerd was started by the docker daemon as a sub-process. There is no sysv unit for containerd, but this is OK: in the Docker sysv init file S60dockerd, we do not set the --containerd flag. The docker daemon will start containerd as a sub-process automatically due to the absence of this flag. Signed-off-by: Christian Stewart --- v1 -> v2: - clarify commit message about containerd.service and sysv compat - fix formatting in S60dockerd - bundle commit into a series with required containerd changes v2 -> v3: - remove whitespace changes (as per Yann review) - use rm -f instead of checking for file existence - add the go.mod file in the CONFIGURE step Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d15b1359cb..670cbd414b 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 2a9b72ca78..229e199aa2 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.22 +DOCKER_ENGINE_VERSION = 23.0.0 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -62,6 +62,14 @@ else DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_ENGINE_CONFIGURE_CMDS + printf "module $(DOCKER_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef + DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD -- 2.39.1 From christian at paral.in Tue Feb 7 04:30:09 2023 From: christian at paral.in (Christian Stewart) Date: Mon, 6 Feb 2023 20:30:09 -0800 Subject: [Buildroot] [PATCH v3 2/3] package/docker-proxy: drop package In-Reply-To: <20230207043010.85696-1-christian@paral.in> References: <20230207043010.85696-1-christian@paral.in> Message-ID: <20230207043010.85696-2-christian@paral.in> The docker-proxy binary (libnetwork) has been merged into the docker-engine source (moby). Drop the docker-proxy package and add cmd/docker-proxy as a build target of docker-engine instead. https://github.com/moby/libnetwork/commit/563fe8e248f3afac75a270f693f38bdc3eea7bf3 Signed-off-by: Christian Stewart --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/docker-engine/Config.in | 1 - package/docker-engine/docker-engine.mk | 2 +- package/docker-proxy/Config.in | 19 ------------------- package/docker-proxy/docker-proxy.hash | 3 --- package/docker-proxy/docker-proxy.mk | 21 --------------------- 8 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 package/docker-proxy/Config.in delete mode 100644 package/docker-proxy/docker-proxy.hash delete mode 100644 package/docker-proxy/docker-proxy.mk diff --git a/Config.in.legacy b/Config.in.legacy index 61686fdd11..c9d5c635cd 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy removed" + select BR2_LEGACY + select BR2_PACKAGE_DOCKER_ENGINE + help + docker-proxy has been dropped by upstream since version + 563fe8. it has been merged into docker-engine (moby). + config BR2_TARGET_GUMMIBOOT bool "gummiboot removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f8acf8776c..2559b8c227 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -545,7 +545,6 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-compose/ F: package/docker-engine/ -F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ diff --git a/package/Config.in b/package/Config.in index b6211f1102..45c803ea6c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2619,7 +2619,6 @@ menu "System tools" source "package/docker-cli/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" - source "package/docker-proxy/Config.in" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 1f0efb8fcc..b5a356eab9 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_USE_MMU # containerd select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency - select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency help Docker is a platform to build, ship, diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 229e199aa2..d769e367fa 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -24,7 +24,7 @@ DOCKER_ENGINE_LDFLAGS = \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs -DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_ENGINE_DEPENDENCIES += libapparmor diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in deleted file mode 100644 index 7e40536537..0000000000 --- a/package/docker-proxy/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_DOCKER_PROXY - bool "docker-proxy" - 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 - help - Libnetwork is a Container Network Model that provides a - consistent programming interface and the required network - abstractions for applications. - - This package provides docker-proxy, a run-time dependency of - Docker. - - https://github.com/docker/libnetwork - -comment "docker-proxy needs a 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_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash deleted file mode 100644 index 63296f14c1..0000000000 --- a/package/docker-proxy/docker-proxy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 05bf95637bae134d12d02bd7a7854cd0c768e6fccb662c2c64523f05b997b204 docker-proxy-f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk deleted file mode 100644 index fe7982e8f6..0000000000 --- a/package/docker-proxy/docker-proxy.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# docker-proxy -# -################################################################################ - -DOCKER_PROXY_VERSION = f6ccccb1c082a432c2a5814aaedaca56af33d9ea -DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) - -DOCKER_PROXY_LICENSE = Apache-2.0 -DOCKER_PROXY_LICENSE_FILES = LICENSE - -DOCKER_PROXY_DEPENDENCIES = host-pkgconf - -DOCKER_PROXY_BUILD_TARGETS = cmd/proxy - -define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy -endef - -$(eval $(golang-package)) -- 2.39.1 From christian at paral.in Tue Feb 7 04:30:10 2023 From: christian at paral.in (Christian Stewart) Date: Mon, 6 Feb 2023 20:30:10 -0800 Subject: [Buildroot] [PATCH v3 3/3] package/docker-cli: bump version to v23.0.0 In-Reply-To: <20230207043010.85696-1-christian@paral.in> References: <20230207043010.85696-1-christian@paral.in> Message-ID: <20230207043010.85696-3-christian@paral.in> docker-cli does not ship a go.mod file in the tarball: create one to tell the Go compiler the root import path prefix for the module and the language version. Note that the language version in go.mod is not required to be equal the version of the Go compiler. This update requires a workaround for the non-standard vendor/ structure in the docker-engine repository, which has an invalid vendor/modules.txt file. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 Signed-off-by: Christian Stewart --- v2 -> v3: - create go.mod file in the CONFIGURE step - update comments regarding adjusting language version - use rm -f instead of checking for file existence Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index c6db95f9b3..ff981be963 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz +sha256 3379d06cd6177832b91f4796c680b6bf15c7895773448716b4c3c5253f611d1b docker-cli-23.0.0.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index cb44c68c1b..4b0c9dcc89 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.22 +DOCKER_CLI_VERSION = 23.0.0 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 @@ -29,6 +29,14 @@ DOCKER_CLI_TAGS += osusergo netgo DOCKER_CLI_GO_ENV = CGO_ENABLED=no endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_CONFIGURE_CMDS + printf "module $(DOCKER_CLI_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef + DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) $(eval $(golang-package)) -- 2.39.1 From christian at paral.in Tue Feb 7 04:31:21 2023 From: christian at paral.in (Christian Stewart) Date: Mon, 6 Feb 2023 20:31:21 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/balena-engine: bump to version 20.10.26 Message-ID: <20230207043121.86027-1-christian@paral.in> balena-engine does not ship a go.mod file in the tarball: create one to tell the Go compiler the root import path prefix for the module and the language version. Note that the language version in go.mod is not required to be equal the version of the Go compiler. This update requires a workaround for the non-standard vendor/ structure in the balena-engine repository, which has an invalid vendor/modules.txt file. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 Remove the vendor/archive sub-tree (fixes a build error) because Go no longer allows having duplicate packages in GOPATH and GOROOT. vendor/archive/tar cannot be in vendor/ because it exists in the standard library. Remove it from vendor/. https://github.com/balena-os/balena-engine/releases/tag/v20.10.26 Signed-off-by: Christian Stewart --- v2 -> v3: - add missing go.mod file in CONFIGURE step - use rm -f instead of checking for file existence - update comment about language version Signed-off-by: Christian Stewart --- package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 4adb8ce561..6a92a40cc8 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz +sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index ecfb62bfbf..89a572cf8e 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 20.10.21 +BALENA_ENGINE_VERSION = 20.10.26 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 @@ -34,6 +34,16 @@ BALENA_ENGINE_TAGS = \ BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# remove the conflicting vendor/archive (not allowed in go1.20) +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define BALENA_ENGINE_CONFIGURE_CMDS + printf "module $(BALENA_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt + rm -rf $(@D)/vendor/archive +endef + ifeq ($(BR2_INIT_SYSTEMD),y) BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald -- 2.39.1 From christian at paral.in Tue Feb 7 04:32:23 2023 From: christian at paral.in (Christian Stewart) Date: Mon, 6 Feb 2023 20:32:23 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/rtl8812au-aircrack-ng: bump to 2022-12-22 version of v5.6.4.2 branch In-Reply-To: <20221230025221.1051537-1-christian@paral.in> References: <20221230025221.1051537-1-christian@paral.in> Message-ID: Hi all, On Thu, Dec 29, 2022 at 6:52 PM Christian Stewart wrote: > > Fixes: > http://autobuild.buildroot.net/results/4f6/4f65b521d5c6cffdf5f6294ce0257b9a19e441fc/ > > Reviewed-by: Giulio Benetti > Signed-off-by: Christian Stewart Is there anything further needs to be done to merge this? It fixes an autobuild issue. Thanks, Christian Stewart From thomas.petazzoni at bootlin.com Tue Feb 7 06:47:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 07 Feb 2023 06:47:14 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-06 Message-ID: <20230207064720.D0DFC403E9@smtp2.osuosl.org> Hello, Autobuild statistics for 2023-02-06 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 2 | 0 | 0 | 2 | 2022.11.x | 10 | 16 | 0 | 26 | master | 158 | 202 | 0 | 360 | Classification of failures by reason for master ----------------------------------------------- bash-5.2.15 | 15 xz-5.2.10 | 12 unknown | 10 host-pahole-1.24 | 9 gobject-introspection-1.72.0 | 7 python-bcrypt-4.0.1 | 7 gerbera-1.10.0 | 5 libopenssl-1.1.1q | 5 python-bunch-1.0.1 | 5 host-binutils-2.38 | 4 host-go-1.19.5 | 4 jack2-1.9.21 | 4 libgcrypt-1.10.1 | 4 libglib2-2.72.3 | 4 perl-5.36.0 | 4 xxhash-0.8.1 | 4 ulog-0389d243352255f6182326... | 3 wolfssl-5.5.3 | 3 dmalloc-5.6.5 | 2 elfutils-0.186 | 2 fontconfig-2.13.1 | 2 glibc-2.36-81-g4f4d7a13edfd... | 2 host-binutils-2.37 | 2 host-libarchive-3.6.2 | 2 host-libxml-parser-perl-2.46 | 2 host-sentry-cli-2.8.0 | 2 libgpg-error-1.46 | 2 linux-6.1.9 | 2 lirc-tools-0.10.2 | 2 mutt-2.2.9 | 2 netsurf-3.10 | 2 norm-1.5.8 | 2 ocf-linux-20171122 | 2 openssh-9.1p1 | 2 ripgrep-af6b6c543b224d348a8... | 2 zabbix-5.4.9 | 2 acpid-2.0.34 | 1 bat-0.19.0 | 1 berkeleydb-5.3.28 | 1 cairo-1.16.0 | 1 collectd-5.12.0 | 1 dahdi-linux-3.2.0 | 1 efivar-38 | 1 exim-4.96 | 1 ffmpeg-4.4.3 | 1 flann-1.9.2 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/romfs/romfs.mk:32: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gmp-6.2.1 | 1 google-breakpad-c85eb4a59b6... | 1 gummiboot-2bcd919c681c952eb... | 1 heirloom-mailx-12.5 | 1 host-binutils-2.39 | 1 host-delve-1.20.0 | 1 host-gcc-final-10.4.0 | 1 host-gcc-initial-10.4.0 | 1 host-gcc-initial-12.2.0 | 1 host-libopenssl-1.1.1q | 1 host-python-maturin-0.14.9 | 1 host-rust-1.66.1 | 1 hyperfine-1.14.0 | 1 kmod-30 | 1 leptonica-1.82.0 | 1 libcamera-apps-1.1.1 | 1 libcap-ng-0.8.3 | 1 libdrm-2.4.114 | 1 libglvnd-1.4.0 | 1 libxml2-2.10.3 | 1 lightning-2.2.0 | 1 lttng-modules-2.13.7 | 1 mariadb-10.3.36 | 1 memcached-1.6.17 | 1 mxs-bootlets-10.12.01 | 1 netsniff-ng-0.6.8 | 1 nmap-7.92 | 1 optee-client-3.19.0 | 1 pcre2-10.42 | 1 poco-1.12.2 | 1 proxychains-ng-4.16 | 1 python-cryptography-39.0.0 | 1 python-numpy-1.23.5 | 1 python-rtoml-0.8.0 | 1 rtl8812au-aircrack-ng-e7a4a... | 1 s6-portable-utils-2.2.5.0 | 1 sdl-1.2.15 | 1 ssdp-responder-1.9 | 1 uccp420wlan-6.9.1 | 1 uqmi-0a19b5b77140465c29e2af... | 1 valgrind-3.19.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/b74bbbbeb49ad30b6e95c0ab756ad325988366b6 | ORPH sh4 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/55dda2420fc19b1c341730ea0cfdb45c2b9b58c9 | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/4d7277cb359a569a99a25784d8769a2bed06c75d | ORPH arc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/57d1ca6d1e8603e901dc7046046c38e4be3ade7b | ORPH mips64 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/23e41be303910c917051eceacd6a3941d24772e6 | ORPH xtensa | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/d7f7d084f8ec2f22ce488c4f0f58619258732e53 | ORPH mips64el | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/5a1a7706511681114af754c5849adf24bb577d66 | ORPH i686 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/91e44276ebbf74a016e4add6e3c10ee6b90b36a8 | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/dceb497b7641a272123296f2c62626e0dbd3dcbf | ORPH xtensa | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/5765a6eb9d6687649cbd40b4d66fb74f9f8b06ca | ORPH mipsel | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/a1f7eced04717a34a12e40f4694ea4c926a4f0d2 | ORPH xtensa | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/1c0450396fc493e781ec4cc985ce3ed5c123faac | ORPH sh4eb | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/4c78fd0efaeb7f3c500bca6af4f0f0342246257f | ORPH arm | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/bd70b232ab83b6f920b1de589b0516854d23c076 | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/37593a293c4f83fea95880e182d21bf24511528d | ORPH or1k | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/7acc584407d3a503e8d39031565a78eb605273d4 | ORPH mipsel | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/e13b49a5939757c797d1f1ba1a94989ec285063a | sh4 | berkeleydb-5.3.28 | NOK | http://autobuild.buildroot.net/results/25dec4e4087903dea9123c72e13679488c9c2480 | ORPH xtensa | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/8c8e1588a049559fd0cb3d8111a171b72ae17158 | or1k | collectd-5.12.0 | NOK | http://autobuild.buildroot.net/results/681dab40f502d66643f4fb93614547823accd961 | s390x | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/24c6f398f175437a7efa98eb4c6b97d16d12c57e | i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/103d33e62c4ba7f03a62aa1190a920bb689a5e52 | ORPH powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/fce96f2a17bae1026eb6dc3df0d81aebd26848be | ORPH arm | efivar-38 | NOK | http://autobuild.buildroot.net/results/a00179e157ff2dbdec28c7a58e3ba5a68a7d6890 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/9933b690c4c79d28175b8ee0658de30a9d374245 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/aeb2692f361e4eabe1c6b71edf73689365600f08 | ORPH armeb | exim-4.96 | NOK | http://autobuild.buildroot.net/results/a068fadd96de2a4cb0c917d6717ec63b715393bd | aarch64 | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/da7deef89d97ff7372d93cce1bde39340f952768 | mips64el | flann-1.9.2 | NOK | http://autobuild.buildroot.net/results/79d2ceb0683d3b8c60fd6ccc67fbc51ca0de4e8a | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/5807a23709117a9c8f1ebd5e707eba68e1ae97c1 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/cfbdb6bd54c8a713f5392474391e5ff969419fd6 | ORPH aarch64_be | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/6c2d5e137dc95f42012d86ad38ff275634f02485 | arm | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/85fb59aa2016082d681105f17ac2ca3edcbbc967 | sparc64 | fs/romfs/romfs.mk:32: /tmp/... | NOK | http://autobuild.buildroot.net/results/54f5b8b25d0144fa9e85e422df276d229e7b5367 | x86_64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/543b91d6a5c928d02d5edcf02d0f655f5b406e7a | arm | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/586d8a5539e10674ef58cf2405c3b82108a4f54f | aarch64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/261a65bb920208367b2b8af260a70e9b720da583 | mips64el | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/2835c27354ee19a20f3947547986d30cf8863b5d | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/d4010bb3b895bc049f4685cc2455848b075467ec | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/c832064a8a486236a4676e55a48a9ff64207856b | microblazeel | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/c7f6d6aca7a2c69207a0f9cbe1163ac5a2d5566e | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/18b2b025e2d24ee393f843ee5ab5085a1c532f1b | powerpc64 | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/4f89977cc44d8cf8ec9e53d47cbe9df1af0a1f18 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/05d50dac0f8ba2fec33fd910d02a5ebe345037b3 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/eb036a2d1ad6c2b15b7b1ae8462d01a77792a067 | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/fad110fc8175e61ffb8e0864c1ce9cd3ff9cc18a | ORPH mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/87c24b45e74e8436dcb383c684802d7dfeb57be9 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/65337aa9be06ee5f6e66d09c57d6839dc6e3603e | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/dd2402f9e89436727203f9292d9885773bc5b877 | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8ac47a9ad3d7c1e5a1b414d4c814a1b4b3cf17cd | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8bb67fdb4c6b78ad22e73818aec76fc6329f855d | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/a4869c93557923f8d553fc4db01e61659cd721a3 | ORPH x86_64 | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/eb573954ba2a541602b6ace2e2311e94bfcf7af3 | i686 | gummiboot-2bcd919c681c952eb... | NOK | http://autobuild.buildroot.net/results/128c43d5da1fba639f8c251528d8c5a640538b9f | sh4aeb | heirloom-mailx-12.5 | NOK | http://autobuild.buildroot.net/results/b51c164de0c53f212e23565a246817862498593b | microblaze | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/c617ffd996845189faae25cf2f1626febd07d009 | sparc64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/113aad35efa553a8e15dc146c83bb9f5cd036c73 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1ba457cba994d896eb92c60d29eabb734519e68d | mips64el | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/69b2e3a743e0a9f0b6148c214a9d06c99e7bf87c | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/5344a4d30ce46c729483cf08d62d99eebc4beafa | i686 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/077f122c55f0abecb1d93544a0264d587dcd5609 | mips64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/cff1bf08af9c9cfa5c7331197af4c5447a9a0d70 | riscv64 | host-delve-1.20.0 | NOK | http://autobuild.buildroot.net/results/a4c78f97b84b81039d397340cb6f36a4fd941145 | microblaze | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/d37ebb30f5796b763fc85f5c95d0ec69e0e13223 | arm | host-gcc-initial-10.4.0 | NOK | http://autobuild.buildroot.net/results/ee25f7aff8e6d09ef891f8c9e0566acd16e81dfc | riscv64 | host-gcc-initial-12.2.0 | NOK | http://autobuild.buildroot.net/results/b0dd81a653663f494247474aa2190984363b3b42 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/99fd66268a07208cc57db1015372de4351268d88 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/a37b8db79bbd440e5223add4077b53481275a44f | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/4ffafc5d1be2524647517feabaeb9a025261f90e | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/71fa90a3058eda7077bc3878419618b79d69cc09 | arc | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/0c09618b568ccfd550771066d9ce13b87feec4a7 | s390x | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/cf928e2fc1021953c46b5b79ba9c32e14c934cbe | i686 | host-libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/7c2df31c6eb34b68e460e092d8c262bdc6c8f25a | microblazeel | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/ee09d52e50a04194c80aa1338f0a6e98c1323cc8 | s390x | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/38d1112965817a5db7e2c4d1089cf5e074873932 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/16710de50934f698a17e25c8672168b6f40500c2 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/20b445379f6bac25f43230db3ba4f7174a952435 | arc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/f61c19c80c4408ef4b31bab8e2cdacf9b7423706 | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/4381f9dae08b0d47525bf291c9ed698036db1ef2 | sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/14e253dd717802bb616264f888d17eaed8e375b4 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d1b116896bc2adc10f32e89ab99242484109549e | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/a1045a9cf65862fa84418f4ea5e69c9f330ddcec | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/3e1f4cb67a54177b169337ea1cf6717f224c850e | powerpc64le | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/08b3dd92cba069fcefd4e789ef31cb9ad3258ece | arm | host-python-maturin-0.14.9 | NOK | http://autobuild.buildroot.net/results/f810653285451492d42c7bcc490d4ec93fa9f2ca | mipsel | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/a6200194c12acb4ada8c8d5d54708ebb4494ea54 | aarch64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/987d34125356d2973e04725a1443121805b24469 | i686 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/5b1fd258ea724448be14771b37986801bc3da3ec | mips64el | hyperfine-1.14.0 | NOK | http://autobuild.buildroot.net/results/e681089d03a7088d000003f0e7e7eb809b08cb68 | ORPH m68k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/6ddecbe0634495d01d213c158c67c99e7d1b9356 | x86_64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/096e0b529ea78c6d1431fcae2ad5522d20421ce9 | riscv32 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/42fc0add46defee30d71fbd8dbabe5abd9f1dbed | mipsel | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/9966289cb8d07a461c14ce0eb5e36607b28aab94 | arm | kmod-30 | NOK | http://autobuild.buildroot.net/results/0a8a97b196e3bb49cd17cb45c587b5de520761c3 | sh4 | leptonica-1.82.0 | NOK | http://autobuild.buildroot.net/results/ca5c7b26c4d84845f733d61e2215aa589f88451c | riscv64 | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/678942304ace22adbc17b70ed5c97da83ed988b4 | arm | libdrm-2.4.114 | NOK | http://autobuild.buildroot.net/results/219ecdf1ead704aef6c0629770b4df895381538e | i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/42bec9e563e1e09ac04818960f483356c9e8e189 | ORPH armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/b6aed2e1691c3ec7dc36fc514efd20c4367ff7d1 | ORPH i486 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/52ef7bdc086ce73a71b559dfffbc1bad5565fa35 | ORPH i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/8e3731ec6162c8977f23d48a117a18d5c29591e5 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/2eadf8d0482fa02d23e8872afde209d732825007 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/fc5fffbbb2a96ae0a6ba11b7dbeae6190b0b5b5c | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/aeeaba1d5f7b4f4821f12360e63d8ca30b67353f | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/68e6bd6fb816e4efdf8b83a7d93d0791fccd5f64 | m68k | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/673ebc10d597c3a7cacab0bfcf18d7373c1f5c5e | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/af4e9d3ece173cdef34097ee2360a073fe41d789 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/625413ba762aae479c3f251e772b58ae3065ded9 | ORPH microblazeel | libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/065f3def24ef868424446d53d0f5f897303070a5 | arm | libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/d677be7289fe1bdc8fc62081a44b98d9eb9ef6d9 | microblaze | libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/129132a33b9cdb779d50033f316e84ec64f1c02c | mips64 | libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/5af699583279ccab96cc8d36af36e76da9683741 | arm | libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/5d10f4f545dccf126e3f5b5efce777a393c5e7bc | x86_64 | libxml2-2.10.3 | NOK | http://autobuild.buildroot.net/results/b0951dee3e361f7c2fddf7eeee4f8af777927b4b | arm | lightning-2.2.0 | NOK | http://autobuild.buildroot.net/results/0aa8287d5532e22dfea6ab5eec4a2aa62d8d0164 | powerpc | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/11775ee613a16a43bc36be0bbed756d9a90bf2f2 | ORPH sparc64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/534eb3040b441ed38f4f82b70bb1e87549ebca8f | ORPH s390x | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/5f5a916926b48c86930f11a242e1cbf3db534a07 | ORPH s390x | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/d7765d9ad1464219a8b70320a7dc57138e0095da | ORPH or1k | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/aac3bfda6f66138f323aa12cff7255b574b09401 | sparc | mariadb-10.3.36 | NOK | http://autobuild.buildroot.net/results/4319f76904a16c1f582b2e70a3c474751c8d0b7a | ORPH nios2 | memcached-1.6.17 | NOK | http://autobuild.buildroot.net/results/3d815f9b5aa0e16e236a9ccc7aa499972898d0f3 | ORPH aarch64_be | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/36ee198d52b0d2a8bb312dbe1c380c68fc1747fb | mipsel | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/5c2c0cc1f05b78711f9e1302e53006877472b0b9 | arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/55fcaec0c76803ea6dff8837759fbc9d7ef6546b | ORPH powerpc64le | netsniff-ng-0.6.8 | NOK | http://autobuild.buildroot.net/results/46247fa9bb7d2c4c892108ee592799fcfc9973d5 | i586 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/7053ad04604025705c600e4e3b2e942685525067 | sparc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/fd3de7e92aa720b23b9c63c10cf1697c3fb20eec | microblaze | nmap-7.92 | NOK | http://autobuild.buildroot.net/results/277445f4d853fa7722825606b1d39955ae5a2af8 | ORPH mips64el | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/2fc49abf94b0839b404bd8f9e836ef8c8f190f7d | ORPH m68k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/197fa060a37fdccc7d9d0fce118241d1521a9134 | ORPH microblaze | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/b05428a2ad37209fc7d5f7fa454e855377f9c205 | ORPH arc | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/b6fc49fa6b4b4871a81927e0d1c14217975b7153 | ORPH m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/d3f52736036da8479e68eb103a06736fb6c02401 | ORPH m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/58d5d48ce3c0b757bf279c49f07abbc3e9249ae1 | ORPH mips | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/041a6155e19821f1854a236ed02eeba9508b0ce7 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/b39433c8b79a1558012e70bbe945fa964cd60d3a | ORPH arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/976c58e57ae7b62a75e2e1a4ca416ee62981583f | powerpc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/5d79c8eafa27da6f9a7d859aec4fd3f44be0b082 | x86_64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/8a9b18c294f8a9746ba3607fa80819e38e00e108 | arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/9804902e4be6c88b31f6a59f64cd4d7a3252f44d | sparc | poco-1.12.2 | NOK | http://autobuild.buildroot.net/results/9c38d7ce68cf3c0b9bb9ef9d127077455e749d73 | mipsel | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/672901916e4995e193e297d03424864a095c52d8 | ORPH powerpc64le | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/036f2127fa64e77744be477d1827e1c9d7dbe6db | powerpc64le | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/3d574b2309e9c7981db96f0818174532eec2a90a | sparc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/b7bf6fb3151aff80de8de25a21f20261a3e5256c | powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/533be5ad4fab94f521429049e786c81a83a8b572 | powerpc64le | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/65c3f73afbffac3ae16acba68c8df1c5d693cc7b | sparc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/b3a46f9ffc713de4a677000c5f7c0ebcd19a736e | x86_64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/b6806b1c39884694061890bc7f8cc79b14d85c32 | powerpc64le | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/9f800ad388fdd0a7ec0b0b653cae52bc5c4dae64 | aarch64 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/e568f377fdffb251b897d4dc3fa70a024db2427e | or1k | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/229fa204bcb8027967b16bd29ecff5490b3f3db1 | nios2 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/a58694b07fae29e1ebcddd35a399b088380b91f1 | sh4aeb | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/0a396a4a14ba94554c820b26d94cf61dfdbd26f9 | powerpc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/83cc6929c4cb1fded11080ef8562b13cdae1af7a | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/2acefb965595b9d6d723d526fecc6d190486aee6 | mipsel | python-rtoml-0.8.0 | NOK | http://autobuild.buildroot.net/results/d89fd438bc2e4470625dd91b8f6ed293a54b70c8 | aarch64 | ripgrep-af6b6c543b224d348a8... | NOK | http://autobuild.buildroot.net/results/fd94875341f303d1866c94f81f12bee389082f42 | sparc64 | ripgrep-af6b6c543b224d348a8... | NOK | http://autobuild.buildroot.net/results/527a425d59bc6dff8e6fdde19b462391adf2730f | x86_64 | rtl8812au-aircrack-ng-e7a4a... | NOK | http://autobuild.buildroot.net/results/97048c28cc552dec8998bb0c01e3cab3385a2c92 | microblaze | s6-portable-utils-2.2.5.0 | NOK | http://autobuild.buildroot.net/results/9df28c07baa1aa765d4a6ef653eaff697e8d3e07 | sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/5c6707457d37cd6c577e8023bfe03d114a7b459c | ORPH sparc64 | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 | sparc64 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/f89989e5c9efd14485b91bcf155f2e3239e0284c | ORPH arc | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/847c87574326c483be5188cefb9c67162ccbf5b6 | sparc | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/59b42564f8667709a51977e94431116a3bfc706d | aarch64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/1d3f689619b16847dba347c28ad3200857da243c | arc | unknown | NOK | http://autobuild.buildroot.net/results/c98a2274329195f774e0144cd8dd40b81deb8ba0 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/9acac14d1d43dbbc9501b2e7bf4324fca548843a | sh4aeb | unknown | NOK | http://autobuild.buildroot.net/results/9287ba8b025305e42bcb2692ac5fb59068f8ee18 | arceb | unknown | NOK | http://autobuild.buildroot.net/results/ab391e9b79ea2baeafeef6e5262b9b214a21800c | or1k | unknown | NOK | http://autobuild.buildroot.net/results/22e7fd4d4098c0c63aac3b92c1461cb62c65ed78 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/57d8f365629e62d39ed8b1764090dce66d1eb9df | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/e02a11a1e713afd11eae5276eb546471803201a7 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/2982e751d5d2d9c93b2f4cddea1c575251531ef3 | arm | unknown | NOK | http://autobuild.buildroot.net/results/2d728342ca41acb4d743ce17486c4f9af3d32402 | sparc | unknown | NOK | http://autobuild.buildroot.net/results/6f05fbd6f0cb200d32ef5763494139c97a9f7652 | mips64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/54648c2bcc26f718718e7e20636bb548acbbf494 | ORPH mipsel | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/c7304dd6eb59109f8f41c9b606fcc3b8b8f6fc2c | ORPH riscv32 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/f056ebe7749a69994afba39a9d4967e2774c45ea | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/502a2b217845eb290c1961d4740b032462f8ae53 | armeb | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/ee6c07791e5d3b4c57ca95f80955230acee9c28f | microblaze | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/f998d56bb2d53485a42e6057c12269db66e64ba5 | ORPH aarch64_be | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/6e01e37b119a4f3028f30cf272396a990f708e29 | ORPH or1k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/69782b4ea44d07f609eebc2c06722af6eb14875a | ORPH mips64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/21f72b10b6f73c61b21893ef70e57c5620517413 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/40c2a03577a636eaee88bc83f2bbd4aa51df30f5 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/cd0e0437687df3e85406f4a50920255fa455de16 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/e5e25a80af3bc3379b2b5617f8d30809c04dbed9 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/24ede07b2b76ec410577fb3283a43047249e4b01 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/a10f968a008db7e418ea69e88340b7e4553c231c | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/cc05989189df98062c9a85b27908b350046bbfee | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/6db78e1e6f11009aec56f1a8a0322fccced63d12 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/9f4bc1004300719f70b86b97050cd125ec2337c1 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/38cacd3dab56c2a592b6d7a549bf3fad50a30f8f | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/d148aaec2a524293804e5b6efd6ad871e8c7ba10 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/b79b12de21b0a210477aa0eb89cbffd436418c0e | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/6a974ddc6a7c7d51d0e129da0e54dcc594fbb471 | ORPH aarch64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/8d7b5dad6cd6fdc47f5f069e18e5d7b61f9eb354 | mips64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/09060bb361fe1fcb1d6c7bfabc33eeb9fa919815 | Classification of failures by reason for 2022.11.x -------------------------------------------------- unknown | 2 frr-8.3.1 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 host-binutils-2.39 | 1 host-gcc-initial-12.2.0 | 1 libgcrypt-1.10.1 | 1 libnss-3.84 | 1 libopenssl-1.1.1q | 1 linux-6.0.19 | 1 lirc-tools-0.10.2 | 1 musl-1.2.3 | 1 pv-1.6.20 | 1 python-numpy-1.23.4 | 1 xxhash-0.8.1 | 1 xz-5.2.7 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- xtensa | frr-8.3.1 | NOK | http://autobuild.buildroot.net/results/9c9b65fb8c632fbae9e5ce1b34ace456d109497a | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/6b0d121aaae138ff12408befa1bd0c5a7e9776bc | mipsel | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/93fd9ddf666c4ef310504298c42396457c7a2760 | arm | host-gcc-initial-12.2.0 | NOK | http://autobuild.buildroot.net/results/32690752960ca774bed32eaf3ed18d442a05e589 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/760fc6371456dc3a7f3566ca182144e5bda6c26e | ORPH sh4a | libnss-3.84 | NOK | http://autobuild.buildroot.net/results/43fad5f946728c4fe04a35bcc639390f20fc5ed6 | s390x | libopenssl-1.1.1q | NOK | http://autobuild.buildroot.net/results/77fc3cedeefa47c0ef29a45dee89c6ba0fad282d | mips | linux-6.0.19 | NOK | http://autobuild.buildroot.net/results/822c8c731770d8e02f2ebfaed10b57166e72a0fe | ORPH mips | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/56bfa82a80b92ea293ea33bf109ac7e58bb4599d | ORPH powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/e7adb7e9f40befb38878e3dff4226f13101a30e5 | armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/998e74b401ae0ad369eb1e951ff083a8d5a3fcb3 | ORPH armeb | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/55ea4b3bedabd0565f458e55710fea1e551eb36f | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/12867e5d4afb9e978908a2085219eb712e95db8d | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/a41fd4768291465566fa6a0be3a356815f7649fc | arm | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/7b439ce04b31781892688ab13eb642f0e94944dc | ORPH microblazeel | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/749e3053478c1b7ff18f536deb368cf920c58736 | ORPH -- http://autobuild.buildroot.net From dario.binacchi at amarulasolutions.com Tue Feb 7 08:21:36 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 7 Feb 2023 09:21:36 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/beaglebone: bump Linux version to 5.10.162-ti-r56 Message-ID: <20230207082136.90164-1-dario.binacchi@amarulasolutions.com> The previous version failed to boot from sd card with a log reported by the document [1]. In my case it always failed, a 100% failure against 75% reported by the document. Instead of adding the patch to fix the problem, I preferred to update the kernel version. Tested on beaglebone black. [1] https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 Signed-off-by: Dario Binacchi --- Changes in v2: - bump version to 5.10.162-ti-r56. Signed-off-by: Dario Binacchi --- configs/beaglebone_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 639b491e9746..3ce5721265c3 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.162-ti-r56)/linux-5.10.162-ti-r56.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" -- 2.32.0 From thomas.petazzoni at bootlin.com Tue Feb 7 08:24:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:24:16 +0100 Subject: [Buildroot] [git commit] utils/get-developers: bail out on parsing errors Message-ID: <20230207082427.4F2D983EAF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ee1dd85a34b6228c634a66450deefadbb2c9b50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently 4 types of parsing errors/warnings can be found: - entry for a file that is not in the tree anymore (warning) - developer entry with no file entry (error) - file entry with no developer (error) - entry that is not a developer, a file or a comment (hard error) Currently only the last one ends the script with -v with error code. Make all 3 error types into hard errors and bail out at the first error found, because the rest of the state machine is not designed to handle malformed input. Suggested-by: Thomas Petazzoni Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/testing/tests/utils/test_get_developers.py | 9 ++++----- utils/getdeveloperlib.py | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/testing/tests/utils/test_get_developers.py b/support/testing/tests/utils/test_get_developers.py index 12710fe8d3..0b313c7c59 100644 --- a/support/testing/tests/utils/test_get_developers.py +++ b/support/testing/tests/utils/test_get_developers.py @@ -70,11 +70,11 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) self.assertIn("Syntax error in DEVELOPERS file, line 1", err) - self.assertEqual(rc, 0) + self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) - # -v generating error for developer entry with no file entries + # -v generating error for developer entry with no file entries, stopping on first error developers = b'# comment\n' \ b'# comment\n' \ b'\n' \ @@ -84,10 +84,9 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) self.assertIn("Syntax error in DEVELOPERS file, line 1", err) - self.assertIn("Syntax error in DEVELOPERS file, line 2", err) - self.assertEqual(rc, 0) + self.assertEqual(rc, 1) self.assertEqual(len(out), 0) - self.assertEqual(len(err), 2) + self.assertEqual(len(err), 1) # -v not generating error for developer entry with empty list of file entries developers = b'# comment\n' \ diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index 2a8d5c213c..dbd21af443 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -243,6 +243,7 @@ def parse_developers(filename=None): if name is not None or len(files) != 0: print("Syntax error in DEVELOPERS file, line %d" % linen, file=sys.stderr) + return None name = line[2:].strip() elif line.startswith("F:"): fname = line[2:].strip() From thomas.petazzoni at bootlin.com Tue Feb 7 08:24:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:24:16 +0100 Subject: [Buildroot] [git commit] utils/get-developers: print error for correct line Message-ID: <20230207082427.5C7BB83EB2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de03312db0190adc5b7dfa5b7658b2275801c933 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Start counting the line numbers in 1 instead of 0, in case an error must be printed. Both the error about a developer entry with no file entry and the error about a file entry with no developer entry actually belong to the non-empty line previous the one being analysed, so in these cases print the line number from the line before. Also count empty and comment lines, so a developer fixing the file can jump to the correct line (or the nearest one). At same time standardize the messages, printing the line number also in the case of a warning for a file that is not in the tree anymore. Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/testing/tests/utils/test_get_developers.py | 16 ++++++++-------- utils/getdeveloperlib.py | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/support/testing/tests/utils/test_get_developers.py b/support/testing/tests/utils/test_get_developers.py index 0b313c7c59..ffc01f6ce7 100644 --- a/support/testing/tests/utils/test_get_developers.py +++ b/support/testing/tests/utils/test_get_developers.py @@ -48,7 +48,7 @@ class TestGetDevelopers(unittest.TestCase): # -v generating error, called from the main dir developers = b'text1\n' out, err, rc = call_get_developers("./utils/get-developers", ["-v"], self.WITH_EMPTY_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 0: 'text1'", err) + self.assertIn("Syntax error in DEVELOPERS file, line 1: 'text1'", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -56,7 +56,7 @@ class TestGetDevelopers(unittest.TestCase): # -v generating error, called from path developers = b'text2\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 0: 'text2'", err) + self.assertIn("Syntax error in DEVELOPERS file, line 1: 'text2'", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -69,7 +69,7 @@ class TestGetDevelopers(unittest.TestCase): b'N:\tAuthor2 \n' \ b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 1", err) + self.assertIn("Syntax error in DEVELOPERS file, line 4", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -83,7 +83,7 @@ class TestGetDevelopers(unittest.TestCase): b'N:\tAuthor3 \n' \ b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 1", err) + self.assertIn("Syntax error in DEVELOPERS file, line 4", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -108,8 +108,8 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tpath/that/does/not/exists/1\n' \ b'F:\tpath/that/does/not/exists/2\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file", err) - self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file", err) + self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file, line 2", err) + self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file, line 3", err) self.assertEqual(rc, 0) self.assertEqual(len(out), 0) self.assertEqual(len(err), 2) @@ -119,8 +119,8 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tpath/that/does/not/exists/1\n' \ b'F:\tpath/that/does/not/exists/2\n' out, err, rc = call_get_developers("./utils/get-developers", ["-c"], self.WITH_EMPTY_PATH, topdir, developers) - self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file", err) - self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file", err) + self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file, line 2", err) + self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file, line 3", err) self.assertEqual(rc, 0) self.assertGreater(len(out), 1000) self.assertEqual(len(err), 2) diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index dbd21af443..e7d0d23e49 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -236,12 +236,13 @@ def parse_developers(filename=None): files = [] name = None for line in f: + linen += 1 line = line.strip() if line.startswith("#"): continue elif line.startswith("N:"): if name is not None or len(files) != 0: - print("Syntax error in DEVELOPERS file, line %d" % linen, + print("Syntax error in DEVELOPERS file, line %d" % (linen - 1), file=sys.stderr) return None name = line[2:].strip() @@ -249,7 +250,7 @@ def parse_developers(filename=None): fname = line[2:].strip() dev_files = glob.glob(os.path.join(brpath, fname)) if len(dev_files) == 0: - print("WARNING: '%s' doesn't match any file" % fname, + print("WARNING: '%s' doesn't match any file, line %d" % (fname, linen), file=sys.stderr) for f in dev_files: dev_file = os.path.relpath(f, brpath) @@ -267,7 +268,6 @@ def parse_developers(filename=None): print("Syntax error in DEVELOPERS file, line %d: '%s'" % (linen, line), file=sys.stderr) return None - linen += 1 # handle last developer if name is not None: developers.append(Developer(name, files)) From thomas.petazzoni at bootlin.com Tue Feb 7 08:24:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:24:47 +0100 Subject: [Buildroot] [next, v2 1/2] utils/get-developers: bail out on parsing errors In-Reply-To: <20221127144819.2022348-1-ricardo.martincoski@gmail.com> References: <20221127144819.2022348-1-ricardo.martincoski@gmail.com> Message-ID: <20230207092447.563f22a5@windsurf> On Sun, 27 Nov 2022 11:48:18 -0300 Ricardo Martincoski wrote: > Currently 4 types of parsing errors/warnings can be found: > - entry for a file that is not in the tree anymore (warning) > - developer entry with no file entry (error) > - file entry with no developer (error) > - entry that is not a developer, a file or a comment (hard error) > > Currently only the last one ends the script with -v with error code. > > Make all 3 error types into hard errors and bail out at the first error > found, because the rest of the state machine is not designed to handle > malformed input. > Suggested-by: Thomas Petazzoni > > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - do not change warning to error, an entry for a file that is not in > the tree anymore is not a syntax error (Thomas) > - add the lineno on the warning messages in the next patch instead of > this patch Both applied to master! Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 08:34:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:34:08 +0100 Subject: [Buildroot] [git commit] support/tests: enable PPD, and thus TLPB, for systemd tests Message-ID: <20230207083424.6B2B183F27@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82f84b4cfbe7d7631b34b67f10e9709772dd1165 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/testing/tests/init/test_systemd.py | 1 + 1 file changed, 1 insertion(+) diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index 06c42736ae..ddc32b0838 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -13,6 +13,7 @@ class InitSystemSystemdBase(InitSystemBase): BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # BR2_TARGET_ROOTFS_TAR is not set + BR2_PER_PACKAGE_DIRECTORIES=y """ def check_systemd(self, fs): From thomas.petazzoni at bootlin.com Tue Feb 7 08:31:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:31:41 +0100 Subject: [Buildroot] [git commit] support/tests: allow top-level parallel builds Message-ID: <20230207083424.5FCA883F26@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c41fb6225632ecea0b7008969bb70cf8e2636ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Running tests with top-level parallel builds can speed up running some tests, expecially those that have a lot of packages like the systemd init tests. Trigger TLPB when the configuration enables per-package directories. We're using the jlevel argument, which normally is used for BR2_JLEVEL as the value for calling make -j at the top-level. In fact, BR2_JLEVEL is "unused" when using TLPB, because the top-level make acts as the job server that distributes tokens to sub-makes (except for the few build systems like waf or scons that don't support this), so it's really the top-level make -j that determines the level of parallelism, and BR2_JLEVEL doesn't really have an effect. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni [Thomas: extend explanation a bit] Signed-off-by: Thomas Petazzoni --- support/testing/infra/basetest.py | 2 +- support/testing/infra/builder.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 45bcd4c2e2..670c7213d6 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -52,7 +52,7 @@ class BRConfigTest(unittest.TestCase): def setUp(self): self.show_msg("Starting") - self.b = Builder(self.config, self.builddir, self.logtofile) + self.b = Builder(self.config, self.builddir, self.logtofile, self.jlevel) if not self.keepbuilds: self.b.delete() diff --git a/support/testing/infra/builder.py b/support/testing/infra/builder.py index 922a707220..a2abb9ed89 100644 --- a/support/testing/infra/builder.py +++ b/support/testing/infra/builder.py @@ -6,11 +6,12 @@ import infra class Builder(object): - def __init__(self, config, builddir, logtofile): + def __init__(self, config, builddir, logtofile, jlevel=None): self.config = '\n'.join([line.lstrip() for line in config.splitlines()]) + '\n' self.builddir = builddir self.logfile = infra.open_log_file(builddir, "build", logtofile) + self.jlevel = jlevel def is_defconfig_valid(self, configfile, defconfig): """Check if the .config is contains all lines present in the defconfig.""" @@ -87,6 +88,8 @@ class Builder(object): env.update(make_extra_env) cmd = ["make", "-C", self.builddir] + if "BR2_PER_PACKAGE_DIRECTORIES=y" in self.config.splitlines() and self.jlevel: + cmd.append(f"-j{self.jlevel}") cmd += make_extra_opts ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, From thomas.petazzoni at bootlin.com Tue Feb 7 08:39:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:39:25 +0100 Subject: [Buildroot] [PATCH 2/3] support/tests: allow top-level parallel builds In-Reply-To: References: Message-ID: <20230207093925.6cd7a7c9@windsurf> On Sat, 24 Dec 2022 10:18:12 +0100 "Yann E. MORIN" wrote: > Running tests with top-level parallel builds can speed up running some > tests, expecially those that have a lot of packages like the systemd > init tests. > > Trigger TLPB when the configuration enables per-package directories. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > --- > support/testing/infra/basetest.py | 2 +- > support/testing/infra/builder.py | 5 ++++- > 2 files changed, 5 insertions(+), 2 deletions(-) Thanks to the additional explanation you provided, I understood better the idea, and therefore applied the patch. I updated the commit log a little bit to summarize the explanation you gave, and applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 08:39:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:39:32 +0100 Subject: [Buildroot] [PATCH 3/3] support/tests: enable PPD, and thus TLPB, for systemd tests In-Reply-To: <9b491a410b4067fb2107567b79329ec541f8b241.1671873478.git.yann.morin.1998@free.fr> References: <9b491a410b4067fb2107567b79329ec541f8b241.1671873478.git.yann.morin.1998@free.fr> Message-ID: <20230207093932.5f0ace73@windsurf> On Sat, 24 Dec 2022 10:18:13 +0100 "Yann E. MORIN" wrote: > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > --- > support/testing/tests/init/test_systemd.py | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Tue Feb 7 08:39:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 09:39:29 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require English perl package for host-libxml-parser-perl Message-ID: <20230207083951.455AD83F4E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f8085e63a4a755d587a25a73dbaafe33b23f867 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes http://autobuild.buildroot.net/results/166/1667b4ebd8e16e7d8b47bc3ca128a76daf27b4d9/ The configure script of host-libxml-parser-perl needs the English perl module on the host: ERROR from evaluation of /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/Expat/Makefile.PL: Can't locate English.pm in @INC (you may need to install the English module) (@INC contains: /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/inc /home/buildroot/autobuild/instance-1/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at ./Makefile.PL line 3. So add a check for it in dependencies.sh similar to the existing check for ExtUtils::MakeMaker. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index afd30008e8..ea16a21e20 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -266,6 +266,7 @@ fi # Check that the Perl installation is complete enough for Buildroot. required_perl_modules="Data::Dumper" # Needed to build host-autoconf +required_perl_modules="$required_perl_modules English" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl From marcus.folkesson at gmail.com Tue Feb 7 08:54:45 2023 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Tue, 7 Feb 2023 09:54:45 +0100 Subject: [Buildroot] [PATCH] package/libcamera-apps: enable LIBAV only if libdrm is present Message-ID: <20230207085445.1651226-1-marcus.folkesson@gmail.com> Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps does enable LIBAV by default which depends on libdrm. Fixes: - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 13 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Marcus Folkesson --- package/libcamera-apps/libcamera-apps.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 290ee9a026..385c65136e 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -25,8 +25,10 @@ LIBCAMERA_APPS_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_LIBDRM),y) LIBCAMERA_APPS_DEPENDENCIES += libdrm LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 endif ifeq ($(BR2_PACKAGE_XORG7),y) -- 2.38.1 From yann.morin.1998 at free.fr Tue Feb 7 09:03:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 10:03:25 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/cni-plugins: new package In-Reply-To: <20220904125359.18844-1-raphael.pavlidis@gmail.com> References: <20220616163309.5271-1-raphael.pavlidis@gmail.com> <20220904125359.18844-1-raphael.pavlidis@gmail.com> Message-ID: <20230207090325.GA4124@scaer> Raphael, All, On 2022-09-04 14:53 +0200, Raphael Pavlidis spake thusly: > cni-plugins contains some reference networking plugins, maintained by > the CNI team. > > Signed-off-by: Raphael Pavlidis We had cni-plugins added by Christian, and we're now at version 1.2.0. I'm not sure whether it makes sense to have a selection for each and individual plugins, but if you think that does, then feel free to respin an update. Thanks! Regards, Yann E. MORIN. > --- > Changes v2 -> v3: > - DEVELOPERS: add Raphael Pavlids for cni-plugins > > Changes v1 -> v2: > - change BR2_PACKAGE_CNI_PLUGINS from config to menuconfig > - turn on all plugins by default > > DEVELOPERS | 3 + > package/Config.in | 1 + > package/cni-plugins/Config.in | 108 +++++++++++++++++++++++++++ > package/cni-plugins/cni-plugins.hash | 3 + > package/cni-plugins/cni-plugins.mk | 77 +++++++++++++++++++ > 5 files changed, 192 insertions(+) > create mode 100644 package/cni-plugins/Config.in > create mode 100644 package/cni-plugins/cni-plugins.hash > create mode 100644 package/cni-plugins/cni-plugins.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index d2bd0d809a..208330881c 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2506,6 +2506,9 @@ F: support/testing/tests/package/test_python_jmespath.py > F: support/testing/tests/package/test_python_rsa.py > F: support/testing/tests/package/test_python_s3transfer.py > > +N: Raphael Pavlidis > +F: package/cni-plugins/ > + > N: Refik Tuzakli > F: package/freescale-imx/ > F: package/paho-mqtt-cpp/ > diff --git a/package/Config.in b/package/Config.in > index d1c098c48f..00e9a5a99f 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1812,6 +1812,7 @@ menu "Networking" > source "package/bluez5_utils-headers/Config.in" > source "package/c-ares/Config.in" > source "package/cgic/Config.in" > + source "package/cni-plugins/Config.in" > source "package/cppzmq/Config.in" > source "package/curlpp/Config.in" > source "package/czmq/Config.in" > diff --git a/package/cni-plugins/Config.in b/package/cni-plugins/Config.in > new file mode 100644 > index 0000000000..9ce13f4bbe > --- /dev/null > +++ b/package/cni-plugins/Config.in > @@ -0,0 +1,108 @@ > +menuconfig BR2_PACKAGE_CNI_PLUGINS > + bool "cni-plugins" > + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS > + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS > + help > + Some reference and example networking plugins, maintained by the CNI team. > + > + https://github.com/containernetworking/plugins > + > +if BR2_PACKAGE_CNI_PLUGINS > + > +config BR2_PACKAGE_CNI_PLUGINS_BRIDGE > + bool "bridge" > + default y > + help > + Creates a bridge, adds the host and the container to it. > + > +config BR2_PACKAGE_CNI_PLUGINS_IPVLAN > + bool "ipvlan" > + default y > + help > + Adds an ipvlan interface in the container. > + > +config BR2_PACKAGE_CNI_PLUGINS_LOOPBACK > + bool "loopback" > + default y > + help > + Set the state of loopback interface to up. > + > +config BR2_PACKAGE_CNI_PLUGINS_MACVLAN > + bool "macvlan" > + default y > + help > + Creates a new MAC address, forwards all traffic to that to the container. > + > +config BR2_PACKAGE_CNI_PLUGINS_PTP > + bool "ptp" > + default y > + help > + Creates a veth pair. > + > +config BR2_PACKAGE_CNI_PLUGINS_VLAN > + bool "vlan" > + default y > + help > + Creates a veth pair. > + > +config BR2_PACKAGE_CNI_PLUGINS_HOST_DEVICE > + bool "host-device" > + default y > + help > + Move an already-existing device into a container. > + > +config BR2_PACKAGE_CNI_PLUGINS_DHCP > + bool "dhcp" > + default y > + help > + Runs a daemon on the host to make DHCP requests on behalf of the > + container. > + > +config BR2_PACKAGE_CNI_PLUGINS_HOST_LOCAL > + bool "host-local" > + default y > + help > + Maintains a local database of allocated IPs. > + > +config BR2_PACKAGE_CNI_PLUGINS_STATIC > + bool "static" > + default y > + help > + Allocate a single static IPv4/IPv6 address to container. It's useful in > + debugging purpose. > + > +config BR2_PACKAGE_CNI_PLUGINS_TUNING > + bool "tuning" > + default y > + help > + Tweaks sysctl parameters of an existing interface. > + > +config BR2_PACKAGE_CNI_PLUGINS_PORTMAP > + bool "portmap" > + default y > + help > + An iptables-based portmapping plugin. Maps ports from the host's address > + space to the container. > + > +config BR2_PACKAGE_CNI_PLUGINS_BANDWIDTH > + bool "bandwidth" > + default y > + help > + Allows bandwidth-limiting through use of traffic control tbf > + (ingress/egress). > + > +config BR2_PACKAGE_CNI_PLUGINS_SBR > + bool "sbr" > + default y > + help > + A plugin that configures source based routing for an interface (from which > + it is chained). > + > +config BR2_PACKAGE_CNI_PLUGINS_FIREWALL > + bool "firewall" > + default y > + help > + A firewall plugin which uses iptables or firewalld to add rules to allow > + traffic to/from the container. > + > +endif # BR2_PACKAGE_CNI_PLUGINS > diff --git a/package/cni-plugins/cni-plugins.hash b/package/cni-plugins/cni-plugins.hash > new file mode 100644 > index 0000000000..c987e1ff45 > --- /dev/null > +++ b/package/cni-plugins/cni-plugins.hash > @@ -0,0 +1,3 @@ > +# Locally computed: > +sha256 c86c44877c47f69cd23611e22029ab26b613f620195b76b3ec20f589367a7962 cni-plugins-1.1.1.tar.gz > +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE > diff --git a/package/cni-plugins/cni-plugins.mk b/package/cni-plugins/cni-plugins.mk > new file mode 100644 > index 0000000000..02abcd283c > --- /dev/null > +++ b/package/cni-plugins/cni-plugins.mk > @@ -0,0 +1,77 @@ > +################################################################################ > +# > +# cni-plugins > +# > +################################################################################ > + > +CNI_PLUGINS_VERSION = 1.1.1 > +CNI_PLUGINS_SITE = $(call github,containernetworking,plugins,v$(CNI_PLUGINS_VERSION)) > +CNI_PLUGINS_LICENSE = Apache-2.0 > +CNI_PLUGINS_LICENSE_FILES = LICENSE > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_BRIDGE),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/bridge > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_IPVLAN),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/ipvlan > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_LOOPBACK),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/loopback > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_MACVLAN),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/macvlan > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_PTP),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/ptp > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_VLAN),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/vlan > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_HOST_DEVICE),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/main/host-device > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_DHCP),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/ipam/dhcp > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_HOST_LOCAL),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/ipam/host-local > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_STATIC),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/ipam/static > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_TUNING),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/meta/tuning > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_PORTMAP),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/meta/portmap > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_BANDWIDTH),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/meta/bandwidth > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_SBR),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/meta/sbr > +endif > + > +ifeq ($(BR2_PACKAGE_CNI_PLUGINS_FIREWALL),y) > +CNI_PLUGINS_BUILD_TARGETS += plugins/meta/firewall > +endif > + > +define CNI_PLUGINS_INSTALL_TARGET_CMDS > + $(INSTALL) -d $(TARGET_DIR)/usr/libexec/cni > + $(INSTALL) -D -m 0755 $(@D)/bin/* $(TARGET_DIR)/usr/libexec/cni/ > +endef > + > +$(eval $(golang-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 thomas.petazzoni at bootlin.com Tue Feb 7 09:03:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:03:57 +0100 Subject: [Buildroot] [PATCH 2/2] configs/beaglebone: bump U-Boot version to 2022.10 In-Reply-To: <20230205214132.6941-2-dario.binacchi@amarulasolutions.com> References: <20230205214132.6941-1-dario.binacchi@amarulasolutions.com> <20230205214132.6941-2-dario.binacchi@amarulasolutions.com> Message-ID: <20230207100357.5503a9f5@windsurf> On Sun, 5 Feb 2023 22:41:32 +0100 Dario Binacchi wrote: > Starting from version 2021.10 only distro booting is supported, as > reported by commit ff8f277e9121 ("ti: am335x_evm: Switch to DISTRO_BOOT only"). > The patch allows to update U-Boot to versions later than 2021.10. > > Tested on beaglebone black. > > Signed-off-by: Dario Binacchi > --- > board/beaglebone/extlinux.conf | 4 ++++ > board/beaglebone/genimage.cfg | 1 + > board/beaglebone/post-build.sh | 2 ++ > configs/beaglebone_defconfig | 2 +- > 4 files changed, 8 insertions(+), 1 deletion(-) > create mode 100644 board/beaglebone/extlinux.conf Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 09:04:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:04:22 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/beaglebone: bump Linux version to 5.10.162-ti-r56 In-Reply-To: <20230207082136.90164-1-dario.binacchi@amarulasolutions.com> References: <20230207082136.90164-1-dario.binacchi@amarulasolutions.com> Message-ID: <20230207100422.5fbd4d71@windsurf> On Tue, 7 Feb 2023 09:21:36 +0100 Dario Binacchi wrote: > The previous version failed to boot from sd card with a log reported by > the document [1]. In my case it always failed, a 100% failure against > 75% reported by the document. > > Instead of adding the patch to fix the problem, I preferred to update > the kernel version. > > Tested on beaglebone black. > > [1] https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 > Signed-off-by: Dario Binacchi > > --- Applied to master, thanks. However, when you send a v2, please always resend the full series, otherwise it's very confusing for us on the maintainer side to figure out where are the other patches of the same series. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 09:05:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:05:19 +0100 Subject: [Buildroot] [git commit] configs/beaglebone: bump U-Boot version to 2022.10 Message-ID: <20230207090529.373EE83F69@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=588ccf38618e1d9401f6636c7565424d438a51b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Starting from version 2021.10 only distro booting is supported, as reported by commit ff8f277e9121 ("ti: am335x_evm: Switch to DISTRO_BOOT only"). The patch allows to update U-Boot to versions later than 2021.10. Tested on beaglebone black. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- board/beaglebone/extlinux.conf | 4 ++++ board/beaglebone/genimage.cfg | 1 + board/beaglebone/post-build.sh | 2 ++ configs/beaglebone_defconfig | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/board/beaglebone/extlinux.conf b/board/beaglebone/extlinux.conf new file mode 100644 index 0000000000..13affcabd4 --- /dev/null +++ b/board/beaglebone/extlinux.conf @@ -0,0 +1,4 @@ +label beaglebone-buildroot + kernel /zImage + fdtdir / + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index 987d205075..4b026fda84 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -12,6 +12,7 @@ image boot.vfat { "am335x-bonegreen.dtb", "am335x-boneblack-wireless.dtb", "am335x-bonegreen-wireless.dtb", + "extlinux" } } diff --git a/board/beaglebone/post-build.sh b/board/beaglebone/post-build.sh index ffdd19138c..b7afd92ffe 100755 --- a/board/beaglebone/post-build.sh +++ b/board/beaglebone/post-build.sh @@ -2,3 +2,5 @@ BOARD_DIR="$(dirname $0)" cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 3ce5721265..d0aa5ad860 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -34,7 +34,7 @@ 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="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set From thomas.petazzoni at bootlin.com Tue Feb 7 09:05:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:05:19 +0100 Subject: [Buildroot] [git commit] configs/beaglebone: bump Linux version to 5.10.162-ti-r56 Message-ID: <20230207090529.2C8CF83F68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=010de6d5c7e2ebafe08234e32818bc0db2ebc569 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The previous version failed to boot from sd card with a log reported by the document [1]. In my case it always failed, a 100% failure against 75% reported by the document. Instead of adding the patch to fix the problem, I preferred to update the kernel version. Tested on beaglebone black. [1] https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- configs/beaglebone_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 639b491e97..3ce5721265 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.162-ti-r56)/linux-5.10.162-ti-r56.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" From peter at korsgaard.com Tue Feb 7 09:06:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 10:06:28 +0100 Subject: [Buildroot] [git commit] support/testing: test_check_package.py: fix flake8 line length error Message-ID: <20230207090641.4CCCF83F78@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63da115085ca0cb369ab3c644200ba4b025da48b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit d631615eb1b8 (support/testing: test check-package ignore list) added a too long line causing the check-flake8 target to fail: support/testing/tests/utils/test_check_package.py:233:133: E501 line too long (138 > 132 characters) https://gitlab.com/buildroot.org/buildroot/-/jobs/3726245521 Signed-off-by: Peter Korsgaard --- support/testing/tests/utils/test_check_package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index ce1998753c..580ad56d42 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -230,5 +230,6 @@ class TestCheckPackage(unittest.TestCase): self.assert_warnings_generated_for_file(m) self.assertIn("{}:0: Indent was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" .format(subdir_file), w) - self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update " + ".checkpackageignore_outdated?" .format(subdir_file), w) From thomas.petazzoni at bootlin.com Tue Feb 7 09:21:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:21:48 +0100 Subject: [Buildroot] [PATCH] toolchain-external: handle case of dangling symlink In-Reply-To: <20220624221901.514921-1-mmayer@broadcom.com> References: <20220624221901.514921-1-mmayer@broadcom.com> Message-ID: <20230207102148.28d2ed73@windsurf> On Fri, 24 Jun 2022 15:19:01 -0700 Markus Mayer via buildroot wrote: > copy_toolchain_lib_root was not handling the case of "readlink" > returning nothing, which will happen if the symlink it is trying to > resolve does not point to a valid file on the build host. This > shouldn't happen, but it can. > > The end result of this situation would be an endless loop of error > messages that would only end if aborted manually. > > [...] > cp: missing destination file operand after > '/local/users/mmayer/buildroot/output/arm64/target//' > Try 'cp --help' for more information. > readlink: missing operand > Try 'readlink --help' for more information. > basename: missing operand > Try 'basename --help' for more information. > dirname: missing operand > Try 'dirname --help' for more information. > ^C > make[1]: *** [package/pkg-generic.mk:384: > > Instead of looping endlessly without explanation, let's abort and > inform the user that something seems amiss with their setup. > > Signed-off-by: Markus Mayer > --- > toolchain/helpers.mk | 5 +++++ > 1 file changed, 5 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 09:23:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:23:26 +0100 Subject: [Buildroot] [PATCH] toolchain-external: handle case of dangling symlink In-Reply-To: References: <20220624221901.514921-1-mmayer@broadcom.com> Message-ID: <20230207102326.6d541a84@windsurf> Hello Romain, On Wed, 11 Jan 2023 15:47:50 +0100 Romain Naour wrote: > > + if [ "$${LIBPATH}" = "" ]; then \ > > + echo "LIBPATH empty after trying to resolve symlink $${OLD_LIBPATH}" 1>&2; \ > > + exit 1; \ > > + fi; \ > > I'm not sure it's ok to fail here on a dangling symlink. > Maybe add a check and ignore such dangling symlink with a warning for the user. > > It's unlikely that such dangling symlink provided by the toolchain will be useful. I hesitated a bit on this. But for now, I believe a toolchain with a dangling symlink is badly broken, and we should not work with it. A warning message with a build continuing will never be noticed by the user, so if we don't abort with hard error, nobody will notice. So I applied the patch of Markus as is for now. We will see if people complain that this breaks with their toolchain, and if it does, we will change the exit to a break to simply move on to handle the next library. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Tue Feb 7 09:33:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 10:33:33 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require open perl package for libxcrypt Message-ID: <20230207093548.1B15A83F98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4cdd99190e89d538c25a8fc701372775fbde3b97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/16c/16cba783be11cc5024f9c56bb0a7abb0acf13ef8/ The configure script of libxcrypt needs the open perl module on the host: Can't locate open.pm in @INC (you may need to install the open module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./build-aux/scripts/expand-selected-hashes line 20. So add a check for it in dependencies.sh similar to how it is done for mpv. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index ea16a21e20..353817f8fb 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -271,6 +271,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules open" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From dario.binacchi at amarulasolutions.com Tue Feb 7 09:49:13 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 7 Feb 2023 10:49:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/uuu: bump to version 1.5.21 Message-ID: <20230207094913.603489-1-dario.binacchi@amarulasolutions.com> - Fixed android super.img loop download 52byte after some block - Use login header as in curl - Skip sleep in usb_add - Add empty line after input password - linux prompt ask user name and password for http(s) download - fix linux build failure Signed-off-by: Dario Binacchi --- package/uuu/uuu.hash | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index cc1cd8326672..a5b665620c64 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 932c0a4acde0f52b907f5693c6d133c83142c4ca6e9df05a38b3ac1e50628883 uuu_source-1.5.11.tar.gz +sha256 e89d3665af499ab71360d948176cf64619b082f8272a994d1fbfc000e67c0f14 uuu_source-1.5.21.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE sha256 584bfbb18b4c08b872d48b80419dd453307212a144134fb516bd6ddc0700c2e8 README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 647015e2dd85..1a5f84ce4d7d 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.11 +UUU_VERSION = 1.5.21 UUU_SOURCE = uuu_source-$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License -- 2.32.0 From peter at korsgaard.com Tue Feb 7 09:51:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 07 Feb 2023 10:51:26 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-bunch: remove package In-Reply-To: <20221212154111.2865211-1-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 12 Dec 2022 08:41:11 -0700") References: <20221212154111.2865211-1-james.hilliard1@gmail.com> Message-ID: <87sffh7qht.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Since the python3 bump to version 3.11 in commit > 738500c296c8b1206f20e94ca3e7c5932a6a0486 python-bunch has failed > to build. > This is due to open() which no longer accepts 'U' (?universal > newline?) in the file mode. > Remove this package as it has not had a release since 2011 and > is unmaintained upstream. > Details: > https://docs.python.org/3.11/whatsnew/3.11.html#porting-to-python-3-11 > Fixes: > - http://autobuild.buildroot.net/results/2ba/2ba72fc9837605a36ea63bbd3e6e181a40cdf360 > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - add comment about python-munch replacement Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 7 09:50:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 10:50:36 +0100 Subject: [Buildroot] [git commit] package/python-bunch: remove package Message-ID: <20230207095148.98DB483FBA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29fd8481e22fd7e8ac00e0bc47614ff06be33706 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since the python3 bump to version 3.11 in commit 738500c296c8b1206f20e94ca3e7c5932a6a0486 python-bunch has failed to build. This is due to open() which no longer accepts 'U' (???universal newline???) in the file mode. Remove this package as it has not had a release since 2011 and is unmaintained upstream. Details: https://docs.python.org/3.11/whatsnew/3.11.html#porting-to-python-3-11 Fixes: - http://autobuild.buildroot.net/results/2ba/2ba72fc9837605a36ea63bbd3e6e181a40cdf360 Signed-off-by: James Hilliard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-bunch/Config.in | 6 ------ package/python-bunch/python-bunch.hash | 5 ----- package/python-bunch/python-bunch.mk | 14 -------------- 6 files changed, 7 insertions(+), 27 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 61686fdd11..ad80522451 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_PYTHON_BUNCH + bool "python-bunch removed" + select BR2_LEGACY + help + The python-bunch package is unmaintained and is replaced + by the python-munch package. + config BR2_TARGET_GUMMIBOOT bool "gummiboot removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f8acf8776c..cad8d6affa 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2040,7 +2040,6 @@ F: package/policycoreutils/ F: package/proftpd/ F: package/protobuf-c/ F: package/protobuf/ -F: package/python-bunch/ F: package/python-colorama/ F: package/python-filelock/ F: package/python-flask-cors/ diff --git a/package/Config.in b/package/Config.in index b6211f1102..8b9570c447 100644 --- a/package/Config.in +++ b/package/Config.in @@ -985,7 +985,6 @@ menu "External python modules" source "package/python-bottle/Config.in" source "package/python-brotli/Config.in" source "package/python-bsdiff4/Config.in" - source "package/python-bunch/Config.in" source "package/python-cached-property/Config.in" source "package/python-can/Config.in" source "package/python-canopen/Config.in" diff --git a/package/python-bunch/Config.in b/package/python-bunch/Config.in deleted file mode 100644 index 89eae742b8..0000000000 --- a/package/python-bunch/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_BUNCH - bool "python-bunch" - help - A dot-accessible dictionary (a la JavaScript objects). - - http://github.com/dsc/bunch diff --git a/package/python-bunch/python-bunch.hash b/package/python-bunch/python-bunch.hash deleted file mode 100644 index cfde2db603..0000000000 --- a/package/python-bunch/python-bunch.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/bunch/json -md5 0a829d64e95ed96defbcae2bf9061bb0 bunch-1.0.1.tar.gz -sha256 50c77a0fc0cb372dfe48b5e11937d5f70e743adbf42683f3a6d2857645a76aaa bunch-1.0.1.tar.gz -# Locally computed sha256 checksums -sha256 57ca95c92059c8380625192462979bd32994aae3fcdf902ff6eb1e467eeb0469 LICENSE.txt diff --git a/package/python-bunch/python-bunch.mk b/package/python-bunch/python-bunch.mk deleted file mode 100644 index 18fdc223bb..0000000000 --- a/package/python-bunch/python-bunch.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-bunch -# -################################################################################ - -PYTHON_BUNCH_VERSION = 1.0.1 -PYTHON_BUNCH_SOURCE = bunch-$(PYTHON_BUNCH_VERSION).tar.gz -PYTHON_BUNCH_SITE = https://files.pythonhosted.org/packages/ef/bf/a4cf1779a4ffb4f610903fa08e15d1f4a8a2f4e3353a02afbe097c5bf4a8 -PYTHON_BUNCH_SETUP_TYPE = setuptools -PYTHON_BUNCH_LICENSE = MIT -PYTHON_BUNCH_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) From jordan at jspeicher.com Tue Feb 7 10:02:15 2023 From: jordan at jspeicher.com (Jordan Speicher) Date: Tue, 7 Feb 2023 11:02:15 +0100 Subject: [Buildroot] [PATCH] package/mcelog: bump to version 191 Message-ID: <20230207100216.889464-1-jordan@jspeicher.com> Create .os_version to specify the version since there is no git checkout available. https://github.com/andikleen/mcelog/releases/tag/v191 https://github.com/andikleen/mcelog/releases/tag/v190 Signed-off-by: Jordan Speicher --- package/mcelog/mcelog.hash | 2 +- package/mcelog/mcelog.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash index e0350b085d..23fd4e50f3 100644 --- a/package/mcelog/mcelog.hash +++ b/package/mcelog/mcelog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 30364d134ff416f3f9469720add84bdccea226268d334f06022110f484550cd9 mcelog-189.tar.gz +sha256 b3b2616acde7afba4752d4dc447a2c2ad5a75da65e7496e0da30f8f8d2015cfa mcelog-191.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk index 8b5876d32e..9f7194e376 100644 --- a/package/mcelog/mcelog.mk +++ b/package/mcelog/mcelog.mk @@ -4,13 +4,14 @@ # ################################################################################ -MCELOG_VERSION = 189 +MCELOG_VERSION = 191 MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION)) MCELOG_LICENSE = GPL-2.0 MCELOG_LICENSE_FILES = LICENSE MCELOG_SELINUX_MODULES = mcelog define MCELOG_BUILD_CMDS + echo "$(MCELOG_VERSION)" > $(@D)/.os_version $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all endef -- 2.34.1 From yann.morin.1998 at free.fr Tue Feb 7 10:06:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:06:53 +0100 Subject: [Buildroot] [git commit] package/docker-proxy: drop package Message-ID: <20230207102011.A621783FFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ae48b70aedf38bf6e90a7bbea5bf28a7c55bdbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The docker-proxy binary (libnetwork) has been merged into the docker-engine source (moby). Drop the docker-proxy package and add cmd/docker-proxy as a build target of docker-engine instead. https://github.com/moby/libnetwork/commit/563fe8e248f3afac75a270f693f38bdc3eea7bf3 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/docker-engine/Config.in | 1 - package/docker-engine/docker-engine.mk | 2 +- package/docker-proxy/Config.in | 19 ------------------- package/docker-proxy/docker-proxy.hash | 3 --- package/docker-proxy/docker-proxy.mk | 21 --------------------- 8 files changed, 9 insertions(+), 47 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index ad80522451..72deb03c35 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy removed" + select BR2_LEGACY + select BR2_PACKAGE_DOCKER_ENGINE + help + docker-proxy has been dropped by upstream since version + 563fe8. it has been merged into docker-engine (moby). + config BR2_PACKAGE_PYTHON_BUNCH bool "python-bunch removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index cad8d6affa..f10036f7f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -545,7 +545,6 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-compose/ F: package/docker-engine/ -F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ diff --git a/package/Config.in b/package/Config.in index 8b9570c447..aa87f1305d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2618,7 +2618,6 @@ menu "System tools" source "package/docker-cli/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" - source "package/docker-proxy/Config.in" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 1f0efb8fcc..b5a356eab9 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_USE_MMU # containerd select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency - select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency help Docker is a platform to build, ship, diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index c50f08245d..ca1aa27b0a 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -24,7 +24,7 @@ DOCKER_ENGINE_LDFLAGS = \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs -DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_ENGINE_DEPENDENCIES += libapparmor diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in deleted file mode 100644 index 7e40536537..0000000000 --- a/package/docker-proxy/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_DOCKER_PROXY - bool "docker-proxy" - 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 - help - Libnetwork is a Container Network Model that provides a - consistent programming interface and the required network - abstractions for applications. - - This package provides docker-proxy, a run-time dependency of - Docker. - - https://github.com/docker/libnetwork - -comment "docker-proxy needs a 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_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash deleted file mode 100644 index 63296f14c1..0000000000 --- a/package/docker-proxy/docker-proxy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 05bf95637bae134d12d02bd7a7854cd0c768e6fccb662c2c64523f05b997b204 docker-proxy-f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk deleted file mode 100644 index fe7982e8f6..0000000000 --- a/package/docker-proxy/docker-proxy.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# docker-proxy -# -################################################################################ - -DOCKER_PROXY_VERSION = f6ccccb1c082a432c2a5814aaedaca56af33d9ea -DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) - -DOCKER_PROXY_LICENSE = Apache-2.0 -DOCKER_PROXY_LICENSE_FILES = LICENSE - -DOCKER_PROXY_DEPENDENCIES = host-pkgconf - -DOCKER_PROXY_BUILD_TARGETS = cmd/proxy - -define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy -endef - -$(eval $(golang-package)) From yann.morin.1998 at free.fr Tue Feb 7 10:06:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:06:55 +0100 Subject: [Buildroot] [git commit] package/docker-cli: bump version to v23.0.0 Message-ID: <20230207102011.B0C0C84000@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5599cb1b41289adcff86ecf91ee6c069fefa9c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Like docker-engine, docker-cli uses a non-standard vendor/ directory structure, so we use the same fixes as we introduced for docker-engine (see commit: package/docker-engine: bump version to v23.0.0): - remove the problematic vendor/modules.txt - create a go.mod Signed-off-by: Christian Stewart [yann.morin.1998 at free.fr: - use post-extract hook - simplify commit message to refer to docker-engine ] Signed-off-by: Yann E. MORIN --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index c6db95f9b3..ff981be963 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz +sha256 3379d06cd6177832b91f4796c680b6bf15c7895773448716b4c3c5253f611d1b docker-cli-23.0.0.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index cb44c68c1b..d61f47e46e 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.22 +DOCKER_CLI_VERSION = 23.0.0 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 @@ -29,6 +29,15 @@ DOCKER_CLI_TAGS += osusergo netgo DOCKER_CLI_GO_ENV = CGO_ENABLED=no endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_FIX_VENDORING + printf "module $(DOCKER_CLI_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef +DOCKER_CLI_POST_EXTRACT_HOOKS += DOCKER_CLI_FIX_VENDORING + DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) $(eval $(golang-package)) From yann.morin.1998 at free.fr Tue Feb 7 10:05:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:05:45 +0100 Subject: [Buildroot] [git commit] package/docker-engine: bump version to v23.0.0 Message-ID: <20230207102011.9634283FFC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=485b47e025541a58358d8852c600b8e7644b4ec6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This update requires a few workaround for the non-standard vendor/ structure in the docker-engine repository. First, as the vendor/ directory exists, our go-post-process script does not do the vendoring, and exits early, which is exactly what we need. Second, docker-engine does not use the "new" go.mod mechanism, so it does not ship any go.mod file, so our go-post-proces, exiting early, does not check that the go.mod file exists, and thus does not fail, which is again exactly what we need. Third, docker-engine has an invalid vendor/modules.txt file that we need to remove or go would fail to build. Since our go-post-process exits early, there is no vendoring, and thus it does not break at download, which once more is exactly what we need. However, the missing go.mod and the problematic vendor/modules.txt cause go to fail at build time, which this time is not really, even really not, what we want... So, we fix it up in two ways. First, the easy part: we just remove the problematic vendor/modules.txt file. Second, we create a go.mod to tell the Go compiler the root import path prefix for the module and the language version. Note that the language version in go.mod is not required to be equal the version of the Go compiler. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 Note that as of v23.0.0 docker-engine expects containerd to be started by systemd if --containerd= flag is set in dockerd.service, whereas in previous versions containerd was started by the docker daemon as a sub-process. There is no sysv unit for containerd, but this is OK: in the Docker sysv init file S60dockerd, we do not set the --containerd flag. The docker daemon will start containerd as a sub-process automatically due to the absence of this flag. Signed-off-by: Christian Stewart [yann.morin.1998 at free.fr: - run fixups in post-extract hook - rework commit log for (hopefully) better explanations ] Signed-off-by: Yann E. MORIN --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d15b1359cb..670cbd414b 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 2a9b72ca78..c50f08245d 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.22 +DOCKER_ENGINE_VERSION = 23.0.0 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -62,6 +62,15 @@ else DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_ENGINE_FIX_VENDORING + printf "module $(DOCKER_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef +DOCKER_ENGINE_POST_EXTRACT_HOOKS += DOCKER_ENGINE_FIX_VENDORING + DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD From yann.morin.1998 at free.fr Tue Feb 7 10:22:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:22:51 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/docker-engine: bump version to v23.0.0 In-Reply-To: <20230207043010.85696-1-christian@paral.in> References: <20230207043010.85696-1-christian@paral.in> Message-ID: <20230207102251.GB4124@scaer> Christian, All, On 2023-02-06 20:30 -0800, Christian Stewart via buildroot spake thusly: > docker-engine does not ship a go.mod file in the tarball: create one to tell the > Go compiler the root import path prefix for the module and the language version. > Note that the language version in go.mod is not required to be equal the version > of the Go compiler. > > This update requires a workaround for the non-standard vendor/ structure in the > docker-engine repository, which has an invalid vendor/modules.txt file. > > Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > > Note that as of v23.0.0 docker-engine expects containerd to be started by > systemd if --containerd= flag is set in dockerd.service, whereas in previous > versions containerd was started by the docker daemon as a sub-process. > > There is no sysv unit for containerd, but this is OK: in the Docker sysv init > file S60dockerd, we do not set the --containerd flag. The docker daemon will > start containerd as a sub-process automatically due to the absence of this flag. > > Signed-off-by: Christian Stewart I've applied to master, after a substantial rewording of the commit log (which already pretty good, thanks!). I also chaged to using a post-extract hook instead of using the configure_cmds. Indeed, currently, the golang infra does not use the configure step, but if we need it in the future, that woudl break here. So I've made that post-extract hooks, because that's what they are in practice (I hesitated with post-patch hooks, though, and I just arbitrarily settled for post-extract). I did the same for docker-cli. Series of three patches applied to master, thanks. Regards, Yann E. MORIN. > --- > > v1 -> v2: > > - clarify commit message about containerd.service and sysv compat > - fix formatting in S60dockerd > - bundle commit into a series with required containerd changes > > v2 -> v3: > > - remove whitespace changes (as per Yann review) > - use rm -f instead of checking for file existence > - add the go.mod file in the CONFIGURE step > > Signed-off-by: Christian Stewart > --- > package/docker-engine/docker-engine.hash | 2 +- > package/docker-engine/docker-engine.mk | 10 +++++++++- > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash > index d15b1359cb..670cbd414b 100644 > --- a/package/docker-engine/docker-engine.hash > +++ b/package/docker-engine/docker-engine.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz > +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk > index 2a9b72ca78..229e199aa2 100644 > --- a/package/docker-engine/docker-engine.mk > +++ b/package/docker-engine/docker-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DOCKER_ENGINE_VERSION = 20.10.22 > +DOCKER_ENGINE_VERSION = 23.0.0 > DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) > > DOCKER_ENGINE_LICENSE = Apache-2.0 > @@ -62,6 +62,14 @@ else > DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs > endif > > +# create the go.mod file with language version go1.19 > +# remove the conflicting vendor/modules.txt > +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > +define DOCKER_ENGINE_CONFIGURE_CMDS > + printf "module $(DOCKER_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod > + rm -f $(@D)/vendor/modules.txt > +endef > + > DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) > > define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD > -- > 2.39.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 thomas.petazzoni at bootlin.com Tue Feb 7 10:30:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:30:47 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external: handle case of dangling symlink Message-ID: <20230207103057.9AA90837D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b11ed25c4a0a6a4f7b9ee38390578d724caa081d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master copy_toolchain_lib_root was not handling the case of "readlink" returning nothing, which will happen if the symlink it is trying to resolve does not point to a valid file on the build host. This shouldn't happen, but it can. The end result of this situation would be an endless loop of error messages that would only end if aborted manually. [...] cp: missing destination file operand after '/local/users/mmayer/buildroot/output/arm64/target//' Try 'cp --help' for more information. readlink: missing operand Try 'readlink --help' for more information. basename: missing operand Try 'basename --help' for more information. dirname: missing operand Try 'dirname --help' for more information. ^C make[1]: *** [package/pkg-generic.mk:384: Instead of looping endlessly without explanation, let's abort and inform the user that something seems amiss with their setup. Signed-off-by: Markus Mayer Signed-off-by: Thomas Petazzoni --- toolchain/helpers.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index eec46d44c6..1cd7494fdb 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -19,7 +19,12 @@ copy_toolchain_lib_root = \ rm -fr $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ if test -h $${LIBPATH} ; then \ cp -d $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ + OLD_LIBPATH="$${LIBPATH}"; \ LIBPATH="`readlink -f $${LIBPATH}`"; \ + if [ "$${LIBPATH}" = "" ]; then \ + echo "LIBPATH empty after trying to resolve symlink $${OLD_LIBPATH}" 1>&2; \ + exit 1; \ + fi; \ elif test -f $${LIBPATH}; then \ $(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ break ; \ From thomas.petazzoni at bootlin.com Tue Feb 7 10:30:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:30:53 +0100 Subject: [Buildroot] [git commit] package/rtl8192eu: disable package for s390x architecture Message-ID: <20230207103205.47FFD84003@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26893ab1c67d7df8c1b71269051ad41b5ea03e5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this package for this architecture. Fixes: http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8192eu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rtl8192eu/Config.in b/package/rtl8192eu/Config.in index 4d71b711c3..969ba090ce 100644 --- a/package/rtl8192eu/Config.in +++ b/package/rtl8192eu/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTL8192EU bool "rtl8192eu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help A standalone driver for the RTL8192EU USB Wi-Fi adapter. @@ -10,4 +11,5 @@ config BR2_PACKAGE_RTL8192EU https://github.com/clnhub/rtl8192eu-linux comment "rtl8192eu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL From thomas.petazzoni at bootlin.com Tue Feb 7 10:38:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:38:37 +0100 Subject: [Buildroot] [PATCH] package/rtl8192eu: disable package for s390x architecture In-Reply-To: <20230206133149.910237-1-giulio.benetti@benettiengineering.com> References: <20230206133149.910237-1-giulio.benetti@benettiengineering.com> Message-ID: <20230207113837.64b654d1@windsurf> On Mon, 6 Feb 2023 14:31:49 +0100 Giulio Benetti wrote: > s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this > package for this architecture. > > Fixes: > http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2/ > > Signed-off-by: Giulio Benetti > --- > package/rtl8192eu/Config.in | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 10:39:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:39:38 +0100 Subject: [Buildroot] [git commit] package/uuu: bump to version 1.5.21 Message-ID: <20230207103959.B682384033@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ff52ac09b1c21fdce65deae39127b31d47858e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fixed android super.img loop download 52byte after some block - Use login header as in curl - Skip sleep in usb_add - Add empty line after input password - linux prompt ask user name and password for http(s) download - fix linux build failure Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/uuu/uuu.hash | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index cc1cd83266..a5b665620c 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 932c0a4acde0f52b907f5693c6d133c83142c4ca6e9df05a38b3ac1e50628883 uuu_source-1.5.11.tar.gz +sha256 e89d3665af499ab71360d948176cf64619b082f8272a994d1fbfc000e67c0f14 uuu_source-1.5.21.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE sha256 584bfbb18b4c08b872d48b80419dd453307212a144134fb516bd6ddc0700c2e8 README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 647015e2dd..1a5f84ce4d 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.11 +UUU_VERSION = 1.5.21 UUU_SOURCE = uuu_source-$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License From thomas.petazzoni at bootlin.com Tue Feb 7 10:39:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:39:41 +0100 Subject: [Buildroot] [git commit] package/mcelog: bump to version 191 Message-ID: <20230207103959.C1F0C84034@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=537daa143b237e88f2e272056bb05771db7f48d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Create .os_version to specify the version since there is no git checkout available. https://github.com/andikleen/mcelog/releases/tag/v191 https://github.com/andikleen/mcelog/releases/tag/v190 Signed-off-by: Jordan Speicher Signed-off-by: Thomas Petazzoni --- package/mcelog/mcelog.hash | 2 +- package/mcelog/mcelog.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash index e0350b085d..23fd4e50f3 100644 --- a/package/mcelog/mcelog.hash +++ b/package/mcelog/mcelog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 30364d134ff416f3f9469720add84bdccea226268d334f06022110f484550cd9 mcelog-189.tar.gz +sha256 b3b2616acde7afba4752d4dc447a2c2ad5a75da65e7496e0da30f8f8d2015cfa mcelog-191.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk index 8b5876d32e..9f7194e376 100644 --- a/package/mcelog/mcelog.mk +++ b/package/mcelog/mcelog.mk @@ -4,13 +4,14 @@ # ################################################################################ -MCELOG_VERSION = 189 +MCELOG_VERSION = 191 MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION)) MCELOG_LICENSE = GPL-2.0 MCELOG_LICENSE_FILES = LICENSE MCELOG_SELINUX_MODULES = mcelog define MCELOG_BUILD_CMDS + echo "$(MCELOG_VERSION)" > $(@D)/.os_version $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all endef From thomas.petazzoni at bootlin.com Tue Feb 7 10:40:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:40:06 +0100 Subject: [Buildroot] [PATCH] package/mcelog: bump to version 191 In-Reply-To: <20230207100216.889464-1-jordan@jspeicher.com> References: <20230207100216.889464-1-jordan@jspeicher.com> Message-ID: <20230207114006.3005f244@windsurf> On Tue, 7 Feb 2023 11:02:15 +0100 Jordan Speicher wrote: > Create .os_version to specify the version since there is no git > checkout available. > > https://github.com/andikleen/mcelog/releases/tag/v191 > https://github.com/andikleen/mcelog/releases/tag/v190 > > Signed-off-by: Jordan Speicher > --- > package/mcelog/mcelog.hash | 2 +- > package/mcelog/mcelog.mk | 3 ++- > 2 files changed, 3 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 Tue Feb 7 10:40:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:40:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/uuu: bump to version 1.5.21 In-Reply-To: <20230207094913.603489-1-dario.binacchi@amarulasolutions.com> References: <20230207094913.603489-1-dario.binacchi@amarulasolutions.com> Message-ID: <20230207114011.7fd5008f@windsurf> On Tue, 7 Feb 2023 10:49:13 +0100 Dario Binacchi wrote: > - Fixed android super.img loop download 52byte after some block > - Use login header as in curl > - Skip sleep in usb_add > - Add empty line after input password > - linux prompt ask user name and password for http(s) download > - fix linux build failure > > Signed-off-by: Dario Binacchi > --- > package/uuu/uuu.hash | 2 +- > package/uuu/uuu.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 Tue Feb 7 10:41:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:41:37 +0100 Subject: [Buildroot] [git commit] package/versal-firmware: use Xilinx github for versal-firmware Message-ID: <20230207104220.E9CC484047@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0781f44c0a9b46d9119557708918948a769e6881 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate versal-firmware package from nealfrager github to Xilinx github. The images are identical, so this patch has zero impact on functionality. Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- configs/versal_vck190_defconfig | 2 +- package/versal-firmware/Config.in | 2 +- package/versal-firmware/versal-firmware.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index fcda6eb431..2808fa522b 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_PACKAGE_VERSAL_FIRMWARE=y -BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="v2022.2" +BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="2022.2_br_1" BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/package/versal-firmware/Config.in b/package/versal-firmware/Config.in index 8d13816149..b4b63282d8 100644 --- a/package/versal-firmware/Config.in +++ b/package/versal-firmware/Config.in @@ -10,7 +10,7 @@ if BR2_PACKAGE_VERSAL_FIRMWARE config BR2_PACKAGE_VERSAL_FIRMWARE_VERSION string "firmware version" - default "v2022.2" + default "2022.2_br_1" help Release version of Versal firmware. diff --git a/package/versal-firmware/versal-firmware.mk b/package/versal-firmware/versal-firmware.mk index 3e4b9e558d..0bc5a00bc6 100644 --- a/package/versal-firmware/versal-firmware.mk +++ b/package/versal-firmware/versal-firmware.mk @@ -5,7 +5,7 @@ ################################################################################ VERSAL_FIRMWARE_VERSION = $(call qstrip,$(BR2_PACKAGE_VERSAL_FIRMWARE_VERSION)) -VERSAL_FIRMWARE_SITE = $(call github,nealfrager,buildroot-firmware,$(VERSAL_FIRMWARE_VERSION)) +VERSAL_FIRMWARE_SITE = $(call github,Xilinx,ubuntu-firmware,$(VERSAL_FIRMWARE_VERSION)) VERSAL_FIRMWARE_LICENSE = Xilinx-Binary-Only VERSAL_FIRMWARE_LICENSE_FILES = LICENSE VERSAL_FIRMWARE_INSTALL_TARGET = NO From thomas.petazzoni at bootlin.com Tue Feb 7 10:43:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:43:21 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/versal_vck190_defconfig: use Xilinx github for versal-firmware In-Reply-To: <20230127105305.25877-1-neal.frager@amd.com> References: <20230127105305.25877-1-neal.frager@amd.com> Message-ID: <20230207114321.2b5c2df6@windsurf> On Fri, 27 Jan 2023 10:53:05 +0000 Neal Frager via buildroot wrote: > Migrate versal-firmware package from nealfrager github to Xilinx github. > The images are identical, so this patch has zero impact on functionality. > > Signed-off-by: Neal Frager > --- > configs/versal_vck190_defconfig | 2 +- > package/versal-firmware/Config.in | 2 +- > package/versal-firmware/versal-firmware.mk | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) I've applied, but to be honest, it still looks a bit weird. The branch on the repo is special for Buildroot, and its contents are completely different than the master branch of the ubuntu-firmware repository. Why are those firmware files specific to Ubuntu, or specific to Buildroot? They should normally be distro/build-system agnostic. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From neal.frager at amd.com Tue Feb 7 10:48:53 2023 From: neal.frager at amd.com (Frager, Neal) Date: Tue, 7 Feb 2023 10:48:53 +0000 Subject: [Buildroot] [PATCH v1 1/1] configs/versal_vck190_defconfig: use Xilinx github for versal-firmware In-Reply-To: <20230207114321.2b5c2df6@windsurf> References: <20230127105305.25877-1-neal.frager@amd.com> <20230207114321.2b5c2df6@windsurf> Message-ID: Hi Thomas, > Migrate versal-firmware package from nealfrager github to Xilinx github. > The images are identical, so this patch has zero impact on functionality. > > Signed-off-by: Neal Frager > --- > configs/versal_vck190_defconfig | 2 +- > package/versal-firmware/Config.in | 2 +- > package/versal-firmware/versal-firmware.mk | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > I've applied, but to be honest, it still looks a bit weird. The branch on the repo is special for Buildroot, and its contents are completely different than the master branch of the ubuntu-firmware repository. Why are those firmware files specific to Ubuntu, or specific to Buildroot? > They should normally be distro/build-system agnostic. Yes, I fully agree with you. We will have a proper firmware repo agnostic to ubuntu starting with our 2023.1 release. In the meantime, Terry O'Neal implemented this solution as a temporary one for 2022.2, so that we could get off of using my private github. I am confident that our 2023.1 solution will clean this up. Best regards, Neal Frager AMD From arnout at mind.be Tue Feb 7 10:55:28 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 11:55:28 +0100 Subject: [Buildroot] [PATCH v2 1/1] add package/python-pyqtchart In-Reply-To: <20220518213933.2475-1-adamg@esdemc.com> References: <20220518213933.2475-1-adamg@esdemc.com> Message-ID: <11b5699c-ebc7-7a6c-e8f8-c3824fe166d3@mind.be> Hi Adam, Sorry for the very late reply to your contribution. Unfortunately, there are some issues still that I can't easily resolve by myself, see below. Therefore, the patch has been marked as Changes Requested in patchwork. Small nitpick: the subject line should be package/python-pyqtchart: new package On 18/05/2022 23:39, Adam Gausmann via buildroot wrote: > Signed-off-by: Adam Gausmann [snip] > diff --git a/package/python-pyqt5/0005-configure-emit-sip-flags.patch b/package/python-pyqt5/0005-configure-emit-sip-flags.patch > new file mode 100644 > index 0000000000..ad524f1e53 > --- /dev/null > +++ b/package/python-pyqt5/0005-configure-emit-sip-flags.patch > @@ -0,0 +1,25 @@ > +configure.py: emit sip_flags > + > +Other PyQt packages (e.g. PyQtChart) obtain their sip_flags from PyQt5. The > +default mechanism is for PyQt5 to embed it in the QtCore package and the other > +packages will try to import PyQt5.QtCore and read it; however, because this is > +not a host package, it cannot be imported during configuration. > + > +Another option is to provide those flags as a command-line option to the other > +packages' configure.py scripts. So, this patch emits the sip_flags generated by > +PyQt5 to a file which will be installed in staging dir for the other packages > +to read. > + > +Signed-off-by: Adam Gausmann Please also send this patch upstream (to the PyQt5 mailing list), and add a reference to the upstream submission here: Upstream: https://www.riverbankcomputing.com/pipermail/pyqt/... Also, this should probably be added to Buildroot as a separate commit, because it affects python-pyqt, not python-pyqtchart. > + > +--- a/configure.py 2022-05-12 14:45:48.624851781 -0500 > ++++ b/configure.py 2022-05-12 14:44:24.704852510 -0500 > +@@ -1450,6 +1450,8 @@ def generate_makefiles(target_config, ve > + > + # Set the SIP platform, version and feature flags. > + sip_flags = get_sip_flags(target_config) > ++ with open('sip_flags', 'w+') as f: > ++ f.write(sip_flags) > + > + # Go through the modules. > + pyqt_modules = list(target_config.pyqt_modules) > diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk > index af32f63796..2698a1e0ad 100644 > --- a/package/python-pyqt5/python-pyqt5.mk > +++ b/package/python-pyqt5/python-pyqt5.mk > @@ -157,7 +157,6 @@ PYTHON_PYQT5_CONF_OPTS = \ > -w --confirm-license \ > --no-designer-plugin \ > --no-docstrings \ > - --no-sip-files \ > $(foreach module,$(PYTHON_PYQT5_MODULES),--enable=$(module)) > > define PYTHON_PYQT5_CONFIGURE_CMDS > @@ -180,6 +179,7 @@ define PYTHON_PYQT5_INSTALL_TARGET_CMDS > $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install > touch $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/__init__.py > $(RM) -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/uic/port_v2 > + install -D $(@D)/sip_flags $(STAGING_DIR)/usr/share/PyQt5/sip_flags > endef > > $(eval $(generic-package)) > diff --git a/package/python-pyqtchart/Config.in b/package/python-pyqtchart/Config.in > new file mode 100644 > index 0000000000..a985927db7 > --- /dev/null > +++ b/package/python-pyqtchart/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_PYTHON_PYQTCHART > + bool "python-pyqtchart" > + depends on BR2_PACKAGE_PYTHON_PYQT5 Instead of depending on pyqt5, it would be beter to depend on qt5 and select pyqt5. > + select BR2_PACKAGE_QT5CHARTS > + help > + Python bindings for Qt Charts. > + > + http://www.riverbankcomputing.com/software/pyqt/ The actual upstream is https://www.riverbankcomputing.com/software/pyqtchart/ > diff --git a/package/python-pyqtchart/python-pyqtchart.hash b/package/python-pyqtchart/python-pyqtchart.hash > new file mode 100644 > index 0000000000..79852741da > --- /dev/null > +++ b/package/python-pyqtchart/python-pyqtchart.hash > @@ -0,0 +1,5 @@ > +# Locally-computed: You should probably download from pypi and get the hash from there: https://pypi.org/project/PyQtChart/#copy-hash-modal-8c261058-8981-4409-8b07-6610f35ddd52 > +sha256 91c9c6857e8c8891faa3875e3714392150016f365a63cdff8bfd40b6c33ea277 PyQtChart_gpl-5.7.tar.gz > + > +# Hash for license file > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE > diff --git a/package/python-pyqtchart/python-pyqtchart.mk b/package/python-pyqtchart/python-pyqtchart.mk > new file mode 100644 > index 0000000000..56bbc5d643 > --- /dev/null > +++ b/package/python-pyqtchart/python-pyqtchart.mk > @@ -0,0 +1,40 @@ > +################################################################################ > +# > +# python-pyqtchart Wouldn't it make more sense to call this python-pyqt5chart, given that there's python-pyqt5, and that there's PyQt6-Charts? Normally we prefer to use the upstream name, which is pyqtchart (or PyQt-Charts or PyQtChart, depending on where you look), but in this case I feel OK calling it python-pyqt5chart. > +# > +################################################################################ > + > +PYTHON_PYQTCHART_VERSION = 5.7 Why this ancient version released 7 years ago? There's a 5.15.6... I'm surprised this ancient version even works with our current Qt version! > +PYTHON_PYQTCHART_SOURCE = PyQtChart_gpl-$(PYTHON_PYQTCHART_VERSION).tar.gz > +PYTHON_PYQTCHART_SITE = http://downloads.sourceforge.net/project/pyqt/PyQtChart/PyQtChart-$(PYTHON_PYQTCHART_VERSION) As mentioned earlier, better download from pypi > +PYTHON_PYQTCHART_LICENSE = GPL-3.0 > + > +PYTHON_PYQTCHART_DEPENDENCIES = python-pyqt5 qt5charts > + > +PYTHON_PYQTCHART_CONF_OPTS = \ > + --destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5 \ > + --qmake $(HOST_DIR)/bin/qmake \ > + --sysroot $(STAGING_DIR)/usr \ > + --no-docstrings \ > + --no-sip-files \ > + --pyqt-sip-flags "$(file <$(STAGING_DIR)/usr/share/PyQt5/sip_flags)" \ > + --qtchart-version=2.0.1 \ Where does this version number come from? Please explain in the commit message. Regards, Arnout > + > +define PYTHON_PYQTCHART_CONFIGURE_CMDS > + (cd $(@D); \ > + $(TARGET_MAKE_ENV) \ > + $(TARGET_CONFIGURE_OPTS) \ > + $(HOST_DIR)/bin/python configure.py \ > + $(PYTHON_PYQTCHART_CONF_OPTS) \ > + ) > +endef > + > +define PYTHON_PYQTCHART_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) > +endef > + > +define PYTHON_PYQTCHART_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install > +endef > + > +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 11:07:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 12:07:57 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/versal_vck190_defconfig: use Xilinx github for versal-firmware In-Reply-To: References: <20230127105305.25877-1-neal.frager@amd.com> <20230207114321.2b5c2df6@windsurf> Message-ID: <20230207120757.21504741@windsurf> Hello, On Tue, 7 Feb 2023 10:48:53 +0000 "Frager, Neal" wrote: > Yes, I fully agree with you. We will have a proper firmware repo > agnostic to ubuntu starting with our 2023.1 release. > > In the meantime, Terry O'Neal implemented this solution as a > temporary one for 2022.2, so that we could get off of using my > private github. > > I am confident that our 2023.1 solution will clean this up. Sounds like a good plan, thanks for the details! Best regards, 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 Tue Feb 7 11:10:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:10:46 +0100 Subject: [Buildroot] [git commit] package/balena-engine: bump to version 20.10.26 Message-ID: <20230207111108.868A984051@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a1081dcbf8d706b08df53fe2ff2d652caf889ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Like docker-engine and docker-cli, balena-engine uses a non-standard vendor/ directory structure, so we use the same fixes as we introduced for docker-engine ((see commit: package/docker-engine: bump version to v23.0.0): - remove the problematic vendor/modules.txt - create a go.mod Also remove the vendor/archive/ sub-tree (fixes a build error) because Go no longer allows having duplicate packages in GOPATH and GOROOT. vendor/archive/tar cannot be in vendor/ because it exists in the standard library. Since we remove the full vendor/archive/, that is also fixed. https://github.com/balena-os/balena-engine/releases/tag/v20.10.26 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 4adb8ce561..6a92a40cc8 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz +sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index ecfb62bfbf..49d526a465 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 20.10.21 +BALENA_ENGINE_VERSION = 20.10.26 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 @@ -34,6 +34,17 @@ BALENA_ENGINE_TAGS = \ BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# remove the conflicting vendor/archive (not allowed in go1.20) +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define BALENA_ENGINE_FIX_VENDORING + printf "module $(BALENA_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt + rm -rf $(@D)/vendor/archive +endef +BALENA_ENGINE_POST_EXTRACT_HOOKS += BALENA_ENGINE_FIX_VENDORING + ifeq ($(BR2_INIT_SYSTEMD),y) BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald From yann.morin.1998 at free.fr Tue Feb 7 11:12:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:12:02 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/balena-engine: bump to version 20.10.26 In-Reply-To: <20230207043121.86027-1-christian@paral.in> References: <20230207043121.86027-1-christian@paral.in> Message-ID: <20230207111202.GC4124@scaer> Christian, All, On 2023-02-06 20:31 -0800, Christian Stewart via buildroot spake thusly: > balena-engine does not ship a go.mod file in the tarball: create one to tell the > Go compiler the root import path prefix for the module and the language version. > Note that the language version in go.mod is not required to be equal the version > of the Go compiler. > > This update requires a workaround for the non-standard vendor/ structure in the > balena-engine repository, which has an invalid vendor/modules.txt file. > > Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > > Remove the vendor/archive sub-tree (fixes a build error) because Go no longer > allows having duplicate packages in GOPATH and GOROOT. vendor/archive/tar cannot > be in vendor/ because it exists in the standard library. Remove it from vendor/. > > https://github.com/balena-os/balena-engine/releases/tag/v20.10.26 > > Signed-off-by: Christian Stewart I've done the samechanges as in docker-engine and docker-cli, and applied to master, thanks. Regards, Yann E. MORIN. > --- > > v2 -> v3: > > - add missing go.mod file in CONFIGURE step > - use rm -f instead of checking for file existence > - update comment about language version > > Signed-off-by: Christian Stewart > --- > package/balena-engine/balena-engine.hash | 2 +- > package/balena-engine/balena-engine.mk | 12 +++++++++++- > 2 files changed, 12 insertions(+), 2 deletions(-) > > diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash > index 4adb8ce561..6a92a40cc8 100644 > --- a/package/balena-engine/balena-engine.hash > +++ b/package/balena-engine/balena-engine.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz > +sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk > index ecfb62bfbf..89a572cf8e 100644 > --- a/package/balena-engine/balena-engine.mk > +++ b/package/balena-engine/balena-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BALENA_ENGINE_VERSION = 20.10.21 > +BALENA_ENGINE_VERSION = 20.10.26 > BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) > > BALENA_ENGINE_LICENSE = Apache-2.0 > @@ -34,6 +34,16 @@ BALENA_ENGINE_TAGS = \ > > BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine > > +# create the go.mod file with language version go1.19 > +# remove the conflicting vendor/modules.txt > +# remove the conflicting vendor/archive (not allowed in go1.20) > +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 > +define BALENA_ENGINE_CONFIGURE_CMDS > + printf "module $(BALENA_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod > + rm -f $(@D)/vendor/modules.txt > + rm -rf $(@D)/vendor/archive > +endef > + > ifeq ($(BR2_INIT_SYSTEMD),y) > BALENA_ENGINE_DEPENDENCIES += systemd > BALENA_ENGINE_TAGS += journald > -- > 2.39.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 vfazio at xes-inc.com Tue Feb 7 11:26:44 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 7 Feb 2023 05:26:44 -0600 Subject: [Buildroot] [PATCH 1/1] package/bash: fix strtoimax builtin inclusion logic Message-ID: <20230207112644.2467564-1-vfazio@xes-inc.com> From: Vincent Fazio Backport fixes from upstream to fix an issue where the strtoimax builtin got built when not necessary. This resolves bash static builds issues when using musl and uClibc. Fixes: http://autobuild.buildroot.org/results/f8c/f8cb91f7f9ac6a46bb2ecfc22c1e42cf699f28d3// http://autobuild.buildroot.org/results/b0e/b0e5fcab9eeb799e31bca27fcb7280b728349bc6// Upstream: https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 Signed-off-by: Vincent Fazio --- ...vert-condition-for-strtoimax-builtin.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch diff --git a/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch new file mode 100644 index 0000000000..2ee9e1ad5a --- /dev/null +++ b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch @@ -0,0 +1,60 @@ +From 754e0d1edc1c01b18f4890de7c58f7610e589d76 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 03:55:28 -0600 +Subject: [PATCH] configure: invert condition for strtoimax builtin + +Previously, bash would attempt to build a replacement for strtoimax if +it found that the C library had the function already declared. + +This caused build errors when linking against static libraries that did +not define the function as a weak alias but, in reality, was a logic +error since bash should only provide it's own implementation if one is +not provided by the C library. + +Now, fix this by inverting the logic. + +Upstream: + https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 + +Signed-off-by: Vincent Fazio +--- + configure | 6 +++++- + m4/strtoimax.m4 | 5 ++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 47313753..6039cee7 100755 +--- a/configure ++++ b/configure +@@ -20443,7 +20443,11 @@ fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bash_cv_func_strtoimax" >&5 + printf "%s\n" "$bash_cv_func_strtoimax" >&6; } +-if test $bash_cv_func_strtoimax = yes; then ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then ++printf "%s\n" "#define HAVE_DECL_STRTOIMAX 1" >>confdefs.h ++ ++fi ++if test $bash_cv_func_strtoimax = no; then + case " $LIBOBJS " in + *" strtoimax.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strtoimax.$ac_objext" +diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 +index 30985723..fa43ac7b 100644 +--- a/m4/strtoimax.m4 ++++ b/m4/strtoimax.m4 +@@ -29,7 +29,10 @@ AC_CACHE_VAL(bash_cv_func_strtoimax, + fi + ]) + AC_MSG_RESULT($bash_cv_func_strtoimax) +-if test $bash_cv_func_strtoimax = yes; then ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then ++AC_DEFINE([HAVE_DECL_STRTOIMAX], [1]) ++fi ++if test $bash_cv_func_strtoimax = no; then + AC_LIBOBJ(strtoimax) + fi + ]) +-- +2.25.1 + -- 2.25.1 From yann.morin.1998 at free.fr Tue Feb 7 11:28:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:28:32 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-wrapper.c: set CCACHE env variables only when ccache is enabled Message-ID: <20230207112855.9D59E84057@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=231d00e63ac08c98d7e823c3bd60a618ff322577 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit modifies the toolchain-wrapper to make sure that the CCACHE_COMPILERCHECK and CCACHE_BASEDIR are only set if ccache support is enabled. Indeed, when BR2_USE_CCACHE is not set (or to a value different than 1), we don't call the compiler with ccache, so there is no reason to set those ccache environment variables, and they could potentially conflict with a separate usage of ccache, outside of Buildroot, for example when using the Buildroot SDK. In particular, the value of CCACHE_BASEDIR doesn't not make any sense when the Buildroot toolchain is not used during the Buildroot build, as it points to the output directory $(BASE_DIR). We pay attention to also not show those variables as being set in the BR2_DEBUG_WRAPPER dump. To help a little bit with this, a ccache_enabled boolean is introduced to indicate when ccache is being used. There is still quite a bit of #ifdef-ery involved, but it's not easy to find a simpler way to organize the code. Signed-off-by: Thomas Petazzoni Tested-By: Vincent Fazio Signed-off-by: Yann E. MORIN --- toolchain/toolchain-wrapper.c | 49 ++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 4c08e97237..f66e588bfd 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -494,10 +494,28 @@ int main(int argc, char **argv) exec_args = args; #ifdef BR_CCACHE - /* If BR2_USE_CCACHE is not defined, or its value is not 1, - * skip the ccache call */ + /* If BR2_USE_CCACHE is set and its value is 1, enable ccache + * usage */ char *br_use_ccache = getenv("BR2_USE_CCACHE"); - if (!br_use_ccache || strncmp(br_use_ccache, "1", strlen("1"))) + bool ccache_enabled = br_use_ccache && !strncmp(br_use_ccache, "1", strlen("1")); + + if (ccache_enabled) { +#ifdef BR_CCACHE_HASH + /* Allow compilercheck to be overridden through the environment */ + if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { + perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); + return 3; + } +#endif +#ifdef BR_CCACHE_BASEDIR + /* Allow compilercheck to be overridden through the environment */ + if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { + perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); + return 3; + } +#endif + } else + /* ccache is disabled, skip it */ exec_args++; #endif @@ -505,12 +523,14 @@ int main(int argc, char **argv) if (debug > 0) { fprintf(stderr, "Toolchain wrapper executing:"); #ifdef BR_CCACHE_HASH - fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", - (debug == 2) ? "\n " : " "); + if (ccache_enabled) + fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", + (debug == 2) ? "\n " : " "); #endif #ifdef BR_CCACHE_BASEDIR - fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", - (debug == 2) ? "\n " : " "); + if (ccache_enabled) + fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", + (debug == 2) ? "\n " : " "); #endif for (i = 0; exec_args[i]; i++) fprintf(stderr, "%s'%s'", @@ -518,21 +538,6 @@ int main(int argc, char **argv) fprintf(stderr, "\n"); } -#ifdef BR_CCACHE_HASH - /* Allow compilercheck to be overridden through the environment */ - if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { - perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); - return 3; - } -#endif -#ifdef BR_CCACHE_BASEDIR - /* Allow compilercheck to be overridden through the environment */ - if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { - perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); - return 3; - } -#endif - if (execv(exec_args[0], exec_args)) perror(path); From yann.morin.1998 at free.fr Tue Feb 7 11:29:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:29:53 +0100 Subject: [Buildroot] [PATCH] toolchain/toolchain-wrapper.c: set CCACHE env variables only when ccache is enabled In-Reply-To: <20220806195802.451076-1-thomas.petazzoni@bootlin.com> References: <20220806195802.451076-1-thomas.petazzoni@bootlin.com> Message-ID: <20230207112953.GD4124@scaer> Thomas, All, On 2022-08-06 21:58 +0200, Thomas Petazzoni via buildroot spake thusly: > This commit modifies the toolchain-wrapper to make sure that the > CCACHE_COMPILERCHECK and CCACHE_BASEDIR are only set if ccache support > is enabled. Indeed, when BR2_USE_CCACHE is not set (or to a value > different than 1), we don't call the compiler with ccache, so there is > no reason to set those ccache environment variables, and they could > potentially conflict with a separate usage of ccache, outside of > Buildroot, for example when using the Buildroot SDK. > > In particular, the value of CCACHE_BASEDIR doesn't not make any sense > when the Buildroot toolchain is not used during the Buildroot build, > as it points to the output directory $(BASE_DIR). > > We pay attention to also not show those variables as being set in the > BR2_DEBUG_WRAPPER dump. > > To help a little bit with this, a ccache_enabled boolean is introduced > to indicate when ccache is being used. > > There is still quite a bit of #ifdef-ery involved, but it's not easy > to find a simpler way to organize the code. > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > toolchain/toolchain-wrapper.c | 49 +++++++++++++++++++---------------- > 1 file changed, 27 insertions(+), 22 deletions(-) > > diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c > index 37b24dd24a..ee1fdf3c71 100644 > --- a/toolchain/toolchain-wrapper.c > +++ b/toolchain/toolchain-wrapper.c > @@ -507,10 +507,28 @@ int main(int argc, char **argv) > > exec_args = args; > #ifdef BR_CCACHE > - /* If BR2_USE_CCACHE is not defined, or its value is not 1, > - * skip the ccache call */ > + /* If BR2_USE_CCACHE is set and its value is 1, enable ccache > + * usage */ > char *br_use_ccache = getenv("BR2_USE_CCACHE"); > - if (!br_use_ccache || strncmp(br_use_ccache, "1", strlen("1"))) > + bool ccache_enabled = br_use_ccache && !strncmp(br_use_ccache, "1", strlen("1")); > + > + if (ccache_enabled) { > +#ifdef BR_CCACHE_HASH > + /* Allow compilercheck to be overridden through the environment */ > + if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { > + perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); > + return 3; > + } > +#endif > +#ifdef BR_CCACHE_BASEDIR > + /* Allow compilercheck to be overridden through the environment */ > + if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { > + perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); > + return 3; > + } > +#endif > + } else > + /* ccache is disabled, skip it */ > exec_args++; > #endif > > @@ -518,12 +536,14 @@ int main(int argc, char **argv) > if (debug > 0) { > fprintf(stderr, "Toolchain wrapper executing:"); > #ifdef BR_CCACHE_HASH > - fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", > - (debug == 2) ? "\n " : " "); > + if (ccache_enabled) > + fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", > + (debug == 2) ? "\n " : " "); > #endif > #ifdef BR_CCACHE_BASEDIR > - fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", > - (debug == 2) ? "\n " : " "); > + if (ccache_enabled) > + fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", > + (debug == 2) ? "\n " : " "); > #endif > for (i = 0; exec_args[i]; i++) > fprintf(stderr, "%s'%s'", > @@ -531,21 +551,6 @@ int main(int argc, char **argv) > fprintf(stderr, "\n"); > } > > -#ifdef BR_CCACHE_HASH > - /* Allow compilercheck to be overridden through the environment */ > - if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { > - perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); > - return 3; > - } > -#endif > -#ifdef BR_CCACHE_BASEDIR > - /* Allow compilercheck to be overridden through the environment */ > - if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { > - perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); > - return 3; > - } > -#endif > - > if (execv(exec_args[0], exec_args)) > perror(path); > > -- > 2.37.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 thomas.petazzoni at bootlin.com Tue Feb 7 11:32:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 12:32:35 +0100 Subject: [Buildroot] [git commit] package/python-idna: set _SETUP_TYPE = flit Message-ID: <20230207113249.D09B184074@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a9da9a8cad5f77902547fab3b24d04175749a7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Python idna package switched to pyproject.toml in commit: https://github.com/kjd/idna/commit/2a00e518efe55d2eeb62cd3f88ace7db41338603 which is included in idna v3.4. When using the old setuptools infra, the package is incorrectly installed as v0.0, which is then incorrectly detected by other packages when using setuptools pkg_resources. The issue can be reproduced with the command: python3 <= 2.5"] import pkg_resources EOF which will fail with output: pkg_resources.ContextualVersionConflict: (idna 0.0.0 (/usr/lib/python3.11/site-packages), Requirement.parse('idna>=2.5'), {'hyperlink'}) pkg_resources.DistributionNotFound: The 'idna>=2.5' distribution was not found and is required by hyperlink This commit changes _SETUP_TYPE to "flit" to fix this issue. Signed-off-by: Julien Olivain Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-idna/python-idna.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 4d9994a9c7..3976cb1518 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -9,7 +9,7 @@ PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/8b/e1/43beb3d38dba6cb420cefa297822eac205a277ab43e5ba5d5c46faf96438 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md -PYTHON_IDNA_SETUP_TYPE = setuptools +PYTHON_IDNA_SETUP_TYPE = flit $(eval $(python-package)) $(eval $(host-python-package)) From peter at korsgaard.com Tue Feb 7 11:35:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 12:35:46 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: correct check for open perl module Message-ID: <20230207113647.F360184086@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b63e155e5fb7104e6660aa0570befa9498259cd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 4cdd99190e89 (support/dependencies/dependencies.sh: require open perl package for libxcrypt) added a check for the "open" perl module for libxcrypt, but it does not work as "open" cannot be directly used with "require" as an argument is needed: perl -e "require open" Not enough arguments for open at -e line 1, at EOF Execution of -e aborted due to compilation errors. So special case the check to instead check with "use open ':std'". Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 353817f8fb..88eabe921d 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -271,10 +271,6 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl -if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then - required_perl_modules="$required_perl_modules open" -fi - if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" @@ -291,6 +287,13 @@ fi # This variable will keep the modules that are missing in your system. missing_perl_modules="" +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + # open cannot be used with require + if ! perl -e "use open ':std'" > /dev/null 2>&1 ; then + missing_perl_modules="$missing_perl_modules open" + fi +fi + for pm in $required_perl_modules ; do if ! perl -e "require $pm" > /dev/null 2>&1 ; then missing_perl_modules="$missing_perl_modules $pm" From yann.morin.1998 at free.fr Tue Feb 7 11:47:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:47:08 +0100 Subject: [Buildroot] [git commit] package/bash: fix strtoimax builtin inclusion logic Message-ID: <20230207114725.BF4E18408C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12d85e9646ed89552c732775de000ad0b436a139 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Backport fixes from upstream to fix an issue where the strtoimax builtin got built when not necessary. This resolves bash static builds issues when using musl and uClibc. We fix both the m4 file and configure in that order, to be safe andnot trigger an automatic autoreconf (even though bash does not have a rule to automatically regenerate configure if an m4 file changes). Fixes: http://autobuild.buildroot.org/results/f8c/f8cb91f7f9ac6a46bb2ecfc22c1e42cf699f28d3// http://autobuild.buildroot.org/results/b0e/b0e5fcab9eeb799e31bca27fcb7280b728349bc6// Upstream: https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 Signed-off-by: Vincent Fazio [yann.morin.1998 at free.fr: - patch configure after the m4 file - add blurb in commit log to explain that ] Signed-off-by: Yann E. MORIN --- ...re-invert-condition-for-strtoimax-builtin.patch | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch new file mode 100644 index 0000000000..c412dcfce2 --- /dev/null +++ b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch @@ -0,0 +1,62 @@ +From 754e0d1edc1c01b18f4890de7c58f7610e589d76 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 03:55:28 -0600 +Subject: [PATCH] configure: invert condition for strtoimax builtin + +Previously, bash would attempt to build a replacement for strtoimax if +it found that the C library had the function already declared. + +This caused build errors when linking against static libraries that did +not define the function as a weak alias but, in reality, was a logic +error since bash should only provide it's own implementation if one is +not provided by the C library. + +Now, fix this by inverting the logic. + +Upstream: + https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 + +Signed-off-by: Vincent Fazio +[yann.morin.1998 at free.fr: patch configure after the m file] +Signed-off-by: Yann E. MORIN +--- + configure | 6 +++++- + m4/strtoimax.m4 | 5 ++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 +index 30985723..fa43ac7b 100644 +--- a/m4/strtoimax.m4 ++++ b/m4/strtoimax.m4 +@@ -29,7 +29,10 @@ AC_CACHE_VAL(bash_cv_func_strtoimax, + fi + ]) + AC_MSG_RESULT($bash_cv_func_strtoimax) +-if test $bash_cv_func_strtoimax = yes; then ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then ++AC_DEFINE([HAVE_DECL_STRTOIMAX], [1]) ++fi ++if test $bash_cv_func_strtoimax = no; then + AC_LIBOBJ(strtoimax) + fi + ]) +diff --git a/configure b/configure +index 47313753..6039cee7 100755 +--- a/configure ++++ b/configure +@@ -20443,7 +20443,11 @@ fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bash_cv_func_strtoimax" >&5 + printf "%s\n" "$bash_cv_func_strtoimax" >&6; } +-if test $bash_cv_func_strtoimax = yes; then ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then ++printf "%s\n" "#define HAVE_DECL_STRTOIMAX 1" >>confdefs.h ++ ++fi ++if test $bash_cv_func_strtoimax = no; then + case " $LIBOBJS " in + *" strtoimax.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strtoimax.$ac_objext" +-- +2.25.1 + From yann.morin.1998 at free.fr Tue Feb 7 11:48:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:48:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/bash: fix strtoimax builtin inclusion logic In-Reply-To: <20230207112644.2467564-1-vfazio@xes-inc.com> References: <20230207112644.2467564-1-vfazio@xes-inc.com> Message-ID: <20230207114842.GE4124@scaer> Vincent, All, On 2023-02-07 05:26 -0600, Vincent Fazio spake thusly: > From: Vincent Fazio > > Backport fixes from upstream to fix an issue where the strtoimax builtin > got built when not necessary. > > This resolves bash static builds issues when using musl and uClibc. > > Fixes: > http://autobuild.buildroot.org/results/f8c/f8cb91f7f9ac6a46bb2ecfc22c1e42cf699f28d3// > http://autobuild.buildroot.org/results/b0e/b0e5fcab9eeb799e31bca27fcb7280b728349bc6// > > Upstream: > https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 > > Signed-off-by: Vincent Fazio As seen IRL, I've done some small changes: - patch configure after the m4 file - add blurb in commit log to explain that Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...vert-condition-for-strtoimax-builtin.patch | 60 +++++++++++++++++++ > 1 file changed, 60 insertions(+) > create mode 100644 package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch > > diff --git a/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch > new file mode 100644 > index 0000000000..2ee9e1ad5a > --- /dev/null > +++ b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch > @@ -0,0 +1,60 @@ > +From 754e0d1edc1c01b18f4890de7c58f7610e589d76 Mon Sep 17 00:00:00 2001 > +From: Vincent Fazio > +Date: Tue, 7 Feb 2023 03:55:28 -0600 > +Subject: [PATCH] configure: invert condition for strtoimax builtin > + > +Previously, bash would attempt to build a replacement for strtoimax if > +it found that the C library had the function already declared. > + > +This caused build errors when linking against static libraries that did > +not define the function as a weak alias but, in reality, was a logic > +error since bash should only provide it's own implementation if one is > +not provided by the C library. > + > +Now, fix this by inverting the logic. > + > +Upstream: > + https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 > + > +Signed-off-by: Vincent Fazio > +--- > + configure | 6 +++++- > + m4/strtoimax.m4 | 5 ++++- > + 2 files changed, 9 insertions(+), 2 deletions(-) > + > +diff --git a/configure b/configure > +index 47313753..6039cee7 100755 > +--- a/configure > ++++ b/configure > +@@ -20443,7 +20443,11 @@ fi > + > + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bash_cv_func_strtoimax" >&5 > + printf "%s\n" "$bash_cv_func_strtoimax" >&6; } > +-if test $bash_cv_func_strtoimax = yes; then > ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then > ++printf "%s\n" "#define HAVE_DECL_STRTOIMAX 1" >>confdefs.h > ++ > ++fi > ++if test $bash_cv_func_strtoimax = no; then > + case " $LIBOBJS " in > + *" strtoimax.$ac_objext "* ) ;; > + *) LIBOBJS="$LIBOBJS strtoimax.$ac_objext" > +diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 > +index 30985723..fa43ac7b 100644 > +--- a/m4/strtoimax.m4 > ++++ b/m4/strtoimax.m4 > +@@ -29,7 +29,10 @@ AC_CACHE_VAL(bash_cv_func_strtoimax, > + fi > + ]) > + AC_MSG_RESULT($bash_cv_func_strtoimax) > +-if test $bash_cv_func_strtoimax = yes; then > ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then > ++AC_DEFINE([HAVE_DECL_STRTOIMAX], [1]) > ++fi > ++if test $bash_cv_func_strtoimax = no; then > + AC_LIBOBJ(strtoimax) > + fi > + ]) > +-- > +2.25.1 > + > -- > 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 thomas.petazzoni at bootlin.com Tue Feb 7 11:50:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 12:50:27 +0100 Subject: [Buildroot] [git commit] package/python-hkdf: new package Message-ID: <20230207115045.1C17C840AE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=433ce2966f787248d5b8a62c46634e2f86250f8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master HMAC-based Extract-and-Expand Key Derivation Function (HKDF). https://github.com/casebeer/python-hkdf Signed-off-by: Julien Olivain [Thomas: justify the license.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/python-hkdf/Config.in | 7 +++++++ package/python-hkdf/python-hkdf.hash | 3 +++ package/python-hkdf/python-hkdf.mk | 17 +++++++++++++++++ .../testing/tests/package/sample_python_hkdf.py | 22 ++++++++++++++++++++++ support/testing/tests/package/test_python_hkdf.py | 11 +++++++++++ 7 files changed, 63 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f10036f7f2..69e73636be 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1693,6 +1693,7 @@ F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ +F: package/python-hkdf/ F: package/python-pyalsa/ F: package/rdma-core/ F: package/riscv-isa-sim/ @@ -1709,6 +1710,7 @@ F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py +F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_rdma_core.py diff --git a/package/Config.in b/package/Config.in index aa87f1305d..b28949500e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1073,6 +1073,7 @@ menu "External python modules" source "package/python-h11/Config.in" source "package/python-h2/Config.in" source "package/python-hiredis/Config.in" + source "package/python-hkdf/Config.in" source "package/python-hpack/Config.in" source "package/python-html5lib/Config.in" source "package/python-httplib2/Config.in" diff --git a/package/python-hkdf/Config.in b/package/python-hkdf/Config.in new file mode 100644 index 0000000000..2add348ca2 --- /dev/null +++ b/package/python-hkdf/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_HKDF + bool "python-hkdf" + help + HMAC-based Extract-and-Expand Key Derivation Function + (HKDF). + + https://github.com/casebeer/python-hkdf diff --git a/package/python-hkdf/python-hkdf.hash b/package/python-hkdf/python-hkdf.hash new file mode 100644 index 0000000000..87702b4582 --- /dev/null +++ b/package/python-hkdf/python-hkdf.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/hkdf/json +md5 d10471ad0ec891cdbe165d78282c943e hkdf-0.0.3.tar.gz +sha256 622a31c634bc185581530a4b44ffb731ed208acf4614f9c795bdd70e77991dca hkdf-0.0.3.tar.gz diff --git a/package/python-hkdf/python-hkdf.mk b/package/python-hkdf/python-hkdf.mk new file mode 100644 index 0000000000..8b68c5cc9f --- /dev/null +++ b/package/python-hkdf/python-hkdf.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-hkdf +# +################################################################################ + +PYTHON_HKDF_VERSION = 0.0.3 +PYTHON_HKDF_SOURCE = hkdf-$(PYTHON_HKDF_VERSION).tar.gz +PYTHON_HKDF_SITE = https://files.pythonhosted.org/packages/c3/be/327e072850db181ce56afd51e26ec7aa5659b18466c709fa5ea2548c935f +PYTHON_HKDF_SETUP_TYPE = setuptools +# No license file in the tree, but +# https://github.com/casebeer/python-hkdf/blob/master/LICENSE shows +# it's BSD-2-Clause. Issue already reported upstream: +# https://github.com/casebeer/python-hkdf/issues/6 +PYTHON_HKDF_LICENSE = BSD-2-Clause + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_hkdf.py b/support/testing/tests/package/sample_python_hkdf.py new file mode 100644 index 0000000000..a730c633e1 --- /dev/null +++ b/support/testing/tests/package/sample_python_hkdf.py @@ -0,0 +1,22 @@ +import hashlib +from binascii import hexlify, unhexlify + +from hkdf import Hkdf, hkdf_expand, hkdf_extract + +salt = b"ThisIsTheSalt." +key_in = b"ThisIsTheSecretKey" +key_info = b"KeyInfo1" +key_len = 16 +expected_key = unhexlify(b"b49d6cc9065b72f3a0859377d8bb7299") + +prk = hkdf_extract(salt, input_key_material=key_in, hash=hashlib.sha512) +key1 = hkdf_expand(prk, info=key_info, length=key_len) + +print("key1:", hexlify(key1)) +assert key1 == expected_key + +kdf = Hkdf(salt, input_key_material=key_in, hash=hashlib.sha512) +key2 = kdf.expand(info=key_info, length=key_len) + +print("key2:", hexlify(key2)) +assert key2 == expected_key diff --git a/support/testing/tests/package/test_python_hkdf.py b/support/testing/tests/package/test_python_hkdf.py new file mode 100644 index 0000000000..e93c24ff60 --- /dev/null +++ b/support/testing/tests/package/test_python_hkdf.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Hkdf(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_HKDF=y + """ + sample_scripts = ["tests/package/sample_python_hkdf.py"] From arnout at mind.be Tue Feb 7 11:53:44 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 12:53:44 +0100 Subject: [Buildroot] [PATCH] package/busybox: update to 1.36.0 Message-ID: <20230207115344.440172-1-arnout@mind.be> Remove upstream patch 0003-awk-fix-use-after-free-CVE-2022-30065.patch and update _IGNORE_CVES accordingly. The two other CVE fixes are still needed. Refresh busybox.config. All configs are set to the new defaults, except for CONFIG_UDHCPC_DEFAULT_SCRIPT: for this one, reuse the script we also use for DHCPv4. This is matches the behaviour previous to the bump, where we had a single script handling both. Signed-off-by: Arnout Vandecappelle --- ...wk-fix-use-after-free-CVE-2022-30065.patch | 52 ------------------- package/busybox/busybox.config | 23 +++++--- package/busybox/busybox.hash | 2 +- package/busybox/busybox.mk | 4 +- 4 files changed, 19 insertions(+), 62 deletions(-) delete mode 100644 package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch diff --git a/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch b/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch deleted file mode 100644 index f9bfee328e..0000000000 --- a/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e06b1f0839972cc3f5b432849d574d14a8f17613 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Fri, 17 Jun 2022 17:45:34 +0200 -Subject: [PATCH] awk: fix use after free (CVE-2022-30065) - -fixes https://bugs.busybox.net/show_bug.cgi?id=14781 - -function old new delta -evaluate 3343 3357 +14 - -Signed-off-by: Natanael Copa -Signed-off-by: Denys Vlasenko -Backport: https://git.busybox.net/busybox/commit/?id=e63d7cdfdac78c6fd27e9e63150335767592b85e -[straightforward conflict resolution in testsuite/awk.tests] -Signed-off-by: Quentin Schulz ---- - editors/awk.c | 3 +++ - testsuite/awk.tests | 6 ++++++ - 2 files changed, 9 insertions(+) - -diff --git a/editors/awk.c b/editors/awk.c -index f6314ac72..654cbac33 100644 ---- a/editors/awk.c -+++ b/editors/awk.c -@@ -3114,6 +3114,9 @@ static var *evaluate(node *op, var *res) - - case XC( OC_MOVE ): - debug_printf_eval("MOVE\n"); -+ /* make sure that we never return a temp var */ -+ if (L.v == TMPVAR0) -+ L.v = res; - /* if source is a temporary string, jusk relink it to dest */ - if (R.v == TMPVAR1 - && !(R.v->type & VF_NUMBER) -diff --git a/testsuite/awk.tests b/testsuite/awk.tests -index bcaafe8fd..156aa65eb 100755 ---- a/testsuite/awk.tests -+++ b/testsuite/awk.tests -@@ -469,4 +469,10 @@ testing 'awk printf %% prints one %' \ - "%\n" \ - '' '' - -+testing 'awk assign while test' \ -+ "awk '\$1==\$1=\"foo\" {print \$1}'" \ -+ "foo\n" \ -+ "" \ -+ "foo" -+ - exit $FAILCOUNT --- -2.37.3 - diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index e7f628ca6d..4826fb8242 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.35.0 -# Thu Jan 27 10:16:54 2022 +# Busybox version: 1.36.0 +# Tue Feb 7 12:34:02 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA1_SMALL=3 +CONFIG_SHA1_HWACCEL=y +CONFIG_SHA256_HWACCEL=y CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_NON_POSIX_CP=y # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set @@ -123,6 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=0 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets @@ -338,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y CONFIG_TRUNCATE=y +CONFIG_TSORT=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux" @@ -520,7 +527,7 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y -# CONFIG_USE_BB_CRYPT_SHA is not set +CONFIG_USE_BB_CRYPT_SHA=y # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set CONFIG_ADDGROUP=y @@ -811,10 +818,10 @@ CONFIG_FEATURE_LESS_TRUNCATE=y CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_FEATURE_LESS_WINCH is not set # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set +CONFIG_FEATURE_LESS_DASHCMD=y # CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_FEATURE_LESS_RAW is not set -# CONFIG_FEATURE_LESS_ENV is not set +CONFIG_FEATURE_LESS_RAW=y +CONFIG_FEATURE_LESS_ENV=y CONFIG_LSSCSI=y CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set @@ -831,10 +838,12 @@ CONFIG_PARTPROBE=y # CONFIG_RFKILL is not set CONFIG_RUNLEVEL=y # CONFIG_RX is not set +CONFIG_SEEDRNG=y CONFIG_SETFATTR=y CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y +CONFIG_TREE=y CONFIG_TS=y # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set @@ -1007,6 +1016,7 @@ CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC6_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" # CONFIG_UDHCPC6 is not set # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set @@ -1141,6 +1151,7 @@ CONFIG_ASH_IDLE_TIMEOUT=y CONFIG_ASH_ECHO=y CONFIG_ASH_PRINTF=y CONFIG_ASH_TEST=y +CONFIG_ASH_SLEEP=y CONFIG_ASH_HELP=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 2091cdaf65..6d1c36906d 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ # From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 -sha256 faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 busybox-1.35.0.tar.bz2 +sha256 542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5 busybox-1.36.0.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index f8f9cb5616..3026823063 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,15 +4,13 @@ # ################################################################################ -BUSYBOX_VERSION = 1.35.0 +BUSYBOX_VERSION = 1.36.0 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 BUSYBOX_LICENSE_FILES = LICENSE archival/libarchive/bz/LICENSE BUSYBOX_CPE_ID_VENDOR = busybox -# 0003-awk-fix-use-after-free-CVE-2022-30065.patch -BUSYBOX_IGNORE_CVES += CVE-2022-30065 # 0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch # 0005-nslookup-sanitize-all-printed-strings-with-printable.patch BUSYBOX_IGNORE_CVES += CVE-2022-28391 -- 2.39.1 From arnout at mind.be Tue Feb 7 13:09:46 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 14:09:46 +0100 Subject: [Buildroot] [PATCH] package/pkg-generic: ignore error when chmod'ing extracted source In-Reply-To: <20220616020353.497241-1-uwu@icenowy.me> References: <20220616020353.497241-1-uwu@icenowy.me> Message-ID: Hi Icenswy, On 16/06/2022 04:03, Icenowy Zheng wrote: > The chmod command included in GNU coreutils 9.0 will exit with 1 when in As mentioned by Romain, this is really a bug in coreutils which was fixed in coreutils 9.1. Since I assume all distros will have updated their coreutils, I see little value in carrying a fix in Buildroot. On the other hand, there is some value in seeing a failure of the chmod. Therefore, I've marked this patch as Rejected in patchwork. Regardless, thank you for your contribution! Regards, Arnout > a recursive a symlink is met and the mode of both itself and its target > is retained; however this situation is usually expected (such kind of > symlink exists in, e.g., a newly extracted tarball of Linux kernel), > thus not a failure. > > Considering this chmod call is only kind of vanishing, ignore error for > it. > > Signed-off-by: Icenowy Zheng > --- > package/pkg-generic.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index b233b07548..03e4b029b3 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -216,7 +216,7 @@ $(BUILD_DIR)/%/.stamp_extracted: > $(Q)mkdir -p $(@D) > $($(PKG)_EXTRACT_CMDS) > # some packages have messed up permissions inside > - $(Q)chmod -R +rw $(@D) > + -$(Q)chmod -R +rw $(@D) > $(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep)) > @$(call step_end,extract) > $(Q)touch $@ From thomas.petazzoni at bootlin.com Tue Feb 7 12:41:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:41:48 +0100 Subject: [Buildroot] [git commit] package/python-spake2: new package Message-ID: <20230207132558.94BFC84150@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9aaef2a07780a200512ccadb2381c559c4ffd8e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master SPAKE2 password-authenticated key exchange (in pure python). This library implements the SPAKE2 password-authenticated key exchange ("PAKE") algorithm. This allows two parties, who share a weak password, to safely derive a strong shared secret (and therefore build an encrypted+authenticated channel). https://github.com/warner/python-spake2 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-spake2/Config.in | 13 +++++++++++++ package/python-spake2/python-spake2.hash | 5 +++++ package/python-spake2/python-spake2.mk | 14 ++++++++++++++ .../testing/tests/package/sample_python_spake2.py | 22 ++++++++++++++++++++++ .../testing/tests/package/test_python_spake2.py | 11 +++++++++++ 7 files changed, 69 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 69e73636be..a631c32405 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1695,6 +1695,7 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-hkdf/ F: package/python-pyalsa/ +F: package/python-spake2/ F: package/rdma-core/ F: package/riscv-isa-sim/ F: package/tinycompress/ @@ -1703,6 +1704,7 @@ 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/sample_python_pyalsa.py +F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py @@ -1713,6 +1715,7 @@ F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py diff --git a/package/Config.in b/package/Config.in index b28949500e..ec7a6483f6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1290,6 +1290,7 @@ menu "External python modules" source "package/python-sockjs/Config.in" source "package/python-sortedcontainers/Config.in" source "package/python-soupsieve/Config.in" + source "package/python-spake2/Config.in" source "package/python-spidev/Config.in" source "package/python-sqlalchemy/Config.in" source "package/python-sqliteschema/Config.in" diff --git a/package/python-spake2/Config.in b/package/python-spake2/Config.in new file mode 100644 index 0000000000..1c2e3a49af --- /dev/null +++ b/package/python-spake2/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_SPAKE2 + bool "python-spake2" + select BR2_PACKAGE_PYTHON_HKDF # runtime + help + SPAKE2 password-authenticated key exchange (in pure python). + + This library implements the SPAKE2 password-authenticated + key exchange ("PAKE") algorithm. This allows two parties, + who share a weak password, to safely derive a strong shared + secret (and therefore build an encrypted+authenticated + channel). + + https://github.com/warner/python-spake2 diff --git a/package/python-spake2/python-spake2.hash b/package/python-spake2/python-spake2.hash new file mode 100644 index 0000000000..30052b1b36 --- /dev/null +++ b/package/python-spake2/python-spake2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/spake2/json +md5 0155bad518bb49c39994fe0b7d9fb32c spake2-0.8.tar.gz +sha256 c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4 spake2-0.8.tar.gz +# Locally computed sha256 checksums +sha256 2a8a1200c3a2769d1815727f3b4439bd800f3bc88163118a36ff30b007d30031 LICENSE diff --git a/package/python-spake2/python-spake2.mk b/package/python-spake2/python-spake2.mk new file mode 100644 index 0000000000..99ce7dae13 --- /dev/null +++ b/package/python-spake2/python-spake2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-spake2 +# +################################################################################ + +PYTHON_SPAKE2_VERSION = 0.8 +PYTHON_SPAKE2_SOURCE = spake2-$(PYTHON_SPAKE2_VERSION).tar.gz +PYTHON_SPAKE2_SITE = https://files.pythonhosted.org/packages/60/0b/bb5eca8e18c38a10b1c207bbe6103df091e5cf7b3e5fdc0efbcad7b85b60 +PYTHON_SPAKE2_SETUP_TYPE = setuptools +PYTHON_SPAKE2_LICENSE = MIT +PYTHON_SPAKE2_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_spake2.py b/support/testing/tests/package/sample_python_spake2.py new file mode 100644 index 0000000000..49dd914ca8 --- /dev/null +++ b/support/testing/tests/package/sample_python_spake2.py @@ -0,0 +1,22 @@ +from binascii import hexlify + +from spake2 import SPAKE2_A, SPAKE2_B + + +shared_password = b"This Is The Password!" + +alice = SPAKE2_A(shared_password) +alice_msg = alice.start() + +bob = SPAKE2_B(shared_password) +bob_msg = bob.start() + +# Alice and Bob exchange their messages... + +alice_key = alice.finish(bob_msg) +bob_key = bob.finish(alice_msg) + +print("alice_key:", hexlify(alice_key)) +print(" bob_key:", hexlify(bob_key)) + +assert alice_key == bob_key diff --git a/support/testing/tests/package/test_python_spake2.py b/support/testing/tests/package/test_python_spake2.py new file mode 100644 index 0000000000..fb47a0802c --- /dev/null +++ b/support/testing/tests/package/test_python_spake2.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Spake2(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_SPAKE2=y + """ + sample_scripts = ["tests/package/sample_python_spake2.py"] From thomas.petazzoni at bootlin.com Tue Feb 7 13:01:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:01:05 +0100 Subject: [Buildroot] [git commit] support/testing/tests/package/test_python_magic_wormhole.py: new runtime test Message-ID: <20230207132558.CA9AB84151@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e23807372370974a307b3c70ef9d77964a149ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../tests/package/test_python_magic_wormhole.py | 62 ++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5776d6d7a5..8dde37bd67 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1717,6 +1717,7 @@ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py +F: support/testing/tests/package/test_python_magic_wormhole.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py diff --git a/support/testing/tests/package/test_python_magic_wormhole.py b/support/testing/tests/package/test_python_magic_wormhole.py new file mode 100644 index 0000000000..d6541a2480 --- /dev/null +++ b/support/testing/tests/package/test_python_magic_wormhole.py @@ -0,0 +1,62 @@ +import os + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3MagicWormhole(TestPythonPackageBase): + __test__ = True + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE=y + BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER=y + BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + timeout = 60 + + def twistd_cmd(self, command): + s = "twistd" + s += " --pidfile=/tmp/{}.pid".format(command) + s += " --logfile=/tmp/{}.log".format(command) + s += " {}".format(command) + + return s + + def test_run(self): + code = "123-hello-buildroot" + text = "Hello Buildroot!" + + relay_url = "ws://localhost:4000/v1" + transit_helper = "tcp:localhost:4001" + + img = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", kernel="builtin", + options=["-initrd", img]) + + self.emulator.login() + + cmd = self.twistd_cmd("wormhole-mailbox") + self.assertRunOk(cmd, timeout=30) + + cmd = self.twistd_cmd("transitrelay") + self.assertRunOk(cmd, timeout=30) + + wormhole_cmd = "wormhole --relay-url={} --transit-helper={}".format( + relay_url, transit_helper) + + cmd = wormhole_cmd + " send --code={} --text=\"{}\" & ".format(code, text) + cmd += "sleep 25" + self.assertRunOk(cmd, timeout=30) + + cmd = wormhole_cmd + " receive {}".format(code) + output, exit_code = self.emulator.run(cmd, timeout=35) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], text) From thomas.petazzoni at bootlin.com Tue Feb 7 12:47:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:47:55 +0100 Subject: [Buildroot] [git commit] package/python-magic-wormhole: new package Message-ID: <20230207132558.A176384151@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb013c3757548f3153a9da59906c388d32a376fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Securely transfer data between computers. This package provides a library and a command-line tool named "wormhole", which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. The two endpoints are identified by using identical "wormhole codes": in general, the sending machine generates and displays the code, which must then be typed into the receiving machine. https://github.com/magic-wormhole/magic-wormhole Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-magic-wormhole/Config.in | 27 ++++++++++++++++++++++ .../python-magic-wormhole.hash | 5 ++++ .../python-magic-wormhole/python-magic-wormhole.mk | 14 +++++++++++ 5 files changed, 48 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a631c32405..8d1d9340bb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1694,6 +1694,7 @@ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ F: package/python-hkdf/ +F: package/python-magic-wormhole/ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ diff --git a/package/Config.in b/package/Config.in index ec7a6483f6..cb9a2b829f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1120,6 +1120,7 @@ menu "External python modules" source "package/python-logstash/Config.in" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" + source "package/python-magic-wormhole/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-magic-wormhole/Config.in b/package/python-magic-wormhole/Config.in new file mode 100644 index 0000000000..e8429d203b --- /dev/null +++ b/package/python-magic-wormhole/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE + bool "python-magic-wormhole" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime + select BR2_PACKAGE_PYTHON_AUTOMAT # runtime + select BR2_PACKAGE_PYTHON_CLICK # runtime + select BR2_PACKAGE_PYTHON_HKDF # runtime + select BR2_PACKAGE_PYTHON_HUMANIZE # runtime + select BR2_PACKAGE_PYTHON_PYNACL # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_SPAKE2 # runtime + select BR2_PACKAGE_PYTHON_TQDM # runtime + select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_TXTORCON # runtime + help + Securely transfer data between computers. + + This package provides a library and a command-line tool + named "wormhole", which makes it possible to get + arbitrary-sized files and directories (or short pieces of + text) from one computer to another. The two endpoints are + identified by using identical "wormhole codes": in general, + the sending machine generates and displays the code, which + must then be typed into the receiving machine. + + https://github.com/magic-wormhole/magic-wormhole diff --git a/package/python-magic-wormhole/python-magic-wormhole.hash b/package/python-magic-wormhole/python-magic-wormhole.hash new file mode 100644 index 0000000000..5e880d5427 --- /dev/null +++ b/package/python-magic-wormhole/python-magic-wormhole.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole/json +md5 ca190d92f56fe32ec8dfd4fc5aab8337 magic-wormhole-0.12.0.tar.gz +sha256 1b0fd8a334da978f3dd96b620fa9b9348cabedf26a87f74baac7a37052928160 magic-wormhole-0.12.0.tar.gz +# Locally computed sha256 checksums +sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE diff --git a/package/python-magic-wormhole/python-magic-wormhole.mk b/package/python-magic-wormhole/python-magic-wormhole.mk new file mode 100644 index 0000000000..91f0f826d5 --- /dev/null +++ b/package/python-magic-wormhole/python-magic-wormhole.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_VERSION = 0.12.0 +PYTHON_MAGIC_WORMHOLE_SOURCE = magic-wormhole-$(PYTHON_MAGIC_WORMHOLE_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_SITE = https://files.pythonhosted.org/packages/d4/62/5e4a86f7c4b111e016577f1b304063ebe604f430db15465ac58b13993608 +PYTHON_MAGIC_WORMHOLE_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 12:56:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:56:25 +0100 Subject: [Buildroot] [git commit] package/python-magic-wormhole-transit-relay: new package Message-ID: <20230207132558.BD9E984150@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=037dbe64d861e3d5580ecac608bd278afc9bbcc6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Transit Relay server for Magic-Wormhole. This repository implements the Magic-Wormhole "Transit Relay", a server that helps clients establish bulk-data transit connections even when both are behind NAT boxes. Each side makes a TCP connection to this server and presents a handshake. Two connections with identical handshakes are glued together, allowing them to pretend they have a direct connection. https://github.com/magic-wormhole/magic-wormhole-transit-relay Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-magic-wormhole-transit-relay/Config.in | 15 +++++++++++++++ .../python-magic-wormhole-transit-relay.hash | 5 +++++ .../python-magic-wormhole-transit-relay.mk | 14 ++++++++++++++ 5 files changed, 36 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index afc079a609..5776d6d7a5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1696,6 +1696,7 @@ F: package/python-gnupg/ F: package/python-hkdf/ F: package/python-magic-wormhole/ F: package/python-magic-wormhole-mailbox-server/ +F: package/python-magic-wormhole-transit-relay/ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ diff --git a/package/Config.in b/package/Config.in index 2ef403168a..b5418c56f6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1122,6 +1122,7 @@ menu "External python modules" source "package/python-m2crypto/Config.in" source "package/python-magic-wormhole/Config.in" source "package/python-magic-wormhole-mailbox-server/Config.in" + source "package/python-magic-wormhole-transit-relay/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-magic-wormhole-transit-relay/Config.in b/package/python-magic-wormhole-transit-relay/Config.in new file mode 100644 index 0000000000..1a743c10fe --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY + bool "python-magic-wormhole-transit-relay" + select BR2_PACKAGE_PYTHON_TWISTED # runtime + help + Transit Relay server for Magic-Wormhole. + + This repository implements the Magic-Wormhole "Transit + Relay", a server that helps clients establish bulk-data + transit connections even when both are behind NAT + boxes. Each side makes a TCP connection to this server and + presents a handshake. Two connections with identical + handshakes are glued together, allowing them to pretend they + have a direct connection. + + https://github.com/magic-wormhole/magic-wormhole-transit-relay diff --git a/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash new file mode 100644 index 0000000000..f131477a40 --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole-transit-relay/json +md5 aa575a4e22b3d5099674ba88b136a9a2 magic-wormhole-transit-relay-0.2.1.tar.gz +sha256 cb4801b46890eaff97286e0e3fec62d1d52ffe317d140083b6336a1fb4e8fa5e magic-wormhole-transit-relay-0.2.1.tar.gz +# Locally computed sha256 checksums +sha256 d70f6469bb210c2aa4c0dfd74f498ef5f0467a137d8296479088e7243c5884eb LICENSE diff --git a/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk new file mode 100644 index 0000000000..e4ffe6e7a6 --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole-transit-relay +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_VERSION = 0.2.1 +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SOURCE = magic-wormhole-transit-relay-$(PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SITE = https://files.pythonhosted.org/packages/21/c9/be25bb30e327037e009657960fc594d089b118c0d81cc6a200cad1bb3852 +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 12:54:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:54:07 +0100 Subject: [Buildroot] [git commit] package/python-magic-wormhole-mailbox-server: new package Message-ID: <20230207132558.AF82B84153@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9244052f28d87d6d85b73402e7d15f730eb66c4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package is the main server that Magic-Wormhole clients connect to. The server performs store-and-forward delivery for small key-exchange and control messages. Bulk data is sent over a direct TCP connection, or through a transit-relay. https://github.com/magic-wormhole/magic-wormhole-mailbox-server Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...move-the-U-open-mode-removed-in-Python-3..patch | 39 ++++++++++++++++++++++ .../python-magic-wormhole-mailbox-server/Config.in | 15 +++++++++ .../python-magic-wormhole-mailbox-server.hash | 5 +++ .../python-magic-wormhole-mailbox-server.mk | 14 ++++++++ 6 files changed, 75 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8d1d9340bb..afc079a609 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1695,6 +1695,7 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-hkdf/ F: package/python-magic-wormhole/ +F: package/python-magic-wormhole-mailbox-server/ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ diff --git a/package/Config.in b/package/Config.in index cb9a2b829f..2ef403168a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1121,6 +1121,7 @@ menu "External python modules" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" source "package/python-magic-wormhole/Config.in" + source "package/python-magic-wormhole-mailbox-server/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch b/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch new file mode 100644 index 0000000000..8afe7c9546 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch @@ -0,0 +1,39 @@ +From df6126ee86c1f84c7e0c25fcf69543b83b1b32c6 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 5 Nov 2022 13:06:07 +0100 +Subject: [PATCH] setup.py: remove the 'U' open mode removed in Python 3.11 + +The 'U' open mode was removed in Python 3.11. See: +https://docs.python.org/3.11/library/functions.html#open + +Installing with Python 3.11 fails with: + + /path/to/python-magic-wormhole-mailbox-server-0.4.1/setup.py", line 20, in + long_description=open('README.md', 'rU').read(), + ^^^^^^^^^^^^^^^^^^^^^^^ + ValueError: invalid mode: 'rU' + +This patch removes the 'U' open mode. + +Upstream: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/commit/df6126ee86c1f84c7e0c25fcf69543b83b1b32c6 +Signed-off-by: Julien Olivain +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 6ef292f..ad9ff5a 100644 +--- a/setup.py ++++ b/setup.py +@@ -17,7 +17,7 @@ trove_classifiers = [ + setup(name="magic-wormhole-mailbox-server", + version=versioneer.get_version(), + description="Securely transfer data between computers", +- long_description=open('README.md', 'rU').read(), ++ long_description=open('README.md', 'r').read(), + long_description_content_type='text/markdown', + author="Brian Warner", + author_email="warner-magic-wormhole at lothar.com", +-- +2.38.1 + diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in new file mode 100644 index 0000000000..db20d3e7b6 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER + bool "python-magic-wormhole-mailbox-server" + select BR2_PACKAGE_PYTHON3_SQLITE # runtime + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_TWISTED # runtime + help + This package is the main server that Magic-Wormhole clients + connect to. The server performs store-and-forward delivery + for small key-exchange and control messages. Bulk data is + sent over a direct TCP connection, or through a + transit-relay. + + https://github.com/magic-wormhole/magic-wormhole-mailbox-server diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash new file mode 100644 index 0000000000..c714712641 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole-mailbox-server/json +md5 3da441df1f354a8399a728da3421ac8f magic-wormhole-mailbox-server-0.4.1.tar.gz +sha256 1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb magic-wormhole-mailbox-server-0.4.1.tar.gz +# Locally computed sha256 checksums +sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk new file mode 100644 index 0000000000..a3394c7dcd --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole-mailbox-server +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION = 0.4.1 +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SOURCE = magic-wormhole-mailbox-server-$(PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SITE = https://files.pythonhosted.org/packages/5b/ba/cbb211bc8f8bfdf7fb620d33331f07bcd889c7a28e7fd8a0de9029bb5a2f +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 13:31:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:31:16 +0100 Subject: [Buildroot] [PATCH next v2 1/7] package/python-idna: set _SETUP_TYPE = flit In-Reply-To: <20221122203130.184496-1-ju.o@free.fr> References: <20221122203130.184496-1-ju.o@free.fr> Message-ID: <20230207143116.40b1f42b@windsurf> On Tue, 22 Nov 2022 21:31:24 +0100 Julien Olivain wrote: > Python idna package switched to pyproject.toml in commit: > https://github.com/kjd/idna/commit/2a00e518efe55d2eeb62cd3f88ace7db41338603 > which is included in idna v3.4. > > When using the old setuptools infra, the package is incorrectly > installed as v0.0, which is then incorrectly detected by other > packages when using setuptools pkg_resources. > > The issue can be reproduced with the command: > > python3 < __requires__ = ["idna >= 2.5"] > import pkg_resources > EOF > > which will fail with output: > > pkg_resources.ContextualVersionConflict: (idna 0.0.0 (/usr/lib/python3.11/site-packages), Requirement.parse('idna>=2.5'), {'hyperlink'}) > pkg_resources.DistributionNotFound: The 'idna>=2.5' distribution was not found and is required by hyperlink > > This commit changes _SETUP_TYPE to "flit" to fix this issue. > > Signed-off-by: Julien Olivain > --- > Changes v1 -> v2: > - Included James' review comment: > - _SETUP_TYPE changed from pep517 to flit > --- > package/python-idna/python-idna.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks, entire series applied! There was really not much to fix. In one commit, the runtime test file was forgotten in DEVELOPERS, and in another, I've added a reference to the upstream commit for the open(..., "rU") thing. Thanks a lot for having added relevant runtime tests for all of this, this is really good! Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Tue Feb 7 13:30:56 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 14:30:56 +0100 Subject: [Buildroot] [git commit] package/busybox: update to 1.36.0 Message-ID: <20230207133203.3C44D8417C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d68b617993bd2f5c82a4936ed1e24e4fec6b94a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove upstream patch 0003-awk-fix-use-after-free-CVE-2022-30065.patch and update _IGNORE_CVES accordingly. The two other CVE fixes are still not applied upstream. Renumber the patches and update the comment in the .mk file. Refresh busybox.config. All configs are set to the new defaults, except for CONFIG_UDHCPC_DEFAULT_SCRIPT: for this one, reuse the script we also use for DHCPv4. This is matches the behaviour previous to the bump, where we had a single script handling both. Signed-off-by: Arnout Vandecappelle --- ...003-awk-fix-use-after-free-CVE-2022-30065.patch | 52 ---------------------- ...dr2str-ensure-only-printable-characters-.patch} | 0 ...itize-all-printed-strings-with-printable.patch} | 0 package/busybox/busybox.config | 23 +++++++--- package/busybox/busybox.hash | 2 +- package/busybox/busybox.mk | 8 ++-- 6 files changed, 21 insertions(+), 64 deletions(-) diff --git a/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch b/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch deleted file mode 100644 index f9bfee328e..0000000000 --- a/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e06b1f0839972cc3f5b432849d574d14a8f17613 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Fri, 17 Jun 2022 17:45:34 +0200 -Subject: [PATCH] awk: fix use after free (CVE-2022-30065) - -fixes https://bugs.busybox.net/show_bug.cgi?id=14781 - -function old new delta -evaluate 3343 3357 +14 - -Signed-off-by: Natanael Copa -Signed-off-by: Denys Vlasenko -Backport: https://git.busybox.net/busybox/commit/?id=e63d7cdfdac78c6fd27e9e63150335767592b85e -[straightforward conflict resolution in testsuite/awk.tests] -Signed-off-by: Quentin Schulz ---- - editors/awk.c | 3 +++ - testsuite/awk.tests | 6 ++++++ - 2 files changed, 9 insertions(+) - -diff --git a/editors/awk.c b/editors/awk.c -index f6314ac72..654cbac33 100644 ---- a/editors/awk.c -+++ b/editors/awk.c -@@ -3114,6 +3114,9 @@ static var *evaluate(node *op, var *res) - - case XC( OC_MOVE ): - debug_printf_eval("MOVE\n"); -+ /* make sure that we never return a temp var */ -+ if (L.v == TMPVAR0) -+ L.v = res; - /* if source is a temporary string, jusk relink it to dest */ - if (R.v == TMPVAR1 - && !(R.v->type & VF_NUMBER) -diff --git a/testsuite/awk.tests b/testsuite/awk.tests -index bcaafe8fd..156aa65eb 100755 ---- a/testsuite/awk.tests -+++ b/testsuite/awk.tests -@@ -469,4 +469,10 @@ testing 'awk printf %% prints one %' \ - "%\n" \ - '' '' - -+testing 'awk assign while test' \ -+ "awk '\$1==\$1=\"foo\" {print \$1}'" \ -+ "foo\n" \ -+ "" \ -+ "foo" -+ - exit $FAILCOUNT --- -2.37.3 - diff --git a/package/busybox/0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch b/package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch similarity index 100% rename from package/busybox/0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch rename to package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch diff --git a/package/busybox/0005-nslookup-sanitize-all-printed-strings-with-printable.patch b/package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch similarity index 100% rename from package/busybox/0005-nslookup-sanitize-all-printed-strings-with-printable.patch rename to package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index e7f628ca6d..4826fb8242 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.35.0 -# Thu Jan 27 10:16:54 2022 +# Busybox version: 1.36.0 +# Tue Feb 7 12:34:02 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA1_SMALL=3 +CONFIG_SHA1_HWACCEL=y +CONFIG_SHA256_HWACCEL=y CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_NON_POSIX_CP=y # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set @@ -123,6 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=0 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets @@ -338,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y CONFIG_TRUNCATE=y +CONFIG_TSORT=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux" @@ -520,7 +527,7 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y -# CONFIG_USE_BB_CRYPT_SHA is not set +CONFIG_USE_BB_CRYPT_SHA=y # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set CONFIG_ADDGROUP=y @@ -811,10 +818,10 @@ CONFIG_FEATURE_LESS_TRUNCATE=y CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_FEATURE_LESS_WINCH is not set # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set +CONFIG_FEATURE_LESS_DASHCMD=y # CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_FEATURE_LESS_RAW is not set -# CONFIG_FEATURE_LESS_ENV is not set +CONFIG_FEATURE_LESS_RAW=y +CONFIG_FEATURE_LESS_ENV=y CONFIG_LSSCSI=y CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set @@ -831,10 +838,12 @@ CONFIG_PARTPROBE=y # CONFIG_RFKILL is not set CONFIG_RUNLEVEL=y # CONFIG_RX is not set +CONFIG_SEEDRNG=y CONFIG_SETFATTR=y CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y +CONFIG_TREE=y CONFIG_TS=y # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set @@ -1007,6 +1016,7 @@ CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC6_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" # CONFIG_UDHCPC6 is not set # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set @@ -1141,6 +1151,7 @@ CONFIG_ASH_IDLE_TIMEOUT=y CONFIG_ASH_ECHO=y CONFIG_ASH_PRINTF=y CONFIG_ASH_TEST=y +CONFIG_ASH_SLEEP=y CONFIG_ASH_HELP=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 2091cdaf65..6d1c36906d 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ # From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 -sha256 faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 busybox-1.35.0.tar.bz2 +sha256 542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5 busybox-1.36.0.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index f8f9cb5616..1633ca525d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,17 +4,15 @@ # ################################################################################ -BUSYBOX_VERSION = 1.35.0 +BUSYBOX_VERSION = 1.36.0 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 BUSYBOX_LICENSE_FILES = LICENSE archival/libarchive/bz/LICENSE BUSYBOX_CPE_ID_VENDOR = busybox -# 0003-awk-fix-use-after-free-CVE-2022-30065.patch -BUSYBOX_IGNORE_CVES += CVE-2022-30065 -# 0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch -# 0005-nslookup-sanitize-all-printed-strings-with-printable.patch +# 0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch +# 0004-nslookup-sanitize-all-printed-strings-with-printable.patch BUSYBOX_IGNORE_CVES += CVE-2022-28391 BUSYBOX_CFLAGS = \ From arnout at mind.be Tue Feb 7 13:33:10 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 14:33:10 +0100 Subject: [Buildroot] [PATCH] package/busybox: update to 1.36.0 In-Reply-To: <20230207115344.440172-1-arnout@mind.be> References: <20230207115344.440172-1-arnout@mind.be> Message-ID: <5b84c64e-bfb9-cd95-63fa-8571cd430e5e@mind.be> On 07/02/2023 12:53, Arnout Vandecappelle wrote: > Remove upstream patch 0003-awk-fix-use-after-free-CVE-2022-30065.patch > and update _IGNORE_CVES accordingly. > > The two other CVE fixes are still needed. > > Refresh busybox.config. All configs are set to the new defaults, except > for CONFIG_UDHCPC_DEFAULT_SCRIPT: for this one, reuse the script we also > use for DHCPv4. This is matches the behaviour previous to the bump, > where we had a single script handling both. > > Signed-off-by: Arnout Vandecappelle Applied to master after a quick review by Thomas, thanks. Regards, Arnout > --- > ...wk-fix-use-after-free-CVE-2022-30065.patch | 52 ------------------- > package/busybox/busybox.config | 23 +++++--- > package/busybox/busybox.hash | 2 +- > package/busybox/busybox.mk | 4 +- > 4 files changed, 19 insertions(+), 62 deletions(-) > delete mode 100644 package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch [snip] From romain.naour at smile.fr Tue Feb 7 13:40:00 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 14:40:00 +0100 Subject: [Buildroot] [PATCH] toolchain/toolchain-wrapper: make gcc --help -v work correctly In-Reply-To: <5DD722F6-F9EE-4517-9E55-5A61BB01F196@gmail.com> References: <5DD722F6-F9EE-4517-9E55-5A61BB01F196@gmail.com> Message-ID: Hello Sagi, Le 07/01/2023 ? 19:09, Sagi Mor a ?crit?: > make "gcc --help -v" display all the options, some packages depend on this > https://bugs.busybox.net/show_bug.cgi?id=15231 > Thanks for the report. Actually it's surprising that --help -v options are really used together by a build system to check gcc support. Is something to fix in the python build system instead [1]? As noticed by the GCC maintainer, the -fwrapv option is available since gcc-3.4.5 [2], so it's unlikely someone still trying to build python with gcc 3. Is any other package using "gcc --help -v"? [1] https://github.com/python/cpython/blob/v3.11.1/configure.ac#L2062 [2] https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=4fa26a60791ec314128a9683fd4d657b251d0268 Best regards, Romain > > Signed-off-by: Sagi Mor > --- > ?toolchain/toolchain-wrapper.c | 11 +++++++++++ > ?1 file changed, 11 insertions(+) > > diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c > index 37b24dd24a..85d592ad2d 100644 > --- a/toolchain/toolchain-wrapper.c > +++ b/toolchain/toolchain-wrapper.c > @@ -498,6 +498,17 @@ int main(int argc, char **argv) > ?} > ?} > ? > +/* drop all non forwards args if --help is specified */ > +for (i = 1; i < argc; i++) { > +if (!strcmp(argv[i], "--help")) { > +cur = args + 1; > +#ifdef BR_CCACHE > +cur++; > +#endif > +break; > +} > +} > + > ?/* append forward args */ > ?memcpy(cur, &argv[1], sizeof(char *) * (argc - 1)); > ?cur += argc - 1; > --? > 2.34.1 > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Tue Feb 7 13:44:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:44:02 +0100 Subject: [Buildroot] [git commit] package/dahdi-linux: fix build with kernel >= 6.1 Message-ID: <20230207134415.6378E8418E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33bdf7bb037c05863aa69bbe219e1cb78d596a3a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with kernel >= 6.1 In file included from ./include/linux/string.h:20, from ./include/linux/bitmap.h:11, from ./include/linux/cpumask.h:12, from ./include/linux/mm_types_task.h:14, from ./include/linux/mm_types.h:5, from ./include/linux/buildid.h:5, from ./include/linux/module.h:14, from /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:24: ./arch/powerpc/include/asm/string.h:27:22: note: expected ???void *??? but argument is of type ???const unsigned char *??? 27 | extern void * memcpy(void *,const void *,__kernel_size_t); | ^~~~~~ /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:661:9: error: too many arguments to function ???netif_napi_add??? 661 | netif_napi_add(netdev, &wc->napi, &wctc4xxp_poll, 64); | ^~~~~~~~~~~~~~ In file included from ./include/net/inet_sock.h:19, from ./include/linux/udp.h:16, from /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:38: ./include/linux/netdevice.h:2562:1: note: declared here 2562 | netif_napi_add(struct net_device *dev, struct napi_struct *napi, | ^~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/d7ce103a886329c68c04ebe05571be8f95a873ce Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0004-next-fix-kernel-6-1-build.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch b/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch new file mode 100644 index 0000000000..b910c4b775 --- /dev/null +++ b/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch @@ -0,0 +1,32 @@ +From a759a578277bde98eba7ef4bf86bdf819a900de9 Mon Sep 17 00:00:00 2001 +From: John Thomson +Date: Sun, 23 Oct 2022 13:42:52 +1000 +Subject: [PATCH] fix kernel 6.1 build + +kernel 6.1 includes b48b89f9c189 ("net: drop the weight argument from netif_napi_add") [0] + +[0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b48b89f9c189d24eb5e2b4a0ac067da5a24ee86d + +Signed-off-by: John Thomson +[Retrieved from: +https://github.com/asterisk/dahdi-linux/pull/14/commits/a759a578277bde98eba7ef4bf86bdf819a900de9] +Signed-off-by: Fabrice Fontaine +--- + include/dahdi/kernel.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h +index 35e93bc4..fd64a15e 100644 +--- a/include/dahdi/kernel.h ++++ b/include/dahdi/kernel.h +@@ -58,6 +58,10 @@ + + #include + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++#define netif_napi_add netif_napi_add_weight ++#endif ++ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) + #include + #include From thomas.petazzoni at bootlin.com Tue Feb 7 13:44:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:44:02 +0100 Subject: [Buildroot] [git commit] package/dahdi-linux: update URL in Config.in help text Message-ID: <20230207134415.6E95E84194@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e06975b38047fe1ef47650248f154ecf88fe09b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master http://www.asterisk.org/downloads/dahdi no longer works, use the Github page instead. Signed-off-by: Thomas Petazzoni --- package/dahdi-linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dahdi-linux/Config.in b/package/dahdi-linux/Config.in index 7b6ce79422..b6086fdc6c 100644 --- a/package/dahdi-linux/Config.in +++ b/package/dahdi-linux/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_DAHDI_LINUX DAHDI Linux is the open source device driver framework used to interface Asterisk with telephony hardware. - http://www.asterisk.org/downloads/dahdi + https://github.com/asterisk/dahdi-linux comment "dahdi-linux needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL From thomas.petazzoni at bootlin.com Tue Feb 7 13:44:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:44:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/dahdi-linux: fix build with kernel >= 6.1 In-Reply-To: <20221229164315.424657-1-fontaine.fabrice@gmail.com> References: <20221229164315.424657-1-fontaine.fabrice@gmail.com> Message-ID: <20230207144425.7a9e03fd@windsurf> On Thu, 29 Dec 2022 17:43:15 +0100 Fabrice Fontaine wrote: > Fix the following build failure with kernel >= 6.1 > > In file included from ./include/linux/string.h:20, > from ./include/linux/bitmap.h:11, > from ./include/linux/cpumask.h:12, > from ./include/linux/mm_types_task.h:14, > from ./include/linux/mm_types.h:5, > from ./include/linux/buildid.h:5, > from ./include/linux/module.h:14, > from /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:24: > ./arch/powerpc/include/asm/string.h:27:22: note: expected ?void *? but argument is of type ?const unsigned char *? > 27 | extern void * memcpy(void *,const void *,__kernel_size_t); > | ^~~~~~ > /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:661:9: error: too many arguments to function ?netif_napi_add? > 661 | netif_napi_add(netdev, &wc->napi, &wctc4xxp_poll, 64); > | ^~~~~~~~~~~~~~ > In file included from ./include/net/inet_sock.h:19, > from ./include/linux/udp.h:16, > from /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:38: > ./include/linux/netdevice.h:2562:1: note: declared here > 2562 | netif_napi_add(struct net_device *dev, struct napi_struct *napi, > | ^~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/d7ce103a886329c68c04ebe05571be8f95a873ce > > Signed-off-by: Fabrice Fontaine > --- > .../0004-next-fix-kernel-6-1-build.patch | 32 +++++++++++++++++++ > 1 file changed, 32 insertions(+) > create mode 100644 package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Tue Feb 7 13:52:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 14:52:27 +0100 Subject: [Buildroot] [git commit] package/pkg-generic.mk: only check for virtual package conflicts when building Message-ID: <20230207135235.D0949841B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7231701a290ba447fde9807ba9d260022ddfc8e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 2f8ba39edf..5d618c6b39 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1182,10 +1182,12 @@ ifeq ($$($$($(2)_KCONFIG_VAR)),y) # Ensure the calling package is the declared provider for all the virtual # packages it claims to be an implementation of. +ifeq ($(BR_BUILDING),y) ifneq ($$($(2)_PROVIDES),) $$(foreach pkg,$$($(2)_PROVIDES),\ $$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep))) endif +endif # Register package as a reverse-dependencies of all its dependencies $$(eval $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),\ From peter at korsgaard.com Tue Feb 7 13:52:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 14:52:26 +0100 Subject: [Buildroot] [git commit] package/mesa3d-headers: only check for conflicts when building Message-ID: <20230207135235.C34CC841B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=509956da4cdba6a76214322b1ace979bbe6cd6a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 03bf635816..9177adceda 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -6,7 +6,7 @@ # mesa3d-headers is inherently incompatible with mesa3d, so error out # if both are enabled. -ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yy) +ifeq ($(BR_BUILDING)$(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yyy) $(error mesa3d-headers enabled, but mesa3d enabled too) endif From yann.morin.1998 at free.fr Tue Feb 7 13:55:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 14:55:03 +0100 Subject: [Buildroot] [PATCH] package/gcc/gcc-final: map debug prefix when reproducible In-Reply-To: <20230206162617.1907911-1-john@metanate.com> References: <20230206162617.1907911-1-john@metanate.com> Message-ID: <20230207135503.GF4124@scaer> John, All, On 2023-02-06 16:26 +0000, John Keeping spake thusly: > When building with BR2_REPRODUCIBLE the toolchain wrapper passes > -fdebug-prefix-map for all packages that are built. But this doesn't > affect the target libraries (like libgcc) built by GCC's build system. > > GCC 4.3 added a configure option to set the debug prefix map for these > libraries, which is used here to avoid encoding potentially > non-reproducible build paths into the debug data. Thanks, this is indeed very interesting. We (briefly) discussed this at the developers day minutes ago, and the question that was brought up was: why is not needed for the first-stage compiler? Indeed, the first-stage compiler builds objects files that are then used by the C library, we would expect the debug symbols for those to also need prefix mapping. Could you look into that, and either pass the option to both the initial and final gcc if needed, or explain in the commit log why it is not needed for the initial gcc, please? In the meantime, I've marked this patch as changes-requested in patchwork. Regards, Yann E. MORIN. > Signed-off-by: John Keeping > --- > package/gcc/gcc-final/gcc-final.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk > index aa883beb7b..5f222a324c 100644 > --- a/package/gcc/gcc-final/gcc-final.mk > +++ b/package/gcc/gcc-final/gcc-final.mk > @@ -108,6 +108,10 @@ else > HOST_GCC_FINAL_CONF_OPTS += --disable-libgomp > endif > > +ifeq ($(BR2_REPRODUCIBLE),y) > +HOST_GCC_FINAL_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot > +endif > + > # End with user-provided options, so that they can override previously > # defined options. > HOST_GCC_FINAL_CONF_OPTS += \ > -- > 2.39.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 vfazio at xes-inc.com Tue Feb 7 14:01:12 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 7 Feb 2023 14:01:12 +0000 Subject: [Buildroot] [External] - [PATCH 1/1] linux: fix LINUX_VERSION_PROBED content In-Reply-To: <20230104020558.1436469-2-giulio.benetti@benettiengineering.com> References: <20230104020558.1436469-1-giulio.benetti@benettiengineering.com> <20230104020558.1436469-2-giulio.benetti@benettiengineering.com> Message-ID: > -----Original Message----- > From: buildroot On Behalf Of Giulio > Benetti > Sent: Tuesday, January 3, 2023 8:06 PM > To: buildroot at buildroot.org > Cc: Giulio Benetti > Subject: [External] - [Buildroot] [PATCH 1/1] linux: fix > LINUX_VERSION_PROBED content > > Actually LINUX_VERSION_PROBED is set with the string sorrounded by the > backquotes including them. So when we evaluate > $(LINUX_VERSION_PROBED) we end up having the command itself and > instead we only need the Linux version probed in the style x.y.z. > > Verifying it turns out that: > 1) --no-print-directory and -s make flags must be passed before -C flag, The > error was not visible because errors were suppressed with '2>/dev/null' > 2) backquotes don't evaluate the expression they sorround but become part > of the string they sorround and get assigned to the variable > > To fix this let's move --no-print-directory right after $(MAKE) and use $(shell ) > instead of backquotes. > > Signed-off-by: Giulio Benetti Tested-by: Vincent Fazio > --- > linux/linux.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..23c169995a > 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -183,7 +183,7 @@ endif > # Get the real Linux version, which tells us where kernel modules are # > going to be installed in the target filesystem. > # Filter out 'w' from MAKEFLAGS, to workaround a bug in make 4.1 (#13141) > -LINUX_VERSION_PROBED = `MAKEFLAGS='$(filter-out w,$(MAKEFLAGS))' > $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s > kernelrelease 2>/dev/null` > +LINUX_VERSION_PROBED = $(shell MAKEFLAGS='$(filter-out > w,$(MAKEFLAGS))' > +$(MAKE) --no-print-directory -s $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) > +kernelrelease 2>/dev/null) > > LINUX_DTS_NAME += $(call > qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > CAUTION: This email originated from outside of the organization. Do not click > links or open attachments unless you recognize the sender and know the > content is safe. From thomas.petazzoni at bootlin.com Tue Feb 7 14:16:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 15:16:46 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix LINUX_VERSION_PROBED content In-Reply-To: <20230104020558.1436469-2-giulio.benetti@benettiengineering.com> References: <20230104020558.1436469-1-giulio.benetti@benettiengineering.com> <20230104020558.1436469-2-giulio.benetti@benettiengineering.com> Message-ID: <20230207151646.09c9df79@windsurf> Hello Giulio, On Wed, 4 Jan 2023 03:05:58 +0100 Giulio Benetti wrote: > Actually LINUX_VERSION_PROBED is set with the string sorrounded by the > backquotes including them. So when we evaluate $(LINUX_VERSION_PROBED) we > end up having the command itself and instead we only need the Linux version > probed in the style x.y.z. > > Verifying it turns out that: > 1) --no-print-directory and -s make flags must be passed before -C flag, > The error was not visible because errors were suppressed with > '2>/dev/null' > 2) backquotes don't evaluate the expression they sorround but become part > of the string they sorround and get assigned to the variable > > To fix this let's move --no-print-directory right after $(MAKE) and > use $(shell ) instead of backquotes. > > Signed-off-by: Giulio Benetti What is this fixing exactly? Do you have a specific problem that this fixes? Or is this just fixing the fact that LINUX_VERSION_PROBED contains `a very long command` instead of the result of the command itself? Indeed, switching back to $(shell ...) like you're proposing would result in basically backporting: commit 28f57bb863ba48df054cec0057c844bf23d5969f Author: Arnout Vandecappelle Date: Sun Jul 12 16:35:27 2015 +0200 linux: use backtick instead of $(shell ...) make function Verified that LINUX_VERSION_PROBED is only used in "-quoted commands (actually, usually it's not quoted). Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni which is not desirable, especially if you don't have a good justification of why the current situation doesn't work. So for now, I'll mark as Rejected, but if you have a good justification, you can resend with a better commit log with this justification. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From angelo at amarulasolutions.com Tue Feb 7 14:29:54 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:29:54 +0100 Subject: [Buildroot] [PATCH v5 00/12] Extend Qt6 configuration Message-ID: <20230207143006.2681335-1-angelo@amarulasolutions.com> This series is an attempt to revamp the QT6 series from Jesse Van Gavere to be included mainline. It reworks a bit of things we discussed during the developer days in Bruxelles. Angelo Compagnucci (4): package/qt6/qt6base: add support for widgets package/qt6/qt6base: add support for widgets gtk backend package/qt6/qt6base: add opengl support package/qt6/qt6base: add QPA backend selection Jesse Van Gavere (8): package/qt6/qt6base: add support for gui module package/qt6/qt6base: add support for gui module fontconfig/harfbuzz package/qt6/qt6base: Add support for gui module jpeg/png/gif image format package/qt6/qt6base: add support for gui module tslib package/qt6/qt6base: add support for gui module libinput package/qt6/qt6base: add support for gui module kms package/qt6/qt6base: add support for gui module printsupport/cups package/qt6/qt6base: add support for building examples package/qt6/Config.in | 5 + package/qt6/qt6base/Config.in | 161 +++++++++++++++++++++++++++++++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 150 ++++++++++++++++++++++++++++ 4 files changed, 317 insertions(+) -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:29:55 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:29:55 +0100 Subject: [Buildroot] [PATCH v5 01/12] package/qt6/qt6base: add support for gui module In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-2-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index e8357a675c..03e138b8e1 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,12 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_GUI + bool "gui module" + select BR2_PACKAGE_FREETYPE + help + This option enables the Qt6Gui library. + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 43ab642b6c..38479dc106 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -144,6 +144,14 @@ else QT6BASE_CONF_OPTS += -DFEATURE_glib=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) +QT6BASE_CONF_OPTS += -DFEATURE_gui=ON -DFEATURE_freetype=ON -DINPUT_opengl=no -DFEATURE_vulkan=OFF +QT6BASE_DEPENDENCIES += freetype + +else +QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:29:56 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:29:56 +0100 Subject: [Buildroot] [PATCH v5 02/12] package/qt6/qt6base: add support for fontconfig/harfbuzz In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-3-angelo@amarulasolutions.com> From: Jesse Van Gavere Additionally the harfbuzz license file is added and the hash for this is also added to the hash file. Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 21 +++++++++++++++++++++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 03e138b8e1..df9266ba31 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -36,6 +36,27 @@ config BR2_PACKAGE_QT6BASE_GUI help This option enables the Qt6Gui library. +if BR2_PACKAGE_QT6BASE_GUI + +config BR2_PACKAGE_QT6BASE_FONTCONFIG + bool "fontconfig support" + select BR2_PACKAGE_FONTCONFIG + help + This option enables Fontconfig and Freetype support using + the system fontconfig and freetype2 libraries. + +config BR2_PACKAGE_QT6BASE_HARFBUZZ + bool "harfbuzz support" + select BR2_PACKAGE_HARFBUZZ if \ + BR2_TOOLCHAIN_HAS_SYNC_4 && \ + BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + This option enables HarfBuzz support (either system harfbuzz + if the toolchain supports __sync for 4 bytes, or the qt + provided one which avoids this dependency by using QAtomic). + +endif + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 0c722ccded..dda7ff61c8 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,6 @@ # Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 sha256 a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d qtbase-everywhere-src-6.4.2.tar.xz +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 38479dc106..d1e409f35c 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -148,6 +148,29 @@ ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) QT6BASE_CONF_OPTS += -DFEATURE_gui=ON -DFEATURE_freetype=ON -DINPUT_opengl=no -DFEATURE_vulkan=OFF QT6BASE_DEPENDENCIES += freetype +ifeq ($(BR2_PACKAGE_QT6BASE_HARFBUZZ),y) +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=ON +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y) +# system harfbuzz in case __sync for 4 bytes is supported +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=OFF +QT6BASE_DEPENDENCIES += harfbuzz +else #BR2_TOOLCHAIN_HAS_SYNC_4 +# qt harfbuzz otherwise (using QAtomic instead) +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=ON +QT6BASE_LICENSE += , MIT (harfbuzz) +QT6BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON +QT6BASE_DEPENDENCIES += fontconfig +else +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:29:57 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:29:57 +0100 Subject: [Buildroot] [PATCH v5 03/12] package/qt6/qt6base: Add support for jpeg/png/gif image format In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-4-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 19 +++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index df9266ba31..aec9e6d00a 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -55,6 +55,25 @@ config BR2_PACKAGE_QT6BASE_HARFBUZZ if the toolchain supports __sync for 4 bytes, or the qt provided one which avoids this dependency by using QAtomic). +config BR2_PACKAGE_QT6BASE_GIF + bool "GIF support" + help + This compiles and installs the plugin for GIF reading support. + +config BR2_PACKAGE_QT6BASE_JPEG + bool "JPEG support" + select BR2_PACKAGE_JPEG + help + This option enables JPEG support using the system libjpeg + library. + +config BR2_PACKAGE_QT6BASE_PNG + bool "PNG support" + select BR2_PACKAGE_LIBPNG + help + This option enables PNG support using the system libpng + library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index d1e409f35c..0060a4a3fe 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -164,6 +164,26 @@ else QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PNG),y) +QT6BASE_CONF_OPTS += -DFEATURE_png=ON -DFEATURE_system_png=ON +QT6BASE_DEPENDENCIES += libpng +else +QT6BASE_CONF_OPTS += -DFEATURE_png=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_GIF),y) +QT6BASE_CONF_OPTS += -DFEATURE_gif=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_gif=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_JPEG),y) +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=ON +QT6BASE_DEPENDENCIES += jpeg +else +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:29:59 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:29:59 +0100 Subject: [Buildroot] [PATCH v5 05/12] package/qt6/qt6base: add support for widgets gtk backend In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-6-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 9a1c3b4b43..bc2202fb2d 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -219,6 +219,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF endif +# only enable gtk support if libgtk3 X11 backend is enabled +ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy) +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=ON +QT6BASE_DEPENDENCIES += libgtk3 +else +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:29:58 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:29:58 +0100 Subject: [Buildroot] [PATCH v5 04/12] package/qt6/qt6base: add support for widgets In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-5-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 23 +++++++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 28 ++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index aec9e6d00a..0332783500 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -38,6 +38,29 @@ config BR2_PACKAGE_QT6BASE_GUI if BR2_PACKAGE_QT6BASE_GUI +config BR2_PACKAGE_QT6BASE_WIDGETS + bool "widgets module" + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT6BASE_XCB + help + This option enables the Qt6Widgets library. + +config BR2_PACKAGE_QT6BASE_LINUXFB + bool "linuxfb support" + +config BR2_PACKAGE_QT6BASE_XCB + bool "X.org XCB support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_IMAGE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_LIBXKBCOMMON + +comment "X.org XCB backend available if X.org is enabled" + depends on !BR2_PACKAGE_XORG7 + config BR2_PACKAGE_QT6BASE_FONTCONFIG bool "fontconfig support" select BR2_PACKAGE_FONTCONFIG diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 0060a4a3fe..9a1c3b4b43 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -191,6 +191,34 @@ else QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON + +ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_xcb=ON \ + -DFEATURE_xcb_xlib=ON \ + -DFEATURE_xkbcommon=ON \ + -DFEATURE_xkbcommon_x11=ON +QT6BASE_DEPENDENCIES += \ + libxcb \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xlib_libX11 \ + libxkbcommon +QT6BASE_DEPENDENCIES += xlib_libXext +else +QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:00 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:00 +0100 Subject: [Buildroot] [PATCH v5 06/12] package/qt6/qt6base: add opengl support In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-7-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/qt6/Config.in | 5 ++++ package/qt6/qt6base/Config.in | 46 ++++++++++++++++++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 17 +++++++++++++ 3 files changed, 68 insertions(+) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index b0cc008df5..655fa8392a 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -12,6 +12,11 @@ config BR2_PACKAGE_QT6_ARCH_SUPPORTS default y if BR2_sparc64 depends on BR2_USE_MMU +config BR2_PACKAGE_QT6_GL_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + comment "qt6 needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, host gcc >= 8" depends on !BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT6_ARCH_SUPPORTS diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 0332783500..732b81abe3 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -61,6 +61,52 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_OPENGL + bool "OpenGL support" + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + help + This option enables OpenGL support. + +comment "OpenGL support needs an OpenGL-capable backend" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS + +if BR2_PACKAGE_QT6BASE_OPENGL + +choice + prompt "OpenGL API" + help + Select OpenGL API. + +config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP + bool "Desktop OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL + help + Use desktop OpenGL. + +config BR2_PACKAGE_QT6BASE_OPENGL_ES2 + bool "OpenGL ES 2.0+" + depends on BR2_PACKAGE_HAS_LIBGLES + help + Use OpenGL ES 2.0 and later versions. + +endchoice + +config BR2_PACKAGE_QT6BASE_OPENGL_LIB + bool "opengl module" + select BR2_PACKAGE_QT6BASE_WIDGETS + help + This option enables the Qt6OpenGL library. This library + includes OpenGL support classes provided to ease porting + from Qt 4.x. + +config BR2_PACKAGE_QT6BASE_EGLFS + bool "eglfs support" + default y + depends on BR2_PACKAGE_HAS_LIBGBM + select BR2_PACKAGE_QT6BASE_OPENGL + +endif + config BR2_PACKAGE_QT6BASE_FONTCONFIG bool "fontconfig support" select BR2_PACKAGE_FONTCONFIG diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index bc2202fb2d..bfa44ae74c 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -231,6 +231,23 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) +QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON +QT6BASE_DEPENDENCIES += libegl +else +QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON +QT6BASE_DEPENDENCIES += libgl +else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON +QT6BASE_DEPENDENCIES += libgles +else +QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:01 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:01 +0100 Subject: [Buildroot] [PATCH v5 07/12] package/qt6/qt6base: add QPA backend selection In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-8-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 18 ++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 3 +++ 2 files changed, 21 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 732b81abe3..0f1c9fccd2 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -33,6 +33,11 @@ config BR2_PACKAGE_QT6BASE_DBUS config BR2_PACKAGE_QT6BASE_GUI bool "gui module" select BR2_PACKAGE_FREETYPE + # At least one graphic backend must be enabled, so enable + # linuxfb if nothing is enabled. + select BR2_PACKAGE_QT6BASE_LINUXFB if \ + !BR2_PACKAGE_QT6BASE_XCB && \ + !BR2_PACKAGE_QT6BASE_EGLFS help This option enables the Qt6Gui library. @@ -61,6 +66,19 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_DEFAULT_QPA + string "Default graphical platform" + help + Choose the default platform abstraction to use for graphical + applications (e.g xcb, linuxfb, eglfs, ...). If this is + empty, the default for your architecture will be used + (usually this is eglfs). + + You can get a list of supported platforms by running a Qt + application with the option "-platform help" on your + target. You can choose a different platform at runtime with + the -platform option. + config BR2_PACKAGE_QT6BASE_OPENGL bool "OpenGL support" depends on BR2_PACKAGE_QT6_GL_SUPPORTS diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index bfa44ae74c..41c7a8b350 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -252,6 +252,9 @@ else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif +QT6BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT6BASE_DEFAULT_QPA)) +QT6BASE_CONF_OPTS += $(if $(QT6BASE_DEFAULT_QPA),-DQT_QPA_DEFAULT_PLATFORM=$(QT6BASE_DEFAULT_QPA)) + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:03 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:03 +0100 Subject: [Buildroot] [PATCH v5 09/12] package/qt6/qt6base: add support for libinput In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-10-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index c878a2e2b6..be17b63c6a 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -231,6 +231,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_LIBINPUT),y) +QT6BASE_CONF_OPTS += -DFEATURE_libinput=ON +QT6BASE_DEPENDENCIES += libinput +else +QT6BASE_CONF_OPTS += -DFEATURE_libinput=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON QT6BASE_DEPENDENCIES += tslib -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:02 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:02 +0100 Subject: [Buildroot] [PATCH v5 08/12] package/qt6/qt6base: add support for tslib In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-9-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 0f1c9fccd2..dbf9c93123 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -224,6 +224,12 @@ config BR2_PACKAGE_QT6BASE_TEST help This options enables the Qt6Test library. +config BR2_PACKAGE_QT6BASE_TSLIB + bool "Enable Tslib support" + select BR2_PACKAGE_TSLIB + help + This options enables the Tslib plugin + config BR2_PACKAGE_QT6BASE_XML bool "XML module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 41c7a8b350..c878a2e2b6 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -231,6 +231,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) +QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON +QT6BASE_DEPENDENCIES += tslib +else +QT6BASE_CONF_OPTS += -DFEATURE_tslib=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON QT6BASE_DEPENDENCIES += libegl -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:04 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:04 +0100 Subject: [Buildroot] [PATCH v5 10/12] package/qt6/qt6base: add support for kms In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-11-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index be17b63c6a..8830e15388 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -184,6 +184,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT6BASE_CONF_OPTS += -DFEATURE_kms=ON +QT6BASE_DEPENDENCIES += libdrm +else +QT6BASE_CONF_OPTS += -DFEATURE_kms=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:05 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:05 +0100 Subject: [Buildroot] [PATCH v5 11/12] package/qt6/qt6base: add support for printsupport/cups In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-12-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 4 ++++ package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index dbf9c93123..cb2d7d34c2 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -168,6 +168,10 @@ config BR2_PACKAGE_QT6BASE_NETWORK help This options enables the Qt6Network library. +config BR2_PACKAGE_QT6BASE_PRINTSUPPORT + depends on BR2_PACKAGE_QT6BASE_WIDGETS + def_bool y + config BR2_PACKAGE_QT6BASE_SQL bool "sql module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 8830e15388..9f82cfc276 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -184,6 +184,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT), y) +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON +ifeq ($(BR2_PACKAGE_CUPS), y) +QT6BASE_CONF_OPTS += -DFEATURE_cups=ON +QT6BASE_DEPENDENCIES += cups +else +QT6BASE_CONF_OPTS += -DFEATURE_cups=OFF +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF +endif + ifeq ($(BR2_PACKAGE_LIBDRM),y) QT6BASE_CONF_OPTS += -DFEATURE_kms=ON QT6BASE_DEPENDENCIES += libdrm -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 14:30:06 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 15:30:06 +0100 Subject: [Buildroot] [PATCH v5 12/12] package/qt6/qt6base: add support for building examples In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> Message-ID: <20230207143006.2681335-13-angelo@amarulasolutions.com> From: Jesse Van Gavere The select option makes the default examples set to actually compile. Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 18 ++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index cb2d7d34c2..365a8cca82 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,24 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_EXAMPLES + bool "Compile and install examples " + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_QT6BASE_DBUS + select BR2_PACKAGE_QT6BASE_NETWORK + select BR2_PACKAGE_QT6BASE_XML + select BR2_PACKAGE_QT6BASE_DBUS + select BR2_PACKAGE_QT6BASE_GUI + select BR2_PACKAGE_QT6BASE_WIDGETS + select BR2_PACKAGE_QT6BASE_OPENGL + select BR2_PACKAGE_QT6BASE_OPENGL_LIB + select BR2_PACKAGE_QT6BASE_CONCURRENT + help + If unsure, say N. + +comment "Building examples needs OpenGL/DBus support" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS || !BR2_PACKAGE_DBUS + config BR2_PACKAGE_QT6BASE_GUI bool "gui module" select BR2_PACKAGE_FREETYPE diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 9f82cfc276..0e72485d88 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -313,6 +313,12 @@ QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EXAMPLES),y) +QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=ON +else +QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_NETWORK),y) QT6BASE_CONF_OPTS += -DFEATURE_network=ON else -- 2.25.1 From arnout at mind.be Tue Feb 7 15:03:27 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 16:03:27 +0100 Subject: [Buildroot] [git commit] package/urandom-scripts: actually credit seed files via seedrng Message-ID: <20230207150345.493D3841CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a6f9d2516820c296a8af788b259ca96926cd60d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, Busybox 1.36.0 contains SeedRNG, a tiny program meant to be called at startup and shutdown (and at arbitrary other points in between if desired). Note that initially, the way seedrng was included in busybox broke things quite severely, but now it's been reverted to a reasonably acceptable version. This is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. Because seedrng is part of busybox, urandom-scripts now depends on BR2_PACKAGE_BUSYBOX. This can be removed again if later we add a standalone seedrng package. Add a decent explanation to the init script about the need for a persistent directory to make this actually work. Signed-off-by: Jason A. Donenfeld [Arnout: - Remove busybox patch, it's now part of busybox 1.36.0. - Depend on busybox. - Fix shellcheck errors. - Use DAEMON and SEEDRNG_ARGS. - Don't bother with "seed_dir" and "skip_credit" variables. - Rename to S20seedrng. ] Signed-off-by: Arnout Vandecappelle --- package/urandom-scripts/Config.in | 5 +-- package/urandom-scripts/S20seedrng | 40 +++++++++++++++++ package/urandom-scripts/S20urandom | 70 ------------------------------ package/urandom-scripts/urandom-scripts.mk | 4 +- 4 files changed, 43 insertions(+), 76 deletions(-) diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in index 987e442e22..6b4a609f95 100644 --- a/package/urandom-scripts/Config.in +++ b/package/urandom-scripts/Config.in @@ -1,10 +1,7 @@ config BR2_PACKAGE_URANDOM_SCRIPTS bool "urandom-initscripts" default y if BR2_PACKAGE_INITSCRIPTS + depends on BR2_PACKAGE_BUSYBOX 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/S20seedrng b/package/urandom-scripts/S20seedrng new file mode 100644 index 0000000000..0fea0bea83 --- /dev/null +++ b/package/urandom-scripts/S20seedrng @@ -0,0 +1,40 @@ +#! /bin/sh +# +# Preserve the random seed between reboots. See urandom(4). +# +# This script can be called multiple times during operation (e.g. with +# "reload" argument) to refresh the seed. + +# The following arguments can be added to SEEDRNG_ARGS in +# /etc/default/seedrng: +# --seed-dir=/path/to/seed/directory +# Path to the directory where the seed and the lock files are stored. +# for optimal operation, this should be a persistent, writeable +# location. Default is /var/lib/seedrng +# +# --skip-credit +# 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. +# +# Example: +# SEEDRNG_ARGS="--seed-dir=/data/seedrng --skip-credit" +# + +DAEMON="seedrng" +SEEDRNG_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +case "$1" in + start|stop|restart|reload) + # Never fail, as this isn't worth making a fuss + # over if it doesn't go as planned. + # shellcheck disable=SC2086 # we need the word splitting + seedrng $SEEDRNG_ARGS || true;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom deleted file mode 100644 index 6c6aea9eee..0000000000 --- a/package/urandom-scripts/S20urandom +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/sh -# -# 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" - -# 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() { - [ -f "$URANDOM_SEED" ] || return 0 - 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;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 2c09728c46..32f3e09343 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -5,8 +5,8 @@ ################################################################################ define URANDOM_SCRIPTS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ - $(TARGET_DIR)/etc/init.d/S20urandom + $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20seedrng \ + $(TARGET_DIR)/etc/init.d/S20seedrng endef $(eval $(generic-package)) From arnout at mind.be Tue Feb 7 15:06:16 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 16:06:16 +0100 Subject: [Buildroot] [PATCH v5] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220420170326.1901572-1-Jason@zx2c4.com> References: <20220420170326.1901572-1-Jason@zx2c4.com> Message-ID: On 20/04/2022 19:03, Jason A. Donenfeld wrote: > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, Busybox now contains SeedRNG, a > tiny program meant to be called at startup and shutdown (and at > arbitrary other points in between if desired). > > Since this is currently in Busybox's git tree, this commit adds it as a > patch to the Busybox package. Then, it wires the init script up to call > it. > > This is a significant improvement over the current init script, which > doesn't credit entropy and whose hashing in shell scripts is sort of > fragile. > > NOTE NOTE NOTE: While I've added the patch to the Busybox package > directory, I don't really know how to wire this up and what to do about > the various config entries. I was hoping that a Buildroot maintainer > might have a better idea of the best way to do this, and could just take > this patch as a starting point for whatever the real commit winds up > being. > > Signed-off-by: Jason A. Donenfeld Applied to master, after some reworking and heavily rewriting the commit message, thanks. package/urandom-scripts: actually credit seed files via seedrng The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, Busybox 1.36.0 contains SeedRNG, a tiny program meant to be called at startup and shutdown (and at arbitrary other points in between if desired). Note that initially, the way seedrng was included in busybox broke things quite severely, but now it's been reverted to a reasonably acceptable version. This is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. Because seedrng is part of busybox, urandom-scripts now depends on BR2_PACKAGE_BUSYBOX. This can be removed again if later we add a standalone seedrng package. Add a decent explanation to the init script about the need for a persistent directory to make this actually work. Signed-off-by: Jason A. Donenfeld [Arnout: - Remove busybox patch, it's now part of busybox 1.36.0. - Depend on busybox. - Fix shellcheck errors. - Use DAEMON and SEEDRNG_ARGS. - Don't bother with "seed_dir" and "skip_credit" variables. - Rename to S20seedrng. ] Signed-off-by: Arnout Vandecappelle Regards, Arnout > --- > Changes v4->v5: > - SeedRNG is now part of Busybox, so we don't need to carry the source > in-tree here, which was the primary objection to earlier versions. > > ...eedRNG-utility-for-kernel-RNG-seed-f.patch | 309 ++++++++++++++++++ > package/urandom-scripts/Config.in | 4 - > package/urandom-scripts/S20urandom | 78 ++--- > 3 files changed, 330 insertions(+), 61 deletions(-) > create mode 100644 package/busybox/0003-seedrng-import-SeedRNG-utility-for-kernel-RNG-seed-f.patch > [snip] From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit] package/tl-expected: new package Message-ID: <20230207151850.16E9384254@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ffbc3a9cb9d4386f6ae171207f7b85ef182e8a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/tl-expected/Config.in | 12 ++++++++++++ package/tl-expected/tl-expected.hash | 3 +++ package/tl-expected/tl-expected.mk | 20 ++++++++++++++++++++ 5 files changed, 37 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 9cc080f7a4..220a326adc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2790,6 +2790,7 @@ N: TIAN Yuanhao F: package/cli11/ F: package/open-isns/ F: package/termcolor/ +F: package/tl-expected/ N: Tan En De F: package/libkcapi/ diff --git a/package/Config.in b/package/Config.in index e1a1b153b1..fa0713c311 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2132,6 +2132,7 @@ endif source "package/startup-notification/Config.in" source "package/tbb/Config.in" source "package/tinycbor/Config.in" + source "package/tl-expected/Config.in" source "package/tz/Config.in" source "package/tzdata/Config.in" source "package/uvw/Config.in" diff --git a/package/tl-expected/Config.in b/package/tl-expected/Config.in new file mode 100644 index 0000000000..92758ffee5 --- /dev/null +++ b/package/tl-expected/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TL_EXPECTED + bool "tl-expected" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + C++11/14/17 std::expected with functional-style extensions and + reference support. + + https://github.com/TartanLlama/expected + +comment "tl-expected needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/tl-expected/tl-expected.hash b/package/tl-expected/tl-expected.hash new file mode 100644 index 0000000000..e5c9cc2a3e --- /dev/null +++ b/package/tl-expected/tl-expected.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 2611769546cedcaef233ef587e71420d1f079a794eb7bb19b888dedf991ace7c tl-expected-v1.0.0-br1.tar.gz +sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 COPYING diff --git a/package/tl-expected/tl-expected.mk b/package/tl-expected/tl-expected.mk new file mode 100644 index 0000000000..8d62c75fea --- /dev/null +++ b/package/tl-expected/tl-expected.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# tl-expected +# +################################################################################ + +TL_EXPECTED_VERSION = v1.0.0 +TL_EXPECTED_SITE = https://github.com/TartanLlama/expected +TL_EXPECTED_SITE_METHOD = git +TL_EXPECTED_GIT_SUBMODULES = YES +TL_EXPECTED_LICENSE = CC0-1.0 +TL_EXPECTED_LICENSE_FILES = COPYING +TL_EXPECTED_INSTALL_STAGING = YES +TL_EXPECTED_INSTALL_TARGET = NO +TL_EXPECTED_CONF_OPTS = \ + -DCMAKE_MODULE_PATH=$(TL_EXPECTED_DIR)/cmake/tl-cmake \ + -DEXPECTED_ENABLE_TESTS=OFF \ + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit] package/termcolor: new package Message-ID: <20230207151850.0951F841CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e4402d4efb86256a3cff9c17c03f7300e427e1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/termcolor/Config.in | 12 ++++++++++++ package/termcolor/termcolor.hash | 3 +++ package/termcolor/termcolor.mk | 14 ++++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 830dab56f0..9cc080f7a4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2789,6 +2789,7 @@ F: package/most/ N: TIAN Yuanhao F: package/cli11/ F: package/open-isns/ +F: package/termcolor/ N: Tan En De F: package/libkcapi/ diff --git a/package/Config.in b/package/Config.in index 3773901552..e1a1b153b1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2176,6 +2176,7 @@ menu "Text and terminal handling" source "package/readline/Config.in" source "package/slang/Config.in" source "package/tclap/Config.in" + source "package/termcolor/Config.in" source "package/utf8proc/Config.in" endmenu diff --git a/package/termcolor/Config.in b/package/termcolor/Config.in new file mode 100644 index 0000000000..979ad61d81 --- /dev/null +++ b/package/termcolor/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TERMCOLOR + bool "termcolor" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + Termcolor is a header-only C++ library for printing colored + messages to the terminal. + + https://github.com/ikalnytskyi/termcolor + +comment "termcolor needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/termcolor/termcolor.hash b/package/termcolor/termcolor.hash new file mode 100644 index 0000000000..dede06c9b0 --- /dev/null +++ b/package/termcolor/termcolor.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 435994c32557674469404cb1527c283fdcf45746f7df75fd2996bb200d6a759f termcolor-2.1.0.tar.gz +sha256 bab0f53c36b248df22e2298ddf9eeea14b28783f187fcbff6a38f2c47b3a3a7d LICENSE diff --git a/package/termcolor/termcolor.mk b/package/termcolor/termcolor.mk new file mode 100644 index 0000000000..0374ce8b73 --- /dev/null +++ b/package/termcolor/termcolor.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# termcolor +# +################################################################################ + +TERMCOLOR_VERSION = 2.1.0 +TERMCOLOR_SITE = $(call github,ikalnytskyi,termcolor,v$(TERMCOLOR_VERSION)) +TERMCOLOR_LICENSE = BSD-3-Clause +TERMCOLOR_LICENSE_FILES = LICENSE +TERMCOLOR_INSTALL_STAGING = YES +TERMCOLOR_INSTALL_TARGET = NO + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit] package/cli11: new package Message-ID: <20230207151849.EFEFD84252@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f25b760186b72d2224d7087324ca5f2baeafb8b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/cli11/Config.in | 13 +++++++++++++ package/cli11/cli11.hash | 3 +++ package/cli11/cli11.mk | 15 +++++++++++++++ 5 files changed, 33 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8dde37bd67..830dab56f0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2787,6 +2787,7 @@ N: Sven Oliver Moll F: package/most/ N: TIAN Yuanhao +F: package/cli11/ F: package/open-isns/ N: Tan En De diff --git a/package/Config.in b/package/Config.in index b5418c56f6..3773901552 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2150,6 +2150,7 @@ endmenu menu "Text and terminal handling" source "package/augeas/Config.in" + source "package/cli11/Config.in" source "package/docopt-cpp/Config.in" source "package/enchant/Config.in" source "package/fmt/Config.in" diff --git a/package/cli11/Config.in b/package/cli11/Config.in new file mode 100644 index 0000000000..87db9ac8f7 --- /dev/null +++ b/package/cli11/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_CLI11 + bool "cli11" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + CLI11 is a command line parser for C++11 and beyond that + provides a rich feature set with a simple and intuitive + interface. + + https://github.com/CLIUtils/CLI11 + +comment "cli11 needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/cli11/cli11.hash b/package/cli11/cli11.hash new file mode 100644 index 0000000000..12e5b4fb55 --- /dev/null +++ b/package/cli11/cli11.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 378da73d2d1d9a7b82ad6ed2b5bda3e7bc7093c4034a1d680a2e009eb067e7b2 cli11-2.3.1.tar.gz +sha256 89022151dbf5827a22430557ef2f8a75808dd25fa1e9a12709ef5421d363e66d LICENSE diff --git a/package/cli11/cli11.mk b/package/cli11/cli11.mk new file mode 100644 index 0000000000..b02bd4478f --- /dev/null +++ b/package/cli11/cli11.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# cli11 +# +################################################################################ + +CLI11_VERSION = 2.3.1 +CLI11_SITE = $(call github,CLIUtils,CLI11,v$(CLI11_VERSION)) +CLI11_LICENSE = BSD-3-Clause +CLI11_LICENSE_FILES = LICENSE +CLI11_INSTALL_STAGING = YES +CLI11_INSTALL_TARGET = NO +CLI11_CONF_OPTS = -DCLI11_BUILD_DOCS=OFF -DCLI11_BUILD_EXAMPLES=OFF + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit] package/reproc: new package Message-ID: <20230207151850.339DA841CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26dd70e954a7c9142b078837ab1bbfad54d0e5cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/reproc/Config.in | 14 ++++++++++++++ package/reproc/reproc.hash | 3 +++ package/reproc/reproc.mk | 17 +++++++++++++++++ 5 files changed, 36 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e8ddad71cd..d7c4d03c4c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2790,6 +2790,7 @@ N: TIAN Yuanhao F: package/cli11/ F: package/libsolv/ F: package/open-isns/ +F: package/reproc/ F: package/termcolor/ F: package/tl-expected/ diff --git a/package/Config.in b/package/Config.in index 6ca4c61959..06d0a05854 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2126,6 +2126,7 @@ endif source "package/protozero/Config.in" source "package/qhull/Config.in" source "package/qlibc/Config.in" + source "package/reproc/Config.in" source "package/riemann-c-client/Config.in" source "package/shapelib/Config.in" source "package/skalibs/Config.in" diff --git a/package/reproc/Config.in b/package/reproc/Config.in new file mode 100644 index 0000000000..a4e9c893b1 --- /dev/null +++ b/package/reproc/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_REPROC + bool "reproc" + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # uses wchar_t + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + help + reproc is a cross-platform C/C++ library that simplifies + starting, stopping and communicating with external programs. + + https://github.com/DaanDeMeyer/reproc + +comment "reproc needs a toolchain w/ threads, wchar" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/reproc/reproc.hash b/package/reproc/reproc.hash new file mode 100644 index 0000000000..6da6d0a0bb --- /dev/null +++ b/package/reproc/reproc.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 55c780f7faa5c8cabd83ebbb84b68e5e0e09732de70a129f6b3c801e905415dd reproc-14.2.4.tar.gz +sha256 8f91afbe266bebac2cf1b220e0e67ace4cb9a97d2b21940abef20eb6691cfa91 LICENSE diff --git a/package/reproc/reproc.mk b/package/reproc/reproc.mk new file mode 100644 index 0000000000..3167911c4d --- /dev/null +++ b/package/reproc/reproc.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# reproc +# +################################################################################ + +REPROC_VERSION = 14.2.4 +REPROC_SITE = $(call github,DaanDeMeyer,reproc,v$(REPROC_VERSION)) +REPROC_LICENSE = MIT +REPROC_LICENSE_FILES = LICENSE +REPROC_INSTALL_STAGING = YES + +ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),yy) # C++11 +REPROC_CONF_OPTS += -DREPROC++=ON +endif + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit] package/libsolv: new package Message-ID: <20230207151850.2491784255@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93ce3c1be0753189d6af3ee9968b935037519c25 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Required by micromamba. Signed-off-by: TIAN Yuanhao [Thomas: - rework shared/static lib handling - don't pass ENABLE_CONDA=ON based on BR2_PACKAGE_MICROMAMBA=y as it's weird that a dependency does something different depending on which of its reverse dependencies is enabled] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libsolv/Config.in | 9 +++++++++ package/libsolv/libsolv.hash | 3 +++ package/libsolv/libsolv.mk | 27 +++++++++++++++++++++++++++ 5 files changed, 41 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 220a326adc..e8ddad71cd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2788,6 +2788,7 @@ F: package/most/ N: TIAN Yuanhao F: package/cli11/ +F: package/libsolv/ F: package/open-isns/ F: package/termcolor/ F: package/tl-expected/ diff --git a/package/Config.in b/package/Config.in index fa0713c311..6ca4c61959 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2085,6 +2085,7 @@ menu "Other" source "package/libshdata/Config.in" source "package/libsigc/Config.in" source "package/libsigsegv/Config.in" + source "package/libsolv/Config.in" source "package/libspatialindex/Config.in" source "package/libtalloc/Config.in" source "package/libtasn1/Config.in" diff --git a/package/libsolv/Config.in b/package/libsolv/Config.in new file mode 100644 index 0000000000..1415d2bc2b --- /dev/null +++ b/package/libsolv/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBSOLV + bool "libsolv" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_ZLIB + help + A free package dependency solver using a satisfiability + algorithm. + + https://github.com/openSUSE/libsolv diff --git a/package/libsolv/libsolv.hash b/package/libsolv/libsolv.hash new file mode 100644 index 0000000000..162e46e54d --- /dev/null +++ b/package/libsolv/libsolv.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 968aef452b5493751fa0168cd58745a77c755e202a43fe8d549d791eb16034d5 libsolv-0.7.22.tar.gz +sha256 57f15acfb29fbef7749779e096a5885c60b716633e34484a21bb717554c0198f LICENSE.BSD diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk new file mode 100644 index 0000000000..144ce68a83 --- /dev/null +++ b/package/libsolv/libsolv.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# libsolv +# +################################################################################ + +LIBSOLV_VERSION = 0.7.22 +LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) +LIBSOLV_LICENSE = BSD-3-Clause +LIBSOLV_LICENSE_FILES = LICENSE.BSD +LIBSOLV_INSTALL_STAGING = YES +LIBSOLV_DEPENDENCIES = zlib +LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON +else +LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON +endif + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON +else +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON +endif + +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Tue Feb 7 15:22:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 16:22:46 +0100 Subject: [Buildroot] [PATCH] package/libcamera-apps: enable LIBAV only if libdrm is present In-Reply-To: <20230207085445.1651226-1-marcus.folkesson@gmail.com> References: <20230207085445.1651226-1-marcus.folkesson@gmail.com> Message-ID: <20230207152246.GG4124@scaer> Marcus, All, On 2023-02-07 09:54 +0100, Marcus Folkesson spake thusly: > Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps > does enable LIBAV by default which depends on libdrm. > > Fixes: > - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ > > /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory > 13 | #include > | ^~~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: Marcus Folkesson > --- > package/libcamera-apps/libcamera-apps.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk > index 290ee9a026..385c65136e 100644 > --- a/package/libcamera-apps/libcamera-apps.mk > +++ b/package/libcamera-apps/libcamera-apps.mk > @@ -25,8 +25,10 @@ LIBCAMERA_APPS_CONF_OPTS = \ > ifeq ($(BR2_PACKAGE_LIBDRM),y) > LIBCAMERA_APPS_DEPENDENCIES += libdrm > LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 But doesn't ENABLE_LIBAV also need a few libraries? From libcamera-apps' encoder/CMakeLists.txt: 13 if (ENABLE_LIBAV) 14 message(STATUS "Checking for libavcodec") 15 pkg_check_modules(LIBAV QUIET IMPORTED_TARGET 16 libavcodec 17 libavdevice 18 libavformat 19 libswresample 20 ) libavcodec, libavdevice, libavformat, and libswresample come with ffmpeg, so this should be added to dependencies too. Note: in fact, if the libs are not found, the feature will be silently disabled: 21 if (LIBAV_FOUND) 22 include_directories(${LIBAV_INCLUDE_DIRS}) 23 set(SRC ${SRC} libav_encoder.cpp) 24 set(TARGET_LIBS ${TARGET_LIBS} ${LIBAV_LIBRARIES}) 25 set(LIBAV_PRESENT 1) 26 message(STATUS "libavcodec found:") 27 message(STATUS " libraries: ${LIBAV_LIBRARIES}") 28 endif() 29 else() 30 message(STATUS "Omitting libavcodec") 31 endif() However, this is not clean, because we explicitly asked for a feature (enable libav suport) but it gets disabled because of missing dependencies. So, either we explicitly and unconditionally disable it, or we add the necessary dependencies. Regards, Yann E. MORIN. > else > LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 > endif > > ifeq ($(BR2_PACKAGE_XORG7),y) > -- > 2.38.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 Tue Feb 7 15:24:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 16:24:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/spirv-llvm-translator: set CMP0077 policy In-Reply-To: <20220621225209.2899559-1-james.hilliard1@gmail.com> References: <20220621225209.2899559-1-james.hilliard1@gmail.com> Message-ID: <9a3a9627-d917-1e31-9ad0-f56487187865@mind.be> On 22/06/2022 00:52, James Hilliard wrote: > Set this to the new behavior for consistency. > > Fixes: > CMake Warning (dev) at /home/buildroot/buildroot/output/per-package/host-spirv-llvm-translator/host/lib/cmake/llvm/HandleLLVMOptions.cmake:852 (option): > Policy CMP0077 is not set: option() honors normal variables. Run "cmake > --help-policy CMP0077" for policy details. Use the cmake_policy command to > set the policy and suppress this warning. > > For compatibility with older versions of CMake, option is clearing the > normal variable 'LLVM_ENABLE_EH'. > Call Stack (most recent call first): > CMakeLists.txt:53 (include) > > Signed-off-by: James Hilliard AFAIU, this change has become irrelevant with one of the two updates to spirv-llvm-translator that have been committed since this patch was sent. Therefore, I marked it as Superseded. Regards, Arnout > --- > package/spirv-llvm-translator/spirv-llvm-translator.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk > index 22f8765582..46704b3f8d 100644 > --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk > +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk > @@ -10,6 +10,7 @@ SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA > SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT > HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm > HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ > + -DCMAKE_POLICY_DEFAULT_CMP0077=NEW \ > -DLLVM_BUILD_TOOLS=ON \ > -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ > -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ From foss+buildroot at 0leil.net Tue Feb 7 15:36:20 2023 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Tue, 7 Feb 2023 16:36:20 +0100 Subject: [Buildroot] [PATCH] package/python3: use pure python UUID backend for host variant Message-ID: <20230207-host-python-libuuid-v1-1-de34da87efd8@theobroma-systems.com> From: Quentin Schulz host-python3 currently does not build if util-linux-uuid option is not enabled, failing with the following error messages: """ /usr/lib64/ccache/gcc -fPIC -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -O2 -I/home/qschulz/work/upstream/buildroot/output/host/include -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I./Include -I. -I/home/qschulz/work/upstream/buildroot/output/host/include -I/usr/local/include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1 -c /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c -o build/temp.linux-x86_64-3.11/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.o /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c: In function ?py_uuid_generate_time_safe?: /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: error: storage size of ?uui ? isn?t known 27 | uuid_t uuid; | ^~~~ /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:31:11: error: implicit declaration of function ?uuid_generate_time_safe?; did you mean ?py_uuid_generate_time_safe?? [-Werror=implicit-function-declaration] 31 | res = uuid_generate_time_safe(uuid); | ^~~~~~~~~~~~~~~~~~~~~~~ | py_uuid_generate_time_safe /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: warning: unused variable ?uuid? [-Wunused-variable] 27 | uuid_t uuid; | ^~~~ /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:47:1: warning: control reaches end of non-void function [-Wreturn-type] 47 | } | ^ cc1: some warnings being treated as errors The necessary bits to build these optional modules were not found: _dbm _gdbm _tkinter nis readline To find the necessary bits, look in setup.py in detect_modules() for the module's name. The following modules found by detect_modules() in setup.py have not been built, they are *disabled* by configure: _ctypes_test _sqlite3 _testbuffer _testcapi _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz Failed to build these modules: _uuid """ Therefore, let's disable building the _uuid extension the same way it's done for the target package since commit 0b68713aae28 ("python3: use pure python UUID backend"). Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- Only build tested with make host-python3 with raspberrypi4_defconfig configuration. --- package/python3/python3.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 219d135b3f..fb6dbf2e64 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -31,6 +31,7 @@ HOST_PYTHON3_CONF_OPTS += \ --enable-unicodedata \ --disable-test-modules \ --disable-idle3 \ + --disable-uuid \ --disable-ossaudiodev # Make sure that LD_LIBRARY_PATH overrides -rpath. --- base-commit: 26dd70e954a7c9142b078837ab1bbfad54d0e5cb change-id: 20230207-host-python-libuuid-d600d32f70ae Best regards, -- Quentin Schulz From yann.morin.1998 at free.fr Tue Feb 7 15:48:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 16:48:49 +0100 Subject: [Buildroot] [git commit] package/python3: use pure python UUID backend for host variant Message-ID: <20230207154903.D0ED584291@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b635bda5bc5ea9db15cb83390d8e3908b85c2629 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-python3 currently does not build if util-linux-uuid option is not enabled, failing with the following error messages: """ /usr/lib64/ccache/gcc -fPIC -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -O2 -I/home/qschulz/work/upstream/buildroot/output/host/include -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I./Include -I. -I/home/qschulz/work/upstream/buildroot/output/host/include -I/usr/local/include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1 -c /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c -o build/temp.linux-x86_64-3.11/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.o /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c: In function ???py_uuid_generate_time_safe???: /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: error: storage size of ???uui ??? isn???t known 27 | uuid_t uuid; | ^~~~ /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:31:11: error: implicit declaration of function ???uuid_generate_time_safe???; did you mean ???py_uuid_generate_time_safe???? [-Werror=implicit-function-declaration] 31 | res = uuid_generate_time_safe(uuid); | ^~~~~~~~~~~~~~~~~~~~~~~ | py_uuid_generate_time_safe /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: warning: unused variable ???uuid??? [-Wunused-variable] 27 | uuid_t uuid; | ^~~~ /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:47:1: warning: control reaches end of non-void function [-Wreturn-type] 47 | } | ^ cc1: some warnings being treated as errors The necessary bits to build these optional modules were not found: _dbm _gdbm _tkinter nis readline To find the necessary bits, look in setup.py in detect_modules() for the module's name. The following modules found by detect_modules() in setup.py have not been built, they are *disabled* by configure: _ctypes_test _sqlite3 _testbuffer _testcapi _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz Failed to build these modules: _uuid """ Therefore, let's disable building the _uuid extension the same way it's done for the target package since commit 0b68713aae28 ("python3: use pure python UUID backend"). Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Yann E. MORIN --- package/python3/python3.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 219d135b3f..fb6dbf2e64 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -31,6 +31,7 @@ HOST_PYTHON3_CONF_OPTS += \ --enable-unicodedata \ --disable-test-modules \ --disable-idle3 \ + --disable-uuid \ --disable-ossaudiodev # Make sure that LD_LIBRARY_PATH overrides -rpath. From yann.morin.1998 at free.fr Tue Feb 7 15:49:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 16:49:15 +0100 Subject: [Buildroot] [PATCH] package/python3: use pure python UUID backend for host variant In-Reply-To: <20230207-host-python-libuuid-v1-1-de34da87efd8@theobroma-systems.com> References: <20230207-host-python-libuuid-v1-1-de34da87efd8@theobroma-systems.com> Message-ID: <20230207154915.GH4124@scaer> Quentin, All, On 2023-02-07 16:36 +0100, Quentin Schulz spake thusly: > From: Quentin Schulz > > host-python3 currently does not build if util-linux-uuid option is not > enabled, failing with the following error messages: > """ > /usr/lib64/ccache/gcc -fPIC -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -O2 -I/home/qschulz/work/upstream/buildroot/output/host/include -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I./Include -I. -I/home/qschulz/work/upstream/buildroot/output/host/include -I/usr/local/include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1 -c /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c -o build/temp.linux-x86_64-3.11/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.o > /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c: In function ?py_uuid_generate_time_safe?: > /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: error: storage size of ?uui ? isn?t known > 27 | uuid_t uuid; > | ^~~~ > /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:31:11: error: implicit declaration of function ?uuid_generate_time_safe?; did you mean ?py_uuid_generate_time_safe?? [-Werror=implicit-function-declaration] > 31 | res = uuid_generate_time_safe(uuid); > | ^~~~~~~~~~~~~~~~~~~~~~~ > | py_uuid_generate_time_safe > /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: warning: unused variable ?uuid? [-Wunused-variable] > 27 | uuid_t uuid; > | ^~~~ > /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:47:1: warning: control reaches end of non-void function [-Wreturn-type] > 47 | } > | ^ > cc1: some warnings being treated as errors > > The necessary bits to build these optional modules were not found: > _dbm _gdbm _tkinter > nis readline > To find the necessary bits, look in setup.py in detect_modules() for the module's name. > > The following modules found by detect_modules() in setup.py have not > been built, they are *disabled* by configure: > _ctypes_test _sqlite3 _testbuffer > _testcapi _testimportmultiple _testinternalcapi > _testmultiphase _xxtestfuzz > > Failed to build these modules: > _uuid > """ > > Therefore, let's disable building the _uuid extension the same way it's > done for the target package since commit 0b68713aae28 ("python3: use > pure python UUID backend"). > > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Applied to master, thanks. Regards, Yann E. MORIN. > --- > Only build tested with make host-python3 with raspberrypi4_defconfig configuration. > --- > package/python3/python3.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python3/python3.mk b/package/python3/python3.mk > index 219d135b3f..fb6dbf2e64 100644 > --- a/package/python3/python3.mk > +++ b/package/python3/python3.mk > @@ -31,6 +31,7 @@ HOST_PYTHON3_CONF_OPTS += \ > --enable-unicodedata \ > --disable-test-modules \ > --disable-idle3 \ > + --disable-uuid \ > --disable-ossaudiodev > > # Make sure that LD_LIBRARY_PATH overrides -rpath. > > --- > base-commit: 26dd70e954a7c9142b078837ab1bbfad54d0e5cb > change-id: 20230207-host-python-libuuid-d600d32f70ae > > Best regards, > -- > Quentin Schulz > _______________________________________________ > 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 thomas.petazzoni at bootlin.com Tue Feb 7 16:03:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:03:53 +0100 Subject: [Buildroot] [PATCH/next 1/6] package/cli11: new package In-Reply-To: <20221128123418.2197-1-tianyuanhao3@163.com> References: <20221128123418.2197-1-tianyuanhao3@163.com> Message-ID: <20230207170353.1caa0546@windsurf> On Mon, 28 Nov 2022 12:34:13 +0000 TIAN Yuanhao wrote: > Required by micromamba. > > Signed-off-by: TIAN Yuanhao > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/cli11/Config.in | 13 +++++++++++++ > package/cli11/cli11.hash | 3 +++ > package/cli11/cli11.mk | 15 +++++++++++++++ > 5 files changed, 33 insertions(+) > create mode 100644 package/cli11/Config.in > create mode 100644 package/cli11/cli11.hash > create mode 100644 package/cli11/cli11.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 16:04:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:04:08 +0100 Subject: [Buildroot] [PATCH/next 2/6] package/termcolor: new package In-Reply-To: <20221128123418.2197-2-tianyuanhao3@163.com> References: <20221128123418.2197-1-tianyuanhao3@163.com> <20221128123418.2197-2-tianyuanhao3@163.com> Message-ID: <20230207170408.143c2e5c@windsurf> On Mon, 28 Nov 2022 12:34:14 +0000 TIAN Yuanhao wrote: > Required by micromamba. > > Signed-off-by: TIAN Yuanhao > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/termcolor/Config.in | 12 ++++++++++++ > package/termcolor/termcolor.hash | 3 +++ > package/termcolor/termcolor.mk | 14 ++++++++++++++ > 5 files changed, 31 insertions(+) > create mode 100644 package/termcolor/Config.in > create mode 100644 package/termcolor/termcolor.hash > create mode 100644 package/termcolor/termcolor.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 16:04:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:04:15 +0100 Subject: [Buildroot] [PATCH/next 3/6] package/tl-expected: new package In-Reply-To: <20221128123418.2197-3-tianyuanhao3@163.com> References: <20221128123418.2197-1-tianyuanhao3@163.com> <20221128123418.2197-3-tianyuanhao3@163.com> Message-ID: <20230207170415.7e528735@windsurf> On Mon, 28 Nov 2022 12:34:15 +0000 TIAN Yuanhao wrote: > Required by micromamba. > > Signed-off-by: TIAN Yuanhao > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/tl-expected/Config.in | 12 ++++++++++++ > package/tl-expected/tl-expected.hash | 3 +++ > package/tl-expected/tl-expected.mk | 20 ++++++++++++++++++++ > 5 files changed, 37 insertions(+) > create mode 100644 package/tl-expected/Config.in > create mode 100644 package/tl-expected/tl-expected.hash > create mode 100644 package/tl-expected/tl-expected.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 16:14:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:14:01 +0100 Subject: [Buildroot] [PATCH/next 4/6] package/libsolv: new package In-Reply-To: <20221128123418.2197-4-tianyuanhao3@163.com> References: <20221128123418.2197-1-tianyuanhao3@163.com> <20221128123418.2197-4-tianyuanhao3@163.com> Message-ID: <20230207171401.54d75d16@windsurf> Hello, On Mon, 28 Nov 2022 12:34:16 +0000 TIAN Yuanhao wrote: > +ifeq ($(BR2_STATIC_LIBS),y) > +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON > +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) > +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON > +endif Changed to: ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON else LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON endif ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON else LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON endif To explicitly handle all cases. > +ifeq ($(BR2_PACKAGE_MICROMAMBA),y) > +LIBSOLV_CONF_OPTS += -DENABLE_CONDA=ON > +endif This isn't really nice, as we generally don't want packages to look at their reverse dependencies to decide which features should be enabled or not. So here, I would prefer to have a BR2_PACKAGE_LIBSOLV_CONDA option, which the micromamba package can select if it needs this feature from libsolv. For now, I've dropped this part, so if we need it for micromamba, could you send a patch just adding this new option, together with the new iteration of the micromamba package? Best regards, 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 Feb 7 16:14:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:14:06 +0100 Subject: [Buildroot] [PATCH/next 5/6] package/reproc: new package In-Reply-To: <20221128123418.2197-5-tianyuanhao3@163.com> References: <20221128123418.2197-1-tianyuanhao3@163.com> <20221128123418.2197-5-tianyuanhao3@163.com> Message-ID: <20230207171406.2c0cba33@windsurf> On Mon, 28 Nov 2022 12:34:17 +0000 TIAN Yuanhao wrote: > Required by micromamba. > > Signed-off-by: TIAN Yuanhao > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/reproc/Config.in | 14 ++++++++++++++ > package/reproc/reproc.hash | 3 +++ > package/reproc/reproc.mk | 17 +++++++++++++++++ > 5 files changed, 36 insertions(+) > create mode 100644 package/reproc/Config.in > create mode 100644 package/reproc/reproc.hash > create mode 100644 package/reproc/reproc.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Tue Feb 7 16:26:05 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 17:26:05 +0100 Subject: [Buildroot] [PATCH] board/qemu: add echo for errors In-Reply-To: <20230122123645.2903470-1-cherniaev.andrei@kairo.space> References: <20230122123645.2903470-1-cherniaev.andrei@kairo.space> Message-ID: Hello Andrei, Le 22/01/2023 ? 13:36, AndreiCherniaev a ?crit?: > From: AndreiCherniaev > Your Signed-off-by is missing, so we can't apply the patch as is [1]. I'm making it as "Changes requested". Maybe a small comment explaining why you want to change the script would be great. [1] https://nightly.buildroot.org/manual.html#submitting-patches > --- > board/qemu/post-image.sh | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/board/qemu/post-image.sh b/board/qemu/post-image.sh > index 88f0413496..91d5b88b03 100755 > --- a/board/qemu/post-image.sh > +++ b/board/qemu/post-image.sh > @@ -6,8 +6,8 @@ README_FILES="${QEMU_BOARD_DIR}/*/readme.txt" > START_QEMU_SCRIPT="${BINARIES_DIR}/start-qemu.sh" > > if [[ "${DEFCONFIG_NAME}" =~ ^"qemu_*" ]]; then > - # Not a Qemu defconfig, can't test. > - exit 0 > + echo "Not a Qemu defconfig, can't test" > + exit 1 Initially exit 0 was intended to not fail the build for non qemu defconfig in gitlab-ci. But board/qemu/post-image.sh in only used by qemu defconfig so even the test doesn't seems not required anymore. > fi > > # Search for "# qemu_*_defconfig" tag in all readme.txt files. > @@ -15,8 +15,8 @@ fi > QEMU_CMD_LINE=$(sed -r ':a; /\\$/N; s/\\\n//; s/\t/ /; ta; /# '${DEFCONFIG_NAME}'$/!d; s/#.*//' ${README_FILES}) > > if [ -z "${QEMU_CMD_LINE}" ]; then > - # No Qemu cmd line found, can't test. > - exit 0 > + echo "No Qemu cmd line found, can't test" > + exit 1 > fi IIRC, some qemu defconfig was not gitlab-ready so exit 0 was here to not fail the gitlab-ci job if no qemu command line was provided. Only a build test is done in this case. Best regards, Romain > > # Remove output/images path since the script will be in From thomas.petazzoni at bootlin.com Tue Feb 7 16:26:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:26:15 +0100 Subject: [Buildroot] [PATCH/next 6/6] package/micromamba: new package In-Reply-To: <20221128123418.2197-6-tianyuanhao3@163.com> References: <20221128123418.2197-1-tianyuanhao3@163.com> <20221128123418.2197-6-tianyuanhao3@163.com> Message-ID: <20230207172615.48ac9871@windsurf> Hello, On Mon, 28 Nov 2022 12:34:18 +0000 TIAN Yuanhao wrote: > Signed-off-by: TIAN Yuanhao Thanks for this submission. Could you clarify what is the motivation for this package? Indeed having a package manager on the target feels a bit strange in the context of Buildroot. Buildroot is normally there precisely to generate a ready-to-use rootfs, not a rootfs which then downloads random stuff from the Internet. Of course, we do have npm or pip, but really their usage is not recommended. > diff --git a/package/micromamba/Config.in b/package/micromamba/Config.in > new file mode 100644 > index 0000000000..998809f452 > --- /dev/null > +++ b/package/micromamba/Config.in > @@ -0,0 +1,43 @@ > +config BR2_PACKAGE_MICROMAMBA_ARCH_SUPPORTS > + bool > + # See libmamba/include/mamba/core/context.hpp > + default y if BR2_arm && (BR2_ARM_CPU_ARMV6 || BR2_ARM_CPU_ARMV7A) > + default y if BR2_aarch64 > + default y if BR2_i386 > + default y if BR2_powerpc64 > + default y if BR2_powerpc64le > + default y if BR2_s390x > + default y if BR2_x86_64 > + depends on BR2_USE_MMU # fork() Always a bit annoying to have architecture-specific things in something that isn't hardware-related in the first place, but OK. > +config BR2_PACKAGE_MICROMAMBA > + bool "micromamba" > + depends on BR2_PACKAGE_MICROMAMBA_ARCH_SUPPORTS > + depends on BR2_USE_WCHAR # fmt, reproc libarchive also needs wchar, spdlog as well (through fmt, admittedly) > + depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem > + select BR2_PACKAGE_LIBARCHIVE > + select BR2_PACKAGE_OPENSSL > + select BR2_PACKAGE_JSON_FOR_MODERN_CPP > + select BR2_PACKAGE_YAML_CPP > + select BR2_PACKAGE_SPDLOG > + select BR2_PACKAGE_LIBCURL > + select BR2_PACKAGE_LIBSOLV > + select BR2_PACKAGE_REPROC > + select BR2_PACKAGE_TL_EXPECTED > + select BR2_PACKAGE_CLI11 > + select BR2_PACKAGE_FMT > + select BR2_PACKAGE_TERMCOLOR These select should be sorted alphabetically to look a bit nicer. > + help > + micromamba is a small, pure-C++ reimplementation of > + mamba/conda. It strives to be a full replacement for mamba and > + conda. > + > + https://github.com/mamba-org/mamba > + > +comment "micromamba needs a toolchain w/ wchar, threads, C++, gcc >= 8" > + depends on BR2_PACKAGE_MICROMAMBA_ARCH_SUPPORTS > + depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 > diff --git a/package/micromamba/micromamba.hash b/package/micromamba/micromamba.hash > new file mode 100644 > index 0000000000..e584c3bd28 > --- /dev/null > +++ b/package/micromamba/micromamba.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 7303d983b49a1a52b302ceae355af1c05afef3a07aa3ad6dd27c36d64c43f991 micromamba-1.0.0.tar.gz > +sha256 41fd98a468e39d319911bd94f4e65d6ad6a7ea66559dd5aa4112f138ff9b629a LICENSE > diff --git a/package/micromamba/micromamba.mk b/package/micromamba/micromamba.mk > new file mode 100644 > index 0000000000..188864444c > --- /dev/null > +++ b/package/micromamba/micromamba.mk > @@ -0,0 +1,43 @@ > +################################################################################ > +# > +# micromamba > +# > +################################################################################ > + > +MICROMAMBA_VERSION = 1.0.0 > +MICROMAMBA_SITE = $(call github,mamba-org,mamba,micromamba-$(MICROMAMBA_VERSION)) > +MICROMAMBA_LICENSE = BSD-3-Clause > +MICROMAMBA_LICENSE_FILES = LICENSE > +MICROMAMBA_DEPENDENCIES = \ > + $(BR2_PYTHON3_HOST_DEPENDENCY) \ > + cli11 \ > + fmt \ > + json-for-modern-cpp \ > + libarchive \ > + libcurl \ > + libsolv \ > + openssl \ > + reproc \ > + spdlog \ > + termcolor \ > + tl-expected \ > + yaml-cpp > + > +MICROMAMBA_CONF_OPTS = -DBUILD_LIBMAMBA=ON -DBUILD_MICROMAMBA=ON > + > +# See libmamba/include/mamba/core/context.hpp > +ifeq ($(BR2_ARM_CPU_ARMV6),y) > +MICROMAMBA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -D___ARM_ARCH_6__" > +else ifeq ($(BR2_ARM_CPU_ARMV7A),y) > +MICROMAMBA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -D__ARM_ARCH_7__" > +endif This is really a bug in the mamba code, because these defines are normally provided by the compiler. For example, an ARMv7 compiler defines: #define __ARM_ARCH 7 #define __ARM_ARCH_7A__ 1 So mamba could use that instead. But one could even wonder why it really matters to define a different MAMBA_PLATFORM name: #ifdef ___ARM_ARCH_6__ static const char MAMBA_PLATFORM[] = "linux-armv6l"; #elif __ARM_ARCH_7__ static const char MAMBA_PLATFORM[] = "linux-armv7l"; #else It is really crazy that this is the *only* thing that causes mamba to have an architecture dependency. Why is that even needed in the first place? > + > +ifeq ($(BR2_STATIC_LIBS),y) > +MICROMAMBA_CONF_OPTS += -DBUILD_STATIC=ON -DMICROMAMBA_LINKAGE=FULL_STATIC > +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) > +MICROMAMBA_CONF_OPTS += -DBUILD_SHARED=ON -DBUILD_STATIC=ON > +else # BR2_SHARED_LIBS > +MICROMAMBA_CONF_OPTS += -DBUILD_SHARED=ON > +endif Please pass BUILD_STATIC=OFF and BUILD_SHARED=OFF explicitly in the appropriate cases. Thanks a lot! Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Tue Feb 7 16:26:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 17:26:31 +0100 Subject: [Buildroot] [git commit] package/{rust, rust-bin}: bump to version 1.67.0 Message-ID: <20230207162647.A6C64842A1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cffe45f91bc5aed2a2a56f84e3a34b6385f70ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Link to Rust 1.67.0 announcement: https://blog.rust-lang.org/2023/01/26/Rust-1.67.0.html Signed-off-by: James Hilliard Tested-by: Sebastian Weyer Signed-off-by: Arnout Vandecappelle --- package/rust-bin/rust-bin.hash | 252 ++++++++++++++++++++--------------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index adf1799ad7..d00e6342e8 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 a1279760f91b3571733e0b0268128d143be2734916753900b5fe7b8ecc3c0900 rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 835b4e1b4d396674f7866a83b9a4f44db16fd12f01a7eaed527282b3700a9b92 rust-1.66.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc -sha256 c7349617c42274bf50f6e3662dfb4f6832a93780099c3bb510be1a5b93d04c37 rust-1.66.1-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 fc38663870f0af47a27241d980ca886c3f7d432267920deb412ac8576bef68f0 rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 2b1a6c54db49a9e62d60cc96c1768f405e0f4c59d698186bf3a28a1bb017b6b5 rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 777d3a650448c15048710282388e90d10740540f570f5d17ed4a2dbdabb89552 rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 875bb310bae7c8c1d2d228a49aa4b547608b6c807ddc9ec44bc87272c77d869b rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 89164ccf75909b3d02bdcb787e33876cad87e55ab0e6239b030b4b6631ed356a rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 e83f9fc473072db23376783595a008cdd9b2f2e9b3be109e55939392864840eb rust-1.66.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 a201aa4595ec8015662b7103b1409a4787c6d1f1d540bb68746633527d855858 rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24 rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc -sha256 520ac446f20490685cc4d73192cfbb4c9b9e55c884aa4ae2b098e3a54d891de8 rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 42afd189ef64988f64976f767a734734bccd7c71e578780e902148c98226fa29 rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 506126773af9c3dacc506776a0b2e12fe6fa0c95eaf4f4ebb5cdbd335feb83fa rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 3d21b478fbf07bd27902bdd189e6988341f0c2c0108b538f926cea3031bc8ea6 rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.asc -sha256 5282fc97111a7eafbead3463ed7bc0f3065332f21aec6a39a740157fe42f943a rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 0ebf0178bbe9c5572d1db89e190dee23aef0e2f667995abedbd66e33d0bd73ab rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 938e7442c21ea0895c44ec78fa718ea1d3abe32ed0425ed328c905e188af250e rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 bdc491f4c05669e7a3382b6bfdaeaa20e2cfa5ef553305df0e0d73729a45e6e4 rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 d75c6dc3c00d662b0d3f6ce7fde0f76057542edfbc97a20b29247842c8a711d2 rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 830285e5388081c68fac9dc955aa824a4d919b0e24eadc6e0b95b30103d79db9 rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 d720bd1e493f53797f90d83dbe6d52ecbe1ff3cae282f4b2e18c37fe92c9adf6 rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.asc -sha256 90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17 rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.asc -sha256 c4bab2d63223d0c6e63806082e30d8c38b37eefc10ee2e7380971e3012c00bca rust-std-1.66.1-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.asc -sha256 52013329eb6697d94f5dce01dd509b4b93b473c18a3a2c05d0230b9dfeab14d1 rust-std-1.66.1-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.asc -sha256 e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568 rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.asc -sha256 23f917eccaca59d4c911eb96d8ffefe86834dbcdf902c9ab6dad8558c31c4575 rust-std-1.66.1-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 70d1406e0981d5d31c1d3f85c848bba0476e0ff6203e7706f66b4d2212f01b66 rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 0fd221d4b4205ce548e83f0e7416c8332eb12b64d5a43c0b3ed61e9f7d6edf13 rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 132d6d5750a877972ebc6f23e831f2ef3077465b2ab24ca645d32ea83c496fe3 rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 533f370368ac8b6192e1450289c64544ebf9cacc38c3a52ef6c0ecded7ee6fa5 rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.asc -sha256 d7028820888d0decde047a6e77b866e690532aa09522c9a23a3fbf8780a72257 rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1 rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35 rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770 rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062 rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927 rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377 rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc -sha256 a9710727ba28955deb7fbec799faed19486c9af3c7e3088ec6659a257515ffca rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc +sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc +sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc +sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc +sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index 89009288f4..d62ce39cfc 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.66.1 +RUST_BIN_VERSION = 1.67.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 545a452bf0..2a260ca64f 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc -sha256 07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe rustc-1.66.1-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc +sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 691683b492..d14ad3a3e7 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.66.1 +RUST_VERSION = 1.67.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From arnout at mind.be Tue Feb 7 16:27:35 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 17:27:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.67.0 In-Reply-To: <20230131050319.2821287-1-james.hilliard1@gmail.com> References: <20230131050319.2821287-1-james.hilliard1@gmail.com> Message-ID: <2d7b1709-7fd8-292d-8fc8-871bcb3c2047@mind.be> On 31/01/2023 06:03, James Hilliard wrote: > Link to Rust 1.67.0 announcement: https://blog.rust-lang.org/2023/01/26/Rust-1.67.0.html > > Signed-off-by: James Hilliard Applied to master, thanks. Thank you Sebastian for testing! Regards, Arnout > --- > package/rust-bin/rust-bin.hash | 252 ++++++++++++++++----------------- > package/rust-bin/rust-bin.mk | 2 +- > package/rust/rust.hash | 6 +- > package/rust/rust.mk | 2 +- > 4 files changed, 131 insertions(+), 131 deletions(-) > [snip] From thomas.petazzoni at bootlin.com Tue Feb 7 16:31:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:31:17 +0100 Subject: [Buildroot] [PATCH 2/3] support/docker: use APT::Retries in apt-get calls to retry In-Reply-To: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> References: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> Message-ID: <20230207163119.292389-2-thomas.petazzoni@bootlin.com> snapshot.debian.org is notoriously slow, and quite often leads to timeouts when downloading packages. To give us a better chance of succeeding, let's retry 3 times before failing. Signed-off-by: Thomas Petazzoni --- support/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index de1534e77a..a16c1e3849 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -20,8 +20,8 @@ COPY apt-sources.list /etc/apt/sources.list # The container has no package lists, so need to update first RUN dpkg --add-architecture i386 && \ - apt-get update -y -RUN apt-get install -y --no-install-recommends \ + apt-get -o APT::Retries=3 update -y +RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ bc \ build-essential \ bzr \ -- 2.38.1 From thomas.petazzoni at bootlin.com Tue Feb 7 16:31:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:31:16 +0100 Subject: [Buildroot] [PATCH 1/3] support/docker: update Debian distro to a newer tag/date Message-ID: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> Signed-off-by: Thomas Petazzoni --- support/docker/Dockerfile | 2 +- support/docker/apt-sources.list | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index d775ae23e1..de1534e77a 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -6,7 +6,7 @@ # We use a specific tag for the base image *and* the corresponding date # for the repository., so do not forget to update the apt-sources.list # file that is shipped next to this Dockerfile. -FROM debian:bullseye-20210902 +FROM debian:bullseye-20230202 LABEL maintainer="Buildroot mailing list " \ vendor="Buildroot" \ diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list index 0f872fd398..849996d9f7 100644 --- a/support/docker/apt-sources.list +++ b/support/docker/apt-sources.list @@ -1,4 +1,4 @@ -# Latest just before 20210817T000000Z: -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20210902T193650Z/ bullseye-security main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main +# Latest just before 20230207T102800Z: +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20230206T092119Z/ bullseye-security main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye-updates main -- 2.38.1 From thomas.petazzoni at bootlin.com Tue Feb 7 16:31:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 17:31:18 +0100 Subject: [Buildroot] [PATCH 3/3] .gitlab-ci.yml: update Docker image to use In-Reply-To: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> References: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> Message-ID: <20230207163119.292389-3-thomas.petazzoni@bootlin.com> We have a new Docker image, updated with the new requirements from bcd15aa08aab1e8292b93995c44dc765a9801632 ("support/docker: add python3-magic"), but also with an updated Debian Bullseye installation. Let's use it. Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cad35c96bc..ed17bb14b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # Configuration for Gitlab-CI. # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines -image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1756 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123 stages: - generate-gitlab-ci -- 2.38.1 From yann.morin.1998 at free.fr Tue Feb 7 16:38:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 17:38:03 +0100 Subject: [Buildroot] [PATCH v2] package/python-orjson: disallow build when using musl. In-Reply-To: <20220519160214.214701-1-gsmecher@threespeedlogic.com> References: <20220509190650.1348657-2-gsmecher@threespeedlogic.com> <20220519160214.214701-1-gsmecher@threespeedlogic.com> Message-ID: <20230207163803.GI4124@scaer> Graeme, All, On 2022-05-19 09:02 -0700, Graeme Smecher spake thusly: > The python-orjson build bails as follows when using musl libc: > > error: cannot produce cdylib for `orjson v3.6.7 (...)` as the > target `i586-unknown-linux-musl` does not support these crate types I could not reproduce such an error wit the following defconfig: BR2_TOOLCHAIN_BUILDROOT_MUSL=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PER_PACKAGE_DIRECTORIES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_ORJSON=y Since you submitted this patch, pythn-orjson was bumped multiple times, and we've also bumped rust to 1.66.1, so maybe that was fixed now. Could you have a further look into this, please? Regards, Yann E. MORIN. > It's not machine-specific (it occurs on i586, s389x, and arm platforms), > and is tied to what appears to be relatively arcane details for > rust/musl: > > https://github.com/rust-lang/rust/issues/59302 > > At some point, it will be possible to remove this restriction - but not > yet. > > Signed-off-by: Graeme Smecher > --- > package/python-orjson/Config.in | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/python-orjson/Config.in b/package/python-orjson/Config.in > index 420e023b0a..b2ad9062cc 100644 > --- a/package/python-orjson/Config.in > +++ b/package/python-orjson/Config.in > @@ -1,6 +1,8 @@ > config BR2_PACKAGE_PYTHON_ORJSON > bool "python-orjson" > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > + # doesn't build with musl until rust's cdylib targets work with it > + depends on !BR2_TOOLCHAIN_USES_MUSL > select BR2_PACKAGE_PYTHON_CFFI # runtime > help > orjson is a fast, correct JSON library for Python. It > @@ -10,3 +12,6 @@ config BR2_PACKAGE_PYTHON_ORJSON > instances natively. > > https://github.com/ijl/orjson > + > +comment "python-orjson requires rust cdylib support, which musl doesn't have yet" > + depends on BR2_TOOLCHAIN_USES_MUSL > -- > 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 romain.naour at smile.fr Tue Feb 7 16:39:32 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 17:39:32 +0100 Subject: [Buildroot] [PATCH 1/1] utils/test-pkg: proper output on host without jq installed In-Reply-To: <20221012164831.10476-1-sebastien.szymanski@armadeus.com> References: <20221012164831.10476-1-sebastien.szymanski@armadeus.com> Message-ID: <75cb042c-7a23-2685-1835-089218d3321f@smile.fr> Hello Sebastien, Adding Yann in Cc. Le 12/10/2022 ? 18:48, S?bastien Szymanski a ?crit?: > On host without jq installed, test-pkg's output is as following: Is jq is listed as optional dependencies of Buildroot? > > $ ./utils/test-pkg -p mmc-utils > bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) > JQ IS > OK > bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) > JQ IS > OK > bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) > ... > > Since test-pkg handles this case we can hide this error message and have > proper output: > > $ ./utils/test-pkg -p mmc-utils > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: OK Indeed, jq was introduced in test-pkg by [1] [1] https://git.buildroot.net/buildroot/commit/?id=f29239cf9bc21d9632031077354b6ba5c868cc1f Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: S?bastien Szymanski > --- > utils/test-pkg | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/utils/test-pkg b/utils/test-pkg > index 4ebfd9af66..e7f5464817 100755 > --- a/utils/test-pkg > +++ b/utils/test-pkg > @@ -201,7 +201,7 @@ build_one() { > > # Validate that we generate proper json as show-info > { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; > - JQ="$(which jq)" > + JQ="$(which jq 2> /dev/null)" > if [ -z "${JQ}" ]; then > make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 > JQ="${dir}/host/bin/jq" From arnout at mind.be Tue Feb 7 16:41:45 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 17:41:45 +0100 Subject: [Buildroot] [PATCH v8 1/4] package/systemd: bump to version 252.4 In-Reply-To: <20230115114840.9027-1-nolange79@gmail.com> References: <20230115114840.9027-1-nolange79@gmail.com> Message-ID: <6490dfd6-5f3b-3801-6955-7fa655f2a82b@mind.be> On 15/01/2023 12:48, Norbert Lange wrote: > Following files changed *license* from CC0-1.0 to MIT-0: > > - src/systemctl/systemd-sysv-install.SKELETON > - config files > - examples under /network > > The file LICENSES/MIT-0.txt has been added for this reason, > hashes added, corrected for LICENSES/README.md. > > Kernel version 3.15 is now the bare minimum, but only > version 4.15 and higher are fully supported and tested: > > - bump kernel header dependencies > - correct kconfig description > - improvements to make the kconfig description better reflect > the information from the README > > Remove upstreamed patch. This is not actually done in this v8, probably left over from some earlier version. > > Set new options to their default, remove -Defi-cc option. > > Set -Ddbus=false to ensure dbus dependency is runtime only. > > Set -Ddbus-interfaces-dir=no as interface XML file generation is > not supported when cross compiling. I guess we could set this to yes for host-systemd, then copy the XML files to target. But they probably depend to some extent on the configuration, and it adds a lot to build time, and I doubt it is very useful to begin with... > > Set -Ddefault-user-shell=/bin/sh to the always available shell. > > Signed-off-by: Norbert Lange > Reviewed-by: James Hilliard [snip] > --- > > License diff for illustration > > --- systemd-stable-250.4/LICENSES/README.md > +++ systemd-stable-252.1/LICENSES/README.md > @@ -45,9 +45,11 @@ > * the following sources are licensed under the **CC0-1.0** license: > - src/basic/siphash24.c > - src/basic/siphash24.h > - - src/systemctl/systemd-sysv-install.SKELETON > - tools/check-includes.pl > + * the following sources are licensed under the **MIT-0** license: > - all examples under man/ > + - src/systemctl/systemd-sysv-install.SKELETON > + - config files and examples under /network > * the following sources are under **Public Domain** (LicenseRef-murmurhash2-public-domain): > - src/basic/MurmurHash2.c > - src/basic/MurmurHash2.h Very nice that you include this! However, git-am (and patchwork) interpret this as a hunk of the overall patch, so it fails and I had to manually adapt. In the future, please prefix with a space or something to avoid that. Applied to master, thanks. (Not pushed yet, I may make more changes while reviewing the rest of the series.) Regards, Arnout > > package/systemd: 252.4 > --- > package/systemd/Config.in | 12 +++++++++--- > package/systemd/systemd.hash | 5 +++-- > package/systemd/systemd.mk | 16 ++++++++++++++-- > system/Config.in | 6 +++--- > 4 files changed, 29 insertions(+), 10 deletions(-) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index 45a9e2d644..f35305c0be 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > depends on !BR2_STATIC_LIBS # kmod > depends on BR2_TOOLCHAIN_USES_GLIBC > depends on BR2_TOOLCHAIN_HAS_SSP > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd > select BR2_PACKAGE_HAS_UDEV > @@ -51,7 +51,11 @@ menuconfig BR2_PACKAGE_SYSTEMD > an elaborate transactional dependency-based service control > logic. It can work as a drop-in replacement for sysvinit. > > - Systemd requires a Linux kernel >= 3.13 with the following > + Kernel versions below 4.15 ("recommended baseline") have > + significant gaps in functionality and are not recommended > + for use with this version of systemd. > + > + Systemd requires a Linux kernel >= 3.15 with the following > options enabled: > > - CONFIG_DEVTMPFS > @@ -66,9 +70,11 @@ menuconfig BR2_PACKAGE_SYSTEMD > - CONFIG_PROC_FS > - CONFIG_FHANDLE (libudev, mount and bind mount handling) > > - - CONFIG_NET_NS (needed by PrivateNetwork=, used in some > + - CONFIG_NET_NS (Required for PrivateNetwork=, used in some > systemd units) > > + - CONFIG_USER_NS (Required for PrivateUsers=) > + > - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS > - CONFIG_TMPFS_POSIX_ACL > - CONFIG_TMPFS_XATTR > diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash > index 3b98566f32..00c08edcd9 100644 > --- a/package/systemd/systemd.hash > +++ b/package/systemd/systemd.hash > @@ -1,5 +1,5 @@ > # sha256 locally computed > -sha256 638a2fc78828765fc97bc73f428205b6dc1d359149b6c6bfe4d2a649cba2cca8 systemd-250.8.tar.gz > +sha256 cf2d27e67663d599a045101c7178cf0ec63d9df2962a54adf7de0d0357724f00 systemd-252.4.tar.gz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 > sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt > @@ -8,7 +8,8 @@ sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENS > sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 LICENSES/LGPL-2.0-or-later.txt > sha256 5bcef4fedbfc08776630e65d5d0d074dd31208037eddb167ca46a9ec4f737764 LICENSES/Linux-syscall-note.txt > sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENSES/lookup3-public-domain.txt > +sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENSES/MIT-0.txt > sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt > sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt > sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt > -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md > +sha256 da9b2c7b8cd10516fd2c4279b82496ea61787148f13e899c62fc8988c5fac34f LICENSES/README.md > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index b96873b73f..b0597f9bb4 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.8 > +SYSTEMD_VERSION = 252.4 > SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) > SYSTEMD_LICENSE = \ > LGPL-2.1+, \ > @@ -29,6 +29,7 @@ SYSTEMD_LICENSE = \ > BSD-3-Clause (tools/chromiumos), \ > CC0-1.0 (few source files, see LICENSES/README.md), \ > GPL-2.0 with Linux-syscall-note (linux kernel headers), \ > + MIT-0 (few source files, see LICENSES/README.md), \ > MIT (few source files, see LICENSES/README.md), \ > OFL-1.1 (Heebo fonts) > SYSTEMD_LICENSE_FILES = \ > @@ -40,6 +41,7 @@ SYSTEMD_LICENSE_FILES = \ > LICENSES/LGPL-2.0-or-later.txt \ > LICENSES/Linux-syscall-note.txt \ > LICENSES/lookup3-public-domain.txt \ > + LICENSES/MIT-0.txt \ > LICENSES/MIT.txt \ > LICENSES/murmurhash2-public-domain.txt \ > LICENSES/OFL-1.1.txt \ > @@ -61,7 +63,13 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg > SYSTEMD_PROVIDES = udev > > SYSTEMD_CONF_OPTS += \ > + -Ddbus=false \ > + -Ddbus-interfaces-dir=no \ > + -Ddefault-compression='auto' \ > -Ddefault-hierarchy=unified \ > + -Ddefault-locale='C.UTF-8' \ > + -Ddefault-user-shell=/bin/sh \ > + -Dfirst-boot-full-preset=false \ > -Didn=true \ > -Dima=false \ > -Dkexec-path=/usr/sbin/kexec \ > @@ -72,6 +80,7 @@ SYSTEMD_CONF_OPTS += \ > -Dman=false \ > -Dmount-path=/usr/bin/mount \ > -Dmode=release \ > + -Dnspawn-locale='C.UTF-8' \ > -Dnss-systemd=true \ > -Dquotacheck-path=/usr/sbin/quotacheck \ > -Dquotaon-path=/usr/sbin/quotaon \ > @@ -82,6 +91,7 @@ SYSTEMD_CONF_OPTS += \ > -Dsulogin-path=/usr/sbin/sulogin \ > -Dsystem-gid-max=999 \ > -Dsystem-uid-max=999 \ > + -Dsysupdate=false \ > -Dsysvinit-path= \ > -Dsysvrcnd-path= \ > -Dtelinit-path= \ > @@ -553,7 +563,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi > SYSTEMD_CONF_OPTS += \ > -Defi=true \ > -Dgnu-efi=true \ > - -Defi-cc=$(TARGET_CC) \ > -Defi-ld=bfd \ > -Defi-libdir=$(STAGING_DIR)/usr/lib \ > -Defi-includedir=$(STAGING_DIR)/usr/include/efi > @@ -793,6 +802,8 @@ HOST_SYSTEMD_CONF_OPTS = \ > -Dbinfmt=false \ > -Drepart=false \ > -Dcoredump=false \ > + -Ddbus=false \ > + -Ddbus-interfaces-dir=no \ > -Dpstore=false \ > -Doomd=false \ > -Dlogind=false \ > @@ -801,6 +812,7 @@ HOST_SYSTEMD_CONF_OPTS = \ > -Dmachined=false \ > -Dportabled=false \ > -Dsysext=false \ > + -Dsysupdate=false \ > -Duserdb=false \ > -Dhomed=false \ > -Dnetworkd=false \ > diff --git a/system/Config.in b/system/Config.in > index 806a747315..232bdfe763 100644 > --- a/system/Config.in > +++ b/system/Config.in > @@ -125,19 +125,19 @@ config BR2_INIT_SYSTEMD > depends on BR2_TOOLCHAIN_USES_GLIBC > depends on BR2_TOOLCHAIN_HAS_SSP > depends on BR2_TOOLCHAIN_HAS_THREADS > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > depends on BR2_HOST_GCC_AT_LEAST_5 > select BR2_ROOTFS_MERGED_USR > select BR2_PACKAGE_SYSTEMD > select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT > > -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5" > +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" > depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS > depends on BR2_USE_MMU > depends on !BR2_TOOLCHAIN_USES_GLIBC || \ > !BR2_TOOLCHAIN_HAS_SSP || \ > - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || \ > + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ > !BR2_HOST_GCC_AT_LEAST_5 > From sebastian.weyer at smile.fr Tue Feb 7 16:50:31 2023 From: sebastian.weyer at smile.fr (Sebastian Weyer) Date: Tue, 7 Feb 2023 17:50:31 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: test_rust.py: Add test to check correct vendoring Message-ID: <20230207165031.17188-1-sebastian.weyer@smile.fr> Currently the tests TestRust and TestRustBin do check for vendoring by requiring package ripgrep to be built but only if the download directory is already empty, otherwise the existing contents of the download directory will be reused and therefore not be redownloaded. This new test will only verify that the required packages are downloaded and vendored correctly without doing a runtime test. It does so by setting a path to a folder "dl" inside the build directory (output-directory/testname/) and then setting the environment variable BR2_DL_DIR to this path before the build starts. This code was essentially copied from the file test_gitforge.py which was added in commit 1ca6ab6ace3c1f9edfbfd16b57d1280b3ea2c6f5 We want the package ripgrep to be built since it requires vendoring directly. Additionally we want the package python-cryptography to be built because it has rust dependencies and therefore indirectly also requires vendoring. Signed-off-by: Sebastian Weyer --- support/testing/tests/package/test_rust.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index fb9dd2d916..763125ca20 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -1,4 +1,5 @@ import os +import shutil import infra.basetest @@ -54,3 +55,44 @@ class TestRust(TestRustBase): def test_run(self): self.login() self.assertRunOk("rg Buildroot /etc/issue") + + +class TestRustVendoring(infra.basetest.BRConfigTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_HOST_RUSTC=y + BR2_PACKAGE_RIPGREP=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y + BR2_BACKUP_SITE="" + """ + + def setUp(self): + super(TestRustVendoring, self).setUp() + + def tearDown(self): + self.show_msg("Cleaning up") + if self.b and not self.keepbuilds: + self.b.delete() + + def check_download(self, package): + # store downloaded tarball inside the output dir so the test infra + # cleans it up at the end + dl_dir = os.path.join(self.builddir, "dl") + # enforce we test the download + if os.path.exists(dl_dir): + shutil.rmtree(dl_dir) + env = {"BR2_DL_DIR": dl_dir} + self.b.build(["{}-dirclean".format(package), + "{}-legal-info".format(package)], + env) + + def test_run(self): + self.check_download("ripgrep") + self.check_download("python-cryptography") -- 2.25.1 From yann.morin.1998 at free.fr Tue Feb 7 16:48:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 17:48:42 +0100 Subject: [Buildroot] [git commit] utils/test-pkg: proper output on host without jq installed Message-ID: <20230207165050.89F57842B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09ac5a9e18e96ba6d3cd13e5e8d34aeccfcb603d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master On host without jq installed, test-pkg's output is as following: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) ... Since test-pkg handles this case we can hide this error message and have proper output: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK Signed-off-by: S??bastien Szymanski Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN --- utils/test-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test-pkg b/utils/test-pkg index 4ebfd9af66..e7f5464817 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -201,7 +201,7 @@ build_one() { # Validate that we generate proper json as show-info { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; - JQ="$(which jq)" + JQ="$(which jq 2> /dev/null)" if [ -z "${JQ}" ]; then make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 JQ="${dir}/host/bin/jq" From yann.morin.1998 at free.fr Tue Feb 7 16:51:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 17:51:09 +0100 Subject: [Buildroot] [PATCH 1/1] utils/test-pkg: proper output on host without jq installed In-Reply-To: <20221012164831.10476-1-sebastien.szymanski@armadeus.com> References: <20221012164831.10476-1-sebastien.szymanski@armadeus.com> Message-ID: <20230207165109.GJ4124@scaer> S?bastien, All, On 2022-10-12 18:48 +0200, S?bastien Szymanski spake thusly: > On host without jq installed, test-pkg's output is as following: > > $ ./utils/test-pkg -p mmc-utils > bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) > JQ IS > OK > bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) > JQ IS > OK > bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) > ... > > Since test-pkg handles this case we can hide this error message and have > proper output: > > $ ./utils/test-pkg -p mmc-utils > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: OK > > Signed-off-by: S?bastien Szymanski Applied to master, thanks. Regards, Yann E. MORIN. > --- > utils/test-pkg | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/utils/test-pkg b/utils/test-pkg > index 4ebfd9af66..e7f5464817 100755 > --- a/utils/test-pkg > +++ b/utils/test-pkg > @@ -201,7 +201,7 @@ build_one() { > > # Validate that we generate proper json as show-info > { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; > - JQ="$(which jq)" > + JQ="$(which jq 2> /dev/null)" > if [ -z "${JQ}" ]; then > make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 > JQ="${dir}/host/bin/jq" > -- > 2.37.3 > > _______________________________________________ > 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 giulio.benetti at benettiengineering.com Tue Feb 7 16:53:07 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 7 Feb 2023 17:53:07 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix LINUX_VERSION_PROBED content In-Reply-To: <20230207151646.09c9df79@windsurf> References: <20230104020558.1436469-1-giulio.benetti@benettiengineering.com> <20230104020558.1436469-2-giulio.benetti@benettiengineering.com> <20230207151646.09c9df79@windsurf> Message-ID: Hello Thomas, Vincent, On 07/02/23 15:16, Thomas Petazzoni via buildroot wrote: > Hello Giulio, > > On Wed, 4 Jan 2023 03:05:58 +0100 > Giulio Benetti wrote: > >> Actually LINUX_VERSION_PROBED is set with the string sorrounded by the >> backquotes including them. So when we evaluate $(LINUX_VERSION_PROBED) we >> end up having the command itself and instead we only need the Linux version >> probed in the style x.y.z. >> >> Verifying it turns out that: >> 1) --no-print-directory and -s make flags must be passed before -C flag, >> The error was not visible because errors were suppressed with >> '2>/dev/null' >> 2) backquotes don't evaluate the expression they sorround but become part >> of the string they sorround and get assigned to the variable >> >> To fix this let's move --no-print-directory right after $(MAKE) and >> use $(shell ) instead of backquotes. >> >> Signed-off-by: Giulio Benetti > > What is this fixing exactly? Do you have a specific problem that this > fixes? Or is this just fixing the fact that LINUX_VERSION_PROBED > contains `a very long command` instead of the result of the command > itself? While building the various rtl* wifi drivers I've noticed KVER='a very long command` but it gets evaluated correctly, indeed the .ko module is installed in the correct "lib/modules/$(LINUX_VERSION_PROBED)" path. > Indeed, switching back to $(shell ...) like you're proposing would > result in basically backporting: > > commit 28f57bb863ba48df054cec0057c844bf23d5969f > Author: Arnout Vandecappelle > Date: Sun Jul 12 16:35:27 2015 +0200 > > linux: use backtick instead of $(shell ...) make function > > Verified that LINUX_VERSION_PROBED is only used in "-quoted commands > (actually, usually it's not quoted). > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > Signed-off-by: Thomas Petazzoni > > which is not desirable, especially if you don't have a good > justification of why the current situation doesn't work. > > So for now, I'll mark as Rejected, but if you have a good > justification, you can resend with a better commit log with this > justification. Let's keep it as rejected, sorry for the noise! Best regards -- Giulio Benetti Benetti Engineering sas From peter at korsgaard.com Tue Feb 7 17:00:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 18:00:40 +0100 Subject: [Buildroot] [PATCH 2/2] support/dependencies/dependencies.sh: ensure git is >= 2.0.0 for vendoring In-Reply-To: <20230207170040.3503236-1-peter@korsgaard.com> References: <20230207170040.3503236-1-peter@korsgaard.com> Message-ID: <20230207170040.3503236-2-peter@korsgaard.com> The go vendoring fails on CentOS 7 (which uses git 1.8.3.1) with errors related to shallow clones: make docker-compose-source .. go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 github.com/docker/compose/v2/pkg/mocks imports github.com/theupdateframework/notary/client imports github.com/docker/go/canonical/json: github.com/docker/go at v1.5.1-1.0.20160303222718-d30aec9fd63c: invalid pseudo-version: git fetch --unshallow -f origin in /home/jacmet/source/buildroot-mirror/output/host/share/go-path/pkg/mod/cache/vcs/48fbd2dfabec81f4c93170677bfc89087d4bec07a2d08f6ca5ce3d17962677ee: exit status 128: fatal: git fetch-pack: expected shallow list make[1]: *** [/home/jacmet/source/buildroot-mirror/output/build/docker-compose-2.15.1/.stamp_downloaded] Error 1 It works with git 2.0.0 (released May 2014, included in Debian 8), so check for >= 2.0.0 with logic similar to the GNU patch version check. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 88eabe921d..9193b3ee12 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -174,6 +174,16 @@ for prog in perl tar wget cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do echo " xargs is usually part of the findutils package in your distribution" fi fi + + # we need git >= 2.0.0 for shallow clones / vendoring + if test $prog = "git" ; then + GIT_VERSION="$(git --version | sed -n 's/^git version \(.*\)/\1/p')" + GIT_MAJOR="$(echo "${GIT_VERSION}" | cut -d . -f 1)" + if [ "${GIT_MAJOR}" -lt 2 ]; then + echo "You have git '${GIT_VERSION}' installed. Git >= 2.0.0 is required" + exit 1 + fi + fi done if test "${missing_progs}" = "yes" ; then -- 2.30.2 From yann.morin.1998 at free.fr Tue Feb 7 17:03:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:03:01 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: test_rust.py: Add test to check correct vendoring In-Reply-To: <20230207165031.17188-1-sebastian.weyer@smile.fr> References: <20230207165031.17188-1-sebastian.weyer@smile.fr> Message-ID: <20230207170301.GK4124@scaer> Sebastian, All, On 2023-02-07 17:50 +0100, Sebastian Weyer spake thusly: > Currently the tests TestRust and TestRustBin do check for vendoring by > requiring package ripgrep to be built but only if the download > directory is already empty, otherwise the existing contents of the download > directory will be reused and therefore not be redownloaded. > > This new test will only verify that the required packages are downloaded > and vendored correctly without doing a runtime test. It does so by setting a > path to a folder "dl" inside the build directory (output-directory/testname/) > and then setting the environment variable BR2_DL_DIR to this path before the > build starts. This code was essentially copied from the file > test_gitforge.py which was added in commit > 1ca6ab6ace3c1f9edfbfd16b57d1280b3ea2c6f5 There is a missing piece in this otherwise detailed commit log: why set BR2_DL_DIR in the environment, rather than set it in the config options? The reason is that a user may already have BR2_DL_DIR set in their own envronment, and that would override the dl dir we set in the config options. No need to respin, that can be fixed when applying. Regards, Yann E. MORIN. > We want the package ripgrep to be built since it requires vendoring > directly. Additionally we want the package python-cryptography to be > built because it has rust dependencies and therefore indirectly also requires > vendoring. > > Signed-off-by: Sebastian Weyer > --- > support/testing/tests/package/test_rust.py | 42 ++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py > index fb9dd2d916..763125ca20 100644 > --- a/support/testing/tests/package/test_rust.py > +++ b/support/testing/tests/package/test_rust.py > @@ -1,4 +1,5 @@ > import os > +import shutil > > import infra.basetest > > @@ -54,3 +55,44 @@ class TestRust(TestRustBase): > def test_run(self): > self.login() > self.assertRunOk("rg Buildroot /etc/issue") > + > + > +class TestRustVendoring(infra.basetest.BRConfigTest): > + config = \ > + """ > + BR2_arm=y > + BR2_cortex_a9=y > + BR2_ARM_ENABLE_NEON=y > + BR2_ARM_ENABLE_VFP=y > + BR2_TOOLCHAIN_EXTERNAL=y > + # BR2_TARGET_ROOTFS_TAR is not set > + BR2_PACKAGE_HOST_RUSTC=y > + BR2_PACKAGE_RIPGREP=y > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y > + BR2_BACKUP_SITE="" > + """ > + > + def setUp(self): > + super(TestRustVendoring, self).setUp() > + > + def tearDown(self): > + self.show_msg("Cleaning up") > + if self.b and not self.keepbuilds: > + self.b.delete() > + > + def check_download(self, package): > + # store downloaded tarball inside the output dir so the test infra > + # cleans it up at the end > + dl_dir = os.path.join(self.builddir, "dl") > + # enforce we test the download > + if os.path.exists(dl_dir): > + shutil.rmtree(dl_dir) > + env = {"BR2_DL_DIR": dl_dir} > + self.b.build(["{}-dirclean".format(package), > + "{}-legal-info".format(package)], > + env) > + > + def test_run(self): > + self.check_download("ripgrep") > + self.check_download("python-cryptography") > -- > 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 vfazio at xes-inc.com Tue Feb 7 17:03:03 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 7 Feb 2023 11:03:03 -0600 Subject: [Buildroot] [PATCH 1/1] package/xz: fix microblaze compiles Message-ID: <20230207170303.2508780-1-vfazio@xes-inc.com> From: Vincent Fazio Patch xz to check if __attribute__((symver ..)) is supported via a compile check during configure. Fixes: http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// Signed-off-by: Vincent Fazio --- ...0001-Detect-symver-attribute-support.patch | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 package/xz/0001-Detect-symver-attribute-support.patch diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch new file mode 100644 index 0000000000..9ec43ea7a0 --- /dev/null +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -0,0 +1,61 @@ +From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 08:51:24 -0600 +Subject: [PATCH] Detect symver attribute support + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://github.com/tukaani-project/xz/pull/32 +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vincent Fazio +--- + configure.ac | 9 +++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5ad5589..08c623a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -791,6 +791,15 @@ else + time with Libtool if neither --with-pic nor + --without-pic is used). This define must be + used together with liblzma_linux.map.]) ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE( ++ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ])], ++ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], ++ [Define to 1 if GCC supports the symver attribute])], ++ []) ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic +diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h +index 11fec52..1d2ef9c 100644 +--- a/src/liblzma/common/common.h ++++ b/src/liblzma/common/common.h +@@ -76,7 +76,7 @@ + // too (which doesn't support __symver__) so use it to detect if __symver__ + // is available. This should be far more reliable than looking at compiler + // version macros as nowadays especially __GNUC__ is defined by many compilers. +-# if lzma_has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define LZMA_SYMVER_API(extnamever, type, intname) \ + extern __attribute__((__symver__(extnamever))) \ + LZMA_API(type) intname +-- +2.25.1 + -- 2.25.1 From thomas.petazzoni at bootlin.com Tue Feb 7 17:10:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:10:35 +0100 Subject: [Buildroot] [git commit] package/uclibc: pass $(TARGET_DEBUGGING) flags Message-ID: <20230207171058.34CDD842D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17481bd0bf6abff260ccc579974b813050f91d4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In order to have debugging symbols in uClibc, let's pass $(TARGET_DEBUGGING) in UCLIBC_EXTRA_CFLAGS. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index d2baffc95e..342d841087 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -375,7 +375,7 @@ endif # Commands # -UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) +UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) $(TARGET_DEBUGGING) # uClibc-ng does not build with LTO, so explicitly disable it # when using a compiler that may have support for LTO From thomas.petazzoni at bootlin.com Tue Feb 7 17:10:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:10:35 +0100 Subject: [Buildroot] [git commit] package/uclibc: enable DODEBUG when BR2_ENABLE_RUNTIME_DEBUG Message-ID: <20230207171058.41479842DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9867a725c12975af52dda9dffbdc33c3b0312db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The DODEBUG=y option of uClibc causes uClibc to be built with -O0 and -DDEBUG, which has a significant runtime performance impact. Currently, DODEBUG=y is passed when BR2_ENABLE_DEBUG=y, but BR2_ENABLE_DEBUG is only about enabling debugging symbols, not about runtime debugging additions. The more recently added BR2_ENABLE_RUNTIME_DEBUG option is precisely designed for that, so we changed the logic to pass DODEBUG=y when BR2_ENABLE_RUNTIME_DEBUG=y, and not BR2_ENABLE_DEBUG=y. This allows to build uClibc with debugging symbols when BR2_ENABLE_DEBUG=y, without disabling optimizations and adding more debugging features that have a runtime performance impact. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 342d841087..4c05d36ab3 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -217,7 +217,7 @@ endif # # Debug # -ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) define UCLIBC_DEBUG_CONFIG $(call KCONFIG_ENABLE_OPT,DODEBUG) endef From thomas.petazzoni at bootlin.com Tue Feb 7 17:10:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:10:35 +0100 Subject: [Buildroot] [git commit] package/uclibc: don't let uClibc build system strip uClibc Message-ID: <20230207171058.29B82842D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf92dcfaa92f6564830d10d4e18ae00fd8102ab2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Let Buildroot handle this, so we can have an unstripped uClibc if needed. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 125aa4cdcf..d2baffc95e 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -397,6 +397,7 @@ define UCLIBC_KCONFIG_FIXUP_CMDS $(call KCONFIG_SET_OPT,RUNTIME_PREFIX,"/") $(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr") $(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib") + $(call KCONFIG_DISABLE_OPT,DOSTRIP) $(UCLIBC_MMU_CONFIG) $(UCLIBC_BINFMT_CONFIG) $(UCLIBC_AARCH64_PAGE_SIZE_CONFIG) From peter at korsgaard.com Tue Feb 7 17:00:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 18:00:39 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring Message-ID: <20230207170040.3503236-1-peter@korsgaard.com> The vendoring done for cargo / go packages (may) need git, so ensure we check for it in dependencies, similar to how it is done for packages directly using git. Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5d618c6b39..82187d7db9 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1250,6 +1250,13 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD +# cargo/go vendoring (may) need git +ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),cargo) +DL_TOOLS_DEPENDENCIES += git +else ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),go) +DL_TOOLS_DEPENDENCIES += git +endif + DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. -- 2.30.2 From thomas.petazzoni at bootlin.com Tue Feb 7 17:12:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:12:09 +0100 Subject: [Buildroot] [PATCH v2] package/uclibc: fix usage of DODEBUG option In-Reply-To: <20220803200629.3172370-1-Ben.Wolsieffer@hefring.com> References: <20220803200629.3172370-1-Ben.Wolsieffer@hefring.com> Message-ID: <20230207181209.6e69b852@windsurf> Hello Ben, On Wed, 3 Aug 2022 16:06:29 -0400 Ben Wolsieffer wrote: > The DODEBUG option passes -O0 and -DDEBUG to the compiler, which has a > significant impact on runtime behavior and performance. Currently, > DODEBUG is enabled by BR2_ENABLE_DEBUG, but it makes more sense for it > to be enabled by BR_ENABLE_RUNTIME_DEBUG. > > This patch implements the above change, and also disables the DOSTRIP > option, allowing Builroot to decide whether binaries should be stripped. > > Lastly, this patch adds $(TARGET_DEBUGGING) to the compiler flags, to > enable debug symbols when appropriate. > > Signed-off-by: Ben Wolsieffer > --- > Changes in v2: > - Always disable DOSTRIP. > - Only add $(TARGET_DEBUGGING) to CFLAGS, to avoid any unintended side > effects. So after quite some time, I finally took care of your patch (sorry for the delay!). I ended up splitting it into 3 separate commits, because even though they are related, the 3 aspects are distinct. So here you are: commit f9867a725c12975af52dda9dffbdc33c3b0312db Author: Ben Wolsieffer Date: Tue Feb 7 17:53:37 2023 +0100 package/uclibc: enable DODEBUG when BR2_ENABLE_RUNTIME_DEBUG The DODEBUG=y option of uClibc causes uClibc to be built with -O0 and -DDEBUG, which has a significant runtime performance impact. Currently, DODEBUG=y is passed when BR2_ENABLE_DEBUG=y, but BR2_ENABLE_DEBUG is only about enabling debugging symbols, not about runtime debugging additions. The more recently added BR2_ENABLE_RUNTIME_DEBUG option is precisely designed for that, so we changed the logic to pass DODEBUG=y when BR2_ENABLE_RUNTIME_DEBUG=y, and not BR2_ENABLE_DEBUG=y. This allows to build uClibc with debugging symbols when BR2_ENABLE_DEBUG=y, without disabling optimizations and adding more debugging features that have a runtime performance impact. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni commit 17481bd0bf6abff260ccc579974b813050f91d4e Author: Ben Wolsieffer Date: Tue Feb 7 17:52:21 2023 +0100 package/uclibc: pass $(TARGET_DEBUGGING) flags In order to have debugging symbols in uClibc, let's pass $(TARGET_DEBUGGING) in UCLIBC_EXTRA_CFLAGS. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni commit cf92dcfaa92f6564830d10d4e18ae00fd8102ab2 Author: Ben Wolsieffer Date: Tue Feb 7 17:50:59 2023 +0100 package/uclibc: don't let uClibc build system strip uClibc Let Buildroot handle this, so we can have an unstripped uClibc if needed. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From gsmecher at threespeedlogic.com Tue Feb 7 17:14:00 2023 From: gsmecher at threespeedlogic.com (Graeme Smecher) Date: Tue, 7 Feb 2023 09:14:00 -0800 Subject: [Buildroot] [PATCH v2] package/python-orjson: disallow build when using musl. In-Reply-To: <20230207163803.GI4124@scaer> References: <20220509190650.1348657-2-gsmecher@threespeedlogic.com> <20220519160214.214701-1-gsmecher@threespeedlogic.com> <20230207163803.GI4124@scaer> Message-ID: Hi Yann, On 2023-02-07 08:38, Yann E. MORIN wrote: > Graeme, All, > > On 2022-05-19 09:02 -0700, Graeme Smecher spake thusly: >> The python-orjson build bails as follows when using musl libc: >> >> error: cannot produce cdylib for `orjson v3.6.7 (...)` as the >> target `i586-unknown-linux-musl` does not support these crate types > > I could not reproduce such an error wit the following defconfig: > > BR2_TOOLCHAIN_BUILDROOT_MUSL=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_PER_PACKAGE_DIRECTORIES=y > BR2_PACKAGE_PYTHON3=y > BR2_PACKAGE_PYTHON_ORJSON=y > > Since you submitted this patch, pythn-orjson was bumped multiple times, > and we've also bumped rust to 1.66.1, so maybe that was fixed now. > > Could you have a further look into this, please? This patch is obsolete. I used to receive orjson build failures associated with musl on a regular basis - they have tapered off since mid-2022. Over the past ~6 months or so, only the mips autobuilds have failed with the following message: - maturin failed Caused by: The architecture mips is not supported http://autobuild.buildroot.net/results/7291d123479411e632b8380f0045a18814dc23ae I am happy to drop the patch. best, Graeme > > Regards, > Yann E. MORIN. > >> It's not machine-specific (it occurs on i586, s389x, and arm platforms), >> and is tied to what appears to be relatively arcane details for >> rust/musl: >> >> https://github.com/rust-lang/rust/issues/59302 >> >> At some point, it will be possible to remove this restriction - but not >> yet. >> >> Signed-off-by: Graeme Smecher >> --- >> package/python-orjson/Config.in | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> diff --git a/package/python-orjson/Config.in b/package/python-orjson/Config.in >> index 420e023b0a..b2ad9062cc 100644 >> --- a/package/python-orjson/Config.in >> +++ b/package/python-orjson/Config.in >> @@ -1,6 +1,8 @@ >> config BR2_PACKAGE_PYTHON_ORJSON >> bool "python-orjson" >> depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS >> + # doesn't build with musl until rust's cdylib targets work with it >> + depends on !BR2_TOOLCHAIN_USES_MUSL >> select BR2_PACKAGE_PYTHON_CFFI # runtime >> help >> orjson is a fast, correct JSON library for Python. It >> @@ -10,3 +12,6 @@ config BR2_PACKAGE_PYTHON_ORJSON >> instances natively. >> >> https://github.com/ijl/orjson >> + >> +comment "python-orjson requires rust cdylib support, which musl doesn't have yet" >> + depends on BR2_TOOLCHAIN_USES_MUSL >> -- >> 2.35.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Tue Feb 7 17:16:42 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 18:16:42 +0100 Subject: [Buildroot] [PATCH v8 2/4] package/systemd: Add config option for sysupdate feature In-Reply-To: <20230115114840.9027-2-nolange79@gmail.com> References: <20230115114840.9027-1-nolange79@gmail.com> <20230115114840.9027-2-nolange79@gmail.com> Message-ID: <65c21c58-0a25-50b0-0e35-f8b4da7abac3@mind.be> On 15/01/2023 12:48, Norbert Lange wrote: > Support the new feature added with v251, > requires openssl. > > Signed-off-by: Norbert Lange > Reviewed-by: James Hilliard > --- > package/systemd/Config.in | 12 ++++++++++++ > package/systemd/systemd.mk | 7 ++++++- > 2 files changed, 18 insertions(+), 1 deletion(-) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index f35305c0be..9278772951 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -481,6 +481,18 @@ config BR2_PACKAGE_SYSTEMD_SYSEXT > > https://www.freedesktop.org/software/systemd/man/systemd-sysext.html > > +config BR2_PACKAGE_SYSTEMD_SYSUPDATE > + bool "enable sysupdate support" > + select BR2_PACKAGE_OPENSSL > + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL > + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK AFAIU, sysupdate uses its own particular way of doing A/B updates (by updating the GPT partition table) which is only supported by systemd-boot. Although I suppose it's possible to write a U-Boot script that does the same thing... So I added a note here to that effect. I don't suppose you actually used this option? Applied to master, thanks. Regards, Arnout > + help > + systemd-sysupdate atomically updates the host OS, container > + images, portable service images or other sources, based on > + the transfer configuration files described in sysupdate.d. > + > + https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html > + > config BR2_PACKAGE_SYSTEMD_SYSUSERS > bool "enable sysusers support" > help > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index b0597f9bb4..f49d34d32f 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -91,7 +91,6 @@ SYSTEMD_CONF_OPTS += \ > -Dsulogin-path=/usr/sbin/sulogin \ > -Dsystem-gid-max=999 \ > -Dsystem-uid-max=999 \ > - -Dsysupdate=false \ > -Dsysvinit-path= \ > -Dsysvrcnd-path= \ > -Dtelinit-path= \ > @@ -489,6 +488,12 @@ else > SYSTEMD_CONF_OPTS += -Dsysext=false > endif > > +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) > +SYSTEMD_CONF_OPTS += -Dsysupdate=true > +else > +SYSTEMD_CONF_OPTS += -Dsysupdate=false > +endif > + > ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) > SYSTEMD_CONF_OPTS += -Dnetworkd=true > SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management From angelo at amarulasolutions.com Tue Feb 7 17:17:08 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:08 +0100 Subject: [Buildroot] [PATCH v6 00/13] Extend Qt6 configuration Message-ID: <20230207171721.2973997-1-angelo@amarulasolutions.com> This series is an attempt to revamp the QT6 series from Jesse Van Gavere to be included mainline. It reworks a bit of things we discussed during the developer days in Bruxelles. Angelo Compagnucci (4): package/qt6/qt6base: add support for widgets package/qt6/qt6base: add support for widgets gtk backend package/qt6/qt6base: add opengl support package/qt6/qt6base: add QPA backend selection Jesse Van Gavere (9): package/qt6/qt6base: add support for gui module package/qt6/qt6base: add support for fontconfig/harfbuzz package/qt6/qt6base: Add support for jpeg/png/gif image format package/qt6/qt6base: add support for tslib package/qt6/qt6base: add support for libinput package/qt6/qt6base: add support for kms package/qt6/qt6base: add support for printsupport/cups package/qt6/qt6base: add support for building examples package/qt6: Add qmake functionality package/qt6/Config.in | 5 + package/qt6/qt6.mk | 12 ++ package/qt6/qt6base/Config.in | 161 +++++++++++++++++++++++++++ package/qt6/qt6base/qmake.conf.in | 34 ++++++ package/qt6/qt6base/qplatformdefs.h | 1 + package/qt6/qt6base/qt.conf.in | 7 ++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 166 ++++++++++++++++++++++++++++ 8 files changed, 387 insertions(+) create mode 100644 package/qt6/qt6base/qmake.conf.in create mode 100644 package/qt6/qt6base/qplatformdefs.h create mode 100644 package/qt6/qt6base/qt.conf.in -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:09 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:09 +0100 Subject: [Buildroot] [PATCH v6 01/13] package/qt6/qt6base: add support for gui module In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-2-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- v6: * Moved the basic linuxfb, xcb backend support here (Thomas P.) package/qt6/qt6base/Config.in | 31 +++++++++++++++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index e8357a675c..1810b1586d 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,37 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_GUI + bool "gui module" + select BR2_PACKAGE_FREETYPE + # At least one graphic backend must be enabled, so enable + # linuxfb if nothing is enabled. + select BR2_PACKAGE_QT6BASE_LINUXFB if \ + !BR2_PACKAGE_QT6BASE_XCB + help + This option enables the Qt6Gui library. + +if BR2_PACKAGE_QT6BASE_GUI + +config BR2_PACKAGE_QT6BASE_LINUXFB + bool "linuxfb support" + +config BR2_PACKAGE_QT6BASE_XCB + bool "X.org XCB support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_IMAGE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_LIBXKBCOMMON + +comment "X.org XCB backend available if X.org is enabled" + depends on !BR2_PACKAGE_XORG7 + +endif + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2f159f380b..9bfb2a8420 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -141,6 +141,39 @@ else QT6BASE_CONF_OPTS += -DFEATURE_glib=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) +QT6BASE_CONF_OPTS += -DFEATURE_gui=ON -DFEATURE_freetype=ON -DINPUT_opengl=no -DFEATURE_vulkan=OFF +QT6BASE_DEPENDENCIES += freetype + +ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_xcb=ON \ + -DFEATURE_xcb_xlib=ON \ + -DFEATURE_xkbcommon=ON \ + -DFEATURE_xkbcommon_x11=ON +QT6BASE_DEPENDENCIES += \ + libxcb \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xlib_libX11 \ + libxkbcommon +QT6BASE_DEPENDENCIES += xlib_libXext +else +QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:10 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:10 +0100 Subject: [Buildroot] [PATCH v6 02/13] package/qt6/qt6base: add support for fontconfig/harfbuzz In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-3-angelo@amarulasolutions.com> From: Jesse Van Gavere Additionally the harfbuzz license file is added and the hash for this is also added to the hash file Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 17 +++++++++++++++++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 1810b1586d..594221b792 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -59,6 +59,23 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_FONTCONFIG + bool "fontconfig support" + select BR2_PACKAGE_FONTCONFIG + help + This option enables Fontconfig and Freetype support using + the system fontconfig and freetype2 libraries. + +config BR2_PACKAGE_QT6BASE_HARFBUZZ + bool "harfbuzz support" + select BR2_PACKAGE_HARFBUZZ if \ + BR2_TOOLCHAIN_HAS_SYNC_4 && \ + BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + This option enables HarfBuzz support (either system harfbuzz + if the toolchain supports __sync for 4 bytes, or the qt + provided one which avoids this dependency by using QAtomic). + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 0c722ccded..dda7ff61c8 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,6 @@ # Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 sha256 a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d qtbase-everywhere-src-6.4.2.tar.xz +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 9bfb2a8420..da67b12c99 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -170,6 +170,29 @@ else QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_HARFBUZZ),y) +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=ON +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y) +# system harfbuzz in case __sync for 4 bytes is supported +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=OFF +QT6BASE_DEPENDENCIES += harfbuzz +else #BR2_TOOLCHAIN_HAS_SYNC_4 +# qt harfbuzz otherwise (using QAtomic instead) +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=ON +QT6BASE_LICENSE += , MIT (harfbuzz) +QT6BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON +QT6BASE_DEPENDENCIES += fontconfig +else +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:12 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:12 +0100 Subject: [Buildroot] [PATCH v6 04/13] package/qt6/qt6base: add support for widgets In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-5-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- v6: * Removed backend configuration options (Thomas P.) package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 6c5c60fa30..0f7e936162 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -95,6 +95,12 @@ config BR2_PACKAGE_QT6BASE_PNG This option enables PNG support using the system libpng library. +config BR2_PACKAGE_QT6BASE_WIDGETS + bool "widgets module" + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT6BASE_XCB + help + This option enables the Qt6Widgets library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 06ebbab8e7..cf3c7b1ad1 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -213,6 +213,10 @@ else QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:11 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:11 +0100 Subject: [Buildroot] [PATCH v6 03/13] package/qt6/qt6base: Add support for jpeg/png/gif image format In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-4-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 19 +++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 594221b792..6c5c60fa30 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -76,6 +76,25 @@ config BR2_PACKAGE_QT6BASE_HARFBUZZ if the toolchain supports __sync for 4 bytes, or the qt provided one which avoids this dependency by using QAtomic). +config BR2_PACKAGE_QT6BASE_GIF + bool "GIF support" + help + This compiles and installs the plugin for GIF reading support. + +config BR2_PACKAGE_QT6BASE_JPEG + bool "JPEG support" + select BR2_PACKAGE_JPEG + help + This option enables JPEG support using the system libjpeg + library. + +config BR2_PACKAGE_QT6BASE_PNG + bool "PNG support" + select BR2_PACKAGE_LIBPNG + help + This option enables PNG support using the system libpng + library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index da67b12c99..06ebbab8e7 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -186,6 +186,26 @@ else QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PNG),y) +QT6BASE_CONF_OPTS += -DFEATURE_png=ON -DFEATURE_system_png=ON +QT6BASE_DEPENDENCIES += libpng +else +QT6BASE_CONF_OPTS += -DFEATURE_png=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_GIF),y) +QT6BASE_CONF_OPTS += -DFEATURE_gif=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_gif=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_JPEG),y) +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=ON +QT6BASE_DEPENDENCIES += jpeg +else +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:13 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:13 +0100 Subject: [Buildroot] [PATCH v6 05/13] package/qt6/qt6base: add support for widgets gtk backend In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-6-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index cf3c7b1ad1..f936d19c68 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -215,6 +215,17 @@ endif ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON + +# only enable gtk support if libgtk3 X11 backend is enabled +ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy) +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=ON +QT6BASE_DEPENDENCIES += libgtk3 +else +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif else -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:14 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:14 +0100 Subject: [Buildroot] [PATCH v6 06/13] package/qt6/qt6base: add opengl support In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-7-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- v6: * Moving eglfs backend selection here (Thomas P.) package/qt6/Config.in | 5 ++++ package/qt6/qt6base/Config.in | 49 +++++++++++++++++++++++++++++++++- package/qt6/qt6base/qt6base.mk | 17 ++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index b0cc008df5..655fa8392a 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -12,6 +12,11 @@ config BR2_PACKAGE_QT6_ARCH_SUPPORTS default y if BR2_sparc64 depends on BR2_USE_MMU +config BR2_PACKAGE_QT6_GL_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + comment "qt6 needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, host gcc >= 8" depends on !BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT6_ARCH_SUPPORTS diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 0f7e936162..a33ffcd511 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -36,7 +36,8 @@ config BR2_PACKAGE_QT6BASE_GUI # At least one graphic backend must be enabled, so enable # linuxfb if nothing is enabled. select BR2_PACKAGE_QT6BASE_LINUXFB if \ - !BR2_PACKAGE_QT6BASE_XCB + !BR2_PACKAGE_QT6BASE_XCB && \ + !BR2_PACKAGE_QT6BASE_EGLFS help This option enables the Qt6Gui library. @@ -59,6 +60,52 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_OPENGL + bool "OpenGL support" + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + help + This option enables OpenGL support. + +comment "OpenGL support needs an OpenGL-capable backend" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS + +if BR2_PACKAGE_QT6BASE_OPENGL + +choice + prompt "OpenGL API" + help + Select OpenGL API. + +config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP + bool "Desktop OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL + help + Use desktop OpenGL. + +config BR2_PACKAGE_QT6BASE_OPENGL_ES2 + bool "OpenGL ES 2.0+" + depends on BR2_PACKAGE_HAS_LIBGLES + help + Use OpenGL ES 2.0 and later versions. + +endchoice + +config BR2_PACKAGE_QT6BASE_OPENGL_LIB + bool "opengl module" + select BR2_PACKAGE_QT6BASE_WIDGETS + help + This option enables the Qt6OpenGL library. This library + includes OpenGL support classes provided to ease porting + from Qt 4.x. + +config BR2_PACKAGE_QT6BASE_EGLFS + bool "eglfs support" + default y + depends on BR2_PACKAGE_HAS_LIBGBM + select BR2_PACKAGE_QT6BASE_OPENGL + +endif + config BR2_PACKAGE_QT6BASE_FONTCONFIG bool "fontconfig support" select BR2_PACKAGE_FONTCONFIG diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index f936d19c68..e9a3396fb6 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -228,6 +228,23 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) +QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON +QT6BASE_DEPENDENCIES += libegl +else +QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON +QT6BASE_DEPENDENCIES += libgl +else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON +QT6BASE_DEPENDENCIES += libgles +else +QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:15 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:15 +0100 Subject: [Buildroot] [PATCH v6 07/13] package/qt6/qt6base: add QPA backend selection In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-8-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 13 +++++++++++++ package/qt6/qt6base/qt6base.mk | 3 +++ 2 files changed, 16 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index a33ffcd511..065725049d 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -60,6 +60,19 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_DEFAULT_QPA + string "Default graphical platform" + help + Choose the default platform abstraction to use for graphical + applications (e.g xcb, linuxfb, eglfs, ...). If this is + empty, the default for your architecture will be used + (usually this is eglfs). + + You can get a list of supported platforms by running a Qt + application with the option "-platform help" on your + target. You can choose a different platform at runtime with + the -platform option. + config BR2_PACKAGE_QT6BASE_OPENGL bool "OpenGL support" depends on BR2_PACKAGE_QT6_GL_SUPPORTS diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index e9a3396fb6..a3c0c20d6e 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -249,6 +249,9 @@ else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif +QT6BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT6BASE_DEFAULT_QPA)) +QT6BASE_CONF_OPTS += $(if $(QT6BASE_DEFAULT_QPA),-DQT_QPA_DEFAULT_PLATFORM=$(QT6BASE_DEFAULT_QPA)) + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:17 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:17 +0100 Subject: [Buildroot] [PATCH v6 09/13] package/qt6/qt6base: add support for libinput In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-10-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 3942af6758..fb452b0b7d 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -228,6 +228,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_LIBINPUT),y) +QT6BASE_CONF_OPTS += -DFEATURE_libinput=ON +QT6BASE_DEPENDENCIES += libinput +else +QT6BASE_CONF_OPTS += -DFEATURE_libinput=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON QT6BASE_DEPENDENCIES += tslib -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:16 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:16 +0100 Subject: [Buildroot] [PATCH v6 08/13] package/qt6/qt6base: add support for tslib In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-9-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 065725049d..d5d6d3569d 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -224,6 +224,12 @@ config BR2_PACKAGE_QT6BASE_TEST help This options enables the Qt6Test library. +config BR2_PACKAGE_QT6BASE_TSLIB + bool "Enable Tslib support" + select BR2_PACKAGE_TSLIB + help + This options enables the Tslib plugin + config BR2_PACKAGE_QT6BASE_XML bool "XML module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index a3c0c20d6e..3942af6758 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -228,6 +228,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) +QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON +QT6BASE_DEPENDENCIES += tslib +else +QT6BASE_CONF_OPTS += -DFEATURE_tslib=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON QT6BASE_DEPENDENCIES += libegl -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:18 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:18 +0100 Subject: [Buildroot] [PATCH v6 10/13] package/qt6/qt6base: add support for kms In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-11-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index fb452b0b7d..4a64886a3f 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -206,6 +206,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT6BASE_CONF_OPTS += -DFEATURE_kms=ON +QT6BASE_DEPENDENCIES += libdrm +else +QT6BASE_CONF_OPTS += -DFEATURE_kms=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:19 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:19 +0100 Subject: [Buildroot] [PATCH v6 11/13] package/qt6/qt6base: add support for printsupport/cups In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-12-angelo@amarulasolutions.com> From: Jesse Van Gavere Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 4 ++++ package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index d5d6d3569d..4d13128661 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -168,6 +168,10 @@ config BR2_PACKAGE_QT6BASE_NETWORK help This options enables the Qt6Network library. +config BR2_PACKAGE_QT6BASE_PRINTSUPPORT + depends on BR2_PACKAGE_QT6BASE_WIDGETS + def_bool y + config BR2_PACKAGE_QT6BASE_SQL bool "sql module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 4a64886a3f..97986a3c2b 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -206,6 +206,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT), y) +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON +ifeq ($(BR2_PACKAGE_CUPS), y) +QT6BASE_CONF_OPTS += -DFEATURE_cups=ON +QT6BASE_DEPENDENCIES += cups +else +QT6BASE_CONF_OPTS += -DFEATURE_cups=OFF +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF +endif + ifeq ($(BR2_PACKAGE_LIBDRM),y) QT6BASE_CONF_OPTS += -DFEATURE_kms=ON QT6BASE_DEPENDENCIES += libdrm -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:21 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:21 +0100 Subject: [Buildroot] [PATCH v6 13/13] package/qt6: Add qmake functionality In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-14-angelo@amarulasolutions.com> From: Jesse Van Gavere The qmake functionality had been missing due to the new host/target build requirement, to get it working the main parts of the qt5 qmake has been kept, we're still making our own device spec which we use to run qmake with along with passing some additional device options for our flags/cross-compiler the biggest difference is that where previously qt.conf was used to fixup per-paths builds, this is now always created with changed contents so qmake looks at the correct target directories. Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- v6: * Removing EGLFS_DEVICE mangling because is not working right now and should be added later. package/qt6/qt6.mk | 12 ++++++++++ package/qt6/qt6base/qmake.conf.in | 34 +++++++++++++++++++++++++++++ package/qt6/qt6base/qplatformdefs.h | 1 + package/qt6/qt6base/qt.conf.in | 7 ++++++ package/qt6/qt6base/qt6base.mk | 16 ++++++++++++++ 5 files changed, 70 insertions(+) create mode 100644 package/qt6/qt6base/qmake.conf.in create mode 100644 package/qt6/qt6base/qplatformdefs.h create mode 100644 package/qt6/qt6base/qt.conf.in diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 431bb8c9d3..847286a3fc 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -10,3 +10,15 @@ QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules include $(sort $(wildcard package/qt6/*/*.mk)) + +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable due +# to the host/target build and tweak the per-package install pathes +define QT6_INSTALL_QT_CONF + rm -f $(HOST_DIR)/bin/qt.conf + sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ + $(QT6BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf +endef + +# Variable for other Qt applications to use +QT6_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ diff --git a/package/qt6/qt6base/qmake.conf.in b/package/qt6/qt6base/qmake.conf.in new file mode 100644 index 0000000000..e0d53d755d --- /dev/null +++ b/package/qt6/qt6base/qmake.conf.in @@ -0,0 +1,34 @@ +# Qt6 has a mechanism to support "device" profiles, so that people can +# specify the compiler, compiler flags and so on for a specific device. + +# We leverage this mechanism in the Buildroot packaging of qt6 to +# simplify cross-compilation: we have our own "device" definition, which +# allows us to easily pass the cross-compiler paths and flags from our +# qt6.mk. + +include(../common/linux_device_pre.conf) + +# modifications to g++-unix.conf +QMAKE_CC = $${CROSS_COMPILE}gcc +QMAKE_CXX = $${CROSS_COMPILE}g++ +QMAKE_LINK = $${CROSS_COMPILE}g++ + +# modifications to gcc-base.conf +QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} +QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} +# Remove all optimisation flags, we really only want our own. +QMAKE_CFLAGS_OPTIMIZE = +QMAKE_CFLAGS_OPTIMIZE_DEBUG = +QMAKE_CFLAGS_OPTIMIZE_FULL = +QMAKE_CFLAGS_OPTIMIZE_SIZE = +QMAKE_CFLAGS_DEBUG = +QMAKE_CXXFLAGS_DEBUG = +QMAKE_CFLAGS_RELEASE = +QMAKE_CXXFLAGS_RELEASE = +CONFIG += nostrip + +QMAKE_LIBS += -lrt -lpthread -ldl +QMAKE_CFLAGS_ISYSTEM = + +include(../common/linux_device_post.conf) +load(qt_config) diff --git a/package/qt6/qt6base/qplatformdefs.h b/package/qt6/qt6base/qplatformdefs.h new file mode 100644 index 0000000000..99e9a27923 --- /dev/null +++ b/package/qt6/qt6base/qplatformdefs.h @@ -0,0 +1 @@ +#include "../../linux-g++/qplatformdefs.h" diff --git a/package/qt6/qt6base/qt.conf.in b/package/qt6/qt6base/qt.conf.in new file mode 100644 index 0000000000..4842bcb462 --- /dev/null +++ b/package/qt6/qt6base/qt.conf.in @@ -0,0 +1,7 @@ +[Paths] +Prefix=/usr +HostPrefix=@@HOST_DIR@@ +HostData=../target/usr +Sysroot=@@STAGING_DIR@@ +SysrootifyPrefix=true +TargetSpec=devices/linux-buildroot-g++ diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index ec1c65f827..f37b2bafce 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -54,6 +54,9 @@ QT6BASE_CONF_OPTS = \ -DFEATURE_system_zlib=ON \ -DFEATURE_system_libb2=ON +QT6BASE_CFLAGS = $(TARGET_CFLAGS) +QT6BASE_CXXFLAGS = $(TARGET_CXXFLAGS) + # x86 optimization options. While we have a BR2_X86_CPU_HAS_AVX512, it # is not clear yet how it maps to all the avx512* options of Qt, so we # for now keeps them disabled. @@ -384,5 +387,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF endif +define QT6BASE_MAKE_BR_SPEC + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qmake.conf.in \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h +endef + +QT6BASE_CONF_OPTS += -DQT_QMAKE_DEVICE_OPTIONS=CROSS_COMPILE="$(TARGET_CROSS)";BR_COMPILER_CFLAGS="$(QT6BASE_CFLAGS)";BR_COMPILER_CXXFLAGS="$(QT6BASE_CXX_FLAGS)" + +QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC + +QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF + $(eval $(cmake-package)) $(eval $(host-cmake-package)) -- 2.25.1 From angelo at amarulasolutions.com Tue Feb 7 17:17:20 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:17:20 +0100 Subject: [Buildroot] [PATCH v6 12/13] package/qt6/qt6base: add support for building examples In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> Message-ID: <20230207171721.2973997-13-angelo@amarulasolutions.com> From: Jesse Van Gavere The selected options make the default examples set to actually compile. Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 18 ++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 4d13128661..4ae5e96ef0 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,24 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_EXAMPLES + bool "Compile and install examples " + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_QT6BASE_DBUS + select BR2_PACKAGE_QT6BASE_NETWORK + select BR2_PACKAGE_QT6BASE_XML + select BR2_PACKAGE_QT6BASE_DBUS + select BR2_PACKAGE_QT6BASE_GUI + select BR2_PACKAGE_QT6BASE_WIDGETS + select BR2_PACKAGE_QT6BASE_OPENGL + select BR2_PACKAGE_QT6BASE_OPENGL_LIB + select BR2_PACKAGE_QT6BASE_CONCURRENT + help + If unsure, say N. + +comment "Building examples needs OpenGL/DBus support" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS || !BR2_PACKAGE_DBUS + config BR2_PACKAGE_QT6BASE_GUI bool "gui module" select BR2_PACKAGE_FREETYPE diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 97986a3c2b..ec1c65f827 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -310,6 +310,12 @@ QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EXAMPLES),y) +QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=ON +else +QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_NETWORK),y) QT6BASE_CONF_OPTS += -DFEATURE_network=ON else -- 2.25.1 From yann.morin.1998 at free.fr Tue Feb 7 17:15:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:15:00 +0100 Subject: [Buildroot] [git commit] .gitlab-ci.yml: update Docker image to use Message-ID: <20230207171938.920A58430C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bde165f7ad4922e218cabdb6eb7c40e1661179f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We have a new Docker image, updated with the new requirements from bcd15aa08aab1e8292b93995c44dc765a9801632 ("support/docker: add python3-magic"), but also with an updated Debian Bullseye installation. Let's use it. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cad35c96bc..ed17bb14b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # Configuration for Gitlab-CI. # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines -image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1756 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123 stages: - generate-gitlab-ci From yann.morin.1998 at free.fr Tue Feb 7 17:14:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:14:59 +0100 Subject: [Buildroot] [git commit] support/docker: update Debian distro to a newer tag/date Message-ID: <20230207171938.7E5E48430A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d24c6f4b15f4794046e8e1ee220298c90ddecd19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/docker/Dockerfile | 2 +- support/docker/apt-sources.list | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index d775ae23e1..de1534e77a 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -6,7 +6,7 @@ # We use a specific tag for the base image *and* the corresponding date # for the repository., so do not forget to update the apt-sources.list # file that is shipped next to this Dockerfile. -FROM debian:bullseye-20210902 +FROM debian:bullseye-20230202 LABEL maintainer="Buildroot mailing list " \ vendor="Buildroot" \ diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list index 0f872fd398..849996d9f7 100644 --- a/support/docker/apt-sources.list +++ b/support/docker/apt-sources.list @@ -1,4 +1,4 @@ -# Latest just before 20210817T000000Z: -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20210902T193650Z/ bullseye-security main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main +# Latest just before 20230207T102800Z: +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20230206T092119Z/ bullseye-security main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye-updates main From yann.morin.1998 at free.fr Tue Feb 7 17:14:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:14:59 +0100 Subject: [Buildroot] [git commit] support/docker: use APT::Retries in apt-get calls to retry Message-ID: <20230207171938.885B08430B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a7c6725f6ca5c1108e6fb76fad414132555b373 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master snapshot.debian.org is notoriously slow, and quite often leads to timeouts when downloading packages. To give us a better chance of succeeding, let's retry 3 times before failing. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index de1534e77a..a16c1e3849 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -20,8 +20,8 @@ COPY apt-sources.list /etc/apt/sources.list # The container has no package lists, so need to update first RUN dpkg --add-architecture i386 && \ - apt-get update -y -RUN apt-get install -y --no-install-recommends \ + apt-get -o APT::Retries=3 update -y +RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ bc \ build-essential \ bzr \ From yann.morin.1998 at free.fr Tue Feb 7 17:22:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:22:08 +0100 Subject: [Buildroot] [PATCH 1/3] support/docker: update Debian distro to a newer tag/date In-Reply-To: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> References: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> Message-ID: <20230207172208.GL4124@scaer> Thomas, All, On 2023-02-07 17:31 +0100, Thomas Petazzoni via buildroot spake thusly: > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/docker/Dockerfile | 2 +- > support/docker/apt-sources.list | 8 ++++---- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile > index d775ae23e1..de1534e77a 100644 > --- a/support/docker/Dockerfile > +++ b/support/docker/Dockerfile > @@ -6,7 +6,7 @@ > # We use a specific tag for the base image *and* the corresponding date > # for the repository., so do not forget to update the apt-sources.list > # file that is shipped next to this Dockerfile. > -FROM debian:bullseye-20210902 > +FROM debian:bullseye-20230202 > > LABEL maintainer="Buildroot mailing list " \ > vendor="Buildroot" \ > diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list > index 0f872fd398..849996d9f7 100644 > --- a/support/docker/apt-sources.list > +++ b/support/docker/apt-sources.list > @@ -1,4 +1,4 @@ > -# Latest just before 20210817T000000Z: > -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main > -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20210902T193650Z/ bullseye-security main > -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main > +# Latest just before 20230207T102800Z: > +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye main > +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20230206T092119Z/ bullseye-security main > +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye-updates main > -- > 2.38.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 Tue Feb 7 17:23:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:23:15 +0100 Subject: [Buildroot] [PATCH 2/3] support/docker: use APT::Retries in apt-get calls to retry In-Reply-To: <20230207163119.292389-2-thomas.petazzoni@bootlin.com> References: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> <20230207163119.292389-2-thomas.petazzoni@bootlin.com> Message-ID: <20230207172315.GM4124@scaer> Thomas, All, On 2023-02-07 17:31 +0100, Thomas Petazzoni via buildroot spake thusly: > snapshot.debian.org is notoriously slow, and quite often leads to > timeouts when downloading packages. To give us a better chance of > succeeding, let's retry 3 times before failing. > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/docker/Dockerfile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile > index de1534e77a..a16c1e3849 100644 > --- a/support/docker/Dockerfile > +++ b/support/docker/Dockerfile > @@ -20,8 +20,8 @@ COPY apt-sources.list /etc/apt/sources.list > > # The container has no package lists, so need to update first > RUN dpkg --add-architecture i386 && \ > - apt-get update -y > -RUN apt-get install -y --no-install-recommends \ > + apt-get -o APT::Retries=3 update -y > +RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ > bc \ > build-essential \ > bzr \ > -- > 2.38.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 Tue Feb 7 17:23:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:23:42 +0100 Subject: [Buildroot] [PATCH 3/3] .gitlab-ci.yml: update Docker image to use In-Reply-To: <20230207163119.292389-3-thomas.petazzoni@bootlin.com> References: <20230207163119.292389-1-thomas.petazzoni@bootlin.com> <20230207163119.292389-3-thomas.petazzoni@bootlin.com> Message-ID: <20230207172342.GN4124@scaer> Thomas, All, On 2023-02-07 17:31 +0100, Thomas Petazzoni via buildroot spake thusly: > We have a new Docker image, updated with the new requirements from > bcd15aa08aab1e8292b93995c44dc765a9801632 ("support/docker: add > python3-magic"), but also with an updated Debian Bullseye > installation. Let's use it. > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > .gitlab-ci.yml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index cad35c96bc..ed17bb14b9 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -1,7 +1,7 @@ > # Configuration for Gitlab-CI. > # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines > > -image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1756 > +image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123 > > stages: > - generate-gitlab-ci > -- > 2.38.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 Jason at zx2c4.com Tue Feb 7 17:23:45 2023 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Tue, 7 Feb 2023 18:23:45 +0100 Subject: [Buildroot] [PATCH v5] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220420170326.1901572-1-Jason@zx2c4.com> Message-ID: On Tue, Feb 07, 2023 at 04:06:16PM +0100, Arnout Vandecappelle wrote: > > > On 20/04/2022 19:03, Jason A. Donenfeld wrote: > > The RNG can't actually be seeded from a shell script, due to the > > reliance on ioctls. For this reason, Busybox now contains SeedRNG, a > > tiny program meant to be called at startup and shutdown (and at > > arbitrary other points in between if desired). > > > > Since this is currently in Busybox's git tree, this commit adds it as a > > patch to the Busybox package. Then, it wires the init script up to call > > it. > > > > This is a significant improvement over the current init script, which > > doesn't credit entropy and whose hashing in shell scripts is sort of > > fragile. > > > > NOTE NOTE NOTE: While I've added the patch to the Busybox package > > directory, I don't really know how to wire this up and what to do about > > the various config entries. I was hoping that a Buildroot maintainer > > might have a better idea of the best way to do this, and could just take > > this patch as a starting point for whatever the real commit winds up > > being. > > > > Signed-off-by: Jason A. Donenfeld > > Applied to master, after some reworking and heavily rewriting the commit > message, thanks. > > package/urandom-scripts: actually credit seed files via seedrng > > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, Busybox 1.36.0 contains SeedRNG, a > tiny program meant to be called at startup and shutdown (and at > arbitrary other points in between if desired). Note that initially, > the way seedrng was included in busybox broke things quite severely, but > now it's been reverted to a reasonably acceptable version. > > This is a significant improvement over the current init script, which > doesn't credit entropy and whose hashing in shell scripts is sort of > fragile. > > Because seedrng is part of busybox, urandom-scripts now depends on > BR2_PACKAGE_BUSYBOX. This can be removed again if later we add a > standalone seedrng package. > > Add a decent explanation to the init script about the need for a > persistent directory to make this actually work. > > Signed-off-by: Jason A. Donenfeld > [Arnout: > - Remove busybox patch, it's now part of busybox 1.36.0. > - Depend on busybox. > - Fix shellcheck errors. > - Use DAEMON and SEEDRNG_ARGS. > - Don't bother with "seed_dir" and "skip_credit" variables. > - Rename to S20seedrng. > ] > Signed-off-by: Arnout Vandecappelle Looks good. Thank you very much for following up and bringing this across the finish line! Jason From peter at korsgaard.com Tue Feb 7 17:24:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 18:24:10 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: silence gcc plugin test Message-ID: <20230207172450.921B78430F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fbd2f6d2cf26225f73f584c3a0cacb1b2476f5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The gcc plugin test was not using the -q option to grep causing it to print the line to stdout, so fix that. While we're at it, adjust the locale check to use grep -q instead of redirecting to /dev/null for consistency with the other checks. Signed-off-by: Peter Korsgaard --- 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 88eabe921d..0aa5e59274 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -194,7 +194,7 @@ if [ "${PATCH_MAJOR}" -lt 2 ] || [ "${PATCH_MAJOR}" -eq 2 -a "${PATCH_MINOR}" -l exit 1; fi -if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then +if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then if ! which locale > /dev/null ; then echo echo "You need locale support on your build machine to build a toolchain supporting locales" @@ -254,7 +254,7 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then fi fi -if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then +if grep -q ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then if ! echo "#include " | $HOSTCXX_NOCCACHE -I$($HOSTCXX_NOCCACHE -print-file-name=plugin)/include -x c++ -c - -o /dev/null ; then echo echo "Your Buildroot configuration needs a host compiler capable of building gcc plugins." From james.kent at orchestrated-technology.com Tue Feb 7 17:10:20 2023 From: james.kent at orchestrated-technology.com (James Kent) Date: Tue, 7 Feb 2023 17:10:20 +0000 Subject: [Buildroot] [PATCH] package/chrony: add default unprivileged user option Message-ID: <20230207171020.20194-1-james.kent@orchestrated-technology.com> Configurable option to define and enable by default an unprivileged user which the Chrony daemon will assume once initialised. Where libcap is not enabled a comment indicates the dependency requirement to make the option available. This option supports the good security practice of dropping elevated privileges for daemon runtime. Signed-off-by: James Kent --- package/chrony/Config.in | 10 ++++++++++ package/chrony/chrony.mk | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/package/chrony/Config.in b/package/chrony/Config.in index 158dc20530..8b053ed7e2 100644 --- a/package/chrony/Config.in +++ b/package/chrony/Config.in @@ -14,3 +14,13 @@ config BR2_PACKAGE_CHRONY_DEBUG_LOGGING Enable support for debug logging output from Chrony when enabled at runtime. If disabled, code for debug logging will not be compiled in. + +config BR2_PACKAGE_CHRONY_USER + bool "chrony default unprivileged user" + depends on BR2_PACKAGE_CHRONY && BR2_PACKAGE_LIBCAP + help + Define and enable default unprivileged user for the Chrony + daemon to run as. + +comment "chrony default unprivileged user requires libcap" + depends on BR2_PACKAGE_CHRONY && !BR2_PACKAGE_LIBCAP diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 379e95a778..16f8f082a3 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -21,6 +21,14 @@ CHRONY_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_LIBCAP),y) CHRONY_DEPENDENCIES += libcap + +ifeq ($(BR2_PACKAGE_CHRONY_USER),y) +CHRONY_CONF_OPTS += --with-user=chrony +define CHRONY_USERS + chrony -1 chrony -1 * /run/chrony - - Time daemon +endef +endif + else CHRONY_CONF_OPTS += --without-libcap endif -- 2.35.3 From yann.morin.1998 at free.fr Tue Feb 7 17:29:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:29:02 +0100 Subject: [Buildroot] [PATCH v2] package/python-orjson: disallow build when using musl. In-Reply-To: References: <20220509190650.1348657-2-gsmecher@threespeedlogic.com> <20220519160214.214701-1-gsmecher@threespeedlogic.com> <20230207163803.GI4124@scaer> Message-ID: <20230207172902.GO4124@scaer> Graeme, All, On 2023-02-07 09:14 -0800, Graeme Smecher spake thusly: > On 2023-02-07 08:38, Yann E. MORIN wrote: > >On 2022-05-19 09:02 -0700, Graeme Smecher spake thusly: > >>The python-orjson build bails as follows when using musl libc: > >I could not reproduce such an error wit the following defconfig: [--SNIP--] > This patch is obsolete. I used to receive orjson build failures > associated with musl on a regular basis - they have tapered off since > mid-2022. In the meantime, Thomas has bisected the resolution to that commit from James: 2cbf1e4d3a1a package/python-orjson: convert to use the python-package infrastructure The commit before, it fails to build; with that commit, the build succeeds. 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 thomas.petazzoni at bootlin.com Tue Feb 7 17:38:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:38:53 +0100 Subject: [Buildroot] [git commit] package/nfs-utils: handle pkg-config in the Autotools standard way for nfsrahead Message-ID: <20230207174831.EAF2D84323@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=700fc2d7bdb53d33368046840ea91c6c4e6b12b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master While using the correct PKG_CHECK_MODULES() approach for libmount we end up having host-nfs-utils needing libmount. But libmount is only needed by nfsrahead that we don't need in host-nfs-utils. But we need host-nfs-utils itself(rpcgen tool specifically) to build nfs-utils. To solve this recursive situation: 1) Update the first patch with the upstreamed one that handles libmount using PKG_CHECK_MODULES(). 2) Add another patch to allow to disable nfsrahead during building for host since this tool is not needed and requires libmount. This way the first patch approach can be correctly used. 3) Add --disable-nfsrahead to HOST_NFS_UTILS_CONF_OPTS 4) Remove en/disable-uuid since now it's required by default: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=c5528f40f9db5061e06dcf1f9b7fce5185b376c6 Both patches have been committed: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=627c95b2b853161b359095e7fdf05d3b07d51379 https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=844d3ad5376603bc9c205a6084d38a2d25146179 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...fsrahead-fix-linking-while-static-linking.patch | 41 ++++++++----- ...figure.ac-allow-to-disable-nfsrahead-tool.patch | 68 ++++++++++++++++++++++ package/nfs-utils/nfs-utils.mk | 7 +-- 3 files changed, 97 insertions(+), 19 deletions(-) diff --git a/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch b/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch index b8dcea63f7..e1d57f30cf 100644 --- a/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch +++ b/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch @@ -1,31 +1,46 @@ -From a69014a1b4e5b8068630abe3109f31eb64b6a076 Mon Sep 17 00:00:00 2001 +From d9abb221cea81dee5956bd987c6efa680c03571a Mon Sep 17 00:00:00 2001 From: Giulio Benetti -Date: Wed, 10 Aug 2022 00:10:51 +0200 +Date: Wed, 10 Aug 2022 23:38:17 +0200 Subject: [PATCH] nfsrahead: fix linking while static linking --lmount must preceed -lblkid and to obtain this let's add: -`pkg-config --libs mount` -in place of: -`-lmount` -This ways the library order will always be correct. +-lmount must preceed -lblkid and to obtain this let's add in configure.ac: +PKG_CHECK_MODULES([LIBMOUNT], [mount]) +and in tools/nfsrahead/Makefile.am let's substitute explicit `-lmount` +with: +$(LIBMOUNT_LIBS) +This way all the required libraries will be present and in the right order +when static linking. Signed-off-by: Giulio Benetti +[Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=627c95b2b853161b359095e7fdf05d3b07d51379] --- -Pending Upstream: -https://patchwork.kernel.org/project/linux-nfs/patch/20220809223308.1421081-1-giulio.benetti at benettiengineering.com/ ---- + configure.ac | 3 +++ tools/nfsrahead/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 2 files changed, 4 insertions(+), 1 deletion(-) +diff --git a/configure.ac b/configure.ac +index f1c46c5c..ff85200b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -273,6 +273,9 @@ AC_LIBCAP + dnl Check for -lxml2 + AC_LIBXML2 + ++dnl Check for -lmount ++PKG_CHECK_MODULES([LIBMOUNT], [mount]) ++ + # Check whether user wants TCP wrappers support + AC_TCP_WRAPPERS + diff --git a/tools/nfsrahead/Makefile.am b/tools/nfsrahead/Makefile.am -index 845ea0d5..280a2eb4 100644 +index 845ea0d5..7e08233a 100644 --- a/tools/nfsrahead/Makefile.am +++ b/tools/nfsrahead/Makefile.am @@ -1,6 +1,6 @@ libexec_PROGRAMS = nfsrahead nfsrahead_SOURCES = main.c -nfsrahead_LDFLAGS= -lmount -+nfsrahead_LDFLAGS= `pkg-config --libs mount` ++nfsrahead_LDFLAGS= $(LIBMOUNT_LIBS) nfsrahead_LDADD = ../../support/nfs/libnfsconf.la man5_MANS = nfsrahead.man diff --git a/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch b/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch new file mode 100644 index 0000000000..ee5e3fa251 --- /dev/null +++ b/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch @@ -0,0 +1,68 @@ +From 9a0002978eb32b78d22f053302e012a4255dc4ef Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 19 Sep 2022 23:43:28 +0200 +Subject: [PATCH] configure.ac: allow to disable nfsrahead tool + +This allows to make libmount not mandatory but depending on nfsrahead +since it only requires it. This is useful when cross-compiling because +in that case we need rpcgen only built for host but not nfsrahead that +also require libmount. So this reduces the dependencies for host +building. + +Signed-off-by: Giulio Benetti +[Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=844d3ad5376603bc9c205a6084d38a2d25146179] +--- + configure.ac | 13 ++++++++++--- + tools/Makefile.am | 6 +++++- + 2 files changed, 15 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ff85200b..5d9cbf31 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -249,6 +249,16 @@ AC_ARG_ENABLE(nfsdcld, + enable_nfsdcld=$enableval, + enable_nfsdcld="yes") + ++AC_ARG_ENABLE(nfsrahead, ++ [AS_HELP_STRING([--disable-nfsrahead],[disable nfsrahead command @<:@default=no@:>@])], ++ enable_nfsrahead=$enableval, ++ enable_nfsrahead="yes") ++ AM_CONDITIONAL(CONFIG_NFSRAHEAD, [test "$enable_nfsrahead" = "yes" ]) ++ if test "$enable_nfsrahead" = yes; then ++ dnl Check for -lmount ++ PKG_CHECK_MODULES([LIBMOUNT], [mount]) ++ fi ++ + AC_ARG_ENABLE(nfsdcltrack, + [AS_HELP_STRING([--disable-nfsdcltrack],[disable NFSv4 clientid tracking programs @<:@default=no@:>@])], + enable_nfsdcltrack=$enableval, +@@ -273,9 +283,6 @@ AC_LIBCAP + dnl Check for -lxml2 + AC_LIBXML2 + +-dnl Check for -lmount +-PKG_CHECK_MODULES([LIBMOUNT], [mount]) +- + # Check whether user wants TCP wrappers support + AC_TCP_WRAPPERS + +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 40c17c37..48fd0cdf 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -12,6 +12,10 @@ if CONFIG_NFSDCLD + OPTDIRS += nfsdclddb + endif + +-SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcctl nfsdclnts nfsrahead $(OPTDIRS) ++if CONFIG_NFSRAHEAD ++OPTDIRS += nfsrahead ++endif ++ ++SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcctl nfsdclnts $(OPTDIRS) + + MAINTAINERCLEANFILES = Makefile.in +-- +2.34.1 + diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index ed205a26b1..1a4a99f566 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -34,6 +34,7 @@ HOST_NFS_UTILS_CONF_OPTS = \ --without-tcp-wrappers \ --with-statedir=/run/nfs \ --disable-caps \ + --disable-nfsrahead \ --without-systemd \ --with-rpcgen=internal \ --with-tirpcinclude=$(HOST_DIR)/include/tirpc @@ -68,12 +69,6 @@ else NFS_UTILS_CONF_OPTS += --disable-caps endif -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) -NFS_UTILS_CONF_OPTS += --enable-uuid -else -NFS_UTILS_CONF_OPTS += --disable-uuid -endif - define NFS_UTILS_INSTALL_FIXUP cd $(TARGET_DIR) && rm -f $(NFS_UTILS_TARGETS_) touch $(TARGET_DIR)/etc/exports From thomas.petazzoni at bootlin.com Tue Feb 7 17:48:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:48:44 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: handle pkg-config in the Autotools standard way for nfsrahead In-Reply-To: <20220919224740.2365011-1-giulio.benetti@benettiengineering.com> References: <20220811224752.1a1e53b7@windsurf> <20220919224740.2365011-1-giulio.benetti@benettiengineering.com> Message-ID: <20230207184844.7a8dfa82@windsurf> On Tue, 20 Sep 2022 00:47:40 +0200 Giulio Benetti wrote: > While using the correct PKG_CHECK_MODULES() approach for libmount we end up > having host-nfs-utils needing libmount. But libmount is only needed by > nfsrahead that we don't need in host-nfs-utils. But we need host-nfs-utils > itself(rpcgen tool specifically) to build nfs-utils. To solve this > recursive situation: > 1) Update the first patch with the upstreamed one that handles libmount > using PKG_CHECK_MODULES(). > 2) Add another patch to allow to disable nfsrahead during building for host > since this tool is not needed and requires libmount. This way the first > patch approach can be correctly used. > 3) Add --disable-nfsrahead to HOST_NFS_UTILS_CONF_OPTS > 4) Remove en/disable-uuid since now it's required by default: > http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=c5528f40f9db5061e06dcf1f9b7fce5185b376c6 > > First patch has been committed: > https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=627c95b2b853161b359095e7fdf05d3b07d51379 > While the second one is pending: > https://lore.kernel.org/linux-nfs/20220919221832.2234294-1-giulio.benetti at benettiengineering.com/ > > Signed-off-by: Giulio Benetti > --- > ...ead-fix-linking-while-static-linking.patch | 39 ++++++++--- > ...e.ac-allow-to-disable-nfsrahead-tool.patch | 68 +++++++++++++++++++ > package/nfs-utils/nfs-utils.mk | 7 +- > 3 files changed, 97 insertions(+), 17 deletions(-) > create mode 100644 package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From angelo at amarulasolutions.com Tue Feb 7 17:51:16 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 18:51:16 +0100 Subject: [Buildroot] [PATCH v4] package/gtkiostream: new package Message-ID: <20230207175116.3043006-1-angelo@amarulasolutions.com> From: Matt Flax This package provides many useful software engineering and signal processing libraries. Signed-off-by: Matt Flax [Angelo: * Bumped to 1.8.0 * Added myself to DEVELOPERS * Added dependency on octave when enable instead of use --disable-octave configure option * Fixes from check-package] Signed-off-by: Angelo Compagnucci --- DEVELOPERS | 4 ++++ package/Config.in | 1 + package/gtkiostream/Config.in | 15 +++++++++++++++ package/gtkiostream/gtkiostream.hash | 3 +++ package/gtkiostream/gtkiostream.mk | 23 +++++++++++++++++++++++ 5 files changed, 46 insertions(+) create mode 100644 package/gtkiostream/Config.in create mode 100644 package/gtkiostream/gtkiostream.hash create mode 100644 package/gtkiostream/gtkiostream.mk diff --git a/DEVELOPERS b/DEVELOPERS index d7c4d03c4c..5355d6d5ac 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -165,6 +165,7 @@ F: package/cups/ F: package/cups-filters/ F: package/fail2ban/ F: package/grep/ +F: package/gtkiostream/ F: package/htpdate/ F: package/i2c-tools/ F: package/jq/ @@ -1978,6 +1979,9 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ +N: Matt Flax +F: package/gtkiostream/ + N: Matt Weber F: board/freescale/p* F: board/freescale/t* diff --git a/package/Config.in b/package/Config.in index 06d0a05854..70e446be47 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1389,6 +1389,7 @@ menu "Audio/Sound" source "package/bcg729/Config.in" source "package/caps/Config.in" source "package/fdk-aac/Config.in" + source "package/gtkiostream/Config.in" source "package/libao/Config.in" source "package/libasplib/Config.in" source "package/libbroadvoice/Config.in" diff --git a/package/gtkiostream/Config.in b/package/gtkiostream/Config.in new file mode 100644 index 0000000000..bb97961587 --- /dev/null +++ b/package/gtkiostream/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_GTKIOSTREAM + bool "gtkiostream" + depends on BR2_INSTALL_LIBSTDCPP # eigen + select BR2_PACKAGE_EIGEN + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_DOUBLE + select BR2_PACKAGE_FFTW_SINGLE + help + This package provides many useful software engineering and + signal processing includes and linkable library. + + https://github.com/flatmax/gtkiostream + +comment "gtkiostream needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/gtkiostream/gtkiostream.hash b/package/gtkiostream/gtkiostream.hash new file mode 100644 index 0000000000..90c754f48c --- /dev/null +++ b/package/gtkiostream/gtkiostream.hash @@ -0,0 +1,3 @@ +# locally computed hash +sha256 44e8d921d462005cd330a1c24e5bd8061175b90ae53f537dbf73f59b74f6e01b gtkiostream-v1.8.0.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 gpl.txt diff --git a/package/gtkiostream/gtkiostream.mk b/package/gtkiostream/gtkiostream.mk new file mode 100644 index 0000000000..3988ae5888 --- /dev/null +++ b/package/gtkiostream/gtkiostream.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# GTKIOSTREAM +# +################################################################################ + +GTKIOSTREAM_VERSION = v1.8.0 +GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,$(GTKIOSTREAM_VERSION)) +GTKIOSTREAM_LICENSE = GPL-2.0+ +GTKIOSTREAM_LICENSE_FILES = gpl.txt +GTKIOSTREAM_DEPENDENCIES = eigen fftw-double fftw-single host-pkgconf + +ifeq ($(BR2_PACKAGE_OCTAVE),y) +GTKIOSTREAM_DEPENDENCIES += octave +GTKIOSTREAM_CONF_OPTS = --enable-octave +else +GTKIOSTREAM_CONF_OPTS = --disable-octave +endif + +# configure script not available +GTKIOSTREAM_AUTORECONF = YES + +$(eval $(autotools-package)) -- 2.25.1 From gsmecher at threespeedlogic.com Tue Feb 7 17:56:54 2023 From: gsmecher at threespeedlogic.com (Graeme Smecher) Date: Tue, 7 Feb 2023 09:56:54 -0800 Subject: [Buildroot] [PATCH v2] package/python-orjson: disallow build when using musl. In-Reply-To: <20230207172902.GO4124@scaer> References: <20220509190650.1348657-2-gsmecher@threespeedlogic.com> <20220519160214.214701-1-gsmecher@threespeedlogic.com> <20230207163803.GI4124@scaer> <20230207172902.GO4124@scaer> Message-ID: Hi Yann, On 2023-02-07 09:29, Yann E. MORIN wrote: > Graeme, All, > > On 2023-02-07 09:14 -0800, Graeme Smecher spake thusly: >> On 2023-02-07 08:38, Yann E. MORIN wrote: >>> On 2022-05-19 09:02 -0700, Graeme Smecher spake thusly: >>>> The python-orjson build bails as follows when using musl libc: >>> I could not reproduce such an error wit the following defconfig: > [--SNIP--] >> This patch is obsolete. I used to receive orjson build failures >> associated with musl on a regular basis - they have tapered off since >> mid-2022. > > In the meantime, Thomas has bisected the resolution to that commit from > James: > > 2cbf1e4d3a1a package/python-orjson: convert to use the python-package infrastructure > > The commit before, it fails to build; with that commit, the build > succeeds. Excellent - two birds, one stone. Thanks again for all your work. best, Graeme From arnout at mind.be Tue Feb 7 17:58:01 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 18:58:01 +0100 Subject: [Buildroot] [PATCH v8 3/4] package/systemd: support dnssec if openssl is available In-Reply-To: <20230115114840.9027-3-nolange79@gmail.com> References: <20230115114840.9027-1-nolange79@gmail.com> <20230115114840.9027-3-nolange79@gmail.com> Message-ID: <06c65863-83a5-6002-5a06-56c41611699d@mind.be> On 15/01/2023 12:48, Norbert Lange wrote: > Set -Ddefault-dnssec=allow-downgrade if openssl is available as both > openssl and gcrypt are now supported for dnssec. > > Signed-off-by: Norbert Lange > Reviewed-by: James Hilliard Applied to master, thanks. (Still not pushed - systemd runtime tests are failing locally, I'm trying to see if this was already the case before the version bump.) Regards, Arnout > > --- > v6->v7: > > * split off as its own patch > * seems that the change was done at v250 or earlier > --- > package/systemd/systemd.mk | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index f49d34d32f..297cc400ee 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -246,9 +246,9 @@ endif > > ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > SYSTEMD_DEPENDENCIES += libgcrypt > -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade -Dgcrypt=true > +SYSTEMD_CONF_OPTS += -Dgcrypt=true > else > -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no -Dgcrypt=false > +SYSTEMD_CONF_OPTS += -Dgcrypt=false > endif > > ifeq ($(BR2_PACKAGE_P11_KIT),y) > @@ -318,6 +318,12 @@ else > SYSTEMD_CONF_OPTS += -Dselinux=false > endif > > +ifneq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_LIBOPENSSL),) > +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade > +else > +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no > +endif > + > ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) > SYSTEMD_CONF_OPTS += -Dhwdb=true > define SYSTEMD_BUILD_HWDB From romain.naour at smile.fr Tue Feb 7 18:04:23 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 19:04:23 +0100 Subject: [Buildroot] [PATCH v4] package/gtkiostream: new package In-Reply-To: <20230207175116.3043006-1-angelo@amarulasolutions.com> References: <20230207175116.3043006-1-angelo@amarulasolutions.com> Message-ID: <51fbd11a-26ef-78fa-3ced-61648adc5a9f@smile.fr> Hello Angelo, Le 07/02/2023 ? 18:51, Angelo Compagnucci a ?crit?: > From: Matt Flax > > This package provides many useful software engineering and signal > processing libraries. > > Signed-off-by: Matt Flax > [Angelo: > * Bumped to 1.8.0 > * Added myself to DEVELOPERS > * Added dependency on octave when enable instead of use > --disable-octave configure option > * Fixes from check-package] > Signed-off-by: Angelo Compagnucci > --- > DEVELOPERS | 4 ++++ > package/Config.in | 1 + > package/gtkiostream/Config.in | 15 +++++++++++++++ > package/gtkiostream/gtkiostream.hash | 3 +++ > package/gtkiostream/gtkiostream.mk | 23 +++++++++++++++++++++++ > 5 files changed, 46 insertions(+) > create mode 100644 package/gtkiostream/Config.in > create mode 100644 package/gtkiostream/gtkiostream.hash > create mode 100644 package/gtkiostream/gtkiostream.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index d7c4d03c4c..5355d6d5ac 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -165,6 +165,7 @@ F: package/cups/ > F: package/cups-filters/ > F: package/fail2ban/ > F: package/grep/ > +F: package/gtkiostream/ > F: package/htpdate/ > F: package/i2c-tools/ > F: package/jq/ > @@ -1978,6 +1979,9 @@ F: board/technologic/ts4900/ > F: configs/ts4900_defconfig > F: package/ts4900-fpga/ > > +N: Matt Flax > +F: package/gtkiostream/ > + > N: Matt Weber > F: board/freescale/p* > F: board/freescale/t* > diff --git a/package/Config.in b/package/Config.in > index 06d0a05854..70e446be47 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1389,6 +1389,7 @@ menu "Audio/Sound" > source "package/bcg729/Config.in" > source "package/caps/Config.in" > source "package/fdk-aac/Config.in" > + source "package/gtkiostream/Config.in" > source "package/libao/Config.in" > source "package/libasplib/Config.in" > source "package/libbroadvoice/Config.in" > diff --git a/package/gtkiostream/Config.in b/package/gtkiostream/Config.in > new file mode 100644 > index 0000000000..bb97961587 > --- /dev/null > +++ b/package/gtkiostream/Config.in > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_GTKIOSTREAM > + bool "gtkiostream" > + depends on BR2_INSTALL_LIBSTDCPP # eigen > + select BR2_PACKAGE_EIGEN > + select BR2_PACKAGE_FFTW > + select BR2_PACKAGE_FFTW_DOUBLE > + select BR2_PACKAGE_FFTW_SINGLE > + help > + This package provides many useful software engineering and > + signal processing includes and linkable library. > + > + https://github.com/flatmax/gtkiostream > + > +comment "gtkiostream needs a toolchain w/ C++" > + depends on !BR2_INSTALL_LIBSTDCPP > diff --git a/package/gtkiostream/gtkiostream.hash b/package/gtkiostream/gtkiostream.hash > new file mode 100644 > index 0000000000..90c754f48c > --- /dev/null > +++ b/package/gtkiostream/gtkiostream.hash > @@ -0,0 +1,3 @@ > +# locally computed hash > +sha256 44e8d921d462005cd330a1c24e5bd8061175b90ae53f537dbf73f59b74f6e01b gtkiostream-v1.8.0.tar.gz > +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 gpl.txt > diff --git a/package/gtkiostream/gtkiostream.mk b/package/gtkiostream/gtkiostream.mk > new file mode 100644 > index 0000000000..3988ae5888 > --- /dev/null > +++ b/package/gtkiostream/gtkiostream.mk > @@ -0,0 +1,23 @@ > +################################################################################ > +# > +# GTKIOSTREAM > +# > +################################################################################ > + > +GTKIOSTREAM_VERSION = v1.8.0 > +GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,$(GTKIOSTREAM_VERSION)) > +GTKIOSTREAM_LICENSE = GPL-2.0+ > +GTKIOSTREAM_LICENSE_FILES = gpl.txt > +GTKIOSTREAM_DEPENDENCIES = eigen fftw-double fftw-single host-pkgconf > + It always useful to use distribution packaging to find any missing dependencies (mentatory or optional) like gtk2 (hence the package name :) ) https://github.com/flatmax/gtkiostream/blob/master/debian/control#L14 Can you double check ? > +ifeq ($(BR2_PACKAGE_OCTAVE),y) > +GTKIOSTREAM_DEPENDENCIES += octave > +GTKIOSTREAM_CONF_OPTS = --enable-octave This trigger a checkpackage warning: package/gtkiostream/gtkiostream.mk:15: conditional override of variable GTKIOSTREAM_CONF_OPTS Best regards, Romain > +else > +GTKIOSTREAM_CONF_OPTS = --disable-octave > +endif > + > +# configure script not available > +GTKIOSTREAM_AUTORECONF = YES > + > +$(eval $(autotools-package)) From nolange79 at gmail.com Tue Feb 7 18:38:15 2023 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 7 Feb 2023 19:38:15 +0100 Subject: [Buildroot] [PATCH v8 1/4] package/systemd: bump to version 252.4 In-Reply-To: <6490dfd6-5f3b-3801-6955-7fa655f2a82b@mind.be> References: <20230115114840.9027-1-nolange79@gmail.com> <6490dfd6-5f3b-3801-6955-7fa655f2a82b@mind.be> Message-ID: Am Di., 7. Feb. 2023 um 17:41 Uhr schrieb Arnout Vandecappelle : > > > > On 15/01/2023 12:48, Norbert Lange wrote: > > Following files changed *license* from CC0-1.0 to MIT-0: > > > > - src/systemctl/systemd-sysv-install.SKELETON > > - config files > > - examples under /network > > > > The file LICENSES/MIT-0.txt has been added for this reason, > > hashes added, corrected for LICENSES/README.md. > > > > Kernel version 3.15 is now the bare minimum, but only > > version 4.15 and higher are fully supported and tested: > > > > - bump kernel header dependencies > > - correct kconfig description > > - improvements to make the kconfig description better reflect > > the information from the README > > > > Remove upstreamed patch. > > This is not actually done in this v8, probably left over from some earlier > version. possibly lost when rebasing > > > > > Set new options to their default, remove -Defi-cc option. > > > > Set -Ddbus=false to ensure dbus dependency is runtime only. > > > > Set -Ddbus-interfaces-dir=no as interface XML file generation is > > not supported when cross compiling. > > I guess we could set this to yes for host-systemd, then copy the XML files to > target. But they probably depend to some extent on the configuration, and it > adds a lot to build time, and I doubt it is very useful to begin with... Dont know what they are used for, outside of dev tools > > > > > Set -Ddefault-user-shell=/bin/sh to the always available shell. > > > > Signed-off-by: Norbert Lange > > Reviewed-by: James Hilliard > > [snip] > > --- > > > > License diff for illustration > > > > --- systemd-stable-250.4/LICENSES/README.md > > +++ systemd-stable-252.1/LICENSES/README.md > > @@ -45,9 +45,11 @@ > > * the following sources are licensed under the **CC0-1.0** license: > > - src/basic/siphash24.c > > - src/basic/siphash24.h > > - - src/systemctl/systemd-sysv-install.SKELETON > > - tools/check-includes.pl > > + * the following sources are licensed under the **MIT-0** license: > > - all examples under man/ > > + - src/systemctl/systemd-sysv-install.SKELETON > > + - config files and examples under /network > > * the following sources are under **Public Domain** (LicenseRef-murmurhash2-public-domain): > > - src/basic/MurmurHash2.c > > - src/basic/MurmurHash2.h > > Very nice that you include this! However, git-am (and patchwork) interpret > this as a hunk of the overall patch, so it fails and I had to manually adapt. In > the future, please prefix with a space or something to avoid that. Ok, but I probably forget it till I the next time, my git commit message scheme is a fuzzy copy of stuff I seen. > > Applied to master, thanks. (Not pushed yet, I may make more changes while > reviewing the rest of the series.) Wouldnt mind if you do a stealthy bump to 254.5 before going through all testing trouble ;) Regards, Norbert > > Regards, > Arnout > > > > > package/systemd: 252.4 > > --- > > package/systemd/Config.in | 12 +++++++++--- > > package/systemd/systemd.hash | 5 +++-- > > package/systemd/systemd.mk | 16 ++++++++++++++-- > > system/Config.in | 6 +++--- > > 4 files changed, 29 insertions(+), 10 deletions(-) > > > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > > index 45a9e2d644..f35305c0be 100644 > > --- a/package/systemd/Config.in > > +++ b/package/systemd/Config.in > > @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > > depends on !BR2_STATIC_LIBS # kmod > > depends on BR2_TOOLCHAIN_USES_GLIBC > > depends on BR2_TOOLCHAIN_HAS_SSP > > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 > > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 > > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > > depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd > > select BR2_PACKAGE_HAS_UDEV > > @@ -51,7 +51,11 @@ menuconfig BR2_PACKAGE_SYSTEMD > > an elaborate transactional dependency-based service control > > logic. It can work as a drop-in replacement for sysvinit. > > > > - Systemd requires a Linux kernel >= 3.13 with the following > > + Kernel versions below 4.15 ("recommended baseline") have > > + significant gaps in functionality and are not recommended > > + for use with this version of systemd. > > + > > + Systemd requires a Linux kernel >= 3.15 with the following > > options enabled: > > > > - CONFIG_DEVTMPFS > > @@ -66,9 +70,11 @@ menuconfig BR2_PACKAGE_SYSTEMD > > - CONFIG_PROC_FS > > - CONFIG_FHANDLE (libudev, mount and bind mount handling) > > > > - - CONFIG_NET_NS (needed by PrivateNetwork=, used in some > > + - CONFIG_NET_NS (Required for PrivateNetwork=, used in some > > systemd units) > > > > + - CONFIG_USER_NS (Required for PrivateUsers=) > > + > > - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS > > - CONFIG_TMPFS_POSIX_ACL > > - CONFIG_TMPFS_XATTR > > diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash > > index 3b98566f32..00c08edcd9 100644 > > --- a/package/systemd/systemd.hash > > +++ b/package/systemd/systemd.hash > > @@ -1,5 +1,5 @@ > > # sha256 locally computed > > -sha256 638a2fc78828765fc97bc73f428205b6dc1d359149b6c6bfe4d2a649cba2cca8 systemd-250.8.tar.gz > > +sha256 cf2d27e67663d599a045101c7178cf0ec63d9df2962a54adf7de0d0357724f00 systemd-252.4.tar.gz > > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 > > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 > > sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt > > @@ -8,7 +8,8 @@ sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENS > > sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 LICENSES/LGPL-2.0-or-later.txt > > sha256 5bcef4fedbfc08776630e65d5d0d074dd31208037eddb167ca46a9ec4f737764 LICENSES/Linux-syscall-note.txt > > sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENSES/lookup3-public-domain.txt > > +sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENSES/MIT-0.txt > > sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt > > sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt > > sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt > > -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md > > +sha256 da9b2c7b8cd10516fd2c4279b82496ea61787148f13e899c62fc8988c5fac34f LICENSES/README.md > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index b96873b73f..b0597f9bb4 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.8 > > +SYSTEMD_VERSION = 252.4 > > SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) > > SYSTEMD_LICENSE = \ > > LGPL-2.1+, \ > > @@ -29,6 +29,7 @@ SYSTEMD_LICENSE = \ > > BSD-3-Clause (tools/chromiumos), \ > > CC0-1.0 (few source files, see LICENSES/README.md), \ > > GPL-2.0 with Linux-syscall-note (linux kernel headers), \ > > + MIT-0 (few source files, see LICENSES/README.md), \ > > MIT (few source files, see LICENSES/README.md), \ > > OFL-1.1 (Heebo fonts) > > SYSTEMD_LICENSE_FILES = \ > > @@ -40,6 +41,7 @@ SYSTEMD_LICENSE_FILES = \ > > LICENSES/LGPL-2.0-or-later.txt \ > > LICENSES/Linux-syscall-note.txt \ > > LICENSES/lookup3-public-domain.txt \ > > + LICENSES/MIT-0.txt \ > > LICENSES/MIT.txt \ > > LICENSES/murmurhash2-public-domain.txt \ > > LICENSES/OFL-1.1.txt \ > > @@ -61,7 +63,13 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg > > SYSTEMD_PROVIDES = udev > > > > SYSTEMD_CONF_OPTS += \ > > + -Ddbus=false \ > > + -Ddbus-interfaces-dir=no \ > > + -Ddefault-compression='auto' \ > > -Ddefault-hierarchy=unified \ > > + -Ddefault-locale='C.UTF-8' \ > > + -Ddefault-user-shell=/bin/sh \ > > + -Dfirst-boot-full-preset=false \ > > -Didn=true \ > > -Dima=false \ > > -Dkexec-path=/usr/sbin/kexec \ > > @@ -72,6 +80,7 @@ SYSTEMD_CONF_OPTS += \ > > -Dman=false \ > > -Dmount-path=/usr/bin/mount \ > > -Dmode=release \ > > + -Dnspawn-locale='C.UTF-8' \ > > -Dnss-systemd=true \ > > -Dquotacheck-path=/usr/sbin/quotacheck \ > > -Dquotaon-path=/usr/sbin/quotaon \ > > @@ -82,6 +91,7 @@ SYSTEMD_CONF_OPTS += \ > > -Dsulogin-path=/usr/sbin/sulogin \ > > -Dsystem-gid-max=999 \ > > -Dsystem-uid-max=999 \ > > + -Dsysupdate=false \ > > -Dsysvinit-path= \ > > -Dsysvrcnd-path= \ > > -Dtelinit-path= \ > > @@ -553,7 +563,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi > > SYSTEMD_CONF_OPTS += \ > > -Defi=true \ > > -Dgnu-efi=true \ > > - -Defi-cc=$(TARGET_CC) \ > > -Defi-ld=bfd \ > > -Defi-libdir=$(STAGING_DIR)/usr/lib \ > > -Defi-includedir=$(STAGING_DIR)/usr/include/efi > > @@ -793,6 +802,8 @@ HOST_SYSTEMD_CONF_OPTS = \ > > -Dbinfmt=false \ > > -Drepart=false \ > > -Dcoredump=false \ > > + -Ddbus=false \ > > + -Ddbus-interfaces-dir=no \ > > -Dpstore=false \ > > -Doomd=false \ > > -Dlogind=false \ > > @@ -801,6 +812,7 @@ HOST_SYSTEMD_CONF_OPTS = \ > > -Dmachined=false \ > > -Dportabled=false \ > > -Dsysext=false \ > > + -Dsysupdate=false \ > > -Duserdb=false \ > > -Dhomed=false \ > > -Dnetworkd=false \ > > diff --git a/system/Config.in b/system/Config.in > > index 806a747315..232bdfe763 100644 > > --- a/system/Config.in > > +++ b/system/Config.in > > @@ -125,19 +125,19 @@ config BR2_INIT_SYSTEMD > > depends on BR2_TOOLCHAIN_USES_GLIBC > > depends on BR2_TOOLCHAIN_HAS_SSP > > depends on BR2_TOOLCHAIN_HAS_THREADS > > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 > > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 > > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > > depends on BR2_HOST_GCC_AT_LEAST_5 > > select BR2_ROOTFS_MERGED_USR > > select BR2_PACKAGE_SYSTEMD > > select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT > > > > -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5" > > +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" > > depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS > > depends on BR2_USE_MMU > > depends on !BR2_TOOLCHAIN_USES_GLIBC || \ > > !BR2_TOOLCHAIN_HAS_SSP || \ > > - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || \ > > + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ > > !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ > > !BR2_HOST_GCC_AT_LEAST_5 > > From nolange79 at gmail.com Tue Feb 7 18:42:23 2023 From: nolange79 at gmail.com (Norbert Lange) Date: Tue, 7 Feb 2023 19:42:23 +0100 Subject: [Buildroot] [PATCH v8 2/4] package/systemd: Add config option for sysupdate feature In-Reply-To: <65c21c58-0a25-50b0-0e35-f8b4da7abac3@mind.be> References: <20230115114840.9027-1-nolange79@gmail.com> <20230115114840.9027-2-nolange79@gmail.com> <65c21c58-0a25-50b0-0e35-f8b4da7abac3@mind.be> Message-ID: Am Di., 7. Feb. 2023 um 18:16 Uhr schrieb Arnout Vandecappelle : > > > > On 15/01/2023 12:48, Norbert Lange wrote: > > Support the new feature added with v251, > > requires openssl. > > > > Signed-off-by: Norbert Lange > > Reviewed-by: James Hilliard > > --- > > package/systemd/Config.in | 12 ++++++++++++ > > package/systemd/systemd.mk | 7 ++++++- > > 2 files changed, 18 insertions(+), 1 deletion(-) > > > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > > index f35305c0be..9278772951 100644 > > --- a/package/systemd/Config.in > > +++ b/package/systemd/Config.in > > @@ -481,6 +481,18 @@ config BR2_PACKAGE_SYSTEMD_SYSEXT > > > > https://www.freedesktop.org/software/systemd/man/systemd-sysext.html > > > > +config BR2_PACKAGE_SYSTEMD_SYSUPDATE > > + bool "enable sysupdate support" > > + select BR2_PACKAGE_OPENSSL > > + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL > > + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK > > AFAIU, sysupdate uses its own particular way of doing A/B updates (by updating > the GPT partition table) which is only supported by systemd-boot. Although I > suppose it's possible to write a U-Boot script that does the same thing... So I > added a note here to that effect. I don't suppose you actually used this option? I dont think thats the case, there is only some way of measuring successfull boots, sysupdate is just a part of the puzzle, you will have to do some additional work for sure. No, I havent used it. > > > Applied to master, thanks. > > Regards, > Arnout Regards, Norbert > > > > + help > > + systemd-sysupdate atomically updates the host OS, container > > + images, portable service images or other sources, based on > > + the transfer configuration files described in sysupdate.d. > > + > > + https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html > > + > > config BR2_PACKAGE_SYSTEMD_SYSUSERS > > bool "enable sysusers support" > > help > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index b0597f9bb4..f49d34d32f 100644 > > --- a/package/systemd/systemd.mk > > +++ b/package/systemd/systemd.mk > > @@ -91,7 +91,6 @@ SYSTEMD_CONF_OPTS += \ > > -Dsulogin-path=/usr/sbin/sulogin \ > > -Dsystem-gid-max=999 \ > > -Dsystem-uid-max=999 \ > > - -Dsysupdate=false \ > > -Dsysvinit-path= \ > > -Dsysvrcnd-path= \ > > -Dtelinit-path= \ > > @@ -489,6 +488,12 @@ else > > SYSTEMD_CONF_OPTS += -Dsysext=false > > endif > > > > +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) > > +SYSTEMD_CONF_OPTS += -Dsysupdate=true > > +else > > +SYSTEMD_CONF_OPTS += -Dsysupdate=false > > +endif > > + > > ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) > > SYSTEMD_CONF_OPTS += -Dnetworkd=true > > SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management From john at metanate.com Tue Feb 7 19:58:10 2023 From: john at metanate.com (John Keeping) Date: Tue, 7 Feb 2023 19:58:10 +0000 Subject: [Buildroot] [PATCH v2] package/gcc: map debug prefix when reproducible Message-ID: <20230207195810.2016594-1-john@metanate.com> When building with BR2_REPRODUCIBLE the toolchain wrapper passes -fdebug-prefix-map for all packages that are built. But this doesn't affect the target libraries (like libgcc) built by GCC's build system. GCC 4.3 added a configure option to set the debug prefix map for these libraries, which is used here to avoid encoding potentially non-reproducible build paths into the debug data. Signed-off-by: John Keeping --- Changes since v1: - Add the option to GCC common config, not just gcc-final package/gcc/gcc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index ec6f3b550a..6dfd93f2a4 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -84,6 +84,10 @@ HOST_GCC_COMMON_CONF_OPTS = \ --with-bugurl="http://bugs.buildroot.net/" \ --without-zstd +ifeq ($(BR2_REPRODUCIBLE),y) +HOST_GCC_COMMON_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot +endif + # Don't build documentation. It takes up extra space / build time, # and sometimes needs specific makeinfo versions to work HOST_GCC_COMMON_CONF_ENV = \ -- 2.39.1 From john at metanate.com Tue Feb 7 20:05:17 2023 From: john at metanate.com (John Keeping) Date: Tue, 7 Feb 2023 20:05:17 +0000 Subject: [Buildroot] [PATCH] package/gcc/gcc-final: map debug prefix when reproducible In-Reply-To: <20230207135503.GF4124@scaer> References: <20230206162617.1907911-1-john@metanate.com> <20230207135503.GF4124@scaer> Message-ID: Hi Yann, On Tue, Feb 07, 2023 at 02:55:03PM +0100, Yann E. MORIN wrote: > On 2023-02-06 16:26 +0000, John Keeping spake thusly: > > When building with BR2_REPRODUCIBLE the toolchain wrapper passes > > -fdebug-prefix-map for all packages that are built. But this doesn't > > affect the target libraries (like libgcc) built by GCC's build system. > > > > GCC 4.3 added a configure option to set the debug prefix map for these > > libraries, which is used here to avoid encoding potentially > > non-reproducible build paths into the debug data. > > Thanks, this is indeed very interesting. We (briefly) discussed this at > the developers day minutes ago, and the question that was brought up > was: why is not needed for the first-stage compiler? > > Indeed, the first-stage compiler builds objects files that are then used > by the C library, we would expect the debug symbols for those to also > need prefix mapping. > > Could you look into that, and either pass the option to both the initial > and final gcc if needed, or explain in the commit log why it is not > needed for the initial gcc, please? I've just sent v2 which moves this to HOST_GCC_COMMON_CONF_OPTS. You're right that some files are affected by the initial compiler - I missed it by focusing on executables (nearly all of which link libgcc.a) when the initial compiler only affects some of glibc's shared objects. I've been testing this with --enable-linker-build-id in the configure options as well to see whether it's possible to enable build IDs for reproducible builds and this change gets a lot closer - the differences are now a handful of files that embed an RPATH pointing to .libs during the build. John From flaniel at linux.microsoft.com Tue Feb 7 20:10:08 2023 From: flaniel at linux.microsoft.com (Francis Laniel) Date: Tue, 07 Feb 2023 21:10:08 +0100 Subject: [Buildroot] [PATCH] package/libbpf: Don't remove bpf.h on host In-Reply-To: References: Message-ID: <12146851.O9o76ZdvQC@pwmachine> Hi. Le lundi 28 novembre 2022, 16:06:20 CET Lang Daniel a ?crit : > libbpf >1.0.0 defines libbpf_bpf_link_type_str(enum bpf_link_type) in > src/libbpf.h, which is included by host-pahole. > bpf_link_type is defined in linux/bpf.h, therefore the comment stating > that pahole doesn't need bpf.h is no longer valid. > > Fixes: > - > http://autobuild.buildroot.net/results/d126a4b6eca786402dc362c86f8df3addec3 > d217/ > > Signed-off-by: Daniel Lang > --- > I wasn't able to reproduce the mentioned compile error in the kernel. > The mentioned file (tools/lib/bpf/strset.c) shouldn't be compiled when > compiling the kernel as it would recompile libbpf. > --- > package/libbpf/libbpf.mk | 17 +---------------- > 1 file changed, 1 insertion(+), 16 deletions(-) > > diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk > index 820f1dc4bf..0381fd833a 100644 > --- a/package/libbpf/libbpf.mk > +++ b/package/libbpf/libbpf.mk > @@ -39,26 +39,11 @@ define LIBBPF_INSTALL_TARGET_CMDS > -C $(@D)/src install DESTDIR=$(TARGET_DIR) > endef > > -# We need to install_uapi_headers so we have btf.h to compile > -# host-pahole. > -# Nonetheless, this target adds bpf.h which generates a conflict when > -# building the kernel: > -# In file included from libbpf_internal.h:17:0, from strset.c:9: > -# relo_core.h:10:6: error: nested redefinition of 'enum bpf_core_relo_kind' > -# enum bpf_core_relo_kind { > -# ^~~~~~~~~~~~~~~~~~ > -# relo_core.h:10:6: error: redeclaration of 'enum bpf_core_relo_kind' > -# In file included from libbpf_legacy.h:13:0, > -# from libbpf_internal.h:16, > -# from strset.c:9: > -# /home/francis/buildroot/output/host/include/linux/bpf.h:6497:6: note: > originally defined here -# enum bpf_core_relo_kind { > -# So, better to remove remove it now since we do not need it to build > +# We need to install_uapi_headers so we have bpf.h and btf.h to compile > # host-pahole, the only user of host-libbpf. > define HOST_LIBBPF_INSTALL_CMDS > $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ > -C $(@D)/src install install_uapi_headers DESTDIR=$(HOST_DIR) > - rm $(HOST_DIR)/include/linux/bpf.h > endef > > $(eval $(generic-package)) Thank you for this patch and sorry for my very late reply. Sadly, I do not think the patch addresses the underlying issue. Indeed, this is not pahole which does not need this file, as pahole relies on to be built. So, the whole point of this comment and the rm is to avoid a problem when building the kernel when pahole was built before. Sadly, I tested your patch and I hit the problem described in the comment regarding redefinition of bpf_core_relo_kind. Did you also hit it or you were able to build the kernel with BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE? Best regards and thank you in advance. From angelo at amarulasolutions.com Tue Feb 7 20:50:41 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 21:50:41 +0100 Subject: [Buildroot] [PATCH v4] package/gtkiostream: new package In-Reply-To: <46eeb5ff-ea1e-acdd-3ab8-3dc945c9fa40@flatmax.com> References: <20230207175116.3043006-1-angelo@amarulasolutions.com> <51fbd11a-26ef-78fa-3ced-61648adc5a9f@smile.fr> <46eeb5ff-ea1e-acdd-3ab8-3dc945c9fa40@flatmax.com> Message-ID: On Tue, Feb 7, 2023 at 9:47 PM Matt Flax wrote: > > On 8/2/23 05:04, Romain Naour wrote: > > Hello Angelo, > > > > Le 07/02/2023 ? 18:51, Angelo Compagnucci a ?crit : > > It always useful to use distribution packaging to find any missing > dependencies > > (mentatory or optional) like gtk2 (hence the package name :) ) > > > > https://github.com/flatmax/gtkiostream/blob/master/debian/control#L14 > > > > Can you double check ? > > > Hey all, great to see my original patch revitalised after many many > months - I am keen for gtkiostream to be absorbed into buildroot. > > gtk2 and gtk3 are optional with this library - despite its name - it is > really now focused on signal processing, ALSA C++, neural networks, > software engineering, etc.. The gtk side of things works nicely with > gtk2 but requires attention for gtk3 - I originally opted to leave > gtk2/3 out entirely in buildroot - I think it is the best solution for now. > Thanks Matt for the very clear explanation, I was about to reply gtk is optional. Even more because it requires the addition of libgtkdatabox which is actually not present in buildroot. Looking at the code, It's not clear if opencv or sox are really that necessary without a gui, but I think we could leave them out. -- 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 Tue Feb 7 21:09:34 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 7 Feb 2023 22:09:34 +0100 Subject: [Buildroot] [PATCH v5] package/gtkiostream: new package Message-ID: <20230207210934.3132539-1-angelo@amarulasolutions.com> From: Matt Flax This package provides many useful software engineering and signal processing libraries. The package offer also a GUI written in GTK which requires several missing packages and therefore is left disabled. Signed-off-by: Matt Flax Signed-off-by: Angelo Compagnucci --- v4: * Bumped to 1.8.0 * Added myself to DEVELOPERS * Added dependency on octave when enable instead of use --disable-octave configure option * Fixes from check-package v5: * Fixed wrong syntax (Romain) * Added optional dependency on sox (Matt) DEVELOPERS | 4 ++++ package/Config.in | 1 + package/gtkiostream/Config.in | 15 +++++++++++++++ package/gtkiostream/gtkiostream.hash | 3 +++ package/gtkiostream/gtkiostream.mk | 25 +++++++++++++++++++++++++ 5 files changed, 48 insertions(+) create mode 100644 package/gtkiostream/Config.in create mode 100644 package/gtkiostream/gtkiostream.hash create mode 100644 package/gtkiostream/gtkiostream.mk diff --git a/DEVELOPERS b/DEVELOPERS index d7c4d03c4c..5355d6d5ac 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -165,6 +165,7 @@ F: package/cups/ F: package/cups-filters/ F: package/fail2ban/ F: package/grep/ +F: package/gtkiostream/ F: package/htpdate/ F: package/i2c-tools/ F: package/jq/ @@ -1978,6 +1979,9 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ +N: Matt Flax +F: package/gtkiostream/ + N: Matt Weber F: board/freescale/p* F: board/freescale/t* diff --git a/package/Config.in b/package/Config.in index 06d0a05854..70e446be47 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1389,6 +1389,7 @@ menu "Audio/Sound" source "package/bcg729/Config.in" source "package/caps/Config.in" source "package/fdk-aac/Config.in" + source "package/gtkiostream/Config.in" source "package/libao/Config.in" source "package/libasplib/Config.in" source "package/libbroadvoice/Config.in" diff --git a/package/gtkiostream/Config.in b/package/gtkiostream/Config.in new file mode 100644 index 0000000000..bb97961587 --- /dev/null +++ b/package/gtkiostream/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_GTKIOSTREAM + bool "gtkiostream" + depends on BR2_INSTALL_LIBSTDCPP # eigen + select BR2_PACKAGE_EIGEN + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_DOUBLE + select BR2_PACKAGE_FFTW_SINGLE + help + This package provides many useful software engineering and + signal processing includes and linkable library. + + https://github.com/flatmax/gtkiostream + +comment "gtkiostream needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/gtkiostream/gtkiostream.hash b/package/gtkiostream/gtkiostream.hash new file mode 100644 index 0000000000..90c754f48c --- /dev/null +++ b/package/gtkiostream/gtkiostream.hash @@ -0,0 +1,3 @@ +# locally computed hash +sha256 44e8d921d462005cd330a1c24e5bd8061175b90ae53f537dbf73f59b74f6e01b gtkiostream-v1.8.0.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 gpl.txt diff --git a/package/gtkiostream/gtkiostream.mk b/package/gtkiostream/gtkiostream.mk new file mode 100644 index 0000000000..f110e6c149 --- /dev/null +++ b/package/gtkiostream/gtkiostream.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# GTKIOSTREAM +# +################################################################################ + +GTKIOSTREAM_VERSION = v1.8.0 +GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,$(GTKIOSTREAM_VERSION)) +GTKIOSTREAM_LICENSE = GPL-2.0+ +GTKIOSTREAM_LICENSE_FILES = gpl.txt +GTKIOSTREAM_DEPENDENCIES = eigen fftw-double fftw-single host-pkgconf + +GTKIOSTREAM_DEPENDENCIES += $(if $(BR2_PACKAGE_SOX),sox) + +ifeq ($(BR2_PACKAGE_OCTAVE),y) +GTKIOSTREAM_DEPENDENCIES += octave +GTKIOSTREAM_CONF_OPTS += --enable-octave +else +GTKIOSTREAM_CONF_OPTS += --disable-octave +endif + +# configure script not available +GTKIOSTREAM_AUTORECONF = YES + +$(eval $(autotools-package)) -- 2.25.1 From thomas.petazzoni at bootlin.com Tue Feb 7 21:20:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:20:54 +0100 Subject: [Buildroot] [PATCH 1/2] package/skeleton-init-openrc: prepare runlevels from make over skeleton In-Reply-To: <20220622212045.573-1-james.knight@collins.com> References: <20220622212045.573-1-james.knight@collins.com> Message-ID: <20230207222054.39573a80@windsurf> Hello James, On Wed, 22 Jun 2022 17:20:44 -0400 James Knight via buildroot wrote: > The following commit changes the creation of an OpenRC environment's > `/etc/runlevels/default/sysv-rcs` symbolic link from the skeleton to > inside the package's Makefile (triggered from the > `SKELETON_INIT_OPENRC_INSTALL_TARGET_CMDS` call). The original symlink > to a `/etc/init.d/sysv-rcs` path may not gracefully work for all > developer environments. For example, on a fresh checkout in a Windows > environment, the symbolic link may be automatically updated to > include a drive specification. For example: > > $ git diff > diff --git a/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs b/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs > index ef5e00823c..e417b4bb44 120000 > --- a/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs > +++ b/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs > @@ -1 +1 @@ > -/etc/init.d/sysv-rcs > \ No newline at end of file > +G:/etc/init.d/sysv-rcs > \ No newline at end of file > > If a developer built with fresh checkout using an example > `qemu_x86_defconfig` tailored to target an OpenRC init system, an > improper symlink can be observed in the target system: > > ... > Welcome to Buildroot > buildroot login: root > Jun 22 20:42:34 login[971]: root login on 'console' > # /etc/runlevels/default/sysv-rcs --version > -sh: /etc/runlevels/default/sysv-rcs: not found > # readlink /etc/runlevels/default/sysv-rcs > /??/G:/etc/init.d/sysv-rcs > # /etc/init.d/sysv-rcs --version > sysv-rcs (OpenRC) 0.43.3 (Buildroot 2022.05-225-g64390b6c42-dirty) > > By switching from having the symbolic link in the skeleton file to > building it during the package's install stage, this (1) prevents > oddities with a Git working environment on environments like Windows, > as well as (2) ensures a proper symlink is created in a Windows > environment. For example: > > # readlink /etc/runlevels/default/sysv-rcs > /etc/init.d/sysv-rcs > # /etc/runlevels/default/sysv-rcs --version > sysv-rcs (OpenRC) 0.43.3 (Buildroot 2022.05-225-g64390b6c42-dirty) > > Signed-off-by: James Knight Thanks for the patch, but the proposed solution is not really desirable, and in fact is probably not the full explanation. Indeed, the OpenRC skeleton in package/skeleton-init-openrc/skeleton/ has plenty of other symlinks, and you didn't complain about them. However, one key difference between the symlinks in package/skeleton-init-openrc/skeleton/ and the sysv-rcs symlink your patch is fixing is that the former symlinks have a relative path to the target, while the latter have a relative path to the target. Could you try instead to change this symlink to use a relative path to its target? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Tue Feb 7 21:23:22 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 22:23:22 +0100 Subject: [Buildroot] [PATCH v4] package/gtkiostream: new package In-Reply-To: References: <20230207175116.3043006-1-angelo@amarulasolutions.com> <51fbd11a-26ef-78fa-3ced-61648adc5a9f@smile.fr> <46eeb5ff-ea1e-acdd-3ab8-3dc945c9fa40@flatmax.com> Message-ID: Hello, Le 07/02/2023 ? 21:59, Matt Flax a ?crit?: > > On 8/2/23 07:50, Angelo Compagnucci wrote: >> >> >> On Tue, Feb 7, 2023 at 9:47 PM Matt Flax wrote: >> >> >> ??? On 8/2/23 05:04, Romain Naour wrote: >> ??? > Hello Angelo, >> ??? > >> ??? > Le 07/02/2023 ? 18:51, Angelo Compagnucci a ?crit?: >> ??? > It always useful to use distribution packaging to find any >> ??? missing dependencies >> ??? > (mentatory or optional) like gtk2 (hence the package name :) ) >> ??? > >> ??? > >> ??? https://github.com/flatmax/gtkiostream/blob/master/debian/control#L14 >> ??? > >> ??? > Can you double check ? >> >> >> ??? Hey all, great to see my original patch revitalised after many many >> ??? months - I am keen for gtkiostream to be absorbed into buildroot. >> >> ??? gtk2 and gtk3 are optional with this library - despite its name - >> ??? it is >> ??? really now focused on signal processing, ALSA C++, neural networks, >> ??? software engineering, etc.. The gtk side of things works nicely with >> ??? gtk2 but requires attention for gtk3 - I originally opted to leave >> ??? gtk2/3 out entirely in buildroot - I think it is the best solution >> ??? for now. >> >> >> Thanks Matt for the very clear explanation, I was about to reply gtk is optional. >> >> Even more because it requires the addition of libgtkdatabox which is actually >> not present in buildroot. >> >> Looking at the code, It's not clear if opencv or sox are really that necessary >> without a gui, but I think we could leave them out. >> > > Indeed. opencv is an image processing thing. Sox the audio processing library on > the other hand is great to have in, but not strictly necessary. > > Thanks for revitalising this patch. Thanks for explanations! Best regards, Romain > > Matt > From yann.morin.1998 at free.fr Tue Feb 7 21:33:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 22:33:07 +0100 Subject: [Buildroot] [PATCH 0/2] gitlab-ci: fix pipelines with the newer docker image (branch yem/pipelines) Message-ID: Hello All! TL;DR: the newer docker image we use in our pipelines uses a newer git version that is more strict with the ownership of the files in the git repository checkout, which makes our check jobs fail. Long story: see the individual commits. ;-) Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (2): gitlab-ci: don't use before_script in job templates gitlab-ci: fix pipelines support/misc/gitlab-ci.yml.in | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | 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 Tue Feb 7 21:33:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 22:33:11 +0100 Subject: [Buildroot] [PATCH 1/2] gitlab-ci: don't use before_script in job templates In-Reply-To: References: Message-ID: <3c87e90584519c73eeb1ae2dd5c52fe60d1572a2.1675805584.git.yann.morin.1998@free.fr> When gitlab prepares a job to run, it checks out the repository with a non-root user, and spawns a container that runs as root, with some UID mapping that makes the files be owned by root in the container. However, our pipelines run as a nont-root user. Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated the docker image that is used to run in our pipelines. That new image includes a git version that is stricter about the ownership of the git tree it is acting in: git aborts in error when the user running it does not own the repository. We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} rules, so they all fail (in various ways). To fix this, we either need to fix the ownership or tell git to ignore the situation. In either case, we'll need to run a scriptlet before all our jobs. Gitlab-ci allows to provide a global before_script, that is inherited by all jobs. However, some of our jobs already declare a before_script, and that would shadow the global before_Scrikpt. There is no technical reason to do our before_script separately from the actual script, so we move the code from the before_scripts to the corresponding scripts. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Thomas Petazzoni --- support/misc/gitlab-ci.yml.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 0ccf36665e..9c1faf0d5f 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -23,9 +23,8 @@ - utils/check-symbols .defconfig_check: - before_script: + script: - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') - script: - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - support/scripts/check-dotconfig.py .config configs/${DEFCONFIG_NAME} @@ -44,10 +43,9 @@ } .defconfig_base: - before_script: + script: - DEFCONFIG_NAME=${CI_JOB_NAME} - OUTPUT_DIR=output - script: - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} @@ -72,13 +70,12 @@ - runtime-test.log .runtime_test_base: - before_script: - - TEST_CASE_NAME=${CI_JOB_NAME} # Keep build directories so the rootfs can be an artifact of the job. The # runner will clean up those files for us. # Multiply every emulator timeout by 10 to avoid sporadic failures in # elastic runners. script: + - TEST_CASE_NAME=${CI_JOB_NAME} - echo "Starting runtime test ${TEST_CASE_NAME}" - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} artifacts: @@ -91,9 +88,8 @@ .test_pkg: stage: build - before_script: + script: - OUTPUT_DIR=${CI_JOB_NAME} - script: - echo "Configure Buildroot for ${OUTPUT_DIR}" - make O=${OUTPUT_DIR} syncconfig - make O=${OUTPUT_DIR} savedefconfig -- 2.25.1 From yann.morin.1998 at free.fr Tue Feb 7 21:33:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 22:33:12 +0100 Subject: [Buildroot] [PATCH 2/2] gitlab-ci: fix pipelines In-Reply-To: References: Message-ID: <393e263cc9e0f72b237b6bf5cda86101ded50101.1675805584.git.yann.morin.1998@free.fr> When gitlab prepares a job to run, it checks out the repository with a non-root user, and spawns a container that runs as root, with some UID mapping that makes the files be owned by root in the container. However, our pipelines run as a nont-root user. Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated the docker image that is used to run in our pipelines. That new image includes a git version that is stricter about the ownership of the git tree it is acting in: git aborts in error when the user running it does not own the repository. We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} rules, so they all fail (in various ways). To fix this, we either need to fix the ownership or tell git to ignore the situation. It is most probably impossible to change the ownership of the files: we run as non-root,and the files belong to root (in the container). So we're stuck. The alternative, is to do as git suggest, and tell it to ignore the situation. In a local setup, this woujld be very insecure, but in the pipelines, this is in a throw-away container, wehre a single user exists and is running, so we don't care much (if at all). Add a global before_script that registers the git config to ignore ownership issues in the buildroot repository; see [0] for the definition of the CI_PROJECT_DIR variable. Note: unlike what is said in there, and in [1], the value actually seen in CI_PROJECT_DIR is already prefixed with CI_BUILDS_DIR (the documentation is unclear about that point). [0] https://docs.gitlab.com/ee/ci/variables/predefined_variables.html [1] https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Thomas Petazzoni --- support/misc/gitlab-ci.yml.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 9c1faf0d5f..38aca31fb5 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -1,3 +1,6 @@ +before_script: + - git config --global --add safe.directory ${CI_PROJECT_DIR} + .check-check-package_base: script: - python3 -m pytest -v utils/checkpackagelib/ -- 2.25.1 From peter at korsgaard.com Tue Feb 7 21:36:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 07 Feb 2023 22:36:21 +0100 Subject: [Buildroot] [PATCH] package/libgtk3: bump to version 3.24.36 In-Reply-To: <20221228071734.737602-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 28 Dec 2022 08:17:34 +0100") References: <20221228071734.737602-1-francois.perrad@gadz.org> Message-ID: <87ilgd6tuy.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > switch to meson infra > remove autotools specific patches > host-libgtk3 is a hack which build only gtk-update-icon-cache > host-libgtk3 is used by libgtk3 & adwaita-icon-theme > Signed-off-by: Francois Perrad Committed after extending the commit message to explain why we're changing to meson and mentioning that it fixes the autobuilder issues caused by the missing file in the 3.24.35 tarball, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 7 21:26:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 22:26:57 +0100 Subject: [Buildroot] [git commit] package/libgtk3: bump to version 3.24.36 Message-ID: <20230207213641.664E584349@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40866ae0ce6e71d01a132dfb7694daa2ec559184 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/37c/37c7db88622c93f1c58aff7431b638143ae741d3/ As the 3.24.5 release tarball was missing a file: https://gitlab.gnome.org/GNOME/gtk/-/issues/5355 Switch to meson infra and remove autotools specific patches as the autotools support has been dropped: https://download.gnome.org/sources/gtk+/3.24/gtk%2B-3.24.36.news host-libgtk3 is a hack which builds only gtk-update-icon-cache host-libgtk3 is used by libgtk3 & adwaita-icon-theme Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- ...-bridge.patch => 0001-disable-atk-bridge.patch} | 28 +++---- package/libgtk3/0001-no-gtk-doc.patch | 25 ------- ...-dependency-from-gtk-encode-symbolic-svg.patch} | 0 package/libgtk3/0002-fix-introspection-check.patch | 28 ------- package/libgtk3/Config.in | 1 + package/libgtk3/libgtk3.hash | 4 +- package/libgtk3/libgtk3.mk | 87 +++++----------------- 7 files changed, 35 insertions(+), 138 deletions(-) diff --git a/package/libgtk3/0003-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch similarity index 62% rename from package/libgtk3/0003-disable-atk-bridge.patch rename to package/libgtk3/0001-disable-atk-bridge.patch index 390fc012fa..f3e9bff2ba 100644 --- a/package/libgtk3/0003-disable-atk-bridge.patch +++ b/package/libgtk3/0001-disable-atk-bridge.patch @@ -5,21 +5,6 @@ add two new packages just for it: at-spi2-core and at-spi2-atk. Signed-off-by: Hadrien Boutteville ---- a/configure.ac -+++ b/configure.ac -@@ -1386,11 +1386,7 @@ - # Check for Accessibility Toolkit flags - ######################################## - --if test x$enable_x11_backend = xyes; then -- ATK_PACKAGES="atk atk-bridge-2.0" --else -- ATK_PACKAGES="atk" --fi -+ATK_PACKAGES="atk" - - PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) - --- a/gtk/a11y/gtkaccessibility.c +++ b/gtk/a11y/gtkaccessibility.c @@ -37,10 +37,6 @@ @@ -33,7 +18,7 @@ Signed-off-by: Hadrien Boutteville static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, -@@ -988,9 +984,5 @@ +@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) _gtk_accessibility_override_atk_util (); do_window_event_initialization (); @@ -43,3 +28,14 @@ Signed-off-by: Hadrien Boutteville - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); } +--- a/meson.build ++++ b/meson.build +@@ -564,7 +564,7 @@ if x11_enabled + xfixes_dep = dependency('xfixes', required: false) + xcomposite_dep = dependency('xcomposite', required: false) + fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) +- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) ++ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) + + backend_immodules += ['xim'] + diff --git a/package/libgtk3/0001-no-gtk-doc.patch b/package/libgtk3/0001-no-gtk-doc.patch deleted file mode 100644 index e1d3208022..0000000000 --- a/package/libgtk3/0001-no-gtk-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -Same patch as for systemd in commit -http://git.buildroot.net/buildroot/commit/?id=7144f2f04b70553 - -Fix deactivation of gtk-doc - -The tarball contains the Makefile for building documentation with gtk-doc, -Unfortunately the AM_CONDITIONAL variable is not the correct one, which -results in an error when running autoreconf. - -This patch fixes this issue. - -Signed-off-by: Eric Le Bihan -Signed-off-by: Hadrien Boutteville - ---- a/gtk-doc.make -+++ b/gtk-doc.make -@@ -300,7 +300,7 @@ - # - # Require gtk-doc when making dist - # --if HAVE_GTK_DOC -+if ENABLE_GTK_DOC - dist-check-gtkdoc: docs - else - dist-check-gtkdoc: diff --git a/package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch b/package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch similarity index 100% rename from package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch rename to package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch diff --git a/package/libgtk3/0002-fix-introspection-check.patch b/package/libgtk3/0002-fix-introspection-check.patch deleted file mode 100644 index 7edf7db71f..0000000000 --- a/package/libgtk3/0002-fix-introspection-check.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix HAVE_INTROSPECTION does not appear in AM_CONDITIONAL - -During autoreconf GOBJECT_INTROSPECTION_CHECK could not be resolved because we -don't have introspection which provides its custom m4 macro. Reconfigure fails -with: - -gdk/Makefile.am:196: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL -gtk/Makefile.am:1347: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL - -We avoid to add a copy of introspection.m4 in the m4 directory of libgtk3 by -adding a check, as performed in Systemd. - -Signed-off-by: Hadrien Boutteville - ---- a/configure.ac -+++ b/configure.ac -@@ -1690,7 +1690,10 @@ - # GObject introspection - ################################################## - --GOBJECT_INTROSPECTION_CHECK(introspection_required_version) -+m4_ifdef([GOBJECT_INTROSPECTION_CHECK], -+ [GOBJECT_INTROSPECTION_CHECK(introspection_required_version)], -+ [AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) -+ enable_introspection=no]) - - ################################################## - # colord module diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index bc8cacd9f5..82ca68d2da 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -88,6 +88,7 @@ config BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXI help diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 1715b94e73..9fed2c9df2 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.35.sha256sum -sha256 ec10fe6d712ef0b3c63b5f932639c9d1ae99fce94f500f6f06965629fef60bd1 gtk+-3.24.35.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.36.sha256sum +sha256 27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691 gtk+-3.24.36.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 4c93413fb2..283c129cef 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).35 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).36 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ @@ -13,69 +13,42 @@ LIBGTK3_LICENSE_FILES = COPYING LIBGTK3_CPE_ID_VENDOR = gnome LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_AUTORECONF = YES - -LIBGTK3_CONF_ENV = \ - ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/bin/gtk-update-icon-cache \ - ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/bin/gdk-pixbuf-csource \ - PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf - -LIBGTK3_CONF_OPTS = \ - --disable-glibtest \ - --enable-explicit-deps=no -HOST_LIBGTK3_CONF_OPTS = --disable-introspection - -# Override pkg-config pkgdatadir variable, it needs the prefix -LIBGTK3_MAKE_OPTS = \ - WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols \ - LIBS=$(TARGET_NLS_LIBS) LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \ gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrender xlib_libXi - -LIBGTK3_CONF_OPTS += \ - --enable-x11-backend \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib +LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrandr xlib_libXrender xlib_libXi +LIBGTK3_CONF_OPTS += -Dx11_backend=true else -LIBGTK3_CONF_OPTS += --disable-x11-backend +LIBGTK3_CONF_OPTS += -Dx11_backend=false endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBGTK3_CONF_OPTS += --enable-introspection +LIBGTK3_CONF_OPTS += -Dintrospection=true LIBGTK3_DEPENDENCIES += gobject-introspection else -LIBGTK3_CONF_OPTS += --disable-introspection +LIBGTK3_CONF_OPTS += -Dintrospection=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) LIBGTK3_DEPENDENCIES += wayland wayland-protocols libxkbcommon -LIBGTK3_CONF_OPTS += --enable-wayland-backend +LIBGTK3_CONF_OPTS += -Dwayland_backend=true else -LIBGTK3_CONF_OPTS += --disable-wayland-backend +LIBGTK3_CONF_OPTS += -Dwayland_backend=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_BROADWAY),y) -LIBGTK3_CONF_OPTS += --enable-broadway-backend +LIBGTK3_CONF_OPTS += -Dbroadway_backend=true else -LIBGTK3_CONF_OPTS += --disable-broadway-backend +LIBGTK3_CONF_OPTS += -Dbroadway_backend=false endif ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -LIBGTK3_CONF_OPTS += --enable-xinerama +LIBGTK3_CONF_OPTS += -Dxinerama=yes LIBGTK3_DEPENDENCIES += xlib_libXinerama else -LIBGTK3_CONF_OPTS += --disable-xinerama -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -LIBGTK3_CONF_OPTS += --enable-xrandr -LIBGTK3_DEPENDENCIES += xlib_libXrandr -else -LIBGTK3_CONF_OPTS += --disable-xrandr +LIBGTK3_CONF_OPTS += -Dxinerama=no endif ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) @@ -83,55 +56,35 @@ LIBGTK3_DEPENDENCIES += xlib_libXcursor endif ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) -LIBGTK3_CONF_OPTS += --enable-xfixes LIBGTK3_DEPENDENCIES += xlib_libXfixes -else -LIBGTK3_CONF_OPTS += --disable-xfixes endif ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) -LIBGTK3_CONF_OPTS += --enable-xcomposite LIBGTK3_DEPENDENCIES += xlib_libXcomposite -else -LIBGTK3_CONF_OPTS += --disable-xcomposite endif ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y) -LIBGTK3_CONF_OPTS += --enable-xdamage LIBGTK3_DEPENDENCIES += xlib_libXdamage -else -LIBGTK3_CONF_OPTS += --disable-xdamage -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y) -LIBGTK3_CONF_OPTS += --enable-xkb -LIBGTK3_DEPENDENCIES += xlib_libxkbfile -else -LIBGTK3_CONF_OPTS += --disable-xkb endif ifeq ($(BR2_PACKAGE_CUPS),y) -LIBGTK3_CONF_OPTS += --enable-cups -LIBGTK3_CONF_ENV += ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config +LIBGTK3_CONF_OPTS += -Dprint_backends=cups LIBGTK3_DEPENDENCIES += cups else -LIBGTK3_CONF_OPTS += --disable-cups +LIBGTK3_CONF_OPTS += -Dprint_backends=auto endif ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y) +LIBGTK3_CONF_OPTS += -Ddemos=true -Dexamples=true LIBGTK3_DEPENDENCIES += hicolor-icon-theme shared-mime-info else -define LIBGTK3_REMOVE_DEMOS - $(RM) $(TARGET_DIR)/usr/bin/gtk3-demo \ - $(TARGET_DIR)/usr/bin/gtk3-demo-application -endef -LIBGTK3_POST_INSTALL_TARGET_HOOKS += LIBGTK3_REMOVE_DEMOS +LIBGTK3_CONF_OPTS += -Ddemos=false -Dexamples=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_TESTS),y) -LIBGTK3_CONF_OPTS += --enable-installed-tests +LIBGTK3_CONF_OPTS += -Dtests=true -Dinstalled_tests=true else -LIBGTK3_CONF_OPTS += --disable-installed-tests +LIBGTK3_CONF_OPTS += -Dtests=false -Dinstalled_tests=false endif define LIBGTK3_COMPILE_GLIB_SCHEMAS @@ -198,5 +151,5 @@ define LIBGTK3_UPDATE_ICON_CACHE endef LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-generic-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 21:37:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:37:15 +0100 Subject: [Buildroot] [git commit] package/wolfssl: handle ARM Thumb situation Message-ID: <20230207213844.CF1F684377@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f79a9c775ff0a59027f274a237d98b5f8d31c022 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master By default on ARM32, wolfssl uses assembly instructions that are not supported on Thumb (original Thumb, not Thumb 2), causing a build failure: /tmp/ccgn33X7.s:299: Error: selected processor does not support `umlal r4,r5,r10,ip' in Thumb mode /tmp/ccgn33X7.s:386: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' /tmp/ccgn33X7.s:387: Error: unshifted register required -- `adc r3,r3,#0' /tmp/ccgn33X7.s:395: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' Fix that by passing --with-arm-target=thumb, which tells wolfssl to use a different set of assembly routines. Fixes: http://autobuild.buildroot.net/results/907/907a5967439c3157c426023b0be1e613092d7bfe/ Signed-off-by: Thomas Petazzoni --- package/wolfssl/wolfssl.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index f415e11bb5..8f6cba56ec 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -43,4 +43,8 @@ else WOLFSSL_CONF_OPTS += --disable-armasm endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +WOLFSSL_CONF_OPTS += --with-arm-target=thumb +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 21:37:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:37:15 +0100 Subject: [Buildroot] [git commit] package/wolfssl: disable broken asm implementations on 32-bit Arm Message-ID: <20230207213844.C537584375@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36b8c9494b56b877fea62f17926f747c7c7bfb8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master wolfSSL has ARMv8-A assembly implementations of some functions for both A64 and A32 ISAs. However, some of the A32 versions use r11, which is usually not allowed: wolfcrypt/src/port/arm/armv8-aes.c: In function 'wc_AesCbcEncrypt': wolfcrypt/src/port/arm/armv8-aes.c:3303:5: error: fp cannot be used in 'asm' here 3303 | } | ^ That can be fixed by adding the compiler flag -fomit-frame-pointer, but then there is another failure: /tmp/ccV19DQV.s: Assembler messages: /tmp/ccV19DQV.s:248: Error: first transfer register must be even -- `ldrd r11,r10,[r14,#4*14]' make[3]: *** [Makefile:5858: wolfcrypt/src/port/arm/src_libwolfssl_la-armv8-chacha.lo] Error 1 This is definitely not a valid instruction in A32, which suggests that this code isn't being tested at all upstream. So disable it here. Fixes: http://autobuild.buildroot.net/results/502/502a2b217845eb290c1961d4740b032462f8ae53/ Signed-off-by: Ben Hutchings Signed-off-by: Thomas Petazzoni --- package/wolfssl/wolfssl.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index cd3acd9411..f415e11bb5 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -33,14 +33,12 @@ WOLFSSL_CONF_OPTS += --disable-sslv3 endif # enable ARMv8 hardware acceleration -ifeq ($(BR2_ARM_CPU_ARMV8A),y) +ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm # the flag -mstrict-align is needed to prevent build errors caused by # some inline assembly in parts of the AES structure using the "m" # constraint -ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -mstrict-align" -endif else WOLFSSL_CONF_OPTS += --disable-armasm endif From thomas.petazzoni at bootlin.com Tue Feb 7 21:37:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:37:15 +0100 Subject: [Buildroot] [git commit] package/wolfssl: disable assembly when not supported Message-ID: <20230207213844.DCD8484378@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8dc5315eb712eca0a5cbf793a6714a47ab6e57e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master wolfssl contains some assembly code and its configure.ac script enables the assembly code depending on the CPU architecture. However, the detection logic is not sufficient and leads to using the assembly code in situation where it should not. Here are two examples: - As soon as the architecture is mips64/mips64el, it uses assembly code, but that assembly code is not mips64r6 compatible. - As soon as the architecture is RISC-V, it uses assembly code, but that assembly code uses multiplication instructions, without paying attention that the "M" extension may not be available in the RISC-V CPU instruction set. In order to avoid this, we introduce a BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS hidden boolean to decide when to enable/disable assembly code. We set an initial value with the supported CPU architectures, with the exclusion of the problematic cases described above. It is pretty likely that this variable will need tuning progressively, as it is difficult to determine which CPU variants exactly are supported by the assembly code in wolfssl. Fixes: - MIPS64 case: http://autobuild.buildroot.net/results/43e/43ee1a457cbeb986d958c9a70cac0676377661c0/ - RISC-V case: http://autobuild.buildroot.net/results/f05/f056ebe7749a69994afba39a9d4967e2774c45ea/ Signed-off-by: Thomas Petazzoni --- package/wolfssl/Config.in | 12 ++++++++++++ package/wolfssl/wolfssl.mk | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/package/wolfssl/Config.in b/package/wolfssl/Config.in index 3a97125e8d..c41bdb6888 100644 --- a/package/wolfssl/Config.in +++ b/package/wolfssl/Config.in @@ -1,3 +1,15 @@ +config BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm || BR2_armeb + default y if BR2_powerpc + default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_mips64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64el && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips || BR2_mipsel + default y if BR2_riscv && BR2_RISCV_ISA_RVM + default y if BR2_s390x + config BR2_PACKAGE_WOLFSSL bool "wolfssl" depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 8f6cba56ec..9f06bb1b4b 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -32,6 +32,12 @@ else WOLFSSL_CONF_OPTS += --disable-sslv3 endif +ifeq ($(BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS),y) +WOLFSSL_CONF_OPTS += --enable-asm +else +WOLFSSL_CONF_OPTS += --disable-asm +endif + # enable ARMv8 hardware acceleration ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm From thomas.petazzoni at bootlin.com Tue Feb 7 21:39:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:39:32 +0100 Subject: [Buildroot] [PATCH] package/wolfssl: Disable broken asm implementations on 32-bit Arm In-Reply-To: <20220614192445.2390329-1-ben.hutchings@mind.be> References: <20220614192445.2390329-1-ben.hutchings@mind.be> Message-ID: <20230207223932.696d9190@windsurf> Hello Ben, On Tue, 14 Jun 2022 21:24:45 +0200 Ben Hutchings wrote: > wolfSSL has ARMv8-A assembly implementations of some functions for > both A64 and A32 ISAs. However, some of the A32 versions use r11, > which is usually not allowed: > > wolfcrypt/src/port/arm/armv8-aes.c: In function 'wc_AesCbcEncrypt': > wolfcrypt/src/port/arm/armv8-aes.c:3303:5: error: fp cannot be used in 'asm' here > 3303 | } > | ^ > > That can be fixed by adding the compiler flag -fomit-frame-pointer, > but then there is another failure: > > /tmp/ccV19DQV.s: Assembler messages: > /tmp/ccV19DQV.s:248: Error: first transfer register must be even -- `ldrd r11,r10,[r14,#4*14]' > make[3]: *** [Makefile:5858: wolfcrypt/src/port/arm/src_libwolfssl_la-armv8-chacha.lo] Error 1 > > This is definitely not a valid instruction in A32, which suggests that > this code isn't being tested at all upstream. So disable it here. > > Signed-off-by: Ben Hutchings > --- > package/wolfssl/wolfssl.mk | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) Thanks, I finally applied your patch, after adding a reference to the autobuilder failure it is fixing. I also pushed two other patches to fix other wolfssl build failures: https://gitlab.com/buildroot.org/buildroot/-/commit/36b8c9494b56b877fea62f17926f747c7c7bfb8d https://gitlab.com/buildroot.org/buildroot/-/commit/f79a9c775ff0a59027f274a237d98b5f8d31c022 https://gitlab.com/buildroot.org/buildroot/-/commit/d8dc5315eb712eca0a5cbf793a6714a47ab6e57e Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Tue Feb 7 21:47:12 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 22:47:12 +0100 Subject: [Buildroot] [PATCH 1/2] gitlab-ci: don't use before_script in job templates In-Reply-To: <3c87e90584519c73eeb1ae2dd5c52fe60d1572a2.1675805584.git.yann.morin.1998@free.fr> References: <3c87e90584519c73eeb1ae2dd5c52fe60d1572a2.1675805584.git.yann.morin.1998@free.fr> Message-ID: <5160d115-3650-23a2-bad5-2887ba763957@smile.fr> Hello Yann, Le 07/02/2023 ? 22:33, Yann E. MORIN a ?crit?: > When gitlab prepares a job to run, it checks out the repository with a > non-root user, and spawns a container that runs as root, with some UID > mapping that makes the files be owned by root in the container. However, > our pipelines run as a nont-root user. > > Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated > the docker image that is used to run in our pipelines. > > That new image includes a git version that is stricter about the > ownership of the git tree it is acting in: git aborts in error when the > user running it does not own the repository. > > We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} > rules, so they all fail (in various ways). is flake8 has been updated too? flake8 may trigger new check-package warning now. > > To fix this, we either need to fix the ownership or tell git to ignore > the situation. In either case, we'll need to run a scriptlet before all > our jobs. > > Gitlab-ci allows to provide a global before_script, that is inherited by > all jobs. However, some of our jobs already declare a before_script, and > that would shadow the global before_Scrikpt. before_Scrikpt/before_scripts > > There is no technical reason to do our before_script separately from > the actual script, so we move the code from the before_scripts to the > corresponding scripts. > Reviewed-by: Romain Naour Best regards, Romain > Signed-off-by: Yann E. MORIN > Cc: Arnout Vandecappelle (Essensium/Mind) > Cc: Romain Naour > Cc: Thomas Petazzoni > --- > support/misc/gitlab-ci.yml.in | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in > index 0ccf36665e..9c1faf0d5f 100644 > --- a/support/misc/gitlab-ci.yml.in > +++ b/support/misc/gitlab-ci.yml.in > @@ -23,9 +23,8 @@ > - utils/check-symbols > > .defconfig_check: > - before_script: > + script: > - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') > - script: > - echo "Configure Buildroot for ${DEFCONFIG_NAME}" > - make ${DEFCONFIG_NAME} > - support/scripts/check-dotconfig.py .config configs/${DEFCONFIG_NAME} > @@ -44,10 +43,9 @@ > } > > .defconfig_base: > - before_script: > + script: > - DEFCONFIG_NAME=${CI_JOB_NAME} > - OUTPUT_DIR=output > - script: > - echo "Configure Buildroot for ${DEFCONFIG_NAME}" > - make ${DEFCONFIG_NAME} > - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} > @@ -72,13 +70,12 @@ > - runtime-test.log > > .runtime_test_base: > - before_script: > - - TEST_CASE_NAME=${CI_JOB_NAME} > # Keep build directories so the rootfs can be an artifact of the job. The > # runner will clean up those files for us. > # Multiply every emulator timeout by 10 to avoid sporadic failures in > # elastic runners. > script: > + - TEST_CASE_NAME=${CI_JOB_NAME} > - echo "Starting runtime test ${TEST_CASE_NAME}" > - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} > artifacts: > @@ -91,9 +88,8 @@ > > .test_pkg: > stage: build > - before_script: > + script: > - OUTPUT_DIR=${CI_JOB_NAME} > - script: > - echo "Configure Buildroot for ${OUTPUT_DIR}" > - make O=${OUTPUT_DIR} syncconfig > - make O=${OUTPUT_DIR} savedefconfig From thomas.petazzoni at bootlin.com Tue Feb 7 21:50:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:50:24 +0100 Subject: [Buildroot] [PATCH v5] package/gtkiostream: new package In-Reply-To: <20230207210934.3132539-1-angelo@amarulasolutions.com> References: <20230207210934.3132539-1-angelo@amarulasolutions.com> Message-ID: <20230207225024.768b301d@windsurf> On Tue, 7 Feb 2023 22:09:34 +0100 Angelo Compagnucci wrote: > From: Matt Flax > > This package provides many useful software engineering and signal > processing libraries. > The package offer also a GUI written in GTK which requires several > missing packages and therefore is left disabled. > > Signed-off-by: Matt Flax > Signed-off-by: Angelo Compagnucci > --- > v4: > * Bumped to 1.8.0 > * Added myself to DEVELOPERS > * Added dependency on octave when enable instead of use > --disable-octave configure option > * Fixes from check-package > v5: > * Fixed wrong syntax (Romain) > * Added optional dependency on sox (Matt) I wanted to apply, but a quick test build with: BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_GTKIOSTREAM=y # BR2_TARGET_ROOTFS_TAR is not set ends up with: /home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find -lfftw3_threads: No such file or directory So, I will hold off for now :) Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Tue Feb 7 21:50:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 22:50:52 +0100 Subject: [Buildroot] [PATCH] package/chrony: add default unprivileged user option In-Reply-To: <20230207171020.20194-1-james.kent@orchestrated-technology.com> References: <20230207171020.20194-1-james.kent@orchestrated-technology.com> Message-ID: <20230207215052.GA2817@scaer> James, All, On 2023-02-07 17:10 +0000, James Kent spake thusly: > Configurable option to define and enable by default an unprivileged > user which the Chrony daemon will assume once initialised. Where libcap > is not enabled a comment indicates the dependency requirement to make > the option available. > > This option supports the good security practice of dropping elevated > privileges for daemon runtime. Thanks, thjis is=ndeed makes sense. See below for some comments... > Signed-off-by: James Kent > --- > package/chrony/Config.in | 10 ++++++++++ > package/chrony/chrony.mk | 8 ++++++++ > 2 files changed, 18 insertions(+) > > diff --git a/package/chrony/Config.in b/package/chrony/Config.in > index 158dc20530..8b053ed7e2 100644 > --- a/package/chrony/Config.in > +++ b/package/chrony/Config.in > @@ -14,3 +14,13 @@ config BR2_PACKAGE_CHRONY_DEBUG_LOGGING > Enable support for debug logging output from Chrony when > enabled at runtime. If disabled, code for debug logging will > not be compiled in. > + > +config BR2_PACKAGE_CHRONY_USER > + bool "chrony default unprivileged user" > + depends on BR2_PACKAGE_CHRONY && BR2_PACKAGE_LIBCAP First, we now try to enclose package sub-options in an if-endif block, rather than have each option depend on the package. I.e.: config BR2_PACKAGE_CHRONY bool "chrony" if BR2_PACKAGE_CHRONY config BR2_PACKAGE_CHRONY_FOO bool "foo" config BR2_PACKAGE_CHRONY_BAR bool "bar" endif Yes, the existing option doesnot follow that coding style, so just fix it up while at it. Second, chrony and libcap both need an MMU, so jut select libcap when BR2_PACKAGE_CHRONY_USER is enabled. > + help > + Define and enable default unprivileged user for the Chrony > + daemon to run as. > + > +comment "chrony default unprivileged user requires libcap" > + depends on BR2_PACKAGE_CHRONY && !BR2_PACKAGE_LIBCAP And thus, that comment is no longer needed. > diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk > index 379e95a778..16f8f082a3 100644 > --- a/package/chrony/chrony.mk > +++ b/package/chrony/chrony.mk > @@ -21,6 +21,14 @@ CHRONY_CONF_OPTS = \ > > ifeq ($(BR2_PACKAGE_LIBCAP),y) > CHRONY_DEPENDENCIES += libcap > + > +ifeq ($(BR2_PACKAGE_CHRONY_USER),y) > +CHRONY_CONF_OPTS += --with-user=chrony > +define CHRONY_USERS > + chrony -1 chrony -1 * /run/chrony - - Time daemon > +endef > +endif This part is correct. Can you fix and respin, please? Regards, Yann E. MORIN. > else > CHRONY_CONF_OPTS += --without-libcap > endif > -- > 2.35.3 > > _______________________________________________ > 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 thomas.petazzoni at bootlin.com Tue Feb 7 21:51:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:51:44 +0100 Subject: [Buildroot] [PATCH v5] package/gtkiostream: new package In-Reply-To: <20230207210934.3132539-1-angelo@amarulasolutions.com> References: <20230207210934.3132539-1-angelo@amarulasolutions.com> Message-ID: <20230207225144.16424f58@windsurf> On Tue, 7 Feb 2023 22:09:34 +0100 Angelo Compagnucci wrote: > +GTKIOSTREAM_VERSION = v1.8.0 > +GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,$(GTKIOSTREAM_VERSION)) > +GTKIOSTREAM_LICENSE = GPL-2.0+ > +GTKIOSTREAM_LICENSE_FILES = gpl.txt > +GTKIOSTREAM_DEPENDENCIES = eigen fftw-double fftw-single host-pkgconf > + > +GTKIOSTREAM_DEPENDENCIES += $(if $(BR2_PACKAGE_SOX),sox) Better written as: GTKIOSTREAM_DEPENDENCIES = \ eigen \ fftw-double \ ... host-pkgconf \ $(if $(BR2_PACKAGE_SOX),sox) > + > +ifeq ($(BR2_PACKAGE_OCTAVE),y) > +GTKIOSTREAM_DEPENDENCIES += octave > +GTKIOSTREAM_CONF_OPTS += --enable-octave > +else > +GTKIOSTREAM_CONF_OPTS += --disable-octave > +endif > + > +# configure script not available > +GTKIOSTREAM_AUTORECONF = YES This normally goes earlier in the makefile, like before the dependencies/conf_opts. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Tue Feb 7 21:51:26 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:26 +0100 Subject: [Buildroot] [git commit] system: Warn if systemd is used with kernel < 4.15 Message-ID: <20230207215154.8BEB2843AC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a095643b4dd34eb7acb69662aa64fa945f4b542 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master To quote the README: > Kernel versions below 4.15 have significant gaps in functionality and > are not recommended for use with this version of systemd. Taint flag > 'old-kernel' will be set. Systemd will most likely still function, but > upstream support and testing are limited. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- system/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/Config.in b/system/Config.in index 6100d965e7..1ca7690ea3 100644 --- a/system/Config.in +++ b/system/Config.in @@ -140,6 +140,10 @@ comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and targe !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 +comment "systemd highly recommends Linux >= 4.15" + depends on BR2_INIT_SYSTEMD + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + config BR2_INIT_NONE bool "None" select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT From arnout at mind.be Tue Feb 7 21:51:25 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:25 +0100 Subject: [Buildroot] [git commit] package/systemd: support dnssec if openssl is available Message-ID: <20230207215154.8326C843AB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b16ae93c85355aad3440737bc4ef7c3ec2d534f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set -Ddefault-dnssec=allow-downgrade if openssl is available as both openssl and gcrypt are now supported for dnssec. Move this out of the gcrypt condition into a joint openssl/gcrypt condition. So the dependency and the openssl/gcrypt config is set in the individual openssl and gcrypt conditions, while the default-dnssec option is set in a joint openssl or gcrypt condition. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/systemd/systemd.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 6536a2740d..cce9162f6d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -245,9 +245,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) SYSTEMD_DEPENDENCIES += libgcrypt -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade -Dgcrypt=true +SYSTEMD_CONF_OPTS += -Dgcrypt=true else -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no -Dgcrypt=false +SYSTEMD_CONF_OPTS += -Dgcrypt=false endif ifeq ($(BR2_PACKAGE_P11_KIT),y) @@ -317,6 +317,12 @@ else SYSTEMD_CONF_OPTS += -Dselinux=false endif +ifneq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_LIBOPENSSL),) +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade +else +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true define SYSTEMD_BUILD_HWDB From arnout at mind.be Tue Feb 7 21:51:23 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:23 +0100 Subject: [Buildroot] [git commit] package/systemd: Add config option for sysupdate feature Message-ID: <20230207215154.76969843AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=545f8c4b5a4f95e204f31ecb496ae93aa91fcd86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Support the new feature added with v251, requires openssl. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/systemd/Config.in | 16 ++++++++++++++++ package/systemd/systemd.mk | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 0d4147840d..9f4d933779 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -481,6 +481,22 @@ config BR2_PACKAGE_SYSTEMD_SYSEXT https://www.freedesktop.org/software/systemd/man/systemd-sysext.html +config BR2_PACKAGE_SYSTEMD_SYSUPDATE + bool "enable sysupdate support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + systemd-sysupdate atomically updates the host OS, container + images, portable service images or other sources, based on + the transfer configuration files described in sysupdate.d. + + Note that the bootloader must be configured specifically to + support the A/B update mechanism defined by sysupdate. Only + systemd-boot does this out of the box. + + https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html + config BR2_PACKAGE_SYSTEMD_SYSUSERS bool "enable sysusers support" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index a38eeba1a8..6536a2740d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -91,7 +91,6 @@ SYSTEMD_CONF_OPTS += \ -Dsulogin-path=/usr/sbin/sulogin \ -Dsystem-gid-max=999 \ -Dsystem-uid-max=999 \ - -Dsysupdate=false \ -Dsysvinit-path= \ -Dsysvrcnd-path= \ -Dtelinit-path= \ @@ -494,6 +493,12 @@ else SYSTEMD_CONF_OPTS += -Dsysext=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) +SYSTEMD_CONF_OPTS += -Dsysupdate=true +else +SYSTEMD_CONF_OPTS += -Dsysupdate=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management From arnout at mind.be Tue Feb 7 21:51:22 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:22 +0100 Subject: [Buildroot] [git commit] package/systemd: bump to version 252.4 Message-ID: <20230207215154.6B8AE843A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2c823d1f548d5a0120d27d6c000603192360f7b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Following files changed *license* from CC0-1.0 to MIT-0: - src/systemctl/systemd-sysv-install.SKELETON - config files - examples under /network The file LICENSES/MIT-0.txt has been added for this reason, hashes added, corrected for LICENSES/README.md. Kernel version 3.15 is now the bare minimum, but only version 4.15 and higher are fully supported and tested: - bump kernel header dependencies - correct kconfig description - improvements to make the kconfig description better reflect the information from the README Set new options to their default, remove -Defi-cc option. Set -Ddbus=false to ensure dbus dependency is runtime only. Set -Ddbus-interfaces-dir=no as interface XML file generation is not supported when cross compiling. Set -Ddefault-user-shell=/bin/sh to the always available shell. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/systemd/Config.in | 12 +++++++++--- package/systemd/systemd.hash | 5 +++-- package/systemd/systemd.mk | 16 ++++++++++++++-- system/Config.in | 6 +++--- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 33ac03e584..0d4147840d 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on !BR2_STATIC_LIBS # kmod depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV @@ -51,7 +51,11 @@ menuconfig BR2_PACKAGE_SYSTEMD an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. - Systemd requires a Linux kernel >= 3.13 with the following + Kernel versions below 4.15 ("recommended baseline") have + significant gaps in functionality and are not recommended + for use with this version of systemd. + + Systemd requires a Linux kernel >= 3.15 with the following options enabled: - CONFIG_DEVTMPFS @@ -66,9 +70,11 @@ menuconfig BR2_PACKAGE_SYSTEMD - CONFIG_PROC_FS - CONFIG_FHANDLE (libudev, mount and bind mount handling) - - CONFIG_NET_NS (needed by PrivateNetwork=, used in some + - CONFIG_NET_NS (Required for PrivateNetwork=, used in some systemd units) + - CONFIG_USER_NS (Required for PrivateUsers=) + - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS - CONFIG_TMPFS_POSIX_ACL - CONFIG_TMPFS_XATTR diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 3b98566f32..00c08edcd9 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 638a2fc78828765fc97bc73f428205b6dc1d359149b6c6bfe4d2a649cba2cca8 systemd-250.8.tar.gz +sha256 cf2d27e67663d599a045101c7178cf0ec63d9df2962a54adf7de0d0357724f00 systemd-252.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt @@ -8,7 +8,8 @@ sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENS sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 LICENSES/LGPL-2.0-or-later.txt sha256 5bcef4fedbfc08776630e65d5d0d074dd31208037eddb167ca46a9ec4f737764 LICENSES/Linux-syscall-note.txt sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENSES/lookup3-public-domain.txt +sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENSES/MIT-0.txt sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md +sha256 da9b2c7b8cd10516fd2c4279b82496ea61787148f13e899c62fc8988c5fac34f LICENSES/README.md diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index f191542866..a38eeba1a8 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.8 +SYSTEMD_VERSION = 252.4 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ @@ -29,6 +29,7 @@ SYSTEMD_LICENSE = \ BSD-3-Clause (tools/chromiumos), \ CC0-1.0 (few source files, see LICENSES/README.md), \ GPL-2.0 with Linux-syscall-note (linux kernel headers), \ + MIT-0 (few source files, see LICENSES/README.md), \ MIT (few source files, see LICENSES/README.md), \ OFL-1.1 (Heebo fonts) SYSTEMD_LICENSE_FILES = \ @@ -40,6 +41,7 @@ SYSTEMD_LICENSE_FILES = \ LICENSES/LGPL-2.0-or-later.txt \ LICENSES/Linux-syscall-note.txt \ LICENSES/lookup3-public-domain.txt \ + LICENSES/MIT-0.txt \ LICENSES/MIT.txt \ LICENSES/murmurhash2-public-domain.txt \ LICENSES/OFL-1.1.txt \ @@ -61,7 +63,13 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ + -Ddbus=false \ + -Ddbus-interfaces-dir=no \ + -Ddefault-compression='auto' \ -Ddefault-hierarchy=unified \ + -Ddefault-locale='C.UTF-8' \ + -Ddefault-user-shell=/bin/sh \ + -Dfirst-boot-full-preset=false \ -Didn=true \ -Dima=false \ -Dkexec-path=/usr/sbin/kexec \ @@ -72,6 +80,7 @@ SYSTEMD_CONF_OPTS += \ -Dman=false \ -Dmount-path=/usr/bin/mount \ -Dmode=release \ + -Dnspawn-locale='C.UTF-8' \ -Dnss-systemd=true \ -Dquotacheck-path=/usr/sbin/quotacheck \ -Dquotaon-path=/usr/sbin/quotaon \ @@ -82,6 +91,7 @@ SYSTEMD_CONF_OPTS += \ -Dsulogin-path=/usr/sbin/sulogin \ -Dsystem-gid-max=999 \ -Dsystem-uid-max=999 \ + -Dsysupdate=false \ -Dsysvinit-path= \ -Dsysvrcnd-path= \ -Dtelinit-path= \ @@ -558,7 +568,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi SYSTEMD_CONF_OPTS += \ -Defi=true \ -Dgnu-efi=true \ - -Defi-cc=$(TARGET_CC) \ -Defi-ld=bfd \ -Defi-libdir=$(STAGING_DIR)/usr/lib \ -Defi-includedir=$(STAGING_DIR)/usr/include/efi @@ -798,6 +807,8 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dbinfmt=false \ -Drepart=false \ -Dcoredump=false \ + -Ddbus=false \ + -Ddbus-interfaces-dir=no \ -Dpstore=false \ -Doomd=false \ -Dlogind=false \ @@ -806,6 +817,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dmachined=false \ -Dportabled=false \ -Dsysext=false \ + -Dsysupdate=false \ -Duserdb=false \ -Dhomed=false \ -Dnetworkd=false \ diff --git a/system/Config.in b/system/Config.in index deb464f4d0..6100d965e7 100644 --- a/system/Config.in +++ b/system/Config.in @@ -124,19 +124,19 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5" +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_HAS_SSP || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 From yann.morin.1998 at free.fr Tue Feb 7 21:55:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 22:55:20 +0100 Subject: [Buildroot] [PATCH 1/2] gitlab-ci: don't use before_script in job templates In-Reply-To: <5160d115-3650-23a2-bad5-2887ba763957@smile.fr> References: <3c87e90584519c73eeb1ae2dd5c52fe60d1572a2.1675805584.git.yann.morin.1998@free.fr> <5160d115-3650-23a2-bad5-2887ba763957@smile.fr> Message-ID: <20230207215520.GB2817@scaer> Romain, All, On 2023-02-07 22:47 +0100, Romain Naour spake thusly: > Le 07/02/2023 ? 22:33, Yann E. MORIN a ?crit?: > > When gitlab prepares a job to run, it checks out the repository with a > > non-root user, and spawns a container that runs as root, with some UID > > mapping that makes the files be owned by root in the container. However, > > our pipelines run as a nont-root user. > > > > Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated > > the docker image that is used to run in our pipelines. > > > > That new image includes a git version that is stricter about the > > ownership of the git tree it is acting in: git aborts in error when the > > user running it does not own the repository. > > > > We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} > > rules, so they all fail (in various ways). > > is flake8 has been updated too? flake8 may trigger new check-package warning now. Yes, there is a newer flake8 too, but there is no new error detected: https://gitlab.com/ymorin/buildroot/-/pipelines/770406457 > > > > To fix this, we either need to fix the ownership or tell git to ignore > > the situation. In either case, we'll need to run a scriptlet before all > > our jobs. > > > > Gitlab-ci allows to provide a global before_script, that is inherited by > > all jobs. However, some of our jobs already declare a before_script, and > > that would shadow the global before_Scrikpt. > before_Scrikpt/before_scripts Thanks Thomas said he'd fix that when applying. ;-] > > There is no technical reason to do our before_script separately from > > the actual script, so we move the code from the before_scripts to the > > corresponding scripts. > Reviewed-by: Romain Naour Thanks! Regards, Yann E. MORIN. > Best regards, > Romain > > > > Signed-off-by: Yann E. MORIN > > Cc: Arnout Vandecappelle (Essensium/Mind) > > Cc: Romain Naour > > Cc: Thomas Petazzoni > > --- > > support/misc/gitlab-ci.yml.in | 12 ++++-------- > > 1 file changed, 4 insertions(+), 8 deletions(-) > > > > diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in > > index 0ccf36665e..9c1faf0d5f 100644 > > --- a/support/misc/gitlab-ci.yml.in > > +++ b/support/misc/gitlab-ci.yml.in > > @@ -23,9 +23,8 @@ > > - utils/check-symbols > > > > .defconfig_check: > > - before_script: > > + script: > > - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') > > - script: > > - echo "Configure Buildroot for ${DEFCONFIG_NAME}" > > - make ${DEFCONFIG_NAME} > > - support/scripts/check-dotconfig.py .config configs/${DEFCONFIG_NAME} > > @@ -44,10 +43,9 @@ > > } > > > > .defconfig_base: > > - before_script: > > + script: > > - DEFCONFIG_NAME=${CI_JOB_NAME} > > - OUTPUT_DIR=output > > - script: > > - echo "Configure Buildroot for ${DEFCONFIG_NAME}" > > - make ${DEFCONFIG_NAME} > > - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} > > @@ -72,13 +70,12 @@ > > - runtime-test.log > > > > .runtime_test_base: > > - before_script: > > - - TEST_CASE_NAME=${CI_JOB_NAME} > > # Keep build directories so the rootfs can be an artifact of the job. The > > # runner will clean up those files for us. > > # Multiply every emulator timeout by 10 to avoid sporadic failures in > > # elastic runners. > > script: > > + - TEST_CASE_NAME=${CI_JOB_NAME} > > - echo "Starting runtime test ${TEST_CASE_NAME}" > > - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} > > artifacts: > > @@ -91,9 +88,8 @@ > > > > .test_pkg: > > stage: build > > - before_script: > > + script: > > - OUTPUT_DIR=${CI_JOB_NAME} > > - script: > > - echo "Configure Buildroot for ${OUTPUT_DIR}" > > - make O=${OUTPUT_DIR} syncconfig > > - make O=${OUTPUT_DIR} savedefconfig > > _______________________________________________ > 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 romain.naour at smile.fr Tue Feb 7 21:57:03 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 22:57:03 +0100 Subject: [Buildroot] [PATCH 2/2] gitlab-ci: fix pipelines In-Reply-To: <393e263cc9e0f72b237b6bf5cda86101ded50101.1675805584.git.yann.morin.1998@free.fr> References: <393e263cc9e0f72b237b6bf5cda86101ded50101.1675805584.git.yann.morin.1998@free.fr> Message-ID: Hello Yann, Is "fix pipelines" your WIP patch subject ? "gitlab-ci: ignore ownership of the git tree" seems better? Le 07/02/2023 ? 22:33, Yann E. MORIN a ?crit?: > When gitlab prepares a job to run, it checks out the repository with a > non-root user, and spawns a container that runs as root, with some UID > mapping that makes the files be owned by root in the container. However, > our pipelines run as a nont-root user. > > Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated > the docker image that is used to run in our pipelines. > > That new image includes a git version that is stricter about the > ownership of the git tree it is acting in: git aborts in error when the > user running it does not own the repository. > > We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} > rules, so they all fail (in various ways). > > To fix this, we either need to fix the ownership or tell git to ignore > the situation. > > It is most probably impossible to change the ownership of the files: we > run as non-root,and the files belong to root (in the container). So > we're stuck. > > The alternative, is to do as git suggest, and tell it to ignore the > situation. In a local setup, this woujld be very insecure, but in the > pipelines, this is in a throw-away container, wehre a single user exists > and is running, so we don't care much (if at all). > > Add a global before_script that registers the git config to ignore > ownership issues in the buildroot repository; see [0] for the definition > of the CI_PROJECT_DIR variable. Note: unlike what is said in there, and > in [1], the value actually seen in CI_PROJECT_DIR is already prefixed > with CI_BUILDS_DIR (the documentation is unclear about that point). > > [0] https://docs.gitlab.com/ee/ci/variables/predefined_variables.html > [1] https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section Reviewed-by: Romain Naour > > Signed-off-by: Yann E. MORIN > Cc: Arnout Vandecappelle (Essensium/Mind) > Cc: Romain Naour > Cc: Thomas Petazzoni > --- > support/misc/gitlab-ci.yml.in | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in > index 9c1faf0d5f..38aca31fb5 100644 > --- a/support/misc/gitlab-ci.yml.in > +++ b/support/misc/gitlab-ci.yml.in > @@ -1,3 +1,6 @@ > +before_script: > + - git config --global --add safe.directory ${CI_PROJECT_DIR} Note: I checked if we have the issue using the utils/docker-run directly, enabling safe.directory is not necessary. Best regards, Romain > + > .check-check-package_base: > script: > - python3 -m pytest -v utils/checkpackagelib/ From arnout at mind.be Tue Feb 7 21:57:11 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:57:11 +0100 Subject: [Buildroot] [PATCH v8 1/4] package/systemd: bump to version 252.4 In-Reply-To: References: <20230115114840.9027-1-nolange79@gmail.com> <6490dfd6-5f3b-3801-6955-7fa655f2a82b@mind.be> Message-ID: <1fcf8ae7-38a5-a634-8354-cb11788de6ac@mind.be> On 07/02/2023 19:38, Norbert Lange wrote: > Am Di., 7. Feb. 2023 um 17:41 Uhr schrieb Arnout Vandecappelle : >> >> >> >> On 15/01/2023 12:48, Norbert Lange wrote: [snip] >> Applied to master, thanks. (Not pushed yet, I may make more changes while >> reviewing the rest of the series.) > > Wouldnt mind if you do a stealthy bump to 254.5 before going through > all testing trouble ;) I'm afraid I already pushed now... Regards, Arnout > > Regards, Norbert >> >> Regards, >> Arnout >> >>> >>> package/systemd: 252.4 >>> --- >>> package/systemd/Config.in | 12 +++++++++--- >>> package/systemd/systemd.hash | 5 +++-- >>> package/systemd/systemd.mk | 16 ++++++++++++++-- >>> system/Config.in | 6 +++--- >>> 4 files changed, 29 insertions(+), 10 deletions(-) >>> >>> diff --git a/package/systemd/Config.in b/package/systemd/Config.in >>> index 45a9e2d644..f35305c0be 100644 >>> --- a/package/systemd/Config.in >>> +++ b/package/systemd/Config.in >>> @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD >>> depends on !BR2_STATIC_LIBS # kmod >>> depends on BR2_TOOLCHAIN_USES_GLIBC >>> depends on BR2_TOOLCHAIN_HAS_SSP >>> - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 >>> + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 >>> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 >>> depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd >>> select BR2_PACKAGE_HAS_UDEV >>> @@ -51,7 +51,11 @@ menuconfig BR2_PACKAGE_SYSTEMD >>> an elaborate transactional dependency-based service control >>> logic. It can work as a drop-in replacement for sysvinit. >>> >>> - Systemd requires a Linux kernel >= 3.13 with the following >>> + Kernel versions below 4.15 ("recommended baseline") have >>> + significant gaps in functionality and are not recommended >>> + for use with this version of systemd. >>> + >>> + Systemd requires a Linux kernel >= 3.15 with the following >>> options enabled: >>> >>> - CONFIG_DEVTMPFS >>> @@ -66,9 +70,11 @@ menuconfig BR2_PACKAGE_SYSTEMD >>> - CONFIG_PROC_FS >>> - CONFIG_FHANDLE (libudev, mount and bind mount handling) >>> >>> - - CONFIG_NET_NS (needed by PrivateNetwork=, used in some >>> + - CONFIG_NET_NS (Required for PrivateNetwork=, used in some >>> systemd units) >>> >>> + - CONFIG_USER_NS (Required for PrivateUsers=) >>> + >>> - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS >>> - CONFIG_TMPFS_POSIX_ACL >>> - CONFIG_TMPFS_XATTR >>> diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash >>> index 3b98566f32..00c08edcd9 100644 >>> --- a/package/systemd/systemd.hash >>> +++ b/package/systemd/systemd.hash >>> @@ -1,5 +1,5 @@ >>> # sha256 locally computed >>> -sha256 638a2fc78828765fc97bc73f428205b6dc1d359149b6c6bfe4d2a649cba2cca8 systemd-250.8.tar.gz >>> +sha256 cf2d27e67663d599a045101c7178cf0ec63d9df2962a54adf7de0d0357724f00 systemd-252.4.tar.gz >>> sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 >>> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 >>> sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt >>> @@ -8,7 +8,8 @@ sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENS >>> sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 LICENSES/LGPL-2.0-or-later.txt >>> sha256 5bcef4fedbfc08776630e65d5d0d074dd31208037eddb167ca46a9ec4f737764 LICENSES/Linux-syscall-note.txt >>> sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENSES/lookup3-public-domain.txt >>> +sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENSES/MIT-0.txt >>> sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt >>> sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt >>> sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt >>> -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md >>> +sha256 da9b2c7b8cd10516fd2c4279b82496ea61787148f13e899c62fc8988c5fac34f LICENSES/README.md >>> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk >>> index b96873b73f..b0597f9bb4 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.8 >>> +SYSTEMD_VERSION = 252.4 >>> SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) >>> SYSTEMD_LICENSE = \ >>> LGPL-2.1+, \ >>> @@ -29,6 +29,7 @@ SYSTEMD_LICENSE = \ >>> BSD-3-Clause (tools/chromiumos), \ >>> CC0-1.0 (few source files, see LICENSES/README.md), \ >>> GPL-2.0 with Linux-syscall-note (linux kernel headers), \ >>> + MIT-0 (few source files, see LICENSES/README.md), \ >>> MIT (few source files, see LICENSES/README.md), \ >>> OFL-1.1 (Heebo fonts) >>> SYSTEMD_LICENSE_FILES = \ >>> @@ -40,6 +41,7 @@ SYSTEMD_LICENSE_FILES = \ >>> LICENSES/LGPL-2.0-or-later.txt \ >>> LICENSES/Linux-syscall-note.txt \ >>> LICENSES/lookup3-public-domain.txt \ >>> + LICENSES/MIT-0.txt \ >>> LICENSES/MIT.txt \ >>> LICENSES/murmurhash2-public-domain.txt \ >>> LICENSES/OFL-1.1.txt \ >>> @@ -61,7 +63,13 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg >>> SYSTEMD_PROVIDES = udev >>> >>> SYSTEMD_CONF_OPTS += \ >>> + -Ddbus=false \ >>> + -Ddbus-interfaces-dir=no \ >>> + -Ddefault-compression='auto' \ >>> -Ddefault-hierarchy=unified \ >>> + -Ddefault-locale='C.UTF-8' \ >>> + -Ddefault-user-shell=/bin/sh \ >>> + -Dfirst-boot-full-preset=false \ >>> -Didn=true \ >>> -Dima=false \ >>> -Dkexec-path=/usr/sbin/kexec \ >>> @@ -72,6 +80,7 @@ SYSTEMD_CONF_OPTS += \ >>> -Dman=false \ >>> -Dmount-path=/usr/bin/mount \ >>> -Dmode=release \ >>> + -Dnspawn-locale='C.UTF-8' \ >>> -Dnss-systemd=true \ >>> -Dquotacheck-path=/usr/sbin/quotacheck \ >>> -Dquotaon-path=/usr/sbin/quotaon \ >>> @@ -82,6 +91,7 @@ SYSTEMD_CONF_OPTS += \ >>> -Dsulogin-path=/usr/sbin/sulogin \ >>> -Dsystem-gid-max=999 \ >>> -Dsystem-uid-max=999 \ >>> + -Dsysupdate=false \ >>> -Dsysvinit-path= \ >>> -Dsysvrcnd-path= \ >>> -Dtelinit-path= \ >>> @@ -553,7 +563,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi >>> SYSTEMD_CONF_OPTS += \ >>> -Defi=true \ >>> -Dgnu-efi=true \ >>> - -Defi-cc=$(TARGET_CC) \ >>> -Defi-ld=bfd \ >>> -Defi-libdir=$(STAGING_DIR)/usr/lib \ >>> -Defi-includedir=$(STAGING_DIR)/usr/include/efi >>> @@ -793,6 +802,8 @@ HOST_SYSTEMD_CONF_OPTS = \ >>> -Dbinfmt=false \ >>> -Drepart=false \ >>> -Dcoredump=false \ >>> + -Ddbus=false \ >>> + -Ddbus-interfaces-dir=no \ >>> -Dpstore=false \ >>> -Doomd=false \ >>> -Dlogind=false \ >>> @@ -801,6 +812,7 @@ HOST_SYSTEMD_CONF_OPTS = \ >>> -Dmachined=false \ >>> -Dportabled=false \ >>> -Dsysext=false \ >>> + -Dsysupdate=false \ >>> -Duserdb=false \ >>> -Dhomed=false \ >>> -Dnetworkd=false \ >>> diff --git a/system/Config.in b/system/Config.in >>> index 806a747315..232bdfe763 100644 >>> --- a/system/Config.in >>> +++ b/system/Config.in >>> @@ -125,19 +125,19 @@ config BR2_INIT_SYSTEMD >>> depends on BR2_TOOLCHAIN_USES_GLIBC >>> depends on BR2_TOOLCHAIN_HAS_SSP >>> depends on BR2_TOOLCHAIN_HAS_THREADS >>> - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 >>> + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 >>> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 >>> depends on BR2_HOST_GCC_AT_LEAST_5 >>> select BR2_ROOTFS_MERGED_USR >>> select BR2_PACKAGE_SYSTEMD >>> select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT >>> >>> -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5" >>> +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" >>> depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS >>> depends on BR2_USE_MMU >>> depends on !BR2_TOOLCHAIN_USES_GLIBC || \ >>> !BR2_TOOLCHAIN_HAS_SSP || \ >>> - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || \ >>> + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ >>> !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ >>> !BR2_HOST_GCC_AT_LEAST_5 >>> From arnout at mind.be Tue Feb 7 21:57:27 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:57:27 +0100 Subject: [Buildroot] [PATCH v8 4/4] system: Warn if systemd is used with kernel < 4.15 In-Reply-To: <20230115114840.9027-4-nolange79@gmail.com> References: <20230115114840.9027-1-nolange79@gmail.com> <20230115114840.9027-4-nolange79@gmail.com> Message-ID: On 15/01/2023 12:48, Norbert Lange wrote: > To quote the README: > >> Kernel versions below 4.15 have significant gaps in functionality and >> are not recommended for use with this version of systemd. Taint flag >> 'old-kernel' will be set. Systemd will most likely still function, but >> upstream support and testing are limited. > > Signed-off-by: Norbert Lange > Reviewed-by: James Hilliard Finally applied to master and pushed. Regards, Arnout > --- > system/Config.in | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/system/Config.in b/system/Config.in > index 232bdfe763..70ddf8df3c 100644 > --- a/system/Config.in > +++ b/system/Config.in > @@ -141,6 +141,15 @@ comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and targe > !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ > !BR2_HOST_GCC_AT_LEAST_5 > > +comment "systemd highly recommends headers >= 4.15" > + depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS > + depends on BR2_USE_MMU > + depends on BR2_TOOLCHAIN_USES_GLIBC > + depends on BR2_TOOLCHAIN_HAS_SSP > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > + depends on BR2_HOST_GCC_AT_LEAST_5 > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 > + > config BR2_INIT_NONE > bool "None" > select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT From thomas.petazzoni at bootlin.com Tue Feb 7 21:55:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:55:49 +0100 Subject: [Buildroot] [git commit] gitlab-ci: fix pipelines Message-ID: <20230207215916.6C638843C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a016b693f7830f3c8ae815851d3204b8b6e99821 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When gitlab prepares a job to run, it checks out the repository with a non-root user, and spawns a container that runs as root, with some UID mapping that makes the files be owned by root in the container. However, our pipelines run as a nont-root user. Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated the docker image that is used to run in our pipelines. That new image includes a git version that is stricter about the ownership of the git tree it is acting in: git aborts in error when the user running it does not own the repository. We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} rules, so they all fail (in various ways). To fix this, we either need to fix the ownership or tell git to ignore the situation. It is most probably impossible to change the ownership of the files: we run as non-root,and the files belong to root (in the container). So we're stuck. The alternative, is to do as git suggest, and tell it to ignore the situation. In a local setup, this would be very insecure, but in the pipelines, this is in a throw-away container, where a single user exists and is running, so we don't care much (if at all). Add a global before_script that registers the git config to ignore ownership issues in the buildroot repository; see [0] for the definition of the CI_PROJECT_DIR variable. Note: unlike what is said in there, and in [1], the value actually seen in CI_PROJECT_DIR is already prefixed with CI_BUILDS_DIR (the documentation is unclear about that point). [0] https://docs.gitlab.com/ee/ci/variables/predefined_variables.html [1] https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/misc/gitlab-ci.yml.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 9c1faf0d5f..38aca31fb5 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -1,3 +1,6 @@ +before_script: + - git config --global --add safe.directory ${CI_PROJECT_DIR} + .check-check-package_base: script: - python3 -m pytest -v utils/checkpackagelib/ From thomas.petazzoni at bootlin.com Tue Feb 7 21:57:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:57:06 +0100 Subject: [Buildroot] [git commit] package/xz: fix microblaze compiles Message-ID: <20230207215916.76BF5843A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bed21bb9b462bece7cd1b9741643aa553ced4d35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Patch xz to check if __attribute__((symver ..)) is supported via a compile check during configure. Fixes: http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni --- .../xz/0001-Detect-symver-attribute-support.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch new file mode 100644 index 0000000000..9ec43ea7a0 --- /dev/null +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -0,0 +1,61 @@ +From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 08:51:24 -0600 +Subject: [PATCH] Detect symver attribute support + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://github.com/tukaani-project/xz/pull/32 +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vincent Fazio +--- + configure.ac | 9 +++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5ad5589..08c623a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -791,6 +791,15 @@ else + time with Libtool if neither --with-pic nor + --without-pic is used). This define must be + used together with liblzma_linux.map.]) ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE( ++ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ])], ++ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], ++ [Define to 1 if GCC supports the symver attribute])], ++ []) ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic +diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h +index 11fec52..1d2ef9c 100644 +--- a/src/liblzma/common/common.h ++++ b/src/liblzma/common/common.h +@@ -76,7 +76,7 @@ + // too (which doesn't support __symver__) so use it to detect if __symver__ + // is available. This should be far more reliable than looking at compiler + // version macros as nowadays especially __GNUC__ is defined by many compilers. +-# if lzma_has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define LZMA_SYMVER_API(extnamever, type, intname) \ + extern __attribute__((__symver__(extnamever))) \ + LZMA_API(type) intname +-- +2.25.1 + From thomas.petazzoni at bootlin.com Tue Feb 7 21:55:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:55:49 +0100 Subject: [Buildroot] [git commit] gitlab-ci: don't use before_script in job templates Message-ID: <20230207215916.5D8E3843C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e92bb8f1c9523227413500380df16bfc64053fad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When gitlab prepares a job to run, it checks out the repository with a non-root user, and spawns a container that runs as root, with some UID mapping that makes the files be owned by root in the container. However, our pipelines run as a nont-root user. Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated the docker image that is used to run in our pipelines. That new image includes a git version that is stricter about the ownership of the git tree it is acting in: git aborts in error when the user running it does not own the repository. We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} rules, so they all fail (in various ways). To fix this, we either need to fix the ownership or tell git to ignore the situation. In either case, we'll need to run a scriptlet before all our jobs. Gitlab-ci allows to provide a global before_script, that is inherited by all jobs. However, some of our jobs already declare a before_script, and that would shadow the global before_script. There is no technical reason to do our before_script separately from the actual script, so we move the code from the before_scripts to the corresponding scripts. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/misc/gitlab-ci.yml.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 0ccf36665e..9c1faf0d5f 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -23,9 +23,8 @@ - utils/check-symbols .defconfig_check: - before_script: - - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') script: + - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - support/scripts/check-dotconfig.py .config configs/${DEFCONFIG_NAME} @@ -44,10 +43,9 @@ } .defconfig_base: - before_script: + script: - DEFCONFIG_NAME=${CI_JOB_NAME} - OUTPUT_DIR=output - script: - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} @@ -72,13 +70,12 @@ - runtime-test.log .runtime_test_base: - before_script: - - TEST_CASE_NAME=${CI_JOB_NAME} # Keep build directories so the rootfs can be an artifact of the job. The # runner will clean up those files for us. # Multiply every emulator timeout by 10 to avoid sporadic failures in # elastic runners. script: + - TEST_CASE_NAME=${CI_JOB_NAME} - echo "Starting runtime test ${TEST_CASE_NAME}" - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} artifacts: @@ -91,9 +88,8 @@ .test_pkg: stage: build - before_script: - - OUTPUT_DIR=${CI_JOB_NAME} script: + - OUTPUT_DIR=${CI_JOB_NAME} - echo "Configure Buildroot for ${OUTPUT_DIR}" - make O=${OUTPUT_DIR} syncconfig - make O=${OUTPUT_DIR} savedefconfig From thomas.petazzoni at bootlin.com Tue Feb 7 22:03:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:03:03 +0100 Subject: [Buildroot] [git commit] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring Message-ID: <20230207220358.796F7843E5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c8ee42bbe6ebb7f20978b06a581c42733197ae2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The vendoring done for cargo / go packages (may) need git, so ensure we check for it in dependencies, similar to how it is done for packages directly using git. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5d618c6b39..82187d7db9 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1250,6 +1250,13 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD +# cargo/go vendoring (may) need git +ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),cargo) +DL_TOOLS_DEPENDENCIES += git +else ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),go) +DL_TOOLS_DEPENDENCIES += git +endif + DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. From thomas.petazzoni at bootlin.com Tue Feb 7 22:03:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:03:10 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: ensure git is >= 2.0.0 for vendoring Message-ID: <20230207220358.83F32843E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f229564c36ec64c1f1292b7281ae0bd33840d7a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The go vendoring fails on CentOS 7 (which uses git 1.8.3.1) with errors related to shallow clones: make docker-compose-source .. go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 github.com/docker/compose/v2/pkg/mocks imports github.com/theupdateframework/notary/client imports github.com/docker/go/canonical/json: github.com/docker/go at v1.5.1-1.0.20160303222718-d30aec9fd63c: invalid pseudo-version: git fetch --unshallow -f origin in /home/jacmet/source/buildroot-mirror/output/host/share/go-path/pkg/mod/cache/vcs/48fbd2dfabec81f4c93170677bfc89087d4bec07a2d08f6ca5ce3d17962677ee: exit status 128: fatal: git fetch-pack: expected shallow list make[1]: *** [/home/jacmet/source/buildroot-mirror/output/build/docker-compose-2.15.1/.stamp_downloaded] Error 1 It works with git 2.0.0 (released May 2014, included in Debian 8), so check for >= 2.0.0 with logic similar to the GNU patch version check. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 0aa5e59274..cf6635bff6 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -174,6 +174,16 @@ for prog in perl tar wget cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do echo " xargs is usually part of the findutils package in your distribution" fi fi + + # we need git >= 2.0.0 for shallow clones / vendoring + if test $prog = "git" ; then + GIT_VERSION="$(git --version | sed -n 's/^git version \(.*\)/\1/p')" + GIT_MAJOR="$(echo "${GIT_VERSION}" | cut -d . -f 1)" + if [ "${GIT_MAJOR}" -lt 2 ]; then + echo "You have git '${GIT_VERSION}' installed. Git >= 2.0.0 is required" + exit 1 + fi + fi done if test "${missing_progs}" = "yes" ; then From thomas.petazzoni at bootlin.com Tue Feb 7 22:06:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:06:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/xz: fix microblaze compiles In-Reply-To: <20230207170303.2508780-1-vfazio@xes-inc.com> References: <20230207170303.2508780-1-vfazio@xes-inc.com> Message-ID: <20230207230623.022d91da@windsurf> On Tue, 7 Feb 2023 11:03:03 -0600 Vincent Fazio wrote: > From: Vincent Fazio > > Patch xz to check if __attribute__((symver ..)) is supported via a > compile check during configure. > > Fixes: > http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// > > Signed-off-by: Vincent Fazio > --- > ...0001-Detect-symver-attribute-support.patch | 61 +++++++++++++++++++ > 1 file changed, 61 insertions(+) > create mode 100644 package/xz/0001-Detect-symver-attribute-support.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 22:06:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:06:48 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring In-Reply-To: <20230207170040.3503236-1-peter@korsgaard.com> References: <20230207170040.3503236-1-peter@korsgaard.com> Message-ID: <20230207230648.7f2efda5@windsurf> On Tue, 7 Feb 2023 18:00:39 +0100 Peter Korsgaard wrote: > The vendoring done for cargo / go packages (may) need git, so ensure we > check for it in dependencies, similar to how it is done for packages > directly using git. > > Signed-off-by: Peter Korsgaard > --- > package/pkg-generic.mk | 7 +++++++ > 1 file changed, 7 insertions(+) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From ju.o at free.fr Tue Feb 7 22:09:37 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 7 Feb 2023 23:09:37 +0100 Subject: [Buildroot] [PATCH 1/5] DEVELOPERS: add Julien Olivain for package/openmpi Message-ID: <20230207220941.58066-1-ju.o@free.fr> The package has been orphan since commit ee58353 (2018-12-22). Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index d7c4d03c4c..156c5dac13 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1689,6 +1689,7 @@ F: package/gnupg2/ F: package/glslsandbox-player/ F: package/octave/ F: package/ola/ +F: package/openmpi/ F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ -- 2.39.1 From ju.o at free.fr Tue Feb 7 22:09:38 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 7 Feb 2023 23:09:38 +0100 Subject: [Buildroot] [PATCH 2/5] package/openmpi: bump to version 4.1.4 In-Reply-To: <20230207220941.58066-1-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> Message-ID: <20230207220941.58066-2-ju.o@free.fr> Notable changes in this commit: - change from v4.0.x to v4.1.x "current" version series, - move the sha256 hash out of the "Locally computed" section, as the value comes from the download page, - the LICENSE file hash changed, as the file was updated (copyright years updated and new contributors added), - the IME (Infinite Memory Engine), introduced in v4.1.x, is disabled to workaround a failure when cross-compiled, - the package now requires a toolchain with atomic support, and needs to link against libatomic when needed. For change log since v4.0.0, see: - https://github.com/open-mpi/ompi/blob/v4.1.4/NEWS#L61 Signed-off-by: Julien Olivain --- Tested on branch master at commit 4fbd2f6 with commands: make check-package ... 0 warnings generated ./utils/test-pkg -a -p openmpi arm-aarch64 [ 1/44]: OK bootlin-aarch64-glibc [ 2/44]: OK bootlin-arcle-hs38-uclibc [ 3/44]: OK bootlin-armv5-uclibc [ 4/44]: OK bootlin-armv7-glibc [ 5/44]: OK bootlin-armv7m-uclibc [ 6/44]: SKIPPED bootlin-armv7-musl [ 7/44]: OK bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED bootlin-m68k-68040-uclibc [ 9/44]: OK bootlin-microblazeel-uclibc [10/44]: OK bootlin-mipsel32r6-glibc [11/44]: OK bootlin-mipsel-uclibc [12/44]: OK bootlin-nios2-glibc [13/44]: OK bootlin-openrisc-uclibc [14/44]: OK bootlin-powerpc64le-power8-glibc [15/44]: OK bootlin-powerpc-e500mc-uclibc [16/44]: OK bootlin-riscv32-glibc [17/44]: OK bootlin-riscv64-glibc [18/44]: OK bootlin-riscv64-musl [19/44]: OK bootlin-sh4-uclibc [20/44]: OK bootlin-sparc64-glibc [21/44]: OK bootlin-sparc-uclibc [22/44]: SKIPPED bootlin-x86-64-glibc [23/44]: OK bootlin-x86-64-musl [24/44]: OK bootlin-x86-64-uclibc [25/44]: OK bootlin-xtensa-uclibc [26/44]: OK br-arm-basic [27/44]: SKIPPED br-arm-full-nothread [28/44]: SKIPPED br-arm-full-static [29/44]: SKIPPED br-i386-pentium4-full [30/44]: OK br-i386-pentium-mmx-musl [31/44]: OK br-mips64-n64-full [32/44]: OK br-mips64r6-el-hf-glibc [33/44]: OK br-powerpc-603e-basic-cpp [34/44]: SKIPPED br-powerpc64-power7-glibc [35/44]: OK linaro-aarch64-be [36/44]: OK linaro-aarch64 [37/44]: OK linaro-arm [38/44]: OK sourcery-arm-armv4t [39/44]: OK sourcery-arm [40/44]: OK sourcery-arm-thumb2 [41/44]: OK sourcery-mips64 [42/44]: OK sourcery-mips [43/44]: OK sourcery-nios2 [44/44]: OK 44 builds, 7 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/openmpi/Config.in | 1 + package/openmpi/openmpi.hash | 10 +++++----- package/openmpi/openmpi.mk | 17 ++++++++++++++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/package/openmpi/Config.in b/package/openmpi/Config.in index 4413c55f9c..80b01a26e1 100644 --- a/package/openmpi/Config.in +++ b/package/openmpi/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_OPENMPI bool "openmpi" depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # dlfcn.h diff --git a/package/openmpi/openmpi.hash b/package/openmpi/openmpi.hash index a399adc758..745ed7c580 100644 --- a/package/openmpi/openmpi.hash +++ b/package/openmpi/openmpi.hash @@ -1,6 +1,6 @@ -# From: https://www.open-mpi.org/software/ompi/v4.0/ -md5 e3da67df1e968c8798827e0e5fe9a510 openmpi-4.0.0.tar.bz2 -sha1 fee1d0287abfb150bae16957de342752c9bdd4e8 openmpi-4.0.0.tar.bz2 +# From: https://www.open-mpi.org/software/ompi/v4.1/ +md5 f057e12aabaf7dd5a6a658180fca404e openmpi-4.1.4.tar.bz2 +sha1 357c61a8e06e103d987c0e4a054e8780a034c8b1 openmpi-4.1.4.tar.bz2 +sha256 92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d openmpi-4.1.4.tar.bz2 # Locally computed -sha256 2f0b8a36cfeb7354b45dda3c5425ef8393c9b04115570b615213faaa3f97366b openmpi-4.0.0.tar.bz2 -sha256 8298a80ed5f09cfd007bae1c0e7d67d1c2810c6389876778dad070c31a691dac LICENSE +sha256 2db71de9577ebfe15c186605844c470dcecd3717f4ef0118c9440d801c0f58f8 LICENSE diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index 8bdc3fa188..f14b55ced5 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -4,14 +4,21 @@ # ################################################################################ -OPENMPI_VERSION_MAJOR = 4.0 -OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).0 +OPENMPI_VERSION_MAJOR = 4.1 +OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).4 OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2 OPENMPI_LICENSE = BSD-3-Clause OPENMPI_LICENSE_FILES = LICENSE OPENMPI_INSTALL_STAGING = YES +# The macro searching for IME (Infinite Memory Engine) filesystem +# brings "-I/usr/local/include" in the CPPFLAGS, even if not +# found. This makes the configuration fail. See: +# https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 +# Disable explicitly to avoid the issue. +OPENMPI_CONF_OPTS = --without-ime + # Enabling Fortran support requires pre-seeding the configure script # with various values that cannot be guessed, so we provide cache # files for various architectures. @@ -43,6 +50,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) OPENMPI_CFLAGS += -O0 endif -OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +OPENMPI_LIBS += -latomic +endif + +OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" LIBS="$(OPENMPI_LIBS)" $(eval $(autotools-package)) -- 2.39.1 From ju.o at free.fr Tue Feb 7 22:09:39 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 7 Feb 2023 23:09:39 +0100 Subject: [Buildroot] [PATCH 3/5] package/openmpi: enable mpi compiler wrapper scripts In-Reply-To: <20230207220941.58066-1-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> Message-ID: <20230207220941.58066-3-ju.o@free.fr> openmpi normally includes compiler wrapper binary programs (e.g. mpicc, mpicxx, etc...). Those programs are inconvenient when cross compiling. Those target binary wrappers are useless in Buildroot, as the target root filesystem does not include compilers. For cross compilation, openmpi also ships Perl scripts providing a subset of those functions. With those compiler wrappers, openmpi programs can now be cross compiled properly in Buildroot. This patch enables those wrappers. Signed-off-by: Julien Olivain --- package/openmpi/openmpi.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index f14b55ced5..e6f5cd0250 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -17,7 +17,9 @@ OPENMPI_INSTALL_STAGING = YES # found. This makes the configuration fail. See: # https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 # Disable explicitly to avoid the issue. -OPENMPI_CONF_OPTS = --without-ime +OPENMPI_CONF_OPTS = \ + --enable-script-wrapper-compilers \ + --without-ime # Enabling Fortran support requires pre-seeding the configure script # with various values that cannot be guessed, so we provide cache -- 2.39.1 From ju.o at free.fr Tue Feb 7 22:09:40 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 7 Feb 2023 23:09:40 +0100 Subject: [Buildroot] [PATCH 4/5] package/openmpi-examples: new package In-Reply-To: <20230207220941.58066-1-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> Message-ID: <20230207220941.58066-4-ju.o@free.fr> This is a "meta" package reusing definitions and files from openmpi. Openmpi examples are shipped in the main library sources, including build wrappers. The library and the wrappers need to be built and installed in staging prior trying to compile an example. This purpose if this package is to handle cleanly those dependencies. Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + package/Config.in | 1 + package/openmpi-examples/Config.in | 8 +++++ .../openmpi-examples/openmpi-examples.hash | 1 + package/openmpi-examples/openmpi-examples.mk | 29 +++++++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 package/openmpi-examples/Config.in create mode 120000 package/openmpi-examples/openmpi-examples.hash create mode 100644 package/openmpi-examples/openmpi-examples.mk diff --git a/DEVELOPERS b/DEVELOPERS index 156c5dac13..3d1c3a2a83 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1690,6 +1690,7 @@ F: package/glslsandbox-player/ F: package/octave/ F: package/ola/ F: package/openmpi/ +F: package/openmpi-examples/ F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ diff --git a/package/Config.in b/package/Config.in index 06d0a05854..e08511fd9a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1961,6 +1961,7 @@ menu "Networking" source "package/open62541/Config.in" source "package/openldap/Config.in" source "package/openmpi/Config.in" + source "package/openmpi-examples/Config.in" source "package/openpgm/Config.in" source "package/openzwave/Config.in" source "package/ortp/Config.in" diff --git a/package/openmpi-examples/Config.in b/package/openmpi-examples/Config.in new file mode 100644 index 0000000000..caaa02d802 --- /dev/null +++ b/package/openmpi-examples/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_OPENMPI_EXAMPLES + bool "openmpi-examples" + select BR2_PACKAGE_OPENMPI + help + This package includes the hello_c example from openmpi. It + is mainly used as a simple openmpi program to test the + libraries. It is also a recipe example for cross compiling + an openmpi program with the mpicc wrappers. diff --git a/package/openmpi-examples/openmpi-examples.hash b/package/openmpi-examples/openmpi-examples.hash new file mode 120000 index 0000000000..b8afe5e2d9 --- /dev/null +++ b/package/openmpi-examples/openmpi-examples.hash @@ -0,0 +1 @@ +../openmpi/openmpi.hash \ No newline at end of file diff --git a/package/openmpi-examples/openmpi-examples.mk b/package/openmpi-examples/openmpi-examples.mk new file mode 100644 index 0000000000..be679333c7 --- /dev/null +++ b/package/openmpi-examples/openmpi-examples.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# openmpi-examples +# +################################################################################ + +OPENMPI_EXAMPLES_VERSION = $(OPENMPI_VERSION) +OPENMPI_EXAMPLES_SOURCE = $(OPENMPI_SOURCE) +OPENMPI_EXAMPLES_DL_SUBDIR = openmpi +OPENMPI_EXAMPLES_SITE = $(OPENMPI_SITE) +OPENMPI_EXAMPLES_LICENSE = $(OPENMPI_LINCENSE) +OPENMPI_EXAMPLES_LICENSE_FILES = $(OPENMPI_LICENSE_FILES) + +OPENMPI_EXAMPLES_DEPENDENCIES = openmpi + +define OPENMPI_EXAMPLES_BUILD_CMDS + $(TARGET_MAKE_ENV) PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) OPAL_DESTDIR=$(STAGING_DIR)/usr \ + mpicc \ + $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + -o $(@D)/examples/hello_c \ + $(@D)/examples/hello_c.c +endef + +define OPENMPI_EXAMPLES_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/examples/hello_c \ + $(TARGET_DIR)/usr/bin/ompi_hello_c +endef + +$(eval $(generic-package)) -- 2.39.1 From ju.o at free.fr Tue Feb 7 22:09:41 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 7 Feb 2023 23:09:41 +0100 Subject: [Buildroot] [PATCH 5/5] support/testing: add test for openmpi In-Reply-To: <20230207220941.58066-1-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> Message-ID: <20230207220941.58066-5-ju.o@free.fr> This openmpi runtime test attempt to run the "hello_c" example program on a 8 cpu Aarch64 system. It expects the same amount of "Hello, world" messages. Signed-off-by: Julien Olivain --- Tested on branch master at commit 4fbd2f6 with commands: make check-package ... 0 warnings generated python3 -m flake8 support/testing/tests/package/test_openmpi.py [no-output] support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_openmpi ... OK --- DEVELOPERS | 1 + support/testing/tests/package/test_openmpi.py | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 support/testing/tests/package/test_openmpi.py diff --git a/DEVELOPERS b/DEVELOPERS index 3d1c3a2a83..c6587b10e1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1715,6 +1715,7 @@ F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ +F: support/testing/tests/package/test_openmpi.py F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_hkdf.py diff --git a/support/testing/tests/package/test_openmpi.py b/support/testing/tests/package/test_openmpi.py new file mode 100644 index 0000000000..86a42a0145 --- /dev/null +++ b/support/testing/tests/package/test_openmpi.py @@ -0,0 +1,53 @@ +import os + +import infra.basetest + + +class TestOpenMPI(infra.basetest.BRTest): + # We use a "virt" Aarch64 machine to have smp and 512M of memory + 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.92" + 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_OPENMPI_EXAMPLES=y + """ + + def test_run(self): + num_cpu = 8 + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern_file = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern_file, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-smp", str(num_cpu), "-cpu", "cortex-a57", "-m", "512M", "-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("ompi_info --all") + + # "--allow-run-as-root" option is needed because mpirun + # normally refuse to start as root, as a security mechanism. + # "--mca plm_rsh_agent /bin/true" is needed because openmpi + # silently fails if the "rsh" binary is not present in the + # system, even if it's not used. We define it as "/bin/true", + # as a workaround. + # The hello_c example will spawn one job per cpu. We expect + # the same number of "Hello, world," output as the number of + # cpus. + cmd = "mpirun" \ + " --allow-run-as-root" \ + " --mca plm_rsh_agent /bin/true" \ + " /usr/bin/ompi_hello_c" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + all_output = ''.join(output) + self.assertEqual(all_output.count('Hello, world,'), num_cpu) -- 2.39.1 From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:16 +0100 Subject: [Buildroot] [PATCH v2] package/rtl8821cu: fix build failure due to missing Linux options In-Reply-To: <20230114003122.1475047-1-giulio.benetti@benettiengineering.com> References: <20230114003122.1475047-1-giulio.benetti@benettiengineering.com> Message-ID: <20230207231316.0cb2528e@windsurf> On Sat, 14 Jan 2023 01:31:22 +0100 Giulio Benetti wrote: > Fixes: > http://autobuild.buildroot.net/results/aea/aea6bc1e4f89bd1010dfdc9caa54c37edb567d5f/ > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * drop CONFIG_PLATFORM_ change > --- > package/rtl8821cu/rtl8821cu.mk | 8 ++++++++ > 1 file changed, 8 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:42 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add Giulio Benetti to package rtl8821cu In-Reply-To: <20230114002552.1427592-1-giulio.benetti@benettiengineering.com> References: <20230114002552.1427592-1-giulio.benetti@benettiengineering.com> Message-ID: <20230207231342.3a0663c0@windsurf> On Sat, 14 Jan 2023 01:25:52 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti > --- > DEVELOPERS | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:07 +0100 Subject: [Buildroot] [git commit] package/rtl8821cu: fix build failure due to missing Linux options Message-ID: <20230207221510.3543D84406@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=737964e2f12057a0d968a2f10197e80e91ba65eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/aea/aea6bc1e4f89bd1010dfdc9caa54c37edb567d5f/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8821cu/rtl8821cu.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk index 18222e0014..97f50d9633 100644 --- a/package/rtl8821cu/rtl8821cu.mk +++ b/package/rtl8821cu/rtl8821cu.mk @@ -9,6 +9,14 @@ RTL8821CU_SITE = $(call github,morrownr,8821cu-20210118,$(RTL8821CU_VERSION)) RTL8821CU_LICENSE = GPL-2.0 RTL8821CU_LICENSE_FILES = LICENSE +define RTL8821CU_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB) +endef + RTL8821CU_USER_EXTRA_CFLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ -DCONFIG_IOCTL_CFG80211 \ From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:33 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Giulio Benetti to package rtl8821cu Message-ID: <20230207221510.4115884426@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfad9bef35e984f00ae70f1cd51cc75b89ff5efc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index d7c4d03c4c..2cb3361c83 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1163,6 +1163,7 @@ F: package/rtl8723bu/ F: package/rtl8723ds/ F: package/rtl8812au-aircrack-ng/ F: package/rtl8821au/ +F: package/rtl8821cu/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ F: package/sunxi-tools/ From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:52 +0100 Subject: [Buildroot] [git commit] package/perl-mail-dkim: bump version to 1.20220520 Message-ID: <20230207221510.4EF638442A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57a64a702a1c162a33097db7ee7e069fb64b39df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-mail-dkim/perl-mail-dkim.hash | 4 ++-- package/perl-mail-dkim/perl-mail-dkim.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-mail-dkim/perl-mail-dkim.hash b/package/perl-mail-dkim/perl-mail-dkim.hash index e94adfc6ed..6edeaa9d8b 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.hash +++ b/package/perl-mail-dkim/perl-mail-dkim.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9de35f8aa77a85dc17423cbcce2bf46d Mail-DKIM-1.20200824.tar.gz -sha256 871d329830acb4840423aa59036622fb2ee394efc1d09316dcc32ae94454e916 Mail-DKIM-1.20200824.tar.gz +md5 5a0dec58f0c2526521b2952a3c126906 Mail-DKIM-1.20220520.tar.gz +sha256 8ac4b8c84bbfad00a3d24bf676493d207dd3cd4a735efabb9e17181534f23646 Mail-DKIM-1.20220520.tar.gz # computed by scancpan sha256 ffaa40feb768566e52d93879fedd2c5483828b6de483874f30a0a4425351555f LICENSE diff --git a/package/perl-mail-dkim/perl-mail-dkim.mk b/package/perl-mail-dkim/perl-mail-dkim.mk index e67bf5ee18..f3383a02bf 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.mk +++ b/package/perl-mail-dkim/perl-mail-dkim.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MAIL_DKIM_VERSION = 1.20200824 +PERL_MAIL_DKIM_VERSION = 1.20220520 PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MB/MBRADSHAW PERL_MAIL_DKIM_LICENSE = Artistic or GPL-1.0+ From thomas.petazzoni at bootlin.com Tue Feb 7 22:15:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:15:16 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/perl-mail-dkim: bump version to 1.20220520 In-Reply-To: <20230113210753.23966-1-bernd.kuhls@t-online.de> References: <20230113210753.23966-1-bernd.kuhls@t-online.de> Message-ID: <20230207231516.2a8c962e@windsurf> On Fri, 13 Jan 2023 22:07:53 +0100 Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls > --- > v2: fixed hash file (Peter) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Tue Feb 7 22:15:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 23:15:17 +0100 Subject: [Buildroot] [PATCH 2/2] gitlab-ci: fix pipelines In-Reply-To: References: <393e263cc9e0f72b237b6bf5cda86101ded50101.1675805584.git.yann.morin.1998@free.fr> Message-ID: <20230207221517.GC2817@scaer> Romain, All, On 2023-02-07 22:57 +0100, Romain Naour spake thusly: > Is "fix pipelines" your WIP patch subject ? > "gitlab-ci: ignore ownership of the git tree" seems better? No, I really intended to write "fix pipeline". Indeed, the subject of a commit log should be a summary of the semantic change, not of how it is done. Thanks for the review! :-) Regards, Yann E. MORIN. > Le 07/02/2023 ? 22:33, Yann E. MORIN a ?crit?: > > When gitlab prepares a job to run, it checks out the repository with a > > non-root user, and spawns a container that runs as root, with some UID > > mapping that makes the files be owned by root in the container. However, > > our pipelines run as a nont-root user. > > > > Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated > > the docker image that is used to run in our pipelines. > > > > That new image includes a git version that is stricter about the > > ownership of the git tree it is acting in: git aborts in error when the > > user running it does not own the repository. > > > > We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} > > rules, so they all fail (in various ways). > > > > To fix this, we either need to fix the ownership or tell git to ignore > > the situation. > > > > It is most probably impossible to change the ownership of the files: we > > run as non-root,and the files belong to root (in the container). So > > we're stuck. > > > > The alternative, is to do as git suggest, and tell it to ignore the > > situation. In a local setup, this woujld be very insecure, but in the > > pipelines, this is in a throw-away container, wehre a single user exists > > and is running, so we don't care much (if at all). > > > > Add a global before_script that registers the git config to ignore > > ownership issues in the buildroot repository; see [0] for the definition > > of the CI_PROJECT_DIR variable. Note: unlike what is said in there, and > > in [1], the value actually seen in CI_PROJECT_DIR is already prefixed > > with CI_BUILDS_DIR (the documentation is unclear about that point). > > > > [0] https://docs.gitlab.com/ee/ci/variables/predefined_variables.html > > [1] https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section > > Reviewed-by: Romain Naour > > > > > > Signed-off-by: Yann E. MORIN > > Cc: Arnout Vandecappelle (Essensium/Mind) > > Cc: Romain Naour > > Cc: Thomas Petazzoni > > --- > > support/misc/gitlab-ci.yml.in | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in > > index 9c1faf0d5f..38aca31fb5 100644 > > --- a/support/misc/gitlab-ci.yml.in > > +++ b/support/misc/gitlab-ci.yml.in > > @@ -1,3 +1,6 @@ > > +before_script: > > + - git config --global --add safe.directory ${CI_PROJECT_DIR} > > Note: I checked if we have the issue using the utils/docker-run directly, > enabling safe.directory is not necessary. > > Best regards, > Romain > > > > + > > .check-check-package_base: > > script: > > - python3 -m pytest -v utils/checkpackagelib/ > > _______________________________________________ > 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 thomas.petazzoni at bootlin.com Tue Feb 7 22:17:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:17:46 +0100 Subject: [Buildroot] [git commit] package/php: bump version to 8.2.1 Message-ID: <20230207222121.8497284440@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90ab065162a35b8aa2c429903e3d59d4ad2c0d7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_2 Updated license hash due to copyright year bump: https://github.com/php/php-src/commit/bf2867bc7235dfb65675ff4e9c21c8bc537726e2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/php/php.hash | 4 ++-- package/php/php.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 23ec84f19f..a9c3b7640b 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 e16e47a872d58685913ac848ce92ec49f42c1828110c98c65fb6265a08724a1a php-8.1.14.tar.xz +sha256 650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af php-8.2.1.tar.xz # License file -sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE +sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 23dd4ba96f..372d55f68a 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.1.14 +PHP_VERSION = 8.2.1 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Tue Feb 7 22:22:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:22:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.2.1 In-Reply-To: <20230112115802.3374366-1-bernd.kuhls@t-online.de> References: <20230112115802.3374366-1-bernd.kuhls@t-online.de> Message-ID: <20230207232200.7de2a1c3@windsurf> On Thu, 12 Jan 2023 12:58:02 +0100 Bernd Kuhls wrote: > Changelog: > https://www.php.net/ChangeLog-8.php#PHP_8_2 > > Updated license hash due to copyright year bump: > https://github.com/php/php-src/commit/bf2867bc7235dfb65675ff4e9c21c8bc537726e2 > > Signed-off-by: Bernd Kuhls > --- > package/php/php.hash | 4 ++-- > package/php/php.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 yann.morin.1998 at free.fr Tue Feb 7 22:23:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 23:23:19 +0100 Subject: [Buildroot] [git commit] package/gcc: map debug prefix when reproducible Message-ID: <20230207224638.41D4084453@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9a92ea1cb1dd2aa9b3f9c83c04d7d01c1f6e148 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When building with BR2_REPRODUCIBLE the toolchain wrapper passes -fdebug-prefix-map for all packages that are built. But this doesn't affect the target libraries (like libgcc) built by GCC's build system. GCC 4.3 added a configure option to set the debug prefix map for these libraries, which is used here to avoid encoding potentially non-reproducible build paths into the debug data. Signed-off-by: John Keeping Signed-off-by: Yann E. MORIN --- package/gcc/gcc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index ec6f3b550a..6dfd93f2a4 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -84,6 +84,10 @@ HOST_GCC_COMMON_CONF_OPTS = \ --with-bugurl="http://bugs.buildroot.net/" \ --without-zstd +ifeq ($(BR2_REPRODUCIBLE),y) +HOST_GCC_COMMON_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot +endif + # Don't build documentation. It takes up extra space / build time, # and sometimes needs specific makeinfo versions to work HOST_GCC_COMMON_CONF_ENV = \ From yann.morin.1998 at free.fr Tue Feb 7 22:47:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 23:47:54 +0100 Subject: [Buildroot] [PATCH v2] package/gcc: map debug prefix when reproducible In-Reply-To: <20230207195810.2016594-1-john@metanate.com> References: <20230207195810.2016594-1-john@metanate.com> Message-ID: <20230207224754.GD2817@scaer> John, All, On 2023-02-07 19:58 +0000, John Keeping spake thusly: > When building with BR2_REPRODUCIBLE the toolchain wrapper passes > -fdebug-prefix-map for all packages that are built. But this doesn't > affect the target libraries (like libgcc) built by GCC's build system. > > GCC 4.3 added a configure option to set the debug prefix map for these > libraries, which is used here to avoid encoding potentially > non-reproducible build paths into the debug data. > > Signed-off-by: John Keeping After burnng through ~80% of my battery testing this: applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes since v1: > - Add the option to GCC common config, not just gcc-final > > package/gcc/gcc.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk > index ec6f3b550a..6dfd93f2a4 100644 > --- a/package/gcc/gcc.mk > +++ b/package/gcc/gcc.mk > @@ -84,6 +84,10 @@ HOST_GCC_COMMON_CONF_OPTS = \ > --with-bugurl="http://bugs.buildroot.net/" \ > --without-zstd > > +ifeq ($(BR2_REPRODUCIBLE),y) > +HOST_GCC_COMMON_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot > +endif > + > # Don't build documentation. It takes up extra space / build time, > # and sometimes needs specific makeinfo versions to work > HOST_GCC_COMMON_CONF_ENV = \ > -- > 2.39.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 Tue Feb 7 22:53:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 23:53:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix BR2_SHARED_STATIC_LIBS In-Reply-To: <20220531190702.107175-1-fontaine.fabrice@gmail.com> References: <20220531190702.107175-1-fontaine.fabrice@gmail.com> Message-ID: <20230207225340.GE2817@scaer> Fabrice, All, This patch has now reached the infamous status of being the oldest patch in our backlog... Sorry for that. :-( On 2022-05-31 21:07 +0200, Fabrice Fontaine spake thusly: > --static is added to pkg-config call with BR2_SHARED_STATIC_LIBS As already noticed by Thomas, this is not correct. In fact, zabix uses custom --enable-{stati,shared} options, instead of usingthe standard libtool directives: 1276 AC_ARG_ENABLE(static,[ --enable-static Build statically linked binaries], 1277 [case "${enableval}" in 1278 yes) 1279 LDFLAGS="${LDFLAGS} -static" 1280 AC_MSG_CHECKING(if static linking is possible) This is where your -static is coming from, and is causing those issues. So, your fix is technically correct (but see below), but for the wrong reasons. > Signed-off-by: Fabrice Fontaine > --- > package/zabbix/zabbix.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk > index adc54028ad..85fd193b4d 100644 > --- a/package/zabbix/zabbix.mk > +++ b/package/zabbix/zabbix.mk > @@ -125,6 +125,13 @@ endif > > endif # BR2_PACKAGE_ZABBIX_SERVER > > +# With BR2_SHARED_STATIC_LIBS=y, the generic infrastructure adds > +# --static when calling pkg-config resulting in a build failure with You'll also need to update that comment, of course. Can you fix the commit log and the comment, and respin, please? Again, sorry for the ong delay... Regards, Yann E. MORIN. > +# libcurl or openssl. Adding --disable-static reverts this > +ifeq ($(BR2_SHARED_STATIC_LIBS),y) > +ZABBIX_CONF_OPTS += --disable-static > +endif > + > define ZABBIX_INSTALL_INIT_SYSTEMD > $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ > $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ > -- > 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 romain.naour at smile.fr Tue Feb 7 22:57:03 2023 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 7 Feb 2023 23:57:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.67.0 In-Reply-To: References: <20230131050319.2821287-1-james.hilliard1@gmail.com> Message-ID: <085ae495-8020-d57c-fa8c-71e6f800f84b@smile.fr> Hello Sebastian, Le 06/02/2023 ? 17:30, Sebastian WEYER a ?crit?: > Hi all, > > On 31/01/2023 06:03, James Hilliard wrote: >> Link to Rust 1.67.0 announcement: https://blog.rust-lang.org/2023/01/26/Rust-1.67.0.html >> >> Signed-off-by: James Hilliard >> --- >> package/rust-bin/rust-bin.hash | 252 ++++++++++++++++----------------- >> package/rust-bin/rust-bin.mk | 2 +- >> package/rust/rust.hash | 6 +- >> package/rust/rust.mk | 2 +- >> 4 files changed, 131 insertions(+), 131 deletions(-) >> >> diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash >> index adf1799ad7..d00e6342e8 100644 >> --- a/package/rust-bin/rust-bin.hash >> +++ b/package/rust-bin/rust-bin.hash >> @@ -1,129 +1,129 @@ >> -# From https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc >> -sha256 a1279760f91b3571733e0b0268128d143be2734916753900b5fe7b8ecc3c0900 rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc >> -sha256 835b4e1b4d396674f7866a83b9a4f44db16fd12f01a7eaed527282b3700a9b92 rust-1.66.1-i686-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc >> -sha256 c7349617c42274bf50f6e3662dfb4f6832a93780099c3bb510be1a5b93d04c37 rust-1.66.1-mips-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc >> -sha256 fc38663870f0af47a27241d980ca886c3f7d432267920deb412ac8576bef68f0 rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc >> -sha256 2b1a6c54db49a9e62d60cc96c1768f405e0f4c59d698186bf3a28a1bb017b6b5 rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc >> -sha256 777d3a650448c15048710282388e90d10740540f570f5d17ed4a2dbdabb89552 rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc >> -sha256 875bb310bae7c8c1d2d228a49aa4b547608b6c807ddc9ec44bc87272c77d869b rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc >> -sha256 89164ccf75909b3d02bdcb787e33876cad87e55ab0e6239b030b4b6631ed356a rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc >> -sha256 e83f9fc473072db23376783595a008cdd9b2f2e9b3be109e55939392864840eb rust-1.66.1-s390x-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc >> -sha256 a201aa4595ec8015662b7103b1409a4787c6d1f1d540bb68746633527d855858 rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc >> -sha256 9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24 rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc >> -sha256 520ac446f20490685cc4d73192cfbb4c9b9e55c884aa4ae2b098e3a54d891de8 rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc >> -sha256 42afd189ef64988f64976f767a734734bccd7c71e578780e902148c98226fa29 rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc >> -sha256 506126773af9c3dacc506776a0b2e12fe6fa0c95eaf4f4ebb5cdbd335feb83fa rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.asc >> -sha256 3d21b478fbf07bd27902bdd189e6988341f0c2c0108b538f926cea3031bc8ea6 rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.asc >> -sha256 5282fc97111a7eafbead3463ed7bc0f3065332f21aec6a39a740157fe42f943a rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.asc >> -sha256 0ebf0178bbe9c5572d1db89e190dee23aef0e2f667995abedbd66e33d0bd73ab rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.asc >> -sha256 938e7442c21ea0895c44ec78fa718ea1d3abe32ed0425ed328c905e188af250e rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc >> -sha256 bdc491f4c05669e7a3382b6bfdaeaa20e2cfa5ef553305df0e0d73729a45e6e4 rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.asc >> -sha256 d75c6dc3c00d662b0d3f6ce7fde0f76057542edfbc97a20b29247842c8a711d2 rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.asc >> -sha256 830285e5388081c68fac9dc955aa824a4d919b0e24eadc6e0b95b30103d79db9 rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.asc >> -sha256 d720bd1e493f53797f90d83dbe6d52ecbe1ff3cae282f4b2e18c37fe92c9adf6 rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.asc >> -sha256 90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17 rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.asc >> -sha256 c4bab2d63223d0c6e63806082e30d8c38b37eefc10ee2e7380971e3012c00bca rust-std-1.66.1-i586-unknown-linux-musl.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.asc >> -sha256 b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.asc >> -sha256 52013329eb6697d94f5dce01dd509b4b93b473c18a3a2c05d0230b9dfeab14d1 rust-std-1.66.1-i686-unknown-linux-musl.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.asc >> -sha256 e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568 rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.asc >> -sha256 23f917eccaca59d4c911eb96d8ffefe86834dbcdf902c9ab6dad8558c31c4575 rust-std-1.66.1-mips-unknown-linux-musl.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc >> -sha256 70d1406e0981d5d31c1d3f85c848bba0476e0ff6203e7706f66b4d2212f01b66 rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.asc >> -sha256 0fd221d4b4205ce548e83f0e7416c8332eb12b64d5a43c0b3ed61e9f7d6edf13 rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc >> -sha256 132d6d5750a877972ebc6f23e831f2ef3077465b2ab24ca645d32ea83c496fe3 rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.asc >> -sha256 533f370368ac8b6192e1450289c64544ebf9cacc38c3a52ef6c0ecded7ee6fa5 rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc >> -sha256 8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.asc >> -sha256 d7028820888d0decde047a6e77b866e690532aa09522c9a23a3fbf8780a72257 rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc >> -sha256 417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1 rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc >> -sha256 7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35 rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc >> -sha256 4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770 rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc >> -sha256 776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc >> -sha256 51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062 rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.asc >> -sha256 3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927 rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc >> -sha256 c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377 rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz >> -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc >> -sha256 a9710727ba28955deb7fbec799faed19486c9af3c7e3088ec6659a257515ffca rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc >> +sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc >> +sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc >> +sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc >> +sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc >> +sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc >> +sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc >> +sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc >> +sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc >> +sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc >> +sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc >> +sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc >> +sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc >> +sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc >> +sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc >> +sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc >> +sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc >> +sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc >> +sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc >> +sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc >> +sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc >> +sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc >> +sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc >> +sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc >> +sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc >> +sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc >> +sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc >> +sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc >> +sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc >> +sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc >> +sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc >> +sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc >> +sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc >> +sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc >> +sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc >> +sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc >> +sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc >> +sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc >> +sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc >> +sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc >> +sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc >> +sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz >> +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc >> +sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz >> # Locally generated >> sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE >> sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT >> diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk >> index 89009288f4..d62ce39cfc 100644 >> --- a/package/rust-bin/rust-bin.mk >> +++ b/package/rust-bin/rust-bin.mk >> @@ -6,7 +6,7 @@ >> >> # When updating this version, check whether support/download/cargo-post-process >> # still generates the same archives. >> -RUST_BIN_VERSION = 1.66.1 >> +RUST_BIN_VERSION = 1.67.0 >> RUST_BIN_SITE = https://static.rust-lang.org/dist >> RUST_BIN_LICENSE = Apache-2.0 or MIT >> RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT >> diff --git a/package/rust/rust.hash b/package/rust/rust.hash >> index 545a452bf0..2a260ca64f 100644 >> --- a/package/rust/rust.hash >> +++ b/package/rust/rust.hash >> @@ -1,6 +1,6 @@ >> -# From https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.sha256 >> -# Verified using https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc >> -sha256 07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe rustc-1.66.1-src.tar.xz >> +# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 >> +# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc >> +sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz >> # Locally generated >> sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE >> sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT >> diff --git a/package/rust/rust.mk b/package/rust/rust.mk >> index 691683b492..d14ad3a3e7 100644 >> --- a/package/rust/rust.mk >> +++ b/package/rust/rust.mk >> @@ -6,7 +6,7 @@ >> >> # When updating this version, check whether support/download/cargo-post-process >> # still generates the same archives. >> -RUST_VERSION = 1.66.1 >> +RUST_VERSION = 1.67.0 >> RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz >> RUST_SITE = https://static.rust-lang.org/dist >> RUST_LICENSE = Apache-2.0 or MIT > > I just tested rust-bin with the following command: > > ./support/testing/run-tests -o test-output -d test-dl/ -k > tests.package.test_rust.TestRustBin > > and verified that it passes with the message "OK". > > Tested-by: Sebastian Weyer Sadly the host-rust package fail to build. Indeed the bootstrap code is broken We have to backport this patch from upstream: https://github.com/rust-lang/rust/commit/3fe64ebbce21e79adb64099984e96dfb79bdd0f9 I know tests.package.test_rust.TestRust takes ages to build :) Best regards, Romain > > Best regards, > Sebastian > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Wed Feb 8 00:53:43 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 7 Feb 2023 17:53:43 -0700 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: fix relative toolchain_csv paths Message-ID: <20230208005343.2544457-1-james.hilliard1@gmail.com> The default toolchain_csv path is a relative path to the buildroot directory. If we run genrandconfig with a cwd that is not the buildroot directory the default toolchain_csv path will be wrong. To fix this prepend the buildroot directory path to the toolchain_csv path whenever the toolchain_csv path is not absolute. Fixes: FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' Signed-off-by: James Hilliard --- utils/genrandconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index b3576f8a51..b96f2ee6de 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -115,6 +115,9 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): toolchain configuration is itself an array of lines of the defconfig. """ + if not os.path.isabs(toolchains_csv): + toolchains_csv = os.path.join(buildrootdir, toolchains_csv) + with open(toolchains_csv) as r: # filter empty lines and comments lines = [t for t in r.readlines() if len(t.strip()) > 0 and t[0] != '#'] -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 8 07:10:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 08 Feb 2023 07:10:52 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-07 Message-ID: <20230208071058.ABFF681EBE@smtp1.osuosl.org> Hello, Autobuild statistics for 2023-02-07 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 4 | 2 | 0 | 6 | 2022.11.x | 22 | 23 | 0 | 45 | master | 154 | 189 | 0 | 343 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 10 linux-6.1.9 | 8 xz-5.2.10 | 8 elfutils-0.186 | 7 host-pahole-1.24 | 7 jack2-1.9.21 | 7 libgpg-error-1.46 | 7 unknown | 7 norm-1.5.8 | 6 host-binutils-2.38 | 4 host-libxml-parser-perl-2.46 | 4 host-rust-1.67.0 | 4 host-sentry-cli-2.8.0 | 4 libgcrypt-1.10.1 | 4 libglib2-2.72.3 | 4 ntp-4.2.8p15 | 3 ocf-linux-20171122 | 3 python-bcrypt-4.0.1 | 3 python-bunch-1.0.1 | 3 python-cryptography-39.0.0 | 3 bash-5.2.15 | 2 cairo-1.16.0 | 2 freeradius-client-1.1.7 | 2 host-binutils-2.39 | 2 host-gcc-initial-10.4.0 | 2 host-go-1.19.5 | 2 host-libarchive-3.6.2 | 2 host-runc-1.1.4 | 2 libnss-3.87 | 2 libsolv-0.7.22 | 2 perl-5.36.0 | 2 quickjs-2021-03-27 | 2 sudo-1.9.12p2 | 2 zabbix-5.4.9 | 2 assimp-5.2.5 | 1 bat-0.19.0 | 1 binutils-arc-2020.09-release | 1 brltty-6.5 | 1 busybox-1.36.0 | 1 coreutils-9.1 | 1 dmalloc-5.6.5 | 1 dust-0.8.1 | 1 efivar-38 | 1 ffmpeg-4.4.3 | 1 fluent-bit-2.0.8 | 1 fontconfig-2.13.1 | 1 frr-8.4.2 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gerbera-1.10.0 | 1 glibc-2.36-81-g4f4d7a13edfd... | 1 google-breakpad-c85eb4a59b6... | 1 gpm-1.20.7 | 1 host-binutils-2.37 | 1 host-delve-1.20.0 | 1 host-gcc-final-11.3.0 | 1 host-gdb-arc-2020.09-releas... | 1 host-moby-buildkit-0.11.2 | 1 host-rust-1.66.1 | 1 hyperfine-1.14.0 | 1 jemalloc-5.3.0 | 1 libabseil-cpp-20220623.1 | 1 libdeflate-1.15 | 1 libxcrypt-4.4.29 | 1 lightning-2.2.0 | 1 linux-5.10.162-cip24-rt10 | 1 lirc-tools-0.10.2 | 1 ltp-testsuite-20220930 | 1 mender-3.4.0 | 1 mosh-1.4.0 | 1 mosquitto-2.0.15 | 1 openblas-0.3.21 | 1 opencv3-3.4.17 | 1 openssh-9.1p1 | 1 opkg-0.4.5 | 1 optee-client-3.19.0 | 1 ply-2.3.0 | 1 python-numpy-1.23.5 | 1 qpdf-10.5.0 | 1 rtl_433-22.11 | 1 ruby-3.1.3 | 1 sdl-1.2.15 | 1 tcf-agent-1.7.0 | 1 toolchain-external-codescap... | 1 uboot-tools-2021.07 | 1 uclibc-1.0.42 | 1 valgrind-3.19.0 | 1 wolfssl-5.5.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/369364fb03677d36f9f0895b64dbbdc9b4840905 | ORPH sparc | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/a5eec813d00c88b8418b7ed8f3ae0d32cc4f42d2 | ORPH sh4 | bash-5.2.15 | NOK | http://autobuild.buildroot.net/results/7387e42f025e1d40c062d519a5e82e7ec2100bbe | ORPH s390x | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/87ff6f6f5b92254ba7a119b7220d8b452a75031c | arceb | binutils-arc-2020.09-release | NOK | http://autobuild.buildroot.net/results/2c24bc780bf45e6c2d2ebbabc216a0144ed5605f | microblazeel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/ddff46b136f7a06a3cd17b7bd2035ea818279c77 | mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/39259b5d19570cf5320bff34deaae4bdcbd94218 | ORPH arm | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/25500de8b56a736ef6882cd6024dc6e47fbfae24 | arm | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/ead46ad592b9464fb8528e226a08a72eb54f8b1f | sh4aeb | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/17881a17e2a62f3f0756dabb4e645d4a8d029b72 | ORPH powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/22fefed9ac5f097929a4e1c2c08e240a6ceb1d2f | ORPH powerpc64 | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/c480f50fdb370f75d8114c04525f8038cf7209d1 | ORPH arm | efivar-38 | NOK | http://autobuild.buildroot.net/results/b6caf7157cc030575d1b88715dffa3fe9135045d | arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/77f78162b7120d3d81c57233d67c66f2b7dae079 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/9bf79715f52b96d09b10c151568652579e4b91b4 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/4dbfdf37f37c065a064e29d3a0266851165b0d76 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/9c345a5d3762715866b38b7542d196110b029c63 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/da326dbf644fcc47fb9b9f625e2ed284b4682786 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3cb1f817f94ae29b962cd0020f608cfe139d15e5 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/6fe4cf52ff89da6df7edff12c4bb92efe2ecb783 | ORPH arm | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/6e577ef6458cf752ddf8c1e4e2e28145a36a365e | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/8a1e017f57a3a1da0e692995ffe2974a6aae3154 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/0ba6e1419700f7f2e14c91ed8c75f156d3c02972 | ORPH riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/a67b10eb688689b4ee7c42af0e1f53a36ea14b09 | riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/443502c7c4134eb942e790c94ff2265af455b3da | xtensa | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/63f8a5b01522c3674798103ced95e0a7b5aa62f3 | m68k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/6d1b4495b4a48337a3948f58b294a36472848b8b | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/c45b87281222bcdc4b802de4f457e3955eb466c9 | arc | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/e81c9a1567d9933672e478acfd23ef16405c73b9 | arm | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/a3c51db5e8d45b0aa668688747a147988019bad2 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/ea241163e72a5e35e265633598e48667eea670f8 | powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0e8a955d91c155598c6bb39b3cee37461800eceb | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5822f300f70ff0c54ef6703204d3b8600dd25623 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/31ae7237bca0b133cb6fe0867917523eafe281d7 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/aed8a025eebf8806379c342a6c5d88fb427af532 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f134044e45fbf8fca658cd5e74596570e239494c | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1a8b36cce91302c6c10bbe81dd9cf86ad747eb21 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5e8aa41a618a512a6ee3c9732b24c6336dffa6e7 | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7306353b97e5601d9c41369c0965038bd99b27ab | ORPH powerpc | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5d334e95e9967e489b16ffd7d8ccb1d65326c1b5 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5dd22984664f63f3f3d85afb4be26ffc50ce6bb7 | ORPH arm | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/c932b37dcc5009f6eff130145640bc8f97942fd1 | mips64 | gpm-1.20.7 | NOK | http://autobuild.buildroot.net/results/f184254ffaeb9ac220080182388df86c74811f91 | aarch64_be | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/4a19d203cbae166b127e427b6ff9dc5987be4a99 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e63033b9fbc27fa2d86819cea1a854a1484f88ee | aarch64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/5e7a9a0c401b300064a03404250e6c82c0dad47c | or1k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/739be78400db2f4053cc42163caf2f34f9102296 | powerpc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e7db68f3921c7ecca96aad878836fe541d05a35b | nios2 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/68a9d2e5281d33870fd1a58e4afb7555ae5f2cc1 | nios2 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/63921029c9d2302eef577cd7ba97f7e2dae16fe3 | riscv64 | host-delve-1.20.0 | NOK | http://autobuild.buildroot.net/results/482d53008d13fcce7727e80dcb4cac558c247892 | arceb | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/28417f0d08aa2476dcc32b0ac5f400d852b7eac6 | sparc | host-gcc-initial-10.4.0 | NOK | http://autobuild.buildroot.net/results/43d0d72c5512f5c47ae03064df9d928e2e7fa3aa | mipsel | host-gcc-initial-10.4.0 | NOK | http://autobuild.buildroot.net/results/0d6d8071b576f39c023e08202f2cc5834a6e0124 | arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/cef1626e6a176abc1515ae6623e7c1e74799fcff | ORPH powerpc64le | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/34c4169c8bdcc76631a0802b8192c3f5101b9d40 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/402b7df63416e399bd82afd2acc85e1081e3cb18 | m68k | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/5bbc80c994f6e374c99ec9893c4f2b5e99d8c9fd | s390x | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/656789900210563458db18e85e2c4822c9cc568d | sh4eb | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/b159a497f159764e481abc7270b49991776bbc29 | powerpc64le | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/509c057bc68c9f88eca61aa4329d2053bb07cc6f | powerpc64 | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/8941db077afdd3e2ce5f19b367770d290f53463c | i586 | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/1667b4ebd8e16e7d8b47bc3ca128a76daf27b4d9 | arm | host-moby-buildkit-0.11.2 | NOK | http://autobuild.buildroot.net/results/1c99bee6ca50a616a9d051680f2a5e2b2a8bc5c6 | microblaze | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/072a93370150c48c7b9e217a88d679607e8aa8ba | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/acdc8a14ef350aab3f7bac1751447e6f16032392 | arc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/9a680f7f0e6a6b816965ee87b9a05b56f5aeedf2 | s390x | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/84325744ad149e89e03e7c5bfa0b226d35cb2df2 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/e5b52367fd30545bca59d9d7432117dd0f5d5427 | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c131098c4e6565d1057d4496f0bd6c62601e0586 | riscv32 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/db092d2d68bfd38045f585a282a0f87704a995d6 | microblaze | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/a4b8651fd53839b44015c6e31d491dd24125f65b | riscv64 | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/3633cfbd6b9c61a78a085695a6ab481691241acd | x86_64 | host-rust-1.66.1 | NOK | http://autobuild.buildroot.net/results/35d10808c36ec5819b000e0714961d46e3661913 | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/214fcbb3458893784b7f85b60f7ee1edb428c77f | s390x | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/94d9916d5aa662e6f600699cab3bc02ff718247b | s390x | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/081c59f8586dc35cb5482848e304be473c4b1c35 | i686 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/133a60a9ea8ea72298f259da47b54575d81f8ab3 | mips64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/7e214009f2464e379ef8e466dac792d212d89723 | arc | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/4a344740169f7877e57c1f3d2571680033406de6 | powerpc64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/c06d0065340d94f3fea14b7d19512c2e95277d4c | aarch64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/914dc3fdfc32cb34265e4cd5cc63e48a4a3e2f9e | i686 | hyperfine-1.14.0 | NOK | http://autobuild.buildroot.net/results/fa32372398ddd3c5dcc7311a571ec3b2e3328a23 | ORPH aarch64_be | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/ca97bf61bea150fbd9e5085382ff7eff16645d3c | or1k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/c5a51ae1ffca857372825a044b9f7183483c8656 | i586 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/a9a99e0ef6754e3a9cbb6a87ddc072de5ad2c0b0 | x86_64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/5f9f0591e99357d199b2e654c945416e631eba36 | x86_64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/4bed6de09e27729a1f9190bc5d334f876b58e86a | microblaze | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/28f2b6f360179d46bcfd23b85d6ec216a3ab865d | microblazeel | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/aa049eb39eb52d8dceafd3694648045a6acd85ee | sh4aeb | jemalloc-5.3.0 | NOK | http://autobuild.buildroot.net/results/294c639cafd67f12151932cc0ab3d0d44230f4c1 | mips64el | libabseil-cpp-20220623.1 | NOK | http://autobuild.buildroot.net/results/783f33881f2d83f3b3578acf159b7914c4bca757 | arm | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/83e68fae08c2391f8fb4b41b76fcdcbc6efaea80 | arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/edcbecc775dc1ca57aa5768736d31101b123d86f | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/a1b02acc4ea7f7c5c21e4553f51ce9c70202fc87 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/735b12bf38b1b03aef910bc93211f05200cc06a0 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/7a97dc5d8158fc5197865747c69bc8481916c048 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/b04bfc92e7423bf4df640424833f5b52775c491f | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/7dd51dab00ec4d2648b735b56bf38c08603ceaba | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/e9358d8b0cb2c2ee2c8998cadbc7cebe8c07fdf6 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/7da758345002eb670853646bcdf0e5359efb047e | aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/b89852411d06e0bb79fd18e0c91a247421ddb48c | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/149d316b80613f97746ff0a1fdbdf4cf4ed2406c | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/ec803460a63594843a6d8d2b91c8edb58538f00a | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/a0c6b5a6e202e59c7f40c97d838b0ed4ffd02594 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/6b8093a3cb26cbea5089765380efe2e39315b191 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/faf7be9344a95baa6e73415ffd67016454ee2cbe | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/1a26f3d5e449ef5ddb546e0bb754f9918828455e | ORPH microblaze | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/eb99f24f00a578c270a76f4142f1f692f3ee3f6a | i486 | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/3c8d15a0498a1c2ef1aa9e4fd8dfd330f07c2808 | nios2 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/f90ae4c6fd523e1df79ab89522b8dc74e2e3df8a | arm | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/2adb760067bf333cf079494e8fa17688aa4b537e | nios2 | libxcrypt-4.4.29 | NOK | http://autobuild.buildroot.net/results/0d44b92ba0320da923e665cda9d5d6739a3f5409 | sparc | lightning-2.2.0 | NOK | http://autobuild.buildroot.net/results/35025cb5ad509770a7198d9b6b1b25a375ddde05 | riscv32 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/ede8bd2897e5b387a560e33e5cbf765bdb687e3b | ORPH powerpc | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/9a4232a6e0d1960ddba9aed9e778a60d813d25ba | ORPH mips64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/c74b1040e5a0d2f2619ee81ef9f2d925862d6f7b | ORPH mips64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/766a85c985c894753d2fb39555b7861a9cc5ffd2 | ORPH sh4a | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/1f7afb73947794da50f336f272790dc7b426923b | ORPH sparc64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/a90cf3cdd92c41eba1c5598abcbd6763af95b91d | ORPH mips64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/8ef5a507978b1d9476609021dd7d873b0122e344 | ORPH mips64el | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/e05e46b38334c537c3ee9e78ae69008d8529305f | ORPH powerpc64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/a85a388e79457e59b96d8c1e1cdc711b8d301801 | ORPH powerpc | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/1e8d4c44bbb041706c1b53b0fe3db341b14af529 | ORPH arm | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/54da73c9bc2303885dc76861c818c3dbda39a9b6 | x86_64 | mender-3.4.0 | NOK | http://autobuild.buildroot.net/results/2bd80939b54f3e562af649f7a19a9d4148c8b91a | s390x | mosh-1.4.0 | NOK | http://autobuild.buildroot.net/results/820e98b1c126469b1f180f078d102ded43b9c40e | or1k | mosquitto-2.0.15 | NOK | http://autobuild.buildroot.net/results/e41611fb58a74a148294b17825555e314031cbc4 | mips | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/c2855d4a9465c29dd4a3e59d4f512a6fe462358b | ORPH arm | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/14d1c8a46c0dfba1dfa666f0659808028929f9d1 | ORPH mipsel | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/83644d2e049c767b4b517e77e20f9b921e264fd9 | ORPH aarch64_be | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/90bc9c9df8d2646d8e68329710f3e36ae1697c97 | ORPH sh4a | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/7dd9bf42c85f962638d0db641602243458243059 | ORPH powerpc64le | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/5960316e2be97b2aa047654f17364e8a4a120feb | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/459addd7bb5bd17ee2e11e24c3029c5ee3733460 | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/b61802195164e0ad34cbf97b21564b6177f26b0d | ORPH riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/ea863135e793e5c72042a759f28be58fbf84ee01 | ORPH microblazeel | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/13b89b2bd548576bd4f666fff7e8c9a4a06edfab | ORPH microblaze | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/b80a3096303aac250f1be85a97a71bfdb0496230 | ORPH aarch64 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/ef326909228e905ff482410785646eeadb27568c | ORPH mips64el | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/8e1dfc1326aa047ecf070e8ff59566a77bde5fa2 | ORPH mips64 | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/88b4081bb9a4d4b088cbf55ef444a2b374db5622 | m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/21d61e81c940c75f8f474fd4270c389d791f0b36 | ORPH or1k | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/4fedaa7352154064f4a7b7e301faf87976956c52 | ORPH powerpc64 | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/d48aa36a8c1447f07053402eb39eaeb86be5a870 | arm | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/32e304a37e8e4d0e962ad898d7ed9b3de4ab4eb1 | powerpc64le | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/a2cf6b20fc746a07738b00876f05c33a29422a19 | x86_64 | ply-2.3.0 | NOK | http://autobuild.buildroot.net/results/8210bd2b9c67d6d7616ada525019b2658195416a | sparc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/79236e3f9a58493561d50dec3187902262294346 | i686 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/e676d3e3db2deb33b984cd39f02766a7c410449d | aarch64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/7c16e5c8548041682dc8fc4521e7e989133d9938 | mips64 | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/c9d2e9830bd25d2f95c67fb7ea5cfda95a57414f | powerpc64le | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/c51deff4d3e536819085dc2ad127cd311eb2e9de | mips | python-bunch-1.0.1 | NOK | http://autobuild.buildroot.net/results/bce4082fc07ec53dbe54e8591254ece9b973131f | arm | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/463ebd0c5c7f4518cec4afdaaef57052e7a63686 | arm | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/0ca9825b909d59cebcd6c562ab20ec61c556605a | sparc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/db4adf7e9665995cf900c44e3dd6920e10dc97d9 | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/dfe6b1a0096a5701b06274df2ae755ed8232d5da | xtensa | qpdf-10.5.0 | NOK | http://autobuild.buildroot.net/results/d2b12640a2c545a31bf025e574f12fa215a90c07 | mips64 | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/f83677ea7206a28fa8558d4e7edd6b19314f90ea | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/6e491927e2dad71fbf98414140404f8a569bde3e | xtensa | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/2be7e78d1832a32a0e731e988d2a10de2a93edd0 | nios2 | ruby-3.1.3 | NOK | http://autobuild.buildroot.net/results/a3801b2526046eb440815afd014ec1b603828b0c | sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/ad135b1dc023a21d6d86b5e8ac746e3f7f08a0f0 | ORPH sparc | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/5467e94e7043fd0ecaf61d99e48e0b4dc0ce191c | ORPH armeb | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/f3c8d1e85dee16b557fada7bdb096574fa6c9181 | ORPH microblaze | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/4d4580e0b42a6fb877b91266ac89bc01d8d76fcc | mips | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/171f7286faf7cb1bbe72c77e8477cb524e50698c | ORPH arc | uboot-tools-2021.07 | NOK | http://autobuild.buildroot.net/results/cdbd6586286b3a3c148020eb71b855008c2be5ee | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/3bfbe9c4f6b10eb3ce4b79ee7cd3b44f2e3cd25d | mips | unknown | NOK | http://autobuild.buildroot.net/results/99a6b116cc342ca1dd2394f6c958d4886f0fd135 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/c804cddacd0d0dc73e7211f6da3bd10cd74907ae | mips | unknown | NOK | http://autobuild.buildroot.net/results/773c90606ad4decb55088f6f1f47ca0ac69d41fb | mips | unknown | NOK | http://autobuild.buildroot.net/results/a6398300c17e99dd4bbd40c4d333867a729bec91 | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/95ceef539d2f058e2b6b4fdd7538d9e62f75f554 | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/054a5c9e6e1703ac8ccdfa15cb0d2af050f827ae | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/d0b516068c3618377bb264e647841227220eb339 | powerpc | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/1ecbd6075bde3a1afb4ef4ef11213153a436e02f | ORPH mips64el | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/43ee1a457cbeb986d958c9a70cac0676377661c0 | microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/73ae9a2505372a4405f5ce8092a5acbe9004e0d5 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/86dbc2665f3f92a8372ce50ad93bb8879489de35 | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/8ded9c328f42d6af686444ba3de5d4199ac86ae8 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/96fb86d82ddbeedcdb693b9e761854a4098c3ccf | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c | ORPH microblazeel | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/93de09856d236d72f2c8970881f6bdc734aa38a1 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/e8ed8cbd3b7c1ca75c48577f62434f2baa6dc548 | ORPH microblaze | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/4dc0c88c1ed250dd5e1be492138bd6e1781128b4 | ORPH mips | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/1dbbefa655380f5ea562067fda897e792de649a3 | microblazeel | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/1240c47fb2b6ecd84a27938683194821164cc351 | Classification of failures by reason for 2022.02.x -------------------------------------------------- grpc-1.43.0 | 1 janus-gateway-0.11.6 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | grpc-1.43.0 | NOK | http://autobuild.buildroot.net/results/9cf27ab26ef49aea17f91bf98024d60441436ce9 | nios2 | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/bb10b19e645ac889c9695b41bf69d24c36fd8021 | Classification of failures by reason for 2022.11.x -------------------------------------------------- host-go-1.19.5 | 2 janus-gateway-1.0.3 | 2 python-numpy-1.23.4 | 2 bzip2-1.0.8 | 1 dmalloc-5.6.5 | 1 efivar-38 | 1 fdk-aac-2.0.2 | 1 gerbera-1.10.0 | 1 gobject-introspection-1.72.0 | 1 host-binutils-2.37 | 1 host-binutils-2.39 | 1 host-libxml-parser-perl-2.46 | 1 host-pahole-1.24 | 1 libuhttpd-3.14.1 | 1 libxcrypt-4.4.29 | 1 nvme-1.12 | 1 uclibc-1.0.42 | 1 unknown | 1 xenomai-3.0.10 | 1 xz-5.2.7 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | bzip2-1.0.8 | NOK | http://autobuild.buildroot.net/results/aea930ea6ec35aa7f8023f50cdbf7e2e3f4388c3 | ORPH i586 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/f88af75188a69ddd956877e92e866e6a0a7169cf | ORPH mips64el | efivar-38 | NOK | http://autobuild.buildroot.net/results/170af89c5452290d927778538edea61bbdf0cbea | arm | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/43c3d7029f17b501077f347d0f9ffbe0b53d5c98 | mips64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/830e55d1f147a7226959afe656932fe6354c020a | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7d36c2e4f17d64c961b65825b5594cae7fc331d8 | ORPH powerpc | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/d1ab68d939acda7d2d5163586f78b3f5e105bc45 | microblazeel | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/70fd251d76e2f4d473f5ad3a0fda0e652b79d8fc | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f5bb3d5e9af58d5bd326cb8d11ba6f50823163ba | aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/1714553b7b9e12a1ef65f230be1cdbfc57721ad1 | powerpc64 | host-libxml-parser-perl-2.46 | NOK | http://autobuild.buildroot.net/results/4a3b1f009e5e5a89f4a7a97576745a7b079d4092 | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/7c66c76666552cc4da121eedb0dbf273c6413062 | powerpc64le | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/e5d42082390bd044d4d2abb1260d559a1b4d214a | mips | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/6e1e24b83c42726f85033c2e67522a954ade3312 | mips64 | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/7ff2ca83c35540f693de777f2198e821053b8c3a | aarch64_be | libxcrypt-4.4.29 | NOK | http://autobuild.buildroot.net/results/16cba783be11cc5024f9c56bb0a7abb0acf13ef8 | mips | nvme-1.12 | NOK | http://autobuild.buildroot.net/results/faef1e36adbfb5a6098e1565c7512030c14d8fc5 | ORPH mips | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/e021295697946b8b3c9bb886df0c245d39686148 | x86_64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/c636f6876bf24b64b41864e3a130d1a3d222ca49 | powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/ed2c0a136242d6e195397c1392e9969db4f59d9c | arc | unknown | NOK | http://autobuild.buildroot.net/results/2b8723054580995da0b514a0a9d2ba7423514b30 | i686 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/9ccbb93fa06ed78983b33e5965f8e9d301aaed4a | microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/66c88d611e91d7df549c400259d2cac864eda3c1 | ORPH Gitlab CI results for 2023-02-07 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestAarch64Pages64kGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449186 | ORPH TestAarch64Pages64kMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449187 | ORPH TestAarch64Pages64kuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449189 | ORPH TestCheckPackage | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449530 | TestClangCompilerRT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448892 | ORPH TestCrudiniPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448894 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448896 | ORPH TestDropbear | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448898 | ORPH TestDtbocfg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448899 | ORPH TestExecline | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448900 | ORPH TestExt2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448844 | ORPH ...rch64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449203 | ORPH ...tlinAarch64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449205 | ORPH ...arch64MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449206 | ORPH ...otlinAarch64MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449208 | ORPH ...ch64UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449209 | ORPH ...linAarch64UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449212 | ORPH ...h64beGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449214 | ORPH ...inAarch64beGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449215 | ORPH ...64beUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449216 | ORPH ...nAarch64beUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449219 | ORPH ...750dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449220 | ORPH ...nArcle750dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449221 | ORPH ...ehs38GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449222 | ORPH ...inArclehs38GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449224 | ORPH ...hs38UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449225 | ORPH ...nArclehs38UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449227 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449228 | ORPH ...mebv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449229 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449232 | ORPH ...rmebv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449234 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449235 | ORPH ...ebv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449238 | ORPH ...5eabiGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449241 | ORPH ...inArmv5eabiGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449242 | ORPH ...v5eabiMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449247 | ORPH ...linArmv5eabiMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449250 | ORPH ...eabiUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449252 | ORPH ...nArmv5eabiUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449254 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449256 | ORPH ...Armv6eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449259 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449260 | ORPH ...nArmv6eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449261 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449262 | ORPH ...rmv6eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449264 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449265 | ORPH ...Armv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449267 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449268 | ORPH ...nArmv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449269 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449270 | ORPH ...rmv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449271 | ORPH ...mv7mUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449272 | ORPH ...tlinArmv7mUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449273 | ORPH ...8xxxUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449274 | ORPH ...nM68k68xxxUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449278 | ORPH ...fireUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449279 | ORPH ...8kcoldfireUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449283 | ORPH ...azebeGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449284 | ORPH ...icroblazebeGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449285 | ORPH ...lazebeMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449286 | ORPH ...MicroblazebeMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449287 | ORPH ...zebeUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449290 | ORPH ...croblazebeUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449291 | ORPH ...azeelGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449292 | ORPH ...icroblazeelGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449294 | ORPH ...lazeelMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449296 | ORPH ...MicroblazeelMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449299 | ORPH ...zeelUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449301 | ORPH ...croblazeelUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449303 | ORPH ...ips32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449304 | ORPH ...otlinMips32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449305 | ORPH ...Mips32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449306 | ORPH ...ootlinMips32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449307 | ORPH ...ps32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449309 | ORPH ...tlinMips32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449312 | ORPH ...s32elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449313 | ORPH ...linMips32elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449314 | ORPH ...ps32elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449316 | ORPH ...tlinMips32elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449317 | ORPH ...32elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449318 | ORPH ...inMips32elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449320 | ORPH ...2r5elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449321 | ORPH ...nMips32r5elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449323 | ORPH ...32r5elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449326 | ORPH ...inMips32r5elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449327 | ORPH ...r5elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449329 | ORPH ...Mips32r5elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449331 | ORPH ...2r6elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449332 | ORPH ...nMips32r6elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449333 | ORPH ...32r6elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449335 | ORPH ...inMips32r6elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449337 | ORPH ...r6elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449338 | ORPH ...Mips32r6elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449339 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449341 | ORPH ...Mips64eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449342 | ORPH ...4eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449344 | ORPH ...nMips64eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449346 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449348 | ORPH ...ips64eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449350 | ORPH ...64n32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449351 | ORPH ...inMips64n32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449354 | ORPH ...s64n32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449356 | ORPH ...linMips64n32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449358 | ORPH ...4n32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449361 | ORPH ...nMips64n32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449363 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449364 | ORPH ...ps64r6eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449367 | ORPH ...6eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449370 | ORPH ...ips64r6eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449371 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449374 | ORPH ...s64r6eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449375 | ORPH ...Nios2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449376 | ORPH ...ootlinNios2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449379 | ORPH ...enriscMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449380 | ORPH ...tlinOpenriscMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449381 | ORPH ...riscUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449382 | ORPH ...inOpenriscUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449384 | ORPH ...440fpGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449385 | ORPH ...owerpc440fpGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449386 | ORPH ...c440fpMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449388 | ORPH ...Powerpc440fpMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449389 | ORPH ...40fpUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449390 | ORPH ...werpc440fpUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449391 | ORPH ...e5500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449392 | ORPH ...erpc64e5500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449394 | ORPH ...e6500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449396 | ORPH ...erpc64e6500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449398 | ORPH ...4e6500MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449399 | ORPH ...werpc64e6500MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449401 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449402 | ORPH ...c64lepower8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449404 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449405 | ORPH ...pc64lepower8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449406 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449407 | ORPH ...rpc64power8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449408 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449409 | ORPH ...erpc64power8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449410 | ORPH ...300c3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449411 | ORPH ...werpce300c3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449413 | ORPH ...e300c3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449414 | ORPH ...owerpce300c3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449416 | ORPH ...00c3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449419 | ORPH ...erpce300c3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449421 | ORPH ...500mcGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449423 | ORPH ...werpce500mcGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449425 | ORPH ...e500mcMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449428 | ORPH ...owerpce500mcMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449429 | ORPH ...00mcUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449431 | ORPH ...erpce500mcUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449434 | ORPH ...lp32dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449437 | ORPH ...lp64dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449441 | ORPH ...iscv64lp64dGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449443 | ORPH ...4lp64dMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449446 | ORPH ...Riscv64lp64dMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449448 | ORPH ...p64dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449449 | ORPH ...scv64lp64dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449450 | ORPH ...0xz13GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449452 | ORPH ...linS390xz13GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449454 | ORPH ...Shsh4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449456 | ORPH ...ootlinShsh4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449458 | ORPH ...nShsh4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449460 | ORPH ...BootlinShsh4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449463 | ORPH ...hsh4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449465 | ORPH ...otlinShsh4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449469 | ORPH ...h4aebGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449474 | ORPH ...linShsh4aebGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449475 | ORPH ...sh4aebMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449476 | ORPH ...tlinShsh4aebMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449477 | ORPH ...arc64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449478 | ORPH ...tlinSparc64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449479 | ORPH ...rcv8UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449481 | ORPH ...linSparcv8UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449482 | ORPH ...X8664GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449483 | ORPH ...ootlinX8664GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449485 | ORPH ...nX8664MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449486 | ORPH ...BootlinX8664MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449487 | ORPH ...8664UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449489 | ORPH ...otlinX8664UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449490 | ORPH ...orei7GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449492 | ORPH ...X8664corei7GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449493 | ORPH ...corei7MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449494 | ORPH ...nX8664corei7MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449495 | ORPH ...rei7UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449497 | ORPH ...8664corei7UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449498 | ORPH ...664v2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449499 | ORPH ...8664v2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449500 | ORPH ...64v2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449501 | ORPH ...664v3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449502 | ORPH ...8664v3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449504 | ORPH ...64v3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449505 | ORPH ...664v4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449506 | ORPH ...8664v4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449507 | ORPH ...64v4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449509 | ORPH ...core2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449511 | ORPH ...linX86core2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449513 | ORPH ...6core2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449515 | ORPH ...tlinX86core2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449518 | ORPH ...ore2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449519 | ORPH ...inX86core2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449520 | ORPH ...6i686GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449521 | ORPH ...tlinX86i686GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449522 | ORPH ...86i686MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449524 | ORPH ...otlinX86i686MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449525 | ORPH ...i686UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449526 | ORPH ...linX86i686UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449527 | ORPH ...lx60UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449528 | ORPH ...Xtensalx60UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449529 | ORPH ...ToolchainBuildrootMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449191 | ORPH ...olchainBuildrootuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449192 | ORPH ...xternalToolchainCCache | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449193 | ORPH ...ernalToolchainCtngMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449195 | ORPH ...rnalToolchainLinaroArm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449197 | ORPH ...ToolchainSourceryArmv4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449198 | ORPH ...ToolchainSourceryArmv5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449201 | ORPH ...ToolchainSourceryArmv7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449202 | ORPH TestGdbArc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448901 | ORPH TestGdbFullTarget | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448903 | ORPH ...GdbHostOnlyAllFeatures | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448904 | ORPH TestGdbHostOnlyDefault | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448905 | ORPH TestGdbserverOnly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448906 | ORPH TestGetDevelopers | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449531 | ORPH TestGlibcAllTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448819 | ORPH TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448907 | ORPH TestGst1Python | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448908 | ORPH TestHWLoc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448909 | ORPH TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448910 | ORPH ...ystemSystemdRoIfupdown | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448873 | ORPH TestLibshdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448913 | ORPH TestLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448919 | ORPH TestLuaHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448935 | ORPH TestLuaInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448937 | ORPH TestLuaLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448915 | ORPH TestLuaLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448917 | ORPH TestLuaLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448921 | ORPH TestLuaLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448923 | ORPH TestLuaLuaCffi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448926 | ORPH TestLuaLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448927 | ORPH TestLuaLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448953 | ORPH TestLuaLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448957 | ORPH TestLuaLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448933 | ORPH TestLuaLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448960 | ORPH TestLuaLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448943 | ORPH TestLuaLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448964 | ORPH TestLuaLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448946 | ORPH TestLuaLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448968 | ORPH TestLuaLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448970 | ORPH TestLuaLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448929 | ORPH TestLuaLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448962 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448972 | ORPH TestLuaLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448951 | ORPH TestLuaLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448939 | ORPH TestLuaLzlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448978 | ORPH TestLuaRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449159 | ORPH TestLuaUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448949 | ORPH TestLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448920 | ORPH TestLuajitHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448936 | ORPH TestLuajitInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448938 | ORPH TestLuajitLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448916 | ORPH TestLuajitLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448918 | ORPH TestLuajitLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448922 | ORPH TestLuajitLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448924 | ORPH TestLuajitLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448928 | ORPH TestLuajitLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448954 | ORPH TestLuajitLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448959 | ORPH TestLuajitLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448934 | ORPH TestLuajitLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448961 | ORPH TestLuajitLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448944 | ORPH TestLuajitLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448967 | ORPH TestLuajitLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448947 | ORPH TestLuajitLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448969 | ORPH TestLuajitLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448971 | ORPH TestLuajitLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448931 | ORPH TestLuajitLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448963 | ORPH TestLuajitLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448974 | ORPH TestLuajitLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448952 | ORPH TestLuajitLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448940 | ORPH TestLuajitRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449161 | ORPH TestLuajitTurbolua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449176 | ORPH TestLuajitUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448950 | ORPH TestLuvi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448975 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448976 | ORPH TestMender | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448979 | ORPH TestMsrTools | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448980 | ORPH TestNcdu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448981 | ORPH TestNetdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448983 | ORPH TestOctave | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448984 | ORPH TestOla | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448985 | ORPH TestOpenJdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448988 | ORPH TestOpenSshGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448990 | ORPH TestOpenSshuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448992 | ORPH TestOpkg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448994 | ORPH TestPerftest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448997 | ORPH TestPerl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449000 | ORPH TestPerlClassLoad | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449002 | ORPH TestPerlDBDmysql | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449004 | ORPH TestPerlEncodeDetect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449007 | ORPH TestPerlGDGraph | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449009 | ORPH TestPerlHTMLParser | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449011 | ORPH TestPerlIOSocketMulticast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449014 | ORPH TestPerlIOSocketSSL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449015 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449018 | ORPH TestPerlMailDKIM | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449019 | ORPH TestPerlX10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449021 | ORPH TestPerlXMLLibXML | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449023 | ORPH TestPerllibwwwperl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449016 | ORPH TestPhpApcu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449024 | ORPH TestPhpLuaLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449025 | ORPH TestPhpLuaLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449026 | ORPH TestPhpPam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449029 | ORPH TestPhpPeclDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449030 | ORPH TestPixz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449031 | ORPH TestPolkitInitd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449033 | ORPH TestPolkitSystemd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449034 | ORPH TestProsodyLua51 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449036 | ORPH TestProsodyLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449037 | ORPH TestPyNdiff | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449127 | ORPH TestPython3Py | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449038 | ORPH TestPython3PyPyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449039 | ORPH TestPython3Pyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449040 | ORPH TestPythonAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449047 | ORPH TestPythonAvro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449052 | ORPH TestPythonPahoMQTT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449112 | ORPH TestPythonPy3Aexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449042 | ORPH TestPythonPy3Argh | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449045 | ORPH TestPythonPy3Attrs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449046 | ORPH TestPythonPy3Autobahn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449048 | ORPH TestPythonPy3Automat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449050 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449055 | ORPH TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449059 | ORPH TestPythonPy3Botocore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449060 | ORPH TestPythonPy3Can | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449061 | ORPH TestPythonPy3Cbor | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449062 | ORPH TestPythonPy3Click | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449065 | ORPH TestPythonPy3Colorzero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449067 | ORPH TestPythonPy3Constantly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449069 | ORPH TestPythonPy3Construct | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449070 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449072 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449074 | ORPH TestPythonPy3DBusFast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449075 | ORPH TestPythonPy3DBusNext | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449077 | ORPH TestPythonPy3Dicttoxml2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449078 | ORPH TestPythonPy3Distro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449081 | ORPH TestPythonPy3Django | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449083 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449086 | ORPH TestPythonPy3Flask | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449089 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449092 | ORPH TestPythonPy3Git | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449094 | ORPH TestPythonPy3Gitdb2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449096 | ORPH TestPythonPy3GnuPG | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449099 | ORPH TestPythonPy3Gobject | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449102 | ORPH TestPythonPy3Gpiozero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449105 | ORPH TestPythonPy3Incremental | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449107 | ORPH TestPythonPy3Iptables | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449108 | ORPH TestPythonPy3Jmespath | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449110 | ORPH TestPythonPy3Libftdi1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448912 | ORPH TestPythonPy3Munch | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449111 | ORPH TestPythonPy3Passlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449114 | ORPH TestPythonPy3Pexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449116 | ORPH TestPythonPy3PyAlsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449118 | ORPH TestPythonPy3Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449123 | ORPH TestPythonPy3Pytest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449128 | ORPH ...PythonPy3PytestAsyncio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449131 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449132 | ORPH TestPythonPy3Qrcode | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449136 | ORPH TestPythonPy3RSA | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449140 | ORPH TestPythonPy3RpiGpio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449139 | ORPH TestPythonPy3S3transfer | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449144 | ORPH TestPythonPy3SciPy | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449146 | ORPH ...thonPy3ServiceIdentity | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449147 | ORPH TestPythonPy3Smmap2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449148 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449150 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449151 | ORPH TestPythonPy3Txaio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449152 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449153 | ORPH TestPythonPy3Ubjson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449154 | ORPH ...y3UnitTestXmlReporting | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449155 | ORPH TestPythonPy3rtoml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449143 | ORPH TestPythonPybind | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449120 | ORPH TestRdmaCore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449156 | ORPH TestRedis | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449158 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449162 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449163 | ORPH TestS6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449166 | ORPH TestS6Networking | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449167 | ORPH TestS6PortableUtils | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449168 | ORPH TestS6Rc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449171 | ORPH ...ELinuxExtraModulesDirs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718448816 | ORPH TestSudo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449172 | ORPH TestSyslogNg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449173 | ORPH TestTmux | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449175 | ORPH TestUbootOpensslPkgConfig | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449177 | ORPH TestZ3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449178 | ORPH TestZerofree | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449180 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449182 | ORPH TestZfsMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449183 | ORPH TestZfsUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3718449185 | ORPH -- http://autobuild.buildroot.net From fido_max at inbox.ru Wed Feb 8 07:12:26 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Wed, 8 Feb 2023 10:12:26 +0300 Subject: [Buildroot] [PATCH v2 1/1] package/postgresql: add lz4 and zstd support Message-ID: <20230208071226.33697-1-fido_max@inbox.ru> PostgreSQL has optional compression support (LZ4 and Zstandard). So enable it if libraries are available. Signed-off-by: Maxim Kochetkov --- package/postgresql/postgresql.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 2ffcac6595..0fb0e01153 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -91,6 +91,20 @@ else POSTGRESQL_CONF_OPTS += --without-libxml endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +POSTGRESQL_DEPENDENCIES += zstd +POSTGRESQL_CONF_OPTS += --with-zstd +else +POSTGRESQL_CONF_OPTS += --without-zstd +endif + +ifeq ($(BR2_PACKAGE_LZ4),y) +POSTGRESQL_DEPENDENCIES += lz4 +POSTGRESQL_CONF_OPTS += --with-lz4 +else +POSTGRESQL_CONF_OPTS += --without-lz4 +endif + # required for postgresql.service Type=notify ifeq ($(BR2_PACKAGE_SYSTEMD),y) POSTGRESQL_DEPENDENCIES += systemd -- 2.38.1 From fido_max at inbox.ru Wed Feb 8 07:18:15 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Wed, 8 Feb 2023 10:18:15 +0300 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: bump version to 1.8.0 Message-ID: <20230208071815.36221-1-fido_max@inbox.ru> Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.8.0 Signed-off-by: Maxim Kochetkov --- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index 505a4496c8..b5b76c15c6 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94c72ceb3c401c816499339f8765c62efbf40685a798dcdf9a4bf7dbedf6c7a5 osm2pgsql-1.7.2.tar.gz +sha256 b266b50f46fe4d1caddab61d26b39f10ea33b896ec23b8b3e294be4666e7b927 osm2pgsql-1.8.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 2bc8d41e6e..9cdfb44ce0 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.7.2 +OSM2PGSQL_VERSION = 1.8.0 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING -- 2.38.1 From fido_max at inbox.ru Wed Feb 8 07:25:16 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Wed, 8 Feb 2023 10:25:16 +0300 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: bump version to 2.9.3 Message-ID: <20230208072516.42067-1-fido_max@inbox.ru> Release notes: https://github.com/timescale/timescaledb/releases/tag/2.9.3 Signed-off-by: Maxim Kochetkov --- 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 a6560eb326..2fd14e6c1a 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 883638f2e79d25ec88ee58f603f3c81c999b6364cb4c799919d363f04089b47b timescaledb-2.9.1.tar.gz +sha256 ff0820891646a772aceab19ee0f7da0a5343dc53b9a72c965ab70f723d231d5c timescaledb-2.9.3.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 44e365285b..e3c94ed2fe 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.9.1 +TIMESCALEDB_VERSION = 2.9.3 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE -- 2.38.1 From fperrad at gmail.com Wed Feb 8 07:53:00 2023 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 8 Feb 2023 08:53:00 +0100 Subject: [Buildroot] [PATCH] package/libressl: security bump to version 3.6.2 Message-ID: <20230208075300.15464-1-francois.perrad@gadz.org> security fix: A malicious certificate revocation list or timestamp response token would allow an attacker to read arbitrary memory. 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 0988e6a36..907b9cdd0 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 acfac61316e93b919c28d62d53037ca734de85c46b4d703f19fd8395cf006774 libressl-3.6.1.tar.gz +sha256 4be80fff073746cf50b4a8e5babe2795acae98c6b132a9e02519b445dfbfd033 libressl-3.6.2.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 8fd7bccbc..b5fae7e26 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.6.1 +LIBRESSL_VERSION = 3.6.2 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.37.2 From arnout at mind.be Wed Feb 8 08:05:01 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 09:05:01 +0100 Subject: [Buildroot] [PATCH] package/gcc/gcc-final: map debug prefix when reproducible In-Reply-To: References: <20230206162617.1907911-1-john@metanate.com> <20230207135503.GF4124@scaer> Message-ID: <6fb44e39-92ac-60d3-2c87-8c156ac850dc@mind.be> On 07/02/2023 21:05, John Keeping wrote: [snip] > I've been testing this with --enable-linker-build-id in the configure > options as well to see whether it's possible to enable build IDs for > reproducible builds and this change gets a lot closer - the differences > are now a handful of files that embed an RPATH pointing to .libs during > the build. Just so I understand things correctly: those .libs RPATH entries get removed by Buildroot's patchelf run at the end of the build, but they still end up affecting the build-id, correct? And these RPATH entries are of course not affected by file-prefix-map, because that would break them entirely... Regards, Arnout From ak at it-klinger.de Wed Feb 8 08:45:08 2023 From: ak at it-klinger.de (Andreas Klinger) Date: Wed, 8 Feb 2023 09:45:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/ply: add dependency on Linux headers >= 5.5 Message-ID: Version 2.3.0 of ply now requires Linux headers >= 5.5 This was missing in commit b9612601b037e6deb79af300e64e0557dda1be5c ("package/ply: bump to version 2.3.0") Fixes: http://autobuild.buildroot.net/results/ce37039991cb0fb02b97d341d78327e54d0e1d26 http://autobuild.buildroot.net/results/c00714847ae92dd609bc8990df318bee58be38b8 http://autobuild.buildroot.net/results/8210bd2b9c67d6d7616ada525019b2658195416a This is a resend, because there are still the same autobuild failures. Signed-off-by: Andreas Klinger --- package/ply/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ply/Config.in b/package/ply/Config.in index 0500e7883f..f7507095c1 100644 --- a/package/ply/Config.in +++ b/package/ply/Config.in @@ -5,16 +5,16 @@ config BR2_PACKAGE_PLY_ARCH_SUPPORTS default y if BR2_powerpc default y if BR2_x86_64 -comment "ply needs a toolchain w/ dynamic library, headers >= 4.14" +comment "ply needs a toolchain w/ dynamic library, headers >= 5.5" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 || BR2_STATIC_LIBS config BR2_PACKAGE_PLY bool "ply" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # BPF_JLT + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 # BPF_JLT depends on !BR2_STATIC_LIBS help ply is a light-weight dynamic tracer for Linux. By means of -- 2.30.2 -- Andreas Klinger Grabenreith 27 84508 Burgkirchen +49 8623 919966 ak at it-klinger.de www.it-klinger.de www.grabenreith.de From thomas.petazzoni at bootlin.com Wed Feb 8 08:54:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:54:35 +0100 Subject: [Buildroot] [git commit] package/libva-utils: bump version to 2.17.1 Message-ID: <20230208085654.0AE6A844B4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9231fe0d6eeb6cdf373715d35b2203d34fd9e859 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/intel/libva-utils/blob/v2.17-branch/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libva-utils/libva-utils.hash | 2 +- package/libva-utils/libva-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 95bcee782b..41374a2ff6 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 646c9bfff6a83504c48de2c786c9514ca30c5e916127faf00f143ef8147ee950 libva-utils-2.16.0.tar.gz +sha256 6ea5993c3eba230a979fa9d35b4cad8df06d4474a773dc0918033bf50353f966 libva-utils-2.17.1.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index 5feaa36995..3dc8cdacde 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.16.0 +LIBVA_UTILS_VERSION = 2.17.1 LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Wed Feb 8 08:54:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:54:49 +0100 Subject: [Buildroot] [git commit] package/intel-mediadriver: bump version to 23.1.0 Message-ID: <20230208085654.16E75844B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19447f02f729ff373e138a74f3c2477739f425df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 a5e9c64e97..e4e41e4ad3 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b553290e829dfd824eb62295c9f07dbe8062ce7998f7c527cc92856d0792562d intel-media-22.6.6.tar.gz +sha256 edae1bdc07b694bd6e42099feddcf875e3b5d7254894f4b3fb292128577baf82 intel-media-23.1.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 8fa93218fa..6cc862dce4 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.6.6 +INTEL_MEDIADRIVER_VERSION = 23.1.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 thomas.petazzoni at bootlin.com Wed Feb 8 08:54:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:54:14 +0100 Subject: [Buildroot] [git commit] package/libva: switch to meson Message-ID: <20230208085654.005D7844B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17be7d028c193dc1160a4cb9313efe37326e7aa9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The time between version 2.17.0 being tagged and the release of its tarball version containing autoconf scripts was three weeks now. With the switch to meson we can directly use the github-generated tarball while not needing to run autoreconf. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libva/libva.hash | 4 +--- package/libva/libva.mk | 19 +++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 700ace0378..780c186069 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,5 +1,3 @@ -# From https://github.com/intel/libva/releases/download/2.17.0/libva-2.17.0.tar.bz2.sha1sum -sha1 997f7b3111bc5a4d32ec72e9d7f9fcfca41e4923 libva-2.17.0.tar.bz2 # Locally computed -sha256 f3e5eb27c305e05a9bb62703d1915a127301cc0c4f9f209025767432230c4eac libva-2.17.0.tar.bz2 +sha256 8940541980ef998a36cd8f6ad905e81838ea4ddf56dc479ed2bebd12711e6001 libva-2.17.0.tar.gz sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index c6b9f63b10..f50010d9fc 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -5,8 +5,7 @@ ################################################################################ LIBVA_VERSION = 2.17.0 -LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 -LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) +LIBVA_SITE = $(call github,intel,libva,$(LIBVA_VERSION)) LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING LIBVA_INSTALL_STAGING = YES @@ -14,25 +13,25 @@ LIBVA_DEPENDENCIES = host-pkgconf libdrm # libdrm is a hard-dependency LIBVA_CONF_OPTS = \ - --enable-drm \ - --with-drivers-path="/usr/lib/va" + -Ddisable_drm=false \ + -Ddriverdir="/usr/lib/va" ifeq ($(BR2_PACKAGE_XORG7),y) LIBVA_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes -LIBVA_CONF_OPTS += --enable-x11 +LIBVA_CONF_OPTS += -Dwith_x11=yes ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) LIBVA_DEPENDENCIES += libgl -LIBVA_CONF_OPTS += --enable-glx +LIBVA_CONF_OPTS += -Dwith_glx=yes endif else -LIBVA_CONF_OPTS += --disable-glx --disable-x11 +LIBVA_CONF_OPTS += -Dwith_glx=no -Dwith_x11=no endif ifeq ($(BR2_PACKAGE_WAYLAND),y) LIBVA_DEPENDENCIES += wayland -LIBVA_CONF_OPTS += --enable-wayland +LIBVA_CONF_OPTS += -Dwith_wayland=yes else -LIBVA_CONF_OPTS += --disable-wayland +LIBVA_CONF_OPTS += -Dwith_wayland=no endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From thomas.petazzoni at bootlin.com Wed Feb 8 08:55:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:55:42 +0100 Subject: [Buildroot] [git commit] package/intel-mediasdk: bump version to 23.1.0 Message-ID: <20230208085654.255FB844B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5997d0d63557488f2cbd06d4425fa3410adf336b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 903b6f3394..a2c4243790 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3a671cc692da5111c041088f5e32528b4346e122e8a134fad71310c572705106 intel-mediasdk-22.6.5.tar.gz +sha256 9208c35641ba995760d662689426a6c433973cf5283b8510f9cfb774e4b9cb38 intel-mediasdk-23.1.0.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index f7bce30c74..462d487ebe 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.6.5 +INTEL_MEDIASDK_VERSION = 23.1.0 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 8 08:57:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:57:17 +0100 Subject: [Buildroot] [PATCH 2/5] package/libva: switch to meson In-Reply-To: <20230130174339.36794-2-bernd.kuhls@t-online.de> References: <20230130174339.36794-1-bernd.kuhls@t-online.de> <20230130174339.36794-2-bernd.kuhls@t-online.de> Message-ID: <20230208095717.66678de3@windsurf> On Mon, 30 Jan 2023 18:43:36 +0100 Bernd Kuhls wrote: > The time between version 2.17.0 being tagged and the release of its > tarball version containing autoconf scripts was three weeks now. > With the switch to meson we can directly use the github-generated > tarball while not needing to run autoreconf. > > Signed-off-by: Bernd Kuhls > --- > package/libva/libva.hash | 4 +--- > package/libva/libva.mk | 19 +++++++++---------- > 2 files changed, 10 insertions(+), 13 deletions(-) Github has fixed their tarball generation logic so that the hashes are now correct again, so I've applied! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 08:57:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:57:24 +0100 Subject: [Buildroot] [PATCH 3/5] package/libva-utils: bump version to 2.17.1 In-Reply-To: <20230130174339.36794-3-bernd.kuhls@t-online.de> References: <20230130174339.36794-1-bernd.kuhls@t-online.de> <20230130174339.36794-3-bernd.kuhls@t-online.de> Message-ID: <20230208095724.437f75a8@windsurf> On Mon, 30 Jan 2023 18:43:37 +0100 Bernd Kuhls wrote: > Release notes: > https://github.com/intel/libva-utils/blob/v2.17-branch/NEWS > > Signed-off-by: Bernd Kuhls > --- > package/libva-utils/libva-utils.hash | 2 +- > package/libva-utils/libva-utils.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Github has fixed their tarball generation logic so that the hashes are now correct again, so I've applied! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 08:58:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:58:08 +0100 Subject: [Buildroot] [PATCH 4/5] package/intel-mediadriver: bump version to 23.1.0 In-Reply-To: <20230130174339.36794-4-bernd.kuhls@t-online.de> References: <20230130174339.36794-1-bernd.kuhls@t-online.de> <20230130174339.36794-4-bernd.kuhls@t-online.de> Message-ID: <20230208095808.5d229bc0@windsurf> On Mon, 30 Jan 2023 18:43:38 +0100 Bernd Kuhls wrote: > 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(-) Github has fixed their tarball generation logic so that the hashes are now correct again, so I've applied! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 08:58:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:58:18 +0100 Subject: [Buildroot] [PATCH 5/5] package/intel-mediasdk: bump version to 23.1.0 In-Reply-To: <20230130174339.36794-5-bernd.kuhls@t-online.de> References: <20230130174339.36794-1-bernd.kuhls@t-online.de> <20230130174339.36794-5-bernd.kuhls@t-online.de> Message-ID: <20230208095818.7917593e@windsurf> On Mon, 30 Jan 2023 18:43:39 +0100 Bernd Kuhls wrote: > 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(-) Github has fixed their tarball generation logic so that the hashes are now correct again, so I've applied! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From john at metanate.com Wed Feb 8 09:34:01 2023 From: john at metanate.com (John Keeping) Date: Wed, 8 Feb 2023 09:34:01 +0000 Subject: [Buildroot] [PATCH] package/gcc/gcc-final: map debug prefix when reproducible In-Reply-To: <6fb44e39-92ac-60d3-2c87-8c156ac850dc@mind.be> References: <20230206162617.1907911-1-john@metanate.com> <20230207135503.GF4124@scaer> <6fb44e39-92ac-60d3-2c87-8c156ac850dc@mind.be> Message-ID: On Wed, Feb 08, 2023 at 09:05:01AM +0100, Arnout Vandecappelle wrote: > On 07/02/2023 21:05, John Keeping wrote: > [snip] > > I've been testing this with --enable-linker-build-id in the configure > > options as well to see whether it's possible to enable build IDs for > > reproducible builds and this change gets a lot closer - the differences > > are now a handful of files that embed an RPATH pointing to .libs during > > the build. > > Just so I understand things correctly: those .libs RPATH entries get > removed by Buildroot's patchelf run at the end of the build, but they still > end up affecting the build-id, correct? And these RPATH entries are of > course not affected by file-prefix-map, because that would break them > entirely... Yes, that's largely correct - the RPATH entries are removed and are not present in the target. The files are still slightly different as a follow-on effect since the path is included in the string table. (Note that the two build directories I'm using for testing have different *length* names.) $ diff -u <(readelf -hlS build-1/target/bin/mount) <(readelf -hlS build-1abc/target/bin/mount) --- /dev/fd/63 2023-02-08 09:26:16.879386009 +0000 +++ /dev/fd/62 2023-02-08 09:26:16.882719365 +0000 @@ -8,7 +8,7 @@ Type: DYN (Position-Independent Executable file) Machine: ARM Version: 0x1 - Entry point address: 0x44ac + Entry point address: 0x44b0 Start of program headers: 52 (bytes into file) Start of section headers: 41268 (bytes into file) Flags: 0x5000200, Version5 EABI, soft-float ABI @@ -28,18 +28,18 @@ [ 4] .hash HASH 000001ac 0001ac 0004a0 04 A 6 0 4 [ 5] .gnu.hash GNU_HASH 0000064c 00064c 000018 04 A 6 0 4 [ 6] .dynsym DYNSYM 00000664 000664 000a30 10 A 7 3 4 - [ 7] .dynstr STRTAB 00001094 001094 000a69 00 A 0 0 1 - [ 8] .gnu.version VERSYM 00001afe 001afe 000146 02 A 6 0 2 - [ 9] .gnu.version_r VERNEED 00001c44 001c44 000130 00 A 7 3 4 - [10] .rel.dyn REL 00001d74 001d74 000260 08 A 6 0 4 - [11] .rel.plt REL 00001fd4 001fd4 0004a8 08 AI 6 23 4 - [12] .init PROGBITS 0000247c 00247c 00000c 00 AX 0 0 4 - [13] .plt PROGBITS 00002488 002488 000710 04 AX 0 0 4 - [14] .text PROGBITS 00002b98 002b98 0057d4 00 AX 0 0 4 - [15] .fini PROGBITS 0000836c 00836c 000008 00 AX 0 0 4 - [16] .rodata PROGBITS 00008374 008374 00151c 00 A 0 0 4 - [17] .ARM.exidx ARM_EXIDX 00009890 009890 000008 00 AL 14 0 4 - [18] .eh_frame PROGBITS 00009898 009898 000004 00 A 0 0 4 + [ 7] .dynstr STRTAB 00001094 001094 000a6c 00 A 0 0 1 + [ 8] .gnu.version VERSYM 00001b00 001b00 000146 02 A 6 0 2 + [ 9] .gnu.version_r VERNEED 00001c48 001c48 000130 00 A 7 3 4 + [10] .rel.dyn REL 00001d78 001d78 000260 08 A 6 0 4 + [11] .rel.plt REL 00001fd8 001fd8 0004a8 08 AI 6 23 4 + [12] .init PROGBITS 00002480 002480 00000c 00 AX 0 0 4 + [13] .plt PROGBITS 0000248c 00248c 000710 04 AX 0 0 4 + [14] .text PROGBITS 00002b9c 002b9c 0057d4 00 AX 0 0 4 + [15] .fini PROGBITS 00008370 008370 000008 00 AX 0 0 4 + [16] .rodata PROGBITS 00008378 008378 00151c 00 A 0 0 4 + [17] .ARM.exidx ARM_EXIDX 00009894 009894 000008 00 AL 14 0 4 + [18] .eh_frame PROGBITS 0000989c 00989c 000004 00 A 0 0 4 [19] .init_array INIT_ARRAY 0001994c 00994c 000004 04 WA 0 0 4 [20] .fini_array FINI_ARRAY 00019950 009950 000004 04 WA 0 0 4 [21] .data.rel.ro PROGBITS 00019954 009954 0002fc 00 WA 0 0 4 @@ -57,11 +57,11 @@ Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align - EXIDX 0x009890 0x00009890 0x00009890 0x00008 0x00008 R 0x4 + EXIDX 0x009894 0x00009894 0x00009894 0x00008 0x00008 R 0x4 PHDR 0x000034 0x00000034 0x00000034 0x00120 0x00120 R 0x4 INTERP 0x000154 0x00000154 0x00000154 0x00013 0x00013 R 0x1 [Requesting program interpreter: /lib/ld-linux.so.3] - LOAD 0x000000 0x00000000 0x00000000 0x0989c 0x0989c R E 0x10000 + LOAD 0x000000 0x00000000 0x00000000 0x098a0 0x098a0 R E 0x10000 LOAD 0x00994c 0x0001994c 0x0001994c 0x006c0 0x006cc RW 0x10000 DYNAMIC 0x009c50 0x00019c50 0x00019c50 0x00120 0x00120 RW 0x4 NOTE 0x000168 0x00000168 0x00000168 0x00044 0x00044 R 0x4 $ diff -u <(readelf -p 7 build-1/target/bin/mount) <(readelf -p 7 build-1abc/target/bin/mount) --- /dev/fd/63 2023-02-08 09:26:28.439469928 +0000 +++ /dev/fd/62 2023-02-08 09:26:28.439469928 +0000 @@ -171,5 +171,5 @@ [ a0b] MOUNT_2.21 [ a16] MOUNT_2.24 [ a21] MOUNT_2.19 - [ a2d] XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + [ a2d] XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX From fido_max at inbox.ru Wed Feb 8 09:45:43 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Wed, 8 Feb 2023 12:45:43 +0300 Subject: [Buildroot] [PATCH 1/1] lksctp-tools: bump to version 1.0.19 Message-ID: <20230208094543.474237-1-fido_max@inbox.ru> Release notes: https://github.com/sctp/lksctp-tools/blob/v1.0.19/ChangeLog Signed-off-by: Maxim Kochetkov --- package/lksctp-tools/lksctp-tools.hash | 4 ++-- package/lksctp-tools/lksctp-tools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lksctp-tools/lksctp-tools.hash b/package/lksctp-tools/lksctp-tools.hash index fb892fdc3b..b3a1f59d86 100644 --- a/package/lksctp-tools/lksctp-tools.hash +++ b/package/lksctp-tools/lksctp-tools.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ -md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz -sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz +md5 0fbb288c9f9625b88d3ab21c9ed9f011 lksctp-tools-1.0.19.tar.gz +sha1 d410a596485c38464177a38ae7c7081444e6589e lksctp-tools-1.0.19.tar.gz # Locally computed sha256 dee5f35e583183abb9212938643ecb2d858fd89e2e286f4b1d903f65d49d6c76 COPYING.lib sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk index 5ac794e842..af86a28516 100644 --- a/package/lksctp-tools/lksctp-tools.mk +++ b/package/lksctp-tools/lksctp-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -LKSCTP_TOOLS_VERSION = 1.0.17 -LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools +LKSCTP_TOOLS_VERSION = 1.0.19 +LKSCTP_TOOLS_SITE = $(call github,sctp,lksctp-tools,v$(LKSCTP_TOOLS_VERSION)) LKSCTP_TOOLS_INSTALL_STAGING = YES # configure not shipped LKSCTP_TOOLS_AUTORECONF = YES -- 2.38.1 From angelo at amarulasolutions.com Wed Feb 8 10:07:04 2023 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Wed, 8 Feb 2023 11:07:04 +0100 Subject: [Buildroot] [PATCH v6] package/gtkiostream: new package Message-ID: <20230208100704.68093-1-angelo@amarulasolutions.com> From: Matt Flax This package provides many useful software engineering and signal processing libraries. Signed-off-by: Matt Flax Signed-off-by: Angelo Compagnucci --- v4: * Bumped to 1.8.0 * Added myself to DEVELOPERS * Added dependency on octave when enable instead of use --disable-octave configure option * Fixes from check-package v5: * Fixed wrong syntax (Romain) * Added optional dependency on sox (Matt) v6: * Fixing fomatting (Thmos P.) * Adding optional flag for openmp * Adding patch to disable testing compilation: build wasfailing for some incompatible linking option in one of the tests. Tests are not useful for the buildroot usecase therefore they are disabled. DEVELOPERS | 4 +++ package/Config.in | 1 + .../0001-Makefile.am-disable-tests.patch | 29 +++++++++++++++++ package/gtkiostream/Config.in | 16 ++++++++++ package/gtkiostream/gtkiostream.hash | 3 ++ package/gtkiostream/gtkiostream.mk | 31 +++++++++++++++++++ 6 files changed, 84 insertions(+) create mode 100644 package/gtkiostream/0001-Makefile.am-disable-tests.patch create mode 100644 package/gtkiostream/Config.in create mode 100644 package/gtkiostream/gtkiostream.hash create mode 100644 package/gtkiostream/gtkiostream.mk diff --git a/DEVELOPERS b/DEVELOPERS index d7c4d03c4c..5355d6d5ac 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -165,6 +165,7 @@ F: package/cups/ F: package/cups-filters/ F: package/fail2ban/ F: package/grep/ +F: package/gtkiostream/ F: package/htpdate/ F: package/i2c-tools/ F: package/jq/ @@ -1978,6 +1979,9 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ +N: Matt Flax +F: package/gtkiostream/ + N: Matt Weber F: board/freescale/p* F: board/freescale/t* diff --git a/package/Config.in b/package/Config.in index 06d0a05854..70e446be47 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1389,6 +1389,7 @@ menu "Audio/Sound" source "package/bcg729/Config.in" source "package/caps/Config.in" source "package/fdk-aac/Config.in" + source "package/gtkiostream/Config.in" source "package/libao/Config.in" source "package/libasplib/Config.in" source "package/libbroadvoice/Config.in" diff --git a/package/gtkiostream/0001-Makefile.am-disable-tests.patch b/package/gtkiostream/0001-Makefile.am-disable-tests.patch new file mode 100644 index 0000000000..26e229a58e --- /dev/null +++ b/package/gtkiostream/0001-Makefile.am-disable-tests.patch @@ -0,0 +1,29 @@ +From b242a56ddaefdcf356cffdfb45f6518c9ce0809e Mon Sep 17 00:00:00 2001 +From: Angelo Compagnucci +Date: Wed, 8 Feb 2023 10:58:20 +0100 +Subject: [PATCH] Makefile.am: disable tests + +Tests are not interesting for buildroot use case, thus disabling +entirely. + +Signed-off-by: Angelo Compagnucci +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 3cc0944..4f12708 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects + SUBDIRS = src api include + + if !HAVE_EMSCRIPTEN +-SUBDIRS += applications test ++SUBDIRS += applications + endif + + ACLOCAL_AMFLAGS = -I m4 +-- +2.25.1 + diff --git a/package/gtkiostream/Config.in b/package/gtkiostream/Config.in new file mode 100644 index 0000000000..58c22ecbcb --- /dev/null +++ b/package/gtkiostream/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_GTKIOSTREAM + bool "gtkiostream" + depends on BR2_INSTALL_LIBSTDCPP # eigen + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_EIGEN + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_DOUBLE + select BR2_PACKAGE_FFTW_SINGLE + help + This package provides many useful software engineering and + signal processing includes and linkable library. + + https://github.com/flatmax/gtkiostream + +comment "gtkiostream needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/gtkiostream/gtkiostream.hash b/package/gtkiostream/gtkiostream.hash new file mode 100644 index 0000000000..90c754f48c --- /dev/null +++ b/package/gtkiostream/gtkiostream.hash @@ -0,0 +1,3 @@ +# locally computed hash +sha256 44e8d921d462005cd330a1c24e5bd8061175b90ae53f537dbf73f59b74f6e01b gtkiostream-v1.8.0.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 gpl.txt diff --git a/package/gtkiostream/gtkiostream.mk b/package/gtkiostream/gtkiostream.mk new file mode 100644 index 0000000000..e178bb668b --- /dev/null +++ b/package/gtkiostream/gtkiostream.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# GTKIOSTREAM +# +################################################################################ + +GTKIOSTREAM_VERSION = v1.8.0 +GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,$(GTKIOSTREAM_VERSION)) +GTKIOSTREAM_LICENSE = GPL-2.0+ +GTKIOSTREAM_LICENSE_FILES = gpl.txt + +# configure script not available +GTKIOSTREAM_AUTORECONF = YES + +GTKIOSTREAM_DEPENDENCIES = \ + eigen \ + fftw-double \ + fftw-single \ + host-pkgconf \ + $(if $(BR2_PACKAGE_SOX),sox) + +ifeq ($(BR2_PACKAGE_OCTAVE),y) +GTKIOSTREAM_DEPENDENCIES += octave +GTKIOSTREAM_CONF_OPTS += --enable-octave +else +GTKIOSTREAM_CONF_OPTS += --disable-octave +endif + +GTKIOSTREAM_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_OPENMP),--disable,--enable)-openmp + +$(eval $(autotools-package)) -- 2.25.1 From peter at korsgaard.com Wed Feb 8 10:47:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 11:47:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: bump version to 2.9.3 In-Reply-To: <20230208072516.42067-1-fido_max@inbox.ru> (Maxim Kochetkov's message of "Wed, 8 Feb 2023 10:25:16 +0300") References: <20230208072516.42067-1-fido_max@inbox.ru> Message-ID: <87cz6k77t2.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov writes: > Release notes: https://github.com/timescale/timescaledb/releases/tag/2.9.3 > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 10:47:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 11:47:30 +0100 Subject: [Buildroot] [PATCH] package/libressl: security bump to version 3.6.2 In-Reply-To: <20230208075300.15464-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 8 Feb 2023 08:53:00 +0100") References: <20230208075300.15464-1-francois.perrad@gadz.org> Message-ID: <878rh877st.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > security fix: > A malicious certificate revocation list or timestamp response token > would allow an attacker to read arbitrary memory. > Signed-off-by: Francois Perrad Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 10:47:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:47:01 +0100 Subject: [Buildroot] [git commit] package/timescaledb: bump version to 2.9.3 Message-ID: <20230208104748.6A6F3844CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35423540c4eb0155f73b898539e00b72ed5f2b32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/timescale/timescaledb/releases/tag/2.9.3 Signed-off-by: Maxim Kochetkov 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 a6560eb326..2fd14e6c1a 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 883638f2e79d25ec88ee58f603f3c81c999b6364cb4c799919d363f04089b47b timescaledb-2.9.1.tar.gz +sha256 ff0820891646a772aceab19ee0f7da0a5343dc53b9a72c965ab70f723d231d5c timescaledb-2.9.3.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 44e365285b..e3c94ed2fe 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.9.1 +TIMESCALEDB_VERSION = 2.9.3 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 8 10:47:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:47:10 +0100 Subject: [Buildroot] [git commit] package/libressl: security bump to version 3.6.2 Message-ID: <20230208104748.781FE844CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02f80f5c224a1d8830fab48ae0c19a9e28f2c082 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master security fix: A malicious certificate revocation list or timestamp response token would allow an attacker to read arbitrary memory. Signed-off-by: Francois Perrad 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 0988e6a36d..907b9cdd06 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 acfac61316e93b919c28d62d53037ca734de85c46b4d703f19fd8395cf006774 libressl-3.6.1.tar.gz +sha256 4be80fff073746cf50b4a8e5babe2795acae98c6b132a9e02519b445dfbfd033 libressl-3.6.2.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 8fd7bccbc4..b5fae7e26e 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.6.1 +LIBRESSL_VERSION = 3.6.2 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 Wed Feb 8 10:49:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 11:49:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: bump version to 1.8.0 In-Reply-To: <20230208071815.36221-1-fido_max@inbox.ru> (Maxim Kochetkov's message of "Wed, 8 Feb 2023 10:18:15 +0300") References: <20230208071815.36221-1-fido_max@inbox.ru> Message-ID: <874jrw77pz.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov writes: > Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.8.0 > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 10:48:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:48:59 +0100 Subject: [Buildroot] [git commit] package/osm2pgsql: bump version to 1.8.0 Message-ID: <20230208104919.2B760844D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d27f4c311c19f5ae130ec1941e964976d3a4f2b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.8.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index 505a4496c8..b5b76c15c6 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94c72ceb3c401c816499339f8765c62efbf40685a798dcdf9a4bf7dbedf6c7a5 osm2pgsql-1.7.2.tar.gz +sha256 b266b50f46fe4d1caddab61d26b39f10ea33b896ec23b8b3e294be4666e7b927 osm2pgsql-1.8.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 2bc8d41e6e..9cdfb44ce0 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.7.2 +OSM2PGSQL_VERSION = 1.8.0 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for widgets Message-ID: <20230208105136.3124C845D0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05e4ad9c7e64e85d56126db8396dcf98138e84ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 5 +++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 394b2d8745..973fb2f11c 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -95,6 +95,11 @@ config BR2_PACKAGE_QT6BASE_PNG This option enables PNG support using the system libpng library. +config BR2_PACKAGE_QT6BASE_WIDGETS + bool "widgets module" + help + This option enables the Qt6Widgets library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index b368cd6dca..2a0afa6d27 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -215,6 +215,12 @@ else QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for widgets gtk backend Message-ID: <20230208105136.3B7CB845C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=889f451caf22f5b36ff8430d7927e8cb3a56681e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2a0afa6d27..911375aa6d 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -217,6 +217,15 @@ endif ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON + +# only enable gtk support if libgtk3 X11 backend is enabled +ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy) +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=ON +QT6BASE_DEPENDENCIES += libgtk3 +else +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:17 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for jpeg/png/gif image format Message-ID: <20230208105136.24C38845CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6d91bc90afab2d601f55990e94c4cef9f0317ce6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 19 +++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index ac2058c901..394b2d8745 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -76,6 +76,25 @@ config BR2_PACKAGE_QT6BASE_HARFBUZZ if the toolchain supports __sync for 4 bytes, or the qt provided one which avoids this dependency by using QAtomic). +config BR2_PACKAGE_QT6BASE_GIF + bool "GIF support" + help + This compiles and installs the plugin for GIF reading support. + +config BR2_PACKAGE_QT6BASE_JPEG + bool "JPEG support" + select BR2_PACKAGE_JPEG + help + This option enables JPEG support using the system libjpeg + library. + +config BR2_PACKAGE_QT6BASE_PNG + bool "PNG support" + select BR2_PACKAGE_LIBPNG + help + This option enables PNG support using the system libpng + library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 6c155a4abb..b368cd6dca 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -188,6 +188,26 @@ else QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PNG),y) +QT6BASE_CONF_OPTS += -DFEATURE_png=ON -DFEATURE_system_png=ON +QT6BASE_DEPENDENCIES += libpng +else +QT6BASE_CONF_OPTS += -DFEATURE_png=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_GIF),y) +QT6BASE_CONF_OPTS += -DFEATURE_gif=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_gif=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_JPEG),y) +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=ON +QT6BASE_DEPENDENCIES += jpeg +else +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add QPA backend selection Message-ID: <20230208105136.547DE845CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bd9a456b2e2c818f35d22a212812087c3f28e4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 13 +++++++++++++ package/qt6/qt6base/qt6base.mk | 3 +++ 2 files changed, 16 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 131dfadc1b..3af6fd9f72 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -67,6 +67,19 @@ config BR2_PACKAGE_QT6BASE_EGLFS depends on BR2_PACKAGE_QT6_GL_SUPPORTS select BR2_PACKAGE_QT6BASE_OPENGL +config BR2_PACKAGE_QT6BASE_DEFAULT_QPA + string "Default graphical platform" + help + Choose the default platform abstraction to use for graphical + applications (e.g xcb, linuxfb, eglfs, ...). If this is + empty, the default for your architecture will be used + (usually this is eglfs). + + You can get a list of supported platforms by running a Qt + application with the option "-platform help" on your + target. You can choose a different platform at runtime with + the -platform option. + config BR2_PACKAGE_QT6BASE_OPENGL bool "OpenGL support" depends on BR2_PACKAGE_QT6_GL_SUPPORTS diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2540fbb59c..828fe57d0b 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -250,6 +250,9 @@ else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif +QT6BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT6BASE_DEFAULT_QPA)) +QT6BASE_CONF_OPTS += $(if $(QT6BASE_DEFAULT_QPA),-DQT_QPA_DEFAULT_PLATFORM=$(QT6BASE_DEFAULT_QPA)) + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for libinput Message-ID: <20230208105136.72758845A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2db19af40179d6c2dfd78e08c005e67b01cdc01e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 8db59bbc31..49a61e4d25 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -229,6 +229,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_LIBINPUT),y) +QT6BASE_CONF_OPTS += -DFEATURE_libinput=ON +QT6BASE_DEPENDENCIES += libinput +else +QT6BASE_CONF_OPTS += -DFEATURE_libinput=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON QT6BASE_DEPENDENCIES += tslib From thomas.petazzoni at bootlin.com Wed Feb 8 10:50:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:50:37 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for gui module Message-ID: <20230208105136.0BF2D845A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c189e7462103591eb17d34a6e33430ddc636c84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 31 +++++++++++++++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index e8357a675c..1810b1586d 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,37 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_GUI + bool "gui module" + select BR2_PACKAGE_FREETYPE + # At least one graphic backend must be enabled, so enable + # linuxfb if nothing is enabled. + select BR2_PACKAGE_QT6BASE_LINUXFB if \ + !BR2_PACKAGE_QT6BASE_XCB + help + This option enables the Qt6Gui library. + +if BR2_PACKAGE_QT6BASE_GUI + +config BR2_PACKAGE_QT6BASE_LINUXFB + bool "linuxfb support" + +config BR2_PACKAGE_QT6BASE_XCB + bool "X.org XCB support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_IMAGE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_LIBXKBCOMMON + +comment "X.org XCB backend available if X.org is enabled" + depends on !BR2_PACKAGE_XORG7 + +endif + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2f159f380b..bcf2464590 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -40,7 +40,6 @@ QT6BASE_INSTALL_STAGING = YES QT6BASE_CONF_OPTS = \ -GNinja \ -DQT_HOST_PATH=$(HOST_DIR) \ - -DFEATURE_gui=OFF \ -DFEATURE_concurrent=OFF \ -DFEATURE_xml=OFF \ -DFEATURE_sql=OFF \ @@ -141,6 +140,42 @@ else QT6BASE_CONF_OPTS += -DFEATURE_glib=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_gui=ON \ + -DFEATURE_freetype=ON \ + -DINPUT_opengl=no \ + -DFEATURE_vulkan=OFF +QT6BASE_DEPENDENCIES += freetype + +ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_xcb=ON \ + -DFEATURE_xcb_xlib=ON \ + -DFEATURE_xkbcommon=ON \ + -DFEATURE_xkbcommon_x11=ON +QT6BASE_DEPENDENCIES += \ + libxcb \ + libxkbcommon \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xlib_libX11 +else +QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for printsupport/cups Message-ID: <20230208105136.86E41845D0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d195622f2388edd021c6f71ba78eb3d2f9539f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 8 ++++++++ package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index da42b2ae0c..7927975bff 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -153,6 +153,14 @@ config BR2_PACKAGE_QT6BASE_WIDGETS help This option enables the Qt6Widgets library. +config BR2_PACKAGE_QT6BASE_PRINTSUPPORT + bool "printing support" + # yes, print support needs widgets + depends on BR2_PACKAGE_QT6BASE_WIDGETS + help + This option enables printing support, optionally using CUPS + if available. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index f4e63ab8d9..7b57eba4ab 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -207,6 +207,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT),y) +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON +ifeq ($(BR2_PACKAGE_CUPS),y) +QT6BASE_CONF_OPTS += -DFEATURE_cups=ON +QT6BASE_DEPENDENCIES += cups +else +QT6BASE_CONF_OPTS += -DFEATURE_cups=OFF +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF +endif + ifeq ($(BR2_PACKAGE_LIBDRM),y) QT6BASE_CONF_OPTS += -DFEATURE_kms=ON QT6BASE_DEPENDENCIES += libdrm From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for kms Message-ID: <20230208105136.7BF49845CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=653e573436398ed58e0d4323d684c237b55f9378 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 49a61e4d25..f4e63ab8d9 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -207,6 +207,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT6BASE_CONF_OPTS += -DFEATURE_kms=ON +QT6BASE_DEPENDENCIES += libdrm +else +QT6BASE_CONF_OPTS += -DFEATURE_kms=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add opengl support Message-ID: <20230208105136.475CF845A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=beeae174f9fffe6ea9c50a717a9b45c71ed45ea9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 5 +++++ package/qt6/qt6base/Config.in | 42 +++++++++++++++++++++++++++++++++++++++++- package/qt6/qt6base/qt6base.mk | 18 +++++++++++++++++- 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 4b2b9a1174..831ae72c3c 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -12,6 +12,11 @@ config BR2_PACKAGE_QT6_ARCH_SUPPORTS default y if BR2_sparc64 depends on BR2_USE_MMU +config BR2_PACKAGE_QT6_GL_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + comment "qt6 needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, host gcc >= 8" depends on !BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT6_ARCH_SUPPORTS diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 973fb2f11c..131dfadc1b 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -36,7 +36,8 @@ config BR2_PACKAGE_QT6BASE_GUI # At least one graphic backend must be enabled, so enable # linuxfb if nothing is enabled. select BR2_PACKAGE_QT6BASE_LINUXFB if \ - !BR2_PACKAGE_QT6BASE_XCB + !BR2_PACKAGE_QT6BASE_XCB && \ + !BR2_PACKAGE_QT6BASE_EGLFS help This option enables the Qt6Gui library. @@ -59,6 +60,45 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_EGLFS + bool "eglfs support" + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGBM + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_QT6BASE_OPENGL + +config BR2_PACKAGE_QT6BASE_OPENGL + bool "OpenGL support" + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + help + This option enables OpenGL support. + +comment "OpenGL support needs an OpenGL-capable backend" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS + +if BR2_PACKAGE_QT6BASE_OPENGL + +choice + prompt "OpenGL API" + help + Select OpenGL API. + +config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP + bool "Desktop OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL + help + Use desktop OpenGL. + +config BR2_PACKAGE_QT6BASE_OPENGL_ES2 + bool "OpenGL ES 2.0+" + depends on BR2_PACKAGE_HAS_LIBGLES + help + Use OpenGL ES 2.0 and later versions. + +endchoice + +endif + config BR2_PACKAGE_QT6BASE_FONTCONFIG bool "fontconfig support" select BR2_PACKAGE_FONTCONFIG diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 911375aa6d..2540fbb59c 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -144,7 +144,6 @@ ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) QT6BASE_CONF_OPTS += \ -DFEATURE_gui=ON \ -DFEATURE_freetype=ON \ - -DINPUT_opengl=no \ -DFEATURE_vulkan=OFF QT6BASE_DEPENDENCIES += freetype @@ -230,6 +229,23 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) +QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON +QT6BASE_DEPENDENCIES += libegl libgbm +else +QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON +QT6BASE_DEPENDENCIES += libgl +else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON +QT6BASE_DEPENDENCIES += libgles +else +QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 8 10:50:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:50:37 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for fontconfig/harfbuzz Message-ID: <20230208105136.18597844D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf5c0db35a06455182f6568ab2cfa69346f8b3a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Additionally the harfbuzz license file is added and the hash for this is also added to the hash file Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 17 +++++++++++++++++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 1810b1586d..ac2058c901 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -59,6 +59,23 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_FONTCONFIG + bool "fontconfig support" + select BR2_PACKAGE_FONTCONFIG + help + This option enables Fontconfig support using the system + fontconfig library. + +config BR2_PACKAGE_QT6BASE_HARFBUZZ + bool "harfbuzz support" + select BR2_PACKAGE_HARFBUZZ if \ + BR2_TOOLCHAIN_HAS_SYNC_4 && \ + BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + This option enables HarfBuzz support (either system harfbuzz + if the toolchain supports __sync for 4 bytes, or the qt + provided one which avoids this dependency by using QAtomic). + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 6544a371c6..fedbbba79f 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -11,3 +11,4 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt sha256 d040359701c01996a017d5c515678929cd1b0625e64cb86db44025fbb6cdf1fc LICENSES/MIT.txt sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index bcf2464590..6c155a4abb 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -172,6 +172,29 @@ else QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_HARFBUZZ),y) +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=ON +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y) +# system harfbuzz in case __sync for 4 bytes is supported +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=OFF +QT6BASE_DEPENDENCIES += harfbuzz +else #BR2_TOOLCHAIN_HAS_SYNC_4 +# qt harfbuzz otherwise (using QAtomic instead) +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=ON +QT6BASE_LICENSE += , MIT (harfbuzz) +QT6BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON +QT6BASE_DEPENDENCIES += fontconfig +else +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: add support for tslib Message-ID: <20230208105136.626F0844D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73d6df812d9eaccfad9cf4b5cb4fc53d30205e20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 3af6fd9f72..da42b2ae0c 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -216,6 +216,12 @@ config BR2_PACKAGE_QT6BASE_TEST help This options enables the Qt6Test library. +config BR2_PACKAGE_QT6BASE_TSLIB + bool "Enable Tslib support" + select BR2_PACKAGE_TSLIB + help + This options enables the Tslib plugin + config BR2_PACKAGE_QT6BASE_XML bool "XML module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 828fe57d0b..8db59bbc31 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -229,6 +229,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) +QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON +QT6BASE_DEPENDENCIES += tslib +else +QT6BASE_CONF_OPTS += -DFEATURE_tslib=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON QT6BASE_DEPENDENCIES += libegl libgbm From james.kent at orchestrated-technology.com Wed Feb 8 10:52:09 2023 From: james.kent at orchestrated-technology.com (James Kent) Date: Wed, 8 Feb 2023 10:52:09 +0000 Subject: [Buildroot] [PATCH] package/chrony: add default unprivileged user option In-Reply-To: <20230207215052.GA2817@scaer> References: <20230207171020.20194-1-james.kent@orchestrated-technology.com> <20230207215052.GA2817@scaer> Message-ID: <8d4f6069-8fd9-e94d-177f-3f4153afb647@orchestrated-technology.com> Yann, thanks for the feedback.? Yes I'll rework the change with your input and submit a revised patch. Regards, James On 07/02/2023 21:50, Yann E. MORIN wrote: > James, All, > > On 2023-02-07 17:10 +0000, James Kent spake thusly: >> Configurable option to define and enable by default an unprivileged >> user which the Chrony daemon will assume once initialised. Where libcap >> is not enabled a comment indicates the dependency requirement to make >> the option available. >> >> This option supports the good security practice of dropping elevated >> privileges for daemon runtime. > Thanks, thjis is=ndeed makes sense. See below for some comments... > >> Signed-off-by: James Kent >> --- >> package/chrony/Config.in | 10 ++++++++++ >> package/chrony/chrony.mk | 8 ++++++++ >> 2 files changed, 18 insertions(+) >> >> diff --git a/package/chrony/Config.in b/package/chrony/Config.in >> index 158dc20530..8b053ed7e2 100644 >> --- a/package/chrony/Config.in >> +++ b/package/chrony/Config.in >> @@ -14,3 +14,13 @@ config BR2_PACKAGE_CHRONY_DEBUG_LOGGING >> Enable support for debug logging output from Chrony when >> enabled at runtime. If disabled, code for debug logging will >> not be compiled in. >> + >> +config BR2_PACKAGE_CHRONY_USER >> + bool "chrony default unprivileged user" >> + depends on BR2_PACKAGE_CHRONY && BR2_PACKAGE_LIBCAP > First, we now try to enclose package sub-options in an if-endif block, > rather than have each option depend on the package. I.e.: > > config BR2_PACKAGE_CHRONY > bool "chrony" > > if BR2_PACKAGE_CHRONY > > config BR2_PACKAGE_CHRONY_FOO > bool "foo" > > config BR2_PACKAGE_CHRONY_BAR > bool "bar" > > endif > > Yes, the existing option doesnot follow that coding style, so just fix > it up while at it. > > Second, chrony and libcap both need an MMU, so jut select libcap when > BR2_PACKAGE_CHRONY_USER is enabled. > >> + help >> + Define and enable default unprivileged user for the Chrony >> + daemon to run as. >> + >> +comment "chrony default unprivileged user requires libcap" >> + depends on BR2_PACKAGE_CHRONY && !BR2_PACKAGE_LIBCAP > And thus, that comment is no longer needed. > >> diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk >> index 379e95a778..16f8f082a3 100644 >> --- a/package/chrony/chrony.mk >> +++ b/package/chrony/chrony.mk >> @@ -21,6 +21,14 @@ CHRONY_CONF_OPTS = \ >> >> ifeq ($(BR2_PACKAGE_LIBCAP),y) >> CHRONY_DEPENDENCIES += libcap >> + >> +ifeq ($(BR2_PACKAGE_CHRONY_USER),y) >> +CHRONY_CONF_OPTS += --with-user=chrony >> +define CHRONY_USERS >> + chrony -1 chrony -1 * /run/chrony - - Time daemon >> +endef >> +endif > This part is correct. > > Can you fix and respin, please? > > Regards, > Yann E. MORIN. > >> else >> CHRONY_CONF_OPTS += --without-libcap >> endif >> -- >> 2.35.3 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Wed Feb 8 10:53:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:53:54 +0100 Subject: [Buildroot] [PATCH v6] package/gtkiostream: new package In-Reply-To: <20230208100704.68093-1-angelo@amarulasolutions.com> References: <20230208100704.68093-1-angelo@amarulasolutions.com> Message-ID: <20230208115354.7437af06@windsurf> On Wed, 8 Feb 2023 11:07:04 +0100 Angelo Compagnucci wrote: > diff --git a/package/gtkiostream/Config.in b/package/gtkiostream/Config.in > new file mode 100644 > index 0000000000..58c22ecbcb > --- /dev/null > +++ b/package/gtkiostream/Config.in > @@ -0,0 +1,16 @@ > +config BR2_PACKAGE_GTKIOSTREAM > + bool "gtkiostream" > + depends on BR2_INSTALL_LIBSTDCPP # eigen > + depends on BR2_TOOLCHAIN_HAS_THREADS > + select BR2_PACKAGE_EIGEN > + select BR2_PACKAGE_FFTW > + select BR2_PACKAGE_FFTW_DOUBLE > + select BR2_PACKAGE_FFTW_SINGLE > + help > + This package provides many useful software engineering and > + signal processing includes and linkable library. > + > + https://github.com/flatmax/gtkiostream > + > +comment "gtkiostream needs a toolchain w/ C++" and threads. > +GTKIOSTREAM_VERSION = v1.8.0 Should be 1.8.0 > +GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,$(GTKIOSTREAM_VERSION)) And should be: GTKIOSTREAM_SITE = $(call github,flatmax,gtkiostream,v$(GTKIOSTREAM_VERSION)) These issues can be fixed when applying, just noting them here as I noticed them. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Wed Feb 8 10:56:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 11:56:04 +0100 Subject: [Buildroot] [PATCH 1/2] package/tinycompress: install to staging In-Reply-To: <20230131064545.3266194-1-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 30 Jan 2023 23:45:44 -0700") References: <20230131064545.3266194-1-james.hilliard1@gmail.com> Message-ID: <87zg9o5su3.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > This will be needed for upcoming pipewire compress offload support. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 10:56:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 11:56:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/pipewire: bump to version 0.3.65 In-Reply-To: <20230131064545.3266194-2-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 30 Jan 2023 23:45:45 -0700") References: <20230131064545.3266194-1-james.hilliard1@gmail.com> <20230131064545.3266194-2-james.hilliard1@gmail.com> Message-ID: <87v8kc5stz.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Add support for new compress-offload and pw-cat-ffmpeg features. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 10:52:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:52:45 +0100 Subject: [Buildroot] [git commit] package/tinycompress: install to staging Message-ID: <20230208105749.37455845F2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ee78c0a8b7854b4e8b260e1791909b8591ae5ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will be needed for upcoming pipewire compress offload support. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/tinycompress/tinycompress.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinycompress/tinycompress.mk b/package/tinycompress/tinycompress.mk index 062233ec80..c9cfbb574b 100644 --- a/package/tinycompress/tinycompress.mk +++ b/package/tinycompress/tinycompress.mk @@ -9,5 +9,6 @@ TINYCOMPRESS_SOURCE = tinycompress-$(TINYCOMPRESS_VERSION).tar.bz2 TINYCOMPRESS_SITE = https://www.alsa-project.org/files/pub/tinycompress TINYCOMPRESS_LICENSE = BSD-3-Clause and LGPL-2.1 TINYCOMPRESS_LICENSE_FILES = COPYING +TINYCOMPRESS_INSTALL_STAGING = YES $(eval $(autotools-package)) From peter at korsgaard.com Wed Feb 8 10:55:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:55:07 +0100 Subject: [Buildroot] [git commit] package/pipewire: bump to version 0.3.65 Message-ID: <20230208105749.43575845F3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=247e2d0eb1e60f483044d58bed58c5ed321528f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add support for new compress-offload and pw-cat-ffmpeg features. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index d8b5b0cc86..0e027aaa55 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 24b218cf3bb1fb279c8c489c14cc9ae483e1da7b4c8215b2ee5a5ee831bae94f pipewire-0.3.62.tar.bz2 +sha256 c78c95cdff2774418f0a9468e94a1b2800761d322f13104df6501e1a0dc92558 pipewire-0.3.65.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 6bcda0a93d..976d7783b9 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.62 +PIPEWIRE_VERSION = 0.3.65 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) @@ -122,10 +122,10 @@ PIPEWIRE_CONF_OPTS += -Dbluez5=disabled -Dbluez5-codec-opus=disabled endif ifeq ($(BR2_PACKAGE_FFMPEG),y) -PIPEWIRE_CONF_OPTS += -Dffmpeg=enabled +PIPEWIRE_CONF_OPTS += -Dffmpeg=enabled -Dpw-cat-ffmpeg=enabled PIPEWIRE_DEPENDENCIES += ffmpeg else -PIPEWIRE_CONF_OPTS += -Dffmpeg=disabled +PIPEWIRE_CONF_OPTS += -Dffmpeg=disabled -Dpw-cat-ffmpeg=disabled endif ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) @@ -215,6 +215,13 @@ else PIPEWIRE_CONF_OPTS += -Dsdl2=disabled endif +ifeq ($(BR2_PACKAGE_TINYCOMPRESS),y) +PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled +PIPEWIRE_DEPENDENCIES += tinycompress +else +PIPEWIRE_CONF_OPTS += -Dcompress-offload=disabled +endif + ifeq ($(WEBRTC_AUDIO_PROCESSING),y) PIPEWIRE_CONF_OPTS += -Decho-cancel-webrtc=enabled PIPEWIRE_DEPENDENCIES += webrtc-audio-processing From peter at korsgaard.com Wed Feb 8 11:00:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 12:00:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/neon-2-sse: bump to version 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f In-Reply-To: <20230201000248.1104432-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 31 Jan 2023 17:02:48 -0700") References: <20230201000248.1104432-1-james.hilliard1@gmail.com> Message-ID: <87r0v05smo.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Drop patch which is now upstream. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 10:57:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:57:26 +0100 Subject: [Buildroot] [git commit] package/neon-2-sse: bump to version 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f Message-ID: <20230208110047.8620F845F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c419ef62d84b5be65599452ab84f7ed719bbe470 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/neon-2-sse/0001-Fix-cmake-languages.patch | 40 ----------------------- package/neon-2-sse/neon-2-sse.hash | 2 +- package/neon-2-sse/neon-2-sse.mk | 2 +- 3 files changed, 2 insertions(+), 42 deletions(-) diff --git a/package/neon-2-sse/0001-Fix-cmake-languages.patch b/package/neon-2-sse/0001-Fix-cmake-languages.patch deleted file mode 100644 index e0becb1ffa..0000000000 --- a/package/neon-2-sse/0001-Fix-cmake-languages.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 186ec82e033d8c718d760d14945535a9d7e160fd Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sun, 29 Jan 2023 21:00:27 -0700 -Subject: [PATCH] Fix cmake languages - -When no language is set cmake defaults to C and CXX, since we support -C by itself we should set the project language to C so that we don't -get a compiler error when building without a CXX toolchain. - -Fixes: -CMake Error at CMakeLists.txt:5 (project): - No CMAKE_CXX_COMPILER could be found. - - Tell CMake where to find the compiler by setting either the environment - variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path - to the compiler, or to the compiler name if it is in the PATH. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/intel/ARM_NEON_2_x86_SSE/pull/62] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e4b8980..8f58e79 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,7 +2,7 @@ - # Modification: Copyright (C) 2017 David Hirvonen - - cmake_minimum_required(VERSION 3.0) --project(NEON_2_SSE VERSION 1.0.0) -+project(NEON_2_SSE VERSION 1.0.0 LANGUAGES C) - - add_library(${PROJECT_NAME} INTERFACE) - --- -2.34.1 - diff --git a/package/neon-2-sse/neon-2-sse.hash b/package/neon-2-sse/neon-2-sse.hash index ded20d58f5..f964d2fa61 100644 --- a/package/neon-2-sse/neon-2-sse.hash +++ b/package/neon-2-sse/neon-2-sse.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 019fbc7ec25860070a1d90e12686fc160cfb33e22aa063c80f52b363f1361e9d neon-2-sse-a15b489e1222b2087007546b4912e21293ea86ff.tar.gz +sha256 4567ca8c8cbc8ce0ea3ddb9dc0f158707eb85c631cb400fd7010cd299cdc5377 neon-2-sse-097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f.tar.gz # License files, locally calculated sha256 7022f51b439a5915e933ecc270c83e24ca0cb2cceeb08b0132dcd4dbb03ed2dc LICENSE diff --git a/package/neon-2-sse/neon-2-sse.mk b/package/neon-2-sse/neon-2-sse.mk index 3e87c62e21..ee6f5446b6 100644 --- a/package/neon-2-sse/neon-2-sse.mk +++ b/package/neon-2-sse/neon-2-sse.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEON_2_SSE_VERSION = a15b489e1222b2087007546b4912e21293ea86ff +NEON_2_SSE_VERSION = 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f NEON_2_SSE_SITE = $(call github,intel,ARM_NEON_2_x86_SSE,$(NEON_2_SSE_VERSION)) NEON_2_SSE_LICENSE = BSD-2-Clause NEON_2_SSE_LICENSE_FILES = LICENSE From sebastian.weyer at smile.fr Wed Feb 8 11:05:51 2023 From: sebastian.weyer at smile.fr (Sebastian Weyer) Date: Wed, 8 Feb 2023 12:05:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/rust: fix boostrap build Message-ID: <20230208110551.187828-1-sebastian.weyer@smile.fr> The update to v1.67.0 of rust broke the boostrap build. This patch applies an upstream patch to fix this: https://github.com/rust-lang/rust/commit/3fe64ebbce21e79adb64099984e96dfb79bdd0f9 Fixes: http://autobuild.buildroot.org/results/214/214fcbb3458893784b7f85b60f7ee1edb428c77f/build-end.log Signed-off-by: Sebastian Weyer Cc: Eric Le Bihan Cc: James Hilliard --- I previously just tested TestRustBin since TestRust takes forever. This time I ran TestRust and it builds fine :) --- ...-unsoundness-in-bootstrap-cache-code.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch new file mode 100644 index 0000000000..3eae34642f --- /dev/null +++ b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch @@ -0,0 +1,43 @@ +From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 +From: Michael Goulet +Date: Mon, 12 Dec 2022 18:29:33 +0000 +Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= + =?UTF-8?q?ap=20cache=20code?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) +Signed-off-by: Sebastian Weyer +--- + src/bootstrap/cache.rs | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs +index be5c9bb0788..05f25af68ea 100644 +--- a/src/bootstrap/cache.rs ++++ b/src/bootstrap/cache.rs +@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { + + impl Deref for Interned { + type Target = T::Target; +- fn deref(&self) -> &'static Self::Target { ++ fn deref(&self) -> &Self::Target { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } ++ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } + } + } + + impl, U: ?Sized> AsRef for Interned { +- fn as_ref(&self) -> &'static U { ++ fn as_ref(&self) -> &U { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } ++ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } + } + } + +-- +2.25.1 + -- 2.25.1 From thomas.petazzoni at bootlin.com Wed Feb 8 11:07:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:07:52 +0100 Subject: [Buildroot] [PATCH v6 01/13] package/qt6/qt6base: add support for gui module In-Reply-To: <20230207171721.2973997-2-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-2-angelo@amarulasolutions.com> Message-ID: <20230208120752.7f49ad05@windsurf> Hello, On Tue, 7 Feb 2023 18:17:09 +0100 Angelo Compagnucci wrote: > +ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) > +QT6BASE_CONF_OPTS += -DFEATURE_gui=ON -DFEATURE_freetype=ON -DINPUT_opengl=no -DFEATURE_vulkan=OFF Split with one option per line. > +QT6BASE_DEPENDENCIES += freetype > + > +ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) > +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON > +else > +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) > +QT6BASE_CONF_OPTS += \ > + -DFEATURE_xcb=ON \ > + -DFEATURE_xcb_xlib=ON \ > + -DFEATURE_xkbcommon=ON \ > + -DFEATURE_xkbcommon_x11=ON > +QT6BASE_DEPENDENCIES += \ > + libxcb \ > + xcb-util-wm \ > + xcb-util-image \ > + xcb-util-keysyms \ > + xcb-util-renderutil \ > + xlib_libX11 \ > + libxkbcommon > +QT6BASE_DEPENDENCIES += xlib_libXext This line was not correct: (1) this package is not needed and (2) it was not selected in Config.in, causing a build failure because we don't allow depending on a package that isn't selected in Config.in. I fixed that up when applying. 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 Wed Feb 8 11:08:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:08:32 +0100 Subject: [Buildroot] [PATCH v6 02/13] package/qt6/qt6base: add support for fontconfig/harfbuzz In-Reply-To: <20230207171721.2973997-3-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-3-angelo@amarulasolutions.com> Message-ID: <20230208120832.16e3a7c4@windsurf> On Tue, 7 Feb 2023 18:17:10 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Additionally the harfbuzz license file is added and the hash for this is > also added to the hash file > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/Config.in | 17 +++++++++++++++++ > package/qt6/qt6base/qt6base.hash | 1 + > package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++++ > 3 files changed, 41 insertions(+) > > diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in > index 1810b1586d..594221b792 100644 > --- a/package/qt6/qt6base/Config.in > +++ b/package/qt6/qt6base/Config.in > @@ -59,6 +59,23 @@ config BR2_PACKAGE_QT6BASE_XCB > comment "X.org XCB backend available if X.org is enabled" > depends on !BR2_PACKAGE_XORG7 > > +config BR2_PACKAGE_QT6BASE_FONTCONFIG > + bool "fontconfig support" > + select BR2_PACKAGE_FONTCONFIG > + help > + This option enables Fontconfig and Freetype support using > + the system fontconfig and freetype2 libraries. It doesn't enable fontconfig and freetype, but only fontconfig. Freetype is unconditionally enabled for the GUI module. I fixed that up when applying. 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 Wed Feb 8 11:08:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:08:43 +0100 Subject: [Buildroot] [PATCH v6 03/13] package/qt6/qt6base: Add support for jpeg/png/gif image format In-Reply-To: <20230207171721.2973997-4-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-4-angelo@amarulasolutions.com> Message-ID: <20230208120843.420c8ed3@windsurf> On Tue, 7 Feb 2023 18:17:11 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/Config.in | 19 +++++++++++++++++++ > package/qt6/qt6base/qt6base.mk | 20 ++++++++++++++++++++ > 2 files changed, 39 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:09:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:09:19 +0100 Subject: [Buildroot] [PATCH v6 04/13] package/qt6/qt6base: add support for widgets In-Reply-To: <20230207171721.2973997-5-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-5-angelo@amarulasolutions.com> Message-ID: <20230208120919.54ed260e@windsurf> On Tue, 7 Feb 2023 18:17:12 +0100 Angelo Compagnucci wrote: > +config BR2_PACKAGE_QT6BASE_WIDGETS > + bool "widgets module" > + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT6BASE_XCB According to my build testing, this dependency is not needed, so I dropped it. > + help > + This option enables the Qt6Widgets library. > + > endif > > config BR2_PACKAGE_QT6BASE_NETWORK > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk > index 06ebbab8e7..cf3c7b1ad1 100644 > --- a/package/qt6/qt6base/qt6base.mk > +++ b/package/qt6/qt6base/qt6base.mk > @@ -213,6 +213,10 @@ else > QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF > endif > > +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) > +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON Missing else clause to explicitly disable widgets. Applied with these two things fixed. 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 Wed Feb 8 11:09:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:09:26 +0100 Subject: [Buildroot] [PATCH v6 05/13] package/qt6/qt6base: add support for widgets gtk backend In-Reply-To: <20230207171721.2973997-6-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-6-angelo@amarulasolutions.com> Message-ID: <20230208120926.2e878f52@windsurf> On Tue, 7 Feb 2023 18:17:13 +0100 Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/qt6base.mk | 11 +++++++++++ > 1 file changed, 11 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:11:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:11:36 +0100 Subject: [Buildroot] [PATCH v6 06/13] package/qt6/qt6base: add opengl support In-Reply-To: <20230207171721.2973997-7-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-7-angelo@amarulasolutions.com> Message-ID: <20230208121136.74cfe8e6@windsurf> On Tue, 7 Feb 2023 18:17:14 +0100 Angelo Compagnucci wrote: > +if BR2_PACKAGE_QT6BASE_OPENGL > + > +choice > + prompt "OpenGL API" > + help > + Select OpenGL API. > + > +config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP > + bool "Desktop OpenGL" > + depends on BR2_PACKAGE_HAS_LIBGL > + help > + Use desktop OpenGL. > + > +config BR2_PACKAGE_QT6BASE_OPENGL_ES2 > + bool "OpenGL ES 2.0+" > + depends on BR2_PACKAGE_HAS_LIBGLES > + help > + Use OpenGL ES 2.0 and later versions. > + > +endchoice > + > +config BR2_PACKAGE_QT6BASE_OPENGL_LIB > + bool "opengl module" > + select BR2_PACKAGE_QT6BASE_WIDGETS > + help > + This option enables the Qt6OpenGL library. This library > + includes OpenGL support classes provided to ease porting > + from Qt 4.x. This option didn't do anything: there is nothing in the .mk file that did something about this option, so I dropped it. > + > +config BR2_PACKAGE_QT6BASE_EGLFS > + bool "eglfs support" > + default y I dropped the "default y", there is no need for that. > + depends on BR2_PACKAGE_HAS_LIBGBM It also needs EGL. > + select BR2_PACKAGE_QT6BASE_OPENGL I also moved this option closer to the other graphics backends (linuxfb, xcb). > config BR2_PACKAGE_QT6BASE_FONTCONFIG > bool "fontconfig support" > select BR2_PACKAGE_FONTCONFIG > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk > index f936d19c68..e9a3396fb6 100644 > --- a/package/qt6/qt6base/qt6base.mk > +++ b/package/qt6/qt6base/qt6base.mk > @@ -228,6 +228,23 @@ else > QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF > endif > > +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) > +QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON > +QT6BASE_DEPENDENCIES += libegl libgbm added here, since according to Config.in we need it. Applied with those fixes, 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 Wed Feb 8 11:11:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:11:46 +0100 Subject: [Buildroot] [PATCH v6 07/13] package/qt6/qt6base: add QPA backend selection In-Reply-To: <20230207171721.2973997-8-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-8-angelo@amarulasolutions.com> Message-ID: <20230208121146.60983a2c@windsurf> On Tue, 7 Feb 2023 18:17:15 +0100 Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/Config.in | 13 +++++++++++++ > package/qt6/qt6base/qt6base.mk | 3 +++ > 2 files changed, 16 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:13:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:13:46 +0100 Subject: [Buildroot] [PATCH v6 08/13] package/qt6/qt6base: add support for tslib In-Reply-To: <20230207171721.2973997-9-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-9-angelo@amarulasolutions.com> Message-ID: <20230208121346.1d1318b0@windsurf> On Tue, 7 Feb 2023 18:17:16 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/Config.in | 6 ++++++ > package/qt6/qt6base/qt6base.mk | 7 +++++++ > 2 files changed, 13 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:13:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:13:50 +0100 Subject: [Buildroot] [PATCH v6 09/13] package/qt6/qt6base: add support for libinput In-Reply-To: <20230207171721.2973997-10-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-10-angelo@amarulasolutions.com> Message-ID: <20230208121350.514b08e0@windsurf> On Tue, 7 Feb 2023 18:17:17 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/qt6base.mk | 7 +++++++ > 1 file changed, 7 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:13:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:13:55 +0100 Subject: [Buildroot] [PATCH v6 10/13] package/qt6/qt6base: add support for kms In-Reply-To: <20230207171721.2973997-11-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-11-angelo@amarulasolutions.com> Message-ID: <20230208121355.07893b6d@windsurf> On Tue, 7 Feb 2023 18:17:18 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/qt6base.mk | 7 +++++++ > 1 file changed, 7 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:15:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:15:01 +0100 Subject: [Buildroot] [PATCH v6 11/13] package/qt6/qt6base: add support for printsupport/cups In-Reply-To: <20230207171721.2973997-12-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-12-angelo@amarulasolutions.com> Message-ID: <20230208121501.7fc4267d@windsurf> On Tue, 7 Feb 2023 18:17:19 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > package/qt6/qt6base/Config.in | 4 ++++ > package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ > 2 files changed, 16 insertions(+) > > diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in > index d5d6d3569d..4d13128661 100644 > --- a/package/qt6/qt6base/Config.in > +++ b/package/qt6/qt6base/Config.in > @@ -168,6 +168,10 @@ config BR2_PACKAGE_QT6BASE_NETWORK > help > This options enables the Qt6Network library. > > +config BR2_PACKAGE_QT6BASE_PRINTSUPPORT > + depends on BR2_PACKAGE_QT6BASE_WIDGETS > + def_bool y Why is that a def_bool y? I see it's like that in qt5base, but I'm not sure why. I changed it to be a normal option: config BR2_PACKAGE_QT6BASE_PRINTSUPPORT bool "printing support" # yes, print support needs widgets depends on BR2_PACKAGE_QT6BASE_WIDGETS help This option enables printing support, optionally using CUPS if available. > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk > index 4a64886a3f..97986a3c2b 100644 > --- a/package/qt6/qt6base/qt6base.mk > +++ b/package/qt6/qt6base/qt6base.mk > @@ -206,6 +206,18 @@ else > QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF > endif > > +ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT), y) Spurious space before y > +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON > +ifeq ($(BR2_PACKAGE_CUPS), y) Same. Applied with those fixes. 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 Wed Feb 8 11:16:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:16:29 +0100 Subject: [Buildroot] [PATCH v6 12/13] package/qt6/qt6base: add support for building examples In-Reply-To: <20230207171721.2973997-13-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-13-angelo@amarulasolutions.com> Message-ID: <20230208121629.756b938e@windsurf> On Tue, 7 Feb 2023 18:17:20 +0100 Angelo Compagnucci wrote: > +config BR2_PACKAGE_QT6BASE_EXAMPLES > + bool "Compile and install examples " > + depends on BR2_PACKAGE_QT6_GL_SUPPORTS > + select BR2_PACKAGE_QT6BASE_DBUS > + select BR2_PACKAGE_QT6BASE_NETWORK > + select BR2_PACKAGE_QT6BASE_XML > + select BR2_PACKAGE_QT6BASE_DBUS > + select BR2_PACKAGE_QT6BASE_GUI > + select BR2_PACKAGE_QT6BASE_WIDGETS > + select BR2_PACKAGE_QT6BASE_OPENGL > + select BR2_PACKAGE_QT6BASE_OPENGL_LIB Due to comments/issues on previous patches, this option does not exist, so I'm not able to apply this patch right now. Could you resend as part of a new series after checking this BR2_PACKAGE_QT6BASE_OPENGL_LIB thing? Also, are all those options needed to have the examples? I believe with Qt5, when you enable the examples, it builds only the examples that it can build based on the features enabled in Qt. This was very handy. The same is not possible here? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Wed Feb 8 11:16:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 12:16:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gstd: bump to version 0.15.0 In-Reply-To: <20230102042130.2962255-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sun, 1 Jan 2023 21:21:30 -0700") References: <20230102042130.2962255-1-james.hilliard1@gmail.com> Message-ID: <87mt5o5rvo.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Drop patches which are now upstream. > Add new libedit dependency. > License hash changed due to LGPL-2.1+ relicense: > https://github.com/RidgeRun/gstd-1.x/commit/76d9fb61a05973b30220fcae5ff87de9d618ea49 I was a bit confused about this, as that commmit is about going from BSD-3-Claus to LGPL-2.1+, but it was marked as GPL-2.0+ for 0.14.0. It turns out that it was first relicensed to BSD, so I've extended the commit message with a link to: https://github.com/RidgeRun/gstd-1.x/commit/2cb6bb8b6c3bba24098a83557c5fa58a8a15ff58 And committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 11:13:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 12:13:44 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gstd: bump to version 0.15.0 Message-ID: <20230208111700.869F384609@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbd06adac50e304f413689febf676911ae29d967 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches which are now upstream. Add new libedit dependency. License hash changed due to LGPL-2.1+ relicense: https://github.com/RidgeRun/gstd-1.x/commit/2cb6bb8b6c3bba24098a83557c5fa58a8a15ff58 https://github.com/RidgeRun/gstd-1.x/commit/76d9fb61a05973b30220fcae5ff87de9d618ea49 Signed-off-by: James Hilliard [Peter: add BSD-3-Clause license change commit for clarity] Signed-off-by: Peter Korsgaard --- ...e-gstd-check-user-xenv.sh-for-systemd-se.patch} | 0 .../gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch | 27 -------- ...ve-meson-python-module-for-python-install.patch | 78 ---------------------- .../0004-meson.build-add-missing-init-subdir.patch | 28 -------- ...uild-use-dependency-function-for-readline.patch | 51 -------------- package/gstreamer1/gstd/Config.in | 5 +- package/gstreamer1/gstd/gstd.hash | 4 +- package/gstreamer1/gstd/gstd.mk | 5 +- 8 files changed, 8 insertions(+), 190 deletions(-) diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch b/package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch similarity index 100% rename from package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch rename to package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch diff --git a/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch b/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch deleted file mode 100644 index 79a65ffbdc..0000000000 --- a/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f1c953b9077619a83ab21c24dc343c7e21cd220d Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 01:46:25 -0600 -Subject: [PATCH] Fix gstd_chmod.sh DESTDIR path. - -This should fix the chmod path when cross compiling. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/247] ---- - gstd/gstd_chmod.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gstd/gstd_chmod.sh b/gstd/gstd_chmod.sh -index 8e58bce..fa7fa80 100755 ---- a/gstd/gstd_chmod.sh -+++ b/gstd/gstd_chmod.sh -@@ -3,4 +3,4 @@ - # $1 mode - # $2 file - --chmod $1 $2 -+chmod $1 ${DESTDIR}/$2 --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch b/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch deleted file mode 100644 index a27d79a0e9..0000000000 --- a/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1067f6138e947d18fd835e4a39f229ae2293f864 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 23:37:03 -0600 -Subject: [PATCH] Use native meson python module for python install. - -Signed-off-by: James Hilliard -[upstreeam: https://github.com/RidgeRun/gstd-1.x/pull/253] -Signed-off-by: Yann E. MORIN ---- - libgstc/meson.build | 4 +++- - libgstc/python/meson.build | 26 +++++++++++++++++++++++++- - meson_options.txt | 2 ++ - 3 files changed, 30 insertions(+), 2 deletions(-) - -diff --git a/libgstc/meson.build b/libgstc/meson.build -index e94dcd1..582cbb8 100644 ---- a/libgstc/meson.build -+++ b/libgstc/meson.build -@@ -1,2 +1,4 @@ - subdir('c') --subdir('python') -+if not get_option('enable-python').disabled() -+ subdir('python') -+endif -diff --git a/libgstc/python/meson.build b/libgstc/python/meson.build -index 057114b..24e3242 100644 ---- a/libgstc/python/meson.build -+++ b/libgstc/python/meson.build -@@ -1 +1,25 @@ --run_command('pip3', 'install', '.') -+pymod = import('python') -+python = pymod.find_installation( -+ get_option('with-python-version'), -+ required : get_option('enable-python').enabled(), -+ disabler : true -+) -+ -+pythonver = python.language_version() -+if pythonver.version_compare('<3.7') -+ error('Python @0@ is not supported anymore, please port your code to python3.7 or newer.'.format(python.language_version())) -+endif -+ -+pygstc_src_files = [ -+ 'pygstc/__init__.py', -+ 'pygstc/gstc.py', -+ 'pygstc/gstcerror.py', -+ 'pygstc/logger.py', -+ 'pygstc/tcp.py' -+] -+ -+python.install_sources( -+ pygstc_src_files, -+ subdir : 'pygstc', -+ pure : true -+) -diff --git a/meson_options.txt b/meson_options.txt -index f50e540..25292e6 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,6 +4,7 @@ option('enable-examples', type : 'feature', value : 'auto', yield : true, descri - option('enable-gtk-doc', type : 'boolean', value : false, description : 'Use gtk-doc to build documentation') - option('enable-systemd', type : 'feature', value : 'auto', description : 'Enable systemd gstd.service install') - option('enable-initd', type : 'feature', value : 'disabled', description : 'Enable init script install') -+option('enable-python', type : 'feature', value : 'auto', description : 'Install the pygstc library') - - # String options - option('with-gstd-runstatedir', type : 'string', value : '${prefix}/var/run/gstd', description : 'Specify the location of the gstd\'s PID file') -@@ -11,6 +12,7 @@ option('with-gstd-logstatedir', type : 'string', value : '${prefix}/var/log/gstd - option('with-gstd-systemddir', type : 'string', value : 'Systemd default systemduserunitdir', description : 'Specify the location of gstd.service file') - option('with-gstd-initddir', type : 'string', value : '${sysconfdir}/init.d', description : 'Specify the location of gstd init script') - option('with-statedir-owner', type : 'string', value : 'root', description : 'Specify the owner of gstd\'s run and log dirs created by the initd script') -+option('with-python-version', type : 'string', value : 'python3', description : 'Specify the python version for pygstc installation') - - # Common options - option('package-name', type : 'string', yield : true, --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0004-meson.build-add-missing-init-subdir.patch b/package/gstreamer1/gstd/0004-meson.build-add-missing-init-subdir.patch deleted file mode 100644 index ed3738e3d4..0000000000 --- a/package/gstreamer1/gstd/0004-meson.build-add-missing-init-subdir.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 689265cd522c770ad3e0391cae80ee884a8c475c Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 21 Apr 2022 01:14:52 -0500 -Subject: [PATCH] meson.build: add missing init subdir - -Seems this got accidentially removed in: -9f4490138c8892b1c86008134438b2ab405c9b0f - -Restore it so that init files are properly installed. - -Signed-off-by: James Hilliard -[upstreeam: https://github.com/RidgeRun/gstd-1.x/pull/291] ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index a30f776..7a8690a 100644 ---- a/meson.build -+++ b/meson.build -@@ -300,3 +300,4 @@ subdir('gst_client') - subdir('tests') - subdir('examples') - subdir('docs') -+subdir('init') --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0005-meson.build-use-dependency-function-for-readline.patch b/package/gstreamer1/gstd/0005-meson.build-use-dependency-function-for-readline.patch deleted file mode 100644 index 51422e56d6..0000000000 --- a/package/gstreamer1/gstd/0005-meson.build-use-dependency-function-for-readline.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3ef45c41105e61efe84c9be3a9a22988dfe10db8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 22 Oct 2021 07:33:04 +0200 -Subject: [PATCH] meson.build: use dependency function for readline - -Use meson dependency function to find readline instead of -cc.find_library. This function will retrieve readline pkg-config file -which is available since version 7 (released 5 years ago) and -https://git.savannah.gnu.org/cgit/readline.git/commit/readline.pc.in?id=d49a9082c0e15bba8cd3d8cc0a994409cf823cac. -readline.pc sets tinfo in Requires.Private which will avoid the -following static build failure: - -/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/lib/libreadline.a(display.o): in function `_rl_move_cursor_relative': -display.c:(.text+0xbb5): undefined reference to `tputs' - -Fixes: - - http://autobuild.buildroot.org/results/77c10947ddc749c54c7c233e3143f5cdf1edc73d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/RidgeRun/gstd-1.x/pull/261] ---- - meson.build | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index 7a8690a..44ed5c2 100644 ---- a/meson.build -+++ b/meson.build -@@ -32,8 +32,8 @@ systemd_required = get_option('enable-systemd').enabled() - systemd_dep = dependency('systemd', required : systemd_required, version : '>=232') - - cc = meson.get_compiler('c') --readline = cc.find_library('readline', required: true) --if readline.found() -+readline_dep = dependency('readline') -+if readline_dep.found() - add_project_arguments('-DHAVE_LIBREADLINE', language: 'c') - add_project_arguments('-DHAVE_READLINE_HISTORY', language: 'c') - # Add arguments to the compiler command line. -@@ -48,8 +48,6 @@ if readline.found() - else - add_project_arguments('-DHAVE_HISTORY_H', language: 'c') - endif -- -- readline_dep = readline - endif - - ## Dependencies --- -2.37.1 - diff --git a/package/gstreamer1/gstd/Config.in b/package/gstreamer1/gstd/Config.in index f36d25f11f..df1d2f59c3 100644 --- a/package/gstreamer1/gstd/Config.in +++ b/package/gstreamer1/gstd/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_GSTD bool "gstd" - depends on BR2_USE_WCHAR # libglib2 -> gettext, libsoup + depends on BR2_USE_WCHAR # libglib2 -> gettext, libedit, libsoup depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libsoup - depends on BR2_USE_MMU # libdaemon, libglib2 + depends on BR2_USE_MMU # libdaemon, libedit, libglib2 select BR2_PACKAGE_GSTREAMER1_GST_DEBUG # gst_debug_bin_to_dot_data select BR2_PACKAGE_JANSSON select BR2_PACKAGE_JSON_GLIB select BR2_PACKAGE_LIBDAEMON + select BR2_PACKAGE_LIBEDIT select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_READLINE diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash index 20c821a27f..632f83f8e8 100644 --- a/package/gstreamer1/gstd/gstd.hash +++ b/package/gstreamer1/gstd/gstd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 56afd58530b63d0d88dd818fd4e6c9230861819b3e131c6a87a46084c3f3fa96 gstd-0.14.0.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 f4a83765d2cf2948c38abc5107ab07d49a01b4101047f188fed7204f1d4e49c7 gstd-0.15.0.tar.gz +sha256 10162be9f7ddb9e98c22c3edd0f78d62ab88f0ca8b1cc968bd85d5d665489d90 COPYING diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk index 817e9143ae..ccb3b3e1bc 100644 --- a/package/gstreamer1/gstd/gstd.mk +++ b/package/gstreamer1/gstd/gstd.mk @@ -4,10 +4,10 @@ # ################################################################################ -GSTD_VERSION = 0.14.0 +GSTD_VERSION = 0.15.0 GSTD_SITE = $(call github,RidgeRun,gstd-1.x,v$(GSTD_VERSION)) GSTD_LICENSE_FILES = COPYING -GSTD_LICENSE = GPL-2.0+ +GSTD_LICENSE = LGPL-2.1+ GSTD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ @@ -15,6 +15,7 @@ GSTD_DEPENDENCIES = \ jansson \ json-glib \ libdaemon \ + libedit \ libglib2 \ libsoup \ readline From thomas.petazzoni at bootlin.com Wed Feb 8 11:18:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:18:29 +0100 Subject: [Buildroot] [PATCH v6 13/13] package/qt6: Add qmake functionality In-Reply-To: <20230207171721.2973997-14-angelo@amarulasolutions.com> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-14-angelo@amarulasolutions.com> Message-ID: <20230208121829.126bc242@windsurf> Hello, On Tue, 7 Feb 2023 18:17:21 +0100 Angelo Compagnucci wrote: > diff --git a/package/qt6/qt6base/qt.conf.in b/package/qt6/qt6base/qt.conf.in > new file mode 100644 > index 0000000000..4842bcb462 > --- /dev/null > +++ b/package/qt6/qt6base/qt.conf.in > @@ -0,0 +1,7 @@ > +[Paths] > +Prefix=/usr > +HostPrefix=@@HOST_DIR@@ > +HostData=../target/usr This looks very very odd, and most likely doesn't work. If I understand correctly, this is a path that will be interpreted relatively to $(HOST_DIR), so this value assumes that host/ and target/ are side by side, but that's not true in the general case. Indeed, BR2_HOST_DIR allows to customize where $(HOST_DIR) is located, and it can be elsewhere than side by side to target/. What is this trying to do exactly? > +Sysroot=@@STAGING_DIR@@ > +SysrootifyPrefix=true > +TargetSpec=devices/linux-buildroot-g++ > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk > index ec1c65f827..f37b2bafce 100644 > --- a/package/qt6/qt6base/qt6base.mk > +++ b/package/qt6/qt6base/qt6base.mk > @@ -54,6 +54,9 @@ QT6BASE_CONF_OPTS = \ > -DFEATURE_system_zlib=ON \ > -DFEATURE_system_libb2=ON > > +QT6BASE_CFLAGS = $(TARGET_CFLAGS) > +QT6BASE_CXXFLAGS = $(TARGET_CXXFLAGS) > + > # x86 optimization options. While we have a BR2_X86_CPU_HAS_AVX512, it > # is not clear yet how it maps to all the avx512* options of Qt, so we > # for now keeps them disabled. > @@ -384,5 +387,18 @@ else > QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF > endif > > +define QT6BASE_MAKE_BR_SPEC > + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qmake.conf.in \ > + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf > + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ > + $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h > +endef > + > +QT6BASE_CONF_OPTS += -DQT_QMAKE_DEVICE_OPTIONS=CROSS_COMPILE="$(TARGET_CROSS)";BR_COMPILER_CFLAGS="$(QT6BASE_CFLAGS)";BR_COMPILER_CXXFLAGS="$(QT6BASE_CXX_FLAGS)" > + > +QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC > + > +QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF Where is QT6_INSTALL_QT_CONF implemented ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 11:19:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:19:56 +0100 Subject: [Buildroot] [git commit] configs/olimex_stmp157: bump Linux and U-Boot Message-ID: <20230208112006.267418461D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=019bf138eaf634ba1781037755c6cc594371ada0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_stmp157_olinuxino_lime_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index a63394fa0b..49670dbe4f 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -16,8 +16,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/stmp1_olinuxino/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/OLIMEX/linux-olimex.git" -# branch release-20220413-v5.10.105 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="d417808c240d55576ee76e5cbb40413ad444ecfd" +# branch release-20221011-v5.10.105 +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1b955f3ee7ef3234f290f65dbea108063996aea0" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olimex/stmp1_olinuxino/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -34,8 +34,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/OLIMEX/u-boot-olinuxino.git" -# release-20220413, based on 2021.04 -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="b39c5a7c93a2d8efaecc9cad4284378af857c3f7" +# release-20220927, based on 2021.04 +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="98ab5ecb0a16eeb426f34b2a1a28e56658c1a59c" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y From thomas.petazzoni at bootlin.com Wed Feb 8 11:19:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:19:56 +0100 Subject: [Buildroot] [git commit] configs/olimex_stmp157: configure eth0 with DHCP Message-ID: <20230208112006.3148C8461F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4ad6d332b9e47e432f9934405946621b2e0c09a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_stmp157_olinuxino_lime_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index 49670dbe4f..60c34d7fa1 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -8,6 +8,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="stmp1-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/stmp1_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/stmp1_olinuxino/genimage.cfg" From thomas.petazzoni at bootlin.com Wed Feb 8 11:24:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:24:10 +0100 Subject: [Buildroot] [PATCH 1/2] configs/olimex_stmp157: bump Linux and U-Boot In-Reply-To: <20221126180016.280061-1-francois.perrad@gadz.org> References: <20221126180016.280061-1-francois.perrad@gadz.org> Message-ID: <20230208122410.51ea30e5@windsurf> On Sat, 26 Nov 2022 19:00:15 +0100 Francois Perrad wrote: > Signed-off-by: Francois Perrad > --- > configs/olimex_stmp157_olinuxino_lime_defconfig | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Both patches applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 12:24:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:24:16 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gst1-plugins-bad: add zxing plugin support Message-ID: <20230208122444.29C4484639@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11b2ab5ee261e8af1065f15e2e69290e15e9e4ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/Config.in | 9 +++++++++ package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 1e89cd124f..d477924eec 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -738,6 +738,15 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 +config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING + bool "zxing" + depends on !BR2_STATIC_LIBS # zxing-cpp + depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp + select BR2_PACKAGE_ZXING_CPP + +comment "zxing plugin needs a toolchain w/ C++, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP + endif comment "gst1-plugins-bad needs a toolchain w/ C++" diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index dfe1f1c9eb..edac818985 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -70,7 +70,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dsvthevcenc=disabled \ -Dtranscode=disabled \ -Dwasapi2=disabled \ - -Dzxing=disabled \ -Dmagicleap=disabled \ -Disac=disabled \ -Diqa=disabled \ @@ -812,6 +811,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dzbar=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += zxing-cpp +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=disabled +endif + # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dgpl=enabled From thomas.petazzoni at bootlin.com Wed Feb 8 12:23:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:23:49 +0100 Subject: [Buildroot] [git commit] package/zxing-cpp: bump to version 1.4.0 Message-ID: <20230208122444.1E74484636@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=456a7398316655ad0b669635f580e4887c24a700 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches which are no longer required. Verified license remains Apache-2.0 after hash change. Rework config options for 1.4.0. Add new host-pkgconf and stb build dependency. Drop optional libiconv dependency which is no longer used. Add optional python module support. Add optional qt5 support. Add optional opencv4 support. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...ke-libs-private-not-exported-to-the-users.patch | 43 ------------------- ...02-CMakeLists-txt-add-BUILD_OPENCV-option.patch | 39 ------------------ package/zxing-cpp/Config.in | 2 + package/zxing-cpp/zxing-cpp.hash | 4 +- package/zxing-cpp/zxing-cpp.mk | 48 +++++++++++++++++----- 5 files changed, 42 insertions(+), 94 deletions(-) diff --git a/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch b/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch deleted file mode 100644 index 90b2320384..0000000000 --- a/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9e5dfa57f3b998bc3049bfa893b20e81dea656df Mon Sep 17 00:00:00 2001 -From: Yuri -Date: Sat, 20 Apr 2019 07:28:26 -0700 -Subject: [PATCH] Link library with OpenCV, not only the executable, make libs - PRIVATE. - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/86] ---- - CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 738f4e1..efe3aee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,10 +60,12 @@ include_directories(core/src) - add_library(libzxing ${LIBZXING_FILES}) - set_target_properties(libzxing PROPERTIES PREFIX "") - -+set(libzxing_LIBS "") -+ - find_package(Iconv) - if(ICONV_FOUND) - include_directories(${ICONV_INCLUDE_DIR}) -- target_link_libraries(libzxing ${ICONV_LIBRARIES}) -+ set(libzxing_LIBS ${libzxing_LIBS} ${ICONV_LIBRARIES}) - else() - add_definitions(-DNO_ICONV=1) - endif() -@@ -75,9 +77,12 @@ if(OpenCV_FOUND) - "./opencv-cli/src/*.h" - ) - add_executable(zxing-cv ${OPENCV_ZXING_FILES}) -+ set(libzxing_LIBS ${libzxing_LIBS} ${OpenCV_LIBRARIES}) - target_link_libraries(zxing-cv libzxing ${OpenCV_LIBRARIES}) - endif() - -+target_link_libraries(libzxing PRIVATE ${libzxing_LIBS}) -+ - # Add cli executable. - file(GLOB_RECURSE ZXING_FILES - "./cli/src/*.cpp" diff --git a/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch b/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch deleted file mode 100644 index 31753d7c24..0000000000 --- a/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fe740316af970f57ec511cdeafb512510e4842a9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 9 Nov 2019 17:21:13 +0100 -Subject: [PATCH] CMakeLists.txt: add BUILD_OPENCV option - -Add BUILD_OPENCV option to allow the user to disable OpenCV. It is -especially useful as opencv library can be built without highgui support - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/90] ---- - CMakeLists.txt | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 738f4e1..12913cd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.0) - project(zxing) - - option(BUILD_TESTING "Enable generation of test targets" OFF) -+option(BUILD_OPENCV "Enable OpenCV classes and OpenCV cli executable" ON) - - set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH}) - -@@ -44,8 +45,10 @@ else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - --# OpenCV classes --find_package(OpenCV) -+if (BUILD_OPENCV) -+ # OpenCV classes -+ find_package(OpenCV) -+endif() - if(OpenCV_FOUND) - list(APPEND LIBZXING_FILES - opencv/src/zxing/MatSource.cpp diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index c1109219a0..6c17565d2a 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_ZXING_CPP bool "zxing-cpp" depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_STB + select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 help ZXing-cpp (pronounced "zebra crossing") is an open-source, multi-format 1D/2D barcode image processing library diff --git a/package/zxing-cpp/zxing-cpp.hash b/package/zxing-cpp/zxing-cpp.hash index cabe3e70d4..5457ede44a 100644 --- a/package/zxing-cpp/zxing-cpp.hash +++ b/package/zxing-cpp/zxing-cpp.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4c2b8601d0e3377143c1a0bbab220146af9fa5a5e29e8fbef42862fe3d38f8e6 zxing-cpp-e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10.tar.gz +sha256 126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862 zxing-cpp-1.4.0.tar.gz # License files -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 COPYING +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index e9c80b4453..1051376808 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -4,23 +4,51 @@ # ################################################################################ -ZXING_CPP_VERSION = e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10 -ZXING_CPP_SITE = $(call github,glassechidna,zxing-cpp,$(ZXING_CPP_VERSION)) +ZXING_CPP_VERSION = 1.4.0 +ZXING_CPP_SITE = $(call github,zxing-cpp,zxing-cpp,v$(ZXING_CPP_VERSION)) ZXING_CPP_LICENSE = Apache-2.0 -ZXING_CPP_LICENSE_FILES = COPYING +ZXING_CPP_LICENSE_FILES = LICENSE ZXING_CPP_INSTALL_STAGING = YES ZXING_CPP_SUPPORTS_IN_SOURCE_BUILD = NO -ZXING_CPP_CONF_OPTS = -DBUILD_TESTING=OFF +ZXING_CPP_DEPENDENCIES = host-pkgconf stb +ZXING_CPP_CONF_OPTS = \ + -DBUILD_READERS=ON \ + -DBUILD_WRITERS=ON \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_BLACKBOX_TESTS=OFF \ + -DBUILD_UNIT_TESTS=OFF \ + -DBUILD_DEPENDENCIES=LOCAL -ifeq ($(BR2_PACKAGE_LIBICONV),y) -ZXING_CPP_DEPENDENCIES += libiconv +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV4_LIB_HIGHGUI),y) +ifeq ($(BR2_PACKAGE_OPENCV3),y) +ZXING_CPP_DEPENDENCIES += opencv3 +endif +ifeq ($(BR2_PACKAGE_OPENCV4),y) +ZXING_CPP_DEPENDENCIES += opencv4 +endif +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_OpenCV=TRUE +else +ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV=TRUE endif -ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y) -ZXING_CPP_DEPENDENCIES += opencv3 -ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON +ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy) +ZXING_CPP_DEPENDENCIES += python3 python-pybind +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=ON +else +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF +endif + +ifeq ($(BR2_PACKAGE_QT5BASE),y) +ZXING_CPP_DEPENDENCIES += qt5base +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yy) +ZXING_CPP_DEPENDENCIES += qt5declarative qt5multimedia +endif +# Only set qt5 as required when all optional qt5 dependencies are present +ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yyy) +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_Qt5=TRUE +endif else -ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFF +ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE endif $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Wed Feb 8 12:27:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:27:53 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/zxing-cpp: bump to version 1.4.0 In-Reply-To: <20221114232254.3970611-1-james.hilliard1@gmail.com> References: <20221114232254.3970611-1-james.hilliard1@gmail.com> Message-ID: <20230208132753.7895f68f@windsurf> On Mon, 14 Nov 2022 16:22:53 -0700 James Hilliard wrote: > Drop patches which are no longer required. > > Verified license remains Apache-2.0 after hash change. > > Rework config options for 1.4.0. > > Add new host-pkgconf and stb build dependency. > > Drop optional libiconv dependency which is no longer used. > > Add optional python module support. > > Add optional qt5 support. > > Add optional opencv4 support. > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - fix makefile pybind check > - add comment for qt5 required config > --- > ...bs-private-not-exported-to-the-users.patch | 43 ----------------- > ...akeLists-txt-add-BUILD_OPENCV-option.patch | 39 --------------- > package/zxing-cpp/Config.in | 2 + > package/zxing-cpp/zxing-cpp.hash | 4 +- > package/zxing-cpp/zxing-cpp.mk | 48 +++++++++++++++---- > 5 files changed, 42 insertions(+), 94 deletions(-) > delete mode 100644 package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch > delete mode 100644 package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch Both applied to master, thanks! On the first patch, I have changed to disable building the examples, it doesn't seem to make much sense to enable examples by default. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 8 12:30:59 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 13:30:59 +0100 Subject: [Buildroot] [PATCH v2 07/14] utils/check-package: check all shell scripts In-Reply-To: <20220731193521.1217825-8-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-8-ricardo.martincoski@gmail.com> Message-ID: <76f90a9f-9899-fd78-3ae4-add859507b2c@mind.be> On 31/07/2022 21:35, Ricardo Martincoski wrote: > Currently only SysV init scripts are checked using shellcheck and a few > other rules (e.g. variable naming, file naming). > > Extend the check using shellcheck to all shell scripts in the tree. > This is actually limited to the list of directories that check-package > knows that can check, but that list can be expanded later. > > In order to apply the check to all shell scripts, use python3-magic to > determine the file type. Turns out there are (at least) two Python modules called "magic", and I happened to have the other one installed... So I adapted the code to support both. > Keep testing first for name pattern, and only in the case there is no > match, check the file type. This ensures, for instance, that SysV > init scripts follow specific rules. > > Apply these checks for shell scripts: > - shellcheck; > - trailing space; > - consecutive empty lines; > - empty last line on file; > - newline at end of file. > > Update the list of ignored warnings. > > Do not add unit tests since no function was added, they were just > reused. > But expand the runtime test for check-package using as fixture a file > that generates a shellcheck warning. > > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - do not mention docker image in the commit message > > NOTE to the maintainer applying this patch: please re-generate the list > of ignored warnings while applying: > $ utils/docker-run make .checkpackageignore Only one exception more than originally, so that's good I guess. Applied to master, thanks. Regards, Arnout > --- > .checkpackageignore | 20 +++++++++++++++++++ > .../utils/br2-external/utils/x-shellscript | 2 ++ > .../testing/tests/utils/test_check_package.py | 17 ++++++++++++++++ > utils/check-package | 13 +++++++++++- > utils/checkpackagelib/lib_shellscript.py | 5 +++++ > 5 files changed, 56 insertions(+), 1 deletion(-) > create mode 100755 support/testing/tests/utils/br2-external/utils/x-shellscript > create mode 100644 utils/checkpackagelib/lib_shellscript.py > > diff --git a/.checkpackageignore b/.checkpackageignore > index d8947e89fc..a527254464 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -16,11 +16,13 @@ package/busybox/S02sysctl Variables > package/busybox/S10mdev ConsecutiveEmptyLines Indent Shellcheck > package/busybox/S15watchdog Indent Variables > package/busybox/S50telnet Indent Shellcheck Variables > +package/busybox/udhcpc.script Shellcheck > package/c-icap/S96cicap Indent Shellcheck Variables > package/cfm/S65cfm Indent Variables > package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables > package/chrony/S49chrony Indent Shellcheck Variables > package/connman/S45connman Variables > +package/coremark-pro/coremark-pro.sh.in Shellcheck > package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob > package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob > package/curlftpfs/0003-nocache-memleak-fix.patch Sob > @@ -30,6 +32,7 @@ package/dbus/S30dbus Indent Shellcheck TrailingSpace Variables > package/dcron/S90dcron Variables > package/dhcp/S80dhcp-relay Shellcheck Variables > package/dhcp/S80dhcp-server Shellcheck Variables > +package/dhcp/dhclient-script Shellcheck TrailingSpace > package/dhcpcd/S41dhcpcd Indent Variables > package/dhrystone/0001-cmdline-nruns.patch Sob > package/dhrystone/0002-HZ.patch Sob > @@ -44,9 +47,11 @@ package/domoticz/S99domoticz Shellcheck > package/dropbear/S50dropbear Indent Shellcheck Variables > package/earlyoom/S02earlyoom Indent Shellcheck > package/ejabberd/S50ejabberd Indent Shellcheck Variables > +package/ejabberd/check-erlang-lib Shellcheck > package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables > package/exim/S86exim Indent Variables > package/fail2ban/S60fail2ban Shellcheck Variables > +package/fakedate/fakedate Shellcheck > package/fbv/0001-cross.patch Sob > package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob > package/fbv/0005-include.patch Sob > @@ -57,6 +62,7 @@ package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsaniti > package/genromfs/0001-build-system.patch Sob > package/gerbera/S99gerbera Indent > package/go/0002-cmd-dist-use-gohostarch-for-ssa-rewrite-check.patch Sob > +package/google-breakpad/gen-syms.sh Shellcheck > package/gpsd/S50gpsd Indent Shellcheck Variables > package/haveged/S21haveged Shellcheck Variables > package/htpdate/S43htpdate Shellcheck > @@ -64,8 +70,12 @@ package/i2pd/S99i2pd Indent Shellcheck Variables > package/ifplugd/0001-cross.patch Sob > package/ifplugd/0002-fix-headers.patch Sob > package/ifupdown-scripts/S40network EmptyLastLine Indent Shellcheck Variables > +package/ifupdown-scripts/network/if-pre-up.d/wait_iface EmptyLastLine Shellcheck > +package/ifupdown-scripts/nfs_check Shellcheck > package/igd2-for-linux/S99upnpd Indent Shellcheck Variables > package/inadyn/S70inadyn Indent NotExecutable > +package/initscripts/init.d/rcK ConsecutiveEmptyLines EmptyLastLine Shellcheck > +package/initscripts/init.d/rcS ConsecutiveEmptyLines EmptyLastLine Shellcheck > package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Variables > package/iptables/S35iptables Shellcheck > package/irda-utils/0001-daemon.patch Sob > @@ -95,6 +105,7 @@ package/lldpd/S60lldpd Indent Shellcheck Variables > package/lockfile-progs/0001-sus3v-legacy.patch Sob > package/madplay/0001-switch-to-new-alsa-api.patch Sob > package/mariadb/S97mysqld Indent Shellcheck Variables > +package/matchbox-keyboard/mb-applet-kbd-wrapper.sh Shellcheck TrailingSpace > package/mender-connect/S43mender-connect Shellcheck > package/mii-diag/0001-strchr.patch Sob > package/minidlna/S60minidlnad Indent Shellcheck Variables > @@ -112,6 +123,7 @@ package/netcat/0001-signed-bit-counting.patch Sob > package/netopeer2/S52netopeer2 Shellcheck Variables > package/netplug/0001-makefile-flags.patch Sob > package/netplug/S29netplug Indent Shellcheck Variables > +package/netplug/netplug-script ConsecutiveEmptyLines Shellcheck > package/netsnmp/S59snmpd Indent Shellcheck Variables > package/network-manager/S45network-manager ConsecutiveEmptyLines EmptyLastLine Shellcheck Variables > package/nfs-utils/S60nfs ConsecutiveEmptyLines Shellcheck Variables > @@ -123,12 +135,14 @@ package/ofono/S46ofono Variables > package/olsr/S50olsr Indent Shellcheck Variables > package/openntpd/S49ntp Shellcheck Variables > package/openssh/S50sshd EmptyLastLine Indent Variables > +package/openvmtools/shutdown Shellcheck > package/openvpn/S60openvpn Indent Shellcheck Variables > package/optee-client/S30optee Indent Shellcheck Variables > package/oracle-mysql/S97mysqld Shellcheck Variables > package/owfs/S55owserver Shellcheck Variables > package/owfs/S60owfs Shellcheck Variables > package/pigpio/S50pigpio Shellcheck Variables > +package/pkgconf/pkg-config.in Shellcheck > package/polkit/S50polkit NotExecutable Shellcheck Variables > package/postgresql/S50postgresql Variables > package/procps-ng/S02sysctl Variables > @@ -161,11 +175,14 @@ package/sslh/S35sslh Indent Shellcheck Variables > package/stunnel/S50stunnel Indent Shellcheck Variables > package/supervisor/S99supervisord Variables > package/suricata/S99suricata Shellcheck > +package/swupdate/swupdate.sh Shellcheck > package/sysrepo/S51sysrepo-plugind Indent Shellcheck > +package/systemd/fakeroot_tmpfiles.sh Shellcheck > package/targetcli-fb/S50target Shellcheck Variables > package/tcf-agent/S55tcf-agent Shellcheck Variables > package/tftpd/S80tftpd-hpa Indent Shellcheck Variables > package/ti-gfx/S80ti-gfx Shellcheck Variables > +package/ti-gfx/esrev.sh Shellcheck > package/ti-sgx-um/S80ti-sgx Variables > package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables > package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables > @@ -176,10 +193,13 @@ package/unscd/S46unscd Indent Shellcheck Variables > package/upmpdcli/S99upmpdcli Indent Shellcheck Variables > package/urandom-scripts/S20urandom Variables > package/usbguard/S20usbguard Indent Shellcheck Variables > +package/vala/vala-wrapper Shellcheck > package/vsftpd/S70vsftpd Indent Shellcheck Variables > package/watchdogd/S01watchdogd Indent NotExecutable > +package/wpa_supplicant/ifupdown.sh Shellcheck > package/x11r7/xapp_xdm/S99xdm Indent Variables > package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob > package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob > package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob > package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables > +package/xl2tp/xl2tpd TrailingSpace > diff --git a/support/testing/tests/utils/br2-external/utils/x-shellscript b/support/testing/tests/utils/br2-external/utils/x-shellscript > new file mode 100755 > index 0000000000..a7de4124bd > --- /dev/null > +++ b/support/testing/tests/utils/br2-external/utils/x-shellscript > @@ -0,0 +1,2 @@ > +#!/bin/bash > +unused="text" > diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py > index f21b9e939f..aeda0857e3 100644 > --- a/support/testing/tests/utils/test_check_package.py > +++ b/support/testing/tests/utils/test_check_package.py > @@ -232,3 +232,20 @@ class TestCheckPackage(unittest.TestCase): > .format(subdir_file), w) > self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update .checkpackageignore?" > .format(subdir_file), w) > + > + # shell scripts are tested using shellcheck > + rel_file = "utils/x-shellscript" > + abs_path = infra.filepath("tests/utils/br2-external") > + abs_file = os.path.join(abs_path, rel_file) > + > + w, m = call_script(["check-package", "-b", rel_file], > + self.WITH_UTILS_IN_PATH, abs_path) > + self.assert_file_was_processed(m) > + self.assert_warnings_generated_for_file(m) > + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(rel_file), w) > + > + w, m = call_script(["check-package", "-b", abs_file], > + self.WITH_UTILS_IN_PATH, infra.basepath()) > + self.assert_file_was_processed(m) > + self.assert_warnings_generated_for_file(m) > + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(abs_file), w) > diff --git a/utils/check-package b/utils/check-package > index d896e8b117..732f1cf112 100755 > --- a/utils/check-package > +++ b/utils/check-package > @@ -3,6 +3,7 @@ > > import argparse > import inspect > +import magic > import os > import re > import six > @@ -13,6 +14,7 @@ import checkpackagelib.lib_config > import checkpackagelib.lib_hash > import checkpackagelib.lib_mk > import checkpackagelib.lib_patch > +import checkpackagelib.lib_shellscript > import checkpackagelib.lib_sysv > > IGNORE_FILENAME = ".checkpackageignore" > @@ -86,6 +88,15 @@ def parse_args(): > return flags > > > +def get_lib_from_filetype(fname): > + if not os.path.isfile(fname): > + return None > + filetype = magic.from_file(fname, mime=True) > + if filetype == "text/x-shellscript": > + return checkpackagelib.lib_shellscript > + return None > + > + > CONFIG_IN_FILENAME = re.compile(r"Config\.\S*$") > DO_CHECK_INTREE = re.compile(r"|".join([ > r"Config.in", > @@ -129,7 +140,7 @@ def get_lib_from_filename(fname): > return checkpackagelib.lib_patch > if SYSV_INIT_SCRIPT_FILENAME.search(fname): > return checkpackagelib.lib_sysv > - return None > + return get_lib_from_filetype(fname) > > > def common_inspect_rules(m): > diff --git a/utils/checkpackagelib/lib_shellscript.py b/utils/checkpackagelib/lib_shellscript.py > new file mode 100644 > index 0000000000..9b4f4aed58 > --- /dev/null > +++ b/utils/checkpackagelib/lib_shellscript.py > @@ -0,0 +1,5 @@ > +from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 > +from checkpackagelib.lib import EmptyLastLine # noqa: F401 > +from checkpackagelib.lib import NewlineAtEof # noqa: F401 > +from checkpackagelib.lib import TrailingSpace # noqa: F401 > +from checkpackagelib.tool import Shellcheck # noqa: F401 From arnout at mind.be Wed Feb 8 12:31:04 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 13:31:04 +0100 Subject: [Buildroot] [git commit] .checkpackageignore: remove package/urandom-scripts/S20urandom Message-ID: <20230208123124.47B868465B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30624cf777b84ead9c788cee911fb1c387d358fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 4a6f9d2516820c296a8af788b259ca96926cd60d removed package/urandom-scripts/S20urandom but didn't remove it from .checkpackageignore. Do so now. The commit actually renamed it to S20seedrng, but it also fixed the Variables errors so it no longer needs to be ignored. Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index b1f2d99b99..c4d07c1d7d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -169,7 +169,6 @@ package/tvheadend/S99tvheadend Indent Shellcheck Variables package/unbound/S70unbound Shellcheck package/unscd/S46unscd Indent Shellcheck Variables package/upmpdcli/S99upmpdcli Indent Shellcheck Variables -package/urandom-scripts/S20urandom Variables package/usbguard/S20usbguard Indent Shellcheck Variables package/vsftpd/S70vsftpd Indent Shellcheck Variables package/watchdogd/S01watchdogd Indent NotExecutable From arnout at mind.be Wed Feb 8 12:31:06 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 13:31:06 +0100 Subject: [Buildroot] [git commit] utils/check-package: check all shell scripts Message-ID: <20230208123124.54BB28465D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5a3dfb9a4a6550b9097b22b1c96a99f90880a64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently only SysV init scripts are checked using shellcheck and a few other rules (e.g. variable naming, file naming). Extend the check using shellcheck to all shell scripts in the tree. This is actually limited to the list of directories that check-package knows that can check, but that list can be expanded later. In order to apply the check to all shell scripts, use python3-magic to determine the file type. Unfortunately, there are two different python modules called "magic". Support both by detecting which one is installed and defining get_filetype accordingly. Keep testing first for name pattern, and only in the case there is no match, check the file type. This ensures, for instance, that SysV init scripts follow specific rules. Apply these checks for shell scripts: - shellcheck; - trailing space; - consecutive empty lines; - empty last line on file; - newline at end of file. Update the list of ignored warnings. Do not add unit tests since no function was added, they were just reused. But expand the runtime test for check-package using as fixture a file that generates a shellcheck warning. Signed-off-by: Ricardo Martincoski [Arnout: support both variants of the "magic" module] Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 21 ++++++++++++++++ .../tests/utils/br2-external/utils/x-shellscript | 2 ++ support/testing/tests/utils/test_check_package.py | 17 +++++++++++++ utils/check-package | 28 +++++++++++++++++++++- utils/checkpackagelib/lib_shellscript.py | 5 ++++ 5 files changed, 72 insertions(+), 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index c4d07c1d7d..405e1c5677 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -16,11 +16,13 @@ package/busybox/S02sysctl Variables package/busybox/S10mdev ConsecutiveEmptyLines Indent Shellcheck package/busybox/S15watchdog Indent Variables package/busybox/S50telnet Indent Shellcheck Variables +package/busybox/udhcpc.script Shellcheck package/c-icap/S96cicap Indent Shellcheck Variables package/cfm/S65cfm Indent Variables package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables package/chrony/S49chrony Indent Shellcheck Variables package/connman/S45connman Variables +package/coremark-pro/coremark-pro.sh.in Shellcheck package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob package/curlftpfs/0003-nocache-memleak-fix.patch Sob @@ -30,6 +32,7 @@ package/dbus/S30dbus Indent Shellcheck TrailingSpace Variables package/dcron/S90dcron Variables package/dhcp/S80dhcp-relay Shellcheck Variables package/dhcp/S80dhcp-server Shellcheck Variables +package/dhcp/dhclient-script Shellcheck TrailingSpace package/dhcpcd/S41dhcpcd Indent Variables package/dhrystone/0001-cmdline-nruns.patch Sob package/dhrystone/0002-HZ.patch Sob @@ -41,12 +44,15 @@ package/dmraid/S20dmraid Variables package/dnsmasq/S80dnsmasq Shellcheck Variables package/docker-engine/S60dockerd Indent Shellcheck Variables package/domoticz/S99domoticz Shellcheck +package/dracut/merged-usr-module-setup.sh Shellcheck package/dropbear/S50dropbear Indent Shellcheck Variables package/earlyoom/S02earlyoom Indent Shellcheck package/ejabberd/S50ejabberd Indent Shellcheck Variables +package/ejabberd/check-erlang-lib Shellcheck package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables package/exim/S86exim Indent Variables package/fail2ban/S60fail2ban Shellcheck Variables +package/fakedate/fakedate Shellcheck package/fbv/0001-cross.patch Sob package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob package/fbv/0005-include.patch Sob @@ -56,6 +62,7 @@ package/gamin/0002-no-const-return.patch Sob package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch Sob package/genromfs/0001-build-system.patch Sob package/gerbera/S99gerbera Indent +package/google-breakpad/gen-syms.sh Shellcheck package/gpsd/S50gpsd Indent Shellcheck Variables package/haveged/S21haveged Shellcheck Variables package/htpdate/S43htpdate Shellcheck @@ -63,8 +70,12 @@ package/i2pd/S99i2pd Indent Shellcheck Variables package/ifplugd/0001-cross.patch Sob package/ifplugd/0002-fix-headers.patch Sob package/ifupdown-scripts/S40network EmptyLastLine Indent Shellcheck Variables +package/ifupdown-scripts/network/if-pre-up.d/wait_iface EmptyLastLine Shellcheck +package/ifupdown-scripts/nfs_check Shellcheck package/igd2-for-linux/S99upnpd Indent Shellcheck Variables package/inadyn/S70inadyn Indent NotExecutable +package/initscripts/init.d/rcK ConsecutiveEmptyLines EmptyLastLine Shellcheck +package/initscripts/init.d/rcS ConsecutiveEmptyLines EmptyLastLine Shellcheck package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Variables package/iptables/S35iptables Shellcheck package/irda-utils/0001-daemon.patch Sob @@ -94,6 +105,7 @@ package/lldpd/S60lldpd Indent Shellcheck Variables package/lockfile-progs/0001-sus3v-legacy.patch Sob package/madplay/0001-switch-to-new-alsa-api.patch Sob package/mariadb/S97mysqld Indent Shellcheck Variables +package/matchbox-keyboard/mb-applet-kbd-wrapper.sh Shellcheck TrailingSpace package/mender-connect/S43mender-connect Shellcheck package/mii-diag/0001-strchr.patch Sob package/minidlna/S60minidlnad Indent Shellcheck Variables @@ -111,6 +123,7 @@ package/netcat/0001-signed-bit-counting.patch Sob package/netopeer2/S52netopeer2 Shellcheck Variables package/netplug/0001-makefile-flags.patch Sob package/netplug/S29netplug Indent Shellcheck Variables +package/netplug/netplug-script ConsecutiveEmptyLines Shellcheck package/netsnmp/S59snmpd Indent Shellcheck Variables package/network-manager/S45network-manager ConsecutiveEmptyLines EmptyLastLine Shellcheck Variables package/nfs-utils/S60nfs ConsecutiveEmptyLines Shellcheck Variables @@ -122,11 +135,13 @@ package/ofono/S46ofono Variables package/olsr/S50olsr Indent Shellcheck Variables package/openntpd/S49ntp Shellcheck Variables package/openssh/S50sshd EmptyLastLine Indent Variables +package/openvmtools/shutdown Shellcheck package/openvpn/S60openvpn Indent Shellcheck Variables package/oracle-mysql/S97mysqld Shellcheck Variables package/owfs/S55owserver Shellcheck Variables package/owfs/S60owfs Shellcheck Variables package/pigpio/S50pigpio Shellcheck Variables +package/pkgconf/pkg-config.in Shellcheck package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob package/postgresql/S50postgresql Variables package/procps-ng/S02sysctl Variables @@ -147,6 +162,7 @@ package/samba4/S91smb Indent Shellcheck Variables package/seatd/S70seatd NotExecutable Variables package/ser2net/S50ser2net Indent Shellcheck Variables package/shairport-sync/S99shairport-sync Indent Shellcheck Variables +package/skeleton-init-systemd/fakeroot_tmpfiles.sh Shellcheck package/smcroute/S41smcroute Indent NotExecutable Variables package/smstools3/S50smsd Shellcheck Variables package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch Sob @@ -156,11 +172,13 @@ package/sslh/S35sslh Indent Shellcheck Variables package/stunnel/S50stunnel Indent Shellcheck Variables package/supervisor/S99supervisord Variables package/suricata/S99suricata Shellcheck +package/swupdate/swupdate.sh Shellcheck package/sysrepo/S51sysrepo-plugind Indent Shellcheck package/targetcli-fb/S50target Shellcheck Variables package/tcf-agent/S55tcf-agent Shellcheck Variables package/tftpd/S80tftpd-hpa Indent Shellcheck Variables package/ti-gfx/S80ti-gfx Shellcheck Variables +package/ti-gfx/esrev.sh Shellcheck package/ti-sgx-um/S80ti-sgx Variables package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables @@ -170,10 +188,13 @@ package/unbound/S70unbound Shellcheck package/unscd/S46unscd Indent Shellcheck Variables package/upmpdcli/S99upmpdcli Indent Shellcheck Variables package/usbguard/S20usbguard Indent Shellcheck Variables +package/vala/vala-wrapper Shellcheck package/vsftpd/S70vsftpd Indent Shellcheck Variables package/watchdogd/S01watchdogd Indent NotExecutable +package/wpa_supplicant/ifupdown.sh Shellcheck package/x11r7/xapp_xdm/S99xdm Indent Variables package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables +package/xl2tp/xl2tpd TrailingSpace diff --git a/support/testing/tests/utils/br2-external/utils/x-shellscript b/support/testing/tests/utils/br2-external/utils/x-shellscript new file mode 100755 index 0000000000..a7de4124bd --- /dev/null +++ b/support/testing/tests/utils/br2-external/utils/x-shellscript @@ -0,0 +1,2 @@ +#!/bin/bash +unused="text" diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index 580ad56d42..d2c1556845 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -233,3 +233,20 @@ class TestCheckPackage(unittest.TestCase): self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update " ".checkpackageignore_outdated?" .format(subdir_file), w) + + # shell scripts are tested using shellcheck + rel_file = "utils/x-shellscript" + abs_path = infra.filepath("tests/utils/br2-external") + abs_file = os.path.join(abs_path, rel_file) + + w, m = call_script(["check-package", "-b", rel_file], + self.WITH_UTILS_IN_PATH, abs_path) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(rel_file), w) + + w, m = call_script(["check-package", "-b", abs_file], + self.WITH_UTILS_IN_PATH, infra.basepath()) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(abs_file), w) diff --git a/utils/check-package b/utils/check-package index 848311bac8..12009b2476 100755 --- a/utils/check-package +++ b/utils/check-package @@ -3,6 +3,7 @@ import argparse import inspect +import magic import os import re import six @@ -13,11 +14,27 @@ import checkpackagelib.lib_config import checkpackagelib.lib_hash import checkpackagelib.lib_mk import checkpackagelib.lib_patch +import checkpackagelib.lib_shellscript import checkpackagelib.lib_sysv VERBOSE_LEVEL_TO_SHOW_IGNORED_FILES = 3 flags = None # Command line arguments. +# There are two Python packages called 'magic': +# https://pypi.org/project/file-magic/ +# https://pypi.org/project/python-magic/ +# Both allow to return a MIME file type, but with a slightly different +# interface. Detect which one of the two we have based on one of the +# attributes. +if hasattr(magic, 'FileMagic'): + # https://pypi.org/project/file-magic/ + def get_filetype(fname): + return magic.detect_from_filename(fname).mime_type +else: + # https://pypi.org/project/python-magic/ + def get_filetype(fname): + return magic.from_file(fname, mime=True) + def get_ignored_parsers_per_file(intree_only, ignore_filename): ignored = dict() @@ -77,6 +94,15 @@ def parse_args(): return flags +def get_lib_from_filetype(fname): + if not os.path.isfile(fname): + return None + filetype = get_filetype(fname) + if filetype == "text/x-shellscript": + return checkpackagelib.lib_shellscript + return None + + CONFIG_IN_FILENAME = re.compile(r"Config\.\S*$") DO_CHECK_INTREE = re.compile(r"|".join([ r"Config.in", @@ -120,7 +146,7 @@ def get_lib_from_filename(fname): return checkpackagelib.lib_patch if SYSV_INIT_SCRIPT_FILENAME.search(fname): return checkpackagelib.lib_sysv - return None + return get_lib_from_filetype(fname) def common_inspect_rules(m): diff --git a/utils/checkpackagelib/lib_shellscript.py b/utils/checkpackagelib/lib_shellscript.py new file mode 100644 index 0000000000..9b4f4aed58 --- /dev/null +++ b/utils/checkpackagelib/lib_shellscript.py @@ -0,0 +1,5 @@ +from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 +from checkpackagelib.lib import EmptyLastLine # noqa: F401 +from checkpackagelib.lib import NewlineAtEof # noqa: F401 +from checkpackagelib.lib import TrailingSpace # noqa: F401 +from checkpackagelib.tool import Shellcheck # noqa: F401 From thomas.petazzoni at bootlin.com Wed Feb 8 12:43:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:43:19 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6base: use DESTDIR instead of --prefix for installation Message-ID: <20230208124458.AD52884680@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfb5035c6fae1285ff0100275083fabc2b9816c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Even though it works, overriding --prefix at installation time is a bit weird. In order to be more consistent with what is done with other build systems, use DESTDIR instead at installation time. Note that $(DESTDIR) comes in addition to the -DCMAKE_INSTALL_PREFIX=/usr that is passed at configure time, so with this commit, the files continue to be installed in $(STAGING_DIR)/usr and $(TARGET_DIR)/usr as they should be. Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 7b57eba4ab..212b2d689e 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -79,11 +79,11 @@ define QT6BASE_BUILD_CMDS endef define QT6BASE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) --prefix $(STAGING_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) endef define QT6BASE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) --prefix $(TARGET_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) endef HOST_QT6BASE_DEPENDENCIES = \ From thomas.petazzoni at bootlin.com Wed Feb 8 12:52:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:52:39 +0100 Subject: [Buildroot] [git commit] package/qt6: bump version to 6.4.2 Message-ID: <20230208125347.33FBA84689@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74686296a4a20438f1e94e22a5a3372df2e830cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1] and [2]. [1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.1/release-note.md [2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.2/release-note.md Signed-off-by: Peter Seiderer Tested-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6.mk | 2 +- package/qt6/qt6base/qt6base.hash | 4 ++-- package/qt6/qt6serialport/qt6serialport.hash | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 575b2f826c..431bb8c9d3 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -5,7 +5,7 @@ ################################################################################ QT6_VERSION_MAJOR = 6.4 -QT6_VERSION = $(QT6_VERSION_MAJOR).0 +QT6_VERSION = $(QT6_VERSION_MAJOR).2 QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index fedbbba79f..63af373836 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtbase-everywhere-src-6.4.0.tar.xz.sha256 -sha256 cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d qtbase-everywhere-src-6.4.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 +sha256 a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d qtbase-everywhere-src-6.4.2.tar.xz # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash index 54a45681fa..1eaa3d6150 100644 --- a/package/qt6/qt6serialport/qt6serialport.hash +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtserialport-everywhere-src-6.4.0.tar.xz.sha256 -sha256 f148cc9e87ce2228e82bff7a64d9521339ece66c4c66aa43b91bac614f4a4483 qtserialport-everywhere-src-6.4.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialport-everywhere-src-6.4.2.tar.xz.sha256 +sha256 336d95919037800184b3c3de8ccb6f62954b20f3756c05adce8d5010504340fa qtserialport-everywhere-src-6.4.2.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt From thomas.petazzoni at bootlin.com Wed Feb 8 12:54:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:54:03 +0100 Subject: [Buildroot] [PATCH v1] package/qt6: bump version to 6.4.2 In-Reply-To: <20230107153156.26347-1-ps.report@gmx.net> References: <20230107153156.26347-1-ps.report@gmx.net> Message-ID: <20230208135403.1a419032@windsurf> On Sat, 7 Jan 2023 16:31:56 +0100 Peter Seiderer wrote: > For details see [1] and [2]. > > [1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.1/release-note.md > [2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.2/release-note.md > > Signed-off-by: Peter Seiderer > --- > package/qt6/qt6.mk | 2 +- > package/qt6/qt6base/qt6base.hash | 4 ++-- > package/qt6/qt6serialport/qt6serialport.hash | 4 ++-- > 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 Wed Feb 8 13:00:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 14:00:10 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6serialbus: new package Message-ID: <20230208133422.256088469A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e447f56408f9308cc0e527f97dcc1844f2d6c850 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 1 + package/qt6/qt6serialbus/Config.in | 15 ++++++++++ package/qt6/qt6serialbus/qt6serialbus.hash | 11 ++++++++ package/qt6/qt6serialbus/qt6serialbus.mk | 45 ++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 831ae72c3c..655fa8392a 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -44,6 +44,7 @@ menuconfig BR2_PACKAGE_QT6 if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" endif diff --git a/package/qt6/qt6serialbus/Config.in b/package/qt6/qt6serialbus/Config.in new file mode 100644 index 0000000000..1f24310e61 --- /dev/null +++ b/package/qt6/qt6serialbus/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_QT6SERIALBUS + bool "qt6serialbus" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD + select BR2_PACKAGE_QT6SERIALPORT + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6serialbus module. + + https://doc.qt.io/qt-6/qtserialbus-index.html + +comment "qt6serialbus needs headers >= 3.6" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash new file mode 100644 index 0000000000..be01f13363 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialbus-everywhere-src-6.4.2.tar.xz.sha256 +sha256 604013657c7327899aa50748deb4bcb5e545ab37ff4964795b9e6f617d48bf1b qtserialbus-everywhere-src-6.4.2.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.mk b/package/qt6/qt6serialbus/qt6serialbus.mk new file mode 100644 index 0000000000..0717736387 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qt6serialbus +# +################################################################################ + +QT6SERIALBUS_VERSION = $(QT6_VERSION) +QT6SERIALBUS_SITE = $(QT6_SITE) +QT6SERIALBUS_SOURCE = qtserialbus-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALBUS_VERSION).tar.xz +QT6SERIALBUS_INSTALL_STAGING = YES +QT6SERIALBUS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SERIALBUS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6SERIALBUS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6SERIALBUS_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SERIALBUS_DEPENDENCIES = \ + qt6serialport + +define QT6SERIALBUS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) +endef + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Wed Feb 8 13:34:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 14:34:51 +0100 Subject: [Buildroot] [PATCH v3] package/qt6/qt6serialbus: new package In-Reply-To: <20230206133836.412572-1-angelo@amarulasolutions.com> References: <20230206133836.412572-1-angelo@amarulasolutions.com> Message-ID: <20230208143451.5700d209@windsurf> On Mon, 6 Feb 2023 14:38:36 +0100 Angelo Compagnucci wrote: > From: Jesse Van Gavere > > Signed-off-by: Jesse Van Gavere > Signed-off-by: Angelo Compagnucci > --- > v2: > * LICENSE/LICENSE_FILES: one per line > * Selecting BR2_PACKAGE_QT6BASE_NETWORK to make the package compile, > fixes: "Failed to find required Qt component "Network". > v3: > * Bumped to version 6.4.2 I changed the installation commands to use DESTDIR= instead of --prefix, like has been done for qt6base, and applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 13:35:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 14:35:21 +0100 Subject: [Buildroot] [git commit] package/qt6/qt6serialport: use DESTDIR instead of --prefix for installation Message-ID: <20230208133555.1DABF846A1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d8e207e7aaf035f48252e19013b610893d2fce0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Even though it works, overriding --prefix at installation time is a bit weird. In order to be more consistent with what is done with other build systems, use DESTDIR instead at installation time. Note that $(DESTDIR) comes in addition to the -DCMAKE_INSTALL_PREFIX=/usr that is passed at configure time, so with this commit, the files continue to be installed in $(STAGING_DIR)/usr and $(TARGET_DIR)/usr as they should be. Signed-off-by: Thomas Petazzoni --- package/qt6/qt6serialport/qt6serialport.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt6/qt6serialport/qt6serialport.mk b/package/qt6/qt6serialport/qt6serialport.mk index 9656e97c96..497719d4ec 100644 --- a/package/qt6/qt6serialport/qt6serialport.mk +++ b/package/qt6/qt6serialport/qt6serialport.mk @@ -41,11 +41,11 @@ define QT6SERIALPORT_BUILD_CMDS endef define QT6SERIALPORT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) --prefix $(STAGING_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) endef define QT6SERIALPORT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) --prefix $(TARGET_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) endef $(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 8 13:43:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 14:43:40 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/sway: new package In-Reply-To: <20221031124625.21172-1-raphael.pavlidis@gmail.com> (Raphael Pavlidis's message of "Mon, 31 Oct 2022 13:46:25 +0100") References: <20221031124625.21172-1-raphael.pavlidis@gmail.com> Message-ID: <87h6vw5l2r.fsf@dell.be.48ers.dk> >>>>> "Raphael" == Raphael Pavlidis writes: > i3-compatible Wayland compositor > This Wayland compositor can be used as a kiosk compositor like cage, but > with the advantage of better configuration of multiple monitor and > windows. For example, move a window by title to the output X or set the > resolution of Y to Z. > Signed-off-by: Raphael Pavlidis > --- > DEVELOPERS | 3 ++- > package/Config.in | 1 + > package/sway/Config.in | 42 ++++++++++++++++++++++++++++++++++++++++++ > package/sway/sway.hash | 3 +++ > package/sway/sway.mk | 36 ++++++++++++++++++++++++++++++++++++ > 5 files changed, 84 insertions(+), 1 deletion(-) > create mode 100644 package/sway/Config.in > create mode 100644 package/sway/sway.hash > create mode 100644 package/sway/sway.mk > +++ b/package/sway/Config.in > @@ -0,0 +1,42 @@ > +config BR2_PACKAGE_SWAY > + bool "sway" > + depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider > + depends on !BR2_STATIC_LIBS # wlroots > + depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots > + depends on BR2_PACKAGE_HAS_LIBEGL # wlroots > + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots > + depends on BR2_PACKAGE_HAS_LIBGLES # wlroots > + depends on BR2_PACKAGE_HAS_UDEV # wlroots > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c > + depends on BR2_USE_WCHAR # pango > + depends on BR2_TOOLCHAIN_HAS_THREADS # pango > + depends on BR2_USE_MMU # pango > + depends on BR2_INSTALL_LIBSTDCPP # pango > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango > + select BR2_PACKAGE_WLROOTS > + select BR2_PACKAGE_JSON_C > + select BR2_PACKAGE_PCRE > + select BR2_PACKAGE_CAIRO > + select BR2_PACKAGE_CAIRO_PNG > + select BR2_PACKAGE_PANGO > + help > + i3-compatible Wayland compositor > + > + https://github.com/swaywm/sway > + > +comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" > + depends on !BR2_PACKAGE_SYSTEMD || \ > + !BR2_PACKAGE_HAS_UDEV || \ > + !BR2_PACKAGE_HAS_LIBEGL || \ > + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ > + !BR2_PACKAGE_HAS_LIBGLES NIT: You have a number of trailing spaces here. > +++ b/package/sway/sway.mk > @@ -0,0 +1,36 @@ > +################################################################################ > +# > +# sway > +# > +################################################################################ > + > +SWAY_VERSION = 1.7 > +SWAY_SITE = $(call github,swaywm,sway,v$(SWAY_VERSION)) > +SWAY_LICENSE = MIT > +SWAY_LICENSE_FILES = LICENSE > +SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango > +SWAY_CONF_OPTS = \ > + -Dwerror=false \ > + -Ddefault-wallpaper=false \ > + -Dzsh-completions=false \ > + -Dbash-completions=false \ > + -Dfish-completions=false \ > + -Dswaybar=false \ > + -Dswaynag=false \ > + -Dtray=disabled \ > + -Dman-pages=disabled \ > + -Dsd-bus-provider=libsystemd > + > +ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) > +SWAY_CONF_OPTS += -Dxwayland=enabled How did you test this? Here wlroots with x11 support doesn't build as we don't have an Xwayland .pc file or binary in Buildroot. > +else > +SWAY_CONF_OPTS += -Dxwayland=disabled > +endif > + > +ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y) > +SWAY_CONF_OPTS += -Dgdk-pixbuf=enabled You also need to ensure that sway is built after gdk-pixbuf with: SWAY_DEPENDENCIES += gdk-pixbuf Committed with that fixed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Wed Feb 8 13:46:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 14:46:39 +0100 Subject: [Buildroot] [PATCH 1/1] board/raspberrypi4: bump kernel version to 5.15.68 In-Reply-To: <20220926051956.3272067-1-buildroot@athaariq.my.id> References: <20220926051956.3272067-1-buildroot@athaariq.my.id> Message-ID: <20230208144639.764af681@windsurf> Hello Athaariq, On Mon, 26 Sep 2022 05:20:15 +0000 (UTC) Athaariq Ardhiansyah wrote: > First of all, kernel support for Raspberry Pi is way too old relative to stable version. Second, we actually have several bug fixes regarding the kernel including HDMI hotplug and more problems on graphic stacks. However, I only have Raspberry Pi 4B so I cannot test the changes for other Raspberry Pi models. For anyone who has those boards, please help us to bump and test the kernel. > > Signed-off-by: Athaariq Ardhiansyah Thanks for your patch. It would indeed be nice to update our RaspberryPi defconfigs, but there are a number of questions which need to be answered before we can apply your patch. First of all, a small detail: your commit log must be wrapped at ~80 columns. Also, it shouldn't use 1st person sentence "I only have". > diff --git a/board/raspberrypi/linux.fragment b/board/raspberrypi/linux.fragment > new file mode 100644 > index 0000000000..798b2e91da > --- /dev/null > +++ b/board/raspberrypi/linux.fragment > @@ -0,0 +1,7 @@ > +# Dynamic CPU Clock > +CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=n > +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > + > +# Fix Kernel Module won't Load > +CONFIG_MODULE_COMPRESS_XZ=n > +CONFIG_MODULE_COMPRESS_NONE=y Why is this Linux kernel configuration fragment needed? There is no explanation in your commit log. Changing the default CPU governor should not be needed, and the second chunk about kernel module compression is a bit strange and deserves some explanation. > diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig > index 5942f7c4e1..6d90a8f004 100644 > --- a/configs/raspberrypi4_64_defconfig > +++ b/configs/raspberrypi4_64_defconfig > @@ -6,13 +6,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_SYSTEM_DHCP="eth0" > > -# Linux headers same as kernel, a 5.10 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +# Linux headers same as kernel, a 5.15 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,155b736f0ff883415d374ba743473f5ef146814b)/linux-155b736f0ff883415d374ba743473f5ef146814b.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi4-64/linux.fragment" > > # Build the DTB from the kernel sources > BR2_LINUX_KERNEL_DTS_SUPPORT=y > @@ -23,6 +24,9 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4-64/config_4_64bit.txt" > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y Why is this being added? > # Required tools to create the SD image > BR2_PACKAGE_HOST_DOSFSTOOLS=y > diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig > index 4e5580c140..f0947c329c 100644 > --- a/configs/raspberrypi4_defconfig > +++ b/configs/raspberrypi4_defconfig > @@ -6,13 +6,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_SYSTEM_DHCP="eth0" > > -# Linux headers same as kernel, a 5.10 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +# Linux headers same as kernel, a 5.15 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,155b736f0ff883415d374ba743473f5ef146814b)/linux-155b736f0ff883415d374ba743473f5ef146814b.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi4/linux.fragment" > > # Build the DTB from the kernel sources > BR2_LINUX_KERNEL_DTS_SUPPORT=y > @@ -23,6 +24,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4/config_4.txt" > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y > +BR2_PACKAGE_RPI_USERLAND=y Why is rpi-userland being added here, and not to the other defconfig above? Also, you're updating rpi-firmware, rpi-userland and RaspberryPi defconfigs in the same commit. Is this because they need to be updated in sync? If that's the case, is there a potential problem if we update rpi-firmware/rpi-userland, but not the defconfigs for RaspberryPi 1/2/3 ? Thanks a lot for your feedback! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Wed Feb 8 13:51:20 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 14:51:20 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/nodejs: add patch to adjust default NodeJS search path In-Reply-To: <20220925192030.1648496-1-thomas.petazzoni@bootlin.com> References: <20220925192030.1648496-1-thomas.petazzoni@bootlin.com> Message-ID: Hello Thomas, Le 25/09/2022 ? 21:20, Thomas Petazzoni a ?crit?: > By default, NodeJS searches global modules in /usr/lib/node, but NPM > installs them in /usr/lib/node_modules/. Therefore by default, if one > installs modules with BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL, they are > not accessible by NodeJS, unless by passing a > NODE_PATH=/usr/lib/node_modules/ variable. Since this is not obvious, > and it's nicer when things work out of the box, we simply patch NodeJS > to look for modules at the right place. > > See > https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package > for some discussions on this topic. Note: The nodejs package has been update to 16.18.1 since your v2 of nodejs series. Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: Thomas Petazzoni > --- > Changes since v1: > - Search for both /usr/lib/node and /usr/lib/node_modules as suggested > by Yann > --- > ...ules-cjs-loader.js-adjust-default-pa.patch | 36 +++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch > > diff --git a/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch > new file mode 100644 > index 0000000000..5b93998e5e > --- /dev/null > +++ b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch > @@ -0,0 +1,36 @@ > +From a31425bdfcb5d695ab25c3d295898326784cffec Mon Sep 17 00:00:00 2001 > +From: Thomas Petazzoni > +Date: Sun, 25 Sep 2022 11:10:06 +0200 > +Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to > + search modules > + > +NPM installs modules in /usr/lib/node_modules/, but by default NodeJS > +searches for them only in /usr/lib/node/. We could also set the > +NODE_PATH environment variable, but it is more convienient to have > +NodeJS configured by default to find modules where they are installed. > + > +This issue is discussed at > +https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package. > + > +Signed-off-by: Thomas Petazzoni > +--- > + lib/internal/modules/cjs/loader.js | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js > +index f1971c40a4..5fe3884156 100644 > +--- a/lib/internal/modules/cjs/loader.js > ++++ b/lib/internal/modules/cjs/loader.js > +@@ -1261,7 +1261,8 @@ Module._initPaths = function() { > + path.resolve(process.execPath, '..') : > + path.resolve(process.execPath, '..', '..'); > + > +- const paths = [path.resolve(prefixDir, 'lib', 'node')]; > ++ const paths = [path.resolve(prefixDir, 'lib', 'node'), > ++ path.resolve(prefixDir, 'lib', 'node_modules')]; > + > + if (homeDir) { > + ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); > +-- > +2.37.3 > + From peter at korsgaard.com Wed Feb 8 13:54:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 14:54:06 +0100 Subject: [Buildroot] [PATCH 1/3] package/wlroots: bump to version 0.15.1 In-Reply-To: <20220422214919.367067-2-aperez@igalia.com> (Adrian Perez de Castro's message of "Sat, 23 Apr 2022 00:49:17 +0300") References: <20220422214919.367067-1-aperez@igalia.com> <20220422214919.367067-2-aperez@igalia.com> Message-ID: <877cws5kld.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > Update to version 0.15.1, and adapt to upstream changes: > - Adapted from the old -Dfoo-backend Meson option to the new -Dbackends > one, which is an array. The set of always enabled backends matches the > previous selection: drm+libinput always enabled, x11 only if selected. > - Removed the libpng and ffmpeg dependency, which are no longer needed > with examples disabled (which is always the case for Buildroot). > - Changed homepage and download site URLs to the FreeDesktop.org GitLab. > This release changes the API/ABI, and applications which use wlroots > must be adapted and rebuilt. Currently in Buildroot we have only the > cage compositor, to be updated in a follow-up patch. > Signed-off-by: Adrian Perez de Castro Old patch, but while testing the recently added sway package I notice that wlroots fails to build with X11 support: Found CMake: /usr/bin/cmake (3.18.4) Run-time dependency xwayland found: NO (tried pkgconfig and cmake) Program Xwayland found: NO How is this supposed to work? We don't have a Xwayland package in Buildroot, so no pkgconfig file. I see there is some fallback logic in wlroots to look for an Xwayland binary (on the host presumably), but that doesn't work for hosts without it and will again fail at runtime. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 8 13:55:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 14:55:31 +0100 Subject: [Buildroot] [git commit] package/sway: new package Message-ID: <20230208135551.450D1846C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b739d6bd98e8ee12ec2150563ef9cdef35d2ea35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master i3-compatible Wayland compositor This Wayland compositor can be used as a kiosk compositor like cage, but with the advantage of better configuration of multiple monitor and windows. For example, move a window by title to the output X or set the resolution of Y to Z. Signed-off-by: Raphael Pavlidis [Peter: Fix white space, add gdk-pixbuf to _DEPENDENCIES] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 ++- package/Config.in | 1 + package/sway/Config.in | 42 ++++++++++++++++++++++++++++++++++++++++++ package/sway/sway.hash | 3 +++ package/sway/sway.mk | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 2cb3361c83..0bb4db81bb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2507,8 +2507,9 @@ F: support/testing/tests/package/test_python_jmespath.py F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py -N: Raphael Pavlidis +N: Raphael Pavlidis F: package/slirp4netns/ +F: package/sway/ N: Refik Tuzakli F: package/freescale-imx/ diff --git a/package/Config.in b/package/Config.in index 06d0a05854..2adfcdbb1d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -327,6 +327,7 @@ comment "Graphic applications" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in" source "package/stellarium/Config.in" + source "package/sway/Config.in" source "package/tesseract-ocr/Config.in" source "package/tinifier/Config.in" diff --git a/package/sway/Config.in b/package/sway/Config.in new file mode 100644 index 0000000000..f8d073520f --- /dev/null +++ b/package/sway/Config.in @@ -0,0 +1,42 @@ +config BR2_PACKAGE_SWAY + bool "sway" + depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider + depends on !BR2_STATIC_LIBS # wlroots + depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots + depends on BR2_PACKAGE_HAS_LIBGLES # wlroots + depends on BR2_PACKAGE_HAS_UDEV # wlroots + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_USE_WCHAR # pango + depends on BR2_TOOLCHAIN_HAS_THREADS # pango + depends on BR2_USE_MMU # pango + depends on BR2_INSTALL_LIBSTDCPP # pango + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango + select BR2_PACKAGE_WLROOTS + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_PANGO + help + i3-compatible Wayland compositor + + https://github.com/swaywm/sway + +comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" + depends on !BR2_PACKAGE_SYSTEMD || \ + !BR2_PACKAGE_HAS_UDEV || \ + !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + !BR2_PACKAGE_HAS_LIBGLES + +comment "sway needs a toolchain w/ wchar, threads, C++, dynamic library, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_INSTALL_LIBSTDCPP || \ + BR2_STATIC_LIBS diff --git a/package/sway/sway.hash b/package/sway/sway.hash new file mode 100644 index 0000000000..6dfa71730f --- /dev/null +++ b/package/sway/sway.hash @@ -0,0 +1,3 @@ +# Locally computed, tarball verified with GPG signature +sha256 0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84 sway-1.7.tar.gz +sha256 bd35722bff46327f5eded1d211207277bbe043d2a22048b282c42ef801593b8b LICENSE diff --git a/package/sway/sway.mk b/package/sway/sway.mk new file mode 100644 index 0000000000..802371c827 --- /dev/null +++ b/package/sway/sway.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# sway +# +################################################################################ + +SWAY_VERSION = 1.7 +SWAY_SITE = $(call github,swaywm,sway,v$(SWAY_VERSION)) +SWAY_LICENSE = MIT +SWAY_LICENSE_FILES = LICENSE +SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango +SWAY_CONF_OPTS = \ + -Dwerror=false \ + -Ddefault-wallpaper=false \ + -Dzsh-completions=false \ + -Dbash-completions=false \ + -Dfish-completions=false \ + -Dswaybar=false \ + -Dswaynag=false \ + -Dtray=disabled \ + -Dman-pages=disabled \ + -Dsd-bus-provider=libsystemd + +ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) +SWAY_CONF_OPTS += -Dxwayland=enabled +else +SWAY_CONF_OPTS += -Dxwayland=disabled +endif + +ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y) +SWAY_CONF_OPTS += -Dgdk-pixbuf=enabled +SWAY_DEPENDENCIES += gdk-pixbuf +else +SWAY_CONF_OPTS += -Dgdk-pixbuf=disabled +endif + +$(eval $(meson-package)) From romain.naour at smile.fr Wed Feb 8 14:09:26 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 15:09:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/rust: fix boostrap build In-Reply-To: <20230208110551.187828-1-sebastian.weyer@smile.fr> References: <20230208110551.187828-1-sebastian.weyer@smile.fr> Message-ID: <08db6cfd-03eb-9515-87ea-17a114805fe2@smile.fr> Hello Sebastian, Le 08/02/2023 ? 12:05, Sebastian Weyer a ?crit?: > The update to v1.67.0 of rust broke the boostrap build. This patch > applies an upstream patch to fix this: > https://github.com/rust-lang/rust/commit/3fe64ebbce21e79adb64099984e96dfb79bdd0f9 > > Fixes: > http://autobuild.buildroot.org/results/214/214fcbb3458893784b7f85b60f7ee1edb428c77f/build-end.log Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: Sebastian Weyer > Cc: Eric Le Bihan > Cc: James Hilliard > --- > I previously just tested TestRustBin since TestRust takes forever. This > time I ran TestRust and it builds fine :) > --- > ...-unsoundness-in-bootstrap-cache-code.patch | 43 +++++++++++++++++++ > 1 file changed, 43 insertions(+) > create mode 100644 package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch > > diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch > new file mode 100644 > index 0000000000..3eae34642f > --- /dev/null > +++ b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch > @@ -0,0 +1,43 @@ > +From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 > +From: Michael Goulet > +Date: Mon, 12 Dec 2022 18:29:33 +0000 > +Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= > + =?UTF-8?q?ap=20cache=20code?= > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) > +Signed-off-by: Sebastian Weyer > +--- > + src/bootstrap/cache.rs | 8 ++++---- > + 1 file changed, 4 insertions(+), 4 deletions(-) > + > +diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs > +index be5c9bb0788..05f25af68ea 100644 > +--- a/src/bootstrap/cache.rs > ++++ b/src/bootstrap/cache.rs > +@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { > + > + impl Deref for Interned { > + type Target = T::Target; > +- fn deref(&self) -> &'static Self::Target { > ++ fn deref(&self) -> &Self::Target { > + let l = T::intern_cache().lock().unwrap(); > +- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } > ++ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } > + } > + } > + > + impl, U: ?Sized> AsRef for Interned { > +- fn as_ref(&self) -> &'static U { > ++ fn as_ref(&self) -> &U { > + let l = T::intern_cache().lock().unwrap(); > +- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } > ++ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } > + } > + } > + > +-- > +2.25.1 > + From thomas.petazzoni at bootlin.com Wed Feb 8 14:23:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 15:23:43 +0100 Subject: [Buildroot] Remove cairo dependency from gobject-introspection Message-ID: <20230208152343.20d46c7d@windsurf> Hello James, Here at the Buildroot Developers Meeting, we ended up looking at where util-linux-libs gets used, and we found out it's used in fontconfig. Since util-linux-libs was originally introduced to break a circular dependency involving systemd and util-linux, we found it strange that fontconfig was involved in that. Turns out that there is a possible circular dependency like this: util-linux -> udev -> systemd -> polkit -> gobject-introspection -> cairo -> fontconfig -> util-linux What is obviously strange in there is the dependency of gobject-introspection on cairo, which comes from: ifeq ($(BR2_PACKAGE_CAIRO),y) GOBJECT_INTROSPECTION_DEPENDENCIES += cairo GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=enabled else GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=disabled endif However, according to gobject-introspection's meson_options.txt: option('cairo', type: 'feature', value : 'auto', description: 'Use cairo for tests' ) it seems like cairo is only used for tests, which we really don't care about. If that's indeed true, do you think you could drop that optional dependency in gobject-instrospection, pass -Dcairo=disabled unconditionally, and cleanup fontconfig to not need util-linux-libs (see commit eb058222596d83bbdc96c80c5d0cdecb572a4ac3) ? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From vfazio at xes-inc.com Wed Feb 8 14:23:58 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Wed, 8 Feb 2023 08:23:58 -0600 Subject: [Buildroot] [PATCH 1/1] package/xz: patch configure due to microblaze patch Message-ID: <20230208142358.2721276-1-vfazio@xes-inc.com> Commit bed21bb9b added a patch to change configure.ac but failed to update configure which caused build failures due to the timestamp difference between configure and configure.ac and the makefile attempting to run aclocal. XZ_AUTORECONF = YES creates a circular dependency where the host autotools need host-xz which also gets patched. Because of this, we need to patch xz's configure script manually. While we're doing this, correct the language in the commit body of the patch, remove a stray whitespace, and fix the offset for configure.ac Fixes: bed21bb9b ("package/xz: fix microblaze compiles") Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685// Signed-off-by: Vincent Fazio --- ...0001-Detect-symver-attribute-support.patch | 54 ++++++++++++++----- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch index 9ec43ea7a0..8016de83ab 100644 --- a/package/xz/0001-Detect-symver-attribute-support.patch +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -1,11 +1,11 @@ -From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From f0e0e8bd08b4d4e7c89a5a3b7d9a3c083f7e5432 Mon Sep 17 00:00:00 2001 From: Vincent Fazio -Date: Tue, 7 Feb 2023 08:51:24 -0600 +Date: Wed, 8 Feb 2023 12:58:37 +0000 Subject: [PATCH] Detect symver attribute support -On non-ELF platforms, such as microblaze, builds will fail when trying -to add symver information because __attribute__((symver ..)) is not -supported even though __has_attribute(__symver__) returns true. +On Microblaze, builds will fail when trying to add symver information +because __attribute__((symver ..)) is not supported even though +__has_attribute(__symver__) returns true. Support for symver needs to be detected via a compile test since __has_attribute can report false positives [0]. @@ -19,15 +19,17 @@ Upstream: https://github.com/tukaani-project/xz/pull/32 Signed-off-by: Thomas Petazzoni Signed-off-by: Vincent Fazio --- - configure.ac | 9 +++++++++ - src/liblzma/common/common.h | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) +--- + configure | 15 +++++++++++++++ + configure.ac | 9 +++++++++ + src/liblzma/common/common.h | 2 +- + 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 5ad5589..08c623a 100644 +index dfec76c..7b01f2e 100644 --- a/configure.ac +++ b/configure.ac -@@ -791,6 +791,15 @@ else +@@ -697,6 +697,15 @@ else time with Libtool if neither --with-pic nor --without-pic is used). This define must be used together with liblzma_linux.map.]) @@ -44,7 +46,7 @@ index 5ad5589..08c623a 100644 *) enable_symbol_versions=generic diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h -index 11fec52..1d2ef9c 100644 +index 671d3bc..27b56ee 100644 --- a/src/liblzma/common/common.h +++ b/src/liblzma/common/common.h @@ -76,7 +76,7 @@ @@ -52,10 +54,36 @@ index 11fec52..1d2ef9c 100644 // is available. This should be far more reliable than looking at compiler // version macros as nowadays especially __GNUC__ is defined by many compilers. -# if lzma_has_attribute(__symver__) -+# if defined(HAVE_SYMVER_ATTRIBUTE) ++# if defined(HAVE_SYMVER_ATTRIBUTE) # define LZMA_SYMVER_API(extnamever, type, intname) \ extern __attribute__((__symver__(extnamever))) \ LZMA_API(type) intname +diff --git a/configure b/configure +index ff0eed5..e685b30 100755 +--- a/configure ++++ b/configure +@@ -16687,6 +16687,21 @@ printf "%s\n" "" >&6; } + + printf "%s\n" "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h + ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO" ++then : ++ ++printf "%s\n" "#define HAVE_SYMVER_ATTRIBUTE 1" >>confdefs.h ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic -- -2.25.1 +2.34.1 -- 2.25.1 From arnout at mind.be Wed Feb 8 14:28:33 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:33 +0100 Subject: [Buildroot] [git commit] utils/check-package: check files in utils/ Message-ID: <20230208142852.07D2E846E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b021bc1d77ce485ac46114482024d12339d6b5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master All the errors in existing scripts in utils/ have been fixed, so nothing needs to be added to .checkpackageignore. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle --- utils/check-package | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/check-package b/utils/check-package index 12009b2476..98a25bd0b2 100755 --- a/utils/check-package +++ b/utils/check-package @@ -113,6 +113,7 @@ DO_CHECK_INTREE = re.compile(r"|".join([ r"package/", r"system/", r"toolchain/", + r"utils/", ])) DO_NOT_CHECK_INTREE = re.compile(r"|".join([ r"boot/barebox/barebox\.mk$", From arnout at mind.be Wed Feb 8 14:28:30 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:30 +0100 Subject: [Buildroot] [git commit] utils/config: fix shellcheck errors Message-ID: <20230208142851.DB595846BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7150edc790cda61270eb0ec1af7ab78255c90003 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In utils/config line 54: ARG="`echo $ARG | tr a-z- A-Z_`" ^------------------------^ SC2006: Use $(...) notation instead of legacy backticked `...`. ^--^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: ARG="$(echo "$ARG" | tr a-z- A-Z_)" In utils/config line 87: local tmpfile="$infile.swp" ^-----^ SC2034: tmpfile appears unused. Verify use (or export if used externally). In utils/config line 182: if [ $? != 0 ] ; then ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. For more information: https://www.shellcheck.net/wiki/SC2034 -- tmpfile appears unused. Verify us... https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ... https://www.shellcheck.net/wiki/SC2006 -- Use $(...) notation instead of le... The suggestions from shellcheck can be applied. The unused variable tmpfile in fact occurs in several functions, all of them can be removed. For the check exit code, the condition is swapped to avoid negative logic. Signed-off-by: Arnout Vandecappelle --- utils/config | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/utils/config b/utils/config index c5e2d723ea..5f5e4362e5 100755 --- a/utils/config +++ b/utils/config @@ -51,7 +51,7 @@ checkarg() { usage fi if [ "$MUNGE_CASE" = "yes" ] ; then - ARG="`echo $ARG | tr a-z- A-Z_`" + ARG="$(echo "$ARG" | tr a-z- A-Z_)" fi case "$ARG" in ${BR2_PREFIX}*) @@ -64,7 +64,6 @@ txt_append() { local anchor="$1" local insert="$2" local infile="$3" - local tmpfile="$infile.swp" # sed append cmd: 'a\' + newline + text + newline cmd="$(printf "a\\%b$insert" "\n")" @@ -76,7 +75,6 @@ txt_subst() { local before="$1" local after="$2" local infile="$3" - local tmpfile="$infile.swp" sed -i -e "s:$before:$after:" "$infile" } @@ -84,7 +82,6 @@ txt_subst() { txt_delete() { local text="$1" local infile="$2" - local tmpfile="$infile.swp" sed -i -e "/$text/d" "$infile" } @@ -178,15 +175,14 @@ while [ "$1" != "" ] ; do if grep -q "# ${BR2_PREFIX}$ARG is not set" $FN ; then echo n else - V="$(grep "^${BR2_PREFIX}$ARG=" $FN)" - if [ $? != 0 ] ; then - echo undef - else + if V="$(grep "^${BR2_PREFIX}$ARG=" $FN)"; then V="${V/#${BR2_PREFIX}$ARG=/}" V="${V/#\"/}" V="${V/%\"/}" V="${V//\\\"/\"}" echo "${V}" + else + echo undef fi fi ;; From arnout at mind.be Wed Feb 8 14:28:32 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:32 +0100 Subject: [Buildroot] [git commit] utils/docker-run: fix shellcheck errors Message-ID: <20230208142851.F0F74846E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dab7a877148adad499a07c5ed785c42707593175 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In utils/test-pkg line 8: if [ ! -z "${TEMP_CONF}" ]; then ^-- SC2236: Use -n instead of ! -z. In utils/test-pkg line 75: TEMP_CONF=$(mktemp /tmp/test-${pkg}-config.XXXXXX) ^----^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: TEMP_CONF=$(mktemp /tmp/test-"${pkg}"-config.XXXXXX) In utils/test-pkg line 76: echo "${pkg_br_name}=y" > ${TEMP_CONF} ^----------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: echo "${pkg_br_name}=y" > "${TEMP_CONF}" In utils/test-pkg line 86: if [ ${random} -gt 0 ]; then ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${random}" -gt 0 ]; then In utils/test-pkg line 90: if [ ${number} -gt 0 ]; then ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${number}" -gt 0 ]; then In utils/test-pkg line 109: toolchains=($(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ ^-- SC2207: Prefer mapfile or read -a to split command output (or quote to avoid splitting). In utils/test-pkg line 110: |if [ ${random} -gt 0 ]; then \ ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: |if [ "${random}" -gt 0 ]; then \ In utils/test-pkg line 111: sort -R |head -n ${random} ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: sort -R |head -n "${random}" In utils/test-pkg line 121: if [ ${nb_tc} -eq 0 ]; then ^------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${nb_tc}" -eq 0 ]; then In utils/test-pkg line 134: printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} ${nb} ${nb_tc} ^---^ SC2086: Double quote to prevent globbing and word splitting. ^------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} "${nb}" "${nb_tc}" In utils/test-pkg line 146: ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} ^---^ SC2086: Double quote to prevent globbing and word splitting. ^--------^ SC2086: Double quote to prevent globbing and word splitting. ^--------^ SC2086: Double quote to prevent globbing and word splitting. ^---------^ SC2086: Double quote to prevent globbing and word splitting. ^--------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: "${nb}" "${nb_skip}" "${nb_fail}" "${nb_legal}" "${nb_show}" In utils/test-pkg line 160: CONFIG_= support/kconfig/merge_config.sh -O "${dir}" \ ^-- SC1007: Remove space after = if trying to assign a value (for empty string, use var='' ... ). In utils/test-pkg line 181: if [ ${prepare_only} -eq 1 ]; then ^-------------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${prepare_only}" -eq 1 ]; then For more information: https://www.shellcheck.net/wiki/SC1007 -- Remove space after = if trying to... https://www.shellcheck.net/wiki/SC2207 -- Prefer mapfile or read -a to spli... https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ... The suggestions from shellcheck can be applied. This script already uses bash so we can rely on mapfile. The warning about CONFIG_= assignment misinterpreted the intention: we don't want to assign to CONFIG_, we want to clear it from the environment. Spell this as CONFIG_="". Signed-off-by: Arnout Vandecappelle --- utils/test-pkg | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/utils/test-pkg b/utils/test-pkg index e7f5464817..19d8713d6a 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -5,7 +5,7 @@ TOOLCHAINS_CSV='support/config-fragments/autobuild/toolchain-configs.csv' TEMP_CONF="" do_clean() { - if [ ! -z "${TEMP_CONF}" ]; then + if [ -n "${TEMP_CONF}" ]; then rm -f "${TEMP_CONF}" fi } @@ -72,8 +72,8 @@ main() { if [ -z "${cfg}" ]; then pkg_br_name="${pkg//-/_}" pkg_br_name="BR2_PACKAGE_${pkg_br_name^^}" - TEMP_CONF=$(mktemp /tmp/test-${pkg}-config.XXXXXX) - echo "${pkg_br_name}=y" > ${TEMP_CONF} + TEMP_CONF="$(mktemp /tmp/test-"${pkg}"-config.XXXXXX)" + echo "${pkg_br_name}=y" > "${TEMP_CONF}" cfg="${TEMP_CONF}" fi if [ ! -e "${cfg}" ]; then @@ -83,15 +83,15 @@ main() { dir="${HOME}/br-test-pkg" fi - if [ ${random} -gt 0 ]; then + if [ "${random}" -gt 0 ]; then mode=$((mode+1)) fi - if [ ${number} -gt 0 ]; then + if [ "${number}" -gt 0 ]; then mode=$((mode+1)) fi - if [ ${all} -eq 1 ]; then + if [ "${all}" -eq 1 ]; then mode=$((mode+1)) fi @@ -106,19 +106,18 @@ main() { # Extract the URLs of the toolchains; drop internal toolchains # E.g.: http://server/path/to/name.config,arch,libc # --> http://server/path/to/name.config - toolchains=($(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ - |if [ ${random} -gt 0 ]; then \ - sort -R |head -n ${random} - elif [ ${number} -gt 0 ]; then \ - head -n ${number} - else - sort - fi - ) - ) + mapfile -t toolchains < <(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ + | if [ "${random}" -gt 0 ]; then \ + sort -R | head -n "${random}" + elif [ "${number}" -gt 0 ]; then \ + head -n "${number}" + else + sort + fi + ) nb_tc="${#toolchains[@]}" - if [ ${nb_tc} -eq 0 ]; then + if [ "${nb_tc}" -eq 0 ]; then printf "error: no toolchain found (networking issue?)\n" >&2; exit 1 fi @@ -131,7 +130,7 @@ main() { : $((nb++)) toolchain="$(basename "${toolchainconfig}" .config)" build_dir="${dir}/${toolchain}" - printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} ${nb} ${nb_tc} + printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} "${nb}" "${nb_tc}" build_one "${build_dir}" "${toolchainconfig}" "${cfg}" "${pkg}" "${prepare_only}" && ret=0 || ret=${?} case ${ret} in (0) printf "OK\n";; @@ -143,7 +142,7 @@ main() { done printf "%d builds, %d skipped, %d build failed, %d legal-info failed, %d show-info failed\n" \ - ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} + "${nb}" "${nb_skip}" "${nb_fail}" "${nb_legal}" "${nb_show}" return $((nb_fail + nb_legal)) } @@ -157,7 +156,7 @@ build_one() { mkdir -p "${dir}" - CONFIG_= support/kconfig/merge_config.sh -O "${dir}" \ + CONFIG_="" support/kconfig/merge_config.sh -O "${dir}" \ "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" \ >> "${dir}/logfile" 2>&1 # We want all the options from the snippet to be present as-is (set @@ -178,7 +177,7 @@ build_one() { rm -f "${dir}/missing.config" # Defer building the job to the caller (e.g. a gitlab pipeline) - if [ ${prepare_only} -eq 1 ]; then + if [ "${prepare_only}" -eq 1 ]; then return 0 fi From arnout at mind.be Wed Feb 8 14:28:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:31 +0100 Subject: [Buildroot] [git commit] utils/docker-run: fix shellcheck errors Message-ID: <20230208142851.E6006846E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c3466bbeeedad1cfc8fda5120d452fd786d68e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In utils/docker-run line 10: --user $(id -u):$(id -g) \ ^------^ SC2046: Quote this to prevent word splitting. ^------^ SC2046: Quote this to prevent word splitting. The suggestions from shellcheck can be applied. Signed-off-by: Arnout Vandecappelle --- utils/docker-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 5653764254..164e11c0e6 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -7,7 +7,7 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') exec docker run -it --rm \ - --user $(id -u):$(id -g) \ + --user "$(id -u):$(id -g)" \ --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ --workdir "${MAIN_DIR}" \ "${IMAGE}" "${@}" From arnout at mind.be Wed Feb 8 14:28:28 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:28 +0100 Subject: [Buildroot] [git commit] utils/brmake: fix shellcheck errors Message-ID: <20230208142851.D0048846E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc364c6ae65d3167409380b8883123a55270b18d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In utils/brmake line 6: local found ret start d h m mf ^---^ SC2034: found appears unused. Verify use (or export if used externally). In utils/brmake line 16: > >( while read line; do ^--^ SC2162: read without -r will mangle backslashes. For both, the suggestions from shellcheck can be applied. Signed-off-by: Arnout Vandecappelle --- utils/brmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/brmake b/utils/brmake index e30119dd10..70dfb6cdc8 100755 --- a/utils/brmake +++ b/utils/brmake @@ -3,7 +3,7 @@ # License: WTFPL, https://spdx.org/licenses/WTFPL.html main() { - local found ret start d h m mf + local ret start d h m mf if ! which unbuffer >/dev/null 2>&1; then printf "you need to install 'unbuffer' (from package expect or expect-dev)\n" >&2 @@ -13,7 +13,7 @@ main() { start=${SECONDS} ( exec 2>&1; unbuffer make "${@}"; ) \ - > >( while read line; do + > >( while read -r line; do printf "%(%Y-%m-%dT%H:%M:%S)T %s\n" -1 "${line}" done \ |tee -a br.log \ From arnout at mind.be Wed Feb 8 14:29:34 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:29:34 +0100 Subject: [Buildroot] [PATCH v2 08/14] utils/check-package: check files in utils/ In-Reply-To: <20220731193521.1217825-9-ricardo.martincoski@gmail.com> References: <20220731193521.1217825-1-ricardo.martincoski@gmail.com> <20220731193521.1217825-9-ricardo.martincoski@gmail.com> Message-ID: <3b1ff0f1-076f-5f6f-1c2b-ac4bdf9951c7@mind.be> On 31/07/2022 21:35, Ricardo Martincoski wrote: > Signed-off-by: Ricardo Martincoski > --- > Changes v1 -> v2: > - none > > NOTE to the maintainer applying this patch: please re-generate the list > of ignored warnings while applying: > $ utils/docker-run make .checkpackageignore Instead, I pushed 4 other commits that fix the shellcheck issues. Applied to master, thanks. Regards, Arnout > --- > .checkpackageignore | 4 ++++ > utils/check-package | 1 + > 2 files changed, 5 insertions(+) > > diff --git a/.checkpackageignore b/.checkpackageignore > index a527254464..615fe22e52 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -203,3 +203,7 @@ package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob > package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob > package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables > package/xl2tp/xl2tpd TrailingSpace > +utils/brmake Shellcheck > +utils/config Shellcheck > +utils/docker-run Shellcheck > +utils/test-pkg Shellcheck > diff --git a/utils/check-package b/utils/check-package > index 732f1cf112..094b7b9c07 100755 > --- a/utils/check-package > +++ b/utils/check-package > @@ -107,6 +107,7 @@ DO_CHECK_INTREE = re.compile(r"|".join([ > r"package/", > r"system/", > r"toolchain/", > + r"utils/", > ])) > DO_NOT_CHECK_INTREE = re.compile(r"|".join([ > r"boot/barebox/barebox\.mk$", From romain.naour at smile.fr Wed Feb 8 14:46:20 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 15:46:20 +0100 Subject: [Buildroot] [PATCH v2 01/11] package/llvm-project: new group for llvm packages In-Reply-To: References: Message-ID: <0b07f7e5-f76c-bbdb-ec81-703dd7fbb273@smile.fr> Hello, Le 25/10/2022 ? 08:02, Lang Daniel via buildroot a ?crit?: > To make updating easier in the future, group all llvm projects in > one subfolder and define some variables for all of them. Agree, especially since it's nowaday released from the same git repository (llvm-project). Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - No changes > --- > package/llvm-project/llvm-project.mk | 10 ++++++++++ > 1 file changed, 10 insertions(+) > create mode 100644 package/llvm-project/llvm-project.mk > > diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk > new file mode 100644 > index 0000000000..7ba89bb605 > --- /dev/null > +++ b/package/llvm-project/llvm-project.mk > @@ -0,0 +1,10 @@ > +################################################################################ > +# > +# llvm-project > +# > +################################################################################ > + > +LLVM_PROJECT_VERSION = 11.1.0 > +LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) > + > +include $(sort $(wildcard package/llvm-project/*/*.mk)) From peter at korsgaard.com Wed Feb 8 14:47:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 15:47:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/rust: fix boostrap build In-Reply-To: <20230208110551.187828-1-sebastian.weyer@smile.fr> (Sebastian Weyer's message of "Wed, 8 Feb 2023 12:05:51 +0100") References: <20230208110551.187828-1-sebastian.weyer@smile.fr> Message-ID: <871qn05i40.fsf@dell.be.48ers.dk> >>>>> "Sebastian" == Sebastian Weyer writes: > The update to v1.67.0 of rust broke the boostrap build. This patch s/boostrap/bootstrap/ ;) > applies an upstream patch to fix this: > https://github.com/rust-lang/rust/commit/3fe64ebbce21e79adb64099984e96dfb79bdd0f9 > Fixes: > http://autobuild.buildroot.org/results/214/214fcbb3458893784b7f85b60f7ee1edb428c77f/build-end.log > Signed-off-by: Sebastian Weyer > Cc: Eric Le Bihan > Cc: James Hilliard Committed with that fixed, thanks. -- Bye, Peter Korsgaard From romain.naour at smile.fr Wed Feb 8 14:48:17 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 15:48:17 +0100 Subject: [Buildroot] [PATCH v2 02/11] package/llvm: move to llvm-project folder In-Reply-To: References: Message-ID: <63707e9a-16fd-b81d-c582-fe1b5f67d92e@smile.fr> Hello, Le 25/10/2022 ? 08:04, Lang Daniel via buildroot a ?crit?: > To make updating easier, move llvm into the llvm-project folder > and use the defined information. > Reviewed-by: Romain Naour > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - No changes > --- > DEVELOPERS | 6 +++--- > package/Config.in | 2 +- > .../llvm/0001-nfc-Fix-missing-include.patch | 0 > package/{ => llvm-project}/llvm/Config.in | 0 > package/{ => llvm-project}/llvm/llvm.hash | 0 > package/{ => llvm-project}/llvm/llvm.mk | 5 ++--- > 6 files changed, 6 insertions(+), 7 deletions(-) > rename package/{ => llvm-project}/llvm/0001-nfc-Fix-missing-include.patch (100%) > rename package/{ => llvm-project}/llvm/Config.in (100%) > rename package/{ => llvm-project}/llvm/llvm.hash (100%) > rename package/{ => llvm-project}/llvm/llvm.mk (98%) > > diff --git a/DEVELOPERS b/DEVELOPERS > index c8183b2290..8763fde182 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1610,7 +1610,7 @@ F: package/earlyoom/ > F: package/gconf/ > F: package/libnss/ > F: package/lld/ > -F: package/llvm/ > +F: package/llvm-project/llvm/ > F: package/python-cython/ > F: package/python-pycups/ > F: package/python-raven/ > @@ -2544,7 +2544,7 @@ F: package/libgta/ > F: package/libiec61850/ > F: package/libspatialindex/ > F: package/linux-syscall-support/ > -F: package/llvm/ > +F: package/llvm-project/llvm/ > F: package/lugaru/ > F: package/mcelog/ > F: package/mesa3d/ > @@ -2956,7 +2956,7 @@ N: Valentin Korenblit > F: package/clang/ > F: package/clinfo/ > F: package/libclc/ > -F: package/llvm/ > +F: package/llvm-project/llvm/ > > N: Vanya Sergeev > F: package/lua-periphery/ > diff --git a/package/Config.in b/package/Config.in > index e3a34d6e97..3b7d4a9448 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2069,7 +2069,7 @@ comment "linux-pam plugins" > source "package/libpam-tacplus/Config.in" > endif > source "package/liquid-dsp/Config.in" > - source "package/llvm/Config.in" > + source "package/llvm-project/llvm/Config.in" > source "package/lttng-libust/Config.in" > source "package/matio/Config.in" > source "package/mpc/Config.in" > diff --git a/package/llvm/0001-nfc-Fix-missing-include.patch b/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch > similarity index 100% > rename from package/llvm/0001-nfc-Fix-missing-include.patch > rename to package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch > diff --git a/package/llvm/Config.in b/package/llvm-project/llvm/Config.in > similarity index 100% > rename from package/llvm/Config.in > rename to package/llvm-project/llvm/Config.in > diff --git a/package/llvm/llvm.hash b/package/llvm-project/llvm/llvm.hash > similarity index 100% > rename from package/llvm/llvm.hash > rename to package/llvm-project/llvm/llvm.hash > diff --git a/package/llvm/llvm.mk b/package/llvm-project/llvm/llvm.mk > similarity index 98% > rename from package/llvm/llvm.mk > rename to package/llvm-project/llvm/llvm.mk > index 977c0a08c2..1adad17b16 100644 > --- a/package/llvm/llvm.mk > +++ b/package/llvm-project/llvm/llvm.mk > @@ -4,9 +4,8 @@ > # > ################################################################################ > > -# LLVM, Clang and lld should be version bumped together > -LLVM_VERSION = 11.1.0 > -LLVM_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VERSION) > +LLVM_VERSION = $(LLVM_PROJECT_VERSION) > +LLVM_SITE = $(LLVM_PROJECT_SITE) > LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz > LLVM_LICENSE = Apache-2.0 with exceptions > LLVM_LICENSE_FILES = LICENSE.TXT From peter at korsgaard.com Wed Feb 8 14:34:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 15:34:42 +0100 Subject: [Buildroot] [git commit] package/rust: fix bootstrap build Message-ID: <20230208144829.C272E846F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7df32882203fdd525156ddb785d171b193e5b282 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The update to v1.67.0 of rust broke the bootstrap build. This patch applies an upstream patch to fix this: https://github.com/rust-lang/rust/commit/3fe64ebbce21e79adb64099984e96dfb79bdd0f9 Fixes: http://autobuild.buildroot.org/results/214/214fcbb3458893784b7f85b60f7ee1edb428c77f/build-end.log Signed-off-by: Sebastian Weyer Cc: Eric Le Bihan Cc: James Hilliard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...1-fix-unsoundness-in-bootstrap-cache-code.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch new file mode 100644 index 0000000000..3eae34642f --- /dev/null +++ b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch @@ -0,0 +1,43 @@ +From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 +From: Michael Goulet +Date: Mon, 12 Dec 2022 18:29:33 +0000 +Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= + =?UTF-8?q?ap=20cache=20code?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) +Signed-off-by: Sebastian Weyer +--- + src/bootstrap/cache.rs | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs +index be5c9bb0788..05f25af68ea 100644 +--- a/src/bootstrap/cache.rs ++++ b/src/bootstrap/cache.rs +@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { + + impl Deref for Interned { + type Target = T::Target; +- fn deref(&self) -> &'static Self::Target { ++ fn deref(&self) -> &Self::Target { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } ++ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } + } + } + + impl, U: ?Sized> AsRef for Interned { +- fn as_ref(&self) -> &'static U { ++ fn as_ref(&self) -> &U { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } ++ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } + } + } + +-- +2.25.1 + From romain.naour at smile.fr Wed Feb 8 14:49:10 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 15:49:10 +0100 Subject: [Buildroot] [PATCH v2 03/11] package/lld: move to llvm-project subfolder In-Reply-To: References: Message-ID: <800ca93a-4af6-7192-5796-65802eb73275@smile.fr> Le 25/10/2022 ? 08:07, Lang Daniel via buildroot a ?crit?: > To make version bumping easier, move llvm to a new llvm-project subfolder > and specify site and version for the project. Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - No changes > --- > DEVELOPERS | 2 +- > package/Config.in.host | 2 +- > package/{ => llvm-project}/lld/Config.in.host | 0 > package/{ => llvm-project}/lld/lld.hash | 0 > package/{ => llvm-project}/lld/lld.mk | 5 ++--- > 5 files changed, 4 insertions(+), 5 deletions(-) > rename package/{ => llvm-project}/lld/Config.in.host (100%) > rename package/{ => llvm-project}/lld/lld.hash (100%) > rename package/{ => llvm-project}/lld/lld.mk (87%) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 8763fde182..d4bab1aa36 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1609,7 +1609,7 @@ F: package/clang/ > F: package/earlyoom/ > F: package/gconf/ > F: package/libnss/ > -F: package/lld/ > +F: package/llvm-project/lld/ > F: package/llvm-project/llvm/ > F: package/python-cython/ > F: package/python-pycups/ > diff --git a/package/Config.in.host b/package/Config.in.host > index 8ccbf40a84..60ec97a39c 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -50,7 +50,7 @@ menu "Host utilities" > source "package/jsmin/Config.in.host" > source "package/kmod/Config.in.host" > source "package/libp11/Config.in.host" > - source "package/lld/Config.in.host" > + source "package/llvm-project/lld/Config.in.host" > source "package/lpc3250loader/Config.in.host" > source "package/lttng-babeltrace/Config.in.host" > source "package/lzma-alone/Config.in.host" > diff --git a/package/lld/Config.in.host b/package/llvm-project/lld/Config.in.host > similarity index 100% > rename from package/lld/Config.in.host > rename to package/llvm-project/lld/Config.in.host > diff --git a/package/lld/lld.hash b/package/llvm-project/lld/lld.hash > similarity index 100% > rename from package/lld/lld.hash > rename to package/llvm-project/lld/lld.hash > diff --git a/package/lld/lld.mk b/package/llvm-project/lld/lld.mk > similarity index 87% > rename from package/lld/lld.mk > rename to package/llvm-project/lld/lld.mk > index 4bf903cda0..46ec3b13ff 100644 > --- a/package/lld/lld.mk > +++ b/package/llvm-project/lld/lld.mk > @@ -4,9 +4,8 @@ > # > ################################################################################ > > -# LLVM, Clang and lld should be version bumped together > -LLD_VERSION = 11.1.0 > -LLD_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLD_VERSION) > +LLD_VERSION = $(LLVM_PROJECT_VERSION) > +LLD_SITE = $(LLVM_PROJECT_SITE) > LLD_SOURCE = lld-$(LLD_VERSION).src.tar.xz > LLD_LICENSE = Apache-2.0 with exceptions > LLD_LICENSE_FILES = LICENSE.TXT From romain.naour at smile.fr Wed Feb 8 14:52:32 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 15:52:32 +0100 Subject: [Buildroot] [PATCH v2 04/11] package/clang: move to llvm-project subfolder In-Reply-To: References: Message-ID: <7ecbf4e7-c57d-8486-7336-63f089720b6a@smile.fr> Hello, Le 25/10/2022 ? 08:07, Lang Daniel via buildroot a ?crit?: > To make version bumping easier, move llvm to a new llvm-project subfolder > and specify site and version for the project. > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - No changes > --- > DEVELOPERS | 6 +++--- > package/Config.in | 2 +- > ...-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 0 > package/{ => llvm-project}/clang/Config.in | 0 > package/{ => llvm-project}/clang/clang.hash | 0 > package/{ => llvm-project}/clang/clang.mk | 7 +++---- > package/llvm-project/llvm-project.mk | 3 ++- > 7 files changed, 9 insertions(+), 9 deletions(-) > rename package/{ => llvm-project}/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch (100%) > rename package/{ => llvm-project}/clang/Config.in (100%) > rename package/{ => llvm-project}/clang/clang.hash (100%) > rename package/{ => llvm-project}/clang/clang.mk (96%) > > diff --git a/DEVELOPERS b/DEVELOPERS > index d4bab1aa36..d516f585d8 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1605,10 +1605,10 @@ F: support/testing/tests/package/test_python_aexpect.py > N: Joseph Kogut > F: package/at-spi2-atk/ > F: package/at-spi2-core/ > -F: package/clang/ > F: package/earlyoom/ > F: package/gconf/ > F: package/libnss/ > +F: package/llvm-project/clang/ > F: package/llvm-project/lld/ > F: package/llvm-project/llvm/ > F: package/python-cython/ > @@ -2525,7 +2525,6 @@ F: package/alure/ > F: package/aubio/ > F: package/binutils/ > F: package/bullet/ > -F: package/clang/ > F: package/clinfo/ > F: package/efl/ > F: package/enet/ > @@ -2544,6 +2543,7 @@ F: package/libgta/ > F: package/libiec61850/ > F: package/libspatialindex/ > F: package/linux-syscall-support/ > +F: package/llvm-project/clang/ > F: package/llvm-project/llvm/ > F: package/lugaru/ > F: package/mcelog/ > @@ -2953,9 +2953,9 @@ F: package/gettext-tiny/ > F: package/tinyssh/ > > N: Valentin Korenblit > -F: package/clang/ > F: package/clinfo/ > F: package/libclc/ > +F: package/llvm-project/clang/ > F: package/llvm-project/llvm/ > > N: Vanya Sergeev > diff --git a/package/Config.in b/package/Config.in > index 3b7d4a9448..15dd27796f 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1970,7 +1970,7 @@ menu "Other" > source "package/capnproto/Config.in" > source "package/cctz/Config.in" > source "package/cereal/Config.in" > - source "package/clang/Config.in" > + source "package/llvm-project/clang/Config.in" > source "package/cmocka/Config.in" > source "package/compiler-rt/Config.in" > source "package/cppcms/Config.in" > diff --git a/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > similarity index 100% > rename from package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > rename to package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > diff --git a/package/clang/Config.in b/package/llvm-project/clang/Config.in > similarity index 100% > rename from package/clang/Config.in > rename to package/llvm-project/clang/Config.in > diff --git a/package/clang/clang.hash b/package/llvm-project/clang/clang.hash > similarity index 100% > rename from package/clang/clang.hash > rename to package/llvm-project/clang/clang.hash > diff --git a/package/clang/clang.mk b/package/llvm-project/clang/clang.mk > similarity index 96% > rename from package/clang/clang.mk > rename to package/llvm-project/clang/clang.mk > index 3c75f8d6b1..0943e21a8c 100644 > --- a/package/clang/clang.mk > +++ b/package/llvm-project/clang/clang.mk > @@ -4,10 +4,9 @@ > # > ################################################################################ > > -# LLVM, Clang and lld should be version bumped together > -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_VERSION_MAJOR = $(LLVM_PROJECT_VERSION_MAJOR) > +CLANG_VERSION = $(LLVM_PROJECT_VERSION) > +CLANG_SITE = $(LLVM_PROJECT_SITE) > CLANG_SOURCE = clang-$(CLANG_VERSION).src.tar.xz > CLANG_LICENSE = Apache-2.0 with exceptions > CLANG_LICENSE_FILES = LICENSE.TXT > diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk > index 7ba89bb605..747a6f5647 100644 > --- a/package/llvm-project/llvm-project.mk > +++ b/package/llvm-project/llvm-project.mk > @@ -4,7 +4,8 @@ > # > ################################################################################ > > -LLVM_PROJECT_VERSION = 11.1.0 > +LLVM_PROJECT_VERSION_MAJOR = 11 > +LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.0 It seems not related to the clang move to llvm-project subfolder. (maybe a rebase + squash issue) It should be done at the begening of this series. Best regards, Romain > LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) > > include $(sort $(wildcard package/llvm-project/*/*.mk)) From romain.naour at smile.fr Wed Feb 8 14:53:41 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 15:53:41 +0100 Subject: [Buildroot] [PATCH v2 05/11] package/compiler-rt: move to llvm-project subfolder In-Reply-To: References: Message-ID: Hello, Le 25/10/2022 ? 08:08, Lang Daniel via buildroot a ?crit?: > To make version bumping easier, move llvm to a new llvm-project subfolder > and specify site and version for the project. Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - No changes > --- > DEVELOPERS | 2 +- > package/Config.in | 2 +- > package/{ => llvm-project}/compiler-rt/Config.in | 0 > package/{ => llvm-project}/compiler-rt/compiler-rt.hash | 0 > package/{ => llvm-project}/compiler-rt/compiler-rt.mk | 6 ++---- > 5 files changed, 4 insertions(+), 6 deletions(-) > rename package/{ => llvm-project}/compiler-rt/Config.in (100%) > rename package/{ => llvm-project}/compiler-rt/compiler-rt.hash (100%) > rename package/{ => llvm-project}/compiler-rt/compiler-rt.mk (85%) > > diff --git a/DEVELOPERS b/DEVELOPERS > index d516f585d8..e6606408c0 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1966,7 +1966,6 @@ 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/ > @@ -2004,6 +2003,7 @@ F: package/libssh2/ > F: package/libtalloc/ > F: package/libqmi/ > F: package/lighttpd/ > +F: package/llvm-project/compiler-rt/ > F: package/logrotate/ > F: package/makedevs/ > F: package/memtester/ > diff --git a/package/Config.in b/package/Config.in > index 15dd27796f..1d48b1448b 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1972,7 +1972,7 @@ menu "Other" > source "package/cereal/Config.in" > source "package/llvm-project/clang/Config.in" > source "package/cmocka/Config.in" > - source "package/compiler-rt/Config.in" > + source "package/llvm-project/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/llvm-project/compiler-rt/Config.in > similarity index 100% > rename from package/compiler-rt/Config.in > rename to package/llvm-project/compiler-rt/Config.in > diff --git a/package/compiler-rt/compiler-rt.hash b/package/llvm-project/compiler-rt/compiler-rt.hash > similarity index 100% > rename from package/compiler-rt/compiler-rt.hash > rename to package/llvm-project/compiler-rt/compiler-rt.hash > diff --git a/package/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk > similarity index 85% > rename from package/compiler-rt/compiler-rt.mk > rename to package/llvm-project/compiler-rt/compiler-rt.mk > index c8ea86e899..84add60801 100644 > --- a/package/compiler-rt/compiler-rt.mk > +++ b/package/llvm-project/compiler-rt/compiler-rt.mk > @@ -4,11 +4,9 @@ > # > ################################################################################ > > -# 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_VERSION = $(LLVM_PROJECT_VERSION) > 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_SITE = $(LLVM_PROJECT_SITE) > COMPILER_RT_LICENSE = NCSA MIT > COMPILER_RT_LICENSE_FILES = LICENSE.TXT > COMPILER_RT_DEPENDENCIES = host-clang llvm From romain.naour at smile.fr Wed Feb 8 15:02:08 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:02:08 +0100 Subject: [Buildroot] [PATCH v2 06/11] package/llvm-project/llvm-cmake: new package In-Reply-To: References: Message-ID: Hello, Le 25/10/2022 ? 08:09, Lang Daniel via buildroot a ?crit?: > This is a small host package containing shared cmake modules > that are needed by various projects during configuration. > For example llvm 15 needs it. > > Signed-off-by: Daniel Lang > --- > package/llvm-project/llvm-cmake/llvm-cmake.hash | 2 ++ > package/llvm-project/llvm-cmake/llvm-cmake.mk | 16 ++++++++++++++++ > 2 files changed, 18 insertions(+) > create mode 100644 package/llvm-project/llvm-cmake/llvm-cmake.hash > create mode 100644 package/llvm-project/llvm-cmake/llvm-cmake.mk > > diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.hash b/package/llvm-project/llvm-cmake/llvm-cmake.hash > new file mode 100644 > index 0000000000..b76013e810 > --- /dev/null > +++ b/package/llvm-project/llvm-cmake/llvm-cmake.hash > @@ -0,0 +1,2 @@ > +# locally calculated > +sha256 21cf3f52c53dc8b8972122ae35a5c18de09c7df693b48b5cd8553c3e3fed090d cmake-15.0.3.src.tar.xz This can't work since LLVM_PROJECT_VERSION is still at 11.1.0. > diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.mk b/package/llvm-project/llvm-cmake/llvm-cmake.mk > new file mode 100644 > index 0000000000..2527b95063 > --- /dev/null > +++ b/package/llvm-project/llvm-cmake/llvm-cmake.mk > @@ -0,0 +1,16 @@ > +################################################################################ > +# > +# llvm-cmake > +# > +################################################################################ > + > +LLVM_CMAKE_VERSION = $(LLVM_PROJECT_VERSION) > +LLVM_CMAKE_SITE = $(LLVM_PROJECT_SITE) Maybe force it to 15.0.3 here and revert to LLVM_PROJECT_VERSION when doing the llvm-project version bump to 15.0.3. > +LLVM_CMAKE_SOURCE = cmake-$(LLVM_CMAKE_VERSION).src.tar.xz > + > +define HOST_LLVM_CMAKE_INSTALL_CMDS > + mkdir -p $(HOST_DIR)/lib/cmake/llvm > + cp -Rv $(@D)/Modules/* $(HOST_DIR)/lib/cmake/llvm > +endef There is really no install target in this package ? Best regards, Romain > + > +$(eval $(host-generic-package)) From peter at korsgaard.com Wed Feb 8 15:04:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 16:04:15 +0100 Subject: [Buildroot] Multiple BR2_BACKUP_SITE In-Reply-To: (Christian Stewart via buildroot's message of "Mon, 30 Jan 2023 15:19:29 -0800") References: Message-ID: <87wn4s42s0.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart via buildroot writes: > Hi all, > Would it be possible to adjust Buildroot so that multiple > BR2_BACKUP_SITE can be specified in a list? This way there could be > multiple mirrors with some mirrors having some things that others do > not. In concept that shouldn't be hard to do, E.G. basically stick a foreach loop in the code that calculates DOWNLOAD_URIS in package/pkg-download.mk. Care to give that a try and send a patch? -- Bye, Peter Korsgaard From romain.naour at smile.fr Wed Feb 8 15:10:44 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:10:44 +0100 Subject: [Buildroot] [PATCH v2 07/11] package/llvm-project/llvm-libunwind: new package In-Reply-To: References: Message-ID: Hello, Le 25/10/2022 ? 08:10, Lang Daniel via buildroot a ?crit?: > Starting with version 15, lld needs the llvm implementation > of libunwind, therefore it is added as a host package. > > Signed-off-by: Daniel Lang > --- > .../llvm-libunwind/llvm-libunwind.hash | 3 +++ > .../llvm-libunwind/llvm-libunwind.mk | 18 ++++++++++++++++++ > 2 files changed, 21 insertions(+) > create mode 100644 package/llvm-project/llvm-libunwind/llvm-libunwind.hash > create mode 100644 package/llvm-project/llvm-libunwind/llvm-libunwind.mk > > diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.hash b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash > new file mode 100644 > index 0000000000..2d6286a40e > --- /dev/null > +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash > @@ -0,0 +1,3 @@ > +# locally computed > +sha256 0ab6e07bf05359e242e9ea80e4089b819914867fa997a715e324e584bcfdf114 libunwind-15.0.3.src.tar.xz Same issue than for llvm-cmake package. > +sha256 b5efebcaca80879234098e52d1725e6d9eb8fb96a19fce625d39184b705f7b6d LICENSE.TXT > diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.mk b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk > new file mode 100644 > index 0000000000..be9965a49a > --- /dev/null > +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk > @@ -0,0 +1,18 @@ > +################################################################################ > +# > +# llvm-libunwind > +# > +################################################################################ > + > +LLVM_LIBUNWIND_VERSION = $(LLVM_PROJECT_VERSION) > +LLVM_LIBUNWIND_SITE = $(LLVM_PROJECT_SITE) > +LLVM_LIBUNWIND_SOURCE = libunwind-$(LLVM_LIBUNWIND_VERSION).src.tar.xz > +LLVM_LIBUNWIND_LICENSE = Apache-2.0 with exceptions > +LLVM_LIBUNWIND_LICENSE_FILES = LICENSE.TXT > +LLVM_LIBUNWIND_SUPPORTS_IN_SOURCE_BUILD = NO > + > +HOST_LLVM_LIBUNWIND_CONF_OPTS += \ > + -DCMAKE_MODULE_PATH="$(HOST_DIR)/lib/cmake/llvm" \ > + -DLIBUNWIND_INSTALL_HEADERS=ON > + > +$(eval $(host-cmake-package)) It's a host only package here, is llvm-libunwind may be useful on the target? If yes, we should take care of libunwind package. Best regards, Romain From thomas.petazzoni at bootlin.com Wed Feb 8 15:15:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:15:27 +0100 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: <20220607231211.533086-1-james.hilliard1@gmail.com> References: <20220607231211.533086-1-james.hilliard1@gmail.com> Message-ID: <20230208161527.31a28b3b@windsurf> On Tue, 7 Jun 2022 17:12:11 -0600 James Hilliard wrote: > In some cases it only makes sense to run tests against a specific > branch, such as when testing new genrandconfig flags. > > Add a config option to override the branch selection. > > Signed-off-by: James Hilliard > --- > scripts/autobuild-run | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) We looked at this with Arnout, and we don't really see what this would be needed, and actually it could be annoying to have people test "random" branches. If you need extensions to genrandconfig, then the autobuild-run script should be backward compatible with older versions of genrandconfig to be able to support older branches for a certain while. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Wed Feb 8 15:16:37 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:16:37 +0100 Subject: [Buildroot] [PATCH v2 08/11] package/llvm-project: bump to version 15.0.3 In-Reply-To: References: Message-ID: Hello, Le 25/10/2022 ? 08:12, Lang Daniel via buildroot a ?crit?: > - Add new build dependencies to lld and llvm > - Drop old config options > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - Bump to 15.0.3 instead of 15.0.1 > - llvm: use CMAKE_HOST_C_COMPILER instead of HOSTCC > --- > package/llvm-project/clang/clang.hash | 2 +- > package/llvm-project/clang/clang.mk | 8 +------ > .../llvm-project/compiler-rt/compiler-rt.hash | 2 +- > .../llvm-project/compiler-rt/compiler-rt.mk | 3 ++- > package/llvm-project/lld/lld.hash | 2 +- > package/llvm-project/lld/lld.mk | 8 +------ > .../llvm-project/llvm-cmake/llvm-cmake.hash | 2 +- > .../llvm-libunwind/llvm-libunwind.hash | 2 +- > package/llvm-project/llvm-project.mk | 4 ++-- > .../llvm/0001-nfc-Fix-missing-include.patch | 24 ------------------- > package/llvm-project/llvm/llvm.hash | 2 +- > package/llvm-project/llvm/llvm.mk | 21 +++++++++------- > 12 files changed, 24 insertions(+), 56 deletions(-) > delete mode 100644 package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch > > diff --git a/package/llvm-project/clang/clang.hash b/package/llvm-project/clang/clang.hash > index 0136b80664..52c755cfb3 100644 > --- a/package/llvm-project/clang/clang.hash > +++ b/package/llvm-project/clang/clang.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 0a8288f065d1f57cb6d96da4d2965cbea32edc572aa972e466e954d17148558b clang-11.1.0.src.tar.xz > +sha256 96036052694e703d159c995bda203b59d1ff185c6879189b9eba837726e1738c clang-15.0.3.src.tar.xz > sha256 ebcd9bbf783a73d05c53ba4d586b8d5813dcdf3bbec50265860ccc885e606f47 LICENSE.TXT > diff --git a/package/llvm-project/clang/clang.mk b/package/llvm-project/clang/clang.mk > index 0943e21a8c..0bafd6461b 100644 > --- a/package/llvm-project/clang/clang.mk > +++ b/package/llvm-project/clang/clang.mk > @@ -17,13 +17,6 @@ CLANG_INSTALL_STAGING = YES > HOST_CLANG_DEPENDENCIES = host-llvm host-libxml2 > CLANG_DEPENDENCIES = llvm host-clang > > -# LLVM >= 9.0 will soon require C++14 support, building llvm 8.x using a > -# toolchain using gcc < 5.1 gives an error but actually still works. Setting > -# this option makes it still build with gcc >= 4.8. > -# https://reviews.llvm.org/D57264 > -HOST_CLANG_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON > -CLANG_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON This option was needed on host with an old gcc version. If you remove this option, you have to add an host gcc dependency on llvm-project (depends on BR2_HOST_GCC_AT_LEAST_X) > - > # This option is needed, otherwise multiple shared libs > # (libclangAST.so, libclangBasic.so, libclangFrontend.so, etc.) will > # be generated. As a final shared lib containing all these components > @@ -62,6 +55,7 @@ CLANG_CONF_OPTS += \ > HOST_CLANG_CONF_OPTS += -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ > -DCLANG_DEFAULT_LINKER=$(TARGET_LD) > CLANG_CONF_OPTS += -DLLVM_DIR=$(STAGING_DIR)/usr/lib/cmake/llvm \ > + -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm \ > -DCLANG_TABLEGEN:FILEPATH=$(HOST_DIR)/bin/clang-tblgen \ > -DLLVM_TABLEGEN_EXE:FILEPATH=$(HOST_DIR)/bin/llvm-tblgen > > diff --git a/package/llvm-project/compiler-rt/compiler-rt.hash b/package/llvm-project/compiler-rt/compiler-rt.hash > index 8ee010ac5a..fe4e98164b 100644 > --- a/package/llvm-project/compiler-rt/compiler-rt.hash > +++ b/package/llvm-project/compiler-rt/compiler-rt.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274 compiler-rt-11.1.0.src.tar.xz > +sha256 db958eee92d1571d8b7f76c1be8513817f1a888dcf6ced88aca871acfb0eeddd compiler-rt-15.0.3.src.tar.xz > sha256 1a8f1058753f1ba890de984e48f0242a3a5c29a6a8f2ed9fd813f36985387e8d LICENSE.TXT > diff --git a/package/llvm-project/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk > index 84add60801..026650c7c8 100644 > --- a/package/llvm-project/compiler-rt/compiler-rt.mk > +++ b/package/llvm-project/compiler-rt/compiler-rt.mk > @@ -17,7 +17,8 @@ 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)/bin/llvm-config > + -DLLVM_CONFIG_PATH=$(HOST_DIR)/bin/llvm-config \ > + -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm > > # The installation of the target runtime libraries defaults to DESTDIR, however > # host-clang resources directory needs a link so Clang can find the runtime > diff --git a/package/llvm-project/lld/lld.hash b/package/llvm-project/lld/lld.hash > index 6d56ffcaab..2d2598dbeb 100644 > --- a/package/llvm-project/lld/lld.hash > +++ b/package/llvm-project/lld/lld.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 017a788cbe1ecc4a949abf10755870519086d058a2e99f438829aef24f0c66ce lld-11.1.0.src.tar.xz > +sha256 cd5d0894a74b957ce78d62212c1df0b3876a7297593aaece6b0512285e3b8732 lld-15.0.3.src.tar.xz > sha256 f7891568956e34643eb6a0db1462db30820d40d7266e2a78063f2fe233ece5a0 LICENSE.TXT > diff --git a/package/llvm-project/lld/lld.mk b/package/llvm-project/lld/lld.mk > index 46ec3b13ff..539dd0bd71 100644 > --- a/package/llvm-project/lld/lld.mk > +++ b/package/llvm-project/lld/lld.mk > @@ -10,13 +10,7 @@ LLD_SOURCE = lld-$(LLD_VERSION).src.tar.xz > LLD_LICENSE = Apache-2.0 with exceptions > LLD_LICENSE_FILES = LICENSE.TXT > LLD_SUPPORTS_IN_SOURCE_BUILD = NO > -HOST_LLD_DEPENDENCIES = host-llvm > - > -# LLVM > 9.0 will soon require C++14 support, building llvm <= 9.0 using a > -# toolchain using gcc < 5.1 gives an error but actually still works. Setting > -# this option makes it still build with gcc >= 4.8. > -# https://reviews.llvm.org/D57264 > -HOST_LLD_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON > +HOST_LLD_DEPENDENCIES = host-llvm host-llvm-libunwind > > # build as static libs as is done in llvm & clang > HOST_LLD_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF > diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.hash b/package/llvm-project/llvm-cmake/llvm-cmake.hash > index b76013e810..862c5d92e8 100644 > --- a/package/llvm-project/llvm-cmake/llvm-cmake.hash > +++ b/package/llvm-project/llvm-cmake/llvm-cmake.hash > @@ -1,2 +1,2 @@ > # locally calculated > -sha256 a660d1b7d4d2ef9759de6ad360d5fa9eed3625a6548068a97df2dd706edf2dd0 cmake-15.0.1.src.tar.xz > +sha256 21cf3f52c53dc8b8972122ae35a5c18de09c7df693b48b5cd8553c3e3fed090d cmake-15.0.3.src.tar.xz > diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.hash b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash > index 2d6286a40e..86775f5dba 100644 > --- a/package/llvm-project/llvm-libunwind/llvm-libunwind.hash > +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash > @@ -1,3 +1,3 @@ > # locally computed > -sha256 65af59d7cd4672e2c1793402968f803beb3f91a92ad95f8702610a9a07a5ca10 libunwind-15.0.1.src.tar.xz > +sha256 0ab6e07bf05359e242e9ea80e4089b819914867fa997a715e324e584bcfdf114 libunwind-15.0.3.src.tar.xz > sha256 b5efebcaca80879234098e52d1725e6d9eb8fb96a19fce625d39184b705f7b6d LICENSE.TXT > diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk > index 747a6f5647..5859ff7cfc 100644 > --- a/package/llvm-project/llvm-project.mk > +++ b/package/llvm-project/llvm-project.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LLVM_PROJECT_VERSION_MAJOR = 11 > -LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.0 > +LLVM_PROJECT_VERSION_MAJOR = 15 > +LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).0.3 > LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) > > include $(sort $(wildcard package/llvm-project/*/*.mk)) > diff --git a/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch b/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch > deleted file mode 100644 > index 62111ca138..0000000000 > --- a/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch > +++ /dev/null > @@ -1,24 +0,0 @@ > -From b498303066a63a203d24f739b2d2e0e56dca70d1 Mon Sep 17 00:00:00 2001 > -From: serge-sans-paille > -Date: Tue, 10 Nov 2020 14:55:25 +0100 > -Subject: [PATCH] [nfc] Fix missing include > - > -[Retrieved (and backported) from: > -https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1] > -Signed-off-by: Fabrice Fontaine > ---- > - llvm/utils/benchmark/src/benchmark_register.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/utils/benchmark/src/benchmark_register.h b/utils/benchmark/src/benchmark_register.h > -index 0705e219f2fa2..4caa5ad4da079 100644 > ---- a/utils/benchmark/src/benchmark_register.h > -+++ b/utils/benchmark/src/benchmark_register.h > -@@ -1,6 +1,7 @@ > - #ifndef BENCHMARK_REGISTER_H > - #define BENCHMARK_REGISTER_H > - > -+#include > - #include > - > - #include "check.h" > diff --git a/package/llvm-project/llvm/llvm.hash b/package/llvm-project/llvm/llvm.hash > index e7f79492de..df9aa88411 100644 > --- a/package/llvm-project/llvm/llvm.hash > +++ b/package/llvm-project/llvm/llvm.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 ce8508e318a01a63d4e8b3090ab2ded3c598a50258cc49e2625b9120d4c03ea5 llvm-11.1.0.src.tar.xz > +sha256 c39aec729662416dcbf0bfe53a9786b34e7d93d02908a0779a2f6d83ad0a4a27 llvm-15.0.3.src.tar.xz > sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT > diff --git a/package/llvm-project/llvm/llvm.mk b/package/llvm-project/llvm/llvm.mk > index 1adad17b16..5751ba4f7f 100644 > --- a/package/llvm-project/llvm/llvm.mk > +++ b/package/llvm-project/llvm/llvm.mk > @@ -14,15 +14,16 @@ LLVM_SUPPORTS_IN_SOURCE_BUILD = NO > LLVM_INSTALL_STAGING = YES > > # LLVM >= 9.0 can use python3 to build. maybe remove this old comment ? host-python (python2) has been removed. Best regards, Romain > -HOST_LLVM_DEPENDENCIES = host-python3 > +HOST_LLVM_DEPENDENCIES = host-python3 host-llvm-cmake > LLVM_DEPENDENCIES = host-llvm > > -# LLVM >= 9.0 will soon require C++14 support, building llvm 8.x using a > -# toolchain using gcc < 5.1 gives an error but actually still works. Setting > -# this option makes it still build with gcc >= 4.8. > -# https://reviews.llvm.org/D57264 > -HOST_LLVM_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON > -LLVM_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON > +# Path to cmake modules from host-llvm-cmake > +HOST_LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm > +LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm > + > +# Assembly files for x64 in lib/Support/BLAKE3 need to be compiled > +# by a C compiler > +HOST_LLVM_CONF_OPTS += -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" > > # Don't build clang libcxx libcxxabi lldb compiler-rt lld polly as llvm subprojects > # This flag assumes that projects are checked out side-by-side and not nested > @@ -259,7 +260,8 @@ HOST_LLVM_CONF_OPTS += \ > -DLLVM_INCLUDE_EXAMPLES=OFF \ > -DLLVM_INCLUDE_DOCS=OFF \ > -DLLVM_INCLUDE_GO_TESTS=OFF \ > - -DLLVM_INCLUDE_TESTS=OFF > + -DLLVM_INCLUDE_TESTS=OFF \ > + -DLLVM_INCLUDE_BENCHMARKS=OFF > LLVM_CONF_OPTS += \ > -DLLVM_BUILD_EXAMPLES=OFF \ > -DLLVM_BUILD_DOCS=OFF \ > @@ -270,7 +272,8 @@ LLVM_CONF_OPTS += \ > -DLLVM_INCLUDE_EXAMPLES=OFF \ > -DLLVM_INCLUDE_DOCS=OFF \ > -DLLVM_INCLUDE_GO_TESTS=OFF \ > - -DLLVM_INCLUDE_TESTS=OFF > + -DLLVM_INCLUDE_TESTS=OFF \ > + -DLLVM_INCLUDE_BENCHMARKS=OFF > > # Copy llvm-config (host variant) to STAGING_DIR > # llvm-config (host variant) returns include and lib directories From romain.naour at smile.fr Wed Feb 8 15:18:26 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:18:26 +0100 Subject: [Buildroot] [PATCH v2 09/11] package/spirv-llvm-translator: bump to version 15.0.0-2 In-Reply-To: References: Message-ID: <89073a3f-f951-d3cc-36c9-4d405dd92919@smile.fr> Hello, Le 25/10/2022 ? 08:13, Lang Daniel via buildroot a ?crit?: Reviewed-by: Romain Naour Best regards, Romain > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - Bump to latest commit that supports llvm15 > --- > package/spirv-llvm-translator/spirv-llvm-translator.hash | 2 +- > package/spirv-llvm-translator/spirv-llvm-translator.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.hash b/package/spirv-llvm-translator/spirv-llvm-translator.hash > index edfca1ea02..0e06d36de1 100644 > --- a/package/spirv-llvm-translator/spirv-llvm-translator.hash > +++ b/package/spirv-llvm-translator/spirv-llvm-translator.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 bdd7cb677b9fcaaff1cce2153de9d69298f136edecaef3631915614bb5db09a1 spirv-llvm-translator-v11.0.0-297-ga619b34bce55360d79fea9058a93ded04919f2b2.tar.gz > +sha256 c2b29bc495fe14a21e871481b5a25d7abed93df8fa3fc22e996e39d9c1373280 spirv-llvm-translator-v15.0.0-2-g2478920a91bff5c59ca65ea9bce8ffaa5af8fa88.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 > index 159f7d3b52..d920999b28 100644 > --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk > +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk > @@ -5,8 +5,8 @@ > ################################################################################ > > # Generate version string using: > -# git describe --tags --match 'v11*' --abbrev=40 origin/llvm_release_110 > -SPIRV_LLVM_TRANSLATOR_VERSION = v11.0.0-297-ga619b34bce55360d79fea9058a93ded04919f2b2 > +# git describe --tags --match 'v15*' --abbrev=40 origin/llvm_release_150 > +SPIRV_LLVM_TRANSLATOR_VERSION = v15.0.0-2-g2478920a91bff5c59ca65ea9bce8ffaa5af8fa88 > SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION)) > SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA > SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT From romain.naour at smile.fr Wed Feb 8 15:22:31 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:22:31 +0100 Subject: [Buildroot] [PATCH v2 10/11] package/libclc: move to llvm-project subfolder and bump to 15.0.3 In-Reply-To: References: Message-ID: Hello, Le 25/10/2022 ? 08:13, Lang Daniel via buildroot a ?crit?: > To make version bumping easier, move llvm to a new llvm-project subfolder > and specify site and version for the project. This patch should go before llvm-cmake (and before llvm-project version bump) without the version bump. Include the libclc version bump with the llvm-project version bump. Best regards, Romain > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - libclc: Add missing change to package/Config.in > - Bump to 15.0.3 instead of 15.0.1 > --- > DEVELOPERS | 4 ++-- > package/Config.in | 2 +- > .../libclc/0001-support-out-of-tree-build.patch | 0 > package/{ => llvm-project}/libclc/Config.in | 0 > package/{ => llvm-project}/libclc/libclc.hash | 2 +- > package/{ => llvm-project}/libclc/libclc.mk | 4 ++-- > 6 files changed, 6 insertions(+), 6 deletions(-) > rename package/{ => llvm-project}/libclc/0001-support-out-of-tree-build.patch (100%) > rename package/{ => llvm-project}/libclc/Config.in (100%) > rename package/{ => llvm-project}/libclc/libclc.hash (51%) > rename package/{ => llvm-project}/libclc/libclc.mk (92%) > > diff --git a/DEVELOPERS b/DEVELOPERS > index e6606408c0..6dbf4fe7a5 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2538,12 +2538,12 @@ F: package/irrlicht/ > F: package/liblinear/ > F: package/lensfun/ > F: package/libbpf/ > -F: package/libclc/ > F: package/libgta/ > F: package/libiec61850/ > F: package/libspatialindex/ > F: package/linux-syscall-support/ > F: package/llvm-project/clang/ > +F: package/llvm-project/libclc/ > F: package/llvm-project/llvm/ > F: package/lugaru/ > F: package/mcelog/ > @@ -2954,8 +2954,8 @@ F: package/tinyssh/ > > N: Valentin Korenblit > F: package/clinfo/ > -F: package/libclc/ > F: package/llvm-project/clang/ > +F: package/llvm-project/libclc/ > F: package/llvm-project/llvm/ > > N: Vanya Sergeev > diff --git a/package/Config.in b/package/Config.in > index 1d48b1448b..882e296533 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2010,7 +2010,7 @@ menu "Other" > source "package/libcap/Config.in" > source "package/libcap-ng/Config.in" > source "package/libcgroup/Config.in" > - source "package/libclc/Config.in" > + source "package/llvm-project/libclc/Config.in" > source "package/libcofi/Config.in" > source "package/libcorrect/Config.in" > source "package/libcrossguid/Config.in" > diff --git a/package/libclc/0001-support-out-of-tree-build.patch b/package/llvm-project/libclc/0001-support-out-of-tree-build.patch > similarity index 100% > rename from package/libclc/0001-support-out-of-tree-build.patch > rename to package/llvm-project/libclc/0001-support-out-of-tree-build.patch > diff --git a/package/libclc/Config.in b/package/llvm-project/libclc/Config.in > similarity index 100% > rename from package/libclc/Config.in > rename to package/llvm-project/libclc/Config.in > diff --git a/package/libclc/libclc.hash b/package/llvm-project/libclc/libclc.hash > similarity index 51% > rename from package/libclc/libclc.hash > rename to package/llvm-project/libclc/libclc.hash > index c496291d81..7140884f6c 100644 > --- a/package/libclc/libclc.hash > +++ b/package/llvm-project/libclc/libclc.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 8f0213e52e2fcaca3dfcc438f05d0e15e9b3c96fd6b0994a802b267dc1047a1d libclc-13.0.1.src.tar.xz > +sha256 07e8a2b31e07a8cc8a976a6bfd87797d2543d5a9530f449755bf5119acbdbe8e libclc-15.0.3.src.tar.xz > sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT > diff --git a/package/libclc/libclc.mk b/package/llvm-project/libclc/libclc.mk > similarity index 92% > rename from package/libclc/libclc.mk > rename to package/llvm-project/libclc/libclc.mk > index 5d246cf4f8..9f303d6d2f 100644 > --- a/package/libclc/libclc.mk > +++ b/package/llvm-project/libclc/libclc.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LIBCLC_VERSION = 13.0.1 > -LIBCLC_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCLC_VERSION) > +LIBCLC_VERSION = $(LLVM_PROJECT_VERSION) > +LIBCLC_SITE = $(LLVM_PROJECT_SITE) > LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz > LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT > LIBCLC_LICENSE_FILES = LICENSE.TXT From peter at korsgaard.com Wed Feb 8 15:25:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 08 Feb 2023 16:25:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/xz: patch configure due to microblaze patch In-Reply-To: <20230208142358.2721276-1-vfazio@xes-inc.com> (Vincent Fazio's message of "Wed, 8 Feb 2023 08:23:58 -0600") References: <20230208142358.2721276-1-vfazio@xes-inc.com> Message-ID: <87sffg41s5.fsf@dell.be.48ers.dk> >>>>> "Vincent" == Vincent Fazio writes: > Commit bed21bb9b added a patch to change configure.ac but failed to > update configure which caused build failures due to the timestamp > difference between configure and configure.ac and the makefile attempting > to run aclocal. > XZ_AUTORECONF = YES creates a circular dependency where the host > autotools need host-xz which also gets patched. Because of this, we need > to patch xz's configure script manually. > While we're doing this, correct the language in the commit body of the > patch, remove a stray whitespace, and fix the offset for configure.ac > Fixes: bed21bb9b ("package/xz: fix microblaze compiles") > Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685// > Signed-off-by: Vincent Fazio This unfortunately still doesn't work as autoreconf is also triggered if configure.ac is newer than Makefile.in, so I dropped the patching of configure.ac which isn't strictly needed and committed, thanks. -- Bye, Peter Korsgaard From romain.naour at smile.fr Wed Feb 8 15:26:16 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:26:16 +0100 Subject: [Buildroot] [PATCH v2 11/11] DEVELOPERS: add Daniel Lang for llvm-project In-Reply-To: References: Message-ID: <7979c25c-5cdc-2335-81dd-26b27ced5a5a@smile.fr> Hello, Le 25/10/2022 ? 08:14, Lang Daniel via buildroot a ?crit?: > From 709898d42f115a5403f54d3fb0dd04e1d5ee087d Mon Sep 17 00:00:00 2001 > From: Daniel Lang > Date: Wed, 28 Sep 2022 16:02:38 +0200 > Subject: [PATCH v2 11/11] DEVELOPERS: add Daniel Lang for llvm-project Thanks for this version bump. Did you know there is a Clang + compilerRT test in the Buildroot testsuite? Have you check if the test succeed with your series applied? ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_clang.TestClangCompilerRT Acked-by: Romain Naour Best regards, Romain > > Signed-off-by: Daniel Lang > --- > Changes v1 -> v2: > - No changes > --- > DEVELOPERS | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 6dbf4fe7a5..19d584015f 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -633,6 +633,7 @@ F: package/dacapo/ > N: Daniel Lang > F: package/dbus-cxx/ > F: package/paho-mqtt-cpp/ > +F: package/llvm-project/ > > N: Damien Lanson > F: package/libvdpau/ From peter at korsgaard.com Wed Feb 8 15:24:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 16:24:25 +0100 Subject: [Buildroot] [git commit] package/xz: patch configure due to microblaze patch Message-ID: <20230208152805.5317F846FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5a83df8da04f5854c2e248e23dea3af620954cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit bed21bb9b added a patch to change configure.ac but failed to update configure which caused build failures due to the timestamp difference between configure and configure.ac and the makefile attempting to run aclocal. XZ_AUTORECONF = YES creates a circular dependency where the host autotools need host-xz which also gets patched. Because of this, we need to patch xz's configure script manually and NOT patch configure.ac so its timestamp stays older than Makefile.in. While we're doing this, correct the language in the commit body of the patch, remove a stray whitespace, and fix the offset for configure.ac Fixes: bed21bb9b ("package/xz: fix microblaze compiles") Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685/ Signed-off-by: Vincent Fazio [Peter: Only patch configure] Signed-off-by: Peter Korsgaard --- .../xz/0001-Detect-symver-attribute-support.patch | 71 ++++++++++++---------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch index 9ec43ea7a0..462fa9d86b 100644 --- a/package/xz/0001-Detect-symver-attribute-support.patch +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -1,11 +1,11 @@ -From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From f0e0e8bd08b4d4e7c89a5a3b7d9a3c083f7e5432 Mon Sep 17 00:00:00 2001 From: Vincent Fazio -Date: Tue, 7 Feb 2023 08:51:24 -0600 +Date: Wed, 8 Feb 2023 12:58:37 +0000 Subject: [PATCH] Detect symver attribute support -On non-ELF platforms, such as microblaze, builds will fail when trying -to add symver information because __attribute__((symver ..)) is not -supported even though __has_attribute(__symver__) returns true. +On Microblaze, builds will fail when trying to add symver information +because __attribute__((symver ..)) is not supported even though +__has_attribute(__symver__) returns true. Support for symver needs to be detected via a compile test since __has_attribute can report false positives [0]. @@ -18,33 +18,16 @@ it is supported and define a variable to advertise support. Upstream: https://github.com/tukaani-project/xz/pull/32 Signed-off-by: Thomas Petazzoni Signed-off-by: Vincent Fazio +[Peter: patch configure instead of configure.ac so autoreconf isn't +triggered at build time] +Signed-off-by: Peter Korsgaard --- - configure.ac | 9 +++++++++ - src/liblzma/common/common.h | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) + configure | 15 +++++++++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 5ad5589..08c623a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -791,6 +791,15 @@ else - time with Libtool if neither --with-pic nor - --without-pic is used). This define must be - used together with liblzma_linux.map.]) -+ OLD_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE( -+ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } -+ ])], -+ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], -+ [Define to 1 if GCC supports the symver attribute])], -+ []) -+ CFLAGS="$OLD_CFLAGS" - ;; - *) - enable_symbol_versions=generic diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h -index 11fec52..1d2ef9c 100644 +index 671d3bc..27b56ee 100644 --- a/src/liblzma/common/common.h +++ b/src/liblzma/common/common.h @@ -76,7 +76,7 @@ @@ -52,10 +35,36 @@ index 11fec52..1d2ef9c 100644 // is available. This should be far more reliable than looking at compiler // version macros as nowadays especially __GNUC__ is defined by many compilers. -# if lzma_has_attribute(__symver__) -+# if defined(HAVE_SYMVER_ATTRIBUTE) ++# if defined(HAVE_SYMVER_ATTRIBUTE) # define LZMA_SYMVER_API(extnamever, type, intname) \ extern __attribute__((__symver__(extnamever))) \ LZMA_API(type) intname +diff --git a/configure b/configure +index ff0eed5..e685b30 100755 +--- a/configure ++++ b/configure +@@ -16687,6 +16687,21 @@ printf "%s\n" "" >&6; } + + printf "%s\n" "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h + ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO" ++then : ++ ++printf "%s\n" "#define HAVE_SYMVER_ATTRIBUTE 1" >>confdefs.h ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic -- -2.25.1 +2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 8 15:34:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:34:15 +0100 Subject: [Buildroot] [git commit] package/open-iscsi: new package Message-ID: <20230208153425.DB28F8470E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a571acddd0badaf9636649d98fd095757878348 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: TIAN Yuanhao Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/open-iscsi/Config.in | 18 ++++++++++++++++++ package/open-iscsi/open-iscsi.hash | 3 +++ package/open-iscsi/open-iscsi.mk | 29 +++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0bb4db81bb..0e116e92a3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2791,6 +2791,7 @@ F: package/most/ N: TIAN Yuanhao F: package/cli11/ F: package/libsolv/ +F: package/open-iscsi/ F: package/open-isns/ F: package/reproc/ F: package/termcolor/ diff --git a/package/Config.in b/package/Config.in index 2adfcdbb1d..511e691ed3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2408,6 +2408,7 @@ endif source "package/odhcp6c/Config.in" source "package/odhcploc/Config.in" source "package/olsr/Config.in" + source "package/open-iscsi/Config.in" source "package/open-lldp/Config.in" source "package/open-plc-utils/Config.in" source "package/openntpd/Config.in" diff --git a/package/open-iscsi/Config.in b/package/open-iscsi/Config.in new file mode 100644 index 0000000000..e55bbfd867 --- /dev/null +++ b/package/open-iscsi/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_OPEN_ISCSI + bool "open-iscsi" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + depends on !BR2_STATIC_LIBS # kmod + select BR2_PACKAGE_KMOD + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPEN_ISNS + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + help + iSCSI tools for Linux. + + https://www.open-iscsi.com + +comment "open-iscsi needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/open-iscsi/open-iscsi.hash b/package/open-iscsi/open-iscsi.hash new file mode 100644 index 0000000000..9fd651cae8 --- /dev/null +++ b/package/open-iscsi/open-iscsi.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2 open-iscsi-2.1.8.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk new file mode 100644 index 0000000000..249253c64f --- /dev/null +++ b/package/open-iscsi/open-iscsi.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# open-iscsi +# +################################################################################ + +OPEN_ISCSI_VERSION = 2.1.8 +OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) +# The COPYING file says GPL-2.0, but there is some GPL-3.0+ code as +# well. See https://github.com/open-iscsi/open-iscsi/issues/379 +OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ +OPEN_ISCSI_LICENSE_FILES = COPYING +OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux + +OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +OPEN_ISCSI_DEPENDENCIES += systemd +OPEN_ISCSI_CONF_OPTS += -Dno_systemd=false +else +OPEN_ISCSI_CONF_OPTS += -Dno_systemd=true +endif + +define OPEN_ISCSI_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_SCSI_LOWLEVEL) + $(call KCONFIG_ENABLE_OPT,CONFIG_ISCSI_TCP) +endef + +$(eval $(meson-package)) From thomas.petazzoni at bootlin.com Wed Feb 8 15:39:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:39:19 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/open-iscsi: new package In-Reply-To: <20221009111423.7654-1-tianyuanhao3@163.com> References: <20220926154320.35494-1-tianyuanhao3@163.com> <20221009111423.7654-1-tianyuanhao3@163.com> Message-ID: <20230208163919.49c6eb38@windsurf> Hello, On Sun, 9 Oct 2022 04:14:23 -0700 TIAN Yuanhao wrote: > Signed-off-by: TIAN Yuanhao > Cc: Thomas Petazzoni I have applied the patch, with some changes. See below. > diff --git a/package/open-iscsi/Config.in b/package/open-iscsi/Config.in > new file mode 100644 > index 0000000000..04ec120e9a > --- /dev/null > +++ b/package/open-iscsi/Config.in > @@ -0,0 +1,19 @@ > +config BR2_PACKAGE_OPEN_ISCSI > + bool "open-iscsi" > + depends on BR2_USE_MMU # fork() > + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread > + depends on !BR2_STATIC_LIBS # kmod > + select BR2_PACKAGE_OPENSSL > + select BR2_PACKAGE_OPEN_ISNS > + select BR2_PACKAGE_KMOD > + select BR2_PACKAGE_UTIL_LINUX > + select BR2_PACKAGE_UTIL_LINUX_LIBS This BR2_PACKAGE_UTIL_LINUX_LIBS symbol is only for packages that cannot use util-linux because they would otherwise create a circular dependency. This is not the case of open-iscsi, so we can use util-linux directly. > + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT > + help > + iSCSI tools for Linux. > + > + https://www.open-iscsi.com > + > +comment "open-iscsi needs a toolchain w/ threads, dynamic library" > + depends on BR2_USE_MMU > + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS > diff --git a/package/open-iscsi/open-iscsi.hash b/package/open-iscsi/open-iscsi.hash > new file mode 100644 > index 0000000000..9fd651cae8 > --- /dev/null > +++ b/package/open-iscsi/open-iscsi.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2 open-iscsi-2.1.8.tar.gz > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk > new file mode 100644 > index 0000000000..4bbd96f591 > --- /dev/null > +++ b/package/open-iscsi/open-iscsi.mk > @@ -0,0 +1,27 @@ > +################################################################################ > +# > +# open-iscsi > +# > +################################################################################ > + > +OPEN_ISCSI_VERSION = 2.1.8 > +OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) > +OPEN_ISCSI_LICENSE = GPL-2.0+ Actually, there is some GPLv3+ code, see https://github.com/open-iscsi/open-iscsi/issues/379, so I changed this to GPL-2.0+, GPL-3.0+ and added a comment to explain what's going on. > +OPEN_ISCSI_LICENSE_FILES = COPYING > +OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux-libs Changed util-linux-libs to util-linux. And applied! Thanks a lot for your contribution! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Wed Feb 8 15:43:40 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 16:43:40 +0100 Subject: [Buildroot] [PATCH v2 2/2] support/testing/tests: add NodeJS tests In-Reply-To: <20220925192030.1648496-2-thomas.petazzoni@bootlin.com> References: <20220925192030.1648496-1-thomas.petazzoni@bootlin.com> <20220925192030.1648496-2-thomas.petazzoni@bootlin.com> Message-ID: Hello, Le 25/09/2022 ? 21:20, Thomas Petazzoni a ?crit?: > This commit adds two new test cases: > > - TestNodeJSBasic which builds a target configuration with just > NodeJS enabled, and which runs a very simple NodeJS script on the > target. > > - TestNodeJSModule, which builds a target configuration with NodeJS > enabled + the installation of one extra module, which means npm on > the host (from host-nodejs) is used, and which runs a very simple > NodeJS script on the target that uses this extra module. > > Having both tests separately allows to validate that both nodejs-only > and nodejs+host-nodejs configurations behave correctly, at least in > minimal scenarios. NodeJS takes ages to build Tested-by: Romain Naour Best regards, Romain > > Signed-off-by: Thomas Petazzoni > --- > DEVELOPERS | 3 ++ > .../tests/package/sample_nodejs_basic.js | 3 ++ > .../tests/package/sample_nodejs_module.js | 7 +++ > support/testing/tests/package/test_nodejs.py | 52 +++++++++++++++++++ > 4 files changed, 65 insertions(+) > create mode 100644 support/testing/tests/package/sample_nodejs_basic.js > create mode 100644 support/testing/tests/package/sample_nodejs_module.js > create mode 100644 support/testing/tests/package/test_nodejs.py > > diff --git a/DEVELOPERS b/DEVELOPERS > index 51d025173a..564149de0f 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2927,11 +2927,14 @@ F: package/weston/ > F: support/testing/tests/boot/test_grub.py > F: support/testing/tests/boot/test_grub/ > F: support/testing/tests/boot/test_syslinux.py > +F: support/testing/tests/package/sample_nodejs_basic.js > +F: support/testing/tests/package/sample_nodejs_module.js > F: support/testing/tests/package/sample_python_augeas.py > F: support/testing/tests/package/sample_python_flask.py > F: support/testing/tests/package/sample_python_flask_expects_json.py > F: support/testing/tests/package/sample_python_git.py > F: support/testing/tests/package/sample_python_unittest_xml_reporting.py > +F: support/testing/tests/package/test_nodejs.py > F: support/testing/tests/package/test_python_augeas.py > F: support/testing/tests/package/test_python_flask.py > F: support/testing/tests/package/test_python_flask_expects_json.py > diff --git a/support/testing/tests/package/sample_nodejs_basic.js b/support/testing/tests/package/sample_nodejs_basic.js > new file mode 100644 > index 0000000000..7633173c64 > --- /dev/null > +++ b/support/testing/tests/package/sample_nodejs_basic.js > @@ -0,0 +1,3 @@ > +var assert = require('assert'); > +assert.strictEqual(1, 1); > +console.log("Hello World"); > diff --git a/support/testing/tests/package/sample_nodejs_module.js b/support/testing/tests/package/sample_nodejs_module.js > new file mode 100644 > index 0000000000..57aee73408 > --- /dev/null > +++ b/support/testing/tests/package/sample_nodejs_module.js > @@ -0,0 +1,7 @@ > +var assert = require('assert'); > +var lodash = require('lodash'); > +result = lodash.chunk(['a', 'b', 'c', 'd'], 2); > +expected = [ [ 'a', 'b' ], [ 'c', 'd' ] ]; > +assert.deepStrictEqual(result, expected) > + > + > diff --git a/support/testing/tests/package/test_nodejs.py b/support/testing/tests/package/test_nodejs.py > new file mode 100644 > index 0000000000..9463c76b72 > --- /dev/null > +++ b/support/testing/tests/package/test_nodejs.py > @@ -0,0 +1,52 @@ > +import os > + > +import infra.basetest > + > + > +class TestNodeJSBasic(infra.basetest.BRTest): > + config = \ > + """ > + BR2_arm=y > + BR2_cortex_a9=y > + BR2_ARM_ENABLE_VFP=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_PACKAGE_NODEJS=y > + BR2_TARGET_ROOTFS_CPIO=y > + # BR2_TARGET_ROOTFS_TAR is not set > + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" > + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" > + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), > + infra.filepath("tests/package/sample_nodejs_basic.js")) > + > + def test_run(self): > + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") > + self.emulator.boot(arch="armv7", > + kernel="builtin", > + options=["-initrd", cpio_file]) > + self.emulator.login() > + self.assertRunOk("node sample_nodejs_basic.js") > + > + > +class TestNodeJSModule(infra.basetest.BRTest): > + config = \ > + """ > + BR2_arm=y > + BR2_cortex_a9=y > + BR2_ARM_ENABLE_VFP=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_PACKAGE_NODEJS=y > + BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="lodash" > + BR2_TARGET_ROOTFS_CPIO=y > + # BR2_TARGET_ROOTFS_TAR is not set > + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" > + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" > + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), > + infra.filepath("tests/package/sample_nodejs_module.js")) > + > + def test_run(self): > + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") > + self.emulator.boot(arch="armv7", > + kernel="builtin", > + options=["-initrd", cpio_file]) > + self.emulator.login() > + self.assertRunOk("node sample_nodejs_module.js") From arnout at mind.be Wed Feb 8 15:47:58 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 16:47:58 +0100 Subject: [Buildroot] [PATCH] package/libbpf: Don't remove bpf.h on host In-Reply-To: <12146851.O9o76ZdvQC@pwmachine> References: <12146851.O9o76ZdvQC@pwmachine> Message-ID: <17501a13-8018-656f-5f4d-b1cf6c1ecd5c@mind.be> Hi Daniel, Francis, On 07/02/2023 21:10, Francis Laniel wrote: > Hi. > > Le lundi 28 novembre 2022, 16:06:20 CET Lang Daniel a ?crit : >> libbpf >1.0.0 defines libbpf_bpf_link_type_str(enum bpf_link_type) in >> src/libbpf.h, which is included by host-pahole. >> bpf_link_type is defined in linux/bpf.h, therefore the comment stating >> that pahole doesn't need bpf.h is no longer valid. >> >> Fixes: >> - >> http://autobuild.buildroot.net/results/d126a4b6eca786402dc362c86f8df3addec3 >> d217/ >> >> Signed-off-by: Daniel Lang >> --- >> I wasn't able to reproduce the mentioned compile error in the kernel. >> The mentioned file (tools/lib/bpf/strset.c) shouldn't be compiled when >> compiling the kernel as it would recompile libbpf. >> --- >> package/libbpf/libbpf.mk | 17 +---------------- >> 1 file changed, 1 insertion(+), 16 deletions(-) >> >> diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk >> index 820f1dc4bf..0381fd833a 100644 >> --- a/package/libbpf/libbpf.mk >> +++ b/package/libbpf/libbpf.mk >> @@ -39,26 +39,11 @@ define LIBBPF_INSTALL_TARGET_CMDS >> -C $(@D)/src install DESTDIR=$(TARGET_DIR) >> endef >> >> -# We need to install_uapi_headers so we have btf.h to compile >> -# host-pahole. >> -# Nonetheless, this target adds bpf.h which generates a conflict when >> -# building the kernel: >> -# In file included from libbpf_internal.h:17:0, from strset.c:9: >> -# relo_core.h:10:6: error: nested redefinition of 'enum bpf_core_relo_kind' >> -# enum bpf_core_relo_kind { >> -# ^~~~~~~~~~~~~~~~~~ >> -# relo_core.h:10:6: error: redeclaration of 'enum bpf_core_relo_kind' >> -# In file included from libbpf_legacy.h:13:0, >> -# from libbpf_internal.h:16, >> -# from strset.c:9: >> -# /home/francis/buildroot/output/host/include/linux/bpf.h:6497:6: note: >> originally defined here -# enum bpf_core_relo_kind { >> -# So, better to remove remove it now since we do not need it to build >> +# We need to install_uapi_headers so we have bpf.h and btf.h to compile >> # host-pahole, the only user of host-libbpf. >> define HOST_LIBBPF_INSTALL_CMDS >> $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ >> -C $(@D)/src install install_uapi_headers DESTDIR=$(HOST_DIR) >> - rm $(HOST_DIR)/include/linux/bpf.h >> endef >> >> $(eval $(generic-package)) > > Thank you for this patch and sorry for my very late reply. > Sadly, I do not think the patch addresses the underlying issue. > Indeed, this is not pahole which does not need this file, as pahole relies on > to be built. > So, the whole point of this comment and the rm is to avoid a problem when > building the kernel when pahole was built before. The current solution, however, also doesn't work, which is why Franci's patch [1] is needed to fix it again. However, we believe this is not the proper fix. The real issue is the following: - libbpf installs headers which are possibly incompatible with the kernel's headers. Normally this is not a problem, because you have either the kernel's or libbpf's headers installed, not both. - However, when we install libbpf headers in $(HOST_DIR)/include, the kernel build itself picks up those headers instead of its own internal headers. That is why bpf.h is removed here to begin with. If bpf.h is not removed (and the kernel headers are indeed incompatible with the libbpf ones), then the kernel build will fail. - There is however no reason why the kernel should pick up $(HOST_DIR)/include instead of its own internal headers. Normally it doesn't do that, because it supplies -I options to its own headers, and these have precedence over the system included /usr/include etc. However, we force HOSTCC="$(HOSTCC) $(HOST_CFLAGS)" and HOST_CFLAGS has -I$(HOST_DIR)/include. This one will come before all of the ones that the kernel adds and will have precedence. Therefore, we believe that the solution is to use -isystem instead of -I in the HOSTCC setting of the kernel. This is indeed what is already done for uboot: HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ Note that there is a risk that this by itself goes wrong as well. We tried at some point to use -isystem instead of -I in HOST_CFLAGS: commit 6f8162cf8c1abef7e0a4771fe0d6b26a28f5c2b6 Author: David Raeman Date: Mon Jul 25 21:52:26 2016 package/Makefile.in should grab HOST_DIR headers using -isystem instead of -I. but this was reverted a copule of days later: commit 255b6f80d395ef048f46cfcf75dba690c56af657 Author: Thomas Petazzoni Date: Sat Jul 30 18:10:18 2016 Revert "package/Makefile.in should grab HOST_DIR headers using -isystem instead of -I." (Unfortunately, the commit has no further explanation of what went wrong). So, could you (Daniel and Francis) try to apply this patch and replace -I with -isystem like is done for U-Boot, and do a bunch of kernel builds to see if it breaks anything? For now, I've marked this patch as Changes Requested (it can only be applied if the bpf.h problem is solved in some other way), and marked Francis's patch [1] as Superseded. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220610165441.84812-2-flaniel at linux.microsoft.com/ > > Sadly, I tested your patch and I hit the problem described in the comment > regarding redefinition of bpf_core_relo_kind. > > Did you also hit it or you were able to build the kernel with > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE? > > > Best regards and thank you in advance. > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Wed Feb 8 15:53:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:53:30 +0100 Subject: [Buildroot] outdated libiberty and prelink-cross support In-Reply-To: <3f3d266c-2f21-197c-29b7-fff3e230e97a@smile.fr> References: <3f3d266c-2f21-197c-29b7-fff3e230e97a@smile.fr> Message-ID: <20230208165330.43c145f3@windsurf> Hello, +Yann and Adam, with questions/help needed below :) On Wed, 2 Nov 2022 14:05:26 +0100 Romain Naour wrote: > I was looking at host-binutils-2.38 issue in the autobuilder [1]. > The issue appear only when host-libiberty is built before host-binutils > (Binutils 2.38 only). > > It seems that libiberty package is still based on binutils 2.32 release and > seems to be updated. > > host-libiberty is currently used by host-gdb and host-prelink-cross packages. > > About the prelink-cross package, it come from the Yocto project [2] but the > support seems halted. Also the Glibc project will remove prelink support for the > upcoming 2.37 release [3]. > > The annoying part is "Prelink-cross emulates a runtime linker for a given > sysroot. This is necessary to allow gobject-introspection to build its typelib > files during cross-compiling." [4] > > host-prelink-cross is currently used by dracut and gobject-introspection packages. I had a look, and there are things at two different levels that can be done. First, we need to remove the package/libiberty/ package. libiberty is currently used by host-gdb and host-prelink-cross: * For host-gdb, the commit log says that the host libiberty might be picked up so we need to build our own. This is weird because libiberty is shipped in the gdb tarball. Yann, when you applied f0a583ddc4c2cab121330284e316f54229dee492, do you remember if you looked at why GDB wasn't picking up its own libiberty? Also, there is no autobuilder failure, so we don't really know under what conditions the problem can be reproduced. * For host-prelink-cross, it in fact doesn't need host-libiberty. It links against it, but apparently, the only functions it uses from libiberty are htab_find_slot() and htab_try_create(), and both are provided by src/hashtab.c in prelink-cross, which was copy/pasted from libiberty, most likely to avoid the dependency. So with a bit of effort in host-prelink-cross, the dependency on host-libiberty could be removed. Then, the second level is about host-prelink-cross itself. It is used by only two packages, so let's have a look: * For gobject-instrospection, it is no longer needed: openembedded-core stopped using it in https://github.com/openembedded/openembedded-core/commit/767e0880d4d729e659e859dd99c1cdb084b8ba51. It simply uses "objdump -p" instead. It also allows to remove a patch from gobject-introspection, so overall it seems like a good thing. * For dracut, the usage is pretty much the same, and a small wrapper around objdump -p would most likely be able to emulate the behavior lf prelink-rtld to list the libraries that a binary depends on. So there's a bit of work for sure, but this work would allow to remove both host-libiberty and host-prelink-cross, which are both weird packages that will inevitably cause problems. My main concerns are: (1) How to reproduce the host-gdb issue that caused the addition of the host-liberty dependency (2) How to test gobject-introspection in a simple way. There is no runtime test for it, I have no idea what is the simplest test that one can do to verify the proper functionality of gobject-introspection after we do the above changes. Best regards, Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 15:54:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:54:35 +0100 Subject: [Buildroot] [git commit] boot/afboot-stm32: disable stack-protector Message-ID: <20230208155557.B0DA584714@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c33a133704166d602090b0b0d394aa9428e6acd4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable stack-protector to avoid the following build failure: /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0003-Makefile-disable-stack-protector.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch new file mode 100644 index 0000000000..27a81b45d5 --- /dev/null +++ b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch @@ -0,0 +1,36 @@ +From d65b07d6fe438e760fdbc33a8e42650a27d5b417 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 11:09:38 +0100 +Subject: [PATCH] Makefile: disable stack-protector + +Disable stack-protector to avoid the following build failure: + +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': +stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 8f42be1..8da7a25 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ CFLAGS := -mthumb -mcpu=cortex-m4 + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Os -std=gnu99 -Wall + CFLAGS += -fno-builtin ++CFLAGS += -fno-stack-protector + LINKERFLAGS := --gc-sections + + obj-y += gpio.o mpu.o qspi.o start_kernel.o +-- +2.35.1 + From thomas.petazzoni at bootlin.com Wed Feb 8 15:56:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:56:05 +0100 Subject: [Buildroot] [PATCH 1/1] boot/afboot-stm32: disable stack-protector In-Reply-To: <20221231101451.521367-1-fontaine.fabrice@gmail.com> References: <20221231101451.521367-1-fontaine.fabrice@gmail.com> Message-ID: <20230208165605.73b2b986@windsurf> On Sat, 31 Dec 2022 11:14:51 +0100 Fabrice Fontaine wrote: > Disable stack-protector to avoid the following build failure: > > /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o > /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': > stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' > /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' > /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' > > Fixes: > - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 > > Signed-off-by: Fabrice Fontaine > --- > ...003-Makefile-disable-stack-protector.patch | 36 +++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From frank.vanbever at mind.be Wed Feb 8 15:57:51 2023 From: frank.vanbever at mind.be (Frank Vanbever) Date: Wed, 8 Feb 2023 16:57:51 +0100 Subject: [Buildroot] [PATCH 1/2] package/nginx-modsecurity: bump to version 1.0.3 Message-ID: <20230208155752.73981-1-frank.vanbever@mind.be> Signed-off-by: Frank Vanbever --- package/nginx-modsecurity/nginx-modsecurity.hash | 4 ++-- package/nginx-modsecurity/nginx-modsecurity.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nginx-modsecurity/nginx-modsecurity.hash b/package/nginx-modsecurity/nginx-modsecurity.hash index fbaf1ca239..0cd2ee07cd 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.hash +++ b/package/nginx-modsecurity/nginx-modsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.2/modsecurity-nginx-v1.0.2.tar.gz.sha256 -sha256 41a6660c50508c60df59f8f09c444d18ef8112a4c118cdc791a3992390b78c32 modsecurity-nginx-v1.0.2.tar.gz +# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.3/modsecurity-nginx-v1.0.3.tar.gz.sha256 +sha256 ae811c7208ac029cb7a99d6f63e03d3971797607517187f47620df39c1f78add modsecurity-nginx-v1.0.3.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/nginx-modsecurity/nginx-modsecurity.mk b/package/nginx-modsecurity/nginx-modsecurity.mk index 90ef8ecd51..a00c200469 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.mk +++ b/package/nginx-modsecurity/nginx-modsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_MODSECURITY_VERSION = 1.0.2 +NGINX_MODSECURITY_VERSION = 1.0.3 NGINX_MODSECURITY_SOURCE = modsecurity-nginx-v$(NGINX_MODSECURITY_VERSION).tar.gz NGINX_MODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v$(NGINX_MODSECURITY_VERSION) NGINX_MODSECURITY_LICENSE = Apache-2.0 -- 2.37.2 From thomas.petazzoni at bootlin.com Wed Feb 8 15:57:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:57:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.20.1 In-Reply-To: <20221127002135.12134-1-peter.macleod.thompson@gmail.com> References: <20221127002135.12134-1-peter.macleod.thompson@gmail.com> Message-ID: <20230208165756.5d8dd14f@windsurf> Hello Peter On Sat, 26 Nov 2022 17:21:35 -0700 Peter Thompson wrote: > LICENSE_FILES changed to LICENSE.txt for version 2.20.1. > Previous versions used COPYING.txt. > > Signed-off-by: Peter Thompson > --- > package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- > package/sdl2_ttf/sdl2_ttf.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Sorry for the long delay, but you had already sent this patch on November 19, 2022 and it was applied on November 21, 2022, so it was too late for a new version. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From frank.vanbever at mind.be Wed Feb 8 15:57:52 2023 From: frank.vanbever at mind.be (Frank Vanbever) Date: Wed, 8 Feb 2023 16:57:52 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: update e-mail for Frank Vanbever In-Reply-To: <20230208155752.73981-1-frank.vanbever@mind.be> References: <20230208155752.73981-1-frank.vanbever@mind.be> Message-ID: <20230208155752.73981-2-frank.vanbever@mind.be> Signed-off-by: Frank Vanbever --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0e116e92a3..32c6e54919 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1088,7 +1088,7 @@ F: package/sane-backends/ F: package/upx/ F: package/zxing-cpp/ -N: Frank Vanbever +N: Frank Vanbever F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ -- 2.37.2 From hrsourabh011 at gmail.com Wed Feb 8 16:07:17 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Wed, 8 Feb 2023 17:07:17 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? Message-ID: Hello All, I want to install a sdk on my Buildroot based Linux machine. SDK location https://github.com/aws/aws-iot-device-sdk-python-v2 . They don't have any packages which I can add in Buildroot. On a native Linux machine, it can be done via pip. But how to do this in Buildroot? Thanks in advance -------------- next part -------------- An HTML attachment was scrubbed... URL: From romain.naour at smile.fr Wed Feb 8 16:10:51 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 17:10:51 +0100 Subject: [Buildroot] outdated libiberty and prelink-cross support In-Reply-To: <20230208165330.43c145f3@windsurf> References: <3f3d266c-2f21-197c-29b7-fff3e230e97a@smile.fr> <20230208165330.43c145f3@windsurf> Message-ID: <5d87a68a-3489-2848-a841-8690bd59c5b6@smile.fr> Hello, Le 08/02/2023 ? 16:53, Thomas Petazzoni a ?crit?: > Hello, > > +Yann and Adam, with questions/help needed below :) > > On Wed, 2 Nov 2022 14:05:26 +0100 > Romain Naour wrote: > >> I was looking at host-binutils-2.38 issue in the autobuilder [1]. >> The issue appear only when host-libiberty is built before host-binutils >> (Binutils 2.38 only). >> >> It seems that libiberty package is still based on binutils 2.32 release and >> seems to be updated. >> >> host-libiberty is currently used by host-gdb and host-prelink-cross packages. >> >> About the prelink-cross package, it come from the Yocto project [2] but the >> support seems halted. Also the Glibc project will remove prelink support for the >> upcoming 2.37 release [3]. >> >> The annoying part is "Prelink-cross emulates a runtime linker for a given >> sysroot. This is necessary to allow gobject-introspection to build its typelib >> files during cross-compiling." [4] >> >> host-prelink-cross is currently used by dracut and gobject-introspection packages. > > I had a look, and there are things at two different levels that can be > done. Thanks! > > First, we need to remove the package/libiberty/ package. libiberty is > currently used by host-gdb and host-prelink-cross: > > * For host-gdb, the commit log says that the host libiberty might be > picked up so we need to build our own. This is weird because > libiberty is shipped in the gdb tarball. Yann, when you applied > f0a583ddc4c2cab121330284e316f54229dee492, do you remember if you > looked at why GDB wasn't picking up its own libiberty? Also, there is > no autobuilder failure, so we don't really know under what conditions > the problem can be reproduced. I had a look before writing this email and I was not sure about libiberty dependency. For me gdb build its own version. I wasn't able to prove that it can use libiberty from the host if available. > > * For host-prelink-cross, it in fact doesn't need host-libiberty. It > links against it, but apparently, the only functions it uses from > libiberty are htab_find_slot() and htab_try_create(), and both are > provided by src/hashtab.c in prelink-cross, which was copy/pasted > from libiberty, most likely to avoid the dependency. So with a bit of > effort in host-prelink-cross, the dependency on host-libiberty could > be removed. > > Then, the second level is about host-prelink-cross itself. It is used > by only two packages, so let's have a look: > > * For gobject-instrospection, it is no longer needed: openembedded-core > stopped using it in > https://github.com/openembedded/openembedded-core/commit/767e0880d4d729e659e859dd99c1cdb084b8ba51. > It simply uses "objdump -p" instead. It also allows to remove a patch > from gobject-introspection, so overall it seems like a good thing. > > * For dracut, the usage is pretty much the same, and a small wrapper > around objdump -p would most likely be able to emulate the behavior > lf prelink-rtld to list the libraries that a binary depends on. > > So there's a bit of work for sure, but this work would allow to remove > both host-libiberty and host-prelink-cross, which are both weird > packages that will inevitably cause problems. > > My main concerns are: > > (1) How to reproduce the host-gdb issue that caused the addition of the > host-liberty dependency Looking at distribution packaging, the gdb package use a bundled libiberty library: https://src.fedoraproject.org/rpms/gdb/blob/rawhide/f/gdb.spec#_122 > > (2) How to test gobject-introspection in a simple way. There is no > runtime test for it, I have no idea what is the simplest test that one > can do to verify the proper functionality of gobject-introspection > after we do the above changes. Sorry I don't know. Best regards, Romain > > Best regards, > > Thomas Petazzoni From rcrichlow9000 at gmail.com Wed Feb 8 16:14:56 2023 From: rcrichlow9000 at gmail.com (Ramon Crichlow) Date: Wed, 8 Feb 2023 10:14:56 -0600 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: Message-ID: You can build an external toolchain with buildroot using make sdk (See Section 6.1.3 in buildroot manual ) Also from the manual (Section 11.2) It has been decided that support for the native compiler on the target would be stopped from the Buildroot-2012.11 release because: this feature was neither maintained nor tested, and often broken; this feature was only available for Buildroot toolchains; Buildroot mostly targets small or very small target hardware with limited resource onboard (CPU, ram, mass-storage), for which compiling on the target does not make much sense; Buildroot aims at easing the cross-compilation, making native compilation on the target unnecessary. On Wed, Feb 8, 2023 at 10:07 AM Sourabh Hegde wrote: > Hello All, > > I want to install a sdk on my Buildroot based Linux machine. SDK location > https://github.com/aws/aws-iot-device-sdk-python-v2 . They don't have any > packages which I can add in Buildroot. > > On a native Linux machine, it can be done via pip. But how to do this in > Buildroot? > > Thanks in advance > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Wed Feb 8 16:20:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 17:20:14 +0100 Subject: [Buildroot] [PATCH 0/3] package/dmalloc: cleanups and ssp workaround (branch yem/dmalloc) Message-ID: Hello All! This short series cleans up (a bit) our dmalloc package, and disables SSP altogether to avoid build failures due to limitations in the dmalloc build system. Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (3): package/dmalloc: convert existing patch to git format package/dmalloc: use actual patches rather than sed-ing package/dmalloc: don't use SSP .../dmalloc/0001-configure-fix-build-on-mips.patch | 87 ++++++++++++++++++++++ package/dmalloc/0001-mips.patch | 45 ----------- ...003-configure-allow-overriding-some-tests.patch | 80 ++++++++++++++++++++ ...e-the-configure-detected-or-user-supplied.patch | 50 +++++++++++++ ...onfigure-use-LD-instead-of-hard-coding-ld.patch | 67 +++++++++++++++++ package/dmalloc/dmalloc.mk | 24 +++--- 6 files changed, 296 insertions(+), 57 deletions(-) create mode 100644 package/dmalloc/0001-configure-fix-build-on-mips.patch delete mode 100644 package/dmalloc/0001-mips.patch create mode 100644 package/dmalloc/0003-configure-allow-overriding-some-tests.patch create mode 100644 package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch create mode 100644 package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch -- .-----------------.--------------------.------------------.--------------------. | 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 Feb 8 16:20:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 17:20:15 +0100 Subject: [Buildroot] [PATCH 2/3] package/dmalloc: use actual patches rather than sed-ing In-Reply-To: References: Message-ID: Our dmalloc packaging is very old and carries historical baggage and idiosyncracies that we have long stopped doing in the rest ofthe code base. Drop our post-patch hooks that seds the configure and Makefile.in files, and add patches (that could be upstreamed one day). We provide the results in the environment, like would be done with actual autoconf cache variables (ac_cv_*). Note: those are the result of cleaning up for further patches that did not manifest because it was too complex to add proper SSP support to dmalloc (instead, we're going to forcibly disable it in the following commit). Note-2: those patches have not been submitted upstream, as it's mostly dead: even though there's een some commit activities recently-ish, there has been no review or comments or the many PR pending for many years now. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- ...onfigure-allow-overriding-some-tests.patch | 80 +++++++++++++++++++ ...-configure-detected-or-user-supplied.patch | 50 ++++++++++++ ...ure-use-LD-instead-of-hard-coding-ld.patch | 67 ++++++++++++++++ package/dmalloc/dmalloc.mk | 17 ++-- 4 files changed, 202 insertions(+), 12 deletions(-) create mode 100644 package/dmalloc/0003-configure-allow-overriding-some-tests.patch create mode 100644 package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch create mode 100644 package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch diff --git a/package/dmalloc/0003-configure-allow-overriding-some-tests.patch b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch new file mode 100644 index 0000000000..3003e8cbe4 --- /dev/null +++ b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch @@ -0,0 +1,80 @@ +From 9d57d4353c82110c609f36f91986277343d4ee45 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:26:56 +0100 +Subject: [PATCH] configure: allow overriding some tests + +Some tests use AC_RUN_IFELSE, so they do not work for cross-compilation. + +Allow the user to provide these results from the environment. + +Signed-off-by: Yann E. MORIN +--- + configure | 6 +++--- + configure.ac | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index c18dfb2..d165962 100755 +--- a/configure ++++ b/configure +@@ -4540,7 +4540,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strdup macro" >&5 + $as_echo_n "checking strdup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strdup_macro=no ++ ac_cv_strdup_macro="${ac_cv_strdup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4578,7 +4578,7 @@ $as_echo "$ac_cv_strdup_macro" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strndup macro" >&5 + $as_echo_n "checking strndup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strndup_macro=no ++ ac_cv_strndup_macro="${ac_cv_strndup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4753,7 +4753,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking basic-block size" >&5 + $as_echo_n "checking basic-block size... " >&6; } +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + if test "$cross_compiling" = yes; then : + ac_cv_page_size=0 +diff --git a/configure.ac b/configure.ac +index 9740fdc..51bdf4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -292,7 +292,7 @@ int main() { return 1; } + ]])], + [ac_cv_strdup_macro=yes], + [ac_cv_strdup_macro=no], +-[ac_cv_strdup_macro=no] ++[ac_cv_strdup_macro="${ac_cv_strdup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strdup_macro]) + +@@ -316,7 +316,7 @@ int main() { return 1; } + ]])], + [ac_cv_strndup_macro=yes], + [ac_cv_strndup_macro=no], +-[ac_cv_strndup_macro=no] ++[ac_cv_strndup_macro="${ac_cv_strndup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strndup_macro]) + +@@ -390,7 +390,7 @@ AC_MSG_RESULT([$ac_cv_use_mmap]) + # + AC_CHECK_FUNCS(getpagesize) + AC_MSG_CHECKING([basic-block size]) +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + AC_RUN_IFELSE([AC_LANG_SOURCE([ + #if HAVE_UNISTD_H +-- +2.25.1 + diff --git a/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch new file mode 100644 index 0000000000..394e7ca34e --- /dev/null +++ b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch @@ -0,0 +1,50 @@ +From c958fd5cd7d5ff03c0a023608b53b74997c514b3 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:43:55 +0100 +Subject: [PATCH] Makefile: use the configure-detected or user-supplied ar + program + +Signed-off-by: Yann E. MORIN +--- + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 86d3cca..089ac99 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -303,11 +303,11 @@ $(LIB_SL) : $(LIBRARY) + mv $@.t $@ + + $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH) : $(OBJS) $(THREAD_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_SL) : $(LIB_TH) +@@ -316,7 +316,7 @@ $(LIB_TH_SL) : $(LIB_TH) + mv $@.t $@ + + $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_CXX_SL) : $(LIB_CXX) +@@ -325,7 +325,7 @@ $(LIB_CXX_SL) : $(LIB_CXX) + mv $@.t $@ + + $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) +-- +2.25.1 + diff --git a/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch new file mode 100644 index 0000000000..3ba6ee3dc7 --- /dev/null +++ b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch @@ -0,0 +1,67 @@ +From d77e5f3d45b0cbae850e3a6e23d52edc137be803 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:52:05 +0100 +Subject: [PATCH] configure: use ${LD} instead of hard-coding 'ld' + +When doing cross-compilation, we do not want to use the native tools to +test, but the target tools. + +Note that the weird quoting is inherited from a legacy patch in +Buildroot, which dates back ages (at least 2006), and as it has not been +identified as breaking things, we keep it as-is... Meh... + +Signed-off-by: Yann E. MORIN +--- + configure | 12 ++++++------ + configure.ac | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/configure b/configure +index 810636e..30a7ea3 100755 +--- a/configure ++++ b/configure +@@ -4377,12 +4377,12 @@ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +diff --git a/configure.ac b/configure.ac +index 51bdf4d..0d80a78 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,12 +169,12 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int foo(int val) { return val + 1; } ])],[ + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +-- +2.25.1 + diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 81ac467277..6b90f810b2 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -44,18 +44,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_63261),y) DMALLOC_CFLAGS += -O0 endif -DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)" - -define DMALLOC_POST_PATCH - $(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure - $(SED) 's/ac_cv_strdup_macro=no$$/ac_cv_strdup_macro=yes/' $(@D)/configure - $(SED) 's/ac_cv_strndup_macro=no$$/ac_cv_strndup_macro=yes/' $(@D)/configure - $(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure - $(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure - $(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in -endef - -DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH +DMALLOC_CONF_ENV = \ + CFLAGS="$(DMALLOC_CFLAGS)" \ + ac_cv_page_size=12 \ + ac_cv_strdup_macro=yes \ + ac_cv_strndup_macro=yes # both DESTDIR and PREFIX are ignored.. define DMALLOC_INSTALL_STAGING_CMDS -- 2.25.1 From yann.morin.1998 at free.fr Wed Feb 8 16:20:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 17:20:16 +0100 Subject: [Buildroot] [PATCH 3/3] package/dmalloc: don't use SSP In-Reply-To: References: Message-ID: <6ab1ebdce8bb87f50f68bf1c57ecf988345c2330.1675873210.git.yann.morin.1998@free.fr> dmalloc directly calls into $(LD) to generate a shared library our of the static one. To detet what command it should run, ./configure tries various incantations of ld with various command line options until one does not fail. One of those is (basically): $(LD) --whole-archive -o contest.o.t contest.a This makes ./configure conclude what the command to link a shared library in the Makefile should be, and thus stores that in a variable: shlinkargs='$(LD) --whole-archive -o $@' ... which is then AC_SUBST()ed into Makefile.in with a rule like: $(SHLIB): $(LIBRARY) @shlinkargs@ $(LIRARY) which once substiuted, gives: $(SHLIB): $(LIBRARY) $(LD) --whole-archive -o $@ $(LIRARY) However, when SSP is enabled, the __stack_chk_fail_local and co symbols are provided by additional libraries or object files, and that is the responsibility of gcc to pass those when linking. But as dmalloc directly calls ld, it misses those. Changing dmalloc to use $(CC) is not trivial, however. First, we can't pass LD=$(TARGET_CC), otherwise the whole package explodes [0]: indeed --whole-archive is unknown to gcc, so it must be passed as -Wl,--whole archive instead. So we'd need to add a new test that uses $(CC), like so: $(CC) -Wl,--whole-archive -o contest.o.t contest.a However, in that case, gcc does pass additional libs/objs (like, for eample, the SSP ones) to the linker. But then those are also inc;luded in the whole-archive section. This causes the linker to add all the symbols form those libs/objs, even those not needed for SSP; on some archs, like PPC, that may require floating point symbols (__muldiv3 et al.) which are in another library, and thus the linked can't find them. The proper solution wouild be to add -Wl,--no-whole-archive, but that would have to be added _after_ the library we want to link, i.e.e we should be able to evntually run: $(CC) -Wl,--whole-archive -o $@ $(LIRARY) -Wl,--no-whole-archive That would require that we introduce a new variable that is added _afgter_ the $(LIBRARY), e.g. @shlinkargs_post@ or so... This is a bigger endeavour than we want to pursue... Since dmalloc is a debugging utility, it is not supposed to go into production builds, and during debugging, it would not be surprising that it needs to poke around arrays to debug them. So, we go the easier route: disable SSP altogether. [0] with lots of nce colors, but that's not the point, is it? Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- package/dmalloc/dmalloc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 6b90f810b2..5bd6691725 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -14,6 +14,13 @@ DMALLOC_LICENSE_FILES = LICENSE.txt DMALLOC_INSTALL_STAGING = YES DMALLOC_CFLAGS = $(TARGET_CFLAGS) +# dmalloc uses $(LD) to link, and thus misses the object files or libs that +# are needed to provide the __stack_chk_fail_local and co. symbols. Changing +# to use $(CC) is really more complex that we'd like. Since dmalloc is +# involved in debugging memory allocation, it is not expected to be a +# production library, so we do not care that much that it has SSP. +DMALLOC_CFLAGS += -fno-stack-protector + ifeq ($(BR2_STATIC_LIBS),y) DMALLOC_CONF_OPTS += --disable-shlib else -- 2.25.1 From yann.morin.1998 at free.fr Wed Feb 8 16:20:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 17:20:14 +0100 Subject: [Buildroot] [PATCH 1/3] package/dmalloc: convert existing patch to git format In-Reply-To: References: Message-ID: We're going to add more patches, so let's cleanup our historical baggage... Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- .../0001-configure-fix-build-on-mips.patch | 87 +++++++++++++++++++ package/dmalloc/0001-mips.patch | 45 ---------- 2 files changed, 87 insertions(+), 45 deletions(-) create mode 100644 package/dmalloc/0001-configure-fix-build-on-mips.patch delete mode 100644 package/dmalloc/0001-mips.patch diff --git a/package/dmalloc/0001-configure-fix-build-on-mips.patch b/package/dmalloc/0001-configure-fix-build-on-mips.patch new file mode 100644 index 0000000000..90a6ad7f54 --- /dev/null +++ b/package/dmalloc/0001-configure-fix-build-on-mips.patch @@ -0,0 +1,87 @@ +From af6adb3f5f05be4faa88a5aa83296c388c8085e7 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 12:30:10 +0100 +Subject: [PATCH] configure: fix build on mips + +This patch is a historical baggage that Buildroot has carried for ages +(since 2006), and the reason for it are notentirely clear. + +Since dmalloc is pretty tricky, and as this patch has not been +identified as causing issues, we keep it; we just add the configure.ac +patchlet to match the one in configure. + +As for the title, the original patch was named dmalloc-mips.patch, so +presumably it fixes some mips issue; let's title the commit that way. + +Signed-off-by: Yann E. MORIN +--- + configure | 4 ++-- + configure.ac | 2 +- + return.h | 16 +++------------- + 3 files changed, 6 insertions(+), 16 deletions(-) + +diff --git a/configure b/configure +index d52a1e8..c18dfb2 100755 +--- a/configure ++++ b/configure +@@ -5413,8 +5413,8 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 + $as_echo_n "checking return.h macros work... " >&6; } + if test "$cross_compiling" = yes; then : +- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assume yes (cross-compiling)" >&5 + $as_echo "no" >&6; } + + else +diff --git a/configure.ac b/configure.ac +index a5295f1..9740fdc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -705,7 +705,7 @@ int main() + ])], + [ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([yes]) ], + [ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ], +-[ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ] ++[ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([assume yes (cross-compiling)]) ] + ) + + ############################################################################## +diff --git a/return.h b/return.h +index 9d3f5f1..d916c7a 100644 +--- a/return.h ++++ b/return.h +@@ -117,26 +117,16 @@ + /*************************************/ + + /* +- * For DEC Mips machines running Ultrix ++ * For Mips machines running Linux + */ + #if __mips + +-/* +- * I have no idea how to get inline assembly with the default cc. +- * Anyone know how? +- */ +- +-#if 0 +- + /* + * NOTE: we assume here that file is global. + * +- * $31 is the frame pointer. $2 looks to be the return address but maybe +- * not consistently. ++ * $31 is the return address. + */ +-#define GET_RET_ADDR(file) asm("sw $2, file") +- +-#endif ++#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) + + #endif /* __mips */ + +-- +2.25.1 + diff --git a/package/dmalloc/0001-mips.patch b/package/dmalloc/0001-mips.patch deleted file mode 100644 index 3150d030ec..0000000000 --- a/package/dmalloc/0001-mips.patch +++ /dev/null @@ -1,45 +0,0 @@ -[Fabrice: Updated for 5.6.5] -Signed-off-by: Fabrice Fontaine ---- a/configure -+++ b/configure -@@ -7107,7 +7107,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 - $as_echo_n "checking return.h macros work... " >&6; } - if test "$cross_compiling" = yes; then : -- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h -+ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - ---- a/return.h -+++ b/return.h -@@ -106,26 +106,16 @@ - /*************************************/ - - /* -- * For DEC Mips machines running Ultrix -+ * For Mips machines running Linux - */ - #if __mips - - /* -- * I have no idea how to get inline assembly with the default cc. -- * Anyone know how? -- */ -- --#if 0 -- --/* - * NOTE: we assume here that file is global. - * -- * $31 is the frame pointer. $2 looks to be the return address but maybe -- * not consistently. -+ * $31 is the return address. - */ --#define GET_RET_ADDR(file) asm("sw $2, file") -- --#endif -+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) - - #endif /* __mips */ - -- 2.25.1 From ps.report at gmx.net Wed Feb 8 16:25:34 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 8 Feb 2023 17:25:34 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: security bump to version 1.1.1t Message-ID: <20230208162534.28581-1-ps.report@gmx.net> Changelog (for details see [1] and [2]): Changes between 1.1.1s and 1.1.1t [7 Feb 2023] *) Fixed X.400 address type confusion in X.509 GeneralName. There is a type confusion vulnerability relating to X.400 address processing inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This vulnerability may allow an attacker who can provide a certificate chain and CRL (neither of which need have a valid signature) to pass arbitrary pointers to a memcmp call, creating a possible read primitive, subject to some constraints. Refer to the advisory for more information. Thanks to David Benjamin for discovering this issue. (CVE-2023-0286) This issue has been fixed by changing the public header file definition of GENERAL_NAME so that x400Address reflects the implementation. It was not possible for any existing application to successfully use the existing definition; however, if any application references the x400Address field (e.g. in dead code), note that the type of this field has changed. There is no ABI change. [Hugo Landau] *) Fixed Use-after-free following BIO_new_NDEF. The public API function BIO_new_NDEF is a helper function used for streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL to support the SMIME, CMS and PKCS7 streaming capabilities, but may also be called directly by end user applications. The function receives a BIO from the caller, prepends a new BIO_f_asn1 filter BIO onto the front of it to form a BIO chain, and then returns the new head of the BIO chain to the caller. Under certain conditions, for example if a CMS recipient public key is invalid, the new filter BIO is freed and the function returns a NULL result indicating a failure. However, in this case, the BIO chain is not properly cleaned up and the BIO passed by the caller still retains internal pointers to the previously freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO then a use-after-free will occur. This will most likely result in a crash. (CVE-2023-0215) [Viktor Dukhovni, Matt Caswell] *) Fixed Double free after calling PEM_read_bio_ex. The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload data. If the function succeeds then the "name_out", "header" and "data" arguments are populated with pointers to buffers containing the relevant decoded data. The caller is responsible for freeing those buffers. It is possible to construct a PEM file that results in 0 bytes of payload data. In this case PEM_read_bio_ex() will return a failure code but will populate the header argument with a pointer to a buffer that has already been freed. If the caller also frees this buffer then a double free will occur. This will most likely lead to a crash. The functions PEM_read_bio() and PEM_read() are simple wrappers around PEM_read_bio_ex() and therefore these functions are also directly affected. These functions are also called indirectly by a number of other OpenSSL functions including PEM_X509_INFO_read_bio_ex() and SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL internal uses of these functions are not vulnerable because the caller does not free the header argument if PEM_read_bio_ex() returns a failure code. (CVE-2022-4450) [Kurt Roeckx, Matt Caswell] *) Fixed Timing Oracle in RSA Decryption. A timing based side channel exists in the OpenSSL RSA Decryption implementation which could be sufficient to recover a plaintext across a network in a Bleichenbacher style attack. To achieve a successful decryption an attacker would have to be able to send a very large number of trial messages for decryption. The vulnerability affects all RSA padding modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. (CVE-2022-4304) [Dmitry Belyavsky, Hubert Kario] Changes between 1.1.1r and 1.1.1s [1 Nov 2022] *) Fixed a regression introduced in 1.1.1r version not refreshing the certificate data to be signed before signing the certificate. [Gibeom Gwon] Changes between 1.1.1q and 1.1.1r [11 Oct 2022] *) Fixed the linux-mips64 Configure target which was missing the SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that platform. [Adam Joseph] *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was causing incorrect results in some cases as a result. [Paul Dale] *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to report correct results in some cases [Matt Caswell] *) Fixed a regression introduced in 1.1.1o for re-signing certificates with different key sizes [Todd Short] *) Added the loongarch64 target [Shi Pujin] *) Fixed a DRBG seed propagation thread safety issue [Bernd Edlinger] *) Fixed a memory leak in tls13_generate_secret [Bernd Edlinger] *) Fixed reported performance degradation on aarch64. Restored the implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid 32-bit lane assignment in CTR mode") for 64bit targets only, since it is reportedly 2-17% slower and the silicon errata only affects 32bit targets. The new algorithm is still used for 32 bit targets. [Bernd Edlinger] *) Added a missing header for memcmp that caused compilation failure on some platforms [Gregor Jasny] [1] https://www.openssl.org/news/cl111.txt [2] https://www.openssl.org/news/vulnerabilities.html 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 8457df6c0a..ebc56b11dd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1q.tar.gz.sha256 -sha256 d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca openssl-1.1.1q.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 +sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index fc22c20467..6e84f06175 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1q +LIBOPENSSL_VERSION = 1.1.1t LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay -- 2.39.1 From ps.report at gmx.net Wed Feb 8 16:27:26 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 8 Feb 2023 17:27:26 +0100 Subject: [Buildroot] [PATCH v1] package/qt6base: additional disable FEATURE_avx512vbmi2 and FEATURE_vaes Message-ID: <20230208162726.28775-1-ps.report@gmx.net> - additional disable new FEATURE_avx512vbmi2/FEATURE_vaes (added with upstream commit [1]) [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=38e6b637b71fae274caedc1d326f641b904e00a4 Signed-off-by: Peter Seiderer --- package/qt6/qt6base/qt6base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 212b2d689e..e6cf4f14bb 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -72,7 +72,9 @@ QT6BASE_CONF_OPTS += \ -DFEATURE_avx512ifma=OFF \ -DFEATURE_avx512pf=OFF \ -DFEATURE_avx512vbmi=OFF \ - -DFEATURE_avx512vl=OFF + -DFEATURE_avx512vbmi2=OFF \ + -DFEATURE_avx512vl=OFF \ + -DFEATURE_vaes=OFF define QT6BASE_BUILD_CMDS $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6BASE_BUILDDIR) -- 2.39.1 From yann.morin.1998 at free.fr Wed Feb 8 16:28:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 17:28:19 +0100 Subject: [Buildroot] [PATCH 2/2] package/dmalloc: disable stack-protector In-Reply-To: <20220612203729.GM427639@scaer> References: <20220610210541.3643416-1-fontaine.fabrice@gmail.com> <20220610210541.3643416-2-fontaine.fabrice@gmail.com> <20220612203729.GM427639@scaer> Message-ID: <20230208162819.GA3386@scaer> Fabrice, All, On 2022-06-12 22:37 +0200, Yann E. MORIN spake thusly: > On 2022-06-10 23:05 +0200, Fabrice Fontaine spake thusly: > > Fix the following build failure with stack-protector: > > /home/autobuild/autobuild/instance-1/output-1/per-package/dmalloc/host/bin/i686-buildroot-linux-gnu-ld -shared --whole-archive -soname libdmallocth.so -o libdmallocth.so.t libdmallocth.a > > /home/autobuild/autobuild/instance-1/output-1/per-package/dmalloc/host/bin/i686-buildroot-linux-gnu-ld: libdmallocth.a(append.o): in function `append_long': > > append.c:(.text+0x115): undefined reference to `__stack_chk_fail_local' [--SNIP--] > > +DMALLOC_CFLAGS = $(TARGET_CFLAGS) -fno-stack-protector > > At the risk of more goofiness, but the reference build issue had me > notice that dmalloc uses ld to do the link phase, while it should really > call gcc. [--SNIP--] > So, thisis a bit of a bigger change, but I otherwise fdo not think that > disabling SSP is a good idea, especially for a library that deals with > allocating memory... So, I eventually took the day to look at this during the dev-days. I've sent an updated series now: https://patchwork.ozlabs.org/project/buildroot/list/?series=340858 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 rcrichlow9000 at gmail.com Wed Feb 8 16:30:53 2023 From: rcrichlow9000 at gmail.com (Ramon Crichlow) Date: Wed, 8 Feb 2023 10:30:53 -0600 Subject: [Buildroot] stm32mp1 kernel won't boot on custom board In-Reply-To: <1349e0d6ec9b6276a76371b29260432890ad680e.camel@dopsi.ch> References: <1349e0d6ec9b6276a76371b29260432890ad680e.camel@dopsi.ch> Message-ID: The cd-gpios property of sdmmc at 58005000 was different in the custom board dts and the dk1 dts. Modifying the dk1 uboot dts and the kernel dts (stm32mp15xx-dkx.dtsi) allowed me to boot the custom board with the latest kernel. The kernel wasn't getting the card detect signal so wasn't able to mount the sd card. Regards, Ramon On Mon, Jan 30, 2023 at 8:54 AM Simon Doppler wrote: > Hello Ramon, > > On Sat, 2023-01-28 at 14:52 -0600, Ra C wrote: > > I have a custom stm32mp157a board which runs OK with a modified 5.4 > kernel. > > I want to migrate to the latest stm supported kernel. > > I built a stm32mp157a_dk1 target using the BR2_EXTERNAL feature > described here: > > https://github.com/bootlin/buildroot-external-st which builds a 5.15 > kernel. > > > > Using the same dtb , the 5.15 kernel fails to mount the root device (a > micro sd card on SDMMC1) > > and gets stuck in a loop looking for a device matching the PARTUUID > in class_find_device(). The > > only devices listed are loop and ram. > > > > The probe function in drivers/mmc/host/mmci.c, which gets called in the > working kernel prior to > > mounting the root device does not get called with the 5.15 kernel. > > > > I don't understand why this is happening given that the same device tree > is used in both cases and > > not sure where next to look. > > Since the DTB is the same, are all the required drivers present (not as > modules)? I didn't check > which drivers exactly are built in with the configs ST provides. I would > especially check for the > CONFIG_MMC* values and whether the required filesystem support is built in. > > Best, > > Simon > -------------- next part -------------- An HTML attachment was scrubbed... URL: From arnout at mind.be Wed Feb 8 16:36:41 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 17:36:41 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: revert bpf_cookie patch to allow building In-Reply-To: <29d2a8c7-44cd-da42-5fed-f17ec0f8ccf2@synopsys.com> References: <97ea44bb-58fe-d6cb-6c79-9be0b245f2c6@synopsys.com> <29d2a8c7-44cd-da42-5fed-f17ec0f8ccf2@synopsys.com> Message-ID: Hi Shahab, On 15/06/2022 12:57, Shahab Vahedi wrote: > Building bpftool on Debian 11 (bullseye) with kernel v5.10 fails: > > -----------------------------------8<----------------------------------- > $ make > . > . > . > CLANG pid_iter.bpf.o > skeleton/pid_iter.bpf.c:47:14: error: incomplete definition of type > 'struct bpf_perf_link' > perf_link = container_of(link, struct bpf_perf_link, link); > . > . > . > skeleton/pid_iter.bpf.c:49:30: error: no member named 'bpf_cookie' in > 'struct perf_event' > return BPF_CORE_READ(event, bpf_cookie); > . > . > . > 10 errors generated. > make: *** [Makefile:176: pid_iter.bpf.o] Error 1 > ----------------------------------->8----------------------------------- > > To be clearer about the setup, there is a clang (11) installed on this > system. bpftool's build process enables "co-re" feature (Compile-Once, > Run-Everywhere) if the clang compiler is new enough to support > BTF_KIND_VAR [1]. When that happens, bpftool will bootstrap itself: > build/bootstrap/libbpf.a. This bootstrap part is about those *.bpf.c > programs and are only built by invoking clang [2], irrespective of the > compiler used to build the rest of the bpftool. To sum it up, to > reproduce the issue, all you need is having the "co-re" feature > enabled and a kernel that does not provide all the data structures > expected. > > There are changes in bpftool v6.8.0 that assumes the existence of > particular data structures in generated vmlinux.h that is obtained > from the host machine. See [3] for further details. This commit adds > a patch to revert that additional change in v6.8.0. > > There's a patch series pending to be submitted upstream [4]. Hopefully, > those will take care of the problem if they land in the next release. Unfortunately, bpftool has been bumped two times since then and it looks like those patches are still not included... > > [1] Checking for the clang support > https://github.com/libbpf/bpftool/blob/d4469819d1d639ae2354f3d2ddd10377f081a576/src/Makefile.feature#L12 > > [2] Using clang to bootstrap > https://github.com/libbpf/bpftool/blob/d4469819d1d639ae2354f3d2ddd10377f081a576/src/Makefile#L175 > > [3] Question about the problem > https://lore.kernel.org/bpf/c47f732d-dba8-2c13-7c72-3a651bf72353 at synopsys.com/t/#u > > [4] Pending patch series > https://lore.kernel.org/bpf/20220421003152.339542-1-alobakin at pm.me/ It's not clear to me why you did a revert of the cookie feature rather than using those patches. I think the first two or three should be sufficient to fix your issue? For the time being, I marked this as Changes Requested. If the upstream patches are not sufficient, please send a mail upstream (as a reply to that series) explaining the problem (again), and re-send this patch to Buildroot. If it does fix things, please send a mail upstream to ask to move the series forward (explaining the issue you have), and send a patch to Buildroot that adds the needed patches. Thanks! Regards, Arnout > > Signed-off-by: Shahab Vahedi > --- > > Changelog: > v1: Initial submission > v2: Use a full fledged git patch for bpftool > v3: Fix the snafu that resulted in malformed patch file > v4: Reword the commit message to make it clearer > > .../0002-revert-bpf_cookie-change.patch | 129 ++++++++++++++++++ > 1 file changed, 129 insertions(+) > create mode 100644 package/bpftool/0002-revert-bpf_cookie-change.patch > > diff --git a/package/bpftool/0002-revert-bpf_cookie-change.patch b/package/bpftool/0002-revert-bpf_cookie-change.patch > new file mode 100644 > index 0000000000..6f9579bd23 > --- /dev/null > +++ b/package/bpftool/0002-revert-bpf_cookie-change.patch > @@ -0,0 +1,129 @@ > +From d7c78d1e38cde73c85b491a833f0e6e3f0d62654 Mon Sep 17 00:00:00 2001 > +From: Shahab Vahedi > +Date: Tue, 14 Jun 2022 10:12:21 +0200 > +Subject: [PATCH] Revert commit "bpftool: Add bpf_cookie to link output" > + > +Building bpftool on a Debian bullseye with clang-11 fails [1]. > +This patch reverts the offending commit [2]. If clang-11 is not > +installed, then the "co-re" feature of bpf will not be enabled > +and the issue remains dormant. > + > +[1] Building release 6.8.0 on Debian 11 > +https://lore.kernel.org/bpf/c47f732d-dba8-2c13-7c72-3a651bf72353 at synopsys.com/t/#u > + > +[2] bpftool: Add bpf_cookie to link output > +https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/commit/?id=cbdaf71f > + > +Signed-off-by: Shahab Vahedi > +--- > + src/main.h | 2 -- > + src/pids.c | 8 -------- > + src/skeleton/pid_iter.bpf.c | 22 ---------------------- > + src/skeleton/pid_iter.h | 2 -- > + 4 files changed, 34 deletions(-) > + > +diff --git a/src/main.h b/src/main.h > +index aa99ffa..2f2b638 100644 > +--- a/src/main.h > ++++ b/src/main.h > +@@ -111,9 +111,7 @@ struct obj_ref { > + > + struct obj_refs { > + int ref_cnt; > +- bool has_bpf_cookie; > + struct obj_ref *refs; > +- __u64 bpf_cookie; > + }; > + > + struct btf; > +diff --git a/src/pids.c b/src/pids.c > +index e2d00d3..57f0d1b 100644 > +--- a/src/pids.c > ++++ b/src/pids.c > +@@ -78,8 +78,6 @@ static void add_ref(struct hashmap *map, struct pid_iter_entry *e) > + ref->pid = e->pid; > + memcpy(ref->comm, e->comm, sizeof(ref->comm)); > + refs->ref_cnt = 1; > +- refs->has_bpf_cookie = e->has_bpf_cookie; > +- refs->bpf_cookie = e->bpf_cookie; > + > + err = hashmap__append(map, u32_as_hash_field(e->id), refs); > + if (err) > +@@ -206,9 +204,6 @@ void emit_obj_refs_json(struct hashmap *map, __u32 id, > + if (refs->ref_cnt == 0) > + break; > + > +- if (refs->has_bpf_cookie) > +- jsonw_lluint_field(json_writer, "bpf_cookie", refs->bpf_cookie); > +- > + jsonw_name(json_writer, "pids"); > + jsonw_start_array(json_writer); > + for (i = 0; i < refs->ref_cnt; i++) { > +@@ -238,9 +233,6 @@ void emit_obj_refs_plain(struct hashmap *map, __u32 id, const char *prefix) > + if (refs->ref_cnt == 0) > + break; > + > +- if (refs->has_bpf_cookie) > +- printf("\n\tbpf_cookie %llu", (unsigned long long) refs->bpf_cookie); > +- > + printf("%s", prefix); > + for (i = 0; i < refs->ref_cnt; i++) { > + struct obj_ref *ref = &refs->refs[i]; > +diff --git a/src/skeleton/pid_iter.bpf.c b/src/skeleton/pid_iter.bpf.c > +index eb05ea5..f70702f 100644 > +--- a/src/skeleton/pid_iter.bpf.c > ++++ b/src/skeleton/pid_iter.bpf.c > +@@ -38,17 +38,6 @@ static __always_inline __u32 get_obj_id(void *ent, enum bpf_obj_type type) > + } > + } > + > +-/* could be used only with BPF_LINK_TYPE_PERF_EVENT links */ > +-static __u64 get_bpf_cookie(struct bpf_link *link) > +-{ > +- struct bpf_perf_link *perf_link; > +- struct perf_event *event; > +- > +- perf_link = container_of(link, struct bpf_perf_link, link); > +- event = BPF_CORE_READ(perf_link, perf_file, private_data); > +- return BPF_CORE_READ(event, bpf_cookie); > +-} > +- > + SEC("iter/task_file") > + int iter(struct bpf_iter__task_file *ctx) > + { > +@@ -80,19 +69,8 @@ int iter(struct bpf_iter__task_file *ctx) > + if (file->f_op != fops) > + return 0; > + > +- __builtin_memset(&e, 0, sizeof(e)); > + e.pid = task->tgid; > + e.id = get_obj_id(file->private_data, obj_type); > +- > +- if (obj_type == BPF_OBJ_LINK) { > +- struct bpf_link *link = (struct bpf_link *) file->private_data; > +- > +- if (BPF_CORE_READ(link, type) == BPF_LINK_TYPE_PERF_EVENT) { > +- e.has_bpf_cookie = true; > +- e.bpf_cookie = get_bpf_cookie(link); > +- } > +- } > +- > + bpf_probe_read_kernel_str(&e.comm, sizeof(e.comm), > + task->group_leader->comm); > + bpf_seq_write(ctx->meta->seq, &e, sizeof(e)); > +diff --git a/src/skeleton/pid_iter.h b/src/skeleton/pid_iter.h > +index bbb570d..5692cf2 100644 > +--- a/src/skeleton/pid_iter.h > ++++ b/src/skeleton/pid_iter.h > +@@ -6,8 +6,6 @@ > + struct pid_iter_entry { > + __u32 id; > + int pid; > +- __u64 bpf_cookie; > +- bool has_bpf_cookie; > + char comm[16]; > + }; > + > +-- > +2.30.2 > + From thomas.petazzoni at bootlin.com Wed Feb 8 16:41:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:41:33 +0100 Subject: [Buildroot] [git commit] package/qt6base: additional disable FEATURE_avx512vbmi2 and FEATURE_vaes Message-ID: <20230208164146.0224A8139E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ff07d3e60d23816a958aae413d4dc7e2dd17003 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - additional disable new FEATURE_avx512vbmi2/FEATURE_vaes (added with upstream commit [1]) [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=38e6b637b71fae274caedc1d326f641b904e00a4 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 212b2d689e..e6cf4f14bb 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -72,7 +72,9 @@ QT6BASE_CONF_OPTS += \ -DFEATURE_avx512ifma=OFF \ -DFEATURE_avx512pf=OFF \ -DFEATURE_avx512vbmi=OFF \ - -DFEATURE_avx512vl=OFF + -DFEATURE_avx512vbmi2=OFF \ + -DFEATURE_avx512vl=OFF \ + -DFEATURE_vaes=OFF define QT6BASE_BUILD_CMDS $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6BASE_BUILDDIR) From thomas.petazzoni at bootlin.com Wed Feb 8 16:41:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:41:47 +0100 Subject: [Buildroot] [PATCH v1] package/qt6base: additional disable FEATURE_avx512vbmi2 and FEATURE_vaes In-Reply-To: <20230208162726.28775-1-ps.report@gmx.net> References: <20230208162726.28775-1-ps.report@gmx.net> Message-ID: <20230208174147.04b62979@windsurf> On Wed, 8 Feb 2023 17:27:26 +0100 Peter Seiderer wrote: > - additional disable new FEATURE_avx512vbmi2/FEATURE_vaes (added with > upstream commit [1]) > > [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=38e6b637b71fae274caedc1d326f641b904e00a4 > > Signed-off-by: Peter Seiderer > --- > package/qt6/qt6base/qt6base.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 16:42:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:42:32 +0100 Subject: [Buildroot] [git commit] package/libopenssl: security bump to version 1.1.1t Message-ID: <20230208164252.5683C84758@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=040896bd4338f7ca419766578db49af154b762c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog (for details see [1] and [2]): Changes between 1.1.1s and 1.1.1t [7 Feb 2023] *) Fixed X.400 address type confusion in X.509 GeneralName. There is a type confusion vulnerability relating to X.400 address processing inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This vulnerability may allow an attacker who can provide a certificate chain and CRL (neither of which need have a valid signature) to pass arbitrary pointers to a memcmp call, creating a possible read primitive, subject to some constraints. Refer to the advisory for more information. Thanks to David Benjamin for discovering this issue. (CVE-2023-0286) This issue has been fixed by changing the public header file definition of GENERAL_NAME so that x400Address reflects the implementation. It was not possible for any existing application to successfully use the existing definition; however, if any application references the x400Address field (e.g. in dead code), note that the type of this field has changed. There is no ABI change. [Hugo Landau] *) Fixed Use-after-free following BIO_new_NDEF. The public API function BIO_new_NDEF is a helper function used for streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL to support the SMIME, CMS and PKCS7 streaming capabilities, but may also be called directly by end user applications. The function receives a BIO from the caller, prepends a new BIO_f_asn1 filter BIO onto the front of it to form a BIO chain, and then returns the new head of the BIO chain to the caller. Under certain conditions, for example if a CMS recipient public key is invalid, the new filter BIO is freed and the function returns a NULL result indicating a failure. However, in this case, the BIO chain is not properly cleaned up and the BIO passed by the caller still retains internal pointers to the previously freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO then a use-after-free will occur. This will most likely result in a crash. (CVE-2023-0215) [Viktor Dukhovni, Matt Caswell] *) Fixed Double free after calling PEM_read_bio_ex. The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload data. If the function succeeds then the "name_out", "header" and "data" arguments are populated with pointers to buffers containing the relevant decoded data. The caller is responsible for freeing those buffers. It is possible to construct a PEM file that results in 0 bytes of payload data. In this case PEM_read_bio_ex() will return a failure code but will populate the header argument with a pointer to a buffer that has already been freed. If the caller also frees this buffer then a double free will occur. This will most likely lead to a crash. The functions PEM_read_bio() and PEM_read() are simple wrappers around PEM_read_bio_ex() and therefore these functions are also directly affected. These functions are also called indirectly by a number of other OpenSSL functions including PEM_X509_INFO_read_bio_ex() and SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL internal uses of these functions are not vulnerable because the caller does not free the header argument if PEM_read_bio_ex() returns a failure code. (CVE-2022-4450) [Kurt Roeckx, Matt Caswell] *) Fixed Timing Oracle in RSA Decryption. A timing based side channel exists in the OpenSSL RSA Decryption implementation which could be sufficient to recover a plaintext across a network in a Bleichenbacher style attack. To achieve a successful decryption an attacker would have to be able to send a very large number of trial messages for decryption. The vulnerability affects all RSA padding modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. (CVE-2022-4304) [Dmitry Belyavsky, Hubert Kario] Changes between 1.1.1r and 1.1.1s [1 Nov 2022] *) Fixed a regression introduced in 1.1.1r version not refreshing the certificate data to be signed before signing the certificate. [Gibeom Gwon] Changes between 1.1.1q and 1.1.1r [11 Oct 2022] *) Fixed the linux-mips64 Configure target which was missing the SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that platform. [Adam Joseph] *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was causing incorrect results in some cases as a result. [Paul Dale] *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to report correct results in some cases [Matt Caswell] *) Fixed a regression introduced in 1.1.1o for re-signing certificates with different key sizes [Todd Short] *) Added the loongarch64 target [Shi Pujin] *) Fixed a DRBG seed propagation thread safety issue [Bernd Edlinger] *) Fixed a memory leak in tls13_generate_secret [Bernd Edlinger] *) Fixed reported performance degradation on aarch64. Restored the implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid 32-bit lane assignment in CTR mode") for 64bit targets only, since it is reportedly 2-17% slower and the silicon errata only affects 32bit targets. The new algorithm is still used for 32 bit targets. [Bernd Edlinger] *) Added a missing header for memcmp that caused compilation failure on some platforms [Gregor Jasny] [1] https://www.openssl.org/news/cl111.txt [2] https://www.openssl.org/news/vulnerabilities.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- 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 8457df6c0a..ebc56b11dd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1q.tar.gz.sha256 -sha256 d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca openssl-1.1.1q.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 +sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index fc22c20467..6e84f06175 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1q +LIBOPENSSL_VERSION = 1.1.1t LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From thomas.petazzoni at bootlin.com Wed Feb 8 16:43:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:43:05 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: security bump to version 1.1.1t In-Reply-To: <20230208162534.28581-1-ps.report@gmx.net> References: <20230208162534.28581-1-ps.report@gmx.net> Message-ID: <20230208174305.1af25bae@windsurf> On Wed, 8 Feb 2023 17:25:34 +0100 Peter Seiderer wrote: > Changelog (for details see [1] and [2]): > > Changes between 1.1.1s and 1.1.1t [7 Feb 2023] > > *) Fixed X.400 address type confusion in X.509 GeneralName. > > There is a type confusion vulnerability relating to X.400 address processing > inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING > but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This > vulnerability may allow an attacker who can provide a certificate chain and > CRL (neither of which need have a valid signature) to pass arbitrary > pointers to a memcmp call, creating a possible read primitive, subject to > some constraints. Refer to the advisory for more information. Thanks to > David Benjamin for discovering this issue. (CVE-2023-0286) > > This issue has been fixed by changing the public header file definition of > GENERAL_NAME so that x400Address reflects the implementation. It was not > possible for any existing application to successfully use the existing > definition; however, if any application references the x400Address field > (e.g. in dead code), note that the type of this field has changed. There is > no ABI change. > [Hugo Landau] > > *) Fixed Use-after-free following BIO_new_NDEF. > > The public API function BIO_new_NDEF is a helper function used for > streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL > to support the SMIME, CMS and PKCS7 streaming capabilities, but may also > be called directly by end user applications. > > The function receives a BIO from the caller, prepends a new BIO_f_asn1 > filter BIO onto the front of it to form a BIO chain, and then returns > the new head of the BIO chain to the caller. Under certain conditions, > for example if a CMS recipient public key is invalid, the new filter BIO > is freed and the function returns a NULL result indicating a failure. > However, in this case, the BIO chain is not properly cleaned up and the > BIO passed by the caller still retains internal pointers to the previously > freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO > then a use-after-free will occur. This will most likely result in a crash. > (CVE-2023-0215) > [Viktor Dukhovni, Matt Caswell] > > *) Fixed Double free after calling PEM_read_bio_ex. > > The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and > decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload > data. If the function succeeds then the "name_out", "header" and "data" > arguments are populated with pointers to buffers containing the relevant > decoded data. The caller is responsible for freeing those buffers. It is > possible to construct a PEM file that results in 0 bytes of payload data. > In this case PEM_read_bio_ex() will return a failure code but will populate > the header argument with a pointer to a buffer that has already been freed. > If the caller also frees this buffer then a double free will occur. This > will most likely lead to a crash. > > The functions PEM_read_bio() and PEM_read() are simple wrappers around > PEM_read_bio_ex() and therefore these functions are also directly affected. > > These functions are also called indirectly by a number of other OpenSSL > functions including PEM_X509_INFO_read_bio_ex() and > SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL > internal uses of these functions are not vulnerable because the caller does > not free the header argument if PEM_read_bio_ex() returns a failure code. > (CVE-2022-4450) > [Kurt Roeckx, Matt Caswell] > > *) Fixed Timing Oracle in RSA Decryption. > > A timing based side channel exists in the OpenSSL RSA Decryption > implementation which could be sufficient to recover a plaintext across > a network in a Bleichenbacher style attack. To achieve a successful > decryption an attacker would have to be able to send a very large number > of trial messages for decryption. The vulnerability affects all RSA padding > modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. > (CVE-2022-4304) > [Dmitry Belyavsky, Hubert Kario] > > Changes between 1.1.1r and 1.1.1s [1 Nov 2022] > > *) Fixed a regression introduced in 1.1.1r version not refreshing the > certificate data to be signed before signing the certificate. > [Gibeom Gwon] > > Changes between 1.1.1q and 1.1.1r [11 Oct 2022] > > *) Fixed the linux-mips64 Configure target which was missing the > SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that > platform. > [Adam Joseph] > > *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was > causing incorrect results in some cases as a result. > [Paul Dale] > > *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to > report correct results in some cases > [Matt Caswell] > > *) Fixed a regression introduced in 1.1.1o for re-signing certificates with > different key sizes > [Todd Short] > > *) Added the loongarch64 target > [Shi Pujin] > > *) Fixed a DRBG seed propagation thread safety issue > [Bernd Edlinger] > > *) Fixed a memory leak in tls13_generate_secret > [Bernd Edlinger] > > *) Fixed reported performance degradation on aarch64. Restored the > implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid > 32-bit lane assignment in CTR mode") for 64bit targets only, since it is > reportedly 2-17% slower and the silicon errata only affects 32bit targets. > The new algorithm is still used for 32 bit targets. > [Bernd Edlinger] > > *) Added a missing header for memcmp that caused compilation failure on some > platforms > [Gregor Jasny] > > [1] https://www.openssl.org/news/cl111.txt > [2] https://www.openssl.org/news/vulnerabilities.html > > Signed-off-by: Peter Seiderer > --- > package/libopenssl/libopenssl.hash | 4 ++-- > package/libopenssl/libopenssl.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 Wed Feb 8 16:44:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:44:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/nginx-modsecurity: bump to version 1.0.3 In-Reply-To: <20230208155752.73981-1-frank.vanbever@mind.be> References: <20230208155752.73981-1-frank.vanbever@mind.be> Message-ID: <20230208174419.3374a888@windsurf> On Wed, 8 Feb 2023 16:57:51 +0100 Frank Vanbever wrote: > Signed-off-by: Frank Vanbever > --- > package/nginx-modsecurity/nginx-modsecurity.hash | 4 ++-- > package/nginx-modsecurity/nginx-modsecurity.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Series of two patches applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 8 16:43:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:43:26 +0100 Subject: [Buildroot] [git commit] package/nginx-modsecurity: bump to version 1.0.3 Message-ID: <20230208164447.962B584777@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41671deec7b00de10dcc372cdeee4400df1d76ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni --- package/nginx-modsecurity/nginx-modsecurity.hash | 4 ++-- package/nginx-modsecurity/nginx-modsecurity.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nginx-modsecurity/nginx-modsecurity.hash b/package/nginx-modsecurity/nginx-modsecurity.hash index fbaf1ca239..0cd2ee07cd 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.hash +++ b/package/nginx-modsecurity/nginx-modsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.2/modsecurity-nginx-v1.0.2.tar.gz.sha256 -sha256 41a6660c50508c60df59f8f09c444d18ef8112a4c118cdc791a3992390b78c32 modsecurity-nginx-v1.0.2.tar.gz +# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.3/modsecurity-nginx-v1.0.3.tar.gz.sha256 +sha256 ae811c7208ac029cb7a99d6f63e03d3971797607517187f47620df39c1f78add modsecurity-nginx-v1.0.3.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/nginx-modsecurity/nginx-modsecurity.mk b/package/nginx-modsecurity/nginx-modsecurity.mk index 90ef8ecd51..a00c200469 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.mk +++ b/package/nginx-modsecurity/nginx-modsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_MODSECURITY_VERSION = 1.0.2 +NGINX_MODSECURITY_VERSION = 1.0.3 NGINX_MODSECURITY_SOURCE = modsecurity-nginx-v$(NGINX_MODSECURITY_VERSION).tar.gz NGINX_MODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v$(NGINX_MODSECURITY_VERSION) NGINX_MODSECURITY_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Wed Feb 8 16:43:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:43:31 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: update e-mail for Frank Vanbever Message-ID: <20230208164447.A0B178477B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=416213be39c6adb860a9d3e85f0a634139c27cac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0e116e92a3..32c6e54919 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1088,7 +1088,7 @@ F: package/sane-backends/ F: package/upx/ F: package/zxing-cpp/ -N: Frank Vanbever +N: Frank Vanbever F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ From james.hilliard1 at gmail.com Wed Feb 8 16:46:19 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 8 Feb 2023 09:46:19 -0700 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: <20230208161527.31a28b3b@windsurf> References: <20220607231211.533086-1-james.hilliard1@gmail.com> <20230208161527.31a28b3b@windsurf> Message-ID: On Wed, Feb 8, 2023 at 8:15 AM Thomas Petazzoni wrote: > > On Tue, 7 Jun 2022 17:12:11 -0600 > James Hilliard wrote: > > > In some cases it only makes sense to run tests against a specific > > branch, such as when testing new genrandconfig flags. > > > > Add a config option to override the branch selection. > > > > Signed-off-by: James Hilliard > > --- > > scripts/autobuild-run | 11 ++++++++++- > > 1 file changed, 10 insertions(+), 1 deletion(-) > > We looked at this with Arnout, and we don't really see what this would > be needed, and actually it could be annoying to have people test > "random" branches. If you need extensions to genrandconfig, then the > autobuild-run script should be backward compatible with older versions > of genrandconfig to be able to support older branches for a certain > while. There are a number of other reasons this is useful, for example some build hosts(for example my asahi-linux build host) have compatibility issues in older branches so it doesn't make sense to run autobuilders on anything other than say master. To prevent testing of unwanted branches I could modify this to restrict the branch override to only allow selecting the branches listed in: http://autobuild.buildroot.org/branches > > Thanks! > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From james.hilliard1 at gmail.com Wed Feb 8 17:30:58 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 8 Feb 2023 10:30:58 -0700 Subject: [Buildroot] [buildroot-test 1/1] scripts/autobuild-run: migrate to asyncio subprocess calls Message-ID: <20230208173058.2118889-1-james.hilliard1@gmail.com> Since python2 is no longer supported we can migrate to asyncio for subprocess handling. This allows us to replace most multiprocessing and threading with asyncio tasks. Also cleanup some unused functions/python2 compatibility shims. Signed-off-by: James Hilliard --- scripts/autobuild-run | 379 +++++++++++++++++++++--------------------- 1 file changed, 191 insertions(+), 188 deletions(-) diff --git a/scripts/autobuild-run b/scripts/autobuild-run index 4987c61..4bed6fc 100755 --- a/scripts/autobuild-run +++ b/scripts/autobuild-run @@ -52,8 +52,6 @@ # message 'directory not empty' which suggests that someone is writing to the # directory at the time of removal. -from __future__ import print_function - epilog = """ Format of the configuration file: @@ -71,55 +69,33 @@ Format of the configuration file: no-toolchains-csv """ +import asyncio import contextlib import csv import argparse -import errno import hashlib +from importlib.machinery import SourceFileLoader +from importlib.util import module_from_spec, spec_from_loader +import inspect import mmap -import multiprocessing import os import pathlib from random import randint import re import shutil import signal -import subprocess import stat import sys -from time import localtime, strftime, sleep -from distutils.version import StrictVersion -import platform -from threading import Thread, Event +from time import localtime, strftime import datetime - -if sys.hexversion >= 0x3000000: - import configparser - import urllib.request as _urllib - import urllib.parse as urlparse - from urllib.error import URLError -else: - import ConfigParser as configparser - import urllib2 as _urllib - import urlparse - from urllib2 import URLError +import configparser +import urllib.request as _urllib +import urllib.parse as urlparse +from urllib.error import URLError urlopen = _urllib.urlopen urlopen_closing = lambda uri: contextlib.closing(urlopen(uri)) -if sys.hexversion >= 0x3000000: - def decode_bytes(b): - return b.decode() - - def encode_str(s): - return s.encode() -else: - def _identity(e): - return e - - decode_bytes = _identity - encode_str = _identity - # A number of packages can take > 60mins of build time (e.g # gst-ffmpeg, qt5webkit, mimic) HUNG_BUILD_TIMEOUT = 120 # mins @@ -161,7 +137,7 @@ class SystemInfo: # -- return None - def has(self, prog): + async def has(self, prog): """Checks whether a program is available. Lazily evaluates missing entries. @@ -176,15 +152,19 @@ class SystemInfo: have_it = self.find_prog(prog) # java[c] needs special care if have_it and prog in ('java', 'javac'): - with open(os.devnull, "w") as devnull: - if subprocess.call("%s -version | grep gcj" % prog, shell=True, - stdout=devnull, stderr=devnull) != 1: - have_it = False + proc = await asyncio.create_subprocess_shell( + "%s -version | grep gcj" % prog, + stdout=asyncio.subprocess.DEVNULL, + stderr=asyncio.subprocess.DEVNULL + ) + ret = await proc.wait() + if ret != 1: + have_it = False # -- self.progs[prog] = have_it return have_it - def check_requirements(self): + async def check_requirements(self): """Checks program dependencies. Returns: True if all mandatory programs are present, else False. @@ -193,14 +173,14 @@ class SystemInfo: missing_requirements = False for prog in self.needed_progs: - if not do_check_has_prog(prog): + if not await do_check_has_prog(prog): print("ERROR: your system lacks the '%s' program" % prog) missing_requirements = True # check optional programs here, # else they'd get checked by each worker instance for prog in self.optional_progs: - do_check_has_prog(prog) + await do_check_has_prog(prog) return not missing_requirements @@ -208,7 +188,7 @@ class Builder: def __init__(self, instance, njobs, sysinfo, http_url, http_login, http_password, submitter, make_opts, nice, toolchains_csv, - repo, upload, buildpid, debug): + repo, upload, debug): self.instance = instance self.njobs = njobs self.sysinfo = sysinfo @@ -221,7 +201,6 @@ class Builder: self.toolchains_csv = toolchains_csv self.repo = repo self.upload = upload - self.buildpid = buildpid self.debug = debug self.build_parallel = False @@ -250,10 +229,10 @@ class Builder: def check_version(self): with urlopen_closing(urlparse.urljoin(self.http_url, 'version')) as r: - version = int(decode_bytes(r.readline()).strip()) + version = int(r.readline().decode().strip()) if version > VERSION: - print("ERROR: script version too old, please upgrade.") - sys.exit(1) + return False + return True def get_branch(self): """Returns the branch that should be built. It fetches a CSV file from @@ -267,14 +246,14 @@ class Builder: csv_branches = [] with urlopen_closing(urlparse.urljoin(self.http_url, 'branches')) as r: for l in r.readlines(): - csv_branches.append(decode_bytes(l)) + csv_branches.append(l.decode()) branches = [] for branch in csv.reader(csv_branches): branches += [branch[0]] * int(branch[1]) return branches[randint(0, len(branches) - 1)] - def prepare_build(self): + async def prepare_build(self): """Prepare for the next build of the specified instance This function prepares the build by making sure all the needed @@ -314,26 +293,35 @@ class Builder: os.path.relpath(f, self.dldir)) os.remove(f) - branch = self.get_branch() + loop = asyncio.get_event_loop() + branch = await loop.run_in_executor(None, self.get_branch) log_write(self.log, "INFO: testing branch '%s'" % branch) # Clone Buildroot. This only happens if the source directory # didn't exist already. if not os.path.exists(self.srcdir): - ret = subprocess.call(["git", "clone", self.repo, self.srcdir], - stdout=self.log, stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "git", "clone", self.repo, self.srcdir, + stdout=self.log, stderr=self.log) + ret = await proc.wait() if ret != 0: log_write(self.log, "ERROR: could not clone Buildroot sources") return -1 # Update the Buildroot sources. abssrcdir = os.path.abspath(self.srcdir) - ret = subprocess.call(["git", "fetch", "-t", self.repo, branch], cwd=abssrcdir, stdout=self.log, stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "git", "fetch", "-t", self.repo, branch, + cwd=abssrcdir, stdout=self.log, stderr=self.log) + ret = await proc.wait() if ret != 0: log_write(self.log, "ERROR: could not fetch Buildroot sources") return -1 - ret = subprocess.call(["git", "checkout", "FETCH_HEAD"], cwd=abssrcdir, stdout=self.log, stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "git", "checkout", "-f", "FETCH_HEAD", + cwd=abssrcdir, stdout=self.log, stderr=self.log) + ret = await proc.wait() if ret != 0: log_write(self.log, "ERROR: could not check out Buildroot sources") return -1 @@ -351,18 +339,21 @@ class Builder: return 0 - def gen_config(self): + def load_gen_config(self, genrandconfig): + spec = spec_from_loader("genrandconfig", SourceFileLoader("genrandconfig", genrandconfig)) + mod = module_from_spec(spec) + spec.loader.exec_module(mod) + return mod.gen_config + + async def gen_config(self): """Generate a new random configuration.""" log_write(self.log, "INFO: generate the configuration") - if self.debug: - devnull = self.log - else: - devnull = open(os.devnull, "w") - - args = [os.path.join(self.srcdir, "utils/genrandconfig"), - "-o", self.outputdir, "-b", self.srcdir] + args = { + 'outputdir': os.path.abspath(self.outputdir), + 'buildrootdir': os.path.abspath(self.srcdir), + } with open(os.path.join(self.outputdir, "branch"), "r") as branchf: branch = branchf.read().strip() @@ -371,32 +362,40 @@ class Builder: if toolchains_csv: if not os.path.isabs(toolchains_csv): toolchains_csv = os.path.join(self.srcdir, toolchains_csv) - args.extend(["--toolchains-csv", toolchains_csv]) - elif branch != "2022.02.x": - args.extend(["--no-toolchains-csv"]) + args['toolchains_csv'] = toolchains_csv + elif branch == "2022.02.x": + toolchains_csv = os.path.join( + self.srcdir, + 'support/config-fragments/autobuild/toolchain-configs.csv' + ) + args['toolchains_csv'] = toolchains_csv + else: + args['toolchains_csv'] = False + + gen_config = self.load_gen_config(os.path.join(self.srcdir, "utils/genrandconfig")) + + if inspect.iscoroutinefunction(gen_config): + ret = await gen_config(argparse.Namespace(**args)) + else: + loop = asyncio.get_event_loop() + ret = await loop.run_in_executor(None, gen_config, argparse.Namespace(**args)) - ret = subprocess.call(args, stdout=devnull, stderr=self.log) return ret - def stop_on_build_hang(self, monitor_thread_hung_build_flag, - monitor_thread_stop_flag, sub_proc, - outputdir): + async def stop_on_build_hang(self, sub_proc, outputdir): build_time_logfile = os.path.join(outputdir, "build/build-time.log") while True: - if monitor_thread_stop_flag.is_set(): - return if os.path.exists(build_time_logfile): mtime = datetime.datetime.fromtimestamp(os.stat(build_time_logfile).st_mtime) if mtime < datetime.datetime.now() - datetime.timedelta(minutes=HUNG_BUILD_TIMEOUT): - if sub_proc.poll() is None: - monitor_thread_hung_build_flag.set() # Used by do_build() to determine build hang + if sub_proc.returncode is None: log_write(self.log, "INFO: build hung") sub_proc.kill() break - monitor_thread_stop_flag.wait(30) + await asyncio.sleep(30) - def check_reproducibility(self): + async def check_reproducibility(self): """Check reproducibility of builds Use diffoscope on the built images, if diffoscope is not @@ -412,18 +411,32 @@ class Builder: with open(reproducible_results, 'w') as diff: if self.sysinfo.has("diffoscope"): # Prefix to point diffoscope towards cross-tools - prefix = subprocess.check_output(["make", "--no-print-directory", "O=%s" % self.outputdir, - "-C", self.srcdir, "printvars", "VARS=TARGET_CROSS"]) + proc = await asyncio.create_subprocess_exec( + "make", "--no-print-directory", "O=%s" % self.outputdir, + "-C", self.srcdir, "printvars", "VARS=TARGET_CROSS", + stdout=asyncio.subprocess.PIPE) + prefix, _ = await proc.communicate() + if proc.returncode: + return -1 # Remove TARGET_CROSS= and \n from the string prefix = prefix[13:-1] log_write(self.log, "INFO: running diffoscope on images") - subprocess.call(["diffoscope", build_1_image, build_2_image, - "--tool-prefix-binutils", prefix, "--json", reproducible_results, - "--text", reproducible_results_txt, "--max-text-report-size", "40000"], - stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "diffoscope", build_1_image, build_2_image, + "--tool-prefix-binutils", prefix, + "--json", reproducible_results, + "--text", reproducible_results_txt, + "--max-text-report-size", "40000", + stderr=self.log + ) + await proc.wait() else: log_write(self.log, "INFO: diffoscope not installed, falling back to cmp") - subprocess.call(["cmp", "-b", build_1_image, build_2_image], stdout=diff, stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "cmp", "-b", build_1_image, build_2_image, + stdout=diff, stderr=self.log + ) + await proc.wait() if os.stat(reproducible_results).st_size > 0: log_write(self.log, "INFO: Build is non-reproducible.") @@ -433,11 +446,11 @@ class Builder: log_write(self.log, "INFO: Build is reproducible!") return 0 - def do_build(self, outputdir): + async def do_build(self, outputdir): """Run the build itself""" f = open(os.path.join(outputdir, "logfile"), "w+") - log_write(self.log, "INFO: build started") + log_write(self.log, "INFO: %d build started" % self.instance) cmd = ["nice", "-n", str(self.nice), "make", "O=%s" % outputdir, @@ -451,30 +464,22 @@ class Builder: if self.build_parallel: cmd.append("-j%s" % self.njobs) - sub = subprocess.Popen(cmd, stdout=f, stderr=f) + sub = await asyncio.create_subprocess_exec(*cmd, stdout=f, stderr=f) - # Setup hung build monitoring thread - monitor_thread_hung_build_flag = Event() - monitor_thread_stop_flag = Event() - build_monitor = Thread(target=self.stop_on_build_hang, - args=(monitor_thread_hung_build_flag, - monitor_thread_stop_flag, - sub, outputdir)) - build_monitor.daemon = True - build_monitor.start() + # Setup hung build monitoring task + build_monitor = asyncio.create_task( + self.stop_on_build_hang(sub, outputdir)) - self.buildpid[self.instance] = sub.pid - ret = sub.wait() - self.buildpid[self.instance] = 0 + ret = await sub.wait() - # If build failed, monitor thread would have exited at this point - if monitor_thread_hung_build_flag.is_set(): + # If build failed, monitor task would have exited at this point + if build_monitor.done(): log_write(self.log, "INFO: build timed out [%d]" % ret) return -2 else: - # Stop monitor thread as this build didn't timeout - monitor_thread_stop_flag.set() - # Monitor thread should be exiting around this point + # Stop monitor task as this build didn't timeout + build_monitor.cancel() + # Monitor task should be exiting around this point if ret != 0: log_write(self.log, "INFO: build failed [%d]" % ret) @@ -483,14 +488,15 @@ class Builder: cmd = ["make", "O=%s" % outputdir, "-C", self.srcdir, "BR2_DL_DIR=%s" % self.dldir, "legal-info"] \ + self.make_opts.split() - ret = subprocess.call(cmd, stdout=f, stderr=f) + proc = await asyncio.create_subprocess_exec(*cmd, stdout=f, stderr=f) + ret = await proc.wait() if ret != 0: log_write(self.log, "INFO: build failed during legal-info") return -1 log_write(self.log, "INFO: build successful") return 0 - def do_reproducible_build(self): + async def do_reproducible_build(self): """Run the builds for reproducibility testing Build twice with the same configuration. Calls do_build() to @@ -499,7 +505,7 @@ class Builder: # Start the first build log_write(self.log, "INFO: Reproducible Build Test, starting build 1") - ret = self.do_build(self.outputdir) + ret = await self.do_build(self.outputdir) if ret != 0: log_write(self.log, "INFO: build 1 failed, skipping build 2") return ret @@ -514,16 +520,16 @@ class Builder: # Start the second build log_write(self.log, "INFO: Reproducible Build Test, starting build 2") - ret = self.do_build(self.outputdir_2) + ret = await self.do_build(self.outputdir_2) if ret != 0: log_write(self.log, "INFO: build 2 failed") return ret # Assuming both have built successfully - ret = self.check_reproducibility() + ret = await self.check_reproducibility() return ret - def send_results(self, result): + async def send_results(self, result): """Prepare and store/send tarball with results This function prepares the tarball with the results, and either @@ -549,15 +555,19 @@ class Builder: copy_if_exists("build", "packages-file-list-staging.txt") copy_if_exists("legal-info", "manifest.csv", "licenses-manifest.csv") - subprocess.call(["git log -n 1 --pretty=format:%%H > %s" % \ - os.path.join(self.resultdir, "gitid")], - shell=True, cwd=self.srcdir) + proc = await asyncio.create_subprocess_shell( + "git log -n 1 --pretty=format:%%H > %s" % + os.path.join(self.resultdir, "gitid"), + cwd=self.srcdir) + await proc.wait() # Return True if the result should be rejected, False otherwise - def reject_results(): - lastlines = decode_bytes(subprocess.Popen( - ["tail", "-n", "3", os.path.join(self.outputdir, "logfile")], - stdout=subprocess.PIPE).communicate()[0]).splitlines() + async def reject_results(): + proc = await asyncio.create_subprocess_exec( + "tail", "-n", "3", os.path.join(self.outputdir, "logfile"), + stdout=asyncio.subprocess.PIPE) + stdout, _ = await proc.communicate() + lastlines = stdout.decode().splitlines() # Reject results where qemu-user refused to build regexp = re.compile(r'^package/qemu/qemu.mk:.*Refusing to build qemu-user') @@ -567,14 +577,16 @@ class Builder: return False - if reject_results(): + if await reject_results(): return - def get_failure_reason(): + async def get_failure_reason(): # Output is a tuple (package, version), or None. - lastlines = decode_bytes(subprocess.Popen( - ["tail", "-n", "3", os.path.join(self.outputdir, "logfile")], - stdout=subprocess.PIPE).communicate()[0]).splitlines() + proc = await asyncio.create_subprocess_exec( + "tail", "-n", "3", os.path.join(self.outputdir, "logfile"), + stdout=asyncio.subprocess.PIPE) + stdout, _ = await proc.communicate() + lastlines = stdout.decode().splitlines() regexp = re.compile(r'make: \*\*\* .*/(?:build|toolchain)/([^/]*)/') for line in lastlines: @@ -585,38 +597,39 @@ class Builder: # not found return None - reason = get_failure_reason() + reason = await get_failure_reason() if reason: with open(os.path.join(self.resultdir, "reason"), "w+") as reasonf: reasonf.write("-".join(reason)) - def extract_end_log(resultfile): + async def extract_end_log(resultfile): """Save the last part of the build log, starting from the failed package""" - def extract_last_500_lines(): - subprocess.call(["tail -500 %s > %s" % \ - (os.path.join(self.outputdir, "logfile"), resultfile)], - shell=True) + async def extract_last_500_lines(): + proc = await asyncio.create_subprocess_shell( + "tail -500 %s > %s" % + (os.path.join(self.outputdir, "logfile"), resultfile)) + await proc.wait() if not reason: - extract_last_500_lines() + await extract_last_500_lines() else: f = open(os.path.join(self.outputdir, "logfile"), 'r') mf = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ) mf.seek(0) # Search for first action on the failed package - offset = mf.find(encode_str('>>> %s' % ' '.join(reason))) + offset = mf.find('>>> %s' % ' '.join(reason).encode()) if offset != -1: with open(resultfile, "w") as endlog: - endlog.write(decode_bytes(mf[offset:])) + endlog.write(mf[offset:].decode()) else: # not found, use last 500 lines as fallback - extract_last_500_lines() + await extract_last_500_lines() mf.close() f.close() - extract_end_log(os.path.join(self.resultdir, "build-end.log")) + await extract_end_log(os.path.join(self.resultdir, "build-end.log")) def copy_config_log_files(): """Recursively copy any config.log files from the failing package""" @@ -671,8 +684,11 @@ class Builder: # Yes, shutil.make_archive() would be nice, but it doesn't exist # in Python 2.6. - ret = subprocess.call(["tar", "cjf", "results.tar.bz2", "results"], - cwd=self.outputdir, stdout=self.log, stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "tar", "cjf", "results.tar.bz2", "results", + cwd=self.outputdir, stdout=self.log, stderr=self.log + ) + ret = await proc.wait() if ret != 0: log_write(self.log, "ERROR: could not make results tarball") sys.exit(1) @@ -681,13 +697,14 @@ class Builder: # Submit results. Yes, Python has some HTTP libraries, but # none of the ones that are part of the standard library can # upload a file without writing dozens of lines of code. - ret = subprocess.call(["curl", "-u", - "%s:%s" % (self.http_login, self.http_password), - "-H", "Expect:", - "-F", "uploadedfile=@%s" % os.path.join(self.outputdir, "results.tar.bz2"), - "-F", "uploadsubmit=1", - urlparse.urljoin(self.http_url, 'submit/')], - stdout=self.log, stderr=self.log) + proc = await asyncio.create_subprocess_exec( + "curl", "-u", "%s:%s" % (self.http_login, self.http_password), + "-H", "Expect:", + "-F", "uploadedfile=@%s" % os.path.join(self.outputdir, "results.tar.bz2"), + "-F", "uploadsubmit=1", + urlparse.urljoin(self.http_url, 'submit/'), + stdout=self.log, stderr=self.log) + ret = await proc.wait() if ret != 0: log_write(self.log, "INFO: results could not be submitted, %d" % ret) else: @@ -704,16 +721,20 @@ class Builder: log_write(self.log, "INFO: results saved as %s" % resultfilename) - def run_one_build(self): - self.check_version() + async def run_one_build(self): + loop = asyncio.get_event_loop() + ret = await loop.run_in_executor(None, self.check_version) + if not ret: + print("ERROR: script version too old, please upgrade.") + sys.exit(1) - ret = self.prepare_build() + ret = await self.prepare_build() if ret != 0: return os.mkdir(self.resultdir) - ret = self.gen_config() + ret = await self.gen_config() if ret != 0: log_write(self.log, "WARN: failed to generate configuration") return @@ -727,13 +748,13 @@ class Builder: self.build_parallel = per_package and randint(0, 1) == 0 if reproducible: - ret = self.do_reproducible_build() + ret = await self.do_reproducible_build() else: - ret = self.do_build(self.outputdir) + ret = await self.do_build(self.outputdir) - self.send_results(ret) + await self.send_results(ret) - def run_instance(self): + async def run_instance(self): """Main per-instance loop Prepare the build, generate a configuration, run the build, and submit the @@ -744,9 +765,9 @@ class Builder: while True: try: - self.run_one_build() - except URLError as e: - sleep(30) + await self.run_one_build() + except URLError: + await asyncio.sleep(30) class Formatter(argparse.ArgumentDefaultsHelpFormatter, argparse.RawDescriptionHelpFormatter): pass @@ -763,7 +784,7 @@ class LoadConfigFile(argparse.Action): value = False setattr(namespace, key, value) -def main(): +async def main(): # Avoid locale settings of autobuilder machine leaking in, for example # showing error messages in another language. @@ -843,7 +864,7 @@ def main(): print("WARN: due to the lack of http login/password details, results will not be submitted") print("WARN: tarballs of results will be kept locally only") - if not sysinfo.check_requirements(): + if not await sysinfo.check_requirements(): sys.exit(1) # Enforce the sanest umask here, to avoid buildroot doing it on its @@ -851,35 +872,7 @@ def main(): # in case of failures. os.umask(0o022) - def sigterm_handler(signum, frame): - """Kill all children""" - - # uninstall signal handler to prevent being called for all subprocesses - signal.signal(signal.SIGINT, signal.SIG_IGN) - signal.signal(signal.SIGTERM, signal.SIG_DFL) - - # stop all instances to prevent new children to be spawned - for p in processes: - p.terminate() - - # kill build processes started with timeout (that puts its children - # explicitly in a separate process group) - for pid in buildpid: - if pid == 0: - continue - try: - os.kill(pid, signal.SIGTERM) - except OSError as e: - if e.errno != errno.ESRCH: # No such process, ignore - raise - - # kill any remaining children in our process group - os.killpg(os.getpgid(os.getpid()), signal.SIGTERM) - - sys.exit(1) - - buildpid = multiprocessing.Array('i', int(args.ninstances)) - processes = [] + tasks = [] for i in range(0, int(args.ninstances)): builder = Builder( instance = i, @@ -894,17 +887,27 @@ def main(): toolchains_csv = args.toolchains_csv, repo = args.repo, upload = upload, - buildpid = buildpid, debug = args.debug) - p = multiprocessing.Process(target=builder.run_instance) - p.start() - processes.append(p) + t = asyncio.create_task(builder.run_instance()) + tasks.append(t) + + buildtasks = asyncio.gather(*tasks, return_exceptions=False) + + def sigterm_handler(signum, frame): + """Kill all children""" + buildtasks.cancel() signal.signal(signal.SIGINT, sigterm_handler) signal.signal(signal.SIGTERM, sigterm_handler) - for p in processes: - p.join() + try: + await buildtasks + except asyncio.CancelledError: + pass if __name__ == '__main__': - main() + if sys.version_info < (3, 7): + loop = asyncio.get_event_loop() + loop.run_until_complete(main()) + else: + asyncio.run(main()) -- 2.34.1 From ps.report at gmx.net Wed Feb 8 17:43:23 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 8 Feb 2023 18:43:23 +0100 Subject: [Buildroot] [PATCH 1/1] board/raspberrypi4: bump kernel version to 5.15.68 In-Reply-To: <20230208144639.764af681@windsurf> References: <20220926051956.3272067-1-buildroot@athaariq.my.id> <20230208144639.764af681@windsurf> Message-ID: <20230208184323.34219f84@gmx.net> On Wed, 8 Feb 2023 14:46:39 +0100, Thomas Petazzoni via buildroot wrote: > Hello Athaariq, > > On Mon, 26 Sep 2022 05:20:15 +0000 (UTC) > Athaariq Ardhiansyah wrote: > > > First of all, kernel support for Raspberry Pi is way too old relative to stable version. Second, we actually have several bug fixes regarding the kernel including HDMI hotplug and more problems on graphic stacks. However, I only have Raspberry Pi 4B so I cannot test the changes for other Raspberry Pi models. For anyone who has those boards, please help us to bump and test the kernel. > > > > Signed-off-by: Athaariq Ardhiansyah > > Thanks for your patch. It would indeed be nice to update our > RaspberryPi defconfigs, but there are a number of questions which need > to be answered before we can apply your patch. > > First of all, a small detail: your commit log must be wrapped at ~80 > columns. Also, it shouldn't use 1st person sentence "I only have". > > > diff --git a/board/raspberrypi/linux.fragment b/board/raspberrypi/linux.fragment > > new file mode 100644 > > index 0000000000..798b2e91da > > --- /dev/null > > +++ b/board/raspberrypi/linux.fragment > > @@ -0,0 +1,7 @@ > > +# Dynamic CPU Clock > > +CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=n > > +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > > + > > +# Fix Kernel Module won't Load > > +CONFIG_MODULE_COMPRESS_XZ=n > > +CONFIG_MODULE_COMPRESS_NONE=y > > Why is this Linux kernel configuration fragment needed? There is no > explanation in your commit log. Changing the default CPU governor > should not be needed, and the second chunk about kernel module > compression is a bit strange and deserves some explanation. > Upstream defconfigs changed to CONFIG_MODULE_COMPRESS_XZ (see [1] and [2]), alternative would be to enable the following in the buildroot raspberry*_defconfigs: BR2_PACKAGE_BUSYBOX_SHOW_OTHERS BR2_PACKAGE_XZ BR2_PACKAGE_KMOD BR2_PACKAGE_KMOD_TOOLS BR2_PACKAGE_HOST_KMOD_XZ Regards, Peter > > diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig > > index 5942f7c4e1..6d90a8f004 100644 > > --- a/configs/raspberrypi4_64_defconfig > > +++ b/configs/raspberrypi4_64_defconfig > > @@ -6,13 +6,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > > > BR2_SYSTEM_DHCP="eth0" > > > > -# Linux headers same as kernel, a 5.10 series > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > +# Linux headers same as kernel, a 5.15 series > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,155b736f0ff883415d374ba743473f5ef146814b)/linux-155b736f0ff883415d374ba743473f5ef146814b.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi4-64/linux.fragment" > > > > # Build the DTB from the kernel sources > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > @@ -23,6 +24,9 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > BR2_PACKAGE_RPI_FIRMWARE=y > > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > > BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4-64/config_4_64bit.txt" > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y > > Why is this being added? > > > # Required tools to create the SD image > > BR2_PACKAGE_HOST_DOSFSTOOLS=y > > diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig > > index 4e5580c140..f0947c329c 100644 > > --- a/configs/raspberrypi4_defconfig > > +++ b/configs/raspberrypi4_defconfig > > @@ -6,13 +6,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > > > BR2_SYSTEM_DHCP="eth0" > > > > -# Linux headers same as kernel, a 5.10 series > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > +# Linux headers same as kernel, a 5.15 series > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,155b736f0ff883415d374ba743473f5ef146814b)/linux-155b736f0ff883415d374ba743473f5ef146814b.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi4/linux.fragment" > > > > # Build the DTB from the kernel sources > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > @@ -23,6 +24,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > BR2_PACKAGE_RPI_FIRMWARE=y > > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > > BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4/config_4.txt" > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y > > +BR2_PACKAGE_RPI_USERLAND=y > > Why is rpi-userland being added here, and not to the other defconfig above? > > Also, you're updating rpi-firmware, rpi-userland and RaspberryPi > defconfigs in the same commit. Is this because they need to be updated > in sync? If that's the case, is there a potential problem if we update > rpi-firmware/rpi-userland, but not the defconfigs for RaspberryPi 1/2/3 ? > > Thanks a lot for your feedback! > > Thomas From fontaine.fabrice at gmail.com Wed Feb 8 17:44:31 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 8 Feb 2023 18:44:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/open-iscsi: add OPEN_ISCSI_CPE_ID_VENDOR Message-ID: <20230208174431.85800-1-fontaine.fabrice@gmail.com> cpe:2.3:a:open-iscsi_project:open-iscsi is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen-iscsi_project%3Aopen-iscsi Signed-off-by: Fabrice Fontaine --- package/open-iscsi/open-iscsi.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk index 249253c64f..e5b965b80d 100644 --- a/package/open-iscsi/open-iscsi.mk +++ b/package/open-iscsi/open-iscsi.mk @@ -10,6 +10,7 @@ OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) # well. See https://github.com/open-iscsi/open-iscsi/issues/379 OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ OPEN_ISCSI_LICENSE_FILES = COPYING +OPEN_ISCSI_CPE_ID_VENDOR = open-iscsi_project OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 8 17:50:08 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 8 Feb 2023 18:50:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsolv: add LIBSOLV_CPE_ID_VENDOR Message-ID: <20230208175008.88846-1-fontaine.fabrice@gmail.com> cpe:2.3:a:opensuse:libsolv is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopensuse%3Alibsolv Signed-off-by: Fabrice Fontaine --- package/libsolv/libsolv.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 144ce68a83..29f8a6a3d2 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -8,6 +8,7 @@ LIBSOLV_VERSION = 0.7.22 LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) LIBSOLV_LICENSE = BSD-3-Clause LIBSOLV_LICENSE_FILES = LICENSE.BSD +LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON -- 2.39.0 From hrsourabh011 at gmail.com Wed Feb 8 18:19:20 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Wed, 8 Feb 2023 19:19:20 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: Message-ID: Hello Ramon, I don't want an external toolchain. Maybe I was not clear. My goal is to use the program/sdk from here https://github.com/aws/aws-iot-device-sdk-python-v2 , this is a python based project. And no package is available for this. Can I use python-pip to install it? On Wed, 8 Feb 2023 at 17:15, Ramon Crichlow wrote: > You can build an external toolchain with buildroot using make sdk (See > Section 6.1.3 in buildroot manual > ) > > Also from the manual (Section 11.2) > It has been decided that support for the native compiler on the target > would be stopped from the Buildroot-2012.11 release because: > > this feature was neither maintained nor tested, and often broken; > this feature was only available for Buildroot toolchains; > Buildroot mostly targets small or very small target hardware with limited > resource onboard (CPU, ram, mass-storage), for which compiling on the > target does not make much sense; > Buildroot aims at easing the cross-compilation, making native compilation > on the target unnecessary. > > > On Wed, Feb 8, 2023 at 10:07 AM Sourabh Hegde > wrote: > >> Hello All, >> >> I want to install a sdk on my Buildroot based Linux machine. SDK location >> https://github.com/aws/aws-iot-device-sdk-python-v2 . They don't have >> any packages which I can add in Buildroot. >> >> On a native Linux machine, it can be done via pip. But how to do this in >> Buildroot? >> >> Thanks in advance >> _______________________________________________ >> 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 Wed Feb 8 18:19:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 19:19:29 +0100 Subject: [Buildroot] [PATCH 2/5] package/aubio: drop AUBIO_REMOVE_OLD_WAF hook In-Reply-To: <20230208181933.3925279-1-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> Message-ID: <20230208181933.3925279-2-peter@korsgaard.com> As that is now handled by the waf-package infrastructure. Signed-off-by: Peter Korsgaard --- package/aubio/aubio.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index c995fdfac7..64174a113d 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -21,12 +21,6 @@ AUBIO_CONF_OPTS = \ # https://github.com/jackaudio/jack2/issues/898 AUBIO_NEEDS_EXTERNAL_WAF = YES -# The old waf script bundled in aubio 0.4.9 need to be removed first. -define AUBIO_REMOVE_OLD_WAF - $(RM) -fr $(@D)/waf $(@D)/waflib -endef -AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF - # Add --notests for each build step to avoid running unit tests on the # build machine. AUBIO_WAF_OPTS = --notests -- 2.30.2 From peter at korsgaard.com Wed Feb 8 18:19:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 19:19:28 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used Message-ID: <20230208181933.3925279-1-peter@korsgaard.com> Waf requires that the version of the waf script matches the version of waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as otherwise waf errors out with errors like: Waf script '2.0.24' and library '1.9.3' do not match Signed-off-by: Peter Korsgaard --- package/pkg-waf.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index e090afa9e6..a067e69c9b 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) define inner-waf-package +# The version of waflib has to match with the version of waf, +# otherwise waf errors out with: +# Waf script 'X' and library 'Y' do not match +define WAF_PACKAGE_REMOVE_WAF_LIB + $(RM) -fr $(@D)/waf $(@D)/waflib +endef + # We need host-python3 to run waf $(2)_DEPENDENCIES += host-python3 @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) $(2)_DEPENDENCIES += host-waf $(2)_WAF = $$(HOST_DIR)/bin/waf +$(2)_PRE_CONFIGURE_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB else $(2)_WAF ?= ./waf endif -- 2.30.2 From peter at korsgaard.com Wed Feb 8 18:19:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 19:19:30 +0100 Subject: [Buildroot] [PATCH 3/5] package/glmark2: use external waf In-Reply-To: <20230208181933.3925279-1-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> Message-ID: <20230208181933.3925279-3-peter@korsgaard.com> Fixes: http://autobuild.buildroot.net/results/bbd/bbd90f11975b691f694412a6fc3446f37dd7c0aa/ The bundled waf script is too old (1.9.3) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/glmark2/glmark2.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index e8d6f71dad..bac9d9ff6f 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -10,6 +10,9 @@ GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng +# The bundled waf script is too old for >= python3.11 +GLMARK2_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y) GLMARK2_DEPENDENCIES += libdrm libgbm libgles udev GLMARK2_FLAVORS += drm-glesv2 -- 2.30.2 From peter at korsgaard.com Wed Feb 8 18:19:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 19:19:31 +0100 Subject: [Buildroot] [PATCH 4/5] package/jack2: fix build with python >= 3.11 In-Reply-To: <20230208181933.3925279-1-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> Message-ID: <20230208181933.3925279-4-peter@korsgaard.com> Fixes: http://autobuild.buildroot.net/results/5ce/5ce5ebd20e0e509b31b51d2ec1aed56fdb8f45aa/ The bundled waf script is too old (2.0.12) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Jack unfortunately uses a modified waf, so we cannot just set JACK2_NEEDS_EXTERNAL_WAF, so instead backport an upstream patch fixing the compatibility issue: https://github.com/jackaudio/jack2/pull/884 Signed-off-by: Peter Korsgaard --- ...U-mode-bit-for-opening-files-in-pyth.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch diff --git a/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch new file mode 100644 index 0000000000..9ee5a43e18 --- /dev/null +++ b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch @@ -0,0 +1,55 @@ +From 328c58967dce8be426f9208ba7717ab5afc2c4f3 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Mon, 11 Jul 2022 00:56:28 +0200 +Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python + +The 'U' mode bit is removed in python 3.11. It has been +deprecated for a long time. The 'U' mode bit has no effect +so this change doesn't change any behavior. + +See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api + +Signed-off-by: Peter Korsgaard +--- + waflib/ConfigSet.py | 2 +- + waflib/Context.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index b300bb56..84736c9c 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -312,7 +312,7 @@ class ConfigSet(object): + :type filename: string + """ + tbl = self.table +- code = Utils.readf(filename, m='rU') ++ code = Utils.readf(filename, m='r') + for m in re_imp.finditer(code): + g = m.group + tbl[g(2)] = eval(g(3)) +diff --git a/waflib/Context.py b/waflib/Context.py +index 9fee3fa1..761b521f 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -266,7 +266,7 @@ class Context(ctx): + cache[node] = True + self.pre_recurse(node) + try: +- function_code = node.read('rU', encoding) ++ function_code = node.read('r', encoding) + exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict) + finally: + self.post_recurse(node) +@@ -662,7 +662,7 @@ def load_module(path, encoding=None): + + module = imp.new_module(WSCRIPT_FILE) + try: +- code = Utils.readf(path, m='rU', encoding=encoding) ++ code = Utils.readf(path, m='r', encoding=encoding) + except EnvironmentError: + raise Errors.WafError('Could not read the file %r' % path) + +-- +2.30.2 + -- 2.30.2 From peter at korsgaard.com Wed Feb 8 18:19:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 19:19:32 +0100 Subject: [Buildroot] [PATCH 5/5] package/norm: use external waf In-Reply-To: <20230208181933.3925279-1-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> Message-ID: <20230208181933.3925279-5-peter@korsgaard.com> Fixes: http://autobuild.buildroot.net/results/ee1/ee15cadf8af10dee6c83b9726a034367e8ae81a7/ The bundled waf script is too old (2.0.7) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/norm/norm.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/norm/norm.mk b/package/norm/norm.mk index 2f9fc7b657..a3fa1b4f80 100644 --- a/package/norm/norm.mk +++ b/package/norm/norm.mk @@ -11,6 +11,9 @@ NORM_INSTALL_STAGING = YES NORM_LICENSE = NRL License NORM_LICENSE_FILES = LICENSE.TXT +# The bundled waf script is too old for >= python3.11 +NORM_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y) NORM_DEPENDENCIES += libnetfilter_queue endif -- 2.30.2 From james.kent at orchestrated-technology.com Wed Feb 8 18:27:31 2023 From: james.kent at orchestrated-technology.com (James Kent) Date: Wed, 8 Feb 2023 18:27:31 +0000 Subject: [Buildroot] [PATCH v2] package/chrony: add default unprivileged user option Message-ID: <20230208182731.15752-1-james.kent@orchestrated-technology.com> Configurable option to define and enable by default an unprivileged user which the Chrony daemon will assume once initialised. The functionality requires libcap which is selected as necessary. This option supports the good security practice of dropping elevated privileges for daemon runtime. The package configuration layout has been updated to current working practice. Signed-off-by: James Kent --- package/chrony/Config.in | 12 +++++++++++- package/chrony/chrony.mk | 8 ++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package/chrony/Config.in b/package/chrony/Config.in index 158dc20530..0ba14c6aef 100644 --- a/package/chrony/Config.in +++ b/package/chrony/Config.in @@ -7,10 +7,20 @@ config BR2_PACKAGE_CHRONY http://chrony.tuxfamily.org/ +if BR2_PACKAGE_CHRONY + config BR2_PACKAGE_CHRONY_DEBUG_LOGGING bool "enable debug logging support" - depends on BR2_PACKAGE_CHRONY help Enable support for debug logging output from Chrony when enabled at runtime. If disabled, code for debug logging will not be compiled in. + +config BR2_PACKAGE_CHRONY_USER + bool "chrony default unprivileged user" + select BR2_PACKAGE_LIBCAP + help + Define and enable default unprivileged user for the Chrony + daemon to run as. + +endif diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 379e95a778..16f8f082a3 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -21,6 +21,14 @@ CHRONY_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_LIBCAP),y) CHRONY_DEPENDENCIES += libcap + +ifeq ($(BR2_PACKAGE_CHRONY_USER),y) +CHRONY_CONF_OPTS += --with-user=chrony +define CHRONY_USERS + chrony -1 chrony -1 * /run/chrony - - Time daemon +endef +endif + else CHRONY_CONF_OPTS += --without-libcap endif -- 2.35.3 From colin.foster at in-advantage.com Wed Feb 8 18:55:16 2023 From: colin.foster at in-advantage.com (Colin Foster) Date: Wed, 8 Feb 2023 10:55:16 -0800 Subject: [Buildroot] [PATCH] package/rauc-hawkbit-updater: new package Message-ID: <20230208185516.858096-1-colin.foster@in-advantage.com> Add useful tool for bridging RAUC with the Hawkbit API. Signed-off-by: Colin Foster --- package/Config.in | 1 + package/rauc-hawkbit-updater/Config.in | 14 ++++++++++++++ .../rauc-hawkbit-updater.hash | 3 +++ .../rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 15 +++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 package/rauc-hawkbit-updater/Config.in create mode 100644 package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash create mode 100644 package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk diff --git a/package/Config.in b/package/Config.in index 511e691ed3..84e5efa856 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2677,6 +2677,7 @@ menu "System tools" source "package/quota/Config.in" source "package/quotatool/Config.in" source "package/rauc/Config.in" + source "package/rauc-hawkbit-updater/Config.in" source "package/rsyslog/Config.in" source "package/runc/Config.in" source "package/s390-tools/Config.in" diff --git a/package/rauc-hawkbit-updater/Config.in b/package/rauc-hawkbit-updater/Config.in new file mode 100644 index 0000000000..bd7b8d7cf5 --- /dev/null +++ b/package/rauc-hawkbit-updater/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_RAUC_HAWKBIT_UPDATER + bool "rauc-hawkbit-updater" + depends on BR2_PACKAGE_RAUC + depends on BR2_PACKAGE_JSON_GLIB + help + rauc-hawkbit-updater is a link between Pengutronix + RAUC and the Eclipse Hawkbit API. Hawkbit can + communicate to remote update servers, and use the + d-bus interface to trigger updates from RAUC. + + http://rauc.io/ + +comment "rauc-hawkbit-updater needs rauc and json-glib" + depends on !BR2_PACKAGE_RAUC || !BR2_PACKAGE_JSON_GLIB diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash new file mode 100644 index 0000000000..c65ead3784 --- /dev/null +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 42318e96a464e6c716edb45c48bd3ec3b874462973db902fbe099a395e4acb4b rauc-hawkbit-updater-1.3.tar.xz +sha256 041234c81fd6fe6c531ea1a886b9e740b9ee06759d1a910a14edbd06f4aa62c7 LICENSE diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk new file mode 100644 index 0000000000..5a74181361 --- /dev/null +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk @@ -0,0 +1,15 @@ +############################################################################### +# +# rauc-hawkbit-updater +# +############################################################################### + +RAUC_HAWKBIT_UPDATER_VERSION = 1.3 +RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/releases/download/v$(RAUC_HAWKBIT_UPDATER_VERSION) +RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz +RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 +RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE +RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix +RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib + +$(eval $(meson-package)) -- 2.25.1 From thomas.petazzoni at bootlin.com Wed Feb 8 19:23:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:23:13 +0100 Subject: [Buildroot] [git commit] package/xr819-xradio: bump to 2022-12-30 version on branch master Message-ID: <20230208192410.C1E44847A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd2e9a2a0d7fd4e407e831503979cc00aa2c4858 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This version allows to build with Linux 6.1 Fixes: Still not reported Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/xr819-xradio/xr819-xradio.hash | 2 +- package/xr819-xradio/xr819-xradio.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index 08a3b6e8cc..60185db736 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 839fdae93eba29121d4116de335b00a026ef63874caf516747dbdf24c17f208b xr819-xradio-58d597bcf081e44904335916e6033bc8ef28b043.tar.gz +sha256 2b297fbcc9b5ed190bcfff9f6f808c170632ac3d69dbd92156a7f4f57142dec9 xr819-xradio-005f28cfe9e20b7f2dfd9d32d38ee97060dc707f.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index 8c1cb1587f..e5daaa6051 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 58d597bcf081e44904335916e6033bc8ef28b043 +XR819_XRADIO_VERSION = 005f28cfe9e20b7f2dfd9d32d38ee97060dc707f XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Feb 8 19:24:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 20:24:25 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used In-Reply-To: <20230208181933.3925279-1-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> Message-ID: <20230208192425.GA2677@scaer> Peter, All, On 2023-02-08 19:19 +0100, Peter Korsgaard spake thusly: > Waf requires that the version of the waf script matches the version of > waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as > otherwise waf errors out with errors like: > > Waf script '2.0.24' and library '1.9.3' do not match > > Signed-off-by: Peter Korsgaard > --- > package/pkg-waf.mk | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk > index e090afa9e6..a067e69c9b 100644 > --- a/package/pkg-waf.mk > +++ b/package/pkg-waf.mk > @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) > > define inner-waf-package > > +# The version of waflib has to match with the version of waf, > +# otherwise waf errors out with: > +# Waf script 'X' and library 'Y' do not match > +define WAF_PACKAGE_REMOVE_WAF_LIB > + $(RM) -fr $(@D)/waf $(@D)/waflib > +endef > + > # We need host-python3 to run waf > $(2)_DEPENDENCIES += host-python3 > > @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO > ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) > $(2)_DEPENDENCIES += host-waf > $(2)_WAF = $$(HOST_DIR)/bin/waf > +$(2)_PRE_CONFIGURE_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB It would make more sense to make that either a post-extract or a post-patch hook. Regards, Yann E. MORIN. > else > $(2)_WAF ?= ./waf > endif > -- > 2.30.2 > -- .-----------------.--------------------.------------------.--------------------. | 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 thomas.petazzoni at bootlin.com Wed Feb 8 19:24:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:24:29 +0100 Subject: [Buildroot] [PATCH] package/xr819-xradio: bump to 2022-12-30 version on branch master In-Reply-To: <20221230054005.1281050-1-giulio.benetti@benettiengineering.com> References: <20221230054005.1281050-1-giulio.benetti@benettiengineering.com> Message-ID: <20230208202429.03b41674@windsurf> On Fri, 30 Dec 2022 06:40:05 +0100 Giulio Benetti wrote: > This version allows to build with Linux 6.1 > > Fixes: > Still not reported > > Signed-off-by: Giulio Benetti > --- > package/xr819-xradio/xr819-xradio.hash | 2 +- > package/xr819-xradio/xr819-xradio.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 Wed Feb 8 19:27:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:27:34 +0100 Subject: [Buildroot] [git commit] package/rtl8723ds: change CFLAGS approach Message-ID: <20230208192809.8B204847AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=672544148b3cafa1cda47cd6e4b88210fc693e14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Instead of undefining endiannes CFLAGS let's change the approach. Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default involving the endianness to be set to little. This way we can set the CFLAGS according to architecture with some default define like: -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -Wno-error Suggested-by: Arnout Vandecappelle Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8723ds/rtl8723ds.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 7e27fa75ea..f303a24041 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -8,12 +8,14 @@ RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 -# Undefine the hardcoded CONFIG_LITTLE_ENDIAN -RTL8723DS_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN -# Set endianness -RTL8723DS_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN +RTL8723DS_USER_EXTRA_CLAGS = \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error RTL8723DS_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_I386_PC=n \ CONFIG_RTL8723DS=m \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) \ From thomas.petazzoni at bootlin.com Wed Feb 8 19:28:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:28:16 +0100 Subject: [Buildroot] [PATCH] package/rtl8723ds: change CFLAGS approach In-Reply-To: <20221213211313.735422-1-giulio.benetti@benettiengineering.com> References: <20221213211313.735422-1-giulio.benetti@benettiengineering.com> Message-ID: <20230208202816.3089d72d@windsurf> On Tue, 13 Dec 2022 22:13:13 +0100 Giulio Benetti wrote: > Instead of undefine endiannes CFLAGS let's change approach. > Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default > involving the endianness to be set to little. This way we can set the > CFLAGS according to architecture with some default define like: > -DCONFIG_IOCTL_CFG80211 > -DRTW_USE_CFG80211_STA_EVENT > -Wno-error > > Suggested-by: Arnout Vandecappelle > Signed-off-by: Giulio Benetti > --- > package/rtl8723ds/rtl8723ds.mk | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 8 19:31:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 20:31:31 +0100 Subject: [Buildroot] [PATCH 0/3 v2] package/dmalloc: cleanups and ssp workaround (branch yem/dmalloc) Message-ID: Hello All! This short series cleans up (a bit) our dmalloc package, and disables SSP altogether to avoid build failures due to limitations in the dmalloc build system. Changes v1 > v2: - explain why we patch both configure and configure.ac Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (3): package/dmalloc: convert existing patch to git format package/dmalloc: use actual patches rather than sed-ing package/dmalloc: don't use SSP .../dmalloc/0001-configure-fix-build-on-mips.patch | 90 ++++++++++++++++++++++ package/dmalloc/0001-mips.patch | 45 ----------- ...003-configure-allow-overriding-some-tests.patch | 80 +++++++++++++++++++ ...e-the-configure-detected-or-user-supplied.patch | 50 ++++++++++++ ...onfigure-use-LD-instead-of-hard-coding-ld.patch | 67 ++++++++++++++++ package/dmalloc/dmalloc.mk | 24 +++--- 6 files changed, 299 insertions(+), 57 deletions(-) create mode 100644 package/dmalloc/0001-configure-fix-build-on-mips.patch delete mode 100644 package/dmalloc/0001-mips.patch create mode 100644 package/dmalloc/0003-configure-allow-overriding-some-tests.patch create mode 100644 package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch create mode 100644 package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch -- .-----------------.--------------------.------------------.--------------------. | 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 Feb 8 19:31:33 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 20:31:33 +0100 Subject: [Buildroot] [PATCH 1/3 v2] package/dmalloc: convert existing patch to git format In-Reply-To: References: Message-ID: <510d3c4ff7dfdb844f62433de885fc9caa9f140e.1675884676.git.yann.morin.1998@free.fr> We're going to add more patches, so let's cleanup our historical baggage... Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- .../0001-configure-fix-build-on-mips.patch | 90 +++++++++++++++++++ package/dmalloc/0001-mips.patch | 45 ---------- 2 files changed, 90 insertions(+), 45 deletions(-) create mode 100644 package/dmalloc/0001-configure-fix-build-on-mips.patch delete mode 100644 package/dmalloc/0001-mips.patch diff --git a/package/dmalloc/0001-configure-fix-build-on-mips.patch b/package/dmalloc/0001-configure-fix-build-on-mips.patch new file mode 100644 index 0000000000..9b1525d0d1 --- /dev/null +++ b/package/dmalloc/0001-configure-fix-build-on-mips.patch @@ -0,0 +1,90 @@ +From af6adb3f5f05be4faa88a5aa83296c388c8085e7 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 12:30:10 +0100 +Subject: [PATCH] configure: fix build on mips + +This patch is a historical baggage that Buildroot has carried for ages +(since 2006), and the reason for it are notentirely clear. + +Since dmalloc is pretty tricky, and as this patch has not been +identified as causing issues, we keep it; we just add the configure.ac +patchlet to match the one in configure. + +As for the title, the original patch was named dmalloc-mips.patch, so +presumably it fixes some mips issue; let's title the commit that way. + +[Fabrice: Updated for 5.6.5] +Signed-off-by: Fabrice Fontaine +[yann.morin.1998 at free.fr: make it a git-formatted patch] +Signed-off-by: Yann E. MORIN +--- + configure | 4 ++-- + configure.ac | 2 +- + return.h | 16 +++------------- + 3 files changed, 6 insertions(+), 16 deletions(-) + +diff --git a/configure b/configure +index d52a1e8..c18dfb2 100755 +--- a/configure ++++ b/configure +@@ -5413,8 +5413,8 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 + $as_echo_n "checking return.h macros work... " >&6; } + if test "$cross_compiling" = yes; then : +- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assume yes (cross-compiling)" >&5 + $as_echo "no" >&6; } + + else +diff --git a/configure.ac b/configure.ac +index a5295f1..9740fdc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -705,7 +705,7 @@ int main() + ])], + [ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([yes]) ], + [ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ], +-[ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ] ++[ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([assume yes (cross-compiling)]) ] + ) + + ############################################################################## +diff --git a/return.h b/return.h +index 9d3f5f1..d916c7a 100644 +--- a/return.h ++++ b/return.h +@@ -117,26 +117,16 @@ + /*************************************/ + + /* +- * For DEC Mips machines running Ultrix ++ * For Mips machines running Linux + */ + #if __mips + +-/* +- * I have no idea how to get inline assembly with the default cc. +- * Anyone know how? +- */ +- +-#if 0 +- + /* + * NOTE: we assume here that file is global. + * +- * $31 is the frame pointer. $2 looks to be the return address but maybe +- * not consistently. ++ * $31 is the return address. + */ +-#define GET_RET_ADDR(file) asm("sw $2, file") +- +-#endif ++#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) + + #endif /* __mips */ + +-- +2.25.1 + diff --git a/package/dmalloc/0001-mips.patch b/package/dmalloc/0001-mips.patch deleted file mode 100644 index 3150d030ec..0000000000 --- a/package/dmalloc/0001-mips.patch +++ /dev/null @@ -1,45 +0,0 @@ -[Fabrice: Updated for 5.6.5] -Signed-off-by: Fabrice Fontaine ---- a/configure -+++ b/configure -@@ -7107,7 +7107,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 - $as_echo_n "checking return.h macros work... " >&6; } - if test "$cross_compiling" = yes; then : -- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h -+ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - ---- a/return.h -+++ b/return.h -@@ -106,26 +106,16 @@ - /*************************************/ - - /* -- * For DEC Mips machines running Ultrix -+ * For Mips machines running Linux - */ - #if __mips - - /* -- * I have no idea how to get inline assembly with the default cc. -- * Anyone know how? -- */ -- --#if 0 -- --/* - * NOTE: we assume here that file is global. - * -- * $31 is the frame pointer. $2 looks to be the return address but maybe -- * not consistently. -+ * $31 is the return address. - */ --#define GET_RET_ADDR(file) asm("sw $2, file") -- --#endif -+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) - - #endif /* __mips */ - -- 2.25.1 From yann.morin.1998 at free.fr Wed Feb 8 19:31:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 20:31:34 +0100 Subject: [Buildroot] [PATCH 2/3 v2] package/dmalloc: use actual patches rather than sed-ing In-Reply-To: References: Message-ID: <366bd1a37592003291a726b260031925652b9b29.1675884676.git.yann.morin.1998@free.fr> Our dmalloc packaging is very old and carries historical baggage and idiosyncracies that we have long stopped doing in the rest ofthe code base. Drop our post-patch hooks that seds the configure and Makefile.in files, and add patches (that could be upstreamed one day). We provide the results in the environment, like would be done with actual autoconf cache variables (ac_cv_*). Note: those are the result of cleaning up for further patches that did not manifest because it was too complex to add proper SSP support to dmalloc (instead, we're going to forcibly disable it in the following commit). Note-2: those patches have not been submitted upstream, as it's mostly dead: even though there's een some commit activities recently-ish, there has been no review or comments or the many PR pending for many years now. Note-3: we patch both configure and configure.ac, rather than autoreconf, for two reasons: 1. the both are in the upstream git tree, so submitting these patches would require patching both, and 2. dmalloc does not autoreconf nicely out of the box, and it was deemed too much hassle to fix that in addition. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- Changes v1 -> v2: - explain why we patch both configure and configure.ac --- ...onfigure-allow-overriding-some-tests.patch | 80 +++++++++++++++++++ ...-configure-detected-or-user-supplied.patch | 50 ++++++++++++ ...ure-use-LD-instead-of-hard-coding-ld.patch | 67 ++++++++++++++++ package/dmalloc/dmalloc.mk | 17 ++-- 4 files changed, 202 insertions(+), 12 deletions(-) create mode 100644 package/dmalloc/0003-configure-allow-overriding-some-tests.patch create mode 100644 package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch create mode 100644 package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch diff --git a/package/dmalloc/0003-configure-allow-overriding-some-tests.patch b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch new file mode 100644 index 0000000000..3003e8cbe4 --- /dev/null +++ b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch @@ -0,0 +1,80 @@ +From 9d57d4353c82110c609f36f91986277343d4ee45 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:26:56 +0100 +Subject: [PATCH] configure: allow overriding some tests + +Some tests use AC_RUN_IFELSE, so they do not work for cross-compilation. + +Allow the user to provide these results from the environment. + +Signed-off-by: Yann E. MORIN +--- + configure | 6 +++--- + configure.ac | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index c18dfb2..d165962 100755 +--- a/configure ++++ b/configure +@@ -4540,7 +4540,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strdup macro" >&5 + $as_echo_n "checking strdup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strdup_macro=no ++ ac_cv_strdup_macro="${ac_cv_strdup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4578,7 +4578,7 @@ $as_echo "$ac_cv_strdup_macro" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strndup macro" >&5 + $as_echo_n "checking strndup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strndup_macro=no ++ ac_cv_strndup_macro="${ac_cv_strndup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4753,7 +4753,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking basic-block size" >&5 + $as_echo_n "checking basic-block size... " >&6; } +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + if test "$cross_compiling" = yes; then : + ac_cv_page_size=0 +diff --git a/configure.ac b/configure.ac +index 9740fdc..51bdf4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -292,7 +292,7 @@ int main() { return 1; } + ]])], + [ac_cv_strdup_macro=yes], + [ac_cv_strdup_macro=no], +-[ac_cv_strdup_macro=no] ++[ac_cv_strdup_macro="${ac_cv_strdup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strdup_macro]) + +@@ -316,7 +316,7 @@ int main() { return 1; } + ]])], + [ac_cv_strndup_macro=yes], + [ac_cv_strndup_macro=no], +-[ac_cv_strndup_macro=no] ++[ac_cv_strndup_macro="${ac_cv_strndup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strndup_macro]) + +@@ -390,7 +390,7 @@ AC_MSG_RESULT([$ac_cv_use_mmap]) + # + AC_CHECK_FUNCS(getpagesize) + AC_MSG_CHECKING([basic-block size]) +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + AC_RUN_IFELSE([AC_LANG_SOURCE([ + #if HAVE_UNISTD_H +-- +2.25.1 + diff --git a/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch new file mode 100644 index 0000000000..394e7ca34e --- /dev/null +++ b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch @@ -0,0 +1,50 @@ +From c958fd5cd7d5ff03c0a023608b53b74997c514b3 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:43:55 +0100 +Subject: [PATCH] Makefile: use the configure-detected or user-supplied ar + program + +Signed-off-by: Yann E. MORIN +--- + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 86d3cca..089ac99 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -303,11 +303,11 @@ $(LIB_SL) : $(LIBRARY) + mv $@.t $@ + + $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH) : $(OBJS) $(THREAD_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_SL) : $(LIB_TH) +@@ -316,7 +316,7 @@ $(LIB_TH_SL) : $(LIB_TH) + mv $@.t $@ + + $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_CXX_SL) : $(LIB_CXX) +@@ -325,7 +325,7 @@ $(LIB_CXX_SL) : $(LIB_CXX) + mv $@.t $@ + + $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) +-- +2.25.1 + diff --git a/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch new file mode 100644 index 0000000000..3ba6ee3dc7 --- /dev/null +++ b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch @@ -0,0 +1,67 @@ +From d77e5f3d45b0cbae850e3a6e23d52edc137be803 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:52:05 +0100 +Subject: [PATCH] configure: use ${LD} instead of hard-coding 'ld' + +When doing cross-compilation, we do not want to use the native tools to +test, but the target tools. + +Note that the weird quoting is inherited from a legacy patch in +Buildroot, which dates back ages (at least 2006), and as it has not been +identified as breaking things, we keep it as-is... Meh... + +Signed-off-by: Yann E. MORIN +--- + configure | 12 ++++++------ + configure.ac | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/configure b/configure +index 810636e..30a7ea3 100755 +--- a/configure ++++ b/configure +@@ -4377,12 +4377,12 @@ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +diff --git a/configure.ac b/configure.ac +index 51bdf4d..0d80a78 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,12 +169,12 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int foo(int val) { return val + 1; } ])],[ + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +-- +2.25.1 + diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 81ac467277..6b90f810b2 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -44,18 +44,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_63261),y) DMALLOC_CFLAGS += -O0 endif -DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)" - -define DMALLOC_POST_PATCH - $(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure - $(SED) 's/ac_cv_strdup_macro=no$$/ac_cv_strdup_macro=yes/' $(@D)/configure - $(SED) 's/ac_cv_strndup_macro=no$$/ac_cv_strndup_macro=yes/' $(@D)/configure - $(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure - $(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure - $(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in -endef - -DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH +DMALLOC_CONF_ENV = \ + CFLAGS="$(DMALLOC_CFLAGS)" \ + ac_cv_page_size=12 \ + ac_cv_strdup_macro=yes \ + ac_cv_strndup_macro=yes # both DESTDIR and PREFIX are ignored.. define DMALLOC_INSTALL_STAGING_CMDS -- 2.25.1 From yann.morin.1998 at free.fr Wed Feb 8 19:31:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 8 Feb 2023 20:31:35 +0100 Subject: [Buildroot] [PATCH 3/3 v2] package/dmalloc: don't use SSP In-Reply-To: References: Message-ID: dmalloc directly calls into $(LD) to generate a shared library our of the static one. To detet what command it should run, ./configure tries various incantations of ld with various command line options until one does not fail. One of those is (basically): $(LD) --whole-archive -o contest.o.t contest.a This makes ./configure conclude what the command to link a shared library in the Makefile should be, and thus stores that in a variable: shlinkargs='$(LD) --whole-archive -o $@' ... which is then AC_SUBST()ed into Makefile.in with a rule like: $(SHLIB): $(LIBRARY) @shlinkargs@ $(LIRARY) which once substiuted, gives: $(SHLIB): $(LIBRARY) $(LD) --whole-archive -o $@ $(LIRARY) However, when SSP is enabled, the __stack_chk_fail_local and co symbols are provided by additional libraries or object files, and that is the responsibility of gcc to pass those when linking. But as dmalloc directly calls ld, it misses those. Changing dmalloc to use $(CC) is not trivial, however. First, we can't pass LD=$(TARGET_CC), otherwise the whole package explodes [0]: indeed --whole-archive is unknown to gcc, so it must be passed as -Wl,--whole archive instead. So we'd need to add a new test that uses $(CC), like so: $(CC) -Wl,--whole-archive -o contest.o.t contest.a However, in that case, gcc does pass additional libs/objs (like, for eample, the SSP ones) to the linker. But then those are also inc;luded in the whole-archive section. This causes the linker to add all the symbols form those libs/objs, even those not needed for SSP; on some archs, like PPC, that may require floating point symbols (__muldiv3 et al.) which are in another library, and thus the linked can't find them. The proper solution wouild be to add -Wl,--no-whole-archive, but that would have to be added _after_ the library we want to link, i.e.e we should be able to evntually run: $(CC) -Wl,--whole-archive -o $@ $(LIRARY) -Wl,--no-whole-archive That would require that we introduce a new variable that is added _afgter_ the $(LIBRARY), e.g. @shlinkargs_post@ or so... This is a bigger endeavour than we want to pursue... Since dmalloc is a debugging utility, it is not supposed to go into production builds, and during debugging, it would not be surprising that it needs to poke around arrays to debug them. So, we go the easier route: disable SSP altogether. [0] with lots of nce colors, but that's not the point, is it? Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- package/dmalloc/dmalloc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 6b90f810b2..5bd6691725 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -14,6 +14,13 @@ DMALLOC_LICENSE_FILES = LICENSE.txt DMALLOC_INSTALL_STAGING = YES DMALLOC_CFLAGS = $(TARGET_CFLAGS) +# dmalloc uses $(LD) to link, and thus misses the object files or libs that +# are needed to provide the __stack_chk_fail_local and co. symbols. Changing +# to use $(CC) is really more complex that we'd like. Since dmalloc is +# involved in debugging memory allocation, it is not expected to be a +# production library, so we do not care that much that it has SSP. +DMALLOC_CFLAGS += -fno-stack-protector + ifeq ($(BR2_STATIC_LIBS),y) DMALLOC_CONF_OPTS += --disable-shlib else -- 2.25.1 From thomas.petazzoni at bootlin.com Wed Feb 8 19:33:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:33:24 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/weston: bump to version 11.0.1 In-Reply-To: <20221214151958.3419333-1-james.hilliard1@gmail.com> References: <20221214151958.3419333-1-james.hilliard1@gmail.com> Message-ID: <20230208203324.4ccd9dba@windsurf> Hello, Thanks for the patch. It overall looks good, but I have one question/comment. On Wed, 14 Dec 2022 08:19:58 -0700 James Hilliard wrote: > @@ -73,7 +84,9 @@ config BR2_PACKAGE_WESTON_RDP > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on BR2_USE_WCHAR # freerdp > depends on BR2_INSTALL_LIBSTDCPP # freerdp > + depends on BR2_PACKAGE_XORG7 # freerdp-server It feels really odd that we need to build half of the X.org planet to have RDP support in Weston. Is this dependency really needed? Isn't that something "wrong" in the freerdp package that should be fixed? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From Afshin.Pir at gallagher.com Wed Feb 8 19:44:51 2023 From: Afshin.Pir at gallagher.com (Afshin Pir) Date: Wed, 8 Feb 2023 19:44:51 +0000 Subject: [Buildroot] OpenSSL v3.0 Message-ID: Hi I wonder whether buildroot currently working on OpenSSL v3.0 package def or not. If not, what are the challenges for building this package? Because I need to migrate to OpenSSL v3.0 in my buildroot and I like to know how I can do it. Best Regards, Afshin ________________________________ This email is confidential and may contain information subject to legal privilege. If you are not the intended recipient please advise us of our error by return e-mail then delete this email and any attached files. You may not copy, disclose or use the contents in any way. The views expressed in this email may not be those of Gallagher Group Ltd or subsidiary companies thereof. ________________________________ -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Wed Feb 8 20:05:30 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 8 Feb 2023 13:05:30 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/weston: bump to version 11.0.1 In-Reply-To: <20230208203324.4ccd9dba@windsurf> References: <20221214151958.3419333-1-james.hilliard1@gmail.com> <20230208203324.4ccd9dba@windsurf> Message-ID: On Wed, Feb 8, 2023 at 12:33 PM Thomas Petazzoni wrote: > > Hello, > > Thanks for the patch. It overall looks good, but I have one > question/comment. > > On Wed, 14 Dec 2022 08:19:58 -0700 > James Hilliard wrote: > > > @@ -73,7 +84,9 @@ config BR2_PACKAGE_WESTON_RDP > > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > > depends on BR2_USE_WCHAR # freerdp > > depends on BR2_INSTALL_LIBSTDCPP # freerdp > > + depends on BR2_PACKAGE_XORG7 # freerdp-server > > It feels really odd that we need to build half of the X.org planet to > have RDP support in Weston. Is this dependency really needed? Isn't > that something "wrong" in the freerdp package that should be fixed? Well there's a long comment in freerdp regarding this issue: https://github.com/buildroot/buildroot/blob/d0603d853b78c3029cad4150389f8786b5f3e7c2/package/freerdp/freerdp.mk#L100-L121 Anyways for weston I'm just propagating the dependency for now, if something changes with freerdp regarding the dependency we can drop the xorg requirement from weston later on. > > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From fido_max at inbox.ru Wed Feb 8 20:07:52 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Wed, 8 Feb 2023 23:07:52 +0300 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: Message-ID: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> On 08.02.2023 21:19, Sourabh Hegde wrote: > Hello Ramon, > > I don't want an external toolchain. Maybe I was not clear. My goal is to > use the program/sdk from here > https://github.com/aws/aws-iot-device-sdk-python-v2 > ?, this is a python > based project. And no package is available for this. Can I use > python-pip to install it? Try to add your own package. https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages You can use any python package as a reference. For example: https://git.buildroot.net/buildroot/commit/package?id=037dbe64d861e3d5580ecac608bd278afc9bbcc6 From romain.naour at smile.fr Wed Feb 8 21:05:54 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 22:05:54 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used In-Reply-To: <20230208181933.3925279-1-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> Message-ID: Hello Peter, Le 08/02/2023 ? 19:19, Peter Korsgaard a ?crit?: > Waf requires that the version of the waf script matches the version of > waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as > otherwise waf errors out with errors like: > > Waf script '2.0.24' and library '1.9.3' do not match > > Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour Best regards, Romain > --- > package/pkg-waf.mk | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk > index e090afa9e6..a067e69c9b 100644 > --- a/package/pkg-waf.mk > +++ b/package/pkg-waf.mk > @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) > > define inner-waf-package > > +# The version of waflib has to match with the version of waf, > +# otherwise waf errors out with: > +# Waf script 'X' and library 'Y' do not match > +define WAF_PACKAGE_REMOVE_WAF_LIB > + $(RM) -fr $(@D)/waf $(@D)/waflib > +endef > + > # We need host-python3 to run waf > $(2)_DEPENDENCIES += host-python3 > > @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO > ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) > $(2)_DEPENDENCIES += host-waf > $(2)_WAF = $$(HOST_DIR)/bin/waf > +$(2)_PRE_CONFIGURE_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB > else > $(2)_WAF ?= ./waf > endif From romain.naour at smile.fr Wed Feb 8 21:08:08 2023 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 8 Feb 2023 22:08:08 +0100 Subject: [Buildroot] [PATCH 2/5] package/aubio: drop AUBIO_REMOVE_OLD_WAF hook In-Reply-To: <20230208181933.3925279-2-peter@korsgaard.com> References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208181933.3925279-2-peter@korsgaard.com> Message-ID: Le 08/02/2023 ? 19:19, Peter Korsgaard a ?crit?: > As that is now handled by the waf-package infrastructure. > > Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour > --- > package/aubio/aubio.mk | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk > index c995fdfac7..64174a113d 100644 > --- a/package/aubio/aubio.mk > +++ b/package/aubio/aubio.mk > @@ -21,12 +21,6 @@ AUBIO_CONF_OPTS = \ > # https://github.com/jackaudio/jack2/issues/898 > AUBIO_NEEDS_EXTERNAL_WAF = YES > > -# The old waf script bundled in aubio 0.4.9 need to be removed first. > -define AUBIO_REMOVE_OLD_WAF > - $(RM) -fr $(@D)/waf $(@D)/waflib > -endef > -AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF Note: the pkg-wag use a PRE_CONFIGURE_HOOKS instead of POST_EXTRACT_HOOKS. Best regards, Romain > - > # Add --notests for each build step to avoid running unit tests on the > # build machine. > AUBIO_WAF_OPTS = --notests From hrsourabh011 at gmail.com Wed Feb 8 21:28:35 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Wed, 8 Feb 2023 22:28:35 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> Message-ID: Hello Maxim, Thanks for the update. I think for me, the option "18.9.3. Generating a python-package from a PyPI repository" https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages is suited. I want to install this package https://pypi.org/project/awsiotsdk/. And this package requires https://pypi.org/project/awscrt/ as dependency. Should I create both Buildroot packages from python packages? In the Buildroot manual, it's mentioned "Find the external python modules menu and insert your package inside.", what should I insert here? source code? On Wed, 8 Feb 2023 at 21:07, Maxim Kochetkov wrote: > > > On 08.02.2023 21:19, Sourabh Hegde wrote: > > Hello Ramon, > > > > I don't want an external toolchain. Maybe I was not clear. My goal is to > > use the program/sdk from here > > https://github.com/aws/aws-iot-device-sdk-python-v2 > > , this is a > python > > based project. And no package is available for this. Can I use > > python-pip to install it? > > Try to add your own package. > > > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages > > You can use any python package as a reference. > For example: > > https://git.buildroot.net/buildroot/commit/package?id=037dbe64d861e3d5580ecac608bd278afc9bbcc6 > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bigunclemax at gmail.com Wed Feb 8 22:21:47 2023 From: bigunclemax at gmail.com (Maxim Kiselev) Date: Thu, 9 Feb 2023 01:21:47 +0300 Subject: [Buildroot] [PATCH 1/1] lksctp-tools: bump to version 1.0.19 In-Reply-To: <20230208094543.474237-1-fido_max@inbox.ru> References: <20230208094543.474237-1-fido_max@inbox.ru> Message-ID: ??, 8 ????. 2023 ?. ? 12:45, Maxim Kochetkov : > > Release notes: https://github.com/sctp/lksctp-tools/blob/v1.0.19/ChangeLog > > Signed-off-by: Maxim Kochetkov > --- > package/lksctp-tools/lksctp-tools.hash | 4 ++-- > package/lksctp-tools/lksctp-tools.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/lksctp-tools/lksctp-tools.hash b/package/lksctp-tools/lksctp-tools.hash > index fb892fdc3b..b3a1f59d86 100644 > --- a/package/lksctp-tools/lksctp-tools.hash > +++ b/package/lksctp-tools/lksctp-tools.hash > @@ -1,6 +1,6 @@ > # From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ > -md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz > -sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz > +md5 0fbb288c9f9625b88d3ab21c9ed9f011 lksctp-tools-1.0.19.tar.gz > +sha1 d410a596485c38464177a38ae7c7081444e6589e lksctp-tools-1.0.19.tar.gz > # Locally computed > sha256 dee5f35e583183abb9212938643ecb2d858fd89e2e286f4b1d903f65d49d6c76 COPYING.lib > sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING > diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk > index 5ac794e842..af86a28516 100644 > --- a/package/lksctp-tools/lksctp-tools.mk > +++ b/package/lksctp-tools/lksctp-tools.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LKSCTP_TOOLS_VERSION = 1.0.17 > -LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools > +LKSCTP_TOOLS_VERSION = 1.0.19 > +LKSCTP_TOOLS_SITE = $(call github,sctp,lksctp-tools,v$(LKSCTP_TOOLS_VERSION)) > LKSCTP_TOOLS_INSTALL_STAGING = YES > # configure not shipped > LKSCTP_TOOLS_AUTORECONF = YES > -- > 2.38.1 > > Signed-off-by: Maxim Kochetkov Tested-by: Maksim Kiselev From flaniel at linux.microsoft.com Wed Feb 8 22:22:16 2023 From: flaniel at linux.microsoft.com (Francis Laniel) Date: Wed, 08 Feb 2023 23:22:16 +0100 Subject: [Buildroot] [PATCH] package/libbpf: Don't remove bpf.h on host In-Reply-To: <17501a13-8018-656f-5f4d-b1cf6c1ecd5c@mind.be> References: <12146851.O9o76ZdvQC@pwmachine> <17501a13-8018-656f-5f4d-b1cf6c1ecd5c@mind.be> Message-ID: <2667723.mvXUDI8C0e@pwmachine> Hi. Le mercredi 8 f?vrier 2023, 16:47:58 CET Arnout Vandecappelle a ?crit : > Hi Daniel, Francis, > > On 07/02/2023 21:10, Francis Laniel wrote: > > Hi. > > > > Le lundi 28 novembre 2022, 16:06:20 CET Lang Daniel a ?crit : > >> libbpf >1.0.0 defines libbpf_bpf_link_type_str(enum bpf_link_type) in > >> src/libbpf.h, which is included by host-pahole. > >> bpf_link_type is defined in linux/bpf.h, therefore the comment stating > >> that pahole doesn't need bpf.h is no longer valid. > >> > >> Fixes: > >> - > >> http://autobuild.buildroot.net/results/d126a4b6eca786402dc362c86f8df3adde > >> c3 > >> d217/ > >> > >> Signed-off-by: Daniel Lang > >> --- > >> I wasn't able to reproduce the mentioned compile error in the kernel. > >> The mentioned file (tools/lib/bpf/strset.c) shouldn't be compiled when > >> compiling the kernel as it would recompile libbpf. > >> --- > >> > >> package/libbpf/libbpf.mk | 17 +---------------- > >> 1 file changed, 1 insertion(+), 16 deletions(-) > >> > >> diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk > >> index 820f1dc4bf..0381fd833a 100644 > >> --- a/package/libbpf/libbpf.mk > >> +++ b/package/libbpf/libbpf.mk > >> @@ -39,26 +39,11 @@ define LIBBPF_INSTALL_TARGET_CMDS > >> > >> -C $(@D)/src install DESTDIR=$(TARGET_DIR) > >> > >> endef > >> > >> -# We need to install_uapi_headers so we have btf.h to compile > >> -# host-pahole. > >> -# Nonetheless, this target adds bpf.h which generates a conflict when > >> -# building the kernel: > >> -# In file included from libbpf_internal.h:17:0, from strset.c:9: > >> -# relo_core.h:10:6: error: nested redefinition of 'enum > >> bpf_core_relo_kind' -# enum bpf_core_relo_kind { > >> -# ^~~~~~~~~~~~~~~~~~ > >> -# relo_core.h:10:6: error: redeclaration of 'enum bpf_core_relo_kind' > >> -# In file included from libbpf_legacy.h:13:0, > >> -# from libbpf_internal.h:16, > >> -# from strset.c:9: > >> -# /home/francis/buildroot/output/host/include/linux/bpf.h:6497:6: note: > >> originally defined here -# enum bpf_core_relo_kind { > >> -# So, better to remove remove it now since we do not need it to build > >> +# We need to install_uapi_headers so we have bpf.h and btf.h to compile > >> > >> # host-pahole, the only user of host-libbpf. > >> define HOST_LIBBPF_INSTALL_CMDS > >> > >> $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ > >> > >> -C $(@D)/src install install_uapi_headers DESTDIR=$(HOST_DIR) > >> > >> - rm $(HOST_DIR)/include/linux/bpf.h > >> > >> endef > >> > >> $(eval $(generic-package)) > > > > Thank you for this patch and sorry for my very late reply. > > Sadly, I do not think the patch addresses the underlying issue. > > Indeed, this is not pahole which does not need this file, as pahole relies > > on to be built. > > So, the whole point of this comment and the rm is to avoid a problem when > > building the kernel when pahole was built before. > > The current solution, however, also doesn't work, which is why Franci's > patch [1] is needed to fix it again. > > However, we believe this is not the proper fix. The real issue is the > following: > > - libbpf installs headers which are possibly incompatible with the kernel's > headers. Normally this is not a problem, because you have either the > kernel's or libbpf's headers installed, not both. > > - However, when we install libbpf headers in $(HOST_DIR)/include, the kernel > build itself picks up those headers instead of its own internal headers. > That is why bpf.h is removed here to begin with. If bpf.h is not removed > (and the kernel headers are indeed incompatible with the libbpf ones), then > the kernel build will fail. > > - There is however no reason why the kernel should pick up > $(HOST_DIR)/include instead of its own internal headers. Normally it > doesn't do that, because it supplies -I options to its own headers, and > these have precedence over the system included /usr/include etc. However, > we force HOSTCC="$(HOSTCC) $(HOST_CFLAGS)" and HOST_CFLAGS has > -I$(HOST_DIR)/include. This one will come before all of the ones that the > kernel adds and will have precedence. > > Therefore, we believe that the solution is to use -isystem instead of -I in > the HOSTCC setting of the kernel. This is indeed what is already done for > uboot: > > HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem > /,$(HOST_CFLAGS)))" \ Thank you for all the details! Using -isystem sounds like a really good idea! > Note that there is a risk that this by itself goes wrong as well. We tried > at some point to use -isystem instead of -I in HOST_CFLAGS: > > commit 6f8162cf8c1abef7e0a4771fe0d6b26a28f5c2b6 > Author: David Raeman > Date: Mon Jul 25 21:52:26 2016 > > package/Makefile.in should grab HOST_DIR headers using -isystem instead > of -I. > > > but this was reverted a copule of days later: > > commit 255b6f80d395ef048f46cfcf75dba690c56af657 > Author: Thomas Petazzoni > Date: Sat Jul 30 18:10:18 2016 > > Revert "package/Makefile.in should grab HOST_DIR headers using -isystem > instead of -I." > > (Unfortunately, the commit has no further explanation of what went wrong). > > So, could you (Daniel and Francis) try to apply this patch and replace -I > with -isystem like is done for U-Boot, and do a bunch of kernel builds to > see if it breaks anything? I will sure take a look and will come back here with my findings! > For now, I've marked this patch as Changes Requested (it can only be > applied if the bpf.h problem is solved in some other way), and marked > Francis's patch [1] as Superseded. > > Regards, > Arnout > > > [1] > https://patchwork.ozlabs.org/project/buildroot/patch/20220610165441.84812-2-> flaniel at linux.microsoft.com/ > > Sadly, I tested your patch and I hit the problem described in the comment > > regarding redefinition of bpf_core_relo_kind. > > > > Did you also hit it or you were able to build the kernel with > > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE? > > > > > > Best regards and thank you in advance. > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot Best regards. From giulio.benetti at benettiengineering.com Wed Feb 8 23:07:19 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 00:07:19 +0100 Subject: [Buildroot] [PATCH 0/2] Bump Harfbuzz to version 6.0.0 Message-ID: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> While building all packages that depend on Harfbuzz(listed in harfbuzz patch) I've found that libgtk3 has a bug that shows up while building libinput because of a bug of a local patch of libgtk3. Best regards Giulio Benetti Giulio Benetti (2): package/libgtk3: fix build failure on libinput due to the presence of atk-bridge-2.0 in gtk+-3.0.pc package/harfbuzz: bump to version 6.0.0 package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- ...h => 0001-Remove-atk-bridge-support.patch} | 31 +++++++++++++++++-- 3 files changed, 30 insertions(+), 5 deletions(-) rename package/libgtk3/{0001-disable-atk-bridge.patch => 0001-Remove-atk-bridge-support.patch} (59%) -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 8 23:07:20 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 00:07:20 +0100 Subject: [Buildroot] [PATCH 1/2] package/libgtk3: fix build failure on libinput due to the presence of atk-bridge-2.0 in gtk+-3.0.pc In-Reply-To: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> Message-ID: <20230208230721.3269610-2-giulio.benetti@benettiengineering.com> Patch 0001-disable-atk-bridge.patch misses to remove: atk_pkgs += ['atk-bridge-2.0'] that is not affected by any meson variable, this results in having libgtk3 to have atk-bridge-2.0 in its gtk+-3.0.pc and so other libraries(i.e. libinput) tries to {pkgconf}find it failing. So let's convert the patch to git format and add the removal of such line. Fixes: still not found Signed-off-by: Giulio Benetti --- ...h => 0001-Remove-atk-bridge-support.patch} | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) rename package/libgtk3/{0001-disable-atk-bridge.patch => 0001-Remove-atk-bridge-support.patch} (59%) diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-Remove-atk-bridge-support.patch similarity index 59% rename from package/libgtk3/0001-disable-atk-bridge.patch rename to package/libgtk3/0001-Remove-atk-bridge-support.patch index f3e9bff2ba..b52c9be650 100644 --- a/package/libgtk3/0001-disable-atk-bridge.patch +++ b/package/libgtk3/0001-Remove-atk-bridge-support.patch @@ -1,16 +1,27 @@ -Remove atk-bridge support. +From 923ba2a1653b942093e9d25f8f4d2e7c09a66328 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 8 Feb 2023 23:50:56 +0100 +Subject: [PATCH] Remove atk-bridge support. atk-bridge doesn't seem useful for now in Buildroot and requires to add two new packages just for it: at-spi2-core and at-spi2-atk. Signed-off-by: Hadrien Boutteville +[Giulio: remove 'atk-bridge-2.0' too] +Signed-off-by: Giulio Benetti +--- + gtk/a11y/gtkaccessibility.c | 8 -------- + meson.build | 4 +--- + 2 files changed, 1 insertion(+), 11 deletions(-) +diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c +index 7f0e5207d9..14da1e80e2 100644 --- a/gtk/a11y/gtkaccessibility.c +++ b/gtk/a11y/gtkaccessibility.c @@ -37,10 +37,6 @@ #include #include - + -#ifdef GDK_WINDOWING_X11 -#include -#endif @@ -21,13 +32,15 @@ Signed-off-by: Hadrien Boutteville @@ -988,9 +984,5 @@ _gtk_accessibility_init (void) _gtk_accessibility_override_atk_util (); do_window_event_initialization (); - + -#ifdef GDK_WINDOWING_X11 - atk_bridge_adaptor_init (NULL, NULL); -#endif - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); } +diff --git a/meson.build b/meson.build +index aed48fc3f6..370bf1cce1 100644 --- a/meson.build +++ b/meson.build @@ -564,7 +564,7 @@ if x11_enabled @@ -39,3 +52,15 @@ Signed-off-by: Hadrien Boutteville backend_immodules += ['xim'] +@@ -583,8 +583,6 @@ if x11_enabled + x11_pkgs += ['xdamage'] + endif + +- atk_pkgs += ['atk-bridge-2.0'] +- + cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false) + cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false) + cdata.set('HAVE_XCOMPOSITE', xcomposite_dep.found() ? 1 : false) +-- +2.34.1 + -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 8 23:07:21 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 00:07:21 +0100 Subject: [Buildroot] [PATCH 2/2] package/harfbuzz: bump to version 6.0.0 In-Reply-To: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> Message-ID: <20230208230721.3269610-3-giulio.benetti@benettiengineering.com> Since the major release changed all the packages that have direct dependency to harfbuzz has been succesfully built: - efl - libass - mupdf - pango - qt5base - qt5webengine - qt6base - sdl2_ttf - supertuxkart - vlc - webkitgtk - wpewebkit Signed-off-by: Giulio Benetti --- 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 9489f25c6a..faae7b91e3 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d harfbuzz-5.3.1.tar.xz +sha256 1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4 harfbuzz-6.0.0.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index b0112168e1..02fe4ecec3 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 5.3.1 +HARFBUZZ_VERSION = 6.0.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) -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 9 00:48:23 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 01:48:23 +0100 Subject: [Buildroot] [PATCH] arch: move global and rename variable BR2_PACKAGE_Z3_ARCH_SUPPORTS Message-ID: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> Package quickjs fails to build on architectures that don't support full float rounding. To support all kind of float rounding FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD must be defined in fenv.h. Since package z3 locally implements this check let's make it global, rename it to be generic and use it for both package quickjs and z3. Fixes: http://autobuild.buildroot.net/results/0b6/0b67381e3643c134c92cbcd1c5dc258fd760cd7e/ http://autobuild.buildroot.net/results/cf2/cf249a82c83d3c8503205f4c3c5859dd9d52afdf/ http://autobuild.buildroot.net/results/9b3/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2/ http://autobuild.buildroot.net/results/4f1/4f13cf7d353260c6b8934dbdcf267bea884b356b/ Signed-off-by: Giulio Benetti --- arch/Config.in | 24 ++++++++++++++++++++++++ package/quickjs/Config.in | 4 ++-- package/z3/Config.in | 25 +------------------------ 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/arch/Config.in b/arch/Config.in index 1c0c400a98..90846861ca 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -253,6 +253,30 @@ config BR2_xtensa endchoice +# Not all architectures support float rounding. This can be found while +# checking if fenv.h provides all four macros: +# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD +# See for example in glibc https://sourceware.org/git/glibc.git +# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ +config BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arceb || BR2_arcle + default y if BR2_arm || BR2_armeb + default y if BR2_i386 + default y if BR2_m68k + # BR2_microblaze has only FE_TONEAREST + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + # BR2_nios2 has only FE_TONEAREST + default y if BR2_or1k + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_s390x + # BR2_sh has only FE_{TONEAREST,TOWARDZERO} + default y if BR2_sparc || BR2_sparc64 + default y if BR2_x86_64 + # BR2_xtensa supports only uclibc which does not have fenv.h + # For some architectures or specific cores, our internal toolchain # backend is not suitable (like, missing support in upstream gcc, or # no ChipCo fork exists...) diff --git a/package/quickjs/Config.in b/package/quickjs/Config.in index dc466241ba..6f24787333 100644 --- a/package/quickjs/Config.in +++ b/package/quickjs/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_QUICKJS bool "quickjs" - depends on !BR2_nios2 # fenv.h lacks FE_{DOWN,UP}WARD on nios2 + depends on BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING # fenv.h lacks FE_{DOWN,UP}WARD depends on !BR2_STATIC_LIBS # No way to check for fenv support. depends on !BR2_TOOLCHAIN_USES_UCLIBC @@ -15,7 +15,7 @@ config BR2_PACKAGE_QUICKJS https://bellard.org/quickjs/ comment "quickjs needs a glibc or musl toolchain w/ gcc >= 4.9, host gcc >= 4.9, dynamic library" - depends on !BR2_nios2 + depends on BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/z3/Config.in b/package/z3/Config.in index 8cd3128687..5ceca5dbe2 100644 --- a/package/z3/Config.in +++ b/package/z3/Config.in @@ -1,33 +1,10 @@ -# z3 supports arch for which libc fenv.h provides all four macros: -# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD -# See for example in glibc https://sourceware.org/git/glibc.git -# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ -config BR2_PACKAGE_Z3_ARCH_SUPPORTS - bool - default y if BR2_aarch64 || BR2_aarch64_be - default y if BR2_arceb || BR2_arcle - default y if BR2_arm || BR2_armeb - default y if BR2_i386 - default y if BR2_m68k - # BR2_microblaze has only FE_TONEAREST - default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - # BR2_nios2 has only FE_TONEAREST - default y if BR2_or1k - default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le - default y if BR2_riscv - default y if BR2_s390x - # BR2_sh has only FE_{TONEAREST,TOWARDZERO} - default y if BR2_sparc || BR2_sparc64 - default y if BR2_x86_64 - # BR2_xtensa supports only uclibc which does not have fenv.h - config BR2_PACKAGE_Z3 bool "z3" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # c++17 # z3 needs fenv.h which is not provided by uclibc depends on !BR2_TOOLCHAIN_USES_UCLIBC - depends on BR2_PACKAGE_Z3_ARCH_SUPPORTS + depends on BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING help Z3, also known as the Z3 Theorem Prover, is a cross-platform satisfiability modulo theories (SMT) solver. -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 9 00:56:18 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 01:56:18 +0100 Subject: [Buildroot] [PATCH] arch: move global and rename variable BR2_PACKAGE_Z3_ARCH_SUPPORTS In-Reply-To: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> References: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> Message-ID: Pardon, this had to be a RFC, I've forgotten to add it. Some architecture still lacks some float rounding but is listed. Let me know if it's possible to apply this patch and catch the other architecture failures on Autobuilder rather than check all the architectures' FPU implementation by hand(I can do it anyway if requested). Best regards -- Giulio Benetti CEO/CTO at Benetti Engineering sas On 09/02/23 01:48, Giulio Benetti wrote: > Package quickjs fails to build on architectures that don't support full > float rounding. To support all kind of float rounding FE_DOWNWARD, > FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD must be defined in fenv.h. > Since package z3 locally implements this check let's make it global, > rename it to be generic and use it for both package quickjs and z3. > > Fixes: > http://autobuild.buildroot.net/results/0b6/0b67381e3643c134c92cbcd1c5dc258fd760cd7e/ > http://autobuild.buildroot.net/results/cf2/cf249a82c83d3c8503205f4c3c5859dd9d52afdf/ > http://autobuild.buildroot.net/results/9b3/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2/ > http://autobuild.buildroot.net/results/4f1/4f13cf7d353260c6b8934dbdcf267bea884b356b/ > > Signed-off-by: Giulio Benetti > --- > arch/Config.in | 24 ++++++++++++++++++++++++ > package/quickjs/Config.in | 4 ++-- > package/z3/Config.in | 25 +------------------------ > 3 files changed, 27 insertions(+), 26 deletions(-) > > diff --git a/arch/Config.in b/arch/Config.in > index 1c0c400a98..90846861ca 100644 > --- a/arch/Config.in > +++ b/arch/Config.in > @@ -253,6 +253,30 @@ config BR2_xtensa > > endchoice > > +# Not all architectures support float rounding. This can be found while > +# checking if fenv.h provides all four macros: > +# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD > +# See for example in glibc https://sourceware.org/git/glibc.git > +# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ > +config BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING > + bool > + default y if BR2_aarch64 || BR2_aarch64_be > + default y if BR2_arceb || BR2_arcle > + default y if BR2_arm || BR2_armeb > + default y if BR2_i386 > + default y if BR2_m68k > + # BR2_microblaze has only FE_TONEAREST > + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el > + # BR2_nios2 has only FE_TONEAREST > + default y if BR2_or1k > + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le > + default y if BR2_riscv > + default y if BR2_s390x > + # BR2_sh has only FE_{TONEAREST,TOWARDZERO} > + default y if BR2_sparc || BR2_sparc64 > + default y if BR2_x86_64 > + # BR2_xtensa supports only uclibc which does not have fenv.h > + > # For some architectures or specific cores, our internal toolchain > # backend is not suitable (like, missing support in upstream gcc, or > # no ChipCo fork exists...) > diff --git a/package/quickjs/Config.in b/package/quickjs/Config.in > index dc466241ba..6f24787333 100644 > --- a/package/quickjs/Config.in > +++ b/package/quickjs/Config.in > @@ -1,6 +1,6 @@ > config BR2_PACKAGE_QUICKJS > bool "quickjs" > - depends on !BR2_nios2 # fenv.h lacks FE_{DOWN,UP}WARD on nios2 > + depends on BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING # fenv.h lacks FE_{DOWN,UP}WARD > depends on !BR2_STATIC_LIBS > # No way to check for fenv support. > depends on !BR2_TOOLCHAIN_USES_UCLIBC > @@ -15,7 +15,7 @@ config BR2_PACKAGE_QUICKJS > https://bellard.org/quickjs/ > > comment "quickjs needs a glibc or musl toolchain w/ gcc >= 4.9, host gcc >= 4.9, dynamic library" > - depends on !BR2_nios2 > + depends on BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING > depends on BR2_USE_MMU > depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_HOST_GCC_AT_LEAST_4_9 > diff --git a/package/z3/Config.in b/package/z3/Config.in > index 8cd3128687..5ceca5dbe2 100644 > --- a/package/z3/Config.in > +++ b/package/z3/Config.in > @@ -1,33 +1,10 @@ > -# z3 supports arch for which libc fenv.h provides all four macros: > -# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD > -# See for example in glibc https://sourceware.org/git/glibc.git > -# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ > -config BR2_PACKAGE_Z3_ARCH_SUPPORTS > - bool > - default y if BR2_aarch64 || BR2_aarch64_be > - default y if BR2_arceb || BR2_arcle > - default y if BR2_arm || BR2_armeb > - default y if BR2_i386 > - default y if BR2_m68k > - # BR2_microblaze has only FE_TONEAREST > - default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el > - # BR2_nios2 has only FE_TONEAREST > - default y if BR2_or1k > - default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le > - default y if BR2_riscv > - default y if BR2_s390x > - # BR2_sh has only FE_{TONEAREST,TOWARDZERO} > - default y if BR2_sparc || BR2_sparc64 > - default y if BR2_x86_64 > - # BR2_xtensa supports only uclibc which does not have fenv.h > - > config BR2_PACKAGE_Z3 > bool "z3" > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # c++17 > # z3 needs fenv.h which is not provided by uclibc > depends on !BR2_TOOLCHAIN_USES_UCLIBC > - depends on BR2_PACKAGE_Z3_ARCH_SUPPORTS > + depends on BR2_PACKAGE_ARCH_HAS_ALL_FLOAT_ROUNDING > help > Z3, also known as the Z3 Theorem Prover, is a cross-platform > satisfiability modulo theories (SMT) solver. From ckhardin at gmail.com Thu Feb 9 01:53:18 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 17:53:18 -0800 Subject: [Buildroot] [PATCH 1/2] boot/uboot: add a setlocalversion rsync hook when overriding srcdir Message-ID: <20230209015319.28176-1-charles.hardin@chargepoint.com> From: Charles Hardin During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define PLAIN_VERSION "2018.03-01358-gbda75d6a8b" #define U_BOOT_VERSION "U-Boot " PLAIN_VERSION Signed-off-by: Charles Hardin Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..e340d2cf11 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -40,6 +40,18 @@ UBOOT_SITE = https://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 endif +ifneq ($(UBOOT_OVERRIDE_SRCDIR),) +define UBOOT_OVERRIDE_SRCDIR_SETLOCALVERSION + (cd $(@D); \ + if [ -x ./scripts/setlocalversion ]; then \ + ./scripts/setlocalversion --save-scmversion \ + $(abspath $(UBOOT_OVERRIDE_SRCDIR)) ||:; \ + fi) +endef + +UBOOT_POST_RSYNC_HOOKS += UBOOT_OVERRIDE_SRCDIR_SETLOCALVERSION +endif + ifeq ($(BR2_TARGET_UBOOT)$(BR2_TARGET_UBOOT_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) endif -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 01:53:19 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 17:53:19 -0800 Subject: [Buildroot] [PATCH 2/2] linux: add a setlocalversion rsync hook when overriding srcdir In-Reply-To: <20230209015319.28176-1-charles.hardin@chargepoint.com> References: <20230209015319.28176-1-charles.hardin@chargepoint.com> Message-ID: <20230209015319.28176-2-charles.hardin@chargepoint.com> From: Charles Hardin During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define UTS_RELEASE "5.4.70-00031-g92c23d10d003" Signed-off-by: Charles Hardin Signed-off-by: Charles Hardin --- linux/linux.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..e88856d71e 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -46,6 +46,18 @@ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_ endif endif +ifneq ($(LINUX_OVERRIDE_SRCDIR),) +define LINUX_OVERRIDE_SRCDIR_SETLOCALVERSION + (cd $(@D); \ + if [ -x ./scripts/setlocalversion ]; then \ + ./scripts/setlocalversion --save-scmversion \ + $(abspath $(LINUX_OVERRIDE_SRCDIR)) ||:; \ + fi) +endef + +LINUX_POST_RSYNC_HOOKS += LINUX_OVERRIDE_SRCDIR_SETLOCALVERSION +endif + ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) endif -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 03:04:02 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 19:04:02 -0800 Subject: [Buildroot] [PATCH 1/2] boot/uboot: add a setlocalversion rsync hook when overriding srcdir Message-ID: <20230209030405.33574-1-charles.hardin@chargepoint.com> From: Charles Hardin During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define PLAIN_VERSION "2018.03-01358-gbda75d6a8b" #define U_BOOT_VERSION "U-Boot " PLAIN_VERSION Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..e340d2cf11 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -40,6 +40,18 @@ UBOOT_SITE = https://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 endif +ifneq ($(UBOOT_OVERRIDE_SRCDIR),) +define UBOOT_OVERRIDE_SRCDIR_SETLOCALVERSION + (cd $(@D); \ + if [ -x ./scripts/setlocalversion ]; then \ + ./scripts/setlocalversion --save-scmversion \ + $(abspath $(UBOOT_OVERRIDE_SRCDIR)) ||:; \ + fi) +endef + +UBOOT_POST_RSYNC_HOOKS += UBOOT_OVERRIDE_SRCDIR_SETLOCALVERSION +endif + ifeq ($(BR2_TARGET_UBOOT)$(BR2_TARGET_UBOOT_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) endif -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 03:04:03 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 19:04:03 -0800 Subject: [Buildroot] [PATCH 1/2] linux: create a scmversion file based on the custom repo variables In-Reply-To: <20230209030405.33574-1-charles.hardin@chargepoint.com> References: <20230209030405.33574-1-charles.hardin@chargepoint.com> Message-ID: <20230209030405.33574-2-charles.hardin@chargepoint.com> From: Charles Hardin When using the custom repositories, the archive creation will omit the source history to get reproducible hashes. This has the side effect of making the setlocalversion scripts within the builds to not create the tracking information as expected. So, just generate a .scmversion so that kernels will be labelled with where buildroot referenced them. For example (line wrapped) #define UTS_RELEASE "5.4.70-repo-version-" \ "92c23d10d0031e0a13244a1a97e7530d3b53fc6e" Signed-off-by: Charles Hardin --- linux/linux.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..0b27c8dee2 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -596,6 +596,20 @@ endif ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)),) $(error No custom repo URL set. Check your BR2_LINUX_KERNEL_CUSTOM_REPO_URL setting) endif + +# Create a custom scm version file to reflect the source version since the +# archive will omit source directories like .git to maintain reproducible +# hashes for the archives +LINUX_CUSTOM_REPO_SCMVERSION = \ + "-repo-version-$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION))" +define LINUX_CUSTOM_REPO_SCMVERSION_HOOK + (cd $(@D); \ + if [ ! -f .scmversion ]; then \ + echo $(LINUX_CUSTOM_REPO_SCMVERSION) > .scmversion; \ + fi) +endef + +LINUX_POST_EXTRACT_HOOKS += LINUX_CUSTOM_REPO_SCMVERSION_HOOK endif ifeq ($(BR_BUILDING),y) -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 03:04:04 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 19:04:04 -0800 Subject: [Buildroot] [PATCH 2/2] boot/uboot: create a scmversion file based on the custom repo variables In-Reply-To: <20230209030405.33574-1-charles.hardin@chargepoint.com> References: <20230209030405.33574-1-charles.hardin@chargepoint.com> Message-ID: <20230209030405.33574-3-charles.hardin@chargepoint.com> From: Charles Hardin When using the custom repositories, the archive creation will omit the source history to get reproducible hashes. This has the side effect of making the setlocalversion scripts within the builds to not create the tracking information as expected. So, just generate a .scmversion so that kernels will be labelled with where buildroot referenced them. Example (line wrapped) #define PLAIN_VERSION "2018.03-repo-version-" \ "d72b9d0908364a64718b652b75e4cac9b85cf0c3" Signed-off-by: Charles Hardin Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..65bb7669c8 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -526,12 +526,25 @@ endif # BR2_TARGET_UBOOT_CUSTOM_TARBALL ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT)$(BR2_TARGET_UBOOT_CUSTOM_HG),y) ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),) $(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting) -endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_URL +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_REPO_URL ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION)),) $(error No custom U-Boot repository version specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting) -endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_VERSION +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION endif # BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG +# Create a custom scm version file to reflect the source version since the +# archive will omit source directories like .git to maintain reproducible +# hashes for the archives +UBOOT_CUSTOM_REPO_SCMVERSION = \ + "-repo-version-$(call qstrip,$(BR2_UBOOT_CUSTOM_REPO_VERSION))" +define UBOOT_CUSTOM_REPO_SCMVERSION_HOOK + (cd $(@D); \ + if [ ! -f .scmversion ]; then \ + echo $(UBOOT_CUSTOM_REPO_SCMVERSION) > .scmversion; \ + fi) +endef + +UBOOT_POST_EXTRACT_HOOKS += UBOOT_CUSTOM_REPO_SCMVERSION_HOOK endif # BR2_TARGET_UBOOT && BR_BUILDING ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 03:04:05 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 19:04:05 -0800 Subject: [Buildroot] [PATCH 2/2] linux: add a setlocalversion rsync hook when overriding srcdir In-Reply-To: <20230209030405.33574-1-charles.hardin@chargepoint.com> References: <20230209030405.33574-1-charles.hardin@chargepoint.com> Message-ID: <20230209030405.33574-4-charles.hardin@chargepoint.com> From: Charles Hardin During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define UTS_RELEASE "5.4.70-00031-g92c23d10d003" Signed-off-by: Charles Hardin Signed-off-by: Charles Hardin --- linux/linux.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..e88856d71e 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -46,6 +46,18 @@ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_ endif endif +ifneq ($(LINUX_OVERRIDE_SRCDIR),) +define LINUX_OVERRIDE_SRCDIR_SETLOCALVERSION + (cd $(@D); \ + if [ -x ./scripts/setlocalversion ]; then \ + ./scripts/setlocalversion --save-scmversion \ + $(abspath $(LINUX_OVERRIDE_SRCDIR)) ||:; \ + fi) +endef + +LINUX_POST_RSYNC_HOOKS += LINUX_OVERRIDE_SRCDIR_SETLOCALVERSION +endif + ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) endif -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 03:07:05 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 19:07:05 -0800 Subject: [Buildroot] [PATCH 1/2] linux: create a scmversion file based on the custom repo variables Message-ID: <20230209030706.33870-1-charles.hardin@chargepoint.com> From: Charles Hardin When using the custom repositories, the archive creation will omit the source history to get reproducible hashes. This has the side effect of making the setlocalversion scripts within the builds to not create the tracking information as expected. So, just generate a .scmversion so that kernels will be labelled with where buildroot referenced them. For example (line wrapped) #define UTS_RELEASE "5.4.70-repo-version-" \ "92c23d10d0031e0a13244a1a97e7530d3b53fc6e" Signed-off-by: Charles Hardin Signed-off-by: Charles Hardin --- linux/linux.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..0b27c8dee2 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -596,6 +596,20 @@ endif ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)),) $(error No custom repo URL set. Check your BR2_LINUX_KERNEL_CUSTOM_REPO_URL setting) endif + +# Create a custom scm version file to reflect the source version since the +# archive will omit source directories like .git to maintain reproducible +# hashes for the archives +LINUX_CUSTOM_REPO_SCMVERSION = \ + "-repo-version-$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION))" +define LINUX_CUSTOM_REPO_SCMVERSION_HOOK + (cd $(@D); \ + if [ ! -f .scmversion ]; then \ + echo $(LINUX_CUSTOM_REPO_SCMVERSION) > .scmversion; \ + fi) +endef + +LINUX_POST_EXTRACT_HOOKS += LINUX_CUSTOM_REPO_SCMVERSION_HOOK endif ifeq ($(BR_BUILDING),y) -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 03:07:06 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 8 Feb 2023 19:07:06 -0800 Subject: [Buildroot] [PATCH 2/2] boot/uboot: create a scmversion file based on the custom repo variables In-Reply-To: <20230209030706.33870-1-charles.hardin@chargepoint.com> References: <20230209030706.33870-1-charles.hardin@chargepoint.com> Message-ID: <20230209030706.33870-2-charles.hardin@chargepoint.com> From: Charles Hardin When using the custom repositories, the archive creation will omit the source history to get reproducible hashes. This has the side effect of making the setlocalversion scripts within the builds to not create the tracking information as expected. So, just generate a .scmversion so that kernels will be labelled with where buildroot referenced them. Example (line wrapped) #define PLAIN_VERSION "2018.03-repo-version-" \ "d72b9d0908364a64718b652b75e4cac9b85cf0c3" Signed-off-by: Charles Hardin Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..65bb7669c8 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -526,12 +526,25 @@ endif # BR2_TARGET_UBOOT_CUSTOM_TARBALL ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT)$(BR2_TARGET_UBOOT_CUSTOM_HG),y) ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),) $(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting) -endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_URL +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_REPO_URL ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION)),) $(error No custom U-Boot repository version specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting) -endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_VERSION +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION endif # BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG +# Create a custom scm version file to reflect the source version since the +# archive will omit source directories like .git to maintain reproducible +# hashes for the archives +UBOOT_CUSTOM_REPO_SCMVERSION = \ + "-repo-version-$(call qstrip,$(BR2_UBOOT_CUSTOM_REPO_VERSION))" +define UBOOT_CUSTOM_REPO_SCMVERSION_HOOK + (cd $(@D); \ + if [ ! -f .scmversion ]; then \ + echo $(UBOOT_CUSTOM_REPO_SCMVERSION) > .scmversion; \ + fi) +endef + +UBOOT_POST_EXTRACT_HOOKS += UBOOT_CUSTOM_REPO_SCMVERSION_HOOK endif # BR2_TARGET_UBOOT && BR_BUILDING ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) -- 2.37.1 (Apple Git-137.1) From peter.macleod.thompson at gmail.com Thu Feb 9 03:30:38 2023 From: peter.macleod.thompson at gmail.com (Peter Thompson) Date: Wed, 8 Feb 2023 20:30:38 -0700 Subject: [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.20.1 In-Reply-To: <20230208165756.5d8dd14f@windsurf> References: <20221127002135.12134-1-peter.macleod.thompson@gmail.com> <20230208165756.5d8dd14f@windsurf> Message-ID: Hi Thomas, Apologies. I had thought there was a problem with the LICENSE_FILES in my update. Hence my subsequent change. Glad everything is now ok. Peter On Wed, Feb 8, 2023 at 8:57 AM Thomas Petazzoni < thomas.petazzoni at bootlin.com> wrote: > Hello Peter > > On Sat, 26 Nov 2022 17:21:35 -0700 > Peter Thompson wrote: > > > LICENSE_FILES changed to LICENSE.txt for version 2.20.1. > > Previous versions used COPYING.txt. > > > > Signed-off-by: Peter Thompson > > --- > > package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- > > package/sdl2_ttf/sdl2_ttf.mk | 4 ++-- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > Sorry for the long delay, but you had already sent this patch on > November 19, 2022 and it was applied on November 21, 2022, so it was > too late for a new version. > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From francois.perrad at gadz.org Thu Feb 9 04:13:31 2023 From: francois.perrad at gadz.org (=?UTF-8?Q?Fran=C3=A7ois_Perrad?=) Date: Thu, 9 Feb 2023 05:13:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/libgtk3: fix build failure on libinput due to the presence of atk-bridge-2.0 in gtk+-3.0.pc In-Reply-To: <20230208230721.3269610-2-giulio.benetti@benettiengineering.com> References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> <20230208230721.3269610-2-giulio.benetti@benettiengineering.com> Message-ID: Le jeu. 9 f?vr. 2023 ? 00:07, Giulio Benetti < giulio.benetti at benettiengineering.com> a ?crit : > Patch 0001-disable-atk-bridge.patch misses to remove: > atk_pkgs += ['atk-bridge-2.0'] > that is not affected by any meson variable, this results in having libgtk3 > to have atk-bridge-2.0 in its gtk+-3.0.pc and so other libraries(i.e. > libinput) tries to {pkgconf}find it failing. So let's convert the patch to > git format and add the removal of such line. > > Fixes: > still not found > this patch (disable-atk-bridge) will be removed soon, see https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 (package/atk: remove package) Fran?ois > Signed-off-by: Giulio Benetti > --- > ...h => 0001-Remove-atk-bridge-support.patch} | 31 +++++++++++++++++-- > 1 file changed, 28 insertions(+), 3 deletions(-) > rename package/libgtk3/{0001-disable-atk-bridge.patch => > 0001-Remove-atk-bridge-support.patch} (59%) > > diff --git a/package/libgtk3/0001-disable-atk-bridge.patch > b/package/libgtk3/0001-Remove-atk-bridge-support.patch > similarity index 59% > rename from package/libgtk3/0001-disable-atk-bridge.patch > rename to package/libgtk3/0001-Remove-atk-bridge-support.patch > index f3e9bff2ba..b52c9be650 100644 > --- a/package/libgtk3/0001-disable-atk-bridge.patch > +++ b/package/libgtk3/0001-Remove-atk-bridge-support.patch > @@ -1,16 +1,27 @@ > -Remove atk-bridge support. > +From 923ba2a1653b942093e9d25f8f4d2e7c09a66328 Mon Sep 17 00:00:00 2001 > +From: Giulio Benetti > +Date: Wed, 8 Feb 2023 23:50:56 +0100 > +Subject: [PATCH] Remove atk-bridge support. > > atk-bridge doesn't seem useful for now in Buildroot and requires to > add two new packages just for it: at-spi2-core and at-spi2-atk. > > Signed-off-by: Hadrien Boutteville > +[Giulio: remove 'atk-bridge-2.0' too] > +Signed-off-by: Giulio Benetti > +--- > + gtk/a11y/gtkaccessibility.c | 8 -------- > + meson.build | 4 +--- > + 2 files changed, 1 insertion(+), 11 deletions(-) > > +diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c > +index 7f0e5207d9..14da1e80e2 100644 > --- a/gtk/a11y/gtkaccessibility.c > +++ b/gtk/a11y/gtkaccessibility.c > @@ -37,10 +37,6 @@ > #include > #include > - > + > -#ifdef GDK_WINDOWING_X11 > -#include > -#endif > @@ -21,13 +32,15 @@ Signed-off-by: Hadrien Boutteville < > hadrien.boutteville at gmail.com> > @@ -988,9 +984,5 @@ _gtk_accessibility_init (void) > _gtk_accessibility_override_atk_util (); > do_window_event_initialization (); > - > + > -#ifdef GDK_WINDOWING_X11 > - atk_bridge_adaptor_init (NULL, NULL); > -#endif > - > atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); > } > +diff --git a/meson.build b/meson.build > +index aed48fc3f6..370bf1cce1 100644 > --- a/meson.build > +++ b/meson.build > @@ -564,7 +564,7 @@ if x11_enabled > @@ -39,3 +52,15 @@ Signed-off-by: Hadrien Boutteville < > hadrien.boutteville at gmail.com> > > backend_immodules += ['xim'] > > +@@ -583,8 +583,6 @@ if x11_enabled > + x11_pkgs += ['xdamage'] > + endif > + > +- atk_pkgs += ['atk-bridge-2.0'] > +- > + cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false) > + cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false) > + cdata.set('HAVE_XCOMPOSITE', xcomposite_dep.found() ? 1 : false) > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Thu Feb 9 05:35:03 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Thu, 9 Feb 2023 08:35:03 +0300 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> Message-ID: <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> On 09.02.2023 00:28, Sourabh Hegde wrote: > Hello Maxim, > > Thanks for the update. > > I think for me, the option "18.9.3. Generating a python-package from a > PyPI repository" > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages ?is suited. > I want to install this package https://pypi.org/project/awsiotsdk/ > . And this package requires > https://pypi.org/project/awscrt/ ?as > dependency. Should I create both Buildroot packages from python packages? Sure. > In the Buildroot manual, it's mentioned "Find the external python > modules menu and insert your package inside.", what should I insert > here? source code? The output from scanpypi util. "This will generate packages python-foo and python-bar in the package folder if they exist on https://pypi.python.org." "external python modules" is located at package/Config.in: ... if BR2_PACKAGE_PYTHON3 menu "External python modules" source "package/python-aenum/Config.in" source "package/python-aexpect/Config.in" ... Try this sequence: utils/scanpypi awscrt awsiotsdk -o package then add source "package/python-awscrt/Config.in" source "package/python-awsiotsdk/Config.in" to the package/Config.in From peter at korsgaard.com Thu Feb 9 06:48:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 09 Feb 2023 07:48:30 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used In-Reply-To: <20230208192425.GA2677@scaer> (Yann E. MORIN's message of "Wed, 8 Feb 2023 20:24:25 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208192425.GA2677@scaer> Message-ID: <87r0uzfi69.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > On 2023-02-08 19:19 +0100, Peter Korsgaard spake thusly: >> Waf requires that the version of the waf script matches the version of >> waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as >> otherwise waf errors out with errors like: >> >> Waf script '2.0.24' and library '1.9.3' do not match >> >> Signed-off-by: Peter Korsgaard >> --- >> package/pkg-waf.mk | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk >> index e090afa9e6..a067e69c9b 100644 >> --- a/package/pkg-waf.mk >> +++ b/package/pkg-waf.mk >> @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) >> >> define inner-waf-package >> >> +# The version of waflib has to match with the version of waf, >> +# otherwise waf errors out with: >> +# Waf script 'X' and library 'Y' do not match >> +define WAF_PACKAGE_REMOVE_WAF_LIB >> + $(RM) -fr $(@D)/waf $(@D)/waflib >> +endef >> + >> # We need host-python3 to run waf >> $(2)_DEPENDENCIES += host-python3 >> >> @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO >> ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) >> $(2)_DEPENDENCIES += host-waf >> $(2)_WAF = $$(HOST_DIR)/bin/waf >> +$(2)_PRE_CONFIGURE_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB > It would make more sense to make that either a post-extract or a > post-patch hook. I hesitated between post-patch and pre-configure, but went with pre-configure as this is closely related to the configure step - But I'm fine with making it a post-patch hook instead. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Thu Feb 9 06:49:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 09 Feb 2023 06:49:16 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-08 Message-ID: <20230209064923.EAB9F405E7@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-08 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 0 | 4 | 0 | 4 | 2022.11.x | 22 | 17 | 0 | 39 | master | 171 | 226 | 2 | 399 | Classification of failures by reason for master ----------------------------------------------- host-rust-1.67.0 | 13 host-go-1.19.5 | 10 host-pahole-1.24 | 10 host-binutils-2.38 | 9 unknown | 8 gobject-introspection-1.72.0 | 7 host-xz-5.2.10 | 7 libsolv-0.7.22 | 7 elfutils-0.186 | 6 perl-5.36.0 | 6 jack2-1.9.21 | 5 norm-1.5.8 | 5 busybox-1.36.0 | 4 host-binutils-2.37 | 4 ocf-linux-20171122 | 4 zabbix-5.4.9 | 4 host-libarchive-3.6.2 | 3 host-sentry-cli-2.8.0 | 3 linux-6.1.9 | 3 netsurf-3.10 | 3 python-cryptography-39.0.0 | 3 efivar-38 | 2 fwup-1.9.1 | 2 gerbera-1.10.0 | 2 glibc-2.36-81-g4f4d7a13edfd... | 2 gobject-introspection | 2 kexec-2.0.25 | 2 libcamera-apps-1.1.1 | 2 libgpg-error-1.46 | 2 linux-5.10.162-cip24-rt10 | 2 lirc-tools-0.10.2 | 2 lttng-modules-2.13.7 | 2 mutt-2.2.9 | 2 opencv3-3.4.17 | 2 php-xdebug-3.0.4 | 2 proxychains-ng-4.16 | 2 python-bcrypt-4.0.1 | 2 python-numpy-1.23.5 | 2 quickjs-2021-03-27 | 2 systemd-252.4 | 2 uclibc-1.0.42 | 2 wolfssl-5.5.3 | 2 xz-5.2.10 | 2 ace-7.0.6 | 1 android-tools-4.2.2+git2013... | 1 apg-2.3.0b | 1 assimp-5.2.5 | 1 avro-c-1.11.1 | 1 batman-adv-2022.3 | 1 bullet-3.21 | 1 containerd-1.6.16 | 1 dmalloc-5.6.5 | 1 edk2-edk2-stable202208 | 1 eigen-3.4.0 | 1 ffmpeg-4.4.3 | 1 fftw-quad-3.3.8 | 1 flac-1.4.2 | 1 fontconfig-2.13.1 | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubi/ubi.mk:51: /tmp/inst... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gdal-3.5.2 | 1 gmp-6.2.1 | 1 host-binutils-2.39 | 1 host-gcc-final-12.2.0 | 1 host-python-maturin-0.14.9 | 1 hyperfine-1.14.0 | 1 kvmtool-f77d646ba01d04be5aa... | 1 lapack-3.10.1 | 1 libabseil-cpp-20220623.1 | 1 libconfig-1.7.3 | 1 libfreeimage-3.18.0 | 1 libglib2-2.72.3 | 1 libsigsegv-2.14 | 1 libvorbis-1.3.7 | 1 linux-5.10.162-cip24 | 1 ltp-testsuite-20220930 | 1 lttng-babeltrace-1.5.7 | 1 mpv-0.33.1 | 1 ntpsec-1_2_2 | 1 nut-2.8.0 | 1 open-iscsi-2.1.8 | 1 optee-client-3.19.0 | 1 package/multipath-tools/mul... | 1 pcm-tools-202110 | 1 pcre2-10.42 | 1 pixz-1.0.7 | 1 pv-1.6.20 | 1 rdma-core-44.0 | 1 s6-linux-utils-2.6.0.0 | 1 sdl-1.2.15 | 1 toolchain-external-codescap... | 1 uccp420wlan-6.9.1 | 1 v4l2loopback-0.12.7 | 1 wireguard-linux-compat-1.0.... | 1 wtfutil-0.41.0 | 1 xenomai-3.0.10 | 1 zeek-4.1.1 | 1 znc-1.8.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- s390x | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/115534e17b6ababe63a68cd65762f992c0677113 | powerpc64le | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/ebc5cb47021a01fa4a51ebc650fc78d6901fcd4f | powerpc64le | apg-2.3.0b | NOK | http://autobuild.buildroot.net/results/8dd83a9bc0f73c998f8741730b3e6633cb44bcad | mips | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/48c1a821b00df3e048085aa01917cf0fda0ae261 | ORPH arm | avro-c-1.11.1 | NOK | http://autobuild.buildroot.net/results/d07d867d88096c25bb8eae0dfbc1c1544613252f | mips | batman-adv-2022.3 | NOK | http://autobuild.buildroot.net/results/b3ac57369e265d62b17ef68db9623b4a6f8ea157 | or1k | bullet-3.21 | NOK | http://autobuild.buildroot.net/results/d670ad272a702ff2f6aef0c19498f88ad41851f0 | mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/9a4b4df9b486e296366e56c81dc24c4101fea66b | ORPH mipsel | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/16bd8e98ed270c3389f3ebded4d0c9c80b11dfb6 | ORPH mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/754fe2560baf18ef5aaf4a184c7ea9b8d09403bb | ORPH mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/e12609ddf5a179c0f0d95797fbb7ba9dff260b4d | ORPH aarch64 | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/172606f296f79c26737b686339ab459d4fc4b362 | powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/b3795ccfb9d39bb64d09d27d7bcd6ba897cb7d3c | ORPH x86_64 | edk2-edk2-stable202208 | NOK | http://autobuild.buildroot.net/results/edf0e7b166060449d8abe945ba0cd5b6d2a0aa7d | aarch64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/da1b5fb23977ca409ffbea2608fd07ddab6e0353 | mips64el | efivar-38 | NOK | http://autobuild.buildroot.net/results/b763ee1ce4377daa024c23aaca1952e319ef3d96 | riscv64 | eigen-3.4.0 | NOK | http://autobuild.buildroot.net/results/c9ca19c3b8aee9b039e033295f4c0f0ef717b85c | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/942cee41a1b13734e4ca02332e3a1e0922142619 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3a93149edbfa250fcf161cb322c50b1fc3d8adf4 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/d087b29237c66142285af7b6bcbcb9b27d6751db | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/538888f10abc0e24103016abda1c4556af2c28f6 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/ec38bf0683539ef156a5e6bb7b456696e47de86f | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/6e4ca63d463524e4bee3b465dcd00131fbfdf42d | ORPH aarch64 | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/59d05def41be11712a9a27ebac6dda90d5b62399 | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/c4e89efd985e286e028da0d93aed42e363394663 | ORPH sh4a | flac-1.4.2 | NOK | http://autobuild.buildroot.net/results/11731c86f662ce90672952d72ba7a4c1b23bf3b0 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/ff2afe511e3634af640f60943ec2c6c12f2e98e9 | ORPH mips64 | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/124381bbfd9d56a8282b8f603ec501112d5440d9 | mips | fs/ubi/ubi.mk:51: /tmp/inst... | NOK | http://autobuild.buildroot.net/results/5c59e1bff6bbcb27a1a50ec1cc0b05112de70825 | mips64el | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/c39563c8a949a1ec925736ecaa34ab9cb340b1ec | or1k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/e4e7c0464ac4ef6e37ce880b01d8912200ead2b5 | aarch64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/60ae0f1f9e33705ab641ed8debfd848889dba86f | aarch64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/e3385a4342a1ef829ef103b223495b7b2eca5e3d | aarch64_be | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/5298740069e92fd98b8508d5eeab9dcbf7c2764c | powerpc | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/5f6f3eb7c087075fd09580831f1a116664f01d00 | aarch64_be | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/8e80a732002901a868ec1915a3ba801b9ba232f4 | x86_64 | gdal-3.5.2 | NOK | http://autobuild.buildroot.net/results/14eef25f68603969dff16244fc3a20750a52ef30 | nios2 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/23cd783d7e1cf5e05b6b896408f770d43df58532 | i686 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/ffbcb61326e615bd5cbaebfe8d3de71d1492980d | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b03d48761de9da8f8a4c1f5c41e1fd489fc15a44 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/d8868160b9322c7321f65ead3cca63ab31dacb9c | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/baffc108c1f0a0167ad2cfa4f553e94035daf0ec | ORPH microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/1f0d05d7ab57824400d0bf1bb29c63219826bc38 | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/a1553e62e49a80390a062e3cdce5a6c6615a8e1e | mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d0e46772ec92359fd932cde5bfda6c7bb9982b42 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f9b5c4c981bc8b3863e41b2377fd8794687abd3a | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7502209c0ea41714bb6933d5f04f99ab49ec4562 | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0d6eb7f9131dde44a1babbdcae31b23416aaabe9 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/fe4683b0572bc001b2ea1e7a0d05e855f15501fc | ORPH mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3f30617092fe60927413b93c6fe988d76df6fe39 | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1c9acaadfe8d885d787726fe49ba95b4dfb1dd9f | ORPH microblaze | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/f3054d433f2bf9376b618997599b94722dfeb94f | powerpc64le | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/39a869ec937107ec6a32926a718c5d35cd5e126b | x86_64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/acb1c370cb661926923d5b424ca5d04327ed851a | mips64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/7a76d7604d48851a69d7f48d02e5a1ba88bec245 | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/7f27a9b822d04a43aff7c9f11b7cd9f7c3d5ab18 | nios2 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1f675b401d5d1b76c74a29c24a380e837dca609c | aarch64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e9c23cff9bf40dba76df6d31ae67ed4ae65b1cb4 | arm | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/8be8c5ab0c68adf91b4f9220849c99c0a4180d7b | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/156fb37611979aa184a6a3d5fbfd0c792687f142 | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/a1c380d45509336ced3c15c0377456b252ec4244 | riscv64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/844fb8fe2538a80417085a8850fccf8b0fb34044 | mips64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/c4d3527b280fab85cd92a63cf70dddcbb6d97eaa | powerpc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/87652f980f69e231da76788dd5cb2a9974f1b2d5 | i686 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/bd20420c7e7b5f4dc767b0bb5ccc08d3840f7e8c | arceb | host-gcc-final-12.2.0 | NOK | http://autobuild.buildroot.net/results/2b51ccf15b1d51f88e12efecfaa482fcb09d1cbe | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/1a62d20f0c67a02a050351f44425d457c46731a0 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/34f5f7775bf2d9cd7354d7366b8da27e9dcec5a1 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/ecb886c2829701b8b2d378ba3f6c6b6e0a344c30 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/5ab746c4a008d66bc51065eddb8d30d54b13784c | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/b01e3dfd9a4c02f4973e12a27c1e0204977a1971 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/3ff250a13176c7c71b3bbc5b04f3c2b83c94b994 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/021867e859c96ec18c5b36d196220eb9425e1035 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/baf5d3f2f0e99208711a87afb97107014558367a | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/df31e672725c84b0ff10e299b5e4ab86f049d742 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/4bf00e5c3062d93ed6e5004b097c026989e5bf3c | m68k | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/0d6c1af08d4de23190fccd10af5a613ca4206266 | powerpc | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/2a7650b7101f3877fe22e1e8cc5fa2b842496d83 | microblaze | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/a63669ded597a295bdf280f5f1b3b59be52c0ba9 | microblaze | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/09f3d36a6cd5fe3bb586d1c3a76edc83b809f106 | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ad2aeffbe05cb16249b01497fb727bbf46cb8158 | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/b6d96201b373b857c7569aaf6e9c75dd828bc608 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d09e26a615cf4a0f9bb18070142bac21aa740445 | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/acb30087c50fb57a8d00f2ced3dba3cfc660758f | mipsel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/918940d33ee7ef3a53f722244618b0332958c330 | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/54994490bfc14e75db5de7edeb2239e4976d9698 | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c19eaed88525e9122abb4ba76c7fb14f825b7a69 | riscv64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/3941c1dcd72abacd79728595c6acdf88f74989b5 | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/a43255e51d924b448fb9ac1d86fa7cf51960533c | arm | host-python-maturin-0.14.9 | NOK | http://autobuild.buildroot.net/results/f2c92faf8b12b430494859cb4d8519336041de7b | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/843d256564385f4f520e467c33629dd64834fa00 | sparc64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/6d92a7c79ade920ed1867c6d7eefb7be407d5921 | mipsel | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/607bc384a53035eb0331e56a84be1173e886be96 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/47f3655e937652698fe46c2cdb48c2ba2b085c90 | mips | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/cafa320ec4d2f80d18fadfdba5905d4d71353317 | powerpc | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/4a1d2c6f272405bcc1fe9cd00241dee212c61bc4 | armeb | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/f2d7f4f077933f9c0d0bfe5a3e37ed2447633fd4 | mips | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/d96702761c41d07fd472cd5c547fd08fc922a297 | mipsel | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/c53a81757ac737aa1032824ce9c9cbe78ae02968 | s390x | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/18a924bf03c77af740b16bd760a6785a18a71a27 | i586 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/47441bb8b682d0ae165d505c996c9b049ebdcde2 | sparc64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/4983653dbe15daa1a744a9abd688d23916ed2726 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/3e04f588da055230cbb0552a31029d7ac3f81a80 | i686 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/675ae2d9e96aac3e455628ca9e96e0507020eab0 | microblazeel | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/00c45d36ed3b957e16ac86cb0fdfb5213dabbf50 | powerpc64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/12a63ae177fe3ed0c9a1ef2fa01870f334f36b0f | riscv32 | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/2669c0eec24e00dc1b5916d403f33dfc6933464e | ORPH or1k | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/76bcbd5a779cb80da6b259b3c61e10d68d761f1d | ORPH x86_64 | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/be1770c8e5d731b39ebedecaf3eb00922a2de9b1 | ORPH riscv64 | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/ea61713f5eb6abe08bb209b144fb8317dabda81c | ORPH microblazeel | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/9586f21e447ef9923606b1385ff333138406b685 | ORPH sh4a | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/0b01487d1fa8ccc51d01b3e016cf61e3fd5758f2 | ORPH powerpc64 | host-xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/1cefaabd9dcbeab708fb8393a729d742aadd97aa | ORPH i686 | hyperfine-1.14.0 | NOK | http://autobuild.buildroot.net/results/1de699415cc297c05677bc348208ec0f883e78fd | ORPH powerpc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/38e0a4cadca15ed52868f00af61f91e925c6b7c7 | microblazeel | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/e59369649bde549f408f41529cf565e25d6200bd | powerpc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/a94c1acc82f8bcf3756d8aeb9c59826a5756ee99 | arm | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/5ce5ebd20e0e509b31b51d2ec1aed56fdb8f45aa | riscv32 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/63d6be1feecf2c847e7008c32e8d2a765f63e9f9 | sh4a | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/bb07359b3516235db6d5ce67e8379da84e9f726c | ORPH sh4 | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/eba37e83f302d30ababf0949b8da51ac60058d13 | ORPH x86_64 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/f65044e76e812654bf067bf2c8b28f8240263b9b | sh4aeb | lapack-3.10.1 | NOK | http://autobuild.buildroot.net/results/e0cbb723eb99a5999d6260497ea5ea029d61af33 | mips64el | libabseil-cpp-20220623.1 | NOK | http://autobuild.buildroot.net/results/3ac532aecb1106ede29d5f99c9afd6107504cdb6 | sh4a | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/62aeed8c8c7c9611bf5b409d20455c2ba596aeb3 | sh4 | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/cf225eb28aa9580e35bc86f0b87a4caab435fcef | aarch64 | libconfig-1.7.3 | NOK | http://autobuild.buildroot.net/results/aabf785da6db207343766a777c488c758df41356 | or1k | libfreeimage-3.18.0 | NOK | http://autobuild.buildroot.net/results/a75cb339d92a7482165dd97827f02e1662f083da | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/ffabea099d81543c8a04d0201341b243389d5de5 | aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/7d0574d43a513b01ac256eee150f793ed6bff25c | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/eccb35faa8f9f84d87219ee8add23d16bd3a5692 | ORPH powerpc | libsigsegv-2.14 | NOK | http://autobuild.buildroot.net/results/2e2e8b523d17ec7e89f4bb9115f1c7260d8b7809 | mipsel | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/94009bd18c71b86468e031063c2b195ec2f37031 | microblaze | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/60b92b55a5ac5e2d726f66d97792c5f62527ec47 | xtensa | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/ce9015a905f2860e088c989be76fd878238b5082 | or1k | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/589e3f217ede6cb5c224c1467fbb0c8f3a009df7 | powerpc64 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/1888befd0c4867ccd4249b901c027c925fc5bb49 | powerpc64le | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/2627551872a0afb33ee6d97903e07684cf9d7149 | powerpc64 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/403cf28ce2039ba51c604bad23e18ad1e6ad21e5 | powerpc | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/0528038e9c4fca29cfa0731996d25aa135966d71 | powerpc64 | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/98fba34626ad02ed98f71cd73a7da941e34052bc | ORPH m68k | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/5511e3e0c0029b988f903ef9e0aa03e91f88f79c | ORPH m68k | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/c592c8ddc5ad24c9d9c09dcdf8c7268ce9ccb089 | ORPH microblazeel | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/cf0b78363cf6d3fdf49cf8a30ec3ab649f0b48d6 | ORPH m68k | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/dba18a1b2f3f560a47f89f988d1e5b7c9de2b546 | ORPH arceb | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/668e9b3020a1a253226cbee0ea1f9cd4bc1ee681 | ORPH mipsel | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/2a492d98ed7ebec57f12ab5588478b25dec163ba | ORPH s390x | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/273607113f8a8afd1b1fb695c3552a54c4771691 | ORPH i686 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/56e3aa46772567a035ca09d859d3c2938a1f4189 | arc | lttng-babeltrace-1.5.7 | NOK | http://autobuild.buildroot.net/results/536d10efb3b8913298786b2ddfde26f11a59d51f | aarch64_be | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/29be208f6cacc7920867d0d76574b8d45c0f083e | i686 | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/5dbfa36db747ba0ea876926cdc7de8e0fc5f31c2 | arm | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/98cde5cbb0844c6ef483a75cf9a6f3fd3a46c693 | mips64el | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/fa9e1f49bf69f03ce20f6fa336feb324256f6315 | mips | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/21600e7c4cb5af878fc043b10e0dcd6d7ff5f22a | microblazeel | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/e623d598bdf893993ea3a680a95a3877e7add9aa | arc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/370d32f544f3719e41e19d79899fc96f225d6cac | mips64el | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/9531ce11da24aeaf5c3a8298ef6d2c80ea813802 | or1k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/530adc2f3189befb6e1b5ba9db85a44f8a1a9021 | ORPH s390x | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/77a8e92cd95f8929504ae7897f625adbf9742024 | ORPH nios2 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/ee15cadf8af10dee6c83b9726a034367e8ae81a7 | ORPH xtensa | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/535a9be77ccc7f768f1616188305604d9b25f24a | ORPH or1k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/b15b57cd23888479cd7c2f479dc427b69901a3ee | ORPH i686 | ntpsec-1_2_2 | NOK | http://autobuild.buildroot.net/results/ded9ad5badbcfa6552443d3ce0866722becfefbd | ORPH aarch64_be | nut-2.8.0 | NOK | http://autobuild.buildroot.net/results/0767d9ddaac0f9adeeaf51ab224581db4af82205 | aarch64_be | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/9af794e5edb25c412d42a8391c8dd848cc9904ca | ORPH microblaze | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/e172b3a52a07e952b36a65badfc644e21beb3edd | ORPH armeb | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/25991d47ce351dca226ad7790ce0bb9a2caf374c | ORPH powerpc64 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/d01a159fdac9b440fb8246db3b393a537bf38d52 | ORPH powerpc64 | open-iscsi-2.1.8 | NOK | http://autobuild.buildroot.net/results/708a4865127056edbbd0d9aa36b82a7a5536a295 | mips | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/6093ba0d71d0968364f7889643f601862a19b393 | nios2 | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/427df6254c2cabb6d6f6dd31260ef24ac86d92dc | m68k | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/bfb49061e2fdf7fcb105c1b8a1421d9bb819702a | mips64 | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/a0189b45f2213784649a231eb7998fd4db71bf9a | x86_64 | pcm-tools-202110 | NOK | http://autobuild.buildroot.net/results/4c7fc3436a61d1f0c831d613c92168b801190cdd | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/761f4ef258a3c14cc48a2ed2aaadda15df30ee71 | ORPH microblazeel | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/8f856a13d9d78d3e2a8d339cb52f51bb0124615c | arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/7a89f9a069b2a256f73e9ee53a1cd4f0797d0d9a | sparc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/5826e6679c33c0a84edbd9e4e7dc55a384ec749c | m68k | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/d6feb5bd3acadeb0164141b05ef6c97f9642f680 | arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/2b3d90f3e950fc637310e5c21785d91413eeeba0 | arm | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/577c67286726586352746175e86104ff540bd479 | powerpc64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/c69630c492d8a6aeafd959dace8fc7041100aece | mips64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/cf389d379aef4d28d04178f82f0503b72cc24f79 | mips | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/c7c5a40afeba25f05007759d84ea7850b36af1aa | aarch64_be | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/87b8ec115e8afdf76e45c950d0355b596b60d89a | ORPH aarch64 | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/7e944e85dbeac9c52d70908ce2e45f7fbb73f71b | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/203ad24296055a8afd21898a8e48f6f7fac15d40 | ORPH powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/4a54d6e9626822594c29977d7cf6d2a8acc1f3f5 | mips | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/804670356082aee41b38c1872af5b0323495257d | powerpc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/d2d59f11ac6dc62b2163f291f0c8353b04b341e9 | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/c926e1c1358cf9650230839e115b8ec363ff4b0a | sparc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/b40e3253606dda61de72fab1a0321f5889924cb0 | mips | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/99d250ef86ed66df7f64050dd20165021c08b74c | mips | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/59aa7537ac4e60d98415ccbdc0eec7445d94767b | mips64el | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/cf249a82c83d3c8503205f4c3c5859dd9d52afdf | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/0b67381e3643c134c92cbcd1c5dc258fd760cd7e | m68k | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/d901e81395103b1d784dd3398d64f71809db7586 | mips | s6-linux-utils-2.6.0.0 | NOK | http://autobuild.buildroot.net/results/31b42e8d1765e7512ba190c1d043c459fc11f99d | sh4aeb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/38c0a387b500b395042e6ed3a93f5357b12bc040 | ORPH aarch64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/81b931be9cba5e69cf28e13cb8a0fee7f099a641 | mipsel | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/fcbcffa45ef26e17f11072a48b53f5369ffec420 | mips64el | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/2062df87a28a3214c13179672e7abfeac4191bc1 | ORPH xtensa | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/7ae064051f12059deed6dcb64f5a096608242c32 | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/b76278723569a04a0189d03cc7169ed646216b13 | powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/7de65b7c3731a5f8ea51023506b7227d8080f4f1 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/8914fd4bf23dae086c42dda9aa2140c9958c60eb | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/0a7868c0ebcecb2ea81e7c7355822b42bfdc66ad | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/700c4cd88ab2a3ad5ef75adde1433511d20e3164 | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/0aa80f89474705de174b15c7bd5ca6006c39870d | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/a35bac666a24946f823791121765f8fb4940a665 | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/d3e5ca15a2d61df801e8e2695631f1ad0560167b | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/f4e9722b48fad831d44f30838b65421ea1807dde | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/4443c29facfa10970d333e2b9332efec46c6c6e9 | i586 | v4l2loopback-0.12.7 | NOK | http://autobuild.buildroot.net/results/f12168f8734c95322bdbedaa4dc54b80435cb97e | sparc | wireguard-linux-compat-1.0.... | NOK | http://autobuild.buildroot.net/results/759a968f720280939121141a00ecaf2d349ca658 | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/8d714da87c984c426c5125d6def7db8b08adbfb5 | mips64el | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/6a782b69f7ed8d37a728c850d52454fb565ff48e | x86_64 | wtfutil-0.41.0 | NOK | http://autobuild.buildroot.net/results/bc40c07bfa6776a64a084ab629dd0464b65ca226 | m68k | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/4dc049b1efe2bb7b43927c3240a64bd68f2e7d64 | mips64el | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/ceba9f5f343e43cb96c06b1020f3688df464174a | ORPH sparc | xz-5.2.10 | NOK | http://autobuild.buildroot.net/results/2edc321b6997f8201508700268d502ed309d165f | ORPH powerpc64le | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/303072f15f6fcd64f38833cb3ebda93b0286af69 | mips | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/01e2f4e5a3cc428ae55d8cc3752576639b59dc2c | or1k | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/865837a9dbb6ad33499fb77e9af4a8a2ed6da02a | aarch64_be | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/4e1a75ba8aee66bd6b004056c875f17379d39add | x86_64 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/0375da69ecc7922d7c73b4ade9d1b64a7e305ea2 | m68k | znc-1.8.2 | NOK | http://autobuild.buildroot.net/results/26de9b6fd9d56f754595c0c743aaa471694cd62d | Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 2 frr-8.1 | 1 mongodb-4.2.18 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/5d79860cb6217f401463dc5fbb2634b91a8bf382 | arm | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/e113d9faf7dc13b0571faca4da90a35fda38afa6 | mipsel | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/e75d8ef60bc7a55b7601b928c2eda720e918758c | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/2066a3ac5da2f84576984cf773437f08c80fe575 | Classification of failures by reason for 2022.11.x -------------------------------------------------- gobject-introspection-1.72.0 | 2 janus-gateway-1.0.3 | 2 unknown | 2 dhcp-4.4.3-P1 | 1 host-go-1.19.5 | 1 host-pahole-1.24 | 1 lirc-tools-0.10.2 | 1 live555-2021.05.03 | 1 mutt-2.2.9 | 1 perl-5.34.1 | 1 xxhash-0.8.1 | 1 xz-5.2.7 | 1 zabbix-5.4.9 | 1 zeek-4.1.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4a | dhcp-4.4.3-P1 | NOK | http://autobuild.buildroot.net/results/94dbe4b9285cfe63d60e524f5de53754d5a8fdc2 | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8067785e2f84506206bef68e977bc84d8a8ff718 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7d6e0d65c9435492fb8b204d784afe9cf2124ff2 | ORPH mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/b23516c8f334f6492655a21a34ba33606db57b3c | arceb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/4bdf87664897da259f8196696e74be7967d12e51 | mipsel | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/e195dedcba11c3c577714ff5f1caaa0675a619aa | powerpc64 | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/57e7ba20af262705e1a974422361d97b6fa7750f | mips64el | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/063eba26bd4bfd3ed18974085cc7571cb388b8f2 | ORPH riscv64 | live555-2021.05.03 | NOK | http://autobuild.buildroot.net/results/5c5a1434f1b38dca9d87186faaf10dbce569bfd1 | ORPH sparc64 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/11aaec164eeac132c0da152fed335d1fd86360fb | arc | perl-5.34.1 | NOK | http://autobuild.buildroot.net/results/969ab380b5522025b8f36c6bc60afd9c11c566ce | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/d5fbcc0b014c534c9ce2a3b34fa6830ab1604579 | arc | unknown | NOK | http://autobuild.buildroot.net/results/57e88b808b62b66a2205aa3186c3df2327435dcf | mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/36d675dfd4416a47483308ca15f9242cd6a4ab2f | ORPH microblazeel | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/03c5f0c63a9bf36dcd8d40d4edc8a54b00d07d93 | ORPH nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/ff5916b936f5418c568c2fb6476673db8c9ccffc | m68k | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/6b39e96ae2daf0b0c7f8b62b6be6aeed4402c757 | Gitlab CI results for 2023-02-08 ================================ -- http://autobuild.buildroot.net From peter at korsgaard.com Thu Feb 9 06:54:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 09 Feb 2023 07:54:52 +0100 Subject: [Buildroot] OpenSSL v3.0 In-Reply-To: (Afshin Pir's message of "Wed, 8 Feb 2023 19:44:51 +0000") References: Message-ID: <87mt5nfhvn.fsf@dell.be.48ers.dk> >>>>> "Afshin" == Afshin Pir writes: > Hi > I wonder whether buildroot currently working on OpenSSL v3.0 package > def or not. If not, what are the challenges for building this package? > Because I need to migrate to OpenSSL v3.0 in my buildroot and I like > to know how I can do it. There has been various discussions but currently no concrete patches for openssl 3.0 support. Most likely not all packages will work with openssl 3.0, so we might need to keep the current openssl 1.1 package for a bit and offer openssl 3.0 as a separate package. Openssl 1.1.x indeed goes EOL in September, so it would be great if someone could work on it soon! -- Bye, Peter Korsgaard From ps.report at gmx.net Thu Feb 9 07:19:22 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 9 Feb 2023 08:19:22 +0100 Subject: [Buildroot] [PATCH 1/1] board/raspberrypi4: bump kernel version to 5.15.68 In-Reply-To: <20230208184323.34219f84@gmx.net> References: <20220926051956.3272067-1-buildroot@athaariq.my.id> <20230208144639.764af681@windsurf> <20230208184323.34219f84@gmx.net> Message-ID: <20230209081922.054039f1@gmx.net> On Wed, 8 Feb 2023 18:43:23 +0100, Peter Seiderer wrote: > On Wed, 8 Feb 2023 14:46:39 +0100, Thomas Petazzoni via buildroot wrote: > > > Hello Athaariq, > > > > On Mon, 26 Sep 2022 05:20:15 +0000 (UTC) > > Athaariq Ardhiansyah wrote: > > > > > First of all, kernel support for Raspberry Pi is way too old relative to stable version. Second, we actually have several bug fixes regarding the kernel including HDMI hotplug and more problems on graphic stacks. However, I only have Raspberry Pi 4B so I cannot test the changes for other Raspberry Pi models. For anyone who has those boards, please help us to bump and test the kernel. > > > > > > Signed-off-by: Athaariq Ardhiansyah > > > > Thanks for your patch. It would indeed be nice to update our > > RaspberryPi defconfigs, but there are a number of questions which need > > to be answered before we can apply your patch. > > > > First of all, a small detail: your commit log must be wrapped at ~80 > > columns. Also, it shouldn't use 1st person sentence "I only have". > > > > > diff --git a/board/raspberrypi/linux.fragment b/board/raspberrypi/linux.fragment > > > new file mode 100644 > > > index 0000000000..798b2e91da > > > --- /dev/null > > > +++ b/board/raspberrypi/linux.fragment > > > @@ -0,0 +1,7 @@ > > > +# Dynamic CPU Clock > > > +CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=n > > > +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > > > + > > > +# Fix Kernel Module won't Load > > > +CONFIG_MODULE_COMPRESS_XZ=n > > > +CONFIG_MODULE_COMPRESS_NONE=y > > > > Why is this Linux kernel configuration fragment needed? There is no > > explanation in your commit log. Changing the default CPU governor > > should not be needed, and the second chunk about kernel module > > compression is a bit strange and deserves some explanation. > > > > Upstream defconfigs changed to CONFIG_MODULE_COMPRESS_XZ (see [1] and [2]), > alternative would be to enable the following in the buildroot > raspberry*_defconfigs: > > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > BR2_PACKAGE_XZ > BR2_PACKAGE_KMOD > BR2_PACKAGE_KMOD_TOOLS > BR2_PACKAGE_HOST_KMOD_XZ > > Regards, > Peter ...ups, and the missing links: [1] https://github.com/raspberrypi/linux/commit/c45b4223a4e4a8cfe39edbb4949329ea478fa4e2 [2] https://github.com/raspberrypi/linux/issues/4966 Regards, Peter > > > > > diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig > > > index 5942f7c4e1..6d90a8f004 100644 > > > --- a/configs/raspberrypi4_64_defconfig > > > +++ b/configs/raspberrypi4_64_defconfig > > > @@ -6,13 +6,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > > > > > BR2_SYSTEM_DHCP="eth0" > > > > > > -# Linux headers same as kernel, a 5.10 series > > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > > +# Linux headers same as kernel, a 5.15 series > > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > > > > > BR2_LINUX_KERNEL=y > > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,155b736f0ff883415d374ba743473f5ef146814b)/linux-155b736f0ff883415d374ba743473f5ef146814b.tar.gz" > > > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi4-64/linux.fragment" > > > > > > # Build the DTB from the kernel sources > > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > > @@ -23,6 +24,9 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > > BR2_PACKAGE_RPI_FIRMWARE=y > > > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > > > BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4-64/config_4_64bit.txt" > > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y > > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y > > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y > > > > Why is this being added? > > > > > # Required tools to create the SD image > > > BR2_PACKAGE_HOST_DOSFSTOOLS=y > > > diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig > > > index 4e5580c140..f0947c329c 100644 > > > --- a/configs/raspberrypi4_defconfig > > > +++ b/configs/raspberrypi4_defconfig > > > @@ -6,13 +6,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > > > > > BR2_SYSTEM_DHCP="eth0" > > > > > > -# Linux headers same as kernel, a 5.10 series > > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > > +# Linux headers same as kernel, a 5.15 series > > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > > > > > BR2_LINUX_KERNEL=y > > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,155b736f0ff883415d374ba743473f5ef146814b)/linux-155b736f0ff883415d374ba743473f5ef146814b.tar.gz" > > > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi4/linux.fragment" > > > > > > # Build the DTB from the kernel sources > > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > > @@ -23,6 +24,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > > BR2_PACKAGE_RPI_FIRMWARE=y > > > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > > > BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4/config_4.txt" > > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y > > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y > > > +BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y > > > +BR2_PACKAGE_RPI_USERLAND=y > > > > Why is rpi-userland being added here, and not to the other defconfig above? > > > > Also, you're updating rpi-firmware, rpi-userland and RaspberryPi > > defconfigs in the same commit. Is this because they need to be updated > > in sync? If that's the case, is there a potential problem if we update > > rpi-firmware/rpi-userland, but not the defconfigs for RaspberryPi 1/2/3 ? > > > > Thanks a lot for your feedback! > > > > Thomas > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Thu Feb 9 07:51:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 9 Feb 2023 08:51:04 +0100 Subject: [Buildroot] [PATCH 1/1] board/raspberrypi4: bump kernel version to 5.15.68 In-Reply-To: <20230209081922.054039f1@gmx.net> References: <20220926051956.3272067-1-buildroot@athaariq.my.id> <20230208144639.764af681@windsurf> <20230208184323.34219f84@gmx.net> <20230209081922.054039f1@gmx.net> Message-ID: <20230209085104.3a41b07b@windsurf> On Thu, 9 Feb 2023 08:19:22 +0100 Peter Seiderer wrote: > > Upstream defconfigs changed to CONFIG_MODULE_COMPRESS_XZ (see [1] and [2]), > > alternative would be to enable the following in the buildroot > > raspberry*_defconfigs: > > > > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > > BR2_PACKAGE_XZ > > BR2_PACKAGE_KMOD > > BR2_PACKAGE_KMOD_TOOLS > > BR2_PACKAGE_HOST_KMOD_XZ > > > > Regards, > > Peter > > ...ups, and the missing links: > > [1] https://github.com/raspberrypi/linux/commit/c45b4223a4e4a8cfe39edbb4949329ea478fa4e2 > [2] https://github.com/raspberrypi/linux/issues/4966 Thanks for the extra info! Peter, in the past I believe you have been maintaining those raspberrypi defconfigs. Any chance that you send an update for all raspberrypi defconfigs again? :-) Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 9 07:54:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 9 Feb 2023 08:54:19 +0100 Subject: [Buildroot] [PATCH] arch: move global and rename variable BR2_PACKAGE_Z3_ARCH_SUPPORTS In-Reply-To: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> References: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> Message-ID: <20230209085419.29494fbb@windsurf> On Thu, 9 Feb 2023 01:48:23 +0100 Giulio Benetti wrote: > Package quickjs fails to build on architectures that don't support full > float rounding. To support all kind of float rounding FE_DOWNWARD, > FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD must be defined in fenv.h. > Since package z3 locally implements this check let's make it global, > rename it to be generic and use it for both package quickjs and z3. > > Fixes: > http://autobuild.buildroot.net/results/0b6/0b67381e3643c134c92cbcd1c5dc258fd760cd7e/ > http://autobuild.buildroot.net/results/cf2/cf249a82c83d3c8503205f4c3c5859dd9d52afdf/ > http://autobuild.buildroot.net/results/9b3/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2/ > http://autobuild.buildroot.net/results/4f1/4f13cf7d353260c6b8934dbdcf267bea884b356b/ > > Signed-off-by: Giulio Benetti Apparently https://patchwork.ozlabs.org/project/buildroot/patch/20221216221934.465323-1-ju.o at free.fr/ would also need the same thing. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From hrsourabh011 at gmail.com Thu Feb 9 08:14:09 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 9 Feb 2023 09:14:09 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: Hello Maxim, Thanks for the explanation. When I tried this : utils/scanpypi awscrt awsiotsdk -o package , I am getting below error: utils/scanpypi:21: DeprecationWarning: the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses import imp Traceback (most recent call last): File "utils/scanpypi", line 23, in import six.moves.urllib.request ModuleNotFoundError: No module named 'six' Any idea what this is about? On Thu, 9 Feb 2023 at 06:35, Maxim Kochetkov wrote: > > > On 09.02.2023 00:28, Sourabh Hegde wrote: > > Hello Maxim, > > > > Thanks for the update. > > > > I think for me, the option "18.9.3. Generating a python-package from a > > PyPI repository" > > > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages > < > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages> is > suited. > > I want to install this package https://pypi.org/project/awsiotsdk/ > > . And this package requires > > https://pypi.org/project/awscrt/ as > > dependency. Should I create both Buildroot packages from python packages? > > Sure. > > > In the Buildroot manual, it's mentioned "Find the external python > > modules menu and insert your package inside.", what should I insert > > here? source code? > > The output from scanpypi util. "This will generate packages python-foo > and python-bar in the package folder if they exist on > https://pypi.python.org." > > "external python modules" is located at package/Config.in: > > ... > if BR2_PACKAGE_PYTHON3 > menu "External python modules" > source "package/python-aenum/Config.in" > source "package/python-aexpect/Config.in" > ... > > Try this sequence: > > utils/scanpypi awscrt awsiotsdk -o package > > then add > source "package/python-awscrt/Config.in" > source "package/python-awsiotsdk/Config.in" > to the package/Config.in > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Thu Feb 9 08:58:50 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Thu, 9 Feb 2023 11:58:50 +0300 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: On 09.02.2023 11:14, Sourabh Hegde wrote: > Hello Maxim, > > Thanks for the explanation. > > When I tried this :?utils/scanpypi awscrt awsiotsdk -o package ,? I am > getting below error: > > utils/scanpypi:21: DeprecationWarning: the imp module is deprecated in > favour of importlib; see the module's documentation for alternative uses > ? import imp > Traceback (most recent call last): > ? File "utils/scanpypi", line 23, in > ? ? import six.moves.urllib.request > ModuleNotFoundError: No module named 'six' You have no "six" module installed for python. I have to install it first. For ubuntu: sudo apt install python3-six From hrsourabh011 at gmail.com Thu Feb 9 09:03:09 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 9 Feb 2023 10:03:09 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: Hello Maxim, Update: The above issue resolved by itself! Now when I do: utils/scanpypi awscrt -o package , it says spdx_lookup module is not installed. This can lead to an inaccurate licence detection. Please install it via pip install spdx_lookup buildroot package name for awscrt: python-awscrt Package: python-awscrt Fetching package awscrt ERROR: Could not find package awscrt. Check syntax inside the python package index: https://pypi.python.org/pypi/ But the package is available at https://pypi.org/project/awscrt/ On Thu, 9 Feb 2023 at 09:58, Maxim Kochetkov wrote: > > > On 09.02.2023 11:14, Sourabh Hegde wrote: > > Hello Maxim, > > > > Thanks for the explanation. > > > > When I tried this : utils/scanpypi awscrt awsiotsdk -o package , I am > > getting below error: > > > > utils/scanpypi:21: DeprecationWarning: the imp module is deprecated in > > favour of importlib; see the module's documentation for alternative uses > > import imp > > Traceback (most recent call last): > > File "utils/scanpypi", line 23, in > > import six.moves.urllib.request > > ModuleNotFoundError: No module named 'six' > > You have no "six" module installed for python. I have to install it > first. For ubuntu: sudo apt install python3-six > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Thu Feb 9 09:10:37 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Thu, 9 Feb 2023 12:10:37 +0300 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: On 09.02.2023 12:03, Sourabh Hegde wrote: > Hello Maxim, > > Update: > > The above issue resolved by itself! > > Now when I do:?utils/scanpypi awscrt -o package , it says > > spdx_lookup module is not installed. This can lead to an inaccurate > licence detection. Please install it via > pip install spdx_lookup > buildroot package name for awscrt: python-awscrt > Package: python-awscrt > Fetching package awscrt > ERROR: Could not find package awscrt. > Check syntax inside the python package index: > https://pypi.python.org/pypi/ > > But the package is available?at https://pypi.org/project/awscrt/ > It works fine for me: buildroot package name for awscrt: python-awscrt Package: python-awscrt Fetching package awscrt Downloading package awscrt from https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz... Checking if package package/python-awscrt already exists... Creating package/python-awscrt/python-awscrt.mk... More than one file found for license: LICENSE, crt/aws-c-common/LICENSE, crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, crt/aws-c-cal/LICENSE, crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE Creating package/python-awscrt/python-awscrt.hash... Creating package/python-awscrt/Config.in... NOTE: Remember to also make an update to the DEVELOPERS file and include an entry for the pkg in packages/Config.in From hrsourabh011 at gmail.com Thu Feb 9 09:28:47 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 9 Feb 2023 10:28:47 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: Hi Maxim, I was missing python setuptools on my host. After installing it, I can add the package. Also, the added package is available in menuconfig Thank you for the support! On Thu, 9 Feb 2023 at 10:10, Maxim Kochetkov wrote: > > > On 09.02.2023 12:03, Sourabh Hegde wrote: > > Hello Maxim, > > > > Update: > > > > The above issue resolved by itself! > > > > Now when I do: utils/scanpypi awscrt -o package , it says > > > > spdx_lookup module is not installed. This can lead to an inaccurate > > licence detection. Please install it via > > pip install spdx_lookup > > buildroot package name for awscrt: python-awscrt > > Package: python-awscrt > > Fetching package awscrt > > ERROR: Could not find package awscrt. > > Check syntax inside the python package index: > > https://pypi.python.org/pypi/ > > > > But the package is available at https://pypi.org/project/awscrt/ > > > > It works fine for me: > > buildroot package name for awscrt: python-awscrt > Package: python-awscrt > Fetching package awscrt > Downloading package awscrt from > > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz. > .. > Checking if package package/python-awscrt already exists... > Creating package/python-awscrt/python-awscrt.mk... > More than one file found for license: LICENSE, crt/aws-c-common/LICENSE, > crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, > crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, > crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, > crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, > crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, crt/aws-c-cal/LICENSE, > crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE > Creating package/python-awscrt/python-awscrt.hash... > Creating package/python-awscrt/Config.in... > NOTE: Remember to also make an update to the DEVELOPERS file > and include an entry for the pkg in packages/Config.in > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From hrsourabh011 at gmail.com Thu Feb 9 12:09:37 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 9 Feb 2023 13:09:37 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: Hello Maxim, While doing make with new Buildroot-packages I getting: [ 51%] Building ASM object aws-lc/crypto/CMakeFiles/crypto_objects.dir/hrss/asm/poly_rq_mul.S.o /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S: Assembler messages: /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:304: Error: unknown pseudo-op: `.att_syntax' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:307: Error: unknown mnemonic `push' -- `push %rbp' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:309: Error: bad register expression /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:310: Error: unknown mnemonic `movq' -- `movq %rsp,%rbp' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:311: Error: bad register expression /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:312: Error: unknown mnemonic `push' -- `push %r12' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:313: Error: bad register expression /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:321: Error: operand 1 must be an integer register -- `mov %rcx,%r8' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:322: Error: unknown mnemonic `addq' -- `addq $6144+12288+512+9408+32,%r8' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:323: Error: operand 1 must be an integer register -- `mov %r8,%rax' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:324: Error: unknown mnemonic `subq' -- `subq $6144,%r8' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:325: Error: operand 1 must be an integer register -- `mov %r8,%r11' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:326: Error: unknown mnemonic `subq' -- `subq $12288,%r8' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:327: Error: operand 1 must be an integer register -- `mov %r8,%r12' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:328: Error: unknown mnemonic `subq' -- `subq $512,%r8' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:329: Error: unknown mnemonic `vmovdqa' -- `vmovdqa const3(%rip),%ymm3' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:330: Error: unknown mnemonic `vmovdqu' -- `vmovdqu 0(%rsi),%ymm0' /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:331: Error: unknown mnemonic `vmovdqu' -- `vmovdqu 88(%rsi),%ymm1' . . . Any idea what it is complaining about? Thanks in advance On Thu, 9 Feb 2023 at 10:28, Sourabh Hegde wrote: > Hi Maxim, > > I was missing python setuptools on my host. After installing it, I can add > the package. Also, the added package is available in menuconfig > > Thank you for the support! > > On Thu, 9 Feb 2023 at 10:10, Maxim Kochetkov wrote: > >> >> >> On 09.02.2023 12:03, Sourabh Hegde wrote: >> > Hello Maxim, >> > >> > Update: >> > >> > The above issue resolved by itself! >> > >> > Now when I do: utils/scanpypi awscrt -o package , it says >> > >> > spdx_lookup module is not installed. This can lead to an inaccurate >> > licence detection. Please install it via >> > pip install spdx_lookup >> > buildroot package name for awscrt: python-awscrt >> > Package: python-awscrt >> > Fetching package awscrt >> > ERROR: Could not find package awscrt. >> > Check syntax inside the python package index: >> > https://pypi.python.org/pypi/ >> > >> > But the package is available at https://pypi.org/project/awscrt/ >> > >> >> It works fine for me: >> >> buildroot package name for awscrt: python-awscrt >> Package: python-awscrt >> Fetching package awscrt >> Downloading package awscrt from >> >> https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz. >> .. >> Checking if package package/python-awscrt already exists... >> Creating package/python-awscrt/python-awscrt.mk... >> More than one file found for license: LICENSE, crt/aws-c-common/LICENSE, >> crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, >> crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, >> crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, >> crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, >> crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, crt/aws-c-cal/LICENSE, >> crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE >> Creating package/python-awscrt/python-awscrt.hash... >> Creating package/python-awscrt/Config.in... >> NOTE: Remember to also make an update to the DEVELOPERS file >> and include an entry for the pkg in packages/Config.in >> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: From Shahab.Vahedi at synopsys.com Thu Feb 9 12:23:57 2023 From: Shahab.Vahedi at synopsys.com (Shahab Vahedi) Date: Thu, 9 Feb 2023 12:23:57 +0000 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: revert bpf_cookie patch to allow building In-Reply-To: References: <97ea44bb-58fe-d6cb-6c79-9be0b245f2c6@synopsys.com> <29d2a8c7-44cd-da42-5fed-f17ec0f8ccf2@synopsys.com> Message-ID: Hi Arnout, On 2/8/23 17:36, Arnout Vandecappelle wrote: > > It's not clear to me why you did a revert of the cookie feature rather than > using those patches. I think the first two or three should be sufficient to > fix your issue? Ideally, the correct way would be applying that pending series. But since there were comments that some of the patches might need reworking [1], I did not feel confident to add them. Therefore, I tried to keep my solution minimal and solve it by eliminating the problem. I know, it is not appealing. > For the time being, I marked this as Changes Requested. If the upstream > patches are not sufficient, please send a mail upstream (as a reply to that > series) explaining the problem (again), and re-send this patch to > Buildroot. If it does fix things, please send a mail upstream to ask to > move the series forward (explaining the issue you have), and send a patch > to Buildroot that adds the needed patches. They (re)confirmed the issue to me in the past [2] and are aware that its solution is missing from all the releases onward (see the first point of "Known bugs" in the release page [3]). [1] https://lore.kernel.org/bpf/20220421003152.339542-3-alobakin at pm.me/T/#rb9ce86e9f25b2d097b88d87af8ffdfa401d63c68 [2] https://lore.kernel.org/bpf/b1a604e1-be09-ac0b-ff22-b194ae9ce886 at isovalent.com/ [3] https://github.com/libbpf/bpftool/releases -- Shahab From bugzilla at busybox.net Thu Feb 9 13:20:03 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 09 Feb 2023 13:20:03 +0000 Subject: [Buildroot] [Bug 15321] New: docker-engine now requires libseccomp by default Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15321 Bug ID: 15321 Summary: docker-engine now requires libseccomp by default Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: dominique.tronche at atos.net CC: buildroot at uclibc.org Target Milestone: --- While trying to build our project which uses docker-engine on the master branch of buildroot which has integrated the major release 23.0.0, the following error message is diplayed when starting the docker containers: Error response from daemon: failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: seccomp: config provided but seccomp not supported: unknown Error: failed to start containers >From docker release note (https://docs.docker.com/engine/release-notes/23.0/) in section security, it seems docker is now always built with seccomp support I think the libseccomp package is therefore now necessary and a select on that package should be added in a Config.in file. It seems to be runc which is linked to the library -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Thu Feb 9 14:45:44 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 15:45:44 +0100 Subject: [Buildroot] [PATCH] arch: move global and rename variable BR2_PACKAGE_Z3_ARCH_SUPPORTS In-Reply-To: <20230209085419.29494fbb@windsurf> References: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> <20230209085419.29494fbb@windsurf> Message-ID: <548774bf-1542-e749-4c0b-200041d0a6b3@benettiengineering.com> On 09/02/23 08:54, Thomas Petazzoni via buildroot wrote: > Subject: > Re: [Buildroot] [PATCH] arch: move global and rename variable > BR2_PACKAGE_Z3_ARCH_SUPPORTS > From: > Thomas Petazzoni via buildroot > Date: > 09/02/23, 08:54 > > To: > Giulio Benetti > CC: > Julien Olivain , buildroot at buildroot.org > > > On Thu, 9 Feb 2023 01:48:23 +0100 > Giulio Benetti wrote: > >> Package quickjs fails to build on architectures that don't support full >> float rounding. To support all kind of float rounding FE_DOWNWARD, >> FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD must be defined in fenv.h. >> Since package z3 locally implements this check let's make it global, >> rename it to be generic and use it for both package quickjs and z3. >> >> Fixes: >> http://autobuild.buildroot.net/results/0b6/0b67381e3643c134c92cbcd1c5dc258fd760cd7e/ >> http://autobuild.buildroot.net/results/cf2/cf249a82c83d3c8503205f4c3c5859dd9d52afdf/ >> http://autobuild.buildroot.net/results/9b3/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2/ >> http://autobuild.buildroot.net/results/4f1/4f13cf7d353260c6b8934dbdcf267bea884b356b/ >> >> Signed-off-by: Giulio Benetti > Apparently > https://patchwork.ozlabs.org/project/buildroot/patch/20221216221934.465323-1-ju.o at free.fr/ > would also need the same thing. Yes, it requires it too once it is applied. I can modify my patch if you apply the swipl one before. No problem. Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 9 17:05:15 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 18:05:15 +0100 Subject: [Buildroot] [PATCH 1/2] package/libgtk3: fix build failure on libinput due to the presence of atk-bridge-2.0 in gtk+-3.0.pc In-Reply-To: References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> <20230208230721.3269610-2-giulio.benetti@benettiengineering.com> Message-ID: <56b9f619-6c20-7d96-9544-c91488a7c974@benettiengineering.com> Hi Fran?ois, On 09/02/23 05:13, Fran?ois Perrad wrote: > > > Le?jeu. 9 f?vr. 2023 ??00:07, Giulio Benetti > > a ?crit?: > > Patch 0001-disable-atk-bridge.patch misses to remove: > atk_pkgs += ['atk-bridge-2.0'] > that is not affected by any meson variable, this results in having > libgtk3 > to have atk-bridge-2.0 in its gtk+-3.0.pc and so other libraries(i.e. > libinput) tries to {pkgconf}find it failing. So let's convert the > patch to > git format and add the removal of such line. > > Fixes: > still not found > > > this patch (disable-atk-bridge) will be removed soon, see > https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 > > (package/atk: remove package) thanks for pointing, I've tested with that patch and yes that patch and the modify I've proposed is not needed. Let's see what is committed first. Best regards -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Giulio Benetti > > --- > ?...h => 0001-Remove-atk-bridge-support.patch} | 31 +++++++++++++++++-- > ?1 file changed, 28 insertions(+), 3 deletions(-) > ?rename package/libgtk3/{0001-disable-atk-bridge.patch => > 0001-Remove-atk-bridge-support.patch} (59%) > > diff --git a/package/libgtk3/0001-disable-atk-bridge.patch > b/package/libgtk3/0001-Remove-atk-bridge-support.patch > similarity index 59% > rename from package/libgtk3/0001-disable-atk-bridge.patch > rename to package/libgtk3/0001-Remove-atk-bridge-support.patch > index f3e9bff2ba..b52c9be650 100644 > --- a/package/libgtk3/0001-disable-atk-bridge.patch > +++ b/package/libgtk3/0001-Remove-atk-bridge-support.patch > @@ -1,16 +1,27 @@ > -Remove atk-bridge support. > +From 923ba2a1653b942093e9d25f8f4d2e7c09a66328 Mon Sep 17 00:00:00 2001 > +From: Giulio Benetti > > +Date: Wed, 8 Feb 2023 23:50:56 +0100 > +Subject: [PATCH] Remove atk-bridge support. > > ?atk-bridge doesn't seem useful for now in Buildroot and requires to > ?add two new packages just for it: at-spi2-core and at-spi2-atk. > > ?Signed-off-by: Hadrien Boutteville > > +[Giulio: remove 'atk-bridge-2.0' too] > +Signed-off-by: Giulio Benetti > > > +--- > + gtk/a11y/gtkaccessibility.c | 8 -------- > + meson.build? ? ? ? ? ? ? ? ?| 4 +--- > + 2 files changed, 1 insertion(+), 11 deletions(-) > > +diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c > +index 7f0e5207d9..14da1e80e2 100644 > ?--- a/gtk/a11y/gtkaccessibility.c > ?+++ b/gtk/a11y/gtkaccessibility.c > ?@@ -37,10 +37,6 @@ > ? #include > ? #include > - > + > ?-#ifdef GDK_WINDOWING_X11 > ?-#include > ?-#endif > @@ -21,13 +32,15 @@ Signed-off-by: Hadrien Boutteville > > > ?@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) > ? ? _gtk_accessibility_override_atk_util (); > ? ? do_window_event_initialization (); > - > + > ?-#ifdef GDK_WINDOWING_X11 > ?-? atk_bridge_adaptor_init (NULL, NULL); > ?-#endif > ?- > ? ? atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); > ? } > +diff --git a/meson.build b/meson.build > +index aed48fc3f6..370bf1cce1 100644 > ?--- a/meson.build > ?+++ b/meson.build > ?@@ -564,7 +564,7 @@ if x11_enabled > @@ -39,3 +52,15 @@ Signed-off-by: Hadrien Boutteville > > > > ? ? backend_immodules += ['xim'] > > +@@ -583,8 +583,6 @@ if x11_enabled > +? ? ?x11_pkgs += ['xdamage'] > +? ?endif > + > +-? atk_pkgs += ['atk-bridge-2.0'] > +- > +? ?cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false) > +? ?cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false) > +? ?cdata.set('HAVE_XCOMPOSITE', xcomposite_dep.found() ? 1 : false) > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > > From peter at korsgaard.com Thu Feb 9 17:07:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 9 Feb 2023 18:07:05 +0100 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: Build with ninja Message-ID: <20230209170707.4066903-1-peter@korsgaard.com> Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b42ac3b644..a6974db926 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -139,4 +139,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# webkitgtk needs cmake >= 3.20 when not building with ninja, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WEBKITGTK_CONF_OPTS += -GNinja +WEBKITGTK_DEPENDENCIES += host-ninja + +define WEBKITGTK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + $(eval $(cmake-package)) -- 2.30.2 From peter at korsgaard.com Thu Feb 9 17:07:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 9 Feb 2023 18:07:06 +0100 Subject: [Buildroot] [PATCH 2/2] package/wpewebkit: Build with ninja In-Reply-To: <20230209170707.4066903-1-peter@korsgaard.com> References: <20230209170707.4066903-1-peter@korsgaard.com> Message-ID: <20230209170707.4066903-2-peter@korsgaard.com> Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 54f37fd702..b9c2fef395 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -103,4 +103,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# wpewebkit needs cmake >= 3.20 when building with the make backend, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WPEWEBKIT_CONF_OPTS += -GNinja +WPEWEBKIT_DEPENDENCIES += host-ninja + +define WPEWEBKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + $(eval $(cmake-package)) -- 2.30.2 From bmeng.cn at gmail.com Thu Feb 9 17:20:02 2023 From: bmeng.cn at gmail.com (Bin Meng) Date: Fri, 10 Feb 2023 01:20:02 +0800 Subject: [Buildroot] [PATCH] board/intel: galileo: Enable Linux kernel root file system on NFS Message-ID: <20230209172002.1442869-1-bmeng.cn@gmail.com> From: Bin Meng Update linux-3.14.config for Galileo to enable Linux kernel root file system on NFS. Signed-off-by: Bin Meng --- board/intel/galileo/linux-3.14.config | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/board/intel/galileo/linux-3.14.config b/board/intel/galileo/linux-3.14.config index e7aa9cf232..c658afb88e 100644 --- a/board/intel/galileo/linux-3.14.config +++ b/board/intel/galileo/linux-3.14.config @@ -154,9 +154,9 @@ CONFIG_TUN=y # CONFIG_NET_VENDOR_SILAN is not set # CONFIG_NET_VENDOR_SIS is not set # CONFIG_NET_VENDOR_SMSC is not set -CONFIG_STMMAC_ETH=m +CONFIG_STMMAC_ETH=y # CONFIG_STMMAC_PLATFORM is not set -CONFIG_STMMAC_PCI=m +CONFIG_STMMAC_PCI=y # CONFIG_NET_VENDOR_SUN is not set # CONFIG_NET_VENDOR_TEHUTI is not set # CONFIG_NET_VENDOR_TI is not set @@ -306,3 +306,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y # CONFIG_VIRTUALIZATION is not set CONFIG_CRC_T10DIF=y +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y +CONFIG_IP_PNP=y -- 2.25.1 From james.hilliard1 at gmail.com Thu Feb 9 18:52:03 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 9 Feb 2023 11:52:03 -0700 Subject: [Buildroot] [PATCH 1/1] package/pipewire-media-session: bump to version 0.4.2 Message-ID: <20230209185203.262016-1-james.hilliard1@gmail.com> Explicitly set installed_tests to disabled. Drop patch which is now upstream. Signed-off-by: James Hilliard --- ...remove-session-managers-option-check.patch | 36 ------------------- .../pipewire-media-session.hash | 2 +- .../pipewire-media-session.mk | 7 ++-- 3 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch diff --git a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch b/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch deleted file mode 100644 index fc1d25edb3..0000000000 --- a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1923c97fbd0b3d8cacdb72386886f860c818bccf Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Wed, 10 Nov 2021 08:54:06 -0700 -Subject: [PATCH] meson: remove session-managers option check. - -This option no longer exists and causes a build failure if building -with the systemd system service enabled. - -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/pipewire/media-session/-/merge_requests/24] ---- - systemd/system/meson.build | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/systemd/system/meson.build b/systemd/system/meson.build -index ab0d49064..0e9885b0f 100644 ---- a/systemd/system/meson.build -+++ b/systemd/system/meson.build -@@ -4,9 +4,7 @@ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunit - systemd_config = configuration_data() - systemd_config.set('PW_MEDIA_SESSION_BINARY', media_session_bindir / 'pipewire-media-session') - --if get_option('session-managers').contains('media-session') -- configure_file(input : 'pipewire-media-session.service.in', -- output : 'pipewire-media-session.service', -- configuration : systemd_config, -- install_dir : systemd_system_services_dir) --endif -+configure_file(input : 'pipewire-media-session.service.in', -+ output : 'pipewire-media-session.service', -+ configuration : systemd_config, -+ install_dir : systemd_system_services_dir) --- -2.25.1 - diff --git a/package/pipewire-media-session/pipewire-media-session.hash b/package/pipewire-media-session/pipewire-media-session.hash index e335fd8913..e6b176eea2 100644 --- a/package/pipewire-media-session/pipewire-media-session.hash +++ b/package/pipewire-media-session/pipewire-media-session.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ebdf9f8e389896fdc4b58da5f909afce18441b4b53d5b4f2104dd53586ea8681 media-session-0.4.1.tar.bz2 +sha256 26e21852e0834a4418b40eae342ac5178dfe40342b9c5afe204d43ef8aafa14e media-session-0.4.2.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 77b9c867237ef919e33c0fdbcf22ab84b1cf24a63f9431ec68759026b658c994 LICENSE diff --git a/package/pipewire-media-session/pipewire-media-session.mk b/package/pipewire-media-session/pipewire-media-session.mk index d349fd7454..cc7317f925 100644 --- a/package/pipewire-media-session/pipewire-media-session.mk +++ b/package/pipewire-media-session/pipewire-media-session.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.1 +PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.2 PIPEWIRE_MEDIA_SESSION_SOURCE = media-session-$(PIPEWIRE_MEDIA_SESSION_VERSION).tar.bz2 PIPEWIRE_MEDIA_SESSION_SITE = https://gitlab.freedesktop.org/pipewire/media-session/-/archive/$(PIPEWIRE_MEDIA_SESSION_VERSION) PIPEWIRE_MEDIA_SESSION_LICENSE = MIT @@ -17,7 +17,10 @@ PIPEWIRE_MEDIA_SESSION_DEPENDENCIES = \ pipewire \ $(TARGET_NLS_DEPENDENCIES) -PIPEWIRE_MEDIA_SESSION_CONF_OPTS = -Ddocs=disabled -Dtests=disabled +PIPEWIRE_MEDIA_SESSION_CONF_OPTS = \ + -Ddocs=disabled \ + -Dtests=disabled \ + -Dinstalled_tests=disabled PIPEWIRE_MEDIA_SESSION_MODULE_SETS_LIST = alsa -- 2.34.1 From ju.o at free.fr Thu Feb 9 19:36:07 2023 From: ju.o at free.fr (Julien Olivain) Date: Thu, 09 Feb 2023 20:36:07 +0100 Subject: [Buildroot] [PATCH] arch: move global and rename variable BR2_PACKAGE_Z3_ARCH_SUPPORTS In-Reply-To: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> References: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> Message-ID: <4acd3e35f6bce28f5f2e6cca8e57789c@free.fr> Hi Giulio, On 09/02/2023 01:48, Giulio Benetti wrote: > Package quickjs fails to build on architectures that don't support full > float rounding. To support all kind of float rounding FE_DOWNWARD, > FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD must be defined in fenv.h. > Since package z3 locally implements this check let's make it global, > rename it to be generic and use it for both package quickjs and z3. > > Fixes: > http://autobuild.buildroot.net/results/0b6/0b67381e3643c134c92cbcd1c5dc258fd760cd7e/ > http://autobuild.buildroot.net/results/cf2/cf249a82c83d3c8503205f4c3c5859dd9d52afdf/ > http://autobuild.buildroot.net/results/9b3/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2/ > http://autobuild.buildroot.net/results/4f1/4f13cf7d353260c6b8934dbdcf267bea884b356b/ > > Signed-off-by: Giulio Benetti To comment a bit on that, the complete condition is a bit more tricky: - the CPU arch FPU HW must have all 4 rounding modes, - the libc must expose a fenv.h header, - the libc must also expose all 4 rouding modes. glibc generally exposes all the HW supported rounding modes. I initially excluded uclibc-ng, because in its Buildroot default configuration, fenv.h is not enabled [1]. I believe it's possible to have some uclibc-ng configuration that are enable and exposing those rounding modes. See [2]. So this proposal is correct but possibly discard the case in which libc is uclibc-ng and its (custom) configuration exposes all FE rounding modes. I am not sure if it's really an issue, as packages with such requirements are mostly tested with glibc anyway... Best regards, Julien. [1] https://git.busybox.net/buildroot/tree/package/uclibc/uClibc-ng.config [2] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/extra/Configs/Config.in.arch?h=v1.0.42#n180 From james.hilliard1 at gmail.com Thu Feb 9 20:12:37 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 9 Feb 2023 13:12:37 -0700 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: On Thu, Feb 9, 2023 at 5:10 AM Sourabh Hegde wrote: > > Hello Maxim, > > While doing make with new Buildroot-packages I getting: > > [ 51%] Building ASM object aws-lc/crypto/CMakeFiles/crypto_objects.dir/hrss/asm/poly_rq_mul.S.o > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S: Assembler messages: > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:304: Error: unknown pseudo-op: `.att_syntax' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:307: Error: unknown mnemonic `push' -- `push %rbp' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:309: Error: bad register expression > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:310: Error: unknown mnemonic `movq' -- `movq %rsp,%rbp' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:311: Error: bad register expression > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:312: Error: unknown mnemonic `push' -- `push %r12' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:313: Error: bad register expression > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:321: Error: operand 1 must be an integer register -- `mov %rcx,%r8' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:322: Error: unknown mnemonic `addq' -- `addq $6144+12288+512+9408+32,%r8' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:323: Error: operand 1 must be an integer register -- `mov %r8,%rax' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:324: Error: unknown mnemonic `subq' -- `subq $6144,%r8' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:325: Error: operand 1 must be an integer register -- `mov %r8,%r11' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:326: Error: unknown mnemonic `subq' -- `subq $12288,%r8' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:327: Error: operand 1 must be an integer register -- `mov %r8,%r12' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:328: Error: unknown mnemonic `subq' -- `subq $512,%r8' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:329: Error: unknown mnemonic `vmovdqa' -- `vmovdqa const3(%rip),%ymm3' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:330: Error: unknown mnemonic `vmovdqu' -- `vmovdqu 0(%rsi),%ymm0' > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:331: Error: unknown mnemonic `vmovdqu' -- `vmovdqu 88(%rsi),%ymm1' > . > . > . > Any idea what it is complaining about? The problem here is that while the python awscrt package uses setuptools it's not a normal python setuptools package, the setup.py installs both a normal setuptools package and a vendored cmake package(meta package really). See cmake build wrapper functionality here in the setuptools setup.py file: https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py#L156-L272 This is the cmake meta project root which is vendored inside of awscrt: https://github.com/awslabs/aws-crt-python/tree/v0.16.10/crt See meta cmakelists build: https://github.com/awslabs/aws-crt-python/blob/v0.16.10/crt/CMakeLists.txt This meta project is made up of multiple subprojects: aws-c-auth aws-c-cal aws-c-common aws-c-compression aws-c-event-stream aws-checksums aws-c-http aws-c-io aws-c-mqtt aws-c-s3 aws-c-sdkutils aws-lc s2n In buildroot we expect cmake packages to use our cmake infrastructure as it will set up the cross compilation environment correctly while the awscrt setuptools cmake wrapper does not. I confirmed that the cmake packages build correctly when using our cmake infrastructure: ################################################################################ # # python-awscrt # ################################################################################ PYTHON_AWSCRT_VERSION = 0.16.10 PYTHON_AWSCRT_SOURCE = awscrt-$(PYTHON_AWSCRT_VERSION).tar.gz PYTHON_AWSCRT_SITE = https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2 PYTHON_AWSCRT_SUBDIR = crt $(eval $(cmake-package)) See: https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_cmake_based_packages So what I think you need to do is create buildroot cmake packages for all these subprojects using buildroot's cmake infrastructure: https://github.com/awslabs/aws-c-auth https://github.com/awslabs/aws-c-cal https://github.com/awslabs/aws-c-common https://github.com/awslabs/aws-c-compression https://github.com/awslabs/aws-c-event-stream https://github.com/awslabs/aws-checksums https://github.com/awslabs/aws-c-http https://github.com/awslabs/aws-c-io https://github.com/awslabs/aws-c-mqtt https://github.com/awslabs/aws-c-s3 https://github.com/awslabs/aws-c-sdkutils https://github.com/awslabs/aws-lc https://github.com/aws/s2n-tls You will then probably need to modify the setup.py file (https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py) so that instead of using the cmake build functions have it use the system versions of these libraries pre-installed via the buildroot cmake infrastructure. You can probably use and check for an env variable such as this in the setup.py: PYTHON_AWSCRT_USE_SYSTEM_CRT=1 When present have it disable building the cmake libraries itself and search for the installed system crt libraries instead of using the vendored cmake build. You should upstream this setup.py functionality to the aws-crt-project as well so that we don't need to carry a patch in buildroot for python-awscrt to use the system crt libraries. Then from the python-awscrt buildroot package you would set that env variable and add all the cmake subprojects as buildroot package dependencies. First thing you should start with is adding the cmake buildroot packages for the crt subprojects to buildroot then work on modifying aws-crt-python to work correctly with them instead of trying to use its broken cmake setuptools wrapper. > > Thanks in advance > > On Thu, 9 Feb 2023 at 10:28, Sourabh Hegde wrote: >> >> Hi Maxim, >> >> I was missing python setuptools on my host. After installing it, I can add the package. Also, the added package is available in menuconfig >> >> Thank you for the support! >> >> On Thu, 9 Feb 2023 at 10:10, Maxim Kochetkov wrote: >>> >>> >>> >>> On 09.02.2023 12:03, Sourabh Hegde wrote: >>> > Hello Maxim, >>> > >>> > Update: >>> > >>> > The above issue resolved by itself! >>> > >>> > Now when I do: utils/scanpypi awscrt -o package , it says >>> > >>> > spdx_lookup module is not installed. This can lead to an inaccurate >>> > licence detection. Please install it via >>> > pip install spdx_lookup >>> > buildroot package name for awscrt: python-awscrt >>> > Package: python-awscrt >>> > Fetching package awscrt >>> > ERROR: Could not find package awscrt. >>> > Check syntax inside the python package index: >>> > https://pypi.python.org/pypi/ >>> > >>> > But the package is available at https://pypi.org/project/awscrt/ >>> > >>> >>> It works fine for me: >>> >>> buildroot package name for awscrt: python-awscrt >>> Package: python-awscrt >>> Fetching package awscrt >>> Downloading package awscrt from >>> https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz... >>> Checking if package package/python-awscrt already exists... >>> Creating package/python-awscrt/python-awscrt.mk... >>> More than one file found for license: LICENSE, crt/aws-c-common/LICENSE, >>> crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, >>> crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, >>> crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, >>> crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, >>> crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, crt/aws-c-cal/LICENSE, >>> crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE >>> Creating package/python-awscrt/python-awscrt.hash... >>> Creating package/python-awscrt/Config.in... >>> NOTE: Remember to also make an update to the DEVELOPERS file >>> and include an entry for the pkg in packages/Config.in >>> > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Feb 9 20:19:40 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:19:40 +0100 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: References: <20220607231211.533086-1-james.hilliard1@gmail.com> <20230208161527.31a28b3b@windsurf> Message-ID: On 08/02/2023 17:46, James Hilliard wrote: > On Wed, Feb 8, 2023 at 8:15 AM Thomas Petazzoni > wrote: >> >> On Tue, 7 Jun 2022 17:12:11 -0600 >> James Hilliard wrote: >> >>> In some cases it only makes sense to run tests against a specific >>> branch, such as when testing new genrandconfig flags. >>> >>> Add a config option to override the branch selection. >>> >>> Signed-off-by: James Hilliard >>> --- >>> scripts/autobuild-run | 11 ++++++++++- >>> 1 file changed, 10 insertions(+), 1 deletion(-) >> >> We looked at this with Arnout, and we don't really see what this would >> be needed, and actually it could be annoying to have people test >> "random" branches. If you need extensions to genrandconfig, then the >> autobuild-run script should be backward compatible with older versions >> of genrandconfig to be able to support older branches for a certain >> while. > > There are a number of other reasons this is useful, for example some > build hosts(for example my asahi-linux build host) have compatibility > issues in older branches so it doesn't make sense to run autobuilders If there are compatibility issues, the fixes should be backported to the stable branches... Regards, Arnout > on anything other than say master. > > To prevent testing of unwanted branches I could modify this to restrict > the branch override to only allow selecting the branches listed in: > http://autobuild.buildroot.org/branches > >> >> Thanks! >> >> Thomas >> -- >> Thomas Petazzoni, CTO, Bootlin >> Embedded Linux and Kernel engineering >> https://bootlin.com From arnout at mind.be Thu Feb 9 20:22:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:22:31 +0100 Subject: [Buildroot] [PATCH v2] package/chrony: add default unprivileged user option In-Reply-To: <20230208182731.15752-1-james.kent@orchestrated-technology.com> References: <20230208182731.15752-1-james.kent@orchestrated-technology.com> Message-ID: <8fe20693-4bf1-4378-d7c4-d81bcd9cf7ed@mind.be> Hi James, On 08/02/2023 19:27, James Kent wrote: > Configurable option to define and enable by default an unprivileged > user which the Chrony daemon will assume once initialised. The > functionality requires libcap which is selected as necessary. > > This option supports the good security practice of dropping elevated > privileges for daemon runtime. > > The package configuration layout has been updated to current working > practice. > > Signed-off-by: James Kent > --- > package/chrony/Config.in | 12 +++++++++++- > package/chrony/chrony.mk | 8 ++++++++ > 2 files changed, 19 insertions(+), 1 deletion(-) > > diff --git a/package/chrony/Config.in b/package/chrony/Config.in > index 158dc20530..0ba14c6aef 100644 > --- a/package/chrony/Config.in > +++ b/package/chrony/Config.in > @@ -7,10 +7,20 @@ config BR2_PACKAGE_CHRONY > > http://chrony.tuxfamily.org/ > > +if BR2_PACKAGE_CHRONY > + > config BR2_PACKAGE_CHRONY_DEBUG_LOGGING > bool "enable debug logging support" > - depends on BR2_PACKAGE_CHRONY > help > Enable support for debug logging output from Chrony when > enabled at runtime. If disabled, code for debug logging will > not be compiled in. > + > +config BR2_PACKAGE_CHRONY_USER > + bool "chrony default unprivileged user" Is there any reason to do this conditionally? For all other packages, we do it unconditionally. Regards, Arnout > + select BR2_PACKAGE_LIBCAP > + help > + Define and enable default unprivileged user for the Chrony > + daemon to run as. > + > +endif > diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk > index 379e95a778..16f8f082a3 100644 > --- a/package/chrony/chrony.mk > +++ b/package/chrony/chrony.mk > @@ -21,6 +21,14 @@ CHRONY_CONF_OPTS = \ > > ifeq ($(BR2_PACKAGE_LIBCAP),y) > CHRONY_DEPENDENCIES += libcap > + > +ifeq ($(BR2_PACKAGE_CHRONY_USER),y) > +CHRONY_CONF_OPTS += --with-user=chrony > +define CHRONY_USERS > + chrony -1 chrony -1 * /run/chrony - - Time daemon > +endef > +endif > + > else > CHRONY_CONF_OPTS += --without-libcap > endif From arnout at mind.be Thu Feb 9 20:27:11 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:27:11 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: revert bpf_cookie patch to allow building In-Reply-To: References: <97ea44bb-58fe-d6cb-6c79-9be0b245f2c6@synopsys.com> <29d2a8c7-44cd-da42-5fed-f17ec0f8ccf2@synopsys.com> Message-ID: <1750a14f-36a1-fe51-1452-3a72b84979c5@mind.be> On 09/02/2023 13:23, Shahab Vahedi wrote: > Hi Arnout, > > On 2/8/23 17:36, Arnout Vandecappelle wrote: >> >> It's not clear to me why you did a revert of the cookie feature rather than >> using those patches. I think the first two or three should be sufficient to >> fix your issue? > > Ideally, the correct way would be applying that pending series. But since > there were comments that some of the patches might need reworking [1], I did I don't see anything in that thread about rework being needed, only some complaints about some mail gateway encrypting messages so they can't be read by some recipients... > not feel confident to add them. Therefore, I tried to keep my solution minimal > and solve it by eliminating the problem. I know, it is not appealing. The problem with your patch is that it is very difficult to decide if it should be kept or not when bumping the version. Plus, some people (or other packages) may rely on the feature that you remove. Regards, Arnout > >> For the time being, I marked this as Changes Requested. If the upstream >> patches are not sufficient, please send a mail upstream (as a reply to that >> series) explaining the problem (again), and re-send this patch to >> Buildroot. If it does fix things, please send a mail upstream to ask to >> move the series forward (explaining the issue you have), and send a patch >> to Buildroot that adds the needed patches. > > They (re)confirmed the issue to me in the past [2] and are aware that its > solution is missing from all the releases onward (see the first point of > "Known bugs" in the release page [3]). > > [1] > https://lore.kernel.org/bpf/20220421003152.339542-3-alobakin at pm.me/T/#rb9ce86e9f25b2d097b88d87af8ffdfa401d63c68 > > [2] > https://lore.kernel.org/bpf/b1a604e1-be09-ac0b-ff22-b194ae9ce886 at isovalent.com/ > > [3] > https://github.com/libbpf/bpftool/releases > > -- > Shahab > > From arnout at mind.be Thu Feb 9 20:30:39 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:30:39 +0100 Subject: [Buildroot] [PATCH 1/1] lksctp-tools: bump to version 1.0.19 In-Reply-To: <20230208094543.474237-1-fido_max@inbox.ru> References: <20230208094543.474237-1-fido_max@inbox.ru> Message-ID: <6a74619e-1750-d295-c6bc-ca93a5b47473@mind.be> On 08/02/2023 10:45, Maxim Kochetkov via buildroot wrote: > Release notes: https://github.com/sctp/lksctp-tools/blob/v1.0.19/ChangeLog > > Signed-off-by: Maxim Kochetkov Applied to master, thanks. Thank for testing, Maksim. Regards, Arnout > --- > package/lksctp-tools/lksctp-tools.hash | 4 ++-- > package/lksctp-tools/lksctp-tools.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/lksctp-tools/lksctp-tools.hash b/package/lksctp-tools/lksctp-tools.hash > index fb892fdc3b..b3a1f59d86 100644 > --- a/package/lksctp-tools/lksctp-tools.hash > +++ b/package/lksctp-tools/lksctp-tools.hash > @@ -1,6 +1,6 @@ > # From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ > -md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz > -sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz > +md5 0fbb288c9f9625b88d3ab21c9ed9f011 lksctp-tools-1.0.19.tar.gz > +sha1 d410a596485c38464177a38ae7c7081444e6589e lksctp-tools-1.0.19.tar.gz > # Locally computed > sha256 dee5f35e583183abb9212938643ecb2d858fd89e2e286f4b1d903f65d49d6c76 COPYING.lib > sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING > diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk > index 5ac794e842..af86a28516 100644 > --- a/package/lksctp-tools/lksctp-tools.mk > +++ b/package/lksctp-tools/lksctp-tools.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LKSCTP_TOOLS_VERSION = 1.0.17 > -LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools > +LKSCTP_TOOLS_VERSION = 1.0.19 > +LKSCTP_TOOLS_SITE = $(call github,sctp,lksctp-tools,v$(LKSCTP_TOOLS_VERSION)) > LKSCTP_TOOLS_INSTALL_STAGING = YES > # configure not shipped > LKSCTP_TOOLS_AUTORECONF = YES From james.hilliard1 at gmail.com Thu Feb 9 20:32:05 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 9 Feb 2023 13:32:05 -0700 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: References: <20220607231211.533086-1-james.hilliard1@gmail.com> <20230208161527.31a28b3b@windsurf> Message-ID: On Thu, Feb 9, 2023 at 1:19 PM Arnout Vandecappelle wrote: > > > > On 08/02/2023 17:46, James Hilliard wrote: > > On Wed, Feb 8, 2023 at 8:15 AM Thomas Petazzoni > > wrote: > >> > >> On Tue, 7 Jun 2022 17:12:11 -0600 > >> James Hilliard wrote: > >> > >>> In some cases it only makes sense to run tests against a specific > >>> branch, such as when testing new genrandconfig flags. > >>> > >>> Add a config option to override the branch selection. > >>> > >>> Signed-off-by: James Hilliard > >>> --- > >>> scripts/autobuild-run | 11 ++++++++++- > >>> 1 file changed, 10 insertions(+), 1 deletion(-) > >> > >> We looked at this with Arnout, and we don't really see what this would > >> be needed, and actually it could be annoying to have people test > >> "random" branches. If you need extensions to genrandconfig, then the > >> autobuild-run script should be backward compatible with older versions > >> of genrandconfig to be able to support older branches for a certain > >> while. > > > > There are a number of other reasons this is useful, for example some > > build hosts(for example my asahi-linux build host) have compatibility > > issues in older branches so it doesn't make sense to run autobuilders > > If there are compatibility issues, the fixes should be backported to the > stable branches... Some of the changes would be rather difficult to backport, for example the 2022.02.x branch doesn't have support for --no-toolchains-csv which is effectively required for supporting non-x86_64 autobuilders as we obviously can't use prebuilt toolchains that only run on x86_64 hosts on an aarch64 host. There are many fixes related to various --no-toolchains-csv build failures that would also need to be backported as well if even feasible. > > Regards, > Arnout > > > on anything other than say master. > > > > To prevent testing of unwanted branches I could modify this to restrict > > the branch override to only allow selecting the branches listed in: > > http://autobuild.buildroot.org/branches > > > >> > >> Thanks! > >> > >> Thomas > >> -- > >> Thomas Petazzoni, CTO, Bootlin > >> Embedded Linux and Kernel engineering > >> https://bootlin.com From arnout at mind.be Thu Feb 9 20:28:47 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:28:47 +0100 Subject: [Buildroot] [git commit] lksctp-tools: bump to version 1.0.19 Message-ID: <20230209203249.54DB5847E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=554d79f5cc01c20d886cbe9c676195159947f066 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/sctp/lksctp-tools/blob/v1.0.19/ChangeLog Signed-off-by: Maxim Kochetkov Tested-by: Maksim Kiselev Signed-off-by: Arnout Vandecappelle --- package/lksctp-tools/lksctp-tools.hash | 4 ++-- package/lksctp-tools/lksctp-tools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lksctp-tools/lksctp-tools.hash b/package/lksctp-tools/lksctp-tools.hash index fb892fdc3b..b3a1f59d86 100644 --- a/package/lksctp-tools/lksctp-tools.hash +++ b/package/lksctp-tools/lksctp-tools.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ -md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz -sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz +md5 0fbb288c9f9625b88d3ab21c9ed9f011 lksctp-tools-1.0.19.tar.gz +sha1 d410a596485c38464177a38ae7c7081444e6589e lksctp-tools-1.0.19.tar.gz # Locally computed sha256 dee5f35e583183abb9212938643ecb2d858fd89e2e286f4b1d903f65d49d6c76 COPYING.lib sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk index 5ac794e842..af86a28516 100644 --- a/package/lksctp-tools/lksctp-tools.mk +++ b/package/lksctp-tools/lksctp-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -LKSCTP_TOOLS_VERSION = 1.0.17 -LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools +LKSCTP_TOOLS_VERSION = 1.0.19 +LKSCTP_TOOLS_SITE = $(call github,sctp,lksctp-tools,v$(LKSCTP_TOOLS_VERSION)) LKSCTP_TOOLS_INSTALL_STAGING = YES # configure not shipped LKSCTP_TOOLS_AUTORECONF = YES From arnout at mind.be Thu Feb 9 20:33:40 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:33:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire-media-session: bump to version 0.4.2 In-Reply-To: <20230209185203.262016-1-james.hilliard1@gmail.com> References: <20230209185203.262016-1-james.hilliard1@gmail.com> Message-ID: <5e0e6c1d-7eed-4fe8-8a33-c59e04d84254@mind.be> On 09/02/2023 19:52, James Hilliard wrote: > Explicitly set installed_tests to disabled. > > Drop patch which is now upstream. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > ...remove-session-managers-option-check.patch | 36 ------------------- > .../pipewire-media-session.hash | 2 +- > .../pipewire-media-session.mk | 7 ++-- > 3 files changed, 6 insertions(+), 39 deletions(-) > delete mode 100644 package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch [snip] From arnout at mind.be Thu Feb 9 20:32:43 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:32:43 +0100 Subject: [Buildroot] [git commit] package/pipewire-media-session: bump to version 0.4.2 Message-ID: <20230209203358.6A350848D5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1bceb4b51581e0c7b3953181ee3a2c31f0094f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Explicitly set installed_tests to disabled. Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- ...eson-remove-session-managers-option-check.patch | 36 ---------------------- .../pipewire-media-session.hash | 2 +- .../pipewire-media-session.mk | 7 +++-- 3 files changed, 6 insertions(+), 39 deletions(-) diff --git a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch b/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch deleted file mode 100644 index fc1d25edb3..0000000000 --- a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1923c97fbd0b3d8cacdb72386886f860c818bccf Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Wed, 10 Nov 2021 08:54:06 -0700 -Subject: [PATCH] meson: remove session-managers option check. - -This option no longer exists and causes a build failure if building -with the systemd system service enabled. - -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/pipewire/media-session/-/merge_requests/24] ---- - systemd/system/meson.build | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/systemd/system/meson.build b/systemd/system/meson.build -index ab0d49064..0e9885b0f 100644 ---- a/systemd/system/meson.build -+++ b/systemd/system/meson.build -@@ -4,9 +4,7 @@ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunit - systemd_config = configuration_data() - systemd_config.set('PW_MEDIA_SESSION_BINARY', media_session_bindir / 'pipewire-media-session') - --if get_option('session-managers').contains('media-session') -- configure_file(input : 'pipewire-media-session.service.in', -- output : 'pipewire-media-session.service', -- configuration : systemd_config, -- install_dir : systemd_system_services_dir) --endif -+configure_file(input : 'pipewire-media-session.service.in', -+ output : 'pipewire-media-session.service', -+ configuration : systemd_config, -+ install_dir : systemd_system_services_dir) --- -2.25.1 - diff --git a/package/pipewire-media-session/pipewire-media-session.hash b/package/pipewire-media-session/pipewire-media-session.hash index e335fd8913..e6b176eea2 100644 --- a/package/pipewire-media-session/pipewire-media-session.hash +++ b/package/pipewire-media-session/pipewire-media-session.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ebdf9f8e389896fdc4b58da5f909afce18441b4b53d5b4f2104dd53586ea8681 media-session-0.4.1.tar.bz2 +sha256 26e21852e0834a4418b40eae342ac5178dfe40342b9c5afe204d43ef8aafa14e media-session-0.4.2.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 77b9c867237ef919e33c0fdbcf22ab84b1cf24a63f9431ec68759026b658c994 LICENSE diff --git a/package/pipewire-media-session/pipewire-media-session.mk b/package/pipewire-media-session/pipewire-media-session.mk index d349fd7454..cc7317f925 100644 --- a/package/pipewire-media-session/pipewire-media-session.mk +++ b/package/pipewire-media-session/pipewire-media-session.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.1 +PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.2 PIPEWIRE_MEDIA_SESSION_SOURCE = media-session-$(PIPEWIRE_MEDIA_SESSION_VERSION).tar.bz2 PIPEWIRE_MEDIA_SESSION_SITE = https://gitlab.freedesktop.org/pipewire/media-session/-/archive/$(PIPEWIRE_MEDIA_SESSION_VERSION) PIPEWIRE_MEDIA_SESSION_LICENSE = MIT @@ -17,7 +17,10 @@ PIPEWIRE_MEDIA_SESSION_DEPENDENCIES = \ pipewire \ $(TARGET_NLS_DEPENDENCIES) -PIPEWIRE_MEDIA_SESSION_CONF_OPTS = -Ddocs=disabled -Dtests=disabled +PIPEWIRE_MEDIA_SESSION_CONF_OPTS = \ + -Ddocs=disabled \ + -Dtests=disabled \ + -Dinstalled_tests=disabled PIPEWIRE_MEDIA_SESSION_MODULE_SETS_LIST = alsa From arnout at mind.be Thu Feb 9 20:44:04 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:44:04 +0100 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: References: <20220607231211.533086-1-james.hilliard1@gmail.com> <20230208161527.31a28b3b@windsurf> Message-ID: On 09/02/2023 21:32, James Hilliard wrote: > On Thu, Feb 9, 2023 at 1:19 PM Arnout Vandecappelle wrote: >> >> >> >> On 08/02/2023 17:46, James Hilliard wrote: >>> On Wed, Feb 8, 2023 at 8:15 AM Thomas Petazzoni >>> wrote: >>>> >>>> On Tue, 7 Jun 2022 17:12:11 -0600 >>>> James Hilliard wrote: >>>> >>>>> In some cases it only makes sense to run tests against a specific >>>>> branch, such as when testing new genrandconfig flags. >>>>> >>>>> Add a config option to override the branch selection. >>>>> >>>>> Signed-off-by: James Hilliard >>>>> --- >>>>> scripts/autobuild-run | 11 ++++++++++- >>>>> 1 file changed, 10 insertions(+), 1 deletion(-) >>>> >>>> We looked at this with Arnout, and we don't really see what this would >>>> be needed, and actually it could be annoying to have people test >>>> "random" branches. If you need extensions to genrandconfig, then the >>>> autobuild-run script should be backward compatible with older versions >>>> of genrandconfig to be able to support older branches for a certain >>>> while. >>> >>> There are a number of other reasons this is useful, for example some >>> build hosts(for example my asahi-linux build host) have compatibility >>> issues in older branches so it doesn't make sense to run autobuilders >> >> If there are compatibility issues, the fixes should be backported to the >> stable branches... > > Some of the changes would be rather difficult to backport, for example > the 2022.02.x branch doesn't have support for --no-toolchains-csv which > is effectively required for supporting non-x86_64 autobuilders as we > obviously can't use prebuilt toolchains that only run on x86_64 hosts on > an aarch64 host. > > There are many fixes related to various --no-toolchains-csv build failures > that would also need to be backported as well if even feasible. Even so, I'm much more inclined to rewrite the autobuild-run logic to dynamically test which options genrandconfig can take and adapt accordingly. That way you don't have to manually maintain those branches and update them on each autobuilder instance. Regards, Arnout > >> >> Regards, >> Arnout >> >>> on anything other than say master. >>> >>> To prevent testing of unwanted branches I could modify this to restrict >>> the branch override to only allow selecting the branches listed in: >>> http://autobuild.buildroot.org/branches >>> >>>> >>>> Thanks! >>>> >>>> Thomas >>>> -- >>>> Thomas Petazzoni, CTO, Bootlin >>>> Embedded Linux and Kernel engineering >>>> https://bootlin.com From arnout at mind.be Thu Feb 9 20:47:16 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:47:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/open-iscsi: add OPEN_ISCSI_CPE_ID_VENDOR In-Reply-To: <20230208174431.85800-1-fontaine.fabrice@gmail.com> References: <20230208174431.85800-1-fontaine.fabrice@gmail.com> Message-ID: <4ca77dcb-789c-2f5c-e4b3-a5c509165859@mind.be> On 08/02/2023 18:44, Fabrice Fontaine wrote: > cpe:2.3:a:open-iscsi_project:open-iscsi is a valid CPE identifier for > this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen-iscsi_project%3Aopen-iscsi > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/open-iscsi/open-iscsi.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk > index 249253c64f..e5b965b80d 100644 > --- a/package/open-iscsi/open-iscsi.mk > +++ b/package/open-iscsi/open-iscsi.mk > @@ -10,6 +10,7 @@ OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) > # well. See https://github.com/open-iscsi/open-iscsi/issues/379 > OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ > OPEN_ISCSI_LICENSE_FILES = COPYING > +OPEN_ISCSI_CPE_ID_VENDOR = open-iscsi_project > OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux > > OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi From arnout at mind.be Thu Feb 9 20:47:23 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:47:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsolv: add LIBSOLV_CPE_ID_VENDOR In-Reply-To: <20230208175008.88846-1-fontaine.fabrice@gmail.com> References: <20230208175008.88846-1-fontaine.fabrice@gmail.com> Message-ID: <543e5bca-a555-395e-7b37-d0a6c166b878@mind.be> On 08/02/2023 18:50, Fabrice Fontaine wrote: > cpe:2.3:a:opensuse:libsolv is a valid CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopensuse%3Alibsolv > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libsolv/libsolv.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk > index 144ce68a83..29f8a6a3d2 100644 > --- a/package/libsolv/libsolv.mk > +++ b/package/libsolv/libsolv.mk > @@ -8,6 +8,7 @@ LIBSOLV_VERSION = 0.7.22 > LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) > LIBSOLV_LICENSE = BSD-3-Clause > LIBSOLV_LICENSE_FILES = LICENSE.BSD > +LIBSOLV_CPE_ID_VENDOR = opensuse > LIBSOLV_INSTALL_STAGING = YES > LIBSOLV_DEPENDENCIES = zlib > LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON From arnout at mind.be Thu Feb 9 20:44:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:44:31 +0100 Subject: [Buildroot] [git commit] package/open-iscsi: add OPEN_ISCSI_CPE_ID_VENDOR Message-ID: <20230209204741.155B884924@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4856c75b2fe0cbab36fcae7f5f223026b24e884f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:open-iscsi_project:open-iscsi is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen-iscsi_project%3Aopen-iscsi Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/open-iscsi/open-iscsi.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk index 249253c64f..e5b965b80d 100644 --- a/package/open-iscsi/open-iscsi.mk +++ b/package/open-iscsi/open-iscsi.mk @@ -10,6 +10,7 @@ OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) # well. See https://github.com/open-iscsi/open-iscsi/issues/379 OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ OPEN_ISCSI_LICENSE_FILES = COPYING +OPEN_ISCSI_CPE_ID_VENDOR = open-iscsi_project OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi From arnout at mind.be Thu Feb 9 20:46:10 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:46:10 +0100 Subject: [Buildroot] [git commit] package/libsolv: add LIBSOLV_CPE_ID_VENDOR Message-ID: <20230209204741.1F82E84925@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8cee8fb37c6ad0164d3f7bad8cfd0f812592ad6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:opensuse:libsolv is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopensuse%3Alibsolv Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libsolv/libsolv.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 144ce68a83..29f8a6a3d2 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -8,6 +8,7 @@ LIBSOLV_VERSION = 0.7.22 LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) LIBSOLV_LICENSE = BSD-3-Clause LIBSOLV_LICENSE_FILES = LICENSE.BSD +LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON From buildroot at heine.tech Thu Feb 9 20:53:01 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Thu, 9 Feb 2023 21:53:01 +0100 Subject: [Buildroot] [PATCH] package/re2: bump to version 2023-02-01 Message-ID: <20230209205309.2464796-1-buildroot@heine.tech> Signed-off-by: Michael Nosthoff --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 9019867db4..a39dece7a9 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 665b65b6668156db2b46dddd33405cd422bd611352c5052ab3dae6a5fbac5506 re2-2022-12-01.tar.gz +sha256 cbce8b7803e856827201a132862e41af386e7afd9cc6d9a9bc7a4fa4d8ddbdde re2-2023-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 07bb9378de..5587366b1f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2022-12-01 +RE2_VERSION = 2023-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE -- 2.34.1 From arnout at mind.be Thu Feb 9 20:53:13 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:53:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/ply: add dependency on Linux headers >= 5.5 In-Reply-To: References: Message-ID: On 08/02/2023 09:45, Andreas Klinger wrote: > Version 2.3.0 of ply now requires Linux headers >= 5.5 > > This was missing in commit b9612601b037e6deb79af300e64e0557dda1be5c > ("package/ply: bump to version 2.3.0") > > Fixes: > > http://autobuild.buildroot.net/results/ce37039991cb0fb02b97d341d78327e54d0e1d26 > http://autobuild.buildroot.net/results/c00714847ae92dd609bc8990df318bee58be38b8 > http://autobuild.buildroot.net/results/8210bd2b9c67d6d7616ada525019b2658195416a Applied to master, thanks. Sorry it took so long. > This is a resend, because there are still the same autobuild failures. A comment like this shouldn't be saved for eternity in the commit history, so it's better put under --- after your Signed-off-by. Regards, Arnout > > Signed-off-by: Andreas Klinger > --- > package/ply/Config.in | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/ply/Config.in b/package/ply/Config.in > index 0500e7883f..f7507095c1 100644 > --- a/package/ply/Config.in > +++ b/package/ply/Config.in > @@ -5,16 +5,16 @@ config BR2_PACKAGE_PLY_ARCH_SUPPORTS > default y if BR2_powerpc > default y if BR2_x86_64 > > -comment "ply needs a toolchain w/ dynamic library, headers >= 4.14" > +comment "ply needs a toolchain w/ dynamic library, headers >= 5.5" > depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS > depends on BR2_USE_MMU > - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 || BR2_STATIC_LIBS > > config BR2_PACKAGE_PLY > bool "ply" > depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS > depends on BR2_USE_MMU # fork() > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # BPF_JLT > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 # BPF_JLT > depends on !BR2_STATIC_LIBS > help > ply is a light-weight dynamic tracer for Linux. By means of From arnout at mind.be Thu Feb 9 20:51:47 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:51:47 +0100 Subject: [Buildroot] [git commit] package/ply: add dependency on Linux headers >= 5.5 Message-ID: <20230209205333.A365684986@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2fd606b91784ced64c7312e02fcbf95f3e736d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Version 2.3.0 of ply now requires Linux headers >= 5.5 This was missing in commit b9612601b037e6deb79af300e64e0557dda1be5c ("package/ply: bump to version 2.3.0") Fixes: http://autobuild.buildroot.net/results/ce37039991cb0fb02b97d341d78327e54d0e1d26 http://autobuild.buildroot.net/results/c00714847ae92dd609bc8990df318bee58be38b8 http://autobuild.buildroot.net/results/8210bd2b9c67d6d7616ada525019b2658195416a Signed-off-by: Andreas Klinger Signed-off-by: Arnout Vandecappelle --- package/ply/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ply/Config.in b/package/ply/Config.in index 0500e7883f..f7507095c1 100644 --- a/package/ply/Config.in +++ b/package/ply/Config.in @@ -5,16 +5,16 @@ config BR2_PACKAGE_PLY_ARCH_SUPPORTS default y if BR2_powerpc default y if BR2_x86_64 -comment "ply needs a toolchain w/ dynamic library, headers >= 4.14" +comment "ply needs a toolchain w/ dynamic library, headers >= 5.5" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 || BR2_STATIC_LIBS config BR2_PACKAGE_PLY bool "ply" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # BPF_JLT + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 # BPF_JLT depends on !BR2_STATIC_LIBS help ply is a light-weight dynamic tracer for Linux. By means of From giulio.benetti at benettiengineering.com Thu Feb 9 20:54:41 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 9 Feb 2023 21:54:41 +0100 Subject: [Buildroot] [PATCH] arch: move global and rename variable BR2_PACKAGE_Z3_ARCH_SUPPORTS In-Reply-To: <4acd3e35f6bce28f5f2e6cca8e57789c@free.fr> References: <20230209004823.3698203-1-giulio.benetti@benettiengineering.com> <4acd3e35f6bce28f5f2e6cca8e57789c@free.fr> Message-ID: <46cf956e-29d9-c0ce-5963-f3fc3543a476@benettiengineering.com> Hi Julien, On 09/02/23 20:36, Julien Olivain wrote: > > ? Hi Giulio, > > On 09/02/2023 01:48, Giulio Benetti wrote: >> Package quickjs fails to build on architectures that don't support full >> float rounding. To support all kind of float rounding FE_DOWNWARD, >> FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD must be defined in fenv.h. >> Since package z3 locally implements this check let's make it global, >> rename it to be generic and use it for both package quickjs and z3. >> >> Fixes: >> http://autobuild.buildroot.net/results/0b6/0b67381e3643c134c92cbcd1c5dc258fd760cd7e/ >> http://autobuild.buildroot.net/results/cf2/cf249a82c83d3c8503205f4c3c5859dd9d52afdf/ >> http://autobuild.buildroot.net/results/9b3/9b37c6c55a5b468657af26ef9b57d4fe24d8fde2/ >> http://autobuild.buildroot.net/results/4f1/4f13cf7d353260c6b8934dbdcf267bea884b356b/ >> >> Signed-off-by: Giulio Benetti > > To comment a bit on that, the complete condition is a bit more tricky: > - the CPU arch FPU HW must have all 4 rounding modes, > - the libc must expose a fenv.h header, > - the libc must also expose all 4 rouding modes. thank you for the more precise explanation, everything is more clear now > glibc generally exposes all the HW supported rounding modes.? I > initially excluded uclibc-ng, because in its Buildroot default > configuration, fenv.h is not enabled [1]. I believe it's possible to > have some uclibc-ng configuration that are enable and exposing those > rounding modes. See [2]. > > So this proposal is correct but possibly discard the case in which libc is > uclibc-ng and its (custom) configuration exposes all FE rounding modes. Maybe we can enable UCLIBC_HAS_FENV on uclibc-ng by default, so all architectures that UCLIBC_HAS_FLOAT they have it. Otherwise that UCLIBC_HAS_FENV gets discarded if I'm correct. > I am not sure if it's really an issue, as packages with such > requirements are mostly tested with glibc anyway... Same here for the architecture. So we'd need a valid condition that is true for the 3 points you've listed above exactly in the order you've listed them if I'm correct. Maybe we can do an intermediate step with this patch and later deal with this matrix validity check Best regards -- Giulio Benetti Benetti Engineering sas > Best regards, > > Julien. > > [1] https://git.busybox.net/buildroot/tree/package/uclibc/uClibc-ng.config > [2] > https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/extra/Configs/Config.in.arch?h=v1.0.42#n180 From james.hilliard1 at gmail.com Thu Feb 9 21:42:21 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 9 Feb 2023 14:42:21 -0700 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: References: <20220607231211.533086-1-james.hilliard1@gmail.com> <20230208161527.31a28b3b@windsurf> Message-ID: On Thu, Feb 9, 2023 at 1:44 PM Arnout Vandecappelle wrote: > > > > On 09/02/2023 21:32, James Hilliard wrote: > > On Thu, Feb 9, 2023 at 1:19 PM Arnout Vandecappelle wrote: > >> > >> > >> > >> On 08/02/2023 17:46, James Hilliard wrote: > >>> On Wed, Feb 8, 2023 at 8:15 AM Thomas Petazzoni > >>> wrote: > >>>> > >>>> On Tue, 7 Jun 2022 17:12:11 -0600 > >>>> James Hilliard wrote: > >>>> > >>>>> In some cases it only makes sense to run tests against a specific > >>>>> branch, such as when testing new genrandconfig flags. > >>>>> > >>>>> Add a config option to override the branch selection. > >>>>> > >>>>> Signed-off-by: James Hilliard > >>>>> --- > >>>>> scripts/autobuild-run | 11 ++++++++++- > >>>>> 1 file changed, 10 insertions(+), 1 deletion(-) > >>>> > >>>> We looked at this with Arnout, and we don't really see what this would > >>>> be needed, and actually it could be annoying to have people test > >>>> "random" branches. If you need extensions to genrandconfig, then the > >>>> autobuild-run script should be backward compatible with older versions > >>>> of genrandconfig to be able to support older branches for a certain > >>>> while. > >>> > >>> There are a number of other reasons this is useful, for example some > >>> build hosts(for example my asahi-linux build host) have compatibility > >>> issues in older branches so it doesn't make sense to run autobuilders > >> > >> If there are compatibility issues, the fixes should be backported to the > >> stable branches... > > > > Some of the changes would be rather difficult to backport, for example > > the 2022.02.x branch doesn't have support for --no-toolchains-csv which > > is effectively required for supporting non-x86_64 autobuilders as we > > obviously can't use prebuilt toolchains that only run on x86_64 hosts on > > an aarch64 host. > > > > There are many fixes related to various --no-toolchains-csv build failures > > that would also need to be backported as well if even feasible. > > Even so, I'm much more inclined to rewrite the autobuild-run logic to > dynamically test which options genrandconfig can take and adapt accordingly. The genrandconfig issue is only one of a number of issues that I've seen come up, there's been a rather long tail of lingering aarch64 compatibility issues that sometimes require major package updates. For example some systemd fixes for aarch64 build hosts aren't really feasible to backport due to requiring major refactoring. What we probably eventually want is the ability to identify issues as build host environment specific by rerunning failed builds on different hosts automatically, but that would probably require some infrastructure changes. > That way you don't have to manually maintain those branches and update them on > each autobuilder instance. I'm pretty much just using this to restrict my autobuilders to master branch when there are known compatibility issues with older branches for a particular host configuration. > > Regards, > Arnout > > > > >> > >> Regards, > >> Arnout > >> > >>> on anything other than say master. > >>> > >>> To prevent testing of unwanted branches I could modify this to restrict > >>> the branch override to only allow selecting the branches listed in: > >>> http://autobuild.buildroot.org/branches > >>> > >>>> > >>>> Thanks! > >>>> > >>>> Thomas > >>>> -- > >>>> Thomas Petazzoni, CTO, Bootlin > >>>> Embedded Linux and Kernel engineering > >>>> https://bootlin.com From ckhardin at gmail.com Thu Feb 9 23:15:15 2023 From: ckhardin at gmail.com (ckhardin at gmail.com) Date: Thu, 9 Feb 2023 15:15:15 -0800 Subject: [Buildroot] [PATCH 1/4] linux: create a scmversion file based on the custom repo variables Message-ID: <20230209231518.9458-1-ckhardin@gmail.com> From: Charles Hardin When using the custom repositories, the archive creation will omit the source history to get reproducible hashes. This has the side effect of making the setlocalversion scripts within the builds to not create the tracking information as expected. So, just generate a .scmversion so that kernels will be labelled with where buildroot referenced them. For example (line wrapped) #define UTS_RELEASE "5.4.70-repo-version-" \ "92c23d10d0031e0a13244a1a97e7530d3b53fc6e" Signed-off-by: Charles Hardin --- linux/linux.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..0b27c8dee2 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -596,6 +596,20 @@ endif ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)),) $(error No custom repo URL set. Check your BR2_LINUX_KERNEL_CUSTOM_REPO_URL setting) endif + +# Create a custom scm version file to reflect the source version since the +# archive will omit source directories like .git to maintain reproducible +# hashes for the archives +LINUX_CUSTOM_REPO_SCMVERSION = \ + "-repo-version-$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION))" +define LINUX_CUSTOM_REPO_SCMVERSION_HOOK + (cd $(@D); \ + if [ ! -f .scmversion ]; then \ + echo $(LINUX_CUSTOM_REPO_SCMVERSION) > .scmversion; \ + fi) +endef + +LINUX_POST_EXTRACT_HOOKS += LINUX_CUSTOM_REPO_SCMVERSION_HOOK endif ifeq ($(BR_BUILDING),y) -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 23:15:16 2023 From: ckhardin at gmail.com (ckhardin at gmail.com) Date: Thu, 9 Feb 2023 15:15:16 -0800 Subject: [Buildroot] [PATCH 2/4] boot/uboot: create a scmversion file based on the custom repo variables In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230209231518.9458-2-ckhardin@gmail.com> From: Charles Hardin When using the custom repositories, the archive creation will omit the source history to get reproducible hashes. This has the side effect of making the setlocalversion scripts within the builds to not create the tracking information as expected. So, just generate a .scmversion so that kernels will be labelled with where buildroot referenced them. Example (line wrapped) #define PLAIN_VERSION "2018.03-repo-version-" \ "d72b9d0908364a64718b652b75e4cac9b85cf0c3" Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..d735b47326 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -526,12 +526,25 @@ endif # BR2_TARGET_UBOOT_CUSTOM_TARBALL ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT)$(BR2_TARGET_UBOOT_CUSTOM_HG),y) ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),) $(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting) -endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_URL +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_REPO_URL ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION)),) $(error No custom U-Boot repository version specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting) -endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_VERSION +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION endif # BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG +# Create a custom scm version file to reflect the source version since the +# archive will omit source directories like .git to maintain reproducible +# hashes for the archives +UBOOT_CUSTOM_REPO_SCMVERSION = \ + "-repo-version-$(call qstrip,$(BR2_UBOOT_TARGET_CUSTOM_REPO_VERSION))" +define UBOOT_CUSTOM_REPO_SCMVERSION_HOOK + (cd $(@D); \ + if [ ! -f .scmversion ]; then \ + echo $(UBOOT_CUSTOM_REPO_SCMVERSION) > .scmversion; \ + fi) +endef + +UBOOT_POST_EXTRACT_HOOKS += UBOOT_CUSTOM_REPO_SCMVERSION_HOOK endif # BR2_TARGET_UBOOT && BR_BUILDING ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 23:15:17 2023 From: ckhardin at gmail.com (ckhardin at gmail.com) Date: Thu, 9 Feb 2023 15:15:17 -0800 Subject: [Buildroot] [PATCH 3/4] boot/uboot: add a setlocalversion rsync hook when overriding srcdir In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230209231518.9458-3-ckhardin@gmail.com> From: Charles Hardin During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define PLAIN_VERSION "2018.03-01358-gbda75d6a8b" #define U_BOOT_VERSION "U-Boot " PLAIN_VERSION Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index d735b47326..3f8479e623 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -40,6 +40,18 @@ UBOOT_SITE = https://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 endif +ifneq ($(UBOOT_OVERRIDE_SRCDIR),) +define UBOOT_OVERRIDE_SRCDIR_SETLOCALVERSION + (cd $(@D); \ + if [ -x ./scripts/setlocalversion ]; then \ + ./scripts/setlocalversion --save-scmversion \ + $(abspath $(UBOOT_OVERRIDE_SRCDIR)) ||:; \ + fi) +endef + +UBOOT_POST_RSYNC_HOOKS += UBOOT_OVERRIDE_SRCDIR_SETLOCALVERSION +endif + ifeq ($(BR2_TARGET_UBOOT)$(BR2_TARGET_UBOOT_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) endif -- 2.37.1 (Apple Git-137.1) From ckhardin at gmail.com Thu Feb 9 23:15:18 2023 From: ckhardin at gmail.com (ckhardin at gmail.com) Date: Thu, 9 Feb 2023 15:15:18 -0800 Subject: [Buildroot] [PATCH 4/4] linux: add a setlocalversion rsync hook when overriding srcdir In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230209231518.9458-4-ckhardin@gmail.com> From: Charles Hardin During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define UTS_RELEASE "5.4.70-00031-g92c23d10d003" Signed-off-by: Charles Hardin --- linux/linux.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 0b27c8dee2..3ef8e555c5 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -46,6 +46,18 @@ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_ endif endif +ifneq ($(LINUX_OVERRIDE_SRCDIR),) +define LINUX_OVERRIDE_SRCDIR_SETLOCALVERSION + (cd $(@D); \ + if [ -x ./scripts/setlocalversion ]; then \ + ./scripts/setlocalversion --save-scmversion \ + $(abspath $(LINUX_OVERRIDE_SRCDIR)) ||:; \ + fi) +endef + +LINUX_POST_RSYNC_HOOKS += LINUX_OVERRIDE_SRCDIR_SETLOCALVERSION +endif + ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) endif -- 2.37.1 (Apple Git-137.1) From cherniaev.andrei at kairo.space Fri Feb 10 05:57:53 2023 From: cherniaev.andrei at kairo.space (Andrei Cherniaev) Date: Fri, 10 Feb 2023 14:57:53 +0900 Subject: [Buildroot] [RE]Re: [PATCH] board/qemu: add echo for errors Message-ID: <167600867506.1345656.7844136709572400573@wmail10.mailplug.com> See my case here https://bugs.busybox.net/show_bug.cgi?id=15271#c1Sorry, I forgot Signed-off-by because buildroot uses a very un-user-friendly old-school contrib system. I suggest using GitHub. Also I want to say. I try to send this mail twice. In first time I got "The mailing lists on this server only accept email from mailing list subscribers. You are not subscribed to this mailing list". Very-very un-user-friendly...----- Original Message -----From : Romain Naour To : "AndreiCherniaev" , Cc : "AndreiCherniaev" , "Romain Naour" Sent : 2023-02-08 01:26:14Subject : Re: [Buildroot] [PATCH] board/qemu: add echo for errorsHello Andrei,Le 22/01/2023 ? 13:36, AndreiCherniaev a ?crit:> From: AndreiCherniaev > Your Signed-off-by is missing, so we can't apply the patch as is [1].I'm making it as "Changes requested".Maybe a small comment explaining why you want to change the script would be great.[1] https://nightly.buildroot.org/manual.html#submitting-patches> ---> board/qemu/post-image.sh | 8 ++++----> 1 file changed, 4 insertions(+), 4 deletions(-)> > diff --git a/board/qemu/post-image.sh b/board/qemu/post-image.sh> index 88f0413496..91d5b88b03 100755> --- a/board/qemu/post-image.sh> +++ b/board/qemu/post-image.sh> @@ -6,8 +6,8 @@ README_FILES="$/*/readme.txt"> START_QEMU_SCRIPT="$/start-qemu.sh"> > if [[ "$" =~ ^"qemu_*" ]]; then> - # Not a Qemu defconfig, can't test.> - exit 0> + echo "Not a Qemu defconfig, can't test"> + exit 1Initially exit 0 was intended to not fail the build for non qemu defconfig ingitlab-ci. But board/qemu/post-image.sh in only used by qemu defconfig so eventhe test doesn't seems not required anymore.> fi> > # Search for "# qemu_*_defconfig" tag in all readme.txt files.> @@ -15,8 +15,8 @@ fi> QEMU_CMD_LINE=$(sed -r ':a; /\\$/N; s/\\\n//; s/\t/ /; ta; /# '$'$/!d; s/#.*//' $)> > if [ -z "$" ]; then> - # No Qemu cmd line found, can't test.> - exit 0> + echo "No Qemu cmd line found, can't test"> + exit 1> fiIIRC, some qemu defconfig was not gitlab-ready so exit 0 was here to not failthe gitlab-ci job if no qemu command line was provided. Only a build test isdone in this case.Best regards,Romain> > # Remove output/images path since the script will be in -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Fri Feb 10 06:37:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 06:37:13 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-09 Message-ID: <20230210063719.5AA4482232@smtp1.osuosl.org> Hello, Autobuild statistics for 2023-02-09 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 4 | 2 | 1 | 7 | 2022.11.x | 14 | 20 | 0 | 34 | master | 171 | 165 | 2 | 338 | Classification of failures by reason for master ----------------------------------------------- unknown | 7 elfutils-0.186 | 6 host-pahole-1.24 | 6 jack2-1.9.21 | 6 libsolv-0.7.22 | 6 python-cryptography-39.0.0 | 6 host-binutils-2.38 | 5 host-go-1.19.5 | 5 linux-6.1.9 | 5 norm-1.5.8 | 5 glibc-2.36-81-g4f4d7a13edfd... | 4 gobject-introspection-1.72.0 | 4 host-rust-1.67.0 | 4 gerbera-1.10.0 | 3 host-binutils-2.37 | 3 ffmpeg-4.4.3 | 2 fluent-bit-2.0.8 | 2 gobject-introspection | 2 host-libarchive-3.6.2 | 2 libglib2-2.72.3 | 2 libgpg-error-1.46 | 2 linux-5.10.162-cip24 | 2 lirc-tools-0.10.2 | 2 lttng-modules-2.13.7 | 2 netsurf-3.10 | 2 php-8.2.1 | 2 python-bcrypt-4.0.1 | 2 python-numpy-1.23.5 | 2 sdl-1.2.15 | 2 sigrok-cli-0.7.2 | 2 systemd-252.4 | 2 xenomai-3.0.10 | 2 zabbix-5.4.9 | 2 ace-7.0.6 | 1 asterisk-16.29.1 | 1 batman-adv-2022.3 | 1 bind-9.16.33 | 1 bluez5_utils-5.65 | 1 brltty-6.5 | 1 coreutils-9.1 | 1 crucible-2022.05.25 | 1 dahdi-linux-3.2.0 | 1 dfu-util-0.11 | 1 dmalloc-5.6.5 | 1 dust-0.8.1 | 1 edk2-edk2-stable202208 | 1 faad2-2.10.1 | 1 fftw-quad-3.3.8 | 1 file-5.43 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fwup-1.9.1 | 1 hawktracer-2ec19d7192334414... | 1 igh-ethercat-2e2cef61318953... | 1 json-c-0.16 | 1 libblockdev-2.26 | 1 libgcrypt-1.10.1 | 1 libnss-3.87 | 1 libsigsegv-2.14 | 1 libzlib-1.2.13 | 1 linux-5.10.162-cip24-rt10 | 1 linux-fusion-9.0.3 | 1 linux-tools | 1 lua-cffi-0.2.3 | 1 modem-manager-1.20.4 | 1 modsecurity2-2.9.7 | 1 mosh-1.4.0 | 1 mutt-2.2.9 | 1 nginx-1.22.1 | 1 ocf-linux-20171122 | 1 opencv3-3.4.17 | 1 openvmtools-11.3.5-18557794 | 1 opkg-0.4.5 | 1 optee-client-3.19.0 | 1 opus-1.3.1 | 1 perl-5.36.0 | 1 pixman-0.42.2 | 1 quickjs-2021-03-27 | 1 reaver-1.6.6 | 1 rsync-3.2.7 | 1 ssdp-responder-1.9 | 1 uclibc-1.0.42 | 1 uclibc-ng-test-6790eafe897b... | 1 wavemon-0.9.4 | 1 xlib_libX11-1.8.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/9b8e7f486eada7c4b28d081886b862ae6fcfaac1 | mips | asterisk-16.29.1 | NOK | http://autobuild.buildroot.net/results/c3952d85c634802e941777e040df977251b05047 | mips64el | batman-adv-2022.3 | NOK | http://autobuild.buildroot.net/results/a751028b46bca05fc149621ec723d144f51724aa | sh4eb | bind-9.16.33 | NOK | http://autobuild.buildroot.net/results/4119b0d9e84e3adf3ffcfc8e2058b1b130d7f959 | ORPH sh4a | bluez5_utils-5.65 | NOK | http://autobuild.buildroot.net/results/941ab94c5cdaaeaa0af3e02f10f683ae7eb48b5f | mipsel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/f138c1d9bb2d32592631d53e594a136bb15242b1 | sh4aeb | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/78ba29070a08165e5cd3b3f0db632583c79b7ce9 | ORPH x86_64 | crucible-2022.05.25 | NOK | http://autobuild.buildroot.net/results/1bf180ff682b73028dc1cfb6f78e5f4ff09c2c68 | i586 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/afefc1310dcdc41779a4488ceda5fbaa47a20961 | or1k | dfu-util-0.11 | NOK | http://autobuild.buildroot.net/results/d875a150ef19af56f9c7b87595a7c325db61a51d | ORPH i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/43bb254e064ccfd813247c6aef7953437fd1d0dc | ORPH powerpc64le | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/07c34d52b08611496ae862aa670ed81776df9d28 | ORPH x86_64 | edk2-edk2-stable202208 | NOK | http://autobuild.buildroot.net/results/ad9a144d92d624c151d890944ffc612a220ec130 | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/e32e53535e5c1c96f59efde5ed1d6a6289e109fb | ORPH arc | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/5fd51cedbae5ddfd16e3bf9dbb48aaa9c1a71309 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/bfb7c87e3c4ee3594e9e97e8ed772370ac1aebcc | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/2d27e7133a82889782bfe14514b9323afeb30644 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/93e3e26f30dfbe3c7f0576e43d2446d95bb483c8 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/2a94467eddc71f877ac6e123e039a69567bec6e1 | ORPH sh4a | faad2-2.10.1 | NOK | http://autobuild.buildroot.net/results/e975b9c2eeac954547cd6d79912c7044a4c2888e | arceb | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/88c78ea274e22e406bc0b82d000bd17914256f40 | aarch64 | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/dca3bc3e306da1f7ddfe3bda1a0747ec14a51bbc | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/9bc9c00f9d65bc7bb838577544b6242019d135dc | ORPH xtensa | file-5.43 | NOK | http://autobuild.buildroot.net/results/541d5cb89a597b43f260552ad584fad084c73d00 | ORPH s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/856fd250f75a696694c70e3208ffcef7470a7082 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/dceb413fb5d459338417d8dd5a42d95aa23e849b | mips64 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/6211045f9699ec4bcc6acd8ff02f2f4729f2c41e | powerpc64 | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/12a24742dfbd5253b12104b962261da2489e003a | aarch64_be | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/1171505712b18f850bc15fd7f5b93500dcea3508 | microblazeel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/1f941d6fc4e1e291fca87ebd86d42bb20bb56785 | mips | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/1bdf804eec3211b652b7df781c49b3eb7478f0ad | powerpc64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/1e23138b42ce8a7746429cec10659f96f2ea856c | mips64el | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/67de65c34f2948dc63008d604b243c180609cb23 | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/ea8ef0aefd1e0893a3ba38370d8b4a5ac4107d7f | mips | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/70a9c3e3fb1d7480bf31619bbd9c9f73d8ad177e | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/13d7d395f220b537fa77d1e6e72c9c3d6a1f6911 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/0614dccce55f6fe4b91d1493781c18ebe0b8ed0c | powerpc64le | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/32e36e46f31bab5382d9bb8e30f260a682698655 | powerpc64le | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/2ecb54e2b6f0329b9b43527030ebcc82c561ab72 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/f7f2662137fa1a1789d929fda36730204dcd1cc0 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/d126b44ac7de8121d53d47ae49b7d5b416e12a8b | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/8cdfa96470f57aa87c502f68091f6c7da610cce2 | nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5d29e38ee3898db338a01f068df33e17a650a7ff | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2a8bcae935d17816a3c629fc63b0fe5db3e6849d | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/313d8c3e4d3de8af5a8ccbc577e34876d2e1bc02 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/34683eafa5ff63c3f16d14331283afd672ce3a76 | ORPH riscv32 | hawktracer-2ec19d7192334414... | NOK | http://autobuild.buildroot.net/results/b4705910778ae1069476b61bb4ce6a5bd4a20889 | or1k | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/aab380e73b5be544fc14a4a0cf9332005233752d | or1k | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/79b01d7b38d887929ca1522c390cd098db916a0a | arceb | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/dec43e3c2ff1a1f9da02dba6554d95b4d2ab7bd3 | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/213cdb606f08d99d6936fa0fb1917857cfddd310 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/0e3565f93db4d7d111b8d3561437d5d274851d2d | aarch64_be | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/20ecb3d5f62818cdf880f8483ccec08324b0e51a | powerpc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/98f7fa79d81d14c448b1b63a6b8d43625771fc46 | mips64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/3f9a88ad7b13552a7ac7d859ee274beba22f2661 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/86559cc399271ef1268cc5e5f9e203b246ae3012 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/1805868dfbdac9f192a96b970847e165847e571a | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f1f7ae30fe97387130a5a048999da42a82ae57ec | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/20e2f1b14e3d4a1302794e54fa7d42ca4f9394b5 | aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/9b60ca3a000307a8df594c6632b7c28c8d9ff793 | aarch64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/34312c9886cd81a683543753039ae41a086c0a2f | mips64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/a23946dbc6925331787bce11ff843de0992b7e1c | m68k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c50ddd652f8d30bb25e64be52099e37e2d6c8977 | sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c0dc715f90f9f96b32ad4add69bb1741d969f38a | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/bd577399d3a86cf91e0e392deb882bc34ddcbd6d | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/33d583f6c8df7bba4e883619489eaa8b03d34ce0 | powerpc64le | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/010eb2f682e24a1419a4690c2235b447ca5d6107 | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/5c5e939f2ac2713240705a4e977b1ee0e1fa2086 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/1a9c904e5238a628d9dd38e86d7af2da4d0f36b8 | armeb | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/bd8614c7c8ff5ef1ae370b470ec3f1e46322169e | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/f0a0305d3a268cb228a5d8afee929bf225dc2fb7 | armeb | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/26352a0ff6b3e77f7023735c05fc9e0f124f9450 | x86_64 | igh-ethercat-2e2cef61318953... | NOK | http://autobuild.buildroot.net/results/c8720b48898585be5ec6cf2ff0c80a48ada331d5 | s390x | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/ca5385968711dffbd1b182eebcc647c97b74c874 | powerpc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/5f9f6e1d4aca0a268cf062d44186661f2305731c | m68k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/2223ca0a19fb617b03defe1a5ea99e05ccb1c3c2 | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/752faa2561cd67d590174ad801a540dbc0c57ce0 | riscv64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/1c7482e12331cbe0f8cfcc89a72ed2fc3ef317c1 | microblaze | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/885cb119e88f2342e747d41d24fe32d0148a4659 | or1k | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/0ce61e355ac495129fa90a2f9288da6bfb3dafd4 | or1k | libblockdev-2.26 | NOK | http://autobuild.buildroot.net/results/a2b824716e48b75e03dd012f8428a0a0d500896a | ORPH arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/36046efdec33e21376d34d2dbb202982aff7243b | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/a8af30ea6070450ba5ce4d3ed628f42bd7a8171b | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/1e270da549afb18348f131a3f21680946c51a6b2 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/ab7262e0850a00c91bbf153ec25154133b4dac04 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/e3de2419d82e91a595b4812312d39f39e9c2d7a6 | ORPH sh4eb | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/dfd980121fd3f1ff22fff7b5cd34e3d3680282a3 | arceb | libsigsegv-2.14 | NOK | http://autobuild.buildroot.net/results/dd8ecf20660ba37b5bbcb59d9deabfb69da77677 | arceb | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/bc3c2659de674c7cadeec9e45f992cfbf8fe68dc | mips | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/dfb84c469a27bd285fa73baac927e4bc1014d037 | aarch64 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/30cdbd6d4b2ebdc5901a86eb40cfe3821585d429 | or1k | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/662242fd32e20c2e33308f517e58aa3b25c5075d | powerpc64 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/3099b142a44116041fd369dc0a2a3fca2d42fbc5 | mips64el | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/1deddeeb0ffdf4dfaaef139bed4e5f8986b31c8c | mips64el | libzlib-1.2.13 | NOK | http://autobuild.buildroot.net/results/f2f9492dfd087b8bbc5c788d87193d185e2ee12c | ORPH mipsel | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/010c7650d8156b890a86921200db35bd30fe18ab | ORPH nios2 | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/9744212f354abc5ac4832585f80e1dcdc636beed | ORPH arceb | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/e3f7be013b6b2ab6f44800606780807b1fe5a115 | ORPH mips64el | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/d32294c96049410c764e8330f4c2ef8ce54b2d9c | ORPH mips64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/6ea3c1ce875b608fd47840aede09238033664824 | ORPH mipsel | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/5a399b6280f5796035c67713a66b356bd2187de9 | ORPH riscv32 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/7cd3c5ea56ba1c0cab7e2d9f9698194beced6d92 | ORPH mipsel | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/c42a001c013cad006d89ec07373846073d0ec204 | ORPH sparc64 | linux-fusion-9.0.3 | NOK | http://autobuild.buildroot.net/results/4a9b8de2e7500db213d8d578164fdcc3ebfebb5e | ORPH mips64 | linux-tools | NOK | http://autobuild.buildroot.net/results/9777eebc395ed3715e974b2f1475396986432fa3 | ORPH microblaze | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/8b9bd67edb7ae89a1fcfe33749bb0b8235e68163 | ORPH mips | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/0ba50382ea2c4e00d5d98be34c0bd8615268c563 | ORPH powerpc64 | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/9e274cceb07e27e5566365320446fecadb20a729 | sparc | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/37f2d1dd48a5ae25b646f4852f6fc807181d999c | or1k | lua-cffi-0.2.3 | NOK | http://autobuild.buildroot.net/results/b441dcbea8723e57084d52339aa7f3592c3e4db3 | armeb | modem-manager-1.20.4 | NOK | http://autobuild.buildroot.net/results/2bdf3b7822a64f625c3bb87f0ad6d334595a763d | sh4a | modsecurity2-2.9.7 | NOK | http://autobuild.buildroot.net/results/fa370b0476c3eaaf48c615e7358c5fd2eae5badd | mips | mosh-1.4.0 | NOK | http://autobuild.buildroot.net/results/9ee6f66248121adcf485266eea3e4f5510fbcab1 | sparc64 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/53ae7495c5d1cfec86a93be4c1b747ea4a311ee3 | powerpc64le | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/7e0466dfe8088620e12df970461c9b5f00ceafc0 | sparc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/6f16aeabf9b728d331ea1e65d7518d569cef717f | sparc64 | nginx-1.22.1 | NOK | http://autobuild.buildroot.net/results/078adb11db6dde9914aacd8906b7c01b03ebebf7 | sparc64 | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/fee1ba15e78d6ca236eb3bbeda565172578bfcfc | ORPH microblaze | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/82662e270cdb40deaf8a9c5a558628996453de1c | ORPH microblazeel | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/46f4e06bb00f3d0126e31d0a558497af5bae7cc0 | ORPH aarch64_be | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/3617d3beb1d669097f8257ad23f2d06b32fe101c | ORPH m68k | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/92ad4eb2e57e74c036e655ae269f44e162b92e21 | ORPH arm | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/d6930dfcdae163553dc9ba55dfefc1585797c35a | ORPH x86_64 | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/3a5cc40a4d0b15ccced46701baed3bfa811c05e7 | aarch64 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/ea0d5440dda349a77315bed2b69e117ab0ed5476 | or1k | opkg-0.4.5 | NOK | http://autobuild.buildroot.net/results/2932dcd2ecab732369d8139aae046e3d908f8bc5 | ORPH i686 | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/4de54f6ec94a65c751b79eab0e61ff804495c726 | arm | opus-1.3.1 | NOK | http://autobuild.buildroot.net/results/0d56a6bf110e060a3e3aa97b70565a93946a8584 | ORPH aarch64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/7923cbc90f6ce3e9583a975b0bbc13bd60a81918 | armeb | php-8.2.1 | NOK | http://autobuild.buildroot.net/results/0309ab52eedecb686e2487533f351e3b0ef3ed84 | armeb | php-8.2.1 | NOK | http://autobuild.buildroot.net/results/4d49a5f2b2ee33502502265e86aebeb190b20f7c | arm | pixman-0.42.2 | NOK | http://autobuild.buildroot.net/results/79c493df47871e78308b987fa921870b9ae1b43f | powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/dc4485436c58ec2b625038b9dbc02216c9e20362 | aarch64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/69c09b40436b7a4080bd68abfb805907ebf2d949 | arm | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/60300a50f6218acced5159e8893b337c6de6fb75 | sparc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/ad57ba835b1342a7903b2bfe7dfc6c3d1868d238 | sparc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/9c6d4505517ad97f1024c7305e4e0ffe2f5fa213 | powerpc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/42bd3c91b1b3124f79c490144d930da18e47f94d | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/076fd5476bd74223b87044ed98cdbaf10dc7daa0 | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/169abf05619832c54fc9fbd716741c0455bce92b | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/9c81d6a957db0733b4ce7137545ada762e619d64 | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/0f251f2eeb7b63efa439cae252bfc244376c56be | or1k | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/5e8c1e69479c838094ef5fba19a21a84a86cc8ad | arc | reaver-1.6.6 | NOK | http://autobuild.buildroot.net/results/fefda6008e2eec8850e532f9916ff567f93e086e | sparc | rsync-3.2.7 | NOK | http://autobuild.buildroot.net/results/1f0c4b6b7fdfded982e311b3bf58640dd405d97d | sh4aeb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/5aea3e90a9ba89e4b3af4fc63db335083b7a91fb | ORPH sh4eb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/3979f16d6f26357fad9334e7ac4f8d22f287ed21 | ORPH aarch64_be | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/7f86445785952b24aaab8d12c37b7873371ab712 | ORPH nios2 | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/9eaca61628c14afe95dd2c32cc6b877cbc3af5d1 | ORPH aarch64 | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 | aarch64_be | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/1233de5599a264832162b156678cfda1bafd5a84 | mipsel | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/5c41408a1dfb8375466189eb8616a4dca1fda727 | powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/4b5be17326bdea6e020957e8c74d1241f1efcca9 | mipsel | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/d307b26fd6673ed724ace500b62a4b3298281750 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/ff415d035818b8ba1c81a6ac810499a88daba86d | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/a1e317a66ea875e30544beef5076a4ae5c035de1 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/c13231dc943fb027355fd2c46db677783bdf654b | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/08f95c6ccfc009842f8e424e685ab9fad93d2703 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/17eeb1e9499abbfde2ed5d62230a1dc51aa8bb96 | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/c2fd411f5b7fe349fa912a20813a6eb0ebecf4e8 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/90c4e3ad87a17de20dd54151583c2b9abaf639b0 | aarch64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/f85ac475b83127a78885196642e84711a20d555f | ORPH s390x | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/29f42c0faebcb1c2534609f5344c2ba68e21c03e | s390x | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/7fc478d5cbd2bd526b732a5aa0e824f0654d00bb | arm | xlib_libX11-1.8.3 | NOK | http://autobuild.buildroot.net/results/c922be5e389a1e71b19c7293fea4ad3580e828c9 | sparc64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/f8221a6e257156903cc77a65d91c189c1656f74d | mips64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/02e6ca13cf64724e3d100f4f3b5472ca6810faac | Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 1 libuwsc | 1 wavemon-0.9.4 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/8f909088906b3bb9f6b3a0dc3f21d4c6521d9374 | mipsel | libuwsc | TIM | http://autobuild.buildroot.net/results/750ca64679192946dc137237cd4e09b66dece792 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/26e9efb7be515cc7e467a57cf58a79fa4ab4f317 | ORPH Classification of failures by reason for 2022.11.x -------------------------------------------------- janus-gateway-1.0.3 | 5 gerbera-1.10.0 | 1 google-breakpad-c85eb4a59b6... | 1 host-binutils-2.38 | 1 host-pahole-1.24 | 1 ipmiutil-3.1.8 | 1 libglib2-2.72.3 | 1 libvorbis-1.3.7 | 1 mariadb-10.3.36 | 1 mutt-2.2.9 | 1 openssh-9.1p1 | 1 proftpd-1.3.8 | 1 pv-1.6.20 | 1 unknown | 1 xenomai-3.0.10 | 1 xxhash-0.8.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/65e77993f5f9eda19f92c99a6da34f2652914275 | mipsel | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/5d2238f2b586a6580c66bfe7d3ccfae026a17c87 | powerpc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/a1e8e36afded3d63796ef60b235ed04a6d398cb4 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/4b60dcd170a4f8cf6b3fb9bcb7c2ad1e2c7f0357 | x86_64 | ipmiutil-3.1.8 | NOK | http://autobuild.buildroot.net/results/6761a25db610e61308e5020a82320c6d4d39a02c | aarch64_be | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/b3fc4e884b861ee742a83484d78f6a61dc8d64da | aarch64_be | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/53a5498f49fa1fa7f939a23d238c6220f6e32fac | x86_64 | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/d054ed4178e089e85e4305605aa1c2e0be85a501 | sparc64 | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/868c1eea7b1ccf599388b8ef42c49b6044ecf8db | mips64 | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/17a00303aa900deb3eeb3d6c5b6e5bac45f63034 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/ffeee758cc9ad36ed05915eda2016b1201826bb6 | powerpc | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/807c94da984b9334a605cf064ccb7aad14080108 | sparc | mariadb-10.3.36 | NOK | http://autobuild.buildroot.net/results/ed08125cfaf43a22d17aa460269ac7123444c848 | ORPH or1k | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/e45feb1781eb044652086f6a668c89eb3701bde2 | or1k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/2638d2db23a96cf624a58b23320ff7429cf9252b | ORPH sparc | proftpd-1.3.8 | NOK | http://autobuild.buildroot.net/results/a3309ec92a143ac96f46d70c0bc9bfa0235c4e03 | armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/14d3075a4d658c646cddea05042d157b82d76edf | ORPH riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/15d34c999cc8bb16d76fc71a38511d6ed645960f | i686 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/9f44186ba196ea94847f7af3e494c753df2de6d1 | aarch64_be | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/034a4f715b257fce05850802a0dc9edc5dfd5c1d | ORPH -- http://autobuild.buildroot.net From fido_max at inbox.ru Fri Feb 10 07:22:28 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 10 Feb 2023 10:22:28 +0300 Subject: [Buildroot] [PATCH 1/1] package/postgresql: bump version to 15.2 Message-ID: <20230210072228.68137-1-fido_max@inbox.ru> Release notes: https://www.postgresql.org/docs/release/15.2/ Signed-off-by: Maxim Kochetkov --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index ef2806c2dd..e6a9bd6658 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v14.6/postgresql-15.1.tar.bz2.sha256 -sha256 64fdf23d734afad0dfe4077daca96ac51dcd697e68ae2d3d4ca6c45cb14e21ae postgresql-15.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 +sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 2ffcac6595..e90aa794b0 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 15.1 +POSTGRESQL_VERSION = 15.2 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL -- 2.38.1 From fido_max at inbox.ru Fri Feb 10 07:37:31 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 10 Feb 2023 10:37:31 +0300 Subject: [Buildroot] [PATCH 1/1] package/gdal: bump version to 3.6.2 Message-ID: <20230210073731.152068-1-fido_max@inbox.ru> Release notes: https://github.com/OSGeo/gdal/blob/v3.6.2/NEWS.md Signed-off-by: Maxim Kochetkov --- package/gdal/gdal.hash | 6 +++--- package/gdal/gdal.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gdal/gdal.hash b/package/gdal/gdal.hash index ab77d7840d..6cf3336644 100644 --- a/package/gdal/gdal.hash +++ b/package/gdal/gdal.hash @@ -1,6 +1,6 @@ -# md5 from: https://download.osgeo.org/gdal/3.5.2/gdal-3.5.2.tar.xz.md5, sha256 locally computed: -md5 821b3b0637ebada5d20dbefb2e3ec964 gdal-3.5.2.tar.xz -sha256 0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2 gdal-3.5.2.tar.xz +# md5 from: https://download.osgeo.org/gdal/3.6.2/gdal-3.6.2.tar.gz.md5, sha256 locally computed: +md5 6f22ffdbd8e00059ddb2b825c5920c4c gdal-3.6.2.tar.xz +sha256 35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681 gdal-3.6.2.tar.xz # Hashes of license files: sha256 fac0116e799ca4de79b076ee04863b5e2b69541ea3664b9bb108c81a5355f16a LICENSE.TXT diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index a3b11c53af..ba9ba71b3b 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -4,7 +4,7 @@ # ################################################################################ -GDAL_VERSION = 3.5.2 +GDAL_VERSION = 3.6.2 GDAL_SITE = https://download.osgeo.org/gdal/$(GDAL_VERSION) GDAL_SOURCE = gdal-$(GDAL_VERSION).tar.xz GDAL_LICENSE = MIT, many others -- 2.38.1 From Shahab.Vahedi at synopsys.com Fri Feb 10 09:17:40 2023 From: Shahab.Vahedi at synopsys.com (Shahab Vahedi) Date: Fri, 10 Feb 2023 09:17:40 +0000 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: revert bpf_cookie patch to allow building In-Reply-To: <1750a14f-36a1-fe51-1452-3a72b84979c5@mind.be> References: <97ea44bb-58fe-d6cb-6c79-9be0b245f2c6@synopsys.com> <29d2a8c7-44cd-da42-5fed-f17ec0f8ccf2@synopsys.com> <1750a14f-36a1-fe51-1452-3a72b84979c5@mind.be> Message-ID: <9a8b4ac5-6ffb-e8d8-3587-2768e004780e@synopsys.com> On 2/9/23 21:27, Arnout Vandecappelle wrote: > > On 09/02/2023 13:23, Shahab Vahedi wrote: >> >> On 2/8/23 17:36, Arnout Vandecappelle wrote: >>> >>> It's not clear to me why you did a revert of the cookie feature rather than >>> using those patches. I think the first two or three should be sufficient to >>> fix your issue? >> >> Ideally, the correct way would be applying that pending series. But since >> there were comments that some of the patches might need reworking [1], I did > > I don't see anything in that thread about rework being needed, only some > complaints about some mail gateway encrypting messages so they can't be > read by some recipients... See this [1] and the response here [2]. Having read it again, apparently it is not such a big deal. Alexander, the author, mentioned that he will redo that part in v3 of the patch the way David suggested. So either, I can make that change when submitting to Buildroot, or take it as it is. Your call. [1] https://lore.kernel.org/bpf/20220421003152.339542-3-alobakin at pm.me/T/#m42db58567febf12040f6ba0478e1a6148c284c55 [2] https://lore.kernel.org/bpf/20220421003152.339542-3-alobakin at pm.me/T/#m293896646128262621c83e8c15c4d977f92ad0d2 >> not feel confident to add them. Therefore, I tried to keep my solution minimal >> and solve it by eliminating the problem. I know, it is not appealing. > > The problem with your patch is that it is very difficult to decide if it > should be kept or not when bumping the version. Plus, some people (or other > packages) may rely on the feature that you remove. I can try to apply that patch series on top of bpftool-v7.1.0-br1.tar.gz in buildroot. If it can be done fairly easily, I will submit it on a different thread. -- Shahab From bugzilla at busybox.net Fri Feb 10 10:13:15 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 10 Feb 2023 10:13:15 +0000 Subject: [Buildroot] [Bug 15331] New: Warning on python-flit-core license when generating legal info Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15331 Bug ID: 15331 Summary: Warning on python-flit-core license when generating legal info Product: buildroot Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: trivial Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: alexis.lothore at bootlin.com CC: buildroot at uclibc.org Target Milestone: --- Created attachment 9506 --> https://bugs.busybox.net/attachment.cgi?id=9506&action=edit Modified defconfig to reproduce the issue The legal-info target emits a warning on python-flit-core: WARNING: python-flit-core-3.8.0: cannot save license (HOST_PYTHON_FLIT_CORE_LICENSE_FILES not defined) Steps to reproduce: - clone buildroot - make qemu_x86_64_defconfig - in menuconfig, enable python3, a python package having flit as setup type (e.g.: argon2_cffi) - make legal-info Host OS : Archlinux (Linux arch-bootlin-alexis 6.1.9-arch1-2 #1 SMP PREEMPT_DYNAMIC Fri, 03 Feb 2023 18:49:53 +0000 x86_64 GNU/Linux) Buildroot version : master (e2fd606b91784ced64c7312e02fcbf95f3e736d6) -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Fri Feb 10 10:13:39 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 10 Feb 2023 10:13:39 +0000 Subject: [Buildroot] [Bug 15331] Warning on python-flit-core license when generating legal info In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15331 Alexis Lothor? changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|unassigned at buildroot.uclibc |alexis.lothore at bootlin.com |.org | -- You are receiving this mail because: You are on the CC list for the bug. From jesseevg at gmail.com Fri Feb 10 10:14:21 2023 From: jesseevg at gmail.com (Jesse Van Gavere) Date: Fri, 10 Feb 2023 11:14:21 +0100 Subject: [Buildroot] [PATCH v6 13/13] package/qt6: Add qmake functionality In-Reply-To: <20230208121829.126bc242@windsurf> References: <20230207171721.2973997-1-angelo@amarulasolutions.com> <20230207171721.2973997-14-angelo@amarulasolutions.com> <20230208121829.126bc242@windsurf> Message-ID: Hello Thomas, You're right, this won't work with a relocated HOST_DIR the QT6_INSTALL_QT_CONF seems to have gotten dropped in Angelo his patch series, I'll rebase onto what has been approved and submit a new series for the qmake functionality. Thanks for the reviews! Regards, Jesse Op wo 8 feb. 2023 om 12:18 schreef Thomas Petazzoni : > > Hello, > > On Tue, 7 Feb 2023 18:17:21 +0100 > Angelo Compagnucci wrote: > > > diff --git a/package/qt6/qt6base/qt.conf.in b/package/qt6/qt6base/qt.conf.in > > new file mode 100644 > > index 0000000000..4842bcb462 > > --- /dev/null > > +++ b/package/qt6/qt6base/qt.conf.in > > @@ -0,0 +1,7 @@ > > +[Paths] > > +Prefix=/usr > > +HostPrefix=@@HOST_DIR@@ > > +HostData=../target/usr > > This looks very very odd, and most likely doesn't work. If I understand > correctly, this is a path that will be interpreted relatively to > $(HOST_DIR), so this value assumes that host/ and target/ are side by > side, but that's not true in the general case. Indeed, BR2_HOST_DIR > allows to customize where $(HOST_DIR) is located, and it can be > elsewhere than side by side to target/. > > What is this trying to do exactly? > > > > > +Sysroot=@@STAGING_DIR@@ > > +SysrootifyPrefix=true > > +TargetSpec=devices/linux-buildroot-g++ > > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk > > index ec1c65f827..f37b2bafce 100644 > > --- a/package/qt6/qt6base/qt6base.mk > > +++ b/package/qt6/qt6base/qt6base.mk > > @@ -54,6 +54,9 @@ QT6BASE_CONF_OPTS = \ > > -DFEATURE_system_zlib=ON \ > > -DFEATURE_system_libb2=ON > > > > +QT6BASE_CFLAGS = $(TARGET_CFLAGS) > > +QT6BASE_CXXFLAGS = $(TARGET_CXXFLAGS) > > + > > # x86 optimization options. While we have a BR2_X86_CPU_HAS_AVX512, it > > # is not clear yet how it maps to all the avx512* options of Qt, so we > > # for now keeps them disabled. > > @@ -384,5 +387,18 @@ else > > QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF > > endif > > > > +define QT6BASE_MAKE_BR_SPEC > > + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qmake.conf.in \ > > + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf > > + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ > > + $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h > > +endef > > + > > +QT6BASE_CONF_OPTS += -DQT_QMAKE_DEVICE_OPTIONS=CROSS_COMPILE="$(TARGET_CROSS)";BR_COMPILER_CFLAGS="$(QT6BASE_CFLAGS)";BR_COMPILER_CXXFLAGS="$(QT6BASE_CXX_FLAGS)" > > + > > +QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC > > + > > +QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF > > Where is QT6_INSTALL_QT_CONF implemented ? > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From alexis.lothore at bootlin.com Fri Feb 10 10:26:55 2023 From: alexis.lothore at bootlin.com (=?UTF-8?q?Alexis=20Lothor=C3=A9?=) Date: Fri, 10 Feb 2023 11:26:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-flit-core: set license path Message-ID: <20230210102655.94324-1-alexis.lothore@bootlin.com> When generating legal info with a configuration enabling a package which uses flit as setup type, we get a warning about python-flit-core license: WARNING: python-flit-core-3.8.0: cannot save license (HOST_PYTHON_FLIT_CORE_LICENSE_FILES not defined) Add missing variable to point to python-flit-core license file Signed-off-by: Alexis Lothor? --- package/python-flit-core/python-flit-core.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 4d7bee81da..f96191ade6 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -8,6 +8,7 @@ PYTHON_FLIT_CORE_VERSION = 3.8.0 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/10/e5/be08751d07b30889af130cec20955c987a74380a10058e6e8856e4010afc PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause +PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap # Use flit built in bootstrap_install for installing host-python-flit-core. -- 2.39.1 From bugzilla at busybox.net Fri Feb 10 10:40:46 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 10 Feb 2023 10:40:46 +0000 Subject: [Buildroot] [Bug 15331] Warning on python-flit-core license when generating legal info In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15331 --- Comment #1 from Alexis Lothor? --- Proposed patch: https://lists.buildroot.org/pipermail/buildroot/2023-February/661800.html -- You are receiving this mail because: You are on the CC list for the bug. From frank.vanbever at mind.be Fri Feb 10 11:06:43 2023 From: frank.vanbever at mind.be (Frank Vanbever) Date: Fri, 10 Feb 2023 12:06:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/elixir: drop package Message-ID: <20230210110643.449927-1-frank.vanbever@mind.be> Elixir was a dependency of rabbitmq-server which got dropped in 89815bad0a531d01ee2733dd9c17576a7647e1d9. It is a host package with no other users, hence it is no longer required. Additionally, newer versions require Erlang 23+. Signed-off-by: Frank Vanbever --- DEVELOPERS | 1 - package/elixir/elixir.hash | 3 --- package/elixir/elixir.mk | 21 --------------------- 3 files changed, 25 deletions(-) delete mode 100644 package/elixir/elixir.hash delete mode 100644 package/elixir/elixir.mk diff --git a/DEVELOPERS b/DEVELOPERS index 32c6e54919..e8e0671709 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1089,7 +1089,6 @@ F: package/upx/ F: package/zxing-cpp/ N: Frank Vanbever -F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ diff --git a/package/elixir/elixir.hash b/package/elixir/elixir.hash deleted file mode 100644 index 6d083e72de..0000000000 --- a/package/elixir/elixir.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Computed locally -sha256 f3465d8a8e386f3e74831bf9594ee39e6dfde6aa430fe9260844cfe46aa10139 elixir-1.9.4.tar.gz -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE diff --git a/package/elixir/elixir.mk b/package/elixir/elixir.mk deleted file mode 100644 index 6d935516f4..0000000000 --- a/package/elixir/elixir.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# elixir -# -################################################################################ - -ELIXIR_VERSION = 1.9.4 -ELIXIR_SITE = $(call github,elixir-lang,elixir,v$(ELIXIR_VERSION)) -ELIXIR_LICENSE = Apache-2.0 -ELIXIR_LICENSE_FILES = LICENSE -HOST_ELIXIR_DEPENDENCIES = host-erlang - -define HOST_ELIXIR_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) compile -endef - -define HOST_ELIXIR_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX="$(HOST_DIR)" -C $(@D) install -endef - -$(eval $(host-generic-package)) -- 2.37.2 From Dirk.DeBecker at ebo-enterprises.com Fri Feb 10 11:15:12 2023 From: Dirk.DeBecker at ebo-enterprises.com (Dirk De Becker) Date: Fri, 10 Feb 2023 11:15:12 +0000 Subject: [Buildroot] Dependency problem for gtkmm3 Message-ID: Hi, I am trying to make a buildroot containing libgtkmm3, but I run into problems. I did the following steps: Checkout master from git://git.buildroot.net/buildroot Select the following things: * BR2_x86_64 * BR2_TOOLCHAIN_BUILDROOT_CXX * BR2_PACKAGE_MESA3D * BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 * BR2_PACKAGE_MESA3D_OPENGL_EGL * BR2_PACKAGE_LIBGTK3 * BR2_PACKAGE_GTKMM3 I get the following error in the output of the build attempt for gtkmm3-3.22.0: configure: error: Package requirements (giomm-2.4 >= 2.49.1 pangomm-1.4 >= 2.38.2 gtk+-3.0 >= 3.22.0 cairomm-1.0 >= 1.12.0 gdk-pixbuf-2.0 >= 2.35.5) were not met: Package 'giomm-2.4', required by 'virtual:world', not found Package 'pangomm-1.4', required by 'virtual:world', not found Package 'cairomm-1.0', required by 'virtual:world', not found It seems that gtkmm3 is dependent on versions of some libraries that are not available. The following packages were built, but these do not provide the correct versions of these packages, according to pkg-config: * glibmm-2.68.2 * pangomm-2.48.2 * cairomm-1.16.1 Met vriendelijke groeten, Cordialement, Kind Regards, [https://www.ebo-enterprises.com/static/emailsignatures/img/ebo_logo-transparant.png] Dirk De Becker Squad Leader e-Vision Embedded dirk.debecker at ebo-enterprises.com +32 498 51 19 86 . +32 57 23 02 70 . [https://www.ebo-enterprises.com/static/emailsignatures/img/microsoft_teams_icon.png] Ter Waarde 60 . 8900 Ypres . Belgium Wetenschapspark 2 . 8400 Ostend . Belgium [https://www.ebo-enterprises.com/static/emailsignatures/img/website_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/twitter_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/facebook_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/instagram_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/linkedin_icon.png] [MicrosoftTeams-image.png] -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: C2_signature_microsoftteams-image_b51463d7-6b52-402b-8e2d-555faff69bb4.png Type: image/png Size: 8323 bytes Desc: C2_signature_microsoftteams-image_b51463d7-6b52-402b-8e2d-555faff69bb4.png URL: From john at metanate.com Fri Feb 10 11:17:33 2023 From: john at metanate.com (John Keeping) Date: Fri, 10 Feb 2023 11:17:33 +0000 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: Build with ninja In-Reply-To: <20230209170707.4066903-1-peter@korsgaard.com> References: <20230209170707.4066903-1-peter@korsgaard.com> Message-ID: Hi Peter, On Thu, Feb 09, 2023 at 06:07:05PM +0100, Peter Korsgaard wrote: > +define WEBKITGTK_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) > +endef > + > +define WEBKITGTK_INSTALL_STAGING_CMDS > + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) > +endef > + > +define WEBKITGTK_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) > +endef > + Would it make sense to apply these changes in pkg-cmake.mk? Using `cmake --build` and `cmake --install` works with all generators and it would avoid needing to repeat this block for both of the packages in this series. Regards, John From buildroot at heine.tech Fri Feb 10 11:39:23 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Fri, 10 Feb 2023 12:39:23 +0100 Subject: [Buildroot] [PATCH] package/boost: bump to version 1.81.0 Message-ID: <20230210113931.4055853-1-buildroot@heine.tech> - add option for new library "url" - drop upstreamed patch Signed-off-by: Michael Nosthoff --- compile tested defconfigs: BR2_arm=y BR2_cortex_a15=y BR2_ARM_FPU_NEON=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_PACKAGE_CC_TOOL=y BR2_PACKAGE_LIBUBOOTENV=y BR2_PACKAGE_BOTAN=y BR2_PACKAGE_UHD=y BR2_PACKAGE_LOG4CXX=y BR2_PACKAGE_LIBCPPRESTSDK=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_COROUTINE=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_FIBER=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y BR2_PACKAGE_BITCOIN=y BR2_PACKAGE_I2PD=y BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_QT5=y BR2_PACKAGE_PULSEVIEW=y BR2_PACKAGE_GNURADIO=y BR2_sh=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE=y BR2_PACKAGE_BOOST=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MATH=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y BR2_PACKAGE_BOOST_RANDOM=y BR2_PACKAGE_BOOST_SERIALIZATION=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y BR2_x86_64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_BOOST=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_COROUTINE=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_FIBER=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MATH=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y BR2_PACKAGE_BOOST_RANDOM=y BR2_PACKAGE_BOOST_SERIALIZATION=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y --- .../0001-Improve-modfunc-performance.patch | 551 ------------------ package/boost/Config.in | 13 + package/boost/boost.hash | 4 +- package/boost/boost.mk | 5 +- 4 files changed, 18 insertions(+), 555 deletions(-) delete mode 100644 package/boost/0001-Improve-modfunc-performance.patch diff --git a/package/boost/0001-Improve-modfunc-performance.patch b/package/boost/0001-Improve-modfunc-performance.patch deleted file mode 100644 index a34d6bb4d5..0000000000 --- a/package/boost/0001-Improve-modfunc-performance.patch +++ /dev/null @@ -1,551 +0,0 @@ -From 825aedad557b7e3bb27614335b6ced16887103de Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= -Date: Mon, 7 Nov 2022 00:16:44 +0100 -Subject: [PATCH] Improve "modfunc" performance Fixes #79 - ("boost/intrusive/hashtable.hpp: build failure (undeclared indentifier)") - -Backport from Boost development branch to fix issues with some architectures -(64-bit with 128-bit processing, where size_t != unsigned long). In this case, -code is enabled that causes a build failure. - -Upstream: https://github.com/boostorg/intrusive/commit/825aedad557b7e3bb27614335b6ced16887103de -Issue: https://github.com/boostorg/intrusive/issues/79 -Fixes: http://autobuild.buildroot.net/results/6cb/6cbc0672f3c5046405793d8cdc8f961d2ffb1d3e - -Signed-off-by: Andreas Ziegler ---- - include/boost/intrusive/hashtable.hpp | 235 ++++++++++++++++---------- - 1 file changed, 145 insertions(+), 90 deletions(-) - -diff --git a/include/boost/intrusive/hashtable.hpp b/include/boost/intrusive/hashtable.hpp -index b8bc877..688fb9b 100644 ---- a/boost/intrusive/hashtable.hpp -+++ b/boost/intrusive/hashtable.hpp -@@ -2,6 +2,7 @@ - // - // (C) Copyright Ion Gaztanaga 2006-2022 - // (C) Copyright 2022 Joaquin M Lopez Munoz. -+// (C) Copyright 2022 Christian Mazakas - // - // Distributed under the Boost Software License, Version 1.0. - // (See accompanying file LICENSE_1_0.txt or copy at -@@ -84,11 +85,6 @@ namespace intrusive { - - /// @cond - --#if !defined(BOOST_NO_INT64_T)&&\ -- (defined(BOOST_HAS_INT128) || (defined(_MSC_VER) && defined(_WIN64))) --#define BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT --#endif -- - //We only support LLP64(Win64) or LP64(most Unix) data models - #ifdef _WIN64 //In 64 bit windows sizeof(size_t) == sizeof(unsigned long long) - # define BOOST_INTRUSIVE_SIZE_C(NUMBER) NUMBER##ULL -@@ -98,7 +94,6 @@ namespace intrusive { - # define BOOST_INTRUSIVE_64_BIT_SIZE_T (((((ULONG_MAX>>16)>>16)>>16)>>15) != 0) - #endif - -- - template - struct prime_list_holder - { -@@ -167,11 +162,11 @@ struct prime_list_holder - { return prime_list[std::ptrdiff_t(n)]; } - - template -- BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % prime_list[SizeIndex]; } -+ BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % SizeIndex; } - - static std::size_t(*const positions[])(std::size_t); - -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T - static const uint64_t inv_sizes32[]; - static const std::size_t inv_sizes32_size; - #endif -@@ -185,17 +180,20 @@ struct prime_list_holder - BOOST_INTRUSIVE_FORCEINLINE static std::size_t size(std::size_t size_index) - { return prime_list_holder<>::size_from_index(size_index); } - -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T - // https://github.com/lemire/fastmod - -- - BOOST_INTRUSIVE_FORCEINLINE static uint64_t mul128_u32(uint64_t lowbits, uint32_t d) - { - #if defined(_MSC_VER) -- return __umulh(lowbits, d); -+ return __umulh(lowbits, d); -+ #elif defined(BOOST_HAS_INT128) -+ return static_cast((uint128_type(lowbits) * d) >> 64); - #else -- __extension__ typedef unsigned __int128 ext_uint128_t; -- return (ext_uint128_t(lowbits) * d) >> 64; -+ uint64_t r1 = (lowbits & UINT32_MAX) * d; -+ uint64_t r2 = (lowbits >> 32) * d; -+ r2 += r1 >> 32; -+ return r2 >> 32; - #endif - } - -@@ -204,51 +202,67 @@ struct prime_list_holder - uint64_t lowbits = M * a; - return (uint32_t)(mul128_u32(lowbits, d)); - } -- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - - BOOST_INTRUSIVE_FORCEINLINE static std::size_t position(std::size_t hash,std::size_t size_index) - { -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) && BOOST_INTRUSIVE_64_BIT_SIZE_T -- const std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T -+ BOOST_CONSTEXPR_OR_CONST std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); - if(BOOST_LIKELY(size_index < sizes_under_32bit)){ - return fastmod_u32( uint32_t(hash)+uint32_t(hash>>32) - , inv_sizes32[size_index] - , uint32_t(prime_list[size_index]) ); - } - else{ -- return positions[size_index-sizes_under_32bit](hash); -+ return positions[size_index](hash); - } -- #elif defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -- return fastmod_u32(hash, inv_sizes32[size_index], uint32_t(sizes[size_index])); - #else - return positions[size_index](hash); -- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - } - }; - - template - std::size_t(* const prime_list_holder::positions[])(std::size_t) = - { -- #if !defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -- modfunc< 0>,modfunc< 1>,modfunc< 2>,modfunc< 3>,modfunc< 4>, -- modfunc< 5>,modfunc< 6>,modfunc< 7>,modfunc< 8>,modfunc< 9>, -- modfunc<10>,modfunc<11>,modfunc<12>,modfunc<13>,modfunc<14>, -- modfunc<15>,modfunc<16>,modfunc<17>,modfunc<18>,modfunc<19>, -- modfunc<20>,modfunc<21>,modfunc<22>,modfunc<23>,modfunc<24>, -- modfunc<25>,modfunc<26>,modfunc<27>,modfunc<28>,modfunc<29>, -- modfunc<30>, -- #endif -- # if BOOST_INTRUSIVE_64_BIT_SIZE_T -- modfunc<31>,modfunc<32>,modfunc<33>,modfunc<34>, -- modfunc<35>,modfunc<36>,modfunc<37>,modfunc<38>,modfunc<39>, -- modfunc<40>,modfunc<41>,modfunc<42>,modfunc<43>,modfunc<44>, -- modfunc<45>,modfunc<46>,modfunc<47>,modfunc<48>,modfunc<49>, -- modfunc<50>,modfunc<51>,modfunc<52>,modfunc<53>,modfunc<54>, -- modfunc<55>,modfunc<56>,modfunc<57>,modfunc<58>,modfunc<59>, -- modfunc<60>,modfunc<61>,modfunc<62>,modfunc<63> -- # else -- modfunc<31> -- # endif -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, //0-30 indexes -+#if BOOST_INTRUSIVE_64_BIT_SIZE_T -+ //Taken from Boost.MultiIndex code, thanks to Joaquin M. Lopez Munoz. -+ modfunc, //<- 32 bit values stop here (index 31) -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc //(index 63) -+#else -+ modfunc //<- 32 bit stops here (index 31) as ptrdiff_t is signed -+#endif - }; - - template -@@ -298,7 +312,7 @@ const std::size_t prime_list_holder::prime_list_size - = sizeof(prime_list) / sizeof(std::size_t); - - --#if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+#if BOOST_INTRUSIVE_64_BIT_SIZE_T - - template - const uint64_t prime_list_holder::inv_sizes32[] = { -@@ -340,7 +354,7 @@ template - const std::size_t prime_list_holder::inv_sizes32_size - = sizeof(inv_sizes32) / sizeof(uint64_t); - --#endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+#endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - - struct prime_fmod_size : prime_list_holder<> - { -@@ -785,9 +799,9 @@ BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_va - } - - template //fastmod_buckets --BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t bucket_cnt, std::size_t split, detail::true_) -+BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t , std::size_t split, detail::true_) - { -- return prime_fmod_size::position(hash_value, split); (void)bucket_cnt; -+ return prime_fmod_size::position(hash_value, split); - } - - //!This metafunction will obtain the type of a bucket -@@ -1473,6 +1487,10 @@ struct bucket_hash_t - , bucket_plus_vtraits_t(BOOST_MOVE_BASE(bucket_plus_vtraits_t, other)) - {} - -+ template -+ BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_hash(const K &k) const -+ { return this->base_t::operator()(k); } -+ - BOOST_INTRUSIVE_FORCEINLINE const hasher &priv_hasher() const - { return this->base_t::get(); } - -@@ -1747,8 +1765,17 @@ struct hashtable_size_wrapper - typedef const size_traits & size_traits_const_t; - typedef size_traits & size_traits_t; - -- BOOST_INTRUSIVE_FORCEINLINE size_traits_const_t priv_size_traits() const -- { return size_traits_; } -+ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const -+ { return size_traits_.get_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType s) -+ { size_traits_.set_size(s); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() -+ { size_traits_.increment(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() -+ { size_traits_.decrement(); } - - BOOST_INTRUSIVE_FORCEINLINE size_traits_t priv_size_traits() - { return size_traits_; } -@@ -1780,7 +1807,19 @@ struct hashtable_size_wrapper - typedef size_traits size_traits_const_t; - typedef size_traits size_traits_t; - -- BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() const -+ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const -+ { return 0u; } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType) -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() - { return size_traits(); } - }; - -@@ -1815,14 +1854,14 @@ struct hashdata_internal - public: - static const bool linear_buckets = 0 != (BoolFlags & hash_bool_flags::linear_buckets_pos); - typedef typename get_hashtable_size_wrapper_bucket -- ::type internal_type; -- -- typedef typename internal_type::key_equal key_equal; -- typedef typename internal_type::hasher hasher; -+ ::type split_bucket_hash_equal_t; -+ -+ typedef typename split_bucket_hash_equal_t::key_equal key_equal; -+ typedef typename split_bucket_hash_equal_t::hasher hasher; - typedef bucket_plus_vtraits - bucket_plus_vtraits_t; - typedef SizeType size_type; -- typedef typename internal_type::size_traits split_traits; -+ typedef typename split_bucket_hash_equal_t::size_traits split_traits; - typedef typename bucket_plus_vtraits_t::bucket_ptr bucket_ptr; - typedef typename bucket_plus_vtraits_t::const_value_traits_ptr const_value_traits_ptr; - typedef typename bucket_plus_vtraits_t::siterator siterator; -@@ -1866,23 +1905,20 @@ struct hashdata_internal - - hashdata_internal( const ValueTraits &val_traits, const bucket_traits &b_traits - , const hasher & h, const key_equal &e) -- : internal_type(val_traits, b_traits, h, e) -+ : split_bucket_hash_equal_t(val_traits, b_traits, h, e) - {} - - BOOST_INTRUSIVE_FORCEINLINE hashdata_internal(BOOST_RV_REF(hashdata_internal) other) -- : internal_type(BOOST_MOVE_BASE(internal_type, other)) -+ : split_bucket_hash_equal_t(BOOST_MOVE_BASE(split_bucket_hash_equal_t, other)) - {} - -- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_t priv_split_traits() -- { return this->priv_size_traits(); } -- -- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_const_t priv_split_traits() const -+ BOOST_INTRUSIVE_FORCEINLINE typename split_bucket_hash_equal_t::size_traits_t priv_split_traits() - { return this->priv_size_traits(); } - - ~hashdata_internal() - { this->priv_clear_buckets(); } - -- using internal_type::priv_clear_buckets; -+ using split_bucket_hash_equal_t::priv_clear_buckets; - - void priv_clear_buckets() - { -@@ -1907,7 +1943,17 @@ struct hashdata_internal - - //public functions - BOOST_INTRUSIVE_FORCEINLINE SizeType split_count() const BOOST_NOEXCEPT -- { return this->priv_split_traits().get_size(); } -+ { return this->split_bucket_hash_equal_t::get_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void split_count(SizeType s) BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::set_hashtable_size_wrapper_size(s); } -+ -+ //public functions -+ BOOST_INTRUSIVE_FORCEINLINE void inc_split_count() BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::inc_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_split_count() BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::dec_hashtable_size_wrapper_size(); } - - BOOST_INTRUSIVE_FORCEINLINE static SizeType initial_split_from_bucket_count(SizeType bc) BOOST_NOEXCEPT - { -@@ -1983,10 +2029,7 @@ struct hashdata_internal - { return (priv_hash_to_nbucket)(hash_value, fastmod_buckets_t()); } - - BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::true_) const //fastmod_buckets_t -- { -- return static_cast(hash_to_bucket_split -- (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::true_())); -- } -+ { return static_cast(prime_fmod_size::position(hash_value, this->split_count())); } - - BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::false_) const //!fastmod_buckets_t - { -@@ -1994,7 +2037,6 @@ struct hashdata_internal - (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::false_())); - } - -- - BOOST_INTRUSIVE_FORCEINLINE iterator iterator_to(reference value, detail::false_) BOOST_NOEXCEPT - { - return iterator( siterator(this->priv_value_to_node_ptr(value)) -@@ -2083,8 +2125,8 @@ struct hashdata_internal - , this->priv_value_traits_ptr()); - } - -- using internal_type::end; -- using internal_type::cend; -+ using split_bucket_hash_equal_t::end; -+ using split_bucket_hash_equal_t::cend; - - local_iterator end(size_type n) BOOST_NOEXCEPT - { return local_iterator(this->priv_bucket_lend(n), this->priv_value_traits_ptr()); } -@@ -2322,19 +2364,32 @@ class hashtable_impl - public: - typedef insert_commit_data_impl insert_commit_data; - -+ private: - void default_init_actions() - { - this->priv_set_sentinel_bucket(); - this->priv_init_buckets_and_cache(); -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - size_type bucket_sz = this->bucket_count(); - BOOST_INTRUSIVE_INVARIANT_ASSERT(bucket_sz != 0); - //Check power of two bucket array if the option is activated - BOOST_INTRUSIVE_INVARIANT_ASSERT - (!power_2_buckets || (0 == (bucket_sz & (bucket_sz - 1)))); -- this->priv_split_traits().set_size(this->initial_split_from_bucket_count(bucket_sz)); -+ this->split_count(this->initial_split_from_bucket_count(bucket_sz)); - } - -+ BOOST_INTRUSIVE_FORCEINLINE SizeType priv_size_count() const BOOST_NOEXCEPT -+ { return this->internal_type::get_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_count(SizeType s) BOOST_NOEXCEPT -+ { this->internal_type::set_hashtable_size_wrapper_size(s); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_inc() BOOST_NOEXCEPT -+ { this->internal_type::inc_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_dec() BOOST_NOEXCEPT -+ { this->internal_type::dec_hashtable_size_wrapper_size(); } -+ - public: - - //! Requires: buckets must not be being used by any other resource. -@@ -2403,10 +2458,10 @@ class hashtable_impl - { - this->priv_swap_cache(x); - x.priv_init_cache(); -- this->priv_size_traits().set_size(x.priv_size_traits().get_size()); -- x.priv_size_traits().set_size(size_type(0)); -- this->priv_split_traits().set_size(x.split_count()); -- x.priv_split_traits().set_size(size_type(0)); -+ this->priv_size_count(x.priv_size_count()); -+ x.priv_size_count(size_type(0)); -+ this->split_count(x.split_count()); -+ x.split_count(size_type(0)); - } - - //! Effects: Equivalent to swap. -@@ -2524,7 +2579,7 @@ class hashtable_impl - size_type size() const BOOST_NOEXCEPT - { - BOOST_IF_CONSTEXPR(constant_time_size) -- return this->priv_size_traits().get_size(); -+ return this->priv_size_count(); - else{ - std::size_t len = 0; - std::size_t bucket_cnt = this->bucket_count(); -@@ -2798,7 +2853,7 @@ class hashtable_impl - //! After a successful rehashing insert_commit_data remains valid. - iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT - { -- this->priv_size_traits().increment(); -+ this->priv_size_inc(); - node_ptr const n = this->priv_value_to_node_ptr(value); - BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || slist_node_algorithms::unique(n)); - node_functions_t::store_hash(n, commit_data.get_hash(), store_hash_t()); -@@ -2890,7 +2945,7 @@ class hashtable_impl - //Get the bucket number and local iterator for both iterators - const bucket_ptr bp = this->priv_get_bucket_ptr(i); - this->priv_erase_node(*bp, i.slist_it(), this->make_node_disposer(disposer), optimize_multikey_t()); -- this->priv_size_traits().decrement(); -+ this->priv_size_dec(); - this->priv_erasure_update_cache(bp); - } - -@@ -2931,7 +2986,7 @@ class hashtable_impl - size_type const num_erased = (size_type)this->priv_erase_node_range - ( before_first_local_it, first_bucket_num, last_local_it, last_bucket_num - , this->make_node_disposer(disposer), optimize_multikey_t()); -- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-num_erased)); -+ this->priv_size_count(size_type(this->priv_size_count()-num_erased)); - this->priv_erasure_update_cache_range(first_bucket_num, last_bucket_num); - } - } -@@ -3001,7 +3056,7 @@ class hashtable_impl - (this->priv_value_from_siterator(it), h, key, equal_func, compare_hash_t())); - slist_node_algorithms::unlink_after_and_dispose(prev.pointed_node(), it.pointed_node(), this->make_node_disposer(disposer)); - } -- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-cnt)); -+ this->priv_size_count(size_type(this->priv_size_count()-cnt)); - this->priv_erasure_update_cache(); - } - -@@ -3020,7 +3075,7 @@ class hashtable_impl - void clear() BOOST_NOEXCEPT - { - this->priv_clear_buckets_and_cache(); -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - } - - //! Requires: Disposer::operator()(pointer) shouldn't throw. -@@ -3045,7 +3100,7 @@ class hashtable_impl - --num_buckets; - slist_node_algorithms::detach_and_dispose(b->get_node_ptr(), d); - } -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - } - this->priv_init_cache(); - } -@@ -3339,7 +3394,7 @@ class hashtable_impl - //! - //! Note: the return value is in the range [0, this->bucket_count()). - BOOST_INTRUSIVE_FORCEINLINE size_type bucket(const key_type& k) const -- { return this->bucket(k, this->priv_hasher()); } -+ { return this->priv_hash_to_nbucket(this->priv_hash(k)); } - - //! Requires: "hash_func" must be a hash function that induces - //! the same hash values as the stored hasher. The difference is that -@@ -3520,7 +3575,7 @@ class hashtable_impl - if((ret = split_idx < bucket_cnt)){ - const std::size_t bucket_to_rehash = split_idx - bucket_cnt/2u; - bucket_type &old_bucket = this->priv_bucket(bucket_to_rehash); -- this->priv_split_traits().increment(); -+ this->inc_split_count(); - - //Anti-exception stuff: if an exception is thrown while - //moving elements from old_bucket to the target bucket, all moved -@@ -3553,7 +3608,7 @@ class hashtable_impl - bucket_type &target_bucket = this->priv_bucket(target_bucket_num); - bucket_type &source_bucket = this->priv_bucket(split_idx-1u); - slist_node_algorithms::transfer_after(target_bucket.get_node_ptr(), source_bucket.get_node_ptr()); -- this->priv_split_traits().decrement(); -+ this->dec_split_count(); - this->priv_insertion_update_cache(target_bucket_num); - } - return ret; -@@ -3763,8 +3818,8 @@ class hashtable_impl - ArrayDisposer rollback2(old_buckets[0], nd, old_bucket_count); - - //Put size in a safe value for rollback exception -- size_type const size_backup = this->priv_size_traits().get_size(); -- this->priv_size_traits().set_size(0); -+ size_type const size_backup = this->priv_size_count(); -+ this->priv_size_count(0); - //Put cache to safe position - this->priv_init_cache(); - this->priv_unset_sentinel_bucket(); -@@ -3826,8 +3881,8 @@ class hashtable_impl - } - } - -- this->priv_size_traits().set_size(size_backup); -- this->priv_split_traits().set_size(split); -+ this->priv_size_count(size_backup); -+ this->split_count(split); - if(&new_bucket_traits != &this->priv_bucket_traits()) - this->priv_bucket_traits() = new_bucket_traits; - this->priv_set_sentinel_bucket(); -@@ -3927,8 +3982,8 @@ class hashtable_impl - this->priv_hasher() = src.priv_hasher(); - this->priv_equal() = src.priv_equal(); - rollback.release(); -- this->priv_size_traits().set_size(src.priv_size_traits().get_size()); -- this->priv_split_traits().set_size(dst_bucket_count); -+ this->priv_size_count(src.priv_size_count()); -+ this->split_count(dst_bucket_count); - this->priv_set_cache_bucket_num(0u); - this->priv_erasure_update_cache(); - } -@@ -3946,7 +4001,7 @@ class hashtable_impl - , n, optimize_multikey_t()); - //Update cache and increment size if needed - this->priv_insertion_update_cache(bucket_num); -- this->priv_size_traits().increment(); -+ this->priv_size_inc(); - slist_node_algorithms::link_after(prev.pointed_node(), n); - return this->build_iterator(siterator(n), this->priv_bucket_ptr(bucket_num)); - } --- -2.34.1 - diff --git a/package/boost/Config.in b/package/boost/Config.in index b99b01f22e..614a71abb0 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -341,6 +341,19 @@ config BR2_PACKAGE_BOOST_TYPE_ERASURE comment "boost-type_erasure needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +config BR2_PACKAGE_BOOST_URL + bool "boost-url" + help + Boost.URL is a portable C++ library which provides containers + and algorithms which model a "URL," more formally described + using the Uniform Resource Identifier (URI) specification. + + This library understands the grammars related to URLs and + provides functionality to validate, parse, examine, and + modify urls, and apply normalization or resolution algorithms. + + To use the library "header-only" this option is not needed. + config BR2_PACKAGE_BOOST_WAVE bool "boost-wave" # limitation of assembler for coldfire diff --git a/package/boost/boost.hash b/package/boost/boost.hash index ab54a4b2fc..ebecc7ddc4 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From https://www.boost.org/users/history/version_1_80_0.html -sha256 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 boost_1_80_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_81_0.html +sha256 71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa boost_1_81_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/boost/boost.mk b/package/boost/boost.mk index bd1d329982..b6e09f777d 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.80.0 +BOOST_VERSION = 1.81.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES @@ -18,7 +18,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ contract container coroutine date_time exception fiber filesystem graph \ graph_parallel iostreams json locale log math mpi nowide program_options \ python random serialization stacktrace test thread timer \ - type_erasure wave) + type_erasure url wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) @@ -50,6 +50,7 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,type_erasure) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,url) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave) BOOST_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) -- 2.34.1 From peter at korsgaard.com Fri Feb 10 11:45:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 12:45:24 +0100 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: Build with ninja In-Reply-To: (John Keeping's message of "Fri, 10 Feb 2023 11:17:33 +0000") References: <20230209170707.4066903-1-peter@korsgaard.com> Message-ID: <87fsbdg2wb.fsf@dell.be.48ers.dk> >>>>> "John" == John Keeping writes: > Hi Peter, > On Thu, Feb 09, 2023 at 06:07:05PM +0100, Peter Korsgaard wrote: >> +define WEBKITGTK_BUILD_CMDS >> + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) >> +endef >> + >> +define WEBKITGTK_INSTALL_STAGING_CMDS >> + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) >> +endef >> + >> +define WEBKITGTK_INSTALL_TARGET_CMDS >> + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) >> +endef >> + > Would it make sense to apply these changes in pkg-cmake.mk? > Using `cmake --build` and `cmake --install` works with all generators > and it would avoid needing to repeat this block for both of the packages > in this series. Longer term that is indeed the direction we want to move to (and generally build cmake packages with the ninja backend). This is meant as a minimal patch that is easy to backport to the stable branches. We have a number of cmake packages that use custom FOO_MAKE_OPTS, how are those passed to make when using cmake --build / --install? -- Bye, Peter Korsgaard From d.lang at abatec.at Fri Feb 10 12:28:23 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 10 Feb 2023 12:28:23 +0000 Subject: [Buildroot] [PATCH] package/boost: bump to version 1.81.0 In-Reply-To: <20230210113931.4055853-1-buildroot@heine.tech> References: <20230210113931.4055853-1-buildroot@heine.tech> Message-ID: Hi Michael, I found a typo. > - add option for new library "url" > - drop upstreamed patch > > Signed-off-by: Michael Nosthoff > > --- > > compile tested defconfigs: > > BR2_arm=y > BR2_cortex_a15=y > BR2_ARM_FPU_NEON=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_PACKAGE_CC_TOOL=y > BR2_PACKAGE_LIBUBOOTENV=y > BR2_PACKAGE_BOTAN=y > BR2_PACKAGE_UHD=y > BR2_PACKAGE_LOG4CXX=y > BR2_PACKAGE_LIBCPPRESTSDK=y > BR2_PACKAGE_BOOST_CONTRACT=y > BR2_PACKAGE_BOOST_COROUTINE=y > BR2_PACKAGE_BOOST_EXCEPTION=y > BR2_PACKAGE_BOOST_FIBER=y > BR2_PACKAGE_BOOST_GRAPH=y > BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y > BR2_PACKAGE_BOOST_IOSTREAMS=y > BR2_PACKAGE_BOOST_JSON=y > BR2_PACKAGE_BOOST_LOCALE=y > BR2_PACKAGE_BOOST_LOG=y > BR2_PACKAGE_BOOST_MPI=y > BR2_PACKAGE_BOOST_NOWIDE=y > BR2_PACKAGE_BOOST_STACKTRACE=y > BR2_PACKAGE_BOOST_TEST=y > BR2_PACKAGE_BOOST_TYPE_ERASURE=y > BR2_PACKAGE_BOOST_URL=y > BR2_PACKAGE_BOOST_WAVE=y > BR2_PACKAGE_BITCOIN=y > BR2_PACKAGE_I2PD=y > > BR2_aarch64=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_PACKAGE_QT5=y > BR2_PACKAGE_PULSEVIEW=y > BR2_PACKAGE_GNURADIO=y > > BR2_sh=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE=y > BR2_PACKAGE_BOOST=y > BR2_PACKAGE_BOOST_CONTRACT=y > BR2_PACKAGE_BOOST_EXCEPTION=y > BR2_PACKAGE_BOOST_GRAPH=y > BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y > BR2_PACKAGE_BOOST_IOSTREAMS=y > BR2_PACKAGE_BOOST_JSON=y > BR2_PACKAGE_BOOST_LOCALE=y > BR2_PACKAGE_BOOST_LOG=y > BR2_PACKAGE_BOOST_MATH=y > BR2_PACKAGE_BOOST_MPI=y > BR2_PACKAGE_BOOST_NOWIDE=y > BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y > BR2_PACKAGE_BOOST_RANDOM=y > BR2_PACKAGE_BOOST_SERIALIZATION=y > BR2_PACKAGE_BOOST_STACKTRACE=y > BR2_PACKAGE_BOOST_TEST=y > BR2_PACKAGE_BOOST_TYPE_ERASURE=y > BR2_PACKAGE_BOOST_URL=y > BR2_PACKAGE_BOOST_WAVE=y > > BR2_x86_64=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_PACKAGE_BOOST=y > BR2_PACKAGE_BOOST_CONTRACT=y > BR2_PACKAGE_BOOST_COROUTINE=y > BR2_PACKAGE_BOOST_EXCEPTION=y > BR2_PACKAGE_BOOST_FIBER=y > BR2_PACKAGE_BOOST_GRAPH=y > BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y > BR2_PACKAGE_BOOST_IOSTREAMS=y > BR2_PACKAGE_BOOST_JSON=y > BR2_PACKAGE_BOOST_LOCALE=y > BR2_PACKAGE_BOOST_LOG=y > BR2_PACKAGE_BOOST_MATH=y > BR2_PACKAGE_BOOST_MPI=y > BR2_PACKAGE_BOOST_NOWIDE=y > BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y > BR2_PACKAGE_BOOST_RANDOM=y > BR2_PACKAGE_BOOST_SERIALIZATION=y > BR2_PACKAGE_BOOST_STACKTRACE=y > BR2_PACKAGE_BOOST_TEST=y > BR2_PACKAGE_BOOST_TYPE_ERASURE=y > BR2_PACKAGE_BOOST_URL=y > BR2_PACKAGE_BOOST_WAVE=y > --- > ?.../0001-Improve-modfunc-performance.patch??? | 551 ------------------ > ?package/boost/Config.in?????????????????????? |? 13 + > ?package/boost/boost.hash????????????????????? |?? 4 +- > ?package/boost/boost.mk??????????????????????? |?? 5 +- > ?4 files changed, 18 insertions(+), 555 deletions(-) > ?delete mode 100644 package/boost/0001-Improve-modfunc-performance.patch SNIP] > diff --git a/package/boost/Config.in b/package/boost/Config.in > index b99b01f22e..614a71abb0 100644 > --- a/package/boost/Config.in > +++ b/package/boost/Config.in > @@ -341,6 +341,19 @@ config BR2_PACKAGE_BOOST_TYPE_ERASURE > ?comment "boost-type_erasure needs a toolchain not affected by GCC bug 64735" > ???????? depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 > ? > +config BR2_PACKAGE_BOOST_URL > +?????? bool "boost-url" > +?????? help > +?????????????? Boost.URL is a portable C++ library which provides containers > +?????????????? and algorithms which model a "URL," more formally described > +?????????????? using the Uniform Resource Identifier (URI) specification. > + > +?????????????? This library understands the grammars related to URLs and > +?????????????? provides functionality to validate, parse, examine, and > +?????????????? modify urls, and apply normalization or resolution algorithms. > + > +?????????????? To use the library "header-only" this option is not needed. > + > ?config BR2_PACKAGE_BOOST_WAVE > ???????? bool "boost-wave" > ???????? # limitation of assembler for coldfire > diff --git a/package/boost/boost.hash b/package/boost/boost.hash > index ab54a4b2fc..ebecc7ddc4 100644 > --- a/package/boost/boost.hash > +++ b/package/boost/boost.hash > @@ -1,5 +1,5 @@ > -# From https://eur06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.boost.org%2Fusers%2Fhistory%2Fversion_1_80_0.html&data=05%7C01%7Cd.lang%40abatec.at%7C64e3321b5ea444a92e6808db0b5b9968%7C8814618e1e364349bccb87b9400379c3%7C0%7C0%7C638116260282315654%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=PK9H%2FdA%2Bj%2BvWN%2BZ3uuweEBL1JzHqihlV1rnN%2FfiQtlI%3D&reserved=0 > -sha256? 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0? boost_1_80_0.tar.bz2 > +# From https://eur06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.boost.org%2Fusers%2Fhistory%2Fversion_1_81_0.html&data=05%7C01%7Cd.lang%40abatec.at%7C64e3321b5ea444a92e6808db0b5b9968%7C8814618e1e364349bccb87b9400379c3%7C0%7C0%7C638116260282315654%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=j%2FvZdH%2B6pdOPSFMblgZHiwJ4otDU6EG7EEWkZOiMf6E%3D&reserved=0 > +sha256? 71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa? boost_1_81_0.tar.bz2 > ? > ?# Locally computed > ?sha256? c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566? LICENSE_1_0.txt > diff --git a/package/boost/boost.mk b/package/boost/boost.mk > index bd1d329982..b6e09f777d 100644 > --- a/package/boost/boost.mk > +++ b/package/boost/boost.mk > @@ -4,7 +4,7 @@ > ?# > ?################################################################################ > ? > -BOOST_VERSION = 1.80.0 > +BOOST_VERSION = 1.81.0 > ?BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 > ?BOOST_SITE = https://eur06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fboostorg.jfrog.io%2Fartifactory%2Fmain%2Frelease%2F%24&data=05%7C01%7Cd.lang%40abatec.at%7C64e3321b5ea444a92e6808db0b5b9968%7C8814618e1e364349bccb87b9400379c3%7C0%7C0%7C638116260282315654%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=Q9MAU7nlmViY0%2FbwW5ZMN2rZBOI%2FB29Q74siHQC9Kl4%3D&reserved=0(BOOST_VERSION)/source > ?BOOST_INSTALL_STAGING = YES > @@ -18,7 +18,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ > ???????? contract container coroutine date_time exception fiber filesystem graph \ > ???????? graph_parallel iostreams json locale log math mpi nowide program_options \ > ???????? python random serialization stacktrace test thread timer \ > -?????? type_erasure wave) > +?????? type_erasure url wave) > ? > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) > @@ -50,6 +50,7 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test) > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread) > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer) > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,type_erasure) > +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,url) I think this line is supposed to be BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_URL),,url) > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave) > ? > ?BOOST_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) > -- > 2.34.1 Regards Daniel From buildroot at heine.tech Fri Feb 10 13:01:35 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Fri, 10 Feb 2023 14:01:35 +0100 Subject: [Buildroot] =?utf-8?q?=5BPATCH=5D_package/boost=3A_bump_to_versi?= =?utf-8?b?b24gMS44MS4w?= In-Reply-To: Message-ID: <42-63e64000-3-6e1e6e80@264880303> Hi Daniel, On Friday, February 10, 2023 13:28 CET, Lang Daniel wrote: > Hi Michael, > > ?BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,type_erasure) > > +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,url) > > I think this line is supposed to be > > BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_URL),,url) yikes, you are right. moved this patch from a different system and somehow forgot this string. thanks for finding! I'll resubmit. Regards, Michael From buildroot at heine.tech Fri Feb 10 13:01:45 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Fri, 10 Feb 2023 14:01:45 +0100 Subject: [Buildroot] [PATCH v2] package/boost: bump to version 1.81.0 Message-ID: <20230210130145.4063383-1-buildroot@heine.tech> - add option for new library "url" - drop upstreamed patch Signed-off-by: Michael Nosthoff --- V2: use correct flag for boost-url compile tested defconfigs: BR2_arm=y BR2_cortex_a15=y BR2_ARM_FPU_NEON=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_PACKAGE_CC_TOOL=y BR2_PACKAGE_LIBUBOOTENV=y BR2_PACKAGE_BOTAN=y BR2_PACKAGE_UHD=y BR2_PACKAGE_LOG4CXX=y BR2_PACKAGE_LIBCPPRESTSDK=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_COROUTINE=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_FIBER=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y BR2_PACKAGE_BITCOIN=y BR2_PACKAGE_I2PD=y BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_QT5=y BR2_PACKAGE_PULSEVIEW=y BR2_PACKAGE_GNURADIO=y BR2_sh=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE=y BR2_PACKAGE_BOOST=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MATH=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y BR2_PACKAGE_BOOST_RANDOM=y BR2_PACKAGE_BOOST_SERIALIZATION=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y BR2_x86_64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_BOOST=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_COROUTINE=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_FIBER=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MATH=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y BR2_PACKAGE_BOOST_RANDOM=y BR2_PACKAGE_BOOST_SERIALIZATION=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y --- .../0001-Improve-modfunc-performance.patch | 551 ------------------ package/boost/Config.in | 13 + package/boost/boost.hash | 4 +- package/boost/boost.mk | 5 +- 4 files changed, 18 insertions(+), 555 deletions(-) delete mode 100644 package/boost/0001-Improve-modfunc-performance.patch diff --git a/package/boost/0001-Improve-modfunc-performance.patch b/package/boost/0001-Improve-modfunc-performance.patch deleted file mode 100644 index a34d6bb4d5..0000000000 --- a/package/boost/0001-Improve-modfunc-performance.patch +++ /dev/null @@ -1,551 +0,0 @@ -From 825aedad557b7e3bb27614335b6ced16887103de Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= -Date: Mon, 7 Nov 2022 00:16:44 +0100 -Subject: [PATCH] Improve "modfunc" performance Fixes #79 - ("boost/intrusive/hashtable.hpp: build failure (undeclared indentifier)") - -Backport from Boost development branch to fix issues with some architectures -(64-bit with 128-bit processing, where size_t != unsigned long). In this case, -code is enabled that causes a build failure. - -Upstream: https://github.com/boostorg/intrusive/commit/825aedad557b7e3bb27614335b6ced16887103de -Issue: https://github.com/boostorg/intrusive/issues/79 -Fixes: http://autobuild.buildroot.net/results/6cb/6cbc0672f3c5046405793d8cdc8f961d2ffb1d3e - -Signed-off-by: Andreas Ziegler ---- - include/boost/intrusive/hashtable.hpp | 235 ++++++++++++++++---------- - 1 file changed, 145 insertions(+), 90 deletions(-) - -diff --git a/include/boost/intrusive/hashtable.hpp b/include/boost/intrusive/hashtable.hpp -index b8bc877..688fb9b 100644 ---- a/boost/intrusive/hashtable.hpp -+++ b/boost/intrusive/hashtable.hpp -@@ -2,6 +2,7 @@ - // - // (C) Copyright Ion Gaztanaga 2006-2022 - // (C) Copyright 2022 Joaquin M Lopez Munoz. -+// (C) Copyright 2022 Christian Mazakas - // - // Distributed under the Boost Software License, Version 1.0. - // (See accompanying file LICENSE_1_0.txt or copy at -@@ -84,11 +85,6 @@ namespace intrusive { - - /// @cond - --#if !defined(BOOST_NO_INT64_T)&&\ -- (defined(BOOST_HAS_INT128) || (defined(_MSC_VER) && defined(_WIN64))) --#define BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT --#endif -- - //We only support LLP64(Win64) or LP64(most Unix) data models - #ifdef _WIN64 //In 64 bit windows sizeof(size_t) == sizeof(unsigned long long) - # define BOOST_INTRUSIVE_SIZE_C(NUMBER) NUMBER##ULL -@@ -98,7 +94,6 @@ namespace intrusive { - # define BOOST_INTRUSIVE_64_BIT_SIZE_T (((((ULONG_MAX>>16)>>16)>>16)>>15) != 0) - #endif - -- - template - struct prime_list_holder - { -@@ -167,11 +162,11 @@ struct prime_list_holder - { return prime_list[std::ptrdiff_t(n)]; } - - template -- BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % prime_list[SizeIndex]; } -+ BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % SizeIndex; } - - static std::size_t(*const positions[])(std::size_t); - -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T - static const uint64_t inv_sizes32[]; - static const std::size_t inv_sizes32_size; - #endif -@@ -185,17 +180,20 @@ struct prime_list_holder - BOOST_INTRUSIVE_FORCEINLINE static std::size_t size(std::size_t size_index) - { return prime_list_holder<>::size_from_index(size_index); } - -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T - // https://github.com/lemire/fastmod - -- - BOOST_INTRUSIVE_FORCEINLINE static uint64_t mul128_u32(uint64_t lowbits, uint32_t d) - { - #if defined(_MSC_VER) -- return __umulh(lowbits, d); -+ return __umulh(lowbits, d); -+ #elif defined(BOOST_HAS_INT128) -+ return static_cast((uint128_type(lowbits) * d) >> 64); - #else -- __extension__ typedef unsigned __int128 ext_uint128_t; -- return (ext_uint128_t(lowbits) * d) >> 64; -+ uint64_t r1 = (lowbits & UINT32_MAX) * d; -+ uint64_t r2 = (lowbits >> 32) * d; -+ r2 += r1 >> 32; -+ return r2 >> 32; - #endif - } - -@@ -204,51 +202,67 @@ struct prime_list_holder - uint64_t lowbits = M * a; - return (uint32_t)(mul128_u32(lowbits, d)); - } -- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - - BOOST_INTRUSIVE_FORCEINLINE static std::size_t position(std::size_t hash,std::size_t size_index) - { -- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) && BOOST_INTRUSIVE_64_BIT_SIZE_T -- const std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); -+ #if BOOST_INTRUSIVE_64_BIT_SIZE_T -+ BOOST_CONSTEXPR_OR_CONST std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); - if(BOOST_LIKELY(size_index < sizes_under_32bit)){ - return fastmod_u32( uint32_t(hash)+uint32_t(hash>>32) - , inv_sizes32[size_index] - , uint32_t(prime_list[size_index]) ); - } - else{ -- return positions[size_index-sizes_under_32bit](hash); -+ return positions[size_index](hash); - } -- #elif defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -- return fastmod_u32(hash, inv_sizes32[size_index], uint32_t(sizes[size_index])); - #else - return positions[size_index](hash); -- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - } - }; - - template - std::size_t(* const prime_list_holder::positions[])(std::size_t) = - { -- #if !defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -- modfunc< 0>,modfunc< 1>,modfunc< 2>,modfunc< 3>,modfunc< 4>, -- modfunc< 5>,modfunc< 6>,modfunc< 7>,modfunc< 8>,modfunc< 9>, -- modfunc<10>,modfunc<11>,modfunc<12>,modfunc<13>,modfunc<14>, -- modfunc<15>,modfunc<16>,modfunc<17>,modfunc<18>,modfunc<19>, -- modfunc<20>,modfunc<21>,modfunc<22>,modfunc<23>,modfunc<24>, -- modfunc<25>,modfunc<26>,modfunc<27>,modfunc<28>,modfunc<29>, -- modfunc<30>, -- #endif -- # if BOOST_INTRUSIVE_64_BIT_SIZE_T -- modfunc<31>,modfunc<32>,modfunc<33>,modfunc<34>, -- modfunc<35>,modfunc<36>,modfunc<37>,modfunc<38>,modfunc<39>, -- modfunc<40>,modfunc<41>,modfunc<42>,modfunc<43>,modfunc<44>, -- modfunc<45>,modfunc<46>,modfunc<47>,modfunc<48>,modfunc<49>, -- modfunc<50>,modfunc<51>,modfunc<52>,modfunc<53>,modfunc<54>, -- modfunc<55>,modfunc<56>,modfunc<57>,modfunc<58>,modfunc<59>, -- modfunc<60>,modfunc<61>,modfunc<62>,modfunc<63> -- # else -- modfunc<31> -- # endif -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, //0-30 indexes -+#if BOOST_INTRUSIVE_64_BIT_SIZE_T -+ //Taken from Boost.MultiIndex code, thanks to Joaquin M. Lopez Munoz. -+ modfunc, //<- 32 bit values stop here (index 31) -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc, -+ modfunc, modfunc //(index 63) -+#else -+ modfunc //<- 32 bit stops here (index 31) as ptrdiff_t is signed -+#endif - }; - - template -@@ -298,7 +312,7 @@ const std::size_t prime_list_holder::prime_list_size - = sizeof(prime_list) / sizeof(std::size_t); - - --#if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+#if BOOST_INTRUSIVE_64_BIT_SIZE_T - - template - const uint64_t prime_list_holder::inv_sizes32[] = { -@@ -340,7 +354,7 @@ template - const std::size_t prime_list_holder::inv_sizes32_size - = sizeof(inv_sizes32) / sizeof(uint64_t); - --#endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) -+#endif // BOOST_INTRUSIVE_64_BIT_SIZE_T - - struct prime_fmod_size : prime_list_holder<> - { -@@ -785,9 +799,9 @@ BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_va - } - - template //fastmod_buckets --BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t bucket_cnt, std::size_t split, detail::true_) -+BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t , std::size_t split, detail::true_) - { -- return prime_fmod_size::position(hash_value, split); (void)bucket_cnt; -+ return prime_fmod_size::position(hash_value, split); - } - - //!This metafunction will obtain the type of a bucket -@@ -1473,6 +1487,10 @@ struct bucket_hash_t - , bucket_plus_vtraits_t(BOOST_MOVE_BASE(bucket_plus_vtraits_t, other)) - {} - -+ template -+ BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_hash(const K &k) const -+ { return this->base_t::operator()(k); } -+ - BOOST_INTRUSIVE_FORCEINLINE const hasher &priv_hasher() const - { return this->base_t::get(); } - -@@ -1747,8 +1765,17 @@ struct hashtable_size_wrapper - typedef const size_traits & size_traits_const_t; - typedef size_traits & size_traits_t; - -- BOOST_INTRUSIVE_FORCEINLINE size_traits_const_t priv_size_traits() const -- { return size_traits_; } -+ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const -+ { return size_traits_.get_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType s) -+ { size_traits_.set_size(s); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() -+ { size_traits_.increment(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() -+ { size_traits_.decrement(); } - - BOOST_INTRUSIVE_FORCEINLINE size_traits_t priv_size_traits() - { return size_traits_; } -@@ -1780,7 +1807,19 @@ struct hashtable_size_wrapper - typedef size_traits size_traits_const_t; - typedef size_traits size_traits_t; - -- BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() const -+ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const -+ { return 0u; } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType) -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() -+ {} -+ -+ BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() - { return size_traits(); } - }; - -@@ -1815,14 +1854,14 @@ struct hashdata_internal - public: - static const bool linear_buckets = 0 != (BoolFlags & hash_bool_flags::linear_buckets_pos); - typedef typename get_hashtable_size_wrapper_bucket -- ::type internal_type; -- -- typedef typename internal_type::key_equal key_equal; -- typedef typename internal_type::hasher hasher; -+ ::type split_bucket_hash_equal_t; -+ -+ typedef typename split_bucket_hash_equal_t::key_equal key_equal; -+ typedef typename split_bucket_hash_equal_t::hasher hasher; - typedef bucket_plus_vtraits - bucket_plus_vtraits_t; - typedef SizeType size_type; -- typedef typename internal_type::size_traits split_traits; -+ typedef typename split_bucket_hash_equal_t::size_traits split_traits; - typedef typename bucket_plus_vtraits_t::bucket_ptr bucket_ptr; - typedef typename bucket_plus_vtraits_t::const_value_traits_ptr const_value_traits_ptr; - typedef typename bucket_plus_vtraits_t::siterator siterator; -@@ -1866,23 +1905,20 @@ struct hashdata_internal - - hashdata_internal( const ValueTraits &val_traits, const bucket_traits &b_traits - , const hasher & h, const key_equal &e) -- : internal_type(val_traits, b_traits, h, e) -+ : split_bucket_hash_equal_t(val_traits, b_traits, h, e) - {} - - BOOST_INTRUSIVE_FORCEINLINE hashdata_internal(BOOST_RV_REF(hashdata_internal) other) -- : internal_type(BOOST_MOVE_BASE(internal_type, other)) -+ : split_bucket_hash_equal_t(BOOST_MOVE_BASE(split_bucket_hash_equal_t, other)) - {} - -- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_t priv_split_traits() -- { return this->priv_size_traits(); } -- -- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_const_t priv_split_traits() const -+ BOOST_INTRUSIVE_FORCEINLINE typename split_bucket_hash_equal_t::size_traits_t priv_split_traits() - { return this->priv_size_traits(); } - - ~hashdata_internal() - { this->priv_clear_buckets(); } - -- using internal_type::priv_clear_buckets; -+ using split_bucket_hash_equal_t::priv_clear_buckets; - - void priv_clear_buckets() - { -@@ -1907,7 +1943,17 @@ struct hashdata_internal - - //public functions - BOOST_INTRUSIVE_FORCEINLINE SizeType split_count() const BOOST_NOEXCEPT -- { return this->priv_split_traits().get_size(); } -+ { return this->split_bucket_hash_equal_t::get_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void split_count(SizeType s) BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::set_hashtable_size_wrapper_size(s); } -+ -+ //public functions -+ BOOST_INTRUSIVE_FORCEINLINE void inc_split_count() BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::inc_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void dec_split_count() BOOST_NOEXCEPT -+ { this->split_bucket_hash_equal_t::dec_hashtable_size_wrapper_size(); } - - BOOST_INTRUSIVE_FORCEINLINE static SizeType initial_split_from_bucket_count(SizeType bc) BOOST_NOEXCEPT - { -@@ -1983,10 +2029,7 @@ struct hashdata_internal - { return (priv_hash_to_nbucket)(hash_value, fastmod_buckets_t()); } - - BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::true_) const //fastmod_buckets_t -- { -- return static_cast(hash_to_bucket_split -- (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::true_())); -- } -+ { return static_cast(prime_fmod_size::position(hash_value, this->split_count())); } - - BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::false_) const //!fastmod_buckets_t - { -@@ -1994,7 +2037,6 @@ struct hashdata_internal - (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::false_())); - } - -- - BOOST_INTRUSIVE_FORCEINLINE iterator iterator_to(reference value, detail::false_) BOOST_NOEXCEPT - { - return iterator( siterator(this->priv_value_to_node_ptr(value)) -@@ -2083,8 +2125,8 @@ struct hashdata_internal - , this->priv_value_traits_ptr()); - } - -- using internal_type::end; -- using internal_type::cend; -+ using split_bucket_hash_equal_t::end; -+ using split_bucket_hash_equal_t::cend; - - local_iterator end(size_type n) BOOST_NOEXCEPT - { return local_iterator(this->priv_bucket_lend(n), this->priv_value_traits_ptr()); } -@@ -2322,19 +2364,32 @@ class hashtable_impl - public: - typedef insert_commit_data_impl insert_commit_data; - -+ private: - void default_init_actions() - { - this->priv_set_sentinel_bucket(); - this->priv_init_buckets_and_cache(); -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - size_type bucket_sz = this->bucket_count(); - BOOST_INTRUSIVE_INVARIANT_ASSERT(bucket_sz != 0); - //Check power of two bucket array if the option is activated - BOOST_INTRUSIVE_INVARIANT_ASSERT - (!power_2_buckets || (0 == (bucket_sz & (bucket_sz - 1)))); -- this->priv_split_traits().set_size(this->initial_split_from_bucket_count(bucket_sz)); -+ this->split_count(this->initial_split_from_bucket_count(bucket_sz)); - } - -+ BOOST_INTRUSIVE_FORCEINLINE SizeType priv_size_count() const BOOST_NOEXCEPT -+ { return this->internal_type::get_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_count(SizeType s) BOOST_NOEXCEPT -+ { this->internal_type::set_hashtable_size_wrapper_size(s); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_inc() BOOST_NOEXCEPT -+ { this->internal_type::inc_hashtable_size_wrapper_size(); } -+ -+ BOOST_INTRUSIVE_FORCEINLINE void priv_size_dec() BOOST_NOEXCEPT -+ { this->internal_type::dec_hashtable_size_wrapper_size(); } -+ - public: - - //! Requires: buckets must not be being used by any other resource. -@@ -2403,10 +2458,10 @@ class hashtable_impl - { - this->priv_swap_cache(x); - x.priv_init_cache(); -- this->priv_size_traits().set_size(x.priv_size_traits().get_size()); -- x.priv_size_traits().set_size(size_type(0)); -- this->priv_split_traits().set_size(x.split_count()); -- x.priv_split_traits().set_size(size_type(0)); -+ this->priv_size_count(x.priv_size_count()); -+ x.priv_size_count(size_type(0)); -+ this->split_count(x.split_count()); -+ x.split_count(size_type(0)); - } - - //! Effects: Equivalent to swap. -@@ -2524,7 +2579,7 @@ class hashtable_impl - size_type size() const BOOST_NOEXCEPT - { - BOOST_IF_CONSTEXPR(constant_time_size) -- return this->priv_size_traits().get_size(); -+ return this->priv_size_count(); - else{ - std::size_t len = 0; - std::size_t bucket_cnt = this->bucket_count(); -@@ -2798,7 +2853,7 @@ class hashtable_impl - //! After a successful rehashing insert_commit_data remains valid. - iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT - { -- this->priv_size_traits().increment(); -+ this->priv_size_inc(); - node_ptr const n = this->priv_value_to_node_ptr(value); - BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || slist_node_algorithms::unique(n)); - node_functions_t::store_hash(n, commit_data.get_hash(), store_hash_t()); -@@ -2890,7 +2945,7 @@ class hashtable_impl - //Get the bucket number and local iterator for both iterators - const bucket_ptr bp = this->priv_get_bucket_ptr(i); - this->priv_erase_node(*bp, i.slist_it(), this->make_node_disposer(disposer), optimize_multikey_t()); -- this->priv_size_traits().decrement(); -+ this->priv_size_dec(); - this->priv_erasure_update_cache(bp); - } - -@@ -2931,7 +2986,7 @@ class hashtable_impl - size_type const num_erased = (size_type)this->priv_erase_node_range - ( before_first_local_it, first_bucket_num, last_local_it, last_bucket_num - , this->make_node_disposer(disposer), optimize_multikey_t()); -- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-num_erased)); -+ this->priv_size_count(size_type(this->priv_size_count()-num_erased)); - this->priv_erasure_update_cache_range(first_bucket_num, last_bucket_num); - } - } -@@ -3001,7 +3056,7 @@ class hashtable_impl - (this->priv_value_from_siterator(it), h, key, equal_func, compare_hash_t())); - slist_node_algorithms::unlink_after_and_dispose(prev.pointed_node(), it.pointed_node(), this->make_node_disposer(disposer)); - } -- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-cnt)); -+ this->priv_size_count(size_type(this->priv_size_count()-cnt)); - this->priv_erasure_update_cache(); - } - -@@ -3020,7 +3075,7 @@ class hashtable_impl - void clear() BOOST_NOEXCEPT - { - this->priv_clear_buckets_and_cache(); -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - } - - //! Requires: Disposer::operator()(pointer) shouldn't throw. -@@ -3045,7 +3100,7 @@ class hashtable_impl - --num_buckets; - slist_node_algorithms::detach_and_dispose(b->get_node_ptr(), d); - } -- this->priv_size_traits().set_size(size_type(0)); -+ this->priv_size_count(size_type(0)); - } - this->priv_init_cache(); - } -@@ -3339,7 +3394,7 @@ class hashtable_impl - //! - //! Note: the return value is in the range [0, this->bucket_count()). - BOOST_INTRUSIVE_FORCEINLINE size_type bucket(const key_type& k) const -- { return this->bucket(k, this->priv_hasher()); } -+ { return this->priv_hash_to_nbucket(this->priv_hash(k)); } - - //! Requires: "hash_func" must be a hash function that induces - //! the same hash values as the stored hasher. The difference is that -@@ -3520,7 +3575,7 @@ class hashtable_impl - if((ret = split_idx < bucket_cnt)){ - const std::size_t bucket_to_rehash = split_idx - bucket_cnt/2u; - bucket_type &old_bucket = this->priv_bucket(bucket_to_rehash); -- this->priv_split_traits().increment(); -+ this->inc_split_count(); - - //Anti-exception stuff: if an exception is thrown while - //moving elements from old_bucket to the target bucket, all moved -@@ -3553,7 +3608,7 @@ class hashtable_impl - bucket_type &target_bucket = this->priv_bucket(target_bucket_num); - bucket_type &source_bucket = this->priv_bucket(split_idx-1u); - slist_node_algorithms::transfer_after(target_bucket.get_node_ptr(), source_bucket.get_node_ptr()); -- this->priv_split_traits().decrement(); -+ this->dec_split_count(); - this->priv_insertion_update_cache(target_bucket_num); - } - return ret; -@@ -3763,8 +3818,8 @@ class hashtable_impl - ArrayDisposer rollback2(old_buckets[0], nd, old_bucket_count); - - //Put size in a safe value for rollback exception -- size_type const size_backup = this->priv_size_traits().get_size(); -- this->priv_size_traits().set_size(0); -+ size_type const size_backup = this->priv_size_count(); -+ this->priv_size_count(0); - //Put cache to safe position - this->priv_init_cache(); - this->priv_unset_sentinel_bucket(); -@@ -3826,8 +3881,8 @@ class hashtable_impl - } - } - -- this->priv_size_traits().set_size(size_backup); -- this->priv_split_traits().set_size(split); -+ this->priv_size_count(size_backup); -+ this->split_count(split); - if(&new_bucket_traits != &this->priv_bucket_traits()) - this->priv_bucket_traits() = new_bucket_traits; - this->priv_set_sentinel_bucket(); -@@ -3927,8 +3982,8 @@ class hashtable_impl - this->priv_hasher() = src.priv_hasher(); - this->priv_equal() = src.priv_equal(); - rollback.release(); -- this->priv_size_traits().set_size(src.priv_size_traits().get_size()); -- this->priv_split_traits().set_size(dst_bucket_count); -+ this->priv_size_count(src.priv_size_count()); -+ this->split_count(dst_bucket_count); - this->priv_set_cache_bucket_num(0u); - this->priv_erasure_update_cache(); - } -@@ -3946,7 +4001,7 @@ class hashtable_impl - , n, optimize_multikey_t()); - //Update cache and increment size if needed - this->priv_insertion_update_cache(bucket_num); -- this->priv_size_traits().increment(); -+ this->priv_size_inc(); - slist_node_algorithms::link_after(prev.pointed_node(), n); - return this->build_iterator(siterator(n), this->priv_bucket_ptr(bucket_num)); - } --- -2.34.1 - diff --git a/package/boost/Config.in b/package/boost/Config.in index b99b01f22e..614a71abb0 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -341,6 +341,19 @@ config BR2_PACKAGE_BOOST_TYPE_ERASURE comment "boost-type_erasure needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +config BR2_PACKAGE_BOOST_URL + bool "boost-url" + help + Boost.URL is a portable C++ library which provides containers + and algorithms which model a "URL," more formally described + using the Uniform Resource Identifier (URI) specification. + + This library understands the grammars related to URLs and + provides functionality to validate, parse, examine, and + modify urls, and apply normalization or resolution algorithms. + + To use the library "header-only" this option is not needed. + config BR2_PACKAGE_BOOST_WAVE bool "boost-wave" # limitation of assembler for coldfire diff --git a/package/boost/boost.hash b/package/boost/boost.hash index ab54a4b2fc..ebecc7ddc4 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From https://www.boost.org/users/history/version_1_80_0.html -sha256 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 boost_1_80_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_81_0.html +sha256 71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa boost_1_81_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/boost/boost.mk b/package/boost/boost.mk index bd1d329982..ddc9283a19 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.80.0 +BOOST_VERSION = 1.81.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES @@ -18,7 +18,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ contract container coroutine date_time exception fiber filesystem graph \ graph_parallel iostreams json locale log math mpi nowide program_options \ python random serialization stacktrace test thread timer \ - type_erasure wave) + type_erasure url wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) @@ -50,6 +50,7 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,type_erasure) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_URL),,url) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave) BOOST_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) -- 2.34.1 From arnout at mind.be Fri Feb 10 13:12:23 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 10 Feb 2023 14:12:23 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: revert bpf_cookie patch to allow building In-Reply-To: <9a8b4ac5-6ffb-e8d8-3587-2768e004780e@synopsys.com> References: <97ea44bb-58fe-d6cb-6c79-9be0b245f2c6@synopsys.com> <29d2a8c7-44cd-da42-5fed-f17ec0f8ccf2@synopsys.com> <1750a14f-36a1-fe51-1452-3a72b84979c5@mind.be> <9a8b4ac5-6ffb-e8d8-3587-2768e004780e@synopsys.com> Message-ID: On 10/02/2023 10:17, Shahab Vahedi wrote: > On 2/9/23 21:27, Arnout Vandecappelle wrote: >> >> On 09/02/2023 13:23, Shahab Vahedi wrote: >>> >>> On 2/8/23 17:36, Arnout Vandecappelle wrote: >>>> >>>> It's not clear to me why you did a revert of the cookie feature rather than >>>> using those patches. I think the first two or three should be sufficient to >>>> fix your issue? >>> >>> Ideally, the correct way would be applying that pending series. But since >>> there were comments that some of the patches might need reworking [1], I did >> >> I don't see anything in that thread about rework being needed, only some >> complaints about some mail gateway encrypting messages so they can't be >> read by some recipients... > See this [1] and the response here [2]. Having read it again, apparently it is Ah, but I guessed that that patch was not relevant for the issue you are facing. I had the impression only the first two or three patches of the series are relevant. > not such a big deal. Alexander, the author, mentioned that he will redo that > part in v3 of the patch the way David suggested. So either, I can make that > change when submitting to Buildroot, or take it as it is. Your call. > > [1] > https://lore.kernel.org/bpf/20220421003152.339542-3-alobakin at pm.me/T/#m42db58567febf12040f6ba0478e1a6148c284c55 > > [2] > https://lore.kernel.org/bpf/20220421003152.339542-3-alobakin at pm.me/T/#m293896646128262621c83e8c15c4d977f92ad0d2 > >>> not feel confident to add them. Therefore, I tried to keep my solution minimal >>> and solve it by eliminating the problem. I know, it is not appealing. >> >> The problem with your patch is that it is very difficult to decide if it >> should be kept or not when bumping the version. Plus, some people (or other >> packages) may rely on the feature that you remove. > > I can try to apply that patch series on top of bpftool-v7.1.0-br1.tar.gz in > buildroot. If it can be done fairly easily, I will submit it on a different > thread. Thanks! Regards, Arnout From sebastian.weyer at smile.fr Fri Feb 10 13:17:28 2023 From: sebastian.weyer at smile.fr (Sebastian Weyer) Date: Fri, 10 Feb 2023 14:17:28 +0100 Subject: [Buildroot] [PATCH 1/1] configs/qemu: update defconfigs to Linux 6.1.11 Message-ID: <20230210131729.2577271-1-sebastian.weyer@smile.fr> Just updating all qemu defconfigs to the latest Kernel version: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=v6.1.11&dt=2 Signed-off-by: Sebastian Weyer --- configs/qemu_aarch64_ebbr_defconfig | 4 ++-- configs/qemu_aarch64_sbsa_defconfig | 4 ++-- configs/qemu_aarch64_virt_defconfig | 4 ++-- configs/qemu_arm_ebbr_defconfig | 4 ++-- configs/qemu_arm_versatile_defconfig | 4 ++-- configs/qemu_arm_vexpress_defconfig | 4 ++-- configs/qemu_arm_vexpress_tz_defconfig | 4 ++-- configs/qemu_m68k_mcf5208_defconfig | 4 ++-- configs/qemu_m68k_q800_defconfig | 4 ++-- configs/qemu_microblazebe_mmu_defconfig | 4 ++-- configs/qemu_microblazeel_mmu_defconfig | 4 ++-- configs/qemu_mips32r2_malta_defconfig | 4 ++-- configs/qemu_mips32r2el_malta_defconfig | 4 ++-- configs/qemu_mips32r6_malta_defconfig | 4 ++-- configs/qemu_mips32r6el_malta_defconfig | 4 ++-- configs/qemu_mips64_malta_defconfig | 4 ++-- configs/qemu_mips64el_malta_defconfig | 4 ++-- configs/qemu_mips64r6_malta_defconfig | 4 ++-- configs/qemu_mips64r6el_malta_defconfig | 4 ++-- configs/qemu_nios2_10m50_defconfig | 4 ++-- configs/qemu_or1k_defconfig | 4 ++-- configs/qemu_ppc64_e5500_defconfig | 4 ++-- configs/qemu_ppc64_pseries_defconfig | 4 ++-- configs/qemu_ppc64le_powernv8_defconfig | 4 ++-- configs/qemu_ppc64le_pseries_defconfig | 4 ++-- configs/qemu_ppc_bamboo_defconfig | 4 ++-- configs/qemu_ppc_e500mc_defconfig | 4 ++-- configs/qemu_ppc_g3beige_defconfig | 4 ++-- configs/qemu_ppc_mac99_defconfig | 4 ++-- configs/qemu_ppc_mpc8544ds_defconfig | 4 ++-- configs/qemu_riscv32_virt_defconfig | 4 ++-- configs/qemu_riscv64_nommu_virt_defconfig | 4 ++-- configs/qemu_riscv64_virt_defconfig | 4 ++-- configs/qemu_s390x_defconfig | 2 +- configs/qemu_sh4_r2d_defconfig | 4 ++-- configs/qemu_sh4eb_r2d_defconfig | 4 ++-- configs/qemu_sparc64_sun4u_defconfig | 4 ++-- configs/qemu_sparc_ss10_defconfig | 4 ++-- configs/qemu_x86_64_defconfig | 4 ++-- configs/qemu_x86_defconfig | 4 ++-- configs/qemu_xtensa_lx60_defconfig | 4 ++-- configs/qemu_xtensa_lx60_nommu_defconfig | 4 ++-- 42 files changed, 83 insertions(+), 83 deletions(-) diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index d293ad0e60..78bab2a933 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 609444e787..9e36b40867 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-sbsa/a BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-sbsa/genimage.cfg" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 03df0ad9e2..9bdf79c4f5 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" 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 diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index f3e2d42a54..53e2d5d1d7 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 4f43273a82..e61665a95e 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index 2c813456f4..b963862e2b 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -20,12 +20,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_TARGET_ROOTFS_EXT2_SIZE="64M" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 576c441154..01dce8f4ca 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -17,12 +17,12 @@ BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index 0490b9e29e..e30bc13ab7 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 30d8982db3..e089ff7864 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index 7bd2ae53b8..f4b53f7556 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index cd8c5a3cb2..8436a8b6f9 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index 49d84c308b..f22f1d168a 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 5363018c47..5b5d5fe44f 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index f77feb9b6d..e8457ab246 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index 575034441a..ad5003c25f 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index e9438fda1e..c201b9da28 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index 4b1c8e22af..f34d8a55b9 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 87ef7902af..500c69b7fb 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 5774207f65..1b0a14b6bf 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index 4b9c53e8de..f88e88f108 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index b3d9d79156..9faf0d174f 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -10,12 +10,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 6ad03c4c87..6ca1321751 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -12,12 +12,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 50844dc93b..a059631adf 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index f6a5c3d409..c380fe5205 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 7ce5a9d310..c3e14958ae 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index f4cc5589e7..6d26cf5105 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index 0a1877c44b..e0f886dda4 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -11,12 +11,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 1c11bcf77d..62e20e8120 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index 2331041c2a..0e8bd6a0c6 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -6,12 +6,12 @@ BR2_powerpc_7400=y BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index b9a0812d52..b54e7b7d81 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index f354e303e5..1a12ed6a65 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.43" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index ee70beb208..2894f1f78a 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -4,7 +4,7 @@ BR2_RISCV_64=y # BR2_RISCV_USE_MMU is not set # Linux headers same as kernel, a 5.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Busybox with hush BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_DEFCONFIG="nommu_virt" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index b3174a152c..d6ab8a33c1 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.43" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 6bbcca0896..cd160d9cf0 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -17,7 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index 0f12b7dfe9..c300490c55 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index d5ee371e79..9e61a6f234 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index 485b497e71..a19e146dfa 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 2ba04c0864..ee2b0a799b 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index cc505a8540..3608178f30 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 34b7e2d292..ac3ba1da12 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index cb78106091..e0ec91d2ac 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index 4be1b66edc..59c383fc40 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -20,12 +20,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -- 2.25.1 From peter at korsgaard.com Fri Feb 10 14:09:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:09:55 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used In-Reply-To: <20230208192425.GA2677@scaer> (Yann E. MORIN's message of "Wed, 8 Feb 2023 20:24:25 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208192425.GA2677@scaer> Message-ID: <87bkm1fw7g.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > On 2023-02-08 19:19 +0100, Peter Korsgaard spake thusly: >> Waf requires that the version of the waf script matches the version of >> waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as >> otherwise waf errors out with errors like: >> >> Waf script '2.0.24' and library '1.9.3' do not match >> >> Signed-off-by: Peter Korsgaard >> --- >> package/pkg-waf.mk | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk >> index e090afa9e6..a067e69c9b 100644 >> --- a/package/pkg-waf.mk >> +++ b/package/pkg-waf.mk >> @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) >> >> define inner-waf-package >> >> +# The version of waflib has to match with the version of waf, >> +# otherwise waf errors out with: >> +# Waf script 'X' and library 'Y' do not match >> +define WAF_PACKAGE_REMOVE_WAF_LIB >> + $(RM) -fr $(@D)/waf $(@D)/waflib >> +endef >> + >> # We need host-python3 to run waf >> $(2)_DEPENDENCIES += host-python3 >> >> @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO >> ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) >> $(2)_DEPENDENCIES += host-waf >> $(2)_WAF = $$(HOST_DIR)/bin/waf >> +$(2)_PRE_CONFIGURE_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB > It would make more sense to make that either a post-extract or a > post-patch hook. Committed after changing it to use a post-patch hook, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:11:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:11:26 +0100 Subject: [Buildroot] [PATCH 2/5] package/aubio: drop AUBIO_REMOVE_OLD_WAF hook In-Reply-To: <20230208181933.3925279-2-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 8 Feb 2023 19:19:29 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208181933.3925279-2-peter@korsgaard.com> Message-ID: <877cwpfw4x.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > As that is now handled by the waf-package infrastructure. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:11:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:11:31 +0100 Subject: [Buildroot] [PATCH 3/5] package/glmark2: use external waf In-Reply-To: <20230208181933.3925279-3-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 8 Feb 2023 19:19:30 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208181933.3925279-3-peter@korsgaard.com> Message-ID: <87357dfw4s.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/bbd/bbd90f11975b691f694412a6fc3446f37dd7c0aa/ > The bundled waf script is too old (1.9.3) for python >= 3.11 as it uses the > 'U' modifier to open (universal newlines), which have been deprecated since > python 3.3 and finally removed in 3.11. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:12:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:12:27 +0100 Subject: [Buildroot] [PATCH 2/5] package/aubio: drop AUBIO_REMOVE_OLD_WAF hook In-Reply-To: (Romain Naour's message of "Wed, 8 Feb 2023 22:08:08 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208181933.3925279-2-peter@korsgaard.com> Message-ID: <87y1p5ehis.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Le 08/02/2023 ? 19:19, Peter Korsgaard a ?crit?: >> As that is now handled by the waf-package infrastructure. >> >> Signed-off-by: Peter Korsgaard > Reviewed-by: Romain Naour >> --- >> package/aubio/aubio.mk | 6 ------ >> 1 file changed, 6 deletions(-) >> >> diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk >> index c995fdfac7..64174a113d 100644 >> --- a/package/aubio/aubio.mk >> +++ b/package/aubio/aubio.mk >> @@ -21,12 +21,6 @@ AUBIO_CONF_OPTS = \ >> # https://github.com/jackaudio/jack2/issues/898 >> AUBIO_NEEDS_EXTERNAL_WAF = YES >> >> -# The old waf script bundled in aubio 0.4.9 need to be removed first. >> -define AUBIO_REMOVE_OLD_WAF >> - $(RM) -fr $(@D)/waf $(@D)/waflib >> -endef >> -AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF > Note: the pkg-wag use a PRE_CONFIGURE_HOOKS instead of POST_EXTRACT_HOOKS. Correct. I don't think that has any functional change, but I did change the waf-package logic to use a post-patch hook as suggested by Yann. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:13:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:13:04 +0100 Subject: [Buildroot] [PATCH 4/5] package/jack2: fix build with python >= 3.11 In-Reply-To: <20230208181933.3925279-4-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 8 Feb 2023 19:19:31 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208181933.3925279-4-peter@korsgaard.com> Message-ID: <87ttztehhr.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/5ce/5ce5ebd20e0e509b31b51d2ec1aed56fdb8f45aa/ > The bundled waf script is too old (2.0.12) for python >= 3.11 as it uses the > 'U' modifier to open (universal newlines), which have been deprecated since > python 3.3 and finally removed in 3.11. > Jack unfortunately uses a modified waf, so we cannot just set > JACK2_NEEDS_EXTERNAL_WAF, so instead backport an upstream patch fixing the > compatibility issue: > https://github.com/jackaudio/jack2/pull/884 > Signed-off-by: Peter Korsgaard I've tweaked the commit message to make it clear that this is about host-python3 and commmitted, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:13:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:13:09 +0100 Subject: [Buildroot] [PATCH 5/5] package/norm: use external waf In-Reply-To: <20230208181933.3925279-5-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 8 Feb 2023 19:19:32 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208181933.3925279-5-peter@korsgaard.com> Message-ID: <87pmahehhm.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/ee1/ee15cadf8af10dee6c83b9726a034367e8ae81a7/ > The bundled waf script is too old (2.0.7) for python >= 3.11 as it uses the > 'U' modifier to open (universal newlines), which have been deprecated since > python 3.3 and finally removed in 3.11. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:14:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:14:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: bump version to 15.2 In-Reply-To: <20230210072228.68137-1-fido_max@inbox.ru> (Maxim Kochetkov via buildroot's message of "Fri, 10 Feb 2023 10:22:28 +0300") References: <20230210072228.68137-1-fido_max@inbox.ru> Message-ID: <87lel5ehfa.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov via buildroot writes: > Release notes: https://www.postgresql.org/docs/release/15.2/ > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 14:08:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:08:54 +0100 Subject: [Buildroot] [git commit] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used Message-ID: <20230210141450.944E784E82@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b4d7f6e13212b4c65ec2832681719fd960e75e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Waf requires that the version of the waf script matches the version of waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as otherwise waf errors out with errors like: Waf script '2.0.24' and library '1.9.3' do not match Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour [Peter: Run as a post-patch hook as suggested by Yann] Signed-off-by: Peter Korsgaard --- package/pkg-waf.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index e090afa9e6..0e752072c8 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) define inner-waf-package +# The version of waflib has to match with the version of waf, +# otherwise waf errors out with: +# Waf script 'X' and library 'Y' do not match +define WAF_PACKAGE_REMOVE_WAF_LIB + $(RM) -fr $(@D)/waf $(@D)/waflib +endef + # We need host-python3 to run waf $(2)_DEPENDENCIES += host-python3 @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) $(2)_DEPENDENCIES += host-waf $(2)_WAF = $$(HOST_DIR)/bin/waf +$(2)_POST_PATCH_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB else $(2)_WAF ?= ./waf endif From peter at korsgaard.com Fri Feb 10 14:10:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:10:42 +0100 Subject: [Buildroot] [git commit] package/glmark2: use external waf Message-ID: <20230210141450.A8C7284EA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e331da62fb7612b7a52a40e37312753cc1c1eef5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/bbd/bbd90f11975b691f694412a6fc3446f37dd7c0aa/ The bundled waf script is too old (1.9.3) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/glmark2/glmark2.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index e8d6f71dad..bac9d9ff6f 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -10,6 +10,9 @@ GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng +# The bundled waf script is too old for >= python3.11 +GLMARK2_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y) GLMARK2_DEPENDENCIES += libdrm libgbm libgles udev GLMARK2_FLAVORS += drm-glesv2 From peter at korsgaard.com Fri Feb 10 14:10:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:10:35 +0100 Subject: [Buildroot] [git commit] package/aubio: drop AUBIO_REMOVE_OLD_WAF hook Message-ID: <20230210141450.9F5C384E86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4543911494b2a485f159eae21bb703b676ec2c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As that is now handled by the waf-package infrastructure. Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/aubio/aubio.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index c995fdfac7..64174a113d 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -21,12 +21,6 @@ AUBIO_CONF_OPTS = \ # https://github.com/jackaudio/jack2/issues/898 AUBIO_NEEDS_EXTERNAL_WAF = YES -# The old waf script bundled in aubio 0.4.9 need to be removed first. -define AUBIO_REMOVE_OLD_WAF - $(RM) -fr $(@D)/waf $(@D)/waflib -endef -AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF - # Add --notests for each build step to avoid running unit tests on the # build machine. AUBIO_WAF_OPTS = --notests From peter at korsgaard.com Fri Feb 10 14:10:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:10:59 +0100 Subject: [Buildroot] [git commit] package/jack2: fix build with host python >= 3.11 Message-ID: <20230210141450.B31A384EA9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8fe92584446bba2bb81f454c5ebbcb4f80a371b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/5ce/5ce5ebd20e0e509b31b51d2ec1aed56fdb8f45aa/ The bundled waf script is too old (2.0.12) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Jack unfortunately uses a modified waf, so we cannot just set JACK2_NEEDS_EXTERNAL_WAF, so instead backport an upstream patch fixing the compatibility issue: https://github.com/jackaudio/jack2/pull/884 Signed-off-by: Peter Korsgaard --- ...e-of-U-mode-bit-for-opening-files-in-pyth.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch new file mode 100644 index 0000000000..9ee5a43e18 --- /dev/null +++ b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch @@ -0,0 +1,55 @@ +From 328c58967dce8be426f9208ba7717ab5afc2c4f3 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Mon, 11 Jul 2022 00:56:28 +0200 +Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python + +The 'U' mode bit is removed in python 3.11. It has been +deprecated for a long time. The 'U' mode bit has no effect +so this change doesn't change any behavior. + +See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api + +Signed-off-by: Peter Korsgaard +--- + waflib/ConfigSet.py | 2 +- + waflib/Context.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index b300bb56..84736c9c 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -312,7 +312,7 @@ class ConfigSet(object): + :type filename: string + """ + tbl = self.table +- code = Utils.readf(filename, m='rU') ++ code = Utils.readf(filename, m='r') + for m in re_imp.finditer(code): + g = m.group + tbl[g(2)] = eval(g(3)) +diff --git a/waflib/Context.py b/waflib/Context.py +index 9fee3fa1..761b521f 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -266,7 +266,7 @@ class Context(ctx): + cache[node] = True + self.pre_recurse(node) + try: +- function_code = node.read('rU', encoding) ++ function_code = node.read('r', encoding) + exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict) + finally: + self.post_recurse(node) +@@ -662,7 +662,7 @@ def load_module(path, encoding=None): + + module = imp.new_module(WSCRIPT_FILE) + try: +- code = Utils.readf(path, m='rU', encoding=encoding) ++ code = Utils.readf(path, m='r', encoding=encoding) + except EnvironmentError: + raise Errors.WafError('Could not read the file %r' % path) + +-- +2.30.2 + From peter at korsgaard.com Fri Feb 10 14:14:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:14:10 +0100 Subject: [Buildroot] [git commit] package/postgresql: bump version to 15.2 Message-ID: <20230210141450.C805984E82@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57e297a215193c92f6a178139db53616f2ee23b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.postgresql.org/docs/release/15.2/ Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index ef2806c2dd..e6a9bd6658 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v14.6/postgresql-15.1.tar.bz2.sha256 -sha256 64fdf23d734afad0dfe4077daca96ac51dcd697e68ae2d3d4ca6c45cb14e21ae postgresql-15.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 +sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 2ffcac6595..e90aa794b0 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 15.1 +POSTGRESQL_VERSION = 15.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 Fri Feb 10 14:11:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:11:16 +0100 Subject: [Buildroot] [git commit] package/norm: use external waf Message-ID: <20230210141450.BC93984EAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8012a86f5cf751f9c4d5d4a63f6502a6ac60d13a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/ee1/ee15cadf8af10dee6c83b9726a034367e8ae81a7/ The bundled waf script is too old (2.0.7) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/norm/norm.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/norm/norm.mk b/package/norm/norm.mk index 2f9fc7b657..a3fa1b4f80 100644 --- a/package/norm/norm.mk +++ b/package/norm/norm.mk @@ -11,6 +11,9 @@ NORM_INSTALL_STAGING = YES NORM_LICENSE = NRL License NORM_LICENSE_FILES = LICENSE.TXT +# The bundled waf script is too old for >= python3.11 +NORM_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y) NORM_DEPENDENCIES += libnetfilter_queue endif From peter at korsgaard.com Fri Feb 10 15:04:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:04:56 +0100 Subject: [Buildroot] [PATCH] support/dependencies/dependencies.sh: require diagnostics perl package for mosh Message-ID: <20230210150456.4535-1-peter@korsgaard.com> Fixes: http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' perl -Mdiagnostics -c ./mosh.pl Can't locate diagnostics.pm in @INC (you may need to install the diagnostics module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5). BEGIN failed--compilation aborted. So add a check for it in dependencies.sh similar to the other perl modules. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index cf6635bff6..4353e9585e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -281,6 +281,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules diagnostics" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" -- 2.30.2 From peter at korsgaard.com Fri Feb 10 15:27:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:27:32 +0100 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: Build with ninja In-Reply-To: <20230209170707.4066903-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 9 Feb 2023 18:07:05 +0100") References: <20230209170707.4066903-1-peter@korsgaard.com> Message-ID: <87h6vtee1n.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Webkitgtk needs cmake >= 3.20 when building with the make backend since > webkitgtk 3.8.0. > Cmake 3.20 is above our minimal version in > support/dependencies/check-host-cmake.mk, so this breaks builds on hosts > with cmake >= 3.18 < 3.20 - So use the ninja backend instead. > https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 15:27:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:27:36 +0100 Subject: [Buildroot] [PATCH 2/2] package/wpewebkit: Build with ninja In-Reply-To: <20230209170707.4066903-2-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 9 Feb 2023 18:07:06 +0100") References: <20230209170707.4066903-1-peter@korsgaard.com> <20230209170707.4066903-2-peter@korsgaard.com> Message-ID: <87cz6hee1j.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Wpewebkit needs cmake >= 3.20 when building with the make backend since > wpewebkit 3.8.0. > Cmake 3.20 is above our minimal version in > support/dependencies/check-host-cmake.mk, so this breaks builds on hosts > with cmake >= 3.18 < 3.20 - So use the ninja backend instead. > https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 15:30:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:30:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: bump version to 3.6.2 In-Reply-To: <20230210073731.152068-1-fido_max@inbox.ru> (Maxim Kochetkov's message of "Fri, 10 Feb 2023 10:37:31 +0300") References: <20230210073731.152068-1-fido_max@inbox.ru> Message-ID: <878rh5edwk.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov writes: > Release notes: https://github.com/OSGeo/gdal/blob/v3.6.2/NEWS.md > Signed-off-by: Maxim Kochetkov > --- > package/gdal/gdal.hash | 6 +++--- > package/gdal/gdal.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > diff --git a/package/gdal/gdal.hash b/package/gdal/gdal.hash > index ab77d7840d..6cf3336644 100644 > --- a/package/gdal/gdal.hash > +++ b/package/gdal/gdal.hash > @@ -1,6 +1,6 @@ > -# md5 from: https://download.osgeo.org/gdal/3.5.2/gdal-3.5.2.tar.xz.md5, sha256 locally computed: > -md5 821b3b0637ebada5d20dbefb2e3ec964 gdal-3.5.2.tar.xz > -sha256 0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2 gdal-3.5.2.tar.xz > +# md5 from: https://download.osgeo.org/gdal/3.6.2/gdal-3.6.2.tar.gz.md5, sha256 locally computed: > +md5 6f22ffdbd8e00059ddb2b825c5920c4c gdal-3.6.2.tar.xz > +sha256 35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681 gdal-3.6.2.tar.xz > # Hashes of license files: > sha256 fac0116e799ca4de79b076ee04863b5e2b69541ea3664b9bb108c81a5355f16a LICENSE.TXT > diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk > index a3b11c53af..ba9ba71b3b 100644 > --- a/package/gdal/gdal.mk > +++ b/package/gdal/gdal.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -GDAL_VERSION = 3.5.2 > +GDAL_VERSION = 3.6.2 Looks like the license details changed: >>> gdal 3.6.2 Collecting legal info ERROR: LICENSE.TXT has wrong sha256 hash: ERROR: expected: fac0116e799ca4de79b076ee04863b5e2b69541ea3664b9bb108c81a5355f16a ERROR: got : 1dae3468e81d00da56e2936f74d33b8b3ad09d726437f19ce209a5dabea41f77 ERROR: Incomplete download, or man-in-the-middle (MITM) attack Please review the changes, update the commit message to explain this and update hash (and GDAL_LICENSE if needed), thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 15:26:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:26:54 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: Build with ninja Message-ID: <20230210153148.B2E2C84F2F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78d499409f71d8a22b0632c8ebc06f67ee6ae6dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 54f37fd702..b9c2fef395 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -103,4 +103,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# wpewebkit needs cmake >= 3.20 when building with the make backend, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WPEWEBKIT_CONF_OPTS += -GNinja +WPEWEBKIT_DEPENDENCIES += host-ninja + +define WPEWEBKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + $(eval $(cmake-package)) From peter at korsgaard.com Fri Feb 10 15:26:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:26:48 +0100 Subject: [Buildroot] [git commit] package/webkitgtk: Build with ninja Message-ID: <20230210153148.A918184F2D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16e5c92ff5fd2b44a1126bd7d7538c68ce838213 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b42ac3b644..a6974db926 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -139,4 +139,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# webkitgtk needs cmake >= 3.20 when not building with ninja, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WEBKITGTK_CONF_OPTS += -GNinja +WEBKITGTK_DEPENDENCIES += host-ninja + +define WEBKITGTK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + $(eval $(cmake-package)) From peter at korsgaard.com Fri Feb 10 15:36:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:36:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-flit-core: set license path In-Reply-To: <20230210102655.94324-1-alexis.lothore@bootlin.com> ("Alexis =?utf-8?Q?Lothor=C3=A9?= via buildroot"'s message of "Fri, 10 Feb 2023 11:26:55 +0100") References: <20230210102655.94324-1-alexis.lothore@bootlin.com> Message-ID: <874jrtedlz.fsf@dell.be.48ers.dk> >>>>> "Alexis" == Alexis Lothor? via buildroot writes: > When generating legal info with a configuration enabling a package which uses > flit as setup type, we get a warning about python-flit-core license: > WARNING: python-flit-core-3.8.0: cannot save license (HOST_PYTHON_FLIT_CORE_LICENSE_FILES not defined) > Add missing variable to point to python-flit-core license file > Signed-off-by: Alexis Lothor? > --- > package/python-flit-core/python-flit-core.mk | 1 + > 1 file changed, 1 insertion(+) > diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk > index 4d7bee81da..f96191ade6 100644 > --- a/package/python-flit-core/python-flit-core.mk > +++ b/package/python-flit-core/python-flit-core.mk > @@ -8,6 +8,7 @@ PYTHON_FLIT_CORE_VERSION = 3.8.0 > PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz > PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/10/e5/be08751d07b30889af130cec20955c987a74380a10058e6e8856e4010afc > PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause > +PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE You also need to add the sha256 of LICENSE to the .hash file: ake host-python-flit-core-legal-info flit_core-3.8.0.tar.gz: OK (md5: 7c41da13273f7787709a24f74e0f5a99) flit_core-3.8.0.tar.gz: OK (sha256: b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3) >>> host-python-flit-core 3.8.0 Extracting gzip -d -c /var/lib/downloads/python-flit-core/flit_core-3.8.0.tar.gz | tar --strip-components=1 -C /home/peko/source/buildroot/output/build/host-python-flit-core-3.8.0 -xf - >>> host-python-flit-core 3.8.0 Patching >>> host-python-flit-core 3.8.0 Collecting legal info ERROR: No hash found for LICENSE Committed with that fixed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 15:36:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:36:24 +0100 Subject: [Buildroot] [git commit] package/python-flit-core: set license path Message-ID: <20230210153716.1E25A84F54@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1613273542554776b089b3df2b6b71c1af2cc0da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When generating legal info with a configuration enabling a package which uses flit as setup type, we get a warning about python-flit-core license: WARNING: python-flit-core-3.8.0: cannot save license (HOST_PYTHON_FLIT_CORE_LICENSE_FILES not defined) Add missing variable to point to python-flit-core license file Signed-off-by: Alexis Lothor?? [Peter: add sha256sum to .hash file] Signed-off-by: Peter Korsgaard --- package/python-flit-core/python-flit-core.hash | 2 ++ package/python-flit-core/python-flit-core.mk | 1 + 2 files changed, 3 insertions(+) diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash index 9281635f1a..f63a64ed1b 100644 --- a/package/python-flit-core/python-flit-core.hash +++ b/package/python-flit-core/python-flit-core.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flit_core/json md5 7c41da13273f7787709a24f74e0f5a99 flit_core-3.8.0.tar.gz sha256 b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3 flit_core-3.8.0.tar.gz +# Locally computed +sha256 35b4f1dec512e617077fd6980dbb43ef8c2887adc5d0185edb4c04da175dd816 LICENSE diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 4d7bee81da..f96191ade6 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -8,6 +8,7 @@ PYTHON_FLIT_CORE_VERSION = 3.8.0 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/10/e5/be08751d07b30889af130cec20955c987a74380a10058e6e8856e4010afc PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause +PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap # Use flit built in bootstrap_install for installing host-python-flit-core. From bugzilla at busybox.net Fri Feb 10 15:52:36 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 10 Feb 2023 15:52:36 +0000 Subject: [Buildroot] [Bug 15331] Warning on python-flit-core license when generating legal info In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15331 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Peter Korsgaard --- Fixed by https://gitlab.com/buildroot.org/buildroot/-/commit/1613273542554776b089b3df2b6b71c1af2cc0da, thanks -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Fri Feb 10 15:53:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:53:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/elixir: drop package In-Reply-To: <20230210110643.449927-1-frank.vanbever@mind.be> (Frank Vanbever's message of "Fri, 10 Feb 2023 12:06:43 +0100") References: <20230210110643.449927-1-frank.vanbever@mind.be> Message-ID: <87zg9lcy9b.fsf@dell.be.48ers.dk> >>>>> "Frank" == Frank Vanbever writes: > Elixir was a dependency of rabbitmq-server which got dropped in > 89815bad0a531d01ee2733dd9c17576a7647e1d9. It is a host package with no other > users, hence it is no longer required. Additionally, newer versions require > Erlang 23+. > Signed-off-by: Frank Vanbever Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 10 15:53:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:53:27 +0100 Subject: [Buildroot] [git commit] package/elixir: drop package Message-ID: <20230210155405.E5F0A84F7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=406698de03a9c9e4ded5a50070de2249398380ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Elixir was a dependency of rabbitmq-server which got dropped in 89815bad0a531d01ee2733dd9c17576a7647e1d9. It is a host package with no other users, hence it is no longer required. Additionally, newer versions require Erlang 23+. Signed-off-by: Frank Vanbever Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - package/elixir/elixir.hash | 3 --- package/elixir/elixir.mk | 21 --------------------- 3 files changed, 25 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 32c6e54919..e8e0671709 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1089,7 +1089,6 @@ F: package/upx/ F: package/zxing-cpp/ N: Frank Vanbever -F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ diff --git a/package/elixir/elixir.hash b/package/elixir/elixir.hash deleted file mode 100644 index 6d083e72de..0000000000 --- a/package/elixir/elixir.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Computed locally -sha256 f3465d8a8e386f3e74831bf9594ee39e6dfde6aa430fe9260844cfe46aa10139 elixir-1.9.4.tar.gz -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE diff --git a/package/elixir/elixir.mk b/package/elixir/elixir.mk deleted file mode 100644 index 6d935516f4..0000000000 --- a/package/elixir/elixir.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# elixir -# -################################################################################ - -ELIXIR_VERSION = 1.9.4 -ELIXIR_SITE = $(call github,elixir-lang,elixir,v$(ELIXIR_VERSION)) -ELIXIR_LICENSE = Apache-2.0 -ELIXIR_LICENSE_FILES = LICENSE -HOST_ELIXIR_DEPENDENCIES = host-erlang - -define HOST_ELIXIR_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) compile -endef - -define HOST_ELIXIR_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX="$(HOST_DIR)" -C $(@D) install -endef - -$(eval $(host-generic-package)) From alexis.lothore at bootlin.com Fri Feb 10 15:47:11 2023 From: alexis.lothore at bootlin.com (=?UTF-8?Q?Alexis_Lothor=c3=a9?=) Date: Fri, 10 Feb 2023 16:47:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-flit-core: set license path In-Reply-To: <874jrtedlz.fsf@dell.be.48ers.dk> References: <20230210102655.94324-1-alexis.lothore@bootlin.com> <874jrtedlz.fsf@dell.be.48ers.dk> Message-ID: On 2/10/23 16:36, Peter Korsgaard wrote: >>>>>> "Alexis" == Alexis Lothor? via buildroot writes: > > > diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk > > index 4d7bee81da..f96191ade6 100644 > > --- a/package/python-flit-core/python-flit-core.mk > > +++ b/package/python-flit-core/python-flit-core.mk > > @@ -8,6 +8,7 @@ PYTHON_FLIT_CORE_VERSION = 3.8.0 > > PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz > > PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/10/e5/be08751d07b30889af130cec20955c987a74380a10058e6e8856e4010afc > > PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause > > +PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE > > You also need to add the sha256 of LICENSE to the .hash file: > > Committed with that fixed, thanks. ACK for next time, sorry for omission and thanks for the fix Kind regards, -- Alexis Lothor?, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From nodeax at gmail.com Fri Feb 10 18:02:22 2023 From: nodeax at gmail.com (Akshay Bhat) Date: Fri, 10 Feb 2023 10:02:22 -0800 Subject: [Buildroot] [PATCH 1/1] package/libiberty: bump version to 2.38 Message-ID: <20230210180222.88328-1-nodeax@gmail.com> If the libiberty package is not the same version as the one packaged with binutils AND if libiberty is installed before binutils, then the below error is observed. Hence for now let us keep the versions in sync. /usr/bin/ld: ../libiberty/libiberty.a(hashtab.o):(.data.rel.local+0x0): multiple definition of `htab_eq_pointer' Signed-off-by: Akshay Bhat --- package/libiberty/libiberty.hash | 2 +- package/libiberty/libiberty.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash index 0dafcea520..74b2d89d31 100644 --- a/package/libiberty/libiberty.hash +++ b/package/libiberty/libiberty.hash @@ -1,5 +1,5 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz +sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz # Locally computed, same as binutils.hash sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/package/libiberty/libiberty.mk b/package/libiberty/libiberty.mk index 6235a8b956..e0e6987ad7 100644 --- a/package/libiberty/libiberty.mk +++ b/package/libiberty/libiberty.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIBERTY_VERSION = 2.32 +LIBIBERTY_VERSION = 2.38 LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils HOST_LIBIBERTY_DL_SUBDIR = binutils -- 2.34.1 From john at metanate.com Fri Feb 10 18:46:58 2023 From: john at metanate.com (John Keeping) Date: Fri, 10 Feb 2023 18:46:58 +0000 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: Build with ninja In-Reply-To: <87fsbdg2wb.fsf@dell.be.48ers.dk> References: <20230209170707.4066903-1-peter@korsgaard.com> <87fsbdg2wb.fsf@dell.be.48ers.dk> Message-ID: On Fri, Feb 10, 2023 at 12:45:24PM +0100, Peter Korsgaard wrote: > >>>>> "John" == John Keeping writes: > > > Hi Peter, > > On Thu, Feb 09, 2023 at 06:07:05PM +0100, Peter Korsgaard wrote: > >> +define WEBKITGTK_BUILD_CMDS > >> + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) > >> +endef > >> + > >> +define WEBKITGTK_INSTALL_STAGING_CMDS > >> + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) > >> +endef > >> + > >> +define WEBKITGTK_INSTALL_TARGET_CMDS > >> + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) > >> +endef > >> + > > > Would it make sense to apply these changes in pkg-cmake.mk? > > > Using `cmake --build` and `cmake --install` works with all generators > > and it would avoid needing to repeat this block for both of the packages > > in this series. > > Longer term that is indeed the direction we want to move to (and > generally build cmake packages with the ninja backend). > > This is meant as a minimal patch that is easy to backport to the stable > branches. Makes sense. > We have a number of cmake packages that use custom FOO_MAKE_OPTS, how > are those passed to make when using cmake --build / --install? For building, we have: cmake --build [] [-- ] so it should be easy to pass _MAKE_OPTS through. But I can't see anything similar for --install, although I wonder if anything actually needs to pass _MAKE_OPTS for installation. >From a quick look only 3 CMake packages use _MAKE_OPTS at all: $ git grep -l cmake-package package/ | grep -vF pkg-cmake.mk | xargs grep MAKE_OPTS package/gdal/gdal.mk:GDAL_MAKE_OPTS += -f Makefile package/mariadb/mariadb.mk:HOST_MARIADB_MAKE_OPTS = import_executables package/zeek/zeek.mk:HOST_ZEEK_MAKE_OPTS = binpac bifcl Of those, gdal's use is probably unnecessary when using `cmake --build` and the other two could us a more specific option to set targets and use the --targets option (but should also be okay with passing options after `--`). Regards, John From troglobit at gmail.com Fri Feb 10 18:47:04 2023 From: troglobit at gmail.com (Joachim Wiberg) Date: Fri, 10 Feb 2023 19:47:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/ssdp-responder; drop systemd unit installation, not needed Message-ID: <20230210184704.3381562-1-troglobit@gmail.com> When systemd is enabled the ssdp-responder build system already installs the unit file, with the correct name, so we can safely drop this. This fixes the recurring autobuilder problems that cropped up the last week+ or so after fixing the spelling error in 6e0ba6b. - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 Signed-off-by: Joachim Wiberg --- package/ssdp-responder/ssdp-responder.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index d40f6f8c57..5193966908 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,9 +25,4 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service -endef - $(eval $(autotools-package)) -- 2.34.1 From yann.morin.1998 at free.fr Fri Feb 10 21:55:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 10 Feb 2023 22:55:48 +0100 Subject: [Buildroot] [PATCH] package/erlang: do not hard-code the Erlang Interface Version (EI_VSN) Message-ID: <20230210215548.1050371-1-yann.morin.1998@free.fr> The note above the erlang version instructs to refer to another note further down the file. However, even if it is not too difficult to find, it is still located a bit too far away, and the reference is not very explicit what note we should look at. When we introduced that variable in 6c1d128844c5 (package/erlang: export EI_VSN so other packages can use it), the rationale for hard-coding it was "to avoid spawning a shell every time the variable is dereferenced". However, that can get a bit confusing and hard to follow. Also, that in fact spawns a shell only once for each rebar-packages, so the overhead is far from being too high. The EI_VSN is only used by rebar-package packages, is derefrenced from the rebar-infra and not the packages themselves, and is not needed by erlang itself (it knows its own EI_VSN), so we can de-hard-code it, and rely on build-time detection, by looking in the appropriate file. We have two files where we could look: - lib/erl_interface/vsn.mk in the erlang source tree, but it is not installed, - .../lib/erlang/releases/$(ERLANG_RELASE)/installed_application_versions as installed by erlang. We use the second one, as it is cleaner, for a package, to look into installed files, rather than to look in the source tree of another package. Although both the host and target erlang are the same, we still look into the corresponding file to extract the version. This is so that it would be easier if in the future we ever manage to rely on a system-installed erlang that could have a EI_VSN different from the target one. We can't re-use the variable ERLANG_EI_VSN, because it now needs to be $(call)-ed with a parameter. Hopefully, external packages that use it directly rather than through the rebar infra, are not legion... Signed-off-by: Yann E. MORIN Cc: Will Newton Cc: Johan Oudinet --- package/erlang/erlang.mk | 8 ++++---- package/pkg-rebar.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index ac2c204a49..5d6b69057a 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -4,8 +4,8 @@ # ################################################################################ -# See note below when updating Erlang ERLANG_VERSION = 22.3.4.22 +ERLANG_RELEASE = $(firstword $(subst ., ,$(ERLANG_VERSION))) ERLANG_SITE = \ https://github.com/erlang/otp/releases/download/OTP-$(ERLANG_VERSION) ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz @@ -36,9 +36,9 @@ ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF HOST_ERLANG_DEPENDENCIES += host-autoconf HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF -# Whenever updating Erlang, this value should be updated as well, to the -# value of EI_VSN in the file lib/erl_interface/vsn.mk -ERLANG_EI_VSN = 3.13.2.2 +# Return the EIV (Erlang Interface Version, EI_VSN) +# $(1): base directory, i.e. either $(HOST_DIR) or $(STAGING_DIR)/usr +erlang_ei_vsn = `sed -r -e '/^erl_interface-(.+)/!d; s//\1/' $(1)/lib/erlang/releases/$(ERLANG_RELEASE)/installed_application_versions` # The configure checks for these functions fail incorrectly ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes diff --git a/package/pkg-rebar.mk b/package/pkg-rebar.mk index e4e3f3bb6c..4b993dd970 100644 --- a/package/pkg-rebar.mk +++ b/package/pkg-rebar.mk @@ -32,10 +32,10 @@ REBAR_TARGET_DEPS_DIR = $(STAGING_DIR)/usr/share/rebar/deps # REBAR_HOST_DEPS_ENV = \ ERL_COMPILER_OPTIONS='{i, "$(REBAR_HOST_DEPS_DIR)"}' \ - ERL_EI_LIBDIR=$(HOST_DIR)/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib + ERL_EI_LIBDIR=$(HOST_DIR)/lib/erlang/lib/erl_interface-$(call erlang_ei_vsn,$(HOST_DIR))/lib REBAR_TARGET_DEPS_ENV = \ ERL_COMPILER_OPTIONS='{i, "$(REBAR_TARGET_DEPS_DIR)"}' \ - ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib + ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(call erlang_ei_vsn,$(STAGING_DIR)/usr)/lib ################################################################################ # Helper functions -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Feb 10 22:05:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:05:38 +0100 Subject: [Buildroot] [git commit] package/gnupg2: bump to version 2.4.0 Message-ID: <20230210221004.E0E9D84FC8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f868e97f6b42ccaa0844880775f86002656227d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See announce: https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html This commit also drop a patch which is now included in the new version. See: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7011286ce6e1fb56c2989fdafbd11b931c489faa Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gnupg2/0001-ks_ldap_free_state.patch | 21 --------------------- package/gnupg2/gnupg2.hash | 10 +++++----- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch deleted file mode 100644 index fa55d27c04..0000000000 --- a/package/gnupg2/0001-ks_ldap_free_state.patch +++ /dev/null @@ -1,21 +0,0 @@ - -Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is not -installed - -Backported from: 7011286ce6e1fb56c2989fdafbd11b931c489faa - -Signed-off-by: Michael Fischer - ---- a/dirmngr/server.c -+++ b/dirmngr/server.c -@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) - ctrl->refcount); - else - { -+#if USE_LDAP - ks_ldap_free_state (ctrl->ks_get_state); - ctrl->ks_get_state = NULL; -+#endif - release_ctrl_ocsp_certs (ctrl); - xfree (ctrl->server_local); - dirmngr_deinit_default_ctrl (ctrl); diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index f9c071ad45..c642862fe2 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html -sha1 1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc gnupg-2.3.8.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html +sha1 63dde155a8df0d5e1987efa5fc17438beca83ac1 gnupg-2.4.0.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.8.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA and AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD -sha256 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed gnupg-2.3.8.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2.sig +# using key 6DAA6E64A76D2840571B4902528897B826403ADA +sha256 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 gnupg-2.4.0.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 9dc29ca99e..5935ce6939 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.3.8 +GNUPG2_VERSION = 2.4.0 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From thomas.petazzoni at bootlin.com Fri Feb 10 22:13:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:13:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiberty: bump version to 2.38 In-Reply-To: <20230210180222.88328-1-nodeax@gmail.com> References: <20230210180222.88328-1-nodeax@gmail.com> Message-ID: <20230210231315.17b367e6@windsurf> Hello, On Fri, 10 Feb 2023 10:02:22 -0800 Akshay Bhat wrote: > If the libiberty package is not the same version as the one packaged > with binutils AND if libiberty is installed before binutils, then the > below error is observed. Hence for now let us keep the versions in sync. > > /usr/bin/ld: ../libiberty/libiberty.a(hashtab.o):(.data.rel.local+0x0): multiple definition of `htab_eq_pointer' > > Signed-off-by: Akshay Bhat Thanks a lot for the fix. Is this fixing http://autobuild.buildroot.net/results/eaf/eaf23ea0c8d7803e3768da40b7070d04801cd36f/build-end.log perhaps? One issue that I see is that the binutils version is configurable: we support 2.37, 2.38, 2.39 and the special ARC version. Do we need to make the libiberty version match with that? Also, see the conversation starting at: https://lore.kernel.org/buildroot/3f3d266c-2f21-197c-29b7-fff3e230e97a at smile.fr/ 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 Fri Feb 10 22:14:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:14:54 +0100 Subject: [Buildroot] Dependency problem for gtkmm3 In-Reply-To: References: Message-ID: <20230210231454.4f3aedbd@windsurf> Hello Dirk, On Fri, 10 Feb 2023 11:15:12 +0000 Dirk De Becker wrote: > Hi, > > I am trying to make a buildroot containing libgtkmm3, but I run into problems. > I did the following steps: > Checkout master from git://git.buildroot.net/buildroot > Select the following things: > > * BR2_x86_64 > * BR2_TOOLCHAIN_BUILDROOT_CXX > * BR2_PACKAGE_MESA3D > * BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 > * BR2_PACKAGE_MESA3D_OPENGL_EGL > * BR2_PACKAGE_LIBGTK3 > * BR2_PACKAGE_GTKMM3 > > I get the following error in the output of the build attempt for gtkmm3-3.22.0: > configure: error: Package requirements (giomm-2.4 >= 2.49.1 pangomm-1.4 >= 2.38.2 gtk+-3.0 >= 3.22.0 cairomm-1.0 >= 1.12.0 gdk-pixbuf-2.0 >= 2.35.5) were not met: > > Package 'giomm-2.4', required by 'virtual:world', not found > Package 'pangomm-1.4', required by 'virtual:world', not found > Package 'cairomm-1.0', required by 'virtual:world', not found > > It seems that gtkmm3 is dependent on versions of some libraries that are not available. > > The following packages were built, but these do not provide the correct versions of these packages, according to pkg-config: > > * glibmm-2.68.2 > * pangomm-2.48.2 > * cairomm-1.16.1 I have not looked at the issue, but it seems to match what our autobuilders have reported at: http://autobuild.buildroot.net/results/172/17263ac51f197031106eb7fd595126a2720f0397/build-end.log Best regards, 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 Feb 10 22:16:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:16:59 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/gnupg2: bump to version 2.4.0 In-Reply-To: <20230106111141.325627-1-ju.o@free.fr> References: <20230106111141.325627-1-ju.o@free.fr> Message-ID: <20230210231659.2957f090@windsurf> On Fri, 6 Jan 2023 12:11:41 +0100 Julien Olivain wrote: > See announce: > https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html > > This commit also drop a patch which is now included in the new version. > See: > https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7011286ce6e1fb56c2989fdafbd11b931c489faa > > Signed-off-by: Julien Olivain > --- > Changes v1 -> v2: > - Removed GNUPG2_CONF_ENV, as the better fix is: > https://git.buildroot.org/buildroot/commit/?id=3a22b009992883ad57553ffb3f194303f90ad1a4 > --- > Tested on top of branch master at commit 3a22b00 with commands: Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 10 22:26:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:26:56 +0100 Subject: [Buildroot] [git commit] package/gtest: drop patch adding debug 'd' to library names in pkg-config files Message-ID: <20230210222713.EA62A85015@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f661c00342befb21c0032e593c758dfb2d336007 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - drop patch adding debug 'd' to gmock/gtest library names in pkg-config files (not longer needed since gtest version bump to 1.22 ([1]) and upstream commit 'FIX #2174 -- remove `DEBUG_POSTFIX`' ([2]). Fixes: http://autobuild.buildroot.net/results/5ea8f180e4909f8157565238b25f567fcf1f3beb .../host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/7.3.1/../../../../aarch64-linux-gnu/bin/ld: cannot find -lgtestd [1] https://git.buildroot.net/buildroot/commit/?id=a336b731af5979a25213b33c5840de6d1ed88bdc [2] https://github.com/google/googletest/commit/ca3ffd90f2726f6c0c6e790f05c7c88491a16466 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...fix-gtest.pc-gmock.pc-library-names-for-t.patch | 62 ---------------------- 1 file changed, 62 deletions(-) diff --git a/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch b/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch deleted file mode 100644 index c47e8fc8f8..0000000000 --- a/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cf5a3177159ca832470e7f876cab0a1923fa666f Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 22 Oct 2021 20:17:36 +0200 -Subject: [PATCH] pkg-config: fix gtest.pc/gmock.pc library names for the debug - build - -In case CMAKE_BUILD_TYPE is set to Debug the gtest library is -name libgtestd.a but the link command returned from gtest.pc is -'-lgtest' (without the debug d) and so the linking of dependent -packages fails (see [1] for a buildroot failure example). - -Enhance the gtest.pc ang gmock.pc generation to honour the debug 'd'. - -[1] http://lists.busybox.net/pipermail/buildroot/2021-October/626382.html - -[Upstream: https://github.com/google/googletest/pull/3625] -Signed-off-by: Peter Seiderer ---- - googlemock/cmake/gmock.pc.in | 2 +- - googletest/cmake/gtest.pc.in | 2 +- - googletest/cmake/internal_utils.cmake | 3 +++ - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in -index 23c67b5c..0f469857 100644 ---- a/googlemock/cmake/gmock.pc.in -+++ b/googlemock/cmake/gmock.pc.in -@@ -6,5 +6,5 @@ Description: GoogleMock (without main() function) - Version: @PROJECT_VERSION@ - URL: https://github.com/google/googletest - Requires: gtest = @PROJECT_VERSION@ --Libs: -L${libdir} -lgmock @CMAKE_THREAD_LIBS_INIT@ -+Libs: -L${libdir} -lgmock at DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@ - Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ -diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in -index b4148fae..225bba81 100644 ---- a/googletest/cmake/gtest.pc.in -+++ b/googletest/cmake/gtest.pc.in -@@ -5,5 +5,5 @@ Name: gtest - Description: GoogleTest (without main() function) - Version: @PROJECT_VERSION@ - URL: https://github.com/google/googletest --Libs: -L${libdir} -lgtest @CMAKE_THREAD_LIBS_INIT@ -+Libs: -L${libdir} -lgtest at DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@ - Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ -diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake -index 58fc9bfb..fd81b825 100644 ---- a/googletest/cmake/internal_utils.cmake -+++ b/googletest/cmake/internal_utils.cmake -@@ -335,6 +335,9 @@ function(install_project) - # Configure and install pkgconfig files. - foreach(t ${ARGN}) - set(configured_pc "${generated_dir}/${t}.pc") -+ if(CMAKE_BUILD_TYPE MATCHES Debug) -+ set(DEBUG_POSTFIX "d") -+ endif() - configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in" - "${configured_pc}" @ONLY) - install(FILES "${configured_pc}" --- -2.33.1 - From thomas.petazzoni at bootlin.com Fri Feb 10 22:27:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:27:13 +0100 Subject: [Buildroot] [PATCH v1] package/gtest: drop patch adding debug 'd' to library names in pkg-config files In-Reply-To: <20230106210133.28803-1-ps.report@gmx.net> References: <20230106210133.28803-1-ps.report@gmx.net> Message-ID: <20230210232713.05954d68@windsurf> On Fri, 6 Jan 2023 22:01:33 +0100 Peter Seiderer wrote: > - drop patch adding debug 'd' to gmock/gtest library names in pkg-config files > (not longer needed since gtest version bump to 1.22 ([1]) and upstream > commit 'FIX #2174 -- remove `DEBUG_POSTFIX`' ([2]). > > Fixes: > > http://autobuild.buildroot.net/results/5ea8f180e4909f8157565238b25f567fcf1f3beb > > .../host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/7.3.1/../../../../aarch64-linux-gnu/bin/ld: cannot find -lgtestd > > [1] https://git.buildroot.net/buildroot/commit/?id=a336b731af5979a25213b33c5840de6d1ed88bdc > [2] https://github.com/google/googletest/commit/ca3ffd90f2726f6c0c6e790f05c7c88491a16466 > > Signed-off-by: Peter Seiderer > --- > ...test.pc-gmock.pc-library-names-for-t.patch | 62 ------------------- > 1 file changed, 62 deletions(-) > delete mode 100644 package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 10 22:30:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:30:08 +0100 Subject: [Buildroot] [git commit] board/asus/tinker: rename label linux-next to linux in extlinux.conf Message-ID: <20230210223129.CE5C585178@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4b46bc3c6997e32050b332d7578f0cb289b57be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We're not using next branch so let's rename label linux-next to linux. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf index 136af0debd..bb96ddb893 100644 --- a/board/asus/tinker/extlinux.conf +++ b/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ -label Tinker linux-next +label Tinker linux kernel /boot/uImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait From thomas.petazzoni at bootlin.com Fri Feb 10 22:30:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:30:30 +0100 Subject: [Buildroot] [git commit] configs/asus_tinker_rk3288: bump Linux to 6.1.2 and U-boot to 2022.10 Message-ID: <20230210223129.D905185179@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fdf20249574b64285979f109bef74eb9cdbf0db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/asus_tinker_rk3288_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 02b340a7f1..40f4125880 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" From thomas.petazzoni at bootlin.com Fri Feb 10 22:31:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:31:15 +0100 Subject: [Buildroot] [git commit] board/asus/tinker: add a note to readme.txt for power supply Message-ID: <20230210223129.E363B851A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d87d6281869d4023e0ff888b99cdd5bdf2a0326 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/readme.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/board/asus/tinker/readme.txt b/board/asus/tinker/readme.txt index 7372d29520..110e2168c9 100644 --- a/board/asus/tinker/readme.txt +++ b/board/asus/tinker/readme.txt @@ -35,3 +35,9 @@ You can write this image directly to an SD card device (i.e. /dev/xxx): $ sudo sync Finally, you can insert the SD card to the Tinker RK3288 board and boot it. + +NOTE: +USB power supply requires more than the standard 500mA USB current, so +this board must be supplied from a capable port or from an external +AC/DC adapter. Otherwise it will hang forever while loading the kernel +image. From thomas.petazzoni at bootlin.com Fri Feb 10 22:29:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:29:10 +0100 Subject: [Buildroot] [git commit] configs/asus_tinker_rk3288: fix boot by prepending tpl to spl+u-boot Message-ID: <20230210223129.C431885174@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e738d5b7251918a62922f3f3b6491b642f9ec182 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master During the last U-boot version bump it's not been noted that the TPL was not prepended to SPL anymore preventing the board to boot, so let's copy TPL to the image folder, prepend it to u-boot-spl-dtb.bin and place it at offset 32KB, where RK3288 bootrom expects to find it. Let's also place u-boot-dtb separated from SPL at offset 8M, where the SPL expects it to find it. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/genimage.cfg | 11 +++++++++-- board/asus/tinker/post-build.sh | 4 ++-- configs/asus_tinker_rk3288_defconfig | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/board/asus/tinker/genimage.cfg b/board/asus/tinker/genimage.cfg index a4b1e8d608..fa7fd734f2 100644 --- a/board/asus/tinker/genimage.cfg +++ b/board/asus/tinker/genimage.cfg @@ -2,12 +2,19 @@ image sdcard.img { hdimage { } - partition u-boot-spl-dtb { + partition u-boot-tpl-spl-dtb { in-partition-table = "no" - image = "u-boot-spl-dtb.img" + image = "u-boot-tpl-spl-dtb.img" offset = 32K } + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 8M + size = 30M + } + partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/asus/tinker/post-build.sh b/board/asus/tinker/post-build.sh index 8108ed83ff..ffbbcdeb58 100755 --- a/board/asus/tinker/post-build.sh +++ b/board/asus/tinker/post-build.sh @@ -3,7 +3,7 @@ MKIMAGE=$HOST_DIR/bin/mkimage BOARD_DIR="$(dirname $0)" -$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img -cat $BINARIES_DIR/u-boot-dtb.bin >> $BINARIES_DIR/u-boot-spl-dtb.img +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl-dtb.bin > $BINARIES_DIR/u-boot-tpl-spl-dtb.img install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 6963fa939f..02b340a7f1 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y From yann.morin.1998 at free.fr Fri Feb 10 22:31:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 10 Feb 2023 23:31:42 +0100 Subject: [Buildroot] [PATCH 1/2] support/download: catch post-process errors Message-ID: <20230210223143.1060114-1-yann.morin.1998@free.fr> Currently, when the post-process helper fails while downloading from upstream, there is no fallback to the backup mirror. In case the post-process helper fails, we mut consider that to be a download failure, so we must bail out as if the download backend itself did fail, but we fail to do so. Duplicate the logic we have for the download helper: if the post-process helper fails, remove the downloaded stuff, and continue on to the next URI, which will ultimately hit the backup mirror (if one has been configured). Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- support/download/dl-wrapper | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 09a6ac1f1a..1e8d6058f6 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -138,9 +138,15 @@ main() { fi if [ -n "${post_process}" ] ; then - "${OLDPWD}/support/download/${post_process}-post-process" \ - -o "${tmpf}" \ - -n "${raw_base_name}" + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + then + # cd back to keep path coherence + cd "${OLDPWD}" + rm -rf "${tmpd}" + continue + fi fi # cd back to free the temp-dir, so we can remove it later -- 2.25.1 From yann.morin.1998 at free.fr Fri Feb 10 22:31:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 10 Feb 2023 23:31:43 +0100 Subject: [Buildroot] [PATCH 2/2] support/download: fix the cargo post-process in face of failed vendoring In-Reply-To: <20230210223143.1060114-1-yann.morin.1998@free.fr> References: <20230210223143.1060114-1-yann.morin.1998@free.fr> Message-ID: <20230210223143.1060114-2-yann.morin.1998@free.fr> In commit 04154a651729 (support/download/cargo-post-process: cargo output for vendor config), we switched away from our hand-crafted cargo.toml mangling, to use cargo itself to update that file. In doing so, we enabled the shell pipefail option, so that we could catch cargo failures, while redirecting its output through tee to the cargo.toml. However, pipefail is overzealous, and will hit us even for pipes we do not want to globally fail, like the one that actually checks whether an archive is already vendored or not: if tar tf "${output}" | grep -q "^[^/]*/VENDOR" ; then ... with pipefail, the above may always fail: - if the tarball is already vendored, grep will exit on the first match because of -q (it only needs a single match to decide that its return code will be zero), so the | will get closed, and tar may get -EPIPE before it had a chance to finish listing the archive, and thus would terminate in error; - if the tarball is not vendored, grep will exit in error. It turns out that the tee was only added so that we could see the messages emitted by cargo, and still fill the cargo.tom with the output of cargo. But that's a bit overkill: the cargo messages are going to stderr, and the blurb to add to cargo.toml to stdout, so we just need to redirect stdout. Yes, we do not see what cargo added to cargo.toml, but that is not so interesting. Still, cargo ends its messages with a suggestion for the user to modify cargo.toml, with: To use vendored sources, add this to your .cargo/config.toml for this project: But since we've already redirected that to cargo.toml, there is nothing for the user to edit, so the above can get confusing. Emit a little blurb that states that everything is under control. And then we can drop pipefail. Note: the go-post-process initially had pipefail too, but it was dropped in bfd1a31d0e59 (support/download/go-post-process: drop -o pipefail) as it was causing spurrious breakage when extracting the archive before vendoring, so it is only reasonable that we also remove it from the cargo-post-process. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Simon Richter --- support/download/cargo-post-process | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index aea2d8da7a..3f4666c006 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -e -set -o pipefail . "${0%/*}/helpers" @@ -31,7 +30,13 @@ flock "${CARGO_HOME}"/.br-lock \ cargo vendor \ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ --locked VENDOR \ - | tee .cargo/config + > .cargo/config + +# "cargo vendor' outputs on stderr a message directing to add some data +# to the project's .cargo/config.toml, data that it outputs on stdout. +# Since we redirect stdout to .cargo/config.toml, the message on stderr +# gets confusing, so instruct the user that it's been handled. +printf '(note: .cargo/config.toml automatically updated by Buildroot)\n\n' popd > /dev/null -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Feb 10 22:34:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:34:51 +0100 Subject: [Buildroot] [PATCH 0/4] Tinker board boot fix and Linux/U-Boot update In-Reply-To: <20230104002113.1038775-1-giulio.benetti@benettiengineering.com> References: <20230104002113.1038775-1-giulio.benetti@benettiengineering.com> Message-ID: <20230210233451.3a3a2f9f@windsurf> On Wed, 4 Jan 2023 01:21:09 +0100 Giulio Benetti wrote: > Giulio Benetti (4): > configs/asus_tinker_rk3288_defconfig: fix boot by prepending tpl to > spl+u-boot > board/asus/tinker: rename label linux-next to linux in extlinux.conf > configs/asus_tinker_rk3288_defconfig: bump Linux to 6.1.2 and U-boot > to 2022.10 > board/asus/tinker: add a note to readme.txt for power supply Series applied with minor adjustements here and there, nothing major. Thanks a lot! 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 Feb 10 22:36:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:36:16 +0100 Subject: [Buildroot] [git commit] support/testing/tests/package/test_gnupg2.py: new runtime test Message-ID: <20230210223815.F3C48851BB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a82eec628c25f96a15ed7f1443923ff625e0d2bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_gnupg2.py | 114 +++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e8e0671709..0af1323340 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1708,6 +1708,7 @@ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py diff --git a/support/testing/tests/package/test_gnupg2.py b/support/testing/tests/package/test_gnupg2.py new file mode 100644 index 0000000000..4505e1c339 --- /dev/null +++ b/support/testing/tests/package/test_gnupg2.py @@ -0,0 +1,114 @@ +import os + +import infra.basetest + + +class TestGnupg2(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_GNUPG2=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Some common data for all the tests + plain_data = "Some plain text data" + plain_file = "file.txt" + gpg_file = plain_file + ".gpg" + asc_file = plain_file + ".asc" + sig_file = plain_file + ".sig" + good_passphrase = "Good Passphrase" + gpg_userid = "br-test at buildroot" + + # Test the program can execute + self.assertRunOk("gpg --version") + + # Generate plain text data + cmd = "echo '{}' > {}".format(plain_data, plain_file) + self.assertRunOk(cmd) + + # Test symmetric encrypt + cmd = "gpg --batch --symmetric" + cmd += " --passphrase '{}' {}".format(good_passphrase, plain_file) + self.assertRunOk(cmd) + + # Test symmetric decrypt + cmd = "gpg --batch --decrypt" + cmd += " --passphrase '{}' {}".format(good_passphrase, gpg_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + + # Test a failed decrypt with a bad password + cmd = "gpg --batch --decrypt" + cmd += " --passphrase 'A-Bad-Password' {}".format(gpg_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Test the generation of an asymmetric key + cmd = "gpg --batch --passphrase ''" + cmd += " --quick-generate-key {} default default".format(gpg_userid) + self.assertRunOk(cmd) + + # Test asymmetric encrypt+sign + cmd = "gpg --batch --yes --encrypt --sign" + cmd += " --recipient {} {}".format(gpg_userid, plain_file) + self.assertRunOk(cmd) + + # Test asymmetric decrypt+verify + cmd = "gpg --decrypt {}".format(gpg_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test asymmetric armored encrypt+sign + cmd = "gpg --batch --yes --armor --encrypt --sign" + cmd += " --recipient {} {}".format(gpg_userid, plain_file) + self.assertRunOk(cmd) + + # Test asymmetric armored decrypt+verify + cmd = "gpg --armor --decrypt {}".format(asc_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test detached signature + cmd = "gpg --batch --yes --detach-sign {}".format(plain_file) + self.assertRunOk(cmd) + + # Test detached signature verification + cmd = "gpg --verify {}".format(sig_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test detached armored signature + cmd = "gpg --batch --yes --armor --detach-sign {}".format(plain_file) + self.assertRunOk(cmd) + + # Test detached armored signature verification + cmd = "gpg --armor --verify {}".format(asc_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test the signature verification of a corrupted file actually fails + cmd = "echo 'CORRUPTED' >> {}".format(plain_file) + self.assertRunOk(cmd) + + cmd = "gpg --verify {}".format(sig_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + cmd = "gpg --armor --verify {}".format(asc_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) From thomas.petazzoni at bootlin.com Fri Feb 10 22:38:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:38:24 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing/tests/package/test_gnupg2.py: new runtime test In-Reply-To: <20230104222007.43604-1-ju.o@free.fr> References: <20230104222007.43604-1-ju.o@free.fr> Message-ID: <20230210233824.7b040a31@windsurf> On Wed, 4 Jan 2023 23:20:07 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit 1ad6b4e with commands: Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 10 22:38:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:38:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/ssdp-responder; drop systemd unit installation, not needed In-Reply-To: <20230210184704.3381562-1-troglobit@gmail.com> References: <20230210184704.3381562-1-troglobit@gmail.com> Message-ID: <20230210233857.1d8ba4a5@windsurf> On Fri, 10 Feb 2023 19:47:04 +0100 Joachim Wiberg wrote: > When systemd is enabled the ssdp-responder build system already installs > the unit file, with the correct name, so we can safely drop this. > > This fixes the recurring autobuilder problems that cropped up the last > week+ or so after fixing the spelling error in 6e0ba6b. > > - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 > - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 > - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 > - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 > - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 > > Signed-off-by: Joachim Wiberg > --- > package/ssdp-responder/ssdp-responder.mk | 5 ----- > 1 file changed, 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 Fri Feb 10 22:38:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:38:44 +0100 Subject: [Buildroot] [git commit] package/ssdp-responder; drop systemd unit installation, not needed Message-ID: <20230210223955.C181F85212@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6e3d36a85f19acedd2ed58f5b8616dbf24f57a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When systemd is enabled the ssdp-responder build system already installs the unit file, with the correct name, so we can safely drop this. This fixes the recurring autobuilder problems that cropped up the last week+ or so after fixing the spelling error in 6e0ba6b. - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/ssdp-responder/ssdp-responder.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index d40f6f8c57..5193966908 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,9 +25,4 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service -endef - $(eval $(autotools-package)) From romain.naour at smile.fr Fri Feb 10 22:47:08 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:08 +0100 Subject: [Buildroot] [PATCH v3 01/10] package/llvm-project: new group for llvm packages In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-2-romain.naour@smile.fr> From: Lang Daniel To make updating easier in the future, group all llvm projects in one subfolder and define some variables for all of them. Introduce LLVM_PROJECT_VERSION_MAJOR to be used by the clang package in a followup change. Signed-off-by: Daniel Lang Reviewed-by: Romain Naour Signed-off-by: Romain Naour --- v3: Add LLVM_PROJECT_VERSION_MAJOR --- package/llvm-project/llvm-project.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 package/llvm-project/llvm-project.mk diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk new file mode 100644 index 0000000000..747a6f5647 --- /dev/null +++ b/package/llvm-project/llvm-project.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# llvm-project +# +################################################################################ + +LLVM_PROJECT_VERSION_MAJOR = 11 +LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.0 +LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) + +include $(sort $(wildcard package/llvm-project/*/*.mk)) -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:07 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:07 +0100 Subject: [Buildroot] [PATCH v3 00/10] group llvm projects and bump to version 15.0.3 Message-ID: <20230210224717.3293906-1-romain.naour@smile.fr> This series attempts two things: - Move the different llvm subprojects into one folder and share version and site information. - Bump the version to the latest 15.0.3 Starting with version 12 different subprojects added dependencies or sources that would be available when building from the "monorepo". These have been added as new host packages. v3: - move libclc before llvm 15.0.3 version bump commit - force llvm-cmake and llvm-libunwind version to 15.0.3 since LLVM_PROJECT_VERSION is still at 11.1.0 - Keep cp as install command since there is no CMakefiles.txt - llvm, clang, lld: keep LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN since this option is still used to check C++17 compiler support: llvm/cmake/modules/CheckCompilerVersion.cmake Changes v1 -> v2: - Rebased onto current master - Bump to 15.0.3 instead of 15.0.1 - llvm: use CMAKE_HOST_C_COMPILER instead of HOSTCC - libclc: Add missing change to package/Config.in Lang Daniel (10): package/llvm-project: new group for llvm packages package/llvm: move to llvm-project folder package/lld: move to llvm-project subfolder package/clang: move to llvm-project subfolder package/compiler-rt: move to llvm-project subfolder package/libclc: move to llvm-project subfolder package/llvm-project/llvm-cmake: new package package/llvm-project/llvm-libunwind: new package package/llvm-project: bump to version 15.0.3 DEVELOPERS: add Daniel Lang for llvm-project DEVELOPERS | 21 ++++++------- package/Config.in | 8 ++--- package/Config.in.host | 2 +- ...hains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 0 package/{ => llvm-project}/clang/Config.in | 0 package/{ => llvm-project}/clang/clang.hash | 2 +- package/{ => llvm-project}/clang/clang.mk | 16 +++++----- .../{ => llvm-project}/compiler-rt/Config.in | 0 .../compiler-rt/compiler-rt.hash | 2 +- .../compiler-rt/compiler-rt.mk | 9 +++--- .../0001-support-out-of-tree-build.patch | 0 package/{ => llvm-project}/libclc/Config.in | 0 package/{ => llvm-project}/libclc/libclc.hash | 2 +- package/{ => llvm-project}/libclc/libclc.mk | 4 +-- package/{ => llvm-project}/lld/Config.in.host | 0 package/{ => llvm-project}/lld/lld.hash | 2 +- package/{ => llvm-project}/lld/lld.mk | 15 +++++----- .../llvm-project/llvm-cmake/llvm-cmake.hash | 2 ++ package/llvm-project/llvm-cmake/llvm-cmake.mk | 17 +++++++++++ .../llvm-libunwind/llvm-libunwind.hash | 3 ++ .../llvm-libunwind/llvm-libunwind.mk | 18 +++++++++++ package/llvm-project/llvm-project.mk | 11 +++++++ package/{ => llvm-project}/llvm/Config.in | 0 package/{ => llvm-project}/llvm/llvm.hash | 2 +- package/{ => llvm-project}/llvm/llvm.mk | 30 ++++++++++++------- .../llvm/0001-nfc-Fix-missing-include.patch | 24 --------------- 26 files changed, 112 insertions(+), 78 deletions(-) rename package/{ => llvm-project}/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch (100%) rename package/{ => llvm-project}/clang/Config.in (100%) rename package/{ => llvm-project}/clang/clang.hash (52%) rename package/{ => llvm-project}/clang/clang.mk (92%) rename package/{ => llvm-project}/compiler-rt/Config.in (100%) rename package/{ => llvm-project}/compiler-rt/compiler-rt.hash (50%) rename package/{ => llvm-project}/compiler-rt/compiler-rt.mk (82%) rename package/{ => llvm-project}/libclc/0001-support-out-of-tree-build.patch (100%) rename package/{ => llvm-project}/libclc/Config.in (100%) rename package/{ => llvm-project}/libclc/libclc.hash (51%) rename package/{ => llvm-project}/libclc/libclc.mk (92%) rename package/{ => llvm-project}/lld/Config.in.host (100%) rename package/{ => llvm-project}/lld/lld.hash (52%) rename package/{ => llvm-project}/lld/lld.mk (67%) create mode 100644 package/llvm-project/llvm-cmake/llvm-cmake.hash create mode 100644 package/llvm-project/llvm-cmake/llvm-cmake.mk create mode 100644 package/llvm-project/llvm-libunwind/llvm-libunwind.hash create mode 100644 package/llvm-project/llvm-libunwind/llvm-libunwind.mk create mode 100644 package/llvm-project/llvm-project.mk rename package/{ => llvm-project}/llvm/Config.in (100%) rename package/{ => llvm-project}/llvm/llvm.hash (52%) rename package/{ => llvm-project}/llvm/llvm.mk (93%) delete mode 100644 package/llvm/0001-nfc-Fix-missing-include.patch -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:09 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:09 +0100 Subject: [Buildroot] [PATCH v3 02/10] package/llvm: move to llvm-project folder In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-3-romain.naour@smile.fr> From: Lang Daniel To make updating easier, move llvm into the llvm-project folder and use the defined information. Signed-off-by: Daniel Lang Reviewed-by: Romain Naour Signed-off-by: Romain Naour --- DEVELOPERS | 6 +++--- package/Config.in | 2 +- .../llvm/0001-nfc-Fix-missing-include.patch | 0 package/{ => llvm-project}/llvm/Config.in | 0 package/{ => llvm-project}/llvm/llvm.hash | 0 package/{ => llvm-project}/llvm/llvm.mk | 5 ++--- 6 files changed, 6 insertions(+), 7 deletions(-) rename package/{ => llvm-project}/llvm/0001-nfc-Fix-missing-include.patch (100%) rename package/{ => llvm-project}/llvm/Config.in (100%) rename package/{ => llvm-project}/llvm/llvm.hash (100%) rename package/{ => llvm-project}/llvm/llvm.mk (98%) diff --git a/DEVELOPERS b/DEVELOPERS index 0af1323340..6244b30d0b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1619,7 +1619,7 @@ F: package/earlyoom/ F: package/gconf/ F: package/libnss/ F: package/lld/ -F: package/llvm/ +F: package/llvm-project/llvm/ F: package/python-cython/ F: package/python-pycups/ F: package/python-raven/ @@ -2580,7 +2580,7 @@ F: package/libgta/ F: package/libiec61850/ F: package/libspatialindex/ F: package/linux-syscall-support/ -F: package/llvm/ +F: package/llvm-project/llvm/ F: package/lugaru/ F: package/mcelog/ F: package/mesa3d/ @@ -2991,7 +2991,7 @@ N: Valentin Korenblit F: package/clang/ F: package/clinfo/ F: package/libclc/ -F: package/llvm/ +F: package/llvm-project/llvm/ N: Vanya Sergeev F: package/lua-periphery/ diff --git a/package/Config.in b/package/Config.in index 511e691ed3..629ee8329b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2107,7 +2107,7 @@ comment "linux-pam plugins" source "package/libpam-tacplus/Config.in" endif source "package/liquid-dsp/Config.in" - source "package/llvm/Config.in" + source "package/llvm-project/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" source "package/mpc/Config.in" diff --git a/package/llvm/0001-nfc-Fix-missing-include.patch b/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch similarity index 100% rename from package/llvm/0001-nfc-Fix-missing-include.patch rename to package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch diff --git a/package/llvm/Config.in b/package/llvm-project/llvm/Config.in similarity index 100% rename from package/llvm/Config.in rename to package/llvm-project/llvm/Config.in diff --git a/package/llvm/llvm.hash b/package/llvm-project/llvm/llvm.hash similarity index 100% rename from package/llvm/llvm.hash rename to package/llvm-project/llvm/llvm.hash diff --git a/package/llvm/llvm.mk b/package/llvm-project/llvm/llvm.mk similarity index 98% rename from package/llvm/llvm.mk rename to package/llvm-project/llvm/llvm.mk index 977c0a08c2..1adad17b16 100644 --- a/package/llvm/llvm.mk +++ b/package/llvm-project/llvm/llvm.mk @@ -4,9 +4,8 @@ # ################################################################################ -# LLVM, Clang and lld should be version bumped together -LLVM_VERSION = 11.1.0 -LLVM_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VERSION) +LLVM_VERSION = $(LLVM_PROJECT_VERSION) +LLVM_SITE = $(LLVM_PROJECT_SITE) LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz LLVM_LICENSE = Apache-2.0 with exceptions LLVM_LICENSE_FILES = LICENSE.TXT -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:11 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:11 +0100 Subject: [Buildroot] [PATCH v3 04/10] package/clang: move to llvm-project subfolder In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-5-romain.naour@smile.fr> From: Lang Daniel To make version bumping easier, move llvm to a new llvm-project subfolder and specify site and version for the project. Signed-off-by: Daniel Lang Signed-off-by: Romain Naour --- v3: move "package/llvm-project/clang/Config.in" entry in package/Config.in --- DEVELOPERS | 6 +++--- package/Config.in | 2 +- ...-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 0 package/{ => llvm-project}/clang/Config.in | 0 package/{ => llvm-project}/clang/clang.hash | 0 package/{ => llvm-project}/clang/clang.mk | 7 +++---- 6 files changed, 7 insertions(+), 8 deletions(-) rename package/{ => llvm-project}/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch (100%) rename package/{ => llvm-project}/clang/Config.in (100%) rename package/{ => llvm-project}/clang/clang.hash (100%) rename package/{ => llvm-project}/clang/clang.mk (96%) diff --git a/DEVELOPERS b/DEVELOPERS index bbb7e2c2fe..b5494c7f95 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1614,10 +1614,10 @@ F: support/testing/tests/package/test_python_aexpect.py N: Joseph Kogut F: package/at-spi2-atk/ F: package/at-spi2-core/ -F: package/clang/ F: package/earlyoom/ F: package/gconf/ F: package/libnss/ +F: package/llvm-project/clang/ F: package/llvm-project/lld/ F: package/llvm-project/llvm/ F: package/python-cython/ @@ -2561,7 +2561,6 @@ F: package/alure/ F: package/aubio/ F: package/binutils/ F: package/bullet/ -F: package/clang/ F: package/clinfo/ F: package/efl/ F: package/enet/ @@ -2580,6 +2579,7 @@ F: package/libgta/ F: package/libiec61850/ F: package/libspatialindex/ F: package/linux-syscall-support/ +F: package/llvm-project/clang/ F: package/llvm-project/llvm/ F: package/lugaru/ F: package/mcelog/ @@ -2988,9 +2988,9 @@ F: package/gettext-tiny/ F: package/tinyssh/ N: Valentin Korenblit -F: package/clang/ F: package/clinfo/ F: package/libclc/ +F: package/llvm-project/clang/ F: package/llvm-project/llvm/ N: Vanya Sergeev diff --git a/package/Config.in b/package/Config.in index 629ee8329b..1065196c63 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2006,7 +2006,6 @@ menu "Other" source "package/capnproto/Config.in" source "package/cctz/Config.in" 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" @@ -2107,6 +2106,7 @@ comment "linux-pam plugins" source "package/libpam-tacplus/Config.in" endif source "package/liquid-dsp/Config.in" + source "package/llvm-project/clang/Config.in" source "package/llvm-project/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" diff --git a/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch similarity index 100% rename from package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch rename to package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch diff --git a/package/clang/Config.in b/package/llvm-project/clang/Config.in similarity index 100% rename from package/clang/Config.in rename to package/llvm-project/clang/Config.in diff --git a/package/clang/clang.hash b/package/llvm-project/clang/clang.hash similarity index 100% rename from package/clang/clang.hash rename to package/llvm-project/clang/clang.hash diff --git a/package/clang/clang.mk b/package/llvm-project/clang/clang.mk similarity index 96% rename from package/clang/clang.mk rename to package/llvm-project/clang/clang.mk index 3c75f8d6b1..0943e21a8c 100644 --- a/package/clang/clang.mk +++ b/package/llvm-project/clang/clang.mk @@ -4,10 +4,9 @@ # ################################################################################ -# LLVM, Clang and lld should be version bumped together -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_VERSION_MAJOR = $(LLVM_PROJECT_VERSION_MAJOR) +CLANG_VERSION = $(LLVM_PROJECT_VERSION) +CLANG_SITE = $(LLVM_PROJECT_SITE) CLANG_SOURCE = clang-$(CLANG_VERSION).src.tar.xz CLANG_LICENSE = Apache-2.0 with exceptions CLANG_LICENSE_FILES = LICENSE.TXT -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:10 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:10 +0100 Subject: [Buildroot] [PATCH v3 03/10] package/lld: move to llvm-project subfolder In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-4-romain.naour@smile.fr> From: Lang Daniel To make version bumping easier, move llvm to a new llvm-project subfolder and specify site and version for the project. Signed-off-by: Daniel Lang Reviewed-by: Romain Naour Signed-off-by: Romain Naour --- DEVELOPERS | 2 +- package/Config.in.host | 2 +- package/{ => llvm-project}/lld/Config.in.host | 0 package/{ => llvm-project}/lld/lld.hash | 0 package/{ => llvm-project}/lld/lld.mk | 5 ++--- 5 files changed, 4 insertions(+), 5 deletions(-) rename package/{ => llvm-project}/lld/Config.in.host (100%) rename package/{ => llvm-project}/lld/lld.hash (100%) rename package/{ => llvm-project}/lld/lld.mk (87%) diff --git a/DEVELOPERS b/DEVELOPERS index 6244b30d0b..bbb7e2c2fe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1618,7 +1618,7 @@ F: package/clang/ F: package/earlyoom/ F: package/gconf/ F: package/libnss/ -F: package/lld/ +F: package/llvm-project/lld/ F: package/llvm-project/llvm/ F: package/python-cython/ F: package/python-pycups/ diff --git a/package/Config.in.host b/package/Config.in.host index dcadbfdfc1..9addc88522 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -51,7 +51,7 @@ menu "Host utilities" source "package/jsmin/Config.in.host" source "package/kmod/Config.in.host" source "package/libp11/Config.in.host" - source "package/lld/Config.in.host" + source "package/llvm-project/lld/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/lttng-babeltrace/Config.in.host" source "package/lzma-alone/Config.in.host" diff --git a/package/lld/Config.in.host b/package/llvm-project/lld/Config.in.host similarity index 100% rename from package/lld/Config.in.host rename to package/llvm-project/lld/Config.in.host diff --git a/package/lld/lld.hash b/package/llvm-project/lld/lld.hash similarity index 100% rename from package/lld/lld.hash rename to package/llvm-project/lld/lld.hash diff --git a/package/lld/lld.mk b/package/llvm-project/lld/lld.mk similarity index 87% rename from package/lld/lld.mk rename to package/llvm-project/lld/lld.mk index 4bf903cda0..46ec3b13ff 100644 --- a/package/lld/lld.mk +++ b/package/llvm-project/lld/lld.mk @@ -4,9 +4,8 @@ # ################################################################################ -# LLVM, Clang and lld should be version bumped together -LLD_VERSION = 11.1.0 -LLD_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLD_VERSION) +LLD_VERSION = $(LLVM_PROJECT_VERSION) +LLD_SITE = $(LLVM_PROJECT_SITE) LLD_SOURCE = lld-$(LLD_VERSION).src.tar.xz LLD_LICENSE = Apache-2.0 with exceptions LLD_LICENSE_FILES = LICENSE.TXT -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:12 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:12 +0100 Subject: [Buildroot] [PATCH v3 05/10] package/compiler-rt: move to llvm-project subfolder In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-6-romain.naour@smile.fr> From: Lang Daniel To make version bumping easier, move llvm to a new llvm-project subfolder and specify site and version for the project. Signed-off-by: Daniel Lang Reviewed-by: Romain Naour Signed-off-by: Romain Naour --- v3: move compiler-rt entry in package/Config.in --- DEVELOPERS | 2 +- package/Config.in | 2 +- package/{ => llvm-project}/compiler-rt/Config.in | 0 package/{ => llvm-project}/compiler-rt/compiler-rt.hash | 0 package/{ => llvm-project}/compiler-rt/compiler-rt.mk | 6 ++---- 5 files changed, 4 insertions(+), 6 deletions(-) rename package/{ => llvm-project}/compiler-rt/Config.in (100%) rename package/{ => llvm-project}/compiler-rt/compiler-rt.hash (100%) rename package/{ => llvm-project}/compiler-rt/compiler-rt.mk (85%) diff --git a/DEVELOPERS b/DEVELOPERS index b5494c7f95..188a6b9427 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1995,7 +1995,6 @@ 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/ @@ -2033,6 +2032,7 @@ F: package/libssh2/ F: package/libtalloc/ F: package/libqmi/ F: package/lighttpd/ +F: package/llvm-project/compiler-rt/ F: package/logrotate/ F: package/makedevs/ F: package/memtester/ diff --git a/package/Config.in b/package/Config.in index 1065196c63..61d85d60cb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2007,7 +2007,6 @@ menu "Other" source "package/cctz/Config.in" source "package/cereal/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" @@ -2107,6 +2106,7 @@ comment "linux-pam plugins" endif source "package/liquid-dsp/Config.in" source "package/llvm-project/clang/Config.in" + source "package/llvm-project/compiler-rt/Config.in" source "package/llvm-project/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" diff --git a/package/compiler-rt/Config.in b/package/llvm-project/compiler-rt/Config.in similarity index 100% rename from package/compiler-rt/Config.in rename to package/llvm-project/compiler-rt/Config.in diff --git a/package/compiler-rt/compiler-rt.hash b/package/llvm-project/compiler-rt/compiler-rt.hash similarity index 100% rename from package/compiler-rt/compiler-rt.hash rename to package/llvm-project/compiler-rt/compiler-rt.hash diff --git a/package/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk similarity index 85% rename from package/compiler-rt/compiler-rt.mk rename to package/llvm-project/compiler-rt/compiler-rt.mk index c8ea86e899..84add60801 100644 --- a/package/compiler-rt/compiler-rt.mk +++ b/package/llvm-project/compiler-rt/compiler-rt.mk @@ -4,11 +4,9 @@ # ################################################################################ -# 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_VERSION = $(LLVM_PROJECT_VERSION) 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_SITE = $(LLVM_PROJECT_SITE) COMPILER_RT_LICENSE = NCSA MIT COMPILER_RT_LICENSE_FILES = LICENSE.TXT COMPILER_RT_DEPENDENCIES = host-clang llvm -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:14 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:14 +0100 Subject: [Buildroot] [PATCH v3 07/10] package/llvm-project/llvm-cmake: new package In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-8-romain.naour@smile.fr> From: Lang Daniel This is a small host package containing shared cmake modules that are needed by various projects during configuration. For example llvm 15 needs it. Signed-off-by: Daniel Lang Signed-off-by: Romain Naour --- v3: - force llvm-cmake version to 15.0.3 since LLVM_PROJECT_VERSION is still at 11.1.0 - Keep cp as install command since there is no CMakefiles.txt - Add License information sinec it come from llvm-project --- package/llvm-project/llvm-cmake/llvm-cmake.hash | 2 ++ package/llvm-project/llvm-cmake/llvm-cmake.mk | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/llvm-project/llvm-cmake/llvm-cmake.hash create mode 100644 package/llvm-project/llvm-cmake/llvm-cmake.mk diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.hash b/package/llvm-project/llvm-cmake/llvm-cmake.hash new file mode 100644 index 0000000000..862c5d92e8 --- /dev/null +++ b/package/llvm-project/llvm-cmake/llvm-cmake.hash @@ -0,0 +1,2 @@ +# locally calculated +sha256 21cf3f52c53dc8b8972122ae35a5c18de09c7df693b48b5cd8553c3e3fed090d cmake-15.0.3.src.tar.xz diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.mk b/package/llvm-project/llvm-cmake/llvm-cmake.mk new file mode 100644 index 0000000000..b305797891 --- /dev/null +++ b/package/llvm-project/llvm-cmake/llvm-cmake.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# llvm-cmake +# +################################################################################ + +LLVM_CMAKE_VERSION = 15.0.3 +LLVM_CMAKE_SITE = $(LLVM_PROJECT_SITE) +LLVM_CMAKE_SOURCE = cmake-$(LLVM_CMAKE_VERSION).src.tar.xz +LLVM_CMAKE_LICENSE = Apache-2.0 with exceptions + +define HOST_LLVM_CMAKE_INSTALL_CMDS + mkdir -p $(HOST_DIR)/lib/cmake/llvm + cp -Rv $(@D)/Modules/* $(HOST_DIR)/lib/cmake/llvm +endef + +$(eval $(host-generic-package)) -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:13 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:13 +0100 Subject: [Buildroot] [PATCH v3 06/10] package/libclc: move to llvm-project subfolder In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-7-romain.naour@smile.fr> From: Lang Daniel To make version bumping easier, move llvm to a new llvm-project subfolder and specify site and version for the project. Signed-off-by: Daniel Lang --- v3: move libclc before llvm 15.0.3 version bump commit move libclc entry in package/Config.in --- DEVELOPERS | 4 ++-- package/Config.in | 2 +- .../libclc/0001-support-out-of-tree-build.patch | 0 package/{ => llvm-project}/libclc/Config.in | 0 package/{ => llvm-project}/libclc/libclc.hash | 0 package/{ => llvm-project}/libclc/libclc.mk | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename package/{ => llvm-project}/libclc/0001-support-out-of-tree-build.patch (100%) rename package/{ => llvm-project}/libclc/Config.in (100%) rename package/{ => llvm-project}/libclc/libclc.hash (100%) rename package/{ => llvm-project}/libclc/libclc.mk (93%) diff --git a/DEVELOPERS b/DEVELOPERS index 188a6b9427..203103e108 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2574,12 +2574,12 @@ F: package/irrlicht/ F: package/liblinear/ F: package/lensfun/ F: package/libbpf/ -F: package/libclc/ F: package/libgta/ F: package/libiec61850/ F: package/libspatialindex/ F: package/linux-syscall-support/ F: package/llvm-project/clang/ +F: package/llvm-project/libclc/ F: package/llvm-project/llvm/ F: package/lugaru/ F: package/mcelog/ @@ -2989,8 +2989,8 @@ F: package/tinyssh/ N: Valentin Korenblit F: package/clinfo/ -F: package/libclc/ F: package/llvm-project/clang/ +F: package/llvm-project/libclc/ F: package/llvm-project/llvm/ N: Vanya Sergeev diff --git a/package/Config.in b/package/Config.in index 61d85d60cb..d268a27975 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2045,7 +2045,6 @@ menu "Other" source "package/libcap/Config.in" source "package/libcap-ng/Config.in" source "package/libcgroup/Config.in" - source "package/libclc/Config.in" source "package/libcofi/Config.in" source "package/libcorrect/Config.in" source "package/libcrossguid/Config.in" @@ -2107,6 +2106,7 @@ endif source "package/liquid-dsp/Config.in" source "package/llvm-project/clang/Config.in" source "package/llvm-project/compiler-rt/Config.in" + source "package/llvm-project/libclc/Config.in" source "package/llvm-project/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" diff --git a/package/libclc/0001-support-out-of-tree-build.patch b/package/llvm-project/libclc/0001-support-out-of-tree-build.patch similarity index 100% rename from package/libclc/0001-support-out-of-tree-build.patch rename to package/llvm-project/libclc/0001-support-out-of-tree-build.patch diff --git a/package/libclc/Config.in b/package/llvm-project/libclc/Config.in similarity index 100% rename from package/libclc/Config.in rename to package/llvm-project/libclc/Config.in diff --git a/package/libclc/libclc.hash b/package/llvm-project/libclc/libclc.hash similarity index 100% rename from package/libclc/libclc.hash rename to package/llvm-project/libclc/libclc.hash diff --git a/package/libclc/libclc.mk b/package/llvm-project/libclc/libclc.mk similarity index 93% rename from package/libclc/libclc.mk rename to package/llvm-project/libclc/libclc.mk index 5d246cf4f8..406adfdb53 100644 --- a/package/libclc/libclc.mk +++ b/package/llvm-project/libclc/libclc.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCLC_VERSION = 13.0.1 -LIBCLC_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCLC_VERSION) +LIBCLC_SITE = $(LLVM_PROJECT_SITE) LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT LIBCLC_LICENSE_FILES = LICENSE.TXT -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:15 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:15 +0100 Subject: [Buildroot] [PATCH v3 08/10] package/llvm-project/llvm-libunwind: new package In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-9-romain.naour@smile.fr> From: Lang Daniel Starting with version 15, lld needs the llvm implementation of libunwind, therefore it is added as a host package. Signed-off-by: Daniel Lang Signed-off-by: Romain Naour --- v3: force llvm-libunwind version to 15.0.3 since LLVM_PROJECT_VERSION is still at 11.1.0 --- .../llvm-libunwind/llvm-libunwind.hash | 3 +++ .../llvm-libunwind/llvm-libunwind.mk | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 package/llvm-project/llvm-libunwind/llvm-libunwind.hash create mode 100644 package/llvm-project/llvm-libunwind/llvm-libunwind.mk diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.hash b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash new file mode 100644 index 0000000000..86775f5dba --- /dev/null +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 0ab6e07bf05359e242e9ea80e4089b819914867fa997a715e324e584bcfdf114 libunwind-15.0.3.src.tar.xz +sha256 b5efebcaca80879234098e52d1725e6d9eb8fb96a19fce625d39184b705f7b6d LICENSE.TXT diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.mk b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk new file mode 100644 index 0000000000..825e1beac0 --- /dev/null +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# llvm-libunwind +# +################################################################################ + +LLVM_LIBUNWIND_VERSION = 15.0.3 +LLVM_LIBUNWIND_SITE = $(LLVM_PROJECT_SITE) +LLVM_LIBUNWIND_SOURCE = libunwind-$(LLVM_LIBUNWIND_VERSION).src.tar.xz +LLVM_LIBUNWIND_LICENSE = Apache-2.0 with exceptions +LLVM_LIBUNWIND_LICENSE_FILES = LICENSE.TXT +LLVM_LIBUNWIND_SUPPORTS_IN_SOURCE_BUILD = NO + +HOST_LLVM_LIBUNWIND_CONF_OPTS += \ + -DCMAKE_MODULE_PATH="$(HOST_DIR)/lib/cmake/llvm" \ + -DLIBUNWIND_INSTALL_HEADERS=ON + +$(eval $(host-cmake-package)) -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:17 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:17 +0100 Subject: [Buildroot] [PATCH v3 10/10] DEVELOPERS: add Daniel Lang for llvm-project In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-11-romain.naour@smile.fr> From: Lang Daniel Signed-off-by: Daniel Lang Signed-off-by: Romain Naour --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 203103e108..33a4c1758a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -642,6 +642,7 @@ F: package/dacapo/ N: Daniel Lang F: package/dbus-cxx/ F: package/libsigc/ +F: package/llvm-project/ F: package/paho-mqtt-cpp/ N: Damien Lanson -- 2.34.3 From romain.naour at smile.fr Fri Feb 10 22:47:16 2023 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 10 Feb 2023 23:47:16 +0100 Subject: [Buildroot] [PATCH v3 09/10] package/llvm-project: bump to version 15.0.3 In-Reply-To: <20230210224717.3293906-1-romain.naour@smile.fr> References: <20230210224717.3293906-1-romain.naour@smile.fr> Message-ID: <20230210224717.3293906-10-romain.naour@smile.fr> From: Lang Daniel - Add new build dependencies to lld and llvm - Add host-gcc and gcc >= 7.x dependency since clang doesn't build with gcc 6.3 [ 28%] Building CXX object utils/TableGen/CMakeFiles/obj.clang-tblgen.dir/TableGen.cpp.o output/build/host-clang-15.0.3/utils/TableGen/RISCVVEmitter.cpp: In instantiation of ?{anonymous}::SemaSignatureTable::init(llvm::ArrayRef<{anonymous}::SemaRecord>):: [with auto:2 = const llvm::SmallVector]?: /usr/include/c++/6/bits/stl_algo.h:3769:5: required from ?_Funct std::for_each(_IIter, _IIter, _Funct) [with _IIter = std::_Rb_tree_const_iterator >; _Funct = {anonymous}::SemaSignatureTable::init(llvm::ArrayRef<{anonymous}::SemaRecord>)::]? output/host/include/llvm/ADT/STLExtras.h:1611:23: required from ?UnaryFunction llvm::for_each(R&&, UnaryFunction) [with R = std::set, {anonymous}::SemaSignatureTable::init(llvm::ArrayRef<{anonymous}::SemaRecord>)::Compare>&; UnaryFunction = {anonymous}::SemaSignatureTable::init(llvm::ArrayRef<{anonymous}::SemaRecord>)::]? output/build/host-clang-15.0.3/utils/TableGen/RISCVVEmitter.cpp:249:64: required from here output/build/host-clang-15.0.3/utils/TableGen/RISCVVEmitter.cpp:249:50: error: cannot call member function ?void {anonymous}::SemaSignatureTable::insert(llvm::ArrayRef)? without object llvm::for_each(Signatures, [this](auto &Sig) { insert(Sig); }); ^~~~~~ utils/TableGen/CMakeFiles/obj.clang-tblgen.dir/build.make:313: recipe for target 'utils/TableGen/CMakeFiles/obj.clang-tblgen.dir/RISCVVEmitter.cpp.o' failed make[4]: *** [utils/TableGen/CMakeFiles/obj.clang-tblgen.dir/RISCVVEmitter.cpp.o] Error 1 Indeed LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN is OFF, the CheckCompilerVersion.cmake trigger an error if gcc < 7.x. Indded since llvm 15 this option check for C++17 [1] The last gcc 7.x version (7.5) has been released in 2019. Fixing llvm/clang issues for old compiler maybe it's not worth it. [1] https://github.com/llvm/llvm-project/commit/4c72deb613d9d8838785b431facb3eb480fb2f51 - Remove LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN since gcc >= 7 is mendatory. Signed-off-by: Daniel Lang Signed-off-by: Romain Naour --- v3: - add libclc bump - llvm, clang, lld, mesa3d (llvm): add gcc >= 7.x dependency Changes v1 -> v2: - Bump to 15.0.3 instead of 15.0.1 - llvm: use CMAKE_HOST_C_COMPILER instead of HOSTCC --- package/llvm-project/clang/Config.in | 10 ++++---- package/llvm-project/clang/clang.hash | 2 +- package/llvm-project/clang/clang.mk | 8 +------ package/llvm-project/compiler-rt/Config.in | 6 ++--- .../llvm-project/compiler-rt/compiler-rt.hash | 2 +- .../llvm-project/compiler-rt/compiler-rt.mk | 3 ++- package/llvm-project/libclc/Config.in | 6 ++--- package/llvm-project/libclc/libclc.hash | 2 +- package/llvm-project/libclc/libclc.mk | 2 +- package/llvm-project/lld/Config.in.host | 6 ++--- package/llvm-project/lld/lld.hash | 2 +- package/llvm-project/lld/lld.mk | 8 +------ package/llvm-project/llvm-cmake/llvm-cmake.mk | 2 +- .../llvm-libunwind/llvm-libunwind.mk | 2 +- package/llvm-project/llvm-project.mk | 4 ++-- .../llvm/0001-nfc-Fix-missing-include.patch | 24 ------------------- package/llvm-project/llvm/Config.in | 10 ++++---- package/llvm-project/llvm/llvm.hash | 2 +- package/llvm-project/llvm/llvm.mk | 22 +++++++++-------- package/mesa3d/Config.in | 10 ++++---- 20 files changed, 50 insertions(+), 83 deletions(-) delete mode 100644 package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch diff --git a/package/llvm-project/clang/Config.in b/package/llvm-project/clang/Config.in index e4d455781e..2e23888720 100644 --- a/package/llvm-project/clang/Config.in +++ b/package/llvm-project/clang/Config.in @@ -1,13 +1,13 @@ config BR2_PACKAGE_CLANG bool "clang" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring - depends on BR2_HOST_GCC_AT_LEAST_5 + depends on BR2_HOST_GCC_AT_LEAST_7 select BR2_PACKAGE_LLVM help Clang is a C/C++, Objective C/C++ and OpenCL C front-end @@ -15,12 +15,12 @@ config BR2_PACKAGE_CLANG http://clang.llvm.org -comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" +comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 7, dynamic library, host gcc >= 7" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_HOST_GCC_AT_LEAST_5 + || !BR2_HOST_GCC_AT_LEAST_7 comment "clang needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS diff --git a/package/llvm-project/clang/clang.hash b/package/llvm-project/clang/clang.hash index 0136b80664..52c755cfb3 100644 --- a/package/llvm-project/clang/clang.hash +++ b/package/llvm-project/clang/clang.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 0a8288f065d1f57cb6d96da4d2965cbea32edc572aa972e466e954d17148558b clang-11.1.0.src.tar.xz +sha256 96036052694e703d159c995bda203b59d1ff185c6879189b9eba837726e1738c clang-15.0.3.src.tar.xz sha256 ebcd9bbf783a73d05c53ba4d586b8d5813dcdf3bbec50265860ccc885e606f47 LICENSE.TXT diff --git a/package/llvm-project/clang/clang.mk b/package/llvm-project/clang/clang.mk index 0943e21a8c..0bafd6461b 100644 --- a/package/llvm-project/clang/clang.mk +++ b/package/llvm-project/clang/clang.mk @@ -17,13 +17,6 @@ CLANG_INSTALL_STAGING = YES HOST_CLANG_DEPENDENCIES = host-llvm host-libxml2 CLANG_DEPENDENCIES = llvm host-clang -# LLVM >= 9.0 will soon require C++14 support, building llvm 8.x using a -# toolchain using gcc < 5.1 gives an error but actually still works. Setting -# this option makes it still build with gcc >= 4.8. -# https://reviews.llvm.org/D57264 -HOST_CLANG_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -CLANG_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON - # This option is needed, otherwise multiple shared libs # (libclangAST.so, libclangBasic.so, libclangFrontend.so, etc.) will # be generated. As a final shared lib containing all these components @@ -62,6 +55,7 @@ CLANG_CONF_OPTS += \ HOST_CLANG_CONF_OPTS += -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ -DCLANG_DEFAULT_LINKER=$(TARGET_LD) CLANG_CONF_OPTS += -DLLVM_DIR=$(STAGING_DIR)/usr/lib/cmake/llvm \ + -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm \ -DCLANG_TABLEGEN:FILEPATH=$(HOST_DIR)/bin/clang-tblgen \ -DLLVM_TABLEGEN_EXE:FILEPATH=$(HOST_DIR)/bin/llvm-tblgen diff --git a/package/llvm-project/compiler-rt/Config.in b/package/llvm-project/compiler-rt/Config.in index 02169b66c0..e8f2ac4201 100644 --- a/package/llvm-project/compiler-rt/Config.in +++ b/package/llvm-project/compiler-rt/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_COMPILER_RT bool "compiler-rt" depends on BR2_PACKAGE_LLVM depends on BR2_TOOLCHAIN_USES_GLIBC # asan lib requires - depends on BR2_HOST_GCC_AT_LEAST_5 # host-clang + depends on BR2_HOST_GCC_AT_LEAST_7 # host-clang help A collection of runtime libraries primarily used by clang and llvm to provide builtins, sanitizer runtimes, and profiling @@ -10,6 +10,6 @@ config BR2_PACKAGE_COMPILER_RT https://compiler-rt.llvm.org/ -comment "compiler-rt requires llvm to be enabled, a glibc toolchain, host gcc >= 5" +comment "compiler-rt requires llvm to be enabled, a glibc toolchain, host gcc >= 7" depends on !BR2_PACKAGE_LLVM - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_HOST_GCC_AT_LEAST_5 + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/llvm-project/compiler-rt/compiler-rt.hash b/package/llvm-project/compiler-rt/compiler-rt.hash index 8ee010ac5a..fe4e98164b 100644 --- a/package/llvm-project/compiler-rt/compiler-rt.hash +++ b/package/llvm-project/compiler-rt/compiler-rt.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274 compiler-rt-11.1.0.src.tar.xz +sha256 db958eee92d1571d8b7f76c1be8513817f1a888dcf6ced88aca871acfb0eeddd compiler-rt-15.0.3.src.tar.xz sha256 1a8f1058753f1ba890de984e48f0242a3a5c29a6a8f2ed9fd813f36985387e8d LICENSE.TXT diff --git a/package/llvm-project/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk index 84add60801..026650c7c8 100644 --- a/package/llvm-project/compiler-rt/compiler-rt.mk +++ b/package/llvm-project/compiler-rt/compiler-rt.mk @@ -17,7 +17,8 @@ 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)/bin/llvm-config + -DLLVM_CONFIG_PATH=$(HOST_DIR)/bin/llvm-config \ + -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm # The installation of the target runtime libraries defaults to DESTDIR, however # host-clang resources directory needs a link so Clang can find the runtime diff --git a/package/llvm-project/libclc/Config.in b/package/llvm-project/libclc/Config.in index 938933fdd3..85eb888578 100644 --- a/package/llvm-project/libclc/Config.in +++ b/package/llvm-project/libclc/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBCLC bool "libclc" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm + depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm help libclc is an open source, BSD licensed implementation of the library requirements of the OpenCL C programming language, @@ -9,6 +9,6 @@ config BR2_PACKAGE_LIBCLC http://libclc.llvm.org/ -comment "libclc needs host gcc >= 5" +comment "libclc needs host gcc >= 7" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on !BR2_HOST_GCC_AT_LEAST_5 + depends on !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/llvm-project/libclc/libclc.hash b/package/llvm-project/libclc/libclc.hash index c496291d81..7140884f6c 100644 --- a/package/llvm-project/libclc/libclc.hash +++ b/package/llvm-project/libclc/libclc.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 8f0213e52e2fcaca3dfcc438f05d0e15e9b3c96fd6b0994a802b267dc1047a1d libclc-13.0.1.src.tar.xz +sha256 07e8a2b31e07a8cc8a976a6bfd87797d2543d5a9530f449755bf5119acbdbe8e libclc-15.0.3.src.tar.xz sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT diff --git a/package/llvm-project/libclc/libclc.mk b/package/llvm-project/libclc/libclc.mk index 406adfdb53..9f303d6d2f 100644 --- a/package/llvm-project/libclc/libclc.mk +++ b/package/llvm-project/libclc/libclc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCLC_VERSION = 13.0.1 +LIBCLC_VERSION = $(LLVM_PROJECT_VERSION) LIBCLC_SITE = $(LLVM_PROJECT_SITE) LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT diff --git a/package/llvm-project/lld/Config.in.host b/package/llvm-project/lld/Config.in.host index d015fdd520..3bed364a79 100644 --- a/package/llvm-project/lld/Config.in.host +++ b/package/llvm-project/lld/Config.in.host @@ -1,7 +1,7 @@ config BR2_PACKAGE_HOST_LLD bool "host lld" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm - depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm + depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm help LLD is a linker from the LLVM project that is a drop-in replacement for system linkers, and runs much faster than @@ -10,6 +10,6 @@ config BR2_PACKAGE_HOST_LLD https://lld.llvm.org/ -comment "host lld needs host gcc >= 5" +comment "host lld needs host gcc >= 7" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on !BR2_HOST_GCC_AT_LEAST_5 + depends on !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/llvm-project/lld/lld.hash b/package/llvm-project/lld/lld.hash index 6d56ffcaab..2d2598dbeb 100644 --- a/package/llvm-project/lld/lld.hash +++ b/package/llvm-project/lld/lld.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 017a788cbe1ecc4a949abf10755870519086d058a2e99f438829aef24f0c66ce lld-11.1.0.src.tar.xz +sha256 cd5d0894a74b957ce78d62212c1df0b3876a7297593aaece6b0512285e3b8732 lld-15.0.3.src.tar.xz sha256 f7891568956e34643eb6a0db1462db30820d40d7266e2a78063f2fe233ece5a0 LICENSE.TXT diff --git a/package/llvm-project/lld/lld.mk b/package/llvm-project/lld/lld.mk index 46ec3b13ff..539dd0bd71 100644 --- a/package/llvm-project/lld/lld.mk +++ b/package/llvm-project/lld/lld.mk @@ -10,13 +10,7 @@ LLD_SOURCE = lld-$(LLD_VERSION).src.tar.xz LLD_LICENSE = Apache-2.0 with exceptions LLD_LICENSE_FILES = LICENSE.TXT LLD_SUPPORTS_IN_SOURCE_BUILD = NO -HOST_LLD_DEPENDENCIES = host-llvm - -# LLVM > 9.0 will soon require C++14 support, building llvm <= 9.0 using a -# toolchain using gcc < 5.1 gives an error but actually still works. Setting -# this option makes it still build with gcc >= 4.8. -# https://reviews.llvm.org/D57264 -HOST_LLD_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON +HOST_LLD_DEPENDENCIES = host-llvm host-llvm-libunwind # build as static libs as is done in llvm & clang HOST_LLD_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.mk b/package/llvm-project/llvm-cmake/llvm-cmake.mk index b305797891..33b6ba8339 100644 --- a/package/llvm-project/llvm-cmake/llvm-cmake.mk +++ b/package/llvm-project/llvm-cmake/llvm-cmake.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLVM_CMAKE_VERSION = 15.0.3 +LLVM_CMAKE_VERSION = $(LLVM_PROJECT_VERSION) LLVM_CMAKE_SITE = $(LLVM_PROJECT_SITE) LLVM_CMAKE_SOURCE = cmake-$(LLVM_CMAKE_VERSION).src.tar.xz LLVM_CMAKE_LICENSE = Apache-2.0 with exceptions diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.mk b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk index 825e1beac0..be9965a49a 100644 --- a/package/llvm-project/llvm-libunwind/llvm-libunwind.mk +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLVM_LIBUNWIND_VERSION = 15.0.3 +LLVM_LIBUNWIND_VERSION = $(LLVM_PROJECT_VERSION) LLVM_LIBUNWIND_SITE = $(LLVM_PROJECT_SITE) LLVM_LIBUNWIND_SOURCE = libunwind-$(LLVM_LIBUNWIND_VERSION).src.tar.xz LLVM_LIBUNWIND_LICENSE = Apache-2.0 with exceptions diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk index 747a6f5647..5859ff7cfc 100644 --- a/package/llvm-project/llvm-project.mk +++ b/package/llvm-project/llvm-project.mk @@ -4,8 +4,8 @@ # ################################################################################ -LLVM_PROJECT_VERSION_MAJOR = 11 -LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.0 +LLVM_PROJECT_VERSION_MAJOR = 15 +LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).0.3 LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) include $(sort $(wildcard package/llvm-project/*/*.mk)) diff --git a/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch b/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch deleted file mode 100644 index 62111ca138..0000000000 --- a/package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b498303066a63a203d24f739b2d2e0e56dca70d1 Mon Sep 17 00:00:00 2001 -From: serge-sans-paille -Date: Tue, 10 Nov 2020 14:55:25 +0100 -Subject: [PATCH] [nfc] Fix missing include - -[Retrieved (and backported) from: -https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1] -Signed-off-by: Fabrice Fontaine ---- - llvm/utils/benchmark/src/benchmark_register.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/benchmark/src/benchmark_register.h b/utils/benchmark/src/benchmark_register.h -index 0705e219f2fa2..4caa5ad4da079 100644 ---- a/utils/benchmark/src/benchmark_register.h -+++ b/utils/benchmark/src/benchmark_register.h -@@ -1,6 +1,7 @@ - #ifndef BENCHMARK_REGISTER_H - #define BENCHMARK_REGISTER_H - -+#include - #include - - #include "check.h" diff --git a/package/llvm-project/llvm/Config.in b/package/llvm-project/llvm/Config.in index d9d30a5ba5..ebb0fca66a 100644 --- a/package/llvm-project/llvm/Config.in +++ b/package/llvm-project/llvm/Config.in @@ -17,13 +17,13 @@ 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_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring - depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm + depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm help The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. @@ -59,12 +59,12 @@ config BR2_PACKAGE_LLVM_BPF endif -comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" +comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 7, dynamic library, host gcc >= 7" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_HOST_GCC_AT_LEAST_5 + || !BR2_HOST_GCC_AT_LEAST_7 comment "llvm needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS diff --git a/package/llvm-project/llvm/llvm.hash b/package/llvm-project/llvm/llvm.hash index e7f79492de..df9aa88411 100644 --- a/package/llvm-project/llvm/llvm.hash +++ b/package/llvm-project/llvm/llvm.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 ce8508e318a01a63d4e8b3090ab2ded3c598a50258cc49e2625b9120d4c03ea5 llvm-11.1.0.src.tar.xz +sha256 c39aec729662416dcbf0bfe53a9786b34e7d93d02908a0779a2f6d83ad0a4a27 llvm-15.0.3.src.tar.xz sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT diff --git a/package/llvm-project/llvm/llvm.mk b/package/llvm-project/llvm/llvm.mk index 1adad17b16..556a2f8c35 100644 --- a/package/llvm-project/llvm/llvm.mk +++ b/package/llvm-project/llvm/llvm.mk @@ -13,16 +13,16 @@ LLVM_CPE_ID_VENDOR = llvm LLVM_SUPPORTS_IN_SOURCE_BUILD = NO LLVM_INSTALL_STAGING = YES -# LLVM >= 9.0 can use python3 to build. -HOST_LLVM_DEPENDENCIES = host-python3 +HOST_LLVM_DEPENDENCIES = host-python3 host-llvm-cmake LLVM_DEPENDENCIES = host-llvm -# LLVM >= 9.0 will soon require C++14 support, building llvm 8.x using a -# toolchain using gcc < 5.1 gives an error but actually still works. Setting -# this option makes it still build with gcc >= 4.8. -# https://reviews.llvm.org/D57264 -HOST_LLVM_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -LLVM_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON +# Path to cmake modules from host-llvm-cmake +HOST_LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm +LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm + +# Assembly files for x64 in lib/Support/BLAKE3 need to be compiled +# by a C compiler +HOST_LLVM_CONF_OPTS += -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" # Don't build clang libcxx libcxxabi lldb compiler-rt lld polly as llvm subprojects # This flag assumes that projects are checked out side-by-side and not nested @@ -259,7 +259,8 @@ HOST_LLVM_CONF_OPTS += \ -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ -DLLVM_INCLUDE_GO_TESTS=OFF \ - -DLLVM_INCLUDE_TESTS=OFF + -DLLVM_INCLUDE_TESTS=OFF \ + -DLLVM_INCLUDE_BENCHMARKS=OFF LLVM_CONF_OPTS += \ -DLLVM_BUILD_EXAMPLES=OFF \ -DLLVM_BUILD_DOCS=OFF \ @@ -270,7 +271,8 @@ LLVM_CONF_OPTS += \ -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ -DLLVM_INCLUDE_GO_TESTS=OFF \ - -DLLVM_INCLUDE_TESTS=OFF + -DLLVM_INCLUDE_TESTS=OFF \ + -DLLVM_INCLUDE_BENCHMARKS=OFF # Copy llvm-config (host variant) to STAGING_DIR # llvm-config (host variant) returns include and lib directories diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index cae2161aa3..78b53fc248 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -24,21 +24,21 @@ 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_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring - depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm + depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm select BR2_PACKAGE_LLVM -comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" +comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 7, dynamic library, host gcc >= 7" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_HOST_GCC_AT_LEAST_5 + || !BR2_HOST_GCC_AT_LEAST_7 comment "llvm support needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS -- 2.34.3 From yann.morin.1998 at free.fr Fri Feb 10 23:11:29 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 00:11:29 +0100 Subject: [Buildroot] [git commit] package/nodejs: add patch to adjust default NodeJS search path Message-ID: <20230210231402.BA856852D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0de216f95fc28c57cc430f39f011d5f88ead083b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master By default, NodeJS searches global modules in /usr/lib/node, but NPM installs them in /usr/lib/node_modules/. Therefore by default, if one installs modules with BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL, they are not accessible by NodeJS, unless by passing a NODE_PATH=/usr/lib/node_modules/ variable. Since this is not obvious, and it's nicer when things work out of the box, we simply patch NodeJS to look for modules at the right place. See https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package for some discussions on this topic. Signed-off-by: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN --- ...l-modules-cjs-loader.js-adjust-default-pa.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch new file mode 100644 index 0000000000..5b93998e5e --- /dev/null +++ b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch @@ -0,0 +1,36 @@ +From a31425bdfcb5d695ab25c3d295898326784cffec Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 25 Sep 2022 11:10:06 +0200 +Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to + search modules + +NPM installs modules in /usr/lib/node_modules/, but by default NodeJS +searches for them only in /usr/lib/node/. We could also set the +NODE_PATH environment variable, but it is more convienient to have +NodeJS configured by default to find modules where they are installed. + +This issue is discussed at +https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package. + +Signed-off-by: Thomas Petazzoni +--- + lib/internal/modules/cjs/loader.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js +index f1971c40a4..5fe3884156 100644 +--- a/lib/internal/modules/cjs/loader.js ++++ b/lib/internal/modules/cjs/loader.js +@@ -1261,7 +1261,8 @@ Module._initPaths = function() { + path.resolve(process.execPath, '..') : + path.resolve(process.execPath, '..', '..'); + +- const paths = [path.resolve(prefixDir, 'lib', 'node')]; ++ const paths = [path.resolve(prefixDir, 'lib', 'node'), ++ path.resolve(prefixDir, 'lib', 'node_modules')]; + + if (homeDir) { + ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); +-- +2.37.3 + From yann.morin.1998 at free.fr Fri Feb 10 23:13:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 00:13:08 +0100 Subject: [Buildroot] [git commit] support/testing/tests: add NodeJS tests Message-ID: <20230210231402.CC01A852E0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f25b0b6d1dcc8580f6b880eb57872b5c4064b89f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit adds two new test cases: - TestNodeJSBasic which builds a target configuration with just NodeJS enabled, and which runs a very simple NodeJS script on the target. - TestNodeJSModule, which builds a target configuration with NodeJS enabled + the installation of one extra module, which means npm on the host (from host-nodejs) is used, and which runs a very simple NodeJS script on the target that uses this extra module. Having both tests separately allows to validate that both nodejs-only and nodejs+host-nodejs configurations behave correctly, at least in minimal scenarios. Signed-off-by: Thomas Petazzoni Tested-by: Romain Naour Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 ++ .../testing/tests/package/sample_nodejs_basic.js | 3 ++ .../testing/tests/package/sample_nodejs_module.js | 7 +++ support/testing/tests/package/test_nodejs.py | 52 ++++++++++++++++++++++ 4 files changed, 65 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0af1323340..ae698f87c5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2944,11 +2944,14 @@ F: package/weston/ F: support/testing/tests/boot/test_grub.py F: support/testing/tests/boot/test_grub/ F: support/testing/tests/boot/test_syslinux.py +F: support/testing/tests/package/sample_nodejs_basic.js +F: support/testing/tests/package/sample_nodejs_module.js F: support/testing/tests/package/sample_python_augeas.py F: support/testing/tests/package/sample_python_flask.py F: support/testing/tests/package/sample_python_flask_expects_json.py F: support/testing/tests/package/sample_python_git.py F: support/testing/tests/package/sample_python_unittest_xml_reporting.py +F: support/testing/tests/package/test_nodejs.py F: support/testing/tests/package/test_python_augeas.py F: support/testing/tests/package/test_python_flask.py F: support/testing/tests/package/test_python_flask_expects_json.py diff --git a/support/testing/tests/package/sample_nodejs_basic.js b/support/testing/tests/package/sample_nodejs_basic.js new file mode 100644 index 0000000000..7633173c64 --- /dev/null +++ b/support/testing/tests/package/sample_nodejs_basic.js @@ -0,0 +1,3 @@ +var assert = require('assert'); +assert.strictEqual(1, 1); +console.log("Hello World"); diff --git a/support/testing/tests/package/sample_nodejs_module.js b/support/testing/tests/package/sample_nodejs_module.js new file mode 100644 index 0000000000..57aee73408 --- /dev/null +++ b/support/testing/tests/package/sample_nodejs_module.js @@ -0,0 +1,7 @@ +var assert = require('assert'); +var lodash = require('lodash'); +result = lodash.chunk(['a', 'b', 'c', 'd'], 2); +expected = [ [ 'a', 'b' ], [ 'c', 'd' ] ]; +assert.deepStrictEqual(result, expected) + + diff --git a/support/testing/tests/package/test_nodejs.py b/support/testing/tests/package/test_nodejs.py new file mode 100644 index 0000000000..9463c76b72 --- /dev/null +++ b/support/testing/tests/package/test_nodejs.py @@ -0,0 +1,52 @@ +import os + +import infra.basetest + + +class TestNodeJSBasic(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_NODEJS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), + infra.filepath("tests/package/sample_nodejs_basic.js")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + self.assertRunOk("node sample_nodejs_basic.js") + + +class TestNodeJSModule(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_NODEJS=y + BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="lodash" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), + infra.filepath("tests/package/sample_nodejs_module.js")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + self.assertRunOk("node sample_nodejs_module.js") From yann.morin.1998 at free.fr Fri Feb 10 23:18:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 00:18:16 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/nodejs: add patch to adjust default NodeJS search path In-Reply-To: References: <20220925192030.1648496-1-thomas.petazzoni@bootlin.com> Message-ID: <20230210231816.GB2796@scaer> Thomas, All, On 2023-02-08 14:51 +0100, Romain Naour spake thusly: > Le 25/09/2022 ? 21:20, Thomas Petazzoni a ?crit?: > > By default, NodeJS searches global modules in /usr/lib/node, but NPM > > installs them in /usr/lib/node_modules/. Therefore by default, if one > > installs modules with BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL, they are > > not accessible by NodeJS, unless by passing a > > NODE_PATH=/usr/lib/node_modules/ variable. Since this is not obvious, > > and it's nicer when things work out of the box, we simply patch NodeJS > > to look for modules at the right place. > > > > See > > https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package > > for some discussions on this topic. > > Note: The nodejs package has been update to 16.18.1 since your v2 of nodejs series. > > Reviewed-by: Romain Naour I could not find the original patch in my mailbox, so I'll reply here: Applied to master, thanks. Regards, Yann E. MORIN. > Best regards, > Romain > > > > > > Signed-off-by: Thomas Petazzoni > > --- > > Changes since v1: > > - Search for both /usr/lib/node and /usr/lib/node_modules as suggested > > by Yann > > --- > > ...ules-cjs-loader.js-adjust-default-pa.patch | 36 +++++++++++++++++++ > > 1 file changed, 36 insertions(+) > > create mode 100644 package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch > > > > diff --git a/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch > > new file mode 100644 > > index 0000000000..5b93998e5e > > --- /dev/null > > +++ b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch > > @@ -0,0 +1,36 @@ > > +From a31425bdfcb5d695ab25c3d295898326784cffec Mon Sep 17 00:00:00 2001 > > +From: Thomas Petazzoni > > +Date: Sun, 25 Sep 2022 11:10:06 +0200 > > +Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to > > + search modules > > + > > +NPM installs modules in /usr/lib/node_modules/, but by default NodeJS > > +searches for them only in /usr/lib/node/. We could also set the > > +NODE_PATH environment variable, but it is more convienient to have > > +NodeJS configured by default to find modules where they are installed. > > + > > +This issue is discussed at > > +https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package. > > + > > +Signed-off-by: Thomas Petazzoni > > +--- > > + lib/internal/modules/cjs/loader.js | 3 ++- > > + 1 file changed, 2 insertions(+), 1 deletion(-) > > + > > +diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js > > +index f1971c40a4..5fe3884156 100644 > > +--- a/lib/internal/modules/cjs/loader.js > > ++++ b/lib/internal/modules/cjs/loader.js > > +@@ -1261,7 +1261,8 @@ Module._initPaths = function() { > > + path.resolve(process.execPath, '..') : > > + path.resolve(process.execPath, '..', '..'); > > + > > +- const paths = [path.resolve(prefixDir, 'lib', 'node')]; > > ++ const paths = [path.resolve(prefixDir, 'lib', 'node'), > > ++ path.resolve(prefixDir, 'lib', 'node_modules')]; > > + > > + if (homeDir) { > > + ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); > > +-- > > +2.37.3 > > + > > _______________________________________________ > 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 Feb 10 23:18:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 00:18:48 +0100 Subject: [Buildroot] [PATCH v2 2/2] support/testing/tests: add NodeJS tests In-Reply-To: References: <20220925192030.1648496-1-thomas.petazzoni@bootlin.com> <20220925192030.1648496-2-thomas.petazzoni@bootlin.com> Message-ID: <20230210231848.GC2796@scaer> Thomas, All, On 2023-02-08 16:43 +0100, Romain Naour spake thusly: > Le 25/09/2022 ? 21:20, Thomas Petazzoni a ?crit?: > > This commit adds two new test cases: > > > > - TestNodeJSBasic which builds a target configuration with just > > NodeJS enabled, and which runs a very simple NodeJS script on the > > target. > > > > - TestNodeJSModule, which builds a target configuration with NodeJS > > enabled + the installation of one extra module, which means npm on > > the host (from host-nodejs) is used, and which runs a very simple > > NodeJS script on the target that uses this extra module. > > > > Having both tests separately allows to validate that both nodejs-only > > and nodejs+host-nodejs configurations behave correctly, at least in > > minimal scenarios. > > NodeJS takes ages to build Muahahaha! :-) > Tested-by: Romain Naour I could not find the original patch in my mailbox, so I'll reply here: Applied to master, thanks. Regards, Yann E. MORIN. > > Best regards, > Romain > > > > > > Signed-off-by: Thomas Petazzoni > > --- > > DEVELOPERS | 3 ++ > > .../tests/package/sample_nodejs_basic.js | 3 ++ > > .../tests/package/sample_nodejs_module.js | 7 +++ > > support/testing/tests/package/test_nodejs.py | 52 +++++++++++++++++++ > > 4 files changed, 65 insertions(+) > > create mode 100644 support/testing/tests/package/sample_nodejs_basic.js > > create mode 100644 support/testing/tests/package/sample_nodejs_module.js > > create mode 100644 support/testing/tests/package/test_nodejs.py > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index 51d025173a..564149de0f 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -2927,11 +2927,14 @@ F: package/weston/ > > F: support/testing/tests/boot/test_grub.py > > F: support/testing/tests/boot/test_grub/ > > F: support/testing/tests/boot/test_syslinux.py > > +F: support/testing/tests/package/sample_nodejs_basic.js > > +F: support/testing/tests/package/sample_nodejs_module.js > > F: support/testing/tests/package/sample_python_augeas.py > > F: support/testing/tests/package/sample_python_flask.py > > F: support/testing/tests/package/sample_python_flask_expects_json.py > > F: support/testing/tests/package/sample_python_git.py > > F: support/testing/tests/package/sample_python_unittest_xml_reporting.py > > +F: support/testing/tests/package/test_nodejs.py > > F: support/testing/tests/package/test_python_augeas.py > > F: support/testing/tests/package/test_python_flask.py > > F: support/testing/tests/package/test_python_flask_expects_json.py > > diff --git a/support/testing/tests/package/sample_nodejs_basic.js b/support/testing/tests/package/sample_nodejs_basic.js > > new file mode 100644 > > index 0000000000..7633173c64 > > --- /dev/null > > +++ b/support/testing/tests/package/sample_nodejs_basic.js > > @@ -0,0 +1,3 @@ > > +var assert = require('assert'); > > +assert.strictEqual(1, 1); > > +console.log("Hello World"); > > diff --git a/support/testing/tests/package/sample_nodejs_module.js b/support/testing/tests/package/sample_nodejs_module.js > > new file mode 100644 > > index 0000000000..57aee73408 > > --- /dev/null > > +++ b/support/testing/tests/package/sample_nodejs_module.js > > @@ -0,0 +1,7 @@ > > +var assert = require('assert'); > > +var lodash = require('lodash'); > > +result = lodash.chunk(['a', 'b', 'c', 'd'], 2); > > +expected = [ [ 'a', 'b' ], [ 'c', 'd' ] ]; > > +assert.deepStrictEqual(result, expected) > > + > > + > > diff --git a/support/testing/tests/package/test_nodejs.py b/support/testing/tests/package/test_nodejs.py > > new file mode 100644 > > index 0000000000..9463c76b72 > > --- /dev/null > > +++ b/support/testing/tests/package/test_nodejs.py > > @@ -0,0 +1,52 @@ > > +import os > > + > > +import infra.basetest > > + > > + > > +class TestNodeJSBasic(infra.basetest.BRTest): > > + config = \ > > + """ > > + BR2_arm=y > > + BR2_cortex_a9=y > > + BR2_ARM_ENABLE_VFP=y > > + BR2_TOOLCHAIN_EXTERNAL=y > > + BR2_PACKAGE_NODEJS=y > > + BR2_TARGET_ROOTFS_CPIO=y > > + # BR2_TARGET_ROOTFS_TAR is not set > > + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" > > + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" > > + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), > > + infra.filepath("tests/package/sample_nodejs_basic.js")) > > + > > + def test_run(self): > > + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") > > + self.emulator.boot(arch="armv7", > > + kernel="builtin", > > + options=["-initrd", cpio_file]) > > + self.emulator.login() > > + self.assertRunOk("node sample_nodejs_basic.js") > > + > > + > > +class TestNodeJSModule(infra.basetest.BRTest): > > + config = \ > > + """ > > + BR2_arm=y > > + BR2_cortex_a9=y > > + BR2_ARM_ENABLE_VFP=y > > + BR2_TOOLCHAIN_EXTERNAL=y > > + BR2_PACKAGE_NODEJS=y > > + BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="lodash" > > + BR2_TARGET_ROOTFS_CPIO=y > > + # BR2_TARGET_ROOTFS_TAR is not set > > + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" > > + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" > > + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), > > + infra.filepath("tests/package/sample_nodejs_module.js")) > > + > > + def test_run(self): > > + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") > > + self.emulator.boot(arch="armv7", > > + kernel="builtin", > > + options=["-initrd", cpio_file]) > > + self.emulator.login() > > + self.assertRunOk("node sample_nodejs_module.js") > > _______________________________________________ > 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 nodeax at gmail.com Fri Feb 10 23:28:16 2023 From: nodeax at gmail.com (Akshay Bhat) Date: Fri, 10 Feb 2023 15:28:16 -0800 Subject: [Buildroot] [PATCH 1/1] package/libiberty: bump version to 2.38 In-Reply-To: <20230210231315.17b367e6@windsurf> References: <20230210180222.88328-1-nodeax@gmail.com> <20230210231315.17b367e6@windsurf> Message-ID: Hi Thomas, On Fri, Feb 10, 2023 at 2:13 PM Thomas Petazzoni wrote: > Thanks a lot for the fix. Is this fixing > http://autobuild.buildroot.net/results/eaf/eaf23ea0c8d7803e3768da40b7070d04801cd36f/build-end.log > perhaps? Yes, that is the issue being fixed! In my case, I enabled the partial initramfs feature. This resulted in the below dependencies: host-dracut -> host-prelink-cross -> host-libiberty If host-libiberty gets built before host-binutils and the versions are different (i.e. functions don't match up) then it results in the above error. > > One issue that I see is that the binutils version is configurable: we > support 2.37, 2.38, 2.39 and the special ARC version. Do we need to > make the libiberty version match with that? > FWIW, the 2.38 version of libiberty does not result in build errors with either 2.37 or 2.39 version of binutils. Happened to get lucky because the libiberty related function defs are largely same-ish between those versions. Obviously this can break with the next version of binutils, so a long term fix is needed. Not sure about the special ARC version, I did not test that case. > Also, see the conversation starting at: > > https://lore.kernel.org/buildroot/3f3d266c-2f21-197c-29b7-fff3e230e97a at smile.fr/ > Thanks, hadn't seen that post before sending the patch and it looks like this package has had some history! I agree, whatever decision comes from that discussion should be the long term fix. Thanks, Akshay From romain.naour at gmail.com Fri Feb 10 23:36:58 2023 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 11 Feb 2023 00:36:58 +0100 Subject: [Buildroot] [PATCH] package/busybox: disable stack optimization for i386 target Message-ID: <20230210233658.3763549-1-romain.naour@gmail.com> The toolchain-builder project reported an issue with Qemu 7.2.0 for x86-core2--glibc--bleeding-edge toolchain [1]: Run /sbin/init as init process random: fast init done EXT4-fs (vda): warning: mounting unchecked fs, running e2fsck is recommended EXT4-fs (vda): re-mounted. Opts: (null). Quota mode: disabled. Starting syslogd: OK traps: syslogd[52] general protection fault ip:b7e21465 sp:bfe59e6c error:0 in libc.so.6[b7d9b000+123000] Starting klogd: OK traps: klogd[56] general protection fault ip:b7e94465 sp:bf8f069c error:0 in libc.so.6[b7e0e000+123000] Running sysctl: traps: logger[62] general protection fault ip:b7e48b6c sp:bfd7d194 error:0 in libc.so.6[b7e05000+123000] Segmentation fault traps: logger[64] general protection fault ip:b7dd3b6c sp:bf9b8604 error:0 in libc.so.6[b7d90000+123000] Segmentation fault (Followed by a kernel panic.) Testing with the pevious Qemu release (7.1.0) allows to boot the system without any problem. Building qemu sources between 7.1.0 and 7.2.0 allows to identify the first "bad" commit [2] and report to the Qemu project [3]. Thanks to Qemu maintainers review, several issues was noticed: "The default i386 busybox build config does not respect glibc's requirements around stack alignment (see [4] for previous discussions and a workaround)." Disabling CONFIG_STACK_OPTIMIZATION_386 option (as suggested in the Gentoo bug report) fixed the issue! This option has been added and enabled by default in buxybox 1_29_0, so it was used since then the for Buildroot's qemu defconfig. Note: The x86-i686--glibc--bleeding-edge (generic x86) doesn't trigger the issue with CONFIG_STACK_OPTIMIZATION_386 enabled. Fixes: https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 [1] https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 [2] https://gitlab.com/qemu-project/qemu/-/commit/958e1dd1300f37f18b2161dfb4eb806fc8c19b44 [3] https://gitlab.com/qemu-project/qemu/-/issues/1478 [4] https://bugs.gentoo.org/725674 Signed-off-by: Romain Naour --- package/busybox/busybox-minimal.config | 2 +- package/busybox/busybox.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 1fb4e39e21..1e7ad1d357 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -53,7 +53,7 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set -CONFIG_STACK_OPTIMIZATION_386=y +# CONFIG_STACK_OPTIMIZATION_386 is not set CONFIG_STATIC_LIBGCC=y # diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 4826fb8242..6e8bd2799d 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -53,7 +53,7 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set -CONFIG_STACK_OPTIMIZATION_386=y +# CONFIG_STACK_OPTIMIZATION_386 is not set CONFIG_STATIC_LIBGCC=y # -- 2.34.3 From thomas.petazzoni at bootlin.com Sat Feb 11 06:39:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 11 Feb 2023 06:39:10 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-10 Message-ID: <20230211063917.ACD0041730@smtp2.osuosl.org> Hello, Autobuild statistics for 2023-02-10 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 1 | 2 | 0 | 3 | 2022.11.x | 21 | 18 | 0 | 39 | master | 169 | 190 | 2 | 361 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 12 elfutils-0.186 | 8 host-go-1.19.5 | 8 unknown | 8 libsolv-0.7.22 | 7 linux-6.1.9 | 7 aubio-0.4.9 | 5 busybox-1.36.0 | 5 host-pahole-1.24 | 5 host-binutils-2.38 | 4 libglib2-2.72.3 | 4 python-bcrypt-4.0.1 | 4 python-cryptography-39.0.0 | 4 fluent-bit-2.0.8 | 3 gerbera-1.10.0 | 3 glibc-2.36-81-g4f4d7a13edfd... | 3 host-binutils-2.39 | 3 ltp-testsuite-20220930 | 3 zabbix-5.4.9 | 3 dropbear-2022.83 | 2 fs/ubifs/ubifs.mk:49: /home... | 2 gobject-introspection | 2 host-rust-1.67.0 | 2 libgcrypt-1.10.1 | 2 libglvnd-1.4.0 | 2 libgpg-error-1.46 | 2 norm-1.5.8 | 2 perl-5.36.0 | 2 php-8.2.1 | 2 ssdp-responder-1.9 | 2 systemd-252.4 | 2 ace-7.0.6 | 1 alsa-lib-1.2.8 | 1 assimp-5.2.5 | 1 binutils-arc-2020.09-release | 1 boost-1.80.0 | 1 boot-wrapper-aarch64-8d5a76... | 1 brltty-6.5 | 1 ctorrent-dnh3.3.2 | 1 dmalloc-5.6.5 | 1 dust-0.8.1 | 1 edk2-edk2-stable202208 | 1 fftw-quad-3.3.8 | 1 fontconfig-2.13.1 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/jffs2/jffs2.mk:71: /home... | 1 fs/romfs/romfs.mk:32: /home... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 glibmm-2.68.2 | 1 gqrx-2.14.4 | 1 host-binutils-2.37 | 1 host-gdb-arc-2020.09-releas... | 1 host-sentry-cli-2.8.0 | 1 jack2-1.9.21 | 1 janet-1.26.0 | 1 json-c-0.16 | 1 kexec-2.0.25 | 1 libcap-ng-0.8.3 | 1 libnetfilter_log-1.0.2 | 1 libnss-3.87 | 1 linux-5.10.162-cip24 | 1 linux-fusion-9.0.3 | 1 modem-manager-1.20.4 | 1 modsecurity2-2.9.7 | 1 musl-1.2.3 | 1 netsurf-3.10 | 1 olsr-0.9.8 | 1 open-iscsi-2.1.8 | 1 openblas-0.3.21 | 1 opencv3-3.4.17 | 1 package/multipath-tools/mul... | 1 pcre2-10.42 | 1 php-xdebug-3.0.4 | 1 proxychains-ng-4.16 | 1 pv-1.6.20 | 1 python-numpy-1.23.5 | 1 python-pyicu-2.10.2 | 1 quickjs-2021-03-27 | 1 ramspeed-2.6.0 | 1 rtl_433-22.11 | 1 ti-k3-r5-loader-2022.10 | 1 toolchain-external-codescap... | 1 uccp420wlan-6.9.1 | 1 uclibc-ng-test-6790eafe897b... | 1 ulog-0389d243352255f6182326... | 1 uqmi-0a19b5b77140465c29e2af... | 1 wolfssl-5.5.3 | 1 wtfutil-0.41.0 | 1 xerces-3.2.4 | 1 zfs-2.1.7 | 1 zxing-cpp-1.4.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblaze | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/69c56f97b60875af15a0f1f3d427fea516d0f0c9 | or1k | alsa-lib-1.2.8 | NOK | http://autobuild.buildroot.net/results/d78262854daf4f9c0ec2a95aa8b51ae3914fa579 | mips | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/2036eb2e2de57685db039f7f15acdf92eaaa0f83 | ORPH x86_64 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/b63aff4f78071417a8e3d0f9521ba0958aceee11 | xtensa | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/d7ce4b18815c29a81d40e9a8db7693b8f2724ece | s390x | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/fcd36dfff65fb4785c371768daa0d1aa7423cb34 | mips64el | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/2960045d52a094678bdde1a5a389d51609d10679 | armeb | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/12155d15370c23478f3e5e92c0858509ab2352d0 | arceb | binutils-arc-2020.09-release | NOK | http://autobuild.buildroot.net/results/20b8153f5bfb82e39452b17ea5ac595bdcfbf295 | arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/23ed4993a7b8e572bf3336baed775812d205b27b | aarch64 | boot-wrapper-aarch64-8d5a76... | NOK | http://autobuild.buildroot.net/results/44287ccc8cc9767704642919e6d928d1f57b436d | microblazeel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/8eeee331a5359e36e0c14708e1471e18a413dfb6 | mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/599e1e07364ff3512f1b0746fc439cf250163933 | ORPH mipsel | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/4653420db351d716b4410fdba3c99ac89bbd395f | ORPH arm | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/4840a3570301d11b9d6f80c18ef94781bca10732 | ORPH mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/1fcaae98548d1d135bfdc240842f9bbe9bb7d9c0 | ORPH mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/32f933867f71aa5ffdb1309ab720f267715e42dd | ORPH riscv64 | ctorrent-dnh3.3.2 | NOK | http://autobuild.buildroot.net/results/d9c568415db17114bcded0c1e866ad2a84a7e619 | i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/b43b535f04ca5c8893e1da6c72acd90dc49d9aa7 | ORPH riscv64 | dropbear-2022.83 | NOK | http://autobuild.buildroot.net/results/9fec37c57abf7e0a1fc55c7bf58f5dc955352b00 | riscv64 | dropbear-2022.83 | NOK | http://autobuild.buildroot.net/results/09cf3927d18ae4fa541977d7754f9685f508dcb4 | sparc64 | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/d0c40c0e65a70b8826e53f39f8881c5bc5521085 | ORPH x86_64 | edk2-edk2-stable202208 | NOK | http://autobuild.buildroot.net/results/e1e255c9f9d030925a3c1f83dcd3f88b83883e31 | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/8831d1e320d42541ae64beb7643b6f4a440333df | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/d89d9141670f07eb2363a5d998ce946b8eda3094 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3e92a1334d195c588c55b0459b5caa65e4087755 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/904e02fb832a10acd14fb502fd087540fd33f39d | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/86fe0f257e4d736f9f8e756ed747c1bce6b56aea | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3f519075d1b56fac11e4f34f298a1bdb045c896f | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/058669a230c550dc3d0332a2535b2163006b22f4 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/7217faa42917b71420a995869dc700498da590c7 | ORPH powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/a7b33d49b83c1fddc7a17d323f4d06a965de1b0d | ORPH s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/ce7302f077d51da25e3df1f02be76ab779c952d8 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/836e46e782eececed72a21235ce1dd7b5183a6f2 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/a15b2515fc8653aca1d8df7a62097fd23128adba | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/17095094df24655f2d427fdfedf2be4aeb449d0b | ORPH mips | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/ca69ce0923a5554fbe694817635f102b819ef57c | arm | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/30c66e57f4fbd1fe426896f4e795402281923106 | powerpc | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/0dc8fd412a2c2e063ff8ecdc310a177eced912a1 | mipsel | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/966b5bf54a62c007d0b58048dcb9580c5e49108a | armeb | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/e09045a05312d6eadfd6f3e589a4096ebb3ece70 | x86_64 | fs/jffs2/jffs2.mk:71: /home... | NOK | http://autobuild.buildroot.net/results/0445b0b159919ddf25ccda2cf04c0aab6033721c | powerpc64le | fs/romfs/romfs.mk:32: /home... | NOK | http://autobuild.buildroot.net/results/ba1c74a76fd0bcca47f46f81951765ea3ddcd92b | aarch64_be | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/0bd3530c1f1eb315493ea56a868e40b7c6506047 | riscv32 | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/ca6b49c6360c8c566b381ac45db72b404cc3faf7 | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/eef3275b37f02b136d9335dba25d4fd0b9707617 | powerpc64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/12408df70811689194d2c7783ed1ede0c8bfd4fd | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/233022227907bfd988312ab968bbfb63d0782b7a | microblaze | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/8763f44444ab4f803bfe7829adf013b62e952c6d | aarch64_be | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/9d22bfc2a116c00a61c9208a9a6fdd2921d841ee | i686 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/3c816d2b7d6d209222ee33fcd546c08a57c6707f | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/f0afd0264318b9b2c97de4b002c2ba6fc10468fe | powerpc64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/67c878dfda4a109acb96daac22086fe451a2a540 | sparc64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/f541f5b859b4744c07373e50f0eb3d60046bdde8 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/432f7113f5695f9cef10301cb8336f761006af70 | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b980b2bfdbb2c07baf9c1a528d6d78193757fb15 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/cfb2ad76dc1c977ad2ce10d310577e149905e5ff | or1k | glibmm-2.68.2 | NOK | http://autobuild.buildroot.net/results/06353e89aff157b86978ff92dee5546b94cca364 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/a4bf6907ce8368fc50d06d6b1bcf1ae372a1ee8e | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/95ac2510e098fcd1b678dc56f955b8cf656ea048 | s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/40b6a3283361171b494a4e61e3575a4981328854 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/dcd2ce692b66ff1b744fdd271e336ddad35f8fe1 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/56de6b95ac1d085c743cac14a714dd308370c897 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5d70bfe310b9980b64687739eae12563d633a690 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/a4b276935182ec3ad5790b8b7bfa1d71d72146b2 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/cd57cadbaffc34552cbe77e3b41b81a577ed5551 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d00fe47cba797af5c772c60cc5a16b9e343f92de | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3a5b8afca39df46f72565fb84614926a091b6050 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5d8eae466f39f77d33f0a893e7b568f434b15148 | ORPH mips | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/82c865bbca8ea6da68bd466d863bff7d46f4b54f | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/e8d93c273779d05954de6a5f4e5a5ac99cae1d9a | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/a264ad20b70c13a3edcfb20da7fe85b1c755640c | ORPH or1k | gqrx-2.14.4 | NOK | http://autobuild.buildroot.net/results/862d1f33c183464ec226994b3754e223f4d89486 | microblaze | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/d5df12a9deb65395b34c242168723e40908984bd | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/21bb5ea5f1b2c83837ecc319bb00dae72a02564b | armeb | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/5258f31067dc891a8d9d9a34893bcb90283b448a | powerpc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/eaf23ea0c8d7803e3768da40b7070d04801cd36f | xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/3994150b82678476b7d7315cc3e069da1c9b1756 | microblazeel | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/def9284e3812a83ff6cc0f8724a6452b77fa1706 | arceb | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/5553103f634e585d8f12d4286731f366fc78db33 | mips | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/4e19b53e181563e8f39ffef24c5dadbbe90b9143 | arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/37593a4d773a2db59b4ad14ff3e5106b01b39bb9 | ORPH aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/c578920d6c707aef6a6ecfc0c0969ab3c0129e45 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/260f4e2579976a05ed6520eb11b9b768dd111995 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/057724d45c5c203b1e1942c0f1bf6f089800dea4 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/60bcb2ef69b3d05a8fdde3d704438a88afad60c3 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/cafbbd095bc4fee66f604de40dfa946a93d05542 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/14d1faa36cb77d16cb62e8f4e11d3d38b7faa828 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/2a433d5c042490c94827e66e7c68e71069248243 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/a2e1b730e9657c9bb00c25b56b0f87d2b37dcb6b | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ca4be5ae25917030e8f9eb2e2d955b822b8eff3e | mipsel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/dfad059935c4fbf9e481213293edb4f4a077c356 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/b5bf0595e4ffe3375c1dfd837febbd4d99052042 | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8dca3dc4a4e7a1242b29f1d9d6761654171c04c7 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/abc6e62836061784014233711ef5770008b03720 | mips | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/219c0f547939f67d8554c3a99b21220572a4f48d | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/6d6bbb624c4f8cb9ef0929254bc4ee81d3d66f99 | arc | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/97568843e87989cca4efbdab157fbc8f6cf95f56 | sparc64 | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/e8af6668a74297049718afc3e9b575828cd22654 | riscv64 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/e16a059a14756b75dcac154976325da8b610e870 | riscv64 | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/f2f45280eb42aad317c5e63c586a0bbbead11509 | arm | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/60c8e0ff1ca3477a404e1bdc56cfdcb40f1f8d94 | ORPH riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/50909cf4ab913d3d388ede498dcedd0f0ba50e17 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/54385117cac35ee4aae677fc4532b6f3512f2239 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/46a879227ecb6ecbe379ede5dce4183522eb004e | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/b06f0c9b042cb3d7c1c06bdf136d600725c6f3e8 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/a96047f0fa2d58d344b27547c769d68b90abed1e | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/8d61a9df582fbf5b81754565788bfc38bdcdecc2 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/fa10a96680ab62ea075e2b92fcc0cb8b7b3c26fd | m68k | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/eb53a7d1664e14ce34ea955c401ff89aabe3a888 | ORPH xtensa | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/beeca8f8ef7c8ffc1f6c52ed61806314450fbc46 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/9c05dc2d09e73f88a05f6e3281bbfd725f4401f7 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/a24feaabeeb1249a48f22212f10b871985c27752 | ORPH powerpc64 | libnetfilter_log-1.0.2 | NOK | http://autobuild.buildroot.net/results/51d4130b121218481a6aa48b121b5ac9d1610514 | ORPH sh4 | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/632833c0adcbd8b478e0488b025a7cb22eb3297e | sparc64 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/66ae215a5c956b75bb8a1a6ecf72a3dde34477bd | aarch64_be | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/0c469d08b4ccfcfff734bc45dfb6bdfcde29f2dd | sparc | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/55f5ba0599d7697655097ddb05d0f1ebdcab1554 | mips | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/e7d017d70b54923cecb991f97d238345e548e4e0 | i686 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/217447a5bd99f6361878830e7a3aae8d6544fd1c | arm | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/b4901401f0c214cae6868536c15933282368b6d8 | mips64el | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/5d853985c2288dee4ae41645302082f12024eb63 | mips | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/a495c8324daeab27811c19ab11cf431e8bf2ae86 | ORPH m68k | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/070a33fe9c1a851e6634bafca3799632b5716af5 | ORPH mips64 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/360230507a62193c4baf7aafea97e07fd07ee86a | ORPH mips64el | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/c2cf7b1093cde39c2f2239ef73a2ae22da746a83 | ORPH mips | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/150436670a1c88c5d00a5e7c119721682d558e99 | ORPH armeb | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/35066f883cad10b3eb44c9139ceb067a50366540 | ORPH m68k | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/466586b45f6841b2066a1030f1eaf816f4354f9c | ORPH nios2 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/dd1d827b8e45b7c7be3334b5bd9faa3deb50d212 | ORPH powerpc64 | linux-fusion-9.0.3 | NOK | http://autobuild.buildroot.net/results/00e107f80e4a2f5468e822382ff18635e6f9b795 | ORPH x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/eec2b7f982a1fb3cd286cdad3983b4054b82872d | x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/600a9b5572bd1d76ff5c5870c0217ff80f05fdba | arm | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/5adfde2ca7241595448093a39fd7f20fa7018570 | arc | modem-manager-1.20.4 | NOK | http://autobuild.buildroot.net/results/4cc9b176a69730c4c965cfdcdb8c6ef03b6ecbaa | powerpc | modsecurity2-2.9.7 | NOK | http://autobuild.buildroot.net/results/7db14c4c2b0c1a9fcdf3171c4f4fc7a336517322 | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/711fedf87e68e8c30c3de08b1e97c9dd8bc9678d | armeb | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/a0a27d6a16cc8dbf56137696224ea039c94d28e1 | xtensa | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/9505050131fa3606cbe46db4b59e74a9fea99d36 | ORPH powerpc64le | norm-1.5.8 | NOK | http://autobuild.buildroot.net/results/030c479833c078a925bb52cca59b18475679861f | ORPH aarch64_be | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/b9fdbb5b956085151c9138f559640198226368ed | ORPH mips64 | open-iscsi-2.1.8 | NOK | http://autobuild.buildroot.net/results/6383536f7c320f305f8ebc32298e2f4f8651762c | mips64el | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/620df7cbc46fed31dea544be38ec67053803705c | ORPH x86_64 | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/7136c0dbedf4b4d4a1af8ce1b75743f8d5af8120 | aarch64_be | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/34f93139fc5924c42a64c1e65260223ebd0933c4 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/3522b9094096b8f32b81c4129988497183005b6c | ORPH nios2 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/e1099a9662610d935ef75378dfeffdaea4bad666 | arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/00ec006d8c1d7985fad0b3bfb9755c32094fc744 | sh4 | php-8.2.1 | NOK | http://autobuild.buildroot.net/results/aa10c677d366046d2ce2f22cb45288b3cbf73d22 | microblaze | php-8.2.1 | NOK | http://autobuild.buildroot.net/results/50e451ca066583686c39f678d1ceee31b33bb634 | powerpc64le | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/092a6d388fc6801c109eb46635e8df80d06a803e | aarch64_be | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/a5c2955a51b67467e8a2771aa5d1ba64233d9882 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/0301c4e3164961d15d1bd609fff8b81997288d94 | ORPH mips | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/f2a9b1e87fd9368a674ddaeb44549f7629b5911b | arm | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/6d0f8a747b7a4018651862614e761dbc766a0db3 | armeb | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/e0355e37c0e34ba0f7b63d47114b6fdd42f11ad5 | mips | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/349fdbf4517ac64631e01c711d85a794059c2157 | powerpc64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/36eef44ae548e537204e180c26b0c83a426809c0 | s390x | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/4ca3a4cd4fcfb5f0bae1260c947c30b41eca92fd | powerpc64le | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/b1cd417f47fe1f194d34536ed502c8973ef5635b | i686 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/1c572bf05388f234bae277d30bb488869b2b2796 | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/1a878752baa7af34c5f8bf782c75989958a3613e | microblaze | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/bf00db2a1c4ce526ec86c18533f5888774ede112 | sh4a | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/80a874b2a663751a8d632e5ef3bb76792d354133 | sh4aeb | ramspeed-2.6.0 | NOK | http://autobuild.buildroot.net/results/861f3e01d053b5eddedfdd31813f99f2a2a0e7d4 | ORPH sparc | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/fbd3e4d4ed6336c381b1491f61ecb7242adabbcf | aarch64_be | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/ea5246533bf010688e22d4fd84ed34d6f5fda499 | aarch64_be | ssdp-responder-1.9 | NOK | http://autobuild.buildroot.net/results/00cb736e091c3678d7ea3b94ae6ed65cac216e09 | powerpc64le | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/cc1c91f7e83e9232b54a17bfe667f0a518b1cbec | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/489e65e133e6bcb037b5ddb5c3863bae1811f84a | aarch64 | ti-k3-r5-loader-2022.10 | NOK | http://autobuild.buildroot.net/results/a0ef96a016f0d7c241c27dea4ebfe82fa6537793 | mipsel | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/4136ffe3872a6c5321ae47569d99b6f664636d4c | ORPH aarch64_be | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/470437580a67dca024745569f7dee76e56293b2f | ORPH mips64el | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/70ec03368b30762e2ee99adf96403db8e8646f66 | or1k | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/2d4533b2a72fc8f42768189d1f8a2e35355218ee | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/b770f8d578420684a15bde55a46fb8d12d996917 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/313a804fada71f1a3fff8ef1600791c3a8fec637 | i586 | unknown | NOK | http://autobuild.buildroot.net/results/e6895d64aa8a00b6c1893c3c438a9934be8997a4 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/e1b4efbd1278e4ca2871f4669cea90dbcb29b8eb | sh4a | unknown | NOK | http://autobuild.buildroot.net/results/b8d04d62c97c1bbaadf0d244d0c1627efc3d0db9 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/101b6ed3c8d724066cab1cc961d930aac4c9d787 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/dfd34ac012415dba0d0c3dd1c2d40535324efa65 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/dd6d71cb91df5495b873ceccec43a89977e66291 | nios2 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/65e4b5c6dc028a4ab92d6966bbda3b6d2a164d4c | ORPH mipsel | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/fb69a79d6431282978c1e56da501dce9ffb2b11d | s390x | wtfutil-0.41.0 | NOK | http://autobuild.buildroot.net/results/29bb789c109b4debdf2d585a69ec489132f34d86 | or1k | xerces-3.2.4 | NOK | http://autobuild.buildroot.net/results/c62856a5eeb34714f26235b2d6f8adc4ea612686 | ORPH nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/4da3c4297cacd1d44c20995bcb35d51bb903683c | mipsel | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/8f55506028ca3794a1a8ee1a4b8d2b766b4e5c09 | mipsel | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/1e26212c1b4b4882c30f90c76172688d6c1156f8 | powerpc64le | zfs-2.1.7 | NOK | http://autobuild.buildroot.net/results/979bd7e58f897632707c7b538aa593532b36836e | powerpc | zxing-cpp-1.4.0 | NOK | http://autobuild.buildroot.net/results/f01f4242773258137c129700336fbabef85768d7 | Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 2 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/abfedd152b767ff0067325f9158a618fb464c2a3 | powerpc | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/13da462684437dba39e23cf1452034e4fe9ba1a7 | Classification of failures by reason for 2022.11.x -------------------------------------------------- janus-gateway-1.0.3 | 4 xz-5.2.7 | 2 elfutils-0.186 | 1 freeradius-client-1.1.7 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fwts-22.09.00 | 1 gerbera-1.10.0 | 1 host-binutils-2.38 | 1 host-pahole-1.24 | 1 igh-ethercat-2e2cef61318953... | 1 mutt-2.2.9 | 1 python-numpy-1.23.4 | 1 zabbix-5.4.9 | 1 zeek-4.1.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/60ca7b46b24113adf6a75b0d40a8477a576d9b39 | ORPH or1k | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/8c231a13508cddb6de41c94c00f452b60103a03f | powerpc64le | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/67b1e5c3cf357f12a93d0b89bfce7c0c0481dd2e | arm | fwts-22.09.00 | NOK | http://autobuild.buildroot.net/results/037053b71d9eff48a74974c02a1b3a6b63555c66 | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/a98fe77399518b49f3e5f7fa51a1331b58707347 | mips64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/59739a27a0043911bfd8a801831f9e8397e76052 | xtensa | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2e36dd9d017b3cefca2544a13570ed725327c65f | i686 | igh-ethercat-2e2cef61318953... | NOK | http://autobuild.buildroot.net/results/818cd81d81574c3c7169abc44c803cc69d10b8a7 | microblaze | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/b7488860e6de3e5145665422afac4db1ea27838f | powerpc64le | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/ecd11e31667861211c3bf76f1155ab1653eb9f5c | mips64el | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/9f2d6297851bc892addd4f2114e7a6066b06b20c | powerpc64le | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/bc96238427cba2669ba188014c71470545329824 | mips64 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/f64b8783acdc67e0334a0d26d2720c41326997dd | x86_64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/ae4830b16e033583f2db20a7607bc58ce08bc17a | microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/078362f36e5f3caa76d9a2b2b790cb726afeca4f | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/34689370c80d195efc66a5dce501616a10b4ea04 | ORPH or1k | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/1986532600b8e6b65abef3ca17d2efe88d2bc425 | sh4 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/911955c2e59f81bcf7f923aa91e5c5ac45d929f8 | Gitlab CI results for 2023-02-10 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637586 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637587 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637588 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637589 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637590 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637591 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637592 | avenger96 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637593 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637594 | bananapi_m2_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637595 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637597 | ORPH beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637598 | beaglebone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637599 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637600 | beagleboneai | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637601 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637602 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637603 | broadcom_northstar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637604 | canaan_kd233 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637606 | chromebook_elm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637608 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637609 | ci20 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637611 | cubieboard2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637613 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637615 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637619 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637621 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637623 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637625 | freescale_imx28evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637627 | freescale_imx6dlsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637629 | freescale_imx6dlsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637632 | freescale_imx6qsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637634 | freescale_imx6qsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637636 | freescale_imx6sxsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637637 | freescale_imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637638 | freescale_imx7dsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637639 | freescale_imx8mmevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637640 | freescale_imx8mnevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637641 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637642 | freescale_imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637643 | freescale_imx8qmmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637644 | freescale_imx8qxpmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637645 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637646 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637647 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637648 | friendlyarm_nanopi_r2s | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637649 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637650 | globalscale_espressobin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637651 | grinn_chiliboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637652 | grinn_liteboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637653 | hifive_unleashed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637654 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637655 | imx6-sabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637656 | imx6-sabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637657 | imx6-sabresd_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637658 | imx6slevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637660 | imx6sx-sdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637661 | imx6ulevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637665 | imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637666 | imx6ulpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637667 | imx7d-sdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637670 | imx7dpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637672 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637674 | imx8mn_bsh_smm_s2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637676 | imx8mn_bsh_smm_s2_pro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637677 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637679 | imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637680 | kontron_bl_imx8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637683 | kontron_pitx_imx8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637685 | kontron_smarc_sal28 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637687 | lafrite | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637688 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637689 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637691 | linksprite_pcduino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637692 | ls1028ardb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637695 | mender_x86_64_efi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637696 | ORPH microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637698 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637701 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637702 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637704 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637705 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637707 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637710 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637711 | minnowboard_max | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637713 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637714 | mx51evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637716 | mx53loco | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637717 | mx6cubox | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637718 | mx6sx_udoo_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637719 | mx6udoo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637720 | nexbox_a95x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637723 | nezha | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637725 | nitrogen6sx | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637726 | nitrogen6x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637727 | nitrogen7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637728 | nitrogen8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637729 | nitrogen8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637730 | nitrogen8mn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637731 | nitrogen8mp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637732 | octavo_osd32mp1_brk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637733 | octavo_osd32mp1_red | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637734 | odroidc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637735 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637736 | olimex_a10_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637737 | olimex_a13_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637738 | olimex_a20_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637742 | olimex_a20_olinuxino_lime2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637741 | olimex_a20_olinuxino_micro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637745 | olimex_a33_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637747 | olimex_a64_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637748 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637749 | olimex_stmp157_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637750 | olpc_xo1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637752 | olpc_xo175 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637751 | openblocks_a6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637753 | orangepi_lite | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637755 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637754 | orangepi_one | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637756 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637757 | orangepi_pc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637758 | orangepi_pc_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637759 | orangepi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637760 | orangepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637761 | orangepi_zero_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637763 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637762 | pandaboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637764 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637765 | pc_x86_64_efi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637766 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637767 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637768 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637769 | qemu_aarch64_ebbr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637770 | qemu_aarch64_sbsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637771 | qemu_aarch64_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637772 | qemu_arm_ebbr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637773 | qemu_arm_versatile | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637774 | qemu_arm_vexpress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637775 | qemu_arm_vexpress_tz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637776 | qemu_m68k_mcf5208 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637777 | qemu_m68k_q800 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637778 | qemu_microblazebe_mmu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637779 | qemu_microblazeel_mmu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637780 | qemu_mips32r2_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637781 | qemu_mips32r2el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637782 | qemu_mips32r6_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637785 | qemu_mips32r6el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637786 | qemu_mips64_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637787 | qemu_mips64el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637788 | qemu_mips64r6_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637789 | qemu_mips64r6el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637790 | qemu_nios2_10m50 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637792 | qemu_or1k | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637793 | qemu_ppc64_e5500 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637794 | qemu_ppc64_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637795 | qemu_ppc64le_powernv8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637796 | qemu_ppc64le_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637797 | qemu_ppc_bamboo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637798 | qemu_ppc_e500mc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637799 | qemu_ppc_g3beige | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637800 | qemu_ppc_mac99 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637801 | qemu_ppc_mpc8544ds | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637802 | qemu_riscv32_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637803 | qemu_riscv64_nommu_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637804 | qemu_riscv64_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637805 | qemu_s390x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637806 | qemu_sh4_r2d | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637807 | qemu_sh4eb_r2d | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637808 | qemu_sparc64_sun4u | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637809 | qemu_sparc_ss10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637810 | qemu_x86 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637812 | qemu_x86_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637811 | qemu_xtensa_lx60 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637813 | qemu_xtensa_lx60_nommu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637814 | raspberrypi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637824 | ORPH raspberrypi0 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637815 | ORPH raspberrypi0w | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637816 | ORPH raspberrypi2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637817 | ORPH raspberrypi3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637819 | raspberrypi3_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637818 | ORPH raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637820 | ORPH raspberrypi4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637823 | ORPH raspberrypi4_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637821 | ORPH raspberrypicm4io | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637826 | ORPH raspberrypicm4io_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637825 | ORPH raspberrypizero2w | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637827 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637828 | rock64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637829 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637830 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637831 | roseapplepi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637832 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637833 | sheevaplug | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637834 | sipeed_lichee_rv | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637835 | sipeed_lichee_rv_dock | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637836 | sipeed_maix_bit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637837 | sipeed_maix_bit_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637838 | sipeed_maix_dock | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637840 | sipeed_maix_dock_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637841 | sipeed_maix_go | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637842 | sipeed_maix_go_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637843 | sipeed_maixduino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637844 | sipeed_maixduino_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637845 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637846 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637847 | snps_archs38_haps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637848 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637849 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637850 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637851 | solidrun_clearfog_gt_8k | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637852 | solidrun_macchiatobin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637853 | ORPH spike_riscv64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637855 | stm32f429_disco_xip | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637856 | stm32f469_disco_sd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637858 | stm32f469_disco_xip | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637861 | stm32mp157a_dk1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637862 | stm32mp157c_dk2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637863 | stm32mp157c_odyssey | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637864 | terasic_de10nano_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637865 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637866 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637867 | ts5500 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637868 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637869 | uevm5432 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637870 | versal_vck190 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637871 | visionfive | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637873 | visionfive2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637872 | wandboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637874 | warp7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637875 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637876 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637877 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637878 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637879 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637880 | zynqmp_kria_kv260 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637881 | zynqmp_zcu102 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637882 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3740637883 | -- http://autobuild.buildroot.net From romain.naour at smile.fr Sat Feb 11 09:33:04 2023 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 11 Feb 2023 10:33:04 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used In-Reply-To: <20230208192425.GA2677@scaer> References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208192425.GA2677@scaer> Message-ID: Hello, Le 08/02/2023 ? 20:24, Yann E. MORIN a ?crit?: > Peter, All, > > On 2023-02-08 19:19 +0100, Peter Korsgaard spake thusly: >> Waf requires that the version of the waf script matches the version of >> waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as >> otherwise waf errors out with errors like: >> >> Waf script '2.0.24' and library '1.9.3' do not match >> >> Signed-off-by: Peter Korsgaard >> --- >> package/pkg-waf.mk | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk >> index e090afa9e6..a067e69c9b 100644 >> --- a/package/pkg-waf.mk >> +++ b/package/pkg-waf.mk >> @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) >> >> define inner-waf-package >> >> +# The version of waflib has to match with the version of waf, >> +# otherwise waf errors out with: >> +# Waf script 'X' and library 'Y' do not match >> +define WAF_PACKAGE_REMOVE_WAF_LIB >> + $(RM) -fr $(@D)/waf $(@D)/waflib We need more $$ here :) Otherwise: >>> aubio 0.4.9 Patching rm -f -fr /waf /waflib Best regards, Romain >> +endef >> + >> # We need host-python3 to run waf >> $(2)_DEPENDENCIES += host-python3 >> >> @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO >> ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) >> $(2)_DEPENDENCIES += host-waf >> $(2)_WAF = $$(HOST_DIR)/bin/waf >> +$(2)_PRE_CONFIGURE_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB > > It would make more sense to make that either a post-extract or a > post-patch hook. > > Regards, > Yann E. MORIN. > >> else >> $(2)_WAF ?= ./waf >> endif >> -- >> 2.30.2 >> > From romain.naour at gmail.com Sat Feb 11 09:42:02 2023 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 11 Feb 2023 10:42:02 +0100 Subject: [Buildroot] [PATCH] package/pkg-waf: add missing $ Message-ID: <20230211094202.3816592-1-romain.naour@gmail.com> We want to have $(@D) expanded at the time the recipe is run, so like all other variables, we need to $$-expand it. Fixes: http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826 Signed-off-by: Romain Naour Cc: Yann E. MORIN Cc: Peter Korsgaard --- package/pkg-waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index 0e752072c8..c3e965bdf3 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -42,7 +42,7 @@ define inner-waf-package # otherwise waf errors out with: # Waf script 'X' and library 'Y' do not match define WAF_PACKAGE_REMOVE_WAF_LIB - $(RM) -fr $(@D)/waf $(@D)/waflib + $(RM) -fr $$(@D)/waf $$(@D)/waflib endef # We need host-python3 to run waf -- 2.34.3 From thomas.petazzoni at bootlin.com Sat Feb 11 09:49:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 11 Feb 2023 10:49:34 +0100 Subject: [Buildroot] [PATCH] package/busybox: disable stack optimization for i386 target In-Reply-To: <20230210233658.3763549-1-romain.naour@gmail.com> References: <20230210233658.3763549-1-romain.naour@gmail.com> Message-ID: <20230211104934.4c34267c@windsurf> On Sat, 11 Feb 2023 00:36:58 +0100 Romain Naour wrote: > The toolchain-builder project reported an issue with Qemu 7.2.0 for > x86-core2--glibc--bleeding-edge toolchain [1]: > > Run /sbin/init as init process > random: fast init done > EXT4-fs (vda): warning: mounting unchecked fs, running e2fsck is recommended > EXT4-fs (vda): re-mounted. Opts: (null). Quota mode: disabled. > Starting syslogd: OK > traps: syslogd[52] general protection fault ip:b7e21465 sp:bfe59e6c error:0 in libc.so.6[b7d9b000+123000] > Starting klogd: OK > traps: klogd[56] general protection fault ip:b7e94465 sp:bf8f069c error:0 in libc.so.6[b7e0e000+123000] > Running sysctl: traps: logger[62] general protection fault ip:b7e48b6c sp:bfd7d194 error:0 in libc.so.6[b7e05000+123000] > Segmentation fault > traps: logger[64] general protection fault ip:b7dd3b6c sp:bf9b8604 error:0 in libc.so.6[b7d90000+123000] > Segmentation fault > > (Followed by a kernel panic.) > > Testing with the pevious Qemu release (7.1.0) allows to boot the system without any problem. > > Building qemu sources between 7.1.0 and 7.2.0 allows to identify the first "bad" commit [2] and > report to the Qemu project [3]. > > Thanks to Qemu maintainers review, several issues was noticed: > > "The default i386 busybox build config does not respect glibc's requirements around stack alignment > (see [4] for previous discussions and a workaround)." > > Disabling CONFIG_STACK_OPTIMIZATION_386 option (as suggested in the Gentoo bug report) fixed the issue! > > This option has been added and enabled by default in buxybox 1_29_0, so it was used since then the for > Buildroot's qemu defconfig. > > Note: The x86-i686--glibc--bleeding-edge (generic x86) doesn't trigger the issue with > CONFIG_STACK_OPTIMIZATION_386 enabled. > > Fixes: > https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 > > [1] https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 > [2] https://gitlab.com/qemu-project/qemu/-/commit/958e1dd1300f37f18b2161dfb4eb806fc8c19b44 > [3] https://gitlab.com/qemu-project/qemu/-/issues/1478 > [4] https://bugs.gentoo.org/725674 Thanks a lo for the great investigation. Do we understand precisely what is happening? The link at [4] does not really have an explanation, it only has experimental observations that lead to the conclusion that disabling CONFIG_STACK_OPTIMIZATION_386 is a work-around, but it does not really explain what is happening. 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 Feb 11 09:51:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 10:51:35 +0100 Subject: [Buildroot] [PATCH] package/pkg-waf: add missing $ In-Reply-To: <20230211094202.3816592-1-romain.naour@gmail.com> References: <20230211094202.3816592-1-romain.naour@gmail.com> Message-ID: <20230211095135.GD2796@scaer> Romain. All, On 2023-02-11 10:42 +0100, Romain Naour spake thusly: > We want to have $(@D) expanded at the time the recipe is run, so like > all other variables, we need to $$-expand it. > > Fixes: > http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826 Thanks for the quick fix, but se below... > Signed-off-by: Romain Naour > Cc: Yann E. MORIN > Cc: Peter Korsgaard > --- > package/pkg-waf.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk > index 0e752072c8..c3e965bdf3 100644 > --- a/package/pkg-waf.mk > +++ b/package/pkg-waf.mk > @@ -42,7 +42,7 @@ define inner-waf-package > # otherwise waf errors out with: > # Waf script 'X' and library 'Y' do not match > define WAF_PACKAGE_REMOVE_WAF_LIB > - $(RM) -fr $(@D)/waf $(@D)/waflib > + $(RM) -fr $$(@D)/waf $$(@D)/waflib Shouldn't we be using $$($$(PKG)_SRCDIR) or $$($(2)_SRCDIR) instead of $$(@D), like is used everywhere else in the file: cd $$($$(PKG)_SRCDIR) && python3 configure [...] cd $$($$(PKG)_SRCDIR) && python3 $$($(2)_WAF) (Note that last one uses a mix of $$(PKG) and $(2)...) Regards, Yann E. MORIN. > endef > > # We need host-python3 to run waf > -- > 2.34.3 > > _______________________________________________ > 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 romain.naour at smile.fr Sat Feb 11 09:57:44 2023 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 11 Feb 2023 10:57:44 +0100 Subject: [Buildroot] [PATCH] package/pkg-waf: add missing $ In-Reply-To: <20230211095135.GD2796@scaer> References: <20230211094202.3816592-1-romain.naour@gmail.com> <20230211095135.GD2796@scaer> Message-ID: Le 11/02/2023 ? 10:51, Yann E. MORIN a ?crit?: > Romain. All, > > On 2023-02-11 10:42 +0100, Romain Naour spake thusly: >> We want to have $(@D) expanded at the time the recipe is run, so like >> all other variables, we need to $$-expand it. >> >> Fixes: >> http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826 > > Thanks for the quick fix, but se below... > >> Signed-off-by: Romain Naour >> Cc: Yann E. MORIN >> Cc: Peter Korsgaard >> --- >> package/pkg-waf.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk >> index 0e752072c8..c3e965bdf3 100644 >> --- a/package/pkg-waf.mk >> +++ b/package/pkg-waf.mk >> @@ -42,7 +42,7 @@ define inner-waf-package >> # otherwise waf errors out with: >> # Waf script 'X' and library 'Y' do not match >> define WAF_PACKAGE_REMOVE_WAF_LIB >> - $(RM) -fr $(@D)/waf $(@D)/waflib >> + $(RM) -fr $$(@D)/waf $$(@D)/waflib > > Shouldn't we be using $$($$(PKG)_SRCDIR) or $$($(2)_SRCDIR) instead of > $$(@D), like is used everywhere else in the file: > > cd $$($$(PKG)_SRCDIR) && python3 configure [...] > > cd $$($$(PKG)_SRCDIR) && python3 $$($(2)_WAF) > > (Note that last one uses a mix of $$(PKG) and $(2)...) I guess @D come from the HOOK from aubio and move to pkg-waf. It seems @D is used at several place in pkg-<*>.mk infra. I'm not sure what we prefer/should use. Best regards, Romain > > Regards, > Yann E. MORIN. > >> endef >> >> # We need host-python3 to run waf >> -- >> 2.34.3 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From yann.morin.1998 at free.fr Sat Feb 11 10:02:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 11:02:49 +0100 Subject: [Buildroot] [git commit] package/pkg-waf: add missing $ Message-ID: <20230211100400.D126684456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d1b223b91b08acdb52611864ae5921b9f3c757b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We want to have $(@D) expanded at the time the recipe is run, so like all other variables, we need to $$-expand it. Fixes: 1b4d7f6e13212b4c65ec2832681719fd960e75e6 Fixes: http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826 Signed-off-by: Romain Naour Cc: Yann E. MORIN Cc: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/pkg-waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index 0e752072c8..c3e965bdf3 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -42,7 +42,7 @@ define inner-waf-package # otherwise waf errors out with: # Waf script 'X' and library 'Y' do not match define WAF_PACKAGE_REMOVE_WAF_LIB - $(RM) -fr $(@D)/waf $(@D)/waflib + $(RM) -fr $$(@D)/waf $$(@D)/waflib endef # We need host-python3 to run waf From yann.morin.1998 at free.fr Sat Feb 11 10:04:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 11:04:28 +0100 Subject: [Buildroot] [PATCH] package/pkg-waf: add missing $ In-Reply-To: <20230211094202.3816592-1-romain.naour@gmail.com> References: <20230211094202.3816592-1-romain.naour@gmail.com> Message-ID: <20230211100428.GE2796@scaer> Romain, All, On 2023-02-11 10:42 +0100, Romain Naour spake thusly: > We want to have $(@D) expanded at the time the recipe is run, so like > all other variables, we need to $$-expand it. > > Fixes: > http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826 > > Signed-off-by: Romain Naour > Cc: Yann E. MORIN > Cc: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pkg-waf.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk > index 0e752072c8..c3e965bdf3 100644 > --- a/package/pkg-waf.mk > +++ b/package/pkg-waf.mk > @@ -42,7 +42,7 @@ define inner-waf-package > # otherwise waf errors out with: > # Waf script 'X' and library 'Y' do not match > define WAF_PACKAGE_REMOVE_WAF_LIB > - $(RM) -fr $(@D)/waf $(@D)/waflib > + $(RM) -fr $$(@D)/waf $$(@D)/waflib > endef > > # We need host-python3 to run waf > -- > 2.34.3 > > _______________________________________________ > 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 romain.naour at smile.fr Sat Feb 11 10:10:43 2023 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 11 Feb 2023 11:10:43 +0100 Subject: [Buildroot] [PATCH] package/busybox: disable stack optimization for i386 target In-Reply-To: <20230211104934.4c34267c@windsurf> References: <20230210233658.3763549-1-romain.naour@gmail.com> <20230211104934.4c34267c@windsurf> Message-ID: <7bbd1030-488a-9876-7c69-0ac6ae15653e@smile.fr> Hello Thomas, Le 11/02/2023 ? 10:49, Thomas Petazzoni via buildroot a ?crit?: > On Sat, 11 Feb 2023 00:36:58 +0100 > Romain Naour wrote: > >> The toolchain-builder project reported an issue with Qemu 7.2.0 for >> x86-core2--glibc--bleeding-edge toolchain [1]: >> >> Run /sbin/init as init process >> random: fast init done >> EXT4-fs (vda): warning: mounting unchecked fs, running e2fsck is recommended >> EXT4-fs (vda): re-mounted. Opts: (null). Quota mode: disabled. >> Starting syslogd: OK >> traps: syslogd[52] general protection fault ip:b7e21465 sp:bfe59e6c error:0 in libc.so.6[b7d9b000+123000] >> Starting klogd: OK >> traps: klogd[56] general protection fault ip:b7e94465 sp:bf8f069c error:0 in libc.so.6[b7e0e000+123000] >> Running sysctl: traps: logger[62] general protection fault ip:b7e48b6c sp:bfd7d194 error:0 in libc.so.6[b7e05000+123000] >> Segmentation fault >> traps: logger[64] general protection fault ip:b7dd3b6c sp:bf9b8604 error:0 in libc.so.6[b7d90000+123000] >> Segmentation fault >> >> (Followed by a kernel panic.) >> >> Testing with the pevious Qemu release (7.1.0) allows to boot the system without any problem. >> >> Building qemu sources between 7.1.0 and 7.2.0 allows to identify the first "bad" commit [2] and >> report to the Qemu project [3]. >> >> Thanks to Qemu maintainers review, several issues was noticed: >> >> "The default i386 busybox build config does not respect glibc's requirements around stack alignment >> (see [4] for previous discussions and a workaround)." >> >> Disabling CONFIG_STACK_OPTIMIZATION_386 option (as suggested in the Gentoo bug report) fixed the issue! >> >> This option has been added and enabled by default in buxybox 1_29_0, so it was used since then the for >> Buildroot's qemu defconfig. >> >> Note: The x86-i686--glibc--bleeding-edge (generic x86) doesn't trigger the issue with >> CONFIG_STACK_OPTIMIZATION_386 enabled. >> >> Fixes: >> https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 >> >> [1] https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 >> [2] https://gitlab.com/qemu-project/qemu/-/commit/958e1dd1300f37f18b2161dfb4eb806fc8c19b44 >> [3] https://gitlab.com/qemu-project/qemu/-/issues/1478 >> [4] https://bugs.gentoo.org/725674 > > Thanks a lo for the great investigation. Do we understand precisely > what is happening? The link at [4] does not really have an explanation, > it only has experimental observations that lead to the conclusion that > disabling CONFIG_STACK_OPTIMIZATION_386 is a work-around, but it does > not really explain what is happening. Actually there are two different issues that contribute to this issue: 1) An existing latent Busybox bug on i386 (busybox compiled with -mpreferred-stack-boundary=2) https://lists.debian.org/debian-boot/2018/01/msg00352.html 2) A Qemu improvement that trigger an exception on unaligned memory accesses that require 16-byte alignment. https://gitlab.com/qemu-project/qemu/-/commit/958e1dd1300f37f18b2161dfb4eb806fc8c19b44 I didn't digging further the root cause of the issue. Best regards, Romain > > Thomas From yann.morin.1998 at free.fr Sat Feb 11 10:52:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 11:52:42 +0100 Subject: [Buildroot] [PATCH 0/2] br2-external: export list and versions of used extrenal trees (branch yem/br2-ext-name-ver) Message-ID: Hello All! This small two-patch series extends the information exported about the br2-external trees in use for the current configuration: the list of br2-external trees names, and the version for each. They are available in Kconfig, and thus in the .config file, as well as make variables that are exported in the environment. Note: we'd have liked to also have the origin of said trees, like the git origin remote or such, but that is far from trivial to extract. Indeed, a br2-external on a git tree may have more than one remote configured, and may get checked-out from a hash that is reachable from branches in more than one remote. Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (2): br2-external: make the list of external trees public br2-external: make version of external trees available support/scripts/br2-external | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | 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 Feb 11 10:52:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 11:52:44 +0100 Subject: [Buildroot] [PATCH 1/2] br2-external: make the list of external trees public In-Reply-To: References: Message-ID: <912929d06f13459e472f6badf7e9251792b272fe.1676112761.git.yann.morin.1998@free.fr> Currently, the list of external trees is a private variable, but for debugging or compliance, one may need to get that list. Add a Kconfig option so that the list appears in the .config file, and export the already existing .mk variable in the environment, so that post-build or post-image scripts can use it. Reported-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- support/scripts/br2-external | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 2c33e6eacc..5815c6ded0 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -126,7 +126,7 @@ do_mk() { done printf '\n' - printf 'BR2_EXTERNAL_NAMES = \n' + printf 'export BR2_EXTERNAL_NAMES = \n' printf 'BR2_EXTERNAL_DIRS = \n' printf 'BR2_EXTERNAL_MKS = \n' @@ -181,6 +181,14 @@ do_kconfig() { printf 'menu "External options"\n\n' >>"${outputdir}/.br2-external.in.menus" + { + printf 'config BR2_EXTERNAL_NAMES\n' + printf '\tstring\n' + # Use star-expansion: we really one a single arg. + printf '\tdefault "%s"\n' "${BR2_EXT_NAMES[*]}" + printf '\n' + } >>"${outputdir}/.br2-external.in.paths" + for br2_name in "${BR2_EXT_NAMES[@]}"; do eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\"" eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" -- 2.25.1 From yann.morin.1998 at free.fr Sat Feb 11 10:52:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 11:52:45 +0100 Subject: [Buildroot] [PATCH 2/2] br2-external: make version of external trees available In-Reply-To: References: Message-ID: For various reasons, like debugging or compliance, it is important to identify what br2-external trees versions were used for a specific build. Add a Kconfig option that contains the version as computed by support/scripts/setlocalversion; this will appear in the .config file (but not in defconfig files, which is what we want). Also generate that variable on the .mk side, so that it gets properly exported in the environment, for post-build of post-iamge scripts to use as they see fit (like, ensuring there is no dirtyness when in a CI for example). Reported-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- support/scripts/br2-external | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 5815c6ded0..8aea479d20 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -66,7 +66,7 @@ do_validate() { do_validate_one() { local br2_ext="${1}" - local br2_name br2_desc n d + local br2_name br2_desc br2_ver n d if [ ! -d "${br2_ext}" ]; then error "'%s': no such file or directory\n" "${br2_ext}" @@ -104,8 +104,10 @@ do_validate_one() { # Register this br2-external tree, use an absolute canonical path br2_ext="$( cd "${br2_ext}"; pwd )" + br2_ver="$( support/scripts/setlocalversion "${br2_ext}" )" BR2_EXT_NAMES+=( "${br2_name}" ) eval BR2_EXT_PATHS_${br2_name}="\"\${br2_ext}\"" + eval BR2_EXT_VERS_${br2_name}="\"\${br2_ver}\"" eval BR2_EXT_DESCS_${br2_name}="\"\${br2_desc:-\${br2_name}}\"" } @@ -113,7 +115,7 @@ do_validate_one() { # for the br2-external tree do_mk() { local outputdir="${1}" - local br2_name br2_desc br2_ext + local br2_name br2_desc br2_ext br2_ver { printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' @@ -139,12 +141,14 @@ do_mk() { for br2_name in "${BR2_EXT_NAMES[@]}"; do eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\"" eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" + eval br2_ver="\"\${BR2_EXT_VERS_${br2_name}}\"" printf '\n' printf 'BR2_EXTERNAL_NAMES += %s\n' "${br2_name}" printf 'BR2_EXTERNAL_DIRS += %s\n' "${br2_ext}" printf 'BR2_EXTERNAL_MKS += %s/external.mk\n' "${br2_ext}" printf 'export BR2_EXTERNAL_%s_PATH = %s\n' "${br2_name}" "${br2_ext}" printf 'export BR2_EXTERNAL_%s_DESC = %s\n' "${br2_name}" "${br2_desc}" + printf 'export BR2_EXTERNAL_%s_VERSION = %s\n' "${br2_name}" "${br2_ver}" done } >"${outputdir}/.br2-external.mk" } @@ -152,7 +156,7 @@ do_mk() { # Generate the kconfig snippets for the br2-external tree. do_kconfig() { local outputdir="${1}" - local br2_name br2_desc br2_ext br2 + local br2_name br2_desc br2_ext br2_ver br2 local -a items items=( @@ -192,11 +196,15 @@ do_kconfig() { for br2_name in "${BR2_EXT_NAMES[@]}"; do eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\"" eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" + eval br2_ver="\"\${BR2_EXT_VERS_${br2_name}}\"" { printf 'config BR2_EXTERNAL_%s_PATH\n' "${br2_name}" printf '\tstring\n' printf '\tdefault "%s"\n' "${br2_ext}" + printf 'config BR2_EXTERNAL_%s_VERSION\n' "${br2_name}" + printf '\tstring\n' + printf '\tdefault "%s"\n' "${br2_ver}" printf '\n' } >>"${outputdir}/.br2-external.in.paths" -- 2.25.1 From yann.morin.1998 at free.fr Sat Feb 11 11:00:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 12:00:55 +0100 Subject: [Buildroot] [git commit] package/pkg-waf: add one more missing $ Message-ID: <20230211110517.F1795846E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33107962eb29d2d33fcf4bed429d5239c1b2d278 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Further fix on top on 9d1b223b91b0 (package/pkg-waf: add missing $). Repeat after me: all variables in an inner-package macro must be expanded, except for: parameters, pkgdir, and pkgname. Signed-off-by: Yann E. MORIN --- package/pkg-waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index c3e965bdf3..0529bb6dda 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -42,7 +42,7 @@ define inner-waf-package # otherwise waf errors out with: # Waf script 'X' and library 'Y' do not match define WAF_PACKAGE_REMOVE_WAF_LIB - $(RM) -fr $$(@D)/waf $$(@D)/waflib + $$(RM) -fr $$(@D)/waf $$(@D)/waflib endef # We need host-python3 to run waf From dario.binacchi at amarulasolutions.com Sat Feb 11 11:41:08 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 11 Feb 2023 12:41:08 +0100 Subject: [Buildroot] [PATCH 1/1] configs/stm32f429_xip_defconfig: bump Linux version to 6.1.10 Message-ID: <20230211114108.353855-1-dario.binacchi@amarulasolutions.com> The size of xipImage has grown by 84KB but there are still 278KB left before running out of 2MB of flash memory. Signed-off-by: Dario Binacchi --- configs/stm32f429_disco_xip_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index f9b3270ecd95..872e4b6a306c 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_m4=y -BR2_KERNEL_HEADERS_5_15=y +BR2_KERNEL_HEADERS_6_1=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f429-disco/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -- 2.32.0 From yann.morin.1998 at free.fr Sat Feb 11 12:12:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 13:12:51 +0100 Subject: [Buildroot] [git commit] configs/stm32f429_xip_defconfig: bump Linux version to 6.1.10 Message-ID: <20230211121845.B8FB684849@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2bf4d02ff35bd8a0d5aace354c987a166437db88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The size of xipImage has grown by 84KB but there are still 278KB left before running out of 2MB of flash memory. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- configs/stm32f429_disco_xip_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index f9b3270ecd..872e4b6a30 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_m4=y -BR2_KERNEL_HEADERS_5_15=y +BR2_KERNEL_HEADERS_6_1=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f429-disco/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From yann.morin.1998 at free.fr Sat Feb 11 12:19:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 13:19:21 +0100 Subject: [Buildroot] [PATCH 1/1] configs/stm32f429_xip_defconfig: bump Linux version to 6.1.10 In-Reply-To: <20230211114108.353855-1-dario.binacchi@amarulasolutions.com> References: <20230211114108.353855-1-dario.binacchi@amarulasolutions.com> Message-ID: <20230211121921.GF2796@scaer> Dario, All, On 2023-02-11 12:41 +0100, Dario Binacchi spake thusly: > The size of xipImage has grown by 84KB but there are still 278KB left > before running out of 2MB of flash memory. > > Signed-off-by: Dario Binacchi Applied to master, thanks. (there's 6.1.11 now, btw! ;-) ) Regards, Yann E. MORIN. > --- > configs/stm32f429_disco_xip_defconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig > index f9b3270ecd95..872e4b6a306c 100644 > --- a/configs/stm32f429_disco_xip_defconfig > +++ b/configs/stm32f429_disco_xip_defconfig > @@ -1,12 +1,12 @@ > BR2_arm=y > BR2_cortex_m4=y > -BR2_KERNEL_HEADERS_5_15=y > +BR2_KERNEL_HEADERS_6_1=y > # BR2_UCLIBC_INSTALL_UTILS is not set > BR2_ENABLE_LTO=y > BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.10" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f429-disco/linux.config" > BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y > -- > 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 peter at korsgaard.com Sat Feb 11 13:17:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 14:17:30 +0100 Subject: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used In-Reply-To: (Romain Naour's message of "Sat, 11 Feb 2023 10:33:04 +0100") References: <20230208181933.3925279-1-peter@korsgaard.com> <20230208192425.GA2677@scaer> Message-ID: <87v8k8cped.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: Hi, >>> +# The version of waflib has to match with the version of waf, >>> +# otherwise waf errors out with: >>> +# Waf script 'X' and library 'Y' do not match >>> +define WAF_PACKAGE_REMOVE_WAF_LIB >>> + $(RM) -fr $(@D)/waf $(@D)/waflib > We need more $$ here :) > Otherwise: >>>> aubio 0.4.9 Patching > rm -f -fr /waf /waflib Ahh crap, thanks for pointing it out. -- Bye, Peter Korsgaard From raphael.pavlidis at gmail.com Sat Feb 11 13:53:15 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Sat, 11 Feb 2023 14:53:15 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/sway: new package In-Reply-To: <87h6vw5l2r.fsf@dell.be.48ers.dk> References: <20221031124625.21172-1-raphael.pavlidis@gmail.com> <87h6vw5l2r.fsf@dell.be.48ers.dk> Message-ID: <7f57a607-bf3c-0250-ed23-c6fbf73961a3@gmail.com> Hi Peter, On 08.02.23 14:43, Peter Korsgaard wrote: [--SNIP--] > > How did you test this? Here wlroots with x11 support doesn't build as we > don't have an Xwayland .pc file or binary in Buildroot. > I create a xwayland package, which build the xserver binary, but did not send the patch yet. (This will fix the problems with weston, too) >> +else > > +SWAY_CONF_OPTS += -Dxwayland=disabled > > +endif > > + > > +ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y) > > +SWAY_CONF_OPTS += -Dgdk-pixbuf=enabled > > You also need to ensure that sway is built after gdk-pixbuf with: > > SWAY_DEPENDENCIES += gdk-pixbuf > > Committed with that fixed, thanks. > Thanks, Raphael Pavlidis From dario.binacchi at amarulasolutions.com Sat Feb 11 14:26:55 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 11 Feb 2023 15:26:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/davinci-bootcount: bump to version 2.0.0 Message-ID: <20230211142655.375225-1-dario.binacchi@amarulasolutions.com> - stm32mp1: support for STM32 TAMP_BKP21R bootcount register - tab formatting - gitignore: added autoscan files - updated documentation - i2c_eeprom: bootcount does not use two uint16s - am33xx: declare registers as 'volatile' - src/am33xx: do not close fd, it seems to prevent reliably writing register - configure.ac: update version, homepage - Added EEPROM read/write for non-TI AM335x platforms Signed-off-by: Dario Binacchi --- package/davinci-bootcount/davinci-bootcount.hash | 2 +- package/davinci-bootcount/davinci-bootcount.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/davinci-bootcount/davinci-bootcount.hash index ef4bca2b7dfe..ecbaa51517ab 100644 --- a/package/davinci-bootcount/davinci-bootcount.hash +++ b/package/davinci-bootcount/davinci-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 de7843cf1245a739b6d18d4db478893e50c2de0ee19bbce96dc323065d28c3e4 davinci-bootcount-0973689c7556a953d2b468e4d8d46758c6d467b4.tar.gz +sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e davinci-bootcount-v2.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk index 385d96d5a2c4..71c597f85a39 100644 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ b/package/davinci-bootcount/davinci-bootcount.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAVINCI_BOOTCOUNT_VERSION = 0973689c7556a953d2b468e4d8d46758c6d467b4 +DAVINCI_BOOTCOUNT_VERSION = v2.0.0 DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,$(DAVINCI_BOOTCOUNT_VERSION)) DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING -- 2.32.0 From thomas at devoogdt.com Sat Feb 11 14:33:56 2023 From: thomas at devoogdt.com (thomas at devoogdt.com) Date: Sat, 11 Feb 2023 15:33:56 +0100 Subject: [Buildroot] [PATCH] package/fluent-bit: bump to version 2.0.9 Message-ID: <20230211143356.173296-1-thomas@devoogdt.com> From: Thomas Devoogdt - Release Notes: https://fluentbit.io/announcements/v2.0.9/ - Patch dropped, as it is upstream: https://github.com/fluent/fluent-bit/commit/7bcb502ebdcd647d6b83c972805e734ad522eb1a Signed-off-by: Thomas Devoogdt --- ...eLists.txt-only-require-a-C-compiler.patch | 27 ------------------- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch diff --git a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch b/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch deleted file mode 100644 index e71bcf0c0d..0000000000 --- a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7bcb502ebdcd647d6b83c972805e734ad522eb1a Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 30 Jan 2023 09:10:37 +0100 -Subject: [PATCH] CMakeLists.txt: only require a C compiler - -Fluent-bit is mostly written in C, -so don't require CXX in the top-level project. - -Signed-off-by: Thomas Devoogdt ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7adb02de..3ff7360d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.12) --project(fluent-bit) -+project(fluent-bit C) - - # CMP0069 ensures that LTO is enabled for all compilers - cmake_policy(SET CMP0069 NEW) --- -2.30.2 - diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index ce7cea7b59..0caadcd56f 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8ff5566389033669feabc9c69a5c6f417dad5c8b066454388e6a706507262acf fluent-bit-2.0.8.tar.gz +sha256 393ad4a6ced48c327607653d610ef273843085a17b6e5c8013877abdf31e6945 fluent-bit-2.0.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 13077e53cc..c10ef613d7 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.0.8 +FLUENT_BIT_VERSION = 2.0.9 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE -- 2.34.1 From dario.binacchi at amarulasolutions.com Sat Feb 11 14:46:23 2023 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 11 Feb 2023 15:46:23 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/davinci-bootcount: bump to version 2.0.0 Message-ID: <20230211144623.380475-1-dario.binacchi@amarulasolutions.com> - stm32mp1: support for STM32 TAMP_BKP21R bootcount register - tab formatting - gitignore: added autoscan files - updated documentation - i2c_eeprom: bootcount does not use two uint16s - am33xx: declare registers as 'volatile' - src/am33xx: do not close fd, it seems to prevent reliably writing register - configure.ac: update version, homepage - Added EEPROM read/write for non-TI AM335x platforms Signed-off-by: Dario Binacchi --- Changes in v2: - move 'v' from DAVINCI_BOOTCOUNT_VERSION to DAVINCI_BOOTCOUNT_SITE Signed-off-by: Dario Binacchi --- package/davinci-bootcount/davinci-bootcount.hash | 2 +- package/davinci-bootcount/davinci-bootcount.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/davinci-bootcount/davinci-bootcount.hash index ef4bca2b7dfe..53435b1d1d6d 100644 --- a/package/davinci-bootcount/davinci-bootcount.hash +++ b/package/davinci-bootcount/davinci-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 de7843cf1245a739b6d18d4db478893e50c2de0ee19bbce96dc323065d28c3e4 davinci-bootcount-0973689c7556a953d2b468e4d8d46758c6d467b4.tar.gz +sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e davinci-bootcount-2.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk index 385d96d5a2c4..695d39688ac6 100644 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ b/package/davinci-bootcount/davinci-bootcount.mk @@ -4,8 +4,8 @@ # ################################################################################ -DAVINCI_BOOTCOUNT_VERSION = 0973689c7556a953d2b468e4d8d46758c6d467b4 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,$(DAVINCI_BOOTCOUNT_VERSION)) +DAVINCI_BOOTCOUNT_VERSION = 2.0.0 +DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING -- 2.32.0 From yann.morin.1998 at free.fr Sat Feb 11 14:58:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 15:58:35 +0100 Subject: [Buildroot] [git commit] package/chrony: run as unprivileged user Message-ID: <20230211150203.B8AD184A7C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=451672e890b5f605aa9ad7a386491a31397c737f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master There are three ways to run chronyd: - start as root, and continue running as root; - start as root, then setuid() to a non-root user via either a command line option or a configuration directive; - start as root, and setuid() to a build-time specified non-root user. Currently, the first situation is used by Buildroot, which does not follow security best practices of dropping elevated privileges for daemon at runtime when that is possible. We switch to the third situation, where a compile-time default non-root user is then used at runtime to drop privileges, with libcap used to keep the capabilities required to call the appropriate syscalls to adjust the system time (typically, CAP_SYS_TIME to call adjtimex() or clock_settime() et al.). This means that libcap is now a mandatory dependency. To be noted: users who previously had configured their systems to run chronyd as non root, would have done so with either the command-line option (`-u`), or the configuration directive (`user`). Those take precedence over the compile-time default, so this should not break their systems (presumably, they also run as the `chrony` user). They would also have taken care to run chronyc as the appropriate user to manipulate chronyd at runtime via the UNIX socket. For those who were running chronyd as root, this does not change either: the functionality is unchanged, and they were running chronyc as root, which should still be capable of manipulating chronyd via its UNIX socket. Take that opportunity to brine chrony's Config.in to current coding style: enclose sub-option in an if-endif block. Signed-off-by: James Kent Signed-off-by: Yann E. MORIN --- package/chrony/Config.in | 6 +++++- package/chrony/chrony.mk | 11 +++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/package/chrony/Config.in b/package/chrony/Config.in index 158dc20530..c22b756c11 100644 --- a/package/chrony/Config.in +++ b/package/chrony/Config.in @@ -1,16 +1,20 @@ config BR2_PACKAGE_CHRONY bool "chrony" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBCAP help Chrony is a pair of programs which are used to maintain the accuracy of the system clock. http://chrony.tuxfamily.org/ +if BR2_PACKAGE_CHRONY + config BR2_PACKAGE_CHRONY_DEBUG_LOGGING bool "enable debug logging support" - depends on BR2_PACKAGE_CHRONY help Enable support for debug logging output from Chrony when enabled at runtime. If disabled, code for debug logging will not be compiled in. + +endif diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 379e95a778..86f23d9060 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -10,20 +10,19 @@ CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING CHRONY_CPE_ID_VENDOR = tuxfamily CHRONY_SELINUX_MODULES = chronyd -CHRONY_DEPENDENCIES = host-pkgconf +CHRONY_DEPENDENCIES = host-pkgconf libcap CHRONY_CONF_OPTS = \ --host-system=Linux \ --host-machine=$(BR2_ARCH) \ --prefix=/usr \ --without-tomcrypt \ + --with-user=chrony \ $(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug) -ifeq ($(BR2_PACKAGE_LIBCAP),y) -CHRONY_DEPENDENCIES += libcap -else -CHRONY_CONF_OPTS += --without-libcap -endif +define CHRONY_USERS + chrony -1 chrony -1 * /run/chrony - - Time daemon +endef ifeq ($(BR2_PACKAGE_LIBNSS),y) CHRONY_DEPENDENCIES += libnss From yann.morin.1998 at free.fr Sat Feb 11 15:01:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 16:01:57 +0100 Subject: [Buildroot] [PATCH v2] package/chrony: add default unprivileged user option In-Reply-To: <8fe20693-4bf1-4378-d7c4-d81bcd9cf7ed@mind.be> References: <20230208182731.15752-1-james.kent@orchestrated-technology.com> <8fe20693-4bf1-4378-d7c4-d81bcd9cf7ed@mind.be> Message-ID: <20230211150157.GG2796@scaer> Arnout, James, All, On 2023-02-09 21:22 +0100, Arnout Vandecappelle spake thusly: > On 08/02/2023 19:27, James Kent wrote: > >Configurable option to define and enable by default an unprivileged > >user which the Chrony daemon will assume once initialised. The > >functionality requires libcap which is selected as necessary. > > > >This option supports the good security practice of dropping elevated > >privileges for daemon runtime. > > > >The package configuration layout has been updated to current working > >practice. > > > >Signed-off-by: James Kent > >--- [--SNIP--] > >+config BR2_PACKAGE_CHRONY_USER > >+ bool "chrony default unprivileged user" > Is there any reason to do this conditionally? For all other packages, we do > it unconditionally. >From what I read, there are three situation to run chrony: - start as root and stay running as root; - start as root, setuid to a user either with a commandline option, or a configuration directive; - start as root, and setuid to a user defined at build-time (which can still be overriden on the commandline or a configuration directive). What this patch does, is to allow for the third option. As it was previously already possible to run as non-root, by just enabling libcap in Buildroot's config, and adding the user configuration directive in chrony's config file (or run it with -u), some people may already do that in their setups, and we do not want to break that. So those people do have eithe the config directive or the -u option, which both take precendence over the build-time configuration. As for those that do run as root, switching to a non-root user should not have any impact in functionality. So, we can safely unconditionally default to a compile-time non-root user. Except, a linux kernel may only have the root user, see CONFIG_MULTIUSER. But in that case we'd have tons of other packages that are gonna whine... Applied to master without the condition, thanks. Regards, Yann E. MORIN. > Regards, > Arnout > > >+ select BR2_PACKAGE_LIBCAP > >+ help > >+ Define and enable default unprivileged user for the Chrony > >+ daemon to run as. > >+ > >+endif > >diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk > >index 379e95a778..16f8f082a3 100644 > >--- a/package/chrony/chrony.mk > >+++ b/package/chrony/chrony.mk > >@@ -21,6 +21,14 @@ CHRONY_CONF_OPTS = \ > > ifeq ($(BR2_PACKAGE_LIBCAP),y) > > CHRONY_DEPENDENCIES += libcap > >+ > >+ifeq ($(BR2_PACKAGE_CHRONY_USER),y) > >+CHRONY_CONF_OPTS += --with-user=chrony > >+define CHRONY_USERS > >+ chrony -1 chrony -1 * /run/chrony - - Time daemon > >+endef > >+endif > >+ > > else > > CHRONY_CONF_OPTS += --without-libcap > > endif -- .-----------------.--------------------.------------------.--------------------. | 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 Feb 11 15:10:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 16:10:34 +0100 Subject: [Buildroot] [PATCH next v2 5/7] package/python-magic-wormhole-mailbox-server: new package Message-ID: <20230211151034.GH2796@scaer> Julien, All, On 2022-11-22 21:31 +0100, Julien Olivain spake thusly: > This package is the main server that Magic-Wormhole clients connect to. > The server performs store-and-forward delivery for small key-exchange > and control messages. Bulk data is sent over a direct TCP connection, > or through a transit-relay. > > https://github.com/magic-wormhole/magic-wormhole-mailbox-server > > Signed-off-by: Julien Olivain > --- [--SNIP--] > diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in > new file mode 100644 > index 0000000000..db20d3e7b6 > --- /dev/null > +++ b/package/python-magic-wormhole-mailbox-server/Config.in > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER > + bool "python-magic-wormhole-mailbox-server" > + select BR2_PACKAGE_PYTHON3_SQLITE # runtime > + select BR2_PACKAGE_PYTHON_ATTRS # runtime > + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime python-autobahn depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS, so this should have been propagated. It's relatively easy to reproduce on current master as of commit 451672e890b5: $ KCONFIG_SEED=0x1D15B9D4 make randconfig [...] WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_AUTOBAHN Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER [=y] && BR2_PACKAGE_PYTHON3 [=y] Care to send a fix, and check the other packages that were added in this series, please? Regards, Yann E. MORIN. > + select BR2_PACKAGE_PYTHON_SIX # runtime > + select BR2_PACKAGE_PYTHON_TWISTED # runtime > + help > + This package is the main server that Magic-Wormhole clients > + connect to. The server performs store-and-forward delivery > + for small key-exchange and control messages. Bulk data is > + sent over a direct TCP connection, or through a > + transit-relay. > + > + https://github.com/magic-wormhole/magic-wormhole-mailbox-server > diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash > new file mode 100644 > index 0000000000..c714712641 > --- /dev/null > +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/magic-wormhole-mailbox-server/json > +md5 3da441df1f354a8399a728da3421ac8f magic-wormhole-mailbox-server-0.4.1.tar.gz > +sha256 1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb magic-wormhole-mailbox-server-0.4.1.tar.gz > +# Locally computed sha256 checksums > +sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE > diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk > new file mode 100644 > index 0000000000..a3394c7dcd > --- /dev/null > +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-magic-wormhole-mailbox-server > +# > +################################################################################ > + > +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION = 0.4.1 > +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SOURCE = magic-wormhole-mailbox-server-$(PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION).tar.gz > +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SITE = https://files.pythonhosted.org/packages/5b/ba/cbb211bc8f8bfdf7fb620d33331f07bcd889c7a28e7fd8a0de9029bb5a2f > +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SETUP_TYPE = setuptools > +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE = MIT > +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE_FILES = LICENSE > + > +$(eval $(python-package)) > -- > 2.38.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 Sat Feb 11 15:25:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 16:25:42 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/sway: new package In-Reply-To: <7f57a607-bf3c-0250-ed23-c6fbf73961a3@gmail.com> (Raphael Pavlidis's message of "Sat, 11 Feb 2023 14:53:15 +0100") References: <20221031124625.21172-1-raphael.pavlidis@gmail.com> <87h6vw5l2r.fsf@dell.be.48ers.dk> <7f57a607-bf3c-0250-ed23-c6fbf73961a3@gmail.com> Message-ID: <87r0uwcjgp.fsf@dell.be.48ers.dk> >>>>> "Raphael" == Raphael Pavlidis writes: > Hi Peter, > On 08.02.23 14:43, Peter Korsgaard wrote: > [--SNIP--] >> How did you test this? Here wlroots with x11 support doesn't build >> as we >> don't have an Xwayland .pc file or binary in Buildroot. >> > I create a xwayland package, which build the xserver binary, but did > not send the patch yet. (This will fix the problems with weston, too) Ok, thanks - Will you submit the xwayland package? -- Bye, Peter Korsgaard From thomas at devoogdt.com Sat Feb 11 15:58:26 2023 From: thomas at devoogdt.com (thomas at devoogdt.com) Date: Sat, 11 Feb 2023 16:58:26 +0100 Subject: [Buildroot] [PATCH] support/config-fragments: add a bootlin s390x toolchain Message-ID: <20230211155826.285037-1-thomas@devoogdt.com> From: Thomas Devoogdt I do constantly get mails that fluent-bit fails to build for s390x. So added this to ensure that the s390x architecture is checked as well if I manually do: $ ./utils/test-pkg -p fluent-bit -a Signed-off-by: Thomas Devoogdt --- .../autobuild/bootlin-s390x-z13-glibc.config | 5 +++++ support/config-fragments/autobuild/toolchain-configs.csv | 1 + 2 files changed, 6 insertions(+) create mode 100644 support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config diff --git a/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config new file mode 100644 index 0000000000..fe3f0380c9 --- /dev/null +++ b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config @@ -0,0 +1,5 @@ +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 diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 0b19051543..a65e9bacc3 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -38,6 +38,7 @@ support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv32-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-sh4-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc64-glibc.config,x86_64 -- 2.34.1 From ps.report at gmx.net Sat Feb 11 16:32:02 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 11 Feb 2023 17:32:02 +0100 Subject: [Buildroot] [PATCH v1] package/ntpsec: fix Stack Smashing Protection detection Message-ID: <20230211163202.25627-1-ps.report@gmx.net> Fix SSP missdetection (compiler supports '-fstack-protector-all' command line argument but selected libc/toolchain does not support SSP, e.g. i686-musl. Fixes: - http://autobuild.buildroot.net/results/ded9ad5badbcfa6552443d3ce0866722becfefbd [...] Checking if C compiler supports -fstack-protector-all : yes [...] Checking for type struct timex : no The configuration failed (complete log in .../build/ntpsec-1_2_2/build/config.log) And from build/ntpsec-1_2_2/build/config.log: err: .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: test.c.1.o: in function `main': test.c:(.text.startup+0x2a): undefined reference to `__stack_chk_fail_local' .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: .../build/ntpsec-1_2_2/build/.conf_check_01f3f794d5b6ffb7add7ce130581ae04/testbuild/main/testprog: hidden symbol `__stack_chk_fail_local' isn't defined .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: final link failed: bad value collect2: error: ld returned 1 exit status Signed-off-by: Peter Seiderer --- package/ntpsec/ntpsec.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index c7fa2f85a8..18a8353900 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -30,6 +30,15 @@ NTPSEC_DEPENDENCIES = \ libcap \ openssl +# prevent '-fstack-protector-all' compiler flag detection without +# ssp support (e.g. i686-musl) +ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) +define NTPSEC_FORCE_DISABLE_SSP + $(SED) s/fstack-protector-all/fstack-protector-all-disabled/g $(@D)/wscript +endef +endif +NTPSEC_PRE_CONFIGURE_HOOKS += NTPSEC_FORCE_DISABLE_SSP + # CC="$(HOSTCC)" is strange but needed to build some host tools, the # cross-compiler will properly be used to build target code thanks to # --cross-compiler -- 2.39.1 From ps.report at gmx.net Sat Feb 11 16:34:22 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 11 Feb 2023 17:34:22 +0100 Subject: [Buildroot] [PATCH v1] package/fft_eval: new package Message-ID: <20230211163422.25944-1-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/Config.in | 1 + package/fft_eval/Config.in | 13 ++++++++++++ package/fft_eval/fft_eval.hash | 5 +++++ package/fft_eval/fft_eval.mk | 36 ++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 package/fft_eval/Config.in create mode 100644 package/fft_eval/fft_eval.hash create mode 100644 package/fft_eval/fft_eval.mk diff --git a/package/Config.in b/package/Config.in index 511e691ed3..aa19164802 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2206,6 +2206,7 @@ menu "Miscellaneous" source "package/collectl/Config.in" source "package/domoticz/Config.in" source "package/empty/Config.in" + source "package/fft_eval/Config.in" source "package/gitlab-runner/Config.in" source "package/gnuradio/Config.in" source "package/googlefontdirectory/Config.in" diff --git a/package/fft_eval/Config.in b/package/fft_eval/Config.in new file mode 100644 index 0000000000..4b6aa9b388 --- /dev/null +++ b/package/fft_eval/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_FFT_EVAL + bool "fft_eval" + help + Pogram to aid open source spectrum analyzer development + for Qualcomm/Atheros AR92xx and AR93xx based chipsets. + + It visualizes the FFT data reported by the chips to help + interpreting and understanding the data. + + Enabel sdl2 and sdl2_ttf for the graphic output tool + fft_eval_sdl. + + https://github.com/simonwunderlich/FFT_eval diff --git a/package/fft_eval/fft_eval.hash b/package/fft_eval/fft_eval.hash new file mode 100644 index 0000000000..ab09e916e7 --- /dev/null +++ b/package/fft_eval/fft_eval.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 154f99c3567835bbbbc9ec4c58bc79961f9fa5342effb6f0bc41475fc9a6d11f fft_eval-6a82b383ce79afc4c1ba26ffcf34b15d3e95894b.tar.gz +sha256 6a573fb2f9082662978cf21fb153096df0a1981deaea7dbc10a11046fe005d9f LICENSES/CC0-1.0.txt +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 797832eda5ff4360a10fee3be94a3250995e76423b79675c9c44204c37ca492d LICENSES/OFL-1.1.txt diff --git a/package/fft_eval/fft_eval.mk b/package/fft_eval/fft_eval.mk new file mode 100644 index 0000000000..383b5f9a51 --- /dev/null +++ b/package/fft_eval/fft_eval.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# fft_eval +# +################################################################################ + +FFT_EVAL_VERSION = 6a82b383ce79afc4c1ba26ffcf34b15d3e95894b +FFT_EVAL_SITE = $(call github,simonwunderlich,FFT_eval,$(FFT_EVAL_VERSION)) +FFT_EVAL_LICENSE = CC0-1.0 (doc), GPL-2.0-only, OFL-1.1 (LiberationSans-Regular.ttf) +FFT_EVAL_LICENSE_FILES = \ + LICENSES/CC0-1.0.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/OFL-1.1.txt + +FFT_EVAL_CONV_OPTS = CONFIG_fft_eval_json=y +FFT_EVAL_TARGETS = fft_eval_json + +ifeq ($(BR2_PACKAGE_SDL2)$(BR2_PACKAGE_SDL2_TTF),yy) +FFT_EVAL_CONV_OPTS += CONFIG_fft_eval_sdl=y +FFT_EVAL_DEPENDENCIES += sdl2 sdl2_ttf +FFT_EVAL_TARGETS += fft_eval_sdl +else +FFT_EVAL_CONV_OPTS += CONFIG_fft_eval_sdl=n +endif + +define FFT_EVAL_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) CROSS=$(STAGING_DIR)/usr/bin/ $(FFT_EVAL_CONV_OPTS) -C $(@D) all +endef + +define FFT_EVAL_INSTALL_TARGET_CMDS + for i in $(FFT_EVAL_TARGETS); do \ + $(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/bin || exit 1; \ + done +endef + +$(eval $(generic-package)) -- 2.39.1 From yann.morin.1998 at free.fr Sat Feb 11 16:49:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 17:49:26 +0100 Subject: [Buildroot] [PATCH v1] package/ntpsec: fix Stack Smashing Protection detection In-Reply-To: <20230211163202.25627-1-ps.report@gmx.net> References: <20230211163202.25627-1-ps.report@gmx.net> Message-ID: <20230211164926.GI2796@scaer> Peter, All, On 2023-02-11 17:32 +0100, Peter Seiderer spake thusly: > Fix SSP missdetection (compiler supports '-fstack-protector-all' command > line argument but selected libc/toolchain does not support SSP, > e.g. i686-musl. > > Fixes: > > - http://autobuild.buildroot.net/results/ded9ad5badbcfa6552443d3ce0866722becfefbd > > [...] > Checking if C compiler supports -fstack-protector-all : yes > [...] > Checking for type struct timex : no > The configuration failed > (complete log in .../build/ntpsec-1_2_2/build/config.log) > > And from build/ntpsec-1_2_2/build/config.log: > > err: .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: test.c.1.o: in function `main': > test.c:(.text.startup+0x2a): undefined reference to `__stack_chk_fail_local' > .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: .../build/ntpsec-1_2_2/build/.conf_check_01f3f794d5b6ffb7add7ce130581ae04/testbuild/main/testprog: hidden symbol `__stack_chk_fail_local' isn't defined > .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: final link failed: bad value > collect2: error: ld returned 1 exit status > > Signed-off-by: Peter Seiderer > --- > package/ntpsec/ntpsec.mk | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk > index c7fa2f85a8..18a8353900 100644 > --- a/package/ntpsec/ntpsec.mk > +++ b/package/ntpsec/ntpsec.mk > @@ -30,6 +30,15 @@ NTPSEC_DEPENDENCIES = \ > libcap \ > openssl > > +# prevent '-fstack-protector-all' compiler flag detection without > +# ssp support (e.g. i686-musl) > +ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) > +define NTPSEC_FORCE_DISABLE_SSP > + $(SED) s/fstack-protector-all/fstack-protector-all-disabled/g $(@D)/wscript > +endef > +endif > +NTPSEC_PRE_CONFIGURE_HOOKS += NTPSEC_FORCE_DISABLE_SSP Assigning to hooks should be done in the conditional if-block, not outside. But in Buildroot, the SSP flags are automatically handled by the wrapper, so we should just unconditionally remove said flags as set by the package, like was done in 50cbac5099b1 (package/sysvinit: add patch to fix compile without stack-protector support) for example (and no, that commit was not chosen totally at random ;-) ). Regards, Yann E. MORIN. > # CC="$(HOSTCC)" is strange but needed to build some host tools, the > # cross-compiler will properly be used to build target code thanks to > # --cross-compiler > -- > 2.39.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 thomas at devoogdt.com Sat Feb 11 17:06:13 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Sat, 11 Feb 2023 18:06:13 +0100 Subject: [Buildroot] [PATCH] package/fluent-bit: add support for non glibc toolchain In-Reply-To: <20230202071518.3961314-1-thomas@devoogdt.com> References: <20230202071518.3961314-1-thomas@devoogdt.com> Message-ID: Hi, The patches need to be rebased if https://patchwork.ozlabs.org/project/buildroot/patch/20230211143356.173296-1-thomas at devoogdt.com/ gets to the master first. Kr, Thomas Op do 2 feb. 2023 om 08:15 schreef Thomas Devoogdt : > > From: Thomas Devoogdt > > - require threads and dynamic library support > - require sync_4 support > - provide fts.h trough musl-fts > > 'static_assert()' is not available if no C++ toolchain or no glibc > is used, so add two patches to fix this > > Signed-off-by: Thomas Devoogdt > --- > .../0002-lib-c-ares-fixup-static_assert.patch | 56 +++++++++++++++++++ > .../0003-lib-cfl-fixup-static_assert.patch | 33 +++++++++++ > package/fluent-bit/Config.in | 10 +++- > package/fluent-bit/fluent-bit.mk | 11 +++- > 4 files changed, 105 insertions(+), 5 deletions(-) > create mode 100644 package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch > create mode 100644 package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch > > No idea if there is an interest in uClibc or musl-enabled toolchains regarding buildroot? > I was able to compile fluent-bit for most of the supported platforms with a limited amount > of changes. > > I had to create two patches in two libs. One (cfl) was already upstreamed, > and added the link to it. The other (c-ares) should be fixed by the m4 bump. I guess that > fluent-bit will bump those sub-libs over time, so we can drop these patches. > > arm-aarch64 [ 1/44]: OK > bootlin-aarch64-glibc [ 2/44]: OK > bootlin-arcle-hs38-uclibc [ 3/44]: OK > bootlin-armv5-uclibc [ 4/44]: OK > bootlin-armv7-glibc [ 5/44]: OK > bootlin-armv7m-uclibc [ 6/44]: SKIPPED > bootlin-armv7-musl [ 7/44]: OK > bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED > bootlin-m68k-68040-uclibc [ 9/44]: OK > bootlin-microblazeel-uclibc [10/44]: OK > bootlin-mipsel32r6-glibc [11/44]: OK > bootlin-mipsel-uclibc [12/44]: OK > bootlin-nios2-glibc [13/44]: OK > bootlin-openrisc-uclibc [14/44]: OK > bootlin-powerpc64le-power8-glibc [15/44]: OK > bootlin-powerpc-e500mc-uclibc [16/44]: OK > bootlin-riscv32-glibc [17/44]: OK > bootlin-riscv64-glibc [18/44]: OK > bootlin-riscv64-musl [19/44]: OK > bootlin-sh4-uclibc [20/44]: OK > bootlin-sparc64-glibc [21/44]: OK > bootlin-sparc-uclibc [22/44]: SKIPPED > bootlin-x86-64-glibc [23/44]: OK > bootlin-x86-64-musl [24/44]: OK > bootlin-x86-64-uclibc [25/44]: OK > bootlin-xtensa-uclibc [26/44]: OK > br-arm-basic [27/44]: OK > br-arm-full-nothread [28/44]: SKIPPED > br-arm-full-static [29/44]: SKIPPED > br-i386-pentium4-full [30/44]: OK > br-i386-pentium-mmx-musl [31/44]: OK > br-mips64-n64-full [32/44]: OK > br-mips64r6-el-hf-glibc [33/44]: OK > br-powerpc-603e-basic-cpp [34/44]: OK > br-powerpc64-power7-glibc [35/44]: OK > linaro-aarch64-be [36/44]: OK > linaro-aarch64 [37/44]: OK > linaro-arm [38/44]: OK > sourcery-arm-armv4t [39/44]: OK > sourcery-arm [40/44]: OK > sourcery-arm-thumb2 [41/44]: OK > sourcery-mips64 [42/44]: OK > sourcery-mips [43/44]: OK > sourcery-nios2 [44/44]: OK > 44 builds, 5 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > diff --git a/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch > new file mode 100644 > index 0000000000..de5d0d06a8 > --- /dev/null > +++ b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch > @@ -0,0 +1,56 @@ > +From aca354ae22c55fa6051d04a9f674fe0825443a94 Mon Sep 17 00:00:00 2001 > +From: Thomas Devoogdt > +Date: Wed, 1 Feb 2023 11:26:56 +0100 > +Subject: [PATCH] lib: c-ares: fixup static_assert > + > +"undefined reference to 'static_assert'" > + > +Not defined when using uClibc or if not C++ >= 11. > + > +upstream: https://github.com/c-ares/c-ares/issues/504 > + > +Signed-off-by: Thomas Devoogdt > +--- > + lib/c-ares-1.18.1/configure | 4 ++++ > + lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 | 3 +++ > + 2 files changed, 7 insertions(+) > + > +diff --git a/lib/c-ares-1.18.1/configure b/lib/c-ares-1.18.1/configure > +index 737f0a0dd..b99b7ed49 100755 > +--- a/lib/c-ares-1.18.1/configure > ++++ b/lib/c-ares-1.18.1/configure > +@@ -6316,6 +6316,8 @@ else $as_nop > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext > + /* end confdefs.h. */ > + > ++#define static_assert _Static_assert > ++ > + template > + struct check > + { > +@@ -6393,6 +6395,8 @@ else $as_nop > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext > + /* end confdefs.h. */ > + > ++#define static_assert _Static_assert > ++ > + template > + struct check > + { > +diff --git a/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 b/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 > +index 229de3091..fe4a11c67 100644 > +--- a/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 > ++++ b/lib/c-ares-1.18.1/m4/ax_cxx_compile_stdcxx_11.m4 > +@@ -37,6 +37,9 @@ > + #serial 9 > + > + m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ > ++ > ++#define static_assert _Static_assert > ++ > + template > + struct check > + { > +-- > +2.39.0 > + > diff --git a/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch b/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch > new file mode 100644 > index 0000000000..7b99a8e4de > --- /dev/null > +++ b/package/fluent-bit/0003-lib-cfl-fixup-static_assert.patch > @@ -0,0 +1,33 @@ > +From 8d17fc961fef2e88f4c8fa2316af925d5466ca4d Mon Sep 17 00:00:00 2001 > +From: Thomas Devoogdt > +Date: Wed, 1 Feb 2023 11:38:15 +0100 > +Subject: [PATCH] lib: cfl: fixup static_assert > + > +"undefined reference to 'static_assert'" > + > +Not defined when using uClibc or if not C++ >= 11. > + > +upstream: https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 > + > +Signed-off-by: Thomas Devoogdt > +--- > + lib/cfl/lib/xxhash/xxhash.h | 3 +-- > + 1 file changed, 1 insertion(+), 2 deletions(-) > + > +diff --git a/lib/cfl/lib/xxhash/xxhash.h b/lib/cfl/lib/xxhash/xxhash.h > +index 08ab79457..511c4d12b 100644 > +--- a/lib/cfl/lib/xxhash/xxhash.h > ++++ b/lib/cfl/lib/xxhash/xxhash.h > +@@ -1546,8 +1546,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) > + /* note: use after variable declarations */ > + #ifndef XXH_STATIC_ASSERT > + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ > +-# include > +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) > ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) > + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ > + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) > + # else > +-- > +2.39.0 > + > diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in > index 6c2299e695..f53eacb447 100644 > --- a/package/fluent-bit/Config.in > +++ b/package/fluent-bit/Config.in > @@ -1,6 +1,9 @@ > config BR2_PACKAGE_FLUENT_BIT > bool "fluent-bit" > - depends on BR2_TOOLCHAIN_USES_GLIBC > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 > + depends on !BR2_STATIC_LIBS # dlfcn.h > + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_LIBYAML > help > @@ -29,5 +32,6 @@ config BR2_PACKAGE_FLUENT_BIT_WASM > > endif > > -comment "fluent-bit needs a glibc toolchain" > - depends on !BR2_TOOLCHAIN_USES_GLIBC > +comment "fluent-bit needs a toolchain w/ threads, dynamic library" > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 > + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS > diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk > index 6e9a33e02e..151afc34aa 100644 > --- a/package/fluent-bit/fluent-bit.mk > +++ b/package/fluent-bit/fluent-bit.mk > @@ -47,12 +47,19 @@ FLUENT_BIT_CONF_OPTS += \ > -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ > -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" > > +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) > +FLUENT_BIT_DEPENDENCIES += musl-fts > +FLUENT_BIT_LINKER_FLAGS += -lfts > +endif > + > # Uses __atomic_compare_exchange_8 > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > -FLUENT_BIT_CONF_OPTS += \ > - -DCMAKE_EXE_LINKER_FLAGS=-latomic > +FLUENT_BIT_LINKER_FLAGS += -latomic > endif > > +FLUENT_BIT_CONF_OPTS += \ > + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LINKER_FLAGS)" > + > define FLUENT_BIT_INSTALL_INIT_SYSV > $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ > $(TARGET_DIR)/etc/init.d/S99fluent-bit > -- > 2.39.0 > From ps.report at gmx.net Sat Feb 11 17:55:47 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 11 Feb 2023 18:55:47 +0100 Subject: [Buildroot] [PATCH v1] package/ntpsec: fix Stack Smashing Protection detection In-Reply-To: <20230211164926.GI2796@scaer> References: <20230211163202.25627-1-ps.report@gmx.net> <20230211164926.GI2796@scaer> Message-ID: <20230211185547.59a1fa42@gmx.net> Hello Yann, *, On Sat, 11 Feb 2023 17:49:26 +0100, "Yann E. MORIN" wrote: > Peter, All, > > On 2023-02-11 17:32 +0100, Peter Seiderer spake thusly: > > Fix SSP missdetection (compiler supports '-fstack-protector-all' command > > line argument but selected libc/toolchain does not support SSP, > > e.g. i686-musl. > > > > Fixes: > > > > - http://autobuild.buildroot.net/results/ded9ad5badbcfa6552443d3ce0866722becfefbd > > > > [...] > > Checking if C compiler supports -fstack-protector-all : yes > > [...] > > Checking for type struct timex : no > > The configuration failed > > (complete log in .../build/ntpsec-1_2_2/build/config.log) > > > > And from build/ntpsec-1_2_2/build/config.log: > > > > err: .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: test.c.1.o: in function `main': > > test.c:(.text.startup+0x2a): undefined reference to `__stack_chk_fail_local' > > .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: .../build/ntpsec-1_2_2/build/.conf_check_01f3f794d5b6ffb7add7ce130581ae04/testbuild/main/testprog: hidden symbol `__stack_chk_fail_local' isn't defined > > .../host/lib/gcc/i686-buildroot-linux-musl/12.2.0/../../../../i686-buildroot-linux-musl/bin/ld: final link failed: bad value > > collect2: error: ld returned 1 exit status > > > > Signed-off-by: Peter Seiderer > > --- > > package/ntpsec/ntpsec.mk | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk > > index c7fa2f85a8..18a8353900 100644 > > --- a/package/ntpsec/ntpsec.mk > > +++ b/package/ntpsec/ntpsec.mk > > @@ -30,6 +30,15 @@ NTPSEC_DEPENDENCIES = \ > > libcap \ > > openssl > > > > +# prevent '-fstack-protector-all' compiler flag detection without > > +# ssp support (e.g. i686-musl) > > +ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) > > +define NTPSEC_FORCE_DISABLE_SSP > > + $(SED) s/fstack-protector-all/fstack-protector-all-disabled/g $(@D)/wscript > > +endef > > +endif > > +NTPSEC_PRE_CONFIGURE_HOOKS += NTPSEC_FORCE_DISABLE_SSP > > Assigning to hooks should be done in the conditional if-block, not > outside. > > But in Buildroot, the SSP flags are automatically handled by the > wrapper, so we should just unconditionally remove said flags as set by > the package, like was done in 50cbac5099b1 (package/sysvinit: add patch > to fix compile without stack-protector support) for example (and no, > that commit was not chosen totally at random ;-) ). Nice reference ;-), do you prefer the above sed hack unconditionally (not sure if the wscript will add additional -lssp/-lssp_nonshared if available) or a patch removing the whole -fstack-protector-all/-lssp/-lssp_nonshared handling? Regards, Peter > > Regards, > Yann E. MORIN. > > > # CC="$(HOSTCC)" is strange but needed to build some host tools, the > > # cross-compiler will properly be used to build target code thanks to > > # --cross-compiler > > -- > > 2.39.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > From ju.o at free.fr Sat Feb 11 18:00:10 2023 From: ju.o at free.fr (Julien Olivain) Date: Sat, 11 Feb 2023 19:00:10 +0100 Subject: [Buildroot] [PATCH next v2 5/7] package/python-magic-wormhole-mailbox-server: new package In-Reply-To: <20230211151034.GH2796@scaer> References: <20230211151034.GH2796@scaer> Message-ID: <789a9e1c7f5e0d253cea4254686c3b63@free.fr> Yann, All, On 11/02/2023 16:10, Yann E. MORIN wrote: > Julien, All, > > On 2022-11-22 21:31 +0100, Julien Olivain spake thusly: >> This package is the main server that Magic-Wormhole clients connect >> to. >> The server performs store-and-forward delivery for small key-exchange >> and control messages. Bulk data is sent over a direct TCP connection, >> or through a transit-relay. >> >> https://github.com/magic-wormhole/magic-wormhole-mailbox-server >> >> Signed-off-by: Julien Olivain >> --- > [--SNIP--] >> diff --git a/package/python-magic-wormhole-mailbox-server/Config.in >> b/package/python-magic-wormhole-mailbox-server/Config.in >> new file mode 100644 >> index 0000000000..db20d3e7b6 >> --- /dev/null >> +++ b/package/python-magic-wormhole-mailbox-server/Config.in >> @@ -0,0 +1,15 @@ >> +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER >> + bool "python-magic-wormhole-mailbox-server" >> + select BR2_PACKAGE_PYTHON3_SQLITE # runtime >> + select BR2_PACKAGE_PYTHON_ATTRS # runtime >> + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime > > python-autobahn depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS, > so this should have been propagated. It's relatively easy to reproduce > on current master as of commit 451672e890b5: > > $ KCONFIG_SEED=0x1D15B9D4 make randconfig > [...] > WARNING: unmet direct dependencies detected for > BR2_PACKAGE_PYTHON_AUTOBAHN > Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] > Selected by [y]: > - BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER [=y] && > BR2_PACKAGE_PYTHON3 [=y] > > Care to send a fix, and check the other packages that were added in > this > series, please? Thank you for reporting this issue! I just checked the series and it is the only patch selecting autobhan with the missing host rustc dependency. I will send a patch right away. Best regards, Julien. From bernd.kuhls at t-online.de Sat Feb 11 18:14:39 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 11 Feb 2023 19:14:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/libdrm: bump version to 2.4.115 Message-ID: <20230211181439.33767-1-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003323.html Signed-off-by: Bernd Kuhls --- 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 387beadc3f..87cc170617 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003250.html -sha256 3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026 libdrm-2.4.114.tar.xz -sha512 8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644 libdrm-2.4.114.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003323.html +sha256 554cfbfe0542bddb391b4e3e05bfbbfc3e282b955bd56218d21c0616481f65eb libdrm-2.4.115.tar.xz +sha512 0c38d3cfd76f627b899f052527c2939d5fc87a417422dceb0761839ba21e69736703a87ba170b5ba7a4aca2506a240760c8c97ca1781a7fb78468225295293bd libdrm-2.4.115.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index cfb0f730fb..f0a6a29636 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.114 +LIBDRM_VERSION = 2.4.115 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT -- 2.39.1 From bernd.kuhls at t-online.de Sat Feb 11 18:22:00 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 11 Feb 2023 19:22:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.2.2 Message-ID: <20230211182200.227946-1-bernd.kuhls@t-online.de> Release notes: https://news-web.php.net/php.announce/345 Changelog: https://www.php.net/ChangeLog-8.php#8.2.2 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 a9c3b7640b..869cb9b94f 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af php-8.2.1.tar.xz +sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 372d55f68a..9ce153f4fa 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.1 +PHP_VERSION = 8.2.2 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES -- 2.39.1 From bernd.kuhls at t-online.de Sat Feb 11 18:25:36 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 11 Feb 2023 19:25:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xlib_libX11: bump version to 1.8.4 Message-ID: <20230211182536.271767-1-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003318.html Signed-off-by: Bernd Kuhls --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 62b67ad544..ed68164d5f 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003305.html -sha256 e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd libX11-1.8.3.tar.xz -sha512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 libX11-1.8.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003318.html +sha256 c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518 libX11-1.8.4.tar.xz +sha512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e libX11-1.8.4.tar.xz # Locally computed sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 3bb3fffce0..add16f49db 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.8.3 +XLIB_LIBX11_VERSION = 1.8.4 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT -- 2.39.1 From thomas at devoogdt.com Sat Feb 11 18:25:43 2023 From: thomas at devoogdt.com (thomas at devoogdt.com) Date: Sat, 11 Feb 2023 19:25:43 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/fluent-bit: bump to version 2.0.9 Message-ID: <20230211182546.633728-1-thomas@devoogdt.com> From: Thomas Devoogdt - Release Notes: https://fluentbit.io/announcements/v2.0.9/ - Patch dropped, as it is upstream: https://github.com/fluent/fluent-bit/commit/7bcb502ebdcd647d6b83c972805e734ad522eb1a Signed-off-by: Thomas Devoogdt --- v2: moved to a serie of patches ...eLists.txt-only-require-a-C-compiler.patch | 27 ------------------- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch diff --git a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch b/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch deleted file mode 100644 index e71bcf0c0d..0000000000 --- a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7bcb502ebdcd647d6b83c972805e734ad522eb1a Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 30 Jan 2023 09:10:37 +0100 -Subject: [PATCH] CMakeLists.txt: only require a C compiler - -Fluent-bit is mostly written in C, -so don't require CXX in the top-level project. - -Signed-off-by: Thomas Devoogdt ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7adb02de..3ff7360d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.12) --project(fluent-bit) -+project(fluent-bit C) - - # CMP0069 ensures that LTO is enabled for all compilers - cmake_policy(SET CMP0069 NEW) --- -2.30.2 - diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index ce7cea7b59..0caadcd56f 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8ff5566389033669feabc9c69a5c6f417dad5c8b066454388e6a706507262acf fluent-bit-2.0.8.tar.gz +sha256 393ad4a6ced48c327607653d610ef273843085a17b6e5c8013877abdf31e6945 fluent-bit-2.0.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 13077e53cc..c10ef613d7 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.0.8 +FLUENT_BIT_VERSION = 2.0.9 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE -- 2.34.1 From thomas at devoogdt.com Sat Feb 11 18:25:44 2023 From: thomas at devoogdt.com (thomas at devoogdt.com) Date: Sat, 11 Feb 2023 19:25:44 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/fluent-bit: add support for non glibc toolchain In-Reply-To: <20230211182546.633728-1-thomas@devoogdt.com> References: <20230211182546.633728-1-thomas@devoogdt.com> Message-ID: <20230211182546.633728-2-thomas@devoogdt.com> From: Thomas Devoogdt - require threads and dynamic library support - require sync_4 support - provide fts.h trough musl-fts static_assert is not available if no C++ toolchain or no glibc is used, so add two patches to fix this Signed-off-by: Thomas Devoogdt --- v2: rebased the c-ares patch .../0001-lib-cfl-fixup-static_assert.patch | 33 +++++++++++ .../0002-lib-c-ares-fixup-static_assert.patch | 56 +++++++++++++++++++ package/fluent-bit/Config.in | 10 +++- package/fluent-bit/fluent-bit.mk | 11 +++- 4 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch create mode 100644 package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch diff --git a/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch b/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch new file mode 100644 index 0000000000..19dab7cac6 --- /dev/null +++ b/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch @@ -0,0 +1,33 @@ +From e4f825dd9e952f4a056bf89342049e67102ae6bb Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:38:15 +0100 +Subject: [PATCH] lib: cfl: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 + +Signed-off-by: Thomas Devoogdt +--- + lib/cfl/lib/xxhash/xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/cfl/lib/xxhash/xxhash.h b/lib/cfl/lib/xxhash/xxhash.h +index 08ab79457..511c4d12b 100644 +--- a/lib/cfl/lib/xxhash/xxhash.h ++++ b/lib/cfl/lib/xxhash/xxhash.h +@@ -1546,8 +1546,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else +-- +2.34.1 + diff --git a/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch new file mode 100644 index 0000000000..d9b918ea8a --- /dev/null +++ b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch @@ -0,0 +1,56 @@ +From f55f9bf6d9201169d2e5d3782068b03ff17dec90 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:26:56 +0100 +Subject: [PATCH] lib: c-ares: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/c-ares/c-ares/issues/504 + +Signed-off-by: Thomas Devoogdt +--- + lib/c-ares-1.19.0/configure | 4 ++++ + lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/lib/c-ares-1.19.0/configure b/lib/c-ares-1.19.0/configure +index 4c5e1a966..58712ec34 100755 +--- a/lib/c-ares-1.19.0/configure ++++ b/lib/c-ares-1.19.0/configure +@@ -6317,6 +6317,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +@@ -6394,6 +6396,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +diff --git a/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 b/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 +index 229de3091..fe4a11c67 100644 +--- a/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 ++++ b/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 +@@ -37,6 +37,9 @@ + #serial 9 + + m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ ++ ++#define static_assert _Static_assert ++ + template + struct check + { +-- +2.34.1 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 6c2299e695..f53eacb447 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_FLUENT_BIT bool "fluent-bit" - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_STATIC_LIBS # dlfcn.h + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBYAML help @@ -29,5 +32,6 @@ config BR2_PACKAGE_FLUENT_BIT_WASM endif -comment "fluent-bit needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC +comment "fluent-bit needs a toolchain w/ threads, dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index c10ef613d7..4ecf813511 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -49,12 +49,19 @@ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +FLUENT_BIT_DEPENDENCIES += musl-fts +FLUENT_BIT_LDFLAGS += -lfts +endif + # Uses __atomic_compare_exchange_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS=-latomic +FLUENT_BIT_LDFLAGS += -latomic endif +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" + define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ $(TARGET_DIR)/etc/init.d/S99fluent-bit -- 2.34.1 From thomas at devoogdt.com Sat Feb 11 18:25:45 2023 From: thomas at devoogdt.com (thomas at devoogdt.com) Date: Sat, 11 Feb 2023 19:25:45 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/fluent-bit: fix builds on s390x architectures In-Reply-To: <20230211182546.633728-1-thomas@devoogdt.com> References: <20230211182546.633728-1-thomas@devoogdt.com> Message-ID: <20230211182546.633728-3-thomas@devoogdt.com> From: Thomas Devoogdt Fixes: - http://autobuild.buildroot.net/results/856fd250f75a696694c70e3208ffcef7470a7082 - http://autobuild.buildroot.net/results/dceb413fb5d459338417d8dd5a42d95aa23e849b Signed-off-by: Thomas Devoogdt --- v2: new patch in this serie package/fluent-bit/fluent-bit.mk | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 4ecf813511..d618fdf1e2 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -12,6 +12,9 @@ FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl +FLUENT_BIT_CFLAGS = $(TARGET_CFLAGS) +FLUENT_BIT_CXXFLAGS = $(TARGET_CXXFLAGS) + FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ -DFLB_RELEASE=Yes \ @@ -42,12 +45,16 @@ FLUENT_BIT_CONF_OPTS += \ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_INSTALL_SYSCONFDIR="/etc/" +# Fix multiple definition of `mk_tls_*'. +# https://github.com/fluent/fluent-bit/issues/5537 +FLUENT_BIT_CFLAGS += -fcommon +FLUENT_BIT_CXXFLAGS += -fcommon + # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h # large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information. -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +# https://bugzilla.redhat.com/show_bug.cgi?id=574992 +FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS +FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) FLUENT_BIT_DEPENDENCIES += musl-fts @@ -60,7 +67,9 @@ FLUENT_BIT_LDFLAGS += -latomic endif FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" \ + -DCMAKE_C_FLAGS="$(FLUENT_BIT_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(FLUENT_BIT_CXXFLAGS)" define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ -- 2.34.1 From bernd.kuhls at t-online.de Sat Feb 11 18:28:38 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 11 Feb 2023 19:28:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xapp_xvidtune: bump version to 1.0.4 Message-ID: <20230211182838.272469-1-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003319.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls --- package/x11r7/xapp_xvidtune/xapp_xvidtune.hash | 5 +++-- package/x11r7/xapp_xvidtune/xapp_xvidtune.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash index ecf7d0330b..0e7e231383 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002129.html -sha256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 xvidtune-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003319.html +sha256 0d4eecd54e440cc11f1bdaaa23180fcf890f003444343f533f639086b05b2cc5 xvidtune-1.0.4.tar.xz +sha512 747d5358f4f7d3d7db508c3f034711ce4b9dd278160d35312e9c4d1604623e84a2438d039b536546fd2df7db8c5ea1907e8a6101985fad2932b6dee5a62c7b80 xvidtune-1.0.4.tar.xz # Locally computed sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk index d7c4d5bf56..cc40d39098 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XVIDTUNE_VERSION = 1.0.3 -XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2 -XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XVIDTUNE_VERSION = 1.0.4 +XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.xz +XAPP_XVIDTUNE_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XVIDTUNE_LICENSE = MIT XAPP_XVIDTUNE_LICENSE_FILES = COPYING XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm -- 2.39.1 From romain.naour at gmail.com Sat Feb 11 18:28:38 2023 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 11 Feb 2023 19:28:38 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain/helper: check the arch sysroot Message-ID: <20230211182839.3841661-1-romain.naour@gmail.com> Since the commit [1], the utils/genrandconfig script improved the configuration randomization used by autobuilders. Since then it can generate a configuration that is not suitable for an external toolchain such the "Codescape IMG GNU Linux Toolchain". Indeed this toolchain can be selected for mips32r5 or mips64r5 while only mips32r2 or mips64r2 are really supported. The toolchain issue will be fixed in a followup change. We want to catch such issue in check_unusable_toolchain function otherwise it is detected late during the sysroot import into staging and trigger a weird error message: ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot/usr//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory This is similar test than for the main sysroot check but this time we have to use the toolchain cflags to check the architecture sysroot. If the architecture sysroot doesn't exist, the toolchain will reply with "libc.a". Either the toolchain is really broken or we used a wrong target architecture variant. In the later case, the toolchain infrastructure will print a meaningful error message. Note: We also may get a similar issue using the toolchain-external-custom package if a toolchain is used with a wrong target architecture variant. Fixes: http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ [1] aeee90ec109b83c42779e6a2617f7d57e25a2b65 Signed-off-by: Romain Naour Cc: Giulio Benetti Cc: Thomas De Schampheleire Cc: Thomas Petazzoni --- Note: We should improve the Buildroot testsuite to test the toolchain wrapper corner cases. --- toolchain/helpers.mk | 11 +++++++++++ .../toolchain-external/pkg-toolchain-external.mk | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 1cd7494fdb..24c482923a 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -422,12 +422,16 @@ check_cross_compiler_exists = \ # the host tuple. # - Exclude distro-class toolchains which are not relocatable. # - Exclude broken toolchains which return "libc.a" with -print-file-name. +# - Exclude toolchains used with wrong toolchain cflags or broken toolchains +# which return "libc.a" with -print-file-name and toolchain cflags. # - Exclude toolchains which doesn't support --sysroot option. # # $1: cross-gcc path +# $1: toolchain cflags # check_unusable_toolchain = \ __CROSS_CC=$(strip $1) ; \ + __TOOLCHAIN_CFLAGS=$(strip $2) ; \ vendor=`$${__CROSS_CC} -dumpmachine | cut -f2 -d'-'` ; \ if test "$${vendor}" = "angstrom" ; then \ echo "Angstrom toolchains are not pure toolchains: they contain" ; \ @@ -449,6 +453,13 @@ check_unusable_toolchain = \ echo "Unable to detect the toolchain sysroot, Buildroot cannot use this toolchain." ; \ exit 1 ; \ fi ; \ + libc_a_archsysroot_path=`$${__CROSS_CC} $${__TOOLCHAIN_CFLAGS} -print-file-name=libc.a` ; \ + if test "$${libc_a_archsysroot_path}" = "libc.a" ; then \ + echo "Unable to detect the toolchain architecture sysroot." ; \ + echo "Please check the Target Architecture Variant selected, the toolchains may not support it." ; \ + echo "Buildroot cannot use this toolchain." ; \ + exit 1 ; \ + fi; \ sysroot_dir="$(call toolchain_find_sysroot,$${__CROSS_CC})" ; \ if test -z "$${sysroot_dir}" ; then \ echo "External toolchain doesn't support --sysroot. Cannot use." ; \ diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 299b6008aa..c37f3500d9 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -563,7 +563,7 @@ endif # kernel headers version, type of C library and all C library features. define $(2)_CONFIGURE_CMDS $$(Q)$$(call check_cross_compiler_exists,$$(TOOLCHAIN_EXTERNAL_CC)) - $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC)) + $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC),"$$(TOOLCHAIN_EXTERNAL_CFLAGS)") $$(Q)SYSROOT_DIR="$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC))" ; \ $$(call check_kernel_headers_version,\ $$(BUILD_DIR),\ -- 2.34.3 From romain.naour at gmail.com Sat Feb 11 18:28:39 2023 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 11 Feb 2023 19:28:39 +0100 Subject: [Buildroot] [PATCH 2/2] toolchain/toolchain-external/toolchain-external-codescape-mti-mips: remove wrong MIPS32r5 and MIPS64r5 support In-Reply-To: <20230211182839.3841661-1-romain.naour@gmail.com> References: <20230211182839.3841661-1-romain.naour@gmail.com> Message-ID: <20230211182839.3841661-2-romain.naour@gmail.com> This toolchain doesn't support MIPS32r5 and MIPS64r5 and the toolchain infrastructure fail to import the sysroot to staging. Fixes: c4a62fa6278058461ff9e501ba6e822486453493 Fixes: http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ Signed-off-by: Romain Naour Cc: Thomas Petazzoni --- .../toolchain-external-codescape-mti-mips/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index c58c55119a..8217ddc38c 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -3,8 +3,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) || \ - BR2_MIPS_CPU_MIPS32R5 || (BR2_MIPS_CPU_MIPS64R5 && !BR2_MIPS_SOFT_FLOAT) + depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 -- 2.34.3 From bernd.kuhls at t-online.de Sat Feb 11 18:31:42 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 11 Feb 2023 19:31:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 Message-ID: <20230211183142.397167-1-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003321.html Fixes CVE-2023-0494: https://lists.x.org/archives/xorg-announce/2023-February/003320.html Signed-off-by: Bernd Kuhls --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 0c3c807ff3..e2a2a251c3 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003310.html -sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz -sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003321.html +sha256 d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb xorg-server-21.1.7.tar.xz +sha512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5 xorg-server-21.1.7.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 04eb5e90b7..33b35b7979 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.6 +XSERVER_XORG_SERVER_VERSION = 21.1.7 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT -- 2.39.1 From bernd.kuhls at t-online.de Sat Feb 11 18:37:15 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 11 Feb 2023 19:37:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xapp_beforelight: bump version to 1.0.6 Message-ID: <20230211183715.432384-1-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003317.html Updated license hash due to upstream commit: https://gitlab.freedesktop.org/xorg/app/beforelight/-/commit/fa1e473dd64673a36a73a01a84a8db61eaa425dc Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls --- package/x11r7/xapp_beforelight/xapp_beforelight.hash | 7 ++++--- package/x11r7/xapp_beforelight/xapp_beforelight.mk | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.hash b/package/x11r7/xapp_beforelight/xapp_beforelight.hash index 00aff75779..f5b0cb21a4 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.hash +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002131.html -sha256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 beforelight-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-January/003317.html +sha256 53f0bf085b7272ebbf626d1b9b0ad320d1a07bc1fe7f3ae260c86a71a857ad28 beforelight-1.0.6.tar.xz +sha512 48a165d151676f6d213883bee98b34007403a77e025253c8649f9a0f5ea258b09381ab523a5e906030ac9fc8245fce2c6beaf9ad0f81116e302d51ad4a0fad5a beforelight-1.0.6.tar.xz # Locally computed -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING +sha256 3909739fae1ee37c3c7167a91f53d29317965aaf932813e16ef733f033619a7b COPYING diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk index 7dcb715ef3..6b753833f7 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_BEFORELIGHT_VERSION = 1.0.5 -XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2 -XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_BEFORELIGHT_VERSION = 1.0.6 +XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.xz +XAPP_BEFORELIGHT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_BEFORELIGHT_LICENSE = MIT XAPP_BEFORELIGHT_LICENSE_FILES = COPYING XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt -- 2.39.1 From james.hilliard1 at gmail.com Sat Feb 11 18:43:46 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 11 Feb 2023 11:43:46 -0700 Subject: [Buildroot] [PATCH 1/1] Makefile: fix rule order for legal-info Message-ID: <20230211184346.1192333-1-james.hilliard1@gmail.com> This command relies on the clean/prepare operations being in a specific order. Currently the execution ordering of the clean/prepare operations may change, for example if --shuffle=reversed is set. To ensure the evaluation order is always correct use double colon rules to make the evaluation order explicit as per make docs: The double-colon rules for a target are executed in the order they appear in the makefile. Signed-off-by: James Hilliard --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4880b426b5..09575a5e3c 100644 --- a/Makefile +++ b/Makefile @@ -839,7 +839,9 @@ legal-info-prepare: $(LEGAL_INFO_DIR) @cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config .PHONY: legal-info -legal-info: legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ +legal-info:: legal-info-clean +legal-info:: legal-info-prepare +legal-info:: $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) @cat support/legal-info/README.header >>$(LEGAL_REPORT) @if [ -r $(LEGAL_WARNINGS) ]; then \ -- 2.34.1 From peter at korsgaard.com Sat Feb 11 22:18:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.2.2 In-Reply-To: <20230211182200.227946-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 11 Feb 2023 19:22:00 +0100") References: <20230211182200.227946-1-bernd.kuhls@t-online.de> Message-ID: <87mt5jdex1.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://news-web.php.net/php.announce/345 > Changelog: https://www.php.net/ChangeLog-8.php#8.2.2 > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 11 22:18:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libdrm: bump version to 2.4.115 In-Reply-To: <20230211181439.33767-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 11 Feb 2023 19:14:39 +0100") References: <20230211181439.33767-1-bernd.kuhls@t-online.de> Message-ID: <87ilg7dewj.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003323.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 11 22:18:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xlib_libX11: bump version to 1.8.4 In-Reply-To: <20230211182536.271767-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 11 Feb 2023 19:25:36 +0100") References: <20230211182536.271767-1-bernd.kuhls@t-online.de> Message-ID: <87edqvdewc.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003318.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 11 22:20:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:20:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 In-Reply-To: <20230211183142.397167-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 11 Feb 2023 19:31:42 +0100") References: <20230211183142.397167-1-bernd.kuhls@t-online.de> Message-ID: <87a61jdetj.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003321.html > Fixes CVE-2023-0494: > https://lists.x.org/archives/xorg-announce/2023-February/003320.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 11 22:18:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:12 +0100 Subject: [Buildroot] [git commit] package/php: bump version to 8.2.2 Message-ID: <20230211222114.6D4F8854A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a54bb2a2d99b835f672ae194dc4934757881e08b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://news-web.php.net/php.announce/345 Changelog: https://www.php.net/ChangeLog-8.php#8.2.2 Signed-off-by: Bernd Kuhls 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 a9c3b7640b..869cb9b94f 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af php-8.2.1.tar.xz +sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 372d55f68a..9ce153f4fa 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.1 +PHP_VERSION = 8.2.2 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 11 22:18:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:26 +0100 Subject: [Buildroot] [git commit] package/x11r7/xlib_libX11: bump version to 1.8.4 Message-ID: <20230211222114.7F2A4854B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b9bea584c2f2c14122395eba7cdbf325ed7256c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003318.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 62b67ad544..ed68164d5f 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003305.html -sha256 e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd libX11-1.8.3.tar.xz -sha512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 libX11-1.8.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003318.html +sha256 c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518 libX11-1.8.4.tar.xz +sha512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e libX11-1.8.4.tar.xz # Locally computed sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 3bb3fffce0..add16f49db 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.8.3 +XLIB_LIBX11_VERSION = 1.8.4 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT From peter at korsgaard.com Sat Feb 11 22:20:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:20:15 +0100 Subject: [Buildroot] [git commit] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 Message-ID: <20230211222114.A07DB854A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8f0c02574b485e3250030d8cbf5c057ced578a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003321.html Fixes CVE-2023-0494: https://lists.x.org/archives/xorg-announce/2023-February/003320.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 0c3c807ff3..e2a2a251c3 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003310.html -sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz -sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003321.html +sha256 d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb xorg-server-21.1.7.tar.xz +sha512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5 xorg-server-21.1.7.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 04eb5e90b7..33b35b7979 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.6 +XSERVER_XORG_SERVER_VERSION = 21.1.7 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From peter at korsgaard.com Sat Feb 11 22:18:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:48 +0100 Subject: [Buildroot] [git commit] package/libdrm: bump version to 2.4.115 Message-ID: <20230211222114.8EB3A854C7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e1fdd144300106704e21176673e465163245669 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003323.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 387beadc3f..87cc170617 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003250.html -sha256 3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026 libdrm-2.4.114.tar.xz -sha512 8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644 libdrm-2.4.114.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003323.html +sha256 554cfbfe0542bddb391b4e3e05bfbbfc3e282b955bd56218d21c0616481f65eb libdrm-2.4.115.tar.xz +sha512 0c38d3cfd76f627b899f052527c2939d5fc87a417422dceb0761839ba21e69736703a87ba170b5ba7a4aca2506a240760c8c97ca1781a7fb78468225295293bd libdrm-2.4.115.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 56366b6c48..52ac13b7d0 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.114 +LIBDRM_VERSION = 2.4.115 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From francois.dugast.foss at gmail.com Sat Feb 11 22:47:55 2023 From: francois.dugast.foss at gmail.com (Francois Dugast) Date: Sat, 11 Feb 2023 23:47:55 +0100 Subject: [Buildroot] [PATCH 1/1] board/visionfive2: add link to documentation Message-ID: <20230211224755.13044-1-francois.dugast.foss@gmail.com> Add a link to RVspace Documentation Center, which did not exist when readme.txt was first submitted. It provides datasheet, quick start, schematics, and so on. Signed-off-by: Francois Dugast --- board/visionfive2/readme.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt index 2da98f3847..1924cbc12b 100644 --- a/board/visionfive2/readme.txt +++ b/board/visionfive2/readme.txt @@ -4,6 +4,8 @@ Starfive VisionFive2 The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a Starfive JH7110 processor. +https://doc-en.rvspace.org/Doc_Center/visionfive_2.html + How to build ============ -- 2.30.2 From christian at paral.in Sun Feb 12 01:42:16 2023 From: christian at paral.in (Christian Stewart) Date: Sat, 11 Feb 2023 17:42:16 -0800 Subject: [Buildroot] [PATCH 1/1] package/rtl8723ds: bump to 2023-02-11 version with new license file Message-ID: <20230212014216.6293-1-christian@paral.in> A COPYING file has been added to rtl8723ds as of the most recent commit. Update the version of the package and add the license file hash. Signed-off-by: Christian Stewart --- package/rtl8723ds/rtl8723ds.hash | 3 ++- package/rtl8723ds/rtl8723ds.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index d5abf9913c..e94a7b40ef 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 97f3ebc5d977ba35d10c9c06e6817e4a00458727b651b56fc00c207c05a61995 rtl8723ds-a638cc8639015b8b9390af3350fab0366b6c87e7.tar.gz +sha256 672787c3f3d1f795b750cd74de8ca34bb661b8ae60f5aa50fb279ec08ff3f05f rtl8723ds-ec85dc6b9f72bfe413bff464ed01a272e29c8dbe.tar.gz +sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 COPYING diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index f303a24041..1bb164fa86 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,9 +4,10 @@ # ################################################################################ -RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 +RTL8723DS_VERSION = ec85dc6b9f72bfe413bff464ed01a272e29c8dbe RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 +RTL8723DS_LICENSE_FILES = COPYING RTL8723DS_USER_EXTRA_CLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ -- 2.39.1 From christian at paral.in Sun Feb 12 01:54:41 2023 From: christian at paral.in (Christian Stewart) Date: Sat, 11 Feb 2023 17:54:41 -0800 Subject: [Buildroot] [PATCH 1/3] package/go-bootstrap: split into two stages: go1.4 and go1.19.5 Message-ID: <20230212015443.7740-1-christian@paral.in> Go 1.20 requires a minimum version of go 1.17.13 to bootstrap. https://go.dev/doc/go1.20#bootstrap As Go 1.4 was the previous version that could be compiled with C, there is now no way to bootstrap go with a C compiler, unless we use a two-stage bootstrap: - build host-go-bootstrap-1.4-20170531 - build host-go-bootstrap-1.19.5 with host-go-bootstrap-1.4-20170531 - build host-go-1.20 with host-go-bootstrap-1.19.5 This is implemented in this commit first, before upgrading host-go to 1.20. Note: the .patch files from package/go version 1.19.x are not necessary for package/go-bootstrap-stage2 and have not been included there. Discussion of possible alternate approaches for future use: https://lore.kernel.org/all/CA+h8R2rtcynkCBsz=_9yANOEguyPCOcQDj8_ns+cv8RS8+8t9A at mail.gmail.com/ https://lore.kernel.org/all/20220525234312.643dfc03 at windsurf/T/ Signed-off-by: Christian Stewart --- v1 -> v2: - fix indentation of GOROOT_BOOTSTRAP in stage2 MAKE_ENV - adjust commit description - remove duplicate MAKE_ENV declaration line - reorder depends on lines in config.in.host Signed-off-by: Christian Stewart --- DEVELOPERS | 2 + package/Config.in.host | 3 +- package/go-bootstrap-stage1/Config.in.host | 6 ++ .../go-bootstrap-stage1.hash} | 0 .../go-bootstrap-stage1.mk | 46 ++++++++++++++++ package/go-bootstrap-stage2/Config.in.host | 4 ++ .../go-bootstrap-stage2.hash | 3 + .../go-bootstrap-stage2.mk | 55 +++++++++++++++++++ package/go-bootstrap/Config.in.host | 7 --- package/go-bootstrap/go-bootstrap.mk | 50 ----------------- package/go/Config.in.host | 6 +- package/go/go.mk | 9 ++- 12 files changed, 126 insertions(+), 65 deletions(-) create mode 100644 package/go-bootstrap-stage1/Config.in.host rename package/{go-bootstrap/go-bootstrap.hash => go-bootstrap-stage1/go-bootstrap-stage1.hash} (100%) create mode 100644 package/go-bootstrap-stage1/go-bootstrap-stage1.mk create mode 100644 package/go-bootstrap-stage2/Config.in.host create mode 100644 package/go-bootstrap-stage2/go-bootstrap-stage2.hash create mode 100644 package/go-bootstrap-stage2/go-bootstrap-stage2.mk delete mode 100644 package/go-bootstrap/Config.in.host delete mode 100644 package/go-bootstrap/go-bootstrap.mk diff --git a/DEVELOPERS b/DEVELOPERS index ae698f87c5..ddfbb12b27 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -548,6 +548,8 @@ F: package/docker-engine/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ +F: package/go-bootstrap-stage1/ +F: package/go-bootstrap-stage2/ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ diff --git a/package/Config.in.host b/package/Config.in.host index dcadbfdfc1..fff75cd165 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -40,7 +40,8 @@ menu "Host utilities" source "package/genpart/Config.in.host" source "package/gnupg/Config.in.host" source "package/go/Config.in.host" - source "package/go-bootstrap/Config.in.host" + source "package/go-bootstrap-stage1/Config.in.host" + source "package/go-bootstrap-stage2/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imagemagick/Config.in.host" diff --git a/package/go-bootstrap-stage1/Config.in.host b/package/go-bootstrap-stage1/Config.in.host new file mode 100644 index 0000000000..56a743caf9 --- /dev/null +++ b/package/go-bootstrap-stage1/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS + bool + # See src/cmd/dist/unix.c for the list of supported architectures + default y if BR2_HOSTARCH = "x86" + default y if BR2_HOSTARCH = "x86_64" + default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.hash b/package/go-bootstrap-stage1/go-bootstrap-stage1.hash similarity index 100% rename from package/go-bootstrap/go-bootstrap.hash rename to package/go-bootstrap-stage1/go-bootstrap-stage1.hash diff --git a/package/go-bootstrap-stage1/go-bootstrap-stage1.mk b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk new file mode 100644 index 0000000000..77e7046cd7 --- /dev/null +++ b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# go-bootstrap-stage1 +# +################################################################################ + +# Use last C-based Go compiler: v1.4.x +# See https://golang.org/doc/install/source#bootstrapFromSource +GO_BOOTSTRAP_STAGE1_VERSION = 1.4-bootstrap-20171003 +GO_BOOTSTRAP_STAGE1_SITE = https://dl.google.com/go +GO_BOOTSTRAP_STAGE1_SOURCE = go$(GO_BOOTSTRAP_STAGE1_VERSION).tar.gz + +GO_BOOTSTRAP_STAGE1_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE1_LICENSE_FILES = LICENSE + +# The toolchain is needed for HOSTCC_NOCACHE used to compile the Go compiler. +HOST_GO_BOOTSTRAP_STAGE1_DEPENDENCIES = toolchain + +HOST_GO_BOOTSTRAP_STAGE1_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE1_VERSION) + +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV = \ + GOOS=linux \ + GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_STAGE1_ROOT)" \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + CC=$(HOSTCC_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE1_BUILD_CMDS + cd $(@D)/src && $(HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV) ./make.bash +endef + +define HOST_GO_BOOTSTRAP_STAGE1_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + + # https://golang.org/issue/2775 + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap-stage2/Config.in.host b/package/go-bootstrap-stage2/Config.in.host new file mode 100644 index 0000000000..967ddaed1d --- /dev/null +++ b/package/go-bootstrap-stage2/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash new file mode 100644 index 0000000000..4c22f0f274 --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash @@ -0,0 +1,3 @@ +# From https://go.dev/dl +sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk new file mode 100644 index 0000000000..b623978500 --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -0,0 +1,55 @@ +################################################################################ +# +# go-bootstrap-stage2 +# +################################################################################ + +GO_BOOTSTRAP_STAGE2_VERSION = 1.19.5 +GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang +GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz + +GO_BOOTSTRAP_STAGE2_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE2_LICENSE_FILES = LICENSE + +# Use go-bootstrap-stage1 to bootstrap. +HOST_GO_BOOTSTRAP_STAGE2_DEPENDENCIES = host-go-bootstrap-stage1 + +HOST_GO_BOOTSTRAP_STAGE2_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE2_VERSION) + +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV = \ + GO111MODULE=off \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE1_ROOT) \ + GOROOT_FINAL=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + GOOS=linux \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE2_BUILD_CMDS + cd $(@D)/src && \ + $(HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) +endef + +define HOST_GO_BOOTSTRAP_STAGE2_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ + + mkdir -p $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg + cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + cp -a $(@D)/pkg/tool $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + + # https://golang.org/issue/2775 + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ + + # Set all file timestamps to prevent the go compiler from rebuilding any + # built in packages when programs are built. + find $(HOST_GO_BOOTSTRAP_STAGE2_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap/Config.in.host b/package/go-bootstrap/Config.in.host deleted file mode 100644 index fab80d24b4..0000000000 --- a/package/go-bootstrap/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS - bool - # See src/cmd/dist/unix.c for the list of support - # architectures - default y if BR2_HOSTARCH = "x86" - default y if BR2_HOSTARCH = "x86_64" - default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.mk b/package/go-bootstrap/go-bootstrap.mk deleted file mode 100644 index 71696a1540..0000000000 --- a/package/go-bootstrap/go-bootstrap.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# go-bootstrap -# -################################################################################ - -# Use last C-based Go compiler: v1.4.x -# See https://golang.org/doc/install/source#bootstrapFromSource -GO_BOOTSTRAP_VERSION = 1.4-bootstrap-20171003 -GO_BOOTSTRAP_SITE = https://dl.google.com/go -GO_BOOTSTRAP_SOURCE = go$(GO_BOOTSTRAP_VERSION).tar.gz - -GO_BOOTSTRAP_LICENSE = BSD-3-Clause -GO_BOOTSTRAP_LICENSE_FILES = LICENSE - -# To build programs that need cgo support the toolchain needs to be -# available, so the toolchain is not needed to build host-go-bootstrap -# itself, but needed by other packages that depend on -# host-go-bootstrap. -HOST_GO_BOOTSTRAP_DEPENDENCIES = toolchain - -HOST_GO_BOOTSTRAP_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_VERSION) - -# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE -# here. See https://github.com/golang/go/issues/11685. -HOST_GO_BOOTSTRAP_MAKE_ENV = \ - GOOS=linux \ - GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_ROOT)" \ - GOROOT="$(@D)" \ - GOBIN="$(@D)/bin" \ - CC=$(HOSTCC_NOCCACHE) \ - CGO_ENABLED=0 - -define HOST_GO_BOOTSTRAP_BUILD_CMDS - cd $(@D)/src && $(HOST_GO_BOOTSTRAP_MAKE_ENV) ./make.bash -endef - -define HOST_GO_BOOTSTRAP_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_ROOT)/bin/go - $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_ROOT)/bin/gofmt - - cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_ROOT)/ - cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_ROOT)/ - - # There is a known issue which requires the go sources to be installed - # https://golang.org/issue/2775 - cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_ROOT)/ -endef - -$(eval $(host-generic-package)) diff --git a/package/go/Config.in.host b/package/go/Config.in.host index ded02d3b3a..b87b862cec 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,7 +2,9 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + # See https://go.dev/doc/install/source#environment + # See src/go/build/syslist.go for the list of supported architectures depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ || BR2_mips64 || BR2_mips64el || BR2_riscv || BR2_s390x @@ -28,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go/go.mk b/package/go/go.mk index c38ae0b99c..b0dd002712 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -12,7 +12,7 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap +HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -121,12 +121,12 @@ HOST_GO_HOST_ENV = \ CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \ CGO_LDFLAGS="$(HOST_LDFLAGS)" -# The go build system is not compatible with ccache, so use -# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_ROOT) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -154,7 +154,6 @@ define HOST_GO_INSTALL_CMDS cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ - # There is a known issue which requires the go sources to be installed # https://golang.org/issue/2775 cp -a $(@D)/src $(HOST_GO_ROOT)/ -- 2.39.1 From christian at paral.in Sun Feb 12 01:54:42 2023 From: christian at paral.in (Christian Stewart) Date: Sat, 11 Feb 2023 17:54:42 -0800 Subject: [Buildroot] [PATCH 2/3] package/go: bump to version 1.20 In-Reply-To: <20230212015443.7740-1-christian@paral.in> References: <20230212015443.7740-1-christian@paral.in> Message-ID: <20230212015443.7740-2-christian@paral.in> The latest Go release, version 1.20, arrives six months after Go 1.19. Most of its changes are in the implementation of the toolchain, runtime, and libraries. https://go.dev/doc/go1.20 Signed-off-by: Christian Stewart --- v1 -> v2: - drop unnecessary change to config.in.host Signed-off-by: Christian Stewart --- ...03-runtime-support-riscv64-SV57-mode.patch | 65 ------------------- package/go/go.hash | 2 +- package/go/go.mk | 4 +- 3 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 package/go/0003-runtime-support-riscv64-SV57-mode.patch diff --git a/package/go/0003-runtime-support-riscv64-SV57-mode.patch b/package/go/0003-runtime-support-riscv64-SV57-mode.patch deleted file mode 100644 index f51c2ca093..0000000000 --- a/package/go/0003-runtime-support-riscv64-SV57-mode.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6618c7af436488fa12018cdcd31eeedb3a698745 Mon Sep 17 00:00:00 2001 -From: Dmitry Vyukov -Date: Fri, 27 May 2022 18:55:35 +0200 -Subject: [PATCH] runtime: support riscv64 SV57 mode - -Riscv64 has SV57 mode when user-space VA is 56 bits. -Linux kernel recently got support for this mode and Go binaries started crashing as: - -runtime: lfstack.push invalid packing: node=0xffffff5908a940 cnt=0x1 -packed=0xffff5908a9400001 -> node=0xffff5908a940 - -Adjust lfstack code to use only 8 top bits of pointers on riscv64. - -For context see: -https://groups.google.com/g/syzkaller-bugs/c/lU0GQTZoNQQ/m/O_c3vmE3AAAJ - -Update #54104 - -Change-Id: Ib5d3d6a79c0c6eddf11618d73fcc8bc1832a9c25 -Signed-off-by: Christian Stewart ---- - -Upstream: https://go-review.googlesource.com/c/go/+/409055/4 ---- - src/runtime/lfstack_64bit.go | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/runtime/lfstack_64bit.go b/src/runtime/lfstack_64bit.go -index 154130cf63..39fa647b9e 100644 ---- a/src/runtime/lfstack_64bit.go -+++ b/src/runtime/lfstack_64bit.go -@@ -36,12 +36,21 @@ const ( - // We use one bit to distinguish between the two ranges. - aixAddrBits = 57 - aixCntBits = 64 - aixAddrBits + 3 -+ -+ // Riscv64 SV57 mode gives 56 bits of userspace VA. -+ // lfstack code supports it, but broader support for SV57 mode is incomplete, -+ // and there may be other issues (see #54104). -+ riscv64AddrBits = 56 -+ riscv64CntBits = 64 - riscv64AddrBits + 3 - ) - - func lfstackPack(node *lfnode, cnt uintptr) uint64 { - if GOARCH == "ppc64" && GOOS == "aix" { - return uint64(uintptr(unsafe.Pointer(node)))<<(64-aixAddrBits) | uint64(cnt&(1<> aixCntBits << 3) | 0xa<<56))) - } -+ if GOARCH == "riscv64" { -+ return (*lfnode)(unsafe.Pointer(uintptr(val >> riscv64CntBits << 3))) -+ } - return (*lfnode)(unsafe.Pointer(uintptr(val >> cntBits << 3))) - } --- -2.35.1 - diff --git a/package/go/go.hash b/package/go/go.hash index 4c22f0f274..204e508fc3 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 3a29ff0421beaf6329292b8a46311c9fbf06c800077ceddef5fb7f8d5b1ace33 go1.20.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index b0dd002712..18d3a80212 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.5 +GO_VERSION = 1.20 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -151,7 +151,7 @@ define HOST_GO_INSTALL_CMDS cp -a $(@D)/lib $(HOST_GO_ROOT)/ mkdir -p $(HOST_GO_ROOT)/pkg - cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ + cp -a $(@D)/pkg/include $(HOST_GO_ROOT)/pkg/ cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ # https://golang.org/issue/2775 -- 2.39.1 From christian at paral.in Sun Feb 12 01:54:43 2023 From: christian at paral.in (Christian Stewart) Date: Sat, 11 Feb 2023 17:54:43 -0800 Subject: [Buildroot] [PATCH 3/3] package/go: use host compiler when go-bootstrap unsupported In-Reply-To: <20230212015443.7740-1-christian@paral.in> References: <20230212015443.7740-1-christian@paral.in> Message-ID: <20230212015443.7740-3-christian@paral.in> All Go compiler versions > 1.4.x (old) are written in Go, and require a existing compiled Go version to use to build from source. https://golang.org/doc/install/source#bootstrapFromSource The process for "bootstrapping" the Go compiler in Buildroot is: 1. Compile a C/C++ cross-compiler (gcc) as the host toolchain. 2. Build go-bootstrap-stage1 (which is Go 1.4.x and written in C) 3. Build go-bootstrap-stage2 (which is Go 1.19.x and written in Go) 3. Build go 1.20 (written in Go) using go-bootstrap-stage2. go-bootstrap-stage1 does not work on 64-bit arm. The Go 1.4.x bootstrap compiler is compatible with x86, x86_64, and arm (32 bit) only. This patch adds a fallback to require a host Go compiler to build host-go when BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS is not set. Signed-off-by: Christian Stewart --- changes prior to inclusion in this series: - thanks Thomas for the review & suggestions - added NEEDS_HOST_GO boolean - added dependency checks to support/dependencies/dependencies.sh - removed unnecessary changes to go-bootstrap package - add dependency on toolchain if Cgo is enabled - updates for go1.20 - updates for go-bootstrap-stage{1,2} changes from v1 -> v2: - remove whitespace fix in bootstrap stage2 Signed-off-by: Christian Stewart --- Config.in | 4 ++++ package/go/Config.in.host | 2 +- package/go/go.mk | 14 ++++++++++++-- support/dependencies/dependencies.sh | 4 ++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Config.in b/Config.in index 0d7641633c..c70ce94d94 100644 --- a/Config.in +++ b/Config.in @@ -58,6 +58,10 @@ config BR2_HOST_GCC_AT_LEAST_9 # When adding new entries above, be sure to update # the HOSTCC_MAX_VERSION variable in the Makefile. +# Hidden boolean selected if bootstrapping Go w/ GCC is not supported. +config BR2_NEEDS_HOST_GO + bool + # Hidden boolean selected by packages in need of Java in order to build # (example: kodi) config BR2_NEEDS_HOST_JAVA diff --git a/package/go/Config.in.host b/package/go/Config.in.host index b87b862cec..7f049ff1ae 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -30,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + select BR2_NEEDS_HOST_GO if !BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go/go.mk b/package/go/go.mk index 18d3a80212..9dcc9321f9 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -12,7 +12,6 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -109,6 +108,11 @@ else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS HOST_GO_CGO_ENABLED = 1 endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +ifeq ($(HOST_GO_CGO_ENABLED),1) +# For cgo support the toolchain needs to be available. +HOST_GO_DEPENDENCIES += toolchain +endif + # For the convenience of host golang packages HOST_GO_HOST_ENV = \ $(HOST_GO_COMMON_ENV) \ @@ -126,7 +130,6 @@ HOST_GO_HOST_ENV = \ HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -136,6 +139,13 @@ HOST_GO_MAKE_ENV = \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ $(HOST_GO_CROSS_ENV) +# Use the Go compiler bootstrapped by Buildroot if available. +# Otherwise, use the host Go compiler. +ifeq ($(BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS),y) +HOST_GO_DEPENDENCIES += host-go-bootstrap-stage2 +HOST_GO_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) +endif + define HOST_GO_BUILD_CMDS cd $(@D)/src && \ $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index cf6635bff6..e2a8db5d9d 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -217,6 +217,10 @@ if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then fi fi +if grep -q ^BR2_NEEDS_HOST_GO=y $BR2_CONFIG ; then + check_prog_host "go" +fi + if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then check_prog_host "java" JAVA_GCJ=$(java -version 2>&1 | grep gcj) -- 2.39.1 From thomas.petazzoni at bootlin.com Sun Feb 12 06:44:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 12 Feb 2023 06:44:48 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-11 Message-ID: <20230212064454.C0648409B2@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-11 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 0 | 1 | 0 | 1 | 2022.11.x | 16 | 23 | 0 | 39 | master | 160 | 217 | 3 | 380 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 18 gobject-introspection-1.72.0 | 17 aubio-0.4.9 | 11 host-pahole-1.24 | 7 host-rust-1.67.0 | 7 host-binutils-2.38 | 6 python-numpy-1.23.5 | 6 unknown | 6 glibc-2.36-81-g4f4d7a13edfd... | 5 linux-6.1.9 | 5 gerbera-1.10.0 | 4 libsolv-0.7.22 | 4 elfutils-0.186 | 3 fluent-bit-2.0.8 | 3 fontconfig-2.13.1 | 3 gobject-introspection | 3 host-binutils-2.37 | 3 host-go-1.19.5 | 3 libglib2-2.72.3 | 3 libgpg-error-1.46 | 3 optee-client-3.19.0 | 3 package/postgresql/postgres... | 3 boost-1.80.0 | 2 dust-0.8.1 | 2 efivar-38 | 2 host-sentry-cli-2.8.0 | 2 janet-1.26.0 | 2 kvmtool-f77d646ba01d04be5aa... | 2 libgcrypt-1.10.1 | 2 linux-5.10.162-cip24-rt10 | 2 lirc-tools-0.10.2 | 2 ocf-linux-20171122 | 2 openblas-0.3.21 | 2 opencv3-3.4.17 | 2 php-8.2.1 | 2 php-xdebug-3.0.4 | 2 python-cryptography-39.0.0 | 2 systemd-252.4 | 2 toolchain-external-codescap... | 2 uqmi-0a19b5b77140465c29e2af... | 2 4th-3.64.1 | 1 acpica-20220331 | 1 bird-2.0.11 | 1 brltty-6.5 | 1 busybox-1.36.0 | 1 cni-plugins-1.2.0 | 1 cppcms-2.0.0-beta2 | 1 dc3dd-7.2.641 | 1 flatbuffers-2.0.8 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/romfs/romfs.mk:32: /home... | 1 fs/tar/tar.mk:38: /home/bui... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fwts-22.09.00 | 1 gmp-6.2.1 | 1 host-binutils-2.39 | 1 host-gcc-final-11.3.0 | 1 host-gdb-arc-2020.09-releas... | 1 host-libarchive-3.6.2 | 1 igh-ethercat-2e2cef61318953... | 1 jack2-1.9.21 | 1 kexec-2.0.25 | 1 libabseil-cpp-20220623.1 | 1 libcamera-apps-1.1.1 | 1 libcap-ng-0.8.3 | 1 libdrm-2.4.114 | 1 libmad-0.15.1b | 1 libnss-3.87 | 1 libsodium-1.0.18 | 1 libvorbis-1.3.7 | 1 linux-5.10.162-cip24 | 1 ltp-testsuite-20220930 | 1 mutt-2.2.9 | 1 netsniff-ng-0.6.8 | 1 netsurf-3.10 | 1 ntp-4.2.8p15 | 1 olsr-0.9.8 | 1 open-iscsi-2.1.8 | 1 openssh-9.1p1 | 1 pcre2-10.42 | 1 perl-5.36.0 | 1 postgresql-legal-info | 1 python-bcrypt-4.0.1 | 1 python-pyicu-2.10.2 | 1 python-pymupdf-1.21.1 | 1 quickjs-2021-03-27 | 1 reaver-1.6.6 | 1 tcf-agent-1.7.0 | 1 tinifier-3.4.0 | 1 tmux-3.3a | 1 traceroute-2.1.0 | 1 valgrind-3.19.0 | 1 xfsprogs-5.14.2 | 1 xlib_libX11-1.8.3 | 1 zabbix-5.4.9 | 1 znc-1.8.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64_be | 4th-3.64.1 | NOK | http://autobuild.buildroot.net/results/f71660c4d4b476ca0c975774b93d25277bd35368 | powerpc64le | acpica-20220331 | NOK | http://autobuild.buildroot.net/results/1496694423b1e08516a0b38dd3945913c10e912b | powerpc64 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/bdf85a975bd5fec92af13fc86aacd1138622ab38 | nios2 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/c6e3393e21de8d94709dc3bee57ffc4315ee4bc2 | i686 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/82ab6b1143f29218189c94b6b9c9bfc0c87d0802 | or1k | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/f2eb9c0291d6dbe48dbfb1bb7548626cc70c8c1f | i686 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/4079951c7c4db612be7c49abb0ed5411a521cce2 | arm | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/5543b848d3d46d69a293e13fdb7ee5aefcde8c9a | sparc | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/230bbd7ed9307751ae2bcb918136eefe57068faf | mips64 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/b6fd3a866af182edc7831492aecc8323f377b826 | arceb | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/26d5083aa5eac332d2db2d03db622f88662e2b2e | or1k | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/fa2ec92405422306b5b070aa8b68ae4ca6f33f1e | nios2 | aubio-0.4.9 | NOK | http://autobuild.buildroot.net/results/6dc2532b798b0c987c19f45be2af0bd55528fd58 | mips64 | bird-2.0.11 | NOK | http://autobuild.buildroot.net/results/fc2f4cb2d09ffb62c92bee1fc588d89fcb7f40a3 | arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/a0266bfbb6e93fac8c59d8c446caad3be51f12c8 | arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/bba03eeff7e2c799543226facb5896d7b87e906c | or1k | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/885b06eaebab89d8c2d488edce5e156875b99e44 | mipsel | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/9b2befe5e5027001b7cbf353dc23b4787720ec33 | ORPH aarch64 | cni-plugins-1.2.0 | NOK | http://autobuild.buildroot.net/results/527a24bdb5eafdf0ae525fb97e46a86076519c11 | nios2 | cppcms-2.0.0-beta2 | NOK | http://autobuild.buildroot.net/results/4a3e6d5eb23a09dfd05735e8982f0b23158759de | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/a29c2c2aa2febd514497b5553157a32537efbade | ORPH x86_64 | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/24289179e5762e0095505444dbc91fc9c97e4512 | ORPH powerpc64le | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/73ba565cb1e5759b7984c378593e46914a7861dd | ORPH x86_64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/2fcdb963a8d33de358144765b59834d2c86db8c1 | i586 | efivar-38 | NOK | http://autobuild.buildroot.net/results/a7671b86e86aefab6b9d6dee4473f923187d9df6 | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/5d30e4a86d3e7adf02a2e02ccc16bbb740991a69 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/afe61caf6bb31f0cfbb14462e06e70348b976c87 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/1da0dd143a4cb5f0032b9195c2908fd713361363 | ORPH m68k | flatbuffers-2.0.8 | NOK | http://autobuild.buildroot.net/results/ee81e3276a56d784c61e8cdbed21e71264995822 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/156b9657bcbdd8643775152ddd86f438361bcc1d | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/854d6217b942c35e11444adf934abf064b916ab6 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/b82a49955a00854816d6c654d61268f4f2b49535 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/034587fcd69e93b43539e404471ae762b47429c0 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/d088fe4fe557ac5494f3bc0b1d4a7ebfd871da60 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/4354008d7227fd6b40b9453e9716b432b078976c | ORPH sh4eb | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/ae7dd6fbb27ceea2aeb960a344885a959058b187 | mips64 | fs/romfs/romfs.mk:32: /home... | NOK | http://autobuild.buildroot.net/results/9409efeecdc5f4b6da58125b46117603612ad98a | x86_64 | fs/tar/tar.mk:38: /home/bui... | NOK | http://autobuild.buildroot.net/results/d5732622c096304755c0172b19ea91485a37a3e7 | sparc | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/01ba26516d4698209fd33001612f142f266292fd | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/776c9bef9a6847c17e327329bfb6a3d43c48f18d | powerpc64le | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/0fb4af5ba536e323536a2922459bfcd4a2bc2bbe | x86_64 | fwts-22.09.00 | NOK | http://autobuild.buildroot.net/results/755c8bf7b13991e78aeed8a973097cc18beec557 | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/a4446448e28d7a5cddeb0efcaca8d5d8613b1318 | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/8256016913018f2ffd555123460a2c6f74972b02 | mips | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/11d7840a1d4ac5d61c8274d41dac7fc761151aba | xtensa | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/ed854fad051d44651777ab316f1e2fa1387b54ff | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/a961b6655fc2f35e381024d90f76e6545456d059 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/7b725674e55cf42c3a2b69a9ccf0298865707b90 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/89d849ddbe667dac0755478487bdada850c62e7d | powerpc64le | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/86931d5d14a01ce682fcd6cb7fc5125bed128e45 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/bb826a87a14760db31865215b60c7f971c5a7f7d | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/2caac63e5f3b8e3b3e220e55bf856bb9ce0340a4 | ORPH nios2 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/4275c68ff5210666c423999a3dd01b7bb9880ff5 | powerpc | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ffa74afd2f2c91ea0a0f9ac74dcef22fcf70e589 | powerpc64le | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/2fe472cb5872b2f4b2bb3a97ae7c75ba8d0afeed | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/b210b40547cc433f74c1691257854e5b9a387099 | powerpc64le | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/636604f8c44bfe83a9640285188e14b256a82742 | mips64el | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/7cb4b3b2f74aaa0f1a4bd7c120ce6fdb30d873d0 | armeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/33496d4995870dd78ce98956349068456898133c | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ff44238599fcaf4f3e4e478e99502072d049f6a6 | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/18afdf2d5c3a17017d7b1a07ff89ec5c023bc65f | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/00a54d9b68040a037049f3c005269e60b4ccab8a | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/4612c8595a5f272d58e7a5b110e8a954550f1f84 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/99dd8445fe43d4a8cb8e82e8b0de8bfeb397b64b | arm | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/47d3ecdde07c7d8c1a38b32e0981332cda15bf56 | riscv32 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6e06939f297f066e2c74d9039b9ff5b582335436 | sh4eb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/29cc2e4b3928af437b758025faa074389e839cd2 | aarch64_be | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/05cae498cb3011e7694bd82e083ed70e83183f0c | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6d88cc2ab92decec032556169e9acff0bf1c6e96 | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/bf437bdce6a47e1058808dd02a0b660c3c33d85a | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/192b2bfaa738ba565c9e28aa79d5b2c9b02da388 | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/ab1ad553aaf0ab9781e125b2a62e80ff656d333c | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/f8a4a22f5647a3b7fd6891f9abec16a16891d16e | or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d717262af52fc79e277d2f6dca3973d4ed9ba3bd | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/dcd3ad1f6df0c95e6a936af4e761b9161a2e3816 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/877ab3fc6a14f9576075194cf340d514fd39fe83 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/48778423d1c0e3e1624f63be976afa6eb70711bc | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2c1ddff75ea4e88b3da84d43909f32184ea886e2 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/81dd2f05a093c8bb6b24206eb0e4288da6e22651 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/eda9bd5f58ecb009ad9209cf827aad6385fc43a1 | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2201c28adb25111bce94ffc33662b49419add7ac | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/b6dd766c2be2e4ecc7d76e917ba413dcb5b6548f | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7026ece6f930bc587f6b4f8118bbec63db4992b9 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/aa5e416dc4d30726a3ef058d18dcd54d8e2571b3 | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3107ccb171aab23ca9d7f0442644ba23579cbfbc | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1b5adfbcddd10300819ba221bc2d6370b9055331 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5e9347c839a0755fb805515a07acd718a8d8482d | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8f075e3c22114615c052430330752db5549d1d0f | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/9880eb9ec39bfdaebbfd0519034d00ead731ba93 | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3980db5e84a5b52f942555620c8f5d7d360e062f | ORPH arm | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/13a71aae02df0440c43e7a9e75efd97c9c8d5866 | riscv64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/9223f78a302a3440985971798d75423b027a2ad5 | i686 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/1a93a2c0f085555bb942911b9f3b90bea08b9e8d | arm | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/919b37bf9386b01fb15be2c8cd5bb281ff00c0b7 | xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1eb4d22cfa973f635199c7249ce2fa5843cdb797 | powerpc64le | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/90922e7f058b26b13e423bd9a00d04eafb15058d | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2a89ab4e2e87f482527d8367e4d363f61ffa834a | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/f21e44ebbeefc7ee0dbec99f58f26810f4ebf210 | sparc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/bc211ed12ae20117ff601fb98fb1f359a2268e73 | powerpc64le | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/12fa4d01a2e6aae462cee6cc93311939c98e1ded | microblaze | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/45146f5bff2286c217d535a0b33980f469a58b75 | arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/290f1d7fa9720667a6c343ea57b31676871cd2c3 | ORPH mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/97b2dcb83f94798ffc2285578c753c8e21ac1bf0 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/cacc9a34920d38d04cb74a04d4ce82fbd08a630a | powerpc64le | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f1d83355bb2209fb274525d3d06f5176f0f9bc70 | mips64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/4728610cb558580614bf5650d3e4fe0d93b60604 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/fa82973d30bd569c6fe58ed57c21d51f9cccd3c8 | s390x | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/b51240b397d33266cef85f978fa5819f11d0070c | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/df0f208fe74fc6d773dc3a5ceebedcdaa5171276 | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/29fdcc8b0a5eecd151e01077d707c13573c771b7 | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/34d922d3b66181e66df1fcea4c4cb15f21f8249e | arceb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c43a15c7a596b454b67716fbe85b4a11652994f0 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2e09d98986abea8728f6dbb54fc2299d2ccbf005 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/72c09448955eef0fdb08f66e7fdd5410855177d5 | armeb | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/0125912d7df0ac6589b298a612f9229332ec1053 | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/92df72cbdbaa957e353204fc93a724b581a720de | armeb | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/614dbdcb98b8da048603b4dc08001c5e698d8c73 | sparc64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/14f876e08b428440be7ce12e8f888a38270a1cb7 | mipsel | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/5668cd1a6256bbc5fc8aa5ea59ed0232a13bd9ab | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/0c69b047e9079741fc8d1d64863bca250d81166f | arceb | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/c9da62eaca2fd5924a67f49e80f99511db9ccef9 | mips64 | host-sentry-cli-2.8.0 | NOK | http://autobuild.buildroot.net/results/470b7e8780183fedba0a8c6033f91e47cd6eea98 | x86_64 | igh-ethercat-2e2cef61318953... | NOK | http://autobuild.buildroot.net/results/a2761f3022c32a6d6a0de3004a29f60bd954cd8a | m68k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/f7e0a450c9b8fb854741132f17a8f12ef7116a29 | aarch64 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/cc175b9d62e0b500b61e7086ac5cff016750e7cb | riscv64 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/543cebf0e7c57746621c6e4161b39a1d479aede1 | arm | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/13c878a41db3ad96233ac3abdbbc917d7600c4db | ORPH i686 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/5fcc48b7e930d9a9f6567240035bb5e33a7b17ed | i686 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/a40c812a8542023f983d72e7822abba291bffdf6 | mips64el | libabseil-cpp-20220623.1 | NOK | http://autobuild.buildroot.net/results/5a8c68191eaedbc7d925c5e66ccaac89412ca0db | arc | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/779f61f032e36fb93bd57dfd5278f8d9970efd31 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/46fc2f7ea1a75ecf7a87eae652cb86c668f84f8f | arm | libdrm-2.4.114 | NOK | http://autobuild.buildroot.net/results/a7b7b140baa269ffafeeaa806f4a3b9520837bf7 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/cc0120608276ac96183ac0fb74a5e7a07ac6143e | ORPH armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/ecd8427b5e2221d2aa985fc4719f2e79f80cddbc | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/023eb79f98856c1ffda364abfab176dc8c08aa5e | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/3177508b94377fd630b9571ff06d89423d73ff9d | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/5a577e6f88d765b9265097ae24c8c45597e4562d | aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/1a335a4dbcfc1f9b53586e15fbe0ae9f5e65a478 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/f5ce6b952fc1e883e66e14c18e3c33607930077d | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/7cbaafc37c631ceee5a7641dd0cc71f6cec8367b | ORPH armeb | libmad-0.15.1b | NOK | http://autobuild.buildroot.net/results/9cd33e547cf10ed01445be3bf2570b039c234c65 | ORPH or1k | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/ecd18a499b065df32de7f77ae6d59bab59b58545 | arceb | libsodium-1.0.18 | NOK | http://autobuild.buildroot.net/results/84a64b76a8ab22c15744bc53c9a192fd5e96f3d9 | microblazeel | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/545e2c31b184219f31853ba9a5917cf09d0adf01 | arm | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/fb0d0b0053a84ae623d19301af1b79c6f1491497 | sh4eb | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/d2fd543e869e106991149a0428341225512f1fa8 | s390x | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/bd897ec8904d99e2ad00169d3a5bc2d60a7a5491 | powerpc | libvorbis-1.3.7 | NOK | http://autobuild.buildroot.net/results/f8c17715deafa66a3a1b618b6e84fc1a855c403e | powerpc64le | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/954056512e8520796c34da817d83de1223751637 | ORPH powerpc64le | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/4ea8906998142a5699aac16991223402741cca8d | ORPH mips64 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/7bebee92854654e003d7744c5c67d9008854a91e | ORPH mips64el | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/b0d0346959823ea25cffddaff0dd60fc3a1e77d2 | ORPH powerpc64le | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/15c2a713c64069a7209d5502455c2ae25ca364d7 | ORPH nios2 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/a3019e18bbae0ab29175cf563cdb2625bb448103 | ORPH s390x | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/f02ba9479d1f7a5a8750b04546c4de7c247781c1 | ORPH arm | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/1b976f01d2265a7cc7de2f5154a7a33fe5a68337 | ORPH mips64el | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/d1052215f52a86766ffbd5788fc74c3f5a35e5f7 | ORPH powerpc | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/85e24e24d4cab0f9c3eec86ea4d49b7daa19f924 | ORPH powerpc64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/ea7772d79cead8db50f69b3ed7c2172a0d23c1b1 | powerpc64 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/e9df082789138491b54c5ddbf0c90d1d1cf81f45 | sparc64 | netsniff-ng-0.6.8 | NOK | http://autobuild.buildroot.net/results/8ca4747980c947a9e65517724b9812a04eac5b81 | arm | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/0e53794f0b641a98089cde954dbd1c737481fc4d | riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/45a327dbfef5e1d29dfdbf86ebcc891ab785a908 | ORPH sparc64 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/4bd97c2615e8986b8fb4b9ae96b17c3abb0ed392 | ORPH nios2 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/e182a116ff7d1b4a1bcdfc200869f49433e92ef7 | ORPH x86_64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/96dd3343a69089c4839a630a1bae622293bda0f4 | ORPH nios2 | open-iscsi-2.1.8 | NOK | http://autobuild.buildroot.net/results/f8e398219ca1255cf1c4e332c6655c09d7cb44d4 | i686 | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/4089a78fe14d77775addaa608e001f5d5c836f9f | ORPH mips64el | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/04fac9beba7aeed52a29565388b3a841a7e00f07 | ORPH mipsel | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/f057d8947a7d1e2364fc501a416774cb5d058073 | or1k | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/6df56ed45c247cd825eee2413d118c2c393d3a92 | m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/b9f5372dfc90f62b6c2819c9d1fadd142c3477c8 | ORPH aarch64_be | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/d90461b7d0cefdc3fc6d887732b4a7ebf49143bd | m68k | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/e1c6b5c9e841a003037045b2ff7afd9836e7c640 | mips64 | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/4f63f841ea5f70ac3dbedb7ded2764be01302082 | microblazeel | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/9bb387de5592c007f70c61702d8aaee4927a7494 | mips64el | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/c2f5101c8b6ee22bddf7523c3dc9f281a9ce5fc9 | microblaze | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/ff43dbc86b2251b56c9a4b601386fca32aaba836 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/454ff2f2653d7a422e7d0be779bcd8194718a421 | ORPH mipsel | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/630cf4f5d3309bf602eb1b84be4466c24308484b | microblaze | php-8.2.1 | NOK | http://autobuild.buildroot.net/results/727fda6192a991f3d13bcefdb52b820a2b577996 | microblazeel | php-8.2.1 | NOK | http://autobuild.buildroot.net/results/b7046244c32a6668e7db1707814606b23f5794be | s390x | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/3a0027566058c116dbbda73b4e8e22f884a35c43 | aarch64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/82aaa741020b6351134707c040dd52fe53c961a0 | arc | postgresql-legal-info | NOK | http://autobuild.buildroot.net/results/4cf0ace588acfaa95f852254a00258dd1a1e6440 | i586 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/46015ea4894088cabefcb8123cb454680d0a20e6 | powerpc64le | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/5fd6613b2431977581f8d72236c57814dd58f776 | aarch64 | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/43c236c2e9afe397a35f2b2e8f77a2eb57cdb2ff | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/23f716d5da90370e030863a992be53a0c6ee4279 | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/7975455b922d2f74aece0014a560eea28c88d905 | arm | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/0cab762be7c0790600772cde2455895feae9d830 | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/13c5105201cb38fa43401edb21c9ab6592eedc50 | sh4eb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/968a69a9c9ea5ab20b78e406be91df0debce3614 | sh4 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/ced0f118567a1e4b960d27c3e9af5bf44cd2d0cb | microblaze | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/88e01ff306c50cc1167c34d4f41e2f977a57ac0e | mips64 | python-pymupdf-1.21.1 | NOK | http://autobuild.buildroot.net/results/28c63f1deec36cbe0568e7f64a198918d8fcc0eb | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/cacc80d52075fbc7713e2ee2a235d2c40c7ca576 | arc | reaver-1.6.6 | NOK | http://autobuild.buildroot.net/results/a1ce811a772350b06431a0db5cac148bae68e533 | mipsel | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/1f04b0be29a694661c8879e404f4a720c19fe3ab | mips | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/0326973e09acd00e261f7d039f3063f9a038aa0c | microblaze | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/b6caf0818d47c91a29c3092092da3f9c1fe59cb2 | x86_64 | tinifier-3.4.0 | NOK | http://autobuild.buildroot.net/results/d6799f39bf91540436a706ff9c12d5ffd6f83114 | powerpc64 | tmux-3.3a | NOK | http://autobuild.buildroot.net/results/cba06f3bb6d9be25e91f56c390a70ddf9904832e | mipsel | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/15257dba2b191ee50dd7efc96ef345b32d826f95 | ORPH mips | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/8320dfaa6e0668d46404cf15c25fe985485cbb1b | ORPH mipsel | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/5e2c8783b9b187b76511581e41a40647af17045c | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/1efc7254fd8cb3f5108a16d0734419f826a41a2c | m68k | unknown | NOK | http://autobuild.buildroot.net/results/ee9cbfe261eb19e9dc97fb1e41d355b6f14e1483 | sparc | unknown | NOK | http://autobuild.buildroot.net/results/78b2ce901b150c648c6062b0966001c70cc797c9 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/21a518dbfd9cca7964bf174596d4831ace422673 | arc | unknown | NOK | http://autobuild.buildroot.net/results/94d1789cde17860a445d5439de53597cc8814bf6 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/2b8e1fdddac0ff8aafb5cf34e76f7ff7833a12b5 | x86_64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/a456f6eb27b910bbd898c2e79c5a21e8d53f72f8 | ORPH s390x | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/69f008db57e7e40a40e61b7a1fd51f89191fcfbb | ORPH mips | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/0faa6029f3489062b131e2e5b880d1497c592e5e | ORPH aarch64_be | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/aaeaf02c0d0ed00c7874c6826f4d52891f2d7e9c | ORPH arm | xlib_libX11-1.8.3 | NOK | http://autobuild.buildroot.net/results/c67086973444535202e7de22f09223a940bc077d | nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/60b26d90a2cc689858d2bcfcc5740003e3d7fe4d | powerpc64le | znc-1.8.2 | NOK | http://autobuild.buildroot.net/results/08a253d46cffed50ad5618c3302657670c75de79 | Classification of failures by reason for 2022.02.x -------------------------------------------------- igd2-for-linux-2.1 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | igd2-for-linux-2.1 | NOK | http://autobuild.buildroot.net/results/7bc4aa0350c208443e1c3bc90ae0fe632e306a15 | Classification of failures by reason for 2022.11.x -------------------------------------------------- python-numpy-1.23.4 | 2 xz-5.2.7 | 2 batman-adv-2022.2 | 1 frr-8.3.1 | 1 fs/romfs/romfs.mk:32: /home... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 gdb-12.1 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 heirloom-mailx-12.5 | 1 host-binutils-2.37 | 1 host-binutils-2.38 | 1 host-go-1.19.5 | 1 host-rust-1.64.0 | 1 kmod-30 | 1 libglib2-2.72.3 | 1 musl-1.2.3 | 1 php-8.1.14 | 1 proftpd-1.3.8 | 1 unknown | 1 valgrind-3.19.0 | 1 zeek-4.1.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | batman-adv-2022.2 | NOK | http://autobuild.buildroot.net/results/f31e00f9d67caf78169496291bafbb3440d824cd | xtensa | frr-8.3.1 | NOK | http://autobuild.buildroot.net/results/0f53ca6c1c76a875f884eefa1bfceb306bc7e908 | mips64el | fs/romfs/romfs.mk:32: /home... | NOK | http://autobuild.buildroot.net/results/59d9d6590460d3f10ed18486bd2a91b6eb4292a1 | powerpc64 | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/0c46bace1c20c6d8a0c73d0a4bd3742a3c28e971 | or1k | gdb-12.1 | NOK | http://autobuild.buildroot.net/results/4bce8066baf2c788a2b1558fe72b59b8e45bc6fb | ORPH powerpc64le | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/26b84f6cdd4472f57259d89098bfa417dfe1b464 | sh4eb | heirloom-mailx-12.5 | NOK | http://autobuild.buildroot.net/results/a5263fcd2967c89ba511ab56635f6c6c9e25b63c | riscv32 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/6f23be3eeaa1fe97373d6234eccf8f757504f889 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/d1cadb0b5e3bf74ce383852f52bf836bf07e6a3e | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/38d27136d8a7ee06c5a51dc0de5ff3f6e934343e | mips | host-rust-1.64.0 | NOK | http://autobuild.buildroot.net/results/7ddbf5f3e4b716daac8547c818ba2e43cb1e8a59 | xtensa | kmod-30 | NOK | http://autobuild.buildroot.net/results/f1f87ddc9437f8c859b32f3f074d5ef0fd3d6f54 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/7f5f32e70b347bfececb3f11752aec31951af7a3 | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/48f1b33b3cd03d827f89d2e0c199c9e82ad32e8f | or1k | php-8.1.14 | NOK | http://autobuild.buildroot.net/results/ca4efdb5c7cee172debee50c103176c0b4a5e583 | sh4aeb | proftpd-1.3.8 | NOK | http://autobuild.buildroot.net/results/69029e7f421b99aafb4db90df9893e5280fbdde2 | aarch64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/3cd0eb1b4a15f3b11902f323cc3b28da83875906 | sh4aeb | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/9d5072983dc6c71de8430af27d832b75d0552c3f | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/48b2b87b02ef2163b07c84977c7922d60330443d | mips64 | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/4f7b9aa4247750e058d461562d8f6e0cbd22f942 | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/6d172a2890c20f0db44204ca671153f695f10694 | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/5c1d483bcfc6de10d720b51eaa4dfc2ad8ecb9eb | ORPH sparc | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/a48722a7a3b0435480d34f3a073460284cea94d4 | -- http://autobuild.buildroot.net From peter at korsgaard.com Sun Feb 12 08:29:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:29:27 +0100 Subject: [Buildroot] [PATCH] support/dependencies/dependencies.sh: require diagnostics perl package for mosh In-Reply-To: <20230210150456.4535-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 10 Feb 2023 16:04:56 +0100") References: <20230210150456.4535-1-peter@korsgaard.com> Message-ID: <875yc7cmmw.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ > scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: > make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' > perl -Mdiagnostics -c ./mosh.pl > Can't locate diagnostics.pm in @INC (you may need to install the > diagnostics module) (@INC contains: > /home/buildroot/autobuild/instance-2/output-1/host/lib/perl > /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 > /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl > /usr/lib64/perl5 /usr/share/perl5). > BEGIN failed--compilation aborted. > So add a check for it in dependencies.sh similar to the other perl modules. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 12 08:29:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:29:45 +0100 Subject: [Buildroot] [PATCH] package/re2: bump to version 2023-02-01 In-Reply-To: <20230209205309.2464796-1-buildroot@heine.tech> (Michael Nosthoff via buildroot's message of "Thu, 9 Feb 2023 21:53:01 +0100") References: <20230209205309.2464796-1-buildroot@heine.tech> Message-ID: <871qmvcmme.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Nosthoff via buildroot writes: > Signed-off-by: Michael Nosthoff Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 12 08:39:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:39:57 +0100 Subject: [Buildroot] [PATCH 1/2] support/download: catch post-process errors In-Reply-To: <20230210223143.1060114-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Fri, 10 Feb 2023 23:31:42 +0100") References: <20230210223143.1060114-1-yann.morin.1998@free.fr> Message-ID: <87wn4nb7ky.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Currently, when the post-process helper fails while downloading from > upstream, there is no fallback to the backup mirror. > In case the post-process helper fails, we mut consider that to be a > download failure, so we must bail out as if the download backend itself > did fail, but we fail to do so. > Duplicate the logic we have for the download helper: if the post-process > helper fails, remove the downloaded stuff, and continue on to the next > URI, which will ultimately hit the backup mirror (if one has been > configured). > Reported-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni Committed after adding a fixes: http://autobuild.buildroot.net/results/12a/12a63ae177fe3ed0c9a1ef2fa01870f334f36b0f/, thanks! > --- > support/download/dl-wrapper | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper > index 09a6ac1f1a..1e8d6058f6 100755 > --- a/support/download/dl-wrapper > +++ b/support/download/dl-wrapper > @@ -138,9 +138,15 @@ main() { > fi > if [ -n "${post_process}" ] ; then > - "${OLDPWD}/support/download/${post_process}-post-process" \ > - -o "${tmpf}" \ > - -n "${raw_base_name}" > + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ > + -o "${tmpf}" \ > + -n "${raw_base_name}" > + then > + # cd back to keep path coherence > + cd "${OLDPWD}" > + rm -rf "${tmpd}" > + continue > + fi > fi > # cd back to free the temp-dir, so we can remove it later > -- > 2.25.1 -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 12 08:45:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:45:04 +0100 Subject: [Buildroot] [PATCH 2/2] support/download: fix the cargo post-process in face of failed vendoring In-Reply-To: <20230210223143.1060114-2-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Fri, 10 Feb 2023 23:31:43 +0100") References: <20230210223143.1060114-1-yann.morin.1998@free.fr> <20230210223143.1060114-2-yann.morin.1998@free.fr> Message-ID: <87sffbb7cf.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > In commit 04154a651729 (support/download/cargo-post-process: cargo > output for vendor config), we switched away from our hand-crafted > cargo.toml mangling, to use cargo itself to update that file. > In doing so, we enabled the shell pipefail option, so that we could > catch cargo failures, while redirecting its output through tee to the > cargo.toml. > However, pipefail is overzealous, and will hit us even for pipes we do > not want to globally fail, like the one that actually checks whether an > archive is already vendored or not: > if tar tf "${output}" | grep -q "^[^/]*/VENDOR" ; then > ... > with pipefail, the above may always fail: > - if the tarball is already vendored, grep will exit on the first > match because of -q (it only needs a single match to decide that its > return code will be zero), so the | will get closed, and tar may > get -EPIPE before it had a chance to finish listing the archive, and > thus would terminate in error; > - if the tarball is not vendored, grep will exit in error. > It turns out that the tee was only added so that we could see the > messages emitted by cargo, and still fill the cargo.tom with the output > of cargo. > But that's a bit overkill: the cargo messages are going to stderr, and > the blurb to add to cargo.toml to stdout, so we just need to redirect > stdout. > Yes, we do not see what cargo added to cargo.toml, but that is not so > interesting. > Still, cargo ends its messages with a suggestion for the user to modify > cargo.toml, with: > To use vendored sources, add this to your .cargo/config.toml for this project: > But since we've already redirected that to cargo.toml, there is nothing > for the user to edit, so the above can get confusing. Emit a little > blurb that states that everything is under control. > And then we can drop pipefail. > Note: the go-post-process initially had pipefail too, but it was dropped > in bfd1a31d0e59 (support/download/go-post-process: drop -o pipefail) as > it was causing spurrious breakage when extracting the archive before > vendoring, so it is only reasonable that we also remove it from the > cargo-post-process. > Reported-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Simon Richter Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 12 08:28:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:28:57 +0100 Subject: [Buildroot] [git commit] package/re2: bump to version 2023-02-01 Message-ID: <20230212084528.A16BD854A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d758b054b496619999e03c60c63b6636d818f3e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 9019867db4..a39dece7a9 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 665b65b6668156db2b46dddd33405cd422bd611352c5052ab3dae6a5fbac5506 re2-2022-12-01.tar.gz +sha256 cbce8b7803e856827201a132862e41af386e7afd9cc6d9a9bc7a4fa4d8ddbdde re2-2023-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 07bb9378de..5587366b1f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2022-12-01 +RE2_VERSION = 2023-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Feb 12 08:28:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:28:45 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require diagnostics perl package for mosh Message-ID: <20230212084528.9526385659@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5be2d9bb621e3f3aa552516c8887a7821ed62788 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' perl -Mdiagnostics -c ./mosh.pl Can't locate diagnostics.pm in @INC (you may need to install the diagnostics module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5). BEGIN failed--compilation aborted. So add a check for it in dependencies.sh similar to the other perl modules. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index cf6635bff6..4353e9585e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -281,6 +281,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules diagnostics" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From peter at korsgaard.com Sun Feb 12 08:39:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:39:19 +0100 Subject: [Buildroot] [git commit] support/download: fix the cargo post-process in face of failed vendoring Message-ID: <20230212084528.BFC3D8567E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59b2e826f2a6c1874c5d032d3a5852326028bc0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In commit 04154a651729 (support/download/cargo-post-process: cargo output for vendor config), we switched away from our hand-crafted cargo.toml mangling, to use cargo itself to update that file. In doing so, we enabled the shell pipefail option, so that we could catch cargo failures, while redirecting its output through tee to the cargo.toml. However, pipefail is overzealous, and will hit us even for pipes we do not want to globally fail, like the one that actually checks whether an archive is already vendored or not: if tar tf "${output}" | grep -q "^[^/]*/VENDOR" ; then ... with pipefail, the above may always fail: - if the tarball is already vendored, grep will exit on the first match because of -q (it only needs a single match to decide that its return code will be zero), so the | will get closed, and tar may get -EPIPE before it had a chance to finish listing the archive, and thus would terminate in error; - if the tarball is not vendored, grep will exit in error. It turns out that the tee was only added so that we could see the messages emitted by cargo, and still fill the cargo.tom with the output of cargo. But that's a bit overkill: the cargo messages are going to stderr, and the blurb to add to cargo.toml to stdout, so we just need to redirect stdout. Yes, we do not see what cargo added to cargo.toml, but that is not so interesting. Still, cargo ends its messages with a suggestion for the user to modify cargo.toml, with: To use vendored sources, add this to your .cargo/config.toml for this project: But since we've already redirected that to cargo.toml, there is nothing for the user to edit, so the above can get confusing. Emit a little blurb that states that everything is under control. And then we can drop pipefail. Note: the go-post-process initially had pipefail too, but it was dropped in bfd1a31d0e59 (support/download/go-post-process: drop -o pipefail) as it was causing spurious breakage when extracting the archive before vendoring, so it is only reasonable that we also remove it from the cargo-post-process. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Simon Richter Signed-off-by: Peter Korsgaard --- support/download/cargo-post-process | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index aea2d8da7a..3f4666c006 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -e -set -o pipefail . "${0%/*}/helpers" @@ -31,7 +30,13 @@ flock "${CARGO_HOME}"/.br-lock \ cargo vendor \ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ --locked VENDOR \ - | tee .cargo/config + > .cargo/config + +# "cargo vendor' outputs on stderr a message directing to add some data +# to the project's .cargo/config.toml, data that it outputs on stdout. +# Since we redirect stdout to .cargo/config.toml, the message on stderr +# gets confusing, so instruct the user that it's been handled. +printf '(note: .cargo/config.toml automatically updated by Buildroot)\n\n' popd > /dev/null From peter at korsgaard.com Sun Feb 12 08:38:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:38:54 +0100 Subject: [Buildroot] [git commit] support/download: catch post-process errors Message-ID: <20230212084528.AF1FC85670@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a39116b5dba6cf0695620e2ba5302f21fa80a4a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/12a/12a63ae177fe3ed0c9a1ef2fa01870f334f36b0f/ Currently, when the post-process helper fails while downloading from upstream, there is no fallback to the backup mirror. In case the post-process helper fails, we must consider that to be a download failure, so we must bail out as if the download backend itself did fail, but we fail to do so. Duplicate the logic we have for the download helper: if the post-process helper fails, remove the downloaded stuff, and continue on to the next URI, which will ultimately hit the backup mirror (if one has been configured). Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/download/dl-wrapper | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 09a6ac1f1a..1e8d6058f6 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -138,9 +138,15 @@ main() { fi if [ -n "${post_process}" ] ; then - "${OLDPWD}/support/download/${post_process}-post-process" \ - -o "${tmpf}" \ - -n "${raw_base_name}" + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + then + # cd back to keep path coherence + cd "${OLDPWD}" + rm -rf "${tmpd}" + continue + fi fi # cd back to free the temp-dir, so we can remove it later From Dirk.DeBecker at ebo-enterprises.com Sun Feb 12 08:51:17 2023 From: Dirk.DeBecker at ebo-enterprises.com (Dirk De Becker) Date: Sun, 12 Feb 2023 08:51:17 +0000 Subject: [Buildroot] Dependency problem for gtkmm3 In-Reply-To: <20230210231454.4f3aedbd@windsurf> References: <20230210231454.4f3aedbd@windsurf> Message-ID: Hi Thomas, Thank you for your quick reply. Will this issue be fixed in the 2023.02 release? Kind regards, Dirk Verzonden vanaf Outlook voor Android Met vriendelijke groeten, Cordialement, Kind Regards, [https://www.ebo-enterprises.com/static/emailsignatures/img/ebo_logo-transparant.png] Dirk De Becker Squad Leader e-Vision Embedded dirk.debecker at ebo-enterprises.com +32 498 51 19 86 . +32 57 23 02 70 . [https://www.ebo-enterprises.com/static/emailsignatures/img/microsoft_teams_icon.png] Ter Waarde 60 . 8900 Ypres . Belgium Wetenschapspark 2 . 8400 Ostend . Belgium [https://www.ebo-enterprises.com/static/emailsignatures/img/website_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/twitter_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/facebook_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/instagram_icon.png] [https://www.ebo-enterprises.com/static/emailsignatures/img/linkedin_icon.png] [cid:microsoftteams-image_b51463d7-6b52-402b-8e2d-555faff69bb4.png] ________________________________ From: Thomas Petazzoni Sent: Friday, February 10, 2023 11:14:54 PM To: Dirk De Becker Cc: buildroot at buildroot.org ; Steven Boucque Subject: Re: [Buildroot] Dependency problem for gtkmm3 CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender and know the content is safe. Hello Dirk, On Fri, 10 Feb 2023 11:15:12 +0000 Dirk De Becker wrote: > Hi, > > I am trying to make a buildroot containing libgtkmm3, but I run into problems. > I did the following steps: > Checkout master from git://git.buildroot.net/buildroot > Select the following things: > > * BR2_x86_64 > * BR2_TOOLCHAIN_BUILDROOT_CXX > * BR2_PACKAGE_MESA3D > * BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 > * BR2_PACKAGE_MESA3D_OPENGL_EGL > * BR2_PACKAGE_LIBGTK3 > * BR2_PACKAGE_GTKMM3 > > I get the following error in the output of the build attempt for gtkmm3-3.22.0: > configure: error: Package requirements (giomm-2.4 >= 2.49.1 pangomm-1.4 >= 2.38.2 gtk+-3.0 >= 3.22.0 cairomm-1.0 >= 1.12.0 gdk-pixbuf-2.0 >= 2.35.5) were not met: > > Package 'giomm-2.4', required by 'virtual:world', not found > Package 'pangomm-1.4', required by 'virtual:world', not found > Package 'cairomm-1.0', required by 'virtual:world', not found > > It seems that gtkmm3 is dependent on versions of some libraries that are not available. > > The following packages were built, but these do not provide the correct versions of these packages, according to pkg-config: > > * glibmm-2.68.2 > * pangomm-2.48.2 > * cairomm-1.16.1 I have not looked at the issue, but it seems to match what our autobuilders have reported at: https://eur06.safelinks.protection.outlook.com/?url=http%3A%2F%2Fautobuild.buildroot.net%2Fresults%2F172%2F17263ac51f197031106eb7fd595126a2720f0397%2Fbuild-end.log&data=05%7C01%7CDirk.DeBecker%40ebo-enterprises.com%7Cf2c82276f6b2448fde9c08db0bb43dbe%7C24133f962b3843609546979fc3caa9d7%7C0%7C0%7C638116640987871529%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=iS%2FzyBdbOpMNuDoIniOElXwANQ%2F6CK3X2cqH25Bwlmw%3D&reserved=0 Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://eur06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbootlin.com%2F&data=05%7C01%7CDirk.DeBecker%40ebo-enterprises.com%7Cf2c82276f6b2448fde9c08db0bb43dbe%7C24133f962b3843609546979fc3caa9d7%7C0%7C0%7C638116640987871529%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=VIGuMURAvlIEalseolNbf05d5BH%2FubIKee%2F01piDErY%3D&reserved=0 -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: microsoftteams-image_b51463d7-6b52-402b-8e2d-555faff69bb4.png Type: image/png Size: 8323 bytes Desc: microsoftteams-image_b51463d7-6b52-402b-8e2d-555faff69bb4.png URL: From yann.morin.1998 at free.fr Sun Feb 12 09:19:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 10:19:14 +0100 Subject: [Buildroot] [PATCH 1/1] Makefile: fix rule order for legal-info In-Reply-To: <20230211184346.1192333-1-james.hilliard1@gmail.com> References: <20230211184346.1192333-1-james.hilliard1@gmail.com> Message-ID: <20230212091914.GJ2796@scaer> James, All, On 2023-02-11 11:43 -0700, James Hilliard spake thusly: > This command relies on the clean/prepare operations being in a > specific order. > > Currently the execution ordering of the clean/prepare operations may > change, for example if --shuffle=reversed is set. > > To ensure the evaluation order is always correct use double colon > rules to make the evaluation order explicit as per make docs: > > The double-colon rules for a target are executed in the order they > appear in the makefile. Thanks for this patch! What bothers me a bit about using double-colon, is that the make manual explicitly state that "[d]ouble-colon rules are somewhat obscure and not often very useful; they provide a mechanism for cases in which the method used to update a target differs depending on which prerequisite files caused the update, and such cases are rare." So, I understand that it does fix the issue, but I'm afraid that it is going to be so easy to forget about that issue, and what I get from the make manual is that we should not use them unless as a last resort in very special corner cases, and the case at hand is not identified by the manual, which somewhat implies that double-colon rules were written specifically to handle the case where "the method used to update a target differs depending on which prerequisite files caused the update", not specifically to ensure that the order is guarantedd. It even goes as far as suggesting that this should not really be relied upon: The double-colon rules for a target are executed in the order they appear in the makefile. However, the cases where double-colon rules really make sense are those where the order of executing the recipes would not matter. So, to me, the ordering is only a side-effect of the original goal, which is to have different commands to generate a target, based on what prerequisite caused the the update... I am also afraid that there are so many other places around where we implicitly rely on the order the prerequisites are listed, and that we can't easily spot (that I spotted the legal-info issue and asked you about it, is pure chance, as I was looking at something completely different). However, in the legal-info case, the rule is definitely not parallel-safe, and we do really want it and its dependencies *not* to execute in parallel in fact. Indeed, all PKG-legal-info rules will emit a little blurb that is appended to the manisfest.csv, with commands like: echo 'PKG,VERSION,blablsablab' >> manifest.csv So, if we run that in parallel, this is going to explode [1]. So, I believe in this case, we do not want to use :: rules, but really ensure that legal-info and all PKG-legal-info rules are never run in parallel, *and* that they are executed in the order they are listed in the prerequisites. We probably want to just add in the top-level Makefile: .NOTPARALLEL: legal-info and in package/pkg-generic.mk, something along the lines of: .NOTPARALLEL: $(2)-legal-info #(2)-all-legal-info Thoughts? [0] https://www.gnu.org/software/make/manual/make.html#Double_002dColon [1] with very nice and bright colors, but a bit too loud still Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > Makefile | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 4880b426b5..09575a5e3c 100644 > --- a/Makefile > +++ b/Makefile > @@ -839,7 +839,9 @@ legal-info-prepare: $(LEGAL_INFO_DIR) > @cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config > > .PHONY: legal-info > -legal-info: legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ > +legal-info:: legal-info-clean > +legal-info:: legal-info-prepare > +legal-info:: $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ > $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) > @cat support/legal-info/README.header >>$(LEGAL_REPORT) > @if [ -r $(LEGAL_WARNINGS) ]; then \ > -- > 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 Feb 12 09:42:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 10:42:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: <20221018034605.800593-1-james.hilliard1@gmail.com> References: <20221018034605.800593-1-james.hilliard1@gmail.com> Message-ID: <20230212094205.GK2796@scaer> James, All, Thanks again for working on such grunt work, it's much appreaciated! On 2022-10-17 21:46 -0600, James Hilliard spake thusly: > These command rely on the clean operations being first so that the > stamp files being deleted will rebuild the targets. > > The execution ordering of the clean and rebuild operations may > change, for example if --shuffle=reversed is set. > > To ensure the evaluation order is always correct use double colon > rules to make the evaluation order explicit as per make docs: > > The double-colon rules for a target are executed in the order they > appear in the makefile. I am not convinced that we should switch over to using double-colons. As I reviewed your other related patch about legal-info [0], the make manual [1] suggests that double-colons are rally intended for cases where "the method used to update a target differs depending on which prerequisite files caused the update" and "double-colon rules really make sense are those where the order of executing the recipes would not matter". So, we'd use a mechanism where order should not matter, to solve an issue with ordering. That'd be weird... Yes, the manual states that "double-colon rules for a target are executed in the order they appear in the makefile", but that really looks like a side-effect of another goal. Also, we'd need to carefully review all our Makefile to ensure that there are no other cases wehre ordering of prerequisites matter. We'd also have to be careful every time we introduce a new rule and remember to check whether it depends on the ordering prereauisites or not, adn worse yet, also whether we can afford the rule to be parallel-safe or not (see the explanation for that in the legal-info review). Having colons and double-colons is going to be quite a headache... We already have issues with remembering that we need to use $$ to expand variables in some places, and the rules there are relatively clean and explicit, but for the :: case, I'm afraid that's going to be a bit more complex. We currently have a single location where we use double-colon: support/kconfig/Makefile.br which is added by our patch against kconfig: support/kconfig/patches/10-br-build-system.patch which dates back to 2010: 7c524dd0b683 Clean up our patches against kconfig which got in three in 2007: a665ed34960b - pull kconfig from linux-2.6.21.5 So, I'd like that we get another way to fix that, if possible... Again, thanks a lot for spending efforts in that area, this is really great! [0] https://lore.kernel.org/buildroot/20230212091914.GJ2796 at scaer/ [1] https://www.gnu.org/software/make/manual/make.html#Double_002dColon Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > package/pkg-generic.mk | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index f24e03a325..6cb461af90 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -1057,17 +1057,20 @@ endif > rm -f $$($(2)_TARGET_INSTALL_IMAGES) > rm -f $$($(2)_TARGET_INSTALL_HOST) > > -$(1)-reinstall: $(1)-clean-for-reinstall $(1) > +$(1)-reinstall:: $(1)-clean-for-reinstall > +$(1)-reinstall:: $(1) > > $(1)-clean-for-rebuild: $(1)-clean-for-reinstall > rm -f $$($(2)_TARGET_BUILD) > > -$(1)-rebuild: $(1)-clean-for-rebuild $(1) > +$(1)-rebuild:: $(1)-clean-for-rebuild > +$(1)-rebuild:: $(1) > > $(1)-clean-for-reconfigure: $(1)-clean-for-rebuild > rm -f $$($(2)_TARGET_CONFIGURE) > > -$(1)-reconfigure: $(1)-clean-for-reconfigure $(1) > +$(1)-reconfigure:: $(1)-clean-for-reconfigure > +$(1)-reconfigure:: $(1) > > # define the PKG variable for all targets, containing the > # uppercase package variable prefix > -- > 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 Feb 12 09:54:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 10:54:24 +0100 Subject: [Buildroot] [PATCH] package/python-magic-wormhole-mailbox-server: add missing reverse dependency on host-rustc Message-ID: <20230212095424.1326531-1-yann.morin.1998@free.fr> From: Julien Olivain As reported by Yann in [1], Kconfig warns about an unmet dependency. The issue can be reproduced on master branch at commit 451672e, with the command: KCONFIG_SEED=0x1D15B9D4 make randconfig The patch adds the missing dependency. Fixes: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_AUTOBAHN Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER [=y] && BR2_PACKAGE_PYTHON3 [=y] [1] https://lists.buildroot.org/pipermail/buildroot/2023-February/661898.html Cc: Yann E. MORIN Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/python-magic-wormhole-mailbox-server/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in index db20d3e7b6..a0721e866f 100644 --- a/package/python-magic-wormhole-mailbox-server/Config.in +++ b/package/python-magic-wormhole-mailbox-server/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER bool "python-magic-wormhole-mailbox-server" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime -- 2.25.1 From james.hilliard1 at gmail.com Sun Feb 12 10:02:03 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 12 Feb 2023 03:02:03 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: <20230212094205.GK2796@scaer> References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> Message-ID: On Sun, Feb 12, 2023 at 2:42 AM Yann E. MORIN wrote: > > James, All, > > Thanks again for working on such grunt work, it's much appreaciated! > > On 2022-10-17 21:46 -0600, James Hilliard spake thusly: > > These command rely on the clean operations being first so that the > > stamp files being deleted will rebuild the targets. > > > > The execution ordering of the clean and rebuild operations may > > change, for example if --shuffle=reversed is set. > > > > To ensure the evaluation order is always correct use double colon > > rules to make the evaluation order explicit as per make docs: > > > > The double-colon rules for a target are executed in the order they > > appear in the makefile. > > I am not convinced that we should switch over to using double-colons. > > As I reviewed your other related patch about legal-info [0], the make > manual [1] suggests that double-colons are rally intended for cases > where "the method used to update a target differs depending on which > prerequisite files caused the update" and "double-colon rules really > make sense are those where the order of executing the recipes would not > matter". This appears to be the only documented method of enforcing execution order without disabling parallel builds...that I've come across at least. > > So, we'd use a mechanism where order should not matter, to solve an > issue with ordering. That'd be weird... > > Yes, the manual states that "double-colon rules for a target are > executed in the order they appear in the makefile", but that really > looks like a side-effect of another goal. Yeah, I agree it's not really the intended use case for double-colon rules, however the ordering behavior is documented so I would not expect it to break. > > Also, we'd need to carefully review all our Makefile to ensure that > there are no other cases wehre ordering of prerequisites matter. We'd > also have to be careful every time we introduce a new rule and remember > to check whether it depends on the ordering prereauisites or not, adn > worse yet, also whether we can afford the rule to be parallel-safe or > not (see the explanation for that in the legal-info review). So unlike the legal-info issue using .NOTPARALLEL would not work here as these make targets do need to work with parallel builds. > > Having colons and double-colons is going to be quite a headache... We > already have issues with remembering that we need to use $$ to expand > variables in some places, and the rules there are relatively clean and > explicit, but for the :: case, I'm afraid that's going to be a bit more > complex. I don't think we have all that many of these issues, but I could be wrong. The clean-for-re{install, build, configure} make targets are a bit hacky to begin with so I don't think make was intended to handle those cases in the first place. We're already in unintended feature use case territory here so this doesn't seem to make things much worse. > > We currently have a single location where we use double-colon: > support/kconfig/Makefile.br > > which is added by our patch against kconfig: > support/kconfig/patches/10-br-build-system.patch > > which dates back to 2010: > 7c524dd0b683 Clean up our patches against kconfig > > which got in three in 2007: > a665ed34960b - pull kconfig from linux-2.6.21.5 > > So, I'd like that we get another way to fix that, if possible... I have unfortunately not found any other method to fix the execution ordering... > > Again, thanks a lot for spending efforts in that area, this is really > great! > > [0] https://lore.kernel.org/buildroot/20230212091914.GJ2796 at scaer/ > [1] https://www.gnu.org/software/make/manual/make.html#Double_002dColon > > Regards, > Yann E. MORIN. > > > Signed-off-by: James Hilliard > > --- > > package/pkg-generic.mk | 9 ++++++--- > > 1 file changed, 6 insertions(+), 3 deletions(-) > > > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > > index f24e03a325..6cb461af90 100644 > > --- a/package/pkg-generic.mk > > +++ b/package/pkg-generic.mk > > @@ -1057,17 +1057,20 @@ endif > > rm -f $$($(2)_TARGET_INSTALL_IMAGES) > > rm -f $$($(2)_TARGET_INSTALL_HOST) > > > > -$(1)-reinstall: $(1)-clean-for-reinstall $(1) > > +$(1)-reinstall:: $(1)-clean-for-reinstall > > +$(1)-reinstall:: $(1) > > > > $(1)-clean-for-rebuild: $(1)-clean-for-reinstall > > rm -f $$($(2)_TARGET_BUILD) > > > > -$(1)-rebuild: $(1)-clean-for-rebuild $(1) > > +$(1)-rebuild:: $(1)-clean-for-rebuild > > +$(1)-rebuild:: $(1) > > > > $(1)-clean-for-reconfigure: $(1)-clean-for-rebuild > > rm -f $$($(2)_TARGET_CONFIGURE) > > > > -$(1)-reconfigure: $(1)-clean-for-reconfigure $(1) > > +$(1)-reconfigure:: $(1)-clean-for-reconfigure > > +$(1)-reconfigure:: $(1) > > > > # define the PKG variable for all targets, containing the > > # uppercase package variable prefix > > -- > > 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 Feb 12 10:11:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 11:11:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> Message-ID: <20230212101112.GL2796@scaer> James, All, On 2023-02-12 03:02 -0700, James Hilliard spake thusly: > On Sun, Feb 12, 2023 at 2:42 AM Yann E. MORIN wrote: > > On 2022-10-17 21:46 -0600, James Hilliard spake thusly: > > > To ensure the evaluation order is always correct use double colon > > > rules to make the evaluation order explicit as per make docs: > > > > > > The double-colon rules for a target are executed in the order they > > > appear in the makefile. [--SNIP--] > > So, I'd like that we get another way to fix that, if possible... > I have unfortunately not found any other method to fix the execution > ordering... What about something along the lines of (untestd!): $(1)-rebuild: $(1): $(1)-clean-for-rebuild $(1)-rebuild: $(1) We already use such a construct in package/pkg-kconfig.mk, but only once, so this is not as if it were widespread either... Still, I think it is more easy to read... 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 james.hilliard1 at gmail.com Sun Feb 12 10:12:41 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 12 Feb 2023 03:12:41 -0700 Subject: [Buildroot] [PATCH 1/1] Makefile: fix rule order for legal-info In-Reply-To: <20230212091914.GJ2796@scaer> References: <20230211184346.1192333-1-james.hilliard1@gmail.com> <20230212091914.GJ2796@scaer> Message-ID: On Sun, Feb 12, 2023 at 2:19 AM Yann E. MORIN wrote: > > James, All, > > On 2023-02-11 11:43 -0700, James Hilliard spake thusly: > > This command relies on the clean/prepare operations being in a > > specific order. > > > > Currently the execution ordering of the clean/prepare operations may > > change, for example if --shuffle=reversed is set. > > > > To ensure the evaluation order is always correct use double colon > > rules to make the evaluation order explicit as per make docs: > > > > The double-colon rules for a target are executed in the order they > > appear in the makefile. > > Thanks for this patch! > > What bothers me a bit about using double-colon, is that the make manual > explicitly state that "[d]ouble-colon rules are somewhat obscure and not > often very useful; they provide a mechanism for cases in which the > method used to update a target differs depending on which prerequisite > files caused the update, and such cases are rare." > > So, I understand that it does fix the issue, but I'm afraid that it is > going to be so easy to forget about that issue, and what I get from the > make manual is that we should not use them unless as a last resort in > very special corner cases, and the case at hand is not identified by the > manual, which somewhat implies that double-colon rules were written > specifically to handle the case where "the method used to update a > target differs depending on which prerequisite files caused the update", > not specifically to ensure that the order is guarantedd. It even goes as > far as suggesting that this should not really be relied upon: > > The double-colon rules for a target are executed in the order they > appear in the makefile. However, the cases where double-colon rules > really make sense are those where the order of executing the recipes > would not matter. > > So, to me, the ordering is only a side-effect of the original goal, > which is to have different commands to generate a target, based on what > prerequisite caused the the update... > > I am also afraid that there are so many other places around where we > implicitly rely on the order the prerequisites are listed, and that we > can't easily spot (that I spotted the legal-info issue and asked you > about it, is pure chance, as I was looking at something completely > different). Well we should be able to flush them out using make shuffle mode. That's how I caught the other issues at least. > > However, in the legal-info case, the rule is definitely not > parallel-safe, and we do really want it and its dependencies *not* to > execute in parallel in fact. > > Indeed, all PKG-legal-info rules will emit a little blurb that is > appended to the manisfest.csv, with commands like: > echo 'PKG,VERSION,blablsablab' >> manifest.csv > > So, if we run that in parallel, this is going to explode [1]. Hmm, might just need a flock operation when doing the manifest.csv file echo append. We do something like that for downloads already: https://github.com/buildroot/buildroot/blob/2022.11.1/package/pkg-download.mk#L113 > > So, I believe in this case, we do not want to use :: rules, but really > ensure that legal-info and all PKG-legal-info rules are never run in > parallel, *and* that they are executed in the order they are listed in > the prerequisites. Well legal-info can take a while to run so it might make sense to make it work in parallel. > > We probably want to just add in the top-level Makefile: > > .NOTPARALLEL: legal-info > > and in package/pkg-generic.mk, something along the lines of: > > .NOTPARALLEL: $(2)-legal-info #(2)-all-legal-info > > Thoughts? Might work...but it seems like using flock may be simpler and faster. > > [0] https://www.gnu.org/software/make/manual/make.html#Double_002dColon > [1] with very nice and bright colors, but a bit too loud still > > Regards, > Yann E. MORIN. > > > Signed-off-by: James Hilliard > > --- > > Makefile | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/Makefile b/Makefile > > index 4880b426b5..09575a5e3c 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -839,7 +839,9 @@ legal-info-prepare: $(LEGAL_INFO_DIR) > > @cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config > > > > .PHONY: legal-info > > -legal-info: legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ > > +legal-info:: legal-info-clean > > +legal-info:: legal-info-prepare > > +legal-info:: $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ > > $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) > > @cat support/legal-info/README.header >>$(LEGAL_REPORT) > > @if [ -r $(LEGAL_WARNINGS) ]; then \ > > -- > > 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 james.hilliard1 at gmail.com Sun Feb 12 10:22:17 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 12 Feb 2023 03:22:17 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: <20230212101112.GL2796@scaer> References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> <20230212101112.GL2796@scaer> Message-ID: On Sun, Feb 12, 2023 at 3:11 AM Yann E. MORIN wrote: > > James, All, > > On 2023-02-12 03:02 -0700, James Hilliard spake thusly: > > On Sun, Feb 12, 2023 at 2:42 AM Yann E. MORIN wrote: > > > On 2022-10-17 21:46 -0600, James Hilliard spake thusly: > > > > To ensure the evaluation order is always correct use double colon > > > > rules to make the evaluation order explicit as per make docs: > > > > > > > > The double-colon rules for a target are executed in the order they > > > > appear in the makefile. > [--SNIP--] > > > So, I'd like that we get another way to fix that, if possible... > > I have unfortunately not found any other method to fix the execution > > ordering... > > What about something along the lines of (untestd!): > > $(1)-rebuild: $(1): $(1)-clean-for-rebuild > $(1)-rebuild: $(1) That would appear to be invalid syntax. > > We already use such a construct in package/pkg-kconfig.mk, but only > once, so this is not as if it were widespread either... I don't see anything like that there, just this which isn't doing anything unusual with multiple prerequisites that require a specific execution order like the re{install,build,configure} rules in pkg-generic.mk: # Force olddefconfig again on -reconfigure $(1)-clean-for-reconfigure: $(1)-clean-kconfig-for-reconfigure $(1)-clean-kconfig-for-reconfigure: rm -f $$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG) > > Still, I think it is more easy to read... > > 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 Sun Feb 12 10:57:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 11:57:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> <20230212101112.GL2796@scaer> Message-ID: <20230212105722.GM2796@scaer> James, All, On 2023-02-12 03:22 -0700, James Hilliard spake thusly: > On Sun, Feb 12, 2023 at 3:11 AM Yann E. MORIN wrote: > > > > James, All, > > > > On 2023-02-12 03:02 -0700, James Hilliard spake thusly: > > > On Sun, Feb 12, 2023 at 2:42 AM Yann E. MORIN wrote: > > > > On 2022-10-17 21:46 -0600, James Hilliard spake thusly: > > > > > To ensure the evaluation order is always correct use double colon > > > > > rules to make the evaluation order explicit as per make docs: > > > > > > > > > > The double-colon rules for a target are executed in the order they > > > > > appear in the makefile. > > [--SNIP--] > > > > So, I'd like that we get another way to fix that, if possible... > > > I have unfortunately not found any other method to fix the execution > > > ordering... > > > > What about something along the lines of (untestd!): > > > > $(1)-rebuild: $(1): $(1)-clean-for-rebuild > > $(1)-rebuild: $(1) > > That would appear to be invalid syntax. > > > > > We already use such a construct in package/pkg-kconfig.mk, but only > > once, so this is not as if it were widespread either... > > I don't see anything like that there, 240: $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $(1)-%: $$($(2)_DIR)/.kconfig_editor_% So, this looks like it is named "target pattern", and it works with a pattern (eh!). $ cat Makefile 1 all: a 2 3 a: 4 @echo a 5 6 a-clean: 7 @sleep 1 8 @echo a-clean 9 10 a-rebuild: %-rebuild: %-clean 11 a-rebuild: a However, that does not work with parallel builds: $ make a $ make a a $ make a-rebuild a-clean a $ make -j a-rebuild a a-clean However, you stated in a previous reply: So unlike the legal-info issue using .NOTPARALLEL would not work here as these make targets do need to work with parallel builds. I don't think that's true. Indeed, foo-rebuild is usually done after a ful build, when iterating over the foo package, iether to test a new source tree (with ocerride-ssrcdir) or to test fixes in foo.mk. In either case, we do not need a top-level parallel build, because only one package, foo, will be built. So, even in this case, we should be able to use .NOTPARALLEL, no? It also means that the kconfig rule I mentionned above, does not work with top-level parallel builds, but that's OK: it's only used to spawn kconfig configurators (menuconfig et al.), so it should not be used with top-level parallel, and thus should require .NOTPARALLEL as well. Meh, TLPB and shuffling are really uncovering issues everywhere... :-( Regards, Yann E. MORIN. > just this which isn't doing anything > unusual with multiple prerequisites that require a specific execution > order like the re{install,build,configure} rules in pkg-generic.mk: > > # Force olddefconfig again on -reconfigure > $(1)-clean-for-reconfigure: $(1)-clean-kconfig-for-reconfigure > > $(1)-clean-kconfig-for-reconfigure: > rm -f $$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG) > > > > > Still, I think it is more easy to read... > > > > 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. | > > '------------------------------^-------^------------------^--------------------' -- .-----------------.--------------------.------------------.--------------------. | 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 Feb 12 11:06:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 12:06:12 +0100 Subject: [Buildroot] [PATCH 1/1] Makefile: fix rule order for legal-info In-Reply-To: References: <20230211184346.1192333-1-james.hilliard1@gmail.com> <20230212091914.GJ2796@scaer> Message-ID: <20230212110612.GN2796@scaer> James, All, On 2023-02-12 03:12 -0700, James Hilliard spake thusly: > On Sun, Feb 12, 2023 at 2:19 AM Yann E. MORIN wrote: > > On 2023-02-11 11:43 -0700, James Hilliard spake thusly: > > > This command relies on the clean/prepare operations being in a > > > specific order. [--SNIP--] > > However, in the legal-info case, the rule is definitely not > > parallel-safe, and we do really want it and its dependencies *not* to > > execute in parallel in fact. > > > > Indeed, all PKG-legal-info rules will emit a little blurb that is > > appended to the manisfest.csv, with commands like: > > echo 'PKG,VERSION,blablsablab' >> manifest.csv > > > > So, if we run that in parallel, this is going to explode [1]. > Hmm, might just need a flock operation when doing the manifest.csv > file echo append. Except we probably want, no, sorry: we do want, that the manifest to be reproducible (and alphabeticaly sorted), which would not be guaranteed with an flock. > We do something like that for downloads already: > https://github.com/buildroot/buildroot/blob/2022.11.1/package/pkg-download.mk#L113 Careful there: the flock is to protect against a concurrent Buildroot build, not an internal protection (although it also serves as an internal protection, when two packages have the same dl dir, like mesa3d and mesa3d-headers). > > So, I believe in this case, we do not want to use :: rules, but really > > ensure that legal-info and all PKG-legal-info rules are never run in > > parallel, *and* that they are executed in the order they are listed in > > the prerequisites. > > Well legal-info can take a while to run so it might make sense to make > it work in parallel. I understand that, but I still think legal-info should produce a reproducible output, and that can't be guaranteed if all we change is using an flock around the manifests. Also, legal-info is probably run after a complete build, so the overhead of downloading, extracting, and patching, ahs already been paid during the build. We talked about legal-info during the dev-days, and one idea that floated was that we need to generate an SBOM of the build, and the closest we have now is legal-info. The SBOM should always be generated, and I believe legal-info should awlays be generated, so the overhead point would be moot (but would be replaced by the overhead of running legal-info for every builds...) More needs to be dug on that topic... 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 james.hilliard1 at gmail.com Sun Feb 12 11:17:39 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 12 Feb 2023 04:17:39 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: <20230212105722.GM2796@scaer> References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> <20230212101112.GL2796@scaer> <20230212105722.GM2796@scaer> Message-ID: On Sun, Feb 12, 2023 at 3:57 AM Yann E. MORIN wrote: > > James, All, > > On 2023-02-12 03:22 -0700, James Hilliard spake thusly: > > On Sun, Feb 12, 2023 at 3:11 AM Yann E. MORIN wrote: > > > > > > James, All, > > > > > > On 2023-02-12 03:02 -0700, James Hilliard spake thusly: > > > > On Sun, Feb 12, 2023 at 2:42 AM Yann E. MORIN wrote: > > > > > On 2022-10-17 21:46 -0600, James Hilliard spake thusly: > > > > > > To ensure the evaluation order is always correct use double colon > > > > > > rules to make the evaluation order explicit as per make docs: > > > > > > > > > > > > The double-colon rules for a target are executed in the order they > > > > > > appear in the makefile. > > > [--SNIP--] > > > > > So, I'd like that we get another way to fix that, if possible... > > > > I have unfortunately not found any other method to fix the execution > > > > ordering... > > > > > > What about something along the lines of (untestd!): > > > > > > $(1)-rebuild: $(1): $(1)-clean-for-rebuild > > > $(1)-rebuild: $(1) > > > > That would appear to be invalid syntax. > > > > > > > > We already use such a construct in package/pkg-kconfig.mk, but only > > > once, so this is not as if it were widespread either... > > > > I don't see anything like that there, > > 240: $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $(1)-%: $$($(2)_DIR)/.kconfig_editor_% > > So, this looks like it is named "target pattern", and it works with a > pattern (eh!). > > $ cat Makefile > 1 all: a > 2 > 3 a: > 4 @echo a > 5 > 6 a-clean: > 7 @sleep 1 > 8 @echo a-clean > 9 > 10 a-rebuild: %-rebuild: %-clean > 11 a-rebuild: a > > However, that does not work with parallel builds: > > $ make > a > > $ make a > a > > $ make a-rebuild > a-clean > a > > $ make -j a-rebuild > a > a-clean > > However, you stated in a previous reply: > > So unlike the legal-info issue using .NOTPARALLEL would not work > here as these make targets do need to work with parallel builds. > > I don't think that's true. Indeed, foo-rebuild is usually done after a > ful build, when iterating over the foo package, iether to test a new > source tree (with ocerride-ssrcdir) or to test fixes in foo.mk. In > either case, we do not need a top-level parallel build, because only one > package, foo, will be built. > > So, even in this case, we should be able to use .NOTPARALLEL, no? Breaking parallel build for foo-rebuild would be rather unexpected behavior as foo-rebuild does work for full builds as well and one may default to using foo-rebuild instead of a foo target for various reasons(to ensure that a package is always rsynced from an overridden source directory for example). I see no good reason to disable parallel build on it when simply ordering the dependency execution order fixes the issue. > > It also means that the kconfig rule I mentionned above, does not work > with top-level parallel builds, but that's OK: it's only used to spawn > kconfig configurators (menuconfig et al.), so it should not be used with > top-level parallel, and thus should require .NOTPARALLEL as well. Might be better to use double colon rules there as well, they are more explicit than using .NOTPARALLEL IMO as .NOTPARALLEL doesn't specify an execution order, also it can potentially introduce accidental performance regressions. > > Meh, TLPB and shuffling are really uncovering issues everywhere... :-( Better to make them very obvious so they can be fixed IMO. Once the known issues are fixed I can run shuffle mode on my autobuilders to uncover remaining issues. > > Regards, > Yann E. MORIN. > > > just this which isn't doing anything > > unusual with multiple prerequisites that require a specific execution > > order like the re{install,build,configure} rules in pkg-generic.mk: > > > > # Force olddefconfig again on -reconfigure > > $(1)-clean-for-reconfigure: $(1)-clean-kconfig-for-reconfigure > > > > $(1)-clean-kconfig-for-reconfigure: > > rm -f $$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG) > > > > > > > > Still, I think it is more easy to read... > > > > > > 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. | > > > '------------------------------^-------^------------------^--------------------' > > -- > .-----------------.--------------------.------------------.--------------------. > | 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 Feb 12 11:25:59 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 12 Feb 2023 04:25:59 -0700 Subject: [Buildroot] [PATCH 1/1] Makefile: fix rule order for legal-info In-Reply-To: <20230212110612.GN2796@scaer> References: <20230211184346.1192333-1-james.hilliard1@gmail.com> <20230212091914.GJ2796@scaer> <20230212110612.GN2796@scaer> Message-ID: On Sun, Feb 12, 2023 at 4:06 AM Yann E. MORIN wrote: > > James, All, > > On 2023-02-12 03:12 -0700, James Hilliard spake thusly: > > On Sun, Feb 12, 2023 at 2:19 AM Yann E. MORIN wrote: > > > On 2023-02-11 11:43 -0700, James Hilliard spake thusly: > > > > This command relies on the clean/prepare operations being in a > > > > specific order. > [--SNIP--] > > > However, in the legal-info case, the rule is definitely not > > > parallel-safe, and we do really want it and its dependencies *not* to > > > execute in parallel in fact. > > > > > > Indeed, all PKG-legal-info rules will emit a little blurb that is > > > appended to the manisfest.csv, with commands like: > > > echo 'PKG,VERSION,blablsablab' >> manifest.csv > > > > > > So, if we run that in parallel, this is going to explode [1]. > > Hmm, might just need a flock operation when doing the manifest.csv > > file echo append. > > Except we probably want, no, sorry: we do want, that the manifest to be > reproducible (and alphabeticaly sorted), which would not be guaranteed > with an flock. Hmm, I thought we were sorting afterwards like this, guess that needs to be checked: https://github.com/buildroot/buildroot/blob/59b2e826f2a6c1874c5d032d3a5852326028bc0e/Makefile#L851 > > > We do something like that for downloads already: > > https://github.com/buildroot/buildroot/blob/2022.11.1/package/pkg-download.mk#L113 > > Careful there: the flock is to protect against a concurrent Buildroot > build, not an internal protection (although it also serves as an > internal protection, when two packages have the same dl dir, like mesa3d > and mesa3d-headers). I assumed it was mostly for packages with the same dl dir, I think it matters more what it can do rather than what it was designed to do ;). > > > > So, I believe in this case, we do not want to use :: rules, but really > > > ensure that legal-info and all PKG-legal-info rules are never run in > > > parallel, *and* that they are executed in the order they are listed in > > > the prerequisites. > > > > Well legal-info can take a while to run so it might make sense to make > > it work in parallel. > > I understand that, but I still think legal-info should produce a > reproducible output, and that can't be guaranteed if all we change is > using an flock around the manifests. It should be reproducible if we run a sort right? > > Also, legal-info is probably run after a complete build, so the overhead > of downloading, extracting, and patching, ahs already been paid during > the build. Doesn't it still take a little while even if that's done? > > We talked about legal-info during the dev-days, and one idea that > floated was that we need to generate an SBOM of the build, and the > closest we have now is legal-info. The SBOM should always be generated, > and I believe legal-info should awlays be generated, so the overhead > point would be moot (but would be replaced by the overhead of running > legal-info for every builds...) More needs to be dug on that topic... Well I think for both cases the faster the generation the better so parallel where possible has advantages there. If something is too slow it's less likely to be used/tested. > > 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 fontaine.fabrice at gmail.com Sun Feb 12 12:44:21 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 13:44:21 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/zabbix: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230212124421.17787-1-fontaine.fabrice@gmail.com> zabbix uses custom --enable-{static,shared} options, instead of standard libtool directives resulting in the following build failure with openssl or libcurl: configure:13132: /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib conftest.c -lssl -lcrypto -lm >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): in function `dlfcn_globallookup': dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): in function `BIO_lookup_ex': b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): in function `BIO_gethostbyname': b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /tmp/cceWHjDi.o: in function `main': conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' [...] configure: error: OpenSSL library libssl or libcrypto not found --- configure:15199: checking for main in -lz configure:15219: /home/autobuild/autobuild/instance-13/output-1/host/bin/s390x-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -I/home/autobuild/autobuild/instance-13/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-13/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib conftest.c -lz -lm >&5 /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/10.3.0/../../../../s390x-buildroot-linux-gnu/bin/ld: cannot find -lz collect2: error: ld returned 1 exit status [...] configure: error: static library z required for linking libcurl not found Fixes: - http://autobuild.buildroot.org/results/c05230d13fa0538323bb77e8f35533e6dd02453f - http://autobuild.buildroot.org/results/cc947038510e16417298b381521f226f7c45f986 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Update commit log and comment package/zabbix/zabbix.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index 23172a358d..06d12dbef4 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -125,6 +125,13 @@ endif endif # BR2_PACKAGE_ZABBIX_SERVER +# zabbix uses custom --enable-{static,shared} options, instead of +# standard libtool directives resulting in a build failure with libcurl +# or openssl. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ZABBIX_CONF_OPTS += --disable-static +endif + define ZABBIX_INSTALL_INIT_SYSTEMD $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 12 12:58:44 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 13:58:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/log4cplus: bump to version 2.1.0 Message-ID: <20230212125844.332225-1-fontaine.fabrice@gmail.com> https://github.com/log4cplus/log4cplus/blob/REL_2_1_0/ChangeLog Signed-off-by: Fabrice Fontaine --- package/log4cplus/log4cplus.hash | 2 +- package/log4cplus/log4cplus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/log4cplus/log4cplus.hash b/package/log4cplus/log4cplus.hash index c4540c9d56..1779b30949 100644 --- a/package/log4cplus/log4cplus.hash +++ b/package/log4cplus/log4cplus.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f5949e713cf8635fc554384ab99b04716e3430f28eed6dd7d71ad03d959b91a0 log4cplus-2.0.8.tar.xz +sha256 d84ac8b1c46645122fbf72691f8eacef68c71b587403ee833bd9a252e06d46cc log4cplus-2.1.0.tar.xz sha256 91d7e42ff80e74c4c94e5ad353375fa0358cd0abbf43f5fe957097cdbd4e2c4d LICENSE diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk index 2dab661654..28eb4ed8f4 100644 --- a/package/log4cplus/log4cplus.mk +++ b/package/log4cplus/log4cplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOG4CPLUS_VERSION = 2.0.8 +LOG4CPLUS_VERSION = 2.1.0 LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION) LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) -- 2.39.0 From giulio.benetti at benettiengineering.com Sun Feb 12 13:00:32 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 12 Feb 2023 14:00:32 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump version to 3.88.1 Message-ID: <20230212130032.724850-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 f847ec4f77..ec3fe0d777 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_87_RTM/src/SHA256SUMS -sha256 68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d nss-3.87.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_88_1_RTM/src/SHA256SUMS +sha256 27d243edf87d1cf1bb9c861f03d387e0e9230ce5017f4308c941f558b54b3496 nss-3.88.1.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index a60e615f9a..3782d239a5 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.87 +LIBNSS_VERSION = 3.88.1 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.34.1 From fontaine.fabrice at gmail.com Sun Feb 12 13:03:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 14:03:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/olsr: fix build with gpsd >= 3.25 Message-ID: <20230212130336.373391-1-fontaine.fabrice@gmail.com> Fix the following build failure with gpsd >= 3.25 raised since commit 3c7fece853f3def9a425eccc384b9dacb1010051: In file included from src/configuration.h:50, from src/configuration.c:46: src/gpsdclient.h:64:8: error: redefinition of 'struct fixsource_t' 64 | struct fixsource_t { | ^~~~~~~~~~~ In file included from src/gpsdclient.h:49, from src/configuration.h:50, from src/configuration.c:46: /tmp/instance-17/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/gps.h:2714:8: note: originally defined here 2714 | struct fixsource_t | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/47a619686bb47debd525c92aa7e14bee5c40ca9e Signed-off-by: Fabrice Fontaine --- .../olsr/0006-build-patch-for-gpsd-3-25.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/olsr/0006-build-patch-for-gpsd-3-25.patch diff --git a/package/olsr/0006-build-patch-for-gpsd-3-25.patch b/package/olsr/0006-build-patch-for-gpsd-3-25.patch new file mode 100644 index 0000000000..c82bc1bb28 --- /dev/null +++ b/package/olsr/0006-build-patch-for-gpsd-3-25.patch @@ -0,0 +1,31 @@ +From 17d583258969c1d182361e0e168b3cad79ef64e6 Mon Sep 17 00:00:00 2001 +From: Rui Chen +Date: Mon, 16 Jan 2023 18:35:32 -0500 +Subject: [PATCH] build: patch for gpsd 3.25 + +Signed-off-by: Rui Chen +[Retrieved from: https://github.com/OLSR/olsrd/pull/119] +Signed-off-by: Fabrice Fontaine +--- + lib/pud/src/gpsdclient.h | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/lib/pud/src/gpsdclient.h b/lib/pud/src/gpsdclient.h +index 061056b12..a51dd2211 100644 +--- a/lib/pud/src/gpsdclient.h ++++ b/lib/pud/src/gpsdclient.h +@@ -60,14 +60,6 @@ struct GpsdConnectionState { + struct devconfig_t dev[MAXUSERDEVS]; + }; + +-/* describe a data source */ +-struct fixsource_t { +- char spec[PATH_MAX]; /* working space, will be modified */ +- char *server; /* pointer into spec field */ +- char *port; /* pointer into spec field */ +- char *device; /* pointer into spec field */ +-}; +- + /** + * The gpsd daemon spec + */ -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 12 14:43:15 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 15:43:15 +0100 Subject: [Buildroot] [PATCH 1/2] package/libsolv: drop unrecognized variables Message-ID: <20230212144316.1181860-1-fontaine.fabrice@gmail.com> Drop unrecognized variables: CMake Warning: Manually-specified variables were not used by the project: BUILD_DOC BUILD_DOCS BUILD_EXAMPLE BUILD_EXAMPLES BUILD_TEST BUILD_TESTING BUILD_TESTS CMAKE_CXX_COMPILER_FORCED DISABLE_STATIC ENABLE_SHARED Signed-off-by: Fabrice Fontaine --- package/libsolv/libsolv.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 29f8a6a3d2..04fdb387fd 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -11,16 +11,15 @@ LIBSOLV_LICENSE_FILES = LICENSE.BSD LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib -LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON else -LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=OFF endif ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=OFF else LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON endif -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 12 14:43:16 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 15:43:16 +0100 Subject: [Buildroot] [PATCH 2/2] package/libsolv: fix build without C++ In-Reply-To: <20230212144316.1181860-1-fontaine.fabrice@gmail.com> References: <20230212144316.1181860-1-fontaine.fabrice@gmail.com> Message-ID: <20230212144316.1181860-2-fontaine.fabrice@gmail.com> Fix the following build failure without C++ raised since the addition ot the package in commit 93ce3c1be0753189d6af3ee9968b935037519c25: CMake Error at CMakeLists.txt:1 (PROJECT): No CMAKE_CXX_COMPILER could be found. Tell CMake where to find the compiler by setting either the environment variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path to the compiler, or to the compiler name if it is in the PATH. Fixes: - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f Signed-off-by: Fabrice Fontaine --- .../libsolv/0001-Fix-build-without-C.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/libsolv/0001-Fix-build-without-C.patch diff --git a/package/libsolv/0001-Fix-build-without-C.patch b/package/libsolv/0001-Fix-build-without-C.patch new file mode 100644 index 0000000000..2389aebcde --- /dev/null +++ b/package/libsolv/0001-Fix-build-without-C.patch @@ -0,0 +1,49 @@ +From 5691f58d1f8ce1332b02536e48f1ac5864629c6c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 12 Feb 2023 15:27:27 +0100 +Subject: [PATCH] Fix build without C++ + +Fix the following build failure without C++: + +CMake Error at CMakeLists.txt:1 (PROJECT): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Fixes: + - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/openSUSE/libsolv/pull/520] +--- + CMakeLists.txt | 2 +- + ext/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3541f496..f899c49a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-PROJECT (libsolv) ++PROJECT (libsolv C) + + CMAKE_MINIMUM_REQUIRED (VERSION 2.8.5) + +diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt +index f01c0238..589fa946 100644 +--- a/ext/CMakeLists.txt ++++ b/ext/CMakeLists.txt +@@ -103,6 +103,7 @@ IF (ENABLE_CUDFREPO) + ENDIF (ENABLE_CUDFREPO) + + IF (ENABLE_HAIKU) ++ enable_language(CXX) + SET (libsolvext_SRCS ${libsolvext_SRCS} + repo_haiku.cpp) + SET (libsolvext_HEADERS ${libsolvext_HEADERS} +-- +2.39.0 + -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 12 14:53:12 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 15:53:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv3: bump to version 3.4.19 Message-ID: <20230212145312.1203134-1-fontaine.fabrice@gmail.com> This bump will fix the following build failure with gcc >= 12: /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp: In function 'bool base64::base64_valid(const uint8_t*, size_t, size_t)': /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp:167:31: error: comparing the result of pointer addition '(src + ((sizetype)off))' and NULL [-Werror=address] 167 | if (src == 0 || src + off == 0) | ~~~~~~~~~~^~~~ cc1plus: some warnings being treated as errors Update hash of LICENSE file (update in year: https://github.com/opencv/opencv/commit/f6fe5c07f61eb0bc934672200b2bfd453f2fc41d) https://github.com/opencv/opencv/wiki/ChangeLog#version3419 Fixes: - http://autobuild.buildroot.org/results/cb9c120c15c8042e6919858d6885c1cc4d996c0c Signed-off-by: Fabrice Fontaine --- package/opencv3/opencv3.hash | 4 ++-- package/opencv3/opencv3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash index 30308188aa..3d6fd2ed8a 100644 --- a/package/opencv3/opencv3.hash +++ b/package/opencv3/opencv3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1353eec67849aadb20df71d8bae18b83708e18fc5da080fe5efeabb1e99b2ee8 opencv3-3.4.17.tar.gz -sha256 9076d3d934839a2f8e7bfe549abda6faea4751f1edd6e9460ff703559890ad5f LICENSE +sha256 9b913e74299ce4416a5c94000da577c592bf670fd53bad16220eb115a0821529 opencv3-3.4.19.tar.gz +sha256 c1fed9cd2f557ba23a1b37a21e2c90629d1a60bdb61e92d0e79369bb6fca3390 LICENSE diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 8e4c90786e..29fb246e65 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV3_VERSION = 3.4.17 +OPENCV3_VERSION = 3.4.19 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 12 15:09:19 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 16:09:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/zxing-cpp: update homepage Message-ID: <20230212150920.1213398-1-fontaine.fabrice@gmail.com> Commit 456a7398316655ad0b669635f580e4887c24a700 decided to switch to an active fork but forgot to update homepage in Config.in Signed-off-by: Fabrice Fontaine --- package/zxing-cpp/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 6c17565d2a..2550dcf023 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_ZXING_CPP implemented in Java, with ports to other languages. This compiles the C++ port. - https://github.com/glassechidna/zxing-cpp + https://github.com/zxing-cpp/zxing-cpp -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 12 15:09:20 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 12 Feb 2023 16:09:20 +0100 Subject: [Buildroot] [PATCH 2/2] package/zxing-cpp: needs wchar In-Reply-To: <20230212150920.1213398-1-fontaine.fabrice@gmail.com> References: <20230212150920.1213398-1-fontaine.fabrice@gmail.com> Message-ID: <20230212150920.1213398-2-fontaine.fabrice@gmail.com> wchar is mandatory since switch to an active fork in commit 456a7398316655ad0b669635f580e4887c24a700: In file included from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Result.h:12, from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/GTIN.cpp:9: /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Content.h:40:14: error: 'wstring' in namespace 'std' does not name a type 40 | std::wstring render(bool withECI) const; | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/4f97f1b291a99218f4706fce8b2934bd845755e1 Signed-off-by: Fabrice Fontaine --- package/gstreamer1/gst1-plugins-bad/Config.in | 6 ++++-- package/zxing-cpp/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index d477924eec..d2ef450d74 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -741,11 +741,13 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING bool "zxing" depends on !BR2_STATIC_LIBS # zxing-cpp + depends on BR2_USE_WCHAR # zxing-cpp depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp select BR2_PACKAGE_ZXING_CPP -comment "zxing plugin needs a toolchain w/ C++, dynamic library" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP +comment "zxing plugin needs a toolchain w/ C++, wchar, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_INSTALL_LIBSTDCPP endif diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 2550dcf023..0d8b79538d 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -1,9 +1,11 @@ -comment "zxing-cpp needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "zxing-cpp needs a toolchain w/ C++, wchar, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + BR2_STATIC_LIBS config BR2_PACKAGE_ZXING_CPP bool "zxing-cpp" depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_STB select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 -- 2.39.0 From ju.o at free.fr Sun Feb 12 16:33:21 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 12 Feb 2023 17:33:21 +0100 Subject: [Buildroot] [PATCH 1/2] DEVELOPERS: reorder entries for Julien Olivain Message-ID: <20230212163322.480467-1-ju.o@free.fr> Entries for "gnupg2" and "test_python_hkdf.py" were not at the right position. Signed-off-by: Julien Olivain --- DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ae698f87c5..ece0d986ae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1685,8 +1685,8 @@ F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ -F: package/gnupg2/ F: package/glslsandbox-player/ +F: package/gnupg2/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1716,8 +1716,8 @@ F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py -F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py +F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_magic_wormhole.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py -- 2.39.1 From ju.o at free.fr Sun Feb 12 16:33:22 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 12 Feb 2023 17:33:22 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Julien Olivain for z3 runtime test files In-Reply-To: <20230212163322.480467-1-ju.o@free.fr> References: <20230212163322.480467-1-ju.o@free.fr> Message-ID: <20230212163322.480467-2-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index ece0d986ae..dcc607ba60 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1724,6 +1724,7 @@ F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py +F: support/testing/tests/package/test_z3/ N: Julien Viard de Galbert F: package/dieharder/ -- 2.39.1 From yann.morin.1998 at free.fr Sun Feb 12 16:49:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 17:49:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/olsr: fix build with gpsd >= 3.25 In-Reply-To: <20230212130336.373391-1-fontaine.fabrice@gmail.com> References: <20230212130336.373391-1-fontaine.fabrice@gmail.com> Message-ID: <20230212164903.GO2796@scaer> Fabrice, All, On 2023-02-12 14:03 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure with gpsd >= 3.25 raised since commit > 3c7fece853f3def9a425eccc384b9dacb1010051: [--SNIP--] > +Signed-off-by: Rui Chen > +[Retrieved from: https://github.com/OLSR/olsrd/pull/119] > +Signed-off-by: Fabrice Fontaine > +--- > + lib/pud/src/gpsdclient.h | 8 -------- > + 1 file changed, 8 deletions(-) > + > +diff --git a/lib/pud/src/gpsdclient.h b/lib/pud/src/gpsdclient.h > +index 061056b12..a51dd2211 100644 > +--- a/lib/pud/src/gpsdclient.h > ++++ b/lib/pud/src/gpsdclient.h > +@@ -60,14 +60,6 @@ struct GpsdConnectionState { > + struct devconfig_t dev[MAXUSERDEVS]; > + }; > + > +-/* describe a data source */ > +-struct fixsource_t { > +- char spec[PATH_MAX]; /* working space, will be modified */ > +- char *server; /* pointer into spec field */ > +- char *port; /* pointer into spec field */ > +- char *device; /* pointer into spec field */ > +-}; Given that this breaks the build with older gpsd versions, I suspect this is not goign to be accepted by upstream. I've sent another proposal to fix that issue in a backward compatible manner: https://github.com/OLSR/olsrd/pull/120 Let's see a bit what upstream decides. Regards, Yann E. MORIN. > + /** > + * The gpsd daemon spec > + */ > -- > 2.39.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 bugzilla at busybox.net Sun Feb 12 18:15:08 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 12 Feb 2023 18:15:08 +0000 Subject: [Buildroot] [Bug 15306] glibc build fails in Docker container In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15306 Russ changed: What |Removed |Added ---------------------------------------------------------------------------- Severity|normal |blocker Priority|P5 |P3 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Sun Feb 12 19:57:07 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 12 Feb 2023 19:57:07 +0000 Subject: [Buildroot] [Bug 15306] glibc build fails in Docker container In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15306 Yann E. MORIN changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |yann.morin.1998 at free.fr --- Comment #1 from Yann E. MORIN --- Russ, All, I have been unable to reproduce such an error with the current master branch, running Ubuntu 22.04 in a docker container, with this defconfig: BR2_aarch64=y Please provide a *minimalist* defconfig that exhibits the issue. Regards, Yann E. MORIN. -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Sun Feb 12 20:02:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 21:02:51 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump version to 3.88.1 In-Reply-To: <20230212130032.724850-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sun, 12 Feb 2023 14:00:32 +0100") References: <20230212130032.724850-1-giulio.benetti@benettiengineering.com> Message-ID: <87o7pybqj8.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Signed-off-by: Giulio Benetti Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 12 20:03:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 21:03:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/log4cplus: bump to version 2.1.0 In-Reply-To: <20230212125844.332225-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 12 Feb 2023 13:58:44 +0100") References: <20230212125844.332225-1-fontaine.fabrice@gmail.com> Message-ID: <87k00mbqim.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/log4cplus/log4cplus/blob/REL_2_1_0/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 12 20:02:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 21:02:14 +0100 Subject: [Buildroot] [git commit] package/libnss: bump version to 3.88.1 Message-ID: <20230212200333.AD49B856EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99024eca8f154062ea88af985ff10e12ae7016b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 f847ec4f77..ec3fe0d777 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_87_RTM/src/SHA256SUMS -sha256 68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d nss-3.87.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_88_1_RTM/src/SHA256SUMS +sha256 27d243edf87d1cf1bb9c861f03d387e0e9230ce5017f4308c941f558b54b3496 nss-3.88.1.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 90fd9259d5..ac342cf3af 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.87 +LIBNSS_VERSION = 3.88.1 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 peter at korsgaard.com Sun Feb 12 20:03:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 21:03:01 +0100 Subject: [Buildroot] [git commit] package/log4cplus: bump to version 2.1.0 Message-ID: <20230212200333.B878585644@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bb77eb8f14585bc79307fd672cab79b7e4e476d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/log4cplus/log4cplus/blob/REL_2_1_0/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/log4cplus/log4cplus.hash | 2 +- package/log4cplus/log4cplus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/log4cplus/log4cplus.hash b/package/log4cplus/log4cplus.hash index c4540c9d56..1779b30949 100644 --- a/package/log4cplus/log4cplus.hash +++ b/package/log4cplus/log4cplus.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f5949e713cf8635fc554384ab99b04716e3430f28eed6dd7d71ad03d959b91a0 log4cplus-2.0.8.tar.xz +sha256 d84ac8b1c46645122fbf72691f8eacef68c71b587403ee833bd9a252e06d46cc log4cplus-2.1.0.tar.xz sha256 91d7e42ff80e74c4c94e5ad353375fa0358cd0abbf43f5fe957097cdbd4e2c4d LICENSE diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk index 2dab661654..28eb4ed8f4 100644 --- a/package/log4cplus/log4cplus.mk +++ b/package/log4cplus/log4cplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOG4CPLUS_VERSION = 2.0.8 +LOG4CPLUS_VERSION = 2.1.0 LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION) LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) From yann.morin.1998 at free.fr Sun Feb 12 20:20:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:20:15 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: reorder entries for Julien Olivain Message-ID: <20230212202118.CD6238572E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f33c8490fe8d110c13a1f28bd5a2063983002fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Entries for "gnupg2" and "test_python_hkdf.py" were not at the right position. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ae698f87c5..ece0d986ae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1685,8 +1685,8 @@ F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ -F: package/gnupg2/ F: package/glslsandbox-player/ +F: package/gnupg2/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1716,8 +1716,8 @@ F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py -F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py +F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_magic_wormhole.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py From yann.morin.1998 at free.fr Sun Feb 12 20:20:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:20:30 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Julien Olivain for z3 runtime test files Message-ID: <20230212202118.D827B85730@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0dc2fa3865b0dbb2a6c103d6bc3bbc294ada604 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index ece0d986ae..dcc607ba60 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1724,6 +1724,7 @@ F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py +F: support/testing/tests/package/test_z3/ N: Julien Viard de Galbert F: package/dieharder/ From yann.morin.1998 at free.fr Sun Feb 12 20:21:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:21:39 +0100 Subject: [Buildroot] [PATCH 1/2] DEVELOPERS: reorder entries for Julien Olivain In-Reply-To: <20230212163322.480467-1-ju.o@free.fr> References: <20230212163322.480467-1-ju.o@free.fr> Message-ID: <20230212202139.GP2796@scaer> Julien, All, On 2023-02-12 17:33 +0100, Julien Olivain spake thusly: > Entries for "gnupg2" and "test_python_hkdf.py" were not at the right > position. > > Signed-off-by: Julien Olivain Both patches applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index ae698f87c5..ece0d986ae 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1685,8 +1685,8 @@ F: configs/spike_riscv64_defconfig > F: configs/zynq_qmtech_defconfig > F: package/fluid-soundfont/ > F: package/fluidsynth/ > -F: package/gnupg2/ > F: package/glslsandbox-player/ > +F: package/gnupg2/ > F: package/octave/ > F: package/ola/ > F: package/perftest/ > @@ -1716,8 +1716,8 @@ F: support/testing/tests/package/test_ola.py > F: support/testing/tests/package/test_ola/ > F: support/testing/tests/package/test_perftest.py > F: support/testing/tests/package/test_python_distro.py > -F: support/testing/tests/package/test_python_hkdf.py > F: support/testing/tests/package/test_python_gnupg.py > +F: support/testing/tests/package/test_python_hkdf.py > F: support/testing/tests/package/test_python_magic_wormhole.py > F: support/testing/tests/package/test_python_pyalsa.py > F: support/testing/tests/package/test_python_spake2.py > -- > 2.39.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 Feb 12 20:27:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:27:47 +0100 Subject: [Buildroot] [git commit] package/zxing-cpp: needs wchar Message-ID: <20230212202900.EC4138578B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=631d0289fe880952d9bedf37cc10b043c70c1482 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master wchar is mandatory since switch to an active fork in commit 456a7398316655ad0b669635f580e4887c24a700: In file included from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Result.h:12, from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/GTIN.cpp:9: /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Content.h:40:14: error: 'wstring' in namespace 'std' does not name a type 40 | std::wstring render(bool withECI) const; | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/4f97f1b291a99218f4706fce8b2934bd845755e1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-bad/Config.in | 6 ++++-- package/zxing-cpp/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index d477924eec..d2ef450d74 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -741,11 +741,13 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING bool "zxing" depends on !BR2_STATIC_LIBS # zxing-cpp + depends on BR2_USE_WCHAR # zxing-cpp depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp select BR2_PACKAGE_ZXING_CPP -comment "zxing plugin needs a toolchain w/ C++, dynamic library" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP +comment "zxing plugin needs a toolchain w/ C++, wchar, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_INSTALL_LIBSTDCPP endif diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 2550dcf023..0d8b79538d 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -1,9 +1,11 @@ -comment "zxing-cpp needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "zxing-cpp needs a toolchain w/ C++, wchar, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + BR2_STATIC_LIBS config BR2_PACKAGE_ZXING_CPP bool "zxing-cpp" depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_STB select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 From yann.morin.1998 at free.fr Sun Feb 12 20:27:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:27:42 +0100 Subject: [Buildroot] [git commit] package/zxing-cpp: update homepage Message-ID: <20230212202900.E190185789@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6dbf3909dd4816230001f0d71dd31d9e96939083 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 456a7398316655ad0b669635f580e4887c24a700 decided to switch to an active fork but forgot to update homepage in Config.in Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zxing-cpp/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 6c17565d2a..2550dcf023 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_ZXING_CPP implemented in Java, with ports to other languages. This compiles the C++ port. - https://github.com/glassechidna/zxing-cpp + https://github.com/zxing-cpp/zxing-cpp From yann.morin.1998 at free.fr Sun Feb 12 20:29:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:29:19 +0100 Subject: [Buildroot] [PATCH 2/2] package/zxing-cpp: needs wchar In-Reply-To: <20230212150920.1213398-2-fontaine.fabrice@gmail.com> References: <20230212150920.1213398-1-fontaine.fabrice@gmail.com> <20230212150920.1213398-2-fontaine.fabrice@gmail.com> Message-ID: <20230212202919.GQ2796@scaer> Fabrice, All, On 2023-02-12 16:09 +0100, Fabrice Fontaine spake thusly: > wchar is mandatory since switch to an active fork in commit > 456a7398316655ad0b669635f580e4887c24a700: > > In file included from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Result.h:12, > from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/GTIN.cpp:9: > /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Content.h:40:14: error: 'wstring' in namespace 'std' does not name a type > 40 | std::wstring render(bool withECI) const; > | ^~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/4f97f1b291a99218f4706fce8b2934bd845755e1 > > Signed-off-by: Fabrice Fontaine Both patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gstreamer1/gst1-plugins-bad/Config.in | 6 ++++-- > package/zxing-cpp/Config.in | 6 ++++-- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in > index d477924eec..d2ef450d74 100644 > --- a/package/gstreamer1/gst1-plugins-bad/Config.in > +++ b/package/gstreamer1/gst1-plugins-bad/Config.in > @@ -741,11 +741,13 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" > config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING > bool "zxing" > depends on !BR2_STATIC_LIBS # zxing-cpp > + depends on BR2_USE_WCHAR # zxing-cpp > depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp > select BR2_PACKAGE_ZXING_CPP > > -comment "zxing plugin needs a toolchain w/ C++, dynamic library" > - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP > +comment "zxing plugin needs a toolchain w/ C++, wchar, dynamic library" > + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ > + !BR2_INSTALL_LIBSTDCPP > > endif > > diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in > index 2550dcf023..0d8b79538d 100644 > --- a/package/zxing-cpp/Config.in > +++ b/package/zxing-cpp/Config.in > @@ -1,9 +1,11 @@ > -comment "zxing-cpp needs a toolchain w/ C++, dynamic library" > - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS > +comment "zxing-cpp needs a toolchain w/ C++, wchar, dynamic library" > + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ > + BR2_STATIC_LIBS > > config BR2_PACKAGE_ZXING_CPP > bool "zxing-cpp" > depends on !BR2_STATIC_LIBS > + depends on BR2_USE_WCHAR > depends on BR2_INSTALL_LIBSTDCPP > select BR2_PACKAGE_STB > select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 > -- > 2.39.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 Feb 12 20:30:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:30:05 +0100 Subject: [Buildroot] [git commit] package/opencv3: bump to version 3.4.19 Message-ID: <20230212203017.B856E857B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d40cab45e21cd1c66bfffa911b1310e29c321486 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure with gcc >= 12: /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp: In function 'bool base64::base64_valid(const uint8_t*, size_t, size_t)': /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp:167:31: error: comparing the result of pointer addition '(src + ((sizetype)off))' and NULL [-Werror=address] 167 | if (src == 0 || src + off == 0) | ~~~~~~~~~~^~~~ cc1plus: some warnings being treated as errors Update hash of LICENSE file (update in year: https://github.com/opencv/opencv/commit/f6fe5c07f61eb0bc934672200b2bfd453f2fc41d) https://github.com/opencv/opencv/wiki/ChangeLog#version3419 Fixes: - http://autobuild.buildroot.org/results/cb9c120c15c8042e6919858d6885c1cc4d996c0c Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/opencv3/opencv3.hash | 4 ++-- package/opencv3/opencv3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash index 30308188aa..3d6fd2ed8a 100644 --- a/package/opencv3/opencv3.hash +++ b/package/opencv3/opencv3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1353eec67849aadb20df71d8bae18b83708e18fc5da080fe5efeabb1e99b2ee8 opencv3-3.4.17.tar.gz -sha256 9076d3d934839a2f8e7bfe549abda6faea4751f1edd6e9460ff703559890ad5f LICENSE +sha256 9b913e74299ce4416a5c94000da577c592bf670fd53bad16220eb115a0821529 opencv3-3.4.19.tar.gz +sha256 c1fed9cd2f557ba23a1b37a21e2c90629d1a60bdb61e92d0e79369bb6fca3390 LICENSE diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 8e4c90786e..29fb246e65 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV3_VERSION = 3.4.17 +OPENCV3_VERSION = 3.4.19 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause From yann.morin.1998 at free.fr Sun Feb 12 20:30:29 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:30:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv3: bump to version 3.4.19 In-Reply-To: <20230212145312.1203134-1-fontaine.fabrice@gmail.com> References: <20230212145312.1203134-1-fontaine.fabrice@gmail.com> Message-ID: <20230212203029.GR2796@scaer> Fabrice, All, On 2023-02-12 15:53 +0100, Fabrice Fontaine spake thusly: > This bump will fix the following build failure with gcc >= 12: > > /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp: In function 'bool base64::base64_valid(const uint8_t*, size_t, size_t)': > /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp:167:31: error: comparing the result of pointer addition '(src + ((sizetype)off))' and NULL [-Werror=address] > 167 | if (src == 0 || src + off == 0) > | ~~~~~~~~~~^~~~ > cc1plus: some warnings being treated as errors > > Update hash of LICENSE file (update in year: > https://github.com/opencv/opencv/commit/f6fe5c07f61eb0bc934672200b2bfd453f2fc41d) > > https://github.com/opencv/opencv/wiki/ChangeLog#version3419 > > Fixes: > - http://autobuild.buildroot.org/results/cb9c120c15c8042e6919858d6885c1cc4d996c0c > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/opencv3/opencv3.hash | 4 ++-- > package/opencv3/opencv3.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash > index 30308188aa..3d6fd2ed8a 100644 > --- a/package/opencv3/opencv3.hash > +++ b/package/opencv3/opencv3.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 1353eec67849aadb20df71d8bae18b83708e18fc5da080fe5efeabb1e99b2ee8 opencv3-3.4.17.tar.gz > -sha256 9076d3d934839a2f8e7bfe549abda6faea4751f1edd6e9460ff703559890ad5f LICENSE > +sha256 9b913e74299ce4416a5c94000da577c592bf670fd53bad16220eb115a0821529 opencv3-3.4.19.tar.gz > +sha256 c1fed9cd2f557ba23a1b37a21e2c90629d1a60bdb61e92d0e79369bb6fca3390 LICENSE > diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk > index 8e4c90786e..29fb246e65 100644 > --- a/package/opencv3/opencv3.mk > +++ b/package/opencv3/opencv3.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -OPENCV3_VERSION = 3.4.17 > +OPENCV3_VERSION = 3.4.19 > OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) > OPENCV3_INSTALL_STAGING = YES > OPENCV3_LICENSE = BSD-3-Clause > -- > 2.39.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 Feb 12 20:34:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:34:09 +0100 Subject: [Buildroot] [git commit] package/libsolv: drop unrecognized variables Message-ID: <20230212203453.3E91185AAB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4706e04e3ca7428c755bffd79ddf8ef8628141e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop unrecognized variables: CMake Warning: Manually-specified variables were not used by the project: BUILD_DOC BUILD_DOCS BUILD_EXAMPLE BUILD_EXAMPLES BUILD_TEST BUILD_TESTING BUILD_TESTS CMAKE_CXX_COMPILER_FORCED DISABLE_STATIC ENABLE_SHARED Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsolv/libsolv.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 29f8a6a3d2..04fdb387fd 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -11,16 +11,15 @@ LIBSOLV_LICENSE_FILES = LICENSE.BSD LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib -LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON else -LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=OFF endif ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=OFF else LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON endif From yann.morin.1998 at free.fr Sun Feb 12 20:34:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:34:14 +0100 Subject: [Buildroot] [git commit] package/libsolv: fix build without C++ Message-ID: <20230212203453.4A88785AAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=add76a41c3c68e649ecae69aa896d5f8b627d1be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without C++ raised since the addition ot the package in commit 93ce3c1be0753189d6af3ee9968b935037519c25: CMake Error at CMakeLists.txt:1 (PROJECT): No CMAKE_CXX_COMPILER could be found. Tell CMake where to find the compiler by setting either the environment variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path to the compiler, or to the compiler name if it is in the PATH. Fixes: - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsolv/0001-Fix-build-without-C.patch | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/package/libsolv/0001-Fix-build-without-C.patch b/package/libsolv/0001-Fix-build-without-C.patch new file mode 100644 index 0000000000..2389aebcde --- /dev/null +++ b/package/libsolv/0001-Fix-build-without-C.patch @@ -0,0 +1,49 @@ +From 5691f58d1f8ce1332b02536e48f1ac5864629c6c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 12 Feb 2023 15:27:27 +0100 +Subject: [PATCH] Fix build without C++ + +Fix the following build failure without C++: + +CMake Error at CMakeLists.txt:1 (PROJECT): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Fixes: + - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/openSUSE/libsolv/pull/520] +--- + CMakeLists.txt | 2 +- + ext/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3541f496..f899c49a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-PROJECT (libsolv) ++PROJECT (libsolv C) + + CMAKE_MINIMUM_REQUIRED (VERSION 2.8.5) + +diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt +index f01c0238..589fa946 100644 +--- a/ext/CMakeLists.txt ++++ b/ext/CMakeLists.txt +@@ -103,6 +103,7 @@ IF (ENABLE_CUDFREPO) + ENDIF (ENABLE_CUDFREPO) + + IF (ENABLE_HAIKU) ++ enable_language(CXX) + SET (libsolvext_SRCS ${libsolvext_SRCS} + repo_haiku.cpp) + SET (libsolvext_HEADERS ${libsolvext_HEADERS} +-- +2.39.0 + From yann.morin.1998 at free.fr Sun Feb 12 20:35:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:35:16 +0100 Subject: [Buildroot] [PATCH 1/2] package/libsolv: drop unrecognized variables In-Reply-To: <20230212144316.1181860-1-fontaine.fabrice@gmail.com> References: <20230212144316.1181860-1-fontaine.fabrice@gmail.com> Message-ID: <20230212203516.GS2796@scaer> Fabrice, All, On 2023-02-12 15:43 +0100, Fabrice Fontaine spake thusly: > Drop unrecognized variables: > > CMake Warning: > Manually-specified variables were not used by the project: > > BUILD_DOC > BUILD_DOCS > BUILD_EXAMPLE > BUILD_EXAMPLES > BUILD_TEST > BUILD_TESTING > BUILD_TESTS > CMAKE_CXX_COMPILER_FORCED > DISABLE_STATIC > ENABLE_SHARED > > Signed-off-by: Fabrice Fontaine Both patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libsolv/libsolv.mk | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk > index 29f8a6a3d2..04fdb387fd 100644 > --- a/package/libsolv/libsolv.mk > +++ b/package/libsolv/libsolv.mk > @@ -11,16 +11,15 @@ LIBSOLV_LICENSE_FILES = LICENSE.BSD > LIBSOLV_CPE_ID_VENDOR = opensuse > LIBSOLV_INSTALL_STAGING = YES > LIBSOLV_DEPENDENCIES = zlib > -LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON > > ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) > LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON > else > -LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON > +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=OFF > endif > > ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) > -LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON > +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=OFF > else > LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON > endif > -- > 2.39.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 Feb 12 20:37:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:37:48 +0100 Subject: [Buildroot] [git commit] package/zabbix: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230212203805.19BAF85AB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=895686180fa73a23f2e4e9ee374618fa259a79ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master zabbix uses custom --enable-{static,shared} options, instead of standard libtool directives resulting in the following build failure with openssl or libcurl: configure:13132: /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib conftest.c -lssl -lcrypto -lm >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): in function `dlfcn_globallookup': dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): in function `BIO_lookup_ex': b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): in function `BIO_gethostbyname': b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /tmp/cceWHjDi.o: in function `main': conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' [...] configure: error: OpenSSL library libssl or libcrypto not found Signed-off-by: Yann E. MORIN --- package/zabbix/zabbix.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index adc54028ad..e00d693ba5 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -125,6 +125,13 @@ endif endif # BR2_PACKAGE_ZABBIX_SERVER +# zabbix uses custom --enable-{static,shared} options, instead of +# standard libtool directives resulting in a build failure with libcurl +# or openssl. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ZABBIX_CONF_OPTS += --disable-static +endif + define ZABBIX_INSTALL_INIT_SYSTEMD $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ From yann.morin.1998 at free.fr Sun Feb 12 20:38:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:38:46 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/zabbix: fix BR2_SHARED_STATIC_LIBS In-Reply-To: <20230212124421.17787-1-fontaine.fabrice@gmail.com> References: <20230212124421.17787-1-fontaine.fabrice@gmail.com> Message-ID: <20230212203846.GT2796@scaer> Fabrice, All, On 2023-02-12 13:44 +0100, Fabrice Fontaine spake thusly: > zabbix uses custom --enable-{static,shared} options, instead of standard > libtool directives resulting in the following build failure with openssl > or libcurl: > > configure:13132: /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib conftest.c -lssl -lcrypto -lm >&5 > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): in function `dlfcn_globallookup': > dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): in function `BIO_lookup_ex': > b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): in function `BIO_gethostbyname': > b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /tmp/cceWHjDi.o: in function `main': > conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' > > [...] > > configure: error: OpenSSL library libssl or libcrypto not found > > --- > > configure:15199: checking for main in -lz > configure:15219: /home/autobuild/autobuild/instance-13/output-1/host/bin/s390x-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -I/home/autobuild/autobuild/instance-13/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-13/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib conftest.c -lz -lm >&5 > /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/10.3.0/../../../../s390x-buildroot-linux-gnu/bin/ld: cannot find -lz > collect2: error: ld returned 1 exit status > > [...] > > configure: error: static library z required for linking libcurl not found > > Fixes: > - http://autobuild.buildroot.org/results/c05230d13fa0538323bb77e8f35533e6dd02453f > - http://autobuild.buildroot.org/results/cc947038510e16417298b381521f226f7c45f986 > > Signed-off-by: Fabrice Fontaine Let's not have a repeat of the previous iteration. So: applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Update commit log and comment > > package/zabbix/zabbix.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk > index 23172a358d..06d12dbef4 100644 > --- a/package/zabbix/zabbix.mk > +++ b/package/zabbix/zabbix.mk > @@ -125,6 +125,13 @@ endif > > endif # BR2_PACKAGE_ZABBIX_SERVER > > +# zabbix uses custom --enable-{static,shared} options, instead of > +# standard libtool directives resulting in a build failure with libcurl > +# or openssl. > +ifeq ($(BR2_SHARED_STATIC_LIBS),y) > +ZABBIX_CONF_OPTS += --disable-static > +endif > + > define ZABBIX_INSTALL_INIT_SYSTEMD > $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ > $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ > -- > 2.39.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 Feb 12 20:46:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:46:22 +0100 Subject: [Buildroot] [git commit] package/python-magic-wormhole-mailbox-server: add missing reverse dependency on host-rustc Message-ID: <20230212204700.B784885AD9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0c933adab99e1767bb673610b69de5eedf42c5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As reported by Yann in [1], Kconfig warns about an unmet dependency. The issue can be reproduced on master branch at commit 451672e, with the command: KCONFIG_SEED=0x1D15B9D4 make randconfig The patch adds the missing dependency. Fixes: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_AUTOBAHN Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER [=y] && BR2_PACKAGE_PYTHON3 [=y] [1] https://lists.buildroot.org/pipermail/buildroot/2023-February/661898.html Cc: Yann E. MORIN Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/python-magic-wormhole-mailbox-server/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in index db20d3e7b6..a0721e866f 100644 --- a/package/python-magic-wormhole-mailbox-server/Config.in +++ b/package/python-magic-wormhole-mailbox-server/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER bool "python-magic-wormhole-mailbox-server" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime From yann.morin.1998 at free.fr Sun Feb 12 20:47:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:47:13 +0100 Subject: [Buildroot] [PATCH] package/python-magic-wormhole-mailbox-server: add missing reverse dependency on host-rustc In-Reply-To: <20230212095424.1326531-1-yann.morin.1998@free.fr> References: <20230212095424.1326531-1-yann.morin.1998@free.fr> Message-ID: <20230212204713.GU2796@scaer> Julien, All, On 2023-02-12 10:54 +0100, Yann E. MORIN spake thusly: > From: Julien Olivain > > As reported by Yann in [1], Kconfig warns about an unmet dependency. > > The issue can be reproduced on master branch at commit 451672e, > with the command: > > KCONFIG_SEED=0x1D15B9D4 make randconfig > > The patch adds the missing dependency. > > Fixes: > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_AUTOBAHN > Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] > Selected by [y]: > - BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER [=y] && BR2_PACKAGE_PYTHON3 [=y] > > [1] https://lists.buildroot.org/pipermail/buildroot/2023-February/661898.html > > Cc: Yann E. MORIN > Signed-off-by: Julien Olivain > Signed-off-by: Yann E. MORIN Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-magic-wormhole-mailbox-server/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in > index db20d3e7b6..a0721e866f 100644 > --- a/package/python-magic-wormhole-mailbox-server/Config.in > +++ b/package/python-magic-wormhole-mailbox-server/Config.in > @@ -1,5 +1,6 @@ > config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER > bool "python-magic-wormhole-mailbox-server" > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography > select BR2_PACKAGE_PYTHON3_SQLITE # runtime > select BR2_PACKAGE_PYTHON_ATTRS # runtime > select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime > -- > 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 Feb 12 20:48:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:48:36 +0100 Subject: [Buildroot] [git commit] package/rtl8723ds: bump to 2023-02-11 version with new license file Message-ID: <20230212204849.EA29D85B02@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27f38e175346c09eed003e95daa0f065b43e27e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A COPYING file has been added to rtl8723ds as of the most recent commit. Update the version of the package and add the license file hash. Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/rtl8723ds/rtl8723ds.hash | 3 ++- package/rtl8723ds/rtl8723ds.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index d5abf9913c..e94a7b40ef 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 97f3ebc5d977ba35d10c9c06e6817e4a00458727b651b56fc00c207c05a61995 rtl8723ds-a638cc8639015b8b9390af3350fab0366b6c87e7.tar.gz +sha256 672787c3f3d1f795b750cd74de8ca34bb661b8ae60f5aa50fb279ec08ff3f05f rtl8723ds-ec85dc6b9f72bfe413bff464ed01a272e29c8dbe.tar.gz +sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 COPYING diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index f303a24041..1bb164fa86 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,9 +4,10 @@ # ################################################################################ -RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 +RTL8723DS_VERSION = ec85dc6b9f72bfe413bff464ed01a272e29c8dbe RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 +RTL8723DS_LICENSE_FILES = COPYING RTL8723DS_USER_EXTRA_CLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ From yann.morin.1998 at free.fr Sun Feb 12 20:49:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:49:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl8723ds: bump to 2023-02-11 version with new license file In-Reply-To: <20230212014216.6293-1-christian@paral.in> References: <20230212014216.6293-1-christian@paral.in> Message-ID: <20230212204900.GV2796@scaer> Christian, All, On 2023-02-11 17:42 -0800, Christian Stewart via buildroot spake thusly: > A COPYING file has been added to rtl8723ds as of the most recent commit. > > Update the version of the package and add the license file hash. > > Signed-off-by: Christian Stewart Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/rtl8723ds/rtl8723ds.hash | 3 ++- > package/rtl8723ds/rtl8723ds.mk | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash > index d5abf9913c..e94a7b40ef 100644 > --- a/package/rtl8723ds/rtl8723ds.hash > +++ b/package/rtl8723ds/rtl8723ds.hash > @@ -1,2 +1,3 @@ > # Locally computed > -sha256 97f3ebc5d977ba35d10c9c06e6817e4a00458727b651b56fc00c207c05a61995 rtl8723ds-a638cc8639015b8b9390af3350fab0366b6c87e7.tar.gz > +sha256 672787c3f3d1f795b750cd74de8ca34bb661b8ae60f5aa50fb279ec08ff3f05f rtl8723ds-ec85dc6b9f72bfe413bff464ed01a272e29c8dbe.tar.gz > +sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 COPYING > diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk > index f303a24041..1bb164fa86 100644 > --- a/package/rtl8723ds/rtl8723ds.mk > +++ b/package/rtl8723ds/rtl8723ds.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 > +RTL8723DS_VERSION = ec85dc6b9f72bfe413bff464ed01a272e29c8dbe > RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) > RTL8723DS_LICENSE = GPL-2.0 > +RTL8723DS_LICENSE_FILES = COPYING > > RTL8723DS_USER_EXTRA_CLAGS = \ > -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ > -- > 2.39.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 Feb 12 20:49:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:49:52 +0100 Subject: [Buildroot] [PATCH 1/1] board/visionfive2: add link to documentation In-Reply-To: <20230211224755.13044-1-francois.dugast.foss@gmail.com> References: <20230211224755.13044-1-francois.dugast.foss@gmail.com> Message-ID: <20230212204952.GW2796@scaer> Fran?ois, All, On 2023-02-11 23:47 +0100, Francois Dugast spake thusly: > Add a link to RVspace Documentation Center, which did not exist > when readme.txt was first submitted. It provides datasheet, quick > start, schematics, and so on. > > Signed-off-by: Francois Dugast Applied to master, thanks. Regards, Yann E. MORIN. > --- > board/visionfive2/readme.txt | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt > index 2da98f3847..1924cbc12b 100644 > --- a/board/visionfive2/readme.txt > +++ b/board/visionfive2/readme.txt > @@ -4,6 +4,8 @@ Starfive VisionFive2 > The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a > Starfive JH7110 processor. > > +https://doc-en.rvspace.org/Doc_Center/visionfive_2.html > + > How to build > ============ > > -- > 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 yann.morin.1998 at free.fr Sun Feb 12 20:49:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:49:09 +0100 Subject: [Buildroot] [git commit] board/visionfive2: add link to documentation Message-ID: <20230212205037.0B3D685B14@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f48b3983cdb32dfcd59e7e549c8eaa1503fe342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a link to RVspace Documentation Center, which did not exist when readme.txt was first submitted. It provides datasheet, quick start, schematics, and so on. Signed-off-by: Francois Dugast Signed-off-by: Yann E. MORIN --- board/visionfive2/readme.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt index 2da98f3847..1924cbc12b 100644 --- a/board/visionfive2/readme.txt +++ b/board/visionfive2/readme.txt @@ -4,6 +4,8 @@ Starfive VisionFive2 The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a Starfive JH7110 processor. +https://doc-en.rvspace.org/Doc_Center/visionfive_2.html + How to build ============ From giulio.benetti at benettiengineering.com Sun Feb 12 20:53:34 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 12 Feb 2023 21:53:34 +0100 Subject: [Buildroot] [PATCH] package/cryptsetup: bump version to 2.6.1 Message-ID: <20230212205334.990478-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 149d1e71f1..87cdf840c3 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc -sha256 44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735 cryptsetup-2.6.0.tar.xz +sha256 410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 cryptsetup-2.6.1.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 659fdfa2a4..3f3034475f 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.6 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ -- 2.34.1 From yann.morin.1998 at free.fr Sun Feb 12 20:53:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:53:55 +0100 Subject: [Buildroot] [git commit] package/x11r7/xapp_beforelight: bump version to 1.0.6 Message-ID: <20230212205429.5EF1785B5E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa93d0cdd7adf1051cdb1643e978c81ae183327c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003317.html The license file was previously a stub, but it now contains the proper license text since upstream commit: https://gitlab.freedesktop.org/xorg/app/beforelight/-/commit/fa1e473dd64673a36a73a01a84a8db61eaa425dc Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls [yann.morin.1998 at free.fr: properly explain the license hash change] Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_beforelight/xapp_beforelight.hash | 7 ++++--- package/x11r7/xapp_beforelight/xapp_beforelight.mk | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.hash b/package/x11r7/xapp_beforelight/xapp_beforelight.hash index 00aff75779..f5b0cb21a4 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.hash +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002131.html -sha256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 beforelight-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-January/003317.html +sha256 53f0bf085b7272ebbf626d1b9b0ad320d1a07bc1fe7f3ae260c86a71a857ad28 beforelight-1.0.6.tar.xz +sha512 48a165d151676f6d213883bee98b34007403a77e025253c8649f9a0f5ea258b09381ab523a5e906030ac9fc8245fce2c6beaf9ad0f81116e302d51ad4a0fad5a beforelight-1.0.6.tar.xz # Locally computed -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING +sha256 3909739fae1ee37c3c7167a91f53d29317965aaf932813e16ef733f033619a7b COPYING diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk index 7dcb715ef3..6b753833f7 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_BEFORELIGHT_VERSION = 1.0.5 -XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2 -XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_BEFORELIGHT_VERSION = 1.0.6 +XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.xz +XAPP_BEFORELIGHT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_BEFORELIGHT_LICENSE = MIT XAPP_BEFORELIGHT_LICENSE_FILES = COPYING XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt From yann.morin.1998 at free.fr Sun Feb 12 20:55:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:55:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xapp_beforelight: bump version to 1.0.6 In-Reply-To: <20230211183715.432384-1-bernd.kuhls@t-online.de> References: <20230211183715.432384-1-bernd.kuhls@t-online.de> Message-ID: <20230212205530.GX2796@scaer> Bernd, All, On 2023-02-11 19:37 +0100, Bernd Kuhls spake thusly: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-January/003317.html > > Updated license hash due to upstream commit: > https://gitlab.freedesktop.org/xorg/app/beforelight/-/commit/fa1e473dd64673a36a73a01a84a8db61eaa425dc This is not enough to assess the change. We need to know what cahnged, so I expanded ojn that: The license file was previously a stub, but it now contains the proper license text since upstream commit: Applied to master, thanks. Regards, Yann E. MORIN. > Switched tarball to xz, updated _SITE. > > Signed-off-by: Bernd Kuhls > --- > package/x11r7/xapp_beforelight/xapp_beforelight.hash | 7 ++++--- > package/x11r7/xapp_beforelight/xapp_beforelight.mk | 6 +++--- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.hash b/package/x11r7/xapp_beforelight/xapp_beforelight.hash > index 00aff75779..f5b0cb21a4 100644 > --- a/package/x11r7/xapp_beforelight/xapp_beforelight.hash > +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.hash > @@ -1,4 +1,5 @@ > -# From http://lists.x.org/archives/xorg-announce/2013-January/002131.html > -sha256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 beforelight-1.0.5.tar.bz2 > +# From https://lists.x.org/archives/xorg-announce/2023-January/003317.html > +sha256 53f0bf085b7272ebbf626d1b9b0ad320d1a07bc1fe7f3ae260c86a71a857ad28 beforelight-1.0.6.tar.xz > +sha512 48a165d151676f6d213883bee98b34007403a77e025253c8649f9a0f5ea258b09381ab523a5e906030ac9fc8245fce2c6beaf9ad0f81116e302d51ad4a0fad5a beforelight-1.0.6.tar.xz > # Locally computed > -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING > +sha256 3909739fae1ee37c3c7167a91f53d29317965aaf932813e16ef733f033619a7b COPYING > diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk > index 7dcb715ef3..6b753833f7 100644 > --- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk > +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -XAPP_BEFORELIGHT_VERSION = 1.0.5 > -XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2 > -XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app > +XAPP_BEFORELIGHT_VERSION = 1.0.6 > +XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.xz > +XAPP_BEFORELIGHT_SITE = https://xorg.freedesktop.org/archive/individual/app > XAPP_BEFORELIGHT_LICENSE = MIT > XAPP_BEFORELIGHT_LICENSE_FILES = COPYING > XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt > -- > 2.39.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 mr.bossman075 at gmail.com Sun Feb 12 20:59:45 2023 From: mr.bossman075 at gmail.com (Jesse Taube) Date: Sun, 12 Feb 2023 15:59:45 -0500 Subject: [Buildroot] [PATCH v2 0/4] Add RISC-V 32 NOMMU support In-Reply-To: <20221217051337.3778405-1-Mr.Bossman075@gmail.com> References: <20221217051337.3778405-1-Mr.Bossman075@gmail.com> Message-ID: Any updates on this set? On 12/17/22 00:13, Jesse Taube wrote: > This patch-set aims to add NOMMU support to RV32. > Many people want to build simple emulators or HDL > models of RISC-V this patch makes it posible to > run linux on them. > > Yimin Gu is the original author of this set. > Submitted here: > https://lists.buildroot.org/pipermail/buildroot/2022-November/656134.html > > Though Jesse T made the configs more concise. > Aswell fixed the 1k line Dconf, > and split into 3 distinct patches. > > A couple things to note: > - UcLibc seems to want __ARCH_WANT_TIME32_SYSCALLS > for adjtimex, but Linux doesnt provide this for RV32. > - Patch 2 adds __ARCH_WANT_STAT64, > but I'm not sure if this is needed. > - Busybox doesnt build umask or unset for NOMMU systems. > I have seen this happen on STM32 aswell as I.MXRT > > [__ARCH_WANT_TIME32_SYSCALLS]: > https://patchwork.kernel.org/project/linux-arm-kernel/patch/20190218210712.3503891-5-arnd at arndb.de/ > > Jesse Taube (1): > configs/qemu_riscv32_nommu_virt_defconfig: New defconfig > > Yimin Gu (3): > package/elf2flt: add RISC-V 32-bits support > package/uclibc: Add RISC-V 32-bit support > arch: Enable support for RISC-V 32-bit NOMMU > > arch/Config.in.riscv | 2 - > board/qemu/riscv32-virt/nommu/defconfig | 16 ++ > .../riscv32-virt/nommu/patches/linux-headers | 1 + > ...nfig-Allow-RV32-to-build-with-no-MMU.patch | 43 ++++++ > ...le-stat64-and-time32-for-RV32-uclibc.patch | 40 +++++ > board/qemu/riscv32-virt/readme.txt | 6 +- > configs/qemu_riscv32_nommu_virt_defconfig | 31 ++++ > package/Makefile.in | 4 +- > .../0007-Added-RISC-V-32-bit-support.patch | 87 +++++++++++ > .../uclibc/0001-RISC-V-32-bit-support.patch | 145 ++++++++++++++++++ > package/uclibc/Config.in | 2 + > 11 files changed, 372 insertions(+), 5 deletions(-) > create mode 100644 board/qemu/riscv32-virt/nommu/defconfig > create mode 120000 board/qemu/riscv32-virt/nommu/patches/linux-headers > create mode 100644 board/qemu/riscv32-virt/nommu/patches/linux/6.0/0001-riscv-Kconfig-Allow-RV32-to-build-with-no-MMU.patch > create mode 100644 board/qemu/riscv32-virt/nommu/patches/linux/6.0/0002-riscv-Enable-stat64-and-time32-for-RV32-uclibc.patch > create mode 100644 configs/qemu_riscv32_nommu_virt_defconfig > create mode 100644 package/elf2flt/0007-Added-RISC-V-32-bit-support.patch > create mode 100644 package/uclibc/0001-RISC-V-32-bit-support.patch > From yann.morin.1998 at free.fr Sun Feb 12 21:06:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 22:06:38 +0100 Subject: [Buildroot] [git commit] package/cryptsetup: bump version to 2.6.1 Message-ID: <20230212210654.0E25F85B9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=888ac96e55c0c53bf5ada2f3f6d58e9e1179d91b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 149d1e71f1..87cdf840c3 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc -sha256 44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735 cryptsetup-2.6.0.tar.xz +sha256 410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 cryptsetup-2.6.1.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 659fdfa2a4..3f3034475f 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.6 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From yann.morin.1998 at free.fr Sun Feb 12 21:07:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 22:07:05 +0100 Subject: [Buildroot] [PATCH] package/cryptsetup: bump version to 2.6.1 In-Reply-To: <20230212205334.990478-1-giulio.benetti@benettiengineering.com> References: <20230212205334.990478-1-giulio.benetti@benettiengineering.com> Message-ID: <20230212210705.GY2796@scaer> Giulio, All, On 2023-02-12 21:53 +0100, Giulio Benetti spake thusly: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/cryptsetup/cryptsetup.hash | 2 +- > package/cryptsetup/cryptsetup.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash > index 149d1e71f1..87cdf840c3 100644 > --- a/package/cryptsetup/cryptsetup.hash > +++ b/package/cryptsetup/cryptsetup.hash > @@ -1,4 +1,4 @@ > # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc > -sha256 44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735 cryptsetup-2.6.0.tar.xz > +sha256 410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 cryptsetup-2.6.1.tar.xz > sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING > sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL > diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk > index 659fdfa2a4..3f3034475f 100644 > --- a/package/cryptsetup/cryptsetup.mk > +++ b/package/cryptsetup/cryptsetup.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > CRYPTSETUP_VERSION_MAJOR = 2.6 > -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 > +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 > CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz > CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) > CRYPTSETUP_DEPENDENCIES = \ > -- > 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 Feb 12 21:08:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 22:08:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xapp_xvidtune: bump version to 1.0.4 In-Reply-To: <20230211182838.272469-1-bernd.kuhls@t-online.de> References: <20230211182838.272469-1-bernd.kuhls@t-online.de> Message-ID: <20230212210804.GZ2796@scaer> Bernd, All, On 2023-02-11 19:28 +0100, Bernd Kuhls spake thusly: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003319.html > > Switched tarball to xz, updated _SITE. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/x11r7/xapp_xvidtune/xapp_xvidtune.hash | 5 +++-- > package/x11r7/xapp_xvidtune/xapp_xvidtune.mk | 6 +++--- > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash > index ecf7d0330b..0e7e231383 100644 > --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash > +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash > @@ -1,4 +1,5 @@ > -# From http://lists.x.org/archives/xorg-announce/2013-January/002129.html > -sha256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 xvidtune-1.0.3.tar.bz2 > +# From https://lists.x.org/archives/xorg-announce/2023-February/003319.html > +sha256 0d4eecd54e440cc11f1bdaaa23180fcf890f003444343f533f639086b05b2cc5 xvidtune-1.0.4.tar.xz > +sha512 747d5358f4f7d3d7db508c3f034711ce4b9dd278160d35312e9c4d1604623e84a2438d039b536546fd2df7db8c5ea1907e8a6101985fad2932b6dee5a62c7b80 xvidtune-1.0.4.tar.xz > # Locally computed > sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING > diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk > index d7c4d5bf56..cc40d39098 100644 > --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk > +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -XAPP_XVIDTUNE_VERSION = 1.0.3 > -XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2 > -XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app > +XAPP_XVIDTUNE_VERSION = 1.0.4 > +XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.xz > +XAPP_XVIDTUNE_SITE = https://xorg.freedesktop.org/archive/individual/app > XAPP_XVIDTUNE_LICENSE = MIT > XAPP_XVIDTUNE_LICENSE_FILES = COPYING > XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm > -- > 2.39.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 Feb 12 21:07:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 22:07:18 +0100 Subject: [Buildroot] [git commit] package/x11r7/xapp_xvidtune: bump version to 1.0.4 Message-ID: <20230212210843.C4F5C85C54@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89710c804ede6879db45c8e41aca3607bd2bb051 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003319.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xvidtune/xapp_xvidtune.hash | 5 +++-- package/x11r7/xapp_xvidtune/xapp_xvidtune.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash index ecf7d0330b..0e7e231383 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002129.html -sha256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 xvidtune-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003319.html +sha256 0d4eecd54e440cc11f1bdaaa23180fcf890f003444343f533f639086b05b2cc5 xvidtune-1.0.4.tar.xz +sha512 747d5358f4f7d3d7db508c3f034711ce4b9dd278160d35312e9c4d1604623e84a2438d039b536546fd2df7db8c5ea1907e8a6101985fad2932b6dee5a62c7b80 xvidtune-1.0.4.tar.xz # Locally computed sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk index d7c4d5bf56..cc40d39098 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XVIDTUNE_VERSION = 1.0.3 -XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2 -XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XVIDTUNE_VERSION = 1.0.4 +XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.xz +XAPP_XVIDTUNE_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XVIDTUNE_LICENSE = MIT XAPP_XVIDTUNE_LICENSE_FILES = COPYING XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm From bugzilla at busybox.net Mon Feb 13 00:43:08 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 13 Feb 2023 00:43:08 +0000 Subject: [Buildroot] [Bug 15306] glibc build fails in Docker container In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15306 --- Comment #2 from Russ --- Yann, Can you provide comprehensive instruction on how I can reproduce your success? I'm happy to see if I can reproduce in my environment, and if your setup works for me as well I'll look for what's different when building the reported target. I'm not super familiar with batocera nor buildroot, so it'd be hard for me to pare it down to a minimal example. -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Mon Feb 13 06:37:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 06:37:58 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-12 Message-ID: <20230213063806.4692660E07@smtp3.osuosl.org> Hello, Autobuild statistics for 2023-02-12 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 4 | 1 | 0 | 5 | 2022.11.x | 14 | 19 | 0 | 33 | master | 175 | 210 | 3 | 388 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 17 unknown | 13 gobject-introspection-1.72.0 | 12 host-go-1.19.5 | 8 zabbix-5.4.9 | 7 libsolv-0.7.22 | 6 package/postgresql/postgres... | 6 host-pahole-1.24 | 5 host-binutils-2.38 | 4 systemd-252.4 | 4 boost-1.80.0 | 3 busybox-1.36.0 | 3 elfutils-0.186 | 3 gerbera-1.10.0 | 3 gobject-introspection | 3 perl-5.36.0 | 3 python-numpy-1.23.5 | 3 uclibc-1.0.42 | 3 ace-7.0.6 | 2 ffmpeg-4.4.3 | 2 fontconfig-2.13.1 | 2 fs/ubifs/ubifs.mk:49: /home... | 2 glibc-2.36-81-g4f4d7a13edfd... | 2 google-breakpad-c85eb4a59b6... | 2 host-binutils-2.37 | 2 host-rust-1.67.0 | 2 libglib2-2.72.3 | 2 linux-5.10.162-cip24 | 2 linux-6.1.9 | 2 ntpsec-1_2_2 | 2 olsr-0.9.8 | 2 open-iscsi-2.1.8 | 2 pcre2-10.42 | 2 php-8.2.2 | 2 php-xdebug-3.0.4 | 2 pv-1.6.20 | 2 sdl-1.2.15 | 2 uclibc-ng-test-6790eafe897b... | 2 zxing-cpp-1.4.0 | 2 bat-0.19.0 | 1 bird-2.0.11 | 1 containerd-1.6.16 | 1 cryptopp-8.6.0 | 1 dash-0.5.11.5 | 1 dropbear-2022.83 | 1 dust-0.8.1 | 1 efivar-38 | 1 file-5.43 | 1 fluent-bit-2.0.8 | 1 frr-8.4.2 | 1 fs/axfs/axfs.mk:32: /home/a... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/f2fs/f2fs.mk:64: /home/a... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gdb-11.2 | 1 glibmm-2.68.2 | 1 gnu-efi-3.0.15 | 1 hawktracer-2ec19d7192334414... | 1 host-binutils-2.39 | 1 host-libarchive-3.6.2 | 1 hwloc-2.8.0 | 1 kmod-30 | 1 libcap-ng-0.8.3 | 1 libgcrypt-1.10.1 | 1 libgpg-error-1.46 | 1 libmdbx-0.11.13 | 1 libnss-3.87 | 1 libopenh264-2.3.1 | 1 lirc-tools-0.10.2 | 1 lttng-modules-2.13.7 | 1 micropython-1.19.1 | 1 modem-manager-1.20.4 | 1 mongodb-4.2.18 | 1 mutt-2.2.9 | 1 mxs-bootlets-10.12.01 | 1 ne10-1.2.1 | 1 ntp-4.2.8p15 | 1 opencv3-3.4.17 | 1 optee-client-3.19.0 | 1 package/multipath-tools/mul... | 1 pipewire-0.3.65 | 1 pixz-1.0.7 | 1 poke-2.4 | 1 proxychains-ng-4.16 | 1 python-bcrypt-4.0.1 | 1 python-cryptography-39.0.0 | 1 python-pyicu-2.10.2 | 1 quickjs-2021-03-27 | 1 sconeserver-8d1935919a20133... | 1 sudo-1.9.12p2 | 1 tcf-agent-1.7.0 | 1 traceroute-2.1.0 | 1 valgrind-3.19.0 | 1 vlc-3.0.18 | 1 weston-10.0.1 | 1 wtfutil-0.41.0 | 1 xenomai-3.0.10 | 1 xtables-addons-3.22 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/ed2b55c26ca3dbbff9e32482c82539d5789fd748 | powerpc64 | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/046c4d2ba9d2a87b7846d220cbf1438585315f1f | armeb | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/3f9cc08d7adec2c4200f27de96b3eac13eb1e773 | arm | bird-2.0.11 | NOK | http://autobuild.buildroot.net/results/cb64ad16b47aabd8f100c5cfac5034000a102f10 | arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/8da6765f2c502fe06cf75ae1ce030ac17066d136 | arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/b7080952b100c97f9142e37fa759d171c46c5a35 | arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/6989cbcd24c53dae3bbb806dfb23368f1a49833a | mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/77c4949ce8af0a1f7ab5ca6dec3bca4f56e25748 | ORPH mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/5804ea8a08ff56912aafb0e7bc329974c3394c92 | ORPH mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/befdfce9d795c4a8c91dedccab476f998bad131d | ORPH powerpc64le | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/c0736a85d8b23963e80412796ed2aa55abb481f2 | arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/a50869b6d979d1b9772a1ef6128ab24155920c23 | xtensa | dash-0.5.11.5 | NOK | http://autobuild.buildroot.net/results/cd7a8619859c4cb77180e65d23d9c1889f662377 | ORPH riscv64 | dropbear-2022.83 | NOK | http://autobuild.buildroot.net/results/be854e8af22ad7e16e617525385f069dc35139d9 | mipsel | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/c4d7ba13f45e4573fc7f6f4d9ad841713d0d4bde | ORPH mips64el | efivar-38 | NOK | http://autobuild.buildroot.net/results/d36361eee4a9f4ed0cfbffed8986320cf836f252 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/5172000db3e0bc4e701c8a6fd82486ca58ac6e6a | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/02d9e0f79953b6c7a04696d653de778e9b5b4d48 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/06e99bade389f5c5f4c5ce37a492f1908d3ce03e | ORPH armeb | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/84c78beca0bea9e9515c02737bed7b87986035af | armeb | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/5afe59ea9d1d3372f1aeb43cd4443cc145209fc7 | armeb | file-5.43 | NOK | http://autobuild.buildroot.net/results/b4451a1ed792f35ce3abec93c43acd539534875e | ORPH s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/fc3d42e9c22652ad45bef9134a3af302e38745e9 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/0c94978d08e7b867edc8adbbd7435b51137c6ec5 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/f1fe6ed228f6cb880dc5e0bf7af4050f9e412a25 | ORPH arc | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/bc4e8a8c639bdb5d90840ad758da1f5b2804c38e | powerpc64 | fs/axfs/axfs.mk:32: /home/a... | NOK | http://autobuild.buildroot.net/results/f595d6e38d59e3b3a222b4099b6594c72384c6a7 | powerpc64le | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/55274e1f07cb6bb6137e2a85c9f44741db9f0db1 | microblaze | fs/f2fs/f2fs.mk:64: /home/a... | NOK | http://autobuild.buildroot.net/results/c1ec6ebdf67bd180b8471629dee341374e38b842 | powerpc | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/4cf2247b662acc3d272f92d73f40f4e6cf84beb7 | or1k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/967bbd3504085a431b748e624974aeb76981b35e | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/497c9ba0aa2d68e112fe243994f1341206fa6f5a | x86_64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/db0fc67ae8d382677e681c6f1e0dd25a88cf9790 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/6d2f6d5be68055d42c58d05abd0e90e658d33f11 | x86_64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/4404030bdf30586739dba6a48db7ccbc977eb1e5 | powerpc64le | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/d71155f13cf41c2efa66f7bc27a070d86df8359f | powerpc64le | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/39f7fd1857adc8989f5d2ec49d85f34c39397bad | i586 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/a20848951a94051c353ea1a99c5f96135aa19af4 | m68k | gdb-11.2 | NOK | http://autobuild.buildroot.net/results/91c58b022279f14bc6b5a36cf85356f90f5dbcae | ORPH s390x | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/32cc9ab99206e23beca6723b4d4ff46a9e94d375 | mips | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/7ac99ea51c4fdefe6a401377477ccdb227ccd2a2 | mips | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/c260d76602544d334b6a914941205b55bd741dfa | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/46259b215cd63808823ddcdd0da8a891b1eb586a | powerpc64le | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/457c8594ded04f0141f81671a197078f52e9a62b | or1k | glibmm-2.68.2 | NOK | http://autobuild.buildroot.net/results/bfb2df1d0bb6d31d2c7139440fa7ab77a0784ab3 | mips64el | gnu-efi-3.0.15 | NOK | http://autobuild.buildroot.net/results/e89e622792ae8e283621babae7ec0d6344a06b65 | sh4aeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/aa608e788c318d940501d27d9b76dae04f446a9a | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/25e9759d0d521072bcdda6f58e35e71cd00df98f | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/532f20521c1468df8e65300f3913413b3e01024c | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/1ab9c64f1a21d6e933f4002629ae1829457a0b57 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/c2fc009007f84947dd7a1222cc2bb94d6f12db0f | aarch64_be | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/8054be537e46200baa4134aae76a0d485881a4be | powerpc | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ac9e283cd931b65ccd6e01b5ca3515de0a6f5ca0 | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/2fad86f853bcb5d89922b9156e8e1b375127dc8b | i686 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/be1ad29278707969c6587344158c5cb927318aa5 | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/63ba02214907185212738352cd3c8ab19757429c | arm | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/893e3035336d6551dd56a2f14375cd85224bea83 | or1k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ab066d913718f10b09dfca61d0e0452f7d6169f6 | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/cb07284246317dd8e5670c6280ec47c2d812dbbc | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6a26941cbb3ed4d51034a31a761c4fa07b660ed1 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/b57cc8fbbcd03bf54a17f116b8fbc26ccc92524c | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/3e91604caa35a4326b8a1aa5dd02c212a6348c3a | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/e79ec54e7f491d9a46c733e67e11c6ea7aff379b | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/6cfd3a18c347bba978dd706b042801c8b5d8279b | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/70f179937851cfef1d6fe4422d205f0583ab5b1c | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/b4dc0df0d76f15c055dab99d5c14639835661663 | i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2e8177f81f70141cac0dd8848fed4b79b616407f | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/83ce33a9eddafe33ecf16a5aa263147470e73c7e | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/b45bd4e5c5b9a4803fd19fd1b600944ead71d06f | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2a3dd39bb97ba1f3f17c8bec499f1480abfec691 | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/c9f75afdd60bfb6458d1d334e1ce73bc0f44bcd0 | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7df6bf0f0df223e2c0473be1294fb34c3e70e276 | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/555ecf9ac0f0317f206723e1a31b8820abc1821a | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/80adfb78aac8ad413033149cc08121cea1f4849d | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/6f17f1938d7c77bc65a9a01891a1536d53233d53 | ORPH mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/dbaee863009980833ec275629e7152944bea4909 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f8fe5d316c3c8f14e9caacf978679323d0efee62 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/38d2aa1f953f86289f234f8ce1c1b90cdbb45dee | ORPH mipsel | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/9f4892aabeb473f151d756871ed0a752f0f9be19 | i686 | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/42a8b0d394964b7936bebbd262e4eb10106358be | riscv32 | hawktracer-2ec19d7192334414... | NOK | http://autobuild.buildroot.net/results/c7a39f66713a0b48f447ccfb1a78bc9c4217b3db | i586 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/73e6238e6319242cb2b8ce244c05462681d840c7 | arm | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/2d3a7c99a6f041551bd5725c196e6fe9cb46a648 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/aff01af7c94f9be02a8bd303464a18fd880e98dc | sh4 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/48af4210fdd5a812317fd62e4f92f68352e6f512 | nios2 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6d6fb182e5a941788433383d0919fc23faa7b536 | armeb | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/8726c3be2c8fbb35fd4d4294ab26597987fb7a61 | arm | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/dda7c210fdc98fd50913f492c918003155378e31 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/98969774e1bdad95a7053470291a1720fab90263 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/8c3872b9fc6c865f3f4ea0fcdaac60ad07503945 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/9d4edc0113589987e8a28d6fc063afad2395a500 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/cfe1b18d623324ff43d20768af3a0c4977d7b557 | mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/3d05960400173a170e711fc9b1eee54754671ce7 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/d9ae290dce54378c8c45257b5e7c28649c8ee87e | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/c621f452f7915370fba07ddc0583f5744110c11a | powerpc64le | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/34ddb049899af197a0285b66703f6e2f93f726c3 | powerpc64le | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/cafe3331f9d67f43abd9b298af1ea1460ef3bf8c | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/e1737b25038a05d9e1e1f1a6c076adfed5f9c107 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/59119579f265fc55c9073c31d97f7ce8d85cf21b | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/88eac71725b21736632e68c05919340a7adefd29 | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/62bfa931076352b10bad12771a1f3ef8fc8db591 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/62172ecf8446347dbadd3d10c494c97958adeb54 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/9e0e773e2b053a392918e2e035e2187a64b0d55e | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/0138dc37f8cc827c88dc77722637634f03b225b6 | x86_64 | hwloc-2.8.0 | NOK | http://autobuild.buildroot.net/results/b0420f11c08bc9f6d6d43d25187e3cdba694b690 | xtensa | kmod-30 | NOK | http://autobuild.buildroot.net/results/9a46d2620453b9054f7af4e6328e67d727100405 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/fb24fd1eaa328804309d2e94b31eedeffa5e91d1 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/58cf10ff0f4c6db76547c10c4afb7c7b18ec6c22 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/2c0c696ce1c417bea1530dffb884c852898840ad | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/0ed8370c738fc93c38173d4ed948eeda75156c92 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/f8d5a62af1d1fea18534b2529075ca2b0746ef75 | ORPH sh4aeb | libmdbx-0.11.13 | NOK | http://autobuild.buildroot.net/results/f804e65712beb15b775f601c7999a90bfe5b4ea9 | i686 | libnss-3.87 | NOK | http://autobuild.buildroot.net/results/8a248bf6d9801e151c6ac830bc51fba1f208d7ec | mipsel | libopenh264-2.3.1 | NOK | http://autobuild.buildroot.net/results/715708ea5a5c61740c40cb2d005a60e0b05a1377 | or1k | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/5e3d201db6ec8fe13724f6ddabd20e2a582fd144 | m68k | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/7bb521af1a9f6f4c5aa360c1345d7b763d59ce2a | mips | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f | mips64 | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/840d71597afd165851cbbe12c81ef625d7e163c1 | powerpc64le | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/e6c1053e0823a07b0d0a81655640f1e41f5f60b7 | mips | libsolv-0.7.22 | NOK | http://autobuild.buildroot.net/results/e167b967a08113bc04e1171713c619194383841f | m68k | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/d386d20a7b262511fae3405117cb4219314266d2 | ORPH mipsel | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/7f0ee8a9bd797c33e4e31fdbd9847458e4e31e59 | ORPH arm | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/c276626aa5102e895ab714580febccfa5a4b55f6 | ORPH mipsel | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/60b3348b56be185a9b10ae77a050254704a7066e | ORPH mips | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/66a230b32fa06558987f36d5df5c82cd04d1d0b1 | ORPH sparc | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/e44f023e1c63de23716bb5010b821c58f0a8c243 | aarch64 | micropython-1.19.1 | NOK | http://autobuild.buildroot.net/results/4789282221dcf56db3f9b0bf503883d924f94875 | aarch64_be | modem-manager-1.20.4 | NOK | http://autobuild.buildroot.net/results/2a2b2faa53961eab12747ed7744d8849128d21f7 | aarch64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/4e8562e1b99084c503bcd04dbee4118958922e56 | powerpc | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/5cdcd3e96ba5bbf9724dbba791f50ef338c40d00 | arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/e768cb8bc4fa91e4f2ee1bdc45dbad4080578306 | ORPH aarch64 | ne10-1.2.1 | NOK | http://autobuild.buildroot.net/results/1c64785ff14e5da2ed2bab13fa26d1dd5f83b69c | sh4eb | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/483bab0cbe6d816ab690da9070b244f4878f6f7b | ORPH m68k | ntpsec-1_2_2 | NOK | http://autobuild.buildroot.net/results/c40e053c790351cd1aca8a2fe494af95770dcf06 | ORPH microblazeel | ntpsec-1_2_2 | NOK | http://autobuild.buildroot.net/results/0bc545c83fdc59a955c9072fb58b728386cb7d5b | ORPH aarch64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/47a619686bb47debd525c92aa7e14bee5c40ca9e | ORPH arceb | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/ccabc573046fd85916db92ca2fd98c607a214ef5 | ORPH armeb | open-iscsi-2.1.8 | NOK | http://autobuild.buildroot.net/results/ae3b2c3dd9dd6ad36363fb74654ea32c564e4ec5 | or1k | open-iscsi-2.1.8 | NOK | http://autobuild.buildroot.net/results/48a4bddc355956733d712214797350cca8e111d9 | microblazeel | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/cb9c120c15c8042e6919858d6885c1cc4d996c0c | aarch64_be | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/fde94badff8334e83edf2c31acdfe6ced366c193 | sparc64 | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/e8701d45443382f7a83be6a2fef78b65e166b7f7 | powerpc64 | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/adaf44b74a0b309aa37acaafb9dbf8bdbf34fb95 | microblaze | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/68df3463197969aa9b93f14687cf9442aeb4f104 | aarch64_be | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/7f02e668fd0d80e4adba81adebf323f1e83685c4 | mips | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/72fb419507ac57ca21f228d283b1b44ee4b1f873 | armeb | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/06b778ff39287912fff2b074bd772b083279568a | aarch64_be | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/4b07e04b4cfe7d4b9968acd34793415b507eec44 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/e21818393adecaac8d66dcd37f7b252d3b72ee61 | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/e0f7902a665c89879a338d28e74ce251f4276bca | ORPH arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/a7fc628e0cb9ab4fe75a932201a070bd047a6f03 | arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/c1c60389b1071f92b7e738aa036c5235727a82b0 | sparc64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/d7aeb37eeb75b6c10f8ffa2df07d44e71cdf49fb | microblaze | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/f1899783a0705748305a2889d3c142002d2e8b62 | sh4aeb | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/2562cb6a37f9e2be914c9a463607b650e46ad1f1 | s390x | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/e4141ce40b0cb52c8b23aefad7234bcc6d74632b | x86_64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/3b2204468e0a86a0baa1093d6bb7bd7a524e00e3 | or1k | pipewire-0.3.65 | NOK | http://autobuild.buildroot.net/results/3a5cb6061ed8dbd7e6428d38b636694be74e6b89 | xtensa | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/d89970ddae85009fa8934a3989c477785a69c77e | sparc64 | poke-2.4 | NOK | http://autobuild.buildroot.net/results/ae121a0ea1097216e441d4b917f71087c848d18d | ORPH aarch64 | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/1d9cb59eccca6a8b8ba09ffa3fab86880498fce5 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/13a3174e6723f87fbf9269bc2e7ffa2caf9384a8 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/d0ba87452b90e92dfd8776c60602d36af60ed085 | ORPH powerpc64 | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/85208e4a093f4c1ea3d1d4c96d2495d676e21493 | mips | python-cryptography-39.0.0 | NOK | http://autobuild.buildroot.net/results/d9b7474cdd2fa4b67b4ccd33b2a68cd4995fad58 | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/2f975cd110b35105aeb9d621589bc7e9a5d885ab | i686 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/8c9b98535c97d28e1e6ce962967b19276da052e1 | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/d2b4e4bd717da16772374d7a5ddc2c896a38dd48 | nios2 | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/a130cbfc1d24848b04864b96ee08fee5fdd37f6f | microblaze | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/10465a11109e1591124679d5c0c5e7dc00cb7c24 | mipsel | sconeserver-8d1935919a20133... | NOK | http://autobuild.buildroot.net/results/dc5af9e47d189be88f2a5c376de8f3ae9fa1bade | sh4a | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/3a3c73c4335916b3103e5262e5de7e1c365ca0eb | ORPH sh4a | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/0bc90b06c29c364679add1734f975e2f3da0809e | ORPH sparc | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/6f7ee2e7ae745e44386d2b9a4c521bacfee66f8d | ORPH aarch64_be | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/2001a2c64550038320432233997342f1848604a1 | mipsel | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/3dd5e2fd3b8420daae02f7b795e9e534e5724dc3 | nios2 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/0f4f31a25468a3f17744341596e23d5cf220d6da | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/861b6f991b69b56cadf9ff8d910c63ee7b1fa217 | microblazeel | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/83a95cb858aa09ea5767f7fb1976f17b40332a2d | arm | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/a1d0563d919b31e4921f007307ce691242fd02da | powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/f00af3a511276621dfe2a64d148bbb32ae08e9b7 | powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/d5bc4f156cb799c7592c1d7c0fc32657a5bd822f | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/80b2f27ed1057a95525508a4ec20a494f1521e19 | mips64el | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/277c81b38c3e5ae04b90c0909aa4400eb1beee1f | mipsel | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/37e91e4ba23f59b706dc184eb53dc25b8debb3e2 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/e9dc76874a7ef703c3ae66e990a84340423fc9f3 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/ae46e7308432916e546882a2901b1f84db78cb44 | arceb | unknown | NOK | http://autobuild.buildroot.net/results/17e679507b6ac7f9d1d97a93d344af02d28378ee | or1k | unknown | NOK | http://autobuild.buildroot.net/results/a3413b882648c26b538150f6797b4366fbebe90a | sparc | unknown | NOK | http://autobuild.buildroot.net/results/b96f40a869b341d7fc1f3b5d6124dba3bd00716d | sh4a | unknown | NOK | http://autobuild.buildroot.net/results/f895d9b3cc0a5e378814196058d47d7a539fc0a4 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/c7ff3183acb358b3e5b663d28096705adb5ac7ce | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/11d6f9b81b65c53e9fe43d365b027972bc936b5a | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/0a4603c55b7e3fcece9dcd9dd745c18b22db2661 | arc | unknown | NOK | http://autobuild.buildroot.net/results/7a2a33c24b37ab61699a757de7dbddd90b4c722f | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/fa42f8d015fa32fe2787660c1a85a1f8a9080287 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/8103d6adc0bfb94a0e40e77cd06ade561ab3d4aa | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/4186e473f0310b249a8173a0f29de05655120ba8 | i686 | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/f29e4f8f25917719b3be17728b4585a3eda0fc90 | ORPH sh4aeb | vlc-3.0.18 | NOK | http://autobuild.buildroot.net/results/da86f6c7639bc332d3861cfa64f8f66b7bdaa6ad | mips64 | weston-10.0.1 | NOK | http://autobuild.buildroot.net/results/534fb5a5f7ab682a29ec4859a9b242207c3c0fbf | x86_64 | wtfutil-0.41.0 | NOK | http://autobuild.buildroot.net/results/9c98acb4e82d55c710abc7a4e0fbfef34a92eef3 | microblazeel | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/eb5102391a42a13903917dcda4edea34013f3968 | microblazeel | xtables-addons-3.22 | NOK | http://autobuild.buildroot.net/results/a6000955ea768274ed55f04bb8bd1fc16a31d93c | ORPH aarch64_be | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/cd904c5a3a3b6b495afc4267c35beb8f96e161a8 | nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/333db4849cc8e8699882662c1839085f5494e40e | mips | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/be14819d94a3e3ac56a5d96201f14be00480b9c7 | mips64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/d897b594573185cd276ed379a29260a56f3582b6 | s390x | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/bae7cfce360723a6329300a2e5e5ad29b858a843 | armeb | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/250bd3f6242e17fe23a4ebb42113ec0bef3688c2 | sparc64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/0fcad1fa660c1523f667864528a1b216f7a6c8db | sparc | zxing-cpp-1.4.0 | NOK | http://autobuild.buildroot.net/results/c44c5c2ad65ffc12353addccda45666f0528d34d | mips64el | zxing-cpp-1.4.0 | NOK | http://autobuild.buildroot.net/results/4f97f1b291a99218f4706fce8b2934bd845755e1 | Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4 | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/e67b97a057f292f1a9d27ef8b7e0fd94441cddc9 | Classification of failures by reason for 2022.11.x -------------------------------------------------- host-pahole-1.24 | 3 alsa-lib-1.2.8 | 1 audit-3.0.7 | 1 dc3dd-7.2.641 | 1 elfutils-0.186 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 janus-gateway-1.0.3 | 1 libuhttpd-3.14.1 | 1 linux-6.0.19 | 1 lirc-tools-0.10.2 | 1 netsurf-3.10 | 1 perl-5.34.1 | 1 uclibc-1.0.42 | 1 x264-baee400fa9ced6f5481a72... | 1 xfsprogs-5.14.2 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | alsa-lib-1.2.8 | NOK | http://autobuild.buildroot.net/results/d09e30ae2412ff07b9462625f986eccfb58036b4 | arm | audit-3.0.7 | NOK | http://autobuild.buildroot.net/results/cc90d10cfbb3eddfea8ac930c14fc6d37c0b2ed3 | or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/23009dd4f194c68b99406560f04371be82f24b63 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/4a0f54d3e02d1f50de59a81d310e3838d267f200 | ORPH aarch64 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/11a5bdad7a59f2aacdc844bb4741bf51072d2f08 | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/15ac6b8ea13682dda77bf2703a4a0bdd1704216f | microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/73b89f70eb0b0789dc739fcfa981d082a2ec1c6f | ORPH sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/447f5706450839fd131a5a0a12955765fca65759 | i686 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/33938700935023015fdfb558df7fc2b1613e6170 | i586 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/550bede827f4d28e1be4af28485ab369d8debd44 | s390x | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/c2b4472b17b4e6fd7970a0093ff96a879644a0b4 | mips64 | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/0c2ca7fd1e5c57713542a1b47cd7a1aa5781a955 | mipsel | linux-6.0.19 | NOK | http://autobuild.buildroot.net/results/75d3c80dafad817bc5aa1633cc14f95e206be25d | ORPH mips | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/410f7676636b0adb1aeb70b6345022df6725316a | ORPH mips | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/5da2eada7d93eeea338c0976af1e785ac0714990 | nios2 | perl-5.34.1 | NOK | http://autobuild.buildroot.net/results/dcdc6b1258740f06d327289c79ab9083db641b26 | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/58e814e6c4e179af49fad5253a6ca12796f0648a | i686 | x264-baee400fa9ced6f5481a72... | NOK | http://autobuild.buildroot.net/results/54c31ac1b0d3ca3dd81b873f54ebd6d827e0c6ce | nios2 | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/acd89a2b1d00f647465b95f51c78ecc15edd6144 | ORPH Gitlab CI results for 2023-02-12 ================================ Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.6 | 7.0.11 | acpica | DISTRO | https://release-monitoring.org/project/00018 | 20220331 | 20222010 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 43 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.5.4 | 4.6.0 | alfred | DISTRO | https://release-monitoring.org/project/241870 | 2022.1 | 2023.0 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 13.0.0_r31 | angularjs | DISTRO | https://release-monitoring.org/project/21321 | 1.8.2 | 1.8.3 | apitrace | DISTRO | https://release-monitoring.org/project/06170 | 10.0 | 11.1 | apr | DISTRO | https://release-monitoring.org/project/00095 | 1.7.0 | 1.7.2 | apr-util | DISTRO | https://release-monitoring.org/project/00096 | 1.6.1 | 1.6.3 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 11.4.4 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.29.1 | 20.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.46.0 | atkmm | DISTRO | https://release-monitoring.org/project/07962 | 2.36.1 | 2.36.2 | atop | DISTRO | https://release-monitoring.org/project/00135 | 2.8.0 | 2.8.1 | audit | DISTRO | https://release-monitoring.org/project/15225 | 3.0.7 | 3.1 | avocado | DISTRO | https://release-monitoring.org/project/13385 | 98.0 | 100.1 | avrdude | DISTRO | https://release-monitoring.org/project/10751 | 6.4 | 7.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_07_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.12.2 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 20.10.26 | 20.10.27 | bat | DISTRO | https://release-monitoring.org/project/241901 | 0.19.0 | 0.22.1 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2023.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2022.3 | 2023.0 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.2.16 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.2.16 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.2.16 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.5 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.38 | 2.40 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.11 | 2.0.12 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 24.0.1 | bluez5_utils | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bluez5_utils-headers | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH boost | DISTRO | https://release-monitoring.org/project/06845 | 1.80.0 | 1.81.0 | bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.2.3 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.16.2 | 6.1.3 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.21 | 3.25 | cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.8 | cairomm | DISTRO | https://release-monitoring.org/project/07959 | 1.16.1 | 1.16.2 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.7.4 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.5.0 | 1.5.2 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 3.9.1 | 4.2.1 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.15 | 7.0 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.18.0 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.7 | 1.0.0 | clang | DISTRO | https://release-monitoring.org/project/11811 | 11.1.0 | 15.0.7 | cli11 | DISTRO | https://release-monitoring.org/project/20578 | 2.3.1 | 2.3.2 | clinfo | DISTRO | https://release-monitoring.org/project/10503 | 3.0.21.02.21 | 3.0.23.01.25 | cloop | DISTRO | https://release-monitoring.org/project/21332 | 3.14.1.3 | 3.14.1.3+... | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.22.3 | 3.25.2 | collectl | DISTRO | https://release-monitoring.org/project/00330 | 4.3.2 | 4.3.8 | compiler-rt | GUESS | https://release-monitoring.org/project/17705 | 11.1.0 | 900 | containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.6.16 | 1.6.17 | crucible | DISTRO | https://release-monitoring.org/project/267616 | 2022.05.25 | 2022.12.06 | crudini | DISTRO | https://release-monitoring.org/project/21669 | 0.9.3 | 0.9.4 | crun | DISTRO | https://release-monitoring.org/project/96792 | 1.7.2 | 1.8 | cryptopp | DISTRO | https://release-monitoring.org/project/14487 | 8.6.0 | 8.7.0 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.16 | 1.28.17 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.7.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | dado | DISTRO | https://release-monitoring.org/project/58442 | 1.8.3-1 | 2.1.0-1 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.9 | 3.0.10 | dash | DISTRO | https://release-monitoring.org/project/00394 | 0.5.11.5 | 0.5.12 | ORPH datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.13.2 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.3.4 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.2.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.4.0 | dbus | DISTRO | https://release-monitoring.org/project/05356 | 1.12.24 | 1.14.6 | ORPH dbus-broker | DISTRO | https://release-monitoring.org/project/271475 | 32 | 33 | dbus-python | DISTRO | https://release-monitoring.org/project/00402 | 1.2.18 | 1.3.2 | ORPH dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH ddrescue | DISTRO | https://release-monitoring.org/project/00410 | 1.26 | 1.27 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.20.0 | 1.20.1 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20220117 | 1.3-20230209 | ORPH diffutils | DISTRO | https://release-monitoring.org/project/00436 | 3.8 | 3.9 | ORPH dnsmasq | DISTRO | https://release-monitoring.org/project/00444 | 2.88 | 2.89 | docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 23.0.0 | 23.0.1 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 2.15.1 | 2.16.0 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 23.0.0 | 23.0.1 | dos2unix | DISTRO | https://release-monitoring.org/project/00453 | 7.4.3 | 7.4.4 | dracut | DISTRO | https://release-monitoring.org/project/10627 | 057 | 059 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.21.4 | 9.23.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH dust | DISTRO | https://release-monitoring.org/project/141344 | 0.8.1 | 0.8.4 | ORPH e2fsprogs | DISTRO | https://release-monitoring.org/project/00646 | 1.46.5 | 1.47.0 | ORPH easy-rsa | DISTRO | https://release-monitoring.org/project/17770 | 3.1.1 | 3.1.2 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.18 | 1.19 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202211 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.1 | 1.26.3 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 21.12 | 23.01 | elfutils | DISTRO | https://release-monitoring.org/project/05679 | 0.186 | 0.188 | ORPH empty | DISTRO | https://release-monitoring.org/project/20564 | 0.6.22b | 0.6.23c | ORPH enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.1 | 0.25.4 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 25.2.2 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.21 | 1.0.22 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.11.1 | 1.11.5 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.9.1 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.16 | 1.0.22 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.29 | 1.0.30 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.14 | 1.0.15 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.10 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.8 | 1.0.9 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.47 | 1.0.49 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.27 | 1.0.29 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.47 | 1.2.7 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.13 | 1.1.16 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.23 | 1.0.25 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.5.6 | 1.6.1 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.32 | 1.0.36 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.12 | 1.0.15 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.10 | 1.0.12 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.9.0.1 | 2.9.1.0 | exiv2 | DISTRO | https://release-monitoring.org/project/00769 | 0.27.5 | 0.27.6 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.30.1 | 1.31 | ORPH feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.9.1 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.35 | 6.4.36 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.3 | 5.1.2 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH file | DISTRO | https://release-monitoring.org/project/00807 | 5.43 | 5.44 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.33 | flashrom | DISTRO | https://release-monitoring.org/project/10202 | 1.2.1 | 1.3.0 | flatbuffers | DISTRO | https://release-monitoring.org/project/16642 | 2.0.8 | 23.1.21 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.4 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fluent-bit | DISTRO | https://release-monitoring.org/project/267335 | 2.0.8 | 2.0.9 | fmc | GUESS | https://release-monitoring.org/project/145761 | LSDK-21.08 | 0.2.0 | font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 6.3.0 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.14.2 | ORPH freeradius-server | DISTRO | https://release-monitoring.org/project/00853 | 3.2.0 | 3.2.1 | freetype | DISTRO | https://release-monitoring.org/project/00854 | 2.12.1 | 2.13.0 | fscryptctl | DISTRO | https://release-monitoring.org/project/270981 | 1.0.0 | 1.1.0 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 22.09.00 | 23.01.00 | gawk | DISTRO | https://release-monitoring.org/project/00868 | 5.2.0 | 5.2.1 | ORPH gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 4.0.0 | ORPH gdal | DISTRO | https://release-monitoring.org/project/00881 | 3.5.2 | 3.6.2 | gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.5.5 | 2.6.2 | gerbera | DISTRO | https://release-monitoring.org/project/18420 | 1.10.0 | 1.12.1 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.56.1 | 10.0.0 | gitlab-runner | DISTRO | https://release-monitoring.org/project/11337 | 15.5.0 | 15.8.2 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.1 | 2.74.0 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.74.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnuplot | DISTRO | https://release-monitoring.org/project/01216 | 5.4.5 | 5.4.6 | gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.10.4.0 | 3.10.5.1 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.8 | 3.8.0 | go | DISTRO | https://release-monitoring.org/project/01227 | 1.19.5 | 1.20 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.72.0 | 1.74.0 | ORPH gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.9 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 7.1.0 | ORPH grantlee | DISTRO | https://release-monitoring.org/project/21448 | 5.2.0 | 5.3.1 | graphicsmagick | DISTRO | https://release-monitoring.org/project/01248 | 1.3.38 | 1.3.40 | grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.51.1 | 1.52.0 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 43.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gssdp | DISTRO | https://release-monitoring.org/project/01262 | 1.4.0.1 | 1.6.2 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.1.0 | gst1-shark | DISTRO | https://release-monitoring.org/project/21854 | v0.7.5 | 0.8.1 | gtest | DISTRO | https://release-monitoring.org/project/18290 | 1.12.1 | 1.13.0 | gtkmm3 | DISTRO | https://release-monitoring.org/project/311572 | 3.22.0 | 3.24.7 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.6.2 | guile | DISTRO | https://release-monitoring.org/project/01277 | 3.0.8 | 3.0.9 | gupnp | DISTRO | https://release-monitoring.org/project/01281 | 1.4.3 | 1.6.3 | gupnp-av | DISTRO | https://release-monitoring.org/project/01282 | 0.14.0 | 0.14.1 | gupnp-tools | DISTRO | https://release-monitoring.org/project/01284 | 0.10.3 | 0.12.0 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.50.3 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2022.09.1 | 2023.01.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.6.5 | 2.7.2 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 5.3.1 | 7.0.0 | heimdal | DISTRO | https://release-monitoring.org/project/01307 | 7.7.1 | 7.8.0 | ORPH hiawatha | DISTRO | https://release-monitoring.org/project/13375 | 11.2 | 11.3 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.13.1 | ORPH hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.22.10 | ORPH htop | DISTRO | https://release-monitoring.org/project/01332 | 3.2.1 | 3.2.2 | ORPH htpdate | DISTRO | https://release-monitoring.org/project/132187 | 1.3.6 | 1.3.7 | hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.365 | 0.367 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.8.0 | 2.9.0 | hyperfine | DISTRO | https://release-monitoring.org/project/18526 | 1.14.0 | 1.15.0 | ORPH i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.43.0 | 2.45.1 | ibm-sw-tpm2 | DISTRO | https://release-monitoring.org/project/18952 | 1661 | 1682 | icu | DISTRO | https://release-monitoring.org/project/16134 | 70-1 | 72-1 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.41 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-51 | 7.1.0-61 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.10.0 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.6.0 | ORPH intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 23.1.0 | 23.1.1 | intel-mediasdk | DISTRO | https://release-monitoring.org/project/21814 | 23.1.0 | 23.1.1 | iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.493 | 3.494 | ipset | DISTRO | https://release-monitoring.org/project/01393 | 7.16 | 7.17 | irqbalance | DISTRO | https://release-monitoring.org/project/01402 | 1.9.0 | 1.9.2 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | irssi | DISTRO | https://release-monitoring.org/project/01404 | 1.4.2 | 1.4.3 | jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.21 | 1.9.22 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 1.1.1 | 1.1.2 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 4.0.0 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.6 | 1.9 | jpeg-turbo | DISTRO | https://release-monitoring.org/project/01648 | 2.1.4 | 2.1.5.1 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.13.1 | 1.13.2 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.2 | jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.10.0 | 3.10.1 | kexec | DISTRO | https://release-monitoring.org/project/12689 | 2.0.25 | 2.0.26 | ORPH kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kodi | DISTRO | https://release-monitoring.org/project/20547 | 19.5-Matrix | 20.0-Nexus | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.7-Ma... | 20.3.3-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.3-Ma... | 20.5.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-jsonschemabuilder | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.4-Ma... | 20.1.5-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.5-Ma... | 20.1.3-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.1-Ma... | 20.5.0-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.6-Ma... | 20.6.0-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.2.2-Ma... | 21.1.0-Omega | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.11-M... | 20.3.1-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.6-Ma... | 20.4.0-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.3.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.4.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.3.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.4-Ma... | 20.3.1-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 21.1.0-Omega | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.5-Ma... | 20.4.0-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.1-Ma... | 21.1.0-Omega | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.3.1-Ma... | 20.6.1-Nexus | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.16-M... | 20.3.4-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-texturepacker | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.2.0-Ma... | 20.3.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.2-Ma... | 20.1.1-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.3-Ma... | 20.2.1-Nexus | ksmbd-tools | DISTRO | https://release-monitoring.org/project/241856 | 3.4.6 | 3.4.7 | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 2.1.0 | 2.2.0 | lapack | DISTRO | https://release-monitoring.org/project/01534 | 3.10.1 | 3.11.0 | leafpad | DISTRO | https://release-monitoring.org/project/01544 | 0.8.18.1 | 0.8.19 | ORPH lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.3 | 0.3.95 | leptonica | DISTRO | https://release-monitoring.org/project/01549 | 1.82.0 | 1.83.0 | less | DISTRO | https://release-monitoring.org/project/01550 | 590 | 608 | ORPH libabseil-cpp | DISTRO | https://release-monitoring.org/project/115295 | 20220623.1 | 20230125.0 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.26 | 2.28-1 | ORPH libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.7 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.65 | 2.67 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 3.0.0 | libdeflate | DISTRO | https://release-monitoring.org/project/242778 | 1.15 | 1.17 | libdnet | DISTRO | https://release-monitoring.org/project/06308 | 1.16.1 | 1.16.3 | ORPH libebml | DISTRO | https://release-monitoring.org/project/07879 | 1.4.2 | 1.4.4 | libedit | DISTRO | https://release-monitoring.org/project/01599 | 20210910-3.1 | 20221030-3.1 | libevdev | DISTRO | https://release-monitoring.org/project/20540 | 1.12.1 | 1.13.0 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.13.1 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.40.0 | ORPH libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.72.3 | 2.74.5 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.4.0 | 1.6.0 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.17.1 | 1.18.0 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.30 | ORPH libgpiod | DISTRO | https://release-monitoring.org/project/20640 | 1.6.3 | 1.6.4 | ORPH libgsasl | DISTRO | https://release-monitoring.org/project/01563 | 1.10.0 | 2.2.0 | ORPH libgsm | DISTRO | https://release-monitoring.org/project/12587 | 1.0.19 | 1.0.22 | libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.8.3 | libhtp | DISTRO | https://release-monitoring.org/project/01632 | 0.5.40 | 0.5.42 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.40 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.16 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.17 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.2 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.20.1 | 1.22.1 | libmatroska | DISTRO | https://release-monitoring.org/project/01657 | 1.6.3 | 1.7.1 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.13 | 0.12.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.8 | 3.1.10 | libmodplug | DISTRO | https://release-monitoring.org/project/05669 | d1b97ed | 0.8.9.0 | ORPH libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.10 | libnetconf2 | DISTRO | https://release-monitoring.org/project/31639 | 2.1.25 | 2.1.28 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.2 | ORPH libnftnl | DISTRO | https://release-monitoring.org/project/01681 | 1.2.3 | 1.2.4 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.2.2 | 5.0.0 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.14 | libpam-tacplus | DISTRO | https://release-monitoring.org/project/20537 | 1.6.1 | 1.7.0 | ORPH libpcap | DISTRO | https://release-monitoring.org/project/01702 | 1.10.2 | 1.10.3 | libpeas | DISTRO | https://release-monitoring.org/project/06871 | 1.32.0 | 1.34.0 | ORPH libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.7.4 | libqrtr-glib | DISTRO | https://release-monitoring.org/project/192056 | 1.0.0 | 1.2.2 | librelp | DISTRO | https://release-monitoring.org/project/01713 | 1.10.0 | 1.11.0 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.54.5 | librtas | DISTRO | https://release-monitoring.org/project/10717 | 2.0.3 | 2.0.4 | ORPH libselinux | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsolv | DISTRO | https://release-monitoring.org/project/07908 | 0.7.22 | 0.7.23 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.2 | 3.2.2 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.2 | 2.5.0 | libtalloc | DISTRO | https://release-monitoring.org/project/01733 | 2.3.4 | 2.4.0 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH libtool | DISTRO | https://release-monitoring.org/project/01741 | 2.4.6 | 2.4.7 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.8 | libucl | DISTRO | https://release-monitoring.org/project/21371 | 0.8.1 | 0.8.2 | libupnp | DISTRO | https://release-monitoring.org/project/21315 | 1.14.13 | 1.14.15 | libupnpp | DISTRO | https://release-monitoring.org/project/15849 | 0.21.0 | 0.22.4 | ORPH liburing | DISTRO | https://release-monitoring.org/project/230185 | 2.2 | 2.3 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.14.1 | libvirt | DISTRO | https://release-monitoring.org/project/13830 | 7.10.0 | 9.0.0 | libvpx | DISTRO | https://release-monitoring.org/project/11083 | 1.12.0 | 1.13.0 | libwpe | DISTRO | https://release-monitoring.org/project/17789 | 1.14.0 | 1.14.1 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.29 | 4.4.33 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.4.0 | 1.5.0 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.54.06 | libyang | DISTRO | https://release-monitoring.org/project/18554 | 2.1.4 | 2.1.30 | lighttpd | DISTRO | https://release-monitoring.org/project/01817 | 1.4.67 | 1.4.69 | lilv | DISTRO | https://release-monitoring.org/project/01818 | 0.24.12 | 0.24.20 | links | DISTRO | https://release-monitoring.org/project/01822 | 2.26 | 2.28 | ORPH linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.10 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20221214 | 20230210 | liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.4.0 | 1.5.0 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2023.01.19 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.15 | 1.0.16 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.13.0 | 1.0.0 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.20.1 | 3.21.0 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | lsof | DISTRO | https://release-monitoring.org/project/01844 | 4.96.5 | 4.98.0 | ORPH ltp-testsuite | DISTRO | https://release-monitoring.org/project/21502 | 20220930 | 20230127 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.6 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.11 | lttng-libust | DISTRO | https://release-monitoring.org/project/07135 | 2.13.1 | 2.13.5 | lttng-modules | DISTRO | https://release-monitoring.org/project/07141 | 2.13.7 | 2.13.8 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.8 | 2.13.9 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luarocks | DISTRO | https://release-monitoring.org/project/01856 | 3.9.1 | 3.9.2 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.43.0-0 | 1.44.2-1 | ORPH luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.13.0 | 2.14.0 | ORPH lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.18 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzma-alone | DISTRO | https://release-monitoring.org/project/242840 | 9.22 | 2201 | ORPH lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.4 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.36 | 10.11.1 | ORPH mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.2 | 3.3.0 | mc | DISTRO | https://release-monitoring.org/project/01954 | 4.8.28 | 4.8.29 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.6.0 | 0.1.6.1 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.2.16 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.17 | 1.6.18 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 6.10 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 22.3.4 | 22.3.5 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 22.3.4 | 22.3.5 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.46.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | minizip | DISTRO | https://release-monitoring.org/project/301509 | 3.0.7 | 3.0.8 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.20.4 | 1.21.2 | modsecurity2 | DISTRO | https://release-monitoring.org/project/68638 | 2.9.7 | 3.0.8 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 6.2.0 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.8 | 7.9 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.33.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.182 | 6.12.0.190 | mp4v2 | DISTRO | https://release-monitoring.org/project/98413 | 2.1.1 | 2.1.2 | ORPH mpc | DISTRO | https://release-monitoring.org/project/01667 | 1.2.1 | 1.3.1 | ORPH mpd | DISTRO | https://release-monitoring.org/project/14864 | 0.23.11 | 0.23.12 | mpfr | DISTRO | https://release-monitoring.org/project/02019 | 4.1.1 | 4.2.0 | ORPH mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.31.2 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.35.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 5.0.0 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.22 | 1.8.23 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.38 | 4.0.42 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.18 | 2.2.2 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.3-20221224 | 6.4-20230211 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.32.4 | 0.32.5 | ORPH netatalk | DISTRO | https://release-monitoring.org/project/02063 | 3.1.13 | 3.1.14 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | 1.218 | 1.219 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.33.1 | 1.38.0 | netopeer2 | DISTRO | https://release-monitoring.org/project/114978 | 2.1.42 | 2.1.49 | network-manager | DISTRO | https://release-monitoring.org/project/21197 | 1.40.10 | 1.42.0 | ORPH networkd-dispatcher | DISTRO | https://release-monitoring.org/project/242008 | 2.2.3 | 2.2.4 | newt | DISTRO | https://release-monitoring.org/project/15129 | 0.52.21 | 0.52.23 | ORPH nftables | DISTRO | https://release-monitoring.org/project/02082 | 1.0.5 | 1.0.6 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.51.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.22.1 | 1.23.3 | ninja | DISTRO | https://release-monitoring.org/project/02089 | 1.11.1.g9... | 1.11.1 | nmap | DISTRO | https://release-monitoring.org/project/02096 | 7.92 | 7.93 | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 16.18.1 | 19.6.0 | noip | DISTRO | https://release-monitoring.org/project/21539 | 2.1.9 | 3.0.0 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.151 | 390.157 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 525.89.02 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 2.3 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.34 | 2.0 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.6.2 | openal | DISTRO | https://release-monitoring.org/project/08172 | 1.22.0 | 1.23.0 | ORPH opencl-clhpp | DISTRO | https://release-monitoring.org/project/271141 | 2.0.16 | 2023.02.06 | opencore-amr | DISTRO | https://release-monitoring.org/project/21548 | 0.1.5 | 0.1.6 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.19 | 4.7.0 | opencv4 | DISTRO | https://release-monitoring.org/project/06615 | 4.6.0 | 4.7.0 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.10.0 | openipmi | DISTRO | https://release-monitoring.org/project/02549 | 2.0.32 | 2.0.33 | ORPH openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.14.1+1 | 21+9 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.4 | ORPH openocd | DISTRO | https://release-monitoring.org/project/02557 | 0.11.0 | 0.12.0 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.46 | opensc | DISTRO | https://release-monitoring.org/project/02559 | 0.22.0 | 0.23.0 | openssh | DISTRO | https://release-monitoring.org/project/02565 | 9.1p1 | 9.2p1 | ORPH openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 11.3.5-18... | 12.1.5 | openvpn | DISTRO | https://release-monitoring.org/project/02567 | 2.5.7 | 2.6.0 | ORPH opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.6.1 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.19.0 | 3.20.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.19.0 | 3.20.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.19.0 | 3.20.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.19.0 | 3.20.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.32 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.2.16 | ORPH paho-mqtt-c | DISTRO | https://release-monitoring.org/project/21375 | 1.3.11 | 1.3.12 | pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.1 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.13 | 0.17.2 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.7 | ORPH pciutils | DISTRO | https://release-monitoring.org/project/02605 | 3.8.0 | 3.9.0 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202212 | ORPH pdbg | DISTRO | https://release-monitoring.org/project/21378 | 3.5 | 3.6 | perl-class-method-modifiers | DISTRO | https://release-monitoring.org/project/06735 | 2.13 | 2.14 | perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.89 | 6.90 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-file-sharedir-install | DISTRO | https://release-monitoring.org/project/11851 | 0.13 | 0.14 | perl-gdgraph | DISTRO | https://release-monitoring.org/project/09187 | 1.54 | 1.56 | perl-html-parser | DISTRO | https://release-monitoring.org/project/02967 | 3.80 | 3.81 | perl-image-exiftool | DISTRO | https://release-monitoring.org/project/06175 | 12.50 | 12.56 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.080 | 2.081 | perl-json-maybexs | DISTRO | https://release-monitoring.org/project/11953 | 1.004003 | 1.004004 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20220520 | 1.20230212 | perl-mime-tools | DISTRO | https://release-monitoring.org/project/11809 | 5.509 | 5.510 | perl-mojolicious-plugin-aut... | DISTRO | https://release-monitoring.org/project/21729 | 1.37 | 1.39 | perl-moo | DISTRO | https://release-monitoring.org/project/03123 | 2.005004 | 2.005005 | perl-net-ssh2 | DISTRO | https://release-monitoring.org/project/03163 | 0.72 | 0.73 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.93_01 | 1.92 | perl-package-stash | DISTRO | https://release-monitoring.org/project/11885 | 0.39 | 0.40 | perl-plack | DISTRO | https://release-monitoring.org/project/06578 | 1.0048 | 1.0050 | perl-sub-install | DISTRO | https://release-monitoring.org/project/03345 | 0.928 | 0.929 | perl-sub-quote | DISTRO | https://release-monitoring.org/project/12678 | 2.006006 | 2.006008 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-type-tiny | DISTRO | https://release-monitoring.org/project/14406 | 1.012004 | 2.002001 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0208 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.22 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-memcached | DISTRO | https://release-monitoring.org/project/17400 | 3.1.5 | 3.2.0 | ORPH php-pam | DISTRO | https://release-monitoring.org/project/241707 | 2.2.3 | 2.2.4 | php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.2.0 | pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.9.4 | ORPH pngquant | DISTRO | https://release-monitoring.org/project/03674 | 2.17.0 | 3.0.1 | poco | DISTRO | https://release-monitoring.org/project/05418 | 1.12.2 | 1.12.4 | poke | DISTRO | https://release-monitoring.org/project/179926 | 2.4 | 3.0 | ORPH policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 22.10.0 | 23.02.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.10 | 1.3.11 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.15 | privoxy | DISTRO | https://release-monitoring.org/project/03712 | 3.0.33 | 3.0.34 | ORPH procps-ng | DISTRO | https://release-monitoring.org/project/03708 | 3.3.17 | 4.0.2 | ORPH proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 9.1.1 | prosody | DISTRO | https://release-monitoring.org/project/03709 | 0.11.14 | 0.12.2 | pru-software-support | DISTRO | https://release-monitoring.org/project/21825 | 6.0.1 | 6.1.0 | psmisc | DISTRO | https://release-monitoring.org/project/03721 | 23.5 | 23.6 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH putty | DISTRO | https://release-monitoring.org/project/05749 | 0.76 | 0.78 | python-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.5.1 | 0.6.0 | python-aiofiles | DISTRO | https://release-monitoring.org/project/12743 | 22.1.0 | 23.1.0 | python-aiohttp | DISTRO | https://release-monitoring.org/project/06713 | 3.8.3 | 3.8.4 | python-aiohttp-jinja2 | DISTRO | https://release-monitoring.org/project/21247 | 1.5 | 1.5.1 | python-alembic | DISTRO | https://release-monitoring.org/project/03766 | 1.9.1 | 1.9.3 | python-argh | DISTRO | https://release-monitoring.org/project/09299 | 0.26.2 | 0.27.2 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 22.12.1 | 23.1.2 | python-beautifulsoup4 | DISTRO | https://release-monitoring.org/project/03779 | 4.11.1 | 4.11.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.26.45 | 1.26.69 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.29.45 | 1.29.69 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.6.1 | python-cryptography | DISTRO | https://release-monitoring.org/project/05532 | 39.0.0 | 39.0.1 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 4.1.5 | 4.1.6 | python-dnspython | DISTRO | https://release-monitoring.org/project/13190 | 2.2.1 | 2.3.0 | python-dtschema | DISTRO | https://release-monitoring.org/project/100908 | 2022.12 | 2023.1 | python-esptool | DISTRO | https://release-monitoring.org/project/11619 | 4.4 | 4.5 | python-flask-babel | DISTRO | https://release-monitoring.org/project/20024 | 2.0.0 | 3.0.1 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 3.0.2 | 3.0.3 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 1.0.1 | 1.1.1 | python-flatbuffers | DISTRO | https://release-monitoring.org/project/85010 | 2.0.7 | 23.1.21 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.30 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.10 | python-hatchling | DISTRO | https://release-monitoring.org/project/185085 | 1.12.2 | 1.13.0 | python-hiredis | DISTRO | https://release-monitoring.org/project/12002 | 2.0.0 | 2.2.1 | python-iptables | DISTRO | https://release-monitoring.org/project/11475 | 1.0.0 | 1.0.1 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 8.8.0 | 8.10.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.6 | 2.4.8 | python-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.1.1 | 2.1.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.6.3 | python-maturin | DISTRO | https://release-monitoring.org/project/42653 | 0.14.9 | 0.14.13 | python-mbstrdecoder | DISTRO | https://release-monitoring.org/project/21702 | 1.1.1 | 1.1.2 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 2.0.4 | 2.0.5 | python-mypy-extensions | DISTRO | https://release-monitoring.org/project/23367 | 0.4.3 | 1.0.0 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.23.5 | 1.24.2 | python-orjson | DISTRO | https://release-monitoring.org/project/31737 | 3.8.4 | 3.8.6 | python-packaging | DISTRO | https://release-monitoring.org/project/11718 | 22.0 | 23.0 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.12.0 | 3.0.0 | python-pathspec | DISTRO | https://release-monitoring.org/project/15607 | 0.10.3 | 0.11.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.11.0 | 5.11.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 22.3.1 | 23.0 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.16.0 | 3.17 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.2 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 3.0.2 | 3.1.3 | python-pypa-build | DISTRO | https://release-monitoring.org/project/132276 | 0.9.0 | 0.10.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.15.6 | 5.15.9 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.7.3 | 0.7.5 | python-pysmb | DISTRO | https://release-monitoring.org/project/21589 | 1.2.9 | 1.2.9.1 | python-pytest | DISTRO | https://release-monitoring.org/project/03765 | 7.2.0 | 7.2.1 | python-pythran | DISTRO | https://release-monitoring.org/project/21140 | 0.12.0 | 0.12.1 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2022.7 | 2022.7.1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 24.0.1 | 25.0.0b1 | python-qrcode | DISTRO | https://release-monitoring.org/project/20011 | 7.3.1 | 7.4.2 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 4.4.0 | 4.5.1 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.28.1 | 2.28.2 | python-rtoml | DISTRO | https://release-monitoring.org/project/62048 | 0.8.0 | 0.9.0 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-scipy | DISTRO | https://release-monitoring.org/project/04768 | 1.8.1 | 1.10.0 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.12.1 | 1.15.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 65.6.3 | 67.2.0 | python-sh | DISTRO | https://release-monitoring.org/project/10429 | 1.14.3 | 2.0.1 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.18.1 | 3.18.3 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.19.25 | 6.7.7 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.4.42 | 2.0.3 | python-systemd | DISTRO | https://release-monitoring.org/project/07314 | 234 | 235 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 5.2.0 | 5.2.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.4 | 1.1.6 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.8.0 | 5.9.0 | python-txaio | DISTRO | https://release-monitoring.org/project/07202 | 22.2.1 | 23.1.1 | python-typeguard | DISTRO | https://release-monitoring.org/project/38819 | 2.13.3 | 3.0.0b2 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.13 | 1.26.14 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.2.5 | 0.2.6 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 57.2 | 58.0b1 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.23.0 | 2.23.1 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 1.4.2 | 1.5.1 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.32 | 0.33 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.6 | 3.0.8 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.39.4 | 0.47.1 | python-zlmdb | DISTRO | https://release-monitoring.org/project/66674 | 22.6.1 | 23.1.1 | python3 | DISTRO | https://release-monitoring.org/project/13254 | 3.11.1 | 3.11.2 | qcom-db410c-firmware | DISTRO | https://release-monitoring.org/project/235382 | 1034.2.1 | 1036.1 | qlibc | DISTRO | https://release-monitoring.org/project/21737 | 2.4.7 | 2.4.8 | ORPH qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 11.2.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.38.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.8 | 6.4.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.3 | 1.4 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-c | DISTRO | https://release-monitoring.org/project/13768 | 0.11.0 | 0.13.0 | ragel | DISTRO | https://release-monitoring.org/project/12105 | 6.10 | 7.0.4 | ORPH ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | raspberrypi-usbboot | DISTRO | https://release-monitoring.org/project/115700 | 2021.07.01 | 20221215-... | ORPH redis | DISTRO | https://release-monitoring.org/project/04181 | 7.0.7 | 7.0.8 | refpolicy | DISTRO | https://release-monitoring.org/project/21663 | 2.20220106 | 2.20221101 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.5 | 2.0.1 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 7.9.2 | rrdtool | DISTRO | https://release-monitoring.org/project/04214 | 1.7.2 | 1.8.0 | ORPH rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2204.1 | 8.2212.0 | rt-tests | DISTRO | https://release-monitoring.org/project/59450 | 2.4 | 2.5 | rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.1.0 | ruby | DISTRO | https://release-monitoring.org/project/04223 | 3.1.3 | 3.2.1 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.67.0 | 1.67.1 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.67.0 | 1.67.1 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.42.1 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.11.1.2 | 2.11.2.0 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.4 | 2.3.5.5 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.8.0 | 1.0.8.1 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.6.0.0 | 2.6.0.1 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.5.1.1 | 2.5.1.2 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.5.0 | 2.2.5.1 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.3.2 | 0.5.3.3 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.12 | 4.17.5 | sane-backends | DISTRO | https://release-monitoring.org/project/04760 | 1.1.1 | 1.2.1 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.4.0 | sdl2 | DISTRO | https://release-monitoring.org/project/04779 | 2.26.2 | 2.26.3 | sdl2_image | DISTRO | https://release-monitoring.org/project/04781 | 2.6.2 | 2.6.3 | sdl2_mixer | DISTRO | https://release-monitoring.org/project/04782 | 2.0.4 | 2.6.3 | ORPH sdl2_net | DISTRO | https://release-monitoring.org/project/04783 | 2.0.1 | 2.2.0 | ORPH sdl2_ttf | DISTRO | https://release-monitoring.org/project/04784 | 2.20.1 | 2.20.2 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdl_sound | DISTRO | https://release-monitoring.org/project/10262 | 1.0.3 | 2.0.1 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | selinux-python | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | semodule-utils | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | ORPH sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 2.8.0 | 2.12.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.5.4 | ser2net | DISTRO | https://release-monitoring.org/project/21655 | 4.3.8 | 4.3.11 | serd | DISTRO | https://release-monitoring.org/project/230531 | 0.30.14 | 0.30.16 | setools | DISTRO | https://release-monitoring.org/project/08951 | 4.4.0 | 4.4.1 | shairport-sync | DISTRO | https://release-monitoring.org/project/21384 | 3.3.9 | 4.1.1 | ORPH shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.2 | ORPH shim | DISTRO | https://release-monitoring.org/project/10719 | 15.4 | 15.7 | signal-estimator | DISTRO | https://release-monitoring.org/project/284559 | v0.0.4 | 0.0.5 | ORPH sispmctl | DISTRO | https://release-monitoring.org/project/21653 | 4.9 | 4.10 | skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.12.0.1 | 2.13.0.0 | snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.10 | 3.5.0 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.40.0 | 3.1.55.0 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.12 | 1.13.13 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sord | DISTRO | https://release-monitoring.org/project/230536 | 0.16.12 | 0.16.14 | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | spawn-fcgi | DISTRO | https://release-monitoring.org/project/05388 | 1.6.4 | 1.6.5 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice | DISTRO | https://release-monitoring.org/project/04871 | 0.15.0 | 0.15.1 | sqlcipher | DISTRO | https://release-monitoring.org/project/11213 | 4.5.1 | 4.5.3 | sshpass | DISTRO | https://release-monitoring.org/project/12961 | 1.09 | 1.10 | start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.20 | ORPH stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.5 | 1.0.7 | stress-ng | DISTRO | https://release-monitoring.org/project/12538 | 0.13.05 | 0.15.03 | strongswan | DISTRO | https://release-monitoring.org/project/04899 | 5.9.8 | 5.9.9 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.65 | 5.68 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.5 | ORPH suricata | DISTRO | https://release-monitoring.org/project/10925 | 6.0.6 | 6.0.10 | sway | DISTRO | https://release-monitoring.org/project/11497 | 1.7 | 1.8 | synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.29.3 | 0.30.2 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.38.1 | 4.0.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.46.0 | sysrepo | DISTRO | https://release-monitoring.org/project/34820 | 2.2.12 | 2.2.36 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.6.1 | 12.6.2 | ORPH system-config-printer | DISTRO | https://release-monitoring.org/project/08855 | 1.5.15 | 1.5.18 | ORPH systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.04 | ORPH tbb | DISTRO | https://release-monitoring.org/project/08217 | 2021.5.0 | 2021.7.0 | tcl | DISTRO | https://release-monitoring.org/project/04941 | 8.6.12 | 8.6.13 | ORPH tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | tcllib | DISTRO | https://release-monitoring.org/project/04943 | 1.20 | 1.21 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.4.2 | 4.4.3 | ORPH terminology | DISTRO | https://release-monitoring.org/project/04951 | 1.12.1 | 1.13.0 | tesseract-ocr | DISTRO | https://release-monitoring.org/project/04954 | 5.0.1 | 5.3.0 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.5.1 | 2.5.2 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.17.0 | ORPH tinifier | DISTRO | https://release-monitoring.org/project/241900 | 3.4.0 | 4.0.1 | tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20220801 | 20230101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tio | DISTRO | https://release-monitoring.org/project/20587 | 1.47 | 2.5 | tk | DISTRO | https://release-monitoring.org/project/11426 | 8.6.12 | 8.6.13 | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 3.0.0 | ORPH tpm2-pkcs11 | DISTRO | https://release-monitoring.org/project/18777 | 1.8.0 | 1.9.0 | tpm2-tools | DISTRO | https://release-monitoring.org/project/12841 | 5.2 | 5.4 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.1.0 | 4.0.1 | ORPH trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | 2.9.7 | 3.1.6 | traceroute | DISTRO | https://release-monitoring.org/project/14877 | 2.1.0 | 2.1.1 | transmission | DISTRO | https://release-monitoring.org/project/05002 | 3.00 | 4.0.0 | tree | DISTRO | https://release-monitoring.org/project/05006 | 2.0.2 | 2.1.0 | tzdata | DISTRO | https://release-monitoring.org/project/05021 | 2022f | 2022g | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2023.01 | uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.12 | 0.13.1 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 4.3.0.0 | 4.4.0.0 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 3.2 | unrar | DISTRO | https://release-monitoring.org/project/13306 | 6.1.7 | 6.2.5 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.7.1 | ORPH upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.19 | 0.99.20 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.56.4 | ORPH valgrind | DISTRO | https://release-monitoring.org/project/13639 | 3.19.0 | 3.20.0 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.7 | 1.0 | vim | DISTRO | https://release-monitoring.org/project/05092 | 9.0.1260 | 9.0.1303 | ORPH vis-network | DISTRO | https://release-monitoring.org/project/270536 | 9.1.0 | 9.1.2 | volk | DISTRO | https://release-monitoring.org/project/147733 | 2.5.2 | 3.0.0 | vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vte | DISTRO | https://release-monitoring.org/project/10895 | 0.66.2 | 0.70.3 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.45 | 3.2.47 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.240 | ORPH waf | DISTRO | https://release-monitoring.org/project/05116 | 2.0.24 | 2.0.25 | wavpack | DISTRO | https://release-monitoring.org/project/05121 | 5.5.0 | 5.6.0 | ORPH waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 1.0.0 | webp | DISTRO | https://release-monitoring.org/project/01761 | 1.2.4 | 1.3.0 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH weston | DISTRO | https://release-monitoring.org/project/13745 | 10.0.1 | 11.0.1 | whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.14 | 5.5.15 | wine | DISTRO | https://release-monitoring.org/project/05134 | 7.0 | 8.1 | wireless-regdb | DISTRO | https://release-monitoring.org/project/15257 | 2022.02.18 | 2022.08.12 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.8 | 0.4.13 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.15.1 | 0.16.2 | wtfutil | DISTRO | https://release-monitoring.org/project/243189 | 0.41.0 | 0.42.0 | xapian | DISTRO | https://release-monitoring.org/project/15919 | 1.4.19 | 1.4.22 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20230201 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.5 | 4.17.0 | xfsprogs | DISTRO | https://release-monitoring.org/project/05188 | 5.14.2 | 6.1.1 | ORPH xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.37 | 2.38 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 6.03 | 6.06.1 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.22 | 3.23 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 376 | 378 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.1 | 0.3.2 | xz | DISTRO | https://release-monitoring.org/project/05277 | 5.2.10 | 5.4.1 | ORPH yad | DISTRO | https://release-monitoring.org/project/05280 | 0.40.0 | 12.3 | zabbix | DISTRO | https://release-monitoring.org/project/05492 | 5.4.9 | 6.2.7 | zchunk | DISTRO | https://release-monitoring.org/project/178035 | 1.2.2 | 1.2.3 | zeek | DISTRO | https://release-monitoring.org/project/267106 | 4.1.1 | 5.1.2 | zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.1.7 | 2.1.9 | zic | DISTRO | https://release-monitoring.org/project/16905 | 2022f | 2022g | zstd | DISTRO | https://release-monitoring.org/project/12083 | 1.5.2 | 1.5.4 | zxing-cpp | DISTRO | https://release-monitoring.org/project/101246 | 1.4.0 | 2.0.0 | Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dropbear | CVE-2021-36369 | https://security-tracker.debian.org/tracker/CVE-2021-36369 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-3998 | https://security-tracker.debian.org/tracker/CVE-2021-3998 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2021-3981 | https://security-tracker.debian.org/tracker/CVE-2021-3981 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2022-0711 | https://security-tracker.debian.org/tracker/CVE-2022-0711 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libbpf | CVE-2021-45940 | https://security-tracker.debian.org/tracker/CVE-2021-45940 libbpf | CVE-2021-45941 | https://security-tracker.debian.org/tracker/CVE-2021-45941 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libxslt | CVE-2022-29824 | https://security-tracker.debian.org/tracker/CVE-2022-29824 lighttpd | CVE-2022-41556 | https://security-tracker.debian.org/tracker/CVE-2022-41556 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mender | CVE-2022-29555 | https://security-tracker.debian.org/tracker/CVE-2022-29555 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 modsecurity2 | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 modsecurity2 | CVE-2023-24021 | https://security-tracker.debian.org/tracker/CVE-2023-24021 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 nodejs | CVE-2022-35256 | https://security-tracker.debian.org/tracker/CVE-2022-35256 nodejs | CVE-2022-43548 | https://security-tracker.debian.org/tracker/CVE-2022-43548 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 opusfile | CVE-2022-47021 | https://security-tracker.debian.org/tracker/CVE-2022-47021 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 patchelf | CVE-2022-44940 | https://security-tracker.debian.org/tracker/CVE-2022-44940 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 proftpd | CVE-2021-46854 | https://security-tracker.debian.org/tracker/CVE-2021-46854 python-aiohttp | CVE-2022-33124 | https://security-tracker.debian.org/tracker/CVE-2022-33124 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-45198 | https://security-tracker.debian.org/tracker/CVE-2022-45198 python-pillow | CVE-2022-45199 | https://security-tracker.debian.org/tracker/CVE-2022-45199 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pyjwt | CVE-2022-29217 | https://security-tracker.debian.org/tracker/CVE-2022-29217 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python-web2py | CVE-2022-33146 | https://security-tracker.debian.org/tracker/CVE-2022-33146 python-werkzeug | CVE-2022-29361 | https://security-tracker.debian.org/tracker/CVE-2022-29361 python3 | CVE-2022-42919 | https://security-tracker.debian.org/tracker/CVE-2022-42919 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3611 | https://security-tracker.debian.org/tracker/CVE-2021-3611 qemu | CVE-2021-3750 | https://security-tracker.debian.org/tracker/CVE-2021-3750 qemu | CVE-2021-3929 | https://security-tracker.debian.org/tracker/CVE-2021-3929 qemu | CVE-2021-3947 | https://security-tracker.debian.org/tracker/CVE-2021-3947 qemu | CVE-2021-4158 | https://security-tracker.debian.org/tracker/CVE-2021-4158 qemu | CVE-2021-4206 | https://security-tracker.debian.org/tracker/CVE-2021-4206 qemu | CVE-2021-4207 | https://security-tracker.debian.org/tracker/CVE-2021-4207 qemu | CVE-2022-0358 | https://security-tracker.debian.org/tracker/CVE-2022-0358 qemu | CVE-2022-26353 | https://security-tracker.debian.org/tracker/CVE-2022-26353 qemu | CVE-2022-26354 | https://security-tracker.debian.org/tracker/CVE-2022-26354 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-35414 | https://security-tracker.debian.org/tracker/CVE-2022-35414 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 rabbitmq-server | CVE-2021-22116 | https://security-tracker.debian.org/tracker/CVE-2021-22116 rabbitmq-server | CVE-2021-22117 | https://security-tracker.debian.org/tracker/CVE-2021-22117 rabbitmq-server | CVE-2021-32718 | https://security-tracker.debian.org/tracker/CVE-2021-32718 rabbitmq-server | CVE-2021-32719 | https://security-tracker.debian.org/tracker/CVE-2021-32719 rabbitmq-server | CVE-2022-31008 | https://security-tracker.debian.org/tracker/CVE-2022-31008 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 rpm | CVE-2021-3521 | https://security-tracker.debian.org/tracker/CVE-2021-3521 rpm | CVE-2021-35937 | https://security-tracker.debian.org/tracker/CVE-2021-35937 rpm | CVE-2021-35938 | https://security-tracker.debian.org/tracker/CVE-2021-35938 rpm | CVE-2021-35939 | https://security-tracker.debian.org/tracker/CVE-2021-35939 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 sdl2 | CVE-2022-4743 | https://security-tracker.debian.org/tracker/CVE-2022-4743 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 sofia-sip | CVE-2023-22741 | https://security-tracker.debian.org/tracker/CVE-2023-22741 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tmux | CVE-2022-47016 | https://security-tracker.debian.org/tracker/CVE-2022-47016 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unbound | CVE-2022-30698 | https://security-tracker.debian.org/tracker/CVE-2022-30698 unbound | CVE-2022-30699 | https://security-tracker.debian.org/tracker/CVE-2022-30699 unbound | CVE-2022-3204 | https://security-tracker.debian.org/tracker/CVE-2022-3204 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 usbguard | CVE-2019-25058 | https://security-tracker.debian.org/tracker/CVE-2019-25058 vim | CVE-2023-0049 | https://security-tracker.debian.org/tracker/CVE-2023-0049 vim | CVE-2023-0051 | https://security-tracker.debian.org/tracker/CVE-2023-0051 vim | CVE-2023-0054 | https://security-tracker.debian.org/tracker/CVE-2023-0054 vim | CVE-2023-0288 | https://security-tracker.debian.org/tracker/CVE-2023-0288 vim | CVE-2023-0433 | https://security-tracker.debian.org/tracker/CVE-2023-0433 vim | CVE-2023-0512 | https://security-tracker.debian.org/tracker/CVE-2023-0512 wavpack | CVE-2022-2476 | https://security-tracker.debian.org/tracker/CVE-2022-2476 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xerces | CVE-2018-1311 | https://security-tracker.debian.org/tracker/CVE-2018-1311 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 modsecurity2 | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 modsecurity2 | CVE-2023-24021 | https://security-tracker.debian.org/tracker/CVE-2023-24021 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 opusfile | CVE-2022-47021 | https://security-tracker.debian.org/tracker/CVE-2022-47021 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python3 | CVE-2022-42919 | https://security-tracker.debian.org/tracker/CVE-2022-42919 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 sdl2 | CVE-2022-4743 | https://security-tracker.debian.org/tracker/CVE-2022-4743 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 sofia-sip | CVE-2023-22741 | https://security-tracker.debian.org/tracker/CVE-2023-22741 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tmux | CVE-2022-47016 | https://security-tracker.debian.org/tracker/CVE-2022-47016 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 vim | CVE-2023-0049 | https://security-tracker.debian.org/tracker/CVE-2023-0049 vim | CVE-2023-0051 | https://security-tracker.debian.org/tracker/CVE-2023-0051 vim | CVE-2023-0054 | https://security-tracker.debian.org/tracker/CVE-2023-0054 vim | CVE-2023-0288 | https://security-tracker.debian.org/tracker/CVE-2023-0288 vim | CVE-2023-0433 | https://security-tracker.debian.org/tracker/CVE-2023-0433 vim | CVE-2023-0512 | https://security-tracker.debian.org/tracker/CVE-2023-0512 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xerces | CVE-2018-1311 | https://security-tracker.debian.org/tracker/CVE-2018-1311 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Mon Feb 13 07:47:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 08:47:35 +0100 Subject: [Buildroot] Dependency problem for gtkmm3 In-Reply-To: References: <20230210231454.4f3aedbd@windsurf> Message-ID: <20230213084735.5318a511@windsurf> Hello Dirk, On Sun, 12 Feb 2023 08:51:17 +0000 Dirk De Becker wrote: > Thank you for your quick reply. > Will this issue be fixed in the 2023.02 release? It all depends on whether someone submits a fix for the issue. Do you think you could have a look? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From br015 at umbiko.net Mon Feb 13 09:26:11 2023 From: br015 at umbiko.net (Andreas Ziegler) Date: Mon, 13 Feb 2023 10:26:11 +0100 Subject: [Buildroot] [PATCH] package/mpd: update to version 0.23.12 Message-ID: <20230213092611.86858-1-br015@umbiko.net> List of changes: decoder::mad: fix integer underflow with very small files input::curl: require CURL 7.55.0 or later output::pipewire: adjust to PipeWire 0.3.64 API change tags:: fix crash bug due to race condition fix build failures with GCC 13 Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.12/NEWS Commit: https://github.com/MusicPlayerDaemon/MPD/commit/b1422fb Tested on: i386 (build) x86_64 (build, run) Aarch64 (build) Signed-off-by: Andreas Ziegler --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 8c488d0357..2521238f64 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 edb4e7a8f9dff238b5610f9e2461940ea98c727a5462fafb1cdf836304dfdca9 mpd-0.23.11.tar.xz +sha256 b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7 mpd-0.23.12.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 449600eda2..6c25c9b46f 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).11 +MPD_VERSION = $(MPD_VERSION_MAJOR).12 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 bugzilla at busybox.net Mon Feb 13 11:44:55 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 13 Feb 2023 11:44:55 +0000 Subject: [Buildroot] [Bug 15306] glibc build fails in Docker container In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15306 --- Comment #3 from Peter Korsgaard --- > I'm not super familiar with batocera nor buildroot, so it'd be hard for me to pare Ahh, so you are not using upstream Buildroot? Possibly your issue is in one of the buildroot modifications done by the batocera project, so perhaps check there? -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Mon Feb 13 11:58:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 12:58:10 +0100 Subject: [Buildroot] [PATCH 2/3] package/linux-headers: drop 4.9.x option In-Reply-To: <20230213115812.582772-1-peter@korsgaard.com> References: <20230213115812.582772-1-peter@korsgaard.com> Message-ID: <20230213115812.582772-2-peter@korsgaard.com> The 4.9.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 72deb03c35..e2dc854c78 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_4_9 + bool "kernel headers version 4.9.x are no longer supported" + select BR2_LEGACY + help + Version 4.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_DOCKER_PROXY bool "docker-proxy removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index f797d5a61a..ae8b5e5f62 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -6,7 +6,6 @@ sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux- sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz # Locally computed diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8a76f93d62..6970090855 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -24,11 +24,6 @@ config BR2_KERNEL_HEADERS_AS_KERNEL depends on BR2_LINUX_KERNEL select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION -config BR2_KERNEL_HEADERS_4_9 - bool "Linux 4.9.x kernel headers" - depends on !BR2_riscv - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 - config BR2_KERNEL_HEADERS_4_14 bool "Linux 4.14.x kernel headers" depends on !BR2_riscv @@ -393,7 +388,6 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.337" if BR2_KERNEL_HEADERS_4_9 default "4.14.305" if BR2_KERNEL_HEADERS_4_14 default "4.19.272" if BR2_KERNEL_HEADERS_4_19 default "5.4.231" if BR2_KERNEL_HEADERS_5_4 -- 2.30.2 From peter at korsgaard.com Mon Feb 13 11:58:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 12:58:11 +0100 Subject: [Buildroot] [PATCH 3/3] package/linux-headers: drop 6.0.x option In-Reply-To: <20230213115812.582772-1-peter@korsgaard.com> References: <20230213115812.582772-1-peter@korsgaard.com> Message-ID: <20230213115812.582772-3-peter@korsgaard.com> The 6.0.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e2dc854c78..7f69462f2e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_6_0 + bool "kernel headers version 6.0.x are no longer supported" + select BR2_LEGACY + help + Version 6.0.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_KERNEL_HEADERS_4_9 bool "kernel headers version 4.9.x are no longer supported" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index ae8b5e5f62..52eb534b40 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz -sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6970090855..18c179ec8d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -45,10 +45,6 @@ config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 -config BR2_KERNEL_HEADERS_6_0 - bool "Linux 6.0.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 - config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 @@ -393,7 +389,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.231" if BR2_KERNEL_HEADERS_5_4 default "5.10.167" if BR2_KERNEL_HEADERS_5_10 default "5.15.93" if BR2_KERNEL_HEADERS_5_15 - default "6.0.19" if BR2_KERNEL_HEADERS_6_0 default "6.1.11" if BR2_KERNEL_HEADERS_6_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL -- 2.30.2 From peter at korsgaard.com Mon Feb 13 11:58:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 12:58:09 +0100 Subject: [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230213115812.582772-1-peter@korsgaard.com> 4.9.x / 6.0.x is now EOL. 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 774f1e0975..11dc5cce07 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.11" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" 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 e88abe5bb8..f797d5a61a 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b linux-6.1.9.tar.xz +sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz -sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz -sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz +sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz +sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz +sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz -sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz +sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz +sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1146231e41..8a76f93d62 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -394,13 +394,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.304" if BR2_KERNEL_HEADERS_4_14 - default "4.19.271" if BR2_KERNEL_HEADERS_4_19 - default "5.4.230" if BR2_KERNEL_HEADERS_5_4 - default "5.10.166" if BR2_KERNEL_HEADERS_5_10 - default "5.15.91" if BR2_KERNEL_HEADERS_5_15 + default "4.14.305" if BR2_KERNEL_HEADERS_4_14 + default "4.19.272" if BR2_KERNEL_HEADERS_4_19 + default "5.4.231" if BR2_KERNEL_HEADERS_5_4 + default "5.10.167" if BR2_KERNEL_HEADERS_5_10 + default "5.15.93" if BR2_KERNEL_HEADERS_5_15 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 - default "6.1.9" if BR2_KERNEL_HEADERS_6_1 + default "6.1.11" if BR2_KERNEL_HEADERS_6_1 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 d.lang at abatec.at Mon Feb 13 12:24:18 2023 From: d.lang at abatec.at (Lang Daniel) Date: Mon, 13 Feb 2023 12:24:18 +0000 Subject: [Buildroot] [PATCH] package/libbpf: Don't remove bpf.h on host In-Reply-To: <2667723.mvXUDI8C0e@pwmachine> References: <12146851.O9o76ZdvQC@pwmachine> <17501a13-8018-656f-5f4d-b1cf6c1ecd5c@mind.be> <2667723.mvXUDI8C0e@pwmachine> Message-ID: Hi Arnout, Francis, > Hi Daniel, Francis, > > On 07/02/2023 21:10, Francis Laniel wrote: >> Hi. >> >> Le lundi 28 novembre 2022, 16:06:20 CET Lang Daniel a ?crit : >>> libbpf >1.0.0 defines libbpf_bpf_link_type_str(enum bpf_link_type) in >>> src/libbpf.h, which is included by host-pahole. >>> bpf_link_type is defined in linux/bpf.h, therefore the comment stating >>> that pahole doesn't need bpf.h is no longer valid. >>> >>> Fixes: >>> - >>> http://autobuild.buildroot.net/results/d126a4b6eca786402dc362c86f8df3addec3 >>> d217/ >>> >>> Signed-off-by: Daniel Lang >>> --- >>> I wasn't able to reproduce the mentioned compile error in the kernel. >>> The mentioned file (tools/lib/bpf/strset.c) shouldn't be compiled when >>> compiling the kernel as it would recompile libbpf. >>> --- >>> package/libbpf/libbpf.mk | 17 +---------------- >>> 1 file changed, 1 insertion(+), 16 deletions(-) >>> >>> diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk >>> index 820f1dc4bf..0381fd833a 100644 >>> --- a/package/libbpf/libbpf.mk >>> +++ b/package/libbpf/libbpf.mk >>> @@ -39,26 +39,11 @@ define LIBBPF_INSTALL_TARGET_CMDS >>> -C $(@D)/src install DESTDIR=$(TARGET_DIR) >>> endef >>> >>> -# We need to install_uapi_headers so we have btf.h to compile >>> -# host-pahole. >>> -# Nonetheless, this target adds bpf.h which generates a conflict when >>> -# building the kernel: >>> -# In file included from libbpf_internal.h:17:0, from strset.c:9: >>> -# relo_core.h:10:6: error: nested redefinition of 'enum bpf_core_relo_kind' >>> -# enum bpf_core_relo_kind { >>> -# ^~~~~~~~~~~~~~~~~~ >>> -# relo_core.h:10:6: error: redeclaration of 'enum bpf_core_relo_kind' >>> -# In file included from libbpf_legacy.h:13:0, >>> -# from libbpf_internal.h:16, >>> -# from strset.c:9: >>> -# /home/francis/buildroot/output/host/include/linux/bpf.h:6497:6: note: >>> originally defined here -# enum bpf_core_relo_kind { >>> -# So, better to remove remove it now since we do not need it to build >>> +# We need to install_uapi_headers so we have bpf.h and btf.h to compile >>> # host-pahole, the only user of host-libbpf. >>> define HOST_LIBBPF_INSTALL_CMDS >>> $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ >>> -C $(@D)/src install install_uapi_headers DESTDIR=$(HOST_DIR) >>> - rm $(HOST_DIR)/include/linux/bpf.h >>> endef >>> >>> $(eval $(generic-package)) >> >> Thank you for this patch and sorry for my very late reply. >> Sadly, I do not think the patch addresses the underlying issue. >> Indeed, this is not pahole which does not need this file, as pahole relies on >> to be built. >> So, the whole point of this comment and the rm is to avoid a problem when >> building the kernel when pahole was built before. > > The current solution, however, also doesn't work, which is why Franci's patch > [1] is needed to fix it again. > > However, we believe this is not the proper fix. The real issue is the following: > > - libbpf installs headers which are possibly incompatible with the kernel's > headers. Normally this is not a problem, because you have either the kernel's or > libbpf's headers installed, not both. > > - However, when we install libbpf headers in $(HOST_DIR)/include, the kernel > build itself picks up those headers instead of its own internal headers. That is > why bpf.h is removed here to begin with. If bpf.h is not removed (and the kernel > headers are indeed incompatible with the libbpf ones), then the kernel build > will fail. > > - There is however no reason why the kernel should pick up $(HOST_DIR)/include > instead of its own internal headers. Normally it doesn't do that, because it > supplies -I options to its own headers, and these have precedence over the > system included /usr/include etc. However, we force HOSTCC="$(HOSTCC) > $(HOST_CFLAGS)" and HOST_CFLAGS has -I$(HOST_DIR)/include. This one will come > before all of the ones that the kernel adds and will have precedence. > > Therefore, we believe that the solution is to use -isystem instead of -I in the > HOSTCC setting of the kernel. This is indeed what is already done for uboot: > > HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem > /,$(HOST_CFLAGS)))" \ > > Note that there is a risk that this by itself goes wrong as well. We tried at > some point to use -isystem instead of -I in HOST_CFLAGS: > > commit 6f8162cf8c1abef7e0a4771fe0d6b26a28f5c2b6 > Author: David Raeman > Date: Mon Jul 25 21:52:26 2016 > > package/Makefile.in should grab HOST_DIR headers using -isystem instead of -I. > > > but this was reverted a copule of days later: > > commit 255b6f80d395ef048f46cfcf75dba690c56af657 > Author: Thomas Petazzoni > Date: Sat Jul 30 18:10:18 2016 > > Revert "package/Makefile.in should grab HOST_DIR headers using -isystem > instead of -I." > > (Unfortunately, the commit has no further explanation of what went wrong). > > So, could you (Daniel and Francis) try to apply this patch and replace -I with > -isystem like is done for U-Boot, and do a bunch of kernel builds to see if it > breaks anything? I didn't apply the patch for package/Makefile.in as that would change the behavour for all packages. I did however copy the logic used in the U-Boot. -HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ +HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ And applied this patch to keep bpf.h I tested the following config: BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="{VERSION}" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="pahole-kernel.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE=y and with a fragment for linux: CONFIG_BPF_SYSCALL=y CONFIG_BPF_UNPRIV_DEFAULT_OFF=n CONFIG_DEBUG_INFO_REDUCED=n CONFIG_DEBUG_INFO_COMPRESSED=n CONFIG_DEBUG_INFO_BTF=y CONFIG_SYSTEM_TRUSTED_KEYRING=y where VERSION is one of: 5.2.21 5.3.18 5.4.231 5.5.19 5.6.19 5.7.19 5.8.18 5.9.16 5.10.167 5.11.22 5.12.19 5.13.19 5.14.21 5.15.93 5.16.20 5.17.15 5.18.19 5.19.17 6.0.19 6.1.11 Version 5.2, as far as I could work it out, is the version that introduced the pahole dependency when CONFIG_DEBUG_INFO_BTF is set. None-LTS versions after 5.10 and before 6.0 fail with: LD vmlinux.o MODPOST vmlinux.symvers MODINFO modules.builtin.modinfo GEN modules.builtin LD .tmp_vmlinux.btf BTF .btf.vmlinux.bin.o LD .tmp_vmlinux.kallsyms1 KSYMS .tmp_vmlinux.kallsyms1.S AS .tmp_vmlinux.kallsyms1.S LD .tmp_vmlinux.kallsyms2 KSYMS .tmp_vmlinux.kallsyms2.S AS .tmp_vmlinux.kallsyms2.S LD vmlinux BTFIDS vmlinux FAILED: load BTF from vmlinux: Invalid argument make[2]: *** [Makefile:1177: vmlinux] Error 255 make[1]: *** [package/pkg-generic.mk:293: /home/d.lang/ws/other/buildroot/output/build/linux-5.11.22/.stamp_built] Error 2 make: *** [Makefile:82: _all] Error 2 But that should be unrelated to the change in package/libbpf and HOSTCC. I will try to work out the reason behind that error. Should I create a patch to change HOSTCC or is additional testing required? > > For now, I've marked this patch as Changes Requested (it can only be applied > if the bpf.h problem is solved in some other way), and marked Francis's patch > [1] as Superseded. > > Regards, > Arnout > > > [1] > https://patchwork.ozlabs.org/project/buildroot/patch/20220610165441.84812-2-flaniel at linux.microsoft.com/ > > >> >> Sadly, I tested your patch and I hit the problem described in the comment >> regarding redefinition of bpf_core_relo_kind. >> >> Did you also hit it or you were able to build the kernel with >> BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE? It seems like I was tested with a too recent kernel and originally preparing this patch and therefore didn't hit this error. >> >> >> Best regards and thank you in advance. >> >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From heiko.thiery at gmail.com Mon Feb 13 12:40:21 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 13 Feb 2023 13:40:21 +0100 Subject: [Buildroot] [PATCH 1/2] package/network-manager: add patch to set mobile-broadband-provider-info-database location Message-ID: <20230213124021.12522-1-heiko.thiery@gmail.com> When building network-manager in cross-compile environment pkg-config returns the wrong path to the mobile-broadband-provider-info database. By adding the option 'mobile_broadband_provider_info_database' to set the correct path to the datafile this can be solved. Signed-off-by: Heiko Thiery --- ...option-to-set-the-mobile-broadband-p.patch | 60 +++++++++++++++++++ package/network-manager/network-manager.mk | 1 + 2 files changed, 61 insertions(+) create mode 100644 package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch diff --git a/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch b/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch new file mode 100644 index 0000000000..4336472e45 --- /dev/null +++ b/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch @@ -0,0 +1,60 @@ +From 03ba04d4784fa4fc7ec31455070fb5ecf25ade23 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Fri, 27 Jan 2023 22:38:42 +0100 +Subject: [PATCH] build: meson: add option to set the + mobile-broadband-provider-info database + +When building network-manager in cross-compile environment meson is not able +to detect the right location of the mobile-broadband-provider-info +database by using the pkg-config module. + +By adding the option 'mobile_broadband_provider_info_database' to set the +correct path to the datafile this can be solved. + +Signed-off-by: Heiko Thiery + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1519 +--- + meson.build | 6 +++++- + meson_options.txt | 1 + + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 0adc42f738..84ce52c736 100644 +--- a/meson.build ++++ b/meson.build +@@ -584,7 +584,10 @@ enable_modem_manager = get_option('modem_manager') + if enable_modem_manager + mm_glib_dep = dependency('mm-glib', version: '>= 0.7.991') + +- mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ mobile_broadband_provider_info_database = get_option('mobile_broadband_provider_info_database') ++ if mobile_broadband_provider_info_database == '' ++ mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ endif + config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_database) + endif + +@@ -1054,6 +1057,7 @@ output += ' jansson: ' + jansson_msg + '\n' + output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n' + output += ' nft: ' + config_h.get('NFT_PATH') + '\n' + output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n' ++output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' + output += ' ofono: ' + enable_ofono.to_string() + '\n' + output += ' concheck: ' + enable_concheck.to_string() + '\n' + output += ' libteamdctl: ' + enable_teamdctl.to_string() + '\n' +diff --git a/meson_options.txt b/meson_options.txt +index 8b1d32e645..4e359f9e92 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -32,6 +32,7 @@ option('ppp', type: 'boolean', value: true, description: 'enable PPP/PPPoE suppo + option('pppd', type: 'string', value: '', description: 'path to pppd binary') + option('pppd_plugin_dir', type: 'string', value: '', description: 'path to the pppd plugins directory') + option('modem_manager', type: 'boolean', value: true, description: 'Enable new ModemManager1 interface support') ++option('mobile_broadband_provider_info_database', type: 'string', value: '', description: 'path to the mobile-broadband-provider-info database') + option('ofono', type: 'boolean', value: false, description: 'Enable oFono support (experimental)') + option('concheck', type: 'boolean', value: true, description: 'enable connectivity checking support') + option('teamdctl', type: 'boolean', value: false, description: 'enable Teamd control support') +-- +2.20.1 + diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 138ff46e4a..87932c75e4 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -96,6 +96,7 @@ endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true +NETWORK_MANAGER_CONF_OPTS += -Dmobile_broadband_provider_info_database=/usr/share/mobile-broadband-provider-info/serviceproviders.xml else NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif -- 2.20.1 From heiko.thiery at gmail.com Mon Feb 13 12:40:23 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 13 Feb 2023 13:40:23 +0100 Subject: [Buildroot] [PATCH 2/2] package/network-manager: bump version to 1.42.0 In-Reply-To: <20230213124021.12522-1-heiko.thiery@gmail.com> References: <20230213124021.12522-1-heiko.thiery@gmail.com> Message-ID: <20230213124021.12522-2-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 3895c1ffc3..270699d63a 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.10.sha256sum -sha256 fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7 NetworkManager-1.40.10.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.42/NetworkManager-1.42.0.sha256sum +sha256 2f6756d507bb6b46716594b67e6fe7491891e1b5b167bbafc5157dfa7753d5b4 NetworkManager-1.42.0.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 87932c75e4..9188af29eb 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.40 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 +NETWORK_MANAGER_VERSION_MAJOR = 1.42 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 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 -- 2.20.1 From stefan at agner.ch Mon Feb 13 14:15:34 2023 From: stefan at agner.ch (Stefan Agner) Date: Mon, 13 Feb 2023 15:15:34 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: disable version control information Message-ID: <12a7772dc9c30d31bc4dd7a4e15ca12425c14834.1676297701.git.stefan@agner.ch> By default go tries to include version control (VCS) information in binaries. Since Buildroot separates version control from the build process it is sensible to disable this behavior. This avoids build errors when building with a git repository higher up in the tree owned by root. In this case the go build system calls `git status --porcelain` which returns with an error: fatal: detected dubious ownership in repository at '/build' Signed-off-by: Stefan Agner --- package/pkg-golang.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index cdc67b32c0..da9c9a21ac 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -45,7 +45,8 @@ $(2)_BUILD_OPTS += \ -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ - -p $$(PARALLEL_JOBS) + -p $$(PARALLEL_JOBS) \ + -buildvcs=false # Target packages need the Go compiler on the host at download time (for # vendoring), and at build and install time. -- 2.39.1 From d.lang at abatec.at Mon Feb 13 14:52:23 2023 From: d.lang at abatec.at (Lang Daniel) Date: Mon, 13 Feb 2023 14:52:23 +0000 Subject: [Buildroot] Dependency problem for gtkmm3 In-Reply-To: <20230213084735.5318a511@windsurf> References: <20230210231454.4f3aedbd@windsurf> <20230213084735.5318a511@windsurf> Message-ID: Hi Thomas, Dirk, > Hello Dirk, > > On Sun, 12 Feb 2023 08:51:17 +0000 > Dirk De Becker wrote: > >> Thank you for your quick reply. >> Will this issue be fixed in the 2023.02 release? > > It all depends on whether someone submits a fix for the issue. Do you > think you could have a look? The problem comes down to an incompatibility that I tried to point out some time ago [0]. Current versions of cairomm, pangomm, glibmm have a different ABI that's not supported in gtkmm 3.x.y. Even the most recent version of gtkmm 3.24.x doesn't support the current version of of the other -mm packages and according to the mailing list of gtkmm [1] there are no plans to support it. The are compatible with gtk4. As it stands gtkmm3 isn't usable and fixing it brings up the same problems of duplicating packages. [0]: https://lists.buildroot.org/pipermail/buildroot/2021-October/625850.html [1]: https://mail.gnome.org/archives/gtkmm-list/2021-May/msg00000.html > > Best regards, > > Thomas Regards Daniel From peter at korsgaard.com Mon Feb 13 14:53:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 15:53:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: switch to cmake build In-Reply-To: <20230124103149.588288-1-fido_max@inbox.ru> (Maxim Kochetkov via buildroot's message of "Tue, 24 Jan 2023 13:31:49 +0300") References: <20230124103149.588288-1-fido_max@inbox.ru> Message-ID: <873579boqu.fsf@dell.be.48ers.dk> >>>>> "Maxim" == Maxim Kochetkov via buildroot writes: > GDAL autoconf has wrong libgeotiff detection. It uses host's > library if installed instead of buildroot one. > Modern versions of gdal have no autoconf build scripts, just cmake only. > So move to cmake build variant. > Fixes: https://bugs.busybox.net/show_bug.cgi?id=15281 > Signed-off-by: Maxim Kochetkov Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 13 14:53:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 15:53:18 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/gdal: switch to cmake build to fix libgeotiff detection Message-ID: <20230213145415.E4FFA85C84@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0664cc9f46eb4ad7116daec6be6639d28d9ab79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x GDAL autoconf has wrong libgeotiff detection. It uses host's library if installed instead of buildroot one. Modern versions of gdal have no autoconf build scripts, just cmake only. So move to cmake build variant. Fixes: https://bugs.busybox.net/show_bug.cgi?id=15281 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 2b43579e9453a4e4f0d25d902634ebd9f1721dfc) Signed-off-by: Peter Korsgaard --- package/gdal/gdal.mk | 168 ++++++++++++++++++++++++++------------------------- 1 file changed, 87 insertions(+), 81 deletions(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 33e7ba724a..2d6dff1a93 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -12,6 +12,15 @@ GDAL_LICENSE_FILES = LICENSE.TXT GDAL_CPE_ID_VENDOR = osgeo GDAL_INSTALL_STAGING = YES GDAL_CONFIG_SCRIPTS = gdal-config +GDAL_SUPPORTS_IN_SOURCE_BUILD = NO + +# Using 'make' with CMake's Makefile generator will not work, as +# 'make' uses GNUmakefile first, but GNUmakefile is provided by +# autotools in gdal. We need to force 'make' to use the Makefile, +# which is generated by CMake. GNUmakefile and autoconf are dropped in +# 3.6 so this can be dropped in future version. +GDAL_MAKE_OPTS += -f Makefile + # gdal at its core only needs host-pkgconf, libgeotiff, proj and tiff # but since by default mrf driver support is enabled, it also needs # jpeg, libpng and zlib. By default there are also many other drivers @@ -20,97 +29,94 @@ GDAL_CONFIG_SCRIPTS = gdal-config # respectively needed dependencies. GDAL_DEPENDENCIES = host-pkgconf jpeg json-c libgeotiff libpng proj tiff zlib -# Yes, even though they have --with options, these few libraries are +# Yes, even though they have -DDGDAL_USE options, a few libraries are # mandatory. If we don't provide them, bundled versions are used. GDAL_CONF_OPTS = \ - --with-geotiff \ - --with-jpeg \ - --with-libjson-c=$(STAGING_DIR)/usr \ - --with-libtool \ - --with-libz \ - --with-png \ - --with-proj \ - --without-armadillo \ - --without-blosc \ - --without-brunsli \ - --without-cfitsio \ - --without-crypto \ - --without-cryptopp \ - --without-curl \ - --without-dds \ - --without-ecw \ - --without-expat \ - --without-exr \ - --without-fgdb \ - --without-freexl \ - --without-geos \ - --without-gnm \ - --without-libkml \ - --without-lz4 \ - --without-gta \ - --without-hdf4 \ - --without-hdf5 \ - --without-hdfs \ - --without-heif \ - --without-idb \ - --without-jp2lura \ - --without-java \ - --without-jpeg12 \ - --without-jxl \ - --without-kakadu \ - --without-kea \ - --without-lerc \ - --without-gif \ - --without-liblzma \ - --without-libdeflate \ - --without-mongocxxv3 \ - --without-mrsid \ - --without-jp2mrsid \ - --without-macosx-framework \ - --without-msg \ - --without-mysql \ - --without-netcdf \ - --without-null \ - --without-oci \ - --without-odbc \ - --without-ogdi \ - --without-opencl \ - --without-openjpeg \ - --without-pam \ - --without-pcidsk \ - --without-pcraster \ - --without-pcre \ - --without-pcre2 \ - --without-pdfium \ - --without-podofo \ - --without-poppler \ - --without-python \ - --without-qhull \ - --without-rasdaman \ - --without-rasterlite2 \ - --without-rdb \ - --without-sfcgal \ - --without-sosi \ - --without-spatialite \ - --without-sqlite3 \ - --without-teigha \ - --without-tiledb \ - --without-webp \ - --without-xerces \ - --without-zstd + -DGDAL_USE_GEOTIFF=ON \ + -DGDAL_USE_JPEG=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_PNG=ON \ + -DGDAL_USE_ARMADILLO=OFF \ + -DGDAL_USE_BLOSC=OFF \ + -DGDAL_USE_BRUNSLI=OFF \ + -DGDAL_USE_CFITSIO=OFF \ + -DGDAL_USE_OPENSSL=OFF \ + -DGDAL_USE_CRYPTOPP=OFF \ + -DGDAL_USE_CRNLIB=OFF \ + -DGDAL_USE_CURL=OFF \ + -DGDAL_USE_ECW=OFF \ + -DGDAL_USE_EXPAT=OFF \ + -DGDAL_USE_FILEGDB=OFF \ + -DGDAL_USE_FREEXL=OFF \ + -DGDAL_USE_GEOS=OFF \ + -DGDAL_USE_LIBKML=OFF \ + -DGDAL_USE_LZ4=OFF \ + -DGDAL_USE_GTA=OFF \ + -DGDAL_USE_HDF4=OFF \ + -DGDAL_USE_HDF5=OFF \ + -DGDAL_USE_HDFS=OFF \ + -DGDAL_USE_HEIF=OFF \ + -DGDAL_USE_IDB=OFF \ + -DGDAL_USE_LURATECH=OFF \ + -DGDAL_USE_JPEG12_INTERNAL=OFF \ + -DGDAL_USE_JXL=OFF \ + -DGDAL_USE_KDU=OFF \ + -DGDAL_USE_KEA=OFF \ + -DGDAL_USE_LERC=OFF \ + -DGDAL_USE_GIF=OFF \ + -DGDAL_USE_LIBLZMA=OFF \ + -DGDAL_USE_DEFLATE=OFF \ + -DGDAL_USE_MONGOCXX=OFF \ + -DGDAL_USE_MRSID=OFF \ + -DGDAL_USE_PUBLICDECOMPWT=OFF \ + -DGDAL_USE_MYSQL=OFF \ + -DGDAL_USE_NETCDF=OFF \ + -DGDAL_USE_ORACLE=OFF \ + -DGDAL_USE_ODBC=OFF \ + -DGDAL_USE_OGDI=OFF \ + -DGDAL_USE_OPENCL=OFF \ + -DGDAL_USE_OPENEXR=OFF \ + -DGDAL_USE_OPENJPEG=OFF \ + -DGDAL_USE_PCRE=OFF \ + -DGDAL_USE_PCRE2=OFF \ + -DGDAL_USE_PDFIUM=OFF \ + -DGDAL_USE_PODOFO=OFF \ + -DGDAL_USE_POPPLER=OFF \ + -DGDAL_USE_QHULL=OFF \ + -DGDAL_USE_RASDAMAN=OFF \ + -DGDAL_USE_RASTERLITE2=OFF \ + -DGDAL_USE_RDB=OFF \ + -DGDAL_USE_SFCGAL=OFF \ + -DGDAL_USE_FYBA=OFF \ + -DGDAL_USE_SPATIALITE=OFF \ + -DGDAL_USE_SQLITE3=OFF \ + -DGDAL_USE_TEIGHA=OFF \ + -DGDAL_USE_TILEDB=OFF \ + -DGDAL_USE_WEBP=OFF \ + -DGDAL_USE_XERCESC=OFF \ + -DGDAL_USE_ZSTD=OFF \ + -DGDAL_ENABLE_DRIVER_PCIDSK=OFF \ + -DGDAL_ENABLE_DRIVER_PCRASTER=OFF \ + -DGDAL_ENABLE_DRIVER_NULL=OFF \ + -DGDAL_ENABLE_MACOSX_FRAMEWORK=OFF \ + -DENABLE_GNM=OFF \ + -DENABLE_PAM=OFF \ + -DBUILD_JAVA_BINDINGS=OFF \ + -DBUILD_PYTHON_BINDINGS=OFF ifeq ($(BR2_PACKAGE_LIBXML2),y) GDAL_DEPENDENCIES += libxml2 -GDAL_CONF_OPTS += --with-xml2 +GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=ON else -GDAL_CONF_OPTS += --without-xml2 +GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=OFF endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql -GDAL_CONF_OPTS += --with-pg +GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON else -GDAL_CONF_OPTS += --without-pg +GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=OFF endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) From stefan at agner.ch Mon Feb 13 14:54:40 2023 From: stefan at agner.ch (Stefan Agner) Date: Mon, 13 Feb 2023 15:54:40 +0100 Subject: [Buildroot] [PATCH] package/dbus-broker: bump to release 33 In-Reply-To: <20230204115212.GC14083@scaer> References: <175cc1e7e72602b9c0e8d6b761cf72b375383189.1675421166.git.stefan@agner.ch> <20230204115212.GC14083@scaer> Message-ID: <4731f67c09026856282903ad811d15ca@agner.ch> On 2023-02-04 12:52, Yann E. MORIN wrote: > Stefan, All, > > On 2023-02-03 11:46 +0100, Stefan Agner spake thusly: >> This release contains mostly a bugfixes, with some improvements around >> error handling for unimplemented functionality and resiliency against >> runtime changes of dbus service-files. >> >> Signed-off-by: Stefan Agner >> --- >> package/dbus-broker/dbus-broker.hash | 2 +- >> package/dbus-broker/dbus-broker.mk | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash >> index f6c2cbe160..89b27ddddc 100644 >> --- a/package/dbus-broker/dbus-broker.hash >> +++ b/package/dbus-broker/dbus-broker.hash >> @@ -1,5 +1,5 @@ >> # Locally calculated >> -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz >> +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz >> sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE >> sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS >> sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md > > Unfortunately, there are issues with licensing info: > > $ make dbus-broker-legal-info > [...] > ERROR: subprojects/libcstdaux-1/AUTHORS has wrong sha256 hash: > ERROR: expected: > 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 > ERROR: got : > e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 > ERROR: Incomplete download, or man-in-the-middle (MITM) attack > make[1]: *** [package/dbus-broker/dbus-broker.mk:71: > dbus-broker-legal-info] Error 1 > make: *** [Makefile:23: _all] Error 2 > > Can you look into that and resubmit the bump, please? Change was due to copyright date bump and additional authors which is maintained in the same file. Will adjust the hash and resend. -- Stefan > > Regards, > Yann E. MORIN. > > >> diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk >> index e82b79220d..c4e3679a2e 100644 >> --- a/package/dbus-broker/dbus-broker.mk >> +++ b/package/dbus-broker/dbus-broker.mk >> @@ -4,7 +4,7 @@ >> # >> ################################################################################ >> >> -DBUS_BROKER_VERSION = 32 >> +DBUS_BROKER_VERSION = 33 >> DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz >> DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) >> >> -- >> 2.39.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Mon Feb 13 14:57:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 15:57:51 +0100 Subject: [Buildroot] [PATCH 1/3] package/kodi: fix armv5 build In-Reply-To: <20230117200821.2882597-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 17 Jan 2023 21:08:19 +0100") References: <20230117200821.2882597-1-bernd.kuhls@t-online.de> Message-ID: <87y1p1a9zk.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Disable neon support when not available. > Fixes build error not yet found by autobuilders > /tmp/cc8LvPwi.s: Assembler messages: > /tmp/cc8LvPwi.s:28: Error: selected processor does not support `vldmia r1,{ q4-q7 }' in ARM mode > /tmp/cc8LvPwi.s:29: Error: selected processor does not support `vldmia r0,{ q8-q11 }' in ARM mode > /tmp/cc8LvPwi.s:30: Error: selected processor does not support `vmul.f32 q0,q8,d8[0]' in ARM mode > /tmp/cc8LvPwi.s:31: Error: selected processor does not support `vmul.f32 q1,q8,d10[0]' in ARM mode > /tmp/cc8LvPwi.s:32: Error: selected processor does not support `vmul.f32 q2,q8,d12[0]' in ARM mode > /tmp/cc8LvPwi.s:33: Error: selected processor does not support `vmul.f32 q3,q8,d14[0]' in ARM mode > /tmp/cc8LvPwi.s:34: Error: selected processor does not support `vmla.f32 q0,q9,d8[1]' in ARM mode > /tmp/cc8LvPwi.s:35: Error: selected processor does not support `vmla.f32 q1,q9,d10[1]' in ARM mode > /tmp/cc8LvPwi.s:36: Error: selected processor does not support `vmla.f32 q2,q9,d12[1]' in ARM mode > /tmp/cc8LvPwi.s:37: Error: selected processor does not support `vmla.f32 q3,q9,d14[1]' in ARM mode > /tmp/cc8LvPwi.s:38: Error: selected processor does not support `vmla.f32 q0,q10,d9[0]' in ARM mode > /tmp/cc8LvPwi.s:39: Error: selected processor does not support `vmla.f32 q1,q10,d11[0]' in ARM mode > /tmp/cc8LvPwi.s:40: Error: selected processor does not support `vmla.f32 q2,q10,d13[0]' in ARM mode > /tmp/cc8LvPwi.s:41: Error: selected processor does not support `vmla.f32 q3,q10,d15[0]' in ARM mode > /tmp/cc8LvPwi.s:42: Error: selected processor does not support `vmla.f32 q0,q11,d9[1]' in ARM mode > /tmp/cc8LvPwi.s:43: Error: selected processor does not support `vmla.f32 q1,q11,d11[1]' in ARM mode > /tmp/cc8LvPwi.s:44: Error: selected processor does not support `vmla.f32 q2,q11,d13[1]' in ARM mode > /tmp/cc8LvPwi.s:45: Error: selected processor does not support `vmla.f32 q3,q11,d15[1]' in ARM mode > /tmp/cc8LvPwi.s:46: Error: selected processor does not support `vstmia r0,{ q0-q3 }' in ARM mode > with this defconfig: > BR2_arm=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_KODI=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > BR2_PACKAGE_MESA3D_OPENGL_ES=y > BR2_PACKAGE_PYTHON3=y > BR2_PACKAGE_PYTHON3_PY_ONLY=y Hi, are these fixed caused by new changes in kodi 19.5, or is 2022.02.x / 2022.11.x also affected? -- Bye, Peter Korsgaard From stefan at agner.ch Mon Feb 13 14:58:57 2023 From: stefan at agner.ch (Stefan Agner) Date: Mon, 13 Feb 2023 15:58:57 +0100 Subject: [Buildroot] [PATCH v2] package/dbus-broker: bump to release 33 Message-ID: <29cebb7af48c3652e440c61cc90fafa4fe3f8046.1676300324.git.stefan@agner.ch> This release contains mostly a bugfixes, with some improvements around error handling for unimplemented functionality and resiliency against runtime changes of dbus service-files. Signed-off-by: Stefan Agner --- package/dbus-broker/dbus-broker.hash | 6 +++--- package/dbus-broker/dbus-broker.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash index f6c2cbe160..06c8f229b7 100644 --- a/package/dbus-broker/dbus-broker.hash +++ b/package/dbus-broker/dbus-broker.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md @@ -11,7 +11,7 @@ sha256 23f24eeaaded5fedd6e7840b6f7b73838f9a4e2112ad6a12fe1ef958f73d0214 subpro sha256 05113a24aca4c537819dd0d91b95b13edb85bea4b6a77a6d9269becb397ed374 subprojects/libcrbtree-3/README.md sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md -sha256 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 subprojects/libcstdaux-1/AUTHORS -sha256 7c4b6c325b0bc02150089112f65132ee999b0f44500b73d1fc06d96c93161037 subprojects/libcstdaux-1/README.md +sha256 e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 subprojects/libcstdaux-1/AUTHORS +sha256 92006886d7f28894fef08bf97e35ef52147067bd3c4d4d6381da7c59f9901dae subprojects/libcstdaux-1/README.md sha256 7e660796fea0400a1a9a539226c345b3c656a745a334e323e33258de7864e985 subprojects/libcutf8-1/AUTHORS sha256 106099cc1c488cbf8911f56da7977a955f6b27a7bb5b815985e59d9fae0e6fe7 subprojects/libcutf8-1/README.md diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index e82b79220d..c4e3679a2e 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_BROKER_VERSION = 32 +DBUS_BROKER_VERSION = 33 DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) -- 2.39.1 From buildroot at heine.tech Mon Feb 13 15:10:39 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 13 Feb 2023 16:10:39 +0100 Subject: [Buildroot] [PATCH] package/networkd-dispatcher: bump to version 2.2.4 Message-ID: <20230213151039.4073397-1-buildroot@heine.tech> Signed-off-by: Michael Nosthoff --- package/networkd-dispatcher/networkd-dispatcher.hash | 2 +- package/networkd-dispatcher/networkd-dispatcher.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash index ffb4fa846a..f50dd75163 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.hash +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 61270b4c2f39c36da4b0a62724a3cc01f6732493fed0f166ee675bafedff11df networkd-dispatcher-2.2.3.tar.bz2 +sha256 993086fa2dab11ba6b54a121adaccbd4c679ce3c8b3193cfa5c00500c28cbdf9 networkd-dispatcher-2.2.4.tar.bz2 sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk index 2b1aa257ce..a3e0319c10 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.mk +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETWORKD_DISPATCHER_VERSION = 2.2.3 +NETWORKD_DISPATCHER_VERSION = 2.2.4 NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) NETWORKD_DISPATCHER_LICENSE = GPL-3.0 -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 13 18:11:20 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 13 Feb 2023 19:11:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: compress-offload needs kernel >= 5.7 Message-ID: <20230213181120.907459-1-fontaine.fabrice@gmail.com> SND_AUDIOCODEC_A{LAC,PE} are only available since kernel 5.7 and https://github.com/torvalds/linux/commit/0f546d6f0292fb624b4cf0cc70096ddb9ea070e6 resulting in the following build failure since bump to version 0.3.65 in commit 247e2d0eb1e60f483044d58bed58c5ed321528f7 and https://git.buildroot.net/buildroot/commit/?id=247e2d0eb1e60f483044d58bed58c5ed321528f7: ../spa/plugins/alsa/alsa-compress-offload-sink.c:183:11: error: 'SND_AUDIOCODEC_ALAC' undeclared here (not in a function); did you mean 'SND_AUDIOCODEC_AAC'? 183 | { SND_AUDIOCODEC_ALAC, }, | ^~~~~~~~~~~~~~~~~~~ | SND_AUDIOCODEC_AAC Moreover, flac_d is also only available since kernel 5.5 and https://github.com/torvalds/linux/commit/d2522335c92c090bf58531a2b696d7fe80ab2a7a Fixes: - http://autobuild.buildroot.org/results/9ecd9aca5edc3756154da59573157954f06e6537 Signed-off-by: Fabrice Fontaine --- package/pipewire/Config.in | 12 ++++++++++++ package/pipewire/pipewire.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/pipewire/Config.in b/package/pipewire/Config.in index f038291e87..4929e5d3d1 100644 --- a/package/pipewire/Config.in +++ b/package/pipewire/Config.in @@ -15,6 +15,18 @@ config BR2_PACKAGE_PIPEWIRE if BR2_PACKAGE_PIPEWIRE +config BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD + bool "pipewire Compress-Offload" + depends on !BR2_STATIC_LIBS # tinycompress + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + select BR2_PACKAGE_TINYCOMPRESS + help + Enable ALSA Compress-Offload support + +comment "pipewire Compress-Offload needs a toolchain w/ dynamic library, headers >= 5.7" + depends on BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + config BR2_PACKAGE_PIPEWIRE_EXAMPLES bool "pipewire examples" help diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 976d7783b9..ecf4a035ec 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -215,7 +215,7 @@ else PIPEWIRE_CONF_OPTS += -Dsdl2=disabled endif -ifeq ($(BR2_PACKAGE_TINYCOMPRESS),y) +ifeq ($(BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD),y) PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled PIPEWIRE_DEPENDENCIES += tinycompress else -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 13 18:12:17 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 13 Feb 2023 19:12:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix legal info Message-ID: <20230213181217.908103-1-fontaine.fabrice@gmail.com> Commit 57e297a215193c92f6a178139db53616f2ee23b5 forgot to update hash of COPYRIGHT file (year updated with https://github.com/postgres/postgres/commit/1fbcb1360bc19b89369209203ea7cc19b8cde224) Fixes: - http://autobuild.buildroot.org/results/93f40dc71619745ddc6741598c9a488c81ea440f Signed-off-by: Fabrice Fontaine --- package/postgresql/postgresql.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index e6a9bd6658..3e89d3ec35 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ # From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated -sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT +sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 13 18:13:32 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 13 Feb 2023 19:13:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/apr-util: security bump to version 1.6.3 Message-ID: <20230213181332.908961-1-fontaine.fabrice@gmail.com> *) SECURITY: CVE-2022-25147 (cve.mitre.org) Integer Overflow or Wraparound vulnerability in apr_base64 functions of Apache Portable Runtime Utility (APR-util) allows an attacker to write beyond bounds of a buffer. https://downloads.apache.org/apr/Announcement-aprutil-1.x.html https://downloads.apache.org/apr/CHANGES-APR-UTIL-1.6 Signed-off-by: Fabrice Fontaine --- package/apr-util/apr-util.hash | 4 ++-- package/apr-util/apr-util.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apr-util/apr-util.hash b/package/apr-util/apr-util.hash index 59ef590109..7e2793cd77 100644 --- a/package/apr-util/apr-util.hash +++ b/package/apr-util/apr-util.hash @@ -1,4 +1,4 @@ -# From http://www.apache.org/dist/apr/apr-util-1.6.1.tar.bz2.sha256 -sha256 d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b apr-util-1.6.1.tar.bz2 +# From http://www.apache.org/dist/apr/apr-util-1.6.3.tar.bz2.sha256 +sha256 a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5 apr-util-1.6.3.tar.bz2 # Locally calculated sha256 ef5609d18601645ad6fe22c6c122094be40e976725c1d0490778abacc836e7a2 LICENSE diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index fb0735f5e7..02b6d5e277 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -4,7 +4,7 @@ # ################################################################################ -APR_UTIL_VERSION = 1.6.1 +APR_UTIL_VERSION = 1.6.3 APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2 APR_UTIL_SITE = https://archive.apache.org/dist/apr APR_UTIL_LICENSE = Apache-2.0 -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 13 18:15:23 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 13 Feb 2023 19:15:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: bump to version 6.2.7 Message-ID: <20230213181523.910359-1-fontaine.fabrice@gmail.com> - host-pkgconf is now mandatory - switch to pcre2 which is supported since version 6.0.0 and https://github.com/zabbix/zabbix/commit/18917f919a68abc863a5c79ba88c0cb156255fdc - Update hash of README (links updated with https://github.com/zabbix/zabbix/commit/067f5f873fb18ae7b22c5eaef40f0898b98edeb5 https://github.com/zabbix/zabbix/commit/499dbc81b987513233d579610335b8938f1ae91d) https://github.com/zabbix/zabbix/blob/6.2.7/ChangeLog Signed-off-by: Fabrice Fontaine --- package/zabbix/Config.in | 2 +- package/zabbix/zabbix.hash | 4 ++-- package/zabbix/zabbix.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index 0f7a0b0003..377c0ff692 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ZABBIX bool "zabbix" depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Zabbix is an enterprise-class open source distributed monitoring solution. Zabbix is free of cost. Zabbix is diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash index 42cc0bda57..bb6127e5ec 100644 --- a/package/zabbix/zabbix.hash +++ b/package/zabbix/zabbix.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 19686628df76e8d5ef7c2ed2975b258c7ca3ec7d151b1bb59d7e132f9fc7c941 zabbix-5.4.9.tar.gz -sha256 10d68ec3abacc29222c07748fc5e5cb9474fd7cd9ccdde1b92ff941ded946b78 README +sha256 6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d zabbix-6.2.7.tar.gz +sha256 f8fc3fd12521b60d53d8c5d48a883eb3c9c5ddec9de986a273e1b77f69d811db README sha256 444fe54aecc95ac0f3314289c300afc73b3946a4dc9fbd7e022709b3e0924dd0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e00d693ba5..db9efed78b 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -4,8 +4,8 @@ # ################################################################################ -ZABBIX_VERSION_MAJOR = 5.4 -ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 +ZABBIX_VERSION_MAJOR = 6.2 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).7 ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING @@ -13,9 +13,8 @@ ZABBIX_CPE_ID_VENDOR = zabbix # We're patching m4/netsnmp.m4 ZABBIX_AUTORECONF = YES -ZABBIX_DEPENDENCIES = pcre +ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ - --with-libpcre=$(STAGING_DIR)/usr/bin/ \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \ -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 13 18:17:54 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 13 Feb 2023 19:17:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/open-iscsi: fix libressl build Message-ID: <20230213181754.913323-1-fontaine.fabrice@gmail.com> Fix the following libressl build failure raised since the addition of the package in commit 2a571acddd0badaf9636649d98fd095757878348: /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' Fixes: - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 Signed-off-by: Fabrice Fontaine --- ...01-SHA3-is-not-supported-by-libressl.patch | 144 ++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch diff --git a/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch new file mode 100644 index 0000000000..0423179d93 --- /dev/null +++ b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch @@ -0,0 +1,144 @@ +From 29a4c3a518d13bfc0a07915e7e87fbec2b66597c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 13 Feb 2023 08:55:11 +0100 +Subject: [PATCH] SHA3 is not supported by libressl + +Disable SHA3 with libressl as it is not supported resulting in the +following build failure: + +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': +auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' + +Fixes: + - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/open-iscsi/open-iscsi/pull/396] +--- + libopeniscsiusr/idbm.h | 2 ++ + usr/auth.c | 13 ++++++++++++- + usr/auth.h | 4 ++++ + usr/idbm.c | 2 ++ + 4 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h +index be5986f..1043b27 100644 +--- a/libopeniscsiusr/idbm.h ++++ b/libopeniscsiusr/idbm.h +@@ -56,7 +56,9 @@ enum iscsi_chap_algs { + ISCSI_AUTH_CHAP_ALG_MD5 = 5, + ISCSI_AUTH_CHAP_ALG_SHA1 = 6, + ISCSI_AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + ISCSI_AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5, + }; + +diff --git a/usr/auth.c b/usr/auth.c +index 46c328e..5f50e26 100644 +--- a/usr/auth.c ++++ b/usr/auth.c +@@ -181,9 +181,11 @@ static int auth_hash_init(EVP_MD_CTX **context, int chap_alg) { + case AUTH_CHAP_ALG_SHA256: + digest = EVP_sha256(); + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + digest = EVP_sha3_256(); + break; ++#endif + } + + if (*context == NULL) +@@ -298,7 +300,9 @@ static int + acl_chk_chap_alg_optn(int chap_algorithm) + { + if (chap_algorithm == AUTH_OPTION_NONE || ++#ifndef LIBRESSL_VERSION_NUMBER + chap_algorithm == AUTH_CHAP_ALG_SHA3_256 || ++#endif + chap_algorithm == AUTH_CHAP_ALG_SHA256 || + chap_algorithm == AUTH_CHAP_ALG_SHA1 || + chap_algorithm == AUTH_CHAP_ALG_MD5) +@@ -711,9 +715,11 @@ acl_chk_chap_alg_key(struct iscsi_acl *client) + case AUTH_CHAP_ALG_SHA256: + client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN; + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN; + break; ++#endif + } + return; + } +@@ -862,7 +868,10 @@ acl_local_auth(struct iscsi_acl *client) + client->local_state = AUTH_LOCAL_STATE_ERROR; + client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT; + break; +- } else if ((client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++ } else if ( ++#ifndef LIBRESSL_VERSION_NUMBER ++ (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++#endif + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) { +@@ -1824,6 +1833,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA256 due to crypto lib configuration"); + } + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) { + value_list[i++] = AUTH_CHAP_ALG_SHA3_256; +@@ -1832,6 +1842,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA3-256 due to crypto lib configuration"); + } + break; ++#endif + case ~0: + /* unset value in array, just ignore */ + break; +diff --git a/usr/auth.h b/usr/auth.h +index 16cdb24..9357772 100644 +--- a/usr/auth.h ++++ b/usr/auth.h +@@ -32,7 +32,9 @@ enum { + AUTH_CHAP_MD5_RSP_LEN = 16, + AUTH_CHAP_SHA1_RSP_LEN = 20, + AUTH_CHAP_SHA256_RSP_LEN = 32, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_SHA3_256_RSP_LEN = 32, ++#endif + AUTH_CHAP_RSP_MAX = 32, + }; + +@@ -67,7 +69,9 @@ enum { + AUTH_CHAP_ALG_MD5 = 5, + AUTH_CHAP_ALG_SHA1 = 6, + AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5 + }; + +diff --git a/usr/idbm.c b/usr/idbm.c +index 90bc142..082e1c6 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -200,7 +200,9 @@ static struct int_list_tbl { + { "MD5", AUTH_CHAP_ALG_MD5 }, + { "SHA1", AUTH_CHAP_ALG_SHA1 }, + { "SHA256", AUTH_CHAP_ALG_SHA256 }, ++#ifndef LIBRESSL_VERSION_NUMBER + { "SHA3-256", AUTH_CHAP_ALG_SHA3_256 }, ++#endif + }; + + static void +-- +2.39.0 + -- 2.39.0 From heiko.thiery at gmail.com Mon Feb 13 18:19:43 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 13 Feb 2023 19:19:43 +0100 Subject: [Buildroot] [PATCH 1/4] package/libyang: bump version to 2.1.30 Message-ID: <20230213181944.10292-1-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- package/libyang/libyang.hash | 2 +- package/libyang/libyang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index da8600351b..26a28d6eed 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f30ee1c3e13f0c5d25c4d2fb628e4b262b483d0a500464a7c12008ccc393a69e libyang-2.1.4.tar.gz +sha256 761cfd959342b147f6a43a84c931c7fde68dd3a1ad540a0e5302288b204f073d libyang-2.1.30.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 6c57a2dd42..f160035c09 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.1.4 +LIBYANG_VERSION = 2.1.30 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE -- 2.20.1 From heiko.thiery at gmail.com Mon Feb 13 18:19:45 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 13 Feb 2023 19:19:45 +0100 Subject: [Buildroot] [PATCH 2/4] package/libnetconf2: bump version to 2.1.28 In-Reply-To: <20230213181944.10292-1-heiko.thiery@gmail.com> References: <20230213181944.10292-1-heiko.thiery@gmail.com> Message-ID: <20230213181944.10292-2-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- package/libnetconf2/libnetconf2.hash | 2 +- package/libnetconf2/libnetconf2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 34e934089e..675c76a500 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2f1a6559e8e43ea18ea337ab5f194f8443695c7ab4dde5d7b2560603f9bf702a libnetconf2-2.1.25.tar.gz +sha256 72e9a6461fadbd22f0cf0d23ba68d62b297c8f564f7f2bee069748fb67fc3a24 libnetconf2-2.1.28.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 0d4294d8d3..e349c1bce4 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 2.1.25 +LIBNETCONF2_VERSION = 2.1.28 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause -- 2.20.1 From heiko.thiery at gmail.com Mon Feb 13 18:19:47 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 13 Feb 2023 19:19:47 +0100 Subject: [Buildroot] [PATCH 3/4] package/sysrepo: bump version to 2.2.36 In-Reply-To: <20230213181944.10292-1-heiko.thiery@gmail.com> References: <20230213181944.10292-1-heiko.thiery@gmail.com> Message-ID: <20230213181944.10292-3-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- package/sysrepo/sysrepo.hash | 2 +- package/sysrepo/sysrepo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index a90d8259bf..6a5e98f41b 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1bc866f13e41ba5e7e4acd52b5c3d42b1a2a1e032775e0a9b094f3265844cd25 sysrepo-2.2.12.tar.gz +sha256 bebb7901682eb23bf4c73d086d0a45c124ec751a67793a66024f1d4203425730 sysrepo-2.2.36.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 9da8c22ca2..6b031ae6f9 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.2.12 +SYSREPO_VERSION = 2.2.36 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause -- 2.20.1 From heiko.thiery at gmail.com Mon Feb 13 18:19:49 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 13 Feb 2023 19:19:49 +0100 Subject: [Buildroot] [PATCH 4/4] package/netopeer2: bump version to 2.1.49 In-Reply-To: <20230213181944.10292-1-heiko.thiery@gmail.com> References: <20230213181944.10292-1-heiko.thiery@gmail.com> Message-ID: <20230213181944.10292-4-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- package/netopeer2/netopeer2.hash | 2 +- package/netopeer2/netopeer2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index cc71a2dab8..6a278fbbaf 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b166fe3425bb55b5f330fb7f53158f613bffc07493925ac437193e4d2defb3e7 netopeer2-2.1.42.tar.gz +sha256 2b1daac037f18c303e0c0dc3318ba30196459472e4c59f2f8547ee74d4cdf31d netopeer2-2.1.49.tar.gz sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 7cb9202575..47fcd31acd 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETOPEER2_VERSION = 2.1.42 +NETOPEER2_VERSION = 2.1.49 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) NETOPEER2_DL_SUBDIR = netopeer2 NETOPEER2_LICENSE = BSD-3-Clause -- 2.20.1 From raphael.pavlidis at gmail.com Mon Feb 13 18:46:55 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Mon, 13 Feb 2023 19:46:55 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/sway: new package In-Reply-To: <87r0uwcjgp.fsf@dell.be.48ers.dk> References: <20221031124625.21172-1-raphael.pavlidis@gmail.com> <87h6vw5l2r.fsf@dell.be.48ers.dk> <7f57a607-bf3c-0250-ed23-c6fbf73961a3@gmail.com> <87r0uwcjgp.fsf@dell.be.48ers.dk> Message-ID: <13e96c75-2880-9631-0ae6-92be1e36c219@gmail.com> On 11.02.23 16:25, Peter Korsgaard wrote: >>>>>> "Raphael" == Raphael Pavlidis writes: > > > Hi Peter, > > On 08.02.23 14:43, Peter Korsgaard wrote: > > [--SNIP--] > >> How did you test this? Here wlroots with x11 support doesn't build > >> as we > >> don't have an Xwayland .pc file or binary in Buildroot. > >> > > I create a xwayland package, which build the xserver binary, but did > > not send the patch yet. (This will fix the problems with weston, too) > > Ok, thanks - Will you submit the xwayland package? > Yes, but I have to do some cleanups. Should I add you to CC then? From peter at korsgaard.com Mon Feb 13 19:26:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 13 Feb 2023 20:26:18 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/sway: new package In-Reply-To: <13e96c75-2880-9631-0ae6-92be1e36c219@gmail.com> (Raphael Pavlidis's message of "Mon, 13 Feb 2023 19:46:55 +0100") References: <20221031124625.21172-1-raphael.pavlidis@gmail.com> <87h6vw5l2r.fsf@dell.be.48ers.dk> <7f57a607-bf3c-0250-ed23-c6fbf73961a3@gmail.com> <87r0uwcjgp.fsf@dell.be.48ers.dk> <13e96c75-2880-9631-0ae6-92be1e36c219@gmail.com> Message-ID: <87pmad9xk5.fsf@dell.be.48ers.dk> >>>>> "Raphael" == Raphael Pavlidis writes: > On 11.02.23 16:25, Peter Korsgaard wrote: >>>>>>> "Raphael" == Raphael Pavlidis writes: >> > Hi Peter, >> > On 08.02.23 14:43, Peter Korsgaard wrote: >> > [--SNIP--] >> >> How did you test this? Here wlroots with x11 support doesn't build >> >> as we >> >> don't have an Xwayland .pc file or binary in Buildroot. >> >> >> > I create a xwayland package, which build the xserver binary, but did >> > not send the patch yet. (This will fix the problems with weston, too) >> Ok, thanks - Will you submit the xwayland package? >> > Yes, but I have to do some cleanups. Should I add you to CC then? Ok, please do. -- Bye, Peter Korsgaard From bernd.kuhls at t-online.de Mon Feb 13 19:31:34 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 13 Feb 2023 20:31:34 +0100 Subject: [Buildroot] [PATCH 1/3] package/kodi: fix armv5 build References: <20230117200821.2882597-1-bernd.kuhls@t-online.de> <87y1p1a9zk.fsf__32646.9581386604$1676300302$gmane$org@dell.be.48ers.dk> Message-ID: Am Mon, 13 Feb 2023 15:57:51 +0100 schrieb Peter Korsgaard: > Hi, are these fixed caused by new changes in kodi 19.5, or is 2022.02.x > / 2022.11.x also affected? Hi, afaics Kodi enables NEON for all arm CPUs since version 17.0: https://github.com/xbmc/xbmc/commit/ 262ebc90ee36054e7eac1baeda7ccbae9995f606#diff-17055ed9d2412a650b2178dd19d3a7ba28bf725b7a2babe2a78ef5037a02b6a9R18 Regards, Bernd From yann.morin.1998 at free.fr Mon Feb 13 20:06:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 13 Feb 2023 21:06:04 +0100 Subject: [Buildroot] [PATCH] package/flannel: use the github helper Message-ID: <20230213200604.2539630-1-yann.morin.1998@free.fr> Currently, flannel uses an ad-hoc github URL and a version-only tarball name, even though we already had the github helper (introduced in 2013) when flannel was introduced (in 2016). Switch to the github helper, which allows us to get a properly named tarball. Signed-off-by: Yann E. MORIN Cc: Geoff Levand --- package/flannel/flannel.hash | 2 +- package/flannel/flannel.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash index 6a0223a20f..bafc453097 100644 --- a/package/flannel/flannel.hash +++ b/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca v0.14.0.tar.gz +sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca flannel-0.14.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index 231cf90dfd..b4e2b2f777 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -5,8 +5,7 @@ ################################################################################ FLANNEL_VERSION = 0.14.0 -FLANNEL_SITE = https://github.com/flannel-io/flannel/archive -FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz +FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) FLANNEL_LICENSE = Apache-2.0 FLANNEL_LICENSE_FILES = LICENSE -- 2.25.1 From romain.naour at smile.fr Mon Feb 13 20:22:17 2023 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 13 Feb 2023 21:22:17 +0100 Subject: [Buildroot] [PATCH 1/1] configs/qemu: update defconfigs to Linux 6.1.11 In-Reply-To: <20230210131729.2577271-1-sebastian.weyer@smile.fr> References: <20230210131729.2577271-1-sebastian.weyer@smile.fr> Message-ID: <75ea1829-e9a5-002d-45b5-ca5d7f3d0f6e@smile.fr> Hello Sebastian, Le 10/02/2023 ? 14:17, Sebastian Weyer a ?crit?: > Just updating all qemu defconfigs to the latest Kernel version: > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=v6.1.11&dt=2 You said you only tested only on qemu aarch64-virt. But without a gitlab-ci access it's really time consuming to do a test for each of them. I tried to a quick test by switching to external toolchain instead https://gitlab.com/kubu93/buildroot/-/pipelines/776319124 No issue reported so far. > > Signed-off-by: Sebastian Weyer > --- > configs/qemu_aarch64_ebbr_defconfig | 4 ++-- > configs/qemu_aarch64_sbsa_defconfig | 4 ++-- > configs/qemu_aarch64_virt_defconfig | 4 ++-- > configs/qemu_arm_ebbr_defconfig | 4 ++-- > configs/qemu_arm_versatile_defconfig | 4 ++-- > configs/qemu_arm_vexpress_defconfig | 4 ++-- > configs/qemu_arm_vexpress_tz_defconfig | 4 ++-- > configs/qemu_m68k_mcf5208_defconfig | 4 ++-- > configs/qemu_m68k_q800_defconfig | 4 ++-- > configs/qemu_microblazebe_mmu_defconfig | 4 ++-- > configs/qemu_microblazeel_mmu_defconfig | 4 ++-- > configs/qemu_mips32r2_malta_defconfig | 4 ++-- > configs/qemu_mips32r2el_malta_defconfig | 4 ++-- > configs/qemu_mips32r6_malta_defconfig | 4 ++-- > configs/qemu_mips32r6el_malta_defconfig | 4 ++-- > configs/qemu_mips64_malta_defconfig | 4 ++-- > configs/qemu_mips64el_malta_defconfig | 4 ++-- > configs/qemu_mips64r6_malta_defconfig | 4 ++-- > configs/qemu_mips64r6el_malta_defconfig | 4 ++-- > configs/qemu_nios2_10m50_defconfig | 4 ++-- > configs/qemu_or1k_defconfig | 4 ++-- > configs/qemu_ppc64_e5500_defconfig | 4 ++-- > configs/qemu_ppc64_pseries_defconfig | 4 ++-- > configs/qemu_ppc64le_powernv8_defconfig | 4 ++-- > configs/qemu_ppc64le_pseries_defconfig | 4 ++-- > configs/qemu_ppc_bamboo_defconfig | 4 ++-- > configs/qemu_ppc_e500mc_defconfig | 4 ++-- > configs/qemu_ppc_g3beige_defconfig | 4 ++-- > configs/qemu_ppc_mac99_defconfig | 4 ++-- > configs/qemu_ppc_mpc8544ds_defconfig | 4 ++-- > configs/qemu_riscv32_virt_defconfig | 4 ++-- > configs/qemu_riscv64_nommu_virt_defconfig | 4 ++-- > configs/qemu_riscv64_virt_defconfig | 4 ++-- > configs/qemu_s390x_defconfig | 2 +- > configs/qemu_sh4_r2d_defconfig | 4 ++-- > configs/qemu_sh4eb_r2d_defconfig | 4 ++-- > configs/qemu_sparc64_sun4u_defconfig | 4 ++-- > configs/qemu_sparc_ss10_defconfig | 4 ++-- > configs/qemu_x86_64_defconfig | 4 ++-- > configs/qemu_x86_defconfig | 4 ++-- > configs/qemu_xtensa_lx60_defconfig | 4 ++-- > configs/qemu_xtensa_lx60_nommu_defconfig | 4 ++-- > 42 files changed, 83 insertions(+), 83 deletions(-) > > diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig > index d293ad0e60..78bab2a933 100644 > --- a/configs/qemu_aarch64_ebbr_defconfig > +++ b/configs/qemu_aarch64_ebbr_defconfig > @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" > > # Linux headers > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig > index 609444e787..9e36b40867 100644 > --- a/configs/qemu_aarch64_sbsa_defconfig > +++ b/configs/qemu_aarch64_sbsa_defconfig > @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-sbsa/a > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-sbsa/genimage.cfg" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig > index 03df0ad9e2..9bdf79c4f5 100644 > --- a/configs/qemu_aarch64_virt_defconfig > +++ b/configs/qemu_aarch64_virt_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > 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 > diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig > index f3e2d42a54..53e2d5d1d7 100644 > --- a/configs/qemu_arm_ebbr_defconfig > +++ b/configs/qemu_arm_ebbr_defconfig > @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" > > # Linux headers > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.9" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" > > diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig > index 4f43273a82..e61665a95e 100644 > --- a/configs/qemu_arm_versatile_defconfig > +++ b/configs/qemu_arm_versatile_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="versatile" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig > index 2c813456f4..b963862e2b 100644 > --- a/configs/qemu_arm_vexpress_defconfig > +++ b/configs/qemu_arm_vexpress_defconfig > @@ -20,12 +20,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > BR2_TARGET_ROOTFS_EXT2_SIZE="64M" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="vexpress" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" > diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig > index 576c441154..01dce8f4ca 100644 > --- a/configs/qemu_arm_vexpress_tz_defconfig > +++ b/configs/qemu_arm_vexpress_tz_defconfig > @@ -17,12 +17,12 @@ BR2_TARGET_ROOTFS_CPIO_UIMAGE=y > # BR2_TARGET_ROOTFS_TAR is not set > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="vexpress" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" > > diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig > index 0490b9e29e..e30bc13ab7 100644 > --- a/configs/qemu_m68k_mcf5208_defconfig > +++ b/configs/qemu_m68k_mcf5208_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig > index 30d8982db3..e089ff7864 100644 > --- a/configs/qemu_m68k_q800_defconfig > +++ b/configs/qemu_m68k_q800_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig > index 7bd2ae53b8..f4b53f7556 100644 > --- a/configs/qemu_microblazebe_mmu_defconfig > +++ b/configs/qemu_microblazebe_mmu_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" > BR2_LINUX_KERNEL_LINUX_BIN=y > diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig > index cd8c5a3cb2..8436a8b6f9 100644 > --- a/configs/qemu_microblazeel_mmu_defconfig > +++ b/configs/qemu_microblazeel_mmu_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" > BR2_LINUX_KERNEL_LINUX_BIN=y > diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig > index 49d84c308b..f22f1d168a 100644 > --- a/configs/qemu_mips32r2_malta_defconfig > +++ b/configs/qemu_mips32r2_malta_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig > index 5363018c47..5b5d5fe44f 100644 > --- a/configs/qemu_mips32r2el_malta_defconfig > +++ b/configs/qemu_mips32r2el_malta_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig > index f77feb9b6d..e8457ab246 100644 > --- a/configs/qemu_mips32r6_malta_defconfig > +++ b/configs/qemu_mips32r6_malta_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig > index 575034441a..ad5003c25f 100644 > --- a/configs/qemu_mips32r6el_malta_defconfig > +++ b/configs/qemu_mips32r6el_malta_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig > index e9438fda1e..c201b9da28 100644 > --- a/configs/qemu_mips64_malta_defconfig > +++ b/configs/qemu_mips64_malta_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig > index 4b1c8e22af..f34d8a55b9 100644 > --- a/configs/qemu_mips64el_malta_defconfig > +++ b/configs/qemu_mips64el_malta_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig > index 87ef7902af..500c69b7fb 100644 > --- a/configs/qemu_mips64r6_malta_defconfig > +++ b/configs/qemu_mips64r6_malta_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig > index 5774207f65..1b0a14b6bf 100644 > --- a/configs/qemu_mips64r6el_malta_defconfig > +++ b/configs/qemu_mips64r6el_malta_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig > index 4b9c53e8de..f88e88f108 100644 > --- a/configs/qemu_nios2_10m50_defconfig > +++ b/configs/qemu_nios2_10m50_defconfig > @@ -1,7 +1,7 @@ > BR2_nios2=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="10m50" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" > BR2_TARGET_ROOTFS_INITRAMFS=y > @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel needs mkimage > BR2_PACKAGE_HOST_UBOOT_TOOLS=y > diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig > index b3d9d79156..9faf0d174f 100644 > --- a/configs/qemu_or1k_defconfig > +++ b/configs/qemu_or1k_defconfig > @@ -10,12 +10,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" > > diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig > index 6ad03c4c87..6ca1321751 100644 > --- a/configs/qemu_ppc64_e5500_defconfig > +++ b/configs/qemu_ppc64_e5500_defconfig > @@ -12,12 +12,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as the kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig > index 50844dc93b..a059631adf 100644 > --- a/configs/qemu_ppc64_pseries_defconfig > +++ b/configs/qemu_ppc64_pseries_defconfig > @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="pseries" > BR2_LINUX_KERNEL_VMLINUX=y > > diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig > index f6a5c3d409..c380fe5205 100644 > --- a/configs/qemu_ppc64le_powernv8_defconfig > +++ b/configs/qemu_ppc64le_powernv8_defconfig > @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="powernv" > BR2_LINUX_KERNEL_VMLINUX=y > > diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig > index 7ce5a9d310..c3e14958ae 100644 > --- a/configs/qemu_ppc64le_pseries_defconfig > +++ b/configs/qemu_ppc64le_pseries_defconfig > @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" > BR2_LINUX_KERNEL_VMLINUX=y > > diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig > index f4cc5589e7..6d26cf5105 100644 > --- a/configs/qemu_ppc_bamboo_defconfig > +++ b/configs/qemu_ppc_bamboo_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig > index 0a1877c44b..e0f886dda4 100644 > --- a/configs/qemu_ppc_e500mc_defconfig > +++ b/configs/qemu_ppc_e500mc_defconfig > @@ -11,12 +11,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as the kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig > index 1c11bcf77d..62e20e8120 100644 > --- a/configs/qemu_ppc_g3beige_defconfig > +++ b/configs/qemu_ppc_g3beige_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig > index 2331041c2a..0e8bd6a0c6 100644 > --- a/configs/qemu_ppc_mac99_defconfig > +++ b/configs/qemu_ppc_mac99_defconfig > @@ -6,12 +6,12 @@ BR2_powerpc_7400=y > BR2_SYSTEM_DHCP="eth0" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="pmac32" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig > index b9a0812d52..b54e7b7d81 100644 > --- a/configs/qemu_ppc_mpc8544ds_defconfig > +++ b/configs/qemu_ppc_mpc8544ds_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" > BR2_LINUX_KERNEL_VMLINUX=y > diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig > index f354e303e5..1a12ed6a65 100644 > --- a/configs/qemu_riscv32_virt_defconfig > +++ b/configs/qemu_riscv32_virt_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.43" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="rv32" > BR2_LINUX_KERNEL_IMAGE=y > > diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig > index ee70beb208..2894f1f78a 100644 > --- a/configs/qemu_riscv64_nommu_virt_defconfig > +++ b/configs/qemu_riscv64_nommu_virt_defconfig > @@ -4,7 +4,7 @@ BR2_RISCV_64=y > # BR2_RISCV_USE_MMU is not set > > # Linux headers same as kernel, a 5.19 series To ease updates, such comment has been removed in other defconfigs. > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Busybox with hush > BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" > @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_DEFCONFIG="nommu_virt" > BR2_LINUX_KERNEL_IMAGE=y > > diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig > index b3174a152c..d6ab8a33c1 100644 > --- a/configs/qemu_riscv64_virt_defconfig > +++ b/configs/qemu_riscv64_virt_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.43" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_IMAGE=y > > diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig > index 6bbcca0896..cd160d9cf0 100644 > --- a/configs/qemu_s390x_defconfig > +++ b/configs/qemu_s390x_defconfig > @@ -17,7 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig > index 0f12b7dfe9..c300490c55 100644 > --- a/configs/qemu_sh4_r2d_defconfig > +++ b/configs/qemu_sh4_r2d_defconfig > @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Linux kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" > BR2_LINUX_KERNEL_ZIMAGE=y > diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig > index d5ee371e79..9e61a6f234 100644 > --- a/configs/qemu_sh4eb_r2d_defconfig > +++ b/configs/qemu_sh4eb_r2d_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Linux kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" > BR2_LINUX_KERNEL_ZIMAGE=y > diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig > index 485b497e71..a19e146dfa 100644 > --- a/configs/qemu_sparc64_sun4u_defconfig > +++ b/configs/qemu_sparc64_sun4u_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Linux kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" > > diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig > index 2ba04c0864..ee2b0a799b 100644 > --- a/configs/qemu_sparc_ss10_defconfig > +++ b/configs/qemu_sparc_ss10_defconfig > @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Linux kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" > > diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig > index cc505a8540..3608178f30 100644 > --- a/configs/qemu_x86_64_defconfig > +++ b/configs/qemu_x86_64_defconfig > @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" > BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y > diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig > index 34b7e2d292..ac3ba1da12 100644 > --- a/configs/qemu_x86_defconfig > +++ b/configs/qemu_x86_defconfig > @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" > > diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig > index cb78106091..e0ec91d2ac 100644 > --- a/configs/qemu_xtensa_lx60_defconfig > +++ b/configs/qemu_xtensa_lx60_defconfig > @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" > BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y > diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig > index 4be1b66edc..59c383fc40 100644 > --- a/configs/qemu_xtensa_lx60_nommu_defconfig > +++ b/configs/qemu_xtensa_lx60_nommu_defconfig > @@ -20,12 +20,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > # Linux headers same as kernel > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.11" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" > BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y Reviewed-by: Romain Naour Best regards, Romain From thomas.petazzoni at bootlin.com Mon Feb 13 22:18:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 23:18:05 +0100 Subject: [Buildroot] [git commit] package/libjxl: new package Message-ID: <20230213221841.DB11385CD3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e648d399d8bd609697e78f13f7fa76be06d91a57 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libjxl is the reference implementation of JPEG XL (encoder and decoder). https://github.com/libjxl/libjxl Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/libjxl/Config.in | 25 +++++++++++++ package/libjxl/libjxl.hash | 4 +++ package/libjxl/libjxl.mk | 33 +++++++++++++++++ support/testing/tests/package/test_libjxl.py | 53 ++++++++++++++++++++++++++++ toolchain/Config.in | 5 +++ 7 files changed, 123 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 28cad8f58f..df2b98ad53 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1688,6 +1688,7 @@ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/gnupg2/ F: package/highway/ +F: package/libjxl/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1712,6 +1713,7 @@ F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py diff --git a/package/Config.in b/package/Config.in index d205bcd816..fff2fb7a93 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1603,6 +1603,7 @@ menu "Graphics" source "package/libgta/Config.in" source "package/libgtk2/Config.in" source "package/libgtk3/Config.in" + source "package/libjxl/Config.in" source "package/libmediaart/Config.in" source "package/libmng/Config.in" source "package/libpng/Config.in" diff --git a/package/libjxl/Config.in b/package/libjxl/Config.in new file mode 100644 index 0000000000..da04b89f9b --- /dev/null +++ b/package/libjxl/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_LIBJXL + bool "libjxl" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # highway + depends on BR2_TOOLCHAIN_HAS_ATOMIC # highway + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP # highway + # libjxl fail to link statically due to libatomic issue + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + select BR2_PACKAGE_BROTLI + select BR2_PACKAGE_HIGHWAY + select BR2_PACKAGE_LCMS2 + help + libjxl is the reference implementation of JPEG XL (encoder + and decoder). + + https://github.com/libjxl/libjxl + +comment "libjxl needs a toolchain with C++, threads, gcc >= 7, dynamic library" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash new file mode 100644 index 0000000000..e71d32e61d --- /dev/null +++ b/package/libjxl/libjxl.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e libjxl-0.7.0.tar.gz +sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE +sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk new file mode 100644 index 0000000000..cc24ba258c --- /dev/null +++ b/package/libjxl/libjxl.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# libjxl +# +################################################################################ + +LIBJXL_VERSION = 0.7.0 +LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) +LIBJXL_LICENSE = BSD-3-Clause +LIBJXL_LICENSE_FILES = LICENSE PATENTS +LIBJXL_CPE_ID_VENDOR = libjxl_project +LIBJXL_INSTALL_STAGING = YES + +LIBJXL_DEPENDENCIES = \ + brotli \ + lcms2 \ + highway + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +LIBJXL_DEPENDENCIES += libpng +endif + +LIBJXL_CONF_OPTS = \ + -DJPEGXL_BUNDLE_LIBPNG=OFF \ + -DJPEGXL_BUNDLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_DOXYGEN=OFF \ + -DJPEGXL_ENABLE_JNI=OFF \ + -DJPEGXL_ENABLE_MANPAGES=OFF \ + -DJPEGXL_ENABLE_OPENEXR=OFF \ + -DJPEGXL_ENABLE_SJPEG=OFF \ + -DJPEGXL_ENABLE_SKCMS=OFF + +$(eval $(cmake-package)) diff --git a/support/testing/tests/package/test_libjxl.py b/support/testing/tests/package/test_libjxl.py new file mode 100644 index 0000000000..b6d5ffc9ce --- /dev/null +++ b/support/testing/tests/package/test_libjxl.py @@ -0,0 +1,53 @@ +import os + +import infra.basetest + + +class TestLibJXL(infra.basetest.BRTest): + # infra.basetest.BASIC_TOOLCHAIN_CONFIG is not used as it is armv5 + # and the image encoding would take too long (several minutes). + # We also add GraphicsMagick to generate and compare images for + # the test. + 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.79" + 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_GRAPHICSMAGICK=y + BR2_PACKAGE_LIBJXL=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", "256M", "-initrd", img]) + self.emulator.login() + + ref = "/var/tmp/reference.ppm" + jxl = "/var/tmp/encoded.jxl" + dec = "/var/tmp/decoded.ppm" + + cmd = "gm convert IMAGE:LOGO {}".format(ref) + self.assertRunOk(cmd) + + cmd = "cjxl {} {}".format(ref, jxl) + self.assertRunOk(cmd, timeout=30) + + cmd = "djxl {} {}".format(jxl, dec) + self.assertRunOk(cmd) + + cmd = "gm compare -metric mse -maximum-error 1e-3 {} {}".format( + ref, dec) + self.assertRunOk(cmd) diff --git a/toolchain/Config.in b/toolchain/Config.in index 01215e0e96..08e4ccad9e 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -141,6 +141,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_68485 bool default y if BR2_microblaze +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81426 +config BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + bool + default y if BR2_sh + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83143 # Error: invalid operands (*UND* and .text sections) for `-' on sh4. # This bug no longer exists in gcc 10.x but reappeared on gcc 11.x and From thomas.petazzoni at bootlin.com Mon Feb 13 22:18:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 23:18:03 +0100 Subject: [Buildroot] [git commit] package/highway: new package Message-ID: <20230213221841.CE86A85CD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4733f9bd5774171b8309e5c42e0419a0e8264308 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Highway is a C++ library that provides portable SIMD/vector intrinsics. https://github.com/google/highway Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + package/Config.in | 1 + ...0001-Check-for-the-presence-of-sys-auxv.h.patch | 62 ++++++++++++++++++++++ package/highway/Config.in | 34 ++++++++++++ package/highway/highway.hash | 3 ++ package/highway/highway.mk | 50 +++++++++++++++++ support/testing/tests/package/test_highway.py | 22 ++++++++ 7 files changed, 174 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index dcc607ba60..28cad8f58f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1687,6 +1687,7 @@ F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/gnupg2/ +F: package/highway/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1709,6 +1710,7 @@ F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_gnupg2.py +F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py diff --git a/package/Config.in b/package/Config.in index 511e691ed3..d205bcd816 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2034,6 +2034,7 @@ menu "Other" source "package/gsl/Config.in" source "package/gtest/Config.in" source "package/gumbo-parser/Config.in" + source "package/highway/Config.in" source "package/jemalloc/Config.in" source "package/lapack/Config.in" source "package/libabseil-cpp/Config.in" diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch new file mode 100644 index 0000000000..df86798613 --- /dev/null +++ b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch @@ -0,0 +1,62 @@ +From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Wed, 23 Nov 2022 23:27:11 +0100 +Subject: [PATCH] Check for the presence of + +Not all gcc versions are providing . Checking for +HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not +sufficient and fail to build in some situations (it was observed for +some gcc armv7m toolchains). + +This patch adds a check for and include it only if present. + +Signed-off-by: Julien Olivain +--- + CMakeLists.txt | 3 +++ + hwy/detect_targets.h | 2 +- + hwy/targets.cc | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b6b14ab..df6b5ab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,6 +84,9 @@ check_cxx_source_compiles( + HWY_RISCV + ) + ++include(CheckIncludeFile) ++check_include_file(sys/auxv.h HAVE_SYS_AUXV_H) ++ + if (HWY_ENABLE_CONTRIB) + # Glob all the traits so we don't need to modify this file when adding + # additional special cases. +diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h +index 7f7e179..f0c6f94 100644 +--- a/hwy/detect_targets.h ++++ b/hwy/detect_targets.h +@@ -392,7 +392,7 @@ + #define HWY_HAVE_RUNTIME_DISPATCH 1 + // On Arm, currently only GCC does, and we require Linux to detect CPU + // capabilities. +-#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX ++#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX && HAVE_SYS_AUXV_H + #define HWY_HAVE_RUNTIME_DISPATCH 1 + #else + #define HWY_HAVE_RUNTIME_DISPATCH 0 +diff --git a/hwy/targets.cc b/hwy/targets.cc +index 2fde4db..abd6a94 100644 +--- a/hwy/targets.cc ++++ b/hwy/targets.cc +@@ -42,7 +42,7 @@ + #include + #endif // HWY_COMPILER_MSVC + +-#elif HWY_ARCH_ARM && HWY_OS_LINUX ++#elif HWY_ARCH_ARM && HWY_OS_LINUX && HAVE_SYS_AUXV_H + #include + #include + #endif // HWY_ARCH_* +-- +2.38.1 + diff --git a/package/highway/Config.in b/package/highway/Config.in new file mode 100644 index 0000000000..f4cef30e01 --- /dev/null +++ b/package/highway/Config.in @@ -0,0 +1,34 @@ +config BR2_PACKAGE_HIGHWAY + bool "highway" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_INSTALL_LIBSTDCPP + # For gcc bug 58969, see: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58969 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++11, GCC_BUG_58969 + help + Highway is a C++ library that provides portable SIMD/vector + intrinsics. + + https://github.com/google/highway + +if BR2_PACKAGE_HIGHWAY + +config BR2_PACKAGE_HIGHWAY_CONTRIB + bool "Enable Contrib" + help + Build Highway contrib library which contains extra + SIMD-related utilities: an image class with aligned rows, a + math library (16 functions already implemented, mostly + trigonometry), and functions for computing dot products and + sorting. + +config BR2_PACKAGE_HIGHWAY_EXAMPLES + bool "Enable Examples" + help + Build Highway examples + +endif + +comment "highway needs a toolchain w/ C++, gcc >= 7" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/highway/highway.hash b/package/highway/highway.hash new file mode 100644 index 0000000000..3ff468443e --- /dev/null +++ b/package/highway/highway.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db highway-1.0.2.tar.gz +sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE diff --git a/package/highway/highway.mk b/package/highway/highway.mk new file mode 100644 index 0000000000..ed7f6ca871 --- /dev/null +++ b/package/highway/highway.mk @@ -0,0 +1,50 @@ +################################################################################ +# +# highway +# +################################################################################ + +HIGHWAY_VERSION = 1.0.2 +HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) +HIGHWAY_LICENSE = Apache-2.0 +HIGHWAY_LICENSE_FILES = LICENSE +HIGHWAY_INSTALL_STAGING = YES + +HIGHWAY_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_PACKAGE_HIGHWAY_CONTRIB),y) +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=ON +else +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=OFF +endif + +ifeq ($(BR2_PACKAGE_HIGHWAY_EXAMPLES),y) +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=ON +# Examples are not installed by cmake. This binary can be useful for +# quick testing and debug. +define HIGHWAY_INSTALL_EXAMPLES + $(INSTALL) -m 0755 \ + $(@D)/examples/hwy_benchmark \ + $(TARGET_DIR)/usr/bin/hwy_benchmark +endef +HIGHWAY_POST_INSTALL_TARGET_HOOKS += HIGHWAY_INSTALL_EXAMPLES +else +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=OFF +endif + +ifeq ($(BR2_ARM_FPU_VFPV4),y) +HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=ON +else +HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=OFF +endif + +# Workaround for gcc bug 104028 on m68k. +# See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104028 +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_104028),y) +HIGHWAY_CXXFLAGS += -O0 +endif + +HIGHWAY_CONF_OPTS += \ + -DCMAKE_CXX_FLAGS="$(HIGHWAY_CXXFLAGS)" + +$(eval $(cmake-package)) diff --git a/support/testing/tests/package/test_highway.py b/support/testing/tests/package/test_highway.py new file mode 100644 index 0000000000..f32363e26f --- /dev/null +++ b/support/testing/tests/package/test_highway.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestHighway(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_HIGHWAY=y + BR2_PACKAGE_HIGHWAY_EXAMPLES=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("hwy_benchmark", timeout=20) From thomas.petazzoni at bootlin.com Mon Feb 13 22:20:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 23:20:50 +0100 Subject: [Buildroot] [PATCH next v2 1/2] package/highway: new package In-Reply-To: <20221124220552.2836398-1-ju.o@free.fr> References: <20221124220552.2836398-1-ju.o@free.fr> Message-ID: <20230213232050.5fe67607@windsurf> On Thu, 24 Nov 2022 23:05:51 +0100 Julien Olivain wrote: > Highway is a C++ library that provides portable SIMD/vector intrinsics. > > https://github.com/google/highway > > Signed-off-by: Julien Olivain Thanks! I've applied, with some small changes, see below. > diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch > new file mode 100644 > index 0000000000..df86798613 > --- /dev/null > +++ b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch > @@ -0,0 +1,62 @@ > +From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001 > +From: Julien Olivain > +Date: Wed, 23 Nov 2022 23:27:11 +0100 > +Subject: [PATCH] Check for the presence of > + > +Not all gcc versions are providing . Checking for > +HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not > +sufficient and fail to build in some situations (it was observed for > +some gcc armv7m toolchains). > + > +This patch adds a check for and include it only if present. > + > +Signed-off-by: Julien Olivain Has this patch been submitted upstream? > diff --git a/package/highway/Config.in b/package/highway/Config.in > new file mode 100644 > index 0000000000..23861f0b94 > --- /dev/null > +++ b/package/highway/Config.in > @@ -0,0 +1,30 @@ > +config BR2_PACKAGE_HIGHWAY > + bool "highway" > + depends on BR2_TOOLCHAIN_HAS_ATOMIC > + depends on BR2_INSTALL_LIBSTDCPP > + # For gcc bug 58969, see: > + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58969 > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++11, GCC_BUG_58969 > + help > + Highway is a C++ library that provides portable SIMD/vector > + intrinsics. > + > + https://github.com/google/highway > + > +if BR2_PACKAGE_HIGHWAY > + > +config BR2_PACKAGE_HIGHWAY_CONTRIB > + bool "Enable Contrib" > + help > + Build Highway contrib library which contains extra > + SIMD-related utilities: an image class with aligned rows, a > + math library (16 functions already implemented, mostly > + trigonometry), and functions for computing dot products and > + sorting. > + > +config BR2_PACKAGE_HIGHWAY_EXAMPLES > + bool "Enable Examples" > + help > + Build Highway examples > + > +endif You forgot the Config.in comment matching the "depends on" of the main options: comment "highway needs a toolchain w/ C++, gcc >= 7" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 > +HIGHWAY_CXXFLAGS = $(TARGET_CXXFLAGS) > + > +ifeq ($(BR2_PACKAGE_HIGHWAY_CONTRIB),y) > +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=ON > +else > +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=OFF > +endif > + > +# Examples are not installed by cmake. This binary can be useful for > +# quick testing and debug. > +define HIGHWAY_INSTALL_EXAMPLES > + $(INSTALL) -m 0755 \ > + $(@D)/examples/hwy_benchmark \ > + $(TARGET_DIR)/usr/bin/hwy_benchmark > +endef I've moved this... > + > +ifeq ($(BR2_PACKAGE_HIGHWAY_EXAMPLES),y) > +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=ON ... here, as it is used only within this condition. Applied with those changes, 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 Mon Feb 13 22:22:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 23:22:35 +0100 Subject: [Buildroot] [PATCH next v2 2/2] package/libjxl: new package In-Reply-To: <20221124220552.2836398-2-ju.o@free.fr> References: <20221124220552.2836398-1-ju.o@free.fr> <20221124220552.2836398-2-ju.o@free.fr> Message-ID: <20230213232235.63bbc016@windsurf> Hello Julien, On Thu, 24 Nov 2022 23:05:52 +0100 Julien Olivain wrote: > libjxl is the reference implementation of JPEG XL (encoder and decoder). > > https://github.com/libjxl/libjxl > > Signed-off-by: Julien Olivain Thanks, I've applied with some small changes, see below. > diff --git a/package/libjxl/Config.in b/package/libjxl/Config.in > new file mode 100644 > index 0000000000..6a15bde107 > --- /dev/null > +++ b/package/libjxl/Config.in > @@ -0,0 +1,23 @@ > +config BR2_PACKAGE_LIBJXL > + bool "libjxl" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # highway > + depends on BR2_TOOLCHAIN_HAS_ATOMIC # highway > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_INSTALL_LIBSTDCPP # highway > + # libjxl fail to link statically due to libatomic issue > + depends on !BR2_STATIC_LIBS > + # GCC bug on sh4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81426 > + depends on !BR2_sh4 Changed to use a new BR2_TOOLCHAIN_HAS_GCC_BUG_81426 blind option. > + select BR2_PACKAGE_BROTLI > + select BR2_PACKAGE_HIGHWAY > + select BR2_PACKAGE_LCMS2 > + help > + libjxl is the reference implementation of JPEG XL (encoder > + and decoder). > + > + https://github.com/libjxl/libjxl > + > +comment "libjxl needs a toolchain with C++, threads, gcc >= 7" > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ > + !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_HAS_THREADS This was not complete: you have 6 "depends on" above, so 6 depends on should be handled here one way or another: comment "libjxl needs a toolchain with C++, threads, gcc >= 7, dynamic library" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS Applied with that change. Thanks a lot for the runtime tests, very useful as usual! Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From geoff at infradead.org Tue Feb 14 01:32:23 2023 From: geoff at infradead.org (Geoff Levand) Date: Mon, 13 Feb 2023 17:32:23 -0800 Subject: [Buildroot] [PATCH] package/flannel: use the github helper In-Reply-To: <20230213200604.2539630-1-yann.morin.1998@free.fr> References: <20230213200604.2539630-1-yann.morin.1998@free.fr> Message-ID: <22dce104-b4e5-6e61-7174-28ab0e11b679@infradead.org> On 2/13/23 12:06, Yann E. MORIN wrote: > Currently, flannel uses an ad-hoc github URL and a version-only tarball > name, even though we already had the github helper (introduced in 2013) > when flannel was introduced (in 2016). > > Switch to the github helper, which allows us to get a properly named > tarball. > > Signed-off-by: Yann E. MORIN > Cc: Geoff Levand > --- > package/flannel/flannel.hash | 2 +- > package/flannel/flannel.mk | 3 +-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash > index 6a0223a20f..bafc453097 100644 > --- a/package/flannel/flannel.hash > +++ b/package/flannel/flannel.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca v0.14.0.tar.gz > +sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca flannel-0.14.0.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk > index 231cf90dfd..b4e2b2f777 100644 > --- a/package/flannel/flannel.mk > +++ b/package/flannel/flannel.mk > @@ -5,8 +5,7 @@ > ################################################################################ > > FLANNEL_VERSION = 0.14.0 > -FLANNEL_SITE = https://github.com/flannel-io/flannel/archive > -FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz > +FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) > > FLANNEL_LICENSE = Apache-2.0 > FLANNEL_LICENSE_FILES = LICENSE Looks good. Thanks for working it out. Acked-by: Geoff Levand From fido_max at inbox.ru Tue Feb 14 05:20:37 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Tue, 14 Feb 2023 08:20:37 +0300 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix legal info In-Reply-To: <20230213181217.908103-1-fontaine.fabrice@gmail.com> References: <20230213181217.908103-1-fontaine.fabrice@gmail.com> Message-ID: <1c1cf3a6-fb4a-fa1c-dd09-29c0ac1a23c1@inbox.ru> On 13.02.2023 21:12, Fabrice Fontaine wrote: > Commit 57e297a215193c92f6a178139db53616f2ee23b5 forgot to update hash of > COPYRIGHT file (year updated with > https://github.com/postgres/postgres/commit/1fbcb1360bc19b89369209203ea7cc19b8cde224) > > Fixes: > - http://autobuild.buildroot.org/results/93f40dc71619745ddc6741598c9a488c81ea440f > > Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov > --- > package/postgresql/postgresql.hash | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash > index e6a9bd6658..3e89d3ec35 100644 > --- a/package/postgresql/postgresql.hash > +++ b/package/postgresql/postgresql.hash > @@ -1,4 +1,4 @@ > # From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 > sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 > # License file, Locally calculated > -sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT > +sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT From marcus.folkesson at gmail.com Tue Feb 14 06:38:21 2023 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Tue, 14 Feb 2023 07:38:21 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/pkg-kconfig.mk new -show-fragment target In-Reply-To: <20230130104308.483243-1-marcus.folkesson@gmail.com> References: <20230130104308.483243-1-marcus.folkesson@gmail.com> Message-ID: Ping Den m?n 30 jan. 2023 kl 11:43 skrev Marcus Folkesson < marcus.folkesson at gmail.com>: > This patch introduce the new target to simplify the generation of > configuration fragments as the output could be directly copied into a > fragment file as-is. > > It is *heavily* based on the -diff-config target, but serves a > different purpose. > > Output from linux-diff-config: > -CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK y > -CONFIG_GCC_PLUGIN_CYC_COMPLEXITY n > -CONFIG_GCC_PLUGIN_LATENT_ENTROPY n > -CONFIG_GCC_PLUGIN_RANDSTRUCT n > -CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF n > -CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL n > -CONFIG_GCC_PLUGIN_STRUCTLEAK_USER n > -CONFIG_STACKPROTECTOR_PER_TASK y > CONFIG_CRYPTO_DH n -> y > CONFIG_CRYPTO_KPP m -> y > CONFIG_GCC_PLUGINS y -> n > CONFIG_KEY_DH_OPERATIONS n -> y > CONFIG_PKCS8_PRIVATE_KEY_PARSER n -> y > CONFIG_VIDEO_IMX274 n -> m > > Output from linux-show-fragment: > CONFIG_CRYPTO_DH=y > CONFIG_CRYPTO_KPP=y > CONFIG_KEY_DH_OPERATIONS=y > CONFIG_PKCS8_PRIVATE_KEY_PARSER=y > CONFIG_VIDEO_IMX274=m > > Signed-off-by: Marcus Folkesson > --- > package/pkg-kconfig.mk | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk > index f4f35bf96a..ee96525c47 100644 > --- a/package/pkg-kconfig.mk > +++ b/package/pkg-kconfig.mk > @@ -309,12 +309,26 @@ $(1)-diff-config: $(1)-check-configuration-done > $$(Q)cp -a $$($(2)_DIR)/.config.dc.bak > $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) > $$(Q)rm -f $$($(2)_DIR)/.config.dc.bak > > +# Target to output differences between the configuration obtained via the > +# defconfig + fragments (if any) and the current configuration. > +# Output format is suitable to be used as-is in fragment files. > +# Note: it preserves the timestamp of the current configuration when > moving it > +# around. > +$(1)-show-fragment: $(1)-check-configuration-done > + $$(Q)cp -a $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) > $$($(2)_DIR)/.config.dc.bak > + $$(call > kconfig-package-merge-config,$(2),$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG),\ > + $$($(2)_KCONFIG_FRAGMENT_FILES)) > + $$(Q)utils/diffconfig -m $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) \ > + $$($(2)_DIR)/.config.dc.bak > + $$(Q)cp -a $$($(2)_DIR)/.config.dc.bak > $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) > + $$(Q)rm -f $$($(2)_DIR)/.config.dc.bak > > endif # package enabled > > .PHONY: \ > $(1)-diff-config \ > $(1)-check-configuration-done \ > + $(1)-show-fragment \ > $$($(2)_DIR)/.kconfig_editor_% \ > $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)) > > -- > 2.38.1 > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Tue Feb 14 06:40:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 14 Feb 2023 06:40:28 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-13 Message-ID: <20230214064033.4D0F081DF7@smtp1.osuosl.org> Hello, Autobuild statistics for 2023-02-13 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 1 | 2 | 0 | 3 | 2022.11.x | 18 | 18 | 0 | 36 | master | 135 | 193 | 4 | 332 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 13 host-go-1.19.5 | 8 package/postgresql/postgres... | 8 elfutils-0.186 | 6 host-rust-1.67.0 | 6 unknown | 6 gobject-introspection-1.72.0 | 5 host-binutils-2.38 | 5 libgcrypt-1.10.1 | 5 linux-6.1.9 | 5 gerbera-1.10.0 | 4 glibc-2.36-81-g4f4d7a13edfd... | 4 olsr-0.9.8 | 4 zabbix-5.4.9 | 4 host-libarchive-3.6.2 | 3 host-pahole-1.24 | 3 libgpg-error-1.46 | 3 systemd-252.4 | 3 dmalloc-5.6.5 | 2 erlang-22.3.4.22 | 2 fs/ubifs/ubifs.mk:49: /home... | 2 gobject-introspection | 2 host-binutils-2.39 | 2 libglib2-2.72.3 | 2 linux-5.10.162-cip24 | 2 linux-5.10.162-cip24-rt10 | 2 lirc-tools-0.10.2 | 2 opus-1.3.1 | 2 php-8.2.2 | 2 postgresql-legal-info | 2 rsync-3.2.7 | 2 valgrind-3.19.0 | 2 xenomai-3.0.10 | 2 ace-7.0.6 | 1 assimp-5.2.5 | 1 attr-2.5.1 | 1 audit-3.0.7 | 1 bind-9.16.33 | 1 boost-1.80.0 | 1 brltty-6.5 | 1 containerd-1.6.16 | 1 dc3dd-7.2.641 | 1 ding-libs-0.6.2 | 1 dust-0.8.1 | 1 edid-decode-188950472c19492... | 1 expat-2.5.0 | 1 ffmpeg | 1 fluent-bit-2.0.8 | 1 fontconfig-2.13.1 | 1 freeradius-client-1.1.7 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubi/ubi.mk:51: /tmp/inst... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fwts-22.09.00 | 1 gmp-6.2.1 | 1 gqrx-2.14.4 | 1 host-binutils-2.37 | 1 host-gcc-final-10.4.0 | 1 host-gcc-final-11.3.0 | 1 host-gcc-final-12.2.0 | 1 host-runc-1.1.4 | 1 hyperfine-1.14.0 | 1 jack2-1.9.21 | 1 jailhouse-0.12 | 1 janet-1.26.0 | 1 libcamera-apps-1.1.1 | 1 libcurl-7.87.0 | 1 libdill-32d0e8b733416208e04... | 1 libfreeimage-3.18.0 | 1 libudfread-1.1.2 | 1 libxml2-2.10.3 | 1 ltp-testsuite-20220930 | 1 mawk | 1 mesa3d-demos-8.5.0 | 1 multipath-tools-0.9.4 | 1 netsurf-3.10 | 1 ocf-linux-20171122 | 1 openvmtools-11.3.5-18557794 | 1 optee-client-3.19.0 | 1 perl-5.36.0 | 1 pipewire-0.3.65 | 1 python-numpy-1.23.5 | 1 python-pymupdf-1.21.1 | 1 python-sip-4.19.25 | 1 rdma-core-44.0 | 1 rtl8812au-aircrack-ng-e7a4a... | 1 rtl8821cu-86cc5ceb7c28b9b99... | 1 ruby-3.1.3 | 1 toolchain-external-codescap... | 1 traceroute-2.1.0 | 1 uclibc-1.0.42 | 1 ulog-0389d243352255f6182326... | 1 uqmi-0a19b5b77140465c29e2af... | 1 volk-2.5.2 | 1 wolfssl-5.5.3 | 1 xvisor-0.3.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/a18c9a471786632f1790ecf9d985838722ffbf2d | mips | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/18b9c0e3b877ccf0a2ef004a7e9b1c132b3515f7 | ORPH mips64el | attr-2.5.1 | NOK | http://autobuild.buildroot.net/results/dfae3378d9e93a688d000d0ac88873bc686e29f0 | arm | audit-3.0.7 | NOK | http://autobuild.buildroot.net/results/35e6df7243ab6b4505380eb15fcabb438c673fc0 | sh4 | bind-9.16.33 | NOK | http://autobuild.buildroot.net/results/06d95cca882f6a58a7b89463e6f602d926da1bf9 | ORPH or1k | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/19f36081bcf386911622c48d3ad03f40fddec360 | powerpc64le | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/6aad75e66463045b33cdffcda67e4eaa08ffe80d | aarch64 | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/f0e72626ecaa9d4af1b16464cb921b39510676bb | or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/417bcbd3f5748a98d6af7aa7772c2c6447bb0127 | ORPH arc | ding-libs-0.6.2 | NOK | http://autobuild.buildroot.net/results/f26ceaea1e91af208cb5ca5576bc6346d9244b1c | powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/c9fa0fb349d5b1351bde2362dc26fff2314c26a9 | ORPH powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/091858c740cedf28164dd2d0a891980341b28af4 | ORPH armeb | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/c14f3612891b40c9ac053ccd5b31c35ba4ef1179 | ORPH riscv64 | edid-decode-188950472c19492... | NOK | http://autobuild.buildroot.net/results/dfdd2284b407df880fb83ea2766f5f0c566ef35c | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/ad7342f721a5855011e9e7663999ecf45ef60ddb | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/728a1a9a187b47b80efaec5297246fddd129bf48 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/387aac8443f8098a018623ed62260d7355c3e6ef | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/c65e90ba56d1ae8061eae11014768e6a5f4c4c32 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/50227e3e281a1e28848b2e1ae0dc1123cfca7fc2 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3469a1cfe2868194102376f19188a5d0a48bebf6 | ORPH sparc64 | erlang-22.3.4.22 | NOK | http://autobuild.buildroot.net/results/48527d6610e3afa13841e921acecddf023145268 | x86_64 | erlang-22.3.4.22 | NOK | http://autobuild.buildroot.net/results/ea968af1e2d32b616755fe83d297f72ab009fb0e | mips64el | expat-2.5.0 | NOK | http://autobuild.buildroot.net/results/198c9fed072fbb87bd21beac7fe40104a6ed8176 | i686 | ffmpeg | TIM | http://autobuild.buildroot.net/results/6830f1b80c0b8af0133e2fa5f03cf4700577ac88 | s390x | fluent-bit-2.0.8 | NOK | http://autobuild.buildroot.net/results/f7962b003a5391cafd3ba7594e9ab2cf901968d6 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/db3b254dbdd409dec3e70c1b489d7473c0a7b33a | ORPH riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/325ca998c1f70fe28f28ff8ec762ba18c22f99ed | microblazeel | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/7b0c134d1f7a23882c44eb2c2ec779d1265ca5e3 | mips | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/6323d814e7dacbaae8a16217c7c6832b3703950b | armeb | fs/ubi/ubi.mk:51: /tmp/inst... | NOK | http://autobuild.buildroot.net/results/46e91a391913f927429e61f92243afb13bcfebd6 | microblazeel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/0aecfe0c22274d623a78907e32322e700a1f101f | armeb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/ad78cc33806706d4ee72bd521fb66cb2eb2cee6b | powerpc64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/ffc22d8bedc9862c775e221c336515c5218131fd | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/a9db0663e4dbd5096184eb3c4a920add5f224ce2 | xtensa | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/e258dc36ec6d9d3273b485a7ed8a6d00b2624b37 | mips | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/bdd396ef095d8e2c9556d3c398ff263f2e8357f9 | arm | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/02d284654057af08162d0cb9edc3e6bbb2ffba32 | microblaze | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/50391e1463ce25db972b2e202c7cb820826c006d | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/ccaaea6c362d57e2daf0a12621b3004febbcfdf2 | s390x | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/b210a78f2bfb622a6cf488a78908c2647719009d | mips64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/ee1909c631cba531070cd67e6c3546be26773bea | x86_64 | fwts-22.09.00 | NOK | http://autobuild.buildroot.net/results/1c00b8f72b0098974add7b4604fe95f2d4329678 | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/3105d25c30e64eae3dbed5379270e3a7c8696327 | s390x | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/bf6380d241dd2dfd7dc0421ea8c2108351893600 | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/6d5b9c1b0f089aee1cb16327bbee50b5527ad8d1 | m68k | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/081bd5474d574f5f45a158e1829ab0dc628ea2bd | riscv32 | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/32dea54f343ce8543b3e598afa8f0b96841acfae | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/0c8d76de4f495c1d41664dc756b0b3900aebfdf6 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/7c02fcf63db132bed901697042391774d98a60f4 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b124ee2d554c1a28b38420bf9000f6571c689964 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/ab8fae8289e96fca3b4ee948b9076e0425f45ba0 | ORPH aarch64_be | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/8868c105ad5d1c8333b02b03097f9a213b85c4ae | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/b9f7d2edcadd4f785817be502a73f357f4fa480e | aarch64_be | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9bd34162265ad04e8a770634ce143c7387ab4ba2 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6df7bb5f30e1438362877fb8eb92fa0c85e56907 | or1k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a35b27be105388c965ce93203ae80ff0946fc5a3 | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/3a294511b2ccc4c4463aa50c1d7c742205d93f6b | i686 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a90db8e1e310858e6ffbbd4aacd7581107d1926f | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/f2f04c2eb3076c7528dd58dfaf94cc4b44ba6344 | aarch64_be | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a75fd752dbd10da441ead9cda39f206315ae258a | sparc | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/acdfa41e8f7c3f6de2b6cf4fe5b13688c0230b0c | nios2 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/f0f5b4d817d235f65a96529ccce1108c315d6145 | mips64el | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/82cb5f9c6c7bf2d01d73c9ed8fcea669779cf10b | nios2 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/3d735d2258dd872dbd50c5358bc4f7b4b8338a6d | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/a25e7938f9fd6e890ed9a652f9509790686b62ce | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/4e7bc1b18c030937f31fb4b2c563324160b6344f | powerpc | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/61ed6ffcec3d7ed29073ab8bb64782323e1cd01f | ORPH mips | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5d8303851152fb4a44c3e87b5b185dd99afbc686 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0537b05399f9eefc9a77ef195be892e6555ef2e0 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3f89a980cbc32e60a9b55330cbb8aa6f63545024 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7100592c8ced090a50b727f8c58884fc7085ab98 | ORPH aarch64_be | gqrx-2.14.4 | NOK | http://autobuild.buildroot.net/results/42b5ab2e555063273ea55fd1c09a9be6d8b620e2 | or1k | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/5699dcd4a21d137334cc9df0743100301444f499 | riscv32 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/230ac4c60497236eac11b74e45df4ffcaad8933e | aarch64_be | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/72d5e1894242d092f4cdeb4f2bbfdf12614acace | nios2 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/49fac1ff741b7ab06962835bd00e2fe89fd62800 | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2f5be22d5aae3793413fd8566b4d995a19e4f379 | or1k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/892bdddc021451157e46f626264f536938c9cb81 | mips64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/9e32209526d39dad8e1d9f63af036ab9d8f45cc7 | mips | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/90293fa6c6eafb705b9dd5745614047d8c0ca5bd | riscv32 | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/94a0da7f503a2a67a6cf05cb103385a0b35cd724 | arceb | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/21c70302a4bd25c8075650b29ec52a82bb5ddece | microblaze | host-gcc-final-12.2.0 | NOK | http://autobuild.buildroot.net/results/574c9686e4b0f54e38909851abb57c328f266733 | riscv64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/3ede83521a087f11b2463907c5a5e4d69b665f2d | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/c8f69909ddb69f04b9f720d91587276f056d86cb | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/21a3509011770d0f7ce9e593c47e5c3cf7c502f4 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/76a37309b2b8188d592c19a83e71bc160a4f343a | arc | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/19515bf7334c676e4b847938c8de5f973c781d68 | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/3e27768aea451b364fd2ccd4ed91ac9f4634acec | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/cf0e13e05b890d0be3822350603e0f118f28a768 | aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/5af0899215a3a41cd67f17e6db4e4d19906cceed | sparc | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/9857bf0454d4684b479b0d710721ab693a38728b | or1k | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/88111f1ef1bde2798611195dbf5c531955d0da23 | m68k | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/9aacc32d35cd23dcad0930f2d1dd089c25cc708a | i686 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/45e1a67e0a1e93419dcdef0446ec14e8daece748 | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/db3d60b0f17713f9b5ac4db53cecfaff07f7c207 | xtensa | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/4b1c251886d06f79a237b2d9abd732b9fd4a84f3 | or1k | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/c3f3de2a7dd1a465c62948ef3a91e28274f8f3e6 | mipsel | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/7ec413f13a56b354a24b7ef69006ecbb49d15df1 | powerpc64le | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/ab42b30ff4a848cddde2610d29ce68c5035d848b | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/94096259ee11bd17ade743aa398733500a25c537 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/d81e1a54b14ab25b4668b0b5c82037f5257f789e | sparc64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/be9c80c8382d272feb65e53dead3a13139e495b3 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/08b93ff45d70d215e2ed0213a2a1cf176651c3ed | armeb | hyperfine-1.14.0 | NOK | http://autobuild.buildroot.net/results/9ea7ba64367c2eaf191c668444bd52642d7ce960 | ORPH m68k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/aae15f54e06bfd5c00aaf38fc78bc65ed98c2575 | x86_64 | jailhouse-0.12 | NOK | http://autobuild.buildroot.net/results/fcd1dc058f6bc9ed8f86c2deb2de5092b86310b9 | xtensa | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/d517f990a730038435323a8c24e752b1fb985e23 | arm | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/391445bfea4ae447622f0a4dd39de3420b6e1398 | arceb | libcurl-7.87.0 | NOK | http://autobuild.buildroot.net/results/3eaa4ee44920285cea2a73f6279bb142f0df9063 | arm | libdill-32d0e8b733416208e04... | NOK | http://autobuild.buildroot.net/results/7b0ec76f05dd978517c1163e0f7521f6e393fe3d | powerpc64le | libfreeimage-3.18.0 | NOK | http://autobuild.buildroot.net/results/a029b31bfa8de58ab5b2665e5e03bcc812d7ff92 | armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/1a27a255ce62ce63a36043cd89d4dc913ab8efb1 | ORPH i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/1ba900ea50270338cda8fe9ffff1a5c637784404 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/60f2d4c98441cbff7c2edf7e73505814a40366b2 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/9da0863e4ce8b3f612f2279a75bb8f9cd22f1806 | ORPH i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/3990f03e4deb21551b320f792647adc067416b74 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/b63e152d47f65476dd3631ae0fa69b45aaf1d651 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/6cc4594437094c3c88898f344ac99c6e60994cd9 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/89910bb1e73fb27a6f85afa41128c74ba78c25bf | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/21997a0a40378cdc00c1420c5748dfcb28dee4e3 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/7478e88bb5511a2087973d3bf2d05bf2422a6ca2 | ORPH arm | libudfread-1.1.2 | NOK | http://autobuild.buildroot.net/results/754596590db80c6250d60b8d3c156ae1ccaf624b | mips64 | libxml2-2.10.3 | NOK | http://autobuild.buildroot.net/results/d1a0f90e0b3f8ead5a3320941f894a635507d0cf | m68k | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/e09104ccffe408a34a124e1fd357d7816591845c | ORPH mipsel | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/83a2bebb7efc709ef662b470df39c65ae1fdebb2 | ORPH sh4a | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/ef1674176eaad3f591ce812be946b38e65f7bd92 | ORPH nios2 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/33520bc829f138035aa6dbdc1718fab12c3c21a9 | ORPH mips | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/423554fcd1721ca8814bade3fec60c69fdbaa146 | ORPH i686 | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/2587b82a352798922a864b9b74d5f74d39e98945 | ORPH powerpc | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/4afe577b30023a525fbb2a14fcebbe587ee056f3 | ORPH mips64el | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/f0995716a2a5fada06ec224e4b5f21f26ade6e83 | ORPH arceb | linux-6.1.9 | NOK | http://autobuild.buildroot.net/results/4239f11f6864aa3c04e2eca4fcb5712f7e970874 | ORPH aarch64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/038271a34d88abceb81aa941db5c9706f75380d9 | ORPH aarch64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/3ffd1cd536e82e4dae21824976d5d4c5b324c9bc | ORPH powerpc64le | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/b80c992b05541558896d2c53534edba99d24988b | m68k | mawk | TIM | http://autobuild.buildroot.net/results/fcf77717661ec34e57cbd8f0e025f015c53e2aa9 | aarch64 | mesa3d-demos-8.5.0 | NOK | http://autobuild.buildroot.net/results/1f59abec436e5db19a70f58ffdd55891935a9e15 | powerpc64le | multipath-tools-0.9.4 | NOK | http://autobuild.buildroot.net/results/e0f56ef924c13d6b1535fdc350ad8ecc06ea0a58 | mips64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/a739ac11ded2fae7283951def6e247e9fb580892 | sparc64 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/8abb8e97a8fb7a9a216787e368f582ea2a6b2aaf | ORPH powerpc64le | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/b5fa7cf0dde7320b78ca8d95e80bca496cf1a827 | ORPH mips | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/dd888f32dbc1191150acc985daeeee43a6c250ba | ORPH riscv32 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/bff5633edcf2d185659d2cc21ef8560127ee18dc | ORPH sh4a | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/02590a47c1a199e8164032dcf177af8d460aa105 | ORPH x86_64 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/9aedc73aceed5a5cb7987f593846752f70693b29 | mipsel | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/6cc48d9eeb288b1582907d8c5e4f36ae17e64229 | arm | opus-1.3.1 | NOK | http://autobuild.buildroot.net/results/2fbcded586aae03a0c59b050f63def61744735b3 | ORPH arm | opus-1.3.1 | NOK | http://autobuild.buildroot.net/results/356d2b80ea48af07f19368ddfc120550ccf01721 | ORPH sparc64 | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/37290f277a1b7206bd3d347e2451dd02c1929d22 | microblazeel | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/2cfa87cdf0ae5ee1d28143d2904a1040d073d804 | mipsel | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/171cccefebf486900d24a8cf592d641de6be363d | nios2 | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/b5f48a6121ab85c207101fa678838e72539939d0 | microblaze | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/d441c3b8507f5079bbf31b4109062bee61b4c887 | s390x | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/d308cac03f7454a015e6d833ecf125fab6ee02bd | mips64 | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/0fefbf0b3f20aca78838403bcd094869e1ab2b21 | mipsel | package/postgresql/postgres... | NOK | http://autobuild.buildroot.net/results/2957277613e738d24ce1e9b261f22f6f1e0042c8 | mips64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/d652c6b5157181f47d8fdb412cc98f30fb26f8f9 | microblaze | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/94b0d25578498b6296832fb8a174756c4beb7b27 | mips | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/c241d3ef0db29abf4c345d7665aefb2ffbd639f2 | s390x | pipewire-0.3.65 | NOK | http://autobuild.buildroot.net/results/9ecd9aca5edc3756154da59573157954f06e6537 | sh4 | postgresql-legal-info | NOK | http://autobuild.buildroot.net/results/93f40dc71619745ddc6741598c9a488c81ea440f | nios2 | postgresql-legal-info | NOK | http://autobuild.buildroot.net/results/9d2daeb565c9fc4465219474e8c87555d072367f | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/1bfc260aad8f5b24e90d49294ef9e9e427e34990 | powerpc | python-pymupdf-1.21.1 | NOK | http://autobuild.buildroot.net/results/cf268d3631330a8288fb8ad2af009abb7f1ca6b0 | powerpc64le | python-sip-4.19.25 | NOK | http://autobuild.buildroot.net/results/af1cbc00bf2574fba67575e1cab1fa7b1434b746 | m68k | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/b0e8c7f317fbbd798b2833803413fa767e0386e8 | sparc | rsync-3.2.7 | NOK | http://autobuild.buildroot.net/results/3bf75b802d79ee0ba81ead235c4be1a19d282bf6 | sparc | rsync-3.2.7 | NOK | http://autobuild.buildroot.net/results/30f0a53825518e78d3e782efafc741a308fb6ac0 | microblaze | rtl8812au-aircrack-ng-e7a4a... | NOK | http://autobuild.buildroot.net/results/e128298929fce31374687a566e50b00c150131b8 | s390x | rtl8821cu-86cc5ceb7c28b9b99... | NOK | http://autobuild.buildroot.net/results/3a74d393cdbc308eab9ec3f0f9e420947669a0ea | riscv64 | ruby-3.1.3 | NOK | http://autobuild.buildroot.net/results/e0c51820ab371e6ab6fa76654dc94934820ffcb9 | sparc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/84c309aee11570a9e9ca44f0681e06ec719ff11e | powerpc64le | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/4f0df587dd00806169aad68ca645374c5056f540 | nios2 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/1eeb23969ad7bd3896bbb3b0ca6992499b9c5942 | mips | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/ead304285a9cf32bf6b9dcc7fc30acece25ec680 | ORPH or1k | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/1b3c27c1b7f48eb95bb91348ac1801a43a845558 | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/507e0bffe040adcf8ce99f77a2024e2182cb1620 | nios2 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/9b3f74bf8656ddebfdd9609b2165b54e71aa3a94 | sh4aeb | unknown | NOK | http://autobuild.buildroot.net/results/c5127f97baaa2397f4dcb45ca512f3ac9a91d474 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/86b5f2bb0381ce5964ab4d851d2341be383a6a86 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/07d15c087b133509fc4745702f90143fc5d96336 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/5df4884304cd4fe53f9901fc075342825f4a2e76 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/4f49f1ddb5796b0324cfcddc507713f8be13db4c | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/0757e3931203a15313148f70986108cf565a998c | sparc64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/e21535338461b5b085e666a8ad84ceeca8779fe0 | ORPH mips64el | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/c36fb5aed960abe88c6627efdbc5f4b328efe5ac | ORPH mips64 | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/6f7847d66e6bd5f20a4ad311e10455dae28638b9 | ORPH powerpc | volk-2.5.2 | NOK | http://autobuild.buildroot.net/results/5225bda547c110317dd7c5f81ae2af8db81f557e | mips64 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/48a3ec2c75e1d57d63365b2bf47c94b58cadb84b | mips64 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/61a179b8d3cc2cd7e7bf88db4254070c8f3c6f9e | mips64 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/6603637236336336292d872f515eddcb7c666f8c | x86_64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/c5bdf24f6fff972bd8f2725174897df3f5f9a5f3 | x86_64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/617b67d19a1b75489754ba16fd0150ef39d8d045 | powerpc | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/bccb9aa17ebaec6abda88bbc5f3feb2d5b9023fd | mipsel | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/26dc8469f452d0efce9d81f41d5c35577885352e | s390x | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/053a62e9969046a7f8a0e1890c24d2bfb099ae42 | Classification of failures by reason for 2022.02.x -------------------------------------------------- flannel-0.14.0 | 1 mesa3d-21.3.5 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64le | flannel-0.14.0 | NOK | http://autobuild.buildroot.net/results/d8e0f21a0475996dcb9d4a6dcb5343d381fe09a9 | mips | mesa3d-21.3.5 | NOK | http://autobuild.buildroot.net/results/265a441fd4ccc81b0434ef4c7bea8c24e1a15ff3 | Classification of failures by reason for 2022.11.x -------------------------------------------------- host-pahole-1.24 | 5 unknown | 2 augeas-1.12.0 | 1 elfutils-0.186 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 libev-4.33 | 1 libgcrypt-1.10.1 | 1 lightning-2.1.3 | 1 linux-6.0.19 | 1 python-numpy-1.23.4 | 1 xxhash-0.8.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | augeas-1.12.0 | NOK | http://autobuild.buildroot.net/results/b550a6883a0340afff13e755056410647b431bd1 | ORPH arc | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/f69128febbfd4a5363c1d098c756a7b8dace7166 | ORPH powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/9d805ea3a3143a2607739a3de97af3a990d7de4a | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/23148e8ba4134b88728e540c72a823d37e659690 | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/b57643a9098eb08653f40515639ff68e3fb06cf8 | ORPH x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ea2ec269e5fcb0a0fe9aabd63bf86f2c7d2b7b0c | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/722f516a6b0faba0a78fca21a204b788b07fd086 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/713f81903a221158a01eb3869d4bf50ff1950eb6 | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/01332fb48d5aab2bc85bf91d016500fbdea0d102 | riscv32 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8fc883af903ba73caadd887019c0df3545068b7b | arm | libev-4.33 | NOK | http://autobuild.buildroot.net/results/efb35288b235943a20823eda39f93ad5db065445 | ORPH arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/328d3715b86693a6f3824d62f71876d7a9c75a07 | ORPH powerpc | lightning-2.1.3 | NOK | http://autobuild.buildroot.net/results/abdf3e9e1633734e80b017e8444c54e6059495d2 | mipsel | linux-6.0.19 | NOK | http://autobuild.buildroot.net/results/0dab7e93b939cab2e34454cb87ed2236d88adc9e | ORPH mipsel | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/bf06f2181b08a7787343d212914c269ff20d86e2 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/a08adb898323277b323a11303f4a8f3783cef0b2 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/60e92faa766a948cae278c9058ede76bbe4e9629 | mipsel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/4b8f858e717d027c5e152f056a2e8b2fb9ee6ff3 | ORPH -- http://autobuild.buildroot.net From hrsourabh011 at gmail.com Tue Feb 14 07:27:34 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Tue, 14 Feb 2023 08:27:34 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: Hello James, Thanks for the update. awscrt also has precompiled wheels such as awscrt-0.16.10-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl Can Buildroot use them instead of cross compiling? If not, is it possible to extract it and install manually? Thanks in advance On Thu, 9 Feb 2023 at 21:12, James Hilliard wrote: > On Thu, Feb 9, 2023 at 5:10 AM Sourabh Hegde > wrote: > > > > Hello Maxim, > > > > While doing make with new Buildroot-packages I getting: > > > > [ 51%] Building ASM object > aws-lc/crypto/CMakeFiles/crypto_objects.dir/hrss/asm/poly_rq_mul.S.o > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S: > Assembler messages: > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:304: > Error: unknown pseudo-op: `.att_syntax' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:307: > Error: unknown mnemonic `push' -- `push %rbp' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:309: > Error: bad register expression > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:310: > Error: unknown mnemonic `movq' -- `movq %rsp,%rbp' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:311: > Error: bad register expression > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:312: > Error: unknown mnemonic `push' -- `push %r12' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:313: > Error: bad register expression > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:321: > Error: operand 1 must be an integer register -- `mov %rcx,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:322: > Error: unknown mnemonic `addq' -- `addq $6144+12288+512+9408+32,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:323: > Error: operand 1 must be an integer register -- `mov %r8,%rax' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:324: > Error: unknown mnemonic `subq' -- `subq $6144,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:325: > Error: operand 1 must be an integer register -- `mov %r8,%r11' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:326: > Error: unknown mnemonic `subq' -- `subq $12288,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:327: > Error: operand 1 must be an integer register -- `mov %r8,%r12' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:328: > Error: unknown mnemonic `subq' -- `subq $512,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:329: > Error: unknown mnemonic `vmovdqa' -- `vmovdqa const3(%rip),%ymm3' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:330: > Error: unknown mnemonic `vmovdqu' -- `vmovdqu 0(%rsi),%ymm0' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:331: > Error: unknown mnemonic `vmovdqu' -- `vmovdqu 88(%rsi),%ymm1' > > . > > . > > . > > Any idea what it is complaining about? > > The problem here is that while the python awscrt package uses setuptools > it's not a normal python setuptools package, the setup.py installs both a > normal > setuptools package and a vendored cmake package(meta package really). > > See cmake build wrapper functionality here in the setuptools setup.py file: > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py#L156-L272 > > This is the cmake meta project root which is vendored inside of awscrt: > https://github.com/awslabs/aws-crt-python/tree/v0.16.10/crt > > See meta cmakelists build: > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/crt/CMakeLists.txt > > This meta project is made up of multiple subprojects: > aws-c-auth > aws-c-cal > aws-c-common > aws-c-compression > aws-c-event-stream > aws-checksums > aws-c-http > aws-c-io > aws-c-mqtt > aws-c-s3 > aws-c-sdkutils > aws-lc > s2n > > In buildroot we expect cmake packages to use our cmake infrastructure > as it will set up the cross compilation environment correctly while the > awscrt setuptools cmake wrapper does not. > > I confirmed that the cmake packages build correctly when using our > cmake infrastructure: > > ################################################################################ > # > # python-awscrt > # > > ################################################################################ > > PYTHON_AWSCRT_VERSION = 0.16.10 > PYTHON_AWSCRT_SOURCE = awscrt-$(PYTHON_AWSCRT_VERSION).tar.gz > PYTHON_AWSCRT_SITE = > > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2 > PYTHON_AWSCRT_SUBDIR = crt > > $(eval $(cmake-package)) > > See: > > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_cmake_based_packages > > So what I think you need to do is create buildroot cmake packages for all > these subprojects using buildroot's cmake infrastructure: > https://github.com/awslabs/aws-c-auth > https://github.com/awslabs/aws-c-cal > https://github.com/awslabs/aws-c-common > https://github.com/awslabs/aws-c-compression > https://github.com/awslabs/aws-c-event-stream > https://github.com/awslabs/aws-checksums > https://github.com/awslabs/aws-c-http > https://github.com/awslabs/aws-c-io > https://github.com/awslabs/aws-c-mqtt > https://github.com/awslabs/aws-c-s3 > https://github.com/awslabs/aws-c-sdkutils > https://github.com/awslabs/aws-lc > https://github.com/aws/s2n-tls > > You will then probably need to modify the setup.py file > (https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py) so that > instead of using the cmake build functions have it use the system versions > of these libraries pre-installed via the buildroot cmake infrastructure. > > You can probably use and check for an env variable such as this in the > setup.py: > PYTHON_AWSCRT_USE_SYSTEM_CRT=1 > > When present have it disable building the cmake libraries itself and search > for the installed system crt libraries instead of using the vendored > cmake build. > > You should upstream this setup.py functionality to the aws-crt-project as > well > so that we don't need to carry a patch in buildroot for python-awscrt to > use > the system crt libraries. > > Then from the python-awscrt buildroot package you would set that env > variable and add all the cmake subprojects as buildroot package > dependencies. > > First thing you should start with is adding the cmake buildroot packages > for > the crt subprojects to buildroot then work on modifying aws-crt-python to > work correctly with them instead of trying to use its broken cmake > setuptools > wrapper. > > > > > Thanks in advance > > > > On Thu, 9 Feb 2023 at 10:28, Sourabh Hegde > wrote: > >> > >> Hi Maxim, > >> > >> I was missing python setuptools on my host. After installing it, I can > add the package. Also, the added package is available in menuconfig > >> > >> Thank you for the support! > >> > >> On Thu, 9 Feb 2023 at 10:10, Maxim Kochetkov wrote: > >>> > >>> > >>> > >>> On 09.02.2023 12:03, Sourabh Hegde wrote: > >>> > Hello Maxim, > >>> > > >>> > Update: > >>> > > >>> > The above issue resolved by itself! > >>> > > >>> > Now when I do: utils/scanpypi awscrt -o package , it says > >>> > > >>> > spdx_lookup module is not installed. This can lead to an inaccurate > >>> > licence detection. Please install it via > >>> > pip install spdx_lookup > >>> > buildroot package name for awscrt: python-awscrt > >>> > Package: python-awscrt > >>> > Fetching package awscrt > >>> > ERROR: Could not find package awscrt. > >>> > Check syntax inside the python package index: > >>> > https://pypi.python.org/pypi/ > >>> > > >>> > But the package is available at https://pypi.org/project/awscrt/ > >>> > > >>> > >>> It works fine for me: > >>> > >>> buildroot package name for awscrt: python-awscrt > >>> Package: python-awscrt > >>> Fetching package awscrt > >>> Downloading package awscrt from > >>> > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz. > .. > >>> Checking if package package/python-awscrt already exists... > >>> Creating package/python-awscrt/python-awscrt.mk... > >>> More than one file found for license: LICENSE, > crt/aws-c-common/LICENSE, > >>> crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, > >>> crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, > >>> crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, > >>> crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, > >>> crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, crt/aws-c-cal/LICENSE, > >>> crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE > >>> Creating package/python-awscrt/python-awscrt.hash... > >>> Creating package/python-awscrt/Config.in... > >>> NOTE: Remember to also make an update to the DEVELOPERS file > >>> and include an entry for the pkg in packages/Config.in > >>> > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From heiko.thiery at gmail.com Tue Feb 14 09:04:25 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Tue, 14 Feb 2023 10:04:25 +0100 Subject: [Buildroot] [PATCH] package/dnsmasq: bump version to 2.89 Message-ID: <20230214090424.9335-1-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- package/dnsmasq/dnsmasq.hash | 4 ++-- package/dnsmasq/dnsmasq.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index fd015d38ac..02ffb2656b 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.88.tar.xz.asc -sha256 23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3 dnsmasq-2.88.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc +sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 3945e4256a..58c5390433 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.88 +DNSMASQ_VERSION = 2.89 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" -- 2.20.1 From heiko.thiery at gmail.com Tue Feb 14 09:11:42 2023 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Tue, 14 Feb 2023 10:11:42 +0100 Subject: [Buildroot] [PATCH] package/wireless-regdb: bump version to 2023.02.13 Message-ID: <20230214091141.12503-1-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- 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 91fcb320d2..36451f839d 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 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz +sha256 fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73 wireless-regdb-2023.02.13.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 35a8c6686d..68fbe35b8b 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2022.02.18 +WIRELESS_REGDB_VERSION = 2023.02.13 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC -- 2.20.1 From mf at go-sys.de Tue Feb 14 09:05:35 2023 From: mf at go-sys.de (Michael Fischer) Date: Tue, 14 Feb 2023 10:05:35 +0100 Subject: [Buildroot] [PATCH] package/sdl2: bump version to 2.26.3 Message-ID: <20230214090535.9545-1-mf@go-sys.de> Update the license hash because of a change in copyright year: - Copyright (C) 1997-2022 Sam Lantinga + Copyright (C) 1997-2023 Sam Lantinga Signed-off-by: Michael Fischer --- package/sdl2/sdl2.hash | 6 +++--- package/sdl2/sdl2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 86e0d86e7c..e26dcee301 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.2.tar.gz.sig -sha256 95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0 SDL2-2.26.2.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.3.tar.gz.sig +sha256 c661205a553b7d252425f4b751ff13209e5e020b876bbfa1598494af61790057 SDL2-2.26.3.tar.gz # Locally calculated -sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt +sha256 9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 8995178e71..c01f12d12c 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.26.2 +SDL2_VERSION = 2.26.3 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib -- 2.20.1 From mf at go-sys.de Tue Feb 14 09:34:14 2023 From: mf at go-sys.de (Michael Fischer) Date: Tue, 14 Feb 2023 10:34:14 +0100 Subject: [Buildroot] [PATCH] package/gnuplot: bump version to 5.4.6 Message-ID: <20230214093414.5861-1-mf@go-sys.de> Signed-off-by: Michael Fischer --- package/gnuplot/gnuplot.hash | 8 ++++---- package/gnuplot/gnuplot.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index 1ee6b53694..de0741d609 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.5/ -md5 c10cf81faa69d77e255a1dcfc625ba78 gnuplot-5.4.5.tar.gz -sha1 1179a768fd5f585a5dcb6aedea76cfa7a8dd5dfe gnuplot-5.4.5.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.6/ +md5 da719235bb2f46830f9d2101d04b14a5 gnuplot-5.4.6.tar.gz +sha1 31ea0c00af5c156e5d068e3b1cc2fb1847f471ab gnuplot-5.4.6.tar.gz # Locally computed -sha256 66f679115dd30559e110498fc94d926949d4d370b4999a042e724b8e910ee478 gnuplot-5.4.5.tar.gz +sha256 02fc27918200ed64d8f0c3b84fe81b95b59cd47ad99f270939ae497c19f27419 gnuplot-5.4.6.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 1ee49cb6ce..c49fbc497d 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.5 +GNUPLOT_VERSION = 5.4.6 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright -- 2.20.1 From giulio.benetti at benettiengineering.com Tue Feb 14 10:50:33 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 14 Feb 2023 11:50:33 +0100 Subject: [Buildroot] [PATCH] package/rtl8821cu: disable package for s390x architecture Message-ID: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this package for this architecture. Fixes: http://autobuild.buildroot.net/results/3a74d393cdbc308eab9ec3f0f9e420947669a0ea/ Signed-off-by: Giulio Benetti --- package/rtl8821cu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rtl8821cu/Config.in b/package/rtl8821cu/Config.in index a5a7b9d255..00a41b5196 100644 --- a/package/rtl8821cu/Config.in +++ b/package/rtl8821cu/Config.in @@ -1,8 +1,10 @@ comment "rtl8821cu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_RTL8821CU bool "rtl8821cu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help rtl8821cu wifi driver -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 14 11:08:27 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 14 Feb 2023 12:08:27 +0100 Subject: [Buildroot] [PATCH] package/rtl8812au-aircrack-ng: bump to 2023-02-03 version to fix build failure with Linux 6.1 Message-ID: <20230214110827.1281144-1-giulio.benetti@benettiengineering.com> Fixes: http://autobuild.buildroot.net/results/e128298929fce31374687a566e50b00c150131b8/ Signed-off-by: Giulio Benetti --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index bc3a926314..cdf5f3b4e2 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eed4888da9cfdc0f83ad3335beaf73af33ce0796b0a2637aeec102d47e1eb8f0 rtl8812au-aircrack-ng-e7a4a390ccbdd768411e1b2a8922c47837f76b47.tar.gz +sha256 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index 45a6ce5729..ab3ebe2077 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = e7a4a390ccbdd768411e1b2a8922c47837f76b47 +RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE -- 2.34.1 From yann.morin at orange.com Tue Feb 14 11:18:46 2023 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 14 Feb 2023 12:18:46 +0100 Subject: [Buildroot] [PATCH] package/rtl8821cu: disable package for s390x architecture In-Reply-To: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> References: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> Message-ID: <16600_1676373529_63EB6E19_16600_354_5_20230214111846.GB3487@tl-lnx-nyma7486> Giulio, All, On 2023-02-14 11:50 +0100, Giulio Benetti spake thusly: > s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this > package for this architecture. Instead of fixing each and every rtlXXXX packages one by one when there is an autobuild failure, can we just exclude them in bulk, since they are all wireless drivers, and thus will never be available for s390x? Regards, Yann E. MORIN. > Fixes: > http://autobuild.buildroot.net/results/3a74d393cdbc308eab9ec3f0f9e420947669a0ea/ > > Signed-off-by: Giulio Benetti > --- > package/rtl8821cu/Config.in | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/rtl8821cu/Config.in b/package/rtl8821cu/Config.in > index a5a7b9d255..00a41b5196 100644 > --- a/package/rtl8821cu/Config.in > +++ b/package/rtl8821cu/Config.in > @@ -1,8 +1,10 @@ > comment "rtl8821cu needs a Linux kernel to be built" > + depends on !BR2_s390x > depends on !BR2_LINUX_KERNEL > > config BR2_PACKAGE_RTL8821CU > bool "rtl8821cu" > + depends on !BR2_s390x > depends on BR2_LINUX_KERNEL > help > rtl8821cu wifi driver > -- > 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 | | | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ 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 marcus.hoffmann at othermo.de Tue Feb 14 11:39:18 2023 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Tue, 14 Feb 2023 12:39:18 +0100 Subject: [Buildroot] [PATCH] package/dnsmasq: bump version to 2.89 In-Reply-To: <20230214090424.9335-1-heiko.thiery@gmail.com> References: <20230214090424.9335-1-heiko.thiery@gmail.com> Message-ID: <0bd69538-a3fe-2162-03e0-42db7b49766e@othermo.de> On 14.02.23 10:04, Heiko Thiery wrote: > Signed-off-by: Heiko Thiery Tested-by: Marcus Hoffmann > --- > package/dnsmasq/dnsmasq.hash | 4 ++-- > package/dnsmasq/dnsmasq.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash > index fd015d38ac..02ffb2656b 100644 > --- a/package/dnsmasq/dnsmasq.hash > +++ b/package/dnsmasq/dnsmasq.hash > @@ -1,6 +1,6 @@ > # Locally calculated after checking pgp signature > -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.88.tar.xz.asc > -sha256 23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3 dnsmasq-2.88.tar.xz > +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc > +sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz > # Locally calculated > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 > diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk > index 3945e4256a..58c5390433 100644 > --- a/package/dnsmasq/dnsmasq.mk > +++ b/package/dnsmasq/dnsmasq.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DNSMASQ_VERSION = 2.88 > +DNSMASQ_VERSION = 2.89 > DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz > DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq > DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" ________________________________ othermo GmbH | Sitz der Gesellschaft: Alzenau | Amtsgericht Aschaffenburg: HRB 14783 | USt-IdNr.: DE319977978 | Gesch?ftsf?hrung: Dr. Dennis Metz. From giulio.benetti at benettiengineering.com Tue Feb 14 12:08:08 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 14 Feb 2023 13:08:08 +0100 Subject: [Buildroot] [RFC PATCH] package/Config.in: move all Wireless Driver into a separate menu and enable them only if architecture s390x is not used Message-ID: <20230214120808.1282621-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/Config.in | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/package/Config.in b/package/Config.in index e0792bda55..a70a45f50a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -582,16 +582,6 @@ endmenu source "package/rpi-userland/Config.in" source "package/rs485conf/Config.in" source "package/rtc-tools/Config.in" - source "package/rtl8188eu/Config.in" - source "package/rtl8189es/Config.in" - source "package/rtl8189fs/Config.in" - source "package/rtl8192eu/Config.in" - source "package/rtl8723bu/Config.in" - source "package/rtl8723ds/Config.in" - source "package/rtl8723ds-bt/Config.in" - source "package/rtl8812au-aircrack-ng/Config.in" - source "package/rtl8821au/Config.in" - source "package/rtl8821cu/Config.in" source "package/sane-backends/Config.in" source "package/sdparm/Config.in" source "package/sedutil/Config.in" @@ -632,12 +622,26 @@ endmenu source "package/usbguard/Config.in" source "package/usbmount/Config.in" source "package/usbutils/Config.in" +if !BR2_s390x +menu "Wireless Drivers" + source "package/rtl8188eu/Config.in" + source "package/rtl8189es/Config.in" + source "package/rtl8189fs/Config.in" + source "package/rtl8192eu/Config.in" + source "package/rtl8723bu/Config.in" + source "package/rtl8723ds/Config.in" + source "package/rtl8723ds-bt/Config.in" + source "package/rtl8812au-aircrack-ng/Config.in" + source "package/rtl8821au/Config.in" + source "package/rtl8821cu/Config.in" + source "package/wilc-driver/Config.in" + source "package/xr819-xradio/Config.in" +endmenu +endif 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" endmenu menu "Interpreter languages and scripting" -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 14 12:16:40 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 14 Feb 2023 13:16:40 +0100 Subject: [Buildroot] [PATCH] package/rtl8821cu: disable package for s390x architecture In-Reply-To: <16600_1676373529_63EB6E19_16600_354_5_20230214111846.GB3487@tl-lnx-nyma7486> References: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> <16600_1676373529_63EB6E19_16600_354_5_20230214111846.GB3487@tl-lnx-nyma7486> Message-ID: <636d30cd-bb2d-ec64-1b4f-9a1d2c98f2b7@benettiengineering.com> Hi Yann, On 14/02/23 12:18, yann.morin at orange.com wrote: > Giulio, All, > > On 2023-02-14 11:50 +0100, Giulio Benetti spake thusly: >> s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this >> package for this architecture. > > Instead of fixing each and every rtlXXXX packages one by one when there > is an autobuild failure, can we just exclude them in bulk, since they > are all wireless drivers, and thus will never be available for s390x? something like this[0] seems to work, what about it? Of course I need to clean up all the packages that depends on !BR2_s390x but the idea works for me, at least I've tested on my side and it does. If you say it's ok I clean up, check better for other Wireless Drivers, create a good patch and send it while rejecting this one. [0]: https://patchwork.ozlabs.org/project/buildroot/patch/20230214120808.1282621-1-giulio.benetti at benettiengineering.com/ -- Giulio Benetti CEO/CTO at Benetti Engineering sas > Regards, > Yann E. MORIN. > >> Fixes: >> http://autobuild.buildroot.net/results/3a74d393cdbc308eab9ec3f0f9e420947669a0ea/ >> >> Signed-off-by: Giulio Benetti >> --- >> package/rtl8821cu/Config.in | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/package/rtl8821cu/Config.in b/package/rtl8821cu/Config.in >> index a5a7b9d255..00a41b5196 100644 >> --- a/package/rtl8821cu/Config.in >> +++ b/package/rtl8821cu/Config.in >> @@ -1,8 +1,10 @@ >> comment "rtl8821cu needs a Linux kernel to be built" >> + depends on !BR2_s390x >> depends on !BR2_LINUX_KERNEL >> >> config BR2_PACKAGE_RTL8821CU >> bool "rtl8821cu" >> + depends on !BR2_s390x >> depends on BR2_LINUX_KERNEL >> help >> rtl8821cu wifi driver >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From yann.morin at orange.com Tue Feb 14 13:15:26 2023 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 14 Feb 2023 14:15:26 +0100 Subject: [Buildroot] [PATCH] package/rtl8821cu: disable package for s390x architecture In-Reply-To: <636d30cd-bb2d-ec64-1b4f-9a1d2c98f2b7@benettiengineering.com> References: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> <16600_1676373529_63EB6E19_16600_354_5_20230214111846.GB3487@tl-lnx-nyma7486> <636d30cd-bb2d-ec64-1b4f-9a1d2c98f2b7@benettiengineering.com> Message-ID: <15869_1676380529_63EB8971_15869_68_1_20230214131526.GC3487@tl-lnx-nyma7486> Giulio, All, On 2023-02-14 13:16 +0100, Giulio Benetti spake thusly: > On 14/02/23 12:18, yann.morin at orange.com wrote: > >On 2023-02-14 11:50 +0100, Giulio Benetti spake thusly: > >>s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this > >>package for this architecture. > >Instead of fixing each and every rtlXXXX packages one by one when there > >is an autobuild failure, can we just exclude them in bulk, since they > >are all wireless drivers, and thus will never be available for s390x? > something like this[0] seems to work, what about it? > > Of course I need to clean up all the packages that depends on !BR2_s390x > but the idea works for me, at least I've tested on my side and it does. > > If you say it's ok I clean up, check better for other Wireless Drivers, > create a good patch and send it while rejecting this one. > > [0]: https://patchwork.ozlabs.org/project/buildroot/patch/20230214120808.1282621-1-giulio.benetti at benettiengineering.com/ That's not really what I meant... I was mostly thinking of sending a patch series that would add the !s390x dependency to all remaining wifi drivers without waiting for them to fail in an autobuilder... However, moving them all inside a common sub-menu that is itself guarded by !s390x sounds OK. At least, when we add a new wireless driver, we'd know where to add it, and we would not have to care about forgetting the !s390x dependency... (but note that, with this email, I'm no maintainer; let's see what the maintainers think). Regards, Yann E. MORIN. -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' _________________________________________________________________________________________________________________________ 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 peter at korsgaard.com Tue Feb 14 14:01:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:01:55 +0100 Subject: [Buildroot] [PATCH 1/3] package/kodi: fix armv5 build In-Reply-To: <20230117200821.2882597-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 17 Jan 2023 21:08:19 +0100") References: <20230117200821.2882597-1-bernd.kuhls@t-online.de> Message-ID: <87zg9g8hws.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Disable neon support when not available. > Fixes build error not yet found by autobuilders > /tmp/cc8LvPwi.s: Assembler messages: > /tmp/cc8LvPwi.s:28: Error: selected processor does not support `vldmia r1,{ q4-q7 }' in ARM mode > /tmp/cc8LvPwi.s:29: Error: selected processor does not support `vldmia r0,{ q8-q11 }' in ARM mode > /tmp/cc8LvPwi.s:30: Error: selected processor does not support `vmul.f32 q0,q8,d8[0]' in ARM mode > /tmp/cc8LvPwi.s:31: Error: selected processor does not support `vmul.f32 q1,q8,d10[0]' in ARM mode > /tmp/cc8LvPwi.s:32: Error: selected processor does not support `vmul.f32 q2,q8,d12[0]' in ARM mode > /tmp/cc8LvPwi.s:33: Error: selected processor does not support `vmul.f32 q3,q8,d14[0]' in ARM mode > /tmp/cc8LvPwi.s:34: Error: selected processor does not support `vmla.f32 q0,q9,d8[1]' in ARM mode > /tmp/cc8LvPwi.s:35: Error: selected processor does not support `vmla.f32 q1,q9,d10[1]' in ARM mode > /tmp/cc8LvPwi.s:36: Error: selected processor does not support `vmla.f32 q2,q9,d12[1]' in ARM mode > /tmp/cc8LvPwi.s:37: Error: selected processor does not support `vmla.f32 q3,q9,d14[1]' in ARM mode > /tmp/cc8LvPwi.s:38: Error: selected processor does not support `vmla.f32 q0,q10,d9[0]' in ARM mode > /tmp/cc8LvPwi.s:39: Error: selected processor does not support `vmla.f32 q1,q10,d11[0]' in ARM mode > /tmp/cc8LvPwi.s:40: Error: selected processor does not support `vmla.f32 q2,q10,d13[0]' in ARM mode > /tmp/cc8LvPwi.s:41: Error: selected processor does not support `vmla.f32 q3,q10,d15[0]' in ARM mode > /tmp/cc8LvPwi.s:42: Error: selected processor does not support `vmla.f32 q0,q11,d9[1]' in ARM mode > /tmp/cc8LvPwi.s:43: Error: selected processor does not support `vmla.f32 q1,q11,d11[1]' in ARM mode > /tmp/cc8LvPwi.s:44: Error: selected processor does not support `vmla.f32 q2,q11,d13[1]' in ARM mode > /tmp/cc8LvPwi.s:45: Error: selected processor does not support `vmla.f32 q3,q11,d15[1]' in ARM mode > /tmp/cc8LvPwi.s:46: Error: selected processor does not support `vstmia r0,{ q0-q3 }' in ARM mode > with this defconfig: > BR2_arm=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_KODI=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > BR2_PACKAGE_MESA3D_OPENGL_ES=y > BR2_PACKAGE_PYTHON3=y > BR2_PACKAGE_PYTHON3_PY_ONLY=y > Signed-off-by: Bernd Kuhls Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 14:02:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:02:04 +0100 Subject: [Buildroot] [PATCH 2/3] package/kodi: fix openrisc build In-Reply-To: <20230117200821.2882597-2-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 17 Jan 2023 21:08:20 +0100") References: <20230117200821.2882597-1-bernd.kuhls@t-online.de> <20230117200821.2882597-2-bernd.kuhls@t-online.de> Message-ID: <87v8k48hwj.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Fixes build error not yet found by autobuilders > -- System type: Linux > CMake Error at cmake/scripts/linux/ArchSetup.cmake:42 (message): > Unknown CPU: or1k > with this defconfig: > BR2_or1k=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_KODI=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > BR2_PACKAGE_MESA3D_OPENGL_ES=y > BR2_PACKAGE_PYTHON3=y > BR2_PACKAGE_PYTHON3_PY_ONLY=y > Signed-off-by: Bernd Kuhls Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 14:02:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:02:10 +0100 Subject: [Buildroot] [PATCH 3/3] package/kodi: fix riscv build In-Reply-To: <20230117200821.2882597-3-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 17 Jan 2023 21:08:21 +0100") References: <20230117200821.2882597-1-bernd.kuhls@t-online.de> <20230117200821.2882597-3-bernd.kuhls@t-online.de> Message-ID: <87r0us8hwd.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Fixes build error not yet found by autobuilders > -- System type: Linux > CMake Error at cmake/scripts/linux/ArchSetup.cmake:42 (message): > Unknown CPU: riscv32 > using this defconfig: > BR2_riscv=y > BR2_RISCV_32=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_KODI=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > BR2_PACKAGE_MESA3D_OPENGL_ES=y > BR2_PACKAGE_PYTHON3=y > BR2_PACKAGE_PYTHON3_PY_ONLY=y > Signed-off-by: Bernd Kuhls Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 14:39:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:39:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2: security bump to version 2.26.2 In-Reply-To: <20230127223855.72359-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 27 Jan 2023 23:38:55 +0100") References: <20230127223855.72359-1-fontaine.fabrice@gmail.com> Message-ID: <87mt5g8g5z.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Drop patch (already in version) > - Fix CVE-2022-4743: A potential memory leak issue was discovered in > SDL2 in GLES_CreateTexture() function in SDL_render_gles.c. The > vulnerability allows an attacker to cause a denial of service attack. > https://github.com/libsdl-org/SDL/releases/tag/release-2.26.0 > https://github.com/libsdl-org/SDL/releases/tag/release-2.26.1 > https://github.com/libsdl-org/SDL/releases/tag/release-2.26.2 > Signed-off-by: Fabrice Fontaine I fail to see how a memory leak in sdl2 could lead to a remote exploit, but oh well - Committed to 2022.11.x, thanks. For 2022.02.x I have instead backported the fix. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 14:01:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:01:17 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/kodi: fix riscv build Message-ID: <20230214143955.3166C85D53@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5240ca4999e5643e53bb12f4fba1ef99b70c721 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes build error not yet found by autobuilders -- System type: Linux CMake Error at cmake/scripts/linux/ArchSetup.cmake:42 (message): Unknown CPU: riscv32 using this defconfig: BR2_riscv=y BR2_RISCV_32=y BR2_TOOLCHAIN_EXTERNAL=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 39886a434a121afc89cf741d0f035422a70ba524) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index c2bc18d828..be72c525c6 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -133,7 +133,7 @@ else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y) KODI_CONF_OPTS += \ -DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \ -DWITH_CPU=powerpc$(if $(BR2_ARCH_IS_64),64) -else ifeq ($(BR2_or1k)$(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) +else ifeq ($(BR2_or1k)$(BR2_powerpc64)$(BR2_riscv)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH) else # Kodi auto-detects ARCH, tested: arm, aarch64, i386, x86_64 From peter at korsgaard.com Tue Feb 14 14:01:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:01:04 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/kodi: fix openrisc build Message-ID: <20230214143955.23BAA85D51@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=873c996fc850a325ef248e4adbca7a6a53df20b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes build error not yet found by autobuilders -- System type: Linux CMake Error at cmake/scripts/linux/ArchSetup.cmake:42 (message): Unknown CPU: or1k with this defconfig: BR2_or1k=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 86fac589fbe1ec03ddc2478bff225e369302abfb) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 0906fe1a63..c2bc18d828 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -133,7 +133,7 @@ else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y) KODI_CONF_OPTS += \ -DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \ -DWITH_CPU=powerpc$(if $(BR2_ARCH_IS_64),64) -else ifeq ($(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) +else ifeq ($(BR2_or1k)$(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH) else # Kodi auto-detects ARCH, tested: arm, aarch64, i386, x86_64 From peter at korsgaard.com Tue Feb 14 12:59:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 13:59:49 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/kodi: fix armv5 build Message-ID: <20230214143955.16EDD85D4F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=198e35ddab7b5fab0c7ca21fe85d59b0a4782c15 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Disable neon support when not available. Fixes build error not yet found by autobuilders /tmp/cc8LvPwi.s: Assembler messages: /tmp/cc8LvPwi.s:28: Error: selected processor does not support `vldmia r1,{ q4-q7 }' in ARM mode /tmp/cc8LvPwi.s:29: Error: selected processor does not support `vldmia r0,{ q8-q11 }' in ARM mode /tmp/cc8LvPwi.s:30: Error: selected processor does not support `vmul.f32 q0,q8,d8[0]' in ARM mode /tmp/cc8LvPwi.s:31: Error: selected processor does not support `vmul.f32 q1,q8,d10[0]' in ARM mode /tmp/cc8LvPwi.s:32: Error: selected processor does not support `vmul.f32 q2,q8,d12[0]' in ARM mode /tmp/cc8LvPwi.s:33: Error: selected processor does not support `vmul.f32 q3,q8,d14[0]' in ARM mode /tmp/cc8LvPwi.s:34: Error: selected processor does not support `vmla.f32 q0,q9,d8[1]' in ARM mode /tmp/cc8LvPwi.s:35: Error: selected processor does not support `vmla.f32 q1,q9,d10[1]' in ARM mode /tmp/cc8LvPwi.s:36: Error: selected processor does not support `vmla.f32 q2,q9,d12[1]' in ARM mode /tmp/cc8LvPwi.s:37: Error: selected processor does not support `vmla.f32 q3,q9,d14[1]' in ARM mode /tmp/cc8LvPwi.s:38: Error: selected processor does not support `vmla.f32 q0,q10,d9[0]' in ARM mode /tmp/cc8LvPwi.s:39: Error: selected processor does not support `vmla.f32 q1,q10,d11[0]' in ARM mode /tmp/cc8LvPwi.s:40: Error: selected processor does not support `vmla.f32 q2,q10,d13[0]' in ARM mode /tmp/cc8LvPwi.s:41: Error: selected processor does not support `vmla.f32 q3,q10,d15[0]' in ARM mode /tmp/cc8LvPwi.s:42: Error: selected processor does not support `vmla.f32 q0,q11,d9[1]' in ARM mode /tmp/cc8LvPwi.s:43: Error: selected processor does not support `vmla.f32 q1,q11,d11[1]' in ARM mode /tmp/cc8LvPwi.s:44: Error: selected processor does not support `vmla.f32 q2,q11,d13[1]' in ARM mode /tmp/cc8LvPwi.s:45: Error: selected processor does not support `vmla.f32 q3,q11,d15[1]' in ARM mode /tmp/cc8LvPwi.s:46: Error: selected processor does not support `vstmia r0,{ q0-q3 }' in ARM mode with this defconfig: BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 2952832a40b08e93bb3dc614bb2068b152b1919f) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 58ad115475..0906fe1a63 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -141,6 +141,14 @@ else KODI_CONF_OPTS += -DWITH_CPU=$(BR2_ARCH) endif +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else ifeq ($(BR2_aarch64),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else +KODI_CONF_OPTS += -DENABLE_NEON=OFF +endif + ifeq ($(BR2_X86_CPU_HAS_SSE),y) KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON else From peter at korsgaard.com Tue Feb 14 14:19:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:19:25 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/sdl2: backport upstream security fix for CVE-2022-4743 Message-ID: <20230214143955.3F71C85D56@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a74860f35d9887cdc397659f56f27940bca787d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes the following security vulnerability: CVE-2022-4743: A potential memory leak issue was discovered in SDL2 in GLES_CreateTexture() function in SDL_render_gles.c. The vulnerability allows an attacker to cause a denial of service attack. Signed-off-by: Peter Korsgaard --- ...tential-memory-leak-in-GLES_CreateTexture.patch | 37 ++++++++++++++++++++++ package/sdl2/sdl2.mk | 3 ++ 2 files changed, 40 insertions(+) diff --git a/package/sdl2/0002-Fix-potential-memory-leak-in-GLES_CreateTexture.patch b/package/sdl2/0002-Fix-potential-memory-leak-in-GLES_CreateTexture.patch new file mode 100644 index 0000000000..9488c1006c --- /dev/null +++ b/package/sdl2/0002-Fix-potential-memory-leak-in-GLES_CreateTexture.patch @@ -0,0 +1,37 @@ +From 00b67f55727bc0944c3266e2b875440da132ce4b Mon Sep 17 00:00:00 2001 +From: zhailiangliang +Date: Wed, 21 Sep 2022 10:30:38 +0800 +Subject: [PATCH] Fix potential memory leak in GLES_CreateTexture + +Signed-off-by: Peter Korsgaard +--- + src/render/opengles/SDL_render_gles.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/render/opengles/SDL_render_gles.c b/src/render/opengles/SDL_render_gles.c +index a5fbab309..ba08a46e2 100644 +--- a/src/render/opengles/SDL_render_gles.c ++++ b/src/render/opengles/SDL_render_gles.c +@@ -359,6 +359,9 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) + renderdata->glGenTextures(1, &data->texture); + result = renderdata->glGetError(); + if (result != GL_NO_ERROR) { ++ if (texture->access == SDL_TEXTUREACCESS_STREAMING) { ++ SDL_free(data->pixels); ++ } + SDL_free(data); + return GLES_SetError("glGenTextures()", result); + } +@@ -387,6 +390,9 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) + + result = renderdata->glGetError(); + if (result != GL_NO_ERROR) { ++ if (texture->access == SDL_TEXTUREACCESS_STREAMING) { ++ SDL_free(data->pixels); ++ } + SDL_free(data); + return GLES_SetError("glTexImage2D()", result); + } +-- +2.30.2 + diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 633383b9e1..c807023632 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -22,6 +22,9 @@ SDL2_CONF_OPTS += \ --disable-pulseaudio \ --disable-video-wayland +# 0002-Fix-potential-memory-leak-in-GLES_CreateTexture.patch +SDL2_IGNORE_CVES += CVE-2022-4743 + # We are using autotools build system for sdl2, so the sdl2-config.cmake # include path are not resolved like for sdl2-config script. # Change the absolute /usr path to resolve relatively to the sdl2-config.cmake location. From peter at korsgaard.com Tue Feb 14 14:00:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:00:36 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/kodi: fix openrisc build Message-ID: <20230214144233.3F59A85C83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf37b32e4022dfd8176ad54337e708da67eb7c33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes build error not yet found by autobuilders -- System type: Linux CMake Error at cmake/scripts/linux/ArchSetup.cmake:42 (message): Unknown CPU: or1k with this defconfig: BR2_or1k=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 86fac589fbe1ec03ddc2478bff225e369302abfb) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 74c800e5b4..2d8bcb4e83 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -136,7 +136,7 @@ else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y) KODI_CONF_OPTS += \ -DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \ -DWITH_CPU=powerpc$(if $(BR2_ARCH_IS_64),64) -else ifeq ($(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) +else ifeq ($(BR2_or1k)$(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH) else # Kodi auto-detects ARCH, tested: arm, aarch64, i386, x86_64 From peter at korsgaard.com Tue Feb 14 14:01:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:01:32 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/kodi: fix riscv build Message-ID: <20230214144233.492DE85D72@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db67415513d203d5ad5d84b029878fc519a8ed7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes build error not yet found by autobuilders -- System type: Linux CMake Error at cmake/scripts/linux/ArchSetup.cmake:42 (message): Unknown CPU: riscv32 using this defconfig: BR2_riscv=y BR2_RISCV_32=y BR2_TOOLCHAIN_EXTERNAL=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 39886a434a121afc89cf741d0f035422a70ba524) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 2d8bcb4e83..63b1d292ae 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -136,7 +136,7 @@ else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y) KODI_CONF_OPTS += \ -DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \ -DWITH_CPU=powerpc$(if $(BR2_ARCH_IS_64),64) -else ifeq ($(BR2_or1k)$(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) +else ifeq ($(BR2_or1k)$(BR2_powerpc64)$(BR2_riscv)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH) else # Kodi auto-detects ARCH, tested: arm, aarch64, i386, x86_64 From peter at korsgaard.com Tue Feb 14 14:13:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:13:45 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/sdl2: bump version to 2.24.2 Message-ID: <20230214144233.54CBC85D73@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e9afb26b93bcdeab3115c0f170d73c5368ac36c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Signed-off-by: Michael Fischer Signed-off-by: Thomas Petazzoni (cherry picked from commit 7c0def2452fc919b1eb4f790669f240392cde84f) Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.hash | 4 ++-- package/sdl2/sdl2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 782c552c52..923a900dc0 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.24.1.tar.gz.sig -sha256 bc121588b1105065598ce38078026a414c28ea95e66ed2adab4c44d80b309e1b SDL2-2.24.1.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.24.2.tar.gz.sig +sha256 b35ef0a802b09d90ed3add0dcac0e95820804202914f5bb7b0feb710f1a1329f SDL2-2.24.2.tar.gz # Locally calculated sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 28e2c5cb36..a1dc8b5b73 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.24.1 +SDL2_VERSION = 2.24.2 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From peter at korsgaard.com Tue Feb 14 14:13:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 15:13:51 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/sdl2: security bump to version 2.26.2 Message-ID: <20230214144233.5E80085D74@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=594acef246416a0b95452db393765ff60e37d662 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x - Drop patch (already in version) - Fix CVE-2022-4743: A potential memory leak issue was discovered in SDL2 in GLES_CreateTexture() function in SDL_render_gles.c. The vulnerability allows an attacker to cause a denial of service attack. https://github.com/libsdl-org/SDL/releases/tag/release-2.26.0 https://github.com/libsdl-org/SDL/releases/tag/release-2.26.1 https://github.com/libsdl-org/SDL/releases/tag/release-2.26.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d33a8417bf1bc5d7276e19da5c37da210d4de31a) Signed-off-by: Peter Korsgaard --- ...oesn-t-have-a-mode-configured-use-the-pre.patch | 76 ---------------------- package/sdl2/sdl2.hash | 4 +- package/sdl2/sdl2.mk | 2 +- 3 files changed, 3 insertions(+), 79 deletions(-) diff --git a/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch b/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch deleted file mode 100644 index c8be280c56..0000000000 --- a/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch +++ /dev/null @@ -1,76 +0,0 @@ -From da9ba3a2a1536017e4ce1ee0f4276578d1ce6e29 Mon Sep 17 00:00:00 2001 -From: Sam Lantinga -Date: Fri, 18 Nov 2022 12:17:27 -0800 -Subject: [PATCH] If a CRTC doesn't have a mode configured, use the preferred - or largest mode as the default mode - -Fixes https://github.com/libsdl-org/SDL/issues/6421 - -[mf at go-sys.de: backport from upstream] -Signed-off-by: Michael Fischer -[yann.morin.1998 at free.fr: do an actual backport] -Signed-off-by: Yann E. MORIN ---- - src/video/kmsdrm/SDL_kmsdrmvideo.c | 35 +++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 6 deletions(-) - -diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c -index eae721455..eeeefef2b 100644 ---- a/src/video/kmsdrm/SDL_kmsdrmvideo.c -+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c -@@ -666,8 +666,8 @@ KMSDRM_CrtcGetVrr(uint32_t drm_fd, uint32_t crtc_id) - /* Gets a DRM connector, builds an SDL_Display with it, and adds it to the - list of SDL Displays in _this->displays[] */ - static void --KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) { -- -+KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) -+{ - SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata); - SDL_DisplayData *dispdata = NULL; - SDL_VideoDisplay display = {0}; -@@ -770,14 +770,37 @@ KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) { - drmModeModeInfo *mode = &connector->modes[i]; - - if (!SDL_memcmp(mode, &crtc->mode, sizeof(crtc->mode))) { -- mode_index = i; -- break; -+ mode_index = i; -+ break; - } - } - - if (mode_index == -1) { -- ret = SDL_SetError("Failed to find index of mode attached to the CRTC."); -- goto cleanup; -+ int current_area, largest_area = 0; -+ -+ /* Find the preferred mode or the highest resolution mode */ -+ for (i = 0; i < connector->count_modes; i++) { -+ drmModeModeInfo *mode = &connector->modes[i]; -+ -+ if (mode->type & DRM_MODE_TYPE_PREFERRED) { -+ mode_index = i; -+ break; -+ } -+ -+ current_area = mode->hdisplay * mode->vdisplay; -+ if (current_area > largest_area) { -+ mode_index = i; -+ largest_area = current_area; -+ } -+ } -+ if (mode_index != -1) { -+ crtc->mode = connector->modes[mode_index]; -+ } -+ } -+ -+ if (mode_index == -1) { -+ ret = SDL_SetError("Failed to find index of mode attached to the CRTC."); -+ goto cleanup; - } - - /*********************************************/ --- -2.25.1 - diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 923a900dc0..86e0d86e7c 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.24.2.tar.gz.sig -sha256 b35ef0a802b09d90ed3add0dcac0e95820804202914f5bb7b0feb710f1a1329f SDL2-2.24.2.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.2.tar.gz.sig +sha256 95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0 SDL2-2.26.2.tar.gz # Locally calculated sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index a1dc8b5b73..8995178e71 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.24.2 +SDL2_VERSION = 2.26.2 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From peter at korsgaard.com Tue Feb 14 13:31:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 14:31:09 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/kodi: fix armv5 build Message-ID: <20230214144233.3471A85D6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dad63d9ec99d676f6d7b90fd17181433d56864d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Disable neon support when not available. Fixes build error not yet found by autobuilders /tmp/cc8LvPwi.s: Assembler messages: /tmp/cc8LvPwi.s:28: Error: selected processor does not support `vldmia r1,{ q4-q7 }' in ARM mode /tmp/cc8LvPwi.s:29: Error: selected processor does not support `vldmia r0,{ q8-q11 }' in ARM mode /tmp/cc8LvPwi.s:30: Error: selected processor does not support `vmul.f32 q0,q8,d8[0]' in ARM mode /tmp/cc8LvPwi.s:31: Error: selected processor does not support `vmul.f32 q1,q8,d10[0]' in ARM mode /tmp/cc8LvPwi.s:32: Error: selected processor does not support `vmul.f32 q2,q8,d12[0]' in ARM mode /tmp/cc8LvPwi.s:33: Error: selected processor does not support `vmul.f32 q3,q8,d14[0]' in ARM mode /tmp/cc8LvPwi.s:34: Error: selected processor does not support `vmla.f32 q0,q9,d8[1]' in ARM mode /tmp/cc8LvPwi.s:35: Error: selected processor does not support `vmla.f32 q1,q9,d10[1]' in ARM mode /tmp/cc8LvPwi.s:36: Error: selected processor does not support `vmla.f32 q2,q9,d12[1]' in ARM mode /tmp/cc8LvPwi.s:37: Error: selected processor does not support `vmla.f32 q3,q9,d14[1]' in ARM mode /tmp/cc8LvPwi.s:38: Error: selected processor does not support `vmla.f32 q0,q10,d9[0]' in ARM mode /tmp/cc8LvPwi.s:39: Error: selected processor does not support `vmla.f32 q1,q10,d11[0]' in ARM mode /tmp/cc8LvPwi.s:40: Error: selected processor does not support `vmla.f32 q2,q10,d13[0]' in ARM mode /tmp/cc8LvPwi.s:41: Error: selected processor does not support `vmla.f32 q3,q10,d15[0]' in ARM mode /tmp/cc8LvPwi.s:42: Error: selected processor does not support `vmla.f32 q0,q11,d9[1]' in ARM mode /tmp/cc8LvPwi.s:43: Error: selected processor does not support `vmla.f32 q1,q11,d11[1]' in ARM mode /tmp/cc8LvPwi.s:44: Error: selected processor does not support `vmla.f32 q2,q11,d13[1]' in ARM mode /tmp/cc8LvPwi.s:45: Error: selected processor does not support `vmla.f32 q3,q11,d15[1]' in ARM mode /tmp/cc8LvPwi.s:46: Error: selected processor does not support `vstmia r0,{ q0-q3 }' in ARM mode with this defconfig: BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 2952832a40b08e93bb3dc614bb2068b152b1919f) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index c41c515d10..74c800e5b4 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -144,6 +144,14 @@ else KODI_CONF_OPTS += -DWITH_CPU=$(BR2_ARCH) endif +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else ifeq ($(BR2_aarch64),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else +KODI_CONF_OPTS += -DENABLE_NEON=OFF +endif + ifeq ($(BR2_X86_CPU_HAS_SSE),y) KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON else From peter at korsgaard.com Tue Feb 14 15:32:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 16:32:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/c-ares: security bump to version 1.19.0 In-Reply-To: <20230129163135.30876-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 29 Jan 2023 17:31:35 +0100") References: <20230129163135.30876-1-fontaine.fabrice@gmail.com> Message-ID: <87h6vo8dpr.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Low. Stack overflow in ares_set_sortlist() which is used during c-ares > initialization and typically provided by an administrator and not an end > user. > https://c-ares.org/changelog.html#1_19_0 > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 15:32:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 16:32:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 9.0.1260 In-Reply-To: <20230129163953.56236-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 29 Jan 2023 17:39:53 +0100") References: <20230129163953.56236-1-fontaine.fabrice@gmail.com> Message-ID: <87cz6c8dpl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2023-0049, CVE-2023-0051, CVE-2023-0054 and CVE-2023-0288 > - Update hash of README.txt: typo fixed by > https://github.com/vim/vim/commit/f1dcd14fc5d4370476cd82895a4479ca2d252e54 > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 15:32:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 16:32:20 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/vim: security bump to version 9.0.1260 Message-ID: <20230214153307.7643885D6E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ef0499c2cd7ddb1611634d8295f7109d9de47a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x - Fix CVE-2023-0049, CVE-2023-0051, CVE-2023-0054 and CVE-2023-0288 - Update hash of README.txt: typo fixed by https://github.com/vim/vim/commit/f1dcd14fc5d4370476cd82895a4479ca2d252e54 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 98f8ddbc74962ab33df5ada2ccb53a27c49e60f1) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 4 ++-- package/vim/vim.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 03ee908db4..4000beedc1 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 c95c9abcf024bd6293ad199e4efa1c09452a9c6456c9cbaf53d896cf7b9f4d08 vim-9.0.0951.tar.gz +sha256 bcaf9b21ab00ab49de4f3bdfda1bcda82533ec16c412824226544a3fce6506ff vim-9.0.1260.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE -sha256 de04910387a62ad4f9b36b91457c8d5ef32733ac5d768a128071b93f4821fcd1 README.txt +sha256 d187aff219161f37138479257f82d687ea10b2cdd17d58b53a3ec9b79d6dc870 README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index d814c68630..e3648bfab9 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.0.0951 +VIM_VERSION = 9.0.1260 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Tue Feb 14 15:31:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 16:31:43 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/c-ares: security bump to version 1.19.0 Message-ID: <20230214153307.6BAEC85D7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01e97d849ead68fbc8521e84499f21b4154681de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Low. Stack overflow in ares_set_sortlist() which is used during c-ares initialization and typically provided by an administrator and not an end user. https://c-ares.org/changelog.html#1_19_0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 121a9d3649498c5f6f3a5ae8a37d6befe2cc8ef8) Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index af1f076aab..edf891674b 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 1a7d52a8a84a9fbffb1be9133c0f6e17217d91ea5a6fa61f6b4729cda78ebbcf c-ares-1.18.1.tar.gz +sha256 bfceba37e23fd531293829002cac0401ef49a6dc55923f7f92236585b7ad1dd3 c-ares-1.19.0.tar.gz # Hash for license file sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 0152759ebc..4332fc6919 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.18.1 +C_ARES_VERSION = 1.19.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From peter at korsgaard.com Tue Feb 14 15:32:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 16:32:10 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/c-ares: security bump to version 1.19.0 Message-ID: <20230214153421.6C24285D87@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=782f193f0fd48a39335ba5321ed76310a7a9a048 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Low. Stack overflow in ares_set_sortlist() which is used during c-ares initialization and typically provided by an administrator and not an end user. https://c-ares.org/changelog.html#1_19_0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 121a9d3649498c5f6f3a5ae8a37d6befe2cc8ef8) Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index af1f076aab..edf891674b 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 1a7d52a8a84a9fbffb1be9133c0f6e17217d91ea5a6fa61f6b4729cda78ebbcf c-ares-1.18.1.tar.gz +sha256 bfceba37e23fd531293829002cac0401ef49a6dc55923f7f92236585b7ad1dd3 c-ares-1.19.0.tar.gz # Hash for license file sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 0152759ebc..4332fc6919 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.18.1 +C_ARES_VERSION = 1.19.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From peter at korsgaard.com Tue Feb 14 15:32:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 16:32:16 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/vim: security bump to version 9.0.1260 Message-ID: <20230214153421.7A7A885D89@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef65baf8e20c3830e632e13fe99f84aeb9d0211e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Fix CVE-2023-0049, CVE-2023-0051, CVE-2023-0054 and CVE-2023-0288 - Update hash of README.txt: typo fixed by https://github.com/vim/vim/commit/f1dcd14fc5d4370476cd82895a4479ca2d252e54 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 98f8ddbc74962ab33df5ada2ccb53a27c49e60f1) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 4 ++-- package/vim/vim.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 03ee908db4..4000beedc1 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 c95c9abcf024bd6293ad199e4efa1c09452a9c6456c9cbaf53d896cf7b9f4d08 vim-9.0.0951.tar.gz +sha256 bcaf9b21ab00ab49de4f3bdfda1bcda82533ec16c412824226544a3fce6506ff vim-9.0.1260.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE -sha256 de04910387a62ad4f9b36b91457c8d5ef32733ac5d768a128071b93f4821fcd1 README.txt +sha256 d187aff219161f37138479257f82d687ea10b2cdd17d58b53a3ec9b79d6dc870 README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index d814c68630..e3648bfab9 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.0.0951 +VIM_VERSION = 9.0.1260 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From leo at yuriev.ru Tue Feb 14 15:51:29 2023 From: leo at yuriev.ru (=?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?=) Date: Tue, 14 Feb 2023 18:51:29 +0300 Subject: [Buildroot] [PATCH] package/libmdbx: bump version to 0.11.14 "Sergey Kapitsa" Message-ID: <20230214155129.679711-1-leo@yuriev.ru> This is stable bugfix release of libmdbx, in memory of Sergey Kapitsa (Russian physicist and demographer) on his 95th birthday. It is reasonable to backport this patch to all applicable releases/branches of Buildroot, at least this release fixes build for sh4 arch. Release notes for v0.11.14 -------------------------- Fixes: - backport: Refined the `__cold`/`__hot` macros to avoid the `error: inlining failed in call to ?always_inline FOO(...)?: target specific option mismatch` issue during build using GCC >10.x for SH4 arch. Actually this is GCC' SH4-backend bug which triggered by the `__attribute__((__optimize__("Os")))` used in conjunction with the `__attribute__((__cold__))`. - backport: Fixed `SIGSEGV` or an erroneous call to `free()` in case where errors occur when reopening by `mdbx_env_open()` of a previously used environment. - backport: Fixed `cursor_put_nochecklen()` internals for case when dupsort'ed named subDb contains a single key with multiple values (aka duplicates), which are replaced with a single value by put-operation with the `MDBX_UPSERT+MDBX_ALLDUPS` flags. In this case, the database becomes completely empty, without any pages. However exactly this condition was not considered and thus wasn't handled correctly. See [issue#8](https://gitflic.ru/project/erthink/libmdbx/issue/8) for more information. - backport: Fixed extra assertion inside `override_meta()`, which could lead to false-positive failing of the assertion in a debug builds during DB recovery and/or auto-rollback. Minors: - backport: Fixed typos. - backport: Refined `const` and `noexcept` for few C++ API methods. - backport: Resolve false-posirive `used uninitialized` warning from GCC >10.x while build for SH4 arch. - backport: Fixed insignificant typo of `||` inside `#if` byte-order condition. The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md Signed-off-by: ?????? ????? (Leonid Yuriev) --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index e3fb309461..b1a2891b91 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 9449fd357119e19902363ab90134d82c9a713b706394c2a1389b5bb4787b5164 libmdbx-amalgamated-0.11.13.tar.xz +sha256 97b03965b5b61727dc4232c50ccb174c632470a3d24438b3c52315bef6fb4033 libmdbx-amalgamated-0.11.14.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index a139e062f6..5e7995f8c8 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.13 +LIBMDBX_VERSION = 0.11.14 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO -- 2.34.1 From peter at korsgaard.com Tue Feb 14 16:05:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:05:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-compose: security bump version to 2.15.1 In-Reply-To: <20230202134149.1864294-1-christian@paral.in> (Christian Stewart's message of "Thu, 2 Feb 2023 05:41:49 -0800") References: <20230202134149.1864294-1-christian@paral.in> Message-ID: <878rh08c7e.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Fix CVE-2022-27664 and CVE-2022-32149 high-risk vulnerability. > Many other bugfixes, enhancements, and improvements. > https://github.com/docker/compose/releases/tag/v2.15.1 > Signed-off-by: Christian Stewart Hmm, those CVE's were for issues in go, not in docker-compose, E.G. only a vulnerability in docker-compose's binary releases. We do not use the binaries, so we shouldn't flag such version bumps as security bumps. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 16:17:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:17:13 +0100 Subject: [Buildroot] [PATCH] package/openvpn: get rid of -e in S60openvpn shebang In-Reply-To: <20230204134709.4160596-1-sorganov@gmail.com> (Sergey Organov's message of "Sat, 4 Feb 2023 16:47:09 +0300") References: <20230204134709.4160596-1-sorganov@gmail.com> Message-ID: <874jro8bna.fsf@dell.be.48ers.dk> >>>>> "Sergey" == Sergey Organov writes: > The -e switch makes the script terminate on error from > start-stop-daemon, rendering unreachable the code that checks the exit > status. > There is no need in the -e switch in the first place either, as the > script takes care of errors handling. > Signed-off-by: Sergey Organov Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:06:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:06:15 +0100 Subject: [Buildroot] [git commit] package/freeswitch: security bump version to 1.10.9 In-Reply-To: <20230205090205.CD8F4836B0@busybox.osuosl.org> (Peter Korsgaard's message of "Sun, 5 Feb 2023 09:53:53 +0100") References: <20230205090205.CD8F4836B0@busybox.osuosl.org> Message-ID: <87zg9g6ut4.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=46683dd4a6e65b5ae3188440e9ae8eaf055d9a85 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Release notes: > https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 > Upstream removed zrtp support: > https://github.com/signalwire/freeswitch/pull/1848 > Signed-off-by: Bernd Kuhls > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:06:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:06:20 +0100 Subject: [Buildroot] [git commit] package/libks: bump version to 1.8.2 In-Reply-To: <20230205101810.8142E836ED@busybox.osuosl.org> (Yann E. MORIN's message of "Sun, 5 Feb 2023 11:16:15 +0100") References: <20230205101810.8142E836ED@busybox.osuosl.org> Message-ID: <87v8k46usz.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=6e09e7987b986d01e86e4ec45319e2dd5945259c > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Needed for upcoming bump of freeswitch to version 1.10.9. > Signed-off-by: Bernd Kuhls > Signed-off-by: Yann E. MORIN Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:06:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:06:28 +0100 Subject: [Buildroot] [git commit] package/sofia-sip: bump version to 1.13.12 In-Reply-To: <20230205101810.8BBE8836EF@busybox.osuosl.org> (Yann E. MORIN's message of "Sun, 5 Feb 2023 11:16:19 +0100") References: <20230205101810.8BBE8836EF@busybox.osuosl.org> Message-ID: <87r0us6usr.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=8bb962724e3a76112b7c374ae6a1c4521f97cc65 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Switch to github helper due to lack of upstream-provided tarball. > Needed for upcoming bump of freeswitch to version 1.10.9. > Signed-off-by: Bernd Kuhls > Signed-off-by: Yann E. MORIN Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:07:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:07:14 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: Remove openal from my list In-Reply-To: <20230201192711.1632095-1-nerv@dawncrow.de> (=?utf-8?Q?=22And?= =?utf-8?Q?r=C3=A9?= Zwing"'s message of "Wed, 1 Feb 2023 20:27:11 +0100") References: <20230201192711.1632095-1-nerv@dawncrow.de> Message-ID: <87mt5g6urh.fsf@dell.be.48ers.dk> >>>>> "Andr?" == Andr? Zwing writes: > Signed-off-by: Andr? Zwing Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 16:16:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:16:28 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/openvpn: get rid of -e in S60openvpn shebang Message-ID: <20230214170733.1155185D7A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd7ca9147a0afc04a6d0d9346141245878b39339 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The -e switch makes the script terminate on error from start-stop-daemon, rendering unreachable the code that checks the exit status. There is no need in the -e switch in the first place either, as the script takes care of errors handling. Signed-off-by: Sergey Organov Signed-off-by: Yann E. MORIN (cherry picked from commit 28ca1da23433d58112304c191c319ac11edc5d77) Signed-off-by: Peter Korsgaard --- package/openvpn/S60openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn index f097cf11ec..00156c80db 100644 --- a/package/openvpn/S60openvpn +++ b/package/openvpn/S60openvpn @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # # Original version by Robert Leslie # , edited by iwj and cs From peter at korsgaard.com Tue Feb 14 16:56:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:56:42 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/freeswitch: security bump version to 1.10.9 Message-ID: <20230214170733.3A55E7FE84@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12003d0146cadea4908ed23a4bcbd5399f79ec8c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 Upstream removed zrtp support: https://github.com/signalwire/freeswitch/pull/1848 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 46683dd4a6e65b5ae3188440e9ae8eaf055d9a85) Signed-off-by: Peter Korsgaard --- package/freeswitch/freeswitch.hash | 5 ++--- package/freeswitch/freeswitch.mk | 11 +---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 18a36ff23c..3497a3283f 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,11 +1,10 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.8.-release.tar.xz.sha256 -sha256 1176b26b2f463de2980e5be953f81ced94d23c784452bd41e086d3933a88be5f freeswitch-1.10.8.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.9.-release.tar.xz.sha256 +sha256 f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 freeswitch-1.10.9.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 6234dd8e97..7497cc4964 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.8 +FREESWITCH_VERSION = 1.10.9 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -81,15 +81,6 @@ FREESWITCH_CONF_OPTS = \ --without-python \ --disable-system-xmlrpc-c -# zrtp supports a limited set of archs, sparc support is also broken due -# to a broken ld call by gcc, see libs/libzrtp/include/zrtp_config.h -ifeq ($(BR2_i386)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le)$(BR2_x86_64),y) -FREESWITCH_LICENSE_FILES += libs/libzrtp/src/zrtp_legal.c -FREESWITCH_CONF_OPTS += --enable-zrtp -else -FREESWITCH_CONF_OPTS += --disable-zrtp -endif - # Enable optional modules FREESWITCH_ENABLED_MODULES += \ applications/mod_avmd \ From peter at korsgaard.com Tue Feb 14 16:15:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:15:17 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230214170733.03DDE85DB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a512389e210629e93f09ab0094c0171aa4af8d7d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x 4.9.x / 6.0.x is now EOL. Signed-off-by: Peter Korsgaard (cherry picked from commit def789059af78cd65294cafa4288cb41691e86c7) [Peter: drop 6.1.x bump] Signed-off-by: Peter Korsgaard --- linux/linux.hash | 10 +++++----- package/linux-headers/Config.in.host | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index ab996a4d81..858b12e0cb 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -2,13 +2,13 @@ sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c93bb384a97ad1f0a4f18e442ce0291242722f78023eca658b22344541f09489 linux-5.19.17.tar.xz -sha256 e7359bd2935b54fe8bb821cf748591c36a95bed019e752d3e4d5803d9da1ccb4 linux-5.15.87.tar.xz -sha256 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 linux-5.10.162.tar.xz -sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz +sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz +sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz +sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz -sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz +sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz +sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 742d13546a..00cc18ea62 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -393,11 +393,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.302" if BR2_KERNEL_HEADERS_4_14 - default "4.19.269" if BR2_KERNEL_HEADERS_4_19 - default "5.4.228" if BR2_KERNEL_HEADERS_5_4 - default "5.10.162" if BR2_KERNEL_HEADERS_5_10 - default "5.15.87" if BR2_KERNEL_HEADERS_5_15 + default "4.14.304" if BR2_KERNEL_HEADERS_4_14 + default "4.19.271" if BR2_KERNEL_HEADERS_4_19 + default "5.4.230" if BR2_KERNEL_HEADERS_5_4 + default "5.10.166" if BR2_KERNEL_HEADERS_5_10 + default "5.15.91" if BR2_KERNEL_HEADERS_5_15 default "5.19.17" if BR2_KERNEL_HEADERS_5_19 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From peter at korsgaard.com Tue Feb 14 16:56:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:56:42 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/libks: bump version to 1.8.2 Message-ID: <20230214170733.1F02B85DB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=121037ce409839af4e0a93a9f5e49a9dc36d8084 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 6e09e7987b986d01e86e4ec45319e2dd5945259c) Signed-off-by: Peter Korsgaard --- 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 d4ad7ebbbc..dba442bdd2 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz +sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index 4aca5c5c4c..c4f0cd5c78 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.8.0 +LIBKS_VERSION = 1.8.2 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright From peter at korsgaard.com Tue Feb 14 17:07:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:07:02 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] DEVELOPERS: Remove openal from my list Message-ID: <20230214170733.46C8A85DB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b24972000a5b8014c5cea119e6f3f834a756ad69 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Signed-off-by: Andr?? Zwing Signed-off-by: Thomas Petazzoni (cherry picked from commit 6c8cda8c94e00dc4571a6ad1b3f9c1c617a63873) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 23bb7031e0..7df31b1fdb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -130,7 +130,6 @@ F: package/python-docopt/ N: Andr?? Zwing F: package/libkrb5/ -F: package/openal/ F: package/p7zip/ F: package/wine/ From peter at korsgaard.com Tue Feb 14 16:56:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:56:42 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/sofia-sip: bump version to 1.13.12 Message-ID: <20230214170733.2B61C85DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01827fbfddf741f8337eef7d1657f027040d2b7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Switch to github helper due to lack of upstream-provided tarball. Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 8bb962724e3a76112b7c374ae6a1c4521f97cc65) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 776136bb15..4617725571 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 daf75c41408c559c2d58a8fd4d39be4a8ff5144bc1db220d4dbc28deeed6670a sofia-sip-1.13.9-f6ee306084.tar.gz +sha256 03dda8653367501b7b1188a6b6513416902372e27475553de9318ee89ac390ff sofia-sip-1.13.12.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 9071d964e4..59c365365b 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,10 +4,11 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.9 -SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-f6ee306084.tar.gz -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip +SOFIA_SIP_VERSION = 1.13.12 +SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION)) SOFIA_SIP_INSTALL_STAGING = YES +# Fetched from github, no pre-generated configure script provided +SOFIA_SIP_AUTORECONF = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS From peter at korsgaard.com Tue Feb 14 16:16:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:16:17 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openvpn: get rid of -e in S60openvpn shebang Message-ID: <20230214170848.31BA785E19@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7d8ba50f6ca38dceb7f57658d302317d81817b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The -e switch makes the script terminate on error from start-stop-daemon, rendering unreachable the code that checks the exit status. There is no need in the -e switch in the first place either, as the script takes care of errors handling. Signed-off-by: Sergey Organov Signed-off-by: Yann E. MORIN (cherry picked from commit 28ca1da23433d58112304c191c319ac11edc5d77) Signed-off-by: Peter Korsgaard --- package/openvpn/S60openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn index f097cf11ec..00156c80db 100644 --- a/package/openvpn/S60openvpn +++ b/package/openvpn/S60openvpn @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # # Original version by Robert Leslie # , edited by iwj and cs From peter at korsgaard.com Tue Feb 14 16:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/sofia-sip: bump version to 1.13.9 Message-ID: <20230214170848.5CA4885E19@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a206365859d6c23ead253b8836f21f3e71318ce9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 6c33056fff080dd1795bcfb543b87e7b70ac455c) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index ae2b3e725c..776136bb15 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 ebd006a98a7dff6e7f4d8357c5ebeee1d3bee3ac29ff213a4909e845f230fcbe sofia-sip-1.13.8-756ab9b5c9.tar.gz +sha256 daf75c41408c559c2d58a8fd4d39be4a8ff5144bc1db220d4dbc28deeed6670a sofia-sip-1.13.9-f6ee306084.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 80e59057c4..9071d964e4 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,8 +4,8 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.8 -SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-756ab9b5c9.tar.gz +SOFIA_SIP_VERSION = 1.13.9 +SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-f6ee306084.tar.gz SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip SOFIA_SIP_INSTALL_STAGING = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Tue Feb 14 17:06:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:06:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] DEVELOPERS: Remove openal from my list Message-ID: <20230214170848.9434985E1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39853c1211f3f7af063be7c6f8ec4423fc49454a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Andr?? Zwing Signed-off-by: Thomas Petazzoni (cherry picked from commit 6c8cda8c94e00dc4571a6ad1b3f9c1c617a63873) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 3e4504d86d..1ff3c6e5dc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -132,7 +132,6 @@ F: package/ktap/ N: Andr?? Zwing F: package/libkrb5/ -F: package/openal/ F: package/p7zip/ F: package/wine/ From peter at korsgaard.com Tue Feb 14 16:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libks: bump version to 1.8.0 Message-ID: <20230214170848.3C59E85E1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1a765f8155c796d655d6f0c28d7bc349bc6e2cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 065750ee0c2a5e0dc217d82d17d7103ab5f22351) Signed-off-by: Peter Korsgaard --- 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 peter at korsgaard.com Tue Feb 14 16:14:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:14:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230214170848.2631F85E16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b712193b425d5bc36b621af43f4c667fdab62004 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x 4.9.x / 6.0.x is now EOL. Signed-off-by: Peter Korsgaard (cherry picked from commit def789059af78cd65294cafa4288cb41691e86c7) [Peter: drop 6.1.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 ed4e305aa7..b8f93f0eaa 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.87" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.91" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.115-cip7" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.109-cip5-rt4" 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 c10164a030..c97e90a43f 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 d8060dc88f862baaae66b42a2dbc12298ed667c698eb5c55617a7786ee47bf25 linux-5.16.20.tar.xz -sha256 e7359bd2935b54fe8bb821cf748591c36a95bed019e752d3e4d5803d9da1ccb4 linux-5.15.87.tar.xz -sha256 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 linux-5.10.162.tar.xz -sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz +sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz +sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz +sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz -sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz +sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz +sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed sha256 f3559be277be9200897022282be18cfc0278d1d8baec8058305b04b9cd72002a linux-cip-5.10.115-cip7.tar.gz sha256 71fba4ed5cb48fa7869e9fe271b68b77fed26775ce5cf2f50891aa8f71c388b3 linux-cip-5.10.109-cip5-rt4.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e082423b86..f6654f8578 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -383,11 +383,11 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "4.4.302" if BR2_KERNEL_HEADERS_4_4 default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.302" if BR2_KERNEL_HEADERS_4_14 - default "4.19.269" if BR2_KERNEL_HEADERS_4_19 - default "5.4.228" if BR2_KERNEL_HEADERS_5_4 - default "5.10.162" if BR2_KERNEL_HEADERS_5_10 - default "5.15.87" if BR2_KERNEL_HEADERS_5_15 + default "4.14.304" if BR2_KERNEL_HEADERS_4_14 + default "4.19.271" if BR2_KERNEL_HEADERS_4_19 + default "5.4.230" if BR2_KERNEL_HEADERS_5_4 + default "5.10.166" if BR2_KERNEL_HEADERS_5_10 + default "5.15.91" if BR2_KERNEL_HEADERS_5_15 default "5.16.20" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From peter at korsgaard.com Tue Feb 14 16:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libks: bump version to 1.8.2 Message-ID: <20230214170848.5163D85E16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3bc915b74ffecb71c53367f7daaec6a573b0417 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 6e09e7987b986d01e86e4ec45319e2dd5945259c) Signed-off-by: Peter Korsgaard --- 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 d4ad7ebbbc..dba442bdd2 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz +sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index 4aca5c5c4c..c4f0cd5c78 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.8.0 +LIBKS_VERSION = 1.8.2 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright From peter at korsgaard.com Tue Feb 14 16:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libks: disable tests Message-ID: <20230214170848.4725685E1B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2461817ad61503646b4c33dcb69822db8781aca5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Disables tests to avoid the following build failure with BR2_SHARED_STATIC_LIBS: [ 42%] Linking C executable teststring ../libks.so.1: undefined reference to `dlsym' Fixes: - http://autobuild.buildroot.org/results/e61a683928795402375165adf686687f3305e0c2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 267e39413ed09876c61eac1c5d7ee3042061b6f7) Signed-off-by: Peter Korsgaard --- .../0001-CMakeLists.txt-honour-BUILD_TESTING.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/package/libks/0001-CMakeLists.txt-honour-BUILD_TESTING.patch b/package/libks/0001-CMakeLists.txt-honour-BUILD_TESTING.patch new file mode 100644 index 0000000000..fbe6cabd86 --- /dev/null +++ b/package/libks/0001-CMakeLists.txt-honour-BUILD_TESTING.patch @@ -0,0 +1,41 @@ +From c850e04898a9498d447b43bf346365646ff1b19c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 13 May 2022 23:12:31 +0200 +Subject: [PATCH] CMakeLists.txt: honour BUILD_TESTING + +Allow the user to disable tests through the standard BUILD_TESTING +option: https://cmake.org/cmake/help/latest/module/CTest.html + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/signalwire/libks/pull/125] +--- + CMakeLists.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5bbac31..37e6bcd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,6 @@ + cmake_minimum_required(VERSION 3.7.2) + ++option(BUILD_TESTING "Build tests" ON) + option(KS_DEBUG_MUTEX "Debug mutexes, only works on linux for now" OFF) + option(KS_DEBUG_SPINLOCK "Debug spinlocks" OFF) + option(KS_DEBUG_POOL "Track pool allocations and provide hooks for rendering them" OFF) +@@ -609,8 +610,10 @@ endif() + #cotire(ks) + + # Add tests +-enable_testing() +-add_subdirectory(tests) ++if (BUILD_TESTING) ++ enable_testing() ++ add_subdirectory(tests) ++endif() + + if (WITH_KS_TEST) + enable_testing() +-- +2.35.1 + From peter at korsgaard.com Tue Feb 14 16:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/sofia-sip: bump version to 1.13.12 Message-ID: <20230214170848.66F3F85E1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab94614e7d5b2076433aef665bc0186e4e477df9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Switch to github helper due to lack of upstream-provided tarball. Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 8bb962724e3a76112b7c374ae6a1c4521f97cc65) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 776136bb15..4617725571 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 daf75c41408c559c2d58a8fd4d39be4a8ff5144bc1db220d4dbc28deeed6670a sofia-sip-1.13.9-f6ee306084.tar.gz +sha256 03dda8653367501b7b1188a6b6513416902372e27475553de9318ee89ac390ff sofia-sip-1.13.12.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 9071d964e4..59c365365b 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,10 +4,11 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.9 -SOFIA_SIP_SOURCE = sofia-sip-$(SOFIA_SIP_VERSION)-f6ee306084.tar.gz -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip +SOFIA_SIP_VERSION = 1.13.12 +SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION)) SOFIA_SIP_INSTALL_STAGING = YES +# Fetched from github, no pre-generated configure script provided +SOFIA_SIP_AUTORECONF = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS From peter at korsgaard.com Tue Feb 14 16:59:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/freeswitch: security bump version to 1.10.9 Message-ID: <20230214170848.8869B85E19@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f1df54d4d43053354749c3b8fe46c3755c746d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 Upstream removed zrtp support: https://github.com/signalwire/freeswitch/pull/1848 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 46683dd4a6e65b5ae3188440e9ae8eaf055d9a85) Signed-off-by: Peter Korsgaard --- package/freeswitch/freeswitch.hash | 5 ++--- package/freeswitch/freeswitch.mk | 11 +---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 18a36ff23c..3497a3283f 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,11 +1,10 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.8.-release.tar.xz.sha256 -sha256 1176b26b2f463de2980e5be953f81ced94d23c784452bd41e086d3933a88be5f freeswitch-1.10.8.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.9.-release.tar.xz.sha256 +sha256 f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 freeswitch-1.10.9.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 6234dd8e97..7497cc4964 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.8 +FREESWITCH_VERSION = 1.10.9 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -81,15 +81,6 @@ FREESWITCH_CONF_OPTS = \ --without-python \ --disable-system-xmlrpc-c -# zrtp supports a limited set of archs, sparc support is also broken due -# to a broken ld call by gcc, see libs/libzrtp/include/zrtp_config.h -ifeq ($(BR2_i386)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le)$(BR2_x86_64),y) -FREESWITCH_LICENSE_FILES += libs/libzrtp/src/zrtp_legal.c -FREESWITCH_CONF_OPTS += --enable-zrtp -else -FREESWITCH_CONF_OPTS += --disable-zrtp -endif - # Enable optional modules FREESWITCH_ENABLED_MODULES += \ applications/mod_avmd \ From peter at korsgaard.com Tue Feb 14 16:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/freeswitch: fix build with libressl >= 3.5.0 Message-ID: <20230214170848.712EC85E1D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=016b0adec19704b3e28456a3f237c0a20d978fe4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure with libressl raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: crypto/hash/hmac_ossl.c: In function 'srtp_hmac_alloc': crypto/hash/hmac_ossl.c:88:55: error: invalid application of 'sizeof' to incomplete type 'HMAC_CTX' {aka 'struct hmac_ctx_st'} 88 | pointer = (uint8_t *)srtp_crypto_alloc(sizeof(HMAC_CTX) + | ^~~~~~~~ crypto/hash/hmac_ossl.c:97:9: warning: implicit declaration of function 'HMAC_CTX_init'; did you mean 'HMAC_CTX_new'? [-Wimplicit-function-declaration] 97 | HMAC_CTX_init(new_hmac_ctx); | ^~~~~~~~~~~~~ | HMAC_CTX_new crypto/hash/hmac_ossl.c: In function 'srtp_hmac_dealloc': crypto/hash/hmac_ossl.c:130:5: warning: implicit declaration of function 'HMAC_CTX_cleanup' [-Wimplicit-function-declaration] 130 | HMAC_CTX_cleanup(hmac_ctx); | ^~~~~~~~~~~~~~~~ crypto/hash/hmac_ossl.c:133:40: error: invalid application of 'sizeof' to incomplete type 'HMAC_CTX' {aka 'struct hmac_ctx_st'} 133 | octet_string_set_to_zero(a, sizeof(HMAC_CTX) + sizeof(srtp_auth_t)); | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e696ead9ffffa5bb80928d75607bfbb9b263d3c6 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e4a762bf7f1b5753730d73ccac9b059f79c81387) Signed-off-by: Peter Korsgaard --- ...rypto-hash-hmac_ossl.c-fix-build-with-lib.patch | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/package/freeswitch/0003-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch b/package/freeswitch/0003-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch new file mode 100644 index 0000000000..eb717fc26d --- /dev/null +++ b/package/freeswitch/0003-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch @@ -0,0 +1,59 @@ +From c8cc6f1773ff370bb14bb963e2f632eef6d6a3c2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 12 May 2022 23:22:42 +0200 +Subject: [PATCH] libs/srtp/crypto/hash/hmac_ossl.c: fix build with libressl >= + 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +crypto/hash/hmac_ossl.c: In function 'srtp_hmac_alloc': +crypto/hash/hmac_ossl.c:88:55: error: invalid application of 'sizeof' to incomplete type 'HMAC_CTX' {aka 'struct hmac_ctx_st'} + 88 | pointer = (uint8_t *)srtp_crypto_alloc(sizeof(HMAC_CTX) + + | ^~~~~~~~ +crypto/hash/hmac_ossl.c:97:9: warning: implicit declaration of function 'HMAC_CTX_init'; did you mean 'HMAC_CTX_new'? [-Wimplicit-function-declaration] + 97 | HMAC_CTX_init(new_hmac_ctx); + | ^~~~~~~~~~~~~ + | HMAC_CTX_new +crypto/hash/hmac_ossl.c: In function 'srtp_hmac_dealloc': +crypto/hash/hmac_ossl.c:130:5: warning: implicit declaration of function 'HMAC_CTX_cleanup' [-Wimplicit-function-declaration] + 130 | HMAC_CTX_cleanup(hmac_ctx); + | ^~~~~~~~~~~~~~~~ +crypto/hash/hmac_ossl.c:133:40: error: invalid application of 'sizeof' to incomplete type 'HMAC_CTX' {aka 'struct hmac_ctx_st'} + 133 | octet_string_set_to_zero(a, sizeof(HMAC_CTX) + sizeof(srtp_auth_t)); + | ^~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/e696ead9ffffa5bb80928d75607bfbb9b263d3c6 + +Signed-off-by: Fabrice Fontaine +--- + libs/srtp/crypto/hash/hmac_ossl.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libs/srtp/crypto/hash/hmac_ossl.c b/libs/srtp/crypto/hash/hmac_ossl.c +index 8146438b05..6730cbb35c 100644 +--- a/libs/srtp/crypto/hash/hmac_ossl.c ++++ b/libs/srtp/crypto/hash/hmac_ossl.c +@@ -79,7 +79,8 @@ static srtp_err_status_t srtp_hmac_alloc(srtp_auth_t **a, + + /* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated + using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + { + /* allocate memory for auth and HMAC_CTX structures */ + uint8_t *pointer; +@@ -125,7 +126,8 @@ static srtp_err_status_t srtp_hmac_dealloc(srtp_auth_t *a) + + hmac_ctx = (HMAC_CTX *)a->state; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + HMAC_CTX_cleanup(hmac_ctx); + + /* zeroize entire state*/ +-- +2.35.1 + From peter at korsgaard.com Tue Feb 14 16:59:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 17:59:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/freeswitch: bump version to 1.10.8 Message-ID: <20230214170848.7CF8985E16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fdc283c0b121d0d0f66ad927ce69059ef44bf62d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.8 Removed two patches which are included in upstream release, renumbered remaining patch. Removed libs/apr-util/LICENSE due to upstream removal of bundled apr-util package. Added fix to disable pcap detection, otherwise /usr/bin/pcap-config can be picked-up which breaks building freeswitch. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 1b8230ab648ec33b93ff29a6c1ed5b327d36c7dd) Signed-off-by: Peter Korsgaard --- ...-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch | 26 ----- ...ypto-hash-hmac_ossl.c-fix-build-with-lib.patch} | 0 .../freeswitch/0002-core-fix--disable-libyuv.patch | 129 --------------------- package/freeswitch/freeswitch.hash | 5 +- package/freeswitch/freeswitch.mk | 9 +- 5 files changed, 8 insertions(+), 161 deletions(-) diff --git a/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch deleted file mode 100644 index 57f6e660c1..0000000000 --- a/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 68039d344d8e826e8b403c9cd0284fd07b4495ac Mon Sep 17 00:00:00 2001 -From: Dragos Oancea -Date: Tue, 26 Oct 2021 08:42:58 +0000 -Subject: [PATCH] [core] fix build SWITCH_BYTE_ORDER == __BIG_ENDIAN - -Downloaded from upstream commit: -https://github.com/signalwire/freeswitch/commit/68039d344d8e826e8b403c9cd0284fd07b4495ac - -Signed-off-by: Bernd Kuhls ---- - src/switch_rtp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/switch_rtp.c b/src/switch_rtp.c -index 1880bbb19c..843ee81381 100644 ---- a/src/switch_rtp.c -+++ b/src/switch_rtp.c -@@ -2155,7 +2155,7 @@ static void switch_send_rtcp_event(switch_rtp_t *rtp_session ,struct switch_rtcp - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value); - snprintf(header, sizeof(header), "Source-Lost"); - #if SWITCH_BYTE_ORDER == __BIG_ENDIAN -- tmpLost = report->lost; /* signed 24bit will extended signess to int32_t automatically */ -+ tmpLost = rtcp_report_block->lost; /* signed 24bit will extended signess to int32_t automatically */ - #else - tmpLost = ntohl(rtcp_report_block->lost)>>8; - tmpLost = tmpLost | ((tmpLost & 0x00800000) ? 0xff000000 : 0x00000000); /* ...and signess compensation */ diff --git a/package/freeswitch/0003-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch b/package/freeswitch/0001-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch similarity index 100% rename from package/freeswitch/0003-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch rename to package/freeswitch/0001-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch diff --git a/package/freeswitch/0002-core-fix--disable-libyuv.patch b/package/freeswitch/0002-core-fix--disable-libyuv.patch deleted file mode 100644 index 137cb27cf8..0000000000 --- a/package/freeswitch/0002-core-fix--disable-libyuv.patch +++ /dev/null @@ -1,129 +0,0 @@ -From a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 Mon Sep 17 00:00:00 2001 -From: Sebastian Kemper -Date: Mon, 1 Nov 2021 09:59:09 +0100 -Subject: [PATCH] [core] fix "--disable-libyuv" - -Recent changes made it impossible to compile freeswitch without libyuv -support. - -src/switch_core_video.c: In function 'switch_img_read_from_file': -src/switch_core_video.c:3139:4: error: implicit declaration of function 'RAWToI420' [-Werror=implicit-function-declaration] -RAWToI420(data, width * 3, -^ -src/switch_core_video.c:3148:4: error: implicit declaration of function 'ABGRToARGB' [-Werror=implicit-function-declaration] -ABGRToARGB(data, width * 4, img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], width, height); -^ - -Fix this my adding/moving the checks for "SWITCH_HAVE_YUV". - -Downloaded from upstream commit: -https://github.com/signalwire/freeswitch/commit/a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 - -Signed-off-by: Bernd Kuhls -Signed-off-by: Sebastian Kemper ---- - src/switch_core_video.c | 12 ++++++++++++ - tests/unit/switch_core_video.c | 4 ++++ - 2 files changed, 16 insertions(+) - -diff --git a/src/switch_core_video.c b/src/switch_core_video.c -index 7dbd685d6ee..0d377f9c3e4 100644 ---- a/src/switch_core_video.c -+++ b/src/switch_core_video.c -@@ -3116,6 +3116,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url_png(switch_image_t *img, cha - - SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name, switch_img_fmt_t img_fmt) - { -+#ifdef SWITCH_HAVE_YUV - int width = 0, height = 0, channels = 0; - int comp = STBI_rgb; - unsigned char *data = NULL; -@@ -3155,12 +3156,16 @@ SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name - } else if (data) { - stbi_image_free(data); - } -+#endif - - return NULL; - } - - SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, const char* file_name, int quality) - { -+#ifndef SWITCH_HAVE_YUV -+ return SWITCH_STATUS_FALSE; -+#else - int comp = STBI_rgb; - unsigned char *data = NULL; - const char *ext = strrchr(file_name, '.'); -@@ -3217,6 +3222,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, co - free(data); - - return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; -+#endif - } - - typedef struct data_url_context_s { -@@ -3224,14 +3230,19 @@ typedef struct data_url_context_s { - char **urlP; - } data_url_context_t; - -+#ifdef SWITCH_HAVE_YUV - static void data_url_write_func(void *context, void *data, int size) - { - switch_buffer_t *buffer = (switch_buffer_t *)context; - switch_buffer_write(buffer, data, size); - } -+#endif - - SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char **urlP, const char *type, int quality) - { -+#ifndef SWITCH_HAVE_YUV -+ return SWITCH_STATUS_FALSE; -+#else - int comp = STBI_rgb; - unsigned char *data = NULL; - int stride_in_bytes = 0; -@@ -3300,6 +3311,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char ** - switch_buffer_destroy(&buffer); - - return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; -+#endif /* SWITCH_HAVE_YUV */ - } - - -diff --git a/tests/unit/switch_core_video.c b/tests/unit/switch_core_video.c -index 27c96102929..e395db474d5 100644 ---- a/tests/unit/switch_core_video.c -+++ b/tests/unit/switch_core_video.c -@@ -48,6 +48,7 @@ FST_CORE_BEGIN("./conf") - } - FST_TEARDOWN_END() - -+#ifdef SWITCH_HAVE_YUV - FST_TEST_BEGIN(data_url_test) - { - char *data_url = NULL; -@@ -88,6 +89,7 @@ FST_CORE_BEGIN("./conf") - unlink(argb_filename); - } - FST_TEST_END() -+#endif /* SWITCH_HAVE_YUV */ - - FST_TEST_BEGIN(img_patch) - { -@@ -239,6 +241,7 @@ FST_CORE_BEGIN("./conf") - } - FST_TEST_END() - -+#ifdef SWITCH_HAVE_YUV - FST_TEST_BEGIN(stb_data_url) - { - switch_image_t *img = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, 120, 60, 1); -@@ -321,6 +324,7 @@ FST_CORE_BEGIN("./conf") - unlink(jpg_write_filename); - } - FST_TEST_END() -+#endif /* SWITCH_HAVE_YUV */ - } - FST_SUITE_END() - } diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 8066c620c4..18a36ff23c 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,10 +1,9 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.7.-release.tar.xz.sha256 -sha256 0919bddc2ea9cab2e4944314e71637bea9dd4f40d510722a74ea032104594c41 freeswitch-1.10.7.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.8.-release.tar.xz.sha256 +sha256 1176b26b2f463de2980e5be953f81ced94d23c784452bd41e086d3933a88be5f freeswitch-1.10.8.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE -sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a libs/apr-util/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 24c1ee4dd4..6234dd8e97 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,20 +4,19 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.7 +FREESWITCH_VERSION = 1.10.8 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging FREESWITCH_INSTALL_STAGING = YES FREESWITCH_LICENSE = MPL-1.1, \ GPL-3.0+ with font exception (fonts), \ - Apache-2.0 (apr, apr-util), \ + Apache-2.0 (apr), \ BSD-3-Clause (libsrtp) FREESWITCH_LICENSE_FILES = \ COPYING \ libs/apr/LICENSE \ - libs/apr-util/LICENSE \ libs/srtp/LICENSE FREESWITCH_CPE_ID_VENDOR = freeswitch @@ -50,6 +49,10 @@ FREESWITCH_CONF_ENV += \ ac_cv_prog_PHP_CONFIG=false \ ac_cv_have_php_config=no +# disable pcap detection, pcap is an optional dependency for unit tests +FREESWITCH_CONF_ENV += \ + ac_cv_prog_HAVE_PCAP_CONFIG=false + # copied from freeswitch/configure.ac, line 258+ FREESWITCH_CONF_ENV += \ ac_cv_file__dev_ptmx=yes \ From peter at korsgaard.com Tue Feb 14 17:12:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:57 +0100 Subject: [Buildroot] [PATCH] package/mpd: update to version 0.23.12 In-Reply-To: <20230213092611.86858-1-br015@umbiko.net> (Andreas Ziegler's message of "Mon, 13 Feb 2023 10:26:11 +0100") References: <20230213092611.86858-1-br015@umbiko.net> Message-ID: <87ilg46uhy.fsf@dell.be.48ers.dk> >>>>> "Andreas" == Andreas Ziegler writes: > List of changes: > decoder::mad: fix integer underflow with very small files > input::curl: require CURL 7.55.0 or later > output::pipewire: adjust to PipeWire 0.3.64 API change > tags:: fix crash bug due to race condition > fix build failures with GCC 13 > Change log: > https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.12/NEWS > Commit: > https://github.com/MusicPlayerDaemon/MPD/commit/b1422fb > Tested on: > i386 (build) > x86_64 (build, run) > Aarch64 (build) > Signed-off-by: Andreas Ziegler Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:13:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:13:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix legal info In-Reply-To: <20230213181217.908103-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 13 Feb 2023 19:12:17 +0100") References: <20230213181217.908103-1-fontaine.fabrice@gmail.com> Message-ID: <87edqs6ugw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 57e297a215193c92f6a178139db53616f2ee23b5 forgot to update hash of > COPYRIGHT file (year updated with > https://github.com/postgres/postgres/commit/1fbcb1360bc19b89369209203ea7cc19b8cde224) > Fixes: > - http://autobuild.buildroot.org/results/93f40dc71619745ddc6741598c9a488c81ea440f > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:13:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:13:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/apr-util: security bump to version 1.6.3 In-Reply-To: <20230213181332.908961-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 13 Feb 2023 19:13:32 +0100") References: <20230213181332.908961-1-fontaine.fabrice@gmail.com> Message-ID: <87a61g6ugq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > *) SECURITY: CVE-2022-25147 (cve.mitre.org) > Integer Overflow or Wraparound vulnerability in apr_base64 functions > of Apache Portable Runtime Utility (APR-util) allows an attacker to > write beyond bounds of a buffer. > https://downloads.apache.org/apr/Announcement-aprutil-1.x.html > https://downloads.apache.org/apr/CHANGES-APR-UTIL-1.6 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:14:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: bump to version 6.2.7 In-Reply-To: <20230213181523.910359-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 13 Feb 2023 19:15:23 +0100") References: <20230213181523.910359-1-fontaine.fabrice@gmail.com> Message-ID: <875yc46ug6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - host-pkgconf is now mandatory > - switch to pcre2 which is supported since version 6.0.0 and > https://github.com/zabbix/zabbix/commit/18917f919a68abc863a5c79ba88c0cb156255fdc > - Update hash of README (links updated with > https://github.com/zabbix/zabbix/commit/067f5f873fb18ae7b22c5eaef40f0898b98edeb5 > https://github.com/zabbix/zabbix/commit/499dbc81b987513233d579610335b8938f1ae91d) > https://github.com/zabbix/zabbix/blob/6.2.7/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:14:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:28 +0100 Subject: [Buildroot] [PATCH] package/dnsmasq: bump version to 2.89 In-Reply-To: <20230214090424.9335-1-heiko.thiery@gmail.com> (Heiko Thiery's message of "Tue, 14 Feb 2023 10:04:25 +0100") References: <20230214090424.9335-1-heiko.thiery@gmail.com> Message-ID: <871qms6uff.fsf@dell.be.48ers.dk> >>>>> "Heiko" == Heiko Thiery writes: > Signed-off-by: Heiko Thiery Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:14:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:43 +0100 Subject: [Buildroot] [PATCH] package/wireless-regdb: bump version to 2023.02.13 In-Reply-To: <20230214091141.12503-1-heiko.thiery@gmail.com> (Heiko Thiery's message of "Tue, 14 Feb 2023 10:11:42 +0100") References: <20230214091141.12503-1-heiko.thiery@gmail.com> Message-ID: <87wn4k5fuk.fsf@dell.be.48ers.dk> >>>>> "Heiko" == Heiko Thiery writes: > Signed-off-by: Heiko Thiery Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:15:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:01 +0100 Subject: [Buildroot] [PATCH] package/sdl2: bump version to 2.26.3 In-Reply-To: <20230214090535.9545-1-mf@go-sys.de> (Michael Fischer's message of "Tue, 14 Feb 2023 10:05:35 +0100") References: <20230214090535.9545-1-mf@go-sys.de> Message-ID: <87sff85fu2.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Fischer writes: > Update the license hash because of a change in copyright year: > - Copyright (C) 1997-2022 Sam Lantinga > + Copyright (C) 1997-2023 Sam Lantinga > Signed-off-by: Michael Fischer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:15:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:14 +0100 Subject: [Buildroot] [PATCH] package/gnuplot: bump version to 5.4.6 In-Reply-To: <20230214093414.5861-1-mf@go-sys.de> (Michael Fischer's message of "Tue, 14 Feb 2023 10:34:14 +0100") References: <20230214093414.5861-1-mf@go-sys.de> Message-ID: <87o7pw5ftp.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Fischer writes: > Signed-off-by: Michael Fischer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:15:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:45 +0100 Subject: [Buildroot] [PATCH] package/libmdbx: bump version to 0.11.14 "Sergey Kapitsa" In-Reply-To: <20230214155129.679711-1-leo@yuriev.ru> (=?utf-8?B?ItCb0LU=?= =?utf-8?B?0L7QvdC40LQg0K7RgNGM0LXQsg==?= (Leonid Yuriev)"'s message of "Tue, 14 Feb 2023 18:51:29 +0300") References: <20230214155129.679711-1-leo@yuriev.ru> Message-ID: <87k00k5fsu.fsf@dell.be.48ers.dk> >>>>> "??????" == ?????? ????? (Leonid Yuriev) writes: > This is stable bugfix release of libmdbx, > in memory of Sergey Kapitsa (Russian physicist and demographer) on his 95th birthday. > It is reasonable to backport this patch to all applicable releases/branches of Buildroot, > at least this release fixes build for sh4 arch. > Release notes for v0.11.14 > -------------------------- > Fixes: > - backport: Refined the `__cold`/`__hot` macros to avoid the > `error: inlining failed in call to ?always_inline FOO(...)?: target specific option mismatch` > issue during build using GCC >10.x for SH4 arch. > Actually this is GCC' SH4-backend bug which triggered by the `__attribute__((__optimize__("Os")))` > used in conjunction with the `__attribute__((__cold__))`. > - backport: Fixed `SIGSEGV` or an erroneous call to `free()` in case where > errors occur when reopening by `mdbx_env_open()` of a previously used > environment. > - backport: Fixed `cursor_put_nochecklen()` internals for case when dupsort'ed named subDb > contains a single key with multiple values (aka duplicates), which are replaced > with a single value by put-operation with the `MDBX_UPSERT+MDBX_ALLDUPS` flags. > In this case, the database becomes completely empty, without any pages. > However exactly this condition was not considered and thus wasn't handled correctly. > See [issue#8](https://gitflic.ru/project/erthink/libmdbx/issue/8) for more information. > - backport: Fixed extra assertion inside `override_meta()`, which could > lead to false-positive failing of the assertion in a debug builds during > DB recovery and/or auto-rollback. > Minors: > - backport: Fixed typos. > - backport: Refined `const` and `noexcept` for few C++ API methods. > - backport: Resolve false-posirive `used uninitialized` warning from GCC >10.x > while build for SH4 arch. > - backport: Fixed insignificant typo of `||` inside `#if` byte-order condition. > The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md > Signed-off-by: ?????? ????? (Leonid Yuriev) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:16:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:16:13 +0100 Subject: [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series In-Reply-To: <20230213115812.582772-1-peter@korsgaard.com> (Peter Korsgaard's message of "Mon, 13 Feb 2023 12:58:09 +0100") References: <20230213115812.582772-1-peter@korsgaard.com> Message-ID: <87fsb85fs2.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > 4.9.x / 6.0.x is now EOL. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:16:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:16:16 +0100 Subject: [Buildroot] [PATCH 2/3] package/linux-headers: drop 4.9.x option In-Reply-To: <20230213115812.582772-2-peter@korsgaard.com> (Peter Korsgaard's message of "Mon, 13 Feb 2023 12:58:10 +0100") References: <20230213115812.582772-1-peter@korsgaard.com> <20230213115812.582772-2-peter@korsgaard.com> Message-ID: <87bklw5frz.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > The 4.9.x series is now EOL upstream, so drop the linux-headers option and > add legacy handling for it. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:16:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:16:20 +0100 Subject: [Buildroot] [PATCH 3/3] package/linux-headers: drop 6.0.x option In-Reply-To: <20230213115812.582772-3-peter@korsgaard.com> (Peter Korsgaard's message of "Mon, 13 Feb 2023 12:58:11 +0100") References: <20230213115812.582772-1-peter@korsgaard.com> <20230213115812.582772-3-peter@korsgaard.com> Message-ID: <877cwk5frv.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > The 6.0.x series is now EOL upstream, so drop the linux-headers option and > add legacy handling for it. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 14 17:11:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:11:38 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230214171654.5C23B85E9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36a8be4770d93c0a4346008c56f6ab6862b9b509 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 4.9.x / 6.0.x is now EOL. 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 774f1e0975..11dc5cce07 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.11" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" 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 e88abe5bb8..f797d5a61a 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b linux-6.1.9.tar.xz +sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz -sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz -sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz +sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz +sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz +sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz -sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz +sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz +sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1146231e41..8a76f93d62 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -394,13 +394,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.304" if BR2_KERNEL_HEADERS_4_14 - default "4.19.271" if BR2_KERNEL_HEADERS_4_19 - default "5.4.230" if BR2_KERNEL_HEADERS_5_4 - default "5.10.166" if BR2_KERNEL_HEADERS_5_10 - default "5.15.91" if BR2_KERNEL_HEADERS_5_15 + default "4.14.305" if BR2_KERNEL_HEADERS_4_14 + default "4.19.272" if BR2_KERNEL_HEADERS_4_19 + default "5.4.231" if BR2_KERNEL_HEADERS_5_4 + default "5.10.167" if BR2_KERNEL_HEADERS_5_10 + default "5.15.93" if BR2_KERNEL_HEADERS_5_15 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 - default "6.1.9" if BR2_KERNEL_HEADERS_6_1 + default "6.1.11" if BR2_KERNEL_HEADERS_6_1 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 Tue Feb 14 17:11:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:11:29 +0100 Subject: [Buildroot] [git commit] package/mpd: update to version 0.23.12 Message-ID: <20230214171654.4A78785E9E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=86a3bd33c2d52b2d3e014913857abaa7f24f428c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master List of changes: decoder::mad: fix integer underflow with very small files input::curl: require CURL 7.55.0 or later output::pipewire: adjust to PipeWire 0.3.64 API change tags:: fix crash bug due to race condition fix build failures with GCC 13 Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.12/NEWS Commit: https://github.com/MusicPlayerDaemon/MPD/commit/b1422fb Tested on: i386 (build) x86_64 (build, run) Aarch64 (build) Signed-off-by: Andreas Ziegler Signed-off-by: Peter Korsgaard --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 8c488d0357..2521238f64 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 edb4e7a8f9dff238b5610f9e2461940ea98c727a5462fafb1cdf836304dfdca9 mpd-0.23.11.tar.xz +sha256 b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7 mpd-0.23.12.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 449600eda2..6c25c9b46f 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).11 +MPD_VERSION = $(MPD_VERSION_MAJOR).12 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 Tue Feb 14 17:12:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:17 +0100 Subject: [Buildroot] [git commit] package/linux-headers: drop 6.0.x option Message-ID: <20230214171654.8E09C85E9E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2b70aa9492517717f948f199e99f055a5c1dde1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The 6.0.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e2dc854c78..7f69462f2e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_6_0 + bool "kernel headers version 6.0.x are no longer supported" + select BR2_LEGACY + help + Version 6.0.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_KERNEL_HEADERS_4_9 bool "kernel headers version 4.9.x are no longer supported" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index ae8b5e5f62..52eb534b40 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz -sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6970090855..18c179ec8d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -45,10 +45,6 @@ config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 -config BR2_KERNEL_HEADERS_6_0 - bool "Linux 6.0.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 - config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 @@ -393,7 +389,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.231" if BR2_KERNEL_HEADERS_5_4 default "5.10.167" if BR2_KERNEL_HEADERS_5_10 default "5.15.93" if BR2_KERNEL_HEADERS_5_15 - default "6.0.19" if BR2_KERNEL_HEADERS_6_0 default "6.1.11" if BR2_KERNEL_HEADERS_6_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From peter at korsgaard.com Tue Feb 14 17:12:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:05 +0100 Subject: [Buildroot] [git commit] package/linux-headers: drop 4.9.x option Message-ID: <20230214171654.75AD885EA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6634710cdb12ec5b972c2c4068636dfd591cae4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The 4.9.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 72deb03c35..e2dc854c78 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_4_9 + bool "kernel headers version 4.9.x are no longer supported" + select BR2_LEGACY + help + Version 4.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_DOCKER_PROXY bool "docker-proxy removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index f797d5a61a..ae8b5e5f62 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -6,7 +6,6 @@ sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux- sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz # Locally computed diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8a76f93d62..6970090855 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -24,11 +24,6 @@ config BR2_KERNEL_HEADERS_AS_KERNEL depends on BR2_LINUX_KERNEL select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION -config BR2_KERNEL_HEADERS_4_9 - bool "Linux 4.9.x kernel headers" - depends on !BR2_riscv - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 - config BR2_KERNEL_HEADERS_4_14 bool "Linux 4.14.x kernel headers" depends on !BR2_riscv @@ -393,7 +388,6 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.337" if BR2_KERNEL_HEADERS_4_9 default "4.14.305" if BR2_KERNEL_HEADERS_4_14 default "4.19.272" if BR2_KERNEL_HEADERS_4_19 default "5.4.231" if BR2_KERNEL_HEADERS_5_4 From peter at korsgaard.com Tue Feb 14 17:12:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:48 +0100 Subject: [Buildroot] [git commit] package/zabbix: bump to version 6.2.7 Message-ID: <20230214171654.B1C7685EA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89fa774a191d41ed5d125d87d812ff3478902251 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - host-pkgconf is now mandatory - switch to pcre2 which is supported since version 6.0.0 and https://github.com/zabbix/zabbix/commit/18917f919a68abc863a5c79ba88c0cb156255fdc - Update hash of README (links updated with https://github.com/zabbix/zabbix/commit/067f5f873fb18ae7b22c5eaef40f0898b98edeb5 https://github.com/zabbix/zabbix/commit/499dbc81b987513233d579610335b8938f1ae91d) https://github.com/zabbix/zabbix/blob/6.2.7/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/zabbix/Config.in | 2 +- package/zabbix/zabbix.hash | 4 ++-- package/zabbix/zabbix.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index 0f7a0b0003..377c0ff692 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ZABBIX bool "zabbix" depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Zabbix is an enterprise-class open source distributed monitoring solution. Zabbix is free of cost. Zabbix is diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash index 42cc0bda57..bb6127e5ec 100644 --- a/package/zabbix/zabbix.hash +++ b/package/zabbix/zabbix.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 19686628df76e8d5ef7c2ed2975b258c7ca3ec7d151b1bb59d7e132f9fc7c941 zabbix-5.4.9.tar.gz -sha256 10d68ec3abacc29222c07748fc5e5cb9474fd7cd9ccdde1b92ff941ded946b78 README +sha256 6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d zabbix-6.2.7.tar.gz +sha256 f8fc3fd12521b60d53d8c5d48a883eb3c9c5ddec9de986a273e1b77f69d811db README sha256 444fe54aecc95ac0f3314289c300afc73b3946a4dc9fbd7e022709b3e0924dd0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e00d693ba5..db9efed78b 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -4,8 +4,8 @@ # ################################################################################ -ZABBIX_VERSION_MAJOR = 5.4 -ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 +ZABBIX_VERSION_MAJOR = 6.2 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).7 ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING @@ -13,9 +13,8 @@ ZABBIX_CPE_ID_VENDOR = zabbix # We're patching m4/netsnmp.m4 ZABBIX_AUTORECONF = YES -ZABBIX_DEPENDENCIES = pcre +ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ - --with-libpcre=$(STAGING_DIR)/usr/bin/ \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \ From peter at korsgaard.com Tue Feb 14 17:12:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:33 +0100 Subject: [Buildroot] [git commit] package/apr-util: security bump to version 1.6.3 Message-ID: <20230214171654.9F07885E9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4231054b05436978795267330202f72be0d3a4d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master *) SECURITY: CVE-2022-25147 (cve.mitre.org) Integer Overflow or Wraparound vulnerability in apr_base64 functions of Apache Portable Runtime Utility (APR-util) allows an attacker to write beyond bounds of a buffer. https://downloads.apache.org/apr/Announcement-aprutil-1.x.html https://downloads.apache.org/apr/CHANGES-APR-UTIL-1.6 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/apr-util/apr-util.hash | 4 ++-- package/apr-util/apr-util.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apr-util/apr-util.hash b/package/apr-util/apr-util.hash index 59ef590109..7e2793cd77 100644 --- a/package/apr-util/apr-util.hash +++ b/package/apr-util/apr-util.hash @@ -1,4 +1,4 @@ -# From http://www.apache.org/dist/apr/apr-util-1.6.1.tar.bz2.sha256 -sha256 d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b apr-util-1.6.1.tar.bz2 +# From http://www.apache.org/dist/apr/apr-util-1.6.3.tar.bz2.sha256 +sha256 a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5 apr-util-1.6.3.tar.bz2 # Locally calculated sha256 ef5609d18601645ad6fe22c6c122094be40e976725c1d0490778abacc836e7a2 LICENSE diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index fb0735f5e7..02b6d5e277 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -4,7 +4,7 @@ # ################################################################################ -APR_UTIL_VERSION = 1.6.1 +APR_UTIL_VERSION = 1.6.3 APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2 APR_UTIL_SITE = https://archive.apache.org/dist/apr APR_UTIL_LICENSE = Apache-2.0 From peter at korsgaard.com Tue Feb 14 17:14:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:21 +0100 Subject: [Buildroot] [git commit] package/dnsmasq: bump version to 2.89 Message-ID: <20230214171654.DDEBA85E9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38101cea6ed695901ec54e52ae3db528f5e19979 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Tested-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/dnsmasq/dnsmasq.hash | 4 ++-- package/dnsmasq/dnsmasq.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index fd015d38ac..02ffb2656b 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.88.tar.xz.asc -sha256 23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3 dnsmasq-2.88.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc +sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 3945e4256a..58c5390433 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.88 +DNSMASQ_VERSION = 2.89 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" From peter at korsgaard.com Tue Feb 14 17:14:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:40 +0100 Subject: [Buildroot] [git commit] package/wireless-regdb: bump version to 2023.02.13 Message-ID: <20230214171654.F2D9385E9E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67eb00b807ddd168a9765e953405d03e18599fb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery 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 91fcb320d2..36451f839d 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 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz +sha256 fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73 wireless-regdb-2023.02.13.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 35a8c6686d..68fbe35b8b 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2022.02.18 +WIRELESS_REGDB_VERSION = 2023.02.13 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 Tue Feb 14 17:13:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:13:18 +0100 Subject: [Buildroot] [git commit] package/postgresql: fix legal info Message-ID: <20230214171654.C89EE85E9E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3cd0132561ecfb471d76409f40aa565612f10208 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 57e297a215193c92f6a178139db53616f2ee23b5 forgot to update hash of COPYRIGHT file (year updated with https://github.com/postgres/postgres/commit/1fbcb1360bc19b89369209203ea7cc19b8cde224) Fixes: - http://autobuild.buildroot.org/results/93f40dc71619745ddc6741598c9a488c81ea440f Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index e6a9bd6658..3e89d3ec35 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ # From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated -sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT +sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT From peter at korsgaard.com Tue Feb 14 17:14:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:57 +0100 Subject: [Buildroot] [git commit] package/sdl2: bump version to 2.26.3 Message-ID: <20230214171655.12FB385E9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=910aae1e23806fff74b16088c8975827e6664c2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update the license hash because of a change in copyright year: - Copyright (C) 1997-2022 Sam Lantinga + Copyright (C) 1997-2023 Sam Lantinga Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.hash | 6 +++--- package/sdl2/sdl2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 86e0d86e7c..e26dcee301 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.2.tar.gz.sig -sha256 95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0 SDL2-2.26.2.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.3.tar.gz.sig +sha256 c661205a553b7d252425f4b751ff13209e5e020b876bbfa1598494af61790057 SDL2-2.26.3.tar.gz # Locally calculated -sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt +sha256 9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 8995178e71..c01f12d12c 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.26.2 +SDL2_VERSION = 2.26.3 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From peter at korsgaard.com Tue Feb 14 17:15:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:11 +0100 Subject: [Buildroot] [git commit] package/gnuplot: bump version to 5.4.6 Message-ID: <20230214171655.25AFB85E9E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df50979e7bf0ff7f0b8a2461ed7ae9dbd103d836 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard --- package/gnuplot/gnuplot.hash | 8 ++++---- package/gnuplot/gnuplot.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index 1ee6b53694..de0741d609 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.5/ -md5 c10cf81faa69d77e255a1dcfc625ba78 gnuplot-5.4.5.tar.gz -sha1 1179a768fd5f585a5dcb6aedea76cfa7a8dd5dfe gnuplot-5.4.5.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.6/ +md5 da719235bb2f46830f9d2101d04b14a5 gnuplot-5.4.6.tar.gz +sha1 31ea0c00af5c156e5d068e3b1cc2fb1847f471ab gnuplot-5.4.6.tar.gz # Locally computed -sha256 66f679115dd30559e110498fc94d926949d4d370b4999a042e724b8e910ee478 gnuplot-5.4.5.tar.gz +sha256 02fc27918200ed64d8f0c3b84fe81b95b59cd47ad99f270939ae497c19f27419 gnuplot-5.4.6.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 1ee49cb6ce..c49fbc497d 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.5 +GNUPLOT_VERSION = 5.4.6 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright From peter at korsgaard.com Tue Feb 14 17:15:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:39 +0100 Subject: [Buildroot] [git commit] package/libmdbx: bump version to 0.11.14 "Sergey Kapitsa" Message-ID: <20230214171655.39BA985E9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efdcc850be902de2596412dbf0f142c3f679ce35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is stable bugfix release of libmdbx, in memory of Sergey Kapitsa (Russian physicist and demographer) on his 95th birthday. It is reasonable to backport this patch to all applicable releases/branches of Buildroot, at least this release fixes build for sh4 arch. Release notes for v0.11.14 -------------------------- Fixes: - backport: Refined the `__cold`/`__hot` macros to avoid the `error: inlining failed in call to ???always_inline FOO(...)???: target specific option mismatch` issue during build using GCC >10.x for SH4 arch. Actually this is GCC' SH4-backend bug which triggered by the `__attribute__((__optimize__("Os")))` used in conjunction with the `__attribute__((__cold__))`. - backport: Fixed `SIGSEGV` or an erroneous call to `free()` in case where errors occur when reopening by `mdbx_env_open()` of a previously used environment. - backport: Fixed `cursor_put_nochecklen()` internals for case when dupsort'ed named subDb contains a single key with multiple values (aka duplicates), which are replaced with a single value by put-operation with the `MDBX_UPSERT+MDBX_ALLDUPS` flags. In this case, the database becomes completely empty, without any pages. However exactly this condition was not considered and thus wasn't handled correctly. See [issue#8](https://gitflic.ru/project/erthink/libmdbx/issue/8) for more information. - backport: Fixed extra assertion inside `override_meta()`, which could lead to false-positive failing of the assertion in a debug builds during DB recovery and/or auto-rollback. Minors: - backport: Fixed typos. - backport: Refined `const` and `noexcept` for few C++ API methods. - backport: Resolve false-posirive `used uninitialized` warning from GCC >10.x while build for SH4 arch. - backport: Fixed insignificant typo of `||` inside `#if` byte-order condition. The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md Signed-off-by: ???????????? ?????????? (Leonid Yuriev) Signed-off-by: Peter Korsgaard --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index e3fb309461..b1a2891b91 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 9449fd357119e19902363ab90134d82c9a713b706394c2a1389b5bb4787b5164 libmdbx-amalgamated-0.11.13.tar.xz +sha256 97b03965b5b61727dc4232c50ccb174c632470a3d24438b3c52315bef6fb4033 libmdbx-amalgamated-0.11.14.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index a139e062f6..5e7995f8c8 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.13 +LIBMDBX_VERSION = 0.11.14 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From matthew.weber at collins.com Tue Feb 14 18:05:05 2023 From: matthew.weber at collins.com (Matthew Weber) Date: Tue, 14 Feb 2023 18:05:05 +0000 Subject: [Buildroot] [PATCH] DEVELOPERS: drop Matt Weber Message-ID: <20230214180505.3691-1-matthew.weber@collins.com> From: Matthew Weber I regret that my work situation doesn't sustain me contributing. Signed-off-by: Matthew Weber --- DEVELOPERS | 105 ----------------------------------------------------- 1 file changed, 105 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index df2b98ad53..72a56deb4c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1984,111 +1984,6 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ -N: Matt Weber -F: board/freescale/p* -F: board/freescale/t* -F: board/qemu/ppc64-e5500/ -F: configs/freescale_p* -F: configs/freescale_t* -F: configs/qemu_ppc64_e5500_defconfig -F: package/ace/ -F: package/argp-standalone/ -F: package/aufs/ -F: package/aufs-util/ -F: package/bc/ -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/ -F: package/davici/ -F: package/dnsmasq/ -F: package/dosfstools/ -F: package/eigen/ -F: package/ethtool/ -F: package/flashbench/ -F: package/fmc/ -F: package/fmlib/ -F: package/freeradius-server/ -F: package/git/ -F: package/gnutls/ -F: package/hostapd/ -F: package/i2c-tools/ -F: package/ifplugd/ -F: package/igmpproxy/ -F: package/iperf/ -F: package/iperf3/ -F: package/iputils/ -F: package/iw/ -F: package/jitterentropy-library/ -F: package/kvm-unit-tests/ -F: package/kvmtool/ -F: package/libcsv/ -F: package/libcurl/ -F: package/libeastl/ -F: package/libfcgi/ -F: package/libopenssl/ -F: package/libselinux/ -F: package/libsemanage/ -F: package/libsepol/ -F: package/libssh2/ -F: package/libtalloc/ -F: package/libqmi/ -F: package/lighttpd/ -F: package/logrotate/ -F: package/makedevs/ -F: package/memtester/ -F: package/mii-diag/ -F: package/mrouted/ -F: package/mtd/ -F: package/mtools/ -F: package/nginx-upload/ -F: package/omniorb/ -F: package/openresolv/ -F: package/paxtest/ -F: package/picocom/ -F: package/policycoreutils/ -F: package/proftpd/ -F: package/protobuf-c/ -F: package/protobuf/ -F: package/python-colorama/ -F: package/python-filelock/ -F: package/python-flask-cors/ -F: package/python-iptables/ -F: package/python-ipy/ -F: package/python-iwlib/ -F: package/python-posix-ipc/ -F: package/python-pycairo/ -F: package/python-pysftp/ -F: package/python-tinyrpc/ -F: package/python-txdbus/ -F: package/qoriq-rcw/ -F: package/raptor/ -F: package/rng-tools/ -F: package/rsyslog/ -F: package/setools/ -F: package/sloci-image/ -F: package/smcroute/ -F: package/tclap/ -F: package/tini/ -F: package/uboot-tools/ -F: package/unionfs/ -F: package/valijson/ -F: package/wpa_supplicant/ -F: package/wireless_tools/ -F: package/xen/ -F: package/xml-security-c/ -F: support/testing/tests/fs/test_oci.py -F: support/testing/tests/package/br2-external/clang-compiler-rt/ -F: support/testing/tests/package/br2-external/openjdk/ -F: support/testing/tests/package/test_clang.py -F: support/testing/tests/package/test_openjdk.py -F: support/testing/tests/package/test_opkg/ -F: support/testing/tests/package/test_opkg.py - N: Mauro Condarelli F: package/mc/ F: package/python-autobahn/ -- 2.25.1 From james.hilliard1 at gmail.com Tue Feb 14 20:25:41 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 14 Feb 2023 13:25:41 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-maturin: bump to version 0.14.13 Message-ID: <20230214202541.2485669-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index b104b1fbbe..d1344f2744 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 59157a06c0a482aec750d64746f2b23e556ce3ec62d9cdce74fcb7b4658b722b maturin-0.14.9.tar.gz +sha256 7ed1234824ef2b0c919c6d24550540bf044fe992612b322a6abda1253f5bb500 maturin-0.14.13.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index 3484e09d22..7781a1070b 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.9 +PYTHON_MATURIN_VERSION = 0.14.13 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/90/f9/f4242c0e8bc5def9a7135c12574449dbb411ecc595cf72202ca97a79c2ad +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/a9/a9/bcff9592d7ad68052432e6369bd310606e2ddeb9bcc0b52d5f69e4140290 PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit -- 2.34.1 From arnout at mind.be Tue Feb 14 20:55:58 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 21:55:58 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> Message-ID: <016a0f72-aa86-dd35-5e6a-100d2564d25a@mind.be> On 14/02/2023 08:27, Sourabh Hegde wrote: > Hello James, > > Thanks for the update. > > awscrt also has precompiled wheels ?such > as awscrt-0.16.10-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl > > Can Buildroot use them instead of cross compiling? If cross-compiling is difficult, it's fairly likely that there are many cases where the binary wheel won't work either. Therefore, no, we (probably) can't use them. > If not, is it possible > to?extract it and install manually? You can do that in a post-build script. It's going to be something that is tested in your specific use case only, so not something that we would support upstream. A wheel file is actually a zip file, so you just need to unzip it in the site_packages directory. And test if it works, of course. Regards, Arnout > > Thanks in advance > > On Thu, 9 Feb 2023 at 21:12, James Hilliard > wrote: > > On Thu, Feb 9, 2023 at 5:10 AM Sourabh Hegde > wrote: > > > > Hello Maxim, > > > > While doing make with new Buildroot-packages I getting: > > > > [ 51%] Building ASM object > aws-lc/crypto/CMakeFiles/crypto_objects.dir/hrss/asm/poly_rq_mul.S.o > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S: Assembler messages: > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:304: Error: unknown pseudo-op: `.att_syntax' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:307: Error: unknown mnemonic `push' -- `push %rbp' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:309: Error: bad register expression > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:310: Error: unknown mnemonic `movq' -- `movq %rsp,%rbp' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:311: Error: bad register expression > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:312: Error: unknown mnemonic `push' -- `push %r12' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:313: Error: bad register expression > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:321: Error: operand 1 must be an integer register -- `mov %rcx,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:322: Error: unknown mnemonic `addq' -- `addq $6144+12288+512+9408+32,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:323: Error: operand 1 must be an integer register -- `mov %r8,%rax' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:324: Error: unknown mnemonic `subq' -- `subq $6144,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:325: Error: operand 1 must be an integer register -- `mov %r8,%r11' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:326: Error: unknown mnemonic `subq' -- `subq $12288,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:327: Error: operand 1 must be an integer register -- `mov %r8,%r12' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:328: Error: unknown mnemonic `subq' -- `subq $512,%r8' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:329: Error: unknown mnemonic `vmovdqa' -- `vmovdqa const3(%rip),%ymm3' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:330: Error: unknown mnemonic `vmovdqu' -- `vmovdqu 0(%rsi),%ymm0' > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:331: Error: unknown mnemonic `vmovdqu' -- `vmovdqu 88(%rsi),%ymm1' > > . > > . > > . > > Any idea what it is complaining about? > > The problem here is that while the python awscrt package uses setuptools > it's not a normal python setuptools package, the setup.py installs both a normal > setuptools package and a vendored cmake package(meta package really). > > See cmake build wrapper functionality here in the setuptools setup.py file: > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py#L156-L272 > > > This is the cmake meta project root which is vendored inside of awscrt: > https://github.com/awslabs/aws-crt-python/tree/v0.16.10/crt > > > See meta cmakelists build: > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/crt/CMakeLists.txt > > > This meta project is made up of multiple subprojects: > aws-c-auth > aws-c-cal > aws-c-common > aws-c-compression > aws-c-event-stream > aws-checksums > aws-c-http > aws-c-io > aws-c-mqtt > aws-c-s3 > aws-c-sdkutils > aws-lc > s2n > > In buildroot we expect cmake packages to use our cmake infrastructure > as it will set up the cross compilation environment correctly while the > awscrt setuptools cmake wrapper does not. > > I confirmed that the cmake packages build correctly when using our > cmake infrastructure: > ################################################################################ > # > # python-awscrt > # > ################################################################################ > > PYTHON_AWSCRT_VERSION = 0.16.10 > PYTHON_AWSCRT_SOURCE = awscrt-$(PYTHON_AWSCRT_VERSION).tar.gz > PYTHON_AWSCRT_SITE = > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2 > PYTHON_AWSCRT_SUBDIR = crt > > $(eval $(cmake-package)) > > See: > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_cmake_based_packages > > So what I think you need to do is create buildroot cmake packages for all > these subprojects using buildroot's cmake infrastructure: > https://github.com/awslabs/aws-c-auth > https://github.com/awslabs/aws-c-cal > https://github.com/awslabs/aws-c-common > > https://github.com/awslabs/aws-c-compression > > https://github.com/awslabs/aws-c-event-stream > > https://github.com/awslabs/aws-checksums > > https://github.com/awslabs/aws-c-http > https://github.com/awslabs/aws-c-io > https://github.com/awslabs/aws-c-mqtt > https://github.com/awslabs/aws-c-s3 > https://github.com/awslabs/aws-c-sdkutils > > https://github.com/awslabs/aws-lc > https://github.com/aws/s2n-tls > > You will then probably need to modify the setup.py file > (https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py > ) so that > instead of using the cmake build functions have it use the system versions > of these libraries pre-installed via the buildroot cmake infrastructure. > > You can probably use and check for an env variable such as this in the setup.py: > PYTHON_AWSCRT_USE_SYSTEM_CRT=1 > > When present have it disable building the cmake libraries itself and search > for the installed system crt libraries instead of using the vendored > cmake build. > > You should upstream this setup.py functionality to the aws-crt-project as well > so that we don't need to carry a patch in buildroot for python-awscrt to use > the system crt libraries. > > Then from the python-awscrt buildroot package you would set that env > variable and add all the cmake subprojects as buildroot package dependencies. > > First thing you should start with is adding the cmake buildroot packages for > the crt subprojects to buildroot then work on modifying aws-crt-python to > work correctly with them instead of trying to use its broken cmake setuptools > wrapper. > > > > > Thanks in advance > > > > On Thu, 9 Feb 2023 at 10:28, Sourabh Hegde > wrote: > >> > >> Hi Maxim, > >> > >> I was missing python setuptools on my host. After installing it, I can > add the package. Also, the added package is available in menuconfig > >> > >> Thank you for the support! > >> > >> On Thu, 9 Feb 2023 at 10:10, Maxim Kochetkov > wrote: > >>> > >>> > >>> > >>> On 09.02.2023 12:03, Sourabh Hegde wrote: > >>> > Hello Maxim, > >>> > > >>> > Update: > >>> > > >>> > The above issue resolved by itself! > >>> > > >>> > Now when I do: utils/scanpypi awscrt -o package , it says > >>> > > >>> > spdx_lookup module is not installed. This can lead to an inaccurate > >>> > licence detection. Please install it via > >>> > pip install spdx_lookup > >>> > buildroot package name for awscrt: python-awscrt > >>> > Package: python-awscrt > >>> > Fetching package awscrt > >>> > ERROR: Could not find package awscrt. > >>> > Check syntax inside the python package index: > >>> > https://pypi.python.org/pypi/ > > > >>> > > >>> > But the package is available at https://pypi.org/project/awscrt/ > > >>> > > > >>> > >>> It works fine for me: > >>> > >>> buildroot package name for awscrt: python-awscrt > >>> Package: python-awscrt > >>> Fetching package awscrt > >>> Downloading package awscrt from > >>> > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz. .. > >>> Checking if package package/python-awscrt already exists... > >>> Creating package/python-awscrt/python-awscrt.mk... > >>> More than one file found for license: LICENSE, crt/aws-c-common/LICENSE, > >>> crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, > >>> crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, > >>> crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, > >>> crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, > >>> crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, crt/aws-c-cal/LICENSE, > >>> crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE > >>> Creating package/python-awscrt/python-awscrt.hash... > >>> Creating package/python-awscrt/Config.in... > >>> NOTE: Remember to also make an update to the DEVELOPERS file > >>>? ? ? ? and include an entry for the pkg in packages/Config.in > >>> > > _______________________________________________ > > 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 Feb 14 21:03:24 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:03:24 +0100 Subject: [Buildroot] Dependency problem for gtkmm3 In-Reply-To: References: <20230210231454.4f3aedbd@windsurf> <20230213084735.5318a511@windsurf> Message-ID: <87ad276e-999c-2503-4dbb-37f54d2b6e15@mind.be> On 13/02/2023 15:52, Lang Daniel via buildroot wrote: > Hi Thomas, Dirk, > >> Hello Dirk, >> >> On Sun, 12 Feb 2023 08:51:17 +0000 >> Dirk De Becker wrote: >> >>> Thank you for your quick reply. >>> Will this issue be fixed in the 2023.02 release? >> >> It all depends on whether someone submits a fix for the issue. Do you >> think you could have a look? > > The problem comes down to an incompatibility that I tried to point out some > time ago [0]. Current versions of cairomm, pangomm, glibmm have a different > ABI that's not supported in gtkmm 3.x.y. > Even the most recent version of gtkmm 3.24.x doesn't support the current > version of of the other -mm packages and according to the mailing list of > gtkmm [1] there are no plans to support it. The are compatible with gtk4. > > As it stands gtkmm3 isn't usable and fixing it brings up the same problems > of duplicating packages. So we have two options: 1. Drop gtkmm3. It has no internal users. 2. Create cairomm112 etc. packages (or whatever the latest working version was) and live with their unmaintained status. Eventually we'll end up with option 1, of course, since gtkmm3 is EOL itself (they're only working on gtkmm4 AFAIU). @Dirk in conclusion: the best you can expect for 2023.02 is for the package to be dropped, which isn't going to help you, of course. Regards, Arnout > > [0]: https://lists.buildroot.org/pipermail/buildroot/2021-October/625850.html > [1]: https://mail.gnome.org/archives/gtkmm-list/2021-May/msg00000.html > >> >> Best regards, >> >> Thomas > > Regards > Daniel > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From Afshin.Pir at gallagher.com Tue Feb 14 21:13:09 2023 From: Afshin.Pir at gallagher.com (Afshin Pir) Date: Tue, 14 Feb 2023 21:13:09 +0000 Subject: [Buildroot] Define dependency package only in staging Message-ID: Hi All I wonder if it is possible that to force the dependant package to be installed only in staging folder. For example, I have written package A which depend on Package B like this: config BR2_PACKAGE_A bool "my-a-provider" select BR2_PACKAGE_B help Test A Package The problem is that the above configuration installs B in the target, but in reality, it is enough to be installed in staging directory (since it provides a header-only version). In there anyway to define a dependency for staging only? Best Regards, Afshin ________________________________ This email is confidential and may contain information subject to legal privilege. If you are not the intended recipient please advise us of our error by return e-mail then delete this email and any attached files. You may not copy, disclose or use the contents in any way. The views expressed in this email may not be those of Gallagher Group Ltd or subsidiary companies thereof. ________________________________ -------------- next part -------------- An HTML attachment was scrubbed... URL: From arnout at mind.be Tue Feb 14 21:16:07 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:16:07 +0100 Subject: [Buildroot] [PATCH] package/libbpf: Don't remove bpf.h on host In-Reply-To: References: <12146851.O9o76ZdvQC@pwmachine> <17501a13-8018-656f-5f4d-b1cf6c1ecd5c@mind.be> <2667723.mvXUDI8C0e@pwmachine> Message-ID: <8010c40b-1f2b-1351-c59b-fd96b61e9861@mind.be> On 13/02/2023 13:24, Lang Daniel wrote: > Hi Arnout, Francis, [snip] >> Therefore, we believe that the solution is to use -isystem instead of -I in the >> HOSTCC setting of the kernel. This is indeed what is already done for uboot: >> >> HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem >> /,$(HOST_CFLAGS)))" \ >> >> Note that there is a risk that this by itself goes wrong as well. We tried at >> some point to use -isystem instead of -I in HOST_CFLAGS: >> >> commit 6f8162cf8c1abef7e0a4771fe0d6b26a28f5c2b6 >> Author: David Raeman >> Date: Mon Jul 25 21:52:26 2016 >> >> package/Makefile.in should grab HOST_DIR headers using -isystem instead of -I. >> >> >> but this was reverted a copule of days later: >> >> commit 255b6f80d395ef048f46cfcf75dba690c56af657 >> Author: Thomas Petazzoni >> Date: Sat Jul 30 18:10:18 2016 >> >> Revert "package/Makefile.in should grab HOST_DIR headers using -isystem >> instead of -I." >> >> (Unfortunately, the commit has no further explanation of what went wrong). >> >> So, could you (Daniel and Francis) try to apply this patch and replace -I with >> -isystem like is done for U-Boot, and do a bunch of kernel builds to see if it >> breaks anything? > > I didn't apply the patch for package/Makefile.in as that would change the behavour > for all packages. Yeah, that's the thing that turned out not to work before. > I did however copy the logic used in the U-Boot. > > -HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ > +HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ That was indeed what I meant. > > And applied this patch to keep bpf.h > > I tested the following config: > > BR2_aarch64=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="{VERSION}" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="pahole-kernel.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE=y > > and with a fragment for linux: > > CONFIG_BPF_SYSCALL=y > CONFIG_BPF_UNPRIV_DEFAULT_OFF=n > CONFIG_DEBUG_INFO_REDUCED=n > CONFIG_DEBUG_INFO_COMPRESSED=n > CONFIG_DEBUG_INFO_BTF=y > CONFIG_SYSTEM_TRUSTED_KEYRING=y > > where VERSION is one of: > 5.2.21 5.3.18 5.4.231 5.5.19 5.6.19 5.7.19 5.8.18 5.9.16 5.10.167 5.11.22 > 5.12.19 5.13.19 5.14.21 5.15.93 5.16.20 5.17.15 5.18.19 5.19.17 6.0.19 6.1.11 > > Version 5.2, as far as I could work it out, is the version that introduced > the pahole dependency when CONFIG_DEBUG_INFO_BTF is set. > > None-LTS versions after 5.10 and before 6.0 fail with: > > LD vmlinux.o > MODPOST vmlinux.symvers > MODINFO modules.builtin.modinfo > GEN modules.builtin > LD .tmp_vmlinux.btf > BTF .btf.vmlinux.bin.o > LD .tmp_vmlinux.kallsyms1 > KSYMS .tmp_vmlinux.kallsyms1.S > AS .tmp_vmlinux.kallsyms1.S > LD .tmp_vmlinux.kallsyms2 > KSYMS .tmp_vmlinux.kallsyms2.S > AS .tmp_vmlinux.kallsyms2.S > LD vmlinux > BTFIDS vmlinux > FAILED: load BTF from vmlinux: Invalid argument > make[2]: *** [Makefile:1177: vmlinux] Error 255 > make[1]: *** [package/pkg-generic.mk:293: /home/d.lang/ws/other/buildroot/output/build/linux-5.11.22/.stamp_built] Error 2 > make: *** [Makefile:82: _all] Error 2 > > But that should be unrelated to the change in package/libbpf and HOSTCC. > I will try to work out the reason behind that error. Since you said "non-LTS versions", I guess it's an upstream issue that got fixed in 6.1 and applied to 6.0.x and 5.15.x? > Should I create a patch to change HOSTCC or is additional testing required? Yes please! And include your extensive test coverage in the commit message. Regards, Arnout > >> >> For now, I've marked this patch as Changes Requested (it can only be applied >> if the bpf.h problem is solved in some other way), and marked Francis's patch >> [1] as Superseded. >> >> Regards, >> Arnout >> >> >> [1] >> https://patchwork.ozlabs.org/project/buildroot/patch/20220610165441.84812-2-flaniel at linux.microsoft.com/ >> >> >>> >>> Sadly, I tested your patch and I hit the problem described in the comment >>> regarding redefinition of bpf_core_relo_kind. >>> >>> Did you also hit it or you were able to build the kernel with >>> BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE? > > It seems like I was tested with a too recent kernel and originally preparing > this patch and therefore didn't hit this error. > >>> >>> >>> Best regards and thank you in advance. >>> >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot From baruch at tkos.co.il Tue Feb 14 21:20:10 2023 From: baruch at tkos.co.il (Baruch Siach) Date: Tue, 14 Feb 2023 23:20:10 +0200 Subject: [Buildroot] Define dependency package only in staging In-Reply-To: References: Message-ID: <87v8k40wok.fsf@tarshish> Hi Afshin, On Tue, Feb 14 2023, Afshin Pir wrote: > I wonder if it is possible that to force the dependant package to be > installed only in staging folder. For example, I have written package > A which depend on Package B like this: > > config BR2_PACKAGE_A > bool "my-a-provider" > select BR2_PACKAGE_B > help > Test A Package > > The problem is that the above configuration installs B in the target, > but in reality, it is enough to be installed in staging directory > (since it provides a header-only version). In there anyway to define a > dependency for staging only? '_INSTALL_TARGET = NO' might help you. baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From hrsourabh011 at gmail.com Tue Feb 14 21:22:24 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Tue, 14 Feb 2023 22:22:24 +0100 Subject: [Buildroot] How to install custom sdk in buildroot? In-Reply-To: <016a0f72-aa86-dd35-5e6a-100d2564d25a@mind.be> References: <36be5bdc-591c-71cb-ea31-9e38ae8d643d@inbox.ru> <22e489f3-cc1d-985d-cca6-18f4f6ddecfa@inbox.ru> <016a0f72-aa86-dd35-5e6a-100d2564d25a@mind.be> Message-ID: Hello Arnout, Thanks for the update. On Tue, 14 Feb 2023 at 21:56, Arnout Vandecappelle wrote: > > > On 14/02/2023 08:27, Sourabh Hegde wrote: > > Hello James, > > > > Thanks for the update. > > > > awscrt also has precompiled wheels < > https://pypi.org/project/awscrt/#files> such > > as > awscrt-0.16.10-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl > > > > Can Buildroot use them instead of cross compiling? > > If cross-compiling is difficult, it's fairly likely that there are many > cases > where the binary wheel won't work either. Therefore, no, we (probably) > can't use > them. > > > If not, is it possible > > to extract it and install manually? > > You can do that in a post-build script. It's going to be something that > is > tested in your specific use case only, so not something that we would > support > upstream. > > A wheel file is actually a zip file, so you just need to unzip it in the > site_packages directory. And test if it works, of course. > To understand it correctly, should I unzip the wheel file into "/target/lib/python3.10/site-packages/" after the make? But, this "awscrt" is the dependency for https://pypi.org/project/awsiotsdk/ https://github.com/aws/aws-iot-device-sdk-python-v2#installation-issues And now how can I select this dependency during build? > > Regards, > Arnout > > > > > Thanks in advance > > > > On Thu, 9 Feb 2023 at 21:12, James Hilliard > > wrote: > > > > On Thu, Feb 9, 2023 at 5:10 AM Sourabh Hegde > > wrote: > > > > > > Hello Maxim, > > > > > > While doing make with new Buildroot-packages I getting: > > > > > > [ 51%] Building ASM object > > aws-lc/crypto/CMakeFiles/crypto_objects.dir/hrss/asm/poly_rq_mul.S.o > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S: > Assembler messages: > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:304: > Error: unknown pseudo-op: `.att_syntax' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:307: > Error: unknown mnemonic `push' -- `push %rbp' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:309: > Error: bad register expression > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:310: > Error: unknown mnemonic `movq' -- `movq %rsp,%rbp' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:311: > Error: bad register expression > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:312: > Error: unknown mnemonic `push' -- `push %r12' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:313: > Error: bad register expression > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:321: > Error: operand 1 must be an integer register -- `mov %rcx,%r8' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:322: > Error: unknown mnemonic `addq' -- `addq $6144+12288+512+9408+32,%r8' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:323: > Error: operand 1 must be an integer register -- `mov %r8,%rax' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:324: > Error: unknown mnemonic `subq' -- `subq $6144,%r8' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:325: > Error: operand 1 must be an integer register -- `mov %r8,%r11' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:326: > Error: unknown mnemonic `subq' -- `subq $12288,%r8' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:327: > Error: operand 1 must be an integer register -- `mov %r8,%r12' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:328: > Error: unknown mnemonic `subq' -- `subq $512,%r8' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:329: > Error: unknown mnemonic `vmovdqa' -- `vmovdqa const3(%rip),%ymm3' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:330: > Error: unknown mnemonic `vmovdqu' -- `vmovdqu 0(%rsi),%ymm0' > > > > > > /home/amazone/output/build/python-awscrt-0.16.10/crt/aws-lc/crypto/hrss/asm/poly_rq_mul.S:331: > Error: unknown mnemonic `vmovdqu' -- `vmovdqu 88(%rsi),%ymm1' > > > . > > > . > > > . > > > Any idea what it is complaining about? > > > > The problem here is that while the python awscrt package uses > setuptools > > it's not a normal python setuptools package, the setup.py installs > both a normal > > setuptools package and a vendored cmake package(meta package really). > > > > See cmake build wrapper functionality here in the setuptools > setup.py file: > > > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py#L156-L272 > > < > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py#L156-L272 > > > > > > This is the cmake meta project root which is vendored inside of > awscrt: > > https://github.com/awslabs/aws-crt-python/tree/v0.16.10/crt > > > > > > See meta cmakelists build: > > > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/crt/CMakeLists.txt > > < > https://github.com/awslabs/aws-crt-python/blob/v0.16.10/crt/CMakeLists.txt > > > > > > This meta project is made up of multiple subprojects: > > aws-c-auth > > aws-c-cal > > aws-c-common > > aws-c-compression > > aws-c-event-stream > > aws-checksums > > aws-c-http > > aws-c-io > > aws-c-mqtt > > aws-c-s3 > > aws-c-sdkutils > > aws-lc > > s2n > > > > In buildroot we expect cmake packages to use our cmake infrastructure > > as it will set up the cross compilation environment correctly while > the > > awscrt setuptools cmake wrapper does not. > > > > I confirmed that the cmake packages build correctly when using our > > cmake infrastructure: > > > ################################################################################ > > # > > # python-awscrt > > # > > > ################################################################################ > > > > PYTHON_AWSCRT_VERSION = 0.16.10 > > PYTHON_AWSCRT_SOURCE = awscrt-$(PYTHON_AWSCRT_VERSION).tar.gz > > PYTHON_AWSCRT_SITE = > > > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2 > < > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2 > > > > PYTHON_AWSCRT_SUBDIR = crt > > > > $(eval $(cmake-package)) > > > > See: > > > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_cmake_based_packages > < > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_cmake_based_packages > > > > > > So what I think you need to do is create buildroot cmake packages > for all > > these subprojects using buildroot's cmake infrastructure: > > https://github.com/awslabs/aws-c-auth < > https://github.com/awslabs/aws-c-auth> > > https://github.com/awslabs/aws-c-cal < > https://github.com/awslabs/aws-c-cal> > > https://github.com/awslabs/aws-c-common > > > > https://github.com/awslabs/aws-c-compression > > > > https://github.com/awslabs/aws-c-event-stream > > > > https://github.com/awslabs/aws-checksums > > > > https://github.com/awslabs/aws-c-http < > https://github.com/awslabs/aws-c-http> > > https://github.com/awslabs/aws-c-io < > https://github.com/awslabs/aws-c-io> > > https://github.com/awslabs/aws-c-mqtt < > https://github.com/awslabs/aws-c-mqtt> > > https://github.com/awslabs/aws-c-s3 < > https://github.com/awslabs/aws-c-s3> > > https://github.com/awslabs/aws-c-sdkutils > > > > https://github.com/awslabs/aws-lc > > > https://github.com/aws/s2n-tls > > > > You will then probably need to modify the setup.py file > > (https://github.com/awslabs/aws-crt-python/blob/v0.16.10/setup.py > > ) > so that > > instead of using the cmake build functions have it use the system > versions > > of these libraries pre-installed via the buildroot cmake > infrastructure. > > > > You can probably use and check for an env variable such as this in > the setup.py: > > PYTHON_AWSCRT_USE_SYSTEM_CRT=1 > > > > When present have it disable building the cmake libraries itself and > search > > for the installed system crt libraries instead of using the vendored > > cmake build. > > > > You should upstream this setup.py functionality to the > aws-crt-project as well > > so that we don't need to carry a patch in buildroot for > python-awscrt to use > > the system crt libraries. > > > > Then from the python-awscrt buildroot package you would set that env > > variable and add all the cmake subprojects as buildroot package > dependencies. > > > > First thing you should start with is adding the cmake buildroot > packages for > > the crt subprojects to buildroot then work on modifying > aws-crt-python to > > work correctly with them instead of trying to use its broken cmake > setuptools > > wrapper. > > > > > > > > Thanks in advance > > > > > > On Thu, 9 Feb 2023 at 10:28, Sourabh Hegde < > hrsourabh011 at gmail.com > > > wrote: > > >> > > >> Hi Maxim, > > >> > > >> I was missing python setuptools on my host. After installing it, > I can > > add the package. Also, the added package is available in menuconfig > > >> > > >> Thank you for the support! > > >> > > >> On Thu, 9 Feb 2023 at 10:10, Maxim Kochetkov > > wrote: > > >>> > > >>> > > >>> > > >>> On 09.02.2023 12:03, Sourabh Hegde wrote: > > >>> > Hello Maxim, > > >>> > > > >>> > Update: > > >>> > > > >>> > The above issue resolved by itself! > > >>> > > > >>> > Now when I do: utils/scanpypi awscrt -o package , it says > > >>> > > > >>> > spdx_lookup module is not installed. This can lead to an > inaccurate > > >>> > licence detection. Please install it via > > >>> > pip install spdx_lookup > > >>> > buildroot package name for awscrt: python-awscrt > > >>> > Package: python-awscrt > > >>> > Fetching package awscrt > > >>> > ERROR: Could not find package awscrt. > > >>> > Check syntax inside the python package index: > > >>> > https://pypi.python.org/pypi/ > > > > > >>> > > > >>> > But the package is available at > https://pypi.org/project/awscrt/ > > > > >>> > https://pypi.org/project/awscrt/>> > > >>> > > >>> It works fine for me: > > >>> > > >>> buildroot package name for awscrt: python-awscrt > > >>> Package: python-awscrt > > >>> Fetching package awscrt > > >>> Downloading package awscrt from > > >>> > > > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz. > < > https://files.pythonhosted.org/packages/ae/98/dda092078f2d47bad08e184ab9d364b8f89166497062bc1cf811c0bbbde2/awscrt-0.16.10.tar.gz > .>.. > > >>> Checking if package package/python-awscrt already exists... > > >>> Creating package/python-awscrt/python-awscrt.mk... > > >>> More than one file found for license: LICENSE, > crt/aws-c-common/LICENSE, > > >>> crt/aws-c-io/LICENSE, crt/aws-lc/LICENSE, > > >>> crt/aws-lc/third_party/fiat/LICENSE, crt/aws-c-mqtt/LICENSE, > > >>> crt/aws-checksums/LICENSE, crt/aws-c-s3/LICENSE, > > >>> crt/aws-c-compression/LICENSE, crt/aws-c-http/LICENSE, > > >>> crt/aws-c-sdkutils/LICENSE, crt/s2n/LICENSE, > crt/aws-c-cal/LICENSE, > > >>> crt/aws-c-auth/LICENSE, crt/aws-c-event-stream/LICENSE > > >>> Creating package/python-awscrt/python-awscrt.hash... > > >>> Creating package/python-awscrt/Config.in... > > >>> NOTE: Remember to also make an update to the DEVELOPERS file > > >>> and include an entry for the pkg in packages/Config.in > > >>> > > > _______________________________________________ > > > 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 arnout at mind.be Tue Feb 14 21:22:59 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:22:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: <20230212094205.GK2796@scaer> References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> Message-ID: <7d630b5f-69b3-6129-2426-7e9b7499f6d3@mind.be> On 12/02/2023 10:42, Yann E. MORIN wrote: > James, All, > > Thanks again for working on such grunt work, it's much appreaciated! > > On 2022-10-17 21:46 -0600, James Hilliard spake thusly: >> These command rely on the clean operations being first so that the >> stamp files being deleted will rebuild the targets. >> >> The execution ordering of the clean and rebuild operations may >> change, for example if --shuffle=reversed is set. >> >> To ensure the evaluation order is always correct use double colon >> rules to make the evaluation order explicit as per make docs: >> >> The double-colon rules for a target are executed in the order they >> appear in the makefile. > > I am not convinced that we should switch over to using double-colons. Me neither. > As I reviewed your other related patch about legal-info [0], the make > manual [1] suggests that double-colons are rally intended for cases > where "the method used to update a target differs depending on which > prerequisite files caused the update" and "double-colon rules really > make sense are those where the order of executing the recipes would not > matter". > > So, we'd use a mechanism where order should not matter, to solve an > issue with ordering. That'd be weird... > > Yes, the manual states that "double-colon rules for a target are > executed in the order they appear in the makefile", but that really > looks like a side-effect of another goal. > > Also, we'd need to carefully review all our Makefile to ensure that > there are no other cases wehre ordering of prerequisites matter. Well, we need to do that regardless of which solution is found, right? Unless we just disable parallel builds and --shuffle entirely. > We'd > also have to be careful every time we introduce a new rule and remember > to check whether it depends on the ordering prereauisites or not, adn > worse yet, also whether we can afford the rule to be parallel-safe or > not (see the explanation for that in the legal-info review). > > Having colons and double-colons is going to be quite a headache... We > already have issues with remembering that we need to use $$ to expand Yeah, maybe we should have some check-package thing to verify that $$ is used everywhere in a macro definition... > variables in some places, and the rules there are relatively clean and > explicit, but for the :: case, I'm afraid that's going to be a bit more > complex. > > We currently have a single location where we use double-colon: > support/kconfig/Makefile.br > > which is added by our patch against kconfig: > support/kconfig/patches/10-br-build-system.patch > > which dates back to 2010: > 7c524dd0b683 Clean up our patches against kconfig > > which got in three in 2007: > a665ed34960b - pull kconfig from linux-2.6.21.5 > > So, I'd like that we get another way to fix that, if possible... > > Again, thanks a lot for spending efforts in that area, this is really > great! > > [0] https://lore.kernel.org/buildroot/20230212091914.GJ2796 at scaer/ > [1] https://www.gnu.org/software/make/manual/make.html#Double_002dColon > > Regards, > Yann E. MORIN. > >> Signed-off-by: James Hilliard >> --- >> package/pkg-generic.mk | 9 ++++++--- >> 1 file changed, 6 insertions(+), 3 deletions(-) >> >> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk >> index f24e03a325..6cb461af90 100644 >> --- a/package/pkg-generic.mk >> +++ b/package/pkg-generic.mk >> @@ -1057,17 +1057,20 @@ endif >> rm -f $$($(2)_TARGET_INSTALL_IMAGES) >> rm -f $$($(2)_TARGET_INSTALL_HOST) >> >> -$(1)-reinstall: $(1)-clean-for-reinstall $(1) >> +$(1)-reinstall:: $(1)-clean-for-reinstall >> +$(1)-reinstall:: $(1) I may be stupid, but what we want is to have an ordering between clean-for-reinstall and $(1), right? So, let's use an ordering dependency? $(1)-reinstall: $(1)-clean-for-reinstall $(1) $(1): $(1)-clean-for-reinstall Regards, Arnout >> >> $(1)-clean-for-rebuild: $(1)-clean-for-reinstall >> rm -f $$($(2)_TARGET_BUILD) >> >> -$(1)-rebuild: $(1)-clean-for-rebuild $(1) >> +$(1)-rebuild:: $(1)-clean-for-rebuild >> +$(1)-rebuild:: $(1) >> >> $(1)-clean-for-reconfigure: $(1)-clean-for-rebuild >> rm -f $$($(2)_TARGET_CONFIGURE) >> >> -$(1)-reconfigure: $(1)-clean-for-reconfigure $(1) >> +$(1)-reconfigure:: $(1)-clean-for-reconfigure >> +$(1)-reconfigure:: $(1) >> >> # define the PKG variable for all targets, containing the >> # uppercase package variable prefix >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Tue Feb 14 21:24:58 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:24:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-generic.mk: fix rule order for re{install, build, configure} In-Reply-To: <7d630b5f-69b3-6129-2426-7e9b7499f6d3@mind.be> References: <20221018034605.800593-1-james.hilliard1@gmail.com> <20230212094205.GK2796@scaer> <7d630b5f-69b3-6129-2426-7e9b7499f6d3@mind.be> Message-ID: On 14/02/2023 22:22, Arnout Vandecappelle wrote: [1] > ?I may be stupid, but what we want is to have an ordering between > clean-for-reinstall and $(1), right? So, let's use an ordering dependency? > > $(1)-reinstall:??????? $(1)-clean-for-reinstall $(1) > $(1):???????????? $(1)-clean-for-reinstall ?Gah, I forgot the actual order-only bit... $(1)-reinstall:?? $(1)-clean-for-reinstall $(1) $(1):?????????? | $(1)-clean-for-reinstall ?Regards, ?Arnout > > > ?Regards, > ?Arnout > >>> ? ? $(1)-clean-for-rebuild: $(1)-clean-for-reinstall >>> ????????????? rm -f $$($(2)_TARGET_BUILD) >>> ? -$(1)-rebuild:??????? $(1)-clean-for-rebuild $(1) >>> +$(1)-rebuild::??????? $(1)-clean-for-rebuild >>> +$(1)-rebuild::??????? $(1) >>> ? ? $(1)-clean-for-reconfigure: $(1)-clean-for-rebuild >>> ????????????? rm -f $$($(2)_TARGET_CONFIGURE) >>> ? -$(1)-reconfigure:??? $(1)-clean-for-reconfigure $(1) >>> +$(1)-reconfigure::??? $(1)-clean-for-reconfigure >>> +$(1)-reconfigure::??? $(1) >>> ? ? # define the PKG variable for all targets, containing the >>> ? # uppercase package variable prefix >>> -- >>> 2.34.1 >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >> From arnout at mind.be Tue Feb 14 21:27:37 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:27:37 +0100 Subject: [Buildroot] [PATCH 1/1] Makefile: fix rule order for legal-info In-Reply-To: <20230211184346.1192333-1-james.hilliard1@gmail.com> References: <20230211184346.1192333-1-james.hilliard1@gmail.com> Message-ID: <91a00522-fc54-e631-5598-158a0aaf7d0c@mind.be> On 11/02/2023 19:43, James Hilliard wrote: > This command relies on the clean/prepare operations being in a > specific order. > > Currently the execution ordering of the clean/prepare operations may > change, for example if --shuffle=reversed is set. > > To ensure the evaluation order is always correct use double colon > rules to make the evaluation order explicit as per make docs: > > The double-colon rules for a target are executed in the order they > appear in the makefile. > > Signed-off-by: James Hilliard > --- > Makefile | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 4880b426b5..09575a5e3c 100644 > --- a/Makefile > +++ b/Makefile > @@ -839,7 +839,9 @@ legal-info-prepare: $(LEGAL_INFO_DIR) > @cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config > > .PHONY: legal-info > -legal-info: legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ > +legal-info:: legal-info-clean > +legal-info:: legal-info-prepare > +legal-info:: $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ > $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) Like for rebuild, reinstall, reconfigure I think the following should work: legal-info-prepare: | legal-info-clean $(1)-all-legal-info: | legal-info-prepare (the last one would be in pkg-generic instead of here, of course). Although in this case I think a full dependency should be even OK, so without the | Regards, Arnout > @cat support/legal-info/README.header >>$(LEGAL_REPORT) > @if [ -r $(LEGAL_WARNINGS) ]; then \ From arnout at mind.be Tue Feb 14 21:30:52 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:30:52 +0100 Subject: [Buildroot] [PATCH] package/erlang: do not hard-code the Erlang Interface Version (EI_VSN) In-Reply-To: <20230210215548.1050371-1-yann.morin.1998@free.fr> References: <20230210215548.1050371-1-yann.morin.1998@free.fr> Message-ID: <4f51a196-e922-1e9e-6fbb-e81b35dc9f73@mind.be> On 10/02/2023 22:55, Yann E. MORIN wrote: > The note above the erlang version instructs to refer to another note > further down the file. However, even if it is not too difficult to find, > it is still located a bit too far away, and the reference is not very > explicit what note we should look at. > > When we introduced that variable in 6c1d128844c5 (package/erlang: export > EI_VSN so other packages can use it), the rationale for hard-coding it > was "to avoid spawning a shell every time the variable is dereferenced". > > However, that can get a bit confusing and hard to follow. Also, that in > fact spawns a shell only once for each rebar-packages, so the overhead > is far from being too high. > > The EI_VSN is only used by rebar-package packages, is derefrenced from > the rebar-infra and not the packages themselves, and is not needed by > erlang itself (it knows its own EI_VSN), so we can de-hard-code it, and > rely on build-time detection, by looking in the appropriate file. > > We have two files where we could look: > - lib/erl_interface/vsn.mk in the erlang source tree, but it is not > installed, > - .../lib/erlang/releases/$(ERLANG_RELASE)/installed_application_versions > as installed by erlang. > > We use the second one, as it is cleaner, for a package, to look into > installed files, rather than to look in the source tree of another > package. > > Although both the host and target erlang are the same, we still look > into the corresponding file to extract the version. This is so that it > would be easier if in the future we ever manage to rely on a > system-installed erlang that could have a EI_VSN different from the > target one. > > We can't re-use the variable ERLANG_EI_VSN, because it now needs to be > $(call)-ed with a parameter. Hopefully, external packages that use it > directly rather than through the rebar infra, are not legion... > > Signed-off-by: Yann E. MORIN > Cc: Will Newton > Cc: Johan Oudinet > --- > package/erlang/erlang.mk | 8 ++++---- > package/pkg-rebar.mk | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk > index ac2c204a49..5d6b69057a 100644 > --- a/package/erlang/erlang.mk > +++ b/package/erlang/erlang.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -# See note below when updating Erlang > ERLANG_VERSION = 22.3.4.22 > +ERLANG_RELEASE = $(firstword $(subst ., ,$(ERLANG_VERSION))) > ERLANG_SITE = \ > https://github.com/erlang/otp/releases/download/OTP-$(ERLANG_VERSION) > ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz > @@ -36,9 +36,9 @@ ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF > HOST_ERLANG_DEPENDENCIES += host-autoconf > HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF > > -# Whenever updating Erlang, this value should be updated as well, to the > -# value of EI_VSN in the file lib/erl_interface/vsn.mk > -ERLANG_EI_VSN = 3.13.2.2 > +# Return the EIV (Erlang Interface Version, EI_VSN) > +# $(1): base directory, i.e. either $(HOST_DIR) or $(STAGING_DIR)/usr > +erlang_ei_vsn = `sed -r -e '/^erl_interface-(.+)/!d; s//\1/' $(1)/lib/erlang/releases/$(ERLANG_RELEASE)/installed_application_versions` Since this is only used by rebar-package, I think it should move to pkg-rebar.mk. > > # The configure checks for these functions fail incorrectly > ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes > diff --git a/package/pkg-rebar.mk b/package/pkg-rebar.mk > index e4e3f3bb6c..4b993dd970 100644 > --- a/package/pkg-rebar.mk > +++ b/package/pkg-rebar.mk > @@ -32,10 +32,10 @@ REBAR_TARGET_DEPS_DIR = $(STAGING_DIR)/usr/share/rebar/deps > # > REBAR_HOST_DEPS_ENV = \ > ERL_COMPILER_OPTIONS='{i, "$(REBAR_HOST_DEPS_DIR)"}' \ > - ERL_EI_LIBDIR=$(HOST_DIR)/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib > + ERL_EI_LIBDIR=$(HOST_DIR)/lib/erlang/lib/erl_interface-$(call erlang_ei_vsn,$(HOST_DIR))/lib Since we support only one erlang version, we could just as well put $(wildcard $(HOST_DIR)/lib/erlang/lib/erl_interface-*/lib) or does that directory not necessarily exist yet after erlang has been installed? Regards, Arnout > REBAR_TARGET_DEPS_ENV = \ > ERL_COMPILER_OPTIONS='{i, "$(REBAR_TARGET_DEPS_DIR)"}' \ > - ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib > + ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(call erlang_ei_vsn,$(STAGING_DIR)/usr)/lib > > ################################################################################ > # Helper functions From arnout at mind.be Tue Feb 14 21:46:33 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 14 Feb 2023 22:46:33 +0100 Subject: [Buildroot] [PATCH 1/4] linux: create a scmversion file based on the custom repo variables In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <1f6626fc-12c0-d1f0-2a8a-2fa2fd0431b6@mind.be> Hi Charles, First of all, in patchwork [1] there are about twelve patches from you about this subject, but I think all except these four are superseded. Is that correct? Could you update patchwork and mark the old ones as superseded? On 10/02/2023 00:15, ckhardin at gmail.com wrote: > From: Charles Hardin > > When using the custom repositories, the archive creation will > omit the source history to get reproducible hashes. This has > the side effect of making the setlocalversion scripts within the > builds to not create the tracking information as expected. So, > just generate a .scmversion so that kernels will be labelled > with where buildroot referenced them. This is less than ideal because it's completely different than the normal git describe output. In particular, if you first develop something in an OVERRIDE_SRCDIR (after applying patch 4) and then change the config to point to the exact same commit with BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION, it will create a completely different UTS_RELEASE string... I think a better solution would be to extend the git download wrapper with a hook that gets called in the git tree itself. E.g.: LINUX_SCMVERSION_HOOK = ./scripts/setlocalversion --save-scmversion The same hook could then also be used for rsync. And it would be easy to add the same feature to barebox, tf-a, ... Regards, Arnout > > For example (line wrapped) > > #define UTS_RELEASE "5.4.70-repo-version-" \ > "92c23d10d0031e0a13244a1a97e7530d3b53fc6e" > > Signed-off-by: Charles Hardin > --- > linux/linux.mk | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/linux/linux.mk b/linux/linux.mk > index 7645b5f507..0b27c8dee2 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -596,6 +596,20 @@ endif > ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)),) > $(error No custom repo URL set. Check your BR2_LINUX_KERNEL_CUSTOM_REPO_URL setting) > endif > + > +# Create a custom scm version file to reflect the source version since the > +# archive will omit source directories like .git to maintain reproducible > +# hashes for the archives > +LINUX_CUSTOM_REPO_SCMVERSION = \ > + "-repo-version-$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION))" > +define LINUX_CUSTOM_REPO_SCMVERSION_HOOK > + (cd $(@D); \ > + if [ ! -f .scmversion ]; then \ > + echo $(LINUX_CUSTOM_REPO_SCMVERSION) > .scmversion; \ > + fi) > +endef > + > +LINUX_POST_EXTRACT_HOOKS += LINUX_CUSTOM_REPO_SCMVERSION_HOOK > endif > > ifeq ($(BR_BUILDING),y) From ju.o at free.fr Tue Feb 14 23:20:08 2023 From: ju.o at free.fr (Julien Olivain) Date: Wed, 15 Feb 2023 00:20:08 +0100 Subject: [Buildroot] [PATCH next v2 1/2] package/highway: new package In-Reply-To: <20230213232050.5fe67607@windsurf> References: <20221124220552.2836398-1-ju.o@free.fr> <20230213232050.5fe67607@windsurf> Message-ID: Hi Thomas, On 13/02/2023 23:20, Thomas Petazzoni wrote: > On Thu, 24 Nov 2022 23:05:51 +0100 > Julien Olivain wrote: > >> Highway is a C++ library that provides portable SIMD/vector >> intrinsics. >> >> https://github.com/google/highway >> >> Signed-off-by: Julien Olivain > > Thanks! I've applied, with some small changes, see below. Thanks for the improvements! [...] >> +This patch adds a check for and include it only if >> present. >> + >> +Signed-off-by: Julien Olivain > > Has this patch been submitted upstream? Yes! A slightly reworked version was accepted upstream and is already in the latest 1.0.3 version tag. See: https://github.com/google/highway/commit/1cab22047a6ef750ef2bc38ad47d6e765d6d376a I'm currently reworking this 1.0.3 and I'll send a version bump when ready. Best regards, Julien. From cps at microplex.com Wed Feb 15 00:10:28 2023 From: cps at microplex.com (Cem Sezer) Date: Tue, 14 Feb 2023 16:10:28 -0800 Subject: [Buildroot] Having trouble getting a simple cmake based custom package to work Message-ID: Hello, I'm looking to continue this thread as I have the exact same problem. http://lists.busybox.net/pipermail/buildroot/2020-August/591250.html The latest entry in the thread is the following, discussing the error message "*No rule to make target 'install/fast': *is where I'm stuck at the moment: >* However, when it is *>* trying to install my package I have a new error. The system seems to be *>* looking for a install/fast target, which the Makefil does not have. * I have no idea on that problem. Maybe read the CMake docs again? https://cmake.org/cmake/help/latest/command/install.html Greets Alex I am still new to cmake, but I've been having trouble getting a basic helloworld (in C) cmake package to work. I looked at that link above for the cmake docs, but am unfamiliar with what I need to do here. My CMakeLists.txt right now is just the following: cmake_minimum_required(VERSION 3.1.0) project(helloworld_c_cmake LANGUAGES C) set(SOURCES main.c) add_executable(${PROJECT_NAME} ${SOURCES}) Any pointers in the right direction would be appreciated. Perhaps this is more of a cmake question than a buildroot question, but tying the two together has been confusing, and I'm sure it must be something simple. Thanks in advance, Cem -------------- next part -------------- An HTML attachment was scrubbed... URL: From baruch at tkos.co.il Wed Feb 15 05:20:10 2023 From: baruch at tkos.co.il (Baruch Siach) Date: Wed, 15 Feb 2023 07:20:10 +0200 Subject: [Buildroot] Define dependency package only in staging In-Reply-To: References: <87v8k40wok.fsf@tarshish> Message-ID: <87r0ur1ory.fsf@tarshish> Hi Afshin, Please keep the list on Cc. On Tue, Feb 14 2023, Afshin Pir wrote: > You mean will it work if I add that in package "A" configuration like this: > B_INSTALL_TARGE = NO > Because normally each package its own configuration. That should be B_INSTALL_TARGET = NO But now I see that you want B out of target only when A selects B, not for the general case, right? There is no direct support for that in Buildroot. You can always use a post build script to remove whatever you like from your target. Alternatively you can add a blind config symbol to package B Config.in that adds 'B_INSTALL_TARGET = NO', and then select this symbol from package A. baruch > -----Original Message----- > From: Baruch Siach > Sent: Wednesday, 15 February 2023 10:20 am > To: Afshin Pir > Cc: buildroot at buildroot.org > Subject: Re: [Buildroot] Define dependency package only in staging > > Hi Afshin, > > On Tue, Feb 14 2023, Afshin Pir wrote: >> I wonder if it is possible that to force the dependant package to be >> installed only in staging folder. For example, I have written package >> A which depend on Package B like this: >> >> config BR2_PACKAGE_A >> bool "my-a-provider" >> select BR2_PACKAGE_B >> help >> Test A Package >> >> The problem is that the above configuration installs B in the target, >> but in reality, it is enough to be installed in staging directory >> (since it provides a header-only version). In there anyway to define a >> dependency for staging only? > > '_INSTALL_TARGET = NO' might help you. > > baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From yann.morin.1998 at free.fr Wed Feb 15 06:29:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 15 Feb 2023 07:29:56 +0100 Subject: [Buildroot] [PATCH] package/erlang: do not hard-code the Erlang Interface Version (EI_VSN) In-Reply-To: <4f51a196-e922-1e9e-6fbb-e81b35dc9f73@mind.be> References: <20230210215548.1050371-1-yann.morin.1998@free.fr> <4f51a196-e922-1e9e-6fbb-e81b35dc9f73@mind.be> Message-ID: <20230215062956.GA2718518@scaer> Arnout, All, On 2023-02-14 22:30 +0100, Arnout Vandecappelle spake thusly: > On 10/02/2023 22:55, Yann E. MORIN wrote: [--SNIP--] > >Although both the host and target erlang are the same, we still look > >into the corresponding file to extract the version. This is so that it > >would be easier if in the future we ever manage to rely on a > >system-installed erlang that could have a EI_VSN different from the > >target one. This ^^^ [0] ... [--SNIP--] > >@@ -36,9 +36,9 @@ ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF > > HOST_ERLANG_DEPENDENCIES += host-autoconf > > HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF > >-# Whenever updating Erlang, this value should be updated as well, to the > >-# value of EI_VSN in the file lib/erl_interface/vsn.mk > >-ERLANG_EI_VSN = 3.13.2.2 > >+# Return the EIV (Erlang Interface Version, EI_VSN) > >+# $(1): base directory, i.e. either $(HOST_DIR) or $(STAGING_DIR)/usr > >+erlang_ei_vsn = `sed -r -e '/^erl_interface-(.+)/!d; s//\1/' $(1)/lib/erlang/releases/$(ERLANG_RELEASE)/installed_application_versions` > Since this is only used by rebar-package, I think it should move to pkg-rebar.mk. I also thought about that, but the knowledge where the file is installed is in erlang, so it makes sense that erlang exports away its own version, like the variable was set previously. That's also what we do for AUTOCONF, AUTORECONF, AUTOMAKE et al: they are defined in their respective packages, but used in the autotools-package infra. > > # The configure checks for these functions fail incorrectly > > ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes > >diff --git a/package/pkg-rebar.mk b/package/pkg-rebar.mk > >index e4e3f3bb6c..4b993dd970 100644 > >--- a/package/pkg-rebar.mk > >+++ b/package/pkg-rebar.mk > >@@ -32,10 +32,10 @@ REBAR_TARGET_DEPS_DIR = $(STAGING_DIR)/usr/share/rebar/deps > > # > > REBAR_HOST_DEPS_ENV = \ > > ERL_COMPILER_OPTIONS='{i, "$(REBAR_HOST_DEPS_DIR)"}' \ > >- ERL_EI_LIBDIR=$(HOST_DIR)/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib > >+ ERL_EI_LIBDIR=$(HOST_DIR)/lib/erlang/lib/erl_interface-$(call erlang_ei_vsn,$(HOST_DIR))/lib ... [0] explains this ^^^, and ... > Since we support only one erlang version, we could just as well put > $(wildcard $(HOST_DIR)/lib/erlang/lib/erl_interface-*/lib) ... [0] answers that, I believe. ;-) > or does that directory not necessarily exist yet after erlang has been installed? The directory does exist, as erl_interface is installed by erlang (it is kind of part of its stdlib, I'd say), and thus is registered by erlang itself. Regards, Yann E. MORIN. > Regards, > Arnout > > > > REBAR_TARGET_DEPS_ENV = \ > > ERL_COMPILER_OPTIONS='{i, "$(REBAR_TARGET_DEPS_DIR)"}' \ > >- ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib > >+ ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(call erlang_ei_vsn,$(STAGING_DIR)/usr)/lib > > ################################################################################ > > # Helper functions -- .-----------------.--------------------.------------------.--------------------. | 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 Wed Feb 15 07:29:23 2023 From: christian at paral.in (Christian Stewart) Date: Tue, 14 Feb 2023 23:29:23 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/go: security bump to version 1.19.6 Message-ID: <20230215072923.184867-1-christian@paral.in> go1.19.6 (released 2023-02-14) includes security fixes to the crypto/tls, mime/multipart, net/http, and path/filepath packages, as well as bug fixes to the go command, the linker, the runtime, and the crypto/x509, net/http, and time packages. See the Go 1.19.6 milestone on the Go issue tracker for details. CVE-2022-41725: net/http, mime/multipart: denial of service from excessive resource consumption CVE-2022-41724: crypto/tls: large handshake records may cause panics CVE-2022-41723: net/http: avoid quadratic complexity in HPACK decoding https://go.dev/doc/devel/release#go1.19.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 4c22f0f274..8254a91524 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 d7f0013f82e6d7f862cc6cb5c8cdb48eef5f2e239b35baa97e2f1a7466043767 go1.19.6.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index c38ae0b99c..a9056da47b 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.5 +GO_VERSION = 1.19.6 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.39.1 From christian at paral.in Wed Feb 15 07:32:54 2023 From: christian at paral.in (Christian Stewart) Date: Tue, 14 Feb 2023 23:32:54 -0800 Subject: [Buildroot] [PATCH v3 1/3] package/go-bootstrap: split into two stages: go1.4 and go1.19.5 Message-ID: <20230215073256.186476-1-christian@paral.in> Go 1.20 requires a minimum version of go 1.17.13 to bootstrap. https://go.dev/doc/go1.20#bootstrap As Go 1.4 was the previous version that could be compiled with C, there is now no way to bootstrap go with a C compiler, unless we use a two-stage bootstrap: - build host-go-bootstrap-1.4-20170531 - build host-go-bootstrap-1.19.5 with host-go-bootstrap-1.4-20170531 - build host-go-1.20 with host-go-bootstrap-1.19.5 This is implemented in this commit first, before upgrading host-go to 1.20. Note: the .patch files from package/go version 1.19.x are not necessary for package/go-bootstrap-stage2 and have not been included there. Discussion of possible alternate approaches for future use: https://lore.kernel.org/all/CA+h8R2rtcynkCBsz=_9yANOEguyPCOcQDj8_ns+cv8RS8+8t9A at mail.gmail.com/ https://lore.kernel.org/all/20220525234312.643dfc03 at windsurf/T/ Signed-off-by: Christian Stewart --- v1 -> v2: - fix indentation of GOROOT_BOOTSTRAP in stage2 MAKE_ENV - adjust commit description - remove duplicate MAKE_ENV declaration line - reorder depends on lines in config.in.host Signed-off-by: Christian Stewart --- DEVELOPERS | 2 + package/Config.in.host | 3 +- package/go-bootstrap-stage1/Config.in.host | 6 ++ .../go-bootstrap-stage1.hash} | 0 .../go-bootstrap-stage1.mk | 46 ++++++++++++++++ package/go-bootstrap-stage2/Config.in.host | 4 ++ .../go-bootstrap-stage2.hash | 3 + .../go-bootstrap-stage2.mk | 55 +++++++++++++++++++ package/go-bootstrap/Config.in.host | 7 --- package/go-bootstrap/go-bootstrap.mk | 50 ----------------- package/go/Config.in.host | 6 +- package/go/go.mk | 9 ++- 12 files changed, 126 insertions(+), 65 deletions(-) create mode 100644 package/go-bootstrap-stage1/Config.in.host rename package/{go-bootstrap/go-bootstrap.hash => go-bootstrap-stage1/go-bootstrap-stage1.hash} (100%) create mode 100644 package/go-bootstrap-stage1/go-bootstrap-stage1.mk create mode 100644 package/go-bootstrap-stage2/Config.in.host create mode 100644 package/go-bootstrap-stage2/go-bootstrap-stage2.hash create mode 100644 package/go-bootstrap-stage2/go-bootstrap-stage2.mk delete mode 100644 package/go-bootstrap/Config.in.host delete mode 100644 package/go-bootstrap/go-bootstrap.mk diff --git a/DEVELOPERS b/DEVELOPERS index df2b98ad53..80305fdf1e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -548,6 +548,8 @@ F: package/docker-engine/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ +F: package/go-bootstrap-stage1/ +F: package/go-bootstrap-stage2/ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ diff --git a/package/Config.in.host b/package/Config.in.host index dcadbfdfc1..fff75cd165 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -40,7 +40,8 @@ menu "Host utilities" source "package/genpart/Config.in.host" source "package/gnupg/Config.in.host" source "package/go/Config.in.host" - source "package/go-bootstrap/Config.in.host" + source "package/go-bootstrap-stage1/Config.in.host" + source "package/go-bootstrap-stage2/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imagemagick/Config.in.host" diff --git a/package/go-bootstrap-stage1/Config.in.host b/package/go-bootstrap-stage1/Config.in.host new file mode 100644 index 0000000000..56a743caf9 --- /dev/null +++ b/package/go-bootstrap-stage1/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS + bool + # See src/cmd/dist/unix.c for the list of supported architectures + default y if BR2_HOSTARCH = "x86" + default y if BR2_HOSTARCH = "x86_64" + default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.hash b/package/go-bootstrap-stage1/go-bootstrap-stage1.hash similarity index 100% rename from package/go-bootstrap/go-bootstrap.hash rename to package/go-bootstrap-stage1/go-bootstrap-stage1.hash diff --git a/package/go-bootstrap-stage1/go-bootstrap-stage1.mk b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk new file mode 100644 index 0000000000..77e7046cd7 --- /dev/null +++ b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# go-bootstrap-stage1 +# +################################################################################ + +# Use last C-based Go compiler: v1.4.x +# See https://golang.org/doc/install/source#bootstrapFromSource +GO_BOOTSTRAP_STAGE1_VERSION = 1.4-bootstrap-20171003 +GO_BOOTSTRAP_STAGE1_SITE = https://dl.google.com/go +GO_BOOTSTRAP_STAGE1_SOURCE = go$(GO_BOOTSTRAP_STAGE1_VERSION).tar.gz + +GO_BOOTSTRAP_STAGE1_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE1_LICENSE_FILES = LICENSE + +# The toolchain is needed for HOSTCC_NOCACHE used to compile the Go compiler. +HOST_GO_BOOTSTRAP_STAGE1_DEPENDENCIES = toolchain + +HOST_GO_BOOTSTRAP_STAGE1_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE1_VERSION) + +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV = \ + GOOS=linux \ + GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_STAGE1_ROOT)" \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + CC=$(HOSTCC_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE1_BUILD_CMDS + cd $(@D)/src && $(HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV) ./make.bash +endef + +define HOST_GO_BOOTSTRAP_STAGE1_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + + # https://golang.org/issue/2775 + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap-stage2/Config.in.host b/package/go-bootstrap-stage2/Config.in.host new file mode 100644 index 0000000000..967ddaed1d --- /dev/null +++ b/package/go-bootstrap-stage2/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash new file mode 100644 index 0000000000..4c22f0f274 --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash @@ -0,0 +1,3 @@ +# From https://go.dev/dl +sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk new file mode 100644 index 0000000000..b623978500 --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -0,0 +1,55 @@ +################################################################################ +# +# go-bootstrap-stage2 +# +################################################################################ + +GO_BOOTSTRAP_STAGE2_VERSION = 1.19.5 +GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang +GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz + +GO_BOOTSTRAP_STAGE2_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE2_LICENSE_FILES = LICENSE + +# Use go-bootstrap-stage1 to bootstrap. +HOST_GO_BOOTSTRAP_STAGE2_DEPENDENCIES = host-go-bootstrap-stage1 + +HOST_GO_BOOTSTRAP_STAGE2_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE2_VERSION) + +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV = \ + GO111MODULE=off \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE1_ROOT) \ + GOROOT_FINAL=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + GOOS=linux \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE2_BUILD_CMDS + cd $(@D)/src && \ + $(HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) +endef + +define HOST_GO_BOOTSTRAP_STAGE2_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ + + mkdir -p $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg + cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + cp -a $(@D)/pkg/tool $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + + # https://golang.org/issue/2775 + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ + + # Set all file timestamps to prevent the go compiler from rebuilding any + # built in packages when programs are built. + find $(HOST_GO_BOOTSTRAP_STAGE2_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap/Config.in.host b/package/go-bootstrap/Config.in.host deleted file mode 100644 index fab80d24b4..0000000000 --- a/package/go-bootstrap/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS - bool - # See src/cmd/dist/unix.c for the list of support - # architectures - default y if BR2_HOSTARCH = "x86" - default y if BR2_HOSTARCH = "x86_64" - default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.mk b/package/go-bootstrap/go-bootstrap.mk deleted file mode 100644 index 71696a1540..0000000000 --- a/package/go-bootstrap/go-bootstrap.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# go-bootstrap -# -################################################################################ - -# Use last C-based Go compiler: v1.4.x -# See https://golang.org/doc/install/source#bootstrapFromSource -GO_BOOTSTRAP_VERSION = 1.4-bootstrap-20171003 -GO_BOOTSTRAP_SITE = https://dl.google.com/go -GO_BOOTSTRAP_SOURCE = go$(GO_BOOTSTRAP_VERSION).tar.gz - -GO_BOOTSTRAP_LICENSE = BSD-3-Clause -GO_BOOTSTRAP_LICENSE_FILES = LICENSE - -# To build programs that need cgo support the toolchain needs to be -# available, so the toolchain is not needed to build host-go-bootstrap -# itself, but needed by other packages that depend on -# host-go-bootstrap. -HOST_GO_BOOTSTRAP_DEPENDENCIES = toolchain - -HOST_GO_BOOTSTRAP_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_VERSION) - -# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE -# here. See https://github.com/golang/go/issues/11685. -HOST_GO_BOOTSTRAP_MAKE_ENV = \ - GOOS=linux \ - GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_ROOT)" \ - GOROOT="$(@D)" \ - GOBIN="$(@D)/bin" \ - CC=$(HOSTCC_NOCCACHE) \ - CGO_ENABLED=0 - -define HOST_GO_BOOTSTRAP_BUILD_CMDS - cd $(@D)/src && $(HOST_GO_BOOTSTRAP_MAKE_ENV) ./make.bash -endef - -define HOST_GO_BOOTSTRAP_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_ROOT)/bin/go - $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_ROOT)/bin/gofmt - - cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_ROOT)/ - cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_ROOT)/ - - # There is a known issue which requires the go sources to be installed - # https://golang.org/issue/2775 - cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_ROOT)/ -endef - -$(eval $(host-generic-package)) diff --git a/package/go/Config.in.host b/package/go/Config.in.host index ded02d3b3a..b87b862cec 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,7 +2,9 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + # See https://go.dev/doc/install/source#environment + # See src/go/build/syslist.go for the list of supported architectures depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ || BR2_mips64 || BR2_mips64el || BR2_riscv || BR2_s390x @@ -28,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go/go.mk b/package/go/go.mk index c38ae0b99c..b0dd002712 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -12,7 +12,7 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap +HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -121,12 +121,12 @@ HOST_GO_HOST_ENV = \ CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \ CGO_LDFLAGS="$(HOST_LDFLAGS)" -# The go build system is not compatible with ccache, so use -# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE. +# See https://github.com/golang/go/issues/11685. HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_ROOT) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -154,7 +154,6 @@ define HOST_GO_INSTALL_CMDS cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ - # There is a known issue which requires the go sources to be installed # https://golang.org/issue/2775 cp -a $(@D)/src $(HOST_GO_ROOT)/ -- 2.39.1 From christian at paral.in Wed Feb 15 07:32:55 2023 From: christian at paral.in (Christian Stewart) Date: Tue, 14 Feb 2023 23:32:55 -0800 Subject: [Buildroot] [PATCH v3 2/3] package/go: bump to version 1.20.1 In-Reply-To: <20230215073256.186476-1-christian@paral.in> References: <20230215073256.186476-1-christian@paral.in> Message-ID: <20230215073256.186476-2-christian@paral.in> The latest Go release, version 1.20, arrives six months after Go 1.19. Most of its changes are in the implementation of the toolchain, runtime, and libraries. https://go.dev/doc/go1.20 Go 1.20.1 fixes four minor security issues: CVE-2022-41725: net/http, mime/multipart: denial of service from excessive resource consumption. CVE-2022-41724: crypto/tls: large handshake records may cause panics CVE-2022-41723: net/http: avoid quadratic complexity in HPACK decoding Signed-off-by: Christian Stewart --- v1 -> v2: - drop unnecessary change to config.in.host v2 -> v3: - bump to go 1.20.1 - add note about fixed cves package/go: bump to 1.20.1 Signed-off-by: Christian Stewart --- ...03-runtime-support-riscv64-SV57-mode.patch | 65 ------------------- package/go/go.hash | 2 +- package/go/go.mk | 4 +- 3 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 package/go/0003-runtime-support-riscv64-SV57-mode.patch diff --git a/package/go/0003-runtime-support-riscv64-SV57-mode.patch b/package/go/0003-runtime-support-riscv64-SV57-mode.patch deleted file mode 100644 index f51c2ca093..0000000000 --- a/package/go/0003-runtime-support-riscv64-SV57-mode.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6618c7af436488fa12018cdcd31eeedb3a698745 Mon Sep 17 00:00:00 2001 -From: Dmitry Vyukov -Date: Fri, 27 May 2022 18:55:35 +0200 -Subject: [PATCH] runtime: support riscv64 SV57 mode - -Riscv64 has SV57 mode when user-space VA is 56 bits. -Linux kernel recently got support for this mode and Go binaries started crashing as: - -runtime: lfstack.push invalid packing: node=0xffffff5908a940 cnt=0x1 -packed=0xffff5908a9400001 -> node=0xffff5908a940 - -Adjust lfstack code to use only 8 top bits of pointers on riscv64. - -For context see: -https://groups.google.com/g/syzkaller-bugs/c/lU0GQTZoNQQ/m/O_c3vmE3AAAJ - -Update #54104 - -Change-Id: Ib5d3d6a79c0c6eddf11618d73fcc8bc1832a9c25 -Signed-off-by: Christian Stewart ---- - -Upstream: https://go-review.googlesource.com/c/go/+/409055/4 ---- - src/runtime/lfstack_64bit.go | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/runtime/lfstack_64bit.go b/src/runtime/lfstack_64bit.go -index 154130cf63..39fa647b9e 100644 ---- a/src/runtime/lfstack_64bit.go -+++ b/src/runtime/lfstack_64bit.go -@@ -36,12 +36,21 @@ const ( - // We use one bit to distinguish between the two ranges. - aixAddrBits = 57 - aixCntBits = 64 - aixAddrBits + 3 -+ -+ // Riscv64 SV57 mode gives 56 bits of userspace VA. -+ // lfstack code supports it, but broader support for SV57 mode is incomplete, -+ // and there may be other issues (see #54104). -+ riscv64AddrBits = 56 -+ riscv64CntBits = 64 - riscv64AddrBits + 3 - ) - - func lfstackPack(node *lfnode, cnt uintptr) uint64 { - if GOARCH == "ppc64" && GOOS == "aix" { - return uint64(uintptr(unsafe.Pointer(node)))<<(64-aixAddrBits) | uint64(cnt&(1<> aixCntBits << 3) | 0xa<<56))) - } -+ if GOARCH == "riscv64" { -+ return (*lfnode)(unsafe.Pointer(uintptr(val >> riscv64CntBits << 3))) -+ } - return (*lfnode)(unsafe.Pointer(uintptr(val >> cntBits << 3))) - } --- -2.35.1 - diff --git a/package/go/go.hash b/package/go/go.hash index 4c22f0f274..8e5acfe42f 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 b5c1a3af52c385a6d1c76aed5361cf26459023980d0320de7658bae3915831a2 go1.20.1.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index b0dd002712..4db703a301 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.5 +GO_VERSION = 1.20.1 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -151,7 +151,7 @@ define HOST_GO_INSTALL_CMDS cp -a $(@D)/lib $(HOST_GO_ROOT)/ mkdir -p $(HOST_GO_ROOT)/pkg - cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ + cp -a $(@D)/pkg/include $(HOST_GO_ROOT)/pkg/ cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ # https://golang.org/issue/2775 -- 2.39.1 From christian at paral.in Wed Feb 15 07:32:56 2023 From: christian at paral.in (Christian Stewart) Date: Tue, 14 Feb 2023 23:32:56 -0800 Subject: [Buildroot] [PATCH v3 3/3] package/go: use host compiler when go-bootstrap unsupported In-Reply-To: <20230215073256.186476-1-christian@paral.in> References: <20230215073256.186476-1-christian@paral.in> Message-ID: <20230215073256.186476-3-christian@paral.in> All Go compiler versions > 1.4.x (old) are written in Go, and require a existing compiled Go version to use to build from source. https://golang.org/doc/install/source#bootstrapFromSource The process for "bootstrapping" the Go compiler in Buildroot is: 1. Compile a C/C++ cross-compiler (gcc) as the host toolchain. 2. Build go-bootstrap-stage1 (which is Go 1.4.x and written in C) 3. Build go-bootstrap-stage2 (which is Go 1.19.x and written in Go) 3. Build go 1.20 (written in Go) using go-bootstrap-stage2. go-bootstrap-stage1 does not work on 64-bit arm. The Go 1.4.x bootstrap compiler is compatible with x86, x86_64, and arm (32 bit) only. This patch adds a fallback to require a host Go compiler to build host-go when BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS is not set. Signed-off-by: Christian Stewart --- changes prior to inclusion in this series: - thanks Thomas for the review & suggestions - added NEEDS_HOST_GO boolean - added dependency checks to support/dependencies/dependencies.sh - removed unnecessary changes to go-bootstrap package - add dependency on toolchain if Cgo is enabled - updates for go1.20 - updates for go-bootstrap-stage{1,2} changes from v1 -> v2: - remove whitespace fix in bootstrap stage2 Signed-off-by: Christian Stewart --- Config.in | 4 ++++ package/go/Config.in.host | 2 +- package/go/go.mk | 14 ++++++++++++-- support/dependencies/dependencies.sh | 4 ++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Config.in b/Config.in index 0d7641633c..c70ce94d94 100644 --- a/Config.in +++ b/Config.in @@ -58,6 +58,10 @@ config BR2_HOST_GCC_AT_LEAST_9 # When adding new entries above, be sure to update # the HOSTCC_MAX_VERSION variable in the Makefile. +# Hidden boolean selected if bootstrapping Go w/ GCC is not supported. +config BR2_NEEDS_HOST_GO + bool + # Hidden boolean selected by packages in need of Java in order to build # (example: kodi) config BR2_NEEDS_HOST_JAVA diff --git a/package/go/Config.in.host b/package/go/Config.in.host index b87b862cec..7f049ff1ae 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -30,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + select BR2_NEEDS_HOST_GO if !BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go/go.mk b/package/go/go.mk index 4db703a301..68f6d9e36b 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -12,7 +12,6 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -109,6 +108,11 @@ else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS HOST_GO_CGO_ENABLED = 1 endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +ifeq ($(HOST_GO_CGO_ENABLED),1) +# For cgo support the toolchain needs to be available. +HOST_GO_DEPENDENCIES += toolchain +endif + # For the convenience of host golang packages HOST_GO_HOST_ENV = \ $(HOST_GO_COMMON_ENV) \ @@ -126,7 +130,6 @@ HOST_GO_HOST_ENV = \ HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -136,6 +139,13 @@ HOST_GO_MAKE_ENV = \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ $(HOST_GO_CROSS_ENV) +# Use the Go compiler bootstrapped by Buildroot if available. +# Otherwise, use the host Go compiler. +ifeq ($(BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS),y) +HOST_GO_DEPENDENCIES += host-go-bootstrap-stage2 +HOST_GO_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) +endif + define HOST_GO_BUILD_CMDS cd $(@D)/src && \ $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 4353e9585e..943c7d0daf 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -217,6 +217,10 @@ if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then fi fi +if grep -q ^BR2_NEEDS_HOST_GO=y $BR2_CONFIG ; then + check_prog_host "go" +fi + if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then check_prog_host "java" JAVA_GCJ=$(java -version 2>&1 | grep gcj) -- 2.39.1 From peter at korsgaard.com Wed Feb 15 09:14:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:14:12 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/go: security bump to version 1.19.6 In-Reply-To: <20230215072923.184867-1-christian@paral.in> (Christian Stewart's message of "Tue, 14 Feb 2023 23:29:23 -0800") References: <20230215072923.184867-1-christian@paral.in> Message-ID: <8735775lzv.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > go1.19.6 (released 2023-02-14) includes security fixes to the crypto/tls, > mime/multipart, net/http, and path/filepath packages, as well as bug fixes to > the go command, the linker, the runtime, and the crypto/x509, net/http, and time > packages. See the Go 1.19.6 milestone on the Go issue tracker for details. > CVE-2022-41725: net/http, mime/multipart: denial of service from excessive resource consumption > CVE-2022-41724: crypto/tls: large handshake records may cause panics > CVE-2022-41723: net/http: avoid quadratic complexity in HPACK decoding > https://go.dev/doc/devel/release#go1.19.minor > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 15 09:19:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:19:49 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/fluent-bit: bump to version 2.0.9 In-Reply-To: <20230211182546.633728-1-thomas@devoogdt.com> (thomas@devoogdt.com's message of "Sat, 11 Feb 2023 19:25:43 +0100") References: <20230211182546.633728-1-thomas@devoogdt.com> Message-ID: <87y1oz4762.fsf@dell.be.48ers.dk> >>>>> "thomas" == thomas writes: > From: Thomas Devoogdt > - Release Notes: > https://fluentbit.io/announcements/v2.0.9/ > - Patch dropped, as it is upstream: > https://github.com/fluent/fluent-bit/commit/7bcb502ebdcd647d6b83c972805e734ad522eb1a > Signed-off-by: Thomas Devoogdt > --- > v2: moved to a serie of patches Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 15 09:21:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:21:07 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/fluent-bit: add support for non glibc toolchain In-Reply-To: <20230211182546.633728-2-thomas@devoogdt.com> (thomas@devoogdt.com's message of "Sat, 11 Feb 2023 19:25:44 +0100") References: <20230211182546.633728-1-thomas@devoogdt.com> <20230211182546.633728-2-thomas@devoogdt.com> Message-ID: <87ttzn473w.fsf@dell.be.48ers.dk> >>>>> "thomas" == thomas writes: > From: Thomas Devoogdt > - require threads and dynamic library support > - require sync_4 support > - provide fts.h trough musl-fts > static_assert is not available if no C++ toolchain or no glibc > is used, so add two patches to fix this > Signed-off-by: Thomas Devoogdt Committed, thanks. We do have xxhash and c-ares packages in Buildroot, could you have a look at using those instead of these vendored libraries? -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 15 09:22:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:22:22 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/fluent-bit: fix builds on s390x architectures In-Reply-To: <20230211182546.633728-3-thomas@devoogdt.com> (thomas@devoogdt.com's message of "Sat, 11 Feb 2023 19:25:45 +0100") References: <20230211182546.633728-1-thomas@devoogdt.com> <20230211182546.633728-3-thomas@devoogdt.com> Message-ID: <87pmab471t.fsf@dell.be.48ers.dk> >>>>> "thomas" == thomas writes: > From: Thomas Devoogdt > Fixes: > - http://autobuild.buildroot.net/results/856fd250f75a696694c70e3208ffcef7470a7082 > - http://autobuild.buildroot.net/results/dceb413fb5d459338417d8dd5a42d95aa23e849b > Signed-off-by: Thomas Devoogdt > --- > v2: new patch in this serie Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 15 09:23:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:23:45 +0100 Subject: [Buildroot] [PATCH] support/config-fragments: add a bootlin s390x toolchain In-Reply-To: <20230211155826.285037-1-thomas@devoogdt.com> (thomas@devoogdt.com's message of "Sat, 11 Feb 2023 16:58:26 +0100") References: <20230211155826.285037-1-thomas@devoogdt.com> Message-ID: <87lekz46zi.fsf@dell.be.48ers.dk> >>>>> "thomas" == thomas writes: > From: Thomas Devoogdt > I do constantly get mails that fluent-bit fails to build for s390x. > So added this to ensure that the s390x architecture is checked as well > if I manually do: > $ ./utils/test-pkg -p fluent-bit -a > Signed-off-by: Thomas Devoogdt Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 15 09:14:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:14:25 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: bump to version 2.0.9 Message-ID: <20230215092413.E76EA85584@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=656af31891cc68eb8b27866cb9e9a7ca428a2b16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Release Notes: https://fluentbit.io/announcements/v2.0.9/ - Patch dropped, as it is upstream: https://github.com/fluent/fluent-bit/commit/7bcb502ebdcd647d6b83c972805e734ad522eb1a Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...-CMakeLists.txt-only-require-a-C-compiler.patch | 27 ---------------------- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch b/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch deleted file mode 100644 index e71bcf0c0d..0000000000 --- a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7bcb502ebdcd647d6b83c972805e734ad522eb1a Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 30 Jan 2023 09:10:37 +0100 -Subject: [PATCH] CMakeLists.txt: only require a C compiler - -Fluent-bit is mostly written in C, -so don't require CXX in the top-level project. - -Signed-off-by: Thomas Devoogdt ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7adb02de..3ff7360d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.12) --project(fluent-bit) -+project(fluent-bit C) - - # CMP0069 ensures that LTO is enabled for all compilers - cmake_policy(SET CMP0069 NEW) --- -2.30.2 - diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index ce7cea7b59..0caadcd56f 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8ff5566389033669feabc9c69a5c6f417dad5c8b066454388e6a706507262acf fluent-bit-2.0.8.tar.gz +sha256 393ad4a6ced48c327607653d610ef273843085a17b6e5c8013877abdf31e6945 fluent-bit-2.0.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 13077e53cc..c10ef613d7 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.0.8 +FLUENT_BIT_VERSION = 2.0.9 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 15 09:13:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:13:41 +0100 Subject: [Buildroot] [git commit] package/go: security bump to version 1.19.6 Message-ID: <20230215092413.DC00585541@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98e0452ebb7cb25311d4f615e07df89a5776268b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master go1.19.6 (released 2023-02-14) includes security fixes to the crypto/tls, mime/multipart, net/http, and path/filepath packages, as well as bug fixes to the go command, the linker, the runtime, and the crypto/x509, net/http, and time packages. See the Go 1.19.6 milestone on the Go issue tracker for details. CVE-2022-41725: net/http, mime/multipart: denial of service from excessive resource consumption CVE-2022-41724: crypto/tls: large handshake records may cause panics CVE-2022-41723: net/http: avoid quadratic complexity in HPACK decoding https://go.dev/doc/devel/release#go1.19.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 4c22f0f274..8254a91524 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 d7f0013f82e6d7f862cc6cb5c8cdb48eef5f2e239b35baa97e2f1a7466043767 go1.19.6.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index c38ae0b99c..a9056da47b 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.5 +GO_VERSION = 1.19.6 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Wed Feb 15 09:23:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:23:35 +0100 Subject: [Buildroot] [git commit] support/config-fragments: add a bootlin s390x toolchain Message-ID: <20230215092414.15C6B85541@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=740d923423f18d94d62e60d0efe8200c7bd889d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master I do constantly get mails that fluent-bit fails to build for s390x. So added this to ensure that the s390x architecture is checked as well if I manually do: $ ./utils/test-pkg -p fluent-bit -a Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config | 5 +++++ support/config-fragments/autobuild/toolchain-configs.csv | 1 + 2 files changed, 6 insertions(+) diff --git a/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config new file mode 100644 index 0000000000..fe3f0380c9 --- /dev/null +++ b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config @@ -0,0 +1,5 @@ +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 diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 0b19051543..a65e9bacc3 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -38,6 +38,7 @@ support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv32-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-sh4-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc64-glibc.config,x86_64 From peter at korsgaard.com Wed Feb 15 09:23:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:23:16 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: fix builds on s390x architectures Message-ID: <20230215092414.0AFB3855A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5cbb458bd44778376ccdd5ffccc3e5fc5492766a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: - http://autobuild.buildroot.net/results/856fd250f75a696694c70e3208ffcef7470a7082 - http://autobuild.buildroot.net/results/dceb413fb5d459338417d8dd5a42d95aa23e849b Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 4ecf813511..d618fdf1e2 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -12,6 +12,9 @@ FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl +FLUENT_BIT_CFLAGS = $(TARGET_CFLAGS) +FLUENT_BIT_CXXFLAGS = $(TARGET_CXXFLAGS) + FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ -DFLB_RELEASE=Yes \ @@ -42,12 +45,16 @@ FLUENT_BIT_CONF_OPTS += \ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_INSTALL_SYSCONFDIR="/etc/" +# Fix multiple definition of `mk_tls_*'. +# https://github.com/fluent/fluent-bit/issues/5537 +FLUENT_BIT_CFLAGS += -fcommon +FLUENT_BIT_CXXFLAGS += -fcommon + # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h # large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information. -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +# https://bugzilla.redhat.com/show_bug.cgi?id=574992 +FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS +FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) FLUENT_BIT_DEPENDENCIES += musl-fts @@ -60,7 +67,9 @@ FLUENT_BIT_LDFLAGS += -latomic endif FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" \ + -DCMAKE_C_FLAGS="$(FLUENT_BIT_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(FLUENT_BIT_CXXFLAGS)" define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ From peter at korsgaard.com Wed Feb 15 09:16:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:16:17 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: add support for non glibc toolchain Message-ID: <20230215092413.F412B85589@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d649bcd3805a26cedb30120ebbdcf12f8fbf449f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - require threads and dynamic library support - require sync_4 support - provide fts.h through musl-fts static_assert is not available if no C++ toolchain or no glibc is used, so add two patches to fix this Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- .../0001-lib-cfl-fixup-static_assert.patch | 33 +++++++++++++ .../0002-lib-c-ares-fixup-static_assert.patch | 56 ++++++++++++++++++++++ package/fluent-bit/Config.in | 10 ++-- package/fluent-bit/fluent-bit.mk | 11 ++++- 4 files changed, 105 insertions(+), 5 deletions(-) diff --git a/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch b/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch new file mode 100644 index 0000000000..19dab7cac6 --- /dev/null +++ b/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch @@ -0,0 +1,33 @@ +From e4f825dd9e952f4a056bf89342049e67102ae6bb Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:38:15 +0100 +Subject: [PATCH] lib: cfl: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 + +Signed-off-by: Thomas Devoogdt +--- + lib/cfl/lib/xxhash/xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/cfl/lib/xxhash/xxhash.h b/lib/cfl/lib/xxhash/xxhash.h +index 08ab79457..511c4d12b 100644 +--- a/lib/cfl/lib/xxhash/xxhash.h ++++ b/lib/cfl/lib/xxhash/xxhash.h +@@ -1546,8 +1546,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else +-- +2.34.1 + diff --git a/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch new file mode 100644 index 0000000000..d9b918ea8a --- /dev/null +++ b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch @@ -0,0 +1,56 @@ +From f55f9bf6d9201169d2e5d3782068b03ff17dec90 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:26:56 +0100 +Subject: [PATCH] lib: c-ares: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/c-ares/c-ares/issues/504 + +Signed-off-by: Thomas Devoogdt +--- + lib/c-ares-1.19.0/configure | 4 ++++ + lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/lib/c-ares-1.19.0/configure b/lib/c-ares-1.19.0/configure +index 4c5e1a966..58712ec34 100755 +--- a/lib/c-ares-1.19.0/configure ++++ b/lib/c-ares-1.19.0/configure +@@ -6317,6 +6317,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +@@ -6394,6 +6396,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +diff --git a/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 b/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 +index 229de3091..fe4a11c67 100644 +--- a/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 ++++ b/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 +@@ -37,6 +37,9 @@ + #serial 9 + + m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ ++ ++#define static_assert _Static_assert ++ + template + struct check + { +-- +2.34.1 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 6c2299e695..f53eacb447 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_FLUENT_BIT bool "fluent-bit" - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_STATIC_LIBS # dlfcn.h + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBYAML help @@ -29,5 +32,6 @@ config BR2_PACKAGE_FLUENT_BIT_WASM endif -comment "fluent-bit needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC +comment "fluent-bit needs a toolchain w/ threads, dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index c10ef613d7..4ecf813511 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -49,12 +49,19 @@ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +FLUENT_BIT_DEPENDENCIES += musl-fts +FLUENT_BIT_LDFLAGS += -lfts +endif + # Uses __atomic_compare_exchange_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS=-latomic +FLUENT_BIT_LDFLAGS += -latomic endif +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" + define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ $(TARGET_DIR)/etc/init.d/S99fluent-bit From d.lang at abatec.at Wed Feb 15 09:58:39 2023 From: d.lang at abatec.at (Lang Daniel) Date: Wed, 15 Feb 2023 09:58:39 +0000 Subject: [Buildroot] [PATCH v2 1/2] package/libbpf: Don't remove bpf.h Message-ID: libbpf >1.0.0 defines libbpf_bpf_link_type_str(enum bpf_link_type) in src/libbpf.h, which is included by host-pahole. bpf_link_type is defined in linux/bpf.h, therefore the comment stating that pahole doesn't need bpf.h is no longer valid. Fixes: - http://autobuild.buildroot.net/results/d126a4b6eca786402dc362c86f8df3addec3d217/ Signed-off-by: Daniel Lang --- v1 -> v2: no changes. --- package/libbpf/libbpf.mk | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index b498136ace..670dbee87e 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -39,26 +39,9 @@ define LIBBPF_INSTALL_TARGET_CMDS -C $(@D)/src install DESTDIR=$(TARGET_DIR) endef -# We need to install_uapi_headers so we have btf.h to compile -# host-pahole. -# Nonetheless, this target adds bpf.h which generates a conflict when -# building the kernel: -# In file included from libbpf_internal.h:17:0, from strset.c:9: -# relo_core.h:10:6: error: nested redefinition of 'enum bpf_core_relo_kind' -# enum bpf_core_relo_kind { -# ^~~~~~~~~~~~~~~~~~ -# relo_core.h:10:6: error: redeclaration of 'enum bpf_core_relo_kind' -# In file included from libbpf_legacy.h:13:0, -# from libbpf_internal.h:16, -# from strset.c:9: -# /home/francis/buildroot/output/host/include/linux/bpf.h:6497:6: note: originally defined here -# enum bpf_core_relo_kind { -# So, better to remove remove it now since we do not need it to build -# host-pahole, the only user of host-libbpf. define HOST_LIBBPF_INSTALL_CMDS $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ -C $(@D)/src install install_uapi_headers DESTDIR=$(HOST_DIR) - rm $(HOST_DIR)/include/linux/bpf.h endef $(eval $(generic-package)) -- 2.25.1 From d.lang at abatec.at Wed Feb 15 09:58:51 2023 From: d.lang at abatec.at (Lang Daniel) Date: Wed, 15 Feb 2023 09:58:51 +0000 Subject: [Buildroot] [PATCH v2 2/2] linux: use -isystem instead of -I in HOSTCC Message-ID: A package might install headers that are incompatible with the kernel's header. One example is the most recent version of pahole (1.24). HOST_CC includes -I$(HOST_DIR)/include which comes before any include logic the kernel might have thus forcing the kernel to prefer headers in HOST_DIR. The logic to substituting -I with -isystem is taken from boot/uboot/uboot.mk. Signed-off-by: Daniel Lang --- v1 -> v2: - Patch was added to the series Tested with: BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="{VERSION}" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="pahole-kernel.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE=y and with a fragment for linux: CONFIG_BPF_SYSCALL=y CONFIG_BPF_UNPRIV_DEFAULT_OFF=n CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DEBUG_INFO_REDUCED=n CONFIG_DEBUG_INFO_COMPRESSED=n CONFIG_DEBUG_INFO_BTF=y CONFIG_SYSTEM_TRUSTED_KEYRING=y where VERSION is one of: 5.2.21 5.3.18 5.4.231 5.5.19 5.6.19 5.7.19 5.8.18 5.9.16 5.10.167 5.11.22 5.12.19 5.13.19 5.14.21 5.15.93 5.16.20 5.17.15 5.18.19 5.19.17 6.0.19 6.1.11 Version 5.2, as far as I could work it out, is the version that introduced the pahole dependency when CONFIG_DEBUG_INFO_BTF is set. None-LTS versions after 5.10 and before 5.19 fail with: LD vmlinux.o MODPOST vmlinux.symvers MODINFO modules.builtin.modinfo GEN modules.builtin LD .tmp_vmlinux.btf BTF .btf.vmlinux.bin.o LD .tmp_vmlinux.kallsyms1 KSYMS .tmp_vmlinux.kallsyms1.S AS .tmp_vmlinux.kallsyms1.S LD .tmp_vmlinux.kallsyms2 KSYMS .tmp_vmlinux.kallsyms2.S AS .tmp_vmlinux.kallsyms2.S LD vmlinux BTFIDS vmlinux FAILED: load BTF from vmlinux: Invalid argument make[2]: *** [Makefile:1177: vmlinux] Error 255 make[1]: *** [package/pkg-generic.mk:293: /home/d.lang/ws/other/buildroot/output/build/linux-5.11.22/.stamp_built] Error 2 make: *** [Makefile:82: _all] Error 2 These version miss BTF_KIND_ENUM64 support and require a patch [0] that has been added to LTS versions. [0]: https://lore.kernel.org/bpf/20221019085604.1017583-6-jolsa at kernel.org/ Signed-off-by: Daniel Lang --- linux/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..03d89cd204 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -150,7 +150,7 @@ endif # Disable building host tools with -Werror: newer gcc versions can be # extra picky about some code (https://bugs.busybox.net/show_bug.cgi?id=14826) LINUX_MAKE_FLAGS = \ - HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ + HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ ARCH=$(KERNEL_ARCH) \ INSTALL_MOD_PATH=$(TARGET_DIR) \ CROSS_COMPILE="$(TARGET_CROSS)" \ -- 2.25.1 From christian at paral.in Wed Feb 15 10:55:00 2023 From: christian at paral.in (Christian Stewart) Date: Wed, 15 Feb 2023 02:55:00 -0800 Subject: [Buildroot] [PATCH] package/pkg-golang: disable version control information In-Reply-To: <12a7772dc9c30d31bc4dd7a4e15ca12425c14834.1676297701.git.stefan@agner.ch> References: <12a7772dc9c30d31bc4dd7a4e15ca12425c14834.1676297701.git.stefan@agner.ch> Message-ID: Hi Stefan, On Mon, Feb 13, 2023 at 6:16 AM Stefan Agner wrote: > > By default go tries to include version control (VCS) information in > binaries. Since Buildroot separates version control from the build > process it is sensible to disable this behavior. > > This avoids build errors when building with a git repository higher > up in the tree owned by root. In this case the go build system > calls `git status --porcelain` which returns with an error: > fatal: detected dubious ownership in repository at '/build' > > Signed-off-by: Stefan Agner > --- > package/pkg-golang.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk > index cdc67b32c0..da9c9a21ac 100644 > --- a/package/pkg-golang.mk > +++ b/package/pkg-golang.mk > @@ -45,7 +45,8 @@ $(2)_BUILD_OPTS += \ > -modcacherw \ > -tags "$$($(2)_TAGS)" \ > -trimpath \ > - -p $$(PARALLEL_JOBS) > + -p $$(PARALLEL_JOBS) \ > + -buildvcs=false Lgtm & tested Reviewed-by: Christian Stewart From thomas at devoogdt.com Wed Feb 15 11:41:57 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 15 Feb 2023 12:41:57 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/fluent-bit: add support for non glibc toolchain In-Reply-To: <87ttzn473w.fsf@dell.be.48ers.dk> References: <20230211182546.633728-1-thomas@devoogdt.com> <20230211182546.633728-2-thomas@devoogdt.com> <87ttzn473w.fsf@dell.be.48ers.dk> Message-ID: Hi, Peter It would indeed be better to link against those, but this is sadly the nature of how fluent-bit is made. Next to those two libs, there are a dozen of other libs that are also literally copied in their code base. What you are proposing is to adapt their cmakefile and only compile the static libs if no dynamic lib could be found. Or even never compile it and just pass the linker flags. I'm afraid that we could have compatibility problems by that, so I would keep it static for now. Kr Thomas Devoogdt Op wo 15 feb. 2023 10:21 schreef Peter Korsgaard : > >>>>> "thomas" == thomas writes: > > > From: Thomas Devoogdt > > - require threads and dynamic library support > > - require sync_4 support > > - provide fts.h trough musl-fts > > > static_assert is not available if no C++ toolchain or no glibc > > is used, so add two patches to fix this > > > Signed-off-by: Thomas Devoogdt > > Committed, thanks. We do have xxhash and c-ares packages in Buildroot, > could you have a look at using those instead of these vendored > libraries? > > -- > Bye, Peter Korsgaard > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Wed Feb 15 12:52:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 13:52:31 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/fluent-bit: add support for non glibc toolchain In-Reply-To: (Thomas Devoogdt's message of "Wed, 15 Feb 2023 12:41:57 +0100") References: <20230211182546.633728-1-thomas@devoogdt.com> <20230211182546.633728-2-thomas@devoogdt.com> <87ttzn473w.fsf@dell.be.48ers.dk> Message-ID: <87h6vn3xbk.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > Hi, Peter > It would indeed be better to link against those, > but this is sadly the nature of how fluent-bit is made. Do you know why they have made that choice? From a quick look it doesn't seem like the code has been modified. > Next to those two libs, there are a dozen of other libs that are also > literally copied in their code base. What you are proposing is to adapt > their cmakefile and only compile the static libs if no dynamic lib could be > found. Or even never compile it and just pass the linker flags. I'm afraid > that we could have compatibility problems by that, so I would keep it > static for now. If that is the only option supported by upstream, then indeed that is what we will have to do. Will you monitor for security vulnerabilities in the vendored libraries and ensure this is also fixed there? E.G. we recently had a (low risk) vulnerability in c-ares. -- Bye, Peter Korsgaard From raphael.pavlidis at gmail.com Wed Feb 15 14:35:34 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Wed, 15 Feb 2023 15:35:34 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/x11r7/xwayland: new package Message-ID: <20230215143534.19834-1-raphael.pavlidis@gmail.com> XServer to run X clients under wayland This XServer is required to run the X clients under Wayland compositor, for example weston or wlroots based compositors. Signed-off-by: Raphael Pavlidis --- DEVELOPERS | 1 + package/weston/Config.in | 8 +++ package/weston/weston.mk | 2 +- package/wlroots/Config.in | 12 ++++ package/wlroots/wlroots.mk | 6 +- package/x11r7/Config.in | 1 + package/x11r7/xwayland/Config.in | 26 ++++++++ package/x11r7/xwayland/xwayland.hash | 6 ++ package/x11r7/xwayland/xwayland.mk | 94 ++++++++++++++++++++++++++++ 9 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 package/x11r7/xwayland/Config.in create mode 100644 package/x11r7/xwayland/xwayland.hash create mode 100644 package/x11r7/xwayland/xwayland.mk diff --git a/DEVELOPERS b/DEVELOPERS index df2b98ad53..b240b7c92a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2515,6 +2515,7 @@ F: support/testing/tests/package/test_python_s3transfer.py N: Raphael Pavlidis F: package/slirp4netns/ F: package/sway/ +F: package/x11r7/xwayland/ N: Refik Tuzakli F: package/freescale-imx/ diff --git a/package/weston/Config.in b/package/weston/Config.in index 3b4e932b7d..db12afc43a 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -111,14 +111,22 @@ config BR2_PACKAGE_WESTON_XWAYLAND bool "XWayland support" depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_LIBEPOXY + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_XWAYLAND comment "XWayland support needs libepoxy and X.org enabled" depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + # Weston needs at least one shell; this can be one of the bundled ones, # below, of from a third-party package, which should then select this. config BR2_PACKAGE_WESTON_HAS_SHELL diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 5e71473640..01f84178b2 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -123,7 +123,7 @@ WESTON_CONF_OPTS += -Dbackend-default=$(call qstrip,$(BR2_PACKAGE_WESTON_DEFAULT ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) WESTON_CONF_OPTS += -Dxwayland=true -WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor +WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor xwayland else WESTON_CONF_OPTS += -Dxwayland=false endif diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 84a4ef846e..26992ca326 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -41,4 +41,16 @@ config BR2_PACKAGE_WLROOTS_X11 help Support Wayland sessions nested inside a X11 window +config BR2_PACKAGE_WLROOTS_XWAYLAND + bool "XWayland support" + depends on BR2_PACKAGE_XORG7 # libxcb, xcb-util-wm, xwayland + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_XWAYLAND + help + Support for X11 applications + +comment "XWayland support needs X.org enabled" + depends on !BR2_PACKAGE_XORG7 + endif diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 4f14d20b11..5b930a51be 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -30,8 +30,12 @@ WLROOTS_BACKENDS = libinput drm ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) WLROOTS_BACKENDS += x11 -WLROOTS_CONF_OPTS += -Dxwayland=enabled WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 +endif + +ifeq ($(BR2_PACKAGE_WLROOTS_XWAYLAND),y) +WLROOTS_CONF_OPTS += -Dxwayland=enabled +WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xwayland else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 365de34c98..4de8922e0d 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -12,6 +12,7 @@ menuconfig BR2_PACKAGE_XORG7 if BR2_PACKAGE_XORG7 menu "X11R7 Servers" source package/x11r7/xserver_xorg-server/Config.in + source package/x11r7/xwayland/Config.in endmenu menu "X11R7 Libraries" source package/x11r7/libxcb/Config.in diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in new file mode 100644 index 0000000000..4f14f2cc36 --- /dev/null +++ b/package/x11r7/xwayland/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_XWAYLAND + bool "xwayland server" + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland + # We need a SHA1 implementation. If either openssl or + # libgcrypt are already part of the build, we'll use one of + # them, otherwise, use the small libsha1 library. + select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_XLIB_LIBXCVT + select BR2_PACKAGE_XLIB_LIBXFONT2 + select BR2_PACKAGE_XLIB_LIBXKBFILE + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_XTRANS + select BR2_PACKAGE_XORGPROTO + help + X.Org X server to run X clients under wayland + + http://xorg.freedesktop.org + +comment "xwayland needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash new file mode 100644 index 0000000000..0c476f3183 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.hash @@ -0,0 +1,6 @@ +# From https://lists.x.org/archives/xorg-announce/2023-February/003322.html +sha256 d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73 xwayland-22.1.8.tar.xz +sha512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a xwayland-22.1.8.tar.xz + +# Locally calculated +sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk new file mode 100644 index 0000000000..174b440b07 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.mk @@ -0,0 +1,94 @@ +################################################################################ +# +# xwayland +# +################################################################################ + +XWAYLAND_VERSION = 22.1.8 +XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz +XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver +XWAYLAND_LICENSE = MIT +XWAYLAND_LICENSE_FILES = COPYING +XWAYLAND_INSTALL_STAGING = YES +XWAYLAND_DEPENDENCIES = \ + pixman \ + wayland \ + wayland-protocols \ + xlib_libxcvt \ + xlib_libXfont2 \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_xtrans \ + xorgproto +XWAYLAND_CONF_OPTS = \ + -Dxwayland_eglstream=false \ + -Dxvfb=false \ + -Ddefault_font_path=/usr/share/fonts/X11/ \ + -Ddtrace=false \ + -Ddocs=false + +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY),yy) +XWAYLAND_CONF_OPTS += -Dglamor=true +XWAYLAND_DEPENDENCIES += libdrm libepoxy +else +XWAYLAND_CONF_OPTS += -Dglamor=false +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XWAYLAND_CONF_OPTS += -Dglx=true +XWAYLAND_DEPENDENCIES += libgl +else +XWAYLAND_CONF_OPTS += -Dglx=false +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXDMCP),y) +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=true \ + -Dxdm-auth-1=true +XWAYLAND_DEPENDENCIES += xlib_libXdmcp +else +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=false \ + -Dxdm-auth-1=false +endif + +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +XWAYLAND_CONF_OPTS += -Dsecure-rpc=true +XWAYLAND_DEPENDENCIES += libtirpc +else +XWAYLAND_CONF_OPTS += -Dsecure-rpc=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX)$(BR2_PACKAGE_AUDIT),yy) +XWAYLAND_CONF_OPTS += -Dxselinux=true +XWAYLAND_DEPENDENCIES += libselinux audit +else +XWAYLAND_CONF_OPTS += -Dxselinux=false +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +XWAYLAND_CONF_OPTS += -Dsha1=libcrypto +XWAYLAND_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +XWAYLAND_CONF_OPTS += -Dsha1=libgcrypt +XWAYLAND_DEPENDENCIES += libgcrypt +else +XWAYLAND_CONF_OPTS += -Dsha1=libsha1 +XWAYLAND_DEPENDENCIES += libsha1 +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_LIBDRM),yy) +XWAYLAND_CONF_OPTS += -Ddri3=true +XWAYLAND_DEPENDENCIES += xlib_libxshmfence libdrm +else +XWAYLAND_CONF_OPTS += -Ddri3=false +endif + +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +XWAYLAND_CONF_OPTS += -Dlibunwind=true +XWAYLAND_DEPENDENCIES += libunwind +else +XWAYLAND_CONF_OPTS += -Dlibunwind=false +endif + +$(eval $(meson-package)) -- 2.39.1 From nolange79 at gmail.com Wed Feb 15 15:13:01 2023 From: nolange79 at gmail.com (Norbert Lange) Date: Wed, 15 Feb 2023 16:13:01 +0100 Subject: [Buildroot] [PATCH] package/zstd: bump to version 1.5.4 Message-ID: <20230215151302.140387-1-nolange79@gmail.com> The LICENSE text has changed, nominally the copyright owner changed from "Facebook" to "Meta Platforms, Inc. and affiliates", reflecting the name change of that company. Add upstream patch to fix zstd-dll build. Signed-off-by: Norbert Lange --- ...-zstd-dll-build-missing-dependencies.patch | 179 ++++++++++++++++++ package/zstd/zstd.hash | 6 +- package/zstd/zstd.mk | 2 +- 3 files changed, 183 insertions(+), 4 deletions(-) create mode 100644 package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch diff --git a/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch new file mode 100644 index 0000000000..bbb008c3b3 --- /dev/null +++ b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch @@ -0,0 +1,179 @@ +Fix zstd-dll build + +https://github.com/facebook/zstd/commit/c78f434aa4f5f1097c8edb975f4c1635817a5a71 + +Signed-off-by: Norbert Lange + +diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml +index 132dbb9961..9c70dda130 100644 +--- a/.github/workflows/dev-short-tests.yml ++++ b/.github/workflows/dev-short-tests.yml +@@ -55,6 +55,14 @@ jobs: + run: | + make c89build V=1 + ++ zstd-dll-test: ++ runs-on: ubuntu-latest ++ steps: ++ - uses: actions/checkout at ac593985615ec2ede58e132d2e21d2b1cbd6127c # tag=v3 ++ - name: build zstd bin against a dynamic lib (debuglevel for more dependencies) ++ run: | ++ make -C lib lib-mt-release ++ DEBUGLEVEL=2 make -C programs zstd-dll + + gcc-7-libzstd: + runs-on: ubuntu-latest +@@ -328,7 +336,6 @@ jobs: + make -j -C programs allVariants MOREFLAGS=-O0 + ./tests/test-variants.sh + +- + qemu-consistency: + name: QEMU ${{ matrix.name }} + runs-on: ubuntu-20.04 +diff --git a/lib/common/zstd_common.c b/lib/common/zstd_common.c +index 3208552475..3f04c22abf 100644 +--- a/lib/common/zstd_common.c ++++ b/lib/common/zstd_common.c +@@ -14,7 +14,6 @@ + * Dependencies + ***************************************/ + #define ZSTD_DEPS_NEED_MALLOC +-#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ + #include "error_private.h" + #include "zstd_internal.h" + +@@ -47,37 +46,3 @@ ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); } + /*! ZSTD_getErrorString() : + * provides error code string from enum */ + const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); } +- +- +- +-/*=************************************************************** +-* Custom allocator +-****************************************************************/ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) +- return customMem.customAlloc(customMem.opaque, size); +- return ZSTD_malloc(size); +-} +- +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) { +- /* calloc implemented as malloc+memset; +- * not as efficient as calloc, but next best guess for custom malloc */ +- void* const ptr = customMem.customAlloc(customMem.opaque, size); +- ZSTD_memset(ptr, 0, size); +- return ptr; +- } +- return ZSTD_calloc(1, size); +-} +- +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) +-{ +- if (ptr!=NULL) { +- if (customMem.customFree) +- customMem.customFree(customMem.opaque, ptr); +- else +- ZSTD_free(ptr); +- } +-} +diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h +index 37836dc703..2557ac703b 100644 +--- a/lib/common/zstd_internal.h ++++ b/lib/common/zstd_internal.h +@@ -24,6 +24,8 @@ + #include "mem.h" + #include "debug.h" /* assert, DEBUGLOG, RAWLOG, g_debuglevel */ + #include "error_private.h" ++#define ZSTD_DEPS_NEED_MALLOC ++#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ + #define ZSTD_STATIC_LINKING_ONLY + #include "../zstd.h" + #define FSE_STATIC_LINKING_ONLY +@@ -351,9 +353,34 @@ const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx); /* compress & dictBu + int ZSTD_seqToCodes(const seqStore_t* seqStorePtr); /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */ + + /* custom memory allocation functions */ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem); +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem); +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem); ++MEM_STATIC void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) ++ return customMem.customAlloc(customMem.opaque, size); ++ return ZSTD_malloc(size); ++} ++ ++MEM_STATIC void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) { ++ /* calloc implemented as malloc+memset; ++ * not as efficient as calloc, but next best guess for custom malloc */ ++ void* const ptr = customMem.customAlloc(customMem.opaque, size); ++ ZSTD_memset(ptr, 0, size); ++ return ptr; ++ } ++ return ZSTD_calloc(1, size); ++} ++ ++MEM_STATIC void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) ++{ ++ if (ptr!=NULL) { ++ if (customMem.customFree) ++ customMem.customFree(customMem.opaque, ptr); ++ else ++ ZSTD_free(ptr); ++ } ++} + + + /* ZSTD_invalidateRepCodes() : +diff --git a/programs/Makefile b/programs/Makefile +index fcff41dc1b..8507abef3f 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -225,7 +225,7 @@ zstd-noxz : zstd + .PHONY: zstd-dll + zstd-dll : LDFLAGS+= -L$(LIBZSTD) + zstd-dll : LDLIBS += -lzstd +-zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c ++zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c pool.c threading.c + zstd-dll : zstd + + +diff --git a/tests/Makefile b/tests/Makefile +index 3eed19ea80..778c7d6759 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -95,7 +95,7 @@ allnothread: fullbench fuzzer paramgrill datagen decodecorpus + dll: fuzzer-dll zstreamtest-dll + + .PHONY: zstd zstd32 zstd-nolegacy # only external makefile knows how to build or update them +-zstd zstd32 zstd-nolegacy: ++zstd zstd32 zstd-nolegacy zstd-dll: + $(MAKE) -C $(PRGDIR) $@ MOREFLAGS+="$(DEBUGFLAGS)" + + .PHONY: libzstd +@@ -328,13 +328,17 @@ test-all: test test32 test-decodecorpus-cli + test-zstd: ZSTD = $(PRGDIR)/zstd + test-zstd: zstd + ++.PHONY: test-zstd-dll ++test-zstd-dll: ZSTD = $(PRGDIR)/zstd ++test-zstd-dll: zstd-dll ++ + test-zstd32: ZSTD = $(PRGDIR)/zstd32 + test-zstd32: zstd32 + + test-zstd-nolegacy: ZSTD = $(PRGDIR)/zstd-nolegacy + test-zstd-nolegacy: zstd-nolegacy + +-test-zstd test-zstd32 test-zstd-nolegacy: datagen ++test-zstd test-zstd32 test-zstd-nolegacy test-zstd-dll: datagen + file $(ZSTD) + EXE_PREFIX="$(QEMU_SYS)" ZSTD_BIN="$(ZSTD)" DATAGEN_BIN=./datagen ./playTests.sh $(ZSTDRTTEST) + diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index eca44b89f0..ca4e2fa0b9 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,6 +1,6 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 -sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.gz.sha256 +sha256 0f470992aedad543126d06efab344dc5f3e171893810455787d38347343a4424 zstd-1.5.4.tar.gz # License files (locally computed) -sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE +sha256 7055266497633c9025b777c78eb7235af13922117480ed5c674677adc381c9d8 LICENSE sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 73bb97a793..45e8bf1bc2 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.2 +ZSTD_VERSION = 1.5.4 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 -- 2.39.1 From giulio.benetti at benettiengineering.com Wed Feb 15 20:09:01 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 15 Feb 2023 21:09:01 +0100 Subject: [Buildroot] [PATCH 1/2] configs/bananapi_m2_ultra_defconfig: bump Linux to 6.1 and U-Boot to 2023.01 Message-ID: <20230215200902.538238-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- configs/bananapi_m2_ultra_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 2ec0e60e8d..0f267021f8 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Ultra" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-ultra/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-r40-bananapi-m2-ultra" @@ -16,7 +16,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 15 20:09:02 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 15 Feb 2023 21:09:02 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Giulio Benetti as maintainer for board bananapi-m2-ultra In-Reply-To: <20230215200902.538238-1-giulio.benetti@benettiengineering.com> References: <20230215200902.538238-1-giulio.benetti@benettiengineering.com> Message-ID: <20230215200902.538238-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ef00ccef3f..7ab2bb5bff 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1135,10 +1135,12 @@ F: package/webp/ F: package/xapian/ N: Giulio Benetti +F: board/bananapi/bananapi-m2-ultra/ F: board/freescale/imxrt1050evk/* F: board/olimex/a* F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig +F: configs/bananapi_m2_ultra_defconfig F: configs/imxrt1050-evk_defconfig F: configs/olimex_a* F: package/at/ -- 2.34.1 From arnout at mind.be Wed Feb 15 20:19:53 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 21:19:53 +0100 Subject: [Buildroot] [PATCH buildroot-test 1/1] scripts/autobuild-run: add support for --branch option In-Reply-To: References: <20220607231211.533086-1-james.hilliard1@gmail.com> <20230208161527.31a28b3b@windsurf> Message-ID: On 09/02/2023 22:42, James Hilliard wrote: > On Thu, Feb 9, 2023 at 1:44 PM Arnout Vandecappelle wrote: >> >> >> >> On 09/02/2023 21:32, James Hilliard wrote: [snip] >>> There are many fixes related to various --no-toolchains-csv build failures >>> that would also need to be backported as well if even feasible. >> >> Even so, I'm much more inclined to rewrite the autobuild-run logic to >> dynamically test which options genrandconfig can take and adapt accordingly. > > The genrandconfig issue is only one of a number of issues that I've > seen come up, > there's been a rather long tail of lingering aarch64 compatibility > issues that sometimes > require major package updates. For example some systemd fixes for aarch64 build > hosts aren't really feasible to backport due to requiring major refactoring. If aarch64 build hosts are broken on the stable branches, that should be fixed, right? At the very least adding BR2_HOSTARCH dependencies... Anyway, with 2022.02 EOL in a bit more than a month, it probably doesn't matter any more... Regards, Arnout > What we probably eventually want is the ability to identify issues as build host > environment specific by rerunning failed builds on different hosts > automatically, > but that would probably require some infrastructure changes. > >> That way you don't have to manually maintain those branches and update them on >> each autobuilder instance. > > I'm pretty much just using this to restrict my autobuilders to master > branch when there > are known compatibility issues with older branches for a particular > host configuration. > >> >> Regards, >> Arnout >> >>> >>>> >>>> Regards, >>>> Arnout >>>> >>>>> on anything other than say master. >>>>> >>>>> To prevent testing of unwanted branches I could modify this to restrict >>>>> the branch override to only allow selecting the branches listed in: >>>>> http://autobuild.buildroot.org/branches >>>>> >>>>>> >>>>>> Thanks! >>>>>> >>>>>> Thomas >>>>>> -- >>>>>> Thomas Petazzoni, CTO, Bootlin >>>>>> Embedded Linux and Kernel engineering >>>>>> https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 15 20:22:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:22:09 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/x11r7/xwayland: new package In-Reply-To: <20230215143534.19834-1-raphael.pavlidis@gmail.com> References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> Message-ID: <20230215212209.269cd96d@windsurf> Hello On Wed, 15 Feb 2023 15:35:34 +0100 Raphael Pavlidis wrote: > XServer to run X clients under wayland > > This XServer is required to run the X clients under Wayland compositor, > for example weston or wlroots based compositors. > > Signed-off-by: Raphael Pavlidis Thanks for the patch! I have a few questions/suggestions below. > DEVELOPERS | 1 + > package/weston/Config.in | 8 +++ > package/weston/weston.mk | 2 +- > package/wlroots/Config.in | 12 ++++ > package/wlroots/wlroots.mk | 6 +- > package/x11r7/Config.in | 1 + > package/x11r7/xwayland/Config.in | 26 ++++++++ > package/x11r7/xwayland/xwayland.hash | 6 ++ > package/x11r7/xwayland/xwayland.mk | 94 ++++++++++++++++++++++++++++ > 9 files changed, 154 insertions(+), 2 deletions(-) This should probably be split into 3 patches: one adding the xwayland package, one tweaking the existing weston package, and one tweaking the wlroots package. > diff --git a/package/weston/Config.in b/package/weston/Config.in > index 3b4e932b7d..db12afc43a 100644 > --- a/package/weston/Config.in > +++ b/package/weston/Config.in > @@ -111,14 +111,22 @@ config BR2_PACKAGE_WESTON_XWAYLAND > bool "XWayland support" > depends on BR2_PACKAGE_XORG7 > depends on BR2_PACKAGE_LIBEPOXY > + depends on BR2_USE_MMU # xwayland > + depends on !BR2_STATIC_LIBS # xwayland > + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland > select BR2_PACKAGE_CAIRO > select BR2_PACKAGE_LIBXCB > select BR2_PACKAGE_XLIB_LIBX11 > select BR2_PACKAGE_XLIB_LIBXCURSOR > + select BR2_PACKAGE_XWAYLAND So does that means that the current BR2_PACKAGE_WESTON_XWAYLAND option is broken? I am rather confused by how XWayland works. Isn't XWayland a normal Wayland client? Why does Weston or wlroots, as Wayland compositors, need to have some support/knowledge for XWayland? > +config BR2_PACKAGE_WLROOTS_XWAYLAND > + bool "XWayland support" > + depends on BR2_PACKAGE_XORG7 # libxcb, xcb-util-wm, xwayland > + select BR2_PACKAGE_LIBXCB > + select BR2_PACKAGE_XCB_UTIL_WM > + select BR2_PACKAGE_XWAYLAND Since you're selecting BR2_PACKAGE_XWAYLAND, you need to replicate: depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # wayland depends on BR2_TOOLCHAIN_HAS_THREADS # wayland and add the corresponding Config.in comment. > diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk > index 4f14d20b11..5b930a51be 100644 > --- a/package/wlroots/wlroots.mk > +++ b/package/wlroots/wlroots.mk > @@ -30,8 +30,12 @@ WLROOTS_BACKENDS = libinput drm > > ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) > WLROOTS_BACKENDS += x11 > -WLROOTS_CONF_OPTS += -Dxwayland=enabled So this is also a bug in the current package? What is WLROOTS_X11 controlling then? Running wlroots as a X11 client? Otherwise, the xwayland package looks fine from a pure review point of view (I did not do any 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 Wed Feb 15 20:23:11 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 21:23:11 +0100 Subject: [Buildroot] Having trouble getting a simple cmake based custom package to work In-Reply-To: References: Message-ID: <40f6ba58-7cda-d062-960f-17ada0c85b24@mind.be> On 15/02/2023 01:10, Cem Sezer wrote: > Hello, > > I'm looking to continue this thread as I have the exact same problem. > > http://lists.busybox.net/pipermail/buildroot/2020-August/591250.html > > > The latest entry in the thread is the following, discussing the error message > "/No rule to make target 'install/fast': /is where I'm stuck at?the moment: > >>/However, when it is />/trying to install my package I have a new error. The system seems to be />/looking for a install/fast target, which the Makefil does not have. / > I have no idea on that problem. Maybe read the CMake docs again? > > https://cmake.org/cmake/help/latest/command/install.html > > Greets > Alex > > I am still new to cmake, but I've been having trouble getting a basic > helloworld?(in C) cmake package to work. I looked at that link above for the > cmake docs, but am unfamiliar with what I need to do here. My CMakeLists.txt > right now is just the following: > > cmake_minimum_required(VERSION 3.1.0) > > project(helloworld_c_cmake LANGUAGES C) > > set(SOURCES main.c) > > add_executable(${PROJECT_NAME} ${SOURCES}) Since there is no installation rule in the CMakeLists.txt, the install/fast target is not going to be generated. The link above to the cmake documentation explains how to add an installation rule. Regards, Arnout > > > Any pointers in the right direction would be appreciated. Perhaps this is more > of a cmake question than a buildroot question, but tying the two together has > been confusing, and I'm sure it must be something simple.?Thanks in advance, > > Cem > > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Wed Feb 15 20:48:36 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 21:48:36 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: fix relative toolchain_csv paths In-Reply-To: <20230208005343.2544457-1-james.hilliard1@gmail.com> References: <20230208005343.2544457-1-james.hilliard1@gmail.com> Message-ID: On 08/02/2023 01:53, James Hilliard wrote: > The default toolchain_csv path is a relative path to the buildroot > directory. > > If we run genrandconfig with a cwd that is not the buildroot directory > the default toolchain_csv path will be wrong. > > To fix this prepend the buildroot directory path to the toolchain_csv > path whenever the toolchain_csv path is not absolute. Well, a typical use case for running genrandconfig with a cwd that is not the buildroot directory could be from a br2-external, with a custom csv as argument. In that case, we actually *do* want the toolchains_csv to be interpreted relative to cwd rather than buildrootdir... Since people may already be relying on that behaviour, I think it would be better to fix it by just making the default one an absolute path, not anything passed explicitly through the commandline. Regards, Arnout > > Fixes: > FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' > > Signed-off-by: James Hilliard > --- > utils/genrandconfig | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/utils/genrandconfig b/utils/genrandconfig > index b3576f8a51..b96f2ee6de 100755 > --- a/utils/genrandconfig > +++ b/utils/genrandconfig > @@ -115,6 +115,9 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): > toolchain configuration is itself an array of lines of the defconfig. > """ > > + if not os.path.isabs(toolchains_csv): > + toolchains_csv = os.path.join(buildrootdir, toolchains_csv) > + > with open(toolchains_csv) as r: > # filter empty lines and comments > lines = [t for t in r.readlines() if len(t.strip()) > 0 and t[0] != '#'] From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:07 +0100 Subject: [Buildroot] [git commit] package/sysrepo: bump version to 2.2.36 Message-ID: <20230215205629.17ABE85C8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8972b7ec25c0c053eb62ce7ea445830b8aac394f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/sysrepo/sysrepo.hash | 2 +- package/sysrepo/sysrepo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index a90d8259bf..6a5e98f41b 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1bc866f13e41ba5e7e4acd52b5c3d42b1a2a1e032775e0a9b094f3265844cd25 sysrepo-2.2.12.tar.gz +sha256 bebb7901682eb23bf4c73d086d0a45c124ec751a67793a66024f1d4203425730 sysrepo-2.2.36.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 9da8c22ca2..6b031ae6f9 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.2.12 +SYSREPO_VERSION = 2.2.36 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:11 +0100 Subject: [Buildroot] [git commit] package/netopeer2: bump version to 2.1.49 Message-ID: <20230215205629.217B485C90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4cc59b5cb397ee79d1a8152540eec512354b1825 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/netopeer2/netopeer2.hash | 2 +- package/netopeer2/netopeer2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index cc71a2dab8..6a278fbbaf 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b166fe3425bb55b5f330fb7f53158f613bffc07493925ac437193e4d2defb3e7 netopeer2-2.1.42.tar.gz +sha256 2b1daac037f18c303e0c0dc3318ba30196459472e4c59f2f8547ee74d4cdf31d netopeer2-2.1.49.tar.gz sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 7cb9202575..47fcd31acd 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETOPEER2_VERSION = 2.1.42 +NETOPEER2_VERSION = 2.1.49 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) NETOPEER2_DL_SUBDIR = netopeer2 NETOPEER2_LICENSE = BSD-3-Clause From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:03 +0100 Subject: [Buildroot] [git commit] package/libyang: bump version to 2.1.30 Message-ID: <20230215205629.02B6C85C8B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69284602e6b93b069b8c99bd2499aef97bc09d47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libyang/libyang.hash | 2 +- package/libyang/libyang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index da8600351b..26a28d6eed 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f30ee1c3e13f0c5d25c4d2fb628e4b262b483d0a500464a7c12008ccc393a69e libyang-2.1.4.tar.gz +sha256 761cfd959342b147f6a43a84c931c7fde68dd3a1ad540a0e5302288b204f073d libyang-2.1.30.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 6c57a2dd42..f160035c09 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.1.4 +LIBYANG_VERSION = 2.1.30 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:13 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: drop Matt Weber Message-ID: <20230215205629.2BF5885C8B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b5b92019ba30aecdaa7ba34c255d15e0c0489e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master I regret that my work situation doesn't sustain me contributing. Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 105 ------------------------------------------------------------- 1 file changed, 105 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index df2b98ad53..72a56deb4c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1984,111 +1984,6 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ -N: Matt Weber -F: board/freescale/p* -F: board/freescale/t* -F: board/qemu/ppc64-e5500/ -F: configs/freescale_p* -F: configs/freescale_t* -F: configs/qemu_ppc64_e5500_defconfig -F: package/ace/ -F: package/argp-standalone/ -F: package/aufs/ -F: package/aufs-util/ -F: package/bc/ -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/ -F: package/davici/ -F: package/dnsmasq/ -F: package/dosfstools/ -F: package/eigen/ -F: package/ethtool/ -F: package/flashbench/ -F: package/fmc/ -F: package/fmlib/ -F: package/freeradius-server/ -F: package/git/ -F: package/gnutls/ -F: package/hostapd/ -F: package/i2c-tools/ -F: package/ifplugd/ -F: package/igmpproxy/ -F: package/iperf/ -F: package/iperf3/ -F: package/iputils/ -F: package/iw/ -F: package/jitterentropy-library/ -F: package/kvm-unit-tests/ -F: package/kvmtool/ -F: package/libcsv/ -F: package/libcurl/ -F: package/libeastl/ -F: package/libfcgi/ -F: package/libopenssl/ -F: package/libselinux/ -F: package/libsemanage/ -F: package/libsepol/ -F: package/libssh2/ -F: package/libtalloc/ -F: package/libqmi/ -F: package/lighttpd/ -F: package/logrotate/ -F: package/makedevs/ -F: package/memtester/ -F: package/mii-diag/ -F: package/mrouted/ -F: package/mtd/ -F: package/mtools/ -F: package/nginx-upload/ -F: package/omniorb/ -F: package/openresolv/ -F: package/paxtest/ -F: package/picocom/ -F: package/policycoreutils/ -F: package/proftpd/ -F: package/protobuf-c/ -F: package/protobuf/ -F: package/python-colorama/ -F: package/python-filelock/ -F: package/python-flask-cors/ -F: package/python-iptables/ -F: package/python-ipy/ -F: package/python-iwlib/ -F: package/python-posix-ipc/ -F: package/python-pycairo/ -F: package/python-pysftp/ -F: package/python-tinyrpc/ -F: package/python-txdbus/ -F: package/qoriq-rcw/ -F: package/raptor/ -F: package/rng-tools/ -F: package/rsyslog/ -F: package/setools/ -F: package/sloci-image/ -F: package/smcroute/ -F: package/tclap/ -F: package/tini/ -F: package/uboot-tools/ -F: package/unionfs/ -F: package/valijson/ -F: package/wpa_supplicant/ -F: package/wireless_tools/ -F: package/xen/ -F: package/xml-security-c/ -F: support/testing/tests/fs/test_oci.py -F: support/testing/tests/package/br2-external/clang-compiler-rt/ -F: support/testing/tests/package/br2-external/openjdk/ -F: support/testing/tests/package/test_clang.py -F: support/testing/tests/package/test_openjdk.py -F: support/testing/tests/package/test_opkg/ -F: support/testing/tests/package/test_opkg.py - N: Mauro Condarelli F: package/mc/ F: package/python-autobahn/ From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:05 +0100 Subject: [Buildroot] [git commit] package/libnetconf2: bump version to 2.1.28 Message-ID: <20230215205629.0DCE385C8D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d22988bfbdca479b18cce6a60b7d51b59e125a6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libnetconf2/libnetconf2.hash | 2 +- package/libnetconf2/libnetconf2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 34e934089e..675c76a500 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2f1a6559e8e43ea18ea337ab5f194f8443695c7ab4dde5d7b2560603f9bf702a libnetconf2-2.1.25.tar.gz +sha256 72e9a6461fadbd22f0cf0d23ba68d62b297c8f564f7f2bee069748fb67fc3a24 libnetconf2-2.1.28.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 0d4294d8d3..e349c1bce4 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 2.1.25 +LIBNETCONF2_VERSION = 2.1.28 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause From thomas.petazzoni at bootlin.com Wed Feb 15 20:57:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:57:43 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: drop Matt Weber In-Reply-To: <20230214180505.3691-1-matthew.weber@collins.com> References: <20230214180505.3691-1-matthew.weber@collins.com> Message-ID: <20230215215743.0a03d0fc@windsurf> Hello Matt, On Tue, 14 Feb 2023 18:05:05 +0000 Matthew Weber via buildroot wrote: > From: Matthew Weber > > I regret that my work situation doesn't sustain me contributing. > > Signed-off-by: Matthew Weber > --- > DEVELOPERS | 105 ----------------------------------------------------- > 1 file changed, 105 deletions(-) Of course sad to see that you no longer have the opportunity to work on Buildroot, but thanks for all the contributions done in the past, and all the best! Patch applied to master, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 15 20:58:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:58:02 +0100 Subject: [Buildroot] [PATCH 1/4] package/libyang: bump version to 2.1.30 In-Reply-To: <20230213181944.10292-1-heiko.thiery@gmail.com> References: <20230213181944.10292-1-heiko.thiery@gmail.com> Message-ID: <20230215215802.5b07d0f8@windsurf> On Mon, 13 Feb 2023 19:19:43 +0100 Heiko Thiery wrote: > Signed-off-by: Heiko Thiery > --- > package/libyang/libyang.hash | 2 +- > package/libyang/libyang.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Series applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 15 20:59:50 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 21:59:50 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain/helper: check the arch sysroot In-Reply-To: <20230211182839.3841661-1-romain.naour@gmail.com> References: <20230211182839.3841661-1-romain.naour@gmail.com> Message-ID: <0ccfb474-6609-3674-00ab-10aabda9748d@mind.be> On 11/02/2023 19:28, Romain Naour wrote: > Since the commit [1], the utils/genrandconfig script improved the > configuration randomization used by autobuilders. Since then it can > generate a configuration that is not suitable for an external toolchain > such the "Codescape IMG GNU Linux Toolchain". > > Indeed this toolchain can be selected for mips32r5 or mips64r5 while only > mips32r2 or mips64r2 are really supported. The toolchain issue will be > fixed in a followup change. > > We want to catch such issue in check_unusable_toolchain function otherwise > it is detected late during the sysroot import into staging and trigger > a weird error message: > > ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory > ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot/usr//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory > > This is similar test than for the main sysroot check but this time we have > to use the toolchain cflags to check the architecture sysroot. > > If the architecture sysroot doesn't exist, the toolchain will reply with > "libc.a". > > Either the toolchain is really broken or we used a wrong target > architecture variant. In the later case, the toolchain infrastructure will > print a meaningful error message. > > Note: We also may get a similar issue using the toolchain-external-custom package > if a toolchain is used with a wrong target architecture variant. > > Fixes: > http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ > > [1] aeee90ec109b83c42779e6a2617f7d57e25a2b65 > > Signed-off-by: Romain Naour > Cc: Giulio Benetti > Cc: Thomas De Schampheleire > Cc: Thomas Petazzoni Both applied to master, thanks. Regards, Arnout > --- > Note: We should improve the Buildroot testsuite to test the toolchain wrapper > corner cases. > --- > toolchain/helpers.mk | 11 +++++++++++ > .../toolchain-external/pkg-toolchain-external.mk | 2 +- > 2 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk > index 1cd7494fdb..24c482923a 100644 > --- a/toolchain/helpers.mk > +++ b/toolchain/helpers.mk > @@ -422,12 +422,16 @@ check_cross_compiler_exists = \ > # the host tuple. > # - Exclude distro-class toolchains which are not relocatable. > # - Exclude broken toolchains which return "libc.a" with -print-file-name. > +# - Exclude toolchains used with wrong toolchain cflags or broken toolchains > +# which return "libc.a" with -print-file-name and toolchain cflags. > # - Exclude toolchains which doesn't support --sysroot option. > # > # $1: cross-gcc path > +# $1: toolchain cflags > # > check_unusable_toolchain = \ > __CROSS_CC=$(strip $1) ; \ > + __TOOLCHAIN_CFLAGS=$(strip $2) ; \ > vendor=`$${__CROSS_CC} -dumpmachine | cut -f2 -d'-'` ; \ > if test "$${vendor}" = "angstrom" ; then \ > echo "Angstrom toolchains are not pure toolchains: they contain" ; \ > @@ -449,6 +453,13 @@ check_unusable_toolchain = \ > echo "Unable to detect the toolchain sysroot, Buildroot cannot use this toolchain." ; \ > exit 1 ; \ > fi ; \ > + libc_a_archsysroot_path=`$${__CROSS_CC} $${__TOOLCHAIN_CFLAGS} -print-file-name=libc.a` ; \ > + if test "$${libc_a_archsysroot_path}" = "libc.a" ; then \ > + echo "Unable to detect the toolchain architecture sysroot." ; \ > + echo "Please check the Target Architecture Variant selected, the toolchains may not support it." ; \ > + echo "Buildroot cannot use this toolchain." ; \ > + exit 1 ; \ > + fi; \ > sysroot_dir="$(call toolchain_find_sysroot,$${__CROSS_CC})" ; \ > if test -z "$${sysroot_dir}" ; then \ > echo "External toolchain doesn't support --sysroot. Cannot use." ; \ > diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk > index 299b6008aa..c37f3500d9 100644 > --- a/toolchain/toolchain-external/pkg-toolchain-external.mk > +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk > @@ -563,7 +563,7 @@ endif > # kernel headers version, type of C library and all C library features. > define $(2)_CONFIGURE_CMDS > $$(Q)$$(call check_cross_compiler_exists,$$(TOOLCHAIN_EXTERNAL_CC)) > - $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC)) > + $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC),"$$(TOOLCHAIN_EXTERNAL_CFLAGS)") > $$(Q)SYSROOT_DIR="$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC))" ; \ > $$(call check_kernel_headers_version,\ > $$(BUILD_DIR),\ From thomas.petazzoni at bootlin.com Wed Feb 15 21:00:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:00:26 +0100 Subject: [Buildroot] [RFC PATCH] package/Config.in: move all Wireless Driver into a separate menu and enable them only if architecture s390x is not used In-Reply-To: <20230214120808.1282621-1-giulio.benetti@benettiengineering.com> References: <20230214120808.1282621-1-giulio.benetti@benettiengineering.com> Message-ID: <20230215220026.1a771114@windsurf> On Tue, 14 Feb 2023 13:08:08 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti > --- > package/Config.in | 28 ++++++++++++++++------------ > 1 file changed, 16 insertions(+), 12 deletions(-) Why not, but then you need to change all the existing packages that have a !S390 dependency to remove it, as it becomes redundant. However, I feel like the dependency is more "obvious" if it is in each package. I know it's a bit of redundancy, but it is less "strange" than having it in package/Config.in. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 15 21:00:04 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:00:04 +0100 Subject: [Buildroot] [git commit] toolchain/helper: check the arch sysroot Message-ID: <20230215210047.1CEBC85D23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4433ad8f5c88fafe3f0aebbaff1abdae17aadcb7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since the commit [1], the utils/genrandconfig script improved the configuration randomization used by autobuilders. Since then it can generate a configuration that is not suitable for an external toolchain such the "Codescape IMG GNU Linux Toolchain". Indeed this toolchain can be selected for mips32r5 or mips64r5 while only mips32r2 or mips64r2 are really supported. The toolchain issue will be fixed in a followup change. We want to catch such issue in check_unusable_toolchain function otherwise it is detected late during the sysroot import into staging and trigger a weird error message: ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot/usr//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory This is similar test than for the main sysroot check but this time we have to use the toolchain cflags to check the architecture sysroot. If the architecture sysroot doesn't exist, the toolchain will reply with "libc.a". Either the toolchain is really broken or we used a wrong target architecture variant. In the later case, the toolchain infrastructure will print a meaningful error message. Note: We also may get a similar issue using the toolchain-external-custom package if a toolchain is used with a wrong target architecture variant. Fixes: http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ [1] aeee90ec109b83c42779e6a2617f7d57e25a2b65 Signed-off-by: Romain Naour Cc: Giulio Benetti Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- toolchain/helpers.mk | 11 +++++++++++ toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 1cd7494fdb..24c482923a 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -422,12 +422,16 @@ check_cross_compiler_exists = \ # the host tuple. # - Exclude distro-class toolchains which are not relocatable. # - Exclude broken toolchains which return "libc.a" with -print-file-name. +# - Exclude toolchains used with wrong toolchain cflags or broken toolchains +# which return "libc.a" with -print-file-name and toolchain cflags. # - Exclude toolchains which doesn't support --sysroot option. # # $1: cross-gcc path +# $1: toolchain cflags # check_unusable_toolchain = \ __CROSS_CC=$(strip $1) ; \ + __TOOLCHAIN_CFLAGS=$(strip $2) ; \ vendor=`$${__CROSS_CC} -dumpmachine | cut -f2 -d'-'` ; \ if test "$${vendor}" = "angstrom" ; then \ echo "Angstrom toolchains are not pure toolchains: they contain" ; \ @@ -449,6 +453,13 @@ check_unusable_toolchain = \ echo "Unable to detect the toolchain sysroot, Buildroot cannot use this toolchain." ; \ exit 1 ; \ fi ; \ + libc_a_archsysroot_path=`$${__CROSS_CC} $${__TOOLCHAIN_CFLAGS} -print-file-name=libc.a` ; \ + if test "$${libc_a_archsysroot_path}" = "libc.a" ; then \ + echo "Unable to detect the toolchain architecture sysroot." ; \ + echo "Please check the Target Architecture Variant selected, the toolchains may not support it." ; \ + echo "Buildroot cannot use this toolchain." ; \ + exit 1 ; \ + fi; \ sysroot_dir="$(call toolchain_find_sysroot,$${__CROSS_CC})" ; \ if test -z "$${sysroot_dir}" ; then \ echo "External toolchain doesn't support --sysroot. Cannot use." ; \ diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 299b6008aa..c37f3500d9 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -563,7 +563,7 @@ endif # kernel headers version, type of C library and all C library features. define $(2)_CONFIGURE_CMDS $$(Q)$$(call check_cross_compiler_exists,$$(TOOLCHAIN_EXTERNAL_CC)) - $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC)) + $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC),"$$(TOOLCHAIN_EXTERNAL_CFLAGS)") $$(Q)SYSROOT_DIR="$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC))" ; \ $$(call check_kernel_headers_version,\ $$(BUILD_DIR),\ From arnout at mind.be Wed Feb 15 21:00:05 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:00:05 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-codescape-mti-mips: remove wrong MIPS32r5 and MIPS64r5 support Message-ID: <20230215210047.2A1F685D32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8eee178355cafa156d93bdc0cd447618dd1a1abc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This toolchain doesn't support MIPS32r5 and MIPS64r5 and the toolchain infrastructure fail to import the sysroot to staging. Fixes: c4a62fa6278058461ff9e501ba6e822486453493 Fixes: http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- .../toolchain-external/toolchain-external-codescape-mti-mips/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index c58c55119a..8217ddc38c 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -3,8 +3,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) || \ - BR2_MIPS_CPU_MIPS32R5 || (BR2_MIPS_CPU_MIPS64R5 && !BR2_MIPS_SOFT_FLOAT) + depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 From thomas.petazzoni at bootlin.com Wed Feb 15 21:02:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:02:53 +0100 Subject: [Buildroot] [PATCH] package/rtl8821cu: disable package for s390x architecture In-Reply-To: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> References: <20230214105033.1042139-1-giulio.benetti@benettiengineering.com> Message-ID: <20230215220253.7f688e55@windsurf> On Tue, 14 Feb 2023 11:50:33 +0100 Giulio Benetti wrote: > s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this > package for this architecture. > > Fixes: > http://autobuild.buildroot.net/results/3a74d393cdbc308eab9ec3f0f9e420947669a0ea/ > > Signed-off-by: Giulio Benetti > --- > package/rtl8821cu/Config.in | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Note: I have seen the discussion that Yann started, and I replied on your other patch proposal. For now I have applied this patch as-is because it fixes an autobuilder issue: it is the most obvious/immediate fix we have. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 15 21:14:20 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:14:20 +0100 Subject: [Buildroot] [git commit] package/pkg-golang: disable version control information Message-ID: <20230215211512.67B3985D35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c3a1f0fe1b912727bb7b5baebe938f75036e566b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master By default go tries to include version control (VCS) information in binaries. Since Buildroot separates version control from the build process it is sensible to disable this behavior. This avoids build errors when building with a git repository higher up in the tree owned by root. In this case the go build system calls `git status --porcelain` which returns with an error: fatal: detected dubious ownership in repository at '/build' Signed-off-by: Stefan Agner Reviewed-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/pkg-golang.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index cdc67b32c0..da9c9a21ac 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -45,7 +45,8 @@ $(2)_BUILD_OPTS += \ -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ - -p $$(PARALLEL_JOBS) + -p $$(PARALLEL_JOBS) \ + -buildvcs=false # Target packages need the Go compiler on the host at download time (for # vendoring), and at build and install time. From arnout at mind.be Wed Feb 15 21:15:17 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:15:17 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: disable version control information In-Reply-To: <12a7772dc9c30d31bc4dd7a4e15ca12425c14834.1676297701.git.stefan@agner.ch> References: <12a7772dc9c30d31bc4dd7a4e15ca12425c14834.1676297701.git.stefan@agner.ch> Message-ID: <3210b93a-49ea-4be4-143c-fd6f578d3435@mind.be> On 13/02/2023 15:15, Stefan Agner wrote: > By default go tries to include version control (VCS) information in > binaries. Since Buildroot separates version control from the build > process it is sensible to disable this behavior. > > This avoids build errors when building with a git repository higher > up in the tree owned by root. In this case the go build system > calls `git status --porcelain` which returns with an error: > fatal: detected dubious ownership in repository at '/build' > > Signed-off-by: Stefan Agner Applied to master, thanks. Regards, Arnout > --- > package/pkg-golang.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk > index cdc67b32c0..da9c9a21ac 100644 > --- a/package/pkg-golang.mk > +++ b/package/pkg-golang.mk > @@ -45,7 +45,8 @@ $(2)_BUILD_OPTS += \ > -modcacherw \ > -tags "$$($(2)_TAGS)" \ > -trimpath \ > - -p $$(PARALLEL_JOBS) > + -p $$(PARALLEL_JOBS) \ > + -buildvcs=false > > # Target packages need the Go compiler on the host at download time (for > # vendoring), and at build and install time. From james.hilliard1 at gmail.com Wed Feb 15 21:15:31 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 15 Feb 2023 14:15:31 -0700 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: make default toolchain_csv path absolute Message-ID: <20230215211531.331246-1-james.hilliard1@gmail.com> The default toolchain_csv path is a relative path to the buildroot directory. If we run genrandconfig with a cwd that is not the buildroot directory the default toolchain_csv path will be wrong. To fix this make the default toolchain_csv path absolute. Fixes: FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' Signed-off-by: James Hilliard --- Changes v1 -> v2: - set default path as absolute --- utils/genrandconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index b3576f8a51..3552b83694 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -801,7 +801,9 @@ if __name__ == '__main__': dest="toolchains_csv", help="Generate random toolchain configuration", action='store_false') - parser.set_defaults(toolchains_csv="support/config-fragments/autobuild/toolchain-configs.csv") + buildroot_abs = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + parser.set_defaults(toolchains_csv=os.path.join(buildroot_abs, + "support/config-fragments/autobuild/toolchain-configs.csv")) args = parser.parse_args() -- 2.34.1 From james.hilliard1 at gmail.com Wed Feb 15 21:18:02 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 15 Feb 2023 14:18:02 -0700 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: fix relative toolchain_csv paths In-Reply-To: References: <20230208005343.2544457-1-james.hilliard1@gmail.com> Message-ID: On Wed, Feb 15, 2023 at 1:48 PM Arnout Vandecappelle wrote: > > > > On 08/02/2023 01:53, James Hilliard wrote: > > The default toolchain_csv path is a relative path to the buildroot > > directory. > > > > If we run genrandconfig with a cwd that is not the buildroot directory > > the default toolchain_csv path will be wrong. > > > > To fix this prepend the buildroot directory path to the toolchain_csv > > path whenever the toolchain_csv path is not absolute. > > Well, a typical use case for running genrandconfig with a cwd that is not the > buildroot directory could be from a br2-external, with a custom csv as argument. > In that case, we actually *do* want the toolchains_csv to be interpreted > relative to cwd rather than buildrootdir... > > Since people may already be relying on that behaviour, I think it would be > better to fix it by just making the default one an absolute path, not anything > passed explicitly through the commandline. Changed the default to an absolute path in v2: https://patchwork.ozlabs.org/project/buildroot/patch/20230215211531.331246-1-james.hilliard1 at gmail.com/ > > Regards, > Arnout > > > > > Fixes: > > FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' > > > > Signed-off-by: James Hilliard > > --- > > utils/genrandconfig | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/utils/genrandconfig b/utils/genrandconfig > > index b3576f8a51..b96f2ee6de 100755 > > --- a/utils/genrandconfig > > +++ b/utils/genrandconfig > > @@ -115,6 +115,9 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): > > toolchain configuration is itself an array of lines of the defconfig. > > """ > > > > + if not os.path.isabs(toolchains_csv): > > + toolchains_csv = os.path.join(buildrootdir, toolchains_csv) > > + > > with open(toolchains_csv) as r: > > # filter empty lines and comments > > lines = [t for t in r.readlines() if len(t.strip()) > 0 and t[0] != '#'] From arnout at mind.be Wed Feb 15 21:20:16 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:20:16 +0100 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: make default toolchain_csv path absolute In-Reply-To: <20230215211531.331246-1-james.hilliard1@gmail.com> References: <20230215211531.331246-1-james.hilliard1@gmail.com> Message-ID: On 15/02/2023 22:15, James Hilliard wrote: > The default toolchain_csv path is a relative path to the buildroot > directory. > > If we run genrandconfig with a cwd that is not the buildroot directory > the default toolchain_csv path will be wrong. > > To fix this make the default toolchain_csv path absolute. > > Fixes: > FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - set default path as absolute > --- > utils/genrandconfig | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/utils/genrandconfig b/utils/genrandconfig > index b3576f8a51..3552b83694 100755 > --- a/utils/genrandconfig > +++ b/utils/genrandconfig > @@ -801,7 +801,9 @@ if __name__ == '__main__': > dest="toolchains_csv", > help="Generate random toolchain configuration", > action='store_false') > - parser.set_defaults(toolchains_csv="support/config-fragments/autobuild/toolchain-configs.csv") > + buildroot_abs = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) > + parser.set_defaults(toolchains_csv=os.path.join(buildroot_abs, > + "support/config-fragments/autobuild/toolchain-configs.csv")) Sorry, that's not going to work either (if it was that easy I'd done it myself :-) buildrootdir can be set to something else with the -b argument, and we want it relative to *that* one of course. Regards, Arnout > > args = parser.parse_args() > From giulio.benetti at benettiengineering.com Wed Feb 15 21:24:42 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 15 Feb 2023 22:24:42 +0100 Subject: [Buildroot] [RFC PATCH] package/Config.in: move all Wireless Driver into a separate menu and enable them only if architecture s390x is not used In-Reply-To: <20230215220026.1a771114@windsurf> References: <20230214120808.1282621-1-giulio.benetti@benettiengineering.com> <20230215220026.1a771114@windsurf> Message-ID: <25265a89-2f7a-4db5-0f15-ef66c48b3b63@benettiengineering.com> On 15/02/23 22:00, Thomas Petazzoni via buildroot wrote: > On Tue, 14 Feb 2023 13:08:08 +0100 > Giulio Benetti wrote: > >> Signed-off-by: Giulio Benetti >> --- >> package/Config.in | 28 ++++++++++++++++------------ >> 1 file changed, 16 insertions(+), 12 deletions(-) > > Why not, but then you need to change all the existing packages that > have a !S390 dependency to remove it, as it becomes redundant. yes, that wouldn't be a problem, it would be part of this patch > However, I feel like the dependency is more "obvious" if it is in each > package. I know it's a bit of redundancy, but it is less "strange" than > having it in package/Config.in. But this way we kill two birds with one stone for dependencies and in the future I see more probable having people adding external Wireless Drivers to that menu, so it will inherits the dependency. And in any case there are already some dependencies in package/Config.in like !BR2_STATIC_LIBS and other BR2_PACKAGE_, 18 if statements in total. I'm wondering also if it would make sense to create many Config.in.* for every top-level menu in package/ like: $ ls buildroot/package/Config.in* package/Config.in package/Config.in.audio-video-app package/Config.in.comp-decop package/Config.in.host ... The only con is to check for packages in multiple Config.in.* but it's already like that with Config.in.host. The pro we could have instead is to "hide" the dependency checking on a specific Config.in.X Nothing special on the final result but maybe it would be more user-friendly. Just my 2 cents Best regards -- Giulio Benetti CEO/CTO at Benetti Engineering sas From arnout at mind.be Wed Feb 15 21:24:48 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:24:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: compress-offload needs kernel >= 5.7 In-Reply-To: <20230213181120.907459-1-fontaine.fabrice@gmail.com> References: <20230213181120.907459-1-fontaine.fabrice@gmail.com> Message-ID: <242cceb0-476d-3a5b-5dcf-fc16b2ecf906@mind.be> On 13/02/2023 19:11, Fabrice Fontaine wrote: > SND_AUDIOCODEC_A{LAC,PE} are only available since kernel 5.7 and > https://github.com/torvalds/linux/commit/0f546d6f0292fb624b4cf0cc70096ddb9ea070e6 > resulting in the following build failure since bump to version 0.3.65 > in commit 247e2d0eb1e60f483044d58bed58c5ed321528f7 and > https://git.buildroot.net/buildroot/commit/?id=247e2d0eb1e60f483044d58bed58c5ed321528f7: > > ../spa/plugins/alsa/alsa-compress-offload-sink.c:183:11: error: 'SND_AUDIOCODEC_ALAC' undeclared here (not in a function); did you mean 'SND_AUDIOCODEC_AAC'? > 183 | { SND_AUDIOCODEC_ALAC, }, > | ^~~~~~~~~~~~~~~~~~~ > | SND_AUDIOCODEC_AAC > > Moreover, flac_d is also only available since kernel 5.5 and > https://github.com/torvalds/linux/commit/d2522335c92c090bf58531a2b696d7fe80ab2a7a > > Fixes: > - http://autobuild.buildroot.org/results/9ecd9aca5edc3756154da59573157954f06e6537 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/pipewire/Config.in | 12 ++++++++++++ > package/pipewire/pipewire.mk | 2 +- > 2 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/package/pipewire/Config.in b/package/pipewire/Config.in > index f038291e87..4929e5d3d1 100644 > --- a/package/pipewire/Config.in > +++ b/package/pipewire/Config.in > @@ -15,6 +15,18 @@ config BR2_PACKAGE_PIPEWIRE > > if BR2_PACKAGE_PIPEWIRE > > +config BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD > + bool "pipewire Compress-Offload" > + depends on !BR2_STATIC_LIBS # tinycompress > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 > + select BR2_PACKAGE_TINYCOMPRESS > + help > + Enable ALSA Compress-Offload support > + > +comment "pipewire Compress-Offload needs a toolchain w/ dynamic library, headers >= 5.7" > + depends on BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 > + > config BR2_PACKAGE_PIPEWIRE_EXAMPLES > bool "pipewire examples" > help > diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk > index 976d7783b9..ecf4a035ec 100644 > --- a/package/pipewire/pipewire.mk > +++ b/package/pipewire/pipewire.mk > @@ -215,7 +215,7 @@ else > PIPEWIRE_CONF_OPTS += -Dsdl2=disabled > endif > > -ifeq ($(BR2_PACKAGE_TINYCOMPRESS),y) > +ifeq ($(BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD),y) > PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled > PIPEWIRE_DEPENDENCIES += tinycompress > else From arnout at mind.be Wed Feb 15 21:23:17 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:23:17 +0100 Subject: [Buildroot] [git commit] package/pipewire: compress-offload needs kernel >= 5.7 Message-ID: <20230215212500.F29DD85D87@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=854314d15361dc3b69b97ee29d483ee920b9098f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master SND_AUDIOCODEC_A{LAC,PE} are only available since kernel 5.7 and https://github.com/torvalds/linux/commit/0f546d6f0292fb624b4cf0cc70096ddb9ea070e6 resulting in the following build failure since bump to version 0.3.65 in commit 247e2d0eb1e60f483044d58bed58c5ed321528f7 and https://git.buildroot.net/buildroot/commit/?id=247e2d0eb1e60f483044d58bed58c5ed321528f7: ../spa/plugins/alsa/alsa-compress-offload-sink.c:183:11: error: 'SND_AUDIOCODEC_ALAC' undeclared here (not in a function); did you mean 'SND_AUDIOCODEC_AAC'? 183 | { SND_AUDIOCODEC_ALAC, }, | ^~~~~~~~~~~~~~~~~~~ | SND_AUDIOCODEC_AAC Moreover, flac_d is also only available since kernel 5.5 and https://github.com/torvalds/linux/commit/d2522335c92c090bf58531a2b696d7fe80ab2a7a Take this opportunity to make compress offload an explicit option rather than automatic based on the availability of tinycompress. The relationship between them is not obvious. Fixes: - http://autobuild.buildroot.org/results/9ecd9aca5edc3756154da59573157954f06e6537 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/pipewire/Config.in | 12 ++++++++++++ package/pipewire/pipewire.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/pipewire/Config.in b/package/pipewire/Config.in index f038291e87..4929e5d3d1 100644 --- a/package/pipewire/Config.in +++ b/package/pipewire/Config.in @@ -15,6 +15,18 @@ config BR2_PACKAGE_PIPEWIRE if BR2_PACKAGE_PIPEWIRE +config BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD + bool "pipewire Compress-Offload" + depends on !BR2_STATIC_LIBS # tinycompress + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + select BR2_PACKAGE_TINYCOMPRESS + help + Enable ALSA Compress-Offload support + +comment "pipewire Compress-Offload needs a toolchain w/ dynamic library, headers >= 5.7" + depends on BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + config BR2_PACKAGE_PIPEWIRE_EXAMPLES bool "pipewire examples" help diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 976d7783b9..ecf4a035ec 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -215,7 +215,7 @@ else PIPEWIRE_CONF_OPTS += -Dsdl2=disabled endif -ifeq ($(BR2_PACKAGE_TINYCOMPRESS),y) +ifeq ($(BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD),y) PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled PIPEWIRE_DEPENDENCIES += tinycompress else From james.hilliard1 at gmail.com Wed Feb 15 21:29:08 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 15 Feb 2023 14:29:08 -0700 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: make default toolchain_csv path absolute In-Reply-To: References: <20230215211531.331246-1-james.hilliard1@gmail.com> Message-ID: On Wed, Feb 15, 2023 at 2:20 PM Arnout Vandecappelle wrote: > > > > On 15/02/2023 22:15, James Hilliard wrote: > > The default toolchain_csv path is a relative path to the buildroot > > directory. > > > > If we run genrandconfig with a cwd that is not the buildroot directory > > the default toolchain_csv path will be wrong. > > > > To fix this make the default toolchain_csv path absolute. > > > > Fixes: > > FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' > > > > Signed-off-by: James Hilliard > > --- > > Changes v1 -> v2: > > - set default path as absolute > > --- > > utils/genrandconfig | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/utils/genrandconfig b/utils/genrandconfig > > index b3576f8a51..3552b83694 100755 > > --- a/utils/genrandconfig > > +++ b/utils/genrandconfig > > @@ -801,7 +801,9 @@ if __name__ == '__main__': > > dest="toolchains_csv", > > help="Generate random toolchain configuration", > > action='store_false') > > - parser.set_defaults(toolchains_csv="support/config-fragments/autobuild/toolchain-configs.csv") > > + buildroot_abs = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) > > + parser.set_defaults(toolchains_csv=os.path.join(buildroot_abs, > > + "support/config-fragments/autobuild/toolchain-configs.csv")) > > Sorry, that's not going to work either (if it was that easy I'd done it myself :-) Under what scenario would this break? > > buildrootdir can be set to something else with the -b argument, and we want it > relative to *that* one of course. Using buildrootdir is cwd dependent, the approach I used is not as it uses the absolute path of the genrandconfig file to compute the default toolchain_csv abs path. > > Regards, > Arnout > > > > > args = parser.parse_args() > > From arnout at mind.be Wed Feb 15 21:28:58 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:28:58 +0100 Subject: [Buildroot] [git commit] docs/manual: add 'menuconfig' to out-of-tree examples Message-ID: <20230215213211.C420185EA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c77e31e0b360fffbd893807ccfbc4f35bf2558d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master If the examples given for launching an out-of-tree build are executed as-is, this will result in the error message Please configure Buildroot first (e.g. "make menuconfig") Even if "make menuconfig" was run before, it's still not going to work because the out-of-tree build doesn't use the in-tree .config. Therefore, the example really should start with some config option. Since "make menuconfig" is used in most other examples of creating a config, use that here as well. Extend both examples with "menuconfig". Reported-by: AndreiCherniaev Signed-off-by: Arnout Vandecappelle --- docs/manual/common-usage.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt index 9abd3799dd..bc78f4a871 100644 --- a/docs/manual/common-usage.txt +++ b/docs/manual/common-usage.txt @@ -30,13 +30,13 @@ the Linux kernel. To use it, add +O=+ to the make command line: -------------------- - $ make O=/tmp/build + $ make O=/tmp/build menuconfig -------------------- Or: -------------------- - $ cd /tmp/build; make O=$PWD -C path/to/buildroot + $ cd /tmp/build; make O=$PWD -C path/to/buildroot menuconfig -------------------- All the output files will be located under +/tmp/build+. If the +O+ From arnout at mind.be Wed Feb 15 21:35:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:35:31 +0100 Subject: [Buildroot] [PATCH] Makefile: add good message when user try make O=$PWD -C path/to/buildroot without cd /tmp/build In-Reply-To: <20230109050525.1560963-1-cherniaev.andrei@kairo.space> References: <20230109050525.1560963-1-cherniaev.andrei@kairo.space> Message-ID: <09f2453a-b72a-211b-230e-f09ae0a53385@mind.be> Hi Andrei, On 09/01/2023 06:05, AndreiCherniaev wrote: > From: AndreiCherniaev > > https://buildroot.org/downloads/manual/manual.html > There is "8.5.?Building out-of-tree". There is example of using > $ cd /tmp/build; make O=$PWD -C path/to/buildroot > but when user ignore cd /tmp/build; there is message > "error Please configure Buildroot first (e.g. "make menuconfig")" > but this message is not correct. I suggest a new message in this case. This is message from my PC: > "error Please go to your output directory first (e.g. "cd /home/username/Downloads/myGit/buildroot_O_bug/O_folder; make menuconfig")" That doesn't really address the problem - I think the real problem is that the example doesn't make it clear you need to run menuconfig (or another config) as the first 'make' invocation. So instead, I updated the manual to add "menuconfig" in the two examples given for out-of-tree builds. I believe that with that, the "e.g. make menuconfig" in the error is sufficiently clear. It's obvious that you need to repeat the O=... IMHO. Thank you for the report however! Regards, Arnout > > Signed-off-by: AndreiCherniaev > --- > Makefile | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 88f90cd2fa..176be12ac4 100644 > --- a/Makefile > +++ b/Makefile > @@ -945,7 +945,11 @@ else # ifeq ($(BR2_HAVE_DOT_CONFIG),y) > # Also for 'all' we error out and ask the user to configure first. > .PHONY: linux toolchain > linux toolchain all: outputmakefile > - $(error Please configure Buildroot first (e.g. "make menuconfig")) > + ifeq ($(NEED_WRAPPER),y) # ifeq ("$(origin O)", "command line") # O := $(CURDIR)/output > + $(error Please go to your output directory first (e.g. "cd $(O); make menuconfig")) > + else > + $(error Please configure Buildroot first (e.g. "make menuconfig")) > + endif > @exit 1 > > endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y) From thomas.petazzoni at bootlin.com Wed Feb 15 21:37:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:37:52 +0100 Subject: [Buildroot] [git commit] package/rtl8821cu: disable package for s390x architecture Message-ID: <20230215213813.11A1F85EB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92f545da0b60a0c82f8f0e8b0e69e30268f0e9f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this package for this architecture. Fixes: http://autobuild.buildroot.net/results/3a74d393cdbc308eab9ec3f0f9e420947669a0ea/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8821cu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rtl8821cu/Config.in b/package/rtl8821cu/Config.in index a5a7b9d255..00a41b5196 100644 --- a/package/rtl8821cu/Config.in +++ b/package/rtl8821cu/Config.in @@ -1,8 +1,10 @@ comment "rtl8821cu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_RTL8821CU bool "rtl8821cu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help rtl8821cu wifi driver From thomas.petazzoni at bootlin.com Wed Feb 15 21:37:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:37:52 +0100 Subject: [Buildroot] [git commit] package/rtl8812au-aircrack-ng: bump to 2023-02-03 version to fix build failure with Linux 6.1 Message-ID: <20230215213813.1C30185EB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d69ea9664f067e5660e13ddf65c52df46f2eca07 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/e128298929fce31374687a566e50b00c150131b8/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index bc3a926314..cdf5f3b4e2 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eed4888da9cfdc0f83ad3335beaf73af33ce0796b0a2637aeec102d47e1eb8f0 rtl8812au-aircrack-ng-e7a4a390ccbdd768411e1b2a8922c47837f76b47.tar.gz +sha256 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index 45a6ce5729..ab3ebe2077 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = e7a4a390ccbdd768411e1b2a8922c47837f76b47 +RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 15 21:38:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:38:33 +0100 Subject: [Buildroot] [PATCH] package/flannel: use the github helper In-Reply-To: <20230213200604.2539630-1-yann.morin.1998@free.fr> References: <20230213200604.2539630-1-yann.morin.1998@free.fr> Message-ID: <20230215223833.06e095ef@windsurf> On Mon, 13 Feb 2023 21:06:04 +0100 "Yann E. MORIN" wrote: > Currently, flannel uses an ad-hoc github URL and a version-only tarball > name, even though we already had the github helper (introduced in 2013) > when flannel was introduced (in 2016). > > Switch to the github helper, which allows us to get a properly named > tarball. > > Signed-off-by: Yann E. MORIN > Cc: Geoff Levand > --- > package/flannel/flannel.hash | 2 +- > package/flannel/flannel.mk | 3 +-- > 2 files changed, 2 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 Wed Feb 15 21:38:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:38:41 +0100 Subject: [Buildroot] [PATCH] package/rtl8812au-aircrack-ng: bump to 2023-02-03 version to fix build failure with Linux 6.1 In-Reply-To: <20230214110827.1281144-1-giulio.benetti@benettiengineering.com> References: <20230214110827.1281144-1-giulio.benetti@benettiengineering.com> Message-ID: <20230215223841.3c083b5f@windsurf> On Tue, 14 Feb 2023 12:08:27 +0100 Giulio Benetti wrote: > Fixes: > http://autobuild.buildroot.net/results/e128298929fce31374687a566e50b00c150131b8/ > > Signed-off-by: Giulio Benetti > --- > package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- > package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.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 Wed Feb 15 21:38:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:38:20 +0100 Subject: [Buildroot] [git commit] package/flannel: use the github helper Message-ID: <20230215213927.82A6585ECB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b361028e6302ee0b062674f0483845930e94ba7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, flannel uses an ad-hoc github URL and a version-only tarball name, even though we already had the github helper (introduced in 2013) when flannel was introduced (in 2016). Switch to the github helper, which allows us to get a properly named tarball. Signed-off-by: Yann E. MORIN Cc: Geoff Levand Acked-by: Geoff Levand Signed-off-by: Thomas Petazzoni --- package/flannel/flannel.hash | 2 +- package/flannel/flannel.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash index 6a0223a20f..bafc453097 100644 --- a/package/flannel/flannel.hash +++ b/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca v0.14.0.tar.gz +sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca flannel-0.14.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index 231cf90dfd..b4e2b2f777 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -5,8 +5,7 @@ ################################################################################ FLANNEL_VERSION = 0.14.0 -FLANNEL_SITE = https://github.com/flannel-io/flannel/archive -FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz +FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) FLANNEL_LICENSE = Apache-2.0 FLANNEL_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 15 21:38:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:38:54 +0100 Subject: [Buildroot] [git commit] package/open-iscsi: fix libressl build Message-ID: <20230215213927.9561785ECD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=295baf16a181b110eba09007f6ad7ac384914581 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following libressl build failure raised since the addition of the package in commit 2a571acddd0badaf9636649d98fd095757878348: /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' Fixes: - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-SHA3-is-not-supported-by-libressl.patch | 144 +++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch new file mode 100644 index 0000000000..0423179d93 --- /dev/null +++ b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch @@ -0,0 +1,144 @@ +From 29a4c3a518d13bfc0a07915e7e87fbec2b66597c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 13 Feb 2023 08:55:11 +0100 +Subject: [PATCH] SHA3 is not supported by libressl + +Disable SHA3 with libressl as it is not supported resulting in the +following build failure: + +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': +auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' + +Fixes: + - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/open-iscsi/open-iscsi/pull/396] +--- + libopeniscsiusr/idbm.h | 2 ++ + usr/auth.c | 13 ++++++++++++- + usr/auth.h | 4 ++++ + usr/idbm.c | 2 ++ + 4 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h +index be5986f..1043b27 100644 +--- a/libopeniscsiusr/idbm.h ++++ b/libopeniscsiusr/idbm.h +@@ -56,7 +56,9 @@ enum iscsi_chap_algs { + ISCSI_AUTH_CHAP_ALG_MD5 = 5, + ISCSI_AUTH_CHAP_ALG_SHA1 = 6, + ISCSI_AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + ISCSI_AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5, + }; + +diff --git a/usr/auth.c b/usr/auth.c +index 46c328e..5f50e26 100644 +--- a/usr/auth.c ++++ b/usr/auth.c +@@ -181,9 +181,11 @@ static int auth_hash_init(EVP_MD_CTX **context, int chap_alg) { + case AUTH_CHAP_ALG_SHA256: + digest = EVP_sha256(); + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + digest = EVP_sha3_256(); + break; ++#endif + } + + if (*context == NULL) +@@ -298,7 +300,9 @@ static int + acl_chk_chap_alg_optn(int chap_algorithm) + { + if (chap_algorithm == AUTH_OPTION_NONE || ++#ifndef LIBRESSL_VERSION_NUMBER + chap_algorithm == AUTH_CHAP_ALG_SHA3_256 || ++#endif + chap_algorithm == AUTH_CHAP_ALG_SHA256 || + chap_algorithm == AUTH_CHAP_ALG_SHA1 || + chap_algorithm == AUTH_CHAP_ALG_MD5) +@@ -711,9 +715,11 @@ acl_chk_chap_alg_key(struct iscsi_acl *client) + case AUTH_CHAP_ALG_SHA256: + client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN; + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN; + break; ++#endif + } + return; + } +@@ -862,7 +868,10 @@ acl_local_auth(struct iscsi_acl *client) + client->local_state = AUTH_LOCAL_STATE_ERROR; + client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT; + break; +- } else if ((client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++ } else if ( ++#ifndef LIBRESSL_VERSION_NUMBER ++ (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++#endif + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) { +@@ -1824,6 +1833,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA256 due to crypto lib configuration"); + } + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) { + value_list[i++] = AUTH_CHAP_ALG_SHA3_256; +@@ -1832,6 +1842,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA3-256 due to crypto lib configuration"); + } + break; ++#endif + case ~0: + /* unset value in array, just ignore */ + break; +diff --git a/usr/auth.h b/usr/auth.h +index 16cdb24..9357772 100644 +--- a/usr/auth.h ++++ b/usr/auth.h +@@ -32,7 +32,9 @@ enum { + AUTH_CHAP_MD5_RSP_LEN = 16, + AUTH_CHAP_SHA1_RSP_LEN = 20, + AUTH_CHAP_SHA256_RSP_LEN = 32, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_SHA3_256_RSP_LEN = 32, ++#endif + AUTH_CHAP_RSP_MAX = 32, + }; + +@@ -67,7 +69,9 @@ enum { + AUTH_CHAP_ALG_MD5 = 5, + AUTH_CHAP_ALG_SHA1 = 6, + AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5 + }; + +diff --git a/usr/idbm.c b/usr/idbm.c +index 90bc142..082e1c6 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -200,7 +200,9 @@ static struct int_list_tbl { + { "MD5", AUTH_CHAP_ALG_MD5 }, + { "SHA1", AUTH_CHAP_ALG_SHA1 }, + { "SHA256", AUTH_CHAP_ALG_SHA256 }, ++#ifndef LIBRESSL_VERSION_NUMBER + { "SHA3-256", AUTH_CHAP_ALG_SHA3_256 }, ++#endif + }; + + static void +-- +2.39.0 + From thomas.petazzoni at bootlin.com Wed Feb 15 21:39:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:39:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/open-iscsi: fix libressl build In-Reply-To: <20230213181754.913323-1-fontaine.fabrice@gmail.com> References: <20230213181754.913323-1-fontaine.fabrice@gmail.com> Message-ID: <20230215223934.141b34c3@windsurf> On Mon, 13 Feb 2023 19:17:54 +0100 Fabrice Fontaine wrote: > Fix the following libressl build failure raised since the addition of > the package in commit 2a571acddd0badaf9636649d98fd095757878348: > > /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': > auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' > > Fixes: > - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 > > Signed-off-by: Fabrice Fontaine > --- > ...01-SHA3-is-not-supported-by-libressl.patch | 144 ++++++++++++++++++ > 1 file changed, 144 insertions(+) > create mode 100644 package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 15 21:41:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:41:40 +0100 Subject: [Buildroot] [PATCH] package/zstd: bump to version 1.5.4 In-Reply-To: <20230215151302.140387-1-nolange79@gmail.com> References: <20230215151302.140387-1-nolange79@gmail.com> Message-ID: <20230215224140.212f6e6b@windsurf> Hello Norbert, On Wed, 15 Feb 2023 16:13:01 +0100 Norbert Lange wrote: > The LICENSE text has changed, nominally the copyright owner changed > from "Facebook" to "Meta Platforms, Inc. and affiliates", > reflecting the name change of that company. > > Add upstream patch to fix zstd-dll build. > > Signed-off-by: Norbert Lange > --- > ...-zstd-dll-build-missing-dependencies.patch | 179 ++++++++++++++++++ > package/zstd/zstd.hash | 6 +- > package/zstd/zstd.mk | 2 +- > 3 files changed, 183 insertions(+), 4 deletions(-) > create mode 100644 package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch Thanks for the patch. > > diff --git a/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch > new file mode 100644 > index 0000000000..bbb008c3b3 > --- /dev/null > +++ b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies.patch > @@ -0,0 +1,179 @@ > +Fix zstd-dll build > + > +https://github.com/facebook/zstd/commit/c78f434aa4f5f1097c8edb975f4c1635817a5a71 > + > +Signed-off-by: Norbert Lange Could you use git format-patch to generate this patch, and preserve the authorship of the patch from its original author? Essentially this: - git clone ... - git checkout v1.5.4 - git cherry-pick c78f434aa4f5f1097c8edb975f4c1635817a5a71 - git commit --amend (add your own SoB in the commit log + reference to the upstream commit) - git format-patch HEAD^ Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 15 21:42:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:42:21 +0100 Subject: [Buildroot] [git commit] package/davinci-bootcount: bump to version 2.0.0 Message-ID: <20230215214321.42EAA85ED2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f16b97eab1859395ddd74f557d33ef8a1f2447d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - stm32mp1: support for STM32 TAMP_BKP21R bootcount register - tab formatting - gitignore: added autoscan files - updated documentation - i2c_eeprom: bootcount does not use two uint16s - am33xx: declare registers as 'volatile' - src/am33xx: do not close fd, it seems to prevent reliably writing register - configure.ac: update version, homepage - Added EEPROM read/write for non-TI AM335x platforms Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/davinci-bootcount/davinci-bootcount.hash | 2 +- package/davinci-bootcount/davinci-bootcount.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/davinci-bootcount/davinci-bootcount.hash index ef4bca2b7d..53435b1d1d 100644 --- a/package/davinci-bootcount/davinci-bootcount.hash +++ b/package/davinci-bootcount/davinci-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 de7843cf1245a739b6d18d4db478893e50c2de0ee19bbce96dc323065d28c3e4 davinci-bootcount-0973689c7556a953d2b468e4d8d46758c6d467b4.tar.gz +sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e davinci-bootcount-2.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk index 385d96d5a2..695d39688a 100644 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ b/package/davinci-bootcount/davinci-bootcount.mk @@ -4,8 +4,8 @@ # ################################################################################ -DAVINCI_BOOTCOUNT_VERSION = 0973689c7556a953d2b468e4d8d46758c6d467b4 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,$(DAVINCI_BOOTCOUNT_VERSION)) +DAVINCI_BOOTCOUNT_VERSION = 2.0.0 +DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Wed Feb 15 21:43:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:43:23 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/davinci-bootcount: bump to version 2.0.0 In-Reply-To: <20230211144623.380475-1-dario.binacchi@amarulasolutions.com> References: <20230211144623.380475-1-dario.binacchi@amarulasolutions.com> Message-ID: <20230215224323.620a3462@windsurf> On Sat, 11 Feb 2023 15:46:23 +0100 Dario Binacchi wrote: > - stm32mp1: support for STM32 TAMP_BKP21R bootcount register > - tab formatting > - gitignore: added autoscan files > - updated documentation > - i2c_eeprom: bootcount does not use two uint16s > - am33xx: declare registers as 'volatile' > - src/am33xx: do not close fd, it seems to prevent reliably writing register > - configure.ac: update version, homepage > - Added EEPROM read/write for non-TI AM335x platforms > > Signed-off-by: Dario Binacchi > > --- Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 15 21:46:18 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:46:18 +0100 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: make default toolchain_csv path absolute In-Reply-To: References: <20230215211531.331246-1-james.hilliard1@gmail.com> Message-ID: <5ee9bd2b-3a6e-7de3-9bc8-168e0639c5af@mind.be> On 15/02/2023 22:29, James Hilliard wrote: > On Wed, Feb 15, 2023 at 2:20 PM Arnout Vandecappelle wrote: >> >> >> >> On 15/02/2023 22:15, James Hilliard wrote: >>> The default toolchain_csv path is a relative path to the buildroot >>> directory. >>> >>> If we run genrandconfig with a cwd that is not the buildroot directory >>> the default toolchain_csv path will be wrong. >>> >>> To fix this make the default toolchain_csv path absolute. >>> >>> Fixes: >>> FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' >>> >>> Signed-off-by: James Hilliard >>> --- >>> Changes v1 -> v2: >>> - set default path as absolute >>> --- >>> utils/genrandconfig | 4 +++- >>> 1 file changed, 3 insertions(+), 1 deletion(-) >>> >>> diff --git a/utils/genrandconfig b/utils/genrandconfig >>> index b3576f8a51..3552b83694 100755 >>> --- a/utils/genrandconfig >>> +++ b/utils/genrandconfig >>> @@ -801,7 +801,9 @@ if __name__ == '__main__': >>> dest="toolchains_csv", >>> help="Generate random toolchain configuration", >>> action='store_false') >>> - parser.set_defaults(toolchains_csv="support/config-fragments/autobuild/toolchain-configs.csv") >>> + buildroot_abs = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) >>> + parser.set_defaults(toolchains_csv=os.path.join(buildroot_abs, >>> + "support/config-fragments/autobuild/toolchain-configs.csv")) >> >> Sorry, that's not going to work either (if it was that easy I'd done it myself :-) > > Under what scenario would this break? I have ~/src/buildroot/utils in my PATH, so I just run 'genrandconfig' from path. If I want to run it in a different worktree (e.g. ~/src/buildroot-next which tracks the next branch), I would go to that directory and run "genrandconfig", so it would use the one in ~/src/buildroot, not the one in ~/sr/buildroot-next. In that case, of course, I want to use the toolchain-configs.csv from the next branch, not the one from ~/src/buildroot. >> buildrootdir can be set to something else with the -b argument, and we want it >> relative to *that* one of course. > > Using buildrootdir is cwd dependent, The default value is cwd dependent; the value you give with the -b option can be absolute or relative. > the approach I used is not as it uses the > absolute path of the genrandconfig file to compute the default toolchain_csv > abs path. And my point is that it should be relative to the buildrootdir given with the commandline option, not relative to the place where genrandconfig happens to reside. TBH, I think genrandonfig has too many options :-) Regards, Arnout > >> >> Regards, >> Arnout >> >>> >>> args = parser.parse_args() >>> From thomas.petazzoni at bootlin.com Wed Feb 15 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit] package/dmalloc: don't use SSP Message-ID: <20230215214803.2C20B85EEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3481674ee36fe9fa695e2e6c255bf02b5ab380b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master dmalloc directly calls into $(LD) to generate a shared library our of the static one. To detect what command it should run, ./configure tries various incantations of ld with various command line options until one does not fail. One of those is (basically): $(LD) --whole-archive -o contest.o.t contest.a This makes ./configure conclude what the command to link a shared library in the Makefile should be, and thus stores that in a variable: shlinkargs='$(LD) --whole-archive -o $@' ... which is then AC_SUBST()ed into Makefile.in with a rule like: $(SHLIB): $(LIBRARY) @shlinkargs@ $(LIRARY) which once substiuted, gives: $(SHLIB): $(LIBRARY) $(LD) --whole-archive -o $@ $(LIRARY) However, when SSP is enabled, the __stack_chk_fail_local and co symbols are provided by additional libraries or object files, and that is the responsibility of gcc to pass those when linking. But as dmalloc directly calls ld, it misses those. Changing dmalloc to use $(CC) is not trivial, however. First, we can't pass LD=$(TARGET_CC), otherwise the whole package explodes [0]: indeed --whole-archive is unknown to gcc, so it must be passed as -Wl,--whole archive instead. So we'd need to add a new test that uses $(CC), like so: $(CC) -Wl,--whole-archive -o contest.o.t contest.a However, in that case, gcc does pass additional libs/objs (like, for eample, the SSP ones) to the linker. But then those are also included in the whole-archive section. This causes the linker to add all the symbols form those libs/objs, even those not needed for SSP; on some archs, like PPC, that may require floating point symbols (__muldiv3 et al.) which are in another library, and thus the linker can't find them. The proper solution wouild be to add -Wl,--no-whole-archive, but that would have to be added _after_ the library we want to link, i.e.e we should be able to evntually run: $(CC) -Wl,--whole-archive -o $@ $(LIRARY) -Wl,--no-whole-archive That would require that we introduce a new variable that is added _after_ the $(LIBRARY), e.g. @shlinkargs_post@ or so... This is a bigger endeavour than we want to pursue... Since dmalloc is a debugging utility, it is not supposed to go into production builds, and during debugging, it would not be surprising that it needs to poke around arrays to debug them. So, we go the easier route: disable SSP altogether. [0] with lots of nice colors, but that's not the point, is it? Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dmalloc/dmalloc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 6b90f810b2..5bd6691725 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -14,6 +14,13 @@ DMALLOC_LICENSE_FILES = LICENSE.txt DMALLOC_INSTALL_STAGING = YES DMALLOC_CFLAGS = $(TARGET_CFLAGS) +# dmalloc uses $(LD) to link, and thus misses the object files or libs that +# are needed to provide the __stack_chk_fail_local and co. symbols. Changing +# to use $(CC) is really more complex that we'd like. Since dmalloc is +# involved in debugging memory allocation, it is not expected to be a +# production library, so we do not care that much that it has SSP. +DMALLOC_CFLAGS += -fno-stack-protector + ifeq ($(BR2_STATIC_LIBS),y) DMALLOC_CONF_OPTS += --disable-shlib else From thomas.petazzoni at bootlin.com Wed Feb 15 21:45:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:45:26 +0100 Subject: [Buildroot] [git commit] package/dmalloc: convert existing patch to git format Message-ID: <20230215214803.16B1985EEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7bd0fdb88a15b15d4b41bdc82a37cf35ab2b268 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We're going to add more patches, so let's cleanup our historical baggage... Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../dmalloc/0001-configure-fix-build-on-mips.patch | 90 ++++++++++++++++++++++ package/dmalloc/0001-mips.patch | 45 ----------- 2 files changed, 90 insertions(+), 45 deletions(-) diff --git a/package/dmalloc/0001-configure-fix-build-on-mips.patch b/package/dmalloc/0001-configure-fix-build-on-mips.patch new file mode 100644 index 0000000000..9b1525d0d1 --- /dev/null +++ b/package/dmalloc/0001-configure-fix-build-on-mips.patch @@ -0,0 +1,90 @@ +From af6adb3f5f05be4faa88a5aa83296c388c8085e7 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 12:30:10 +0100 +Subject: [PATCH] configure: fix build on mips + +This patch is a historical baggage that Buildroot has carried for ages +(since 2006), and the reason for it are notentirely clear. + +Since dmalloc is pretty tricky, and as this patch has not been +identified as causing issues, we keep it; we just add the configure.ac +patchlet to match the one in configure. + +As for the title, the original patch was named dmalloc-mips.patch, so +presumably it fixes some mips issue; let's title the commit that way. + +[Fabrice: Updated for 5.6.5] +Signed-off-by: Fabrice Fontaine +[yann.morin.1998 at free.fr: make it a git-formatted patch] +Signed-off-by: Yann E. MORIN +--- + configure | 4 ++-- + configure.ac | 2 +- + return.h | 16 +++------------- + 3 files changed, 6 insertions(+), 16 deletions(-) + +diff --git a/configure b/configure +index d52a1e8..c18dfb2 100755 +--- a/configure ++++ b/configure +@@ -5413,8 +5413,8 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 + $as_echo_n "checking return.h macros work... " >&6; } + if test "$cross_compiling" = yes; then : +- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assume yes (cross-compiling)" >&5 + $as_echo "no" >&6; } + + else +diff --git a/configure.ac b/configure.ac +index a5295f1..9740fdc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -705,7 +705,7 @@ int main() + ])], + [ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([yes]) ], + [ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ], +-[ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ] ++[ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([assume yes (cross-compiling)]) ] + ) + + ############################################################################## +diff --git a/return.h b/return.h +index 9d3f5f1..d916c7a 100644 +--- a/return.h ++++ b/return.h +@@ -117,26 +117,16 @@ + /*************************************/ + + /* +- * For DEC Mips machines running Ultrix ++ * For Mips machines running Linux + */ + #if __mips + +-/* +- * I have no idea how to get inline assembly with the default cc. +- * Anyone know how? +- */ +- +-#if 0 +- + /* + * NOTE: we assume here that file is global. + * +- * $31 is the frame pointer. $2 looks to be the return address but maybe +- * not consistently. ++ * $31 is the return address. + */ +-#define GET_RET_ADDR(file) asm("sw $2, file") +- +-#endif ++#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) + + #endif /* __mips */ + +-- +2.25.1 + diff --git a/package/dmalloc/0001-mips.patch b/package/dmalloc/0001-mips.patch deleted file mode 100644 index 3150d030ec..0000000000 --- a/package/dmalloc/0001-mips.patch +++ /dev/null @@ -1,45 +0,0 @@ -[Fabrice: Updated for 5.6.5] -Signed-off-by: Fabrice Fontaine ---- a/configure -+++ b/configure -@@ -7107,7 +7107,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 - $as_echo_n "checking return.h macros work... " >&6; } - if test "$cross_compiling" = yes; then : -- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h -+ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - ---- a/return.h -+++ b/return.h -@@ -106,26 +106,16 @@ - /*************************************/ - - /* -- * For DEC Mips machines running Ultrix -+ * For Mips machines running Linux - */ - #if __mips - - /* -- * I have no idea how to get inline assembly with the default cc. -- * Anyone know how? -- */ -- --#if 0 -- --/* - * NOTE: we assume here that file is global. - * -- * $31 is the frame pointer. $2 looks to be the return address but maybe -- * not consistently. -+ * $31 is the return address. - */ --#define GET_RET_ADDR(file) asm("sw $2, file") -- --#endif -+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) - - #endif /* __mips */ - From thomas.petazzoni at bootlin.com Wed Feb 15 21:45:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:45:44 +0100 Subject: [Buildroot] [git commit] package/dmalloc: use actual patches rather than sed-ing Message-ID: <20230215214803.219DD85ED1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b259dac22a4179494e9947c485b6b171d8fef52e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Our dmalloc packaging is very old and carries historical baggage and idiosyncracies that we have long stopped doing in the rest ofthe code base. Drop our post-patch hooks that seds the configure and Makefile.in files, and add patches (that could be upstreamed one day). We provide the results in the environment, like would be done with actual autoconf cache variables (ac_cv_*). Note: those are the result of cleaning up for further patches that did not manifest because it was too complex to add proper SSP support to dmalloc (instead, we're going to forcibly disable it in the following commit). Note-2: those patches have not been submitted upstream, as it's mostly dead: even though there's been some commit activities recently-ish, there has been no review or comments or the many PR pending for many years now. Note-3: we patch both configure and configure.ac, rather than autoreconf, for two reasons: 1. the both are in the upstream git tree, so submitting these patches would require patching both, and 2. dmalloc does not autoreconf nicely out of the box, and it was deemed too much hassle to fix that in addition. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...003-configure-allow-overriding-some-tests.patch | 80 ++++++++++++++++++++++ ...e-the-configure-detected-or-user-supplied.patch | 50 ++++++++++++++ ...onfigure-use-LD-instead-of-hard-coding-ld.patch | 67 ++++++++++++++++++ package/dmalloc/dmalloc.mk | 17 ++--- 4 files changed, 202 insertions(+), 12 deletions(-) diff --git a/package/dmalloc/0003-configure-allow-overriding-some-tests.patch b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch new file mode 100644 index 0000000000..3003e8cbe4 --- /dev/null +++ b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch @@ -0,0 +1,80 @@ +From 9d57d4353c82110c609f36f91986277343d4ee45 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:26:56 +0100 +Subject: [PATCH] configure: allow overriding some tests + +Some tests use AC_RUN_IFELSE, so they do not work for cross-compilation. + +Allow the user to provide these results from the environment. + +Signed-off-by: Yann E. MORIN +--- + configure | 6 +++--- + configure.ac | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index c18dfb2..d165962 100755 +--- a/configure ++++ b/configure +@@ -4540,7 +4540,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strdup macro" >&5 + $as_echo_n "checking strdup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strdup_macro=no ++ ac_cv_strdup_macro="${ac_cv_strdup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4578,7 +4578,7 @@ $as_echo "$ac_cv_strdup_macro" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strndup macro" >&5 + $as_echo_n "checking strndup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strndup_macro=no ++ ac_cv_strndup_macro="${ac_cv_strndup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4753,7 +4753,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking basic-block size" >&5 + $as_echo_n "checking basic-block size... " >&6; } +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + if test "$cross_compiling" = yes; then : + ac_cv_page_size=0 +diff --git a/configure.ac b/configure.ac +index 9740fdc..51bdf4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -292,7 +292,7 @@ int main() { return 1; } + ]])], + [ac_cv_strdup_macro=yes], + [ac_cv_strdup_macro=no], +-[ac_cv_strdup_macro=no] ++[ac_cv_strdup_macro="${ac_cv_strdup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strdup_macro]) + +@@ -316,7 +316,7 @@ int main() { return 1; } + ]])], + [ac_cv_strndup_macro=yes], + [ac_cv_strndup_macro=no], +-[ac_cv_strndup_macro=no] ++[ac_cv_strndup_macro="${ac_cv_strndup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strndup_macro]) + +@@ -390,7 +390,7 @@ AC_MSG_RESULT([$ac_cv_use_mmap]) + # + AC_CHECK_FUNCS(getpagesize) + AC_MSG_CHECKING([basic-block size]) +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + AC_RUN_IFELSE([AC_LANG_SOURCE([ + #if HAVE_UNISTD_H +-- +2.25.1 + diff --git a/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch new file mode 100644 index 0000000000..394e7ca34e --- /dev/null +++ b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch @@ -0,0 +1,50 @@ +From c958fd5cd7d5ff03c0a023608b53b74997c514b3 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:43:55 +0100 +Subject: [PATCH] Makefile: use the configure-detected or user-supplied ar + program + +Signed-off-by: Yann E. MORIN +--- + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 86d3cca..089ac99 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -303,11 +303,11 @@ $(LIB_SL) : $(LIBRARY) + mv $@.t $@ + + $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH) : $(OBJS) $(THREAD_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_SL) : $(LIB_TH) +@@ -316,7 +316,7 @@ $(LIB_TH_SL) : $(LIB_TH) + mv $@.t $@ + + $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_CXX_SL) : $(LIB_CXX) +@@ -325,7 +325,7 @@ $(LIB_CXX_SL) : $(LIB_CXX) + mv $@.t $@ + + $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) +-- +2.25.1 + diff --git a/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch new file mode 100644 index 0000000000..3ba6ee3dc7 --- /dev/null +++ b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch @@ -0,0 +1,67 @@ +From d77e5f3d45b0cbae850e3a6e23d52edc137be803 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:52:05 +0100 +Subject: [PATCH] configure: use ${LD} instead of hard-coding 'ld' + +When doing cross-compilation, we do not want to use the native tools to +test, but the target tools. + +Note that the weird quoting is inherited from a legacy patch in +Buildroot, which dates back ages (at least 2006), and as it has not been +identified as breaking things, we keep it as-is... Meh... + +Signed-off-by: Yann E. MORIN +--- + configure | 12 ++++++------ + configure.ac | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/configure b/configure +index 810636e..30a7ea3 100755 +--- a/configure ++++ b/configure +@@ -4377,12 +4377,12 @@ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +diff --git a/configure.ac b/configure.ac +index 51bdf4d..0d80a78 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,12 +169,12 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int foo(int val) { return val + 1; } ])],[ + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +-- +2.25.1 + diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 81ac467277..6b90f810b2 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -44,18 +44,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_63261),y) DMALLOC_CFLAGS += -O0 endif -DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)" - -define DMALLOC_POST_PATCH - $(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure - $(SED) 's/ac_cv_strdup_macro=no$$/ac_cv_strdup_macro=yes/' $(@D)/configure - $(SED) 's/ac_cv_strndup_macro=no$$/ac_cv_strndup_macro=yes/' $(@D)/configure - $(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure - $(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure - $(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in -endef - -DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH +DMALLOC_CONF_ENV = \ + CFLAGS="$(DMALLOC_CFLAGS)" \ + ac_cv_page_size=12 \ + ac_cv_strdup_macro=yes \ + ac_cv_strndup_macro=yes # both DESTDIR and PREFIX are ignored.. define DMALLOC_INSTALL_STAGING_CMDS From james.hilliard1 at gmail.com Wed Feb 15 21:57:50 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 15 Feb 2023 14:57:50 -0700 Subject: [Buildroot] [PATCH v2 1/1] utils/genrandconfig: make default toolchain_csv path absolute In-Reply-To: <5ee9bd2b-3a6e-7de3-9bc8-168e0639c5af@mind.be> References: <20230215211531.331246-1-james.hilliard1@gmail.com> <5ee9bd2b-3a6e-7de3-9bc8-168e0639c5af@mind.be> Message-ID: On Wed, Feb 15, 2023 at 2:46 PM Arnout Vandecappelle wrote: > > > > On 15/02/2023 22:29, James Hilliard wrote: > > On Wed, Feb 15, 2023 at 2:20 PM Arnout Vandecappelle wrote: > >> > >> > >> > >> On 15/02/2023 22:15, James Hilliard wrote: > >>> The default toolchain_csv path is a relative path to the buildroot > >>> directory. > >>> > >>> If we run genrandconfig with a cwd that is not the buildroot directory > >>> the default toolchain_csv path will be wrong. > >>> > >>> To fix this make the default toolchain_csv path absolute. > >>> > >>> Fixes: > >>> FileNotFoundError: [Errno 2] No such file or directory: 'support/config-fragments/autobuild/toolchain-configs.csv' > >>> > >>> Signed-off-by: James Hilliard > >>> --- > >>> Changes v1 -> v2: > >>> - set default path as absolute > >>> --- > >>> utils/genrandconfig | 4 +++- > >>> 1 file changed, 3 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/utils/genrandconfig b/utils/genrandconfig > >>> index b3576f8a51..3552b83694 100755 > >>> --- a/utils/genrandconfig > >>> +++ b/utils/genrandconfig > >>> @@ -801,7 +801,9 @@ if __name__ == '__main__': > >>> dest="toolchains_csv", > >>> help="Generate random toolchain configuration", > >>> action='store_false') > >>> - parser.set_defaults(toolchains_csv="support/config-fragments/autobuild/toolchain-configs.csv") > >>> + buildroot_abs = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) > >>> + parser.set_defaults(toolchains_csv=os.path.join(buildroot_abs, > >>> + "support/config-fragments/autobuild/toolchain-configs.csv")) > >> > >> Sorry, that's not going to work either (if it was that easy I'd done it myself :-) > > > > Under what scenario would this break? > > I have ~/src/buildroot/utils in my PATH, so I just run 'genrandconfig' from > path. If I want to run it in a different worktree (e.g. ~/src/buildroot-next > which tracks the next branch), I would go to that directory and run > "genrandconfig", so it would use the one in ~/src/buildroot, not the one in > ~/sr/buildroot-next. In that case, of course, I want to use the > toolchain-configs.csv from the next branch, not the one from ~/src/buildroot. Well you can still do that by passing the relative path via --toolchains-csv to override the default abs path. > > > >> buildrootdir can be set to something else with the -b argument, and we want it > >> relative to *that* one of course. > > > > Using buildrootdir is cwd dependent, > > The default value is cwd dependent; the value you give with the -b option can > be absolute or relative. Yeah, but I think making it an abs path relative to the genrandconfig file as the default is less likely to cause unexpected issues. Having it relative to cwd when not passing an option is a bit unexpected IMO. > > > the approach I used is not as it uses the > > absolute path of the genrandconfig file to compute the default toolchain_csv > > abs path. > > And my point is that it should be relative to the buildrootdir given with the > commandline option, not relative to the place where genrandconfig happens to reside. It's still relative to cwd when passing a relative path via --toolchains-csv, just the default is changed to be an abs path. > > TBH, I think genrandonfig has too many options :-) > > Regards, > Arnout > > > > >> > >> Regards, > >> Arnout > >> > >>> > >>> args = parser.parse_args() > >>> From thomas.petazzoni at bootlin.com Wed Feb 15 22:21:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 23:21:19 +0100 Subject: [Buildroot] [git commit] package/python-marshmallow-sqlalchemy: new package Message-ID: <20230215222259.06C4E85F32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e9f0dc59a5c4310139040f88189d10ad0b76906 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Martin Hundeboll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-marshmallow-sqlalchemy/Config.in | 10 ++++++++++ .../python-marshmallow-sqlalchemy.hash | 5 +++++ .../python-marshmallow-sqlalchemy.mk | 14 ++++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2b05714e9c..bcf377d3d4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1968,6 +1968,7 @@ F: package/zic/ N: Martin Hundeb??ll F: package/python-apispec/ F: package/python-marshmallow/ +F: package/python-marshmallow-sqlalchemy/ F: package/python-webargs/ N: Martin Kepplinger diff --git a/package/Config.in b/package/Config.in index ece35f12c8..3807050eeb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1130,6 +1130,7 @@ menu "External python modules" source "package/python-markdown2/Config.in" source "package/python-markupsafe/Config.in" source "package/python-marshmallow/Config.in" + source "package/python-marshmallow-sqlalchemy/Config.in" source "package/python-matplotlib/Config.in" source "package/python-mbstrdecoder/Config.in" source "package/python-memory-profiler/Config.in" diff --git a/package/python-marshmallow-sqlalchemy/Config.in b/package/python-marshmallow-sqlalchemy/Config.in new file mode 100644 index 0000000000..f48d27edd6 --- /dev/null +++ b/package/python-marshmallow-sqlalchemy/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_MARSHMALLOW_SQLALCHEMY + bool "python-marshmallow-sqlalchemy" + select BR2_PACKAGE_PYTHON_MARSHMALLOW # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime + help + SQLAlchemy integration with the marshmallow + (de)serialization library. + + https://github.com/marshmallow-code/marshmallow-sqlalchemy diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash new file mode 100644 index 0000000000..6b847de94d --- /dev/null +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/marshmallow-sqlalchemy/json +md5 5e012b07ccf4ad67dbd3f38cc68cb1f4 marshmallow-sqlalchemy-0.28.1.tar.gz +sha256 aa376747296780a56355e3067b9c8bf43a2a1c44ff985de82b3a5d9e161ca2b8 marshmallow-sqlalchemy-0.28.1.tar.gz +# Locally computed sha256 checksums +sha256 625df8e2758a271b4bc90525c0b6161814e0f72cb3504b03ab5206b7abf50072 LICENSE diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk new file mode 100644 index 0000000000..293ea29be6 --- /dev/null +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-marshmallow-sqlalchemy +# +################################################################################ + +PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 0.28.1 +PYTHON_MARSHMALLOW_SQLALCHEMY_SOURCE = marshmallow-sqlalchemy-$(PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION).tar.gz +PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/eb/96/3895bde2247fa653c36d887ff08e439665668aa7c991a3924ae199be88d6 +PYTHON_MARSHMALLOW_SQLALCHEMY_SETUP_TYPE = setuptools +PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE = MIT +PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 15 22:17:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 23:17:52 +0100 Subject: [Buildroot] [git commit] package/python-marshmallow: new package Message-ID: <20230215222258.EB99285F35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c3e7014105eb69db7d9c9f662ab0a5054f35797 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master marshmallow is a dependency of to-be-added python-flask-smorest. Signed-off-by: Martin Hundeb??ll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-marshmallow/Config.in | 8 ++++++++ package/python-marshmallow/python-marshmallow.hash | 6 ++++++ package/python-marshmallow/python-marshmallow.mk | 14 ++++++++++++++ 5 files changed, 30 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7335e70d15..2b05714e9c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1967,6 +1967,7 @@ F: package/zic/ N: Martin Hundeb??ll F: package/python-apispec/ +F: package/python-marshmallow/ F: package/python-webargs/ N: Martin Kepplinger diff --git a/package/Config.in b/package/Config.in index 747fac54bf..ece35f12c8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1129,6 +1129,7 @@ menu "External python modules" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" source "package/python-markupsafe/Config.in" + source "package/python-marshmallow/Config.in" source "package/python-matplotlib/Config.in" source "package/python-mbstrdecoder/Config.in" source "package/python-memory-profiler/Config.in" diff --git a/package/python-marshmallow/Config.in b/package/python-marshmallow/Config.in new file mode 100644 index 0000000000..cc1b42f465 --- /dev/null +++ b/package/python-marshmallow/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_MARSHMALLOW + bool "python-marshmallow" + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + help + A lightweight library for converting complex datatypes to + and from native Python datatypes. + + https://github.com/marshmallow-code/marshmallow diff --git a/package/python-marshmallow/python-marshmallow.hash b/package/python-marshmallow/python-marshmallow.hash new file mode 100644 index 0000000000..dc277d16e5 --- /dev/null +++ b/package/python-marshmallow/python-marshmallow.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/marshmallow/json +md5 3cf5c42917509a199c3105466435c425 marshmallow-3.19.0.tar.gz +sha256 90032c0fd650ce94b6ec6dc8dfeb0e3ff50c144586462c389b81a07205bedb78 marshmallow-3.19.0.tar.gz +# Locally computed sha256 checksums +sha256 759dc79c383ad79340c6e41f712e80407fe0d2cb3cbaad1ed98aa9c3e28a602c LICENSE +sha256 f982e6fd97ba00973e94605b972ff04894b22c4fa937b868828b32ae8f0a7c2e docs/license.rst diff --git a/package/python-marshmallow/python-marshmallow.mk b/package/python-marshmallow/python-marshmallow.mk new file mode 100644 index 0000000000..6427296508 --- /dev/null +++ b/package/python-marshmallow/python-marshmallow.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-marshmallow +# +################################################################################ + +PYTHON_MARSHMALLOW_VERSION = 3.19.0 +PYTHON_MARSHMALLOW_SOURCE = marshmallow-$(PYTHON_MARSHMALLOW_VERSION).tar.gz +PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/5e/59/dd465e5ab0ccb879c410f88c75189a19fd437b12cd9a03b31579aef58709 +PYTHON_MARSHMALLOW_SETUP_TYPE = setuptools +PYTHON_MARSHMALLOW_LICENSE = MIT +PYTHON_MARSHMALLOW_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 15 22:16:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 23:16:09 +0100 Subject: [Buildroot] [git commit] package/python-apispec: new package Message-ID: <20230215222258.CA7BF85F32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8984b7581a7d534c9170061913b4840ed33d87c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master apispec is a dependency of to-be-added python-flask-smorest. Signed-off-by: Martin Hundeb??ll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-apispec/Config.in | 9 +++++++++ package/python-apispec/python-apispec.hash | 5 +++++ package/python-apispec/python-apispec.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 72a56deb4c..949eef8327 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1965,6 +1965,9 @@ F: package/rpi-firmware/ F: package/tzdata/ F: package/zic/ +N: Martin Hundeb??ll +F: package/python-apispec/ + N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ diff --git a/package/Config.in b/package/Config.in index fff2fb7a93..de40f2d529 100644 --- a/package/Config.in +++ b/package/Config.in @@ -958,6 +958,7 @@ menu "External python modules" source "package/python-alembic/Config.in" source "package/python-alsaaudio/Config.in" source "package/python-ansicolors/Config.in" + source "package/python-apispec/Config.in" source "package/python-appdirs/Config.in" source "package/python-argh/Config.in" source "package/python-argon2-cffi/Config.in" diff --git a/package/python-apispec/Config.in b/package/python-apispec/Config.in new file mode 100644 index 0000000000..7a322c9969 --- /dev/null +++ b/package/python-apispec/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_APISPEC + bool "python-apispec" + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + help + A pluggable API specification generator. Currently supports + the OpenAPI Specification (f.k.a. the Swagger + specification). + + https://github.com/marshmallow-code/apispec diff --git a/package/python-apispec/python-apispec.hash b/package/python-apispec/python-apispec.hash new file mode 100644 index 0000000000..9d653cc8e8 --- /dev/null +++ b/package/python-apispec/python-apispec.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/apispec/json +md5 b4e90006a26215e2e0a6fe2629d12c10 apispec-6.0.2.tar.gz +sha256 e76d80b739edef4be213092a6384ad7fd933ba7d64f6d5a0aff8d4da1bef7887 apispec-6.0.2.tar.gz +# Locally computed sha256 checksums +sha256 a452afcef750956a8396f7e7a6f913a117d28ef99a13170c29dc74c3b7a95f29 LICENSE diff --git a/package/python-apispec/python-apispec.mk b/package/python-apispec/python-apispec.mk new file mode 100644 index 0000000000..4674ce0c3d --- /dev/null +++ b/package/python-apispec/python-apispec.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-apispec +# +################################################################################ + +PYTHON_APISPEC_VERSION = 6.0.2 +PYTHON_APISPEC_SOURCE = apispec-$(PYTHON_APISPEC_VERSION).tar.gz +PYTHON_APISPEC_SITE = https://files.pythonhosted.org/packages/a7/2a/b42c17e0d653341b8f5916999892cd2d8489de127dac6118ae44531674f5 +PYTHON_APISPEC_SETUP_TYPE = setuptools +PYTHON_APISPEC_LICENSE = MIT +PYTHON_APISPEC_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 15 22:22:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 23:22:26 +0100 Subject: [Buildroot] [git commit] package/python-flask-smorest: new package Message-ID: <20230215222259.146D485F33@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d00e437922fb1b611f35c3138b9fbf7bcff62757 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Martin Hundeb??ll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-flask-smorest/Config.in | 11 +++++++++++ package/python-flask-smorest/python-flask-smorest.hash | 5 +++++ package/python-flask-smorest/python-flask-smorest.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index bcf377d3d4..f8451c7fec 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1967,6 +1967,7 @@ F: package/zic/ N: Martin Hundeb??ll F: package/python-apispec/ +F: package/python-flask-smorest/ F: package/python-marshmallow/ F: package/python-marshmallow-sqlalchemy/ F: package/python-webargs/ diff --git a/package/Config.in b/package/Config.in index 3807050eeb..0af4adffa5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1058,6 +1058,7 @@ menu "External python modules" source "package/python-flask-expects-json/Config.in" source "package/python-flask-jsonrpc/Config.in" source "package/python-flask-login/Config.in" + source "package/python-flask-smorest/Config.in" source "package/python-flask-sqlalchemy/Config.in" source "package/python-flask-wtf/Config.in" source "package/python-flatbuffers/Config.in" diff --git a/package/python-flask-smorest/Config.in b/package/python-flask-smorest/Config.in new file mode 100644 index 0000000000..a8ccfbd9f7 --- /dev/null +++ b/package/python-flask-smorest/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_FLASK_SMOREST + bool "python-flask-smorest" + select BR2_PACKAGE_PYTHON_APISPEC # runtime + select BR2_PACKAGE_PYTHON_FLASK # runtime + select BR2_PACKAGE_PYTHON_MARSHMALLOW # runtime + select BR2_PACKAGE_PYTHON_WEBARGS # runtime + select BR2_PACKAGE_PYTHON_WERKZEUG # runtime + help + Flask/Marshmallow-based REST API framework. + + https://github.com/marshmallow-code/flask-smorest diff --git a/package/python-flask-smorest/python-flask-smorest.hash b/package/python-flask-smorest/python-flask-smorest.hash new file mode 100644 index 0000000000..5abe0c5033 --- /dev/null +++ b/package/python-flask-smorest/python-flask-smorest.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/flask-smorest/json +md5 1dad52f26c59ca2dcaf0c5d109879605 flask-smorest-0.40.0.tar.gz +sha256 9b46b4937ccf78702d99fed8cfd1cd5c37608ddefd65ff16a86d1ad5c7f7d8c0 flask-smorest-0.40.0.tar.gz +# Locally computed sha256 checksums +sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE diff --git a/package/python-flask-smorest/python-flask-smorest.mk b/package/python-flask-smorest/python-flask-smorest.mk new file mode 100644 index 0000000000..069d9244dd --- /dev/null +++ b/package/python-flask-smorest/python-flask-smorest.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-flask-smorest +# +################################################################################ + +PYTHON_FLASK_SMOREST_VERSION = 0.40.0 +PYTHON_FLASK_SMOREST_SOURCE = flask-smorest-$(PYTHON_FLASK_SMOREST_VERSION).tar.gz +PYTHON_FLASK_SMOREST_SITE = https://files.pythonhosted.org/packages/e6/b5/1b81ea4f7e377cf8a653aa10c249656a1c73de7a3695b2544d7a713ea3c2 +PYTHON_FLASK_SMOREST_SETUP_TYPE = setuptools +PYTHON_FLASK_SMOREST_LICENSE = MIT +PYTHON_FLASK_SMOREST_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 15 22:16:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 23:16:55 +0100 Subject: [Buildroot] [git commit] package/python-webargs: new package Message-ID: <20230215222258.DDC9B85F33@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c41d4836999fa691c5952bd476182bf93647e7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master webargs is a dependency of to-be-added python-flask-smorest. Signed-off-by: Martin Hundeb??ll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-webargs/Config.in | 11 +++++++++++ package/python-webargs/python-webargs.hash | 5 +++++ package/python-webargs/python-webargs.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 949eef8327..7335e70d15 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1967,6 +1967,7 @@ F: package/zic/ N: Martin Hundeb??ll F: package/python-apispec/ +F: package/python-webargs/ N: Martin Kepplinger F: package/tslib/ diff --git a/package/Config.in b/package/Config.in index de40f2d529..747fac54bf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1341,6 +1341,7 @@ menu "External python modules" source "package/python-wcwidth/Config.in" source "package/python-weasyprint/Config.in" source "package/python-web2py/Config.in" + source "package/python-webargs/Config.in" source "package/python-webencodings/Config.in" source "package/python-webob/Config.in" source "package/python-webpy/Config.in" diff --git a/package/python-webargs/Config.in b/package/python-webargs/Config.in new file mode 100644 index 0000000000..f2332d3b70 --- /dev/null +++ b/package/python-webargs/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_WEBARGS + bool "python-webargs" + select BR2_PACKAGE_PYTHON_MARSHMALLOW # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + help + Declarative parsing and validation of HTTP request objects, + with built-in support for popular web frameworks, including + Flask, Django, Bottle, Tornado, Pyramid, Falcon, and + aiohttp. + + https://github.com/marshmallow-code/webargs diff --git a/package/python-webargs/python-webargs.hash b/package/python-webargs/python-webargs.hash new file mode 100644 index 0000000000..619b584807 --- /dev/null +++ b/package/python-webargs/python-webargs.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/webargs/json +md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz +sha256 99d68940c452e07726485a15fef43f12f8ae6c0c5b391bcba76065d4527fb85d webargs-8.2.0.tar.gz +# Locally computed sha256 checksums +sha256 5973e5dcc20b65e4eb4b4acdf273bb78a18522914ab626f496f1b070f7e6294d LICENSE diff --git a/package/python-webargs/python-webargs.mk b/package/python-webargs/python-webargs.mk new file mode 100644 index 0000000000..e048d8a4ac --- /dev/null +++ b/package/python-webargs/python-webargs.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-webargs +# +################################################################################ + +PYTHON_WEBARGS_VERSION = 8.2.0 +PYTHON_WEBARGS_SOURCE = webargs-$(PYTHON_WEBARGS_VERSION).tar.gz +PYTHON_WEBARGS_SITE = https://files.pythonhosted.org/packages/4b/7d/fece8e6547b3edde8953b1c84a63da02e1a88efcb9d7d485e4d1b25d9c47 +PYTHON_WEBARGS_SETUP_TYPE = setuptools +PYTHON_WEBARGS_LICENSE = MIT +PYTHON_WEBARGS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 15 22:24:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 23:24:23 +0100 Subject: [Buildroot] [PATCH 1/5] package/python-apispec: new package In-Reply-To: <20230105130000.682525-2-martin@geanix.com> References: <20230105130000.682525-1-martin@geanix.com> <20230105130000.682525-2-martin@geanix.com> Message-ID: <20230215232423.0bcc3f62@windsurf> Hello Martin, On Thu, 5 Jan 2023 13:59:56 +0100 Martin Hundeb?ll wrote: > apispec is a dependency of to-be-added python-flask-smorest. > > Signed-off-by: Martin Hundeb?ll > --- > package/Config.in | 1 + > package/python-apispec/Config.in | 9 +++++++++ > package/python-apispec/python-apispec.hash | 5 +++++ > package/python-apispec/python-apispec.mk | 14 ++++++++++++++ > 4 files changed, 29 insertions(+) > create mode 100644 package/python-apispec/Config.in > create mode 100644 package/python-apispec/python-apispec.hash > create mode 100644 package/python-apispec/python-apispec.mk Thanks for your contribution! I have applied all 5 patches. One thing was missing on all patches: adding yourself to the DEVELOPERS file for each package. There was also an issue on PATCH 4/5, on the LICENSE file: the hash you had was not up-to-date. I double checked and the hash you had for the license file was from a previous version of the package. The license file just changed due to copyright years, so I updated the hash file with the correct hash for the LICENSE file when applying. Again, thanks for this contribution! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From aduskett at gmail.com Wed Feb 15 22:43:00 2023 From: aduskett at gmail.com (Adam Duskett) Date: Wed, 15 Feb 2023 14:43:00 -0800 Subject: [Buildroot] [PATCH 1/1] package/openjdk{-bin}: bump versions to 11.0.18+10 and 17.0.6+10 Message-ID: <20230215224300.486258-1-aduskett@gmail.com> Signed-off-by: Adam Duskett --- ...ARCv2-ISA-processors-support-to-Zero.patch | 20 +++++++++---------- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) rename package/openjdk/{17.0.1+12 => 17.0.6+10}/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch (83%) diff --git a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 83% rename from package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index 1ef523a419..dfd3b07bea 100644 --- a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -23,8 +23,8 @@ diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 index 5120918aed2..f7a99955874 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 -@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], - BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread" +@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], + fi fi + # Libatomic library @@ -55,7 +55,7 @@ index c0f2446dbd7..dc416ece885 100644 arm*) VAR_CPU=arm VAR_CPU_ARCH=arm -@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], +@@ -563,6 +569,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], HOTSPOT_$1_CPU_DEFINE=PPC64 # The cpu defines below are for zero, we don't support them directly. @@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c index b08caf4d5d3..2bf084895ba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,12 +95,12 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { - static Elf32_Half running_arch_code=EM_RISCV; +@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { + static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ -- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc -+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc +- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc ++ AARCH64, ALPHA, ARC ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc #endif // Identify compatibility class for VM's architecture and library's architecture diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 293787792d..0a67e7a3ec 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2fdd23261526362d4aaf58323441d4c31d29de2e374ba94bbf2727a00adc0ea7 openjdk-17.0.2+8.tar.gz -sha256 0e859cc03378439023e17ee82aecee5a52265fb38906a8bebf16027aa2b2bcf5 openjdk-11.0.14.1+1.tar.gz +sha256 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472 openjdk-17.0.6+10.tar.gz +sha256 04af71fc7adda41a49861870f9ec0ac0f059c2cf9393ce32995ea8ef4279a1b1 openjdk-11.0.18+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 42d52d57c4..0fe506bbfd 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.2+8 +OPENJDK_VERSION_MINOR = 0.6+10 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.14.1+1 +OPENJDK_VERSION_MINOR = 0.18+10 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) -- 2.39.1 From aduskett at gmail.com Wed Feb 15 22:47:12 2023 From: aduskett at gmail.com (Adam Duskett) Date: Wed, 15 Feb 2023 14:47:12 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/openjdk{-bin}: bump versions to 11.0.18+10 and 17.0.6+10 Message-ID: <20230215224712.487272-1-aduskett@gmail.com> Signed-off-by: Adam Duskett --- v1 -> v2: Add missing openjdk-bin updates package/openjdk-bin/openjdk-bin.hash | 8 ++++---- package/openjdk-bin/openjdk-bin.mk | 4 ++-- ...ARCv2-ISA-processors-support-to-Zero.patch | 20 +++++++++---------- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) rename package/openjdk/{17.0.1+12 => 17.0.6+10}/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch (83%) diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 4d3942125f..241ca34a04 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,10 +1,10 @@ # https://github.com/adoptium/temurin17-binaries/releases -sha256 288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48 OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz -sha256 302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz +sha256 a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289 OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz +sha256 9e0e88bbd9fa662567d0c1e22d469268c68ac078e9e5fe5a7244f56fec71f55f OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz # From https://github.com/adoptium/temurin11-binaries/releases -sha256 43fb84f8063ad9bf6b6d694a67b8f64c8827552b920ec5ce794dfe5602edffe7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz -sha256 79572f5172c6a040591d34632f98a20ed148702bbce2f57649e8ac01c0d2e3db OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14.1_1.tar.gz +sha256 4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz +sha256 04d5eeff6a6449bcdca0f52cd97bafd43ce09d40ef1e73fa0e1add63bea4a9c8 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index 608a0bc3ac..c3eb0b05e6 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_8 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.6_10 else HOST_OPENJDK_BIN_VERSION_MAJOR = 11 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.14.1_1 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.18_10 endif ifeq ($(HOSTARCH),x86_64) diff --git a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 83% rename from package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index 1ef523a419..dfd3b07bea 100644 --- a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -23,8 +23,8 @@ diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 index 5120918aed2..f7a99955874 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 -@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], - BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread" +@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], + fi fi + # Libatomic library @@ -55,7 +55,7 @@ index c0f2446dbd7..dc416ece885 100644 arm*) VAR_CPU=arm VAR_CPU_ARCH=arm -@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], +@@ -563,6 +569,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], HOTSPOT_$1_CPU_DEFINE=PPC64 # The cpu defines below are for zero, we don't support them directly. @@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c index b08caf4d5d3..2bf084895ba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,12 +95,12 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { - static Elf32_Half running_arch_code=EM_RISCV; +@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { + static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ -- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc -+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc +- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc ++ AARCH64, ALPHA, ARC ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc #endif // Identify compatibility class for VM's architecture and library's architecture diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 293787792d..0a67e7a3ec 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2fdd23261526362d4aaf58323441d4c31d29de2e374ba94bbf2727a00adc0ea7 openjdk-17.0.2+8.tar.gz -sha256 0e859cc03378439023e17ee82aecee5a52265fb38906a8bebf16027aa2b2bcf5 openjdk-11.0.14.1+1.tar.gz +sha256 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472 openjdk-17.0.6+10.tar.gz +sha256 04af71fc7adda41a49861870f9ec0ac0f059c2cf9393ce32995ea8ef4279a1b1 openjdk-11.0.18+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 42d52d57c4..0fe506bbfd 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.2+8 +OPENJDK_VERSION_MINOR = 0.6+10 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.14.1+1 +OPENJDK_VERSION_MINOR = 0.18+10 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) -- 2.39.1 From fontaine.fabrice at gmail.com Wed Feb 15 22:49:21 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 15 Feb 2023 23:49:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: libseccomp is mandatory Message-ID: <20230215224921.20138-1-fontaine.fabrice@gmail.com> libseccomp is mandatory since bump to version 23.0.0 in commit 485b47e025541a58358d8852c600b8e7644b4ec6: https://github.com/moby/moby/pull/42501 Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=15321 Signed-off-by: Fabrice Fontaine --- package/docker-engine/Config.in | 10 ++++++++-- package/docker-engine/docker-engine.mk | 7 +------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index b5a356eab9..570b2ff681 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -5,9 +5,12 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # containerd -> runc depends on BR2_USE_MMU # containerd + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # libseccomp select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency + select BR2_PACKAGE_LIBSECCOMP help Docker is a platform to build, ship, and run applications as lightweight containers. @@ -48,8 +51,11 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS endif -comment "docker-engine needs a glibc or musl toolchain w/ threads" +comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 3.17" 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 || BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 depends on BR2_USE_MMU diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 14c6d8d9d6..28ae8365a8 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -10,7 +10,7 @@ DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE -DOCKER_ENGINE_DEPENDENCIES = host-pkgconf +DOCKER_ENGINE_DEPENDENCIES = host-pkgconf libseccomp DOCKER_ENGINE_GOMOD = github.com/docker/docker DOCKER_ENGINE_CPE_ID_VENDOR = mobyproject @@ -31,11 +31,6 @@ DOCKER_ENGINE_DEPENDENCIES += libapparmor DOCKER_ENGINE_TAGS += apparmor endif -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -DOCKER_ENGINE_TAGS += seccomp -DOCKER_ENGINE_DEPENDENCIES += libseccomp -endif - ifeq ($(BR2_INIT_SYSTEMD),y) DOCKER_ENGINE_DEPENDENCIES += systemd DOCKER_ENGINE_TAGS += systemd journald -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 15 22:59:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 15 Feb 2023 23:59:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-marshmallow: add CPE variables Message-ID: <20230215225947.26078-1-fontaine.fabrice@gmail.com> cpe:2.3:a:marshmallow_project:marshmallow is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Amarshmallow_project%3Amarshmallow Signed-off-by: Fabrice Fontaine --- package/python-marshmallow/python-marshmallow.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-marshmallow/python-marshmallow.mk b/package/python-marshmallow/python-marshmallow.mk index 6427296508..ba6da6b29c 100644 --- a/package/python-marshmallow/python-marshmallow.mk +++ b/package/python-marshmallow/python-marshmallow.mk @@ -10,5 +10,7 @@ PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/5e/59/dd465e5a PYTHON_MARSHMALLOW_SETUP_TYPE = setuptools PYTHON_MARSHMALLOW_LICENSE = MIT PYTHON_MARSHMALLOW_LICENSE_FILES = LICENSE +PYTHON_MARSHMALLOW_CPE_ID_VENDOR = marshmallow_project +PYTHON_MARSHMALLOW_CPE_ID_PRODUCT = marshmallow $(eval $(python-package)) -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 15 23:04:13 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 16 Feb 2023 00:04:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-webargs: add CPE variables Message-ID: <20230215230413.28610-1-fontaine.fabrice@gmail.com> cpe:2.3:a:webargs_project:webargs is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Awebargs_project%3Awebargs Signed-off-by: Fabrice Fontaine --- package/python-webargs/python-webargs.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-webargs/python-webargs.mk b/package/python-webargs/python-webargs.mk index e048d8a4ac..ce270842c1 100644 --- a/package/python-webargs/python-webargs.mk +++ b/package/python-webargs/python-webargs.mk @@ -10,5 +10,7 @@ PYTHON_WEBARGS_SITE = https://files.pythonhosted.org/packages/4b/7d/fece8e6547b3 PYTHON_WEBARGS_SETUP_TYPE = setuptools PYTHON_WEBARGS_LICENSE = MIT PYTHON_WEBARGS_LICENSE_FILES = LICENSE +PYTHON_WEBARGS_CPE_ID_VENDOR = webargs_project +PYTHON_WEBARGS_CPE_ID_PRODUCT = webargs $(eval $(python-package)) -- 2.39.0 From cps at microplex.com Thu Feb 16 01:15:23 2023 From: cps at microplex.com (Cem Sezer) Date: Wed, 15 Feb 2023 17:15:23 -0800 Subject: [Buildroot] Having trouble getting a simple cmake based custom package to work In-Reply-To: <40f6ba58-7cda-d062-960f-17ada0c85b24@mind.be> References: <40f6ba58-7cda-d062-960f-17ada0c85b24@mind.be> Message-ID: Hello Arnout, Thank you for your reply. I realize this was a silly question and I did fix it by adding install(TARGETS helloworld_c_cmake DESTINATION bin) to CMakeLists.txt. I appreciate the helpfulness of this community. I have been tinkering with a larger project and am using this one as a reference. Kind regards, Cem On Wed, Feb 15, 2023 at 12:23 PM Arnout Vandecappelle wrote: > > > On 15/02/2023 01:10, Cem Sezer wrote: > > Hello, > > > > I'm looking to continue this thread as I have the exact same problem. > > > > http://lists.busybox.net/pipermail/buildroot/2020-August/591250.html > > > > > > The latest entry in the thread is the following, discussing the error > message > > "/No rule to make target 'install/fast': /is where I'm stuck at the > moment: > > > >>/However, when it is />/trying to install my package I have a new error. > The system seems to be />/looking for a install/fast target, which the > Makefil does not have. / > > I have no idea on that problem. Maybe read the CMake docs again? > > > > https://cmake.org/cmake/help/latest/command/install.html < > https://cmake.org/cmake/help/latest/command/install.html> > > > > Greets > > Alex > > > > I am still new to cmake, but I've been having trouble getting a basic > > helloworld (in C) cmake package to work. I looked at that link above for > the > > cmake docs, but am unfamiliar with what I need to do here. My > CMakeLists.txt > > right now is just the following: > > > > cmake_minimum_required(VERSION 3.1.0) > > > > project(helloworld_c_cmake LANGUAGES C) > > > > set(SOURCES main.c) > > > > add_executable(${PROJECT_NAME} ${SOURCES}) > > Since there is no installation rule in the CMakeLists.txt, the > install/fast > target is not going to be generated. The link above to the cmake > documentation > explains how to add an installation rule. > > Regards, > Arnout > > > > > > > Any pointers in the right direction would be appreciated. Perhaps this > is more > > of a cmake question than a buildroot question, but tying the two > together has > > been confusing, and I'm sure it must be something simple. Thanks in > advance, > > > > Cem > > > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From Afshin.Pir at gallagher.com Thu Feb 16 02:43:30 2023 From: Afshin.Pir at gallagher.com (Afshin Pir) Date: Thu, 16 Feb 2023 02:43:30 +0000 Subject: [Buildroot] Can I enable a config option from command line? Message-ID: Hi When building buildroot, I use a default config file. But there is only 1 option (BR2_ENABLE_RUNTIME_DEBUG=y) which is not in config file by default, and I want to enable it by command line when building buildroot. Is there any way to achieve this? Best Regards, Afshin ________________________________ This email is confidential and may contain information subject to legal privilege. If you are not the intended recipient please advise us of our error by return e-mail then delete this email and any attached files. You may not copy, disclose or use the contents in any way. The views expressed in this email may not be those of Gallagher Group Ltd or subsidiary companies thereof. ________________________________ -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Thu Feb 16 06:46:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 16 Feb 2023 06:46:09 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-15 Message-ID: <20230216064614.ED83E81F8A@smtp1.osuosl.org> Hello, Autobuild statistics for 2023-02-15 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 2 | 2 | 0 | 4 | 2022.11.x | 19 | 21 | 0 | 40 | master | 176 | 172 | 2 | 350 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 14 unknown | 9 gobject-introspection-1.72.0 | 6 host-binutils-2.38 | 6 host-pahole-1.24 | 6 python-numpy-1.23.5 | 5 elfutils-0.186 | 4 gerbera-1.10.0 | 4 host-binutils-2.37 | 4 host-rust-1.67.0 | 4 linux-6.1.11 | 4 olsr-0.9.8 | 4 glibc-2.36-81-g4f4d7a13edfd... | 3 host-go-1.19.6 | 3 libgpg-error-1.46 | 3 pistache-3ec9d7c4f8b828fdd3... | 3 busybox-1.36.0 | 2 containerd-1.6.16 | 2 dmalloc-5.6.5 | 2 fs/ubifs/ubifs.mk:49: /home... | 2 host-binutils-2.39 | 2 host-go-1.19.5 | 2 janet-1.26.0 | 2 libcap-ng-0.8.3 | 2 libglib2-2.72.3 | 2 perl-5.36.0 | 2 php-8.2.2 | 2 quickjs-2021-03-27 | 2 sdl-1.2.15 | 2 systemd-252.4 | 2 uccp420wlan-6.9.1 | 2 ace-7.0.6 | 1 asterisk-16.29.1 | 1 binutils-arc-2020.09-release | 1 docker-cli-23.0.0 | 1 efivar-38 | 1 f2fs-tools-1.15.0 | 1 faad2-2.10.1 | 1 ffmpeg-4.4.3 | 1 fluent-bit-2.0.9 | 1 fontconfig-2.13.1 | 1 fs/romfs/romfs.mk:32: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fwts-22.09.00 | 1 gdal-3.5.2 | 1 gmp-6.2.1 | 1 gobject-introspection | 1 google-breakpad-c85eb4a59b6... | 1 host-gcc-final-12.2.0 | 1 host-gcc-initial-11.3.0 | 1 host-libarchive-3.6.2 | 1 host-runc-1.1.4 | 1 libbytesize-2.7 | 1 libeastl-45469730d641868ce0... | 1 libgcrypt | 1 libgcrypt-1.10.1 | 1 libglvnd-1.4.0 | 1 libgpgme-1.17.1 | 1 libnss-3.88.1 | 1 libtommath-1.2.0 | 1 libuci-4b3db1179747b6a67790... | 1 linux-5.10.162-cip24-rt10 | 1 ltp-testsuite-20220930 | 1 lttng-modules-2.13.7 | 1 luvi-2.13.0 | 1 ne10-1.2.1 | 1 netsniff-ng-0.6.8 | 1 ntp-4.2.8p15 | 1 numactl-2.0.16 | 1 nut-2.8.0 | 1 ocf-linux-20171122 | 1 open-iscsi-2.1.8 | 1 package/multipath-tools/mul... | 1 pcre2-10.42 | 1 php-xdebug-3.0.4 | 1 pv-1.6.20 | 1 ramspeed-2.6.0 | 1 rtl8812au-aircrack-ng-e7a4a... | 1 rtl8821cu-86cc5ceb7c28b9b99... | 1 skalibs-2.12.0.1 | 1 sudo-1.9.12p2 | 1 ti-k3-r5-loader-2022.10 | 1 ulog-0389d243352255f6182326... | 1 valgrind-3.19.0 | 1 wolfssl-5.5.3 | 1 xenomai-3.0.10 | 1 zabbix-6.2.7 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc64 | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/9dee7c09fd7b41d276df0285a0f3dcae1a71f041 | ORPH arc | asterisk-16.29.1 | NOK | http://autobuild.buildroot.net/results/edd90eaf31d82be58f7ed500a85a3ac3f0bdcc26 | arc | binutils-arc-2020.09-release | NOK | http://autobuild.buildroot.net/results/d5095669fca3dab51b6edaa4a637e4ac61fc7f09 | mipsel | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/35c59ac08f0bc6fdc39df8b2a218a51628234641 | ORPH mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/bbc39d279d983d13c17e0c4ea8a3a57190e0f358 | ORPH x86_64 | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/04fb1b05f94f581f5f4b57e360c4980c39bb01d4 | x86_64 | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/ed6b51115da0bab32546a98a0fa0099904c02b57 | powerpc | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/ca04d74e204eeeef2032a31d384864130539690b | ORPH i686 | dmalloc-5.6.5 | NOK | http://autobuild.buildroot.net/results/564b0c6b7d737cd460f1d807cae2e7715f350164 | ORPH x86_64 | docker-cli-23.0.0 | NOK | http://autobuild.buildroot.net/results/fb892eb343f2912c6bf7e72552eb8c2302fd31c4 | aarch64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/20d5fdce075fe996637a5fac884a62df42cfb7ab | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/28ac1df2acf9fd6d438c67d27e73de29583ba573 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/4cfcaa3245ab76b0680def6cbd736bfea61e82a3 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/5dcbfd961f72f6c0f794c1f6dd6c844526ce09dc | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/43c426b0350561273729c3ddfaedc1ae6fbf4d9b | ORPH or1k | f2fs-tools-1.15.0 | NOK | http://autobuild.buildroot.net/results/395c54dedc7edc97bd866bdff619a01bcd9e74ec | sh4 | faad2-2.10.1 | NOK | http://autobuild.buildroot.net/results/21e55f05bc0b5c0caaa02c86b83cbb52ace570e7 | aarch64 | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/5a8003d832d7797940618038bddee63cda6f4813 | mips | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/f697ada67a6f7f45665f2f9ef938e992cbcb75cc | ORPH sparc64 | fs/romfs/romfs.mk:32: /tmp/... | NOK | http://autobuild.buildroot.net/results/a3f816874bde147c478e89171cc95fca5ea05b62 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/f4ddf4c900d92f88510818092caa1930d550b0b4 | mipsel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/01c7d1dbf2301a5eb270789c9cc4459ed47149e5 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/ab36eac01244c5c23bdaa8aed7e29985082a3caf | sh4eb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/09b849fadab3476b3cce7bcc0139dcff4f544ec7 | arceb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/2a74bbf23ddcae18d160f84c5bacbdfb7ed8e2e2 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/3afbc3deb52c73b110a4d01b048a93b0427612b4 | mips | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/fe79afaa525785565385b1ad553f9059dcfa2d2e | sparc | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/114dc758207d617072b67d7c8432b357ce6dedb4 | x86_64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/6d3873761d80a8cf727231290426cdc165f96964 | aarch64 | fwts-22.09.00 | NOK | http://autobuild.buildroot.net/results/007ed25ac8689801dd95a15ea2a2fdac70f8ec46 | sh4aeb | gdal-3.5.2 | NOK | http://autobuild.buildroot.net/results/2ddcfaf126f86d37b5c343b87173f5759fe68dcf | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/b0c70e27eca65892a5220cfd9ada62c2e4beca1b | microblaze | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/6cbb6a7627d28da11a942076d7372e80e1122388 | powerpc | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/d7933c062904ffac486d7b6fc99845757b193734 | riscv64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/db582b9c53485c665f9f76b9e8103a34afb4e59a | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/7a8fb93a1598c356d5e034a3a504fa2fddbeae73 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/c6d6759e37987ff38659b306b7dada8f063d98da | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e355df7965a7e2ac0a785234c0ac88ecef1a46cc | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/7a025d36a2d80a572ac149997ab2b0f86d95f71c | ORPH aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/71e49ffc3f3bfb61778eb4513fc955bc94e7d003 | mips | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/558ec000cb42b0e01f4c3adb36b5b5a4392547e4 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/d0d3f84f734878799323c2bc5b4f93f2265ba9d2 | powerpc64le | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9c31284d7938120c85331209cd16d4b5b4fd9126 | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/8f86c366c190164241afb633456e44d5fc0edc8d | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/650bb8155b416d7e4fe39d66111db3a3a69828c3 | sh4aeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9ddfdfb65c93c0c294e7f6de92bae33298fad931 | arm | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a5267685e4f59ac91026d855b3659d11dcb97ec5 | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9cc154310710ed0dc617205e25d614542b7bb776 | sparc | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/612d91c134e383ab1fa124fc56561cd5803350b5 | m68k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9a4b09625ec3bac6eb705294b610e06f70df83c2 | i686 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ce63a0fc33c013e2a3fb9324e5d1a60ea1f2fdb0 | mips64el | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/370f2a6f70d934445053d7d6ad310ee89690ef1a | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a729120c817cc3c622c4ffebabc0bce81768c6af | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/3964a399be9c56beca82915e36f5bbcd6332ab2a | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/bb0e1f8db351a97e115705821f17db1ff18be563 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8676a8d36e73a8602543815d7b1bdc70fbe2f12e | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/114c2c647c064edf6494c03f2aa159908dd854d1 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/db3ff08df89f905c17a568eae4318ef061684921 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/053f7b5920992c55692a993fc902cceb53d00d93 | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/348949355ea2921bf1cb20eaa0a6aa769aee275a | ORPH arm | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/9ebc690eb3bed788dc5252639c99c91aad335802 | armeb | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/c2c742ccc125980d88116c0c777fc007aa346fb6 | microblazeel | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/e3c4784a64acdec47c554f779b5e370284b65213 | mips64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/66f3ef307cb08d595213c0e10643f0d1356ad9c1 | mipsel | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/30221c558845fd3eb7a8aa81e064e77bb9edc997 | powerpc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/ed943af65e7b7042baf101f055f122aa4fd993ab | sh4a | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6f40bfc68fc80b8dd1963ecb35499189a5e131da | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/b27edb2fb36cc90c074934bb71e67436c63426f0 | powerpc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1fe1f648fe816cacd7bae26d1a137ceeb486aad9 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/48e8d30ce201499453a715aacfdcc6c58d71ebf6 | mips64el | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/13a81e35b4f6f20e543209685c5a0f19daa9d524 | sparc64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/f6b2611f2a85a2b898776238dc65d8bae64f85e5 | or1k | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/6761c39ed46dbde67a5802d1f6ecc77e35c227fd | armeb | host-gcc-final-12.2.0 | NOK | http://autobuild.buildroot.net/results/c2716aab33032c359066adbfcf4cb43bcfc188c5 | aarch64_be | host-gcc-initial-11.3.0 | NOK | http://autobuild.buildroot.net/results/bc2a4fc35f9046c129ddb466620297a5510b69d2 | aarch64_be | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/fdabf629cc9804a8adce13d224f02c25b929b94a | mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/1005227f1187703c6e41347aaf46f9e971fab5bf | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/831b282445ac3a6ea84c9175426afb548265fbed | aarch64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/fde8e1bd837cb7006b6d4652bc45a14f25a2a834 | riscv64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/ffa6f19195a9c4577f40379c457b390d4211ba68 | riscv64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/1348173539dd09d4e4ed4e45f539f3596be1708f | m68k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/0e6181ac6db1d0b9fc5c7c5f145208b8c5e9b1a5 | xtensa | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/dcada09cb1f17294b07d9c5bc215a07613004843 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1263b7d898db47d050ae5fc803b557f462e26749 | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/6354c390fb8ffede7f4f0480bc943f323f1b0bf6 | s390x | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/19d0010080d12aae4eef347ed58513aace5f8951 | sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/fa0b8293b4ac25a0edc7fe941fa4f181801362a0 | microblaze | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/bfa50d8c1bf3adbf8092871f828f9bf77181314b | mips | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/c8f86e360bcfdf801bb1d043b8761c41f65adc39 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/1f38aaaed7b9b0fc72f551d250c1ff68f3a69fe9 | mips | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/5fe1501db6e9cca674d1c02696cd405d10d5f2ce | arm | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/6ab84de8c6aa656136896fee5b2ba9f8d4f56c36 | arm | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/ae9d8d27c76f0e20972c7874ef0246eec0cf5aab | arm | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/a2b40adb93b751221ba2cdf9a705f86c30499021 | arceb | libbytesize-2.7 | NOK | http://autobuild.buildroot.net/results/f8f12e584b01c33e9b28f2ad04bbf980ccaff576 | ORPH riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/ef5c3a28f3b207278b841e57ffc3cc97a1430acb | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/adf960f787d5552cfaa12c577f291bf3169d7b57 | powerpc | libeastl-45469730d641868ce0... | NOK | http://autobuild.buildroot.net/results/10ac7290112bfbf7b5d8da900c297bd65043b6a6 | ORPH arm | libgcrypt | TIM | http://autobuild.buildroot.net/results/7cca6a3d6aa8706d43ab32f1520891e1c0625558 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/b76290dbff3591b66d691da3bed1d6bcc0abe4d8 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/e37b9205ff33b1582aab9ca5e31f9fda30df428d | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/17f95aec4105e85dbd6d1528f6e7aff955d20b12 | microblaze | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/dbf03d1da34bbadab6bc4185e33eeaaf2821697a | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/d9ed87d42ea45a93539990169903d83cb07e7307 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/07c84368de3aca4af2cdc797d8ab24ed5c3d86cb | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/8548fbcb56cc7c94657998565299c89bccc897f9 | ORPH nios2 | libgpgme-1.17.1 | NOK | http://autobuild.buildroot.net/results/23849de6eb48fc48f3ee183392a8769d953309ce | ORPH powerpc | libnss-3.88.1 | NOK | http://autobuild.buildroot.net/results/4e74dffc2c9e99c7afe4fce01f92fa218f787924 | arceb | libtommath-1.2.0 | NOK | http://autobuild.buildroot.net/results/56d68bb58b2b73af8bc684e43d0bb9fb971b23c8 | mipsel | libuci-4b3db1179747b6a67790... | NOK | http://autobuild.buildroot.net/results/1afb8ea81fc2f465b4db48f39ab0cdb346c759fe | nios2 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/b7140d4a80341e61cc8ec02e162cd1664853e210 | ORPH powerpc | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4b4edb08df2f3dc43eddd5c736be3a1d39262fbf | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/71c4623660a7b2870d14a07c373e2da2293a19a9 | ORPH arm | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/8eb868da489b6d2466482ed6835413d660435b55 | ORPH sh4 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/96e2d05665618db9becc1a6e64ce57b12e11b362 | ORPH x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/279978413aaf705449021240d077f728be3b3a42 | sparc64 | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/2079df94060d516eb9f6d2e9c75cc5a82d7bb3fc | aarch64_be | luvi-2.13.0 | NOK | http://autobuild.buildroot.net/results/826aa550f3d4708012a0b3988e2ba7079a6ae67d | ORPH aarch64 | ne10-1.2.1 | NOK | http://autobuild.buildroot.net/results/fb4f8a89be41c63ebfaa3cbb3498be863528277d | s390x | netsniff-ng-0.6.8 | NOK | http://autobuild.buildroot.net/results/5e90a5776ba1e4ab70e426710516024f0adb1be3 | riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/3655f09519fe0b0f568163924654e81c5ff12e82 | ORPH or1k | numactl-2.0.16 | NOK | http://autobuild.buildroot.net/results/f3bf23693ac4bf1e7502d43812fdce7af56e8a7d | armeb | nut-2.8.0 | NOK | http://autobuild.buildroot.net/results/4b47b15f44c8c5c163b0ec5ad23be962126b4195 | arceb | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/45a37b89375253d0bc643107c75a580979f62f82 | ORPH mips | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/0a2e9480512d73a6c7909f4eeda68a1fe5d8fd96 | ORPH arm | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/3fe72e5033b226abebbdb379d4cd0955896ae7e1 | ORPH powerpc64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/8f6995ecd0f6d6fb45ced55a3c5bcd26356ef828 | ORPH sh4 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/aeedbefdd815fdad7984890d2bb30254fc4a4412 | ORPH aarch64_be | open-iscsi-2.1.8 | NOK | http://autobuild.buildroot.net/results/2824c76a36b52eef4db0710e92635b31ddb0ebbc | mipsel | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/ab93da32395b927bd842b719ad420e897c2cae03 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/e209b583b19f7dfc77e369526f17186ea9150881 | ORPH arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/596bb2308a17d81907e25fd8184e38921a977347 | x86_64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/5ec54e6532511d2d7727a1682f057a837d5abb96 | or1k | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/970e569067040816150f532ef73a1716535a746d | microblaze | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/1eef48630c73124fe839630ea76d5834c94a3699 | mips | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/74a70b905738f6c9fb749bc20d638cc56a38ae98 | sparc | pistache-3ec9d7c4f8b828fdd3... | NOK | http://autobuild.buildroot.net/results/2bcf650d5d807b754cb578d11064168475c3ba0e | ORPH powerpc64le | pistache-3ec9d7c4f8b828fdd3... | NOK | http://autobuild.buildroot.net/results/07bc9c3a0534925dfdb69eccdc17e3e248d902c8 | ORPH powerpc64le | pistache-3ec9d7c4f8b828fdd3... | NOK | http://autobuild.buildroot.net/results/9252c91ba8a6a70aa84b8af5b3297e5a949bbd78 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/88a8a4dccafd5423cc8c3240d90f9ae4b412e8f4 | ORPH mips | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/bfcf764b4e7a2de3548358acef05f3ca06b426ee | sh4aeb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/d29b531c6ae27c1fff8199d9cf478d555ffc461d | arm | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/096ce470b745ccebe739d7ddf3374bbf6cc6d432 | armeb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/80f902b9cf65dd9d99e5db4647d6d0284a990e63 | i686 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/76203c0f16442b0e7174dc29b6bf863eecee10fa | microblaze | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/4f82a8fc3e2545198594bc8228c95649bb6cf0c6 | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/3c1a5695721fa86fccc9444d271d3e04df88c7a7 | sh4 | ramspeed-2.6.0 | NOK | http://autobuild.buildroot.net/results/63021e4c7a7e6149fdc8d900bce3e1c9f5fec8c7 | ORPH riscv32 | rtl8812au-aircrack-ng-e7a4a... | NOK | http://autobuild.buildroot.net/results/c68c83efbec390a2f39b7784e99ae300cf568963 | s390x | rtl8821cu-86cc5ceb7c28b9b99... | NOK | http://autobuild.buildroot.net/results/9703c3067acc6de5d5c90e26867c61ef31415b1a | sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/76152e101e5fc47dbce0506dd40cc2d8313f4f82 | ORPH sh4eb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/201453b922cfe2526ce3d0cdcc81bd6041f7f744 | ORPH or1k | skalibs-2.12.0.1 | NOK | http://autobuild.buildroot.net/results/3c1cff653bb292c4b21c09d666dc133362f541ef | sparc | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/df6fb63ed00b8ecba58dd87e5c1f3eb6acd1512a | ORPH sh4aeb | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/2e590d737a6d87af621cb2efbd340a51a084c62a | aarch64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/5aa4e1c4b33c1f7bbc0fc3005a167683ee0b1cf1 | aarch64 | ti-k3-r5-loader-2022.10 | NOK | http://autobuild.buildroot.net/results/5a6fcf5240a480ae95fcc813cf8bbc86ce971bfc | powerpc64le | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/4c3c2e73503e9853a0438152eedba8c2b4e1fb03 | ORPH aarch64_be | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/f5f24537d2eb61c6b6153fb2a7449cc5cc21f397 | ORPH mips | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/50e0a33f098ea65c98166e03ae7a2e54b755bea7 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/752882340cb98262dcb30fe8de44d75d551ae5ab | or1k | unknown | NOK | http://autobuild.buildroot.net/results/9a0a20fb626388cccb0d8d74cc18bb460b020dd6 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/3358fdbf5a3f085c61a5fac3530a1eb319521617 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/00064694f299645b93d9cf32d306902a2629f209 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/da19efbcd7e59fbc2a17fed8eb6844f44f49149d | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/1e57940eb7befbc3e195331de641d8c97683f8b5 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/ed28778ccfdddc3024295b556fd61c4b04cc44ac | m68k | unknown | NOK | http://autobuild.buildroot.net/results/64756b7c39d58970b92699592d00ed7c715c3db6 | sparc | unknown | NOK | http://autobuild.buildroot.net/results/4e717ecc9cf4ec499a38cae02a70fd83e5439747 | powerpc | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/dd12aad7d0fbd1715e99a4947a6ad03943132b1c | ORPH mips | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/2726191bf46eabd7d07f166c5cc3b10ba12958c9 | i686 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/64a1bacec2b269edd7c860bf95ea30ed7a446001 | or1k | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/140700d627d2bd2e434043004245417a2a6ff24d | Classification of failures by reason for 2022.02.x -------------------------------------------------- janus-gateway-0.11.6 | 1 xxhash-0.8.1 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- s390x | janus-gateway-0.11.6 | NOK | http://autobuild.buildroot.net/results/41c09230991e92b72d253fe367a6f3f7dafcc223 | xtensa | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/88d82df24df5a97786a1660b17b821d94f7d77d5 | ORPH Classification of failures by reason for 2022.11.x -------------------------------------------------- zabbix-5.4.9 | 2 alsa-lib-1.2.8 | 1 bind-9.16.33 | 1 cmocka-1.1.5 | 1 gerbera-1.10.0 | 1 google-breakpad-c85eb4a59b6... | 1 heirloom-mailx-12.5 | 1 host-binutils-2.38 | 1 host-go-1.19.5 | 1 host-pahole-1.24 | 1 jailhouse-0.12 | 1 libglib2-2.72.3 | 1 lirc-tools-0.10.2 | 1 php-8.1.14 | 1 protobuf-21.8 | 1 unknown | 1 wolfssl-5.5.3 | 1 xfsprogs-5.14.2 | 1 xxhash-0.8.1 | 1 zeek-4.1.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64le | alsa-lib-1.2.8 | NOK | http://autobuild.buildroot.net/results/de5d3c180ab51fb0f19b4551b60c6884baaf9192 | sh4a | bind-9.16.33 | NOK | http://autobuild.buildroot.net/results/2be53d1fc13680c7cc31196dbb735034987e8121 | ORPH powerpc64le | cmocka-1.1.5 | NOK | http://autobuild.buildroot.net/results/8326373f22cce83ebcd7aea0a219a45e4645cf7a | s390x | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/faba16c36c273c11a74560919362e5666787d711 | arm | google-breakpad-c85eb4a59b6... | NOK | http://autobuild.buildroot.net/results/5e78ef3d8f127caf3fccf39e593dd1e69e893513 | sh4eb | heirloom-mailx-12.5 | NOK | http://autobuild.buildroot.net/results/864bdaa0b383f9a08f8ae98a8ffe4bc818332302 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/93f87ab4a0fb73fe12a04de2ff929c816c963f93 | aarch64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/bb678da4257cc242a11064ab833f70c41e7bc7f4 | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/146c0f3b2f77433d9fae537b5a58796b46497d9e | x86_64 | jailhouse-0.12 | NOK | http://autobuild.buildroot.net/results/d1214a859b16f20245c1a9233789f6e0288f1327 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/4222a8780f024080418030a42953829feb9f1e7f | mips64el | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/b1c5adf9f0217e103022b8ffbd7eb17f273e43c3 | ORPH microblaze | php-8.1.14 | NOK | http://autobuild.buildroot.net/results/4ceb4260eb65dbd93030b660b95610b5176618a5 | m68k | protobuf-21.8 | NOK | http://autobuild.buildroot.net/results/79def34b9ab4a8ed31fdeeaa7bec01d2463dbe8c | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/d20ef9c42d0947969ce5a26b31d74254fcc7b584 | riscv32 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/c39291824fd024720742331d215b658b6f85bdd4 | mipsel | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/9cbcf60f60fe53708dc903f89281a8a510e77ca4 | ORPH mips64el | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/9270aea763bbddfc85fe9cd9c5e9066ace1ba1ab | ORPH nios2 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/2168e3a8a87f05b7795622b26ede3bb5200846d7 | mips64el | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/1e1aa4d154fb54118a237886a524cb6a5cffa591 | x86_64 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/adfb64477ed6b5a08341f3bbfcbb9d7c16fcd855 | Gitlab CI results for 2023-02-15 ================================ -- http://autobuild.buildroot.net From nolange79 at gmail.com Thu Feb 16 08:47:13 2023 From: nolange79 at gmail.com (Norbert Lange) Date: Thu, 16 Feb 2023 09:47:13 +0100 Subject: [Buildroot] [PATCH v2] package/zstd: bump to version 1.5.4 Message-ID: <20230216084714.85507-1-nolange79@gmail.com> The LICENSE text has changed, nominally the copyright owner changed from "Facebook" to "Meta Platforms, Inc. and affiliates", reflecting the name change of that company. Add upstream patch to fix zstd-dll build. Signed-off-by: Norbert Lange --- v1->v2: recreate upstream patch with git-formatpatch --- ...-dll-build-missing-dependencies-3496.patch | 321 ++++++++++++++++++ package/zstd/zstd.hash | 6 +- package/zstd/zstd.mk | 2 +- 3 files changed, 325 insertions(+), 4 deletions(-) create mode 100644 package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch diff --git a/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch new file mode 100644 index 0000000000..60737159c6 --- /dev/null +++ b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch @@ -0,0 +1,321 @@ +From e47c7c0d5a923dcdc3b302f9944eb4a70b7ee0be Mon Sep 17 00:00:00 2001 +From: Yonatan Komornik <11005061+yoniko at users.noreply.github.com> +Date: Sun, 12 Feb 2023 12:32:31 -0800 +Subject: [PATCH] Fix zstd-dll build missing dependencies (#3496) + +* Fixes zstd-dll build (https://github.com/facebook/zstd/issues/3492): +- Adds pool.o and threading.o dependency to the zstd-dll target +- Moves custom allocation functions into header to avoid needing to add dependency on common.o +- Adds test target for zstd-dll +- Adds github workflow that buildis zstd-dll + +[nolange79: backport from upstream c78f434aa4f5f1097c8edb975f4c1635817a5a71] +Signed-off-by: Norbert Lange +--- + .github/workflows/dev-short-tests.yml | 9 +++- + contrib/linux-kernel/zstd_common_module.c | 3 -- + lib/common/allocations.h | 55 +++++++++++++++++++++++ + lib/common/pool.c | 2 +- + lib/common/zstd_common.c | 35 --------------- + lib/common/zstd_internal.h | 5 --- + lib/compress/zstd_compress.c | 1 + + lib/compress/zstd_cwksp.h | 1 + + lib/compress/zstdmt_compress.c | 1 + + lib/decompress/zstd_ddict.c | 1 + + lib/decompress/zstd_decompress.c | 1 + + programs/Makefile | 2 +- + tests/Makefile | 8 +++- + 13 files changed, 76 insertions(+), 48 deletions(-) + create mode 100644 lib/common/allocations.h + +diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml +index 132dbb99..3ae2e9da 100644 +--- a/.github/workflows/dev-short-tests.yml ++++ b/.github/workflows/dev-short-tests.yml +@@ -55,6 +55,14 @@ jobs: + run: | + make c89build V=1 + ++ build-zstd-dll: ++ runs-on: ubuntu-latest ++ steps: ++ - uses: actions/checkout at ac593985615ec2ede58e132d2e21d2b1cbd6127c # tag=v3 ++ - name: build zstd bin against a dynamic lib (debuglevel for more dependencies) ++ run: | ++ make -C lib lib-mt-release ++ DEBUGLEVEL=2 make -C programs zstd-dll + + gcc-7-libzstd: + runs-on: ubuntu-latest +@@ -328,7 +336,6 @@ jobs: + make -j -C programs allVariants MOREFLAGS=-O0 + ./tests/test-variants.sh + +- + qemu-consistency: + name: QEMU ${{ matrix.name }} + runs-on: ubuntu-20.04 +diff --git a/contrib/linux-kernel/zstd_common_module.c b/contrib/linux-kernel/zstd_common_module.c +index 2fead39e..466828e3 100644 +--- a/contrib/linux-kernel/zstd_common_module.c ++++ b/contrib/linux-kernel/zstd_common_module.c +@@ -24,9 +24,6 @@ EXPORT_SYMBOL_GPL(HUF_readStats_wksp); + EXPORT_SYMBOL_GPL(ZSTD_isError); + EXPORT_SYMBOL_GPL(ZSTD_getErrorName); + EXPORT_SYMBOL_GPL(ZSTD_getErrorCode); +-EXPORT_SYMBOL_GPL(ZSTD_customMalloc); +-EXPORT_SYMBOL_GPL(ZSTD_customCalloc); +-EXPORT_SYMBOL_GPL(ZSTD_customFree); + + MODULE_LICENSE("Dual BSD/GPL"); + MODULE_DESCRIPTION("Zstd Common"); +diff --git a/lib/common/allocations.h b/lib/common/allocations.h +new file mode 100644 +index 00000000..a3153c4b +--- /dev/null ++++ b/lib/common/allocations.h +@@ -0,0 +1,55 @@ ++/* ++ * Copyright (c) Meta Platforms, Inc. and affiliates. ++ * All rights reserved. ++ * ++ * This source code is licensed under both the BSD-style license (found in the ++ * LICENSE file in the root directory of this source tree) and the GPLv2 (found ++ * in the COPYING file in the root directory of this source tree). ++ * You may select, at your option, one of the above-listed licenses. ++ */ ++ ++/* This file provides custom allocation primitives ++ */ ++ ++#define ZSTD_DEPS_NEED_MALLOC ++#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ ++ ++#include "mem.h" /* MEM_STATIC */ ++#define ZSTD_STATIC_LINKING_ONLY ++#include "../zstd.h" /* ZSTD_customMem */ ++ ++#ifndef ZSTD_ALLOCATIONS_H ++#define ZSTD_ALLOCATIONS_H ++ ++/* custom memory allocation functions */ ++ ++MEM_STATIC void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) ++ return customMem.customAlloc(customMem.opaque, size); ++ return ZSTD_malloc(size); ++} ++ ++MEM_STATIC void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) { ++ /* calloc implemented as malloc+memset; ++ * not as efficient as calloc, but next best guess for custom malloc */ ++ void* const ptr = customMem.customAlloc(customMem.opaque, size); ++ ZSTD_memset(ptr, 0, size); ++ return ptr; ++ } ++ return ZSTD_calloc(1, size); ++} ++ ++MEM_STATIC void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) ++{ ++ if (ptr!=NULL) { ++ if (customMem.customFree) ++ customMem.customFree(customMem.opaque, ptr); ++ else ++ ZSTD_free(ptr); ++ } ++} ++ ++#endif /* ZSTD_ALLOCATIONS_H */ +diff --git a/lib/common/pool.c b/lib/common/pool.c +index f3d9d085..d5ca5a78 100644 +--- a/lib/common/pool.c ++++ b/lib/common/pool.c +@@ -10,9 +10,9 @@ + + + /* ====== Dependencies ======= */ ++#include "../common/allocations.h" /* ZSTD_customCalloc, ZSTD_customFree */ + #include "zstd_deps.h" /* size_t */ + #include "debug.h" /* assert */ +-#include "zstd_internal.h" /* ZSTD_customCalloc, ZSTD_customFree */ + #include "pool.h" + + /* ====== Compiler specifics ====== */ +diff --git a/lib/common/zstd_common.c b/lib/common/zstd_common.c +index 32085524..3f04c22a 100644 +--- a/lib/common/zstd_common.c ++++ b/lib/common/zstd_common.c +@@ -14,7 +14,6 @@ + * Dependencies + ***************************************/ + #define ZSTD_DEPS_NEED_MALLOC +-#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ + #include "error_private.h" + #include "zstd_internal.h" + +@@ -47,37 +46,3 @@ ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); } + /*! ZSTD_getErrorString() : + * provides error code string from enum */ + const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); } +- +- +- +-/*=************************************************************** +-* Custom allocator +-****************************************************************/ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) +- return customMem.customAlloc(customMem.opaque, size); +- return ZSTD_malloc(size); +-} +- +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) { +- /* calloc implemented as malloc+memset; +- * not as efficient as calloc, but next best guess for custom malloc */ +- void* const ptr = customMem.customAlloc(customMem.opaque, size); +- ZSTD_memset(ptr, 0, size); +- return ptr; +- } +- return ZSTD_calloc(1, size); +-} +- +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) +-{ +- if (ptr!=NULL) { +- if (customMem.customFree) +- customMem.customFree(customMem.opaque, ptr); +- else +- ZSTD_free(ptr); +- } +-} +diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h +index 37836dc7..1f942f27 100644 +--- a/lib/common/zstd_internal.h ++++ b/lib/common/zstd_internal.h +@@ -350,11 +350,6 @@ typedef struct { + const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx); /* compress & dictBuilder */ + int ZSTD_seqToCodes(const seqStore_t* seqStorePtr); /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */ + +-/* custom memory allocation functions */ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem); +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem); +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem); +- + + /* ZSTD_invalidateRepCodes() : + * ensures next compression will not use repcodes from previous block. +diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c +index b55f684c..173ce242 100644 +--- a/lib/compress/zstd_compress.c ++++ b/lib/compress/zstd_compress.c +@@ -11,6 +11,7 @@ + /*-************************************* + * Dependencies + ***************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* INT_MAX, ZSTD_memset, ZSTD_memcpy */ + #include "../common/mem.h" + #include "hist.h" /* HIST_countFast_wksp */ +diff --git a/lib/compress/zstd_cwksp.h b/lib/compress/zstd_cwksp.h +index 97676693..9113cdbd 100644 +--- a/lib/compress/zstd_cwksp.h ++++ b/lib/compress/zstd_cwksp.h +@@ -14,6 +14,7 @@ + /*-************************************* + * Dependencies + ***************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ + #include "../common/zstd_internal.h" + + #if defined (__cplusplus) +diff --git a/lib/compress/zstdmt_compress.c b/lib/compress/zstdmt_compress.c +index 7a2c7172..bf2de4a7 100644 +--- a/lib/compress/zstdmt_compress.c ++++ b/lib/compress/zstdmt_compress.c +@@ -20,6 +20,7 @@ + + + /* ====== Dependencies ====== */ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memset, INT_MAX, UINT_MAX */ + #include "../common/mem.h" /* MEM_STATIC */ + #include "../common/pool.h" /* threadpool */ +diff --git a/lib/decompress/zstd_ddict.c b/lib/decompress/zstd_ddict.c +index ad5c34a7..309ec0d0 100644 +--- a/lib/decompress/zstd_ddict.c ++++ b/lib/decompress/zstd_ddict.c +@@ -14,6 +14,7 @@ + /*-******************************************************* + * Dependencies + *********************************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ + #include "../common/cpu.h" /* bmi2 */ + #include "../common/mem.h" /* low level memory routines */ +diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c +index d487966c..3f3ca57c 100644 +--- a/lib/decompress/zstd_decompress.c ++++ b/lib/decompress/zstd_decompress.c +@@ -55,6 +55,7 @@ + /*-******************************************************* + * Dependencies + *********************************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ + #include "../common/mem.h" /* low level memory routines */ + #define FSE_STATIC_LINKING_ONLY +diff --git a/programs/Makefile b/programs/Makefile +index fcff41dc..8507abef 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -225,7 +225,7 @@ zstd-noxz : zstd + .PHONY: zstd-dll + zstd-dll : LDFLAGS+= -L$(LIBZSTD) + zstd-dll : LDLIBS += -lzstd +-zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c ++zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c pool.c threading.c + zstd-dll : zstd + + +diff --git a/tests/Makefile b/tests/Makefile +index 3eed19ea..778c7d67 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -95,7 +95,7 @@ allnothread: fullbench fuzzer paramgrill datagen decodecorpus + dll: fuzzer-dll zstreamtest-dll + + .PHONY: zstd zstd32 zstd-nolegacy # only external makefile knows how to build or update them +-zstd zstd32 zstd-nolegacy: ++zstd zstd32 zstd-nolegacy zstd-dll: + $(MAKE) -C $(PRGDIR) $@ MOREFLAGS+="$(DEBUGFLAGS)" + + .PHONY: libzstd +@@ -328,13 +328,17 @@ test-all: test test32 test-decodecorpus-cli + test-zstd: ZSTD = $(PRGDIR)/zstd + test-zstd: zstd + ++.PHONY: test-zstd-dll ++test-zstd-dll: ZSTD = $(PRGDIR)/zstd ++test-zstd-dll: zstd-dll ++ + test-zstd32: ZSTD = $(PRGDIR)/zstd32 + test-zstd32: zstd32 + + test-zstd-nolegacy: ZSTD = $(PRGDIR)/zstd-nolegacy + test-zstd-nolegacy: zstd-nolegacy + +-test-zstd test-zstd32 test-zstd-nolegacy: datagen ++test-zstd test-zstd32 test-zstd-nolegacy test-zstd-dll: datagen + file $(ZSTD) + EXE_PREFIX="$(QEMU_SYS)" ZSTD_BIN="$(ZSTD)" DATAGEN_BIN=./datagen ./playTests.sh $(ZSTDRTTEST) + +-- +2.39.1 + diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index eca44b89f0..ca4e2fa0b9 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,6 +1,6 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 -sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.gz.sha256 +sha256 0f470992aedad543126d06efab344dc5f3e171893810455787d38347343a4424 zstd-1.5.4.tar.gz # License files (locally computed) -sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE +sha256 7055266497633c9025b777c78eb7235af13922117480ed5c674677adc381c9d8 LICENSE sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 73bb97a793..45e8bf1bc2 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.2 +ZSTD_VERSION = 1.5.4 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 -- 2.39.1 From thomas at devoogdt.com Thu Feb 16 09:26:16 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 16 Feb 2023 10:26:16 +0100 Subject: [Buildroot] [PATCH] package/lighttpd: bump to version 1.4.69 Message-ID: <20230216092616.2973294-1-thomas.devoogdt@barco.com> Changelog: - https://www.lighttpd.net/2023/1/3/1.4.68/ - https://www.lighttpd.net/2023/2/10/1.4.69/ In this commit: - rebased patch & dropped server.use-ipv6 option [2] - fix changed meson options [1] [1]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/376d20f1617f2c0202fb415e4cc66d3f780db5ca [2]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/6b31f76cd9b36b6033607181238fbf41c5b81e07 Signed-off-by: Thomas Devoogdt --- ...lt-lighttpd-configuration-file-to-ha.patch | 33 ++++------ package/lighttpd/lighttpd.hash | 4 +- package/lighttpd/lighttpd.mk | 64 +++++++++---------- 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch index 1a887655b8..2eab2a84e5 100644 --- a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +++ b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch @@ -1,11 +1,11 @@ -From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001 +From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Dec 2021 22:07:17 +0100 Subject: [PATCH] Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames - * Disable IPv6 + * Disable IPv6 (Dropped since 1.4.68) * Do not setuid to a user that doesn't exist on the system * Change the network backend to writev since linux-sendfile fails on buildroot @@ -13,13 +13,15 @@ Signed-off-by: Maxime Ripard Signed-off-by: Simon Dawson [Gustavo: update for 1.4.37] Signed-off-by: Gustavo Zacarias +[Thomas: update for 1.4.69 - drop server.use-ipv6] +Signed-off-by: Thomas Devoogdt --- doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) + doc/config/lighttpd.conf | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf -index e685d43..92cff4f 100644 +index e685d437..92cff4f0 100644 --- a/doc/config/conf.d/access_log.conf +++ b/doc/config/conf.d/access_log.conf @@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) @@ -32,7 +34,7 @@ index e685d43..92cff4f 100644 ## ## The default format produces CLF compatible output. diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index 495d2a1..c3e1446 100644 +index d45a284d..4e926d5a 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -13,8 +13,8 @@ @@ -46,16 +48,7 @@ index 495d2a1..c3e1446 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ server.port = 80 - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" +@@ -97,8 +97,8 @@ server.port = 80 ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -66,7 +59,7 @@ index 495d2a1..c3e1446 100644 ## ## Enable lighttpd to serve requests on sockets received from systemd -@@ -118,7 +118,7 @@ server.groupname = "lighttpd" +@@ -114,7 +114,7 @@ server.groupname = "lighttpd" ## ## Document root ## @@ -75,7 +68,7 @@ index 495d2a1..c3e1446 100644 ## ## The value for the "Server:" response field. -@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid" +@@ -140,7 +140,7 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## @@ -84,7 +77,7 @@ index 495d2a1..c3e1446 100644 ## ## If you want to log to syslog you have to unset the -@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf" +@@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf" ## and write(). Every modern OS provides its own syscall to help network ## servers transfer files as fast as possible ## @@ -94,5 +87,5 @@ index 495d2a1..c3e1446 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.34.1 +2.39.0 diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 8353857ad9..29bf5124b6 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.67.sha512sum -sha512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627 lighttpd-1.4.67.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum +sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index d3440040fb..ca2035b6b3 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).67 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -13,49 +13,49 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=false \ - -Dwith_fam=false \ + -Dwith_dbi=disabled \ + -Dwith_fam=disabled \ -Dwith_gnutls=false \ - -Dwith_libev=false \ - -Dwith_libunwind=false \ + -Dwith_libev=disabled \ + -Dwith_libunwind=disabled \ -Dwith_mbedtls=false \ -Dwith_nettle=false \ -Dwith_nss=false \ - -Dwith_pcre=false \ - -Dwith_sasl=false \ + -Dwith_pcre=disabled \ + -Dwith_sasl=disabled \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=true \ + -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli -LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +LIGHTTPD_CONF_OPTS += -Dwith_brotli=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +LIGHTTPD_CONF_OPTS += -Dwith_bzip=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 -LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +LIGHTTPD_CONF_OPTS += -Dwith_krb5=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) LIGHTTPD_DEPENDENCIES += openldap -LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +LIGHTTPD_CONF_OPTS += -Dwith_ldap=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) @@ -67,16 +67,16 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) LIGHTTPD_DEPENDENCIES += libmaxminddb -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mysql -LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) @@ -88,9 +88,9 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += -Dwith_pam=true +LIGHTTPD_CONF_OPTS += -Dwith_pam=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pam=false +LIGHTTPD_CONF_OPTS += -Dwith_pam=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) @@ -102,36 +102,36 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) LIGHTTPD_DEPENDENCIES += postgresql -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=enabled ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=enabled LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=disabled endif else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true +LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) LIGHTTPD_DEPENDENCIES += zstd -LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +LIGHTTPD_CONF_OPTS += -Dwith_zstd=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +LIGHTTPD_CONF_OPTS += -Dwith_zstd=disabled endif define LIGHTTPD_INSTALL_CONFIG -- 2.39.0 From thomas at devoogdt.com Thu Feb 16 09:41:02 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 16 Feb 2023 10:41:02 +0100 Subject: [Buildroot] [PATCH v2] package/lighttpd: bump to version 1.4.69 Message-ID: <20230216094102.2984308-1-thomas.devoogdt@barco.com> Changelog: - https://www.lighttpd.net/2023/1/3/1.4.68/ - https://www.lighttpd.net/2023/2/10/1.4.69/ In this commit: - rebased patch & dropped server.use-ipv6 option [1] - fix changed meson options [2] [1]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/376d20f1617f2c0202fb415e4cc66d3f780db5ca [2]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/6b31f76cd9b36b6033607181238fbf41c5b81e07 Signed-off-by: Thomas Devoogdt --- v2: fix git message url links --- ...lt-lighttpd-configuration-file-to-ha.patch | 33 ++++------ package/lighttpd/lighttpd.hash | 4 +- package/lighttpd/lighttpd.mk | 64 +++++++++---------- 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch index 1a887655b8..2eab2a84e5 100644 --- a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +++ b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch @@ -1,11 +1,11 @@ -From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001 +From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Dec 2021 22:07:17 +0100 Subject: [PATCH] Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames - * Disable IPv6 + * Disable IPv6 (Dropped since 1.4.68) * Do not setuid to a user that doesn't exist on the system * Change the network backend to writev since linux-sendfile fails on buildroot @@ -13,13 +13,15 @@ Signed-off-by: Maxime Ripard Signed-off-by: Simon Dawson [Gustavo: update for 1.4.37] Signed-off-by: Gustavo Zacarias +[Thomas: update for 1.4.69 - drop server.use-ipv6] +Signed-off-by: Thomas Devoogdt --- doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) + doc/config/lighttpd.conf | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf -index e685d43..92cff4f 100644 +index e685d437..92cff4f0 100644 --- a/doc/config/conf.d/access_log.conf +++ b/doc/config/conf.d/access_log.conf @@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) @@ -32,7 +34,7 @@ index e685d43..92cff4f 100644 ## ## The default format produces CLF compatible output. diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index 495d2a1..c3e1446 100644 +index d45a284d..4e926d5a 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -13,8 +13,8 @@ @@ -46,16 +48,7 @@ index 495d2a1..c3e1446 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ server.port = 80 - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" +@@ -97,8 +97,8 @@ server.port = 80 ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -66,7 +59,7 @@ index 495d2a1..c3e1446 100644 ## ## Enable lighttpd to serve requests on sockets received from systemd -@@ -118,7 +118,7 @@ server.groupname = "lighttpd" +@@ -114,7 +114,7 @@ server.groupname = "lighttpd" ## ## Document root ## @@ -75,7 +68,7 @@ index 495d2a1..c3e1446 100644 ## ## The value for the "Server:" response field. -@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid" +@@ -140,7 +140,7 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## @@ -84,7 +77,7 @@ index 495d2a1..c3e1446 100644 ## ## If you want to log to syslog you have to unset the -@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf" +@@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf" ## and write(). Every modern OS provides its own syscall to help network ## servers transfer files as fast as possible ## @@ -94,5 +87,5 @@ index 495d2a1..c3e1446 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.34.1 +2.39.0 diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 8353857ad9..29bf5124b6 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.67.sha512sum -sha512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627 lighttpd-1.4.67.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum +sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index d3440040fb..ca2035b6b3 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).67 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -13,49 +13,49 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=false \ - -Dwith_fam=false \ + -Dwith_dbi=disabled \ + -Dwith_fam=disabled \ -Dwith_gnutls=false \ - -Dwith_libev=false \ - -Dwith_libunwind=false \ + -Dwith_libev=disabled \ + -Dwith_libunwind=disabled \ -Dwith_mbedtls=false \ -Dwith_nettle=false \ -Dwith_nss=false \ - -Dwith_pcre=false \ - -Dwith_sasl=false \ + -Dwith_pcre=disabled \ + -Dwith_sasl=disabled \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=true \ + -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli -LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +LIGHTTPD_CONF_OPTS += -Dwith_brotli=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +LIGHTTPD_CONF_OPTS += -Dwith_bzip=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 -LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +LIGHTTPD_CONF_OPTS += -Dwith_krb5=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) LIGHTTPD_DEPENDENCIES += openldap -LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +LIGHTTPD_CONF_OPTS += -Dwith_ldap=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) @@ -67,16 +67,16 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) LIGHTTPD_DEPENDENCIES += libmaxminddb -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mysql -LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) @@ -88,9 +88,9 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += -Dwith_pam=true +LIGHTTPD_CONF_OPTS += -Dwith_pam=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pam=false +LIGHTTPD_CONF_OPTS += -Dwith_pam=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) @@ -102,36 +102,36 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) LIGHTTPD_DEPENDENCIES += postgresql -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=enabled ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=enabled LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=disabled endif else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true +LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) LIGHTTPD_DEPENDENCIES += zstd -LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +LIGHTTPD_CONF_OPTS += -Dwith_zstd=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +LIGHTTPD_CONF_OPTS += -Dwith_zstd=disabled endif define LIGHTTPD_INSTALL_CONFIG -- 2.39.0 From vincent.stehle at arm.com Thu Feb 16 10:07:50 2023 From: vincent.stehle at arm.com (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Thu, 16 Feb 2023 11:07:50 +0100 Subject: [Buildroot] [PATCH 1/2] configs/qemu_arm_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 Message-ID: <20230216100751.446662-1-vincent.stehle@arm.com> - Bump Linux kernel version to 6.1.12. - Bump U-Boot version to 2023.01 and follow CONFIG_SYS_TEXT_BASE renaming. Signed-off-by: Vincent Stehl? Cc: Romain Naour --- board/qemu/arm-ebbr/u-boot.fragment | 2 +- configs/qemu_arm_ebbr_defconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/qemu/arm-ebbr/u-boot.fragment b/board/qemu/arm-ebbr/u-boot.fragment index bfc382cde9..66fe910f16 100644 --- a/board/qemu/arm-ebbr/u-boot.fragment +++ b/board/qemu/arm-ebbr/u-boot.fragment @@ -31,5 +31,5 @@ CONFIG_PARTITION_TYPE_GUID=y CONFIG_RNG_OPTEE=y CONFIG_RTC_EMULATION=y CONFIG_SCMI_FIRMWARE=y -CONFIG_SYS_TEXT_BASE=0x60000000 CONFIG_TEE=y +CONFIG_TEXT_BASE=0x60000000 diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index f3e2d42a54..8fbb3069bc 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" @@ -42,7 +42,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -- 2.39.1 From vincent.stehle at arm.com Thu Feb 16 10:07:51 2023 From: vincent.stehle at arm.com (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Thu, 16 Feb 2023 11:07:51 +0100 Subject: [Buildroot] [PATCH 2/2] configs/qemu_aarch64_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 In-Reply-To: <20230216100751.446662-1-vincent.stehle@arm.com> References: <20230216100751.446662-1-vincent.stehle@arm.com> Message-ID: <20230216100751.446662-2-vincent.stehle@arm.com> - Bump Linux kernel version to 6.1.12. - Bump U-Boot version to 2023.01 and rename config fragment to make it clearer that it is not a complete config file. Signed-off-by: Vincent Stehl? Cc: Romain Naour --- .../qemu/aarch64-ebbr/{u-boot.config => u-boot.fragment} | 0 configs/qemu_aarch64_ebbr_defconfig | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename board/qemu/aarch64-ebbr/{u-boot.config => u-boot.fragment} (100%) diff --git a/board/qemu/aarch64-ebbr/u-boot.config b/board/qemu/aarch64-ebbr/u-boot.fragment similarity index 100% rename from board/qemu/aarch64-ebbr/u-boot.config rename to board/qemu/aarch64-ebbr/u-boot.fragment diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index d293ad0e60..e3157089a9 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -39,9 +39,9 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.config" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Host tools -- 2.39.1 From thomas at devoogdt.com Thu Feb 16 10:25:56 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 16 Feb 2023 11:25:56 +0100 Subject: [Buildroot] [PATCH v2] package/lighttpd: bump to version 1.4.69 Message-ID: <20230216102556.3047136-1-thomas.devoogdt@barco.com> Changelog: - https://www.lighttpd.net/2023/1/3/1.4.68/ - https://www.lighttpd.net/2023/2/10/1.4.69/ In this commit: - rebased patch & dropped server.use-ipv6 option [1] - fix changed meson options [2] [1]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/376d20f1617f2c0202fb415e4cc66d3f780db5ca [2]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/6b31f76cd9b36b6033607181238fbf41c5b81e07 Signed-off-by: Thomas Devoogdt --- v2: fix git message url links --- ...lt-lighttpd-configuration-file-to-ha.patch | 33 ++++------ package/lighttpd/lighttpd.hash | 4 +- package/lighttpd/lighttpd.mk | 64 +++++++++---------- 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch index 1a887655b8..2eab2a84e5 100644 --- a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +++ b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch @@ -1,11 +1,11 @@ -From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001 +From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Dec 2021 22:07:17 +0100 Subject: [PATCH] Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames - * Disable IPv6 + * Disable IPv6 (Dropped since 1.4.68) * Do not setuid to a user that doesn't exist on the system * Change the network backend to writev since linux-sendfile fails on buildroot @@ -13,13 +13,15 @@ Signed-off-by: Maxime Ripard Signed-off-by: Simon Dawson [Gustavo: update for 1.4.37] Signed-off-by: Gustavo Zacarias +[Thomas: update for 1.4.69 - drop server.use-ipv6] +Signed-off-by: Thomas Devoogdt --- doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) + doc/config/lighttpd.conf | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf -index e685d43..92cff4f 100644 +index e685d437..92cff4f0 100644 --- a/doc/config/conf.d/access_log.conf +++ b/doc/config/conf.d/access_log.conf @@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) @@ -32,7 +34,7 @@ index e685d43..92cff4f 100644 ## ## The default format produces CLF compatible output. diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index 495d2a1..c3e1446 100644 +index d45a284d..4e926d5a 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -13,8 +13,8 @@ @@ -46,16 +48,7 @@ index 495d2a1..c3e1446 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ server.port = 80 - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" +@@ -97,8 +97,8 @@ server.port = 80 ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -66,7 +59,7 @@ index 495d2a1..c3e1446 100644 ## ## Enable lighttpd to serve requests on sockets received from systemd -@@ -118,7 +118,7 @@ server.groupname = "lighttpd" +@@ -114,7 +114,7 @@ server.groupname = "lighttpd" ## ## Document root ## @@ -75,7 +68,7 @@ index 495d2a1..c3e1446 100644 ## ## The value for the "Server:" response field. -@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid" +@@ -140,7 +140,7 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## @@ -84,7 +77,7 @@ index 495d2a1..c3e1446 100644 ## ## If you want to log to syslog you have to unset the -@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf" +@@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf" ## and write(). Every modern OS provides its own syscall to help network ## servers transfer files as fast as possible ## @@ -94,5 +87,5 @@ index 495d2a1..c3e1446 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.34.1 +2.39.0 diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 8353857ad9..29bf5124b6 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.67.sha512sum -sha512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627 lighttpd-1.4.67.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum +sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index d3440040fb..ca2035b6b3 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).67 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -13,49 +13,49 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=false \ - -Dwith_fam=false \ + -Dwith_dbi=disabled \ + -Dwith_fam=disabled \ -Dwith_gnutls=false \ - -Dwith_libev=false \ - -Dwith_libunwind=false \ + -Dwith_libev=disabled \ + -Dwith_libunwind=disabled \ -Dwith_mbedtls=false \ -Dwith_nettle=false \ -Dwith_nss=false \ - -Dwith_pcre=false \ - -Dwith_sasl=false \ + -Dwith_pcre=disabled \ + -Dwith_sasl=disabled \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=true \ + -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli -LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +LIGHTTPD_CONF_OPTS += -Dwith_brotli=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +LIGHTTPD_CONF_OPTS += -Dwith_bzip=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 -LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +LIGHTTPD_CONF_OPTS += -Dwith_krb5=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) LIGHTTPD_DEPENDENCIES += openldap -LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +LIGHTTPD_CONF_OPTS += -Dwith_ldap=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) @@ -67,16 +67,16 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) LIGHTTPD_DEPENDENCIES += libmaxminddb -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mysql -LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) @@ -88,9 +88,9 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += -Dwith_pam=true +LIGHTTPD_CONF_OPTS += -Dwith_pam=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pam=false +LIGHTTPD_CONF_OPTS += -Dwith_pam=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) @@ -102,36 +102,36 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) LIGHTTPD_DEPENDENCIES += postgresql -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=enabled ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=enabled LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=disabled endif else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true +LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) LIGHTTPD_DEPENDENCIES += zstd -LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +LIGHTTPD_CONF_OPTS += -Dwith_zstd=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +LIGHTTPD_CONF_OPTS += -Dwith_zstd=disabled endif define LIGHTTPD_INSTALL_CONFIG -- 2.39.0 From flaniel at linux.microsoft.com Thu Feb 16 14:23:35 2023 From: flaniel at linux.microsoft.com (Francis Laniel) Date: Thu, 16 Feb 2023 15:23:35 +0100 Subject: [Buildroot] [PATCH v2 2/2] linux: use -isystem instead of -I in HOSTCC In-Reply-To: References: Message-ID: <12152275.O9o76ZdvQC@pwmachine> Hi. Le mercredi 15 f?vrier 2023, 10:58:51 CET Lang Daniel a ?crit : > A package might install headers that are incompatible with the kernel's > header. One example is the most recent version of pahole (1.24). > HOST_CC includes -I$(HOST_DIR)/include which comes before any include > logic the kernel might have thus forcing the kernel to prefer headers in > HOST_DIR. > > The logic to substituting -I with -isystem is taken from > boot/uboot/uboot.mk. > > Signed-off-by: Daniel Lang Thank you for this patch! I tested it and got the same error as you: FAILED: load BTF from vmlinux: Invalid argument I tested with qemu_x86_64_defconfig to which I added the same options as you. I will test with a kernel younger than 5.15.18 and I come back here! > --- > v1 -> v2: > - Patch was added to the series > > Tested with: > > BR2_aarch64=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="{VERSION}" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="pahole-kernel.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE=y > > and with a fragment for linux: > > CONFIG_BPF_SYSCALL=y > CONFIG_BPF_UNPRIV_DEFAULT_OFF=n > CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y > CONFIG_DEBUG_INFO_REDUCED=n > CONFIG_DEBUG_INFO_COMPRESSED=n > CONFIG_DEBUG_INFO_BTF=y > CONFIG_SYSTEM_TRUSTED_KEYRING=y > > where VERSION is one of: > 5.2.21 5.3.18 5.4.231 5.5.19 5.6.19 5.7.19 5.8.18 5.9.16 5.10.167 5.11.22 > 5.12.19 5.13.19 5.14.21 5.15.93 5.16.20 5.17.15 5.18.19 5.19.17 6.0.19 > 6.1.11 > > Version 5.2, as far as I could work it out, is the version that introduced > the pahole dependency when CONFIG_DEBUG_INFO_BTF is set. > > None-LTS versions after 5.10 and before 5.19 fail with: > > LD vmlinux.o > MODPOST vmlinux.symvers > MODINFO modules.builtin.modinfo > GEN modules.builtin > LD .tmp_vmlinux.btf > BTF .btf.vmlinux.bin.o > LD .tmp_vmlinux.kallsyms1 > KSYMS .tmp_vmlinux.kallsyms1.S > AS .tmp_vmlinux.kallsyms1.S > LD .tmp_vmlinux.kallsyms2 > KSYMS .tmp_vmlinux.kallsyms2.S > AS .tmp_vmlinux.kallsyms2.S > LD vmlinux > BTFIDS vmlinux > FAILED: load BTF from vmlinux: Invalid argument > make[2]: *** [Makefile:1177: vmlinux] Error 255 > make[1]: *** [package/pkg-generic.mk:293: > /home/d.lang/ws/other/buildroot/output/build/linux-5.11.22/.stamp_built] > Error 2 make: *** [Makefile:82: _all] Error 2 > > These version miss BTF_KIND_ENUM64 support and require a patch [0] that has > been added to LTS versions. > > [0]: https://lore.kernel.org/bpf/20221019085604.1017583-6-jolsa at kernel.org/ > > Signed-off-by: Daniel Lang > --- > linux/linux.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/linux/linux.mk b/linux/linux.mk > index 7645b5f507..03d89cd204 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -150,7 +150,7 @@ endif > # Disable building host tools with -Werror: newer gcc versions can be > # extra picky about some code > (https://bugs.busybox.net/show_bug.cgi?id=14826) LINUX_MAKE_FLAGS = \ > - HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ > + HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem > /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ ARCH=$(KERNEL_ARCH) \ > INSTALL_MOD_PATH=$(TARGET_DIR) \ > CROSS_COMPILE="$(TARGET_CROSS)" \ Best regards. From flaniel at linux.microsoft.com Thu Feb 16 14:48:37 2023 From: flaniel at linux.microsoft.com (Francis Laniel) Date: Thu, 16 Feb 2023 15:48:37 +0100 Subject: [Buildroot] [PATCH v2 2/2] linux: use -isystem instead of -I in HOSTCC In-Reply-To: <12152275.O9o76ZdvQC@pwmachine> References: <12152275.O9o76ZdvQC@pwmachine> Message-ID: <4807202.31r3eYUQgx@pwmachine> Le jeudi 16 f?vrier 2023, 15:23:35 CET Francis Laniel a ?crit : > Hi. > > Le mercredi 15 f?vrier 2023, 10:58:51 CET Lang Daniel a ?crit : > > A package might install headers that are incompatible with the kernel's > > header. One example is the most recent version of pahole (1.24). > > HOST_CC includes -I$(HOST_DIR)/include which comes before any include > > logic the kernel might have thus forcing the kernel to prefer headers in > > HOST_DIR. > > > > The logic to substituting -I with -isystem is taken from > > boot/uboot/uboot.mk. > > > > Signed-off-by: Daniel Lang > > Thank you for this patch! > I tested it and got the same error as you: > FAILED: load BTF from vmlinux: Invalid argument > > I tested with qemu_x86_64_defconfig to which I added the same options as > you. I will test with a kernel younger than 5.15.18 and I come back here! I tested with latest kernel and everything works like a charm: Welcome to Buildroot buildroot login: root # uname -r 6.1.11 # ls /sys/kernel/btf/ vmlinux Thank you for it! Reviewed-by: Francis Laniel Tested-by: Francis Laniel > > --- > > > > v1 -> v2: > > - Patch was added to the series > > > > Tested with: > > > > BR2_aarch64=y > > BR2_TOOLCHAIN_EXTERNAL=y > > BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y > > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="{VERSION}" > > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="pahole-kernel.config" > > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE=y > > > > and with a fragment for linux: > > > > CONFIG_BPF_SYSCALL=y > > CONFIG_BPF_UNPRIV_DEFAULT_OFF=n > > CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y > > CONFIG_DEBUG_INFO_REDUCED=n > > CONFIG_DEBUG_INFO_COMPRESSED=n > > CONFIG_DEBUG_INFO_BTF=y > > CONFIG_SYSTEM_TRUSTED_KEYRING=y > > > > where VERSION is one of: > > 5.2.21 5.3.18 5.4.231 5.5.19 5.6.19 5.7.19 5.8.18 5.9.16 5.10.167 5.11.22 > > 5.12.19 5.13.19 5.14.21 5.15.93 5.16.20 5.17.15 5.18.19 5.19.17 6.0.19 > > 6.1.11 > > > > Version 5.2, as far as I could work it out, is the version that introduced > > the pahole dependency when CONFIG_DEBUG_INFO_BTF is set. > > > > None-LTS versions after 5.10 and before 5.19 fail with: > > LD vmlinux.o > > MODPOST vmlinux.symvers > > MODINFO modules.builtin.modinfo > > GEN modules.builtin > > LD .tmp_vmlinux.btf > > BTF .btf.vmlinux.bin.o > > LD .tmp_vmlinux.kallsyms1 > > KSYMS .tmp_vmlinux.kallsyms1.S > > AS .tmp_vmlinux.kallsyms1.S > > LD .tmp_vmlinux.kallsyms2 > > KSYMS .tmp_vmlinux.kallsyms2.S > > AS .tmp_vmlinux.kallsyms2.S > > LD vmlinux > > BTFIDS vmlinux > > > > FAILED: load BTF from vmlinux: Invalid argument > > make[2]: *** [Makefile:1177: vmlinux] Error 255 > > make[1]: *** [package/pkg-generic.mk:293: > > /home/d.lang/ws/other/buildroot/output/build/linux-5.11.22/.stamp_built] > > Error 2 make: *** [Makefile:82: _all] Error 2 > > > > These version miss BTF_KIND_ENUM64 support and require a patch [0] that > > has > > been added to LTS versions. > > > > [0]: > > https://lore.kernel.org/bpf/20221019085604.1017583-6-jolsa at kernel.org/ > > > > Signed-off-by: Daniel Lang > > --- > > > > linux/linux.mk | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/linux/linux.mk b/linux/linux.mk > > index 7645b5f507..03d89cd204 100644 > > --- a/linux/linux.mk > > +++ b/linux/linux.mk > > @@ -150,7 +150,7 @@ endif > > > > # Disable building host tools with -Werror: newer gcc versions can be > > # extra picky about some code > > > > (https://bugs.busybox.net/show_bug.cgi?id=14826) LINUX_MAKE_FLAGS = \ > > - HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ > > + HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem > > /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ ARCH=$(KERNEL_ARCH) \ > > > > INSTALL_MOD_PATH=$(TARGET_DIR) \ > > CROSS_COMPILE="$(TARGET_CROSS)" \ > > Best regards. From thomas.petazzoni at bootlin.com Thu Feb 16 15:01:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 16 Feb 2023 16:01:08 +0100 Subject: [Buildroot] Can I enable a config option from command line? In-Reply-To: References: Message-ID: <20230216160108.5a8d0c63@windsurf> Hello, On Thu, 16 Feb 2023 02:43:30 +0000 Afshin Pir wrote: > When building buildroot, I use a default config file. But there is > only 1 option (BR2_ENABLE_RUNTIME_DEBUG=y) which is not in config > file by default, and I want to enable it by command line when > building buildroot. Is there any way to achieve this? ./utils/config --enable BR2_ENABLE_RUNTIME_DEBUG have a look at ./utils/config --help Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 16 15:02:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 16 Feb 2023 16:02:39 +0100 Subject: [Buildroot] [PATCH 0/3 v2] package/dmalloc: cleanups and ssp workaround (branch yem/dmalloc) In-Reply-To: References: Message-ID: <20230216160239.3cf956fb@windsurf> On Wed, 8 Feb 2023 20:31:31 +0100 "Yann E. MORIN" wrote: > Yann E. MORIN (3): > package/dmalloc: convert existing patch to git format > package/dmalloc: use actual patches rather than sed-ing > package/dmalloc: don't use SSP Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Thu Feb 16 17:40:18 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 16 Feb 2023 18:40:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: bump to version 2.10.0 Message-ID: <20230216174018.33199-1-fontaine.fabrice@gmail.com> https://github.com/FreeRDP/FreeRDP/releases/tag/2.10.0 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 f6adc05312..55314cfdd3 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.9.0.tar.gz.sha256 -sha256 fcf71cf5b09c5c2636341ba212f34b8fb728246ea28e08caf6cef8b4a96184b7 freerdp-2.9.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.10.0.tar.gz.sha256 +sha256 a673d3fc21911dd9f196834f2f3a23c3ebc7e5e4deab2f7686fcec879279e2c1 freerdp-2.10.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index fb0e6920cf..01c511819d 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.9.0 +FREERDP_VERSION = 2.10.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 -- 2.39.0 From fontaine.fabrice at gmail.com Thu Feb 16 17:41:34 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 16 Feb 2023 18:41:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build with libexecinfo Message-ID: <20230216174134.34179-1-fontaine.fabrice@gmail.com> Fix the following build failure with libexecinfo raised since commit d649bcd3805a26cedb30120ebbdcf12f8fbf449f: /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/10.4.0/../../../../mips-buildroot-linux-musl/bin/ld: ../lib/monkey/library/libmonkey.a(mk_utils.c.o): in function `mk_utils_stacktrace': mk_utils.c:(.text+0x1578): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 Signed-off-by: Fabrice Fontaine --- package/fluent-bit/fluent-bit.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index d618fdf1e2..8ba16399bb 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -56,6 +56,11 @@ FLUENT_BIT_CXXFLAGS += -fcommon FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +FLUENT_BIT_DEPENDENCIES += libexecinfo +FLUENT_BIT_LDFLAGS += -lexecinfo +endif + ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) FLUENT_BIT_DEPENDENCIES += musl-fts FLUENT_BIT_LDFLAGS += -lfts -- 2.39.0 From bernd.kuhls at t-online.de Thu Feb 16 18:20:36 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 16 Feb 2023 19:20:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/python3: bump version to 3.11.2 Message-ID: <20230216182036.40830-1-bernd.kuhls@t-online.de> Changelog: https://docs.python.org/release/3.11.2/whatsnew/changelog.html#python-3-11-2 Updated license hash due to copyright year bump: https://github.com/python/cpython/commit/07d1f99e8faefcf24dab2113fb0df27202fa6f71 Signed-off-by: Bernd Kuhls --- package/python3/python3.hash | 4 ++-- package/python3/python3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 7f079865d9..f235347efb 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f Python-3.11.1.tar.xz -sha256 d4a223f033419313218c9b8444167e91e87a5bebdb43fb8490df441df5220a8b LICENSE +sha256 29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af Python-3.11.2.tar.xz +sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index fb6dbf2e64..56fe95cd07 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others -- 2.39.1 From bernd.kuhls at t-online.de Thu Feb 16 18:24:10 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 16 Feb 2023 19:24:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: security bump version to 8.2.3 Message-ID: <20230216182410.225354-1-bernd.kuhls@t-online.de> Changelog: https://www.php.net/ChangeLog-8.php#8.2.3 Fixes CVE-2023-0567, CVE-2023-0568 & CVE-2023-0662. 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 869cb9b94f..41aa326156 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz +sha256 b9b566686e351125d67568a33291650eb8dfa26614d205d70d82e6e92613d457 php-8.2.3.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 9ce153f4fa..bd7d5a8c3c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.2 +PHP_VERSION = 8.2.3 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES -- 2.39.1 From raphael.pavlidis at gmail.com Thu Feb 16 18:31:27 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Thu, 16 Feb 2023 19:31:27 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/x11r7/xwayland: new package In-Reply-To: <20230215212209.269cd96d@windsurf> References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> <20230215212209.269cd96d@windsurf> Message-ID: <5d06d30a-064e-b8a5-b9b5-3ff0a5941ab3@gmail.com> Hi Thomas, On 15.02.23 21:22, Thomas Petazzoni wrote: [SNIP] > > This should probably be split into 3 patches: one adding the xwayland > package, one tweaking the existing weston package, and one tweaking the > wlroots package. > > Okay, I will split the commit into 3 patches. [SNIP] > > So does that means that the current BR2_PACKAGE_WESTON_XWAYLAND option > is broken? > Yes, it is broken. To use the XWayland support, you need the XWayland binary, which is not build yet by buildroot. > I am rather confused by how XWayland works. Isn't XWayland a normal > Wayland client? Why does Weston or wlroots, as Wayland compositors, > need to have some support/knowledge for XWayland? Yes, as far as I know, it is a Wayland client. It acts as an XServer, which X11 application connects to, and then it forward (lets say) to the Wayland compositor. The Wayland compositor executes the XWayland server. The compositor needs the xwayland as build dependency, because in the .pc file it is written, where the xwayland binary is located and which features are enabled. https://gitlab.freedesktop.org/wlroots/wlroots/-/blob/master/xwayland/meson.build#L65 [SNIP] > > Since you're selecting BR2_PACKAGE_XWAYLAND, you need to replicate: > > depends on BR2_USE_MMU # fork() > depends on !BR2_STATIC_LIBS # wayland > depends on BR2_TOOLCHAIN_HAS_THREADS # wayland > > and add the corresponding Config.in comment. > Good point, I forgot that. [SNIP] > > So this is also a bug in the current package? > > What is WLROOTS_X11 controlling then? Running wlroots as a X11 client? The X11 backend has nothing to do with the XWayland support. X11 backend means that the compositor can run on an XServer. The XWayland support means that X11 application can run on the Wayland compositor. [SNIP] Thanks, Raphael Pavlidis From raphael.pavlidis at gmail.com Thu Feb 16 18:33:20 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Thu, 16 Feb 2023 19:33:20 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/x11r7/xwayland: new package In-Reply-To: <20230215143534.19834-1-raphael.pavlidis@gmail.com> References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> Message-ID: <20230216183322.21622-1-raphael.pavlidis@gmail.com> XServer to run X clients under wayland This XServer is required to run the X clients under Wayland compositor, for example weston or wlroots based compositors. Signed-off-by: Raphael Pavlidis --- Changes v1 -> v2: - split up patches in 3 parts - add missing depends on in wlroots DEVELOPERS | 1 + package/x11r7/Config.in | 1 + package/x11r7/xwayland/Config.in | 26 ++++++++ package/x11r7/xwayland/xwayland.hash | 6 ++ package/x11r7/xwayland/xwayland.mk | 94 ++++++++++++++++++++++++++++ 5 files changed, 128 insertions(+) create mode 100644 package/x11r7/xwayland/Config.in create mode 100644 package/x11r7/xwayland/xwayland.hash create mode 100644 package/x11r7/xwayland/xwayland.mk diff --git a/DEVELOPERS b/DEVELOPERS index f8451c7fec..5374fb2f61 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2417,6 +2417,7 @@ F: support/testing/tests/package/test_python_s3transfer.py N: Raphael Pavlidis F: package/slirp4netns/ F: package/sway/ +F: package/x11r7/xwayland/ N: Refik Tuzakli F: package/freescale-imx/ diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 365de34c98..4de8922e0d 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -12,6 +12,7 @@ menuconfig BR2_PACKAGE_XORG7 if BR2_PACKAGE_XORG7 menu "X11R7 Servers" source package/x11r7/xserver_xorg-server/Config.in + source package/x11r7/xwayland/Config.in endmenu menu "X11R7 Libraries" source package/x11r7/libxcb/Config.in diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in new file mode 100644 index 0000000000..4f14f2cc36 --- /dev/null +++ b/package/x11r7/xwayland/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_XWAYLAND + bool "xwayland server" + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland + # We need a SHA1 implementation. If either openssl or + # libgcrypt are already part of the build, we'll use one of + # them, otherwise, use the small libsha1 library. + select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_XLIB_LIBXCVT + select BR2_PACKAGE_XLIB_LIBXFONT2 + select BR2_PACKAGE_XLIB_LIBXKBFILE + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_XTRANS + select BR2_PACKAGE_XORGPROTO + help + X.Org X server to run X clients under wayland + + http://xorg.freedesktop.org + +comment "xwayland needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash new file mode 100644 index 0000000000..0c476f3183 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.hash @@ -0,0 +1,6 @@ +# From https://lists.x.org/archives/xorg-announce/2023-February/003322.html +sha256 d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73 xwayland-22.1.8.tar.xz +sha512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a xwayland-22.1.8.tar.xz + +# Locally calculated +sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk new file mode 100644 index 0000000000..174b440b07 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.mk @@ -0,0 +1,94 @@ +################################################################################ +# +# xwayland +# +################################################################################ + +XWAYLAND_VERSION = 22.1.8 +XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz +XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver +XWAYLAND_LICENSE = MIT +XWAYLAND_LICENSE_FILES = COPYING +XWAYLAND_INSTALL_STAGING = YES +XWAYLAND_DEPENDENCIES = \ + pixman \ + wayland \ + wayland-protocols \ + xlib_libxcvt \ + xlib_libXfont2 \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_xtrans \ + xorgproto +XWAYLAND_CONF_OPTS = \ + -Dxwayland_eglstream=false \ + -Dxvfb=false \ + -Ddefault_font_path=/usr/share/fonts/X11/ \ + -Ddtrace=false \ + -Ddocs=false + +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY),yy) +XWAYLAND_CONF_OPTS += -Dglamor=true +XWAYLAND_DEPENDENCIES += libdrm libepoxy +else +XWAYLAND_CONF_OPTS += -Dglamor=false +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XWAYLAND_CONF_OPTS += -Dglx=true +XWAYLAND_DEPENDENCIES += libgl +else +XWAYLAND_CONF_OPTS += -Dglx=false +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXDMCP),y) +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=true \ + -Dxdm-auth-1=true +XWAYLAND_DEPENDENCIES += xlib_libXdmcp +else +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=false \ + -Dxdm-auth-1=false +endif + +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +XWAYLAND_CONF_OPTS += -Dsecure-rpc=true +XWAYLAND_DEPENDENCIES += libtirpc +else +XWAYLAND_CONF_OPTS += -Dsecure-rpc=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX)$(BR2_PACKAGE_AUDIT),yy) +XWAYLAND_CONF_OPTS += -Dxselinux=true +XWAYLAND_DEPENDENCIES += libselinux audit +else +XWAYLAND_CONF_OPTS += -Dxselinux=false +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +XWAYLAND_CONF_OPTS += -Dsha1=libcrypto +XWAYLAND_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +XWAYLAND_CONF_OPTS += -Dsha1=libgcrypt +XWAYLAND_DEPENDENCIES += libgcrypt +else +XWAYLAND_CONF_OPTS += -Dsha1=libsha1 +XWAYLAND_DEPENDENCIES += libsha1 +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_LIBDRM),yy) +XWAYLAND_CONF_OPTS += -Ddri3=true +XWAYLAND_DEPENDENCIES += xlib_libxshmfence libdrm +else +XWAYLAND_CONF_OPTS += -Ddri3=false +endif + +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +XWAYLAND_CONF_OPTS += -Dlibunwind=true +XWAYLAND_DEPENDENCIES += libunwind +else +XWAYLAND_CONF_OPTS += -Dlibunwind=false +endif + +$(eval $(meson-package)) -- 2.39.1 From raphael.pavlidis at gmail.com Thu Feb 16 18:33:21 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Thu, 16 Feb 2023 19:33:21 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/weston: add xwayland dependency In-Reply-To: <20230216183322.21622-1-raphael.pavlidis@gmail.com> References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> <20230216183322.21622-1-raphael.pavlidis@gmail.com> Message-ID: <20230216183322.21622-2-raphael.pavlidis@gmail.com> If the XWayland support is enabled then build the corresponding XServer. Signed-off-by: Raphael Pavlidis --- package/weston/Config.in | 10 +++++++++- package/weston/weston.mk | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 3b4e932b7d..09119edaaa 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -109,16 +109,24 @@ comment "X11 (nested) compositor needs X.org enabled" config BR2_PACKAGE_WESTON_XWAYLAND bool "XWayland support" - depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_LIBEPOXY + depends on BR2_PACKAGE_XORG7 # xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_XWAYLAND comment "XWayland support needs libepoxy and X.org enabled" depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + # Weston needs at least one shell; this can be one of the bundled ones, # below, of from a third-party package, which should then select this. config BR2_PACKAGE_WESTON_HAS_SHELL diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 5e71473640..01f84178b2 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -123,7 +123,7 @@ WESTON_CONF_OPTS += -Dbackend-default=$(call qstrip,$(BR2_PACKAGE_WESTON_DEFAULT ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) WESTON_CONF_OPTS += -Dxwayland=true -WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor +WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor xwayland else WESTON_CONF_OPTS += -Dxwayland=false endif -- 2.39.1 From raphael.pavlidis at gmail.com Thu Feb 16 18:33:22 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Thu, 16 Feb 2023 19:33:22 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/wlroots: add XWayland support In-Reply-To: <20230216183322.21622-1-raphael.pavlidis@gmail.com> References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> <20230216183322.21622-1-raphael.pavlidis@gmail.com> Message-ID: <20230216183322.21622-3-raphael.pavlidis@gmail.com> The new option enables the XWayland support, so X11 application can be running on a wlroots based compositor. Also, do not enable the XWayland support if the X11 backend is active. Signed-off-by: Raphael Pavlidis --- package/wlroots/Config.in | 19 +++++++++++++++++++ package/wlroots/wlroots.mk | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 84a4ef846e..fe3080450c 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -41,4 +41,23 @@ config BR2_PACKAGE_WLROOTS_X11 help Support Wayland sessions nested inside a X11 window +config BR2_PACKAGE_WLROOTS_XWAYLAND + bool "XWayland support" + depends on BR2_PACKAGE_XORG7 # libxcb, xcb-util-wm, xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_XWAYLAND + help + Support for X11 applications + +comment "XWayland support needs X.org enabled" + depends on !BR2_PACKAGE_XORG7 + +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + endif diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 4f14d20b11..5b930a51be 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -30,8 +30,12 @@ WLROOTS_BACKENDS = libinput drm ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) WLROOTS_BACKENDS += x11 -WLROOTS_CONF_OPTS += -Dxwayland=enabled WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 +endif + +ifeq ($(BR2_PACKAGE_WLROOTS_XWAYLAND),y) +WLROOTS_CONF_OPTS += -Dxwayland=enabled +WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xwayland else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif -- 2.39.1 From bernd.kuhls at t-online.de Thu Feb 16 18:28:00 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 16 Feb 2023 19:28:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump version to 0.103.8 Message-ID: <20230216182800.254043-1-bernd.kuhls@t-online.de> Release notes: https://blog.clamav.net/2023/02/clamav-01038-01052-and-101-patch.html Fixes CVE-2023-20032 & CVE-2023-20052. Signed-off-by: Bernd Kuhls --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index 60439400ee..27f9b16a39 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1e34c31f600cb3b5bd1bf76690590cdeebe9409b330959b1c0f77d421bb17e50 clamav-0.103.7.tar.gz +sha256 6f49da6ee927936de13d359e559d3944248e3a257d40b80b6c99ebe6fe8c8c3f clamav-0.103.8.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index dfdc416601..0f0491bf0d 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.7 +CLAMAV_VERSION = 0.103.8 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ -- 2.39.1 From bernd.kuhls at t-online.de Thu Feb 16 18:36:54 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 16 Feb 2023 19:36:54 +0100 Subject: [Buildroot] [PATCH 1/2] package/x11r7/xdriver_xf86-video-trident: bump version to 1.4.0 Message-ID: <20230216183655.402798-1-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003326.html Removed patch which was applied upstream. Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls --- .../0001-Remove-ramdac.patch | 56 ------------------- .../xdriver_xf86-video-trident.hash | 5 +- .../xdriver_xf86-video-trident.mk | 6 +- 3 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch diff --git a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch b/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch deleted file mode 100644 index 38ca9afebf..0000000000 --- a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 07a5c4732f1c28ffcb873ee04500e3cb813c50b4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Dec 2021 22:28:04 +0100 -Subject: [PATCH] Remove ramdac - -ramdac drivers have been removed from xserver since version 21.0.99.1 -and -https://gitlab.freedesktop.org/xorg/xserver/-/commit/f0385fb420158ac3bc1c4c325431ffc5c62344bb -resulting in the following build failure: - -In file included from trident_bank.c:37: -trident.h:41:10: fatal error: xf86RamDac.h: No such file or directory - 41 | #include "xf86RamDac.h" - | ^~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/c81ac8075af257e8626d9d097270be7a7b4a1496 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/merge_requests/1] ---- - src/trident.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/trident.h b/src/trident.h -index 5cadf52..c82de4c 100644 ---- a/src/trident.h -+++ b/src/trident.h -@@ -38,7 +38,6 @@ - #include "xaa.h" - #endif - #include "xf86fbman.h" --#include "xf86RamDac.h" - #include "compiler.h" - #include "vgaHW.h" - #include "xf86i2c.h" -@@ -103,7 +102,6 @@ typedef struct { - int useEXA; - int Chipset; - int DACtype; -- int RamDac; - int ChipRev; - int HwBpp; - int BppShift; -@@ -169,7 +167,6 @@ typedef struct { - CARD32 BltScanDirection; - CARD32 DrawFlag; - CARD16 LinePattern; -- RamDacRecPtr RamDacRec; - int CursorOffset; - xf86CursorInfoPtr CursorInfoRec; - xf86Int10InfoPtr Int10; --- -2.33.0 - diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash index 321f35d4f0..2ef664487c 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002762.html -sha256 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f xf86-video-trident-1.3.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003326.html +sha256 7f76219ca7d7dc6061aa3c2aa59bc2a63895b8e6217e413ce315949f57b0189b xf86-video-trident-1.4.0.tar.xz +sha512 86f349ccfcf7c704e77a95882f63ac92f55819a3a00388f294777762fed04dde2197dd6124cded9e787af1982fecc43ad4d0af34307845e616a73d5a2ba750b9 xf86-video-trident-1.4.0.tar.xz # Locally calculated sha256 4f065198c49eac1513b915bc4478152c21119f31a97919a6ea8f3e1d10133d15 COPYING diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk index 20ec4bbc24..53fe150420 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.8 -XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.4.0 +XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.xz +XDRIVER_XF86_VIDEO_TRIDENT_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT XDRIVER_XF86_VIDEO_TRIDENT_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xorgproto -- 2.39.1 From bernd.kuhls at t-online.de Thu Feb 16 18:36:55 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 16 Feb 2023 19:36:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/xutil_util-macros: bump version to 1.20.0 In-Reply-To: <20230216183655.402798-1-bernd.kuhls@t-online.de> References: <20230216183655.402798-1-bernd.kuhls@t-online.de> Message-ID: <20230216183655.402798-2-bernd.kuhls@t-online.de> Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003324.html Updated license hash due to copyright year bump: https://gitlab.freedesktop.org/xorg/util/macros/-/commit/cb147377e9341af05232f95814022abdecf14024 Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls --- package/xutil_util-macros/xutil_util-macros.hash | 8 ++++---- package/xutil_util-macros/xutil_util-macros.mk | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/xutil_util-macros/xutil_util-macros.hash b/package/xutil_util-macros/xutil_util-macros.hash index 30c9916dca..4fcddb7a85 100644 --- a/package/xutil_util-macros/xutil_util-macros.hash +++ b/package/xutil_util-macros/xutil_util-macros.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-January/003069.html -sha256 0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971 util-macros-1.19.3.tar.bz2 -sha512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2 util-macros-1.19.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003324.html +sha256 0b86b262dbe971edb4ff233bc370dfad9f241d09f078a3f6d5b7f4b8ea4430db util-macros-1.20.0.tar.xz +sha512 76caefb118bf1675d7b2b96e1bbb04eb9a320b02e120839e55a22ef98538ecf00d0e686a67186fc8fdc8492d277ffe3125ae8b7ac61ce4739edc0de3f468d2eb util-macros-1.20.0.tar.xz # Locally computed -sha256 489b630a75e3255485732eae3d50ff4d29d3feb66760bb3acb04f897e4d9e375 COPYING +sha256 7db0516389152a90c20ea910e8839d10204ebc25ccbc71fc7f5809dfb98e80ac COPYING diff --git a/package/xutil_util-macros/xutil_util-macros.mk b/package/xutil_util-macros/xutil_util-macros.mk index b0ce14ee5a..e2e40eb84e 100644 --- a/package/xutil_util-macros/xutil_util-macros.mk +++ b/package/xutil_util-macros/xutil_util-macros.mk @@ -4,9 +4,9 @@ # ################################################################################ -XUTIL_UTIL_MACROS_VERSION = 1.19.3 -XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2 -XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util +XUTIL_UTIL_MACROS_VERSION = 1.20.0 +XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.xz +XUTIL_UTIL_MACROS_SITE = https://xorg.freedesktop.org/archive/individual/util XUTIL_UTIL_MACROS_LICENSE = MIT XUTIL_UTIL_MACROS_LICENSE_FILES = COPYING -- 2.39.1 From thomas at devoogdt.com Thu Feb 16 19:34:05 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 16 Feb 2023 20:34:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build with libexecinfo In-Reply-To: <20230216174134.34179-1-fontaine.fabrice@gmail.com> References: <20230216174134.34179-1-fontaine.fabrice@gmail.com> Message-ID: Hi, Perhaps I'm missing something, but why is it not needed to select `BR2_PACKAGE_LIBEXECINFO` in the Config.in file? (Similar to `select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC`) The `ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)` can be re-used to add and select execinfo. Kr, Thomas Devoogdt Op do 16 feb. 2023 om 18:41 schreef Fabrice Fontaine : > > Fix the following build failure with libexecinfo raised since commit > d649bcd3805a26cedb30120ebbdcf12f8fbf449f: > > /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/10.4.0/../../../../mips-buildroot-linux-musl/bin/ld: ../lib/monkey/library/libmonkey.a(mk_utils.c.o): in function `mk_utils_stacktrace': > mk_utils.c:(.text+0x1578): undefined reference to `backtrace' > > Fixes: > - http://autobuild.buildroot.org/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 > > Signed-off-by: Fabrice Fontaine > --- > package/fluent-bit/fluent-bit.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk > index d618fdf1e2..8ba16399bb 100644 > --- a/package/fluent-bit/fluent-bit.mk > +++ b/package/fluent-bit/fluent-bit.mk > @@ -56,6 +56,11 @@ FLUENT_BIT_CXXFLAGS += -fcommon > FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS > FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +FLUENT_BIT_DEPENDENCIES += libexecinfo > +FLUENT_BIT_LDFLAGS += -lexecinfo > +endif > + > ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) > FLUENT_BIT_DEPENDENCIES += musl-fts > FLUENT_BIT_LDFLAGS += -lfts > -- > 2.39.0 > > From fontaine.fabrice at gmail.com Thu Feb 16 20:32:17 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 16 Feb 2023 21:32:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build with libexecinfo In-Reply-To: References: <20230216174134.34179-1-fontaine.fabrice@gmail.com> Message-ID: Hi Thomas, Le jeu. 16 f?vr. 2023 ? 20:34, Thomas Devoogdt a ?crit : > Hi, > > Perhaps I'm missing something, but why is it not needed to select > `BR2_PACKAGE_LIBEXECINFO` in the Config.in file? > (Similar to `select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC`) > libexecinfo is not a mandatory dependency, fluent-bit builds perfectly fine without it, that's why a select is not needed. > > The `ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)` can be re-used to add and > select execinfo. > > Kr, > > Thomas Devoogdt > > Op do 16 feb. 2023 om 18:41 schreef Fabrice Fontaine > : > > > > Fix the following build failure with libexecinfo raised since commit > > d649bcd3805a26cedb30120ebbdcf12f8fbf449f: > > > > > /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/10.4.0/../../../../mips-buildroot-linux-musl/bin/ld: > ../lib/monkey/library/libmonkey.a(mk_utils.c.o): in function > `mk_utils_stacktrace': > > mk_utils.c:(.text+0x1578): undefined reference to `backtrace' > > > > Fixes: > > - > http://autobuild.buildroot.org/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/fluent-bit/fluent-bit.mk | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/ > fluent-bit.mk > > index d618fdf1e2..8ba16399bb 100644 > > --- a/package/fluent-bit/fluent-bit.mk > > +++ b/package/fluent-bit/fluent-bit.mk > > @@ -56,6 +56,11 @@ FLUENT_BIT_CXXFLAGS += -fcommon > > FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS > > FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS > > > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > > +FLUENT_BIT_DEPENDENCIES += libexecinfo > > +FLUENT_BIT_LDFLAGS += -lexecinfo > > +endif > > + > > ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) > > FLUENT_BIT_DEPENDENCIES += musl-fts > > FLUENT_BIT_LDFLAGS += -lfts > > -- > > 2.39.0 > > > > > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Thu Feb 16 21:25:53 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 16 Feb 2023 22:25:53 +0100 Subject: [Buildroot] [PATCH 3/3] DEVELOPERS: add Giulio Benetti to board imx6ullevk for both mainline and NXP(Freescale) versions In-Reply-To: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> References: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> Message-ID: <20230216212553.2591068-3-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b1c6f2d447..840455ccea 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1136,11 +1136,14 @@ F: package/xapian/ N: Giulio Benetti F: board/bananapi/bananapi-m2-ultra/ +F: board/freescale/imx6ullevk/ F: board/freescale/imxrt1050evk/* F: board/olimex/a* F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig F: configs/bananapi_m2_ultra_defconfig +F: configs/freescale_imx6ullevk_defconfig +F: configs/imx6ullevk_defconfig F: configs/imxrt1050-evk_defconfig F: configs/olimex_a* F: package/at/ -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 16 21:25:51 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 16 Feb 2023 22:25:51 +0100 Subject: [Buildroot] [PATCH 1/3] configs/imx6ullevk_defconfig: bump Linux to 6.1.12 and U-Boot to 2023.01 Message-ID: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> Let's also reorder BR2_UBOOT_ options by moving BR2_TARGET_UBOOT_FORMAT_DTB_IMX after BR2_TARGET_UBOOT_NEEDS_OPENSSL since this reflects the order in boot/uboot/Config.in file. Signed-off-by: Giulio Benetti --- configs/imx6ullevk_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/imx6ullevk_defconfig b/configs/imx6ullevk_defconfig index c6e2981697..b507d1c0d6 100644 --- a/configs/imx6ullevk_defconfig +++ b/configs/imx6ullevk_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -22,10 +22,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" -BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 16 21:25:52 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 16 Feb 2023 22:25:52 +0100 Subject: [Buildroot] [PATCH 2/3] configs/freescale_imx6ullevk_defconfig: bump Linux and U-Boot to lf-5.15.71-2.2.0 In-Reply-To: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> References: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> Message-ID: <20230216212553.2591068-2-giulio.benetti@benettiengineering.com> Let's also enable BR2_TARGET_UBOOT_NEEDS_OPENSSL required by uboot to build correctly. Signed-off-by: Giulio Benetti --- configs/freescale_imx6ullevk_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index 7a8965be18..db4fa69f71 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -1,11 +1,11 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.15.71-2.2.0)/linux-imx-lf-5.15.71-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -15,8 +15,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.15.71-2.2.0)/uboot-imx-lf-5.15.71-2.2.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -- 2.34.1 From thomas.petazzoni at bootlin.com Fri Feb 17 06:41:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 06:41:16 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-16 Message-ID: <20230217064122.37BCA403BE@smtp2.osuosl.org> Hello, Autobuild statistics for 2023-02-16 =================================== branch | OK | NOK | TIM | TOT | 2022.02.x | 4 | 1 | 0 | 5 | 2022.11.x | 13 | 18 | 0 | 31 | master | 152 | 186 | 0 | 338 | Classification of failures by reason for master ----------------------------------------------- unknown | 11 gnupg2-2.4.0 | 10 host-go-1.19.6 | 8 host-pahole-1.24 | 7 gerbera-1.10.0 | 6 python-numpy-1.23.5 | 6 zabbix-6.2.7 | 6 gobject-introspection-1.72.0 | 5 host-binutils-2.38 | 5 linux-6.1.11 | 5 perl-5.36.0 | 5 libgcrypt-1.10.1 | 4 elfutils-0.186 | 3 glibc-2.36-81-g4f4d7a13edfd... | 3 host-libarchive-3.6.2 | 3 libglib2-2.72.3 | 3 linux-5.10.162-cip24 | 3 quickjs-2021-03-27 | 3 xenomai-3.0.10 | 3 bird-2.0.11 | 2 dc3dd-7.2.641 | 2 host-binutils-2.37 | 2 ltp-testsuite-20220930 | 2 mongodb-4.2.18 | 2 netsurf-3.10 | 2 ocf-linux-20171122 | 2 php-xdebug-3.0.4 | 2 systemd-252.4 | 2 tcf-agent-1.7.0 | 2 uccp420wlan-6.9.1 | 2 ulog-0389d243352255f6182326... | 2 xtables-addons-3.22 | 2 android-tools-4.2.2+git2013... | 1 bat-0.19.0 | 1 check-0.15.2 | 1 ddrescue-1.26 | 1 docker-cli-23.0.0 | 1 dust-0.8.1 | 1 efivar-38 | 1 f2fs-tools-1.15.0 | 1 ffmpeg-4.4.3 | 1 fftw-quad-3.3.8 | 1 fontconfig-2.13.1 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 gmp-6.2.1 | 1 gnu-efi-3.0.15 | 1 host-delve-1.20.0 | 1 host-gcc-initial-12.2.0 | 1 host-gdb-arc-2020.09-releas... | 1 ibrdtnd-1.0.1 | 1 imagemagick-7.1.0-51 | 1 jack2-1.9.21 | 1 janet-1.26.0 | 1 kexec-2.0.25 | 1 kmod-30 | 1 libcamera-apps-1.1.1 | 1 libcap-ng-0.8.3 | 1 libjxl-0.7.0 | 1 libsigsegv-2.14 | 1 linux-5.10.162-cip24-rt10 | 1 liquid-dsp-1.4.0 | 1 lirc-tools-0.10.2 | 1 luvi-2.13.0 | 1 modem-manager-1.20.4 | 1 musl-1.2.3 | 1 netsniff-ng-0.6.8 | 1 olsr-0.9.8 | 1 owl-linux-1.0.7 | 1 pcre2-10.42 | 1 php-8.2.2 | 1 python-pyicu-2.10.2 | 1 reaver-1.6.6 | 1 s6-linux-utils-2.6.0.0 | 1 sdl-1.2.15 | 1 skalibs-2.12.0.1 | 1 snmppp-3.4.10 | 1 traceroute-2.1.0 | 1 uclibc-1.0.42 | 1 uqmi-0a19b5b77140465c29e2af... | 1 vdr-2.6.3 | 1 wavemon-0.9.4 | 1 wpa_supplicant-2.10 | 1 xfsprogs-5.14.2 | 1 xvisor-0.3.1 | 1 zeek-4.1.1 | 1 zxing-cpp-1.4.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/6de44e79728ef4ebe4aad1087aafb71bc0a28d3f | mips | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/c2dd77d1d8a893e60930a40bc352cb66f01111cf | powerpc64 | bird-2.0.11 | NOK | http://autobuild.buildroot.net/results/9736d87ddabcc78525fe981d830f6e6c0b5fe2f6 | arceb | bird-2.0.11 | NOK | http://autobuild.buildroot.net/results/06d027240756ba3ee058e6d4f68553f4e9843fc4 | mips64 | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/f837cdd02bfd6c4dccb563e00072fe46fa58b8a9 | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/3ca9fc835b196273afef52f13d6fdf51bc2dda2b | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/26af26ee1c5f58ccab024370ed7eb8620570ce95 | ORPH riscv64 | ddrescue-1.26 | NOK | http://autobuild.buildroot.net/results/0e65f79b7547c1cb3d4a56b2ef2e5be90ed23b06 | ORPH i686 | docker-cli-23.0.0 | NOK | http://autobuild.buildroot.net/results/9d2fe18217f9f476c70dca77047c69ffac424f91 | mipsel | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/d0e79f4f848a339eee9ca685a1a0cebe80d0b12a | ORPH arm | efivar-38 | NOK | http://autobuild.buildroot.net/results/f939a267ce864d65459bd5adf8122b4a0a474a20 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/0bde0cf03f46a224a0acab36328f466c899bc1b1 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/11b5aa42a8d6922a6b30c24f71ba2b0109484555 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3993fa82a7d2d6aa24853f38445c30a22224b44c | ORPH or1k | f2fs-tools-1.15.0 | NOK | http://autobuild.buildroot.net/results/0d40f26865d5576efdcee4fee5bd57fa775d352b | mips64 | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/f023d0bbed5455eb6ae26128ef86d136fdf2af88 | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/4fbf24f4cae0307b33b9e155cd483c90e8f7ea12 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/36d3497c5f93e88b47608967b4c5ecfeb0bb720d | ORPH mips64el | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/c4340fc5754e83aa839f45b380ebf36386b7a360 | x86_64 | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/f253c1e0c8c17f3f42e7bef66d2a1769bad5ca35 | arceb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/120b45ceeff0bfd1f2bf8547992e31a747215701 | powerpc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/236f7d56c114cfb3cac9456669e68a07654fce2e | sh4aeb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/f9cfd6d0975855ddcddea01fcf0549904edd06df | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/d73ba965be31f24bb28ddab6f82846375543270e | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/b67c78838fa0bb7a136296e09d8fee44e724382a | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/4cccb4a26df101518191afa7fb5fa719f1ebee2e | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/41721ceb12445888ce9b2084e6ce6922c37a0b4c | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/d43181481da37335fc35b5c29235fcea2a05cff2 | or1k | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/bbc26bdcc7d4a7faaee55dcd728ff0a587576931 | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/bbf59f4325a5fef59c34c95fcade1a7176279275 | mipsel | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/cd72c33c324de08559873995b200d8ef83681a10 | sparc64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/44f1d18337a3987485b9420594f75aff04a9494b | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/8b3262657cd25cdae119e8e00bdf395c1fd3f988 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e46a0a6a00aa4738c69ef2acc5d1cc849e28277a | powerpc64le | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/fbe9012c528dc7cc965de8f3dda69e7b4109bc56 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/8156c5fc7410340650a00a521d27a365177f8477 | ORPH mips64el | gnu-efi-3.0.15 | NOK | http://autobuild.buildroot.net/results/17971e777b2f26a610da8125079cf963c0f49640 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/e54f80b5fa40085173343c70c9ac396684f1def8 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/2fc8acfb2df01e7dfb99f5de25f7621bf6147679 | or1k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/077166eb71e1f124101895b2b3abf9f94d7543d5 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ead3a99a7912a6cfacb70a286811a42da0e2ab7a | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9ddb2288d638d047b248b30c46039da0387dd5e7 | arm | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/84ac9019e2a2b28236c9b38b985296da507a0e87 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ecf420363e14d5d7f3ffca2181053c657701a043 | powerpc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a7fb00ace9954804bacb690f7e91cd0dc3546e2f | aarch64_be | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/0d79bf49f61e5b106375f53600c455561440a64a | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/deaee8a591c84d6d88d85da53bf5992fbe2e42f5 | nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/77ab421e5c3142090274e79092a28e951615b3cf | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5fb2b7c481746137accc8b05f78c9fdfa7decf4d | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/a71093886e7d9f7b6eb7691b91f7082083598cbf | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/97159375d60650e5960ef2a0d3358373e8aa9edb | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d885c583d6052cc9c2d386f79812230fe4202f6e | ORPH i686 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/a32180792367070f7fd87969fa97bb579a0fb06e | sh4eb | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/85e139fd4b77437fa64c4af81e5a077686c38adb | arc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/c0392b321ffcecb82ecf39b90b4b837b1b644630 | xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2226d524a6c91e943432438f4b26d76597b44abe | xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/9ec53c0b08ebe81d24062baf794fba1e5f5f9ad7 | xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/0894997034da9626d6018316e9270818ca81ed7c | mipsel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/665526e1f891f774403fbff223994ceb5a583074 | x86_64 | host-delve-1.20.0 | NOK | http://autobuild.buildroot.net/results/a5298e3133ab1e2555a2dded4f10f54560494d62 | or1k | host-gcc-initial-12.2.0 | NOK | http://autobuild.buildroot.net/results/858e673a04ff766ec312ca09a182f29ad037cfe0 | arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/8c68734dcbcc2512c473cc64785df8634cfc952c | ORPH mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/10fd58a454a3246fd9717999c7a0c29a155dcec6 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e478e04405e2e530b7d986e044b6997d127b2a52 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/d142a6bc8f789c097744e38e52b855af97167f5f | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/d06ac5eb845ccf973d64106cc70931c1ff9689be | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/0c47d0ebd12d8037fb99da5f20cbe46a1a4c37d8 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e0d8c98007152b2a8b22a58a79e1c6754ffa38f3 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e868fe389c8011c61bce7d6f2bb9c2e38a434fc5 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/3b0de7e607b6ab8c7af33bda05122475e7922771 | sparc | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/d7721e21bf4b89674ceec6b5b1485dc8b4fc60cf | sparc64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/a97764c692e2b0159fa5749b610b6889b398eb3b | i686 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/9b2aaa67d01a9dce853409562d385fad397a1a9f | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/6d825e029856a35c2de5e666410d0cf0440d2b5c | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1cba10a7820ba01dbaaa424ce546466cf3bcd55f | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ee268b09b5c3f8e0b25c0f457cf2eb0194900c0d | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c89fb45b52fe872cd4902cfc66f697a11ef1d376 | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/071e7d2b6fb138e9e02d521c14b0077e64909df3 | s390x | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/35b844082a3f0f076156b130cbe7fe32ee2ecf3b | sh4a | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/0b7ab885c27be643ce17c597084b74b600d45ec0 | nios2 | ibrdtnd-1.0.1 | NOK | http://autobuild.buildroot.net/results/e32dd44fd9cf77cd439d2edf1027c90e96d79885 | ORPH sh4a | imagemagick-7.1.0-51 | NOK | http://autobuild.buildroot.net/results/aa46da31950506a6a4d13831b1df34a394b0851b | ORPH m68k | jack2-1.9.21 | NOK | http://autobuild.buildroot.net/results/8fd9f57b33568524d1af4dd0193969fac7a26988 | arceb | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/16ea3613e5ff4a029ea6db14dd689b237b6bdd51 | sh4a | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/27247e94111a8f9170020de273c809cdd9eddd90 | ORPH mips64 | kmod-30 | NOK | http://autobuild.buildroot.net/results/206c1cbd6fea08ed6a114c0d375d816bdc4bdf6f | microblaze | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/7b8e23230602768a5478208d781255a73f8553d5 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/e09a618c7ef907d45cf92b0bc346c68246157b01 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/b1928a808c68fe43b6ebed146e67aebddd1ce8c8 | ORPH armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/01187bcf80903a29ad758e6d0321e09ad7019980 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/cf1db81cb83927305d5a2f59bba7ce36e4a74e52 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/8b6877a37ee854fed2f153b1a1fa6217c78a275b | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/b83e50b96e321a810b9e4a9d075f842c359921ff | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/18a429c1ab8bf1c2c0cad7eefffb462542e4094b | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/baecdb18976e108ca87cb763427e1a25430cd847 | microblazeel | libjxl-0.7.0 | NOK | http://autobuild.buildroot.net/results/505a9767abe7116d70853ca7f5d3564fbf34be78 | powerpc | libsigsegv-2.14 | NOK | http://autobuild.buildroot.net/results/414de566389ecdc67f0d1eaa711eaffc90a2d940 | sh4aeb | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/df4578f77eea4d5589634958626c5dfa05a709d2 | ORPH mips64 | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/5d38cbd2e6e3622f8469c3ef6c124764f07acddb | ORPH m68k | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/cbe88903b2c980845c3a11c25ba8fd77cba929b6 | ORPH powerpc64le | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/ebf8e774af6d7d9e18eaa4da2ab98aaa7df25cdb | ORPH mipsel | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/40cd3c774eecd3744c65af87211e48ed116a41b7 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/bbc9762ee0358e08608132fec7886f47dd4e746b | ORPH mipsel | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/f80cbbb984b3d8c4de325653f131425920fb2ca7 | ORPH mipsel | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/3e2b5c8ea81c56f58374b384de9d6b8cd3708da9 | ORPH sh4aeb | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/60bf39ac97119b60fb675bceede9432fb432106f | ORPH arm | liquid-dsp-1.4.0 | NOK | http://autobuild.buildroot.net/results/0b384930bf48e5578842abffee065825dfc98aa6 | aarch64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/93830d30ec9301fd99f417ee4cca0a93b8020efb | ORPH powerpc64le | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/0790bbc8d99659a801f2eb108ec0dec62199fd3d | s390x | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/ceade8103e84303e205fdad31f9ba46f2617cd34 | aarch64 | luvi-2.13.0 | NOK | http://autobuild.buildroot.net/results/f63633b494b3451732ec765d7b64795a4e410f32 | ORPH aarch64 | modem-manager-1.20.4 | NOK | http://autobuild.buildroot.net/results/270c745b859ec7f7b2ae95a8f22470a966e3dde4 | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/912790f0032a222351b01367fee32e750b172b46 | aarch64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/f3c43532b6bd417abcbac646ced70c297b020a48 | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/f352489b5b0545c7a644eaa7d052b4c4d3f360dd | powerpc64le | netsniff-ng-0.6.8 | NOK | http://autobuild.buildroot.net/results/4b433a2ab36576714559fd8dd97483922f8d2e8b | sparc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/48e16f69249ca38fe2c35fa3c20f500e41058e69 | aarch64_be | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/6b4c873a9c5e32426fc2446b9dce30c5f5280cae | s390x | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/29be45c68be71d78537bd4aa0ffad2e69b0826bf | ORPH sparc | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/625944ad06a22b5de98e927acdf59859638d022d | ORPH or1k | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/7c2fcf32bcf9bf54563338eff54017fcd4ed4b79 | ORPH armeb | owl-linux-1.0.7 | NOK | http://autobuild.buildroot.net/results/45911e8e146a11aa53173a3b954de5c673ef15ac | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/6363c9474fb3485329a6b6630a5c8a1750211acd | ORPH mips64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/042b913f6252b8535fa74751b75ce58a408e2c59 | arceb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/61fe4b21fb819156ff7bc509b7e2a8f98ab22140 | sh4 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/bf8a14ea16a155a876ab7e302dff1f1a0c66bdc7 | sparc64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/6feda086cc912a10aaf049aa10d7c887b1b74862 | i486 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/e20361eccdd96cfe3d807f85bc680f6be8e8c9c0 | microblaze | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/e816c98d0e705dddb062b19ec39257cf18e515c7 | mips | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/601f28f6324ba7f292d9465296bcf6697ee69795 | s390x | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/1f8ba349162acd80684d05a4eae4b8ef4eec7635 | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/40c09549f7843df8319e4f8f37f914939945741f | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/44cbf26b08fc3eb5097e27077c58d0508bc8ed69 | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/b1b881c7cc99f7355cc49daa00f75b61eaa789eb | sh4 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/db051d1ea131094ebb2c36587c4d98a6c7c76fff | sh4 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/178bb7babdde395df1ed9e4a8dc6de2e13293af2 | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/bea485c7ef84ca01a08526807dd421bb357cb924 | or1k | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/960cb33e35c1e506c1b3bb663122cbf3993234de | mips | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/57e8a455791d47a7ab2d2389bf2ec32ba7e1fb4e | microblaze | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/3d53c943454adf0ac22335bdd017636c9f461ee9 | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/1ed4d2a9a19f77857e05e567b050f763faa37034 | arc | reaver-1.6.6 | NOK | http://autobuild.buildroot.net/results/5f33e33be1bc4b96a0440969140d0af42912a739 | mips | s6-linux-utils-2.6.0.0 | NOK | http://autobuild.buildroot.net/results/e41e3385b5559b59de65437ef3f26c69a5eb9214 | sh4aeb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/c2d2c1b5862a21e9f9b3c982c84551ed38a4fd1c | ORPH or1k | skalibs-2.12.0.1 | NOK | http://autobuild.buildroot.net/results/2d193c40c667ec7ed912b6c3fcbef434c878b2b7 | powerpc64le | snmppp-3.4.10 | NOK | http://autobuild.buildroot.net/results/50b8f92fdbab3e8f0b386ef4cea8884a6b3f19c3 | powerpc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/529052ca41ff9fc4022b50f1beb0967e21058429 | aarch64_be | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/0b1ce5e29326f168b1915f893018ba4d055fd914 | microblazeel | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/a81e5b7c920471d988d04b1431e314345e627f75 | microblazeel | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/576ff8326f907610c42f768acb69815a79740d43 | mips64el | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/fe35d00284ea5d06c51245dd9513cf23c251f724 | arc | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/1a6f78fa36e0fbc4de7942720e010ce04a551b15 | ORPH s390x | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/716386e31412a1c2e3f3acad88e24d3ecef90f3c | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/6964e958c5d5b3c24cd547069b129c7e87108b34 | nios2 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/82d19a0f209253ea0dc27c845932f54166c05afa | powerpc64le | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/b8db315e56ba313d6489036c20aa43609289474e | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/846a9f7bc0f41da2bfd4f18377470f2c329a8ce2 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/fe5fbb92594a62fb30aa6803fbb990aae23c0507 | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/3bb5a72c3b3d58a37ec7a1f406ff2f9c896e25a6 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/79b1637148d7d4fa8215b56eae0969a66d189cb0 | mips | unknown | NOK | http://autobuild.buildroot.net/results/9ad0e1ca793568420420bf7d1e72ae7873b04238 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/ede47e2c46dc7b7d7109b22783938c38d726ef87 | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/5a3b7ac0d425fe82d2fc07aaab36c35c8ccb1c8e | mips | unknown | NOK | http://autobuild.buildroot.net/results/17e51f61405112a7ce7d70e121ce3cda5dea3ff4 | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/65e2288f41ff3dd0c1cecdf0a1b5d2a68eecbedf | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/4f1d0ab3efbd93737be5f8b03ca2e0e548dc3b15 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/e8ba058488bdd7bb3c188c026629e9e08fa42d5d | i686 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/88802c80854626cd34f88d98ead9aec29ab12ceb | ORPH or1k | vdr-2.6.3 | NOK | http://autobuild.buildroot.net/results/7cfd815037e345b2ef9d309bf9d59bc6310e1ebe | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/8acd7f1fe23fcc84b915f53b145905b747f8d185 | ORPH arceb | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/f349130985870f4a781cca56c3f551108f81aa3e | microblaze | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/07b4740f56668c3d9ec5a71f945533e1ceacdae9 | riscv32 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/a5f4acb08892f2dfa3658106a6174eae5638fb5e | nios2 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/dbf2ebd472615b2b652bff7822d1214cf71bb43f | mips64 | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/3b46e7a419df07412601b65a7444d6a4e4405941 | ORPH arc | xtables-addons-3.22 | NOK | http://autobuild.buildroot.net/results/501d47ccc3f1096d159d92f9cf2d98dced0566da | ORPH arc | xtables-addons-3.22 | NOK | http://autobuild.buildroot.net/results/2f204a9c05b5801f251c0c799ee6a8d607ea6efa | ORPH aarch64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/c72e49479e541bde248490173a6a4b76366eb7fd | microblazeel | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/a8aed62e550cf20dc20737e7516a6fa0875a0be0 | nios2 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/4f7406ec4bf7c72dca8b4ba2109977ce1771b90a | aarch64_be | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/712c35d84c03041c81991f07549d09869be1ff15 | nios2 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/9303fc036e98267ea4fda8fde6d89c83f6a15c40 | aarch64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/9b6da726841e8a4281be61442f47165bc77d8884 | mips64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/7a3a0f152bdbc4b7a6a6fc91794bdec17a0c85e5 | powerpc64 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/c7c58429e597c0d496244924aaf5a8aa65d5650f | sparc | zxing-cpp-1.4.0 | NOK | http://autobuild.buildroot.net/results/77002bd19a9b8a089d340f20880144bc8b58745c | Classification of failures by reason for 2022.02.x -------------------------------------------------- zabbix-5.4.9 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- s390x | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/2aabb416e97609e1868056ca7a0bb294fe8f6b20 | Classification of failures by reason for 2022.11.x -------------------------------------------------- xxhash-0.8.1 | 2 zabbix-5.4.9 | 2 audit-3.0.7 | 1 efivar-38 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 gerbera-1.10.0 | 1 gobject-introspection-1.72.0 | 1 host-pahole-1.24 | 1 libglib2-2.72.3 | 1 lirc-tools-0.10.2 | 1 lttng-modules-2.13.1 | 1 netsurf-3.10 | 1 pcsc-lite-1.9.9 | 1 unknown | 1 xenomai-3.0.10 | 1 xz-5.2.7 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | audit-3.0.7 | NOK | http://autobuild.buildroot.net/results/0bd7bcc8e1eb49d6800fe728fb52d84a3575ce81 | mipsel | efivar-38 | NOK | http://autobuild.buildroot.net/results/932e5c9fd97b8a9666e8eb11d5ec5431edc5be39 | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/6dd752c77ed42e9ecce56da8b0907682f82b0b5c | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/1fbda6fb4f804f66094b99b8f99dd94ba80895a8 | x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2d6e5ccd1c48c3269e83fc339abe59fe3efbda5d | ORPH xtensa | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8e60bb21a91c48ca5cd304593f802b55af1810eb | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/26ce3470b5ebf9c951abbc49dd0aaffcf18496a8 | arm | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/dcba3c40836b61f452e190307ea7e10d367d4da7 | ORPH aarch64_be | lttng-modules-2.13.1 | NOK | http://autobuild.buildroot.net/results/12ca286547d078f79316526ebcc095f5ab89076a | sparc64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/9ecd505890cb5927bc45fddde8f2ec9d6c5336cd | or1k | pcsc-lite-1.9.9 | NOK | http://autobuild.buildroot.net/results/32327068d68750e0745c39e2579969d5185db47b | ORPH aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/f244f9aab5c14fcb71ec3cac0adfa516b293a1a8 | m68k | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/bc2a11d3b5128b321e5aec77afc2c4a69498ecfa | or1k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/991ef12aa98d259aa363f7f56e4d393daf60c2e8 | ORPH or1k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/94833d60d5e186466eb11771662f4068378a744b | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/d20cb1891f8ec9d319253d0311cff0d018fb4a09 | ORPH mips | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/d634c8a94e81f911e679cd21bed55c947301f618 | mips64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/781606f1fdf7bad8457fbf24d5f85ede9f29cc83 | -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Fri Feb 17 13:28:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:28:47 +0100 Subject: [Buildroot] [git commit] package/dotconf: new package Message-ID: <20230217133205.0674E85FAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5336566668bd2ac9cd458a051eb6e8105d4b4544 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/dotconf/Config.in | 6 ++++++ package/dotconf/dotconf.hash | 3 +++ package/dotconf/dotconf.mk | 15 +++++++++++++++ 5 files changed, 28 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f8451c7fec..b9d54feb46 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2297,6 +2297,9 @@ F: package/wireguard-linux-compat/ F: package/wireguard-tools/ F: support/testing/tests/package/test_docker_compose.py +N: Peter Seiderer +F: package/dotconf/ + N: Peter Thompson F: package/sdl2_gfx/ F: package/sdl2_image/ diff --git a/package/Config.in b/package/Config.in index 0af4adffa5..b2808cc6f8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2019,6 +2019,7 @@ menu "Other" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" source "package/ding-libs/Config.in" + source "package/dotconf/Config.in" source "package/double-conversion/Config.in" source "package/eigen/Config.in" source "package/elfutils/Config.in" diff --git a/package/dotconf/Config.in b/package/dotconf/Config.in new file mode 100644 index 0000000000..21a74fa065 --- /dev/null +++ b/package/dotconf/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_DOTCONF + bool "dotconf" + help + Configuration file parser. + + https://github.com/williamh/dotconf diff --git a/package/dotconf/dotconf.hash b/package/dotconf/dotconf.hash new file mode 100644 index 0000000000..3233ea62c8 --- /dev/null +++ b/package/dotconf/dotconf.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7f1ecf40de1ad002a065a321582ed34f8c14242309c3547ad59710ae3c805653 dotconf-1.3.tar.gz +sha256 a50cc98d5044a7bbddabe61fc0ec42aa671c73bf414d0c6b50da83ea8ae041c6 COPYING diff --git a/package/dotconf/dotconf.mk b/package/dotconf/dotconf.mk new file mode 100644 index 0000000000..26e78b3c7a --- /dev/null +++ b/package/dotconf/dotconf.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# dotconf +# +################################################################################ + +DOTCONF_VERSION = 1.3 +DOTCONF_SITE = $(call github,williamh,dotconf,v$(DOTCONF_VERSION)) +DOTCONF_LICENSE = LGPL-2.1 +DOTCONF_LICENSE_FILES = COPYING +DOTCONF_INSTALL_STAGING = YES +# dotconf source code is released without configure script +DOTCONF_AUTORECONF = YES + +$(eval $(autotools-package)) From giulio.benetti at benettiengineering.com Fri Feb 17 13:32:41 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 17 Feb 2023 14:32:41 +0100 Subject: [Buildroot] [PATCH] package/libfuse3: bump to version 3.14.0 Message-ID: <20230217133241.533189-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index f697f4ad3f..2d78153c81 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 96399b09b91bc717a9e96ffea660d611e6a342547c1abd4d0e858b3dca9d5a13 libfuse3-3.13.1.tar.gz +sha256 b14f7d97abc11a5a70a37955021a7a1d8eb1d3dd5b6abec66af093eae3168c62 libfuse3-3.14.0.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index a2e9775868..8c306ba187 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.13.1 +LIBFUSE3_VERSION = 3.14.0 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE -- 2.34.1 From thomas.petazzoni at bootlin.com Fri Feb 17 13:32:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:32:58 +0100 Subject: [Buildroot] [PATCH v1] package/dotconf: new package In-Reply-To: <20230106210827.30007-1-ps.report@gmx.net> References: <20230106210827.30007-1-ps.report@gmx.net> Message-ID: <20230217143258.0f756d59@windsurf> Hello Peter, On Fri, 6 Jan 2023 22:08:25 +0100 Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > package/Config.in | 1 + > package/dotconf/Config.in | 6 ++++++ > package/dotconf/dotconf.hash | 3 +++ > package/dotconf/dotconf.mk | 15 +++++++++++++++ > 4 files changed, 25 insertions(+) > create mode 100644 package/dotconf/Config.in > create mode 100644 package/dotconf/dotconf.hash > create mode 100644 package/dotconf/dotconf.mk I've applied after adding an entry in the DEVELOPERS file for this package. I know you dropped yourself from the DEVELOPERS file in September 2022, but apparently you're back, and for new packages, we really want to have someone associated to them in the DEVELOPERS file to take care of build issues. Hopefully you are fine with this. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 17 13:45:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:45:57 +0100 Subject: [Buildroot] [git commit] package/speechd: new package Message-ID: <20230217134632.6C4D385FC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/speechd/Config.in | 20 ++++++++++++++++++++ package/speechd/speechd.hash | 5 +++++ package/speechd/speechd.mk | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b9d54feb46..319ea9f4dc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2299,6 +2299,7 @@ F: support/testing/tests/package/test_docker_compose.py N: Peter Seiderer F: package/dotconf/ +F: package/speechd/ N: Peter Thompson F: package/sdl2_gfx/ diff --git a/package/Config.in b/package/Config.in index b2808cc6f8..e9746862b4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -51,6 +51,7 @@ menu "Audio and video applications" source "package/pipewire-media-session/Config.in" source "package/pulseaudio/Config.in" source "package/sox/Config.in" + source "package/speechd/Config.in" source "package/squeezelite/Config.in" source "package/tinycompress/Config.in" source "package/tovid/Config.in" diff --git a/package/speechd/Config.in b/package/speechd/Config.in new file mode 100644 index 0000000000..8fdc452d19 --- /dev/null +++ b/package/speechd/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_SPEECHD + bool "speechd" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_DOTCONF + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSNDFILE + help + Speech Dispatcher project provides a high-level device + independent layer for access to speech synthesis through + a simple, stable and well documented interface. + + https://freebsoft.org/speechd + +comment "speechd needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/speechd/speechd.hash b/package/speechd/speechd.hash new file mode 100644 index 0000000000..4eb4cd09d2 --- /dev/null +++ b/package/speechd/speechd.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 628d4446894b47f0df099123924c1070180b5b5b09c5b637ebe80d8578fba92f speechd-0.11.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL-2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL-3 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk new file mode 100644 index 0000000000..0d43e4b6fb --- /dev/null +++ b/package/speechd/speechd.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# speechd +# +################################################################################ + +SPEECHD_VERSION = 0.11.4 +SPEECHD_SITE = $(call github,brailcom,speechd,$(SPEECHD_VERSION)) +SPEECHD_LICENSE = GPL-2.0+, GPL-3.0+ (buildsystem), LGPL-2.1+ +SPEECHD_LICENSE_FILES = COPYING.GPL-2 COPYING.GPL-3 COPYING.LGPL +SPEECHD_INSTALL_STAGING = YES +# speechd source code is released without configure script +SPEECHD_AUTORECONF = YES +SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile + +# fix missing config.rpath (needed for autoreconf) in the codebase +define SPEECHD_TOUCH_CONFIG_RPATH + touch $(@D)/config.rpath +endef +SPEECHD_PRE_CONFIGURE_HOOKS += SPEECHD_TOUCH_CONFIG_RPATH + +ifeq ($(BR2_PACKAGE_LIBTOOL),y) +SPEECHD_DEPENDENCIES += libtool +SPEECHD_CONF_OPTS += --with-libltdl +else +SPEECHD_CONF_OPTS += --without-libltdl +endif + +define SPEECHD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/speech-dispatcherd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/speech-dispatcherd.service +endef + +$(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Fri Feb 17 13:46:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:46:45 +0100 Subject: [Buildroot] [PATCH v1] package/speechd: new package In-Reply-To: <20230106210827.30007-2-ps.report@gmx.net> References: <20230106210827.30007-1-ps.report@gmx.net> <20230106210827.30007-2-ps.report@gmx.net> Message-ID: <20230217144645.536cea66@windsurf> On Fri, 6 Jan 2023 22:08:26 +0100 Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Notes/Todo: > - double check license description against > https://github.com/brailcom/speechd#license > - maybe add SYSV init script > --- > package/Config.in | 1 + > package/speechd/Config.in | 20 ++++++++++++++++++++ > package/speechd/speechd.hash | 5 +++++ > package/speechd/speechd.mk | 34 ++++++++++++++++++++++++++++++++++ > 4 files changed, 60 insertions(+) > create mode 100644 package/speechd/Config.in > create mode 100644 package/speechd/speechd.hash > create mode 100644 package/speechd/speechd.mk Applied to master, after adding an entry in the DEVELOPERS file! Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 17 13:47:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:47:44 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5speech: new package Message-ID: <20230217134803.3E53785FCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ced0a528ddbffcc130997aaeee7598c82c6cd49 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/qt5/Config.in | 1 + package/qt5/qt5speech/Config.in | 12 ++++++++++++ package/qt5/qt5speech/qt5speech.hash | 7 +++++++ package/qt5/qt5speech/qt5speech.mk | 23 +++++++++++++++++++++++ 5 files changed, 44 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 319ea9f4dc..a429f81cc9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2299,6 +2299,7 @@ F: support/testing/tests/package/test_docker_compose.py N: Peter Seiderer F: package/dotconf/ +F: package/qt5/qt5speech/ F: package/speechd/ N: Peter Thompson diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 6dc9cfa148..f1b16ff39b 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -59,6 +59,7 @@ source "package/qt5/qt5scxml/Config.in" source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialbus/Config.in" source "package/qt5/qt5serialport/Config.in" +source "package/qt5/qt5speech/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5tools/Config.in" source "package/qt5/qt5virtualkeyboard/Config.in" diff --git a/package/qt5/qt5speech/Config.in b/package/qt5/qt5speech/Config.in new file mode 100644 index 0000000000..cebd06057e --- /dev/null +++ b/package/qt5/qt5speech/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_QT5SPEECH + bool "qt5speech" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qt Speech enables support for accessibility features such as + text-to-speech. + + For output optional enable flite or speechd. + + https://doc.qt.io/qt-5/qtspeech-index.html diff --git a/package/qt5/qt5speech/qt5speech.hash b/package/qt5/qt5speech/qt5speech.hash new file mode 100644 index 0000000000..595aac9f22 --- /dev/null +++ b/package/qt5/qt5speech/qt5speech.hash @@ -0,0 +1,7 @@ +# Locally calculated +sha256 6d0794ab9d5286d04fbac2db44c00ed3306e569c876f84cfd91ac0e79c834b1e qtspeech-d32f4a479d38a11f547598004b975f4356424a16.tar.bz2 + +# Hashes for license files: +sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 +sha256 75d800e60c8d58c2e7f0338e8552ea6123a9ce7e5dd8e1cdf2095e013b737488 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5speech/qt5speech.mk b/package/qt5/qt5speech/qt5speech.mk new file mode 100644 index 0000000000..8cf6fe19c1 --- /dev/null +++ b/package/qt5/qt5speech/qt5speech.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# qt5speech +# +################################################################################ + +QT5SPEECH_VERSION = d32f4a479d38a11f547598004b975f4356424a16 +QT5SPEECH_SITE = $(QT5_SITE)/qtspeech/-/archive/$(QT5SPEECH_VERSION) +QT5SPEECH_SOURCE = qtspeech-$(QT5SPEECH_VERSION).tar.bz2 +QT5SPEECH_INSTALL_STAGING = YES +QT5SPEECH_LICENSE = GPL-2.0+ or LGPL-3.0, GFDL-1.3 (docs) +QT5SPEECH_LICENSE_FILES = LICENSE.GPLv2 LICENSE.LGPLv3 LICENSE.FDL +QT5SPEECH_SYNC_QT_HEADERS = YES + +ifeq ($(BR2_PACKAGE_FLITE),y) +QT5SPEECH_DEPENDENCIES += flite +endif + +ifeq ($(BR2_PACKAGE_SPEECHD),y) +QT5SPEECH_DEPENDENCIES += speechd +endif + +$(eval $(qmake-package)) From thomas.petazzoni at bootlin.com Fri Feb 17 13:48:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:48:14 +0100 Subject: [Buildroot] [PATCH v1] package/qt5speech: new package In-Reply-To: <20230106210827.30007-3-ps.report@gmx.net> References: <20230106210827.30007-1-ps.report@gmx.net> <20230106210827.30007-3-ps.report@gmx.net> Message-ID: <20230217144814.5f8689bb@windsurf> On Fri, 6 Jan 2023 22:08:27 +0100 Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > package/qt5/Config.in | 1 + > package/qt5/qt5speech/Config.in | 12 ++++++++++++ > package/qt5/qt5speech/qt5speech.hash | 7 +++++++ > package/qt5/qt5speech/qt5speech.mk | 23 +++++++++++++++++++++++ > 4 files changed, 43 insertions(+) > create mode 100644 package/qt5/qt5speech/Config.in > create mode 100644 package/qt5/qt5speech/qt5speech.hash > create mode 100644 package/qt5/qt5speech/qt5speech.mk Applied to master after adding an entry to the DEVELOPERS file. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 17 14:10:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 15:10:41 +0100 Subject: [Buildroot] [PATCH] python-wheel: new package In-Reply-To: <20221025065356.1838-1-afshin.nasser@gmail.com> References: <20221025065356.1838-1-afshin.nasser@gmail.com> Message-ID: <20230217151041.5d6ece80@windsurf> Hello Nasser, Thanks for the contribution, and sorry for the very slow feedback :-/ On Tue, 25 Oct 2022 10:23:56 +0330 Nasser Afshin wrote: > Signed-off-by: Nasser Afshin > --- > package/Config.in | 1 + > package/python-wheel/Config.in | 15 +++++++++++++++ > package/python-wheel/python-wheel.hash | 5 +++++ > package/python-wheel/python-wheel.mk | 14 ++++++++++++++ > 4 files changed, 35 insertions(+) > create mode 100644 package/python-wheel/Config.in > create mode 100644 package/python-wheel/python-wheel.hash > create mode 100644 package/python-wheel/python-wheel.mk Could you give some details on the use case for python-wheels on the target? Also, could you add an entry to the DEVELOPERS file? In addition, for Python packages, we really like to have a runtime test in support/testing/. Could you have a look into this? > source "package/python-ws4py/Config.in" > diff --git a/package/python-wheel/Config.in b/package/python-wheel/Config.in > new file mode 100644 > index 0000000000..225d7529a4 > --- /dev/null > +++ b/package/python-wheel/Config.in > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_PYTHON_WHEEL > + bool "python-wheel" > + help > + This library is the reference implementation of the Python wheel > + packaging standard, as defined in PEP 427. > + > + It has two different roles: > + 1. A setuptools extension for building wheels that provides the bdist_wheel > + setuptools command > + 2. A command line tool for working with wheel files > + > + It should be noted that wheel is not intended to be used as a library, and as > + such there is no stable, public API. > + > + https://github.com/pypa/wheel The indentation is not correct. Could you run "make check-package" and make sure there are no warnings? > index 0000000000..d8fab54867 > --- /dev/null > +++ b/package/python-wheel/python-wheel.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-wheel > +# > +################################################################################ > + > +PYTHON_WHEEL_VERSION = 0.37.1 > +PYTHON_WHEEL_SOURCE = wheel-$(PYTHON_WHEEL_VERSION).tar.gz > +PYTHON_WHEEL_SITE = https://files.pythonhosted.org/packages/c0/6c/9f840c2e55b67b90745af06a540964b73589256cb10cc10057c87ac78fc2 > +PYTHON_WHEEL_SETUP_TYPE = distutils Are you sure? It seems to be using setuptools. Could you double check this? Could you fix this and resend, as a new patch sent with "git send-email" (and not in the middle of a reply, like you did for python-pycrate, which was not good)? Thanks a lot! Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 17 14:08:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 15:08:49 +0100 Subject: [Buildroot] [git commit] package/python-pycrate: new package Message-ID: <20230217141250.EF90C85FD9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a850f632b9f76b8526f807468548c570b1dc2bd6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Nasser Afshin Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-pycrate/Config.in | 6 ++++++ package/python-pycrate/python-pycrate.hash | 5 +++++ package/python-pycrate/python-pycrate.mk | 20 ++++++++++++++++++++ 5 files changed, 35 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a429f81cc9..3d9c51a094 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2092,6 +2092,9 @@ N: Murat Demirten F: package/jpeg-turbo/ F: package/libgeotiff/ +N: Nasser Afshin +F: package/python-pycrate/ + N: Nathaniel Roach F: package/bandwidthd/ F: package/libgudev/ diff --git a/package/Config.in b/package/Config.in index e9746862b4..523cf7cbdf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1196,6 +1196,7 @@ menu "External python modules" source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" source "package/python-pycparser/Config.in" + source "package/python-pycrate/Config.in" source "package/python-pycryptodomex/Config.in" source "package/python-pycups/Config.in" source "package/python-pydal/Config.in" diff --git a/package/python-pycrate/Config.in b/package/python-pycrate/Config.in new file mode 100644 index 0000000000..193a973f7e --- /dev/null +++ b/package/python-pycrate/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYCRATE + bool "python-pycrate" + help + A software suite to handle various data formats. + + https://github.com/P1sec/pycrate/ diff --git a/package/python-pycrate/python-pycrate.hash b/package/python-pycrate/python-pycrate.hash new file mode 100644 index 0000000000..e37fd6743a --- /dev/null +++ b/package/python-pycrate/python-pycrate.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pycrate/json +md5 075622d5d573274cd4dbfe268ca52f7f pycrate-0.5.5.tar.gz +sha256 59f09331890a389a6b98412f19f4fb021c5a75a35ab07bf5ba0d1e299a0967af pycrate-0.5.5.tar.gz +# Locally computed +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 license.txt diff --git a/package/python-pycrate/python-pycrate.mk b/package/python-pycrate/python-pycrate.mk new file mode 100644 index 0000000000..6779433556 --- /dev/null +++ b/package/python-pycrate/python-pycrate.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-pycrate +# +################################################################################ + +PYTHON_PYCRATE_VERSION = 0.5.5 +PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz +PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/25/8f/b3d7e0b541aa04b2f0f7aa694a6946b572bfa2e2627cf1f12b5416d633df +PYTHON_PYCRATE_SETUP_TYPE = setuptools +PYTHON_PYCRATE_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/P1sec/pycrate/$(PYTHON_PYCRATE_VERSION)/license.txt +PYTHON_PYCRATE_LICENSE = LGPL-2.1+ +PYTHON_PYCRATE_LICENSE_FILES = license.txt + +define PYTHON_PYCRATE_ADD_LICENSE_FILE + cp $(PYTHON_PYCRATE_DL_DIR)/license.txt $(@D) +endef +PYTHON_PYCRATE_POST_EXTRACT_HOOKS += PYTHON_PYCRATE_ADD_LICENSE_FILE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Fri Feb 17 14:36:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 15:36:24 +0100 Subject: [Buildroot] [PATCH v3 RESEND] python-pycrate: new package In-Reply-To: <20221108084551.GA22961@smart-All-Series> References: <20221025065539.4646-1-afshin.nasser@gmail.com> <20221026102255.GA602@smart-All-Series> <20221029080229.GA24217@smart-All-Series> <20221108084551.GA22961@smart-All-Series> Message-ID: <20230217153624.58898d55@windsurf> Hello, On Tue, 8 Nov 2022 12:15:51 +0330 Nasser Afshin wrote: > > > From de6e28885836a6d9a5347a083a68055098508583 Mon Sep 17 00:00:00 2001 > > > From: Nasser Afshin > > > Date: Tue, 25 Oct 2022 16:06:53 +0330 > > > Subject: [PATCH v3] python-pycrate: new package > > > > > > Signed-off-by: Nasser Afshin Thanks for your contribution. However what you did here when resending a new iteration really wasn't convenient to apply the patch. Next time could you use "git send-email" to send the new iteration as a new-email. Some more comments below. > > > diff --git a/package/python-pycrate/python-pycrate.hash b/package/python-pycrate/python-pycrate.hash > > > new file mode 100644 > > > index 0000000000..8ad33370b4 > > > --- /dev/null > > > +++ b/package/python-pycrate/python-pycrate.hash > > > @@ -0,0 +1,6 @@ > > > +# md5, sha256 from https://pypi.org/pypi/pycrate/json > > > +md5 075622d5d573274cd4dbfe268ca52f7f pycrate-0.5.5.tar.gz > > > +sha256 59f09331890a389a6b98412f19f4fb021c5a75a35ab07bf5ba0d1e299a0967af pycrate-0.5.5.tar.gz > > > +# Locally computed > > > +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 license.txt This did not match the expected formatting. "make check-package" complains about formatting issues in the hash file. > > > diff --git a/package/python-pycrate/python-pycrate.mk b/package/python-pycrate/python-pycrate.mk > > > new file mode 100644 > > > index 0000000000..c0da152656 > > > --- /dev/null > > > +++ b/package/python-pycrate/python-pycrate.mk > > > @@ -0,0 +1,14 @@ > > > +################################################################################ > > > +# > > > +# python-pycrate > > > +# > > > +################################################################################ > > > + > > > +PYTHON_PYCRATE_VERSION = 0.5.5 > > > +PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz > > > +PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/25/8f/b3d7e0b541aa04b2f0f7aa694a6946b572bfa2e2627cf1f12b5416d633df > > > +PYTHON_PYCRATE_SETUP_TYPE = setuptools > > > +PYTHON_PYCRATE_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/P1sec/pycrate/master/license.txt This was not good for three reasons: (1) The license.txt was not listed in PYTHON_PYCRATE_LICENSE_FILES so it was not taken into account (2) The URL from which you download the file does not point to a stable file: it's the file from the master branch, so it can change at any time, breaking the hash check, but also potentially being inconsistent with the license of version 0.5.5 that the package is using (3) The license.txt was not copied into the source directory of the package, making it unaccessible to the legal-info machinery. With these issues fixed, the .mk file looks like this: PYTHON_PYCRATE_VERSION = 0.5.5 PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/25/8f/b3d7e0b541aa04b2f0f7aa694a6946b572bfa2e2627cf1f12b5416d633df PYTHON_PYCRATE_SETUP_TYPE = setuptools PYTHON_PYCRATE_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/P1sec/pycrate/$(PYTHON_PYCRATE_VERSION)/license.txt PYTHON_PYCRATE_LICENSE = LGPL-2.1+ PYTHON_PYCRATE_LICENSE_FILES = license.txt define PYTHON_PYCRATE_ADD_LICENSE_FILE cp $(PYTHON_PYCRATE_DL_DIR)/license.txt $(@D) endef PYTHON_PYCRATE_POST_EXTRACT_HOOKS += PYTHON_PYCRATE_ADD_LICENSE_FILE $(eval $(python-package)) I've applied after fixing the different issues. However, one thing that would be really good to add is a runtime test in support/testing/ to make sure that the package is at least minimally working at runtime. You can take a look at all the support/testing/tests/package/test_python* files for examples. Thanks a lot! 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 Feb 17 14:57:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 15:57:08 +0100 Subject: [Buildroot] [git commit] package/catch2: new package Message-ID: <20230217145951.7793585FED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5b597d5d839486e82a80f1c59c2a91a5af87c06 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Catch2 is a modern C++ unit testing framework which is increasing in popularity. This package is staging only and allows to build tests to be run on the target. - https://github.com/catchorg/Catch2 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/catch2/Config.in | 28 ++++++++++++++++++++++++++++ package/catch2/catch2.hash | 3 +++ package/catch2/catch2.mk | 22 ++++++++++++++++++++++ 5 files changed, 55 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3d9c51a094..7894b10e38 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2035,6 +2035,7 @@ F: package/sdl2/ N: Michael Nosthoff F: package/boost/ +F: package/catch2/ F: package/fmt/ F: package/grpc/ F: package/gtest/ diff --git a/package/Config.in b/package/Config.in index 523cf7cbdf..6c5238a9b0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2012,6 +2012,7 @@ menu "Other" source "package/boost/Config.in" source "package/c-capnproto/Config.in" source "package/capnproto/Config.in" + source "package/catch2/Config.in" source "package/cctz/Config.in" source "package/cereal/Config.in" source "package/clang/Config.in" diff --git a/package/catch2/Config.in b/package/catch2/Config.in new file mode 100644 index 0000000000..2f53d197b2 --- /dev/null +++ b/package/catch2/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_CATCH2 + bool "catch2" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_USE_MMU # fork() + help + Catch2 is mainly a unit testing framework for C++, but it + also provides basic micro-benchmarking features, and simple + BDD macros. + + Catch2's main advantage is that using it is both simple and + natural. Tests autoregister themselves and do not have to + be named with valid identifiers, assertions look like + normal C++ code, and sections provide a nice way to share + set-up and tear-down code in tests. + + This package allows running testsuites on the target which + might be advantageous in certain cases. + + https://github.com/catchorg/Catch2 + +comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash new file mode 100644 index 0000000000..664164fd76 --- /dev/null +++ b/package/catch2/catch2.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 2106bccfec18c8ce673623d56780220e38527dd8f283ccba26aa4b8758737d0e catch2-3.1.1.tar.gz +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk new file mode 100644 index 0000000000..ab62cc943b --- /dev/null +++ b/package/catch2/catch2.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# catch2 +# +################################################################################ + +CATCH2_VERSION = 3.1.1 +CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) +CATCH2_INSTALL_STAGING = YES +CATCH2_INSTALL_TARGET = NO +CATCH2_LICENSE = BSL-1.0 +CATCH2_LICENSE_FILES = LICENSE.txt +CATCH2_SUPPORTS_IN_SOURCE_BUILD = NO + +# We force building a static library only as building a dynamic +# library is not really supported officially: +# https://github.com/catchorg/Catch2/blob/devel/docs/faq.md#can-i-compile-catch2-into-a-dynamic-library +CATCH2_CONF_OPTS = \ + -DCATCH_INSTALL_DOCS=OFF \ + -DBUILD_SHARED_LIBS=OFF + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Fri Feb 17 15:01:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:01:10 +0100 Subject: [Buildroot] [PATCH v3] package/catch2: new package In-Reply-To: <20221025190109.320525-1-buildroot@heine.tech> References: <20221025190109.320525-1-buildroot@heine.tech> Message-ID: <20230217160110.60c3b66d@windsurf> Hello Michael, On Tue, 25 Oct 2022 21:01:09 +0200 Michael Nosthoff via buildroot wrote: > Catch2 is a modern C++ unit testing framework which is > increasing in popularity. > This package is staging only and allows to build tests > to be run on the target. > > - https://github.com/catchorg/Catch2 > > Signed-off-by: Michael Nosthoff Sorry for the huge delay. I have applied your patch to master, with two small changes, see below. > +CATCH2_VERSION = 3.1.1 > +CATCH2_SOURCE = v$(CATCH2_VERSION).tar.gz > +CATCH2_SITE = https://github.com/catchorg/Catch2/archive I've used the github macro instead, because you're anyway downloading the auto-generated tarball from Github here. > +CATCH2_INSTALL_STAGING = YES > +CATCH2_INSTALL_TARGET = NO > +CATCH2_LICENSE = BSL-1.0 > +CATCH2_LICENSE_FILES = LICENSE.txt > +CATCH2_SUPPORTS_IN_SOURCE_BUILD = NO > + > +CATCH2_CONF_OPTS = -DCATCH_INSTALL_DOCS=OFF \ > + -DBUILD_SHARED_LIBS=OFF I fixed up the indentation here, and added a comment to explain why we unconditionally disable shared libraries. 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 Fri Feb 17 15:02:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:02:28 +0100 Subject: [Buildroot] [git commit] package/openipmi: add libexecinfo optional dependency Message-ID: <20230217150858.DA9E286000@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5357f650d7e58043a5b8ab820972984eb07fef4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add libexecinfo optional dependency as upstream rejected the patch to add --with-execinfo=no Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-configure.ac-add-without-execinfo-option.patch | 55 ---------------------- package/openipmi/openipmi.mk | 6 ++- 2 files changed, 5 insertions(+), 56 deletions(-) diff --git a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch deleted file mode 100644 index e1838a06f4..0000000000 --- a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 388033e3d0129510c3884333bc428cefeb75e0b8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 3 Jan 2022 23:27:21 +0100 -Subject: [PATCH] configure.ac: add --without-execinfo option - -Add an option to allow the user to disable execinfo to avoid the -following build failure on musl with -https://github.com/mikroskeem/libexecinfo: - -/home/buildroot/autobuild/instance-3/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-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' - -Fixes: - - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://sourceforge.net/p/openipmi/patches/36] ---- - configure.ac | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 607864b9..f369166f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -77,6 +77,16 @@ AC_ARG_WITH(poptlibs, - POPTLIBS="$withval" - ) - -+tryexecinfo=yes -+AC_ARG_WITH(execinfo, -+[ --with-execinfo[[=yes|no]] Look for execinfo.], -+ if test "x$withval" = "xyes"; then -+ tryexecinfo=yes -+ elif test "x$withval" = "xno"; then -+ tryexecinfo=no -+ fi, -+) -+ - # If UCD SNMP requires OpenSSL, this tells where to find the crypto lib - tryopenssl=yes - AC_ARG_WITH(openssl, -@@ -275,7 +285,9 @@ AM_PROG_CC_C_O - AC_PROG_LIBTOOL - AC_STDC_HEADERS - --AC_CHECK_HEADERS(execinfo.h) -+if test "x$tryexecinfo" != "xno"; then -+ AC_CHECK_HEADERS(execinfo.h) -+fi - AC_CHECK_HEADERS([netinet/ether.h]) - AC_CHECK_HEADERS([sys/ethernet.h]) - --- -2.34.1 - diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index b3a4d90d4b..81492ec131 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -15,7 +15,6 @@ OPENIPMI_INSTALL_STAGING = YES OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" OPENIPMI_CONF_OPTS = \ - --with-execinfo=no \ --with-glib=no \ --with-tcl=no \ --with-perl=no \ @@ -26,6 +25,11 @@ ifeq ($(BR2_PACKAGE_GDBM),y) OPENIPMI_DEPENDENCIES += gdbm endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +OPENIPMI_DEPENDENCIES += libexecinfo +OPENIPMI_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPENIPMI_DEPENDENCIES += openssl OPENIPMI_CONF_OPTS += --with-openssl=yes From thomas.petazzoni at bootlin.com Fri Feb 17 15:02:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:02:38 +0100 Subject: [Buildroot] [git commit] package/openipmi: bump to version 2.0.33 Message-ID: <20230217150858.E63F986002@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c674014c1744dd6db3dd8717efca51fe7ceb1038 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) and so also drop autoreconf Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Avoid-searching-host-library-path.patch | 53 ---------------------- package/openipmi/openipmi.hash | 6 +-- package/openipmi/openipmi.mk | 4 +- 3 files changed, 4 insertions(+), 59 deletions(-) diff --git a/package/openipmi/0001-Avoid-searching-host-library-path.patch b/package/openipmi/0001-Avoid-searching-host-library-path.patch deleted file mode 100644 index 15b4510f67..0000000000 --- a/package/openipmi/0001-Avoid-searching-host-library-path.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Wed, 22 Jul 2015 07:04:33 +0300 -Subject: [PATCH] Avoid searching host library path - -The $(libdir) variable points to the location of the directory on the target -system, /usr/lib by default. When cross compiling this directory contains the -host libraries which may be different than target libraries. Don't use -$(libdir) in the library search path. - -Signed-off-by: Baruch Siach -Signed-off-by: Joel Stanley -[Fabrice: refresh patch for 2.0.32] -Signed-off-by: Fabrice Fontaine -[Upstream status: https://sourceforge.net/p/openipmi/patches/35] ---- - cmdlang/Makefile.am | 3 +-- - unix/Makefile.am | 6 ++---- - 2 files changed, 3 insertions(+), 6 deletions(-) - -diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index 264ee12be79f..0b3843784656 100644 ---- a/cmdlang/Makefile.am -+++ b/cmdlang/Makefile.am -@@ -15,7 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ - $(top_builddir)/utils/libOpenIPMIutils.la \ - $(top_builddir)/lib/libOpenIPMI.la - libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - bin_PROGRAMS = openipmish - -diff --git a/unix/Makefile.am b/unix/Makefile.am -index 5128839dad13..bd0f897ba8d6 100644 ---- a/unix/Makefile.am -+++ b/unix/Makefile.am -@@ -10,12 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la - libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ - $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) - libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c - libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ - $(GDBM_LIB) $(RT_LIB) - libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - noinst_HEADERS = heap.h - diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash index eded076ade..fc3cf1a520 100644 --- a/package/openipmi/openipmi.hash +++ b/package/openipmi/openipmi.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 73d7dce4312b006983b11367e4a43d4ec52cf888 OpenIPMI-2.0.32.tar.gz -md5 532404c9df7d0e8bde975b95b9e6775b OpenIPMI-2.0.32.tar.gz +sha1 4387f227aad92756e296d1c9421e83231d355dbd OpenIPMI-2.0.33.tar.gz +md5 923d2914dbbc3307712f8c58401bab0f OpenIPMI-2.0.33.tar.gz # Locally computed -sha256 f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945 OpenIPMI-2.0.32.tar.gz +sha256 fb53e9ea5e2681cf8af7cda024b1a0044c675f84116ca27ae9616c8b7ad95b49 OpenIPMI-2.0.33.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index 81492ec131..ccf86f93cd 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -4,15 +4,13 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.32 +OPENIPMI_VERSION = 2.0.33 OPENIPMI_SITE = https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD OPENIPMI_DEPENDENCIES = popt ncurses readline host-pkgconf OPENIPMI_INSTALL_STAGING = YES -# Patching Makefile.am -OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" OPENIPMI_CONF_OPTS = \ --with-glib=no \ From thomas.petazzoni at bootlin.com Fri Feb 17 15:09:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:09:58 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/openipmi: add libexecinfo optional dependency In-Reply-To: <20221030175632.4139-1-fontaine.fabrice@gmail.com> References: <20221030175632.4139-1-fontaine.fabrice@gmail.com> Message-ID: <20230217160958.6c761a9d@windsurf> On Sun, 30 Oct 2022 18:56:31 +0100 Fabrice Fontaine wrote: > Add libexecinfo optional dependency as upstream rejected the patch to > add --with-execinfo=no > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Add missing local patch Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Feb 17 15:10:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:10:40 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/openipmi: add libexecinfo optional dependency In-Reply-To: <20221030182041.GX1058960@scaer> References: <20221030175632.4139-1-fontaine.fabrice@gmail.com> <20221030182041.GX1058960@scaer> Message-ID: <20230217161040.42a0c31a@windsurf> Hello Yann, On Sun, 30 Oct 2022 19:20:41 +0100 "Yann E. MORIN" wrote: > Fabrice, All, > > On 2022-10-30 18:56 +0100, Fabrice Fontaine spake thusly: > > Add libexecinfo optional dependency as upstream rejected the patch to > > add --with-execinfo=no > > Indeed, they rejected it, but they suggested an alternate solution: > check for backtrace() and whether it requires -lexecinfo. > > Something like: > > AC_SEARCH_LIBS( > [backtrace], > [execinfo], > , > [AC_MSG_ERROR([backtrace() not found and no library provides it; maybe install libexecinfo])] > ) > > Regards, > Yann E. MORIN. Agreed, but for now, Fabrice's patch was good enough, so I applied as-is. It will certainly be nice if Fabrice has the chance to work on a better solution using AC_SEARCH_LIBS(). Best regards, 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 Feb 17 15:15:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:15:21 +0100 Subject: [Buildroot] [PATCH] board/cubietech/cubieboard1: add Cubieboard 1 In-Reply-To: <20221105194712.541286-1-gero@schwaericke.email> References: <20221105194712.541286-1-gero@schwaericke.email> Message-ID: <20230217161521.01f4f2a7@windsurf> Hello Gero, On Sat, 5 Nov 2022 19:47:12 +0000 Gero Schw?ricke wrote: > Board support for the Cubieboard 1 from Cubietech. Based the config for > Cubieboard 2 and the Olimex A10-OLinuXino-LIME which is also an > Allwinner A10 board (sunxi kernel). > > Signed-off-by: Gero Schw?ricke First of all, thanks a lot for your contribution, and sorry for the very slow feedback. See below some feedback. First of all, the commit title should be: configs/cubieboard1: new defconfig > --- > board/cubietech/cubieboard1/boot.cmd | 7 +++++ > board/cubietech/cubieboard1/genimage.cfg | 36 ++++++++++++++++++++++ > configs/cubieboard1_defconfig | 39 ++++++++++++++++++++++++ > 3 files changed, 82 insertions(+) > create mode 100644 board/cubietech/cubieboard1/boot.cmd > create mode 100644 board/cubietech/cubieboard1/genimage.cfg > create mode 100644 configs/cubieboard1_defconfig Could you add an entry in the DEVELOPERS file, both for the board/cubietech/cubieboard1/ folder and for the configs/cubieboard1_defconfig file? Another thing that is missing is a board/cubietech/cubieboard1/readme.txt that explains how to use this defconfig on this particular board. > diff --git a/board/cubietech/cubieboard1/boot.cmd b/board/cubietech/cubieboard1/boot.cmd > new file mode 100644 > index 0000000000..eefbdc8169 > --- /dev/null > +++ b/board/cubietech/cubieboard1/boot.cmd > @@ -0,0 +1,7 @@ > +# based on board/cubieboard2/boot.cmd > + > +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 sun4i-a10-cubieboard.dtb > +bootz $kernel_addr_r - $fdt_addr_r There's no support for extlinux.conf in the default U-Boot configuration for this board? Otherwise, it all looks good to me. Could you address the minor issues listed here, and send a 2nd version of your patch? Thanks a lot! Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From hrsourabh011 at gmail.com Fri Feb 17 15:52:49 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Fri, 17 Feb 2023 16:52:49 +0100 Subject: [Buildroot] Missing curl binary Message-ID: Hello, I am trying to include curl binary in my image. I have selected BR2_PACKAGE_LIBCURL=y , BR2_PACKAGE_LIBCURL_CURL=y in the Config. But still the curl binary is not installed in the target. Can anyone please let me know what is the issue here and how to resolve it? Thank you, Sourabh -------------- next part -------------- An HTML attachment was scrubbed... URL: From hrsourabh011 at gmail.com Fri Feb 17 16:15:39 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Fri, 17 Feb 2023 17:15:39 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates Message-ID: Hello, I am trying to add a custom CA to the trust store. I have copied the CA file to "/usr/local/share/ca-certificates/" in the rootfs_overlay and also has a .crt extension. Now after executing "make" the CA is not added to the trust store in /etc/ssl/certs/ in the target. Anyways it's installed only in "/usr/local/share/ca-certificates/" in the target. I thought "update-ca-certificates" will add this during image build. Can anyone please let me know what is missing here? Thank you, Sourabh -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Sat Feb 18 06:45:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 06:45:54 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-17 Message-ID: <20230218064600.861BC60BA4@smtp3.osuosl.org> Hello, Autobuild statistics for 2023-02-17 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 20 | 15 | 0 | 35 | master | 153 | 170 | 2 | 325 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 13 elfutils-0.186 | 8 linux-6.1.11 | 8 unknown | 7 gobject-introspection-1.72.0 | 6 host-go-1.19.6 | 5 zabbix-6.2.7 | 5 glibc-2.36-81-g4f4d7a13edfd... | 4 host-binutils-2.38 | 4 netsurf-3.10 | 4 host-gcc-final-11.3.0 | 3 host-libarchive-3.6.2 | 3 libgpg-error-1.46 | 3 mxs-bootlets-10.12.01 | 3 olsr-0.9.8 | 3 python-numpy-1.23.5 | 3 systemd-252.4 | 3 busybox-1.36.0 | 2 freeradius-client-1.1.7 | 2 host-pahole-1.24 | 2 host-rust-1.67.0 | 2 httping-2.5 | 2 libglib2-2.72.3 | 2 ltp-testsuite-20220930 | 2 ocf-linux-20171122 | 2 openvmtools-11.3.5-18557794 | 2 perl-5.36.0 | 2 qemu-7.2.0 | 2 uqmi-0a19b5b77140465c29e2af... | 2 acpid-2.0.34 | 1 asterisk-16.29.1 | 1 at91dataflashboot-1.05 | 1 audit-3.0.7 | 1 bayer2rgb-neon-15feb1115b48... | 1 boost-1.80.0 | 1 coremark-1.01 | 1 crun-1.7.2 | 1 dc3dd-7.2.641 | 1 docker-cli-23.0.0 | 1 dropbear-2022.83 | 1 dtbocfg-0.0.9 | 1 erlang-22.3.4.22 | 1 exim-4.96 | 1 fdk-aac-2.0.2 | 1 ffmpeg | 1 ffmpeg-4.4.3 | 1 fluent-bit-2.0.9 | 1 frr-8.4.2 | 1 fs/btrfs/btrfs.mk:55: /tmp/... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/jffs2/jffs2.mk:71: /home... | 1 fs/romfs/romfs.mk:32: /home... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gerbera-1.10.0 | 1 gnu-efi-3.0.15 | 1 gobject-introspection | 1 gocryptfs-2.3 | 1 highway-1.0.2 | 1 host-gcc-final-10.4.0 | 1 host-python3-3.11.1 | 1 json-c-0.16 | 1 kexec-2.0.25 | 1 libcamera-apps-1.1.1 | 1 libdeflate-1.15 | 1 libgcrypt-1.10.1 | 1 lightning-2.2.0 | 1 linux-5.10.162-cip24 | 1 linux-5.10.162-cip24-rt10 | 1 multipath-tools-0.9.4 | 1 musl-1.2.3 | 1 ncurses-6.3-20221224 | 1 ntp-4.2.8p15 | 1 openblas-0.3.21 | 1 p7zip-17.04 | 1 php-8.2.2 | 1 qt6base-6.4.2 | 1 rdma-core-44.0 | 1 rtl_433-22.11 | 1 speechd-0.11.4 | 1 strongswan-5.9.8 | 1 traceroute-2.1.0 | 1 uclibc-1.0.42 | 1 vdr-2.6.3 | 1 wolfssl-5.5.3 | 1 xenomai-3.0.10 | 1 xerces-3.2.4 | 1 xfont_font-misc-misc-1.1.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/9d4bf10de3807a5323eec4c60a11bc43d3267084 | ORPH powerpc64le | asterisk-16.29.1 | NOK | http://autobuild.buildroot.net/results/5c693aeb90f95ccb533b49166d577a399c3690d2 | arm | at91dataflashboot-1.05 | NOK | http://autobuild.buildroot.net/results/1b614a4d41981b30d9f94f825f4f0bb30fb00b86 | ORPH arm | audit-3.0.7 | NOK | http://autobuild.buildroot.net/results/d332170f58f690df76d5cb8444f5ec2ec144f230 | aarch64 | bayer2rgb-neon-15feb1115b48... | NOK | http://autobuild.buildroot.net/results/07e18d37e72acdaffcc36fc100f3d5275d2fb95a | arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/82425aff829ec7510ba2d7cf8216c8a865bf1d10 | mipsel | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/3c7376c24572431d90de0ac7296e303eb47f05e8 | ORPH mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/1061ff5b2a5b4a688d16be790a508a91600caae2 | ORPH sh4eb | coremark-1.01 | NOK | http://autobuild.buildroot.net/results/f19fe9f2dfef11193e9113453452e58b835b9afd | x86_64 | crun-1.7.2 | NOK | http://autobuild.buildroot.net/results/4472510f03772900b4cce1210c3cb3f127bdf170 | or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/60b54c59ce5a046f88b246abee6c6b46dfa5ec41 | ORPH x86_64 | docker-cli-23.0.0 | NOK | http://autobuild.buildroot.net/results/a456e83eafb08f7bead53948fb6e1ee9baa9b00b | riscv64 | dropbear-2022.83 | NOK | http://autobuild.buildroot.net/results/dd611960536f3d687a09df4a5026f0b297780a2b | mips64 | dtbocfg-0.0.9 | NOK | http://autobuild.buildroot.net/results/100ec330477ec3d5c5e9c513b3027fe8b05510ea | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/fae5fcff55318441ab0ecc38d0b950917a8070ea | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/8af49fa8c9e52e17b92208d0504eafbf95628807 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/50b4479971eb1fedb62719e23e0deb4bfe25b871 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/15dbaa7dd7d8c182cea81fbc8ffe7b8e6dbed62a | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/341b81bafeaf82a45bd2f5cc29a02e7c6182b78c | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/cd4123b6cf875fb799cc6430df916960940ec606 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/4db21cbb4b074ce650a86ecf1716b8c27f0b3608 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/b4e329ba6168f7955040933b22a085b13e61dacc | ORPH x86_64 | erlang-22.3.4.22 | NOK | http://autobuild.buildroot.net/results/90f7365d8477d35fca452b7b3f38babba086375e | armeb | exim-4.96 | NOK | http://autobuild.buildroot.net/results/5878e316b505a986e0c8484df242b932f7340051 | mips64 | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/1e7a20ef7a513ba23ea3d8a856e9d5712265b0e3 | i686 | ffmpeg | TIM | http://autobuild.buildroot.net/results/339ed3f76628df80b471228494f341b363de7c71 | armeb | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/5f3305ac8ec3a42873c6ba8b2e41044f58a768d9 | mips64el | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/f1a078db85941f1702fa7f60b25f83b2d29bd2f1 | riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/3c67f2538493a584797721d842e8f4e4f00dac58 | riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/55916661afeac4dd55604c2b79526d5d5535fdc7 | xtensa | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/a1705af7c1ce496fcb8379a6ce0dac045f37bdad | i686 | fs/btrfs/btrfs.mk:55: /tmp/... | NOK | http://autobuild.buildroot.net/results/46ba9dfa0a8db8007d411a4eb166ab0786343c82 | microblaze | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/c42a4ce76b4c10cef1ae8da639e24d8dbe491ebf | sh4 | fs/jffs2/jffs2.mk:71: /home... | NOK | http://autobuild.buildroot.net/results/68bd8da60bb54efe5d968be06c83ec24a51e0125 | sparc64 | fs/romfs/romfs.mk:32: /home... | NOK | http://autobuild.buildroot.net/results/6f313299170fbf0a327a8f1c66101e64780fd757 | sparc64 | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/b330794dd1ed5e5a7a18ea84feeba74ddced00ab | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/efff5708efefbadaad9b0ccbdfb9457a67d8fc02 | sparc64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/5c7b57ea0ce2cf844c815d25a938c8cc459d149b | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/13502204cdacf3a6de4724f33c2b40c84fc6a622 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/dbf25786616ce1c5e24a619cad37a23654165d66 | s390x | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/c308155617b27c462f2e3d59f5270279ca1caf66 | mipsel | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/28baddd912e6b68bf0ec77d0db5d2d8aac771d85 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/05e67999633be3d32714e2b538edac8539eb60f1 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/3e569e640e5daefb71c0975b69683ea4765a483f | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/50be6cf54bda9324cba68d6e7aaeb7578f27b04a | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/f6186da98a4b1015515f18d9c1c0f983430f1890 | mips64el | gnu-efi-3.0.15 | NOK | http://autobuild.buildroot.net/results/fbf037d44cf66bff44a6784d1d419a399cb44dec | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/5bf00af86da6e41d1a48abc7304bf339908a0150 | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a4e5e3a086895a6a43c7c52cd06d200062190068 | powerpc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/678b45f929de0ac7b284444cf2d49d2beb0bf180 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/fca58256430d6f3397811cf0fcabbd0e47c06163 | armeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/037cff719282e79917ff86576fe201b3682428d1 | powerpc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/19ca2f216b75d07b1aecf124a842cbc71942382e | mips | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/a07d70e03628ba1c724d4f7cf9d8b0c96939f8f8 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ec43fa2eca9450f36ec4d84f431d222563a121b1 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/1a57bceade7d3209de32caf0f4793cabd9087dec | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/88a3caa3248768133212e4e560450e7466d11e76 | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/32aa9ab8cfab21f40dfcd18c6351cbb52e881241 | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6fc897182479a45ce633f260711b1cc51b337597 | powerpc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/e2077da2a1e8dbd58b2c65d3fa39e0a09c378a58 | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/b16d6ac24f803d61f000adeb55b5fa4da9305e15 | powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/aeba99a319e3612658371e1e47e8bde35622afff | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/5a24bd790dcc0e1ec9f6ae4d9c2753d1fc51d247 | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f0609a70930f9601c0c724ce903b7730eb715fa7 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8f4fb319ef756c5e4c63728d3b5c2062489b0650 | ORPH armeb | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/cf2fc1ea9242bdfc945fff76a5a180e8767e31f0 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/9236bc11e47905896aab248a8217ecb6098a5f47 | ORPH s390x | gocryptfs-2.3 | NOK | http://autobuild.buildroot.net/results/8416beaf6dfaab1fcd0d8b1444dcdb2508b21693 | xtensa | highway-1.0.2 | NOK | http://autobuild.buildroot.net/results/f316a7cdf22ce57e386093ab8d4e696d4e708cc7 | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/387a9c49b06b1ed78f246ab804b0b3e94ba621fe | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/195606dad6add19fa9ad9272bb1b92b5f6456c38 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/955c80bca06f2630292b2fde80ebf58b9f397d49 | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/32e95db4cbea1c4f7a1757f1c77ec1b9262b267b | sparc | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/b87b9cd13186bc5ebfef4140298d9d67ff9a9dad | microblaze | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/f674b6cdadf788fb07980e6cb69d40d07a01795d | microblaze | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/0954ea533f050bf87cb29f1f25aa5ac161e521fd | arceb | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/13535aba17c4845635319a77d1c2709e2e2454fe | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/9c0cf006333b13fc7c5a6f275567f1818d276cae | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/f8e3b4686e8b811dbce64fae0c6b74f1e0476634 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e4ac2c7828f56b812ec48ebd6f891bc089367c86 | i586 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/37de9ac12d1c4d5a17bb1440bd9423756e8cae43 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e5c3534367d2810dfb062c6779c64a7fa3131b50 | s390x | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/eb93c87cb00be4173973d0961ae24c59bce93687 | x86_64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/b3fd21ab0cbdd1e0d571c24d600d6d1e0d1011a4 | x86_64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/35fe668bd3a9f8bbd1f83951a92a5f1b860b71b3 | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/540cb18b51f225fd7a7d892e16429a92d6c1d58b | m68k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/30e646d5579353a7ee8dc72b9110b7e3ea27e02f | sparc64 | host-python3-3.11.1 | NOK | http://autobuild.buildroot.net/results/c899e7574a2dae61469b1fa87cf82e47187634cd | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/eebd45377cb6a9a35cc30c3a5200d20f421c1e1d | s390x | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/d13f30143077a0c4277d28feae406ddc3ed9f423 | arceb | httping-2.5 | NOK | http://autobuild.buildroot.net/results/e4da8093844459c5d1c74d173505f611367ca9aa | arc | httping-2.5 | NOK | http://autobuild.buildroot.net/results/e2c7bcce38efa0ec62f9a1be32b969fb09d709b4 | or1k | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/86b7d1bafb27b7b6d2606100bf22659285b99db1 | armeb | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/c60fac85048b8b563d80bb0e62c8328564853033 | ORPH i686 | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/4683479f3f560f95d57d849ded3ed7482854231f | armeb | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/c3514908f5c82ea0d7b036196e7611ffd9e13500 | i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/8dadb27cae8507f77418069e42f51c6471b356a1 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/ea5d6cf1c2c02bec62f50d5c445c97bbcbfddd9f | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/8d675e604e8233a21f34b188961b2a4a1caccc79 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/716c02fb9f6daeec51bfce65fd187f01ab94eff5 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/521f8c699371ac77660bd1ec70c1491336921722 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/7da0d654d9f8c88ba8643be9f7433a423b9b5450 | ORPH x86_64 | lightning-2.2.0 | NOK | http://autobuild.buildroot.net/results/6d1a8bc49860f44eb75c9f70c790ea4678f4a111 | mips | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/e94a592bff020ec75e7d4956032ca426bb8a2ac4 | ORPH mips64 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/ee1fd464b836e18f50e3992f434d9bf8079cd80c | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/0825f187d55fb2cb62a5b948ce88449cea72ca62 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/b1425c00309d4d4120644686cff6da9b48bd06b3 | ORPH aarch64_be | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/c358c92c2567d2e8ff2252a9247e3493b428d634 | ORPH powerpc | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/d7c7b86904e422005ad3ae3ac102ff02a8846d8a | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/9e44382b0276e7912791b419523b5152f27a9aa6 | ORPH arc | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/6d307ca4a9e2e660353675799589df9eca509e16 | ORPH aarch64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/3b130b9396876a5c151d9ed57bdc1d4478d8cd69 | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/6fc8885f86becdc95fd01d984536e2f97ba4b9ed | ORPH microblazeel | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/03884badae8913d755fb9eecdfc0e05718ffef46 | s390x | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/a34c0e0f3798e844c94ee40931d7a81a3c35451d | i586 | multipath-tools-0.9.4 | NOK | http://autobuild.buildroot.net/results/2229bb1771200082cfae9a307acf71475946ffcb | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/6ad59299e7d8bb4b71e75c39fcaa6ef90f16ad62 | arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/b4b26f6b02fd1991f46eba5db240e5050b96d333 | ORPH arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/5094d267e015fb549b905d97d5dd713489d040e4 | ORPH arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/22ec0cf206fd188e973a8a5b70e37478bd399b43 | ORPH mips64 | ncurses-6.3-20221224 | NOK | http://autobuild.buildroot.net/results/4c4e5783772eddf6013a99cc55512d37a01ea39f | ORPH sparc64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/82650c75fd79491859473ac1fb65f558873fcdf3 | arc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/e33f2c928e59e806bd460f5c91031a521109ca3d | arc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/4628c578c3d56046be8b5e9a0b455746b14e13db | m68k | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/c8e2ddc3cc441094fab9a57ee32d20fe79586f7a | riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/a3e755bcebff49c9d69c83524712c790dc1bf0c4 | ORPH microblaze | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/60cf8b64d457dbe6d2ef9ac68f689ab0233ac131 | ORPH microblazeel | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/9d6e59b7df2707da567a283374488828f948f96b | ORPH sh4eb | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/1b80258acaffc21ebd6778325d6a069e2f0a29d7 | ORPH or1k | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/1982846c8fd22ebcd955e85ce86cce156a8e6127 | ORPH aarch64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/38aa855cdd88c0100d0b9b6028b3bfd3e0d054fb | ORPH mips64 | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/785d373edd0db83dbc2b49d99e73ef91e3d90c77 | ORPH x86_64 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/08366bb87af75eec33b611f34ba95bbf58317088 | i686 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/d7151646b99e885b0aa18297adaef127f7e939e7 | sparc64 | p7zip-17.04 | NOK | http://autobuild.buildroot.net/results/b837a27d7899e99336db2a6623c04597b8707289 | powerpc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/beb3d9b9ea79f2442e8d36f45ba3533b03084b65 | sparc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/fd627f09816bb71ccf4c8cb1c57eaab827171190 | microblazeel | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/0f5bbe455ef8ac1a3f406930f97a31e728ed2331 | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/199144c6d75a8b8ee0a34fc3d452cd3f353a6cb5 | i686 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/07942f871e078ed2bd1ab60578cf2303e172801a | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/6ab2ead00c27e8f608b31f914fc6d098b2590d95 | powerpc64le | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/f79db75c970898536e19091abe22f79f0db76d22 | mips | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/ad0d6c63d227edfc1f35b5a7d626def331e2625c | mipsel | qt6base-6.4.2 | NOK | http://autobuild.buildroot.net/results/d56284c098fb8c781a4c238df605683c11e06e15 | powerpc | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/c52bcb921cedbfba1c30cf3898dbdea72d2090bb | x86_64 | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/7de9c47145afa8210df51df145f78c5e912d6ff4 | s390x | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/b8592464257474bfb07216484f5ff3e341c24108 | nios2 | strongswan-5.9.8 | NOK | http://autobuild.buildroot.net/results/a924256ae3c68c71bc1e6c7525728861e6cdfc99 | sparc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/6dc3b7024ae64e548ef51e7dcf8c608e81d8e508 | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/801f23b20e017c01c433c26090f5ebf635a4a024 | sh4a | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/dba31fbde3e7f9dbdd187afd2a98f89f4e350411 | armeb | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/998cdb5b8a5e24b34e597e5fec293553d17bce52 | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/5eee39a646b62de2fecf86a300dbebe06dc8b669 | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/d4aaece66b361c972af55e613d540c2640be9d90 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/00909d00e9c1707747a5aad7ccc46946edf8da41 | sh4eb | unknown | NOK | http://autobuild.buildroot.net/results/297cf2bd1141c9e1e60b2e745acd975cf8d9d0d6 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/c1212ce5004aba36e516b7269cff93296feeb391 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/cae5c191a75ebe34c86f07fb1e59126d1a12329c | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/a1fc4542815727aa11d9547bb60a44157ab60087 | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/4dbb63d7be93471be9963a8bc52c409e200d9da9 | powerpc64le | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/bc4873abe8b876a428ebfb8f136eb4d364478127 | ORPH sparc64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/8ede0c711c94102081a61da456e42c6c7a0013e9 | ORPH mipsel | vdr-2.6.3 | NOK | http://autobuild.buildroot.net/results/4e97de65e8d0e7ab7d987014767dc484db4490d1 | mips64 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/19f0a6a13c0451095c0fc332ecfda9fdaa35139b | m68k | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/769d004317a9ef07bee98289a5f9c58c3a5aea4f | nios2 | xerces-3.2.4 | NOK | http://autobuild.buildroot.net/results/5391a9b75383b3c7b66d91ed15a9572564cdbe24 | ORPH microblazeel | xfont_font-misc-misc-1.1.2 | NOK | http://autobuild.buildroot.net/results/04e8959b663d61bbcc3841d33e86f5ebb42a058e | powerpc64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/4e3a6191b2f8065f15c127cf362feb0bd2d78457 | mips64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/0ff479c94ef455625aa498f5e12568d05b6fe736 | or1k | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/b89e8b1ac315824fd361427b8716ffb6957ab2cf | x86_64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/af1e8929f8ee440b9942f1030177b2d06f4d2c7b | powerpc64le | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/752dabae9bbb6d5983e6090524515685b1897ee6 | Classification of failures by reason for 2022.11.x -------------------------------------------------- xxhash-0.8.1 | 2 xz-5.2.7 | 2 crucible-2022.05.25 | 1 elfutils-0.186 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 host-go-1.19.5 | 1 host-pahole-1.24 | 1 janus-gateway-1.0.3 | 1 liblog4c-localtime-1.0 | 1 linux-6.0.19 | 1 ripgrep-af6b6c543b224d348a8... | 1 unknown | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | crucible-2022.05.25 | NOK | http://autobuild.buildroot.net/results/087fbfc2e46d2affb78da61d469d1d31d7711828 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/1ac203eb1fc1fabb8e1f233f22e281036c7949be | ORPH powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/d4f6e70d16ebad0c2fb62a39cd383c814b23dbd0 | mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/017d3764db017fc757760180c5f9244be345882f | ORPH mips64 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/bfa74b85cd24e86ce7c33abf0d738087b922aa61 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d904c1d578411ad72c9eadda2f8011ff968b3399 | aarch64 | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/fc3725daf40c9488e7606240eb613aa8b9430373 | riscv64 | liblog4c-localtime-1.0 | NOK | http://autobuild.buildroot.net/results/5508d99a8d1951adfb1c45e46834eff81586f0de | x86_64 | linux-6.0.19 | NOK | http://autobuild.buildroot.net/results/9c9e4d5913076f83f4deb32febe83b280aba4504 | ORPH mips | ripgrep-af6b6c543b224d348a8... | NOK | http://autobuild.buildroot.net/results/a29ef9cf1a771e74e41ee75c76796c4f8acd9eb7 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/8d54670a8469d36dfe9550f7710c5887ca600022 | microblaze | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/7515284a08f79144003689473e8b8409ff556013 | ORPH mips | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/49d2cd50ffe8cab803a538890ff252599f5fbede | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/e9c8352997264b9d815788b5cc49316b72d11376 | ORPH microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/90ea274b47552e8c2837cbd8625545c4eab217b3 | ORPH Gitlab CI results for 2023-02-17 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758739 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758741 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758743 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758745 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758747 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758748 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758749 | avenger96 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758750 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758751 | bananapi_m2_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758752 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758753 | ORPH beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758754 | beaglebone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758755 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758757 | beagleboneai | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758758 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758759 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758761 | broadcom_northstar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758762 | canaan_kd233 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758763 | chromebook_elm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758764 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758765 | ci20 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758766 | cubieboard2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758768 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758770 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758771 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758773 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758774 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758775 | freescale_imx28evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758776 | freescale_imx6dlsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758777 | freescale_imx6dlsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758778 | freescale_imx6qsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758779 | freescale_imx6qsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758781 | freescale_imx6sxsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758783 | freescale_imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758784 | freescale_imx7dsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758788 | freescale_imx8mmevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758791 | freescale_imx8mnevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758793 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758794 | freescale_imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758796 | freescale_imx8qmmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758797 | freescale_imx8qxpmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758799 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758801 | ORPH freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758802 | ORPH freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758805 | ORPH friendlyarm_nanopi_r2s | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758807 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758810 | globalscale_espressobin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758812 | grinn_chiliboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758814 | grinn_liteboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758815 | hifive_unleashed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758816 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758817 | imx6-sabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758818 | imx6-sabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758819 | imx6-sabresd_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758820 | imx6slevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758821 | imx6sx-sdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758822 | imx6ulevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758823 | imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758824 | imx6ulpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758825 | imx7d-sdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758826 | imx7dpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758827 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758828 | imx8mn_bsh_smm_s2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758829 | imx8mn_bsh_smm_s2_pro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758830 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758831 | imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758832 | kontron_bl_imx8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758834 | kontron_pitx_imx8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758835 | kontron_smarc_sal28 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758836 | lafrite | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758837 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758838 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758839 | linksprite_pcduino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758840 | ls1028ardb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758841 | mender_x86_64_efi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758842 | ORPH microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758843 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758845 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758846 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758848 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758851 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758853 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758856 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758858 | minnowboard_max | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758860 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758861 | mx51evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758863 | mx53loco | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758867 | mx6cubox | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758873 | mx6sx_udoo_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758879 | mx6udoo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758881 | nexbox_a95x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758884 | nezha | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758886 | nitrogen6sx | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758889 | nitrogen6x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758891 | nitrogen7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758893 | nitrogen8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758895 | nitrogen8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758900 | nitrogen8mn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758902 | nitrogen8mp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758904 | octavo_osd32mp1_brk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758907 | octavo_osd32mp1_red | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758912 | odroidc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758915 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758919 | olimex_a10_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758921 | olimex_a13_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758925 | olimex_a20_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758930 | olimex_a20_olinuxino_lime2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758926 | olimex_a20_olinuxino_micro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758932 | olimex_a33_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758934 | olimex_a64_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758938 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758941 | olimex_stmp157_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758942 | olpc_xo1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758954 | olpc_xo175 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758946 | openblocks_a6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758980 | orangepi_lite | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758983 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758982 | orangepi_one | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758984 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758985 | orangepi_pc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758986 | orangepi_pc_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758987 | orangepi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758988 | orangepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758990 | orangepi_zero_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758993 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758991 | pandaboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758995 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758996 | pc_x86_64_efi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758997 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758998 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780758999 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759000 | qemu_aarch64_ebbr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759001 | qemu_aarch64_sbsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759002 | qemu_aarch64_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759003 | qemu_arm_ebbr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759004 | qemu_arm_versatile | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759005 | qemu_arm_vexpress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759006 | qemu_arm_vexpress_tz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759008 | qemu_m68k_mcf5208 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759009 | qemu_m68k_q800 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759010 | qemu_microblazebe_mmu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759012 | qemu_microblazeel_mmu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759013 | qemu_mips32r2_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759015 | qemu_mips32r2el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759016 | qemu_mips32r6_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759018 | qemu_mips32r6el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759020 | qemu_mips64_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759021 | qemu_mips64el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759024 | qemu_mips64r6_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759025 | qemu_mips64r6el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759026 | qemu_nios2_10m50 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759027 | qemu_or1k | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759029 | qemu_ppc64_e5500 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759030 | qemu_ppc64_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759031 | qemu_ppc64le_powernv8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759032 | qemu_ppc64le_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759033 | qemu_ppc_bamboo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759034 | qemu_ppc_e500mc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759036 | qemu_ppc_g3beige | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759037 | qemu_ppc_mac99 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759038 | qemu_ppc_mpc8544ds | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759039 | qemu_riscv32_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759041 | qemu_riscv64_nommu_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759042 | qemu_riscv64_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759044 | qemu_s390x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759045 | qemu_sh4_r2d | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759047 | qemu_sh4eb_r2d | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759048 | qemu_sparc64_sun4u | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759049 | qemu_sparc_ss10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759051 | qemu_x86 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759056 | qemu_x86_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759054 | qemu_xtensa_lx60 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759058 | qemu_xtensa_lx60_nommu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759061 | raspberrypi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759080 | ORPH raspberrypi0 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759064 | ORPH raspberrypi0w | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759069 | ORPH raspberrypi2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759070 | ORPH raspberrypi3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759073 | raspberrypi3_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759071 | ORPH raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759074 | ORPH raspberrypi4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759077 | ORPH raspberrypi4_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759075 | ORPH raspberrypicm4io | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759084 | ORPH raspberrypicm4io_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759082 | ORPH raspberrypizero2w | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759085 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759086 | rock64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759087 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759089 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759090 | roseapplepi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759093 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759094 | sheevaplug | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759095 | sipeed_lichee_rv | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759096 | sipeed_lichee_rv_dock | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759098 | sipeed_maix_bit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759103 | sipeed_maix_bit_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759107 | sipeed_maix_dock | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759110 | sipeed_maix_dock_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759113 | sipeed_maix_go | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759116 | sipeed_maix_go_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759119 | sipeed_maixduino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759123 | sipeed_maixduino_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759125 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759129 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759132 | snps_archs38_haps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759134 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759138 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759140 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759142 | solidrun_clearfog_gt_8k | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759144 | solidrun_macchiatobin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759147 | ORPH spike_riscv64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759148 | stm32f429_disco_xip | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759149 | stm32f469_disco_sd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759151 | stm32f469_disco_xip | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759152 | stm32mp157a_dk1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759154 | stm32mp157c_dk2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759155 | stm32mp157c_odyssey | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759156 | terasic_de10nano_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759159 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759161 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759167 | ts5500 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759170 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759172 | uevm5432 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759174 | versal_vck190 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759176 | visionfive | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759181 | visionfive2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759179 | wandboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759184 | warp7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759185 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759187 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759189 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759191 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759192 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759195 | zynqmp_kria_kv260 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759198 | zynqmp_zcu102 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759199 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3780759202 | -- http://autobuild.buildroot.net From bagasdotme at gmail.com Sat Feb 18 08:58:37 2023 From: bagasdotme at gmail.com (Bagas Sanjaya) Date: Sat, 18 Feb 2023 15:58:37 +0700 Subject: [Buildroot] [PATCH] package/git: security bump to version 2.39.2 Message-ID: <20230218085837.350535-1-bagasdotme@gmail.com> Fix two CVEs (CVE-2023-22490 and CVE-2023-23946). For the full release note, see [1]. While at it, also refresh two Buildroot patches introduced when the package was bumped to 2.39.0. [1]: https://lore.kernel.org/git/xmqqr0us5dio.fsf at gitster.g/ Signed-off-by: Bagas Sanjaya --- ...compat-util-avoid-redefining-system-function-nam.patch | 8 +++++--- ...compat-util-undefine-system-names-before-redecla.patch | 6 +++--- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch index dbde87940a..24100e1f6e 100644 --- a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch +++ b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch @@ -1,4 +1,4 @@ -From 385f67eb2254edb1fb4cf523e5e3d5a8f123d72c Mon Sep 17 00:00:00 2001 +From 86aeac96d04ae5381085c0f93acb12d3bfd06969 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 30 Nov 2022 16:15:14 -0500 Subject: [PATCH] git-compat-util: avoid redefining system function names @@ -64,7 +64,7 @@ Signed-off-by: Bagas Sanjaya 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h -index a76d0526f7..e3456bdd0d 100644 +index af05077560..f6882b9b50 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -341,11 +341,12 @@ struct itimerval { @@ -83,7 +83,7 @@ index a76d0526f7..e3456bdd0d 100644 #endif #ifndef NO_LIBGEN_H -@@ -1471,14 +1472,16 @@ int open_nofollow(const char *path, int flags); +@@ -1479,14 +1480,16 @@ int open_nofollow(const char *path, int flags); #endif #ifndef _POSIX_THREAD_SAFE_FUNCTIONS @@ -102,6 +102,8 @@ index a76d0526f7..e3456bdd0d 100644 #define getc_unlocked(fh) getc(fh) #endif + +base-commit: cbf04937d5b9fcf0a76c28f69e6294e9e3ecd7e6 -- An old man doll... just what I always wanted! - Clara diff --git a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch index 9e3c9b662c..f6207300ee 100644 --- a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch +++ b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch @@ -1,4 +1,4 @@ -From 6d406390b870fdb2cd9d18b12ebfabc12f5096df Mon Sep 17 00:00:00 2001 +From d4a11fd215195cd1ca6a43058ef250b688ade1f4 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 2 Dec 2022 06:05:38 -0500 Subject: [PATCH] git-compat-util: undefine system names before redeclaring @@ -29,7 +29,7 @@ Signed-off-by: Bagas Sanjaya 1 file changed, 4 insertions(+) diff --git a/git-compat-util.h b/git-compat-util.h -index e3456bdd0d..211861da0f 100644 +index f6882b9b50..dadb9e55cb 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -346,6 +346,7 @@ static inline int git_setitimer(int which, @@ -40,7 +40,7 @@ index e3456bdd0d..211861da0f 100644 #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) #endif -@@ -1480,6 +1481,9 @@ static inline void git_funlockfile(FILE *fh) +@@ -1488,6 +1489,9 @@ static inline void git_funlockfile(FILE *fh) { ; /* nothing */ } diff --git a/package/git/git.hash b/package/git/git.hash index 75398896e5..b7840cd1eb 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161 git-2.39.1.tar.xz +sha256 475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 git-2.39.2.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 1d728e1964..206d06ffe7 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.39.1 +GIT_VERSION = 2.39.2 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ base-commit: d00e437922fb1b611f35c3138b9fbf7bcff62757 -- An old man doll... just what I always wanted! - Clara From egorenar-dev at posteo.net Sat Feb 18 09:29:43 2023 From: egorenar-dev at posteo.net (Alexander Egorenkov) Date: Sat, 18 Feb 2023 09:29:43 +0000 Subject: [Buildroot] [PATCH 1/1] package/multipath-tools: fix path to kernel headers Message-ID: <20230218092943.2598-1-egorenar-dev@posteo.net> With change 6b7d47be3b23 ("multipath-tools: Makefiles: simplify code for include dirs") the Makefile variable 'LINUX_HEADERS_INCDIR' has been replaced with 'kernel_incdir'. fpin_handlers.c:355:32: note: each undeclared identifier is reported only once for each function it appears in fpin_handlers.c:360:37: error: ?ELS_DTAG_LNK_INTEGRITY? undeclared (first use in this function) 360 | if (dtag == ELS_DTAG_LNK_INTEGRITY) { | ^~~~~~~~~~~~~~~~~~~~~~ make[2]: *** [../Makefile.inc:116: fpin_handlers.o] Error 1 Fixes: http://autobuild.buildroot.net/results/e0f56ef924c13d6b1535fdc350ad8ecc06ea0a58 Signed-off-by: Alexander Egorenkov --- package/multipath-tools/multipath-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index 90394fae9fde..23b3cc944267 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -22,7 +22,7 @@ MULTIPATH_TOOLS_CPE_ID_VENDOR = opensvc MULTIPATH_TOOLS_DEPENDENCIES = lvm2 json-c readline udev liburcu libaio host-pkgconf MULTIPATH_TOOLS_MAKE_OPTS = \ - LINUX_HEADERS_INCDIR=$(STAGING_DIR)/usr/include \ + kernel_incdir=$(STAGING_DIR)/usr/include \ LIB="lib" \ RUN="run" \ OPTFLAGS="" \ -- 2.39.2 From bagasdotme at gmail.com Sat Feb 18 10:14:26 2023 From: bagasdotme at gmail.com (Bagas Sanjaya) Date: Sat, 18 Feb 2023 17:14:26 +0700 Subject: [Buildroot] [PATCH] Revert "package/gnupg2: bump to version 2.4.0" Message-ID: <20230218101426.630874-1-bagasdotme@gmail.com> Bumping the package version to 2.4.0, it fails to cross-compile with unsafe cross-compile paths (for example recent build log at [1]): make[4]: Entering directory '/home/thomas/autobuild/instance-3/output-1/build/gnupg2-2.4.0/common' /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o t-stringhelp.o t-stringhelp.c /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o libcommon_a-i18n.o `test -f 'i18n.c' || echo './'`i18n.c /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o libcommon_a-mapstrings.o `test -f 'mapstrings.c' || echo './'`mapstrings.c /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o libcommon_a-stringhelp.o `test -f 'stringhelp.c' || echo './'`stringhelp.c aarch64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' make[4]: *** [Makefile:1283: t-stringhelp.o] Error 1 Revert the bump for now until the issue can be fixed upstream. [1]: http://autobuild.buildroot.net/results/5bf00af86da6e41d1a48abc7304bf339908a0150/build-end.log Signed-off-by: Bagas Sanjaya --- package/gnupg2/0001-ks_ldap_free_state.patch | 21 ++++++++++++++++++++ package/gnupg2/gnupg2.hash | 10 +++++----- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 package/gnupg2/0001-ks_ldap_free_state.patch diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch new file mode 100644 index 0000000000..fa55d27c04 --- /dev/null +++ b/package/gnupg2/0001-ks_ldap_free_state.patch @@ -0,0 +1,21 @@ + +Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is not +installed + +Backported from: 7011286ce6e1fb56c2989fdafbd11b931c489faa + +Signed-off-by: Michael Fischer + +--- a/dirmngr/server.c ++++ b/dirmngr/server.c +@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) + ctrl->refcount); + else + { ++#if USE_LDAP + ks_ldap_free_state (ctrl->ks_get_state); + ctrl->ks_get_state = NULL; ++#endif + release_ctrl_ocsp_certs (ctrl); + xfree (ctrl->server_local); + dirmngr_deinit_default_ctrl (ctrl); diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index c642862fe2..f9c071ad45 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html -sha1 63dde155a8df0d5e1987efa5fc17438beca83ac1 gnupg-2.4.0.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html +sha1 1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc gnupg-2.3.8.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 gnupg-2.4.0.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.8.tar.bz2.sig +# using key 6DAA6E64A76D2840571B4902528897B826403ADA and AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD +sha256 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed gnupg-2.3.8.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 5935ce6939..9dc29ca99e 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.0 +GNUPG2_VERSION = 2.3.8 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ base-commit: d00e437922fb1b611f35c3138b9fbf7bcff62757 -- An old man doll... just what I always wanted! - Clara From bagasdotme at gmail.com Sat Feb 18 10:16:27 2023 From: bagasdotme at gmail.com (Bagas Sanjaya) Date: Sat, 18 Feb 2023 17:16:27 +0700 Subject: [Buildroot] (no subject) Message-ID: (resend again with revert patch removed) Hi, I found that package/gnupg2 (version 2.4.0) fails to build, complaining about unsafe search path for cross-compilation. I found this when test-building for my git bump at [1]. The excerpt from the build log was: make[4]: Entering directory '/home/bagas/repo/buildroot/output/build/gnupg2-2.4.0/common' /home/bagas/repo/buildroot/output/host/bin/aarch64-linux-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/bagas/repo/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -c -o t-stringhelp.o t-stringhelp.c /home/bagas/repo/buildroot/output/host/bin/aarch64-linux-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/bagas/repo/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -c -o libcommon_a-i18n.o `test -f 'i18n.c' || echo './'`i18n.c aarch64-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' make[4]: *** [Makefile:1283: t-stringhelp.o] Error 1 Reverting 0f868e97f6b4 ("package/gnupg2: bump to version 2.4.0") made the error above gone, thus the problem was in upstream code. This issue is also confirmed by autobuilder (example log is [2]). The full build log is attached. If the revert is desired, the patch is at [3]. Thanks. [1]: https://lore.kernel.org/buildroot/20230218085837.350535-1-bagasdotme at gmail.com/ [2]: http://autobuild.buildroot.net/results/5bf00af86da6e41d1a48abc7304bf339908a0150/build-end.log [3]: https://lore.kernel.org/buildroot/20230218101426.630874-1-bagasdotme at gmail.com/ -- An old man doll... just what I always wanted! - Clara -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: From bagasdotme at gmail.com Sat Feb 18 10:17:56 2023 From: bagasdotme at gmail.com (Bagas Sanjaya) Date: Sat, 18 Feb 2023 17:17:56 +0700 Subject: [Buildroot] (no subject) In-Reply-To: References: Message-ID: <3692da35-d89d-46a6-524d-590c83f35a0f@gmail.com> On 2/18/23 17:16, Bagas Sanjaya wrote: > (resend again with revert patch removed) > > Hi, > > I found that package/gnupg2 (version 2.4.0) fails to build, complaining > about unsafe search path for cross-compilation. I found this when > test-building for my git bump at [1]. > > The excerpt from the build log was: > > make[4]: Entering directory '/home/bagas/repo/buildroot/output/build/gnupg2-2.4.0/common' > /home/bagas/repo/buildroot/output/host/bin/aarch64-linux-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/bagas/repo/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -c -o t-stringhelp.o t-stringhelp.c > /home/bagas/repo/buildroot/output/host/bin/aarch64-linux-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/bagas/repo/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -c -o libcommon_a-i18n.o `test -f 'i18n.c' || echo './'`i18n.c > aarch64-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' > make[4]: *** [Makefile:1283: t-stringhelp.o] Error 1 > > Reverting 0f868e97f6b4 ("package/gnupg2: bump to version 2.4.0") made the error above > gone, thus the problem was in upstream code. > > This issue is also confirmed by autobuilder (example log is [2]). > > The full build log is attached. > > If the revert is desired, the patch is at [3]. > > Thanks. > > [1]: https://lore.kernel.org/buildroot/20230218085837.350535-1-bagasdotme at gmail.com/ > [2]: http://autobuild.buildroot.net/results/5bf00af86da6e41d1a48abc7304bf339908a0150/build-end.log > [3]: https://lore.kernel.org/buildroot/20230218101426.630874-1-bagasdotme at gmail.com/ > Oops, please ignore (no subject). I will send the report later. -- An old man doll... just what I always wanted! - Clara From hrsourabh011 at gmail.com Sat Feb 18 10:28:33 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sat, 18 Feb 2023 11:28:33 +0100 Subject: [Buildroot] Missing curl binary In-Reply-To: References: Message-ID: Can anyone please let me know how to resolve this? On Fri, Feb 17, 2023, 16:52 Sourabh Hegde wrote: > Hello, > > I am trying to include curl binary in my image. I have > selected BR2_PACKAGE_LIBCURL=y , BR2_PACKAGE_LIBCURL_CURL=y in the Config. > But still the curl binary is not installed in the target. Can anyone please > let me know what is the issue here and how to resolve it? > > Thank you, > Sourabh > -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Sat Feb 18 10:39:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 11:39:39 +0100 Subject: [Buildroot] [PATCH] Revert "package/gnupg2: bump to version 2.4.0" In-Reply-To: <20230218101426.630874-1-bagasdotme@gmail.com> References: <20230218101426.630874-1-bagasdotme@gmail.com> Message-ID: <20230218113939.526f0a76@windsurf> Hello Bagas, Let's add Julien Olivain in Cc, as he did the bump of gnupg2 to version 2.4.0. Julien: could you have a look at the below issue, which is affecting gnupg2 in the autobuilders? Thanks a lot! Thomas On Sat, 18 Feb 2023 17:14:26 +0700 Bagas Sanjaya wrote: > Bumping the package version to 2.4.0, it fails to cross-compile with > unsafe cross-compile paths (for example recent build log at [1]): > > make[4]: Entering directory '/home/thomas/autobuild/instance-3/output-1/build/gnupg2-2.4.0/common' > /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o t-stringhelp.o t-stringhelp.c > /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o libcommon_a-i18n.o `test -f 'i 18 > n.c' || echo './'`i18n.c > /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o libcommon_a-mapstrings.o `test - > f 'mapstrings.c' || echo './'`mapstrings.c > /home/thomas/autobuild/instance-3/output-1/host/bin/aarch64-buildroot-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/libusb-1.0 -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/home/thomas/autobuild/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/include -I/usr/include -I/usr/include -I/usr/include -I/usr/include -DWITHOUT_NPTH=1 -Wall -Wno-format-zero-length -Wno-pointer-sign -Wpointer-arith -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g1 -D_FORTIFY_SOURCE=2 -c -o libcommon_a-stringhelp.o `test - > f 'stringhelp.c' || echo './'`stringhelp.c > aarch64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' > make[4]: *** [Makefile:1283: t-stringhelp.o] Error 1 > > Revert the bump for now until the issue can be fixed upstream. > > [1]: http://autobuild.buildroot.net/results/5bf00af86da6e41d1a48abc7304bf339908a0150/build-end.log > > Signed-off-by: Bagas Sanjaya > --- > package/gnupg2/0001-ks_ldap_free_state.patch | 21 ++++++++++++++++++++ > package/gnupg2/gnupg2.hash | 10 +++++----- > package/gnupg2/gnupg2.mk | 2 +- > 3 files changed, 27 insertions(+), 6 deletions(-) > create mode 100644 package/gnupg2/0001-ks_ldap_free_state.patch > > diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch > new file mode 100644 > index 0000000000..fa55d27c04 > --- /dev/null > +++ b/package/gnupg2/0001-ks_ldap_free_state.patch > @@ -0,0 +1,21 @@ > + > +Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is not > +installed > + > +Backported from: 7011286ce6e1fb56c2989fdafbd11b931c489faa > + > +Signed-off-by: Michael Fischer > + > +--- a/dirmngr/server.c > ++++ b/dirmngr/server.c > +@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) > + ctrl->refcount); > + else > + { > ++#if USE_LDAP > + ks_ldap_free_state (ctrl->ks_get_state); > + ctrl->ks_get_state = NULL; > ++#endif > + release_ctrl_ocsp_certs (ctrl); > + xfree (ctrl->server_local); > + dirmngr_deinit_default_ctrl (ctrl); > diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash > index c642862fe2..f9c071ad45 100644 > --- a/package/gnupg2/gnupg2.hash > +++ b/package/gnupg2/gnupg2.hash > @@ -1,7 +1,7 @@ > -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html > -sha1 63dde155a8df0d5e1987efa5fc17438beca83ac1 gnupg-2.4.0.tar.bz2 > +# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html > +sha1 1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc gnupg-2.3.8.tar.bz2 > # Calculated based on the hash above and signature > -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2.sig > -# using key 6DAA6E64A76D2840571B4902528897B826403ADA > -sha256 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 gnupg-2.4.0.tar.bz2 > +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.8.tar.bz2.sig > +# using key 6DAA6E64A76D2840571B4902528897B826403ADA and AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD > +sha256 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed gnupg-2.3.8.tar.bz2 > sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING > diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk > index 5935ce6939..9dc29ca99e 100644 > --- a/package/gnupg2/gnupg2.mk > +++ b/package/gnupg2/gnupg2.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GNUPG2_VERSION = 2.4.0 > +GNUPG2_VERSION = 2.3.8 > GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 > GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg > GNUPG2_LICENSE = GPL-3.0+ > > base-commit: d00e437922fb1b611f35c3138b9fbf7bcff62757 -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From ju.o at free.fr Sat Feb 18 11:13:16 2023 From: ju.o at free.fr (Julien Olivain) Date: Sat, 18 Feb 2023 12:13:16 +0100 Subject: [Buildroot] [PATCH] Revert "package/gnupg2: bump to version 2.4.0" In-Reply-To: <20230218113939.526f0a76@windsurf> References: <20230218101426.630874-1-bagasdotme@gmail.com> <20230218113939.526f0a76@windsurf> Message-ID: <96015d0268df72d3cdd58e7db09c1333@free.fr> Hi Thomas, Bagas, All, On 18/02/2023 11:39, Thomas Petazzoni wrote: > Hello Bagas, > > Let's add Julien Olivain in Cc, as he did the bump of gnupg2 to version > 2.4.0. > > Julien: could you have a look at the below issue, which is affecting > gnupg2 in the autobuilders? I indeed started to receive some autobuild failures. Unfortunately, I cannot reproduce on my system for now: on my side, the build complete successfully. I tried with _and_ without having a /usr/bin/gpgrt-config on host, which I was suspecting to bring some host config. In my first proposal of gnupg2 version 2.4.0 bump [1], I initially proposed to add Buildroot staging bin dir in PATH, to make sure we won't have such host/br-staging confusion: GNUPG2_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) Bagas, could you try on your side if this solve the issue? [1] https://patchwork.ozlabs.org/project/buildroot/patch/20230103193649.7488-5-ju.o at free.fr/ Best regards, Julien. From thomas.petazzoni at bootlin.com Fri Feb 17 15:25:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:25:01 +0100 Subject: [Buildroot] [git commit] package/python-apispec: fix formatting in hash file Message-ID: <20230218111540.98FF68477C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4336a86a0c414db7fbb3ff61d66e38bd916bb04e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: package/python-apispec/python-apispec.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Thomas Petazzoni --- package/python-apispec/python-apispec.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-apispec/python-apispec.hash b/package/python-apispec/python-apispec.hash index 9d653cc8e8..f2861f920a 100644 --- a/package/python-apispec/python-apispec.hash +++ b/package/python-apispec/python-apispec.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/apispec/json -md5 b4e90006a26215e2e0a6fe2629d12c10 apispec-6.0.2.tar.gz +md5 b4e90006a26215e2e0a6fe2629d12c10 apispec-6.0.2.tar.gz sha256 e76d80b739edef4be213092a6384ad7fd933ba7d64f6d5a0aff8d4da1bef7887 apispec-6.0.2.tar.gz # Locally computed sha256 checksums sha256 a452afcef750956a8396f7e7a6f913a117d28ef99a13170c29dc74c3b7a95f29 LICENSE From thomas.petazzoni at bootlin.com Sat Feb 18 11:14:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 12:14:21 +0100 Subject: [Buildroot] [git commit] package/python-flask-smorest: fix formatting in hash file Message-ID: <20230218111540.A2B268479A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41cca5274a8afce269f9b2bdc9e113e073e28abb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: package/python-flask-smorest/python-flask-smorest.hash:5: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Thomas Petazzoni --- package/python-flask-smorest/python-flask-smorest.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-flask-smorest/python-flask-smorest.hash b/package/python-flask-smorest/python-flask-smorest.hash index 5abe0c5033..941535c503 100644 --- a/package/python-flask-smorest/python-flask-smorest.hash +++ b/package/python-flask-smorest/python-flask-smorest.hash @@ -2,4 +2,4 @@ md5 1dad52f26c59ca2dcaf0c5d109879605 flask-smorest-0.40.0.tar.gz sha256 9b46b4937ccf78702d99fed8cfd1cd5c37608ddefd65ff16a86d1ad5c7f7d8c0 flask-smorest-0.40.0.tar.gz # Locally computed sha256 checksums -sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE +sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE From thomas.petazzoni at bootlin.com Sat Feb 18 11:15:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 12:15:05 +0100 Subject: [Buildroot] [git commit] package/python-webargs: fix formatting in hash file Message-ID: <20230218111540.AC8E7847AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6085c00d0feece6f3ba635e7847ea653bc5fac3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: package/python-webargs/python-webargs.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Thomas Petazzoni --- package/python-webargs/python-webargs.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-webargs/python-webargs.hash b/package/python-webargs/python-webargs.hash index 619b584807..10bb3651f0 100644 --- a/package/python-webargs/python-webargs.hash +++ b/package/python-webargs/python-webargs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/webargs/json -md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz +md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz sha256 99d68940c452e07726485a15fef43f12f8ae6c0c5b391bcba76065d4527fb85d webargs-8.2.0.tar.gz # Locally computed sha256 checksums sha256 5973e5dcc20b65e4eb4b4acdf273bb78a18522914ab626f496f1b070f7e6294d LICENSE From thomas.petazzoni at bootlin.com Sat Feb 18 11:18:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 12:18:46 +0100 Subject: [Buildroot] Missing curl binary In-Reply-To: References: Message-ID: <20230218121846.306f95f5@windsurf> On Fri, 17 Feb 2023 16:52:49 +0100 Sourabh Hegde wrote: > I am trying to include curl binary in my image. I have > selected BR2_PACKAGE_LIBCURL=y , BR2_PACKAGE_LIBCURL_CURL=y in the Config. > But still the curl binary is not installed in the target. Can anyone please > let me know what is the issue here and how to resolve it? I suppose you did a build with BR2_PACKAGE_LIBCURL=y, then after the build completed you changed the configuration to enable BR2_PACKAGE_LIBCURL_CURL=y and just ran "make". This doesn't work, as the libcurl package is already built, and Buildroot is not smart enough to detect that you changed something related to the libcurl configuration. Run: "make libcurl-dirclean all" to force rebuilding the libcurl package (or do a full rebuild). See https://buildroot.org/downloads/manual/manual.html#full-rebuild for more details. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 18 11:19:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 12:19:40 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: References: Message-ID: <20230218121940.7442410e@windsurf> On Fri, 17 Feb 2023 17:15:39 +0100 Sourabh Hegde wrote: > I am trying to add a custom CA to the trust store. I have copied the CA > file to "/usr/local/share/ca-certificates/" in the rootfs_overlay and also > has a .crt extension. Now after executing "make" the CA is not added to the > trust store in /etc/ssl/certs/ in the target. Anyways it's installed only > in "/usr/local/share/ca-certificates/" in the target. I thought > "update-ca-certificates" will add this during image build. > Can anyone please let me know what is missing here? What makes you think update-ca-certificates is run during the build? I don't remember Buildroot having anything that does this. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From buildroot at heine.tech Sat Feb 18 11:24:45 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Sat, 18 Feb 2023 12:24:45 +0100 Subject: [Buildroot] [PATCH] package/catch2: bump to version 3.3.1 Message-ID: <20230218112449.1753677-1-buildroot@heine.tech> raise the minimum gcc to 5 as stated in release notes for 3.1.0 [0]. [0] https://github.com/catchorg/Catch2/releases/tag/v3.1.0 --- package/catch2/Config.in | 6 +++--- package/catch2/catch2.hash | 2 +- package/catch2/catch2.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/catch2/Config.in b/package/catch2/Config.in index 2f53d197b2..40d2d12434 100644 --- a/package/catch2/Config.in +++ b/package/catch2/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_CATCH2 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 depends on BR2_USE_MMU # fork() help Catch2 is mainly a unit testing framework for C++, but it @@ -21,8 +21,8 @@ config BR2_PACKAGE_CATCH2 https://github.com/catchorg/Catch2 -comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash index 664164fd76..b533792f8f 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2106bccfec18c8ce673623d56780220e38527dd8f283ccba26aa4b8758737d0e catch2-3.1.1.tar.gz +sha256 d90351cdc55421f640c553cfc0875a8c834428679444e8062e9187d05b18aace catch2-3.3.1.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index ab62cc943b..6e4af3d670 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.1.1 +CATCH2_VERSION = 3.3.1 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO -- 2.34.1 From buildroot at heine.tech Sat Feb 18 11:49:01 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Sat, 18 Feb 2023 12:49:01 +0100 Subject: [Buildroot] =?utf-8?q?=5BPATCH=5D_package/catch2=3A_bump_to_vers?= =?utf-8?b?aW9uIDMuMy4x?= In-Reply-To: <20230218112449.1753677-1-buildroot@heine.tech> Message-ID: <10cdb9-63f0bb00-3-1c95df6@32750985> On Saturday, February 18, 2023 12:24 CET, Michael Nosthoff wrote: > raise the minimum gcc to 5 as stated in release notes for 3.1.0 [0]. > > [0] https://github.com/catchorg/Catch2/releases/tag/v3.1.0 Signed-off-by: Michael Nosthoff From buildroot at heine.tech Sat Feb 18 11:48:37 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Sat, 18 Feb 2023 12:48:37 +0100 Subject: [Buildroot] [PATCH] packge/libabseil-cpp: bump to version 20230125.0 Message-ID: <20230218114837.1761715-1-buildroot@heine.tech> libabseil now depends on c++14 and gcc >= 7.3.1 [0][1] [0] https://github.com/abseil/abseil-cpp/releases/tag/20230125.0 [1] https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md Signed-off-by: Michael Nosthoff --- Note: I'm not sure if the BR2_TOOLCHAIN_GCC_AT_LEAST_7 dependency is sufficient. But I don't think we have a more version specific Flag available? --- package/grpc/Config.in | 6 +++--- package/libabseil-cpp/Config.in | 6 +++--- package/libabseil-cpp/libabseil-cpp.hash | 2 +- package/libabseil-cpp/libabseil-cpp.mk | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/grpc/Config.in b/package/grpc/Config.in index db6425819b..06436fe888 100644 --- a/package/grpc/Config.in +++ b/package/grpc/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_GRPC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libabseil-cpp depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS @@ -19,9 +19,9 @@ config BR2_PACKAGE_GRPC http://github.com/grpc/grpc -comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 5" +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 7" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/package/libabseil-cpp/Config.in b/package/libabseil-cpp/Config.in index 45f339ff26..d4139e8e04 100644 --- a/package/libabseil-cpp/Config.in +++ b/package/libabseil-cpp/Config.in @@ -18,7 +18,7 @@ config BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS config BR2_PACKAGE_LIBABSEIL_CPP bool "libabseil-cpp" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # uses dlfcn.h depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS @@ -31,7 +31,7 @@ config BR2_PACKAGE_LIBABSEIL_CPP https://github.com/abseil/abseil-cpp -comment "libabseil-cpp needs a toolchain w/ gcc >= 4.9, C++, threads, dynamic library" +comment "libabseil-cpp needs a toolchain w/ gcc >= 7.3.1, C++14, threads, dynamic library" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/libabseil-cpp/libabseil-cpp.hash b/package/libabseil-cpp/libabseil-cpp.hash index 808bdbab29..81710f50fb 100644 --- a/package/libabseil-cpp/libabseil-cpp.hash +++ b/package/libabseil-cpp/libabseil-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8 libabseil-cpp-20220623.1.tar.gz +sha256 3ea49a7d97421b88a8c48a0de16c16048e17725c7ec0f1d3ea2683a2a75adc21 libabseil-cpp-20230125.0.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE diff --git a/package/libabseil-cpp/libabseil-cpp.mk b/package/libabseil-cpp/libabseil-cpp.mk index ceda106b7d..4e6ac2ee31 100644 --- a/package/libabseil-cpp/libabseil-cpp.mk +++ b/package/libabseil-cpp/libabseil-cpp.mk @@ -4,19 +4,19 @@ # ################################################################################ -LIBABSEIL_CPP_VERSION = 20220623.1 +LIBABSEIL_CPP_VERSION = 20230125.0 LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION)) LIBABSEIL_CPP_LICENSE = Apache-2.0 LIBABSEIL_CPP_LICENSE_FILES = LICENSE LIBABSEIL_CPP_INSTALL_STAGING = YES LIBABSEIL_CPP_CONF_OPTS = \ - -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD=14 \ -DABSL_ENABLE_INSTALL=ON \ -DABSL_USE_GOOGLETEST_HEAD=OFF HOST_LIBABSEIL_CPP_CONF_OPTS = \ - -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD=14 \ -DABSL_ENABLE_INSTALL=ON \ -DABSL_USE_GOOGLETEST_HEAD=OFF -- 2.34.1 From hrsourabh011 at gmail.com Sat Feb 18 12:54:15 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sat, 18 Feb 2023 13:54:15 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: <20230218121940.7442410e@windsurf> References: <20230218121940.7442410e@windsurf> Message-ID: Hello Thomas, Thanks for the update. I was thinking the ca-certificates package will take care of this. Maybe I was wrong. So, how should we add local CA to the trust store in the target? On Sat, 18 Feb 2023 at 12:19, Thomas Petazzoni wrote: > On Fri, 17 Feb 2023 17:15:39 +0100 > Sourabh Hegde wrote: > > > I am trying to add a custom CA to the trust store. I have copied the CA > > file to "/usr/local/share/ca-certificates/" in the rootfs_overlay and > also > > has a .crt extension. Now after executing "make" the CA is not added to > the > > trust store in /etc/ssl/certs/ in the target. Anyways it's installed only > > in "/usr/local/share/ca-certificates/" in the target. I thought > > "update-ca-certificates" will add this during image build. > > Can anyone please let me know what is missing here? > > What makes you think update-ca-certificates is run during the build? I > don't remember Buildroot having anything that does this. > > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Sat Feb 18 13:19:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 14:19:37 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: References: <20230218121940.7442410e@windsurf> Message-ID: <20230218141937.60c307f7@windsurf> Hello, On Sat, 18 Feb 2023 13:54:15 +0100 Sourabh Hegde wrote: > Thanks for the update. > > I was thinking the ca-certificates package will take care of this. Maybe I > was wrong. > > So, how should we add local CA to the trust store in the target? I am not sure as I'm not super familiar with that aspect. If what you need to do is to call update-ca-certificates during the build, then we could potentially build it for the host, and run it as a post-build script. Of course, this assumes update-ca-certificates is capable of doing its work on a root filesystem that isn't at the root. Do you have more details about what needs to be done? With more details, we could probably give some more useful hints. Best regards, Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 18 13:24:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 14:24:35 +0100 Subject: [Buildroot] [PATCH] Revert "package/gnupg2: bump to version 2.4.0" In-Reply-To: <96015d0268df72d3cdd58e7db09c1333@free.fr> References: <20230218101426.630874-1-bagasdotme@gmail.com> <20230218113939.526f0a76@windsurf> <96015d0268df72d3cdd58e7db09c1333@free.fr> Message-ID: <20230218142435.06cb9c26@windsurf> Hello Julien, On Sat, 18 Feb 2023 12:13:16 +0100 Julien Olivain wrote: > I indeed started to receive some autobuild failures. > Unfortunately, I cannot reproduce on my system for now: > on my side, the build complete successfully. > > I tried with _and_ without having a /usr/bin/gpgrt-config on host, > which I was suspecting to bring some host config. > > In my first proposal of gnupg2 version 2.4.0 bump [1], I initially > proposed > to add Buildroot staging bin dir in PATH, to make sure we won't have > such > host/br-staging confusion: > > GNUPG2_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) This is a really bad idea, and can potentially break. Indeed, STAGING_DIR/usr/bin contains lots of programs that are compiled for the target. So if you do that, the build process on your build machine might try to invoke executables that are compiled for the target. If the issue comes from a -config script, then generally, two things are needed: - Make sure the -config script returns correct values for cross-compilation. If not, use _CONFIG_SCRIPTS in the package installing this -config script - Make sure the package calling the -config script calls the right one. Most autotools-based projects provide some sort of cache variable that allows to tell the configure script that -config in $(STAGING_DIR)/usr/bin/-config should be used Best regards, Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From hrsourabh011 at gmail.com Sat Feb 18 13:39:39 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sat, 18 Feb 2023 14:39:39 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: <20230218141937.60c307f7@windsurf> References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> Message-ID: Hi Thomas, I want to add a local CA to the openssl trust-store in my image. This CA will be used by other applications in the target. As I read in other blogs the local CA needs to be in /usr/local/share/ca-certificates with .crt extension and executing update-ca-certificates will add it to /etc/ssl/certs/. But, what I have noticed is this is always done with "sudo". So, do you think post-build script can handle this? How about post-image script? On Sat, Feb 18, 2023, 14:19 Thomas Petazzoni wrote: > Hello, > > On Sat, 18 Feb 2023 13:54:15 +0100 > Sourabh Hegde wrote: > > > Thanks for the update. > > > > I was thinking the ca-certificates package will take care of this. Maybe > I > > was wrong. > > > > So, how should we add local CA to the trust store in the target? > > I am not sure as I'm not super familiar with that aspect. If what you > need to do is to call update-ca-certificates during the build, then we > could potentially build it for the host, and run it as a post-build > script. Of course, this assumes update-ca-certificates is capable of > doing its work on a root filesystem that isn't at the root. > > Do you have more details about what needs to be done? With more > details, we could probably give some more useful hints. > > Best regards, > > Thomas Petazzoni > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bagasdotme at gmail.com Sat Feb 18 13:45:37 2023 From: bagasdotme at gmail.com (Bagas Sanjaya) Date: Sat, 18 Feb 2023 20:45:37 +0700 Subject: [Buildroot] Debugging gnupg2 unsafe search path error (was Re: [PATCH] Revert "package/gnupg2: bump to version 2.4.0") In-Reply-To: <96015d0268df72d3cdd58e7db09c1333@free.fr> References: <20230218101426.630874-1-bagasdotme@gmail.com> <20230218113939.526f0a76@windsurf> <96015d0268df72d3cdd58e7db09c1333@free.fr> Message-ID: On 2/18/23 18:13, Julien Olivain wrote: > In my first proposal of gnupg2 version 2.4.0 bump [1], I initially proposed > to add Buildroot staging bin dir in PATH, to make sure we won't have such > host/br-staging confusion: > > GNUPG2_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) > > Bagas, could you try on your side if this solve the issue? > > [1] https://patchwork.ozlabs.org/project/buildroot/patch/20230103193649.7488-5-ju.o at free.fr/ > Hi Julien, I applied your suggestion on top of master as: ---- >8 ---- diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 5935ce6939..55917912a8 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -15,6 +15,9 @@ GNUPG2_SELINUX_MODULES = gpg GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf +# Let's see if staging GNUPG2_CONF_ENV here works. +GNUPG2_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) + GNUPG2_CONF_OPTS = \ --disable-rpath \ --with-libgpg-error-prefix=$(STAGING_DIR)/usr \ Unfortunately, the build error still occurs with your suggestion. Thanks. -- An old man doll... just what I always wanted! - Clara From yann.morin.1998 at free.fr Sat Feb 18 14:21:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 18 Feb 2023 15:21:15 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: <20230218141937.60c307f7@windsurf> References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> Message-ID: <20230218142115.GC2718518@scaer> Thomas, All, On 2023-02-18 14:19 +0100, Thomas Petazzoni via buildroot spake thusly: > On Sat, 18 Feb 2023 13:54:15 +0100 > Sourabh Hegde wrote: > > I was thinking the ca-certificates package will take care of this. Maybe I > > was wrong. > > So, how should we add local CA to the trust store in the target? > I am not sure as I'm not super familiar with that aspect. If what you > need to do is to call update-ca-certificates during the build, then we > could potentially build it for the host, and run it as a post-build > script. Of course, this assumes update-ca-certificates is capable of > doing its work on a root filesystem that isn't at the root. > > Do you have more details about what needs to be done? With more > details, we could probably give some more useful hints. I think we just need to split CA_CERTIFICATES_INSTALL_TARGET_CMDS in two: one part to actually instll the certifcates provided by ca-certificates itself, and the rest to update the castore with all certificate, as a target-finalize hook. I.e. all that starts from "Remove any existing certificates under /etc/ssl/certs" should be moved to a target-finalize hook. 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 egorenar at linux.ibm.com Sat Feb 18 13:40:59 2023 From: egorenar at linux.ibm.com (Alexander Egorenkov) Date: Sat, 18 Feb 2023 14:40:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: bump to version 2.26.0 Message-ID: <20230218134059.53863-1-egorenar@linux.ibm.com> Signed-off-by: Alexander Egorenkov --- 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 a0dde477c324..37b67c5cb180 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ccb20954e748309a50fd56edd9abd94c6f897081e9a1a33e9d965a56f650990d s390-tools-2.25.0.tar.gz +sha256 da81c55fb11d84923c0ebaed703f557052eb1a273495f60ebe3d20a74627303e s390-tools-2.26.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index cb6278dfb837..8cd549140547 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.25.0 +S390_TOOLS_VERSION = 2.26.0 S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE -- 2.39.2 From yann.morin.1998 at free.fr Sat Feb 18 15:32:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 18 Feb 2023 16:32:16 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: <20230218142115.GC2718518@scaer> References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> <20230218142115.GC2718518@scaer> Message-ID: <20230218153216.GD2718518@scaer> Thomas, Sourabh, All, On 2023-02-18 15:21 +0100, Yann E. MORIN spake thusly: > On 2023-02-18 14:19 +0100, Thomas Petazzoni via buildroot spake thusly: > > On Sat, 18 Feb 2023 13:54:15 +0100 > > Sourabh Hegde wrote: > > > I was thinking the ca-certificates package will take care of this. Maybe I > > > was wrong. > > > So, how should we add local CA to the trust store in the target? > > I am not sure as I'm not super familiar with that aspect. If what you > > need to do is to call update-ca-certificates during the build, then we > > could potentially build it for the host, and run it as a post-build > > script. Of course, this assumes update-ca-certificates is capable of > > doing its work on a root filesystem that isn't at the root. No, update-ca-certificates does not know how to work out-of-tree, which is the reason why we already need to handle it manually when we install ca-certificates. Also, we do remove update-ca-certificates on purpose from TARGET_DIR, because it is not expected that we need/can regenerate the root bundle on the target. > > Do you have more details about what needs to be done? With more > > details, we could probably give some more useful hints. > > I think we just need to split CA_CERTIFICATES_INSTALL_TARGET_CMDS in two: > one part to actually instll the certifcates provided by ca-certificates > itself, and the rest to update the castore with all certificate, as a > target-finalize hook. > > I.e. all that starts from "Remove any existing certificates under > /etc/ssl/certs" should be moved to a target-finalize hook. Basically, something around those lines (totally untested): diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index 0b6962ab7b..cc55d39957 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -20,7 +20,9 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates +endef +define CA_CERTIFICATES_GEN_BUNDLE # Remove any existing certificates under /etc/ssl/certs rm -f $(TARGET_DIR)/etc/ssl/certs/* @@ -30,14 +32,15 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS for i in `find usr/share/ca-certificates -name "*.crt" | LC_COLLATE=C sort` ; do \ ln -sf ../../../$$i etc/ssl/certs/`basename $${i} .crt`.pem ;\ cat $$i ;\ - done >$(@D)/ca-certificates.crt + done >$(BUILD_DIR)/ca-certificates.crt # Create symlinks to the certificates by their hash values $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs # Install the certificates bundle - $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ + $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt endef +CA_CERTIFICATES_TARGET_FINALIZE_HOOKS += CA_CERTIFICATES_GEN_BUNDLE $(eval $(generic-package)) Sourabh, can you test and adapt that and report, please? 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 hrsourabh011 at gmail.com Sat Feb 18 15:56:49 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sat, 18 Feb 2023 16:56:49 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: <20230218153216.GD2718518@scaer> References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> <20230218142115.GC2718518@scaer> <20230218153216.GD2718518@scaer> Message-ID: Hello Yann, All, Thanks for the update. Yes, I will try this patch and let you know. Also, we do remove update-ca-certificates on purpose from TARGET_DIR, > because it is not expected that we need/can regenerate the root bundle > on the target. > I am not sure if I understood this completely. I have a generic question: What if someone wants to update castore on the target itself. Let's say if the local CA is already available on the target then how can it be added to the trust store with update-ca-certificates? Is it not a good option to include "update-ca-certificates" in TARGET_DIR? On Sat, 18 Feb 2023 at 16:32, Yann E. MORIN wrote: > Thomas, Sourabh, All, > > On 2023-02-18 15:21 +0100, Yann E. MORIN spake thusly: > > On 2023-02-18 14:19 +0100, Thomas Petazzoni via buildroot spake thusly: > > > On Sat, 18 Feb 2023 13:54:15 +0100 > > > Sourabh Hegde wrote: > > > > I was thinking the ca-certificates package will take care of this. > Maybe I > > > > was wrong. > > > > So, how should we add local CA to the trust store in the target? > > > I am not sure as I'm not super familiar with that aspect. If what you > > > need to do is to call update-ca-certificates during the build, then we > > > could potentially build it for the host, and run it as a post-build > > > script. Of course, this assumes update-ca-certificates is capable of > > > doing its work on a root filesystem that isn't at the root. > > No, update-ca-certificates does not know how to work out-of-tree, which > is the reason why we already need to handle it manually when we install > ca-certificates. > > Also, we do remove update-ca-certificates on purpose from TARGET_DIR, > because it is not expected that we need/can regenerate the root bundle > on the target. > > > > Do you have more details about what needs to be done? With more > > > details, we could probably give some more useful hints. > > > > I think we just need to split CA_CERTIFICATES_INSTALL_TARGET_CMDS in two: > > one part to actually instll the certifcates provided by ca-certificates > > itself, and the rest to update the castore with all certificate, as a > > target-finalize hook. > > > > I.e. all that starts from "Remove any existing certificates under > > /etc/ssl/certs" should be moved to a target-finalize hook. > > Basically, something around those lines (totally untested): > > diff --git a/package/ca-certificates/ca-certificates.mk > b/package/ca-certificates/ca-certificates.mk > index 0b6962ab7b..cc55d39957 100644 > --- a/package/ca-certificates/ca-certificates.mk > +++ b/package/ca-certificates/ca-certificates.mk > @@ -20,7 +20,9 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS > $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) > rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates > +endef > > +define CA_CERTIFICATES_GEN_BUNDLE > # Remove any existing certificates under /etc/ssl/certs > rm -f $(TARGET_DIR)/etc/ssl/certs/* > > @@ -30,14 +32,15 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS > for i in `find usr/share/ca-certificates -name "*.crt" | > LC_COLLATE=C sort` ; do \ > ln -sf ../../../$$i etc/ssl/certs/`basename $${i} > .crt`.pem ;\ > cat $$i ;\ > - done >$(@D)/ca-certificates.crt > + done >$(BUILD_DIR)/ca-certificates.crt > > # Create symlinks to the certificates by their hash values > $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs > > # Install the certificates bundle > - $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ > + $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ > $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt > endef > +CA_CERTIFICATES_TARGET_FINALIZE_HOOKS += CA_CERTIFICATES_GEN_BUNDLE > > $(eval $(generic-package)) > > Sourabh, can you test and adapt that and report, please? > > 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. | > > '------------------------------^-------^------------------^--------------------' > -------------- next part -------------- An HTML attachment was scrubbed... URL: From hrsourabh011 at gmail.com Sat Feb 18 17:00:35 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sat, 18 Feb 2023 18:00:35 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> <20230218142115.GC2718518@scaer> <20230218153216.GD2718518@scaer> Message-ID: Hello Yann, I am trying to apply the patch. I am doing below steps: 1. modified the ca-certificates.mk to include changes. Also attached in this mail. Could you please verify the changes? 2. Generated patch file using "diff -u "old_file" "new_file" > file.patch". Placed the patch file in /buildroot/package/ca-certificates/ dir 0002-ca-certificates-add_local_CAs.patch +++ ca-certificates.mk 2023-02-18 14:13:13.181814043 +0000 @@ -20,24 +20,29 @@ $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates +endef +define CA_CERTIFICATES_GEN_BUNDLE # Remove any existing certificates under /etc/ssl/certs rm -f $(TARGET_DIR)/etc/ssl/certs/* +endef # Create symlinks to certificates under /etc/ssl/certs # and generate the bundle cd $(TARGET_DIR) ;\ +define CA_CERTIFICATES_INSTALL_TARGET_CMDS for i in `find usr/share/ca-certificates -name "*.crt" | LC_COLLATE=C sort` ; do \ ln -sf ../../../$$i etc/ssl/certs/`basename $${i} .crt`.pem ;\ cat $$i ;\ - done >$(@D)/ca-certificates.crt + done >$(BUILD_DIR)/ca-certificates.crt # Create symlinks to the certificates by their hash values $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs # Install the certificates bundle - $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ + $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt endef +CA_CERTIFICATES_TARGET_FINALIZE_HOOKS += CA_CERTIFICATES_GEN_BUNDLE $(eval $(generic-package)) 3. Trying to rebuild the package: make ca-certificates-dirclean make But, the patch is not applied. Getting below error: Applying 0002-ca-certificates-add_local_CAs.patch using patch: can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? Can you please let me know what am I doing wrong here? Thank you. On Sat, 18 Feb 2023 at 16:56, Sourabh Hegde wrote: > Hello Yann, All, > > Thanks for the update. > > Yes, I will try this patch and let you know. > > Also, we do remove update-ca-certificates on purpose from TARGET_DIR, >> because it is not expected that we need/can regenerate the root bundle >> on the target. >> > > I am not sure if I understood this completely. I have a generic question: > What if someone wants to update castore on the target itself. Let's say if > the local CA is already available on the target then how can it be added to > the trust store with update-ca-certificates? Is it not a good option to > include "update-ca-certificates" in TARGET_DIR? > > On Sat, 18 Feb 2023 at 16:32, Yann E. MORIN > wrote: > >> Thomas, Sourabh, All, >> >> On 2023-02-18 15:21 +0100, Yann E. MORIN spake thusly: >> > On 2023-02-18 14:19 +0100, Thomas Petazzoni via buildroot spake thusly: >> > > On Sat, 18 Feb 2023 13:54:15 +0100 >> > > Sourabh Hegde wrote: >> > > > I was thinking the ca-certificates package will take care of this. >> Maybe I >> > > > was wrong. >> > > > So, how should we add local CA to the trust store in the target? >> > > I am not sure as I'm not super familiar with that aspect. If what you >> > > need to do is to call update-ca-certificates during the build, then we >> > > could potentially build it for the host, and run it as a post-build >> > > script. Of course, this assumes update-ca-certificates is capable of >> > > doing its work on a root filesystem that isn't at the root. >> >> No, update-ca-certificates does not know how to work out-of-tree, which >> is the reason why we already need to handle it manually when we install >> ca-certificates. >> >> Also, we do remove update-ca-certificates on purpose from TARGET_DIR, >> because it is not expected that we need/can regenerate the root bundle >> on the target. >> >> > > Do you have more details about what needs to be done? With more >> > > details, we could probably give some more useful hints. >> > >> > I think we just need to split CA_CERTIFICATES_INSTALL_TARGET_CMDS in >> two: >> > one part to actually instll the certifcates provided by ca-certificates >> > itself, and the rest to update the castore with all certificate, as a >> > target-finalize hook. >> > >> > I.e. all that starts from "Remove any existing certificates under >> > /etc/ssl/certs" should be moved to a target-finalize hook. >> >> Basically, something around those lines (totally untested): >> >> diff --git a/package/ca-certificates/ca-certificates.mk >> b/package/ca-certificates/ca-certificates.mk >> index 0b6962ab7b..cc55d39957 100644 >> --- a/package/ca-certificates/ca-certificates.mk >> +++ b/package/ca-certificates/ca-certificates.mk >> @@ -20,7 +20,9 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS >> $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs >> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) >> rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates >> +endef >> >> +define CA_CERTIFICATES_GEN_BUNDLE >> # Remove any existing certificates under /etc/ssl/certs >> rm -f $(TARGET_DIR)/etc/ssl/certs/* >> >> @@ -30,14 +32,15 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS >> for i in `find usr/share/ca-certificates -name "*.crt" | >> LC_COLLATE=C sort` ; do \ >> ln -sf ../../../$$i etc/ssl/certs/`basename $${i} >> .crt`.pem ;\ >> cat $$i ;\ >> - done >$(@D)/ca-certificates.crt >> + done >$(BUILD_DIR)/ca-certificates.crt >> >> # Create symlinks to the certificates by their hash values >> $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs >> >> # Install the certificates bundle >> - $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ >> + $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ >> $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt >> endef >> +CA_CERTIFICATES_TARGET_FINALIZE_HOOKS += CA_CERTIFICATES_GEN_BUNDLE >> >> $(eval $(generic-package)) >> >> Sourabh, can you test and adapt that and report, please? >> >> 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. | >> >> '------------------------------^-------^------------------^--------------------' >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: ca-certificates.mk Type: application/octet-stream Size: 1942 bytes Desc: not available URL: From hrsourabh011 at gmail.com Sat Feb 18 17:09:00 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sat, 18 Feb 2023 18:09:00 +0100 Subject: [Buildroot] Missing curl binary In-Reply-To: <20230218121846.306f95f5@windsurf> References: <20230218121846.306f95f5@windsurf> Message-ID: Hi Thomas, Yes, that was the issue. Doing "make libcurl-dirclean all" fixed it. Thanks for the support On Sat, 18 Feb 2023 at 12:18, Thomas Petazzoni wrote: > On Fri, 17 Feb 2023 16:52:49 +0100 > Sourabh Hegde wrote: > > > I am trying to include curl binary in my image. I have > > selected BR2_PACKAGE_LIBCURL=y , BR2_PACKAGE_LIBCURL_CURL=y in the > Config. > > But still the curl binary is not installed in the target. Can anyone > please > > let me know what is the issue here and how to resolve it? > > I suppose you did a build with BR2_PACKAGE_LIBCURL=y, then after the > build completed you changed the configuration to enable > BR2_PACKAGE_LIBCURL_CURL=y and just ran "make". This doesn't work, as > the libcurl package is already built, and Buildroot is not smart enough > to detect that you changed something related to the libcurl > configuration. > > Run: "make libcurl-dirclean all" to force rebuilding the libcurl > package (or do a full rebuild). > > See https://buildroot.org/downloads/manual/manual.html#full-rebuild for > more details. > > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From ju.o at free.fr Sat Feb 18 17:40:35 2023 From: ju.o at free.fr (Julien Olivain) Date: Sat, 18 Feb 2023 18:40:35 +0100 Subject: [Buildroot] Debugging gnupg2 unsafe search path error (was Re: [PATCH] Revert "package/gnupg2: bump to version 2.4.0") In-Reply-To: References: <20230218101426.630874-1-bagasdotme@gmail.com> <20230218113939.526f0a76@windsurf> <96015d0268df72d3cdd58e7db09c1333@free.fr> Message-ID: <1852709c493974b2588cc7c9c28bba7e@free.fr> Hi Bagas, On 18/02/2023 14:45, Bagas Sanjaya wrote: > On 2/18/23 18:13, Julien Olivain wrote: >> In my first proposal of gnupg2 version 2.4.0 bump [1], I initially >> proposed >> to add Buildroot staging bin dir in PATH, to make sure we won't have >> such >> host/br-staging confusion: >> >> GNUPG2_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) >> >> Bagas, could you try on your side if this solve the issue? >> >> [1] >> https://patchwork.ozlabs.org/project/buildroot/patch/20230103193649.7488-5-ju.o at free.fr/ >> > > Hi Julien, > > I applied your suggestion on top of master as: > > ---- >8 ---- > diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk > index 5935ce6939..55917912a8 100644 > --- a/package/gnupg2/gnupg2.mk > +++ b/package/gnupg2/gnupg2.mk > @@ -15,6 +15,9 @@ GNUPG2_SELINUX_MODULES = gpg > GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba > libnpth \ > $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf > > +# Let's see if staging GNUPG2_CONF_ENV here works. > +GNUPG2_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) > + > GNUPG2_CONF_OPTS = \ > --disable-rpath \ > --with-libgpg-error-prefix=$(STAGING_DIR)/usr \ > > > Unfortunately, the build error still occurs with your suggestion. Thank you for testing. I still can't reproduce the issue on my side. Compilation works fine on my system (with and without a /usr/bin/gpgrt-config script), and also in the Buildroot utils/docker-run (which does not include a /usr/bin/gpgrt-config script). My system has the same libgpg-error version 1.46 as Buildroot. Could you tell me what is the distribution of your host system (or what is the version of the libgpg-error on the host)? I'll try the same environment in a docker. Another way to force the gpgrt-config path without putting the full staging usr bin in the PATH (as Thomas recommended not to do) would be to add the following: GNUPG2_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config While compiling gnupg2 in Buildroot, you should see in the configuration log: ... checking for gpg-error-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpg-error-config checking for gpgrt-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpgrt-config ... Without this line, if the host contains a gpgrt-config, you should see: checking for gpg-error-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpg-error-config checking for gpgrt-config... /usr/bin/gpgrt-config and if the host does not not contain a gpgrt-config, you should see: checking for gpg-error-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpg-error-config checking for gpgrt-config... no I still suspect the root cause is the presence of a /usr/bin/gpgrt-config of a specific/older libgpg-error version on the host. Best regards, Julien. From romain.naour at gmail.com Sat Feb 18 18:02:15 2023 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 18 Feb 2023 19:02:15 +0100 Subject: [Buildroot] [PATCH] package/poke: bump to version 3.0 Message-ID: <20230218180215.1077049-1-romain.naour@gmail.com> See: http://www.jemarch.net/poke-3.0-relnotes.html Build tested: https://gitlab.com/kubu93/buildroot/-/pipelines/782116399 Signed-off-by: Romain Naour --- test-pkg config: BR2_PACKAGE_POKE=y --- package/poke/poke.hash | 2 +- package/poke/poke.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poke/poke.hash b/package/poke/poke.hash index 09dc4e8972..e6e436570c 100644 --- a/package/poke/poke.hash +++ b/package/poke/poke.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 841e285917c6738ce982a6930e30ebeadecfb0655a79d9184f16f876a9fe6e47 poke-2.4.tar.gz +sha256 79a9b2f33c9f8c327c499afadaeeabfeecf6ad4988924d2c6c6f317e50317add poke-3.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index d49e628dbf..4a6ff344b2 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 2.4 +POKE_VERSION = 3.0 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) -- 2.34.3 From bagasdotme at gmail.com Sun Feb 19 04:26:26 2023 From: bagasdotme at gmail.com (Bagas Sanjaya) Date: Sun, 19 Feb 2023 11:26:26 +0700 Subject: [Buildroot] Debugging gnupg2 unsafe search path error (was Re: [PATCH] Revert "package/gnupg2: bump to version 2.4.0") In-Reply-To: <1852709c493974b2588cc7c9c28bba7e@free.fr> References: <20230218101426.630874-1-bagasdotme@gmail.com> <20230218113939.526f0a76@windsurf> <96015d0268df72d3cdd58e7db09c1333@free.fr> <1852709c493974b2588cc7c9c28bba7e@free.fr> Message-ID: On Sat, Feb 18, 2023 at 06:40:35PM +0100, Julien Olivain wrote: > Thank you for testing. > > I still can't reproduce the issue on my side. Compilation works fine on my > system > (with and without a /usr/bin/gpgrt-config script), and also in the Buildroot > utils/docker-run (which does not include a /usr/bin/gpgrt-config script). My > system > has the same libgpg-error version 1.46 as Buildroot. > > Could you tell me what is the distribution of your host system (or what is > the version > of the libgpg-error on the host)? I'll try the same environment in a > docker. > > Another way to force the gpgrt-config path without putting the full staging > usr bin > in the PATH (as Thomas recommended not to do) would be to add the following: > > GNUPG2_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config > Hi Julien, My setup is Debian 11. For the host GnuPG, I compiled GnuPG 2.4.0 with libgpg-error 1.46. I source a script (gnupg-setup) to initialize the compiled version into my ~/.bashrc. The script is: ---- >8 ---- if ! (systemctl --user is-active -q dirmngr-local.socket); then systemctl --user start {dirmngr,gpg-agent,gpg-agent-ssh,gpg-agent-browser,gpg-agent-extra}-local.socket fi export PATH=$HOME/.local/gnupg/bin:$PATH The actual .socket unit files are copied from GnuPG sources but I add Conflicts= against corresponding system-provided socket units. For your suggestion above, the build successed only when the initialization script above isn't sourced. However, when the script is sourced, the build search for host version of libraries instead (and thus FTBFS). > While compiling gnupg2 in Buildroot, you should see in the configuration > log: > > ... > checking for gpg-error-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpg-error-config > checking for gpgrt-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpgrt-config > ... > > Without this line, if the host contains a gpgrt-config, you should see: > > checking for gpg-error-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpg-error-config > checking for gpgrt-config... /usr/bin/gpgrt-config > > and if the host does not not contain a gpgrt-config, you should see: > > checking for gpg-error-config... /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/gpg-error-config > checking for gpgrt-config... no Yes, I see the message above in my build log. Thanks. -- An old man doll... just what I always wanted! - Clara -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: From thomas.petazzoni at bootlin.com Sun Feb 19 06:37:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 06:37:39 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-18 Message-ID: <20230219063745.E110C41800@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-18 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 7 | 9 | 0 | 16 | master | 151 | 166 | 1 | 318 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 22 host-pahole-1.24 | 8 linux-6.1.11 | 8 gobject-introspection-1.72.0 | 7 unknown | 7 host-binutils-2.38 | 5 host-go-1.19.6 | 5 libgcrypt-1.10.1 | 5 speechd-0.11.4 | 5 host-rust-1.67.0 | 4 glibc-2.36-81-g4f4d7a13edfd... | 3 systemd-252.4 | 3 xenomai-3.0.10 | 3 busybox-1.36.0 | 2 cairo-1.16.0 | 2 dash-0.5.11.5 | 2 gerbera-1.10.0 | 2 gmp-6.2.1 | 2 libgpg-error-1.46 | 2 linux-5.10.162-cip24-rt10 | 2 netsurf-3.10 | 2 olsr-0.9.8 | 2 php-8.2.2 | 2 at91dataflashboot-1.05 | 1 audit-3.0.7 | 1 check-0.15.2 | 1 cni-plugins-1.2.0 | 1 duma-2.5.15 | 1 efivar-38 | 1 elfutils-0.186 | 1 ffmpeg-4.4.3 | 1 fftw-quad-3.3.8 | 1 flann-1.9.2 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fstrcmp-0.7.D001 | 1 fwup-1.9.1 | 1 glibmm-2.68.2 | 1 gobject-introspection | 1 host-binutils-2.37 | 1 host-binutils-2.39 | 1 host-gcc-final-12.2.0 | 1 host-gdb-arc-2020.09-releas... | 1 host-libarchive-3.6.2 | 1 janet-1.26.0 | 1 kmod-30 | 1 libglib2-2.72.3 | 1 libglvnd-1.4.0 | 1 libhid-0.2.16 | 1 libjxl-0.7.0 | 1 libnfc-1.8.0 | 1 libressl-3.6.2 | 1 libsigsegv-2.14 | 1 libuci-4b3db1179747b6a67790... | 1 libxml2-2.10.3 | 1 libzlib-1.2.13 | 1 linux-5.10.162-cip24 | 1 linux-fusion-9.0.3 | 1 linux-tools | 1 lirc-tools-0.10.2 | 1 ltp-testsuite-20220930 | 1 lxc-5.0.2 | 1 matio-1.5.23 | 1 multipath-tools-0.9.4 | 1 ocf-linux-20171122 | 1 openal-1.22.0 | 1 openblas-0.3.21 | 1 opus-1.3.1 | 1 pcre2-10.42 | 1 php-xdebug-3.0.4 | 1 proftpd-1.3.8 | 1 python-numpy-1.23.5 | 1 python3-3.11.1 | 1 qemu-7.2.0 | 1 sdl-1.2.15 | 1 sigrok-cli-0.7.2 | 1 snmppp-3.4.10 | 1 uccp420wlan-6.9.1 | 1 valgrind-3.19.0 | 1 xfsprogs-5.14.2 | 1 zabbix-6.2.7 | 1 zxing-cpp-1.4.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | at91dataflashboot-1.05 | NOK | http://autobuild.buildroot.net/results/78e81ddf6fe9aa36cc1777ef2764d0d8627c9d13 | ORPH armeb | audit-3.0.7 | NOK | http://autobuild.buildroot.net/results/9ced9cd83351214ee393a94cf8d296e59a2d7717 | mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/3e13b17cf04fd413a3ad97686b717996c432f90e | ORPH mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/f6d03598201657332c5b70fd85ae6e30dc5870c0 | ORPH aarch64 | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/fa7645feb8b100486ef7317ae01a043cc7e0058b | powerpc | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/107916e6c212095db405d316f4ab57149d301a43 | x86_64 | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/9d61b956022c0233502273a4c183c097a9400749 | ORPH i686 | cni-plugins-1.2.0 | NOK | http://autobuild.buildroot.net/results/c6c9fb8911e0568e260b0a63c30a747d72250269 | or1k | dash-0.5.11.5 | NOK | http://autobuild.buildroot.net/results/1066076138f5a52fdba59260daf44d9d08ecfb02 | ORPH xtensa | dash-0.5.11.5 | NOK | http://autobuild.buildroot.net/results/95bdac3486aceda02531c41f402831a339301317 | ORPH armeb | duma-2.5.15 | NOK | http://autobuild.buildroot.net/results/cf455c210424e720426680a525947c691c51eab9 | ORPH aarch64 | efivar-38 | NOK | http://autobuild.buildroot.net/results/e6e6ceba41c0f7ec135a86bff83d787f070b34d0 | microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/9d14343b1798f2bc4410b2e529ab84444bc375db | ORPH i686 | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/f0c75b20eebb079e9733e705b0a59252699860cc | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/abc60144cb5e61ad168ac8c47d6dc6d84bc76a4d | ORPH arm | flann-1.9.2 | NOK | http://autobuild.buildroot.net/results/22a5416d04913dac726284dc44f78cd3a9291cec | microblazeel | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/160a51fac666663d9f8f45d7a82bf9a72bbc9da8 | or1k | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/e723b0b36bb91ce91246ddc7a5e0890b04d3ea10 | aarch64_be | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/2d44113e83497526f6c08bfa8070970b862e4796 | sparc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/403a1be571e63c0ce04acd843e09ba6c9ee9d40c | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/029cef2f885f659d15cb73256620e4db18a58411 | armeb | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/d11c45c153e800a8cc3df1e123a7d8a783cdbaf0 | arceb | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/05a5496495e51da2c9caf7570695cc95e1745e30 | aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/2f00f6a1623a31915eccb252d802eb159c72c062 | powerpc64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/a744139da6e35ebc4e43686dd27411c7da2dff72 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/c330fa1fffad9e3116a56553f24dcccca8e77b8a | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/5bd6f4648cdd265e31aa9ec8885a1faa3737d9a8 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/0a19ed9bb2720e7b6949112c977461dce8e1f415 | or1k | glibmm-2.68.2 | NOK | http://autobuild.buildroot.net/results/4962e1ffc531ea51188bba681bd31c7f2e9654d8 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/cf6f748ce250998efed7de540d5082edc891452c | ORPH riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/238f7f0d4fe848395c0c903c3f1f10e942ebcef2 | ORPH powerpc64le | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/d8e26edefea364fc809f45bd04cd80df1e81be57 | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/3b44d03d4e043d6ab067fa700382b6e4ae43910d | armeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/3c27029acf6b3ac6143c3a4f1abd555687f374f7 | nios2 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/84ad3f2c009dfc9a1283bf0e39ce38fb7476548c | i686 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/e869d10ac406980f88cf1623ffe52454517d8de7 | or1k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/796f589ef1100597b0160c5d2413f5a7d67c31fe | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/859bf641d81cd93274655babaa54d926a4cd6f6b | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/7b90d6946193b5b190feeafc0b446c59b1629090 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/65e0663c8f2f0ad4130c75f827fb7dabd0613dc7 | armeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/4cae2ca1016e7c3638fe027796aa8390b78bbcb3 | sh4aeb | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/4beb3d78b8ae1ba34345406968f958d1b2bd87ed | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/9cf43311db661ffc8f4dd772d24a78cbcdc74c8d | arm | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/c1228589072383ed28741ee76a57f9f4d8ea9f72 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/1ae538e5eb074945a99beb1ae289af8e2a1cb6de | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/f17b1c257696f43b00ff196291a8c489add421ed | i586 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6436465cec15394e834ec6c0aa7c9ea0e5c7f08e | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/b970eebd9d0e5fab2387c952c1a959f26a9b6a31 | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/6d48bef6174c55201b824ed46f31a16ed9e6d841 | powerpc64le | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/cbe66ca39b678b9a05e700394b1272949ea38a4b | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/fc4960d37ca0a2d2ba257ec846c2c965afb9ec8c | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/423c3ce7317c181e9f2e4a49b76ee9d26167375c | mips | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/dfd2fe3f4b20d68b4de1ef028f7ddca34aee4293 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/73a31f21c8434e9fbecd1bee671aaa119ecf76fc | s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/315c8f61097e5e95c74fa4ac343adedb032864a1 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/45c942f63be141258e3424661d044847dc62cacf | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8e2830acdd33b062bad5b95f68f9fc31299741e6 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8797e00a5a77c4002f4655ff73f9d51f3f72dae9 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0181ede6b23475f3d329964fad0cda9552b837e3 | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/687d3cca0dbe563b18492fb0b1320b316e1647af | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d88e5873c1c2941e99da381e32ef3c4b9c94d1f7 | ORPH powerpc64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/2b965a8f0c745a0c75214270e0376ca70a698115 | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/51f8b51fe1efdbaacae7ae7d6a0b7caa2ca6bc54 | powerpc64le | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/ab738a475197bc1fcff01417b3dbac27361f2eb7 | riscv32 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e37236b2a4cee0c7b516fea268dfa0399e3ce660 | armeb | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/64faa949e7ff158b2933b5821ac69f5c03061f15 | i686 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/baa326b439fd73b93b0ed230fb8ae241ab07fc2f | xtensa | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/ef80c5b74c50f8818593ba2c6c5a7079aaa6f6b1 | microblaze | host-gcc-final-12.2.0 | NOK | http://autobuild.buildroot.net/results/7d3af92ecdd0d2b3368613f0589441e09bd1df0a | arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/4493456d770626e0c25d8c745b6ba4bb8436b505 | ORPH i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/74c9f936abfdeb902c877bc26a0b6708c1c65252 | riscv64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/4692170071917f15705f38626cee110c7080ef22 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/60dcd75ecc6e431866e0f0286a98dd3f73b091a0 | riscv64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/bd13eea42c1f96fda351468c54c9979fd14bd24c | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/ab6a0a608ca1031e6904a26fda045be82317b06e | mips64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/335fa5e50d33abf1a297b358b657330f988097c0 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/f1332647f60c8a9601960a311b8b2946d43b8ab5 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1a73b7f0c727d941a15b531b75a944034cb3136f | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/afaf2bfe881edb4e6ad06b66b14499cdf2f91685 | mipsel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/53c0d407578ea83da7f4eab90a72a5c9185beb21 | arceb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ea7b461d2dec6ea6c15763752c432072c256d5ca | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2541c2063f262ac6a6bf2528534569ef780f62d0 | sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/5f5951fa21b867465408afb93a4dc6f865eaa200 | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/41172aa86d3eaee131386db020d008ddb9869190 | powerpc64le | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/3cdd9861919a19616938b09cd8290627ce79c44a | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/d90faa5e58245a58e18265076884991de0b60428 | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/d7c16bc32dccf66ae634ff7ddeded47dad4dbc73 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/db4c7f2fd90f944e977c7280057c0ac8382fb890 | aarch64_be | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/90ac4467a9eacd28644a6f710d669567af1fa7b6 | x86_64 | kmod-30 | NOK | http://autobuild.buildroot.net/results/b31ae705e641135885c0678746db20185e1b60b3 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/fd5a15ecaffa7664f9dee0258431a50561984565 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/1e9116d09dd96b95d974c8e5819ede33b5299cac | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/8060b102c4e08e61c2739e880bfb588be8ce6813 | ORPH arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/2985be716aaee664970def0d197d2a08fe496fcc | ORPH arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/062fc71dace7710aa494acc91f0332dd5252f6a4 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/91142f574ae5f5dce2e4bc5739c1d7086f04a1a9 | mipsel | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/48f1a59384bf8bffb246667973af8d1bf52376fa | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/6d6061c382efc6e78056a890290330e5fe29bc72 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/fe41886cb54906406b06789579d0256888b684ae | ORPH arceb | libhid-0.2.16 | NOK | http://autobuild.buildroot.net/results/920d45d47decea8f6eb652fa49d0d5be3f01bddc | ORPH i686 | libjxl-0.7.0 | NOK | http://autobuild.buildroot.net/results/f02e042d79342a6744913634368d57db76c9bcdd | or1k | libnfc-1.8.0 | NOK | http://autobuild.buildroot.net/results/7f33b9ce81d6cf9a3747e8d05644120db8ad230d | armeb | libressl-3.6.2 | NOK | http://autobuild.buildroot.net/results/fc2d4e894dde11d674244e1de65658f03072eeb5 | ORPH powerpc | libsigsegv-2.14 | NOK | http://autobuild.buildroot.net/results/13b0a59d8a36ddef725833743b15d7aa02a1f264 | mips64 | libuci-4b3db1179747b6a67790... | NOK | http://autobuild.buildroot.net/results/789e03372b064b8221f614fb27364360fda12e3c | x86_64 | libxml2-2.10.3 | NOK | http://autobuild.buildroot.net/results/985527a0e59f6b4a10faf73c722150dfb0f00f6c | mips64el | libzlib-1.2.13 | NOK | http://autobuild.buildroot.net/results/81941196257cdb218b1123768c33a341a4493861 | ORPH mipsel | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/420a406571a2ce4fd66487c279e8cc4e87a3f0d8 | ORPH mips64 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/fac1943e4046a2fe48d99997ca247bd1d15a9ad9 | ORPH mips64el | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/ee8f3dccfeb35ff375a13c34bb94480529cb61ed | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/c338222a16e9234d376f5c5201e51e8c5faa484f | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/ceb8385819ceb0852734d449c01c7ca0b962a9b1 | ORPH mips64el | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4d29e21605bf51392c224ae08c0c09853754bae3 | ORPH powerpc | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/5ec4068bce62e2fb574a74ea378a5e7b9cfee8cc | ORPH m68k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/b96f0de25f0c80476b2b126da97a2392b3c30cca | ORPH m68k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/37562596eed2062810b17d3acf7df0a7ee155b53 | ORPH powerpc64le | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/67a8445a91e3690928175227e1d02a464912e813 | ORPH arceb | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/47c0dd8d1cad8b8c300a5defedd3cb93228fac84 | ORPH x86_64 | linux-fusion-9.0.3 | NOK | http://autobuild.buildroot.net/results/7b5bbca45822f8cb23cd02861eadf3c37842e2eb | ORPH mips64el | linux-tools | NOK | http://autobuild.buildroot.net/results/5b56a9ad46cd114975a0a2ea3811564dde453bf9 | ORPH sparc64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/0ebe0926d6cb2ee73e01c714c8dceddccb425d8f | ORPH x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/86832d4a359711189a9e648cff3db9a997b68ebd | aarch64_be | lxc-5.0.2 | NOK | http://autobuild.buildroot.net/results/f383cfa5aa32594e01a0b8694bc2532d038c258a | nios2 | matio-1.5.23 | NOK | http://autobuild.buildroot.net/results/7b98c54cc0cbc4e41648b1a9266f5f1d48b3a16a | mips64el | multipath-tools-0.9.4 | NOK | http://autobuild.buildroot.net/results/fe006217b96f544f3bd495db1b842ba7ceb92c94 | powerpc64le | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/44d196af7f55d8b08f56bbc5d0c585a7dba1b8bb | mipsel | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/d6f9379b928846d8d386249467c0ddd7ecdfd80d | i686 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/5acdafd55e06368d2cc9fe628084130516c85e69 | ORPH microblaze | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/6c5a33c16b5a3505887dcebd02f3a93c6d619ada | ORPH x86_64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/6643c7f0130085aee38cf912f504a81161f390d9 | ORPH mipsel | openal-1.22.0 | NOK | http://autobuild.buildroot.net/results/5b18d2c4ec5df4b51827e29239d2bb192a5eefb5 | ORPH mips64el | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/85a743146f1604329aa6326e57e41bcf32aec585 | ORPH armeb | opus-1.3.1 | NOK | http://autobuild.buildroot.net/results/df2741ea654aa5e3165e0617c162acacc76ed12a | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/d8246c9e3e54547cdb7d94dcdbf376d292dfd787 | ORPH armeb | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/20b64a465602070531d114aec41b1a7c940c3a94 | microblaze | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/acdbed0d4a20049edc72d6250e7bedc011daa398 | mipsel | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/d5800324f85d0227e28ebedbd83a24fecb65d580 | arceb | proftpd-1.3.8 | NOK | http://autobuild.buildroot.net/results/2aba5297206e44dc086c3138ace70e85739196f3 | ORPH i686 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/f3db763c41d9abcd7ed35c8aad11d7842c901182 | x86_64 | python3-3.11.1 | NOK | http://autobuild.buildroot.net/results/61d61b1523b1b498b6af5d3088fc348c51421f7a | riscv32 | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/a742f4f67f82650623d3644e963e3df507762251 | sh4a | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/610498fac72a7abd2b48fc4fd6f9698d370b9492 | ORPH armeb | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/e4fb9180c9f4ba2643a3e4a588f37a450b041913 | ORPH powerpc64le | snmppp-3.4.10 | NOK | http://autobuild.buildroot.net/results/82ea09ff86c99a6e603a6d0ff778ee40e008eab7 | arceb | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/5f721b45674f59f00d0e411c679b31af7cc24eaf | arceb | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/b9807d227d15fa5cf25f283cd9244b6384aa97d6 | mips | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/0c2983cb9df393c372755c86a78b6c1c7089d56e | powerpc64le | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/d4f193545eb31864a9bac5a9d05bba39d3c7ff3e | s390x | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/fcd2f54c9240862b9ad38382c9f1d19e0eb6486b | powerpc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/66b0855d63c430d09acd1227ee9446a5ae5f6211 | arm | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/56eb99f0ef56b3d684c0445ebd25ded901e469d0 | sparc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/043ca336d4abb6ae147a0d43a5bd82b847885b2f | powerpc64le | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/062cebb8270da8a5e16159feb842514552de1128 | ORPH microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/834d4b406f8bea568d66621133125180052bc609 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/12a0a903182973ab144780eb80297af03dd5dbc3 | mips | unknown | NOK | http://autobuild.buildroot.net/results/0af8d180dc52c00e6fc27d52c8e2c94d766a7d5d | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/f96e5c09ed4b56b9fa712d7f292af43541c34757 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/8b56820cba16eb235f5d7c16cc16200ceb71049d | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/d86be9c08ce7da8441c6e4c82d25da6910ad26a7 | arceb | unknown | NOK | http://autobuild.buildroot.net/results/9b450c6ba85bb6dfb6380eec96d09992c2759d6e | mips | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/96895ad8942b5ac1932e753fd834feabd714af4d | ORPH powerpc | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/9759584ad48b9681e3454dba90676ffda01801c6 | sh4a | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/dc35a189de39244dc49f5a6f98c1c277fd704b80 | mipsel | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/891319a108654aede38fa5126986d534b2b0fd6e | mipsel | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/794f292edc659d48369412594e4596ef0e6866ac | ORPH powerpc64le | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/e74056c2c6c2f26762b4475f9a42b7807a4143fd | mips64el | zxing-cpp-1.4.0 | NOK | http://autobuild.buildroot.net/results/e62a38b7a477a66708fc2cd2cd9970ae9c20402b | Classification of failures by reason for 2022.11.x -------------------------------------------------- host-pahole-1.24 | 1 libgcrypt-1.10.1 | 1 libnss-3.84 | 1 mutt-2.2.9 | 1 ocf-linux-20171122 | 1 opencv3-3.4.17 | 1 python-numpy-1.23.4 | 1 unknown | 1 xxhash-0.8.1 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/4ddfb0c52b4efc2d49ca7e7c76bbe7e53cb0089e | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/c801955a73c2c35477dadc2747b072318104434d | ORPH microblazeel | libnss-3.84 | NOK | http://autobuild.buildroot.net/results/203ccf8d98b24b9718c574c58c64730b21b2d848 | powerpc64le | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/a820eb613005019b35c99e39f3aca2a155e26897 | aarch64 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/2b4e3590d3817872b26efa3ec53cd2d3c1e479f9 | ORPH m68k | opencv3-3.4.17 | NOK | http://autobuild.buildroot.net/results/342d7be42ae065ec0c8207b1a13d981ad6eb753b | mipsel | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/dbfcdfb804ff149f2500c20ace66c134e554df36 | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/3ce8a2d5073edddcc51ae5d81ec331be6d883d00 | microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/5226bbbd354ed3865a30df1b395705072c2b68d2 | ORPH -- http://autobuild.buildroot.net From hrsourabh011 at gmail.com Sun Feb 19 12:53:28 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Sun, 19 Feb 2023 13:53:28 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> <20230218142115.GC2718518@scaer> <20230218153216.GD2718518@scaer> Message-ID: Hello Yann, All, Applying 0002-ca-certificates-add_local_CAs.patch using patch: > can't find file to patch at input line 3 > I think the issue is during build, the ca-certificates.mk is not available in the output/build/ca-certificates/ dir. Only Makefile and ca-certificates.crt file is present. So how can I patch the makefile? On Sat, 18 Feb 2023 at 18:00, Sourabh Hegde wrote: > Hello Yann, > > I am trying to apply the patch. I am doing below steps: > > 1. modified the ca-certificates.mk to include changes. Also attached in > this mail. Could you please verify the changes? > 2. Generated patch file using "diff -u "old_file" "new_file" > > file.patch". Placed the patch file in /buildroot/package/ca-certificates/ > dir > 0002-ca-certificates-add_local_CAs.patch > +++ ca-certificates.mk 2023-02-18 14:13:13.181814043 +0000 > @@ -20,24 +20,29 @@ > $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install > DESTDIR=$(TARGET_DIR) > rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates > +endef > > +define CA_CERTIFICATES_GEN_BUNDLE > # Remove any existing certificates under /etc/ssl/certs > rm -f $(TARGET_DIR)/etc/ssl/certs/* > +endef > > # Create symlinks to certificates under /etc/ssl/certs > # and generate the bundle > cd $(TARGET_DIR) ;\ > +define CA_CERTIFICATES_INSTALL_TARGET_CMDS > for i in `find usr/share/ca-certificates -name "*.crt" | > LC_COLLATE=C sort` ; do \ > ln -sf ../../../$$i etc/ssl/certs/`basename $${i} > .crt`.pem ;\ > cat $$i ;\ > - done >$(@D)/ca-certificates.crt > + done >$(BUILD_DIR)/ca-certificates.crt > > # Create symlinks to the certificates by their hash values > $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs > > # Install the certificates bundle > - $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ > + $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ > $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt > endef > +CA_CERTIFICATES_TARGET_FINALIZE_HOOKS += CA_CERTIFICATES_GEN_BUNDLE > > $(eval $(generic-package)) > > 3. Trying to rebuild the package: > make ca-certificates-dirclean > make > > But, the patch is not applied. Getting below error: > Applying 0002-ca-certificates-add_local_CAs.patch using patch: > can't find file to patch at input line 3 > Perhaps you used the wrong -p or --strip option? > > Can you please let me know what am I doing wrong here? > > Thank you. > > On Sat, 18 Feb 2023 at 16:56, Sourabh Hegde > wrote: > >> Hello Yann, All, >> >> Thanks for the update. >> >> Yes, I will try this patch and let you know. >> >> Also, we do remove update-ca-certificates on purpose from TARGET_DIR, >>> because it is not expected that we need/can regenerate the root bundle >>> on the target. >>> >> >> I am not sure if I understood this completely. I have a generic question: >> What if someone wants to update castore on the target itself. Let's say if >> the local CA is already available on the target then how can it be added to >> the trust store with update-ca-certificates? Is it not a good option to >> include "update-ca-certificates" in TARGET_DIR? >> >> On Sat, 18 Feb 2023 at 16:32, Yann E. MORIN >> wrote: >> >>> Thomas, Sourabh, All, >>> >>> On 2023-02-18 15:21 +0100, Yann E. MORIN spake thusly: >>> > On 2023-02-18 14:19 +0100, Thomas Petazzoni via buildroot spake thusly: >>> > > On Sat, 18 Feb 2023 13:54:15 +0100 >>> > > Sourabh Hegde wrote: >>> > > > I was thinking the ca-certificates package will take care of this. >>> Maybe I >>> > > > was wrong. >>> > > > So, how should we add local CA to the trust store in the target? >>> > > I am not sure as I'm not super familiar with that aspect. If what you >>> > > need to do is to call update-ca-certificates during the build, then >>> we >>> > > could potentially build it for the host, and run it as a post-build >>> > > script. Of course, this assumes update-ca-certificates is capable of >>> > > doing its work on a root filesystem that isn't at the root. >>> >>> No, update-ca-certificates does not know how to work out-of-tree, which >>> is the reason why we already need to handle it manually when we install >>> ca-certificates. >>> >>> Also, we do remove update-ca-certificates on purpose from TARGET_DIR, >>> because it is not expected that we need/can regenerate the root bundle >>> on the target. >>> >>> > > Do you have more details about what needs to be done? With more >>> > > details, we could probably give some more useful hints. >>> > >>> > I think we just need to split CA_CERTIFICATES_INSTALL_TARGET_CMDS in >>> two: >>> > one part to actually instll the certifcates provided by ca-certificates >>> > itself, and the rest to update the castore with all certificate, as a >>> > target-finalize hook. >>> > >>> > I.e. all that starts from "Remove any existing certificates under >>> > /etc/ssl/certs" should be moved to a target-finalize hook. >>> >>> Basically, something around those lines (totally untested): >>> >>> diff --git a/package/ca-certificates/ca-certificates.mk >>> b/package/ca-certificates/ca-certificates.mk >>> index 0b6962ab7b..cc55d39957 100644 >>> --- a/package/ca-certificates/ca-certificates.mk >>> +++ b/package/ca-certificates/ca-certificates.mk >>> @@ -20,7 +20,9 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS >>> $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs >>> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) >>> rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates >>> +endef >>> >>> +define CA_CERTIFICATES_GEN_BUNDLE >>> # Remove any existing certificates under /etc/ssl/certs >>> rm -f $(TARGET_DIR)/etc/ssl/certs/* >>> >>> @@ -30,14 +32,15 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS >>> for i in `find usr/share/ca-certificates -name "*.crt" | >>> LC_COLLATE=C sort` ; do \ >>> ln -sf ../../../$$i etc/ssl/certs/`basename $${i} >>> .crt`.pem ;\ >>> cat $$i ;\ >>> - done >$(@D)/ca-certificates.crt >>> + done >$(BUILD_DIR)/ca-certificates.crt >>> >>> # Create symlinks to the certificates by their hash values >>> $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs >>> >>> # Install the certificates bundle >>> - $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ >>> + $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ >>> $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt >>> endef >>> +CA_CERTIFICATES_TARGET_FINALIZE_HOOKS += CA_CERTIFICATES_GEN_BUNDLE >>> >>> $(eval $(generic-package)) >>> >>> Sourabh, can you test and adapt that and report, please? >>> >>> 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. | >>> >>> '------------------------------^-------^------------------^--------------------' >>> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Sun Feb 19 13:17:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 19 Feb 2023 14:17:53 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> <20230218142115.GC2718518@scaer> <20230218153216.GD2718518@scaer> Message-ID: <20230219131753.GE2718518@scaer> Sourabh, All, On 2023-02-19 13:53 +0100, Sourabh Hegde spake thusly: > I think the issue is during build, the [1]ca-certificates.mk is not available in the output/build/ca-certificates/ dir. Only > Makefile and ca-certificates.crt file is present. > So how can I patch the makefile?? This is a patch agaisnt Buildroot itself. Apply it to Buildroot. 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 fontaine.fabrice at gmail.com Sun Feb 19 14:00:49 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 15:00:49 +0100 Subject: [Buildroot] [PATCH 1/3] package/libjxl: fix build with libjpeg Message-ID: <20230219140051.80647-1-fontaine.fabrice@gmail.com> Building with libjpeg will raise the following build failure on some architectures since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57: /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In function 'jxl::Status jxl::extras::{anonymous}::EncodeWithLibJpeg(const jxl::extras::PackedImage&, const JxlBasicInfo&, const std::vector&, std::vector, size_t, const string&, std::vector*)': /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] 126 | jpeg_mem_dest(&cinfo, &buffer, &size); | ^~~~~ | | | long unsigned int* Upstream advocates to use jpeg-turbo: https://github.com/libjxl/libjxl/issues/1802 Fixes: - http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 Signed-off-by: Fabrice Fontaine --- package/libjxl/libjxl.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index cc24ba258c..02a93ac5d9 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -30,4 +30,11 @@ LIBJXL_CONF_OPTS = \ -DJPEGXL_ENABLE_SJPEG=OFF \ -DJPEGXL_ENABLE_SKCMS=OFF +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) +LIBJXL_DEPENDENCIES += jpeg-turbo +LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=ON +else +LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=OFF +endif + $(eval $(cmake-package)) -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 14:00:50 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 15:00:50 +0100 Subject: [Buildroot] [PATCH 2/3] package/libjxl: disable benchmark and tests In-Reply-To: <20230219140051.80647-1-fontaine.fabrice@gmail.com> References: <20230219140051.80647-1-fontaine.fabrice@gmail.com> Message-ID: <20230219140051.80647-2-fontaine.fabrice@gmail.com> Disable benchmark and tests which are enabled by default since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57 Signed-off-by: Fabrice Fontaine --- package/libjxl/libjxl.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 02a93ac5d9..77405e4f11 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -23,7 +23,9 @@ endif LIBJXL_CONF_OPTS = \ -DJPEGXL_BUNDLE_LIBPNG=OFF \ -DJPEGXL_BUNDLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_BENCHMARK=OFF \ -DJPEGXL_ENABLE_DOXYGEN=OFF \ + -DJPEGXL_ENABLE_EXAMPLES=OFF \ -DJPEGXL_ENABLE_JNI=OFF \ -DJPEGXL_ENABLE_MANPAGES=OFF \ -DJPEGXL_ENABLE_OPENEXR=OFF \ -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 14:00:51 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 15:00:51 +0100 Subject: [Buildroot] [PATCH 3/3] package/libjxl: security bump to version 0.8.1 In-Reply-To: <20230219140051.80647-1-fontaine.fabrice@gmail.com> References: <20230219140051.80647-1-fontaine.fabrice@gmail.com> Message-ID: <20230219140051.80647-3-fontaine.fabrice@gmail.com> Security: Fix OOB read in exif.h https://github.com/libjxl/libjxl/releases/tag/v0.8.1 https://github.com/libjxl/libjxl/releases/tag/v0.8.0 Signed-off-by: Fabrice Fontaine --- package/libjxl/libjxl.hash | 2 +- package/libjxl/libjxl.mk | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index e71d32e61d..6b4c9d8d0a 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e libjxl-0.7.0.tar.gz +sha256 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 libjxl-0.8.1.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 77405e4f11..095dc06764 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.7.0 +LIBJXL_VERSION = 0.8.1 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS @@ -34,9 +34,13 @@ LIBJXL_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) LIBJXL_DEPENDENCIES += jpeg-turbo -LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=ON +LIBJXL_CONF_OPTS += \ + -DJPEGXL_ENABLE_JPEGLI=ON \ + -DJPEGXL_ENABLE_TOOLS=ON else -LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=OFF +LIBJXL_CONF_OPTS += \ + -DJPEGXL_ENABLE_JPEGLI=OFF \ + -DJPEGXL_ENABLE_TOOLS=OFF endif $(eval $(cmake-package)) -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 14:25:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 15:25:47 +0100 Subject: [Buildroot] [PATCH 1/2] package/speechd: disable kali support Message-ID: <20230219142548.626439-1-fontaine.fabrice@gmail.com> Disable kali support as it is not needed and raises the following build failure without C++ since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: CXX sd_kali-kali.o /bin/sh: line 1: no: command not found Fixes: - http://autobuild.buildroot.org/results/2f6c8b3674753d6a9f165117c70e7dad88505505 Signed-off-by: Fabrice Fontaine --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 0d43e4b6fb..46c0672f59 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,6 +12,7 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile +SPEECHD_CONF_OPTS = --without-kali # fix missing config.rpath (needed for autoreconf) in the codebase define SPEECHD_TOUCH_CONFIG_RPATH -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 14:25:48 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 15:25:48 +0100 Subject: [Buildroot] [PATCH 2/2] package/speechd: fix build without makeinfo In-Reply-To: <20230219142548.626439-1-fontaine.fabrice@gmail.com> References: <20230219142548.626439-1-fontaine.fabrice@gmail.com> Message-ID: <20230219142548.626439-2-fontaine.fabrice@gmail.com> Fix the following build failure without makeinfo raised since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: /home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found Fixes: - http://autobuild.buildroot.org/results/d4f193545eb31864a9bac5a9d05bba39d3c7ff3e Signed-off-by: Fabrice Fontaine --- package/speechd/0001-add-disable-doc.patch | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 package/speechd/0001-add-disable-doc.patch diff --git a/package/speechd/0001-add-disable-doc.patch b/package/speechd/0001-add-disable-doc.patch new file mode 100644 index 0000000000..dd17b10e4f --- /dev/null +++ b/package/speechd/0001-add-disable-doc.patch @@ -0,0 +1,78 @@ +From d88557d3c29c33f76af20cb7a6eb798f6f598c23 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 19 Feb 2023 15:18:35 +0100 +Subject: [PATCH] add --disable-doc + +Allow the user to disable documentation through --disable-doc to avoid +the following build failure without makeinfo: + +make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/doc' + MAKEINFO ssip.info + MAKEINFO spd-say.info +/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found +/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +make[3]: *** [Makefile:492: ssip.info] Error 127 + +Fixes: + - http://autobuild.buildroot.org/results/d4f193545eb31864a9bac5a9d05bba39d3c7ff3e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/brailcom/speechd/pull/810] +--- + Makefile.am | 6 +++++- + configure.ac | 4 ++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 26617c78..480eb50e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,7 +22,11 @@ pkgconfig_DATA = speech-dispatcher.pc + + BUILT_SOURCES = $(top_srcdir)/.version + +-SUBDIRS= include locale src config doc po ++SUBDIRS= include locale src config po ++ ++if ENABLE_DOC ++SUBDIRS += doc ++endif + + EXTRA_DIST= config.rpath COPYING.LGPL COPYING.GPL-2 COPYING.GPL-3 ANNOUNCE BUGS FAQ README.md README.packagers README.translators README.overview.md README.style.md build.sh speech-dispatcherd.service.in speech-dispatcher.socket speech-dispatcher.service.in po/Makevars.in po/README + +diff --git a/configure.ac b/configure.ac +index faaa8629..4f2af908 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -168,6 +168,10 @@ AC_SUBST([EXTRA_SOCKET_LIBS]) + AC_SUBST([ERROR_CFLAGS]) + AC_SUBST([RDYNAMIC]) + ++AC_ARG_ENABLE([doc], ++ [AC_HELP_STRING([--disable-doc], [turn off documentation])]) ++AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no") ++ + # Check for python support. + # Python 3 or greater required + AC_ARG_ENABLE([python], +-- +2.39.0 + -- 2.39.0 From ju.o at free.fr Sun Feb 19 15:00:24 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 16:00:24 +0100 Subject: [Buildroot] Debugging gnupg2 unsafe search path error (was Re: [PATCH] Revert "package/gnupg2: bump to version 2.4.0") In-Reply-To: References: <20230218101426.630874-1-bagasdotme@gmail.com> <20230218113939.526f0a76@windsurf> <96015d0268df72d3cdd58e7db09c1333@free.fr> <1852709c493974b2588cc7c9c28bba7e@free.fr> Message-ID: <5bce31654ac7b25a0be6352770f90553@free.fr> Hi Bagas, On 19/02/2023 05:26, Bagas Sanjaya wrote: > On Sat, Feb 18, 2023 at 06:40:35PM +0100, Julien Olivain wrote: >> Thank you for testing. >> >> I still can't reproduce the issue on my side. Compilation works fine >> on my >> system >> (with and without a /usr/bin/gpgrt-config script), and also in the >> Buildroot >> utils/docker-run (which does not include a /usr/bin/gpgrt-config >> script). My >> system >> has the same libgpg-error version 1.46 as Buildroot. >> >> Could you tell me what is the distribution of your host system (or >> what is >> the version >> of the libgpg-error on the host)? I'll try the same environment in a >> docker. >> >> Another way to force the gpgrt-config path without putting the full >> staging >> usr bin >> in the PATH (as Thomas recommended not to do) would be to add the >> following: >> >> GNUPG2_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config >> > > Hi Julien, > > My setup is Debian 11. > > For the host GnuPG, I compiled GnuPG 2.4.0 with libgpg-error 1.46. I > source a script (gnupg-setup) to initialize the compiled version into > my > ~/.bashrc. > > The script is: > > ---- >8 ---- > if ! (systemctl --user is-active -q dirmngr-local.socket); then > systemctl --user start > {dirmngr,gpg-agent,gpg-agent-ssh,gpg-agent-browser,gpg-agent-extra}-local.socket > fi > > export PATH=$HOME/.local/gnupg/bin:$PATH > > The actual .socket unit files are copied from GnuPG sources but I add > Conflicts= against corresponding system-provided socket units. > > For your suggestion above, the build successed only when the > initialization > script above isn't sourced. However, when the script is sourced, the > build > search for host version of libraries instead (and thus FTBFS). Thanks for the tests and feedback. I am now able to reproduce the issue by installing the libgpg-error-dev package in the Buildroot Docker image (which also happen to be a Debian 11). I'll send my patch proposal to fix autobuild failures. Right now, I don't see why your sourced file would prevent this fix to work. Is it possible the same issue happen in other gnupg2 friend packages? (such as libassuan, libgcrypt, libksba, ...) which I believe are all using the AM_PATH_GPG_ERROR() macro from libgpg-error gpg-error.m4. Best regards, Julien. From ju.o at free.fr Sun Feb 19 15:04:26 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 16:04:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnupg2: fix build failure when host provides an old gpgrt-config Message-ID: <20230219150426.1509780-1-ju.o@free.fr> gnupg2 uses the libgpg-error library. The libgpg-error library has a long plan to be renamed to "gpgrt" (see [1]). For the transition, it provides two configuration scripts "gpg-error-config" (the old, original one, kept for compatibility) and "gpgrt-config" (which is meant to be the replacement). When both are detected, "gpgrt-config" should be preferred. gnupg2 configure script searches for "gpg-error-config" in the path provided to --with-libgpg-error-prefix=PFX (more specifically, in "PFX/bin"). The logic to find "gpgrt-config" is different: it is searched in paths "$prefix/bin:$PATH". See [2]. On Buildroot, autotools target packages are configured with "--prefix=/usr", which makes the configure script to search in the host "/usr/bin". In some host environment providing such a "/usr/bin/gpgrt-config" script of an older version, host compilation flags are incorrectly added for the target, which leads to compilation failures. The issue can be reproduced in a Buildroot Docker image from [3] in which the libgpg-error-dev package is added. When tested, the libgpg-error-dev package was at version 1.38. In that configuration, gnupg2 configure will output the message: checking for gpgrt-config... /usr/bin/gpgrt-config and the compilation fails with a message: aarch64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' Note: it was observed that in some other configurations in which the host /usr/bin/gpgrt-config was from libgpg-error version 1.46, the host script was redirecting correctly in the buildroot sysroot. Since gnupg2 searches for "gpgrt-config" with a "AC_PATH_PROG(GPGRT_CONFIG, ...)" macro, this patch fixes this issue by simply forcing the script path in the GPGRT_CONFIG environment variable. See also [4] which discussed the "gpgrt-config" search logic. Fixes: - http://autobuild.buildroot.net/results/423c3ce7317c181e9f2e4a49b76ee9d26167375c/ (and many others) [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=e0b9f16445a96942af0839bcdb9a0b0f8cf31380;hb=885a287a57cf060b4c5b441822c09d23b8dee2bd#l29 [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=m4/gpg-error.m4;h=a975e53d07d1b743f51d8aa1767cd8e0d71b4071;hb=c0556edb80518720b0d884251685fe008c8f0429#l68 [3] https://git.buildroot.org/buildroot/tree/support/docker/Dockerfile?id=b6085c00d0feece6f3ba635e7847ea653bc5fac3 [4] https://dev.gnupg.org/T5365 Reported-by: Bagas Sanjaya Tested-by: Bagas Sanjaya Signed-off-by: Julien Olivain --- Patch tested on master branch at commit b6085c0 with commands: make check-package ... 0 warnings generated support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_gnupg2 ... OK utils/docker-run support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_gnupg2 ... OK utils/test-pkg -p gnupg2 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]: SKIPPED sourcery-arm [6/6]: OK 6 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/gnupg2/gnupg2.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 5935ce6939..73de185ba7 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -23,6 +23,10 @@ GNUPG2_CONF_OPTS = \ --with-ksba-prefix=$(STAGING_DIR)/usr \ --with-npth-prefix=$(STAGING_DIR)/usr +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +GNUPG2_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config + ifneq ($(BR2_PACKAGE_GNUPG2_GPGV),y) define GNUPG2_REMOVE_GPGV rm -f $(TARGET_DIR)/usr/bin/gpgv -- 2.39.2 From ju.o at free.fr Sun Feb 19 15:30:59 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 16:30:59 +0100 Subject: [Buildroot] [PATCH 1/3] package/libjxl: fix build with libjpeg In-Reply-To: <20230219140051.80647-1-fontaine.fabrice@gmail.com> References: <20230219140051.80647-1-fontaine.fabrice@gmail.com> Message-ID: <334eac4665b498754a5615cdec982341@free.fr> Hi Fabrice, On 19/02/2023 15:00, Fabrice Fontaine wrote: > Building with libjpeg will raise the following build failure on some > architectures since the addition of the package in commit > e648d399d8bd609697e78f13f7fa76be06d91a57: > > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In > function 'jxl::Status > jxl::extras::{anonymous}::EncodeWithLibJpeg(const > jxl::extras::PackedImage&, const JxlBasicInfo&, const > std::vector&, std::vector, size_t, const > string&, std::vector*)': > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: > error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka > 'unsigned int*'} [-fpermissive] > 126 | jpeg_mem_dest(&cinfo, &buffer, &size); > | ^~~~~ > | | > | long unsigned int* > > Upstream advocates to use jpeg-turbo: > https://github.com/libjxl/libjxl/issues/1802 > > Fixes: > - > http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 > > Signed-off-by: Fabrice Fontaine > --- > package/libjxl/libjxl.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk > index cc24ba258c..02a93ac5d9 100644 > --- a/package/libjxl/libjxl.mk > +++ b/package/libjxl/libjxl.mk > @@ -30,4 +30,11 @@ LIBJXL_CONF_OPTS = \ > -DJPEGXL_ENABLE_SJPEG=OFF \ > -DJPEGXL_ENABLE_SKCMS=OFF > > +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) > +LIBJXL_DEPENDENCIES += jpeg-turbo > +LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=ON > +else > +LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=OFF Having JPEGXL_ENABLE_TOOLS=ON without any libjpeg is a valid configuration for libjxl. Is it possible to disable the tools only if BR2_PACKAGE_LIBJPEG=y? The configuration with tools and without any libjpeg is the one used by the package runtime test. Running the test with command: support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_libjxl now fails with output: AssertionError: 127 != 0 : Failed to run: cjxl /var/tmp/reference.ppm /var/tmp/encoded.jxl output was: -sh: cjxl: not found > +endif > + > $(eval $(cmake-package)) Best regards, Julien. From ju.o at free.fr Sun Feb 19 15:37:07 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 16:37:07 +0100 Subject: [Buildroot] [PATCH 3/3] package/libjxl: security bump to version 0.8.1 In-Reply-To: <20230219140051.80647-3-fontaine.fabrice@gmail.com> References: <20230219140051.80647-1-fontaine.fabrice@gmail.com> <20230219140051.80647-3-fontaine.fabrice@gmail.com> Message-ID: <7155523cf22f19d3f27a454d8a8767e2@free.fr> Hi Fabrice, On 19/02/2023 15:00, Fabrice Fontaine wrote: > Security: Fix OOB read in exif.h > > https://github.com/libjxl/libjxl/releases/tag/v0.8.1 > https://github.com/libjxl/libjxl/releases/tag/v0.8.0 > > Signed-off-by: Fabrice Fontaine > --- > package/libjxl/libjxl.hash | 2 +- > package/libjxl/libjxl.mk | 10 +++++++--- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash > index e71d32e61d..6b4c9d8d0a 100644 > --- a/package/libjxl/libjxl.hash > +++ b/package/libjxl/libjxl.hash > @@ -1,4 +1,4 @@ > # Locally computed: > -sha256 > 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e > libjxl-0.7.0.tar.gz > +sha256 > 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 > libjxl-0.8.1.tar.gz > sha256 > 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede > LICENSE > sha256 > 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 > PATENTS > diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk > index 77405e4f11..095dc06764 100644 > --- a/package/libjxl/libjxl.mk > +++ b/package/libjxl/libjxl.mk > @@ -4,7 +4,7 @@ > # > > ################################################################################ > > -LIBJXL_VERSION = 0.7.0 > +LIBJXL_VERSION = 0.8.1 When bumping to version 0.8.1, I observed a segmentation fault crash while running the package runtime test with the command: support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_libjxl The issue happen only when the libjxl tools are enabled AND there is no jpeg support enabled. I have a pull-request upstream which is not merged yet, at: https://github.com/libjxl/libjxl/pull/2178 Maybe this patch could be included, to make sure the runtime test will still work? > LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) > LIBJXL_LICENSE = BSD-3-Clause > LIBJXL_LICENSE_FILES = LICENSE PATENTS > @@ -34,9 +34,13 @@ LIBJXL_CONF_OPTS = \ > > ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) > LIBJXL_DEPENDENCIES += jpeg-turbo > -LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=ON > +LIBJXL_CONF_OPTS += \ > + -DJPEGXL_ENABLE_JPEGLI=ON \ > + -DJPEGXL_ENABLE_TOOLS=ON > else > -LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=OFF > +LIBJXL_CONF_OPTS += \ > + -DJPEGXL_ENABLE_JPEGLI=OFF \ > + -DJPEGXL_ENABLE_TOOLS=OFF > endif > > $(eval $(cmake-package)) Best regards, Julien. From fontaine.fabrice at gmail.com Sun Feb 19 16:14:53 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 17:14:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/ipmiutil: fix uclibc build without wchar Message-ID: <20230219161453.87903-1-fontaine.fabrice@gmail.com> For an unknown reason, wchar_t is incorrectly detected with uclibc resulting in the following build failure: In file included from igetevent.c:136: imb_api.h:150:5: error: unknown type name 'wchar_t' 150 | wchar_t *Buffer; | ^~~~~~~ The build failure can be reproduced even when reverting bump to version 3.1.8. Fixes: - http://autobuild.buildroot.org/results/e9ff3bd08e106dc834968bf5e4296ce8299027f8 Signed-off-by: Fabrice Fontaine --- package/ipmiutil/ipmiutil.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk index ad9fbfc24c..b48eaa7cb2 100644 --- a/package/ipmiutil/ipmiutil.mk +++ b/package/ipmiutil/ipmiutil.mk @@ -10,6 +10,7 @@ IPMIUTIL_LICENSE = BSD-3-Clause IPMIUTIL_LICENSE_FILES = COPYING IPMIUTIL_MAKE = $(MAKE1) +IPMIUTIL_CONF_ENV = ac_cv_type_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) ifeq ($(BR2_PACKAGE_OPENSSL),y) # tests against distro libcrypto so it might get a false positive when -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 16:37:10 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 17:37:10 +0100 Subject: [Buildroot] [PATCH 1/3] package/libjxl: fix build with libjpeg In-Reply-To: <334eac4665b498754a5615cdec982341@free.fr> References: <20230219140051.80647-1-fontaine.fabrice@gmail.com> <334eac4665b498754a5615cdec982341@free.fr> Message-ID: Hi Julien, Le dim. 19 f?vr. 2023 ? 16:31, Julien Olivain a ?crit : > Hi Fabrice, > > On 19/02/2023 15:00, Fabrice Fontaine wrote: > > Building with libjpeg will raise the following build failure on some > > architectures since the addition of the package in commit > > e648d399d8bd609697e78f13f7fa76be06d91a57: > > > > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In > > function 'jxl::Status > > jxl::extras::{anonymous}::EncodeWithLibJpeg(const > > jxl::extras::PackedImage&, const JxlBasicInfo&, const > > std::vector&, std::vector, size_t, const > > string&, std::vector*)': > > > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: > > error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka > > 'unsigned int*'} [-fpermissive] > > 126 | jpeg_mem_dest(&cinfo, &buffer, &size); > > | ^~~~~ > > | | > > | long unsigned int* > > > > Upstream advocates to use jpeg-turbo: > > https://github.com/libjxl/libjxl/issues/1802 > > > > Fixes: > > - > > > http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/libjxl/libjxl.mk | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk > > index cc24ba258c..02a93ac5d9 100644 > > --- a/package/libjxl/libjxl.mk > > +++ b/package/libjxl/libjxl.mk > > @@ -30,4 +30,11 @@ LIBJXL_CONF_OPTS = \ > > -DJPEGXL_ENABLE_SJPEG=OFF \ > > -DJPEGXL_ENABLE_SKCMS=OFF > > > > +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) > > +LIBJXL_DEPENDENCIES += jpeg-turbo > > +LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=ON > > +else > > +LIBJXL_CONF_OPTS += -DJPEGXL_ENABLE_TOOLS=OFF > > Having JPEGXL_ENABLE_TOOLS=ON without any libjpeg is a valid > configuration for libjxl. > > Is it possible to disable the tools only if BR2_PACKAGE_LIBJPEG=y? > Thanks for your review, I'll send a v2 which will set CMAKE_DISABLE_FIND_PACKAGE_JPEG. > The configuration with tools and without any libjpeg is the one > used by the package runtime test. > > Running the test with command: > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_libjxl > > now fails with output: > > AssertionError: 127 != 0 : > Failed to run: cjxl /var/tmp/reference.ppm /var/tmp/encoded.jxl > output was: > -sh: cjxl: not found > > > +endif > > + > > $(eval $(cmake-package)) > > Best regards, > > Julien. > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Sun Feb 19 16:48:20 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 17:48:20 +0100 Subject: [Buildroot] [PATCH v2,1/3] package/libjxl: fix build with libjpeg Message-ID: <20230219164822.142283-1-fontaine.fabrice@gmail.com> Building with libjpeg will raise the following build failure on some architectures since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57: /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In function 'jxl::Status jxl::extras::{anonymous}::EncodeWithLibJpeg(const jxl::extras::PackedImage&, const JxlBasicInfo&, const std::vector&, std::vector, size_t, const string&, std::vector*)': /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] 126 | jpeg_mem_dest(&cinfo, &buffer, &size); | ^~~~~ | | | long unsigned int* Upstream advocates to use jpeg-turbo: https://github.com/libjxl/libjxl/issues/1802 Fixes: - http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Julien Olivain: - Keep tools enabled and only disable jpeg subset of tools if jpeg-turbo is not available package/libjxl/libjxl.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index cc24ba258c..1257928efd 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -30,4 +30,11 @@ LIBJXL_CONF_OPTS = \ -DJPEGXL_ENABLE_SJPEG=OFF \ -DJPEGXL_ENABLE_SKCMS=OFF +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) +LIBJXL_DEPENDENCIES += jpeg-turbo +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=OFF +else +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=ON +endif + $(eval $(cmake-package)) -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 16:48:21 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 17:48:21 +0100 Subject: [Buildroot] [PATCH v2, 2/3] package/libjxl: disable benchmark and tests In-Reply-To: <20230219164822.142283-1-fontaine.fabrice@gmail.com> References: <20230219164822.142283-1-fontaine.fabrice@gmail.com> Message-ID: <20230219164822.142283-2-fontaine.fabrice@gmail.com> Disable benchmark and tests which are enabled by default since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57 Signed-off-by: Fabrice Fontaine --- package/libjxl/libjxl.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 1257928efd..b4dfbecf82 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -23,7 +23,9 @@ endif LIBJXL_CONF_OPTS = \ -DJPEGXL_BUNDLE_LIBPNG=OFF \ -DJPEGXL_BUNDLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_BENCHMARK=OFF \ -DJPEGXL_ENABLE_DOXYGEN=OFF \ + -DJPEGXL_ENABLE_EXAMPLES=OFF \ -DJPEGXL_ENABLE_JNI=OFF \ -DJPEGXL_ENABLE_MANPAGES=OFF \ -DJPEGXL_ENABLE_OPENEXR=OFF \ -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 16:48:22 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 17:48:22 +0100 Subject: [Buildroot] [PATCH v2, 3/3] package/libjxl: security bump to version 0.8.1 In-Reply-To: <20230219164822.142283-1-fontaine.fabrice@gmail.com> References: <20230219164822.142283-1-fontaine.fabrice@gmail.com> Message-ID: <20230219164822.142283-3-fontaine.fabrice@gmail.com> Security: Fix OOB read in exif.h https://github.com/libjxl/libjxl/releases/tag/v0.8.1 https://github.com/libjxl/libjxl/releases/tag/v0.8.0 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Julien Olivain): - Add patch to fix crash ...entation-fault-when-JPEG-is-disabled.patch | 44 +++++++++++++++++++ package/libjxl/libjxl.hash | 2 +- package/libjxl/libjxl.mk | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch diff --git a/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch new file mode 100644 index 0000000000..3d709c956b --- /dev/null +++ b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch @@ -0,0 +1,44 @@ +From 504f35c8204248ae6f97278e8b7c6cc5853a1b94 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 10 Feb 2023 21:31:30 +0100 +Subject: [PATCH] djxl: fix segmentation fault when JPEG is disabled + +When libjxl is compiled without JPEG support, by configuring for example +with: + + cmake -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE ... + +djxl crashes with a segmentation fault at: +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L367 + +The crash can be reproduced with the sequence: + + gm convert IMAGE:LOGO ref.ppm + cjxl ref.ppm enc.jxl + djxl enc.jxl dec.ppm + +The crash happen because opt_jpeg_quality_id does not get +initialized at: +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L107 + +This commit fixes the crash by adding a test on opt_jpeg_quality_id. + +Signed-off-by: Julien Olivain +[Retrieved from: +https://github.com/libjxl/libjxl/pull/2178/commits/504f35c8204248ae6f97278e8b7c6cc5853a1b94] +--- + tools/djxl_main.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/djxl_main.cc b/tools/djxl_main.cc +index b755301fcb..42b889e7ce 100644 +--- a/tools/djxl_main.cc ++++ b/tools/djxl_main.cc +@@ -370,6 +370,7 @@ int main(int argc, const char* argv[]) { + args.color_space = force_colorspace; + } + if (codec == jxl::extras::Codec::kPNM && extension != ".pfm" && ++ args.opt_jpeg_quality_id != -1 && + !cmdline.GetOption(args.opt_jpeg_quality_id)->matched()) { + args.bits_per_sample = 0; + } diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index e71d32e61d..6b4c9d8d0a 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e libjxl-0.7.0.tar.gz +sha256 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 libjxl-0.8.1.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index b4dfbecf82..f603327bf6 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.7.0 +LIBJXL_VERSION = 0.8.1 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS -- 2.39.0 From peter at korsgaard.com Sun Feb 19 16:53:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:53:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/python3: bump version to 3.11.2 In-Reply-To: <20230216182036.40830-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 16 Feb 2023 19:20:36 +0100") References: <20230216182036.40830-1-bernd.kuhls@t-online.de> Message-ID: <87ttzh38cn.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: > https://docs.python.org/release/3.11.2/whatsnew/changelog.html#python-3-11-2 > Updated license hash due to copyright year bump: > https://github.com/python/cpython/commit/07d1f99e8faefcf24dab2113fb0df27202fa6f71 > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:53:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:53:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: security bump version to 8.2.3 In-Reply-To: <20230216182410.225354-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 16 Feb 2023 19:24:10 +0100") References: <20230216182410.225354-1-bernd.kuhls@t-online.de> Message-ID: <87pma538ch.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.2.3 > Fixes CVE-2023-0567, CVE-2023-0568 & CVE-2023-0662. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:53:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:53:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump version to 0.103.8 In-Reply-To: <20230216182800.254043-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 16 Feb 2023 19:28:00 +0100") References: <20230216182800.254043-1-bernd.kuhls@t-online.de> Message-ID: <87lekt38c9.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://blog.clamav.net/2023/02/clamav-01038-01052-and-101-patch.html > Fixes CVE-2023-20032 & CVE-2023-20052. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:54:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:54:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/x11r7/xdriver_xf86-video-trident: bump version to 1.4.0 In-Reply-To: <20230216183655.402798-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 16 Feb 2023 19:36:54 +0100") References: <20230216183655.402798-1-bernd.kuhls@t-online.de> Message-ID: <87h6vh38as.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003326.html > Removed patch which was applied upstream. > Switched tarball to xz, updated _SITE. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:54:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:54:25 +0100 Subject: [Buildroot] [PATCH 2/2] package/xutil_util-macros: bump version to 1.20.0 In-Reply-To: <20230216183655.402798-2-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 16 Feb 2023 19:36:55 +0100") References: <20230216183655.402798-1-bernd.kuhls@t-online.de> <20230216183655.402798-2-bernd.kuhls@t-online.de> Message-ID: <87cz6538am.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003324.html > Updated license hash due to copyright year bump: > https://gitlab.freedesktop.org/xorg/util/macros/-/commit/cb147377e9341af05232f95814022abdecf14024 > Switched tarball to xz, updated _SITE. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:54:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:54:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: bump to version 2.10.0 In-Reply-To: <20230216174018.33199-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 16 Feb 2023 18:40:18 +0100") References: <20230216174018.33199-1-fontaine.fabrice@gmail.com> Message-ID: <878rgt389x.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/FreeRDP/FreeRDP/releases/tag/2.10.0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:55:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:55:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build with libexecinfo In-Reply-To: <20230216174134.34179-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 16 Feb 2023 18:41:34 +0100") References: <20230216174134.34179-1-fontaine.fabrice@gmail.com> Message-ID: <874jrh388h.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with libexecinfo raised since commit > d649bcd3805a26cedb30120ebbdcf12f8fbf449f: > /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/10.4.0/../../../../mips-buildroot-linux-musl/bin/ld: > ../lib/monkey/library/libmonkey.a(mk_utils.c.o): in function > `mk_utils_stacktrace': > mk_utils.c:(.text+0x1578): undefined reference to `backtrace' > Fixes: > - http://autobuild.buildroot.org/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 16:52:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:52:32 +0100 Subject: [Buildroot] [git commit] package/php: security bump version to 8.2.3 Message-ID: <20230219165607.56D9786033@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66b1926764582a628b0b6b68a3aebe4b9790ab12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://www.php.net/ChangeLog-8.php#8.2.3 Fixes CVE-2023-0567, CVE-2023-0568 & CVE-2023-0662. Signed-off-by: Bernd Kuhls 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 869cb9b94f..41aa326156 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz +sha256 b9b566686e351125d67568a33291650eb8dfa26614d205d70d82e6e92613d457 php-8.2.3.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 9ce153f4fa..bd7d5a8c3c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.2 +PHP_VERSION = 8.2.3 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Sun Feb 19 16:53:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:53:44 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-trident: bump version to 1.4.0 Message-ID: <20230219165607.7364E803E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05de8e14ce9bf9ea109aa028b34aba559aa18aad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003326.html Removed patch which was applied upstream. Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-Remove-ramdac.patch | 56 ---------------------- .../xdriver_xf86-video-trident.hash | 5 +- .../xdriver_xf86-video-trident.mk | 6 +-- 3 files changed, 6 insertions(+), 61 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch b/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch deleted file mode 100644 index 38ca9afebf..0000000000 --- a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 07a5c4732f1c28ffcb873ee04500e3cb813c50b4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Dec 2021 22:28:04 +0100 -Subject: [PATCH] Remove ramdac - -ramdac drivers have been removed from xserver since version 21.0.99.1 -and -https://gitlab.freedesktop.org/xorg/xserver/-/commit/f0385fb420158ac3bc1c4c325431ffc5c62344bb -resulting in the following build failure: - -In file included from trident_bank.c:37: -trident.h:41:10: fatal error: xf86RamDac.h: No such file or directory - 41 | #include "xf86RamDac.h" - | ^~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/c81ac8075af257e8626d9d097270be7a7b4a1496 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/merge_requests/1] ---- - src/trident.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/trident.h b/src/trident.h -index 5cadf52..c82de4c 100644 ---- a/src/trident.h -+++ b/src/trident.h -@@ -38,7 +38,6 @@ - #include "xaa.h" - #endif - #include "xf86fbman.h" --#include "xf86RamDac.h" - #include "compiler.h" - #include "vgaHW.h" - #include "xf86i2c.h" -@@ -103,7 +102,6 @@ typedef struct { - int useEXA; - int Chipset; - int DACtype; -- int RamDac; - int ChipRev; - int HwBpp; - int BppShift; -@@ -169,7 +167,6 @@ typedef struct { - CARD32 BltScanDirection; - CARD32 DrawFlag; - CARD16 LinePattern; -- RamDacRecPtr RamDacRec; - int CursorOffset; - xf86CursorInfoPtr CursorInfoRec; - xf86Int10InfoPtr Int10; --- -2.33.0 - diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash index 321f35d4f0..2ef664487c 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002762.html -sha256 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f xf86-video-trident-1.3.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003326.html +sha256 7f76219ca7d7dc6061aa3c2aa59bc2a63895b8e6217e413ce315949f57b0189b xf86-video-trident-1.4.0.tar.xz +sha512 86f349ccfcf7c704e77a95882f63ac92f55819a3a00388f294777762fed04dde2197dd6124cded9e787af1982fecc43ad4d0af34307845e616a73d5a2ba750b9 xf86-video-trident-1.4.0.tar.xz # Locally calculated sha256 4f065198c49eac1513b915bc4478152c21119f31a97919a6ea8f3e1d10133d15 COPYING diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk index 20ec4bbc24..53fe150420 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.8 -XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.4.0 +XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.xz +XDRIVER_XF86_VIDEO_TRIDENT_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT XDRIVER_XF86_VIDEO_TRIDENT_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xorgproto From peter at korsgaard.com Sun Feb 19 16:55:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:55:03 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: fix build with libexecinfo Message-ID: <20230219165607.95F5286034@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=364511933811d76d4b866fe3aa04adff449cf94b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with libexecinfo raised since commit d649bcd3805a26cedb30120ebbdcf12f8fbf449f: /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/10.4.0/../../../../mips-buildroot-linux-musl/bin/ld: ../lib/monkey/library/libmonkey.a(mk_utils.c.o): in function `mk_utils_stacktrace': mk_utils.c:(.text+0x1578): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index d618fdf1e2..8ba16399bb 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -56,6 +56,11 @@ FLUENT_BIT_CXXFLAGS += -fcommon FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +FLUENT_BIT_DEPENDENCIES += libexecinfo +FLUENT_BIT_LDFLAGS += -lexecinfo +endif + ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) FLUENT_BIT_DEPENDENCIES += musl-fts FLUENT_BIT_LDFLAGS += -lfts From peter at korsgaard.com Sun Feb 19 16:52:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:52:09 +0100 Subject: [Buildroot] [git commit] package/python3: bump version to 3.11.2 Message-ID: <20230219165607.49C7D86032@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be235c048f004617851d7ef752ee5f4dc2373e28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://docs.python.org/release/3.11.2/whatsnew/changelog.html#python-3-11-2 Updated license hash due to copyright year bump: https://github.com/python/cpython/commit/07d1f99e8faefcf24dab2113fb0df27202fa6f71 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/python3/python3.hash | 4 ++-- package/python3/python3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 7f079865d9..f235347efb 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f Python-3.11.1.tar.xz -sha256 d4a223f033419313218c9b8444167e91e87a5bebdb43fb8490df441df5220a8b LICENSE +sha256 29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af Python-3.11.2.tar.xz +sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index fb6dbf2e64..56fe95cd07 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From peter at korsgaard.com Sun Feb 19 16:52:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:52:46 +0100 Subject: [Buildroot] [git commit] package/clamav: security bump version to 0.103.8 Message-ID: <20230219165607.643E486034@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9fc69996bcd190e693b1af95cc44fda89028d049 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://blog.clamav.net/2023/02/clamav-01038-01052-and-101-patch.html Fixes CVE-2023-20032 & CVE-2023-20052. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index 60439400ee..27f9b16a39 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1e34c31f600cb3b5bd1bf76690590cdeebe9409b330959b1c0f77d421bb17e50 clamav-0.103.7.tar.gz +sha256 6f49da6ee927936de13d359e559d3944248e3a257d40b80b6c99ebe6fe8c8c3f clamav-0.103.8.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index dfdc416601..0f0491bf0d 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.7 +CLAMAV_VERSION = 0.103.8 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From peter at korsgaard.com Sun Feb 19 16:54:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:54:02 +0100 Subject: [Buildroot] [git commit] package/xutil_util-macros: bump version to 1.20.0 Message-ID: <20230219165607.7E7F486033@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71c51f1920deda32ea63105163fe84b20a0f9109 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003324.html Updated license hash due to copyright year bump: https://gitlab.freedesktop.org/xorg/util/macros/-/commit/cb147377e9341af05232f95814022abdecf14024 Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/xutil_util-macros/xutil_util-macros.hash | 8 ++++---- package/xutil_util-macros/xutil_util-macros.mk | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/xutil_util-macros/xutil_util-macros.hash b/package/xutil_util-macros/xutil_util-macros.hash index 30c9916dca..4fcddb7a85 100644 --- a/package/xutil_util-macros/xutil_util-macros.hash +++ b/package/xutil_util-macros/xutil_util-macros.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-January/003069.html -sha256 0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971 util-macros-1.19.3.tar.bz2 -sha512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2 util-macros-1.19.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003324.html +sha256 0b86b262dbe971edb4ff233bc370dfad9f241d09f078a3f6d5b7f4b8ea4430db util-macros-1.20.0.tar.xz +sha512 76caefb118bf1675d7b2b96e1bbb04eb9a320b02e120839e55a22ef98538ecf00d0e686a67186fc8fdc8492d277ffe3125ae8b7ac61ce4739edc0de3f468d2eb util-macros-1.20.0.tar.xz # Locally computed -sha256 489b630a75e3255485732eae3d50ff4d29d3feb66760bb3acb04f897e4d9e375 COPYING +sha256 7db0516389152a90c20ea910e8839d10204ebc25ccbc71fc7f5809dfb98e80ac COPYING diff --git a/package/xutil_util-macros/xutil_util-macros.mk b/package/xutil_util-macros/xutil_util-macros.mk index b0ce14ee5a..e2e40eb84e 100644 --- a/package/xutil_util-macros/xutil_util-macros.mk +++ b/package/xutil_util-macros/xutil_util-macros.mk @@ -4,9 +4,9 @@ # ################################################################################ -XUTIL_UTIL_MACROS_VERSION = 1.19.3 -XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2 -XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util +XUTIL_UTIL_MACROS_VERSION = 1.20.0 +XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.xz +XUTIL_UTIL_MACROS_SITE = https://xorg.freedesktop.org/archive/individual/util XUTIL_UTIL_MACROS_LICENSE = MIT XUTIL_UTIL_MACROS_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 19 16:54:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:54:46 +0100 Subject: [Buildroot] [git commit] package/freerdp: bump to version 2.10.0 Message-ID: <20230219165607.89E5586035@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=03bab7117d232c9dcd784a74eefc0e48ea51ee53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/FreeRDP/FreeRDP/releases/tag/2.10.0 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 f6adc05312..55314cfdd3 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.9.0.tar.gz.sha256 -sha256 fcf71cf5b09c5c2636341ba212f34b8fb728246ea28e08caf6cef8b4a96184b7 freerdp-2.9.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.10.0.tar.gz.sha256 +sha256 a673d3fc21911dd9f196834f2f3a23c3ebc7e5e4deab2f7686fcec879279e2c1 freerdp-2.10.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index fb0e6920cf..01c511819d 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.9.0 +FREERDP_VERSION = 2.10.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From fontaine.fabrice at gmail.com Sun Feb 19 16:56:38 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 17:56:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/modsecurity2: disable pcre Message-ID: <20230219165638.147772-1-fontaine.fabrice@gmail.com> Disable pcre to avoid the following build failure if pcre-config is found on host raised since bump to version 2.9.7 in commit 42e34cf10f9eb037aa8c48a4fb9e8f521901b983: /home/thomas/autobuild/instance-0/output-1/per-package/modsecurity2/host/bin/../lib/gcc/mips64el-buildroot-linux-gnu/11.3.0/../../../../mips64el-buildroot-linux-gnu/bin/ld: cannot find -lpcre: No such file or directory Fixes: - http://autobuild.buildroot.org/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af Signed-off-by: Fabrice Fontaine --- package/modsecurity2/modsecurity2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index c251291e64..88bbf3bb29 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -21,6 +21,7 @@ MODSECURITY2_CONF_OPTS = \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ --without-curl \ --without-lua \ + --without-pcre \ --without-yajl \ --without-ssdeep -- 2.39.0 From peter at korsgaard.com Sun Feb 19 17:01:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:01:43 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/x11r7/xwayland: new package In-Reply-To: <20230216183322.21622-1-raphael.pavlidis@gmail.com> (Raphael Pavlidis's message of "Thu, 16 Feb 2023 19:33:20 +0100") References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> <20230216183322.21622-1-raphael.pavlidis@gmail.com> Message-ID: <87zg991te0.fsf@dell.be.48ers.dk> >>>>> "Raphael" == Raphael Pavlidis writes: > XServer to run X clients under wayland > This XServer is required to run the X clients under Wayland compositor, > for example weston or wlroots based compositors. > Signed-off-by: Raphael Pavlidis > --- > Changes v1 -> v2: > - split up patches in 3 parts > - add missing depends on in wlroots Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 17:01:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:01:49 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/weston: add xwayland dependency In-Reply-To: <20230216183322.21622-2-raphael.pavlidis@gmail.com> (Raphael Pavlidis's message of "Thu, 16 Feb 2023 19:33:21 +0100") References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> <20230216183322.21622-1-raphael.pavlidis@gmail.com> <20230216183322.21622-2-raphael.pavlidis@gmail.com> Message-ID: <87v8jx1tdu.fsf@dell.be.48ers.dk> >>>>> "Raphael" == Raphael Pavlidis writes: > If the XWayland support is enabled then build the corresponding XServer. > Signed-off-by: Raphael Pavlidis Committed, thanks. -- Bye, Peter Korsgaard From ju.o at free.fr Sun Feb 19 17:04:25 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 18:04:25 +0100 Subject: [Buildroot] [PATCH v2, 1/3] package/libjxl: fix build with libjpeg In-Reply-To: <20230219164822.142283-1-fontaine.fabrice@gmail.com> References: <20230219164822.142283-1-fontaine.fabrice@gmail.com> Message-ID: <6d3f617e396aac69a2d150436eb98741@free.fr> Hi Fabrice, Thanks for the quick update! On 19/02/2023 17:48, Fabrice Fontaine wrote: > Building with libjpeg will raise the following build failure on some > architectures since the addition of the package in commit > e648d399d8bd609697e78f13f7fa76be06d91a57: > > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In > function 'jxl::Status > jxl::extras::{anonymous}::EncodeWithLibJpeg(const > jxl::extras::PackedImage&, const JxlBasicInfo&, const > std::vector&, std::vector, size_t, const > string&, std::vector*)': > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: > error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka > 'unsigned int*'} [-fpermissive] > 126 | jpeg_mem_dest(&cinfo, &buffer, &size); > | ^~~~~ > | | > | long unsigned int* > > Upstream advocates to use jpeg-turbo: > https://github.com/libjxl/libjxl/issues/1802 > > Fixes: > - > http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 > Reviewed-by: Julien Olivain > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Julien Olivain: > - Keep tools enabled and only disable jpeg subset of tools if > jpeg-turbo is not available > > package/libjxl/libjxl.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk > index cc24ba258c..1257928efd 100644 > --- a/package/libjxl/libjxl.mk > +++ b/package/libjxl/libjxl.mk > @@ -30,4 +30,11 @@ LIBJXL_CONF_OPTS = \ > -DJPEGXL_ENABLE_SJPEG=OFF \ > -DJPEGXL_ENABLE_SKCMS=OFF > > +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) > +LIBJXL_DEPENDENCIES += jpeg-turbo > +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=OFF > +else > +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=ON > +endif > + > $(eval $(cmake-package)) Best regards, Julien. From ju.o at free.fr Sun Feb 19 17:05:08 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 18:05:08 +0100 Subject: [Buildroot] [PATCH v2, 2/3] package/libjxl: disable benchmark and tests In-Reply-To: <20230219164822.142283-2-fontaine.fabrice@gmail.com> References: <20230219164822.142283-1-fontaine.fabrice@gmail.com> <20230219164822.142283-2-fontaine.fabrice@gmail.com> Message-ID: <3be3f2958ee3260c0ef88382b92ccd3d@free.fr> Hi Fabrice, On 19/02/2023 17:48, Fabrice Fontaine wrote: > Disable benchmark and tests which are enabled by default since the > addition of the package in commit > e648d399d8bd609697e78f13f7fa76be06d91a57 > Reviewed-by: Julien Olivain > Signed-off-by: Fabrice Fontaine > --- > package/libjxl/libjxl.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk > index 1257928efd..b4dfbecf82 100644 > --- a/package/libjxl/libjxl.mk > +++ b/package/libjxl/libjxl.mk > @@ -23,7 +23,9 @@ endif > LIBJXL_CONF_OPTS = \ > -DJPEGXL_BUNDLE_LIBPNG=OFF \ > -DJPEGXL_BUNDLE_SKCMS=OFF \ > + -DJPEGXL_ENABLE_BENCHMARK=OFF \ > -DJPEGXL_ENABLE_DOXYGEN=OFF \ > + -DJPEGXL_ENABLE_EXAMPLES=OFF \ > -DJPEGXL_ENABLE_JNI=OFF \ > -DJPEGXL_ENABLE_MANPAGES=OFF \ > -DJPEGXL_ENABLE_OPENEXR=OFF \ Best regards, Julien. From ju.o at free.fr Sun Feb 19 17:07:12 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 18:07:12 +0100 Subject: [Buildroot] [PATCH v2, 3/3] package/libjxl: security bump to version 0.8.1 In-Reply-To: <20230219164822.142283-3-fontaine.fabrice@gmail.com> References: <20230219164822.142283-1-fontaine.fabrice@gmail.com> <20230219164822.142283-3-fontaine.fabrice@gmail.com> Message-ID: <701823a1b87f5b99a6bdb21aa8b573d7@free.fr> Hi Fabrice, Thanks for the quick update! I successfully tested with the command: support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_libjxl On 19/02/2023 17:48, Fabrice Fontaine wrote: > Security: Fix OOB read in exif.h > > https://github.com/libjxl/libjxl/releases/tag/v0.8.1 > https://github.com/libjxl/libjxl/releases/tag/v0.8.0 > Tested-by: Julien Olivain Reviewed-by: Julien Olivain > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Julien Olivain): > - Add patch to fix crash > > ...entation-fault-when-JPEG-is-disabled.patch | 44 +++++++++++++++++++ > package/libjxl/libjxl.hash | 2 +- > package/libjxl/libjxl.mk | 2 +- > 3 files changed, 46 insertions(+), 2 deletions(-) > create mode 100644 > package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch > > diff --git > a/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch > b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch > new file mode 100644 > index 0000000000..3d709c956b > --- /dev/null > +++ > b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch > @@ -0,0 +1,44 @@ > +From 504f35c8204248ae6f97278e8b7c6cc5853a1b94 Mon Sep 17 00:00:00 2001 > +From: Julien Olivain > +Date: Fri, 10 Feb 2023 21:31:30 +0100 > +Subject: [PATCH] djxl: fix segmentation fault when JPEG is disabled > + > +When libjxl is compiled without JPEG support, by configuring for > example > +with: > + > + cmake -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE ... > + > +djxl crashes with a segmentation fault at: > +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L367 > + > +The crash can be reproduced with the sequence: > + > + gm convert IMAGE:LOGO ref.ppm > + cjxl ref.ppm enc.jxl > + djxl enc.jxl dec.ppm > + > +The crash happen because opt_jpeg_quality_id does not get > +initialized at: > +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L107 > + > +This commit fixes the crash by adding a test on opt_jpeg_quality_id. > + > +Signed-off-by: Julien Olivain > +[Retrieved from: > +https://github.com/libjxl/libjxl/pull/2178/commits/504f35c8204248ae6f97278e8b7c6cc5853a1b94] > +--- > + tools/djxl_main.cc | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/tools/djxl_main.cc b/tools/djxl_main.cc > +index b755301fcb..42b889e7ce 100644 > +--- a/tools/djxl_main.cc > ++++ b/tools/djxl_main.cc > +@@ -370,6 +370,7 @@ int main(int argc, const char* argv[]) { > + args.color_space = force_colorspace; > + } > + if (codec == jxl::extras::Codec::kPNM && extension != ".pfm" && > ++ args.opt_jpeg_quality_id != -1 && > + !cmdline.GetOption(args.opt_jpeg_quality_id)->matched()) { > + args.bits_per_sample = 0; > + } > diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash > index e71d32e61d..6b4c9d8d0a 100644 > --- a/package/libjxl/libjxl.hash > +++ b/package/libjxl/libjxl.hash > @@ -1,4 +1,4 @@ > # Locally computed: > -sha256 > 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e > libjxl-0.7.0.tar.gz > +sha256 > 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 > libjxl-0.8.1.tar.gz > sha256 > 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede > LICENSE > sha256 > 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 > PATENTS > diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk > index b4dfbecf82..f603327bf6 100644 > --- a/package/libjxl/libjxl.mk > +++ b/package/libjxl/libjxl.mk > @@ -4,7 +4,7 @@ > # > > ################################################################################ > > -LIBJXL_VERSION = 0.7.0 > +LIBJXL_VERSION = 0.8.1 > LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) > LIBJXL_LICENSE = BSD-3-Clause > LIBJXL_LICENSE_FILES = LICENSE PATENTS Best regards, Julien. From peter at korsgaard.com Sun Feb 19 17:10:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:10:39 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/wlroots: add XWayland support In-Reply-To: <20230216183322.21622-3-raphael.pavlidis@gmail.com> (Raphael Pavlidis's message of "Thu, 16 Feb 2023 19:33:22 +0100") References: <20230215143534.19834-1-raphael.pavlidis@gmail.com> <20230216183322.21622-1-raphael.pavlidis@gmail.com> <20230216183322.21622-3-raphael.pavlidis@gmail.com> Message-ID: <87r0ul1sz4.fsf@dell.be.48ers.dk> >>>>> "Raphael" == Raphael Pavlidis writes: > The new option enables the XWayland support, so X11 application can be > running on a wlroots based compositor. Also, do not enable the XWayland > support if the X11 backend is active. > Signed-off-by: Raphael Pavlidis Slightly tweaked the commit message and committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 19 17:16:00 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 18:16:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmodsecurity: needs dynamic library with libcurl, libssh2 and mbedtls Message-ID: <20230219171600.481355-1-fontaine.fabrice@gmail.com> Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as mbedtls can be pulled in libcurl through libssh2 resulting in the following build failure: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init': md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a Signed-off-by: Fabrice Fontaine --- package/libmodsecurity/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index b15d808759..027c62716c 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_LIBMODSECURITY depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity embeds several mbedtls source files - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) + depends on !(BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS))) select BR2_PACKAGE_PCRE2 help Libmodsecurity is one component of the ModSecurity @@ -21,4 +22,5 @@ comment "libmodsecurity needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS comment "libmodsecurity needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS)) -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 17:19:48 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 18:19:48 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/libmodsecurity: needs dynamic library with libcurl, libssh2 and mbedtls Message-ID: <20230219171948.483505-1-fontaine.fabrice@gmail.com> Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as mbedtls can be pulled in libcurl through libssh2 resulting in the following build failure: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init': md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Update nginx-modsecurity package/libmodsecurity/Config.in | 6 ++++-- package/nginx-modsecurity/Config.in | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index b15d808759..027c62716c 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_LIBMODSECURITY depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity embeds several mbedtls source files - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) + depends on !(BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS))) select BR2_PACKAGE_PCRE2 help Libmodsecurity is one component of the ModSecurity @@ -21,4 +22,5 @@ comment "libmodsecurity needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS comment "libmodsecurity needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS)) diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in index 5cbe57a866..f3f883ab5a 100644 --- a/package/nginx-modsecurity/Config.in +++ b/package/nginx-modsecurity/Config.in @@ -3,7 +3,9 @@ config BR2_PACKAGE_NGINX_MODSECURITY depends on BR2_PACKAGE_NGINX_HTTP depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) # libmodsecurity + # libmodsecurity + depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS))) select BR2_PACKAGE_LIBMODSECURITY help The ModSecurity-nginx connector is the connection @@ -18,4 +20,5 @@ comment "nginx-modsecurity needs a toolchain w/ C++, threads" comment "nginx-modsecurity needs a toolchain w/ dynamic library" depends on BR2_PACKAGE_NGINX_HTTP - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS)) -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 17:24:40 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 18:24:40 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/libmodsecurity: needs dynamic library with libcurl, libssh2 and mbedtls Message-ID: <20230219172440.519540-1-fontaine.fabrice@gmail.com> Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as mbedtls can be pulled in libcurl through libssh2 resulting in the following build failure: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init': md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a Signed-off-by: Fabrice Fontaine --- Changes v2 -> v3: - Fix syntax Changes v1 -> v2: - Update nginx-modsecurity package/libmodsecurity/Config.in | 6 ++++-- package/nginx-modsecurity/Config.in | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index b15d808759..027c62716c 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_LIBMODSECURITY depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity embeds several mbedtls source files - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) + depends on !(BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS))) select BR2_PACKAGE_PCRE2 help Libmodsecurity is one component of the ModSecurity @@ -21,4 +22,5 @@ comment "libmodsecurity needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS comment "libmodsecurity needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS)) diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in index 5cbe57a866..96ef7e88d5 100644 --- a/package/nginx-modsecurity/Config.in +++ b/package/nginx-modsecurity/Config.in @@ -3,7 +3,9 @@ config BR2_PACKAGE_NGINX_MODSECURITY depends on BR2_PACKAGE_NGINX_HTTP depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) # libmodsecurity + # libmodsecurity + depends on !(BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS))) select BR2_PACKAGE_LIBMODSECURITY help The ModSecurity-nginx connector is the connection @@ -18,4 +20,5 @@ comment "nginx-modsecurity needs a toolchain w/ C++, threads" comment "nginx-modsecurity needs a toolchain w/ dynamic library" depends on BR2_PACKAGE_NGINX_HTTP - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on BR2_STATIC_LIBS && (BR2_PACKAGE_LIBCURL_MBEDTLS \ + || (BR2_PACKAGE_LIBCURL && BR2_PACKAGE_LIBSSH2_MBEDTLS)) -- 2.39.0 From peter at korsgaard.com Sun Feb 19 17:30:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:30:27 +0100 Subject: [Buildroot] [PATCH v2] package/lighttpd: bump to version 1.4.69 In-Reply-To: <20230216102556.3047136-1-thomas.devoogdt@barco.com> (Thomas Devoogdt's message of "Thu, 16 Feb 2023 11:25:56 +0100") References: <20230216102556.3047136-1-thomas.devoogdt@barco.com> Message-ID: <87mt591s24.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > Changelog: > - https://www.lighttpd.net/2023/1/3/1.4.68/ > - https://www.lighttpd.net/2023/2/10/1.4.69/ > In this commit: > - rebased patch & dropped server.use-ipv6 option [1] > - fix changed meson options [2] > [1]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/376d20f1617f2c0202fb415e4cc66d3f780db5ca > [2]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/6b31f76cd9b36b6033607181238fbf41c5b81e07 > Signed-off-by: Thomas Devoogdt > --- > v2: fix git message url links Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 19 17:32:08 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 18:32:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/nginx-naxsi: fix build with pcre2 Message-ID: <20230219173208.613324-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of nginx to version 1.22.1 in commit 722b84eafa5e3d9540e0a80bae0c971a3a778358: /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c: In function 'ngx_http_process_basic_rule_buffer': /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c:205:61: error: invalid use of incomplete typedef 'ngx_regex_t' {aka 'struct pcre2_real_code_8'} 205 | (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, | ^~ Fixes: - http://autobuild.buildroot.org/results/7fff888bd36710e2d2f5bb39a38597e8c04305ce Signed-off-by: Fabrice Fontaine --- .../0001-PCRE2-compatibility.patch | 221 ++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 package/nginx-naxsi/0001-PCRE2-compatibility.patch diff --git a/package/nginx-naxsi/0001-PCRE2-compatibility.patch b/package/nginx-naxsi/0001-PCRE2-compatibility.patch new file mode 100644 index 0000000000..aa3df4dff7 --- /dev/null +++ b/package/nginx-naxsi/0001-PCRE2-compatibility.patch @@ -0,0 +1,221 @@ +From 2937c44276cba21601ade4e265d32515f570d68c Mon Sep 17 00:00:00 2001 +From: Danila Vershinin +Date: Thu, 16 Jun 2022 01:22:23 +0300 +Subject: [PATCH] PCRE2 compatibility (#587) + +* Fix: use pcre2 when building with nginx >= 1.21.5 + +I've tried to compile naxsi 1.3 as module for nginx 1.21.6, and got the error: + +error: invalid use of incomplete typedef 'ngx_regex_t' {aka 'struct pcre2_real_code_8'} + 205 | (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, + +I found this issue report: Ref: https://github.com/nbs-system/naxsi/issues/580 +then i tried to solve the pcre2 compatibility issue. + +I've included an helper function that is 'copied' from: https://github.com/nginx/nginx/blob/master/src/core/ngx_regex.c#L393 +that it is called in place of 'pcre_exec' when nginx_version >= 1021005 + +Not sure if this is the best solution, but I managed to build naxsi 1.3 as module for nginx 1.21.6 succesfully, and it seems to work well. + +I'm not used to develop in C anymore (since 25 years ago, at least!), but I hope that this patch I made can help anybody else. + +* Added a check for nginx_version >= 1021005 + +Added a check for nginx_version >= 1021005 to avoid helper function definition on older versions + +* Use NGX_PCRE2 conditional + +Update naxsi.h + +Don't include pcre.h in order for compilation to work both against pcre and pcre2 + +Fix pcre vs pcre2 compilation + +Co-authored-by: laluigino <99279306+laluigino at users.noreply.github.com> +[Retrieved from: +https://github.com/nbs-system/naxsi/commit/2937c44276cba21601ade4e265d32515f570d68c] +Signed-off-by: Fabrice Fontaine +--- + naxsi_src/naxsi.h | 1 - + naxsi_src/naxsi_config.c | 9 ++++- + naxsi_src/naxsi_runtime.c | 82 ++++++++++++++++++++++++++++++++++++++- + naxsi_src/naxsi_utils.c | 8 ++++ + 4 files changed, 96 insertions(+), 4 deletions(-) + +diff --git a/naxsi_src/naxsi.h b/naxsi_src/naxsi.h +index 53df1bd8..b2f5c1a5 100644 +--- a/naxsi_src/naxsi.h ++++ b/naxsi_src/naxsi.h +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + + extern ngx_module_t ngx_http_naxsi_module; + +diff --git a/naxsi_src/naxsi_config.c b/naxsi_src/naxsi_config.c +index 4ea15567..6d2f0e23 100644 +--- a/naxsi_src/naxsi_config.c ++++ b/naxsi_src/naxsi_config.c +@@ -322,8 +322,11 @@ naxsi_zone(ngx_conf_t* r, ngx_str_t* tmp, ngx_http_rule_t* rule) + + custom_rule->target_rx = ngx_pcalloc(r->pool, sizeof(ngx_regex_compile_t)); + return_value_if(!custom_rule->target_rx, NGX_CONF_ERROR); +- ++#if (NGX_PCRE2) ++ custom_rule->target_rx->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + custom_rule->target_rx->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + custom_rule->target_rx->pattern = custom_rule->target; + custom_rule->target_rx->pool = r->pool; + custom_rule->target_rx->err.len = 0; +@@ -442,7 +445,11 @@ naxsi_rx(ngx_conf_t* r, ngx_str_t* tmp, ngx_http_rule_t* rule) + ha.len = tmp->len - strlen(RX_T); + rgc = ngx_pcalloc(r->pool, sizeof(ngx_regex_compile_t)); + return_value_if(!rgc, NGX_CONF_ERROR); ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = ha; + rgc->pool = r->pool; + rgc->err.len = 0; +diff --git a/naxsi_src/naxsi_runtime.c b/naxsi_src/naxsi_runtime.c +index d548ce37..784852b0 100644 +--- a/naxsi_src/naxsi_runtime.c ++++ b/naxsi_src/naxsi_runtime.c +@@ -181,6 +181,75 @@ ngx_http_naxsi_rawbody_parse(ngx_http_request_ctx_t* ctx, + unsigned char* + ngx_utf8_check(ngx_str_t* str); + ++#if defined nginx_version && (nginx_version >= 1021005) ++/* ++ * variables to use pcre2 ++ */ ++static pcre2_match_data *ngx_pcre2_match_data; ++static ngx_uint_t ngx_pcre2_match_data_size; ++ ++/* ++ * helper function to use pcre2 ++ */ ++ngx_int_t ++ngx_pcre2_exec(ngx_regex_t *re, unsigned char* str, unsigned int len, ngx_int_t tmp_idx, int *captures, ngx_uint_t size) ++{ ++ size_t *ov; ++ ngx_int_t rc; ++ ngx_uint_t n, i; ++ ++ /* ++ * The pcre2_match() function might allocate memory for backtracking ++ * frames, typical allocations are from 40k and above. So the allocator ++ * is configured to do direct allocations from heap during matching. ++ */ ++ ++ if (ngx_pcre2_match_data == NULL ++ || size > ngx_pcre2_match_data_size) ++ { ++ /* ++ * Allocate a match data if not yet allocated or smaller than ++ * needed. ++ */ ++ ++ if (ngx_pcre2_match_data) { ++ pcre2_match_data_free(ngx_pcre2_match_data); ++ } ++ ++ ngx_pcre2_match_data_size = size; ++ ngx_pcre2_match_data = pcre2_match_data_create(size / 3, NULL); ++ ++ if (ngx_pcre2_match_data == NULL) { ++ rc = PCRE2_ERROR_NOMEMORY; ++ goto failed; ++ } ++ } ++ ++ rc = pcre2_match(re, str, len, tmp_idx, 0, ngx_pcre2_match_data, NULL); ++ ++ if (rc < 0) { ++ goto failed; ++ } ++ ++ n = pcre2_get_ovector_count(ngx_pcre2_match_data); ++ ov = pcre2_get_ovector_pointer(ngx_pcre2_match_data); ++ ++ if (n > size / 3) { ++ n = size / 3; ++ } ++ ++ for (i = 0; i < n; i++) { ++ captures[i * 2] = ov[i * 2]; ++ captures[i * 2 + 1] = ov[i * 2 + 1]; ++ } ++ ++failed: ++ ++ return rc; ++ ++} ++#endif ++ + /* + ** in : string to inspect, associated rule + ** does : apply the rule on the string, return 1 if matched, +@@ -201,7 +270,14 @@ ngx_http_process_basic_rule_buffer(ngx_str_t* str, ngx_http_rule_t* rl, ngx_int_ + tmp_idx = 0; + len = str->len; + while +-#if defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) ++#if (NGX_PCRE2) ++ (tmp_idx < len && (match = ngx_pcre2_exec(rl->br->rx->regex, ++ str->data, ++ str->len, ++ tmp_idx, ++ captures, ++ 30)) >= 0) ++#elif defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) + (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, + 0, + (const char*)str->data, +@@ -496,7 +572,9 @@ ngx_http_naxsi_pcre_wrapper(ngx_regex_compile_t* rx, unsigned char* str, unsigne + int match; + int captures[30]; + +-#if defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) ++#if (NGX_PCRE2) ++ match = ngx_pcre2_exec(rx->regex, str, len, 0, captures, 1); ++#elif defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) + match = pcre_exec(rx->regex->code, 0, (const char*)str, len, 0, 0, captures, 1); + #elif defined nginx_version && (nginx_version > 1001011) + match = pcre_exec(rx->regex->pcre, 0, (const char*)str, len, 0, 0, captures, 1); +diff --git a/naxsi_src/naxsi_utils.c b/naxsi_src/naxsi_utils.c +index e3d6f185..d2ecedec 100644 +--- a/naxsi_src/naxsi_utils.c ++++ b/naxsi_src/naxsi_utils.c +@@ -800,7 +800,11 @@ ngx_http_naxsi_create_hashtables_n(ngx_http_naxsi_loc_conf_t* dlc, ngx_conf_t* c + ngx_pcalloc(cf->pool, sizeof(ngx_regex_compile_t)); + rgc = custloc_array(curr_r->br->custom_locations->elts)[name_idx].target_rx; + if (rgc) { ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = custloc_array(curr_r->br->custom_locations->elts)[name_idx].target; + rgc->pool = cf->pool; + rgc->err.len = 0; +@@ -816,7 +820,11 @@ ngx_http_naxsi_create_hashtables_n(ngx_http_naxsi_loc_conf_t* dlc, ngx_conf_t* c + ngx_pcalloc(cf->pool, sizeof(ngx_regex_compile_t)); + rgc = custloc_array(curr_r->br->custom_locations->elts)[uri_idx].target_rx; + if (rgc) { ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = custloc_array(curr_r->br->custom_locations->elts)[uri_idx].target; + rgc->pool = cf->pool; + rgc->err.len = 0; -- 2.39.0 From peter at korsgaard.com Sun Feb 19 17:00:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:00:13 +0100 Subject: [Buildroot] [git commit] package/weston: add xwayland dependency Message-ID: <20230219173225.298DC8607D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df4f7f8e85274d5bde29171203c7eb95f4903765 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master If the XWayland support is enabled then build the corresponding XServer. Signed-off-by: Raphael Pavlidis Signed-off-by: Peter Korsgaard --- package/weston/Config.in | 10 +++++++++- package/weston/weston.mk | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 3b4e932b7d..09119edaaa 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -109,16 +109,24 @@ comment "X11 (nested) compositor needs X.org enabled" config BR2_PACKAGE_WESTON_XWAYLAND bool "XWayland support" - depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_LIBEPOXY + depends on BR2_PACKAGE_XORG7 # xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_XWAYLAND comment "XWayland support needs libepoxy and X.org enabled" depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + # Weston needs at least one shell; this can be one of the bundled ones, # below, of from a third-party package, which should then select this. config BR2_PACKAGE_WESTON_HAS_SHELL diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 5e71473640..01f84178b2 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -123,7 +123,7 @@ WESTON_CONF_OPTS += -Dbackend-default=$(call qstrip,$(BR2_PACKAGE_WESTON_DEFAULT ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) WESTON_CONF_OPTS += -Dxwayland=true -WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor +WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor xwayland else WESTON_CONF_OPTS += -Dxwayland=false endif From peter at korsgaard.com Sun Feb 19 17:10:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:10:18 +0100 Subject: [Buildroot] [git commit] package/wlroots: add XWayland support Message-ID: <20230219173225.3E99C8607E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5945a71d87c988cb6b864600dd8dbecae0ef30fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The new option enables the XWayland support, so X11 application can be running on a wlroots based compositor. Also, do not enable the XWayland support if the X11 backend is active, as it is unrelated to it. Signed-off-by: Raphael Pavlidis Signed-off-by: Peter Korsgaard --- package/wlroots/Config.in | 19 +++++++++++++++++++ package/wlroots/wlroots.mk | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 84a4ef846e..b2d3f3c3b1 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -41,4 +41,23 @@ config BR2_PACKAGE_WLROOTS_X11 help Support Wayland sessions nested inside a X11 window +config BR2_PACKAGE_WLROOTS_XWAYLAND + bool "XWayland support" + depends on BR2_PACKAGE_XORG7 # libxcb, xcb-util-wm, xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_XWAYLAND + help + Support for running X11 applications under wayland + +comment "XWayland support needs X.org enabled" + depends on !BR2_PACKAGE_XORG7 + +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + endif diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 4f14d20b11..5b930a51be 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -30,8 +30,12 @@ WLROOTS_BACKENDS = libinput drm ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) WLROOTS_BACKENDS += x11 -WLROOTS_CONF_OPTS += -Dxwayland=enabled WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 +endif + +ifeq ($(BR2_PACKAGE_WLROOTS_XWAYLAND),y) +WLROOTS_CONF_OPTS += -Dxwayland=enabled +WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xwayland else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif From peter at korsgaard.com Sun Feb 19 16:57:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:57:32 +0100 Subject: [Buildroot] [git commit] package/x11r7/xwayland: new package Message-ID: <20230219173225.15D2D8607C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05c3177493aa8447d5cb568c8c13e0c09eded18b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master XServer to run X clients under wayland This XServer is required to run the X clients under Wayland compositor, for example weston or wlroots based compositors. Signed-off-by: Raphael Pavlidis Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/x11r7/Config.in | 1 + package/x11r7/xwayland/Config.in | 26 ++++++++++ package/x11r7/xwayland/xwayland.hash | 6 +++ package/x11r7/xwayland/xwayland.mk | 94 ++++++++++++++++++++++++++++++++++++ 5 files changed, 128 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7894b10e38..a7a0bb14d1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2426,6 +2426,7 @@ F: support/testing/tests/package/test_python_s3transfer.py N: Raphael Pavlidis F: package/slirp4netns/ F: package/sway/ +F: package/x11r7/xwayland/ N: Refik Tuzakli F: package/freescale-imx/ diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 365de34c98..4de8922e0d 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -12,6 +12,7 @@ menuconfig BR2_PACKAGE_XORG7 if BR2_PACKAGE_XORG7 menu "X11R7 Servers" source package/x11r7/xserver_xorg-server/Config.in + source package/x11r7/xwayland/Config.in endmenu menu "X11R7 Libraries" source package/x11r7/libxcb/Config.in diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in new file mode 100644 index 0000000000..4f14f2cc36 --- /dev/null +++ b/package/x11r7/xwayland/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_XWAYLAND + bool "xwayland server" + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland + # We need a SHA1 implementation. If either openssl or + # libgcrypt are already part of the build, we'll use one of + # them, otherwise, use the small libsha1 library. + select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_XLIB_LIBXCVT + select BR2_PACKAGE_XLIB_LIBXFONT2 + select BR2_PACKAGE_XLIB_LIBXKBFILE + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_XTRANS + select BR2_PACKAGE_XORGPROTO + help + X.Org X server to run X clients under wayland + + http://xorg.freedesktop.org + +comment "xwayland needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash new file mode 100644 index 0000000000..0c476f3183 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.hash @@ -0,0 +1,6 @@ +# From https://lists.x.org/archives/xorg-announce/2023-February/003322.html +sha256 d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73 xwayland-22.1.8.tar.xz +sha512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a xwayland-22.1.8.tar.xz + +# Locally calculated +sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk new file mode 100644 index 0000000000..174b440b07 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.mk @@ -0,0 +1,94 @@ +################################################################################ +# +# xwayland +# +################################################################################ + +XWAYLAND_VERSION = 22.1.8 +XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz +XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver +XWAYLAND_LICENSE = MIT +XWAYLAND_LICENSE_FILES = COPYING +XWAYLAND_INSTALL_STAGING = YES +XWAYLAND_DEPENDENCIES = \ + pixman \ + wayland \ + wayland-protocols \ + xlib_libxcvt \ + xlib_libXfont2 \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_xtrans \ + xorgproto +XWAYLAND_CONF_OPTS = \ + -Dxwayland_eglstream=false \ + -Dxvfb=false \ + -Ddefault_font_path=/usr/share/fonts/X11/ \ + -Ddtrace=false \ + -Ddocs=false + +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY),yy) +XWAYLAND_CONF_OPTS += -Dglamor=true +XWAYLAND_DEPENDENCIES += libdrm libepoxy +else +XWAYLAND_CONF_OPTS += -Dglamor=false +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XWAYLAND_CONF_OPTS += -Dglx=true +XWAYLAND_DEPENDENCIES += libgl +else +XWAYLAND_CONF_OPTS += -Dglx=false +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXDMCP),y) +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=true \ + -Dxdm-auth-1=true +XWAYLAND_DEPENDENCIES += xlib_libXdmcp +else +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=false \ + -Dxdm-auth-1=false +endif + +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +XWAYLAND_CONF_OPTS += -Dsecure-rpc=true +XWAYLAND_DEPENDENCIES += libtirpc +else +XWAYLAND_CONF_OPTS += -Dsecure-rpc=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX)$(BR2_PACKAGE_AUDIT),yy) +XWAYLAND_CONF_OPTS += -Dxselinux=true +XWAYLAND_DEPENDENCIES += libselinux audit +else +XWAYLAND_CONF_OPTS += -Dxselinux=false +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +XWAYLAND_CONF_OPTS += -Dsha1=libcrypto +XWAYLAND_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +XWAYLAND_CONF_OPTS += -Dsha1=libgcrypt +XWAYLAND_DEPENDENCIES += libgcrypt +else +XWAYLAND_CONF_OPTS += -Dsha1=libsha1 +XWAYLAND_DEPENDENCIES += libsha1 +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_LIBDRM),yy) +XWAYLAND_CONF_OPTS += -Ddri3=true +XWAYLAND_DEPENDENCIES += xlib_libxshmfence libdrm +else +XWAYLAND_CONF_OPTS += -Ddri3=false +endif + +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +XWAYLAND_CONF_OPTS += -Dlibunwind=true +XWAYLAND_DEPENDENCIES += libunwind +else +XWAYLAND_CONF_OPTS += -Dlibunwind=false +endif + +$(eval $(meson-package)) From peter at korsgaard.com Sun Feb 19 17:11:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:11:02 +0100 Subject: [Buildroot] [git commit] package/lighttpd: bump to version 1.4.69 Message-ID: <20230219173225.5277F8607C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c9622ae5084473b9eeb15b04673d081f5c9fa11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: - https://www.lighttpd.net/2023/1/3/1.4.68/ - https://www.lighttpd.net/2023/2/10/1.4.69/ In this commit: - rebased patch & dropped server.use-ipv6 option [1] - fix changed meson options [2] [1]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/376d20f1617f2c0202fb415e4cc66d3f780db5ca [2]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/6b31f76cd9b36b6033607181238fbf41c5b81e07 Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...default-lighttpd-configuration-file-to-ha.patch | 33 +++++------ package/lighttpd/lighttpd.hash | 4 +- package/lighttpd/lighttpd.mk | 64 +++++++++++----------- 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch index 1a887655b8..2eab2a84e5 100644 --- a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +++ b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch @@ -1,11 +1,11 @@ -From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001 +From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Dec 2021 22:07:17 +0100 Subject: [PATCH] Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames - * Disable IPv6 + * Disable IPv6 (Dropped since 1.4.68) * Do not setuid to a user that doesn't exist on the system * Change the network backend to writev since linux-sendfile fails on buildroot @@ -13,13 +13,15 @@ Signed-off-by: Maxime Ripard Signed-off-by: Simon Dawson [Gustavo: update for 1.4.37] Signed-off-by: Gustavo Zacarias +[Thomas: update for 1.4.69 - drop server.use-ipv6] +Signed-off-by: Thomas Devoogdt --- doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) + doc/config/lighttpd.conf | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf -index e685d43..92cff4f 100644 +index e685d437..92cff4f0 100644 --- a/doc/config/conf.d/access_log.conf +++ b/doc/config/conf.d/access_log.conf @@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) @@ -32,7 +34,7 @@ index e685d43..92cff4f 100644 ## ## The default format produces CLF compatible output. diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index 495d2a1..c3e1446 100644 +index d45a284d..4e926d5a 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -13,8 +13,8 @@ @@ -46,16 +48,7 @@ index 495d2a1..c3e1446 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ server.port = 80 - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" +@@ -97,8 +97,8 @@ server.port = 80 ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -66,7 +59,7 @@ index 495d2a1..c3e1446 100644 ## ## Enable lighttpd to serve requests on sockets received from systemd -@@ -118,7 +118,7 @@ server.groupname = "lighttpd" +@@ -114,7 +114,7 @@ server.groupname = "lighttpd" ## ## Document root ## @@ -75,7 +68,7 @@ index 495d2a1..c3e1446 100644 ## ## The value for the "Server:" response field. -@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid" +@@ -140,7 +140,7 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## @@ -84,7 +77,7 @@ index 495d2a1..c3e1446 100644 ## ## If you want to log to syslog you have to unset the -@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf" +@@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf" ## and write(). Every modern OS provides its own syscall to help network ## servers transfer files as fast as possible ## @@ -94,5 +87,5 @@ index 495d2a1..c3e1446 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.34.1 +2.39.0 diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 8353857ad9..29bf5124b6 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.67.sha512sum -sha512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627 lighttpd-1.4.67.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum +sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index d3440040fb..ca2035b6b3 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).67 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -13,49 +13,49 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=false \ - -Dwith_fam=false \ + -Dwith_dbi=disabled \ + -Dwith_fam=disabled \ -Dwith_gnutls=false \ - -Dwith_libev=false \ - -Dwith_libunwind=false \ + -Dwith_libev=disabled \ + -Dwith_libunwind=disabled \ -Dwith_mbedtls=false \ -Dwith_nettle=false \ -Dwith_nss=false \ - -Dwith_pcre=false \ - -Dwith_sasl=false \ + -Dwith_pcre=disabled \ + -Dwith_sasl=disabled \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=true \ + -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli -LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +LIGHTTPD_CONF_OPTS += -Dwith_brotli=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +LIGHTTPD_CONF_OPTS += -Dwith_bzip=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 -LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +LIGHTTPD_CONF_OPTS += -Dwith_krb5=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) LIGHTTPD_DEPENDENCIES += openldap -LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +LIGHTTPD_CONF_OPTS += -Dwith_ldap=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) @@ -67,16 +67,16 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) LIGHTTPD_DEPENDENCIES += libmaxminddb -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mysql -LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) @@ -88,9 +88,9 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += -Dwith_pam=true +LIGHTTPD_CONF_OPTS += -Dwith_pam=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pam=false +LIGHTTPD_CONF_OPTS += -Dwith_pam=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) @@ -102,36 +102,36 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) LIGHTTPD_DEPENDENCIES += postgresql -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=enabled ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=enabled LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=disabled endif else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true +LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) LIGHTTPD_DEPENDENCIES += zstd -LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +LIGHTTPD_CONF_OPTS += -Dwith_zstd=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +LIGHTTPD_CONF_OPTS += -Dwith_zstd=disabled endif define LIGHTTPD_INSTALL_CONFIG From fontaine.fabrice at gmail.com Sun Feb 19 17:35:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 18:35:36 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/nginx-naxsi: fix build with pcre2 Message-ID: <20230219173536.615233-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of nginx to version 1.22.1 in commit 722b84eafa5e3d9540e0a80bae0c971a3a778358: /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c: In function 'ngx_http_process_basic_rule_buffer': /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c:205:61: error: invalid use of incomplete typedef 'ngx_regex_t' {aka 'struct pcre2_real_code_8'} 205 | (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, | ^~ Fixes: - http://autobuild.buildroot.org/results/7fff888bd36710e2d2f5bb39a38597e8c04305ce Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix patch number .../0002-PCRE2-compatibility.patch | 221 ++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 package/nginx-naxsi/0002-PCRE2-compatibility.patch diff --git a/package/nginx-naxsi/0002-PCRE2-compatibility.patch b/package/nginx-naxsi/0002-PCRE2-compatibility.patch new file mode 100644 index 0000000000..aa3df4dff7 --- /dev/null +++ b/package/nginx-naxsi/0002-PCRE2-compatibility.patch @@ -0,0 +1,221 @@ +From 2937c44276cba21601ade4e265d32515f570d68c Mon Sep 17 00:00:00 2001 +From: Danila Vershinin +Date: Thu, 16 Jun 2022 01:22:23 +0300 +Subject: [PATCH] PCRE2 compatibility (#587) + +* Fix: use pcre2 when building with nginx >= 1.21.5 + +I've tried to compile naxsi 1.3 as module for nginx 1.21.6, and got the error: + +error: invalid use of incomplete typedef 'ngx_regex_t' {aka 'struct pcre2_real_code_8'} + 205 | (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, + +I found this issue report: Ref: https://github.com/nbs-system/naxsi/issues/580 +then i tried to solve the pcre2 compatibility issue. + +I've included an helper function that is 'copied' from: https://github.com/nginx/nginx/blob/master/src/core/ngx_regex.c#L393 +that it is called in place of 'pcre_exec' when nginx_version >= 1021005 + +Not sure if this is the best solution, but I managed to build naxsi 1.3 as module for nginx 1.21.6 succesfully, and it seems to work well. + +I'm not used to develop in C anymore (since 25 years ago, at least!), but I hope that this patch I made can help anybody else. + +* Added a check for nginx_version >= 1021005 + +Added a check for nginx_version >= 1021005 to avoid helper function definition on older versions + +* Use NGX_PCRE2 conditional + +Update naxsi.h + +Don't include pcre.h in order for compilation to work both against pcre and pcre2 + +Fix pcre vs pcre2 compilation + +Co-authored-by: laluigino <99279306+laluigino at users.noreply.github.com> +[Retrieved from: +https://github.com/nbs-system/naxsi/commit/2937c44276cba21601ade4e265d32515f570d68c] +Signed-off-by: Fabrice Fontaine +--- + naxsi_src/naxsi.h | 1 - + naxsi_src/naxsi_config.c | 9 ++++- + naxsi_src/naxsi_runtime.c | 82 ++++++++++++++++++++++++++++++++++++++- + naxsi_src/naxsi_utils.c | 8 ++++ + 4 files changed, 96 insertions(+), 4 deletions(-) + +diff --git a/naxsi_src/naxsi.h b/naxsi_src/naxsi.h +index 53df1bd8..b2f5c1a5 100644 +--- a/naxsi_src/naxsi.h ++++ b/naxsi_src/naxsi.h +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + + extern ngx_module_t ngx_http_naxsi_module; + +diff --git a/naxsi_src/naxsi_config.c b/naxsi_src/naxsi_config.c +index 4ea15567..6d2f0e23 100644 +--- a/naxsi_src/naxsi_config.c ++++ b/naxsi_src/naxsi_config.c +@@ -322,8 +322,11 @@ naxsi_zone(ngx_conf_t* r, ngx_str_t* tmp, ngx_http_rule_t* rule) + + custom_rule->target_rx = ngx_pcalloc(r->pool, sizeof(ngx_regex_compile_t)); + return_value_if(!custom_rule->target_rx, NGX_CONF_ERROR); +- ++#if (NGX_PCRE2) ++ custom_rule->target_rx->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + custom_rule->target_rx->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + custom_rule->target_rx->pattern = custom_rule->target; + custom_rule->target_rx->pool = r->pool; + custom_rule->target_rx->err.len = 0; +@@ -442,7 +445,11 @@ naxsi_rx(ngx_conf_t* r, ngx_str_t* tmp, ngx_http_rule_t* rule) + ha.len = tmp->len - strlen(RX_T); + rgc = ngx_pcalloc(r->pool, sizeof(ngx_regex_compile_t)); + return_value_if(!rgc, NGX_CONF_ERROR); ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = ha; + rgc->pool = r->pool; + rgc->err.len = 0; +diff --git a/naxsi_src/naxsi_runtime.c b/naxsi_src/naxsi_runtime.c +index d548ce37..784852b0 100644 +--- a/naxsi_src/naxsi_runtime.c ++++ b/naxsi_src/naxsi_runtime.c +@@ -181,6 +181,75 @@ ngx_http_naxsi_rawbody_parse(ngx_http_request_ctx_t* ctx, + unsigned char* + ngx_utf8_check(ngx_str_t* str); + ++#if defined nginx_version && (nginx_version >= 1021005) ++/* ++ * variables to use pcre2 ++ */ ++static pcre2_match_data *ngx_pcre2_match_data; ++static ngx_uint_t ngx_pcre2_match_data_size; ++ ++/* ++ * helper function to use pcre2 ++ */ ++ngx_int_t ++ngx_pcre2_exec(ngx_regex_t *re, unsigned char* str, unsigned int len, ngx_int_t tmp_idx, int *captures, ngx_uint_t size) ++{ ++ size_t *ov; ++ ngx_int_t rc; ++ ngx_uint_t n, i; ++ ++ /* ++ * The pcre2_match() function might allocate memory for backtracking ++ * frames, typical allocations are from 40k and above. So the allocator ++ * is configured to do direct allocations from heap during matching. ++ */ ++ ++ if (ngx_pcre2_match_data == NULL ++ || size > ngx_pcre2_match_data_size) ++ { ++ /* ++ * Allocate a match data if not yet allocated or smaller than ++ * needed. ++ */ ++ ++ if (ngx_pcre2_match_data) { ++ pcre2_match_data_free(ngx_pcre2_match_data); ++ } ++ ++ ngx_pcre2_match_data_size = size; ++ ngx_pcre2_match_data = pcre2_match_data_create(size / 3, NULL); ++ ++ if (ngx_pcre2_match_data == NULL) { ++ rc = PCRE2_ERROR_NOMEMORY; ++ goto failed; ++ } ++ } ++ ++ rc = pcre2_match(re, str, len, tmp_idx, 0, ngx_pcre2_match_data, NULL); ++ ++ if (rc < 0) { ++ goto failed; ++ } ++ ++ n = pcre2_get_ovector_count(ngx_pcre2_match_data); ++ ov = pcre2_get_ovector_pointer(ngx_pcre2_match_data); ++ ++ if (n > size / 3) { ++ n = size / 3; ++ } ++ ++ for (i = 0; i < n; i++) { ++ captures[i * 2] = ov[i * 2]; ++ captures[i * 2 + 1] = ov[i * 2 + 1]; ++ } ++ ++failed: ++ ++ return rc; ++ ++} ++#endif ++ + /* + ** in : string to inspect, associated rule + ** does : apply the rule on the string, return 1 if matched, +@@ -201,7 +270,14 @@ ngx_http_process_basic_rule_buffer(ngx_str_t* str, ngx_http_rule_t* rl, ngx_int_ + tmp_idx = 0; + len = str->len; + while +-#if defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) ++#if (NGX_PCRE2) ++ (tmp_idx < len && (match = ngx_pcre2_exec(rl->br->rx->regex, ++ str->data, ++ str->len, ++ tmp_idx, ++ captures, ++ 30)) >= 0) ++#elif defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) + (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, + 0, + (const char*)str->data, +@@ -496,7 +572,9 @@ ngx_http_naxsi_pcre_wrapper(ngx_regex_compile_t* rx, unsigned char* str, unsigne + int match; + int captures[30]; + +-#if defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) ++#if (NGX_PCRE2) ++ match = ngx_pcre2_exec(rx->regex, str, len, 0, captures, 1); ++#elif defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) + match = pcre_exec(rx->regex->code, 0, (const char*)str, len, 0, 0, captures, 1); + #elif defined nginx_version && (nginx_version > 1001011) + match = pcre_exec(rx->regex->pcre, 0, (const char*)str, len, 0, 0, captures, 1); +diff --git a/naxsi_src/naxsi_utils.c b/naxsi_src/naxsi_utils.c +index e3d6f185..d2ecedec 100644 +--- a/naxsi_src/naxsi_utils.c ++++ b/naxsi_src/naxsi_utils.c +@@ -800,7 +800,11 @@ ngx_http_naxsi_create_hashtables_n(ngx_http_naxsi_loc_conf_t* dlc, ngx_conf_t* c + ngx_pcalloc(cf->pool, sizeof(ngx_regex_compile_t)); + rgc = custloc_array(curr_r->br->custom_locations->elts)[name_idx].target_rx; + if (rgc) { ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = custloc_array(curr_r->br->custom_locations->elts)[name_idx].target; + rgc->pool = cf->pool; + rgc->err.len = 0; +@@ -816,7 +820,11 @@ ngx_http_naxsi_create_hashtables_n(ngx_http_naxsi_loc_conf_t* dlc, ngx_conf_t* c + ngx_pcalloc(cf->pool, sizeof(ngx_regex_compile_t)); + rgc = custloc_array(curr_r->br->custom_locations->elts)[uri_idx].target_rx; + if (rgc) { ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = custloc_array(curr_r->br->custom_locations->elts)[uri_idx].target; + rgc->pool = cf->pool; + rgc->err.len = 0; -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 17:52:04 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 18:52:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/less: fix CVE-2022-46663 Message-ID: <20230219175204.645686-1-fontaine.fabrice@gmail.com> In GNU Less before 609, crafted data can result in "less -R" not filtering ANSI escape sequences sent to the terminal. Signed-off-by: Fabrice Fontaine --- ...-on-invalid-embedded-escape-sequence.patch | 27 +++++++++++++++++++ package/less/less.mk | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch diff --git a/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch new file mode 100644 index 0000000000..233f949e24 --- /dev/null +++ b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch @@ -0,0 +1,27 @@ +From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 +From: Mark Nudelman +Date: Fri, 7 Oct 2022 19:25:46 -0700 +Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. + +[Retrieved from: +https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c] +Signed-off-by: Fabrice Fontaine +--- + line.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/line.c b/line.c +index 236c49ae..cba7bdd1 100644 +--- a/line.c ++++ b/line.c +@@ -633,8 +633,8 @@ ansi_step(pansi, ch) + /* Hyperlink ends with \7 or ESC-backslash. */ + if (ch == '\7') + return ANSI_END; +- if (pansi->prev_esc && ch == '\\') +- return ANSI_END; ++ if (pansi->prev_esc) ++ return (ch == '\\') ? ANSI_END : ANSI_ERR; + pansi->prev_esc = (ch == ESC); + return ANSI_MID; + } diff --git a/package/less/less.mk b/package/less/less.mk index 7d7a6d5fe5..f01f94d6c8 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -11,6 +11,9 @@ LESS_LICENSE_FILES = COPYING LESS_CPE_ID_VENDOR = gnu LESS_DEPENDENCIES = ncurses +# 0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch +LESS_IGNORE_CVES += CVE-2022-46663 + define LESS_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less endef -- 2.39.0 From peter at korsgaard.com Sun Feb 19 18:44:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 19:44:58 +0100 Subject: [Buildroot] [PATCH] package/git: security bump to version 2.39.2 In-Reply-To: <20230218085837.350535-1-bagasdotme@gmail.com> (Bagas Sanjaya's message of "Sat, 18 Feb 2023 15:58:37 +0700") References: <20230218085837.350535-1-bagasdotme@gmail.com> Message-ID: <87ilfx1olx.fsf@dell.be.48ers.dk> >>>>> "Bagas" == Bagas Sanjaya writes: > Fix two CVEs (CVE-2023-22490 and CVE-2023-23946). For the full release > note, see [1]. > While at it, also refresh two Buildroot patches introduced when the > package was bumped to 2.39.0. > [1]: https://lore.kernel.org/git/xmqqr0us5dio.fsf at gitster.g/ > Signed-off-by: Bagas Sanjaya Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 19 18:44:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 19:44:33 +0100 Subject: [Buildroot] [git commit] package/git: security bump to version 2.39.2 Message-ID: <20230219184511.0F5FB8608A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5085b61121a55c830b4d1576ab52441dc1491e35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix two CVEs (CVE-2023-22490 and CVE-2023-23946). For the full release note, see [1]. While at it, also refresh two Buildroot patches introduced when the package was bumped to 2.39.0. [1]: https://lore.kernel.org/git/xmqqr0us5dio.fsf at gitster.g/ Signed-off-by: Bagas Sanjaya Signed-off-by: Peter Korsgaard --- ...001-git-compat-util-avoid-redefining-system-function-nam.patch | 8 +++++--- ...002-git-compat-util-undefine-system-names-before-redecla.patch | 6 +++--- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch index dbde87940a..24100e1f6e 100644 --- a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch +++ b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch @@ -1,4 +1,4 @@ -From 385f67eb2254edb1fb4cf523e5e3d5a8f123d72c Mon Sep 17 00:00:00 2001 +From 86aeac96d04ae5381085c0f93acb12d3bfd06969 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 30 Nov 2022 16:15:14 -0500 Subject: [PATCH] git-compat-util: avoid redefining system function names @@ -64,7 +64,7 @@ Signed-off-by: Bagas Sanjaya 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h -index a76d0526f7..e3456bdd0d 100644 +index af05077560..f6882b9b50 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -341,11 +341,12 @@ struct itimerval { @@ -83,7 +83,7 @@ index a76d0526f7..e3456bdd0d 100644 #endif #ifndef NO_LIBGEN_H -@@ -1471,14 +1472,16 @@ int open_nofollow(const char *path, int flags); +@@ -1479,14 +1480,16 @@ int open_nofollow(const char *path, int flags); #endif #ifndef _POSIX_THREAD_SAFE_FUNCTIONS @@ -102,6 +102,8 @@ index a76d0526f7..e3456bdd0d 100644 #define getc_unlocked(fh) getc(fh) #endif + +base-commit: cbf04937d5b9fcf0a76c28f69e6294e9e3ecd7e6 -- An old man doll... just what I always wanted! - Clara diff --git a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch index 9e3c9b662c..f6207300ee 100644 --- a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch +++ b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch @@ -1,4 +1,4 @@ -From 6d406390b870fdb2cd9d18b12ebfabc12f5096df Mon Sep 17 00:00:00 2001 +From d4a11fd215195cd1ca6a43058ef250b688ade1f4 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 2 Dec 2022 06:05:38 -0500 Subject: [PATCH] git-compat-util: undefine system names before redeclaring @@ -29,7 +29,7 @@ Signed-off-by: Bagas Sanjaya 1 file changed, 4 insertions(+) diff --git a/git-compat-util.h b/git-compat-util.h -index e3456bdd0d..211861da0f 100644 +index f6882b9b50..dadb9e55cb 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -346,6 +346,7 @@ static inline int git_setitimer(int which, @@ -40,7 +40,7 @@ index e3456bdd0d..211861da0f 100644 #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) #endif -@@ -1480,6 +1481,9 @@ static inline void git_funlockfile(FILE *fh) +@@ -1488,6 +1489,9 @@ static inline void git_funlockfile(FILE *fh) { ; /* nothing */ } diff --git a/package/git/git.hash b/package/git/git.hash index 75398896e5..b7840cd1eb 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161 git-2.39.1.tar.xz +sha256 475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 git-2.39.2.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 1d728e1964..206d06ffe7 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.39.1 +GIT_VERSION = 2.39.2 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From bernd.kuhls at t-online.de Sun Feb 19 19:07:45 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 19 Feb 2023 20:07:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.88.0 Message-ID: <20230219190745.412680-1-bernd.kuhls@t-online.de> Changelog: https://curl.se/changes.html#7_88_0 Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/2bc1d775f510196154283374284f98d3eae03544#diff-400d38e5cfee181230373a8b02d38f50271a5bf62c62410382efddb8e8b19e22 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 230ec8d704..714b02acb0 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.87.0.tar.xz.asc +# https://curl.se/download/curl-7.88.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff curl-7.87.0.tar.xz -sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING +sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 994b685d34..eb481e4782 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.87.0 +LIBCURL_VERSION = 7.88.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ -- 2.39.1 From ju.o at free.fr Sun Feb 19 19:40:08 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 19 Feb 2023 20:40:08 +0100 Subject: [Buildroot] [PATCH v2, 3/3] package/libjxl: security bump to version 0.8.1 In-Reply-To: <701823a1b87f5b99a6bdb21aa8b573d7@free.fr> References: <20230219164822.142283-1-fontaine.fabrice@gmail.com> <20230219164822.142283-3-fontaine.fabrice@gmail.com> <701823a1b87f5b99a6bdb21aa8b573d7@free.fr> Message-ID: Hi again Fabrice, On 19/02/2023 18:07, Julien Olivain wrote: > Hi Fabrice, > > Thanks for the quick update! > > I successfully tested with the command: > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_libjxl > > On 19/02/2023 17:48, Fabrice Fontaine wrote: >> Security: Fix OOB read in exif.h >> >> https://github.com/libjxl/libjxl/releases/tag/v0.8.1 >> https://github.com/libjxl/libjxl/releases/tag/v0.8.0 >> > > Tested-by: Julien Olivain > Reviewed-by: Julien Olivain > >> Signed-off-by: Fabrice Fontaine >> --- >> Changes v1 -> v2 (after review of Julien Olivain): >> - Add patch to fix crash >> >> ...entation-fault-when-JPEG-is-disabled.patch | 44 >> +++++++++++++++++++ >> package/libjxl/libjxl.hash | 2 +- >> package/libjxl/libjxl.mk | 2 +- >> 3 files changed, 46 insertions(+), 2 deletions(-) >> create mode 100644 >> package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch >> >> diff --git >> a/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch >> b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch >> new file mode 100644 >> index 0000000000..3d709c956b >> --- /dev/null >> +++ >> b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch >> @@ -0,0 +1,44 @@ >> +From 504f35c8204248ae6f97278e8b7c6cc5853a1b94 Mon Sep 17 00:00:00 >> 2001 >> +From: Julien Olivain >> +Date: Fri, 10 Feb 2023 21:31:30 +0100 >> +Subject: [PATCH] djxl: fix segmentation fault when JPEG is disabled >> + >> +When libjxl is compiled without JPEG support, by configuring for >> example >> +with: >> + >> + cmake -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE ... >> + >> +djxl crashes with a segmentation fault at: >> +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L367 >> + >> +The crash can be reproduced with the sequence: >> + >> + gm convert IMAGE:LOGO ref.ppm >> + cjxl ref.ppm enc.jxl >> + djxl enc.jxl dec.ppm >> + >> +The crash happen because opt_jpeg_quality_id does not get >> +initialized at: >> +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L107 >> + >> +This commit fixes the crash by adding a test on opt_jpeg_quality_id. >> + >> +Signed-off-by: Julien Olivain >> +[Retrieved from: >> +https://github.com/libjxl/libjxl/pull/2178/commits/504f35c8204248ae6f97278e8b7c6cc5853a1b94] >> +--- >> + tools/djxl_main.cc | 1 + >> + 1 file changed, 1 insertion(+) >> + >> +diff --git a/tools/djxl_main.cc b/tools/djxl_main.cc >> +index b755301fcb..42b889e7ce 100644 >> +--- a/tools/djxl_main.cc >> ++++ b/tools/djxl_main.cc >> +@@ -370,6 +370,7 @@ int main(int argc, const char* argv[]) { >> + args.color_space = force_colorspace; >> + } >> + if (codec == jxl::extras::Codec::kPNM && extension != ".pfm" && >> ++ args.opt_jpeg_quality_id != -1 && >> + !cmdline.GetOption(args.opt_jpeg_quality_id)->matched()) { >> + args.bits_per_sample = 0; >> + } >> diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash >> index e71d32e61d..6b4c9d8d0a 100644 >> --- a/package/libjxl/libjxl.hash >> +++ b/package/libjxl/libjxl.hash >> @@ -1,4 +1,4 @@ >> # Locally computed: >> -sha256 >> 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e >> libjxl-0.7.0.tar.gz >> +sha256 >> 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 >> libjxl-0.8.1.tar.gz >> sha256 >> 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede >> LICENSE >> sha256 >> 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 >> PATENTS >> diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk >> index b4dfbecf82..f603327bf6 100644 >> --- a/package/libjxl/libjxl.mk >> +++ b/package/libjxl/libjxl.mk >> @@ -4,7 +4,7 @@ >> # >> >> ################################################################################ >> >> -LIBJXL_VERSION = 0.7.0 >> +LIBJXL_VERSION = 0.8.1 Testing a bit more thoroughly on top of branch master a commit 1c9622a, with command: utils/test-pkg -p libjxl -a revealed some new build failures for riscv{32,64}. Output shows: ... bootlin-riscv32-glibc [17/45]: FAILED bootlin-riscv64-glibc [18/45]: FAILED bootlin-riscv64-musl [19/45]: FAILED ... 45 builds, 11 skipped, 3 build failed, 0 legal-info failed, 0 show-info failed They are all failing at the same place, with error in log: /br-test-pkg/bootlin-riscv64-glibc/build/libjxl-0.8.1/lib/jxl/enc_xyb.cc: In function ?jxl::Image3F jxl::N_SCALAR::TransformToLinearRGB(const jxl::Image3F&, const jxl::ColorEncoding&, float, const JxlCmsInterface&, jxl::ThreadPool*)?: /br-test-pkg/bootlin-riscv64-glibc/build/libjxl-0.8.1/lib/jxl/enc_xyb.cc:223:21: error: variable ?std::atomic ok? has initializer but incomplete type 223 | std::atomic ok{true}; | ^~ >> LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) >> LIBJXL_LICENSE = BSD-3-Clause >> LIBJXL_LICENSE_FILES = LICENSE PATENTS Best regards, Julien. From thomas.petazzoni at bootlin.com Sun Feb 19 20:53:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:53:36 +0100 Subject: [Buildroot] [git commit] package/libfuse3: bump to version 3.14.0 Message-ID: <20230219205348.3DD608609A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=273bec97fc34068281d44e57bc60fbcfed5c8342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index f697f4ad3f..2d78153c81 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 96399b09b91bc717a9e96ffea660d611e6a342547c1abd4d0e858b3dca9d5a13 libfuse3-3.13.1.tar.gz +sha256 b14f7d97abc11a5a70a37955021a7a1d8eb1d3dd5b6abec66af093eae3168c62 libfuse3-3.14.0.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index a2e9775868..8c306ba187 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.13.1 +LIBFUSE3_VERSION = 3.14.0 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sun Feb 19 20:54:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:54:31 +0100 Subject: [Buildroot] [PATCH] package/libfuse3: bump to version 3.14.0 In-Reply-To: <20230217133241.533189-1-giulio.benetti@benettiengineering.com> References: <20230217133241.533189-1-giulio.benetti@benettiengineering.com> Message-ID: <20230219215431.2e172a10@windsurf> On Fri, 17 Feb 2023 14:32:41 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti > --- > package/libfuse3/libfuse3.hash | 2 +- > package/libfuse3/libfuse3.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 Feb 19 20:54:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:54:39 +0100 Subject: [Buildroot] [git commit] package/speechd: disable kali support Message-ID: <20230219205533.9F083860A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8797f3fb272e9c1a5fe6a1953cacf6e5065a133a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable kali support as it is not needed and raises the following build failure without C++ since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: CXX sd_kali-kali.o /bin/sh: line 1: no: command not found Fixes: - http://autobuild.buildroot.org/results/2f6c8b3674753d6a9f165117c70e7dad88505505 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 0d43e4b6fb..46c0672f59 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,6 +12,7 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile +SPEECHD_CONF_OPTS = --without-kali # fix missing config.rpath (needed for autoreconf) in the codebase define SPEECHD_TOUCH_CONFIG_RPATH From thomas.petazzoni at bootlin.com Sun Feb 19 20:55:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:55:23 +0100 Subject: [Buildroot] [git commit] package/speechd: fix build without makeinfo Message-ID: <20230219205533.A93F0860C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99d5f1f7d3cd4b1f2041edbddd5d09caacf4848d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without makeinfo raised since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: /home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found Fixes: - http://autobuild.buildroot.org/results/d4f193545eb31864a9bac5a9d05bba39d3c7ff3e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speechd/0001-add-disable-doc.patch | 78 ++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/package/speechd/0001-add-disable-doc.patch b/package/speechd/0001-add-disable-doc.patch new file mode 100644 index 0000000000..dd17b10e4f --- /dev/null +++ b/package/speechd/0001-add-disable-doc.patch @@ -0,0 +1,78 @@ +From d88557d3c29c33f76af20cb7a6eb798f6f598c23 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 19 Feb 2023 15:18:35 +0100 +Subject: [PATCH] add --disable-doc + +Allow the user to disable documentation through --disable-doc to avoid +the following build failure without makeinfo: + +make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/doc' + MAKEINFO ssip.info + MAKEINFO spd-say.info +/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found +/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +make[3]: *** [Makefile:492: ssip.info] Error 127 + +Fixes: + - http://autobuild.buildroot.org/results/d4f193545eb31864a9bac5a9d05bba39d3c7ff3e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/brailcom/speechd/pull/810] +--- + Makefile.am | 6 +++++- + configure.ac | 4 ++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 26617c78..480eb50e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,7 +22,11 @@ pkgconfig_DATA = speech-dispatcher.pc + + BUILT_SOURCES = $(top_srcdir)/.version + +-SUBDIRS= include locale src config doc po ++SUBDIRS= include locale src config po ++ ++if ENABLE_DOC ++SUBDIRS += doc ++endif + + EXTRA_DIST= config.rpath COPYING.LGPL COPYING.GPL-2 COPYING.GPL-3 ANNOUNCE BUGS FAQ README.md README.packagers README.translators README.overview.md README.style.md build.sh speech-dispatcherd.service.in speech-dispatcher.socket speech-dispatcher.service.in po/Makevars.in po/README + +diff --git a/configure.ac b/configure.ac +index faaa8629..4f2af908 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -168,6 +168,10 @@ AC_SUBST([EXTRA_SOCKET_LIBS]) + AC_SUBST([ERROR_CFLAGS]) + AC_SUBST([RDYNAMIC]) + ++AC_ARG_ENABLE([doc], ++ [AC_HELP_STRING([--disable-doc], [turn off documentation])]) ++AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no") ++ + # Check for python support. + # Python 3 or greater required + AC_ARG_ENABLE([python], +-- +2.39.0 + From thomas.petazzoni at bootlin.com Sun Feb 19 20:55:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:55:40 +0100 Subject: [Buildroot] [PATCH 1/2] package/speechd: disable kali support In-Reply-To: <20230219142548.626439-1-fontaine.fabrice@gmail.com> References: <20230219142548.626439-1-fontaine.fabrice@gmail.com> Message-ID: <20230219215540.3968527c@windsurf> On Sun, 19 Feb 2023 15:25:47 +0100 Fabrice Fontaine wrote: > Disable kali support as it is not needed and raises the following build > failure without C++ since the addition of the package in commit > 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: > > CXX sd_kali-kali.o > /bin/sh: line 1: no: command not found > > Fixes: > - http://autobuild.buildroot.org/results/2f6c8b3674753d6a9f165117c70e7dad88505505 > > Signed-off-by: Fabrice Fontaine > --- > package/speechd/speechd.mk | 1 + > 1 file changed, 1 insertion(+) Both applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 19 20:56:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:56:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnupg2: fix build failure when host provides an old gpgrt-config In-Reply-To: <20230219150426.1509780-1-ju.o@free.fr> References: <20230219150426.1509780-1-ju.o@free.fr> Message-ID: <20230219215633.61ffccbe@windsurf> On Sun, 19 Feb 2023 16:04:26 +0100 Julien Olivain wrote: > gnupg2 uses the libgpg-error library. The libgpg-error library has a > long plan to be renamed to "gpgrt" (see [1]). For the transition, it > provides two configuration scripts "gpg-error-config" (the old, > original one, kept for compatibility) and "gpgrt-config" (which is > meant to be the replacement). When both are detected, "gpgrt-config" > should be preferred. > > gnupg2 configure script searches for "gpg-error-config" in the path > provided to --with-libgpg-error-prefix=PFX (more specifically, in > "PFX/bin"). > > The logic to find "gpgrt-config" is different: it is searched in > paths "$prefix/bin:$PATH". See [2]. On Buildroot, autotools target > packages are configured with "--prefix=/usr", which makes the > configure script to search in the host "/usr/bin". > > In some host environment providing such a "/usr/bin/gpgrt-config" > script of an older version, host compilation flags are incorrectly > added for the target, which leads to compilation failures. > > The issue can be reproduced in a Buildroot Docker image from [3] in > which the libgpg-error-dev package is added. When tested, the > libgpg-error-dev package was at version 1.38. > > In that configuration, gnupg2 configure will output the message: > > checking for gpgrt-config... /usr/bin/gpgrt-config > > and the compilation fails with a message: > > aarch64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' > > Note: it was observed that in some other configurations in which the > host /usr/bin/gpgrt-config was from libgpg-error version 1.46, the > host script was redirecting correctly in the buildroot sysroot. > > Since gnupg2 searches for "gpgrt-config" with a > "AC_PATH_PROG(GPGRT_CONFIG, ...)" macro, this patch fixes this > issue by simply forcing the script path in the GPGRT_CONFIG > environment variable. > > See also [4] which discussed the "gpgrt-config" search logic. > > Fixes: > - http://autobuild.buildroot.net/results/423c3ce7317c181e9f2e4a49b76ee9d26167375c/ > (and many others) > > [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=e0b9f16445a96942af0839bcdb9a0b0f8cf31380;hb=885a287a57cf060b4c5b441822c09d23b8dee2bd#l29 > [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=m4/gpg-error.m4;h=a975e53d07d1b743f51d8aa1767cd8e0d71b4071;hb=c0556edb80518720b0d884251685fe008c8f0429#l68 > [3] https://git.buildroot.org/buildroot/tree/support/docker/Dockerfile?id=b6085c00d0feece6f3ba635e7847ea653bc5fac3 > [4] https://dev.gnupg.org/T5365 > > Reported-by: Bagas Sanjaya > Tested-by: Bagas Sanjaya > Signed-off-by: Julien Olivain > --- > Patch tested on master branch at commit b6085c0 with commands: Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 19 20:55:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:55:53 +0100 Subject: [Buildroot] [git commit] package/gnupg2: fix build failure when host provides an old gpgrt-config Message-ID: <20230219205732.85A218611D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gnupg2 uses the libgpg-error library. The libgpg-error library has a long plan to be renamed to "gpgrt" (see [1]). For the transition, it provides two configuration scripts "gpg-error-config" (the old, original one, kept for compatibility) and "gpgrt-config" (which is meant to be the replacement). When both are detected, "gpgrt-config" should be preferred. gnupg2 configure script searches for "gpg-error-config" in the path provided to --with-libgpg-error-prefix=PFX (more specifically, in "PFX/bin"). The logic to find "gpgrt-config" is different: it is searched in paths "$prefix/bin:$PATH". See [2]. On Buildroot, autotools target packages are configured with "--prefix=/usr", which makes the configure script to search in the host "/usr/bin". In some host environment providing such a "/usr/bin/gpgrt-config" script of an older version, host compilation flags are incorrectly added for the target, which leads to compilation failures. The issue can be reproduced in a Buildroot Docker image from [3] in which the libgpg-error-dev package is added. When tested, the libgpg-error-dev package was at version 1.38. In that configuration, gnupg2 configure will output the message: checking for gpgrt-config... /usr/bin/gpgrt-config and the compilation fails with a message: aarch64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' Note: it was observed that in some other configurations in which the host /usr/bin/gpgrt-config was from libgpg-error version 1.46, the host script was redirecting correctly in the buildroot sysroot. Since gnupg2 searches for "gpgrt-config" with a "AC_PATH_PROG(GPGRT_CONFIG, ...)" macro, this patch fixes this issue by simply forcing the script path in the GPGRT_CONFIG environment variable. See also [4] which discussed the "gpgrt-config" search logic. Fixes: - http://autobuild.buildroot.net/results/423c3ce7317c181e9f2e4a49b76ee9d26167375c/ (and many others) [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=e0b9f16445a96942af0839bcdb9a0b0f8cf31380;hb=885a287a57cf060b4c5b441822c09d23b8dee2bd#l29 [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=m4/gpg-error.m4;h=a975e53d07d1b743f51d8aa1767cd8e0d71b4071;hb=c0556edb80518720b0d884251685fe008c8f0429#l68 [3] https://git.buildroot.org/buildroot/tree/support/docker/Dockerfile?id=b6085c00d0feece6f3ba635e7847ea653bc5fac3 [4] https://dev.gnupg.org/T5365 Reported-by: Bagas Sanjaya Tested-by: Bagas Sanjaya Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gnupg2/gnupg2.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 5935ce6939..73de185ba7 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -23,6 +23,10 @@ GNUPG2_CONF_OPTS = \ --with-ksba-prefix=$(STAGING_DIR)/usr \ --with-npth-prefix=$(STAGING_DIR)/usr +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +GNUPG2_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config + ifneq ($(BR2_PACKAGE_GNUPG2_GPGV),y) define GNUPG2_REMOVE_GPGV rm -f $(TARGET_DIR)/usr/bin/gpgv From thomas.petazzoni at bootlin.com Sun Feb 19 20:58:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:58:03 +0100 Subject: [Buildroot] [PATCH] package/catch2: bump to version 3.3.1 In-Reply-To: <20230218112449.1753677-1-buildroot@heine.tech> References: <20230218112449.1753677-1-buildroot@heine.tech> Message-ID: <20230219215803.1ad7ae5b@windsurf> On Sat, 18 Feb 2023 12:24:45 +0100 Michael Nosthoff via buildroot wrote: > raise the minimum gcc to 5 as stated in release notes for 3.1.0 [0]. > > [0] https://github.com/catchorg/Catch2/releases/tag/v3.1.0 > --- > package/catch2/Config.in | 6 +++--- > package/catch2/catch2.hash | 2 +- > package/catch2/catch2.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 Feb 19 20:57:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:57:47 +0100 Subject: [Buildroot] [git commit] package/catch2: bump to version 3.3.1 Message-ID: <20230219205904.B25A38622D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3a462e85a786401964d522124e4f431d79339e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master raise the minimum gcc to 5 as stated in release notes for 3.1.0 [0]. [0] https://github.com/catchorg/Catch2/releases/tag/v3.1.0 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/catch2/Config.in | 6 +++--- package/catch2/catch2.hash | 2 +- package/catch2/catch2.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/catch2/Config.in b/package/catch2/Config.in index 2f53d197b2..40d2d12434 100644 --- a/package/catch2/Config.in +++ b/package/catch2/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_CATCH2 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 depends on BR2_USE_MMU # fork() help Catch2 is mainly a unit testing framework for C++, but it @@ -21,8 +21,8 @@ config BR2_PACKAGE_CATCH2 https://github.com/catchorg/Catch2 -comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash index 664164fd76..b533792f8f 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2106bccfec18c8ce673623d56780220e38527dd8f283ccba26aa4b8758737d0e catch2-3.1.1.tar.gz +sha256 d90351cdc55421f640c553cfc0875a8c834428679444e8062e9187d05b18aace catch2-3.3.1.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index ab62cc943b..6e4af3d670 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.1.1 +CATCH2_VERSION = 3.3.1 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO From thomas.petazzoni at bootlin.com Sun Feb 19 21:02:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 22:02:17 +0100 Subject: [Buildroot] [PATCH] packge/libabseil-cpp: bump to version 20230125.0 In-Reply-To: <20230218114837.1761715-1-buildroot@heine.tech> References: <20230218114837.1761715-1-buildroot@heine.tech> Message-ID: <20230219220217.6b34a65f@windsurf> Hello Michael, On Sat, 18 Feb 2023 12:48:37 +0100 Michael Nosthoff via buildroot wrote: > libabseil now depends on c++14 and gcc >= 7.3.1 [0][1] > > [0] https://github.com/abseil/abseil-cpp/releases/tag/20230125.0 > [1] https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md > > Signed-off-by: Michael Nosthoff > --- > > Note: > I'm not sure if the BR2_TOOLCHAIN_GCC_AT_LEAST_7 dependency is sufficient. > But I don't think we have a more version specific Flag available? We don't have more specific blind options than 7.x, 8.x, etc. to describe a gcc dependency. > package/grpc/Config.in | 6 +++--- > package/libabseil-cpp/Config.in | 6 +++--- > package/libabseil-cpp/libabseil-cpp.hash | 2 +- > package/libabseil-cpp/libabseil-cpp.mk | 6 +++--- > 4 files changed, 10 insertions(+), 10 deletions(-) I'm afraid this is not sufficient. Indeed, you need to look at the reverse dependencies of GRPC for example. So, package/falcosecurity-libs needs to be adjusted, then package/sysdig as well, and also the BR2_PACKAGE_COLLECTD_GRPC option from package/collectd. Could you have a look into this, and submit an updated version? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 19 21:09:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 22:09:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: bump to version 2.26.0 In-Reply-To: <20230218134059.53863-1-egorenar@linux.ibm.com> References: <20230218134059.53863-1-egorenar@linux.ibm.com> Message-ID: <20230219220949.4507fcc8@windsurf> On Sat, 18 Feb 2023 14:40:59 +0100 Alexander Egorenkov wrote: > Signed-off-by: Alexander Egorenkov > --- > package/s390-tools/s390-tools.hash | 2 +- > package/s390-tools/s390-tools.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 Feb 19 21:09:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 22:09:25 +0100 Subject: [Buildroot] [git commit] package/s390-tools: bump to version 2.26.0 Message-ID: <20230219211013.9112386293@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d782c0682f559d407e64698470b511512a5bdc78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- 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 a0dde477c3..37b67c5cb1 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ccb20954e748309a50fd56edd9abd94c6f897081e9a1a33e9d965a56f650990d s390-tools-2.25.0.tar.gz +sha256 da81c55fb11d84923c0ebaed703f557052eb1a273495f60ebe3d20a74627303e s390-tools-2.26.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index cb6278dfb8..8cd5491405 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.25.0 +S390_TOOLS_VERSION = 2.26.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 thomas.petazzoni at bootlin.com Sun Feb 19 21:10:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 22:10:00 +0100 Subject: [Buildroot] [git commit] package/poke: bump to version 3.0 Message-ID: <20230219211013.9B95E86296@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2ecaf26b5e3693cf0145a2d1fcc2e0953884baf4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See: http://www.jemarch.net/poke-3.0-relnotes.html Build tested: https://gitlab.com/kubu93/buildroot/-/pipelines/782116399 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/poke/poke.hash | 2 +- package/poke/poke.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poke/poke.hash b/package/poke/poke.hash index 09dc4e8972..e6e436570c 100644 --- a/package/poke/poke.hash +++ b/package/poke/poke.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 841e285917c6738ce982a6930e30ebeadecfb0655a79d9184f16f876a9fe6e47 poke-2.4.tar.gz +sha256 79a9b2f33c9f8c327c499afadaeeabfeecf6ad4988924d2c6c6f317e50317add poke-3.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index d49e628dbf..4a6ff344b2 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 2.4 +POKE_VERSION = 3.0 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 thomas.petazzoni at bootlin.com Sun Feb 19 21:10:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 22:10:12 +0100 Subject: [Buildroot] [PATCH] package/poke: bump to version 3.0 In-Reply-To: <20230218180215.1077049-1-romain.naour@gmail.com> References: <20230218180215.1077049-1-romain.naour@gmail.com> Message-ID: <20230219221012.31f1977e@windsurf> On Sat, 18 Feb 2023 19:02:15 +0100 Romain Naour wrote: > See: > http://www.jemarch.net/poke-3.0-relnotes.html > > Build tested: > https://gitlab.com/kubu93/buildroot/-/pipelines/782116399 > > Signed-off-by: Romain Naour > --- > test-pkg config: > BR2_PACKAGE_POKE=y > --- > package/poke/poke.hash | 2 +- > package/poke/poke.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 Feb 19 22:05:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 23:05:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/ipmiutil: fix uclibc build without wchar In-Reply-To: <20230219161453.87903-1-fontaine.fabrice@gmail.com> References: <20230219161453.87903-1-fontaine.fabrice@gmail.com> Message-ID: <20230219230510.4b29d5be@windsurf> On Sun, 19 Feb 2023 17:14:53 +0100 Fabrice Fontaine wrote: > For an unknown reason, wchar_t is incorrectly detected with uclibc > resulting in the following build failure: > > In file included from igetevent.c:136: > imb_api.h:150:5: error: unknown type name 'wchar_t' > 150 | wchar_t *Buffer; > | ^~~~~~~ > > The build failure can be reproduced even when reverting bump to version > 3.1.8. > > Fixes: > - http://autobuild.buildroot.org/results/e9ff3bd08e106dc834968bf5e4296ce8299027f8 > > Signed-off-by: Fabrice Fontaine > --- > package/ipmiutil/ipmiutil.mk | 1 + > 1 file changed, 1 insertion(+) I think the problem is that uClibc-ng defines the wchar_t type even if wchar support is disabled. I believe if the AC_CHECK_TYPES() check in ipmiutil ensured that was included, the detection would work correctly, as wchar.h contains a #error when wchar support is disabled. Anyway, in the mean time, what you proposed looks fine to me, so: applied! Thanks, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 19 22:04:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 23:04:04 +0100 Subject: [Buildroot] [git commit] package/ipmiutil: fix uclibc build without wchar Message-ID: <20230219220525.DA3CC86317@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b4937a1709a88f90abbeac48e2e2db33b83d44b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For an unknown reason, wchar_t is incorrectly detected with uclibc resulting in the following build failure: In file included from igetevent.c:136: imb_api.h:150:5: error: unknown type name 'wchar_t' 150 | wchar_t *Buffer; | ^~~~~~~ The build failure can be reproduced even when reverting bump to version 3.1.8. Fixes: - http://autobuild.buildroot.org/results/e9ff3bd08e106dc834968bf5e4296ce8299027f8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipmiutil/ipmiutil.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk index ad9fbfc24c..b48eaa7cb2 100644 --- a/package/ipmiutil/ipmiutil.mk +++ b/package/ipmiutil/ipmiutil.mk @@ -10,6 +10,7 @@ IPMIUTIL_LICENSE = BSD-3-Clause IPMIUTIL_LICENSE_FILES = COPYING IPMIUTIL_MAKE = $(MAKE1) +IPMIUTIL_CONF_ENV = ac_cv_type_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) ifeq ($(BR2_PACKAGE_OPENSSL),y) # tests against distro libcrypto so it might get a false positive when From troglobit at gmail.com Sun Feb 19 22:20:46 2023 From: troglobit at gmail.com (Joachim Wiberg) Date: Sun, 19 Feb 2023 23:20:46 +0100 Subject: [Buildroot] [PATCH 0/1] package/ssdp-responder: bump to v2.0 Message-ID: <20230219222048.22093-1-troglobit@gmail.com> Meta data: $ ./utils/check-package package/ssdp-responder/* 102 lines processed 0 warnings generated $ ./utils/test-pkg -c ssdp-responder.config -p ssdp-responder 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 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Joachim Wiberg (1): package/ssdp-responder: bump to v2.0 package/ssdp-responder/ssdp-responder.hash | 2 +- package/ssdp-responder/ssdp-responder.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.34.1 From troglobit at gmail.com Sun Feb 19 22:20:47 2023 From: troglobit at gmail.com (Joachim Wiberg) Date: Sun, 19 Feb 2023 23:20:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/ssdp-responder: bump to v2.0 In-Reply-To: <20230219222048.22093-1-troglobit@gmail.com> References: <20230219222048.22093-1-troglobit@gmail.com> Message-ID: <20230219222048.22093-2-troglobit@gmail.com> ChangeLog: - https://github.com/troglobit/ssdp-responder/releases/tag/v2.0 - https://github.com/troglobit/ssdp-responder/blob/v2.0/ChangeLog.md Critical Fixes: - Fix periodic busy loop causing intermittent 100% CPU load - Fix invalid uuid:uuid:... in description.xml (dup uuid:) Signed-off-by: Joachim Wiberg --- package/ssdp-responder/ssdp-responder.hash | 2 +- package/ssdp-responder/ssdp-responder.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.hash b/package/ssdp-responder/ssdp-responder.hash index 425ad86e08..8b4f3e4e45 100644 --- a/package/ssdp-responder/ssdp-responder.hash +++ b/package/ssdp-responder/ssdp-responder.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 974c244abd4ba8c87532867a84756182a1460c99072ffb1eb91c5a1f73311d89 ssdp-responder-1.9.tar.gz +sha256 d8888f2ac59febfb3b2473a1402041014052ad4dc1eeb4168c78aeca1692aae3 ssdp-responder-2.0.tar.gz sha256 68d6fdc22e337f725fe719bf9ae6d92b1d8d0ca4cff8219b303ab76706670a8d LICENSE diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index 5193966908..20e7219386 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSDP_RESPONDER_VERSION = 1.9 +SSDP_RESPONDER_VERSION = 2.0 SSDP_RESPONDER_SITE = https://github.com/troglobit/ssdp-responder/releases/download/v$(SSDP_RESPONDER_VERSION) SSDP_RESPONDER_LICENSE = ISC SSDP_RESPONDER_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Sun Feb 19 22:45:46 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 19 Feb 2023 23:45:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/modem-manager: fix static build Message-ID: <20230219224546.1232023-1-fontaine.fabrice@gmail.com> Commit d769cfc13f6c2544f8bc5b6339d23763319a2383 was incomplete as plugins/meson.build still unconditionally calls shared_module. So disable plugins to fix the following static build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: [238/417] Linking target plugins/libmm-shared-telit.so FAILED: plugins/libmm-shared-telit.so Plugins could be enabled back through builtin_plugins as soon as https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/1c4da332ee6e0d948f85a63f74cb27e89075c011 lands in a stable release Fixes: - http://autobuild.buildroot.org/results/deb2a752accb021392bb9dc3d06b2b1bf151535c Signed-off-by: Fabrice Fontaine --- package/modem-manager/modem-manager.mk | 44 ++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 979a80a8e9..824b9eda5a 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -80,6 +80,50 @@ else MODEM_MANAGER_CONF_OPTS += -Dbash_completion=false endif +ifeq ($(BR2_STATIC_LIBS),y) +MODEM_MANAGER_CONF_OPTS += \ + -Dplugin_generic=disabled \ + -Dplugin_altair_lte=disabled \ + -Dplugin_anydata=disabled \ + -Dplugin_broadmobi=disabled \ + -Dplugin_cinterion=disabled \ + -Dplugin_dell=disabled \ + -Dplugin_dlink=disabled \ + -Dplugin_fibocom=disabled \ + -Dplugin_foxconn=disabled \ + -Dplugin_gosuncn=disabled \ + -Dplugin_haier=disabled \ + -Dplugin_huawei=disabled \ + -Dplugin_intel=disabled \ + -Dplugin_iridium=disabled \ + -Dplugin_linktop=disabled \ + -Dplugin_longcheer=disabled \ + -Dplugin_mbm=disabled \ + -Dplugin_motorola=disabled \ + -Dplugin_mtk=disabled \ + -Dplugin_nokia=disabled \ + -Dplugin_nokia_icera=disabled \ + -Dplugin_novatel=disabled \ + -Dplugin_novatel_lte=disabled \ + -Dplugin_option=disabled \ + -Dplugin_option_hso=disabled \ + -Dplugin_pantech=disabled \ + -Dplugin_qcom_soc=disabled \ + -Dplugin_quectel=disabled \ + -Dplugin_samsung=disabled \ + -Dplugin_sierra_legacy=disabled \ + -Dplugin_sierra=disabled \ + -Dplugin_simtech=disabled \ + -Dplugin_telit=disabled \ + -Dplugin_thuraya=disabled \ + -Dplugin_tplink=disabled \ + -Dplugin_ublox=disabled \ + -Dplugin_via=disabled \ + -Dplugin_wavecom=disabled \ + -Dplugin_x22x=disabled \ + -Dplugin_zte=disabled +endif + define MODEM_MANAGER_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/modem-manager/S44modem-manager \ $(TARGET_DIR)/etc/init.d/S44modem-manager -- 2.39.0 From fontaine.fabrice at gmail.com Sun Feb 19 23:23:01 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 00:23:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230219232301.1795196-1-fontaine.fabrice@gmail.com> tmux uses custom --enable-static option, instead of standard libtool directive resulting in the following build failure with systemd or utf8proc raised since commits 1f618aa388535181c281c85e2b5264532de4ef0f and e279599d255a79c08ef20b97b96eb248689d52a9: checking for utf8proc.h... yes checking for library containing utf8proc_charwidth... no configure: error: "utf8proc not found" In file included from tmux.h:34, from alerts.c:23: compat.h:379:18: error: conflicting types for 'forkpty'; have 'pid_t(int *, char *, struct termios *, struct winsize *)' {aka 'int(int *, char *, struct termios *, struct winsize *)'} 379 | pid_t forkpty(int *, char *, struct termios *, struct winsize *); | ^~~~~~~ Link to (closed) upstream issue: https://github.com/tmux/tmux/issues/3290 Fixes: - http://autobuild.buildroot.org/results/6e8523d8d514bf6d8fc3377d05e5edbe7fc2d5bb - http://autobuild.buildroot.org/results/cba06f3bb6d9be25e91f56c390a70ddf9904832e Signed-off-by: Fabrice Fontaine --- package/tmux/tmux.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 47ee9b16ca..af06c8570b 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -25,6 +25,12 @@ else TMUX_CONF_OPTS += --disable-utf8proc endif +# tmux uses custom --enable-static option, instead of standard libtool +# directive resulting in a build failure with systemd or utf8proc +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +TMUX_CONF_OPTS += --disable-static +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS -- 2.39.0 From fancp2007 at gmail.com Mon Feb 20 05:20:18 2023 From: fancp2007 at gmail.com (Scott Fan) Date: Mon, 20 Feb 2023 13:20:18 +0800 Subject: [Buildroot] [PATCH v1] package/libopenssl: security bump to version 1.1.1t In-Reply-To: <20230208174305.1af25bae@windsurf> References: <20230208162534.28581-1-ps.report@gmx.net> <20230208174305.1af25bae@windsurf> Message-ID: it should also apply to the 2022.02.x branch. Scott Fan On Thu, Feb 9, 2023 at 12:43 AM Thomas Petazzoni via buildroot < buildroot at buildroot.org> wrote: > On Wed, 8 Feb 2023 17:25:34 +0100 > Peter Seiderer wrote: > > > Changelog (for details see [1] and [2]): > > > > Changes between 1.1.1s and 1.1.1t [7 Feb 2023] > > > > *) Fixed X.400 address type confusion in X.509 GeneralName. > > > > There is a type confusion vulnerability relating to X.400 address > processing > > inside an X.509 GeneralName. X.400 addresses were parsed as an > ASN1_STRING > > but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. > This > > vulnerability may allow an attacker who can provide a certificate > chain and > > CRL (neither of which need have a valid signature) to pass arbitrary > > pointers to a memcmp call, creating a possible read primitive, > subject to > > some constraints. Refer to the advisory for more information. > Thanks to > > David Benjamin for discovering this issue. (CVE-2023-0286) > > > > This issue has been fixed by changing the public header file > definition of > > GENERAL_NAME so that x400Address reflects the implementation. It > was not > > possible for any existing application to successfully use the > existing > > definition; however, if any application references the x400Address > field > > (e.g. in dead code), note that the type of this field has changed. > There is > > no ABI change. > > [Hugo Landau] > > > > *) Fixed Use-after-free following BIO_new_NDEF. > > > > The public API function BIO_new_NDEF is a helper function used for > > streaming ASN.1 data via a BIO. It is primarily used internally to > OpenSSL > > to support the SMIME, CMS and PKCS7 streaming capabilities, but may > also > > be called directly by end user applications. > > > > The function receives a BIO from the caller, prepends a new > BIO_f_asn1 > > filter BIO onto the front of it to form a BIO chain, and then > returns > > the new head of the BIO chain to the caller. Under certain > conditions, > > for example if a CMS recipient public key is invalid, the new > filter BIO > > is freed and the function returns a NULL result indicating a > failure. > > However, in this case, the BIO chain is not properly cleaned up and > the > > BIO passed by the caller still retains internal pointers to the > previously > > freed filter BIO. If the caller then goes on to call BIO_pop() on > the BIO > > then a use-after-free will occur. This will most likely result in a > crash. > > (CVE-2023-0215) > > [Viktor Dukhovni, Matt Caswell] > > > > *) Fixed Double free after calling PEM_read_bio_ex. > > > > The function PEM_read_bio_ex() reads a PEM file from a BIO and > parses and > > decodes the "name" (e.g. "CERTIFICATE"), any header data and the > payload > > data. If the function succeeds then the "name_out", "header" and > "data" > > arguments are populated with pointers to buffers containing the > relevant > > decoded data. The caller is responsible for freeing those buffers. > It is > > possible to construct a PEM file that results in 0 bytes of payload > data. > > In this case PEM_read_bio_ex() will return a failure code but will > populate > > the header argument with a pointer to a buffer that has already > been freed. > > If the caller also frees this buffer then a double free will occur. > This > > will most likely lead to a crash. > > > > The functions PEM_read_bio() and PEM_read() are simple wrappers > around > > PEM_read_bio_ex() and therefore these functions are also directly > affected. > > > > These functions are also called indirectly by a number of other > OpenSSL > > functions including PEM_X509_INFO_read_bio_ex() and > > SSL_CTX_use_serverinfo_file() which are also vulnerable. Some > OpenSSL > > internal uses of these functions are not vulnerable because the > caller does > > not free the header argument if PEM_read_bio_ex() returns a failure > code. > > (CVE-2022-4450) > > [Kurt Roeckx, Matt Caswell] > > > > *) Fixed Timing Oracle in RSA Decryption. > > > > A timing based side channel exists in the OpenSSL RSA Decryption > > implementation which could be sufficient to recover a plaintext > across > > a network in a Bleichenbacher style attack. To achieve a successful > > decryption an attacker would have to be able to send a very large > number > > of trial messages for decryption. The vulnerability affects all RSA > padding > > modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. > > (CVE-2022-4304) > > [Dmitry Belyavsky, Hubert Kario] > > > > Changes between 1.1.1r and 1.1.1s [1 Nov 2022] > > > > *) Fixed a regression introduced in 1.1.1r version not refreshing the > > certificate data to be signed before signing the certificate. > > [Gibeom Gwon] > > > > Changes between 1.1.1q and 1.1.1r [11 Oct 2022] > > > > *) Fixed the linux-mips64 Configure target which was missing the > > SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that > > platform. > > [Adam Joseph] > > > > *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation > was > > causing incorrect results in some cases as a result. > > [Paul Dale] > > > > *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were > failing to > > report correct results in some cases > > [Matt Caswell] > > > > *) Fixed a regression introduced in 1.1.1o for re-signing certificates > with > > different key sizes > > [Todd Short] > > > > *) Added the loongarch64 target > > [Shi Pujin] > > > > *) Fixed a DRBG seed propagation thread safety issue > > [Bernd Edlinger] > > > > *) Fixed a memory leak in tls13_generate_secret > > [Bernd Edlinger] > > > > *) Fixed reported performance degradation on aarch64. Restored the > > implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: > avoid > > 32-bit lane assignment in CTR mode") for 64bit targets only, since > it is > > reportedly 2-17% slower and the silicon errata only affects 32bit > targets. > > The new algorithm is still used for 32 bit targets. > > [Bernd Edlinger] > > > > *) Added a missing header for memcmp that caused compilation failure > on some > > platforms > > [Gregor Jasny] > > > > [1] https://www.openssl.org/news/cl111.txt > > [2] https://www.openssl.org/news/vulnerabilities.html > > > > Signed-off-by: Peter Seiderer > > --- > > package/libopenssl/libopenssl.hash | 4 ++-- > > package/libopenssl/libopenssl.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 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From marcus.folkesson at gmail.com Mon Feb 20 07:18:46 2023 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Mon, 20 Feb 2023 08:18:46 +0100 Subject: [Buildroot] [PATCH v2] package/libcamera-apps: enable LIBAV only if libdrm is present Message-ID: <20230220071846.2334907-1-marcus.folkesson@gmail.com> Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps does enable LIBAV by default which depends on libdrm. Fixes: - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 13 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Marcus Folkesson --- Notes: v2: -Add dependency to ffmpeg package/libcamera-apps/Config.in | 1 + package/libcamera-apps/libcamera-apps.mk | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in index 711fd6de05..d0cc6a4210 100644 --- a/package/libcamera-apps/Config.in +++ b/package/libcamera-apps/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS 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_FFMPEG if BR2_PACKAGE_LIBDRM 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 diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 290ee9a026..1464875298 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -23,10 +23,12 @@ LIBCAMERA_APPS_CONF_OPTS = \ -DENABLE_TFLITE=0 ifeq ($(BR2_PACKAGE_LIBDRM),y) -LIBCAMERA_APPS_DEPENDENCIES += libdrm +LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 endif ifeq ($(BR2_PACKAGE_XORG7),y) -- 2.38.1 From marcus.folkesson at gmail.com Mon Feb 20 07:25:13 2023 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Mon, 20 Feb 2023 08:25:13 +0100 Subject: [Buildroot] [PATCH] package/libostree: bump to version 2023.1 Message-ID: <20230220072513.2336540-1-marcus.folkesson@gmail.com> Signed-off-by: Marcus Folkesson --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index ed31109fdb..3098cdd1fc 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f libostree-2022.7.tar.xz +sha256 dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55 libostree-2023.1.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 8e8ec63213..4b17fcf391 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2022.7 +LIBOSTREE_VERSION = 2023.1 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) -- 2.38.1 From buildroot at heine.tech Mon Feb 20 07:48:06 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 20 Feb 2023 08:48:06 +0100 Subject: [Buildroot] =?utf-8?q?=5BPATCH=5D_packge/libabseil-cpp=3A_bump_t?= =?utf-8?q?o_version_20230125=2E0?= In-Reply-To: <20230219220217.6b34a65f@windsurf> Message-ID: <10dac5-63f32580-3-1c9b7240@22476584> Hi, On Sunday, February 19, 2023 22:02 CET, Thomas Petazzoni wrote: > Hello Michael, > > On Sat, 18 Feb 2023 12:48:37 +0100 > Michael Nosthoff via buildroot wrote: > > > libabseil now depends on c++14 and gcc >= 7.3.1 [0][1] > > > > [0] https://github.com/abseil/abseil-cpp/releases/tag/20230125.0 > > [1] https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md > > > > Signed-off-by: Michael Nosthoff > > --- > > > > Note: > > I'm not sure if the BR2_TOOLCHAIN_GCC_AT_LEAST_7 dependency is sufficient. > > But I don't think we have a more version specific Flag available? > > We don't have more specific blind options than 7.x, 8.x, etc. to > describe a gcc dependency. > > > package/grpc/Config.in | 6 +++--- > > package/libabseil-cpp/Config.in | 6 +++--- > > package/libabseil-cpp/libabseil-cpp.hash | 2 +- > > package/libabseil-cpp/libabseil-cpp.mk | 6 +++--- > > 4 files changed, 10 insertions(+), 10 deletions(-) > > I'm afraid this is not sufficient. Indeed, you need to look at the > reverse dependencies of GRPC for example. > > So, package/falcosecurity-libs needs to be adjusted, then > package/sysdig as well, and also the BR2_PACKAGE_COLLECTD_GRPC option > from package/collectd. > good point. since grpc now also only has "officially support for gcc 7.3+" I would then first bump grpc with all it dependencies and then resubmit this patch. https://github.com/grpc/grpc/blob/master/src/cpp/README.md > Could you have a look into this, and submit an updated version? > > Thanks a lot! > > Thomas Regards, Michael From thomas.petazzoni at bootlin.com Mon Feb 20 08:23:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 09:23:53 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: remove Shyam Saini Message-ID: <20230220082433.172298609A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd351c4e933e48f380cc8924d1659b220d13b70c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Shyam's email address at Savoir Faire Linux is bouncing, so drop they from the DEVELOPERS file. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index a7a0bb14d1..2eff5b23ef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2605,9 +2605,6 @@ F: package/tunctl/ F: package/ubus/ F: package/wolfssl/ -N: Shyam Saini -F: package/cukinia/ - N: Simon Dawson F: boot/at91bootstrap3/ F: package/cppzmq/ From aleksander at aleksander.es Mon Feb 20 08:28:42 2023 From: aleksander at aleksander.es (Aleksander Morgado) Date: Mon, 20 Feb 2023 09:28:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/modem-manager: fix static build In-Reply-To: <20230219224546.1232023-1-fontaine.fabrice@gmail.com> References: <20230219224546.1232023-1-fontaine.fabrice@gmail.com> Message-ID: Hey, On Sun, Feb 19, 2023 at 11:45 PM Fabrice Fontaine wrote: > > Commit d769cfc13f6c2544f8bc5b6339d23763319a2383 was incomplete as > plugins/meson.build still unconditionally calls shared_module. So > disable plugins to fix the following static build failure raised since > bump to version 1.20.2 in commit > b95334b71fbdde0f7621b58ed35fa98df9e0966d: > > [238/417] Linking target plugins/libmm-shared-telit.so > FAILED: plugins/libmm-shared-telit.so > > Plugins could be enabled back through builtin_plugins as soon as > https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/1c4da332ee6e0d948f85a63f74cb27e89075c011 > lands in a stable release > > Fixes: > - http://autobuild.buildroot.org/results/deb2a752accb021392bb9dc3d06b2b1bf151535c > > Signed-off-by: Fabrice Fontaine > --- > package/modem-manager/modem-manager.mk | 44 ++++++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > > diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk > index 979a80a8e9..824b9eda5a 100644 > --- a/package/modem-manager/modem-manager.mk > +++ b/package/modem-manager/modem-manager.mk > @@ -80,6 +80,50 @@ else > MODEM_MANAGER_CONF_OPTS += -Dbash_completion=false > endif > > +ifeq ($(BR2_STATIC_LIBS),y) > +MODEM_MANAGER_CONF_OPTS += \ > + -Dplugin_generic=disabled \ > + -Dplugin_altair_lte=disabled \ > + -Dplugin_anydata=disabled \ > + -Dplugin_broadmobi=disabled \ > + -Dplugin_cinterion=disabled \ > + -Dplugin_dell=disabled \ > + -Dplugin_dlink=disabled \ > + -Dplugin_fibocom=disabled \ > + -Dplugin_foxconn=disabled \ > + -Dplugin_gosuncn=disabled \ > + -Dplugin_haier=disabled \ > + -Dplugin_huawei=disabled \ > + -Dplugin_intel=disabled \ > + -Dplugin_iridium=disabled \ > + -Dplugin_linktop=disabled \ > + -Dplugin_longcheer=disabled \ > + -Dplugin_mbm=disabled \ > + -Dplugin_motorola=disabled \ > + -Dplugin_mtk=disabled \ > + -Dplugin_nokia=disabled \ > + -Dplugin_nokia_icera=disabled \ > + -Dplugin_novatel=disabled \ > + -Dplugin_novatel_lte=disabled \ > + -Dplugin_option=disabled \ > + -Dplugin_option_hso=disabled \ > + -Dplugin_pantech=disabled \ > + -Dplugin_qcom_soc=disabled \ > + -Dplugin_quectel=disabled \ > + -Dplugin_samsung=disabled \ > + -Dplugin_sierra_legacy=disabled \ > + -Dplugin_sierra=disabled \ > + -Dplugin_simtech=disabled \ > + -Dplugin_telit=disabled \ > + -Dplugin_thuraya=disabled \ > + -Dplugin_tplink=disabled \ > + -Dplugin_ublox=disabled \ > + -Dplugin_via=disabled \ > + -Dplugin_wavecom=disabled \ > + -Dplugin_x22x=disabled \ > + -Dplugin_zte=disabled > +endif > + You can disable all plugins altogether with "-Dauto_features=disabled"; it is the recommended way to do so in MM 1.20. But I wonder, is it only to have the build with static libs pass? MM 1.20 without plugins will not be usable at all, at least one plugin is required, so not sure how useful that is. In MM 1.22 (or git main) there is the new "-Dbuiltin_plugins=true" option that will embed all selected plugins within the ModemManager daemon binary itself. Cheers! From aperez at igalia.com Mon Feb 20 08:42:39 2023 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 20 Feb 2023 10:42:39 +0200 Subject: [Buildroot] [PATCH] package/wpewebkit: security bump to version 2.38.5 Message-ID: <20230220084239.3714786-1-aperez@igalia.com> Bugfix release, fixes zero-day CVE-2023-23529 and includes a few build and behaviour patches as well. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.5.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0002.html Signed-off-by: Adrian Perez de Castro --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index dcd082e045..0fa1018721 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums -md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz -sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz -sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.5.tar.xz.sums +md5 73f7abd0c1cc808032869f72602166e3 wpewebkit-2.38.5.tar.xz +sha1 3f10a04758eeb349f63f841aff765dae25bcde1b wpewebkit-2.38.5.tar.xz +sha256 ff00fd3d0a4c6d551850a78a7dfe4883b6b7ebd93c5549e1121b2f43d3ac1661 wpewebkit-2.38.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b9c2fef395..48e5c2f8cd 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.4 +WPEWEBKIT_VERSION = 2.38.5 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES -- 2.39.2 From thomas.petazzoni at bootlin.com Mon Feb 20 06:40:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 06:40:18 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-19 Message-ID: <20230220064026.151B540B90@smtp2.osuosl.org> Hello, Autobuild statistics for 2023-02-19 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 17 | 13 | 0 | 30 | master | 136 | 181 | 2 | 319 | Classification of failures by reason for master ----------------------------------------------- gnupg2-2.4.0 | 16 host-go-1.19.6 | 10 gobject-introspection-1.72.0 | 8 elfutils-0.186 | 7 host-binutils-2.38 | 5 libglib2-2.72.3 | 5 linux-6.1.11 | 5 unknown | 5 glibc-2.36-81-g4f4d7a13edfd... | 4 host-binutils-2.39 | 4 linux-5.10.162-cip24-rt10 | 4 perl-5.36.0 | 4 speechd-0.11.4 | 4 zabbix-6.2.7 | 4 busybox-1.36.0 | 3 libgpg-error-1.46 | 3 php-xdebug-3.0.4 | 3 python-numpy-1.23.5 | 3 alsa-lib-1.2.8 | 2 gitlab-runner-15.5.0 | 2 gobject-introspection | 2 host-binutils-2.37 | 2 host-pahole-1.24 | 2 host-rust-1.67.0 | 2 ipmiutil-3.1.8 | 2 ltp-testsuite-20220930 | 2 musl-1.2.3 | 2 olsr-0.9.8 | 2 sdl-1.2.15 | 2 systemd-252.4 | 2 uclibc-1.0.42 | 2 valgrind-3.19.0 | 2 xvisor-0.3.1 | 2 apcupsd-3.14.14 | 1 assimp-5.2.5 | 1 bind-9.16.33 | 1 binutils-arc-2020.09-release | 1 brltty-6.5 | 1 cairo-1.16.0 | 1 check-0.15.2 | 1 cmocka-1.1.5 | 1 cni-plugins-1.2.0 | 1 crucible-2022.05.25 | 1 cups-pk-helper-0.2.7 | 1 dhcp-4.4.3-P1 | 1 flannel-0.14.0 | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fstrcmp-0.7.D001 | 1 gerbera-1.10.0 | 1 heirloom-mailx-12.5 | 1 host-libarchive-3.6.2 | 1 jailhouse-0.12 | 1 libabseil-cpp-20220623.1 | 1 libdeflate-1.15 | 1 libgcrypt-1.10.1 | 1 libjxl-0.7.0 | 1 libmodsecurity-3.0.8 | 1 libnss-3.88.1 | 1 libsigsegv-2.14 | 1 linux-5.10.162-cip24 | 1 lpc32xxcdl-2.11 | 1 lttng-modules-2.13.7 | 1 mariadb-10.3.36 | 1 modem-manager-1.20.4 | 1 modsecurity2-2.9.7 | 1 netsurf-3.10 | 1 nginx-1.22.1 | 1 openblas-0.3.21 | 1 optee-client-3.19.0 | 1 php-8.2.2 | 1 python-orjson-3.8.4 | 1 quickjs-2021-03-27 | 1 rdma-core-44.0 | 1 ruby-3.1.3 | 1 tmux-3.3a | 1 traceroute-2.1.0 | 1 uboot-tools-2021.07 | 1 uqmi-0a19b5b77140465c29e2af... | 1 wireguard-linux-compat-1.0.... | 1 xenomai-3.0.10 | 1 znc-1.8.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | alsa-lib-1.2.8 | NOK | http://autobuild.buildroot.net/results/e77d4f2d89b90513e26f560faf2ae3e0775d9867 | or1k | alsa-lib-1.2.8 | NOK | http://autobuild.buildroot.net/results/17e310b976d3c88cc8485e6387a2ecac5b9d02b9 | arc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/30034a25058a58e4ce976450589f23414d484991 | mipsel | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/f5cc21f4707de9f538deb99462e056bdd41aa71f | ORPH sh4aeb | bind-9.16.33 | NOK | http://autobuild.buildroot.net/results/2fa8d661ce0c9395ed4b16b766c251d052328fd5 | ORPH arc | binutils-arc-2020.09-release | NOK | http://autobuild.buildroot.net/results/e6ef6d73ae4ce2508a21f88399e53ef29f07f953 | microblaze | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/e877c64022814a7e87cc0fb779ac2281daeead44 | arm | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/f71a895c40f684a8665969665ae66d2d436a14b5 | ORPH arm | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/19a2a7f501f08b168edfd698731e98130dcb94ce | ORPH mips64 | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/55ab67f8b605ec4e46ce75ec60f675c57bc059ea | ORPH aarch64 | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/57575c4208d30804ba6708f3c8212538678c9171 | mipsel | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/5e860ecddfa8e80d6baacb029167d9059a6f5ce9 | ORPH armeb | cmocka-1.1.5 | NOK | http://autobuild.buildroot.net/results/d940854294073cf6ff94d35369810731443cdab7 | s390x | cni-plugins-1.2.0 | NOK | http://autobuild.buildroot.net/results/48fdfea7436aa845a778d2b0de98cd1f0145008c | powerpc64le | crucible-2022.05.25 | NOK | http://autobuild.buildroot.net/results/80565f130b0250e13f28df065feed4e0b9fe2f33 | mips | cups-pk-helper-0.2.7 | NOK | http://autobuild.buildroot.net/results/2b0b01b26849427918f88d79858fb28762a409e9 | ORPH xtensa | dhcp-4.4.3-P1 | NOK | http://autobuild.buildroot.net/results/1169ecfc95f46d48ec7f1989a00bdfd7582997fe | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/e7efa8251502d48a04c12631db9f035b5c3902d0 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/6661d823edcd0e110f6088b08f48ceaa97e49aec | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/46396bb7b38ad211db25ff34d486a992e2f82dab | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/0783577b2ee0cb1a4dd4ca34928fbdc6a844e446 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/fe3a619d81b68cf1cbc9002337944f65da97842d | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/c5bd864fdb66d460920cd7a6643fd2979a81ea74 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/9da112fa5e327ceabec0ad54bc74667ff04d3013 | ORPH aarch64 | flannel-0.14.0 | NOK | http://autobuild.buildroot.net/results/7e487d61d5ca2743b6a2fcdbd20e82ca85152e08 | aarch64_be | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/09655c0239db56734d5e02121e4bca6a26d46409 | powerpc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/19135597a2b6e9ba3cf10fff8bbc9652449f75fc | mips | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/0adccc0e9884ef11edd4b1c1e5e03bd25267c3a6 | riscv64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/7d8f464031df91580c080688cdb069661a64ba9d | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/20c7a03966531675e6430e6642ca33e30f9bd009 | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/2f57e98633d0d02d6f9b1a4d111f0a09baf5d41f | aarch64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/52420685f2e7960aa95319a2c8f8b34f9e8315d3 | aarch64_be | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/453b069d076e86cb0f12fd5fdaf1eda7f2df83d9 | armeb | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/d04062bbd577f97d4dd3aaa3ab5f0c69dce42c86 | sh4aeb | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/479511a7ecd7132804d8aff2262b3b96e257c9aa | mipsel | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/a38f62deec8e30802bed40dcc9202cd5124857b2 | i686 | gitlab-runner-15.5.0 | NOK | http://autobuild.buildroot.net/results/e6800fd2ba542593d1dfd7ece64a5ccead33d84c | arm | gitlab-runner-15.5.0 | NOK | http://autobuild.buildroot.net/results/031c5178a46574aaf19bece23fc6c3417e46d448 | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/718dea23b00020806335853f7371fcda69fcf70d | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/040130cb75ee7228582fa15905ee3f8601bc0485 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/1f9e306beb1df5d6b144cc92fc4341e85eb1c586 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/cd6c325a6bc8c20092fd26442e0d6e038dea5b8d | or1k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/bca427c4ac05555314070e90138fa81843247df6 | sh4a | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/14a8163b3d3d7163dd9f07d6dcc73874315203c0 | powerpc | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/1e5faf936c358a1351a029c9c1d59818214fb940 | mipsel | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/e837c78635cf3f74cadcf6ac647f49df579157a4 | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/81f2489ab125886612b0c7c34dcd0094a94eb336 | riscv32 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/37ca8cff0c90ef1b5ef19552c2937ca72244245f | sh4 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/d2dcb776ab257b72aa630281c2b53be17952dcd7 | sparc64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/bffeebc83c3f17781b145da91676dd874aca891b | mips64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/41e9e430f980709cfa74eafb9ff1365556d43bf1 | sh4a | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/efcd04496dc54c9db2bccfc264c19a013cf55204 | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/ed6adca256fd4d5282f8d5771245e605a017ebb0 | x86_64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/79bdab498d611c6990c848ba7b905187901c7a11 | s390x | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/4bb28d54a9cc193c755643501d51d0cbe1598ebc | or1k | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/cc640b7c2aba872cacf5e866b6d22bd10e045dab | aarch64 | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/45414f1030eafd39a268aabdb84b1ddf5c171161 | sparc | gnupg2-2.4.0 | NOK | http://autobuild.buildroot.net/results/b473a55bc76fe9c8d402cc9a21297aef94f96e68 | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/b6b606618d74c0faa1624cd47e548cb1e8ea5cd1 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/cf77a3579a4c18e082d28a6109879aa056bd81f3 | or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/4d9b2450dae4846ad2613cbd81bfead48c50bac3 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/93059a5f66e6b3cf3779dd9345caf3502a53ff6d | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3d4311bb45b68dc009258d316f053828c0e7fb0b | ORPH sh4eb | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/c8693e29e917b47715263868299404012766a897 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7759bbe2d9edf8daa020e4a5d08dff417f41b56d | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/e9377d9950949bb87bbf79af2a297692af8d3ca8 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/152ecd4b7a1b219cb5ad7ce542a021abc534e687 | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/c0292713197e897bdc5ebea7592fa010f494185b | ORPH sh4eb | heirloom-mailx-12.5 | NOK | http://autobuild.buildroot.net/results/d4780c224d1e9ad2506364ecbd9e5c235e7b40a6 | powerpc64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/68533f21e728441a76f58dd14f11f7de250a1f62 | microblazeel | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/862c4edcb240e48c2dbccc14669672c73fc55993 | armeb | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/52523993ca67032051ebc937dbe3b333758b30c5 | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/0f6e55f1eaa17686d4d662aa67b3fff1d2adfe40 | or1k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/bae7c55560c3e108a6c24aa4edc0ab67939d7b2f | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/a647f8b97e98d593a246a0c4a570f97f28aba728 | mips64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/67b0e647156cae8e3e75a11295ac327457b1782b | mips64el | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/857f923a1716ba421d0df65f7ed765891c6b3190 | sh4eb | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/946e04319c6580840cdad1337934e1e82163ca53 | arceb | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/a7ea31fcb6b0b3cdd86fc9433bfbd72c2dc64238 | microblaze | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/7c922f644cbd1681e7b0c4b0d785891696c4694b | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/98e954edc6d27e55591e5a52f6616039ec408f94 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/b6b1bec8bc400f82a94ef546bdd131d138bdd347 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/037a50a07d02a44bde0f693eccb8d4ebb97dd490 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/ee505334ac261d4b7889b9a4efb762ae7df7fca7 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/bc1a8f571f1c88f96e627e269bebc9be07f18cbd | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/dda088eb1f43416e5eba0ddfa0d166193ee8c9ec | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/a486cf06e8786b2e31b49d3aef277d0d98ba1c62 | i586 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/bb5be2862e9c966d7f422d1620698044cadbe5e7 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/a81fbdac9c37ff246917e77879fcd3ea673d5c4b | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/72292f74c48044f3bf8d1df400d3d2988c51816c | sparc64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/452f239a590876c60adcaa6490621c529e66fd3b | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d87367b9a7c9079e87dfb996a16e40ad51a97c94 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/cdf30e4f23c8e74d164dbd823a4e042740a5d036 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/a5581177c35fbfcee41e28e8bbd226cb71d89345 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/2635bde5bd856a69db542fe66713f942c5f9cf9f | x86_64 | ipmiutil-3.1.8 | NOK | http://autobuild.buildroot.net/results/6b6ea2ddc29f112ba1e4a78f36c42b109a10cd3d | i586 | ipmiutil-3.1.8 | NOK | http://autobuild.buildroot.net/results/e9ff3bd08e106dc834968bf5e4296ce8299027f8 | x86_64 | jailhouse-0.12 | NOK | http://autobuild.buildroot.net/results/d62a535681de32882f24a5181a414f687ca052ee | mips64el | libabseil-cpp-20220623.1 | NOK | http://autobuild.buildroot.net/results/25a5bfa2ede8f94f61e9ffc04093ec820e79b289 | armeb | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/45225328f3ebdbf775a3d98c96831f1898de902e | armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/9ae272f6808f1d5524223e3914c902e5dac46e34 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/e25252e6522b254a5db6cc01ba477e1fb50d9933 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/06fad6fe850c77fce6c61d97d79a5efeb495fe5b | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/9cdcd6858395e35edce6ec161277c408a41cf575 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/2f29bc0c16ccdc06b41e05d3147eb09fdde14e2d | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/70b2a198525324277ac239d34d47d158968fb748 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/3400830ff0f2f961f0dd42239a4d3007c6ab7eb2 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/ba5b3384d6f6911c3806409fb080992bc72ef1e0 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/b56e51c23cb733da9ecd97a9205c49863df80bc9 | ORPH sparc | libjxl-0.7.0 | NOK | http://autobuild.buildroot.net/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 | powerpc64le | libmodsecurity-3.0.8 | NOK | http://autobuild.buildroot.net/results/4c235e46188f23d1a48297f4e5942cec7b25959a | powerpc64le | libnss-3.88.1 | NOK | http://autobuild.buildroot.net/results/e8d7b09f5d3ddaa3072f4b7fb9e4e2eb010708ea | arceb | libsigsegv-2.14 | NOK | http://autobuild.buildroot.net/results/a756d96821ca14bc087497ca893c1dc5e8a04f7a | powerpc | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/3f3626738ce82b9ebc63c08405528d7762edaed7 | ORPH sh4a | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/836f57706ff464a20f8e450ff8cc7a7b84358dd6 | ORPH powerpc | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/c71938ce28597ccef5f01add72bb9f1ea95724bd | ORPH mips64 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/7523f4d5e08bea64f30e75265767dbd9399549ad | ORPH nios2 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/61a2d206ac7b5d5a9c1890f532cce49b9f34c236 | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4250abc61638830c17fe1927054a7793ae115c2c | ORPH mips64el | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/cfcbc9b0b69e3151eff2574fe3fe0636f8ef0046 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/fb8416f94e2fd7c73b6c2a83cf4a544854e50a63 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/ffb474c2da32b1185c1e72fb71c5da413f2c44d4 | ORPH aarch64_be | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/f4404c101d790a8ced36f6715482bd90a8af3095 | ORPH arm | lpc32xxcdl-2.11 | NOK | http://autobuild.buildroot.net/results/46cca35e83c21117fa099813353c4369fce4890f | ORPH sparc64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/c2f3f9db51fa36dd7b9ecbd2ed028a1ae103db15 | powerpc64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/cb3adc16eaa4880fd8c34d132896845943e426c1 | arceb | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/b45faebac994378cf1d2ced9c76525225e106731 | sparc | mariadb-10.3.36 | NOK | http://autobuild.buildroot.net/results/97db9b9350d6ae639187b169ae6ce0eefc956203 | ORPH xtensa | modem-manager-1.20.4 | NOK | http://autobuild.buildroot.net/results/deb2a752accb021392bb9dc3d06b2b1bf151535c | mips64el | modsecurity2-2.9.7 | NOK | http://autobuild.buildroot.net/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/bc652c57de1ec51250219d5ccab118bf6eaecd77 | powerpc | musl-1.2.3 | NOK | http://autobuild.buildroot.net/results/381f44e2a611bf0a710e52a080668719ce1e674d | arc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/0bdc44d0ed711438c83dae7e2f9863bc4a1dbfc6 | powerpc | nginx-1.22.1 | NOK | http://autobuild.buildroot.net/results/63c6a553b3223b7c05cb9cb7338d4826836e9987 | aarch64_be | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/1c246a7b6312337cb9a609be2797cb7e4df156ae | ORPH microblaze | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/025ba50e9a70255bca07d43e8402bf26dc23fbb2 | ORPH mips64 | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/c52262f4d8e8f56b3ecce93d91aa07439ae84ea1 | ORPH sparc | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/03a3f2269e403ba7a9d71fc8e82d297b754e1924 | aarch64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/0328c5f741098703ce3c36d0c6ab38a752fb71b3 | or1k | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/442e182c43511dcb026e1c12e456e43671d532b7 | armeb | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/97bef2dfdc54036b180e8be82a20dd6607ef4f25 | mips64el | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/6ad13a85ceb32786d1796433ad15dabe0718dee2 | microblaze | php-8.2.2 | NOK | http://autobuild.buildroot.net/results/21eb094f14fc5c1abcf6bfbc285e9dc6c8f4c1ab | x86_64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/dcdebe6b551c03f69e329621aca38a00ce4d9499 | powerpc64le | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/c16325d76b8a253961ee43c9d4fcb4ff5e6f9e7f | mips64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/4a2e41eaca34c784018300d6bfdd0e4544531446 | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/5bb7e57e14ce866044056e398d94664eb6afa16b | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/30a58fe0224888b3ba7513478e58535b5988bec1 | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/3aa43e0c6f785d05485dbdd8112a65f33a2e6c7f | mips | python-orjson-3.8.4 | NOK | http://autobuild.buildroot.net/results/70e373857799260339fcc752216e50d112f53383 | sh4aeb | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/0c0a21f3713aedf6c2779e7ec019a9ce38d02808 | microblazeel | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/18f6efa7f69bb90b4539d86201ca62604bc6da92 | arc | ruby-3.1.3 | NOK | http://autobuild.buildroot.net/results/c71496f9d37d6b2a97309da0b34962dc8a26983c | sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/2fb3246e2bd49e327a066d3811777db04dacdfe1 | ORPH sh4aeb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/64636dbdf44b40a64b998eb4fa7646f6bc92c6fd | ORPH or1k | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/0d18510e728e2e3b42abdc736ac5d2423fed16b2 | aarch64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/2f6c8b3674753d6a9f165117c70e7dad88505505 | armeb | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/69cd1680553f9dfda365eaef770d6d1bd92d137c | nios2 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/317b2a48cf986278fbe498c179afe1b5438ef699 | aarch64_be | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/efbc9d39fe9233b7532e5f43b5f4632b19c4a15c | powerpc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/86dceadac182e6e9f9c2e38ac0b1fe00e9e9b141 | aarch64 | tmux-3.3a | NOK | http://autobuild.buildroot.net/results/6e8523d8d514bf6d8fc3377d05e5edbe7fc2d5bb | powerpc64le | traceroute-2.1.0 | NOK | http://autobuild.buildroot.net/results/5f4d2733c45691b256840384fb16402befd856ef | sparc64 | uboot-tools-2021.07 | NOK | http://autobuild.buildroot.net/results/d86963ce0fa511954c3da23c226a2e46027123cd | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/625fcf01bcf283ae7529f90ad55bc84e75006ec7 | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/6149c8d8641b7a084b5c2f217e38ca592b5160fb | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/9eed5f583131d6b92613548f56e7e785fbe0bc25 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/06737aa4c1f68e5009db72b05a3eef461487f5ec | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/75eb256521c74212101d08cebdba47413ddf7531 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/e436c583ebe0e8d075509f54a1c428ff309952f1 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/1c779abdfb8b62da7f13cdfe5c06fd3530f43f61 | sh4a | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/a0af9d22c4594b9b618c443dc3e390ccb87e134e | ORPH mips64el | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/b44a35fedd5a41f61dfe41851c1eded5e7355f66 | ORPH mips64 | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/e3a35eec1b118ab411b797f91bb1f968d18fdc78 | ORPH aarch64_be | wireguard-linux-compat-1.0.... | NOK | http://autobuild.buildroot.net/results/dfd7d8acc4874e77043b0efcc7088fc8116225fa | nios2 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/f7d6a401eaa179d59843d531f568988cd7802b82 | aarch64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/29cb6ffd0b7e7af068e83d32214277b44266339c | aarch64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/25e7ab1e39b0cc352b472211c9d93301f8ff2de5 | aarch64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/68677fee0e9db08604dd467760675622afc69d57 | nios2 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/17c364d60e87ff13e67c210977455e0d170a58ba | i686 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/701b343b3b0d471c75899b61d02bd9d63a272247 | powerpc64le | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/8a49327e5ac4490e65d7c9f5188834fe241b0e55 | arm | znc-1.8.2 | NOK | http://autobuild.buildroot.net/results/8cc95aa53d2cad108873792ea8abf73cecb90f6b | Classification of failures by reason for 2022.11.x -------------------------------------------------- gobject-introspection-1.72.0 | 2 host-pahole-1.24 | 2 xz-5.2.7 | 2 fstrcmp-0.7.D001 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 host-binutils-2.38 | 1 host-go-1.19.5 | 1 python-numpy-1.23.4 | 1 unknown | 1 zstd-1.5.2 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- armeb | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/3685097c02223cd99520d6ad3154a15e164f41fa | arceb | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/9c3cd71b81f725083f230d4799109395bf988f2e | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/77da8330370d369556f186c476f1560fd8621595 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/74d94d64b1f10fc9d8157ac158390b965b8f15ba | ORPH x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1f871b15fd6cfa8e827bab57b6a152f800eac926 | i686 | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/402514edb9fd0b4bdb93b7da13d4aa9cda62bd41 | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/c2cf853a9bc42721c729e0a7f052988ca9561172 | nios2 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/87cd47f24b4859780bfde0cff937be7fc8e4f32b | arm | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/0f7879ff04e1cb3e6f4510aeb373355c7fdb33e5 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/cfb69b80e5c9add3bd6b1cbe708fdff498ea7088 | microblazeel | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/3142c0a1a5ed851ca7a9a5ba1463619684499b26 | ORPH microblazeel | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/11e98a0e34e965f029a9c9e9cce265fedd2e6d39 | ORPH microblazeel | zstd-1.5.2 | NOK | http://autobuild.buildroot.net/results/cc78293687bf615bb229514bb5e21d9eb8594e0e | Gitlab CI results for 2023-02-19 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestAarch64Pages64kGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542058 | ORPH TestAarch64Pages64kMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542059 | ORPH TestAarch64Pages64kuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542060 | ORPH TestClangCompilerRT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541819 | ORPH TestCrudiniPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541820 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541821 | ORPH ...rch64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542069 | ORPH ...tlinAarch64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542070 | ORPH ...arch64MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542071 | ORPH ...otlinAarch64MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542072 | ORPH ...ch64UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542073 | ORPH ...linAarch64UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542074 | ORPH ...h64beGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542075 | ORPH ...inAarch64beGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542076 | ORPH ...64beUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542077 | ORPH ...nAarch64beUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542078 | ORPH ...750dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542079 | ORPH ...nArcle750dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542080 | ORPH ...ehs38GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542081 | ORPH ...inArclehs38GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542082 | ORPH ...hs38UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542083 | ORPH ...nArclehs38UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542084 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542086 | ORPH ...mebv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542087 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542088 | ORPH ...rmebv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542089 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542090 | ORPH ...ebv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542091 | ORPH ...5eabiGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542092 | ORPH ...inArmv5eabiGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542093 | ORPH ...v5eabiMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542094 | ORPH ...linArmv5eabiMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542095 | ORPH ...eabiUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542096 | ORPH ...nArmv5eabiUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542097 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542098 | ORPH ...Armv6eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542099 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542100 | ORPH ...nArmv6eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542101 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542102 | ORPH ...rmv6eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542103 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542104 | ORPH ...Armv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542105 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542106 | ORPH ...nArmv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542107 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542108 | ORPH ...rmv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542112 | ORPH ...mv7mUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542113 | ORPH ...tlinArmv7mUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542115 | ORPH ...8xxxUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542117 | ORPH ...nM68k68xxxUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542118 | ORPH ...fireUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542119 | ORPH ...8kcoldfireUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542120 | ORPH ...azebeGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542121 | ORPH ...icroblazebeGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542122 | ORPH ...lazebeMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542123 | ORPH ...MicroblazebeMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542124 | ORPH ...zebeUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542125 | ORPH ...croblazebeUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542126 | ORPH ...azeelGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542128 | ORPH ...icroblazeelGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542129 | ORPH ...lazeelMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542130 | ORPH ...MicroblazeelMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542131 | ORPH ...zeelUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542132 | ORPH ...croblazeelUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542133 | ORPH ...ips32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542134 | ORPH ...otlinMips32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542135 | ORPH ...Mips32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542136 | ORPH ...ootlinMips32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542137 | ORPH ...ps32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542138 | ORPH ...tlinMips32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542139 | ORPH ...s32elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542140 | ORPH ...linMips32elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542141 | ORPH ...ps32elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542143 | ORPH ...tlinMips32elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542144 | ORPH ...32elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542145 | ORPH ...inMips32elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542146 | ORPH ...2r5elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542147 | ORPH ...nMips32r5elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542148 | ORPH ...32r5elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542149 | ORPH ...inMips32r5elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542150 | ORPH ...r5elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542151 | ORPH ...Mips32r5elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542152 | ORPH ...2r6elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542153 | ORPH ...nMips32r6elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542155 | ORPH ...32r6elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542156 | ORPH ...inMips32r6elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542157 | ORPH ...r6elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542158 | ORPH ...Mips32r6elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542159 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542160 | ORPH ...Mips64eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542161 | ORPH ...4eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542162 | ORPH ...nMips64eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542163 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542164 | ORPH ...ips64eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542165 | ORPH ...64n32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542166 | ORPH ...inMips64n32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542167 | ORPH ...s64n32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542169 | ORPH ...linMips64n32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542170 | ORPH ...4n32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542172 | ORPH ...nMips64n32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542173 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542174 | ORPH ...ps64r6eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542175 | ORPH ...6eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542176 | ORPH ...ips64r6eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542177 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542178 | ORPH ...s64r6eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542179 | ORPH ...Nios2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542180 | ORPH ...ootlinNios2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542181 | ORPH ...nriscGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542182 | ORPH ...linOpenriscGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542183 | ORPH ...enriscMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542184 | ORPH ...tlinOpenriscMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542185 | ORPH ...riscUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542186 | ORPH ...inOpenriscUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542187 | ORPH ...440fpGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542188 | ORPH ...owerpc440fpGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542189 | ORPH ...c440fpMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542190 | ORPH ...Powerpc440fpMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542191 | ORPH ...40fpUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542192 | ORPH ...werpc440fpUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542193 | ORPH ...e5500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542195 | ORPH ...erpc64e5500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542196 | ORPH ...e6500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542197 | ORPH ...erpc64e6500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542198 | ORPH ...4e6500MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542199 | ORPH ...werpc64e6500MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542200 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542201 | ORPH ...c64lepower8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542202 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542204 | ORPH ...pc64lepower8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542207 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542208 | ORPH ...rpc64power8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542209 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542210 | ORPH ...erpc64power8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542211 | ORPH ...300c3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542212 | ORPH ...werpce300c3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542213 | ORPH ...e300c3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542214 | ORPH ...owerpce300c3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542215 | ORPH ...00c3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542216 | ORPH ...erpce300c3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542217 | ORPH ...500mcGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542218 | ORPH ...werpce500mcGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542219 | ORPH ...e500mcMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542220 | ORPH ...owerpce500mcMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542221 | ORPH ...00mcUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542223 | ORPH ...erpce500mcUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542227 | ORPH ...lp32dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542232 | ORPH ...lp64dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542237 | ORPH ...iscv64lp64dGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542238 | ORPH ...4lp64dMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542239 | ORPH ...Riscv64lp64dMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542240 | ORPH ...p64dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542241 | ORPH ...scv64lp64dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542243 | ORPH ...0xz13GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542244 | ORPH ...linS390xz13GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542245 | ORPH ...Shsh4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542246 | ORPH ...ootlinShsh4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542247 | ORPH ...nShsh4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542248 | ORPH ...BootlinShsh4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542249 | ORPH ...hsh4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542250 | ORPH ...otlinShsh4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542251 | ORPH ...h4aebGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542252 | ORPH ...linShsh4aebGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542253 | ORPH ...sh4aebMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542254 | ORPH ...tlinShsh4aebMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542255 | ORPH ...arc64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542256 | ORPH ...tlinSparc64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542257 | ORPH ...rcv8UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542258 | ORPH ...linSparcv8UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542259 | ORPH ...X8664GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542260 | ORPH ...ootlinX8664GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542261 | ORPH ...nX8664MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542262 | ORPH ...BootlinX8664MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542263 | ORPH ...8664UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542264 | ORPH ...otlinX8664UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542265 | ORPH ...orei7GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542266 | ORPH ...X8664corei7GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542267 | ORPH ...corei7MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542268 | ORPH ...nX8664corei7MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542269 | ORPH ...rei7UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542270 | ORPH ...8664corei7UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542271 | ORPH ...664v2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542272 | ORPH ...tlinX8664v2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542273 | ORPH ...8664v2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542274 | ORPH ...otlinX8664v2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542275 | ORPH ...64v2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542276 | ORPH ...linX8664v2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542277 | ORPH ...664v3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542278 | ORPH ...tlinX8664v3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542279 | ORPH ...8664v3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542280 | ORPH ...otlinX8664v3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542281 | ORPH ...64v3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542283 | ORPH ...linX8664v3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542285 | ORPH ...664v4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542286 | ORPH ...tlinX8664v4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542287 | ORPH ...8664v4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542288 | ORPH ...otlinX8664v4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542289 | ORPH ...64v4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542290 | ORPH ...linX8664v4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542291 | ORPH ...core2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542292 | ORPH ...linX86core2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542293 | ORPH ...ToolchainBuildrootMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542061 | ORPH ...olchainBuildrootuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542062 | ORPH ...xternalToolchainCCache | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542063 | ORPH ...ernalToolchainCtngMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542064 | ORPH ...rnalToolchainLinaroArm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542065 | ORPH ...ToolchainSourceryArmv4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542066 | ORPH ...ToolchainSourceryArmv5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542067 | ORPH ...ToolchainSourceryArmv7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542068 | ORPH TestFileCapabilities | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541783 | ORPH TestGlibcAllTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541792 | ORPH ...DefaultLimitedTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541799 | ORPH TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541825 | ORPH TestInitSystemBusyboxRo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541815 | ORPH TestIso9660Grub2EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541802 | ORPH TestIso9660Grub2External | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541803 | ORPH ...0Grub2ExternalCompress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541804 | ORPH TestIso9660Grub2Hybrid | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541805 | ORPH TestIso9660Grub2Internal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541806 | ORPH ...so9660SyslinuxExternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541807 | ORPH ...slinuxExternalCompress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541808 | ORPH ...so9660SyslinuxInternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541810 | ORPH TestJffs2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541811 | ORPH TestLibshdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541827 | ORPH TestLuaLuaCffi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541844 | ORPH TestLuaLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541872 | ORPH TestLuaLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541864 | ORPH TestLuaLzlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541886 | ORPH TestLuaRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542037 | ORPH TestLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541833 | ORPH TestLuajitLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541846 | ORPH TestLuajitLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541875 | ORPH TestLuajitLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541861 | ORPH TestLuajitRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542038 | ORPH TestLuajitTurbolua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542049 | ORPH TestMender | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541887 | ORPH TestOci | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541813 | ORPH TestOpkg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541898 | ORPH TestPerlGDGraph | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541909 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541914 | ORPH TestPerlX10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541916 | ORPH TestPerllibwwwperl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541913 | ORPH TestPhpApcu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541918 | ORPH TestPhpLuaLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541919 | ORPH TestPhpLuaLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541920 | ORPH TestPhpPam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541921 | ORPH TestPhpPeclDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541922 | ORPH TestPolkitSystemd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541926 | ORPH TestPyNdiff | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541994 | ORPH TestPython3PyPyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541930 | ORPH TestPythonAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541935 | ORPH TestPythonAvro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541938 | ORPH TestPythonPahoMQTT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541978 | ORPH TestPythonPy3Autobahn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541936 | ORPH TestPythonPy3Automat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541937 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541939 | ORPH TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541940 | ORPH TestPythonPy3Botocore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541941 | ORPH TestPythonPy3Can | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541942 | ORPH TestPythonPy3Cbor | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541944 | ORPH TestPythonPy3Click | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541952 | ORPH TestPythonPy3Colorzero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541953 | ORPH TestPythonPy3Constantly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541954 | ORPH TestPythonPy3Construct | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541955 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541956 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541957 | ORPH TestPythonPy3DBusFast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541958 | ORPH TestPythonPy3DBusNext | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541959 | ORPH TestPythonPy3Dicttoxml2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541960 | ORPH TestPythonPy3Distro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541961 | ORPH TestPythonPy3Django | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541962 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541963 | ORPH TestPythonPy3Flask | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541964 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541965 | ORPH TestPythonPy3Git | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541966 | ORPH TestPythonPy3Gitdb2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541967 | ORPH TestPythonPy3GnuPG | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541968 | ORPH TestPythonPy3Gobject | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541969 | ORPH TestPythonPy3Gpiozero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541970 | ORPH TestPythonPy3Hkdf | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541971 | ORPH TestPythonPy3Incremental | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541972 | ORPH TestPythonPy3Iptables | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541973 | ORPH TestPythonPy3Jmespath | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541974 | ORPH ...PythonPy3MagicWormhole | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541975 | ORPH TestPythonPy3Munch | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541977 | ORPH TestPythonPy3Passlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541980 | ORPH TestPythonPy3Pexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541985 | ORPH TestPythonPy3PyAlsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541986 | ORPH TestPythonPy3Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541993 | ORPH TestPythonPy3Pytest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541995 | ORPH ...PythonPy3PytestAsyncio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541996 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541997 | ORPH TestPythonPy3Qrcode | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541998 | ORPH TestPythonPy3RSA | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542000 | ORPH TestPythonPy3RpiGpio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541999 | ORPH TestPythonPy3S3transfer | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542020 | ORPH TestPythonPy3SciPy | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542021 | ORPH ...thonPy3ServiceIdentity | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542022 | ORPH TestPythonPy3Smmap2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542025 | ORPH TestPythonPy3Spake2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542026 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542027 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542028 | ORPH TestPythonPy3Txaio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542029 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542030 | ORPH TestPythonPy3Ubjson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542031 | ORPH ...y3UnitTestXmlReporting | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542032 | ORPH TestPythonPy3rtoml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542006 | ORPH TestPythonPybind | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795541992 | ORPH TestRdmaCore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542033 | ORPH TestRedis | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542034 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542039 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542040 | ORPH TestS6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542041 | ORPH TestS6Networking | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542042 | ORPH TestS6PortableUtils | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542043 | ORPH TestS6Rc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542044 | ORPH TestSudo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542045 | ORPH TestSyslogNg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542046 | ORPH TestTmux | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542047 | ORPH TestUbootOpensslPkgConfig | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542050 | ORPH TestZ3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542051 | ORPH TestZerofree | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542052 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542053 | ORPH TestZfsMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542054 | ORPH TestZfsUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3795542055 | ORPH Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.6 | 7.0.11 | ORPH acpica | DISTRO | https://release-monitoring.org/project/00018 | 20220331 | 20222010 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 43 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.5.4 | 4.6.0 | alfred | DISTRO | https://release-monitoring.org/project/241870 | 2022.1 | 2023.0 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 13.0.0_r31 | angularjs | DISTRO | https://release-monitoring.org/project/21321 | 1.8.2 | 1.8.3 | apitrace | DISTRO | https://release-monitoring.org/project/06170 | 10.0 | 11.1 | apr | DISTRO | https://release-monitoring.org/project/00095 | 1.7.0 | 1.7.2 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 12.0.0 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.29.1 | 20.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.46.0 | atkmm | DISTRO | https://release-monitoring.org/project/07962 | 2.36.1 | 2.36.2 | atop | DISTRO | https://release-monitoring.org/project/00135 | 2.8.0 | 2.8.1 | audit | DISTRO | https://release-monitoring.org/project/15225 | 3.0.7 | 3.1 | avocado | DISTRO | https://release-monitoring.org/project/13385 | 98.0 | 100.1 | avrdude | DISTRO | https://release-monitoring.org/project/10751 | 6.4 | 7.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_07_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.12.2 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 20.10.26 | 20.10.28 | bat | DISTRO | https://release-monitoring.org/project/241901 | 0.19.0 | 0.22.1 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2023.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2022.3 | 2023.0 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.8.2 | 1.9.0 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.2.23 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.2.23 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.2.23 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.5 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.38 | 2.40 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.11 | 2.0.12 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 24.0.1 | bluez5_utils | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bluez5_utils-headers | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH boost | DISTRO | https://release-monitoring.org/project/06845 | 1.80.0 | 1.81.0 | bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.2.3 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.16.2 | 6.1.3 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.21 | 3.25 | cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.8 | cairomm | DISTRO | https://release-monitoring.org/project/07959 | 1.16.1 | 1.16.2 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.7.4 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.5.0 | 1.5.2 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 3.9.1 | 4.2.1 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.15 | 7.0 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.18.0 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.8 | 1.0.1 | clang | DISTRO | https://release-monitoring.org/project/11811 | 11.1.0 | 15.0.7 | cli11 | DISTRO | https://release-monitoring.org/project/20578 | 2.3.1 | 2.3.2 | clinfo | DISTRO | https://release-monitoring.org/project/10503 | 3.0.21.02.21 | 3.0.23.01.25 | cloop | DISTRO | https://release-monitoring.org/project/21332 | 3.14.1.3 | 3.14.1.3+... | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.22.3 | 3.25.2 | collectl | DISTRO | https://release-monitoring.org/project/00330 | 4.3.2 | 4.3.8 | compiler-rt | GUESS | https://release-monitoring.org/project/17705 | 11.1.0 | 900 | ORPH containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.6.16 | 1.6.18 | crucible | DISTRO | https://release-monitoring.org/project/267616 | 2022.05.25 | 2022.12.06 | crudini | DISTRO | https://release-monitoring.org/project/21669 | 0.9.3 | 0.9.4 | crun | DISTRO | https://release-monitoring.org/project/96792 | 1.7.2 | 1.8 | cryptopp | DISTRO | https://release-monitoring.org/project/14487 | 8.6.0 | 8.7.0 | cukinia | DISTRO | https://release-monitoring.org/project/138119 | 0.6.0 | 0.6.1 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.16 | 1.28.17 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.7.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | dado | DISTRO | https://release-monitoring.org/project/58442 | 1.8.3-1 | 2.1.0-1 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.9 | 3.0.10 | dash | DISTRO | https://release-monitoring.org/project/00394 | 0.5.11.5 | 0.5.12 | ORPH datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.13.2 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.3.4 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.2.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.4.0 | dav1d | DISTRO | https://release-monitoring.org/project/18920 | 1.0.0 | 1.1.0 | dbus | DISTRO | https://release-monitoring.org/project/05356 | 1.12.24 | 1.14.6 | ORPH dbus-broker | DISTRO | https://release-monitoring.org/project/271475 | 32 | 33 | dbus-python | DISTRO | https://release-monitoring.org/project/00402 | 1.2.18 | 1.3.2 | ORPH dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH ddrescue | DISTRO | https://release-monitoring.org/project/00410 | 1.26 | 1.27 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.20.0 | 1.20.1 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20220117 | 1.3-20230209 | ORPH diffutils | DISTRO | https://release-monitoring.org/project/00436 | 3.8 | 3.9 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 23.0.0 | 23.0.1 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 2.15.1 | 2.16.0 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 23.0.0 | 23.0.1 | domoticz | DISTRO | https://release-monitoring.org/project/21342 | 2022.2 | 2023.1 | dos2unix | DISTRO | https://release-monitoring.org/project/00453 | 7.4.3 | 7.4.4 | dracut | DISTRO | https://release-monitoring.org/project/10627 | 057 | 059 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.21.4 | 9.23.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH dust | DISTRO | https://release-monitoring.org/project/141344 | 0.8.1 | 0.8.4 | ORPH e2fsprogs | DISTRO | https://release-monitoring.org/project/00646 | 1.46.5 | 1.47.0 | ORPH easy-rsa | DISTRO | https://release-monitoring.org/project/17770 | 3.1.1 | 3.1.2 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.18 | 1.19 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202211 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.1 | 1.26.3 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 21.12 | 23.01 | elfutils | DISTRO | https://release-monitoring.org/project/05679 | 0.186 | 0.188 | ORPH empty | DISTRO | https://release-monitoring.org/project/20564 | 0.6.22b | 0.6.23c | ORPH enchant | DISTRO | https://release-monitoring.org/project/06601 | 2.3.3 | 2.3.4 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.1 | 0.25.4 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 25.2.3 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.21 | 1.0.22 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.11.1 | 1.11.5 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.9.1 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.16 | 1.0.22 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.29 | 1.0.30 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.14 | 1.0.15 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.10 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.8 | 1.0.9 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.47 | 1.0.49 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.27 | 1.0.29 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.47 | 1.2.7 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.13 | 1.1.16 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.23 | 1.0.25 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.5.6 | 1.6.1 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.32 | 1.0.36 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.12 | 1.0.15 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.10 | 1.0.12 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.9.0.1 | 2.9.2.0 | exiv2 | DISTRO | https://release-monitoring.org/project/00769 | 0.27.5 | 0.27.6 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.30.1 | 1.31 | ORPH feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.9.1 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.35 | 6.4.36 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.3 | 5.1.2 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH file | DISTRO | https://release-monitoring.org/project/00807 | 5.43 | 5.44 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.33 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.21.2 | flashrom | DISTRO | https://release-monitoring.org/project/10202 | 1.2.1 | 1.3.0 | flatbuffers | DISTRO | https://release-monitoring.org/project/16642 | 2.0.8 | 23.1.21 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.4 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fmc | GUESS | https://release-monitoring.org/project/145761 | LSDK-21.08 | 0.2.0 | ORPH font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 6.3.0 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.14.2 | ORPH freeradius-server | DISTRO | https://release-monitoring.org/project/00853 | 3.2.0 | 3.2.2 | freetype | DISTRO | https://release-monitoring.org/project/00854 | 2.12.1 | 2.13.0 | fscryptctl | DISTRO | https://release-monitoring.org/project/270981 | 1.0.0 | 1.1.0 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 22.09.00 | 23.01.00 | gawk | DISTRO | https://release-monitoring.org/project/00868 | 5.2.0 | 5.2.1 | ORPH gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 4.0.0 | ORPH gdal | DISTRO | https://release-monitoring.org/project/00881 | 3.5.2 | 3.6.2 | gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.5.5 | 2.6.2 | gerbera | DISTRO | https://release-monitoring.org/project/18420 | 1.10.0 | 1.12.1 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.56.1 | 10.0.0 | gitlab-runner | DISTRO | https://release-monitoring.org/project/11337 | 15.5.0 | 15.9.0 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.1 | 2.74.0 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.74.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.10.4.0 | 3.10.5.1 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.8 | 3.8.0 | ORPH go | DISTRO | https://release-monitoring.org/project/01227 | 1.19.6 | 1.20.1 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.72.0 | 1.74.0 | ORPH gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.9 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 7.1.0 | ORPH grantlee | DISTRO | https://release-monitoring.org/project/21448 | 5.2.0 | 5.3.1 | graphicsmagick | DISTRO | https://release-monitoring.org/project/01248 | 1.3.38 | 1.3.40 | grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.51.1 | 1.52.1 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 43.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gssdp | DISTRO | https://release-monitoring.org/project/01262 | 1.4.0.1 | 1.6.2 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.1.0 | gst1-shark | DISTRO | https://release-monitoring.org/project/21854 | v0.7.5 | 0.8.1 | gtest | DISTRO | https://release-monitoring.org/project/18290 | 1.12.1 | 1.13.0 | gtkmm3 | DISTRO | https://release-monitoring.org/project/311572 | 3.22.0 | 3.24.7 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.6.2 | guile | DISTRO | https://release-monitoring.org/project/01277 | 3.0.8 | 3.0.9 | gupnp | DISTRO | https://release-monitoring.org/project/01281 | 1.4.3 | 1.6.3 | gupnp-av | DISTRO | https://release-monitoring.org/project/01282 | 0.14.0 | 0.14.1 | gupnp-tools | DISTRO | https://release-monitoring.org/project/01284 | 0.10.3 | 0.12.0 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.50.3 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2022.09.1 | 2023.01.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.6.5 | 2.7.3 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 5.3.1 | 7.0.0 | heimdal | DISTRO | https://release-monitoring.org/project/01307 | 7.7.1 | 7.8.0 | ORPH hiawatha | DISTRO | https://release-monitoring.org/project/13375 | 11.2 | 11.3 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.13.1 | ORPH highway | DISTRO | https://release-monitoring.org/project/205809 | 1.0.2 | 1.0.3 | hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.22.10 | ORPH htop | DISTRO | https://release-monitoring.org/project/01332 | 3.2.1 | 3.2.2 | ORPH htpdate | DISTRO | https://release-monitoring.org/project/132187 | 1.3.6 | 1.3.7 | hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.365 | 0.367 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.8.0 | 2.9.0 | hyperfine | DISTRO | https://release-monitoring.org/project/18526 | 1.14.0 | 1.15.0 | ORPH i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.43.0 | 2.46.0 | ibm-sw-tpm2 | DISTRO | https://release-monitoring.org/project/18952 | 1661 | 1682 | icu | DISTRO | https://release-monitoring.org/project/16134 | 70-1 | 72-1 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.41 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-51 | 7.1.0-62 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.10.0 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.6.0 | ORPH intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 23.1.0 | 23.1.1 | intel-mediasdk | DISTRO | https://release-monitoring.org/project/21814 | 23.1.0 | 23.1.1 | intel-microcode | DISTRO | https://release-monitoring.org/project/20614 | 20221108 | 20230214 | iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.493 | 3.494 | iperf3 | DISTRO | https://release-monitoring.org/project/01389 | 3.12 | 3.13 | ORPH ipset | DISTRO | https://release-monitoring.org/project/01393 | 7.16 | 7.17 | irqbalance | DISTRO | https://release-monitoring.org/project/01402 | 1.9.0 | 1.9.2 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | irssi | DISTRO | https://release-monitoring.org/project/01404 | 1.4.2 | 1.4.3 | jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.21 | 1.9.22 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 1.1.1 | 1.1.2 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 4.0.0 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.6 | 1.9 | jpeg-turbo | DISTRO | https://release-monitoring.org/project/01648 | 2.1.4 | 2.1.5.1 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.13.1 | 1.13.2 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.2 | jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.10.0 | 3.10.1 | kexec | DISTRO | https://release-monitoring.org/project/12689 | 2.0.25 | 2.0.26 | ORPH kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kodi | DISTRO | https://release-monitoring.org/project/20547 | 19.5-Matrix | 20.0-Nexus | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.7-Ma... | 20.3.3-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.3-Ma... | 20.5.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-jsonschemabuilder | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.4-Ma... | 20.1.5-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.5-Ma... | 20.1.3-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.1-Ma... | 20.5.0-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.6-Ma... | 20.6.1-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.2.2-Ma... | 21.1.0-Omega | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.11-M... | 20.3.2-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.6-Ma... | 20.4.0-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.3.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.4.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.3.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.4-Ma... | 20.3.1-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 21.1.0-Omega | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.5-Ma... | 20.4.0-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.1-Ma... | 21.1.0-Omega | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.3.1-Ma... | 21.1.0-Omega | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.16-M... | 20.3.5-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-texturepacker | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.2.0-Ma... | 20.3.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.2-Ma... | 20.1.1-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.3-Ma... | 20.2.1-Nexus | ksmbd-tools | DISTRO | https://release-monitoring.org/project/241856 | 3.4.6 | 3.4.7 | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 2.1.0 | 2.2.0 | lapack | DISTRO | https://release-monitoring.org/project/01534 | 3.10.1 | 3.11.0 | leafpad | DISTRO | https://release-monitoring.org/project/01544 | 0.8.18.1 | 0.8.19 | ORPH lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.3 | 0.3.95 | leptonica | DISTRO | https://release-monitoring.org/project/01549 | 1.82.0 | 1.83.0 | less | DISTRO | https://release-monitoring.org/project/01550 | 590 | 627 | ORPH libabseil-cpp | DISTRO | https://release-monitoring.org/project/115295 | 20220623.1 | 20230125.1 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.26 | 2.28-1 | ORPH libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.7 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.65 | 2.67 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 3.0.0 | libcurl | DISTRO | https://release-monitoring.org/project/00381 | 7.87.0 | 7.88.0 | libdeflate | DISTRO | https://release-monitoring.org/project/242778 | 1.15 | 1.17 | libdnet | DISTRO | https://release-monitoring.org/project/06308 | 1.16.1 | 1.16.3 | ORPH libebml | DISTRO | https://release-monitoring.org/project/07879 | 1.4.2 | 1.4.4 | libedit | DISTRO | https://release-monitoring.org/project/01599 | 20210910-3.1 | 20221030-3.1 | libevdev | DISTRO | https://release-monitoring.org/project/20540 | 1.12.1 | 1.13.0 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.14.0 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.40.0 | ORPH libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.72.3 | 2.74.5 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.4.0 | 1.6.0 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.17.1 | 1.18.0 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.30 | ORPH libgpiod | DISTRO | https://release-monitoring.org/project/20640 | 1.6.3 | 1.6.4 | ORPH libgsasl | DISTRO | https://release-monitoring.org/project/01563 | 1.10.0 | 2.2.0 | ORPH libgsm | DISTRO | https://release-monitoring.org/project/12587 | 1.0.19 | 1.0.22 | libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.8.3 | libhtp | DISTRO | https://release-monitoring.org/project/01632 | 0.5.40 | 0.5.42 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.40 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.16 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.17 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.2 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.20.1 | 1.22.1 | libjxl | DISTRO | https://release-monitoring.org/project/232764 | 0.7.0 | 0.8.1 | liblinear | DISTRO | https://release-monitoring.org/project/21363 | 2.45 | 2.46 | libmatroska | DISTRO | https://release-monitoring.org/project/01657 | 1.6.3 | 1.7.1 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.14 | 0.12.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.8 | 3.1.10 | libmodplug | DISTRO | https://release-monitoring.org/project/05669 | d1b97ed | 0.8.9.0 | ORPH libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.10 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.2 | ORPH libnftnl | DISTRO | https://release-monitoring.org/project/01681 | 1.2.3 | 1.2.4 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.2.2 | 5.0.0 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.14 | libostree | DISTRO | https://release-monitoring.org/project/10899 | 2022.7 | 2023.1 | libpam-tacplus | DISTRO | https://release-monitoring.org/project/20537 | 1.6.1 | 1.7.0 | ORPH libpcap | DISTRO | https://release-monitoring.org/project/01702 | 1.10.2 | 1.10.3 | libpeas | DISTRO | https://release-monitoring.org/project/06871 | 1.32.0 | 1.34.0 | ORPH libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.7.4 | libqrtr-glib | DISTRO | https://release-monitoring.org/project/192056 | 1.0.0 | 1.2.2 | librelp | DISTRO | https://release-monitoring.org/project/01713 | 1.10.0 | 1.11.0 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.54.5 | librsync | DISTRO | https://release-monitoring.org/project/06309 | 2.3.2 | 2.3.4 | librtas | DISTRO | https://release-monitoring.org/project/10717 | 2.0.3 | 2.0.4 | ORPH libselinux | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsolv | DISTRO | https://release-monitoring.org/project/07908 | 0.7.22 | 0.7.23 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.2 | 3.2.2 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.2 | 2.5.0 | libtalloc | DISTRO | https://release-monitoring.org/project/01733 | 2.3.4 | 2.4.0 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH libtool | DISTRO | https://release-monitoring.org/project/01741 | 2.4.6 | 2.4.7 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.8 | libucl | DISTRO | https://release-monitoring.org/project/21371 | 0.8.1 | 0.8.2 | libupnp | DISTRO | https://release-monitoring.org/project/21315 | 1.14.13 | 1.14.15 | libupnpp | DISTRO | https://release-monitoring.org/project/15849 | 0.21.0 | 0.22.4 | ORPH liburcu | DISTRO | https://release-monitoring.org/project/07134 | 0.13.2 | 0.14.0 | liburing | DISTRO | https://release-monitoring.org/project/230185 | 2.2 | 2.3 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.14.1 | libvirt | DISTRO | https://release-monitoring.org/project/13830 | 7.10.0 | 9.0.0 | libvpx | DISTRO | https://release-monitoring.org/project/11083 | 1.12.0 | 1.13.0 | libwpe | DISTRO | https://release-monitoring.org/project/17789 | 1.14.0 | 1.14.1 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.29 | 4.4.33 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.4.0 | 1.5.0 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.54.06 | lightning | DISTRO | https://release-monitoring.org/project/01816 | 2.2.0 | 2.2.1 | lilv | DISTRO | https://release-monitoring.org/project/01818 | 0.24.12 | 0.24.20 | links | DISTRO | https://release-monitoring.org/project/01822 | 2.26 | 2.28 | ORPH linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.10 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20221214 | 20230210 | liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.4.0 | 1.5.0 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2023.01.19 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.15 | 1.0.16 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.13.0 | 1.0.0 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.20.1 | 3.21.0 | ORPH lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | lsof | DISTRO | https://release-monitoring.org/project/01844 | 4.96.5 | 4.98.0 | ORPH ltp-testsuite | DISTRO | https://release-monitoring.org/project/21502 | 20220930 | 20230127 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.6 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.11 | lttng-libust | DISTRO | https://release-monitoring.org/project/07135 | 2.13.1 | 2.13.5 | lttng-modules | DISTRO | https://release-monitoring.org/project/07141 | 2.13.7 | 2.13.8 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.8 | 2.13.9 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luarocks | DISTRO | https://release-monitoring.org/project/01856 | 3.9.1 | 3.9.2 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.43.0-0 | 1.44.2-1 | ORPH luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.13.0 | 2.14.0 | ORPH lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.18 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzma-alone | DISTRO | https://release-monitoring.org/project/242840 | 9.22 | 2201 | ORPH lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.4 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.36 | 10.11.2 | ORPH mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.2 | 3.3.0 | mc | DISTRO | https://release-monitoring.org/project/01954 | 4.8.28 | 4.8.29 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.6.0 | 0.1.6.2 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.2.23 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.17 | 1.6.18 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 6.10 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 22.3.4 | 22.3.5 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 22.3.4 | 22.3.5 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.46.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | minizip | DISTRO | https://release-monitoring.org/project/301509 | 3.0.7 | 3.0.8 | moby-buildkit | DISTRO | https://release-monitoring.org/project/20836 | 0.11.2 | 0.11.3 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.20.4 | 1.21.2 | modsecurity2 | DISTRO | https://release-monitoring.org/project/68638 | 2.9.7 | 3.0.8 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 6.2.0 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.8 | 7.9 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.33.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.182 | 6.12.0.190 | mp4v2 | DISTRO | https://release-monitoring.org/project/98413 | 2.1.1 | 2.1.2 | ORPH mpc | DISTRO | https://release-monitoring.org/project/01667 | 1.2.1 | 1.3.1 | ORPH mpfr | DISTRO | https://release-monitoring.org/project/02019 | 4.1.1 | 4.2.0 | ORPH mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.31.2 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.35.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 5.0.0 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.22 | 1.8.23 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.38 | 4.0.42 | ORPH ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.18 | 2.2.2 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.3-20221224 | 6.4-20230218 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.32.4 | 0.32.5 | ORPH netatalk | DISTRO | https://release-monitoring.org/project/02063 | 3.1.13 | 3.1.14 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | 1.218 | 1.219 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.33.1 | 1.38.1 | network-manager | DISTRO | https://release-monitoring.org/project/21197 | 1.40.10 | 1.42.0 | ORPH networkd-dispatcher | DISTRO | https://release-monitoring.org/project/242008 | 2.2.3 | 2.2.4 | newt | DISTRO | https://release-monitoring.org/project/15129 | 0.52.21 | 0.52.23 | ORPH nftables | DISTRO | https://release-monitoring.org/project/02082 | 1.0.5 | 1.0.6 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.52.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.22.1 | 1.23.3 | ninja | DISTRO | https://release-monitoring.org/project/02089 | 1.11.1.g9... | 1.11.1 | nmap | DISTRO | https://release-monitoring.org/project/02096 | 7.92 | 7.93 | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 16.18.1 | 19.6.1 | noip | DISTRO | https://release-monitoring.org/project/21539 | 2.1.9 | 3.0.0 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.151 | 390.157 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 525.89.02 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 2.3 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.34 | 2.0 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.6.2 | openal | DISTRO | https://release-monitoring.org/project/08172 | 1.22.0 | 1.23.0 | ORPH opencl-clhpp | DISTRO | https://release-monitoring.org/project/271141 | 2.0.16 | 2023.02.06 | opencore-amr | DISTRO | https://release-monitoring.org/project/21548 | 0.1.5 | 0.1.6 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.19 | 4.7.0 | opencv4 | DISTRO | https://release-monitoring.org/project/06615 | 4.6.0 | 4.7.0 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.10.0 | openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.14.1+1 | 21+10 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.4 | ORPH openocd | DISTRO | https://release-monitoring.org/project/02557 | 0.11.0 | 0.12.0 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.46 | opensc | DISTRO | https://release-monitoring.org/project/02559 | 0.22.0 | 0.23.0 | openssh | DISTRO | https://release-monitoring.org/project/02565 | 9.1p1 | 9.2p1 | ORPH openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 11.3.5-18... | 12.1.5 | openvpn | DISTRO | https://release-monitoring.org/project/02567 | 2.5.7 | 2.6.0 | ORPH opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.6.1 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.19.0 | 3.20.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.19.0 | 3.20.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.19.0 | 3.20.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.19.0 | 3.20.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.32 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.2.23 | ORPH osm2pgsql | DISTRO | https://release-monitoring.org/project/02575 | 1.8.0 | 1.8.1 | paho-mqtt-c | DISTRO | https://release-monitoring.org/project/21375 | 1.3.11 | 1.3.12 | pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.1 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.13 | 0.17.2 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.7 | ORPH pciutils | DISTRO | https://release-monitoring.org/project/02605 | 3.8.0 | 3.9.0 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202212 | ORPH pdbg | DISTRO | https://release-monitoring.org/project/21378 | 3.5 | 3.6 | perl-class-method-modifiers | DISTRO | https://release-monitoring.org/project/06735 | 2.13 | 2.14 | perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.89 | 6.90 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-file-sharedir-install | DISTRO | https://release-monitoring.org/project/11851 | 0.13 | 0.14 | perl-gdgraph | DISTRO | https://release-monitoring.org/project/09187 | 1.54 | 1.56 | perl-html-parser | DISTRO | https://release-monitoring.org/project/02967 | 3.80 | 3.81 | perl-image-exiftool | DISTRO | https://release-monitoring.org/project/06175 | 12.50 | 12.56 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.080 | 2.081 | perl-json-maybexs | DISTRO | https://release-monitoring.org/project/11953 | 1.004003 | 1.004004 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20220520 | 1.20230212 | perl-mime-tools | DISTRO | https://release-monitoring.org/project/11809 | 5.509 | 5.510 | perl-mojolicious-plugin-aut... | DISTRO | https://release-monitoring.org/project/21729 | 1.37 | 1.39 | perl-moo | DISTRO | https://release-monitoring.org/project/03123 | 2.005004 | 2.005005 | perl-net-ssh2 | DISTRO | https://release-monitoring.org/project/03163 | 0.72 | 0.73 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.93_01 | 1.92 | perl-package-stash | DISTRO | https://release-monitoring.org/project/11885 | 0.39 | 0.40 | perl-plack | DISTRO | https://release-monitoring.org/project/06578 | 1.0048 | 1.0050 | perl-sub-install | DISTRO | https://release-monitoring.org/project/03345 | 0.928 | 0.929 | perl-sub-quote | DISTRO | https://release-monitoring.org/project/12678 | 2.006006 | 2.006008 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-type-tiny | DISTRO | https://release-monitoring.org/project/14406 | 1.012004 | 2.002001 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0208 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.22 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-memcached | DISTRO | https://release-monitoring.org/project/17400 | 3.1.5 | 3.2.0 | ORPH php-pam | DISTRO | https://release-monitoring.org/project/241707 | 2.2.3 | 2.2.4 | php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.2.0 | pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.65 | 0.3.66 | pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.9.4 | ORPH pngquant | DISTRO | https://release-monitoring.org/project/03674 | 2.17.0 | 3.0.1 | poco | DISTRO | https://release-monitoring.org/project/05418 | 1.12.2 | 1.12.4 | policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 22.10.0 | 23.02.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.10 | 1.3.11 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.15 | privoxy | DISTRO | https://release-monitoring.org/project/03712 | 3.0.33 | 3.0.34 | ORPH procps-ng | DISTRO | https://release-monitoring.org/project/03708 | 3.3.17 | 4.0.3 | ORPH proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 9.1.1 | prosody | DISTRO | https://release-monitoring.org/project/03709 | 0.11.14 | 0.12.2 | protobuf | DISTRO | https://release-monitoring.org/project/03715 | 21.12 | 22.0 | pru-software-support | DISTRO | https://release-monitoring.org/project/21825 | 6.0.1 | 6.1.0 | psmisc | DISTRO | https://release-monitoring.org/project/03721 | 23.5 | 23.6 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH putty | DISTRO | https://release-monitoring.org/project/05749 | 0.76 | 0.78 | python-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.5.1 | 0.6.0 | python-aiofiles | DISTRO | https://release-monitoring.org/project/12743 | 22.1.0 | 23.1.0 | python-aiohttp | DISTRO | https://release-monitoring.org/project/06713 | 3.8.3 | 3.8.4 | python-aiohttp-jinja2 | DISTRO | https://release-monitoring.org/project/21247 | 1.5 | 1.5.1 | python-alembic | DISTRO | https://release-monitoring.org/project/03766 | 1.9.1 | 1.9.4 | python-argh | DISTRO | https://release-monitoring.org/project/09299 | 0.26.2 | 0.28.1 | python-async-lru | DISTRO | https://release-monitoring.org/project/56566 | 1.0.3 | 2.0.0 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 22.12.1 | 23.1.2 | python-beautifulsoup4 | DISTRO | https://release-monitoring.org/project/03779 | 4.11.1 | 4.11.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.26.45 | 1.26.74 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.29.45 | 1.29.74 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.6.1 | python-cryptography | DISTRO | https://release-monitoring.org/project/05532 | 39.0.0 | 39.0.1 | python-dbus-fast | DISTRO | https://release-monitoring.org/project/287975 | 1.84.0 | 1.84.1 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 4.1.5 | 4.1.7 | python-dnspython | DISTRO | https://release-monitoring.org/project/13190 | 2.2.1 | 2.3.0 | python-dtschema | DISTRO | https://release-monitoring.org/project/100908 | 2022.12 | 2023.1 | python-esptool | DISTRO | https://release-monitoring.org/project/11619 | 4.4 | 4.5 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 2.2.2 | 2.2.3 | python-flask-babel | DISTRO | https://release-monitoring.org/project/20024 | 2.0.0 | 3.0.1 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 3.0.2 | 3.0.3 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 1.0.1 | 1.1.1 | python-flatbuffers | DISTRO | https://release-monitoring.org/project/85010 | 2.0.7 | 23.1.21 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.31 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.10 | python-hatchling | DISTRO | https://release-monitoring.org/project/185085 | 1.12.2 | 1.13.0 | python-hiredis | DISTRO | https://release-monitoring.org/project/12002 | 2.0.0 | 2.2.2 | python-iptables | DISTRO | https://release-monitoring.org/project/11475 | 1.0.0 | 1.0.1 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 8.8.0 | 8.10.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.6 | 2.4.8 | python-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.1.1 | 2.1.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.7.0 | python-maturin | DISTRO | https://release-monitoring.org/project/42653 | 0.14.9 | 0.14.13 | python-mbstrdecoder | DISTRO | https://release-monitoring.org/project/21702 | 1.1.1 | 1.1.2 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 2.0.4 | 2.0.5 | python-modbus-tk | DISTRO | https://release-monitoring.org/project/22813 | 1.1.2 | 1.1.3 | python-mpd2 | DISTRO | https://release-monitoring.org/project/19721 | 3.0.5 | 3.1.0 | python-mypy-extensions | DISTRO | https://release-monitoring.org/project/23367 | 0.4.3 | 1.0.0 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.23.5 | 1.24.2 | python-orjson | DISTRO | https://release-monitoring.org/project/31737 | 3.8.4 | 3.8.6 | python-packaging | DISTRO | https://release-monitoring.org/project/11718 | 22.0 | 23.0 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.12.0 | 3.0.0 | python-pathspec | DISTRO | https://release-monitoring.org/project/15607 | 0.10.3 | 0.11.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.11.0 | 5.11.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 22.3.1 | 23.0.1 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 21.12 | 22.0 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.16.0 | 3.17 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.10.4 | 1.10.5 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.3 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 3.0.2 | 3.1.3 | python-pypa-build | DISTRO | https://release-monitoring.org/project/132276 | 0.9.0 | 0.10.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.15.6 | 5.15.9 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.7.3 | 0.7.5 | python-pysmb | DISTRO | https://release-monitoring.org/project/21589 | 1.2.9 | 1.2.9.1 | python-pyspnego | DISTRO | https://release-monitoring.org/project/107092 | 0.7.0 | 0.8.0 | python-pytest | DISTRO | https://release-monitoring.org/project/03765 | 7.2.0 | 7.2.1 | python-pythran | DISTRO | https://release-monitoring.org/project/21140 | 0.12.0 | 0.12.1 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2022.7 | 2022.7.1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 24.0.1 | 25.0.0b1 | python-qrcode | DISTRO | https://release-monitoring.org/project/20011 | 7.3.1 | 7.4.2 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 4.4.0 | 4.5.1 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.28.1 | 2.28.2 | python-rtoml | DISTRO | https://release-monitoring.org/project/62048 | 0.8.0 | 0.9.0 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-scipy | DISTRO | https://release-monitoring.org/project/04768 | 1.8.1 | 1.10.0 | python-selenium | DISTRO | https://release-monitoring.org/project/05645 | 4.8.0 | 4.8.2 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.12.1 | 1.15.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 65.6.3 | 67.3.2 | python-sh | DISTRO | https://release-monitoring.org/project/10429 | 1.14.3 | 2.0.2 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.18.1 | 3.18.3 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.19.25 | 6.7.7 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.3.2.post1 | 2.4 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.4.42 | 2.0.4 | python-systemd | DISTRO | https://release-monitoring.org/project/07314 | 234 | 235 | python-tabledata | DISTRO | https://release-monitoring.org/project/21613 | 1.3.0 | 1.3.1 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 5.2.0 | 5.2.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.4 | 1.1.6 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.8.0 | 5.9.0 | python-txaio | DISTRO | https://release-monitoring.org/project/07202 | 22.2.1 | 23.1.1 | python-txtorcon | DISTRO | https://release-monitoring.org/project/19661 | 22.0.0 | 23.0.0 | python-typeguard | DISTRO | https://release-monitoring.org/project/38819 | 2.13.3 | 3.0.0b2 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 4.4.0 | 4.5.0 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.13 | 1.26.14 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.2.5 | 0.2.6 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 57.2 | 58.0b1 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.23.0 | 2.23.1 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 1.4.2 | 1.5.1 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 2.2.2 | 2.2.3 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.32 | 0.33 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.6 | 3.0.8 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.39.4 | 0.47.3 | python-zlmdb | DISTRO | https://release-monitoring.org/project/66674 | 22.6.1 | 23.1.1 | qcom-db410c-firmware | DISTRO | https://release-monitoring.org/project/235382 | 1034.2.1 | 1036.1 | qlibc | DISTRO | https://release-monitoring.org/project/21737 | 2.4.7 | 2.4.8 | ORPH qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 11.2.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.38.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.8 | 6.4.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.3 | 1.4 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-c | DISTRO | https://release-monitoring.org/project/13768 | 0.11.0 | 0.13.0 | ragel | DISTRO | https://release-monitoring.org/project/12105 | 6.10 | 7.0.4 | ORPH ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | raspberrypi-usbboot | DISTRO | https://release-monitoring.org/project/115700 | 2021.07.01 | 20221215-... | ORPH redis | DISTRO | https://release-monitoring.org/project/04181 | 7.0.7 | 7.0.8 | refpolicy | DISTRO | https://release-monitoring.org/project/21663 | 2.20220106 | 2.20221101 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.5 | 2.0.1 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 7.9.2 | rrdtool | DISTRO | https://release-monitoring.org/project/04214 | 1.7.2 | 1.8.0 | ORPH rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2204.1 | 8.2212.0 | ORPH rt-tests | DISTRO | https://release-monitoring.org/project/59450 | 2.4 | 2.5 | rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.1.0 | ruby | DISTRO | https://release-monitoring.org/project/04223 | 3.1.3 | 3.2.1 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.67.0 | 1.67.1 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.67.0 | 1.67.1 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.42.1 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.11.1.2 | 2.11.3.0 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.4 | 2.3.5.5 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.8.0 | 1.1.0.0 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.6.0.0 | 2.6.1.0 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.5.1.1 | 2.5.1.3 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.5.0 | 2.3.0.0 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.3.2 | 0.5.4.0 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.12 | 4.17.5 | sane-backends | DISTRO | https://release-monitoring.org/project/04760 | 1.1.1 | 1.2.1 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.4.0 | sdl2_image | DISTRO | https://release-monitoring.org/project/04781 | 2.6.2 | 2.6.3 | sdl2_mixer | DISTRO | https://release-monitoring.org/project/04782 | 2.0.4 | 2.6.3 | ORPH sdl2_net | DISTRO | https://release-monitoring.org/project/04783 | 2.0.1 | 2.2.0 | ORPH sdl2_ttf | DISTRO | https://release-monitoring.org/project/04784 | 2.20.1 | 2.20.2 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdl_sound | DISTRO | https://release-monitoring.org/project/10262 | 1.0.3 | 2.0.1 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | selinux-python | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | semodule-utils | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.4 | ORPH sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 2.8.0 | 2.13.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.6.0 | ser2net | DISTRO | https://release-monitoring.org/project/21655 | 4.3.8 | 4.3.11 | serd | DISTRO | https://release-monitoring.org/project/230531 | 0.30.14 | 0.30.16 | setools | DISTRO | https://release-monitoring.org/project/08951 | 4.4.0 | 4.4.1 | ORPH shairport-sync | DISTRO | https://release-monitoring.org/project/21384 | 3.3.9 | 4.1.1 | ORPH shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.2 | ORPH shim | DISTRO | https://release-monitoring.org/project/10719 | 15.4 | 15.7 | signal-estimator | DISTRO | https://release-monitoring.org/project/284559 | v0.0.4 | 0.0.5 | ORPH sispmctl | DISTRO | https://release-monitoring.org/project/21653 | 4.9 | 4.10 | skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.12.0.1 | 2.13.1.0 | snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.10 | 3.5.0 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.40.0 | 3.1.55.0 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.12 | 1.13.13 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sord | DISTRO | https://release-monitoring.org/project/230536 | 0.16.12 | 0.16.14 | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | spawn-fcgi | DISTRO | https://release-monitoring.org/project/05388 | 1.6.4 | 1.6.5 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice | DISTRO | https://release-monitoring.org/project/04871 | 0.15.0 | 0.15.1 | sqlcipher | DISTRO | https://release-monitoring.org/project/11213 | 4.5.1 | 4.5.3 | sshpass | DISTRO | https://release-monitoring.org/project/12961 | 1.09 | 1.10 | start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.20 | ORPH stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.5 | 1.0.7 | stress-ng | DISTRO | https://release-monitoring.org/project/12538 | 0.13.05 | 0.15.04 | strongswan | DISTRO | https://release-monitoring.org/project/04899 | 5.9.8 | 5.9.9 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.65 | 5.68 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.5 | ORPH suricata | DISTRO | https://release-monitoring.org/project/10925 | 6.0.6 | 6.0.10 | sway | DISTRO | https://release-monitoring.org/project/11497 | 1.7 | 1.8.1 | synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.29.3 | 0.30.2 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.38.1 | 4.0.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.46.0 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.6.1 | 12.6.2 | ORPH system-config-printer | DISTRO | https://release-monitoring.org/project/08855 | 1.5.15 | 1.5.18 | ORPH systemd | DISTRO | https://release-monitoring.org/project/05440 | 252.4 | 253 | systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.04 | ORPH tbb | DISTRO | https://release-monitoring.org/project/08217 | 2021.5.0 | 2021.8.0 | tcl | DISTRO | https://release-monitoring.org/project/04941 | 8.6.12 | 8.6.13 | ORPH tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | ORPH tcllib | DISTRO | https://release-monitoring.org/project/04943 | 1.20 | 1.21 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.4.2 | 4.4.3 | ORPH terminology | DISTRO | https://release-monitoring.org/project/04951 | 1.12.1 | 1.13.0 | tesseract-ocr | DISTRO | https://release-monitoring.org/project/04954 | 5.0.1 | 5.3.0 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.5.1 | 2.5.2 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.18.0 | ORPH tinifier | DISTRO | https://release-monitoring.org/project/241900 | 3.4.0 | 4.0.1 | tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20220801 | 20230101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tio | DISTRO | https://release-monitoring.org/project/20587 | 1.47 | 2.5 | tk | DISTRO | https://release-monitoring.org/project/11426 | 8.6.12 | 8.6.13 | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 3.0.0 | ORPH tpm2-pkcs11 | DISTRO | https://release-monitoring.org/project/18777 | 1.8.0 | 1.9.0 | tpm2-tools | DISTRO | https://release-monitoring.org/project/12841 | 5.2 | 5.5 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.1.0 | 4.0.1 | ORPH trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | 2.9.7 | 3.1.6 | traceroute | DISTRO | https://release-monitoring.org/project/14877 | 2.1.0 | 2.1.2 | transmission | DISTRO | https://release-monitoring.org/project/05002 | 3.00 | 4.0.0 | tree | DISTRO | https://release-monitoring.org/project/05006 | 2.0.2 | 2.1.0 | tzdata | DISTRO | https://release-monitoring.org/project/05021 | 2022f | 2022g | uacme | DISTRO | https://release-monitoring.org/project/22795 | 1.7.3 | 1.7.4 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2023.01 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.12 | 0.13.1 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 4.3.0.0 | 4.4.0.0 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 3.2 | ORPH unrar | DISTRO | https://release-monitoring.org/project/13306 | 6.1.7 | 6.2.5 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.7.2 | ORPH upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.19 | 1.90.0 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.56.4 | ORPH valgrind | DISTRO | https://release-monitoring.org/project/13639 | 3.19.0 | 3.20.0 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.7 | 1.0 | ORPH vdr | DISTRO | https://release-monitoring.org/project/05069 | 2.6.3 | 2.6.4 | vim | DISTRO | https://release-monitoring.org/project/05092 | 9.0.1260 | 9.0.1327 | ORPH vis-network | DISTRO | https://release-monitoring.org/project/270536 | 9.1.0 | 9.1.2 | volk | DISTRO | https://release-monitoring.org/project/147733 | 2.5.2 | 3.0.0 | vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vte | DISTRO | https://release-monitoring.org/project/10895 | 0.66.2 | 0.70.3 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.45 | 3.2.47 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.241 | ORPH waf | DISTRO | https://release-monitoring.org/project/05116 | 2.0.24 | 2.0.25 | wavpack | DISTRO | https://release-monitoring.org/project/05121 | 5.5.0 | 5.6.0 | ORPH waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 1.0.0 | webp | DISTRO | https://release-monitoring.org/project/01761 | 1.2.4 | 1.3.0 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH weston | DISTRO | https://release-monitoring.org/project/13745 | 10.0.1 | 11.0.1 | whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.14 | 5.5.15 | wine | DISTRO | https://release-monitoring.org/project/05134 | 7.0 | 8.2 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.8 | 0.4.13 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.15.1 | 0.16.2 | wpewebkit | DISTRO | https://release-monitoring.org/project/17557 | 2.38.4 | 2.38.5 | wtfutil | DISTRO | https://release-monitoring.org/project/243189 | 0.41.0 | 0.42.0 | xapian | DISTRO | https://release-monitoring.org/project/15919 | 1.4.19 | 1.4.22 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20230201 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.5 | 4.17.0 | xfsprogs | DISTRO | https://release-monitoring.org/project/05188 | 5.14.2 | 6.1.1 | ORPH xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.37 | 2.38 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 6.03 | 6.06.1 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.22 | 3.23 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 376 | 379 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.1 | 0.3.2 | xz | DISTRO | https://release-monitoring.org/project/05277 | 5.2.10 | 5.4.1 | ORPH yad | DISTRO | https://release-monitoring.org/project/05280 | 0.40.0 | 12.3 | zchunk | DISTRO | https://release-monitoring.org/project/178035 | 1.2.2 | 1.2.4 | zeek | DISTRO | https://release-monitoring.org/project/267106 | 4.1.1 | 5.1.2 | zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.1.7 | 2.1.9 | zic | DISTRO | https://release-monitoring.org/project/16905 | 2022f | 2022g | zstd | DISTRO | https://release-monitoring.org/project/12083 | 1.5.2 | 1.5.4 | zxing-cpp | DISTRO | https://release-monitoring.org/project/101246 | 1.4.0 | 2.0.0 | Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 less | CVE-2022-46663 | https://security-tracker.debian.org/tracker/CVE-2022-46663 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-cryptography | CVE-2023-23931 | https://security-tracker.debian.org/tracker/CVE-2023-23931 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 speechd | CVE-2001-0956 | https://security-tracker.debian.org/tracker/CVE-2001-0956 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dropbear | CVE-2021-36369 | https://security-tracker.debian.org/tracker/CVE-2021-36369 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-3998 | https://security-tracker.debian.org/tracker/CVE-2021-3998 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2021-3981 | https://security-tracker.debian.org/tracker/CVE-2021-3981 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2022-0711 | https://security-tracker.debian.org/tracker/CVE-2022-0711 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 less | CVE-2022-46663 | https://security-tracker.debian.org/tracker/CVE-2022-46663 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libbpf | CVE-2021-45940 | https://security-tracker.debian.org/tracker/CVE-2021-45940 libbpf | CVE-2021-45941 | https://security-tracker.debian.org/tracker/CVE-2021-45941 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libxslt | CVE-2022-29824 | https://security-tracker.debian.org/tracker/CVE-2022-29824 lighttpd | CVE-2022-41556 | https://security-tracker.debian.org/tracker/CVE-2022-41556 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mender | CVE-2022-29555 | https://security-tracker.debian.org/tracker/CVE-2022-29555 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 modsecurity2 | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 modsecurity2 | CVE-2023-24021 | https://security-tracker.debian.org/tracker/CVE-2023-24021 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 nodejs | CVE-2022-35256 | https://security-tracker.debian.org/tracker/CVE-2022-35256 nodejs | CVE-2022-43548 | https://security-tracker.debian.org/tracker/CVE-2022-43548 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 opusfile | CVE-2022-47021 | https://security-tracker.debian.org/tracker/CVE-2022-47021 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 patchelf | CVE-2022-44940 | https://security-tracker.debian.org/tracker/CVE-2022-44940 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 proftpd | CVE-2021-46854 | https://security-tracker.debian.org/tracker/CVE-2021-46854 python-aiohttp | CVE-2022-33124 | https://security-tracker.debian.org/tracker/CVE-2022-33124 python-cryptography | CVE-2023-23931 | https://security-tracker.debian.org/tracker/CVE-2023-23931 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-45198 | https://security-tracker.debian.org/tracker/CVE-2022-45198 python-pillow | CVE-2022-45199 | https://security-tracker.debian.org/tracker/CVE-2022-45199 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pyjwt | CVE-2022-29217 | https://security-tracker.debian.org/tracker/CVE-2022-29217 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python-web2py | CVE-2022-33146 | https://security-tracker.debian.org/tracker/CVE-2022-33146 python-werkzeug | CVE-2022-29361 | https://security-tracker.debian.org/tracker/CVE-2022-29361 python3 | CVE-2022-42919 | https://security-tracker.debian.org/tracker/CVE-2022-42919 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3611 | https://security-tracker.debian.org/tracker/CVE-2021-3611 qemu | CVE-2021-3750 | https://security-tracker.debian.org/tracker/CVE-2021-3750 qemu | CVE-2021-3929 | https://security-tracker.debian.org/tracker/CVE-2021-3929 qemu | CVE-2021-3947 | https://security-tracker.debian.org/tracker/CVE-2021-3947 qemu | CVE-2021-4158 | https://security-tracker.debian.org/tracker/CVE-2021-4158 qemu | CVE-2021-4206 | https://security-tracker.debian.org/tracker/CVE-2021-4206 qemu | CVE-2021-4207 | https://security-tracker.debian.org/tracker/CVE-2021-4207 qemu | CVE-2022-0358 | https://security-tracker.debian.org/tracker/CVE-2022-0358 qemu | CVE-2022-26353 | https://security-tracker.debian.org/tracker/CVE-2022-26353 qemu | CVE-2022-26354 | https://security-tracker.debian.org/tracker/CVE-2022-26354 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-35414 | https://security-tracker.debian.org/tracker/CVE-2022-35414 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 rabbitmq-server | CVE-2021-22116 | https://security-tracker.debian.org/tracker/CVE-2021-22116 rabbitmq-server | CVE-2021-22117 | https://security-tracker.debian.org/tracker/CVE-2021-22117 rabbitmq-server | CVE-2021-32718 | https://security-tracker.debian.org/tracker/CVE-2021-32718 rabbitmq-server | CVE-2021-32719 | https://security-tracker.debian.org/tracker/CVE-2021-32719 rabbitmq-server | CVE-2022-31008 | https://security-tracker.debian.org/tracker/CVE-2022-31008 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 rpm | CVE-2021-3521 | https://security-tracker.debian.org/tracker/CVE-2021-3521 rpm | CVE-2021-35937 | https://security-tracker.debian.org/tracker/CVE-2021-35937 rpm | CVE-2021-35938 | https://security-tracker.debian.org/tracker/CVE-2021-35938 rpm | CVE-2021-35939 | https://security-tracker.debian.org/tracker/CVE-2021-35939 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unbound | CVE-2022-30698 | https://security-tracker.debian.org/tracker/CVE-2022-30698 unbound | CVE-2022-30699 | https://security-tracker.debian.org/tracker/CVE-2022-30699 unbound | CVE-2022-3204 | https://security-tracker.debian.org/tracker/CVE-2022-3204 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 usbguard | CVE-2019-25058 | https://security-tracker.debian.org/tracker/CVE-2019-25058 wavpack | CVE-2022-2476 | https://security-tracker.debian.org/tracker/CVE-2022-2476 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xerces | CVE-2018-1311 | https://security-tracker.debian.org/tracker/CVE-2018-1311 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 less | CVE-2022-46663 | https://security-tracker.debian.org/tracker/CVE-2022-46663 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libopenssl | CVE-2022-4450 | https://security-tracker.debian.org/tracker/CVE-2022-4450 libopenssl | CVE-2023-0215 | https://security-tracker.debian.org/tracker/CVE-2023-0215 libopenssl | CVE-2023-0286 | https://security-tracker.debian.org/tracker/CVE-2023-0286 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 modsecurity2 | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 modsecurity2 | CVE-2023-24021 | https://security-tracker.debian.org/tracker/CVE-2023-24021 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 opusfile | CVE-2022-47021 | https://security-tracker.debian.org/tracker/CVE-2022-47021 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-cryptography | CVE-2023-23931 | https://security-tracker.debian.org/tracker/CVE-2023-23931 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python3 | CVE-2022-42919 | https://security-tracker.debian.org/tracker/CVE-2022-42919 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xerces | CVE-2018-1311 | https://security-tracker.debian.org/tracker/CVE-2018-1311 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From thomas at devoogdt.com Mon Feb 20 09:09:21 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 20 Feb 2023 10:09:21 +0100 Subject: [Buildroot] [PATCH v1 1/3] Revert "xorg-server: not available with musl on ARM" Message-ID: <20230220090923.2155635-1-thomas.devoogdt@barco.com> From: Thomas Devoogdt This reverts commit 9daafbcb75a7ab593ce8a1f21c6149c8437bc0bc. Fixed since https://gitlab.freedesktop.org/xorg/xserver/-/issues/840. Signed-off-by: Thomas Devoogdt --- package/x11r7/xserver_xorg-server/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 865917c4ec..b933bd0285 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -1,11 +1,6 @@ -comment "xorg-server needs a glibc or uClibc toolchain" - depends on BR2_arm && BR2_TOOLCHAIN_USES_MUSL - config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" depends on BR2_USE_MMU # fork() - # xserver uses inb/outb on arm, which aren't available with musl - depends on !(BR2_arm && BR2_TOOLCHAIN_USES_MUSL) # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. -- 2.39.2 From thomas at devoogdt.com Mon Feb 20 09:09:22 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 20 Feb 2023 10:09:22 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: <20230220090923.2155635-1-thomas.devoogdt@barco.com> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> Message-ID: <20230220090923.2155635-2-thomas.devoogdt@barco.com> The reason why it was not used was that at-spi2-core and at-spi2-atk were not available, since then, it is, so drop this patch. This will also avoid warnings in webkitgtk. Signed-off-by: Thomas Devoogdt --- package/libgtk3/0001-disable-atk-bridge.patch | 41 ------------------- package/libgtk3/Config.in | 2 + package/libgtk3/libgtk3.mk | 4 +- 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch deleted file mode 100644 index f3e9bff2ba..0000000000 --- a/package/libgtk3/0001-disable-atk-bridge.patch +++ /dev/null @@ -1,41 +0,0 @@ -Remove atk-bridge support. - -atk-bridge doesn't seem useful for now in Buildroot and requires to -add two new packages just for it: at-spi2-core and at-spi2-atk. - -Signed-off-by: Hadrien Boutteville - ---- a/gtk/a11y/gtkaccessibility.c -+++ b/gtk/a11y/gtkaccessibility.c -@@ -37,10 +37,6 @@ - #include - #include - --#ifdef GDK_WINDOWING_X11 --#include --#endif -- - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, - guint n_param_values, - const GValue *param_values, -@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) - _gtk_accessibility_override_atk_util (); - do_window_event_initialization (); - --#ifdef GDK_WINDOWING_X11 -- atk_bridge_adaptor_init (NULL, NULL); --#endif -- - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); - } ---- a/meson.build -+++ b/meson.build -@@ -564,7 +564,7 @@ if x11_enabled - xfixes_dep = dependency('xfixes', required: false) - xcomposite_dep = dependency('xcomposite', required: false) - fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) -- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) -+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) - - backend_immodules += ['xim'] - diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 82ca68d2da..d921f79226 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -24,6 +24,8 @@ config BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 283c129cef..fc2b501cb8 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -14,8 +14,8 @@ LIBGTK3_CPE_ID_VENDOR = gnome LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \ - gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) +LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk at-spi2-atk at-spi2-core libglib2 \ + cairo pango gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrandr xlib_libXrender xlib_libXi -- 2.39.2 From thomas at devoogdt.com Mon Feb 20 09:09:23 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 20 Feb 2023 10:09:23 +0100 Subject: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5 In-Reply-To: <20230220090923.2155635-1-thomas.devoogdt@barco.com> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> Message-ID: <20230220090923.2155635-3-thomas.devoogdt@barco.com> From: Thomas Devoogdt Bugfix release, with many security fixes, including (but not limited to) a patch for CVE-2023-23529. Release notes: https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0002.html Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, we do check on >= GCC 8, because we can't check on >= GCC 8.3. https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b Signed-off-by: Thomas Devoogdt --- package/webkitgtk/Config.in | 4 ++-- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index dc5d738dae..976341093e 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 34fd19d3de..c771297b5a 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums -md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz -sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz -sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums +md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz +sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz +sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index a6974db926..3263f7fea0 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.4 +WEBKITGTK_VERSION = 2.38.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES -- 2.39.2 From fontaine.fabrice at gmail.com Mon Feb 20 09:17:39 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 10:17:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: set --with-libpcre2 Message-ID: <20230220091739.13107-1-fontaine.fabrice@gmail.com> Set --with-libpcre2 to avoid the following build failure raised since bump to version 6.2.7 in commit 89fa774a191d41ed5d125d87d812ff3478902251: configure: using old pcre library by default checking pkg-config is at least version 0.9.0... yes configure: error: cannot find pkg-config package for libpcre Fixes: - http://autobuild.buildroot.org/results/701b343b3b0d471c75899b61d02bd9d63a272247 Signed-off-by: Fabrice Fontaine --- package/zabbix/zabbix.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index db9efed78b..0d6c579f4c 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -15,6 +15,7 @@ ZABBIX_AUTORECONF = YES ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ + --with-libpcre2 \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \ -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 09:19:33 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 10:19:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/modem-manager: fix static build In-Reply-To: References: <20230219224546.1232023-1-fontaine.fabrice@gmail.com> Message-ID: Hi, Le lun. 20 f?vr. 2023 ? 09:28, Aleksander Morgado a ?crit : > Hey, > > On Sun, Feb 19, 2023 at 11:45 PM Fabrice Fontaine > wrote: > > > > Commit d769cfc13f6c2544f8bc5b6339d23763319a2383 was incomplete as > > plugins/meson.build still unconditionally calls shared_module. So > > disable plugins to fix the following static build failure raised since > > bump to version 1.20.2 in commit > > b95334b71fbdde0f7621b58ed35fa98df9e0966d: > > > > [238/417] Linking target plugins/libmm-shared-telit.so > > FAILED: plugins/libmm-shared-telit.so > > > > Plugins could be enabled back through builtin_plugins as soon as > > > https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/1c4da332ee6e0d948f85a63f74cb27e89075c011 > > lands in a stable release > > > > Fixes: > > - > http://autobuild.buildroot.org/results/deb2a752accb021392bb9dc3d06b2b1bf151535c > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/modem-manager/modem-manager.mk | 44 ++++++++++++++++++++++++++ > > 1 file changed, 44 insertions(+) > > > > diff --git a/package/modem-manager/modem-manager.mk > b/package/modem-manager/modem-manager.mk > > index 979a80a8e9..824b9eda5a 100644 > > --- a/package/modem-manager/modem-manager.mk > > +++ b/package/modem-manager/modem-manager.mk > > @@ -80,6 +80,50 @@ else > > MODEM_MANAGER_CONF_OPTS += -Dbash_completion=false > > endif > > > > +ifeq ($(BR2_STATIC_LIBS),y) > > +MODEM_MANAGER_CONF_OPTS += \ > > + -Dplugin_generic=disabled \ > > + -Dplugin_altair_lte=disabled \ > > + -Dplugin_anydata=disabled \ > > + -Dplugin_broadmobi=disabled \ > > + -Dplugin_cinterion=disabled \ > > + -Dplugin_dell=disabled \ > > + -Dplugin_dlink=disabled \ > > + -Dplugin_fibocom=disabled \ > > + -Dplugin_foxconn=disabled \ > > + -Dplugin_gosuncn=disabled \ > > + -Dplugin_haier=disabled \ > > + -Dplugin_huawei=disabled \ > > + -Dplugin_intel=disabled \ > > + -Dplugin_iridium=disabled \ > > + -Dplugin_linktop=disabled \ > > + -Dplugin_longcheer=disabled \ > > + -Dplugin_mbm=disabled \ > > + -Dplugin_motorola=disabled \ > > + -Dplugin_mtk=disabled \ > > + -Dplugin_nokia=disabled \ > > + -Dplugin_nokia_icera=disabled \ > > + -Dplugin_novatel=disabled \ > > + -Dplugin_novatel_lte=disabled \ > > + -Dplugin_option=disabled \ > > + -Dplugin_option_hso=disabled \ > > + -Dplugin_pantech=disabled \ > > + -Dplugin_qcom_soc=disabled \ > > + -Dplugin_quectel=disabled \ > > + -Dplugin_samsung=disabled \ > > + -Dplugin_sierra_legacy=disabled \ > > + -Dplugin_sierra=disabled \ > > + -Dplugin_simtech=disabled \ > > + -Dplugin_telit=disabled \ > > + -Dplugin_thuraya=disabled \ > > + -Dplugin_tplink=disabled \ > > + -Dplugin_ublox=disabled \ > > + -Dplugin_via=disabled \ > > + -Dplugin_wavecom=disabled \ > > + -Dplugin_x22x=disabled \ > > + -Dplugin_zte=disabled > > +endif > > + > > You can disable all plugins altogether with > "-Dauto_features=disabled"; it is the recommended way to do so in MM > 1.20. > But I wonder, is it only to have the build with static libs pass? MM > 1.20 without plugins will not be usable at all, at least one plugin is > required, so not sure how useful that is. > Thanks for your review, I'll send a v2 that disables building statically modem-manager 1.20. > > In MM 1.22 (or git main) there is the new "-Dbuiltin_plugins=true" > option that will embed all selected plugins within the ModemManager > daemon binary itself. > > Cheers! > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Mon Feb 20 09:25:16 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 10:25:16 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/modem-manager: needs dynamic library Message-ID: <20230220092516.17774-1-fontaine.fabrice@gmail.com> Commit d769cfc13f6c2544f8bc5b6339d23763319a2383 was incomplete as plugins/meson.build still unconditionally calls shared_module. So add a dependency to dynamic library to avoid the following static build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: [238/417] Linking target plugins/libmm-shared-telit.so FAILED: plugins/libmm-shared-telit.so Building statically could be enabled back through builtin_plugins as soon as https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/1c4da332ee6e0d948f85a63f74cb27e89075c011 lands in a stable release Fixes: - http://autobuild.buildroot.org/results/deb2a752accb021392bb9dc3d06b2b1bf151535c Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Aleksander Morgado): - Disable building statically instead of disabling all plugins package/modem-manager/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index 8489e6fc86..6990996a86 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_MODEM_MANAGER depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV @@ -39,6 +40,7 @@ comment "QRTR support needs a toolchain w/ headers >= 4.15" endif -comment "modemmanager needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS +comment "modemmanager needs a toolchain w/ wchar, threads, dynamic library" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS depends on BR2_USE_MMU -- 2.39.0 From aperez at igalia.com Mon Feb 20 09:29:39 2023 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 20 Feb 2023 11:29:39 +0200 Subject: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5 In-Reply-To: <20230220090923.2155635-3-thomas.devoogdt@barco.com> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-3-thomas.devoogdt@barco.com> Message-ID: <20230220112939.GB446957@igalia.com> Hi Thomas, all, On Mon, 20 Feb 2023 10:09:23 +0100 Thomas Devoogdt wrote: > From: Thomas Devoogdt > > Bugfix release, with many security fixes, including (but not limited to) > a patch for CVE-2023-23529. > > Release notes: > > https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html Hehe, I was just about to submit this update myself after smoke-testing a build. Thanks for sending it :-) > Accompanying security advisory: > > https://webkitgtk.org/security/WSA-2023-0002.html > > Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. > Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, > we do check on >= GCC 8, because we can't check on >= GCC 8.3. > > https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b > > Signed-off-by: Thomas Devoogdt Acked-by: Adrian Perez de Castro > --- > package/webkitgtk/Config.in | 4 ++-- > package/webkitgtk/webkitgtk.hash | 8 ++++---- > package/webkitgtk/webkitgtk.mk | 2 +- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in > index dc5d738dae..976341093e 100644 > --- a/package/webkitgtk/Config.in > +++ b/package/webkitgtk/Config.in > @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt > > -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" > +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > depends on !BR2_BINFMT_FLAT > depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ > @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK > depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 > depends on BR2_USE_WCHAR # icu, libsoup > depends on BR2_PACKAGE_LIBGTK3 > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > index 34fd19d3de..c771297b5a 100644 > --- a/package/webkitgtk/webkitgtk.hash > +++ b/package/webkitgtk/webkitgtk.hash > @@ -1,7 +1,7 @@ > -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums > -md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz > -sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz > -sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz > +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums > +md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz > +sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz > +sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz > > # Hashes for license files: > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > index a6974db926..3263f7fea0 100644 > --- a/package/webkitgtk/webkitgtk.mk > +++ b/package/webkitgtk/webkitgtk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WEBKITGTK_VERSION = 2.38.4 > +WEBKITGTK_VERSION = 2.38.5 > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > WEBKITGTK_INSTALL_STAGING = YES > -- > 2.39.2 > > _______________________________________________ > 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 fontaine.fabrice at gmail.com Mon Feb 20 09:33:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 10:33:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix libcurl build Message-ID: <20230220093336.77462-1-fontaine.fabrice@gmail.com> Fix the following libcurl build failure: In file included from /tmp/instance-1/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/include/curl/curl.h:3195, from ../../../../include/sysinc.h:384, from ../../../../include/common.h:23, from simple.c:20: simple.c: In function 'check_https': simple.c:167:65: error: invalid use of void expression 167 | if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_USERAGENT, "Zabbix " ZABBIX_VERSION)) || | ^ Fixes: - http://autobuild.buildroot.org/results/053a62e9969046a7f8a0e1890c24d2bfb099ae42 Signed-off-by: Fabrice Fontaine --- ...se-parentheses-to-ensure-compilation.patch | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 package/zabbix/0002-Use-parentheses-to-ensure-compilation.patch diff --git a/package/zabbix/0002-Use-parentheses-to-ensure-compilation.patch b/package/zabbix/0002-Use-parentheses-to-ensure-compilation.patch new file mode 100644 index 0000000000..482480e5e0 --- /dev/null +++ b/package/zabbix/0002-Use-parentheses-to-ensure-compilation.patch @@ -0,0 +1,65 @@ +From 2fe3c652bd6a6522d5be3fd41c6ed39ddc2d21fa Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 13 Feb 2023 14:32:38 +0100 +Subject: [PATCH] Use parentheses to ensure compilation + +Compiler fails with latest Curl release. Use parenthesis to ensure +compiler evaluates expression correctly: + +In file included from /tmp/instance-1/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/include/curl/curl.h:3195, + from ../../../../include/sysinc.h:384, + from ../../../../include/common.h:23, + from simple.c:20: +simple.c: In function 'check_https': +simple.c:167:65: error: invalid use of void expression + 167 | if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_USERAGENT, "Zabbix " ZABBIX_VERSION)) || + | ^ + +Fixes: + - http://autobuild.buildroot.org/results/053a62e9969046a7f8a0e1890c24d2bfb099ae42 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent (no feedback on first patch)] +--- + src/libs/zbxsysinfo/simple/simple.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/libs/zbxsysinfo/simple/simple.c b/src/libs/zbxsysinfo/simple/simple.c +index fc16a784cf..c3ce974492 100644 +--- a/src/libs/zbxsysinfo/simple/simple.c ++++ b/src/libs/zbxsysinfo/simple/simple.c +@@ -177,14 +177,14 @@ static int check_https(const char *host, unsigned short port, int timeout, int * + else + zbx_snprintf(https_host, sizeof(https_host), "%s%s", (0 == strncmp(host, "https://", 8) ? "" : "https://"), host); + +- if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_USERAGENT, "Zabbix " ZABBIX_VERSION)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_URL, https_host)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_PORT, (long)port)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_NOBODY, 1L)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_SSL_VERIFYPEER, 0L)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_SSL_VERIFYHOST, 0L)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_TIMEOUT, (long)timeout)) || +- CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = ZBX_CURLOPT_ACCEPT_ENCODING, ""))) ++ if (CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_USERAGENT), "Zabbix " ZABBIX_VERSION)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_URL), https_host)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_PORT), (long)port)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_NOBODY), 1L)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_SSL_VERIFYPEER), 0L)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_SSL_VERIFYHOST), 0L)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_TIMEOUT), (long)timeout)) || ++ CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = ZBX_CURLOPT_ACCEPT_ENCODING), ""))) + { + zabbix_log(LOG_LEVEL_DEBUG, "%s: could not set cURL option [%d]: %s", + __func__, (int)opt, curl_easy_strerror(err)); +@@ -193,7 +193,7 @@ static int check_https(const char *host, unsigned short port, int timeout, int * + + if (NULL != CONFIG_SOURCE_IP) + { +- if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_INTERFACE, CONFIG_SOURCE_IP))) ++ if (CURLE_OK != (err = curl_easy_setopt(easyhandle, (opt = CURLOPT_INTERFACE), CONFIG_SOURCE_IP))) + { + zabbix_log(LOG_LEVEL_DEBUG, "%s: could not set source interface option [%d]: %s", + __func__, (int)opt, curl_easy_strerror(err)); +-- +2.39.0 + -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 09:46:53 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 10:46:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: fix per-package build Message-ID: <20230220094653.105814-1-fontaine.fabrice@gmail.com> Fix the following per-package build failure raised since commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429: configure.ac:140: error: possibly undefined macro: AC_MSG_FAILURE If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:328: error: possibly undefined macro: AC_CHECK_LIB Fixes: - http://autobuild.buildroot.org/results/11868e9bc4916843a7fc76f7b5e4c251f89e33dc Signed-off-by: Fabrice Fontaine --- package/libarchive/libarchive.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cd7c13fbed..2010b6529f 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -140,6 +140,8 @@ endif # The only user of host-libarchive needs zlib support HOST_LIBARCHIVE_DEPENDENCIES = host-zlib +# needed for autoreconf +HOST_LIBARCHIVE_DEPENDENCIES += host-pkgconf HOST_LIBARCHIVE_CONF_OPTS = \ --disable-bsdtar \ --disable-bsdcpio \ -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 10:03:09 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 11:03:09 +0100 Subject: [Buildroot] [PATCH 1/1] support/dependencies/dependencies.sh: require FileHandle perl package for syslinux Message-ID: <20230220100309.116832-1-fontaine.fabrice@gmail.com> syslinux needs FileHandle module: Can't locate FileHandle.pm in @INC (you may need to install the FileHandle module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. /home/buildroot/autobuild/instance-0/output-1/host/bin/i586-buildroot-linux-gnu-gcc -Wp,-MT,errlist.o,-MD,./.errlist.o.d -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-labels=0 -ffast-math -fomit-frame-pointer -std=gnu99 -m32 -mpreferred-stack-boundary=2 -fno-stack-protector -fwrapv -freg-struct-return -fPIC -fno-exceptions -fno-asynchronous-unwind-tables -fno-strict-aliasing -falign-functions=0 -falign-jumps=0 -falign-labels=0 -falign-loops=0 -g -D__COM32__ -D__FIRMWARE_BIOS__ -nostdinc -iwithprefix include -I. -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/../include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/include/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/core/include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/ -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/sys/module -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/bios/com32/lib//../.. -W -Wall -Wstrict-prototypes -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline -DDYNAMIC_CRC_TABLE -DPNG_NO_CONSOLE_IO -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_MNG_FEATURES -DPNG_NO_READ_tIME -DPNG_NO_WRITE_tIME -mregparm=3 -DREGPARM=3 -c -o errlist.o errlist.c cc1: fatal error: errlist.c: No such file or directory Fixes: - http://autobuild.buildroot.org/results/de88089888b2ca354b28af3550abf846560da7d5 Signed-off-by: Fabrice Fontaine --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 4353e9585e..a692856d31 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -298,6 +298,10 @@ if grep -q -E '^BR2_PACKAGE_(WEBKITGTK|WPEWEBKIT)=y' $BR2_CONFIG ; then required_perl_modules="${required_perl_modules} JSON::PP" fi +if grep -q ^BR2_TARGET_SYSLINUX=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules FileHandle" +fi + # This variable will keep the modules that are missing in your system. missing_perl_modules="" -- 2.39.0 From hrsourabh011 at gmail.com Mon Feb 20 10:10:27 2023 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Mon, 20 Feb 2023 11:10:27 +0100 Subject: [Buildroot] Updating trust store using update-ca-certificates In-Reply-To: <20230219131753.GE2718518@scaer> References: <20230218121940.7442410e@windsurf> <20230218141937.60c307f7@windsurf> <20230218142115.GC2718518@scaer> <20230218153216.GD2718518@scaer> <20230219131753.GE2718518@scaer> Message-ID: HI Yann, All, Yes, will do it. I am testing it now New changes: define CA_CERTIFICATES_GEN_BUNDLE # Create symlinks to certificates under /etc/ssl/certs # and generate the bundle cd $(TARGET_DIR) ;\ for i in `find usr/local/share/ca-certificates -name "*.crt" | LC_COLLATE=C sort` ; do \ ln -sf ../../../$$i etc/ssl/certs/`basename $${i} .crt`.pem ;\ cat $$i ;\ done >>$(BUILD_DIR)/ca-certificates.crt # Create symlinks to the certificates by their hash values $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs # Install the certificates bundle $(INSTALL) -D -m 644 $(BUILD_DIR)/ca-certificates.crt \ $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt endef So, after "make" new local CA is added to trust-store. So far so good. But now I did "make clean" and "make". And no certificates are installed!. Even the default certificates (from mozilla) are not installed. I could't find /usr/share/ca-certificates in the target. Any idea why this is happening? On Sun, 19 Feb 2023 at 14:17, Yann E. MORIN wrote: > Sourabh, All, > > On 2023-02-19 13:53 +0100, Sourabh Hegde spake thusly: > > I think the issue is during build, the [1]ca-certificates.mk is not > available in the output/build/ca-certificates/ dir. Only > > Makefile and ca-certificates.crt file is present. > > So how can I patch the makefile? > > This is a patch agaisnt Buildroot itself. Apply it to Buildroot. > > 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. | > > '------------------------------^-------^------------------^--------------------' > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: ca-certificates.mk Type: application/octet-stream Size: 2620 bytes Desc: not available URL: From br015 at umbiko.net Mon Feb 20 10:11:15 2023 From: br015 at umbiko.net (Andreas Ziegler) Date: Mon, 20 Feb 2023 10:11:15 +0000 Subject: [Buildroot] [PATCH 3/4] package/linux-tools: add rtla In-Reply-To: <20230206083931.759b3ee3@pc-7.home> References: <20230206083931.759b3ee3@pc-7.home> Message-ID: Hi Maxime, * On 2023-02-06 07:39, Maxime Chevallier wrote: > Hello Andreas, > > On Sun, 05 Feb 2023 09:22:56 +0100 > Andreas Ziegler wrote: > >> Hi Maxime, >> >> I was able to build RTLA after some adaptions, see below. > > Thanks for the effort, I appreciate ! You are welcome :-) There is one more thing that might be improved: On an aarch64 build, using an internal musl toolchain, I encountered the following build issue: In file included from src/trace.h:2, from src/osnoise.h:2, from src/rtla.c:11: /home/data/buildroot.rpi64/host/bin/../aarch64-buildroot-linux-musl/sysroot/usr/include/tracefs/tracefs.h:50:35: error: unknown type name ?cpu_set_t? 50 | cpu_set_t *set, size_t set_size); | ^~~~~~~~~ (...) src/osnoise_top.c: In function ?osnoise_top_main?: src/osnoise_top.c:618:26: warning: implicit declaration of function ?tracefs_iterate_raw_events?; did you mean ?tracefs_system_events?? [-Wimplicit-function-declaration] 618 | retval = tracefs_iterate_raw_events(trace->tep, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ | tracefs_system_events (...) It seems that both libraries are compiled with _GNU_SOURCE $ grep _GNU_SOURCE ../libtracefs-1.6.4/Makefile override CFLAGS += -D_GNU_SOURCE $(LIBTRACEEVENT_INCLUDES) $(INCLUDES) $ grep _GNU_SOURCE ../libtraceevent-1.7.1/Makefile override CFLAGS += $(udis86-flags) -D_GNU_SOURCE but rtla defines it inconsistently $ grep _GNU_SOURCE tools/tracing/rtla/Makefile $ grep _GNU_SOURCE tools/tracing/rtla/src/*.[ch] tools/tracing/rtla/src/trace.c:#define _GNU_SOURCE thereby missing some definitions from Proposed fix below. >> > diff --git a/package/linux-tools/linux-tool-rtla.mk.in >> > b/package/linux-tools/linux-tool-rtla.mk.in >> > new file mode 100644 >> > index 0000000000..a736e3b785 >> > --- /dev/null >> > +++ b/package/linux-tools/linux-tool-rtla.mk.in >> > @@ -0,0 +1,32 @@ >> > +################################################################################ >> > +# >> > +# rtla >> > +# >> > +################################################################################ >> > + >> > +LINUX_TOOLS += rtla >> > + >> > +RTLA_DEPENDENCIES = host-pkgconf libtracefs >> >> RTLA needs some kernel features; better to include them here, saves >> time experimenting: >> >> # linux kernel needs FTRACE, TIMERLAT_TRACER, HIST_TRIGGERS for RTLA >> to work >> ifeq ($(BR2_PACKAGE_LINUX_TOOLS_RTLA),y) >> define RTLA_LINUX_CONFIG_FIXUPS >> $(call KCONFIG_ENABLE_OPT,CONFIG_FTRACE) >> $(call KCONFIG_ENABLE_OPT,CONFIG_TIMERLAT_TRACER) >> $(call KCONFIG_ENABLE_OPT,CONFIG_HIST_TRIGGERS) >> endef >> endif > > Oh I wasn't aware that we could enable kernel options that way. I'll > include them in the v2, along with CONFIG_OSNOISE_TRACER that is also > required. > >> > +RTLA_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ >> > + CC=$(TARGET_CC) \ Define _GNU_SOURCE to prevent the musl build error above. This generates a warning due to redefinition of symbol in trace.c, but it is less intrusive than patching the source code: + EXTRA_CFLAGS="-D_GNU_SOURCE" \ >> > + LDFLAGS="$(TARGET_LDFLAGS)" \ >> > + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig >> > + >> >> The RTLA Makefile unconditionally compiles with stack smashing >> protection; linking fails on builds configured without this feature: >> >> # adapted from linux-tool-tmon.mk.in >> ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) >> define RTLA_DISABLE_STACK_PROTECTOR >> $(SED) 's/-fstack-protector.* //' >> $(LINUX_DIR)/tools/tracing/rtla/Makefile >> endef >> endif > > Good catch too, I didn't see that. > >> > +define RTLA_BUILD_CMDS >> > + $(Q)if ! grep install >> > $(LINUX_DIR)/tools/tracing/rtla/Makefile >> > >/dev/null 2>&1 ; then \ >> > + echo "Your kernel version is too old and does not >> > implement the rtla tool." ; \ >> > + echo "At least kernel 5.17 must be used." ; \ >> > + exit 1 ; \ >> > + fi >> > + >> >> $(RTLA_DISABLE_STACK_PROTECTOR) >> >> > + $(TARGET_MAKE_ENV) \ >> > + $(MAKE) $(RTLA_MAKE_OPTS) \ >> > + -C $(LINUX_DIR)/tools/tracing rtla >> > +endef >> > + >> > +define RTLA_INSTALL_TARGET_CMDS >> > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/tracing \ >> > + $(RTLA_MAKE_OPTS) \ >> > + DESTDIR=$(TARGET_DIR) \ >> > + rtla_install >> > +endef >> >> rtla_install fails with: >> Makefile:34: *** NOTICE: rst2man required to generate man pages. >> Stop. because it tries to build and install man pages also. Better to >> use a custom install command: >> >> # The rtla_install target tries to create and install manpages, >> # which terminates with an error and cannot be disabled >> define RTLA_INSTALL_TARGET_CMDS >> $(INSTALL) -m 0755 -D $(LINUX_DIR)/tools/tracing/rtla/rtla \ >> $(TARGET_DIR)/usr/bin/rtla >> endef > > Ok makes sense as well :) > > Thanks a lot for the review, tests and fixes ! > > Maxime > >> Kind regards, >> Andreas >> >> > -- >> > 2.39.1 Kind regards, Andreas From fontaine.fabrice at gmail.com Mon Feb 20 10:30:01 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 11:30:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/glslsandbox-player: add wayland-protocols optional dependency Message-ID: <20230220103001.607877-1-fontaine.fabrice@gmail.com> wayland-protocols is an optional dependency which is enabled by default resulting in the following wayland build failure since the addition of the package in commit f201ca9d0d25b491ec5e1ed4e1d02fd52d027997: checking for wayland_client... yes checking for wayland_egl... yes configure: Wayland EGL support enabled checking for wayland_protocols... no configure: error: Package requirements (wayland-protocols >= 1.12) were not met: Package 'wayland-protocols', required by 'virtual:world', not found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables wayland_protocols_CFLAGS and wayland_protocols_LIBS to avoid the need to call pkg-config. Fixes: - http://autobuild.buildroot.org/results/865af860f9e52fe5311bb0c6a246ff871ae5a989 Signed-off-by: Fabrice Fontaine --- package/glslsandbox-player/Config.in | 5 ++++- package/glslsandbox-player/glslsandbox-player.mk | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 53646cde1f..9b6f8447f9 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -112,8 +112,11 @@ endchoice if BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI bool "Wayland IVI shell support" -endif +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG + bool "Wayland XDG shell support" + select BR2_PACKAGE_WAYLAND_PROTOCOLS +endif endif comment "glslsandbox-player needs openGL ES and EGL driver" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index f0a9475aa6..241f3475d2 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -72,6 +72,12 @@ GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-ivi else GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-ivi endif +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += wayland-protocols +GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-wlxdg +else +GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-wlxdg +endif else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += xlib_libX11 GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=x11 -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 11:21:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 12:21:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/rockchip-mali: needs C++ Message-ID: <20230220112147.952174-1-fontaine.fabrice@gmail.com> rockchip-mali pre-built libraries needs C++ since the addition of the package in commit 97c74a73e5dee17530647f89b2c7d8692781eb14: readelf -a output/build/rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427/lib/aarch64-linux-gnu/libmali-bifrost-g31-rxp0-gbm.so|grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libpthread.so.0] 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] 0x0000000000000001 (NEEDED) Shared library: [librt.so.1] 0x0000000000000001 (NEEDED) Shared library: [libdrm.so.2] 0x0000000000000001 (NEEDED) Shared library: [libm.so.6] 0x0000000000000001 (NEEDED) Shared library: [libstdc++.so.6] 0x0000000000000001 (NEEDED) Shared library: [libgcc_s.so.1] 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] While at it, add a comment when dependencies are not met Fixes: - No autobuilder failures (yet), found when debugging an issue with rockchip-mali and glslsandbox-player Signed-off-by: Fabrice Fontaine --- package/rockchip-mali/Config.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/rockchip-mali/Config.in b/package/rockchip-mali/Config.in index d616284911..5a23954af3 100644 --- a/package/rockchip-mali/Config.in +++ b/package/rockchip-mali/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ROCKCHIP_MALI bool "rockchip-mali" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_ARM_EABIHF || BR2_aarch64 # lidbrm. This would normally need a Config.in comment, but @@ -30,3 +31,8 @@ config BR2_PACKAGE_PROVIDES_LIBGBM default "rockchip-mali" endif + +comment "rockchip-mali needs a glibc toolchain w/ C++, threads" + depends on BR2_ARM_EABIHF || BR2_aarch64 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 11:24:10 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 12:24:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/glslsandbox-player: fix build with rockchip-mali Message-ID: <20230220112410.953669-1-fontaine.fabrice@gmail.com> Fix the following build failure with rockchip-mali raised since commit 97c74a73e5dee17530647f89b2c7d8692781eb14: checking for glesv2... no configure: error: Package requirements (glesv2 >= 1) were not met: Package dependency requirement 'glesv2 >= 1' could not be satisfied. Package 'glesv2' has version '', required version is '>= 1' Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables glesv2_CFLAGS and glesv2_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. Fixes: - http://autobuild.buildroot.org/results/ac765b0ff5f914df4087ae4691fe711dc912f03b Signed-off-by: Fabrice Fontaine --- ...gure.ac-fix-build-with-rockchip-mali.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/glslsandbox-player/0001-configure.ac-fix-build-with-rockchip-mali.patch diff --git a/package/glslsandbox-player/0001-configure.ac-fix-build-with-rockchip-mali.patch b/package/glslsandbox-player/0001-configure.ac-fix-build-with-rockchip-mali.patch new file mode 100644 index 0000000000..97bfe00401 --- /dev/null +++ b/package/glslsandbox-player/0001-configure.ac-fix-build-with-rockchip-mali.patch @@ -0,0 +1,46 @@ +From b811d408fe52fd5ee5a908eb16a2ff2b4217c235 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 20 Feb 2023 11:53:39 +0100 +Subject: [PATCH 1/1] configure.ac: fix build with rockchip-mali + +Don't check glesv2 version in glesv2.pc file to avoid the following +build failure with rockchip-mali: + +checking for glesv2... no +configure: error: Package requirements (glesv2 >= 1) were not met: + +Package dependency requirement 'glesv2 >= 1' could not be satisfied. +Package 'glesv2' has version '', required version is '>= 1' + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables glesv2_CFLAGS +and glesv2_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +Fixes: + - http://autobuild.buildroot.org/results/ac765b0ff5f914df4087ae4691fe711dc912f03b + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/jolivain/glslsandbox-player/pull/5] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1f45b1f..5cb2d4c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -84,7 +84,7 @@ AS_IF([test "x$enable_strict_gles" = "xyes"], [ + ]) + + PKG_CHECK_MODULES([egl], [egl >= 1]) +-PKG_CHECK_MODULES([glesv2], [glesv2 >= 1]) ++PKG_CHECK_MODULES([glesv2], [glesv2]) + + AC_CHECK_HEADERS([EGL/eglext.h], [], [], + [[#include +-- +2.39.0 + -- 2.39.0 From buildroot at heine.tech Mon Feb 20 12:49:45 2023 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 20 Feb 2023 13:49:45 +0100 Subject: [Buildroot] [PATCH] package/grpc: bump to version 1.52.1 Message-ID: <20230220124945.1842532-1-buildroot@heine.tech> - alter patches 0001 and 0003 for changed paths/locations - bump minimum gcc to 7.3, see [0] - alter gcc dependency of dependend packages accordingly [0] https://github.com/grpc/grpc/tree/master/src/cpp Signed-off-by: Michael Nosthoff --- package/collectd/Config.in | 6 +- package/falcosecurity-libs/Config.in | 2 +- ...the-availability-of-pthread_setname_.patch | 32 ++++++---- .../grpc/0003-host-grpc-only-cpp-plugin.patch | 62 ++++++++++--------- package/grpc/Config.in | 6 +- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 2 +- package/sysdig/Config.in | 6 +- 8 files changed, 65 insertions(+), 53 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index a431da79f1..7f87b54645 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -683,15 +683,15 @@ config BR2_PACKAGE_COLLECTD_GRPC depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc depends on BR2_INSTALL_LIBSTDCPP # grpc -> protobuf depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # grpc -> protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # grpc -> libabseil-cpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # grpc depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc select BR2_PACKAGE_GRPC help Send/receive values using the gRPC protocol. -comment "grpc needs a toolchain w/ C++, gcc >= 5" +comment "grpc needs a toolchain w/ C++, gcc >= 7.3" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc diff --git a/package/falcosecurity-libs/Config.in b/package/falcosecurity-libs/Config.in index f101883384..41251fb748 100644 --- a/package/falcosecurity-libs/Config.in +++ b/package/falcosecurity-libs/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_FALCOSECURITY_LIBS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_LINUX_KERNEL depends on BR2_INSTALL_LIBSTDCPP # jsoncpp, protobuf, tbb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # grpc, gtest + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # grpc, gtest depends on BR2_TOOLCHAIN_HAS_THREADS # jq, protobuf, tbb depends on !BR2_STATIC_LIBS # protobuf, tbb depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc diff --git a/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch b/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch index 92dc5a6c45..5abdf6600f 100644 --- a/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch +++ b/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch @@ -1,4 +1,4 @@ -From 0dfb289a3b362b082ac3608d887e42f09dadc0d2 Mon Sep 17 00:00:00 2001 +From 7fddf245b63d723ffa03e9c87366e4a7673121c8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 31 Dec 2018 16:22:07 +0100 Subject: [PATCH] Properly detect the availability of pthread_setname_np() @@ -18,17 +18,23 @@ Signed-off-by: Thomas Petazzoni this with our cmake based workaround. See: https://github.com/grpc/grpc/pull/27540 ] +Signed-off-by: Michael Nosthoff + +[buildroot at heine.tech: + In 1.52.0 the path of port_platform.h changed. Alter patch accordingly. +] + Signed-off-by: Michael Nosthoff --- - CMakeLists.txt | 6 ++++++ - include/grpc/impl/codegen/port_platform.h | 2 ++ + CMakeLists.txt | 6 ++++++ + include/grpc/support/port_platform.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45c2fcb..0b2be4f 100644 +index b0299050c4..5dfc04be90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -208,6 +208,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) +@@ -247,6 +247,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") @@ -41,11 +47,11 @@ index 45c2fcb..0b2be4f 100644 if(MSVC) include(cmake/msvc_static_runtime.cmake) add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) -diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h -index 4f213ff..55ecd9d 100644 ---- a/include/grpc/impl/codegen/port_platform.h -+++ b/include/grpc/impl/codegen/port_platform.h -@@ -186,6 +186,7 @@ +diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h +index 9f9cac0054..29f99db7cf 100644 +--- a/include/grpc/support/port_platform.h ++++ b/include/grpc/support/port_platform.h +@@ -181,6 +181,7 @@ #endif /* _LP64 */ #ifdef __GLIBC__ #define GPR_POSIX_CRASH_HANDLER 1 @@ -53,7 +59,7 @@ index 4f213ff..55ecd9d 100644 #ifdef __GLIBC_PREREQ #if __GLIBC_PREREQ(2, 12) #define GPR_LINUX_PTHREAD_NAME 1 -@@ -194,6 +195,7 @@ +@@ -189,6 +190,7 @@ // musl libc & others #define GPR_LINUX_PTHREAD_NAME 1 #endif @@ -61,6 +67,6 @@ index 4f213ff..55ecd9d 100644 #include #else /* musl libc */ #define GPR_MUSL_LIBC_COMPAT 1 - -- -2.26.63 +2.34.1 + diff --git a/package/grpc/0003-host-grpc-only-cpp-plugin.patch b/package/grpc/0003-host-grpc-only-cpp-plugin.patch index c68b096df6..73cef78fd8 100644 --- a/package/grpc/0003-host-grpc-only-cpp-plugin.patch +++ b/package/grpc/0003-host-grpc-only-cpp-plugin.patch @@ -1,4 +1,4 @@ -From a1922eadfc87da3dd221ff631f94ddd4a8ee7049 Mon Sep 17 00:00:00 2001 +From 7858880865e3a35a3d1d69ea490fb8f390dee12d Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 25 May 2021 14:55:23 +0200 Subject: [PATCH] Add option to restrict building of (host-)grpc to @@ -14,12 +14,15 @@ Signed-off-by: Fabrice Fontaine Updated for 1.48.0: Signed-off-by: Michael Nosthoff + +Updated for 1.52.1: +Signed-off-by: Michael Nosthoff --- - CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++-------- - 1 file changed, 35 insertions(+), 8 deletions(-) + CMakeLists.txt | 39 +++++++++++++++++++++++++++++++++++---- + 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d3963b074b..51cef83141 100644 +index b0299050c4..d6efe523c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,12 +49,16 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) @@ -39,7 +42,7 @@ index d3963b074b..51cef83141 100644 set(gRPC_INSTALL ${gRPC_INSTALL_default} CACHE BOOL "Generate installation target") -@@ -555,6 +559,8 @@ add_custom_target(plugins +@@ -562,6 +566,8 @@ add_custom_target(plugins DEPENDS ${_gRPC_PLUGIN_LIST} ) @@ -48,7 +51,7 @@ index d3963b074b..51cef83141 100644 add_custom_target(tools_c DEPENDS ) -@@ -567,6 +573,8 @@ add_custom_target(tools_cxx +@@ -573,6 +579,8 @@ add_custom_target(tools_cxx add_custom_target(tools DEPENDS tools_c tools_cxx) @@ -57,7 +60,7 @@ index d3963b074b..51cef83141 100644 protobuf_generate_grpc_cpp_with_import_path_correction( src/proto/grpc/channelz/channelz.proto src/proto/grpc/channelz/channelz.proto ) -@@ -1228,6 +1236,7 @@ if(gRPC_BUILD_TESTS) +@@ -1332,6 +1340,7 @@ if(gRPC_BUILD_TESTS) DEPENDS buildtests_c buildtests_cxx) endif() @@ -65,7 +68,7 @@ index d3963b074b..51cef83141 100644 add_library(address_sorting third_party/address_sorting/address_sorting.c -@@ -1280,6 +1289,8 @@ if(gRPC_INSTALL) +@@ -1385,6 +1394,8 @@ if(gRPC_INSTALL) ) endif() @@ -74,16 +77,16 @@ index d3963b074b..51cef83141 100644 if(gRPC_BUILD_TESTS) add_library(end2end_tests -@@ -1451,6 +1462,8 @@ endforeach() +@@ -1538,6 +1549,8 @@ target_link_libraries(end2end_tests endif() +if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + add_library(gpr - src/core/ext/upb-generated/google/protobuf/any.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c -@@ -2373,6 +2386,8 @@ if(gRPC_INSTALL) + src/core/lib/gpr/alloc.cc + src/core/lib/gpr/atm.cc +@@ -2566,6 +2579,8 @@ if(gRPC_INSTALL) ) endif() @@ -92,7 +95,7 @@ index d3963b074b..51cef83141 100644 if(gRPC_BUILD_TESTS) add_library(grpc_test_util -@@ -2511,6 +2526,8 @@ endif() +@@ -2684,6 +2699,8 @@ endif() endif() @@ -101,7 +104,7 @@ index d3963b074b..51cef83141 100644 add_library(grpc_unsecure src/core/ext/filters/census/grpc_context.cc src/core/ext/filters/channel_idle/channel_idle_filter.cc -@@ -2916,6 +2933,8 @@ if(gRPC_INSTALL) +@@ -3177,6 +3194,8 @@ if(gRPC_INSTALL) ) endif() @@ -110,7 +113,7 @@ index d3963b074b..51cef83141 100644 if(gRPC_BUILD_TESTS) if(gRPC_BUILD_CODEGEN) -@@ -2987,6 +3006,8 @@ endif() +@@ -3262,6 +3281,8 @@ endif() endif() @@ -119,7 +122,7 @@ index d3963b074b..51cef83141 100644 add_library(grpc++ src/core/ext/transport/binder/client/binder_connector.cc src/core/ext/transport/binder/client/channel_create.cc -@@ -3463,6 +3484,7 @@ if(gRPC_INSTALL) +@@ -3717,6 +3738,7 @@ if(gRPC_INSTALL) ) endif() @@ -127,7 +130,7 @@ index d3963b074b..51cef83141 100644 if(gRPC_BUILD_CODEGEN) add_library(grpc++_reflection -@@ -3705,6 +3727,8 @@ target_link_libraries(grpc++_test_util +@@ -3979,6 +4001,8 @@ target_link_libraries(grpc++_test_util endif() @@ -136,7 +139,7 @@ index d3963b074b..51cef83141 100644 add_library(grpc++_unsecure src/cpp/client/channel_cc.cc src/cpp/client/client_callback.cc -@@ -4023,6 +4047,7 @@ if(gRPC_INSTALL) +@@ -4644,6 +4668,7 @@ if(gRPC_INSTALL) ) endif() @@ -144,7 +147,7 @@ index d3963b074b..51cef83141 100644 add_library(grpc_plugin_support src/compiler/cpp_generator.cc -@@ -4082,7 +4107,7 @@ foreach(_hdr +@@ -4705,7 +4730,7 @@ foreach(_hdr endforeach() @@ -153,7 +156,7 @@ index d3963b074b..51cef83141 100644 install(TARGETS grpc_plugin_support EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -@@ -4166,6 +4191,8 @@ endif() +@@ -4791,6 +4816,8 @@ endif() endif() @@ -162,16 +165,16 @@ index d3963b074b..51cef83141 100644 add_library(upb third_party/upb/third_party/utf8_range/naive.c third_party/upb/third_party/utf8_range/range2-neon.c -@@ -4256,6 +4283,8 @@ target_link_libraries(gen_hpack_tables - gpr +@@ -4891,6 +4918,8 @@ target_link_libraries(bad_server_response_test + grpc_test_util ) +endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY + + endif() if(gRPC_BUILD_TESTS) - -@@ -11228,7 +11257,7 @@ target_link_libraries(grpc_cli +@@ -12155,7 +12184,7 @@ target_link_libraries(grpc_completion_queue_test endif() @@ -180,16 +183,16 @@ index d3963b074b..51cef83141 100644 add_executable(grpc_cpp_plugin src/compiler/cpp_plugin.cc -@@ -11258,7 +11287,7 @@ target_link_libraries(grpc_cpp_plugin +@@ -12187,7 +12216,7 @@ target_link_libraries(grpc_cpp_plugin -if(gRPC_INSTALL) +if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) - install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets + install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -@@ -19803,7 +19832,7 @@ endif() +@@ -25209,7 +25238,7 @@ endif() @@ -198,9 +201,12 @@ index d3963b074b..51cef83141 100644 if(gRPC_INSTALL) install(EXPORT gRPCTargets -@@ -19900,3 +19929,5 @@ generate_pkgconfig( +@@ -25317,3 +25346,5 @@ generate_pkgconfig( "-lgrpc++_unsecure" "" "grpc++_unsecure.pc") + +endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY +-- +2.34.1 + diff --git a/package/grpc/Config.in b/package/grpc/Config.in index db6425819b..dffe164e3a 100644 --- a/package/grpc/Config.in +++ b/package/grpc/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_GRPC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS @@ -19,9 +19,9 @@ config BR2_PACKAGE_GRPC http://github.com/grpc/grpc -comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 5" +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 7.3" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index e6b76dcb5e..e53c13476f 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229 grpc-1.51.1.tar.gz +sha256 ec125d7fdb77ecc25b01050a0d5d32616594834d3fe163b016768e2ae42a2df6 grpc-1.52.1.tar.gz sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 9125b1f9f6..fd051170fe 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.51.1 +GRPC_VERSION = 1.52.1 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 diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in index c0a631bd49..581d778d54 100644 --- a/package/sysdig/Config.in +++ b/package/sysdig/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_SYSDIG depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # falcosecurity-libs depends on BR2_LINUX_KERNEL # falcosecurity-libs depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # falcosecurity-libs + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # grpc depends on BR2_TOOLCHAIN_HAS_THREADS # falcosecurity-libs depends on !BR2_STATIC_LIBS # falcosecurity-libs depends on BR2_TOOLCHAIN_USES_GLIBC # falcosecurity-libs @@ -23,12 +23,12 @@ config BR2_PACKAGE_SYSDIG https://github.com/draios/sysdig/wiki -comment "sysdig needs a glibc toolchain w/ C++, threads, gcc >= 5, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" +comment "sysdig needs a glibc toolchain w/ C++, threads, gcc >= 7.3, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_USES_GLIBC \ || !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 -- 2.34.1 From thomas at devoogdt.com Mon Feb 20 13:01:24 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 20 Feb 2023 14:01:24 +0100 Subject: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5 In-Reply-To: <20230220112939.GB446957@igalia.com> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-3-thomas.devoogdt@barco.com> <20230220112939.GB446957@igalia.com> Message-ID: Hi, Compiling webkitgtk takes some time, so I won't check all architectures, but at least this small report is ok: $ cat webkitgtk.config BR2_PACKAGE_XORG7=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_LIBGTK3=y BR2_PACKAGE_WEBKITGTK=y $ ./utils/test-pkg -c webkitgtk.config -p webkitgtk 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]: SKIPPED sourcery-arm [6/6]: SKIPPED 6 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed kr, Thomas Devoogdt Op ma 20 feb. 2023 om 10:29 schreef Adrian Perez de Castro : > > Hi Thomas, all, > > On Mon, 20 Feb 2023 10:09:23 +0100 Thomas Devoogdt wrote: > > From: Thomas Devoogdt > > > > Bugfix release, with many security fixes, including (but not limited to) > > a patch for CVE-2023-23529. > > > > Release notes: > > > > https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html > > Hehe, I was just about to submit this update myself after smoke-testing > a build. Thanks for sending it :-) > > > Accompanying security advisory: > > > > https://webkitgtk.org/security/WSA-2023-0002.html > > > > Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. > > Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, > > we do check on >= GCC 8, because we can't check on >= GCC 8.3. > > > > https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b > > > > Signed-off-by: Thomas Devoogdt > > Acked-by: Adrian Perez de Castro > > > --- > > package/webkitgtk/Config.in | 4 ++-- > > package/webkitgtk/webkitgtk.hash | 8 ++++---- > > package/webkitgtk/webkitgtk.mk | 2 +- > > 3 files changed, 7 insertions(+), 7 deletions(-) > > > > diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in > > index dc5d738dae..976341093e 100644 > > --- a/package/webkitgtk/Config.in > > +++ b/package/webkitgtk/Config.in > > @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > > depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt > > > > -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" > > +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" > > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > > depends on !BR2_BINFMT_FLAT > > depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ > > @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK > > depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby > > depends on BR2_INSTALL_LIBSTDCPP > > depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup > > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 > > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 > > depends on BR2_USE_WCHAR # icu, libsoup > > depends on BR2_PACKAGE_LIBGTK3 > > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > > index 34fd19d3de..c771297b5a 100644 > > --- a/package/webkitgtk/webkitgtk.hash > > +++ b/package/webkitgtk/webkitgtk.hash > > @@ -1,7 +1,7 @@ > > -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums > > -md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz > > -sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz > > -sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz > > +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums > > +md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz > > +sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz > > +sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz > > > > # Hashes for license files: > > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > > index a6974db926..3263f7fea0 100644 > > --- a/package/webkitgtk/webkitgtk.mk > > +++ b/package/webkitgtk/webkitgtk.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -WEBKITGTK_VERSION = 2.38.4 > > +WEBKITGTK_VERSION = 2.38.5 > > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > > WEBKITGTK_INSTALL_STAGING = YES > > -- > > 2.39.2 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > Cheers, > ?Adri?n From fontaine.fabrice at gmail.com Mon Feb 20 13:15:25 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 14:15:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: security bump to version 4.1.7 Message-ID: <20230220131525.1783413-1-fontaine.fabrice@gmail.com> Fix CVE-2023-23969 and CVE-2023-24580 https://docs.djangoproject.com/en/dev/releases/4.1.6 https://docs.djangoproject.com/en/dev/releases/4.1.7 Signed-off-by: Fabrice Fontaine --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 1d3035bb98..cb03b33bfe 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 6b6a47d7478ead15b0a0835841c433dc Django-4.1.5.tar.gz -sha256 ff56ebd7ead0fd5dbe06fe157b0024a7aaea2e0593bb3785fb594cf94dad58ef Django-4.1.5.tar.gz +md5 626f96c63ddfab24bab90d80c87a7aad Django-4.1.7.tar.gz +sha256 44f714b81c5f190d9d2ddad01a532fe502fa01c4cb8faf1d081f4264ed15dcd8 Django-4.1.7.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index e08de68954..e8c91cf51f 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.5 +PYTHON_DJANGO_VERSION = 4.1.7 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/41/c8/b3c469353f9d1b7f0e99b45520582b891da02cd87408bc867affa6e039a3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/9f/a7/07939866241b7e8f8d3bf164b7d6ad428163723e29dd472700f8ab0e5fd5 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 13:21:13 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 14:21:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-cryptography: security bump to version 39.0.1 Message-ID: <20230220132113.1814581-1-fontaine.fabrice@gmail.com> Fix CVE-2023-23931: cryptography is a package designed to expose cryptographic primitives and recipes to Python developers. In affected versions `Cipher.update_into` would accept Python objects which implement the buffer protocol, but provide only immutable buffers. This would allow immutable objects (such as `bytes`) to be mutated, thus violating fundamental rules of Python and resulting in corrupted output. This now correctly raises an exception. This issue has been present since `update_into` was originally introduced in cryptography 1.8. https://github.com/pyca/cryptography/security/advisories/GHSA-w7pp-m8wf-vj6r https://cryptography.io/en/latest/changelog/#v39-0-1 Signed-off-by: Fabrice Fontaine --- package/python-cryptography/python-cryptography.hash | 2 +- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 3f2204eeb1..a23944a06f 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 2d00e023261719f85caf360ee061d37ee27654a0344d1376441c8a29ea3bac86 cryptography-39.0.0.tar.gz +sha256 531348679f144d118156be5b17ddac750974cdcd9f44bb0a7cfd7ddcfee79c80 cryptography-39.0.1.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 6868ff4633..a130b2d10d 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 39.0.0 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.1 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/12/e3/c46c274cf466b24e5d44df5d5cd31a31ff23e57f074a2bb30931a8c9b01a +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/6a/f5/a729774d087e50fffd1438b3877a91e9281294f985bda0fd15bf99016c78 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD -- 2.39.0 From fontaine.fabrice at gmail.com Mon Feb 20 13:25:51 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 14:25:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/speechd: fix build with help2man Message-ID: <20230220132552.1825946-1-fontaine.fabrice@gmail.com> Fix the following build failure with help2man raised since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: LC_ALL=C help2man -n "speech synthesis daemon" --output=speech-dispatcher.1 ./speech-dispatcher help2man: can't get `--help' info from ./speech-dispatcher Try `--no-discard-stderr' if option outputs to stderr Fixes: - http://autobuild.buildroot.org/results/cc1817efb4a5d54ffd2e7ac2f4fc773535f70972 Signed-off-by: Fabrice Fontaine --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 46c0672f59..dee94a6752 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,6 +12,7 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile +SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" SPEECHD_CONF_OPTS = --without-kali # fix missing config.rpath (needed for autoreconf) in the codebase -- 2.39.0 From aperez at igalia.com Mon Feb 20 13:27:27 2023 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 20 Feb 2023 15:27:27 +0200 Subject: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5 In-Reply-To: References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-3-thomas.devoogdt@barco.com> <20230220112939.GB446957@igalia.com> Message-ID: <20230220152727.GB497036@igalia.com> On Mon, 20 Feb 2023 14:01:24 +0100 Thomas Devoogdt wrote: > Hi, > > Compiling webkitgtk takes some time, so I won't check all > architectures, but at least this small report is ok: > > $ cat webkitgtk.config > BR2_PACKAGE_XORG7=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_OPENGL_GLX=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y > BR2_PACKAGE_LIBGTK3=y > BR2_PACKAGE_WEBKITGTK=y > > $ ./utils/test-pkg -c webkitgtk.config -p webkitgtk > 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]: SKIPPED > sourcery-arm [6/6]: SKIPPED > 6 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed My ARM64 builds (glibc, musl) completed just fine, too :-) > kr, > > Thomas Devoogdt > > Op ma 20 feb. 2023 om 10:29 schreef Adrian Perez de Castro : > > > > Hi Thomas, all, > > > > On Mon, 20 Feb 2023 10:09:23 +0100 Thomas Devoogdt wrote: > > > From: Thomas Devoogdt > > > > > > Bugfix release, with many security fixes, including (but not limited to) > > > a patch for CVE-2023-23529. > > > > > > Release notes: > > > > > > https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html > > > > Hehe, I was just about to submit this update myself after smoke-testing > > a build. Thanks for sending it :-) > > > > > Accompanying security advisory: > > > > > > https://webkitgtk.org/security/WSA-2023-0002.html > > > > > > Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. > > > Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, > > > we do check on >= GCC 8, because we can't check on >= GCC 8.3. > > > > > > https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b > > > > > > Signed-off-by: Thomas Devoogdt > > > > Acked-by: Adrian Perez de Castro > > > > > --- > > > package/webkitgtk/Config.in | 4 ++-- > > > package/webkitgtk/webkitgtk.hash | 8 ++++---- > > > package/webkitgtk/webkitgtk.mk | 2 +- > > > 3 files changed, 7 insertions(+), 7 deletions(-) > > > > > > diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in > > > index dc5d738dae..976341093e 100644 > > > --- a/package/webkitgtk/Config.in > > > +++ b/package/webkitgtk/Config.in > > > @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > > > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > > > depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt > > > > > > -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" > > > +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" > > > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > > > depends on !BR2_BINFMT_FLAT > > > depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ > > > @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK > > > depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby > > > depends on BR2_INSTALL_LIBSTDCPP > > > depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup > > > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 > > > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 > > > depends on BR2_USE_WCHAR # icu, libsoup > > > depends on BR2_PACKAGE_LIBGTK3 > > > depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS > > > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > > > index 34fd19d3de..c771297b5a 100644 > > > --- a/package/webkitgtk/webkitgtk.hash > > > +++ b/package/webkitgtk/webkitgtk.hash > > > @@ -1,7 +1,7 @@ > > > -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums > > > -md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz > > > -sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz > > > -sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz > > > +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums > > > +md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz > > > +sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz > > > +sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz > > > > > > # Hashes for license files: > > > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > > > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > > > index a6974db926..3263f7fea0 100644 > > > --- a/package/webkitgtk/webkitgtk.mk > > > +++ b/package/webkitgtk/webkitgtk.mk > > > @@ -4,7 +4,7 @@ > > > # > > > ################################################################################ > > > > > > -WEBKITGTK_VERSION = 2.38.4 > > > +WEBKITGTK_VERSION = 2.38.5 > > > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > > > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > > > WEBKITGTK_INSTALL_STAGING = YES > > > -- > > > 2.39.2 > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > > > > Cheers, > > ?Adri?n > _______________________________________________ > 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 thomas.petazzoni at bootlin.com Mon Feb 20 14:06:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 15:06:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: fix per-package build In-Reply-To: <20230220094653.105814-1-fontaine.fabrice@gmail.com> References: <20230220094653.105814-1-fontaine.fabrice@gmail.com> Message-ID: <20230220150625.6a523f4f@windsurf> Hello Fabrice, On Mon, 20 Feb 2023 10:46:53 +0100 Fabrice Fontaine wrote: > Fix the following per-package build failure raised since commit > 9525bc7e64e8f44c31ab9dfd3f516ecb35982429: Thanks for the fix. However, why do you think this is related to per-package? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 14:07:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 15:07:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/glslsandbox-player: fix build with rockchip-mali In-Reply-To: <20230220112410.953669-1-fontaine.fabrice@gmail.com> References: <20230220112410.953669-1-fontaine.fabrice@gmail.com> Message-ID: <20230220150704.7ff37d71@windsurf> On Mon, 20 Feb 2023 12:24:10 +0100 Fabrice Fontaine wrote: > + PKG_CHECK_MODULES([egl], [egl >= 1]) > +-PKG_CHECK_MODULES([glesv2], [glesv2 >= 1]) > ++PKG_CHECK_MODULES([glesv2], [glesv2]) Is this the proper solution, or is the proper solution to patch rockchip-mali's .pc file? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Mon Feb 20 14:23:42 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 15:23:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/glslsandbox-player: fix build with rockchip-mali In-Reply-To: <20230220150704.7ff37d71@windsurf> References: <20230220112410.953669-1-fontaine.fabrice@gmail.com> <20230220150704.7ff37d71@windsurf> Message-ID: Le lun. 20 f?vr. 2023 ? 15:07, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > On Mon, 20 Feb 2023 12:24:10 +0100 > Fabrice Fontaine wrote: > > > + PKG_CHECK_MODULES([egl], [egl >= 1]) > > +-PKG_CHECK_MODULES([glesv2], [glesv2 >= 1]) > > ++PKG_CHECK_MODULES([glesv2], [glesv2]) > > Is this the proper solution, or is the proper solution to patch > rockchip-mali's .pc file? > Patching rockchip-mali is probably better but I don't know what version number should be put inside glesv2.pc. Should I hardcode 2 in the pkgconfig file? Moreover, should I patch the file through a sed in buildroot or send an upstream patch? Upstreaming this change is probably impossible as rockchip-mali uses a commit from October 2018 and the pkgconfig is not available anymore in usptream master. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Mon Feb 20 14:25:50 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 15:25:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: fix per-package build In-Reply-To: <20230220150625.6a523f4f@windsurf> References: <20230220094653.105814-1-fontaine.fabrice@gmail.com> <20230220150625.6a523f4f@windsurf> Message-ID: Hello Thomas, Le lun. 20 f?vr. 2023 ? 15:06, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > Hello Fabrice, > > On Mon, 20 Feb 2023 10:46:53 +0100 > Fabrice Fontaine wrote: > > > Fix the following per-package build failure raised since commit > > 9525bc7e64e8f44c31ab9dfd3f516ecb35982429: > > Thanks for the fix. However, why do you think this is related to > per-package? > Indeed, the build failures are also raised without per-package, I'll send a v2. > > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Mon Feb 20 14:27:46 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 15:27:46 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/libarchive: fix host build Message-ID: <20230220142746.1935069-1-fontaine.fabrice@gmail.com> Fix the following host build failure raised since commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429: configure.ac:140: error: possibly undefined macro: AC_MSG_FAILURE If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:328: error: possibly undefined macro: AC_CHECK_LIB Fixes: - http://autobuild.buildroot.org/results/11868e9bc4916843a7fc76f7b5e4c251f89e33dc Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni): - Drop per-package from commit message package/libarchive/libarchive.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cd7c13fbed..2010b6529f 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -140,6 +140,8 @@ endif # The only user of host-libarchive needs zlib support HOST_LIBARCHIVE_DEPENDENCIES = host-zlib +# needed for autoreconf +HOST_LIBARCHIVE_DEPENDENCIES += host-pkgconf HOST_LIBARCHIVE_CONF_OPTS = \ --disable-bsdtar \ --disable-bsdcpio \ -- 2.39.0 From thomas.petazzoni at bootlin.com Mon Feb 20 14:59:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 15:59:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/glslsandbox-player: fix build with rockchip-mali In-Reply-To: References: <20230220112410.953669-1-fontaine.fabrice@gmail.com> <20230220150704.7ff37d71@windsurf> Message-ID: <20230220155909.634ee802@windsurf> On Mon, 20 Feb 2023 15:23:42 +0100 Fabrice Fontaine wrote: > Patching rockchip-mali is probably better but I don't know what version > number should be put inside glesv2.pc. > Should I hardcode 2 in the pkgconfig file? I guess whatever works for glslsandbox-player. Packages like rockchip-mali are anyway crappy. > Moreover, should I patch the file through a sed in buildroot or send an > upstream patch? > Upstreaming this change is probably impossible as rockchip-mali uses a > commit from October 2018 and the pkgconfig is not available anymore in > usptream master. I suppose a patch is fine, and it won't be upstream. As said above, those OpenGL blobs are anyway crappy :-/ Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Mon Feb 20 17:06:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:06:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/less: fix CVE-2022-46663 In-Reply-To: <20230219175204.645686-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 19 Feb 2023 18:52:04 +0100") References: <20230219175204.645686-1-fontaine.fabrice@gmail.com> Message-ID: <87cz641d2z.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > In GNU Less before 609, crafted data can result in "less -R" not > filtering ANSI escape sequences sent to the terminal. > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:06:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:06:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.88.0 In-Reply-To: <20230219190745.412680-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 19 Feb 2023 20:07:45 +0100") References: <20230219190745.412680-1-bernd.kuhls@t-online.de> Message-ID: <878rgs1d2g.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://curl.se/changes.html#7_88_0 > Updated license hash due to copyright year bump: > https://github.com/curl/curl/commit/2bc1d775f510196154283374284f98d3eae03544#diff-400d38e5cfee181230373a8b02d38f50271a5bf62c62410382efddb8e8b19e22 > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:09:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:09:12 +0100 Subject: [Buildroot] [PATCH] package/libostree: bump to version 2023.1 In-Reply-To: <20230220072513.2336540-1-marcus.folkesson@gmail.com> (Marcus Folkesson's message of "Mon, 20 Feb 2023 08:25:13 +0100") References: <20230220072513.2336540-1-marcus.folkesson@gmail.com> Message-ID: <874jrg1cxz.fsf@dell.be.48ers.dk> >>>>> "Marcus" == Marcus Folkesson writes: > Signed-off-by: Marcus Folkesson > --- > package/libostree/libostree.hash | 2 +- > package/libostree/libostree.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash > index ed31109fdb..3098cdd1fc 100644 > --- a/package/libostree/libostree.hash > +++ b/package/libostree/libostree.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f libostree-2022.7.tar.xz > +sha256 dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55 libostree-2023.1.tar.xz NIT: Syntax is sha256 as pointed out by ./utils/check-package: package/libostree/libostree.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Committed with that fixed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:10:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:10:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: security bump to version 4.1.7 In-Reply-To: <20230220131525.1783413-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 20 Feb 2023 14:15:25 +0100") References: <20230220131525.1783413-1-fontaine.fabrice@gmail.com> Message-ID: <87zg98z2hw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-23969 and CVE-2023-24580 > https://docs.djangoproject.com/en/dev/releases/4.1.6 > https://docs.djangoproject.com/en/dev/releases/4.1.7 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:11:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:11:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-cryptography: security bump to version 39.0.1 In-Reply-To: <20230220132113.1814581-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 20 Feb 2023 14:21:13 +0100") References: <20230220132113.1814581-1-fontaine.fabrice@gmail.com> Message-ID: <87v8jwz2h4.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-23931: cryptography is a package designed to expose > cryptographic primitives and recipes to Python developers. In affected > versions `Cipher.update_into` would accept Python objects which > implement the buffer protocol, but provide only immutable buffers. This > would allow immutable objects (such as `bytes`) to be mutated, thus > violating fundamental rules of Python and resulting in corrupted output. > This now correctly raises an exception. This issue has been present > since `update_into` was originally introduced in cryptography 1.8. > https://github.com/pyca/cryptography/security/advisories/GHSA-w7pp-m8wf-vj6r > https://cryptography.io/en/latest/changelog/#v39-0-1 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:12:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:12:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/glslsandbox-player: add wayland-protocols optional dependency In-Reply-To: <20230220103001.607877-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 20 Feb 2023 11:30:01 +0100") References: <20230220103001.607877-1-fontaine.fabrice@gmail.com> Message-ID: <87r0ukz2ey.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > wayland-protocols is an optional dependency which is enabled by default > resulting in the following wayland build failure since the addition of > the package in commit f201ca9d0d25b491ec5e1ed4e1d02fd52d027997: > checking for wayland_client... yes > checking for wayland_egl... yes > configure: Wayland EGL support enabled > checking for wayland_protocols... no > configure: error: Package requirements (wayland-protocols >= 1.12) were not met: > Package 'wayland-protocols', required by 'virtual:world', not found > Consider adjusting the PKG_CONFIG_PATH environment variable if you > installed software in a non-standard prefix. > Alternatively, you may set the environment variables wayland_protocols_CFLAGS > and wayland_protocols_LIBS to avoid the need to call pkg-config. > Fixes: > - http://autobuild.buildroot.org/results/865af860f9e52fe5311bb0c6a246ff871ae5a989 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:13:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:13:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/rockchip-mali: needs C++ In-Reply-To: <20230220112147.952174-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 20 Feb 2023 12:21:47 +0100") References: <20230220112147.952174-1-fontaine.fabrice@gmail.com> Message-ID: <87mt58z2du.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > rockchip-mali pre-built libraries needs C++ since the addition of the > package in commit 97c74a73e5dee17530647f89b2c7d8692781eb14: > readelf -a output/build/rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427/lib/aarch64-linux-gnu/libmali-bifrost-g31-rxp0-gbm.so|grep NEEDED > 0x0000000000000001 (NEEDED) Shared library: [libpthread.so.0] > 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] > 0x0000000000000001 (NEEDED) Shared library: [librt.so.1] > 0x0000000000000001 (NEEDED) Shared library: [libdrm.so.2] > 0x0000000000000001 (NEEDED) Shared library: [libm.so.6] > 0x0000000000000001 (NEEDED) Shared library: [libstdc++.so.6] > 0x0000000000000001 (NEEDED) Shared library: [libgcc_s.so.1] > 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] > While at it, add a comment when dependencies are not met > Fixes: > - No autobuilder failures (yet), found when debugging an issue with > rockchip-mali and glslsandbox-player > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:05:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:05:06 +0100 Subject: [Buildroot] [git commit] package/less: fix CVE-2022-46663 Message-ID: <20230220171438.89596863E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=924ca9414fa962ce767c39b277489a0bdcbfad79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In GNU Less before 609, crafted data can result in "less -R" not filtering ANSI escape sequences sent to the terminal. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...rlink-on-invalid-embedded-escape-sequence.patch | 27 ++++++++++++++++++++++ package/less/less.mk | 3 +++ 2 files changed, 30 insertions(+) diff --git a/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch new file mode 100644 index 0000000000..233f949e24 --- /dev/null +++ b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch @@ -0,0 +1,27 @@ +From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 +From: Mark Nudelman +Date: Fri, 7 Oct 2022 19:25:46 -0700 +Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. + +[Retrieved from: +https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c] +Signed-off-by: Fabrice Fontaine +--- + line.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/line.c b/line.c +index 236c49ae..cba7bdd1 100644 +--- a/line.c ++++ b/line.c +@@ -633,8 +633,8 @@ ansi_step(pansi, ch) + /* Hyperlink ends with \7 or ESC-backslash. */ + if (ch == '\7') + return ANSI_END; +- if (pansi->prev_esc && ch == '\\') +- return ANSI_END; ++ if (pansi->prev_esc) ++ return (ch == '\\') ? ANSI_END : ANSI_ERR; + pansi->prev_esc = (ch == ESC); + return ANSI_MID; + } diff --git a/package/less/less.mk b/package/less/less.mk index 7d7a6d5fe5..f01f94d6c8 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -11,6 +11,9 @@ LESS_LICENSE_FILES = COPYING LESS_CPE_ID_VENDOR = gnu LESS_DEPENDENCIES = ncurses +# 0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch +LESS_IGNORE_CVES += CVE-2022-46663 + define LESS_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less endef From peter at korsgaard.com Mon Feb 20 17:07:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:07:55 +0100 Subject: [Buildroot] [git commit] package/libostree: bump to version 2023.1 Message-ID: <20230220171438.D94BD863E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d37b3916a1ce75085da8232db95cfd354137e540 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index ed31109fdb..63dfe98d80 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f libostree-2022.7.tar.xz +sha256 dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55 libostree-2023.1.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 8e8ec63213..4b17fcf391 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2022.7 +LIBOSTREE_VERSION = 2023.1 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From peter at korsgaard.com Mon Feb 20 17:06:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:06:49 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: security bump to version 2.38.5 Message-ID: <20230220171438.C09D6863E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7852618c23756d8a79809a4e9e9c331a8fb0cf16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bugfix release, fixes zero-day CVE-2023-23529 and includes a few build and behaviour patches as well. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.5.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0002.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index dcd082e045..0fa1018721 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums -md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz -sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz -sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.5.tar.xz.sums +md5 73f7abd0c1cc808032869f72602166e3 wpewebkit-2.38.5.tar.xz +sha1 3f10a04758eeb349f63f841aff765dae25bcde1b wpewebkit-2.38.5.tar.xz +sha256 ff00fd3d0a4c6d551850a78a7dfe4883b6b7ebd93c5549e1121b2f43d3ac1661 wpewebkit-2.38.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b9c2fef395..48e5c2f8cd 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.4 +WPEWEBKIT_VERSION = 2.38.5 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 17:13:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:13:07 +0100 Subject: [Buildroot] [git commit] package/rockchip-mali: needs C++ Message-ID: <20230220171439.45181863E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f1858e859833da272fce70bf445ca1b53ebffe1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master rockchip-mali pre-built libraries needs C++ since the addition of the package in commit 97c74a73e5dee17530647f89b2c7d8692781eb14: readelf -a output/build/rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427/lib/aarch64-linux-gnu/libmali-bifrost-g31-rxp0-gbm.so|grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libpthread.so.0] 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] 0x0000000000000001 (NEEDED) Shared library: [librt.so.1] 0x0000000000000001 (NEEDED) Shared library: [libdrm.so.2] 0x0000000000000001 (NEEDED) Shared library: [libm.so.6] 0x0000000000000001 (NEEDED) Shared library: [libstdc++.so.6] 0x0000000000000001 (NEEDED) Shared library: [libgcc_s.so.1] 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] While at it, add a comment when dependencies are not met Fixes: - No autobuilder failures (yet), found when debugging an issue with rockchip-mali and glslsandbox-player Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/rockchip-mali/Config.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/rockchip-mali/Config.in b/package/rockchip-mali/Config.in index d616284911..5a23954af3 100644 --- a/package/rockchip-mali/Config.in +++ b/package/rockchip-mali/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ROCKCHIP_MALI bool "rockchip-mali" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_ARM_EABIHF || BR2_aarch64 # lidbrm. This would normally need a Config.in comment, but @@ -30,3 +31,8 @@ config BR2_PACKAGE_PROVIDES_LIBGBM default "rockchip-mali" endif + +comment "rockchip-mali needs a glibc toolchain w/ C++, threads" + depends on BR2_ARM_EABIHF || BR2_aarch64 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS From peter at korsgaard.com Mon Feb 20 17:05:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:05:58 +0100 Subject: [Buildroot] [git commit] package/libcurl: bump version to 7.88.0 Message-ID: <20230220171438.A3DCE863E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14ca6b5fdb6a5e0fa99b04461240772d93076b2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://curl.se/changes.html#7_88_0 Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/2bc1d775f510196154283374284f98d3eae03544#diff-400d38e5cfee181230373a8b02d38f50271a5bf62c62410382efddb8e8b19e22 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 230ec8d704..714b02acb0 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.87.0.tar.xz.asc +# https://curl.se/download/curl-7.88.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff curl-7.87.0.tar.xz -sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING +sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 994b685d34..eb481e4782 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.87.0 +LIBCURL_VERSION = 7.88.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From peter at korsgaard.com Mon Feb 20 17:12:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:12:11 +0100 Subject: [Buildroot] [git commit] package/glslsandbox-player: add wayland-protocols optional dependency Message-ID: <20230220171439.2AD36863E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee13e3fb41dc7c0c001127733b5a599c1e509747 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master wayland-protocols is an optional dependency which is enabled by default resulting in the following wayland build failure since the addition of the package in commit f201ca9d0d25b491ec5e1ed4e1d02fd52d027997: checking for wayland_client... yes checking for wayland_egl... yes configure: Wayland EGL support enabled checking for wayland_protocols... no configure: error: Package requirements (wayland-protocols >= 1.12) were not met: Package 'wayland-protocols', required by 'virtual:world', not found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables wayland_protocols_CFLAGS and wayland_protocols_LIBS to avoid the need to call pkg-config. Fixes: - http://autobuild.buildroot.org/results/865af860f9e52fe5311bb0c6a246ff871ae5a989 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/glslsandbox-player/Config.in | 5 ++++- package/glslsandbox-player/glslsandbox-player.mk | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 132705584e..530c158fc3 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -111,8 +111,11 @@ endchoice if BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI bool "Wayland IVI shell support" -endif +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG + bool "Wayland XDG shell support" + select BR2_PACKAGE_WAYLAND_PROTOCOLS +endif endif comment "glslsandbox-player needs openGL ES and EGL driver" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index f0a9475aa6..241f3475d2 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -72,6 +72,12 @@ GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-ivi else GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-ivi endif +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += wayland-protocols +GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-wlxdg +else +GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-wlxdg +endif else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += xlib_libX11 GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=x11 From peter at korsgaard.com Mon Feb 20 17:10:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:10:37 +0100 Subject: [Buildroot] [git commit] package/python-django: security bump to version 4.1.7 Message-ID: <20230220171438.EFD28863E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a85ed5d21c14cbe3ec2864206fe792152598e4db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2023-23969 and CVE-2023-24580 https://docs.djangoproject.com/en/dev/releases/4.1.6 https://docs.djangoproject.com/en/dev/releases/4.1.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 1d3035bb98..cb03b33bfe 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 6b6a47d7478ead15b0a0835841c433dc Django-4.1.5.tar.gz -sha256 ff56ebd7ead0fd5dbe06fe157b0024a7aaea2e0593bb3785fb594cf94dad58ef Django-4.1.5.tar.gz +md5 626f96c63ddfab24bab90d80c87a7aad Django-4.1.7.tar.gz +sha256 44f714b81c5f190d9d2ddad01a532fe502fa01c4cb8faf1d081f4264ed15dcd8 Django-4.1.7.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index e08de68954..e8c91cf51f 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.5 +PYTHON_DJANGO_VERSION = 4.1.7 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/41/c8/b3c469353f9d1b7f0e99b45520582b891da02cd87408bc867affa6e039a3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/9f/a7/07939866241b7e8f8d3bf164b7d6ad428163723e29dd472700f8ab0e5fd5 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 17:11:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:11:07 +0100 Subject: [Buildroot] [git commit] package/python-cryptography: security bump to version 39.0.1 Message-ID: <20230220171439.123BA863E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67c967c2d16c29f193fde43b3c48edf0911baccd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2023-23931: cryptography is a package designed to expose cryptographic primitives and recipes to Python developers. In affected versions `Cipher.update_into` would accept Python objects which implement the buffer protocol, but provide only immutable buffers. This would allow immutable objects (such as `bytes`) to be mutated, thus violating fundamental rules of Python and resulting in corrupted output. This now correctly raises an exception. This issue has been present since `update_into` was originally introduced in cryptography 1.8. https://github.com/pyca/cryptography/security/advisories/GHSA-w7pp-m8wf-vj6r https://cryptography.io/en/latest/changelog/#v39-0-1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-cryptography/python-cryptography.hash | 2 +- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 3f2204eeb1..a23944a06f 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 2d00e023261719f85caf360ee061d37ee27654a0344d1376441c8a29ea3bac86 cryptography-39.0.0.tar.gz +sha256 531348679f144d118156be5b17ddac750974cdcd9f44bb0a7cfd7ddcfee79c80 cryptography-39.0.1.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 6868ff4633..a130b2d10d 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 39.0.0 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.1 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/12/e3/c46c274cf466b24e5d44df5d5cd31a31ff23e57f074a2bb30931a8c9b01a +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/6a/f5/a729774d087e50fffd1438b3877a91e9281294f985bda0fd15bf99016c78 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From peter at korsgaard.com Mon Feb 20 17:17:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:17:59 +0100 Subject: [Buildroot] [PATCH v1 1/3] Revert "xorg-server: not available with musl on ARM" In-Reply-To: <20230220090923.2155635-1-thomas.devoogdt@barco.com> (Thomas Devoogdt's message of "Mon, 20 Feb 2023 10:09:21 +0100") References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> Message-ID: <87ilfwz260.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > From: Thomas Devoogdt > This reverts commit 9daafbcb75a7ab593ce8a1f21c6149c8437bc0bc. > Fixed since https://gitlab.freedesktop.org/xorg/xserver/-/issues/840. I've added a note that this was included since xserver 1.20.6 and committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:22:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:22:16 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: <20230220090923.2155635-2-thomas.devoogdt@barco.com> (Thomas Devoogdt's message of "Mon, 20 Feb 2023 10:09:22 +0100") References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-2-thomas.devoogdt@barco.com> Message-ID: <87edqkz1yv.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > The reason why it was not used was that at-spi2-core and at-spi2-atk were not available, > since then, it is, so drop this patch. This will also avoid warnings in webkitgtk. > Signed-off-by: Thomas Devoogdt > --- > package/libgtk3/0001-disable-atk-bridge.patch | 41 ------------------- > package/libgtk3/Config.in | 2 + > package/libgtk3/libgtk3.mk | 4 +- > 3 files changed, 4 insertions(+), 43 deletions(-) > delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch > diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch > deleted file mode 100644 > index f3e9bff2ba..0000000000 > --- a/package/libgtk3/0001-disable-atk-bridge.patch > +++ /dev/null > @@ -1,41 +0,0 @@ > -Remove atk-bridge support. > - > -atk-bridge doesn't seem useful for now in Buildroot and requires to > -add two new packages just for it: at-spi2-core and at-spi2-atk. > - > -Signed-off-by: Hadrien Boutteville > - > ---- a/gtk/a11y/gtkaccessibility.c > -+++ b/gtk/a11y/gtkaccessibility.c > -@@ -37,10 +37,6 @@ > - #include > - #include > - > --#ifdef GDK_WINDOWING_X11 > --#include > --#endif > -- > - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, > - guint n_param_values, > - const GValue *param_values, > -@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) > - _gtk_accessibility_override_atk_util (); > - do_window_event_initialization (); > - > --#ifdef GDK_WINDOWING_X11 > -- atk_bridge_adaptor_init (NULL, NULL); > --#endif > -- > - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); > - } > ---- a/meson.build > -+++ b/meson.build > -@@ -564,7 +564,7 @@ if x11_enabled > - xfixes_dep = dependency('xfixes', required: false) > - xcomposite_dep = dependency('xcomposite', required: false) > - fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) > -- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) > -+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) > - > - backend_immodules += ['xim'] > - > diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in > index 82ca68d2da..d921f79226 100644 > --- a/package/libgtk3/Config.in > +++ b/package/libgtk3/Config.in > @@ -24,6 +24,8 @@ config BR2_PACKAGE_LIBGTK3 > depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ > BR2_PACKAGE_HAS_LIBGL > select BR2_PACKAGE_ATK > + select BR2_PACKAGE_AT_SPI2_ATK > + select BR2_PACKAGE_AT_SPI2_CORE at-spi2-core depends on xorg7 / xlib-libXtst, so that would mean that we would pull that in even for libgtk3 builds with the broadway/wayland backends, is that sensible? Maybe it is? Does at-spi2 work under wayland? -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:22:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:22:45 +0100 Subject: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5 In-Reply-To: <20230220090923.2155635-3-thomas.devoogdt@barco.com> (Thomas Devoogdt's message of "Mon, 20 Feb 2023 10:09:23 +0100") References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-3-thomas.devoogdt@barco.com> Message-ID: <87a618z1y2.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > From: Thomas Devoogdt > Bugfix release, with many security fixes, including (but not limited to) > a patch for CVE-2023-23529. > Release notes: > https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html > Accompanying security advisory: > https://webkitgtk.org/security/WSA-2023-0002.html > Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. > Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, > we do check on >= GCC 8, because we can't check on >= GCC 8.3. > https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b > Signed-off-by: Thomas Devoogdt Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 17:17:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:17:14 +0100 Subject: [Buildroot] [git commit] Revert "xorg-server: not available with musl on ARM" Message-ID: <20230220172325.5381C86400@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b21cd8be3f9469d6bdbbaed951ae7c59efb46a24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 9daafbcb75a7ab593ce8a1f21c6149c8437bc0bc. Fixed since https://gitlab.freedesktop.org/xorg/xserver/-/issues/840 (xserver 1.20.6). Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 865917c4ec..b933bd0285 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -1,11 +1,6 @@ -comment "xorg-server needs a glibc or uClibc toolchain" - depends on BR2_arm && BR2_TOOLCHAIN_USES_MUSL - config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" depends on BR2_USE_MMU # fork() - # xserver uses inb/outb on arm, which aren't available with musl - depends on !(BR2_arm && BR2_TOOLCHAIN_USES_MUSL) # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. From peter at korsgaard.com Mon Feb 20 17:22:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:22:29 +0100 Subject: [Buildroot] [git commit] package/webkitgtk: security bump to version 2.38.5 Message-ID: <20230220172325.5D93F86401@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c7fcbbe75de5c535e8d5dd7182900b6d09e2b03 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bugfix release, with many security fixes, including (but not limited to) a patch for CVE-2023-23529. Release notes: https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0002.html Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, we do check on >= GCC 8, because we can't check on >= GCC 8.3. https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b Signed-off-by: Thomas Devoogdt Acked-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 4 ++-- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index dc5d738dae..976341093e 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 34fd19d3de..c771297b5a 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums -md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz -sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz -sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums +md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz +sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz +sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index a6974db926..3263f7fea0 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.4 +WEBKITGTK_VERSION = 2.38.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From thomas at devoogdt.com Mon Feb 20 18:53:59 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 20 Feb 2023 19:53:59 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: <87edqkz1yv.fsf@dell.be.48ers.dk> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-2-thomas.devoogdt@barco.com> <87edqkz1yv.fsf@dell.be.48ers.dk> Message-ID: Hi, I see that X11 support is optional and is automatically detected: https://github.com/GNOME/at-spi2-core/blob/main/meson_options.txt#L31-L34 So it would be better to append a commit to this one to remove the Xorg dependency on at-spi2-core. Kr, Thomas Devoogdt Op ma 20 feb. 2023 om 18:22 schreef Peter Korsgaard : > > >>>>> "Thomas" == Thomas Devoogdt writes: > > > The reason why it was not used was that at-spi2-core and at-spi2-atk were not available, > > since then, it is, so drop this patch. This will also avoid warnings in webkitgtk. > > > Signed-off-by: Thomas Devoogdt > > --- > > package/libgtk3/0001-disable-atk-bridge.patch | 41 ------------------- > > package/libgtk3/Config.in | 2 + > > package/libgtk3/libgtk3.mk | 4 +- > > 3 files changed, 4 insertions(+), 43 deletions(-) > > delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch > > > diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch > > deleted file mode 100644 > > index f3e9bff2ba..0000000000 > > --- a/package/libgtk3/0001-disable-atk-bridge.patch > > +++ /dev/null > > @@ -1,41 +0,0 @@ > > -Remove atk-bridge support. > > - > > -atk-bridge doesn't seem useful for now in Buildroot and requires to > > -add two new packages just for it: at-spi2-core and at-spi2-atk. > > - > > -Signed-off-by: Hadrien Boutteville > > - > > ---- a/gtk/a11y/gtkaccessibility.c > > -+++ b/gtk/a11y/gtkaccessibility.c > > -@@ -37,10 +37,6 @@ > > - #include > > - #include > > - > > --#ifdef GDK_WINDOWING_X11 > > --#include > > --#endif > > -- > > - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, > > - guint n_param_values, > > - const GValue *param_values, > > -@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) > > - _gtk_accessibility_override_atk_util (); > > - do_window_event_initialization (); > > - > > --#ifdef GDK_WINDOWING_X11 > > -- atk_bridge_adaptor_init (NULL, NULL); > > > --#endif > > -- > > - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); > > - } > > ---- a/meson.build > > -+++ b/meson.build > > -@@ -564,7 +564,7 @@ if x11_enabled > > - xfixes_dep = dependency('xfixes', required: false) > > - xcomposite_dep = dependency('xcomposite', required: false) > > - fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) > > -- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) > > -+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) > > - > > - backend_immodules += ['xim'] > > - > > > diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in > > index 82ca68d2da..d921f79226 100644 > > --- a/package/libgtk3/Config.in > > +++ b/package/libgtk3/Config.in > > @@ -24,6 +24,8 @@ config BR2_PACKAGE_LIBGTK3 > > depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ > > BR2_PACKAGE_HAS_LIBGL > > select BR2_PACKAGE_ATK > > + select BR2_PACKAGE_AT_SPI2_ATK > > + select BR2_PACKAGE_AT_SPI2_CORE > > at-spi2-core depends on xorg7 / xlib-libXtst, so that would mean that we > would pull that in even for libgtk3 builds with the broadway/wayland > backends, is that sensible? > > Maybe it is? Does at-spi2 work under wayland? > > -- > Bye, Peter Korsgaard > From bernd.kuhls at t-online.de Mon Feb 20 19:18:22 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 20 Feb 2023 20:18:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 22.3.5 Message-ID: <20230220191822.99026-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.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 9177adceda..ad1999a30d 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 = 22.3.4 +MESA3D_HEADERS_VERSION = 22.3.5 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 e4de997f0e..50c5bcc7fc 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html -sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz -sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.html +sha256 3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9 mesa-22.3.5.tar.xz +sha512 a4cad9b7e6501678fac279bd88a37e522633c7128afa8df04982f469c930e3557bb1d05b4b0f5ae16704d8d04e50c90a7489943a48861df17dd947704c329b85 mesa-22.3.5.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 36b7151510..a744334c5b 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 = 22.3.4 +MESA3D_VERSION = 22.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.39.1 From fontaine.fabrice at gmail.com Mon Feb 20 19:21:25 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 20:21:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: fix uclibc with libiconv build Message-ID: <20230220192125.555632-1-fontaine.fabrice@gmail.com> Replace patch added by commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429 as current patch is not correct, build failures are still raised by uclibc-ng with libiconv on fwup/gvfs/...: configure: error: Requires libarchive. Libarchive must be built with zlib support. [...] Run-time dependency libarchive found: NO (tried cmake) ../output-1/build/gvfs-1.48.1/meson.build:405:2: ERROR: Dependency lookup for libarchive with method 'pkgconfig' failed: Could not generate cargs for libarchive: Package iconv was not found in the pkg-config search path. Perhaps you should add the directory containing `iconv.pc' to the PKG_CONFIG_PATH environment variable Package 'iconv', required by 'libarchive', not found Fixes: - http://autobuild.buildroot.org/results/05a5496495e51da2c9caf7570695cc95e1745e30 - http://autobuild.buildroot.org/results/98dc4b415115cca65b53e4cd986144ef85bf17ad Signed-off-by: Fabrice Fontaine --- ...y-add-iconv-to-the-pc-file-if-needed.patch | 44 ------------------- ...o-not-add-iconv-for-Requires.private.patch | 28 ++++++++++++ 2 files changed, 28 insertions(+), 44 deletions(-) delete mode 100644 package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch create mode 100644 package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch deleted file mode 100644 index c93944f789..0000000000 --- a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 -From: Peter Pentchev -Date: Thu, 29 Dec 2022 00:04:40 +0200 -Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) - -Hi, - -Thanks for writing and maintaining libarchive! - -What do you think about this trivial change that does not add "iconv" to -the pkg-config file's list of required packages unless it is actually -needed? On at least Debian GNU/Linux systems, the iconv(3) function is -part of the system C library and there is no Debian package that -installs an iconv.pc file, so I had to make this change to the Debian -package of libarchive. - -Thanks again, and keep up the great work! - -G'luck, -Peter - -Downloaded from upstream commit: -https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 99bff20d1..e2715cfde 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then - AC_CHECK_HEADERS([localcharset.h]) - am_save_LIBS="$LIBS" - LIBS="${LIBS} ${LIBICONV}" -- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" -+ if test -n "$LIBICONV"; then -+ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" -+ fi - AC_CHECK_FUNCS([locale_charset]) - LIBS="${am_save_LIBS}" - if test "x$ac_cv_func_locale_charset" != "xyes"; then diff --git a/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch b/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch new file mode 100644 index 0000000000..91903866ef --- /dev/null +++ b/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch @@ -0,0 +1,28 @@ +From 619c1be8d38ff79622db8f66f3b02832795315f9 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Wed, 14 Dec 2022 09:04:39 +0100 +Subject: [PATCH] autotools: do not add iconv for Requires.private + +There is no pkgconfig file for iconv, thus things break with this +change. Let's drop iconv from Requires.private. + +Fixes: a83f3d32 ("autotools: Fix static linking when openssl is enabled in windows") +[Retrieved from: +https://github.com/libarchive/libarchive/pull/1817/commits/619c1be8d38ff79622db8f66f3b02832795315f9] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99bff20d1..f245d0c55 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -378,7 +378,6 @@ if test "x$with_iconv" != "xno"; then + AC_CHECK_HEADERS([localcharset.h]) + am_save_LIBS="$LIBS" + LIBS="${LIBS} ${LIBICONV}" +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" + AC_CHECK_FUNCS([locale_charset]) + LIBS="${am_save_LIBS}" + if test "x$ac_cv_func_locale_charset" != "xyes"; then -- 2.39.0 From bernd.kuhls at t-online.de Mon Feb 20 19:25:34 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 20 Feb 2023 20:25:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-iptvsimple: bump version to 19.3.0-Matrix Message-ID: <20230220192534.103145-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 47dd202258..de71703c53 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 57710d3add72301d47a9eef016916ee5f61b7b8604c73450d67b9ba962eff60c kodi-pvr-iptvsimple-19.2.2-Matrix.tar.gz +sha256 421a883054dd31ad512866236c364e5a564d7db9fa595dadc3e37b9169b7fe79 kodi-pvr-iptvsimple-19.3.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 5b91c35c0c..e5976a7d3a 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 19.2.2-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 19.3.0-Matrix KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md -- 2.39.1 From peter at korsgaard.com Mon Feb 20 20:03:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:03:06 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: (Thomas Devoogdt's message of "Mon, 20 Feb 2023 19:53:59 +0100") References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-2-thomas.devoogdt@barco.com> <87edqkz1yv.fsf@dell.be.48ers.dk> Message-ID: <875ybwyuit.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > Hi, > I see that X11 support is optional and is automatically detected: > https://github.com/GNOME/at-spi2-core/blob/main/meson_options.txt#L31-L34 > So it would be better to append a commit to this one to remove the > Xorg dependency on at-spi2-core. Thanks, care to send a patch for that? -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 20 20:13:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:13:02 +0100 Subject: [Buildroot] [git commit] Update for 2023.02-rc1 Message-ID: <20230220201541.B9CD18640F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8c4b360fd40e5b266c851588a81aff102afaec7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 85 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 4 +-- docs/website/download.html | 22 ++++++------ docs/website/news.html | 21 ++++++++++++ 4 files changed, 119 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index 9fd8b31350..21e349f3a8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,88 @@ +2023.02-rc1, released February 20th, 2023 + + Numerous package updates and many (62) new packages. + + Toolchain: + + - The check for access to "unsafe" (E.G. from the build host) + header files and libraries by the cross compiler is now + unconditionally enabled. + + - Bootlin external toolchains updated to 2022.08 + + - The handling of the CCACHE_* environment variables by the + toolchain wrapper is now more strict, causing the variables + to only be exported when BR2_CCACHE is enabled. + + Infrastructure: + + - Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + - Legal-info: Stop warning about not saving sources for local + / override packages if _REDISTRIBUTE is set to NO. + + - Go: Ensure our go build and module cache is used, even for the + download step. + + - Cargo: CARGO_HOME (the location where cargo stores it + downloaded artifacts) is now located under DL_DIR rather + than in HOST_DIR/share/cargo, ensuring it is shared between + builds. + + Misc: + + - Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + - Ext2: Year 2038+ compatible inodes are now used by default, + independently of the filesystem size. + + - Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + New defconfigs: i.MX8mn BSH SMM S2 / pro, QEMU ARM EBBR, + Sipeed Lichee rv / rv dock, Starfive Visionfive2, Xilinx Versal + VCK190. + + New packages: catch2, cli11, dotconf, edk2-non-osi, + fluent-bit, fxdiv, hddtemp, highway, imx-vpu-hantro-daemon, + libjxl, libsolv, libunibreak, neon-2-sse, open-iscsi, + opencv4-contrib, perftest, perl-image-exiftool, + python-apispec, python-async-generator, python-cppy, + python-dbus-fast, python-dicttoxml2, python-flask-smorest, + python-h11, python-hkdf, python-magic-wormhole, + python-magic-wormhole-mailbox-server, + python-magic-wormhole-transit-relay, python-marshmallow, + python-munch, python-outcome, python-pycrate, python-pyspnego, + python-reedsolo, python-selenium, python-smbprotocol, + python-sniffio, python-spake2, python-trio, + python-trio-websocket, python-uhid, python-webargs, + python-wsproto, qt5speech, qt6serialbus, rdma-core, reproc, + rtl8723ds-bt, rtl8821cu, sexpect, speechd, sscep, stb, sway, + termcolor, ti-k3-r5-loader, tl-expected, unifdef, + versal-firmware, xwayland, z3 + + Removed packages: docker-proxy, elixir, gummiboot, + python-bunch, python-m2r, sun20i-d1-spl, ucl, + xdriver_xf86-input-keyboard, xdriver_xf86-video-glint, + xdriver_xf86-video-imx-viv, xdriver_xf86-video-tga + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + #15271: no start-qemu.sh + #15281: Error compiling GDAL library for RPi-64 if libgdal-dev install.. + #15291: BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS without location + #15301: Selecting NAND Flash boot media (NAND_BOOT) breaks the uboot.. + #15331: Warning on python-flit-core license when generating legal info + 2022.11.1, released January 18th, 2023 Important / security related fixes. diff --git a/Makefile b/Makefile index 4880b426b5..c97086c09c 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02-git +export BR2_VERSION := 2023.02-rc1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1669308000 +BR2_VERSION_EPOCH = 1676923000 # 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 a7efef1ef3..a6b9a9a7c4 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -75,38 +75,38 @@

      PGP signature

      - +
      Source code
      diff --git a/docs/website/news.html b/docs/website/news.html index 687efeb377..8acf454052 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

      News

        +
      • +
        +
        +
        +

        2023.02-rc1 released

        +

        20 February 2023

        +
        +
        +

        We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

        + +

        Go to the downloads page to pick up the + 2023.02-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

        +
        +
        +
        • +
      • From thomas.petazzoni at bootlin.com Mon Feb 20 20:36:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:36:12 +0100 Subject: [Buildroot] [git commit] package/speechd: fix build with help2man Message-ID: <20230220203633.CE2A886429@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d77d1c98240bf9c7c9062a67d68b1e548af42e5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with help2man raised since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: LC_ALL=C help2man -n "speech synthesis daemon" --output=speech-dispatcher.1 ./speech-dispatcher help2man: can't get `--help' info from ./speech-dispatcher Try `--no-discard-stderr' if option outputs to stderr Fixes: - http://autobuild.buildroot.org/results/cc1817efb4a5d54ffd2e7ac2f4fc773535f70972 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 46c0672f59..dee94a6752 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,6 +12,7 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile +SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" SPEECHD_CONF_OPTS = --without-kali # fix missing config.rpath (needed for autoreconf) in the codebase From thomas.petazzoni at bootlin.com Mon Feb 20 20:36:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:36:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/speechd: fix build with help2man In-Reply-To: <20230220132552.1825946-1-fontaine.fabrice@gmail.com> References: <20230220132552.1825946-1-fontaine.fabrice@gmail.com> Message-ID: <20230220213640.4a61b2c2@windsurf> On Mon, 20 Feb 2023 14:25:51 +0100 Fabrice Fontaine wrote: > Fix the following build failure with help2man raised since the addition > of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: > > LC_ALL=C help2man -n "speech synthesis daemon" --output=speech-dispatcher.1 ./speech-dispatcher > help2man: can't get `--help' info from ./speech-dispatcher > Try `--no-discard-stderr' if option outputs to stderr > > Fixes: > - http://autobuild.buildroot.org/results/cc1817efb4a5d54ffd2e7ac2f4fc773535f70972 > > Signed-off-by: Fabrice Fontaine > --- > package/speechd/speechd.mk | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:37:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:37:41 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/libarchive: fix host build In-Reply-To: <20230220142746.1935069-1-fontaine.fabrice@gmail.com> References: <20230220142746.1935069-1-fontaine.fabrice@gmail.com> Message-ID: <20230220213741.0f9cf741@windsurf> On Mon, 20 Feb 2023 15:27:46 +0100 Fabrice Fontaine wrote: > Fix the following host build failure raised since commit > 9525bc7e64e8f44c31ab9dfd3f516ecb35982429: > > configure.ac:140: error: possibly undefined macro: AC_MSG_FAILURE > If this token and others are legitimate, please use m4_pattern_allow. > See the Autoconf documentation. > configure.ac:328: error: possibly undefined macro: AC_CHECK_LIB > > Fixes: > - http://autobuild.buildroot.org/results/11868e9bc4916843a7fc76f7b5e4c251f89e33dc > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Thomas Petazzoni): > - Drop per-package from commit message Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:36:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:36:55 +0100 Subject: [Buildroot] [git commit] package/libarchive: fix host build Message-ID: <20230220203832.BD7D18642E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8e461bba5942b4711b94a57799600fb4eb226c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following host build failure raised since commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429: configure.ac:140: error: possibly undefined macro: AC_MSG_FAILURE If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:328: error: possibly undefined macro: AC_CHECK_LIB Fixes: - http://autobuild.buildroot.org/results/11868e9bc4916843a7fc76f7b5e4c251f89e33dc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libarchive/libarchive.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cd7c13fbed..2010b6529f 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -140,6 +140,8 @@ endif # The only user of host-libarchive needs zlib support HOST_LIBARCHIVE_DEPENDENCIES = host-zlib +# needed for autoreconf +HOST_LIBARCHIVE_DEPENDENCIES += host-pkgconf HOST_LIBARCHIVE_CONF_OPTS = \ --disable-bsdtar \ --disable-bsdcpio \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:38:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:38:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/libarchive: fix uclibc with libiconv build In-Reply-To: <20230220192125.555632-1-fontaine.fabrice@gmail.com> References: <20230220192125.555632-1-fontaine.fabrice@gmail.com> Message-ID: <20230220213858.2104ae5e@windsurf> On Mon, 20 Feb 2023 20:21:25 +0100 Fabrice Fontaine wrote: > Replace patch added by commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429 > as current patch is not correct, build failures are still raised by > uclibc-ng with libiconv on fwup/gvfs/...: > > configure: error: Requires libarchive. Libarchive must be built with zlib support. > > [...] > > Run-time dependency libarchive found: NO (tried cmake) > > ../output-1/build/gvfs-1.48.1/meson.build:405:2: ERROR: Dependency lookup for libarchive with method 'pkgconfig' failed: Could not generate cargs for libarchive: > Package iconv was not found in the pkg-config search path. > Perhaps you should add the directory containing `iconv.pc' > to the PKG_CONFIG_PATH environment variable > Package 'iconv', required by 'libarchive', not found > > Fixes: > - http://autobuild.buildroot.org/results/05a5496495e51da2c9caf7570695cc95e1745e30 > - http://autobuild.buildroot.org/results/98dc4b415115cca65b53e4cd986144ef85bf17ad > > Signed-off-by: Fabrice Fontaine > --- > ...y-add-iconv-to-the-pc-file-if-needed.patch | 44 ------------------- > ...o-not-add-iconv-for-Requires.private.patch | 28 ++++++++++++ > 2 files changed, 28 insertions(+), 44 deletions(-) > delete mode 100644 package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch > create mode 100644 package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:39:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:39:47 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require FileHandle perl package for syslinux Message-ID: <20230220203958.774428643D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=474196d6bb410c0a9f5e1c8bb7018594a29a57bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master syslinux needs FileHandle module: Can't locate FileHandle.pm in @INC (you may need to install the FileHandle module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. /home/buildroot/autobuild/instance-0/output-1/host/bin/i586-buildroot-linux-gnu-gcc -Wp,-MT,errlist.o,-MD,./.errlist.o.d -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-labels=0 -ffast-math -fomit-frame-pointer -std=gnu99 -m32 -mpreferred-stack-boundary=2 -fno-stack-protector -fwrapv -freg-struct-return -fPIC -fno-exceptions -fno-asynchronous-unwind-tables -fno-strict-aliasing -falign-functions=0 -falign-jumps=0 -falign-labels=0 -falign-loops=0 -g -D__COM32__ -D__FIRMWARE_BIOS__ -nostdinc -iwithprefix include -I. -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/../include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/include/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/core/include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/ -I/home/buildroot/autobuild/instance-0/output-1/bu ild/syslinux-6.03/com32/lib/sys/module -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/bios/com32/lib//../.. -W -Wall -Wstrict-prototypes -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline -DDYNAMIC_CRC_TABLE -DPNG_NO_CONSOLE_IO -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_MNG_FEATURES -DPNG_NO_READ_tIME -DPNG_NO_WRITE_tIME -mregparm=3 -DREGPARM=3 -c -o errlist.o errlist.c cc1: fatal error: errlist.c: No such file or directory Fixes: - http://autobuild.buildroot.org/results/de88089888b2ca354b28af3550abf846560da7d5 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 4353e9585e..a692856d31 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -298,6 +298,10 @@ if grep -q -E '^BR2_PACKAGE_(WEBKITGTK|WPEWEBKIT)=y' $BR2_CONFIG ; then required_perl_modules="${required_perl_modules} JSON::PP" fi +if grep -q ^BR2_TARGET_SYSLINUX=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules FileHandle" +fi + # This variable will keep the modules that are missing in your system. missing_perl_modules="" From thomas.petazzoni at bootlin.com Mon Feb 20 20:38:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:38:43 +0100 Subject: [Buildroot] [git commit] package/libarchive: fix uclibc with libiconv build Message-ID: <20230220203958.6CA088643C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e8cce6f2b1936dbda9d63ddf4f41acf59a64113 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace patch added by commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429 as current patch is not correct, build failures are still raised by uclibc-ng with libiconv on fwup/gvfs/...: configure: error: Requires libarchive. Libarchive must be built with zlib support. [...] Run-time dependency libarchive found: NO (tried cmake) ../output-1/build/gvfs-1.48.1/meson.build:405:2: ERROR: Dependency lookup for libarchive with method 'pkgconfig' failed: Could not generate cargs for libarchive: Package iconv was not found in the pkg-config search path. Perhaps you should add the directory containing `iconv.pc' to the PKG_CONFIG_PATH environment variable Package 'iconv', required by 'libarchive', not found Fixes: - http://autobuild.buildroot.org/results/05a5496495e51da2c9caf7570695cc95e1745e30 - http://autobuild.buildroot.org/results/98dc4b415115cca65b53e4cd986144ef85bf17ad Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...1-Only-add-iconv-to-the-pc-file-if-needed.patch | 44 ---------------------- ...ols-do-not-add-iconv-for-Requires.private.patch | 28 ++++++++++++++ 2 files changed, 28 insertions(+), 44 deletions(-) diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch deleted file mode 100644 index c93944f789..0000000000 --- a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 -From: Peter Pentchev -Date: Thu, 29 Dec 2022 00:04:40 +0200 -Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) - -Hi, - -Thanks for writing and maintaining libarchive! - -What do you think about this trivial change that does not add "iconv" to -the pkg-config file's list of required packages unless it is actually -needed? On at least Debian GNU/Linux systems, the iconv(3) function is -part of the system C library and there is no Debian package that -installs an iconv.pc file, so I had to make this change to the Debian -package of libarchive. - -Thanks again, and keep up the great work! - -G'luck, -Peter - -Downloaded from upstream commit: -https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 99bff20d1..e2715cfde 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then - AC_CHECK_HEADERS([localcharset.h]) - am_save_LIBS="$LIBS" - LIBS="${LIBS} ${LIBICONV}" -- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" -+ if test -n "$LIBICONV"; then -+ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" -+ fi - AC_CHECK_FUNCS([locale_charset]) - LIBS="${am_save_LIBS}" - if test "x$ac_cv_func_locale_charset" != "xyes"; then diff --git a/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch b/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch new file mode 100644 index 0000000000..91903866ef --- /dev/null +++ b/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch @@ -0,0 +1,28 @@ +From 619c1be8d38ff79622db8f66f3b02832795315f9 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Wed, 14 Dec 2022 09:04:39 +0100 +Subject: [PATCH] autotools: do not add iconv for Requires.private + +There is no pkgconfig file for iconv, thus things break with this +change. Let's drop iconv from Requires.private. + +Fixes: a83f3d32 ("autotools: Fix static linking when openssl is enabled in windows") +[Retrieved from: +https://github.com/libarchive/libarchive/pull/1817/commits/619c1be8d38ff79622db8f66f3b02832795315f9] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99bff20d1..f245d0c55 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -378,7 +378,6 @@ if test "x$with_iconv" != "xno"; then + AC_CHECK_HEADERS([localcharset.h]) + am_save_LIBS="$LIBS" + LIBS="${LIBS} ${LIBICONV}" +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" + AC_CHECK_FUNCS([locale_charset]) + LIBS="${am_save_LIBS}" + if test "x$ac_cv_func_locale_charset" != "xyes"; then From thomas.petazzoni at bootlin.com Mon Feb 20 20:39:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:39:59 +0100 Subject: [Buildroot] [PATCH 1/1] support/dependencies/dependencies.sh: require FileHandle perl package for syslinux In-Reply-To: <20230220100309.116832-1-fontaine.fabrice@gmail.com> References: <20230220100309.116832-1-fontaine.fabrice@gmail.com> Message-ID: <20230220213959.799dfa91@windsurf> On Mon, 20 Feb 2023 11:03:09 +0100 Fabrice Fontaine wrote: > syslinux needs FileHandle module: > > Can't locate FileHandle.pm in @INC (you may need to install the FileHandle module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. > BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. > /home/buildroot/autobuild/instance-0/output-1/host/bin/i586-buildroot-linux-gnu-gcc -Wp,-MT,errlist.o,-MD,./.errlist.o.d -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-labels=0 -ffast-math -fomit-frame-pointer -std=gnu99 -m32 -mpreferred-stack-boundary=2 -fno-stack-protector -fwrapv -freg-struct-return -fPIC -fno-exceptions -fno-asynchronous-unwind-tables -fno-strict-aliasing -falign-functions=0 -falign-jumps=0 -falign-labels=0 -falign-loops=0 -g -D__COM32__ -D__FIRMWARE_BIOS__ -nostdinc -iwithprefix include -I. -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/../include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/include/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/core/include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/ -I/home/buildroot/autobuild/instance-0/output-1/ bu > ild/syslinux-6.03/com32/lib/sys/module -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/bios/com32/lib//../.. -W -Wall -Wstrict-prototypes -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline -DDYNAMIC_CRC_TABLE -DPNG_NO_CONSOLE_IO -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_MNG_FEATURES -DPNG_NO_READ_tIME -DPNG_NO_WRITE_tIME -mregparm=3 -DREGPARM=3 -c -o errlist.o errlist.c > cc1: fatal error: errlist.c: No such file or directory > > Fixes: > - http://autobuild.buildroot.org/results/de88089888b2ca354b28af3550abf846560da7d5 > > Signed-off-by: Fabrice Fontaine > --- > support/dependencies/dependencies.sh | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 20 20:43:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:43:56 +0100 Subject: [Buildroot] Buildroot 2023.02-rc1 released Message-ID: <871qmkysmr.fsf@dell.be.48ers.dk> Hi, Buildroot 2023.02-rc1 is released - Go download it at: http://buildroot.net/downloads/buildroot-2023.02-rc1.tar.gz or http://buildroot.net/downloads/buildroot-2023.02-rc1.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. Once more, a fairly busy cycle with more than 1500 changes from 106 unique contributors! Of noteworthy new features/changes we have: Toolchain: - The check for access to "unsafe" (E.G. from the build host) header files and libraries by the cross compiler is now unconditionally enabled. - Bootlin external toolchains updated to 2022.08 - The handling of the CCACHE_* environment variables by the toolchain wrapper is now more strict, causing the variables to only be exported when BR2_CCACHE is enabled. Infrastructure: - Br2-external: Fix make performance issue when many (> 6) external trees are used together. - Legal-info: Stop warning about not saving sources for local / override packages if _REDISTRIBUTE is set to NO. - Go: Ensure our go build and module cache is used, even for the download step. - Cargo: CARGO_HOME (the location where cargo stores its downloaded artifacts) is now located under DL_DIR rather than in HOST_DIR/share/cargo, ensuring it is shared between builds. Misc: - Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is used. - Ext2: Year 2038+ compatible inodes are now used by default, independently of the filesystem size. - A large number of NXP related packages and defconfigs have been updated as upstream moved the git repositories to Github. - New defconfigs: i.MX8mn BSH SMM S2 / pro, QEMU ARM EBBR, Sipeed Lichee rv / rv dock, Starfive Visionfive2, Xilinx Versal VCK190. - New packages: catch2, cli11, dotconf, edk2-non-osi, fluent-bit, fxdiv, hddtemp, highway, imx-vpu-hantro-daemon, libjxl, libsolv, libunibreak, neon-2-sse, open-iscsi, opencv4-contrib, perftest, perl-image-exiftool, python-apispec, python-async-generator, python-cppy, python-dbus-fast, python-dicttoxml2, python-flask-smorest, python-h11, python-hkdf, python-magic-wormhole, python-magic-wormhole-mailbox-server, python-magic-wormhole-transit-relay, python-marshmallow, python-munch, python-outcome, python-pycrate, python-pyspnego, python-reedsolo, python-selenium, python-smbprotocol, python-sniffio, python-spake2, python-trio, python-trio-websocket, python-uhid, python-webargs, python-wsproto, qt5speech, qt6serialbus, rdma-core, reproc, rtl8723ds-bt, rtl8821cu, sexpect, speechd, sscep, stb, sway, termcolor, ti-k3-r5-loader, tl-expected, unifdef, versal-firmware, xwayland, z3 And the usual package version updates and bug fixes. See the CHANGES file for details: http://git.buildroot.net/buildroot/plain/CHANGES?id=2023.02-rc1 Many thanks to the people contributing to this release: git shortlog -sn 2022.11.. 355 James Hilliard 188 Bernd Kuhls 166 Fabrice Fontaine 69 Julien Olivain 63 Francois Perrad 63 Peter Korsgaard 59 Ricardo Martincoski 53 Lang Daniel 41 Giulio Benetti 34 Thomas Petazzoni 33 Yann E. MORIN 30 Christian Stewart 20 Neal Frager 19 Heiko Thiery 15 Maxim Kochetkov 13 Thomas Devoogdt 12 Angelo Compagnucci 12 Peter Seiderer 11 Marcin Niestroj 11 Romain Naour 10 Adrian Perez de Castro 10 Dario Binacchi 9 Arnout Vandecappelle 9 Chris Dimich 9 Michael Nosthoff 9 Vincent Fazio 8 Jesse Van Gavere 8 Joachim Wiberg 8 TIAN Yuanhao 8 Yegor Yefremov 7 Baruch Siach 7 Marcus Folkesson 6 Martin Hundeb?ll 5 Etienne Carriere 5 Norbert Lange 4 Alexander Egorenkov 4 Dennis Van Hoorick 4 Quentin Schulz 4 Raphael Pavlidis 4 Thomas Claveirole 4 Vincent Stehl? 3 Ben Wolsieffer 3 Casey Reeves 3 Frank Vanbever 3 Gleb Mazovetskiy 3 Michael Fischer 2 Andreas Klinger 2 Andreas Ziegler 2 Bagas Sanjaya 2 Brandon Maier 2 Carlos Santos 2 Florian Fainelli 2 Francois Dugast 2 Gwenhael Goavec-Merou 2 John Keeping 2 Konstantin Menyaev 2 Kory Maincent 2 Nicolas Carrier 2 Nicolas Cavallari 2 Patrick Gerber 2 Stefan Agner 2 Stephan Henningsen 2 Tim Gover 2 Yair Ben-Avraham 2 ?????? ????? (Leonid Yuriev) 1 Alexis Lothor? 1 Andrey Grafin 1 Andr? Zwing 1 Bartosz Golaszewski 1 Ben Hutchings 1 Daniel Semkowicz 1 Danilo Bargen 1 Dimitar Tomov 1 Dominik Michael Rauh 1 Edgar Bonet 1 Gary Bisson 1 Gilles Chanteperdrix 1 Graeme Smecher 1 James Kent 1 Jason A. Donenfeld 1 Jerry Kooyman 1 Joel Carlson 1 Jordan Speicher 1 Jos? Luis Salvador Rufo 1 Kyle Harding 1 Markus Mayer 1 Matthew Weber 1 Michael Trimarchi 1 Nasser Afshin 1 Nevo Hed 1 Niklas Cassel 1 Paul Cercueil 1 Peter Thompson 1 Petr Vorel 1 Ramon Crichlow 1 Robert Marko 1 Sebastian Weyer 1 Sergey Organov 1 S?bastien Szymanski 1 Tan En De 1 Thomas Huth 1 Titouan Christophe 1 Wolfgang Grandegger 1 Woodrow Douglass 1 Xuanhao Shi 1 Yu Chien Peter Lin And a special thanks to our patch reviewers: git log 2022.11.. | grep -Ei '(reviewed|acked)-by:' | \ sed 's/.*by: //' | sort | uniq -c | sort -n -r 12 Luca Ceresoli 8 James Hilliard 7 Romain Naour 5 Marcin Niestroj 5 Heiko Thiery 5 Christian Stewart 4 Giulio Benetti 3 Yegor Yefremov 3 Norbert Lange 3 Julien Olivain 3 Francois Perrad 2 Adrian Perez de Castro 1 Yann E. MORIN 1 Yann E. MORIN 1 Thomas Petazzoni 1 Ryan Barnett 1 Quentin Schulz 1 Petr Vorel 1 Neal Frager 1 Maxim Kochetkov 1 Marcus Hoffmann 1 Marcus Folkesson 1 Joachim Wiberg 1 Indrek Kruusa 1 Geoff Levand 1 Fabio Estevam 1 Dario Binacchi 1 Andrew Davis We will now create a next branch and start merging new features for 2023.05 already in parallel with the 2023.02 stabilization. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 20 20:44:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:44:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix libcurl build In-Reply-To: <20230220093336.77462-1-fontaine.fabrice@gmail.com> References: <20230220093336.77462-1-fontaine.fabrice@gmail.com> Message-ID: <20230220214423.1a42a0e5@windsurf> Hello Fabrice, On Mon, 20 Feb 2023 10:33:36 +0100 Fabrice Fontaine wrote: > Fix the following libcurl build failure: > > In file included from /tmp/instance-1/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/include/curl/curl.h:3195, > from ../../../../include/sysinc.h:384, > from ../../../../include/common.h:23, > from simple.c:20: > simple.c: In function 'check_https': > simple.c:167:65: error: invalid use of void expression > 167 | if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_USERAGENT, "Zabbix " ZABBIX_VERSION)) || > | ^ > > Fixes: > - http://autobuild.buildroot.org/results/053a62e9969046a7f8a0e1890c24d2bfb099ae42 > > Signed-off-by: Fabrice Fontaine > --- > ...se-parentheses-to-ensure-compilation.patch | 65 +++++++++++++++++++ > 1 file changed, 65 insertions(+) > create mode 100644 package/zabbix/0002-Use-parentheses-to-ensure-compilation.patch This was reported to curl upstream in https://github.com/curl/curl/issues/10148, and apparently fixed in curl by https://github.com/curl/curl/commit/e2aed004302e51cfa5b6ce8c8ab65ef92aa83196. So it apparently was considered a bug in curl, so perhaps it should be fixed in curl rather than in zabbix? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:46:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:46:40 +0100 Subject: [Buildroot] [git commit] package/modem-manager: needs dynamic library Message-ID: <20230220204653.000F386442@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d9c146f0a540536c0ad8df7b31a190c117ad1581 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit d769cfc13f6c2544f8bc5b6339d23763319a2383 was incomplete as plugins/meson.build still unconditionally calls shared_module. So add a dependency to dynamic library to avoid the following static build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: [238/417] Linking target plugins/libmm-shared-telit.so FAILED: plugins/libmm-shared-telit.so Building statically could be enabled back through builtin_plugins as soon as https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/1c4da332ee6e0d948f85a63f74cb27e89075c011 lands in a stable release Fixes: - http://autobuild.buildroot.org/results/deb2a752accb021392bb9dc3d06b2b1bf151535c Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/modem-manager/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index 8489e6fc86..6990996a86 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_MODEM_MANAGER depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV @@ -39,6 +40,7 @@ comment "QRTR support needs a toolchain w/ headers >= 4.15" endif -comment "modemmanager needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS +comment "modemmanager needs a toolchain w/ wchar, threads, dynamic library" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS depends on BR2_USE_MMU From thomas.petazzoni at bootlin.com Mon Feb 20 20:46:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:46:52 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/modem-manager: needs dynamic library In-Reply-To: <20230220092516.17774-1-fontaine.fabrice@gmail.com> References: <20230220092516.17774-1-fontaine.fabrice@gmail.com> Message-ID: <20230220214652.029e413b@windsurf> On Mon, 20 Feb 2023 10:25:16 +0100 Fabrice Fontaine wrote: > Commit d769cfc13f6c2544f8bc5b6339d23763319a2383 was incomplete as > plugins/meson.build still unconditionally calls shared_module. So add a > dependency to dynamic library to avoid the following static build > failure raised since bump to version 1.20.2 in commit > b95334b71fbdde0f7621b58ed35fa98df9e0966d: > > [238/417] Linking target plugins/libmm-shared-telit.so > FAILED: plugins/libmm-shared-telit.so > > Building statically could be enabled back through builtin_plugins as > soon as > https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/1c4da332ee6e0d948f85a63f74cb27e89075c011 > lands in a stable release > > Fixes: > - http://autobuild.buildroot.org/results/deb2a752accb021392bb9dc3d06b2b1bf151535c > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Aleksander Morgado): > - Disable building statically instead of disabling all plugins Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:47:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:47:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: set --with-libpcre2 In-Reply-To: <20230220091739.13107-1-fontaine.fabrice@gmail.com> References: <20230220091739.13107-1-fontaine.fabrice@gmail.com> Message-ID: <20230220214718.5880fd4c@windsurf> On Mon, 20 Feb 2023 10:17:39 +0100 Fabrice Fontaine wrote: > Set --with-libpcre2 to avoid the following build failure raised since > bump to version 6.2.7 in > commit 89fa774a191d41ed5d125d87d812ff3478902251: > > configure: using old pcre library by default > checking pkg-config is at least version 0.9.0... yes > configure: error: cannot find pkg-config package for libpcre > > Fixes: > - http://autobuild.buildroot.org/results/701b343b3b0d471c75899b61d02bd9d63a272247 > > Signed-off-by: Fabrice Fontaine > --- > package/zabbix/zabbix.mk | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:47:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:47:09 +0100 Subject: [Buildroot] [git commit] package/zabbix: set --with-libpcre2 Message-ID: <20230220204820.E76CD8644B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d29799914d5df6fb372284d8c3408809e00d0b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set --with-libpcre2 to avoid the following build failure raised since bump to version 6.2.7 in commit 89fa774a191d41ed5d125d87d812ff3478902251: configure: using old pcre library by default checking pkg-config is at least version 0.9.0... yes configure: error: cannot find pkg-config package for libpcre Fixes: - http://autobuild.buildroot.org/results/701b343b3b0d471c75899b61d02bd9d63a272247 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/zabbix/zabbix.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index db9efed78b..0d6c579f4c 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -15,6 +15,7 @@ ZABBIX_AUTORECONF = YES ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ + --with-libpcre2 \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:49:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:49:58 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: <87edqkz1yv.fsf@dell.be.48ers.dk> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-2-thomas.devoogdt@barco.com> <87edqkz1yv.fsf@dell.be.48ers.dk> Message-ID: <20230220214958.19d88af8@windsurf> On Mon, 20 Feb 2023 18:22:16 +0100 Peter Korsgaard wrote: > at-spi2-core depends on xorg7 / xlib-libXtst, so that would mean that we > would pull that in even for libgtk3 builds with the broadway/wayland > backends, is that sensible? > > Maybe it is? Does at-spi2 work under wayland? Please note that we also have a series that removes atk, at-spi2-atk, and bumps at-spi2-core, which now replaces both atk and at-spi2-atk: https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:50:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:50:20 +0100 Subject: [Buildroot] [git commit] package/libjxl: fix build with libjpeg Message-ID: <20230220205040.1212286487@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92c4589b904cfbc4cd633a92729ecd98a50851ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Building with libjpeg will raise the following build failure on some architectures since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57: /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In function 'jxl::Status jxl::extras::{anonymous}::EncodeWithLibJpeg(const jxl::extras::PackedImage&, const JxlBasicInfo&, const std::vector&, std::vector, size_t, const string&, std::vector*)': /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] 126 | jpeg_mem_dest(&cinfo, &buffer, &size); | ^~~~~ | | | long unsigned int* Upstream advocates to use jpeg-turbo: https://github.com/libjxl/libjxl/issues/1802 Fixes: - http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 Signed-off-by: Fabrice Fontaine Reviewed-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libjxl/libjxl.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index cc24ba258c..1257928efd 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -30,4 +30,11 @@ LIBJXL_CONF_OPTS = \ -DJPEGXL_ENABLE_SJPEG=OFF \ -DJPEGXL_ENABLE_SKCMS=OFF +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) +LIBJXL_DEPENDENCIES += jpeg-turbo +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=OFF +else +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=ON +endif + $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:50:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:50:25 +0100 Subject: [Buildroot] [git commit] package/libjxl: disable benchmark and tests Message-ID: <20230220205040.1F02B86489@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13b05a9b00bb1eeacefafe7b2a3537988a53dcea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable benchmark and tests which are enabled by default since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57 Signed-off-by: Fabrice Fontaine Reviewed-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libjxl/libjxl.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 1257928efd..b4dfbecf82 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -23,7 +23,9 @@ endif LIBJXL_CONF_OPTS = \ -DJPEGXL_BUNDLE_LIBPNG=OFF \ -DJPEGXL_BUNDLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_BENCHMARK=OFF \ -DJPEGXL_ENABLE_DOXYGEN=OFF \ + -DJPEGXL_ENABLE_EXAMPLES=OFF \ -DJPEGXL_ENABLE_JNI=OFF \ -DJPEGXL_ENABLE_MANPAGES=OFF \ -DJPEGXL_ENABLE_OPENEXR=OFF \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:50:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:50:31 +0100 Subject: [Buildroot] [git commit] package/libjxl: security bump to version 0.8.1 Message-ID: <20230220205040.2BBF98648A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff7c37e57419aeb2fb63ebc21bad9696aaaba2b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Security: Fix OOB read in exif.h https://github.com/libjxl/libjxl/releases/tag/v0.8.1 https://github.com/libjxl/libjxl/releases/tag/v0.8.0 Signed-off-by: Fabrice Fontaine Tested-by: Julien Olivain Reviewed-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...-segmentation-fault-when-JPEG-is-disabled.patch | 44 ++++++++++++++++++++++ package/libjxl/libjxl.hash | 2 +- package/libjxl/libjxl.mk | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch new file mode 100644 index 0000000000..3d709c956b --- /dev/null +++ b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch @@ -0,0 +1,44 @@ +From 504f35c8204248ae6f97278e8b7c6cc5853a1b94 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 10 Feb 2023 21:31:30 +0100 +Subject: [PATCH] djxl: fix segmentation fault when JPEG is disabled + +When libjxl is compiled without JPEG support, by configuring for example +with: + + cmake -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE ... + +djxl crashes with a segmentation fault at: +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L367 + +The crash can be reproduced with the sequence: + + gm convert IMAGE:LOGO ref.ppm + cjxl ref.ppm enc.jxl + djxl enc.jxl dec.ppm + +The crash happen because opt_jpeg_quality_id does not get +initialized at: +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L107 + +This commit fixes the crash by adding a test on opt_jpeg_quality_id. + +Signed-off-by: Julien Olivain +[Retrieved from: +https://github.com/libjxl/libjxl/pull/2178/commits/504f35c8204248ae6f97278e8b7c6cc5853a1b94] +--- + tools/djxl_main.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/djxl_main.cc b/tools/djxl_main.cc +index b755301fcb..42b889e7ce 100644 +--- a/tools/djxl_main.cc ++++ b/tools/djxl_main.cc +@@ -370,6 +370,7 @@ int main(int argc, const char* argv[]) { + args.color_space = force_colorspace; + } + if (codec == jxl::extras::Codec::kPNM && extension != ".pfm" && ++ args.opt_jpeg_quality_id != -1 && + !cmdline.GetOption(args.opt_jpeg_quality_id)->matched()) { + args.bits_per_sample = 0; + } diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index e71d32e61d..6b4c9d8d0a 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e libjxl-0.7.0.tar.gz +sha256 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 libjxl-0.8.1.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index b4dfbecf82..f603327bf6 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.7.0 +LIBJXL_VERSION = 0.8.1 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:51:11 +0100 Subject: [Buildroot] [PATCH 1/3] package/libjxl: fix build with libjpeg In-Reply-To: <20230219140051.80647-1-fontaine.fabrice@gmail.com> References: <20230219140051.80647-1-fontaine.fabrice@gmail.com> Message-ID: <20230220215111.19dcba5d@windsurf> On Sun, 19 Feb 2023 15:00:49 +0100 Fabrice Fontaine wrote: > Building with libjpeg will raise the following build failure on some > architectures since the addition of the package in commit > e648d399d8bd609697e78f13f7fa76be06d91a57: > > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In function 'jxl::Status jxl::extras::{anonymous}::EncodeWithLibJpeg(const jxl::extras::PackedImage&, const JxlBasicInfo&, const std::vector&, std::vector, size_t, const string&, std::vector*)': > /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] > 126 | jpeg_mem_dest(&cinfo, &buffer, &size); > | ^~~~~ > | | > | long unsigned int* > > Upstream advocates to use jpeg-turbo: > https://github.com/libjxl/libjxl/issues/1802 > > Fixes: > - http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 > > Signed-off-by: Fabrice Fontaine > --- > package/libjxl/libjxl.mk | 7 +++++++ > 1 file changed, 7 insertions(+) To be honest, I find quite ugly the fact that only jpeg-turbo is supported, but it indeed seems like libjpeg and jpeg-turbo are not 100% compatible, unfortunately. So: entire series applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:51:34 +0100 Subject: [Buildroot] [git commit] package/modsecurity2: disable pcre Message-ID: <20230220205145.207EA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06af305874abc1eb4bb98dbd8aabe071fa5d77bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable pcre to avoid the following build failure if pcre-config is found on host raised since bump to version 2.9.7 in commit 42e34cf10f9eb037aa8c48a4fb9e8f521901b983: /home/thomas/autobuild/instance-0/output-1/per-package/modsecurity2/host/bin/../lib/gcc/mips64el-buildroot-linux-gnu/11.3.0/../../../../mips64el-buildroot-linux-gnu/bin/ld: cannot find -lpcre: No such file or directory Fixes: - http://autobuild.buildroot.org/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/modsecurity2/modsecurity2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index c251291e64..88bbf3bb29 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -21,6 +21,7 @@ MODSECURITY2_CONF_OPTS = \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ --without-curl \ --without-lua \ + --without-pcre \ --without-yajl \ --without-ssdeep From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:46 -0000 Subject: [Buildroot] [git commit branch/next] package/numactl: link with -latomic if needed Message-ID: <20230220205145.9B43386491@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a353cf87367fa2df22b8f0e55dee4d48a6f91ea8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since bump to version 2.0.16 in commit e9bc980d93a189a16e7320bd254b906c87ca9f87: /nvmedata/autobuild/instance-7/output-1/per-package/numactl/host/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: ./.libs/libnuma.a(libnuma.o): in function `numa_police_memory': libnuma.c:(.text+0xe28): undefined reference to `__atomic_fetch_and_1' Fixes: - http://autobuild.buildroot.org/results/a92c1c60518d3fe08f3f808f9cc812031e85a4e9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-link-with-latomic-if-needed-again.patch | 41 ++++++++++++++++++++++ package/numactl/numactl.mk | 2 ++ 2 files changed, 43 insertions(+) diff --git a/package/numactl/0001-link-with-latomic-if-needed-again.patch b/package/numactl/0001-link-with-latomic-if-needed-again.patch new file mode 100644 index 0000000000..54d55656ec --- /dev/null +++ b/package/numactl/0001-link-with-latomic-if-needed-again.patch @@ -0,0 +1,41 @@ +From 692abb6d751a41c7f0206771ecd454933750256e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 2 Nov 2022 13:28:02 +0100 +Subject: [PATCH] link with -latomic if needed (again ...) + +numactl unconditionally uses __atomic_fetch_and but some architectures +(e.g. sparc) needs to link with -latomic to be able to use it. So check +if -latomic is needed and update numa.pc accordingly. + +This linking was made by e0de0d9e981ddb53bdeb4a4b9dc43046c9ff4ff9 but +wrongly reverted by 10c277c20768be9a563f75265bcd7e73954763ad resulting +in the following build failure on sparc or microblaze: + +/nvmedata/autobuild/instance-7/output-1/per-package/numactl/host/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: ./.libs/libnuma.a(libnuma.o): in function `numa_police_memory': +libnuma.c:(.text+0xe28): undefined reference to `__atomic_fetch_and_1' + +Fixes: + - http://autobuild.buildroot.org/results/54b7567d804d9abff56f47cd26bae774c1e38669 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/numactl/numactl/pull/144] +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 8510fc5..ebf9917 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,6 +27,8 @@ AM_CONDITIONAL([RISCV64], [test x"${target_cpu}" = x"riscv64"]) + + AC_CONFIG_FILES([Makefile]) + ++AC_SEARCH_LIBS([__atomic_fetch_and_1], [atomic]) ++ + # GCC tries to be "helpful" and only issue a warning for unrecognized + # attributes. So we compile the test with Werror, so that if the + # attribute is not recognized the compilation fails +-- +2.35.1 + diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk index b2f349255f..157f953c51 100644 --- a/package/numactl/numactl.mk +++ b/package/numactl/numactl.mk @@ -10,6 +10,8 @@ NUMACTL_SITE = \ NUMACTL_LICENSE = LGPL-2.1 (libnuma), GPL-2.0 (programs) NUMACTL_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 NUMACTL_INSTALL_STAGING = YES +# We're patching configure.ac +NUMACTL_AUTORECONF = YES NUMACTL_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -fPIC" $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:47 -0000 Subject: [Buildroot] [git commit branch/next] package/makedumpfile: fix mips64 build Message-ID: <20230220205145.8EB768648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5adf96d5bd3a580ab47e74ef8988594435a18a20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following mips64 build failure raised since commit 0b389385666687ecfd09cdbce6c6ecfd74ce11ab: makedumpfile.c: In function 'is_kvaddr': makedumpfile.c:1613:39: error: 'KVBASE' undeclared (first use in this function) return (addr >= (unsigned long long)(KVBASE)); ^~~~~~ Fixes: - http://autobuild.buildroot.org/results/94824fa8baa8edb99a5ca245e5561e0c4e430638 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/makedumpfile/0002-Handle-__mips64.patch | 69 +++++++++++++++++++++++++ 1 file changed, 69 insertions(+) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:47 -0000 Subject: [Buildroot] [git commit branch/next] package/ipmitool: drop ncurses dependency Message-ID: <20230220205145.D8D6686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a95fcbebf5955de48dd7f57dfc27708739968da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next ncurses is not a dependency since bump to version 1.8.19 in commit 8317065ecb4979fe43c466f7e5a7f6dc281bd10d and https://github.com/ipmitool/ipmitool/commit/63dd71c39c9bf522ad3a785dd001737a285458eb Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipmitool/Config.in | 1 - package/ipmitool/ipmitool.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/ipmitool/Config.in b/package/ipmitool/Config.in index f5c79c8403..dbd6483110 100644 --- a/package/ipmitool/Config.in +++ b/package/ipmitool/Config.in @@ -32,7 +32,6 @@ config BR2_PACKAGE_IPMITOOL_IPMIEVD config BR2_PACKAGE_IPMITOOL_IPMISHELL bool "ipmishell" - select BR2_PACKAGE_NCURSES select BR2_PACKAGE_READLINE help IPMI shell interface diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index 06d50bb6b9..0b8befffcd 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -34,7 +34,7 @@ IPMITOOL_CONF_OPTS += --disable-intf-usb endif ifeq ($(BR2_PACKAGE_IPMITOOL_IPMISHELL),y) -IPMITOOL_DEPENDENCIES += ncurses readline +IPMITOOL_DEPENDENCIES += readline IPMITOOL_CONF_OPTS += --enable-ipmishell else IPMITOOL_CONF_OPTS += --disable-ipmishell From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:48 -0000 Subject: [Buildroot] [git commit branch/next] configs/qemu_aarch64_ebbr: bump u-boot and linux versions Message-ID: <20230220205145.B1C5D86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=acae82e8a13ca97c354c94cedd2a59f89fba2ee6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Bump U-Boot version to v2022.10. - Bump Linux kernel version to v6.0.0. Signed-off-by: Vincent Stehl?? Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/qemu_aarch64_ebbr_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index 15822e17a3..a0d8105c43 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -39,7 +39,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.config" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:48 -0000 Subject: [Buildroot] [git commit branch/next] package/libidn2: fix build with libunistring Message-ID: <20230220205145.F228486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9e5b0255d47babf45f1f6e13dccf65bbbc9f84c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with libunistring raised since the addition of the package in commit ffb85a4a16df94e4980057a194e5fdc3c8332e32: /home/autobuild/autobuild/instance-2/output-1/per-package/libidn2/host/bin/../lib/gcc/aarch64-buildroot-linux-gnu/11.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: warning: libunistring.so.2, needed by ../lib/.libs/libidn2.so, not found (try using -rpath or -rpath-link) /home/autobuild/autobuild/instance-2/output-1/per-package/libidn2/host/bin/../lib/gcc/aarch64-buildroot-linux-gnu/11.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: ../lib/.libs/libidn2.so: undefined reference to `u8_strconv_to_encoding' [...] aarch64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib' Fixes: - http://autobuild.buildroot.org/results/30ac50512cd4b4cb3ecc97514a72d1f316a1b33a - http://autobuild.buildroot.org/results/c225ff4ef007b9a3ca56e6b601687aaa33699675 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libidn2/libidn2.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libidn2/libidn2.mk b/package/libidn2/libidn2.mk index 9d72998149..9d24e93d27 100644 --- a/package/libidn2/libidn2.mk +++ b/package/libidn2/libidn2.mk @@ -13,10 +13,12 @@ LIBIDN2_DEPENDENCIES = \ host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) +LIBIDN2_CONF_OPTS = --without-included-libunistring LIBIDN2_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBUNISTRING),y) LIBIDN2_DEPENDENCIES += libunistring +LIBIDN2_CONF_OPTS += --with-libunistring-prefix=$(STAGING_DIR)/usr/lib endif ifeq ($(BR2_PACKAGE_LIBIDN2_BINARY),) From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:49 -0000 Subject: [Buildroot] [git commit branch/next] support/testing/tests/package/test_python_crossbar: use ext2 instead of cpio Message-ID: <20230220205146.1EEFE86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7930708a3b1e429ea605f4544564b29313b0a7b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The CPIO filesystem generated by the test_python_crossbar test is too large, and doesn't fit as an initramfs in the 256MB of RAM available in the versatilepb machine. This causes a "Initramfs unpacking failed: write error" when booting, and many files being missing from the root filesystem, ultimately causing the test to fail. It would make sense to switch all test cases to use ext2 + a hard-drive, but for now, let's fix the few test cases that are causing problems. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3249828587 Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_crossbar.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/package/test_python_crossbar.py b/support/testing/tests/package/test_python_crossbar.py index 83649aeec2..178b16be82 100644 --- a/support/testing/tests/package/test_python_crossbar.py +++ b/support/testing/tests/package/test_python_crossbar.py @@ -1,4 +1,5 @@ from tests.package.test_python import TestPythonPackageBase +import os class TestPythonPy3Crossbar(TestPythonPackageBase): @@ -13,8 +14,16 @@ class TestPythonPy3Crossbar(TestPythonPackageBase): BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CROSSBAR=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="120M" """ sample_scripts = ["tests/package/sample_python_crossbar.py"] timeout = 60 + + def login(self): + ext2_file = os.path.join(self.builddir, "images", "rootfs.ext2") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-drive", "file=%s,if=scsi,format=raw" % ext2_file], + kernel_cmdline=["rootwait", "root=/dev/sda"]) + self.emulator.login() From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:49 -0000 Subject: [Buildroot] [git commit branch/next] package/procps-ng: fix build without __NR_pidfd_open Message-ID: <20230220205145.CBB0586491@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c07caa732b5c4ca5836ee81ce90f57f967dcc721 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure without __NR_pidfd_open raised since bump to version 3.3.17 in commit cc28c7aa6df7798ce5ca79d6d1c7c2eb115ba220 and https://gitlab.com/procps-ng/procps/-/commit/c8384e682c1cfb3b2dc797e0f8a3cbaaccf7a3da: pgrep.c: In function 'pidfd_open': pgrep.c:748:17: error: '__NR_pidfd_open' undeclared (first use in this function); did you mean 'pidfd_open'? 748 | return syscall(__NR_pidfd_open, pid, flags); | ^~~~~~~~~~~~~~~ | pidfd_open Fixes: - http://autobuild.buildroot.org/results/f23a5156e641b2ebdd673973dec0f9c87760c688 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/procps-ng/0003-fix-pifd_open-check.patch | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/package/procps-ng/0003-fix-pifd_open-check.patch b/package/procps-ng/0003-fix-pifd_open-check.patch new file mode 100644 index 0000000000..7152901e70 --- /dev/null +++ b/package/procps-ng/0003-fix-pifd_open-check.patch @@ -0,0 +1,59 @@ +From 0cce3e981540c28d2f703b9ab16c04d0df8fa03d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 3 Nov 2022 18:24:53 +0100 +Subject: [PATCH] fix pifd_open check + +Replace AC_CHECK_FUNC by AC_CHECK_FUNCS otherwise HAVE_PIDFD_OPEN will +never be defined resulting in the following build failure if pidfd_open +is available but __NR_pidfd_open is not available: + +pgrep.c: In function 'pidfd_open': +pgrep.c:748:17: error: '__NR_pidfd_open' undeclared (first use in this function); did you mean 'pidfd_open'? + 748 | return syscall(__NR_pidfd_open, pid, flags); + | ^~~~~~~~~~~~~~~ + | pidfd_open + +This build failure is raised since the addition of pwait in version +3.3.17 and +https://gitlab.com/procps-ng/procps/-/commit/c8384e682c1cfb3b2dc797e0f8a3cbaaccf7a3da + +Fixes: + - http://autobuild.buildroot.org/results/f23a5156e641b2ebdd673973dec0f9c87760c688 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.com/procps-ng/procps/-/merge_requests/166] +--- + configure.ac | 2 +- + src/pgrep.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 629881a6..1a3ccdb8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -160,7 +160,7 @@ AC_TRY_COMPILE([#include ], + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + +-AC_CHECK_FUNC([pidfd_open], [enable_pwait=yes], [ ++AC_CHECK_FUNCS([pidfd_open], [enable_pwait=yes], [ + AC_MSG_CHECKING([for __NR_pidfd_open]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include +diff --git a/pgrep.c b/pgrep.c +index c4ad5da3..29cfedf7 100644 +--- a/pgrep.c ++++ b/pgrep.c +@@ -38,7 +38,7 @@ + #include + #include + +-#if defined(ENABLE_PWAIT) && !defined(HAVE_PIDFD_OPEN) ++#if defined(ENABLE_PWAIT) + #include + #include + #endif +-- +2.35.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:50 -0000 Subject: [Buildroot] [git commit branch/next] package/rpi-userland: fix hello_ applications Message-ID: <20230220205145.A782B86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5044928baeaed86cee6f8452dc3850d5d0cb80a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The HELLO_ examples fail to run because the librevision.so library build by the userland package is not included in the image. Include this library if BR2_PACKAGE_RPI_USERLAND_HELLO is selected. Signed-off-by: Tim Gover Signed-off-by: Thomas Petazzoni --- package/rpi-userland/rpi-userland.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 1204196e19..2800b56296 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -25,6 +25,9 @@ define RPI_USERLAND_EXTRA_LIBS_TARGET $(INSTALL) -m 0644 -D \ $(@D)/build/lib/libilclient.so \ $(TARGET_DIR)/usr/lib/libilclient.so + $(INSTALL) -m 0644 -D \ + $(@D)/build/lib/librevision.so \ + $(TARGET_DIR)/usr/lib/librevision.so endef RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_EXTRA_LIBS_TARGET @@ -32,6 +35,9 @@ define RPI_USERLAND_EXTRA_LIBS_STAGING $(INSTALL) -m 0644 -D \ $(@D)/build/lib/libilclient.so \ $(STAGING_DIR)/usr/lib/libilclient.so + $(INSTALL) -m 0644 -D \ + $(@D)/build/lib/librevision.so \ + $(STAGING_DIR)/usr/lib/librevision.so endef RPI_USERLAND_POST_INSTALL_STAGING_HOOKS += RPI_USERLAND_EXTRA_LIBS_STAGING From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:50 -0000 Subject: [Buildroot] [git commit branch/next] package/rsync: force HAVE_C99_VSNPRINTF to "yes" Message-ID: <20230220205146.41EF486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b17cd017e8b946d718c81f0e38fd570e6a6bc0d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We know the system will have a modern-enough C library that implements the required snprintf() functionality. Since the configure stage can't detect the system's capabilities (because it is cross-compiling), let's hard-code the decision. As a result, rsync won't be linking in its own copy of snprintf(). Signed-off-by: Markus Mayer Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 81ad4b9291..7ff7ca6eef 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -11,6 +11,9 @@ RSYNC_LICENSE_FILES = COPYING RSYNC_CPE_ID_VENDOR = samba RSYNC_SELINUX_MODULES = rsync RSYNC_DEPENDENCIES = zlib popt +# We know that our C library is modern enough for C99 vsnprintf(). Since +# configure can't detect this, we tell configure that vsnprintf() is safe. +RSYNC_CONF_ENV = rsync_cv_HAVE_C99_VSNPRINTF=yes RSYNC_CONF_OPTS = \ --with-included-zlib=no \ --with-included-popt=no \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:50 -0000 Subject: [Buildroot] [git commit branch/next] package/lxc: add systemd optional dependency Message-ID: <20230220205149.48F2A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e71ef565e720e56c51eed6933f6d87331193837f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since bump to version 5.0.1 in commit db19998035701d08bf1b5fd366e0b5aa9adb8e57: Run-time dependency systemd found: NO (tried pkgconfig and cmake) ../output-1/build/lxc-5.0.1/config/init/systemd/meson.build:11:4: ERROR: Dependency "systemd" not found, tried pkgconfig and cmake Fixes: - http://autobuild.buildroot.org/results/495175c367084093bc01c40290736c738d876894 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lxc/lxc.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index f0a0e8041a..e1639c5f15 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -63,4 +63,19 @@ else LXC_CONF_OPTS += -Dopenssl=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +LXC_CONF_OPTS += -Dsd-bus=enabled +LXC_DEPENDENCIES += systemd +else +LXC_CONF_OPTS += -Dsd-bus=disabled +endif + +ifeq ($(BR2_INIT_SYSTEMD),y) +LXC_CONF_OPTS += -Dinit-script=systemd +else ifeq ($(BR2_INIT_SYSV),y) +LXC_CONF_OPTS += -Dinit-script=sysvinit +else +LXC_CONF_OPTS += -Dinit-script= +endif + $(eval $(meson-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:51 -0000 Subject: [Buildroot] [git commit branch/next] package/ipmitool: fix static build with readline Message-ID: <20230220205145.E5D058648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82480ee22bdfae6f7d399975722b5c125749d8c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static build failure with readline raised since bump to version 1.8.19 in commit 8317065ecb4979fe43c466f7e5a7f6dc281bd10d and https://github.com/ipmitool/ipmitool/commit/63dd71c39c9bf522ad3a785dd001737a285458eb: configure:15125: /tmp/instance-0/output-1/host/bin/armeb-buildroot-linux-musleabi-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O0 -g0 -static -Wall -Wextra -std=gnu11 -pedantic -Wformat -Wformat-nonliteral -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lreadline -lcrypto >&5 /tmp/instance-0/output-1/host/lib/gcc/armeb-buildroot-linux-musleabi/11.3.0/../../../../armeb-buildroot-linux-musleabi/bin/ld: /tmp/instance-0/output-1/host/armeb-buildroot-linux-musleabi/sysroot/usr/lib/libreadline.a(display.o): in function `_rl_move_cursor_relative': display.c:(.text+0x80fc): undefined reference to `tputs' Fixes: - http://autobuild.buildroot.org/results/dabc6a4f49d464c129ac6bc3710011678142fcbe Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...01-configure.ac-fix-readline-static-build.patch | 49 ++++++++++++++++++++++ package/ipmitool/ipmitool.mk | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/package/ipmitool/0001-configure.ac-fix-readline-static-build.patch b/package/ipmitool/0001-configure.ac-fix-readline-static-build.patch new file mode 100644 index 0000000000..e3d4349502 --- /dev/null +++ b/package/ipmitool/0001-configure.ac-fix-readline-static-build.patch @@ -0,0 +1,49 @@ +From 9836e2211ba8b3035a1d390bbf6a0eebe4c2439d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 3 Nov 2022 17:19:09 +0100 +Subject: [PATCH] configure.ac: fix readline static build + +Use pkg-config to retrieve readline dependencies such as ncurses to +avoid the following static build when readline is built with ncurses +support (which is raised since version 1.8.19 and +https://github.com/ipmitool/ipmitool/commit/63dd71c39c9bf522ad3a785dd001737a285458eb): + +** Unable to build Solaris 9 x86 IPMI interface support! +checking for library containing readline... no +configure: error: ** Unable to find readline required by ipmishell. + +[...] + +configure:15125: /tmp/instance-0/output-1/host/bin/armeb-buildroot-linux-musleabi-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O0 -g0 -static -Wall -Wextra -std=gnu11 -pedantic -Wformat -Wformat-nonliteral -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lreadline -lcrypto >&5 +/tmp/instance-0/output-1/host/lib/gcc/armeb-buildroot-linux-musleabi/11.3.0/../../../../armeb-buildroot-linux-musleabi/bin/ld: /tmp/instance-0/output-1/host/armeb-buildroot-linux-musleabi/sysroot/usr/lib/libreadline.a(display.o): in function `_rl_move_cursor_relative': +display.c:(.text+0x80fc): undefined reference to `tputs' + +Fixes: + - http://autobuild.buildroot.org/results/dabc6a4f49d464c129ac6bc3710011678142fcbe + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ipmitool/ipmitool/pull/374] +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d6ba62b..4ee1be8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -624,7 +624,11 @@ AC_ARG_ENABLE([ipmishell], + + dnl check for readline library to enable ipmi shell + if test "x$xenable_ipmishell" = "xyes"; then +- AC_SEARCH_LIBS([readline], [readline edit], [have_readline=yes]) ++ PKG_PROG_PKG_CONFIG ++ PKG_CHECK_MODULES([READLINE], [readline], ++ [LIBS="$LIBS $READLINE_LIBS" have_readline=yes], ++ [AC_SEARCH_LIBS([readline], [readline edit], [have_readline=yes])] ++ ) + if test "x$have_readline" != "xyes"; then + AC_MSG_ERROR([** Unable to find readline required by ipmishell.]) + xenable_ipmishell=no +-- +2.35.1 + diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index 0b8befffcd..ebd8f9b337 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -34,7 +34,7 @@ IPMITOOL_CONF_OPTS += --disable-intf-usb endif ifeq ($(BR2_PACKAGE_IPMITOOL_IPMISHELL),y) -IPMITOOL_DEPENDENCIES += readline +IPMITOOL_DEPENDENCIES += host-pkgconf readline IPMITOOL_CONF_OPTS += --enable-ipmishell else IPMITOOL_CONF_OPTS += --disable-ipmishell From yann.morin.1998 at free.fr Mon Feb 20 20:51:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:51 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_r1: remove defconfig Message-ID: <20230220205148.AE26786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60361bfabeaead7b262c6b918a5e3962a9e32f31 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499056 Cc: Davide Viti Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 - board/friendlyarm/nanopi-r1/boot.cmd | 8 - board/friendlyarm/nanopi-r1/genimage.cfg | 37 ----- .../nanopi-r1/kernel/linux-extras.config | 2 - .../nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts | 170 --------------------- board/friendlyarm/nanopi-r1/readme.txt | 29 ---- .../nanopi-r1/uboot/nanopi_r1_defconfig | 22 --- .../nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts | 102 ------------- configs/friendlyarm_nanopi_r1_defconfig | 49 ------ 9 files changed, 421 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0c9f885808..45cf302386 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -721,8 +721,6 @@ N: David Pierret F: package/bat/ N: Davide Viti -F: board/friendlyarm/nanopi-r1/ -F: configs/friendlyarm_nanopi_r1_defconfig F: package/flann/ F: package/python-paho-mqtt/ F: package/qhull/ diff --git a/board/friendlyarm/nanopi-r1/boot.cmd b/board/friendlyarm/nanopi-r1/boot.cmd deleted file mode 100644 index 9f0cdbfe51..0000000000 --- a/board/friendlyarm/nanopi-r1/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-nanopi-r1.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-r1/genimage.cfg b/board/friendlyarm/nanopi-r1/genimage.cfg deleted file mode 100644 index a180311cae..0000000000 --- a/board/friendlyarm/nanopi-r1/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the NanoPi M1 -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-r1.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/board/friendlyarm/nanopi-r1/kernel/linux-extras.config b/board/friendlyarm/nanopi-r1/kernel/linux-extras.config deleted file mode 100644 index 206b3810a7..0000000000 --- a/board/friendlyarm/nanopi-r1/kernel/linux-extras.config +++ /dev/null @@ -1,2 +0,0 @@ -# USB ethernet -CONFIG_USB_RTL8152=y diff --git a/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts b/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts deleted file mode 100644 index ca15a57bee..0000000000 --- a/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright (C) 2019 Igor Pecovnik - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file 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 2 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 General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "sun8i-h3-nanopi.dtsi" - -/ { - model = "FriendlyElec NanoPi-R1"; - compatible = "friendlyarm,nanopi-r1", "allwinner,sun8i-h3"; - - aliases { - serial1 = &uart3; - ethernet0 = &emac; - ethernet1 = &emac; - ethernet2 = &sdio_wifi; - }; - - wifi_pwrseq: wifi_pwrseq { - compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; - reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ - }; - - reg_gmac_3v3: gmac-3v3 { - compatible = "regulator-fixed"; - regulator-name = "gmac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <100000>; - enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; - }; - - leds { - /delete-node/ status; - /delete-node/ pwr; - led1 { - label = "LED1"; - gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; - }; - - led2 { - label = "LED2"; - gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; - default-state = "off"; - linux,default-trigger = "netdev"; - }; - - led3 { - label = "LED3"; - gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>; - default-state = "off"; - linux,default-trigger = "netdev"; - }; - }; - - r_gpio_keys { - compatible = "gpio-keys"; - input-name = "k1"; - pinctrl-names = "default"; - pinctrl-0 = <&sw_r_npi>; - - /delete-node/ k1; - reset { - label = "reset"; - linux,code = ; - gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; - }; - }; -}; - -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; - phy-handle = <&ext_rgmii_phy>; - phy-mode = "rgmii"; - - status = "okay"; -}; - -&external_mdio { - ext_rgmii_phy: ethernet-phy at 1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <7>; - }; -}; - -&mmc1 { - vmmc-supply = <®_vcc3v3>; - vqmmc-supply = <®_vcc3v3>; - mmc-pwrseq = <&wifi_pwrseq>; - bus-width = <4>; - non-removable; - status = "okay"; - - sdio_wifi: sdio_wifi at 1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; - interrupt-parent = <&pio>; - interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */ - interrupt-names = "host-wake"; - }; -}; - -&mmc2 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc2_8bit_pins>; - vmmc-supply = <®_vcc3v3>; - vqmmc-supply = <®_vcc3v3>; - bus-width = <8>; - non-removable; - status = "okay"; -}; - -&ohci0 { - status = "okay"; -}; - -&ohci1 { - status = "okay"; -}; - -&usb_otg { - dr_mode = "peripheral"; - status = "okay"; -}; - -&usbphy { - status = "okay"; -}; diff --git a/board/friendlyarm/nanopi-r1/readme.txt b/board/friendlyarm/nanopi-r1/readme.txt deleted file mode 100644 index fa3114fc83..0000000000 --- a/board/friendlyarm/nanopi-r1/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -NanoPi R1 - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the NanoPi R1. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make friendlyarm_nanopi_r1_defconfig - -Compile everything and build the SD card image: - - $ make - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig b/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig deleted file mode 100644 index e028b41a46..0000000000 --- a/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig +++ /dev/null @@ -1,22 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_SUNXI=y -CONFIG_SPL=y -CONFIG_MACH_SUN8I_H3=y -CONFIG_DRAM_CLK=408 -CONFIG_DRAM_ZQ=3881979 -CONFIG_DRAM_ODT_EN=y -CONFIG_MACPWR="PD6" -# CONFIG_VIDEO_DE2 is not set -CONFIG_NR_DRAM_BANKS=1 -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y -CONFIG_SYS_CLK_FREQ=480000000 -# CONFIG_CMD_FLASH is not set -# CONFIG_SPL_DOS_PARTITION is not set -# CONFIG_SPL_EFI_PARTITION is not set -CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-r1" -CONFIG_SUN8I_EMAC=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_OHCI_HCD=y -CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y -CONFIG_MMC_SUNXI_SLOT_EXTRA=2 diff --git a/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts b/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts deleted file mode 100644 index 9c3c574e0f..0000000000 --- a/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2019 Igor Pecovnik - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file 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 2 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 General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "sun8i-h3-nanopi.dtsi" - -/ { - model = "FriendlyARM NanoPi R1"; - compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3"; - - reg_gmac_3v3: gmac-3v3 { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - regulator-name = "gmac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <100000>; - enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; - }; - -}; - -&ehci0 { - status = "okay"; -}; - -&pio { - gmac_power_pin_nanopi: gmac_power_pin at 0 { - pins = "PD6"; - function = "gpio_out"; - }; -}; - -&ohci0 { - status = "okay"; -}; - -&mmc2 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc2_8bit_pins>; - vmmc-supply = <®_vcc3v3>; - bus-width = <8>; - non-removable; - cap-mmc-hw-reset; - status = "okay"; -}; - -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; - phy-handle = <&ext_rgmii_phy>; - phy-mode = "rgmii"; - - status = "okay"; -}; - -&external_mdio { - ext_rgmii_phy: ethernet-phy at 1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <7>; - }; -}; diff --git a/configs/friendlyarm_nanopi_r1_defconfig b/configs/friendlyarm_nanopi_r1_defconfig deleted file mode 100644 index 8b03f6dd00..0000000000 --- a/configs/friendlyarm_nanopi_r1_defconfig +++ /dev/null @@ -1,49 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="nanopi-r1" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi R1" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts" -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_TARGET_UBOOT_USE_CUSTOM_CONFIG=y -BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-r1/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-r1/kernel/linux-extras.config" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts" -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-r1" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r1/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From yann.morin.1998 at free.fr Mon Feb 20 20:51:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:51 -0000 Subject: [Buildroot] [git commit branch/next] package/gawk: renumber remaining patch Message-ID: <20230220205146.4DD6186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4721367debff67d2a4fddb3a5d72796ebbb401f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit aaba432e2cae (package/gawk: drop incorrect patch) was sent on the list before e6942ad11ff0 (package/gawk: fix double free during kernel build) was applied. But when aaba432e2cae was eventually applied, the remaining patch was not renumbered. Fix that now. Signed-off-by: Yann E. MORIN --- ...g-with-Node_elem_new.patch => 0001-Fix-a-bug-with-Node_elem_new.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package/gawk/0002-Fix-a-bug-with-Node_elem_new.patch b/package/gawk/0001-Fix-a-bug-with-Node_elem_new.patch similarity index 100% rename from package/gawk/0002-Fix-a-bug-with-Node_elem_new.patch rename to package/gawk/0001-Fix-a-bug-with-Node_elem_new.patch From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:52 -0000 Subject: [Buildroot] [git commit branch/next] package/multipath-tools: security bump to version 0.9.3 Message-ID: <20230220205146.0AB7E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a7a5641597c5c3d0978906fb8cf93eb153425a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: - CVE-2022-41974: Authorization bypass - CVE-2022-41973: Symlink attack For more details, see the writeup: https://www.qualys.com/2022/10/24/leeloo-multipath/leeloo-multipath.txt Update README.md hash after license-unrelated changes: git shortlog 0.9.0..0.9.3 -- README.md Konstantin Kharlamov (1): README.md: mention libreadline and libedit optional deps Xose Vazquez Perez (4): multipath-tools: update devel repo info in README.md multipath-tools: add ALUA info to README.md multipath-tools: add basic info on how to use multipath-tools with NVMe devices multipath-tools: add more info for NetApp RDAC arrays Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/multipath-tools/multipath-tools.hash | 4 ++-- package/multipath-tools/multipath-tools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index df0d24fb74..6f893d37ce 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,7 +1,7 @@ # Locally computed: -sha256 d6d1d819a53d076a91828ede42d9786451a471c4b71ca3fd25d04ad5413e3f95 multipath-tools-0.9.0.tar.gz +sha256 7d5af5d86e43b757e253d1ba244aa8a9c09bfbb1677a72accb799b1bfcc0a9ac multipath-tools-0.9.3.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1 -sha256 fb0a5d2008c609fec129d2ffd01dd7f65f0e3868bcf465b6fda76e25ff896ce9 README.md +sha256 1e6095ac219062b8ddb2416d2a3cc40560619cd6b3ba609f5602bbd320413be0 README.md diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index f3ce3ca8b8..ec5d853644 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.9.0 +MULTIPATH_TOOLS_VERSION = 0.9.3 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:52 -0000 Subject: [Buildroot] [git commit branch/next] configs/kontron_bl_imx8mm: U-Boot needs util-linux Message-ID: <20230220205149.B5D9A86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=223516b51e1a45fa86dc1ac959aed93c7434afa4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: /usr/bin/ld: cannot find -lgnutls /usr/bin/ld: cannot find -luuid collect2: error: ld returned 1 exit status when building U-Boot. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3301821264 Signed-off-by: Thomas Petazzoni --- configs/kontron_bl_imx8mm_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig index ff376662e9..13ed1a2078 100644 --- a/configs/kontron_bl_imx8mm_defconfig +++ b/configs/kontron_bl_imx8mm_defconfig @@ -48,6 +48,7 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" BR2_TARGET_UBOOT_SPL=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:52 -0000 Subject: [Buildroot] [git commit branch/next] package/botan: add host-python3 dependency Message-ID: <20230220205146.AC99C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ad4301f608a270b6f463ebd91684cde0f584ebd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next add host-python3 dependency to avoid the following build failure raised since the addition of the package in commit e43da7bb32285bbd41b38a379aef77132d149df7: (cd /home/autobuild/autobuild/instance-19/output-1/build/botan-2.19.2; PATH="/home/autobuild/autobuild/instance-19/output-1/host/bin:/home/autobuild/autobuild/instance-19/output-1/host/sbin:/home/autobuild/make:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ./configure.py --cpu="m68k" --disable-cc-tests --os=linux --cc=gcc --cc-bin="/home/autobuild/autobuild/instance-19/output-1/host/bin/m68k-linux-g++" --prefix=/usr --without-documentation --extra-libs=atomic --disable-shared-library --enable-static-library --no-autoload --without-stack-protector --without-os-feature=getauxval --with-boost --with-sqlite --with-zlib --disable-altivec --disable-neon) /usr/bin/env: 'python': No such file or directory Fixes: - http://autobuild.buildroot.org/results/91eb6d03ee899bc1034efc5ac7d1fe78961d37ca Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/botan/botan.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/botan/botan.mk b/package/botan/botan.mk index b26ee4c66e..b0ebe594b1 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -13,6 +13,7 @@ BOTAN_CPE_ID_VENDOR = botan_project BOTAN_INSTALL_STAGING = YES +BOTAN_DEPENDENCIES = host-python3 BOTAN_CONF_OPTS = \ --cpu=$(BR2_ARCH) \ --disable-cc-tests \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:53 -0000 Subject: [Buildroot] [git commit branch/next] support/testing/tests/package/test_python_flask*: increase time after server startup Message-ID: <20230220205146.14D6186491@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3884cfc0571abc19b35b2f161f6c8c009847a0bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next It seems like on Gitlab CI, the runners are quite slow, and the Flask server does not startup in the 15 seconds we give it. So increase this to 30 seconds before trying to contact the Flask server. Hopefully fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3249828594 Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_flask.py | 2 +- support/testing/tests/package/test_python_flask_expects_json.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/package/test_python_flask.py b/support/testing/tests/package/test_python_flask.py index ef5d96bae9..9d8587e918 100644 --- a/support/testing/tests/package/test_python_flask.py +++ b/support/testing/tests/package/test_python_flask.py @@ -21,7 +21,7 @@ class TestPythonPy3Flask(TestPythonPackageBase): _, exit_code = self.emulator.run(cmd, timeout=self.timeout) # Give enough time for the flask server to start up - time.sleep(15) + time.sleep(30) cmd = "wget -q -O - http://127.0.0.1:5000/" output, exit_code = self.emulator.run(cmd, timeout=self.timeout) diff --git a/support/testing/tests/package/test_python_flask_expects_json.py b/support/testing/tests/package/test_python_flask_expects_json.py index 5576cba2b4..91b8bf21b7 100644 --- a/support/testing/tests/package/test_python_flask_expects_json.py +++ b/support/testing/tests/package/test_python_flask_expects_json.py @@ -31,7 +31,7 @@ class TestPythonPy3FlaskExpectsJson(TestPythonPackageBase): _, exit_code = self.emulator.run(cmd, timeout=self.timeout) # Give enough time for the flask server to start up - time.sleep(15) + time.sleep(30) self.try_json("""{"email": "test", "name": "test"}""", 200) self.try_json("""{"email": "test", "name": 2}""", 400) From yann.morin.1998 at free.fr Mon Feb 20 20:51:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:53 -0000 Subject: [Buildroot] [git commit branch/next] packages/sudo: explicitly set with-tzdir Message-ID: <20230220205150.1B5A086496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51d3902af72d74cf5bf7c1246e4bf41cfc5e55f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next sudo's configure script looks up on the host to determine the path to the timezone data location. That fails in cross-compilation. This is used to sanitise the TZ envirnment variable at runtime, and is not used at buildtime (except to be stored as a string in the program). We can tell sudo where the tz data will be, which we do when the tzdata package is enabled, and we can tell it not to use it at all (to not pass TZ down to sudo-ed executions) othwerwise. Signed-off-by: Nuno Gon??alves [yann.morin.1998 at free.fr: rewrite and extend commit log] Signed-off-by: Yann E. MORIN --- package/sudo/sudo.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 1826f72017..28cfcbb1e2 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -16,6 +16,7 @@ SUDO_SELINUX_MODULES = sudo # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \ + --with-tzdir=$(if $(BR2_PACKAGE_TZDATA),/usr/share/zoneinfo,no) \ --without-lecture \ --without-sendmail \ --without-umask \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:54 -0000 Subject: [Buildroot] [git commit branch/next] package/gsl: fix powerpc build Message-ID: <20230220205147.0E98F86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94e47000c27c447de45e7190fbe8d3ef24d7df04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following powerpc build failures on: - musl raised because fpu_control.h is not available: In file included from fp.c:8: fp-gnuppc.c:21:10: fatal error: fpu_control.h: No such file or directory 21 | #include | ^~~~~~~~~~~~~~~ - glibc raised because _FPU_RC_NEAREST is undefined if _SOFT_FLOAT is set: In file included from fp.c:8: fp-gnuppc.c: In function 'gsl_ieee_set_mode': fp-gnuppc.c:53:15: error: '_FPU_RC_NEAREST' undeclared (first use in this function) 53 | mode |= _FPU_RC_NEAREST ; | ^~~~~~~~~~~~~~~ These build failures are raised since the addition of the package in commit 9d9f7feba4ffbfeb54479f1ad90d47acca1a6f0b Fixes: - http://autobuild.buildroot.org/results/d73e116c81bf16d2e55fced215d6bd3b382fef10 - http://autobuild.buildroot.org/results/48403946bb4cda9013e51db59c1b2ffdcf4e2854 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-configure.ac-fix-build-on-powerpc.patch | 53 ++++++++++++++++++++++ package/gsl/gsl.mk | 2 + 2 files changed, 55 insertions(+) diff --git a/package/gsl/0001-configure.ac-fix-build-on-powerpc.patch b/package/gsl/0001-configure.ac-fix-build-on-powerpc.patch new file mode 100644 index 0000000000..13f6da4588 --- /dev/null +++ b/package/gsl/0001-configure.ac-fix-build-on-powerpc.patch @@ -0,0 +1,53 @@ +From 84e62d57b90b41a0c96bb9fb6ec61ecaac76a1ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 5 Nov 2022 21:31:36 +0100 +Subject: [PATCH] configure.ac: fix build on powerpc + +Fix the following powerpc build failures on: + - musl raised because fpu_control.h is not available: + +In file included from fp.c:8: +fp-gnuppc.c:21:10: fatal error: fpu_control.h: No such file or directory + 21 | #include + | ^~~~~~~~~~~~~~~ + + - glibc raised because _FPU_RC_NEAREST is undefined if _SOFT_FLOAT is + set: + + In file included from fp.c:8: +fp-gnuppc.c: In function 'gsl_ieee_set_mode': +fp-gnuppc.c:53:15: error: '_FPU_RC_NEAREST' undeclared (first use in this function) + 53 | mode |= _FPU_RC_NEAREST ; + | ^~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/d73e116c81bf16d2e55fced215d6bd3b382fef10 + - http://autobuild.buildroot.org/results/48403946bb4cda9013e51db59c1b2ffdcf4e2854 + +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/configure.ac b/configure.ac +index bfd9ca30..1ee6dca0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -389,6 +389,14 @@ if test "$ac_cv_c_ieee_interface" = "gnux86" ; then + fi + fi + ++if test "$ac_cv_c_ieee_interface" = "gnuppc" ; then ++ AC_CACHE_CHECK([for _FPU_RC_NEAREST], ac_cv_c__fpu_rc_nearest, ++ [ac_cv_c__fpu_rc_nearest=no ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ++]], [[ unsigned short mode = _FPU_RC_NEAREST ; ]])],[ac_cv_c__fpu_rc_nearest="yes"],[ac_cv_c_ieee_interface=unknown]) ++ ]) ++fi ++ + ac_tr_ieee_interface=HAVE_`echo $ac_cv_c_ieee_interface | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_IEEE_INTERFACE + AC_DEFINE_UNQUOTED($ac_tr_ieee_interface,1,[IEEE Interface Type]) + +-- +2.35.1 + diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk index 416955b72c..3604f9836c 100644 --- a/package/gsl/gsl.mk +++ b/package/gsl/gsl.mk @@ -10,6 +10,8 @@ GSL_INSTALL_STAGING = YES GSL_LICENSE = GPL-3.0 GSL_LICENSE_FILES = COPYING GSL_CONFIG_SCRIPTS = gsl-config +# We're patching configure.ac +GSL_AUTORECONF = YES # uClibc pretends to have fenv support as it installs , but in # practice, it only implements it for i386. Problem reported upstream From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:54 -0000 Subject: [Buildroot] [git commit branch/next] support/testing/tests/package/test_gdb.py: drop version-specific tests Message-ID: <20230220205146.294CF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9dd9ee857ec59e35552efe46a173eebc50659d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Back when support/testing/tests/package/test_gdb was introduced, there was a significant difference in how gdb < 10 and gdb >= 10 were handled in gdb.mk, which explained why we were testing both gdb 9.x and gdb 11.x. However, support for gdb 9.x has now been dropped, and we only support gdb >= 10.x, so testing gdb 9.x and 11.x separately no longer make much sense. In addition: - other GDB tests in the same file already test the default version, which is now 11.x, meaning we in fact have duplicated tests between the ones testing the default version and the ones testing 11.x specifically - GDB 9.x has been removed, which means all the tests testing GDB 9.x are failing, with a Config.in.legacy build error. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3249828456 (TestGdbHostOnly9x) https://gitlab.com/buildroot.org/buildroot/-/jobs/3249828454 (TestGdbHostGdbserver9x) https://gitlab.com/buildroot.org/buildroot/-/jobs/3249828451 (TestGdbHostGdbTarget9x) Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_gdb.py | 108 ------------------------------ 1 file changed, 108 deletions(-) diff --git a/support/testing/tests/package/test_gdb.py b/support/testing/tests/package/test_gdb.py index a7b0870644..4712162349 100644 --- a/support/testing/tests/package/test_gdb.py +++ b/support/testing/tests/package/test_gdb.py @@ -91,114 +91,6 @@ class TestGdbFullTarget(BaseGdb): self.verify_gdb() -class TestGdbHostOnly9x(BaseGdb): - config = \ - infra.basetest.MINIMAL_CONFIG + \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_9_2=y - """ - - def test_run(self): - self.verify_host_gdb() - - -class TestGdbHostGdbserver9x(BaseGdb): - config = \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_9_2=y - BR2_PACKAGE_GDB=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - - def test_run(self): - self.verify_host_gdb() - self.boot() - self.verify_gdbserver() - - -class TestGdbHostGdbTarget9x(BaseGdb): - config = \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_9_2=y - BR2_PACKAGE_GDB=y - BR2_PACKAGE_GDB_DEBUGGER=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - - def test_run(self): - self.verify_host_gdb() - self.boot() - self.verify_gdb() - - -class TestGdbHostOnly11x(BaseGdb): - config = \ - infra.basetest.MINIMAL_CONFIG + \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_11=y - """ - - def test_run(self): - self.verify_host_gdb() - - -class TestGdbHostGdbserver11x(BaseGdb): - config = \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_11=y - BR2_PACKAGE_GDB=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - - def test_run(self): - self.verify_host_gdb() - self.boot() - self.verify_gdbserver() - - -class TestGdbHostGdbTarget11x(BaseGdb): - config = \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_11=y - BR2_PACKAGE_GDB=y - BR2_PACKAGE_GDB_DEBUGGER=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - - def test_run(self): - self.verify_host_gdb() - self.boot() - self.verify_gdb() - - class TestGdbArc(BaseGdb): config = \ """ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:54 -0000 Subject: [Buildroot] [git commit branch/next] package/libvncserver: fix CVE-2020-29260 Message-ID: <20230220205150.DA7DE86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3ab978703e0597b4bdf17d3e32cf0357db8315c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libvncclient v0.9.13 was discovered to contain a memory leak via the function rfbClientCleanup(). Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...nt-free-vncRec-memory-in-rfbClientCleanup.patch | 28 ++++++++++++++++++++++ package/libvncserver/libvncserver.mk | 3 +++ 2 files changed, 31 insertions(+) diff --git a/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch b/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch new file mode 100644 index 0000000000..7658c112f3 --- /dev/null +++ b/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch @@ -0,0 +1,28 @@ +From bef41f6ec4097a8ee094f90a1b34a708fbd757ec Mon Sep 17 00:00:00 2001 +From: Christian Beier +Date: Sat, 21 Nov 2020 12:52:31 +0100 +Subject: [PATCH] libvncclient: free vncRec memory in rfbClientCleanup() + +Otherwise we leak memory. Spotted by Ramin Farajpour Cami +, thanks! + +[Retrieved from: +https://github.com/LibVNC/libvncserver/commit/bef41f6ec4097a8ee094f90a1b34a708fbd757ec] +Signed-off-by: Fabrice Fontaine +--- + libvncclient/vncviewer.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c +index d6b91f02b..0a1bdcf6a 100644 +--- a/libvncclient/vncviewer.c ++++ b/libvncclient/vncviewer.c +@@ -534,6 +534,8 @@ void rfbClientCleanup(rfbClient* client) { + client->clientData = next; + } + ++ free(client->vncRec); ++ + if (client->sock != RFB_INVALID_SOCKET) + rfbCloseSocket(client->sock); + if (client->listenSock != RFB_INVALID_SOCKET) diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk index ead809d19c..8f24e2d098 100644 --- a/package/libvncserver/libvncserver.mk +++ b/package/libvncserver/libvncserver.mk @@ -14,6 +14,9 @@ LIBVNCSERVER_INSTALL_STAGING = YES LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON +# 0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch +LIBVNCSERVER_IGNORE_CVES += CVE-2020-29260 + # only used for examples LIBVNCSERVER_CONF_OPTS += \ -DWITH_FFMPEG=OFF \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:53 -0000 Subject: [Buildroot] [git commit branch/next] package/pixman: security bump version to 0.42.2 Message-ID: <20230220205145.BEFA08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ceeb39303267400d6335e3c687ce1f73d9e6dcc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-October/003228.html https://lists.x.org/archives/xorg-announce/2022-November/003249.html Fixes CVE-2022-44638: https://lists.x.org/archives/xorg-announce/2022-November/003251.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/pixman/pixman.hash | 6 +++--- package/pixman/pixman.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pixman/pixman.hash b/package/pixman/pixman.hash index 1af632a9f4..78407bf048 100644 --- a/package/pixman/pixman.hash +++ b/package/pixman/pixman.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2020-April/003043.html -sha256 da8ed9fe2d1c5ef8ce5d1207992db959226bd4e37e3f88acf908fd9a71e2704e pixman-0.40.0.tar.xz -sha512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270 pixman-0.40.0.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-October/003228.html +sha256 5747d2ec498ad0f1594878cc897ef5eb6c29e91c53b899f7f71b506785fc1376 pixman-0.42.2.tar.xz +sha512 3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8 pixman-0.42.2.tar.xz # Locally computed sha256 fac9270f0987b96ff4533fca3548c633e02083cbba4a0172a3b149b2e4019793 COPYING diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 3f65f0484d..6e6d787d27 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIXMAN_VERSION = 0.40.0 +PIXMAN_VERSION = 0.42.2 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.xz PIXMAN_SITE = https://xorg.freedesktop.org/releases/individual/lib PIXMAN_LICENSE = MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:55 -0000 Subject: [Buildroot] [git commit branch/next] package/gawk: drop incorrect patch Message-ID: <20230220205146.35A0A86491@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aaba432e2cae6ccff2bc6fa30c3ec0cc3c0f3c71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 8cd06967b9be (gawk: bump version and migrate to autotargets) added a patch that purportedly reduced the installation size by not installing the versioned program (gawk-X.Y). However, the versioned program is a hard-link to the unversioned one, so, save for a directory entry, it does not take extra space in the final image. Drop that patch. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/gawk/0001-no-versioned.patch | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/package/gawk/0001-no-versioned.patch b/package/gawk/0001-no-versioned.patch deleted file mode 100644 index c5bbdddeb5..0000000000 --- a/package/gawk/0001-no-versioned.patch +++ /dev/null @@ -1,16 +0,0 @@ -Disabled versioned installation of binaries to save space. - -Signed-off-by: Gustavo Zacarias -[Gustavo: update for 4.1.2] - -diff -Nura gawk-4.1.2.orig/Makefile.in gawk-4.1.2/Makefile.in ---- gawk-4.1.2.orig/Makefile.in 2015-04-29 16:11:09.367925925 -0300 -+++ gawk-4.1.2/Makefile.in 2015-04-29 16:11:25.308466495 -0300 -@@ -1173,6 +1173,7 @@ - # (This is done universally, which may not always be right, but - # there's no easy way to distinguish GNU from non-GNU systems.) - install-exec-hook: -+foo: - (cd $(DESTDIR)$(bindir); \ - $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ - if [ ! -f awk$(EXEEXT) ]; \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:55 -0000 Subject: [Buildroot] [git commit branch/next] Revert "package/ninja: bump to version 1.11.1.g95dee.kitware.jobserver-1" Message-ID: <20230220205147.7A0B086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19bd315208ccdd01d7b8147d43d05799f3deaa1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit 8e2d08c583228e48c622e0adc2ba577cded40ad2. It was meant to be applied to next, not master. Signed-off-by: Thomas Petazzoni --- package/ninja/ninja.hash | 2 +- package/ninja/ninja.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ninja/ninja.hash b/package/ninja/ninja.hash index 57c10bb287..ecde199844 100644 --- a/package/ninja/ninja.hash +++ b/package/ninja/ninja.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 7ba84551f5b315b4270dc7c51adef5dff83a2154a3665a6c9744245c122dd0db ninja-1.11.1.g95dee.kitware.jobserver-1.tar.gz +sha256 549c31ee596566b952c600e23eb9b8d39a4112cd5fdeb2e5a83370669176da40 ninja-1.10.2.g51db2.kitware.jobserver-1.tar.gz sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index b7bc1a4f1c..bc84046414 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -4,8 +4,8 @@ # ################################################################################ -NINJA_VERSION_MAJOR = 1.11.1 -NINJA_VERSION = $(NINJA_VERSION_MAJOR).g95dee.kitware.jobserver-1 +NINJA_VERSION_MAJOR = 1.10.2 +NINJA_VERSION = $(NINJA_VERSION_MAJOR).g51db2.kitware.jobserver-1 NINJA_SITE = $(call github,Kitware,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 20:51:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:51:55 -0000 Subject: [Buildroot] [git commit branch/next] boot/uboot/uboot.mk: fix zynqmp without pmufw Message-ID: <20230220205152.B50EA86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13dc57c94f9f394441b6faeb864aefd2b8ed08ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit d07e6b70 (boot/uboot/uboot.mk: add pmufw.elf support) broke configurations where the UBOOT_ZYNQMP_PMUFW was blank. Previously it would set the U-Boot CONFIG_PMUFW_INIT_FILE to the blank string, but now it will set it to ".bin" which causes U-Boot to fail to build. Signed-off-by: Brandon Maier Reviewed-by: Luca Ceresoli Signed-off-by: Brandon Maier Reviewed-by: Neal Frager Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 0439ec5e4b..9e073daa38 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -395,8 +395,9 @@ UBOOT_ZYNQMP_PMUFW_BASENAME = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH)) define UBOOT_ZYNQMP_KCONFIG_PMUFW $(if $(filter %.elf,$(UBOOT_ZYNQMP_PMUFW_PATH)), - objcopy -O binary -I elf32-little $(UBOOT_ZYNQMP_PMUFW_BASENAME).elf $(UBOOT_ZYNQMP_PMUFW_BASENAME).bin) - $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_BASENAME).bin") + objcopy -O binary -I elf32-little $(UBOOT_ZYNQMP_PMUFW_BASENAME).elf $(UBOOT_ZYNQMP_PMUFW_BASENAME).bin + $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_BASENAME).bin"), + $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)")) endef UBOOT_ZYNQMP_PM_CFG = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PM_CFG)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:56 -0000 Subject: [Buildroot] [git commit branch/next] package/freeipmi: fix build without makeinfo Message-ID: <20230220205147.615018648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbf3253d76399f2b310120e87c29569dd65749cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable documentation to avoid the following build failure without makeinfo raised at least since bump to version 1.6.10 in commit f0faa3b71c585cb70bcd6fa4bafb756b98130bd5 (and probably since the addition of the package in commit 663f39c88c01593855c18355a4decdceeffd884b): /home/buildroot/autobuild/instance-0/output-1/build/freeipmi-1.6.10/config/missing: line 81: makeinfo: command not found WARNING: 'makeinfo' is missing on your system. You should only need it if you modified a '.texi' file, or any other file indirectly affecting the aspect of the manual. You might want to install the Texinfo package: The spurious makeinfo call might also be the consequence of using a buggy 'make' (AIX, DU, IRIX), in which case you might want to install GNU make: Makefile:442: recipe for target 'freeipmi-faq.info' failed Fixes: - http://autobuild.buildroot.org/results/ac6ff1c746a354f885fc1674d10e7bff9e536134 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/freeipmi/0001-add-disable-doc.patch | 72 +++++++++++++++++++++++++++++ package/freeipmi/freeipmi.mk | 2 + 2 files changed, 74 insertions(+) diff --git a/package/freeipmi/0001-add-disable-doc.patch b/package/freeipmi/0001-add-disable-doc.patch new file mode 100644 index 0000000000..e410d2b52f --- /dev/null +++ b/package/freeipmi/0001-add-disable-doc.patch @@ -0,0 +1,72 @@ +From 5324c88632c021a87251370b03067d857e9a9892 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 2 Nov 2022 19:02:42 +0100 +Subject: [PATCH] add --disable-doc + +Allow the user to disable documentation through --disable-doc to avoid +the following build failure without makeinfo: + +/home/buildroot/autobuild/instance-0/output-1/build/freeipmi-1.6.10/config/missing: line 81: makeinfo: command not found +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +Makefile:442: recipe for target 'freeipmi-faq.info' failed + +Fixes: + - http://autobuild.buildroot.org/results/ac6ff1c746a354f885fc1674d10e7bff9e536134 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/61] +--- + Makefile.am | 6 +++++- + configure.ac | 4 ++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index cf757f634..d74952e30 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,6 @@ + ACLOCAL_AMFLAGS = -I config + + SUBDIRS = \ +- doc \ + etc \ + common \ + libfreeipmi \ +@@ -33,6 +32,11 @@ SUBDIRS = \ + rmcpping \ + contrib + ++if ENABLE_DOC ++SUBDIRS += \ ++ doc ++endif ++ + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ + +diff --git a/configure.ac b/configure.ac +index 54fdf6367..7a94b958b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -341,6 +341,10 @@ else + fi + AC_SUBST(WITH_DEBUG) + ++AC_ARG_ENABLE(doc, ++ AC_HELP_STRING([--disable-doc], [turn off documentation])) ++AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no") ++ + dnl Allow advanced developers to compile with raw dumping + AC_ARG_ENABLE(rawdumps, + AC_HELP_STRING([--enable-rawdumps], [output raw packet dumps when debugging])) +-- +2.35.1 + diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk index 916f2eb68a..3e0ac0ffa9 100644 --- a/package/freeipmi/freeipmi.mk +++ b/package/freeipmi/freeipmi.mk @@ -12,6 +12,8 @@ FREEIPMI_LICENSE_FILES = \ COPYING.ipmidetect COPYING.ipmi-fru COPYING.ipmimonitoring \ COPYING.ipmiping COPYING.ipmipower COPYING.ipmiseld COPYING.pstdout \ COPYING.sunbmc COPYING.ZRESEARCH +# We're patching configure.ac +FREEIPMI_AUTORECONF = YES FREEIPMI_DEPENDENCIES = host-pkgconf FREEIPMI_INSTALL_STAGING = YES # Disable checking for /dev/urandom and /dev/random through AC_CHECK_FILE From yann.morin.1998 at free.fr Mon Feb 20 20:51:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:56 -0000 Subject: [Buildroot] [git commit branch/next] package/sudo: fix CVE-2022-43995 Message-ID: <20230220205146.5A1558648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26634490364decc24fa32f175c12c8a2d984f1d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Sudo 1.8.0 through 1.9.12, with the crypt() password backend, contains a plugins/sudoers/auth/passwd.c array-out-of-bounds error that can result in a heap-based buffer over-read. This can be triggered by arbitrary local users with access to Sudo by entering a password of seven characters or fewer. The impact could vary depending on the compiler and processor architecture. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/sudo/0001-Fix-CVE-2022-43995.patch | 53 ++++++++++++++++++++++++++++++ package/sudo/sudo.mk | 3 ++ 2 files changed, 56 insertions(+) diff --git a/package/sudo/0001-Fix-CVE-2022-43995.patch b/package/sudo/0001-Fix-CVE-2022-43995.patch new file mode 100644 index 0000000000..3f544dcf81 --- /dev/null +++ b/package/sudo/0001-Fix-CVE-2022-43995.patch @@ -0,0 +1,53 @@ +From bd209b9f16fcd1270c13db27ae3329c677d48050 Mon Sep 17 00:00:00 2001 +From: "Todd C. Miller" +Date: Fri, 28 Oct 2022 07:29:55 -0600 +Subject: [PATCH] Fix CVE-2022-43995, potential heap overflow for passwords < 8 + characters. Starting with sudo 1.8.0 the plaintext password buffer is + dynamically sized so it is not safe to assume that it is at least 9 bytes in + size. Found by Hugo Lefeuvre (University of Manchester) with ConfFuzz. + +[Retrieved from: +https://github.com/sudo-project/sudo/commit/bd209b9f16fcd1270c13db27ae3329c677d48050] +Signed-off-by: Fabrice Fontaine +--- + plugins/sudoers/auth/passwd.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c +index b2046eca2..0416861e9 100644 +--- a/plugins/sudoers/auth/passwd.c ++++ b/plugins/sudoers/auth/passwd.c +@@ -63,7 +63,7 @@ sudo_passwd_init(struct passwd *pw, sudo_auth *auth) + int + sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_conv_callback *callback) + { +- char sav, *epass; ++ char des_pass[9], *epass; + char *pw_epasswd = auth->data; + size_t pw_len; + int matched = 0; +@@ -75,12 +75,12 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c + + /* + * Truncate to 8 chars if standard DES since not all crypt()'s do this. +- * If this turns out not to be safe we will have to use OS #ifdef's (sigh). + */ +- sav = pass[8]; + pw_len = strlen(pw_epasswd); +- if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) +- pass[8] = '\0'; ++ if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) { ++ strlcpy(des_pass, pass, sizeof(des_pass)); ++ pass = des_pass; ++ } + + /* + * Normal UN*X password check. +@@ -88,7 +88,6 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c + * only compare the first DESLEN characters in that case. + */ + epass = (char *) crypt(pass, pw_epasswd); +- pass[8] = sav; + if (epass != NULL) { + if (HAS_AGEINFO(pw_epasswd, pw_len) && strlen(epass) == DESLEN) + matched = !strncmp(pw_epasswd, epass, DESLEN); diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 4f9fdb4b2c..1826f72017 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -23,6 +23,9 @@ SUDO_CONF_OPTS = \ --without-interfaces \ --with-env-editor +# 0001-Fix-CVE-2022-43995.patch +SUDO_IGNORE_CVES += CVE-2022-43995 + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) define SUDO_INSTALL_PAM_CONF $(INSTALL) -D -m 0644 package/sudo/sudo.pam $(TARGET_DIR)/etc/pam.d/sudo From yann.morin.1998 at free.fr Mon Feb 20 20:51:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:57 -0000 Subject: [Buildroot] [git commit branch/next] package/libopenssl: don't build the afalg engine Message-ID: <20230220205146.72F3F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=adc1c5d8f14f69a62a2a4260465363ab120816ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The openssl configure script disables the afalg engine when it detects cross-compilation, but the detection missfires because it is based on the CROSS_COMPILE environment variable, which we do not set (as we pass fully qualified CC et al.). So, the afalg engine is built, but it is built for the host, not the target, so it does not make sense to build and install it. Besides, it leaks build host info. Signed-off-by: Nuno Gon??alves [yann.morin.1998 at free.fr: extend commit log] Signed-off-by: Yann E. MORIN --- package/libopenssl/libopenssl.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index c7a2d65cc4..50d41a6533 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -83,6 +83,7 @@ define LIBOPENSSL_CONFIGURE_CMDS no-tests \ no-fuzz-libfuzzer \ no-fuzz-afl \ + no-afalgeng \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA),,no-chacha) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5),,no-rc5) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2),,no-rc2) \ From peter at korsgaard.com Mon Feb 20 20:51:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:51:57 -0000 Subject: [Buildroot] [git commit branch/next] Merge branch 'next' Message-ID: <20230220205156.1E345828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ca0edcb5f20c00336e7fb52ffa74cca2c2d5ef6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Patch is too large, so refusing to show it Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:57 -0000 Subject: [Buildroot] [git commit branch/next] package/lxc: bump to version 5.0.1 Message-ID: <20230220205147.39F9886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db19998035701d08bf1b5fd366e0b5aa9adb8e57 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next LXC 5.0 will be supported until June 2027 and our current LTS release, LXC 4.0 will now switch to a slower maintenance pace, only getting critical bugfixes and security updates. We strongly recommend all LXC users to plan an upgrade to the 5.0 branch. - Switch to meson-package - Add an upstream patch to fix the following build failure with glibc 2.36 (unfortunately upstream doesn't plan to fix this for 4.x: https://github.com/lxc/lxc/issues/4183 and patch is only working with meson, not autotools) https://discuss.linuxcontainers.org/t/lxc-5-0-lts-has-been-released https://discuss.linuxcontainers.org/t/lxc-5-0-1-has-been-released Fixes: - http://autobuild.buildroot.org/results/f77e2dc44c9a224f280e08089a890e85c302274f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...etect-where-struct-mount_attr-is-declared.patch | 186 +++++++++++++++++++++ package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 36 ++-- 3 files changed, 204 insertions(+), 20 deletions(-) diff --git a/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch b/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch new file mode 100644 index 0000000000..8de7adcc56 --- /dev/null +++ b/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch @@ -0,0 +1,186 @@ +From c1115e1503bf955c97f4cf3b925a6a9f619764c3 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Tue, 9 Aug 2022 16:14:25 +0200 +Subject: [PATCH] build: detect where struct mount_attr is declared + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) +[Retrieved from: +https://github.com/lxc/lxc/commit/c1115e1503bf955c97f4cf3b925a6a9f619764c3] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 30 ++++++++++++++++++++++++++++-- + src/lxc/conf.c | 6 +++--- + src/lxc/conf.h | 2 +- + src/lxc/mount_utils.c | 6 +++--- + src/lxc/syscall_wrappers.h | 12 ++++++++++-- + 5 files changed, 45 insertions(+), 11 deletions(-) + +diff --git a/meson.build b/meson.build +index a145faf069..f679aabbc8 100644 +--- a/meson.build ++++ b/meson.build +@@ -590,7 +590,6 @@ decl_headers = ''' + foreach decl: [ + '__aligned_u64', + 'struct clone_args', +- 'struct mount_attr', + 'struct open_how', + 'struct rtnl_link_stats64', + ] +@@ -610,7 +609,6 @@ foreach tuple: [ + ['struct seccomp_notif_sizes'], + ['struct clone_args'], + ['__aligned_u64'], +- ['struct mount_attr'], + ['struct open_how'], + ['struct rtnl_link_stats64'], + ] +@@ -630,6 +628,34 @@ foreach tuple: [ + endif + endforeach + ++## Types. ++decl_headers = ''' ++#include ++''' ++ ++# We get -1 if the size cannot be determined ++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 ++ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), true) ++ found_types += 'struct mount_attr (sys/mount.h)' ++else ++ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) ++ missing_types += 'struct mount_attr (sys/mount.h)' ++endif ++ ++## Types. ++decl_headers = ''' ++#include ++''' ++ ++# We get -1 if the size cannot be determined ++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 ++ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), true) ++ found_types += 'struct mount_attr (linux/mount.h)' ++else ++ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), false) ++ missing_types += 'struct mount_attr (linux/mount.h)' ++endif ++ + ## Headers. + foreach ident: [ + ['bpf', '''#include +diff --git a/src/lxc/conf.c b/src/lxc/conf.c +index ffbe74c2f6..4193cd07f5 100644 +--- a/src/lxc/conf.c ++++ b/src/lxc/conf.c +@@ -2885,7 +2885,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) + struct lxc_mount_options opts = {}; + int dfd_from; + const char *source_relative, *target_relative; +- struct lxc_mount_attr attr = {}; ++ struct mount_attr attr = {}; + + ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts); + if (ret < 0) +@@ -3005,7 +3005,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) + + /* Set propagation mount options. */ + if (opts.attr.propagation) { +- attr = (struct lxc_mount_attr) { ++ attr = (struct mount_attr) { + .propagation = opts.attr.propagation, + }; + +@@ -4109,7 +4109,7 @@ int lxc_idmapped_mounts_parent(struct lxc_handler *handler) + + for (;;) { + __do_close int fd_from = -EBADF, fd_userns = -EBADF; +- struct lxc_mount_attr attr = {}; ++ struct mount_attr attr = {}; + struct lxc_mount_options opts = {}; + ssize_t ret; + +diff --git a/src/lxc/conf.h b/src/lxc/conf.h +index 7dc2f15b60..772479f9e1 100644 +--- a/src/lxc/conf.h ++++ b/src/lxc/conf.h +@@ -223,7 +223,7 @@ struct lxc_mount_options { + unsigned long mnt_flags; + unsigned long prop_flags; + char *data; +- struct lxc_mount_attr attr; ++ struct mount_attr attr; + char *raw_options; + }; + +diff --git a/src/lxc/mount_utils.c b/src/lxc/mount_utils.c +index bba75f933c..88dd73ee36 100644 +--- a/src/lxc/mount_utils.c ++++ b/src/lxc/mount_utils.c +@@ -31,7 +31,7 @@ lxc_log_define(mount_utils, lxc); + * setting in @attr_set, but must also specify MOUNT_ATTR__ATIME in the + * @attr_clr field. + */ +-static inline void set_atime(struct lxc_mount_attr *attr) ++static inline void set_atime(struct mount_attr *attr) + { + switch (attr->attr_set & MOUNT_ATTR__ATIME) { + case MOUNT_ATTR_RELATIME: +@@ -272,7 +272,7 @@ int create_detached_idmapped_mount(const char *path, int userns_fd, + { + __do_close int fd_tree_from = -EBADF; + unsigned int open_tree_flags = OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC; +- struct lxc_mount_attr attr = { ++ struct mount_attr attr = { + .attr_set = MOUNT_ATTR_IDMAP | attr_set, + .attr_clr = attr_clr, + .userns_fd = userns_fd, +@@ -335,7 +335,7 @@ int __fd_bind_mount(int dfd_from, const char *path_from, __u64 o_flags_from, + __u64 attr_clr, __u64 propagation, int userns_fd, + bool recursive) + { +- struct lxc_mount_attr attr = { ++ struct mount_attr attr = { + .attr_set = attr_set, + .attr_clr = attr_clr, + .propagation = propagation, +diff --git a/src/lxc/syscall_wrappers.h b/src/lxc/syscall_wrappers.h +index a5e98b565c..c8a7d0c7b7 100644 +--- a/src/lxc/syscall_wrappers.h ++++ b/src/lxc/syscall_wrappers.h +@@ -18,6 +18,12 @@ + #include "macro.h" + #include "syscall_numbers.h" + ++#if HAVE_STRUCT_MOUNT_ATTR ++#include ++#elif HAVE_UAPI_STRUCT_MOUNT_ATTR ++#include ++#endif ++ + #ifdef HAVE_LINUX_MEMFD_H + #include + #endif +@@ -210,16 +216,18 @@ extern int fsmount(int fs_fd, unsigned int flags, unsigned int attr_flags); + /* + * mount_setattr() + */ +-struct lxc_mount_attr { ++#if !HAVE_STRUCT_MOUNT_ATTR && !HAVE_UAPI_STRUCT_MOUNT_ATTR ++struct mount_attr { + __u64 attr_set; + __u64 attr_clr; + __u64 propagation; + __u64 userns_fd; + }; ++#endif + + #if !HAVE_MOUNT_SETATTR + static inline int mount_setattr(int dfd, const char *path, unsigned int flags, +- struct lxc_mount_attr *attr, size_t size) ++ struct mount_attr *attr, size_t size) + { + return syscall(__NR_mount_setattr, dfd, path, flags, attr, size); + } diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index d460bc6a01..c18e062cc1 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz +sha256 d8195423bb1e206f8521d24b6cde4789f043960c7cf065990a9cf741dcfd4222 lxc-5.0.1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index cece27411e..f0a0e8041a 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.12 +LXC_VERSION = 5.0.1 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 @@ -13,56 +13,54 @@ LXC_DEPENDENCIES = host-pkgconf LXC_INSTALL_STAGING = YES LXC_CONF_OPTS = \ - --disable-apparmor \ - --disable-examples \ - --with-distro=buildroot \ - --disable-werror \ - $(if $(BR2_PACKAGE_BASH),,--disable-bash) + -Dapparmor=false \ + -Dexamples=false \ + -Dman=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) LXC_DEPENDENCIES += bash-completion endif ifeq ($(BR2_PACKAGE_LIBCAP),y) -LXC_CONF_OPTS += --enable-capabilities +LXC_CONF_OPTS += -Dcapabilities=true LXC_DEPENDENCIES += libcap else -LXC_CONF_OPTS += --disable-capabilities +LXC_CONF_OPTS += -Dcapabilities=false endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -LXC_CONF_OPTS += --enable-seccomp +LXC_CONF_OPTS += -Dseccomp=true LXC_DEPENDENCIES += libseccomp else -LXC_CONF_OPTS += --disable-seccomp +LXC_CONF_OPTS += -Dseccomp=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -LXC_CONF_OPTS += --enable-selinux +LXC_CONF_OPTS += -Dselinux=true LXC_DEPENDENCIES += libselinux else -LXC_CONF_OPTS += --disable-selinux +LXC_CONF_OPTS += -Dselinux=false endif ifeq ($(BR2_PACKAGE_LIBURING),y) -LXC_CONF_OPTS += --enable-liburing +LXC_CONF_OPTS += -Dio-uring-event-loop=true LXC_DEPENDENCIES += liburing else -LXC_CONF_OPTS += --disable-liburing +LXC_CONF_OPTS += -Dio-uring-event-loop=false endif ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -LXC_CONF_OPTS += --enable-pam +LXC_CONF_OPTS += -Dpam-cgroup=true LXC_DEPENDENCIES += linux-pam else -LXC_CONF_OPTS += --disable-pam +LXC_CONF_OPTS += -Dpam-cgroup=false endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -LXC_CONF_OPTS += --enable-openssl +LXC_CONF_OPTS += -Dopenssl=true LXC_DEPENDENCIES += openssl else -LXC_CONF_OPTS += --disable-openssl +LXC_CONF_OPTS += -Dopenssl=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From peter at korsgaard.com Mon Feb 20 20:51:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:51:58 -0000 Subject: [Buildroot] [git commit branch/next] Revert "package/mupdf: fix CVE-2021-4216" Message-ID: <20230220205156.41C2086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f298729fc3e3d71c01eab9e2939661fb50a7fe5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit 3ddca0ccb90967977c2db8c966c205568cf4cb93. With the merge of next, we are now using mupdf 1.20.3, so this fix is no longer needed. Signed-off-by: Peter Korsgaard --- ...-by-zero-for-zero-width-pages-in-muraster.patch | 29 ---------------------- package/mupdf/mupdf.mk | 3 --- 2 files changed, 32 deletions(-) diff --git a/package/mupdf/0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch b/package/mupdf/0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch deleted file mode 100644 index 099a3fdbab..0000000000 --- a/package/mupdf/0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 22c47acbd52949421f8c7cb46ea1556827d0fcbf Mon Sep 17 00:00:00 2001 -From: Sebastian Rasmussen -Date: Tue, 18 Jan 2022 20:33:10 +0100 -Subject: [PATCH] Bug 704834: Fix division by zero for zero width pages in - muraster. - -[Retrieved from: -https://github.com/ArtifexSoftware/mupdf/commit/22c47acbd52949421f8c7cb46ea1556827d0fcbf] -Signed-off-by: Fabrice Fontaine ---- - source/tools/muraster.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/source/tools/muraster.c b/source/tools/muraster.c -index c2ceb62f2e..97f4ae2633 100644 ---- a/source/tools/muraster.c -+++ b/source/tools/muraster.c -@@ -1003,8 +1003,9 @@ initialise_banding(fz_context *ctx, render_details *render, int color) - - w = render->ibounds.x1 - render->ibounds.x0; - min_band_mem = (size_t)bpp * w * min_band_height; -- reps = (int)(max_band_memory / min_band_mem); -- if (reps < 1) -+ if (min_band_mem > 0) -+ reps = (int)(max_band_memory / min_band_mem); -+ if (min_band_mem == 0 || reps < 1) - reps = 1; - - /* Adjust reps to even out the work between threads */ diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index c333f43957..1fc54b2d35 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -28,9 +28,6 @@ MUPDF_IGNORE_CVES += CVE-2021-3407 # 0003-Bug-703791-Stay-within-hash-table-max-key-size-in-cached-color-converter.patch MUPDF_IGNORE_CVES += CVE-2021-37220 -# 0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch -MUPDF_IGNORE_CVES += CVE-2021-4216 - # The pkg-config name for gumbo-parser is `gumbo`. MUPDF_PKG_CONFIG_PACKAGES = \ freetype2 \ From yann.morin.1998 at free.fr Mon Feb 20 20:51:58 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:58 -0000 Subject: [Buildroot] [git commit branch/next] package/linux: don't leak host timezone into linux version string Message-ID: <20230220205146.65DD486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a848418db4f956486a17dedc08f09803b26c84a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Nuno Gon??alves Signed-off-by: Yann E. MORIN --- linux/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index efdc21eff2..6b547a68ed 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -162,7 +162,7 @@ LINUX_MAKE_ENV += \ KBUILD_BUILD_VERSION=1 \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C TZ='UTC' date -d @$(SOURCE_DATE_EPOCH))" endif # gcc-8 started warning about function aliases that have a From yann.morin.1998 at free.fr Mon Feb 20 20:51:58 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:51:58 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: fix musl and uclibc-ng builds Message-ID: <20230220205147.B06FB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d9f268424558c37cd9538596358a537cd2f882d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following musl and uclibc-ng build failures raised since the addition of the package in commit 530d6f661e506a4774b7236cb93d65f669adbc92: configure: error: *** argp functions not found - install libargp or argp_standalone Fixes: - http://autobuild.buildroot.org/results/55b283fa46a797253193fb752638ba88597a416b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/crun/Config.in | 1 + package/crun/crun.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/crun/Config.in b/package/crun/Config.in index 5aca10dcdb..5def7001c1 100644 --- a/package/crun/Config.in +++ b/package/crun/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_CRUN bool "crun" + select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_YAJL # libocispec help crun is a fast and low-memory OCI Container Runtime in C. diff --git a/package/crun/crun.mk b/package/crun/crun.mk index 4a0c150594..65f166e657 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -15,6 +15,10 @@ CRUN_CPE_ID_VENDOR = crun_project CRUN_AUTORECONF = YES CRUN_CONF_OPTS = --disable-embedded-yajl +ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) +CRUN_DEPENDENCIES += argp-standalone +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) CRUN_DEPENDENCIES += libcap CRUN_CONF_OPTS += --enable-caps From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:59 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: add missing backslash Message-ID: <20230220205146.BC337828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b21e2f216b08135366c7d9ba1eb087f6bdaba482 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 0b4a9930124f7fb4c7bfae281db900905006a2da ("package/swupdate: specify SWU_VER during build") forgot a backslash. Fixes the following check-package warning: package/swupdate/swupdate.mk:213: unexpected indent with tabs and obviously makes the code correct. Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 2f618b2e79..bfc161d490 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -209,7 +209,7 @@ SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)) SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig SWUPDATE_MAKE_OPTS = \ - SWU_VER="$(SWUPDATE_VERSION) (Buildroot $(BR2_VERSION_FULL))" + SWU_VER="$(SWUPDATE_VERSION) (Buildroot $(BR2_VERSION_FULL))" \ CROSS_COMPILE="$(TARGET_CROSS)" \ CONFIG_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ CONFIG_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:51:59 -0000 Subject: [Buildroot] [git commit branch/next] package/socat: disable openssl for static build Message-ID: <20230220205147.92FB481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=934ec83e9d005fb21e5813f4480ebd624ee28c6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next socat's configure script does not take the zlib dependency into account when linking with libssl, and therefore fails at detecting libssl in BR2_STATIC_LIBS=y configurations. Since there is no easy way to add the zlib dependency, just disable openssl support for static builds. This is not fixing a build failure: libssl was not detected in BR2_STATIC_LIBS=y configurations, so what this commit does is make it explicit. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/socat/socat.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/socat/socat.mk b/package/socat/socat.mk index c1bf4d260f..bfccd02031 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -39,7 +39,7 @@ SOCAT_DEPENDENCIES = host-autoconf # incompatibile license (GPL-3.0+) SOCAT_CONF_OPTS = --disable-readline -ifeq ($(BR2_PACKAGE_OPENSSL),y) +ifeq ($(BR2_PACKAGE_OPENSSL):$(BR2_STATIC_LIBS),y:) SOCAT_DEPENDENCIES += openssl else SOCAT_CONF_OPTS += --disable-openssl From yann.morin.1998 at free.fr Mon Feb 20 20:52:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:00 -0000 Subject: [Buildroot] [git commit branch/next] configs/kontron_smarc_sal28: add BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20230220205147.E18FD86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6103c844a5a9ec711cb3cc81ae784ec593382e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Uboot host tools require openssl. So enable BR2_TARGET_UBOOT_NEEDS_OPENSSL. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3267233835 Signed-off-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- configs/kontron_smarc_sal28_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/kontron_smarc_sal28_defconfig b/configs/kontron_smarc_sal28_defconfig index 25846c8cbd..f8515f5b76 100644 --- a/configs/kontron_smarc_sal28_defconfig +++ b/configs/kontron_smarc_sal28_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron_sl28" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:00 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: specify SWU_VER during build Message-ID: <20230220205146.8FE3D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b4a9930124f7fb4c7bfae281db900905006a2da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The swupdate build process uses SWU_VER as part of the build commandline for compiling objects to define the value for use in globals.h (see also Makefile.flags). This value is also used to communicate capabilities to lua handlers (see upstream 0f38ff186e76c55c8d00ccb53739a29bcca91445). When swupdate gets built, SWU_VER defaults to using `git describe` to determine the version. This, unfortunately, picks up the version of the Buildroot checkout and not the actual version of swupdate. Now, specify SWU_VER as part of the make options to override the calculated value so the proper version is reported. Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index b2f50d2b71..2f618b2e79 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -209,6 +209,7 @@ SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)) SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig SWUPDATE_MAKE_OPTS = \ + SWU_VER="$(SWUPDATE_VERSION) (Buildroot $(BR2_VERSION_FULL))" CROSS_COMPILE="$(TARGET_CROSS)" \ CONFIG_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ CONFIG_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" From yann.morin.1998 at free.fr Mon Feb 20 20:52:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:01 -0000 Subject: [Buildroot] [git commit branch/next] package/gensio: fix libressl build Message-ID: <20230220205147.BE1718648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de6820ab1bd2a695772adc7df44036baba62913a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following libressl build failure raised since bump to version 2.5.5 in commit 8f67d23af11510b447d9d0e1a71249f97e655305 and https://github.com/cminyard/gensio/commit/12c94a29808e930a660142013c518468ca14ea62: gensio_filter_certauth.c: In function 'v3_certauth_add_challenge_rsp': gensio_filter_certauth.c:735:44: error: 'EVP_PKEY_ED25519' undeclared (first use in this function); did you mean 'EVP_PKEY_DSA1'? 735 | if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) { | ^~~~~~~~~~~~~~~~ | EVP_PKEY_DSA1 Fixes: - http://autobuild.buildroot.org/results/a0348df9bf9c7ccfd576f607abb6b186da384ad9 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-EVP_PKEY_ED25519-build-error-on-libressl.patch | 105 +++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch b/package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch new file mode 100644 index 0000000000..e9087aa3e5 --- /dev/null +++ b/package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch @@ -0,0 +1,105 @@ +From 1e7071684329f23ee3447310d203d193c283979e Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Wed, 5 Oct 2022 15:30:32 -0600 +Subject: [PATCH] Fix missing EVP_PKEY_ED25519 build error on libressl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: +gensio_filter_certauth.c: In function ???v3_certauth_add_challenge_rsp???: +gensio_filter_certauth.c:838:44: error: ???EVP_PKEY_ED25519??? undeclared (first use in this function); did you mean ???EVP_PKEY_DSA1???? + 838 | if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) { + | ^~~~~~~~~~~~~~~~ + | EVP_PKEY_DSA1 +gensio_filter_certauth.c:838:44: note: each undeclared identifier is reported only once for each function it appears in +gensio_filter_certauth.c: In function ???certauth_add_challenge_rsp???: +gensio_filter_certauth.c:901:44: error: ???EVP_PKEY_ED25519??? undeclared (first use in this function); did you mean ???EVP_PKEY_DSA1???? + 901 | if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) + | ^~~~~~~~~~~~~~~~ + | EVP_PKEY_DSA1 +gensio_filter_certauth.c: In function ???certauth_check_challenge???: +gensio_filter_certauth.c:1048:35: error: ???EVP_PKEY_ED25519??? undeclared (first use in this function); did you mean ???EVP_PKEY_DSA1???? + 1048 | if (EVP_PKEY_base_id(pkey) == EVP_PKEY_ED25519) + | ^~~~~~~~~~~~~~~~ + | EVP_PKEY_DSA1 + +Signed-off-by: Corey Minyard +[Retrieved from: +https://github.com/cminyard/gensio/commit/1e7071684329f23ee3447310d203d193c283979e] +Signed-off-by: Fabrice Fontaine +--- + lib/gensio_filter_certauth.c | 6 ++++++ + tools/gtlssh-keygen.c | 11 ++++++++++- + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/lib/gensio_filter_certauth.c b/lib/gensio_filter_certauth.c +index 642379b6..c4552e79 100644 +--- a/lib/gensio_filter_certauth.c ++++ b/lib/gensio_filter_certauth.c +@@ -835,11 +835,13 @@ v3_certauth_add_challenge_rsp(struct certauth_filter *sfilter) + unsigned int lenpos, len; + int rv = 0; + ++#ifdef EVP_PKEY_ED25519 + if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) { + gca_log_err(sfilter, + "Remote end or SSL too old to support ed25519 key"); + return GE_KEYINVALID; + } ++#endif + + certauth_write_byte(sfilter, CERTAUTH_CHALLENGE_RSP); + lenpos = sfilter->write_buf_len; +@@ -898,8 +900,10 @@ certauth_add_challenge_rsp(struct certauth_filter *sfilter) + if (sfilter->version < 4 || sfilter->my_version < 4) + return v3_certauth_add_challenge_rsp(sfilter); + ++#ifdef EVP_PKEY_ED25519 + if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) + digest = NULL; ++#endif + + certauth_write_byte(sfilter, CERTAUTH_CHALLENGE_RSP); + lenpos = sfilter->write_buf_len; +@@ -1045,8 +1049,10 @@ certauth_check_challenge(struct certauth_filter *sfilter) + goto out_nomem; + } + ++#ifdef EVP_PKEY_ED25519 + if (EVP_PKEY_base_id(pkey) == EVP_PKEY_ED25519) + digest = NULL; ++#endif + + if (!EVP_DigestVerifyInit(sign_ctx, NULL, digest, NULL, pkey)) { + gca_logs_err(sfilter, "Digest verify init failed"); +diff --git a/tools/gtlssh-keygen.c b/tools/gtlssh-keygen.c +index c8c28937..0779dd78 100644 +--- a/tools/gtlssh-keygen.c ++++ b/tools/gtlssh-keygen.c +@@ -108,7 +108,12 @@ help(const char *progname) + P(" The default is your username for normal certificates and\n"); + P(" the fully qualified domain name for server certificates.\n"); + P(" --algorithm - Set the algorithm to use for the key,\n"); +- P(" either ed25519, rsa or ec. The default is ed25519.\n"); ++ P(" either ed25519, rsa or ec. "); ++#ifdef EVP_PKEY_ED25519 ++ P("The default is ed25519.\n"); ++#else ++ P("The default is ec.\n"); ++#endif + P(" --force, -f - Don't ask questions, just do the operation. This\n"); + P(" may overwrite data without asking.\n"); + P(" --version - Print the version number and exit.\n"); +@@ -831,7 +836,11 @@ genpkey_ed25519(const char *key) + return rc != 0; + } + ++#ifdef EVP_PKEY_ED25519 + static int (*genpkey)(const char *key) = genpkey_ed25519; ++#else ++static int (*genpkey)(const char *key) = genpkey_ec; ++#endif + + /* + * Create a single key. If name is NULL, it's a server key, otherwise From yann.morin.1998 at free.fr Mon Feb 20 20:52:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:01 -0000 Subject: [Buildroot] [git commit branch/next] package/libdcadec: remove package Message-ID: <20230220205146.833538648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6aed2126b9c4cbae2a3f770e6d9029b44daa957 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Quoting https://github.com/foo86/dcadec "This program is deprecated! This decoder has been fully integrated into FFmpeg master branch and further development will continue there. Using FFmpeg for DTS decoding is now recommended." lbdcadec has had no commit oin the past 7+ years now. Fixes: http://autobuild.buildroot.net/results/1e63586c91a2670ecac2940f6e9840e6801c32f3/ Signed-off-by: Bernd Kuhls [yann.morin.1998 at free.fr: amend commit log with age of last activity] Signed-off-by: Yann E. MORIN --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/libdcadec/Config.in | 7 ------- package/libdcadec/libdcadec.hash | 3 --- package/libdcadec/libdcadec.mk | 33 --------------------------------- 6 files changed, 8 insertions(+), 45 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 0e63d59a98..7458fa331e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.11" +config BR2_PACKAGE_LIBDCADEC + bool "package was deprecated upstream, use ffmpeg instead" + select BR2_LEGACY + help + This decoder has been fully integrated into FFmpeg master + branch and further development will continue there. Using + FFmpeg for DTS decoding is now recommended. + config BR2_KERNEL_HEADERS_5_17 bool "kernel headers version 5.17.x are no longer supported" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7d27936992..2613624f4b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -363,7 +363,6 @@ F: package/libcdio/ F: package/libcec/ F: package/libcodec2/ F: package/libcrossguid/ -F: package/libdcadec/ F: package/libdeflate/ F: package/libdrm/ F: package/libdvbcsa/ diff --git a/package/Config.in b/package/Config.in index 238d7813f0..aef80f9ab0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1785,7 +1785,6 @@ menu "Multimedia" source "package/libbluray/Config.in" source "package/libcamera/Config.in" source "package/libcamera-apps/Config.in" - source "package/libdcadec/Config.in" source "package/libdvbcsa/Config.in" source "package/libdvbpsi/Config.in" source "package/libdvbsi/Config.in" diff --git a/package/libdcadec/Config.in b/package/libdcadec/Config.in deleted file mode 100644 index 2687a18187..0000000000 --- a/package/libdcadec/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBDCADEC - bool "libdcadec" - help - dcadec is a free DTS Coherent Acoustics decoder with support - for HD extensions. - - https://github.com/foo86/dcadec diff --git a/package/libdcadec/libdcadec.hash b/package/libdcadec/libdcadec.hash deleted file mode 100644 index 3c3e80e8a3..0000000000 --- a/package/libdcadec/libdcadec.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44 libdcadec-0.2.0.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/package/libdcadec/libdcadec.mk b/package/libdcadec/libdcadec.mk deleted file mode 100644 index a3579ad632..0000000000 --- a/package/libdcadec/libdcadec.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# libdcadec -# -################################################################################ - -LIBDCADEC_VERSION = 0.2.0 -LIBDCADEC_SITE = $(call github,foo86,dcadec,v$(LIBDCADEC_VERSION)) -LIBDCADEC_LICENSE = LGPL-2.1+ -LIBDCADEC_LICENSE_FILES = COPYING.LGPLv2.1 -LIBDCADEC_INSTALL_STAGING = YES - -ifeq ($(BR2_STATIC_LIBS),) -LIBDCADEC_SHARED = CONFIG_SHARED=1 -endif - -define LIBDCADEC_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ - $(LIBDCADEC_SHARED) -C $(@D) -endef - -define LIBDCADEC_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(LIBDCADEC_SHARED) DESTDIR=$(STAGING_DIR) PREFIX=/usr install -endef - -define LIBDCADEC_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(LIBDCADEC_SHARED) DESTDIR=$(TARGET_DIR) PREFIX=/usr install -endef - -$(eval $(generic-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:52:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:02 -0000 Subject: [Buildroot] [git commit branch/next] configs/bananapi_m64: remove defconfig Message-ID: <20230220205148.4283486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=daf3c6661f823e566b6310042884c36c1d73f1de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499008 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 - board/bananapi/bananapi-m64/boot.cmd | 6 ---- board/bananapi/bananapi-m64/genimage.cfg | 40 ------------------------- board/bananapi/bananapi-m64/readme.txt | 37 ----------------------- configs/bananapi_m64_defconfig | 50 -------------------------------- 5 files changed, 134 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 9e3c919a14..37d2e3854f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1314,7 +1314,6 @@ F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig -F: configs/bananapi_m64_defconfig F: configs/engicam_imx6qdl_icore_defconfig F: configs/engicam_imx6qdl_icore_qt5_defconfig F: configs/engicam_imx6qdl_icore_rqs_defconfig diff --git a/board/bananapi/bananapi-m64/boot.cmd b/board/bananapi/bananapi-m64/boot.cmd deleted file mode 100644 index d35c9b0b2c..0000000000 --- a/board/bananapi/bananapi-m64/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-a64-bananapi-m64.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/bananapi/bananapi-m64/genimage.cfg b/board/bananapi/bananapi-m64/genimage.cfg deleted file mode 100644 index e922c0dba2..0000000000 --- a/board/bananapi/bananapi-m64/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-bananapi-m64.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/bananapi/bananapi-m64/readme.txt b/board/bananapi/bananapi-m64/readme.txt deleted file mode 100644 index 0dec3e52ee..0000000000 --- a/board/bananapi/bananapi-m64/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Bananapi M64. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Bananapi M64 link: -http://www.banana-pi.org/m64.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Bananapi+M64 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make bananapi_m64_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Bananapi M64 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/bananapi_m64_defconfig b/configs/bananapi_m64_defconfig deleted file mode 100644 index b93332ed21..0000000000 --- a/configs/bananapi_m64_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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/bananapi/bananapi-m64/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-bananapi-m64" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M64" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m64/genimage.cfg" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:02 -0000 Subject: [Buildroot] [git commit branch/next] package/docopt-cpp: fix static build Message-ID: <20230220205146.C9E408648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1ebbb919aebdfb1cc984803d2dee554edb4672e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static build failure raised since the addition of the package in commit 43f96ced67c9a1f84d3f0edf5cd632178eb176b8: [ 66%] Linking CXX shared library libdocopt.so ld (ld-elf2flt): -shared used without passing a shared library ID Fixes: - http://autobuild.buildroot.org/results/834a0209c8165b3208ebf8654cb6cf8e3568b671 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...t-use-BUILD_SHARED_LIBS-where-appropriate.patch | 87 ++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch b/package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch new file mode 100644 index 0000000000..77206d5208 --- /dev/null +++ b/package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch @@ -0,0 +1,87 @@ +From 6d3b803d2b0e4bf8703bbfa51a67f378d6bd59f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9o=20DELRIEU?= +Date: Tue, 19 Nov 2019 14:58:59 +0100 +Subject: [PATCH] only build one target, use BUILD_SHARED_LIBS where + appropriate + +[Retrieved from: +https://github.com/docopt/docopt.cpp/commit/6d3b803d2b0e4bf8703bbfa51a67f378d6bd59f6] +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 39 ++++++--------------------------------- + 1 file changed, 6 insertions(+), 33 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index feff32e..14c3420 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,33 +34,15 @@ set(docopt_HEADERS + #============================================================================ + # Compile targets + #============================================================================ +-if(MSVC OR XCODE) +- # MSVC requires __declspec() attributes, which are achieved via the +- # DOCOPT_DLL and DOCOPT_EXPORTS macros below. Since those macros are only +- # defined when building a shared library, we must build the shared and +- # static libraries completely separately. +- # Xcode does not support libraries with only object files as sources. +- # See https://cmake.org/cmake/help/v3.0/command/add_library.html?highlight=add_library +- add_library(docopt SHARED ${docopt_SOURCES} ${docopt_HEADERS}) +- add_library(docopt_s STATIC ${docopt_SOURCES} ${docopt_HEADERS}) +-else() +- # If not using MSVC or Xcode, we will create an intermediate object target +- # to avoid compiling the source code twice. +- add_library(docopt_o OBJECT ${docopt_SOURCES} ${docopt_HEADERS}) +- set_target_properties(docopt_o PROPERTIES POSITION_INDEPENDENT_CODE TRUE) +- +- add_library(docopt SHARED $) +- set_target_properties(docopt PROPERTIES +- VERSION ${PROJECT_VERSION} +- SOVERSION ${PROJECT_VERSION_MAJOR} +- ) +- add_library(docopt_s STATIC $) +-endif() ++add_library(docopt ${docopt_SOURCES} ${docopt_HEADERS}) ++set_target_properties(docopt PROPERTIES ++ VERSION ${PROJECT_VERSION} ++ SOVERSION ${PROJECT_VERSION_MAJOR} ++) + + target_include_directories(docopt PUBLIC $ $) +-target_include_directories(docopt_s PUBLIC $ $) + +-if(MSVC) ++if(MSVC AND BUILD_SHARED_LIBS) + # DOCOPT_DLL: Must be specified when building *and* when using the DLL. + # That's what the "PUBLIC" means. + # DOCOPT_EXPORTS: Must use __declspec(dllexport) when building the DLL. +@@ -69,11 +51,6 @@ if(MSVC) + PRIVATE DOCOPT_EXPORTS) + endif() + +-if(NOT MSVC) +- set_target_properties(docopt PROPERTIES OUTPUT_NAME docopt) +- set_target_properties(docopt_s PROPERTIES OUTPUT_NAME docopt) +-endif() +- + if(USE_BOOST_REGEX) + add_definitions("-DDOCTOPT_USE_BOOST_REGEX") + # This is needed on Linux, where linking a static library into docopt.so +@@ -82,9 +59,6 @@ if(USE_BOOST_REGEX) + find_package(Boost 1.53 REQUIRED COMPONENTS regex) + include_directories(${Boost_INCLUDE_DIRS}) + target_link_libraries(docopt ${Boost_LIBRARIES}) +- if(WITH_STATIC) +- target_link_libraries(docopt_s ${Boost_LIBRARIES}) +- endif() + endif() + + #============================================================================ +@@ -120,7 +94,6 @@ set(export_name "docopt-targets") + install(TARGETS docopt EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + # Development package +-install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES ${docopt_HEADERS} DESTINATION include/docopt) + + # CMake Package From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:03 -0000 Subject: [Buildroot] [git commit branch/next] package/multipath-tools: add MULTIPATH_TOOLS_CPE_ID_VENDOR Message-ID: <20230220205146.D7220828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=adf4d6f7295b08b177a01d177a3f0a54e1f20f4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next cpe:2.3:a:opensvc:multipath-tools is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopensvc%3Amultipath-tools Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/multipath-tools/multipath-tools.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index ec5d853644..df3d5138e8 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -18,6 +18,7 @@ MULTIPATH_TOOLS_LICENSE_FILES = \ LICENSES/LGPL-2.0 \ LICENSES/LGPL-2.1 \ README.md +MULTIPATH_TOOLS_CPE_ID_VENDOR = opensvc MULTIPATH_TOOLS_DEPENDENCIES = lvm2 json-c readline udev liburcu libaio host-pkgconf MULTIPATH_TOOLS_MAKE_OPTS = \ From yann.morin.1998 at free.fr Mon Feb 20 20:52:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:03 -0000 Subject: [Buildroot] [git commit branch/next] configs/bananapi_m1: remove defconfig Message-ID: <20230220205148.1FA7D86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef832cd8551c6bbebe2f56a21a5dd4f1f54aa495 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499003 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 - board/bananapi/bananapi-m1/boot.cmd | 7 ------- board/bananapi/bananapi-m1/genimage.cfg | 34 ------------------------------ board/bananapi/bananapi-m1/readme.txt | 37 --------------------------------- configs/bananapi_m1_defconfig | 29 -------------------------- 5 files changed, 108 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 94d1338880..90c2d2ba21 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1318,7 +1318,6 @@ F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig -F: configs/bananapi_m1_defconfig F: configs/bananapi_m64_defconfig F: configs/engicam_imx6qdl_icore_defconfig F: configs/engicam_imx6qdl_icore_qt5_defconfig diff --git a/board/bananapi/bananapi-m1/boot.cmd b/board/bananapi/bananapi-m1/boot.cmd deleted file mode 100644 index 0cf6f4d63e..0000000000 --- a/board/bananapi/bananapi-m1/boot.cmd +++ /dev/null @@ -1,7 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -mmc dev 0 -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun7i-a20-bananapi.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/bananapi/bananapi-m1/genimage.cfg b/board/bananapi/bananapi-m1/genimage.cfg deleted file mode 100644 index ce62fbf712..0000000000 --- a/board/bananapi/bananapi-m1/genimage.cfg +++ /dev/null @@ -1,34 +0,0 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "sun7i-a20-bananapi.dtb", - "boot.scr" - } - } - - size = 64M -} - -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" - } -} diff --git a/board/bananapi/bananapi-m1/readme.txt b/board/bananapi/bananapi-m1/readme.txt deleted file mode 100644 index 382ba63c49..0000000000 --- a/board/bananapi/bananapi-m1/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Bananapi M1. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Bananapi M1 link: -http://www.banana-pi.org/m1.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Bananapi+M1 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make bananapi_m1_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Bananapi M1 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/bananapi_m1_defconfig b/configs/bananapi_m1_defconfig deleted file mode 100644 index 23da363345..0000000000 --- a/configs/bananapi_m1_defconfig +++ /dev/null @@ -1,29 +0,0 @@ -BR2_arm=y -BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y -BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M1" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m1/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.12" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapi" -BR2_TARGET_ROOTFS_EXT2=y -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="2018.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapi" -BR2_TARGET_UBOOT_NEEDS_DTC=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/bananapi/bananapi-m1/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:04 -0000 Subject: [Buildroot] [git commit branch/next] package/wolfssl: bump to version 5.5.3 Message-ID: <20230220205147.01F0A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34b681cfefe2aee03df290715f3047f624595288 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix for possible buffer zeroization overrun introduced at the end of v5.5.2 release cycle in GitHub pull request 5743 (#5743) and fixed in pull request 5757 (#5757). In the case where a specific memory allocation failed or a hardware fault happened there was the potential for an overrun of 0???s when masking the buffer used for (D)TLS 1.2 and lower operations. (D)TLS 1.3 only and crypto only users are not affected by the issue. This is not related in any way to recent issues reported in OpenSSL. https://github.com/wolfSSL/wolfssl/releases/tag/v5.5.3-stable Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 65d77ca659..08262113a0 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 49c6195462cae034efe6c86268824ba515682508a5f5199358d56a4168a82cf0 wolfssl-5.5.2.tar.gz +sha256 fd3135b8657d09fb96a8aad16585da850b96ea420ae8ce5ac4d5fdfc614c2683 wolfssl-5.5.3.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index d9fa72ccf4..cd3acd9411 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -WOLFSSL_VERSION = 5.5.2 +WOLFSSL_VERSION = 5.5.3 WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:52:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:04 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add myself to configs/kontron_smarc_sal28_defconfig Message-ID: <20230220205147.EDBB68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce38e455bb61ad2f4219a2c7da8b68d07dd0b180 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2613624f4b..9bd98da5ef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1243,8 +1243,10 @@ F: package/volk/ N: Heiko Thiery F: board/kontron/bl-imx8mm/ +F: board/kontron/smarc-sal28/ F: board/kontron/pitx-imx8m/ F: configs/kontron_bl_imx8mm_defconfig +F: configs/kontron_smarc_sal28_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ F: package/ipmitool/ From yann.morin.1998 at free.fr Mon Feb 20 20:52:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:05 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_m1: remove defconfig Message-ID: <20230220205148.667A686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f7b44cfcb10cf2d1c71a35b89d61da04ae32e2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. This defconfig did not even have an entry in the DEVELOPERS file. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499050 Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- board/friendlyarm/nanopi-m1/boot.cmd | 8 ------ board/friendlyarm/nanopi-m1/genimage.cfg | 37 -------------------------- board/friendlyarm/nanopi-m1/readme.txt | 29 -------------------- configs/friendlyarm_nanopi_m1_defconfig | 45 -------------------------------- 4 files changed, 119 deletions(-) diff --git a/board/friendlyarm/nanopi-m1/boot.cmd b/board/friendlyarm/nanopi-m1/boot.cmd deleted file mode 100644 index b4d612ede7..0000000000 --- a/board/friendlyarm/nanopi-m1/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-nanopi-m1.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-m1/genimage.cfg b/board/friendlyarm/nanopi-m1/genimage.cfg deleted file mode 100644 index 3b2b82ce96..0000000000 --- a/board/friendlyarm/nanopi-m1/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the NanoPi M1 -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-m1.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/board/friendlyarm/nanopi-m1/readme.txt b/board/friendlyarm/nanopi-m1/readme.txt deleted file mode 100644 index 6a34c4239d..0000000000 --- a/board/friendlyarm/nanopi-m1/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -NanoPi M1 - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the NanoPi M1. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make friendlyarm_nanopi_m1_defconfig - -Compile everything and build the SD card image: - - $ make - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/friendlyarm_nanopi_m1_defconfig b/configs/friendlyarm_nanopi_m1_defconfig deleted file mode 100644 index 18cfcb261e..0000000000 --- a/configs/friendlyarm_nanopi_m1_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1" -BR2_TARGET_UBOOT_NEEDS_DTC=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=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:07 -0000 Subject: [Buildroot] [git commit branch/next] package/guile: fix Config.in comment dependency Message-ID: <20230220205147.2D469828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3441f3c5d66111af18f83ad585a2f0abb096ee7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The main guile option depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS, but this was not accounted for in the Config.in comment. Signed-off-by: Thomas Petazzoni --- package/guile/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/guile/Config.in b/package/guile/Config.in index 3cf0ec863b..eeeeaf4035 100644 --- a/package/guile/Config.in +++ b/package/guile/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_GUILE http://www.gnu.org/software/guile comment "guile needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library" + depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL From yann.morin.1998 at free.fr Mon Feb 20 20:52:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:07 -0000 Subject: [Buildroot] [git commit branch/next] configs/bananapi_m1_plus: remove defconfig Message-ID: <20230220205148.2B9208648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a086bd267f1b2e5c211e705b977b17df1c20867b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499004 Cc: Filip Skoneczny Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 -- board/sinovoip/m1-plus/boot.cmd | 5 -- board/sinovoip/m1-plus/genimage.cfg | 38 ------------- board/sinovoip/m1-plus/linux-wifi.fragment | 10 ---- ...7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch | 39 ------------- board/sinovoip/m1-plus/post-build.sh | 4 -- board/sinovoip/m1-plus/readme.txt | 64 ---------------------- .../brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt | 1 - .../lib/firmware/brcm/brcmfmac43362-sdio.txt | 56 ------------------- configs/bananapi_m1_plus_defconfig | 45 --------------- 10 files changed, 266 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 90c2d2ba21..b77f4ff68c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1004,10 +1004,6 @@ F: configs/freescale_imx6ullevk_defconfig N: Falco Hyfing F: package/python-pymodbus/ -N: Filip Skoneczny -F: board/sinovoip/m1-plus -F: configs/bananapi_m1_plus_defconfig - N: Florian Fainelli F: package/cpulimit/ diff --git a/board/sinovoip/m1-plus/boot.cmd b/board/sinovoip/m1-plus/boot.cmd deleted file mode 100644 index 4829996474..0000000000 --- a/board/sinovoip/m1-plus/boot.cmd +++ /dev/null @@ -1,5 +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 sun7i-a20-bananapi-m1-plus.dtb -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/sinovoip/m1-plus/genimage.cfg b/board/sinovoip/m1-plus/genimage.cfg deleted file mode 100644 index 18a549e631..0000000000 --- a/board/sinovoip/m1-plus/genimage.cfg +++ /dev/null @@ -1,38 +0,0 @@ -# Minimal SD card image for the Banana Pi M1+ -# Based on the Banana Pro genimage.cfg - -image boot.vfat { - vfat { - files = { - "zImage", - "sun7i-a20-bananapi-m1-plus.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/board/sinovoip/m1-plus/linux-wifi.fragment b/board/sinovoip/m1-plus/linux-wifi.fragment deleted file mode 100644 index 5576d738ad..0000000000 --- a/board/sinovoip/m1-plus/linux-wifi.fragment +++ /dev/null @@ -1,10 +0,0 @@ -# Networking support -CONFIG_WIRELESS=y -CONFIG_CFG80211=y -CONFIG_CFG80211_WEXT=y -CONFIG_RFKILL=y - -# Network device support -CONFIG_WLAN=y -CONFIG_WLAN_VENDOR_BROADCOM=y -CONFIG_BRCMFMAC=m diff --git a/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch b/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch deleted file mode 100644 index b01b6b2829..0000000000 --- a/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 58bae4096a7bf8d5d3bfbddb82cb37dd0561c938 Mon Sep 17 00:00:00 2001 -From: Filip Skoneczny -Date: Sun, 10 Jan 2021 19:07:14 +0100 -Subject: [PATCH] ARM: dts: sun7i: bananapi-m1-plus: Disable OOB IRQ for brcm - wifi module - - Based on 23bc805. - BugLink: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908438 - -Signed-off-by: Filip Skoneczny ---- - arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts -index 32d5d45a35c0..97f9987f51d7 100644 ---- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts -+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts -@@ -193,9 +193,14 @@ &mmc3 { - brcmf: wifi at 1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; -- interrupt-parent = <&pio>; -- interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; -- interrupt-names = "host-wake"; -+ /* -+ * OOB interrupt support is broken ATM, drv probe failing with: -+ * ieee80211 phy0: brcmf_attach: dongle is not responding: err=-110 -+ * -+ * interrupt-parent = <&pio>; -+ * interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; -+ * interrupt-names = "host-wake"; -+ */ - }; - }; - --- -2.25.1 - diff --git a/board/sinovoip/m1-plus/post-build.sh b/board/sinovoip/m1-plus/post-build.sh deleted file mode 100755 index 4ee6fa3bc4..0000000000 --- a/board/sinovoip/m1-plus/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# Remove all but the brcmfmac43362 firmware files -find $TARGET_DIR/lib/firmware/brcm -type f -not -name "brcmfmac43362*" -delete diff --git a/board/sinovoip/m1-plus/readme.txt b/board/sinovoip/m1-plus/readme.txt deleted file mode 100644 index ae647c21a9..0000000000 --- a/board/sinovoip/m1-plus/readme.txt +++ /dev/null @@ -1,64 +0,0 @@ -Banana Pi M1+ - -Intro -===== - -This default configuration will allow you to start experimenting with the -Buildroot environment for the Banana Pi M1+. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make bananapi_m1_plus_defconfig - -Compile everything and build the SD card image: - - $ make - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ dd if=output/images/sdcard.img of=/dev/sdX - -Notes: - - replace 'sdX' with the actual device with your micro SD card - - you may need to be root to do that (use 'sudo') - -Insert the micro SD card in your Banana Pi M1+ and power it up. The console -is on the debug TTL UART, 115200 8N1. - -Ethernet -========== - - # udhcpc -i eth0 - -Wifi -========== - - # wpa_passphrase YOUR_SSID >> /etc/wpa_supplicant.conf - (enter the wifi password and press enter) - # wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf -B - # udhcpc -i wlan0 - -Note: - - replace 'YOUR_SSID' with the actual SSID from your access point - -Audio -========== - -For this example you need package alsa-utils. - -Connect a headphone to the 3.5mm jack (TRRS). Note, that the Banana Pi M1+ -has an on-board microphone, too. - - # amixer cset name='Power Amplifier DAC Playback Switch' on - # amixer cset name='Power Amplifier Mute Switch' on - # amixer cset name='Power Amplifier Volume' 42 diff --git a/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt b/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt deleted file mode 120000 index 93947975ee..0000000000 --- a/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt +++ /dev/null @@ -1 +0,0 @@ -brcmfmac43362-sdio.txt \ No newline at end of file diff --git a/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt b/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt deleted file mode 100644 index 14a554fdd8..0000000000 --- a/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt +++ /dev/null @@ -1,56 +0,0 @@ -#AP6210_NVRAM_V1.2_03192013 -manfid=0x2d0 -prodid=0x492 -vendid=0x14e4 -devid=0x4343 -boardtype=0x0598 - -# Board Revision is P307, same nvram file can be used for P304, P305, P306 and P307 as the tssi pa params used are same -#Please force the automatic RX PER data to the respective board directory if not using P307 board, for e.g. for P305 boards force the data into the following directory /projects/BCM43362/a1_labdata/boardtests/results/sdg_rev0305 -boardrev=0x1307 -boardnum=777 -xtalfreq=26000 -boardflags=0x80201 -boardflags2=0x80 -sromrev=3 -wl0id=0x431b -macaddr=00:90:4c:07:71:12 -aa2g=1 -ag0=2 -maxp2ga0=74 -cck2gpo=0x2222 -ofdm2gpo=0x44444444 -mcs2gpo0=0x6666 -mcs2gpo1=0x6666 -pa0maxpwr=56 - -#P207 PA params -#pa0b0=5447 -#pa0b1=-658 -#pa0b2=-175 - -#Same PA params for P304,P305, P306, P307 - -pa0b0=5447 -pa0b1=-607 -pa0b2=-160 -pa0itssit=62 -pa1itssit=62 - - -cckPwrOffset=5 -ccode=0 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 -triso2g=0 -noise_cal_enable_2g=0 -noise_cal_po_2g=0 -swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x010101,0x1ff -temp_add=29767 -temp_mult=425 - -btc_flags=0x6 -btc_params0=5000 -btc_params1=1000 -btc_params6=63 diff --git a/configs/bananapi_m1_plus_defconfig b/configs/bananapi_m1_plus_defconfig deleted file mode 100644 index 271124f79a..0000000000 --- a/configs/bananapi_m1_plus_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_NEON_VFPV4=y -BR2_GLOBAL_PATCH_DIR="board/sinovoip/m1-plus/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TARGET_GENERIC_HOSTNAME="bananapi" -BR2_TARGET_GENERIC_ISSUE="Welcome to Banana Pi!" -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_OVERLAY="board/sinovoip/m1-plus/rootfs_overlay" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/sinovoip/m1-plus/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sinovoip/m1-plus/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.3" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sinovoip/m1-plus/linux-wifi.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapi-m1-plus" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y -BR2_PACKAGE_IW=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m1_plus" -BR2_TARGET_UBOOT_NEEDS_DTC=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_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sinovoip/m1-plus/boot.cmd" From yann.morin.1998 at free.fr Mon Feb 20 20:52:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:08 -0000 Subject: [Buildroot] [git commit branch/next] package/optee-client: fix util-linux dependency Message-ID: <20230220205206.E05A286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=28f31d4694ad212d9b511c53ba35c6443eeef972 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When applying 917a961d9c77 (package/optee-client: bump to version 3.19.0), a last-minute change was made in Config.in to change the dependency to util-linux instead of util-linux-libs, but the counterpart to that change in the .mk was omitted. Fix that now. Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/optee-client/optee-client.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 3e0c9269b8..311ca191b0 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -27,7 +27,7 @@ OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF endif ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y) -OPTEE_CLIENT_EXT_DEPENDENCIES += host-pkgconf util-linux-libs +OPTEE_CLIENT_EXT_DEPENDENCIES += host-pkgconf util-linux OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=ON else OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=OFF From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:08 -0000 Subject: [Buildroot] [git commit branch/next] package/libmbim: bump version to 1.28.2 Message-ID: <20230220205206.C5C1C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57bea338e95e49bf1f2405908462686306044825 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libmbim/libmbim.hash | 2 +- package/libmbim/libmbim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmbim/libmbim.hash b/package/libmbim/libmbim.hash index e98c53b1c9..2e2b46fcdb 100644 --- a/package/libmbim/libmbim.hash +++ b/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 58cd9ab1a2af9bbf40f9c02d3152a96baaa34a5f66a4289e928c7cf1c9584abb libmbim-1.26.4.tar.gz +sha256 cf74682c56f4c34ca4aee86de3b8c425a89fc2c0782052815295faf6a8e0a9fb libmbim-1.28.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index 1e2b1771eb..1c12b82298 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMBIM_VERSION = 1.26.4 +LIBMBIM_VERSION = 1.28.2 LIBMBIM_SITE = https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION) LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBMBIM_LICENSE_FILES = COPYING COPYING.LIB From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:08 -0000 Subject: [Buildroot] [git commit branch/next] package/ipmitool: fix per-package build Message-ID: <20230220205149.2DE6786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=68c143419336139fcf5dccd8289f410be4285550 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following per-package build failure raised since commit 82480ee22bdfae6f7d399975722b5c125749d8c7: configure.ac:44: error: possibly undefined macro: AC_SEARCH_LIBS If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. Fixes: - http://autobuild.buildroot.org/results/ecf72cd1ebd53f3b3b10f0a24082f9c0ab5d4d12 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipmitool/ipmitool.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index ebd8f9b337..b9f60d8151 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -12,6 +12,7 @@ IPMITOOL_LICENSE_FILES = COPYING IPMITOOL_CPE_ID_VENDOR = ipmitool_project # From git IPMITOOL_AUTORECONF = YES +IPMITOOL_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_FREEIPMI),y) IPMITOOL_DEPENDENCIES += freeipmi @@ -34,7 +35,7 @@ IPMITOOL_CONF_OPTS += --disable-intf-usb endif ifeq ($(BR2_PACKAGE_IPMITOOL_IPMISHELL),y) -IPMITOOL_DEPENDENCIES += host-pkgconf readline +IPMITOOL_DEPENDENCIES += readline IPMITOOL_CONF_OPTS += --enable-ipmishell else IPMITOOL_CONF_OPTS += --disable-ipmishell From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:08 -0000 Subject: [Buildroot] [git commit branch/next] package/ninja: bump to version 1.11.1.g95dee.kitware.jobserver-1 Message-ID: <20230220205147.6DCA886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e2d08c583228e48c622e0adc2ba577cded40ad2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/ninja/ninja.hash | 2 +- package/ninja/ninja.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ninja/ninja.hash b/package/ninja/ninja.hash index ecde199844..57c10bb287 100644 --- a/package/ninja/ninja.hash +++ b/package/ninja/ninja.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 549c31ee596566b952c600e23eb9b8d39a4112cd5fdeb2e5a83370669176da40 ninja-1.10.2.g51db2.kitware.jobserver-1.tar.gz +sha256 7ba84551f5b315b4270dc7c51adef5dff83a2154a3665a6c9744245c122dd0db ninja-1.11.1.g95dee.kitware.jobserver-1.tar.gz sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index bc84046414..b7bc1a4f1c 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -4,8 +4,8 @@ # ################################################################################ -NINJA_VERSION_MAJOR = 1.10.2 -NINJA_VERSION = $(NINJA_VERSION_MAJOR).g51db2.kitware.jobserver-1 +NINJA_VERSION_MAJOR = 1.11.1 +NINJA_VERSION = $(NINJA_VERSION_MAJOR).g95dee.kitware.jobserver-1 NINJA_SITE = $(call github,Kitware,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:09 -0000 Subject: [Buildroot] [git commit branch/next] package/libqmi: bump version to 1.32.2 Message-ID: <20230220205206.D291A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eea24067ad8c27918e30ec91d1d5d2cf0ab13946 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index dee2a94d93..5036c1d3c0 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 b2e0285690f94fe6d0cc3c422514117b187c8ddb90133c2900993e13343f5a5e libqmi-1.30.8.tar.gz +sha256 aec96bf2733a7b5ba27bb52346ce3a1ab54440800843f78001cc2a51213ce1b9 libqmi-1.32.2.tar.gz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index 6b7f45729e..c3db50a92c 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.30.8 +LIBQMI_VERSION = 1.32.2 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 yann.morin.1998 at free.fr Mon Feb 20 20:52:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:09 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_neo2: remove defconfig Message-ID: <20230220205148.893B88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24bb61071269f5446b6a1a5aaa89e5439e51940a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499053 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/friendlyarm/nanopi-neo2/boot.cmd | 6 ---- board/friendlyarm/nanopi-neo2/genimage.cfg | 40 ------------------------ board/friendlyarm/nanopi-neo2/readme.txt | 37 ---------------------- configs/friendlyarm_nanopi_neo2_defconfig | 50 ------------------------------ 5 files changed, 135 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index eca6cccfe8..7442d3a6ee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1301,7 +1301,6 @@ F: board/amarula/ F: board/asus/ F: board/bananapi/ F: board/engicam/ -F: board/friendlyarm/nanopi-neo2/ F: board/olimex/a33_olinuxino/ F: board/olimex/a64-olinuxino/ F: board/orangepi/orangepi-lite2/ @@ -1318,7 +1317,6 @@ F: configs/engicam_imx6qdl_icore_qt5_defconfig F: configs/engicam_imx6qdl_icore_rqs_defconfig F: configs/engicam_imx6ul_geam_defconfig F: configs/engicam_imx6ul_isiot_defconfig -F: configs/friendlyarm_nanopi_neo2_defconfig F: configs/olimex_a33_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig F: configs/orangepi_lite2_defconfig diff --git a/board/friendlyarm/nanopi-neo2/boot.cmd b/board/friendlyarm/nanopi-neo2/boot.cmd deleted file mode 100644 index 9a39f4afc9..0000000000 --- a/board/friendlyarm/nanopi-neo2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-nanopi-neo2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg deleted file mode 100644 index 3163a06592..0000000000 --- a/board/friendlyarm/nanopi-neo2/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-nanopi-neo2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt deleted file mode 100644 index 0f445e2bea..0000000000 --- a/board/friendlyarm/nanopi-neo2/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi NEO2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Nanopi NEO2 link: -http://nanopi.io/nanopi-neo2.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/FriendlyARM+NanoPi+NEO2 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make friendlyarm_nanopi_neo2_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Nanopi NEO2 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig deleted file mode 100644 index 9262737b88..0000000000 --- a/configs/friendlyarm_nanopi_neo2_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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/friendlyarm/nanopi-neo2/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:09 -0000 Subject: [Buildroot] [git commit branch/next] package/libqb: disable tests Message-ID: <20230220205146.E8E458648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c153a318ae203913cb2211964ca35c6880a68552 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable tests to avoid the following build failure when check is enabled: libstat_wrapper.c:11:10: fatal error: gnu/lib-names.h: No such file or directory 11 | #include | ^~~~~~~~~~~~~~~~~ This build failure is raised since bump to version 2.0.6 in commit 2ee1bd7bb2e8d01f4ddca3fb1127ec729be1c9bf and https://github.com/ClusterLabs/libqb/commit/78df90b180740712d0c90b6d982b78241cc99d72 Fixes: - http://autobuild.buildroot.org/results/450cfc36d4fd6dc71c138bec45f05b5a2d92a08d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libqb/0001-Add-disable-tests-option.patch | 62 +++++++++++++++++++++++ package/libqb/libqb.mk | 3 ++ 2 files changed, 65 insertions(+) diff --git a/package/libqb/0001-Add-disable-tests-option.patch b/package/libqb/0001-Add-disable-tests-option.patch new file mode 100644 index 0000000000..1afb05520d --- /dev/null +++ b/package/libqb/0001-Add-disable-tests-option.patch @@ -0,0 +1,62 @@ +From 051d9cfe8f365e30affc6476ed79b9e04a6b15ad Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 4 Nov 2022 00:27:50 +0100 +Subject: [PATCH] Add --disable-tests option + +Add --disable-tests to allow the user to disable tests. As a +side-effect, this will avoid the following build failure when check is +found: + +libstat_wrapper.c:11:10: fatal error: gnu/lib-names.h: No such file or directory + 11 | #include + | ^~~~~~~~~~~~~~~~~ + +This build failure is raised since version 2.0.5 and +https://github.com/ClusterLabs/libqb/commit/78df90b180740712d0c90b6d982b78241cc99d72 + +Fixes: + - http://autobuild.buildroot.org/results/450cfc36d4fd6dc71c138bec45f05b5a2d92a08d + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ClusterLabs/libqb/pull/475] +--- + Makefile.am | 6 +++++- + configure.ac | 5 +++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index a08b1d2..6a710a0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -39,7 +39,11 @@ ACLOCAL_AMFLAGS = -I m4 + + dist_doc_DATA = COPYING INSTALL README.markdown + +-SUBDIRS = include lib doxygen2man docs tools tests examples ++SUBDIRS = include lib doxygen2man docs tools examples ++ ++if ENABLE_TESTS ++SUBDIRS += tests ++endif + + dist-clean-local: + rm -f .snapshot-version autoconf automake autoheader +diff --git a/configure.ac b/configure.ac +index ac44b7e..4946008 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -562,6 +562,11 @@ AC_ARG_WITH([force-sockets-config-file], + [ FORCESOCKETSFILE="$withval" ], + [ FORCESOCKETSFILE="$sysconfdir/libqb/force-filesystem-sockets" ]) + ++AC_ARG_ENABLE([tests], ++ [AS_HELP_STRING([--disable-tests],[disable tests])],, ++ [ enable_tests="yes" ]) ++AM_CONDITIONAL([ENABLE_TESTS], [test x$enable_tests = xyes]) ++ + AC_ARG_ENABLE([install-tests], + [AS_HELP_STRING([--enable-install-tests],[install tests])],, + [ enable_install_tests="no" ]) +-- +2.35.1 + diff --git a/package/libqb/libqb.mk b/package/libqb/libqb.mk index 0f409fd646..65d68181ee 100644 --- a/package/libqb/libqb.mk +++ b/package/libqb/libqb.mk @@ -12,6 +12,9 @@ LIBQB_LICENSE = LGPL-2.1+ LIBQB_LICENSE_FILES = COPYING LIBQB_CPE_ID_VENDOR = clusterlabs LIBQB_INSTALL_STAGING = YES +# We're patching configure.ac +LIBQB_AUTORECONF = YES +LIBQB_CONF_OPTS = --disable-tests LIBQB_DEPENDENCIES = libxml2 # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:10 -0000 Subject: [Buildroot] [git commit branch/next] package/libuhttpd: fix build with wolfssl >= 5.0 Message-ID: <20230220205147.531E4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca6f38a340bf7eaac76aafcdf7dd78f5c61b0ba6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with wolfssl raised since bump to version 5.2.0 in commit 14e0c4de719a0d63192cc5de66a608f75297f37d and https://github.com/wolfSSL/wolfssl/commit/33cb8231481d5beb46b57511c2630aba36028256: /home/buildroot/autobuild/instance-0/output-1/build/libuhttpd-3.14.1/src/ssl/openssl.c: In function 'handle_wolfssl_asn_error': /home/buildroot/autobuild/instance-0/output-1/build/libuhttpd-3.14.1/src/ssl/openssl.c:339:10: error: 'ASN_NTRU_KEY_E' undeclared (first use in this function); did you mean 'ASN_ECC_KEY_E'? 339 | case ASN_NTRU_KEY_E: | ^~~~~~~~~~~~~~ | ASN_ECC_KEY_E Fixes: - http://autobuild.buildroot.org/results/3261b0035c8aadd1b62538b53e03af1cd8a7b312 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-add-compatibility-for-wolfssl-5-0.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch b/package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch new file mode 100644 index 0000000000..7da7199e7e --- /dev/null +++ b/package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch @@ -0,0 +1,30 @@ +From 73aa4ef762b2de67bc8c7c260bd36b34fdb91e63 Mon Sep 17 00:00:00 2001 +From: "Sergey V. Lobanov" +Date: Mon, 3 Jan 2022 19:36:52 +0300 +Subject: [PATCH] add compatibility for wolfssl >= 5.0 + +NTRU support has been removed in wolfssl 5.0 so it is required to +mask NTRU specific code if wolfssl >= 5.0 + +Signed-off-by: Sergey V. Lobanov +[Retrieved from: +https://github.com/zhaojh329/ssl/commit/73aa4ef762b2de67bc8c7c260bd36b34fdb91e63] +Signed-off-by: Fabrice Fontaine +--- + openssl.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/ssl/openssl.c b/src/ssl/openssl.c +index 5a49267..278bab5 100644 +--- a/src/ssl/openssl.c ++++ b/src/ssl/openssl.c +@@ -336,7 +336,9 @@ static bool handle_wolfssl_asn_error(void *ssl, int r, + case ASN_SIG_HASH_E: + case ASN_SIG_KEY_E: + case ASN_DH_KEY_E: ++#if LIBWOLFSSL_VERSION_HEX < 0x05000000 + case ASN_NTRU_KEY_E: ++#endif + case ASN_CRIT_EXT_E: + case ASN_ALT_NAME_E: + case ASN_NO_PEM_HEADER: From yann.morin.1998 at free.fr Mon Feb 20 20:52:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:10 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_neo_plus2: remove defconfig Message-ID: <20230220205148.A18FA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d968cab0bd673311a87a8fc5187b1701200719de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499055 Cc: Louis Aussedat Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 - board/friendlyarm/nanopi-neo-plus2/extlinux.conf | 4 -- board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 40 -------------- .../nanopi-neo-plus2/linux-extras.config | 10 ---- board/friendlyarm/nanopi-neo-plus2/post-build.sh | 4 -- board/friendlyarm/nanopi-neo-plus2/readme.txt | 37 ------------- ...fmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt | 53 ------------------ configs/friendlyarm_nanopi_neo_plus2_defconfig | 62 ---------------------- 8 files changed, 212 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 27482d095a..0c9f885808 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1780,8 +1780,6 @@ F: package/ti-sgx-km/ F: package/ti-sgx-um/ N: Louis Aussedat -F: board/friendlyarm/nanopi-neo-plus2/ -F: configs/friendlyarm_nanopi_neo_plus2_defconfig F: package/mfoc F: package/libpam-nfc F: package/python-dnspython/ diff --git a/board/friendlyarm/nanopi-neo-plus2/extlinux.conf b/board/friendlyarm/nanopi-neo-plus2/extlinux.conf deleted file mode 100644 index fcb6f632c1..0000000000 --- a/board/friendlyarm/nanopi-neo-plus2/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label linux - kernel /Image - devicetree /sun50i-h5-nanopi-neo-plus2.dtb - append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait diff --git a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg b/board/friendlyarm/nanopi-neo-plus2/genimage.cfg deleted file mode 100644 index 9000201399..0000000000 --- a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-nanopi-neo-plus2.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-neo-plus2/linux-extras.config b/board/friendlyarm/nanopi-neo-plus2/linux-extras.config deleted file mode 100644 index 52b4b4b29e..0000000000 --- a/board/friendlyarm/nanopi-neo-plus2/linux-extras.config +++ /dev/null @@ -1,10 +0,0 @@ -# wireless core -CONFIG_WIRELESS=y -CONFIG_CFG80211=y -CONFIG_MAC80211=y -CONFIG_CFG80211_WEXT=y - -# wireless drivers -CONFIG_WLAN=y -CONFIG_WLAN_VENDOR_BROADCOM=y -CONFIG_BRCMFMAC=m diff --git a/board/friendlyarm/nanopi-neo-plus2/post-build.sh b/board/friendlyarm/nanopi-neo-plus2/post-build.sh deleted file mode 100755 index ec20fca7d9..0000000000 --- a/board/friendlyarm/nanopi-neo-plus2/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-neo-plus2/readme.txt b/board/friendlyarm/nanopi-neo-plus2/readme.txt deleted file mode 100644 index ae59952029..0000000000 --- a/board/friendlyarm/nanopi-neo-plus2/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi NEO Plus2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Nanopi NEO2 link: -http://nanopi.io/nanopi-neo-plus2.html - -Wiki link: -http://wiki.friendlyarm.com/wiki/index.php/NanoPi_NEO_Plus2 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make friendlyarm_nanopi_neo_plus2_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Nanopi NEO Plus2 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt b/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt deleted file mode 100644 index 740d172eb5..0000000000 --- a/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt +++ /dev/null @@ -1,53 +0,0 @@ -#AP6212_NVRAM_V1.0.1_20160606 -# 2.4 GHz, 20 MHz BW mode -# The following parameter values are just placeholders, need to be updated. -manfid=0x2d0 -prodid=0x0726 -vendid=0x14e4 -devid=0x43e2 -boardtype=0x0726 -boardrev=0x1101 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -sromrev=11 -boardflags=0x00404201 -xtalfreq=26000 -nocrc=1 -ag0=255 -aa2g=1 -ccode=ALL - -pa0itssit=0x20 -extpagain2g=0 - -#PA parameters for 2.4GHz, measured at CHIP OUTPUT -pa2ga0=-168,7161,-820 -AvVmid_c0=0x0,0xc8 -cckpwroffset0=5 - -# PPR params -maxp2ga0=90 -txpwrbckof=6 -cckbw202gpo=0x5555 -legofdmbw202gpo=0x77777777 -mcsbw202gpo=0xaaaaaaaa - -# OFDM IIR : -ofdmdigfilttype=7 -# PAPD mode: -papdmode=2 - -il0macaddr=00:90:4c:c5:12:38 -wl0id=0x431b - -#OOB parameters -hostwake=0x40 -hostrdy=0x41 -usbrdy=0x03 -usbrdydelay=100 -deadman_to=0xffffffff -# muxenab: 0x1 for UART enable, 0x10 for Host awake -muxenab=0x10 -# CLDO PWM voltage settings - 0x4 - 1.1 volt -#cldo_pwm=0x4 -glitch_based_crsmin=1 diff --git a/configs/friendlyarm_nanopi_neo_plus2_defconfig b/configs/friendlyarm_nanopi_neo_plus2_defconfig deleted file mode 100644 index 461e468cb6..0000000000 --- a/configs/friendlyarm_nanopi_neo_plus2_defconfig +++ /dev/null @@ -1,62 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_ROOTFS_OVERLAY="board/friendlyarm/nanopi-neo-plus2/rootfs_overlay" - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo_plus2" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.4" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo-plus2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo-plus2/linux-extras.config" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO Plus2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo-plus2/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo-plus2/post-build.sh" - -# wireless firmware -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y - -# wireless tools -BR2_PACKAGE_IW=y -BR2_PACKAGE_WIRELESS_TOOLS=y -BR2_PACKAGE_WIRELESS_TOOLS_LIB=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:11 -0000 Subject: [Buildroot] [git commit branch/next] package/strongswan: security bump to version 5.9.8 Message-ID: <20230220205146.9FD678648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b79d735139282ecf052dc89d4c221bbd16447112 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixed a vulnerability related to online certificate revocation checking that was caused because the revocation plugin used potentially untrusted OCSP URIs and CRL distribution points in certificates. This allowed a remote attacker to initiate IKE_SAs and send crafted certificates that contain URIs pointing to servers under their control, which could have lead to a denial-of-service attack. This vulnerability has been registered as CVE-2022-40617. Drop patch (already in version) https://www.strongswan.org/blog/2022/10/03/strongswan-vulnerability-(cve-2022-40617).html https://github.com/strongswan/strongswan/releases/tag/5.9.6 https://github.com/strongswan/strongswan/releases/tag/5.9.7 https://github.com/strongswan/strongswan/releases/tag/5.9.8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...strongswan-plugins-wolfssl-rename-encrypt.patch | 150 --------------------- package/strongswan/strongswan.hash | 6 +- package/strongswan/strongswan.mk | 2 +- 3 files changed, 4 insertions(+), 154 deletions(-) diff --git a/package/strongswan/0001-src-libstrongswan-plugins-wolfssl-rename-encrypt.patch b/package/strongswan/0001-src-libstrongswan-plugins-wolfssl-rename-encrypt.patch deleted file mode 100644 index 7b47b3278b..0000000000 --- a/package/strongswan/0001-src-libstrongswan-plugins-wolfssl-rename-encrypt.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 5900426a710eaa65a27784687775e331bcb0489b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 8 Aug 2022 09:52:19 +0200 -Subject: [PATCH] wolfssl: Rename `encrypt` methods to avoid conflicts with - system headers - -Rename `encrypt` methods to avoid the following build failure when wolfSSL -is built with --enable-opensslextra: - -In file included from ../../../../src/libstrongswan/utils/utils.h:59, - from ../../../../src/libstrongswan/library.h:101, - from wolfssl_common.h:29, - from wolfssl_aead.c:23: -wolfssl_aead.c:90:16: error: conflicting types for 'encrypt'; have '_Bool(union , chunk_t, chunk_t, chunk_t, chunk_t *)' - 90 | METHOD(aead_t, encrypt, bool, - | ^~~~~~~ -../../../../src/libstrongswan/utils/utils/object.h:99:20: note: in definition of macro 'METHOD' - 99 | static ret name(union {iface *_public; this;} \ - | ^~~~ -In file included from /home/autobuild/autobuild/instance-5/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/include/wolfssl/wolfcrypt/wc_port.h:573, - from /home/autobuild/autobuild/instance-5/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/include/wolfssl/wolfcrypt/types.h:35, - from /home/autobuild/autobuild/instance-5/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/include/wolfssl/wolfcrypt/logging.h:33, - from /home/autobuild/autobuild/instance-5/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/include/wolfssl/ssl.h:35, - from wolfssl_common.h:64, - from wolfssl_aead.c:23: -/home/autobuild/autobuild/instance-5/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/include/unistd.h:149:6: note: previous declaration of 'encrypt' with type 'void(char *, int)' - 149 | void encrypt(char *, int); - | ^~~~~~~ - -Closes strongswan/strongswan#1201 -[Retrieved from: -https://github.com/strongswan/strongswan/commit/5900426a710eaa65a27784687775e331bcb0489b] ---- - src/libstrongswan/plugins/wolfssl/wolfssl_aead.c | 4 ++-- - src/libstrongswan/plugins/wolfssl/wolfssl_crypter.c | 4 ++-- - src/libstrongswan/plugins/wolfssl/wolfssl_ec_public_key.c | 4 ++-- - src/libstrongswan/plugins/wolfssl/wolfssl_ed_public_key.c | 4 ++-- - src/libstrongswan/plugins/wolfssl/wolfssl_rsa_public_key.c | 4 ++-- - 5 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_aead.c b/src/libstrongswan/plugins/wolfssl/wolfssl_aead.c -index 2ea7c94cd65..44f054916cf 100644 ---- a/src/libstrongswan/plugins/wolfssl/wolfssl_aead.c -+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_aead.c -@@ -87,7 +87,7 @@ struct private_aead_t { - encryption_algorithm_t alg; - }; - --METHOD(aead_t, encrypt, bool, -+METHOD(aead_t, encrypt_, bool, - private_aead_t *this, chunk_t plain, chunk_t assoc, chunk_t iv, - chunk_t *encrypted) - { -@@ -323,7 +323,7 @@ aead_t *wolfssl_aead_create(encryption_algorithm_t algo, - - INIT(this, - .public = { -- .encrypt = _encrypt, -+ .encrypt = _encrypt_, - .decrypt = _decrypt, - .get_block_size = _get_block_size, - .get_icv_size = _get_icv_size, -diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_crypter.c b/src/libstrongswan/plugins/wolfssl/wolfssl_crypter.c -index cffe7ba2375..085a912404c 100644 ---- a/src/libstrongswan/plugins/wolfssl/wolfssl_crypter.c -+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_crypter.c -@@ -230,7 +230,7 @@ METHOD(crypter_t, decrypt, bool, - return success; - } - --METHOD(crypter_t, encrypt, bool, -+METHOD(crypter_t, encrypt_, bool, - private_wolfssl_crypter_t *this, chunk_t data, chunk_t iv, chunk_t *dst) - { - u_char *out; -@@ -578,7 +578,7 @@ wolfssl_crypter_t *wolfssl_crypter_create(encryption_algorithm_t algo, - INIT(this, - .public = { - .crypter = { -- .encrypt = _encrypt, -+ .encrypt = _encrypt_, - .decrypt = _decrypt, - .get_block_size = _get_block_size, - .get_iv_size = _get_iv_size, -diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_ec_public_key.c b/src/libstrongswan/plugins/wolfssl/wolfssl_ec_public_key.c -index d8a1ededb06..110543762f2 100644 ---- a/src/libstrongswan/plugins/wolfssl/wolfssl_ec_public_key.c -+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_ec_public_key.c -@@ -193,7 +193,7 @@ METHOD(public_key_t, verify, bool, - } - } - --METHOD(public_key_t, encrypt, bool, -+METHOD(public_key_t, encrypt_, bool, - private_wolfssl_ec_public_key_t *this, encryption_scheme_t scheme, - void *params, chunk_t crypto, chunk_t *plain) - { -@@ -324,7 +324,7 @@ static private_wolfssl_ec_public_key_t *create_empty() - .key = { - .get_type = _get_type, - .verify = _verify, -- .encrypt = _encrypt, -+ .encrypt = _encrypt_, - .get_keysize = _get_keysize, - .equals = public_key_equals, - .get_fingerprint = _get_fingerprint, -diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_ed_public_key.c b/src/libstrongswan/plugins/wolfssl/wolfssl_ed_public_key.c -index f423d8d5691..ea0fb3dfc77 100644 ---- a/src/libstrongswan/plugins/wolfssl/wolfssl_ed_public_key.c -+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_ed_public_key.c -@@ -111,7 +111,7 @@ METHOD(public_key_t, verify, bool, - return ret == 0 && res == 1; - } - --METHOD(public_key_t, encrypt, bool, -+METHOD(public_key_t, encrypt_, bool, - private_public_key_t *this, encryption_scheme_t scheme, - void *params, chunk_t crypto, chunk_t *plain) - { -@@ -368,7 +368,7 @@ static private_public_key_t *create_empty(key_type_t type) - .public = { - .get_type = _get_type, - .verify = _verify, -- .encrypt = _encrypt, -+ .encrypt = _encrypt_, - .get_keysize = _get_keysize, - .equals = public_key_equals, - .get_fingerprint = _get_fingerprint, -diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_rsa_public_key.c b/src/libstrongswan/plugins/wolfssl/wolfssl_rsa_public_key.c -index 72df115fe90..da8899c2d8c 100644 ---- a/src/libstrongswan/plugins/wolfssl/wolfssl_rsa_public_key.c -+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_rsa_public_key.c -@@ -216,7 +216,7 @@ METHOD(public_key_t, verify, bool, - } - } - --METHOD(public_key_t, encrypt, bool, -+METHOD(public_key_t, encrypt_, bool, - private_wolfssl_rsa_public_key_t *this, encryption_scheme_t scheme, - void *params, chunk_t plain, chunk_t *crypto) - { -@@ -440,7 +440,7 @@ static private_wolfssl_rsa_public_key_t *create_empty() - .key = { - .get_type = _get_type, - .verify = _verify, -- .encrypt = _encrypt, -+ .encrypt = _encrypt_, - .equals = public_key_equals, - .get_keysize = _get_keysize, - .get_fingerprint = _get_fingerprint, diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index aca7ddf5cd..4822f9152f 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,7 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.9.5.tar.bz2.md5 -md5 53005324e3cba8592f1fb958b1c2d0e5 strongswan-5.9.5.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.8.tar.bz2.md5 +md5 f46b0d3e7aed88824650d0721c887443 strongswan-5.9.8.tar.bz2 # Calculated based on the hash above -sha256 983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd strongswan-5.9.5.tar.bz2 +sha256 d3303a43c0bd7b75a12b64855e8edcb53696f06190364f26d1533bde1f2e453c strongswan-5.9.8.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 44c20f8414..cae1433e39 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.9.5 +STRONGSWAN_VERSION = 5.9.8 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:51:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:51:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/modsecurity2: disable pcre In-Reply-To: <20230219165638.147772-1-fontaine.fabrice@gmail.com> References: <20230219165638.147772-1-fontaine.fabrice@gmail.com> Message-ID: <20230220215144.68fff5fe@windsurf> On Sun, 19 Feb 2023 17:56:38 +0100 Fabrice Fontaine wrote: > Disable pcre to avoid the following build failure if pcre-config is > found on host raised since bump to version 2.9.7 in commit > 42e34cf10f9eb037aa8c48a4fb9e8f521901b983: > > /home/thomas/autobuild/instance-0/output-1/per-package/modsecurity2/host/bin/../lib/gcc/mips64el-buildroot-linux-gnu/11.3.0/../../../../mips64el-buildroot-linux-gnu/bin/ld: cannot find -lpcre: No such file or directory > > Fixes: > - http://autobuild.buildroot.org/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af > > Signed-off-by: Fabrice Fontaine > --- > package/modsecurity2/modsecurity2.mk | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:12 -0000 Subject: [Buildroot] [git commit branch/next] package/socat: fix printf feature detection Message-ID: <20230220205147.86B16828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ca100c2d2478cb8ef615edd1ad3cc2e1d90047b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next socal configure uses AC_TRY_RUN to detect printf features. This does not work for cross compilation. All C libraries we use support C99 snprintf. Only glibc and uClibc support the deprecated Z modifier. These issues were noticed by an inspection of configure.ac. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/socat/socat.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/socat/socat.mk b/package/socat/socat.mk index e20577492d..c1bf4d260f 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -11,6 +11,14 @@ SOCAT_LICENSE = GPL-2.0 with OpenSSL exception SOCAT_LICENSE_FILES = README COPYING COPYING.OpenSSL SOCAT_CPE_ID_VENDOR = dest-unreach +SOCAT_CONF_ENV = ac_cv_have_c99_snprintf=yes + +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC)$(BR2_TOOLCHAIN_USES_UCLIBC),y) +SOCAT_CONF_ENV += ac_cv_have_z_modifier=yes +else +SOCAT_CONF_ENV += ac_cv_have_z_modifier=no +endif + ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) SOCAT_CONF_ENV += \ sc_cv_sys_crdly_shift=12 \ From yann.morin.1998 at free.fr Mon Feb 20 20:52:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:12 -0000 Subject: [Buildroot] [git commit branch/next] configs/orangepi_pc2: remove defconfig Message-ID: <20230220205148.BA9E88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eeede611f81d8f83b72e4a6671cd7d1e46b266b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499136 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/orangepi/orangepi-pc2/boot.cmd | 6 ---- board/orangepi/orangepi-pc2/genimage.cfg | 40 ------------------------- board/orangepi/orangepi-pc2/readme.txt | 37 ----------------------- configs/orangepi_pc2_defconfig | 50 -------------------------------- 5 files changed, 135 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 45cf302386..ec8df84fa8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1303,7 +1303,6 @@ F: board/olimex/a33_olinuxino/ F: board/olimex/a64-olinuxino/ F: board/orangepi/orangepi-lite2/ F: board/orangepi/orangepi-one-plus -F: board/orangepi/orangepi-pc2/ F: board/orangepi/orangepi-prime/ F: board/orangepi/orangepi-win/ F: board/orangepi/orangepi-zero-plus2/ @@ -1319,7 +1318,6 @@ F: configs/olimex_a33_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig F: configs/orangepi_lite2_defconfig F: configs/orangepi_one_plus_defconfig -F: configs/orangepi_pc2_defconfig F: configs/orangepi_prime_defconfig F: configs/orangepi_win_defconfig F: configs/orangepi_zero_plus2_defconfig diff --git a/board/orangepi/orangepi-pc2/boot.cmd b/board/orangepi/orangepi-pc2/boot.cmd deleted file mode 100644 index 4d4fc7bf67..0000000000 --- a/board/orangepi/orangepi-pc2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-pc2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc2/genimage.cfg b/board/orangepi/orangepi-pc2/genimage.cfg deleted file mode 100644 index cc8695c9f1..0000000000 --- a/board/orangepi/orangepi-pc2/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-pc2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-pc2/readme.txt b/board/orangepi/orangepi-pc2/readme.txt deleted file mode 100644 index 1200481952..0000000000 --- a/board/orangepi/orangepi-pc2/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Orangepi PC2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Orangepi PC2 link: -http://www.orangepi.org/orangepipc2/ - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+PC2 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make orangepi_pc2_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Orangepi PC2 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig deleted file mode 100644 index c7e17c8eb1..0000000000 --- a/configs/orangepi_pc2_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc2" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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-pc2/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-pc2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi PC2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc2/genimage.cfg" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:13 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-tools: fix static build Message-ID: <20230220205149.2163186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a29e7fb6765c0a08a3276a11a4da54dfdbdca703 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Pass TARGET_LDFLAGS (which contains -static) to fix the following static build failures with gpio, iio and pci: LINK lsgpio /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/arm-buildroot-linux-musleabi/10.4.0/../../../../arm-buildroot-linux-musleabi/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/arm-buildroot-linux-musleabi/10.4.0/libgcc.a(_dvmd_lnx.o): in function `__aeabi_ldiv0': /home/autobuild/autobuild/instance-8/output-1/build/host-gcc-final-10.4.0/build/arm-buildroot-linux-musleabi/libgcc/../../../libgcc/config/arm/lib1funcs.S:1499: undefined reference to `raise' [...] LINK iio_event_monitor /home/thomas/autobuild/instance-2/output-1/host/lib/gcc/microblazeel-buildroot-linux-musl/11.3.0/../../../../microblazeel-buildroot-linux-musl/bin/ld: /home/thomas/autobuild/instance-2/output-1/host/lib/gcc/microblazeel-buildroot-linux-musl/11.3.0/libgcc.a(unwind-dw2.o): in function `size_of_encoded_value': /home/thomas/autobuild/instance-2/output-1/build/host-gcc-final-11.3.0/build/microblazeel-buildroot-linux-musl/libgcc/../../../libgcc/unwind-pe.h:88: undefined reference to `abort' Fixes: - http://autobuild.buildroot.org/results/f202eb843ef331939f5f12325bdbf2d0d664a7ce - http://autobuild.buildroot.org/results/504ec8be1ebd15c5da09f8b90bb723a58d4c58c5 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/linux-tools/linux-tool-gpio.mk.in | 2 +- package/linux-tools/linux-tool-iio.mk.in | 2 +- package/linux-tools/linux-tool-pci.mk.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-tools/linux-tool-gpio.mk.in b/package/linux-tools/linux-tool-gpio.mk.in index d5a0dbda38..e825db1b11 100644 --- a/package/linux-tools/linux-tool-gpio.mk.in +++ b/package/linux-tools/linux-tool-gpio.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += gpio -GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) +GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" define GPIO_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/gpio/Makefile >/dev/null 2>&1 ; then \ diff --git a/package/linux-tools/linux-tool-iio.mk.in b/package/linux-tools/linux-tool-iio.mk.in index a8cc89e830..27ab0ed7ed 100644 --- a/package/linux-tools/linux-tool-iio.mk.in +++ b/package/linux-tools/linux-tool-iio.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += iio -IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) +IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" define IIO_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/iio/Makefile >/dev/null 2>&1 ; then \ diff --git a/package/linux-tools/linux-tool-pci.mk.in b/package/linux-tools/linux-tool-pci.mk.in index 4ef0368a32..17246f5d7e 100644 --- a/package/linux-tools/linux-tool-pci.mk.in +++ b/package/linux-tools/linux-tool-pci.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += pci -PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) +PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" define PCI_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/pci/Makefile >/dev/null 2>&1 ; then \ From yann.morin.1998 at free.fr Mon Feb 20 20:52:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:13 -0000 Subject: [Buildroot] [git commit branch/next] package/ca-certificates: add support for cryptography >= 3.0 Message-ID: <20230220205147.A042286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fc1bf137e44caf44a018cf948d5bd2a10566860 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Building ca-certificates with a newer cryptography is breaking because python-cryptography's x509 API changed to accept only bytes, not str. Carry a patch that has been submitted upstream [0] but has not yet been applied [1]. Minor changes to account for 0001-*.patch. [0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008244 [1] https://salsa.debian.org/debian/ca-certificates Signed-off-by: Justin Wood Signed-off-by: Yann E. MORIN --- ...tdata2pem.py-Fix-compat-with-cryptography.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch b/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch new file mode 100644 index 0000000000..0537da9224 --- /dev/null +++ b/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch @@ -0,0 +1,29 @@ +From 5e493ca307a031e81528ceddb96f3da40bc062cf Mon Sep 17 00:00:00 2001 +From: Wataru Ashihara +Date: Wed, 2 Nov 2022 12:40:05 -0400 +Subject: [PATCH] mozilla/certdata2pem.py: Fix compat with cryptography > 3.0 + +In newer cryptography packages, load_der_x509_certificate is enforced to be 'bytes' rather than currently used 'bytearray'. This fixes that. + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008244 +Signed-off-by: Justin Wood +--- + mozilla/certdata2pem.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py +index a6261f8..c0fa52c 100644 +--- a/mozilla/certdata2pem.py ++++ b/mozilla/certdata2pem.py +@@ -122,7 +122,7 @@ for obj in objects: + try: + from cryptography import x509 + +- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) ++ cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE'])) + if cert.not_valid_after < datetime.datetime.now(): + print('!'*74) + print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) +-- +2.38.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:14 -0000 Subject: [Buildroot] [git commit branch/next] package/boost: fix patch formatting issue Message-ID: <20230220205149.7550F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a0759dd02401e681b008c17b18a9669aba4b8f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit ea38acd17d88b9eaf853313398c772b94338ad47 ("package/boost: backport development branch changes to fix MIPS64 build failure") introduced a patch formatting issue detected by check-package. This commit fixes this issue. Fixes: package/boost/0001-Improve-modfunc-performance.patch:4: generate your patches with 'git format-patch -N' https://gitlab.com/buildroot.org/buildroot/-/jobs/3287511158 Signed-off-by: Thomas Petazzoni --- package/boost/0001-Improve-modfunc-performance.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boost/0001-Improve-modfunc-performance.patch b/package/boost/0001-Improve-modfunc-performance.patch index 9cf5d8387e..a34d6bb4d5 100644 --- a/package/boost/0001-Improve-modfunc-performance.patch +++ b/package/boost/0001-Improve-modfunc-performance.patch @@ -1,7 +1,7 @@ From 825aedad557b7e3bb27614335b6ced16887103de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Mon, 7 Nov 2022 00:16:44 +0100 -Subject: [PATCH 1/1] Improve "modfunc" performance Fixes #79 +Subject: [PATCH] Improve "modfunc" performance Fixes #79 ("boost/intrusive/hashtable.hpp: build failure (undeclared indentifier)") Backport from Boost development branch to fix issues with some architectures From yann.morin.1998 at free.fr Mon Feb 20 20:52:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:14 -0000 Subject: [Buildroot] [git commit branch/next] package/zlib-ng: fix build without neon Message-ID: <20230220205147.CAA7D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88d2135a7ad7ed899ef1f2fec070407810f8055d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure without NEON probably raised since bump to version 1.9.9-b1 in commit 1f7b12a0b4572d7e763c431a63c22cfb912b8b14 and https://github.com/zlib-ng/zlib-ng/commit/ec02ecf104e1d3f1836a908a359f20aa93494df5: In file included from /home/autobuild/autobuild/instance-4/output-1/build/zlib-ng-2.0.6/arch/arm/adler32_neon.c:11: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/include/arm_neon.h:31:2: error: #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" 31 | #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/8260762632cde9eb5bc2154084680b5bec034aa6 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zlib-ng/zlib-ng.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index 938acd4181..aa65d8437d 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -18,9 +18,15 @@ ZLIB_NG_CONF_OPTS += \ -DZLIB_COMPAT=1 \ -DZLIB_ENABLE_TESTS=OFF -# Enable NEON and ACLE on ARM +# Enable ACLE on ARM ifeq ($(BR2_arm),y) -ZLIB_NG_CONF_OPTS += -DWITH_ACLE=1 -DWITH_NEON=1 +ZLIB_NG_CONF_OPTS += -DWITH_ACLE=1 +endif + +ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) +ZLIB_NG_CONF_OPTS += -DWITH_NEON=ON +else +ZLIB_NG_CONF_OPTS += -DWITH_NEON=OFF endif ifeq ($(BR2_powerpc_power8),y) From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:15 -0000 Subject: [Buildroot] [git commit branch/next] package/udisks: fix the tool name in the config help Message-ID: <20230220205149.84E7886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=593c64eaf9d2f03d1a0164c114caffa2f4546f5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The name of the tool in udisks2 is udisksctl. Signed-off-by: Wolfgang Grandegger Signed-off-by: Thomas Petazzoni --- package/udisks/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/udisks/Config.in b/package/udisks/Config.in index a3a0f82144..5d0b96f3c0 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -31,8 +31,8 @@ config BR2_PACKAGE_UDISKS interfaces that can be used to query and manipulate storage devices. - o a command-line tool, udisks(1), that can be used to query - and use the daemon + o a command-line tool, udisksctl(1), that can be used to + query and use the daemon http://www.freedesktop.org/wiki/Software/udisks From yann.morin.1998 at free.fr Mon Feb 20 20:52:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:15 -0000 Subject: [Buildroot] [git commit branch/next] package/mupdf: fix CVE-2021-4216 Message-ID: <20230220205147.D76B2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ddca0ccb90967977c2db8c966c205568cf4cb93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A Floating point exception (division-by-zero) flaw was found in Mupdf for zero width pages in muraster.c. It is fixed in Mupdf-1.20.0-rc1 upstream. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-by-zero-for-zero-width-pages-in-muraster.patch | 29 ++++++++++++++++++++++ package/mupdf/mupdf.mk | 3 +++ 2 files changed, 32 insertions(+) diff --git a/package/mupdf/0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch b/package/mupdf/0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch new file mode 100644 index 0000000000..099a3fdbab --- /dev/null +++ b/package/mupdf/0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch @@ -0,0 +1,29 @@ +From 22c47acbd52949421f8c7cb46ea1556827d0fcbf Mon Sep 17 00:00:00 2001 +From: Sebastian Rasmussen +Date: Tue, 18 Jan 2022 20:33:10 +0100 +Subject: [PATCH] Bug 704834: Fix division by zero for zero width pages in + muraster. + +[Retrieved from: +https://github.com/ArtifexSoftware/mupdf/commit/22c47acbd52949421f8c7cb46ea1556827d0fcbf] +Signed-off-by: Fabrice Fontaine +--- + source/tools/muraster.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/source/tools/muraster.c b/source/tools/muraster.c +index c2ceb62f2e..97f4ae2633 100644 +--- a/source/tools/muraster.c ++++ b/source/tools/muraster.c +@@ -1003,8 +1003,9 @@ initialise_banding(fz_context *ctx, render_details *render, int color) + + w = render->ibounds.x1 - render->ibounds.x0; + min_band_mem = (size_t)bpp * w * min_band_height; +- reps = (int)(max_band_memory / min_band_mem); +- if (reps < 1) ++ if (min_band_mem > 0) ++ reps = (int)(max_band_memory / min_band_mem); ++ if (min_band_mem == 0 || reps < 1) + reps = 1; + + /* Adjust reps to even out the work between threads */ diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 56ea7cc507..e86ba1e73f 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -28,6 +28,9 @@ MUPDF_IGNORE_CVES += CVE-2021-3407 # 0003-Bug-703791-Stay-within-hash-table-max-key-size-in-cached-color-converter.patch MUPDF_IGNORE_CVES += CVE-2021-37220 +# 0005-Bug-704834-Fix-division-by-zero-for-zero-width-pages-in-muraster.patch +MUPDF_IGNORE_CVES += CVE-2021-4216 + # The pkg-config name for gumbo-parser is `gumbo`. MUPDF_PKG_CONFIG_PACKAGES = \ freetype2 \ From yann.morin.1998 at free.fr Mon Feb 20 20:52:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:16 -0000 Subject: [Buildroot] [git commit branch/next] configs/orangepi_rk3399: remove defconfig Message-ID: <20230220205148.E2EEA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08b6ce741a0d5309368e7bb7b41951a27ebe85f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499144 Cc: Suniel Mahesh Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 - board/orangepi/orangepi-rk3399/extlinux.conf | 4 -- board/orangepi/orangepi-rk3399/genimage.cfg | 38 ------------------- board/orangepi/orangepi-rk3399/post-build.sh | 5 --- board/orangepi/orangepi-rk3399/readme.txt | 56 ---------------------------- configs/orangepi_rk3399_defconfig | 53 -------------------------- 6 files changed, 158 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index f366426125..89a72bc923 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2732,12 +2732,10 @@ F: package/powertop/ N: Suniel Mahesh F: board/firefly/ F: board/friendlyarm/nanopi-m4 -F: board/orangepi/orangepi-rk3399 F: board/pine64/rockpro64 F: board/radxa/rockpi-4 F: board/radxa/rockpi-n8 F: board/radxa/rockpi-n10 -F: configs/orangepi_rk3399_defconfig F: configs/roc_pc_rk3399_defconfig F: configs/rock_pi_4_defconfig F: configs/rock_pi_n8_defconfig diff --git a/board/orangepi/orangepi-rk3399/extlinux.conf b/board/orangepi/orangepi-rk3399/extlinux.conf deleted file mode 100644 index 157c6a715e..0000000000 --- a/board/orangepi/orangepi-rk3399/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_ORANGEPI linux - kernel /Image - devicetree /rk3399-orangepi.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg deleted file mode 100644 index a02166172f..0000000000 --- a/board/orangepi/orangepi-rk3399/genimage.cfg +++ /dev/null @@ -1,38 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-orangepi.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = F - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-rk3399/post-build.sh b/board/orangepi/orangepi-rk3399/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/board/orangepi/orangepi-rk3399/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/orangepi/orangepi-rk3399/readme.txt b/board/orangepi/orangepi-rk3399/readme.txt deleted file mode 100644 index 197e1fb448..0000000000 --- a/board/orangepi/orangepi-rk3399/readme.txt +++ /dev/null @@ -1,56 +0,0 @@ -Orangepi Rk3399 -================ -http://www.orangepi.org/Orange%20Pi%20RK3399/ - -Build: -====== - $ make orangepi_rk3399_defconfig - $ make - -Files created in output directory -================================= - -output/images - -????????? bl31.elf -????????? boot.vfat -????????? extlinux -????????? idbloader.img -????????? Image -????????? rk3399-orangepi.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device. - -Booting: -======== -Orangepi-RK3399 by default boots from emmc. For SD card boot to -happen, emmc should be empty. If emmc happens to have any bootable -image then erase emmc so that bootrom will look for a proper image in SD. - -emmc can be erased once after booted into linux as shown in below link. - -https://wiki.amarulasolutions.com/bsp/setup/rockchip/rk3399_emmc.html - -Serial console: ---------------- - -Baudrate for this board is 1500000. - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/orangepi.html diff --git a/configs/orangepi_rk3399_defconfig b/configs/orangepi_rk3399_defconfig deleted file mode 100644 index bcce35febd..0000000000 --- a/configs/orangepi_rk3399_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-orangepi" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="orangepi-rk3399" -BR2_TARGET_GENERIC_ISSUE="Welcome to ORANGEPI-RK3399" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-rk3399/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-rk3399/post-build.sh" From yann.morin.1998 at free.fr Mon Feb 20 20:52:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:16 -0000 Subject: [Buildroot] [git commit branch/next] configs/bananapi_m2_plus: remove defconfig Message-ID: <20230220205148.36D2886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97ee98d157fb244966094f23e9e2b52a33748fb8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499005 Cc: Mike Harmony Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 ---- board/sinovoip/m2-plus/boot.cmd | 7 ------- board/sinovoip/m2-plus/genimage.cfg | 34 ---------------------------------- configs/bananapi_m2_plus_defconfig | 30 ------------------------------ 4 files changed, 75 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index b77f4ff68c..9e3c919a14 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2142,10 +2142,6 @@ F: configs/licheepi_zero_defconfig N: Mike Frampton F: package/qcom-db410c-firmware/ -N: Mike Harmony -F: board/sinovoip/m2-plus/ -F: configs/bananapi_m2_plus_defconfig - N: Mikhail Boiko F: package/libfribidi/ diff --git a/board/sinovoip/m2-plus/boot.cmd b/board/sinovoip/m2-plus/boot.cmd deleted file mode 100644 index d22464a1c1..0000000000 --- a/board/sinovoip/m2-plus/boot.cmd +++ /dev/null @@ -1,7 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -mmc dev 0 -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-bananapi-m2-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/sinovoip/m2-plus/genimage.cfg b/board/sinovoip/m2-plus/genimage.cfg deleted file mode 100644 index 9311e026dd..0000000000 --- a/board/sinovoip/m2-plus/genimage.cfg +++ /dev/null @@ -1,34 +0,0 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-bananapi-m2-plus.dtb", - "boot.scr" - } - } - - size = 64M -} - -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" - } -} diff --git a/configs/bananapi_m2_plus_defconfig b/configs/bananapi_m2_plus_defconfig deleted file mode 100644 index 77a403ce81..0000000000 --- a/configs/bananapi_m2_plus_defconfig +++ /dev/null @@ -1,30 +0,0 @@ -BR2_arm=y -BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y -BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Plus" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sinovoip/m2-plus/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-bananapi-m2-plus" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Sinovoip_BPI_M2_Plus" -BR2_TARGET_UBOOT_NEEDS_DTC=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=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sinovoip/m2-plus/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From yann.morin.1998 at free.fr Mon Feb 20 20:52:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:17 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_m1: remove defconfig Message-ID: <20230220205148.71CCF86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6f323b1ae74e91c6c66b562e99d2c27dcbb5988 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. This defconfig did not even have an entry in the DEVELOPERS file. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499051 Cc: Filip Skoneczny Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- board/friendlyarm/nanopi-m1-plus/boot.cmd | 8 ----- board/friendlyarm/nanopi-m1-plus/genimage.cfg | 36 --------------------- board/friendlyarm/nanopi-m1-plus/readme.txt | 29 ----------------- configs/friendlyarm_nanopi_m1_plus_defconfig | 45 --------------------------- 4 files changed, 118 deletions(-) diff --git a/board/friendlyarm/nanopi-m1-plus/boot.cmd b/board/friendlyarm/nanopi-m1-plus/boot.cmd deleted file mode 100644 index 35a1d65d3d..0000000000 --- a/board/friendlyarm/nanopi-m1-plus/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-nanopi-m1-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-m1-plus/genimage.cfg b/board/friendlyarm/nanopi-m1-plus/genimage.cfg deleted file mode 100644 index 5257cf89c7..0000000000 --- a/board/friendlyarm/nanopi-m1-plus/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the NanoPi M1 Plus -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-m1-plus.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" - } -} diff --git a/board/friendlyarm/nanopi-m1-plus/readme.txt b/board/friendlyarm/nanopi-m1-plus/readme.txt deleted file mode 100644 index 0327dec80e..0000000000 --- a/board/friendlyarm/nanopi-m1-plus/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -NanoPi M1 Plus - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the NanoPi M1 Plus. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make friendlyarm_nanopi_m1_plus_defconfig - -Compile everything and build the SD card image: - - $ make - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/friendlyarm_nanopi_m1_plus_defconfig b/configs/friendlyarm_nanopi_m1_plus_defconfig deleted file mode 100644 index 06adc54b15..0000000000 --- a/configs/friendlyarm_nanopi_m1_plus_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1-plus" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1 Plus" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1_plus" -BR2_TARGET_UBOOT_NEEDS_DTC=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=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1-plus/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1-plus" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1-plus/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:17 -0000 Subject: [Buildroot] [git commit branch/next] package/lxc: fix systemd build Message-ID: <20230220205149.CD37286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a378178cdd93a7b8d2c83d091b61478440f331a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following systemd build failure raised since bump to version 5.0.1 in commit db19998035701d08bf1b5fd366e0b5aa9adb8e57: ../src/lxc/cgroups/cgfsng.c: In function 'unpriv_systemd_create_scope': ../src/lxc/cgroups/cgfsng.c:1234:104: error: incompatible type for argument 10 of 'sd_bus_call_method_asyncv' r = sd_bus_call_method_asyncv(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL, NULL); ^~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261449 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ll_method_async-to-replace-the-asyncv-one.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch b/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch new file mode 100644 index 0000000000..22013cb363 --- /dev/null +++ b/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch @@ -0,0 +1,47 @@ +From b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Thu, 25 Aug 2022 05:45:53 -0700 +Subject: [PATCH] use sd_bus_call_method_async to replace the asyncv one + +The sd_bus_call_method_asyncv's 10th parameter is of type +va_list and supplying NULL when invoking it causes compilation +error. Just replace it with the async one. + +Signed-off-by: Chen Qi +[Retrieved from: +https://github.com/lxc/lxc/commit/b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 4 ++-- + src/lxc/cgroups/cgfsng.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 21955a0504..f8bdcf4e83 100644 +--- a/meson.build ++++ b/meson.build +@@ -295,9 +295,9 @@ if not want_sd_bus.disabled() + has_sd_bus = false + endif + +- if not cc.has_function('sd_bus_call_method_asyncv', prefix: '#include ', dependencies: libsystemd) ++ if not cc.has_function('sd_bus_call_method_async', prefix: '#include ', dependencies: libsystemd) + if not sd_bus_optional +- error('libsystemd misses required sd_bus_call_method_asyncv function') ++ error('libsystemd misses required sd_bus_call_method_async function') + endif + + has_sd_bus = false +diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c +index 8a3615893f..d90e5385e1 100644 +--- a/src/lxc/cgroups/cgfsng.c ++++ b/src/lxc/cgroups/cgfsng.c +@@ -1232,7 +1232,7 @@ static int unpriv_systemd_create_scope(struct cgroup_ops *ops, struct lxc_conf * + if (r < 0) + return log_error(SYSTEMD_SCOPE_FAILED, "Failed to connect to user bus: %s", strerror(-r)); + +- r = sd_bus_call_method_asyncv(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL, NULL); ++ r = sd_bus_call_method_async(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL); + if (r < 0) + return log_error(SYSTEMD_SCOPE_FAILED, "Failed to subscribe to signals: %s", strerror(-r)); + From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:18 -0000 Subject: [Buildroot] [git commit branch/next] package/wavemon: fix kernel header collision Message-ID: <20230220205149.E72EF86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57a1ce00a2c9f4b4b988f41b15ad01c6abc2a99c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since bump to version 0.9.4 in commit 5cae1a0d675eca41125b6430157d3d0d78d1220c: In file included from iw_if.h:26:0, from conf.c:19: /home/buildroot/autobuild/instance-1/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/linux/if.h:71:2: error: redeclaration of enumerator 'IFF_UP' IFF_UP = 1<<0, /* sysfs */ ^ /home/buildroot/autobuild/instance-1/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/net/if.h:44:5: note: previous definition of 'IFF_UP' was here IFF_UP = 0x1, /* Interface is up. */ ^ Fixes: - http://autobuild.buildroot.org/results/cbdf3e0cf0bee8f1b076581768c24155afc320d9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-iw_if.h-don-t-include-linux-if.h.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/package/wavemon/0001-iw_if.h-don-t-include-linux-if.h.patch b/package/wavemon/0001-iw_if.h-don-t-include-linux-if.h.patch new file mode 100644 index 0000000000..95f54e4b7f --- /dev/null +++ b/package/wavemon/0001-iw_if.h-don-t-include-linux-if.h.patch @@ -0,0 +1,41 @@ +From 4ac1482bb40376e47805c3737dfed60abb1dd3b4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 22 Dec 2021 00:39:35 +0100 +Subject: [PATCH] iw_if.h: don't include linux/if.h (#109) + +Don't include linux/if.h to avoid the following build failure: + +In file included from iw_if.h:31:0, + from conf.c:19: +/home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h: At top level: +/home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:143:8: error: redefinition of 'struct ifmap' + struct ifmap { + ^ +In file included from iw_if.h:26:0, + from conf.c:19: +/home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/net/if.h:111:8: note: originally defined here + struct ifmap + ^ + +Fixes: + - http://autobuild.buildroot.org/results/a6ee162cf04b70b144b54e1ca4b7b2421071c50c + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/uoaerg/wavemon/commit/4ac1482bb40376e47805c3737dfed60abb1dd3b4] +--- + iw_if.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/iw_if.h b/iw_if.h +index 9e7fa89..6607e0b 100644 +--- a/iw_if.h ++++ b/iw_if.h +@@ -28,7 +28,6 @@ + #include + #include + #include +-#include + + /* Definitions from linux/ieee80211.h (not necessarily part of distro headers) */ + #define WLAN_CAPABILITY_ESS (1<<0) From yann.morin.1998 at free.fr Mon Feb 20 20:52:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:18 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopc_t4: remove defconfig Message-ID: <20230220205148.4EF41828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa274e01e335c75684425a682b3dd8823d284da9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499048 Cc: Suniel Mahesh Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/friendlyarm/nanopc-t4/extlinux.conf | 4 --- board/friendlyarm/nanopc-t4/genimage.cfg | 39 ----------------------- board/friendlyarm/nanopc-t4/post-build.sh | 5 --- board/friendlyarm/nanopc-t4/readme.txt | 45 -------------------------- configs/friendlyarm_nanopc_t4_defconfig | 53 ------------------------------- 6 files changed, 148 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 37d2e3854f..427fce235d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2745,14 +2745,12 @@ F: package/powertop/ N: Suniel Mahesh F: board/firefly/ -F: board/friendlyarm/nanopc-t4 F: board/friendlyarm/nanopi-m4 F: board/orangepi/orangepi-rk3399 F: board/pine64/rockpro64 F: board/radxa/rockpi-4 F: board/radxa/rockpi-n8 F: board/radxa/rockpi-n10 -F: configs/friendlyarm_nanopc_t4_defconfig F: configs/friendlyarm_nanopi_m4_defconfig F: configs/orangepi_rk3399_defconfig F: configs/roc_pc_rk3399_defconfig diff --git a/board/friendlyarm/nanopc-t4/extlinux.conf b/board/friendlyarm/nanopc-t4/extlinux.conf deleted file mode 100644 index 31c6b30d32..0000000000 --- a/board/friendlyarm/nanopc-t4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_NanoPC_T4 linux - kernel /Image - devicetree /rk3399-nanopc-t4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rootwait diff --git a/board/friendlyarm/nanopc-t4/genimage.cfg b/board/friendlyarm/nanopc-t4/genimage.cfg deleted file mode 100644 index 1787322260..0000000000 --- a/board/friendlyarm/nanopc-t4/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-nanopc-t4.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = F - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopc-t4/post-build.sh b/board/friendlyarm/nanopc-t4/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/board/friendlyarm/nanopc-t4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopc-t4/readme.txt b/board/friendlyarm/nanopc-t4/readme.txt deleted file mode 100644 index 0989c6cc1e..0000000000 --- a/board/friendlyarm/nanopc-t4/readme.txt +++ /dev/null @@ -1,45 +0,0 @@ -FriendlyARM NANOPC-T4 -===================== - -Build: - - $ make friendlyarm_nanopc_t4_defconfig - $ make - -Files created in output directory -================================= - -output/images - -????????? bl31.elf -????????? boot.vfat -????????? extlinux -????????? idbloader.img -????????? Image -????????? rk3399-nanopc-t4.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device - -Serial console --------------- - -Baudrate for this board is 1500000 - -Login: ------- -Apply power and press the PWR button for 3 sec. Enter 'root' as login user, and the prompt is ready. - -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/npc_t4.html diff --git a/configs/friendlyarm_nanopc_t4_defconfig b/configs/friendlyarm_nanopc_t4_defconfig deleted file mode 100644 index 2f7c53904e..0000000000 --- a/configs/friendlyarm_nanopc_t4_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopc-t4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopc-t4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="nanopc-t4" -BR2_TARGET_GENERIC_ISSUE="Welcome to NanoPC-T4" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopc-t4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopc-t4/post-build.sh" From yann.morin.1998 at free.fr Mon Feb 20 20:52:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:19 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_m4: remove defconfig Message-ID: <20230220205148.7D853828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e7dfe20bb8cf0cccfbd177321eff73e82c8d940 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499052 Cc: Suniel Mahesh Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 - board/friendlyarm/nanopi-m4/extlinux.conf | 4 --- board/friendlyarm/nanopi-m4/genimage.cfg | 39 ----------------------- board/friendlyarm/nanopi-m4/post-build.sh | 5 --- board/friendlyarm/nanopi-m4/readme.txt | 45 -------------------------- configs/friendlyarm_nanopi_m4_defconfig | 53 ------------------------------- 6 files changed, 147 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 30582cb648..eca6cccfe8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2749,7 +2749,6 @@ F: board/pine64/rockpro64 F: board/radxa/rockpi-4 F: board/radxa/rockpi-n8 F: board/radxa/rockpi-n10 -F: configs/friendlyarm_nanopi_m4_defconfig F: configs/orangepi_rk3399_defconfig F: configs/roc_pc_rk3399_defconfig F: configs/rock_pi_4_defconfig diff --git a/board/friendlyarm/nanopi-m4/extlinux.conf b/board/friendlyarm/nanopi-m4/extlinux.conf deleted file mode 100644 index fb24f09eb1..0000000000 --- a/board/friendlyarm/nanopi-m4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_NANOPI_M4 linux - kernel /Image - devicetree /rk3399-nanopi-m4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/board/friendlyarm/nanopi-m4/genimage.cfg b/board/friendlyarm/nanopi-m4/genimage.cfg deleted file mode 100644 index 3e6818eab9..0000000000 --- a/board/friendlyarm/nanopi-m4/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-nanopi-m4.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = F - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-m4/post-build.sh b/board/friendlyarm/nanopi-m4/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/board/friendlyarm/nanopi-m4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-m4/readme.txt b/board/friendlyarm/nanopi-m4/readme.txt deleted file mode 100644 index 0553bf8377..0000000000 --- a/board/friendlyarm/nanopi-m4/readme.txt +++ /dev/null @@ -1,45 +0,0 @@ -FriendlyARM NANOPI-M4 -===================== - -Build: - - $ make friendlyarm_nanopi_m4_defconfig - $ make - -Files created in output directory -================================= - -output/images - -????????? bl31.elf -????????? boot.vfat -????????? extlinux -????????? idbloader.img -????????? Image -????????? rk3399-nanopi-m4.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device - -Serial console --------------- - -Baudrate for this board is 1500000 - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/nanopi_m4.html diff --git a/configs/friendlyarm_nanopi_m4_defconfig b/configs/friendlyarm_nanopi_m4_defconfig deleted file mode 100644 index 9c3f58f200..0000000000 --- a/configs/friendlyarm_nanopi_m4_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-m4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopi-m4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="nanopi-m4" -BR2_TARGET_GENERIC_ISSUE="Welcome to NANOPI-M4" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-m4/post-build.sh" From yann.morin.1998 at free.fr Mon Feb 20 20:52:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:19 -0000 Subject: [Buildroot] [git commit branch/next] package/efivar: fix build with musl libc Message-ID: <20230220205150.0506B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf14df13358ddd1b06709924a84f87dfa711cceb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Backport upstream patch to fix build with musl libc. This patch is only a requirement since efivar 38 and was applied upstream shortly after the 38 version tag. Fixes: http://autobuild.buildroot.net/results/c49d894b109d68e2624074eab8b939fefa3b42ef/ Signed-off-by: Erico Nunes Signed-off-by: Yann E. MORIN --- .../0004-efisecdb-fix-build-with-musl-libc.patch | 185 +++++++++++++++++++++ 1 file changed, 185 insertions(+) diff --git a/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch b/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..9815a9d0cf --- /dev/null +++ b/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch @@ -0,0 +1,185 @@ +From cece3ffd5be2f8641eb694513f2b73e5eb97ffd3 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Fri, 28 Jan 2022 12:13:30 +0100 +Subject: [PATCH] efisecdb: fix build with musl libc + +Refactor code to use POSIX atexit(3) instead of the GNU specific +on_exit(3). + +Resolves: #197 +Resolves: #202 +Signed-off-by: Natanael Copa +[Erico: backport from upstream commit +cece3ffd5be2f8641eb694513f2b73e5eb97ffd3] +Signed-off-by: Erico Nunes +--- + src/compiler.h | 2 -- + src/efisecdb.c | 68 +++++++++++++++++++------------------------------- + 2 files changed, 26 insertions(+), 44 deletions(-) + +diff --git a/src/compiler.h b/src/compiler.h +index e2f18f0..d95fb01 100644 +--- a/src/compiler.h ++++ b/src/compiler.h +@@ -7,8 +7,6 @@ + #ifndef COMPILER_H_ + #define COMPILER_H_ + +-#include +- + /* GCC version checking borrowed from glibc. */ + #if defined(__GNUC__) && defined(__GNUC_MINOR__) + # define GNUC_PREREQ(maj,min) \ +diff --git a/src/efisecdb.c b/src/efisecdb.c +index f882373..6bd5ad9 100644 +--- a/src/efisecdb.c ++++ b/src/efisecdb.c +@@ -25,6 +25,10 @@ + extern char *optarg; + extern int optind, opterr, optopt; + ++static efi_secdb_t *secdb = NULL; ++static list_t infiles; ++static list_t actions; ++ + struct hash_param { + char *name; + efi_secdb_type_t algorithm; +@@ -187,12 +191,11 @@ add_action(list_t *list, action_type_t action_type, const efi_guid_t *owner, + } + + static void +-free_actions(int status UNUSED, void *actionsp) ++free_actions(void) + { +- list_t *actions = (list_t *)actionsp; + list_t *pos, *tmp; + +- for_each_action_safe(pos, tmp, actions) { ++ for_each_action_safe(pos, tmp, &actions) { + action_t *action = list_entry(pos, action_t, list); + + list_del(&action->list); +@@ -202,12 +205,11 @@ free_actions(int status UNUSED, void *actionsp) + } + + static void +-free_infiles(int status UNUSED, void *infilesp) ++free_infiles(void) + { +- list_t *infiles = (list_t *)infilesp; + list_t *pos, *tmp; + +- for_each_ptr_safe(pos, tmp, infiles) { ++ for_each_ptr_safe(pos, tmp, &infiles) { + ptrlist_t *entry = list_entry(pos, ptrlist_t, list); + + list_del(&entry->list); +@@ -216,27 +218,12 @@ free_infiles(int status UNUSED, void *infilesp) + } + + static void +-maybe_free_secdb(int status UNUSED, void *voidp) ++maybe_free_secdb(void) + { +- efi_secdb_t **secdbp = (efi_secdb_t **)voidp; +- +- if (secdbp == NULL || *secdbp == NULL) ++ if (secdb == NULL) + return; + +- efi_secdb_free(*secdbp); +-} +- +-static void +-maybe_do_unlink(int status, void *filep) +-{ +- char **file = (char **)filep; +- +- if (status == 0) +- return; +- if (file == NULL || *file == NULL) +- return; +- +- unlink(*file); ++ efi_secdb_free(secdb); + } + + static void +@@ -323,15 +310,6 @@ parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb, + return status; + } + +-/* +- * These need to be static globals so that they're not on main's stack when +- * on_exit() fires. +- */ +-static efi_secdb_t *secdb = NULL; +-static list_t infiles; +-static list_t actions; +-static char *outfile = NULL; +- + int + main(int argc, char *argv[]) + { +@@ -351,6 +329,7 @@ main(int argc, char *argv[]) + bool do_sort_data = false; + bool sort_descending = false; + int status = 0; ++ char *outfile = NULL; + + const char sopts[] = ":aAc:dfg:h:i:Lo:rs:t:v?"; + const struct option lopts[] = { +@@ -376,10 +355,9 @@ main(int argc, char *argv[]) + INIT_LIST_HEAD(&infiles); + INIT_LIST_HEAD(&actions); + +- on_exit(free_actions, &actions); +- on_exit(free_infiles, &infiles); +- on_exit(maybe_free_secdb, &secdb); +- on_exit(maybe_do_unlink, &outfile); ++ atexit(free_actions); ++ atexit(free_infiles); ++ atexit(maybe_free_secdb); + + /* + * parse the command line. +@@ -587,24 +565,30 @@ sort_err: + outfd = open(outfile, flags, 0600); + if (outfd < 0) { + char *tmpoutfile = outfile; +- if (errno == EEXIST) +- outfile = NULL; ++ if (errno != EEXIST) ++ unlink(outfile); + err(1, "could not open \"%s\"", tmpoutfile); + } + + rc = ftruncate(outfd, 0); +- if (rc < 0) ++ if (rc < 0) { ++ unlink(outfile); + err(1, "could not truncate output file \"%s\"", outfile); ++ } + + void *output; + size_t size = 0; + rc = efi_secdb_realize(secdb, &output, &size); +- if (rc < 0) ++ if (rc < 0) { ++ unlink(outfile); + secdb_err(1, "could not realize signature list"); ++ } + + rc = write(outfd, output, size); +- if (rc < 0) ++ if (rc < 0) { ++ unlink(outfile); + err(1, "could not write signature list"); ++ } + + close(outfd); + xfree(output); +-- +2.37.3 + From yann.morin.1998 at free.fr Mon Feb 20 20:52:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:20 -0000 Subject: [Buildroot] [git commit branch/next] configs/arm_juno: remove defconfig Message-ID: <20230220205148.14781828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=347c1087388d7782e6865f112f195e6780d473a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234498972 Cc: Gustavo Pimentel Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 - board/arm/juno/linux-juno-defconfig | 169 ------------------------------------ board/arm/juno/readme.txt | 134 ---------------------------- configs/arm_juno_defconfig | 23 ----- 4 files changed, 330 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index b099ce2f62..94d1338880 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1221,10 +1221,6 @@ F: support/testing/tests/package/test_python_scipy.py N: Gustavo Heinz F: package/python-m2crypto/ -N: Gustavo Pimentel -F: configs/arm_juno_defconfig -F: board/arm/juno/ - N: Gwenhael Goavec-Merou F: board/terasic/de10nano_cyclone5/ F: configs/terasic_de10nano_cyclone5_defconfig diff --git a/board/arm/juno/linux-juno-defconfig b/board/arm/juno/linux-juno-defconfig deleted file mode 100644 index 64598d21a1..0000000000 --- a/board/arm/juno/linux-juno-defconfig +++ /dev/null @@ -1,169 +0,0 @@ -CONFIG_SMP=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_FHANDLE=y -CONFIG_AUDIT=y -CONFIG_NO_HZ_IDLE=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -CONFIG_MEMCG_KMEM=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_SCHED_AUTOGROUP=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_PROFILING=y -CONFIG_JUMP_LABEL=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_ARCH_VEXPRESS=y -CONFIG_PCI=y -CONFIG_PCI_MSI=y -CONFIG_PCI_HOST_GENERIC=y -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=y -CONFIG_HOTPLUG_PCI=y -CONFIG_NR_CPUS=6 -CONFIG_PREEMPT=y -CONFIG_KSM=y -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_CMA=y -CONFIG_CMDLINE="console=ttyAMA0" -CONFIG_COMPAT=y -CONFIG_CPU_IDLE=y -CONFIG_ARM_CPUIDLE=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_INTERACTIVE=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=y -CONFIG_ARM_DT_BL_CPUFREQ=y -CONFIG_ARM_SCPI_CPUFREQ=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_BPF_JIT=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_SD=y -CONFIG_ATA=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_AHCI_PLATFORM=y -CONFIG_AHCI_XGENE=y -CONFIG_PATA_PLATFORM=y -CONFIG_PATA_OF_PLATFORM=y -CONFIG_NETDEVICES=y -CONFIG_TUN=y -CONFIG_SKY2=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -CONFIG_INPUT_EVDEV=y -CONFIG_SERIO_AMBAKMI=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SERIAL_XILINX_PS_UART=y -CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_DESIGNWARE_PLATFORM=y -CONFIG_I2C_SLAVE=y -CONFIG_SPI=y -CONFIG_SPI_PL022=y -CONFIG_PTP_1588_CLOCK=m -CONFIG_GPIO_PL061=y -CONFIG_GPIO_XGENE=y -CONFIG_POWER_RESET_XGENE=y -CONFIG_POWER_RESET_SYSCON=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_VEXPRESS=m -CONFIG_DRM=y -CONFIG_DRM_I2C_NXP_TDA998X=y -CONFIG_DRM_ARM=y -CONFIG_DRM_HDLCD=y -CONFIG_DRM_VIRTUAL_HDLCD=y -CONFIG_FB_ARMCLCD=y -CONFIG_LOGO=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PLATFORM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_ISP1760=y -CONFIG_NOP_USB_XCEIV=y -CONFIG_USB_ULPI=y -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SPI=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_EFI=y -CONFIG_RTC_DRV_PL030=y -CONFIG_RTC_DRV_PL031=y -CONFIG_DMADEVICES=y -CONFIG_PL330_DMA=y -CONFIG_COMMON_CLK_SCPI=y -CONFIG_ARM_TIMER_SP804=y -CONFIG_MAILBOX=y -CONFIG_ARM_MHU=y -CONFIG_PHY_XGENE=y -CONFIG_ARM_SCPI_PROTOCOL=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y -CONFIG_QUOTA=y -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=y -CONFIG_CUSE=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_HUGETLBFS=y -CONFIG_EFIVAR_FS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_FS=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_SECURITY=y -CONFIG_CRYPTO_ANSI_CPRNG=y -CONFIG_ARM64_CRYPTO=y -CONFIG_CRYPTO_SHA1_ARM64_CE=y -CONFIG_CRYPTO_SHA2_ARM64_CE=y -CONFIG_CRYPTO_GHASH_ARM64_CE=y -CONFIG_CRYPTO_AES_ARM64_CE_CCM=y -CONFIG_CRYPTO_AES_ARM64_CE_BLK=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SOC=y -CONFIG_SND_SIMPLE_CARD=y -CONFIG_SND_DESIGNWARE_I2S=y -CONFIG_CMA=y -CONFIG_CMA_SIZE_MBYTES=64 diff --git a/board/arm/juno/readme.txt b/board/arm/juno/readme.txt deleted file mode 100644 index b292d9636d..0000000000 --- a/board/arm/juno/readme.txt +++ /dev/null @@ -1,134 +0,0 @@ -ARM Juno r1/r0 - -Intro -===== - -These instructions apply to all models of the ARM Juno: - - Juno r0 (does not support PCIe) - - Juno r1 (supports PCIe) - - Juno r2 (Big Cluster with A72) - -Buildroot will generate the kernel image, device tree blob, bootloader binaries -and a minimal root filesystem. - -How to build it -=============== - -Configure Buildroot -------------------- - -Configuring Buildroot is pretty simple, just execute: - - $ make arm_juno_defconfig - -Build the rootfs, kernel and DTB --------------------------------- - -Note: you will need to have access to the network, since Buildroot will -download the packages' sources. - -You may now build your rootfs with: - - $ make - -(This may take a while) - -Result of the build -------------------- - -After building, you should obtain this tree: - - output/images/ - +-- rootfs.tar - +-- juno.dtb (if Juno r0 is used) - +-- juno-r1.dtb (if Juno r1 is used) - +-- juno-r2.dtb (if Juno r2 is used) - +-- Image - +-- bl1.bin - +-- bl2.bin - +-- bl2u.bin - +-- bl31.bin - +-- fip.bin - +-- scp-fw.bin - +-- u-boot.bin - -Preparing your rootfs -====================== - -Format your pen drive as a ext3 filesystem by executing: - - $ mkfs.ext3 /dev/ - -Preparing your rootfs -====================== - -Format your pen drive as a ext3 filesystem by executing: - - $ mkfs.ext3 /dev/ - -Installing your rootfs -====================== - -After mounting the pen drive please execute the following: - - $ sudo tar -xvf output/images/rootfs.tar -C - -When completed make sure to unmount the device: - - $ umount - -Insert the pen drive in one of the ARM Juno' USB type A connectors. - -Configure *.dtb in the boot configuration for Juno r0 -===================================================== - -SITE1/HBI0262B/images.txt -..... -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x00C00000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify Image name to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point -...... - -Configure *.dtb in the boot configuration for Juno r1 -===================================================== - -SITE1/HBI0262C/images.txt -...... -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x00C00000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno-r1.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify target filename to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point -...... - -Configure *.dtb in the boot configuration for Juno r2 -===================================================== - -SITE1/HBI0262D/images.txt -...... -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x02000000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno-r2.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify target filename to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point -...... - -Installing kernel image and DTB -=============================== - -1. Connect to the ARM Juno UART0 and execute USB_ON in the terminal -2. Connect a USB cable between your PC and ARM Juno USB type B connector - A mass storage device should appear in your desktop. -3. Open the software/ folder -4. Copy the 'Image' file to software/ -5. Copy the 'juno-r1.dtb' (r1), 'juno.dtb' (r0) or juno-r2.dtb (r2) file to software/ -6. Copy the bootloader binaries (bl1.bin and fip.bin) to software/ -7. Press the red button in the front pannel of ARM Juno - -At this time, the board will erase the Flash entry for each new item and -replace it with the lastest ones. diff --git a/configs/arm_juno_defconfig b/configs/arm_juno_defconfig deleted file mode 100644 index 5832986779..0000000000 --- a/configs/arm_juno_defconfig +++ /dev/null @@ -1,23 +0,0 @@ -BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y -BR2_TARGET_GENERIC_HOSTNAME="juno-buildroot" -BR2_TARGET_GENERIC_ISSUE="Welcome to SNPS Juno by Buildroot" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/arm/juno/linux-juno-defconfig" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/juno arm/juno-r1 arm/juno-r2" -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.4" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="vexpress_aemv8a_juno" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.03" -BR2_TARGET_VEXPRESS_FIRMWARE=y From yann.morin.1998 at free.fr Mon Feb 20 20:52:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:20 -0000 Subject: [Buildroot] [git commit branch/next] package/mdio-tools: needs fork Message-ID: <20230220205150.490E386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0d1c6288a9adfb54dc9d98b8c4f5531eb4c9cba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since the addition of the package in commit 8fdf8731e727dc5c2d4080d7a56e1d71dc25e533: mdio.c: In function 'mdio_modprobe': mdio.c:738:15: error: implicit declaration of function 'fork' [-Werror=implicit-function-declaration] 738 | pid = fork(); | ^~~~ Fixes: - http://autobuild.buildroot.org/results/c53aaeaa34dd4d6d9a57da196687beecaeed9fe2 Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/mdio-tools/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/mdio-tools/Config.in b/package/mdio-tools/Config.in index f24c1a6974..237f4454cc 100644 --- a/package/mdio-tools/Config.in +++ b/package/mdio-tools/Config.in @@ -1,12 +1,15 @@ comment "mdio-tools needs a Linux kernel to be built" + depends on BR2_USE_MMU depends on !BR2_LINUX_KERNEL comment "mdio-tools needs a toolchain w/ headers >= 5.1" + depends on BR2_USE_MMU depends on BR2_LINUX_KERNEL depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 config BR2_PACKAGE_MDIO_TOOLS bool "mdio-tools" + depends on BR2_USE_MMU # fork() depends on BR2_LINUX_KERNEL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 select BR2_PACKAGE_LIBMNL From yann.morin.1998 at free.fr Mon Feb 20 20:52:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:21 -0000 Subject: [Buildroot] [git commit branch/next] configs/orangepi_plus: remove defconfig Message-ID: <20230220205148.CA9ED828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c4828568d6c5e4f1efb5b7d83ec6254d23ccdfa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. This defconfig did not even have an entry in the DEVELOPERS file. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499140 Cc: Shyam Saini Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- board/orangepi/orangepi-plus/boot.cmd | 8 ------ board/orangepi/orangepi-plus/genimage.cfg | 36 ------------------------- board/orangepi/orangepi-plus/readme.txt | 29 -------------------- configs/orangepi_plus_defconfig | 44 ------------------------------- 4 files changed, 117 deletions(-) diff --git a/board/orangepi/orangepi-plus/boot.cmd b/board/orangepi/orangepi-plus/boot.cmd deleted file mode 100644 index 1a378cb918..0000000000 --- a/board/orangepi/orangepi-plus/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-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-plus/genimage.cfg b/board/orangepi/orangepi-plus/genimage.cfg deleted file mode 100644 index 1ca30258dc..0000000000 --- a/board/orangepi/orangepi-plus/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the OrangePi Plus\Plus2 -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-plus.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" - } -} diff --git a/board/orangepi/orangepi-plus/readme.txt b/board/orangepi/orangepi-plus/readme.txt deleted file mode 100644 index 7f871bcfab..0000000000 --- a/board/orangepi/orangepi-plus/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -OrangePi Plus/Plus2 - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the OrangePi Plus/Plus2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make orangepi_plus_defconfig - -Compile everything and build the SD card image: - - $ make - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig deleted file mode 100644 index 11d7486486..0000000000 --- a/configs/orangepi_plus_defconfig +++ /dev/null @@ -1,44 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Plus" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Plus" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_plus" -BR2_TARGET_UBOOT_NEEDS_DTC=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=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-plus/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-plus" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-plus/genimage.cfg" - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:21 -0000 Subject: [Buildroot] [git commit branch/next] boot/arm-trusted-firmware: fix SSP disable in v2.2 Message-ID: <20230220205150.533BB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e330ff030d11193ce716822c932c2a6b0f109c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next ATF version 2.2 and older does not disable SSP when ENABLE_STACK_PROTECTOR is not set. This is because the compiler enables SSP by default, and ATF does not pass -fno-stack-protector to the compiler. Upstream commit 7af195e29a42 ("Disable stack protection explicitly") fixed the issue for v2.3 and newer. Add -fno-stack-protector in CFLAGS when BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP is not set to fix older ATF versions. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3301821171 Cc: Dick Olsson Cc: Sergey Matyukevich Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 34d7d80243..1164c81410 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -67,11 +67,17 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ ENABLE_STACK_PROTECTOR=$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL)) +else +ARM_TRUSTED_FIRMWARE_CFLAGS += -fno-stack-protector +endif + +ifeq ($(BR2_PIC_PIE),y) +ARM_TRUSTED_FIRMWARE_CFLAGS += -fno-PIE endif ARM_TRUSTED_FIRMWARE_MAKE_ENV += \ $(TARGET_MAKE_ENV) \ - $(if $(BR2_PIC_PIE),CFLAGS="-fno-PIE") + CFLAGS="$(ARM_TRUSTED_FIRMWARE_CFLAGS)" ifeq ($(BR2_ARM_CPU_ARMV7A),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARM_ARCH_MAJOR=7 From yann.morin.1998 at free.fr Mon Feb 20 20:52:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:21 -0000 Subject: [Buildroot] [git commit branch/next] package/qoriq-rcw: update codeaurora URLs to github Message-ID: <20230220205220.7EE028648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a019e5e460f0d85b0b44163ba80be7cd6a53738a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Signed-off-by: Julien Olivain Reviewed-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/qoriq-rcw/Config.in.host | 2 +- package/qoriq-rcw/qoriq-rcw.hash | 2 +- package/qoriq-rcw/qoriq-rcw.mk | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/qoriq-rcw/Config.in.host b/package/qoriq-rcw/Config.in.host index 08fc83acd0..58c16d495b 100644 --- a/package/qoriq-rcw/Config.in.host +++ b/package/qoriq-rcw/Config.in.host @@ -9,7 +9,7 @@ config BR2_PACKAGE_HOST_QORIQ_RCW $(HOST_DIR)/share/rcw. Either a SDK or post scripts can then use this toolset and examples. - https://source.codeaurora.org/external/qoriq/qoriq-components/rcw/ + https://github.com/nxp-qoriq/rcw if BR2_PACKAGE_HOST_QORIQ_RCW diff --git a/package/qoriq-rcw/qoriq-rcw.hash b/package/qoriq-rcw/qoriq-rcw.hash index f34c771d11..2a887d57d4 100644 --- a/package/qoriq-rcw/qoriq-rcw.hash +++ b/package/qoriq-rcw/qoriq-rcw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 caa6802f2ba5ea92fd27e7c977749010a91c9091fcc3fe626f96d9cacfba1f0a qoriq-rcw-LSDK-21.08-br1.tar.gz +sha256 f199c10e50bd18d7bed0d60f5b68194240dea4f1aa164cec98332723727a4796 qoriq-rcw-LSDK-21.08.tar.gz sha256 68f4b15ecc085729419bc60ca6eeadca5af0237bbfec791e8a79da9c943d42e9 LICENSE diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index 0501c36f46..8b1ceacfce 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -5,8 +5,7 @@ ################################################################################ QORIQ_RCW_VERSION = LSDK-21.08 -QORIQ_RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw -QORIQ_RCW_SITE_METHOD = git +QORIQ_RCW_SITE = $(call github,nxp-qoriq,rcw,$(QORIQ_RCW_VERSION)) QORIQ_RCW_LICENSE = BSD-3-Clause QORIQ_RCW_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:22 -0000 Subject: [Buildroot] [git commit branch/next] configs/rock_pi_n10: remove defconfig Message-ID: <20230220205149.A991A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66653be5b85f6cbfceac51d95180f785f921b681 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3259671399 Cc: Suniel Mahesh Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 -- board/radxa/rockpi-n10/extlinux.conf | 4 --- board/radxa/rockpi-n10/genimage.cfg | 39 ----------------------- board/radxa/rockpi-n10/post-build.sh | 5 --- board/radxa/rockpi-n10/readme.txt | 61 ------------------------------------ configs/rock_pi_n10_defconfig | 55 -------------------------------- 6 files changed, 166 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ae20554f91..bd76ddca28 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2731,9 +2731,7 @@ N: Suniel Mahesh F: board/friendlyarm/nanopi-m4 F: board/pine64/rockpro64 F: board/radxa/rockpi-n8 -F: board/radxa/rockpi-n10 F: configs/rock_pi_n8_defconfig -F: configs/rock_pi_n10_defconfig F: configs/rockpro64_defconfig F: package/arm-gnu-toolchain/ diff --git a/board/radxa/rockpi-n10/extlinux.conf b/board/radxa/rockpi-n10/extlinux.conf deleted file mode 100644 index b6a4c97cd9..0000000000 --- a/board/radxa/rockpi-n10/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_ROCK_PI_N10 linux - kernel /Image - devicetree /rk3399pro-rock-pi-n10.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p4 rw rootwait diff --git a/board/radxa/rockpi-n10/genimage.cfg b/board/radxa/rockpi-n10/genimage.cfg deleted file mode 100644 index fe6fa3f8f9..0000000000 --- a/board/radxa/rockpi-n10/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399pro-rock-pi-n10.dtb", - "extlinux" - } - } - - size = 112M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = F - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/board/radxa/rockpi-n10/post-build.sh b/board/radxa/rockpi-n10/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/board/radxa/rockpi-n10/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/radxa/rockpi-n10/readme.txt b/board/radxa/rockpi-n10/readme.txt deleted file mode 100644 index 49decbb3d9..0000000000 --- a/board/radxa/rockpi-n10/readme.txt +++ /dev/null @@ -1,61 +0,0 @@ -RADXA ROCKPI-N10 -================ -https://wiki.radxa.com/RockpiN10 - -Build: -====== - $ make rock_pi_n10_defconfig - $ make - -Files created in output directory -================================= - -output/images -. -????????? bl31.elf -????????? boot.vfat -????????? extlinux -????????? idbloader.img -????????? Image -????????? rk3399pro-rock-pi-n10.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device. - -Booting: -======== - -Serial console: ---------------- -RockPi-N10 has a 40-pin GPIO header. The pin layout is as follows: - -pin 6: gnd -pin 8: tx -pin 10: rx - -Baudrate for this board is 1500000. - -The boot order on rockpi-n10 is emmc, sd. If emmc contains a valid Image, the board -always boots from emmc. To boot from SD, erase emmc as per the guide: - -https://wiki.amarulasolutions.com/bsp/setup/rockchip/rk3399_emmc.html - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -wiki link: ----------- -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399pro/rock-pi-n10.html diff --git a/configs/rock_pi_n10_defconfig b/configs/rock_pi_n10_defconfig deleted file mode 100644 index c622839c89..0000000000 --- a/configs/rock_pi_n10_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/amarula/u-boot-amarula.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="cf2747360fdd1eb0d51dd01a984c7c62c7f714fe" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock-pi-n10-rk3399pro" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399pro-rock-pi-n10" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="rockpi-n10" -BR2_TARGET_GENERIC_ISSUE="Welcome to ROCKPI-N10" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="160M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rockpi-n10/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rockpi-n10/post-build.sh" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:22 -0000 Subject: [Buildroot] [git commit branch/next] package/gptfdisk: fix popt static build Message-ID: <20230220205149.14BE08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a38682dd54dde976836c37dcc30ec24baa474690 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static build failure with popt and iconv raised since bump to version 1.0.9 in commit 69015ce94ac3ffe7f349ec37868eea0d0ffec90e and https://sourceforge.net/p/gptfdisk/code/ci/122b58ad82f1a144226d262c87241ee035ed1aff (which added an unified Makefile): /home/autobuild/autobuild/instance-0/output-1/host/bin/mips64el-buildroot-linux-uclibc-g++ crc32.o support.o guid.o gptpart.o mbrpart.o basicmbr.o mbr.o gpt.o bsd.o parttypes.o attributes.o diskio.o diskio-unix.o sgdisk.o gptcl.o -static -liconv -lpopt -o sgdisk /home/autobuild/autobuild/instance-0/output-1/host/lib/gcc/mips64el-buildroot-linux-uclibc/11.3.0/../../../../mips64el-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/lib64/../lib64/libpopt.a(poptint.o): in function `strdup_locale_from_utf8': poptint.c:(.text+0x113c): undefined reference to `libiconv_open' As can be seen above, this build failure is raised because -liconv is added before -lpopt so use pkgconfig and SGDISK_LDLIBS The addition of -liconv in LDLIBS could probably be removed in a follow-up patch for next branch Fixes: - http://autobuild.buildroot.org/results/c9f2c9e737c2dd1cd4c1a08a5e8a48165179282d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gptfdisk/gptfdisk.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index 0df9cda08f..f3fc930202 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -15,7 +15,8 @@ GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_CGDISK) += cgdisk GPTFDISK_DEPENDENCIES += util-linux ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y) -GPTFDISK_DEPENDENCIES += popt +GPTFDISK_DEPENDENCIES += host-pkgconf popt +GPTFDISK_SGDISK_LDLIBS += `$(PKG_CONFIG_HOST_BINARY) --libs popt` endif ifeq ($(BR2_PACKAGE_GPTFDISK_CGDISK),y) GPTFDISK_DEPENDENCIES += ncurses @@ -32,7 +33,8 @@ endif define GPTFDISK_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - LDLIBS='$(GPTFDISK_LDLIBS)' $(GPTFDISK_TARGETS_y) + LDLIBS='$(GPTFDISK_LDLIBS)' \ + SGDISK_LDLIBS='$(GPTFDISK_SGDISK_LDLIBS)' $(GPTFDISK_TARGETS_y) endef define GPTFDISK_INSTALL_TARGET_CMDS From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:23 -0000 Subject: [Buildroot] [git commit branch/next] package/dbus-broker: audit support needs libcap-ng Message-ID: <20230220205150.92F3886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f0e82c4ef8bc02bf8b2ada7bf5daf940d4e4cac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since v14 in 2018, audit support has needed libcap-ng. Fixes: http://autobuild.buildroot.org/results/43abdb85cc2f386d427cec1cfa876e20e3509cb8/ Signed-off-by: Yann E. MORIN Cc: Norbert Lange Signed-off-by: Thomas Petazzoni --- package/dbus-broker/Config.in | 1 + package/dbus-broker/dbus-broker.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/dbus-broker/Config.in b/package/dbus-broker/Config.in index c7206232da..aa6584c392 100644 --- a/package/dbus-broker/Config.in +++ b/package/dbus-broker/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_DBUS_BROKER depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 depends on BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBCAP_NG if BR2_PACKAGE_AUDIT help Linux D-Bus Message Broker. diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index c0a58de9ad..e82b79220d 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -28,7 +28,8 @@ DBUS_BROKER_DEPENDENCIES = expat systemd DBUS_BROKER_CONF_OPTS = -Dlauncher=true ifeq ($(BR2_PACKAGE_AUDIT),y) -DBUS_BROKER_DEPENDENCIES += audit +# libcap-ng selected from Config.in +DBUS_BROKER_DEPENDENCIES += audit libcap-ng DBUS_BROKER_CONF_OPTS += -Daudit=true else DBUS_BROKER_CONF_OPTS += -Daudit=false From yann.morin.1998 at free.fr Mon Feb 20 20:52:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:23 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_neo4: remove defconfig Message-ID: <20230220205148.9573186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f7a517f5c156666cef58dec429bfffd4ae41e81 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499054 Cc: Marek Belisko Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/friendlyarm/nanopi-neo4/extlinux.conf | 4 --- board/friendlyarm/nanopi-neo4/genimage.cfg | 22 ------------ board/friendlyarm/nanopi-neo4/post-build.sh | 5 --- board/friendlyarm/nanopi-neo4/readme.txt | 53 --------------------------- configs/friendlyarm_nanopi_neo4_defconfig | 55 ----------------------------- 6 files changed, 141 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 7442d3a6ee..27482d095a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1896,8 +1896,6 @@ F: utils/config F: utils/diffconfig N: Marek Belisko -F: board/friendlyarm/nanopi-neo4/ -F: configs/friendlyarm_nanopi_neo4_defconfig F: package/libatasmart/ F: package/polkit/ F: package/sg3_utils/ diff --git a/board/friendlyarm/nanopi-neo4/extlinux.conf b/board/friendlyarm/nanopi-neo4/extlinux.conf deleted file mode 100644 index 91eef67fb9..0000000000 --- a/board/friendlyarm/nanopi-neo4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label NanoPi Neo4 linux - kernel /boot/Image - devicetree /boot/rk3399-nanopi-neo4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p1 rootwait diff --git a/board/friendlyarm/nanopi-neo4/genimage.cfg b/board/friendlyarm/nanopi-neo4/genimage.cfg deleted file mode 100644 index 966c869273..0000000000 --- a/board/friendlyarm/nanopi-neo4/genimage.cfg +++ /dev/null @@ -1,22 +0,0 @@ -image sdcard.img { - hdimage { - } - - partition u-boot-tpl-spl-dtb { - in-partition-table = "no" - image = "idbloader.img" - offset = 32K - } - - partition u-boot-dtb { - in-partition-table = "no" - image = "u-boot.itb" - offset = 8M - size = 30M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-neo4/post-build.sh b/board/friendlyarm/nanopi-neo4/post-build.sh deleted file mode 100755 index 1f5ff6a611..0000000000 --- a/board/friendlyarm/nanopi-neo4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-neo4/readme.txt b/board/friendlyarm/nanopi-neo4/readme.txt deleted file mode 100644 index 7c04a52806..0000000000 --- a/board/friendlyarm/nanopi-neo4/readme.txt +++ /dev/null @@ -1,53 +0,0 @@ -Intro -===== - -NanoPi Neo4 is a RK3399 SoC based ARM64 board. - - -Official wiki: http://wiki.friendlyarm.com/wiki/index.php/NanoPi_NEO4 -Mainline wiki: https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/neo4.html - -Build -===== - -Run NanoPi Neo4 configuration - - $ make friendlyarm_nanopi_neo4_defconfig - -To build, run make comamnd. - - $ make - -Files created in output directory -================================= - -output/images - -????????? bl31.bin -????????? bl31.elf -????????? Image -????????? rk3399-nanopi-neo4.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb -????????? u-boot-spl-dtb.bin -????????? u-boot-tpl-dtb.bin -????????? u-boot-tpl-dtb.img -????????? u-boot-tpl-spl-dtb.img - -Creating bootable SD card: -========================= - -Simply invoke (as root) - - # dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device - -Serial console --------------- - -Baudrate for this board is 1500000 diff --git a/configs/friendlyarm_nanopi_neo4_defconfig b/configs/friendlyarm_nanopi_neo4_defconfig deleted file mode 100644 index a11872ef2a..0000000000 --- a/configs/friendlyarm_nanopi_neo4_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-neo4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.18" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopi-neo4" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="NanoPi Neo4" -BR2_TARGET_GENERIC_ISSUE="Welcome to NanoPi Neo4!" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="70M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo4/post-build.sh" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:24 -0000 Subject: [Buildroot] [git commit branch/next] package/boost: backport development branch changes to fix MIPS64 build failure Message-ID: <20230220205149.07AAD86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea38acd17d88b9eaf853313398c772b94338ad47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Backport from Boost/intrusive development branch. Fixes issue introduced with version 1.80. Issue: https://github.com/boostorg/intrusive/issues/79 Fixes: http://autobuild.buildroot.net/results/6cb/6cbc0672f3c5046405793d8cdc8f961d2ffb1d3e Signed-off-by: Andreas Ziegler Signed-off-by: Thomas Petazzoni --- .../boost/0001-Improve-modfunc-performance.patch | 551 +++++++++++++++++++++ 1 file changed, 551 insertions(+) diff --git a/package/boost/0001-Improve-modfunc-performance.patch b/package/boost/0001-Improve-modfunc-performance.patch new file mode 100644 index 0000000000..9cf5d8387e --- /dev/null +++ b/package/boost/0001-Improve-modfunc-performance.patch @@ -0,0 +1,551 @@ +From 825aedad557b7e3bb27614335b6ced16887103de Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= +Date: Mon, 7 Nov 2022 00:16:44 +0100 +Subject: [PATCH 1/1] Improve "modfunc" performance Fixes #79 + ("boost/intrusive/hashtable.hpp: build failure (undeclared indentifier)") + +Backport from Boost development branch to fix issues with some architectures +(64-bit with 128-bit processing, where size_t != unsigned long). In this case, +code is enabled that causes a build failure. + +Upstream: https://github.com/boostorg/intrusive/commit/825aedad557b7e3bb27614335b6ced16887103de +Issue: https://github.com/boostorg/intrusive/issues/79 +Fixes: http://autobuild.buildroot.net/results/6cb/6cbc0672f3c5046405793d8cdc8f961d2ffb1d3e + +Signed-off-by: Andreas Ziegler +--- + include/boost/intrusive/hashtable.hpp | 235 ++++++++++++++++---------- + 1 file changed, 145 insertions(+), 90 deletions(-) + +diff --git a/include/boost/intrusive/hashtable.hpp b/include/boost/intrusive/hashtable.hpp +index b8bc877..688fb9b 100644 +--- a/boost/intrusive/hashtable.hpp ++++ b/boost/intrusive/hashtable.hpp +@@ -2,6 +2,7 @@ + // + // (C) Copyright Ion Gaztanaga 2006-2022 + // (C) Copyright 2022 Joaquin M Lopez Munoz. ++// (C) Copyright 2022 Christian Mazakas + // + // Distributed under the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at +@@ -84,11 +85,6 @@ namespace intrusive { + + /// @cond + +-#if !defined(BOOST_NO_INT64_T)&&\ +- (defined(BOOST_HAS_INT128) || (defined(_MSC_VER) && defined(_WIN64))) +-#define BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT +-#endif +- + //We only support LLP64(Win64) or LP64(most Unix) data models + #ifdef _WIN64 //In 64 bit windows sizeof(size_t) == sizeof(unsigned long long) + # define BOOST_INTRUSIVE_SIZE_C(NUMBER) NUMBER##ULL +@@ -98,7 +94,6 @@ namespace intrusive { + # define BOOST_INTRUSIVE_64_BIT_SIZE_T (((((ULONG_MAX>>16)>>16)>>16)>>15) != 0) + #endif + +- + template + struct prime_list_holder + { +@@ -167,11 +162,11 @@ struct prime_list_holder + { return prime_list[std::ptrdiff_t(n)]; } + + template +- BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % prime_list[SizeIndex]; } ++ BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % SizeIndex; } + + static std::size_t(*const positions[])(std::size_t); + +- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++ #if BOOST_INTRUSIVE_64_BIT_SIZE_T + static const uint64_t inv_sizes32[]; + static const std::size_t inv_sizes32_size; + #endif +@@ -185,17 +180,20 @@ struct prime_list_holder + BOOST_INTRUSIVE_FORCEINLINE static std::size_t size(std::size_t size_index) + { return prime_list_holder<>::size_from_index(size_index); } + +- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++ #if BOOST_INTRUSIVE_64_BIT_SIZE_T + // https://github.com/lemire/fastmod + +- + BOOST_INTRUSIVE_FORCEINLINE static uint64_t mul128_u32(uint64_t lowbits, uint32_t d) + { + #if defined(_MSC_VER) +- return __umulh(lowbits, d); ++ return __umulh(lowbits, d); ++ #elif defined(BOOST_HAS_INT128) ++ return static_cast((uint128_type(lowbits) * d) >> 64); + #else +- __extension__ typedef unsigned __int128 ext_uint128_t; +- return (ext_uint128_t(lowbits) * d) >> 64; ++ uint64_t r1 = (lowbits & UINT32_MAX) * d; ++ uint64_t r2 = (lowbits >> 32) * d; ++ r2 += r1 >> 32; ++ return r2 >> 32; + #endif + } + +@@ -204,51 +202,67 @@ struct prime_list_holder + uint64_t lowbits = M * a; + return (uint32_t)(mul128_u32(lowbits, d)); + } +- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T + + BOOST_INTRUSIVE_FORCEINLINE static std::size_t position(std::size_t hash,std::size_t size_index) + { +- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) && BOOST_INTRUSIVE_64_BIT_SIZE_T +- const std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); ++ #if BOOST_INTRUSIVE_64_BIT_SIZE_T ++ BOOST_CONSTEXPR_OR_CONST std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); + if(BOOST_LIKELY(size_index < sizes_under_32bit)){ + return fastmod_u32( uint32_t(hash)+uint32_t(hash>>32) + , inv_sizes32[size_index] + , uint32_t(prime_list[size_index]) ); + } + else{ +- return positions[size_index-sizes_under_32bit](hash); ++ return positions[size_index](hash); + } +- #elif defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) +- return fastmod_u32(hash, inv_sizes32[size_index], uint32_t(sizes[size_index])); + #else + return positions[size_index](hash); +- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T + } + }; + + template + std::size_t(* const prime_list_holder::positions[])(std::size_t) = + { +- #if !defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) +- modfunc< 0>,modfunc< 1>,modfunc< 2>,modfunc< 3>,modfunc< 4>, +- modfunc< 5>,modfunc< 6>,modfunc< 7>,modfunc< 8>,modfunc< 9>, +- modfunc<10>,modfunc<11>,modfunc<12>,modfunc<13>,modfunc<14>, +- modfunc<15>,modfunc<16>,modfunc<17>,modfunc<18>,modfunc<19>, +- modfunc<20>,modfunc<21>,modfunc<22>,modfunc<23>,modfunc<24>, +- modfunc<25>,modfunc<26>,modfunc<27>,modfunc<28>,modfunc<29>, +- modfunc<30>, +- #endif +- # if BOOST_INTRUSIVE_64_BIT_SIZE_T +- modfunc<31>,modfunc<32>,modfunc<33>,modfunc<34>, +- modfunc<35>,modfunc<36>,modfunc<37>,modfunc<38>,modfunc<39>, +- modfunc<40>,modfunc<41>,modfunc<42>,modfunc<43>,modfunc<44>, +- modfunc<45>,modfunc<46>,modfunc<47>,modfunc<48>,modfunc<49>, +- modfunc<50>,modfunc<51>,modfunc<52>,modfunc<53>,modfunc<54>, +- modfunc<55>,modfunc<56>,modfunc<57>,modfunc<58>,modfunc<59>, +- modfunc<60>,modfunc<61>,modfunc<62>,modfunc<63> +- # else +- modfunc<31> +- # endif ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, //0-30 indexes ++#if BOOST_INTRUSIVE_64_BIT_SIZE_T ++ //Taken from Boost.MultiIndex code, thanks to Joaquin M. Lopez Munoz. ++ modfunc, //<- 32 bit values stop here (index 31) ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc //(index 63) ++#else ++ modfunc //<- 32 bit stops here (index 31) as ptrdiff_t is signed ++#endif + }; + + template +@@ -298,7 +312,7 @@ const std::size_t prime_list_holder::prime_list_size + = sizeof(prime_list) / sizeof(std::size_t); + + +-#if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++#if BOOST_INTRUSIVE_64_BIT_SIZE_T + + template + const uint64_t prime_list_holder::inv_sizes32[] = { +@@ -340,7 +354,7 @@ template + const std::size_t prime_list_holder::inv_sizes32_size + = sizeof(inv_sizes32) / sizeof(uint64_t); + +-#endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++#endif // BOOST_INTRUSIVE_64_BIT_SIZE_T + + struct prime_fmod_size : prime_list_holder<> + { +@@ -785,9 +799,9 @@ BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_va + } + + template //fastmod_buckets +-BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t bucket_cnt, std::size_t split, detail::true_) ++BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t , std::size_t split, detail::true_) + { +- return prime_fmod_size::position(hash_value, split); (void)bucket_cnt; ++ return prime_fmod_size::position(hash_value, split); + } + + //!This metafunction will obtain the type of a bucket +@@ -1473,6 +1487,10 @@ struct bucket_hash_t + , bucket_plus_vtraits_t(BOOST_MOVE_BASE(bucket_plus_vtraits_t, other)) + {} + ++ template ++ BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_hash(const K &k) const ++ { return this->base_t::operator()(k); } ++ + BOOST_INTRUSIVE_FORCEINLINE const hasher &priv_hasher() const + { return this->base_t::get(); } + +@@ -1747,8 +1765,17 @@ struct hashtable_size_wrapper + typedef const size_traits & size_traits_const_t; + typedef size_traits & size_traits_t; + +- BOOST_INTRUSIVE_FORCEINLINE size_traits_const_t priv_size_traits() const +- { return size_traits_; } ++ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const ++ { return size_traits_.get_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType s) ++ { size_traits_.set_size(s); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() ++ { size_traits_.increment(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() ++ { size_traits_.decrement(); } + + BOOST_INTRUSIVE_FORCEINLINE size_traits_t priv_size_traits() + { return size_traits_; } +@@ -1780,7 +1807,19 @@ struct hashtable_size_wrapper + typedef size_traits size_traits_const_t; + typedef size_traits size_traits_t; + +- BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() const ++ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const ++ { return 0u; } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType) ++ {} ++ ++ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() ++ {} ++ ++ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() ++ {} ++ ++ BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() + { return size_traits(); } + }; + +@@ -1815,14 +1854,14 @@ struct hashdata_internal + public: + static const bool linear_buckets = 0 != (BoolFlags & hash_bool_flags::linear_buckets_pos); + typedef typename get_hashtable_size_wrapper_bucket +- ::type internal_type; +- +- typedef typename internal_type::key_equal key_equal; +- typedef typename internal_type::hasher hasher; ++ ::type split_bucket_hash_equal_t; ++ ++ typedef typename split_bucket_hash_equal_t::key_equal key_equal; ++ typedef typename split_bucket_hash_equal_t::hasher hasher; + typedef bucket_plus_vtraits + bucket_plus_vtraits_t; + typedef SizeType size_type; +- typedef typename internal_type::size_traits split_traits; ++ typedef typename split_bucket_hash_equal_t::size_traits split_traits; + typedef typename bucket_plus_vtraits_t::bucket_ptr bucket_ptr; + typedef typename bucket_plus_vtraits_t::const_value_traits_ptr const_value_traits_ptr; + typedef typename bucket_plus_vtraits_t::siterator siterator; +@@ -1866,23 +1905,20 @@ struct hashdata_internal + + hashdata_internal( const ValueTraits &val_traits, const bucket_traits &b_traits + , const hasher & h, const key_equal &e) +- : internal_type(val_traits, b_traits, h, e) ++ : split_bucket_hash_equal_t(val_traits, b_traits, h, e) + {} + + BOOST_INTRUSIVE_FORCEINLINE hashdata_internal(BOOST_RV_REF(hashdata_internal) other) +- : internal_type(BOOST_MOVE_BASE(internal_type, other)) ++ : split_bucket_hash_equal_t(BOOST_MOVE_BASE(split_bucket_hash_equal_t, other)) + {} + +- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_t priv_split_traits() +- { return this->priv_size_traits(); } +- +- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_const_t priv_split_traits() const ++ BOOST_INTRUSIVE_FORCEINLINE typename split_bucket_hash_equal_t::size_traits_t priv_split_traits() + { return this->priv_size_traits(); } + + ~hashdata_internal() + { this->priv_clear_buckets(); } + +- using internal_type::priv_clear_buckets; ++ using split_bucket_hash_equal_t::priv_clear_buckets; + + void priv_clear_buckets() + { +@@ -1907,7 +1943,17 @@ struct hashdata_internal + + //public functions + BOOST_INTRUSIVE_FORCEINLINE SizeType split_count() const BOOST_NOEXCEPT +- { return this->priv_split_traits().get_size(); } ++ { return this->split_bucket_hash_equal_t::get_hashtable_size_wrapper_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void split_count(SizeType s) BOOST_NOEXCEPT ++ { this->split_bucket_hash_equal_t::set_hashtable_size_wrapper_size(s); } ++ ++ //public functions ++ BOOST_INTRUSIVE_FORCEINLINE void inc_split_count() BOOST_NOEXCEPT ++ { this->split_bucket_hash_equal_t::inc_hashtable_size_wrapper_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void dec_split_count() BOOST_NOEXCEPT ++ { this->split_bucket_hash_equal_t::dec_hashtable_size_wrapper_size(); } + + BOOST_INTRUSIVE_FORCEINLINE static SizeType initial_split_from_bucket_count(SizeType bc) BOOST_NOEXCEPT + { +@@ -1983,10 +2029,7 @@ struct hashdata_internal + { return (priv_hash_to_nbucket)(hash_value, fastmod_buckets_t()); } + + BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::true_) const //fastmod_buckets_t +- { +- return static_cast(hash_to_bucket_split +- (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::true_())); +- } ++ { return static_cast(prime_fmod_size::position(hash_value, this->split_count())); } + + BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::false_) const //!fastmod_buckets_t + { +@@ -1994,7 +2037,6 @@ struct hashdata_internal + (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::false_())); + } + +- + BOOST_INTRUSIVE_FORCEINLINE iterator iterator_to(reference value, detail::false_) BOOST_NOEXCEPT + { + return iterator( siterator(this->priv_value_to_node_ptr(value)) +@@ -2083,8 +2125,8 @@ struct hashdata_internal + , this->priv_value_traits_ptr()); + } + +- using internal_type::end; +- using internal_type::cend; ++ using split_bucket_hash_equal_t::end; ++ using split_bucket_hash_equal_t::cend; + + local_iterator end(size_type n) BOOST_NOEXCEPT + { return local_iterator(this->priv_bucket_lend(n), this->priv_value_traits_ptr()); } +@@ -2322,19 +2364,32 @@ class hashtable_impl + public: + typedef insert_commit_data_impl insert_commit_data; + ++ private: + void default_init_actions() + { + this->priv_set_sentinel_bucket(); + this->priv_init_buckets_and_cache(); +- this->priv_size_traits().set_size(size_type(0)); ++ this->priv_size_count(size_type(0)); + size_type bucket_sz = this->bucket_count(); + BOOST_INTRUSIVE_INVARIANT_ASSERT(bucket_sz != 0); + //Check power of two bucket array if the option is activated + BOOST_INTRUSIVE_INVARIANT_ASSERT + (!power_2_buckets || (0 == (bucket_sz & (bucket_sz - 1)))); +- this->priv_split_traits().set_size(this->initial_split_from_bucket_count(bucket_sz)); ++ this->split_count(this->initial_split_from_bucket_count(bucket_sz)); + } + ++ BOOST_INTRUSIVE_FORCEINLINE SizeType priv_size_count() const BOOST_NOEXCEPT ++ { return this->internal_type::get_hashtable_size_wrapper_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void priv_size_count(SizeType s) BOOST_NOEXCEPT ++ { this->internal_type::set_hashtable_size_wrapper_size(s); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void priv_size_inc() BOOST_NOEXCEPT ++ { this->internal_type::inc_hashtable_size_wrapper_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void priv_size_dec() BOOST_NOEXCEPT ++ { this->internal_type::dec_hashtable_size_wrapper_size(); } ++ + public: + + //! Requires: buckets must not be being used by any other resource. +@@ -2403,10 +2458,10 @@ class hashtable_impl + { + this->priv_swap_cache(x); + x.priv_init_cache(); +- this->priv_size_traits().set_size(x.priv_size_traits().get_size()); +- x.priv_size_traits().set_size(size_type(0)); +- this->priv_split_traits().set_size(x.split_count()); +- x.priv_split_traits().set_size(size_type(0)); ++ this->priv_size_count(x.priv_size_count()); ++ x.priv_size_count(size_type(0)); ++ this->split_count(x.split_count()); ++ x.split_count(size_type(0)); + } + + //! Effects: Equivalent to swap. +@@ -2524,7 +2579,7 @@ class hashtable_impl + size_type size() const BOOST_NOEXCEPT + { + BOOST_IF_CONSTEXPR(constant_time_size) +- return this->priv_size_traits().get_size(); ++ return this->priv_size_count(); + else{ + std::size_t len = 0; + std::size_t bucket_cnt = this->bucket_count(); +@@ -2798,7 +2853,7 @@ class hashtable_impl + //! After a successful rehashing insert_commit_data remains valid. + iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT + { +- this->priv_size_traits().increment(); ++ this->priv_size_inc(); + node_ptr const n = this->priv_value_to_node_ptr(value); + BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || slist_node_algorithms::unique(n)); + node_functions_t::store_hash(n, commit_data.get_hash(), store_hash_t()); +@@ -2890,7 +2945,7 @@ class hashtable_impl + //Get the bucket number and local iterator for both iterators + const bucket_ptr bp = this->priv_get_bucket_ptr(i); + this->priv_erase_node(*bp, i.slist_it(), this->make_node_disposer(disposer), optimize_multikey_t()); +- this->priv_size_traits().decrement(); ++ this->priv_size_dec(); + this->priv_erasure_update_cache(bp); + } + +@@ -2931,7 +2986,7 @@ class hashtable_impl + size_type const num_erased = (size_type)this->priv_erase_node_range + ( before_first_local_it, first_bucket_num, last_local_it, last_bucket_num + , this->make_node_disposer(disposer), optimize_multikey_t()); +- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-num_erased)); ++ this->priv_size_count(size_type(this->priv_size_count()-num_erased)); + this->priv_erasure_update_cache_range(first_bucket_num, last_bucket_num); + } + } +@@ -3001,7 +3056,7 @@ class hashtable_impl + (this->priv_value_from_siterator(it), h, key, equal_func, compare_hash_t())); + slist_node_algorithms::unlink_after_and_dispose(prev.pointed_node(), it.pointed_node(), this->make_node_disposer(disposer)); + } +- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-cnt)); ++ this->priv_size_count(size_type(this->priv_size_count()-cnt)); + this->priv_erasure_update_cache(); + } + +@@ -3020,7 +3075,7 @@ class hashtable_impl + void clear() BOOST_NOEXCEPT + { + this->priv_clear_buckets_and_cache(); +- this->priv_size_traits().set_size(size_type(0)); ++ this->priv_size_count(size_type(0)); + } + + //! Requires: Disposer::operator()(pointer) shouldn't throw. +@@ -3045,7 +3100,7 @@ class hashtable_impl + --num_buckets; + slist_node_algorithms::detach_and_dispose(b->get_node_ptr(), d); + } +- this->priv_size_traits().set_size(size_type(0)); ++ this->priv_size_count(size_type(0)); + } + this->priv_init_cache(); + } +@@ -3339,7 +3394,7 @@ class hashtable_impl + //! + //! Note: the return value is in the range [0, this->bucket_count()). + BOOST_INTRUSIVE_FORCEINLINE size_type bucket(const key_type& k) const +- { return this->bucket(k, this->priv_hasher()); } ++ { return this->priv_hash_to_nbucket(this->priv_hash(k)); } + + //! Requires: "hash_func" must be a hash function that induces + //! the same hash values as the stored hasher. The difference is that +@@ -3520,7 +3575,7 @@ class hashtable_impl + if((ret = split_idx < bucket_cnt)){ + const std::size_t bucket_to_rehash = split_idx - bucket_cnt/2u; + bucket_type &old_bucket = this->priv_bucket(bucket_to_rehash); +- this->priv_split_traits().increment(); ++ this->inc_split_count(); + + //Anti-exception stuff: if an exception is thrown while + //moving elements from old_bucket to the target bucket, all moved +@@ -3553,7 +3608,7 @@ class hashtable_impl + bucket_type &target_bucket = this->priv_bucket(target_bucket_num); + bucket_type &source_bucket = this->priv_bucket(split_idx-1u); + slist_node_algorithms::transfer_after(target_bucket.get_node_ptr(), source_bucket.get_node_ptr()); +- this->priv_split_traits().decrement(); ++ this->dec_split_count(); + this->priv_insertion_update_cache(target_bucket_num); + } + return ret; +@@ -3763,8 +3818,8 @@ class hashtable_impl + ArrayDisposer rollback2(old_buckets[0], nd, old_bucket_count); + + //Put size in a safe value for rollback exception +- size_type const size_backup = this->priv_size_traits().get_size(); +- this->priv_size_traits().set_size(0); ++ size_type const size_backup = this->priv_size_count(); ++ this->priv_size_count(0); + //Put cache to safe position + this->priv_init_cache(); + this->priv_unset_sentinel_bucket(); +@@ -3826,8 +3881,8 @@ class hashtable_impl + } + } + +- this->priv_size_traits().set_size(size_backup); +- this->priv_split_traits().set_size(split); ++ this->priv_size_count(size_backup); ++ this->split_count(split); + if(&new_bucket_traits != &this->priv_bucket_traits()) + this->priv_bucket_traits() = new_bucket_traits; + this->priv_set_sentinel_bucket(); +@@ -3927,8 +3982,8 @@ class hashtable_impl + this->priv_hasher() = src.priv_hasher(); + this->priv_equal() = src.priv_equal(); + rollback.release(); +- this->priv_size_traits().set_size(src.priv_size_traits().get_size()); +- this->priv_split_traits().set_size(dst_bucket_count); ++ this->priv_size_count(src.priv_size_count()); ++ this->split_count(dst_bucket_count); + this->priv_set_cache_bucket_num(0u); + this->priv_erasure_update_cache(); + } +@@ -3946,7 +4001,7 @@ class hashtable_impl + , n, optimize_multikey_t()); + //Update cache and increment size if needed + this->priv_insertion_update_cache(bucket_num); +- this->priv_size_traits().increment(); ++ this->priv_size_inc(); + slist_node_algorithms::link_after(prev.pointed_node(), n); + return this->build_iterator(siterator(n), this->priv_bucket_ptr(bucket_num)); + } +-- +2.34.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:26 -0000 Subject: [Buildroot] [git commit branch/next] package/libkcapi: fix uclibc build Message-ID: <20230220205149.3BB3F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21747875f90cb3345b6927ded9fffb7582cf06a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following uclibc build failure raised since bump to version 1.4.0 in commit 06a9dc3528847ec6c12a9b6188d4106e086eabe5 and https://github.com/smuellerDD/libkcapi/commit/12f19b9a1dd308117f83e8cb33e28e3c040710a0: lib/kcapi-kernel-if.c: In function '_kcapi_common_send_meta': lib/kcapi-kernel-if.c:196:26: error: conversion to 'int' from 'size_t' {aka 'unsigned int'} may change the sign of the result [-Werror=sign-conversion] 196 | msg.msg_iovlen = kcapi_downcast_int(iovlen); | ^~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/eccf4b84670b5ef0fdd68b46338edf5043c7cc0d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...01-lib-kcapi-kernel-if.c-fix-uclibc-build.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch b/package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch new file mode 100644 index 0000000000..818150dafb --- /dev/null +++ b/package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch @@ -0,0 +1,55 @@ +From 4d9bbc866682bdf46c78047dca02230372620295 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 6 Nov 2022 17:05:14 +0100 +Subject: [PATCH] lib/kcapi-kernel-if.c: fix uclibc build + +Fix the following uclibc build failure raised since version 1.4.0 and +https://github.com/smuellerDD/libkcapi/commit/12f19b9a1dd308117f83e8cb33e28e3c040710a0: + +lib/kcapi-kernel-if.c: In function '_kcapi_common_send_meta': +lib/kcapi-kernel-if.c:196:26: error: conversion to 'int' from 'size_t' {aka 'unsigned int'} may change the sign of the result [-Werror=sign-conversion] + 196 | msg.msg_iovlen = kcapi_downcast_int(iovlen); + | ^~~~~~~~~~~~~~~~~~ + +Indeed, uclibc has the same behavior than musl when __WORDSIZE != 32 +even if it defines __GLIBC__: +https://github.com/wbx-github/uclibc-ng/blob/ab1dd83bec59c9e65c31efd6e887182948f627be/libc/sysdeps/linux/common/bits/socket.h + +Fixes: + - http://autobuild.buildroot.org/results/eccf4b84670b5ef0fdd68b46338edf5043c7cc0d + +Signed-off-by: Tan En De +Signed-off-by: Fabrice Fontaine +Signed-off-by: Stephan Mueller +[Retrieved from: +https://github.com/smuellerDD/libkcapi/commit/4d9bbc866682bdf46c78047dca02230372620295] +--- + lib/kcapi-kernel-if.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/lib/kcapi-kernel-if.c b/lib/kcapi-kernel-if.c +index d7b10bf..b4d7f74 100644 +--- a/lib/kcapi-kernel-if.c ++++ b/lib/kcapi-kernel-if.c +@@ -119,7 +119,7 @@ int _kcapi_common_accept(struct kcapi_handle *handle) + return 0; + } + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !(defined(__UCLIBC__) && __WORDSIZE == 32) + static inline size_t kcapi_downcast_int(size_t in) + { + return in; +@@ -564,11 +564,7 @@ ssize_t _kcapi_common_recv_data(struct kcapi_handle *handle, + msg.msg_controllen = 0; + msg.msg_flags = 0; + msg.msg_iov = iov; +-#ifdef __GLIBC__ +- msg.msg_iovlen = iovlen; +-#else +- msg.msg_iovlen = (int)iovlen; +-#endif ++ msg.msg_iovlen = kcapi_downcast_int(iovlen); + ret = recvmsg(*_kcapi_get_opfd(handle), &msg, 0); + if (ret < 0) + ret = -errno; From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:26 -0000 Subject: [Buildroot] [git commit branch/next] package/vlc: fix opengl library check Message-ID: <20230220205150.C2B3186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0aad05cbf20c8e09834e9e1d78a3376cb89910b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/9710753984a38b8c6f83a136b39c3bc320ba558b/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../vlc/0012-opengl-missing-library-check.patch | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/package/vlc/0012-opengl-missing-library-check.patch b/package/vlc/0012-opengl-missing-library-check.patch new file mode 100644 index 0000000000..3a28fe34e3 --- /dev/null +++ b/package/vlc/0012-opengl-missing-library-check.patch @@ -0,0 +1,57 @@ +From 4ab41404cb85684125d73977cadebf83bbc246f5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sat, 22 Jan 2022 11:34:38 +0200 +Subject: [PATCH] opengl: missing library check + +Traditionally the presence of the header file was not considered +sufficient, though this was somewhat forgotten with the prevalence of +pkg-config. + +However most libraries have portable headers, while the shared library +is platform-dependent. It is common for the header to be present while +the library is absent with "multilib" installations (i.e. Linux +installation with multiple architectures). + +Downloaded from upstream commit: +https://code.videolan.org/videolan/vlc/-/commit/4ab41404cb85684125d73977cadebf83bbc246f5 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2f50808d597..0d57fadbf8b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3169,7 +3169,6 @@ have_gl="no" + PKG_CHECK_MODULES([GL], [gl], [ + have_gl="yes" + ], [ +- AC_MSG_CHECKING([for OpenGL]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #ifdef _WIN32 + # include +@@ -3179,13 +3178,17 @@ PKG_CHECK_MODULES([GL], [gl], [ + [int t0 = GL_TEXTURE0;]]) + ], [ + GL_CFLAGS="" +- have_gl="yes" + AS_IF([test "${SYS}" != "mingw32"], [ +- GL_LIBS="-lGL" ++ AC_CHECK_LIB([GL], [glTexture2D], [ ++ have_gl="yes" ++ GL_LIBS="-lGL" ++ ]) + ], [ ++ have_gl="yes" + GL_LIBS="-lopengl32" + ]) + ]) ++ AC_MSG_CHECKING([for OpenGL]) + AC_MSG_RESULT([${have_gl}]) + ]) + AM_CONDITIONAL([HAVE_GL], [test "${have_gl}" = "yes"]) +-- +GitLab + From yann.morin.1998 at free.fr Mon Feb 20 20:52:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:27 -0000 Subject: [Buildroot] [git commit branch/next] configs/amarula_a64_relic: remove defconfig Message-ID: <20230220205148.05B7086494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b93307815031399d9178b4a9be8628ed19d2d4b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234498966 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 - board/amarula/a64-relic/extlinux.conf | 4 - board/amarula/a64-relic/genimage.cfg | 11 --- board/amarula/a64-relic/post-build.sh | 4 - board/amarula/a64-relic/readme.txt | 90 ---------------------- .../lib/firmware/brcm/brcmfmac4330-sdio.txt | 83 -------------------- configs/amarula_a64_relic_defconfig | 63 --------------- 7 files changed, 256 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 9bd98da5ef..b099ce2f62 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1320,7 +1320,6 @@ F: board/orangepi/orangepi-prime/ F: board/orangepi/orangepi-win/ F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ -F: configs/amarula_a64_relic_defconfig F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig F: configs/bananapi_m1_defconfig diff --git a/board/amarula/a64-relic/extlinux.conf b/board/amarula/a64-relic/extlinux.conf deleted file mode 100644 index 9f469846bc..0000000000 --- a/board/amarula/a64-relic/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label linux-4.17.0-rc3 - kernel /Image - devicetree /sun50i-a64-amarula-relic.dtb - append console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p4 rootwait diff --git a/board/amarula/a64-relic/genimage.cfg b/board/amarula/a64-relic/genimage.cfg deleted file mode 100644 index 58b607f5fb..0000000000 --- a/board/amarula/a64-relic/genimage.cfg +++ /dev/null @@ -1,11 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-amarula-relic.dtb", - "extlinux" - } - } - - size = 64M -} diff --git a/board/amarula/a64-relic/post-build.sh b/board/amarula/a64-relic/post-build.sh deleted file mode 100755 index ec20fca7d9..0000000000 --- a/board/amarula/a64-relic/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/amarula/a64-relic/readme.txt b/board/amarula/a64-relic/readme.txt deleted file mode 100644 index 77f79e3094..0000000000 --- a/board/amarula/a64-relic/readme.txt +++ /dev/null @@ -1,90 +0,0 @@ -Amarula A64 Relic -================ - -Amarula A64-Relic is an Allwinner A64 based IoT device, which supports: -- Allwinner A64 Cortex-A53 -- Mali-400MP2 GPU -- AXP803 PMIC -- 1GB DDR3 RAM -- 8GB eMMC -- AP6330 Wifi/BLE -- MIPI-DSI -- CSI: OV5640 sensor -- USB OTG -- 12V DC power supply - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Amarual+A64-Relic - -Build -===== - - $ make amarula_a64_relic_defconfig - - $ make - -build files at output/images/: - - sunxi-spl.bin - - u-boot.itb - - Image - - sun50i-a64-amarula-relic.dtb - - boot.vfat - - rootfs.ext4 - -Write eMMC -========= - -The board comes with an operating system preloaded on the eMMC. -To replace it with the Buildroot-built system, take the following -steps - -1. Connect the board UART with host and open minicom(ttyUSBx/115200N8) - -2. Supply 12V DC for power-on the board. - -3. Interrupt U-Boot by pressing enter - -4. Create GPT partitions - => mmc dev 1 - => gpt write mmc 1 $partitions - -5. Connect the board USB-OTG with USB slot on the host. - -6. Initiate fastboot - => fastboot 0 - -7. Write images from host onto eMMC using fastboot - $ cd output/images - $ sudo fastboot -i 0x1f3a flash loader1 sunxi-spl.bin - $ sudo fastboot -i 0x1f3a flash loader2 u-boot.itb - $ sudo fastboot -i 0x1f3a flash esp boot.vfat - $ sudo fastboot -i 0x1f3a flash system rootfs.ext4 - -Update eMMC during Development -============================== - -During development, reflashing the entire filesystem image at every -change is time consuming. A useful alternative is to directly access -over USB the filesystem stored on the eMMC, using the USB Mass Storage -capability of U-Boot. To achieve this: - -1. Build U-Boot by enabling UMS - $ make uboot-menuconfig - (select CONFIG_CMD_USB_MASS_STORAGE=y) - -2. Follow all 6 steps from 'Write eMMC' and mount eMMC on host - => mmc dev 1 - => ums 0 mmc 1 - -WiFi -==== - - # wpa_passphrase ACCESSPOINTNAME >> /etc/wpa_supplicant.conf - (type password and enter) - # wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf -B - # udhcpc -i wlan0 - # ping google.com - --- -Jagan Teki -29-Jun-2018 diff --git a/board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt b/board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt deleted file mode 100644 index d095f24c26..0000000000 --- a/board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt +++ /dev/null @@ -1,83 +0,0 @@ -#AP6330_NVRAM_V1.0_20121130 -#Sample variables file for BCM94330 SD FC AGB board -manfid=0x2d0 -prodid=0x0547 -vendid=0x14e4 -devid=0x4360 -boardtype=0x05e1 -boardrev=0x1202 -boardflags=0x0080200 -nocrc=1 -xtalfreq=26000 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -ag0=254 -aa2g=1 -ccode=ALL -pa0itssit=0x20 -pa0b0=5587 -pa0b1=-633 -pa0b2=-158 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 -#rssi params for 5GHz -rssismf5g=0x4 -rssismc5g=0x3 -rssisav5g=0x7 -#PA parameters for lower a-band -pa1lob0=4748 -pa1lob1=-566 -pa1lob2=-180 -#PA parameters for midband -pa1b0=4762 -pa1b1=-593 -pa1b2=-172 -#PA parameters for high band -#pa1hib0=4596 -pa1hib0=4666 -pa1hib1=-619 -pa1hib2=-163 -rxpo5g=0 -maxp2ga0=74 -maxp5ga0=66 -maxp5gla0=66 -maxp5gha0=66 -# 2.4G Tx Power offsets -cck2gpo=0x2222 -ofdm2gpo=0x44444444 -mcs2gpo0=0x6666 -mcs2gpo1=0x6666 -# 5G Tx Power offsets -ofdm5gpo=0x44444444 -ofdm5glpo=0x44444444 -ofdm5ghpo=0x44444444 -mcs5gpo0=0x6666 -mcs5gpo1=0x6666 -mcs5glpo0=0x6666 -mcs5glpo1=0x6666 -mcs5ghpo0=0x6666 -mcs5ghpo1=0x6666 -sromrev=3 -il0macaddr=00:90:4c:c5:12:38 -wl0id=0x431b -cckPwrOffset=4 -swctrlmap_2g=0x44844484,0x42824282,0x40804484,0x18282,0x1ff -triso5g=0 -swctrlmap_5g=0x00100010,0x20202020,0x20202020,0x14202,0x0f0 -rfreg033=0x19 -rfreg033_cck=0x1f -dacrate2g=160 -dacrate5g=160 -txalpfbyp2g=1 -bphyscale=17 -cckPwrIdxCorr=-15 -pacalidx2g=50 -#pacalidx5g=20 -noise_cal_ref_2g=53 -noise_cal_po_2g=0 -noise_cal_ref_5g=52 -noise_cal_po_5g=5,0,0 -# 4330 OOB parameter: High level trigger -muxenab=0x10 - diff --git a/configs/amarula_a64_relic_defconfig b/configs/amarula_a64_relic_defconfig deleted file mode 100644 index 304a3ef824..0000000000 --- a/configs/amarula_a64_relic_defconfig +++ /dev/null @@ -1,63 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 4.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="amarula_a64_relic" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,v1.0a)/linux-amarula_v1.0a.tar.gz" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-amarula-relic" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Amarula A64-Relic" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_ANDROID_TOOLS=y -BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/amarula/a64-relic/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/amarula/a64-relic/post-build.sh" -BR2_ROOTFS_OVERLAY="board/amarula/a64-relic/rootfs_overlay" - -# wireless firmware -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y - -# wireless tools -BR2_PACKAGE_IW=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:27 -0000 Subject: [Buildroot] [git commit branch/next] package/ntfs-3g: security bump to version 2022.10.3 Message-ID: <20230220205150.9E59486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6facb6fa1022a6bc5aa6fbdbaf20b1a57f420259 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-40284: A buffer overflow was discovered in NTFS-3G before 2022.10.3. Crafted metadata in an NTFS image can cause code execution. A local attacker can exploit this if the ntfs-3g binary is setuid root. A physically proximate attacker can exploit this if NTFS-3G software is configured to execute upon attachment of an external storage device. https://github.com/tuxera/ntfs-3g/security/advisories/GHSA-v4w8-jv3w-7prm https://github.com/tuxera/ntfs-3g/releases/tag/2022.10.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ntfs-3g/ntfs-3g.hash | 2 +- package/ntfs-3g/ntfs-3g.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ntfs-3g/ntfs-3g.hash b/package/ntfs-3g/ntfs-3g.hash index 89bce73559..3fcba6af4d 100644 --- a/package/ntfs-3g/ntfs-3g.hash +++ b/package/ntfs-3g/ntfs-3g.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0489fbb6972581e1b417ab578d543f6ae522e7fa648c3c9b49c789510fd5eb93 ntfs-3g_ntfsprogs-2022.5.17.tgz +sha256 f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c ntfs-3g_ntfsprogs-2022.10.3.tgz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f COPYING.LIB diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk index 64800c5eeb..62c515d50f 100644 --- a/package/ntfs-3g/ntfs-3g.mk +++ b/package/ntfs-3g/ntfs-3g.mk @@ -4,7 +4,7 @@ # ################################################################################ -NTFS_3G_VERSION = 2022.5.17 +NTFS_3G_VERSION = 2022.10.3 NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz NTFS_3G_SITE = http://tuxera.com/opensource NTFS_3G_CONF_OPTS = --disable-ldconfig From yann.morin.1998 at free.fr Mon Feb 20 20:52:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:28 -0000 Subject: [Buildroot] [git commit branch/next] configs/orangepi_win: remove defconfig Message-ID: <20230220205148.EE6BA828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5099a1058d93821399ea758c5227e1fbbe6f76de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499145 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/orangepi/orangepi-win/boot.cmd | 6 ---- board/orangepi/orangepi-win/genimage.cfg | 40 -------------------------- board/orangepi/orangepi-win/readme.txt | 37 ------------------------ configs/orangepi_win_defconfig | 48 -------------------------------- 5 files changed, 133 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 89a72bc923..81e6cd54ab 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1303,7 +1303,6 @@ F: board/olimex/a33_olinuxino/ F: board/olimex/a64-olinuxino/ F: board/orangepi/orangepi-lite2/ F: board/orangepi/orangepi-one-plus -F: board/orangepi/orangepi-win/ F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ F: configs/amarula_vyasa_rk3288_defconfig @@ -1317,7 +1316,6 @@ F: configs/olimex_a33_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig F: configs/orangepi_lite2_defconfig F: configs/orangepi_one_plus_defconfig -F: configs/orangepi_win_defconfig F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig diff --git a/board/orangepi/orangepi-win/boot.cmd b/board/orangepi/orangepi-win/boot.cmd deleted file mode 100644 index 2ddb769d6d..0000000000 --- a/board/orangepi/orangepi-win/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-a64-orangepi-win.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-win/genimage.cfg b/board/orangepi/orangepi-win/genimage.cfg deleted file mode 100644 index 98fd1a033d..0000000000 --- a/board/orangepi/orangepi-win/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-orangepi-win.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-win/readme.txt b/board/orangepi/orangepi-win/readme.txt deleted file mode 100644 index 93adddd86b..0000000000 --- a/board/orangepi/orangepi-win/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Orangepi Win/Win Plus. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Orangepi Win/Win Plus link: -http://www.orangepi.org/OrangePiWin_WinPlus/ - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Win - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make orangepi_win_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Orangepi Win/Win Plus and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/orangepi_win_defconfig b/configs/orangepi_win_defconfig deleted file mode 100644 index 715ff3b711..0000000000 --- a/configs/orangepi_win_defconfig +++ /dev/null @@ -1,48 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_win" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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-win/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-orangepi-win" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Win/Win Plus" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-win/genimage.cfg" From peter at korsgaard.com Mon Feb 20 20:52:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:28 -0000 Subject: [Buildroot] [git commit branch/next] docs/website: update for 2022.08.2 Message-ID: <20230220205151.29D518648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc9b716296f37e0e3e47fd34c8991e92b6baeebd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 9f2a81eb2b..c042f34887 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@
      -

      Latest stable release: 2022.08.1

      +

      Latest stable release: 2022.08.2

      - +
      - +
      -

      buildroot-2022.08.1.tar.gz

      -

      PGP signature

      +

      buildroot-2022.08.2.tar.gz

      +

      PGP signature

      - +
      - +
      -

      buildroot-2022.08.1.tar.xz

      -

      PGP signature

      +

      buildroot-2022.08.2.tar.xz

      +

      PGP signature

      diff --git a/docs/website/news.html b/docs/website/news.html index ba6e85f2e3..d8d2a14cd1 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

      News

        +
      • +
        +
        +
        +

        2022.08.2 released

        +

        16 November 2022

        +
        +
        +

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

        +
        +
        +
        • +
      • From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:29 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: drop entry related to inexisting directory Message-ID: <20230220205149.C11CD828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dfbdb72103dff293fc7688872de91aaa9469d559 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 4e7dfe20bb8cf0cccfbd177321eff73e82c8d940 ("configs/friendlyarm_nanopi_m4: remove defconfig") forgot to fully reflect the removal of the defconfig in the DEVELOPERS file, causing a get-developers warning: WARNING: 'board/friendlyarm/nanopi-m4' doesn't match any file Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index bd76ddca28..826e04d805 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2728,7 +2728,6 @@ F: package/hwloc/ F: package/powertop/ N: Suniel Mahesh -F: board/friendlyarm/nanopi-m4 F: board/pine64/rockpro64 F: board/radxa/rockpi-n8 F: configs/rock_pi_n8_defconfig From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:29 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-net-ssleay: bump to version 1.93_01 Message-ID: <20230220205150.CEB7581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=191fa1718f7f61ad9846a37c6f0c86a3b713e81c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Refresh patch - Drop -lz from Makefile with libressl as this is the only solution for now: https://github.com/radiator-software/p5-net-ssleay/issues/399 - License has been clarified to be Artistic-2.0 since version 1.86.11: https://github.com/radiator-software/p5-net-ssleay/commit/aa4a0206d6d2a5ac2998dd9d6a8c5b88902c04de - This bump will fix the following build failure with libressl: In file included from /home/autobuild/autobuild/instance-11/output-1/host/armeb-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/perl5/5.34.1/armeb-linux/CORE/perl.h:5748, from SSLeay.xs:141: SSLeay.xs: In function 'XS_Net__SSLeay_SESSION_get_master_key': SSLeay.xs:5569:37: error: invalid use of incomplete typedef 'SSL_SESSION' {aka 'struct ssl_session_st'} 5569 | sv_setpvn(ST(0), (const char*)s->master_key, s->master_key_length); | ^~ https://metacpan.org/release/CHRISN/Net-SSLeay-1.93_01/changes Fixes: - http://autobuild.buildroot.org/results/71337cc496727f2b1173c055d706c5bfc2f5d2bc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../perl-net-ssleay/0001-fix-build-system.patch | 30 +++++++++++----------- package/perl-net-ssleay/perl-net-ssleay.hash | 6 ++--- package/perl-net-ssleay/perl-net-ssleay.mk | 13 +++++++--- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/package/perl-net-ssleay/0001-fix-build-system.patch b/package/perl-net-ssleay/0001-fix-build-system.patch index a6cd0f9ceb..a5ccf464ba 100644 --- a/package/perl-net-ssleay/0001-fix-build-system.patch +++ b/package/perl-net-ssleay/0001-fix-build-system.patch @@ -8,29 +8,29 @@ paths, since they are missing the destdir; Buildroot compilers and linkers already know where to search, anyway. Signed-off-by: "Yann E. MORIN" +[Fabrice: update for 1.93_01] +Signed-off-by: Fabrice Fontaine diff -durN perl-net-ssleay-1.64.orig/inc/Module/Install/PRIVATE/Net/SSLeay.pm perl-net-ssleay-1.64/inc/Module/Install/PRIVATE/Net/SSLeay.pm ---- perl-net-ssleay-1.64.orig/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2014-04-01 08:08:37.000000000 +0200 -+++ perl-net-ssleay-1.64/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2014-07-13 00:38:46.281380282 +0200 -@@ -37,14 +37,18 @@ - exit 0; # according http://wiki.cpantesters.org/wiki/CPANAuthorNotes this is best-practice when "missing library" +--- perl-net-ssleay-1.64.orig/Makefile.PL 2014-04-01 08:08:37.000000000 +0200 ++++ perl-net-ssleay-1.64/Makefile.PL 2014-07-13 00:38:46.281380282 +0200 +@@ -192,12 +192,16 @@ + exit MISSING_PREREQ; } -- $self->check_openssl_version($prefix, $exec); +- check_openssl_version($prefix, $exec); +# Does not work for cross-compilation. +# In Buildroot, we do have a supported version. -+# $self->check_openssl_version($prefix, $exec); - my $opts = $self->ssleay_get_build_opts($prefix, $exec); - - $self->makemaker_args( ++# check_openssl_version($prefix, $exec); + my %args = ( CCCDLFLAGS => $opts->{cccdlflags}, OPTIMIZE => $opts->{optimize}, -- INC => join(' ', map {"-I$_"} @{$opts->{inc_paths}}), -- LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), +- INC => qq{-I"$opts->{inc_path}"}, +- LIBS => join(' ', (map '-L'.maybe_quote($_), @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), +# Buildroot already has the correct include and library search paths. -+# INC => join(' ', map {"-I$_"} @{$opts->{inc_paths}}), -+# LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), ++# INC => qq{-I"$opts->{inc_path}"}, ++# LIBS => join(' ', (map '-L'.maybe_quote($_), @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), + LIBS => join(' ', (map {"-l$_"} @{$opts->{lib_links}})), ); - - if ( $self->prompt( + # From HMBRAND to handle multple version of OPENSSL installed + if (my $lp = join " " => map '-L'.maybe_quote($_), @{$opts->{lib_paths} || []}) diff --git a/package/perl-net-ssleay/perl-net-ssleay.hash b/package/perl-net-ssleay/perl-net-ssleay.hash index 7502a60ad1..9caff68edd 100644 --- a/package/perl-net-ssleay/perl-net-ssleay.hash +++ b/package/perl-net-ssleay/perl-net-ssleay.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d602bdce4e0531c6efc276e3e429ca69 Net-SSLeay-1.85.tar.gz -sha256 9d8188b9fb1cae3bd791979c20554925d5e94a138d00414f1a6814549927b0c8 Net-SSLeay-1.85.tar.gz +md5 c73821e9790b3bdb3471d9b8faf48bbb Net-SSLeay-1.93_01.tar.gz +sha256 876d022fbc719631b11d6bb4b6e78db3c19bbca578093c376c8f9900a4432aa3 Net-SSLeay-1.93_01.tar.gz # computed by scancpan -sha256 b55065185a2172d9f2ea2dd87c18c206ea3dc45a64e5f3deb3eee34d839dc822 LICENSE +sha256 685e534b60d4e2b4fbb1a259a83b5a86e877a919bbb9efc95994276f706a3a71 LICENSE diff --git a/package/perl-net-ssleay/perl-net-ssleay.mk b/package/perl-net-ssleay/perl-net-ssleay.mk index 80ce8b9cc7..8b7b2b973b 100644 --- a/package/perl-net-ssleay/perl-net-ssleay.mk +++ b/package/perl-net-ssleay/perl-net-ssleay.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_NET_SSLEAY_VERSION = 1.85 +PERL_NET_SSLEAY_VERSION = 1.93_01 PERL_NET_SSLEAY_SOURCE = Net-SSLeay-$(PERL_NET_SSLEAY_VERSION).tar.gz -PERL_NET_SSLEAY_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIKEM +PERL_NET_SSLEAY_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CH/CHRISN PERL_NET_SSLEAY_DEPENDENCIES = openssl -PERL_NET_SSLEAY_LICENSE = OpenSSL +PERL_NET_SSLEAY_LICENSE = Artistic-2.0 PERL_NET_SSLEAY_LICENSE_FILES = LICENSE PERL_NET_SSLEAY_DISTNAME = Net-SSLeay @@ -24,4 +24,11 @@ define PERL_NET_SSLEAY_FIX_MAKEFILE endef PERL_NET_SSLEAY_POST_CONFIGURE_HOOKS += PERL_NET_SSLEAY_FIX_MAKEFILE +ifeq ($(BR2_PACKAGE_LIBRESSL),y) +define PERL_NET_SSLEAY_DROP_ZLIB_MAKEFILE + $(SED) "s/-lz//" $(@D)/Makefile +endef +PERL_NET_SSLEAY_POST_CONFIGURE_HOOKS += PERL_NET_SSLEAY_DROP_ZLIB_MAKEFILE +endif + $(eval $(perl-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:30 -0000 Subject: [Buildroot] [git commit branch/next] package/libkcapi: disable -Werror Message-ID: <20230220205149.6780E86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f6c257638cf2598cad123afa8cdbf84437de072 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following musl build failure (disabling -Werror seems to be the only "solution": https://github.com/smuellerDD/libkcapi/issues/136): lib/kcapi-kernel-if.c: In function '_kcapi_common_send_meta': lib/kcapi-kernel-if.c:212:12: error: unsigned conversion from 'long int' to 'long unsigned int' changes value from '-4' to '4294967292' [-Werror=sign-conversion] 212 | header = CMSG_NXTHDR(&msg, header); | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/c789d43e71e6075e297bef58d888228a89055bbc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libkcapi/0002-Add-disable-werror.patch | 46 ++++++++++++++++++++++++++ package/libkcapi/libkcapi.mk | 1 + 2 files changed, 47 insertions(+) diff --git a/package/libkcapi/0002-Add-disable-werror.patch b/package/libkcapi/0002-Add-disable-werror.patch new file mode 100644 index 0000000000..4f2f55f145 --- /dev/null +++ b/package/libkcapi/0002-Add-disable-werror.patch @@ -0,0 +1,46 @@ +From c27b154f03ad7e94447c7114d73aee60f0098093 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 7 Nov 2022 13:38:06 +0100 +Subject: [PATCH] Add --disable-werror + +Allow the user to disable -Werror through --disable-werror + +Signed-off-by: Fabrice Fontaine +Signed-off-by: Stephan Mueller +[Retrieved from: +https://github.com/smuellerDD/libkcapi/commit/c27b154f03ad7e94447c7114d73aee60f0098093] +--- + Makefile.am | 5 ++++- + configure.ac | 3 +++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 1c95d3d..cddedac 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I m4 + AUTOMAKE_OPTIONS = subdir-objects + lib_LTLIBRARIES = libkcapi.la + +-COMMON_CPPFLAGS = -Wextra -Wall -pedantic -fwrapv --param ssp-buffer-size=4 -O2 -Werror -std=gnu99 -Wconversion ++COMMON_CPPFLAGS = -Wextra -Wall -pedantic -fwrapv --param ssp-buffer-size=4 -O2 -std=gnu99 -Wconversion ++if ENABLE_WERROR ++COMMON_CPPFLAGS += -Werror ++endif + COMMON_LDFLAGS = -Wl,-z,relro,-z,now + + libtool: $(LIBTOOL_DEPS) +diff --git a/configure.ac b/configure.ac +index cb910e2..e230577 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,6 +76,9 @@ AX_ADD_FORTIFY_SOURCE + + AC_CHECK_API_VERSION + ++AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror], [Disable -Werror])], [with_werror=$enableval], [with_werror=yes]) ++AM_CONDITIONAL([ENABLE_WERROR], [test "x$with_werror" = "xyes"]) ++ + AC_ARG_ENABLE([kcapi-test], [AS_HELP_STRING([--enable-kcapi-test], [Compile kcapi test program])], [with_kcapi_test=$enableval]) + AM_CONDITIONAL([ENABLE_KCAPI_TEST], [test "x$with_kcapi_test" = "xyes"]) + diff --git a/package/libkcapi/libkcapi.mk b/package/libkcapi/libkcapi.mk index e88928a74d..c6251c286c 100644 --- a/package/libkcapi/libkcapi.mk +++ b/package/libkcapi/libkcapi.mk @@ -15,6 +15,7 @@ LIBKCAPI_CONF_ENV = \ ac_cv_path_DB2PDF="" \ ac_cv_path_DB2PS="" \ ac_cv_path_XMLTO="" +LIBKCAPI_CONF_OPTS = --disable-werror LIBKCAPI_MAKE_OPTS = CPPFLAGS="$(TARGET_CPPFLAGS)" ifeq ($(BR2_PACKAGE_LIBKCAPI_ASYM),y) From peter at korsgaard.com Mon Feb 20 20:52:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:30 -0000 Subject: [Buildroot] [git commit branch/next] package/rsync: fix configure options Message-ID: <20230220205151.5F62D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8b5feee87be5157e93665011b3c350f6996dfcc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Rename configure options to avoid the following build failure raised since bump to version 3.2.5 in commit ae2807821d897c16141d003f646475fee9e77cba: ./simd-checksum-x86_64.cpp: In function 'uint32_t get_checksum1_cpp(char*, int32_t)': ./simd-checksum-x86_64.cpp:89:52: error: multiversioning needs 'ifunc' which is not supported on this target 89 | __attribute__ ((target("default"))) MVSTATIC int32 get_checksum1_avx2_64(schar* buf, int32 len, int32 i, uint32* ps1, uint32* ps2) { return i; } | ^~~~~~~~~~~~~~~~~~~~~ ./simd-checksum-x86_64.cpp:480:1: error: use of multiversioned function without a default 480 | } | ^ If you can't fix the issue, re-run ./configure with --disable-roll-simd. Fixes: - http://autobuild.buildroot.org/results/069da8e585da2e51bfd4f475cc12b9a134954b08 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/rsync/rsync.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 7ff7ca6eef..8c7ad462ac 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -17,12 +17,12 @@ RSYNC_CONF_ENV = rsync_cv_HAVE_C99_VSNPRINTF=yes RSYNC_CONF_OPTS = \ --with-included-zlib=no \ --with-included-popt=no \ - --disable-simd \ + --disable-roll-simd \ --disable-openssl \ --disable-xxhash \ --disable-zstd \ --disable-lz4 \ - --disable-asm + --disable-md5-asm ifeq ($(BR2_PACKAGE_ACL),y) RSYNC_DEPENDENCIES += acl From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:31 -0000 Subject: [Buildroot] [git commit branch/next] configs/rock_pi_4: remove defconfig Message-ID: <20230220205149.9DCD0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=707938d6848ce945e07ca779748b49b27bdaf222 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3259671395 Cc: Suniel Mahesh Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 -- board/radxa/rockpi-4/extlinux.conf | 4 --- board/radxa/rockpi-4/genimage.cfg | 39 ------------------------ board/radxa/rockpi-4/post-build.sh | 5 ---- board/radxa/rockpi-4/readme.txt | 61 -------------------------------------- configs/rock_pi_4_defconfig | 55 ---------------------------------- 6 files changed, 166 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index c282a867ce..ae20554f91 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2730,10 +2730,8 @@ F: package/powertop/ N: Suniel Mahesh F: board/friendlyarm/nanopi-m4 F: board/pine64/rockpro64 -F: board/radxa/rockpi-4 F: board/radxa/rockpi-n8 F: board/radxa/rockpi-n10 -F: configs/rock_pi_4_defconfig F: configs/rock_pi_n8_defconfig F: configs/rock_pi_n10_defconfig F: configs/rockpro64_defconfig diff --git a/board/radxa/rockpi-4/extlinux.conf b/board/radxa/rockpi-4/extlinux.conf deleted file mode 100644 index 83374f174a..0000000000 --- a/board/radxa/rockpi-4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_ROCK_PI_4 linux - kernel /Image - devicetree /rk3399-rock-pi-4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/board/radxa/rockpi-4/genimage.cfg b/board/radxa/rockpi-4/genimage.cfg deleted file mode 100644 index 9f64e96970..0000000000 --- a/board/radxa/rockpi-4/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-rock-pi-4.dtb", - "extlinux" - } - } - - size = 112M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = F - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/board/radxa/rockpi-4/post-build.sh b/board/radxa/rockpi-4/post-build.sh deleted file mode 100755 index ba29375c05..0000000000 --- a/board/radxa/rockpi-4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/radxa/rockpi-4/readme.txt b/board/radxa/rockpi-4/readme.txt deleted file mode 100644 index 1db7569ed9..0000000000 --- a/board/radxa/rockpi-4/readme.txt +++ /dev/null @@ -1,61 +0,0 @@ -RADXA ROCK_PI_4 -================ -https://rockpi.org/rockpi4 - -ROCK Pi 4 is a Single Board Computer (SBC) from radxa. This guide is valid -for the below models: -- ROCK PI 4 Model A -- ROCK PI 4 Model B -- ROCK PI 4 Model C - -Build: -====== - $ make rock_pi_4_defconfig - $ make - -Files created in output directory -================================= - -output/images - -????????? bl31.elf -????????? boot.vfat -????????? extlinux -????????? idbloader.img -????????? Image -????????? rk3399-rock-pi-4.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device. - -Booting: -======== - -Serial console: ---------------- -RockPi4 has a 40-pin GPIO header. The pin layout is as follows: - -pin 6: gnd -pin 8: tx -pin 10: rx - -Baudrate for this board is 1500000. - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -Wiki link: -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/rock-pi-4.html diff --git a/configs/rock_pi_4_defconfig b/configs/rock_pi_4_defconfig deleted file mode 100644 index 401a59bac4..0000000000 --- a/configs/rock_pi_4_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/amarula/u-boot-amarula.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="cf2747360fdd1eb0d51dd01a984c7c62c7f714fe" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock-pi-4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.46" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rock-pi-4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="rockpi4" -BR2_TARGET_GENERIC_ISSUE="Welcome to ROCK_PI_4" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="96M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rockpi-4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rockpi-4/post-build.sh" From yann.morin.1998 at free.fr Mon Feb 20 20:52:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:31 -0000 Subject: [Buildroot] [git commit branch/next] package/xterm: security bump to patch 376 Message-ID: <20230220205151.A53CA86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0cc7c63f91ffadb0835bb57cdb7bfffdf7803add branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issue: CVE-2022-45063: xterm before 375 allows code execution via font ops, e.g., because an OSC 50 response may have Ctrl-g and therefore lead to command execution within the vi line-editing mode of Zsh: https://www.openwall.com/lists/oss-security/2022/11/10/1 Additionally, patch 376 fixes a null pointer access issue: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1022942 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/xterm/xterm.hash | 2 +- package/xterm/xterm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index 3f6ec765ce..12cd2e639b 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 32f888277b19e28ebc0a3112bff000607c07bed0679caa0beebb36f9cad484f5 xterm-371.tgz +sha256 1e5bb7aad068fb31d6d3cbb77f80c7ad1526cd4c956a4ddcf2c5cf28af5334e1 xterm-376.tgz # Locally calculated sha256 9521ef761474cd31ea406f56a751646a7b42a9287cdc6f2f8e52ed4c4d2a73e7 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index 95984f1cf9..d01b608d99 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 371 +XTERM_VERSION = 376 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From yann.morin.1998 at free.fr Mon Feb 20 20:52:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:32 -0000 Subject: [Buildroot] [git commit branch/next] package/libksba: security bump to version 1.6.2 Message-ID: <20230220205151.7A4C886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c0311220fb627db8af4a2cd8c3adb067e8a308d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A severe bug has been found in Libksba , the library used by GnuPG for parsing the ASN.1 structures as used by S/MIME. The bug affects all versions of Libksba before 1.6.2 and may be used for remote code execution. Fix CVE-2022-3515 Signed-off-by: Michael Fischer Signed-off-by: Yann E. MORIN --- package/libksba/libksba.hash | 2 +- package/libksba/libksba.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libksba/libksba.hash b/package/libksba/libksba.hash index 422048be5f..77485c0cb6 100644 --- a/package/libksba/libksba.hash +++ b/package/libksba/libksba.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b libksba-1.6.0.tar.bz2 +sha256 fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971 libksba-1.6.2.tar.bz2 # Hash for license files: sha256 8f1b87e551d97b2b23b6d3403a5d598c63ea89824cb8ee351f631f6cab2beaa5 AUTHORS diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index ca5fc1d749..3a8b3fa502 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKSBA_VERSION = 1.6.0 +LIBKSBA_VERSION = 1.6.2 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:32 -0000 Subject: [Buildroot] [git commit branch/next] configs/roc_pc_rk3399: remove defconfig Message-ID: <20230220205149.90AAF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5370ec74516495a4ac6c0bc9780b8e92a2f1e6b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3259671226 Cc: Suniel Mahesh Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 -- board/firefly/roc-rk3399-pc/extlinux.conf | 4 ---- board/firefly/roc-rk3399-pc/genimage.cfg | 22 ----------------- board/firefly/roc-rk3399-pc/post-build.sh | 5 ---- board/firefly/roc-rk3399-pc/readme.txt | 40 ------------------------------- 5 files changed, 73 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 81e6cd54ab..c282a867ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2728,13 +2728,11 @@ F: package/hwloc/ F: package/powertop/ N: Suniel Mahesh -F: board/firefly/ F: board/friendlyarm/nanopi-m4 F: board/pine64/rockpro64 F: board/radxa/rockpi-4 F: board/radxa/rockpi-n8 F: board/radxa/rockpi-n10 -F: configs/roc_pc_rk3399_defconfig F: configs/rock_pi_4_defconfig F: configs/rock_pi_n8_defconfig F: configs/rock_pi_n10_defconfig diff --git a/board/firefly/roc-rk3399-pc/extlinux.conf b/board/firefly/roc-rk3399-pc/extlinux.conf deleted file mode 100644 index 50a358fadc..0000000000 --- a/board/firefly/roc-rk3399-pc/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399RocPC linux - kernel /boot/Image - devicetree /boot/rk3399-roc-pc.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p1 rootwait diff --git a/board/firefly/roc-rk3399-pc/genimage.cfg b/board/firefly/roc-rk3399-pc/genimage.cfg deleted file mode 100644 index 966c869273..0000000000 --- a/board/firefly/roc-rk3399-pc/genimage.cfg +++ /dev/null @@ -1,22 +0,0 @@ -image sdcard.img { - hdimage { - } - - partition u-boot-tpl-spl-dtb { - in-partition-table = "no" - image = "idbloader.img" - offset = 32K - } - - partition u-boot-dtb { - in-partition-table = "no" - image = "u-boot.itb" - offset = 8M - size = 30M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/firefly/roc-rk3399-pc/post-build.sh b/board/firefly/roc-rk3399-pc/post-build.sh deleted file mode 100755 index 1f5ff6a611..0000000000 --- a/board/firefly/roc-rk3399-pc/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/firefly/roc-rk3399-pc/readme.txt b/board/firefly/roc-rk3399-pc/readme.txt deleted file mode 100644 index 8a6f1cdee6..0000000000 --- a/board/firefly/roc-rk3399-pc/readme.txt +++ /dev/null @@ -1,40 +0,0 @@ -Libre Computer Board ROC-RK3399-PC -=================================== - -Build: - - $ make roc_pc_rk3399_defconfig - $ make - -Files created in output directory -================================= - -output/images - -????????? bl31.elf -????????? idbloader.img -????????? Image -????????? rk3399-roc-pc.dtb -????????? rootfs.ext2 -????????? rootfs.ext4 -> rootfs.ext2 -????????? rootfs.tar -????????? sdcard.img -????????? u-boot.bin -????????? u-boot.itb - -Creating bootable SD card: -========================== - -Simply invoke (as root) - -sudo dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device - -Serial console --------------- - -Baudrate for this board is 1500000 - -Wiki link: -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/roc-rk3399-pc.html From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:33 -0000 Subject: [Buildroot] [git commit branch/next] package/alsa-utils: update dependency for topology support Message-ID: <20230220205149.DA3358648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e62cf8d9025506ebcb9c1b1d3bb49523474851eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is a follow-up patch for https://git.busybox.net/buildroot/commit/?id=28497102e1788df3628bd3324a3304a03c7942d0 which created a new option for topology support in alsa-lib, this dependency was not ported over to alsa-utils. Fixes: http://autobuild.buildroot.net/results/a9c9f5157365efe8271bf69dab0d5a5532b196ea/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/alsa-utils/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in index 555f06fd21..3429d0b406 100644 --- a/package/alsa-utils/Config.in +++ b/package/alsa-utils/Config.in @@ -46,6 +46,7 @@ config BR2_PACKAGE_ALSA_UTILS_ALSAUCM config BR2_PACKAGE_ALSA_UTILS_ALSATPLG bool "alsatplg" depends on !BR2_STATIC_LIBS # dlfcn.h + select BR2_PACKAGE_ALSA_LIB_TOPOLOGY comment "alsatplg needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS From yann.morin.1998 at free.fr Mon Feb 20 20:52:33 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:33 -0000 Subject: [Buildroot] [git commit branch/next] package/openpgm: fix build for non-x86 targets Message-ID: <20230220205151.B1F8F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f706ebb2cf325565f12b532c84a9d5ebe14d0d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next openpgm-5-3-128 has assembly code for x86 that is not guarded by architecture defines. A patch to fix that has been merged upstream some time ago, and the next release will have it. This includes that patch for the time being. Fixes: http://autobuild.buildroot.net/results/338291e5bf0671cb7ed7a32cc10e546c7a521acc Fixes: http://autobuild.buildroot.net/results/3ab6d7f9ee841fa18c1c220d722b1c06ca1fff30 Fixes: http://autobuild.buildroot.net/results/68e840b1fec8f14775cef0b6a14d9b847337324b Signed-off-by: Alexander Lukichev Signed-off-by: Yann E. MORIN --- package/openpgm/0003-fix-build-on-macOS-ARM.patch | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/package/openpgm/0003-fix-build-on-macOS-ARM.patch b/package/openpgm/0003-fix-build-on-macOS-ARM.patch new file mode 100644 index 0000000000..5769c5d7f1 --- /dev/null +++ b/package/openpgm/0003-fix-build-on-macOS-ARM.patch @@ -0,0 +1,34 @@ +From 43dfc3e3a66b8e4584eb46219b129197a2428181 Mon Sep 17 00:00:00 2001 +From: Michael Cho +Date: Thu, 10 Mar 2022 22:46:29 -0800 +Subject: [PATCH] fix build on macOS ARM + +[alexander.lukichev at gmail.com: backport from upstream] +Signed-off-by: Alexander Lukichev +--- + openpgm/pgm/cpu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/openpgm/pgm/cpu.c b/openpgm/pgm/cpu.c +index cbcc988..f5da471 100644 +--- a/openpgm/pgm/cpu.c ++++ b/openpgm/pgm/cpu.c +@@ -33,6 +33,7 @@ + //#define CPU_DEBUG + + ++#if defined(__i386__) || defined(__x86_64__) + #ifndef _MSC_VER + static + void +@@ -59,7 +60,6 @@ _xgetbv(uint32_t xcr) { + #endif + + +-#if defined(__i386__) || defined(__x86_64__) + PGM_GNUC_INTERNAL + void + pgm_cpuid (pgm_cpu_t* cpu) +-- +2.37.2 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:34 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx/imx-gpu-viv: drop X11 output Message-ID: <20230220205232.F1954828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=424f53ac0730ea8e8aac4f3341f25a9829582cbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since e8df0f7 (package/freescale-imx/imx-gpu-viv: bump to version 6.4.3.p4.4) the X11 folder is no longer included in the archive. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ++++++ package/freescale-imx/imx-gpu-viv/Config.in | 22 ++++------------------ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 16 +--------------- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6d66f1b958..41c5fdefb3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 + bool "imx-gpu-viv X11 output has been removed" + select BR2_LEGACY + help + The X11 output was dropped by NXP. + config BR2_PACKAGE_QEMU_CUSTOM_TARGETS string "the QEMU specific targets option has been removed" help diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index 9ba3d0428e..9372b6313f 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -27,9 +27,9 @@ config BR2_PACKAGE_IMX_GPU_VIV Userspace libraries for Vivante GPU on i.MX platforms It contains libraries and headers for GLES, OpenCL, and - OpenVG. It also contains a DRI plugin for X11. It also - contains a plugin for DirectFB-1.4.0, but that doesn't work - together with buildroot's DirectFB version. + OpenVG. It also contains a plugin for DirectFB-1.4.0, but + that doesn't work together with buildroot's DirectFB + version. This library is provided by Freescale as-is and doesn't have an upstream. @@ -40,22 +40,9 @@ choice prompt "Output option" help There are two versions of this library: one for - direct framebuffer access, one for X11 rendering. + direct framebuffer access, one for wayland rendering. Choose here which version to install. -config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - bool "X11" - depends on BR2_PACKAGE_XORG7 - # The i.MX8 blob doesn't support X11 output - depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXFIXES - -comment "X11 backend needs Xorg package" - depends on !BR2_PACKAGE_XORG7 - depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M - config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB bool "Framebuffer" # The i.MX8 blob doesn't support FB output @@ -70,7 +57,6 @@ endchoice config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT string - default "x11" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 default "fb" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB default "wayland" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 06fbbc7343..e0e8a31533 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -26,14 +26,6 @@ endif IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT)) -ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -# The libGAL.so library provided by imx-gpu-viv uses X functions. Packages -# may want to link against libGAL.so (QT5 Base with OpenGL and X support -# does so). For this to work we need build dependencies to libXdamage, -# libXext and libXfixes so that X functions used in libGAL.so are referenced. -IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes -endif - # Libraries are linked against libdrm, except framebuffer output on ARM ifneq ($(IMX_GPU_VIV_LIB_TARGET)$(BR2_arm),fby) IMX_GPU_VIV_DEPENDENCIES += libdrm @@ -55,12 +47,6 @@ else ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland) define IMX_GPU_VIV_FIXUP_PKGCONFIG ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc endef -else ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -define IMX_GPU_VIV_FIXUP_PKGCONFIG - $(foreach lib,egl glesv1_cm glesv2 vg, \ - ln -sf $(lib)_x11.pc $(@D)/gpu-core/usr/lib/pkgconfig/$(lib).pc - ) -endef endif # Instead of building, we fix up the inconsistencies that exist @@ -68,7 +54,7 @@ endif # Make sure these commands are idempotent. define IMX_GPU_VIV_BUILD_CMDS cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_LIB_TARGET)/* $(@D)/gpu-core/usr/lib/ - $(foreach backend,fb x11 wayland, \ + $(foreach backend,fb wayland, \ $(RM) -r $(@D)/gpu-core/usr/lib/$(backend) ) $(IMX_GPU_VIV_FIXUP_PKGCONFIG) From yann.morin.1998 at free.fr Mon Feb 20 20:52:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:34 -0000 Subject: [Buildroot] [git commit branch/next] packages/sudo: explicitly set enable-tmpfiles.d Message-ID: <20230220205150.294C98648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c333176a3dae8aa4fa5468e3345d71bc10c44ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next sudo's configure script looks up on the host to determine the path where to install its systemd tmpfiles. That is incorrect in cross-compilation. We can explicitly tell sudo where to install its tmpfiles, which we do when systemd is enabled (in Buildroot, systemd-tmpfiles is always enabled when systemd is), or we can tell it not to install tmpfiles at all, which we do otherwise. Signed-off-by: Nuno Gon??alves [yann.morin.1998 at free.fr: reword and extend commit log] Signed-off-by: Yann E. MORIN --- package/sudo/sudo.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 28cfcbb1e2..8e237bd36a 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -17,6 +17,7 @@ SUDO_SELINUX_MODULES = sudo SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \ --with-tzdir=$(if $(BR2_PACKAGE_TZDATA),/usr/share/zoneinfo,no) \ + --enable-tmpfiles.d=$(if $(BR2_PACKAGE_SYSTEMD),/usr/lib/tmpfiles.d,no) \ --without-lecture \ --without-sendmail \ --without-umask \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:34 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx/imx-gpu-viv: add platform specific drivers Message-ID: <20230220205233.19B2B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=838c9a33be603e59ff7f65041bbcc138e573d13f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since e8df0f7 (package/freescale-imx/imx-gpu-viv: bump to version 6.4.3.p4.4) the archive contains platform specific drivers that need to be copied and included. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-viv/Config.in | 8 ++++++++ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index 9372b6313f..3e095b730c 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -77,6 +77,14 @@ if BR2_aarch64 config BR2_PACKAGE_PROVIDES_LIBGBM default "imx-gpu-viv" +config BR2_PACKAGE_IMX_GPU_VIV_PLATFORM + string + default "mx8mn" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + default "mx8mp" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + default "mx8mq" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + default "mx8qm" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + default "mx8qxp" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + endif config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index e0e8a31533..f72735e093 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -49,6 +49,13 @@ define IMX_GPU_VIV_FIXUP_PKGCONFIG endef endif +IMX_GPU_VIV_PLATFORM_DIR = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_PLATFORM)) +ifneq ($(IMX_GPU_VIV_PLATFORM_DIR),) +define IMX_GPU_VIV_COPY_PLATFORM + cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_PLATFORM_DIR)/* $(@D)/gpu-core/usr/lib/ +endef +endif + # Instead of building, we fix up the inconsistencies that exist # in the upstream archive here. We also remove unused backend files. # Make sure these commands are idempotent. @@ -57,6 +64,10 @@ define IMX_GPU_VIV_BUILD_CMDS $(foreach backend,fb wayland, \ $(RM) -r $(@D)/gpu-core/usr/lib/$(backend) ) + $(IMX_GPU_VIV_COPY_PLATFORM) + $(foreach platform,mx8mn mx8mp mx8mq mx8qm mx8qxp mx8ulp, \ + $(RM) -r $(@D)/gpu-core/usr/lib/$(platform) + ) $(IMX_GPU_VIV_FIXUP_PKGCONFIG) endef From yann.morin.1998 at free.fr Mon Feb 20 20:52:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:34 -0000 Subject: [Buildroot] [git commit branch/next] package/samba4: security bump to version 4.15.12 Message-ID: <20230220205151.E9052828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81a02457b0f161d6a0b7c9f2f916d55983e5cb44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issue: - CVE-2022-42898: Samba buffer overflow vulnerabilities on 32-bit systems https://www.samba.org/samba/security/CVE-2022-42898.html Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 f845a31290..81cbab4552 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.11.tar.asc -sha256 2f305980d49c7723cbef281fff2b81a2eeafae51e58b5172bb43d9693ef8953b samba-4.15.11.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.12.tar.asc +sha256 5889493d69dc7723be6c3154387fbed38c1cddf93a16da8670d99b7cca33b15e samba-4.15.12.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 814bf0bbaa..31f692e03d 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.11 +SAMBA4_VERSION = 4.15.12 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:52:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:35 -0000 Subject: [Buildroot] [git commit branch/next] package/sdl2: fix sdl_init() error with kernel 5.15 Message-ID: <20230220205152.0F2A986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7928c51bf625333102358ed1c9d84efe3e6bdc01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes #6421 Backport from: da9ba3a2a1536017e4ce1ee0f4276578d1ce6e29 Signed-off-by: Michael Fischer [yann.morin.1998 at free.fr: make it an actual backport] Signed-off-by: Yann E. MORIN --- ...oesn-t-have-a-mode-configured-use-the-pre.patch | 76 ++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch b/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch new file mode 100644 index 0000000000..c8be280c56 --- /dev/null +++ b/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch @@ -0,0 +1,76 @@ +From da9ba3a2a1536017e4ce1ee0f4276578d1ce6e29 Mon Sep 17 00:00:00 2001 +From: Sam Lantinga +Date: Fri, 18 Nov 2022 12:17:27 -0800 +Subject: [PATCH] If a CRTC doesn't have a mode configured, use the preferred + or largest mode as the default mode + +Fixes https://github.com/libsdl-org/SDL/issues/6421 + +[mf at go-sys.de: backport from upstream] +Signed-off-by: Michael Fischer +[yann.morin.1998 at free.fr: do an actual backport] +Signed-off-by: Yann E. MORIN +--- + src/video/kmsdrm/SDL_kmsdrmvideo.c | 35 +++++++++++++++++++++++++----- + 1 file changed, 29 insertions(+), 6 deletions(-) + +diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c +index eae721455..eeeefef2b 100644 +--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c ++++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c +@@ -666,8 +666,8 @@ KMSDRM_CrtcGetVrr(uint32_t drm_fd, uint32_t crtc_id) + /* Gets a DRM connector, builds an SDL_Display with it, and adds it to the + list of SDL Displays in _this->displays[] */ + static void +-KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) { +- ++KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) ++{ + SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata); + SDL_DisplayData *dispdata = NULL; + SDL_VideoDisplay display = {0}; +@@ -770,14 +770,37 @@ KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) { + drmModeModeInfo *mode = &connector->modes[i]; + + if (!SDL_memcmp(mode, &crtc->mode, sizeof(crtc->mode))) { +- mode_index = i; +- break; ++ mode_index = i; ++ break; + } + } + + if (mode_index == -1) { +- ret = SDL_SetError("Failed to find index of mode attached to the CRTC."); +- goto cleanup; ++ int current_area, largest_area = 0; ++ ++ /* Find the preferred mode or the highest resolution mode */ ++ for (i = 0; i < connector->count_modes; i++) { ++ drmModeModeInfo *mode = &connector->modes[i]; ++ ++ if (mode->type & DRM_MODE_TYPE_PREFERRED) { ++ mode_index = i; ++ break; ++ } ++ ++ current_area = mode->hdisplay * mode->vdisplay; ++ if (current_area > largest_area) { ++ mode_index = i; ++ largest_area = current_area; ++ } ++ } ++ if (mode_index != -1) { ++ crtc->mode = connector->modes[mode_index]; ++ } ++ } ++ ++ if (mode_index == -1) { ++ ret = SDL_SetError("Failed to find index of mode attached to the CRTC."); ++ goto cleanup; + } + + /*********************************************/ +-- +2.25.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:35 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/kria/kv260/uboot.fragment: remove unnecessary CONFIG_MULTI_DTB_FIT option Message-ID: <20230220205150.5CF58828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=515319b86f17ea5a2ce3e51c9063bac9f9e00a01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch removes the CONFIG_MULTI_DTB_FIT u-boot option for the zynqmp_kria_kv260_defconfig as it is not necessary. The post build kv260.sh creates the proper u-boot.itb without needing this option. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3310463281 Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- board/zynqmp/kria/kv260/uboot.fragment | 1 - 1 file changed, 1 deletion(-) diff --git a/board/zynqmp/kria/kv260/uboot.fragment b/board/zynqmp/kria/kv260/uboot.fragment index 874eb470ac..0ed560c411 100644 --- a/board/zynqmp/kria/kv260/uboot.fragment +++ b/board/zynqmp/kria/kv260/uboot.fragment @@ -1,7 +1,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp-smk-k26-revA" CONFIG_SYS_SPI_U_BOOT_OFFS=0xF80000 CONFIG_DTB_RESELECT=y -CONFIG_MULTI_DTB_FIT=y CONFIG_DMA=y CONFIG_XILINX_DPDMA=y CONFIG_PHY=y From yann.morin.1998 at free.fr Mon Feb 20 20:52:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:35 -0000 Subject: [Buildroot] [git commit branch/next] package/python-alembic: bump to version 1.9.1 Message-ID: <20230220205233.7802D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cde8b664b5fef509df74582097b925b899191543 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-alembic/python-alembic.hash | 4 ++-- package/python-alembic/python-alembic.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-alembic/python-alembic.hash b/package/python-alembic/python-alembic.hash index e256e9dc08..f94f5ab10a 100644 --- a/package/python-alembic/python-alembic.hash +++ b/package/python-alembic/python-alembic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/alembic/json -md5 667a722df7dbef926a4ce760b9917622 alembic-1.8.1.tar.gz -sha256 cd0b5e45b14b706426b833f06369b9a6d5ee03f826ec3238723ce8caaf6e5ffa alembic-1.8.1.tar.gz +md5 999392ffc900da18afbf10d2ac31bdc6 alembic-1.9.1.tar.gz +sha256 f9f76e41061f5ebe27d4fe92600df9dd612521a7683f904dab328ba02cffa5a2 alembic-1.9.1.tar.gz # Locally computed sha256 checksums sha256 f0e3f7a5080879ccae798882d9bee3d48fe335d0bad84ca8eec86fa594375ea0 LICENSE diff --git a/package/python-alembic/python-alembic.mk b/package/python-alembic/python-alembic.mk index 735678b384..64ce85bead 100644 --- a/package/python-alembic/python-alembic.mk +++ b/package/python-alembic/python-alembic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ALEMBIC_VERSION = 1.8.1 +PYTHON_ALEMBIC_VERSION = 1.9.1 PYTHON_ALEMBIC_SOURCE = alembic-$(PYTHON_ALEMBIC_VERSION).tar.gz -PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/37/ab/80e6d86ca81235ea1a7104089dddf74de4b45f8af0a05d4b265be44d6ff9 +PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/81/87/5c531d2923c61e7ae68b23c8660df289ae4241a0d38f3fbcbd8dba64ca6b PYTHON_ALEMBIC_SETUP_TYPE = setuptools PYTHON_ALEMBIC_LICENSE = MIT PYTHON_ALEMBIC_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:52:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:36 -0000 Subject: [Buildroot] [git commit branch/next] package/imagemagick: utilities now need C++ support Message-ID: <20230220205150.3B0BC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0910ada70b7194596c6ace0cb06b303173c13de7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since upstream commit https://github.com/ImageMagick/ImageMagick/commit/07f3b487f9860fd4eb9422f1a906d0fe83b6fd1c (which first appeared in version 7.1.0-47), ImageMagick forces the need of a C++ compiler to build its utilities. Despite the request of Bernd Kuhls to revert this change, upstream declined. Since this change is causing build failures in our autobuilders, our only choice is to follow the choice of upstream, and disable building the utilities when C++ support is not available. Fixes: http://autobuild.buildroot.net/results/4283235d697408cf2e70be5e3769dbe6ebb9ddae/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/imagemagick/imagemagick.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 6bdf24c1e8..8a2ec460d5 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -178,6 +178,12 @@ else IMAGEMAGICK_CONF_OPTS += --without-bzlib endif +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +IMAGEMAGICK_CONF_OPTS += --with-utilities +else +IMAGEMAGICK_CONF_OPTS += --without-utilities +endif + HOST_IMAGEMAGICK_CONF_OPTS = \ --disable-opencl \ --disable-openmp \ From yann.morin.1998 at free.fr Mon Feb 20 20:52:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:36 -0000 Subject: [Buildroot] [git commit branch/next] package/sdl: add upstream security fix for CVE-2022-34568 Message-ID: <20230220205152.1BA81828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7368099ae9767a57ec72fcfbb29a5d85ac7bcf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next SDL v1.2 was discovered to contain a use-after-free via the XFree function at /src/video/x11/SDL_x11yuv.c. https://github.com/advisories/GHSA-wr7h-5wm3-p3h4 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- ...-SDL_x11yuv.c-fix-possible-use-after-free.patch | 28 ++++++++++++++++++++++ package/sdl/sdl.mk | 3 +++ 2 files changed, 31 insertions(+) diff --git a/package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch b/package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch new file mode 100644 index 0000000000..d7858d0f96 --- /dev/null +++ b/package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch @@ -0,0 +1,28 @@ +From d7e00208738a0bc6af302723fe64908ac35b777b Mon Sep 17 00:00:00 2001 +From: Ozkan Sezer +Date: Sat, 18 Jun 2022 14:55:00 +0300 +Subject: [PATCH] SDL_x11yuv.c: fix possible use-after-free + +Fixes: https://github.com/libsdl-org/SDL-1.2/issues/863 +Signed-off-by: Peter Korsgaard +--- + src/video/x11/SDL_x11yuv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/video/x11/SDL_x11yuv.c b/src/video/x11/SDL_x11yuv.c +index 62698dfd..0d5754e3 100644 +--- a/src/video/x11/SDL_x11yuv.c ++++ b/src/video/x11/SDL_x11yuv.c +@@ -374,8 +374,8 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S + #ifdef PITCH_WORKAROUND + if ( hwdata->image != NULL && hwdata->image->pitches[0] != (width*bpp) ) { + /* Ajust overlay width according to pitch */ +- XFree(hwdata->image); + width = hwdata->image->pitches[0] / bpp; ++ XFree(hwdata->image); + hwdata->image = SDL_NAME(XvCreateImage)(GFX_Display, xv_port, format, + 0, width, height); + } +-- +2.30.2 + diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 7389cd3edb..462600debb 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -13,6 +13,9 @@ SDL_CPE_ID_VENDOR = libsdl SDL_CPE_ID_PRODUCT = simple_directmedia_layer SDL_INSTALL_STAGING = YES +# 0003-SDL_x11yuv.c-fix-possible-use-after-free.patch +SDL_IGNORE_CVES += CVE-2022-34568 + # we're patching configure.in, but package cannot autoreconf with our version of # autotools, so we have to do it manually instead of setting SDL_AUTORECONF = YES define SDL_RUN_AUTOGEN From yann.morin.1998 at free.fr Mon Feb 20 20:52:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:37 -0000 Subject: [Buildroot] [git commit branch/next] configs/kontron_bl_imx8mm_defconfig: bump U-boot to 2022.10 Message-ID: <20230220205150.0F308828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e63809d8d7ed873f320c61fc0eb7e0f64250acf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 223516b51e1a (configs/kontron_bl_imx8mm: U-Boot needs util-linux) added the needed dependency against host-util-linux, but missed an earlier comment about u-boot still failing [0] The U-Boot makefile for the host tools does not handle the compiler/linker options properly. There are some patches [1][2] that fixes that issue already applied in the newer U-Boot version 2022.10. So we have to bump U-Boot to fix an autobuilder failure. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3267233833 [0] https://lore.kernel.org/buildroot/CAEyMn7Y3UgT-8dYY5rbnzcPfbGmqRVXG=joWx1fSSCC=WiFzbg at mail.gmail.com/ [1] U-Boot: a638bd349ea43825 (kbuild: add KBUILD_HOSTLDFLAGS to cmd_host-csingle) [2] U-Boot: 31a7688cbe0ed5ed (tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls) Cc: Yann E. MORIN Signed-off-by: Heiko Thiery [yann.morin.1998 at free.fr: - update commit log with reference to [0] - slightly tweak commit log ] Signed-off-by: Yann E. MORIN --- configs/kontron_bl_imx8mm_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig index 13ed1a2078..240cb52245 100644 --- a/configs/kontron_bl_imx8mm_defconfig +++ b/configs/kontron_bl_imx8mm_defconfig @@ -38,7 +38,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880 BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:37 -0000 Subject: [Buildroot] [git commit branch/next] utils/genrandconfig: don't build igh-ethercat drivers Message-ID: <20230220205152.3E0C386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75cb8a490200e2480d1dcc2a2e59de0a575c1531 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next igh-ethercat comes with a small number of patched Linux kernel network drivers, which aim at replacing the ones available in upstream Linux kernel. All those drivers are provided only for specific kernel releases. For example: r8169-2.6.24-ethercat.c r8169-2.6.24-orig.c r8169-2.6.27-ethercat.c r8169-2.6.27-orig.c r8169-2.6.28-ethercat.c r8169-2.6.28-orig.c r8169-2.6.29-ethercat.c r8169-2.6.29-orig.c r8169-2.6.31-ethercat.c r8169-2.6.31-orig.c r8169-2.6.32-ethercat.c r8169-2.6.32-orig.c r8169-2.6.33-ethercat.c r8169-2.6.33-orig.c r8169-2.6.35-ethercat.c r8169-2.6.35-orig.c r8169-2.6.36-ethercat.c r8169-2.6.36-orig.c r8169-2.6.37-ethercat.c r8169-2.6.37-orig.c r8169-3.10-ethercat.c r8169-3.10-orig.c r8169-3.12-ethercat.c r8169-3.12-orig.c r8169-3.14-ethercat.c r8169-3.14-orig.c r8169-3.16-ethercat.c r8169-3.16-orig.c r8169-3.2-ethercat.c r8169-3.2-orig.c r8169-3.4-ethercat.c r8169-3.4-orig.c r8169-3.6-ethercat.c r8169-3.6-orig.c r8169-3.8-ethercat.c r8169-3.8-orig.c r8169-4.4-ethercat.c r8169-4.4-orig.c Obviously, this doesn't play well with the random configuration testing done by utils/genrandconfig. This commit avoids this issue by making sure we never build any of those drivers as part of the genrandconfig generated configurations. Fixes: http://autobuild.buildroot.net/results/07b7475d780c067d99ee5618a5fd2bb024a5b4e7/ Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 9c6c2b359c..eccd3a228e 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -629,6 +629,13 @@ def fixup_config(sysinfo, configfile): configlines.append('BR2_PACKAGE_XVISOR_USE_DEFCONFIG=y\n') configlines.remove('BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE=""\n') + # Don't build igh-ethercat driver as they are highly + # kernel-version specific + for opt in ['8139TOO', 'E100', 'E1000', 'E1000E', 'R8169']: + optstr = 'BR2_PACKAGE_IGH_ETHERCAT_%s=y\n' % opt + if optstr in configlines: + configlines.remove(optstr) + with open(configfile, "w+") as configf: configf.writelines(configlines) From yann.morin.1998 at free.fr Mon Feb 20 20:52:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:38 -0000 Subject: [Buildroot] [git commit branch/next] utils/genrandconfig: disallow configs with BR2_XTENSA_CUSTOM=y Message-ID: <20230220205150.B2EAB828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c81da5e41c8b8863920a1f0416e4f7f4d22788bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When BR2_XTENSA_CUSTOM=y is used with the internal toolchain, an overlay file is mandatory, which genrandconfig can't provide. So we simply disallow such configurations. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index f19a405685..9c6c2b359c 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -304,6 +304,11 @@ def fixup_config(sysinfo, configfile): # No C library for internal toolchain if 'BR2_TOOLCHAIN_BUILDROOT_NONE=y' in configlines: return False + # Xtensa custom cores require an overlay file with internal + # toolchains + if 'BR2_XTENSA_CUSTOM=y' in configlines and \ + 'BR2_TOOLCHAIN_BUILDROOT=y' in configlines: + return False if 'BR2_PACKAGE_AUFS_UTIL=y\n' in configlines and \ 'BR2_PACKAGE_AUFS_UTIL_VERSION=""\n' in configlines: From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:38 -0000 Subject: [Buildroot] [git commit branch/next] package/mesa3d: fix uClibc build Message-ID: <20230220205152.4C71086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ebfe647b6df76016fb8a50b718d60fdff15fe87 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Moved the util/compiler.h include to util/macros.h due to upstream commit which added static_assert() to src/util/macros.h https://cgit.freedesktop.org/mesa/mesa/commit/src/util/macros.h?h=22.2&id=f1023571e8ce7ccb6ec7bc115240cb76aef3e5e5 Please note that this patch can be removed when buildroot toolchains are updated to uClibc 1.0.42: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?h=v1.0.42&id=03fbd941e943976bb92cb392882c2ff7ec218704 Fixes: http://autobuild.buildroot.net/results/a55/a55d6980faad8b5063f8f4f8b89467061d44a2ae/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d/0004-Fix-uClibc-build.patch | 37 +++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/package/mesa3d/0004-Fix-uClibc-build.patch b/package/mesa3d/0004-Fix-uClibc-build.patch index 70ff5e2b4c..c8c82fe0dc 100644 --- a/package/mesa3d/0004-Fix-uClibc-build.patch +++ b/package/mesa3d/0004-Fix-uClibc-build.patch @@ -18,29 +18,22 @@ Fixes build errors with uClibc and gcc-9.3.0: function ???static_assert??? [-Werror=implicit-function-declaration] 101 | static_assert(ARRAY_SIZE(egl_platforms) == _EGL_NUM_PLATFORMS, +../src/util/macros.h:74:4: error: implicit declaration of function + ???static_assert??? [-Werror=implicit-function-declaration] + 74 | static_assert(cond, #cond); \ + | ^~~~~~~~~~~~~ + Patch sent upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13898 Signed-off-by: Bernd Kuhls --- - src/egl/main/egldisplay.c | 1 + - src/util/compiler.h | 10 ++++++++++ + src/util/compiler.h | 10 ++++++++++ + src/util/macros.h | 1 + 2 files changed, 11 insertions(+) -diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c -index 131fc22786f9..d3e2bb96e2f6 100644 ---- a/src/egl/main/egldisplay.c -+++ b/src/egl/main/egldisplay.c -@@ -42,6 +42,7 @@ - #endif - #include - #include "c11/threads.h" -+#include "util/compiler.h" - #include "util/macros.h" - #include "util/os_file.h" - #include "util/u_atomic.h" diff --git a/src/util/compiler.h b/src/util/compiler.h -index d184ad455af9..b5c56807acc6 100644 +index d184ad455af..b5c56807acc 100644 --- a/src/util/compiler.h +++ b/src/util/compiler.h @@ -36,6 +36,16 @@ @@ -60,6 +53,18 @@ index d184ad455af9..b5c56807acc6 100644 #include "util/macros.h" +diff --git a/src/util/macros.h b/src/util/macros.h +index 22b18303826..8f73ee72693 100644 +--- a/src/util/macros.h ++++ b/src/util/macros.h +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include "util/compiler.h" + + /* Compute the size of an array */ + #ifndef ARRAY_SIZE -- -GitLab +2.34.1 From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:39 -0000 Subject: [Buildroot] [git commit branch/next] package/dracut: workaround breakage on non-merged-usr hosts Message-ID: <20230220205150.8594B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4f5ed5a7cf035d448c49edd8d106a09ce945170 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next dracut is not really ready to be installed with a non-/ prefix, and it has a lot of hard-coded assumptions that it is going to run on the host for which it is goign to generate an initramfs; for example, it hard-codes calls to /lib/dracut/some-file in some of its modules. It also uses the host system layout to decide whether it needs a merged-usr or not. Furthermore, dracut populates the temporary directory which content will be used to generate the cpio, with a bunch of files, even before calling any of the dracut modules. The name for that temporary directory is not predictable (looks like the output of 'mktemp -d dracut.XXXXXX', with names like dracut.1Vfn9F seen while debugging). As a consequence, we can't prepare the temporary directory with the proper symlinks beforehand. So, we provide a very-early module of our own, that will (hopefully) run before any other module, to fixup the messed-up layout prepared by dracut. This module moves the content of /lib, /bin, and /sbin, out and into their counterparts in /usr, and creates the usual symlinks. When we do not require a merged-usr, then we have nothing to do, so the module checks for /lib being a symlink, as the hint that we want a merged-usr or not. Note: currently, we've seen nothing that dracut installed in /bin or /sbin, but for trying to be future-proof, we also handle them; this causes a spurious warning: mv: cannot stat '..../build/buildroot-fs/cpio/tmp/dracut.YQnzNP/initramfs/bin/*': No such file or directory Since there are already quite a bunch of similar failures in the official modules bundled in dracut, an extra such issue or two should not be too scary... Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261241 https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261239 https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261236 Signed-off-by: Yann E. MORIN Cc: Thierry Bultel Cc: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/dracut/dracut.mk | 2 ++ package/dracut/merged-usr-module-setup.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk index 742a073a36..597492bc5e 100644 --- a/package/dracut/dracut.mk +++ b/package/dracut/dracut.mk @@ -22,6 +22,8 @@ HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT # "ld-musl-x.so" symlinks, respectively - else the init process cannot # start define HOST_DRACUT_POST_INSTALL_LIBC_LINKS_MODULE + $(INSTALL) -D -m 0755 package/dracut/merged-usr-module-setup.sh \ + $(HOST_DIR)/lib/dracut/modules.d/0000-merged-usr/module-setup.sh $(INSTALL) -D -m 0755 package/dracut/libc-links-module-setup.sh \ $(HOST_DIR)/lib/dracut/modules.d/05libc-links/module-setup.sh endef diff --git a/package/dracut/merged-usr-module-setup.sh b/package/dracut/merged-usr-module-setup.sh new file mode 100644 index 0000000000..6dc0e7ca7b --- /dev/null +++ b/package/dracut/merged-usr-module-setup.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +check() { + [ -L "${dracutsysrootdir?}/lib" ] +} + +depends() { + return 0 +} + +install() { + # dracut pre-installs a set of files before calling any of + # the modules, and dracut also messes up host vs. target + # system, so on a non-merged-usr host, it will prepare a + # non-merged-usr initramfs, even though the current config + # is for a merged-usr system. + # So undo its borkage. + for dir in lib bin sbin; do + mkdir -p "${initdir?}/usr/${dir}" + if [ -d "${initdir?}/${dir}" ]; then + mv "${initdir?}/${dir}/"* "${initdir?}/usr/${dir}" + rm -rf "${initdir?}/${dir}" + ln -s "usr/${dir}" "${initdir?}/${dir}" + fi + done +} From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:39 -0000 Subject: [Buildroot] [git commit branch/next] boot/edk2: fix the build for arm sgi575 Message-ID: <20230220205152.7AC0886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79591b76674a8c0ed150021a27771a73a70d159b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The edk2 package can be configured for platform Arm Sgi575 but this does not build correctly: Usage: build.exe [options] [all|fds|genc|genmake|clean|cleanall|cleanlib|modules|libraries|run] build.exe: error: option -a: invalid choice: '-b' (choose from 'IA32', 'X64', 'EBC', 'ARM', 'AARCH64', 'RISCV64') make[1]: *** [package/pkg-generic.mk:293: /home/thomas/buildroot/buildroot/output/build/edk2-edk2-stable202102/.stamp_built] Error 2 make: *** [Makefile:84: _all] Error 2 Add the necessary definitions to fix the build. Signed-off-by: Vincent Stehl?? Cc: Dick Olsson Signed-off-by: Thomas Petazzoni --- boot/edk2/edk2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index 5cbd9d152e..7d8765c310 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -75,6 +75,12 @@ EDK2_PACKAGE_NAME = ArmVirtPkg EDK2_PLATFORM_NAME = ArmVirtQemuKernel EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) +else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_SGI575),y) +EDK2_ARCH = AARCH64 +EDK2_PACKAGE_NAME = Platform/ARM/SgiPkg/Sgi575 +EDK2_PLATFORM_NAME = Sgi575 +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME) + else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_VEXPRESS_FVP_AARCH64),y) EDK2_ARCH = AARCH64 EDK2_PACKAGE_NAME = Platform/ARM/VExpressPkg From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:40 -0000 Subject: [Buildroot] [git commit branch/next] package/matchbox-starup-monitor: fix build without C++ Message-ID: <20230220205150.6C5E28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b44f6c2f303ef03f563edd159b1c88d1cf118ed5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next matchbox-startup-monitor is an ageing package, and uses an old configure.ac with archaic constructs. This had generated a configure script that incorrectly tries to look for and validate a C++ compiler: checking for powerpc64le-buildroot-linux-gnu-g++... no checking whether we are using the GNU C++ compiler... no checking whether no accepts -g... no checking dependency style of no... none checking how to run the C++ preprocessor... /lib/cpp configure: error: C++ preprocessor "/lib/cpp" fails sanity check Calling autoreconf fixes the issue, as the generated configure no longer tries to look for a C++ compiler at all anymore. Running autoreconf does not add any new dependency, as they are already in the dependency chain via other packages. Fixes: http://autobuild.buildroot.org/results/223/223f43dd76ee907c5f25c4fee94a0f5d75614dd5/ See also similar changes: 9993a36f5e12 package/pamtester: fix build without C++ c05cc5de868c package/madplay: needs autoreconf eae18d01abc7 libmad: needs autoreconf 43274dd3e0da package/libid3tag: needs autoreconf Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/matchbox-startup-monitor/matchbox-startup-monitor.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox-startup-monitor/matchbox-startup-monitor.mk index c80e75332c..cd2ae4162f 100644 --- a/package/matchbox-startup-monitor/matchbox-startup-monitor.mk +++ b/package/matchbox-startup-monitor/matchbox-startup-monitor.mk @@ -11,4 +11,9 @@ MATCHBOX_STARTUP_MONITOR_LICENSE = GPL-2.0+ MATCHBOX_STARTUP_MONITOR_LICENSE_FILES = COPYING MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification +# Obsolete constructs in the archaic configure.ac generated an outworn +# configure script that incorrectly searches a C++ compiler. Regenerate +# the autoconf machinery to avoid failures without a C++ compiler. +MATCHBOX_STARTUP_MONITOR_AUTORECONF = YES + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:40 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8189es: bump to latest version to fix build failure with Linux >= 6.0 Message-ID: <20230220205152.70EC686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08a013d25a09d07a3e7a89b1afbb20da206a383d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop local patch that has been upstreamed[0] and drop the endianness handling too since from this commit[1] on it's handled by using Linux macro __LITTLE_ENDIAN. [0]: https://github.com/jwrdegoede/rtl8189ES_linux/commit/4a555ffb77a5947814b6c7f330968318e265c496 [1]: https://github.com/jwrdegoede/rtl8189ES_linux/commit/b3da33576da5359d85c7cfe82716c9a08a592aff Fixes: http://autobuild.buildroot.net/results/6178fbfbe9fe762645b1907c4ceb032a00e75a89/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...ve-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch | 40 ---------------------- package/rtl8189es/rtl8189es.hash | 2 +- package/rtl8189es/rtl8189es.mk | 10 ++---- 3 files changed, 3 insertions(+), 49 deletions(-) diff --git a/package/rtl8189es/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch b/package/rtl8189es/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch deleted file mode 100644 index dc4deff9f1..0000000000 --- a/package/rtl8189es/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4a555ffb77a5947814b6c7f330968318e265c496 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 28 Sep 2022 21:17:17 +0200 -Subject: [PATCH] Makefile: move 'EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)' at the - end of EXTRA_FLAGS assignment - -At the moment USER_EXTRA_CFLAGS can't override local Makfile EXTRA_CFLAGS -since it's assigned at the beginning of the Makefile. For example it's not -possible to undefine the hardcoded CONFIG_LITTLE_ENDIAN and this doesn't -allow to build these modules for big endian architectures. So let's move -the assignment of USER_EXTRA_CFLAGS to EXTRA_CFLAGS after the last -EXTRA_CFLAGS assignment. - -Signed-off-by: Giulio Benetti -[Upstream status: https://github.com/jwrdegoede/rtl8189ES_linux/pull/83] ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 8fcb7bd..e4664e9 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,3 @@ --EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) - EXTRA_CFLAGS += -O1 - #EXTRA_CFLAGS += -O3 - #EXTRA_CFLAGS += -Wall -@@ -2239,6 +2238,8 @@ ifneq ($(USER_MODULE_NAME),) - MODULE_NAME := $(USER_MODULE_NAME) - endif - -+EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -+ - ifneq ($(KERNELRELEASE),) - - ########### this part for *.mk ############################ --- -2.34.1 - diff --git a/package/rtl8189es/rtl8189es.hash b/package/rtl8189es/rtl8189es.hash index d897e5e6c2..44d73e60f0 100644 --- a/package/rtl8189es/rtl8189es.hash +++ b/package/rtl8189es/rtl8189es.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 74325014c1a8503b3a7e48ad06997baddad8c1dae86bb79f4368532cc3e75fb2 rtl8189es-39c17661136da48f8e9c644194dce6a7f5076896.tar.gz +sha256 96347dbfedd95a217fb89b7b295fe417b711dbad3db896ef0c2fa733c6d150fd rtl8189es-e58bd86c9d9408c648b1246a0dd76b16856ec172.tar.gz diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk index cddcb195f9..6acc409e73 100644 --- a/package/rtl8189es/rtl8189es.mk +++ b/package/rtl8189es/rtl8189es.mk @@ -4,20 +4,14 @@ # ################################################################################ -RTL8189ES_VERSION = 39c17661136da48f8e9c644194dce6a7f5076896 +RTL8189ES_VERSION = e58bd86c9d9408c648b1246a0dd76b16856ec172 RTL8189ES_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189ES_VERSION)) RTL8189ES_LICENSE = GPL-2.0 -# Undefine the hardcoded CONFIG_LITTLE_ENDIAN -RTL8189ES_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN -# Set endianness -RTL8189ES_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN - RTL8189ES_MODULE_MAKE_OPTS = \ CONFIG_RTL8189ES=m \ KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) \ - USER_EXTRA_CFLAGS="$(RTL8189ES_USER_EXTRA_CLAGS)" + KSRC=$(LINUX_DIR) define RTL8189ES_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) From yann.morin.1998 at free.fr Mon Feb 20 20:52:41 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:41 -0000 Subject: [Buildroot] [git commit branch/next] arch/arch.mk.xtensa: relax check on overlay file to apply only to internal toolchains Message-ID: <20230220205150.A940E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6465c79166fed0c9a9b99a15d34c555a3141344f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 4cbf7336914f25478aea943456ba7dc3c892c21a ("arch/xtensa: custom configuration requires an overlay") added a check in arch/arch.mk.xtensa to bail out if a custom Xtensa core is selected but not overlay file is provided. While this is indeed a perfectly valid check to make when building an internal toolchain, with an external toolchain it's entirely possible to build with no overlay file: the toolchain already exists, and there's no overlay to be applied in the context of the Buildroot build. And indeed commit 4cbf7336914f25478aea943456ba7dc3c892c21a broke some of the runtime test cases that use a custom Xtensa core configuration, with no overlay, to test the toolchains.bootlin.com Xtensa external toolchain. By relaxing the check to only apply to internal toolchain configurations, we fix those test cases. It is to be noted that this still allows a configuration where gdb gets built for a custom core, but with no overlay, so basically that means the fsf variant, which can lead to build or run failures that 4cbf7336914f attempted to fix to begin with. This still covers the most common cases. Finally, it also means being able to build a kernel with no overlay, but this is offset by the fact that the kernel may be already patched with an overlay (as it is possible to specify a custom kernel), which is most probably what people using a custom core would have. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261966 https://gitlab.com/buildroot.org/buildroot/-/jobs/3282261963 Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: extend commit log with last two paragraphs] Signed-off-by: Yann E. MORIN --- arch/arch.mk.xtensa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arch.mk.xtensa b/arch/arch.mk.xtensa index 7b6c59cecd..75145e725f 100644 --- a/arch/arch.mk.xtensa +++ b/arch/arch.mk.xtensa @@ -1,6 +1,6 @@ BR_ARCH_XTENSA_OVERLAY_FILE = $(call qstrip,$(BR2_XTENSA_OVERLAY_FILE)) -ifeq ($(BR_BUILDING)$(BR2_XTENSA_CUSTOM):$(BR_ARCH_XTENSA_OVERLAY_FILE),yy:) +ifeq ($(BR_BUILDING)$(BR2_XTENSA_CUSTOM)$(BR2_TOOLCHAIN_BUILDROOT):$(BR_ARCH_XTENSA_OVERLAY_FILE),yyy:) $(error No xtensa overlay file provided. Check your BR2_XTENSA_OVERLAY_FILE setting) endif From peter at korsgaard.com Mon Feb 20 20:52:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:41 -0000 Subject: [Buildroot] [git commit branch/next] package/gnupg2: bump version to 2.3.8 Message-ID: <20230220205152.9D8D386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73f04f7f0cb5ab7b4df0f2e8c706d73e6d12b793 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Brings a number of fixes: https://dev.gnupg.org/T6106 Add patch 0001 to fix undefined reference to `ks_ldap_free_state' backported from commit 7011286ce6e1fb56c2989fdafbd11b931c489faa Signed-off-by: Michael Fischer [Peter: add changelog info] Signed-off-by: Peter Korsgaard --- package/gnupg2/0001-ks_ldap_free_state.patch | 21 +++++++++++++++++++++ package/gnupg2/gnupg2.hash | 10 +++++----- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch new file mode 100644 index 0000000000..fa55d27c04 --- /dev/null +++ b/package/gnupg2/0001-ks_ldap_free_state.patch @@ -0,0 +1,21 @@ + +Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is not +installed + +Backported from: 7011286ce6e1fb56c2989fdafbd11b931c489faa + +Signed-off-by: Michael Fischer + +--- a/dirmngr/server.c ++++ b/dirmngr/server.c +@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) + ctrl->refcount); + else + { ++#if USE_LDAP + ks_ldap_free_state (ctrl->ks_get_state); + ctrl->ks_get_state = NULL; ++#endif + release_ctrl_ocsp_certs (ctrl); + xfree (ctrl->server_local); + dirmngr_deinit_default_ctrl (ctrl); diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index ec2654be7b..f9c071ad45 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q3/000474.html -sha1 9255a70a984bfbfa5312a9a52a1cf47cb0d1fc84 gnupg-2.3.7.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html +sha1 1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc gnupg-2.3.8.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.7.tar.bz2.sig -# using key 02F38DFF731FF97CB039A1DA549E695E905BA208 -sha256 ee163a5fb9ec99ffc1b18e65faef8d086800c5713d15a672ab57d3799da83669 gnupg-2.3.7.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.8.tar.bz2.sig +# using key 6DAA6E64A76D2840571B4902528897B826403ADA and AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD +sha256 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed gnupg-2.3.8.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 7d8424c136..9dc29ca99e 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.3.7 +GNUPG2_VERSION = 2.3.8 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From peter at korsgaard.com Mon Feb 20 20:52:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:41 -0000 Subject: [Buildroot] [git commit branch/next] package/libcamera: bump to version 0.0.3 Message-ID: <20230220205240.7BED086496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2890f308b5e884b2cbf9db3ccfd7ea7e0f4b0ddb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Libcamera recently started to tag releases, so use the version tag instead of raw commit hash. Signed-off-by: Daniel Semkowicz Reviewed-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 68c9c1f005..033e318910 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 59318208a9c1b183cacaf5a7175568d8a9fa094f2dd8c9794269bb6e9636986e libcamera-ba6435930f08e802cffc688d90f156a8959a0f86-br1.tar.gz +sha256 d7100286616550aca487b46ae9de2a70bb471352a332b8214901b4148739990f libcamera-v0.0.3-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 9c03d3a3b3..8979a43aca 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = ba6435930f08e802cffc688d90f156a8959a0f86 +LIBCAMERA_VERSION = v0.0.3 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:42 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/kria/kv260/kv260.sh: fix u-boot.itb without CONFIG_MULTI_DTB_FIT option Message-ID: <20230220205150.E61E0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec9519831ed5d5698c787b48d2ab952525cacb93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch fixes the kv260.sh to generate a working u-boot.itb now that the CONFIG_MULTI_DTB_FIT u-boot option is no longer used. This is a follow-up fix of 515319b86f17ea5a2ce3e51c9063bac9f9e00a01 ("board/zynqmp/kria/kv260/uboot.fragment: remove unnecessary CONFIG_MULTI_DTB_FIT option") to fix the build of: https://gitlab.com/buildroot.org/buildroot/-/jobs/3310463281 Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- board/zynqmp/kria/kv260/kv260.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/zynqmp/kria/kv260/kv260.sh b/board/zynqmp/kria/kv260/kv260.sh index e3467f3068..e891852009 100755 --- a/board/zynqmp/kria/kv260/kv260.sh +++ b/board/zynqmp/kria/kv260/kv260.sh @@ -8,5 +8,5 @@ UBOOT_DIR=$4 -fdtoverlay -o ${UBOOT_DIR}/fit-dtb.blob -i ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb ${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo +fdtoverlay -o ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb -i ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb ${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo ${UBOOT_DIR}/tools/mkimage -E -f ${UBOOT_DIR}/u-boot.its -B 0x8 ${BINARIES_DIR}/u-boot.itb From peter at korsgaard.com Mon Feb 20 20:52:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:42 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 19}.x / 6.0.x series Message-ID: <20230220205152.AA69A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f157a1136220ff0ad88766ebfb9d1ca9b4f59cc2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 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 ee59761f33..3631fcb6d6 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.0.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.0.9" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 c4ee15c37b..0af02e1326 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 8ede745a69351ea0f27fe0c48780d4efa37ff086135e129358ce09694957e8f9 linux-6.0.1.tar.xz +sha256 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7 linux-6.0.9.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 4686e33847db3ec58e1043bc0c806472aae694b2c413bb7d8da91a5c9a55eb1b linux-5.19.15.tar.xz -sha256 a822f09525ae8803453939a91e73f18097a3ba2aec73be4fe9ab314a0131715d linux-5.15.73.tar.xz -sha256 85253abf097eb5013b988a400eb022eed0e0626e7e0a7daa3ab4b6bcabbced9a linux-5.10.147.tar.xz -sha256 2bb826cdf9b2cfce385fb5d51fc8070fe428e467bd3df4ae2a7eb6f0c0cc2e63 linux-5.4.217.tar.xz +sha256 c93bb384a97ad1f0a4f18e442ce0291242722f78023eca658b22344541f09489 linux-5.19.17.tar.xz +sha256 cba39031dbc0eed0785b8afdc8c58cf23df83e47001b2354fa44486ae699c154 linux-5.15.79.tar.xz +sha256 f1b027526c58e7bd127f35b17736e4a6c865866b9048898f05c5358d4d52d4f3 linux-5.10.155.tar.xz +sha256 8b7df25b5560620eb2776d7b7c67569764b3916ff2f596767f72567b38d13d36 linux-5.4.224.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 bf021936a450e9292e10cc7db9909cd0d336406191d22aadd22bdcc51ca2595f linux-4.9.330.tar.xz -sha256 62ccb9ba94a7da5115bc923eebf8dffee9229801da02be87d90ae68ab9a76a6b linux-4.14.295.tar.xz -sha256 bec33298bd0470b5e725c7dc29a2dd4daf02065cb01cd4a54f6adee6ff582cb2 linux-4.19.261.tar.xz +sha256 41bf80c4766ba9915470afe97ead6a16faff484b94590387012ce7f9ce41502b linux-4.9.333.tar.xz +sha256 26233603ae992cd31e9f78066d54475b3e3f878ab0e3fd271e74a795ab60b15c linux-4.14.299.tar.xz +sha256 37406ead61149283973bccdf670a1fd020c2f19722b7176e88ec8567df6dacd0 linux-4.19.265.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8679241a2c..f72e7f408c 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -392,14 +392,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.330" if BR2_KERNEL_HEADERS_4_9 - default "4.14.295" if BR2_KERNEL_HEADERS_4_14 - default "4.19.261" if BR2_KERNEL_HEADERS_4_19 - default "5.4.217" if BR2_KERNEL_HEADERS_5_4 - default "5.10.147" if BR2_KERNEL_HEADERS_5_10 - default "5.15.73" if BR2_KERNEL_HEADERS_5_15 - default "5.19.15" if BR2_KERNEL_HEADERS_5_19 - default "6.0.1" if BR2_KERNEL_HEADERS_6_0 + default "4.9.333" if BR2_KERNEL_HEADERS_4_9 + default "4.14.299" if BR2_KERNEL_HEADERS_4_14 + default "4.19.265" if BR2_KERNEL_HEADERS_4_19 + default "5.4.224" if BR2_KERNEL_HEADERS_5_4 + default "5.10.155" if BR2_KERNEL_HEADERS_5_10 + default "5.15.79" if BR2_KERNEL_HEADERS_5_15 + default "5.19.17" if BR2_KERNEL_HEADERS_5_19 + default "6.0.9" if BR2_KERNEL_HEADERS_6_0 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 thomas.petazzoni at bootlin.com Mon Feb 20 20:52:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:43 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-data-optlist: bump to version 0.113 Message-ID: <20230220205241.C8E1B86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11133fbf22c64906655b7269d247ceeec28d0b41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-data-optlist/perl-data-optlist.hash | 4 ++-- package/perl-data-optlist/perl-data-optlist.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-data-optlist/perl-data-optlist.hash b/package/perl-data-optlist/perl-data-optlist.hash index 1c805acef7..ccc05ae4d6 100644 --- a/package/perl-data-optlist/perl-data-optlist.hash +++ b/package/perl-data-optlist/perl-data-optlist.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 3b2cdb7846391f9acaf4e948a9a6b21b Data-OptList-0.112.tar.gz -sha256 62c60ccaae88d5339ae36bcc8940b03388cf84adbf27828b1f8b300307103bab Data-OptList-0.112.tar.gz +md5 cda08370c4058ba56e40c2f21d94d233 Data-OptList-0.113.tar.gz +sha256 36aebc5817b7d4686b649434c2ee41f45c8bf97d4ca5a99f607cc40f695a4285 Data-OptList-0.113.tar.gz # computed by scancpan sha256 712f3e40537810ba3046533fd71d877f69ab446d5e8e8a1135771804494b8b42 LICENSE diff --git a/package/perl-data-optlist/perl-data-optlist.mk b/package/perl-data-optlist/perl-data-optlist.mk index 8e089245f6..1a9aa05cc9 100644 --- a/package/perl-data-optlist/perl-data-optlist.mk +++ b/package/perl-data-optlist/perl-data-optlist.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATA_OPTLIST_VERSION = 0.112 +PERL_DATA_OPTLIST_VERSION = 0.113 PERL_DATA_OPTLIST_SOURCE = Data-OptList-$(PERL_DATA_OPTLIST_VERSION).tar.gz PERL_DATA_OPTLIST_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RJ/RJBS PERL_DATA_OPTLIST_LICENSE = Artistic or GPL-1.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:43 -0000 Subject: [Buildroot] [git commit branch/next] package/gdal: switch to cmake build to fix libgeotiff detection Message-ID: <20230220205241.7E02786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b43579e9453a4e4f0d25d902634ebd9f1721dfc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next GDAL autoconf has wrong libgeotiff detection. It uses host's library if installed instead of buildroot one. Modern versions of gdal have no autoconf build scripts, just cmake only. So move to cmake build variant. Fixes: https://bugs.busybox.net/show_bug.cgi?id=15281 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/gdal/gdal.mk | 168 ++++++++++++++++++++++++++------------------------- 1 file changed, 87 insertions(+), 81 deletions(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 33e7ba724a..2d6dff1a93 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -12,6 +12,15 @@ GDAL_LICENSE_FILES = LICENSE.TXT GDAL_CPE_ID_VENDOR = osgeo GDAL_INSTALL_STAGING = YES GDAL_CONFIG_SCRIPTS = gdal-config +GDAL_SUPPORTS_IN_SOURCE_BUILD = NO + +# Using 'make' with CMake's Makefile generator will not work, as +# 'make' uses GNUmakefile first, but GNUmakefile is provided by +# autotools in gdal. We need to force 'make' to use the Makefile, +# which is generated by CMake. GNUmakefile and autoconf are dropped in +# 3.6 so this can be dropped in future version. +GDAL_MAKE_OPTS += -f Makefile + # gdal at its core only needs host-pkgconf, libgeotiff, proj and tiff # but since by default mrf driver support is enabled, it also needs # jpeg, libpng and zlib. By default there are also many other drivers @@ -20,97 +29,94 @@ GDAL_CONFIG_SCRIPTS = gdal-config # respectively needed dependencies. GDAL_DEPENDENCIES = host-pkgconf jpeg json-c libgeotiff libpng proj tiff zlib -# Yes, even though they have --with options, these few libraries are +# Yes, even though they have -DDGDAL_USE options, a few libraries are # mandatory. If we don't provide them, bundled versions are used. GDAL_CONF_OPTS = \ - --with-geotiff \ - --with-jpeg \ - --with-libjson-c=$(STAGING_DIR)/usr \ - --with-libtool \ - --with-libz \ - --with-png \ - --with-proj \ - --without-armadillo \ - --without-blosc \ - --without-brunsli \ - --without-cfitsio \ - --without-crypto \ - --without-cryptopp \ - --without-curl \ - --without-dds \ - --without-ecw \ - --without-expat \ - --without-exr \ - --without-fgdb \ - --without-freexl \ - --without-geos \ - --without-gnm \ - --without-libkml \ - --without-lz4 \ - --without-gta \ - --without-hdf4 \ - --without-hdf5 \ - --without-hdfs \ - --without-heif \ - --without-idb \ - --without-jp2lura \ - --without-java \ - --without-jpeg12 \ - --without-jxl \ - --without-kakadu \ - --without-kea \ - --without-lerc \ - --without-gif \ - --without-liblzma \ - --without-libdeflate \ - --without-mongocxxv3 \ - --without-mrsid \ - --without-jp2mrsid \ - --without-macosx-framework \ - --without-msg \ - --without-mysql \ - --without-netcdf \ - --without-null \ - --without-oci \ - --without-odbc \ - --without-ogdi \ - --without-opencl \ - --without-openjpeg \ - --without-pam \ - --without-pcidsk \ - --without-pcraster \ - --without-pcre \ - --without-pcre2 \ - --without-pdfium \ - --without-podofo \ - --without-poppler \ - --without-python \ - --without-qhull \ - --without-rasdaman \ - --without-rasterlite2 \ - --without-rdb \ - --without-sfcgal \ - --without-sosi \ - --without-spatialite \ - --without-sqlite3 \ - --without-teigha \ - --without-tiledb \ - --without-webp \ - --without-xerces \ - --without-zstd + -DGDAL_USE_GEOTIFF=ON \ + -DGDAL_USE_JPEG=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_PNG=ON \ + -DGDAL_USE_ARMADILLO=OFF \ + -DGDAL_USE_BLOSC=OFF \ + -DGDAL_USE_BRUNSLI=OFF \ + -DGDAL_USE_CFITSIO=OFF \ + -DGDAL_USE_OPENSSL=OFF \ + -DGDAL_USE_CRYPTOPP=OFF \ + -DGDAL_USE_CRNLIB=OFF \ + -DGDAL_USE_CURL=OFF \ + -DGDAL_USE_ECW=OFF \ + -DGDAL_USE_EXPAT=OFF \ + -DGDAL_USE_FILEGDB=OFF \ + -DGDAL_USE_FREEXL=OFF \ + -DGDAL_USE_GEOS=OFF \ + -DGDAL_USE_LIBKML=OFF \ + -DGDAL_USE_LZ4=OFF \ + -DGDAL_USE_GTA=OFF \ + -DGDAL_USE_HDF4=OFF \ + -DGDAL_USE_HDF5=OFF \ + -DGDAL_USE_HDFS=OFF \ + -DGDAL_USE_HEIF=OFF \ + -DGDAL_USE_IDB=OFF \ + -DGDAL_USE_LURATECH=OFF \ + -DGDAL_USE_JPEG12_INTERNAL=OFF \ + -DGDAL_USE_JXL=OFF \ + -DGDAL_USE_KDU=OFF \ + -DGDAL_USE_KEA=OFF \ + -DGDAL_USE_LERC=OFF \ + -DGDAL_USE_GIF=OFF \ + -DGDAL_USE_LIBLZMA=OFF \ + -DGDAL_USE_DEFLATE=OFF \ + -DGDAL_USE_MONGOCXX=OFF \ + -DGDAL_USE_MRSID=OFF \ + -DGDAL_USE_PUBLICDECOMPWT=OFF \ + -DGDAL_USE_MYSQL=OFF \ + -DGDAL_USE_NETCDF=OFF \ + -DGDAL_USE_ORACLE=OFF \ + -DGDAL_USE_ODBC=OFF \ + -DGDAL_USE_OGDI=OFF \ + -DGDAL_USE_OPENCL=OFF \ + -DGDAL_USE_OPENEXR=OFF \ + -DGDAL_USE_OPENJPEG=OFF \ + -DGDAL_USE_PCRE=OFF \ + -DGDAL_USE_PCRE2=OFF \ + -DGDAL_USE_PDFIUM=OFF \ + -DGDAL_USE_PODOFO=OFF \ + -DGDAL_USE_POPPLER=OFF \ + -DGDAL_USE_QHULL=OFF \ + -DGDAL_USE_RASDAMAN=OFF \ + -DGDAL_USE_RASTERLITE2=OFF \ + -DGDAL_USE_RDB=OFF \ + -DGDAL_USE_SFCGAL=OFF \ + -DGDAL_USE_FYBA=OFF \ + -DGDAL_USE_SPATIALITE=OFF \ + -DGDAL_USE_SQLITE3=OFF \ + -DGDAL_USE_TEIGHA=OFF \ + -DGDAL_USE_TILEDB=OFF \ + -DGDAL_USE_WEBP=OFF \ + -DGDAL_USE_XERCESC=OFF \ + -DGDAL_USE_ZSTD=OFF \ + -DGDAL_ENABLE_DRIVER_PCIDSK=OFF \ + -DGDAL_ENABLE_DRIVER_PCRASTER=OFF \ + -DGDAL_ENABLE_DRIVER_NULL=OFF \ + -DGDAL_ENABLE_MACOSX_FRAMEWORK=OFF \ + -DENABLE_GNM=OFF \ + -DENABLE_PAM=OFF \ + -DBUILD_JAVA_BINDINGS=OFF \ + -DBUILD_PYTHON_BINDINGS=OFF ifeq ($(BR2_PACKAGE_LIBXML2),y) GDAL_DEPENDENCIES += libxml2 -GDAL_CONF_OPTS += --with-xml2 +GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=ON else -GDAL_CONF_OPTS += --without-xml2 +GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=OFF endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql -GDAL_CONF_OPTS += --with-pg +GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON else -GDAL_CONF_OPTS += --without-pg +GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=OFF endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:43 -0000 Subject: [Buildroot] [git commit branch/next] boot/edk2: refine license Message-ID: <20230220205152.D72AD86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40c05259d89545c40a2ead709be161569db54a05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The edk2 project is licensed under the BSD-2-Clause license with a patent grant, as per commit 304bff7223a8 ("edk2: Change License.txt from 2-Clause BSD to BSD+Patent"). There is a BSD-2-Clause-Patent SPDX license identifier[1] for this case, therefore refine the edk2 package to use this more specific identifier. [1]: https://spdx.org/licenses/BSD-2-Clause-Patent.html Signed-off-by: Vincent Stehl?? Cc: Dick Olsson Signed-off-by: Thomas Petazzoni --- boot/edk2/edk2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index 7d8765c310..953bea6fd3 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -7,7 +7,7 @@ EDK2_VERSION = edk2-stable202102 EDK2_SITE = https://github.com/tianocore/edk2 EDK2_SITE_METHOD = git -EDK2_LICENSE = BSD-2-Clause +EDK2_LICENSE = BSD-2-Clause-Patent EDK2_LICENSE_FILES = License.txt EDK2_CPE_ID_VENDOR = tianocore EDK2_DEPENDENCIES = edk2-platforms host-python3 host-acpica host-util-linux From peter at korsgaard.com Mon Feb 20 20:52:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:43 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.08.2 Message-ID: <20230220205151.1D6A281979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12a33b54b319437a8636825dd80e8fe88d497930 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard (cherry picked from commit 25680e6aa823bdeabb51d0768f12cebcd09c6d68) [Peter: drop Makefile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 40 ++++++++++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index abee6d9fac..b856f16179 100644 --- a/CHANGES +++ b/CHANGES @@ -74,6 +74,46 @@ #15061: Node.js Package fails to build against musl i386 #15071: RTL8723BS library is outdated +2022.08.2, released November 16th, 2022 + + Important / security related fixes. + + Defconfig: Aspeed ast2600evb: Correct FPU config, Kontron bl + imx8mm: Bump U-Boot to fix build issue, Pine64: Change to + mainline ATF to fix build issue, Zynqmp zcu102 / zcu106 / kria + kv260: Fix pmufw reset issue + + Updated/fixed packages: arm-trusted-firmware, bind, botan, + ca-certificates, collectd, darkhttpd, dbus, dbus-broker, dhcp, + dnsmasq, docker-cli, docker-engine, exfatprogs, expat, + f2fs-tools, faad2, ffmpeg, freerdp, gitlab-runner, glibc, + gnutls, go, gpsd, gptfdisk, grub2, gsl, gst-omx, + gst1-devtools, gst1-libav, gst1-plugins-bad, + gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, hdparm, hostapd, imagemagick, + iwd, jack2, libbpf, libcurl, libidn2, libinput, libmdbx, + libopenssl, libosip2, libpng, libtasn1, libtorrent-rasterbar, + libuhttpd, libvncserver, libxml2, linux, linux-tools, lldpd, + lrzip, lz4, matchbox-startup-monitor, meson, msmtp, + multipath-tools, mupdf, musl, mv-ddr-marvell, mxml, nodejs, + ntfs-3g, numactl, openssh, openvmtools, oracle-mysql, + paho-mqtt-c, perl-net-ssleay, php, pixman, poppler, procps-ng, + python-django, python3, qdecoder, redis, rpi-userland, rsync, + rtl8189es, rtl8189fs, rtl8723bu, rtl8723ds, + rtl8812au-aircrack-ng, rtl8821au, rtl_433, samba4, shapelib, + socat, sqlite, squashfs, squid, strongswan, sudo, swupdate, + timescaledb, uclibc-ng-test, udisks, uftp, uhd, umtprd, + usbguard, vim, vlc, volk, wavemon, wilc-driver, + wireguard-linux-compat, wolfssl, wpa_supplicant, wpewebkit, + zlib-ng, zsh + + Issues resolved (http://bugs.uclibc.org): + + #14936: nodejs does not build + #15026: package/udisks: install to staging + #15061: Node.js Package fails to build against musl i386 + 2022.08.1, released October 2nd, 2022 Important / security related fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index f558e52ca6..40c7c4e1ce 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2022.08.1' +RELEASE='2022.08.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Mon Feb 20 20:52:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:44 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.02.7 Message-ID: <20230220205151.3920686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d46f51064e4611142c723ad080d01ed6095af2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard (cherry picked from commit d036dc6ec873f50a24e73d8dbdafecb3b4098909) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/CHANGES b/CHANGES index b856f16179..d08b2500ab 100644 --- a/CHANGES +++ b/CHANGES @@ -479,6 +479,41 @@ #14731: BR2_PACKAGE_IOSTAT #14751: LVM2 Outdated Link +2022.02.7, released November 17th, 2022 + + Important / security related fixes. + + Defconfig: Pine64: Change to mainline ATF to fix build + issue, Zynqmp zcu102 / zcu106: Fix pmufw reset issue + + Updated/fixed packages: arm-trusted-firmware, bind, botan, + collectd, darkhttpd, dbus, dhcp, dnsmasq, docker-cli, + docker-engine, exfatprogs, expat, f2fs-tools, faad2, ffmpeg, + freerdp, gnutls, go, gpsd, grub2, gsl, gst-omx, gst1-devtools, + gst1-libav, gst1-plugins-bad, gst1-plugins-base, + gst1-plugins-good, gst1-plugins-ugly, gst1-python, + gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, hdparm, hostapd, imagemagick, + iwd, jack2, libbpf, libcurl, libfribi, libidn2, libinput, + libmdbx, libopenssl, libosip2, libpng, libtasn1, + libtorrent-rasterbar, libuhttpd, libvncserver, libxml2, linux, + linux-tools, lldpd, lrzip, lz4, matchbox-startup-monitor, + msmtp, multipath-tools, mupdf, musl, mv-ddr-marvell, mxml, + nodejs, ntfs-3g, numactl, openvmtools, oracle-mysql, + paho-mqtt-c, perl-net-ssleay, php, pixman, poppler, procps-ng, + python-django, python3, qdecoder, rpi-userland, rsync, + rtl8189es, rtl8189fs, rtl8723bu, rtl8812au-aircrack-ng, + rtl8821au, rtl_433, samba4, shapelib, socat, squid, sqlite, + squashfs, strongswan, sudo, swupdate, timescaledb, u-boot, + uclibc-ng-test, udisks, uftp, uhd, umtprd, vim, wavemon, + wireguard-linux-compat, wolfssl, wpa_supplicant, wpewebkit, + zlib-ng, zsh + + Issues resolved (http://bugs.uclibc.org): + + #15026: package/udisks: install to staging + #15061: Node.js Package fails to build against musl i386 + 2022.02.6, released October 2nd, 2022 Important / security related fixes. From arnout at mind.be Mon Feb 20 20:52:44 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:52:44 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: add libubootenv as optional dependency Message-ID: <20230220205153.1468A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a11b36089b34dcf0c1b90835a436f50efec3d8fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next If the swupdate configuration contains CONFIG_UBOOT=y it uses libubootenv to access the U-Boot environment. We don't have Buildroot config options for all the different optional dependencies of swupdate, instead we rely on the user to select the appropriate packages and simply add the dependency in the .mk file. Do this for libubootenv as well. swupdate doesn't have anything like HAVE_LIBUBOOTENV, it just assumes libubootenv is available. Fixes: bootloader/uboot.c:23:10: fatal error: libuboot.h: No such file or directory 23 | #include Note that libubootenv is normally built before swupdate (alphabetical ordering), so the error only occrus with BR2_PER_PACKAGE_DIRECTORIES or when building swupdate directly. Note that the autobuilders don't have this error, because they only build swupdate with a default configuration that doesn't have U-Boot support. Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle --- package/swupdate/swupdate.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index bfc161d490..ed0c1e56a8 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -81,6 +81,10 @@ else SWUPDATE_MAKE_ENV += HAVE_LIBGPIOD=n endif +ifeq ($(BR2_PACKAGE_LIBUBOOTENV),y) +SWUPDATE_DEPENDENCIES += libubootenv +endif + ifeq ($(BR2_PACKAGE_LIBURIPARSER),y) SWUPDATE_DEPENDENCIES += liburiparser SWUPDATE_MAKE_ENV += HAVE_URIPARSER=y From peter at korsgaard.com Mon Feb 20 20:52:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:45 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.11-rc2 Message-ID: <20230220205151.0A26C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90f2700c09359b5f7627a1632bdcff911a6c5576 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- CHANGES | 26 ++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 58 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 3090466d2e..abee6d9fac 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,29 @@ +2022.11-rc2, released November 16th, 2022 + + Fixes all over the tree. + + Removed defconfigs: Amarule a64 relic, ARM Juno, Bananapi M1 / + M1 plus / M2 plus / M64, FriendlyARM NanoPC T4 / A64 / M1 / M1 + plus / M4 / Neo2 / Neo4 / Neo plus2 / R1 / Orangepi PC2 / Plus + / Prime / rk3399 / Win, Rock PC rk3399 / PI4 / N10. + + Updated/fixed packages: alsa-utils, arm-trusted-firmware, + bdwgc, boost, botan, ca-certificates, crun, dbus-broker, + docopt-cpp, dracut, efivar, freeipmi, gawk, gensio, gptfdisk, + gsl, guile, imagemagick, ipmitool, libidn2, libkcapi, + libopenssl, libqb, libuhttpd, libvncserver, linux, + linux-tools, lxc, makedumpfile, matchbox-startup-monitor, + mdio-tools, multipath-tools, mupdf, ntfs-3g, numactl, + perl-net-ssleay, pixman, procps-ng, rpi-userland, rsync, + s6-linux-init, socat, strongswan, sudo, swupdate, systemd, + udisks, vlc, wavemon, wolfssl, zlib-ng + + Removed packages: libdcadec + + Issues resolved (http://bugs.uclibc.org): + + #15121: make nconfig failes with nvidia drivers and mesa3d selected + 2022.11-rc1, released November 3rd, 2022 Fixes all over the tree and new features. diff --git a/Makefile b/Makefile index 7c1c07a2e4..b2f342f4a8 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.11-rc1 +export BR2_VERSION := 2022.11-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1667490600 +BR2_VERSION_EPOCH = 1668603000 # 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 98a4d3a28e..9f2a81eb2b 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@
      -

      Latest release candidate: 2022.11-rc1

      +

      Latest release candidate: 2022.11-rc2

      - +
      - +
      -

      buildroot-2022.11-rc1.tar.gz

      -

      PGP signature

      +

      buildroot-2022.11-rc2.tar.gz

      +

      PGP signature

      - +
      - +
      -

      buildroot-2022.11-rc1.tar.xz

      -

      PGP signature

      +

      buildroot-2022.11-rc2.tar.xz

      +

      PGP signature

      diff --git a/docs/website/news.html b/docs/website/news.html index c228c1f1e6..ba6e85f2e3 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

      News

        +
      • +
        +
        +
        +

        2022.11-rc2 released

        +

        16 November 2022

        +
        +
        +

        2022.11-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

        + +

        Head to the downloads page to pick up the + 2022.11-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

        +
        +
        +
        • +
      • From arnout at mind.be Mon Feb 20 20:52:45 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:52:45 -0000 Subject: [Buildroot] [git commit branch/next] package.libopenssl: fix enabling/disabling mdc2 Message-ID: <20230220205153.2D17486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=45bb69c2bdee44346d6be5b58e46b2278e40a04a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 3dbc86f09897 (openssl: bump version, enable mdc2+camellia+tlsext) form 2010-06-03, forced the build of mdc2. Commit a83d41867c8d (package/libopenssl: add option to enable some features) added an option to explicitly disable mdc2, but forgot to amend the existing enabling option. It appears that, like most (all?) openssl config options, mdc2 ends up enabled unless explicitly disabled. Additionally, mdc2 depends on DES, so without DES, mdc2 gets disabled. So, drop the explicit enabling option, and make mdc2 select DES. Signed-off-by: Yann E. MORIN Cc: "GAUTRON, Erwan" Cc: "Weber, Matthew L Collins" Signed-off-by: Arnout Vandecappelle --- package/libopenssl/Config.in | 1 + package/libopenssl/libopenssl.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in index 00339238fb..7a3f56a512 100644 --- a/package/libopenssl/Config.in +++ b/package/libopenssl/Config.in @@ -63,6 +63,7 @@ config BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 config BR2_PACKAGE_LIBOPENSSL_ENABLE_MDC2 bool "enable MDC2" default y + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES config BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2 bool "enable BLAKE2" diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 3542b89727..fc22c20467 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -79,7 +79,6 @@ define LIBOPENSSL_CONFIGURE_CMDS $(if $(BR2_PACKAGE_HAS_CRYPTODEV),enable-devcryptoeng) \ no-rc5 \ enable-camellia \ - enable-mdc2 \ no-tests \ no-fuzz-libfuzzer \ no-fuzz-afl \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:45 -0000 Subject: [Buildroot] [git commit branch/next] package/luaposix: bump to version 36.0 Message-ID: <20230220205244.3D4CF86497@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c93db6789b1afaba27703baf9d323bcb06e6430e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next diff LICENSE: -Copyright (C) 2006-2021 luaposix authors +Copyright (C) 2006-2023 luaposix authors Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/luaposix/luaposix.hash | 4 ++-- package/luaposix/luaposix.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash index ee76ea103d..fc0b5fa747 100644 --- a/package/luaposix/luaposix.hash +++ b/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1b5c48d2abd59de0738d1fc1e6204e44979ad2a1a26e8e22a2d6215dd502c797 luaposix-35.1.tar.gz -sha256 f50bc0f3197523b1709f31707425f2de95f8a45534b081a6b564179ab059e850 LICENSE +sha256 e0fcb4996f76aa49ae3e5edf69978171091e3d69d5de5589d591d227f8a427c1 luaposix-36.0.tar.gz +sha256 ea0fdaae50b0d31a81c2c99f4354264783c71043fd40522feaa40eecc069599b LICENSE diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index fa26709154..1a537defc4 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 35.1 +LUAPOSIX_VERSION = 36.0 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 20 20:52:46 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:52:46 -0000 Subject: [Buildroot] [git commit branch/next] package/libkrb5: security bump to version 1.20.1 Message-ID: <20230220205153.382D48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f93c47fad847219e2d748570484ca800faa9d4eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issue: CVE-2022-42898: In MIT krb5 releases 1.8 and later, an authenticated attacker may be able to cause a KDC or kadmind process to crash by reading beyond the bounds of allocated memory, creating a denial of service. A privileged attacker may similarly be able to cause a Kerberos or GSS application service to crash. On 32-bit platforms, an attacker can also cause insufficient memory to be allocated for the result, potentially leading to remote code execution in a KDC, kadmind, or GSS or Kerberos application server process. An attacker with the privileges of a cross-realm KDC may be able to extract secrets from a KDC process's memory by having them copied into the PAC of a new ticket. Bugfix tarballs are located in the same directory as the base version, so introduce LIBKRB5_VERSION_MAJOR. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- package/libkrb5/libkrb5.hash | 2 +- package/libkrb5/libkrb5.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libkrb5/libkrb5.hash b/package/libkrb5/libkrb5.hash index 2fce24b45b..94dfa2ed6e 100644 --- a/package/libkrb5/libkrb5.hash +++ b/package/libkrb5/libkrb5.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 7e022bdd3c851830173f9faaa006a230a0e0fdad4c953e85bff4bf0da036e12f krb5-1.20.tar.gz +sha256 704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851 krb5-1.20.1.tar.gz # Hash for license file: sha256 cfadcf7b2ead2f3af793c25c00638c9908ac0023b101695f40cb9a03b16811dc NOTICE diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index 5e547470ed..9bacfaee58 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBKRB5_VERSION = 1.20 -LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION) +LIBKRB5_VERSION_MAJOR = 1.20 +LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).1 +LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION_MAJOR) LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz LIBKRB5_SUBDIR = src LIBKRB5_LICENSE = MIT, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, others From peter at korsgaard.com Mon Feb 20 20:52:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:46 -0000 Subject: [Buildroot] [git commit branch/next] package/freerdp: security bump to version 2.9.0 Message-ID: <20230220205151.53DCB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35c2ee69a51a343f2e5c1f88eeb8c7064922ded4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Backported #8403: Fixed multiple client side input validation issues (CVE-2022-39316, CVE-2022-39317, CVE-2022-39318, CVE-2022-39319, CVE-2022-39320, CVE-2022-41877, CVE-2022-39347) https://github.com/FreeRDP/FreeRDP/releases/tag/2.9.0 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 94d0746d40..f6adc05312 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.8.1.tar.gz.sha256 -sha256 ea8903b29914134202a972c06052432678c89cb5eebcc8f5a41553030c97376b freerdp-2.8.1.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.9.0.tar.gz.sha256 +sha256 fcf71cf5b09c5c2636341ba212f34b8fb728246ea28e08caf6cef8b4a96184b7 freerdp-2.9.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index ae844c589e..fb0e6920cf 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.8.1 +FREERDP_VERSION = 2.9.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From peter at korsgaard.com Mon Feb 20 20:52:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:47 -0000 Subject: [Buildroot] [git commit branch/next] docs/website: update for 2022.02.7 Message-ID: <20230220205151.4801681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd7279973981926f878c8988df8a187a56caff1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index c042f34887..538f2f6042 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
        Download
        -

        Latest long term support release: 2022.02.6

        +

        Latest long term support release: 2022.02.7

        - +
        - +
        -

        buildroot-2022.02.6.tar.gz

        -

        PGP signature

        +

        buildroot-2022.02.7.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2022.02.6.tar.xz

        -

        PGP signature

        +

        buildroot-2022.02.7.tar.xz

        +

        PGP signature

        diff --git a/docs/website/news.html b/docs/website/news.html index d8d2a14cd1..ee7ce344c9 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

        News

          +
        • +
          +
          +
          +

          2022.02.7 released

          +

          17 November 2022

          +
          +
          +

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

          +
          +
          +
          • +
        • From arnout at mind.be Mon Feb 20 20:52:47 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:52:47 -0000 Subject: [Buildroot] [git commit branch/next] package/gcc: ensure __register_frame is optimized out for glibc Message-ID: <20230220205153.77456828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fc5c1ccdb11af5185471272ef5eeece81b5e866 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next On some architectures when building with -O0 the __register_frame symbol fails to get optimized out which can cause linking failures when building glibc. To fix this set -O1 for GCC target libs when building with glibc and BR2_OPTIMIZE_0 on the problematic target architectures. This was reported both to GCC [1] and glibc [2] upstream. It is not entirely clear yet where the bug lies exactly. At the moment the assumption is that it's GCC, so create a symbol BR2_TOOLCHAIN_HAS_GCC_BUG_107728. This issue only seems to occur when linking glibc, not with anything else, so only compile libgcc from host-gcc-initial with -O1. Fixes: - http://autobuild.buildroot.net/results/89b/89b6c6924240b7cf82035a844f3573673e91b364 - http://autobuild.buildroot.net/results/46f/46f4ec99d2b23d354a4bb5e92123d64f0da6ed27 - http://autobuild.buildroot.net/results/839/839f929f700cf181ebdf34389c7806a96f55813e - http://autobuild.buildroot.net/results/0e2/0e202bf53a683930f3cad6edef2a4dea629eaecb - http://autobuild.buildroot.net/results/8a8/8a8c917f597fdcca744e696e19e9300b64004335 - http://autobuild.buildroot.net/results/c05/c058b27ed2834dfa633b63ec6c3639ab1e8bf412 - http://autobuild.buildroot.net/results/8ba/8ba8882a861cf7df359c23969c09b2be0725b2e5 [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107728 [2] https://sourceware.org/bugzilla/show_bug.cgi?id=29621 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/gcc/gcc-initial/gcc-initial.mk | 7 +++++++ toolchain/Config.in | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index f5bc6c5b77..ebd8e8f017 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -43,6 +43,13 @@ HOST_GCC_INITIAL_CONF_OPTS = \ HOST_GCC_INITIAL_CONF_ENV = \ $(HOST_GCC_COMMON_CONF_ENV) +# Enable GCC target libs optimizations to optimize out __register_frame +# when needed for some architectures when building with glibc. +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_107728),y) +HOST_GCC_INITIAL_CONF_ENV += CFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CFLAGS) -O1" +HOST_GCC_INITIAL_CONF_ENV += CXXFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CXXFLAGS) -O1" +endif + HOST_GCC_INITIAL_MAKE_OPTS = $(HOST_GCC_COMMON_MAKE_OPTS) all-gcc all-target-libgcc HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc install-target-libgcc diff --git a/toolchain/Config.in b/toolchain/Config.in index 23596d6c85..e7329c1a1c 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -227,6 +227,18 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_104028 bool default y if BR2_m68k +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107728 +# https://sourceware.org/bugzilla/show_bug.cgi?id=29621 +config BR2_TOOLCHAIN_HAS_GCC_BUG_107728 + bool + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_OPTIMIZE_0 + default y if BR2_microblazebe || BR2_microblazeel \ + || BR2_mips || BR2_mipsel \ + || BR2_nios2 \ + || BR2_or1k \ + || BR2_sh + config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:48 -0000 Subject: [Buildroot] [git commit branch/next] configs/roc_pc_rk3399: remove defconfig Message-ID: <20230220205153.810BC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ade5915c1d65b7653125d1cf6952efdd6113806 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 5370ec74516495a4ac6c0bc9780b8e92a2f1e6b1 was supposed to remove the roc_pc_rk3399 defconfig. It actually removed everything related to this defconfig, but not the defconfig itself. The build failure this commit was supposed to fix is therefore still happening. We fix it up by finally removing the defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3372859807 Signed-off-by: Thomas Petazzoni --- configs/roc_pc_rk3399_defconfig | 55 ----------------------------------------- 1 file changed, 55 deletions(-) diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig deleted file mode 100644 index ae7cf19a80..0000000000 --- a/configs/roc_pc_rk3399_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="roc-pc-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.18" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-roc-pc" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" -BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/firefly/roc-rk3399-pc/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/roc-rk3399-pc/post-build.sh" From yann.morin.1998 at free.fr Mon Feb 20 20:52:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:48 -0000 Subject: [Buildroot] [git commit branch/next] package/xen: security bump to version 4.14.5 Message-ID: <20230220205151.93FC681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f901a90f57927bf09ccac2dc145c77688501cfe2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Includes a number of bugfixes and the security fixes up to xsa-400: https://xenproject.org/downloads/xen-project-archives/xen-project-4-14-series/xen-project-4-14-5/ Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/xen/xen.hash | 2 +- package/xen/xen.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index a81d05e3f7..5637f0e8d9 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e76d56dfcdabf5d80aa06819f44472de49526a518dbb483eb08e7ff9aec2c669 xen-4.14.4.tar.gz +sha256 a1a24092ad14658eed420b7d56b67d0d9d5b314e96c30a799b45f3a721f98bf0 xen-4.14.5.tar.gz sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING diff --git a/package/xen/xen.mk b/package/xen/xen.mk index 03341d4275..169753e89f 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.14.4 +XEN_VERSION = 4.14.5 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:49 -0000 Subject: [Buildroot] [git commit branch/next] package/dash: fix static with shared build Message-ID: <20230220205153.AC1A586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3c14de0dfc047817917fb4dbc20c211e751bb3f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When BR2_SHARED_STATIC_LIBS is enabled we pass both --enable-static and --enable-shared to configure. dash configure.ac only looks for --enable-static to make the build static. But when linking against libedit pkg-config only returns dynamic linking dependencies, so the indirect ncurses dependency in not mentioned. The end result is that libedit can't find ncurses symbols on link. BR2_SHARED_STATIC_LIBS only makes sense for libraries, not executable binaries. Pass --disable-static unless BR2_STATIC_LIBS is enabled for static only build. Fixes: http://autobuild.buildroot.net/results/137d39cc5ec436759a2fde3f26ce5633e0ad6c2e/ http://autobuild.buildroot.net/results/55a38e0e45212bf7403d9ccb626c9422e3affe72/ http://autobuild.buildroot.net/results/8f109f1a04a6a2ff6d8c4c920e499fbaec3f72b9/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/dash/dash.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/dash/dash.mk b/package/dash/dash.mk index fed3a99551..6efc71e568 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -27,6 +27,10 @@ else DASH_CONF_OPTS += --without-libedit endif +ifeq ($(BR2_STATIC_LIBS),) +DASH_CONF_OPTS += --disable-static +endif + define DASH_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/src/dash $(TARGET_DIR)/bin/dash endef From yann.morin.1998 at free.fr Mon Feb 20 20:52:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:49 -0000 Subject: [Buildroot] [git commit branch/next] package/nodejs: security bump to version 16.18.1 Message-ID: <20230220205151.878678648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58ba17c7849056fbeb3b4d652749af32f81e7360 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issue: DNS rebinding in --inspect via invalid octal IP address (Medium) (CVE-2022-43548) The Node.js rebinding protector for --inspect still allows invalid IP address, specifically, the octal format. An example of an octal IP address is 1.09.0.0, the 09 octet is invalid because 9 is not a number in the base 8 number system. Browsers such as Firefox (tested on latest version m105) will still attempt to resolve this invalid octal address via DNS. When combined with an active --inspect session, such as when using VSCode, an attacker can perform DNS rebinding and execute arbitrary code Update license hash for an update of base64 (MIT license) and a change in copyright year: https://github.com/nodejs/node/commit/8ea9a71b15a953cd0936f7e6aae84c62873a77b5 https://github.com/nodejs/node/commit/9f14dc1a8f43a9f3755c673009378b798cbdd73b Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/nodejs/nodejs.hash | 6 +++--- package/nodejs/nodejs.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 83e4c271ce..4408782248 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v16.17.1/SHASUMS256.txt -sha256 6721feb4152d56d2c6b358ce397abd5a7f1daf09ee2e25c5021b9b4d3f86a330 node-v16.17.1.tar.xz +# From https://nodejs.org/dist/v16.18.1/SHASUMS256.txt +sha256 1f8051a88f86f42064f4415fe7a980e59b0a502ecc8def583f6303bc4d445238 node-v16.18.1.tar.xz # Hash for license file -sha256 69090e865afa7c62715b97f0712632d2923bd7a5faba91f94e4e75a2f9219d5e LICENSE +sha256 0bec08634ba79b5404f6b7f92ea850f3c2a06e27e6f83f2267e4f5e55ae33334 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 29a10b900f..367d5d2058 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 16.17.1 +NODEJS_VERSION = 16.18.1 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = \ From yann.morin.1998 at free.fr Mon Feb 20 20:52:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:50 -0000 Subject: [Buildroot] [git commit branch/next] package/systemd: security bump to version v250.8 Message-ID: <20230220205151.CEF3E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e24033f76ad339b1a66fb5b259b8e28f076de97e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issue: - CVE-2022-3821: An off-by-one Error issue was discovered in Systemd in format_timespan() function of time-util.c. An attacker could supply specific values for time and accuracy that leads to buffer overrun in format_timespan(), leading to a Denial of Service. https://github.com/systemd/systemd/issues/23928 Drop now upstream 0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- ...call-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch | 33 ---------------------- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch b/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch deleted file mode 100644 index 0934886acb..0000000000 --- a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 16c132a6a0389e0eaea70c4ad95dbfd1637ec5ba Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 7 Jan 2022 22:25:23 +0100 -Subject: [PATCH] missing-syscall: define MOVE_MOUNT_T_EMPTY_PATH if missing - -MOVE_MOUNT_T_EMPTY_PATH has been added to systemd 250 by [1] -but it's defined in kernel headers since version 5.2. - -[1] c7bf079bbc19e3b409acc0c7acc3e14749211fe2 - -Signed-off-by: Romain Naour ---- - src/basic/missing_syscall.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 8267b1a90c..793d111c55 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -569,6 +569,10 @@ static inline int missing_open_tree( - #define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ - #endif - -+#ifndef MOVE_MOUNT_T_EMPTY_PATH -+#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ -+#endif -+ - static inline int missing_move_mount( - int from_dfd, - const char *from_pathname, --- -2.31.1 - diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 3572b25965..3b98566f32 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz +sha256 638a2fc78828765fc97bc73f428205b6dc1d359149b6c6bfe4d2a649cba2cca8 systemd-250.8.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 b42f6a502b..30a75b7a40 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.4 +SYSTEMD_VERSION = 250.8 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From arnout at mind.be Mon Feb 20 20:52:50 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:52:50 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Giulio Benetti to rtl8192eu package Message-ID: <20230220205153.CE87486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=059c61a18f6a1fb8f0580c0475983fe37fa69e44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 569d58407a..bfebf8163c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1151,6 +1151,7 @@ F: package/qt5/ F: package/rockchip-mali/ F: package/rtl8188eu/ F: package/rtl8189es/ +F: package/rtl8192eu/ F: package/rtl8723bu/ F: package/rtl8723ds/ F: package/rtl8812au-aircrack-ng/ From yann.morin.1998 at free.fr Mon Feb 20 20:52:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:51 -0000 Subject: [Buildroot] [git commit branch/next] package/nginx: add upstream security fix for CVE-2022-4174{1, 2} Message-ID: <20230220205151.6DEB681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8fa2ff28574cb5ba889cb4fc48240dd4291401a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: - CVE-2022-41741: Memory corruption in the ngx_http_mp4_module - CVE-2022-41742: Memory disclosure in the ngx_http_mp4_module https://mailman.nginx.org/archives/list/nginx-announce at nginx.org/message/RBRRON6PYBJJM2XIAPQBFBVLR4Q6IHRA/ Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- .../nginx/0011-Mp4-disabled-duplicate-atoms.patch | 315 +++++++++++++++++++++ package/nginx/nginx.mk | 3 + 2 files changed, 318 insertions(+) diff --git a/package/nginx/0011-Mp4-disabled-duplicate-atoms.patch b/package/nginx/0011-Mp4-disabled-duplicate-atoms.patch new file mode 100644 index 0000000000..7baa810b56 --- /dev/null +++ b/package/nginx/0011-Mp4-disabled-duplicate-atoms.patch @@ -0,0 +1,315 @@ +From 6b022a5556af22b6e18532e547a6ae46b0d8c6ea Mon Sep 17 00:00:00 2001 +From: Roman Arutyunyan +Date: Wed, 19 Oct 2022 10:53:17 +0300 +Subject: [PATCH] Mp4: disabled duplicate atoms. + +Most atoms should not appear more than once in a container. Previously, +this was not enforced by the module, which could result in worker process +crash, memory corruption and disclosure. + +Signed-off-by: Peter Korsgaard +--- + src/http/modules/ngx_http_mp4_module.c | 147 +++++++++++++++++++++++++ + 1 file changed, 147 insertions(+) + +diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c +index 9c3f627f..4eff01e9 100644 +--- a/src/http/modules/ngx_http_mp4_module.c ++++ b/src/http/modules/ngx_http_mp4_module.c +@@ -1121,6 +1121,12 @@ ngx_http_mp4_read_ftyp_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + return NGX_ERROR; + } + ++ if (mp4->ftyp_atom.buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 ftyp atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; + + ftyp_atom = ngx_palloc(mp4->request->pool, atom_size); +@@ -1179,6 +1185,12 @@ ngx_http_mp4_read_moov_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + return NGX_DECLINED; + } + ++ if (mp4->moov_atom.buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 moov atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + conf = ngx_http_get_module_loc_conf(mp4->request, ngx_http_mp4_module); + + if (atom_data_size > mp4->buffer_size) { +@@ -1246,6 +1258,12 @@ ngx_http_mp4_read_mdat_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mdat atom"); + ++ if (mp4->mdat_atom.buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 mdat atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + data = &mp4->mdat_data_buf; + data->file = &mp4->file; + data->in_file = 1; +@@ -1372,6 +1390,12 @@ ngx_http_mp4_read_mvhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mvhd atom"); + ++ if (mp4->mvhd_atom.buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 mvhd atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom_header = ngx_mp4_atom_header(mp4); + mvhd_atom = (ngx_mp4_mvhd_atom_t *) atom_header; + mvhd64_atom = (ngx_mp4_mvhd64_atom_t *) atom_header; +@@ -1637,6 +1661,13 @@ ngx_http_mp4_read_tkhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_TKHD_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 tkhd atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->tkhd_size = atom_size; + trak->movie_duration = duration; + +@@ -1676,6 +1707,12 @@ ngx_http_mp4_read_mdia_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_MDIA_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 mdia atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->mdia_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -1799,6 +1836,13 @@ ngx_http_mp4_read_mdhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_MDHD_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 mdhd atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->mdhd_size = atom_size; + trak->timescale = timescale; + trak->duration = duration; +@@ -1862,6 +1906,12 @@ ngx_http_mp4_read_hdlr_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_HDLR_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 hdlr atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->hdlr_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -1890,6 +1940,12 @@ ngx_http_mp4_read_minf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_MINF_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 minf atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->minf_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -1933,6 +1989,15 @@ ngx_http_mp4_read_vmhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf ++ || trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf) ++ { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 vmhd/smhd atom in \"%s\"", ++ mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->vmhd_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -1964,6 +2029,15 @@ ngx_http_mp4_read_smhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf ++ || trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf) ++ { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 vmhd/smhd atom in \"%s\"", ++ mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->smhd_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -1995,6 +2069,12 @@ ngx_http_mp4_read_dinf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_DINF_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 dinf atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->dinf_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -2023,6 +2103,12 @@ ngx_http_mp4_read_stbl_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_STBL_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stbl atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->stbl_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -2144,6 +2230,12 @@ ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + + trak = ngx_mp4_last_trak(mp4); + ++ if (trak->out[NGX_HTTP_MP4_STSD_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stsd atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + atom = &trak->stsd_atom_buf; + atom->temporary = 1; + atom->pos = atom_header; +@@ -2212,6 +2304,13 @@ ngx_http_mp4_read_stts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + atom_end = atom_table + entries * sizeof(ngx_mp4_stts_entry_t); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_STTS_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stts atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->time_to_sample_entries = entries; + + atom = &trak->stts_atom_buf; +@@ -2480,6 +2579,13 @@ ngx_http_mp4_read_stss_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + "sync sample entries:%uD", entries); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_STSS_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stss atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->sync_samples_entries = entries; + + atom_table = atom_header + sizeof(ngx_http_mp4_stss_atom_t); +@@ -2678,6 +2784,13 @@ ngx_http_mp4_read_ctts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + "composition offset entries:%uD", entries); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_CTTS_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 ctts atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->composition_offset_entries = entries; + + atom_table = atom_header + sizeof(ngx_mp4_ctts_atom_t); +@@ -2881,6 +2994,13 @@ ngx_http_mp4_read_stsc_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + atom_end = atom_table + entries * sizeof(ngx_mp4_stsc_entry_t); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_STSC_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stsc atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->sample_to_chunk_entries = entries; + + atom = &trak->stsc_atom_buf; +@@ -3213,6 +3333,13 @@ ngx_http_mp4_read_stsz_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + "sample uniform size:%uD, entries:%uD", size, entries); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_STSZ_ATOM].buf) { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stsz atom in \"%s\"", mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->sample_sizes_entries = entries; + + atom_table = atom_header + sizeof(ngx_mp4_stsz_atom_t); +@@ -3396,6 +3523,16 @@ ngx_http_mp4_read_stco_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + atom_end = atom_table + entries * sizeof(uint32_t); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_STCO_ATOM].buf ++ || trak->out[NGX_HTTP_MP4_CO64_ATOM].buf) ++ { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stco/co64 atom in \"%s\"", ++ mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->chunks = entries; + + atom = &trak->stco_atom_buf; +@@ -3602,6 +3739,16 @@ ngx_http_mp4_read_co64_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) + atom_end = atom_table + entries * sizeof(uint64_t); + + trak = ngx_mp4_last_trak(mp4); ++ ++ if (trak->out[NGX_HTTP_MP4_STCO_ATOM].buf ++ || trak->out[NGX_HTTP_MP4_CO64_ATOM].buf) ++ { ++ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, ++ "duplicate mp4 stco/co64 atom in \"%s\"", ++ mp4->file.name.data); ++ return NGX_ERROR; ++ } ++ + trak->chunks = entries; + + atom = &trak->co64_atom_buf; +-- +2.30.2 + diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index ba01c7e016..62ea379ffc 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -19,6 +19,9 @@ NGINX_CONF_OPTS = \ --with-cpp="$(TARGET_CC)" \ --with-ld-opt="$(TARGET_LDFLAGS)" +# 0011-Mp4-disabled-duplicate-atoms.patch +NGINX_IGNORE_CVES += CVE-2022-41741 CVE-2022-41742 + # www-data user and group are used for nginx. Because these user and group # are already set by buildroot, it is not necessary to redefine them. # See system/skeleton/etc/passwd From peter at korsgaard.com Mon Feb 20 20:52:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:51 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi: add comment to display udev dependency for gbm when wayland/x11 are disabled Message-ID: <20230220205153.F050E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8aa68a529ecdcf6f83d81a71863d59eb2147522b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Without this additional comment only the comment kodi needs an OpenGL EGL backend with OpenGL or GLES support is displayed which is not enough to guide users. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 90710683db..7bd8bc2943 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -27,6 +27,9 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM depends on BR2_PACKAGE_HAS_UDEV # libinput select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS +comment "kodi needs udev support for gbm" + depends on !BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND bool default y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:52 -0000 Subject: [Buildroot] [git commit branch/next] package/netsnmp: security bump to version 5.9.3 Message-ID: <20230220205153.A0D8186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83b4337354014a5425a0ee081b94d4d0991f8d47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: - CVE-2022-24805 A buffer overflow in the handling of the INDEX of NET-SNMP-VACM-MIB can cause an out-of-bounds memory access. - CVE-2022-24809 A malformed OID in a GET-NEXT to the nsVacmAccessTable can cause a NULL pointer dereference. - CVE-2022-24806 Improper Input Validation when SETing malformed OIDs in master agent and subagent simultaneously - CVE-2022-24807 A malformed OID in a SET request to SNMP-VIEW-BASED-ACM-MIB::vacmAccessTable can cause an out-of-bounds memory access. - CVE-2022-24808 A malformed OID in a SET request to NET-SNMP-AGENT-MIB::nsLogTable can cause a NULL pointer dereference - CVE-2022-24810 A malformed OID in a SET to the nsVacmAccessTable can cause a NULL pointer dereference. Drop openssl linking patches as they are merged upstream / upstream changed to use pkg-config for openssl since: https://github.com/net-snmp/net-snmp/commit/8c3a094fbe9ebe38ed762488082d52c6d4e04ddb Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...1-configure-static-linking-Fix-SSL-checks.patch | 146 --------------------- .../0002-configure-Fix-lcrypto-lz-test.patch | 44 ------- ...ix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch | 39 ------ ...ix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch | 39 ------ package/netsnmp/netsnmp.hash | 4 +- package/netsnmp/netsnmp.mk | 2 +- 6 files changed, 3 insertions(+), 271 deletions(-) diff --git a/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch b/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch deleted file mode 100644 index bf61fdfe7a..0000000000 --- a/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch +++ /dev/null @@ -1,146 +0,0 @@ -From bd59be8e4e339870a1400f6866a7b73ca11f6460 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 12 Sep 2018 20:16:39 +0200 -Subject: [PATCH] configure, static linking: Fix SSL checks - -During checking of DTLS_method, the stub program is linked only with -ssl -libssl.a lacks some function from -lcrypto: -RAND_*() -ERR_*() -BUF_MEM_*() -etc. -and -lz: -- inflate() -- deflate() - -Append -lcrypto and -lz to LIBS variable when checking DTLS_method. - -See also https://sourceforge.net/p/net-snmp/patches/1374/. - -Signed-off-by: Giulio Benetti -[bvanassche: Edited subject / rewrote this patch] -[yann.morin.1998 at free.fr: - - use an actual backport of bd59be8e4e339870a1400f6866a7b73ca11f6460 -] -Signed-off-by: Yann E. MORIN ---- - configure | 52 ++++++++++++++++++++++++++++++++++--- - configure.d/config_os_libs2 | 14 +++++++--- - 2 files changed, 58 insertions(+), 8 deletions(-) - -diff --git a/configure b/configure -index 6504a8e58a..1116cecaad 100755 ---- a/configure -+++ b/configure -@@ -23228,16 +23228,60 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_md5" >&5 - $as_echo "$ac_cv_lib_crypto_EVP_md5" >&6; } - if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : -- CRYPTO="crypto" -+ CRYPTO="crypto"; LIBCRYPTO="-lcrypto" -+else -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_md5 in -lcrypto" >&5 -+$as_echo_n "checking for EVP_md5 in -lcrypto... " >&6; } -+if ${ac_cv_lib_crypto_EVP_md5+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lcrypto -lz $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char EVP_md5 (); -+int -+main () -+{ -+return EVP_md5 (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_crypto_EVP_md5=yes -+else -+ ac_cv_lib_crypto_EVP_md5=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_md5" >&5 -+$as_echo "$ac_cv_lib_crypto_EVP_md5" >&6; } -+if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : -+ CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz" -+fi -+ -+ - fi - -- fi -+ else -+ LIBCRYPTO="-l${CRYPTO}" -+ fi - - if test x$CRYPTO != x; then - - $as_echo "#define HAVE_LIBCRYPTO 1" >>confdefs.h - -- LIBCRYPTO="-l${CRYPTO}" - netsnmp_save_LIBS="$LIBS" - LIBS="$LIBCRYPTO" - for ac_func in AES_cfb128_encrypt EVP_sha224 EVP_sha384 EVP_MD_CTX_create EVP_MD_CTX_destroy EVP_MD_CTX_new EVP_MD_CTX_free DH_set0_pqg DH_get0_pqg DH_get0_key ASN1_STRING_get0_data X509_NAME_ENTRY_get_object X509_NAME_ENTRY_get_data X509_get_signature_nid -@@ -23291,7 +23335,7 @@ _ACEOF - LIBS="$netsnmp_save_LIBS" - fi - netsnmp_save_LIBS="$LIBS" -- LIBS="-lssl" -+ LIBS="-lssl $LIBCRYPTO" - for ac_func in TLS_method TLSv1_method DTLS_method DTLSv1_method SSL_library_init SSL_load_error_strings ERR_get_error_all - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 4a1ad1551f..75214cfff3 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -306,13 +306,19 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - LIBS="$netsnmp_save_LIBS" - - if test x$CRYPTO = x; then -- AC_CHECK_LIB([crypto], [EVP_md5], [CRYPTO="crypto"]) -- fi -+ AC_CHECK_LIB([crypto], [EVP_md5], -+ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], [ -+ AC_CHECK_LIB([crypto], [EVP_md5], -+ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], -+ [-lz]) -+ ]) -+ else -+ LIBCRYPTO="-l${CRYPTO}" -+ fi - - if test x$CRYPTO != x; then - AC_DEFINE(HAVE_LIBCRYPTO, 1, - [Define to 1 if you have the OpenSSL library (-lcrypto or -leay32).]) -- LIBCRYPTO="-l${CRYPTO}" - netsnmp_save_LIBS="$LIBS" - LIBS="$LIBCRYPTO" - AC_CHECK_FUNCS([AES_cfb128_encrypt]dnl -@@ -342,7 +348,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - LIBS="$netsnmp_save_LIBS" - fi - netsnmp_save_LIBS="$LIBS" -- LIBS="-lssl" -+ LIBS="-lssl $LIBCRYPTO" - AC_CHECK_FUNCS([TLS_method TLSv1_method DTLS_method DTLSv1_method]dnl - [SSL_library_init SSL_load_error_strings]) - LIBS="$netsnmp_save_LIBS" --- -2.25.1 - diff --git a/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch b/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch deleted file mode 100644 index 50387c8390..0000000000 --- a/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 13da2bcde8e22dd0127a668374fdf79bed04d353 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Mon, 17 Sep 2018 07:33:34 -0700 -Subject: [PATCH] configure: Fix -lcrypto -lz test - -Avoid that the second crypto library test uses the cached result from -the first test by explicitly clearing the cached test result. - -[yann.morin.1998 at free.fr: - - use an actual backport of 13da2bcde8e22dd0127a668374fdf79bed04d353 -] -Signed-off-by: Yann E. MORIN ---- - configure | 1 + - configure.d/config_os_libs2 | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/configure b/configure -index 1116cecaad..33b8c93e57 100755 ---- a/configure -+++ b/configure -@@ -23231,6 +23231,7 @@ if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : - CRYPTO="crypto"; LIBCRYPTO="-lcrypto" - else - -+ unset ac_cv_lib_crypto_EVP_md5 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_md5 in -lcrypto" >&5 - $as_echo_n "checking for EVP_md5 in -lcrypto... " >&6; } - if ${ac_cv_lib_crypto_EVP_md5+:} false; then : -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 75214cfff3..81788a2096 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -308,6 +308,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - if test x$CRYPTO = x; then - AC_CHECK_LIB([crypto], [EVP_md5], - [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], [ -+ unset ac_cv_lib_crypto_EVP_md5 - AC_CHECK_LIB([crypto], [EVP_md5], - [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], - [-lz]) --- -2.25.1 - diff --git a/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch b/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch deleted file mode 100644 index 4293e15d25..0000000000 --- a/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8e273c688aa235ed9c68570a700d31596bac14df Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Mon, 15 Oct 2018 19:07:05 +0200 -Subject: [PATCH] configure: fix AC_CHECK_FUNCS(EVP_sha224 EVP_sha384 ...) - failure on static linking - -If building as static lib, AC_CHECK_FUNCS(EVP_sha224 EVP_sha384 ...) -fails due to missing -lz in $LIBS. -At the moment, $LIBS contains $LIBCRYPTO only discarding previous $LIBS -content. - -Add $LIBS to: -LIBS="$LIBCRYPTO" -as: -LIBS="$LIBCRYPTO $LIBS" -This way $LIBS will contain -lz at the end of linking command that in -static linking build is mandatory. - -Signed-off-by: Giulio Benetti ---- - configure.d/config_os_libs2 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 81788a209..93044000b 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -321,7 +321,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - AC_DEFINE(HAVE_LIBCRYPTO, 1, - [Define to 1 if you have the OpenSSL library (-lcrypto or -leay32).]) - netsnmp_save_LIBS="$LIBS" -- LIBS="$LIBCRYPTO" -+ LIBS="$LIBCRYPTO $LIBS" - AC_CHECK_FUNCS([AES_cfb128_encrypt]dnl - [EVP_sha224 EVP_sha384 ]dnl - [EVP_MD_CTX_create EVP_MD_CTX_destroy]dnl --- -2.17.1 - diff --git a/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch b/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch deleted file mode 100644 index 8fcce2a5c7..0000000000 --- a/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1ab6e3fc3cf61fa5a7b7363e59095e868474524b Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Mon, 15 Oct 2018 19:34:26 +0200 -Subject: [PATCH] configure: fix AC_CHECK_FUNCS(TLS_method TLSv1_method - ...) failure on static linking - -If building as static lib, AC_CHECK_FUNCS(TLS_method TLSv1_method ...) -fails due to missing -lz in $LIBS. -At the moment, $LIBS contains "-lssl $LIBCRYPTO" only discarding -previous $LIBS content. - -Add $LIBS to: -LIBS="-lssl $LIBCRYPTO" -as: -LIBS="-lssl $LIBCRYPTO $LIBS" -This way $LIBS will contain -lz at the end of linking command that in -static linking build is mandatory. - -Signed-off-by: Giulio Benetti ---- - configure.d/config_os_libs2 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 93044000b..c811c63ec 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -349,7 +349,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - LIBS="$netsnmp_save_LIBS" - fi - netsnmp_save_LIBS="$LIBS" -- LIBS="-lssl $LIBCRYPTO" -+ LIBS="-lssl $LIBCRYPTO $LIBS" - AC_CHECK_FUNCS([TLS_method TLSv1_method DTLS_method DTLSv1_method]dnl - [SSL_library_init SSL_load_error_strings]dnl - [ERR_get_error_all]) --- -2.17.1 - diff --git a/package/netsnmp/netsnmp.hash b/package/netsnmp/netsnmp.hash index 9d196c8bee..e1e9d10898 100644 --- a/package/netsnmp/netsnmp.hash +++ b/package/netsnmp/netsnmp.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature at -# https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9/net-snmp-5.9.tar.gz.asc +# https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9.3/net-snmp-5.9.3.tar.gz.asc # using key D0F8F495DA6160C44EFFBF10F07B9D2DACB19FD6 -sha256 04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071 net-snmp-5.9.tar.gz +sha256 2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a net-snmp-5.9.3.tar.gz # Hash for license file sha256 ed869ea395a1f125819a56676385ab0557a21507764bf56f2943302011381e59 COPYING diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 985cfeac72..56a07e2ccd 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETSNMP_VERSION = 5.9 +NETSNMP_VERSION = 5.9.3 NETSNMP_SITE = https://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION) NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz NETSNMP_LICENSE = Various BSD-like From yann.morin.1998 at free.fr Mon Feb 20 20:52:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:52 -0000 Subject: [Buildroot] [git commit branch/next] package/gptfdisk: fix runtime failure with popt 1.19 Message-ID: <20230220205152.01F1B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b91eb32120d5a810a7f5a8bb2ad17baf16eedd6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following runtime failure raised since bump of popt to version 1.19 in commit 895bfba93f6e5535f2132aeea144d2cd87ebc71b: Problem opening for reading! Error is 2. The specified file does not exist! Fixes: - No autobuilder failure Signed-off-by: Fabrice Fontaine Reported-by: Florian Fainelli Tested-by: Florian Fainelli Signed-off-by: Yann E. MORIN --- ...-crash-of-sgdisk-when-compiled-with-lates.patch | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch b/package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch new file mode 100644 index 0000000000..bdeedd95cc --- /dev/null +++ b/package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch @@ -0,0 +1,60 @@ +From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d Mon Sep 17 00:00:00 2001 +From: Rod Smith +Date: Fri, 15 Apr 2022 18:10:14 -0400 +Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest + popt (commit 740; presumably eventually release 1.19) + +[Retrieved from: +https://sourceforge.net/p/gptfdisk/code/ci/5d5e76d369a412bfb3d2cebb5fc0a7509cef878d/] +Signed-off-by: Fabrice Fontaine +--- + NEWS | 8 ++++++++ + gptcl.cc | 2 +- + support.h | 2 +- + 3 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/NEWS b/NEWS +index c7add56..9e153fd 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,11 @@ ++1.0.10 (?/??/2022): ++------------------- ++ ++- Fixed problem that caused sgdisk to crash with errors about being unable ++ to read the disk's partition table when compiled with the latest popt ++ (commit 740, which is pre-release as I type; presumably version 1.19 and ++ later once released). ++ + 1.0.9 (4/14/2022): + ------------------ + +diff --git a/gptcl.cc b/gptcl.cc +index 34c9421..0d578eb 100644 +--- a/gptcl.cc ++++ b/gptcl.cc +@@ -155,7 +155,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + } // while + + // Assume first non-option argument is the device filename.... +- device = (char*) poptGetArg(poptCon); ++ device = strdup((char*) poptGetArg(poptCon)); + poptResetContext(poptCon); + + if (device != NULL) { +diff --git a/support.h b/support.h +index 8ba9ad1..f91f1bc 100644 +--- a/support.h ++++ b/support.h +@@ -8,7 +8,7 @@ + #include + #include + +-#define GPTFDISK_VERSION "1.0.9" ++#define GPTFDISK_VERSION "1.0.9.1" + + #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__) + // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64 +-- +2.35.1 + From peter at korsgaard.com Mon Feb 20 20:52:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:53 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi: fix build with fmt >= 9.x Message-ID: <20230220205154.06E0386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61bdd02e933e194a6f8aa5c1541f675d8ab71d09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For details see https://github.com/xbmc/xbmc/pull/21674 Build-tested using this previously broken defconfig: BR2_x86_64=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...t-as-char-as-formatting-of-non-void-point.patch | 54 ++++++++++++++++++++++ ...1-cast-as-char-as-formatting-of-non-void-.patch | 33 +++++++++++++ 2 files changed, 87 insertions(+) diff --git a/package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch b/package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch new file mode 100644 index 0000000000..af68de220c --- /dev/null +++ b/package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch @@ -0,0 +1,54 @@ +From 44b30c116682968bacf8aec566fc9c193026ecc9 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Wed, 6 Jul 2022 22:48:35 +1000 +Subject: [PATCH] GLUtils: cast as char as formatting of non-void pointers + is disallowed + +Downloaded from upstream commit: +https://github.com/xbmc/xbmc/commit/44b30c116682968bacf8aec566fc9c193026ecc9 + +Signed-off-by: Bernd Kuhls +--- + xbmc/utils/GLUtils.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp +index 1ef804709f..c36dcf6a20 100644 +--- a/xbmc/utils/GLUtils.cpp ++++ b/xbmc/utils/GLUtils.cpp +@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno) + void LogGraphicsInfo() + { + #if defined(HAS_GL) || defined(HAS_GLES) +- const GLubyte *s; ++ const char* s; + +- s = glGetString(GL_VENDOR); ++ s = reinterpret_cast(glGetString(GL_VENDOR)); + if (s) + CLog::Log(LOGINFO, "GL_VENDOR = %s", s); + else + CLog::Log(LOGINFO, "GL_VENDOR = NULL"); + +- s = glGetString(GL_RENDERER); ++ s = reinterpret_cast(glGetString(GL_RENDERER)); + if (s) + CLog::Log(LOGINFO, "GL_RENDERER = %s", s); + else + CLog::Log(LOGINFO, "GL_RENDERER = NULL"); + +- s = glGetString(GL_VERSION); ++ s = reinterpret_cast(glGetString(GL_VERSION)); + if (s) + CLog::Log(LOGINFO, "GL_VERSION = %s", s); + else + CLog::Log(LOGINFO, "GL_VERSION = NULL"); + +- s = glGetString(GL_SHADING_LANGUAGE_VERSION); ++ s = reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION)); + if (s) + CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s); + else +-- +2.30.2 + diff --git a/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch b/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch new file mode 100644 index 0000000000..41dc3356bd --- /dev/null +++ b/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch @@ -0,0 +1,33 @@ +From 651c82853fe69dc5aa3e6a50f2eb2f752caafba0 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Mon, 11 Jul 2022 09:39:02 +0000 +Subject: [PATCH] WinSystemX11: cast as char as formatting of non-void + pointers is disallowed + +Downloaded from upstream commit: +https://github.com/xbmc/xbmc/commit/651c82853fe69dc5aa3e6a50f2eb2f752caafba0 + +Signed-off-by: Bernd Kuhls +--- + xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp +index 8a18288fd8..033c0f77bf 100644 +--- a/xbmc/windowing/X11/WinSystemX11.cpp ++++ b/xbmc/windowing/X11/WinSystemX11.cpp +@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager() + + if(status == Success && items_read) + { +- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data); ++ const char* s; ++ ++ s = reinterpret_cast(data); ++ CLog::Log(LOGDEBUG, "Window Manager Name: {}", s); + } + else + CLog::Log(LOGDEBUG,"Window Manager Name: "); +-- +2.30.2 + From yann.morin.1998 at free.fr Mon Feb 20 20:52:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:53 -0000 Subject: [git commit branch/next] package/mali-driver: remove Miquèl from the DEVELOPERS list Message-ID: <20230220205152.65606828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=124fc473dd9298facc6f9fd58dd59a706550e29b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next I am not really maintaining these packages, I don't follow closely enough nor use them to take the time to make the necessary changes. Giulio has been much more reactive than me to fix issues and he is already listed for them anyway. Cc: Giulio Benetti Signed-off-by: Miquel Raynal Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 826e04d805..2aecdb1c8f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2128,10 +2128,6 @@ F: package/qcom-db410c-firmware/ N: Mikhail Boiko F: package/libfribidi/ -N: Miqu??l Raynal -F: package/mali-driver/ -F: package/rockchip-mali/ - N: Mircea Gliga F: package/mbuffer/ From peter at korsgaard.com Mon Feb 20 20:52:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:54 -0000 Subject: [Buildroot] [git commit branch/next] package/vim: security bump to version 9.0.0951 Message-ID: <20230220205154.3C0C986494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d40c8b31d50c55f6bf2536f2e3ad2af4c6dd5730 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-3705: A vulnerability was found in vim and classified as problematic. Affected by this issue is the function qf_update_buffer of the file quickfix.c of the component autocmd Handler. The manipulation leads to use after free. The attack may be launched remotely. Upgrading to version 9.0.0805 is able to address this issue. The name of the patch is d0fab10ed2a86698937e3c3fed2f10bd9bb5e731. It is recommended to upgrade the affected component. The identifier of this vulnerability is VDB-212324. Signed-off-by: Fabrice Fontaine 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 ef3bc46cdc..03ee908db4 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 f50ab9c023e7c276a61a7076c840d36254ce83691dba28af9ac5c513b6ace3b4 vim-9.0.0709.tar.gz +sha256 c95c9abcf024bd6293ad199e4efa1c09452a9c6456c9cbaf53d896cf7b9f4d08 vim-9.0.0951.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 de04910387a62ad4f9b36b91457c8d5ef32733ac5d768a128071b93f4821fcd1 README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 22c1eb91a8..d814c68630 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.0.0709 +VIM_VERSION = 9.0.0951 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:54 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8723ds: fix build failure due to endianness and Linux version 6.0 Message-ID: <20230220205152.5A3C381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=354f9387f33b5fab023cb98e52d84d58624f0ecf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add local patch pending upstream[0] to override CFLAGS to set endianness according to BR2_ENDIAN. Let's also bump version to latest to support up to Linux 6.1. [0]: https://github.com/lwfinger/rtl8723ds/pull/29 Fixes: http://autobuild.buildroot.net/results/2646ec0512f867e20c25c1d0a6417826218942d6/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...ve-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch | 39 ++++++++++++++++++++++ package/rtl8723ds/rtl8723ds.hash | 2 +- package/rtl8723ds/rtl8723ds.mk | 10 ++++-- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/package/rtl8723ds/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch b/package/rtl8723ds/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch new file mode 100644 index 0000000000..4495817358 --- /dev/null +++ b/package/rtl8723ds/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch @@ -0,0 +1,39 @@ +From 769a1943cb409f89f3c91208294a89b09bf47b86 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 16 Nov 2022 16:08:21 +0100 +Subject: [PATCH] Makefile: move 'EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)' at the + end of EXTRA_FLAGS assignment + +At the moment USER_EXTRA_CFLAGS can't override local Makfile EXTRA_CFLAGS +since it's assigned at the beginning of the Makefile. For example it's not +possible to undefine the hardcoded CONFIG_LITTLE_ENDIAN and this doesn't +allow to build these modules for big endian architectures. So let's move +the assignment of USER_EXTRA_CFLAGS to EXTRA_CFLAGS after the last +EXTRA_CFLAGS assignment. + +Signed-off-by: Giulio Benetti +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index aa57f85..3d91574 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,3 @@ +-EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) + EXTRA_CFLAGS += -O1 + #EXTRA_CFLAGS += -O3 + #EXTRA_CFLAGS += -Wall +@@ -1738,6 +1737,8 @@ ifneq ($(USER_MODULE_NAME),) + MODULE_NAME := $(USER_MODULE_NAME) + endif + ++EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) ++ + ifneq ($(KERNELRELEASE),) + + rtk_core := core/rtw_cmd.o \ +-- +2.34.1 + diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index 440ce75ef4..cbc77e14c1 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 cc5dcf9d17cefabfeba3e68671367c7d69091936e40f71dc5e1165c61195a9fb rtl8723ds-76146e85847beb2427b1d4958fa275822f2b04ab.tar.gz +sha256 691040a85d838f8d8d7da0f2ed460f1ea5f6734c40dc73770ba7e260b6cda9cc rtl8723ds-5ab2d3f3858dc4c833013c47a79faa05b10198f6.tar.gz diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 8598f906a9..0d96e6b03a 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,14 +4,20 @@ # ################################################################################ -RTL8723DS_VERSION = 76146e85847beb2427b1d4958fa275822f2b04ab +RTL8723DS_VERSION = 5ab2d3f3858dc4c833013c47a79faa05b10198f6 RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 +# Undefine the hardcoded CONFIG_LITTLE_ENDIAN +RTL8723DS_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN +# Set endianness +RTL8723DS_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN + RTL8723DS_MODULE_MAKE_OPTS = \ CONFIG_RTL8723DS=m \ KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) + KSRC=$(LINUX_DIR) \ + USER_EXTRA_CFLAGS="$(RTL8723DS_USER_EXTRA_CLAGS)" define RTL8723DS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) From peter at korsgaard.com Mon Feb 20 20:52:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:59 -0000 Subject: [Buildroot] [git commit branch/next] package/git: security bump to version 2.31.5 Message-ID: <20230220205154.47FA886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1d783d4ddcda520fa8bcf4d8cd3f68eaa2188a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: * CVE-2022-39253: When relying on the `--local` clone optimization, Git dereferences symbolic links in the source repository before creating hardlinks (or copies) of the dereferenced link in the destination repository. This can lead to surprising behavior where arbitrary files are present in a repository's `$GIT_DIR` when cloning from a malicious repository. Git will no longer dereference symbolic links via the `--local` clone mechanism, and will instead refuse to clone repositories that have symbolic links present in the `$GIT_DIR/objects` directory. Additionally, the value of `protocol.file.allow` is changed to be "user" by default. * CVE-2022-39260: An overly-long command string given to `git shell` can result in overflow in `split_cmdline()`, leading to arbitrary heap writes and remote code execution when `git shell` is exposed and the directory `$HOME/git-shell-commands` exists. `git shell` is taught to refuse interactive commands that are longer than 4MiB in size. `split_cmdline()` is hardened to reject inputs larger than 2GiB. https://github.com/git/git/blob/v2.31.5/Documentation/RelNotes/2.31.5.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 41afa83f86..af09ea817b 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 84fc20acf8fbea5cad7d5d7be0dfeb32494f1dac8e6c61675c904d1fd3d8c016 git-2.31.4.tar.xz +sha256 dbc80f88d36fcde2c7acaaa9343cfab0f56effe9aee60e5eb00f3f36b8a619b4 git-2.31.5.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index dc587170e8..653b4f46ad 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.31.4 +GIT_VERSION = 2.31.5 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From peter at korsgaard.com Mon Feb 20 20:53:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:00 -0000 Subject: [Buildroot] [git commit branch/next] package/memcached: fix static with shared build Message-ID: <20230220205154.CEB7386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7ca04fcb42051c53ff146cb7566d9ddd95a3a71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When BR2_SHARED_STATIC_LIBS is enabled, both --enable-static and --enable-shared are passed to configure. memcached configure.ac only looks for --enable-static to make the build static. But when linking against openssl pkg-config only returns dynamic linking dependencies, resulting in the following build failure: /home/thomas/autobuild/instance-1/output-1/host/bin/aarch64_be-buildroot-linux-gnu-gcc -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -pthread -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -static -o timedrun timedrun.o -levent -L/home/thomas/autobuild/instance-1/output-1/host/bin/../aarch64_be-buildroot-linux-gnu/sysroot/usr/lib -lssl -lcrypto -ldl /home/thomas/autobuild/instance-1/output-1/host/lib/gcc/aarch64_be-buildroot-linux-gnu/11.3.0/../../../../aarch64_be-buildroot-linux-gnu/bin/ld: memcached-memcached.o: in function `conn_new': memcached.c:(.text+0x1668): undefined reference to `SSL_set_info_callback' BR2_SHARED_STATIC_LIBS only makes sense for libraries, not executable binaries. Pass --disable-static unless BR2_STATIC_LIBS is enabled for static only build. Fixes: - http://autobuild.buildroot.org/results/363c84eaa69350e02bec0b35b88d4bdf4dad804c - http://autobuild.buildroot.org/results/0bde41bb700100d8df5ebdb1b64dfdc76c7af475 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/memcached/memcached.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index c7d89054bd..7b4069e820 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -29,4 +29,8 @@ else MEMCACHED_CONF_OPTS += --disable-tls endif +ifeq ($(BR2_STATIC_LIBS),) +MEMCACHED_CONF_OPTS += --disable-static +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:00 -0000 Subject: [Buildroot] [git commit branch/next] package/edk2-platforms: refine license Message-ID: <20230220205152.CD7C18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9bd126698397eb3105340f48e4f033e09b34aaf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The edk2-platforms project is licensed under the BSD-2-Clause license with a patent grant, as per commit ae604e4ffe8f ("edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent"). There is a BSD-2-Clause-Patent SPDX license identifier[1] for this case, therefore refine the edk2-platforms package to use this more specific identifier. [1]: https://spdx.org/licenses/BSD-2-Clause-Patent.html Signed-off-by: Vincent Stehl?? Cc: Dick Olsson Signed-off-by: Thomas Petazzoni --- package/edk2-platforms/edk2-platforms.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk index 7de59c1afc..6b155bf013 100644 --- a/package/edk2-platforms/edk2-platforms.mk +++ b/package/edk2-platforms/edk2-platforms.mk @@ -7,7 +7,7 @@ # Keep in sync with latest commit as of the release date for boot/edk2 EDK2_PLATFORMS_VERSION = db922e1253cb6f1fc456805bc42fb7d401eed5c2 EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION)) -EDK2_PLATFORMS_LICENSE = BSD-2-Clause +EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent EDK2_PLATFORMS_LICENSE_FILES = License.txt EDK2_PLATFORMS_INSTALL_TARGET = NO EDK2_PLATFORMS_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:01 -0000 Subject: [Buildroot] [git commit branch/next] utils/scanpypi: add LICENCE.TXT to the list of the license files Message-ID: <20230220205152.EEE6786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ecc33ec02a9c137387b9eb820e8e3b55b732d9b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scanpypi b/utils/scanpypi index 452b4a3fc3..3c98bb4bcc 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -487,7 +487,7 @@ class BuildrootPackage(): lines = [] filenames = ['LICENCE', 'LICENSE', 'LICENSE.MD', 'LICENSE.RST', - 'LICENSE.TXT', 'COPYING', 'COPYING.TXT'] + 'LICENCE.TXT', 'LICENSE.TXT', 'COPYING', 'COPYING.TXT'] self.license_files = list(find_file_upper_case(filenames, self.tmp_extract)) lines.append(self.__get_license_names(self.license_files)) From yann.morin.1998 at free.fr Mon Feb 20 20:53:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:01 -0000 Subject: [Buildroot] [git commit branch/next] package/optee-client: rename S30optee Message-ID: <20230220205155.2FB9486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cac489ce1dc9f280a76dce92960ea7807a5e86c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit b1c4c18766e51ee55e8d2e3a7cb12cb2762b12ff forgot to rename S30optee in optee-client.mk resulting in the following build failure: /usr/bin/install -m 0755 -D package/optee-client//S30optee /home/autobuild/autobuild/instance-0/output-1/target/etc/init.d/S30optee /usr/bin/install: cannot stat 'package/optee-client//S30optee': No such file or directory Fixes: - http://autobuild.buildroot.org/results/21fc165933e6d226de277b62d4ce99342cef0ffb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/optee-client/optee-client.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 252841ba10..3fbbe9484c 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -27,8 +27,8 @@ OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF endif define OPTEE_CLIENT_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30optee \ - $(TARGET_DIR)/etc/init.d/S30optee + $(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30tee-supplicant \ + $(TARGET_DIR)/etc/init.d/S30tee-supplicant endef $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:02 -0000 Subject: [Buildroot] [git commit branch/next] package/exim: add upstream security fixes for CVE-2022-3559 Message-ID: <20230220205154.8F1F086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bccc70e07a2a8c093249d6701161791e7ab7b58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes CVE-2022-3559: A vulnerability was found in Exim and classified as problematic. This issue affects some unknown processing of the component Regex Handler. The manipulation leads to use after free. The name of the patch is 4e9ed49f8f12eb331b29bd5b6dc3693c520fddc2. It is recommended to apply a patch to fix this issue. The identifier VDB-211073 was assigned to this vulnerability. The upstream patch does not apply to 4.96, so use the backported patches from Debian. Amazingly, the patch needs 3 additional patches to unbreak builds without "WITH_CONTENT_SCAN" (default in Buildroot), so add those as well. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...0006-Fix-regex-n-use-after-free.-Bug-2915.patch | 173 +++++++++++++++++++++ .../0007-Fix-non-WITH_CONTENT_SCAN-build.patch | 61 ++++++++ .../0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch | 139 +++++++++++++++++ .../0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch | 49 ++++++ package/exim/exim.mk | 3 + 5 files changed, 425 insertions(+) diff --git a/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch b/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch new file mode 100644 index 0000000000..57fa189b04 --- /dev/null +++ b/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch @@ -0,0 +1,173 @@ +From 4e9ed49f8f12eb331b29bd5b6dc3693c520fddc2 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 31 Aug 2022 15:37:40 +0100 +Subject: [PATCH] Fix $regex use-after-free. Bug 2915 + +[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_08-Fix-regex-n-use-after-free.-Bug-2915.patch] +[Peter: drop Changelog hunk] +Signed-off-by: Peter Korsgaard +--- + src/exim.c | 4 +--- + src/expand.c | 2 +- + src/functions.h | 1 + + src/globals.c | 2 +- + src/regex.c | 29 ++++++++++++++++++----------- + src/smtp_in.c | 2 ++ + test/confs/4002 | 10 ++++++++++ + test/mail/4002.userx | 7 +++++++ + test/scripts/4000-scanning/4002 | 7 +++++++ + 9 files changed, 53 insertions(+), 17 deletions(-) + +--- a/src/exim.c ++++ b/src/exim.c +@@ -1999,12 +1999,10 @@ + + regex_whitelisted_macro = + regex_must_compile(US"^[A-Za-z0-9_/.-]*$", FALSE, TRUE); + #endif + +-for (i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; +- + /* If the program is called as "mailq" treat it as equivalent to "exim -bp"; + this seems to be a generally accepted convention, since one finds symbolic + links called "mailq" in standard OS configurations. */ + + if ((namelen == 5 && Ustrcmp(argv[0], "mailq") == 0) || +@@ -6082,11 +6080,11 @@ + callout_address = NULL; + sending_ip_address = NULL; + deliver_localpart_data = deliver_domain_data = + recipient_data = sender_data = NULL; + acl_var_m = NULL; +- for(int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; ++ regex_vars_clear(); + + store_reset(reset_point); + } + + exim_exit(EXIT_SUCCESS); /* Never returns */ +--- a/src/expand.c ++++ b/src/expand.c +@@ -1871,11 +1871,11 @@ + { + tree_node * node = tree_search(router_var, name + 2); + return node ? node->data.ptr : strict_acl_vars ? NULL : US""; + } + +-/* Handle $auth variables. */ ++/* Handle $auth, $regex variables. */ + + if (Ustrncmp(name, "auth", 4) == 0) + { + uschar *endptr; + int n = Ustrtoul(name + 4, &endptr, 10); +--- a/src/functions.h ++++ b/src/functions.h +@@ -436,10 +436,11 @@ + extern int regex(const uschar **); + #endif + extern BOOL regex_match(const pcre2_code *, const uschar *, int, uschar **); + extern BOOL regex_match_and_setup(const pcre2_code *, const uschar *, int, int); + extern const pcre2_code *regex_must_compile(const uschar *, BOOL, BOOL); ++extern void regex_vars_clear(void); + extern void retry_add_item(address_item *, uschar *, int); + extern BOOL retry_check_address(const uschar *, host_item *, uschar *, BOOL, + uschar **, uschar **); + extern retry_config *retry_find_config(const uschar *, const uschar *, int, int); + extern BOOL retry_ultimate_address_timeout(uschar *, const uschar *, +--- a/src/globals.c ++++ b/src/globals.c +@@ -1313,11 +1313,11 @@ + #ifndef DISABLE_PIPE_CONNECT + const pcre2_code *regex_EARLY_PIPE = NULL; + #endif + const pcre2_code *regex_ismsgid = NULL; + const pcre2_code *regex_smtp_code = NULL; +-const uschar *regex_vars[REGEX_VARS]; ++const uschar *regex_vars[REGEX_VARS] = { 0 };; + #ifdef WHITELIST_D_MACROS + const pcre2_code *regex_whitelisted_macro = NULL; + #endif + #ifdef WITH_CONTENT_SCAN + uschar *regex_match_string = NULL; +--- a/src/regex.c ++++ b/src/regex.c +@@ -94,22 +94,32 @@ + } + pcre2_match_data_free(md); + return FAIL; + } + ++ ++/* reset expansion variables */ ++void ++regex_vars_clear(void) ++{ ++regex_match_string = NULL; ++for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; ++} ++ ++ ++ + int +-regex(const uschar **listptr) ++regex(const uschar ** listptr) + { + unsigned long mbox_size; +-FILE *mbox_file; +-pcre_list *re_list_head; +-uschar *linebuffer; ++FILE * mbox_file; ++pcre_list * re_list_head; ++uschar * linebuffer; + long f_pos = 0; + int ret = FAIL; + +-/* reset expansion variable */ +-regex_match_string = NULL; ++regex_vars_clear(); + + if (!mime_stream) /* We are in the DATA ACL */ + { + if (!(mbox_file = spool_mbox(&mbox_size, NULL, NULL))) + { /* error while spooling */ +@@ -167,18 +177,17 @@ + + + int + mime_regex(const uschar **listptr) + { +-pcre_list *re_list_head = NULL; +-FILE *f; +-uschar *mime_subject = NULL; ++pcre_list * re_list_head = NULL; ++FILE * f; ++uschar * mime_subject = NULL; + int mime_subject_len = 0; + int ret; + +-/* reset expansion variable */ +-regex_match_string = NULL; ++regex_vars_clear(); + + /* precompile our regexes */ + if (!(re_list_head = compile(*listptr))) + return FAIL; /* no regexes -> nothing to do */ + +--- a/src/smtp_in.c ++++ b/src/smtp_in.c +@@ -2155,12 +2155,14 @@ + prdr_requested = FALSE; + #endif + #ifdef SUPPORT_I18N + message_smtputf8 = FALSE; + #endif ++regex_vars_clear(); + body_linecount = body_zerocount = 0; + ++lookup_value = NULL; /* Can be set by ACL */ + sender_rate = sender_rate_limit = sender_rate_period = NULL; + ratelimiters_mail = NULL; /* Updated by ratelimit ACL condition */ + /* Note that ratelimiters_conn persists across resets. */ + + /* Reset message ACL variables */ diff --git a/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch b/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch new file mode 100644 index 0000000000..9f87f18e00 --- /dev/null +++ b/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch @@ -0,0 +1,61 @@ +From d8ecc7bf97934a1e2244788c610c958cacd740bd Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 31 Aug 2022 17:03:37 +0100 +Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build. + +Broken-by: 4e9ed49f8f + +[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_09-Fix-non-WITH_CONTENT_SCAN-build.patch] +Signed-off-by: Peter Korsgaard +--- + src/exim.c | 11 +++++++++++ + src/regex.c | 10 ---------- + 2 files changed, 11 insertions(+), 10 deletions(-) + +--- a/src/exim.c ++++ b/src/exim.c +@@ -1677,10 +1677,21 @@ + if ((s = expand_string(big_buffer))) printf("%s\n", CS s); + else printf("Failed: %s\n", expand_string_message); + } + + ++/* reset regex expansion variables */ ++void ++regex_vars_clear(void) ++{ ++regex_match_string = NULL; ++for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; ++} ++ ++ ++ ++ + + /************************************************* + * Entry point and high-level code * + *************************************************/ + +--- a/src/regex.c ++++ b/src/regex.c +@@ -95,20 +95,10 @@ + pcre2_match_data_free(md); + return FAIL; + } + + +-/* reset expansion variables */ +-void +-regex_vars_clear(void) +-{ +-regex_match_string = NULL; +-for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; +-} +- +- +- + int + regex(const uschar ** listptr) + { + unsigned long mbox_size; + FILE * mbox_file; diff --git a/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch b/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch new file mode 100644 index 0000000000..43cc1d79a9 --- /dev/null +++ b/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch @@ -0,0 +1,139 @@ +From 158dff9936e36a2d31d037d3988b9353458d6471 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 31 Aug 2022 17:17:59 +0100 +Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build (2) + +Broken-by: d8ecc7bf97 + +[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_10-Fix-non-WITH_CONTENT_SCAN-build-2.patch] +[Peter: drop Changelog hunk] +Signed-off-by: Peter Korsgaard +--- + src/exim.c | 13 +------------ + src/functions.h | 2 +- + src/globals.h | 2 +- + src/regex.c | 10 ++++++++++ + src/smtp_in.c | 2 ++ + 5 files changed, 15 insertions(+), 14 deletions(-) + +--- a/src/exim.c ++++ b/src/exim.c +@@ -1677,21 +1677,10 @@ + if ((s = expand_string(big_buffer))) printf("%s\n", CS s); + else printf("Failed: %s\n", expand_string_message); + } + + +-/* reset regex expansion variables */ +-void +-regex_vars_clear(void) +-{ +-regex_match_string = NULL; +-for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; +-} +- +- +- +- + + /************************************************* + * Entry point and high-level code * + *************************************************/ + +@@ -6085,17 +6074,17 @@ + deliver_domain_orig = NULL; + deliver_host = deliver_host_address = NULL; + dnslist_domain = dnslist_matched = NULL; + #ifdef WITH_CONTENT_SCAN + malware_name = NULL; ++ regex_vars_clear(); + #endif + callout_address = NULL; + sending_ip_address = NULL; + deliver_localpart_data = deliver_domain_data = + recipient_data = sender_data = NULL; + acl_var_m = NULL; +- regex_vars_clear(); + + store_reset(reset_point); + } + + exim_exit(EXIT_SUCCESS); /* Never returns */ +--- a/src/functions.h ++++ b/src/functions.h +@@ -432,15 +432,15 @@ + extern BOOL receive_msg(BOOL); + extern int_eximarith_t receive_statvfs(BOOL, int *); + extern void receive_swallow_smtp(void); + #ifdef WITH_CONTENT_SCAN + extern int regex(const uschar **); ++extern void regex_vars_clear(void); + #endif + extern BOOL regex_match(const pcre2_code *, const uschar *, int, uschar **); + extern BOOL regex_match_and_setup(const pcre2_code *, const uschar *, int, int); + extern const pcre2_code *regex_must_compile(const uschar *, BOOL, BOOL); +-extern void regex_vars_clear(void); + extern void retry_add_item(address_item *, uschar *, int); + extern BOOL retry_check_address(const uschar *, host_item *, uschar *, BOOL, + uschar **, uschar **); + extern retry_config *retry_find_config(const uschar *, const uschar *, int, int); + extern BOOL retry_ultimate_address_timeout(uschar *, const uschar *, +--- a/src/globals.h ++++ b/src/globals.h +@@ -895,16 +895,16 @@ + #ifndef DISABLE_PIPE_CONNECT + extern const pcre2_code *regex_EARLY_PIPE; /* For recognizing PIPE_CONNCT */ + #endif + extern const pcre2_code *regex_ismsgid; /* Compiled r.e. for message ID */ + extern const pcre2_code *regex_smtp_code; /* For recognizing SMTP codes */ +-extern const uschar *regex_vars[]; /* $regexN variables */ + #ifdef WHITELIST_D_MACROS + extern const pcre2_code *regex_whitelisted_macro; /* For -D macro values */ + #endif + #ifdef WITH_CONTENT_SCAN + extern uschar *regex_match_string; /* regex that matched a line (regex ACL condition) */ ++extern const uschar *regex_vars[]; + #endif + extern int remote_delivery_count; /* Number of remote addresses */ + extern int remote_max_parallel; /* Maximum parallel delivery */ + extern uschar *remote_sort_domains; /* Remote domain sorting order */ + extern retry_config *retries; /* Chain of retry config information */ +--- a/src/regex.c ++++ b/src/regex.c +@@ -95,10 +95,20 @@ + pcre2_match_data_free(md); + return FAIL; + } + + ++/* reset expansion variables */ ++void ++regex_vars_clear(void) ++{ ++regex_match_string = NULL; ++for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; ++} ++ ++ ++ + int + regex(const uschar ** listptr) + { + unsigned long mbox_size; + FILE * mbox_file; +--- a/src/smtp_in.c ++++ b/src/smtp_in.c +@@ -2155,11 +2155,13 @@ + prdr_requested = FALSE; + #endif + #ifdef SUPPORT_I18N + message_smtputf8 = FALSE; + #endif ++#ifdef WITH_CONTENT_SCAN + regex_vars_clear(); ++#endif + body_linecount = body_zerocount = 0; + + lookup_value = NULL; /* Can be set by ACL */ + sender_rate = sender_rate_limit = sender_rate_period = NULL; + ratelimiters_mail = NULL; /* Updated by ratelimit ACL condition */ diff --git a/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch b/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch new file mode 100644 index 0000000000..f9675c80d3 --- /dev/null +++ b/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch @@ -0,0 +1,49 @@ +From 32da6327e434e986a18b75a84f2d8c687ba14619 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Thu, 1 Sep 2022 15:54:35 +0100 +Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build (3) + +Broken-by: d8ecc7bf97 + +[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_11-Fix-non-WITH_CONTENT_SCAN-build-3.patch] +[Peter: drop Changelog hunk] +Signed-off-by: Peter Korsgaard +--- + src/expand.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/expand.c b/src/expand.c +index 89de56255..831ca2b75 100644 +--- a/src/expand.c ++++ b/src/expand.c +@@ -1869,6 +1869,7 @@ if (Ustrncmp(name, "auth", 4) == 0) + if (!*endptr && n != 0 && n <= AUTH_VARS) + return auth_vars[n-1] ? auth_vars[n-1] : US""; + } ++#ifdef WITH_CONTENT_SCAN + else if (Ustrncmp(name, "regex", 5) == 0) + { + uschar *endptr; +@@ -1876,6 +1877,7 @@ else if (Ustrncmp(name, "regex", 5) == 0) + if (!*endptr && n != 0 && n <= REGEX_VARS) + return regex_vars[n-1] ? regex_vars[n-1] : US""; + } ++#endif + + /* For all other variables, search the table */ + +@@ -8715,9 +8717,11 @@ assert_variable_notin() treats as const, so deconst is safe. */ + for (int i = 0; i < AUTH_VARS; i++) if (auth_vars[i]) + assert_variable_notin(US"auth", US auth_vars[i], &e); + ++#ifdef WITH_CONTENT_SCAN + /* check regex variables. assert_variable_notin() treats as const. */ + for (int i = 0; i < REGEX_VARS; i++) if (regex_vars[i]) + assert_variable_notin(US"regex", US regex_vars[i], &e); ++#endif + + /* check known-name variables */ + for (var_entry * v = var_table; v < var_table + var_table_size; v++) +-- +2.35.1 + diff --git a/package/exim/exim.mk b/package/exim/exim.mk index 9c54eeec44..cd2fabeab1 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -13,6 +13,9 @@ EXIM_CPE_ID_VENDOR = exim EXIM_SELINUX_MODULES = exim mta EXIM_DEPENDENCIES = host-berkeleydb host-pcre2 pcre2 berkeleydb host-pkgconf +# 0006-Fix-regex-n-use-after-free.-Bug-2915.patch +EXIM_IGNORE_CVES += CVE-2022-3559 + # Modify a variable value. It must already exist in the file, either # commented or not. define exim-config-change # variable-name, variable-value From peter at korsgaard.com Mon Feb 20 20:53:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:02 -0000 Subject: [Buildroot] [git commit branch/next] package/python3: add upstream security fix for CVE-2022-45061 Message-ID: <20230220205152.C24B2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39a2ff16f92a61a3e8593c394d211c18d01de8d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issue: CVE-2022-45061: An issue was discovered in Python before 3.11.1. An unnecessary quadratic algorithm exists in one path when processing some inputs to the IDNA (RFC 3490) decoder, such that a crafted, unreasonably long name being presented to the decoder could lead to a CPU denial of service. Hostnames are often supplied by remote servers that could be controlled by a malicious actor; in such a scenario, they could trigger excessive CPU consumption on the client attempting to make use of an attacker-supplied supposed hostname. For example, the attack payload could be placed in the Location header of an HTTP response with status code 302. Signed-off-by: Peter Korsgaard --- ...33-Fix-quadratic-time-idna-decoding.-GH-9.patch | 86 ++++++++++++++++++++++ package/python3/python3.mk | 3 + 2 files changed, 89 insertions(+) diff --git a/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch b/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch new file mode 100644 index 0000000000..d281e7261d --- /dev/null +++ b/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch @@ -0,0 +1,86 @@ +From 9bb8e18ca46fe66fa6802602f8a7228a24dd785f Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington at users.noreply.github.com> +Date: Mon, 7 Nov 2022 19:23:16 -0800 +Subject: [PATCH] [3.11] gh-98433: Fix quadratic time idna decoding. (GH-99092) + (GH-99222) + +There was an unnecessary quadratic loop in idna decoding. This restores +the behavior to linear. + +(cherry picked from commit d315722564927c7202dd6e111dc79eaf14240b0d) + +(cherry picked from commit a6f6c3a3d6f2b580f2d87885c9b8a9350ad7bf15) + +Co-authored-by: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> +Co-authored-by: Gregory P. Smith +[Peter: drop NEWS.d/*] +Signed-off-by: Peter Korsgaard +--- + Lib/encodings/idna.py | 32 +++++++++---------- + Lib/test/test_codecs.py | 6 ++++ + 2 files changed, 23 insertions(+), 17 deletions(-) + +diff --git a/Lib/encodings/idna.py b/Lib/encodings/idna.py +index ea4058512f..bf98f51336 100644 +--- a/Lib/encodings/idna.py ++++ b/Lib/encodings/idna.py +@@ -39,23 +39,21 @@ def nameprep(label): + + # Check bidi + RandAL = [stringprep.in_table_d1(x) for x in label] +- for c in RandAL: +- if c: +- # There is a RandAL char in the string. Must perform further +- # tests: +- # 1) The characters in section 5.8 MUST be prohibited. +- # This is table C.8, which was already checked +- # 2) If a string contains any RandALCat character, the string +- # MUST NOT contain any LCat character. +- if any(stringprep.in_table_d2(x) for x in label): +- raise UnicodeError("Violation of BIDI requirement 2") +- +- # 3) If a string contains any RandALCat character, a +- # RandALCat character MUST be the first character of the +- # string, and a RandALCat character MUST be the last +- # character of the string. +- if not RandAL[0] or not RandAL[-1]: +- raise UnicodeError("Violation of BIDI requirement 3") ++ if any(RandAL): ++ # There is a RandAL char in the string. Must perform further ++ # tests: ++ # 1) The characters in section 5.8 MUST be prohibited. ++ # This is table C.8, which was already checked ++ # 2) If a string contains any RandALCat character, the string ++ # MUST NOT contain any LCat character. ++ if any(stringprep.in_table_d2(x) for x in label): ++ raise UnicodeError("Violation of BIDI requirement 2") ++ # 3) If a string contains any RandALCat character, a ++ # RandALCat character MUST be the first character of the ++ # string, and a RandALCat character MUST be the last ++ # character of the string. ++ if not RandAL[0] or not RandAL[-1]: ++ raise UnicodeError("Violation of BIDI requirement 3") + + return label + +diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py +index 8edd5ac063..2407567261 100644 +--- a/Lib/test/test_codecs.py ++++ b/Lib/test/test_codecs.py +@@ -1535,6 +1535,12 @@ def test_builtin_encode(self): + self.assertEqual("pyth\xf6n.org".encode("idna"), b"xn--pythn-mua.org") + self.assertEqual("pyth\xf6n.org.".encode("idna"), b"xn--pythn-mua.org.") + ++ def test_builtin_decode_length_limit(self): ++ with self.assertRaisesRegex(UnicodeError, "too long"): ++ (b"xn--016c"+b"a"*1100).decode("idna") ++ with self.assertRaisesRegex(UnicodeError, "too long"): ++ (b"xn--016c"+b"a"*70).decode("idna") ++ + def test_stream(self): + r = codecs.getreader("idna")(io.BytesIO(b"abc")) + r.read(3) +-- +2.30.2 + diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 4131941e11..2e17104102 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -13,6 +13,9 @@ PYTHON3_LICENSE_FILES = LICENSE PYTHON3_CPE_ID_VENDOR = python PYTHON3_CPE_ID_PRODUCT = python +# 0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch +PYTHON3_IGNORE_CVES += CVE-2022-45061 + # This host Python is installed in $(HOST_DIR), as it is needed when # cross-compiling third-party Python modules. From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:03 -0000 Subject: [Buildroot] [git commit branch/next] package/heimdal: security bump to version 7.7.1 Message-ID: <20230220205153.069FE828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3959a039059d6b3bc95100409975e87e9c14d3b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This release fixes the following Security Vulnerabilities: - CVE-2022-42898 PAC parse integer overflows - CVE-2022-3437 Overflows and non-constant time leaks in DES{,3} and arcfour - CVE-2022-41916 Fix Unicode normalization read of 1 bytes past end of array - CVE-2021-44758 NULL dereference DoS in SPNEGO acceptors - CVE-2021-3671 A null pointer de-reference when handling missing sname in TGS-REQ - CVE-2022-44640 Heimdal KDC: invalid free in ASN.1 codec Note that CVE-2022-44640 is a severe vulnerability, possibly a 10.0 on the Common Vulnerability Scoring System (CVSS) v3, as we believe it should be possible to get an RCE on a KDC, which means that credentials can be compromised that can be used to impersonate anyone in a realm or forest of realms. Heimdal's ASN.1 compiler generates code that allows specially crafted DER encodings of CHOICEs to invoke the wrong free function on the decoded structure upon decode error. This is known to impact the Heimdal KDC, leading to an invalid free() of an address partly or wholly under the control of the attacker, in turn leading to a potential remote code execution (RCE) vulnerability. This error affects the DER codec for all extensible CHOICE types used in Heimdal, though not all cases will be exploitable. We have not completed a thorough analysis of all the Heimdal components affected, thus the Kerberos client, the X.509 library, and other parts, may be affected as well. This bug has been in Heimdal's ASN.1 compiler since 2005, but it may only affect Heimdal 1.6 and up. It was first reported by Douglas Bagnall, though it had been found independently by the Heimdal maintainers via fuzzing a few weeks earlier. While no zero-day exploit is known, such an exploit will likely be available soon after public disclosure. - CVE-2019-14870: Validate client attributes in protocol-transition - CVE-2019-14870: Apply forwardable policy in protocol-transition - CVE-2019-14870: Always lookup impersonate client in DB Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/heimdal/heimdal.hash | 4 ++-- package/heimdal/heimdal.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/heimdal/heimdal.hash b/package/heimdal/heimdal.hash index 005447a43b..cf822340da 100644 --- a/package/heimdal/heimdal.hash +++ b/package/heimdal/heimdal.hash @@ -1,5 +1,5 @@ # From https://github.com/heimdal/heimdal/releases -sha1 5dd16703be7255f66a4d65440f0c622aeeca60d9 heimdal-7.7.0.tar.gz -sha256 f02d3314d634cc55eb9cf04a1eae0d96b293e45a1f837de9d894e800161b7d1b heimdal-7.7.0.tar.gz +sha1 a33fdc957f84ab13f39f164b04fe1deeaab3179e heimdal-7.7.1.tar.gz +sha256 117cb1ede7848db24cf27311c46f7f735a99f9c836c22e80aec92b91efe56644 heimdal-7.7.1.tar.gz # Locally computed sha256 0c4b07bf5b98f7a1d01f8e60722d6c6747ef052c2aa6d2043daf690d4e1b0a7f LICENSE diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index a8d87531ec..21b6c0ccb3 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -4,7 +4,7 @@ # ################################################################################ -HEIMDAL_VERSION = 7.7.0 +HEIMDAL_VERSION = 7.7.1 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 From yann.morin.1998 at free.fr Mon Feb 20 20:53:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:03 -0000 Subject: [Buildroot] [git commit branch/next] package/gdb: zlib is mandatory, not optional Message-ID: <20230220205155.51ECB86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3341ceb1e58536cf43a4c000e4bb3cdbff3f6de5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next zlib is a mandatory dependency of gdb and by default, gdb will use its internal one. Moreover, --with-zlib has been replaced by --with-system-zlib since version 7.10 and https://github.com/bminor/binutils-gdb/commit/fa1f5da0b6ff3622f9bf60e348e149b76920abba Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=15131 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/gdb/Config.in | 1 + package/gdb/gdb.mk | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 273b3072ae..80b1185b5e 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -17,6 +17,7 @@ config BR2_PACKAGE_GDB depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_ZLIB # When the external toolchain gdbserver is copied to the # target, we don't allow building a separate gdbserver. The # one from the external toolchain should be used. diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 45ce126bab..4b9c5c6b70 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -32,7 +32,8 @@ GDB_PRE_CONFIGURE_HOOKS += GDB_CONFIGURE_SYMLINK # also need ncurses. # As for libiberty, gdb may use a system-installed one if present, so # we must ensure ours is installed first. -HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses +GDB_DEPENDENCIES = zlib +HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses host-zlib # Disable building documentation GDB_MAKE_OPTS += MAKEINFO=true @@ -130,6 +131,7 @@ GDB_CONF_OPTS = \ --disable-sim \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) \ --without-included-gettext \ + --with-system-zlib \ --disable-werror \ --enable-static \ --without-mpfr @@ -212,13 +214,6 @@ else GDB_CONF_OPTS += --without-lzma endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -GDB_CONF_OPTS += --with-zlib -GDB_DEPENDENCIES += zlib -else -GDB_CONF_OPTS += --without-zlib -endif - ifeq ($(BR2_PACKAGE_GDB_PYTHON),) # This removes some unneeded Python scripts and XML target description # files that are not useful for a normal usage of the debugger. @@ -256,6 +251,7 @@ HOST_GDB_CONF_OPTS = \ --enable-threads \ --disable-werror \ --without-included-gettext \ + --with-system-zlib \ --with-curses \ --without-mpfr \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) From yann.morin.1998 at free.fr Mon Feb 20 20:53:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:04 -0000 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6serialport: fix license Message-ID: <20230220205155.854E186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc1edd8c065471b5071be7e84a1bff56853a8472 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 343974b99528702842e8c1dad945fcd4f0defd6c forgot to change the licensing information which has been updated with https://code.qt.io/cgit/qt/qtserialport.git/commit/?id=bb05a26d52c834cc7f3c549f3e5d66f76baf42a2 resulting in the following build failure: ERROR: LICENSE.GPL2 has wrong sha256 hash: ERROR: expected: 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 ERROR: got : Fixes: - No autobuilder failures yet Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: one-item per line] Signed-off-by: Yann E. MORIN --- package/qt6/qt6serialport/qt6serialport.hash | 11 ++++++----- package/qt6/qt6serialport/qt6serialport.mk | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash index fb1b3dcf6b..54a45681fa 100644 --- a/package/qt6/qt6serialport/qt6serialport.hash +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -2,8 +2,9 @@ sha256 f148cc9e87ce2228e82bff7a64d9521339ece66c4c66aa43b91bac614f4a4483 qtserialport-everywhere-src-6.4.0.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialport/qt6serialport.mk b/package/qt6/qt6serialport/qt6serialport.mk index 01763657b8..9656e97c96 100644 --- a/package/qt6/qt6serialport/qt6serialport.mk +++ b/package/qt6/qt6serialport/qt6serialport.mk @@ -9,8 +9,21 @@ QT6SERIALPORT_SITE = $(QT6_SITE) QT6SERIALPORT_SOURCE = qtserialport-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALPORT_VERSION).tar.xz QT6SERIALPORT_INSTALL_STAGING = YES QT6SERIALPORT_SUPPORTS_IN_SOURCE_BUILD = NO -QT6SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) -QT6SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL + +QT6SERIALPORT_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0 with exception (tools), \ + GFDL-1.3 (docs), \ + BSD-3-Clause + +QT6SERIALPORT_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/Qt-GPL-exception-1.0.txt + QT6SERIALPORT_CONF_OPTS = \ -GNinja \ -DQT_HOST_PATH=$(HOST_DIR) \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:04 -0000 Subject: [Buildroot] [git commit branch/next] package/iwd: add dbus compile time dependency Message-ID: <20230220205152.86444828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47659b4f342382c764076c0c0dfbee446b090661 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In 5b3b2d80f4cf586d360ff696c3dacbd4cb48fdc4 we dropped dbus as a build dependency, however we still need it when building with systemd so that the service directory is available via pkg-config. In addition we can drop --with-dbus-datadir by unconditionally requiring dbus as the datadir will then be fetched from pkg-config. Fixes: checking D-Bus bus services directory... configure: error: D-Bus bus services directory is required http://autobuild.buildroot.net/results/4a48676460e6ce588897598f0022ec840b4b4b8d/ Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/iwd/iwd.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 002988cf33..5ffbde334e 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -16,9 +16,8 @@ IWD_SELINUX_MODULES = networkmanager IWD_CONF_OPTS = \ --disable-manual-pages \ --enable-external-ell \ - --enable-dbus-policy \ - --with-dbus-datadir=/usr/share -IWD_DEPENDENCIES = ell + --enable-dbus-policy +IWD_DEPENDENCIES = dbus ell ifeq ($(BR2_PACKAGE_READLINE),y) # iwd client depends on readline (GPL-3.0+) From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:05 -0000 Subject: [Buildroot] [git commit branch/next] package/bdwgc: needs MMU Message-ID: <20230220205147.1BAC08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ceb51d1463acb6918fbb825dc56b2a2b48ab8674 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raise since bump to version 8.2.2 in commit d7619682552dd34f499e9f17b0234af53da743ec and https://github.com/ivmai/bdwgc/commit/9d8c196268068bb75f86dee0ba75ccd024531e72: os_dep.c: In function 'block_unmap_inner': os_dep.c:2668:17: warning: implicit declaration of function 'madvise'; did you mean 'raise'? [-Wimplicit-function-declaration] 2668 | if (madvise(start_addr, len, MADV_DONTNEED) == -1) | ^~~~~~~ | raise Fixes: - http://autobuild.buildroot.org/results/2b9924cb8c36a75e1ca7aefe83e95dc11c10ded6 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/bdwgc/Config.in | 1 + package/guile/Config.in | 2 ++ package/poke/Config.in | 2 ++ 3 files changed, 5 insertions(+) diff --git a/package/bdwgc/Config.in b/package/bdwgc/Config.in index aad2bc9ef2..1124ab0f60 100644 --- a/package/bdwgc/Config.in +++ b/package/bdwgc/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_BDWGC bool "bdwgc" + depends on BR2_USE_MMU # madvise() depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS select BR2_PACKAGE_LIBATOMIC_OPS help diff --git a/package/guile/Config.in b/package/guile/Config.in index f70e674018..3cf0ec863b 100644 --- a/package/guile/Config.in +++ b/package/guile/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_GUILE bool "guile" + depends on BR2_USE_MMU # bdwgc depends on !BR2_TOOLCHAIN_USES_MUSL # no strtol_l depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # bdwgc @@ -17,5 +18,6 @@ config BR2_PACKAGE_GUILE http://www.gnu.org/software/guile comment "guile needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/poke/Config.in b/package/poke/Config.in index 40e7a31bab..8bedb12bf8 100644 --- a/package/poke/Config.in +++ b/package/poke/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_POKE depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # bdwgc depends on BR2_USE_WCHAR # needs wctomb depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU # bdwgc select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # less select BR2_PACKAGE_BDWGC select BR2_PACKAGE_LESS # runtime @@ -25,4 +26,5 @@ config BR2_PACKAGE_POKE comment "poke needs a toolchain w/ NPTL, wchar" depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:06 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-tools: perf needs threads Message-ID: <20230220205147.4667186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=958c166837a484e2a9515342c49e93dca734d726 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised (at least) since linux 4.0 and https://github.com/torvalds/linux/commit/459a3df76c99124fd222586be7f10f862547e7a9: CC /home/autobuild/autobuild/instance-2/output-1/build/linux-6.0.1/tools/perf/builtin-bench.o In file included from builtin-bench.c:22: bench/bench.h:66:10: fatal error: pthread.h: No such file or directory 66 | #include | ^~~~~~~~~~~ Fies: - http://autobuild.buildroot.org/results/b6abd641f528101e74f9af33e54ccefe0731148f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/linux-tools/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index 82e62f826e..8a0b6d5802 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -47,14 +47,15 @@ config BR2_PACKAGE_LINUX_TOOLS_PCI These tools are available only from kernel version 4.20. -comment "perf needs a toolchain w/ dynamic library" +comment "perf needs a toolchain w/ dynamic library, threads" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_LINUX_TOOLS_PERF bool "perf" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LINUX_TOOLS help perf (sometimes "Perf Events" or perf tools, originally From yann.morin.1998 at free.fr Mon Feb 20 20:52:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:06 -0000 Subject: [Buildroot] [git commit branch/next] configs/friendlyarm_nanopi_a64: remove defconfig Message-ID: <20230220205148.5A04D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c56314f4f9a648148eebc6b86d1c28ff9986dbae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499049 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/friendlyarm/nanopi-a64/boot.cmd | 6 ---- board/friendlyarm/nanopi-a64/genimage.cfg | 40 ------------------------- board/friendlyarm/nanopi-a64/readme.txt | 37 ----------------------- configs/friendlyarm_nanopi_a64_defconfig | 50 ------------------------------- 5 files changed, 135 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 427fce235d..30582cb648 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1301,7 +1301,6 @@ F: board/amarula/ F: board/asus/ F: board/bananapi/ F: board/engicam/ -F: board/friendlyarm/nanopi-a64/ F: board/friendlyarm/nanopi-neo2/ F: board/olimex/a33_olinuxino/ F: board/olimex/a64-olinuxino/ @@ -1319,7 +1318,6 @@ F: configs/engicam_imx6qdl_icore_qt5_defconfig F: configs/engicam_imx6qdl_icore_rqs_defconfig F: configs/engicam_imx6ul_geam_defconfig F: configs/engicam_imx6ul_isiot_defconfig -F: configs/friendlyarm_nanopi_a64_defconfig F: configs/friendlyarm_nanopi_neo2_defconfig F: configs/olimex_a33_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig diff --git a/board/friendlyarm/nanopi-a64/boot.cmd b/board/friendlyarm/nanopi-a64/boot.cmd deleted file mode 100644 index 446bd85672..0000000000 --- a/board/friendlyarm/nanopi-a64/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-a64-nanopi-a64.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-a64/genimage.cfg b/board/friendlyarm/nanopi-a64/genimage.cfg deleted file mode 100644 index 6907314149..0000000000 --- a/board/friendlyarm/nanopi-a64/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-nanopi-a64.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-a64/readme.txt b/board/friendlyarm/nanopi-a64/readme.txt deleted file mode 100644 index 88c4e661cb..0000000000 --- a/board/friendlyarm/nanopi-a64/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi A64. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Nanopi A64 link: -http://nanopi.io/nanopi-a64.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/FriendlyARM+Nanopi+A64 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make friendlyarm_nanopi_a64_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Nanopi A64 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/friendlyarm_nanopi_a64_defconfig b/configs/friendlyarm_nanopi_a64_defconfig deleted file mode 100644 index 4df22b2a2f..0000000000 --- a/configs/friendlyarm_nanopi_a64_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_a64" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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/friendlyarm/nanopi-a64/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-nanopi-a64" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi A64" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-a64/genimage.cfg" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:24 -0000 Subject: [Buildroot] [git commit branch/next] package/s6-linux-init: bump to version 1.0.8.0 Message-ID: <20230220205149.5B45D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d3c06435b24bac849bb31fcd24f56d45b191f47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This bump will fix the following build failure raised since bump of skalibs to version 2.12.0.1 in commit 0f7bfc80814e90918b9527cab4cbf6afedd22195 thanks to https://github.com/skarnet/s6-linux-init/commit/6696cee3bd309f61fc6c945ef747262a845e9267 In file included from src/shutdown/hpr_shutdown.c:8: src/shutdown/hpr.h:20:40: error: unknown type name 'tain_t'; did you mean 'tain'? 20 | extern int hpr_shutdown (unsigned int, tain_t const *, unsigned int) ; | ^~~~~~ | tain Update hash of COPYING (update in year with https://github.com/skarnet/s6-linux-init/commit/42a91a98b780759257862642c764c2102237fea6) https://github.com/skarnet/s6-linux-init/blob/v1.0.8.0/NEWS Fixes: - http://autobuild.buildroot.org/results/4382beeb0f94d583ba605c70a47f34b45c76e311 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/s6-linux-init/s6-linux-init.hash | 4 ++-- package/s6-linux-init/s6-linux-init.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/s6-linux-init/s6-linux-init.hash b/package/s6-linux-init/s6-linux-init.hash index 23f02d5359..f70a4f87b5 100644 --- a/package/s6-linux-init/s6-linux-init.hash +++ b/package/s6-linux-init/s6-linux-init.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 29e368516b1a3c61a6d1f8680645cc122a2e02127debec91738f170a3b93b8c5 s6-linux-init-1.0.6.3.tar.gz -sha256 4a5e44a69d649f0c37b29d7f6e5df1bb292b09898247be07f0c97814dac4b15d COPYING +sha256 92055a7964cf66604066ad964a2c2392ee7c5e64821be03146c1341e0d8c3dc6 s6-linux-init-1.0.8.0.tar.gz +sha256 1898df1e8703bd9c1350d2ec3397880b9b4c1451038a9ce5e1c4b2e58622da39 COPYING diff --git a/package/s6-linux-init/s6-linux-init.mk b/package/s6-linux-init/s6-linux-init.mk index 95595368de..6aec220de4 100644 --- a/package/s6-linux-init/s6-linux-init.mk +++ b/package/s6-linux-init/s6-linux-init.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_LINUX_INIT_VERSION = 1.0.6.3 +S6_LINUX_INIT_VERSION = 1.0.8.0 S6_LINUX_INIT_SITE = http://skarnet.org/software/s6-linux-init S6_LINUX_INIT_LICENSE = ISC S6_LINUX_INIT_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:52:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:25 -0000 Subject: [Buildroot] [git commit branch/next] configs/orangepi_prime: remove defconfig Message-ID: <20230220205148.D71EB86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0763bc283fda0117b920fe8fae29c9e8cc48737 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This defconfig has been failing to build for several months, with nobody stepping up to fix it. It's time to drop it. See https://lore.kernel.org/buildroot/20220806224338.0159e15c at windsurf/ for a notification on August 6, 2022 about the issues with this defconfig. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3234499141 Cc: Jagan Teki Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 -- board/orangepi/orangepi-prime/boot.cmd | 6 ---- board/orangepi/orangepi-prime/genimage.cfg | 40 ------------------------ board/orangepi/orangepi-prime/readme.txt | 37 ---------------------- configs/orangepi_prime_defconfig | 50 ------------------------------ 5 files changed, 135 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ec8df84fa8..f366426125 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1303,7 +1303,6 @@ F: board/olimex/a33_olinuxino/ F: board/olimex/a64-olinuxino/ F: board/orangepi/orangepi-lite2/ F: board/orangepi/orangepi-one-plus -F: board/orangepi/orangepi-prime/ F: board/orangepi/orangepi-win/ F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ @@ -1318,7 +1317,6 @@ F: configs/olimex_a33_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig F: configs/orangepi_lite2_defconfig F: configs/orangepi_one_plus_defconfig -F: configs/orangepi_prime_defconfig F: configs/orangepi_win_defconfig F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig diff --git a/board/orangepi/orangepi-prime/boot.cmd b/board/orangepi/orangepi-prime/boot.cmd deleted file mode 100644 index 34887880d8..0000000000 --- a/board/orangepi/orangepi-prime/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-prime.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-prime/genimage.cfg b/board/orangepi/orangepi-prime/genimage.cfg deleted file mode 100644 index dde9a6485f..0000000000 --- a/board/orangepi/orangepi-prime/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-prime.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-prime/readme.txt b/board/orangepi/orangepi-prime/readme.txt deleted file mode 100644 index 5811884d4d..0000000000 --- a/board/orangepi/orangepi-prime/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Orangepi Prime. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Orangepi Prime link: -http://www.orangepi.org/OrangePiPrime/ - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Prime - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make orangepi_prime_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -How to write the SD card -======================== - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync - -Insert the micro SDcard in your Orangepi Prime and power it up. The console -is on the serial line, 115200 8N1. diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig deleted file mode 100644 index f8f958c67b..0000000000 --- a/configs/orangepi_prime_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_prime" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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-prime/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-prime" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Prime" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-prime/genimage.cfg" From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:25 -0000 Subject: [Buildroot] [git commit branch/next] package/systemd: fix build with -Ofast Message-ID: <20230220205150.78D9486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9cd084b54e2223e49c37962b0cbefae7bea26ef5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next systemd does not build with -Ofast (at least with gcc-12), leading to build errors like: ../src/shared/condition.c: In function ???condition_dump_list???: ../src/shared/condition.c:1227:33: error: ???%s??? directive argument is null [-Werror=format-overflow=] 1227 | "%s\t%s: %s%s%s %s\n", | ^~ cc1: some warnings being treated as errors It is not really clear what the reason is, but it smells like a compiler error. Indeed, the failing format is passed to an fprintf, and the parameter corresponding to the failing %s directive is a call to a function which prototype is defined but the implementation only comes later in the same compilation unit, but is the result of macro expansion, which yields a function definition like: const char foo_to_string(foo_type i) { if (i < 0 || i >= (foo_type) ELEMENTSOF(foo_table)) return NULL; return foo_table[i] } (where ELEMENTSOF(x) is a macros arounf sizeof(x) to determine the number of elements in the array foo_table). However, in the failing case, foo_table is a static const array indexed with constants from an enum, and foo_to_string() is only ever called with variables that are only ever set to one of those enum values. Since -Ofast is also explicitly documented as breaking otehrwise conformant programs, we're not going to debug further the reason for the build failure. Instead, just revert to the best alternate optimisation level. We chose -O3, as -Ofast is based on -O3 with breaking optimisation flags. With -O3, the build succeeds. Fixes: http://autobuild.buildroot.org/results/3ffaa9b3ecacc6ac326be78196af1ad613f195ed/ (sparc64) http://autobuild.buildroot.org/results/3f6ae2e503dd1539e4240f344865da4881879204/ (arm) http://autobuild.buildroot.org/results/68c17056490d441c7f862349e9c7e471b4570162/ (ppc64) ... Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Sen Hastings Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 1d7452de19..b42f6a502b 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -90,6 +90,11 @@ SYSTEMD_CONF_OPTS += \ -Dumount-path=/usr/bin/umount \ -Dutmp=false +SYSTEMD_CFLAGS = $(TARGET_CFLAGS) +ifeq ($(BR2_OPTIMIZE_FAST),y) +SYSTEMD_CFLAGS += -O3 +endif + ifeq ($(BR2_nios2),y) # Nios2 ld emits warnings, make warnings not to be treated as errors SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings From peter at korsgaard.com Mon Feb 20 20:52:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:55 -0000 Subject: [Buildroot] [git commit branch/next] package/vlc: security bump version to 3.0.18 Message-ID: <20230220205154.118AD86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6866076d79ff2e022762b79421f511a8037fda73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Removed patch 0010, a different fix was applied upstream: https://code.videolan.org/videolan/vlc/-/commit/05445b74a38d045cb28f71f96ccbe882445a031e Removed patch 0011 which was backported from upstream. Renumbered patch 0012 -> 0010. Release notes: http://www.videolan.org/vlc/releases/3.0.18.html Fixes CVE-2022-41325: http://www.videolan.org/security/sb-vlc3018.html Signed-off-by: Bernd Kuhls [Peter: fix sha1 hash entry] Signed-off-by: Peter Korsgaard --- ...ess-live555.cpp-fix-build-with-live555-20.patch | 36 --------- ...tch => 0010-opengl-missing-library-check.patch} | 0 ...dav1d-fix-compilation-with-upcoming-dav1d.patch | 88 ---------------------- package/vlc/vlc.hash | 8 +- package/vlc/vlc.mk | 2 +- 5 files changed, 5 insertions(+), 129 deletions(-) diff --git a/package/vlc/0010-modules-access-live555.cpp-fix-build-with-live555-20.patch b/package/vlc/0010-modules-access-live555.cpp-fix-build-with-live555-20.patch deleted file mode 100644 index 5f046648d4..0000000000 --- a/package/vlc/0010-modules-access-live555.cpp-fix-build-with-live555-20.patch +++ /dev/null @@ -1,36 +0,0 @@ -From eba390d13ec4089cd6b9d8687ab3f8905b9d3ac8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 22 May 2021 22:56:04 +0200 -Subject: [PATCH] modules/access/live555.cpp: fix build with live555 >= - 2020.12.11 - -Since live555-2020.12.11, connectionEndpointAddress() member function -use a "struct sockaddr_storage" in preparation for eventual support of -IPv6: http://www.live555.com/liveMedia/public/changelog.txt - -Fixes: - - http://autobuild.buildroot.org/results/83170984f96238756c45bf1f4e542363afafd45f - -Signed-off-by: Fabrice Fontaine ---- - modules/access/live555.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp -index 9d6e01ae32..32a6c294eb 100644 ---- a/modules/access/live555.cpp -+++ b/modules/access/live555.cpp -@@ -850,7 +850,9 @@ static int SessionsSetup( demux_t *p_demux ) - if( !p_sys->b_multicast ) - { - /* We need different rollover behaviour for multicast */ -- p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() ); -+ struct sockaddr_storage tempAddr; -+ sub->getConnectionEndpointAddress( tempAddr ); -+ p_sys->b_multicast = IsMulticastAddress( tempAddr ); - } - - tk = (live_track_t*)malloc( sizeof( live_track_t ) ); --- -2.30.2 - diff --git a/package/vlc/0012-opengl-missing-library-check.patch b/package/vlc/0010-opengl-missing-library-check.patch similarity index 100% rename from package/vlc/0012-opengl-missing-library-check.patch rename to package/vlc/0010-opengl-missing-library-check.patch diff --git a/package/vlc/0011-dav1d-fix-compilation-with-upcoming-dav1d.patch b/package/vlc/0011-dav1d-fix-compilation-with-upcoming-dav1d.patch deleted file mode 100644 index 74b8645379..0000000000 --- a/package/vlc/0011-dav1d-fix-compilation-with-upcoming-dav1d.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 2202c892c8dc1381b596c53c2ebd3ca680061f95 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Fri, 18 Mar 2022 11:42:49 +0100 -Subject: [PATCH] dav1d: fix compilation with (upcoming) dav1d 1.0 - -(cherry picked from commit dbf45cea2a8abdfbef897b8a71f3eb782bb1b712) (edited) -edited: -- 3.0 has the 128 pixels padding elsewhere -- 3.0 has an extra parameter for add_integer_with_range() -- 3.0 was setting i_extra_picture_buffers further down in the code -- 3.0 uses 16 threads max - -Signed-off-by: Steve Lhomme - -Downloaded from upstream commit -https://code.videolan.org/videolan/vlc/-/commit/2202c892c8dc1381b596c53c2ebd3ca680061f95 - -Signed-off-by: Bernd Kuhls ---- - modules/codec/dav1d.c | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/modules/codec/dav1d.c b/modules/codec/dav1d.c -index 039165f52ec..cfabbc27cb3 100644 ---- a/modules/codec/dav1d.c -+++ b/modules/codec/dav1d.c -@@ -63,10 +63,16 @@ vlc_module_begin () - set_category(CAT_INPUT) - set_subcategory(SUBCAT_INPUT_VCODEC) - -+#if DAV1D_API_VERSION_MAJOR >= 6 -+ add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_THREADS, -+ THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) -+ add_obsolete_string("dav1d-thread-tiles") // unused with dav1d 1.0 -+#else - add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS, - THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) - add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS, - THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false) -+#endif - vlc_module_end () - - /***************************************************************************** -@@ -294,6 +300,11 @@ static int OpenDecoder(vlc_object_t *p_this) - return VLC_ENOMEM; - - dav1d_default_settings(&p_sys->s); -+#if DAV1D_API_VERSION_MAJOR >= 6 -+ p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); -+ if (p_sys->s.n_threads == 0) -+ p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16; -+#else - p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles"); - if (p_sys->s.n_tile_threads == 0) - p_sys->s.n_tile_threads = -@@ -303,6 +314,7 @@ static int OpenDecoder(vlc_object_t *p_this) - p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); - if (p_sys->s.n_frame_threads == 0) - p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16; -+#endif - p_sys->s.allocator.cookie = dec; - p_sys->s.allocator.alloc_picture_callback = NewPicture; - p_sys->s.allocator.release_picture_callback = FreePicture; -@@ -313,12 +325,20 @@ static int OpenDecoder(vlc_object_t *p_this) - return VLC_EGENERIC; - } - -+#if DAV1D_API_VERSION_MAJOR >= 6 -+ msg_Dbg(p_this, "Using dav1d version %s with %d threads", -+ dav1d_version(), p_sys->s.n_threads); -+ -+ dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1); -+#else - msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads", - dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads); - -+ dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); -+#endif -+ - dec->pf_decode = Decode; - dec->pf_flush = FlushDecoder; -- dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); - - dec->fmt_out.video.i_width = dec->fmt_in.video.i_width; - dec->fmt_out.video.i_height = dec->fmt_in.video.i_height; --- -GitLab - diff --git a/package/vlc/vlc.hash b/package/vlc/vlc.hash index 9060097906..4b9940df33 100644 --- a/package/vlc/vlc.hash +++ b/package/vlc/vlc.hash @@ -1,7 +1,7 @@ -# From https://get.videolan.org/vlc/3.0.17.4/vlc-3.0.17.4.tar.xz.sha256 -sha256 8c5a62d88a4fb45c1b095cf10befef217dfa87aedcec5184b9e7d590b6dd4133 vlc-3.0.17.4.tar.xz -# From https://get.videolan.org/vlc/3.0.17.4/vlc-3.0.17.4.tar.xz.sha1 -sha1 ebcd9939103fda141267c5a8f1c603df4533218e vlc-3.0.17.4.tar.xz +# From https://get.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz.sha256 +sha256 57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec vlc-3.0.18.tar.xz +# From https://get.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz.sha1 +sha1 b11ccaa0f5ee15a550564817d60458eb0946f80e vlc-3.0.18.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index aee3b735a9..c6ae46f469 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VLC_VERSION = 3.0.17.4 +VLC_VERSION = 3.0.18 VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPL-2.0+, LGPL-2.1+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:55 -0000 Subject: [Buildroot] [git commit branch/next] package/libnss: fix build failure with make 4.3.91 Message-ID: <20230220205152.278F18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5852fee868c318f0864bed3238b46348156422b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Make 4.3.91 doesn't allow to safely override Simple Expanded Variables, so let's add a patch pending upstream[0] to make those variable Conditional Expanded. [0]: https://bugzilla.mozilla.org/show_bug.cgi?id=1801182 Fixes: http://autobuild.buildroot.net/results/1074143dbea60567cd83be0a23f7c0214d470de9/ Signed-off-by: Giulio Benetti Tested-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch b/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch new file mode 100644 index 0000000000..7b3abea307 --- /dev/null +++ b/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch @@ -0,0 +1,45 @@ +From a1a5f3afea2ee59bdbb7a74eb2d7f82b635dbd1a Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Thu, 17 Nov 2022 20:38:48 +0100 +Subject: [PATCH] Bug 1801182 - Allow overriding OS_ARCH, OS_TEST and + OS_RELEASE in Makefile + +Starting from Make 4.3.91 simple expanded variables can't be safely +overriden via command line anymore, so let's use conditional expanded +variables to override OS_ARCH, OS_TEST and OS_RELEASE. + +Signed-off-by: Giulio Benetti +[Upstream status: https://bugzilla.mozilla.org/show_bug.cgi?id=1801182] +--- + nss/coreconf/arch.mk | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +index 17e9faeac..85aac9341 100644 +--- a/nss/coreconf/arch.mk ++++ b/nss/coreconf/arch.mk +@@ -20,17 +20,17 @@ + # Macros for getting the OS architecture + # + +-OS_ARCH := $(subst /,_,$(shell uname -s)) ++OS_ARCH ?= $(subst /,_,$(shell uname -s)) + + # + # Attempt to differentiate between sparc and x86 Solaris + # + +-OS_TEST := $(shell uname -m) ++OS_TEST ?= $(shell uname -m) + ifeq ($(OS_TEST),i86pc) +- OS_RELEASE := $(shell uname -r)_$(OS_TEST) ++ OS_RELEASE ?= $(shell uname -r)_$(OS_TEST) + else +- OS_RELEASE := $(shell uname -r) ++ OS_RELEASE ?= $(shell uname -r) + endif + + +-- +2.34.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:56 -0000 Subject: [Buildroot] [git commit branch/next] package/exim: mark CVE-2022-3620 as ignored Message-ID: <20230220205154.9B7DF86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43d5ff7ee4c5f012d79ba69ae6c736e3a88d20c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next CVE-2022-3620: A vulnerability was found in Exim and classified as problematic. This issue affects the function dmarc_dns_lookup of the file dmarc.c of the component DMARC Handler. The manipulation leads to use after free. The attack may be initiated remotely. The name of the patch is 12fb3842f81bcbd4a4519d5728f2d7e0e3ca1445. It is recommended to apply a patch to fix this issue. The associated identifier of this vulnerability is VDB-211919. This vulnerability is in the DMARC handling, which is only used if libopendmarc is available AND SUPPORT_DMARC is set to yes, neither of which is true for Buildroot, so ignore the CVE. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/exim/exim.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/exim/exim.mk b/package/exim/exim.mk index cd2fabeab1..b84a51d6de 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -16,6 +16,9 @@ EXIM_DEPENDENCIES = host-berkeleydb host-pcre2 pcre2 berkeleydb host-pkgconf # 0006-Fix-regex-n-use-after-free.-Bug-2915.patch EXIM_IGNORE_CVES += CVE-2022-3559 +# built without dmarc support +EXIM_IGNORE_CVES += CVE-2022-3620 + # Modify a variable value. It must already exist in the file, either # commented or not. define exim-config-change # variable-name, variable-value From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:56 -0000 Subject: [Buildroot] [git commit branch/next] package/igh-ethercat: bump to latest Git commit Message-ID: <20230220205152.3359F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea3e1696776187b55bbcaa49072cda49a43c32f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The current version 1.5.2 dates back from 2013, so it is extremely old. The latest master branch of igh-ethercat contains numerous fixes, including fixes to ensure that it builds with recent Linux kernel releases. Backporting the individual patches fixing those issues on a 9 year old release would be too much effort, so we propose to simply bump the version to the latest available in the Git master branch. Fixes: http://autobuild.buildroot.net/results/4dc9b71c805a8156bcf8f398edd3a30f2b6ac6da/ Signed-off-by: Thomas Petazzoni --- package/igh-ethercat/igh-ethercat.hash | 3 +-- package/igh-ethercat/igh-ethercat.mk | 13 ++++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package/igh-ethercat/igh-ethercat.hash b/package/igh-ethercat/igh-ethercat.hash index c77627ee56..88548bf23e 100644 --- a/package/igh-ethercat/igh-ethercat.hash +++ b/package/igh-ethercat/igh-ethercat.hash @@ -1,5 +1,4 @@ -# From http://etherlab.org/download/ethercat/ethercat-1.5.2.tar.bz2.md5 -md5 6b4001f8d975865d74a0b108b3bdda3d ethercat-1.5.2.tar.bz2 # Locally computed +sha256 eb13a0f7f073ad54589c4f41829d9e995b37b26fbc7fcd05e3adb5e201e6feb4 igh-ethercat-2e2cef6131895336f87c57c18fe78ae01a90d3de.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk index 9fcfb4f6f2..1041ba0758 100644 --- a/package/igh-ethercat/igh-ethercat.mk +++ b/package/igh-ethercat/igh-ethercat.mk @@ -4,11 +4,12 @@ # ################################################################################ -IGH_ETHERCAT_VERSION = 1.5.2 -IGH_ETHERCAT_SITE = http://etherlab.org/download/ethercat -IGH_ETHERCAT_SOURCE = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2 +IGH_ETHERCAT_VERSION = 2e2cef6131895336f87c57c18fe78ae01a90d3de +IGH_ETHERCAT_SITE = $(call gitlab,etherlab.org,ethercat,$(IGH_ETHERCAT_VERSION)) IGH_ETHERCAT_LICENSE = GPL-2.0 (IgH EtherCAT master), LGPL-2.1 (libraries) IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER +# Fetching from Git +IGH_ETHERCAT_AUTORECONF = YES IGH_ETHERCAT_INSTALL_STAGING = YES @@ -21,5 +22,11 @@ IGH_ETHERCAT_CONF_OPTS = \ $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000E),--enable-e1000e,--disable-e1000e) \ $(if $(BR2_PACKAGE_IGH_ETHERCAT_R8169),--enable-r8169,--disable-r8169) +# Needed to make autoreconf happy +define IGH_ETHERCAT_CREATE_CHANGELOG + touch $(@D)/ChangeLog +endef +IGH_ETHERCAT_POST_PATCH_HOOKS += IGH_ETHERCAT_CREATE_CHANGELOG + $(eval $(kernel-module)) $(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:52:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:52:57 -0000 Subject: [Buildroot] [git commit branch/next] package/asterisk: security bump to version 16.28.0 Message-ID: <20230220205151.DC48886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd42aa1d0a3ed7a5845c7b5e7c8aeb82d899699c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Asterisk 16.26.0 fixed the following security issues: - [ASTERISK-29476] ??? res_stir_shaken: Blind SSRF vulnerabilities https://issues.asterisk.org/jira/browse/ASTERISK-29476 - [ASTERISK-29838] ??? ${SQL_ESC()} not correctly escaping a terminating \ https://issues.asterisk.org/jira/browse/ASTERISK-29838 - [ASTERISK-29872] ??? res_stir_shaken: Resource exhaustion with large files https://issues.asterisk.org/jira/browse/ASTERISK-29872 https://www.asterisk.org/asterisk-news/asterisk-16-26-0-now-available/ It unfortunately also introduced a change to chan_iax2, breaking builds without OpenSSL: https://github.com/asterisk/asterisk/commit/59a8cdaca2dbb5eeb7382dfbe78c0c1cbed8ce6d Which was again fixed in 16.28.0: https://github.com/asterisk/asterisk/commit/f812dfb68c6ed7ae55b4c163716fd1ddc063ff54 So bump to 16.28.0: https://www.asterisk.org/asterisk-news/asterisk-16-28-0-now-available/ The libxml2 support now uses pkg-config, so drop the libxml2-config handling: https://github.com/asterisk/asterisk/commit/bf9dafa7c22302b2f1a12b8216da63102116d9c9 Signed-off-by: Peter Korsgaard [yann.morin.1998 at free.fr: - add host-pkgconf dep, don't rely on implicit dep from host-asterisk ] Signed-off-by: Yann E. MORIN --- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 880d67562d..9792d82ac5 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 0fb817943a276f5e540c2a9432e8841cd3393e7c1bd1250055c620902f6eafc8 asterisk-16.25.2.tar.gz +sha256 6e9c2f350db018df854b1301687ced8993facb2787698336e55cd19e0ae3ebfe asterisk-16.28.0.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 9b59997b80..e0f28ae7ee 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.25.2 +ASTERISK_VERSION = 16.28.0 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) @@ -31,6 +31,7 @@ ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ith ASTERISK_DEPENDENCIES = \ host-asterisk \ + host-pkgconf \ jansson \ libcurl \ libedit \ @@ -115,8 +116,7 @@ ASTERISK_CONF_OPTS += --without-avcodec ASTERISK_CONF_OPTS += --without-spandsp ASTERISK_CONF_ENV = \ - ac_cv_file_bridges_bridge_softmix_include_hrirs_h=true \ - ac_cv_path_CONFIG_LIBXML2=$(STAGING_DIR)/usr/bin/xml2-config + ac_cv_file_bridges_bridge_softmix_include_hrirs_h=true # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) @@ -314,8 +314,6 @@ HOST_ASTERISK_LICENSE_FILES = COPYING # so do not inherit the target setup. HOST_ASTERISK_AUTORECONF = NO -HOST_ASTERISK_CONF_ENV = CONFIG_LIBXML2=$(HOST_DIR)/bin/xml2-config - HOST_ASTERISK_CONF_OPTS = \ --without-newt \ --without-curses \ From peter at korsgaard.com Mon Feb 20 20:52:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:57 -0000 Subject: [Buildroot] [git commit branch/next] package/libmdbx: bump version to 0.11.13 "Swashplate" Message-ID: <20230220205154.1C25B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b71948c32bdc7f849190cb9501f72faa608dc17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is stable bugfix release of libmdbx, in Family Glory and in memory of Boris Yuriev (the inventor of Helicopter and Swashplate in 1911) on his 133rd birthday. It is reasonable to backport this patch to all applicable releases/branches of Buildroot. Release notes for v0.11.13 -------------------------- Fixes: - Fixed builds with older libc versions after using `fcntl64()` (backport). - Fixed builds with older `stdatomic.h` versions, where the `ATOMIC_*_LOCK_FREE` macros mistakenly redefined using functions (backport). - Added workaround for `mremap()` defect to avoid assertion failure (backport). - Workaround for `encryptfs` bug(s) in the `copy_file_range` implementation (backport). - Fixed unexpected `MDBX_BUSY` from `mdbx_env_set_option()`, `mdbx_env_set_syncbytes()` and `mdbx_env_set_syncperiod()` (backport). - CMake requirements lowered to version 3.0.2 (backport). - Added admonition of insecure for RISC-V (backport). Minors: - Minor clarification output of `--help` for `mdbx_test` (backport). - Added admonition of insecure for RISC-V (backport). - Stochastic scripts and CMake files synchronized with the `devel` branch. - Use `--dont-check-ram-size` for small-tests make-targets (backport). The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md Signed-off-by: ???????????? ?????????? (Leonid Yuriev) Signed-off-by: Thomas Petazzoni --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index 79af189633..e3fb309461 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 dde8f3626509bb764b17c93fe0629389625cb50362502eb1c27ca208342f3894 libmdbx-amalgamated-0.11.12.tar.xz +sha256 9449fd357119e19902363ab90134d82c9a713b706394c2a1389b5bb4787b5164 libmdbx-amalgamated-0.11.13.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index ac1a3a0d6f..a139e062f6 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.12 +LIBMDBX_VERSION = 0.11.13 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:58 -0000 Subject: [Buildroot] [git commit branch/next] package/gitlab-runner: fix inconsistency of systemd and sysv daemons Message-ID: <20230220205152.91F748648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef6c9da9d255f04847a89d22b99ab3605102d4cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Copy default $DAEMON_ARGS from systemd service to sysv init script. Make GITLAB_RUNNER_USER home directory the same as default --work-directory (-d) flag. Run sysv daemon process using root user (remove -c option) This is needed to correctly access config files as specified. System access can still be limited with gitlab-runner `--user` flag. Use same $DAEMON_ARGS variable name so it can be overwritten in /etc/default/gitlab-runner environment file in both cases. Signed-off-by: Marek Metelski Reviewed-by: Marcin Niestroj Signed-off-by: Thomas Petazzoni --- package/gitlab-runner/S95gitlab-runner | 6 +++--- package/gitlab-runner/gitlab-runner.mk | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/gitlab-runner/S95gitlab-runner b/package/gitlab-runner/S95gitlab-runner index 2a50e7151a..739adf1783 100644 --- a/package/gitlab-runner/S95gitlab-runner +++ b/package/gitlab-runner/S95gitlab-runner @@ -3,7 +3,7 @@ DAEMON="gitlab-runner" PIDFILE="/var/run/$DAEMON.pid" -GITLAB_RUNNER_ARGS="run" +DAEMON_ARGS="run --syslog --user gitlab-runner -d /var/lib/gitlab-runner -c /etc/gitlab-runner/config.toml" # shellcheck source=/dev/null [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" @@ -11,8 +11,8 @@ GITLAB_RUNNER_ARGS="run" start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -m -b -p "$PIDFILE" -c "$DAEMON:$DAEMON" -x "/usr/bin/$DAEMON" \ - -- $GITLAB_RUNNER_ARGS + start-stop-daemon -S -q -m -b -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ + -- $DAEMON_ARGS status=$? if [ "$status" -eq 0 ]; then echo "OK" diff --git a/package/gitlab-runner/gitlab-runner.mk b/package/gitlab-runner/gitlab-runner.mk index fde776e631..9542275135 100644 --- a/package/gitlab-runner/gitlab-runner.mk +++ b/package/gitlab-runner/gitlab-runner.mk @@ -12,9 +12,8 @@ GITLAB_RUNNER_LICENSE_FILES = LICENSE GITLAB_RUNNER_LDFLAGS = \ -X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=$(GITLAB_RUNNER_VERSION) -# Don't run gitlab runner as root. define GITLAB_RUNNER_USERS - gitlab-runner -1 gitlab-runner -1 * /var/run/dbus /bin/false - Gitlab Runner + gitlab-runner -1 gitlab-runner -1 * /var/lib/gitlab-runner /bin/false - Gitlab Runner endef define GITLAB_RUNNER_INSTALL_INIT_SYSV From peter at korsgaard.com Mon Feb 20 20:52:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:52:58 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_kria_kv260_defconfig: bump to Xilinx 2022.2 Message-ID: <20230220205154.6773486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5bbc20154e2291b967b7fc66ca4f85a2b47dcfd1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch bumps the zynqmp_kria_kv260_defconfig to Xilinx release 2022.2. Xilinx 2022.2 includes: - U-Boot 2022.01 bug fixes - Linux bump to Linux 5.15.36 with bug fixes - TF-A 2.6 bug fixes - PMUFW bug fixes Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/zynqmp_kria_kv260_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 25bab4cbb4..7afc7748b0 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.1)/xlnx_rebase_v5.15_LTS_2022.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/smk-k26-revA-sck-kv-g-revB" @@ -15,14 +15,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.1)/xlnx_rebase_v2.6_2022.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.1)/xlnx_rebase_v2022.01_2022.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/kv260/uboot.fragment" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -30,7 +30,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.1/kv260/kv260_pmufw.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.2/kv260/kv260_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:52:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:52:59 -0000 Subject: [Buildroot] [git commit branch/next] configs/qemu_aarch64_ebbr: add host-qemu Message-ID: <20230220205152.E1706828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2cda2584fbb566284019f39ca89f44b42dacdb03 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add the host-qemu package to enable testing on gitlab. Signed-off-by: Vincent Stehl?? Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/qemu_aarch64_ebbr_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index a0d8105c43..d293ad0e60 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -48,3 +48,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From arnout at mind.be Mon Feb 20 20:53:05 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:53:05 -0000 Subject: [Buildroot] [git commit branch/next] package/libopenssl: drop useless option for rc5 Message-ID: <20230220205153.21BE286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7178dd432e4905cf96383e5aa316553cf30f178 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit a83d41867c8d (package/libopenssl: add option to enable some features) added an option to enable rc5. However, since commit 1fff94121936 (Fixup non-x86 openssl build), dated 2002-12-30, rc5 has always been forcibly disabled in Buildroot. Given that it was unconditionally disabled all this time, and no one complained, it means there is virtually no-one using rc5, so we can just drop the option. Signed-off-by: Yann E. MORIN Cc: "GAUTRON, Erwan" Cc: "Weber, Matthew L Collins" Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 7 +++++++ package/libopenssl/Config.in | 4 ---- package/libopenssl/libopenssl.mk | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7458fa331e..b3c35d6b07 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.11" +config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 + bool "libopenssl rc5 was never enabled" + select BR2_LEGACY + help + The libopenssl option for rc5 never actually enabled rc5, + which had always been disabled in Buildroot. + config BR2_PACKAGE_LIBDCADEC bool "package was deprecated upstream, use ffmpeg instead" select BR2_LEGACY diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in index fcead4c11a..00339238fb 100644 --- a/package/libopenssl/Config.in +++ b/package/libopenssl/Config.in @@ -44,10 +44,6 @@ config BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA bool "enable CHACHA" default y -config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 - bool "enable RC5" - default y - config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2 bool "enable RC2" default y diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 50d41a6533..3542b89727 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -85,7 +85,6 @@ define LIBOPENSSL_CONFIGURE_CMDS no-fuzz-afl \ no-afalgeng \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA),,no-chacha) \ - $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5),,no-rc5) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2),,no-rc2) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4),,no-rc4) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MD2),,no-md2) \ From peter at korsgaard.com Mon Feb 20 20:53:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:05 -0000 Subject: [Buildroot] [git commit branch/next] package/lxc: fix build with sys/pidfd.h Message-ID: <20230220205155.AA34A86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74b1d385b67dc5933eca3ebeb456d400bd5296d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with sys/pidfd.h raised since bump to version 5.0.1 in commit db19998035701d08bf1b5fd366e0b5aa9adb8e57: In file included from ../src/lxc/utils.h:23, from ../src/lxc/cgroups/cgfsng.c:51: ../src/lxc/process_utils.h:140:17: error: expected identifier before numeric constant 140 | #define P_PIDFD 3 | ^ Fixes: - http://autobuild.buildroot.org/results/c9ff42a921ca47f634f908bab80c80164c227a02 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...003-build-detect-sys-pidfd.h-availability.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch b/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch new file mode 100644 index 0000000000..3aa598407f --- /dev/null +++ b/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch @@ -0,0 +1,55 @@ +From ef1e0607b82e27350c2d677d649c6a0a9693fd40 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Tue, 9 Aug 2022 16:27:40 +0200 +Subject: [PATCH] build: detect sys/pidfd.h availability + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) + +[Retrieved from: +https://github.com/lxc/lxc/commit/ef1e0607b82e27350c2d677d649c6a0a9693fd40] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 1 + + src/lxc/process_utils.h | 6 ++++++ + 2 files changed, 7 insertions(+) + +diff --git a/meson.build b/meson.build +index f679aabbc8..e999542336 100644 +--- a/meson.build ++++ b/meson.build +@@ -735,6 +735,7 @@ foreach tuple: [ + ['sys/resource.h'], + ['sys/memfd.h'], + ['sys/personality.h'], ++ ['sys/pidfd.h'], + ['sys/signalfd.h'], + ['sys/timerfd.h'], + ['pty.h'], +diff --git a/src/lxc/process_utils.h b/src/lxc/process_utils.h +index 9c15b15741..ed84741d0e 100644 +--- a/src/lxc/process_utils.h ++++ b/src/lxc/process_utils.h +@@ -15,6 +15,10 @@ + #include + #include + ++#if HAVE_SYS_PIDFD_H ++#include ++#endif ++ + #include "compiler.h" + #include "syscall_numbers.h" + +@@ -136,9 +140,11 @@ + #endif + + /* waitid */ ++#if !HAVE_SYS_PIDFD_H + #ifndef P_PIDFD + #define P_PIDFD 3 + #endif ++#endif + + #ifndef CLONE_ARGS_SIZE_VER0 + #define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ From peter at korsgaard.com Mon Feb 20 20:53:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:06 -0000 Subject: [Buildroot] [git commit branch/next] Kickoff 2023.02 cycle Message-ID: <20230220205155.D735E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15d3648df93d1113b07a63c1264ea4b5ba9662b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 89f3648bb7..9c1776eb6c 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.11 +export BR2_VERSION := 2023.02-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1669308000 From yann.morin.1998 at free.fr Mon Feb 20 20:53:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:06 -0000 Subject: [Buildroot] [git commit branch/next] package/sysstat: security bump to version 12.6.1 Message-ID: <20230220205151.BEF7481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4ef408e8f738575841c5ffc43504be4c3f6fa56 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-39377: sysstat is a set of system performance tools for the Linux operating system. On 32 bit systems, in versions 9.1.16 and newer but prior to 12.7.1, allocate_structures contains a size_t overflow in sa_common.c. The allocate_structures function insufficiently checks bounds before arithmetic multiplication, allowing for an overflow in the size allocated for the buffer representing system activities. This issue may lead to Remote Code Execution (RCE). Despite what is written above in the CVE announcement, and as written in the Changelog, the fix is also included in version 12.6.1 (12.7.1 is a development version): https://github.com/sysstat/sysstat/commit/c1e631eddc50c04e4dcea169ba396bee2bd6b0ab As a consequence, 12.6.1 is still reported as being affected. Until the NVD is updated appropriately, we mark the CVE as ignored with a comment that explains why. Note: that commit is not reachable from any branch in the sysstat repository, and Github warns about that, but the commit does belong to the upstream repository and is reachable from the 12.6.1 tag (it looks like sysstat only pushes tags-with-history for fix releases). https://github.com/sysstat/sysstat/security/advisories/GHSA-q8r6-g56f-9w7x https://github.com/sysstat/sysstat/blob/v12.6.1/CHANGES Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: - ignore the CVE, explain why - explain why github warns about the fix commit ] Signed-off-by: Yann E. MORIN --- package/sysstat/sysstat.hash | 4 ++-- package/sysstat/sysstat.mk | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash index b573f312c6..b47f000e57 100644 --- a/package/sysstat/sysstat.hash +++ b/package/sysstat/sysstat.hash @@ -1,5 +1,5 @@ # From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 1e38bc029979def730ae1fb1e39f631bd1a3bc73 sysstat-12.4.2.tar.xz +sha1 a730982e0c2d4964a0022c1509f3ea0a345402bc sysstat-12.6.1.tar.xz # Locally calculated -sha256 3701b2c1883d50eb384d7b95ce5b6df0a71fdcb3c23f96cb58098d1bcffa018f sysstat-12.4.2.tar.xz +sha256 18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342 sysstat-12.6.1.tar.xz sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 6948f6b390..eaf505dc49 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSSTAT_VERSION = 12.4.2 +SYSSTAT_VERSION = 12.6.1 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard SYSSTAT_CONF_OPTS = --disable-file-attr @@ -14,6 +14,9 @@ SYSSTAT_LICENSE_FILES = COPYING SYSSTAT_CPE_ID_VENDOR = sysstat_project SYSSTAT_SELINUX_MODULES = sysstat +# NVD is not up-to-date; 12.6.1 includes c1e631eddc50, which fixes the issue +SYSSTAT_IGNORE_CVES += CVE-2022-39377 + ifeq ($(BR2_PACKAGE_LM_SENSORS),y) SYSSTAT_DEPENDENCIES += lm-sensors SYSSTAT_CONF_OPTS += --enable-sensors From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:07 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: remove Derrick Lyndon Pallas Message-ID: <20230220205155.E1AF886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6aca1d4d70bfe0b8a627d9e08692b36dd19a92d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next His e-mail address no longer exists: Your message wasn't delivered to derrick at meter.com because the address couldn't be found, or is unable to receive mail. Learn more here: https://support.google.com/mail/answer/6596 The response was: The email account that you tried to reach does not exist. Please try double-checking the recipient's email address for typos or unnecessary spaces. Learn more at https://support.google.com/mail/answer/6596 Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 4f862befb0..9da61cca13 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -729,9 +729,6 @@ F: package/tcllib/ N: Denis Bodor F: package/libstrophe/ -N: Derrick Lyndon Pallas -F: package/ipcalc/ - N: Dick Olsson F: board/aarch64-efi/ F: board/pc/ From peter at korsgaard.com Mon Feb 20 20:53:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:08 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.11-rc3 Message-ID: <20230220205153.4ECF5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=269c1e9368e5473fa0dc117ff6b020143c014c8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- CHANGES | 15 +++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 47 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index d08b2500ab..79b010a9b8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,18 @@ +2022.11-rc3, released November 24th, 2022 + + Fixes all over the tree. + + Updated/fixed packages: asterisk, edk2, edk2-platforms, + freerdp, gitlab-runner, gnupg2, gptfdisk, heimdal, + igh-ethercat, iwd, libkrb5, libksba, libnss, libopenssl, + mesa3d, nginx, nodejs, openpgm, python3, rsync, rtl8189es, + rtl8723ds, samba4, sdl, sdl2, swupdate, sysstat, systemd, + uboot, xen, xterm + + Issues resolved (http://bugs.uclibc.org): + + #15141: kernel 5.16.2 (realtime patch 19) fails to build + 2022.11-rc2, released November 16th, 2022 Fixes all over the tree. diff --git a/Makefile b/Makefile index b2f342f4a8..827ab230ef 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.11-rc2 +export BR2_VERSION := 2022.11-rc3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1668603000 +BR2_VERSION_EPOCH = 1669308000 # 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 538f2f6042..a92f630611 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@
        -

        Latest release candidate: 2022.11-rc2

        +

        Latest release candidate: 2022.11-rc3

        - +
        - +
        -

        buildroot-2022.11-rc2.tar.gz

        -

        PGP signature

        +

        buildroot-2022.11-rc3.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2022.11-rc2.tar.xz

        -

        PGP signature

        +

        buildroot-2022.11-rc3.tar.xz

        +

        PGP signature

        diff --git a/docs/website/news.html b/docs/website/news.html index ee7ce344c9..1d76cc3cf5 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

        News

          +
        • +
          +
          +
          +

          2022.11-rc3 released

          +

          24 November 2022

          +
          +
          +

          2022.11-rc3 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

          + +

          Head to the downloads page to pick up the + 2022.11-rc3 + release candidate, and report any problems found to the + mailing list or + bug tracker.

          +
          +
          +
          • +
        • From peter at korsgaard.com Mon Feb 20 20:53:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:08 -0000 Subject: [Buildroot] [git commit branch/next] package/sdl2_ttf: fix legal-info after bump to 2.20.1 Message-ID: <20230220205156.34EAC86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2313f68e4c56faf9d5366bc3c61d03cf814f5a43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 93d8b71371962 (package/sdl2_ttf: bump version to 2.20.1) dropped the hash for COPYING.txt and added a hash for LICENSE.txt but forgot to adjust SDL2_TTF_LICENSE_FILES, breaking legal-info: >>> sdl2_ttf 2.20.1 Collecting legal info ERROR: No hash found for COPYING.txt cp: cannot stat '/path/to/output/build/sdl2_ttf-2.20.1/COPYING.txt': No such file or directory make[1]: *** [package/sdl2_ttf/sdl2_ttf.mk:38: sdl2_ttf-legal-info] Error 1 Signed-off-by: Peter Korsgaard --- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 4b44b0fc41..f859d097ff 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -8,7 +8,7 @@ SDL2_TTF_VERSION = 2.20.1 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib -SDL2_TTF_LICENSE_FILES = COPYING.txt +SDL2_TTF_LICENSE_FILES = LICENSE.txt SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf SDL2_TTF_CONF_OPTS = --disable-freetype-builtin --disable-harfbuzz-builtin From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:08 -0000 Subject: [Buildroot] [git commit branch/next] package/wilc-driver: fix build failure due to missing Linux options Message-ID: <20230220205153.5A3AA86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9fe82e56d205c1fb3efe4ef6ae5b24d2284f1429 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Enable Linux options depending on the bus has been chosen, so: 1) enable by default common Linux options: CONFIG_NET CONFIG_WIRELESS CONFIG_CFG80211 CONFIG_CRC_ITU_T CONFIG_CRC7 2) enable for SDIO bus: CONFIG_MMC 3) enable for SPI bus: CONFIG_SPI Fixes: http://autobuild.buildroot.net/results/d8c4f0f959dd2ec110db8a75980f13172c3c116c/ Signed-off-by: Giulio Benetti Reviewed-by: Kris Bahnsen Signed-off-by: Thomas Petazzoni --- package/wilc-driver/wilc-driver.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/wilc-driver/wilc-driver.mk b/package/wilc-driver/wilc-driver.mk index a89af30e29..a7a902b6db 100644 --- a/package/wilc-driver/wilc-driver.mk +++ b/package/wilc-driver/wilc-driver.mk @@ -13,11 +13,17 @@ WILC_DRIVER_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_WILC_DRIVER_SPI),y) WILC_DRIVER_MODULE_MAKE_OPTS += \ CONFIG_WILC_SPI=m +define WILC_DRIVER_SPI_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_SPI) +endef endif ifeq ($(BR2_PACKAGE_WILC_DRIVER_SDIO),y) WILC_DRIVER_MODULE_MAKE_OPTS += \ CONFIG_WILC_SDIO=m +define WILC_DRIVER_SDIO_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_MMC) +endef endif ifeq ($(BR2_PACKAGE_WILC_DRIVER_SDIO_OOB),y) @@ -25,5 +31,15 @@ WILC_DRIVER_MODULE_MAKE_OPTS += \ CONFIG_WILC_HW_OOB_INTR=y endif +define WILC_DRIVER_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRC_ITU_T) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRC7) + $(WILC_DRIVER_SPI_LINUX_CONFIG_FIXUPS) + $(WILC_DRIVER_SDIO_LINUX_CONFIG_FIXUPS) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:09 -0000 Subject: [Buildroot] [git commit branch/next] configs/nitrogen8*: extend filesystem size Message-ID: <20230220205153.957C2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=634b55a1c6e5009bfd592bd9c40b99fd14cbf668 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The default ext2 filesystem size of 60 MB is now too small to contain the root filesystem of the Nitrogen i.MX8 configurations. The nitrogen8mp_defconfig configuration for examples generates 55 MB of contents in the rootfs, so an image of 60 MB is slightly too small. This commit extends the filesystem size to 120 MB. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3372859635 (nitrogen8mp) https://gitlab.com/buildroot.org/buildroot/-/jobs/3372859634 (nitrogen8mn) https://gitlab.com/buildroot.org/buildroot/-/jobs/3372859633 (nitrogen8mm) https://gitlab.com/buildroot.org/buildroot/-/jobs/3372859632 (nitrogen8m) Signed-off-by: Thomas Petazzoni --- configs/nitrogen8m_defconfig | 1 + configs/nitrogen8mm_defconfig | 1 + configs/nitrogen8mn_defconfig | 1 + configs/nitrogen8mp_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/nitrogen8m_defconfig b/configs/nitrogen8m_defconfig index a6a9526dee..932ff97ab3 100644 --- a/configs/nitrogen8m_defconfig +++ b/configs/nitrogen8m_defconfig @@ -16,6 +16,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y diff --git a/configs/nitrogen8mm_defconfig b/configs/nitrogen8mm_defconfig index 0130a6a62a..53fbdc3da4 100644 --- a/configs/nitrogen8mm_defconfig +++ b/configs/nitrogen8mm_defconfig @@ -16,6 +16,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y diff --git a/configs/nitrogen8mn_defconfig b/configs/nitrogen8mn_defconfig index 50976959c5..51a0a56140 100644 --- a/configs/nitrogen8mn_defconfig +++ b/configs/nitrogen8mn_defconfig @@ -16,6 +16,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y diff --git a/configs/nitrogen8mp_defconfig b/configs/nitrogen8mp_defconfig index a14a024353..05caae466a 100644 --- a/configs/nitrogen8mp_defconfig +++ b/configs/nitrogen8mp_defconfig @@ -16,6 +16,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y From peter at korsgaard.com Mon Feb 20 20:53:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:10 -0000 Subject: [Buildroot] [git commit branch/next] Revert "package/python3: fix CVE-2022-37454" Message-ID: <20230220205156.29EFA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac96a65a29c73456b7cc8fd707b405e6ca67ac20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/270/2707e4e5545e2cf70ad5dfa36a5c25d3a44916d2/ This reverts commit 92d96e8513c75a8ab496c90841920e896085915f. With the merge of next, we are now using python 3.11.0, so this fix is no longer needed. Signed-off-by: Peter Korsgaard --- ...8517-Fix-buffer-overflows-in-_sha3-module.patch | 101 --------------------- package/python3/python3.mk | 3 - 2 files changed, 104 deletions(-) diff --git a/package/python3/0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch b/package/python3/0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch deleted file mode 100644 index 5c50dd16cb..0000000000 --- a/package/python3/0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 0e4e058602d93b88256ff90bbef501ba20be9dd3 Mon Sep 17 00:00:00 2001 -From: Theo Buehler -Date: Fri, 21 Oct 2022 21:26:01 +0200 -Subject: [PATCH] [3.10] gh-98517: Fix buffer overflows in _sha3 module - (#98519) - -This is a port of the applicable part of XKCP's fix [1] for -CVE-2022-37454 and avoids the segmentation fault and the infinite -loop in the test cases published in [2]. - -[1]: https://github.com/XKCP/XKCP/commit/fdc6fef075f4e81d6b1bc38364248975e08e340a -[2]: https://mouha.be/sha-3-buffer-overflow/ - -Regression test added by: Gregory P. Smith [Google LLC] - -[Retrieved from: -https://github.com/python/cpython/commit/0e4e058602d93b88256ff90bbef501ba20be9dd3] -Signed-off-by: Fabrice Fontaine ---- - Lib/test/test_hashlib.py | 9 +++++++++ - .../2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst | 1 + - Modules/_sha3/kcp/KeccakSponge.inc | 15 ++++++++------- - 3 files changed, 18 insertions(+), 7 deletions(-) - create mode 100644 Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst - -diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py -index 535f4aa3e04c..9aa6c1f0a3b6 100644 ---- a/Lib/test/test_hashlib.py -+++ b/Lib/test/test_hashlib.py -@@ -495,6 +495,15 @@ def test_case_md5_huge(self, size): - def test_case_md5_uintmax(self, size): - self.check('md5', b'A'*size, '28138d306ff1b8281f1a9067e1a1a2b3') - -+ @unittest.skipIf(sys.maxsize < _4G - 1, 'test cannot run on 32-bit systems') -+ @bigmemtest(size=_4G - 1, memuse=1, dry_run=False) -+ def test_sha3_update_overflow(self, size): -+ """Regression test for gh-98517 CVE-2022-37454.""" -+ h = hashlib.sha3_224() -+ h.update(b'\x01') -+ h.update(b'\x01'*0xffff_ffff) -+ self.assertEqual(h.hexdigest(), '80762e8ce6700f114fec0f621fd97c4b9c00147fa052215294cceeed') -+ - # use the three examples from Federal Information Processing Standards - # Publication 180-1, Secure Hash Standard, 1995 April 17 - # http://www.itl.nist.gov/div897/pubs/fip180-1.htm -diff --git a/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst b/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst -new file mode 100644 -index 000000000000..2d23a6ad93c7 ---- /dev/null -+++ b/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst -@@ -0,0 +1 @@ -+Port XKCP's fix for the buffer overflows in SHA-3 (CVE-2022-37454). -diff --git a/Modules/_sha3/kcp/KeccakSponge.inc b/Modules/_sha3/kcp/KeccakSponge.inc -index e10739deafa8..cf92e4db4d36 100644 ---- a/Modules/_sha3/kcp/KeccakSponge.inc -+++ b/Modules/_sha3/kcp/KeccakSponge.inc -@@ -171,7 +171,7 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat - i = 0; - curData = data; - while(i < dataByteLen) { -- if ((instance->byteIOIndex == 0) && (dataByteLen >= (i + rateInBytes))) { -+ if ((instance->byteIOIndex == 0) && (dataByteLen-i >= rateInBytes)) { - #ifdef SnP_FastLoop_Absorb - /* processing full blocks first */ - -@@ -199,10 +199,10 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat - } - else { - /* normal lane: using the message queue */ -- -- partialBlock = (unsigned int)(dataByteLen - i); -- if (partialBlock+instance->byteIOIndex > rateInBytes) -+ if (dataByteLen-i > rateInBytes-instance->byteIOIndex) - partialBlock = rateInBytes-instance->byteIOIndex; -+ else -+ partialBlock = (unsigned int)(dataByteLen - i); - #ifdef KeccakReference - displayBytes(1, "Block to be absorbed (part)", curData, partialBlock); - #endif -@@ -281,7 +281,7 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte - i = 0; - curData = data; - while(i < dataByteLen) { -- if ((instance->byteIOIndex == rateInBytes) && (dataByteLen >= (i + rateInBytes))) { -+ if ((instance->byteIOIndex == rateInBytes) && (dataByteLen-i >= rateInBytes)) { - for(j=dataByteLen-i; j>=rateInBytes; j-=rateInBytes) { - SnP_Permute(instance->state); - SnP_ExtractBytes(instance->state, curData, 0, rateInBytes); -@@ -299,9 +299,10 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte - SnP_Permute(instance->state); - instance->byteIOIndex = 0; - } -- partialBlock = (unsigned int)(dataByteLen - i); -- if (partialBlock+instance->byteIOIndex > rateInBytes) -+ if (dataByteLen-i > rateInBytes-instance->byteIOIndex) - partialBlock = rateInBytes-instance->byteIOIndex; -+ else -+ partialBlock = (unsigned int)(dataByteLen - i); - i += partialBlock; - - SnP_ExtractBytes(instance->state, curData, instance->byteIOIndex, partialBlock); diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 4d94d25ff8..123bc8ef88 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -16,9 +16,6 @@ PYTHON3_CPE_ID_PRODUCT = python # 0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch PYTHON3_IGNORE_CVES += CVE-2022-45061 -# 0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch -PYTHON3_IGNORE_CVES += CVE-2022-37454 - # This host Python is installed in $(HOST_DIR), as it is needed when # cross-compiling third-party Python modules. From arnout at mind.be Mon Feb 20 20:53:10 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:53:10 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8188eu: bump to 2022-11-29 version on v5.2.2.4 branch Message-ID: <20230220205153.B78288648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1fe4f83bf41fd403fde7d0ad23187e0d50aa0bbd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/8bcb4d0adabc141ff8144f9e22bd549e3cd8858a/ Signed-off-by: Giulio Benetti Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle --- package/rtl8188eu/rtl8188eu.hash | 2 +- package/rtl8188eu/rtl8188eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8188eu/rtl8188eu.hash b/package/rtl8188eu/rtl8188eu.hash index 0ad7786328..29ce0e32c2 100644 --- a/package/rtl8188eu/rtl8188eu.hash +++ b/package/rtl8188eu/rtl8188eu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 50529c110e0a45fbe3169d0e237c4d0959300840f5e162c24256452976fb2670 rtl8188eu-c4908ca4caf861d858c4d9e8452a2ad5c88cf2ba.tar.gz +sha256 c573529862861a7a75534a4f2bc34ba7e3b116125298b5bc0d432b3065bd7df6 rtl8188eu-f4af53305cb1e9a0d8d9957a042f7c01b7121bfc.tar.gz sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/package/rtl8188eu/rtl8188eu.mk b/package/rtl8188eu/rtl8188eu.mk index 199362d7ae..3698115d3c 100644 --- a/package/rtl8188eu/rtl8188eu.mk +++ b/package/rtl8188eu/rtl8188eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8188EU_VERSION = c4908ca4caf861d858c4d9e8452a2ad5c88cf2ba +RTL8188EU_VERSION = f4af53305cb1e9a0d8d9957a042f7c01b7121bfc RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION)) RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob) RTL8188EU_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:10 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libxshmfence: bump version to 1.3.2 Message-ID: <20230220205156.5FAC586494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79a72dd0a5c8563533f75914d276022c401b3ffa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003287.html https://lists.x.org/archives/xorg-announce/2022-October/003229.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash | 8 +++----- package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash index 3ec055a792..e8f83d427f 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-February/002840.html -md5 42dda8016943dc12aff2c03a036e0937 libxshmfence-1.3.tar.bz2 -sha1 3472218fc0e8ee8183533d22dbcd4bbe90bf3ab8 libxshmfence-1.3.tar.bz2 -sha256 b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7 libxshmfence-1.3.tar.bz2 -sha512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7 libxshmfence-1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003287.html +sha256 870df257bc40b126d91b5a8f1da6ca8a524555268c50b59c0acd1a27f361606f libxshmfence-1.3.2.tar.xz +sha512 e20a6827e370726cf50489a69f4a52b897f1c44e3eba8c72a4e626b08724e877d090770b8016765736d887d5d5eaba1fda9c29066e62d259b4d1e2064bc1626c libxshmfence-1.3.2.tar.xz # Locally computed sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk index 605408fff7..4241102855 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXSHMFENCE_VERSION = 1.3 -XLIB_LIBXSHMFENCE_SOURCE = libxshmfence-$(XLIB_LIBXSHMFENCE_VERSION).tar.bz2 +XLIB_LIBXSHMFENCE_VERSION = 1.3.2 +XLIB_LIBXSHMFENCE_SOURCE = libxshmfence-$(XLIB_LIBXSHMFENCE_VERSION).tar.xz XLIB_LIBXSHMFENCE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXSHMFENCE_LICENSE = MIT XLIB_LIBXSHMFENCE_LICENSE_FILES = COPYING From arnout at mind.be Mon Feb 20 20:53:11 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:53:11 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8821au: bump to 2022-10-30 version of v5.2.6 branch Message-ID: <20230220205153.C245F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=121184d746bc1a21385e9f20728664b257b52682 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/4526cb70ce91bcd5fce60ebb4f704a63f1ecd249/ Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/rtl8821au/rtl8821au.hash | 2 +- package/rtl8821au/rtl8821au.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8821au/rtl8821au.hash b/package/rtl8821au/rtl8821au.hash index a5d0c2d5d4..b19cb93bf6 100644 --- a/package/rtl8821au/rtl8821au.hash +++ b/package/rtl8821au/rtl8821au.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 302f37098c3ae018eebf8ca80bcd2ec8ffc46755daed811278321d0914758f41 rtl8821au-e0b443940471c166a5cc6280d3608f95228e017f.tar.gz +sha256 9dfb2b12c52fe759e4978cbd7a0fb90f0605ae9146a6d0186f2869bbfb6d13fd rtl8821au-0cab870ff635ba038705ab29363b0cbbedd5c258.tar.gz sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 LICENSE diff --git a/package/rtl8821au/rtl8821au.mk b/package/rtl8821au/rtl8821au.mk index 65c0bc913d..6bb77de81f 100644 --- a/package/rtl8821au/rtl8821au.mk +++ b/package/rtl8821au/rtl8821au.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8821AU_VERSION = e0b443940471c166a5cc6280d3608f95228e017f +RTL8821AU_VERSION = 0cab870ff635ba038705ab29363b0cbbedd5c258 RTL8821AU_SITE = $(call github,lwfinger,rtl8812au,$(RTL8821AU_VERSION)) RTL8821AU_LICENSE = GPL-2.0 RTL8821AU_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:53:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:11 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXau: bump version to 1.0.11 Message-ID: <20230220205156.8008486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7436867eb1d07a1cf0c9c809b6c13c11596a1159 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003284.html https://lists.x.org/archives/xorg-announce/2022-August/003201.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXau/xlib_libXau.hash | 8 +++----- package/x11r7/xlib_libXau/xlib_libXau.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libXau/xlib_libXau.hash b/package/x11r7/xlib_libXau/xlib_libXau.hash index 65ae54ec32..8d2a6ff43c 100644 --- a/package/x11r7/xlib_libXau/xlib_libXau.hash +++ b/package/x11r7/xlib_libXau/xlib_libXau.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002942.html -md5 c5f16288f2da9f071b29111d68797480 libXau-1.0.9.tar.bz2 -sha1 ef9b1ad00f958c8b6e30a1bbc11fdfac311c9733 libXau-1.0.9.tar.bz2 -sha256 ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec libXau-1.0.9.tar.bz2 -sha512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562 libXau-1.0.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003284.html +sha256 f3fa3282f5570c3f6bd620244438dbfbdd580fc80f02f549587a0f8ab329bbeb libXau-1.0.11.tar.xz +sha512 f56abba3bef3fdd4739dfa69367a4251b5fab7c89194c9aece9efa66b9ebbf0736690cc9bd654aab19d9db377e4b9a5268c9c020b3d293bb5351bff5fe75a4dd libXau-1.0.11.tar.xz # Locally computed sha256 56abe29bb1d9806a9e04fa9f80fed2c0f18027594df3f098148d814aef6bddfa COPYING diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk index bac10818f1..0e9f79d38d 100644 --- a/package/x11r7/xlib_libXau/xlib_libXau.mk +++ b/package/x11r7/xlib_libXau/xlib_libXau.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXAU_VERSION = 1.0.9 -XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2 +XLIB_LIBXAU_VERSION = 1.0.11 +XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.xz XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXAU_LICENSE = MIT XLIB_LIBXAU_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:12 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXxf86dga: bump version to 1.1.6 Message-ID: <20230220205156.964AE86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6e3bcfb376b59a2503f111b6339202752b794c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003281.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash | 8 +++----- package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash index 1b05624783..9057d4e8e2 100644 --- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash +++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002982.html -md5 0ddeafc13b33086357cfa96fae41ee8e libXxf86dga-1.1.5.tar.bz2 -sha1 332ba80d1b3d06473f7bbfe1612e7c5b58fbdf69 libXxf86dga-1.1.5.tar.bz2 -sha256 2b98bc5f506c6140d4eddd3990842d30f5dae733b64f198a504f07461bdb7203 libXxf86dga-1.1.5.tar.bz2 -sha512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89 libXxf86dga-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003281.html +sha256 be44427579808fe3a217d59f51cae756a26913eb6e4c8738ccab65ff56d7980f libXxf86dga-1.1.6.tar.xz +sha512 61f7954471df63840ffb5e82347018e285d30d64d4d0a97770ca031c8554a0f52d1b007ab8342a283cd2f0d534f564fb59f57ec92515714f20a7d145912c65d9 libXxf86dga-1.1.6.tar.xz # Locally computed sha256 dd27933ebc5c063128b158b085e4c442a36b0e6f704cf753116da119610191da COPYING diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk index a5173fbc7c..1094e1a1ad 100644 --- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk +++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXXF86DGA_VERSION = 1.1.5 -XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2 +XLIB_LIBXXF86DGA_VERSION = 1.1.6 +XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.xz XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXXF86DGA_LICENSE = MIT XLIB_LIBXXF86DGA_LICENSE_FILES = COPYING From arnout at mind.be Mon Feb 20 20:53:12 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 20 Feb 2023 20:53:12 -0000 Subject: [Buildroot] [git commit branch/next] board/freescale/imx6ul(l)evk: fix repetition of "to" string Message-ID: <20230220205153.DB9398648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb894b2e98e944e517cb74278df555fa4147d3b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- board/freescale/imx6ulevk/readme.txt | 2 +- board/freescale/imx6ullevk/readme.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/freescale/imx6ulevk/readme.txt b/board/freescale/imx6ulevk/readme.txt index 90355f354f..5bc03771f2 100644 --- a/board/freescale/imx6ulevk/readme.txt +++ b/board/freescale/imx6ulevk/readme.txt @@ -12,7 +12,7 @@ Build First, configure Buildroot for your i.MX6UL EVK board: -In order to to do so there are two supported options: +In order to do so there are two supported options: make freescale_imx6ulevk_defconfig diff --git a/board/freescale/imx6ullevk/readme.txt b/board/freescale/imx6ullevk/readme.txt index 77acec2615..dc7c5f3678 100644 --- a/board/freescale/imx6ullevk/readme.txt +++ b/board/freescale/imx6ullevk/readme.txt @@ -9,7 +9,7 @@ Build First, configure Buildroot for your i.MX6ULL EVK board: -In order to to do so there are two supported options: +In order to do so there are two supported options: make freescale_imx6ullevk_defconfig From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:13 -0000 Subject: [Buildroot] [git commit branch/next] toolchain/Config.in: fix check-package warning Message-ID: <20230220205153.8AB408648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d5d447c5d531479ea5fa60ca3231ec91bde5354 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next toolchain/Config.in:236: attributes order: type, default, depends on, select, help (http://nightly.buildroot.org/#_config_files) Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3381962216 Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index e7329c1a1c..4947ab3aae 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -231,13 +231,13 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_104028 # https://sourceware.org/bugzilla/show_bug.cgi?id=29621 config BR2_TOOLCHAIN_HAS_GCC_BUG_107728 bool - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_OPTIMIZE_0 default y if BR2_microblazebe || BR2_microblazeel \ || BR2_mips || BR2_mipsel \ || BR2_nios2 \ || BR2_or1k \ || BR2_sh + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_OPTIMIZE_0 config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool From yann.morin.1998 at free.fr Mon Feb 20 20:53:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:13 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXcomposite: bump version to 0.4.6 Message-ID: <20230220205156.CC56286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d39f7ecd4938158183adfc13147a9d3b61c85a8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003276.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash | 8 +++----- package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash index 5d4575b5ab..62b5ea9276 100644 --- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash +++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002971.html -md5 3fa0841ea89024719b20cd702a9b54e0 libXcomposite-0.4.5.tar.bz2 -sha1 902631efb55a798c81086e5ff90b60349839db40 libXcomposite-0.4.5.tar.bz2 -sha256 b3218a2c15bab8035d16810df5b8251ffc7132ff3aa70651a1fba0bfe9634e8f libXcomposite-0.4.5.tar.bz2 -sha512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5 libXcomposite-0.4.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003276.html +sha256 fe40bcf0ae1a09070eba24088a5eb9810efe57453779ec1e20a55080c6dc2c87 libXcomposite-0.4.6.tar.xz +sha512 f35a0da8f9f22fd788eee01209557fe3a1b1abdc9744f76330ba42b21b6e3af5464ca4451c33415856417c30da5aa5624e3707980c644327249bfeda5a62a59b libXcomposite-0.4.6.tar.xz # Locally computed sha256 efa0219ed8485ac555c1a3fb82daf34539b2e0dcf4dadc99c01f1e39c69a4a68 COPYING diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk index 80e94fe37c..c296ee6c6c 100644 --- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk +++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXCOMPOSITE_VERSION = 0.4.5 -XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.bz2 -XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXCOMPOSITE_VERSION = 0.4.6 +XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.xz +XLIB_LIBXCOMPOSITE_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXCOMPOSITE_LICENSE = MIT XLIB_LIBXCOMPOSITE_LICENSE_FILES = COPYING XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:53:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:14 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXScrnSaver: bump version to 1.2.4 Message-ID: <20230220205156.ABE8B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8929d19dfba43af98ae1c981131e33d366f45e8a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003279.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash | 8 +++----- package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash index 01f468b77a..a32997e1fe 100644 --- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash +++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-July/002906.html -md5 eeea9d5af3e6c143d0ea1721d27a5e49 libXScrnSaver-1.2.3.tar.bz2 -sha1 70c791c5755a298ecf1a0823e239a24fa4b2b42f libXScrnSaver-1.2.3.tar.bz2 -sha256 f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8 libXScrnSaver-1.2.3.tar.bz2 -sha512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a libXScrnSaver-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003279.html +sha256 75cd2859f38e207a090cac980d76bc71e9da99d48d09703584e00585abc920fe libXScrnSaver-1.2.4.tar.xz +sha512 e4395af85f8496618afb23ffdaca1a75f5e3d213478d8dc73249cbc9840d7b993ba7513dbf6015cb38b48fe3f2223496365158a148dd5e1ac7475c5ee569e28c libXScrnSaver-1.2.4.tar.xz # Locally computed sha256 5cf3e16f5dd753a4c0853e8227134ab65f5562d9ef89b1a2d7681f5c8ac9feb5 COPYING diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk index 92abb902eb..55ae7a6801 100644 --- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk +++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXSCRNSAVER_VERSION = 1.2.3 -XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.bz2 -XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXSCRNSAVER_VERSION = 1.2.4 +XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.xz +XLIB_LIBXSCRNSAVER_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXSCRNSAVER_LICENSE = MIT XLIB_LIBXSCRNSAVER_LICENSE_FILES = COPYING XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:53:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:14 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8723ds: bump to 2022-12-01 version to fix build issue Message-ID: <20230220205154.3110D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c6d4d7be81ac9ea0ed031e5f0796ef2d2a28770 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop local patch that has been upstreamed. Fixes: http://autobuild.buildroot.net/results/fa2/fa2482674d789e7674dc0d83c5f54393beed4d70/ Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...ve-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch | 39 ---------------------- package/rtl8723ds/rtl8723ds.hash | 2 +- package/rtl8723ds/rtl8723ds.mk | 2 +- 3 files changed, 2 insertions(+), 41 deletions(-) diff --git a/package/rtl8723ds/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch b/package/rtl8723ds/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch deleted file mode 100644 index 4495817358..0000000000 --- a/package/rtl8723ds/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 769a1943cb409f89f3c91208294a89b09bf47b86 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 16 Nov 2022 16:08:21 +0100 -Subject: [PATCH] Makefile: move 'EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)' at the - end of EXTRA_FLAGS assignment - -At the moment USER_EXTRA_CFLAGS can't override local Makfile EXTRA_CFLAGS -since it's assigned at the beginning of the Makefile. For example it's not -possible to undefine the hardcoded CONFIG_LITTLE_ENDIAN and this doesn't -allow to build these modules for big endian architectures. So let's move -the assignment of USER_EXTRA_CFLAGS to EXTRA_CFLAGS after the last -EXTRA_CFLAGS assignment. - -Signed-off-by: Giulio Benetti ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index aa57f85..3d91574 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,3 @@ --EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) - EXTRA_CFLAGS += -O1 - #EXTRA_CFLAGS += -O3 - #EXTRA_CFLAGS += -Wall -@@ -1738,6 +1737,8 @@ ifneq ($(USER_MODULE_NAME),) - MODULE_NAME := $(USER_MODULE_NAME) - endif - -+EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -+ - ifneq ($(KERNELRELEASE),) - - rtk_core := core/rtw_cmd.o \ --- -2.34.1 - diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index cbc77e14c1..d5abf9913c 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 691040a85d838f8d8d7da0f2ed460f1ea5f6734c40dc73770ba7e260b6cda9cc rtl8723ds-5ab2d3f3858dc4c833013c47a79faa05b10198f6.tar.gz +sha256 97f3ebc5d977ba35d10c9c06e6817e4a00458727b651b56fc00c207c05a61995 rtl8723ds-a638cc8639015b8b9390af3350fab0366b6c87e7.tar.gz diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 0d96e6b03a..7e27fa75ea 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723DS_VERSION = 5ab2d3f3858dc4c833013c47a79faa05b10198f6 +RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 From peter at korsgaard.com Mon Feb 20 20:53:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:15 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_zcu102_defconfig: bump to Xilinx 2022.2 Message-ID: <20230220205154.51DC9828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=818d0e18a81190b9ca256fa7e465ee37d65820f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch bumps the zynqmp_zcu102_defconfig to Xilinx release 2022.2. Xilinx 2022.2 includes: - U-Boot 2022.01 bug fixes - Linux bump to Linux 5.15.36 with bug fixes - TF-A 2.6 bug fixes - PMUFW bug fixes Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu102_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index e27dfdb6c9..6047d4299c 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.1)/xlnx_rebase_v5.15_LTS_2022.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" @@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.1)/xlnx_rebase_v2.6_2022.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.1)/xlnx_rebase_v2022.01_2022.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -29,7 +29,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/v2022.1_22.04_1/xlnx-firmware/zcu102/zcu102_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.2/zcu102/zcu102_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From yann.morin.1998 at free.fr Mon Feb 20 20:53:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:15 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xvinfo: bump version to 1.1.5 Message-ID: <20230220205156.E338A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f08e0d7def20cc04ad39b952bcfffd91ceda13d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003273.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xvinfo/xapp_xvinfo.hash | 8 +++----- package/x11r7/xapp_xvinfo/xapp_xvinfo.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash b/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash index 3d8ace9ae5..7dd5820c08 100644 --- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash +++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002955.html -md5 b13afec137b9b331814a9824ab03ec80 xvinfo-1.1.4.tar.bz2 -sha1 136a70a72b23c81f4fe8f4c8cb7073316be16b44 xvinfo-1.1.4.tar.bz2 -sha256 0353220d6606077ba42363db65f50410759f9815352f77adc799e2adfa76e73f xvinfo-1.1.4.tar.bz2 -sha512 85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e xvinfo-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003273.html +sha256 3ede71ecb26d9614ccbc6916720285e95a2c7e0c5e19b8570eaaf72ad7c5c404 xvinfo-1.1.5.tar.xz +sha512 18467161b248c68f6bde15e1c1b4b8cf812daf46777602558aee5fb7cb4d2649218de88fa93842fea4f316d954440f03a37d71fa4fda92eda3c7d80970e19cbb xvinfo-1.1.5.tar.xz # Locally computed sha256 7725b0484faa1832534814ecb577f5a86acc74f1bcce25f92c55dfc1b693717d COPYING diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk index 7b3b97f073..6fa392f018 100644 --- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk +++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XVINFO_VERSION = 1.1.4 -XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.bz2 -XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XVINFO_VERSION = 1.1.5 +XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.xz +XAPP_XVINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XVINFO_LICENSE = MIT XAPP_XVINFO_LICENSE_FILES = COPYING XAPP_XVINFO_DEPENDENCIES = xlib_libX11 xlib_libXv From peter at korsgaard.com Mon Feb 20 20:53:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:16 -0000 Subject: [Buildroot] [git commit branch/next] package/dovecot: add upstream security fix for CVE-2022-30550 Message-ID: <20230220205153.E6255828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43899226b25aeb85aeb699f0df0c7ecf8d48616c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next An issue was discovered in the auth component in Dovecot 2.2 and 2.3 before 2.3.20. When two passdb configuration entries exist with the same driver and args settings, incorrect username_filter and mechanism settings can be applied to passdb definitions. These incorrectly applied settings can lead to an unintended security configuration and can permit privilege escalation in certain configurations. The documentation does not advise against the use of passdb definitions that have the same driver and args settings. One such configuration would be where an administrator wishes to use the same PAM configuration or passwd file for both normal and master users but use the username_filter setting to restrict which of the users is able to be a master user. https://dovecot.org/pipermail/dovecot-news/2022-July/000477.html Signed-off-by: Peter Korsgaard --- ...ndling-passdbs-with-identical-driver-args.patch | 136 +++++++++++++++++++++ package/dovecot/dovecot.mk | 3 + 2 files changed, 139 insertions(+) diff --git a/package/dovecot/0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch b/package/dovecot/0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch new file mode 100644 index 0000000000..04b8f5392a --- /dev/null +++ b/package/dovecot/0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch @@ -0,0 +1,136 @@ +From 7bad6a24160e34bce8f10e73dbbf9e5fbbcd1904 Mon Sep 17 00:00:00 2001 +From: Timo Sirainen +Date: Mon, 9 May 2022 15:23:33 +0300 +Subject: [PATCH] auth: Fix handling passdbs with identical driver/args but + different mechanisms/username_filter + +The passdb was wrongly deduplicated in this situation, causing wrong +mechanisms or username_filter setting to be used. This would be a rather +unlikely configuration though. + +Fixed by moving mechanisms and username_filter from struct passdb_module +to struct auth_passdb, which is where they should have been in the first +place. + +Signed-off-by: Peter Korsgaard +--- + src/auth/auth-request.c | 6 +++--- + src/auth/auth.c | 18 ++++++++++++++++++ + src/auth/auth.h | 5 +++++ + src/auth/passdb.c | 15 ++------------- + src/auth/passdb.h | 4 ---- + 5 files changed, 28 insertions(+), 20 deletions(-) + +diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c +index cd08b1fa02..0ca29f3674 100644 +--- a/src/auth/auth-request.c ++++ b/src/auth/auth-request.c +@@ -534,8 +534,8 @@ auth_request_want_skip_passdb(struct auth_request *request, + struct auth_passdb *passdb) + { + /* if mechanism is not supported, skip */ +- const char *const *mechs = passdb->passdb->mechanisms; +- const char *const *username_filter = passdb->passdb->username_filter; ++ const char *const *mechs = passdb->mechanisms; ++ const char *const *username_filter = passdb->username_filter; + const char *username; + + username = request->fields.user; +@@ -548,7 +548,7 @@ auth_request_want_skip_passdb(struct auth_request *request, + return TRUE; + } + +- if (passdb->passdb->username_filter != NULL && ++ if (passdb->username_filter != NULL && + !auth_request_username_accepted(username_filter, username)) { + auth_request_log_debug(request, + request->mech != NULL ? AUTH_SUBSYS_MECH +diff --git a/src/auth/auth.c b/src/auth/auth.c +index f2f3fda20c..9f6c4ba60c 100644 +--- a/src/auth/auth.c ++++ b/src/auth/auth.c +@@ -99,6 +99,24 @@ auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *set, + auth_passdb->override_fields_tmpl = + passdb_template_build(auth->pool, set->override_fields); + ++ if (*set->mechanisms == '\0') { ++ auth_passdb->mechanisms = NULL; ++ } else if (strcasecmp(set->mechanisms, "none") == 0) { ++ auth_passdb->mechanisms = (const char *const[]){ NULL }; ++ } else { ++ auth_passdb->mechanisms = ++ (const char *const *)p_strsplit_spaces(auth->pool, ++ set->mechanisms, " ,"); ++ } ++ ++ if (*set->username_filter == '\0') { ++ auth_passdb->username_filter = NULL; ++ } else { ++ auth_passdb->username_filter = ++ (const char *const *)p_strsplit_spaces(auth->pool, ++ set->username_filter, " ,"); ++ } ++ + /* for backwards compatibility: */ + if (set->pass) + auth_passdb->result_success = AUTH_DB_RULE_CONTINUE; +diff --git a/src/auth/auth.h b/src/auth/auth.h +index f700e29d5c..460a179765 100644 +--- a/src/auth/auth.h ++++ b/src/auth/auth.h +@@ -41,6 +41,11 @@ struct auth_passdb { + struct passdb_template *default_fields_tmpl; + struct passdb_template *override_fields_tmpl; + ++ /* Supported authentication mechanisms, NULL is all, {NULL} is none */ ++ const char *const *mechanisms; ++ /* Username filter, NULL is no filter */ ++ const char *const *username_filter; ++ + enum auth_passdb_skip skip; + enum auth_db_rule result_success; + enum auth_db_rule result_failure; +diff --git a/src/auth/passdb.c b/src/auth/passdb.c +index eb4ac8ae82..f5eed1af4f 100644 +--- a/src/auth/passdb.c ++++ b/src/auth/passdb.c +@@ -224,19 +224,8 @@ passdb_preinit(pool_t pool, const struct auth_passdb_settings *set) + passdb->id = ++auth_passdb_id; + passdb->iface = *iface; + passdb->args = p_strdup(pool, set->args); +- if (*set->mechanisms == '\0') { +- passdb->mechanisms = NULL; +- } else if (strcasecmp(set->mechanisms, "none") == 0) { +- passdb->mechanisms = (const char *const[]){NULL}; +- } else { +- passdb->mechanisms = (const char* const*)p_strsplit_spaces(pool, set->mechanisms, " ,"); +- } +- +- if (*set->username_filter == '\0') { +- passdb->username_filter = NULL; +- } else { +- passdb->username_filter = (const char* const*)p_strsplit_spaces(pool, set->username_filter, " ,"); +- } ++ /* NOTE: if anything else than driver & args are added here, ++ passdb_find() also needs to be updated. */ + array_push_back(&passdb_modules, &passdb); + return passdb; + } +diff --git a/src/auth/passdb.h b/src/auth/passdb.h +index 2e95328e5c..e466a9fdb6 100644 +--- a/src/auth/passdb.h ++++ b/src/auth/passdb.h +@@ -63,10 +63,6 @@ struct passdb_module { + /* Default password scheme for this module. + If default_cache_key is set, must not be NULL. */ + const char *default_pass_scheme; +- /* Supported authentication mechanisms, NULL is all, [NULL] is none*/ +- const char *const *mechanisms; +- /* Username filter, NULL is no filter */ +- const char *const *username_filter; + + /* If blocking is set to TRUE, use child processes to access + this passdb. */ +-- +2.30.2 + diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 7619250985..e28f500b7b 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -21,6 +21,9 @@ DOVECOT_DEPENDENCIES = \ # is part of the Red Hat packaging and not part of upstream dovecot DOVECOT_IGNORE_CVES += CVE-2016-4983 +# 0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch +DOVECOT_IGNORE_CVES += CVE-2022-30550 + DOVECOT_CONF_ENV = \ RPCGEN=__disable_RPCGEN_rquota \ i_cv_epoll_works=yes \ From yann.morin.1998 at free.fr Mon Feb 20 20:53:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:16 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xset: bump version to 1.2.5 Message-ID: <20230220205157.0700186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea7d4fe0df7154b60f563295de0ce362991ff1d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003271.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xset/xapp_xset.hash | 8 +++----- package/x11r7/xapp_xset/xapp_xset.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xset/xapp_xset.hash b/package/x11r7/xapp_xset/xapp_xset.hash index a4f19d0273..dea34a1a13 100644 --- a/package/x11r7/xapp_xset/xapp_xset.hash +++ b/package/x11r7/xapp_xset/xapp_xset.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002873.html -md5 70ea7bc7bacf1a124b1692605883f620 xset-1.2.4.tar.bz2 -sha1 41a857f30ff5bb0dfbda1549bb703984344ea228 xset-1.2.4.tar.bz2 -sha256 e4fd95280df52a88e9b0abc1fee11dcf0f34fc24041b9f45a247e52df941c957 xset-1.2.4.tar.bz2 -sha512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d xset-1.2.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003271.html +sha256 9f692d55635b3862cd63633b1222a87680ec283c7a8e8ed6dd698a3147f75e2f xset-1.2.5.tar.xz +sha512 12b53d7cd6b7ccf6515c03f68151490fce6b2629e99b8d85ac5d760f4ed93394a457213c3947533809fbbb04acd1ed260aeea1256099a10397660eef3088150d xset-1.2.5.tar.xz # Locally computed sha256 6bfc619b6d37dd0e6ca575edcb3a05194136e04d1d9989b8e14e6f7850587382 COPYING diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk index 9ead55a20f..498e6a123c 100644 --- a/package/x11r7/xapp_xset/xapp_xset.mk +++ b/package/x11r7/xapp_xset/xapp_xset.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XSET_VERSION = 1.2.4 -XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2 -XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XSET_VERSION = 1.2.5 +XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.xz +XAPP_XSET_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XSET_LICENSE = MIT XAPP_XSET_LICENSE_FILES = COPYING XAPP_XSET_DEPENDENCIES = xlib_libXmu From yann.morin.1998 at free.fr Mon Feb 20 20:53:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:17 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xprop: bump version to 1.2.6 Message-ID: <20230220205157.1FAEA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3500526b189e4a75f3b969ac54685fc8a4b2e15c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003269.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xprop/xapp_xprop.hash | 6 +++--- package/x11r7/xapp_xprop/xapp_xprop.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_xprop/xapp_xprop.hash b/package/x11r7/xapp_xprop/xapp_xprop.hash index 95e7c4eeed..9db2fb9125 100644 --- a/package/x11r7/xapp_xprop/xapp_xprop.hash +++ b/package/x11r7/xapp_xprop/xapp_xprop.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-November/003064.html -sha256 9b92ed0316bf2486121d8bac88bd1878f16b43bd335f18009b1f941f1eca93a1 xprop-1.2.5.tar.bz2 -sha512 93cfa621fa76ca6e8e780a252c508380b6dc9db39b67bfca16bb9800f0d39110f5d18189409a8577ef79e98bf5eece17f5e23f2218ca72ae8bb04ee7b429d559 xprop-1.2.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003269.html +sha256 580b8525b12ecc0144aa16c88b0aafa76d2e799b44c8c6c50f9ce92788b5586e xprop-1.2.6.tar.xz +sha512 ab25d4b8bf9de8fb37149060ad4870ffed4d6846ac3b31903a42c36301fcb0d50d3ba15949fdd9079507db97d3f05d4bbd11711d825e5470482cc30772cc3f25 xprop-1.2.6.tar.xz # Locally computed sha256 f19ff982936cca133b9593a6561c3817512207e0b4c951d0e4eb5956d30d4415 COPYING diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk index 75f0d37cdc..888e9d3a69 100644 --- a/package/x11r7/xapp_xprop/xapp_xprop.mk +++ b/package/x11r7/xapp_xprop/xapp_xprop.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XPROP_VERSION = 1.2.5 -XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2 -XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XPROP_VERSION = 1.2.6 +XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.xz +XAPP_XPROP_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XPROP_LICENSE = MIT XAPP_XPROP_LICENSE_FILES = COPYING XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu From peter at korsgaard.com Mon Feb 20 20:53:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:18 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_zcu106_defconfig: bump to Xilinx 2022.2 Message-ID: <20230220205154.5BCCD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c997c457a4ee33d81e6b93e4f6f147bb9e861e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch bumps the zynqmp_zcu106_defconfig to Xilinx release 2022.2. Xilinx 2022.2 includes: - U-Boot 2022.01 bug fixes - Linux bump to Linux 5.15.36 with bug fixes - TF-A 2.6 bug fixes - PMUFW bug fixes Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu106_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 4113a9025a..dcbc4319e8 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.1)/xlnx_rebase_v5.15_LTS_2022.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.1)/xlnx_rebase_v2.6_2022.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.1)/xlnx_rebase_v2022.01_2022.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -29,7 +29,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/v2022.1_22.04_1/xlnx-firmware/zcu106/zcu106_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.2/zcu106/zcu106_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From yann.morin.1998 at free.fr Mon Feb 20 20:53:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:18 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xgamma: bump version to 1.0.7 Message-ID: <20230220205157.37B0186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1564c1e6e9e9e72daae419c1a839b986485eff5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003267.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xgamma/xapp_xgamma.hash | 5 +++-- package/x11r7/xapp_xgamma/xapp_xgamma.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.hash b/package/x11r7/xapp_xgamma/xapp_xgamma.hash index 0031450c4d..17efe0a975 100644 --- a/package/x11r7/xapp_xgamma/xapp_xgamma.hash +++ b/package/x11r7/xapp_xgamma/xapp_xgamma.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002574.html -sha256 0ef1c35b5c18b1b22317f455c8df13c0a471a8efad63c89c98ae3ce8c2b222d3 xgamma-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003267.html +sha256 1c79dae85a8953a15f4fe5c2895a033307b43b8613456c87ec47b374b113bc8f xgamma-1.0.7.tar.xz +sha512 9eeee9b537dcae9e4d153774eb632a6a5e8dd32bebadc9bbd897a773e5b56f76848f32a1699b8c921d3094760c42b5083365d853b89ab31fd85c7a0d46feeceb xgamma-1.0.7.tar.xz # Locally computed sha256 78d354d348feaaab8d67a220e84137ec24fece04af4dface2e67132c72e216a2 COPYING diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk index a73a29e5a2..f2e9e91efb 100644 --- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk +++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XGAMMA_VERSION = 1.0.6 -XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.bz2 -XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XGAMMA_VERSION = 1.0.7 +XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.xz +XAPP_XGAMMA_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XGAMMA_LICENSE = MIT XAPP_XGAMMA_LICENSE_FILES = COPYING XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm From peter at korsgaard.com Mon Feb 20 20:53:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:19 -0000 Subject: [Buildroot] [git commit branch/next] package/netsnmp: drop autoreconf Message-ID: <20230220205154.271A4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ad6bc2f587a31c7e1475103a59c93f6a398e8ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 83b4337354014 (package/netsnmp: security bump to version 5.9.3) dropped the patches, but forgot to remove the autoreconf. Do so now. Signed-off-by: Peter Korsgaard --- package/netsnmp/netsnmp.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 56a07e2ccd..15bc318e36 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -40,7 +40,6 @@ NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true inst NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install NETSNMP_MAKE = $(MAKE1) NETSNMP_CONFIG_SCRIPTS = net-snmp-config -NETSNMP_AUTORECONF = YES ifeq ($(BR2_ENDIAN),"BIG") NETSNMP_CONF_OPTS += --with-endianness=big From yann.morin.1998 at free.fr Mon Feb 20 20:53:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:19 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xcursorgen: bump version to 1.0.8 Message-ID: <20230220205157.5826B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9e1546672ce900d82a39f991237246a201874d47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003264.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash | 8 +++----- package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash index 2f64671434..45bff55ed2 100644 --- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash +++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-January/002936.html -md5 25cc7ca1ce5dcbb61c2b471c55e686b5 xcursorgen-1.0.7.tar.bz2 -sha1 109367eb23b0ad52cf5de15f50c02ebe872698ae xcursorgen-1.0.7.tar.bz2 -sha256 35b6f844b24f1776e9006c880a745728800764dbe3b327a128772b4610d8eb3d xcursorgen-1.0.7.tar.bz2 -sha512 bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2 xcursorgen-1.0.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003264.html +sha256 32b33ce27b4e285e64ff375731806bb7988cc626ff10915c65f1dc4da640cc9b xcursorgen-1.0.8.tar.xz +sha512 dede5b9e1e09f9253365bbb83fdab26c681641913f3586cef52d4802db9cecc7e252344911cd969a873c3a5c5ebbd4b862f786de263f92ea1bcb2df90236f9c4 xcursorgen-1.0.8.tar.xz # Locally computed sha256 8c773336b654442ac8018715a52be1a8254895c57c898d5387016e9488cc2009 COPYING diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk index bcc696b01c..318cd562db 100644 --- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk +++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XCURSORGEN_VERSION = 1.0.7 -XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2 -XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XCURSORGEN_VERSION = 1.0.8 +XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.xz +XAPP_XCURSORGEN_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XCURSORGEN_LICENSE = MIT XAPP_XCURSORGEN_LICENSE_FILES = COPYING XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor From yann.morin.1998 at free.fr Mon Feb 20 20:53:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:20 -0000 Subject: [Buildroot] [git commit branch/next] docs/manual: fixed some spelling mistakes Message-ID: <20230220205154.73000828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a34dcba9ebcda5a1dcb95b332486454776cd305b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixed some spelling mistakes of countable nouns. Signed-off-by: Zikui Zhao Reviewed-by: Woodrow Douglass Signed-off-by: Yann E. MORIN --- docs/manual/customize-directory-structure.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/customize-directory-structure.txt b/docs/manual/customize-directory-structure.txt index a3a7ad4cb9..1249421da2 100644 --- a/docs/manual/customize-directory-structure.txt +++ b/docs/manual/customize-directory-structure.txt @@ -27,10 +27,10 @@ to you. | +-- post_image.sh | +-- rootfs_overlay/ | | +-- etc/ -| | +-- +| | +-- | +-- patches/ | +-- foo/ -| | +-- +| | +-- | +-- libbar/ | +-- | From yann.morin.1998 at free.fr Mon Feb 20 20:53:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:20 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXrandr: bump version to 1.5.3 Message-ID: <20230220205157.62C3786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=327d7453ba3d4991c4ddc64a0164ca7f80ea0ef1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003262.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXrandr/xlib_libXrandr.hash | 8 +++----- package/x11r7/xlib_libXrandr/xlib_libXrandr.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash b/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash index 4b12328df0..3d3bb640ed 100644 --- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash +++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002979.html -md5 18f3b20d522f45e4dadd34afb5bea048 libXrandr-1.5.2.tar.bz2 -sha1 7a1f6df239341b76fd59ebbe101d6f180adb43bb libXrandr-1.5.2.tar.bz2 -sha256 8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023 libXrandr-1.5.2.tar.bz2 -sha512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87 libXrandr-1.5.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003262.html +sha256 897639014a78e1497704d669c5dd5682d721931a4452c89a7ba62676064eb428 libXrandr-1.5.3.tar.xz +sha512 0c385fc304a872048ffca5cfb8789dfe3132e3126894d54b2fe642dff19d286e7ade1d2f6da894e03788df9c5cf31427c674e987143037b7d385b19285590edb libXrandr-1.5.3.tar.xz # Locally computed sha256 73777e5be1cef2827d843e4b186803f050c66db472cf8076d88e2b5f71696e67 COPYING diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk index aa2761330a..5e88173ed7 100644 --- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk +++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXRANDR_VERSION = 1.5.2 -XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2 -XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXRANDR_VERSION = 1.5.3 +XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.xz +XLIB_LIBXRANDR_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXRANDR_LICENSE = MIT XLIB_LIBXRANDR_LICENSE_FILES = COPYING XLIB_LIBXRANDR_CPE_ID_VENDOR = x.org From yann.morin.1998 at free.fr Mon Feb 20 20:53:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:21 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xlsclients: bump version to 1.1.5 Message-ID: <20230220205157.8790086494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e20641dcf85dada48621f46e1f30966c90696317 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003259.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xlsclients/xapp_xlsclients.hash | 8 +++----- package/x11r7/xapp_xlsclients/xapp_xlsclients.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash b/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash index b73917cb4a..ac172acceb 100644 --- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash +++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002866.html -md5 4fa92377e0ddc137cd226a7a87b6b29a xlsclients-1.1.4.tar.bz2 -sha1 175af1c216a1db3de5023ecd6cce186e7693c6e4 xlsclients-1.1.4.tar.bz2 -sha256 773f2af49c7ea2c44fba4213bee64325875c1b3c9bc4bbcd8dac9261751809c1 xlsclients-1.1.4.tar.bz2 -sha512 42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4 xlsclients-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003259.html +sha256 68baee57e70250ac4a7759fb78221831f97d88bc8e51dcc2e64eb3f8ca56bae3 xlsclients-1.1.5.tar.xz +sha512 3896643378603876438772475e89ad5c066f98c16593245db5fa066418ff793798247f976d2bf7aa401d2590fc9807b80c9758bcbcc91566f02ceb856d9702bf xlsclients-1.1.5.tar.xz # Locally computed sha256 716d6f1d18cb97cdd4a2ef7b101d944a250ca9de57578a490c038b9aaf950648 COPYING diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk index 167748b338..a179e06713 100644 --- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk +++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XLSCLIENTS_VERSION = 1.1.4 -XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2 -XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XLSCLIENTS_VERSION = 1.1.5 +XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.xz +XAPP_XLSCLIENTS_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XLSCLIENTS_LICENSE = MIT XAPP_XLSCLIENTS_LICENSE_FILES = COPYING XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu libxcb xcb-util From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:21 -0000 Subject: [Buildroot] [git commit branch/next] package/libarchive: fix CVE-2022-36227 Message-ID: <20230220205154.801C08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d74137341d009e9a0dd79bca80015548f5af92ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In libarchive 3.6.1, the software does not check for an error after calling calloc function that can return with a NULL pointer if the function fails, which leads to a resultant NULL pointer dereference. NOTE: the discoverer cites this CWE-476 remark but third parties dispute the code-execution impact: "In rare circumstances, when NULL is equivalent to the 0x0 memory address and privileged code can access it, then writing or reading memory is possible, which may lead to code execution." Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...libarchive-Handle-a-calloc-returning-NULL.patch | 38 ++++++++++++++++++++++ package/libarchive/libarchive.mk | 3 ++ 2 files changed, 41 insertions(+) diff --git a/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch b/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch new file mode 100644 index 0000000000..75ce6112fe --- /dev/null +++ b/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch @@ -0,0 +1,38 @@ +From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001 +From: obiwac +Date: Fri, 22 Jul 2022 22:41:10 +0200 +Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754) + +[Retrieved from: +https://github.com/libarchive/libarchive/commit/bff38efe8c110469c5080d387bec62a6ca15b1a5] +Signed-off-by: Fabrice Fontaine +--- + libarchive/archive_write.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c +index 66592e826..27626b541 100644 +--- a/libarchive/archive_write.c ++++ b/libarchive/archive_write.c +@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a) + struct archive_write_filter *f; + + f = calloc(1, sizeof(*f)); ++ ++ if (f == NULL) ++ return (NULL); ++ + f->archive = _a; + f->state = ARCHIVE_WRITE_FILTER_STATE_NEW; + if (a->filter_first == NULL) +@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data, + a->client_data = client_data; + + client_filter = __archive_write_allocate_filter(_a); ++ ++ if (client_filter == NULL) ++ return (ARCHIVE_FATAL); ++ + client_filter->open = archive_write_client_open; + client_filter->write = archive_write_client_write; + client_filter->close = archive_write_client_close; diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 865f605e2f..649b7dd4dc 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -12,6 +12,9 @@ LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING LIBARCHIVE_CPE_ID_VENDOR = libarchive +# 0001-libarchive-Handle-a-calloc-returning-NULL.patch +LIBARCHIVE_IGNORE_CVES += CVE-2022-36227 + ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) LIBARCHIVE_CONF_OPTS += --enable-bsdtar=static From yann.morin.1998 at free.fr Mon Feb 20 20:53:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:22 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xlogo: bump version to 1.0.6 Message-ID: <20230220205157.A091386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df57bbf7279757a11327361e7cd9a1091b2da40f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003257.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xlogo/xapp_xlogo.hash | 8 +++----- package/x11r7/xapp_xlogo/xapp_xlogo.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.hash b/package/x11r7/xapp_xlogo/xapp_xlogo.hash index c393e7dc33..58f2ac4028 100644 --- a/package/x11r7/xapp_xlogo/xapp_xlogo.hash +++ b/package/x11r7/xapp_xlogo/xapp_xlogo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002963.html -md5 e9d21de1dc8c8b9f854509a26a985cd7 xlogo-1.0.5.tar.bz2 -sha1 f025a0ad30c45cbec1c2f3b1610bff94fb4e9f33 xlogo-1.0.5.tar.bz2 -sha256 633d7a3aa5df61e4e643b740e5799664741ab1a0ba40593e54fcd15dc30f378e xlogo-1.0.5.tar.bz2 -sha512 0d78e269b0be3c5de71de7f362b896bfd9934ecd9d0361b3302399b1269e029c4a9f35418d792121a1edc34405d753f9d69c996cc3a69ac717f2b0d1f736406b xlogo-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003257.html +sha256 c16ae461a7f7ea275f55c82acf3ee86ce0eb5e406f3a91ab2bb4d332693f32a0 xlogo-1.0.6.tar.xz +sha512 f0c921e0e34d2c0959d95ca0fcb7488395043280b8b35bcad4e8a528224f2b38581fbf60e82239d06760ecd637692cb29c3b1c0c46ac7f269f692a139d954ea0 xlogo-1.0.6.tar.xz # Locally computed sha256 972b454b6c0da17cec61225ab9dfd4afc69fd8e7e4c629497197c6f79adc6fb0 COPYING diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk index 455469e160..27d693bec9 100644 --- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk +++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XLOGO_VERSION = 1.0.5 -XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2 -XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XLOGO_VERSION = 1.0.6 +XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.xz +XAPP_XLOGO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XLOGO_LICENSE = MIT XAPP_XLOGO_LICENSE_FILES = COPYING XAPP_XLOGO_DEPENDENCIES = \ From peter at korsgaard.com Mon Feb 20 20:53:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:22 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8723bu: fix build failure due to missing Linux options Message-ID: <20230220205154.DD8DB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1978e9b0219712b2b839d9f44a0b98b2e8280f75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This driver requires: CONFIG_NET CONFIG_WIRELESS CONFIG_CFG80211 CONFIG_USB_SUPPORT CONFIG_USB to build so let's add them to RTL8723BU_LINUX_CONFIG_FIXUPS. Fixes: http://autobuild.buildroot.net/results/7f3637760ad88d314e6812865f3667d1de091957/ Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/rtl8723bu/rtl8723bu.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index 3da8d9cecf..82c487b4e1 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -12,6 +12,14 @@ RTL8723BU_MODULE_MAKE_OPTS = \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) +define RTL8723BU_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB) +endef + define RTL8723BU_INSTALL_TARGET_CMDS $(INSTALL) -D -m 644 $(@D)/rtl8723b_fw.bin $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723b_fw.bin endef From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:23 -0000 Subject: [Buildroot] [git commit branch/next] package/linuxptp: add patch to fix build failures with make 4.4 Message-ID: <20230220205154.C02248648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e87d92966630a6c05857c3e29d1781fce3c16bad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When using make 4.4 the KBOUD_OUTPUT environment variable provided to the linuxptp makefile is not utilized. The added patch will fix that behavior. Fixes: http://autobuild.buildroot.net/results/5294fac7ed04945d47ea4eb2d1448bcbea5352bb/ Cc: James Hilliard Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- ...-conditional-assignment-for-KBUILD_OUTPUT.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch b/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch new file mode 100644 index 0000000000..73cd34f744 --- /dev/null +++ b/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch @@ -0,0 +1,43 @@ +From: Changqing Li +Date: Wed, 23 Nov 2022 08:23:46 +0800 +Subject: [Linuxptp-devel] [PATCH] makefile: use conditional assignment for KBUILD_OUTPUT + +Refer [1],from make 4.4, all variables that are marked as export will +also be passed to the shell started by the shell function. use "=" will +make KBUILD_OUTPUT always empty for shell function, use "?=" to make +"export KBUILD_OUTPUT" in enrironment can work. + +[snip of 4.4 NEWS] +* WARNING: Backward-incompatibility! + Previously makefile variables marked as export were not exported to commands + started by the $(shell ...) function. Now, all exported variables are + exported to $(shell ...). +[snip] + +[1] https://git.savannah.gnu.org/cgit/make.git/tree/NEWS?h=4.4&id=ed493f6c9116cc217b99c2cfa6a95f15803235a2#n74 + +Signed-off-by: Changqing Li + +[Retrieved from mailing list. The patch was not yet accepted and applied: +https://www.mail-archive.com/linuxptp-devel at lists.sourceforge.net/msg06151.html] +Signed-off-by: Heiko Thiery + +--- + makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makefile b/makefile +index 9aed383..ba3fb38 100644 +--- a/makefile ++++ b/makefile +@@ -15,7 +15,7 @@ + # with this program; if not, write to the Free Software Foundation, Inc., + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-KBUILD_OUTPUT = ++KBUILD_OUTPUT ?= + + DEBUG = + CC = $(CROSS_COMPILE)gcc +-- +2.25.1 From yann.morin.1998 at free.fr Mon Feb 20 20:53:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:23 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xcompmgr: bump version to 1.1.9 Message-ID: <20230220205157.C2001828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59d64c57c755338306e9eddc9ff98a948ef79694 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003254.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash | 8 +++----- package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash b/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash index 6f0d755261..b9675a5ecf 100644 --- a/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash +++ b/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002989.html -md5 ef8c7d4140c11efb8de4141b3968208c xcompmgr-1.1.8.tar.bz2 -sha1 7bb28329b4bb687763df2d2c1723cb6ecb20945a xcompmgr-1.1.8.tar.bz2 -sha256 0b89daf4f060fa3fa83cca862c45d531fef7121b5d06552c1d73d396ad9a7243 xcompmgr-1.1.8.tar.bz2 -sha512 ccf29426ffb0797a53653d1ce152de5eee0cec284811fed4b8e634ea0d948180531e4619d96f47e4f9594432c57322624fe0fdaee2c9200efac427fc0904953d xcompmgr-1.1.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003254.html +sha256 4875b6698672d01eb3a5080bde6eac9a989d486a82226a2d5e23624f1527a6f0 xcompmgr-1.1.9.tar.xz +sha512 699117492af7fd84b36d317dcbf422d5ec86a7f21e29370caa737cd940d8ff866a5c8704ba2e7bd17a64e085d77fd23b628263d619813dead85cd669ff5b860e xcompmgr-1.1.9.tar.xz # Locally computed sha256 c843545f72771b3ff95eb88defc2e3ed8f9a1802d9bb6c32c196bb5eec3d3a5d COPYING diff --git a/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk b/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk index 24ebad7bda..c754ea37b3 100644 --- a/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk +++ b/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XCOMPMGR_VERSION = 1.1.8 -XAPP_XCOMPMGR_SOURCE = xcompmgr-$(XAPP_XCOMPMGR_VERSION).tar.bz2 -XAPP_XCOMPMGR_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XCOMPMGR_VERSION = 1.1.9 +XAPP_XCOMPMGR_SOURCE = xcompmgr-$(XAPP_XCOMPMGR_VERSION).tar.xz +XAPP_XCOMPMGR_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XCOMPMGR_LICENSE = MIT XAPP_XCOMPMGR_LICENSE_FILES = COPYING XAPP_XCOMPMGR_DEPENDENCIES = \ From yann.morin.1998 at free.fr Mon Feb 20 20:53:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:24 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_rgb: bump version to 1.1.0 Message-ID: <20230220205157.E37F4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8bf8f441d10848bddd47b9b0c84575177db2b4af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003245.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_rgb/xapp_rgb.hash | 5 +++-- package/x11r7/xapp_rgb/xapp_rgb.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_rgb/xapp_rgb.hash b/package/x11r7/xapp_rgb/xapp_rgb.hash index ce05454ce9..11b2a83905 100644 --- a/package/x11r7/xapp_rgb/xapp_rgb.hash +++ b/package/x11r7/xapp_rgb/xapp_rgb.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-November/002494.html -sha256 bbca7c6aa59939b9f6a0fb9fff15dfd62176420ffd4ae30c8d92a6a125fbe6b0 rgb-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003245.html +sha256 fc03d7f56e5b2a617668167f8927948cce54f93097e7ccd9f056077f479ed37b rgb-1.1.0.tar.xz +sha512 640888d64b2d328fff4a1652ba1299436e348bc3cbc90710d79c635acfa7f2fce0018adb818123b41ca008197ff1cbf87aab60501de36c163bed2d80d8556008 rgb-1.1.0.tar.xz # Locally computed sha256 1d08eb3384f5dedc7735bcfae1aa58cb64643ca9389edce3312b1c3cefbfdaa7 COPYING diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk index b2d5d77744..4b6399fc76 100644 --- a/package/x11r7/xapp_rgb/xapp_rgb.mk +++ b/package/x11r7/xapp_rgb/xapp_rgb.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_RGB_VERSION = 1.0.6 -XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.bz2 -XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_RGB_VERSION = 1.1.0 +XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.xz +XAPP_RGB_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_RGB_LICENSE = MIT XAPP_RGB_LICENSE_FILES = COPYING XAPP_RGB_DEPENDENCIES = xorgproto host-pkgconf From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:25 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8821au: move upstream and fix missing linux options Message-ID: <20230220205153.6BD9D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f324758f670af788df4cfaf235fd2fc5b4f15450 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This package builds to fail with Linux > 5.15 and abperiasamy's rtl8812AU_8821AU_linux repository is not maintained since 2 years and there is now a fork where all pending patches have been upstreamed, so let's switch to lwfinger's rtl8812au repository that is well maintained with Linux up to version 5.18 supported. While switching let's drop all local patches. Also add me as maintainer for this package in DEVELOPERS file. Fixes: http://autobuild.buildroot.net/results/a3db3a6540b67a1f1fe31d61fe1d6824d43f59f0/ Signed-off-by: Giulio Benetti Reviewed-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + ...licit-fallthrough-comments-for-kernel-5.3.patch | 29 -- ...5.3-driver-crashes-from-aircrack-ng-rtl88.patch | 169 ---------- ...printf-for-extending-string-which-causes-.patch | 339 --------------------- ...56_state-to-rtl_sha256_state-to-avoid-nam.patch | 79 ----- ...e-rtw_mgmt_frame_register-on-kernel-5.8.0.patch | 47 --- ...nvert-file_operations-to-proc_ops-for-5.6.patch | 110 ------- package/rtl8821au/rtl8821au.hash | 4 +- package/rtl8821au/rtl8821au.mk | 12 +- 9 files changed, 13 insertions(+), 777 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 2aecdb1c8f..569d58407a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1154,6 +1154,7 @@ F: package/rtl8189es/ F: package/rtl8723bu/ F: package/rtl8723ds/ F: package/rtl8812au-aircrack-ng/ +F: package/rtl8821au/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ F: package/sunxi-tools/ diff --git a/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch b/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch deleted file mode 100644 index 00e801b6b1..0000000000 --- a/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 99f1e8bd7172ddf9613db3531a8b37921ed73351 Mon Sep 17 00:00:00 2001 -From: Jesper Skov -Date: Fri, 25 Oct 2019 10:05:41 +0200 -Subject: [PATCH] Fix implicit fallthrough comments for kernel 5.3 - -[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/commit/e8a30a4c5a80efbbd5b1dbfe11b22916df4492f9.patch] -Signed-off-by: Peter Seiderer -Signed-off-by: Christian Stewart ---- - core/rtw_mlme_ext.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c -index 24565ea..380f507 100644 ---- a/core/rtw_mlme_ext.c -+++ b/core/rtw_mlme_ext.c -@@ -758,7 +758,9 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame) - else - ptable->func = &OnAuthClient; - //pass through -+ //fallthrough - case WIFI_ASSOCREQ: -+ //fallthrough - case WIFI_REASSOCREQ: - _mgt_dispatcher(padapter, ptable, precv_frame); - #ifdef CONFIG_HOSTAPD_MLME --- -2.28.0 - diff --git a/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch b/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch deleted file mode 100644 index 213ea806b0..0000000000 --- a/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch +++ /dev/null @@ -1,169 +0,0 @@ -From cde2dbf6e94e00fcf198422b03de01d3090675d9 Mon Sep 17 00:00:00 2001 -From: Jesper Skov -Date: Fri, 25 Oct 2019 10:10:29 +0200 -Subject: [PATCH] Fix kernel 5.3 driver crashes, from aircrack-ng/rtl8812au#421 - -[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/commit/822b485d36d6f72304a219c3be228f40968b542b.patch] -Signed-off-by: Peter Seiderer -Signed-off-by: Christian Stewart ---- - os_dep/linux/rtw_cfgvendor.c | 45 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 45 insertions(+) - -diff --git a/os_dep/linux/rtw_cfgvendor.c b/os_dep/linux/rtw_cfgvendor.c -index e7ba90a..81fc8af 100644 ---- a/os_dep/linux/rtw_cfgvendor.c -+++ b/os_dep/linux/rtw_cfgvendor.c -@@ -1173,6 +1173,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = BRCM_VENDOR_SCMD_PRIV_STR - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_priv_string_handler - }, - #if defined(GSCAN_SUPPORT) && 0 -@@ -1182,6 +1185,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_GET_CAPABILITIES - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_gscan_get_capabilities - }, - { -@@ -1190,6 +1196,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_SET_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_set_scan_cfg - }, - { -@@ -1198,6 +1207,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_SET_SCAN_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_set_batch_scan_cfg - }, - { -@@ -1206,6 +1218,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_ENABLE_GSCAN - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_initiate_gscan - }, - { -@@ -1214,6 +1229,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_ENABLE_FULL_SCAN_RESULTS - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_enable_full_scan_result - }, - { -@@ -1222,6 +1240,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_SET_HOTLIST - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_hotlist_cfg - }, - { -@@ -1230,6 +1251,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_SET_SIGNIFICANT_CHANGE_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_significant_change_cfg - }, - { -@@ -1238,6 +1262,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_GET_SCAN_RESULTS - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_gscan_get_batch_results - }, - { -@@ -1246,6 +1273,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_GET_CHANNEL_LIST - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_gscan_get_channel_list - }, - #endif /* GSCAN_SUPPORT */ -@@ -1256,6 +1286,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = RTT_SUBCMD_SET_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_rtt_set_config - }, - { -@@ -1264,6 +1297,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = RTT_SUBCMD_CANCEL_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_rtt_cancel_config - }, - { -@@ -1272,6 +1308,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = RTT_SUBCMD_GETCAPABILITY - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_rtt_get_capability - }, - #endif /* RTT_SUPPORT */ -@@ -1281,6 +1320,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = rtw_cfgvendor_get_feature_set - }, - { -@@ -1289,6 +1331,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET_MATRIX - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = rtw_cfgvendor_get_feature_set_matrix - } - }; --- -2.28.0 - diff --git a/package/rtl8821au/0003-Fix-using-sprintf-for-extending-string-which-causes-.patch b/package/rtl8821au/0003-Fix-using-sprintf-for-extending-string-which-causes-.patch deleted file mode 100644 index 2c4b595c37..0000000000 --- a/package/rtl8821au/0003-Fix-using-sprintf-for-extending-string-which-causes-.patch +++ /dev/null @@ -1,339 +0,0 @@ -From 5b6641978e8fa68bca05d224a61f8513b010eda8 Mon Sep 17 00:00:00 2001 -From: Coleman -Date: Fri, 17 Jul 2020 08:53:00 +0800 -Subject: [PATCH] Fix using sprintf for extending string, which causes - undefined behavior - -[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/commit/be57045a0933d64e958878696883e9cf998e1bf3.patch] -Signed-off-by: Coleman -Signed-off-by: Christian Stewart ---- - core/rtw_mp.c | 2 +- - os_dep/linux/ioctl_linux.c | 108 ++++++++++++++++++------------------- - 2 files changed, 55 insertions(+), 55 deletions(-) - -diff --git a/core/rtw_mp.c b/core/rtw_mp.c -index c2e400d..989bb3e 100644 ---- a/core/rtw_mp.c -+++ b/core/rtw_mp.c -@@ -1871,7 +1871,7 @@ u32 mp_query_psd(PADAPTER pAdapter, u8 *data) - } else { - psd_data = rtw_GetPSDData(pAdapter, i); - } -- sprintf(data, "%s%x ", data, psd_data); -+ sprintf(data + strlen(data), "%x ", psd_data); - i++; - } - -diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c -index c74a153..9543fa3 100644 ---- a/os_dep/linux/ioctl_linux.c -+++ b/os_dep/linux/ioctl_linux.c -@@ -9080,19 +9080,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i = 0; i < EFUSE_MAP_SIZE; i += 16) { - // DBG_871X("0x%02x\t", i); -- sprintf(extra, "%s0x%02x\t", extra, i); -+ sprintf(extra + strlen(extra), "0x%02x\t", i); - for (j=0; j<8; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, PROMContent[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", PROMContent[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, PROMContent[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", PROMContent[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra,"%s\n",extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0], "realmap") == 0) { -@@ -9107,19 +9107,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i = 0; i < EFUSE_MAP_SIZE; i += 16) { - // DBG_871X("0x%02x\t", i); -- sprintf(extra, "%s0x%02x\t", extra, i); -+ sprintf(extra + strlen(extra), "0x%02x\t", i); - for (j=0; j<8; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeEfuseInitMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeEfuseInitMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra,"%s\n",extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0], "rmap") == 0) { -@@ -9158,7 +9158,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, - *extra = 0; - for (i=0; iBTEfuseInitMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra,"%s\t",extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", pEfuseHal->BTEfuseInitMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0],"btbmap") == 0) { -@@ -9384,19 +9384,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i=512; i<1024 ; i+=16) { - // DBG_871X("0x%03x\t", i); -- sprintf(extra, "%s0x%03x\t", extra, i); -+ sprintf(extra + strlen(extra), "0x%03x\t", i); - for (j=0; j<8; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra,"%s\t",extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0],"btrmap") == 0) { -@@ -9436,7 +9436,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, - // DBG_871X("%s: bt efuse data={", __FUNCTION__); - for (i=0; ifakeBTEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0],"btbfake") == 0) { -@@ -9465,19 +9465,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i=512; i<1024; i+=16) { - // DBG_871X("0x%03x\t", i); -- sprintf(extra, "%s0x%03x\t", extra, i); -+ sprintf(extra + strlen(extra), "0x%03x\t", i); - for (j=0; j<8; j++) { - // DBG_871X("%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0],"wlrfkmap")== 0) { -@@ -9485,19 +9485,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i=0; ifakeEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeEfuseModifiedMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", pEfuseHal->fakeEfuseModifiedMap[i+j]); -- sprintf(extra, "%s %02X", extra, pEfuseHal->fakeEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), " %02X", pEfuseHal->fakeEfuseModifiedMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - -@@ -9523,7 +9523,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, - *extra = 0; - for (i=0; ifakeEfuseModifiedMap[addr+i]); -- sprintf(extra, "%s0x%02X ", extra, pEfuseHal->fakeEfuseModifiedMap[addr+i]); -+ sprintf(extra + strlen(extra), "0x%02X ", pEfuseHal->fakeEfuseModifiedMap[addr+i]); - } - } else if (strcmp(tmp[0],"btrfkrmap")== 0) { - if ((tmp[1]==NULL) || (tmp[2]==NULL)) { -@@ -9547,7 +9547,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, - *extra = 0; - for (i=0; ifakeBTEfuseModifiedMap[addr+i]); -- sprintf(extra, "%s0x%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[addr+i]); -+ sprintf(extra + strlen(extra), "0x%02X ", pEfuseHal->fakeBTEfuseModifiedMap[addr+i]); - } - } else { - sprintf(extra, "Command not found!"); -@@ -10409,7 +10409,7 @@ static int rtw_mp_read_reg(struct net_device *dev, - pnext++; - if ( *pnext != '\0' ) { - strtout = simple_strtoul (pnext , &ptmp, 16); -- sprintf( extra, "%s %d" ,extra ,strtout ); -+ sprintf(extra + strlen(extra), " %d" ,strtout ); - } else { - break; - } -@@ -10443,7 +10443,7 @@ static int rtw_mp_read_reg(struct net_device *dev, - pnext++; - if ( *pnext != '\0' ) { - strtout = simple_strtoul (pnext , &ptmp, 16); -- sprintf( extra, "%s %d" ,extra ,strtout ); -+ sprintf(extra + strlen(extra), " %d" ,strtout ); - } else { - break; - } -@@ -10566,7 +10566,7 @@ static int rtw_mp_read_rf(struct net_device *dev, - pnext++; - if ( *pnext != '\0' ) { - strtou = simple_strtoul (pnext , &ptmp, 16); -- sprintf( extra, "%s %d" ,extra ,strtou ); -+ sprintf(extra + strlen(extra), " %d" ,strtou ); - } else { - break; - } -@@ -12155,14 +12155,14 @@ todo: - goto exit; - - #ifdef CONFIG_RTL8723A -- sprintf(extra, "%s %d ", extra, (pMptCtx->mptOutBuf[i]& 0x3f)); -+ sprintf(extra + strlen(extra), " %d ", (pMptCtx->mptOutBuf[i]& 0x3f)); - #else -- sprintf(extra, "%s %d ", extra, (pMptCtx->mptOutBuf[i]& 0x1f)); -+ sprintf(extra + strlen(extra), " %d ", (pMptCtx->mptOutBuf[i]& 0x1f)); - #endif - } - } else { - for (i=4; imptOutLen; i++) { -- sprintf(extra, "%s 0x%x ", extra, pMptCtx->mptOutBuf[i]); -+ sprintf(extra + strlen(extra), " 0x%x ", pMptCtx->mptOutBuf[i]); - } - } - --- -2.28.0 - diff --git a/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch b/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch deleted file mode 100644 index 41cee2b247..0000000000 --- a/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 19aee91e45788d594615a9be58fa5d0879ec816a Mon Sep 17 00:00:00 2001 -From: youcai -Date: Tue, 18 Aug 2020 00:43:16 +0800 -Subject: [PATCH] rename sha256_state to rtl_sha256_state to avoid name - conflict with crypto - -[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/pull/338/commits/af6f6c1578f16145478326a939bb7593bbcdb4e7.patch] -Signed-off-by: Coleman -Signed-off-by: Christian Stewart ---- - core/rtw_security.c | 10 +++++----- - include/rtw_security.h | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/core/rtw_security.c b/core/rtw_security.c -index d54e6af..de2d91f 100644 ---- a/core/rtw_security.c -+++ b/core/rtw_security.c -@@ -2200,7 +2200,7 @@ BIP_exit: - - #ifndef PLATFORM_FREEBSD - /* compress 512-bits */ --static int sha256_compress(struct sha256_state *md, unsigned char *buf) -+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf) - { - u32 S[8], W[64], t0, t1; - u32 t; -@@ -2249,7 +2249,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) - } - - /* Initialize the hash state */ --static void sha256_init(struct sha256_state *md) -+static void sha256_init(struct rtl_sha256_state *md) - { - md->curlen = 0; - md->length = 0; -@@ -2270,7 +2270,7 @@ static void sha256_init(struct sha256_state *md) - @param inlen The length of the data (octets) - @return CRYPT_OK if successful - */ --static int sha256_process(struct sha256_state *md, unsigned char *in, -+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in, - unsigned long inlen) - { - unsigned long n; -@@ -2311,7 +2311,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in, - @param out [out] The destination of the hash (32 bytes) - @return CRYPT_OK if successful - */ --static int sha256_done(struct sha256_state *md, unsigned char *out) -+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out) - { - int i; - -@@ -2363,7 +2363,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out) - static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len, - u8 *mac) - { -- struct sha256_state ctx; -+ struct rtl_sha256_state ctx; - size_t i; - - sha256_init(&ctx); -diff --git a/include/rtw_security.h b/include/rtw_security.h -index d41014e..98feb69 100644 ---- a/include/rtw_security.h -+++ b/include/rtw_security.h -@@ -233,7 +233,7 @@ struct security_priv { - #endif /* DBG_SW_SEC_CNT */ - }; - --struct sha256_state { -+struct rtl_sha256_state { - u64 length; - u32 state[8], curlen; - u8 buf[64]; --- -2.28.0 - diff --git a/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch b/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch deleted file mode 100644 index 6d09153b82..0000000000 --- a/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9421b0763e5f20babb2c0fd437979a71fbac1739 Mon Sep 17 00:00:00 2001 -From: Christian Stewart -Date: Tue, 8 Sep 2020 22:46:45 -0700 -Subject: [PATCH] disable rtw_mgmt_frame_register on kernel 5.8.0 - -rtl8812au: fix build for kernel 5.8 - -[Source: https://github.com/lwfinger/rtl8812au/commit/ec1591b90dd323185717fa42887f96444cca5921.patch] -Signed-off-by: Larry Finger -Signed-off-by: Christian Stewart ---- - os_dep/linux/ioctl_cfg80211.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c -index 019daf9..13238cb 100644 ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -5177,6 +5177,7 @@ exit: - return ret; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) - struct wireless_dev *wdev, -@@ -5205,6 +5206,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, - exit: - return; - } -+#endif - - #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) - static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy, -@@ -6021,7 +6023,9 @@ static struct cfg80211_ops rtw_cfg80211_ops = { - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) - .mgmt_tx = cfg80211_rtw_mgmt_tx, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, -+#endif - #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35)) - .action = cfg80211_rtw_mgmt_tx, - #endif --- -2.28.0 - diff --git a/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch b/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch deleted file mode 100644 index 30595ec695..0000000000 --- a/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch +++ /dev/null @@ -1,110 +0,0 @@ -From e0ed05200e6e4b86e26e092dc1f16fc8fc1e2b67 Mon Sep 17 00:00:00 2001 -From: Christian Stewart -Date: Tue, 8 Sep 2020 23:08:39 -0700 -Subject: [PATCH] rtw_proc: convert file_operations to proc_ops for 5.6.x - compat - -Signed-off-by: Christian Stewart -[Fix < 5.6.x compile - missing semicolon] -Signed-off-by: Peter Seiderer ---- - os_dep/linux/rtw_proc.c | 40 ++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 38 insertions(+), 2 deletions(-) - -diff --git a/os_dep/linux/rtw_proc.c b/os_dep/linux/rtw_proc.c -index 048080a..6295f66 100644 ---- a/os_dep/linux/rtw_proc.c -+++ b/os_dep/linux/rtw_proc.c -@@ -65,9 +65,15 @@ inline struct proc_dir_entry *rtw_proc_create_dir(const char *name, struct proc_ - } - - inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent, -- const struct file_operations *fops, void * data) -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) -+ const struct file_operations *fops, -+ #else -+ const struct proc_ops *fops, -+ #endif -+ void * data -+ ) - { -- struct proc_dir_entry *entry; -+ struct proc_dir_entry *entry; - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) - entry = proc_create_data(name, S_IFREG|S_IRUGO|S_IWUGO, parent, fops, data); -@@ -167,6 +173,7 @@ static ssize_t rtw_drv_proc_write(struct file *file, const char __user *buffer, - return -EROFS; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) - static const struct file_operations rtw_drv_proc_fops = { - .owner = THIS_MODULE, - .open = rtw_drv_proc_open, -@@ -175,6 +182,15 @@ static const struct file_operations rtw_drv_proc_fops = { - .release = single_release, - .write = rtw_drv_proc_write, - }; -+#else -+static const struct proc_ops rtw_drv_proc_fops = { -+ .proc_open = rtw_drv_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = seq_release, -+ .proc_write = rtw_drv_proc_write, -+}; -+#endif - - int rtw_drv_proc_init(void) - { -@@ -776,6 +792,7 @@ static ssize_t rtw_adapter_proc_write(struct file *file, const char __user *buff - return -EROFS; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) - static const struct file_operations rtw_adapter_proc_fops = { - .owner = THIS_MODULE, - .open = rtw_adapter_proc_open, -@@ -784,6 +801,15 @@ static const struct file_operations rtw_adapter_proc_fops = { - .release = single_release, - .write = rtw_adapter_proc_write, - }; -+#else -+static const struct proc_ops rtw_adapter_proc_fops = { -+ .proc_open = rtw_adapter_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release, -+ .proc_write = rtw_adapter_proc_write, -+}; -+#endif - - int proc_get_odm_dbg_comp(struct seq_file *m, void *v) - { -@@ -1030,6 +1056,7 @@ static ssize_t rtw_odm_proc_write(struct file *file, const char __user *buffer, - return -EROFS; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) - static const struct file_operations rtw_odm_proc_fops = { - .owner = THIS_MODULE, - .open = rtw_odm_proc_open, -@@ -1038,6 +1065,15 @@ static const struct file_operations rtw_odm_proc_fops = { - .release = single_release, - .write = rtw_odm_proc_write, - }; -+#else -+static const struct proc_ops rtw_odm_proc_fops = { -+ .proc_open = rtw_odm_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release, -+ .proc_write = rtw_odm_proc_write, -+}; -+#endif - - struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev) - { --- -2.29.0 - diff --git a/package/rtl8821au/rtl8821au.hash b/package/rtl8821au/rtl8821au.hash index de84332f72..a5d0c2d5d4 100644 --- a/package/rtl8821au/rtl8821au.hash +++ b/package/rtl8821au/rtl8821au.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9c8e127dcf2b4d87df546f7f51afdbca0a0561cdba9bcc2689722e1090c46204 rtl8821au-4235b0ec7d7220a6364586d8e25b1e8cb99c36f1.tar.gz -sha256 6d66dec8f6c253a1af2ffd858167c722b1ce3218215446172c81355d0a49e7fc LICENSE +sha256 302f37098c3ae018eebf8ca80bcd2ec8ffc46755daed811278321d0914758f41 rtl8821au-e0b443940471c166a5cc6280d3608f95228e017f.tar.gz +sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 LICENSE diff --git a/package/rtl8821au/rtl8821au.mk b/package/rtl8821au/rtl8821au.mk index 5f4ba3eb76..65c0bc913d 100644 --- a/package/rtl8821au/rtl8821au.mk +++ b/package/rtl8821au/rtl8821au.mk @@ -4,11 +4,19 @@ # ################################################################################ -RTL8821AU_VERSION = 4235b0ec7d7220a6364586d8e25b1e8cb99c36f1 -RTL8821AU_SITE = $(call github,abperiasamy,rtl8812AU_8821AU_linux,$(RTL8821AU_VERSION)) +RTL8821AU_VERSION = e0b443940471c166a5cc6280d3608f95228e017f +RTL8821AU_SITE = $(call github,lwfinger,rtl8812au,$(RTL8821AU_VERSION)) RTL8821AU_LICENSE = GPL-2.0 RTL8821AU_LICENSE_FILES = LICENSE +define RTL8821AU_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB) +endef + RTL8821AU_MODULE_MAKE_OPTS = \ CONFIG_RTL8812AU_8821AU=m \ KVER=$(LINUX_VERSION_PROBED) \ From yann.morin.1998 at free.fr Mon Feb 20 20:53:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:25 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXinerama: bump version to 1.1.5 Message-ID: <20230220205157.EE9C086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b97079d921d8e62ce73d08e11069f5c04734e048 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003244.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXinerama/xlib_libXinerama.hash | 8 +++----- package/x11r7/xlib_libXinerama/xlib_libXinerama.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash b/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash index ca4081d375..e3ac880b39 100644 --- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash +++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-July/002905.html -md5 0d5f826a197dae74da67af4a9ef35885 libXinerama-1.1.4.tar.bz2 -sha1 34a1d9908ffbd46805d2357c6b05f5e341a8dc7c libXinerama-1.1.4.tar.bz2 -sha256 0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720 libXinerama-1.1.4.tar.bz2 -sha512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14 libXinerama-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003244.html +sha256 5094d1f0fcc1828cb1696d0d39d9e866ae32520c54d01f618f1a3c1e30c2085c libXinerama-1.1.5.tar.xz +sha512 735b5320de4782005b379e409bf2f976131c17d496b297d33a0e127ca1443034778586b6b25c077b2ad73a4ab34d440d7510475e0041f38202bb40f15fb08ff7 libXinerama-1.1.5.tar.xz # Locally computed sha256 f661fd883b6e980b3b118e0fbe230fbf10eef8d4d4a35931355f29ed647ddbe3 COPYING diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk index 48e32d55e2..67e3398c71 100644 --- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk +++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXINERAMA_VERSION = 1.1.4 -XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2 -XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXINERAMA_VERSION = 1.1.5 +XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.xz +XLIB_LIBXINERAMA_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXINERAMA_LICENSE = MIT XLIB_LIBXINERAMA_LICENSE_FILES = COPYING XLIB_LIBXINERAMA_CPE_ID_VENDOR = x From yann.morin.1998 at free.fr Mon Feb 20 20:53:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:25 -0000 Subject: [Buildroot] [git commit branch/next] package: optee-client: fix identation issues Message-ID: <20230220205154.EED0D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1c4c18766e51ee55e8d2e3a7cb12cb2762b12ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix issues reported by utils/check-package: package/optee-client/S30optee:40: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/optee-client/S30optee:46: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/optee-client/S30optee:47: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/optee-client/S30optee:48: should be indented with tabs (http://nightly.buildroot.org/#adding-packages-start-script) package/optee-client/S30optee:0: filename should be S (http://nightly.buildroot.org/#adding-packages-start-script) package/optee-client/S30tee-supplicant:0: run 'shellcheck' and fix the warnings Signed-off-by: Etienne Carriere [yann.morin.1998 at free.fr: - fix shellcheck SC2086 - rename the file ] Signed-off-by: Yann E. MORIN --- package/optee-client/{S30optee => S30tee-supplicant} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package/optee-client/S30optee b/package/optee-client/S30tee-supplicant similarity index 83% rename from package/optee-client/S30optee rename to package/optee-client/S30tee-supplicant index 17e6d6d2b8..8a605dbe5f 100644 --- a/package/optee-client/S30optee +++ b/package/optee-client/S30tee-supplicant @@ -7,6 +7,7 @@ DAEMON_ARGS="-d /dev/teepriv0" start() { printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ -- $DAEMON_ARGS status=$? @@ -37,13 +38,13 @@ restart() { } case "$1" in - start|stop|restart) + start|stop|restart) "$1";; reload) # Restart, since there is no true "reload" feature (does not # reconfigure/restart on SIGHUP, just closes all open files). restart;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac From yann.morin.1998 at free.fr Mon Feb 20 20:53:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:26 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xutil_makedepend: bump version to 1.0.7 Message-ID: <20230220205158.0588986496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=228780fbde4c2b645ea52a870df5ec020912ddf8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003243.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xutil_makedepend/xutil_makedepend.hash | 8 +++----- package/x11r7/xutil_makedepend/xutil_makedepend.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.hash b/package/x11r7/xutil_makedepend/xutil_makedepend.hash index 079fa9ef8f..3a7496e1a4 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.hash +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002985.html -md5 b2ca7f2f21f1c04a88b6a254c19c9b68 makedepend-1.0.6.tar.bz2 -sha1 3f321f7b570ec98f1fabc441267d29347a2e1456 makedepend-1.0.6.tar.bz2 -sha256 d558a52e8017d984ee59596a9582c8d699a1962391b632bec3bb6804bf4d501c makedepend-1.0.6.tar.bz2 -sha512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42 makedepend-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003243.html +sha256 a729cfd3c0f4e16c0db1da351e7f53335222e058e3434e84f91251fd6d407065 makedepend-1.0.7.tar.xz +sha512 fd575de737aa56ef8e475d1ddb7b2392e730ee1b23c0b853bbb21975b757c3fc56f94d57ecc5a784dceed2be653feb10909e86fd96fdc074b50fbbd0e27a19db makedepend-1.0.7.tar.xz # Locally computed sha256 0530078db78c47ae978dc2bd77f4f427e6cd97df868672c95b1ef284113c8cb7 COPYING diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk index 18f8eb1f6a..b16bbe0978 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk @@ -4,9 +4,9 @@ # ################################################################################ -XUTIL_MAKEDEPEND_VERSION = 1.0.6 -XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.bz2 -XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util +XUTIL_MAKEDEPEND_VERSION = 1.0.7 +XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.xz +XUTIL_MAKEDEPEND_SITE = https://xorg.freedesktop.org/archive/individual/util XUTIL_MAKEDEPEND_LICENSE = MIT XUTIL_MAKEDEPEND_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:26 -0000 Subject: [Buildroot] [git commit branch/next] package/matchbox-keyboard: add libpng dependency Message-ID: <20230220205155.0B9808648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a63fbb0d9762a0e6a454b1bea9ce44d620a6860a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libpng is a mandatory dependency since bump to version 0.1.1 in commit e2511d88e83acae4144be89ce5e258b724067bd5 and https://git.yoctoproject.org/matchbox-keyboard/commit/?id=1d7c5f1e0ad736205151c0df5aa738f942bd3e97: checking for PNG... no configure: error: Package requirements (libpng) were not met: Package 'libpng', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/4495f0720d7053a52ff8fef82d18a70a6f20c66b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/matchbox-keyboard/Config.in | 1 + package/matchbox-keyboard/matchbox-keyboard.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/matchbox-keyboard/Config.in b/package/matchbox-keyboard/Config.in index 260a57c6a4..3d7a9d203c 100644 --- a/package/matchbox-keyboard/Config.in +++ b/package/matchbox-keyboard/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MATCHBOX_KEYBOARD bool "matchbox-keyboard" + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO diff --git a/package/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox-keyboard/matchbox-keyboard.mk index 242c4831d1..a1e3c61543 100644 --- a/package/matchbox-keyboard/matchbox-keyboard.mk +++ b/package/matchbox-keyboard/matchbox-keyboard.mk @@ -11,7 +11,7 @@ MATCHBOX_KEYBOARD_SITE = \ MATCHBOX_KEYBOARD_LICENSE = LGPL-2.1, GPL-2.0+ (applet.c) MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING applet/applet.c MATCHBOX_KEYBOARD_DEPENDENCIES = \ - host-pkgconf matchbox-lib matchbox-fakekey expat xlib_libXrender + host-pkgconf matchbox-lib matchbox-fakekey expat libpng xlib_libXrender # From git MATCHBOX_KEYBOARD_AUTORECONF = YES From yann.morin.1998 at free.fr Mon Feb 20 20:53:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:27 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xcb-util-renderutil: bump version to 0.3.10 Message-ID: <20230220205158.58AD586494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b42c06423c7b31b5fdc8d2d06bdec7cd059eb30 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003234.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash | 5 +++-- package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash b/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash index 19ed9d4640..cb3ed55cea 100644 --- a/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash +++ b/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-June/002446.html -sha256 c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b xcb-util-renderutil-0.3.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003234.html +sha256 3e15d4f0e22d8ddbfbb9f5d77db43eacd7a304029bf25a6166cc63caa96d04ba xcb-util-renderutil-0.3.10.tar.xz +sha512 9cfa9201be2df7c0b832e1e1fe506e7c7a1e0f2b1b1d4a4b58620eadc241190a36478fa3ea27c32047fa79bf199f17dcd0b106853dbf5eda8cd584f3fc2b0c15 xcb-util-renderutil-0.3.10.tar.xz # Locally computed sha256 271169dd66674e9c396697af0b4822d1c59ccd2342b7740864d667a02963068b COPYING diff --git a/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk b/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk index 9e6683bf3a..d15d19f7e2 100644 --- a/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk +++ b/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_RENDERUTIL_VERSION = 0.3.9 -XCB_UTIL_RENDERUTIL_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_RENDERUTIL_SOURCE = xcb-util-renderutil-$(XCB_UTIL_RENDERUTIL_VERSION).tar.bz2 +XCB_UTIL_RENDERUTIL_VERSION = 0.3.10 +XCB_UTIL_RENDERUTIL_SITE = https://xorg.freedesktop.org/archive/individual/lib +XCB_UTIL_RENDERUTIL_SOURCE = xcb-util-renderutil-$(XCB_UTIL_RENDERUTIL_VERSION).tar.xz XCB_UTIL_RENDERUTIL_LICENSE = MIT XCB_UTIL_RENDERUTIL_LICENSE_FILES = COPYING XCB_UTIL_RENDERUTIL_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:53:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:27 -0000 Subject: [Buildroot] [git commit branch/next] package/elf2flt: fix text relocations on xtensa Message-ID: <20230220205155.1F083828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3781e4efc52f542f58147b2de5f599b4e729bcbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next elf2flt 2021.08 has changed endianness swapping logic for relocated entries in the text segment. This broke little-endian xtensa FLAT images which now fail to start with the following message: binfmt_flat: reloc outside program 0x24c80100 (0 - 0x6e430/0x56a20) Fix it by restoring old endianness swapping logic for relocated entries in the text segment when building for xtensa. Reported-by: Niklas Cassel Signed-off-by: Max Filippov Signed-off-by: Yann E. MORIN --- .../0006-elf2flt-xtensa-fix-text-relocations.patch | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch b/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch new file mode 100644 index 0000000000..3664775906 --- /dev/null +++ b/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch @@ -0,0 +1,51 @@ +From e248d9774506fdd8698b14a7edead113f19ecdb0 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Tue, 29 Nov 2022 17:47:54 -0800 +Subject: [PATCH] xtensa: fix text relocations + +The commit 5e08f1968316 ("Don't always update text in !pic_with_got case") +changed good_32bit_resolved_reloc to not do endianness swapping for +relocated entries in the text segment. This broke little-endian xtensa +FLAT images which after this change fail to start with the following +message: + + binfmt_flat: reloc outside program 0x24c80100 (0 - 0x6e430/0x56a20) + +Fix it by preserving 'update_text' when building for xtensa. + +Fixes: 5e08f1968316 ("Don't always update text in !pic_with_got case") +Reported-by: Niklas Cassel +Signed-off-by: Max Filippov +--- + elf2flt.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/elf2flt.c b/elf2flt.c +index b93aecdaced3..cec3f4a22239 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -808,7 +808,20 @@ output_relocs ( + continue; + case R_XTENSA_32: + case R_XTENSA_PLT: +- goto good_32bit_resolved_reloc; ++ if (bfd_big_endian (abs_bfd)) ++ sym_addr = ++ (r_mem[0] << 24) ++ + (r_mem[1] << 16) ++ + (r_mem[2] << 8) ++ + r_mem[3]; ++ else ++ sym_addr = ++ r_mem[0] ++ + (r_mem[1] << 8) ++ + (r_mem[2] << 16) ++ + (r_mem[3] << 24); ++ relocation_needed = 1; ++ break; + default: + goto bad_resolved_reloc; + #else +-- +2.30.2 + From yann.morin.1998 at free.fr Mon Feb 20 20:53:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:28 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xsetroot: bump version to 1.1.3 Message-ID: <20230220205158.2A2C686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51818b18b9a1fe1a5e0b31298f86cb80309ae9ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003240.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xsetroot/xapp_xsetroot.hash | 8 +++----- package/x11r7/xapp_xsetroot/xapp_xsetroot.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash b/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash index 32294c1f3d..43f7cd66d0 100644 --- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash +++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002874.html -md5 5fe769c8777a6e873ed1305e4ce2c353 xsetroot-1.1.2.tar.bz2 -sha1 42ab81761823b44974feab86477007c49dbace50 xsetroot-1.1.2.tar.bz2 -sha256 10c442ba23591fb5470cea477a0aa5f679371f4f879c8387a1d9d05637ae417c xsetroot-1.1.2.tar.bz2 -sha512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b xsetroot-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003240.html +sha256 6081b45a9eb4426e045d259d1e144b32417fb635e5b96aa90647365ac96638d1 xsetroot-1.1.3.tar.xz +sha512 f333d1bfd92bb943044da36331ae2cf68a811c8f3891719d9ebc1749e2dd0c67068f86face0794c3c4ae584c4dd189bad4998dccb38fe1ac37a8921e5713e7c0 xsetroot-1.1.3.tar.xz # Locally computed sha256 48e9c9572e0dc1c14b93b753542f780e7751dd7f035816374d8a8be0211a4520 COPYING diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk index 98ba344cfa..1ffbb2b6b0 100644 --- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk +++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XSETROOT_VERSION = 1.1.2 -XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.bz2 -XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XSETROOT_VERSION = 1.1.3 +XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.xz +XAPP_XSETROOT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XSETROOT_LICENSE = MIT XAPP_XSETROOT_LICENSE_FILES = COPYING XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXcursor xdata_xbitmaps From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:28 -0000 Subject: [Buildroot] [git commit branch/next] package/rabbitmq-server: drop package Message-ID: <20230220205154.B1D39828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89815bad0a531d01ee2733dd9c17576a7647e1d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The packaged version has a number of security issues, newer versions require erlang 23+ and nobody has stepped up to maintain it since the issues were reported: http://lists.busybox.net/pipermail/buildroot/2022-November/656230.html So drop the package and add legacy handling for it. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++ DEVELOPERS | 1 - package/Config.in | 1 - package/rabbitmq-server/Config.in | 14 ----- package/rabbitmq-server/S50rabbitmq-server | 30 ----------- package/rabbitmq-server/rabbitmq-server.hash | 25 --------- package/rabbitmq-server/rabbitmq-server.mk | 69 ------------------------- package/rabbitmq-server/rabbitmq-server.service | 16 ------ 8 files changed, 7 insertions(+), 156 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index b3c35d6b07..49f63fd14c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.11" +config BR2_PACKAGE_RABBITMQ_SERVER + bool "rabbitmq-server removed" + select BR2_LEGACY + help + Package was removed because it was unmaintained and had + known security issues. + config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 bool "libopenssl rc5 was never enabled" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index bfebf8163c..8bcce1fd37 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1074,7 +1074,6 @@ F: package/libdmtx/ F: package/libsodium/ F: package/php-amqp/ F: package/python-cherrypy/ -F: package/rabbitmq-server/ F: package/sane-backends/ F: package/ucl/ F: package/upx/ diff --git a/package/Config.in b/package/Config.in index aef80f9ab0..682faf3697 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2394,7 +2394,6 @@ endif source "package/pure-ftpd/Config.in" source "package/putty/Config.in" source "package/quagga/Config.in" - source "package/rabbitmq-server/Config.in" source "package/radvd/Config.in" source "package/reaver/Config.in" source "package/redir/Config.in" diff --git a/package/rabbitmq-server/Config.in b/package/rabbitmq-server/Config.in deleted file mode 100644 index b3b7639e28..0000000000 --- a/package/rabbitmq-server/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_RABBITMQ_SERVER - bool "rabbitmq-server" - depends on BR2_PACKAGE_ERLANG - select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_OPENSSL # Required to build Erlang's crypto and ssl - # applications - help - High-performance AMQP-compliant message broker written in - Erlang. - - http://www.rabbitmq.com - -comment "rabbitmq-server needs erlang" - depends on !BR2_PACKAGE_ERLANG diff --git a/package/rabbitmq-server/S50rabbitmq-server b/package/rabbitmq-server/S50rabbitmq-server deleted file mode 100644 index 35f7844860..0000000000 --- a/package/rabbitmq-server/S50rabbitmq-server +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Start/stop rabbitmq-server -# - -INSTALLUSER=rabbitmq -RUNDIR=/var/run/rabbitmq -LOGDIR=/var/log/rabbitmq - -case "$1" in - start) - install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" || exit 1 - install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$LOGDIR" || exit 1 - printf "Starting rabbitmq-server: " - su -c "/usr/sbin/rabbitmq-server -detached" - "$INSTALLUSER" 2>/dev/null - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping rabbitmq-server: " - su -c "/usr/sbin/rabbitmqctl stop" - "$INSTALLUSER" - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - "$0" stop || true - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package/rabbitmq-server/rabbitmq-server.hash b/package/rabbitmq-server/rabbitmq-server.hash deleted file mode 100644 index 693ab208ec..0000000000 --- a/package/rabbitmq-server/rabbitmq-server.hash +++ /dev/null @@ -1,25 +0,0 @@ -# Locally computed -sha256 8c6729b985cb21bab13363b1c806cfa15845b046be9e641ab1496bd5a1eaf19d rabbitmq-server-3.8.2.tar.xz -sha256 a96b7ed2e7def9c86d84d9ca0e79e4a55fc8e6e202ac89caa4f9791ccb9cf2a3 LICENSE -sha256 acd82bfce369b066e7e612197206da4fa38b8614486658775d0b6f66ac30114a LICENSE-APACHE2 -sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE-APACHE2-excanvas -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE-APACHE2-ExplorerCanvas -sha256 b04c8850fdf64d17233f0acbe4eb632f03bd663094233c949bdbe788858bb841 LICENSE-APL2-Stomp-Websocket -sha256 3c69f8327beaaa45d2f3d7831edf211d0f37d1d9c7754267478320697e1882e9 LICENSE-BSD-base64js -sha256 af7b5cdf5e16446c64d6e755b2a6386e38c56500ae27587edcd94c96d330ee35 LICENSE-BSD-recon -sha256 7615ea96ccddc822655cb48a9d2a5cac2f176fca7fe28131af934ce21f48cbc8 LICENSE-erlcloud -sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234 LICENSE-httpc_aws -sha256 c0e940d13f488849c27963e7d87f3fc27a2f5843cfd49148029a558251014689 LICENSE-ISC-cowboy -sha256 af399cded8f343407fb68eeb51755676e9700c65c380f073376afd8d20f428a1 LICENSE-MIT-EJS -sha256 b2614726fe57ee8267324ecfdebe6e578e5aaa5a77a7f84b9d26463c058147d1 LICENSE-MIT-EJS10 -sha256 0f26e121a7a1dab675bd8474cdc517428863036a668260033467c7278f488cd4 LICENSE-MIT-Erlware-Commons -sha256 52cb566b16d84314b92b91361ed072eaaf166e8d3dfa3d0fd3577613925f205c LICENSE-MIT-Flot -sha256 8cb9a8ff8cafd6a085fd4f086e797b719c334a621df19354dc286591003da3f5 LICENSE-MIT-jQuery -sha256 44f25d51c90aa55dd4b3ba7f3d6e9a594073fcbefe651e16e74cabd48005b476 LICENSE-MIT-jQuery164 -sha256 fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692 LICENSE-MIT-Mochi -sha256 b80081a5bb527dbe6b79f18a40f44b4ba6303e4856cadd249672c97b90e6dd7c LICENSE-MIT-Sammy -sha256 cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed LICENSE-MIT-Sammy060 -sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd LICENSE-MPL -sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd LICENSE-MPL-RabbitMQ -sha256 66a3107d5ad6a058aab753eaac2047ccb2ed0e39465dd0fe5844da3e300d5172 LICENSE-MPL2 -sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234 LICENSE-rabbitmq_aws diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk deleted file mode 100644 index 969e61e2b5..0000000000 --- a/package/rabbitmq-server/rabbitmq-server.mk +++ /dev/null @@ -1,69 +0,0 @@ -################################################################################ -# -# rabbitmq-server -# -################################################################################ - -RABBITMQ_SERVER_VERSION = 3.8.2 -RABBITMQ_SERVER_SITE = https://github.com/rabbitmq/rabbitmq-server/releases/download/v$(RABBITMQ_SERVER_VERSION) -RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz -RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-3-Clause, BSD-2-Clause, MIT, MPL-2.0, ISC -RABBITMQ_SERVER_LICENSE_FILES = \ - LICENSE \ - LICENSE-APACHE2 \ - LICENSE-APACHE2-excanvas \ - LICENSE-APACHE2-ExplorerCanvas \ - LICENSE-APL2-Stomp-Websocket \ - LICENSE-BSD-base64js \ - LICENSE-BSD-recon \ - LICENSE-erlcloud \ - LICENSE-httpc_aws \ - LICENSE-ISC-cowboy \ - LICENSE-MIT-EJS \ - LICENSE-MIT-EJS10 \ - LICENSE-MIT-Erlware-Commons \ - LICENSE-MIT-Flot \ - LICENSE-MIT-jQuery \ - LICENSE-MIT-jQuery164 \ - LICENSE-MIT-Mochi \ - LICENSE-MIT-Sammy \ - LICENSE-MIT-Sammy060 \ - LICENSE-MPL \ - LICENSE-MPL-RabbitMQ \ - LICENSE-MPL2 \ - LICENSE-rabbitmq_aws -RABBITMQ_SERVER_CPE_ID_VENDOR = vmware -RABBITMQ_SERVER_CPE_ID_PRODUCT = rabbitmq -RABBITMQ_SERVER_SELINUX_MODULES = rabbitmq - -RABBITMQ_SERVER_DEPENDENCIES = host-elixir host-libxslt host-zip erlang libxslt -RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults - -define RABBITMQ_SERVER_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define RABBITMQ_SERVER_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install - - for bin in $(RABBITMQ_SERVER_TARGET_BINS); do \ - ln -sf ../lib/erlang/lib/rabbitmq_server-$(RABBITMQ_SERVER_VERSION)/sbin/$$bin \ - $(TARGET_DIR)/usr/sbin/$$bin; \ - done -endef - -define RABBITMQ_SERVER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/rabbitmq-server/rabbitmq-server.service \ - $(TARGET_DIR)/usr/lib/systemd/system/rabbitmq-server.service -endef - -define RABBITMQ_SERVER_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/rabbitmq-server/S50rabbitmq-server \ - $(TARGET_DIR)/etc/init.d/S50rabbitmq-server -endef - -define RABBITMQ_SERVER_USERS - rabbitmq -1 rabbitmq -1 * /var/lib/rabbitmq /bin/sh - rabbitmq-server daemon -endef - -$(eval $(generic-package)) diff --git a/package/rabbitmq-server/rabbitmq-server.service b/package/rabbitmq-server/rabbitmq-server.service deleted file mode 100644 index f69b33d455..0000000000 --- a/package/rabbitmq-server/rabbitmq-server.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=RabbitMQ Messaging Server -After=syslog.target network.target - -[Service] -Type=simple -User=rabbitmq -Group=rabbitmq -Environment=HOME=/var/lib/rabbitmq -WorkingDirectory=/var/lib/rabbitmq -LogsDirectory=/var/log/rabbitmq -ExecStart=/usr/sbin/rabbitmq-server -ExecStop=/usr/sbin/rabbitmqctl stop - -[Install] -WantedBy=multi-user.target From yann.morin.1998 at free.fr Mon Feb 20 20:53:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:35 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXxf86vm: bump version to 1.1.5 Message-ID: <20230220205158.F1AE886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b8022395d32d8bda95ca084436659a983932c11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-September/003213.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash | 7 +++---- package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash index 0601360c0e..d181310c69 100644 --- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash +++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash @@ -1,6 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-February/002539.html -sha1 78ef18ca2be157131899e01c62679e247409a13f libXxf86vm-1.1.4.tar.bz2 -sha256 afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57 libXxf86vm-1.1.4.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-September/003213.html +sha256 247fef48b3e0e7e67129e41f1e789e8d006ba47dba1c0cdce684b9b703f888e7 libXxf86vm-1.1.5.tar.xz +sha512 68226fcb9773a583ea417ab413146203dd7db6ff8a4d388285da972353355e11e179861a77c9fa284aefac025bb3bbf5a9537fa0bf246c782e0116a667c9d9b6 libXxf86vm-1.1.5.tar.xz # Locally calculated sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk index 8871bd507e..0f3decb04e 100644 --- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk +++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXXF86VM_VERSION = 1.1.4 -XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2 -XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXXF86VM_VERSION = 1.1.5 +XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.xz +XLIB_LIBXXF86VM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXXF86VM_LICENSE = MIT XLIB_LIBXXF86VM_LICENSE_FILES = COPYING XLIB_LIBXXF86VM_CPE_ID_VENDOR = x From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:35 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: remove Sven Haardiek Message-ID: <20230220205155.EDF52828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e40f96af34e3706fff2ebd6e9a6cebd14091d4ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next His e-mail address no longer exists: Your message to sven.haardiek at iotec-gmbh.de couldn't be delivered. sven.haardiek wasn't found at iotec-gmbh.de. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 9da61cca13..7b5eda1615 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2728,10 +2728,6 @@ F: configs/rock_pi_n8_defconfig F: configs/rockpro64_defconfig F: package/arm-gnu-toolchain/ -N: Sven Haardiek -F: package/lcdproc/ -F: package/python-influxdb/ - N: Sven Oliver Moll F: package/most/ From peter at korsgaard.com Mon Feb 20 20:53:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:36 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.11 Message-ID: <20230220205155.BEC7B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40bd4a32aadaa1d041a8525628ecaaf7f5a7fde6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- CHANGES | 20 ++++++++++++++++++++ Makefile | 2 +- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 18 ++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 51 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index 79b010a9b8..f71e53fe4b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,23 @@ +2022.11, released December 5th, 2022 + + Fixes all over the tree. + + Defconfigs: Nitrogen8*: Bump rootfs size, Zynqmp + kv260/zcu102/zcu106: Update to Xilinx 2022.2, + + Updated/fixed packages: dash, dovecot, elf2flt, exim, gcc, + gdb, git, kodi, libarchive, libmdbx, linuxptp, lxc, + matchbox-keyboard, memcached, netsnmp, optee-client, + python-scipy, python3, qt6base, qt6serialport, rtl8188eu, + rtl8723bu, rtl8723ds, rtl8821au, vim, vlc, wilc-driver + + Removed packages: rabbitmq-server + + Issues resolved (http://bugs.uclibc.org): + + #15131: Target GDB uses internal zlib + #15151: Busybox /etc/init.d scripts are not executable + 2022.11-rc3, released November 24th, 2022 Fixes all over the tree. diff --git a/Makefile b/Makefile index 827ab230ef..89f3648bb7 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.11-rc3 +export BR2_VERSION := 2022.11 # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1669308000 diff --git a/docs/website/download.html b/docs/website/download.html index a92f630611..6f7007529c 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,40 +42,40 @@
        -

        Latest stable release: 2022.08.2

        +

        Latest stable release: 2022.11

        - +
        - +
        -

        buildroot-2022.08.2.tar.gz

        -

        PGP signature

        +

        buildroot-2022.11.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2022.08.2.tar.xz

        -

        PGP signature

        +

        buildroot-2022.11.tar.xz

        +

        PGP signature

        - +
        Source code
        diff --git a/docs/website/news.html b/docs/website/news.html index 1d76cc3cf5..9be00982cb 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,24 @@

        News

          +
        • +
          +
          +
          +

          2022.11 released

          +

          5 December 2022

          +
          +
          +

          The stable 2022.11 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.11 release.

          +
          +
          +
          • +
        • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 40c7c4e1ce..02fe6bca67 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2022.08.2' +RELEASE='2022.11' ### Change here for more memory/cores ### VM_MEMORY=2048 From yann.morin.1998 at free.fr Mon Feb 20 20:53:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:36 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXft: bump version to 2.3.6 Message-ID: <20230220205159.134D486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f7d13d9588cf3632a7c73bd81dddb52a4263309 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-September/003211.html https://lists.x.org/archives/xorg-announce/2022-September/003209.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXft/xlib_libXft.hash | 6 +++--- package/x11r7/xlib_libXft/xlib_libXft.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXft/xlib_libXft.hash b/package/x11r7/xlib_libXft/xlib_libXft.hash index 8743a9b7d1..484764be3d 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.hash +++ b/package/x11r7/xlib_libXft/xlib_libXft.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-August/003104.html -sha256 57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd libXft-2.3.4.tar.bz2 -sha512 5bb019750982ed4643880efd7368bc226ad49cfa8c0c8c6d4614dfeed74f588c65e1ba69adcc12284ec07d841e5b58fc1c27f3fddf83fe1a2837b29dd9ecec51 libXft-2.3.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-September/003211.html +sha256 60a6e7319fc938bbb8d098c9bcc86031cc2327b5d086d3335fc5c76323c03022 libXft-2.3.6.tar.xz +sha512 732f8c635fcac6010012ba8c10c23d2dd6ec79b0f096d6bcc9b7e36d2ca0817387faa7ee5bb6f43cff02adc68e4234c1b8f95021ebc548f61c492e0b76836d90 libXft-2.3.6.tar.xz # Locally computed sha256 7cda22286b1379b9b73df695f72cbad36595e65b039a5fbc5c89b69ecc44438c COPYING diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index b1640a6613..a86501900c 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXFT_VERSION = 2.3.4 -XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2 +XLIB_LIBXFT_VERSION = 2.3.6 +XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.xz XLIB_LIBXFT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFT_LICENSE = MIT XLIB_LIBXFT_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:37 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libICE: bump version to 1.1.1 Message-ID: <20230220205156.55F678648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8ae5b86edcf172d824982c0740c5099ea087697 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003288.html https://lists.x.org/archives/xorg-announce/2022-December/003274.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libICE/xlib_libICE.hash | 8 +++----- package/x11r7/xlib_libICE/xlib_libICE.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libICE/xlib_libICE.hash b/package/x11r7/xlib_libICE/xlib_libICE.hash index 2bfbe54788..4a58f97698 100644 --- a/package/x11r7/xlib_libICE/xlib_libICE.hash +++ b/package/x11r7/xlib_libICE/xlib_libICE.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003006.html -md5 76d77499ee7120a56566891ca2c0dbcf libICE-1.0.10.tar.bz2 -sha1 5b5eb125d4f43a3ab8153b0f850963ee6c982c24 libICE-1.0.10.tar.bz2 -sha256 6f86dce12cf4bcaf5c37dddd8b1b64ed2ddf1ef7b218f22b9942595fb747c348 libICE-1.0.10.tar.bz2 -sha512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468 libICE-1.0.10.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003288.html +sha256 03e77afaf72942c7ac02ccebb19034e6e20f456dcf8dddadfeb572aa5ad3e451 libICE-1.1.1.tar.xz +sha512 2f7833a25f31cc743ca95cb88f9a8403b50e19ffb5bf43bfef87ba405857d359789daaa9ec2391351237d958f16d35dbf082adb76d301e46d3a54162a6b452d3 libICE-1.1.1.tar.xz # Locally computed sha256 60105b7ea93cb07a67fee8443b092b727e3db7f0dff4fbe05bc6cd7747fb53c8 COPYING diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk index 2b56aaab98..d92e81c0ab 100644 --- a/package/x11r7/xlib_libICE/xlib_libICE.mk +++ b/package/x11r7/xlib_libICE/xlib_libICE.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBICE_VERSION = 1.0.10 -XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.bz2 +XLIB_LIBICE_VERSION = 1.1.1 +XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.xz XLIB_LIBICE_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBICE_LICENSE = MIT XLIB_LIBICE_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:38 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_showfont: bump version to 1.0.6 Message-ID: <20230220205159.2B56B86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe85dbf818ab4321f3a18f742458f3313ed1b3ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003207.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_showfont/xapp_showfont.hash | 5 +++-- package/x11r7/xapp_showfont/xapp_showfont.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_showfont/xapp_showfont.hash b/package/x11r7/xapp_showfont/xapp_showfont.hash index ff35e9c9eb..7bec4e8728 100644 --- a/package/x11r7/xapp_showfont/xapp_showfont.hash +++ b/package/x11r7/xapp_showfont/xapp_showfont.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002513.html -sha256 e9735c1c530b8a52edfab7415cc0fd7f8d2889095114f4cb689a27476461ac89 showfont-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003207.html +sha256 2b9b9f06e65e095ed76ce560b701b9fc47fa63310ee706b54c8787af061d0e56 showfont-1.0.6.tar.xz +sha512 21a318519492f4ba46a8bcb3590097fc5f96fe01fdb557257ae56bae813671952a2aad6c0df8cd69659e06708571c398e6d97969224cf692e22c8a35c8e6c363 showfont-1.0.6.tar.xz # Locally computed sha256 c32217021e0507207e2ee6da3fcee3d9e32816003a7153b3357c08cdc97934a8 COPYING diff --git a/package/x11r7/xapp_showfont/xapp_showfont.mk b/package/x11r7/xapp_showfont/xapp_showfont.mk index c0b8c9a3a2..a805f35231 100644 --- a/package/x11r7/xapp_showfont/xapp_showfont.mk +++ b/package/x11r7/xapp_showfont/xapp_showfont.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_SHOWFONT_VERSION = 1.0.5 -XAPP_SHOWFONT_SOURCE = showfont-$(XAPP_SHOWFONT_VERSION).tar.bz2 -XAPP_SHOWFONT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_SHOWFONT_VERSION = 1.0.6 +XAPP_SHOWFONT_SOURCE = showfont-$(XAPP_SHOWFONT_VERSION).tar.xz +XAPP_SHOWFONT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SHOWFONT_LICENSE = MIT XAPP_SHOWFONT_LICENSE_FILES = COPYING XAPP_SHOWFONT_DEPENDENCIES = xlib_libFS From yann.morin.1998 at free.fr Mon Feb 20 20:53:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:38 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libxkbfile: bump version to 1.1.2 Message-ID: <20230220205156.6B020828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cfae45da9c35dd5e9a9bd8c42a8fb008d425f35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003286.html https://lists.x.org/archives/xorg-announce/2022-October/003227.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash | 8 +++----- package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash index 3f2ffdf09a..7e6199f16b 100644 --- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash +++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002977.html -md5 dd7e1e946def674e78c0efbc5c7d5b3b libxkbfile-1.1.0.tar.bz2 -sha1 487f314b6dbc17e93d0fe1e3741392156a9ca895 libxkbfile-1.1.0.tar.bz2 -sha256 758dbdaa20add2db4902df0b1b7c936564b7376c02a0acd1f2a331bd334b38c7 libxkbfile-1.1.0.tar.bz2 -sha512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826 libxkbfile-1.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003286.html +sha256 b8a3784fac420b201718047cfb6c2d5ee7e8b9481564c2667b4215f6616644b1 libxkbfile-1.1.2.tar.xz +sha512 0639fad7b64b36a85f8d24cdd40085e0ec18d7a671793b8b5c26449e9cc5a84c37117e7757fb1238ac353044935dd00013e42166de5af9dec428e873a47e598d libxkbfile-1.1.2.tar.xz # Locally computed sha256 e1b3fdad8037ab3f986ef9caaa7c8da47d8d55875e680c7d6011f6c07363ea7c COPYING diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk index 6b68496650..2e7f82922f 100644 --- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk +++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXKBFILE_VERSION = 1.1.0 -XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.bz2 +XLIB_LIBXKBFILE_VERSION = 1.1.2 +XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.xz XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXKBFILE_LICENSE = MIT XLIB_LIBXKBFILE_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:39 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_ico: bump version to 1.0.6 Message-ID: <20230220205159.4202C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74440b3cd2bf5cdaf06753d53a471bb5f2c288c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003205.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_ico/xapp_ico.hash | 8 +++----- package/x11r7/xapp_ico/xapp_ico.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_ico/xapp_ico.hash b/package/x11r7/xapp_ico/xapp_ico.hash index a0970cd507..0258537fd5 100644 --- a/package/x11r7/xapp_ico/xapp_ico.hash +++ b/package/x11r7/xapp_ico/xapp_ico.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002880.html -md5 7895f2d109f4206b6d2db37257e07d12 ico-1.0.5.tar.bz2 -sha1 8759ec954375f3a1b37dc920a12790bfbfb0cad3 ico-1.0.5.tar.bz2 -sha256 d73b62f29eb98d850f16b76d759395180b860b613fbe1686b18eee99a6e3773f ico-1.0.5.tar.bz2 -sha512 93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6 ico-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003205.html +sha256 38f369d431e753280fde70fa489cc94ce204f9f8eabd2f49fc7d32afa69f4405 ico-1.0.6.tar.xz +sha512 0ada451b8026ea10d1a5633f847b7bf833292e4cd01e3f1079d82c91fd142c06c6c4005b7146900ee34ac7acc8fd981db37ada9052dff49c2cfce995b9146c8c ico-1.0.6.tar.xz # Locally computed sha256 97ef3a622f2f385cabfc8ab7aff13dc46468c10a5520670b5edfa33f2c3999eb COPYING diff --git a/package/x11r7/xapp_ico/xapp_ico.mk b/package/x11r7/xapp_ico/xapp_ico.mk index 8b0d4f90f3..56dbd64b38 100644 --- a/package/x11r7/xapp_ico/xapp_ico.mk +++ b/package/x11r7/xapp_ico/xapp_ico.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_ICO_VERSION = 1.0.5 -XAPP_ICO_SOURCE = ico-$(XAPP_ICO_VERSION).tar.bz2 -XAPP_ICO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_ICO_VERSION = 1.0.6 +XAPP_ICO_SOURCE = ico-$(XAPP_ICO_VERSION).tar.xz +XAPP_ICO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_ICO_LICENSE = MIT XAPP_ICO_LICENSE_FILES = COPYING XAPP_ICO_DEPENDENCIES = xlib_libX11 From yann.morin.1998 at free.fr Mon Feb 20 20:53:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:39 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-input-mouse: bump version to 1.9.4 Message-ID: <20230220205156.4B6B8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82abffdbb7784ab30874544f740abf23f6c0c695 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash | 8 +++----- .../x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash index fe83f6920f..adba659aea 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-June/002903.html -md5 a2104693bbcfe1413397f7905eecd3dc xf86-input-mouse-1.9.3.tar.bz2 -sha1 b3982998808ba43117fc066c4ecc94ce67c5818e xf86-input-mouse-1.9.3.tar.bz2 -sha256 93ecb350604d05be98b7d4e5db3b8155a44890069a7d8d6b800c0bea79c85cc5 xf86-input-mouse-1.9.3.tar.bz2 -sha512 d99f5b4b1ef1aa4cbf1a92549e412f54f121bc804e4d6643248ad7ea18081b38b958bd289dc8476ebc0f6ef5f7424c2f2a8abcfaa30cae5378829549af6b148f xf86-input-mouse-1.9.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003247.html +sha256 7f6f8551fc238abdddcf9f38906564c1f8c7dacb0ad947cfc110487aefbd8d4c xf86-input-mouse-1.9.4.tar.xz +sha512 7dfde3b1e0c1291c4d78ee920942771808b007f743bfc6eed20de12579383745858673dd874a4b5cf4ab8d9d15f6f7ca2db81ee831547a488d64848a7fe5e16c xf86-input-mouse-1.9.4.tar.xz # Locally computed sha256 472ff645ead9bf3ffb48d42c596376ffc595897e0c0993a071a7ada0da1f4f10 COPYING diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk index 3886fa7aa1..4a9eb3089f 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.3 -XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.4 +XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.xz +XDRIVER_XF86_INPUT_MOUSE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT XDRIVER_XF86_INPUT_MOUSE_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xorgproto From yann.morin.1998 at free.fr Mon Feb 20 20:53:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:40 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-glint: remove package Message-ID: <20230220205159.766C386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=565f41e27c7a6cfd3b51ddf46071799a40f5eb99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Building this package is broken with X.org xserver 21: https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1 Fixes: http://autobuild.buildroot.net/results/f9d/f9d650ccb4173085cfc8873f1e52ee56caf982fa/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- Config.in.legacy | 7 +++++++ package/x11r7/Config.in | 1 - package/x11r7/xdriver_xf86-video-glint/Config.in | 10 ---------- .../xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash | 4 ---- .../xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk | 14 -------------- 5 files changed, 7 insertions(+), 29 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 522102a0c0..bf3bd55f35 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT + bool "xf86-video-glint removed" + select BR2_LEGACY + help + The X.org xf86-video-glint package no longer builds with + Xserver 21 and is unmaintained. + config BR2_PACKAGE_USBREDIR_SERVER bool "usbredirserver removed" select BR2_LEGACY diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 63259e88da..273db98e89 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -164,7 +164,6 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdriver_xf86-video-fbdev/Config.in source package/x11r7/xdriver_xf86-video-fbturbo/Config.in source package/x11r7/xdriver_xf86-video-geode/Config.in - source package/x11r7/xdriver_xf86-video-glint/Config.in source package/x11r7/xdriver_xf86-video-i128/Config.in source package/x11r7/xdriver_xf86-video-imx/Config.in source package/x11r7/xdriver_xf86-video-imx-viv/Config.in diff --git a/package/x11r7/xdriver_xf86-video-glint/Config.in b/package/x11r7/xdriver_xf86-video-glint/Config.in deleted file mode 100644 index c474f6c912..0000000000 --- a/package/x11r7/xdriver_xf86-video-glint/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT - bool "xf86-video-glint" - depends on BR2_PACKAGE_MESA3D - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XORGPROTO - help - GLINT/Permedia video driver - -comment "xf86-video-glint needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash deleted file mode 100644 index 40474ebc7b..0000000000 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002759.html -sha256 852833ab2ea9ce519195dfd061a6c7aa5945a093cdc19546d1e9e69df7d577d2 xf86-video-glint-1.2.9.tar.bz2 -# Locally calculated -sha256 6ca8e1a7e1d491f3618d3f14df1be64dbc8adefae7bbaf11d4920240dfb12f6e COPYING diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk deleted file mode 100644 index fba0030757..0000000000 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-glint -# -################################################################################ - -XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.9 -XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_GLINT_LICENSE = MIT -XDRIVER_XF86_VIDEO_GLINT_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xorgproto - -$(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:53:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:40 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libfontenc: bump version to 1.1.7 Message-ID: <20230220205156.75BCD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ce4206c9e8871ed02ccb824d584dfff36bbc719 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003285.html https://lists.x.org/archives/xorg-announce/2022-August/003204.html https://lists.x.org/archives/xorg-announce/2022-August/003199.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libfontenc/xlib_libfontenc.hash | 8 +++----- package/x11r7/xlib_libfontenc/xlib_libfontenc.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash b/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash index cf09f61c3e..a061ca4a4b 100644 --- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash +++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002956.html -md5 6447db6a689fb530c218f0f8328c3abc libfontenc-1.1.4.tar.bz2 -sha1 d4f232b0b07487b984e13422ce4130b61a8b9edb libfontenc-1.1.4.tar.bz2 -sha256 2cfcce810ddd48f2e5dc658d28c1808e86dcf303eaff16728b9aa3dbc0092079 libfontenc-1.1.4.tar.bz2 -sha512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582 libfontenc-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003285.html +sha256 c0d36991faee06551ddbaf5d99266e97becdc05edfae87a833c3ff7bf73cfec2 libfontenc-1.1.7.tar.xz +sha512 fd8578a81090fa938dd75ad9081ab62c6c54fa2535d1c6291afd799ac8dc7c344a43f07cea5cd4433af16df0d926c22e7c169877bc8b13d92584e7dec173d701 libfontenc-1.1.7.tar.xz # Locally computed sha256 a4dda7a643b517794bfa23dc9605da030055df38ac8a5b9e1905e690975a59c4 COPYING diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk index a55b90d680..e12086b125 100644 --- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk +++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBFONTENC_VERSION = 1.1.4 -XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.bz2 +XLIB_LIBFONTENC_VERSION = 1.1.7 +XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.xz XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBFONTENC_LICENSE = MIT XLIB_LIBFONTENC_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 20:53:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:41 -0000 Subject: [Buildroot] [git commit branch/next] package/dnsmasq: bump to version 2.88 Message-ID: <20230220205159.B07CD86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c29929c123a2e84e358a08916168d8010fbb3e9d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2022q4/016767.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/dnsmasq/dnsmasq.hash | 4 ++-- package/dnsmasq/dnsmasq.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index 78127ca714..fd015d38ac 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.87.tar.xz.asc -sha256 0228c0364a7f2356fd7e7f1549937cbf3099a78d3b2eb1ba5bb0c31e2b89de7a dnsmasq-2.87.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.88.tar.xz.asc +sha256 23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3 dnsmasq-2.88.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 46a40c4bbb..3945e4256a 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.87 +DNSMASQ_VERSION = 2.88 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" From yann.morin.1998 at free.fr Mon Feb 20 20:53:41 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:41 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xkbcomp: bump version to 1.4.6 Message-ID: <20230220205156.8B649828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38e38370277366777ba850608c38f528f152a1e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003283.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash | 7 +++---- package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash index bccaae6f57..b626e50236 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-March/003075.html -sha256 6851086c4244b6fd0cc562880d8ff193fb2bbf1e141c73632e10731b31d4b05e xkbcomp-1.4.5.tar.bz2 -sha512 2e84f8d6b083e2e818cb95e5d2a184da00e50d71b280e92d1a71465a9a4348f922f4ddccb42cfeee6f76705bbfc8580ef67aedd0d958aaa1ae6bbcc66ccd8154 xkbcomp-1.4.5.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-December/003283.html +sha256 fa50d611ef41e034487af7bd8d8c718df53dd18002f591cca16b0384afc58e98 xkbcomp-1.4.6.tar.xz +sha512 90e69dd1c78c28f77a5acc7821b43afec1b9ac4895bc6f3462b4902baaadc26f3869da69e3bd023b4bc74adb5f1be0c43ca24b3dab37ac9a479c5622684baa81 xkbcomp-1.4.6.tar.xz # Locally computed sha256 6b833fdc05906ce57f016dc791db86830d49ee4da2861ce45806c50b3f4dda9e COPYING diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk index b52f5e6850..61922c7cc9 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XKBCOMP_VERSION = 1.4.5 -XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2 +XAPP_XKBCOMP_VERSION = 1.4.6 +XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.xz XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XKBCOMP_LICENSE = MIT XAPP_XKBCOMP_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 20:53:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:42 -0000 Subject: [Buildroot] [git commit branch/next] package/botan: security bump to version 2.19.3 Message-ID: <20230220205159.9FD8C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f276188ef7967ce8332fb38fdecd98b080b7e3db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-43705: In Botan before 2.19.3, it is possible to forge OCSP responses due to a certificate verification error. This issue was introduced in Botan 1.11.34 (November 2016). https://github.com/randombit/botan/security/advisories/GHSA-4v9w-qvcq-6q7w https://github.com/randombit/botan/blob/2.19.3/news.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/botan/botan.hash | 2 +- package/botan/botan.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/botan/botan.hash b/package/botan/botan.hash index d768c669ea..64da04415e 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 3af5f17615c6b5cd8b832d269fb6cb4d54ec64f9eb09ddbf1add5093941b4d75 Botan-2.19.2.tar.xz +sha256 dae047f399c5a47f087db5d3d9d9e8f11ae4985d14c928d71da1aff801802d55 Botan-2.19.3.tar.xz # Locally computed sha256 472faf6d2231130382779f96de506be19296473750356449fc426ddc9cb03b50 license.txt diff --git a/package/botan/botan.mk b/package/botan/botan.mk index b0ebe594b1..59fbc950b0 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 2.19.2 +BOTAN_VERSION = 2.19.3 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause From yann.morin.1998 at free.fr Mon Feb 20 20:53:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:42 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXv: bump version to 1.0.12 Message-ID: <20230220205156.A17578648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc8b91fdadd8abf22035c127bcd2bbb5961cf43e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003280.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXv/xlib_libXv.hash | 6 +++--- package/x11r7/xlib_libXv/xlib_libXv.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXv/xlib_libXv.hash b/package/x11r7/xlib_libXv/xlib_libXv.hash index a6f7e3d55c..0852f27f8b 100644 --- a/package/x11r7/xlib_libXv/xlib_libXv.hash +++ b/package/x11r7/xlib_libXv/xlib_libXv.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002727.html -sha256 d26c13eac99ac4504c532e8e76a1c8e4bd526471eb8a0a4ff2a88db60cb0b088 libXv-1.0.11.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-December/003280.html +sha256 aaf7fa09f689f7a2000fe493c0d64d1487a1210db154053e9e2336b860c63848 libXv-1.0.12.tar.xz +sha512 bdd00de1ce6a8911056181ab4de32f9e319a68567389162d4bc2e3c9946d5f3c60f87eb6c53f74c9b6a342255e591d5fef4a445a4ac8ca3c1b6fe87d42c51c1e libXv-1.0.12.tar.xz # Locally calculated sha256 4fac4d581d00f11c459d68b7cb970f3d4e5a5bbfb53784d85f59a90076280301 COPYING diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk index 1105b5925d..808b1e6e7b 100644 --- a/package/x11r7/xlib_libXv/xlib_libXv.mk +++ b/package/x11r7/xlib_libXv/xlib_libXv.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXV_VERSION = 1.0.11 -XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2 +XLIB_LIBXV_VERSION = 1.0.12 +XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.xz XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXV_LICENSE = ISC-like XLIB_LIBXV_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:43 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXres: bump version to 1.2.2 Message-ID: <20230220205156.B6B10828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b6ea10c528c1c7b3f6ac7bbba7ba519974b2c3a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003278.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXres/xlib_libXres.hash | 7 +++---- package/x11r7/xlib_libXres/xlib_libXres.mk | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libXres/xlib_libXres.hash b/package/x11r7/xlib_libXres/xlib_libXres.hash index 700590ad8c..2e6d3d5c55 100644 --- a/package/x11r7/xlib_libXres/xlib_libXres.hash +++ b/package/x11r7/xlib_libXres/xlib_libXres.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-March/003078.html -sha256 b6e6fb1ebb61610e56017edd928fb89a5f53b3f4f990078309877468663b2b11 libXres-1.2.1.tar.bz2 -sha512 c17d28406e17e305dc4976f095e88059735f5bd8c600adf2e556523c9e0dd7fa01dcbf7a9d28a642e77e49a5b30f54bb9b2fc34bfbedce467ee2a020bba5cdf1 libXres-1.2.1.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-December/003278.html +sha256 9a7446f3484b9b7538ac5ee30d2c1ce9e5b7fbbaf1440e02f6cca186a1fa745f libXres-1.2.2.tar.xz +sha512 897f2d426ea6f41169a5a52c356d1a1cb2ffb9144ae41b9fedd06455c3d81042930fe55be269ce4b8545ee65fcfe168101192a599053d810e8810f627c94f810 libXres-1.2.2.tar.xz # Locally calculated sha256 0d7300168f85833ea2564835f66a61e036ede90b33e76c06a7b4078096fedbcc COPYING diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk index de3637a04a..25498090fe 100644 --- a/package/x11r7/xlib_libXres/xlib_libXres.mk +++ b/package/x11r7/xlib_libXres/xlib_libXres.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXRES_VERSION = 1.2.1 -XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2 -XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXRES_VERSION = 1.2.2 +XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.xz +XLIB_LIBXRES_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXRES_LICENSE = MIT XLIB_LIBXRES_LICENSE_FILES = COPYING XLIB_LIBXRES_CPE_ID_VENDOR = x From yann.morin.1998 at free.fr Mon Feb 20 20:53:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:43 -0000 Subject: [Buildroot] [git commit branch/next] package/libftdi1: fix static build with libusb and -latomic Message-ID: <20230220205159.E05D486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de82d57b56dd895c7eb56948c631fa30c4935a2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Use pkg-config to retrieve libusb dependencies such as -latomic and avoid the following static build failure raised since bump of libusb to version 1.0.25 in commit aad609936fc83acfe1eac6ffc86d29ac35dcf54e: /nvmedata/autobuild/instance-29/output-1/per-package/libftdi1/host/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /nvmedata/autobuild/instance-29/output-1/per-package/libftdi1/host/sparc-buildroot-linux-uclibc/sysroot/lib/libusb-1.0.a(core.o): in function `libusb_unref_device': /nvmedata/autobuild/instance-29/output-1/build/libusb-1.0.25/libusb/core.c:1186: undefined reference to `__atomic_fetch_add_4' Fixes: - http://autobuild.buildroot.org/results/1ca7cd85ae60ad4797a6d8a83b2fb51d7eab96d9 Signed-off-by: Fabrice Fontaine Reviewed-by: Yegor Yefremov Signed-off-by: Yann E. MORIN --- ...txt-fix-static-build-with-libusb-and-lato.patch | 47 ++++++++++++++++++++++ package/libftdi1/libftdi1.mk | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch b/package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch new file mode 100644 index 0000000000..c818c58d68 --- /dev/null +++ b/package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch @@ -0,0 +1,47 @@ +From b5b8fab6063ad90bb5ef05a72708ecde1796bc81 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 13 May 2022 18:11:50 +0200 +Subject: [PATCH] CMakeLists.txt: fix static build with libusb and -latomic + +Use pkg-config to retrieve libusb dependencies such as -latomic and +avoid the following static build failure: + +/nvmedata/autobuild/instance-29/output-1/per-package/libftdi1/host/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /nvmedata/autobuild/instance-29/output-1/per-package/libftdi1/host/sparc-buildroot-linux-uclibc/sysroot/lib/libusb-1.0.a(core.o): in function `libusb_unref_device': +/nvmedata/autobuild/instance-29/output-1/build/libusb-1.0.25/libusb/core.c:1186: undefined reference to `__atomic_fetch_add_4' + +Fixes: + - http://autobuild.buildroot.org/results/1ca7cd85ae60ad4797a6d8a83b2fb51d7eab96d9 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +http://developer.intra2net.com/git/?p=libftdi;a=commit;h=b5b8fab6063ad90bb5ef05a72708ecde1796bc81] +--- + CMakeLists.txt | 12 ++++++++++-- + 1 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 58f664a..d20aa94 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,8 +25,16 @@ if(${CMAKE_BUILD_TYPE} STREQUAL Debug) + endif(${CMAKE_BUILD_TYPE} STREQUAL Debug) + + # find libusb +-find_package ( USB1 REQUIRED ) +-include_directories ( ${LIBUSB_INCLUDE_DIR} ) ++find_package( PkgConfig ) ++if (PkgConfig_FOUND) ++ pkg_check_modules( LIBUSB libusb-1.0 ) ++ if (LIBUSB_FOUND) ++ include_directories ( ${LIBUSB_INCLUDE_DIRS} ) ++ else() ++ find_package ( USB1 REQUIRED ) ++ include_directories ( ${LIBUSB_INCLUDE_DIR} ) ++ endif() ++endif() + + # Find Boost + if (FTDIPP OR BUILD_TESTS) +-- +1.7.1 + diff --git a/package/libftdi1/libftdi1.mk b/package/libftdi1/libftdi1.mk index d2e3f42e14..66798addc4 100644 --- a/package/libftdi1/libftdi1.mk +++ b/package/libftdi1/libftdi1.mk @@ -8,7 +8,7 @@ LIBFTDI1_VERSION = 1.5 LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2 LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download LIBFTDI1_INSTALL_STAGING = YES -LIBFTDI1_DEPENDENCIES = libusb +LIBFTDI1_DEPENDENCIES = host-pkgconf libusb LIBFTDI1_LICENSE = LGPL-2.1 (libftdi1), MIT (libftdi1) LIBFTDI1_LICENSE_FILES = LICENSE COPYING.LIB LIBFTDI1_CONFIG_SCRIPTS = libftdi1-config From yann.morin.1998 at free.fr Mon Feb 20 20:53:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:44 -0000 Subject: [Buildroot] [git commit branch/next] package/optee-client: bump to version 3.19.0 Message-ID: <20230220205200.1101886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=917a961d9c77d5f1aaa47206add9b9ff80e74a82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bumps OP-TEE client package version to OP-TEE release 3.19.0. This package introduces a mandatory dependency on util-linux and pk-config packages that were made optional in commit [1], following 3.19.0 release tag. The dependency is related to new library teeacl for access control list based login identification. This change picks that commit and defines the dependency only when TEEACL library is to be embedded. The patch will be removed once we dump to the next OP-TEE release tag, as state by new BR2 boolean config switch BR2_PACKAGE_OPTEE_CLIENT_TEEACL. Signed-off-by: Etienne Carriere [yann.morin.1998 at free.fr: - actually backport upstream commit - don't default y for BR2_PACKAGE_OPTEE_CLIENT_TEEACL - select util-linux instead of depending on it - don't select util-linux-libs, there's no circular deps - squash both conditions together in .mk - fix check-package ] Signed-off-by: Yann E. MORIN --- ...eacl-condition-libteeacl-with-WITH_TEEACL.patch | 105 +++++++++++++++++++++ package/optee-client/Config.in | 8 ++ package/optee-client/optee-client.hash | 4 +- package/optee-client/optee-client.mk | 9 +- 4 files changed, 123 insertions(+), 3 deletions(-) diff --git a/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch b/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch new file mode 100644 index 0000000000..4fdf9afc94 --- /dev/null +++ b/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch @@ -0,0 +1,105 @@ +From bbdf665aba39c29a3ce7bd06e4554c62a416ebaa Mon Sep 17 00:00:00 2001 +From: Etienne Carriere +Date: Thu, 10 Nov 2022 12:05:24 +0100 +Subject: [PATCH] libteeacl: condition libteeacl with WITH_TEEACL + +Build and embed libteeacl upon WITH_TEEACL=1 (default configuration). +This configuration switch allows one to build OP-TEE client without +dependencies on pkg-config and libuuid when OP-TEE ACL for +PKCS11 is not needed: + cmake -DWITH_TEEACL=0 ... +or + make WITH_TEEACL=0 ... + +With the comments below addressed, LGTM. + +Acked-by: Jerome Forissier +Acked-by: Jens Wiklander +Reviewed-by: Eero Aaltonen +[etienne.carriere at linaro.org: backport upstream commit] +Signed-off-by: Etienne Carriere +[yann.morin.1998 at free.fr: actually do a backport of bbdf665] +Signed-off-by: Yann E. MORIN +--- + CMakeLists.txt | 9 ++++++--- + Makefile | 15 ++++++++++++--- + 2 files changed, 18 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0786752..9fb5c6a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,7 @@ project (optee_client C) + set (CMAKE_TOOLCHAIN_FILE CMakeToolchain.txt) + + set (CFG_WERROR 1 CACHE BOOL "Build with -Werror") ++option (WITH_TEEACL "Build libteeacl" TRUE) + + include(GNUInstallDirs) + +@@ -37,7 +38,9 @@ add_subdirectory (libteec) + add_subdirectory (tee-supplicant) + add_subdirectory (public) + add_subdirectory (libckteec) +-find_package (PkgConfig REQUIRED) +-pkg_check_modules(uuid REQUIRED IMPORTED_TARGET uuid) +-add_subdirectory (libteeacl) ++if(WITH_TEEACL) ++ find_package (PkgConfig REQUIRED) ++ pkg_check_modules(uuid REQUIRED IMPORTED_TARGET uuid) ++ add_subdirectory (libteeacl) ++endif(WITH_TEEACL) + add_subdirectory (libseteec) +diff --git a/Makefile b/Makefile +index 90b487e..2ee5621 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,6 +16,8 @@ SBINDIR ?= /usr/sbin + LIBDIR ?= /usr/lib + INCLUDEDIR ?= /usr/include + ++WITH_TEEACL ?= 1 ++ + .PHONY: all build build-libteec build-libckteec build-libseteec \ + build-libteeacl check-libuuid install copy_export clean cscope \ + clean-cscope \ +@@ -35,8 +37,10 @@ build-tee-supplicant: build-libteec + @echo "Building tee-supplicant" + $(MAKE) --directory=tee-supplicant --no-print-directory --no-builtin-variables CFG_TEE_SUPP_LOG_LEVEL=$(CFG_TEE_SUPP_LOG_LEVEL) + +-build: build-libteec build-tee-supplicant build-libckteec build-libseteec \ +- build-libteeacl ++build: build-libteec build-tee-supplicant build-libckteec build-libseteec ++ifeq ($(WITH_TEEACL),1) ++build: build-libteeacl ++endif + + build-libckteec: build-libteec + @echo "Building libckteec.so" +@@ -57,7 +61,10 @@ check-libuuid: + install: copy_export + + clean: clean-libteec clean-tee-supplicant clean-cscope clean-libckteec \ +- clean-libseteec clean-libteeacl ++ clean-libseteec ++ifeq ($(WITH_TEEACL),1) ++clean: clean-libteeacl ++endif + + clean-libteec: + @$(MAKE) --directory=libteec --no-print-directory clean +@@ -158,9 +165,11 @@ copy_export: build + cp libckteec/include/*.h $(DESTDIR)$(INCLUDEDIR) + cp -d ${O}/libckteec/libckteec.so* $(DESTDIR)$(LIBDIR) + cp -d ${O}/libckteec/libckteec.a $(DESTDIR)$(LIBDIR) ++ifeq ($(WITH_TEEACL),1) + cp libteeacl/include/*.h $(DESTDIR)$(INCLUDEDIR) + cp -d ${O}/libteeacl/libteeacl.so* $(DESTDIR)$(LIBDIR) + cp -d ${O}/libteeacl/libteeacl.a $(DESTDIR)$(LIBDIR) ++endif + cp libseteec/include/*.h $(DESTDIR)$(INCLUDEDIR) + cp -d ${O}/libseteec/libseteec.so* $(DESTDIR)$(LIBDIR) + cp -d ${O}/libseteec/libseteec.a $(DESTDIR)$(LIBDIR) +-- +2.25.1 + diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in index cc7f176c77..538948b72c 100644 --- a/package/optee-client/Config.in +++ b/package/optee-client/Config.in @@ -37,6 +37,14 @@ config BR2_PACKAGE_OPTEE_CLIENT_SUPP_PLUGINS help Enable TEE supplicant plugin support. +config BR2_PACKAGE_OPTEE_CLIENT_TEEACL + bool "Enable TEE Access Control List login" + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Enable TEE ACL login identification for OP-TEE service that + supports them as OP-TEE PKCS#11 services. + endif comment "optee-client needs a toolchain w/ threads, headers >= 4.3" diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 8e55bf5725..c067e26f4e 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.18.0/optee-client-3.18.0.tar.gz -sha256 ecc0f04fdd5398aa52fea50427fbd624f7f90274aec7bbf2cc8a5bd16758202b optee-client-3.18.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.19.0/optee-client-3.19.0.tar.gz +sha256 5f0d02efa0e496964e86ca9dd2461ada923d1f9e11a4b9cafb5393bd08337644 optee-client-3.19.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 3fbbe9484c..3e0c9269b8 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.18.0 +OPTEE_CLIENT_VERSION = 3.19.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE @@ -26,6 +26,13 @@ else OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF endif +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y) +OPTEE_CLIENT_EXT_DEPENDENCIES += host-pkgconf util-linux-libs +OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=ON +else +OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=OFF +endif + define OPTEE_CLIENT_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30tee-supplicant \ $(TARGET_DIR)/etc/init.d/S30tee-supplicant From yann.morin.1998 at free.fr Mon Feb 20 20:53:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:45 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXdamage: bump version to 1.1.6 Message-ID: <20230220205156.C1BD08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bac3d21a3fb3ef872b538adda01725c2fb77dd75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003277.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXdamage/xlib_libXdamage.hash | 8 +++----- package/x11r7/xlib_libXdamage/xlib_libXdamage.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash b/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash index 9e7cf566a7..41a809ad23 100644 --- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash +++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002973.html -md5 e3f554267a7a04b042dc1f6352bd6d99 libXdamage-1.1.5.tar.bz2 -sha1 719ae6ab8c1b972c6386b654976c479255af5572 libXdamage-1.1.5.tar.bz2 -sha256 b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45 libXdamage-1.1.5.tar.bz2 -sha512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124 libXdamage-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003277.html +sha256 52733c1f5262fca35f64e7d5060c6fcd81a880ba8e1e65c9621cf0727afb5d11 libXdamage-1.1.6.tar.xz +sha512 624dcefa1c79064569df952892f7f1351dc19ad338ce73d1a57041e406cb3e18abe531bab352b93d1f0f5c9b5c6b2652cc84a8f1fbfcbba648343812695a8acb libXdamage-1.1.6.tar.xz # Locally computed sha256 33effe928634be12e668465c3935c5570ff2787b970b15d9243d69df42302c57 COPYING diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk index cc5493ff6c..dba0862211 100644 --- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk +++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXDAMAGE_VERSION = 1.1.5 -XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.bz2 -XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXDAMAGE_VERSION = 1.1.6 +XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.xz +XLIB_LIBXDAMAGE_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXDAMAGE_LICENSE = MIT XLIB_LIBXDAMAGE_LICENSE_FILES = COPYING XLIB_LIBXDAMAGE_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:53:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:45 -0000 Subject: [Buildroot] [git commit branch/next] package/gnuradio: restrict gcc to >= 8 Message-ID: <20230220205200.416BC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34cea39024bf8dedaa071bc5f2d903755501215c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next With gnuradio 3.10 boost/filesystem was replaced by std::filesystem. This feature was introduced with gcc 8 (requirering -lstdc++fs (with gcc 9 explicit -lstdc++fs is no more explicitely required)). With gcc < 8 build fails with error: In file included from /home/br-user/work/instance-0/output-1/host/aarch64_be-buildroot-linux-gnu/sysroot/usr/include/boost/dll/runtime_symbol_info.hpp:11:0, from /home/br-user/work/instance-0/output-1/build/gnuradio-3.10.4.0/buildroot-build/gnuradio-runtime/lib/constants.cc:16: /home/br-user/work/instance-0/output-1/host/aarch64_be-buildroot-linux-gnu/sysroot/usr/include/boost/dll/config.hpp:42:10: fatal error: filesystem: No such file or directory #include ^~~~~~~~~~~~ compilation terminated. Add a dependency to gcc >= 8. BR2_TOOLCHAIN_HAS_GCC_BUG_64735 only affects gcc <7, so we drop it. Adding this restriction on gcc >= 8 also covers the dependency for volk, which requires gcc >= 7, which was not propagated to gnuradio so far. Tested with bootlin toolchain 2020.02-2 (gcc 8.3.0) Fixes: - http://autobuild.buildroot.net/results/6a82605c58f9ef9eb6c14603777dd8523dd00aa5/ - http://autobuild.buildroot.net/results/c7c4ae76954e388ab639b39fd521d90acfe4edc9/ Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Yann E. MORIN --- package/gnuradio/Config.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index de19732cfb..1824589263 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -1,12 +1,12 @@ -comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library" +comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 -comment "gnuradio needs a toolchain not affected by GCC bug 43744 and 64735" +comment "gnuradio needs a toolchain not affected by GCC bug 43744" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 config BR2_PACKAGE_GNURADIO bool "gnuradio" @@ -16,8 +16,8 @@ config BR2_PACKAGE_GNURADIO depends on BR2_USE_MMU # use fork() depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic, boost-thread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744 - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_DATE_TIME From yann.morin.1998 at free.fr Mon Feb 20 20:53:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:46 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-r128: bump version to 6.12.1 Message-ID: <20230220205156.D673086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4df6b365b77c3838858b43c201f0e2af4db7a498 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003275.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash | 8 +++----- package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash index 455c3d4439..cf9b21ebe8 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-October/002926.html -md5 105ebcfe1bac06fe84645ac3def91184 xf86-video-r128-6.12.0.tar.bz2 -sha1 7cfa41d386fa43b5d30299203e4845d8afba4899 xf86-video-r128-6.12.0.tar.bz2 -sha256 801c86882cbd2bbb3084d471dcc5cfee2c1754dcbfb4dc446676d58a6bd9e057 xf86-video-r128-6.12.0.tar.bz2 -sha512 0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38 xf86-video-r128-6.12.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003275.html +sha256 7d023c2b171f1664e43d12a1d21674079d8065536f82bb95b448bfce4981c741 xf86-video-r128-6.12.1.tar.xz +sha512 18b2408fe68161c32f84c7147717f8e6c6377e81e9d59e2f098843c54cd0ae757aab5059568da8c71ef38100807d56ee22447417c236c1b3deea292bb676e700 xf86-video-r128-6.12.1.tar.xz # Locally computed sha256 69f7c71859dc8f51aabdbe7a9ee915a480933eb81658f8af2bf4c918e65afe8b COPYING diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk index 1931dbecd7..49514e3d3a 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_R128_VERSION = 6.12.0 -XDRIVER_XF86_VIDEO_R128_SOURCE = xf86-video-r128-$(XDRIVER_XF86_VIDEO_R128_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_R128_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_R128_VERSION = 6.12.1 +XDRIVER_XF86_VIDEO_R128_SOURCE = xf86-video-r128-$(XDRIVER_XF86_VIDEO_R128_VERSION).tar.xz +XDRIVER_XF86_VIDEO_R128_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_R128_LICENSE = MIT XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xorgproto From yann.morin.1998 at free.fr Mon Feb 20 20:53:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:46 -0000 Subject: [Buildroot] [git commit branch/next] package/optee-test: bump to version 3.19.0 Message-ID: <20230220205200.291E686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4744cfb703908eb027e479633508fc498fda667e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bumps OP-TEE test package version to OP-TEE release 3.19.0. Signed-off-by: Etienne Carriere Signed-off-by: Yann E. MORIN --- 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 2af1768155..4da3807bb5 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.18.0/optee-test-3.18.0.tar.gz -sha256 cc36a9afb99bd299a3d3769ad634ab7d5cb0e27c84ad04e14c0ff593db0f3faf optee-test-3.18.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.19.0/optee-test-3.19.0.tar.gz +sha256 9435901e9329a25ef4de3904e27d80377b8bb4dd6b215e8fb29d66a7b76afa11 optee-test-3.19.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 d522bb3300..7b065b6123 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.18.0 +OPTEE_TEST_VERSION = 3.19.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 Mon Feb 20 20:53:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:46 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xstdcmap: bump version to 1.0.5 Message-ID: <20230220205156.EF8198648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=481860051016bbaab467621e5651500327f4f004 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003272.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash | 8 +++----- package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash index 3f601c7249..028980bdca 100644 --- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash +++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002954.html -md5 da67142c128d18386ff145882e0afc66 xstdcmap-1.0.4.tar.bz2 -sha1 a5eff72ba31625e5b11506add800140019a39636 xstdcmap-1.0.4.tar.bz2 -sha256 06898b3f1eaad0b205ff3c75bdefa3207868b889d4cb37b32b8267b2bbfe6f8b xstdcmap-1.0.4.tar.bz2 -sha512 2adbb0aec1766341e04090efa962241ff6c9e32c612851b7221cec0ee16852107d406a08ec5251070f39df882c13e3c8c9edcd88f278187a9f373e1727643a8f xstdcmap-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003272.html +sha256 365847e379398499ec9ad9a299cc47a0d6e7feba9546dfd4e5b422204b5ac180 xstdcmap-1.0.5.tar.xz +sha512 3f2047af1d328a34d38ededc13de00298db3300eab1d1dbdff7d2aa4a3cd543a79305bfbd2e6424c5e023cf866a4f7a70aa9a3014444d543268d2f812a322a49 xstdcmap-1.0.5.tar.xz # Locally computed sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk index dd5b0ee349..60825556e7 100644 --- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk +++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XSTDCMAP_VERSION = 1.0.4 -XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.bz2 -XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XSTDCMAP_VERSION = 1.0.5 +XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.xz +XAPP_XSTDCMAP_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XSTDCMAP_LICENSE = MIT XAPP_XSTDCMAP_LICENSE_FILES = COPYING XAPP_XSTDCMAP_DEPENDENCIES = xlib_libX11 xlib_libXmu From peter at korsgaard.com Mon Feb 20 20:53:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:47 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.02.8 Message-ID: <20230220205200.7006886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e84a88e8e2ed7873fbf5362d2d8b5bcd75634af7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard (cherry picked from commit ea51485ee9ab44f72f8b1cc019dcb17f276d1def) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGES b/CHANGES index 312e324ef7..6de79c7d35 100644 --- a/CHANGES +++ b/CHANGES @@ -530,6 +530,22 @@ #14731: BR2_PACKAGE_IOSTAT #14751: LVM2 Outdated Link +2022.02.8, released December 10th, 2022 + + Important / security related fixes. + + Updated/fixed packages: asterisk, dash, dovecot, + dovecot-pigeonhole, edk2, edk2-platforms, elf2flt, exim, + freerdp, gcc, gdb, git, gnupg2, heimdal, iwd, kodi, + libarchive, libmdbx, libkrb5, libksba, libopenssl, memcached, + netsnmp, nginx, openpgm, optee-client, python3, rsync, + rtl8723bu, samba4, sdl, sdl2, swupdate, sysstat, systemd, + uboot, vim, vlc, xen, xterm + + Issues resolved (http://bugs.uclibc.org): + + #15131: Target GDB uses internal zlib + 2022.02.7, released November 17th, 2022 Important / security related fixes. From yann.morin.1998 at free.fr Mon Feb 20 20:53:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:47 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xrandr: bump version to 1.5.2 Message-ID: <20230220205157.14F6C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=835918d8e8e34ee298580c4da5e57bf0f925f708 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003270.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xrandr/xapp_xrandr.hash | 8 +++----- package/x11r7/xapp_xrandr/xapp_xrandr.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.hash b/package/x11r7/xapp_xrandr/xapp_xrandr.hash index 4c68dcbb71..a407326bb8 100644 --- a/package/x11r7/xapp_xrandr/xapp_xrandr.hash +++ b/package/x11r7/xapp_xrandr/xapp_xrandr.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-August/003018.html -md5 fe40f7a4fd39dd3a02248d3e0b1972e4 xrandr-1.5.1.tar.xz -sha1 9f72957e0d2a26ece509336ea7e1529cc9ea881e xrandr-1.5.1.tar.xz -sha256 7bc76daf9d72f8aff885efad04ce06b90488a1a169d118dea8a2b661832e8762 xrandr-1.5.1.tar.xz -sha512 3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922 xrandr-1.5.1.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003270.html +sha256 c8bee4790d9058bacc4b6246456c58021db58a87ddda1a9d0139bf5f18f1f240 xrandr-1.5.2.tar.xz +sha512 b536e8f1e04094894aa52ae496725c58691b043860b3327c41d737b07b642a939733321b62f698032b11ba857208a6177600a3ca3295ff1be6ade4341cdc2747 xrandr-1.5.2.tar.xz # Locally computed sha256 0dd9a3d62c48dd7b87790029e39fb5e11756d33fded3bc1644e11585c87b2038 COPYING diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk index 8586c6feb3..d6b39b51d0 100644 --- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk +++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XRANDR_VERSION = 1.5.1 +XAPP_XRANDR_VERSION = 1.5.2 XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.xz -XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XRANDR_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XRANDR_LICENSE = MIT XAPP_XRANDR_LICENSE_FILES = COPYING XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11 From yann.morin.1998 at free.fr Mon Feb 20 20:53:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:50 -0000 Subject: [Buildroot] [git commit branch/next] package/davfs2: bump to version 1.7.0 Message-ID: <20230220205200.CBE2C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76423bd3a657f0ca197e2301bbb21e4fc9eee992 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://savannah.nongnu.org/forum/forum.php?forum_id=10244 https://git.savannah.nongnu.org/cgit/davfs2.git/tree/ChangeLog?h=rel-1-7-0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/davfs2/davfs2.hash | 2 +- package/davfs2/davfs2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/davfs2/davfs2.hash b/package/davfs2/davfs2.hash index a555779dbc..1cbacc388f 100644 --- a/package/davfs2/davfs2.hash +++ b/package/davfs2/davfs2.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ce3eb948ece582a51c934ccb0cc70e659839172717caff173f69a5e2af90c5c0 davfs2-1.6.1.tar.gz +sha256 251db75a27380cca1330b1b971700c5e5dcc0c90e5a47622285f0140edfe3a2f davfs2-1.7.0.tar.gz # License file, locally calculated sha256 0ae0485a5bd37a63e63603596417e4eb0e653334fa6c7f932ca3a0e85d4af227 COPYING diff --git a/package/davfs2/davfs2.mk b/package/davfs2/davfs2.mk index 42192faa59..a67c506250 100644 --- a/package/davfs2/davfs2.mk +++ b/package/davfs2/davfs2.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAVFS2_VERSION = 1.6.1 +DAVFS2_VERSION = 1.7.0 DAVFS2_SITE = http://download.savannah.nongnu.org/releases/davfs2 DAVFS2_LICENSE = GPL-3.0+ DAVFS2_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:50 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xdm: bump version to 1.1.14 Message-ID: <20230220205157.4D2498648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42c8fe191473193c0854bd8a641c046d4f149a97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003265.html xlib_libXinerama is an optional dependency now. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xdm/Config.in | 1 - package/x11r7/xapp_xdm/xapp_xdm.hash | 6 +++--- package/x11r7/xapp_xdm/xapp_xdm.mk | 12 +++++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xapp_xdm/Config.in b/package/x11r7/xapp_xdm/Config.in index af816a1349..1ac15ce368 100644 --- a/package/x11r7/xapp_xdm/Config.in +++ b/package/x11r7/xapp_xdm/Config.in @@ -8,7 +8,6 @@ config BR2_PACKAGE_XAPP_XDM select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAW select BR2_PACKAGE_XLIB_LIBXDMCP - select BR2_PACKAGE_XLIB_LIBXINERAMA select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XORGPROTO help diff --git a/package/x11r7/xapp_xdm/xapp_xdm.hash b/package/x11r7/xapp_xdm/xapp_xdm.hash index 5ba3a3f062..daf1b0852f 100644 --- a/package/x11r7/xapp_xdm/xapp_xdm.hash +++ b/package/x11r7/xapp_xdm/xapp_xdm.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003148.html -sha256 e58267e8f1478f2f5cd57cbcf2367a36973860c3131a450a3e0816585af03264 xdm-1.1.13.tar.xz -sha512 1c7ba51dc8c6989ff6ede3a3abd06e002903609d4ebd31f06ec39fbfee3a80a690c6180f85c3ab135a0de4623261d92a191d1ca5f733cdb3bd2e7e78977b98e5 xdm-1.1.13.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003265.html +sha256 3e9bf25636797ec9e595286dd6820ecc33901439f07705eaf608ecda012c3d5f xdm-1.1.14.tar.xz +sha512 8ed1d2c946916c24cb4b2de9326f65629c97e53b145312c9cb9c6e4308d8b47d67d3981319fbd4feac9b3ed436b9dfb24a1c905d37d7bcf07b49c18a68c7a6e4 xdm-1.1.14.tar.xz # Locally computed sha256 b33b4bebbd6511b3e15315e8e29d67f25334ee45da8b7da6e6e97c53a70c6923 COPYING diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk index 98306f66f5..035f2e9484 100644 --- a/package/x11r7/xapp_xdm/xapp_xdm.mk +++ b/package/x11r7/xapp_xdm/xapp_xdm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDM_VERSION = 1.1.13 +XAPP_XDM_VERSION = 1.1.14 XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.xz -XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDM_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDM_LICENSE = MIT XAPP_XDM_LICENSE_FILES = COPYING XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes @@ -16,7 +16,6 @@ XAPP_XDM_DEPENDENCIES = \ xlib_libX11 \ xlib_libXaw \ xlib_libXdmcp \ - xlib_libXinerama \ xlib_libXt \ xorgproto XAPP_XDM_CONF_OPTS = \ @@ -24,6 +23,13 @@ XAPP_XDM_CONF_OPTS = \ --with-utmp-file=/var/adm/utmpx \ --with-wtmp-file=/var/adm/wtmpx +ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) +XAPP_XDM_CONF_OPTS += --with-xinerama +XAPP_XDM_DEPENDENCIES += xlib_libXinerama +else +XAPP_XDM_CONF_OPTS += --without-xinerama +endif + define XAPP_XDM_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/x11r7/xapp_xdm/S99xdm \ $(TARGET_DIR)/etc/init.d/S99xdm From yann.morin.1998 at free.fr Mon Feb 20 20:53:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:51 -0000 Subject: [Buildroot] [git commit branch/next] package/python-installer: bump to version 0.6.0 Message-ID: <20230220205200.D90E086496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=689649251ff598adb79df393353d7fa1ea14f364 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 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 543bd0fa62..97d455b87c 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 bf17db5e6b58c4cfa33642f5348d3814 installer-0.5.1.tar.gz -sha256 f970995ec2bb815e2fdaf7977b26b2091e1e386f0f42eafd5ac811953dc5d445 installer-0.5.1.tar.gz +md5 ac5fee994b04f228c151306f5ad96b04 installer-0.6.0.tar.gz +sha256 f3bd36cd261b440a88a1190b1becca0578fee90b4b62decc796932fdd5ae8839 installer-0.6.0.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 08f17499dd..3430e46b51 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INSTALLER_VERSION = 0.5.1 +PYTHON_INSTALLER_VERSION = 0.6.0 PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz -PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 +PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/c9/ab/a9141dc175ec7b620fffe7e0295251a7b6a0ffb4325d64aeb128dff8c698 PYTHON_INSTALLER_LICENSE = MIT PYTHON_INSTALLER_LICENSE_FILES = LICENSE PYTHON_INSTALLER_SETUP_TYPE = flit-bootstrap From yann.morin.1998 at free.fr Mon Feb 20 20:53:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:52 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXpm: bump version to 3.5.14 Message-ID: <20230220205157.7148B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d2fff78049392f2dae82f5ea9f5a0dbac225f4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003261.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 8 +++----- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index edfdaab335..9ccfb4c8de 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,8 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-December/003034.html -md5 6f0ecf8d103d528cfc803aa475137afa libXpm-3.5.13.tar.bz2 -sha1 38b1a2728adb49f4e255aba1530f51789815ffc4 libXpm-3.5.13.tar.bz2 -sha256 9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25 libXpm-3.5.13.tar.bz2 -sha512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5 libXpm-3.5.13.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003261.html +sha256 f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2 libXpm-3.5.14.tar.xz +sha512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz # Locally calculated sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 7b645dc9e6..417dcfec38 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.13 -XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2 -XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXPM_VERSION = 3.5.14 +XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz +XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project From yann.morin.1998 at free.fr Mon Feb 20 20:53:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:52 -0000 Subject: [Buildroot] [git commit branch/next] package/ulogd: bump to version 2.0.8 Message-ID: <20230220205200.C0A8286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6fc4b59ffd3007ca9e436d33647acc5dfff62970 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patch (already in version) - Update configure options due to https://git.netfilter.org/ulogd2/commit/?id=794f0385ab60fd8c52ff3ce498c8aac78b58ac20 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-ulogd-fix-build-with-musl-libc.patch | 32 ---------------------- package/ulogd/ulogd.hash | 6 ++-- package/ulogd/ulogd.mk | 26 +++++++++--------- 3 files changed, 15 insertions(+), 49 deletions(-) diff --git a/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch b/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch deleted file mode 100644 index af6e13648c..0000000000 --- a/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 675e762091380590f78ff07a94a25caa459b786b Mon Sep 17 00:00:00 2001 -From: Cameron Norman -Date: Sat, 27 Oct 2018 13:05:45 -0700 -Subject: ulogd: fix build with musl libc - -The attached patch fixes building ulogd2 with musl libc. It is being -used on Void Linux right now. - -Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1278 -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Fabrice Fontaine -[Retrrieved from: -https://git.netfilter.org/ulogd2/commit/?id=675e762091380590f78ff07a94a25caa459b786b] ---- - src/ulogd.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ulogd.c b/src/ulogd.c -index b8bc57c..9cd64e8 100644 ---- a/src/ulogd.c -+++ b/src/ulogd.c -@@ -65,6 +65,7 @@ - #include - #include - #include -+#include - #include - #include - #ifdef DEBUG --- -cgit v1.2.1 - diff --git a/package/ulogd/ulogd.hash b/package/ulogd/ulogd.hash index 0e07a714ee..35b518b9ce 100644 --- a/package/ulogd/ulogd.hash +++ b/package/ulogd/ulogd.hash @@ -1,7 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.7.tar.bz2.{md5sum,sha1sum} -md5 2bb2868cf51acbb90c35763c9f995f31 ulogd-2.0.7.tar.bz2 -sha1 f2d90469e2842e2bfbe19c55cf6d56ac107aa4b9 ulogd-2.0.7.tar.bz2 +# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.8.tar.bz2.sha256sum +sha256 4ead6c3970c3f57fa1e89fe2d7cc483ba6fe2bd1b08701521e0b3afd667df291 ulogd-2.0.8.tar.bz2 # Locally calculated -sha256 990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b ulogd-2.0.7.tar.bz2 sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index c00a53f3d5..65280a2ba6 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -4,10 +4,10 @@ # ################################################################################ -ULOGD_VERSION = 2.0.7 +ULOGD_VERSION = 2.0.8 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files -ULOGD_CONF_OPTS = --without-dbi +ULOGD_CONF_OPTS = --disable-dbi ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ libnfnetlink @@ -18,39 +18,39 @@ ULOGD_SELINUX_MODULES = ulogd # DB backends need threads ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) ifeq ($(BR2_PACKAGE_MYSQL),y) -ULOGD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr +ULOGD_CONF_OPTS += --enable-mysql ULOGD_DEPENDENCIES += mysql else -ULOGD_CONF_OPTS += --without-mysql +ULOGD_CONF_OPTS += --disable-mysql endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) -ULOGD_CONF_OPTS += --with-pgsql +ULOGD_CONF_OPTS += --enable-pgsql ULOGD_DEPENDENCIES += postgresql else -ULOGD_CONF_OPTS += --without-pgsql +ULOGD_CONF_OPTS += --disable-pgsql endif ifeq ($(BR2_PACKAGE_SQLITE),y) -ULOGD_CONF_OPTS += --with-sqlite +ULOGD_CONF_OPTS += --enable-sqlite3 ULOGD_DEPENDENCIES += sqlite else -ULOGD_CONF_OPTS += --without-sqlite +ULOGD_CONF_OPTS += --disable-sqlite3 endif else -ULOGD_CONF_OPTS += --without-mysql --without-pgsql --without-sqlite +ULOGD_CONF_OPTS += --disable-mysql --disable-pgsql --disable-sqlite3 endif ifeq ($(BR2_PACKAGE_LIBPCAP),y) -ULOGD_CONF_OPTS += --with-pcap +ULOGD_CONF_OPTS += --enable-pcap ULOGD_DEPENDENCIES += libpcap else -ULOGD_CONF_OPTS += --without-pcap +ULOGD_CONF_OPTS += --disable-pcap endif ifeq ($(BR2_PACKAGE_JANSSON),y) -ULOGD_CONF_OPTS += --with-jansson +ULOGD_CONF_OPTS += --enable-json ULOGD_DEPENDENCIES += jansson else -ULOGD_CONF_OPTS += --without-jansson +ULOGD_CONF_OPTS += --disable-json endif $(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:53:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:53 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXdmcp: bump version to 1.1.4 Message-ID: <20230220205157.7C82281979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=723eff5808451188ddc097aafc17e6969b849e57 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003260.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash | 8 +++----- package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash index 9f7f968350..83609413fd 100644 --- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash +++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002974.html -md5 115c5c12ecce0e749cd91d999a5fd160 libXdmcp-1.1.3.tar.bz2 -sha1 0a8f8a274f829331efb1e8e2027c38631b204dd0 libXdmcp-1.1.3.tar.bz2 -sha256 20523b44aaa513e17c009e873ad7bbc301507a3224c232610ce2e099011c6529 libXdmcp-1.1.3.tar.bz2 -sha512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec libXdmcp-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003260.html +sha256 2dce5cc317f8f0b484ec347d87d81d552cdbebb178bd13c5d8193b6b7cd6ad00 libXdmcp-1.1.4.tar.xz +sha512 83b384d43bfb034c395f83f97d1c6e73aa3d5faa8f8756b08e697c0b9c3c87189651b51e8213fbd1f5f9cbc2d8136cbf143627481744345d78cfe0ff2ad074a9 libXdmcp-1.1.4.tar.xz # Locally computed sha256 8a3c3f35b0dbcb60a4e242b9e4394a352a65bb27deb2938ea1e2e62a626e16e9 COPYING diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk index 51db9908e5..a79e2615db 100644 --- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk +++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXDMCP_VERSION = 1.1.3 -XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2 -XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXDMCP_VERSION = 1.1.4 +XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.xz +XLIB_LIBXDMCP_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXDMCP_LICENSE = MIT XLIB_LIBXDMCP_LICENSE_FILES = COPYING XLIB_LIBXDMCP_CPE_ID_VENDOR = x.org From yann.morin.1998 at free.fr Mon Feb 20 20:53:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:53 -0000 Subject: [Buildroot] [git commit branch/next] package/python-can: bump to version 4.1.0 Message-ID: <20230220205201.182B4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09c966af735ca53b447f52965d123c21e43ae522 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop spurious setuptools runtime dependency. Add new msgpack runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-can/Config.in | 2 +- package/python-can/python-can.hash | 5 +++-- package/python-can/python-can.mk | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index e92d9668e0..5d21e29d88 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_AENUM # runtime + select BR2_PACKAGE_PYTHON_MSGPACK # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime select BR2_PACKAGE_PYTHON_WRAPT # runtime diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index dd8a9b107d..73be230201 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/python-can -sha256 59d92846ffb981e634e9e0f2d14a6b4967a875e3869bd2ba168c92c4db6b8b5d python-can-4.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/python-can/json +md5 d8365b7a09e49f47dac0da75d8518808 python-can-4.1.0.tar.gz +sha256 3f2b6b0dc5f459591d171ee0c0136dce79acedc2740ce695024aa3444e911bb9 python-can-4.1.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 9284a9cf99..ba98337d5d 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 4.0.0 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/1f/f7/a643cba269d59e108fe4c1854a8e71d5cdadadd4de1b9c8862b190171122 +PYTHON_CAN_VERSION = 4.1.0 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/90/55/898e69e37d5d4692bf21ba8750e095493d2ecbb29be7394d5cb735f0ab0f PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Mon Feb 20 20:53:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:54 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xlsatoms: bump version to 1.1.4 Message-ID: <20230220205157.926BC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b0c8c6aee402bc6e9128bc8bb535ad1ef1f2fc5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003258.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash | 8 +++----- package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash index 21484fdcdf..be9ed6f0b4 100644 --- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash +++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002951.html -md5 61671fee12535347db24ec3a715032a7 xlsatoms-1.1.3.tar.bz2 -sha1 9fdb1e8df6bb08529a812ac90f63d500bf5174cc xlsatoms-1.1.3.tar.bz2 -sha256 57868f958c263976727881f3078e55b86b4a109dc578d2b92f5c6d690850a382 xlsatoms-1.1.3.tar.bz2 -sha512 c267ccfdc5a83e834bfb5c3b144e22642badcadef4eb146eeec2df6fe6f85e9379500ae4219912c70fa2e535036a1a96cf496381f5d814e79af075e03c975f30 xlsatoms-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003258.html +sha256 f4bfa15f56c066d326a5d5b292646708f25b9247506840b9047cd2687dcc71b7 xlsatoms-1.1.4.tar.xz +sha512 82f0d1e17850770537eac82947eff4514639f8122bd864e02685ede49db110a4c90c7782702ffb677a2b581f3eacd10dba80e63e29e7a1ed1c9255ee163fe0c4 xlsatoms-1.1.4.tar.xz # Locally computed sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk index a3230fc2dc..2ef09ef2d5 100644 --- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk +++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XLSATOMS_VERSION = 1.1.3 -XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2 -XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XLSATOMS_VERSION = 1.1.4 +XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.xz +XAPP_XLSATOMS_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XLSATOMS_LICENSE = MIT XAPP_XLSATOMS_LICENSE_FILES = COPYING XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu From yann.morin.1998 at free.fr Mon Feb 20 20:53:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:54 -0000 Subject: [Buildroot] [git commit branch/next] package/python-canopen: bump to version 2.0.0 Message-ID: <20230220205201.22E6381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d068bf4c4fce1eb376711940fb02a017815127e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-canopen/python-canopen.hash | 5 +++-- package/python-canopen/python-canopen.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-canopen/python-canopen.hash b/package/python-canopen/python-canopen.hash index 32bcae18f9..610dca3f34 100644 --- a/package/python-canopen/python-canopen.hash +++ b/package/python-canopen/python-canopen.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/canopen/json -sha256 4394770d528e93a48936138c4a7b37b5dff26d54f82a435ad9790cd1e43f55b9 canopen-1.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/canopen/json +md5 0719b73bd8ccaeaa9fb758c5338fd030 canopen-2.0.0.tar.gz +sha256 bcc8aa9ea83f7ada5da0dade81038977be52a93802c2657649729eb1f82065d9 canopen-2.0.0.tar.gz # Locally computed sha256 checksums sha256 0740d30978affcd91c0fc817b7cf942a332381bf0380fe17e60c6a0b377c6e0d LICENSE.txt diff --git a/package/python-canopen/python-canopen.mk b/package/python-canopen/python-canopen.mk index fc328c698e..bd0a3bfba7 100644 --- a/package/python-canopen/python-canopen.mk +++ b/package/python-canopen/python-canopen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CANOPEN_VERSION = 1.0.0 +PYTHON_CANOPEN_VERSION = 2.0.0 PYTHON_CANOPEN_SOURCE = canopen-$(PYTHON_CANOPEN_VERSION).tar.gz -PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/1f/2b/55b6d82b3dcba184a01c6fe027df239953940e36a463cd24b71e67bd1f37 +PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/9e/d6/6ced4b410b904aeee5f7d0227187eae95a5ad769f01014a74fc0e016845e PYTHON_CANOPEN_SETUP_TYPE = setuptools PYTHON_CANOPEN_LICENSE = MIT PYTHON_CANOPEN_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Mon Feb 20 20:53:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:55 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xkbevd: bump version to 1.1.5 Message-ID: <20230220205157.B6A0386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07f7d434a438421eb382a27349e67cffd97d8a3f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003255.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xkbevd/xapp_xkbevd.hash | 5 +++-- package/x11r7/xapp_xkbevd/xapp_xkbevd.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash b/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash index c3cf2f32b2..40b813fcf2 100644 --- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash +++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002577.html -sha256 2430a2e5302a4cb4a5530c1df8cb3721a149bbf8eb377a2898921a145197f96a xkbevd-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003255.html +sha256 38357b702de9d3457c4ff75053390f457b84c4accc7f088101255c37c684926b xkbevd-1.1.5.tar.xz +sha512 9e4a56484771e5eb5444fbd11e7d0bb952a2746eea79b84298e2000ada96896d501b886727c4ef08c120b5dcce550fca2d3e3dd762f4ca0327c38d9609961c5b xkbevd-1.1.5.tar.xz # Locally computed sha256 38c6dbf8f88b1c920561ff3a4d1ffdb85c069c664f5f8b64a9adb477ef347b7c COPYING diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk index 7a9a8fb18f..5b99e6967f 100644 --- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk +++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XKBEVD_VERSION = 1.1.4 -XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.bz2 -XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XKBEVD_VERSION = 1.1.5 +XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.xz +XAPP_XKBEVD_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XKBEVD_LICENSE = MIT XAPP_XKBEVD_LICENSE_FILES = COPYING XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile From yann.morin.1998 at free.fr Mon Feb 20 20:53:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:55 -0000 Subject: [Buildroot] [git commit branch/next] package/python-chardet: bump to version 5.1.0 Message-ID: <20230220205201.45B1B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=870197baf9c22fe45122b1c2db6bfc19f153c27b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop setuptools runtime dependency. Update description as python 2 is no longer supported. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-chardet/Config.in | 3 +-- package/python-chardet/python-chardet.hash | 4 ++-- package/python-chardet/python-chardet.mk | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-chardet/Config.in b/package/python-chardet/Config.in index 869888cfe0..59e7cbfa2c 100644 --- a/package/python-chardet/Config.in +++ b/package/python-chardet/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_CHARDET bool "python-chardet" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help - Universal encoding detector for Python 2 and 3. + Universal encoding detector for Python 3. https://github.com/chardet/chardet diff --git a/package/python-chardet/python-chardet.hash b/package/python-chardet/python-chardet.hash index 7721814279..7887dd769d 100644 --- a/package/python-chardet/python-chardet.hash +++ b/package/python-chardet/python-chardet.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/chardet/json -md5 8013c248c098e165ac53d900e1a1278a chardet-5.0.0.tar.gz -sha256 0368df2bfd78b5fc20572bb4e9bb7fb53e2c094f60ae9993339e8671d0afb8aa chardet-5.0.0.tar.gz +md5 394bd03d7a258d2771040bfbd5a7bf66 chardet-5.1.0.tar.gz +sha256 0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5 chardet-5.1.0.tar.gz # Locally computed sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE diff --git a/package/python-chardet/python-chardet.mk b/package/python-chardet/python-chardet.mk index 1d737891a0..42646aa513 100644 --- a/package/python-chardet/python-chardet.mk +++ b/package/python-chardet/python-chardet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHARDET_VERSION = 5.0.0 +PYTHON_CHARDET_VERSION = 5.1.0 PYTHON_CHARDET_SOURCE = chardet-$(PYTHON_CHARDET_VERSION).tar.gz -PYTHON_CHARDET_SITE = https://files.pythonhosted.org/packages/31/a2/12c090713b3d0e141f367236d3a8bdc3e5fca0d83ff3647af4892c16c205 +PYTHON_CHARDET_SITE = https://files.pythonhosted.org/packages/41/32/cdc91dcf83849c7385bf8e2a5693d87376536ed000807fa07f5eab33430d PYTHON_CHARDET_SETUP_TYPE = setuptools PYTHON_CHARDET_LICENSE = LGPL-2.1+ PYTHON_CHARDET_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:53:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:56 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xkill: bump version to 1.0.6 Message-ID: <20230220205157.AC3A38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fefd30f06c88f36cc75b52b767293586e1770af1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-November/003256.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xkill/xapp_xkill.hash | 8 +++----- package/x11r7/xapp_xkill/xapp_xkill.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xkill/xapp_xkill.hash b/package/x11r7/xapp_xkill/xapp_xkill.hash index 911a28d0b6..8cee05d871 100644 --- a/package/x11r7/xapp_xkill/xapp_xkill.hash +++ b/package/x11r7/xapp_xkill/xapp_xkill.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002864.html -md5 938177e4472c346cf031c1aefd8934fc xkill-1.0.5.tar.bz2 -sha1 c5ee06b33adb252a41e4f737be6bd47651ff582a xkill-1.0.5.tar.bz2 -sha256 c5f0bb6a95e1ac7c4def8a657496d5d2f21ccd41eb47ef2c9ccb03fb6d6aff6b xkill-1.0.5.tar.bz2 -sha512 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249 xkill-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003256.html +sha256 e5a8aa78c475677b11504646da8d93dacc30744258076a2ca418a24438aeb907 xkill-1.0.6.tar.xz +sha512 a755a8db51d7860b9942161776390007b9b530c2f7fcf8ddb3383311d36d185a6f08a44c5f6f7735576b146902e66aca21cbd7e746c1289d035e79332e8173b6 xkill-1.0.6.tar.xz # Locally computed sha256 13306c3890e4c8710bc468dee0eba7f9677cd94c7a67d2d81fa932d4f635b21f COPYING diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk index 64ddbca694..84dad0b5c7 100644 --- a/package/x11r7/xapp_xkill/xapp_xkill.mk +++ b/package/x11r7/xapp_xkill/xapp_xkill.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XKILL_VERSION = 1.0.5 -XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.bz2 -XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XKILL_VERSION = 1.0.6 +XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.xz +XAPP_XKILL_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XKILL_LICENSE = MIT XAPP_XKILL_LICENSE_FILES = COPYING XAPP_XKILL_DEPENDENCIES = xlib_libX11 xlib_libXmu From yann.morin.1998 at free.fr Mon Feb 20 20:53:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:56 -0000 Subject: [Buildroot] [git commit branch/next] package/python-charset-normalizer: bump to version 3.0.1 Message-ID: <20230220205201.512AD81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c54e8a01b69983fe0b262b564be799397c432f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-charset-normalizer/python-charset-normalizer.hash | 4 ++-- package/python-charset-normalizer/python-charset-normalizer.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-charset-normalizer/python-charset-normalizer.hash b/package/python-charset-normalizer/python-charset-normalizer.hash index 32d8a22e66..a70499917a 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.hash +++ b/package/python-charset-normalizer/python-charset-normalizer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/charset-normalizer/json -md5 169527085be8e6bb7874164c24481eca charset-normalizer-3.0.0.tar.gz -sha256 b27d10ad15740b45fd55f76e6901a4391e6dca3917ef48ecdcf17edf6e00d770 charset-normalizer-3.0.0.tar.gz +md5 12ee1c8bedbfba84e99db46d5d94f411 charset-normalizer-3.0.1.tar.gz +sha256 ebea339af930f8ca5d7a699b921106c6e29c617fe9606fa7baa043c1cdae326f charset-normalizer-3.0.1.tar.gz # Locally computed sha256 checksums sha256 eb31a0c5a4fb09b8a4e32055d25c1e5f9c358a2752fef3cd720213d1ccfee241 LICENSE diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index b2c42a74b8..95c55ffd3c 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHARSET_NORMALIZER_VERSION = 3.0.0 +PYTHON_CHARSET_NORMALIZER_VERSION = 3.0.1 PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/fe/77/6d5d367b7cfee812a88573e80bbe25cea2d015ed2c3490e4464951ff3232 +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/96/d7/1675d9089a1f4677df5eb29c3f8b064aa1e70c1251a0a8a127803158942d PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:53:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:57 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_sessreg: bump version to 1.1.3 Message-ID: <20230220205157.D8AB086494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ded7c84b569bc9b9e8bbbb23c768302098c8cfc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003246.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_sessreg/xapp_sessreg.hash | 8 +++----- package/x11r7/xapp_sessreg/xapp_sessreg.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.hash b/package/x11r7/xapp_sessreg/xapp_sessreg.hash index b8f55b50c5..1f1b54b877 100644 --- a/package/x11r7/xapp_sessreg/xapp_sessreg.hash +++ b/package/x11r7/xapp_sessreg/xapp_sessreg.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-June/002994.html -md5 92be564d4be7d8aa7b5024057b715210 sessreg-1.1.2.tar.bz2 -sha1 169c1ff9fb152b4b4ca0cfbd3e1aee33af042016 sessreg-1.1.2.tar.bz2 -sha256 dfcb9e954273ace63879aec053c7880466f8755752a35aa9ced3fa5f04fd2c33 sessreg-1.1.2.tar.bz2 -sha512 7e3c2bdcadb7133aace463b58d8c6108d315ec95d2a42509073eeddc7f02644092a4b3168bd3b426c041736a016291092e0bf8368acd620dbeff96d53d12f98c sessreg-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003246.html +sha256 022acd5de8077dddc4f919961f79e102ecd5f3228a333681af5cd0e7344facc2 sessreg-1.1.3.tar.xz +sha512 bc1e83afc598ac5b4c6ab0861799b6c8727c123ee662c1fb9cbdd9ee926973b7a00cc62e32f6b4e462c0da3516f8b824337d9cf17587ebabd3f4753502641a60 sessreg-1.1.3.tar.xz # Locally computed sha256 ac8f5cc696e6c473aea4caaf18650316dc8912fcf0f370cae1df5f395cea8631 COPYING diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk index 7f488e2423..b196bb947e 100644 --- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk +++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_SESSREG_VERSION = 1.1.2 -XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2 +XAPP_SESSREG_VERSION = 1.1.3 +XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.xz XAPP_SESSREG_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SESSREG_LICENSE = MIT XAPP_SESSREG_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:57 -0000 Subject: [Buildroot] [git commit branch/next] package/python-dicttoxml: bump to version 1.7.15 Message-ID: <20230220205201.7514C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9eb2d23a260af9594ce80caace01bfa2deac3ff7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-dicttoxml/python-dicttoxml.hash | 8 ++++---- package/python-dicttoxml/python-dicttoxml.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-dicttoxml/python-dicttoxml.hash b/package/python-dicttoxml/python-dicttoxml.hash index d8c43d0144..dcde7cf1b6 100644 --- a/package/python-dicttoxml/python-dicttoxml.hash +++ b/package/python-dicttoxml/python-dicttoxml.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/dicttoxml/json -md5 ec5643a048cf32dad3c28db236b923e4 dicttoxml-1.7.4.tar.gz -# Locally computed -sha256 ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45 dicttoxml-1.7.4.tar.gz +# md5, sha256 from https://pypi.org/pypi/dicttoxml/json +md5 234550e3aa875c6f3520aa9a2dff1ef1 dicttoxml-1.7.15.tar.gz +sha256 5540fe7dfde2d2ed9467e67fcc981cbd2e164dc3120c862bdb7333202ac48838 dicttoxml-1.7.15.tar.gz +# Locally computed sha256 checksums sha256 4514114bd9da0b2fbf8c4fa264c0e6cc80fd41e6ac7f09d7a39a215662951c7c LICENCE.txt diff --git a/package/python-dicttoxml/python-dicttoxml.mk b/package/python-dicttoxml/python-dicttoxml.mk index 537afff601..3e5f90e9de 100644 --- a/package/python-dicttoxml/python-dicttoxml.mk +++ b/package/python-dicttoxml/python-dicttoxml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DICTTOXML_VERSION = 1.7.4 +PYTHON_DICTTOXML_VERSION = 1.7.15 PYTHON_DICTTOXML_SOURCE = dicttoxml-$(PYTHON_DICTTOXML_VERSION).tar.gz -PYTHON_DICTTOXML_SITE = https://pypi.python.org/packages/74/36/534db111db9e7610a41641a1f6669a964aacaf51858f466de264cc8dcdd9 +PYTHON_DICTTOXML_SITE = https://files.pythonhosted.org/packages/45/b5/efa170fd88e8b8bc025c59592eade0fb7de6ae02ed3dd63957956adc1396 PYTHON_DICTTOXML_SETUP_TYPE = distutils PYTHON_DICTTOXML_LICENSE = GPL-2.0 PYTHON_DICTTOXML_LICENSE_FILES = LICENCE.txt From yann.morin.1998 at free.fr Mon Feb 20 20:53:58 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:58 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libX11: bump version to 1.8.2 Message-ID: <20230220205157.CCC1F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=671c130b0cc0eee99665554e52af7fad5f99500e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update license hash due to upstream commits https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/a04b84f0f7bb3a78088756759f4b9b8bb363251e https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/a35d706cd8dc7b498bca2a3fc4a3732047439ed7 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libX11/xlib_libX11.hash | 8 ++++---- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 5a8f639165..4f5027d62d 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-June/003168.html -sha256 1bc41aa1bbe01401f330d76dfa19f386b79c51881c7bbfee9eb4e27f22f2d9f7 libX11-1.8.1.tar.xz -sha512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a libX11-1.8.1.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-November/003253.html +sha256 ed91d573d570db83b8ae546f4890dccfcd0b9dfe1e50a1b401b63a74c152ed04 libX11-1.8.2.tar.xz +sha512 662ee8043d9ba27df82f647515b701d6f302a52715f21afdaba391f3b70691753e3649e7ff8322e07858be4297df9cbb19227958d676ed6dea198cce64330d1d libX11-1.8.2.tar.xz # Locally computed -sha256 2daec087a88e7c9b8082557cdeebad5bbb8155a4137472f0b22e269cd99d0c1e COPYING +sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 9ed9f1ddb3..26d4b4d306 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.8.1 +XLIB_LIBX11_VERSION = 1.8.2 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT From yann.morin.1998 at free.fr Mon Feb 20 20:53:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:59 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_x11perf: bump version to 1.6.2 Message-ID: <20230220205158.105C2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1261e78ee2a7994f0cf764c0a61d457984daf673 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003242.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_x11perf/xapp_x11perf.hash | 8 +++----- package/x11r7/xapp_x11perf/xapp_x11perf.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.hash b/package/x11r7/xapp_x11perf/xapp_x11perf.hash index 673d3602ba..3370d7df53 100644 --- a/package/x11r7/xapp_x11perf/xapp_x11perf.hash +++ b/package/x11r7/xapp_x11perf/xapp_x11perf.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002983.html -md5 e96b56756990c56c24d2d02c2964456b x11perf-1.6.1.tar.bz2 -sha1 c54ebef80b6cb565397fe2e3069e0d7470027e5a x11perf-1.6.1.tar.bz2 -sha256 1c7e0b8ffc2794b4ccf11e04d551823abe0ea47b4f7db0637390db6fbe817c34 x11perf-1.6.1.tar.bz2 -sha512 b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b x11perf-1.6.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003242.html +sha256 5a0e7cea47716ad07ceca38bbd07ae06459ee4d837b9c9dfc21ccb94e3e24fcc x11perf-1.6.2.tar.xz +sha512 5be9e601071a42d103adbab5f30c1900a3779a5b2c06c709df99a85487c9790d36b835d43f5c6d74cc7d950cc3ad06927210d7b1f58939cfd0b4a6f3e5e32112 x11perf-1.6.2.tar.xz # Locally computed sha256 f467ff659142e2eb4cb7275c48c789d249af398b09a405d3e181dcc339b3b922 COPYING diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk index ec10590b73..3a1d579939 100644 --- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk +++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_X11PERF_VERSION = 1.6.1 -XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.bz2 -XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_X11PERF_VERSION = 1.6.2 +XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.xz +XAPP_X11PERF_SITE = https://xorg.freedesktop.org/archive/individual/test XAPP_X11PERF_LICENSE = MIT XAPP_X11PERF_LICENSE_FILES = COPYING XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft From yann.morin.1998 at free.fr Mon Feb 20 20:54:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:00 -0000 Subject: [Buildroot] [git commit branch/next] package/python-dtschema: bump to version 2022.12 Message-ID: <20230220205201.9D2A886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a3fb64466b38f68ed4c49fe3eda86a5094bd411 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-dtschema/python-dtschema.hash | 4 ++-- package/python-dtschema/python-dtschema.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dtschema/python-dtschema.hash b/package/python-dtschema/python-dtschema.hash index 32e6e99fa7..734ff3f681 100644 --- a/package/python-dtschema/python-dtschema.hash +++ b/package/python-dtschema/python-dtschema.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dtschema/json -md5 69f39814b2e90809b32cbeafc3e6aaab dtschema-2022.11.tar.gz -sha256 825e51b8bb82a2d4833d15c25ff2b9a3f5a53b36a490d7c4b6b136037e823320 dtschema-2022.11.tar.gz +md5 3fd3ba2d98ad320c06277274ca40d045 dtschema-2022.12.tar.gz +sha256 f532d433a915e507d4b426b7ef57a6730d23c0938b682fb4866f9dfa80a58ec6 dtschema-2022.12.tar.gz # Locally computed sha256 checksums sha256 ca0d66263406dc684fe9db60577b234f65ffdf620d7e041c708e969447b69111 LICENSE.txt diff --git a/package/python-dtschema/python-dtschema.mk b/package/python-dtschema/python-dtschema.mk index 90fffd4255..dbdf43160c 100644 --- a/package/python-dtschema/python-dtschema.mk +++ b/package/python-dtschema/python-dtschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DTSCHEMA_VERSION = 2022.11 +PYTHON_DTSCHEMA_VERSION = 2022.12 PYTHON_DTSCHEMA_SOURCE = dtschema-$(PYTHON_DTSCHEMA_VERSION).tar.gz -PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/9a/15/41ece48fc9524ad815238cfbd164b8ac9dde889759790afbcc4903564dbd +PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/f2/61/7d7e907ea6eed33708ce07766258b961fe476221fbd2e759a1921487e381 PYTHON_DTSCHEMA_SETUP_TYPE = setuptools PYTHON_DTSCHEMA_LICENSE = BSD-2-Clause PYTHON_DTSCHEMA_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Mon Feb 20 20:54:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:00 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXext: bump version to 1.3.5 Message-ID: <20230220205158.1BF5E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f28be9b1fd93a3852d4db00041588d52e171638f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003241.html Updated license hash due to upstream commits https://gitlab.freedesktop.org/xorg/lib/libxext/-/commit/81a3d082b1c73393a59131aa57fe32bb0d76e149 https://gitlab.freedesktop.org/xorg/lib/libxext/-/commit/b6929c143e8372eb6838a331942d34a8d2b13b7b Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXext/xlib_libXext.hash | 10 ++++------ package/x11r7/xlib_libXext/xlib_libXext.mk | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package/x11r7/xlib_libXext/xlib_libXext.hash b/package/x11r7/xlib_libXext/xlib_libXext.hash index e6b41a3dba..2ab509598b 100644 --- a/package/x11r7/xlib_libXext/xlib_libXext.hash +++ b/package/x11r7/xlib_libXext/xlib_libXext.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002975.html -md5 f5b48bb76ba327cd2a8dc7a383532a95 libXext-1.3.4.tar.bz2 -sha1 14e2451162e8766173b5b14c73e94a22b1fcab55 libXext-1.3.4.tar.bz2 -sha256 59ad6fcce98deaecc14d39a672cf218ca37aba617c9a0f691cac3bcd28edf82b libXext-1.3.4.tar.bz2 -sha512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a libXext-1.3.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003241.html +sha256 db14c0c895c57ea33a8559de8cb2b93dc76c42ea4a39e294d175938a133d7bca libXext-1.3.5.tar.xz +sha512 fd9805982dabfb14b1526c0cb71f94508003fa3fcd60560d387465afd891c1dca61927ae86278436d53f4b840cacd1f412071fdc3dce1d6f730610a9c163d59b libXext-1.3.5.tar.xz # Locally computed -sha256 80767ac915f2f0f94de9efb15f0197a59b6f1e609cae85059f8703272dc3e146 COPYING +sha256 fd62910be4b13829d94e76c1447cf840953f0e225c4dc6c79349c84dd0557f22 COPYING diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk index 6002e59e0d..0bb3efa31f 100644 --- a/package/x11r7/xlib_libXext/xlib_libXext.mk +++ b/package/x11r7/xlib_libXext/xlib_libXext.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXEXT_VERSION = 1.3.4 -XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2 -XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXEXT_VERSION = 1.3.5 +XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.xz +XLIB_LIBXEXT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXEXT_LICENSE = MIT XLIB_LIBXEXT_LICENSE_FILES = COPYING XLIB_LIBXEXT_CPE_ID_VENDOR = x From yann.morin.1998 at free.fr Mon Feb 20 20:54:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:01 -0000 Subject: [Buildroot] [git commit branch/next] package/python-falcon: bump to version 3.1.1 Message-ID: <20230220205201.C124C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ef45500e35fac59e403af4709e16e40d2c9bb4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Always build cython modules as sdist does not contain prebuilt cython sources. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-falcon/python-falcon.hash | 4 ++-- package/python-falcon/python-falcon.mk | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/python-falcon/python-falcon.hash b/package/python-falcon/python-falcon.hash index d4e99a6998..497b5d2b57 100644 --- a/package/python-falcon/python-falcon.hash +++ b/package/python-falcon/python-falcon.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/falcon/json -md5 0172450908573a4449a5937810d512b9 falcon-3.1.0.tar.gz -sha256 f2760bd18c16393a6fb5e55f371f67921edb72febe693a82b3c5e82195d087b7 falcon-3.1.0.tar.gz +md5 383673fc6378428d0db5861a416cad0d falcon-3.1.1.tar.gz +sha256 5dd393dbf01cbaf99493893de4832121bd495dc49a46c571915b79c59aad7ef4 falcon-3.1.1.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-falcon/python-falcon.mk b/package/python-falcon/python-falcon.mk index 01b5eca4a2..b5ebc399dc 100644 --- a/package/python-falcon/python-falcon.mk +++ b/package/python-falcon/python-falcon.mk @@ -4,15 +4,12 @@ # ################################################################################ -PYTHON_FALCON_VERSION = 3.1.0 +PYTHON_FALCON_VERSION = 3.1.1 PYTHON_FALCON_SOURCE = falcon-$(PYTHON_FALCON_VERSION).tar.gz -PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/36/53/4fd90c6c841bc2e4be29ab92c65e5406df9096c421f138bef9d95d43afc9 +PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/29/bc/c11c9a14bb5b4d18a024ee51da15b793d1c869d151bb4101e324e0d055a8 PYTHON_FALCON_SETUP_TYPE = setuptools PYTHON_FALCON_LICENSE = Apache-2.0 PYTHON_FALCON_LICENSE_FILES = LICENSE - -ifeq ($(BR2_PACKAGE_HOST_PYTHON_CYTHON),y) PYTHON_FALCON_DEPENDENCIES += host-python-cython -endif $(eval $(python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:54:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:01 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xfsinfo: bump version to 1.0.7 Message-ID: <20230220205158.3FEDC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c999fb9a0527e371f4d9f433436afcc1dc88d4af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003238.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash | 8 +++----- package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash index dbdf8e0eda..7d5976473d 100644 --- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash +++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002949.html -md5 0060d6151427d9e570e54fc52a88e7d7 xfsinfo-1.0.6.tar.bz2 -sha1 cbfe7470179f1ab5eecf992226dc1b28902c6b4c xfsinfo-1.0.6.tar.bz2 -sha256 8a3e8b9b9ae6ed571989d04e1846d39b9043e28f7623b500ebe1d47762c9b1d6 xfsinfo-1.0.6.tar.bz2 -sha512 901fc3817d7c95f2ba75ed0c51de91abd8efa67bbb93ad6b7d66e56a2f721af9db364e92f9ef2e719835fd48e934a5ea7402e5565c0ccd9b6b82633e869dc57b xfsinfo-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003238.html +sha256 92f3ca451cba7717eed15f80de3c123aa56c82a1ee7d6e9116ba513021b98874 xfsinfo-1.0.7.tar.xz +sha512 1914916bf995c08a520bd009ddfa57c7e4a997a829380232d359f9bf68852c67650efb8f1fe3cc8a11889b2ec067f50ac38df711ffaf4536802a0b530dc1789c xfsinfo-1.0.7.tar.xz # Locally computed sha256 bae01fa08f30f21f9cfb75e8339d081b34e5e03d12677177f85a55b0ca41d0db COPYING diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk index bef9787ffe..29e9fc75c4 100644 --- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk +++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XFSINFO_VERSION = 1.0.6 -XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.bz2 -XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XFSINFO_VERSION = 1.0.7 +XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.xz +XAPP_XFSINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XFSINFO_LICENSE = MIT XAPP_XFSINFO_LICENSE_FILES = COPYING XAPP_XFSINFO_DEPENDENCIES = xlib_libFS xlib_libX11 From yann.morin.1998 at free.fr Mon Feb 20 20:54:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:02 -0000 Subject: [Buildroot] [git commit branch/next] package/python-filelock: bump to version 3.8.2 Message-ID: <20230220205201.CC97686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9268e835d33b188978145b912f9a9d1359da63a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-filelock/python-filelock.hash | 4 ++-- package/python-filelock/python-filelock.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-filelock/python-filelock.hash b/package/python-filelock/python-filelock.hash index e4dd67de07..f9e6bc03e8 100644 --- a/package/python-filelock/python-filelock.hash +++ b/package/python-filelock/python-filelock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/filelock/json -md5 9bd8d33d5d7dc95012981ccbfb2d2a0f filelock-3.8.0.tar.gz -sha256 55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc filelock-3.8.0.tar.gz +md5 d66099b8823ebbdd980cde0dae8f7341 filelock-3.8.2.tar.gz +sha256 7565f628ea56bfcd8e54e42bdc55da899c85c1abfe1b5bcfd147e9188cebb3b2 filelock-3.8.2.tar.gz # Locally computed sha256 checksums sha256 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd LICENSE diff --git a/package/python-filelock/python-filelock.mk b/package/python-filelock/python-filelock.mk index 8d5308ddca..86f1220b54 100644 --- a/package/python-filelock/python-filelock.mk +++ b/package/python-filelock/python-filelock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FILELOCK_VERSION = 3.8.0 +PYTHON_FILELOCK_VERSION = 3.8.2 PYTHON_FILELOCK_SOURCE = filelock-$(PYTHON_FILELOCK_VERSION).tar.gz -PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/95/55/b897882bffb8213456363e646bf9e9fa704ffda5a7d140edf935a9e02c7b +PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/d8/73/292d9ea2370840a163e6dd2d2816a571244e9335e2f6ad957bf0527c492f PYTHON_FILELOCK_SETUP_TYPE = setuptools PYTHON_FILELOCK_LICENSE = Public Domain PYTHON_FILELOCK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:02 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xcb-util-image: bump version to 0.4.1 Message-ID: <20230220205158.6FA0E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7b42852817e93423afeff64e637795d8ba80672 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003231.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xcb-util-image/xcb-util-image.hash | 5 +++-- package/x11r7/xcb-util-image/xcb-util-image.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xcb-util-image/xcb-util-image.hash b/package/x11r7/xcb-util-image/xcb-util-image.hash index b2c42d6899..e200853e47 100644 --- a/package/x11r7/xcb-util-image/xcb-util-image.hash +++ b/package/x11r7/xcb-util-image/xcb-util-image.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-October/002489.html -sha256 2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc xcb-util-image-0.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003231.html +sha256 ccad8ee5dadb1271fd4727ad14d9bd77a64e505608766c4e98267d9aede40d3d xcb-util-image-0.4.1.tar.xz +sha512 9b47ba38b91196d76541b6ccabeaf291d3b91036f15422909cd6a79b3fd1a9786d5b1728e411bc41cfdf3d60a253485f4ef7c65ffa6ae646fa93439ec782746e xcb-util-image-0.4.1.tar.xz # License file, locally calculated sha256 19672c6153d8c4870abe734fa4dd2197481a311f4788d02ad729be07e116b26b COPYING diff --git a/package/x11r7/xcb-util-image/xcb-util-image.mk b/package/x11r7/xcb-util-image/xcb-util-image.mk index 8ddb0be86d..446d545ef2 100644 --- a/package/x11r7/xcb-util-image/xcb-util-image.mk +++ b/package/x11r7/xcb-util-image/xcb-util-image.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_IMAGE_VERSION = 0.4.0 -XCB_UTIL_IMAGE_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_IMAGE_SOURCE = xcb-util-image-$(XCB_UTIL_IMAGE_VERSION).tar.bz2 +XCB_UTIL_IMAGE_VERSION = 0.4.1 +XCB_UTIL_IMAGE_SITE = https://xorg.freedesktop.org/archive/individual/lib +XCB_UTIL_IMAGE_SOURCE = xcb-util-image-$(XCB_UTIL_IMAGE_VERSION).tar.xz XCB_UTIL_IMAGE_INSTALL_STAGING = YES XCB_UTIL_IMAGE_LICENSE = MIT XCB_UTIL_IMAGE_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:54:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:03 -0000 Subject: [Buildroot] [git commit branch/next] package/python-gobject: bump to version 3.42.2 Message-ID: <20230220205201.D9F6786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8144885b83c67b2aba3c06a33126454c8293f96a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-gobject/python-gobject.hash | 4 ++-- package/python-gobject/python-gobject.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-gobject/python-gobject.hash b/package/python-gobject/python-gobject.hash index 0c14efb1d4..4398356006 100644 --- a/package/python-gobject/python-gobject.hash +++ b/package/python-gobject/python-gobject.hash @@ -1,3 +1,3 @@ -# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.42/pygobject-3.42.1.sha256sum -sha256 1f34b5f7624de35e44eb5a7eb428353285bd03004d55131a5f7f7fa9b90f3cc9 pygobject-3.42.1.tar.xz +# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.42/pygobject-3.42.2.sha256sum +sha256 ade8695e2a7073849dd0316d31d8728e15e1e0bc71d9ff6d1c09e86be52bc957 pygobject-3.42.2.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/python-gobject/python-gobject.mk b/package/python-gobject/python-gobject.mk index 2fa7504d51..014090540f 100644 --- a/package/python-gobject/python-gobject.mk +++ b/package/python-gobject/python-gobject.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON_GOBJECT_VERSION_MAJOR = 3.42 -PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).1 +PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).2 PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.xz PYTHON_GOBJECT_SITE = https://ftp.gnome.org/pub/gnome/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR) PYTHON_GOBJECT_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Mon Feb 20 20:54:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:03 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xcb-util-wm: bump version to 0.4.2 Message-ID: <20230220205158.4B77F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7f74ba0b3f8d5dd0dcf5af42e0622749e57a7e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003235.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xcb-util-wm/xcb-util-wm.hash | 5 +++-- package/x11r7/xcb-util-wm/xcb-util-wm.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xcb-util-wm/xcb-util-wm.hash b/package/x11r7/xcb-util-wm/xcb-util-wm.hash index 444212accf..7383f015f2 100644 --- a/package/x11r7/xcb-util-wm/xcb-util-wm.hash +++ b/package/x11r7/xcb-util-wm/xcb-util-wm.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-February/002401.html -sha256 28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f xcb-util-wm-0.4.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003235.html +sha256 62c34e21d06264687faea7edbf63632c9f04d55e72114aa4a57bb95e4f888a0b xcb-util-wm-0.4.2.tar.xz +sha512 eab6588e6a47d28a3b25ecd13b5018529419db6b49c74458c093699b60a194933be1e1f6f7799abf03344f7ebc7af88586ff2935938d53644bdd5c763a7fa9b0 xcb-util-wm-0.4.2.tar.xz # License file, locally calculated sha256 12ab3559977a4b22ae3030b90c64a386e6ec51ab0e4eab1ff530f81a2639400a COPYING diff --git a/package/x11r7/xcb-util-wm/xcb-util-wm.mk b/package/x11r7/xcb-util-wm/xcb-util-wm.mk index 37df3fd92d..0c4f6e86fa 100644 --- a/package/x11r7/xcb-util-wm/xcb-util-wm.mk +++ b/package/x11r7/xcb-util-wm/xcb-util-wm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_WM_VERSION = 0.4.1 -XCB_UTIL_WM_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_WM_SOURCE = xcb-util-wm-$(XCB_UTIL_WM_VERSION).tar.bz2 +XCB_UTIL_WM_VERSION = 0.4.2 +XCB_UTIL_WM_SITE = https://xorg.freedesktop.org/archive/individual/lib +XCB_UTIL_WM_SOURCE = xcb-util-wm-$(XCB_UTIL_WM_VERSION).tar.xz XCB_UTIL_WM_INSTALL_STAGING = YES XCB_UTIL_WM_LICENSE = MIT XCB_UTIL_WM_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:54:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:04 -0000 Subject: [Buildroot] [git commit branch/next] package/python-influxdb: bump to version 5.3.1 Message-ID: <20230220205202.09F6D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=77871541bdeb7c84e0d54b4d4b3f13a83c5cdb6f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-influxdb/python-influxdb.hash | 4 ++-- package/python-influxdb/python-influxdb.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-influxdb/python-influxdb.hash b/package/python-influxdb/python-influxdb.hash index 7b43091eca..e86bd8c2ca 100644 --- a/package/python-influxdb/python-influxdb.hash +++ b/package/python-influxdb/python-influxdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/influxdb/json -md5 d528c8ccd8ab40bc608ad1e507e7788a influxdb-5.3.0.tar.gz -sha256 9bcaafd57ac152b9824ab12ed19f204206ef5df8af68404770554c5b55b475f6 influxdb-5.3.0.tar.gz +md5 e5888a7023e9a49d8a372538b625f908 influxdb-5.3.1.tar.gz +sha256 46f85e7b04ee4b3dee894672be6a295c94709003a7ddea8820deec2ac4d8b27a influxdb-5.3.1.tar.gz # Locally computed sha256 checksums sha256 b654917e2c25a69d2bd56e72dddbc6eb29bf7e40384d7c46bb291d5c5185213b LICENSE diff --git a/package/python-influxdb/python-influxdb.mk b/package/python-influxdb/python-influxdb.mk index e5b1aea70f..d77cb89d2d 100644 --- a/package/python-influxdb/python-influxdb.mk +++ b/package/python-influxdb/python-influxdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INFLUXDB_VERSION = 5.3.0 +PYTHON_INFLUXDB_VERSION = 5.3.1 PYTHON_INFLUXDB_SOURCE = influxdb-$(PYTHON_INFLUXDB_VERSION).tar.gz -PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/be/8d/85ec8f11299a6dfc115244db71fd8f13e9a69f5e9eb77dc3392f4f959e9a +PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/86/4f/a9c524576677c1694b149e09d4fd6342e4a1d9a5f409e437168a14d6d150 PYTHON_INFLUXDB_SETUP_TYPE = setuptools PYTHON_INFLUXDB_LICENSE = MIT PYTHON_INFLUXDB_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:04 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xcb-util-keysyms: bump version to 0.4.1 Message-ID: <20230220205158.6472A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd91f23a6ab9d0bb734fa8084275d81a39d300b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003233.html Added license file. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash | 7 +++++-- package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk | 10 ++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash index 6437d070f4..20a341ca22 100644 --- a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash +++ b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash @@ -1,2 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-October/002485.html -sha256 0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9 xcb-util-keysyms-0.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003233.html +sha256 7c260a5294412aed429df1da2f8afd3bd07b7cba3fec772fba15a613a6d5c638 xcb-util-keysyms-0.4.1.tar.xz +sha512 dd53a36b52647f22bf0da8cded4b2974a51899eaac799797017ed8534f14bc2d2d339a14fa5ef387ae4528b7d9a5d31920bb0c71b09ca34f58e5081e768e2bbf xcb-util-keysyms-0.4.1.tar.xz +# Locally computed +sha256 d499c1bf2c2a5f0a0498e5204d998388e308dcf2273dfbe2250a5b9a73f66537 COPYING diff --git a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk index 9036b06fe8..364dc5b6da 100644 --- a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk +++ b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk @@ -4,13 +4,11 @@ # ################################################################################ -XCB_UTIL_KEYSYMS_VERSION = 0.4.0 -XCB_UTIL_KEYSYMS_SOURCE = xcb-util-keysyms-$(XCB_UTIL_KEYSYMS_VERSION).tar.bz2 -XCB_UTIL_KEYSYMS_SITE = http://xcb.freedesktop.org/dist - -# unfortunately, no license file +XCB_UTIL_KEYSYMS_VERSION = 0.4.1 +XCB_UTIL_KEYSYMS_SOURCE = xcb-util-keysyms-$(XCB_UTIL_KEYSYMS_VERSION).tar.xz +XCB_UTIL_KEYSYMS_SITE = https://xorg.freedesktop.org/archive/individual/lib XCB_UTIL_KEYSYMS_LICENSE = MIT - +XCB_UTIL_KEYSYMS_LICENSE_FILES = COPYING XCB_UTIL_KEYSYMS_INSTALL_STAGING = YES XCB_UTIL_KEYSYMS_DEPENDENCIES = host-pkgconf libxcb From yann.morin.1998 at free.fr Mon Feb 20 20:54:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:05 -0000 Subject: [Buildroot] [git commit branch/next] package/python-jsonschema: bump to version 4.17.3 Message-ID: <20230220205202.304D786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb56da9f18647d3414aa42b4d67133a30a52579f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-jsonschema/python-jsonschema.hash | 4 ++-- package/python-jsonschema/python-jsonschema.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-jsonschema/python-jsonschema.hash b/package/python-jsonschema/python-jsonschema.hash index 19b9659d08..f710576461 100644 --- a/package/python-jsonschema/python-jsonschema.hash +++ b/package/python-jsonschema/python-jsonschema.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/jsonschema/json -md5 e569b6114d575bdb05cb8ce4676fe458 jsonschema-4.17.0.tar.gz -sha256 5bfcf2bca16a087ade17e02b282d34af7ccd749ef76241e7f9bd7c0cb8a9424d jsonschema-4.17.0.tar.gz +md5 7c65ceb8923c83cb1f22c2b5a86d99b0 jsonschema-4.17.3.tar.gz +sha256 0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d jsonschema-4.17.3.tar.gz # Locally computed sha256 checksums sha256 4f92a015a13c4d1a040bef018aa13430b4f1bc73b41b16bb846c346766de7439 COPYING sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a json/LICENSE diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 8cc624886c..16fc660ec9 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JSONSCHEMA_VERSION = 4.17.0 +PYTHON_JSONSCHEMA_VERSION = 4.17.3 PYTHON_JSONSCHEMA_SOURCE = jsonschema-$(PYTHON_JSONSCHEMA_VERSION).tar.gz -PYTHON_JSONSCHEMA_SITE = https://files.pythonhosted.org/packages/3a/3d/0653047b9b2ed03d3e96012bc90cfc96227221193fbedd4dc0cbf5a0e342 +PYTHON_JSONSCHEMA_SITE = https://files.pythonhosted.org/packages/36/3d/ca032d5ac064dff543aa13c984737795ac81abc9fb130cd2fcff17cfabc7 PYTHON_JSONSCHEMA_SETUP_TYPE = pep517 PYTHON_JSONSCHEMA_LICENSE = MIT PYTHON_JSONSCHEMA_LICENSE_FILES = COPYING json/LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:05 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_bdftopcf: bump version to 1.1.1 Message-ID: <20230220205158.9203E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08a0ed4d56c03a431b73a6faa53b0c5b83d7ca04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003223.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash | 9 +++------ package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash index bf806ab0d7..0596b65e49 100644 --- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash +++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash @@ -1,8 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-November/002821.html -md5 2a455d3c02390597feb9cefb3fe97a45 bdftopcf-1.1.tar.bz2 -sha1 48a783337a5aa49ebc102c9788ff0f43ea35c5c4 bdftopcf-1.1.tar.bz2 -sha256 4b4df05fc53f1e98993638d6f7e178d95b31745c4568cee407e167491fd311a2 bdftopcf-1.1.tar.bz2 -sha512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec bdftopcf-1.1.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-October/003223.html +sha256 11c953d53c0f3ed349d0198dfb0a40000b5121df7eef09f2615a262892fed908 bdftopcf-1.1.1.tar.xz +sha512 257dc9ae29f2cf1496aad91ccba534348d87f881d75431aa6611a8154cb817d17588c464ab6c6c6bc51e6060baa8dcfcb9fd8c037cdaea8d18287651fa6b7ea9 bdftopcf-1.1.1.tar.xz # Locally calculated sha256 a437fb5272ba507c2977b2ef623bb391270f521b2a20271ed044785f4eaa5dbc COPYING diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk index 7ee618d641..d47f5c02ce 100644 --- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk +++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_BDFTOPCF_VERSION = 1.1 -XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2 -XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_BDFTOPCF_VERSION = 1.1.1 +XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.xz +XAPP_BDFTOPCF_SITE = https://xorg.freedesktop.org/archive/individual/util XAPP_BDFTOPCF_LICENSE = MIT XAPP_BDFTOPCF_LICENSE_FILES = COPYING XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont From yann.morin.1998 at free.fr Mon Feb 20 20:54:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:06 -0000 Subject: [Buildroot] [git commit branch/next] package/python-m2r: bump to version 0.3.1 Message-ID: <20230220205202.62D6C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fdda5c1a6dea195260fc57cc2940dfed88071468 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-m2r/python-m2r.hash | 4 ++-- package/python-m2r/python-m2r.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-m2r/python-m2r.hash b/package/python-m2r/python-m2r.hash index 0770e0d1b1..4bdd7160d8 100644 --- a/package/python-m2r/python-m2r.hash +++ b/package/python-m2r/python-m2r.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/m2r/json -md5 8bdb45c19e2b59bb5ffb9a0348e81ad8 m2r-0.2.1.tar.gz -sha256 bf90bad66cda1164b17e5ba4a037806d2443f2a4d5ddc9f6a5554a0322aaed99 m2r-0.2.1.tar.gz +md5 255d080f56eb3d3a82d95194850c99c3 m2r-0.3.1.tar.gz +sha256 aafb67fc49cfb1d89e46a3443ac747e15f4bb42df20ed04f067ad9efbee256ab m2r-0.3.1.tar.gz # Locally computed sha256 checksums sha256 28728ec0ecbd8c171ebaeccebf69e3961282fd81f06abc7424c65546b6ae6f27 LICENSE diff --git a/package/python-m2r/python-m2r.mk b/package/python-m2r/python-m2r.mk index 47fb154c68..8a4708f128 100644 --- a/package/python-m2r/python-m2r.mk +++ b/package/python-m2r/python-m2r.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_M2R_VERSION = 0.2.1 +PYTHON_M2R_VERSION = 0.3.1 PYTHON_M2R_SOURCE = m2r-$(PYTHON_M2R_VERSION).tar.gz -PYTHON_M2R_SITE = https://files.pythonhosted.org/packages/39/e7/9fae11a45f5e1a3a21d8a98d02948e597c4afd7848a0dbe1a1ebd235f13e +PYTHON_M2R_SITE = https://files.pythonhosted.org/packages/94/65/fd40fbdc608298e760affb95869c3baed237dfe5649d62da1eaa1deca8f3 PYTHON_M2R_SETUP_TYPE = setuptools PYTHON_M2R_LICENSE = MIT PYTHON_M2R_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:06 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXmu: bump version to 1.1.4 Message-ID: <20230220205158.84786828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0978ae1d5e1acca7f9ab165e4050cfa1c283fed4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003224.html Updated license hash due to upstream commits: https://gitlab.freedesktop.org/xorg/lib/libxmu/-/commit/621f61f7d3f5955a84e6aa8b7458699870fdee45 https://gitlab.freedesktop.org/xorg/lib/libxmu/-/commit/f84dcc7fef5e0842e6408f059c13d73975114ec4 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXmu/xlib_libXmu.hash | 10 ++++------ package/x11r7/xlib_libXmu/xlib_libXmu.mk | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.hash b/package/x11r7/xlib_libXmu/xlib_libXmu.hash index b443419285..58d3545156 100644 --- a/package/x11r7/xlib_libXmu/xlib_libXmu.hash +++ b/package/x11r7/xlib_libXmu/xlib_libXmu.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002978.html -md5 ac774cff8b493f566088a255dbf91201 libXmu-1.1.3.tar.bz2 -sha1 7ff54ce38379fb795aebed38f6be404ee0dfeec6 libXmu-1.1.3.tar.bz2 -sha256 9c343225e7c3dc0904f2122b562278da5fed639b1b5e880d25111561bac5b731 libXmu-1.1.3.tar.bz2 -sha512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762 libXmu-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003224.html +sha256 210de3ab9c3e9382572c25d17c2518a854ce6e2c62c5f8315deac7579e758244 libXmu-1.1.4.tar.xz +sha512 3cf90cb3ff380aafefbb39297bdd95b9e1e6d6618cecb53ff09faf38f9b9c54599d28367f07a9ec77a20214c6c3e661b8d0a12b38082556790a79a59942039c1 libXmu-1.1.4.tar.xz # Locally computed -sha256 e65a4a8bbf8b0dfd2439d6bc6d86df03e2b8e693b757593b25149e099aeb8ec4 COPYING +sha256 8f0f2ca7a05cfd10bf9e307a272182de7cb52d7a603feaf17b9943c2c9a4838e COPYING diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk index 3218e0ec39..051968059b 100644 --- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk +++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXMU_VERSION = 1.1.3 -XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.bz2 -XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXMU_VERSION = 1.1.4 +XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.xz +XLIB_LIBXMU_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXMU_LICENSE = MIT XLIB_LIBXMU_LICENSE_FILES = COPYING XLIB_LIBXMU_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:54:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:07 -0000 Subject: [Buildroot] [git commit branch/next] package/python-lmdb: bump to version 1.4.0 Message-ID: <20230220205202.562A486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec022187abdad4cbf286531b236c460d14b97739 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-lmdb/python-lmdb.hash | 4 ++-- package/python-lmdb/python-lmdb.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-lmdb/python-lmdb.hash b/package/python-lmdb/python-lmdb.hash index e50c35df67..c8137ce4c0 100644 --- a/package/python-lmdb/python-lmdb.hash +++ b/package/python-lmdb/python-lmdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lmdb/json -md5 3c955c49be10a7a07a2fcd54d180c3af lmdb-1.3.0.tar.gz -sha256 60a11efc21aaf009d06518996360eed346f6000bfc9de05114374230879f992e lmdb-1.3.0.tar.gz +md5 230103e2cd8efbca8ee7cf29151afd0d lmdb-1.4.0.tar.gz +sha256 39f6c4ee145d28d17025d350720abb6f95db816514e868db57444fdef51cbb47 lmdb-1.4.0.tar.gz # Locally computed sha256 checksums sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index fba168d340..071106605f 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LMDB_VERSION = 1.3.0 +PYTHON_LMDB_VERSION = 1.4.0 PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz -PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/ed/61/41f3c7cbd8a67202ef24fad3375ed936093a0547dc645581dd11c09581b7 +PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/fd/78/4cdc5927d5f3c3c86c4da0108c2eeba544cd67e773232164d59f3e442ff0 PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE PYTHON_LMDB_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Mon Feb 20 20:54:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:07 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_smproxy: bump version to 1.0.7 Message-ID: <20230220205158.C83388648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=77c048e6297193ba4e116484bd8005fafdc412e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003218.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_smproxy/xapp_smproxy.hash | 5 +++-- package/x11r7/xapp_smproxy/xapp_smproxy.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.hash b/package/x11r7/xapp_smproxy/xapp_smproxy.hash index db9dd27af3..587864baf7 100644 --- a/package/x11r7/xapp_smproxy/xapp_smproxy.hash +++ b/package/x11r7/xapp_smproxy/xapp_smproxy.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002564.html -sha256 6cf19155a2752237f36dbf8bc4184465ea190d2652f887faccb4e2a6ebf77266 smproxy-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003218.html +sha256 4aa99237cc9dab7d87ce9bc7cca4116674a853b5f08dfe3f9db1bb2b2cf9f305 smproxy-1.0.7.tar.xz +sha512 cd6a6933b74f76ae65fb16504e57871724bc1102eae1d02e801e99c3fe73fe44e27f87cef3fbf9f75f369d18197b53bb677d637d94cc8185b55acae0cbd44f21 smproxy-1.0.7.tar.xz # Locally computed sha256 92dce6d8a1fcc0c6b5e56dc44e431e7f73bfa2ed5e83295662aa314067a671d8 COPYING diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk index f51c1ec090..f76752941c 100644 --- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk +++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_SMPROXY_VERSION = 1.0.6 -XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.bz2 -XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_SMPROXY_VERSION = 1.0.7 +XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.xz +XAPP_SMPROXY_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SMPROXY_LICENSE = MIT XAPP_SMPROXY_LICENSE_FILES = COPYING XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt From yann.morin.1998 at free.fr Mon Feb 20 20:54:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:08 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_viewres: bump version to 1.0.7 Message-ID: <20230220205158.BD2B0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52264859725c6af2f88b0df6cf59f70b3b6d106d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003219.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_viewres/xapp_viewres.hash | 8 +++----- package/x11r7/xapp_viewres/xapp_viewres.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_viewres/xapp_viewres.hash b/package/x11r7/xapp_viewres/xapp_viewres.hash index 3e2928dc4e..a662f4ef2e 100644 --- a/package/x11r7/xapp_viewres/xapp_viewres.hash +++ b/package/x11r7/xapp_viewres/xapp_viewres.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-August/003020.html -md5 38e6568271d8098327706c5cf855dbc7 viewres-1.0.6.tar.bz2 -sha1 f1d12e5b4e1180916edb44234599a486b025b480 viewres-1.0.6.tar.bz2 -sha256 11c15db02066c1d5fc3febf9b185d16c1112f87e37c4b101a484dcefffb80934 viewres-1.0.6.tar.bz2 -sha512 3f4cfc61608bc6c9b35ef66ceb473661ca01946d3306d54040d32803e8e0eec506a0ce37ea22bfe514544a6ba9645fd30f39b20c063aff696b3c0fda3fe95dff viewres-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003219.html +sha256 b15a62085b1a10f55ae1cf17b7ded75b72b21be240c68071685db377c4afc628 viewres-1.0.7.tar.xz +sha512 75878faee001163891adf8472c79b31273f794e23dd775c80b33acdd1ce76df708eb27a49c20f79b7101ad676e1d50d9c857c2e2e0930c6209eeb7af8a11397c viewres-1.0.7.tar.xz # Locally computed sha256 aefb540c54bc95c68702cd2ae668c559e63cc1a84f55ae5c0e78547e7d75d2d5 COPYING diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk index 2e05a6e7d9..49933d7af6 100644 --- a/package/x11r7/xapp_viewres/xapp_viewres.mk +++ b/package/x11r7/xapp_viewres/xapp_viewres.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_VIEWRES_VERSION = 1.0.6 -XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.bz2 -XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_VIEWRES_VERSION = 1.0.7 +XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.xz +XAPP_VIEWRES_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_VIEWRES_LICENSE = MIT XAPP_VIEWRES_LICENSE_FILES = COPYING XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw From yann.morin.1998 at free.fr Mon Feb 20 20:54:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:09 -0000 Subject: [Buildroot] [git commit branch/next] package/python-mako: bump to version 1.2.4 Message-ID: <20230220205202.6DD7286496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8954158337c3c15a7b7f184cd78fab9b625df08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-mako/python-mako.hash | 4 ++-- package/python-mako/python-mako.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-mako/python-mako.hash b/package/python-mako/python-mako.hash index 4bacafafde..a010e8d8f6 100644 --- a/package/python-mako/python-mako.hash +++ b/package/python-mako/python-mako.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mako/json -md5 4fa0a489a247c59b36fe3e0de5514fed Mako-1.2.3.tar.gz -sha256 7fde96466fcfeedb0eed94f187f20b23d85e4cb41444be0e542e2c8c65c396cd Mako-1.2.3.tar.gz +md5 651f365616611fcd4f2702a9002e2195 Mako-1.2.4.tar.gz +sha256 d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34 Mako-1.2.4.tar.gz # Locally computed sha256 checksums sha256 760f22b3e9ea4a50eb99201bd8dd118869f28108cfb64ccce6d1b305cf9ae9fa LICENSE diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index a663b7dbda..313fbfcab2 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAKO_VERSION = 1.2.3 +PYTHON_MAKO_VERSION = 1.2.4 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/b9/38/c25f0874ea71802fc6f1e9f0f88a7e9666818121b28991bbc1d8eddbcdb1 +PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6ddc1dddf9958677f76f5f80c236bd65309d280b166d3e PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:09 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_fstobdf: bump version to 1.0.7 Message-ID: <20230220205158.DCDD2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5cd2f31a255b4295d83adaeb8db97150c3f660ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003215.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_fstobdf/xapp_fstobdf.hash | 5 +++-- package/x11r7/xapp_fstobdf/xapp_fstobdf.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash b/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash index a2f1425afb..956c3ef0e3 100644 --- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash +++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002511.html -sha256 66cf550326c993e7043f260a8ec4a533a3bf9d8f0e7397a6fe9cca803732e92e fstobdf-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003215.html +sha256 2624cbf071ccca89c2a6dadd65004784f478b2ba1c62b8209e03909954f36b50 fstobdf-1.0.7.tar.xz +sha512 b303cc2060e8ccaa139e855a7d377d28877158efa1087eeeebf9f30f7c9962764eceab5c4044b4b508890413cf38546da9b26756dd27a142b806dcd6fdb6ba59 fstobdf-1.0.7.tar.xz # Locally computed sha256 b76125d919ac2bfbff96955dec98b90729633b2df5fbfa2ad3f2e4376164febb COPYING diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk index e897514c80..989883d42e 100644 --- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk +++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_FSTOBDF_VERSION = 1.0.6 -XAPP_FSTOBDF_SOURCE = fstobdf-$(XAPP_FSTOBDF_VERSION).tar.bz2 -XAPP_FSTOBDF_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_FSTOBDF_VERSION = 1.0.7 +XAPP_FSTOBDF_SOURCE = fstobdf-$(XAPP_FSTOBDF_VERSION).tar.xz +XAPP_FSTOBDF_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_FSTOBDF_LICENSE = MIT XAPP_FSTOBDF_LICENSE_FILES = COPYING XAPP_FSTOBDF_DEPENDENCIES = xlib_libFS xlib_libX11 From yann.morin.1998 at free.fr Mon Feb 20 20:54:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:10 -0000 Subject: [Buildroot] [git commit branch/next] package/python-numpy: bump to version 1.23.5 Message-ID: <20230220205202.9265B86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c2007f5b632efce3c2776b9d360ad3621694648 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-numpy/python-numpy.hash | 4 ++-- package/python-numpy/python-numpy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash index 2a2dec44da..9ac9280c78 100644 --- a/package/python-numpy/python-numpy.hash +++ b/package/python-numpy/python-numpy.hash @@ -1,5 +1,5 @@ -# Copied from https://github.com/numpy/numpy/releases/tag/v1.23.4 -sha256 ed2cc92af0efad20198638c69bb0fc2870a58dabfba6eb722c933b48556c686c numpy-1.23.4.tar.gz +# Copied from https://github.com/numpy/numpy/releases/tag/v1.23.5 +sha256 1b1766d6f397c18153d40015ddfc79ddb715cabadc04d2d228d4e5a8bc4ded1a numpy-1.23.5.tar.gz # License files, locally calculated sha256 0f88787955e7131224f53a8c3f3e859dc502408e3a539a4dcf61fb7888b5b984 LICENSE.txt sha256 c27d0a8026bdb8876562b720ab24d1688e3827a89f6083cd6e7e8caa9584aba3 numpy/core/src/multiarray/dragon4.c diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 4f4848c4ba..812bfdae4a 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.23.4 +PYTHON_NUMPY_VERSION = 1.23.5 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) PYTHON_NUMPY_LICENSE = BSD-3-Clause, MIT, Zlib From yann.morin.1998 at free.fr Mon Feb 20 20:54:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:10 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXtst: bump version to 1.2.4 Message-ID: <20230220205158.E74358648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e2df02d3109131b72880ebf313088e70366c5da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-September/003214.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXtst/xlib_libXtst.hash | 5 +++-- package/x11r7/xlib_libXtst/xlib_libXtst.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.hash b/package/x11r7/xlib_libXtst/xlib_libXtst.hash index f64a018567..7bdcdb9c17 100644 --- a/package/x11r7/xlib_libXtst/xlib_libXtst.hash +++ b/package/x11r7/xlib_libXtst/xlib_libXtst.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002726.html -sha256 4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204 libXtst-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-September/003214.html +sha256 84f5f30b9254b4ffee14b5b0940e2622153b0d3aed8286a3c5b7eeb340ca33c8 libXtst-1.2.4.tar.xz +sha512 f2f4e01239b892b8e26284cede90feb4fe7738beb243bca0f6adb349029f8bf87b5a482911edcd2401733c92ef78eec07fcd455b92e5b8c4828374769e60098d libXtst-1.2.4.tar.xz # Locally computed sha256 940190489c7a0e5ae3d83fc4fcbd79e0cd1b765bf1a4efd408293c1ee0332ceb COPYING diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk index c79301e064..47103377aa 100644 --- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk +++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXTST_VERSION = 1.2.3 -XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.bz2 -XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXTST_VERSION = 1.2.4 +XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.xz +XLIB_LIBXTST_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXTST_LICENSE = MIT XLIB_LIBXTST_LICENSE_FILES = COPYING XLIB_LIBXTST_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:54:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:11 -0000 Subject: [Buildroot] [git commit branch/next] package/python-posix-ipc: bump to version 1.1.0 Message-ID: <20230220205202.CF1278648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb0fc1d63c96df58782d5473bcca175724924e51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next License hash changed due to date update: https://github.com/osvenskan/posix_ipc/commit/4db678001be2f16175c70cb88d4fb9f9126333f5 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-posix-ipc/python-posix-ipc.hash | 6 +++--- package/python-posix-ipc/python-posix-ipc.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-posix-ipc/python-posix-ipc.hash b/package/python-posix-ipc/python-posix-ipc.hash index 4258af6348..74d2db0f5e 100644 --- a/package/python-posix-ipc/python-posix-ipc.hash +++ b/package/python-posix-ipc/python-posix-ipc.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/posix-ipc/json -md5 8c9443859492ecf3aae9182aa6b5c78c posix_ipc-1.0.5.tar.gz -sha256 6cddb1ce2cf4aae383f2a0079c26c69bee257fe2720f372201ef047f8ceb8b97 posix_ipc-1.0.5.tar.gz +md5 81baeabebd3e4064972ec62fd9eace0b posix_ipc-1.1.0.tar.gz +sha256 f86a15b32b38573c78e305ebd9100d8198a3d9facc03ffafe39edc35833738e3 posix_ipc-1.1.0.tar.gz # Locally computed sha256 checksums -sha256 61f0669e70518e6d32f87e485965fe9309de60e4bef938b29cecd068b3db9a98 LICENSE +sha256 2b58f0bf31a8cbd7e56bfef030e9f7f02758ce8a810d073ccf41753bdc2a0747 LICENSE diff --git a/package/python-posix-ipc/python-posix-ipc.mk b/package/python-posix-ipc/python-posix-ipc.mk index 359dee6d7c..c25af9ecbd 100644 --- a/package/python-posix-ipc/python-posix-ipc.mk +++ b/package/python-posix-ipc/python-posix-ipc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_POSIX_IPC_VERSION = 1.0.5 +PYTHON_POSIX_IPC_VERSION = 1.1.0 PYTHON_POSIX_IPC_SOURCE = posix_ipc-$(PYTHON_POSIX_IPC_VERSION).tar.gz -PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/bc/2f/9a7901aa26fb0e02a671b989ba814d059a0f45af85cea31b9c9eef7e2dda +PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/41/72/90b6702782921c0e3e0b10a66f2a47d8cfaf9c2255d763ab45cc8cea25eb PYTHON_POSIX_IPC_LICENSE = BSD-3-Clause PYTHON_POSIX_IPC_LICENSE_FILES = LICENSE PYTHON_POSIX_IPC_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Mon Feb 20 20:54:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:11 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_fslsfonts: bump version to 1.0.6 Message-ID: <20230220205159.082B8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2745a3b89ccc74f5d15ff812feb0b62da860e12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-September/003210.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash | 5 +++-- package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash index 1a7985f9a5..20573576c9 100644 --- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash +++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002510.html -sha256 f1ed55093356b78daec2678d22f52d42ec11fe88575562d734396962e626d7f6 fslsfonts-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-September/003210.html +sha256 01cb0c5a7dbddadef846ca3b52c2ab9c60f2c32c3f16584cd97a6c7f293341ee fslsfonts-1.0.6.tar.xz +sha512 1181a8e6cc820410d1deac98b3e5097506e4168c6515307b6b9aaf705cb57193a009cb331a51d46ce68e9548712f122b5c942d5a1bc1e01bdd191b7b1beab09e fslsfonts-1.0.6.tar.xz # Locally computed sha256 fbdfcafb5755565ad688bf3f7f808109d358040ec83ed3de496155105451fdf4 COPYING diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk index 27786a55c1..1b8d630124 100644 --- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk +++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_FSLSFONTS_VERSION = 1.0.5 -XAPP_FSLSFONTS_SOURCE = fslsfonts-$(XAPP_FSLSFONTS_VERSION).tar.bz2 -XAPP_FSLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_FSLSFONTS_VERSION = 1.0.6 +XAPP_FSLSFONTS_SOURCE = fslsfonts-$(XAPP_FSLSFONTS_VERSION).tar.xz +XAPP_FSLSFONTS_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_FSLSFONTS_LICENSE = MIT XAPP_FSLSFONTS_LICENSE_FILES = COPYING XAPP_FSLSFONTS_DEPENDENCIES = xlib_libFS xlib_libX11 From yann.morin.1998 at free.fr Mon Feb 20 20:54:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:12 -0000 Subject: [Buildroot] [git commit branch/next] package/python-prompt-toolkit: bump to version 3.0.36 Message-ID: <20230220205202.DC11086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f37cfa7907f8594ce9df3ee7956223b9da26bd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop no longer required six dependency. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-prompt-toolkit/Config.in | 1 - package/python-prompt-toolkit/python-prompt-toolkit.hash | 4 ++-- package/python-prompt-toolkit/python-prompt-toolkit.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-prompt-toolkit/Config.in b/package/python-prompt-toolkit/Config.in index ad4f8162de..81d958884e 100644 --- a/package/python-prompt-toolkit/Config.in +++ b/package/python-prompt-toolkit/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT bool "python-prompt-toolkit" - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_WCWIDTH # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.hash b/package/python-prompt-toolkit/python-prompt-toolkit.hash index 8b91ee767f..62ba0c3cfe 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.hash +++ b/package/python-prompt-toolkit/python-prompt-toolkit.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/prompt-toolkit/json -md5 0cc5e752cb2759e99658e2391644e767 prompt_toolkit-3.0.31.tar.gz -sha256 9ada952c9d1787f52ff6d5f3484d0b4df8952787c087edf6a1f7c2cb1ea88148 prompt_toolkit-3.0.31.tar.gz +md5 5a2bb559c0bcbc617f507a320c64ba03 prompt_toolkit-3.0.36.tar.gz +sha256 3e163f254bef5a03b146397d7c1963bd3e2812f0964bb9a24e6ec761fd28db63 prompt_toolkit-3.0.36.tar.gz # Locally computed sha256 checksums sha256 303574d9bdd85c757d6025017942bf17baeedf2778f62bd7f425d07d880f4c4a LICENSE diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.mk b/package/python-prompt-toolkit/python-prompt-toolkit.mk index bef761e20f..426fa41e0b 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.mk +++ b/package/python-prompt-toolkit/python-prompt-toolkit.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.31 +PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.36 PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz -PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/80/76/c94cf323ca362dd7baca8d8ddf3b5fe1576848bc0156522ad581c04f8446 +PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/fb/93/180be2342f89f16543ec4eb3f25083b5b84eba5378f68efff05409fb39a9 PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3-Clause PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:12 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xmh: bump version to 1.0.4 Message-ID: <20230220205159.1F9C68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a49f6567142eee59817d07afa380337260f81634 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003208.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xmh/xapp_xmh.hash | 5 +++-- package/x11r7/xapp_xmh/xapp_xmh.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xmh/xapp_xmh.hash b/package/x11r7/xapp_xmh/xapp_xmh.hash index 1dadc34586..f0c9fa9567 100644 --- a/package/x11r7/xapp_xmh/xapp_xmh.hash +++ b/package/x11r7/xapp_xmh/xapp_xmh.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002582.html -sha256 b92f4f912a5fb6346d52cc2b639aea087b347f3b2e4e1a4fc7a165b1345f5689 xmh-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003208.html +sha256 e82c425a4c4156eee2e344d2e952f3fd816e03973005cd656ec1e9acf6f329db xmh-1.0.4.tar.xz +sha512 03bba7d3e7c2070b03378335aed0188dd0fd0a488f19dc5ad3f26674a9b38e6599377d082328041dd3ab72123ed60acae32cff19d7149517545b80e1339db26a xmh-1.0.4.tar.xz # Locally computed sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk index c18bbfe5da..db6102eb75 100644 --- a/package/x11r7/xapp_xmh/xapp_xmh.mk +++ b/package/x11r7/xapp_xmh/xapp_xmh.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XMH_VERSION = 1.0.3 -XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.bz2 -XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XMH_VERSION = 1.0.4 +XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.xz +XAPP_XMH_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XMH_LICENSE = MIT XAPP_XMH_LICENSE_FILES = COPYING XAPP_XMH_DEPENDENCIES = xlib_libXaw xdata_xbitmaps From yann.morin.1998 at free.fr Mon Feb 20 20:54:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:13 -0000 Subject: [Buildroot] [git commit branch/next] package/python-psutil: bump to version 5.9.4 Message-ID: <20230220205203.0700386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9371a7994e1099a8681411ddb686a1c2ce53ef10 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-psutil/python-psutil.hash | 4 ++-- package/python-psutil/python-psutil.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index c7b7e46ec1..15927562b1 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json -md5 66b847f94545e96b540518ebe19740b4 psutil-5.9.3.tar.gz -sha256 7ccfcdfea4fc4b0a02ca2c31de7fcd186beb9cff8207800e14ab66f79c773af6 psutil-5.9.3.tar.gz +md5 f72751d05b781757b7cd9bc375d2e351 psutil-5.9.4.tar.gz +sha256 3d7f9739eb435d4b1338944abe23f49584bde5395f27487d2ee25ad9a8774a62 psutil-5.9.4.tar.gz # Locally computed sha256 checksums sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 578f69d3c7..e764d1accc 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 5.9.3 +PYTHON_PSUTIL_VERSION = 5.9.4 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/de/eb/1c01a34c86ee3b058c556e407ce5b07cb7d186ebe47b3e69d6f152ca5cc5 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/3d/7d/d05864a69e452f003c0d77e728e155a89a2a26b09e64860ddd70ad64fb26 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:13 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_oclock: bump version to 1.0.5 Message-ID: <20230220205159.364EA828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=445abe597ccb099660da911fa8fe1ab29b47e986 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003206.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_oclock/xapp_oclock.hash | 8 +++----- package/x11r7/xapp_oclock/xapp_oclock.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_oclock/xapp_oclock.hash b/package/x11r7/xapp_oclock/xapp_oclock.hash index c8893f88b3..20e899b880 100644 --- a/package/x11r7/xapp_oclock/xapp_oclock.hash +++ b/package/x11r7/xapp_oclock/xapp_oclock.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002856.html -md5 973f6d25a6f0990720b98a15c9436b92 oclock-1.0.4.tar.bz2 -sha1 0bc8f3f44290950f60af894e20e0ceb0c5e8e862 oclock-1.0.4.tar.bz2 -sha256 cc20cfc1c0d5128d89e1eecd9ba52e58f111075be163e0aeda5690dbaafbaefe oclock-1.0.4.tar.bz2 -sha512 6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7 oclock-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003206.html +sha256 8f09979655e889d056b7a1e50b57f38b32529453e756b53ec659070fb3c3965c oclock-1.0.5.tar.xz +sha512 a87e89afdb25a91c36077e030b05c3907ddc063c6bdc0715a01bfc16edef8730b3b5a0347399ef4c8b2a13e70e068cba9ec5fe8d411f08548c0aa790a1873aff oclock-1.0.5.tar.xz # Locally computed sha256 f6cae4b0c603ef5bd76da2df96b38aa43aa7547e482adb8cb8b83f09af35e4a2 COPYING diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk index 0f94cf8c13..4f70df4cbf 100644 --- a/package/x11r7/xapp_oclock/xapp_oclock.mk +++ b/package/x11r7/xapp_oclock/xapp_oclock.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_OCLOCK_VERSION = 1.0.4 -XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.bz2 -XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_OCLOCK_VERSION = 1.0.5 +XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.xz +XAPP_OCLOCK_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_OCLOCK_LICENSE = MIT XAPP_OCLOCK_LICENSE_FILES = COPYING XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu From yann.morin.1998 at free.fr Mon Feb 20 20:54:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:14 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pycairo: bump to version 1.23.0 Message-ID: <20230220205203.2C83186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59ae28ac059852c4adb9e5116006f8724bd8578b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycairo/python-pycairo.hash | 4 ++-- package/python-pycairo/python-pycairo.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycairo/python-pycairo.hash b/package/python-pycairo/python-pycairo.hash index f8018e682f..98bb7f2802 100644 --- a/package/python-pycairo/python-pycairo.hash +++ b/package/python-pycairo/python-pycairo.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycairo/json -md5 682238eaa8bd7032e36a20b6f53824d1 pycairo-1.21.0.tar.gz -sha256 251907f18a552df938aa3386657ff4b5a4937dde70e11aa042bc297957f4b74b pycairo-1.21.0.tar.gz +md5 7a3729d21659098e1b9a411b62e88966 pycairo-1.23.0.tar.gz +sha256 9b61ac818723adc04367301317eb2e814a83522f07bbd1f409af0dada463c44c pycairo-1.23.0.tar.gz # Locally computed sha256 checksums sha256 360b9a526d47c51a7cab7f1ec49ca5893050562d639b742d588934ff84823a72 COPYING sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING-LGPL-2.1 diff --git a/package/python-pycairo/python-pycairo.mk b/package/python-pycairo/python-pycairo.mk index 5b231f6b1e..f9933df187 100644 --- a/package/python-pycairo/python-pycairo.mk +++ b/package/python-pycairo/python-pycairo.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCAIRO_VERSION = 1.21.0 +PYTHON_PYCAIRO_VERSION = 1.23.0 PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz -PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/92/a4/506564f574fa74c90b98690e8ecc8dbae1629f31fcfe0be69de45d9e1605 +PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/69/ca/9e9fa2e8be0876a9bbf046a1be7ee33e61d4fdfbd1fd25c76c1bdfddf8c4 PYTHON_PYCAIRO_SETUP_TYPE = setuptools PYTHON_PYCAIRO_DEPENDENCIES = cairo PYTHON_PYCAIRO_LICENSE = LGPL-2.1 or MPL-1.1 From yann.morin.1998 at free.fr Mon Feb 20 20:54:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:14 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXfont2: bump version to 2.0.6 Message-ID: <20230220205159.4E5638648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4649c06bff7e30bdbd7a3ebab59c578f09d67172 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003203.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXfont2/xlib_libXfont2.hash | 6 +++--- package/x11r7/xlib_libXfont2/xlib_libXfont2.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash index 069f2fc616..f2ae5925f8 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-August/003103.html -sha256 aa7c6f211cf7215c0ab4819ed893dc98034363d7b930b844bb43603c2e10b53e libXfont2-2.0.5.tar.bz2 -sha512 64d0635d14676bb645d61932afb177eb3808a46525b26e7ee31abc975eca75207743e85523fdd82b08010ce124eb4802338b508ee7b126875d2a3c12f8ac4faa libXfont2-2.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003203.html +sha256 74ca20017eb0fb3f56d8d5e60685f560fc85e5ff3d84c61c4cb891e40c27aef4 libXfont2-2.0.6.tar.xz +sha512 24d6baeef8dc2ca2730925c6b790a97f4a3f46ea7b4d908555e7df29cee6e27b63d638b50c88dd30c853cecff7d9b079402cb617f4498f96410c5770b8815cbd libXfont2-2.0.6.tar.xz # Locally calculated sha256 97e413bb4962bbb5773085cd5405502bf1d4eadeaf98ff5be015eacacc840462 COPYING diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk index fb0bba879c..7f90f67046 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXFONT2_VERSION = 2.0.5 -XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2 +XLIB_LIBXFONT2_VERSION = 2.0.6 +XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.xz XLIB_LIBXFONT2_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFONT2_LICENSE = MIT XLIB_LIBXFONT2_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:54:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:15 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pymodbus: bump to version 3.0.2 Message-ID: <20230220205203.5292286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90817e547c54a26e6554819a545f6ef059ee479b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pymodbus/python-pymodbus.hash | 4 ++-- package/python-pymodbus/python-pymodbus.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pymodbus/python-pymodbus.hash b/package/python-pymodbus/python-pymodbus.hash index b5243567b7..d9337ffe84 100644 --- a/package/python-pymodbus/python-pymodbus.hash +++ b/package/python-pymodbus/python-pymodbus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymodbus/json -md5 25a8724539d0eac1b09d9b41812d86f9 pymodbus-3.0.0.tar.gz -sha256 37c9b6f3e5c82f39ee42047ca48cbc9fd0c49a6731126789500191e9deea6cbc pymodbus-3.0.0.tar.gz +md5 89da6585b27b8c4b3887eb9f7d1e950b pymodbus-3.0.2.tar.gz +sha256 704cb7fb90631c45f9c3a70b89d0c990fe0e208ac56f14a5c449e21bebd1e201 pymodbus-3.0.2.tar.gz # Locally computed sha256 checksums sha256 796a47993313691ea404d8af7e4c0f9daf1d2760e3900938985b59c9008eee2f LICENSE diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index 2ed7e94afe..54879d38e9 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMODBUS_VERSION = 3.0.0 +PYTHON_PYMODBUS_VERSION = 3.0.2 PYTHON_PYMODBUS_SOURCE = pymodbus-$(PYTHON_PYMODBUS_VERSION).tar.gz -PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/0f/5a/50e9492f98ef911af18c2b603bc003fef726e84d22bac2ce6e651643b29c +PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/94/f7/6149a1b107fa54378a7adec83db7cd3679bf02216a6f5c83b37f55335897 PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:15 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libFS: bump version to 1.0.9 Message-ID: <20230220205159.59D65828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b1ff446fb74b910ff9005b8725e962a626ef11a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003200.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libFS/xlib_libFS.hash | 8 +++----- package/x11r7/xlib_libFS/xlib_libFS.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libFS/xlib_libFS.hash b/package/x11r7/xlib_libFS/xlib_libFS.hash index 50cb94dd3a..6ca152ac4a 100644 --- a/package/x11r7/xlib_libFS/xlib_libFS.hash +++ b/package/x11r7/xlib_libFS/xlib_libFS.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002970.html -md5 4e1196275aa743d6ebd3d3d5ec1dff9c libFS-1.0.8.tar.bz2 -sha1 70173cc15a7a55defb7b22b00a9387901acad634 libFS-1.0.8.tar.bz2 -sha256 c8e13727149b2ddfe40912027459b2522042e3844c5cd228c3300fe5eef6bd0f libFS-1.0.8.tar.bz2 -sha512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f libFS-1.0.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003200.html +sha256 597379438b3242ccc7d7b0fc432dc6c844eca0d4a82a7b82518bfeb203fc208a libFS-1.0.9.tar.xz +sha512 7d012e62736c6d567931bad982eec221199d296f0fe41e1e7fde5575b8b928e9a8c644aa8746242bdfe72393635320b58774d9a519285765bd26d633588092b8 libFS-1.0.9.tar.xz # Locally computed sha256 5386724e7475b89394dd836b954a6688f875efab99e43e8eb7e8775f5b99a341 COPYING diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk index 9d9aecb74f..0fbf453ca4 100644 --- a/package/x11r7/xlib_libFS/xlib_libFS.mk +++ b/package/x11r7/xlib_libFS/xlib_libFS.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBFS_VERSION = 1.0.8 -XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2 -XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBFS_VERSION = 1.0.9 +XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.xz +XLIB_LIBFS_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBFS_LICENSE = MIT XLIB_LIBFS_LICENSE_FILES = COPYING XLIB_LIBFS_CPE_ID_VENDOR = x From yann.morin.1998 at free.fr Mon Feb 20 20:54:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:16 -0000 Subject: [Buildroot] [git commit branch/next] package/python-redis: bump to version 4.4.0 Message-ID: <20230220205203.6A52E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c75ac80eeaa30b3888f20e0c32df7a3e5c9172b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next License hash changed due to syntax update: https://github.com/redis/redis-py/commit/2a0405d07e20ac7f695ff67415ad6c8368fd6066 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-redis/python-redis.hash | 6 +++--- package/python-redis/python-redis.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash index 9465e251f8..209ff35b78 100644 --- a/package/python-redis/python-redis.hash +++ b/package/python-redis/python-redis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/redis/json -md5 15f05dbef3d166c6244f7afa6c3cacf8 redis-4.3.4.tar.gz -sha256 ddf27071df4adf3821c4f2ca59d67525c3a82e5f268bed97b813cb4fabf87880 redis-4.3.4.tar.gz +md5 4ab691af57ac346c2e630ce2787a424f redis-4.4.0.tar.gz +sha256 7b8c87d19c45d3f1271b124858d2a5c13160c4e74d4835e28273400fa34d5228 redis-4.4.0.tar.gz # Locally computed sha256 checksums -sha256 790148d8c12f8a38b2707a74be2343316bad126995ff54801a181b8b231ba124 LICENSE +sha256 7801a39e3a1aec58a7ea7c9f4dc1238cf0922c36a1fc8eff0bb7d684ff6dd354 LICENSE diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk index 7c18f31507..bbbd6f1df2 100644 --- a/package/python-redis/python-redis.mk +++ b/package/python-redis/python-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REDIS_VERSION = 4.3.4 +PYTHON_REDIS_VERSION = 4.4.0 PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/8f/d4/78ef2d3f316041fa6c92daa7ac2c8056c39858c3775fad35fd84b9b3a6fb +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/7a/05/671367bb466b3301bc4543fdad6ac107214ca327c8d97165b30246d87e88 PYTHON_REDIS_SETUP_TYPE = setuptools PYTHON_REDIS_LICENSE = MIT PYTHON_REDIS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:16 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xorgproto: bump version to 2022.2 Message-ID: <20230220205159.67DE58648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d77345d05169d2fe8df1afc3714c2b373e273ef9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-August/003197.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xorgproto/xorgproto.hash | 6 +++--- package/x11r7/xorgproto/xorgproto.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xorgproto/xorgproto.hash b/package/x11r7/xorgproto/xorgproto.hash index bd9cae2510..cc52013e11 100644 --- a/package/x11r7/xorgproto/xorgproto.hash +++ b/package/x11r7/xorgproto/xorgproto.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003160.html -sha256 1d2dcc66963f234d2c1e1f8d98a0d3e8725149cdac0a263df4097593c48bc2a6 xorgproto-2022.1.tar.bz2 -sha512 add275a9c0d005053f31fdca6da009142792a3c7e2cd4b56da93eed3a397adf52d91c441ff6455959b87559f402eb9f46fdd8932e951c7d2d96623975391202a xorgproto-2022.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003197.html +sha256 5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e xorgproto-2022.2.tar.xz +sha512 8e6108110600d076a94cc6d0e465b2e9adfbbe8d7e6b75fae9c5262d99dc6074ab1ed561a74d6d451f00f5b7af9f507a6317be9c0770efeed9e60b64beb7a1c9 xorgproto-2022.2.tar.xz # Locally computed sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto diff --git a/package/x11r7/xorgproto/xorgproto.mk b/package/x11r7/xorgproto/xorgproto.mk index 89cc248386..c707bdafc0 100644 --- a/package/x11r7/xorgproto/xorgproto.mk +++ b/package/x11r7/xorgproto/xorgproto.mk @@ -4,8 +4,8 @@ # ################################################################################ -XORGPROTO_VERSION = 2022.1 -XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.bz2 +XORGPROTO_VERSION = 2022.2 +XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.xz XORGPROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XORGPROTO_LICENSE = MIT XORGPROTO_LICENSE_FILES = \ From yann.morin.1998 at free.fr Mon Feb 20 20:54:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:17 -0000 Subject: [Buildroot] [git commit branch/next] package/python-simplejson: bump to version 3.18.0 Message-ID: <20230220205203.8214F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=225e8745c62c75b20867af928d459abfbb53da94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-simplejson/python-simplejson.hash | 4 ++-- package/python-simplejson/python-simplejson.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-simplejson/python-simplejson.hash b/package/python-simplejson/python-simplejson.hash index 0f56d4c6cc..1c99b87590 100644 --- a/package/python-simplejson/python-simplejson.hash +++ b/package/python-simplejson/python-simplejson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplejson/json -md5 0b8f47c9451bf101a791f8b5bccf1f33 simplejson-3.17.6.tar.gz -sha256 cf98038d2abf63a1ada5730e91e84c642ba6c225b0198c3684151b1f80c5f8a6 simplejson-3.17.6.tar.gz +md5 83e24e662f024e06af2fffe698227da4 simplejson-3.18.0.tar.gz +sha256 58a429d2c2fa80834115b923ff689622de8f214cf0dc4afa9f59e824b444ab31 simplejson-3.18.0.tar.gz # Locally computed sha256 checksums sha256 fcaa1e313a99304322e2e0836ea4ee7d839ce9a480438f3922a853edfdde129f LICENSE.txt diff --git a/package/python-simplejson/python-simplejson.mk b/package/python-simplejson/python-simplejson.mk index 52bff7569c..1607d9c90c 100644 --- a/package/python-simplejson/python-simplejson.mk +++ b/package/python-simplejson/python-simplejson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEJSON_VERSION = 3.17.6 +PYTHON_SIMPLEJSON_VERSION = 3.18.0 PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz -PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/7a/47/c7cc3d4ed15f09917838a2fb4e1759eafb6d2f37ebf7043af984d8b36cf7 +PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/17/3d/b8bfe1f40558f6a16f70c349adf97480dc71a7d11b2b1a5dc0824a87faa0 PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt PYTHON_SIMPLEJSON_CPE_ID_VENDOR = simplejson_project From peter at korsgaard.com Mon Feb 20 20:54:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:18 -0000 Subject: [Buildroot] [git commit branch/next] package/go: security bump to version 1.19.4 Message-ID: <20230220205159.93A0B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=090d126da88c1d529bf073626e423fceeb3cf9d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Includes 2 security fixes following the security policy. - CVE-2022-41720: https://go.dev/issue/56694 - CVE-2022-41717: https://go.dev/issue/56350 https://groups.google.com/g/golang-nuts/c/rQgaDWEvUrE https://github.com/golang/go/issues?q=milestone%3AGo1.19.4+label%3ACherryPickApproved+ 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 866e7e0d59..d35db10213 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 18ac263e39210bcf68d85f4370e97fb1734166995a1f63fb38b4f6e07d90d212 go1.19.3.src.tar.gz +sha256 eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368 go1.19.4.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index fd4caa2e5a..44e0c622c9 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.3 +GO_VERSION = 1.19.4 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From yann.morin.1998 at free.fr Mon Feb 20 20:54:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:18 -0000 Subject: [Buildroot] [git commit branch/next] package/libuwsc: fix wolfssl build Message-ID: <20230220205159.D4E99828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1567fbd72d4b547f70a7509247bf9abb73ab58e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libuwsc needs BR2_PACKAGE_WOLFSSL_ALL (which enables openssl compat layer) to avoid the following wolfssl build failure raised since the addition of the package in commit 120c04775d7ebe5a2cfc14848f5d11f3a333970b: /home/br-user/work/instance-1/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' 62 | SSL_CTX *ctx; | ^~~~~~~ Note that we do not select _ALL when wolfssl is enabled, because wolfssl is neither the only nor the preferred choice, so the condition would have to be a bit more complex: select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL \ && !BR2_STATIC_LIBS && !BR2_PACKAGE_OPENSSL It is not overly complicated, but it is no longer trivial or obvious, and would easily break if the ordering of preferences were to change in the .mk fie in the future. Fixes: - http://autobuild.buildroot.org/results/6c2a6ed6fca1f92aab299f6ed9cd900b20e8d512 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: explain why we don't select _ALL] Signed-off-by: Yann E. MORIN --- package/libuwsc/libuwsc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libuwsc/libuwsc.mk b/package/libuwsc/libuwsc.mk index cad351529d..051ea411fa 100644 --- a/package/libuwsc/libuwsc.mk +++ b/package/libuwsc/libuwsc.mk @@ -18,7 +18,7 @@ LIBUWSC_CONF_OPTS += \ -DUWSC_USE_MBEDTLS=OFF \ -DUWSC_USE_OPENSSL=ON \ -DUWSC_USE_WOLFSSL=OFF -else ifeq ($(BR2_PACKAGE_WOLFSSL),y) +else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) LIBUWSC_DEPENDENCIES += wolfssl LIBUWSC_CONF_OPTS += \ -DUWSC_SSL_SUPPORT=ON \ From yann.morin.1998 at free.fr Mon Feb 20 20:54:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:19 -0000 Subject: [Buildroot] [git commit branch/next] package/python-texttable: bump to version 1.6.7 Message-ID: <20230220205203.A4F8786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9b0bfbdfeb976bf047b9c6e346542159035395c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-texttable/python-texttable.hash | 4 ++-- package/python-texttable/python-texttable.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-texttable/python-texttable.hash b/package/python-texttable/python-texttable.hash index a769e91772..560749b238 100644 --- a/package/python-texttable/python-texttable.hash +++ b/package/python-texttable/python-texttable.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/texttable/json -md5 15faadc07ba44d337cc1675ea6092a02 texttable-1.6.4.tar.gz -sha256 42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9 texttable-1.6.4.tar.gz +md5 83eb15fb541dd857ff051a8d0c979b9c texttable-1.6.7.tar.gz +sha256 290348fb67f7746931bcdfd55ac7584ecd4e5b0846ab164333f0794b121760f2 texttable-1.6.7.tar.gz # Locally computed sha256 checksums sha256 4ba7bdab54504a3bc44eb33ecca873a26a63ab902822101a87bb46235da63594 LICENSE diff --git a/package/python-texttable/python-texttable.mk b/package/python-texttable/python-texttable.mk index 59df5f6ff5..c63fb5786c 100644 --- a/package/python-texttable/python-texttable.mk +++ b/package/python-texttable/python-texttable.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEXTTABLE_VERSION = 1.6.4 +PYTHON_TEXTTABLE_VERSION = 1.6.7 PYTHON_TEXTTABLE_SOURCE = texttable-$(PYTHON_TEXTTABLE_VERSION).tar.gz -PYTHON_TEXTTABLE_SITE = https://files.pythonhosted.org/packages/d5/78/dbc2a5eab57a01fedaf975f2c16f04e76f09336dbeadb9994258aa0a2b1a +PYTHON_TEXTTABLE_SITE = https://files.pythonhosted.org/packages/e4/84/4686ee611bb020038375c5f11fe7b6b3bb94ee78614a1faba45effe51591 PYTHON_TEXTTABLE_SETUP_TYPE = setuptools PYTHON_TEXTTABLE_LICENSE = MIT PYTHON_TEXTTABLE_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:19 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-tga: remove package Message-ID: <20230220205159.83BD7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87a09b105bb9762cee1245856a9b0a27a89887d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Building this package is broken with X.org xserver 21. Fixes: http://autobuild.buildroot.net/results/de5/de5efd922edb9eb7dc9981b5f10ea402487ee431/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- Config.in.legacy | 6 +++ package/x11r7/Config.in | 1 - .../xdriver_xf86-video-tga/0001-mibstore.patch | 47 ---------------------- package/x11r7/xdriver_xf86-video-tga/Config.in | 5 --- .../xdriver_xf86-video-tga.hash | 4 -- .../xdriver_xf86-video-tga.mk | 14 ------- 6 files changed, 6 insertions(+), 71 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index bf3bd55f35..9602a49e3b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA + bool "xf86-video-tga removed" + select BR2_LEGACY + help + The X.org xf86-video-tga package was removed. + config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT bool "xf86-video-glint removed" select BR2_LEGACY diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 273db98e89..da79c4e851 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -180,7 +180,6 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in source package/x11r7/xdriver_xf86-video-sis/Config.in source package/x11r7/xdriver_xf86-video-tdfx/Config.in - source package/x11r7/xdriver_xf86-video-tga/Config.in source package/x11r7/xdriver_xf86-video-trident/Config.in source package/x11r7/xdriver_xf86-video-vesa/Config.in source package/x11r7/xdriver_xf86-video-vmware/Config.in diff --git a/package/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch b/package/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch deleted file mode 100644 index 07bcd04f25..0000000000 --- a/package/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b7022db0559cd1b6cd3eb6b5abf6896a607b478d Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 12:55:00 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-tga/commit/?id=b7022db0559cd1b6cd3eb6b5abf6896a607b478d - -Signed-off-by: Bernd Kuhls - -diff --git a/src/tga_accel.c b/src/tga_accel.c -index 35af1a4..b414df5 100644 ---- a/src/tga_accel.c -+++ b/src/tga_accel.c -@@ -37,7 +37,6 @@ - #include "xf86cmap.h" - #include "mipointer.h" - --#include "mibstore.h" - #include "miline.h" - - #include "tga_regs.h" -diff --git a/src/tga_driver.c b/src/tga_driver.c -index dd4f3e6..90d2660 100644 ---- a/src/tga_driver.c -+++ b/src/tga_driver.c -@@ -46,8 +46,6 @@ - - /* software cursor */ - #include "mipointer.h" --/* backing store */ --#include "mibstore.h" - - /* #include "mibank.h" */ - /* colormap manipulation */ -@@ -1451,7 +1449,6 @@ TGAScreenInit(SCREEN_INIT_ARGS_DECL) - - fbPictureInit (pScreen, 0, 0); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - --- -cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xdriver_xf86-video-tga/Config.in b/package/x11r7/xdriver_xf86-video-tga/Config.in deleted file mode 100644 index 7c75661acc..0000000000 --- a/package/x11r7/xdriver_xf86-video-tga/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA - bool "xf86-video-tga" - select BR2_PACKAGE_XORGPROTO - help - X.Org driver for tga cards diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash deleted file mode 100644 index 4f8c10965c..0000000000 --- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-July/002025.html -sha256 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131 xf86-video-tga-1.2.2.tar.bz2 -# Locally calculated -sha256 92e36c6b7c99c8335e5823d53686e58ebd82ee8051a6360f60c8c0fb05745954 COPYING diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk deleted file mode 100644 index 421b09be22..0000000000 --- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-tga -# -################################################################################ - -XDRIVER_XF86_VIDEO_TGA_VERSION = 1.2.2 -XDRIVER_XF86_VIDEO_TGA_SOURCE = xf86-video-tga-$(XDRIVER_XF86_VIDEO_TGA_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_TGA_LICENSE = MIT -XDRIVER_XF86_VIDEO_TGA_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xorgproto - -$(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:54:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:20 -0000 Subject: [Buildroot] [git commit branch/next] package/python-ujson: bump to version 5.6.0 Message-ID: <20230220205203.CB00386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33f493781cf55c556769024e8058ee223d122507 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-ujson/python-ujson.hash | 4 ++-- package/python-ujson/python-ujson.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-ujson/python-ujson.hash b/package/python-ujson/python-ujson.hash index 27df5aa355..3dfc681167 100644 --- a/package/python-ujson/python-ujson.hash +++ b/package/python-ujson/python-ujson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ujson/json -md5 73b42e3f4bf3130073cfffbd82608275 ujson-5.5.0.tar.gz -sha256 b25077a971c7da47bd6846a912a747f6963776d90720c88603b1b55d81790780 ujson-5.5.0.tar.gz +md5 45a74680e2936470821bf74a8f043a71 ujson-5.6.0.tar.gz +sha256 f881e2d8a022e9285aa2eab6ba8674358dbcb2b57fa68618d88d62937ac3ff04 ujson-5.6.0.tar.gz # Locally computed sha256 checksums sha256 6a00a8f8b4050303368b694147bde1aed9c96bdff869c181dbbf3ccb784a1501 LICENSE.txt diff --git a/package/python-ujson/python-ujson.mk b/package/python-ujson/python-ujson.mk index 95cb0ebad1..24ad4822b8 100644 --- a/package/python-ujson/python-ujson.mk +++ b/package/python-ujson/python-ujson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UJSON_VERSION = 5.5.0 +PYTHON_UJSON_VERSION = 5.6.0 PYTHON_UJSON_SOURCE = ujson-$(PYTHON_UJSON_VERSION).tar.gz -PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/6e/4a/03ddad85a10dd52e209993a14afa0cb0dc5c348e4647329f1c53856ad9e6 +PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/45/48/466d672c53fcb93d64a2817e3a0306214103e3baba109821c88e1150c100 PYTHON_UJSON_SETUP_TYPE = setuptools PYTHON_UJSON_LICENSE = BSD-3-Clause PYTHON_UJSON_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 20 20:54:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:20 -0000 Subject: [Buildroot] [git commit branch/next] package/proftpd: bump to version 1.3.8 Message-ID: <20230220205159.BD207828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=583e06a495e401c564adfd0c13c4ebad33e34e63 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch (already in version) http://proftpd.org/docs/NEWS-1.3.8 http://proftpd.org/docs/RELEASE_NOTES-1.3.8 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...quotatab-fix-build-failure-against-gcc-10.patch | 56 ---------------------- package/proftpd/proftpd.hash | 2 +- package/proftpd/proftpd.mk | 4 +- 3 files changed, 3 insertions(+), 59 deletions(-) diff --git a/package/proftpd/0001-mod_quotatab-fix-build-failure-against-gcc-10.patch b/package/proftpd/0001-mod_quotatab-fix-build-failure-against-gcc-10.patch deleted file mode 100644 index 5f4eb66c71..0000000000 --- a/package/proftpd/0001-mod_quotatab-fix-build-failure-against-gcc-10.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 9c9623c8a47fb5580dfea1a59296c6d224479504 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Mon, 2 Mar 2020 23:45:22 +0000 -Subject: [PATCH] mod_quotatab: fix build failure against gcc-10 - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` -$ ./configure --with-modules=mod_quotatab && make -... -ld: modules/module_glue.o:(.data.rel+0x68): - undefined reference to `quotatab_file_module' -collect2: error: ld returned 1 exit status -make: *** [Makefile:56: proftpd] Error 1 -``` - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Signed-off-by: Sergei Trofimovich - -[Retrieved from: -https://github.com/proftpd/proftpd/commit/9c9623c8a47fb5580dfea1a59296c6d224479504] -Signed-off-by: Fabrice Fontaine ---- - contrib/mod_quotatab.c | 1 + - contrib/mod_quotatab.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/contrib/mod_quotatab.c b/contrib/mod_quotatab.c -index 4fa6c1f44..0ee480163 100644 ---- a/contrib/mod_quotatab.c -+++ b/contrib/mod_quotatab.c -@@ -50,6 +50,7 @@ typedef struct regtab_obj { - module quotatab_module; - - /* Quota objects for the current session */ -+quota_deltas_t quotatab_deltas; - static quota_table_t *limit_tab = NULL; - static quota_limit_t sess_limit; - -diff --git a/contrib/mod_quotatab.h b/contrib/mod_quotatab.h -index ed30333f5..c818395a0 100644 ---- a/contrib/mod_quotatab.h -+++ b/contrib/mod_quotatab.h -@@ -188,7 +188,7 @@ typedef struct table_obj { - #define QUOTATAB_TALLY_SRC 0x0002 - - /* Quota objects for the current session. */ --quota_deltas_t quotatab_deltas; -+extern quota_deltas_t quotatab_deltas; - - /* Function prototypes necessary for quotatab sub-modules */ - int quotatab_log(const char *, ...) diff --git a/package/proftpd/proftpd.hash b/package/proftpd/proftpd.hash index 983500bb8e..f950f26b86 100644 --- a/package/proftpd/proftpd.hash +++ b/package/proftpd/proftpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2dbe684034ab592742ebdb778a8a234b70f959efeb30feedee3ea77f26f74fbb proftpd-1.3.6e.tar.gz +sha256 f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748 proftpd-1.3.8.tar.gz sha256 391a473d755c29b5326fb726326ff3c37e42512f53a8f5789fc310232150bf80 COPYING diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 64c16a84eb..8e7d108c9e 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -4,8 +4,8 @@ # ################################################################################ -PROFTPD_VERSION = 1.3.6e -PROFTPD_SITE = $(call github,proftpd,proftpd,v$(PROFTPD_VERSION)) +PROFTPD_VERSION = 1.3.8 +PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source PROFTPD_LICENSE = GPL-2.0+ PROFTPD_LICENSE_FILES = COPYING PROFTPD_CPE_ID_VENDOR = proftpd From yann.morin.1998 at free.fr Mon Feb 20 20:54:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:21 -0000 Subject: [Buildroot] [git commit branch/next] package/python-websocket-client: bump to version 1.4.2 Message-ID: <20230220205203.EF4458648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6e04028825a8cfdf952553d89363d2c85b69746 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-websocket-client/python-websocket-client.hash | 4 ++-- package/python-websocket-client/python-websocket-client.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash index 08a6c260ca..5da778027b 100644 --- a/package/python-websocket-client/python-websocket-client.hash +++ b/package/python-websocket-client/python-websocket-client.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/websocket-client/json -md5 1e8b6daae0cad86f8cd9210b24bdf95b websocket-client-1.4.1.tar.gz -sha256 f9611eb65c8241a67fb373bef040b3cf8ad377a9f6546a12b620b6511e8ea9ef websocket-client-1.4.1.tar.gz +md5 26d1d8db59c9417570d8ec73ace1687b websocket-client-1.4.2.tar.gz +sha256 d6e8f90ca8e2dd4e8027c4561adeb9456b54044312dba655e7cae652ceb9ae59 websocket-client-1.4.2.tar.gz # Locally computed sha256 checksums sha256 638eb70dcc4af2e6d8388de0636ced399f7c24716e11b8573a6b06f879e80691 LICENSE diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk index 7e21187e22..79cde7e590 100644 --- a/package/python-websocket-client/python-websocket-client.mk +++ b/package/python-websocket-client/python-websocket-client.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKET_CLIENT_VERSION = 1.4.1 +PYTHON_WEBSOCKET_CLIENT_VERSION = 1.4.2 PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket-client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz -PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/99/11/01fe7ebcb7545a1990c53c11f31230afe1388b0b34256e3fd20e49482245 +PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/75/af/1d13b93e7a21aca7f8ab8645fcfcfad21fc39716dc9dce5dc2a97f73ff78 PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools PYTHON_WEBSOCKET_CLIENT_LICENSE = Apache-2.0 PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:21 -0000 Subject: [Buildroot] [git commit branch/next] boot/optee-os: bump to version 3.19.0 Message-ID: <20230220205159.EBACB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f748fc7489882095bdda22ed71b05149474d9b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bumps OP-TEE OS package version to OP-TEE release 3.19.0. Signed-off-by: Etienne Carriere Signed-off-by: Yann E. MORIN --- boot/optee-os/Config.in | 4 ++-- boot/optee-os/optee-os.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 5244700bc2..8bcce22306 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.18.0" + bool "3.19.0" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY help @@ -70,7 +70,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.18.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.19.0" if BR2_TARGET_OPTEE_OS_LATEST default "custom" if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL 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 38f68bec5d..a87f21a9bf 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.18.0/optee-os-3.18.0.tar.gz -sha256 bdd309697745ec4406951652094b50d9adb06c3612f01bd8a3d72682ec8e03e8 optee-os-3.18.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.19.0/optee-os-3.19.0.tar.gz +sha256 5e0c03bbc4d106f262a6bd33333c002c3380205ae6b82334aa7b644721ff7868 optee-os-3.19.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:22 -0000 Subject: [Buildroot] [git commit branch/next] package/python-zopfli: bump to version 0.2.2 Message-ID: <20230220205204.21A6D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc4bed533a6c0166b70aeb03ddde9b021ea4058f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-zopfli/python-zopfli.hash | 4 ++-- package/python-zopfli/python-zopfli.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-zopfli/python-zopfli.hash b/package/python-zopfli/python-zopfli.hash index 969ed97992..29bdfe5e5b 100644 --- a/package/python-zopfli/python-zopfli.hash +++ b/package/python-zopfli/python-zopfli.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zopfli/json -md5 505ea595d86b8a7fec55620c839a4859 zopfli-0.2.1.zip -sha256 e5263d2806e2c1ccb23f52b2972a235d31d42f22f3fa3032cc9aded51e9bf2c6 zopfli-0.2.1.zip +md5 0c1e41e5403524e0180f3ed9aaa356ec zopfli-0.2.2.zip +sha256 2d49db7540d9991976af464ebc1b9ed12988c04d90691bcb51dc4a373a9e2afc zopfli-0.2.2.zip # Locally computed sha256 checksums sha256 018b1cb87efdf7a04c2fcc13d57ed63f62149113fb207b27ea13430d64f13513 COPYING diff --git a/package/python-zopfli/python-zopfli.mk b/package/python-zopfli/python-zopfli.mk index 689634fefa..d6af6e4b5f 100644 --- a/package/python-zopfli/python-zopfli.mk +++ b/package/python-zopfli/python-zopfli.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZOPFLI_VERSION = 0.2.1 +PYTHON_ZOPFLI_VERSION = 0.2.2 PYTHON_ZOPFLI_SOURCE = zopfli-$(PYTHON_ZOPFLI_VERSION).zip -PYTHON_ZOPFLI_SITE = https://files.pythonhosted.org/packages/91/25/ba6f370e18359292f05ca4df93642eb7d1c424721ef61f61b8610a63d0c5 +PYTHON_ZOPFLI_SITE = https://files.pythonhosted.org/packages/9a/ed/d004d5737f9546167eecf0ecd995ee1a796703e512deb2f2ea26cdbe4b3e PYTHON_ZOPFLI_SETUP_TYPE = setuptools PYTHON_ZOPFLI_LICENSE = Apache-2.0 PYTHON_ZOPFLI_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:54:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:22 -0000 Subject: [Buildroot] [git commit branch/next] package/optee-benchmark: bump to version 3.19.0 Message-ID: <20230220205200.03572828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c552f39c98d271002032b0d74f62c9cfe4348dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bumps OP-TEE benchmark package version to OP-TEE release 3.19.0. Signed-off-by: Etienne Carriere Signed-off-by: Yann E. MORIN --- 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 27c91e0fb0..d74a24c8ab 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.18.0/optee-benchmark-3.18.0.tar.gz -sha256 2151aa5da062402518f35823d9c9dffa2e012f924625d2f7123e0d21d350a86b optee-benchmark-3.18.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.19.0/optee-benchmark-3.19.0.tar.gz +sha256 32f41854bf07eb7bb89dfc702da023c3a99518c33fbe7edf0e1f004e29a8c90c optee-benchmark-3.19.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 1071c4bb5c..338a51ada4 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.18.0 +OPTEE_BENCHMARK_VERSION = 3.19.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 Mon Feb 20 20:54:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:23 -0000 Subject: [Buildroot] [git commit branch/next] package/python-bleak: bump version to 0.19.1 Message-ID: <20230220205204.4832B86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e22b84872dbf76e696de1d5c1031af044597343 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Reviewed-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-bleak/Config.in | 3 ++- package/python-bleak/python-bleak.hash | 4 ++-- package/python-bleak/python-bleak.mk | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-bleak/Config.in b/package/python-bleak/Config.in index 085c16fae8..691450f86b 100644 --- a/package/python-bleak/Config.in +++ b/package/python-bleak/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_BLEAK bool "python-bleak" - select BR2_PACKAGE_PYTHON_DBUS_NEXT # runtime + select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime + select BR2_PACKAGE_PYTHON_DBUS_FAST # runtime help Bluetooth Low Energy platform Agnostic Klient. diff --git a/package/python-bleak/python-bleak.hash b/package/python-bleak/python-bleak.hash index 5acac877c9..9a8310b11c 100644 --- a/package/python-bleak/python-bleak.hash +++ b/package/python-bleak/python-bleak.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bleak/json -md5 0c26b270358a782767012220fc595aa5 bleak-0.12.1.tar.gz -sha256 4a80a24cc944e52e856054639f298229c39a2fc720e5f7adbeebb117d10849ed bleak-0.12.1.tar.gz +md5 57564087d6e17ad1853109f530279b27 bleak-0.19.1.tar.gz +sha256 dff7c7f281dcb6629d0d722209c79ec3aa2a6c33867cb5c1ea3d44b72ca155c0 bleak-0.19.1.tar.gz # Locally computed sha256 checksums sha256 c4029a2b63b3824ab68be841f414addbdde20cb79cdbe272fa80c0b2abe65374 LICENSE diff --git a/package/python-bleak/python-bleak.mk b/package/python-bleak/python-bleak.mk index 3ae6d90311..00a4946ef6 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLEAK_VERSION = 0.12.1 +PYTHON_BLEAK_VERSION = 0.19.1 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz -PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/67/4b/ba00c69a24a8d08c86f02caa45727a2ad2844c7bee9630ccb063be226f71 +PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/30/b9/60e1f455365e2340fe076cf7683f4e6d03db0b759d4f93fa45e68dc371e5 PYTHON_BLEAK_SETUP_TYPE = setuptools PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:23 -0000 Subject: [Buildroot] [git commit branch/next] package/polkit: fix file permissions to match upstream Message-ID: <20230220205200.357D1828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=712ee21876562b46947142f35dfe1186d88ad241 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The permissions are now in sync with meson_post_install.py, and debian. Most importantly, polkit-agent-helper-1 is now setuid root, but also the rules.d directories rather than their parents are owned by polkitd. Signed-off-by: Norbert Lange Signed-off-by: Yann E. MORIN --- package/polkit/polkit.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index 205d6aff4c..dab5d542eb 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -52,9 +52,10 @@ define POLKIT_USERS endef define POLKIT_PERMISSIONS - /etc/polkit-1 r 750 root polkitd - - - - - - /usr/share/polkit-1 r 750 root polkitd - - - - - + /etc/polkit-1/rules.d d 700 polkitd root - - - - - + /usr/share/polkit-1/rules.d d 700 polkitd root - - - - - /usr/bin/pkexec f 4755 root root - - - - - + /usr/lib/polkit-1/polkit-agent-helper-1 f 4755 root root - - - - - endef define POLKIT_INSTALL_INIT_SYSTEMD From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:24 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-firmware: bump to 20221109 Message-ID: <20230220205204.62F0D86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bec9e5f7852f6fefb234877dff45916d921c4b18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Stephan Henningsen Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.hash | 4 ++-- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index d81223e311..321436fb61 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 e9d174af729511c8cccb60ec4e0b223b3c44b67d813b42d1ab9813acfa667fa5 linux-firmware-20221012.tar.xz +sha256 c0ddffbbcf30f2e015bddd5c6d3ce1f13976b906aceabda4a57e3c41a3190701 linux-firmware-20221109.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -35,6 +35,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 6857749e23d6a2853e5d33f6d6012a60d5baa2b4d51b5f8c6799d00d68733841 WHENCE +sha256 3461a8c8bddaa7b77f489f339abf90e4930fc0cde27915324781d12bd0828f1c 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 ea97166d93..672a536c4a 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20221012 +LINUX_FIRMWARE_VERSION = 20221109 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 Mon Feb 20 20:54:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:24 -0000 Subject: [Buildroot] [git commit branch/next] package/optee-examples: bump to version 3.19.0 Message-ID: <20230220205200.1D8E28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e86fdfa4d047a2f7f6d8f56b9ea056e65d35ea4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bumps OP-TEE examples package version to OP-TEE release 3.19.0. Signed-off-by: Etienne Carriere Signed-off-by: Yann E. MORIN --- 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 876584c5e9..937dd44c8c 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.18.0/optee-examples-3.18.0.tar.gz -sha256 6c64fbc6c5d1282b6311b4076351abbbfab10ac918c6cfc60e45ec705bb5a9ec optee-examples-3.18.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.19.0/optee-examples-3.19.0.tar.gz +sha256 545f9438885220e890a4f785249a586a957b22dacc31a3cbafa4656f8e9db349 optee-examples-3.19.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 17adce0fe0..bb2b208583 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.18.0 +OPTEE_EXAMPLES_VERSION = 3.19.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 peter at korsgaard.com Mon Feb 20 20:54:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:25 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15}.x / 6.0.x series Message-ID: <20230220205204.7EE6186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6936ec7ec6cb6df0e910f8df92961b79b12ee229 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls 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 3631fcb6d6..c1c690f4cc 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.0.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.0.12" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 0af02e1326..8739da4f75 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7 linux-6.0.9.tar.xz +sha256 89b730edf8942b49e02f9894244205886c9a214d629b35b88c4ff06ee9304f01 linux-6.0.12.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c93bb384a97ad1f0a4f18e442ce0291242722f78023eca658b22344541f09489 linux-5.19.17.tar.xz -sha256 cba39031dbc0eed0785b8afdc8c58cf23df83e47001b2354fa44486ae699c154 linux-5.15.79.tar.xz -sha256 f1b027526c58e7bd127f35b17736e4a6c865866b9048898f05c5358d4d52d4f3 linux-5.10.155.tar.xz -sha256 8b7df25b5560620eb2776d7b7c67569764b3916ff2f596767f72567b38d13d36 linux-5.4.224.tar.xz +sha256 fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65 linux-5.15.82.tar.xz +sha256 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7 linux-5.10.158.tar.xz +sha256 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44 linux-5.4.226.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 41bf80c4766ba9915470afe97ead6a16faff484b94590387012ce7f9ce41502b linux-4.9.333.tar.xz -sha256 26233603ae992cd31e9f78066d54475b3e3f878ab0e3fd271e74a795ab60b15c linux-4.14.299.tar.xz -sha256 37406ead61149283973bccdf670a1fd020c2f19722b7176e88ec8567df6dacd0 linux-4.19.265.tar.xz +sha256 ed4fd861fe9f6cd09f409f00dcccfa691e6d1a61c585723e587575dcb60aeb29 linux-4.9.335.tar.xz +sha256 acd2ee8e03da098fe9f7e52871dd0790850fc32b78657606bdf65bdd94bbf99b linux-4.14.301.tar.xz +sha256 219bce1ac3f542d06fc606ae6bcb10f8ab1940a46c7903113be59afc486c204f linux-4.19.268.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f72e7f408c..24f51418e6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -392,14 +392,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.333" if BR2_KERNEL_HEADERS_4_9 - default "4.14.299" if BR2_KERNEL_HEADERS_4_14 - default "4.19.265" if BR2_KERNEL_HEADERS_4_19 - default "5.4.224" if BR2_KERNEL_HEADERS_5_4 - default "5.10.155" if BR2_KERNEL_HEADERS_5_10 - default "5.15.79" if BR2_KERNEL_HEADERS_5_15 + default "4.9.335" if BR2_KERNEL_HEADERS_4_9 + default "4.14.301" if BR2_KERNEL_HEADERS_4_14 + default "4.19.268" if BR2_KERNEL_HEADERS_4_19 + default "5.4.226" if BR2_KERNEL_HEADERS_5_4 + default "5.10.158" if BR2_KERNEL_HEADERS_5_10 + default "5.15.82" if BR2_KERNEL_HEADERS_5_15 default "5.19.17" if BR2_KERNEL_HEADERS_5_19 - default "6.0.9" if BR2_KERNEL_HEADERS_6_0 + default "6.0.12" if BR2_KERNEL_HEADERS_6_0 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 Mon Feb 20 20:54:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:25 -0000 Subject: [Buildroot] [git commit branch/next] docs/website/news.html: add notice about 2022.08.3 release Message-ID: <20230220205200.5FE68828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21321a983615f8a3ca33c92599c7fc6023711949 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The announcement mail didn't make it to the mailman archive, so use the lore link instead. 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 8f7e22a0b9..74ccd11b08 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

          News

            +
          • +
            +
            +
            +

            2022.08.3 released

            +

            10 December 2022

            +
            +
            +

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

            +
            +
            +
            • +
          • From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:26 -0000 Subject: [Buildroot] [git commit branch/next] package/delve: bump to version 1.20.0 Message-ID: <20230220205204.AEAC386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a49ab07e76216dd9cecd86533e39d1a868102df8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/go-delve/delve/blob/master/CHANGELOG.md#1200-2022-12-07 https://github.com/go-delve/delve/releases/tag/v1.20.0 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/delve/delve.hash | 2 +- package/delve/delve.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/delve/delve.hash b/package/delve/delve.hash index 04ea4954cc..bf730b9047 100644 --- a/package/delve/delve.hash +++ b/package/delve/delve.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 086106a4776fa155bf20c37d27b9caed55255be6359c7f0bda1893d3adbb614e delve-1.8.0.tar.gz +sha256 39d2e3ae965abf5e71f3d8efbef368b1ee1d7154ea6604ec71d508350d419d03 delve-1.20.0.tar.gz sha256 778864b990007e8cef6633f8c372dd05bac1fada6cf67b008afb1483f83b38f5 LICENSE diff --git a/package/delve/delve.mk b/package/delve/delve.mk index 4ca1786ffc..b43d0f03c8 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -4,7 +4,7 @@ # ################################################################################ -DELVE_VERSION = 1.8.0 +DELVE_VERSION = 1.20.0 DELVE_SITE = $(call github,go-delve,delve,v$(DELVE_VERSION)) DELVE_LICENSE = MIT DELVE_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:26 -0000 Subject: [Buildroot] [git commit branch/next] package/connman: fix CVE-2022-3229{2, 3} Message-ID: <20230220205159.C96AD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f2b4c80f44ac0da88fc087017d495e627131350 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-32292: In ConnMan through 1.41, remote attackers able to send HTTP requests to the gweb component are able to exploit a heap-based buffer overflow in received_data to execute code. Fix CVE-2022-32293: In ConnMan through 1.41, a man-in-the-middle attack against a WISPR HTTP query could be used to trigger a use-after-free in WISPR handling, leading to crashes or code execution. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-gweb-Fix-OOB-write-in-received_data.patch | 36 +++++ ...r-Add-reference-counter-to-portal-context.patch | 142 +++++++++++++++++ ...03-wispr-Update-portal-context-references.patch | 175 +++++++++++++++++++++ package/connman/connman.mk | 7 + 4 files changed, 360 insertions(+) diff --git a/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch b/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch new file mode 100644 index 0000000000..d1a9d8f8fe --- /dev/null +++ b/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch @@ -0,0 +1,36 @@ +From d1a5ede5d255bde8ef707f8441b997563b9312bd Mon Sep 17 00:00:00 2001 +From: Nathan Crandall +Date: Tue, 12 Jul 2022 08:56:34 +0200 +Subject: gweb: Fix OOB write in received_data() + +There is a mismatch of handling binary vs. C-string data with memchr +and strlen, resulting in pos, count, and bytes_read to become out of +sync and result in a heap overflow. Instead, do not treat the buffer +as an ASCII C-string. We calculate the count based on the return value +of memchr, instead of strlen. + +Fixes: CVE-2022-32292 + +[Retrieved from: +https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=d1a5ede5d255bde8ef707f8441b997563b9312bd] +Signed-off-by: Fabrice Fontaine +--- + gweb/gweb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gweb/gweb.c b/gweb/gweb.c +index 12fcb1d8..13c6c5f2 100644 +--- a/gweb/gweb.c ++++ b/gweb/gweb.c +@@ -918,7 +918,7 @@ static gboolean received_data(GIOChannel *channel, GIOCondition cond, + } + + *pos = '\0'; +- count = strlen((char *) ptr); ++ count = pos - ptr; + if (count > 0 && ptr[count - 1] == '\r') { + ptr[--count] = '\0'; + bytes_read--; +-- +cgit + diff --git a/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch b/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch new file mode 100644 index 0000000000..c2cebdfdcc --- /dev/null +++ b/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch @@ -0,0 +1,142 @@ +From 72343929836de80727a27d6744c869dff045757c Mon Sep 17 00:00:00 2001 +From: Daniel Wagner +Date: Tue, 5 Jul 2022 08:32:12 +0200 +Subject: wispr: Add reference counter to portal context + +Track the connman_wispr_portal_context live time via a +refcounter. This only adds the infrastructure to do proper reference +counting. + +Fixes: CVE-2022-32293 + +[Retrieved from: +https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=72343929836de80727a27d6744c869dff045757c] +Signed-off-by: Fabrice Fontaine +--- + src/wispr.c | 52 ++++++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 42 insertions(+), 10 deletions(-) + +diff --git a/src/wispr.c b/src/wispr.c +index a07896ca..bde7e63b 100644 +--- a/src/wispr.c ++++ b/src/wispr.c +@@ -56,6 +56,7 @@ struct wispr_route { + }; + + struct connman_wispr_portal_context { ++ int refcount; + struct connman_service *service; + enum connman_ipconfig_type type; + struct connman_wispr_portal *wispr_portal; +@@ -97,6 +98,11 @@ static char *online_check_ipv4_url = NULL; + static char *online_check_ipv6_url = NULL; + static bool enable_online_to_ready_transition = false; + ++#define wispr_portal_context_ref(wp_context) \ ++ wispr_portal_context_ref_debug(wp_context, __FILE__, __LINE__, __func__) ++#define wispr_portal_context_unref(wp_context) \ ++ wispr_portal_context_unref_debug(wp_context, __FILE__, __LINE__, __func__) ++ + static void connman_wispr_message_init(struct connman_wispr_message *msg) + { + DBG(""); +@@ -162,9 +168,6 @@ static void free_connman_wispr_portal_context( + { + DBG("context %p", wp_context); + +- if (!wp_context) +- return; +- + if (wp_context->wispr_portal) { + if (wp_context->wispr_portal->ipv4_context == wp_context) + wp_context->wispr_portal->ipv4_context = NULL; +@@ -201,9 +204,38 @@ static void free_connman_wispr_portal_context( + g_free(wp_context); + } + ++static struct connman_wispr_portal_context * ++wispr_portal_context_ref_debug(struct connman_wispr_portal_context *wp_context, ++ const char *file, int line, const char *caller) ++{ ++ DBG("%p ref %d by %s:%d:%s()", wp_context, ++ wp_context->refcount + 1, file, line, caller); ++ ++ __sync_fetch_and_add(&wp_context->refcount, 1); ++ ++ return wp_context; ++} ++ ++static void wispr_portal_context_unref_debug( ++ struct connman_wispr_portal_context *wp_context, ++ const char *file, int line, const char *caller) ++{ ++ if (!wp_context) ++ return; ++ ++ DBG("%p ref %d by %s:%d:%s()", wp_context, ++ wp_context->refcount - 1, file, line, caller); ++ ++ if (__sync_fetch_and_sub(&wp_context->refcount, 1) != 1) ++ return; ++ ++ free_connman_wispr_portal_context(wp_context); ++} ++ + static struct connman_wispr_portal_context *create_wispr_portal_context(void) + { +- return g_try_new0(struct connman_wispr_portal_context, 1); ++ return wispr_portal_context_ref( ++ g_new0(struct connman_wispr_portal_context, 1)); + } + + static void free_connman_wispr_portal(gpointer data) +@@ -215,8 +247,8 @@ static void free_connman_wispr_portal(gpointer data) + if (!wispr_portal) + return; + +- free_connman_wispr_portal_context(wispr_portal->ipv4_context); +- free_connman_wispr_portal_context(wispr_portal->ipv6_context); ++ wispr_portal_context_unref(wispr_portal->ipv4_context); ++ wispr_portal_context_unref(wispr_portal->ipv6_context); + + g_free(wispr_portal); + } +@@ -452,7 +484,7 @@ static void portal_manage_status(GWebResult *result, + connman_info("Client-Timezone: %s", str); + + if (!enable_online_to_ready_transition) +- free_connman_wispr_portal_context(wp_context); ++ wispr_portal_context_unref(wp_context); + + __connman_service_ipconfig_indicate_state(service, + CONNMAN_SERVICE_STATE_ONLINE, type); +@@ -616,7 +648,7 @@ static void wispr_portal_request_wispr_login(struct connman_service *service, + return; + } + +- free_connman_wispr_portal_context(wp_context); ++ wispr_portal_context_unref(wp_context); + return; + } + +@@ -952,7 +984,7 @@ static int wispr_portal_detect(struct connman_wispr_portal_context *wp_context) + + if (wp_context->token == 0) { + err = -EINVAL; +- free_connman_wispr_portal_context(wp_context); ++ wispr_portal_context_unref(wp_context); + } + } else if (wp_context->timeout == 0) { + wp_context->timeout = g_idle_add(no_proxy_callback, wp_context); +@@ -1001,7 +1033,7 @@ int __connman_wispr_start(struct connman_service *service, + + /* If there is already an existing context, we wipe it */ + if (wp_context) +- free_connman_wispr_portal_context(wp_context); ++ wispr_portal_context_unref(wp_context); + + wp_context = create_wispr_portal_context(); + if (!wp_context) +-- +cgit + diff --git a/package/connman/0003-wispr-Update-portal-context-references.patch b/package/connman/0003-wispr-Update-portal-context-references.patch new file mode 100644 index 0000000000..61c4e21f94 --- /dev/null +++ b/package/connman/0003-wispr-Update-portal-context-references.patch @@ -0,0 +1,175 @@ +From 416bfaff988882c553c672e5bfc2d4f648d29e8a Mon Sep 17 00:00:00 2001 +From: Daniel Wagner +Date: Tue, 5 Jul 2022 09:11:09 +0200 +Subject: wispr: Update portal context references + +Maintain proper portal context references to avoid UAF. + +Fixes: CVE-2022-32293 + +[Retrieved from: +https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=416bfaff988882c553c672e5bfc2d4f648d29e8a] +Signed-off-by: Fabrice Fontaine +--- + src/wispr.c | 34 ++++++++++++++++++++++------------ + 1 file changed, 22 insertions(+), 12 deletions(-) + +diff --git a/src/wispr.c b/src/wispr.c +index bde7e63b..84bed33f 100644 +--- a/src/wispr.c ++++ b/src/wispr.c +@@ -105,8 +105,6 @@ static bool enable_online_to_ready_transition = false; + + static void connman_wispr_message_init(struct connman_wispr_message *msg) + { +- DBG(""); +- + msg->has_error = false; + msg->current_element = NULL; + +@@ -166,8 +164,6 @@ static void free_wispr_routes(struct connman_wispr_portal_context *wp_context) + static void free_connman_wispr_portal_context( + struct connman_wispr_portal_context *wp_context) + { +- DBG("context %p", wp_context); +- + if (wp_context->wispr_portal) { + if (wp_context->wispr_portal->ipv4_context == wp_context) + wp_context->wispr_portal->ipv4_context = NULL; +@@ -483,9 +479,6 @@ static void portal_manage_status(GWebResult *result, + &str)) + connman_info("Client-Timezone: %s", str); + +- if (!enable_online_to_ready_transition) +- wispr_portal_context_unref(wp_context); +- + __connman_service_ipconfig_indicate_state(service, + CONNMAN_SERVICE_STATE_ONLINE, type); + +@@ -546,14 +539,17 @@ static void wispr_portal_request_portal( + { + DBG(""); + ++ wispr_portal_context_ref(wp_context); + wp_context->request_id = g_web_request_get(wp_context->web, + wp_context->status_url, + wispr_portal_web_result, + wispr_route_request, + wp_context); + +- if (wp_context->request_id == 0) ++ if (wp_context->request_id == 0) { + wispr_portal_error(wp_context); ++ wispr_portal_context_unref(wp_context); ++ } + } + + static bool wispr_input(const guint8 **data, gsize *length, +@@ -618,13 +614,15 @@ static void wispr_portal_browser_reply_cb(struct connman_service *service, + return; + + if (!authentication_done) { +- wispr_portal_error(wp_context); + free_wispr_routes(wp_context); ++ wispr_portal_error(wp_context); ++ wispr_portal_context_unref(wp_context); + return; + } + + /* Restarting the test */ + __connman_service_wispr_start(service, wp_context->type); ++ wispr_portal_context_unref(wp_context); + } + + static void wispr_portal_request_wispr_login(struct connman_service *service, +@@ -700,11 +698,13 @@ static bool wispr_manage_message(GWebResult *result, + + wp_context->wispr_result = CONNMAN_WISPR_RESULT_LOGIN; + ++ wispr_portal_context_ref(wp_context); + if (__connman_agent_request_login_input(wp_context->service, + wispr_portal_request_wispr_login, +- wp_context) != -EINPROGRESS) ++ wp_context) != -EINPROGRESS) { + wispr_portal_error(wp_context); +- else ++ wispr_portal_context_unref(wp_context); ++ } else + return true; + + break; +@@ -753,6 +753,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + if (length > 0) { + g_web_parser_feed_data(wp_context->wispr_parser, + chunk, length); ++ wispr_portal_context_unref(wp_context); + return true; + } + +@@ -770,6 +771,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + + switch (status) { + case 000: ++ wispr_portal_context_ref(wp_context); + __connman_agent_request_browser(wp_context->service, + wispr_portal_browser_reply_cb, + wp_context->status_url, wp_context); +@@ -781,11 +783,14 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + if (g_web_result_get_header(result, "X-ConnMan-Status", + &str)) { + portal_manage_status(result, wp_context); ++ wispr_portal_context_unref(wp_context); + return false; +- } else ++ } else { ++ wispr_portal_context_ref(wp_context); + __connman_agent_request_browser(wp_context->service, + wispr_portal_browser_reply_cb, + wp_context->redirect_url, wp_context); ++ } + + break; + case 300: +@@ -798,6 +803,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + !g_web_result_get_header(result, "Location", + &redirect)) { + ++ wispr_portal_context_ref(wp_context); + __connman_agent_request_browser(wp_context->service, + wispr_portal_browser_reply_cb, + wp_context->status_url, wp_context); +@@ -808,6 +814,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + + wp_context->redirect_url = g_strdup(redirect); + ++ wispr_portal_context_ref(wp_context); + wp_context->request_id = g_web_request_get(wp_context->web, + redirect, wispr_portal_web_result, + wispr_route_request, wp_context); +@@ -820,6 +827,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + + break; + case 505: ++ wispr_portal_context_ref(wp_context); + __connman_agent_request_browser(wp_context->service, + wispr_portal_browser_reply_cb, + wp_context->status_url, wp_context); +@@ -832,6 +840,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) + wp_context->request_id = 0; + done: + wp_context->wispr_msg.message_type = -1; ++ wispr_portal_context_unref(wp_context); + return false; + } + +@@ -890,6 +899,7 @@ static void proxy_callback(const char *proxy, void *user_data) + xml_wispr_parser_callback, wp_context); + + wispr_portal_request_portal(wp_context); ++ wispr_portal_context_unref(wp_context); + } + + static gboolean no_proxy_callback(gpointer user_data) +-- +cgit + diff --git a/package/connman/connman.mk b/package/connman/connman.mk index a76a339e6f..fbd7318e4e 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -13,6 +13,13 @@ CONNMAN_LICENSE = GPL-2.0 CONNMAN_LICENSE_FILES = COPYING CONNMAN_CPE_ID_VENDOR = intel +# 0001-gweb-Fix-OOB-write-in-received_data.patch +CONNMAN_IGNORE_CVES += CVE-2022-32292 + +# 0002-wispr-Add-reference-counter-to-portal-context.patch +# 0003-wispr-Update-portal-context-references.patch +CONNMAN_IGNORE_CVES += CVE-2022-32293 + CONNMAN_CONF_OPTS = --with-dbusconfdir=/etc ifeq ($(BR2_INIT_SYSTEMD),y) From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:27 -0000 Subject: [Buildroot] [git commit branch/next] package/gocryptfs: bump to version 2.3 Message-ID: <20230220205204.EC82A86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e744cc249030d0ded5c5bb445b9b4ac46e400957 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Rebase the patch for riscv compatibility as well. "go mod tidy" insists on updating x/sys so pin it to the version from upstream release v2.3 using a replace statement. https://github.com/rfjakob/gocryptfs/releases/tag/v2.3 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- ...o.mod-fix-jacobsa-crypto-build-on-riscv64.patch | 84 +++++++++++++++------- package/gocryptfs/gocryptfs.hash | 2 +- package/gocryptfs/gocryptfs.mk | 2 +- 3 files changed, 61 insertions(+), 27 deletions(-) diff --git a/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch b/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch index 90e3cc262d..0074932fba 100644 --- a/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch +++ b/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch @@ -1,4 +1,4 @@ -From e9b64ab75e8539a52d60ecb299fc5425f0d27dc7 Mon Sep 17 00:00:00 2001 +From e72d34ef2c87e5c9ffd49c98b651641f48d89c24 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 25 Jun 2022 14:57:38 -0700 Subject: [PATCH] go.mod: fix jacobsa/crypto build on riscv64 @@ -11,27 +11,31 @@ Upstream PR: https://github.com/jacobsa/crypto/issues/13 Signed-off-by: Christian Stewart --- - go.mod | 9 ++--- - go.sum | 4 +- + go.mod | 15 ++++--- + go.sum | 16 +++----- .../jacobsa/crypto/cmac/hash_generic.go | 40 +++++++++++++++++++ - vendor/modules.txt | 13 +----- - 4 files changed, 48 insertions(+), 18 deletions(-) + vendor/modules.txt | 16 ++------ + 4 files changed, 59 insertions(+), 28 deletions(-) create mode 100644 vendor/github.com/jacobsa/crypto/cmac/hash_generic.go diff --git a/go.mod b/go.mod -index 29f7c2c..533fcdd 100644 +index 754a667..5103029 100644 --- a/go.mod +++ b/go.mod -@@ -2,19 +2,18 @@ module github.com/rfjakob/gocryptfs/v2 +@@ -2,19 +2,22 @@ module github.com/rfjakob/gocryptfs/v2 go 1.16 +// Fixes build against risc-v +// See: https://github.com/jacobsa/crypto/issues/13 -+replace github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607 // xorblock-generic-1 ++replace github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 // buildroot-1 ++ ++// Prevent x/sys version from changing and polluting vendor/ ++// Pin it to the current version in the original go.mod. ++replace golang.org/x/sys => golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 + require ( - github.com/hanwen/go-fuse/v2 v2.1.1-0.20210825171523-3ab5d95a30ae + github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914 github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 - github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd // indirect - github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff // indirect @@ -43,25 +47,52 @@ index 29f7c2c..533fcdd 100644 github.com/spf13/pflag v1.0.5 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 - golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect - golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 - golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b +- golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 ++ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a + golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 ) diff --git a/go.sum b/go.sum -index be0be5f..c26b80e 100644 +index 4167388..71826e9 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,9 @@ -+github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607 h1:N8UVJlxKDhrvHTKXC7oVVfhVvGbgaw2mmlnCgGkfOFc= -+github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607/go.mod h1:Om5VFfyh5VipAEOOVoHAUa4hebUCKxQUjggFPTLeH08= ++github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 h1:awSzmXfGWzvmRmrU1oSHqUdpxNcVPRMqv0rytbSA8kA= ++github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93/go.mod h1:SHG0nzlQikn4UxNIXqEKd2hvJM2tRIrdr1FfOrF+/wY= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/hanwen/go-fuse/v2 v2.1.1-0.20210825171523-3ab5d95a30ae h1:4CB6T4YTUVvnro5ba8ju1QCbOuyGAeF3vvKlo50EJ4k= - github.com/hanwen/go-fuse/v2 v2.1.1-0.20210825171523-3ab5d95a30ae/go.mod h1:B1nGE/6RBFyBRC1RRnf23UpwCdyJ31eukw34oAKukAc= + github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914 h1:hGXMxS1wTE4y+f7iBqFArrJ6X8QozHnEdnVzGZI9Ywc= + github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914/go.mod h1:B1nGE/6RBFyBRC1RRnf23UpwCdyJ31eukw34oAKukAc= -github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 h1:YuDUUFNM21CAbyPOpOP8BicaTD/0klJEKt5p8yuw+uY= -github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115/go.mod h1:LadVJg0XuawGk+8L1rYnIED8451UyNxEMdTWCEt5kmU= github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd h1:9GCSedGjMcLZCrusBZuo4tyKLpKUPenUUqi34AkuFmA= github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M= github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff h1:2xRHTvkpJ5zJmglXLRqHiZQNjUoOkhUyhTAhEQvPAWw= +@@ -30,21 +30,17 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= + golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +-golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c= +-golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= ++golang.org/x/net v0.0.0-20220708220712-1185a9018129 h1:vucSRfWwTsoXro7P+3Cjlr6flUMtzCwzlvkxEQtHHB0= ++golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= + golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo= + golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= ++golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= + golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc= + golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= + golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= ++golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= + golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= diff --git a/vendor/github.com/jacobsa/crypto/cmac/hash_generic.go b/vendor/github.com/jacobsa/crypto/cmac/hash_generic.go new file mode 100644 index 0000000..235e3fc @@ -109,7 +140,7 @@ index 0000000..235e3fc + } +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 662f0c3..9b47daa 100644 +index 0e97e42..634c079 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -5,19 +5,11 @@ github.com/hanwen/go-fuse/v2/fuse @@ -117,7 +148,7 @@ index 662f0c3..9b47daa 100644 github.com/hanwen/go-fuse/v2/internal/utimens github.com/hanwen/go-fuse/v2/splice -# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 -+# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 => github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607 ++# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 => github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 ## explicit github.com/jacobsa/crypto/cmac github.com/jacobsa/crypto/common @@ -133,20 +164,23 @@ index 662f0c3..9b47daa 100644 # github.com/pkg/xattr v0.4.3 ## explicit github.com/pkg/xattr -@@ -40,8 +32,6 @@ golang.org/x/crypto/pbkdf2 +@@ -39,9 +31,7 @@ golang.org/x/crypto/internal/subtle + golang.org/x/crypto/pbkdf2 golang.org/x/crypto/poly1305 golang.org/x/crypto/scrypt - golang.org/x/crypto/ssh/terminal -# golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d -## explicit - # golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 +-# golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 ++# golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a => golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 ## explicit golang.org/x/sys/cpu -@@ -52,3 +42,4 @@ golang.org/x/sys/windows - # golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b + golang.org/x/sys/internal/unsafeheader +@@ -51,3 +41,5 @@ golang.org/x/sys/windows + # golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 ## explicit golang.org/x/term -+# github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v0.0.0-20220403053904-77863254e607 ++# github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 ++# golang.org/x/sys => golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 -- -2.35.1 +2.38.1 diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash index ae161d1cd8..28965a0648 100644 --- a/package/gocryptfs/gocryptfs.hash +++ b/package/gocryptfs/gocryptfs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 88f32bb8e18fa89e4ab666f7c8ad622281a11e423b4093e50ac260f960bc40b6 gocryptfs-2.2.1.tar.gz +sha256 bfc98c18e44a2ca24a0e1472b6d9bb96e6072d7fb5651616515d2e7117b8fed9 gocryptfs-2.3.tar.gz sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk index 8f70dba7c3..077597e7e8 100644 --- a/package/gocryptfs/gocryptfs.mk +++ b/package/gocryptfs/gocryptfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOCRYPTFS_VERSION = 2.2.1 +GOCRYPTFS_VERSION = 2.3 GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) GOCRYPTFS_LICENSE = MIT GOCRYPTFS_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:54:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:27 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.08.3 Message-ID: <20230220205200.533DD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f9f6180491c697b29aa687f378c2ab58c7f91fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard (cherry picked from commit 1fad7a933d28a17ce4064898e49e2ad4d6ba8bd3) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGES b/CHANGES index f71e53fe4b..312e324ef7 100644 --- a/CHANGES +++ b/CHANGES @@ -109,6 +109,22 @@ #15061: Node.js Package fails to build against musl i386 #15071: RTL8723BS library is outdated +2022.08.3, released December 10th, 2022 + + Important / security related fixes. + + Updated/fixed packages: asterisk, dash, dovecot, edk2, + edk2-platforms, elf2flt, exim, freerdp, gcc, gdb, git, gnupg2, + heimdal, iwd, kodi, libarchive, libkrb5, libksba, libmdbx, + libopenssl, matchbox-keyboard, memcached, netsnmp, nginx, + nodejs, openpgm, optee-client, python-scipy, python3, rsync, + rtl8723bu, samba4, sdl, sdl2, swupdate, sysstat, systemd, + uboot, vim, vlc, wilc-driver, xen, xterm + + Issues resolved (http://bugs.uclibc.org): + + 15131: Target GDB uses internal zlib + 2022.08.2, released November 16th, 2022 Important / security related fixes. From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:28 -0000 Subject: [Buildroot] [git commit branch/next] package/swig: bump to version 4.1.1 Message-ID: <20230220205205.5339586494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=260924e239627cbe1379cfc752939245d53a06e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/swig/Config.in.host | 2 +- package/swig/swig.hash | 2 +- package/swig/swig.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/swig/Config.in.host b/package/swig/Config.in.host index fd2049d30a..4c0deebc58 100644 --- a/package/swig/Config.in.host +++ b/package/swig/Config.in.host @@ -5,4 +5,4 @@ config BR2_PACKAGE_HOST_SWIG written in C and C++ with a variety of high-level programming languages. - http://www.swig.org/ + https://www.swig.org/ diff --git a/package/swig/swig.hash b/package/swig/swig.hash index 64fe4f979e..21590c422a 100644 --- a/package/swig/swig.hash +++ b/package/swig/swig.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc swig-4.0.2.tar.gz +sha256 2af08aced8fcd65cdb5cc62426768914bedc735b1c250325203716f78e39ac9b swig-4.1.1.tar.gz sha256 f53abaeed775018d519a1b9615f0ca17894772bd9ca21c2a156bf340ac41c13e LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-GPL sha256 7f50d942373a871211c5efee03f3db2f9efd1cff1002b0ef8e3748baa611a5c2 LICENSE-UNIVERSITIES diff --git a/package/swig/swig.mk b/package/swig/swig.mk index 437cf448be..d432cab53d 100644 --- a/package/swig/swig.mk +++ b/package/swig/swig.mk @@ -4,8 +4,8 @@ # ################################################################################ -SWIG_VERSION_MAJOR = 4.0 -SWIG_VERSION = $(SWIG_VERSION_MAJOR).2 +SWIG_VERSION_MAJOR = 4.1 +SWIG_VERSION = $(SWIG_VERSION_MAJOR).1 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION) HOST_SWIG_DEPENDENCIES = host-bison host-pcre HOST_SWIG_CONF_OPTS = \ From peter at korsgaard.com Mon Feb 20 20:54:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:28 -0000 Subject: [Buildroot] [git commit branch/next] docs/website: update for 2022.02.8 Message-ID: <20230220205200.7CACB828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8de04b2cb6d4734665c332d8714006ba77e8b962 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The announcement mail didn't make it to the mailman archive, so use the lore link instead. Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 6f7007529c..7fc5d1169b 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
            Download
            -

            Latest long term support release: 2022.02.7

            +

            Latest long term support release: 2022.02.8

            - +
            - +
            -

            buildroot-2022.02.7.tar.gz

            -

            PGP signature

            +

            buildroot-2022.02.8.tar.gz

            +

            PGP signature

            - +
            - +
            -

            buildroot-2022.02.7.tar.xz

            -

            PGP signature

            +

            buildroot-2022.02.8.tar.xz

            +

            PGP signature

            diff --git a/docs/website/news.html b/docs/website/news.html index 74ccd11b08..75f1cb785d 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

            News

              +
            • +
              +
              +
              +

              2022.02.8 released

              +

              10 December 2022

              +
              +
              +

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

              +
              +
              +
              • +
            • From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:29 -0000 Subject: [Buildroot] [git commit branch/next] support/testing/tests/package/test_ncdu.py: new runtime test Message-ID: <20230220205205.7BFBE86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ad775fc8118927bde9bf442bbb7e8307280e97d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_ncdu.py | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 20677ef8ce..04047d43da 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1683,6 +1683,7 @@ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ diff --git a/support/testing/tests/package/test_ncdu.py b/support/testing/tests/package/test_ncdu.py new file mode 100644 index 0000000000..cbbb27f751 --- /dev/null +++ b/support/testing/tests/package/test_ncdu.py @@ -0,0 +1,23 @@ +import os + +import infra.basetest + + +class TestNcdu(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_NCDU=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("ncdu --version") + self.assertRunOk("ncdu -x -o /tmp/ncdu.list /") + self.assertRunOk("grep -F '\"name\":\"ncdu\"' /tmp/ncdu.list") From yann.morin.1998 at free.fr Mon Feb 20 20:54:29 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:29 -0000 Subject: [Buildroot] [git commit branch/next] package/smcroute: bump to version 2.5.6 Message-ID: <20230220205200.B4FB78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61f03109c7d6b2a66462d920ee5f4b9f7530ca7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/troglobit/smcroute/releases/tag/2.5.6 Most important news from the ChangeLog: - Batch mode supoprt for smcroutectl - Fix strange behavior when joining/leaving the same group - Minor spelling checks of documentation Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg [yann.morin.1998 at free.fr: added news by Joachim] Signed-off-by: Yann E. MORIN --- package/smcroute/smcroute.hash | 4 ++-- package/smcroute/smcroute.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/smcroute/smcroute.hash b/package/smcroute/smcroute.hash index 642a1f62fe..b472dfbc04 100644 --- a/package/smcroute/smcroute.hash +++ b/package/smcroute/smcroute.hash @@ -1,5 +1,5 @@ -# Upstream .sha256 from GitHub -sha256 2569cd97fa2047df14203a7144be53a1b32928cb460421a302bbcce381b42bc3 smcroute-2.5.5.tar.gz +# Hash from https://github.com/troglobit/smcroute/releases/download/2.5.6/smcroute-2.5.6.tar.gz.sha256 +sha256 0be38f617e322daafaa941c02423239f5c117b940cf0f45bacadb6733c4b3916 smcroute-2.5.6.tar.gz # Locally generated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/smcroute/smcroute.mk b/package/smcroute/smcroute.mk index e6114c9a8c..0c4f88ab1b 100644 --- a/package/smcroute/smcroute.mk +++ b/package/smcroute/smcroute.mk @@ -4,7 +4,7 @@ # ################################################################################ -SMCROUTE_VERSION = 2.5.5 +SMCROUTE_VERSION = 2.5.6 SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION) SMCROUTE_LICENSE = GPL-2.0+ SMCROUTE_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:30 -0000 Subject: [Buildroot] [git commit branch/next] package/exempi: bump to version 2.6.3 Message-ID: <20230220205205.AB16E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63b540638c72969bf8c3eb6c06e1c49c4fbcbb9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Samples can be disabled since version 2.6.2 and https://gitlab.freedesktop.org/libopenraw/exempi/-/commit/a8db9f4e7e4156ee7e52def01f1f83ca5fa7de40 This bump will fix the following build failure on arm with gcc 10 raised since bump to version 2.6.0 in commit 55f1d0a3592253df2a356c195e5131a970eade9b and https://gitlab.freedesktop.org/libopenraw/exempi/-/commit/0872e35a30457d2ecf746a1bebdb7d94636d0e2f https://github.com/adobe/XMP-Toolkit-SDK/commit/0872e35a30457d2ecf746a1bebdb7d94636d0e2f thanks to https://gitlab.freedesktop.org/libopenraw/exempi/-/commit/f26d77ba26a7245a95068bca2eea9608f4e79f80: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../XMPFiles/source/.libs/libXMPFiles.a(XMPFiles_Impl.o):(.rodata+0x5c): multiple definition of `typeinfo name for TXMPMeta, std::allocator > >'; XMPFilesCoverage.o:(.rodata+0x0): first defined here https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.3/NEWS Fixes: - http://autobuild.buildroot.org/results/c440719de02a154c6bdae11bda06ea30c131c71d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/exempi/exempi.hash | 2 +- package/exempi/exempi.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/exempi/exempi.hash b/package/exempi/exempi.hash index 5df610de17..772d9130d4 100644 --- a/package/exempi/exempi.hash +++ b/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd exempi-2.6.1.tar.bz2 +sha256 80b3aa0b7f54978c6a49cc5f5f1d3b6e9524b59de74ef92b3bf0abeba4c28fb1 exempi-2.6.3.tar.xz sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index 56fbe20379..f808afd53c 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -4,11 +4,11 @@ # ################################################################################ -EXEMPI_VERSION = 2.6.1 -EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 +EXEMPI_VERSION = 2.6.3 +EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.xz EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES -EXEMPI_CONF_OPTS = --disable-unittest +EXEMPI_CONF_OPTS = --disable-samples --disable-unittest EXEMPI_DEPENDENCIES = host-pkgconf expat zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) EXEMPI_LICENSE = BSD-3-Clause From yann.morin.1998 at free.fr Mon Feb 20 20:54:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:30 -0000 Subject: [Buildroot] [git commit branch/next] package/sed: bump to version 4.9 Message-ID: <20230220205200.A93B9828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0aea5f9d8e63f6146730c39b05ec8cae15dd100 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update hash of COPYING (URL updated: https://git.savannah.gnu.org/cgit/sed.git/commit/?id=5adab913a82ef1b7f844339ab209531ccf198990) https://git.savannah.gnu.org/cgit/sed.git/tree/NEWS?h=v4.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/sed/sed.hash | 6 +++--- package/sed/sed.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sed/sed.hash b/package/sed/sed.hash index bb48128526..10e2c36d8f 100644 --- a/package/sed/sed.hash +++ b/package/sed/sed.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/sed/sed-4.8.tar.xz.sig +# https://ftp.gnu.org/gnu/sed/sed-4.9.tar.xz.sig # with the key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633 sed-4.8.tar.xz +sha256 6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181 sed-4.9.tar.xz # Locally calculated -sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 64fb2035b0..8165083658 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -4,7 +4,7 @@ # ################################################################################ -SED_VERSION = 4.8 +SED_VERSION = 4.9 SED_SOURCE = sed-$(SED_VERSION).tar.xz SED_SITE = $(BR2_GNU_MIRROR)/sed SED_LICENSE = GPL-3.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:31 -0000 Subject: [Buildroot] [git commit branch/next] package/capnproto: security bump to version 0.9.2 Message-ID: <20230220205205.D363786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=040ab175df6337bf39a609adea07a7756c309be8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-46149: Cap'n Proto is a data interchange format and remote procedure call (RPC) system. Cap'n Proro prior to versions 0.7.1, 0.8.1, 0.9.2, and 0.10.3, as well as versions of Cap'n Proto's Rust implementation prior to 0.13.7, 0.14.11, and 0.15.2 are vulnerable to out-of-bounds read due to logic error handling list-of-list. This issue may lead someone to remotely segfault a peer by sending it a malicious message, if the victim performs certain actions on a list-of-pointer type. Exfiltration of memory is possible if the victim performs additional certain actions on a list-of-pointer type. To be vulnerable, an application must perform a specific sequence of actions, described in the GitHub Security Advisory. The bug is present in inlined code, therefore the fix will require rebuilding dependent applications. Cap'n Proto has C++ fixes available in versions 0.7.1, 0.8.1, 0.9.2, and 0.10.3. https://github.com/capnproto/capnproto/security/advisories/GHSA-qqff-4vw4-f6hx https://dwrensha.github.io/capnproto-rust/2022/11/30/out_of_bounds_memory_access_bug.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/capnproto/capnproto.hash | 2 +- package/capnproto/capnproto.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash index 7fd0e6158b..c3233e7c8b 100644 --- a/package/capnproto/capnproto.hash +++ b/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 daf49f794560f715e2f4651c842aaece2d065d4216834c5c3d3254962e35b535 capnproto-0.9.1.tar.gz +sha256 4fe1ca8ab90859f33f08d2c4fcd7099e2983b0b946beecebd2fe051e3a64c67e capnproto-0.9.2.tar.gz sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk index 7fc07043fb..23f128455a 100644 --- a/package/capnproto/capnproto.mk +++ b/package/capnproto/capnproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAPNPROTO_VERSION = 0.9.1 +CAPNPROTO_VERSION = 0.9.2 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:31 -0000 Subject: [Buildroot] [git commit branch/next] package/python-munch: new package Message-ID: <20230220205200.885308648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=002a5f7ced3d148655ee0d58f5dc61a509d9e218 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/python-munch/Config.in | 7 +++++++ package/python-munch/python-munch.hash | 5 +++++ package/python-munch/python-munch.mk | 15 +++++++++++++++ 4 files changed, 28 insertions(+) diff --git a/package/Config.in b/package/Config.in index f4a423c7a6..d5a673295d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1128,6 +1128,7 @@ menu "External python modules" source "package/python-msgfy/Config.in" source "package/python-msgpack/Config.in" source "package/python-multidict/Config.in" + source "package/python-munch/Config.in" source "package/python-mutagen/Config.in" source "package/python-mwclient/Config.in" source "package/python-mwscrape/Config.in" diff --git a/package/python-munch/Config.in b/package/python-munch/Config.in new file mode 100644 index 0000000000..9db2623674 --- /dev/null +++ b/package/python-munch/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_MUNCH + bool "python-munch" + help + Munch is a dictionary that supports attribute-style access, + a la JavaScript. + + https://github.com/Infinidat/munch diff --git a/package/python-munch/python-munch.hash b/package/python-munch/python-munch.hash new file mode 100644 index 0000000000..7e32282833 --- /dev/null +++ b/package/python-munch/python-munch.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/munch/json +md5 ed84c3718416c8d4d03d0a6ef46e8e0c munch-2.5.0.tar.gz +sha256 2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2 munch-2.5.0.tar.gz +# Locally computed sha256 checksums +sha256 57ca95c92059c8380625192462979bd32994aae3fcdf902ff6eb1e467eeb0469 LICENSE.txt diff --git a/package/python-munch/python-munch.mk b/package/python-munch/python-munch.mk new file mode 100644 index 0000000000..85f6803f07 --- /dev/null +++ b/package/python-munch/python-munch.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-munch +# +################################################################################ + +PYTHON_MUNCH_VERSION = 2.5.0 +PYTHON_MUNCH_SOURCE = munch-$(PYTHON_MUNCH_VERSION).tar.gz +PYTHON_MUNCH_SITE = https://files.pythonhosted.org/packages/43/a1/ec48010724eedfe2add68eb7592a0d238590e14e08b95a4ffb3c7b2f0808 +PYTHON_MUNCH_SETUP_TYPE = setuptools +PYTHON_MUNCH_LICENSE = MIT +PYTHON_MUNCH_LICENSE_FILES = LICENSE.txt +PYTHON_MUNCH_DEPENDENCIES = host-python-pbr + +$(eval $(python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:54:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:32 -0000 Subject: [Buildroot] [git commit branch/next] package/python-boto3: bump to version 1.26.27 Message-ID: <20230220205200.F34A88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3277b274ce0a1ae356d07a944c5df6b019d97bef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-boto3/python-boto3.hash | 4 ++-- package/python-boto3/python-boto3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-boto3/python-boto3.hash b/package/python-boto3/python-boto3.hash index 347acde9b2..60fd07681c 100644 --- a/package/python-boto3/python-boto3.hash +++ b/package/python-boto3/python-boto3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/boto3/json -md5 17f5f946d79da139fa9fd9b014fe0d99 boto3-1.26.0.tar.gz -sha256 8f0e4eb5c26f927c09bc03302d38156af578b816f1e4f8ca4f0f734d134b9d4f boto3-1.26.0.tar.gz +md5 9d5447419233a259b3ade6fb86d86cb6 boto3-1.26.27.tar.gz +sha256 255a7565226c21c5d500f69aabb977e1ac07dbaf576f4428d00558e8e508a23b boto3-1.26.27.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/python-boto3/python-boto3.mk b/package/python-boto3/python-boto3.mk index 03dc32a08b..e40ac92f09 100644 --- a/package/python-boto3/python-boto3.mk +++ b/package/python-boto3/python-boto3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTO3_VERSION = 1.26.0 +PYTHON_BOTO3_VERSION = 1.26.27 PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz -PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/77/18/91af4ff58b26d03af8bf8e0759c4087b77032bdc54199d750905080c669a +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/62/7b/7cdcb980d9d90c910a6abec2cdee0ff6aa7a3d8afea4044ffd968d5c107c PYTHON_BOTO3_SETUP_TYPE = setuptools PYTHON_BOTO3_LICENSE = Apache-2.0 PYTHON_BOTO3_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:32 -0000 Subject: [Buildroot] [git commit branch/next] package/hans: bump to version 1.1 Message-ID: <20230220205206.1303786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f8dacd79bb578b61b710d626cfa82ed64d5a2ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/friedrich/hans/blob/v1.1/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hans/hans.hash | 6 +++--- package/hans/hans.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/hans/hans.hash b/package/hans/hans.hash index c555528efb..a1f591eb1c 100644 --- a/package/hans/hans.hash +++ b/package/hans/hans.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/hanstunnel/files/source/ -md5 8628393ec1b61a6c3a47a0a3dcb455b3 hans-1.0.tar.gz -sha1 0bc857df109af222732cb95c861a0f0a6dd53dee hans-1.0.tar.gz +md5 d23fbaeb990ed7d05695fcc8f8ef7847 hans-1.1.tar.gz +sha1 15dd4b717e8808d9279af970d4826aad826bc849 hans-1.1.tar.gz # Locally computed -sha256 f8f70cf22ba14d9223695c9e9a2d75289d8360f61f533b83ee538836f29a458e hans-1.0.tar.gz +sha256 966962d8734ab6b4d871e035d08f45256025a5220216bd48e41fa7fd0ad136c5 hans-1.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/hans/hans.mk b/package/hans/hans.mk index e26c2f37f8..6d2b1dabe5 100644 --- a/package/hans/hans.mk +++ b/package/hans/hans.mk @@ -4,7 +4,7 @@ # ################################################################################ -HANS_VERSION = 1.0 +HANS_VERSION = 1.1 HANS_SITE = http://downloads.sourceforge.net/project/hanstunnel/source HANS_LICENSE = GPL-3.0+ HANS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:33 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:33 -0000 Subject: [Buildroot] [git commit branch/next] package/python-botocore: bump to version 1.29.27 Message-ID: <20230220205201.0B3ED86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1eeac3dbfe32130bd15b9e9675891e68b12c38d0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-botocore/python-botocore.hash | 4 ++-- package/python-botocore/python-botocore.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-botocore/python-botocore.hash b/package/python-botocore/python-botocore.hash index 72e64f521e..8314c534e9 100644 --- a/package/python-botocore/python-botocore.hash +++ b/package/python-botocore/python-botocore.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/botocore/json -md5 fae1e9ad89e12436ef65b8208febdc3e botocore-1.29.0.tar.gz -sha256 f25dc0827005f81abf4b890a20c71f64ee40ea9e9795df38a242fdeed79e0a89 botocore-1.29.0.tar.gz +md5 488df64a4fcd884f9fbcf990bdc8b34c botocore-1.29.27.tar.gz +sha256 0932b22d8737b11037adf7e734f9b90425b575d0757e4c1a035e99f382955221 botocore-1.29.27.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt diff --git a/package/python-botocore/python-botocore.mk b/package/python-botocore/python-botocore.mk index 9d2a94b39b..4b14af4368 100644 --- a/package/python-botocore/python-botocore.mk +++ b/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.29.0 +PYTHON_BOTOCORE_VERSION = 1.29.27 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/0a/95/8f31139077187f2da9132d7547979262376e19056d99c7cf6278431a53de +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/08/3f/e9f97b0700e0be670404a7d4a9ac62fd59495897f15c928dd38874e98ef7 PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:33 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: add staging install Message-ID: <20230220205206.05DA886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb2f2886b2364e5b6a0867f55106bf83acb064e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next SWupdate provides API for external programs, so some headers and libraries must be install to staging. This patch installs headers and libs to STAGING_DIR, to prevent a header name collision a subdirectory /usr/include/swupdate creates. Signed-off-by: Andrey Grafin Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index ed0c1e56a8..54ae03f238 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -17,6 +17,7 @@ SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ LICENSES/LGPL-2.1-or-later.txt \ LICENSES/MIT.txt \ LICENSES/OFL-1.1.txt +SWUPDATE_INSTALL_STAGING = YES # swupdate uses $CROSS-cc instead of $CROSS-gcc, which is not # available in all external toolchains, and use CC for linking. Ensure @@ -228,6 +229,11 @@ define SWUPDATE_BUILD_CMDS $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) $(SWUPDATE_MAKE_OPTS) endef +define SWUPDATE_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ + $(SWUPDATE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) INCLUDEDIR=/usr/include/swupdate install +endef + define SWUPDATE_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ $(SWUPDATE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install From yann.morin.1998 at free.fr Mon Feb 20 20:54:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:34 -0000 Subject: [Buildroot] [git commit branch/next] package/python-bitstring: bump to version 4.0.1 Message-ID: <20230220205200.E6B4D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=332af506d3451c0bfe8e78624b25bf87fcebdddb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-bitstring/python-bitstring.hash | 6 +++--- package/python-bitstring/python-bitstring.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-bitstring/python-bitstring.hash b/package/python-bitstring/python-bitstring.hash index f05619a5d3..f078cc7f14 100644 --- a/package/python-bitstring/python-bitstring.hash +++ b/package/python-bitstring/python-bitstring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bitstring/json -md5 04d24380a0dc491e6bdacd983a90912e bitstring-3.1.9.tar.gz -sha256 a5848a3f63111785224dca8bb4c0a75b62ecdef56a042c8d6be74b16f7e860e7 bitstring-3.1.9.tar.gz +md5 ffd806650062e2fae33ee19b51906924 bitstring-4.0.1.tar.gz +sha256 7719f08f6df89ce28453a5e580d4a8ec1d1bda892dbb033466da0ccd9bdcb706 bitstring-4.0.1.tar.gz # Locally computed sha256 checksums -sha256 a9e9c584106d4f9686c9a6aa036e507b5e7044633b8acb4365bc074d8d004711 LICENSE +sha256 3705eed5a923f35d9bfaca1f10e9136cc84d6e576570aec661bda69991f129ea LICENSE diff --git a/package/python-bitstring/python-bitstring.mk b/package/python-bitstring/python-bitstring.mk index ff59487540..11c9375707 100644 --- a/package/python-bitstring/python-bitstring.mk +++ b/package/python-bitstring/python-bitstring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BITSTRING_VERSION = 3.1.9 +PYTHON_BITSTRING_VERSION = 4.0.1 PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz -PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/4c/b1/80d58eeb21c9d4ca739770558d61f6adacb13aa4908f4f55e0974cbd25ee +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/d2/64/e733b18349be383a4b7859c865d6c9e5ccc5845e9b4258504055607ec1cb PYTHON_BITSTRING_SETUP_TYPE = setuptools PYTHON_BITSTRING_LICENSE = MIT PYTHON_BITSTRING_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:35 -0000 Subject: [Buildroot] [git commit branch/next] package/pugixml: bump to version 1.13 Message-ID: <20230220205206.4E42E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc47afdc57cb7bdff3c4481607b2887f8a9cae94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://pugixml.org/docs/manual.html#v1.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pugixml/pugixml.hash | 2 +- package/pugixml/pugixml.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pugixml/pugixml.hash b/package/pugixml/pugixml.hash index 190dfb6a6e..b828e03561 100644 --- a/package/pugixml/pugixml.hash +++ b/package/pugixml/pugixml.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dcf671a919cc4051210f08ffd3edf9e4247f79ad583c61577a13ee93af33afc7 pugixml-1.12.1.tar.gz +sha256 40c0b3914ec131485640fa57e55bf1136446026b41db91c1bef678186a12abbe pugixml-1.13.tar.gz sha256 206f671b6d342557adcc973088c2c638df0ec0b1dabbcd24e65aadd2191778d2 LICENSE.md diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 9137f04630..c796186827 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PUGIXML_VERSION = 1.12.1 +PUGIXML_VERSION = 1.13 PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Feb 20 20:54:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:35 -0000 Subject: [Buildroot] [git commit branch/next] package/python-cbor2: bump to version 5.4.6 Message-ID: <20230220205201.2E6A786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eff0a0852830e05d2ed79dd8c744afff7d126002 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cbor2/python-cbor2.hash | 4 ++-- package/python-cbor2/python-cbor2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cbor2/python-cbor2.hash b/package/python-cbor2/python-cbor2.hash index 6098273aa1..70c35ca864 100644 --- a/package/python-cbor2/python-cbor2.hash +++ b/package/python-cbor2/python-cbor2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cbor2/json -md5 358b18e2a96ab96945e33417d5c8cb31 cbor2-5.4.3.tar.gz -sha256 62b863c5ee6ced4032afe948f3c1484f375550995d3b8498145237fe28e546c2 cbor2-5.4.3.tar.gz +md5 74512376482be8a6af10596a63b6d254 cbor2-5.4.6.tar.gz +sha256 b893500db0fe033e570c3adc956af6eefc57e280026bd2d86fd53da9f1e594d7 cbor2-5.4.6.tar.gz # Locally computed sha256 checksums sha256 a6afd126d8f545a15166a22f25fadff4b9fb4978bbdd17e97d97d950b66d2fef LICENSE.txt diff --git a/package/python-cbor2/python-cbor2.mk b/package/python-cbor2/python-cbor2.mk index 743ae4ef6f..a2fcd73b74 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.4.3 +PYTHON_CBOR2_VERSION = 5.4.6 PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/9d/c9/cfa5c35a62642a19c14bf9a12dfbf0ee134466be1f062df2258a2ec2f2f7 +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d9/69/de486293f5211d2e8fe1a19854e69f2811a18448162c52b48c67f8fbcac3 PYTHON_CBOR2_SETUP_TYPE = setuptools PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:36 -0000 Subject: [Buildroot] [git commit branch/next] package/docker-cli: security bump to version 20.10.21 Message-ID: <20230220205206.67E4986494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c833234cb4eb46cf95dbc3d4f32e1d2d2dab23b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Partial mitigations for CVE-2022-39253 Git vulnerability and other fixes: https://github.com/moby/moby/releases/tag/v20.10.21 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 153e0e5d00..d9477cf3af 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f4398ad858274605f8e4e55d4618b2f5bdff6969a4afa232842bb2417d8a98db docker-cli-20.10.19.tar.gz +sha256 f0f62ca1c80e8fd5b9e140ca64ef3e75dc7cf7a28040b3d10b260307128946e8 docker-cli-20.10.21.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 1fac21790b..a14edb2c31 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.19 +DOCKER_CLI_VERSION = 20.10.21 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Mon Feb 20 20:54:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:36 -0000 Subject: [Buildroot] [git commit branch/next] package/python-certifi: bump to version 2022.12.7 Message-ID: <20230220205201.39EC186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35db8c433e3a283a7611eca1b7e27e8cee474a4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-certifi/python-certifi.hash | 4 ++-- package/python-certifi/python-certifi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index 0557a5c97c..d3cf24ecfa 100644 --- a/package/python-certifi/python-certifi.hash +++ b/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 ff9c8d5c7e7fb083de6b874609c5ca68 certifi-2022.9.24.tar.gz -sha256 0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 certifi-2022.9.24.tar.gz +md5 d00966473b8ac42c2c033b75f4bed6f4 certifi-2022.12.7.tar.gz +sha256 35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 certifi-2022.12.7.tar.gz # Locally computed sha256 checksums sha256 a02f6c638f9fb84d06f7764c3ab085d8af7eda5b93c166da54312479077c6fb0 LICENSE diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index 8e2435199f..70f9e69d2c 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2022.9.24 +PYTHON_CERTIFI_VERSION = 2022.12.7 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/cb/a4/7de7cd59e429bd0ee6521ba58a75adaec136d32f91a761b28a11d8088d44 +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/37/f7/2b1b0ec44fdc30a3d31dfebe52226be9ddc40cd6c0f34ffc8923ba423b69 PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:37 -0000 Subject: [Buildroot] [git commit branch/next] package/fail2ban: bump to version 1.0.2 Message-ID: <20230220205206.950A886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de7850f9464a686fc7f37a8c1f8880f47ebffb00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/fail2ban/fail2ban/blob/1.0.2/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/fail2ban/fail2ban.hash | 2 +- package/fail2ban/fail2ban.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fail2ban/fail2ban.hash b/package/fail2ban/fail2ban.hash index 4073efe4c7..b40922e70a 100644 --- a/package/fail2ban/fail2ban.hash +++ b/package/fail2ban/fail2ban.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 62b54679ebae81ac57f32c5e27aba9f2494ec5bafd45a0fd68e7a27fd448e5ac fail2ban-1.0.1.tar.gz +sha256 ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23 fail2ban-1.0.2.tar.gz sha256 a75fec0260742fe6275d63ff6a5d97b924b28766558306b3fa4069763096929b COPYING diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk index 288266c2c7..7ad22d02d1 100644 --- a/package/fail2ban/fail2ban.mk +++ b/package/fail2ban/fail2ban.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAIL2BAN_VERSION = 1.0.1 +FAIL2BAN_VERSION = 1.0.2 FAIL2BAN_SITE = $(call github,fail2ban,fail2ban,$(FAIL2BAN_VERSION)) FAIL2BAN_LICENSE = GPL-2.0+ FAIL2BAN_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:54:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:37 -0000 Subject: [Buildroot] [git commit branch/next] package/python-cryptography: bump to version 38.0.4 Message-ID: <20230220205201.695CA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f0ceb49be6a5e3439fa6da226d4e414b5a208ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cryptography/python-cryptography.hash | 2 +- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 40d217f666..a01c8810e3 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 cd0b4536eabc6fcb80aa03430fc2ca485d33249eea0cd23f76c1dd9da410c66c cryptography-38.0.3.tar.gz +sha256 2abbeb6d42e8844de036bf2e0d78a42feeee1d57ebf29a07684490f98bdcab37 cryptography-38.0.4.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 69eb90d795..4254fa3557 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 38.0.3 +PYTHON_CRYPTOGRAPHY_VERSION = 38.0.4 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/13/dd/a9608b7aebe5d2dc0c98a4b2090a6b815628efa46cc1c046b89d8cd25f4c +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/e3/3f/41186b1f2fd86a542d399175f6b8e43f82cd4dfa51235a0b030a042b811a PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From yann.morin.1998 at free.fr Mon Feb 20 20:54:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:38 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-voodoo: bump version to 1.2.6 Message-ID: <20230220205207.4E7EB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5a0c2b779afa886cd1d79dc242f834ed0b87644 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003298.html Added hash file, removed autoreconf. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.hash | 5 +++++ .../x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.hash b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.hash new file mode 100644 index 0000000000..1220ec6c2f --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.hash @@ -0,0 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2022-December/003298.html +sha256 622973f03ac0bd0c854794ebeac268f15f4f831ec0dbe36e6cfa2b65042af602 xf86-video-voodoo-1.2.6.tar.xz +sha512 c889d79044438d6b15efceda07f63874063a2faa24a86d048e62c8ad1364efdfec04ff7ec662ad0749d2a7263abb14edb74e7d5ebf9a1aa880edb2b341a80a31 xf86-video-voodoo-1.2.6.tar.xz +# Locally computed +sha256 59ed98e3f6c6d0358d75183cf18a295d807acf2c3ea489197dd0a287b6e39bf1 COPYING diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk index d6deaa7974..33264a0bb7 100644 --- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk +++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk @@ -4,11 +4,11 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VOODOO_VERSION = 9172ae566a0e85313fc80ab62b4455393eefe593 -XDRIVER_XF86_VIDEO_VOODOO_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-voodoo +XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.2.6 +XDRIVER_XF86_VIDEO_VOODOO_SOURCE = xf86-video-voodoo-$(XDRIVER_XF86_VIDEO_VOODOO_VERSION).tar.xz +XDRIVER_XF86_VIDEO_VOODOO_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_VOODOO_LICENSE = MIT XDRIVER_XF86_VIDEO_VOODOO_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = YES XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xorgproto $(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:54:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:38 -0000 Subject: [Buildroot] [git commit branch/next] package/python-cheroot: bump to version 9.0.0 Message-ID: <20230220205201.5C8C186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25aedae85112ee9225f23863587807bdef67580c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cheroot/python-cheroot.hash | 4 ++-- package/python-cheroot/python-cheroot.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cheroot/python-cheroot.hash b/package/python-cheroot/python-cheroot.hash index e538d1fcdc..c3556109cd 100644 --- a/package/python-cheroot/python-cheroot.hash +++ b/package/python-cheroot/python-cheroot.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cheroot/json -md5 70247d0948899f453b50e6181cddd0d7 cheroot-8.6.0.tar.gz -sha256 366adf6e7cac9555486c2d1be6297993022eff6f8c4655c1443268cca3f08e25 cheroot-8.6.0.tar.gz +md5 1617fdbaba7d6edbe5b0ff48f7563111 cheroot-9.0.0.tar.gz +sha256 3d47ad9ee19ecbec144b4758399036692fdbf67a40b96eef1fb1454367b3d338 cheroot-9.0.0.tar.gz # Locally computed sha256 checksums sha256 e20feeb491a7e98084f15719349e9857aad41c4503c5e479f8815b063dbf7564 LICENSE.md diff --git a/package/python-cheroot/python-cheroot.mk b/package/python-cheroot/python-cheroot.mk index 95f2e39480..f75065c7da 100644 --- a/package/python-cheroot/python-cheroot.mk +++ b/package/python-cheroot/python-cheroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHEROOT_VERSION = 8.6.0 +PYTHON_CHEROOT_VERSION = 9.0.0 PYTHON_CHEROOT_SOURCE = cheroot-$(PYTHON_CHEROOT_VERSION).tar.gz -PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/99/c4/9b5ca09208047f2689c24ee63e195aa01ceffb7857d715cabc046559ddd6 +PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/8c/e7/8e6387d59a352c5799e917a23e7b76771a8bb97322c1ce7e42934d0066c3 PYTHON_CHEROOT_LICENSE = BSD-3-Clause PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md PYTHON_CHEROOT_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:39 -0000 Subject: [Buildroot] [git commit branch/next] package/sscep: requires blowfish support in openssl Message-ID: <20230220205207.A5B6286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4fc5e48521082d1b3cd9d96efc34979969d745b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Enable blowfish in openssl to fix the following build failure raised since the addition of the package in commit 72fa60dc102679f51b228336ec38f5af78ff7646: src/sscep.c: In function 'get_cipher_alg': src/sscep.c:123:24: warning: implicit declaration of function 'EVP_bf_cbc'; did you mean 'EVP_sm4_cbc'? [-Wimplicit-function-declaration] 123 | return EVP_bf_cbc(); | ^~~~~~~~~~ | EVP_sm4_cbc Fixes: - http://autobuild.buildroot.org/results/55d2c481d8c148fb3bb61c1331340bcd71274553 Signed-off-by: Fabrice Fontaine Reviewed-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/sscep/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sscep/Config.in b/package/sscep/Config.in index 4b9039c9b2..2e5e29f7c8 100644 --- a/package/sscep/Config.in +++ b/package/sscep/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SSCEP bool "sscep" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL help SSCEP is a client-only implementation of the SCEP From yann.morin.1998 at free.fr Mon Feb 20 20:54:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:39 -0000 Subject: [Buildroot] [git commit branch/next] package/python-django: bump to version 4.1.4 Message-ID: <20230220205201.84B73828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=045e99044223cfc707f5969791d7db2be8c5aa9b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop no longer required pytz and setuptools runtime dependencies. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-django/Config.in | 3 --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/python-django/Config.in b/package/python-django/Config.in index 8ffceb7275..5830cadc93 100644 --- a/package/python-django/Config.in +++ b/package/python-django/Config.in @@ -3,10 +3,7 @@ config BR2_PACKAGE_PYTHON_DJANGO select BR2_PACKAGE_PYTHON3_UNICODEDATA select BR2_PACKAGE_PYTHON3_PYEXPAT select BR2_PACKAGE_PYTHON_ASGIREF # runtime - select BR2_PACKAGE_PYTHON_PYTZ # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_SQLPARSE # runtime - help Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design. It takes your diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index b9ae8a1da1..40526bc0ff 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 60c54c37ecf9e5e635ee6bb07a13a9fa Django-4.1.3.tar.gz -sha256 678bbfc8604eb246ed54e2063f0765f13b321a50526bdc8cb1f943eda7fa31f1 Django-4.1.3.tar.gz +md5 02e2222d064d800f37c6a0ba78ce87f3 Django-4.1.4.tar.gz +sha256 d38a4e108d2386cb9637da66a82dc8d0733caede4c83c4afdbda78af4214211b Django-4.1.4.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index c90caa9635..96ec53f82c 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.3 +PYTHON_DJANGO_VERSION = 4.1.4 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/d0/ab/33f9c2bd4cf7ff2d319131eca7231247f962f781ebc8a012ebe02582244a +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/de/7d/ca5d224f7d345b0defd0a57c6deb0c6115fbe5304e4d9571f728b617f1a3 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:40 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/zcu106/patches: fix build by dropping U-Boot patch Message-ID: <20230220205207.C218D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca9b63a1e0bfa474a75522e62d671ed8b080f19f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since commit 3c997c457a4ee33d81e6b93e4f6f147bb9e861e9 ("configs/zynqmp_zcu106_defconfig: bump to Xilinx 2022.2"), we're using U-Boot version Xilinx 2022.2, which already carries the psu_init_gpl.c, causing the build to fail as our patch doesn't apply. Fix this by dropping the no longer needed patch. Fixes: 3c997c457a4ee33d81e6b93e4f6f147bb9e861e9 ("configs/zynqmp_zcu106_defconfig: bump to Xilinx 2022.2") Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- ...p-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch | 40 ---------------------- configs/zynqmp_zcu106_defconfig | 1 - 2 files changed, 41 deletions(-) diff --git a/board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch b/board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch deleted file mode 100644 index 4281880da0..0000000000 --- a/board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch +++ /dev/null @@ -1,40 +0,0 @@ -From aaaa10b613165b7790fe1c084de007240b5bd77a Mon Sep 17 00:00:00 2001 -From: Neal Frager -Date: Thu, 5 May 2022 13:34:43 +0100 -Subject: [PATCH 1/1] arm64: zynqmp: zynqmp-zcu102-revA: Fix DP PLL - configuration - -This patch fixes the DP audio and video PLL configurations -for the zynqmp-zcu106-revA evaluation board - -The Linux DP driver expects the DP to be using the following PLL config: - - DP video PLL should use the VPLL (0x0) - - DP audio PLL should use the RPLL (0x3) - -Register 0xFD1A0070 configures the DP video PLL. -Register 0xFD1A0074 configures the DP audio PLL. - -Signed-off-by: Neal Frager -Signed-off-by: Michal Simek ---- - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -index 15f0be1a43..cbc436289f 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -81,8 +81,8 @@ static unsigned long psu_clock_init_data(void) - psu_mask_write(0xFF5E0104, 0x00000007U, 0x00000000U); - psu_mask_write(0xFF5E0128, 0x01003F07U, 0x01000F00U); - psu_mask_write(0xFD1A00A0, 0x01003F07U, 0x01000200U); -- psu_mask_write(0xFD1A0070, 0x013F3F07U, 0x01010203U); -- psu_mask_write(0xFD1A0074, 0x013F3F07U, 0x01013C00U); -+ psu_mask_write(0xFD1A0070, 0x013F3F07U, 0x01010500U); -+ psu_mask_write(0xFD1A0074, 0x013F3F07U, 0x01013C03U); - psu_mask_write(0xFD1A007C, 0x013F3F07U, 0x01011303U); - psu_mask_write(0xFD1A0060, 0x03003F07U, 0x03000100U); - psu_mask_write(0xFD1A0068, 0x01003F07U, 0x01000200U); --- -2.17.1 - diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index dcbc4319e8..699e528f32 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -36,4 +36,3 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/zcu106/patches" From yann.morin.1998 at free.fr Mon Feb 20 20:54:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:40 -0000 Subject: [Buildroot] [git commit branch/next] package/python-reedsolo: new package Message-ID: <20230220205201.A9B88828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ef0959eabce0cf3f155b8959fdd06e6018c86e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/python-reedsolo/Config.in | 6 ++++++ package/python-reedsolo/python-reedsolo.hash | 5 +++++ package/python-reedsolo/python-reedsolo.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/package/Config.in b/package/Config.in index d5a673295d..6804e1d418 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1231,6 +1231,7 @@ menu "External python modules" source "package/python-qrcode/Config.in" source "package/python-raven/Config.in" source "package/python-redis/Config.in" + source "package/python-reedsolo/Config.in" source "package/python-reentry/Config.in" source "package/python-regex/Config.in" source "package/python-remi/Config.in" diff --git a/package/python-reedsolo/Config.in b/package/python-reedsolo/Config.in new file mode 100644 index 0000000000..6482b1e98c --- /dev/null +++ b/package/python-reedsolo/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_REEDSOLO + bool "python-reedsolo" + help + Pure-Python Reed Solomon encoder/decoder. + + https://github.com/tomerfiliba/reedsolomon diff --git a/package/python-reedsolo/python-reedsolo.hash b/package/python-reedsolo/python-reedsolo.hash new file mode 100644 index 0000000000..fdafc89f49 --- /dev/null +++ b/package/python-reedsolo/python-reedsolo.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/reedsolo/json +md5 b67a04027a1825c63a63b6793ec660a3 reedsolo-1.6.0.tar.gz +sha256 4e290d3b0a7207ac7aac186790766c752b5fcdf5e0b04dfd260349579052bbac reedsolo-1.6.0.tar.gz +# Locally computed sha256 checksums +sha256 0babd7b573efc3dcf5bb3c28b583150726f775d3dd8d54d6cd062834735b3d73 LICENSE diff --git a/package/python-reedsolo/python-reedsolo.mk b/package/python-reedsolo/python-reedsolo.mk new file mode 100644 index 0000000000..2a7fd42a05 --- /dev/null +++ b/package/python-reedsolo/python-reedsolo.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-reedsolo +# +################################################################################ + +PYTHON_REEDSOLO_VERSION = 1.6.0 +PYTHON_REEDSOLO_SOURCE = reedsolo-$(PYTHON_REEDSOLO_VERSION).tar.gz +PYTHON_REEDSOLO_SITE = https://files.pythonhosted.org/packages/9b/10/28d1492cc82a103bc06f18cb9a9dbb3a9168ab2e4068801fa0aa0c76b231 +PYTHON_REEDSOLO_SETUP_TYPE = setuptools +PYTHON_REEDSOLO_LICENSE = Public Domain +PYTHON_REEDSOLO_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:41 -0000 Subject: [Buildroot] [git commit branch/next] configs/versal_vck190_defconfig: use correct u-boot.dtb in boot.bin Message-ID: <20230220205207.DD74386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c19e0bdc5621518986dfa04ced0dadd3c53e193c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch fixes a problem in the vck190 boot.bin generation as it should be using the u-boot.dtb as the u-boot device tree and not the Linux system.dtb. While both dtbs are basically the same, it is better not to mix this up. Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- board/versal/post-image.sh | 2 +- board/versal/uboot.fragment | 1 + configs/versal_vck190_defconfig | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh index 890522c31d..f45f29a155 100755 --- a/board/versal/post-image.sh +++ b/board/versal/post-image.sh @@ -24,7 +24,7 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" } image { id = 0x1c000000, name=apu_subsystem - { type=raw, load=0x00001000, file=${BINARIES_DIR}/system.dtb } + { type=raw, load=0x00001000, file=${BINARIES_DIR}/u-boot.dtb } { core=a72-0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf } { core=a72-0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf } } diff --git a/board/versal/uboot.fragment b/board/versal/uboot.fragment new file mode 100644 index 0000000000..6f71907379 --- /dev/null +++ b/board/versal/uboot.fragment @@ -0,0 +1 @@ +CONFIG_OF_SEPARATE=y diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index d87df221c6..fcda6eb431 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -25,10 +25,12 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/versal/uboot.fragment" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y +BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_PACKAGE_VERSAL_FIRMWARE=y BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="v2022.2" BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" From yann.morin.1998 at free.fr Mon Feb 20 20:54:41 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:41 -0000 Subject: [Buildroot] [git commit branch/next] package/python-dnspython: bump to version 2.2.1 Message-ID: <20230220205201.9203C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7b796406e93b405ad9c276ac96fef7c4007cb15 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Backport patch removing wheel dependency. Add new host-python-setuptools-scm build dependency. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- ...01-Remove-spurious-wheel-build-dependency.patch | 29 ++++++++++++++++++++++ package/python-dnspython/python-dnspython.hash | 4 +-- package/python-dnspython/python-dnspython.mk | 20 ++++----------- 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch b/package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch new file mode 100644 index 0000000000..b43217edad --- /dev/null +++ b/package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch @@ -0,0 +1,29 @@ +From 53b989e4ce32c941d748ad33502600497595914a Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Wed, 2 Nov 2022 14:01:58 -0600 +Subject: [PATCH] Remove spurious wheel build dependency + +Wheel isn't a build dependency so it shouldn't be in setup_requires. +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +53b989e4ce32c941d748ad33502600497595914a] +--- + setup.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.cfg b/setup.cfg +index 0abd270..2cb3e06 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -46,7 +46,7 @@ packages = + dns.rdtypes.CH + python_requires = >=3.7 + test_suite = tests +-setup_requires = setuptools>=44; wheel; setuptools_scm[toml]>=3.4.3 ++setup_requires = setuptools>=44; setuptools_scm[toml]>=3.4.3 + + [options.extras_require] + DOH = httpx>=0.21.1; h2>=4.1.0; requests; requests-toolbelt +-- +2.34.1 + diff --git a/package/python-dnspython/python-dnspython.hash b/package/python-dnspython/python-dnspython.hash index c9c74c8d75..29441b41ea 100644 --- a/package/python-dnspython/python-dnspython.hash +++ b/package/python-dnspython/python-dnspython.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dnspython/json -md5 8a362d7b2358be3117683e2dbf9654fc dnspython-2.1.0.zip -sha256 e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4 dnspython-2.1.0.zip +md5 c7172f4115cd7b60fd5037cfcd8f9408 dnspython-2.2.1.tar.gz +sha256 0f7569a4a6ff151958b64304071d370daa3243d15941a7beedf0c9fe5105603e dnspython-2.2.1.tar.gz # Locally computed sha256 checksums sha256 c3ea3ff5654b329c19d3bc5f7481af623c3dded4a6145585499f843ad3d741cd LICENSE diff --git a/package/python-dnspython/python-dnspython.mk b/package/python-dnspython/python-dnspython.mk index 77e6082807..43030ae476 100644 --- a/package/python-dnspython/python-dnspython.mk +++ b/package/python-dnspython/python-dnspython.mk @@ -4,24 +4,14 @@ # ################################################################################ -PYTHON_DNSPYTHON_VERSION = 2.1.0 -PYTHON_DNSPYTHON_SOURCE = dnspython-$(PYTHON_DNSPYTHON_VERSION).zip -PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/13/27/5277de856f605f3429d752a39af3588e29d10181a3aa2e2ee471d817485a +PYTHON_DNSPYTHON_VERSION = 2.2.1 +PYTHON_DNSPYTHON_SOURCE = dnspython-$(PYTHON_DNSPYTHON_VERSION).tar.gz +PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/99/fb/e7cd35bba24295ad41abfdff30f6b4c271fd6ac70d20132fa503c3e768e0 PYTHON_DNSPYTHON_LICENSE = ISC PYTHON_DNSPYTHON_LICENSE_FILES = LICENSE PYTHON_DNSPYTHON_SETUP_TYPE = setuptools - -define PYTHON_DNSPYTHON_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(PYTHON_DNSPYTHON_DL_DIR)/$(PYTHON_DNSPYTHON_SOURCE) - mv $(@D)/dnspython-$(PYTHON_DNSPYTHON_VERSION)/* $(@D) - $(RM) -r $(@D)/dnspython-$(PYTHON_DNSPYTHON_VERSION) -endef - -define HOST_PYTHON_DNSPYTHON_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(HOST_PYTHON_DNSPYTHON_DL_DIR)/$(HOST_PYTHON_DNSPYTHON_SOURCE) - mv $(@D)/dnspython-$(HOST_PYTHON_DNSPYTHON_VERSION)/* $(@D) - $(RM) -r $(@D)/dnspython-$(HOST_PYTHON_DNSPYTHON_VERSION) -endef +PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm +HOST_PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:42 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-mediasdk: bump version to 22.6.4 Message-ID: <20230220205208.4C19F86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=193ea75cc03fe829aa8a04bc2335f426892998d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 e4fd569830..7cbedb7127 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a47a554cb3055614a8041cf478c4c89e249c2157c7e98389fbaba6144dc18783 intel-mediasdk-22.6.3.tar.gz +sha256 197acd056f81e9ff1c27068d50e8c84c2014d94c7ac17cad69d5c2d61e445fd3 intel-mediasdk-22.6.4.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index f5e39905a1..3bd6197779 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.6.3 +INTEL_MEDIASDK_VERSION = 22.6.4 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:42 -0000 Subject: [Buildroot] [git commit branch/next] package/python-esptool: bump to version 4.4 Message-ID: <20230220205201.B56D48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25b67238f53867f40b485b79eddaa7ef6fad9ca4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop no longer required pyaes runtime dependency. Add new bitstring, cryptography and reedsolo runtime dependencies. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-esptool/Config.in | 5 ++++- package/python-esptool/python-esptool.hash | 4 ++-- package/python-esptool/python-esptool.mk | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/python-esptool/Config.in b/package/python-esptool/Config.in index b21ccd72d5..36243fa89e 100644 --- a/package/python-esptool/Config.in +++ b/package/python-esptool/Config.in @@ -1,7 +1,10 @@ config BR2_PACKAGE_PYTHON_ESPTOOL bool "python-esptool" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + select BR2_PACKAGE_PYTHON_BITSTRING # runtime + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_ECDSA # runtime - select BR2_PACKAGE_PYTHON_PYAES # runtime + select BR2_PACKAGE_PYTHON_REEDSOLO # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime select BR2_PACKAGE_PYTHON3_ZLIB help diff --git a/package/python-esptool/python-esptool.hash b/package/python-esptool/python-esptool.hash index 7e523a7027..b7246f9788 100644 --- a/package/python-esptool/python-esptool.hash +++ b/package/python-esptool/python-esptool.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/esptool/json -md5 973b63eac1391d3491846d8676c783e7 esptool-4.3.tar.gz -sha256 03d00312eef258baf83faefd0b912b2251dd0440242da9dcb1b18fe75ed614c3 esptool-4.3.tar.gz +md5 92c38551bc33bd5271bdea033aa51610 esptool-4.4.tar.gz +sha256 8acd4dfe70819b1302861ae92894380fb4700b377f5a4739479a4ec276e0b256 esptool-4.4.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index 3f33fd7865..0a71e1a78b 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ESPTOOL_VERSION = 4.3 +PYTHON_ESPTOOL_VERSION = 4.4 PYTHON_ESPTOOL_SOURCE = esptool-$(PYTHON_ESPTOOL_VERSION).tar.gz -PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/5b/d7/0dae311a94a490d7b7af2f4fab079b34f6244c6129017997bc994f7b360b +PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/8b/4c/82d7fe5fa0643415bbb90bebff1f861816903c481ee5156fabd6d76dc684 PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:43 -0000 Subject: [Buildroot] [git commit branch/next] package/python-setuptools: bump to version 65.6.3 Message-ID: <20230220205208.84AFA86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bbe96083f035b21be58498d055b83b2f7576ce16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- 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 3e4ae01d92..76ad1ba1ce 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 3f062858ddfb5efa564c9c02a30cb104 setuptools-65.5.1.tar.gz -sha256 e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f setuptools-65.5.1.tar.gz +md5 1fd8bd04b0bed95ad6c81f03b1c080bc setuptools-65.6.3.tar.gz +sha256 a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75 setuptools-65.6.3.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 3b62221e25..226ef2b479 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 65.5.1 +PYTHON_SETUPTOOLS_VERSION = 65.6.3 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/26/f4/ca5cb6df512f453ad50f78900bf7ec6a5491ee44bb49d0f6f76802dbdd43 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b6/21/cb9a8d0b2c8597c83fce8e9c02884bce3d4951e41e807fc35791c6b23d9a PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From yann.morin.1998 at free.fr Mon Feb 20 20:54:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:43 -0000 Subject: [Buildroot] [git commit branch/next] package/python-greenlet: bump to version 2.0.1 Message-ID: <20230220205201.E59CF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b2f08f587a7e779745d0f89ac576ef6026b0b05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-greenlet/python-greenlet.hash | 4 ++-- package/python-greenlet/python-greenlet.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-greenlet/python-greenlet.hash b/package/python-greenlet/python-greenlet.hash index b5fd1fd7b2..4e9e96398a 100644 --- a/package/python-greenlet/python-greenlet.hash +++ b/package/python-greenlet/python-greenlet.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/greenlet/json -md5 1d73a38c1c0b0c7e16ec17d6a19f3652 greenlet-2.0.0.tar.gz -sha256 6c66f0da8049ee3c126b762768179820d4c0ae0ca46ae489039e4da2fae39a52 greenlet-2.0.0.tar.gz +md5 8d0f10b807144a86b54841cfab2620a9 greenlet-2.0.1.tar.gz +sha256 42e602564460da0e8ee67cb6d7236363ee5e131aa15943b6670e44e5c2ed0f67 greenlet-2.0.1.tar.gz # Locally computed sha256 checksums sha256 769831d6e5dfaf2c20802faccff1fafb4c2025dd8f6253dfa47fcad59d4d0979 LICENSE sha256 e5ff3c23c110e494cd7d736c10fd96d462457bafeca310840db6527298c7d46b LICENSE.PSF diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index 42bf7970d8..232e2820f8 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GREENLET_VERSION = 2.0.0 +PYTHON_GREENLET_VERSION = 2.0.1 PYTHON_GREENLET_SOURCE = greenlet-$(PYTHON_GREENLET_VERSION).tar.gz -PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/23/6f/f72865c589d0c79f03b51520a4cdd65647de0513e9ad107a5731df89c235 +PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/fd/6a/f07b0028baff9bca61ecfcd9ee021e7e33369da8094f00eff409f2ff32be PYTHON_GREENLET_SETUP_TYPE = setuptools PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:44 -0000 Subject: [Buildroot] [git commit branch/next] package/python-tomli: drop flit-bootstrap for host package Message-ID: <20230220205208.AF66C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=467d464abe20e7c20ce246b0fee1d12ccc2b2312 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next As tomli is no longer required for bootstrapping our pep517 toolchain we no longer need to use flit-bootstrap for the host package. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-tomli/python-tomli.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk index b803d67466..5d259f71a3 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -10,7 +10,6 @@ PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/c0/3f/d7af728f075fb0 PYTHON_TOMLI_LICENSE = MIT PYTHON_TOMLI_LICENSE_FILES = LICENSE PYTHON_TOMLI_SETUP_TYPE = flit -HOST_PYTHON_TOMLI_SETUP_TYPE = flit-bootstrap $(eval $(python-package)) $(eval $(host-python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:54:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:44 -0000 Subject: [Buildroot] [git commit branch/next] package/python-hatch-vcs: bump to version 0.3.0 Message-ID: <20230220205201.F2CBE8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=027ad7bbd6fd6ab57781f0730e9587acb26efc76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-hatch-vcs/python-hatch-vcs.hash | 4 ++-- package/python-hatch-vcs/python-hatch-vcs.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatch-vcs/python-hatch-vcs.hash b/package/python-hatch-vcs/python-hatch-vcs.hash index e57eeddd2f..6e5fe1de13 100644 --- a/package/python-hatch-vcs/python-hatch-vcs.hash +++ b/package/python-hatch-vcs/python-hatch-vcs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatch_vcs/json -md5 e56b6d0c05cfb9b59d493c67f94d6e48 hatch_vcs-0.2.0.tar.gz -sha256 9913d733b34eec9bb0345d0626ca32165a4ad2de15d1ce643c36d09ca908abff hatch_vcs-0.2.0.tar.gz +md5 c2f2cbe6851b7b2969cb4aa24c4b9b2f hatch_vcs-0.3.0.tar.gz +sha256 cec5107cfce482c67f8bc96f18bbc320c9aa0d068180e14ad317bbee5a153fee hatch_vcs-0.3.0.tar.gz # Locally computed sha256 checksums sha256 117aa5006d8475562f04442ab06dd2a4c501af3a77255eae0deef1f0c2499a1a LICENSE.txt diff --git a/package/python-hatch-vcs/python-hatch-vcs.mk b/package/python-hatch-vcs/python-hatch-vcs.mk index 55c6461751..ef5f6541cd 100644 --- a/package/python-hatch-vcs/python-hatch-vcs.mk +++ b/package/python-hatch-vcs/python-hatch-vcs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCH_VCS_VERSION = 0.2.0 +PYTHON_HATCH_VCS_VERSION = 0.3.0 PYTHON_HATCH_VCS_SOURCE = hatch_vcs-$(PYTHON_HATCH_VCS_VERSION).tar.gz -PYTHON_HATCH_VCS_SITE = https://files.pythonhosted.org/packages/ac/13/b3d83564c0cc0f1d45b4ea2a78b87b383a8165797613fedf11f1a7e49b48 +PYTHON_HATCH_VCS_SITE = https://files.pythonhosted.org/packages/04/33/b68d68e532392d938472d16a03e4ce0ccd749ea31b42d18f8baa6547cbfd PYTHON_HATCH_VCS_LICENSE = MIT PYTHON_HATCH_VCS_LICENSE_FILES = LICENSE.txt PYTHON_HATCH_VCS_SETUP_TYPE = pep517 From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:45 -0000 Subject: [Buildroot] [git commit branch/next] support/testing: add test for python-dicttoxml2 Message-ID: <20230220205208.C75CD86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b54e0dde3009cb859ff93a704a068d4fd162a035 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ support/testing/tests/package/sample_python_dicttoxml2.py | 11 +++++++++++ support/testing/tests/package/test_python_dicttoxml2.py | 12 ++++++++++++ 3 files changed, 25 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8e9a743c70..7f6908d0b4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3117,9 +3117,11 @@ F: package/wpa_supplicant/ F: package/x11r7/xapp_xconsole/ F: package/x11r7/xapp_xinput-calibrator/ F: package/zlog/ +F: support/testing/tests/package/sample_python_dicttoxml2.py F: support/testing/tests/package/sample_python_dtschema.py F: support/testing/tests/package/test_libftdi1.py F: support/testing/tests/package/test_python_can.py +F: support/testing/tests/package/test_python_dicttoxml2.py F: support/testing/tests/package/test_python_dtschema.py F: utils/scanpypi diff --git a/support/testing/tests/package/sample_python_dicttoxml2.py b/support/testing/tests/package/sample_python_dicttoxml2.py new file mode 100644 index 0000000000..788c5e2cd7 --- /dev/null +++ b/support/testing/tests/package/sample_python_dicttoxml2.py @@ -0,0 +1,11 @@ +from dicttoxml2 import dicttoxml + +payload: dict = {'mylist': ['foo', 'bar', 'baz'], 'mydict': {'foo': 'bar', 'baz': 1}, 'ok': True} + +expected: bytes = b'' \ + b'' \ + b'' \ + b'' \ + b'' + +assert dicttoxml(payload, cdata=True) == expected diff --git a/support/testing/tests/package/test_python_dicttoxml2.py b/support/testing/tests/package/test_python_dicttoxml2.py new file mode 100644 index 0000000000..437518db7f --- /dev/null +++ b/support/testing/tests/package/test_python_dicttoxml2.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Dicttoxml2(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DICTTOXML2=y + """ + sample_scripts = ["tests/package/sample_python_dicttoxml2.py"] + timeout = 40 From yann.morin.1998 at free.fr Mon Feb 20 20:54:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:45 -0000 Subject: [Buildroot] [git commit branch/next] package/python-ipython: bump to version 8.7.0 Message-ID: <20230220205202.17AE8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bf1b6f75b8b2e1f1cfaa99aa62f2818b81534d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 e61727e045..aae34f6f9b 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 8c98f6def0622ea32975cb779247c3d7 ipython-8.6.0.tar.gz -sha256 7c959e3dedbf7ed81f9b9d8833df252c430610e2a4a6464ec13cd20975ce20a5 ipython-8.6.0.tar.gz +md5 3adf9fca317512e5b3516a9ac25b3442 ipython-8.7.0.tar.gz +sha256 882899fe78d5417a0aa07f995db298fa28b58faeba2112d2e3a4c95fe14bb738 ipython-8.7.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 f3aac75db1..1af1081741 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 8.6.0 +PYTHON_IPYTHON_VERSION = 8.7.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/7f/59/05e94e067afb61460f0d5229a1edb800e2f65b8436085fad9cd262d80d45 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/82/2b/026af47da09998404f51064d328f5f1f68c78829082d2945be489343fde6 PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From yann.morin.1998 at free.fr Mon Feb 20 20:54:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:46 -0000 Subject: [Buildroot] [git commit branch/next] package/python-jedi: bump to version 0.18.2 Message-ID: <20230220205202.242388648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0cc120f42d8cd84cbd73e1b55a088627fc755537 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-jedi/python-jedi.hash | 4 ++-- package/python-jedi/python-jedi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-jedi/python-jedi.hash b/package/python-jedi/python-jedi.hash index d0f083e942..dee8810e89 100644 --- a/package/python-jedi/python-jedi.hash +++ b/package/python-jedi/python-jedi.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/jedi/json -md5 d8dba4a98a35530f7f5b461c20aff180 jedi-0.18.1.tar.gz -sha256 74137626a64a99c8eb6ae5832d99b3bdd7d29a3850fe2aa80a4126b2a7d949ab jedi-0.18.1.tar.gz +md5 47e89a2b8bedcfeb1527fac37b9ba1b3 jedi-0.18.2.tar.gz +sha256 bae794c30d07f6d910d32a7048af09b5a39ed740918da923c6b780790ebac612 jedi-0.18.2.tar.gz # Locally computed sha256 checksums sha256 78e60cd0b8f28694f30195482c33d76908d846b0d15278deb7332aa22ba8e412 LICENSE.txt sha256 235e993965d399a25e7d493d25c8622f78718510884b9c051f1f1866b6f34e9d jedi/third_party/django-stubs/LICENSE.txt diff --git a/package/python-jedi/python-jedi.mk b/package/python-jedi/python-jedi.mk index b0508de701..40de61f0e8 100644 --- a/package/python-jedi/python-jedi.mk +++ b/package/python-jedi/python-jedi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JEDI_VERSION = 0.18.1 +PYTHON_JEDI_VERSION = 0.18.2 PYTHON_JEDI_SOURCE = jedi-$(PYTHON_JEDI_VERSION).tar.gz -PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/c2/25/273288df952e07e3190446efbbb30b0e4871a0d63b4246475f3019d4f55e +PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/15/02/afd43c5066de05f6b3188f3aa74136a3289e6c30e7a45f351546cab0928c PYTHON_JEDI_SETUP_TYPE = setuptools PYTHON_JEDI_LICENSE = MIT, Apache-2.0 (typeshed) PYTHON_JEDI_LICENSE_FILES = LICENSE.txt jedi/third_party/django-stubs/LICENSE.txt jedi/third_party/typeshed/LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:47 -0000 Subject: [Buildroot] [git commit branch/next] package/mpd: update to version 0.23.11 Message-ID: <20230220205208.E067686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54fc7aa2be7adc170d30f6f0ec64e34951e52ddd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Mostly fixes for build and runtime failures; no new features. Standard directory for default database and cache changed from ~/.cache to ~/.cache/mpd. Full change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.11/NEWS Signed-off-by: Andreas Ziegler Signed-off-by: Thomas Petazzoni --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index fca0ee8539..8c488d0357 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 2becaba980402e8dc7972ccc3476e493b7ae2eeb720d31fa6712472ed48e9f2d mpd-0.23.9.tar.xz +sha256 edb4e7a8f9dff238b5610f9e2461940ea98c727a5462fafb1cdf836304dfdca9 mpd-0.23.11.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 5c15953984..449600eda2 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).9 +MPD_VERSION = $(MPD_VERSION_MAJOR).11 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 yann.morin.1998 at free.fr Mon Feb 20 20:54:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:48 -0000 Subject: [Buildroot] [git commit branch/next] package/python-lark: bump to version 1.1.5 Message-ID: <20230220205202.4972C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44c986b1266d5f1d2527971aadd1d03a2843a4a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-lark/python-lark.hash | 4 ++-- package/python-lark/python-lark.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-lark/python-lark.hash b/package/python-lark/python-lark.hash index abc168e93b..6e192684a8 100644 --- a/package/python-lark/python-lark.hash +++ b/package/python-lark/python-lark.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lark/json -md5 d7368d8f9fd0b844c034f321f5b52fd4 lark-1.1.4.tar.gz -sha256 eee86062b149600ef62de0d8dfd38cf85ffc737e16911e7d8c18880f8c5b1333 lark-1.1.4.tar.gz +md5 b9048974c5ce56997e9e536dda475159 lark-1.1.5.tar.gz +sha256 4b534eae1f9af5b4ea000bea95776350befe1981658eea3820a01c37e504bb4d lark-1.1.5.tar.gz # Locally computed sha256 checksums sha256 8263e5652d07cecb3adadf05140b65e70cfa169ecec5f520fe1671479ce12a83 LICENSE diff --git a/package/python-lark/python-lark.mk b/package/python-lark/python-lark.mk index 548adcd833..c08fc2cabd 100644 --- a/package/python-lark/python-lark.mk +++ b/package/python-lark/python-lark.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LARK_VERSION = 1.1.4 +PYTHON_LARK_VERSION = 1.1.5 PYTHON_LARK_SOURCE = lark-$(PYTHON_LARK_VERSION).tar.gz -PYTHON_LARK_SITE = https://files.pythonhosted.org/packages/1d/08/eb2590d4f824b5a947d866c603799fa70278f1372cbf8d15b7b4823dfb2b +PYTHON_LARK_SITE = https://files.pythonhosted.org/packages/a2/25/8e16de418fc83bb00dabaf8c7110bc45a90bf5481a70aa5f1668fcea73bc PYTHON_LARK_SETUP_TYPE = setuptools PYTHON_LARK_LICENSE = MIT PYTHON_LARK_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:48 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Thomas Claveirole to package vuejs Message-ID: <20230220205209.106C786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba7b0bf52bf3a749fc280d4ad5b743b5ee180828 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7f6908d0b4..7d7d2344a1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2768,6 +2768,7 @@ F: package/x265/ N: Thomas Claveirole F: package/fcgiwrap/ F: package/openlayers/ +F: package/vuejs/ F: package/vuejs-router/ N: Thomas De Schampheleire From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:49 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Christian Stewart to balena-engine package Message-ID: <20230220205209.357F686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc644ed3be1ae52bf883f93083fc96f9fe1f2ee4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7d7d2344a1..f0dcc42de7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -538,6 +538,7 @@ N: Christian Kellermann F: package/python-pylibftdi/ N: Christian Stewart +F: package/balena-engine/ F: package/batman-adv/ F: package/catatonit/ F: package/cni-plugins/ From yann.morin.1998 at free.fr Mon Feb 20 20:54:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:49 -0000 Subject: [Buildroot] [git commit branch/next] package/python-keyring: bump to version 23.11.0 Message-ID: <20230220205202.3D17D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f4c7af8a698646d496df64672bbda01d351180b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-keyring/python-keyring.hash | 4 ++-- package/python-keyring/python-keyring.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-keyring/python-keyring.hash b/package/python-keyring/python-keyring.hash index 45f5bf7c84..791ee6563b 100644 --- a/package/python-keyring/python-keyring.hash +++ b/package/python-keyring/python-keyring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/keyring/json -md5 60219a9a22467e15fcd09515b5b2ef39 keyring-23.9.3.tar.gz -sha256 69b01dd83c42f590250fe7a1f503fc229b14de83857314b1933a3ddbf595c4a5 keyring-23.9.3.tar.gz +md5 edf0645c28f16884e2b121b2c51e0770 keyring-23.11.0.tar.gz +sha256 ad192263e2cdd5f12875dedc2da13534359a7e760e77f8d04b50968a821c2361 keyring-23.11.0.tar.gz # Locally computed sha256 checksums sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-keyring/python-keyring.mk b/package/python-keyring/python-keyring.mk index 8d7833e14f..c1f124cb3e 100644 --- a/package/python-keyring/python-keyring.mk +++ b/package/python-keyring/python-keyring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_KEYRING_VERSION = 23.9.3 +PYTHON_KEYRING_VERSION = 23.11.0 PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz -PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/2a/ef/28d3d5428108111dae4304a2ebec80d113aea9e78c939e25255425d486ff +PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/1c/35/c22960f14f5e17384296b2f09da259f8b5244fb3831eccec71cf948a49c6 PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:50 -0000 Subject: [Buildroot] [git commit branch/next] package/python-memory-profiler: bump to version 0.61.0 Message-ID: <20230220205202.79773828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d08d1f7bca47a5f73422ebd716f30c79cd99124 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-memory-profiler/python-memory-profiler.hash | 4 ++-- package/python-memory-profiler/python-memory-profiler.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-memory-profiler/python-memory-profiler.hash b/package/python-memory-profiler/python-memory-profiler.hash index 9e3aca517b..bab9018331 100644 --- a/package/python-memory-profiler/python-memory-profiler.hash +++ b/package/python-memory-profiler/python-memory-profiler.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/memory-profiler/json -md5 c4d29b47885c32581f5bcefb44d2ca8e memory_profiler-0.60.0.tar.gz -sha256 6a12869511d6cebcb29b71ba26985675a58e16e06b3c523b49f67c5497a33d1c memory_profiler-0.60.0.tar.gz +md5 5fe93d5035288095c4f86ef69ee19f37 memory_profiler-0.61.0.tar.gz +sha256 4e5b73d7864a1d1292fb76a03e82a3e78ef934d06828a698d9dada76da2067b0 memory_profiler-0.61.0.tar.gz # Locally computed sha256 checksums sha256 51926ce91b8283532efa9dfb02518582c15f49c105a3ac18cce1f7a4947e96ae COPYING diff --git a/package/python-memory-profiler/python-memory-profiler.mk b/package/python-memory-profiler/python-memory-profiler.mk index 5e43662e07..c7f84043eb 100644 --- a/package/python-memory-profiler/python-memory-profiler.mk +++ b/package/python-memory-profiler/python-memory-profiler.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MEMORY_PROFILER_VERSION = 0.60.0 +PYTHON_MEMORY_PROFILER_VERSION = 0.61.0 PYTHON_MEMORY_PROFILER_SOURCE = memory_profiler-$(PYTHON_MEMORY_PROFILER_VERSION).tar.gz -PYTHON_MEMORY_PROFILER_SITE = https://files.pythonhosted.org/packages/06/dd/7308a8ef1902db9d81c5bc226befe346a87ed8787caff00b8d91ed9f3b86 +PYTHON_MEMORY_PROFILER_SITE = https://files.pythonhosted.org/packages/b2/88/e1907e1ca3488f2d9507ca8b0ae1add7b1cd5d3ca2bc8e5b329382ea2c7b PYTHON_MEMORY_PROFILER_SETUP_TYPE = setuptools PYTHON_MEMORY_PROFILER_LICENSE = BSD-3-Clause PYTHON_MEMORY_PROFILER_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:50 -0000 Subject: [Buildroot] [git commit branch/next] package/swig: depend on host-pcre2 instead of host-pcre Message-ID: <20230220205209.5002286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d534bb8d93319212b3c083b083189e8e7b414637 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since the bump of swig to version 4.1.1 in commit 260924e239627cbe1379cfc752939245d53a06e0, host-pcre2 is needed instead of host-pcre. Since is change that was introduced in swig 4.1.0, as stated in https://sourceforge.net/p/swig/news/2022/10/swig-410-released/: Update optional SWIG build dependency for regex support from PCRE to PCRE2 Fixes: http://autobuild.buildroot.net/results/3a70042aad7376bcccf56d639ced93f504f47963 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/swig/swig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/swig/swig.mk b/package/swig/swig.mk index d432cab53d..ad585c3f97 100644 --- a/package/swig/swig.mk +++ b/package/swig/swig.mk @@ -7,7 +7,7 @@ SWIG_VERSION_MAJOR = 4.1 SWIG_VERSION = $(SWIG_VERSION_MAJOR).1 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION) -HOST_SWIG_DEPENDENCIES = host-bison host-pcre +HOST_SWIG_DEPENDENCIES = host-bison host-pcre2 HOST_SWIG_CONF_OPTS = \ --with-pcre \ --disable-ccache \ From yann.morin.1998 at free.fr Mon Feb 20 20:54:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:51 -0000 Subject: [Buildroot] [git commit branch/next] package/python-opcua-asyncio: bump to version 1.0.1 Message-ID: <20230220205202.9DEFE828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b9b6541b2d1e06ab14e69c774d6f70e4d96db21 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-opcua-asyncio/python-opcua-asyncio.hash | 4 ++-- package/python-opcua-asyncio/python-opcua-asyncio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.hash b/package/python-opcua-asyncio/python-opcua-asyncio.hash index 36b16a1596..21b5794ebf 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.hash +++ b/package/python-opcua-asyncio/python-opcua-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asyncua/json -md5 a52df0dc0586abd1592c97a0274d1c9d asyncua-1.0.0.tar.gz -sha256 25966e374b0c90da112a96e9dbc5cc36c123b2b60412eac6f26b04a4b0b4d91e asyncua-1.0.0.tar.gz +md5 f67770b896d2ffe975adbaea38c5efc9 asyncua-1.0.1.tar.gz +sha256 515342470022b9c391587dcf526015ff4c7582f566c72406c778c9f9a2757cad asyncua-1.0.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.mk b/package/python-opcua-asyncio/python-opcua-asyncio.mk index 509beda151..52c5d5117e 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.mk +++ b/package/python-opcua-asyncio/python-opcua-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_OPCUA_ASYNCIO_VERSION = 1.0.0 +PYTHON_OPCUA_ASYNCIO_VERSION = 1.0.1 PYTHON_OPCUA_ASYNCIO_SOURCE = asyncua-$(PYTHON_OPCUA_ASYNCIO_VERSION).tar.gz -PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/e7/ea/6fe0799c740b0fc8ffda42fc97bf45204ffe06fe41d505c02654e0d4e379 +PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/9f/88/c32bd5904c92475dd30fa2c3130c4f9170a36343d390e2ce5b002fdf1cee PYTHON_OPCUA_ASYNCIO_SETUP_TYPE = setuptools PYTHON_OPCUA_ASYNCIO_LICENSE = LGPL-3.0+ PYTHON_OPCUA_ASYNCIO_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:54:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:54:51 -0000 Subject: [Buildroot] [git commit branch/next] package/python-automat: drop host-python-m2r build dependency Message-ID: <20230220205209.68CB886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6398d18d50c021992375c4229e3898402c3a1cc8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since version 22.10.0, used since Buildroot commit 12c430f880f9255529d8c53cdb59f4178d2cd8f4, python-automat no longer needs host-python-m2r, so let's drop this dependency. This is needed as host-python-m2r is about to be removed from Buildroot, due to incompatibility with its dependencies. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-automat/python-automat.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-automat/python-automat.mk b/package/python-automat/python-automat.mk index 675fbd2260..101197b15b 100644 --- a/package/python-automat/python-automat.mk +++ b/package/python-automat/python-automat.mk @@ -10,6 +10,6 @@ PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/7a/7b/9c3d26d8a041 PYTHON_AUTOMAT_SETUP_TYPE = setuptools PYTHON_AUTOMAT_LICENSE = MIT PYTHON_AUTOMAT_LICENSE_FILES = LICENSE -PYTHON_AUTOMAT_DEPENDENCIES = host-python-m2r host-python-setuptools-scm +PYTHON_AUTOMAT_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From peter at korsgaard.com Mon Feb 20 20:54:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:52 -0000 Subject: [Buildroot] [git commit branch/next] package/libbluray: bump version to 1.3.4 Message-ID: <20230220205209.A254C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67a6bc3d19afffffe75b1e6ffa1f0e1b89dea39f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://code.videolan.org/videolan/libbluray/-/blob/1.3.4/ChangeLog Added a configure option to build without external libudfread introduced in version 1.3.4: https://code.videolan.org/videolan/libbluray/-/commit/2f10fb73b869337f2a2fb6fc8c8b45ef88383b78 Using --with-external-libudfread is broken so this option was not added. Since the default to build with optional libudfread support was kept upstream there is no change in behaviour. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libbluray/libbluray.hash | 4 ++-- package/libbluray/libbluray.mk | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash index 6e62bb49a1..a631722bb0 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.1/libbluray-1.3.1.tar.bz2.sha512 -sha512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a libbluray-1.3.1.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2.sha512 +sha512 94dbf3b68d1c23fe4648c153cc2f0c251886fac0a6b6bbe3a77caabaa5322682f712afe4a7b6b16ca3f06744fbc0e1ca872209a32898dcf0ae182055d335aec1 libbluray-1.3.4.tar.bz2 # Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index a9eb3c67c6..54f4caa368 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.3.1 +LIBBLURAY_VERSION = 1.3.4 LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES @@ -21,6 +21,8 @@ endif ifeq ($(BR2_PACKAGE_LIBUDFREAD),y) LIBBLURAY_DEPENDENCIES += libudfread +else +LIBBLURAY_CONF_OPTS += --without-external-libudfread endif ifeq ($(BR2_PACKAGE_FREETYPE),y) From peter at korsgaard.com Mon Feb 20 20:54:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:58 -0000 Subject: [Buildroot] [git commit branch/next] fs/ext2: generate Y2K38-resilient filesystems Message-ID: <20230220205210.94CAF86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=319d2735f99e95955c2a75c8fc6282ddf7de232a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When creating a filesystem, mkfs.ext will chose the inode size depending on the size of the filesystem. Small filesystem get 128-bytes inodes, while bigger filesystems use 256-byte inodes (inode must be a power of 2 larger or equal to 128, and smaller or equal to the blocksize). However, 128-byte inodes can't store timestamps past the dreaded 2038-01-19 03:14:07Z deadline, while inodes larger than or equal to 256 do not have the issue. It turns out that the tipping point to decide whether a filesystem is small or big, is about around the size of the filesystems we generate for our runtime tests. This causes the kernel to emit warning like: ext2 filesystem being remounted at / supports timestamps until 2038 (0x7fffffff) We add a new option to our ext2 filesystem, so that user can specify the size of the inode. That new option defaults to 256 to be resilient to the Y2K38 problem. Note: it was already possible for users to explicitly pass the -I option, through BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS. We could have chosen to extend the existing value with a -I 256, but that is not satisfactory. Indeed, we do want to ensure that the default is now Y2K38-OK, even for existing configurations that did not have explicit setting. We also pass that new option before the user-specified arbitrary ones, so that BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS still wins (in case -I was set there). Signed-off-by: Yann E. MORIN [Peter: tweak help text] Signed-off-by: Peter Korsgaard --- fs/ext2/Config.in | 13 +++++++++++++ fs/ext2/ext2.mk | 1 + 2 files changed, 14 insertions(+) diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in index 705446df57..4451d0797f 100644 --- a/fs/ext2/Config.in +++ b/fs/ext2/Config.in @@ -60,6 +60,19 @@ config BR2_TARGET_ROOTFS_EXT2_INODES int "exact number of inodes (leave at 0 for auto calculation)" default 0 +config BR2_TARGET_ROOTFS_EXT2_INODE_SIZE + int "inode size" + default 256 + help + Set the size of inodes, in bytes, as a power of 2 larger or + equal to 128. + + Set to 0 to let the filesystem generator decide based on the + file system size. If unsure, keep the default, 256. + + Note: 128-byte inodes suffer of the Y2K38 problem, and can't + store timestamps beyond 2038-01-19 03:14:07Z. + config BR2_TARGET_ROOTFS_EXT2_RESBLKS int "reserved blocks percentage" default 5 diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk index 5b5393f092..e69e79cd2e 100644 --- a/fs/ext2/ext2.mk +++ b/fs/ext2/ext2.mk @@ -22,6 +22,7 @@ ROOTFS_EXT2_OPTS = \ -N $(BR2_TARGET_ROOTFS_EXT2_INODES) \ -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) \ -L "$(ROOTFS_EXT2_LABEL)" \ + -I $(BR2_TARGET_ROOTFS_EXT2_INODE_SIZE) \ $(ROOTFS_EXT2_MKFS_OPTS) ROOTFS_EXT2_DEPENDENCIES = host-e2fsprogs From yann.morin.1998 at free.fr Mon Feb 20 20:54:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:59 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pycryptodomex: bump to version 3.16.0 Message-ID: <20230220205203.3940A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24d1bfa38d9f10785e8cd366c9680e9ca8905de6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycryptodomex/python-pycryptodomex.hash | 4 ++-- package/python-pycryptodomex/python-pycryptodomex.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 97c5e79024..eb011dddb8 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.hash +++ b/package/python-pycryptodomex/python-pycryptodomex.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json -md5 683580f8f464348397a41ebabb5511a9 pycryptodomex-3.15.0.tar.gz -sha256 7341f1bb2dadb0d1a0047f34c3a58208a92423cdbd3244d998e4b28df5eac0ed pycryptodomex-3.15.0.tar.gz +md5 9d27f03c036c89afd3d66970bb49cd06 pycryptodomex-3.16.0.tar.gz +sha256 e9ba9d8ed638733c9e95664470b71d624a6def149e2db6cc52c1aca5a6a2df1d pycryptodomex-3.16.0.tar.gz # Locally computed sha256 checksums sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index 8f22bf3ef2..b566bdd066 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.15.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.16.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/52/0d/6cc95a83f6961a1ca041798d222240890af79b381e97eda3b9b538dba16f +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/5d/22/575c7dd7c86843e07a791cfa2143e7292d6b380f5a7cce966a49b9d6c9f4 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ From peter at korsgaard.com Mon Feb 20 20:54:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:59 -0000 Subject: [Buildroot] [git commit branch/next] package/sudo: bump to version 1.9.12p1 Message-ID: <20230220205210.BBF8E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f095f5a8bec8352ffa182f606c5c7349ec2d6dca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next remove merged patch diff LICENSE.md - Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler + Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler - Copyright (c) 2008-2018, Dave Benson and the protobuf-c authors. + Copyright (c) 2008-2022, Dave Benson and the protobuf-c authors. Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/sudo/0001-Fix-CVE-2022-43995.patch | 53 ------------------------------ package/sudo/Config.in | 2 +- package/sudo/sudo.hash | 6 ++-- package/sudo/sudo.mk | 7 ++-- 4 files changed, 6 insertions(+), 62 deletions(-) diff --git a/package/sudo/0001-Fix-CVE-2022-43995.patch b/package/sudo/0001-Fix-CVE-2022-43995.patch deleted file mode 100644 index 3f544dcf81..0000000000 --- a/package/sudo/0001-Fix-CVE-2022-43995.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bd209b9f16fcd1270c13db27ae3329c677d48050 Mon Sep 17 00:00:00 2001 -From: "Todd C. Miller" -Date: Fri, 28 Oct 2022 07:29:55 -0600 -Subject: [PATCH] Fix CVE-2022-43995, potential heap overflow for passwords < 8 - characters. Starting with sudo 1.8.0 the plaintext password buffer is - dynamically sized so it is not safe to assume that it is at least 9 bytes in - size. Found by Hugo Lefeuvre (University of Manchester) with ConfFuzz. - -[Retrieved from: -https://github.com/sudo-project/sudo/commit/bd209b9f16fcd1270c13db27ae3329c677d48050] -Signed-off-by: Fabrice Fontaine ---- - plugins/sudoers/auth/passwd.c | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c -index b2046eca2..0416861e9 100644 ---- a/plugins/sudoers/auth/passwd.c -+++ b/plugins/sudoers/auth/passwd.c -@@ -63,7 +63,7 @@ sudo_passwd_init(struct passwd *pw, sudo_auth *auth) - int - sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_conv_callback *callback) - { -- char sav, *epass; -+ char des_pass[9], *epass; - char *pw_epasswd = auth->data; - size_t pw_len; - int matched = 0; -@@ -75,12 +75,12 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c - - /* - * Truncate to 8 chars if standard DES since not all crypt()'s do this. -- * If this turns out not to be safe we will have to use OS #ifdef's (sigh). - */ -- sav = pass[8]; - pw_len = strlen(pw_epasswd); -- if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) -- pass[8] = '\0'; -+ if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) { -+ strlcpy(des_pass, pass, sizeof(des_pass)); -+ pass = des_pass; -+ } - - /* - * Normal UN*X password check. -@@ -88,7 +88,6 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c - * only compare the first DESLEN characters in that case. - */ - epass = (char *) crypt(pass, pw_epasswd); -- pass[8] = sav; - if (epass != NULL) { - if (HAS_AGEINFO(pw_epasswd, pw_len) && strlen(epass) == DESLEN) - matched = !strncmp(pw_epasswd, epass, DESLEN); diff --git a/package/sudo/Config.in b/package/sudo/Config.in index cbef15d67b..ee5ea542ab 100644 --- a/package/sudo/Config.in +++ b/package/sudo/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_SUDO basic philosophy is to give as few privileges as possible but still allow people to get their work done. - http://www.sudo.ws/sudo/ + https://www.sudo.ws/sudo/ diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index 63c98e2c4e..a3476df96b 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,4 +1,4 @@ -# From: http://www.sudo.ws/download.html -sha256 a21918eb9fc0063794f6887464fa2d924ab6d192e19063191a429605c22791d2 sudo-1.9.11p2.tar.gz +# From: https://www.sudo.ws/getting/download/ +sha256 475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8 sudo-1.9.12p1.tar.gz # Locally calculated -sha256 cf3a83366f9aabfd76d693ce03843106fcaaf6c76dfa97610f7c0b719a06e6bb LICENSE.md +sha256 d2f93a3b17ed5586fddd07be33ad767146c1a81a22682baa68bb4360a31d020a LICENSE.md diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 8e237bd36a..a16b6863aa 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,8 +4,8 @@ # ################################################################################ -SUDO_VERSION_MAJOR = 1.9.11 -SUDO_VERSION_MINOR = p2 +SUDO_VERSION_MAJOR = 1.9.12 +SUDO_VERSION_MINOR = p1 SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause @@ -25,9 +25,6 @@ SUDO_CONF_OPTS = \ --without-interfaces \ --with-env-editor -# 0001-Fix-CVE-2022-43995.patch -SUDO_IGNORE_CVES += CVE-2022-43995 - ifeq ($(BR2_PACKAGE_LINUX_PAM),y) define SUDO_INSTALL_PAM_CONF $(INSTALL) -D -m 0644 package/sudo/sudo.pam $(TARGET_DIR)/etc/pam.d/sudo From yann.morin.1998 at free.fr Mon Feb 20 20:55:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:00 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pybind: bump to version 2.10.1 Message-ID: <20230220205203.20D288648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0894b7f78b17a2ddb4e922c5ee63379fe00a7259 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pybind/python-pybind.hash | 2 +- package/python-pybind/python-pybind.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash index b4b3ff94d0..530cbf64af 100644 --- a/package/python-pybind/python-pybind.hash +++ b/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 eacf582fa8f696227988d08cfc46121770823839fe9e301a20fbce67e7cd70ec python-pybind-2.10.0.tar.gz +sha256 111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad python-pybind-2.10.1.tar.gz # License files, locally calculated sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index c5bee3d0a7..e89d77147e 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.10.0 +PYTHON_PYBIND_VERSION = 2.10.1 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:55:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:00 -0000 Subject: [Buildroot] [git commit branch/next] package/libarchive: bump to version 3.6.2 Message-ID: <20230220205210.AFD2686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=380341b249175382691f268de4b41d3843ff0acc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next remove merged patch Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- ...libarchive-Handle-a-calloc-returning-NULL.patch | 38 ---------------------- package/libarchive/Config.in | 2 +- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 5 +-- 4 files changed, 3 insertions(+), 44 deletions(-) diff --git a/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch b/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch deleted file mode 100644 index 75ce6112fe..0000000000 --- a/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001 -From: obiwac -Date: Fri, 22 Jul 2022 22:41:10 +0200 -Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754) - -[Retrieved from: -https://github.com/libarchive/libarchive/commit/bff38efe8c110469c5080d387bec62a6ca15b1a5] -Signed-off-by: Fabrice Fontaine ---- - libarchive/archive_write.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c -index 66592e826..27626b541 100644 ---- a/libarchive/archive_write.c -+++ b/libarchive/archive_write.c -@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a) - struct archive_write_filter *f; - - f = calloc(1, sizeof(*f)); -+ -+ if (f == NULL) -+ return (NULL); -+ - f->archive = _a; - f->state = ARCHIVE_WRITE_FILTER_STATE_NEW; - if (a->filter_first == NULL) -@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data, - a->client_data = client_data; - - client_filter = __archive_write_allocate_filter(_a); -+ -+ if (client_filter == NULL) -+ return (ARCHIVE_FATAL); -+ - client_filter->open = archive_write_client_open; - client_filter->write = archive_write_client_write; - client_filter->close = archive_write_client_close; diff --git a/package/libarchive/Config.in b/package/libarchive/Config.in index fd429acb60..ffa4cff7b3 100644 --- a/package/libarchive/Config.in +++ b/package/libarchive/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBARCHIVE Libarchive is a reusable C library for reading and writing a variety of streaming archive formats. - http://www.libarchive.org/ + https://www.libarchive.org/ if BR2_PACKAGE_LIBARCHIVE diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index ca580b4977..b03bef3de5 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6 libarchive-3.6.1.tar.xz +sha256 9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d libarchive-3.6.2.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 649b7dd4dc..cfc148d01d 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.6.1 +LIBARCHIVE_VERSION = 3.6.2 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES @@ -12,9 +12,6 @@ LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING LIBARCHIVE_CPE_ID_VENDOR = libarchive -# 0001-libarchive-Handle-a-calloc-returning-NULL.patch -LIBARCHIVE_IGNORE_CVES += CVE-2022-36227 - ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) LIBARCHIVE_CONF_OPTS += --enable-bsdtar=static From yann.morin.1998 at free.fr Mon Feb 20 20:55:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:01 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pydal: bump to version 20221110.1 Message-ID: <20230220205203.4688D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7fa52b837cc3a39534ba675e913c9bae583988d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pydal/python-pydal.hash | 6 ++++-- package/python-pydal/python-pydal.mk | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index 852e568ac5..c55a17a545 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,3 +1,5 @@ -# sha256 locally computed -sha256 0a2dbc5d61d37d2b59d441ed0aab48c1ec906ce66088eb5cee021b009601de02 python-pydal-20220916.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/pydal/json +md5 eeaf44cdcdb6bd2040713c710a4a04be pydal-20221110.1.tar.gz +sha256 7c3e891c70f8d8918e36276f210a1959bb7badf3b276f47191986ffcf5b6a390 pydal-20221110.1.tar.gz +# Locally computed sha256 checksums sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index a3df1ccff1..f55c7fc2c5 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20220916.1 -PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) +PYTHON_PYDAL_VERSION = 20221110.1 +PYTHON_PYDAL_SOURCE = pydal-$(PYTHON_PYDAL_VERSION).tar.gz +PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/73/83/b904c464b6ab060e12b3f406f1fab7deb97bcd9d2021d8c87325e6225c2d PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt PYTHON_PYDAL_SETUP_TYPE = setuptools From peter at korsgaard.com Mon Feb 20 20:55:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:01 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xhost: bump version to 1.0.9 Message-ID: <20230220205210.DF57E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f62d409cb8d1bcd015b9ca4aeca31b2d1c8dbf02 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003301.html Updated license hash due to copyright year bump: https://gitlab.freedesktop.org/xorg/app/xhost/-/commit/167ad7fa3a339da96798da49d05c3125045a87c2 Switched tarball to xz, updated _SITE. Added optional support for gettext: https://gitlab.freedesktop.org/xorg/app/xhost/-/commit/167ad7fa3a339da96798da49d05c3125045a87c2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xhost/xapp_xhost.hash | 10 ++++------ package/x11r7/xapp_xhost/xapp_xhost.mk | 9 +++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/package/x11r7/xapp_xhost/xapp_xhost.hash b/package/x11r7/xapp_xhost/xapp_xhost.hash index 71eabccc44..fea2588c6d 100644 --- a/package/x11r7/xapp_xhost/xapp_xhost.hash +++ b/package/x11r7/xapp_xhost/xapp_xhost.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002950.html -md5 a48c72954ae6665e0616f6653636da8c xhost-1.0.8.tar.bz2 -sha1 971670858a464d4f8eeb6f4e182f9fcd94149790 xhost-1.0.8.tar.bz2 -sha256 a2dc3c579e13674947395ef8ccc1b3763f89012a216c2cc6277096489aadc396 xhost-1.0.8.tar.bz2 -sha512 55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b xhost-1.0.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003301.html +sha256 ea86b531462035b19a2e5e01ef3d9a35cca7d984086645e2fc844d8f0e346645 xhost-1.0.9.tar.xz +sha512 d281a0df0a036d693ce7dbe0d1d53839110d203f42454bf4d33a49fbfddec078149969b6ad76641e40e207ddc8317ea563088c59025fc57d8245e5ed27f79818 xhost-1.0.9.tar.xz # Locally computed -sha256 7e69bed6fcfff05ecf454d7e4b29cd265172385833f1978f04b638f92f2cfecf COPYING +sha256 d3106697fb05dea4e9899b9e782ae7c3c17086d5b3dc7966494fc83fda9e468e COPYING diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk index e9fb155216..55f7ca5cc7 100644 --- a/package/x11r7/xapp_xhost/xapp_xhost.mk +++ b/package/x11r7/xapp_xhost/xapp_xhost.mk @@ -4,11 +4,12 @@ # ################################################################################ -XAPP_XHOST_VERSION = 1.0.8 -XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2 -XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XHOST_VERSION = 1.0.9 +XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.xz +XAPP_XHOST_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XHOST_LICENSE = MIT XAPP_XHOST_LICENSE_FILES = COPYING -XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu +XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu $(TARGET_NLS_DEPENDENCIES) +XAPP_XHOST_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) $(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:55:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:02 -0000 Subject: [Buildroot] [git commit branch/next] package/python-sentry-sdk: bump to version 1.11.1 Message-ID: <20230220205203.768018648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2733644c8947f8dafa1559bc12b3e67cee99ae6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-sentry-sdk/python-sentry-sdk.hash | 4 ++-- package/python-sentry-sdk/python-sentry-sdk.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index 729ffe94c4..2aa739f398 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 7f31bd0d6d968c711f8b1d928836eaaa sentry-sdk-1.10.1.tar.gz -sha256 105faf7bd7b7fa25653404619ee261527266b14103fe1389e0ce077bd23a9691 sentry-sdk-1.10.1.tar.gz +md5 4980e01dc73c6bcf794b0b7d3f3e08d7 sentry-sdk-1.11.1.tar.gz +sha256 675f6279b6bb1fea09fd61751061f9a90dca3b5929ef631dd50dc8b3aeb245e9 sentry-sdk-1.11.1.tar.gz # Locally computed sha256 checksums sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index d8e9e8a2c9..056a015952 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 1.10.1 +PYTHON_SENTRY_SDK_VERSION = 1.11.1 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/43/37/89598a56119199b69a3c4b13e2ce1b57ff69f68313ed393016086d6b487b +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/a3/d5/db26377e9817407ae8d7b65e15b3c3b8d817c301633be15bd2aef61f38a3 PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:55:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:02 -0000 Subject: [Buildroot] [git commit branch/next] package/mbedtls: security bump to version 2.28.2 Message-ID: <20230220205211.04BAD828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2baa583c350b9d594e87f9cab1db597789904df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following security issues: - Fix potential heap buffer overread and overwrite in DTLS if MBEDTLS_SSL_DTLS_CONNECTION_ID is enabled and MBEDTLS_SSL_CID_IN_LEN_MAX > 2 * MBEDTLS_SSL_CID_OUT_LEN_MAX. - An adversary with access to precise enough information about memory accesses (typically, an untrusted operating system attacking a secure enclave) could recover an RSA private key after observing the victim performing a single private-key operation if the window size used for the exponentiation was 3 or smaller. Drop patch (already in version: https://github.com/Mbed-TLS/mbedtls/commit/9d9d45c6b2aeaedfdfdadfec3d05d168db685968) https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...x-x86-PIC-inline-ASM-compilation-with-GCC.patch | 74 ---------------------- package/mbedtls/mbedtls.hash | 4 +- package/mbedtls/mbedtls.mk | 2 +- 3 files changed, 3 insertions(+), 77 deletions(-) diff --git a/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch b/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch deleted file mode 100644 index 60bf53f6e4..0000000000 --- a/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch +++ /dev/null @@ -1,74 +0,0 @@ -From a0ae2ba37ca479c6edddec8634b25686be965e0d Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 27 Aug 2018 22:50:57 +0200 -Subject: [PATCH] bn_mul.h: fix x86 PIC inline ASM compilation with GCC < 5 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes #1910 - -With ebx added to the MULADDC_STOP clobber list to fix #1550, the inline -assembly fails to build with GCC < 5 in PIC mode with the following error: - -include/mbedtls/bn_mul.h:46:13: error: PIC register clobbered by ???ebx??? in ???asm??? - -This is because older GCC versions treated the x86 ebx register (which is -used for the GOT) as a fixed reserved register when building as PIC. - -This is fixed by an improved register allocator in GCC 5+. From the release -notes: - -Register allocation improvements: Reuse of the PIC hard register, instead of -using a fixed register, was implemented on x86/x86-64 targets. This -improves generated PIC code performance as more hard registers can be used. - -https://www.gnu.org/software/gcc/gcc-5/changes.html - -As a workaround, detect this situation and disable the inline assembly, -similar to the MULADDC_CANNOT_USE_R7 logic. - -Signed-off-by: Peter Korsgaard -Upstream: https://github.com/ARMmbed/mbedtls/pull/1986 ---- - include/mbedtls/bn_mul.h | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h -index b587317d9..74a2d29be 100644 ---- a/include/mbedtls/bn_mul.h -+++ b/include/mbedtls/bn_mul.h -@@ -50,13 +50,29 @@ - #if defined(__GNUC__) && \ - ( !defined(__ARMCC_VERSION) || __ARMCC_VERSION >= 6000000 ) - -+/* -+ * GCC < 5.0 treated the x86 ebx (which is used for the GOT) as a -+ * fixed reserved register when building as PIC, leading to errors -+ * like: bn_mul.h:46:13: error: PIC register clobbered by ???ebx??? in ???asm??? -+ * -+ * This is fixed by an improved register allocator in GCC 5+. From the -+ * release notes: -+ * Register allocation improvements: Reuse of the PIC hard register, -+ * instead of using a fixed register, was implemented on x86/x86-64 -+ * targets. This improves generated PIC code performance as more hard -+ * registers can be used. -+ */ -+#if defined(__GNUC__) && __GNUC__ < 5 && defined(__PIC__) -+#define MULADDC_CANNOT_USE_EBX -+#endif -+ - /* - * Disable use of the i386 assembly code below if option -O0, to disable all - * compiler optimisations, is passed, detected with __OPTIMIZE__ - * This is done as the number of registers used in the assembly code doesn't - * work with the -O0 option. - */ --#if defined(__i386__) && defined(__OPTIMIZE__) -+#if defined(__i386__) && defined(__OPTIMIZE__) && !defined(MULADDC_CANNOT_USE_EBX) - - #define MULADDC_INIT \ - asm( \ --- -2.11.0 - diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 38182fe119..876cd7b77e 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.1: -sha256 6797a7b6483ef589deeab8d33d401ed235d7be25eeecda1be8ddfed406d40ff4 mbedtls-2.28.1.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.2: +sha256 bc55232bf71fd66045122ba9050a29ea7cb2e8f99b064a9e6334a82f715881a0 mbedtls-2.28.2.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 49ea7886f6..7a605ac5b1 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.1 +MBEDTLS_VERSION = 2.28.2 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ From yann.morin.1998 at free.fr Mon Feb 20 20:55:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:03 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pyphen: bump to version 0.13.2 Message-ID: <20230220205203.5EBA2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8a8ed95901a663fff43217b7c73530eff25d757 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyphen/python-pyphen.hash | 4 ++-- package/python-pyphen/python-pyphen.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyphen/python-pyphen.hash b/package/python-pyphen/python-pyphen.hash index 3a145e0f81..39af62e085 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 a2d6f69468684bbaa88d004b79c02128 pyphen-0.13.0.tar.gz -sha256 06873cebffd65a8fca7c20c0e3dc032655c7ee8de0f552205cad3b574265c293 pyphen-0.13.0.tar.gz +md5 a5039d1a4d8d4bad784cb864927f83f8 pyphen-0.13.2.tar.gz +sha256 847f57a043a58408f24670ae0184ff6edfb5fd5731743208228c028ddc514438 pyphen-0.13.2.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 d83eb79736..9ca064c293 100644 --- a/package/python-pyphen/python-pyphen.mk +++ b/package/python-pyphen/python-pyphen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPHEN_VERSION = 0.13.0 +PYTHON_PYPHEN_VERSION = 0.13.2 PYTHON_PYPHEN_SOURCE = pyphen-$(PYTHON_PYPHEN_VERSION).tar.gz -PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/9a/53/e7f212c87f91aab928bbf0de95ebc319c4d935e59bd5ed868f2c2bfc9465 +PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/46/12/aeb28a1e1a3f3cede967cea98ef3a1da844418ab8296a4bb9513f232736c 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 peter at korsgaard.com Mon Feb 20 20:55:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:03 -0000 Subject: [Buildroot] [git commit branch/next] package/libgeos: bump version to 3.11.1 Message-ID: <20230220205211.3B38181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46686174e55c4f53d4fd680e65371ee8d227fbce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://github.com/libgeos/geos/releases/tag/3.11.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/libgeos/libgeos.hash | 2 +- package/libgeos/libgeos.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index 34b2b855d6..cd0a4e0330 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 79ab8cabf4aa8604d161557b52e3e4d84575acdc0d08cb09ab3f7aaefa4d858a geos-3.11.0.tar.bz2 +sha256 6d0eb3cfa9f92d947731cc75f1750356b3bdfc07ea020553daf6af1c768e0be2 geos-3.11.1.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index 55c975eb4a..c6d470dc97 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.11.0 +LIBGEOS_VERSION = 3.11.1 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 From yann.morin.1998 at free.fr Mon Feb 20 20:55:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:04 -0000 Subject: [Buildroot] [git commit branch/next] package/python-termcolor: bump to version 2.1.1 Message-ID: <20230220205203.996C48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd7d4548cb434c2ed999ed62224d4aaad091c11b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-termcolor/python-termcolor.hash | 4 ++-- package/python-termcolor/python-termcolor.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-termcolor/python-termcolor.hash b/package/python-termcolor/python-termcolor.hash index 9e0324ed64..73fb9129ed 100644 --- a/package/python-termcolor/python-termcolor.hash +++ b/package/python-termcolor/python-termcolor.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/termcolor/json -md5 04e4981838535169d19d26a14a76af17 termcolor-2.1.0.tar.gz -sha256 b80df54667ce4f48c03fe35df194f052dc27a541ebbf2544e4d6b47b5d6949c4 termcolor-2.1.0.tar.gz +md5 f7f59efd147dd1ec2a25e667616e8a52 termcolor-2.1.1.tar.gz +sha256 67cee2009adc6449c650f6bcf3bdeed00c8ba53a8cda5362733c53e0a39fb70b termcolor-2.1.1.tar.gz # Locally computed sha256 checksums sha256 e79b6bd82962c1330caaa7c42278567b08667777673f8e2371a624d5715d4c0e COPYING.txt diff --git a/package/python-termcolor/python-termcolor.mk b/package/python-termcolor/python-termcolor.mk index 8731032fec..d7511d692f 100644 --- a/package/python-termcolor/python-termcolor.mk +++ b/package/python-termcolor/python-termcolor.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TERMCOLOR_VERSION = 2.1.0 +PYTHON_TERMCOLOR_VERSION = 2.1.1 PYTHON_TERMCOLOR_SOURCE = termcolor-$(PYTHON_TERMCOLOR_VERSION).tar.gz -PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/62/1a/e78a930f70dd576f2a7250a98263ac973a80d6f1a395d89328844881a0c0 +PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/19/da/ff1f0906818a5bd2e69e773d88801ca3c9e92d0d7caa99db1665658819ea PYTHON_TERMCOLOR_SETUP_TYPE = pep517 PYTHON_TERMCOLOR_LICENSE = MIT PYTHON_TERMCOLOR_LICENSE_FILES = COPYING.txt From peter at korsgaard.com Mon Feb 20 20:55:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:04 -0000 Subject: [Buildroot] [git commit branch/next] package/python-traitlets: bump to version 5.7.1 Message-ID: <20230220205211.728B086494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ebc1545b2f6f192d5abf2d61d9203c3f2095366 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-traitlets/python-traitlets.hash | 4 ++-- package/python-traitlets/python-traitlets.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-traitlets/python-traitlets.hash b/package/python-traitlets/python-traitlets.hash index 3b48fb6ab8..0c68e04518 100644 --- a/package/python-traitlets/python-traitlets.hash +++ b/package/python-traitlets/python-traitlets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/traitlets/json -md5 bae965c0e6ab468079f233e8a9caf581 traitlets-5.7.0.tar.gz -sha256 bd0fca5c890a09bf66b33cce67ca14156b080429bc39c7ef26b075a4bd4f9fc3 traitlets-5.7.0.tar.gz +md5 74ad03a0c8dd45d5621b12e0be0ab38f traitlets-5.7.1.tar.gz +sha256 fde8f62c05204ead43c2c1b9389cfc85befa7f54acb5da28529d671175bb4108 traitlets-5.7.1.tar.gz # Locally computed sha256 checksums sha256 3dcd47086529bf178cf7d10f35a8c188a1e9710391acecceef700898a4cf099b COPYING.md diff --git a/package/python-traitlets/python-traitlets.mk b/package/python-traitlets/python-traitlets.mk index 71bb775a45..8cda56817f 100644 --- a/package/python-traitlets/python-traitlets.mk +++ b/package/python-traitlets/python-traitlets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TRAITLETS_VERSION = 5.7.0 +PYTHON_TRAITLETS_VERSION = 5.7.1 PYTHON_TRAITLETS_SOURCE = traitlets-$(PYTHON_TRAITLETS_VERSION).tar.gz -PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/a2/88/5b2a191dd0287b45b933405d951ebfc490a9dfee2494442e5977653ec43b +PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/0b/db/9adbbb2bef9a43ecfa4f1cbcec1d662adade10262328a4b7ef65effc6341 PYTHON_TRAITLETS_LICENSE = BSD-3-Clause PYTHON_TRAITLETS_LICENSE_FILES = COPYING.md PYTHON_TRAITLETS_SETUP_TYPE = pep517 From peter at korsgaard.com Mon Feb 20 20:55:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:05 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xkeyboard-config: bump version to 2.37 Message-ID: <20230220205211.DE52C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=10b329956a378f9f3806339355cd6df32133690c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://gitlab.freedesktop.org/xorg/data/xkeyboard-config/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xkeyboard-config/xkeyboard-config.hash | 2 +- package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.hash b/package/x11r7/xkeyboard-config/xkeyboard-config.hash index e7e3765e59..08e36da1d0 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595 xkeyboard-config-2.36.tar.xz +sha256 eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c xkeyboard-config-2.37.tar.xz sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk index 0f45d9f74a..b82c15a23a 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk @@ -4,7 +4,7 @@ # ################################################################################ -XKEYBOARD_CONFIG_VERSION = 2.36 +XKEYBOARD_CONFIG_VERSION = 2.37 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.xz XKEYBOARD_CONFIG_SITE = https://www.x.org/releases/individual/data/xkeyboard-config XKEYBOARD_CONFIG_LICENSE = MIT From yann.morin.1998 at free.fr Mon Feb 20 20:55:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:05 -0000 Subject: [Buildroot] [git commit branch/next] package/python-tempora: bump to version 5.1.0 Message-ID: <20230220205203.8DD6C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55113b2e487b69d6f6c3e703ea9ef9cce1cc0075 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-tempora/python-tempora.hash | 4 ++-- package/python-tempora/python-tempora.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-tempora/python-tempora.hash b/package/python-tempora/python-tempora.hash index d802a63d87..39249eb4fa 100644 --- a/package/python-tempora/python-tempora.hash +++ b/package/python-tempora/python-tempora.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tempora/json -md5 24b77c173a7e89084004a38fe44e3ce3 tempora-5.0.2.tar.gz -sha256 31fa5bb33b2641026211f23e808eb8bd351901988b167d45f323c8f450ecf211 tempora-5.0.2.tar.gz +md5 f9954a8c3b091f9769eb7bbe0faddccf tempora-5.1.0.tar.gz +sha256 3e7c4a5369a1788c88a99b6be3a4c74c0c7728d3b62fd768a7e81bd0be0e88df tempora-5.1.0.tar.gz # Locally computed sha256 checksums sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-tempora/python-tempora.mk b/package/python-tempora/python-tempora.mk index e22ac52472..68516a8388 100644 --- a/package/python-tempora/python-tempora.mk +++ b/package/python-tempora/python-tempora.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEMPORA_VERSION = 5.0.2 +PYTHON_TEMPORA_VERSION = 5.1.0 PYTHON_TEMPORA_SOURCE = tempora-$(PYTHON_TEMPORA_VERSION).tar.gz -PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/72/2c/9aff4204a4ea5172b0cb3508f8a504ab6562ba539825ea2e33a5b4cb629b +PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/a9/4e/41863232e77742b3a5b30a81e1398abd102aa0a67657bc86a53800966b8e PYTHON_TEMPORA_LICENSE = MIT PYTHON_TEMPORA_LICENSE_FILES = LICENSE PYTHON_TEMPORA_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Mon Feb 20 20:55:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:06 -0000 Subject: [Buildroot] [git commit branch/next] package/python-traitlets: bump to version 5.7.0 Message-ID: <20230220205203.B0A8B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b401a65858161cd840378632d934a5fa13120d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-traitlets/python-traitlets.hash | 4 ++-- package/python-traitlets/python-traitlets.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-traitlets/python-traitlets.hash b/package/python-traitlets/python-traitlets.hash index 095e85c155..3b48fb6ab8 100644 --- a/package/python-traitlets/python-traitlets.hash +++ b/package/python-traitlets/python-traitlets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/traitlets/json -md5 d5f87bbea8acf897ac3e435c7b71acdc traitlets-5.5.0.tar.gz -sha256 b122f9ff2f2f6c1709dab289a05555be011c87828e911c0cf4074b85cb780a79 traitlets-5.5.0.tar.gz +md5 bae965c0e6ab468079f233e8a9caf581 traitlets-5.7.0.tar.gz +sha256 bd0fca5c890a09bf66b33cce67ca14156b080429bc39c7ef26b075a4bd4f9fc3 traitlets-5.7.0.tar.gz # Locally computed sha256 checksums sha256 3dcd47086529bf178cf7d10f35a8c188a1e9710391acecceef700898a4cf099b COPYING.md diff --git a/package/python-traitlets/python-traitlets.mk b/package/python-traitlets/python-traitlets.mk index 25ab71047a..71bb775a45 100644 --- a/package/python-traitlets/python-traitlets.mk +++ b/package/python-traitlets/python-traitlets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TRAITLETS_VERSION = 5.5.0 +PYTHON_TRAITLETS_VERSION = 5.7.0 PYTHON_TRAITLETS_SOURCE = traitlets-$(PYTHON_TRAITLETS_VERSION).tar.gz -PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/dd/a8/278742d17c9e95ccb0dcb86ae216df114d2166d88e72f42b60a7b58b600b +PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/a2/88/5b2a191dd0287b45b933405d951ebfc490a9dfee2494442e5977653ec43b PYTHON_TRAITLETS_LICENSE = BSD-3-Clause PYTHON_TRAITLETS_LICENSE_FILES = COPYING.md PYTHON_TRAITLETS_SETUP_TYPE = pep517 From peter at korsgaard.com Mon Feb 20 20:55:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:07 -0000 Subject: [Buildroot] [git commit branch/next] package/python-fire: bump to version 0.5.0 Message-ID: <20230220205211.EC0FB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7963d4a5dd86e2fce9c70371d10509220d3bda2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-fire/python-fire.hash | 4 ++-- package/python-fire/python-fire.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fire/python-fire.hash b/package/python-fire/python-fire.hash index d86376c52b..ce44bef96e 100644 --- a/package/python-fire/python-fire.hash +++ b/package/python-fire/python-fire.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fire/json -md5 799be84cbbd7df2cf159cdcb538ab6f9 fire-0.4.0.tar.gz -sha256 c5e2b8763699d1142393a46d0e3e790c5eb2f0706082df8f647878842c216a62 fire-0.4.0.tar.gz +md5 8b24d579bd2a1b344b4f9670fa49ebc8 fire-0.5.0.tar.gz +sha256 a6b0d49e98c8963910021f92bba66f65ab440da2982b78eb1bbf95a0a34aacc6 fire-0.5.0.tar.gz # Locally computed sha256 checksums sha256 a5de77b62266bca0bb97bf058992f0b0f308a83a8ca55ee10fbf6bd8ed8f7ed0 LICENSE diff --git a/package/python-fire/python-fire.mk b/package/python-fire/python-fire.mk index 40631fce86..7a6c31e8a4 100644 --- a/package/python-fire/python-fire.mk +++ b/package/python-fire/python-fire.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FIRE_VERSION = 0.4.0 +PYTHON_FIRE_VERSION = 0.5.0 PYTHON_FIRE_SOURCE = fire-$(PYTHON_FIRE_VERSION).tar.gz -PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/11/07/a119a1aa04d37bc819940d95ed7e135a7dcca1c098123a3764a6dcace9e7 +PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/94/ed/3b9a10605163f48517931083aee8364d4d6d3bb1aa9b75eb0a4a5e9fbfc1 PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:55:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:07 -0000 Subject: [Buildroot] [git commit branch/next] package/python-u-msgpack: bump to version 2.7.2 Message-ID: <20230220205203.BDB6D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d85a17270de1595d4b63c999e4c76b3bd53eccab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next License hash changed due to year update: https://github.com/vsergeev/u-msgpack-python/commit/8794887e2a71258ddacb7c435ca6f43304c2a21b Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-u-msgpack/python-u-msgpack.hash | 6 +++--- package/python-u-msgpack/python-u-msgpack.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-u-msgpack/python-u-msgpack.hash b/package/python-u-msgpack/python-u-msgpack.hash index 0891783985..0ec2385533 100644 --- a/package/python-u-msgpack/python-u-msgpack.hash +++ b/package/python-u-msgpack/python-u-msgpack.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/u-msgpack-python/json -md5 8691cea6bc7b44bce6e2115260a54323 u-msgpack-python-2.7.1.tar.gz -sha256 b7e7d433cab77171a4c752875d91836f3040306bab5063fb6dbe11f64ea69551 u-msgpack-python-2.7.1.tar.gz +md5 6c4fbe9e1df1c1563ecc9e435b82fdcb u-msgpack-python-2.7.2.tar.gz +sha256 e86f7ac6aa0ef4c6c49f004b4fd435bce99c23e2dd5d73003f3f9816024c2bd8 u-msgpack-python-2.7.2.tar.gz # Locally computed sha256 checksums -sha256 268ae7b7efbf67cd7bc0a9efea844fcf448d03f9cc6b8c79e8fe311815985030 LICENSE +sha256 f938fe2d3b7b329005d4b2851f106fd4351ca55f0836335acbe52386312f7f31 LICENSE diff --git a/package/python-u-msgpack/python-u-msgpack.mk b/package/python-u-msgpack/python-u-msgpack.mk index e0a3b3f297..372c5a8d45 100644 --- a/package/python-u-msgpack/python-u-msgpack.mk +++ b/package/python-u-msgpack/python-u-msgpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_U_MSGPACK_VERSION = 2.7.1 +PYTHON_U_MSGPACK_VERSION = 2.7.2 PYTHON_U_MSGPACK_SOURCE = u-msgpack-python-$(PYTHON_U_MSGPACK_VERSION).tar.gz -PYTHON_U_MSGPACK_SITE = https://files.pythonhosted.org/packages/62/94/a4f485b628310534d377b3e7cb6f85b8066dc823dbff0e4421fb4227fb7e +PYTHON_U_MSGPACK_SITE = https://files.pythonhosted.org/packages/44/a7/1cb4f059bbf72ea24364f9ba3ef682725af09969e29df988aa5437f0044e PYTHON_U_MSGPACK_SETUP_TYPE = setuptools PYTHON_U_MSGPACK_LICENSE = MIT PYTHON_U_MSGPACK_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:55:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:07 -0000 Subject: [Buildroot] [git commit branch/next] package/python-aiocoap: bump to version 0.4.5 Message-ID: <20230220205212.1CDB886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15f7b944df8be0f20e88f1d2b50534700030981e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-aiocoap/python-aiocoap.hash | 4 ++-- package/python-aiocoap/python-aiocoap.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiocoap/python-aiocoap.hash b/package/python-aiocoap/python-aiocoap.hash index 176b3d22c7..ab50ff0958 100644 --- a/package/python-aiocoap/python-aiocoap.hash +++ b/package/python-aiocoap/python-aiocoap.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiocoap/json -md5 218178420e8fc3581001f52eb726b016 aiocoap-0.4.4.tar.gz -sha256 9d7c9626cbc4dc24a91c6b8694cbeb834e376ab7e20e4137609380f726a9540b aiocoap-0.4.4.tar.gz +md5 03ca0411b7401bfd6e9bdaefe09bd88a aiocoap-0.4.5.tar.gz +sha256 906c927822185c8acf04fdcc1dd98fd845f31dabf5d5e395c39137dcbd6ba1e3 aiocoap-0.4.5.tar.gz # Locally computed sha256 checksums sha256 2bb211d412a6bfa4b2a9cf01123c7fe90e5e6185938896e23ab07b84f8494180 LICENSE diff --git a/package/python-aiocoap/python-aiocoap.mk b/package/python-aiocoap/python-aiocoap.mk index 96d8619a84..92f47b7a4f 100644 --- a/package/python-aiocoap/python-aiocoap.mk +++ b/package/python-aiocoap/python-aiocoap.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCOAP_VERSION = 0.4.4 +PYTHON_AIOCOAP_VERSION = 0.4.5 PYTHON_AIOCOAP_SOURCE = aiocoap-$(PYTHON_AIOCOAP_VERSION).tar.gz -PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/6a/7c/139993da8dcdfc86446ee6df65b98c68e40c5fcb0caeff3a6b348d9f7d6f +PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/65/63/9051af6a2fc498f50b71f23bdbde0cc1d1f0a69eb767776dbf6d1411e240 PYTHON_AIOCOAP_SETUP_TYPE = setuptools PYTHON_AIOCOAP_LICENSE = MIT PYTHON_AIOCOAP_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:55:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:08 -0000 Subject: [Buildroot] [git commit branch/next] package/python-watchdog: bump to version 2.2.0 Message-ID: <20230220205203.E397486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=873ea8bd385ef1b89be0f2753f6968aae6022508 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-watchdog/python-watchdog.hash | 4 ++-- package/python-watchdog/python-watchdog.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-watchdog/python-watchdog.hash b/package/python-watchdog/python-watchdog.hash index 59facb8fea..3bacccf2d6 100644 --- a/package/python-watchdog/python-watchdog.hash +++ b/package/python-watchdog/python-watchdog.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/watchdog/json -md5 0e60e0a2d3a8c18ba37105f8b44de810 watchdog-2.1.9.tar.gz -sha256 43ce20ebb36a51f21fa376f76d1d4692452b2527ccd601950d69ed36b9e21609 watchdog-2.1.9.tar.gz +md5 d029b806814bcba26745c26769a847bc watchdog-2.2.0.tar.gz +sha256 83cf8bc60d9c613b66a4c018051873d6273d9e45d040eed06d6a96241bd8ec01 watchdog-2.2.0.tar.gz # Locally computed sha256 checksums sha256 02c8760f988a76e92a9d6cb525456a86f7b0fd1953870dd491de5955cb974d41 COPYING sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-watchdog/python-watchdog.mk b/package/python-watchdog/python-watchdog.mk index 71a3f8a0c2..bb9f145e16 100644 --- a/package/python-watchdog/python-watchdog.mk +++ b/package/python-watchdog/python-watchdog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WATCHDOG_VERSION = 2.1.9 +PYTHON_WATCHDOG_VERSION = 2.2.0 PYTHON_WATCHDOG_SOURCE = watchdog-$(PYTHON_WATCHDOG_VERSION).tar.gz -PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/42/f7/da8e889f8626786eac9454e8d2718fc79359ed517be20cdd50c647167d39 +PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/c3/fb/bd960970258366b0704307ccd12617d64201407bfb6d31ae412d2762ccf1 PYTHON_WATCHDOG_SETUP_TYPE = setuptools PYTHON_WATCHDOG_LICENSE = Apache-2.0 PYTHON_WATCHDOG_LICENSE_FILES = LICENSE COPYING From peter at korsgaard.com Mon Feb 20 20:55:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:08 -0000 Subject: [Buildroot] [git commit branch/next] package/python-maturin: bump to version 0.14.5 Message-ID: <20230220205212.2A85786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63cd5db50914536910b67a0a06e05c22ddcc5a22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index d642119786..9d68751c03 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 dd1ee5cd1bb76c434319f305cd30873be2f8221e310168fc376b53b7d0e166ff maturin-0.14.4.tar.gz +sha256 383f60977a330ec8699a51c37ea9c5175ee7e95fc36b06d9415e0eec1f3acaf0 maturin-0.14.5.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index ea055ffcf6..4570ad4535 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.4 +PYTHON_MATURIN_VERSION = 0.14.5 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/7c/51/36749c1a0881a4292e4f334bd9ddb0865e0991a83070834d1aaa1af7443f +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/36/83/2bdec738921e253d774ab8b9e99f4540a406ad0d8a1442c84575e5506686 PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From yann.morin.1998 at free.fr Mon Feb 20 20:55:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:09 -0000 Subject: [Buildroot] [git commit branch/next] package/python-urllib3: bump to version 1.26.13 Message-ID: <20230220205203.D684F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a265441cf91c8accdf0e2bbdc46171335c357ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-urllib3/python-urllib3.hash | 4 ++-- package/python-urllib3/python-urllib3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash index 8aacf5780a..963967332e 100644 --- a/package/python-urllib3/python-urllib3.hash +++ b/package/python-urllib3/python-urllib3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urllib3/json -md5 ba308b52b9092184cf4905bc59a88fc0 urllib3-1.26.12.tar.gz -sha256 3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e urllib3-1.26.12.tar.gz +md5 38f7d1589aa9720101316d07fcbd05c8 urllib3-1.26.13.tar.gz +sha256 c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8 urllib3-1.26.13.tar.gz # Locally computed sha256 checksums sha256 c37bf186e27cf9dbe9619e55edfe3cea7b30091ceb3da63c7dacbe0e6d77907b LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index 96d3938fd2..5868927440 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.26.12 +PYTHON_URLLIB3_VERSION = 1.26.13 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/b2/56/d87d6d3c4121c0bcec116919350ca05dc3afd2eeb7dc88d07e8083f8ea94 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/c2/51/32da03cf19d17d46cce5c731967bf58de9bd71db3a379932f53b094deda4 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python From peter at korsgaard.com Mon Feb 20 20:55:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:09 -0000 Subject: [Buildroot] [git commit branch/next] package/mtd: add lsmtd option Message-ID: <20230220205212.361A586496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4c41ac00c7d144f8aed1644a1b80eca8470d01d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next lsmtd is a new utility added in v2.1.0[1]. [1] http://git.infradead.org/mtd-utils.git/commit/c26ce774a7209012c0505ee841d54898c6665e20 Signed-off-by: Brandon Maier Signed-off-by: Peter Korsgaard --- package/mtd/Config.in | 3 +++ package/mtd/mtd.mk | 1 + 2 files changed, 4 insertions(+) diff --git a/package/mtd/Config.in b/package/mtd/Config.in index c45dd1e2b7..3ba48da645 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -71,6 +71,9 @@ config BR2_PACKAGE_MTD_JFFS2DUMP bool "jffs2dump" select BR2_PACKAGE_MTD_JFFS_UTILS +config BR2_PACKAGE_MTD_LSMTD + bool "lsmtd" + config BR2_PACKAGE_MTD_MKFSJFFS2 bool "mkfs.jffs2" select BR2_PACKAGE_MTD_JFFS_UTILS diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 6e266a8760..db2b104586 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -94,6 +94,7 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump +MTD_TARGETS_$(BR2_PACKAGE_MTD_LSMTD) += lsmtd MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2 MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug MTD_TARGETS_$(BR2_PACKAGE_MTD_MTDPART) += mtdpart From yann.morin.1998 at free.fr Mon Feb 20 20:55:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:10 -0000 Subject: [Buildroot] [git commit branch/next] package/python-yarl: bump to version 1.8.2 Message-ID: <20230220205204.0AF07828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca8d70086d31d1f54c31dcbc2bab307d97066910 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-yarl/python-yarl.hash | 4 ++-- package/python-yarl/python-yarl.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-yarl/python-yarl.hash b/package/python-yarl/python-yarl.hash index b4e411cbdf..9725e0058b 100644 --- a/package/python-yarl/python-yarl.hash +++ b/package/python-yarl/python-yarl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/yarl/json -md5 ff8f2843481cd11c3c674ce4f6fa167b yarl-1.8.1.tar.gz -sha256 af887845b8c2e060eb5605ff72b6f2dd2aab7a761379373fd89d314f4752abbf yarl-1.8.1.tar.gz +md5 57c82725b9f4895eecee45faf5e61a54 yarl-1.8.2.tar.gz +sha256 49d43402c6e3013ad0978602bf6bf5328535c48d192304b91b97a3c6790b1562 yarl-1.8.2.tar.gz # Locally computed sha256 checksums sha256 56d6ac6c8105c0a51304c21db060e361af9a8ea0af9a75c239c28b5d13693838 LICENSE diff --git a/package/python-yarl/python-yarl.mk b/package/python-yarl/python-yarl.mk index 55bfbab53e..77e0c91383 100644 --- a/package/python-yarl/python-yarl.mk +++ b/package/python-yarl/python-yarl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YARL_VERSION = 1.8.1 +PYTHON_YARL_VERSION = 1.8.2 PYTHON_YARL_SOURCE = yarl-$(PYTHON_YARL_VERSION).tar.gz -PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/d6/04/255c68974ec47fa754564c4abba8f61f9ed68b869bbbb854198d6259c4f7 +PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/c4/1e/1b204050c601d5cd82b45d5c8f439cb6f744a2ce0c0a6f83be0ddf0dc7b2 PYTHON_YARL_LICENSE = Apache-2.0 PYTHON_YARL_LICENSE_FILES = LICENSE PYTHON_YARL_SETUP_TYPE = setuptools From peter at korsgaard.com Mon Feb 20 20:55:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:10 -0000 Subject: [Buildroot] [git commit branch/next] linux: bump _KERNEL_LATEST_VERSION to 6.1 Message-ID: <20230220205212.76B1986494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78504fca92c33cfd23beddd1c9b83fe58b9e0e9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index fba3d90e6b..1bca082cbf 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,8 +28,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.0)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.1)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.145-cip17)" @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.0.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ From peter at korsgaard.com Mon Feb 20 20:55:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:15 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-headers: drop 5.19.x option Message-ID: <20230220205204.90781828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5449ea7d20e76242661434b5324c7474c2c96938 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The 5.19.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 9602a49e3b..cb0176a31c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_5_19 + bool "kernel headers version 5.19.x are no longer supported" + select BR2_LEGACY + help + Version 5.19.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA bool "xf86-video-tga removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 8739da4f75..9976a44489 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 89b730edf8942b49e02f9894244205886c9a214d629b35b88c4ff06ee9304f01 linux-6.0.12.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 c93bb384a97ad1f0a4f18e442ce0291242722f78023eca658b22344541f09489 linux-5.19.17.tar.xz sha256 fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65 linux-5.15.82.tar.xz sha256 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7 linux-5.10.158.tar.xz sha256 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44 linux-5.4.226.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 24f51418e6..4c8b1fca27 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -53,10 +53,6 @@ config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 -config BR2_KERNEL_HEADERS_5_19 - bool "Linux 5.19.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 - config BR2_KERNEL_HEADERS_6_0 bool "Linux 6.0.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 @@ -398,7 +394,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.226" if BR2_KERNEL_HEADERS_5_4 default "5.10.158" if BR2_KERNEL_HEADERS_5_10 default "5.15.82" if BR2_KERNEL_HEADERS_5_15 - default "5.19.17" if BR2_KERNEL_HEADERS_5_19 default "6.0.12" if BR2_KERNEL_HEADERS_6_0 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From peter at korsgaard.com Mon Feb 20 20:55:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:16 -0000 Subject: [Buildroot] [git commit branch/next] package/mpfr: bump to version 4.1.1 Message-ID: <20230220205213.315CB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4386b912db9f9f9a3cf5cbc9165e1609a55309f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://www.mpfr.org/mpfr-4.1.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mpfr/mpfr.hash | 2 +- package/mpfr/mpfr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpfr/mpfr.hash b/package/mpfr/mpfr.hash index 35056f626a..4b0d14c9c2 100644 --- a/package/mpfr/mpfr.hash +++ b/package/mpfr/mpfr.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f mpfr-4.1.0.tar.xz +sha256 ffd195bd567dbaffc3b98b23fd00aad0537680c9896171e44fe3ff79e28ac33d mpfr-4.1.1.tar.xz # Hash for license file sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSER diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index cd558dae0e..8d12c7502b 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPFR_VERSION = 4.1.0 +MPFR_VERSION = 4.1.1 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:16 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: bump to version 1.7.2 Message-ID: <20230220205204.A17F481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6987b92da510a8c8b9534a22506850c163d0f035 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bugfixes: https://github.com/containers/crun/releases/tag/1.7.2 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/crun/crun.hash | 2 +- package/crun/crun.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/crun/crun.hash b/package/crun/crun.hash index de61310e08..2b21800f02 100644 --- a/package/crun/crun.hash +++ b/package/crun/crun.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 acd24012daa951cf1674b20b2d5f87975d5d6c8e8c80bfe12e4cffa3495cae67 crun-1.5.tar.gz +sha256 f669ecd3d1895dcaa8425eabb707c06eb3bdb5ae5201a50a423c3cace36c4a05 crun-1.7.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.libcrun diff --git a/package/crun/crun.mk b/package/crun/crun.mk index 65f166e657..8c9993993c 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRUN_VERSION = 1.5 +CRUN_VERSION = 1.7.2 CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION) CRUN_DEPENDENCIES = host-pkgconf yajl From peter at korsgaard.com Mon Feb 20 20:55:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:17 -0000 Subject: [Buildroot] [git commit branch/next] configs/nezha_defconfig: use 6.1 kernel headers Message-ID: <20230220205213.54FAF86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bed9b6cd02cf26a8d9b26f876f3f46a7352e6542 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The kernel used is based on 6.1-rc3, so use the recently introduced 6.1 kernel headers version to fix a build issue: Incorrect selection of kernel headers: expected 6.0.x, got 6.1.x Signed-off-by: Peter Korsgaard --- configs/nezha_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 2936746c49..854392f929 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:17 -0000 Subject: [Buildroot] [git commit branch/next] package/usbutils: bump to version 015 Message-ID: <20230220205204.BD08F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=994113674adf46a3059d3378708a2aed4cce0c80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/gregkh/usbutils/blob/v015/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/usbutils/usbutils.hash | 2 +- package/usbutils/usbutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/usbutils/usbutils.hash b/package/usbutils/usbutils.hash index f5d55bb4a0..caedf5fd80 100644 --- a/package/usbutils/usbutils.hash +++ b/package/usbutils/usbutils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/usb/usbutils/sha256sums.asc -sha256 3a079cfad60560227b67192482d7813bf96326fcbb66c04254839715f276fc69 usbutils-014.tar.xz +sha256 c3b451bb1f4ff9f6356cac5a6956a9ac8e85d81651af56a29e689f94fa6fda6e usbutils-015.tar.xz # Locally calculated sha256 91412672119c72352b76c1d48fa1a8b7cdc7f70be7929e468c8805db468e23e4 LICENSES/GPL-2.0-only.txt sha256 4631da83311d27f99078d0d102e31bd34a4fcbcc2dae2aa40f1454a5b48125dc LICENSES/GPL-3.0-only.txt diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 50b1a5a0cc..84a6a625cf 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBUTILS_VERSION = 014 +USBUTILS_VERSION = 015 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils USBUTILS_DEPENDENCIES = host-pkgconf libusb udev From peter at korsgaard.com Mon Feb 20 20:55:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:18 -0000 Subject: [Buildroot] [git commit branch/next] configs/lichee_rv: new defconfig Message-ID: <20230220205212.E2DB486494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=286628bcc2d1931807c4648ef4359873bb3ee559 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Lichee RV - Nezha CM is a compute module with modular design, equipped with Allwinner D1 chip (based on T-Head XuanTie C906 core), 512MB DDR3 RAM. Board support is based on the nezha defconfig already available in buildroot. https://wiki.sipeed.com/hardware/en/lichee/RV/RV.html https://linux-sunxi.org/Sipeed_Lichee_RV Signed-off-by: Angelo Compagnucci Reviewed-by: Indrek Kruusa Tested-by: Indrek Kruusa Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ board/sipeed/lichee_rv/genimage.cfg | 19 +++++++++++++ .../lichee_rv/overlay/boot/extlinux/extlinux.conf | 4 +++ board/sipeed/lichee_rv/readme.txt | 26 +++++++++++++++++ configs/sipeed_lichee_rv_defconfig | 33 ++++++++++++++++++++++ 5 files changed, 84 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b52a065dbc..2f27ddb110 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -157,6 +157,8 @@ N: Andrey Yurovsky F: package/rauc/ N: Angelo Compagnucci +F: board/sipeed/lichee_rv/ +F: configs/sipeed_lichee_rv* F: package/apparmor/ F: package/corkscrew/ F: package/cups/ diff --git a/board/sipeed/lichee_rv/genimage.cfg b/board/sipeed/lichee_rv/genimage.cfg new file mode 100644 index 0000000000..d5df41203d --- /dev/null +++ b/board/sipeed/lichee_rv/genimage.cfg @@ -0,0 +1,19 @@ +# Minimal SD card image for the sipeed Lichee RV + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + offset = 1M + } +} diff --git a/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf b/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..91b2298628 --- /dev/null +++ b/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + # use devicetree from u-boot + append console=ttyS0,115200 root=/dev/mmcblk0p1 ro rootwait diff --git a/board/sipeed/lichee_rv/readme.txt b/board/sipeed/lichee_rv/readme.txt new file mode 100644 index 0000000000..24e8141851 --- /dev/null +++ b/board/sipeed/lichee_rv/readme.txt @@ -0,0 +1,26 @@ +Lichee RV +=============== + +Lichee RV - Nezha CM is a compute module with modular design, equipped +with Allwinner D1 chip (based on T-Head XuanTie C906 core), 512MB DDR3 RAM. +It can boot from TF card or SD-NAND, uses two sets of M.2 b key 67 pin +connectors to route all IO, making it convient for wide use and easy to replace. + +How to build +============ + +$ make sipeed_lichee_rv_defconfig +$ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Connect a TTL UART to the debug connector, insert the microSD card and +plug in a USB-C cable to the PWR connector to boot the system. diff --git a/configs/sipeed_lichee_rv_defconfig b/configs/sipeed_lichee_rv_defconfig new file mode 100644 index 0000000000..f9782f870b --- /dev/null +++ b/configs/sipeed_lichee_rv_defconfig @@ -0,0 +1,33 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/lichee_rv/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="nezha" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-lichee-rv" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +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_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_PLAT="generic" +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set +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,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="lichee_rv_dock" +BR2_TARGET_UBOOT_NEEDS_DTC=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-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y From yann.morin.1998 at free.fr Mon Feb 20 20:55:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:18 -0000 Subject: [Buildroot] [git commit branch/next] package/python3: bump to version 3.11.1 Message-ID: <20230220205204.2D430828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c38de8139abee58fb8d1cdc83d061c93aee7fd7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update license hash: - http://www.cwi.nl -> https://www.cwi.nl - http://www.cnri.reston.va.us -> https://www.cnri.reston.va.us - http://www.opensource.org -> https://opensource.org Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- ...33-Fix-quadratic-time-idna-decoding.-GH-9.patch | 86 ---------------------- package/python3/python3.hash | 4 +- package/python3/python3.mk | 2 +- 3 files changed, 3 insertions(+), 89 deletions(-) diff --git a/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch b/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch deleted file mode 100644 index d281e7261d..0000000000 --- a/package/python3/0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 9bb8e18ca46fe66fa6802602f8a7228a24dd785f Mon Sep 17 00:00:00 2001 -From: "Miss Islington (bot)" - <31488909+miss-islington at users.noreply.github.com> -Date: Mon, 7 Nov 2022 19:23:16 -0800 -Subject: [PATCH] [3.11] gh-98433: Fix quadratic time idna decoding. (GH-99092) - (GH-99222) - -There was an unnecessary quadratic loop in idna decoding. This restores -the behavior to linear. - -(cherry picked from commit d315722564927c7202dd6e111dc79eaf14240b0d) - -(cherry picked from commit a6f6c3a3d6f2b580f2d87885c9b8a9350ad7bf15) - -Co-authored-by: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com> -Co-authored-by: Gregory P. Smith -[Peter: drop NEWS.d/*] -Signed-off-by: Peter Korsgaard ---- - Lib/encodings/idna.py | 32 +++++++++---------- - Lib/test/test_codecs.py | 6 ++++ - 2 files changed, 23 insertions(+), 17 deletions(-) - -diff --git a/Lib/encodings/idna.py b/Lib/encodings/idna.py -index ea4058512f..bf98f51336 100644 ---- a/Lib/encodings/idna.py -+++ b/Lib/encodings/idna.py -@@ -39,23 +39,21 @@ def nameprep(label): - - # Check bidi - RandAL = [stringprep.in_table_d1(x) for x in label] -- for c in RandAL: -- if c: -- # There is a RandAL char in the string. Must perform further -- # tests: -- # 1) The characters in section 5.8 MUST be prohibited. -- # This is table C.8, which was already checked -- # 2) If a string contains any RandALCat character, the string -- # MUST NOT contain any LCat character. -- if any(stringprep.in_table_d2(x) for x in label): -- raise UnicodeError("Violation of BIDI requirement 2") -- -- # 3) If a string contains any RandALCat character, a -- # RandALCat character MUST be the first character of the -- # string, and a RandALCat character MUST be the last -- # character of the string. -- if not RandAL[0] or not RandAL[-1]: -- raise UnicodeError("Violation of BIDI requirement 3") -+ if any(RandAL): -+ # There is a RandAL char in the string. Must perform further -+ # tests: -+ # 1) The characters in section 5.8 MUST be prohibited. -+ # This is table C.8, which was already checked -+ # 2) If a string contains any RandALCat character, the string -+ # MUST NOT contain any LCat character. -+ if any(stringprep.in_table_d2(x) for x in label): -+ raise UnicodeError("Violation of BIDI requirement 2") -+ # 3) If a string contains any RandALCat character, a -+ # RandALCat character MUST be the first character of the -+ # string, and a RandALCat character MUST be the last -+ # character of the string. -+ if not RandAL[0] or not RandAL[-1]: -+ raise UnicodeError("Violation of BIDI requirement 3") - - return label - -diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py -index 8edd5ac063..2407567261 100644 ---- a/Lib/test/test_codecs.py -+++ b/Lib/test/test_codecs.py -@@ -1535,6 +1535,12 @@ def test_builtin_encode(self): - self.assertEqual("pyth\xf6n.org".encode("idna"), b"xn--pythn-mua.org") - self.assertEqual("pyth\xf6n.org.".encode("idna"), b"xn--pythn-mua.org.") - -+ def test_builtin_decode_length_limit(self): -+ with self.assertRaisesRegex(UnicodeError, "too long"): -+ (b"xn--016c"+b"a"*1100).decode("idna") -+ with self.assertRaisesRegex(UnicodeError, "too long"): -+ (b"xn--016c"+b"a"*70).decode("idna") -+ - def test_stream(self): - r = codecs.getreader("idna")(io.BytesIO(b"abc")) - r.read(3) --- -2.30.2 - diff --git a/package/python3/python3.hash b/package/python3/python3.hash index c4ee79305d..7f079865d9 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a57dc82d77358617ba65b9841cee1e3b441f386c3789ddc0676eca077f2951c3 Python-3.11.0.tar.xz -sha256 f03e17cd594c2085f66a454e695c7ebe5b4d3c0eff534f4f194abc2fd164621b LICENSE +sha256 85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f Python-3.11.1.tar.xz +sha256 d4a223f033419313218c9b8444167e91e87a5bebdb43fb8490df441df5220a8b LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 123bc8ef88..219d135b3f 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).0 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From peter at korsgaard.com Mon Feb 20 20:55:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:19 -0000 Subject: [Buildroot] [git commit branch/next] configs/sipeed_lichee_rv_dock_defconfig: use 6.1 kernel headers Message-ID: <20230220205213.5EE7686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dfbe4215cd19cfe95922ba8536b61f44a6ce8140 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The kernel used is based on 6.1-rc3, so use the recently introduced 6.1 kernel headers version to fix a build issue: Incorrect selection of kernel headers: expected 6.0.x, got 6.1.x Signed-off-by: Peter Korsgaard --- configs/sipeed_lichee_rv_dock_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sipeed_lichee_rv_dock_defconfig b/configs/sipeed_lichee_rv_dock_defconfig index 7c8c6788fa..807209eeec 100644 --- a/configs/sipeed_lichee_rv_dock_defconfig +++ b/configs/sipeed_lichee_rv_dock_defconfig @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay board/sipeed/lichee_rv_dock/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:20 -0000 Subject: [Buildroot] [git commit branch/next] package/docker-compose: bump to version 2.14.0 Message-ID: <20230220205204.CAE348648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1576b09b5c52b746256ca5b4b313eab9bf068b09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/docker/compose/releases/tag/v2.14.0 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 39f98523b8..7a7ab5f110 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 69d7d0311ac34ed4543f9a694995fbc4e2b785976a5a710015c20f0d04c204cb docker-compose-2.11.2.tar.gz +sha256 5cbf6cd1dd8ce98c5e2d62ca7f622e96abce444979b8e8852b033213a98e2049 docker-compose-2.14.0.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index bc88d8df88..ef9ee97196 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.11.2 +DOCKER_COMPOSE_VERSION = 2.14.0 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:55:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:20 -0000 Subject: [Buildroot] [git commit branch/next] package/unifdef: add new package Message-ID: <20230220205213.836F086494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7dbe844bae38aba8e6080da3b650b89f702c0f1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A small package that does "Selectively remove C preprocessor conditionals". The package will be needed for the upcoming webkitgtk 2.40.0 release. I personally added it to get started with 2.39.2. See: https://github.com/WebKit/WebKit/commit/f76a7e30e5749af897b83cc75b2534b1afa32552 Signed-off-by: Thomas Devoogdt [Peter: use prefix=] Signed-off-by: Peter Korsgaard --- .../0001-Makefile-fix-error-on-install.patch | 31 ++++++++++++++++++++++ package/unifdef/unifdef.hash | 3 +++ package/unifdef/unifdef.mk | 20 ++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/package/unifdef/0001-Makefile-fix-error-on-install.patch b/package/unifdef/0001-Makefile-fix-error-on-install.patch new file mode 100644 index 0000000000..c959a41c5a --- /dev/null +++ b/package/unifdef/0001-Makefile-fix-error-on-install.patch @@ -0,0 +1,31 @@ +From b5e4229918c13bc0c11a523105cdb3a464337b37 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 12 Dec 2022 12:59:59 +0100 +Subject: [PATCH] Makefile: fix error on install + +ln: failed to create symbolic link '/home/thomas/Documents/buildroot/output/host/share/man/man1/unifdefall.1': File exists + +Seen while trying to add this package to buildroot.org. + +(upstream: https://github.com/fanf2/unifdef/pull/16) +Signed-off-by: Thomas Devoogdt +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 36c7028..485927a 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,7 +28,7 @@ install: unifdef unifdefall.sh unifdef.1 + : manual + install -m 755 -d ${man1dest} + install -m 644 unifdef.1 ${man1dest}/ +- ln -s unifdef.1 ${man1dest}/unifdefall.1 ++ ln -f -s unifdef.1 ${man1dest}/unifdefall.1 + + clean: + rm -f unifdef version.h +-- +2.38.1 + diff --git a/package/unifdef/unifdef.hash b/package/unifdef/unifdef.hash new file mode 100644 index 0000000000..c3a6b7465c --- /dev/null +++ b/package/unifdef/unifdef.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 fba564a24db7b97ebe9329713ac970627b902e5e9e8b14e19e024eb6e278d10b unifdef-2.12.tar.gz +sha256 37ed46a39446b15b08af418fda23b75c27a769d5aad236d817ee7522cc9caeee COPYING diff --git a/package/unifdef/unifdef.mk b/package/unifdef/unifdef.mk new file mode 100644 index 0000000000..7d10595d1b --- /dev/null +++ b/package/unifdef/unifdef.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# unifdef +# +################################################################################ + +UNIFDEF_VERSION = 2.12 +UNIFDEF_SITE = https://dotat.at/prog/unifdef +UNIFDEF_LICENSE = BSD-2-Clause +UNIFDEF_LICENSE_FILES = COPYING + +define HOST_UNIFDEF_BUILD_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + +define HOST_UNIFDEF_INSTALL_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) prefix=$(HOST_DIR) install +endef + +$(eval $(host-generic-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:21 -0000 Subject: [Buildroot] [git commit branch/next] package/fuse-overlayfs: bump to version 1.10 Message-ID: <20230220205204.DA169828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=498b9c294239d4684641df5ee60e169a4ed85383 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Contains various bugfixes. https://github.com/containers/fuse-overlayfs/releases/tag/v1.10 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/fuse-overlayfs/fuse-overlayfs.hash | 2 +- package/fuse-overlayfs/fuse-overlayfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fuse-overlayfs/fuse-overlayfs.hash b/package/fuse-overlayfs/fuse-overlayfs.hash index f9473c154a..aa5438755e 100644 --- a/package/fuse-overlayfs/fuse-overlayfs.hash +++ b/package/fuse-overlayfs/fuse-overlayfs.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 6c81b65b71067b303aaa9871f512c2cabc23e2b793f19c6c854d01a492b5a923 fuse-overlayfs-1.5.0.tar.gz +sha256 4351eaed7cf26a5012c14c6e0fc883ef65a7b5dcc95ba129ce485904106c25a9 fuse-overlayfs-1.10.tar.gz # Locally computed sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/fuse-overlayfs/fuse-overlayfs.mk b/package/fuse-overlayfs/fuse-overlayfs.mk index 0ad7dbc51d..1633d3bd41 100644 --- a/package/fuse-overlayfs/fuse-overlayfs.mk +++ b/package/fuse-overlayfs/fuse-overlayfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -FUSE_OVERLAYFS_VERSION = 1.5.0 +FUSE_OVERLAYFS_VERSION = 1.10 FUSE_OVERLAYFS_SITE = $(call github,containers,fuse-overlayfs,v$(FUSE_OVERLAYFS_VERSION)) FUSE_OVERLAYFS_LICENSE = GPL-3.0 FUSE_OVERLAYFS_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:55:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:21 -0000 Subject: [Buildroot] [git commit branch/next] package/libgpg-error: Disable support for non-C languages Message-ID: <20230220205213.B03EC86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9abb21ab314cb5d5000334fd9399521104d64043 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The only other language supported is CL (Common Lisp) which buildroot does not package yet. This saves 52KB in the final root filesystem. Signed-off-by: Florian Fainelli [yann.morin.1998 at free.fr: reformat for one-option per-line] Signed-off-by: Yann E. MORIN --- package/libgpg-error/libgpg-error.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 86dea6ad2a..252d95ac7f 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -13,8 +13,10 @@ LIBGPG_ERROR_CPE_ID_VENDOR = gnupg LIBGPG_ERROR_INSTALL_STAGING = YES LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -LIBGPG_ERROR_CONF_OPTS = --disable-tests \ - --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) +LIBGPG_ERROR_CONF_OPTS = \ + --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) \ + --disable-tests \ + --disable-languages ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBGPG_ERROR_CONF_OPTS += --enable-threads From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:22 -0000 Subject: [Buildroot] [git commit branch/next] package/moby-buildkit: security bump to version 0.10.6 Message-ID: <20230220205205.06D0181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b69acab54b6b258d83833c8f51b09ee0913e9a4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next CVE-2022-39253: git vulnerability mitigation. ... and other bugfixes. https://github.com/moby/buildkit/releases/tag/v0.10.6 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- 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 cfd1c0c946..43ee1b12c9 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5877faf02cbddfb6c988f44b5b373739fed87f4aeb8802c6777fe7be2f772506 moby-buildkit-0.10.0.tar.gz +sha256 5ffe5a2d11736719649dae962461f66df394ae4cc1e58294e5f2bd4d4632d9d0 moby-buildkit-0.10.6.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 667383bf50..59d68a7dca 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.10.0 +MOBY_BUILDKIT_VERSION = 0.10.6 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:22 -0000 Subject: [Buildroot] [git commit branch/next] package/mosh: bump to version 1.4.0 Message-ID: <20230220205205.142A0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=271ad374ced4bfe325bf0d8ba21adb92793d2ae7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Many new features & bugfixes. https://github.com/mobile-shell/mosh/releases Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/mosh/mosh.hash | 2 +- package/mosh/mosh.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mosh/mosh.hash b/package/mosh/mosh.hash index 3558bf9030..6c1d0e7af3 100644 --- a/package/mosh/mosh.hash +++ b/package/mosh/mosh.hash @@ -1,5 +1,5 @@ # From https://mailman.mit.edu/pipermail/mosh-users/2017-July/000357.html -sha256 da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216 mosh-1.3.2.tar.gz +sha256 872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd mosh-1.4.0.tar.gz # Locally calculcated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8042495ddc8d99b883335d53552554eccf825fc1f0ba487d0f8e6656baaa8199 COPYING.iOS diff --git a/package/mosh/mosh.mk b/package/mosh/mosh.mk index f9e335799d..c938f70719 100644 --- a/package/mosh/mosh.mk +++ b/package/mosh/mosh.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSH_VERSION = 1.3.2 +MOSH_VERSION = 1.4.0 MOSH_SITE = https://mosh.org MOSH_DEPENDENCIES = zlib ncurses protobuf host-pkgconf MOSH_LICENSE = GPL-3.0+ with exception From peter at korsgaard.com Mon Feb 20 20:55:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:25 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-input-keyboard: remove package Message-ID: <20230220205213.9334B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1100ead7b3189761765988504609447c88e22da5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next According to the upstream release notes of version 2.0.0: https://lists.x.org/archives/xorg-announce/2022-July/003180.html "This keyboard driver is primarily used with BSD, GNU Hurd, illumos, & Solaris systems. Linux systems should instead use either xf86-input- libinput or xf86-input-evdev. While versions 1.9.0 and earlier had rudimentary support for Linux as well, that has been removed in this release." Signed-off-by: Bernd Kuhls [Peter: Reword help text] Signed-off-by: Peter Korsgaard --- Config.in.legacy | 5 +++++ package/x11r7/Config.in | 1 - package/x11r7/xdriver_xf86-input-keyboard/Config.in | 5 ----- .../xdriver_xf86-input-keyboard.hash | 4 ---- .../xdriver_xf86-input-keyboard.mk | 15 --------------- 5 files changed, 5 insertions(+), 25 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 852189f0ff..ca25c18b16 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,11 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD + bool "xf86-input-keyboard removed" + help + The X.org keyboard input driver no longer support Linux. + config BR2_TARGET_SUN20I_D1_SPL bool "sun20-d1-spl removed" select BR2_LEGACY diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index da79c4e851..4d3613cf4d 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -149,7 +149,6 @@ if BR2_PACKAGE_XORG7 menu "X11R7 Drivers" source package/x11r7/xdriver_xf86-input-evdev/Config.in source package/x11r7/xdriver_xf86-input-joystick/Config.in - source package/x11r7/xdriver_xf86-input-keyboard/Config.in source package/x11r7/xdriver_xf86-input-libinput/Config.in source package/x11r7/xdriver_xf86-input-mouse/Config.in source package/x11r7/xdriver_xf86-input-synaptics/Config.in diff --git a/package/x11r7/xdriver_xf86-input-keyboard/Config.in b/package/x11r7/xdriver_xf86-input-keyboard/Config.in deleted file mode 100644 index ee23033b97..0000000000 --- a/package/x11r7/xdriver_xf86-input-keyboard/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD - bool "xf86-input-keyboard" - select BR2_PACKAGE_XORGPROTO - help - Keyboard input driver diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash deleted file mode 100644 index 66e2c3ed95..0000000000 --- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002739.html -sha256 f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388 xf86-input-keyboard-1.9.0.tar.bz2 -# Locally calculated -sha256 b91b17c53724c79685e3025a38028b7d48c966fdd239e0efe2d98874d3c139a0 COPYING diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk deleted file mode 100644 index fb1e289643..0000000000 --- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xdriver_xf86-input-keyboard -# -################################################################################ - -XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.9.0 -XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_INPUT_KEYBOARD_LICENSE = MIT -XDRIVER_XF86_INPUT_KEYBOARD_LICENSE_FILES = COPYING -XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xorgproto -XDRIVER_XF86_INPUT_KEYBOARD_CONF_OPTS = --disable-selective-werror - -$(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:55:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:26 -0000 Subject: [Buildroot] [git commit branch/next] Config.in: update default CPAN mirror to https, update mirrors URL Message-ID: <20230220205213.DDAC186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=add21fd600b2db4dbb930e2e62b9fbb1b72cceb9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The http site automatically redirects to the https variant, so let's just use that as the default. The mirror list URL http://search.cpan.org/mirror seems outdated (re-directed to https://metacpan.org/mirrors aka 'Not Found - The resource you requested could not be found.'). The closest matching URLs we found were: https://www.cpan.org/SITES.html http://mirrors.cpan.org/map.html http://mirrors.cpan.org/ That last one has all the list, so we use that; the second is a world map, so we also include it. Sadly, neither of the mirrors list (table or map) are served as https; they are only available as http... Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: - add a little blurb to explain http->https redirect - update the mirror list URL, and... - extend commit message with original explanations from Peter, and.. - notice that they are not served via https... ] Signed-off-by: Yann E. MORIN --- Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Config.in b/Config.in index 3c57c591a8..64604a0aed 100644 --- a/Config.in +++ b/Config.in @@ -287,14 +287,15 @@ config BR2_LUAROCKS_MIRROR config BR2_CPAN_MIRROR string "CPAN mirror (Perl packages)" - default "http://cpan.metacpan.org" + default "https://cpan.metacpan.org" help CPAN (Comprehensive Perl Archive Network) is a repository of Perl packages. It has multiple software mirrors scattered around the world. This option allows you to select a mirror. The list of mirrors is available at: - http://search.cpan.org/mirror + http://mirrors.cpan.org/ (tabular) + http://mirrors.cpan.org/map.html (clickable world map) endif From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:26 -0000 Subject: [Buildroot] [git commit branch/next] package/autoconf-archive: bump to version 2022.09.03 Message-ID: <20230220205205.61C6D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5a009920f0a79ecfcfa2778a61e4a49cdd4d6b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/autoconf-archive/autoconf-archive.hash | 2 +- package/autoconf-archive/autoconf-archive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/autoconf-archive/autoconf-archive.hash b/package/autoconf-archive/autoconf-archive.hash index 79ee5ff68a..ff7710dc2b 100644 --- a/package/autoconf-archive/autoconf-archive.hash +++ b/package/autoconf-archive/autoconf-archive.hash @@ -1,4 +1,4 @@ # Computed locally -sha256 e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd autoconf-archive-2021.02.19.tar.xz +sha256 e07454f00d8cae7907bed42d0747798927809947684d94c37207a4d63a32f423 autoconf-archive-2022.09.03.tar.xz sha256 e6037104443f9a7829b2aa7c5370d0789a7bda3ca65a0b904cdc0c2e285d9195 COPYING sha256 23ed0b84fa023bfa33433b498192cd08a3bfb1f4864a8ed791a84f3eb48b2dd2 COPYING.EXCEPTION diff --git a/package/autoconf-archive/autoconf-archive.mk b/package/autoconf-archive/autoconf-archive.mk index bd4a09d96d..0ffdf61ddf 100644 --- a/package/autoconf-archive/autoconf-archive.mk +++ b/package/autoconf-archive/autoconf-archive.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOCONF_ARCHIVE_VERSION = 2021.02.19 +AUTOCONF_ARCHIVE_VERSION = 2022.09.03 AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive AUTOCONF_ARCHIVE_LICENSE = GPL-3.0+ with exception From yann.morin.1998 at free.fr Mon Feb 20 20:55:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:27 -0000 Subject: [Buildroot] [git commit branch/next] package/skeleton-systemd: systemd-ify mounting /var tmpfs with ro rootfs Message-ID: <20230220205214.0340F86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8cbfbe487ac6fb00c037475ed8aaca3d89899769 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next To mount our /var tmpfs when the rootfs is mounted read-only (really, not remounted read-write), we use an entry in fstab. However, /etc could also be a tmpfs (for full state-less systems, or easy factory-reset, see [0]). It also prevents easily ordering other systemd units until after /var is mounted (not impossible, but less easy). So, we register /var as a systemd mount unit, so that we can also have the /var factory populated and functional even when /etc is empty. The var.mount unit is heavily modelled after systemd's own tmp.mount one, so we carry the same license for that file (in case that may apply). This has two side effects: - as hinted previously, it simplifies writing other systemd units to order them after /var is mounted - user can easily replace it with their own, which mounts an actual filesystem [0] http://0pointer.de/blog/projects/stateless.html Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Romain Naour Cc: Je??re??my Rosen [yann.morin.1998 at free.fr: - split original patch in two - this one only handles converting /var mounting into a systemd unit - adapt commit log accordingly ] Signed-off-by: Yann E. MORIN Reviewed-by: Norbert Lange [yann.morin.1998 at free.fr (as suggested by Norbert): - fix Before= dependencies - drop [Install] section ] Signed-off-by: Yann E. MORIN --- package/skeleton-init-systemd/skeleton-init-systemd.mk | 3 ++- package/skeleton-init-systemd/var.mount | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index ec908b4fac..ff8bc528c0 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -30,7 +30,6 @@ else # back there by the tmpfiles.d mechanism. define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab - echo "tmpfs /var tmpfs mode=1777 0 0" >>$(TARGET_DIR)/etc/fstab endef define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR @@ -52,6 +51,8 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR || exit 1; \ fi; \ done >$(TARGET_DIR)/usr/lib/tmpfiles.d/00-buildroot-var.conf + $(INSTALL) -D -m 0644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/var.mount \ + $(TARGET_DIR)/usr/lib/systemd/system/var.mount endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR diff --git a/package/skeleton-init-systemd/var.mount b/package/skeleton-init-systemd/var.mount new file mode 100644 index 0000000000..e97accef93 --- /dev/null +++ b/package/skeleton-init-systemd/var.mount @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# Modelled after systemd's tmp.mount + +[Unit] +Description=Buildroot /var tmpfs +DefaultDependencies=no +Conflicts=umount.target +Before=local-fs.target umount.target +After=swap.target + +[Mount] +What=tmpfs +Where=/var +Type=tmpfs +Options=mode=1777,strictatime,nosuid,nodev,size=50%%,nr_inodes=1m From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:28 -0000 Subject: [Buildroot] [git commit branch/next] package/freeradius-server: disable with libressl Message-ID: <20230220205205.8D029828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=953e2889734d1ccac609f997e0f3ebdeee20c41b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Building with libressl results in the following build failure since the addition of the package in commit 736c4c1655d93652a9a7e79235bbe726b3d46176: src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c: In function '_session_secret': src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c:228:47: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} 228 | eap_fast_session_ticket(tls_session, s->s3->client_random, s->s3->server_random, secret, secret_len); | ^~ Disable building with libressl following upstream feedback: https://github.com/FreeRADIUS/freeradius-server/pull/4689 Fixes: - http://autobuild.buildroot.org/results/c8df444f4c39f83e254dbb642a5852a1c956f7bb Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/freeradius-server/freeradius-server.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index ebd459341d..af3320eb44 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -178,7 +178,7 @@ else FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_postgresql endif -ifeq ($(BR2_PACKAGE_HAS_OPENSSL),y) +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) FREERADIUS_SERVER_DEPENDENCIES += openssl FREERADIUS_SERVER_CONF_OPTS += \ --with-openssl \ From peter at korsgaard.com Mon Feb 20 20:55:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:28 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: 5.{4, 10, 15}.x / 6.{0, 1}.x series Message-ID: <20230220205214.2A69C86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0245d30e569cc88875f7ed5b162029064128e89e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls 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 1bca082cbf..b5c65eded4 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 c7bbb6be99..8d85dc4c6f 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,10 +1,10 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb linux-6.1.tar.xz -sha256 08d3118d6b755769f166de6babed54964393a7c0928029bef11bf55559a72da4 linux-6.0.13.tar.xz +sha256 a3e61377cf4435a9e2966b409a37a1056f6aaa59e561add9125a88e3c0971dfb linux-6.1.1.tar.xz +sha256 d484eb3d4f88be14b42507a85ad4b0932e92e7a742acbce74e8be007124a6820 linux-6.0.15.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3 linux-5.15.83.tar.xz -sha256 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7 linux-5.10.159.tar.xz -sha256 5eefc5037415f31c942d3cfa430b96c2a273246cf7e51db1e51b1d89887f0593 linux-5.4.227.tar.xz +sha256 2c0bae29fac98e0a9408914a4551b2971365ac0000351cb255d6bd9aa0849808 linux-5.15.85.tar.xz +sha256 7aaaf6d0bcd8a2cfa14ad75f02ca62bb2de08aad3bee3eff198de49ea5254079 linux-5.10.161.tar.xz +sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 1f6de11306cc9f82fe1d4dd03565cdf43906fa6f77302913d942fd63b77b500c linux-4.9.336.tar.xz sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index cd36c7c763..60bbe5b768 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -399,11 +399,11 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.9.336" if BR2_KERNEL_HEADERS_4_9 default "4.14.302" if BR2_KERNEL_HEADERS_4_14 default "4.19.269" if BR2_KERNEL_HEADERS_4_19 - default "5.4.227" if BR2_KERNEL_HEADERS_5_4 - default "5.10.159" if BR2_KERNEL_HEADERS_5_10 - default "5.15.83" if BR2_KERNEL_HEADERS_5_15 - default "6.0.13" if BR2_KERNEL_HEADERS_6_0 - default "6.1" if BR2_KERNEL_HEADERS_6_1 + default "5.4.228" if BR2_KERNEL_HEADERS_5_4 + default "5.10.161" if BR2_KERNEL_HEADERS_5_10 + default "5.15.85" if BR2_KERNEL_HEADERS_5_15 + default "6.0.15" if BR2_KERNEL_HEADERS_6_0 + default "6.1.1" if BR2_KERNEL_HEADERS_6_1 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 thomas.petazzoni at bootlin.com Mon Feb 20 20:55:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:29 -0000 Subject: [Buildroot] [git commit branch/next] package/ncdu: bump to version 1.18 Message-ID: <20230220205205.6F5898648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94170d3ecbbf751adfc55c79d6e5619b0a1ce018 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For change log since 1.17, see: - https://dev.yorhel.nl/ncdu/changes This commit also adds md5 and sha1 hashes published on the web site. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/ncdu/ncdu.hash | 4 +++- package/ncdu/ncdu.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/ncdu/ncdu.hash b/package/ncdu/ncdu.hash index c47b4f9bac..1e31eaea8e 100644 --- a/package/ncdu/ncdu.hash +++ b/package/ncdu/ncdu.hash @@ -1,5 +1,7 @@ # From https://dev.yorhel.nl/ncdu -sha256 810745a8ed1ab3788c87d3aea4cc1a14edf6ee226f764bcc383e024ba56adbf1 ncdu-1.17.tar.gz +md5 4186b5be477cc3a0944619ade81f123b ncdu-1.18.tar.gz +sha1 d47ce3cdf317adadc1426817d07899c90b767aba ncdu-1.18.tar.gz +sha256 3c37a1a96580c9c5d2cc352dc3c5eef0d909158c05f1cc29db4712544c8b9f95 ncdu-1.18.tar.gz # computed locally sha256 4590cb935ff8a50cee76ce12c2cb0411c0b06e84c267b478579785dcf328660d COPYING diff --git a/package/ncdu/ncdu.mk b/package/ncdu/ncdu.mk index acfd496ec8..240ef9d8ea 100644 --- a/package/ncdu/ncdu.mk +++ b/package/ncdu/ncdu.mk @@ -4,7 +4,7 @@ # ################################################################################ -NCDU_VERSION = 1.17 +NCDU_VERSION = 1.18 NCDU_SITE = http://dev.yorhel.nl/download NCDU_DEPENDENCIES = ncurses From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:30 -0000 Subject: [Buildroot] [git commit branch/next] package/asterisk: security bump to version 16.29.1 Message-ID: <20230220205205.B83B0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c34e0b1cd5f7e10ce4fc19880e15ba608006ee76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: - CVE-2022-37325: A zero length Called or Calling Party Number can cause a buffer under-run and Asterisk crash. https://downloads.asterisk.org/pub/security/AST-2022-007.html - CVE-2022-42705: Use after free in res_pjsip_pubsub.c may allow a remote authenticated attacker to crash Asterisk (denial of service) by performing activity on a subscription via a reliable transport at the same time Asterisk is also performing activty on that subscription. https://downloads.asterisk.org/pub/security/AST-2022-008.html - CVE-2022-42706: AMI Users with ???config??? permissions may read files outside of Asterisk directory via GetConfig AMI Action even if ???live_dangerously" is set to "no" https://downloads.asterisk.org/pub/security/AST-2022-009.html Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 9792d82ac5..98ee3bdc71 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 6e9c2f350db018df854b1301687ced8993facb2787698336e55cd19e0ae3ebfe asterisk-16.28.0.tar.gz +sha256 9b93006a87be9c29492299118200e4f66c8369851c66a50fdef5b15dfc4eb2c2 asterisk-16.29.1.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index e0f28ae7ee..22ac0334fd 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.28.0 +ASTERISK_VERSION = 16.29.1 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) From peter at korsgaard.com Mon Feb 20 20:55:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:30 -0000 Subject: [Buildroot] [git commit branch/next] package/nasm: bump to version 2.16.01 Message-ID: <20230220205214.68C4286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=728518fa647f9fdac8bdc6935fe49cd8a5d99ce7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://nasm.us/doc/nasmdocc.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/nasm/nasm.hash | 2 +- package/nasm/nasm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nasm/nasm.hash b/package/nasm/nasm.hash index 86c67d6ba5..e9771c1d7f 100644 --- a/package/nasm/nasm.hash +++ b/package/nasm/nasm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f nasm-2.15.05.tar.xz +sha256 c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558 nasm-2.16.01.tar.xz sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 LICENSE diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk index ecb0889363..043a84cf07 100644 --- a/package/nasm/nasm.mk +++ b/package/nasm/nasm.mk @@ -4,7 +4,7 @@ # ################################################################################ -NASM_VERSION = 2.15.05 +NASM_VERSION = 2.16.01 NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz NASM_SITE = https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) NASM_LICENSE = BSD-2-Clause From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:30 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xserver_xorg-server: add upstream security fixes for CVE-2022-355{0, 1} Message-ID: <20230220205205.C63928648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66f3cc0b96baff46d3a136f9d8bf2a3b44037bdc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: - CVE-2022-3550: A vulnerability classified as critical was found in X.org Server. Affected by this vulnerability is the function _GetCountedString of the file xkb/xkb.c. The manipulation leads to buffer overflow. It is recommended to apply a patch to fix this issue. The associated identifier of this vulnerability is VDB-211051. - CVE-2022-3551: A vulnerability, which was classified as problematic, has been found in X.org Server. Affected by this issue is the function ProcXkbGetKbdByName of the file xkb/xkb.c. The manipulation leads to memory leak. It is recommended to apply a patch to fix this issue. The identifier of this vulnerability is VDB-211052. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...etCountedString-against-request-length-at.patch | 35 +++++++++++++ ...some-possible-memleaks-in-XkbGetKbdByName.patch | 60 ++++++++++++++++++++++ .../xserver_xorg-server/xserver_xorg-server.mk | 7 +++ 3 files changed, 102 insertions(+) diff --git a/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch b/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch new file mode 100644 index 0000000000..8c1869504c --- /dev/null +++ b/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch @@ -0,0 +1,35 @@ +From 11beef0b7f1ed290348e45618e5fa0d2bffcb72e Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 5 Jul 2022 12:06:20 +1000 +Subject: [PATCH] xkb: proof GetCountedString against request length attacks + +GetCountedString did a check for the whole string to be within the +request buffer but not for the initial 2 bytes that contain the length +field. A swapped client could send a malformed request to trigger a +swaps() on those bytes, writing into random memory. + +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + xkb/xkb.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index f42f59ef3..1841cff26 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -5137,6 +5137,11 @@ _GetCountedString(char **wire_inout, ClientPtr client, char **str) + CARD16 len; + + wire = *wire_inout; ++ ++ if (client->req_len < ++ bytes_to_int32(wire + 2 - (char *) client->requestBuffer)) ++ return BadValue; ++ + len = *(CARD16 *) wire; + if (client->swapped) { + swaps(&len); +-- +2.30.2 + diff --git a/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch b/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch new file mode 100644 index 0000000000..39afec0988 --- /dev/null +++ b/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch @@ -0,0 +1,60 @@ +From 18f91b950e22c2a342a4fbc55e9ddf7534a707d2 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Wed, 13 Jul 2022 11:23:09 +1000 +Subject: [PATCH] xkb: fix some possible memleaks in XkbGetKbdByName + +GetComponentByName returns an allocated string, so let's free that if we +fail somewhere. + +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + xkb/xkb.c | 26 ++++++++++++++++++++------ + 1 file changed, 20 insertions(+), 6 deletions(-) + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index 4692895db..b79a269e3 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -5935,18 +5935,32 @@ ProcXkbGetKbdByName(ClientPtr client) + xkb = dev->key->xkbInfo->desc; + status = Success; + str = (unsigned char *) &stuff[1]; +- if (GetComponentSpec(&str, TRUE, &status)) /* keymap, unsupported */ +- return BadMatch; ++ { ++ char *keymap = GetComponentSpec(&str, TRUE, &status); /* keymap, unsupported */ ++ if (keymap) { ++ free(keymap); ++ return BadMatch; ++ } ++ } + names.keycodes = GetComponentSpec(&str, TRUE, &status); + names.types = GetComponentSpec(&str, TRUE, &status); + names.compat = GetComponentSpec(&str, TRUE, &status); + names.symbols = GetComponentSpec(&str, TRUE, &status); + names.geometry = GetComponentSpec(&str, TRUE, &status); +- if (status != Success) ++ if (status == Success) { ++ len = str - ((unsigned char *) stuff); ++ if ((XkbPaddedSize(len) / 4) != stuff->length) ++ status = BadLength; ++ } ++ ++ if (status != Success) { ++ free(names.keycodes); ++ free(names.types); ++ free(names.compat); ++ free(names.symbols); ++ free(names.geometry); + return status; +- len = str - ((unsigned char *) stuff); +- if ((XkbPaddedSize(len) / 4) != stuff->length) +- return BadLength; ++ } + + CHK_MASK_LEGAL(0x01, stuff->want, XkbGBN_AllComponentsMask); + CHK_MASK_LEGAL(0x02, stuff->need, XkbGBN_AllComponentsMask); +-- +2.30.2 + diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 18ddd1cb07..8dba9f1ed0 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -11,6 +11,13 @@ XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES + +# 0002-xkb-proof-GetCountedString-against-request-length-at.patch +XSERVER_XORG_SERVER_IGNORE_CVES += CVE-2022-3550 + +# 0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch +XSERVER_XORG_SERVER_IGNORE_CVES += CVE-2022-3551 + XSERVER_XORG_SERVER_DEPENDENCIES = \ xutil_util-macros \ xlib_libX11 \ From peter at korsgaard.com Mon Feb 20 20:55:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:31 -0000 Subject: [Buildroot] [git commit branch/next] package/libraw: bump to version 0.21.0 Message-ID: <20230220205214.4EE4F86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d668cd0b2967346668423b564e4e149f14787def branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patch (already in version) - Drop autoreconf - Update hash of README.md (year updated with https://github.com/LibRaw/LibRaw/commit/4c954948ba2de262b9cb23a1843fb8651aa3dcc1 and licensing terms slightly reworded with https://github.com/LibRaw/LibRaw/commit/2a9a4de21ea7f5d15314da8ee5f27feebf239655) https://www.libraw.org/news/libraw-0-21-release Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-Add-Libs.private-to-libraw.pc.patch | 67 ---------------------- package/libraw/libraw.hash | 4 +- package/libraw/libraw.mk | 4 +- 3 files changed, 3 insertions(+), 72 deletions(-) diff --git a/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch b/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch deleted file mode 100644 index a90af23178..0000000000 --- a/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ad911cbc3c16397cf9d326c30571a4d1edaaa03f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 2 Jun 2021 07:45:40 +0200 -Subject: [PATCH] Add Libs.private to libraw.pc - -Add Libs.private to libraw.pc to avoid the following static build -failure when enabling libraw with jasper support in imagemagick: - -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libjasper.a(jpg_enc.c.o): in function `jpg_encode': -jpg_enc.c:(.text+0x1f4): undefined reference to `jpeg_stdio_dest' - --ljpeg must be added after -ljasper because jasper depends on jpeg - -Fixes: - - http://autobuild.buildroot.org/results/88e43a1ea2059a684e50b0f5f2af407e8c6df2e1 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/LibRaw/LibRaw/pull/406] ---- - configure.ac | 2 ++ - libraw.pc.in | 1 + - libraw_r.pc.in | 1 + - 3 files changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 4ab2f313..7bf5fdfd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,6 +57,7 @@ if test x$jpeg = xtrue; then - AC_CHECK_HEADERS([jpeglib.h], [ - CPPFLAGS="$CPPFLAGS -DUSE_JPEG -DUSE_JPEG8" - LIBS="$LIBS -ljpeg" -+ AC_SUBST([PACKAGE_LIBS_PRIVATE],"-ljpeg $PACKAGE_LIBS_PRIVATE") - ], AC_MSG_WARN([no jpeg headers found])) - ], - AC_MSG_WARN([libjpeg not found]) -@@ -78,6 +79,7 @@ if test x$jasper = xtrue; then - AC_CHECK_HEADERS([jasper/jasper.h], [ - CPPFLAGS="$CPPFLAGS -DUSE_JASPER" - LIBS="$LIBS -ljasper" -+ AC_SUBST([PACKAGE_LIBS_PRIVATE],"-ljasper $PACKAGE_LIBS_PRIVATE") - ], AC_MSG_WARN([no jasper headers found])) - ], - AC_MSG_WARN([libjasper not found]) -diff --git a/libraw.pc.in b/libraw.pc.in -index 1bab18b8..c95fbc48 100644 ---- a/libraw.pc.in -+++ b/libraw.pc.in -@@ -8,4 +8,5 @@ Description: Raw image decoder library (non-thread-safe) - Requires: @PACKAGE_REQUIRES@ - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lraw -lstdc++ at PC_OPENMP@ -+Libs.private: @PACKAGE_LIBS_PRIVATE@ - Cflags: -I${includedir}/libraw -I${includedir} -diff --git a/libraw_r.pc.in b/libraw_r.pc.in -index e8427271..92bbbffa 100644 ---- a/libraw_r.pc.in -+++ b/libraw_r.pc.in -@@ -8,4 +8,5 @@ Description: Raw image decoder library (thread-safe) - Requires: @PACKAGE_REQUIRES@ - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lraw_r -lstdc++ at PC_OPENMP@ -+Libs.private: @PACKAGE_LIBS_PRIVATE@ - Cflags: -I${includedir}/libraw -I${includedir} --- -2.30.2 - diff --git a/package/libraw/libraw.hash b/package/libraw/libraw.hash index f2a01c277b..3076810cca 100644 --- a/package/libraw/libraw.hash +++ b/package/libraw/libraw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6 LibRaw-0.20.2.tar.gz +sha256 8747b34e8534cc2dd7ef8c92c436414b3578904fd4bf9b87ea60f17aa99fb0bd LibRaw-0.21.0.tar.gz sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL -sha256 313415f7f48f6cd3cc78856626aab4bbe97dbb1e9a11db9c25396ca8d0e76cd9 README.md +sha256 7d6650cef6cf892abe95e55a6bda1e1c42f221fd411b807deb2fc0b805b868d4 README.md diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index fc02c7915f..176acf6a44 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRAW_VERSION = 0.20.2 +LIBRAW_VERSION = 0.21.0 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data LIBRAW_INSTALL_STAGING = YES @@ -15,8 +15,6 @@ LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0 LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL README.md LIBRAW_CPE_ID_VENDOR = libraw LIBRAW_DEPENDENCIES = host-pkgconf -# https://github.com/LibRaw/LibRaw/issues/353 -LIBRAW_AUTORECONF = YES LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS) LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)" From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:31 -0000 Subject: [Buildroot] [git commit branch/next] package/lttng-tools: bump to version 2.13.8 Message-ID: <20230220205205.E0877828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d94e7a6214c3bbf9add65e7ab29b530d2d57b70 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This bump will fix the following build failure without NPTL thanks to https://github.com/lttng/lttng-tools/commit/27f2b8400c9db484cd195c4240c379e845b1413d which is raised since bump to version 2.13.2 in commit 8e5f2d0f8e8c04e98f8761f3cba683c56bbefc8c and https://github.com/lttng/lttng-tools/commit/014d7d3b5e9d69989bf776cffb6c21ff7e1d36ff: In file included from thread.c:10: ../../src/common/compat/pthread.h: In function 'lttng_pthread_setname_np': ../../src/common/compat/pthread.h:63:27: error: 'LTTNG_UST_ABI_PROCNAME_LEN' undeclared (first use in this function) 63 | if (strnlen(name, LTTNG_UST_ABI_PROCNAME_LEN) >= LTTNG_UST_ABI_PROCNAME_LEN) { | ^~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/lttng/lttng-tools/blob/v2.13.8/ChangeLog Fixes: - http://autobuild.buildroot.org/results/bbc8d6621822bb5da7513331e69799ca25a03f66 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lttng-tools/lttng-tools.hash | 4 ++-- package/lttng-tools/lttng-tools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lttng-tools/lttng-tools.hash b/package/lttng-tools/lttng-tools.hash index 5b5f55da30..b48904d0b9 100644 --- a/package/lttng-tools/lttng-tools.hash +++ b/package/lttng-tools/lttng-tools.hash @@ -1,5 +1,5 @@ -# From https://lttng.org/files/lttng-tools/lttng-tools-2.13.2.tar.bz2.sha256 -sha256 ced2ba00020da77fd17ac92b5a53825502409a07e3aeca28f9515d4a844fd7bd lttng-tools-2.13.2.tar.bz2 +# From https://lttng.org/files/lttng-tools/lttng-tools-2.13.8.tar.bz2.sha256 +sha256 b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1 lttng-tools-2.13.8.tar.bz2 # Locally computed sha256 068e55c7dbe597400199aee75ac5e71bdb2ca88c4c9a4cfa8e1fbc61f933eda5 LICENSE diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index efa22a52e3..add1f12a8c 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.13.2 +LTTNG_TOOLS_VERSION = 2.13.8 LTTNG_TOOLS_SITE = https://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:55:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:32 -0000 Subject: [Buildroot] [git commit branch/next] package/skeleton-systemd: move var factory comment closer to code Message-ID: <20230220205214.7559186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e02fdfe26b2ad36166379c444e017f832946f30d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 8cbfbe487ac6 (package/skeleton-systemd: systemd-ify mounting /var tmpfs with ro rootfs) removed the fstab handling of /var, and left the macro deal solely about keeping / read-only. However, the code about how the var factory is handled was left above the macro, which is now misleading and confusing. Move the comment closer to the actual rootfs-pre-cmd hook which actually deals with handling the var factory. Signed-off-by: Yann E. MORIN --- package/skeleton-init-systemd/skeleton-init-systemd.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 30783dfd26..fb15552f99 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -23,15 +23,15 @@ endef else +define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW + echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab +endef + # On a R/O rootfs, /var is a tmpfs filesystem. So, at build time, we # redirect /var to the "factory settings" location. Just before the # filesystem gets created, the /var symlink will be replaced with # a real (but empty) directory, and the "factory files" will be copied # back there by the tmpfiles.d mechanism. -define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW - echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab -endef - ifeq ($(BR2_INIT_SYSTEMD_VAR_FACTORY),y) define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR rm -rf $(TARGET_DIR)/usr/share/factory/var From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:32 -0000 Subject: [Buildroot] [git commit branch/next] package/neon: bump to version 0.32.4 Message-ID: <20230220205205.9B9E38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f39ac8336e9cd933de50970a657e32a8d9601c67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/notroj/neon/blob/0.32.4/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/neon/neon.hash | 2 +- package/neon/neon.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/neon/neon.hash b/package/neon/neon.hash index 5a5a77a58b..9bd6195e39 100644 --- a/package/neon/neon.hash +++ b/package/neon/neon.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 986566468c6295fc5d0fb141a5981e31c9f82ee38e938374abed8471ef2fb286 neon-0.32.2.tar.gz +sha256 b1e2120e4ae07df952c4a858731619733115c5f438965de4fab41d6bf7e7a508 neon-0.32.4.tar.gz # Hash for license files sha256 ce2421ee38d6c0e02c85ac076478a0f92da6ef92b92b7a174877cabf01b2e531 README.md sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB diff --git a/package/neon/neon.mk b/package/neon/neon.mk index eae6bfbad6..1ce8f1ff16 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEON_VERSION = 0.32.2 +NEON_VERSION = 0.32.4 NEON_SITE = https://notroj.github.io/neon NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md From peter at korsgaard.com Mon Feb 20 20:55:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:33 -0000 Subject: [Buildroot] [git commit branch/next] package/lualogging: bump to version 1.8.0 Message-ID: <20230220205214.8EB3886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1381a4d2884cd7abdda45253b871cddd995a3e4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/lualogging/lualogging.hash | 2 +- package/lualogging/lualogging.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lualogging/lualogging.hash b/package/lualogging/lualogging.hash index a9eadab4d1..5ed012ea5c 100644 --- a/package/lualogging/lualogging.hash +++ b/package/lualogging/lualogging.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 d4a8791e9b24840c4a4c0366399f55b6deb060fc3947f3a9aae9ced0334160c1 lualogging-1.7.0-1.src.rock +sha256 285edf8abc9844cb37da94888ca01cb26a2ba08411ea13a3ee0f4d029ca512dd lualogging-1.8.0-1.src.rock sha256 d900082cb26f8cf4a491ca51c00241f2c2e9cd9ae3531c62234017a360706adb lualogging/COPYRIGHT diff --git a/package/lualogging/lualogging.mk b/package/lualogging/lualogging.mk index 78197f6be6..96c09c5a49 100644 --- a/package/lualogging/lualogging.mk +++ b/package/lualogging/lualogging.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUALOGGING_VERSION = 1.7.0-1 +LUALOGGING_VERSION = 1.8.0-1 LUALOGGING_SUBDIR = lualogging LUALOGGING_LICENSE = MIT LUALOGGING_LICENSE_FILES = $(LUALOGGING_SUBDIR)/COPYRIGHT From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:33 -0000 Subject: [Buildroot] [git commit branch/next] package/dehydrated: bump to version 0.7.1 Message-ID: <20230220205205.ED5498648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef13132fd390cc25643e78afc692640c86d7aaf2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update hash of LICENSE (update in year: https://github.com/dehydrated-io/dehydrated/commit/dd0bbd2405ecea4820ad2442120d8dc4a37137b6) https://github.com/dehydrated-io/dehydrated/releases/tag/v0.7.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dehydrated/dehydrated.hash | 6 +++--- package/dehydrated/dehydrated.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dehydrated/dehydrated.hash b/package/dehydrated/dehydrated.hash index 0452645256..711e5a6cea 100644 --- a/package/dehydrated/dehydrated.hash +++ b/package/dehydrated/dehydrated.hash @@ -1,6 +1,6 @@ # Locally computed after verifying -# https://github.com/dehydrated-io/dehydrated/releases/download/v0.7.0/dehydrated-0.7.0.tar.gz.asc +# https://github.com/dehydrated-io/dehydrated/releases/download/v0.7.1/dehydrated-0.7.1.tar.gz.asc # with key 3C2F2605E078A1E18F4793909C4DBE6CF438F333 from https://keybase.io/lukas2511 -sha256 1c5f12c2e57e64b1762803f82f0f7e767a72e65a6ce68e4d1ec197e61b9dc4f9 dehydrated-0.7.0.tar.gz +sha256 4d28a0598230b276b316070ce16be7d9ab984f3bdef482acf0bc24fcdcc0d0b0 dehydrated-0.7.1.tar.gz # License, locally computed -sha256 b4583b7dd07e3e2a08906de38e7e329d41f921ed9dcb6310b3886e013a6b8723 LICENSE +sha256 f25ab9c5f13abf15ab097180423ef6b82a89c552e92d49ae627762ee9c04a3a8 LICENSE diff --git a/package/dehydrated/dehydrated.mk b/package/dehydrated/dehydrated.mk index 28fb5a4912..f8909d8abe 100644 --- a/package/dehydrated/dehydrated.mk +++ b/package/dehydrated/dehydrated.mk @@ -4,7 +4,7 @@ # ################################################################################ -DEHYDRATED_VERSION = 0.7.0 +DEHYDRATED_VERSION = 0.7.1 DEHYDRATED_SITE = https://github.com/dehydrated-io/dehydrated/releases/download/v$(DEHYDRATED_VERSION) DEHYDRATED_LICENSE = MIT From peter at korsgaard.com Mon Feb 20 20:55:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:34 -0000 Subject: [Buildroot] [git commit branch/next] package/dovecot-pigeonhole: bump version to 0.5.20 Message-ID: <20230220205214.B5FA286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b30eb2f763ac98b4c44d38097bc6da8d9a9a550b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://dovecot.org/pipermail/dovecot-news/2022-December/000480.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index 635e221481..5c7ba322b2 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 10b923efcc6f3c4d92ecdbb780e12a5c33e6d0fdbe3aba5fcd3ecde4179c730c dovecot-2.3-pigeonhole-0.5.19.tar.gz +sha256 ae32bd4870ea2c1328ae09ba206e9ec12128046d6afca52fbbc9ef7f75617c98 dovecot-2.3-pigeonhole-0.5.20.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index c25cd60b21..0b64cb0d6f 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.19 +DOVECOT_PIGEONHOLE_VERSION = 0.5.20 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:34 -0000 Subject: [Buildroot] [git commit branch/next] package/ipset: bump to version 7.16 Message-ID: <20230220205206.22DAF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84463af7c42bc0d81ea0e03de911f5b1b4ef57c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://ipset.netfilter.org/changelog.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipset/ipset.hash | 4 ++-- package/ipset/ipset.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ipset/ipset.hash b/package/ipset/ipset.hash index 9c251be27e..fb9b8c40d2 100644 --- a/package/ipset/ipset.hash +++ b/package/ipset/ipset.hash @@ -1,4 +1,4 @@ -# From https://ipset.netfilter.org/ipset-7.15.tar.bz2.sha512sum.txt -sha512 0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a ipset-7.15.tar.bz2 +# From https://ipset.netfilter.org/ipset-7.16.tar.bz2.sha512sum.txt +sha512 e69ddee956f0922c8e08e7e5d358d6b5b24178a9f08151b20957cc3465baaba9ecd6aa938ae157f2cd286ccd7f0b7a279cfd89cec2393a00b43e4d945c275307 ipset-7.16.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk index 4eda65e81b..9832d8fd30 100644 --- a/package/ipset/ipset.mk +++ b/package/ipset/ipset.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPSET_VERSION = 7.15 +IPSET_VERSION = 7.16 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf From peter at korsgaard.com Mon Feb 20 20:55:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:35 -0000 Subject: [Buildroot] [git commit branch/next] package/libdeflate: fix static build Message-ID: <20230220205214.DAA1586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08049e9f522c0fee6ff05b7358b1f1689f4e53c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static build failure raised since bump to version 1.15 in commit c31087182fa545784d9a0a01f0b32715d78c3955: [ 79%] Linking C shared library libdeflate.so /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/12.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/12.2.0/crtbeginT.o: relocation R_ARC_32_ME against `__TMC_END__' can not be used when making a shared object; recompile with -fPIC Fixes: - http://autobuild.buildroot.org/results/25489e5c6f0da642136e099ab35b091624f53a2b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libdeflate/libdeflate.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk index 2305af4dc9..67e97c6e5e 100644 --- a/package/libdeflate/libdeflate.mk +++ b/package/libdeflate/libdeflate.mk @@ -12,4 +12,18 @@ LIBDEFLATE_INSTALL_STAGING = YES LIBDEFLATE_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -D_DEFAULT_SOURCE" +ifeq ($(BR2_SHARED_LIBS),y) +LIBDEFLATE_CONF_OPTS += \ + -DLIBDEFLATE_BUILD_SHARED_LIB=ON \ + -DLIBDEFLATE_BUILD_STATIC_LIB=OFF +else ifeq ($(BR2_STATIC_LIBS),y) +LIBDEFLATE_CONF_OPTS += \ + -DLIBDEFLATE_BUILD_SHARED_LIB=OFF \ + -DLIBDEFLATE_BUILD_STATIC_LIB=ON +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +LIBDEFLATE_CONF_OPTS += \ + -DLIBDEFLATE_BUILD_SHARED_LIB=ON \ + -DLIBDEFLATE_BUILD_STATIC_LIB=ON +endif + $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:35 -0000 Subject: [Buildroot] [git commit branch/next] package/psmisc: bump to version 23.5 Message-ID: <20230220205206.304C78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3324161873274b90b0c89e2a5ebb74e915bd6e86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://gitlab.com/psmisc/psmisc/-/blob/v23.5/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/psmisc/psmisc.hash | 6 +++--- package/psmisc/psmisc.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/psmisc/psmisc.hash b/package/psmisc/psmisc.hash index 47e44f6921..fe146f90c9 100644 --- a/package/psmisc/psmisc.hash +++ b/package/psmisc/psmisc.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/psmisc/files/psmisc/ -md5 8114cd4489b95308efe2509c3a406bbf psmisc-23.4.tar.xz -sha1 a4c34111e570c43967efb2bbd8a4f31d94d22e0f psmisc-23.4.tar.xz +md5 014f0b5d5ab32478a2c57812ad01e1fb psmisc-23.5.tar.xz +sha1 a16073f459a19288c1ea2b413a84e1b996cab595 psmisc-23.5.tar.xz # Locally computed: -sha256 7f0cceeace2050c525f3ebb35f3ba01d618b8d690620580bdb8cd8269a0c1679 psmisc-23.4.tar.xz +sha256 dc37ecc2f7e4a90a94956accc6e1c77adb71316b7c9cbd39b26738db0c3ae58b psmisc-23.5.tar.xz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index 8b92be11e8..3229184459 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -4,7 +4,7 @@ # ################################################################################ -PSMISC_VERSION = 23.4 +PSMISC_VERSION = 23.5 PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc PSMISC_SOURCE = psmisc-$(PSMISC_VERSION).tar.xz PSMISC_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:36 -0000 Subject: [Buildroot] [git commit branch/next] package/containerd: security bump to version 1.6.12 Message-ID: <20230220205206.3F223828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4634a22cf70ec957ceabbb0dcd9611c824bc7a60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next CVE-2022-23471: https://github.com/advisories/GHSA-2qjp-425j-52j9 and other bugfixes, see: https://github.com/containerd/containerd/releases/tag/v1.6.12 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 285519441a..04a29949d7 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 f5f938513c28377f64f85e84f2750d39f26b01262f3a062b7e8ce35b560ca407 containerd-1.6.8.tar.gz +sha256 b86e5c42f58b8348422c972513ff49783c0d505ed84e498d0d0245c5992e4320 containerd-1.6.12.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 89bbbf5c03..192175800c 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.8 +CONTAINERD_VERSION = 1.6.12 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:55:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:36 -0000 Subject: [Buildroot] [git commit branch/next] package/bird: bump to version 2.0.11 Message-ID: <20230220205215.00CF286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8024bae870b7ebd9707614343c5dfdc849ea8fdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://bird.network.cz/pipermail/bird-users/2022-December/016431.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/bird/bird.hash | 2 +- package/bird/bird.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bird/bird.hash b/package/bird/bird.hash index 6ccacd8d58..3e00a1993d 100644 --- a/package/bird/bird.hash +++ b/package/bird/bird.hash @@ -1,2 +1,2 @@ -sha256 7ed341ddd8dc87fa9736586b3515447a8436fec442d65f4022155ab9de1ffd5a bird-2.0.10.tar.gz +sha256 60a7b83b67b9d089d2a745a11fddd12461f631abc7b645b6c085adf90b3f55d6 bird-2.0.11.tar.gz sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README diff --git a/package/bird/bird.mk b/package/bird/bird.mk index e1e392168c..1295358fb9 100644 --- a/package/bird/bird.mk +++ b/package/bird/bird.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIRD_VERSION = 2.0.10 +BIRD_VERSION = 2.0.11 BIRD_SITE = https://bird.network.cz/download BIRD_LICENSE = GPL-2.0+ BIRD_LICENSE_FILES = README From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:55:31 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/libmodsecurity: needs dynamic library with libcurl, libssh2 and mbedtls In-Reply-To: <20230219172440.519540-1-fontaine.fabrice@gmail.com> References: <20230219172440.519540-1-fontaine.fabrice@gmail.com> Message-ID: <20230220215531.7b3a1783@windsurf> Hello Fabrice, On Sun, 19 Feb 2023 18:24:40 +0100 Fabrice Fontaine wrote: > Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as > mbedtls can be pulled in libcurl through libssh2 resulting in the > following build failure: > > /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init': > md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here > > Fixes: > - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a > > Signed-off-by: Fabrice Fontaine > --- > Changes v2 -> v3: > - Fix syntax > Changes v1 -> v2: > - Update nginx-modsecurity Isn't that a bit madness? If libmodsecurity has its copy of parts of mbedtls, but didn't take care of renaming the symbols, then ultimately what we should conclude is that using libmodsecurity in a statically linked configuration is not supported. So I would advocate for simplifying the whole thing and just make libmodsecurity and its reverse dependencies depends on !BR2_STATIC_LIBS and be done with it. What do you think? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:37 -0000 Subject: [Buildroot] [git commit branch/next] package/docker-engine: security bump to version 20.10.21 Message-ID: <20230220205206.5B6088648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=309bc5d2d4b0f3ca133b40e36ee949411b3d532d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Partial mitigations for CVE-2022-39253 Git vulnerability and other fixes: https://github.com/moby/moby/releases/tag/v20.10.21 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index dfd4f4e365..10e9727a08 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 228caadac1b37a5ba310eb25418cf1fdd8878336f1d8faf0a2daa87fcc577577 docker-engine-20.10.19.tar.gz +sha256 61f4c3a2d0426e1bbbda1b0e5dd33ec203776f7d99d1a61522c77c04c4ed09fe docker-engine-20.10.21.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index dc45baf055..36c66485ba 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.19 +DOCKER_ENGINE_VERSION = 20.10.21 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From peter at korsgaard.com Mon Feb 20 20:55:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:37 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl_433: drop dynamic library dependency Message-ID: <20230220205215.1BF5586494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7967755fbf25fe4d5860884bedb3e01fcd7e9855 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next rtl_433 can be built statically since its addition in commit 4634e84978a3e64e9050021d209a41cd88a1ad16 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/rtl_433/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/rtl_433/Config.in b/package/rtl_433/Config.in index 5664227c82..a6db00f477 100644 --- a/package/rtl_433/Config.in +++ b/package/rtl_433/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_RTL_433 bool "rtl_433" depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK if BR2_PACKAGE_LIBOPENSSL help @@ -11,6 +10,6 @@ config BR2_PACKAGE_RTL_433 https://github.com/merbanan/rtl_433 -comment "rtl_433 needs a toolchain w/ dynamic library, threads" +comment "rtl_433 needs a toolchain w/ threads" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:38 -0000 Subject: [Buildroot] [git commit branch/next] package/utf8proc: bump to version 2.8.0 Message-ID: <20230220205206.881FD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3046605251d1f946c610faaa5f337d0b3ee7406a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/JuliaStrings/utf8proc/blob/v2.8.0/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/utf8proc/utf8proc.hash | 2 +- package/utf8proc/utf8proc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/utf8proc/utf8proc.hash b/package/utf8proc/utf8proc.hash index acc73903c8..658ffa1f7c 100644 --- a/package/utf8proc/utf8proc.hash +++ b/package/utf8proc/utf8proc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4bb121e297293c0fd55f08f83afab6d35d48f0af4ecc07523ad8ec99aa2b12a1 utf8proc-2.7.0.tar.gz +sha256 a0a60a79fe6f6d54e7d411facbfcc867a6e198608f2cd992490e46f04b1bcecc utf8proc-2.8.0.tar.gz sha256 3b510150d34f248a221bb88e1d811238d6c6c18b51231822c42974c39bb07256 LICENSE.md diff --git a/package/utf8proc/utf8proc.mk b/package/utf8proc/utf8proc.mk index 707e553561..b08c6e7109 100644 --- a/package/utf8proc/utf8proc.mk +++ b/package/utf8proc/utf8proc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UTF8PROC_VERSION = 2.7.0 +UTF8PROC_VERSION = 2.8.0 UTF8PROC_SITE = $(call github,JuliaStrings,utf8proc,v$(UTF8PROC_VERSION)) UTF8PROC_LICENSE = MIT UTF8PROC_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Feb 20 20:55:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:38 -0000 Subject: [Buildroot] [git commit branch/next] package/qemu: fix indentation for host-qemu sub-options in menuconfig Message-ID: <20230220205215.339BA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=037226b33b42fb22234694fe1fcb0b6db624161f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 255acdc14365 (package/qemu: needs gcc >= 8) added a comment that explains that host-qemu would not be available for gcc < 4.8. However, it interspersed that comment between the main symbol and the conditional block with the sub-options. This breaks the indentation of the sub-options in menuconfig, where they appear at the same level as the main symbol, rather than indented below it. Fix that by moving the comment before the main symbol. Signed-off-by: Yann E. MORIN --- package/qemu/Config.in.host | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index f9cdb9b703..8dd0c7d11b 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -34,6 +34,11 @@ config BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS bool default y if BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS +comment "host-qemu needs a host gcc >= 8" + depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || \ + BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORT + depends on !BR2_HOST_GCC_AT_LEAST_8 + config BR2_PACKAGE_HOST_QEMU bool "host qemu" depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS @@ -50,11 +55,6 @@ config BR2_PACKAGE_HOST_QEMU http://www.qemu.org -comment "host-qemu needs a host gcc >= 8" - depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || \ - BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORT - depends on !BR2_HOST_GCC_AT_LEAST_8 - if BR2_PACKAGE_HOST_QEMU comment "Emulators selection" From yann.morin.1998 at free.fr Mon Feb 20 20:55:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:39 -0000 Subject: [Buildroot] [git commit branch/next] package/ncurses: fix legal info Message-ID: <20230220205215.5588786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b0ac1d62bb2b998cba17699216e9fed7caeb976 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit a38a30eb3a46570705642dc37235ddcc1471b434 forgot to update hash of COPYING (update in year) Fixes: - http://autobuild.buildroot.org/results/18ed032d1b7e0492ed90f09873cd260997c1deae Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ncurses/ncurses.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index 1029c1ddcb..c72a2abf46 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -62,4 +62,4 @@ sha256 32dc21b671ead8b199d66111ebd3404e8cd5f8c4ca5587cfeb5c6a4913b2d103 ncurse sha256 8fe3bcacaea784ac7971e102a8eb8ca58c4c2c4c13c1ec33f32334600b9e4f56 ncurses-6.3-20221203.patch.gz # Locally computed -sha256 4d1fde61868c73776a539366dccf5d5a4857e7fd7299efb1f02e07c2afe9ea87 COPYING +sha256 63de87399e9fc8860236082b6b0520e068e9eb1fad0ebd30202aa30bb6f690ac COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:39 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: indent with tabs Message-ID: <20230220205206.A2A7E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65e0351adc5075ac679557d7e41a02815f979e90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit eb2f2886b2364e5b6a0867f55106bf83acb064e7 ("package/swupdate: add staging install") has introduced some commands indented with spaces, which check-package doesn't like. Fix that by using tabs instead, and while we're at it, wrap the line that is a bit too long. Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 54ae03f238..1cd60d1b8f 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -230,8 +230,9 @@ define SWUPDATE_BUILD_CMDS endef define SWUPDATE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ - $(SWUPDATE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) INCLUDEDIR=/usr/include/swupdate install + $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ + $(SWUPDATE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) \ + INCLUDEDIR=/usr/include/swupdate install endef define SWUPDATE_INSTALL_TARGET_CMDS From yann.morin.1998 at free.fr Mon Feb 20 20:55:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:40 -0000 Subject: [Buildroot] [git commit branch/next] package/libdeflate: fix aarch64 build Message-ID: <20230220205215.78DB286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dc7e1fc363b217683f009f6470519b751675083 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following aarch64 build failure raised since the addition of the package in commit 4231e7b10b87de71e33bb9906eede3751bed5dfe: In file included from /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h:256, from /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/crc32.c:227: /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h: In function 'clmul_u32': /home/autobuild/autobuild/instance-22/output-1/host/lib/gcc/aarch64-buildroot-linux-gnu/10.4.0/include/arm_neon.h:26723:1: error: inlining failed in call to 'always_inline' 'vmull_p64': target specific option mismatch 26723 | vmull_p64 (poly64_t __a, poly64_t __b) | ^~~~~~~~~ In file included from /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/crc32.c:227: /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h:262:19: note: called from here 262 | uint64x2_t res = vreinterpretq_u64_p128( | ^~~~~~~~~~~~~~~~~~~~~~~ 263 | compat_vmull_p64((poly64_t)a, (poly64_t)b)); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/9aee8dafea614db77209818b913a571534466506 - http://autobuild.buildroot.org/results/951d5a1a2959a0cc65ca7e52967ec07bc1cc00f1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...rypto-target-when-required-due-to-gcc-bug.patch | 90 ++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch b/package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch new file mode 100644 index 0000000000..8823ec4b39 --- /dev/null +++ b/package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch @@ -0,0 +1,90 @@ +From f8f022e5bc574088ae80327ea5f88a8fe09b48c8 Mon Sep 17 00:00:00 2001 +From: Eric Biggers +Date: Sun, 25 Dec 2022 15:05:52 -0800 +Subject: [PATCH] lib/arm/crc32: use crypto target when required due to gcc bug + +Fixes https://github.com/ebiggers/libdeflate/issues/280 +Fixes: 6db64ab7afd2 ("lib/crc32: CRC-32 optimizations and other improvements") +[Retrieved from: +https://github.com/ebiggers/libdeflate/commit/f8f022e5bc574088ae80327ea5f88a8fe09b48c8] +Signed-off-by: Fabrice Fontaine +--- + lib/arm/cpu_features.h | 23 +++++++++++++++++++++++ + lib/arm/crc32_impl.h | 9 +++++---- + 2 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/lib/arm/cpu_features.h b/lib/arm/cpu_features.h +index 204c0cd5..4092eba8 100644 +--- a/lib/arm/cpu_features.h ++++ b/lib/arm/cpu_features.h +@@ -116,6 +116,29 @@ static inline u32 get_arm_cpu_features(void) { return 0; } + #else + # define HAVE_PMULL_INTRIN 0 + #endif ++/* ++ * Set USE_PMULL_TARGET_EVEN_IF_NATIVE if a workaround for a gcc bug that was ++ * fixed by commit 11a113d501ff ("aarch64: Simplify feature definitions") in gcc ++ * 13 is needed. A minimal program that fails to build due to this bug when ++ * compiled with -mcpu=emag, at least with gcc 10 through 12, is: ++ * ++ * static inline __attribute__((always_inline,target("+crypto"))) void f() {} ++ * void g() { f(); } ++ * ++ * The error is: ++ * ++ * error: inlining failed in call to ???always_inline??? ???f???: target specific option mismatch ++ * ++ * The workaround is to explicitly add the crypto target to the non-inline ++ * function g(), even though this should not be required due to -mcpu=emag ++ * enabling 'crypto' natively and causing __ARM_FEATURE_CRYPTO to be defined. ++ */ ++#if HAVE_PMULL_NATIVE && defined(ARCH_ARM64) && \ ++ GCC_PREREQ(6, 1) && !GCC_PREREQ(13, 1) ++# define USE_PMULL_TARGET_EVEN_IF_NATIVE 1 ++#else ++# define USE_PMULL_TARGET_EVEN_IF_NATIVE 0 ++#endif + + /* CRC32 */ + #ifdef __ARM_FEATURE_CRC32 +diff --git a/lib/arm/crc32_impl.h b/lib/arm/crc32_impl.h +index e426a63d..b9300e4b 100644 +--- a/lib/arm/crc32_impl.h ++++ b/lib/arm/crc32_impl.h +@@ -236,7 +236,7 @@ crc32_arm_crc(u32 crc, const u8 *p, size_t len) + * for implementations that use pmull for folding the data itself. + */ + #if HAVE_CRC32_INTRIN && HAVE_PMULL_INTRIN +-# if HAVE_CRC32_NATIVE && HAVE_PMULL_NATIVE ++# if HAVE_CRC32_NATIVE && HAVE_PMULL_NATIVE && !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef ARCH_ARM32 +@@ -438,7 +438,7 @@ crc32_arm_crc_pmullcombine(u32 crc, const u8 *p, size_t len) + #if HAVE_PMULL_INTRIN + # define crc32_arm_pmullx4 crc32_arm_pmullx4 + # define SUFFIX _pmullx4 +-# if HAVE_PMULL_NATIVE ++# if HAVE_PMULL_NATIVE && !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef ARCH_ARM32 +@@ -558,7 +558,7 @@ crc32_arm_pmullx4(u32 crc, const u8 *p, size_t len) + #if defined(ARCH_ARM64) && HAVE_PMULL_INTRIN && HAVE_CRC32_INTRIN + # define crc32_arm_pmullx12_crc crc32_arm_pmullx12_crc + # define SUFFIX _pmullx12_crc +-# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE ++# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE && !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef __clang__ +@@ -584,7 +584,8 @@ crc32_arm_pmullx4(u32 crc, const u8 *p, size_t len) + (HAVE_SHA3_TARGET || HAVE_SHA3_NATIVE) + # define crc32_arm_pmullx12_crc_eor3 crc32_arm_pmullx12_crc_eor3 + # define SUFFIX _pmullx12_crc_eor3 +-# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE && HAVE_SHA3_NATIVE ++# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE && HAVE_SHA3_NATIVE && \ ++ !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef __clang__ From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:40 -0000 Subject: [Buildroot] [git commit branch/next] package/batman-adv: bump to version 2022.3 Message-ID: <20230220205206.780E4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=155d3ac6e52aa3ecec83780bb72561d6cb6b9626 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bug fixes and code cleanups. https://www.open-mesh.org/news/110 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/batman-adv/batman-adv.hash | 2 +- package/batman-adv/batman-adv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/batman-adv/batman-adv.hash b/package/batman-adv/batman-adv.hash index c5add4cdea..14a92c231a 100644 --- a/package/batman-adv/batman-adv.hash +++ b/package/batman-adv/batman-adv.hash @@ -2,6 +2,6 @@ sha1 e1829e10fc37ea674a20cb9ba1d6c1483042fbfa batman-adv-2022.2.tar.gz # Hash for license files -sha256 8aca27c6f168b137a7ed7031d58169396c1a97f958c2ea95b9c30a9b92576fe0 batman-adv-2022.2.tar.gz +sha256 218ffb534fead1c9b5b0d90ec1b2fba688209cdf00e861bece1cbf469fe69953 batman-adv-2022.3.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk index d279694bf5..75b8292ee1 100644 --- a/package/batman-adv/batman-adv.mk +++ b/package/batman-adv/batman-adv.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATMAN_ADV_VERSION = 2022.2 +BATMAN_ADV_VERSION = 2022.3 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h) BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT From yann.morin.1998 at free.fr Mon Feb 20 20:55:41 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:41 -0000 Subject: [Buildroot] [git commit branch/next] package/lua-datafile: bump to version 0.7 Message-ID: <20230220205215.92F6286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7145d04349fbc92588984a01180fc35f044f879a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-datafile/lua-datafile.hash | 2 +- package/lua-datafile/lua-datafile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lua-datafile/lua-datafile.hash b/package/lua-datafile/lua-datafile.hash index 07a13e7e8a..e3b415ad4d 100644 --- a/package/lua-datafile/lua-datafile.hash +++ b/package/lua-datafile/lua-datafile.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 4f7d58c50267b5ebd2145e52aaa5fb63fbf63a74ae765f08e2d0dddd570b6b6a datafile-0.6-1.src.rock +sha256 b511ce5a4f4072bb6c496bd42760fa92a0576d0c77828b6a2600d68fe9d7e998 datafile-0.7-1.src.rock sha256 0443ddabab14f69d4c5e2641860343784a0ccbe5ae7a3743f20de9a13991da66 datafile/LICENSE diff --git a/package/lua-datafile/lua-datafile.mk b/package/lua-datafile/lua-datafile.mk index 5d30fdcf97..3b4c65d3e3 100644 --- a/package/lua-datafile/lua-datafile.mk +++ b/package/lua-datafile/lua-datafile.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_DATAFILE_VERSION = 0.6-1 +LUA_DATAFILE_VERSION = 0.7-1 LUA_DATAFILE_NAME_UPSTREAM = datafile LUA_DATAFILE_SUBDIR = datafile LUA_DATAFILE_LICENSE = MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:41 -0000 Subject: [Buildroot] [git commit branch/next] package/json-for-modern-cpp: bump to version 3.11.2 Message-ID: <20230220205206.B0D8E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5dc226a41998b7f0f92d4fd1330e1e233310e3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/json-for-modern-cpp/json-for-modern-cpp.hash | 2 +- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index a193fa6d49..7668f67249 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 json-3.10.5.tar.gz +sha256 d69f9deb6a75e2580465c6c4c5111b89c4dc2fa94e3a85fcd2ffcd9a143d9273 json-3.11.2.tar.gz sha256 86b998c792894ccb911a1cb7994f7a9652894e7a094c0b5e45be2f553f45cf14 LICENSE.MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index fd13ce1fd1..435644fd53 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.10.5 +JSON_FOR_MODERN_CPP_VERSION = 3.11.2 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT From yann.morin.1998 at free.fr Mon Feb 20 20:55:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:42 -0000 Subject: [Buildroot] [git commit branch/next] package/open62541: bump to version 1.3.4 Message-ID: <20230220205215.B9E7D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83b2e53dcde56d478928d917604bf3af1f903d9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/open62541/open62541.hash | 2 +- package/open62541/open62541.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/open62541/open62541.hash b/package/open62541/open62541.hash index 22c13851bf..09002436e9 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 283545991c3eb36b18c75a64638c7c2ad8f193654c2403b76aee848abf454e14 open62541-v1.3.3-br1.tar.gz +sha256 9a7955ba01e12dbd327e534c25288f4918d275031394c804943a7e45ba903621 open62541-v1.3.4-br1.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index edc95dcf15..2c0e3b17fe 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN62541_VERSION = v1.3.3 +OPEN62541_VERSION = v1.3.4 OPEN62541_SITE_METHOD = git OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES From yann.morin.1998 at free.fr Mon Feb 20 20:55:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:43 -0000 Subject: [Buildroot] [git commit branch/next] package/pkg-meson.mk: add 'setup' as meson command in config step Message-ID: <20230220205207.07413828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d23d6fde81b3a8bf701d0382d55fe60e2334c934 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When building/configure meson packages the following warning is displayed: WARNING: Running the setup command as meson [options] instead of meson setup [options] is ambiguous and deprecated. This warning was introduced in meson release 0.64.0 [0], which we are using since commit 9afa3e3c7d07 (package/meson: bump to version 0.64.0), and is dpcumented in the manual [1]. Follow the advise and the manual, and add the 'setup' argument as the meson command. [0] https://github.com/mesonbuild/meson/commit/3c7ab542c0c4770241eae149b0d4cd8de329aee0 [1] https://mesonbuild.com/Commands.html#setup Signed-off-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- package/pkg-meson.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index d675f7f733..4aa6e44afa 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -149,7 +149,7 @@ define $(2)_CONFIGURE_CMDS CC_FOR_BUILD="$$(HOSTCC)" \ CXX_FOR_BUILD="$$(HOSTCXX)" \ $$($$(PKG)_CONF_ENV) \ - $$(MESON) \ + $$(MESON) setup \ --prefix=/usr \ --libdir=lib \ --default-library=$(if $(BR2_STATIC_LIBS),static,shared) \ @@ -169,7 +169,7 @@ define $(2)_CONFIGURE_CMDS rm -rf $$($$(PKG)_SRCDIR)/build mkdir -p $$($$(PKG)_SRCDIR)/build $$(HOST_CONFIGURE_OPTS) \ - $$($$(PKG)_CONF_ENV) $$(MESON) \ + $$($$(PKG)_CONF_ENV) $$(MESON) setup \ --prefix=$$(HOST_DIR) \ --libdir=lib \ --sysconfdir=$$(HOST_DIR)/etc \ From yann.morin.1998 at free.fr Mon Feb 20 20:55:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:43 -0000 Subject: [Buildroot] [git commit branch/next] package/lua-cjson: bump to version 2.1.0.10 Message-ID: <20230220205215.870B586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eda08c6b88ca466c27cb02004e92ac5ae6e60998 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-cjson/Config.in | 2 +- package/lua-cjson/lua-cjson.hash | 2 +- package/lua-cjson/lua-cjson.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-cjson/Config.in b/package/lua-cjson/Config.in index 9474b3176c..1c153fa46a 100644 --- a/package/lua-cjson/Config.in +++ b/package/lua-cjson/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_LUA_CJSON (C-module) - http://www.kyne.com.au/~mark/software/lua-cjson.php + https://www.kyne.com.au/~mark/software/lua-cjson.php diff --git a/package/lua-cjson/lua-cjson.hash b/package/lua-cjson/lua-cjson.hash index b052c5199c..5ddc07bcc6 100644 --- a/package/lua-cjson/lua-cjson.hash +++ b/package/lua-cjson/lua-cjson.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 455fa7d07d8ac9d61f68f538958f8e28972256f38b0a1c2740873daf809d1837 lua-cjson-2.1.0.6-1.src.rock +sha256 02dea368d07753647c75bd9e6660dd4d06ff7d09956d90d5afc4c3f5b78ed187 lua-cjson-2.1.0.10-1.src.rock sha256 9576e82ef5013fbe80b3bd446a7d9ddd47328baa2186c31d3d885e2a9a8cd31e lua-cjson/LICENSE diff --git a/package/lua-cjson/lua-cjson.mk b/package/lua-cjson/lua-cjson.mk index e029dab5cb..e08d230060 100644 --- a/package/lua-cjson/lua-cjson.mk +++ b/package/lua-cjson/lua-cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CJSON_VERSION = 2.1.0.6-1 +LUA_CJSON_VERSION = 2.1.0.10-1 LUA_CJSON_SUBDIR = lua-cjson LUA_CJSON_LICENSE = MIT LUA_CJSON_LICENSE_FILES = $(LUA_CJSON_SUBDIR)/LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:55:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:44 -0000 Subject: [Buildroot] [git commit branch/next] package/opensc: propagate dependencies from pcsc-lite Message-ID: <20230220205206.EDE6386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=071fdbf963228590b453e5111eadc8a74b579aa2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit d590003e31dd (package/pcsc-lite: needs gcc >= 4.9) propagated that new dependency to a bunch of packages that select pcsc-lite. Then commit 8aaa7ecbce1d (package/opensc: new package) introduced opensc, which selects pcsc-lite. However, the package was submitted before the dependency to gcc 4.8+ was added to pcsc-lite, and that was missed during the review. Add it now. Signed-off-by: Yann E. MORIN --- package/opensc/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/opensc/Config.in b/package/opensc/Config.in index 2cec096ac2..8c6a95a41d 100644 --- a/package/opensc/Config.in +++ b/package/opensc/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_OPENSC depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pcsc-lite select BR2_PACKAGE_PCSC_LITE select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL @@ -13,6 +14,7 @@ config BR2_PACKAGE_OPENSC https://github.com/OpenSC/OpenSC/wiki -comment "opensc needs a toolchain with dynamic library, threads" +comment "opensc needs a toolchain with dynamic library, threads, gcc >= 4.9" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:45 -0000 Subject: [Buildroot] [git commit branch/next] package/dump1090: bump to version 8.2 Message-ID: <20230220205215.D19D186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99127efe6ec2c8c056e252845326cc374859fa74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/flightaware/dump1090/compare/v7.2...v8.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dump1090/dump1090.hash | 2 +- package/dump1090/dump1090.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dump1090/dump1090.hash b/package/dump1090/dump1090.hash index 23178567ac..8a4c3a4818 100644 --- a/package/dump1090/dump1090.hash +++ b/package/dump1090/dump1090.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dfcf57b19f43e0262b1a03b0dc5069a9ddc48427d85378b7ef52fb4e74911eef dump1090-7.2.tar.gz +sha256 1ab8a5acd891bdbba586e2e9f2d9b056210940bd47b5c1a19d133eb091f31555 dump1090-8.2.tar.gz sha256 804f68c803eb5c127c53ad17c4f4e5033ef158e514bb76950dc7b1773f9ce4b0 LICENSE diff --git a/package/dump1090/dump1090.mk b/package/dump1090/dump1090.mk index 82eaaf2cb8..60ef4a9bcb 100644 --- a/package/dump1090/dump1090.mk +++ b/package/dump1090/dump1090.mk @@ -4,7 +4,7 @@ # ################################################################################ -DUMP1090_VERSION = 7.2 +DUMP1090_VERSION = 8.2 DUMP1090_SITE = $(call github,flightaware,dump1090,v$(DUMP1090_VERSION)) DUMP1090_LICENSE = GPL-2.0+ DUMP1090_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:55:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:45 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-input-joystick: bump version to 1.6.4 Message-ID: <20230220205207.1B0588648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7255c2b31755241d8c4fafc5f733faa68182282d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003290.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash | 5 +++-- .../xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash index d2384d6c15..0d7911bf96 100644 --- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash +++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002742.html -sha256 9e7669ecf0f23b8e5dc39d5397cf28296f692aa4c0e4255f5e02816612c18eab xf86-input-joystick-1.6.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003290.html +sha256 905ec485fabc699b1cb21518cbd152246776fa83570e09c5822ca0973733ccd2 xf86-input-joystick-1.6.4.tar.xz +sha512 4e9127f125543060f9e6bc4b0aa384bc98a92acc52bfb240c9a114c565e0b24d2e9dcbc0e866845abc8aeb1e1a6c78cd5e3f0c0f22007aa93460b6a1910d67ef xf86-input-joystick-1.6.4.tar.xz # Locally calculated sha256 460cf612147407317a3911ce03a215707d8d6d5f3e604a53fefa6e54974ad07e COPYING diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk index 0ec4be5e53..0573f43949 100644 --- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.3 -XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.4 +XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.xz +XDRIVER_XF86_INPUT_JOYSTICK_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT XDRIVER_XF86_INPUT_JOYSTICK_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xorgproto From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:46 -0000 Subject: [Buildroot] [git commit branch/next] package/haveged: bump to version 1.9.18 Message-ID: <20230220205215.DF98F86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b473917001fa1145bec2ab118fac97dab0fc26e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/jirka-h/haveged/blob/v1.9.18/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/haveged/haveged.hash | 2 +- package/haveged/haveged.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/haveged/haveged.hash b/package/haveged/haveged.hash index 8c62ead7c3..61bf6cc9a1 100644 --- a/package/haveged/haveged.hash +++ b/package/haveged/haveged.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f882919ccead07ad6687a4784c0c501e617321e96dd0118403464969359cf6ad haveged-1.9.15.tar.gz +sha256 b835fa02b52ee7d06276e028571cadcb14d08f5e5a4b5767adf81451f70561c7 haveged-1.9.18.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/haveged/haveged.mk b/package/haveged/haveged.mk index 7035142aee..fbf72a96ad 100644 --- a/package/haveged/haveged.mk +++ b/package/haveged/haveged.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAVEGED_VERSION = 1.9.15 +HAVEGED_VERSION = 1.9.18 HAVEGED_SITE = $(call github,jirka-h,haveged,v$(HAVEGED_VERSION)) HAVEGED_LICENSE = GPL-3.0+ HAVEGED_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:55:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:46 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-ast: bump version to 1.1.6 Message-ID: <20230220205207.2C2AF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e242cde92c10e6605de54a489f1aaee3dac3b5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003291.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash | 5 +++-- package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash index 2988db98af..12ad79e4b4 100644 --- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash +++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash @@ -1,4 +1,5 @@ -# Locally computed -sha256 1edbbc55d47d3fd71dec99b15c2483e22738c642623a0fb86ef4a81a9067a2de xf86-video-ast-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003291.html +sha256 75754fa9c7f9a94fcc706d32cc118942d16c71934d88110442443a143b930daf xf86-video-ast-1.1.6.tar.xz +sha512 8482fec8d6be577f293cb820e623544475163f713fd74ec415f899bf5e9cf9453ffe4f96e141da3671437ebf616b47395d30d4b10858053c5893f5f5b7575ef1 xf86-video-ast-1.1.6.tar.xz # Locally calculated sha256 1cdd3d57e2fdcbd21b8a7b788ffbe6f809216a9bdd36b2225cff6c4b4404a170 COPYING diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk index b39bbf9a15..f29dc29f0b 100644 --- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk +++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_AST_VERSION = 1.1.5 -XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_AST_VERSION = 1.1.6 +XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.xz +XDRIVER_XF86_VIDEO_AST_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_AST_LICENSE = MIT XDRIVER_XF86_VIDEO_AST_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_AST_DEPENDENCIES = xorgproto xserver_xorg-server From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:47 -0000 Subject: [Buildroot] [git commit branch/next] package/libdeflate: fix build with arm soft float Message-ID: <20230220205215.C55E886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c181878a84e9531f25d8dd1f5cb10b86f8bf9e51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with arm soft float raised since bump to version 1.15 in commit c31087182fa545784d9a0a01f0b32715d78c3955 and https://github.com/ebiggers/libdeflate/commit/84c76f6f2cf5e5ac4deca0b1c25faebb42469f58: In file included from /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h:256, from /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/crc32.c:227: /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabi/11.3.0/include/arm_neon.h:31:2: error: #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" 31 | #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" | ^~~~~ In file included from /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/crc32.c:227: /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h: In function 'clmul_u32': /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h:262:9: error: unknown type name 'uint64x2_t'; did you mean 'uint16x2_t'? 262 | uint64x2_t res = vreinterpretq_u64_p128( | ^~~~~~~~~~ | uint16x2_t Fixes: - http://autobuild.buildroot.org/results/1445dcbf676893133f311a92ac21b29237fb75df Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...d-error-due-to-PMULL-enabled-without-NEON.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch b/package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch new file mode 100644 index 0000000000..b13cbc48af --- /dev/null +++ b/package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch @@ -0,0 +1,35 @@ +From 079a6dd171583c1953017b703ec63c5367a284b4 Mon Sep 17 00:00:00 2001 +From: Eric Biggers +Date: Mon, 26 Dec 2022 11:32:47 -0800 +Subject: [PATCH] lib/arm/cpu_features: fix build error due to PMULL enabled + without NEON + +When building for soft float arm32, HAVE_PMULL_INTRIN is being set when +it shouldn't be, causing a build error: + + #error "NEON intrinsics not available with the soft-float ABI..." + +Fix this by making HAVE_PMULL_INTRIN depend on HAVE_NEON_INTRIN, as used +to be the case, in order to get the 'defined(__ARM_FP)' dependency, + +Fixes https://github.com/ebiggers/libdeflate/issues/282 +Fixes: 84c76f6f2cf5 ("lib/arm: make crc32 code work with MSVC") +[Retrieved from: +https://github.com/ebiggers/libdeflate/commit/079a6dd171583c1953017b703ec63c5367a284b4] +Signed-off-by: Fabrice Fontaine +--- + lib/arm/cpu_features.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/arm/cpu_features.h b/lib/arm/cpu_features.h +index 4092eba8..edcf7359 100644 +--- a/lib/arm/cpu_features.h ++++ b/lib/arm/cpu_features.h +@@ -97,6 +97,7 @@ static inline u32 get_arm_cpu_features(void) { return 0; } + #endif + #if HAVE_PMULL_NATIVE || \ + (HAVE_DYNAMIC_ARM_CPU_FEATURES && \ ++ HAVE_NEON_INTRIN /* needed to exclude soft float arm32 case */ && \ + (GCC_PREREQ(6, 1) || __has_builtin(__builtin_neon_vmull_p64) || \ + defined(_MSC_VER)) && \ + /* From yann.morin.1998 at free.fr Mon Feb 20 20:55:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:47 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-vesa: bump version to 2.6.0 Message-ID: <20230220205207.3DEE186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f792825039878323d996d973f0bfd588991fc5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003297.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash | 6 +++--- package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash index d179228a74..3e32249f12 100644 --- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash +++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-September/003060.html -sha256 1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659 xf86-video-vesa-2.5.0.tar.bz2 -sha512 36fd921f54f33eb25966b5f9ea1e1b3e9009965c012c8b9c676686b472111719921b80cf62dafc746058878253e21f0ef341a2ff2d650df22ca1e35e81716a8b xf86-video-vesa-2.5.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003297.html +sha256 10082771b1a8f659c60b3d9b70456a4b59948a75b3cade2dfa33b8b05e549bb1 xf86-video-vesa-2.6.0.tar.xz +sha512 494e117c1e6e0ce4c66ac7798de54667862c62605bfd76dd9373447d40dcd0521100810c9285cbe9c159440e217954c0cad6d5219c5894e075509c7c0bc353c7 xf86-video-vesa-2.6.0.tar.xz # Locally computed sha256 bda49ba1e860501c20fd444423bc790f6da4f769561b69acc0cbe5abff9409b6 COPYING diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk index b08bab4ec8..8a5a5ebf58 100644 --- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk +++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VESA_VERSION = 2.5.0 -XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_VESA_VERSION = 2.6.0 +XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.xz +XDRIVER_XF86_VIDEO_VESA_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_VESA_LICENSE = MIT XDRIVER_XF86_VIDEO_VESA_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xorgproto From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:48 -0000 Subject: [Buildroot] [git commit branch/next] package/fmlib: fix build for ppc e500mc Message-ID: <20230220205216.032C286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1df9d42bdd8cc2e594d6337ee62c3f31499baf80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When BR2_powerpc_e500mc=y, fmlib package compilation fails with output: make[2]: *** No rule to make target 'libfm-e500mc.a'. Stop. The fmlib package "make help" command shows: The available make libfm-.a targets are: libfm-ppce500mc.a (P2, P3, P4) ... The package Config.in incorrectly sets BR2_PACKAGE_FMLIB_ARCHTYPE to "e500mc", which is then passed as the package make target. The correct value should be "ppce500mc". The commit fixes this build issue. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/fmlib/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fmlib/Config.in b/package/fmlib/Config.in index df4ae440ea..7bccfd7c83 100644 --- a/package/fmlib/Config.in +++ b/package/fmlib/Config.in @@ -37,7 +37,7 @@ endchoice config BR2_PACKAGE_FMLIB_ARCHTYPE string - default "e500mc" if BR2_powerpc_e500mc + default "ppce500mc" if BR2_powerpc_e500mc default "ppc64e6500" if BR2_powerpc_e6500 && BR2_powerpc64 default "ppc32e6500" if BR2_powerpc_e6500 && BR2_powerpc From yann.morin.1998 at free.fr Mon Feb 20 20:55:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:48 -0000 Subject: [Buildroot] [git commit branch/next] package/xr819-xradio: fix build failure with Linux 6.0 Message-ID: <20230220205207.5D1DC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fbb447cded5120135ce21ce6a5d2936dc79f645 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bump to latest version to fix build failure with Linux 6.0. Fixes: http://autobuild.buildroot.net/results/434c1d2a5104090366519278314bf750324d3710/ Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/xr819-xradio/xr819-xradio.hash | 2 +- package/xr819-xradio/xr819-xradio.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index 89201a8eb7..08a3b6e8cc 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 0d0449a85488b990d10ecdf67ac88bfbd39fa81c2df5dfcfed583975222afd33 xr819-xradio-4f0cfd5e869ca101e7c624d9ce05ba5d2b2a0bc2.tar.gz +sha256 839fdae93eba29121d4116de335b00a026ef63874caf516747dbdf24c17f208b xr819-xradio-58d597bcf081e44904335916e6033bc8ef28b043.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index 835e229347..8c1cb1587f 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 4f0cfd5e869ca101e7c624d9ce05ba5d2b2a0bc2 +XR819_XRADIO_VERSION = 58d597bcf081e44904335916e6033bc8ef28b043 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:55:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:49 -0000 Subject: [Buildroot] [git commit branch/next] package/network-manager: bump to version 1.40.6 Message-ID: <20230220205207.6C188828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7c20ad548818fad6924f19e31ef2defdc418875 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 26bcf843c2..f503665a9a 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.36/NetworkManager-1.36.4.sha256sum -sha256 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59 NetworkManager-1.36.4.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.6.sha256sum +sha256 2f025b2d5af7de593bbf47c17e4d98a2b9608ea90a8260fb08080be97439534e NetworkManager-1.40.6.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index a17c5e1774..847c6a82ba 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.36 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 +NETWORK_MANAGER_VERSION_MAJOR = 1.40 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).6 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 From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:49 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi-pvr-nextpvr: bump version to 19.0.6-Matrix Message-ID: <20230220205216.1883D86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82edf126c98bbf652de917892f25ea6d37f99bb9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 2 +- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 79921da503..17d9817053 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 49df97d2e566dc044d3027e4ee6ed8e1ff122f4c38c82325e20ac91e148d5558 kodi-pvr-nextpvr-19.0.5-Matrix.tar.gz +sha256 45ad0def6bbdb50fc42dc0b8a997e0db758fda42421fa7eb7643466ea512134f kodi-pvr-nextpvr-19.0.6-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index dc62040b02..6b3590a6d6 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 19.0.5-Matrix +KODI_PVR_NEXTPVR_VERSION = 19.0.6-Matrix KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:51 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add myself to more packages Message-ID: <20230220205216.2522E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02cc05e757970a23da3c0818f275d465a4c1f280 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5eed4a8455..48e7e08b3a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2105,12 +2105,16 @@ F: package/gnuplot/ F: package/sdl2/ N: Michael Nosthoff +F: package/boost/ +F: package/fmt/ F: package/grpc/ F: package/gtest/ +F: package/json-for-modern-cpp/ F: package/libabseil-cpp/ F: package/networkd-dispatcher/ F: package/protobuf/ F: package/re2/ +F: package/spdlog/ N: Michael Rommel F: package/knock/ From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:51 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/kria/kv260/uboot.fragment: move to board/zynqmp/kria Message-ID: <20230220205207.8C592828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2da02b9e38a72ec3d18171e482a0791b5dd24b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch moves the board/zynqmp/kria/kv260/uboot.fragment file to the board/zynqmp/kria directory. The reason is that this file is the same for any kria starter kit and is not specific to the kv260. By moving the file, it can be logically re-used with the kr260 when support for this starter kit is added to buildroot. KR260 Starter Kit: https://www.xilinx.com/products/som/kria/kr260-robotics-starter-kit.html Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- board/zynqmp/kria/{kv260 => }/uboot.fragment | 0 configs/zynqmp_kria_kv260_defconfig | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/board/zynqmp/kria/kv260/uboot.fragment b/board/zynqmp/kria/uboot.fragment similarity index 100% rename from board/zynqmp/kria/kv260/uboot.fragment rename to board/zynqmp/kria/uboot.fragment diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index df01ad30b8..3214d45fa9 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -24,7 +24,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/kv260/uboot.fragment" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:52 -0000 Subject: [Buildroot] [git commit branch/next] package/stellarium: bump version to 1.2 Message-ID: <20230220205216.2F4C086496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=319c56dfe3309dbf24be01fed3afff6259a2c5dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add patch to fix build error. Removed sha1 hash. Add configure option to disable searching for qt6 as of now due to incomplete implementation of qt6 modules, like gui, in buildroot. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/stellarium/0001-add-missing-include.patch | 32 +++++++++++++++++++++++ package/stellarium/stellarium.hash | 3 +-- package/stellarium/stellarium.mk | 4 ++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/package/stellarium/0001-add-missing-include.patch b/package/stellarium/0001-add-missing-include.patch new file mode 100644 index 0000000000..822fc50367 --- /dev/null +++ b/package/stellarium/0001-add-missing-include.patch @@ -0,0 +1,32 @@ +From f36ce55e7a0fbba11fb7e1d4107ef61a79dc95d3 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 25 Dec 2022 20:38:17 +0100 +Subject: [PATCH] add missing include + +Fixes build error: + +stellarium-1.2/plugins/MeteorShowers/src/MeteorShowersMgr.hpp:331:12: + error: field 'm_lastUpdate' has incomplete type 'QDateTime' + +Patch sent upstream: https://github.com/Stellarium/stellarium/pull/2933 + +Signed-off-by: Bernd Kuhls +--- + plugins/MeteorShowers/src/MeteorShowersMgr.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/MeteorShowers/src/MeteorShowersMgr.hpp b/plugins/MeteorShowers/src/MeteorShowersMgr.hpp +index 8096856b6d..17716a68b0 100644 +--- a/plugins/MeteorShowers/src/MeteorShowersMgr.hpp ++++ b/plugins/MeteorShowers/src/MeteorShowersMgr.hpp +@@ -20,6 +20,7 @@ + #ifndef METEORSHOWERSMGR_HPP + #define METEORSHOWERSMGR_HPP + ++#include + #include + #include + +-- +2.34.1 + diff --git a/package/stellarium/stellarium.hash b/package/stellarium/stellarium.hash index f33dd385ca..2488b611a4 100644 --- a/package/stellarium/stellarium.hash +++ b/package/stellarium/stellarium.hash @@ -1,5 +1,4 @@ # From https://github.com/Stellarium/stellarium/releases -sha1 3661b4e8a94e7a520873fa22ddc79f39904eb1c4 stellarium-0.22.2.tar.gz -sha256 31e965d32cafc0fbad212c7ef4efbeac988f909206013554e1fe35123ebb9376 stellarium-0.22.2.tar.gz +sha256 802a0e8231cae41ec04f697f70105c291d9719aa6e7fd8cbe1f15068c3324e09 stellarium-1.2.tar.xz # Locally computed sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index 769e7049c1..a62488907f 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -4,7 +4,8 @@ # ################################################################################ -STELLARIUM_VERSION = 0.22.2 +STELLARIUM_VERSION = 1.2 +STELLARIUM_SOURCE = stellarium-$(STELLARIUM_VERSION).tar.xz STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION) STELLARIUM_LICENSE = GPL-2.0+ STELLARIUM_LICENSE_FILES = COPYING @@ -18,6 +19,7 @@ STELLARIUM_CONF_OPTS = \ -DENABLE_MEDIA=ON \ -DENABLE_NLS=OFF \ -DENABLE_QTWEBENGINE=OFF \ + -DENABLE_QT6=OFF \ -DUSE_SYSTEM_ZLIB=ON ifeq ($(BR2_PACKAGE_QT5SCRIPT),y) From yann.morin.1998 at free.fr Mon Feb 20 20:55:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:52 -0000 Subject: [Buildroot] [git commit branch/next] package/tealdeer: exclude unsupported targets Message-ID: <20230220205207.7CF378648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=22bdfbdfc72681f552ae346a110d81b98ec477e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Not all target architectures are supported by the "ring" dependency: - mips: https://github.com/briansmith/ring/issues/562 - PowerPC: https://github.com/briansmith/ring/issues/389 - Sparc: https://github.com/briansmith/ring/issues/1512 - s390x: https://github.com/briansmith/ring/commit/4d2e1a8fb80398f7c3c0137ea8fdd512f82d37a0 Signed-off-by: Danilo Bargen Signed-off-by: Yann E. MORIN --- package/tealdeer/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/tealdeer/Config.in b/package/tealdeer/Config.in index 96ed81614b..662a937ce1 100644 --- a/package/tealdeer/Config.in +++ b/package/tealdeer/Config.in @@ -1,6 +1,11 @@ config BR2_PACKAGE_TEALDEER bool "tealdeer" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # Crypto dependency (ring) not available for mips, PowerPC, Sparc, s390x + depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) + depends on !(BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le) + depends on !(BR2_sparc || BR2_sparc64) + depends on !BR2_s390x select BR2_PACKAGE_HOST_RUSTC help A fast and full-featured tldr client. tldr pages are From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:53 -0000 Subject: [Buildroot] [git commit branch/next] package/meson: bump to version 1.0.0 Message-ID: <20230220205216.50F4E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a41f246439c0387f7b028b3f7e40978a2e0f1a50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- 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 1544bb3897..6993b756ae 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.64.1/meson-0.64.1.tar.gz.asc -sha256 3a8e030c2334f782085f81627062cc6d4a6771edf31e055ffe374f9e6b089ab9 meson-0.64.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.0.0/meson-1.0.0.tar.gz.asc +sha256 aa50a4ba4557c25e7d48446abfde857957dcdf58385fffbe670ba0e8efacce05 meson-1.0.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 5aae95973a..e417d8d627 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.64.1 +MESON_VERSION = 1.0.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:53 -0000 Subject: [Buildroot] [git commit branch/next] package/postgresql: bump version to 14.6 Message-ID: <20230220205207.B461E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f8592b686e4aa1085ace7c7f25c7c777a3fd2ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://www.postgresql.org/docs/release/14.6/ Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 8fdaadde99..26bb626943 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v14.5/postgresql-14.5.tar.bz2.sha256 -sha256 d4f72cb5fb857c9a9f75ec8cf091a1771272802f2178f0b2e65b7b6ff64f4a30 postgresql-14.5.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v14.6/postgresql-14.6.tar.bz2.sha256 +sha256 508840fc1809d39ab72274d5f137dabb9fd7fb4f933da4168aeebb20069edf22 postgresql-14.6.tar.bz2 # License file, Locally calculated sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 631a959122..502860bc99 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 14.5 +POSTGRESQL_VERSION = 14.6 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 Mon Feb 20 20:55:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:53 -0000 Subject: [Buildroot] [git commit branch/next] package/gcc: fix gcc12 with uClibc Message-ID: <20230220205216.8618E86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=327fab5b9d45891233ff647d5b352cc94b3c27ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next GCC 12 produces broken binaries when used with uClibc. E.g. `gdb` crashes on startup. GCC HEAD fixes this in: https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=ee4af2ed0b7322884ec4ff537564683c3749b813 Adds the commit as patch for GCC 12. Signed-off-by: Gleb Mazovetskiy Signed-off-by: Thomas Petazzoni --- package/gcc/12.2.0/0002-fix-condvar.patch | 82 +++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/package/gcc/12.2.0/0002-fix-condvar.patch b/package/gcc/12.2.0/0002-fix-condvar.patch new file mode 100644 index 0000000000..5044942e9f --- /dev/null +++ b/package/gcc/12.2.0/0002-fix-condvar.patch @@ -0,0 +1,82 @@ +From ee4af2ed0b7322884ec4ff537564683c3749b813 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely +Date: Thu, 22 Dec 2022 09:56:47 +0000 +Subject: [PATCH] libstdc++: Avoid recursion in __nothrow_wait_cv::wait + [PR105730] + +The commit r12-5877-g9e18a25331fa25 removed the incorrect +noexcept-specifier from std::condition_variable::wait and gave the new +symbol version @@GLIBCXX_3.4.30. It also redefined the original symbol +std::condition_variable::wait(unique_lock&)@GLIBCXX_3.4.11 as an +alias for a new symbol, __gnu_cxx::__nothrow_wait_cv::wait, which still +has the incorrect noexcept guarantee. That __nothrow_wait_cv::wait is +just a wrapper around the real condition_variable::wait which adds +noexcept and so terminates on a __forced_unwind exception. + +This doesn't work on uclibc, possibly due to a dynamic linker bug. When +__nothrow_wait_cv::wait calls the condition_variable::wait function it +binds to the alias symbol, which means it just calls itself recursively +until the stack overflows. + +This change avoids the possibility of a recursive call by changing the +__nothrow_wait_cv::wait function so that instead of calling +condition_variable::wait it re-implements it. This requires accessing +the private _M_cond member of condition_variable, so we need to use the +trick of instantiating a template with the member-pointer of the private +member. + +libstdc++-v3/ChangeLog: + + PR libstdc++/105730 + * src/c++11/compatibility-condvar.cc (__nothrow_wait_cv::wait): + Access private data member of base class and call its wait + member. + +Signed-off-by: Gleb Mazovetskiy +--- + .../src/c++11/compatibility-condvar.cc | 22 ++++++++++++++++++- + 1 file changed, 21 insertions(+), 1 deletion(-) + +diff --git a/libstdc++-v3/src/c++11/compatibility-condvar.cc b/libstdc++-v3/src/c++11/compatibility-condvar.cc +index e3a8b8403ca..3cef3bc0714 100644 +--- a/libstdc++-v3/src/c++11/compatibility-condvar.cc ++++ b/libstdc++-v3/src/c++11/compatibility-condvar.cc +@@ -67,6 +67,24 @@ _GLIBCXX_END_NAMESPACE_VERSION + && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT) + namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) + { ++namespace ++{ ++ // Pointer-to-member for private std::condition_variable::_M_cond member. ++ std::__condvar std::condition_variable::* __base_member; ++ ++ template ++ struct cracker ++ { static std::__condvar std::condition_variable::* value; }; ++ ++ // Initializer for this static member also initializes __base_member. ++ template ++ std::__condvar std::condition_variable::* ++ cracker::value = __base_member = X; ++ ++ // Explicit instantiation is allowed to access the private member. ++ template class cracker<&std::condition_variable::_M_cond>; ++} ++ + struct __nothrow_wait_cv : std::condition_variable + { + void wait(std::unique_lock&) noexcept; +@@ -76,7 +94,9 @@ __attribute__((used)) + void + __nothrow_wait_cv::wait(std::unique_lock& lock) noexcept + { +- this->condition_variable::wait(lock); ++ // In theory this could be simply this->std::condition_variable::wait(lock) ++ // but with uclibc that binds to the @GLIBCXX_3.4.11 symbol, see PR 105730. ++ (this->*__base_member).wait(*lock.mutex()); + } + } // namespace __gnu_cxx + +-- +2.31.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:54 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi-pvr-nextpvr: bump version to 19.0.5-Matrix Message-ID: <20230220205207.F090F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dd4caaa011b1efffc522d0d313725a195cfee7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 2 +- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 74f15e6d9b..79921da503 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 278411430d41ac24f28e05f76d2d46a90cb3989202a450399ac0495c264a6846 kodi-pvr-nextpvr-19.0.4-Matrix.tar.gz +sha256 49df97d2e566dc044d3027e4ee6ed8e1ff122f4c38c82325e20ac91e148d5558 kodi-pvr-nextpvr-19.0.5-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index c2f54e0c2c..dc62040b02 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 19.0.4-Matrix +KODI_PVR_NEXTPVR_VERSION = 19.0.5-Matrix KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:54 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl_433: fix static openssl build Message-ID: <20230220205216.AF01786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56763ca01229ead2dba2cfb27025b41c0a5e18ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static openssl build failure raised since commit 7967755fbf25fe4d5860884bedb3e01fcd7e9855: /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-13/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': ssl_cert.c:(.text+0x384): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/417c86963ffe038aa052ea3cf19fd52c3e9b7396 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...txt-use-pkg-config-to-detect-openssl-when.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch b/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch new file mode 100644 index 0000000000..00858c8ff9 --- /dev/null +++ b/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch @@ -0,0 +1,42 @@ +From b860de9e207d8fe2ea37dad28fdd014493d87703 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 27 Dec 2022 16:29:16 +0100 +Subject: [PATCH] build: Fix CMake to use pkg-config openssl when possible + (#2290) + +In order to take into account the libraries used by openssl when +building statically, using pkg-config is recommended. This patch +therefore improves the CMakeLists.txt to use pkg-config to detect +openssl when pkg-config is available. This will avoid +static build failure when openssl needs to link with -latomic. + +Fixes: + - http://autobuild.buildroot.org/results/417c86963ffe038aa052ea3cf19fd52c3e9b7396 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/b860de9e207d8fe2ea37dad28fdd014493d87703] +--- + CMakeLists.txt | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d47a3eda2..cf30d8be2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -175,7 +175,14 @@ set(ENABLE_OPENSSL AUTO CACHE STRING "Enable OpenSSL TLS support") + set_property(CACHE ENABLE_OPENSSL PROPERTY STRINGS AUTO ON OFF) + if(ENABLE_OPENSSL) # AUTO / ON + +-find_package(OpenSSL) ++find_package(PkgConfig) ++if(PKG_CONFIG_FOUND) ++ pkg_check_modules(OPENSSL openssl) ++ set(OPENSSL_LIBRARIES ${OPENSSL_LINK_LIBRARIES}) ++ set(OPENSSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIRS}) ++else() ++ find_package(OpenSSL) ++endif() + if(OPENSSL_FOUND) + message(STATUS "OpenSSL TLS support will be compiled. Found version ${OPENSSL_VERSION}") + include_directories(${OPENSSL_INCLUDE_DIR}) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:55 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pypa-build: drop host-python-tomli dependency Message-ID: <20230220205208.0DDA28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=889c7815ed5fca418ca02dda9a8f5fcf8674fac4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The host-python-tomli dependency is not required on python version 3.11 and newer. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pypa-build/python-pypa-build.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk index b78aefe855..adc124b074 100644 --- a/package/python-pypa-build/python-pypa-build.mk +++ b/package/python-pypa-build/python-pypa-build.mk @@ -12,7 +12,6 @@ PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE PYTHON_PYPA_BUILD_SETUP_TYPE = setuptools HOST_PYTHON_PYPA_BUILD_DEPENDENCIES = \ host-python-packaging \ - host-python-pep517 \ - host-python-tomli + host-python-pep517 $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:56 -0000 Subject: [Buildroot] [git commit branch/next] package/aubio: switch to external waf script Message-ID: <20230220205216.D74AC86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6264dfae49af69d7358f2d6fef21bd720e62440f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since the python 3.11 version bump [1], the waf script bundled in aubio 0.4.9 can't be executed anymore due to a waf bug [2]. Use the waf script provided by the Buildroot waf package infrastructure after removing the old waf script and its libraries. Fixes: http://autobuild.buildroot.org/results/e2b/e2be18415ca794c68e708f2fdfd0a1a1ff5be714 [1] 738500c296c8b1206f20e94ca3e7c5932a6a0486 [2] https://gitlab.com/ita1024/waf/-/commit/68997828c850ce7fb30b73b4adfde35053e539d1 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/aubio/aubio.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index b2eb2b5e6d..c995fdfac7 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -16,6 +16,17 @@ AUBIO_CONF_OPTS = \ --disable-docs \ --disable-atlas +# The waf script bundled in aubio 0.4.9 is too old for python3.11 +# Similar issue with Jack: +# https://github.com/jackaudio/jack2/issues/898 +AUBIO_NEEDS_EXTERNAL_WAF = YES + +# The old waf script bundled in aubio 0.4.9 need to be removed first. +define AUBIO_REMOVE_OLD_WAF + $(RM) -fr $(@D)/waf $(@D)/waflib +endef +AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF + # Add --notests for each build step to avoid running unit tests on the # build machine. AUBIO_WAF_OPTS = --notests From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:56 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/kria/patches: fix build by dropping U-Boot patch Message-ID: <20230220205207.CFE60828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=607665e3cecd967759344d6c702babe82ffa604c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since commit 5bbc20154e2291b967b7fc66ca4f85a2b47dcfd1 ("configs/zynqmp_kria_kv260_defconfig: bump to Xilinx 2022.2"), we're using U-Boot version Xilinx 2022.2, which already carries the psu_init_gpl.c, causing the build to fail as our patch doesn't apply. Fix this by dropping the no longer needed patch. Fixes: 5bbc20154e2291b967b7fc66ca4f85a2b47dcfd1 ("configs/zynqmp_kria_kv260_defconfig: bump to Xilinx 2022.2") Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- ...p-zynqmp-sm-k26-revA-Fix-DP-PLL-configura.patch | 39 ---------------------- configs/zynqmp_kria_kv260_defconfig | 1 - 2 files changed, 40 deletions(-) diff --git a/board/zynqmp/kria/patches/uboot/0001-arm64-zynqmp-zynqmp-sm-k26-revA-Fix-DP-PLL-configura.patch b/board/zynqmp/kria/patches/uboot/0001-arm64-zynqmp-zynqmp-sm-k26-revA-Fix-DP-PLL-configura.patch deleted file mode 100644 index 99dc056115..0000000000 --- a/board/zynqmp/kria/patches/uboot/0001-arm64-zynqmp-zynqmp-sm-k26-revA-Fix-DP-PLL-configura.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c6677ee92c05e3f0f22cc08e3b309a996292562f Mon Sep 17 00:00:00 2001 -From: Neal Frager -Date: Fri, 13 May 2022 14:02:07 +0100 -Subject: [PATCH 1/1] arm64: zynqmp: zynqmp-sm-k26-revA: Fix DP PLL - configuration - -This patch fixes the DP audio and video PLL configurations for the zynqmp-sm-k26-revA som. - -The Linux DP driver expects the DP to be using the following PLL config: - - DP video PLL should use the VPLL (0x0) - - DP audio PLL should use the RPLL (0x3) - - DP system time clock PLL should use RPLL (0x3) - -Register 0xFD1A0070 configures the DP video PLL. -Register 0xFD1A0074 configures the DP audio PLL. -Register 0xFD1A007C configures the DP system time clock PLL. - -Signed-off-by: Neal Frager ---- - board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c -index ed025790bc..e5598807e8 100644 ---- a/board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c -@@ -74,6 +74,9 @@ static unsigned long psu_clock_init_data(void) - psu_mask_write(0xFF5E0128, 0x01003F07U, 0x01000A00U); - psu_mask_write(0xFD1A0060, 0x03003F07U, 0x03000100U); - psu_mask_write(0xFD1A0068, 0x01003F07U, 0x01000200U); -+ psu_mask_write(0xFD1A0070, 0x013F3F07U, 0x01010500U); -+ psu_mask_write(0xFD1A0074, 0x013F3F07U, 0x01013C03U); -+ psu_mask_write(0xFD1A007C, 0x013F3F07U, 0x01013803U); - psu_mask_write(0xFD1A0080, 0x00003F07U, 0x00000200U); - psu_mask_write(0xFD1A0084, 0x07003F07U, 0x07000100U); - psu_mask_write(0xFD1A00B8, 0x01003F07U, 0x01000203U); --- -2.17.1 - diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 3214d45fa9..5c53122b46 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -38,4 +38,3 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/patches" From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:57 -0000 Subject: [Buildroot] [git commit branch/next] package/lua-cqueues: force using libopenssl Message-ID: <20230220205216.E2CA786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=620a77dc9d93365d87c7b18545f091c8e962509e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next As building lua-cqueues fails to build with libressl, we force the use of libopenssl instead. Fixes: http://autobuild.buildroot.net/results/032d6c9bf84b0d4e50d3c27f37b71c0564c52312/ Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-cqueues/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lua-cqueues/Config.in b/package/lua-cqueues/Config.in index 60f022848b..a8c38950cf 100644 --- a/package/lua-cqueues/Config.in +++ b/package/lua-cqueues/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LUA_CQUEUES bool "lua-cqueues" depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix. From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:57 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pep517: drop host-python-tomli dependency Message-ID: <20230220205208.1E03F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0e09a1b0a6a57f3bda48d87f7292af136d59949 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The host-python-tomli dependency is not required on python version 3.11 and newer. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pep517/python-pep517.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk index 1fd294fbb4..c43b09faaa 100644 --- a/package/python-pep517/python-pep517.mk +++ b/package/python-pep517/python-pep517.mk @@ -10,6 +10,5 @@ PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/4d/19/e11fcc88288f6 PYTHON_PEP517_LICENSE = MIT PYTHON_PEP517_LICENSE_FILES = LICENSE PYTHON_PEP517_SETUP_TYPE = flit-bootstrap -HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:58 -0000 Subject: [Buildroot] [git commit branch/next] package/slang: add option to enable/disable slsh Message-ID: <20230220205216.EF51386496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2468404c76e5d56d14f7e2afea8e2641f036e30 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The S-lang shell is currently installed by default but most packages are typically interested in the shared libraries only. Add a configuration option to disable the slsh program and its supporting files. Signed-off-by: Florian Fainelli Signed-off-by: Thomas Petazzoni --- package/slang/Config.in | 9 +++++++++ package/slang/slang.mk | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/package/slang/Config.in b/package/slang/Config.in index a500ff5b7d..0b2c987f73 100644 --- a/package/slang/Config.in +++ b/package/slang/Config.in @@ -5,3 +5,12 @@ config BR2_PACKAGE_SLANG Multi-platform console display library. http://www.jedsoft.org/slang/index.html + +if BR2_PACKAGE_SLANG + +config BR2_PACKAGE_SLANG_SLSH + bool "enable slsh" + help + Enable the S-lang interpreter + +endif diff --git a/package/slang/slang.mk b/package/slang/slang.mk index e0f5968b46..2b3cbdf27a 100644 --- a/package/slang/slang.mk +++ b/package/slang/slang.mk @@ -60,4 +60,13 @@ SLANG_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-static SLANG_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-static endif +ifeq ($(BR2_PACKAGE_SLANG_SLSH),) +define SLANG_REMOVE_SLSH + rm -rf $(TARGET_DIR)/etc/slsh.rc \ + $(TARGET_DIR)/usr/share/slsh \ + $(TARGET_DIR)/usr/bin/slsh +endef +SLANG_POST_INSTALL_TARGET_HOOKS += SLANG_REMOVE_SLSH +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:58 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-mediadriver: bump version to 22.6.4 Message-ID: <20230220205208.3C2FE828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e14c63da95959cbcbbc1cda4bf5e643cb9d17f80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 0a42475400..a9b7c6407d 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f42c41dce7ab4213e21f6599cd0602e5ab40a8182ec286bfc0a16547721dff7a intel-media-22.6.3.tar.gz +sha256 0c04b9d74b92de41fd409b62913ce4afd799236c0b6bc1983a496990764e5d90 intel-media-22.6.4.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 27f3193929..ff97445181 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.6.3 +INTEL_MEDIADRIVER_VERSION = 22.6.4 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 yann.morin.1998 at free.fr Mon Feb 20 20:55:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:59 -0000 Subject: [Buildroot] [git commit branch/next] package/qemu: reorder dependencies alphabetically Message-ID: <20230220205217.224D086494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad71850aa039e344a1c32cd07876c1a83bdf5d5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/qemu/qemu.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index cbcbbc2bc5..be84452862 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -23,10 +23,10 @@ QEMU_CPE_ID_VENDOR = qemu QEMU_DEPENDENCIES = \ host-meson \ host-pkgconf \ + host-python3 \ libglib2 \ - zlib \ pixman \ - host-python3 + zlib # Need the LIBS variable because librt and libm are # not automatically pulled. :-( @@ -253,12 +253,12 @@ $(eval $(generic-package)) # Host-qemu HOST_QEMU_DEPENDENCIES = \ - host-meson \ - host-pkgconf \ - host-zlib \ host-libglib2 \ + host-meson \ host-pixman \ - host-python3 + host-pkgconf \ + host-python3 \ + host-zlib # BR ARCH qemu # ------- ---- From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:59 -0000 Subject: [Buildroot] [git commit branch/next] package/python-maturin: drop host-python-tomli dependency Message-ID: <20230220205208.2CF2C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef708b0c195d168c311b1096c1ab2b7bf6c2aa1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The host-python-tomli dependency is not required on python version 3.11 and newer. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-maturin/python-maturin.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index ab87df3842..3dedfdce11 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -12,7 +12,6 @@ PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit HOST_PYTHON_MATURIN_DEPENDENCIES = \ host-python-setuptools-rust \ - host-python-tomli \ host-rustc HOST_PYTHON_MATURIN_ENV = \ $(HOST_PKG_CARGO_ENV) \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:00 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: drop ucl Message-ID: <20230220205217.5190386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be69066d8fee8b30dad8317bb4aad425bc005623 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 85c5af46ad6c18841576c0f7abe241a617a44cb7 forgot to drop ucl from DEVELOPERS file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 48e7e08b3a..0eea9c33d9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1091,7 +1091,6 @@ F: package/libsodium/ F: package/php-amqp/ F: package/python-cherrypy/ F: package/sane-backends/ -F: package/ucl/ F: package/upx/ F: package/zxing-cpp/ From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:00 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-gmmlib: bump version to 22.3.1 Message-ID: <20230220205208.5B3138648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7402436bebe225ccc758960dfd822e8afcee9e65 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 490ff46dfc..9491f23680 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c1f33e1519edfc527127baeb0436b783430dfd256c643130169a3a71dc86aff9 intel-gmmlib-22.3.0.tar.gz +sha256 4adcd33a07617e1c95c4bc6d85bac2e3a881ba19ffcca2857da765248295fd2c intel-gmmlib-22.3.1.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index ee5b60ab6b..81c455eafd 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.0 +INTEL_GMMLIB_VERSION = 22.3.1 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Feb 20 20:56:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:01 -0000 Subject: [Buildroot] [git commit branch/next] package/qemu: bump to version 7.2.0 Message-ID: <20230220205217.2D91986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a21d2f356fbcb76dd8f96c8c9476401be104e90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changes log: https://wiki.qemu.org/ChangeLog/7.2 Add host-slirp dependency to provide the network backend 'user' that was included in previous Qemu release by a submodule in Qemu sources [1]. This network backend is currently used by several defconfig that would fail to boot with: "-net user: network backend 'user' is not compiled into this binary" board/mender/x86_64/readme.txt board/pc/readme.txt board/pc/readme.txt board/qemu/arm-versatile/readme.txt board/qemu/arm-vexpress/readme.txt board/qemu/mips32r2-malta/readme.txt board/qemu/mips32r2el-malta/readme.txt board/qemu/mips32r6el-malta/readme.txt board/qemu/ppc-bamboo/readme.txt board/qemu/ppc-e500mc/readme.txt board/qemu/ppc-g3beige/readme.txt board/qemu/ppc-mac99/readme.txt board/qemu/ppc-mpc8544ds/readme.txt board/qemu/ppc64-e5500/readme.txt board/qemu/s390x/readme.txt board/qemu/sh4-r2d/readme.txt board/qemu/sh4eb-r2d/readme.txt board/qemu/sparc-ss10/readme.txt board/qemu/sparc64-sun4u/readme.txt board/qemu/x86/readme.txt board/qemu/x86_64/readme.txt Update the slirp configure option following the slirp submodule removal [2]. Runtime tested in gitlab: https://gitlab.com/kubu93/buildroot/-/pipelines/725509959 Add a backport from upstream, to fix sh4 stability [3]. [1] https://wiki.qemu.org/ChangeLog/7.2#Removal_of_the_.22slirp.22_submodule_.28affects_.22-netdev_user.22.29 [2] https://gitlab.com/qemu-project/qemu/-/commit/5890258aeeba303704ec1adca415e46067800777 [3] https://gitlab.com/kubu93/buildroot/-/jobs/3490258272 Signed-off-by: Romain Naour [yann.morin.1998 at free.fr: backport fix rather than revert faulty commit] Signed-off-by: Yann E. MORIN --- ...4-Mask-restore-of-env-flags-from-tb-flags.patch | 36 ++++++++++++++++++++++ package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 6 ++-- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch b/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch new file mode 100644 index 0000000000..8dc2dd8823 --- /dev/null +++ b/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch @@ -0,0 +1,36 @@ +From bc2331635ce18ff068d2bb1e493bc546e1f786e1 Mon Sep 17 00:00:00 2001 +From: Guenter Roeck +Date: Mon, 12 Dec 2022 09:03:17 -0600 +Subject: [PATCH] target/sh4: Mask restore of env->flags from tb->flags + +The values in env->flags are a subset of tb->flags. +Restore only the bits that belong. + +Cc: qemu-stable at nongnu.org +Fixes: ab419fd8a035 ("target/sh4: Fix TB_FLAG_UNALIGN") +Signed-off-by: Guenter Roeck +Message-ID: <20221212011345.GA2235238 at roeck-us.net> +[rth: Reduce to only the the superh_cpu_synchronize_from_tb change] +Signed-off-by: Richard Henderson +[yann.morin.1998 at free.fr: backport from upstream] +Signed-off-by: Yann E. MORIN +--- + target/sh4/cpu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c +index 951eb6b9c8..f0934b20fa 100644 +--- a/target/sh4/cpu.c ++++ b/target/sh4/cpu.c +@@ -47,7 +47,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, + SuperHCPU *cpu = SUPERH_CPU(cs); + + cpu->env.pc = tb_pc(tb); +- cpu->env.flags = tb->flags; ++ cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK; + } + + static void superh_restore_state_to_opc(CPUState *cs, +-- +2.25.1 + diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 06d090bd1d..e671e1d184 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 a0634e536bded57cf38ec8a751adb124b89c776fe0846f21ab6c6728f1cbbbe6 qemu-7.1.0.tar.xz +sha256 5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157 qemu-7.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index be84452862..8725e7c8c4 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 7.1.0 +QEMU_VERSION = 7.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c @@ -69,7 +69,7 @@ QEMU_OPTS += --enable-vhost-user endif ifeq ($(BR2_PACKAGE_QEMU_SLIRP),y) -QEMU_OPTS += --enable-slirp=system +QEMU_OPTS += --enable-slirp QEMU_DEPENDENCIES += slirp else QEMU_OPTS += --disable-slirp @@ -258,6 +258,7 @@ HOST_QEMU_DEPENDENCIES = \ host-pixman \ host-pkgconf \ host-python3 \ + host-slirp \ host-zlib # BR ARCH qemu @@ -402,6 +403,7 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-vnc-jpeg \ --disable-png \ --disable-vnc-sasl \ + --enable-slirp \ --enable-tools \ $(HOST_QEMU_OPTS) endef From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:01 -0000 Subject: [Buildroot] [git commit branch/next] package/python-orjson: bump to version 3.8.3 Message-ID: <20230220205208.7716C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=681ef0b18c27815b85a2ad4b43c02dede8af06bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-orjson/python-orjson.hash | 2 +- package/python-orjson/python-orjson.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-orjson/python-orjson.hash b/package/python-orjson/python-orjson.hash index 8563ed544f..515590795b 100644 --- a/package/python-orjson/python-orjson.hash +++ b/package/python-orjson/python-orjson.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 dc06889b0ce52d5e96253573f6cbdf5939c5902022cbe2538cedc622e9378372 orjson-3.8.2.tar.gz +sha256 0c8d161dfd8b9e4133beabd81e3e1473c246efe55abec571845f72a2ba7b74e4 orjson-3.8.3.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/python-orjson/python-orjson.mk b/package/python-orjson/python-orjson.mk index b18a5cdada..bda0a8ab48 100644 --- a/package/python-orjson/python-orjson.mk +++ b/package/python-orjson/python-orjson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ORJSON_VERSION = 3.8.2 +PYTHON_ORJSON_VERSION = 3.8.3 PYTHON_ORJSON_SOURCE = orjson-$(PYTHON_ORJSON_VERSION).tar.gz -PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/13/08/d476fff015ccc0f043d3df6332c807695ae3d6abc1758b24f3d335750550 +PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/1c/b9/a0b4fb195ded02820e0a933ffe28b782b7e5ef7a4f8c1e1c742d619548e4 PYTHON_ORJSON_SETUP_TYPE = pep517 PYTHON_ORJSON_LICENSE = Apache-2.0 or MIT PYTHON_ORJSON_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:02 -0000 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.0 Message-ID: <20230220205208.6A651828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4a1183d8f7d8422dbc23432248b984745a428b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Removed xmvc support due to upstream removal: https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=22.3&id=8cc766d8f7eac26b7c029a2fac1bdfdba4776c29 Removed comment concerning gallium-xlib due to upstream removal: https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=22.3&id=5bed3d4ad659c30cb0ef4b40172f1aab877ccc98 Rebased patch 0004 due to upstream commit: https://cgit.freedesktop.org/mesa/mesa/commit/src/util/macros.h?h=22.3&id=c0b891ecca2b92c9ef2945440c77f45345df3290 Please note that patch 0004 can be removed when buildroot toolchains are updated to uClibc 1.0.42: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?h=v1.0.42&id=03fbd941e943976bb92cb392882c2ff7ec218704 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ++++++ package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/0004-Fix-uClibc-build.patch | 4 ++-- package/mesa3d/Config.in | 18 ------------------ package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 10 +--------- 6 files changed, 13 insertions(+), 33 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index cb0176a31c..9136ccd0e0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_MESA3D_XVMC + bool "mesa Gallium XvMC state tracker removed" + select BR2_LEGACY + help + The Gallium XvMC state tracker was removed upstream. + config BR2_KERNEL_HEADERS_5_19 bool "kernel headers version 5.19.x are no longer supported" select BR2_LEGACY diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 3712c79db0..d33d492ba7 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 = 22.2.2 +MESA3D_HEADERS_VERSION = 22.3.0 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/0004-Fix-uClibc-build.patch b/package/mesa3d/0004-Fix-uClibc-build.patch index c8c82fe0dc..95ca95fd67 100644 --- a/package/mesa3d/0004-Fix-uClibc-build.patch +++ b/package/mesa3d/0004-Fix-uClibc-build.patch @@ -58,9 +58,9 @@ index 22b18303826..8f73ee72693 100644 --- a/src/util/macros.h +++ b/src/util/macros.h @@ -27,6 +27,7 @@ - #include - #include + #include #include + #include +#include "util/compiler.h" /* Compute the size of an array */ diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 40f7009492..cae2161aa3 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -299,24 +299,6 @@ comment "Gallium VDPAU state tracker needs X.org and gallium drivers r300, r600, || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \ || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) -config BR2_PACKAGE_MESA3D_XVMC - bool "Gallium XvMC state tracker" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ - || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 - select BR2_PACKAGE_MESA3D_NEEDS_X11 - select BR2_PACKAGE_XLIB_LIBXV - select BR2_PACKAGE_XLIB_LIBXVMC - help - XvMC state tracker (needs r600 or nouveau gallium drivers). - -comment "Gallium XvMC state tracker needs X.org and gallium drivers r600 or nouveau" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_PACKAGE_XORG7 || \ - !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ - || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) - comment "Vulkan drivers" config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index f10f8fe112..77223676ea 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-October/000689.html -sha256 2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9 mesa-22.2.2.tar.xz -sha512 a1eb67e1ae4880c79b1fdc570f4389baba0b8ba796da7e695c9af19a7d92b6c06b95570e6c796548b61355989025fb7efbf9acac74cbd695f7e297dc913b933c mesa-22.2.2.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-November/000695.html +sha256 644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746 mesa-22.3.0.tar.xz +sha512 bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da mesa-22.3.0.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index bac071ecb3..c3bd44c2fa 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 = 22.2.2 +MESA3D_VERSION = 22.3.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos @@ -77,7 +77,6 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # glx: # dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi # xlib : xlib conflicts with any dri driver -# gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. # Always enable glx-direct; without it, many GLX applications don't work. MESA3D_CONF_OPTS += \ -Dglx=dri \ @@ -212,13 +211,6 @@ else MESA3D_CONF_OPTS += -Dgles1=disabled -Dgles2=disabled endif -ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) -MESA3D_DEPENDENCIES += xlib_libXv xlib_libXvMC -MESA3D_CONF_OPTS += -Dgallium-xvmc=enabled -else -MESA3D_CONF_OPTS += -Dgallium-xvmc=disabled -endif - ifeq ($(BR2_PACKAGE_VALGRIND),y) MESA3D_CONF_OPTS += -Dvalgrind=enabled MESA3D_DEPENDENCIES += valgrind From thomas.petazzoni at bootlin.com Mon Feb 20 20:53:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:53:29 -0000 Subject: [Buildroot] [git commit branch/next] package/python-scipy: fix sh4 build Message-ID: <20230220205155.62B6E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bdc9f8a247309f1bf007a77576480091d20e2d1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following sh4 build failure raised since the addition of the package in commit e10431db29e08c3ae56c145165bf110bd17f2a6c: INFO: sh4aeb-linux-gcc: scipy/special/_test_round.c scipy/special/_test_round.c: In function '__pyx_pf_5scipy_7special_11_test_round_have_fenv': scipy/special/_test_round.c:2353:30: error: 'FE_UPWARD' undeclared (first use in this function) 2353 | __pyx_t_1 = ((fesetround(FE_UPWARD) != 0) != 0); | ^~~~~~~~~ Retrieve debian patch as upstream doesn't want to fix this SH4 specific issue: https://github.com/scipy/scipy/issues/15584 Fixes: - http://autobuild.buildroot.org/results/b82d8ed02ba5d094a0d4054e0de28e95c9d3554d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-scipy/0001-build-sh4-FE.patch | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/python-scipy/0001-build-sh4-FE.patch b/package/python-scipy/0001-build-sh4-FE.patch new file mode 100644 index 0000000000..d50dd84462 --- /dev/null +++ b/package/python-scipy/0001-build-sh4-FE.patch @@ -0,0 +1,36 @@ +From aae8b63ddffe014e9353c3e8d2604628433eb7d7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 4 Dec 2022 14:14:21 +0100 +Subject: [PATCH] build sh4 FE + +ensures FE_UPWARD and FE_DOWNWARD are defined for sh4 architecture. + +Closes: #1007769. + +[Retrieved from: +https://salsa.debian.org/python-team/packages/scipy/-/blob/master/debian/patches/build_sh4_FE.patch] +Signed-off-by: Fabrice Fontaine +--- + scipy/special/_round.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/scipy/special/_round.h b/scipy/special/_round.h +index 013a25620..c321a1939 100644 +--- a/scipy/special/_round.h ++++ b/scipy/special/_round.h +@@ -69,5 +69,12 @@ int fegetround() + + #endif + ++/* SH4 is not C99 compliant, see https://github.com/scipy/scipy/issues/15584 */ ++#ifndef FE_UPWARD ++#define FE_UPWARD -1 ++#endif ++#ifndef FE_DOWNWARD ++#define FE_DOWNWARD -1 ++#endif + + #endif /* _round.h */ +-- +2.38.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:53:29 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:29 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXrender: bump version to 0.9.11 Message-ID: <20230220205158.350BD86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c93b50a34a3f46c27fd21c72332c7fde18e0a3f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003239.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXrender/xlib_libXrender.hash | 6 +++--- package/x11r7/xlib_libXrender/xlib_libXrender.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.hash b/package/x11r7/xlib_libXrender/xlib_libXrender.hash index 680c765237..015fa0af21 100644 --- a/package/x11r7/xlib_libXrender/xlib_libXrender.hash +++ b/package/x11r7/xlib_libXrender/xlib_libXrender.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002725.html -sha256 c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949 libXrender-0.9.10.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-October/003239.html +sha256 bc53759a3a83d1ff702fb59641b3d2f7c56e05051fa0cfa93501166fa782dc24 libXrender-0.9.11.tar.xz +sha512 2327cc1b530382d81df29b8d579f801f1f990202107cc84506986bcf5d15010d414e9418987b200e3f222d188afce46f0d7754febcdca62a5fc1e541b3bb82de libXrender-0.9.11.tar.xz # Locally calculated sha256 bbe1db89c48816c48248796adac91defd8fbde1141b145f01511781ab87f29a1 COPYING diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk index 0ef0ec48d9..fd97c83cf6 100644 --- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk +++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXRENDER_VERSION = 0.9.10 -XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2 -XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXRENDER_VERSION = 0.9.11 +XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.xz +XLIB_LIBXRENDER_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXRENDER_LICENSE = MIT XLIB_LIBXRENDER_LICENSE_FILES = COPYING XLIB_LIBXRENDER_CPE_ID_VENDOR = x.org From yann.morin.1998 at free.fr Mon Feb 20 20:53:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:30 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Jesse for the qt6 package Message-ID: <20230220205155.92A96828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34c7b86224556822ce1003b639f98bf87d7496b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 8bcce1fd37..4f862befb0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1468,7 +1468,7 @@ F: package/x11r7/xdriver_xf86-video-imx/ F: package/x11r7/xdriver_xf86-video-imx-viv/ N: Jesse Van Gavere -F: package/qt6/qt6serialport/ +F: package/qt6/ N: Jianhui Zhao F: package/libuhttpd/ From yann.morin.1998 at free.fr Mon Feb 20 20:53:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:30 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xcb-util-cursor: bump version to 0.1.4 Message-ID: <20230220205158.7A11186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6111bac9e5d2f1cea5db127ad59f2379f86b90fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003230.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xcb-util-cursor/xcb-util-cursor.hash | 5 +++-- package/x11r7/xcb-util-cursor/xcb-util-cursor.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash b/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash index 14cea17138..ca316d3ce8 100644 --- a/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash +++ b/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-May/002691.html -sha1 26562eb6d4151307f7b6a53453d360ecfc0563ac xcb-util-cursor-0.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003230.html +sha256 28dcfe90bcab7b3561abe0dd58eb6832aa9cc77cfe42fcdfa4ebe20d605231fb xcb-util-cursor-0.1.4.tar.xz +sha512 d27dd59a4d7ded9994dca77774421dd9533e3ee823b880af35d3219bd7340c89fbc61d1d0fa10e2991de2cac9e6395e09497769d7b8728eedc691e76649107b1 xcb-util-cursor-0.1.4.tar.xz # Locally computed sha256 0dde91ae1d443105dc9e13cbaed6674c36683b7095836ad9ddfce26be270aad5 COPYING diff --git a/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk b/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk index 07b37c5e47..0fb131693b 100644 --- a/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk +++ b/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_CURSOR_VERSION = 0.1.3 -XCB_UTIL_CURSOR_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_CURSOR_SOURCE = xcb-util-cursor-$(XCB_UTIL_CURSOR_VERSION).tar.bz2 +XCB_UTIL_CURSOR_VERSION = 0.1.4 +XCB_UTIL_CURSOR_SITE = https://xorg.freedesktop.org/archive/individual/lib +XCB_UTIL_CURSOR_SOURCE = xcb-util-cursor-$(XCB_UTIL_CURSOR_VERSION).tar.xz XCB_UTIL_CURSOR_LICENSE = MIT XCB_UTIL_CURSOR_LICENSE_FILES = COPYING XCB_UTIL_CURSOR_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:53:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:31 -0000 Subject: [Buildroot] [git commit branch/next] package/python3: fix CVE-2022-37454 Message-ID: <20230220205155.407C08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92d96e8513c75a8ab496c90841920e896085915f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The Keccak XKCP SHA-3 reference implementation before fdc6fef has an integer overflow and resultant buffer overflow that allows attackers to execute arbitrary code or eliminate expected cryptographic properties. This occurs in the sponge function interface. Python 3.11 and later switched to using tiny_sha3 in GH-32060, so they should not be affected. https://github.com/python/cpython/issues/98517 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...8517-Fix-buffer-overflows-in-_sha3-module.patch | 101 +++++++++++++++++++++ package/python3/python3.mk | 3 + 2 files changed, 104 insertions(+) diff --git a/package/python3/0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch b/package/python3/0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch new file mode 100644 index 0000000000..5c50dd16cb --- /dev/null +++ b/package/python3/0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch @@ -0,0 +1,101 @@ +From 0e4e058602d93b88256ff90bbef501ba20be9dd3 Mon Sep 17 00:00:00 2001 +From: Theo Buehler +Date: Fri, 21 Oct 2022 21:26:01 +0200 +Subject: [PATCH] [3.10] gh-98517: Fix buffer overflows in _sha3 module + (#98519) + +This is a port of the applicable part of XKCP's fix [1] for +CVE-2022-37454 and avoids the segmentation fault and the infinite +loop in the test cases published in [2]. + +[1]: https://github.com/XKCP/XKCP/commit/fdc6fef075f4e81d6b1bc38364248975e08e340a +[2]: https://mouha.be/sha-3-buffer-overflow/ + +Regression test added by: Gregory P. Smith [Google LLC] + +[Retrieved from: +https://github.com/python/cpython/commit/0e4e058602d93b88256ff90bbef501ba20be9dd3] +Signed-off-by: Fabrice Fontaine +--- + Lib/test/test_hashlib.py | 9 +++++++++ + .../2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst | 1 + + Modules/_sha3/kcp/KeccakSponge.inc | 15 ++++++++------- + 3 files changed, 18 insertions(+), 7 deletions(-) + create mode 100644 Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst + +diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py +index 535f4aa3e04c..9aa6c1f0a3b6 100644 +--- a/Lib/test/test_hashlib.py ++++ b/Lib/test/test_hashlib.py +@@ -495,6 +495,15 @@ def test_case_md5_huge(self, size): + def test_case_md5_uintmax(self, size): + self.check('md5', b'A'*size, '28138d306ff1b8281f1a9067e1a1a2b3') + ++ @unittest.skipIf(sys.maxsize < _4G - 1, 'test cannot run on 32-bit systems') ++ @bigmemtest(size=_4G - 1, memuse=1, dry_run=False) ++ def test_sha3_update_overflow(self, size): ++ """Regression test for gh-98517 CVE-2022-37454.""" ++ h = hashlib.sha3_224() ++ h.update(b'\x01') ++ h.update(b'\x01'*0xffff_ffff) ++ self.assertEqual(h.hexdigest(), '80762e8ce6700f114fec0f621fd97c4b9c00147fa052215294cceeed') ++ + # use the three examples from Federal Information Processing Standards + # Publication 180-1, Secure Hash Standard, 1995 April 17 + # http://www.itl.nist.gov/div897/pubs/fip180-1.htm +diff --git a/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst b/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst +new file mode 100644 +index 000000000000..2d23a6ad93c7 +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst +@@ -0,0 +1 @@ ++Port XKCP's fix for the buffer overflows in SHA-3 (CVE-2022-37454). +diff --git a/Modules/_sha3/kcp/KeccakSponge.inc b/Modules/_sha3/kcp/KeccakSponge.inc +index e10739deafa8..cf92e4db4d36 100644 +--- a/Modules/_sha3/kcp/KeccakSponge.inc ++++ b/Modules/_sha3/kcp/KeccakSponge.inc +@@ -171,7 +171,7 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat + i = 0; + curData = data; + while(i < dataByteLen) { +- if ((instance->byteIOIndex == 0) && (dataByteLen >= (i + rateInBytes))) { ++ if ((instance->byteIOIndex == 0) && (dataByteLen-i >= rateInBytes)) { + #ifdef SnP_FastLoop_Absorb + /* processing full blocks first */ + +@@ -199,10 +199,10 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat + } + else { + /* normal lane: using the message queue */ +- +- partialBlock = (unsigned int)(dataByteLen - i); +- if (partialBlock+instance->byteIOIndex > rateInBytes) ++ if (dataByteLen-i > rateInBytes-instance->byteIOIndex) + partialBlock = rateInBytes-instance->byteIOIndex; ++ else ++ partialBlock = (unsigned int)(dataByteLen - i); + #ifdef KeccakReference + displayBytes(1, "Block to be absorbed (part)", curData, partialBlock); + #endif +@@ -281,7 +281,7 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte + i = 0; + curData = data; + while(i < dataByteLen) { +- if ((instance->byteIOIndex == rateInBytes) && (dataByteLen >= (i + rateInBytes))) { ++ if ((instance->byteIOIndex == rateInBytes) && (dataByteLen-i >= rateInBytes)) { + for(j=dataByteLen-i; j>=rateInBytes; j-=rateInBytes) { + SnP_Permute(instance->state); + SnP_ExtractBytes(instance->state, curData, 0, rateInBytes); +@@ -299,9 +299,10 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte + SnP_Permute(instance->state); + instance->byteIOIndex = 0; + } +- partialBlock = (unsigned int)(dataByteLen - i); +- if (partialBlock+instance->byteIOIndex > rateInBytes) ++ if (dataByteLen-i > rateInBytes-instance->byteIOIndex) + partialBlock = rateInBytes-instance->byteIOIndex; ++ else ++ partialBlock = (unsigned int)(dataByteLen - i); + i += partialBlock; + + SnP_ExtractBytes(instance->state, curData, instance->byteIOIndex, partialBlock); diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 2e17104102..b291fcf582 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -16,6 +16,9 @@ PYTHON3_CPE_ID_PRODUCT = python # 0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch PYTHON3_IGNORE_CVES += CVE-2022-45061 +# 0034-3-10-gh-98517-Fix-buffer-overflows-in-_sha3-module.patch +PYTHON3_IGNORE_CVES += CVE-2022-37454 + # This host Python is installed in $(HOST_DIR), as it is needed when # cross-compiling third-party Python modules. From yann.morin.1998 at free.fr Mon Feb 20 20:53:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:31 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xgc: bump version to 1.0.6 Message-ID: <20230220205158.A738586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef8faec32df85cf6172a9e26f68d6c6f704265e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003221.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xgc/xapp_xgc.hash | 5 +++-- package/x11r7/xapp_xgc/xapp_xgc.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xgc/xapp_xgc.hash b/package/x11r7/xapp_xgc/xapp_xgc.hash index 50e1362b64..7664e31186 100644 --- a/package/x11r7/xapp_xgc/xapp_xgc.hash +++ b/package/x11r7/xapp_xgc/xapp_xgc.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002575.html -sha256 14828d9bda358ad57efc0206bc416ee33ba542091edb186485cca5389adc2f5e xgc-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003221.html +sha256 7b87bbdbce4ec858738a3b81b8a3943aff01036001e2a1d00bb5384392a8b240 xgc-1.0.6.tar.xz +sha512 f449b9b2d313aeba1fe9bf33fef90291776403f1fdf4afc507c4b973045c97fc8ded65ddec4f8c58727e7e4c7c4ad6a65ae79581eb4bdfe9c79a5f909dbc0a1f xgc-1.0.6.tar.xz # Locally computed sha256 13ebeb3e59e406064d46e94a707ed5ec5d8d2bf840971265dd46db0850d22d02 COPYING diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk index 41d42c461e..fc055f57dd 100644 --- a/package/x11r7/xapp_xgc/xapp_xgc.mk +++ b/package/x11r7/xapp_xgc/xapp_xgc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XGC_VERSION = 1.0.5 -XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.bz2 -XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XGC_VERSION = 1.0.6 +XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.xz +XAPP_XGC_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XGC_LICENSE = MIT XAPP_XGC_LICENSE_FILES = COPYING XAPP_XGC_DEPENDENCIES = xlib_libXaw From yann.morin.1998 at free.fr Mon Feb 20 20:53:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:32 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xkbprint: bump version to 1.0.6 Message-ID: <20230220205158.9C52686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd1c370ad7567fc38732d28cb52d66bc5dbb22fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003222.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xkbprint/xapp_xkbprint.hash | 8 +++----- package/x11r7/xapp_xkbprint/xapp_xkbprint.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash b/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash index 69a80576c4..8ca7656b5c 100644 --- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash +++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-November/003030.html -md5 9c34da77363dc3d0f616980da87244bf xkbprint-1.0.5.tar.bz2 -sha1 e707caffb3c680b3a869a776aa3f80caeac9e9c3 xkbprint-1.0.5.tar.bz2 -sha256 5b58fe834f0822f06d63d283fac404098c6d3f6acce61888b81016f1c41023fa xkbprint-1.0.5.tar.bz2 -sha512 ac3870352f3a595b5b8a8cb64f39e9bea81b17572c73cfbf72482477a2f576d0ffcdcf735cb3c66b8a88a7fe0f7aece6738cbac87df5641e44fae1ab9b97111f xkbprint-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003222.html +sha256 99cc9404f7b90289ae04944c0d98a208cc8b158492ad6481386e31d4d09aa7b0 xkbprint-1.0.6.tar.xz +sha512 a1c2401b2a2ef4c6bd2efc18923ecb176adcf38b6c5dfdce25f22f1f5ab21e25f494b25dac25b1765fb9a0f6acc24d191cd41b9a098a9e3c6eaf9a9df490be29 xkbprint-1.0.6.tar.xz # Locally computed sha256 79b32f28f7f5063054a564e1fdeee56f82a525b6516303704a1f70e55fe7197e COPYING diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk index 8643cb4276..f374c18dae 100644 --- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk +++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XKBPRINT_VERSION = 1.0.5 -XAPP_XKBPRINT_SOURCE = xkbprint-$(XAPP_XKBPRINT_VERSION).tar.bz2 -XAPP_XKBPRINT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XKBPRINT_VERSION = 1.0.6 +XAPP_XKBPRINT_SOURCE = xkbprint-$(XAPP_XKBPRINT_VERSION).tar.xz +XAPP_XKBPRINT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XKBPRINT_LICENSE = MIT XAPP_XKBPRINT_LICENSE_FILES = COPYING XAPP_XKBPRINT_DEPENDENCIES = xlib_libxkbfile From yann.morin.1998 at free.fr Mon Feb 20 20:53:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:32 -0000 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: fix license Message-ID: <20230220205155.751158648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d37b3f384c3c783dfdd786062847f621e52b069b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 343974b99528702842e8c1dad945fcd4f0defd6c forgot to change the licensing information which has been updated with https://code.qt.io/cgit/qt/qtbase.git/commit/?id=05fc3aef53348fb58be6308076e000825b704e58 resulting in the following build failure: ERROR: LICENSE.GPL2 has wrong sha256 hash: ERROR: expected: 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 ERROR: got : Fixes: - http://autobuild.buildroot.org/results/bf20b7457349f1bb7a82d471ad2c9e4307ac540c Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: - one-item per line, both for _LICENSE and _LICENSE_FILES - fix check-package ] Signed-off-by: Yann E. MORIN --- package/qt6/qt6base/qt6base.hash | 14 +++++++++----- package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++-- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 5dd26973fa..6544a371c6 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -2,8 +2,12 @@ sha256 cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d qtbase-everywhere-src-6.4.0.tar.xz # Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSE.FDL +sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 3abd6471b9a9a08d65ce771143f8e278bb4c1aeb10c1c2d476935a6b049653f5 LICENSES/BSL-1.0.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 d040359701c01996a017d5c515678929cd1b0625e64cb86db44025fbb6cdf1fc LICENSES/MIT.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index b7ee6037f3..2f159f380b 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -7,8 +7,27 @@ QT6BASE_VERSION = $(QT6_VERSION) QT6BASE_SITE = $(QT6_SITE) QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz -QT6BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) -QT6BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL + +QT6BASE_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0 with exception (tools), \ + GFDL-1.3 (docs), \ + Apache-2.0, \ + BSD-3-Clause, \ + BSL-1.0, \ + MIT + +QT6BASE_LICENSE_FILES = \ + LICENSES/Apache-2.0.txt \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/BSL-1.0.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/MIT.txt \ + LICENSES/Qt-GPL-exception-1.0.txt + QT6BASE_DEPENDENCIES = \ host-ninja \ host-qt6base \ From yann.morin.1998 at free.fr Mon Feb 20 20:53:33 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:33 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xditview: bump version to 1.0.6 Message-ID: <20230220205158.B283886496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f18b8dcb4e622f973d73332732d3dd6f548d3a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003220.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xditview/xapp_xditview.hash | 8 +++----- package/x11r7/xapp_xditview/xapp_xditview.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xditview/xapp_xditview.hash b/package/x11r7/xapp_xditview/xapp_xditview.hash index 4586c0b5a4..dbaf5e42b7 100644 --- a/package/x11r7/xapp_xditview/xapp_xditview.hash +++ b/package/x11r7/xapp_xditview/xapp_xditview.hash @@ -1,7 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002570.html -md5 3a909116a3b2abe3845215cf49e09fa5 xditview-1.0.5.tar.bz2 -sha1 f06f65bca31168c86bcebd7f92dbbda08817a5cc xditview-1.0.5.tar.bz2 -sha256 eecb1ed51ab4edc7f454476d1248cfb7799a17c5679b3dd834e8b4658331c04b xditview-1.0.5.tar.bz2 -sha512 e20c903f38394b496111267e142d84d11e69a3b89f91869652d1f2ee5c997a13f90bfa2966651b42cd3979a330b348a6e397cc6a74c45b1f3f91643e7c06765d xditview-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003220.html +sha256 517700df205d4fdf65db182698157c959f1e7c10597670a7f45b1fcb2319819f xditview-1.0.6.tar.xz +sha512 249769d27980e9a69ac8f056f329dfa514f3ab6267d6ed69814c5695f315d2a7021c560a0e26fdd2568290a071793d7f2eafdd92f9981ed556047deb244ebf5a xditview-1.0.6.tar.xz # Locally computed sha256 023d879308a49249181f78bbb567e93c45138ad847fe969d191e4802e7a1a005 COPYING diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk index 388710034c..8655bd3e92 100644 --- a/package/x11r7/xapp_xditview/xapp_xditview.mk +++ b/package/x11r7/xapp_xditview/xapp_xditview.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDITVIEW_VERSION = 1.0.5 -XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.bz2 -XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDITVIEW_VERSION = 1.0.6 +XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.xz +XAPP_XDITVIEW_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDITVIEW_LICENSE = MIT XAPP_XDITVIEW_LICENSE_FILES = COPYING XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw From peter at korsgaard.com Mon Feb 20 20:53:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:33 -0000 Subject: [Buildroot] [git commit branch/next] utils/genrandconfig: add mxs-bootlets board handling Message-ID: <20230220205155.9CCD58648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c1f67428af623b39312270a490dfc9a6d647773 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add a custom case to make sure that a random configuration with an empty board for mxs-bootlets doesn't fail. It reverts to BR2_TARGET_MXS_BOOTLETS_STMP37xx in that case. >>> mxs-bootlets 10.12.01 Building BOARD= CROSS_COMPILE="/home/thomas/autobuild/instance-1/output-1/per-package/mxs-bootlets/host/bin/arm-buildroot-linux-uclibcgnueabi-" /usr/bin/make -j1 -C /home/thomas/autobuild/instance-1/output-1/build/mxs-bootlets-10.12.01 power_prep /home/thomas/autobuild/instance-1/output-1/per-package/xinetd/host/bin/arm-buildroot-linux-uclibcgnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -static -DNO_RPC -I../../include -c -o inet_aton.o inet_aton.c make[1]: Entering directory '/home/thomas/autobuild/instance-1/buildroot' make[1]: warning: -j1 forced in submake: resetting jobserver mode. build power_prep /usr/bin/make -C power_prep ARCH= BOARD= make[2]: Entering directory '/home/thomas/autobuild/instance-1/output-1/build/mxs-bootlets-10.12.01/power_prep' /usr/bin/make -C ./../mach-/hw make[3]: Entering directory '/home/thomas/autobuild/instance-1/output-1/build/mxs-bootlets-10.12.01/power_prep' make[3]: *** ../mach-/hw: No such file or directory. Stop. Fixes: - http://autobuild.buildroot.org/results/44a2efc64b9b8ff4541430d6b649e7a11a4e4873 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index eccd3a228e..b4ebb9a9be 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -559,6 +559,13 @@ def fixup_config(sysinfo, configfile): if 'BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT=y\n' in configlines: return False + if 'BR2_TARGET_MXS_BOOTLETS=y\n' in configlines and \ + 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD=y\n' in configlines and \ + 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD_NAME=""\n' in configlines: + configlines.remove('BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD=y\n') + configlines.append('BR2_TARGET_MXS_BOOTLETS_STMP37xx=y\n') + configlines.remove('BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD_NAME=""\n') + if 'BR2_TARGET_MXS_BOOTLETS=y\n' in configlines and \ 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT=y\n' in configlines and \ 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_URL=""\n' in configlines: From yann.morin.1998 at free.fr Mon Feb 20 20:53:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:34 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-input-vmmouse: bump version to 13.2.0 Message-ID: <20230220205158.D28EC86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e17f3076021efbd9ed699d78dc252aa0bf629922 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-October/003217.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash | 5 +++-- .../x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash index fd6221fa23..2a221a4c12 100644 --- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash +++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-June/002616.html -sha256 0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319 xf86-input-vmmouse-13.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003217.html +sha256 56f077580ab8f02e2f40358c5c46b0ae3e1828fc77744526b24adf1ceea339b8 xf86-input-vmmouse-13.2.0.tar.xz +sha512 26a01347a679db058abdc7cbd9a363bb4fccd1a727dc18e279d15b8a0dce71f67af5ff54df28b908391da8d2fc311d8c1813f26dcded4e9a2668db7b55ca5687 xf86-input-vmmouse-13.2.0.tar.xz # Locally calculated sha256 804737a1582428fdde4e2bfd1e9f3ca07971fc3bdce20ba2d06cc2bba6c84a9e COPYING diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk index b8c77de5f6..178e1344b2 100644 --- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk +++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 13.1.0 -XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 13.2.0 +XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.xz +XDRIVER_XF86_INPUT_VMMOUSE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_VMMOUSE_LICENSE = MIT XDRIVER_XF86_INPUT_VMMOUSE_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xorgproto From peter at korsgaard.com Mon Feb 20 20:53:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:53:34 -0000 Subject: [Buildroot] [git commit branch/next] docs/website/news.html: add 2022.11 announcement link Message-ID: <20230220205155.CB1F18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=45c6747faed26a92b142b19a00062032c5c0f542 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 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 9be00982cb..8f7e22a0b9 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

              The stable 2022.11 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.11 release.

              From yann.morin.1998 at free.fr Mon Feb 20 20:53:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:48 -0000 Subject: [Buildroot] [git commit branch/next] package/gqrx: fix dependencies Message-ID: <20230220205200.9E3C386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ec2adee4efb96787cf702f418d09b45cb686482 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 34cea39024bf8dedaa071bc5f2d903755501215c forgot to update gnuradio dependencies Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/gqrx/Config.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in index adcdbb0896..442b28e546 100644 --- a/package/gqrx/Config.in +++ b/package/gqrx/Config.in @@ -1,15 +1,16 @@ -comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library" +comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8" depends on BR2_USE_MMU # gnuradio depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || BR2_STATIC_LIBS + !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 comment "gqrx needs qt5" depends on !BR2_PACKAGE_QT5 -comment "gqrx needs a toolchain not affected by GCC bug 43744 and 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 || BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +comment "gqrx needs a toolchain not affected by GCC bug 43744" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 config BR2_PACKAGE_GQRX bool "gqrx" @@ -21,8 +22,8 @@ config BR2_PACKAGE_GQRX depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_QT5 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # gnuradio -> boost-atomic + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # gnuradio depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744 # gnuradio - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # gnuradio select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS select BR2_PACKAGE_BOOST_SYSTEM From yann.morin.1998 at free.fr Mon Feb 20 20:53:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:48 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xinit: bump version to 1.4.2 Message-ID: <20230220205157.2C1628648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f15b22fdd55611f0a1b64cb8a430df3c6385e11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003268.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xinit/xapp_xinit.hash | 8 +++----- package/x11r7/xapp_xinit/xapp_xinit.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xinit/xapp_xinit.hash b/package/x11r7/xapp_xinit/xapp_xinit.hash index 49c8099467..4b7d8feb5d 100644 --- a/package/x11r7/xapp_xinit/xapp_xinit.hash +++ b/package/x11r7/xapp_xinit/xapp_xinit.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002962.html -md5 6d506ab2efc17a08e87778654e099d37 xinit-1.4.1.tar.bz2 -sha1 d874a2eecf2c30291e327851b151fdab8183260c xinit-1.4.1.tar.bz2 -sha256 de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9 xinit-1.4.1.tar.bz2 -sha512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340 xinit-1.4.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003268.html +sha256 b7d8dc8d22ef9f15985a10b606ee4f2aad6828befa437359934647e88d331f23 xinit-1.4.2.tar.xz +sha512 4b62c2edd97b40133577cbba88b3f31b36c5634b4eb667ef0c302e8358dc1c55a255abe42aaadc910d8aa9ea0e3add157a12a301382f1cdbe091df4e1215fae0 xinit-1.4.2.tar.xz # Locally computed sha256 c47001aa217d4ae7787121d80634db4bdba564e49a0ecab8d48b1bdc4edee1c7 COPYING diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk index 86a4d92674..795a1b541b 100644 --- a/package/x11r7/xapp_xinit/xapp_xinit.mk +++ b/package/x11r7/xapp_xinit/xapp_xinit.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XINIT_VERSION = 1.4.1 -XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2 -XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XINIT_VERSION = 1.4.2 +XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.xz +XAPP_XINIT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11 XAPP_XINIT_LICENSE = MIT XAPP_XINIT_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:49 -0000 Subject: [Buildroot] [git commit branch/next] package/{, python-py}mupdf: bump to version 1.21.0 Message-ID: <20230220205200.93D5C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c2033cd2ace077e7dfaf58a2589b2a93a5fd7b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: squash the two bumps together] Signed-off-by: Yann E. MORIN --- package/mupdf/mupdf.hash | 4 ++-- package/mupdf/mupdf.mk | 2 +- package/python-pymupdf/python-pymupdf.hash | 4 ++-- package/python-pymupdf/python-pymupdf.mk | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mupdf/mupdf.hash b/package/mupdf/mupdf.hash index fa24e741c7..6785aa163a 100644 --- a/package/mupdf/mupdf.hash +++ b/package/mupdf/mupdf.hash @@ -1,8 +1,8 @@ # From https://mupdf.com/downloads/index.html: -sha1 f27108668e876b47d7438e2a8b2295654e66f42d mupdf-1.20.3-source.tar.lz +sha1 27d75cae256450abb9f50cd00b3e5a895fc684cf mupdf-1.21.0-source.tar.lz # Locally computed: -sha256 6f73f63ef8aa81991dfd023d4426a548827d1d74e0bfcf2a013acad63b651868 mupdf-1.20.3-source.tar.lz +sha256 f23fc1ad9081375d9c5f2318d6e6e5c5be490ecb70b10ed7167932afbe1ccfb5 mupdf-1.21.0-source.tar.lz # Hash for license files: sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 1fc54b2d35..e93a41bd00 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -5,7 +5,7 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -MUPDF_VERSION = 1.20.3 +MUPDF_VERSION = 1.21.0 MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.lz MUPDF_SITE = https://mupdf.com/downloads/archive MUPDF_LICENSE = AGPL-3.0+ diff --git a/package/python-pymupdf/python-pymupdf.hash b/package/python-pymupdf/python-pymupdf.hash index 21befb3b7c..d930d04335 100644 --- a/package/python-pymupdf/python-pymupdf.hash +++ b/package/python-pymupdf/python-pymupdf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymupdf/json -md5 450f0c613fec4b0d061299d3d935fafa PyMuPDF-1.20.2.tar.gz -sha256 02eedf01f57c6bafb5e8667cea0088a2d2522643c47100f1908bec3a68a84888 PyMuPDF-1.20.2.tar.gz +md5 ae24d77d44369e46bbcd5457fe97d776 PyMuPDF-1.21.0.tar.gz +sha256 a63dfc289e127a16ab60310ee6005fe83121c7a97f7c120db688f9281c9e5d0f PyMuPDF-1.21.0.tar.gz # Locally computed sha256 checksums sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index 238fc4dd47..38212dc44b 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -5,9 +5,9 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -PYTHON_PYMUPDF_VERSION = 1.20.2 +PYTHON_PYMUPDF_VERSION = 1.21.0 PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz -PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/4a/09/6afe87a8ea7acb6e4709223a704270ffe9929497add4d06b12305e229ba8 +PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/61/14/632eefe5568ee7a4ec95aa7fc9c63996ff6a6d2464d4e3a9dc35da11a409 PYTHON_PYMUPDF_SETUP_TYPE = setuptools PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:53:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:53:49 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xfd: bump version to 1.1.4 Message-ID: <20230220205157.4293B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e708680a43bdd4bc6cb5b84544a98bc27ccc8d55 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://lists.x.org/archives/xorg-announce/2022-December/003266.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xfd/xapp_xfd.hash | 8 +++----- package/x11r7/xapp_xfd/xapp_xfd.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xfd/xapp_xfd.hash b/package/x11r7/xapp_xfd/xapp_xfd.hash index ec85170180..5965958828 100644 --- a/package/x11r7/xapp_xfd/xapp_xfd.hash +++ b/package/x11r7/xapp_xfd/xapp_xfd.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002968.html -md5 f9c9f2b101a96d4b50c2a4ab9b5ab5b1 xfd-1.1.3.tar.bz2 -sha1 ca6dbe2027b205992a52c6bb717a43508f12a8c4 xfd-1.1.3.tar.bz2 -sha256 192f938ba5830e84cc807d8ead2ad9655b43eaed6500c830f3e083aad10ed958 xfd-1.1.3.tar.bz2 -sha512 68e2d4ce5e24215353b6f3231191d69639c4dd90a703e03ccf152bbfe4012da071c387ba289f918fb0336a3be9ee49dc05cbec7273fa85f5e476ead7e10795f0 xfd-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003266.html +sha256 d5470ffb66fd45a1e1b03d6df01f12d4caf0cf675cde0345cda237243e9076fd xfd-1.1.4.tar.xz +sha512 fa1f8a7b5d89be20fb2b1e3e0e8f4d7f9463e91fd385d21e1403a398c2e263112043b568417c420c5ee33bec60e06658498dd55df6d7ac19da3af0844f932209 xfd-1.1.4.tar.xz # Locally computed sha256 57ae10f24fc110dafb3b8d7735cf26b1905ff74e716745b2520e4ccd7751095c COPYING diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk index 149e24b79a..1ef1d69db3 100644 --- a/package/x11r7/xapp_xfd/xapp_xfd.mk +++ b/package/x11r7/xapp_xfd/xapp_xfd.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XFD_VERSION = 1.1.3 -XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2 -XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XFD_VERSION = 1.1.4 +XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.xz +XAPP_XFD_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XFD_LICENSE = MIT XAPP_XFD_LICENSE_FILES = COPYING XAPP_XFD_DEPENDENCIES = \ From yann.morin.1998 at free.fr Mon Feb 20 20:54:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:52 -0000 Subject: [Buildroot] [git commit branch/next] package/python-multidict: bump to version 6.0.3 Message-ID: <20230220205202.85DA98648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff8b3b7413bceba91198376fa056ce0f90571616 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-multidict/python-multidict.hash | 4 ++-- package/python-multidict/python-multidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index 999c8867d0..eae60af37c 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 f8230905ad1f50c87e8d9cc6b0bb7ca2 multidict-6.0.2.tar.gz -sha256 5ff3bd75f38e4c43f1f470f2df7a4d430b821c4ce22be384e1459cb57d6bb013 multidict-6.0.2.tar.gz +md5 b5875cf0a0578956dcfffc123d8344ca multidict-6.0.3.tar.gz +sha256 2523a29006c034687eccd3ee70093a697129a3ffe8732535d3b2df6a4ecc279d multidict-6.0.3.tar.gz # Locally computed sha256 checksums sha256 06a240ea10ba868fda2de58df859886961df873aa74bbab1e0f13eaf99f92b7b LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index 1a9aec7ba7..bfffb84709 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 6.0.2 +PYTHON_MULTIDICT_VERSION = 6.0.3 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/fa/a7/71c253cdb8a1528802bac7503bf82fe674367e4055b09c28846fdfa4ab90 +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/b5/5b/1dd3b9cf73c474ea1d0f0b1f8b7b712b0f13817493fd93101256ec856b59 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:54:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:53 -0000 Subject: [Buildroot] [git commit branch/next] package/sqlite: bump version to 3.40.0 Message-ID: <20230220205209.CB1C286494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a182f3a7edcaf771d350604abc132e157b47f7ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://sqlite.org/releaselog/3_40_0.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 936f42e8e9..ea4e30a463 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb sqlite-autoconf-3390400.tar.gz +sha256 0333552076d2700c75352256e91c78bf5cd62491589ba0c69aed0a81868980e7 sqlite-autoconf-3400000.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 4f4164c374..9d0b60ab59 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.39.4 -SQLITE_TAR_VERSION = 3390400 +SQLITE_VERSION = 3.40.0 +SQLITE_TAR_VERSION = 3400000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain From yann.morin.1998 at free.fr Mon Feb 20 20:54:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:53 -0000 Subject: [Buildroot] [git commit branch/next] package/python-packaging: bump to version 22.0 Message-ID: <20230220205202.A999B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85516a05b3bbe41793d431043ab505bb89786d1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate to flit package infrastructure. Drop python-parsing dependency. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-packaging/Config.in | 1 - package/python-packaging/python-packaging.hash | 4 ++-- package/python-packaging/python-packaging.mk | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/python-packaging/Config.in b/package/python-packaging/Config.in index 12170df84e..c09dfffe2c 100644 --- a/package/python-packaging/Config.in +++ b/package/python-packaging/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PACKAGING bool "python-packaging" - select BR2_PACKAGE_PYTHON_PYPARSING # runtime help Core utilities for Python packages. diff --git a/package/python-packaging/python-packaging.hash b/package/python-packaging/python-packaging.hash index 0f353a9e36..e10c11904b 100644 --- a/package/python-packaging/python-packaging.hash +++ b/package/python-packaging/python-packaging.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/packaging/json -md5 e713c1939f294fd729af4a7be40dd141 packaging-21.3.tar.gz -sha256 dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb packaging-21.3.tar.gz +md5 806414ea4c6f17b029a7911b622062e8 packaging-22.0.tar.gz +sha256 2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3 packaging-22.0.tar.gz # Locally computed sha256 checksums sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 LICENSE sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.APACHE diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 74b5803525..c9190ccfee 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -4,13 +4,13 @@ # ################################################################################ -PYTHON_PACKAGING_VERSION = 21.3 +PYTHON_PACKAGING_VERSION = 22.0 PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c -PYTHON_PACKAGING_SETUP_TYPE = setuptools +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/6b/f7/c240d7654ddd2d2f3f328d8468d4f1f876865f6b9038b146bec0a6737c65 +PYTHON_PACKAGING_SETUP_TYPE = flit PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD -HOST_PYTHON_PACKAGING_DEPENDENCIES = host-python-pyparsing +HOST_PYTHON_PACKAGING_SETUP_TYPE = flit-bootstrap $(eval $(python-package)) $(eval $(host-python-package)) From peter at korsgaard.com Mon Feb 20 20:54:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:54 -0000 Subject: [Buildroot] [git commit branch/next] package/tor: bump version to 0.4.7.12 Message-ID: <20230220205209.D771B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b8c1f832b88b10efac754bb3e011a2e929bb5a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://gitlab.torproject.org/tpo/core/tor/-/blob/main/ChangeLog?expanded=true&viewer=simple Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 4 ++-- package/tor/tor.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index dba08f51b5..2a2953dc29 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.7.10.tar.gz.sha256sum -sha256 647e56dfa59ea36dab052027fcfc7663905c826c03509363c456900ecd435a5b tor-0.4.7.10.tar.gz +# From https://dist.torproject.org/tor-0.4.7.12.tar.gz.sha256sum +sha256 3b5d969712c467851bd028f314343ef15a97ea457191e93ffa97310b05b9e395 tor-0.4.7.12.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index ed3714f2db..6812005618 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.7.10 +TOR_VERSION = 0.4.7.12 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:54:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:54 -0000 Subject: [Buildroot] [git commit branch/next] package/python-paramiko: bump to version 2.12.0 Message-ID: <20230220205202.B5BA686494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=101272d1313827f655e247bab740783a7e6dee0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 f4142b5c33..b327a6b8a9 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 b01682efcd6943936702c497afdd0aed paramiko-2.11.0.tar.gz -sha256 003e6bee7c034c21fbb051bf83dc0a9ee4106204dd3c53054c71452cc4ec3938 paramiko-2.11.0.tar.gz +md5 3f49814473cc153a7189fec31cfacfab paramiko-2.12.0.tar.gz +sha256 376885c05c5d6aa6e1f4608aac2a6b5b0548b1add40274477324605903d9cd49 paramiko-2.12.0.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 a33e11c768..621176ed41 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.11.0 +PYTHON_PARAMIKO_VERSION = 2.12.0 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/1d/08/3b8d8f1b4ec212c17429c2f3ff55b7f2237a1ad0c954972e39c8f0ac394c +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/98/75/e78ddbe671a4a59514b59bc6a321263118e4ac3fe88175dd784d1a47a00f PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:54:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:55 -0000 Subject: [Buildroot] [git commit branch/next] nezha_defconfig: bump u-boot to current top of d1-wip Message-ID: <20230220205210.1550A86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=adc8355150e876b3301b35405d411fd1ea98dff0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is now based on U-Boot 2022.10 and has gained SPL support, so use that instead of sun20-d1-spl. With this we can also drop the u-boot patch and patch directory. Signed-off-by: Peter Korsgaard --- board/nezha/genimage.cfg | 26 ++--------- ...CK-Support-building-u-boot.toc1-for-nezda.patch | 54 ---------------------- configs/nezha_defconfig | 7 +-- 3 files changed, 6 insertions(+), 81 deletions(-) diff --git a/board/nezha/genimage.cfg b/board/nezha/genimage.cfg index 783391fb99..836666ff8e 100644 --- a/board/nezha/genimage.cfg +++ b/board/nezha/genimage.cfg @@ -4,34 +4,16 @@ image sdcard.img { hdimage { } - partition boot0-1 { - in-partition-table = "no" - image = "boot0_sdcard_sun20iw1p1.bin" + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" offset = 8K } - partition boot0-2 { - in-partition-table = "no" - image = "boot0_sdcard_sun20iw1p1.bin" - offset = 128K - } - - partition u-boot-1 { - in-partition-table = "no" - image = "u-boot.toc1" - offset = 12M - } - - partition u-boot-2 { - in-partition-table = "no" - image = "u-boot.toc1" - offset = 16400K - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext4" bootable = "true" - offset = 18M + offset = 1M } } diff --git a/board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch b/board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch deleted file mode 100644 index 6e89a921df..0000000000 --- a/board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 4a923e0e4ef6d2b41cb89d658e269adada847573 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Thu, 4 Nov 2021 22:32:04 +0100 -Subject: [PATCH] Makefile: HACK: Support building u-boot.toc1 for nezda board - -For easier integration into Buildroot. The boot0 / toc1 logic is WIP until -U-Boot gains SPL support for the D1, so add a hack to make it easier to -integrate in Buildroot as-is. - -Signed-off-by: Peter Korsgaard ---- - Makefile | 9 +++++++++ - nezha.cfg | 9 +++++++++ - 2 files changed, 18 insertions(+) - create mode 100644 nezha.cfg - -diff --git a/Makefile b/Makefile -index f911f70344..259d93bf80 100644 ---- a/Makefile -+++ b/Makefile -@@ -1084,6 +1084,15 @@ endif - .binman_stamp: FORCE - @touch $@ - -+fw_dynamic.bin: $(OPENSBI) -+ $(call if_changed,copy) -+ -+MKIMAGEFLAGS_u-boot.toc1 = -T sunxi_toc1 -+u-boot.toc1: nezha.cfg fw_dynamic.bin inputs -+ $(call if_changed,mkimage) -+ -+all: u-boot.toc1 -+ - ifeq ($(CONFIG_DEPRECATED),y) - $(warning "You have deprecated configuration options enabled in your .config! Please check your configuration.") - endif -diff --git a/nezha.cfg b/nezha.cfg -new file mode 100644 -index 0000000000..2d23b9b388 ---- /dev/null -+++ b/nezha.cfg -@@ -0,0 +1,9 @@ -+[opensbi] -+file = fw_dynamic.bin -+addr = 0x40000000 -+[dtb] -+file = arch/riscv/dts/sun20i-d1-nezha.dtb -+addr = 0x44000000 -+[u-boot] -+file = u-boot-nodtb.bin -+addr = 0x4a000000 --- -2.20.1 - diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 5d0948a013..02f351d483 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,5 +1,4 @@ BR2_riscv=y -BR2_GLOBAL_PATCH_DIR="board/nezha/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" @@ -20,18 +19,16 @@ BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,opensbi,e6793dc36a71537023f078034fe795c64a9992a3)/opensbi-e6793dc36a71537023f078034fe795c64a9992a3.tar.gz" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set -BR2_TARGET_SUN20I_D1_SPL=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,smaeul,u-boot,d1-2022-05-26)/uboot-d1-2022-05-26.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nezha" BR2_TARGET_UBOOT_NEEDS_DTC=y -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.toc1" +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y From yann.morin.1998 at free.fr Mon Feb 20 20:54:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:55 -0000 Subject: [Buildroot] [git commit branch/next] package/{python-}protobuf: bump to version 4.21.11 Message-ID: <20230220205202.E953B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e25c2ec47755a27fada8cffc2aa822402bb86b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 2 +- package/python-protobuf/python-protobuf.hash | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index 24dbc0f1a1..f1f5fa77cd 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 f6251f2d00aad41b34c1dfa3d752713cb1bb1b7020108168a4deaa206ba8ed42 protobuf-cpp-3.21.8.tar.gz +sha256 96f0ab99b7414e44e7bf9b218bb59510d61549ca68e648f19e3622f9999bec00 protobuf-cpp-3.21.11.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 88f359f24c..33a7c40f40 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,7 +7,7 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works and to update its hash, # as they share the same version/site variables. -PROTOBUF_VERSION = 21.8 +PROTOBUF_VERSION = 21.11 PROTOBUF_SOURCE = protobuf-cpp-3.$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index a12c199663..c2afc3955a 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d81ebc20030fe8d03bceb38f06aba2797c40852e5aab6819481ce808fb305fae protobuf-python-4.21.8.tar.gz +sha256 ae4ca6e1da635f31019d8911923163f372d9d333e8857510f513acba33172d0c protobuf-python-4.21.11.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE From peter at korsgaard.com Mon Feb 20 20:54:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:56 -0000 Subject: [Buildroot] [git commit branch/next] boot/sun20i-d1-spl: drop package Message-ID: <20230220205210.3702A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a3a7169d66b610c968128688b6475ffc333cc96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next U-Boot has now gained SPL support for D1, so this temporary bootloader is no longer supported. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ DEVELOPERS | 1 - boot/Config.in | 1 - boot/sun20i-d1-spl/Config.in | 8 -------- boot/sun20i-d1-spl/sun20i-d1-spl.hash | 2 -- boot/sun20i-d1-spl/sun20i-d1-spl.mk | 23 ----------------------- 6 files changed, 7 insertions(+), 35 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 28c6822689..852189f0ff 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_TARGET_SUN20I_D1_SPL + bool "sun20-d1-spl removed" + select BR2_LEGACY + help + U-Boot has gained SPL support for D1, so this temporary + bootloader is no longer supported. + config BR2_PACKAGE_PYTHON_M2R bool "python-m2r removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f0dcc42de7..831e60982e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2305,7 +2305,6 @@ F: board/pandaboard/ F: board/roseapplepi/ F: board/visionfive/ F: boot/shim/ -F: boot/sun20i-d1-spl/ F: configs/avenger96_defconfig F: configs/beagleboneai_defconfig F: configs/lafrite_defconfig diff --git a/boot/Config.in b/boot/Config.in index ce17b2df6b..2d4d077632 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -20,7 +20,6 @@ source "boot/optee-os/Config.in" source "boot/opensbi/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" -source "boot/sun20i-d1-spl/Config.in" source "boot/syslinux/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" diff --git a/boot/sun20i-d1-spl/Config.in b/boot/sun20i-d1-spl/Config.in deleted file mode 100644 index 9d94d87b1c..0000000000 --- a/boot/sun20i-d1-spl/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_TARGET_SUN20I_D1_SPL - bool "sun20-d1-spl" - depends on BR2_RISCV_64 - help - Allwinner D1 boot0 code with modifications to use as U-Boot - SPL. - - https://github.com/smaeul/sun20i_d1_spl diff --git a/boot/sun20i-d1-spl/sun20i-d1-spl.hash b/boot/sun20i-d1-spl/sun20i-d1-spl.hash deleted file mode 100644 index 11d17a9a16..0000000000 --- a/boot/sun20i-d1-spl/sun20i-d1-spl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 08e2d0574e58c99734cd1d9ea89b86464242bf2db4f6769b23803bf9dcdac3c4 sun20i-d1-spl-882671fcf53137aaafc3a94fa32e682cb7b921f1.tar.gz diff --git a/boot/sun20i-d1-spl/sun20i-d1-spl.mk b/boot/sun20i-d1-spl/sun20i-d1-spl.mk deleted file mode 100644 index 6bcea0fa96..0000000000 --- a/boot/sun20i-d1-spl/sun20i-d1-spl.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# sun20i-d1-spl -# -################################################################################ - -# Commit on the 'mainline' branch -SUN20I_D1_SPL_VERSION = 882671fcf53137aaafc3a94fa32e682cb7b921f1 -SUN20I_D1_SPL_SITE = $(call github,smaeul,sun20i_d1_spl,$(SUN20I_D1_SPL_VERSION)) -SUN20I_D1_SPL_INSTALL_TARGET = NO -SUN20I_D1_SPL_INSTALL_IMAGES = YES -SUN20I_D1_SPL_LICENSE = GPL-2.0+ - -define SUN20I_D1_SPL_BUILD_CMDS - $(MAKE) -C $(@D) CROSS_COMPILE="$(TARGET_CROSS)" p=sun20iw1p1 mmc -endef - -define SUN20I_D1_SPL_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/nboot/boot0_sdcard_sun20iw1p1.bin \ - $(BINARIES_DIR)/boot0_sdcard_sun20iw1p1.bin -endef - -$(eval $(generic-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:54:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:56 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pathspec: bump to version 0.10.3 Message-ID: <20230220205202.C1676828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9f06cbbbce135bb149681fa708650a140a12271 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pathspec/python-pathspec.hash | 4 ++-- package/python-pathspec/python-pathspec.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pathspec/python-pathspec.hash b/package/python-pathspec/python-pathspec.hash index 91e4fb85b7..5eb76cb5f9 100644 --- a/package/python-pathspec/python-pathspec.hash +++ b/package/python-pathspec/python-pathspec.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathspec/json -md5 6f4fde5e701d328a2846d206edb63aa9 pathspec-0.10.1.tar.gz -sha256 7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d pathspec-0.10.1.tar.gz +md5 d89408b52aff020ac768a14c0ef1c7de pathspec-0.10.3.tar.gz +sha256 56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6 pathspec-0.10.3.tar.gz # Locally computed sha256 checksums sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/python-pathspec/python-pathspec.mk b/package/python-pathspec/python-pathspec.mk index ccb794cce9..e88bce231f 100644 --- a/package/python-pathspec/python-pathspec.mk +++ b/package/python-pathspec/python-pathspec.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHSPEC_VERSION = 0.10.1 +PYTHON_PATHSPEC_VERSION = 0.10.3 PYTHON_PATHSPEC_SOURCE = pathspec-$(PYTHON_PATHSPEC_VERSION).tar.gz -PYTHON_PATHSPEC_SITE = https://files.pythonhosted.org/packages/24/9f/a9ae1e6efa11992dba2c4727d94602bd2f6ee5f0dedc29ee2d5d572c20f7 +PYTHON_PATHSPEC_SITE = https://files.pythonhosted.org/packages/32/1a/6baf904503c3e943cae9605c9c88a43b964dea5b59785cf956091b341b08 PYTHON_PATHSPEC_LICENSE = MPL-2.0 PYTHON_PATHSPEC_LICENSE_FILES = LICENSE PYTHON_PATHSPEC_SETUP_TYPE = setuptools From peter at korsgaard.com Mon Feb 20 20:54:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:54:57 -0000 Subject: [Buildroot] [git commit branch/next] package/python-lxml: bump to version 4.9.2 Message-ID: <20230220205210.650D386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e38d5190ea16a7fda9f3045ba9ba316e4da53f5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-lxml/python-lxml.hash | 2 +- package/python-lxml/python-lxml.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index cd1943b0b4..72df6d0278 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f lxml-4.9.1.tar.gz +sha256 2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67 lxml-4.9.2.tar.gz sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 050495c3f3..657622a962 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.9.1 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/70/bb/7a2c7b4f8f434aa1ee801704bf08f1e53d7b5feba3d5313ab17003477808 +PYTHON_LXML_VERSION = 4.9.2 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/06/5a/e11cad7b79f2cf3dd2ff8f81fa8ca667e7591d3d8451768589996b65dec1 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. From yann.morin.1998 at free.fr Mon Feb 20 20:54:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:54:57 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pudb: bump to version 2022.1.3 Message-ID: <20230220205203.145DB828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cfd2cb65f2345aa3cda8926c0ec64537f9e4f27b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pudb/python-pudb.hash | 4 ++-- package/python-pudb/python-pudb.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pudb/python-pudb.hash b/package/python-pudb/python-pudb.hash index d9943a3601..1ae15ad8a6 100644 --- a/package/python-pudb/python-pudb.hash +++ b/package/python-pudb/python-pudb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pudb/json -md5 c2b4275b76068f18d630f7bae889345b pudb-2022.1.2.tar.gz -sha256 6b83ab805bddb53710109690a2237e98bf83c0b3a00033c517cdf5f6a8fa470d pudb-2022.1.2.tar.gz +md5 cda1c28dc52318162e2b131280f09960 pudb-2022.1.3.tar.gz +sha256 58e83ada9e19ffe92c1fdc78ae5458ef91aeb892a5b8f0e7379e6fa61e0e664a pudb-2022.1.3.tar.gz # Locally computed sha256 checksums sha256 a95343fffff49cde3d9bf33cf6bb71cb3bf0ed83f47d98a7ba04b175d29c79ab LICENSE diff --git a/package/python-pudb/python-pudb.mk b/package/python-pudb/python-pudb.mk index 7df38f0f02..a357c34c44 100644 --- a/package/python-pudb/python-pudb.mk +++ b/package/python-pudb/python-pudb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PUDB_VERSION = 2022.1.2 +PYTHON_PUDB_VERSION = 2022.1.3 PYTHON_PUDB_SOURCE = pudb-$(PYTHON_PUDB_VERSION).tar.gz -PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/8b/ef/6dea7c63fdddd7753e2a2930e59799ef32247f2499c0d9bcd233439e7483 +PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/85/a5/f1fd378f56bd8168b5921fd09d4b84fd8101a90e81402a509796caea2094 PYTHON_PUDB_SETUP_TYPE = setuptools PYTHON_PUDB_LICENSE = MIT PYTHON_PUDB_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:55:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:11 -0000 Subject: [Buildroot] [git commit branch/next] package/python-zope-interface: bump to version 5.5.2 Message-ID: <20230220205204.166528648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c330d67dae8ca6eefde2aa076151820d87beebe7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-zope-interface/python-zope-interface.hash | 4 ++-- package/python-zope-interface/python-zope-interface.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-zope-interface/python-zope-interface.hash b/package/python-zope-interface/python-zope-interface.hash index 6bab9d2c1c..7052f77899 100644 --- a/package/python-zope-interface/python-zope-interface.hash +++ b/package/python-zope-interface/python-zope-interface.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zope-interface/json -md5 644f7574b81710a21b1b738d448811e4 zope.interface-5.5.1.tar.gz -sha256 6d678475fdeb11394dc9aaa5c564213a1567cc663082e0ee85d52f78d1fbaab2 zope.interface-5.5.1.tar.gz +md5 5a383d71156ce6f89f59a86d957a8d65 zope.interface-5.5.2.tar.gz +sha256 bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671 zope.interface-5.5.2.tar.gz # Locally computed sha256 checksums sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt diff --git a/package/python-zope-interface/python-zope-interface.mk b/package/python-zope-interface/python-zope-interface.mk index 4f201e5cbf..2bada3a7d4 100644 --- a/package/python-zope-interface/python-zope-interface.mk +++ b/package/python-zope-interface/python-zope-interface.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZOPE_INTERFACE_VERSION = 5.5.1 +PYTHON_ZOPE_INTERFACE_VERSION = 5.5.2 PYTHON_ZOPE_INTERFACE_SOURCE = zope.interface-$(PYTHON_ZOPE_INTERFACE_VERSION).tar.gz -PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/c5/ec/3e116b5c3c54f1fb7296a686c110c14d1242bbea17286c487892075d9858 +PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/38/6f/fbfb7dde38be7e5644bb342c4c7cdc444cd5e2ffbd70d091263b3858a8cb PYTHON_ZOPE_INTERFACE_SETUP_TYPE = setuptools PYTHON_ZOPE_INTERFACE_LICENSE = ZPL-2.1 PYTHON_ZOPE_INTERFACE_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 20 20:55:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:11 -0000 Subject: [Buildroot] [git commit branch/next] package/ply: bump to version 2.3.0 Message-ID: <20230220205212.9E28886494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9612601b037e6deb79af300e64e0557dda1be5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Andreas Klinger Signed-off-by: Peter Korsgaard --- package/ply/ply.hash | 2 +- package/ply/ply.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ply/ply.hash b/package/ply/ply.hash index df01ae08e0..b6a56aa909 100644 --- a/package/ply/ply.hash +++ b/package/ply/ply.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8cd92fc8784873fb0507bc11f3f62a31d0345c64914ddaadb958d8b2d6de0100 ply-2.2.0.tar.gz +sha256 99be1ed3942370699cbfc7f493bc3ffd4601312a81471215ac7ccb2e04a0a8b2 ply-2.3.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ply/ply.mk b/package/ply/ply.mk index b3c56bd9a5..dc02fc5472 100644 --- a/package/ply/ply.mk +++ b/package/ply/ply.mk @@ -4,7 +4,7 @@ # ################################################################################ -PLY_VERSION = 2.2.0 +PLY_VERSION = 2.3.0 PLY_SITE = $(call github,wkz,ply,$(PLY_VERSION)) PLY_AUTORECONF = YES PLY_LICENSE = GPL-2.0 From peter at korsgaard.com Mon Feb 20 20:55:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:12 -0000 Subject: [Buildroot] [git commit branch/next] package/domoticz: bump to version 2022.2 Message-ID: <20230220205212.845A986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=384b75098ba936277379fbaf6e9b78ad8e6fa25f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/domoticz/domoticz/blob/2022.2/History.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...rdware-EnOceanRawValue.h-include-stdarg.h.patch | 33 ++++++++++++++++++++++ package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 2 +- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch b/package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch new file mode 100644 index 0000000000..bc3e60023d --- /dev/null +++ b/package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch @@ -0,0 +1,33 @@ +From 6296d7112089a0f3bfb3056f6d9637e13ce4ce83 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 18 Dec 2022 12:27:38 +0100 +Subject: [PATCH] hardware/EnOceanRawValue.h: include stdarg.h + +Include stdarg.h to avoid the following build failure on uclibc: + +In file included from /home/fabrice/buildroot/output/build/domoticz-2022.2/hardware/EnOceanRawValue.cpp:2: +/home/fabrice/buildroot/output/build/domoticz-2022.2/hardware/EnOceanRawValue.h:109:83: error: 'va_list' has not been declared + 109 | uint32_t SetRawValuesNb(uint8_t * data, T_DATAFIELD * OffsetDes, int NbParameter, va_list value); + | ^~~~~~~ + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/domoticz/domoticz/pull/5472] +--- + hardware/EnOceanRawValue.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hardware/EnOceanRawValue.h b/hardware/EnOceanRawValue.h +index 84f38d17a..df858f27d 100644 +--- a/hardware/EnOceanRawValue.h ++++ b/hardware/EnOceanRawValue.h +@@ -1,6 +1,7 @@ + #ifndef _SetGetRawValue + #define _SetGetRawValue + ++#include + #include + #include + #include +-- +2.35.1 + diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index 9de241015c..c439238800 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8282cb71c924b6ef92503976d50f966f2c785eab8f8cffa1136ac133f0241157 domoticz-2022.1.tar.gz +sha256 8f84098bb64bec12ff7aac5f1fb6b6230a88c5781c2b75bc89861caea73cbccf domoticz-2022.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index bc4a2def41..451021150b 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 2022.1 +DOMOTICZ_VERSION = 2022.2 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:13 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8189es: disable -Werror to fix build failure Message-ID: <20230220205204.55442828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abb36a1f5f619991a1a66c1a87b9881294465ab9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/349893c66fcfbbf0e0e10285299581894254c941/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8189es/rtl8189es.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk index 6acc409e73..c2ee77f922 100644 --- a/package/rtl8189es/rtl8189es.mk +++ b/package/rtl8189es/rtl8189es.mk @@ -11,7 +11,8 @@ RTL8189ES_LICENSE = GPL-2.0 RTL8189ES_MODULE_MAKE_OPTS = \ CONFIG_RTL8189ES=m \ KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) + KSRC=$(LINUX_DIR) \ + USER_EXTRA_CFLAGS="-Wno-error" define RTL8189ES_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) From yann.morin.1998 at free.fr Mon Feb 20 20:55:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:13 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pycares: bump to version 4.3.0 Message-ID: <20230220205204.38B518648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ea6eecb734ae04988e0f4d4a7ea0f5fb9420c89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycares/python-pycares.hash | 4 ++-- package/python-pycares/python-pycares.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycares/python-pycares.hash b/package/python-pycares/python-pycares.hash index 13f640b1c1..7cdd93dd93 100644 --- a/package/python-pycares/python-pycares.hash +++ b/package/python-pycares/python-pycares.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycares/json -md5 7706a01fdbfc593564b63ac0d71031d9 pycares-4.2.2.tar.gz -sha256 e1f57a8004370080694bd6fb969a1ffc9171a59c6824d54f791c1b2e4d298385 pycares-4.2.2.tar.gz +md5 d11b196cebb45a38caa56e850f4a60d9 pycares-4.3.0.tar.gz +sha256 c542696f6dac978e9d99192384745a65f80a7d9450501151e4a7563e06010d45 pycares-4.3.0.tar.gz # Locally computed sha256 checksums sha256 427bb3a5372024a26e2c290b24382512bcc7ca123431c4dd178dd613beea7eee LICENSE diff --git a/package/python-pycares/python-pycares.mk b/package/python-pycares/python-pycares.mk index 858adbf33b..b1c7dcef50 100644 --- a/package/python-pycares/python-pycares.mk +++ b/package/python-pycares/python-pycares.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCARES_VERSION = 4.2.2 +PYTHON_PYCARES_VERSION = 4.3.0 PYTHON_PYCARES_SOURCE = pycares-$(PYTHON_PYCARES_VERSION).tar.gz -PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/ac/a3/21594384c2398420dd7f6e8656aeb5a2c15128ddf2b85ef5f4403342e18d +PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/01/50/e3015e6e03a3cf64113f509e8b86b71af37169b59ccedfcb182f3d031329 PYTHON_PYCARES_SETUP_TYPE = setuptools PYTHON_PYCARES_LICENSE = MIT PYTHON_PYCARES_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:55:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:13 -0000 Subject: [Buildroot] [git commit branch/next] package/lightning: bump version to 2.2.0 Message-ID: <20230220205211.9A45B86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af6f7aa76db5aed1eada0b27bd0375610a2fc728 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Notable changes in this new version include support for the Apple Aarch64 ABI, and compare-and-swap atomic instructions. Signed-off-by: Paul Cercueil [Peter: drop _AUTORECONF] Signed-off-by: Peter Korsgaard --- ...kefile.am-don-t-install-lightning.h-twice.patch | 38 ---------------------- package/lightning/lightning.hash | 2 +- package/lightning/lightning.mk | 4 +-- 3 files changed, 2 insertions(+), 42 deletions(-) diff --git a/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch b/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch deleted file mode 100644 index fb5299c25f..0000000000 --- a/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 604c931bc673c507254a84c0f423c9ec8ce6e3a1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 10 Oct 2019 20:36:46 +0200 -Subject: [PATCH] include/Makefile.am: don't install lightning.h twice - -Commit 17164ed32d8f3530153b9cad67a4399c65f24512 added lightning.h to -nodist_include_HEADERS without removing it from include_HEADERS - -This raises the following error on one of the buildroot autobuilders: -/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include' -/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include' -/usr/bin/install: cannot create regular file `/home/test/autobuild/run/instance-3/output-1/target/usr/include/lightning.h': File exists - -Fix this by removing lightning.h from include_HEADERS - -Fixes: - - http://autobuild.buildroot.org/results/05ebc75598627d2a08e08e194f51cb8464f97b95 - -Signed-off-by: Fabrice Fontaine ---- - include/Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/Makefile.am b/include/Makefile.am -index e754dd3..8f91594 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -14,7 +14,6 @@ - # License for more details. - # - --include_HEADERS = lightning.h - SUBDIRS = \ - lightning - --- -2.23.0 - diff --git a/package/lightning/lightning.hash b/package/lightning/lightning.hash index 2840a97f91..998ae3743b 100644 --- a/package/lightning/lightning.hash +++ b/package/lightning/lightning.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed856b866dc6f68678dc1151579118fab1c65fad687cf847fc2d94ca045efdc9 lightning-2.1.3.tar.gz +sha256 4e3984ff1ccf0ba30a985211d40fc5c06b25f014ebdf3d80d0fe3d0c80dd7c0e lightning-2.2.0.tar.gz sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/package/lightning/lightning.mk b/package/lightning/lightning.mk index da8c07e61f..8ab2ca1f9d 100644 --- a/package/lightning/lightning.mk +++ b/package/lightning/lightning.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIGHTNING_VERSION = 2.1.3 +LIGHTNING_VERSION = 2.2.0 LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning LIGHTNING_LICENSE = LGPL-3.0+ LIGHTNING_LICENSE_FILES = COPYING.LESSER LIGHTNING_INSTALL_STAGING = YES LIGHTNING_CPE_ID_VENDOR = gnu -# We're patching include/Makefile.am -LIGHTNING_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIGHTNING_DISASSEMBLER),y) LIGHTNING_DEPENDENCIES += binutils zlib From peter at korsgaard.com Mon Feb 20 20:55:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:14 -0000 Subject: [Buildroot] [git commit branch/next] package/vuejs-router: fix license hash Message-ID: <20230220205213.07A9486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66c2d6d4b43776d4afb62b985a082bf2d75cb708 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 2fce36d928082685d7f77c3587e15b7827ce0b42 forgot to update LICENSE hash (update in year: https://github.com/vuejs/router/commit/ed238db64b2a605f785ee4e2f847a6788c06a2ea) Fixes: - http://autobuild.buildroot.org/results/beac411246342a9445495bc7c8f6a7e7369b9c53 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/vuejs-router/vuejs-router.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/vuejs-router/vuejs-router.hash b/package/vuejs-router/vuejs-router.hash index 147e730f20..b48e59ef48 100644 --- a/package/vuejs-router/vuejs-router.hash +++ b/package/vuejs-router/vuejs-router.hash @@ -1,3 +1,3 @@ # Locally computed sha256 437558a84b99d0d89743d4897ec16a90a96a1d3a6786e697a8808a044bcb9b8f vue-router-4.1.6.tgz -sha256 9c0015250f592a09d7787efc07152afcf661fff6bda2554359f6d00987828c02 LICENSE +sha256 91a2845c4db44e7497b514b98634a674c737986ad0db81599307cf733bf850b2 LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:14 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-firmware: add support for Intel 6/6E WiFi firmware Message-ID: <20230220205204.70FE68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b55dfdb286ddb7fb4f35c20b731a4c93bd3ff201 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Stephan Henningsen Signed-off-by: Thomas Petazzoni --- 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 8ce71140da..4b415a7da2 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -268,6 +268,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX Firmware files for the Intel Wifi 9xxx devices supported by the iwlwifi kernel driver. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6E + bool "Intel iwlwifi 6/6E" + help + Firmware files for the Intel Wi-Fi 6 and Wi-Fi 6E devices + supported by the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8 bool "Libertas SD 8686 v8" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 672a536c4a..200b4ca564 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -514,6 +514,11 @@ LINUX_FIRMWARE_FILES += iwlwifi-9???-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6E),y) +LINUX_FIRMWARE_FILES += iwlwifi-so-a0-gf-a0*.{ucode,pnvm} +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3),y) LINUX_FIRMWARE_FILES += tigon/* # No license file; the license is in the file WHENCE From peter at korsgaard.com Mon Feb 20 20:55:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:15 -0000 Subject: [Buildroot] [git commit branch/next] package/libcoap: bump to version 4.3.1 Message-ID: <20230220205213.24CF786494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=163f933692f616c1b73d060aa03bd8323956692f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update hash of LICENSE file (update in year: https://github.com/obgm/libcoap/commit/43bfbea924e0f5220c4121487df980afe7159346) https://github.com/obgm/libcoap/blob/v4.3.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libcoap/libcoap.hash | 4 ++-- package/libcoap/libcoap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcoap/libcoap.hash b/package/libcoap/libcoap.hash index 4a5bcaa7ff..e0006b62af 100644 --- a/package/libcoap/libcoap.hash +++ b/package/libcoap/libcoap.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 1a195adacd6188d3b71c476e7b21706fef7f3663ab1fb138652e8da49a9ec556 libcoap-4.3.0.tar.gz +sha256 074a71deca01e06d3acb00a1416d0fbeb87d130f40a3c0f6fda3a5c711855dca libcoap-4.3.1.tar.gz sha256 09dd86a017bad210527085008cbf706609c58210897b69845af14099577e7eb7 COPYING -sha256 c5625e704d52deade1c9b2d7931ac8593be147ba63af62b53b8c7e309b7eaeb9 LICENSE +sha256 5711e8bf7e94b59fcf0681d0f73752111bc196563b60f8568f19dacd0213192b LICENSE diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index edcc1bbef8..c0a941a0c8 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCOAP_VERSION = 4.3.0 +LIBCOAP_VERSION = 4.3.1 LIBCOAP_SITE = $(call github,obgm,libcoap,v$(LIBCOAP_VERSION)) LIBCOAP_INSTALL_STAGING = YES LIBCOAP_LICENSE = BSD-2-Clause From peter at korsgaard.com Mon Feb 20 20:55:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:55:22 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8192eu: fix build failure on Big Endian architectures Message-ID: <20230220205213.A09FE86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=447abe169af7e69a82a3e0218670006a42914053 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default involving the endianness to be set to little. This way we can set the CFLAGS according to architecture with some default define like: -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -Wno-error Suggested-by: Arnout Vandecappelle Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/rtl8192eu/rtl8192eu.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index e1688eef1b..d967db90b8 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -7,9 +7,16 @@ RTL8192EU_VERSION = 94bce7798bbb18de6d8b1646dedb2511f24867d3 RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 + +RTL8192EU_USER_EXTRA_CFLAGS = -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error + RTL8192EU_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_I386_PC=n \ CONFIG_RTL8192EU=m \ - USER_EXTRA_CFLAGS="-Wno-error" + USER_EXTRA_CFLAGS="$(RTL8192EU_USER_EXTRA_CFLAGS)" define RTL8192EU_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:23 -0000 Subject: [Buildroot] [git commit branch/next] package/nerdctl: bump to version 1.0.0 Message-ID: <20230220205205.22F3181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=717cf468c4be8669785027f298f077f903214fc7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Nerdctl has reached version 1.0.0. https://github.com/containerd/nerdctl/releases/tag/v1.0.0 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/nerdctl/nerdctl.hash | 2 +- package/nerdctl/nerdctl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash index 22cc97c362..e253fb74b2 100644 --- a/package/nerdctl/nerdctl.hash +++ b/package/nerdctl/nerdctl.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 be41804ef139a3f92b774edc8439678e56b44033d7ab3fcf4389f0865c1fe069 nerdctl-0.17.1.tar.gz +sha256 ae468c65480e9c6679e0dd23d466b723e7f19bff779d4e2e0fa4629be343af2a nerdctl-1.0.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk index 3f3c04aa11..fdf60cb189 100644 --- a/package/nerdctl/nerdctl.mk +++ b/package/nerdctl/nerdctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NERDCTL_VERSION = 0.17.1 +NERDCTL_VERSION = 1.0.0 NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) NERDCTL_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:24 -0000 Subject: [Buildroot] [git commit branch/next] package/pipewire: bump to version 0.3.62 Message-ID: <20230220205205.349EE828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67895bf33c00e07bc0f85311f39eaa237f58bd45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add support for new optional gsettings meson config option. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- 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 4585534569..d8b5b0cc86 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8164eb53c9eafedfa22fe1adc4b8e38f3173c6f33695c735a17ed1a3d43c664e pipewire-0.3.60.tar.bz2 +sha256 24b218cf3bb1fb279c8c489c14cc9ae483e1da7b4c8215b2ee5a5ee831bae94f pipewire-0.3.62.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 9fef605878..6bcda0a93d 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.60 +PIPEWIRE_VERSION = 0.3.62 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) @@ -166,6 +166,13 @@ else PIPEWIRE_CONF_OPTS += -Dx11-xfixes=disabled endif +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +PIPEWIRE_CONF_OPTS += -Dgsettings=enabled +PIPEWIRE_DEPENDENCIES += libglib2 +else +PIPEWIRE_CONF_OPTS += -Dgsettings=disabled +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) PIPEWIRE_CONF_OPTS += -Dlibusb=enabled PIPEWIRE_DEPENDENCIES += libusb From yann.morin.1998 at free.fr Mon Feb 20 20:55:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:55:24 -0000 Subject: [Buildroot] [git commit branch/next] package/lightning; fix build Message-ID: <20230220205213.D3CCE86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af1f90cc07e1b74cbda92402926bbcb88a722a93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since bump to version 2.2.0 in commit af6f7aa76db5aed1eada0b27bd0375610a2fc728 and http://git.savannah.gnu.org/cgit/lightning.git/commit/?id=837c7a1e8d08fb9294578dc84694077f4d6106f9: jit_disasm.c: In function 'fprintf_styled': jit_disasm.c:57:27: error: parameter name omitted 57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) | ^~~~~~ jit_disasm.c:57:35: error: parameter name omitted 57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) | ^~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e15e01e98e0d8c873efd3f512b671d98e4daf6c0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-lib-jit_disasm.c-fix-build.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/package/lightning/0001-lib-jit_disasm.c-fix-build.patch b/package/lightning/0001-lib-jit_disasm.c-fix-build.patch new file mode 100644 index 0000000000..9e79be91a0 --- /dev/null +++ b/package/lightning/0001-lib-jit_disasm.c-fix-build.patch @@ -0,0 +1,42 @@ +From 0d828c96c373c34b201ca7ea37b61c1e3b0485cd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 19 Dec 2022 23:55:31 +0100 +Subject: [PATCH] lib/jit_disasm.c: fix build + +Fix the following build failure raised since +http://git.savannah.gnu.org/cgit/lightning.git/commit/?id=837c7a1e8d08fb9294578dc84694077f4d6106f9: + +jit_disasm.c: In function 'fprintf_styled': +jit_disasm.c:57:27: error: parameter name omitted + 57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) + | ^~~~~~ +jit_disasm.c:57:35: error: parameter name omitted + 57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) + | ^~~~~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/e15e01e98e0d8c873efd3f512b671d98e4daf6c0 + +Signed-off-by: Fabrice Fontaine +[yann.morin.1998 at free.fr: make it a backport now it's applied upstream] +Signed-off-by: Yann E. MORIN +--- + lib/jit_disasm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/jit_disasm.c b/lib/jit_disasm.c +index 58a269b..68c966d 100644 +--- a/lib/jit_disasm.c ++++ b/lib/jit_disasm.c +@@ -54,7 +54,7 @@ static FILE *disasm_stream; + #endif + + #if BINUTILS_2_38 +-static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) ++static int fprintf_styled(void * stream, enum disassembler_style style, const char* fmt, ...) + { + va_list args; + int r; +-- +2.25.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:55:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:55:25 -0000 Subject: [Buildroot] [git commit branch/next] package/ruby: security bump to version 3.1.3 Message-ID: <20230220205205.44C518648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20f7ed86aa9f2a65af9b44a599f7d1b10075f158 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next fix CVE-2021-33621: HTTP response splitting in CGI see https://www.ruby-lang.org/en/news/2022/11/24/ruby-3-1-3-released/ Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch | 2 +- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch b/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch index 039a6466d6..805dfd2f89 100644 --- a/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch +++ b/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch @@ -14,7 +14,7 @@ diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c index 2a4835a2..24d0da46 100644 --- a/ext/openssl/ossl_pkey.c +++ b/ext/openssl/ossl_pkey.c -@@ -670,7 +670,7 @@ ossl_pkey_export_traditional(int argc, VALUE *argv, VALUE self, int to_der) +@@ -710,7 +710,7 @@ ossl_pkey_export_traditional(int argc, VALUE *argv, VALUE self, int to_der) } } else { diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index da6221ec50..42d8a2497f 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2022/04/12/ruby-3-1-2-released/ -sha512 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21 ruby-3.1.2.tar.xz +# https://www.ruby-lang.org/en/news/2022/11/24/ruby-3-1-3-released/ +sha512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69 ruby-3.1.3.tar.xz # License files, Locally calculated sha256 794c384f94396ab07e3e6f53a9f8be093facb7eb4193266024302b93b29e12dc LEGAL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index cbdfa4b826..28b1ec13ef 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 3.1 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).2 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).3 RUBY_VERSION_EXT = 3.1.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:03 -0000 Subject: [Buildroot] [git commit branch/next] package/hostapd: enable 802.11ax support Message-ID: <20230220205217.7985386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ab2946dba9d71dcce9297efc05348c87f304a22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Hostapd has 802.11ax support, however it is currently disabled by default, so let's enable it as it adds only 2 KB to the overall size of the hostapd package. Signed-off-by: Robert Marko Signed-off-by: Thomas Petazzoni --- package/hostapd/hostapd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 4420142fbd..8981d9247e 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -53,6 +53,7 @@ endif ifeq ($(BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS),y) HOSTAPD_CONFIG_ENABLE += \ CONFIG_HS20 \ + CONFIG_IEEE80211AX \ CONFIG_IEEE80211AC \ CONFIG_IEEE80211N \ CONFIG_IEEE80211R \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:03 -0000 Subject: [Buildroot] [git commit branch/next] package/libdnet: fix python build Message-ID: <20230220205217.B083186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14bb74b4617df6fe511e638147cbde01fd7637a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised with python >= 3.11 by backporting a patch and adding libbsd dependency as suggested by upstream in https://github.com/ofalk/libdnet/issues/74: ./dnet.c: In function '__Pyx_AddTraceback': ./dnet.c:456:62: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 456 | #define __Pyx_PyFrame_SetLineNumber(frame, lineno) (frame)->f_lineno = (lineno) | ^~ ./dnet.c:25190:5: note: in expansion of macro '__Pyx_PyFrame_SetLineNumber' 25190 | __Pyx_PyFrame_SetLineNumber(py_frame, py_line); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/78dff4b514fb7c510f5a745ee6cbbc049ceb2794 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0002-Correct-path-to-string-h-from-bsd.patch | 26 ++++++++++++++++++++++ package/libdnet/Config.in | 11 +++++++++ package/libdnet/libdnet.mk | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch b/package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch new file mode 100644 index 0000000000..2aa4f4516b --- /dev/null +++ b/package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch @@ -0,0 +1,26 @@ +From 347c23da1ec6f19b0b0143d53edcc209e522bbf2 Mon Sep 17 00:00:00 2001 +From: Oliver Falk +Date: Wed, 29 Jun 2022 13:27:45 +0200 +Subject: [PATCH] Correct path to string.h (from bsd); Fixes #74 + +[Retrieved (and backported) from: +https://github.com/ofalk/libdnet/commit/347c23da1ec6f19b0b0143d53edcc209e522bbf2] +Signed-off-by: Fabrice Fontaine +--- + python/dnet.c | 64 +++++++++++++++++++++++-------------------------- + python/dnet.pyx | 2 +- + 2 files changed, 31 insertions(+), 35 deletions(-) + +diff --git a/python/dnet.pyx b/python/dnet.pyx +index d9cbc90..af65a11 100644 +--- a/python/dnet.pyx ++++ b/python/dnet.pyx +@@ -40,7 +40,7 @@ cdef extern from *: + unsigned long htonl(unsigned long n) + unsigned long ntohl(unsigned long n) + +-cdef extern from "string.h": ++cdef extern from "bsd/string.h": + int strlcpy(char *dst, char *src, int size) + + cdef __memcpy(char *dst, object src, int n): diff --git a/package/libdnet/Config.in b/package/libdnet/Config.in index f853e4e12d..473e8aea22 100644 --- a/package/libdnet/Config.in +++ b/package/libdnet/Config.in @@ -10,11 +10,22 @@ if BR2_PACKAGE_LIBDNET config BR2_PACKAGE_LIBDNET_PYTHON bool "libdnet python module" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_STATIC_LIBS # libbsd + depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd + depends on BR2_USE_WCHAR # libbsd + select BR2_PACKAGE_LIBBSD help dnet module for python comment "dnet module for python requires python3 package" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on !BR2_PACKAGE_PYTHON3 +comment "dnet module for python needs a toolchain w/ dynamic library, threads, wchar" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR + endif diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index dc56b892b4..14af07e6d5 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -17,7 +17,7 @@ LIBDNET_CONFIG_SCRIPTS = dnet-config LIBDNET_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) -LIBDNET_DEPENDENCIES += host-python-cython python3 +LIBDNET_DEPENDENCIES += libbsd host-python-cython python3 LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec From yann.morin.1998 at free.fr Mon Feb 20 20:56:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:03 -0000 Subject: [Buildroot] [git commit branch/next] package/hddtemp: new package Message-ID: <20230220205208.97487828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93d982207b43f9e741e190a71317901972175796 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next [Bernd: - switched to actively maintained fork - package/Config.in: moved to "Hardware handling" (Peter) - added toolchain dependencies (Thomas) - added license hash - fixed build errors related to iconv and execinfo (Peter) - removed hook HDDTEMP_REMOVE_MAN (Thomas) - install hddtemp.db to target - added build/install _CMDS due to https://github.com/vitlav/hddtemp/issues/5] Signed-off-by: Bernd Kuhls [yann.morin.1998 at free.fr: - use GETTEXTIZE=YES, drop host-gettext from _DEPENDENCIES - drop custom build and install commands now that we gettextize - explicitly specify the DB path, introduce HDDTEMP_DB_PATH ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/hddtemp/Config.in | 17 +++++++++++++++++ package/hddtemp/hddtemp.hash | 3 +++ package/hddtemp/hddtemp.mk | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 57 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 04047d43da..29dffaadf1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -345,6 +345,7 @@ F: package/glmark2/ F: package/gpsd/ F: package/gptfdisk/ F: package/hdparm/ +F: package/hddtemp/ F: package/inih/ F: package/intel-gmmlib/ F: package/intel-mediadriver/ diff --git a/package/Config.in b/package/Config.in index 6804e1d418..10a0493b8d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -508,6 +508,7 @@ endmenu source "package/gpsd/Config.in" source "package/gptfdisk/Config.in" source "package/gvfs/Config.in" + source "package/hddtemp/Config.in" source "package/hdparm/Config.in" source "package/hwdata/Config.in" source "package/hwloc/Config.in" diff --git a/package/hddtemp/Config.in b/package/hddtemp/Config.in new file mode 100644 index 0000000000..0e02252461 --- /dev/null +++ b/package/hddtemp/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_HDDTEMP + bool "hddtemp" + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + help + hddtemp is a small utility that gives you the temperature of + your hard drive by reading S.M.A.R.T. informations, for drives + that support this feature. + + https://github.com/vitlav/hddtemp + http://www.guzu.net/linux/hddtemp.php + +comment "hddtemp needs dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS diff --git a/package/hddtemp/hddtemp.hash b/package/hddtemp/hddtemp.hash new file mode 100644 index 0000000000..cd82d7f89b --- /dev/null +++ b/package/hddtemp/hddtemp.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 592322c64f0d5f035132249e3d051b752f5d24867514522a17285d5e72d21075 hddtemp-0.4.3.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 GPL-2 diff --git a/package/hddtemp/hddtemp.mk b/package/hddtemp/hddtemp.mk new file mode 100644 index 0000000000..7023e11e59 --- /dev/null +++ b/package/hddtemp/hddtemp.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# hddtemp +# +################################################################################ + +HDDTEMP_VERSION = 0.4.3 +HDDTEMP_SITE = $(call github,vitlav,hddtemp,v$(HDDTEMP_VERSION)) +HDDTEMP_LICENSE = GPLv2 +HDDTEMP_LICENSE_FILES = GPL-2 + +# Fetched from Github with no configure script +HDDTEMP_AUTORECONF = YES +HDDTEMP_GETTEXTIZE = YES + +HDDTEMP_DB_PATH = /usr/share/misc/hddtemp.db +HDDTEMP_CONF_OPTS = --with-db-path=$(HDDTEMP_DB_PATH) +HDDTEMP_CONF_ENV = LIBS="$(HDDTEMP_LIBS)" + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +HDDTEMP_DEPENDENCIES += libexecinfo +HDDTEMP_LIBS += -lexecinfo +endif + +ifeq ($(BR2_PACKAGE_LIBICONV),y) +HDDTEMP_DEPENDENCIES += libiconv +HDDTEMP_LIBS += -liconv +endif + +define HDDTEMP_INSTALL_HDDTEMP_DB + $(INSTALL) -D $(@D)/data/hddtemp.db $(TARGET_DIR)$(HDDTEMP_DB_PATH) +endef +HDDTEMP_POST_INSTALL_TARGET_HOOKS += HDDTEMP_INSTALL_HDDTEMP_DB + +$(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:04 -0000 Subject: [Buildroot] [git commit branch/next] package/gr-osmosdr: bump to version 0.2.4 Message-ID: <20230220205217.E2BF5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cdb77d0b86ca7e62b61d7f7e7947af591fe47e71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This bump will fix the following build failure raised since bump of gnuradio to version 3.10.4.0 in commit e37c110bead8b7b35cd97915673fa785ccb39f2d thanks to https://github.com/osmocom/gr-osmosdr/commit/159885f9e67101834c100ceb7affc122e3f98bac: /home/autobuild/autobuild/instance-20/output-1/build/gr-osmosdr-0.2.3/lib/source_impl.cc: In static member function 'static osmosdr::source::sptr osmosdr::source::make(const string&)': /home/autobuild/autobuild/instance-20/output-1/build/gr-osmosdr-0.2.3/lib/source_impl.cc:105:36: error: could not convert 'gnuradio::get_initial_sptr(T*) [with T = source_impl]()' from 'std::shared_ptr' to 'osmosdr::source::sptr' {aka 'boost::shared_ptr'} 105 | return gnuradio::get_initial_sptr( new source_impl(args) ); | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~ | | | std::shared_ptr https://github.com/osmocom/gr-osmosdr/releases/tag/v0.2.4 Fixes: - http://autobuild.buildroot.org/results/5af61d6fb8f8c5d5f91c74a6ef66800236d7bf12 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gr-osmosdr/gr-osmosdr.hash | 2 +- package/gr-osmosdr/gr-osmosdr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gr-osmosdr/gr-osmosdr.hash b/package/gr-osmosdr/gr-osmosdr.hash index 95f1137e38..b5ac50c4ed 100644 --- a/package/gr-osmosdr/gr-osmosdr.hash +++ b/package/gr-osmosdr/gr-osmosdr.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 11b1eb13725ced5ded9121a10aaf7bccf2430c5c69d020791408219968665b71 gr-osmosdr-0.2.3.tar.gz +sha256 28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63 gr-osmosdr-0.2.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index 870db60c55..89907c1baa 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -GR_OSMOSDR_VERSION = 0.2.3 +GR_OSMOSDR_VERSION = 0.2.4 GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,v$(GR_OSMOSDR_VERSION)) GR_OSMOSDR_LICENSE = GPL-3.0+ GR_OSMOSDR_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:05 -0000 Subject: [Buildroot] [git commit branch/next] package/python-maturin: bump to version 0.14.4 Message-ID: <20230220205208.BC1C6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b119f21867b46184ac6d12ebbcd6f77e5ad84a43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index b9936fe8bf..d642119786 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 54976d46be5d1e0d94ae8fbcfb8e72212b1ec9fe9752e3d14510c17a4000efeb maturin-0.14.1.tar.gz +sha256 dd1ee5cd1bb76c434319f305cd30873be2f8221e310168fc376b53b7d0e166ff maturin-0.14.4.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index 3dedfdce11..ea055ffcf6 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.1 +PYTHON_MATURIN_VERSION = 0.14.4 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/a3/54/6bac789ab775b5ef1f07977e998cf719857e2675c3442f3f24e0399e1483 +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/7c/51/36749c1a0881a4292e4f334bd9ddb0865e0991a83070834d1aaa1af7443f PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:05 -0000 Subject: [Buildroot] [git commit branch/next] package/{rust, rust-bin}: bump to version 1.66.0 Message-ID: <20230220205216.5CBFA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de4cf253752d2225b7d258cbaee0ddebf64901fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Link to Rust 1.66.0 annoucement: https://blog.rust-lang.org/2022/12/15/Rust-1.66.0.html Newest version of the source archives have been retrieved with their hash values, and the signature of the .asc files have been verified as follows: $ curl -fsSL https://static.rust-lang.org/rust-key.gpg.ascii | gpg --import $ gpg --verify There is no typographical error in the packages according to the check-pakage utility: $ ./utils/check-package package/rust-bin/* $ ./utils/check-package package/rust/* The testsuite tool were successfully run for rust and rust-bin packages to test the Rust toolchain under 1.66.0: $ ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_rust.TestRustBin $ ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_rust.TestRust In order to verify the compatibility of packages depending on Rust 1.66.0, tests using `./utils/test-pkg` were run. You may want to execute the test-pkg command after creating a `.config` file enabling the corresponding BR2_PACKAGE, for example: Create a file `buildroot/ripgrep.config` containing "BR2_PACKAGE_RIPGREP=y" Then execute: $ ./utils/test-pkg -d test-pkg -c ripgrep.config -p ripgrep Results: librsvg OK ripgrep OK suricata OK bat OK Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.hash | 252 ++++++++++++++++++++--------------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index af9927a028..7cc1052dd9 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 b3a83a9585b8c4ede4eab2a11b3f96895f676d8b46c9642140c4fefd5c309ed1 rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 50595b96f98e0940bbfe00209d6c233e9158e140ecd6088ad3bd53f89b123e9d rust-1.65.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 afa3af620b3a0bf8a1da33413eace1db681db5f99b2572ac016027b3d71a50b7 rust-1.65.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 c6b48026fb131a404bcdc7a691246c3de716e32805d58d1571e253b9a5b047b5 rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 5601b31290790a7077c342c8731bb1d5de1a89639476e14bc7840aeaa3ab6010 rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 8cf900ac125d6bebc97ebb777761923b2062e4fc36692c1f2d68faa0e70949b2 rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 e0654c20446aa5c66def122617f3ca4be9e9b86e75040327e3d35973b6b88980 rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 f02e1bac01415e101fac58608b070b0f37c7df1a142c8001ddbc489cfb85c232 rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 e7dc9bb42c0e738f68f8ad4b05cf4b7bef8fa490c379e5730c7e282507b305ee rust-1.65.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 9455cab767f7b9f46259aac8d953f15f11b3d65513384e2b0a5e77d0432ae82f rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 735b681c8a6e60925c76d6cc899e78b4cb4562ada24a1f265b2021c1faad78ad rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 9ea488da40c347826cce7e238847c745ee566254bb1d077412673f8243fb1cd2 rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 c8793e77ef43336bc372a7a5b4720d5449e92577c7875471c2bc40ddbfde4811 rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 f7d5eb17dbe46ee9d3c4f9fcffc07b8e3311c747545402c8d3b5c43043f27288 rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 32d7f301196d73027fb9a5ae595dbadacdc234307c36b4a175a132e75318e38c rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 453a1443e4753611dc4e6969e50ad8d7984a31d1a457729a860599ed19b1de7a rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 d079e841be640b4ce26aa821f29bc813243a7c0af7b8aca8ca4acf5c2e5b722f rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 1d11ab1d60070ae30ff87b55dca077f4d532d814a9ab7bc77055b5b429a78c6e rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 fec73401941bffce3b6913d31955f1291119dea119c0051d94f271ae7c959d4c rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 c14268337c69650a2618909d8e691489385d748374d73ab8d6a2f9d6b030d70d rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 9368527053c4bab0fd320209b45f0278d0a1e54a37006a56a6e565404ab73fef rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 0b5bc219333e3e983fb1e7e86a0c268c4a52ccbd6326a16785be9d9017d97e9f rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 533eda439eb5ffec258b8219445742d6d60570040b3ff167291e3d0d985b9d70 rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-musl.tar.xz.asc -sha256 7f5d9ae65827aef1a51676927a4c9533f942021d2fd45fd93b23dfaa738ee205 rust-std-1.65.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 99bd62d593a6ab3205cab7f06b5793a075b9d05d868e927a6948e46269d61e82 rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-musl.tar.xz.asc -sha256 644a4c57c1392f776c5ebb13f9832778b69464391b3766e6bbd18c3aa11787a6 rust-std-1.65.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 50c65a8effc85aa89242ba0a2a2c89bfcc4d0a39dcb42396d10b0036b9a4e90c rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-musl.tar.xz.asc -sha256 3bc5043f4eb7bb6418708792ee8e777197e562d03843a9adf62ce245ba07289a rust-std-1.65.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 338c702b79dac33e32dde097084dd38852487d2976c5eb66b44ba8fc8319342b rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 9450745a5e678c9b7e65ecc7d6a016f92d8d22d8091c4a77431b1e58b99a435f rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 a0a0e60a0e850140194250fbbfb962c322d4f474f4ec22d03b7f537034257c09 rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 0862706d22dcfee39b0d2df874dd6065d8c3020c0b8974f6e7b694edd42413ae rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 79e078420f7c45fd1cf38b70620ced50d35ddb1621736b65be987c20481fe5bc rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 482e9245873338a08f47ea2c29683134b8813deb3e3eafb78b786d34bbecce51 rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 672b9ea8018dcdf7d5f79f5298bacc34e7600a082727b4f1a20c14251752aaa2 rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 8a26e08908156ae5a05c64c2732435ef4efb994a2ac6d0b2e9c93c0dae19d089 rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ce18b44300f7d5d94856cef5b270ba010061fafa411beb9782207e26cbab88a6 rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 fa99f123ce14f1cda245857b50fd4709adee960e7d36ce663b87c13aee18b64b rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 a3f6740be345364f4599ae837d2401e0f31e5d33a4f958852d12a384ee581a83 rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 fc2a8816665f464d3085dcd379c44b9de0ee1f1084fae0a4c32c57754b27992b rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 2b588cd2d49688c0c33b7466614123e8fe4c910f4d802fc0ff0662b1772816a9 rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 55abeb1b55aeebc46a4af2f304271361397df58d12f7eb23fb262bc3132c6056 rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 e8d853383355aa17fd8d7efae740ac0f18b3a5f452c9ac62f5042fc96ebda3e9 rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 c9551f9650fcaf74ea4fb6874b6853f9ffecb6925e7a087afb4f36840e5b7b8d rust-1.66.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 ec49ef94889c88f8fd107e9c263003aa6dcd9fb4d17ba057ffab4e4dc28fefd4 rust-1.66.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 755bcca28ee9d4504b7bd87265dc492a8e39550211f8081740940ada9e48cc7e rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 eaaca0295a75a180082456eb3606e6c3fbc16a4f2b54bd754caab5a69b192f88 rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 a194c1a8f1bd8c450872ad2220bfe74e590c5706d4ec939577c69a013a0bbcff rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 9fa197239eb374e071ef4486939c4713a2d662c5e7ebca0505626a3a53a7ed75 rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 6331e676198af2e75734f6566ca62ae22bb61b1d55e749494c454e777a73f195 rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 8d7053db5ea68f4801c7a808a222473076b8a602af70379975e81eede8a7e0ea rust-1.66.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 a656328e1cd36b253bf39807b5a3eacdf0ce7d982fc9fb51a026f273386de84a rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 b5ac5985a8fefd2a0de67197f7c2549aacee502cc784a3c3c93921b005aa31fa rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 ca62347018d1ace5e13a4a2f898dd2b19d5cb96db41482119418538f6482e2db rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 c8d10c558605673fe975b3b1c8ec8d2a9887f18cb97690bf900c19668b6d05ba rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 70650b3a8c04c183a83a2a4ebee7047d6546e69a81e227c24afa6d34ad54fe9b rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 262a2024250e4aa7865a33d52d9b6826b5f059f0562a73f6067a04020879d4f0 rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 e41c5f840d73ed1073ef3a8abb125e6f41a66008ad7817fb2a1e703cf93f0a8b rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 8b8ab8fe4af3ce9604e264fada7ddaed610d8e517d8425d5d85184ea4f111b52 rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 ec0552562348852c487e401168a0ad5f9e90cfc4cf03f5200f80b6594aa47d6d rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 5d166402813621d8c426bdb7dc857f97c72c921c2f2b52a893639a4c73862838 rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 a7170034ddb9218f4f78d6a1d8f8d7ce8c17419015393a96a24aa13f9c89da2d rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 fbc7e7565196fb7ec18b9b2ef0c8a1267fb4825bf68ff0559c0956841d5ade14 rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 7caecb4b926d78ec879e53eaaa4d8001ef575cd80e6340e0518545fd8500eb8f rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 b22aaa59dee87dfc504f7e37ec1f297bbbe3f9ca5a7e4177d40975f2b4b32570 rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-musl.tar.xz.asc +sha256 b538209ea82733f25d88e3a9dc7d7b00f23f61ede128142412404c37846bad69 rust-std-1.66.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 5c7da9cc8d71e72021bfcc8040a6d2c248127d1fbed12d81e2e4bdf61c70b8d6 rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-musl.tar.xz.asc +sha256 3f14c6381c74b175e32ce0f2e6337811a5ea2cc048239fc55101b6319b0ce7f8 rust-std-1.66.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 8909dff6e3fd2c0a2f7c747d8c31003cf6d4fd2ea877ddb933b3fd7861c1cf87 rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-musl.tar.xz.asc +sha256 e76c5fea6da85b42a6f313cc326d064067314532d6a057cfc95f733c2f019de1 rust-std-1.66.0-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 26e5304dc5d592b2a34933794c4636220ad86d78e9c639e36c18f46d3a8c0235 rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 a621c95eef9b548d59234beeea031cc369d5744312a5ebfe4ac2250cb1b900e8 rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 41b2e528e2b123220b2dbc8b6bf93986c22d86091f7cd653ac55d1b169720e1f rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 28de7df8cead0a09a6c4dbb3be6898f7bb495c803e5d1f15945dd66a60ebb2c4 rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 519403a99b0859f21d4cabd347bada629f24fff913dafc54af255e4776d18f1b rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz.asc +sha256 d1a8d76bd7549b3845dad92cdab45876c987e7ba6a27ea67f39414d498a66761 rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 b68691f94417033b612f0fdb510d385499558ea19dcf2caf02a5c1d7141816fd rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0be870ead23d432b83981a45b37bb173315965485ef9ad6dcee1418702a26a3a rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 ed05f169784776c94c4880281fbabab66b49ed05a221d8e06c6926e1161b8bbe rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 93a8b0514106c8039a8767b961090e8a0f8e4b62d1488e70e93e2e553860f70c rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 304008a504385f91672ab6ddf86b50f05a588432f01537049f4fbe95f8d41402 rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 107045313c7b6678579eba1fb0b96519585a2e282570635c64c02ef4544aacaa rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 c59ca7959a019f3f660c1f46bea3c13e7769b67732731469c0c42d02f28d08e7 rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 b4dbc07eb417f77d9b794546d647f014d1650e1e0c0e76ff3d878dc09479e320 rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index 91ee5a5372..b341bc4b7c 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.65.0 +RUST_BIN_VERSION = 1.66.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 9776f3f84c..35028b304b 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.asc -sha256 2d6aa2ea3fedd55acbbd65f78349385f9daa9c14e25db7a8df5d015588eee1cf rustc-1.65.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.xz.asc +sha256 0dc176e34fae9871f855a6ba4cb30fa19d69c5b4428d29281a07419c4950715c rustc-1.66.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index d501391d77..55fa38df18 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.65.0 +RUST_VERSION = 1.66.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:06 -0000 Subject: [Buildroot] [git commit branch/next] boot/ti-k3-r5-loader: new package Message-ID: <20230220205208.A31498648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0189bcb47c7733c36fcbcb88fbf26f57958db576 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is a separate U-Boot package that allows to build the intermediate SPL binary for the Cortex-R5 core on TI's k3 platforms. Usually, the resulting SPL will be used for k3-image-gen to build the full R5 boot binary tiboot3.bin. Signed-off-by: Xuanhao Shi Signed-off-by: Anand Gadiyar Reviewed-by: Giulio Benetti Acked-by: Andrew Davis Tested-by: Bryan Brattlof Cc: Romain Naour Cc: Francois Perrad Reviewed-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 6 ++++ boot/Config.in | 1 + boot/ti-k3-r5-loader/Config.in | 35 ++++++++++++++++++++++ boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 3 ++ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 49 +++++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 29dffaadf1..8e9a743c70 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -128,6 +128,9 @@ F: package/dcron/ F: package/libxmlrpc/ F: package/python-docopt/ +N: Anand Gadiyar +F: boot/ti-k3-r5-loader/ + N: Andr?? Zwing F: package/libkrb5/ F: package/openal/ @@ -3005,6 +3008,9 @@ F: package/python-pyusb/ N: Wojciech Nizi??ski F: package/fwup/ +N: Xuanhao Shi +F: boot/ti-k3-r5-loader/ + N: Yair Ben Avraham F: package/casync/ F: package/gloox/ diff --git a/boot/Config.in b/boot/Config.in index 40472ae07d..ce17b2df6b 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -22,6 +22,7 @@ source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/sun20i-d1-spl/Config.in" source "boot/syslinux/Config.in" +source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in new file mode 100644 index 0000000000..10602c8df3 --- /dev/null +++ b/boot/ti-k3-r5-loader/Config.in @@ -0,0 +1,35 @@ +config BR2_TARGET_TI_K3_R5_LOADER + bool "ti-k3-r5-loader" + depends on BR2_aarch64 + help + Separate U-Boot build for R5 cores on TI's k3 boards. + Usually used to build tiboot3.bin with k3-image-gen. + +if BR2_TARGET_TI_K3_R5_LOADER + +choice + prompt "Configuration" + default BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG + +config BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG + bool "Using an in-tree board defconfig file" + +config BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG + bool "Using a custom board (def)config file" + +endchoice + +config BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG + string "Board defconfig" + depends on BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG + help + Name of the board for which TI K3 R5 Loader should be + built, without the _defconfig suffix. + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE + string "Configuration file path" + depends on BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG + help + Path to the TI K3 R5 Loader configuration file. + +endif diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 100644 index 0000000000..c5d1cb8e09 --- /dev/null +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk new file mode 100644 index 0000000000..422ab20d71 --- /dev/null +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# ti-k3-r5-loader +# +################################################################################ + +TI_K3_R5_LOADER_VERSION = 2022.10 +TI_K3_R5_LOADER_SITE = https://ftp.denx.de/pub/u-boot +TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.bz2 +TI_K3_R5_LOADER_LICENSE = GPL-2.0+ +TI_K3_R5_LOADER_LICENSE_FILES = Licenses/gpl-2.0.txt +TI_K3_R5_LOADER_CPE_ID_VENDOR = denx +TI_K3_R5_LOADER_CPE_ID_PRODUCT = u-boot +TI_K3_R5_LOADER_INSTALL_IMAGES = YES +TI_K3_R5_LOADER_DEPENDENCIES = \ + host-pkgconf \ + $(BR2_MAKE_HOST_DEPENDENCY) \ + host-arm-gnu-toolchain \ + host-openssl + +TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) +TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) +TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ + host-arm-gnu-toolchain \ + $(BR2_MAKE_HOST_DEPENDENCY) \ + $(BR2_BISON_HOST_DEPENDENCY) \ + $(BR2_FLEX_HOST_DEPENDENCY) + +TI_K3_R5_LOADER_BOARD = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD)) +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) +TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig +else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) +TI_K3_R5_LOADER_KCONFIG_FILE = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE)) +endif # BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG +TI_K3_R5_LOADER_MAKE_OPTS = \ + CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ + ARCH=arm \ + HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ + HOSTLDFLAGS="$(HOST_LDFLAGS)" + +define TI_K3_R5_LOADER_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) +endef + +define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS + cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin +endef + +$(eval $(kconfig-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:06 -0000 Subject: [Buildroot] [git commit branch/next] package/capnproto: bump version to 0.10.3 Message-ID: <20230220205218.0856F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96d3e5fd2f5310e9f626084669a9ddaa55c92eda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The 0.10 line offers minor improvements and bug fixes. The previous security bump from 0.9.1 to 0.9.2 fixed CVE-2022-46149, which was also present in 0.10.2, but is fixed within 0.10.3. Signed-off-by: Joel Carlson Signed-off-by: Thomas Petazzoni --- package/capnproto/capnproto.hash | 2 +- package/capnproto/capnproto.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash index c3233e7c8b..0faf69d069 100644 --- a/package/capnproto/capnproto.hash +++ b/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4fe1ca8ab90859f33f08d2c4fcd7099e2983b0b946beecebd2fe051e3a64c67e capnproto-0.9.2.tar.gz +sha256 e07446f56043c983e009038e69d18ff86a2924909f0b518ccf47eccf5ac03919 capnproto-0.10.3.tar.gz sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk index 23f128455a..84acf5fc65 100644 --- a/package/capnproto/capnproto.mk +++ b/package/capnproto/capnproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAPNPROTO_VERSION = 0.9.2 +CAPNPROTO_VERSION = 0.10.3 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:07 -0000 Subject: [Buildroot] [git commit branch/next] package/zfs: bump version to 2.1.7 Message-ID: <20230220205208.D3D938648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ba57676c52a41f9f2efa311f101eb637c39897b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jos?? Luis Salvador Rufo Signed-off-by: Thomas Petazzoni --- package/zfs/zfs.hash | 4 ++-- package/zfs/zfs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index b73fc3b703..0bce3817fe 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,5 +1,5 @@ -# From https://github.com/openzfs/zfs/releases/download/zfs-2.1.6/zfs-2.1.6.sha256.asc -sha256 15339014f8d2131348eb937bf8893849806b6d2645ea607a18c7f117749dbd7a zfs-2.1.6.tar.gz +# From https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.sha256.asc +sha256 6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b zfs-2.1.7.tar.gz sha256 96a27353fe717ff2c8b95deb8b009c4eb750303c6400e2d8a2582ab1ec12b25a bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch # Hash for license files: diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index f7e673c23f..84e9099ba9 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZFS_VERSION = 2.1.6 +ZFS_VERSION = 2.1.7 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) ZFS_PATCH = https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch ZFS_LICENSE = CDDL From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:07 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-firmware: bump to version 20221214 Message-ID: <20230220205218.30BA386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7854488512a96cbcb2d48313b89c7d085a1c2cfb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update WHENCE file hash due to date/firmware file updates: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=32d8681d21f2eef052cadfdfafc47e02eed6c2b2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.hash | 4 ++-- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 321436fb61..6bbc2f9c77 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 c0ddffbbcf30f2e015bddd5c6d3ce1f13976b906aceabda4a57e3c41a3190701 linux-firmware-20221109.tar.xz +sha256 e793783e92acbde549965521462d1d1327827360664cf242dbda08f075654331 linux-firmware-20221214.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -35,6 +35,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 3461a8c8bddaa7b77f489f339abf90e4930fc0cde27915324781d12bd0828f1c WHENCE +sha256 744babd4eae138ccfb5bd343b1589912b9839274f8a794af0b6c9b451df73579 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 526e8c1c44..6990ef38ad 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20221109 +LINUX_FIRMWARE_VERSION = 20221214 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 thomas.petazzoni at bootlin.com Mon Feb 20 20:56:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:08 -0000 Subject: [Buildroot] [git commit branch/next] package/vuejs: bump version to 3.2.45 Message-ID: <20230220205208.ED223828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85c497c230dbf61bd1acbd3dcf55a93887560775 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/vuejs/vuejs.hash | 2 +- package/vuejs/vuejs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vuejs/vuejs.hash b/package/vuejs/vuejs.hash index c53364e97d..e66bee06d3 100644 --- a/package/vuejs/vuejs.hash +++ b/package/vuejs/vuejs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 042033a2a8e6d45f750924953f03c34058d5afd9cc1571fbaf1827eaf04f6943 vue-3.2.33.tgz +sha256 968e71a707a4a1961faa6e513b6bba162ef04c3413d7edaba0abc1a5996ae71b vue-3.2.45.tgz sha256 1bb85cc9b13b81ef41c81c51866172fc345e0503c86726a6755b796590b70175 LICENSE diff --git a/package/vuejs/vuejs.mk b/package/vuejs/vuejs.mk index d544124bbc..8f7d0cd3d4 100644 --- a/package/vuejs/vuejs.mk +++ b/package/vuejs/vuejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_VERSION = 3.2.33 +VUEJS_VERSION = 3.2.45 VUEJS_SOURCE = vue-$(VUEJS_VERSION).tgz VUEJS_SITE = https://registry.npmjs.org/vue/- VUEJS_LICENSE = MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:09 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-firmware: add RTL8125B NIC firmware Message-ID: <20230220205218.24BBF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=909e10a422df33cd67e6f0fc6ad628ee2c1fb933 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Needed due to kernel commit: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0439297be95111cf9ef5ece2091af16d140ce2ef Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 200b4ca564..526e8c1c44 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -584,6 +584,7 @@ LINUX_FIRMWARE_FILES += \ rtl_nic/rtl8107e-1.fw \ rtl_nic/rtl8107e-2.fw \ rtl_nic/rtl8125a-3.fw \ + rtl_nic/rtl8125b-2.fw \ rtl_nic/rtl8168d-1.fw \ rtl_nic/rtl8168d-2.fw \ rtl_nic/rtl8168e-1.fw \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:09 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8192eu: bump to latest version to support up to Linux 6.1 Message-ID: <20230220205209.1D8B6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cb92ddbb92264bcef1794dd7c28ee76c9353c36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index f616def194..0cb9961345 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 75b523ff1cda54d7cd8734a043b2d145231ab81fcc13d3edcd80e00d59201409 rtl8192eu-1e15b6d451731bc4d3ffd587194dc4bd0f286ac0.tar.gz +sha256 827e9592336744cbcfca5de988d8f4e14a62690302d3cabf72aa4bedebded2b7 rtl8192eu-94bce7798bbb18de6d8b1646dedb2511f24867d3.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index 0e8ffea5cb..e1688eef1b 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = 1e15b6d451731bc4d3ffd587194dc4bd0f286ac0 +RTL8192EU_VERSION = 94bce7798bbb18de6d8b1646dedb2511f24867d3 RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 RTL8192EU_MODULE_MAKE_OPTS = \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:10 -0000 Subject: [Buildroot] [git commit branch/next] package/libmodplug: update to git version Message-ID: <20230220205218.4BBA7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=369ff9a88ff8e88b78287e37fbaf191e57598be2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The libmodplug release has not been updated for over 5 years. The git version contains many bug fixes, including for OOB accesses, unaligned reads and writes, etc. This git repository is the official home of libmodplug (by the original author), however a new release does not seem likely anytime soon: there are multiple open issues in the repository asking the author to tag a release, all without a response. Update buildroot to the current version of libmodplug from the official git repository. The build system changed from autotools to cmake since the last version. We add a _CPE_ID_VERSION variable pointing to the latest stable version, so that we don't get notified about all older CVEs that we are not affected by. Signed-off-by: Gleb Mazovetskiy Signed-off-by: Thomas Petazzoni --- package/libmodplug/libmodplug.hash | 2 +- package/libmodplug/libmodplug.mk | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libmodplug/libmodplug.hash b/package/libmodplug/libmodplug.hash index e75152e27f..01ff71014c 100644 --- a/package/libmodplug/libmodplug.hash +++ b/package/libmodplug/libmodplug.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de libmodplug-0.8.9.0.tar.gz +sha256 d145910ca10c3ecab0019d45be7e31ea6be1d1ee951ef0e1f747c9752d20f043 libmodplug-d1b97ed.tar.gz sha256 49942e7b3b175f549e751feb08b5270ca6f6c5fb7a1be9f9517db275ec32c92e COPYING diff --git a/package/libmodplug/libmodplug.mk b/package/libmodplug/libmodplug.mk index 98c38a3b00..735d0e704d 100644 --- a/package/libmodplug/libmodplug.mk +++ b/package/libmodplug/libmodplug.mk @@ -4,11 +4,14 @@ # ################################################################################ -LIBMODPLUG_VERSION = 0.8.9.0 -LIBMODPLUG_SITE = http://downloads.sourceforge.net/project/modplug-xmms/libmodplug/$(LIBMODPLUG_VERSION) +LIBMODPLUG_VERSION = d1b97ed +LIBMODPLUG_SITE = $(call github,Konstanty,libmodplug,$(LIBMODPLUG_VERSION)) LIBMODPLUG_INSTALL_STAGING = YES LIBMODPLUG_LICENSE = Public Domain LIBMODPLUG_LICENSE_FILES = COPYING LIBMODPLUG_CPE_ID_VENDOR = konstanty_bialkowski +# Our version is actually newer than this, but having this allows to +# not have reports about CVEs for versions older than 0.8.9.0. +LIBMODPLUG_CPE_ID_VERSION = 0.8.9.0 -$(eval $(autotools-package)) +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:10 -0000 Subject: [Buildroot] [git commit branch/next] package/vuejs-router: bump version to 4.1.6 Message-ID: <20230220205209.05C708648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fce36d928082685d7f77c3587e15b7827ce0b42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/vuejs-router/vuejs-router.hash | 2 +- package/vuejs-router/vuejs-router.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vuejs-router/vuejs-router.hash b/package/vuejs-router/vuejs-router.hash index ba8f09b508..147e730f20 100644 --- a/package/vuejs-router/vuejs-router.hash +++ b/package/vuejs-router/vuejs-router.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 59d6f3e237e68953fc4e4e22463b487b9fde5733b3ff3392eec488c0cc84976b vue-router-4.0.15.tgz +sha256 437558a84b99d0d89743d4897ec16a90a96a1d3a6786e697a8808a044bcb9b8f vue-router-4.1.6.tgz sha256 9c0015250f592a09d7787efc07152afcf661fff6bda2554359f6d00987828c02 LICENSE diff --git a/package/vuejs-router/vuejs-router.mk b/package/vuejs-router/vuejs-router.mk index 562c698157..de7e9c30c5 100644 --- a/package/vuejs-router/vuejs-router.mk +++ b/package/vuejs-router/vuejs-router.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_ROUTER_VERSION = 4.0.15 +VUEJS_ROUTER_VERSION = 4.1.6 VUEJS_ROUTER_SOURCE = vue-router-$(VUEJS_ROUTER_VERSION).tgz VUEJS_ROUTER_SITE = https://registry.npmjs.org/vue-router/- VUEJS_ROUTER_LICENSE = MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:11 -0000 Subject: [Buildroot] [git commit branch/next] package/rsync: add zstd support Message-ID: <20230220205218.97F05828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83a3744c73d5630ded3f85dc801fe3827ab82889 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 3cdd820fc0..7a32c4f8b1 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -19,7 +19,6 @@ RSYNC_CONF_OPTS = \ --with-included-popt=no \ --disable-roll-simd \ --disable-openssl \ - --disable-zstd \ --disable-lz4 \ --disable-md5-asm @@ -36,4 +35,11 @@ else RSYNC_CONF_OPTS += --disable-xxhash endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +RSYNC_DEPENDENCIES += zstd +RSYNC_CONF_OPTS += --enable-zstd +else +RSYNC_CONF_OPTS += --disable-zstd +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:11 -0000 Subject: [Buildroot] [git commit branch/next] package/balena-engine: bump to version 20.10.21 Message-ID: <20230220205209.2A46D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5d12e66ca9058b86fe90c8e683a5029b1c8bb37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/balena-os/balena-engine/blob/v20.10.21/CHANGELOG.md Signed-off-by: Christian Stewart Tested-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- 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..4adb8ce561 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 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index 0afcea3d7e..ecfb62bfbf 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.21 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:12 -0000 Subject: [Buildroot] [git commit branch/next] package/rsync: add lz4 support Message-ID: <20230220205218.A521086496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9511fe9b1c8fbb797f50dde708f7aae50e6d6a46 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 7a32c4f8b1..9c7824f575 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -19,7 +19,6 @@ RSYNC_CONF_OPTS = \ --with-included-popt=no \ --disable-roll-simd \ --disable-openssl \ - --disable-lz4 \ --disable-md5-asm ifeq ($(BR2_PACKAGE_ACL),y) @@ -28,6 +27,13 @@ else RSYNC_CONF_OPTS += --disable-acl-support endif +ifeq ($(BR2_PACKAGE_LZ4),y) +RSYNC_DEPENDENCIES += lz4 +RSYNC_CONF_OPTS += --enable-lz4 +else +RSYNC_CONF_OPTS += --disable-lz4 +endif + ifeq ($(BR2_PACKAGE_XXHASH),y) RSYNC_DEPENDENCIES += xxhash RSYNC_CONF_OPTS += --enable-xxhash From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:12 -0000 Subject: [Buildroot] [git commit branch/next] package/mali-driver: bump to latest version to build with Linux version up to 6.0 Message-ID: <20230220205209.42E11828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8405dcae33b47bd5b8cf5ef4faf0db01644a1d4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update to the latest upstream version, to which a few fixes were added to fix build failures with Aarch64 and Linux 5.18/5.19/6.0 Fixes: http://autobuild.buildroot.net/results/6f073fea149533a294dd838ce8373185236fe1d4/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/mali-driver/mali-driver.hash | 2 +- package/mali-driver/mali-driver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mali-driver/mali-driver.hash b/package/mali-driver/mali-driver.hash index d18db55fe0..5d32c1af8a 100644 --- a/package/mali-driver/mali-driver.hash +++ b/package/mali-driver/mali-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 512ca30916fd9b9abec70073fced1c2d33757cddbcb3d0f1d1c4b8c6c318f207 mali-driver-3d697de9bce8bc68bf9408d5407873ce32d0f4fc.tar.gz +sha256 761e3f000b4c546cbd35baf34f5a0d1090f048dd44ee543773674192fd95f6b3 mali-driver-87c13e6994b20b5068e3a5e4f4c1b64db666a4c8.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mali-driver/mali-driver.mk b/package/mali-driver/mali-driver.mk index 515f70c429..bdc9fedeb4 100644 --- a/package/mali-driver/mali-driver.mk +++ b/package/mali-driver/mali-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -MALI_DRIVER_VERSION = 3d697de9bce8bc68bf9408d5407873ce32d0f4fc +MALI_DRIVER_VERSION = 87c13e6994b20b5068e3a5e4f4c1b64db666a4c8 MALI_DRIVER_SITE = $(call github,bootlin,mali-driver,$(MALI_DRIVER_VERSION)) MALI_DRIVER_DEPENDENCIES = linux MALI_DRIVER_LICENSE = GPL-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:13 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: add zstd optional dependency Message-ID: <20230220205218.C4194828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f934a00928b413fb3c190749a5bda578c6c02255 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next zstd is an optional dependency which is enabled by default since version 4.0.10 and https://gitlab.com/libtiff/libtiff/-/commit/62b9df5d2af68262fa6fcfb66086bf128f7d67c3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tiff/Config.in | 4 ++++ package/tiff/tiff.mk | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index cc9aa5cfd0..d1004d6668 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -72,4 +72,8 @@ config BR2_PACKAGE_TIFF_UTILITIES help Install all tiff utilities. +config BR2_PACKAGE_TIFF_ZSTD + bool "ZSTD compression" + select BR2_PACKAGE_ZSTD + endif diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index a753065fde..90b28ff37a 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -100,5 +100,12 @@ else TIFF_CONF_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_TIFF_ZSTD),y) +TIFF_CONF_OPTS += --enable-zstd +TIFF_DEPENDENCIES += zstd +else +TIFF_CONF_OPTS += --disable-zstd +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:13 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-mediadriver: fix build without X11 Message-ID: <20230220205209.5C7778648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16ed6b9a4a689496b69ba7b5daf122a88db40ce9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/52c/52c8f5352b16ced4e85286950f95e1b57c564fa5/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-dont-include-va-dricommon-h.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch b/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch new file mode 100644 index 0000000000..9d512f9c0b --- /dev/null +++ b/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch @@ -0,0 +1,36 @@ +From e0d2caafcd5e583a01f7792eaec5d1f2d540bdf1 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Fri, 18 Nov 2022 22:44:52 +1100 +Subject: [PATCH] [Media Common] [VP] dont include va_dricommon.h + + is not in non-X11 libva 2.16.0 +The header "media_libva_putsurface_linux.h" is included + +Downloaded from upstream commit +https://github.com/intel/media-driver/commit/e0d2caafcd5e583a01f7792eaec5d1f2d540bdf1 + +Signed-off-by: Rudi Heitbaum +Signed-off-by: Bernd Kuhls +--- + media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp +index 8695d6c86..6719c07b3 100644 +--- a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp ++++ b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp +@@ -23,7 +23,6 @@ + //! \file ddi_vp_functions.cpp + //! \brief ddi vp functions implementaion. + //! +-#include + #include "ddi_vp_functions.h" + #include "media_libva_util_next.h" + #include "media_libva_common_next.h" +@@ -4700,4 +4699,4 @@ VAStatus DdiVpFunctions::PutSurfaceLinuxHW( + + return VA_STATUS_SUCCESS; + } +-#endif // !defined(ANDROID) && defined(X11_FOUND) +\ No newline at end of file ++#endif // !defined(ANDROID) && defined(X11_FOUND) From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:14 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: add C++ support Message-ID: <20230220205218.E55FC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db853e24b534d54f281cecbed0eb17412cdfc710 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tiff/tiff.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 6d761ad678..c2a4108f35 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -14,7 +14,6 @@ TIFF_INSTALL_STAGING = YES TIFF_CONF_OPTS = \ --disable-contrib \ - --disable-cxx \ --disable-tests \ --without-x @@ -29,6 +28,12 @@ HOST_TIFF_CONF_OPTS = \ --disable-tests HOST_TIFF_DEPENDENCIES = host-pkgconf +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +TIFF_CONF_OPTS += --enable-cxx +else +TIFF_CONF_OPTS += --disable-cxx +endif + ifneq ($(BR2_PACKAGE_TIFF_CCITT),y) TIFF_CONF_OPTS += --disable-ccitt endif From yann.morin.1998 at free.fr Mon Feb 20 20:56:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:14 -0000 Subject: [Buildroot] [git commit branch/next] package/libmbim: fix license Message-ID: <20230220205209.886958648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3b31a39fdffbf738789885f6e318131055e4b9b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libmbim library is licensed under LGPL-2.1+ since at least version 1.8.0 and https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/25cc3ed88d25b17c18fb32f46f96b560834387d3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libmbim/libmbim.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index 1c12b82298..e728cf58f9 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -6,7 +6,7 @@ LIBMBIM_VERSION = 1.28.2 LIBMBIM_SITE = https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION) -LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) +LIBMBIM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs) LIBMBIM_LICENSE_FILES = COPYING COPYING.LIB LIBMBIM_CPE_ID_VENDOR = freedesktop LIBMBIM_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:15 -0000 Subject: [Buildroot] [git commit branch/next] package/python-m2r: remove package Message-ID: <20230220205209.7869E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=470ce5d85c40a2f3b43dd9efaefac0000b047d23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since the bump of python-mistune to version 2.0.4 in commit ead539c27dd61ba010b3723b26af91da0779eb98, the python-m2r package fails to build: it is no longer maintained and no longer compatible with recent versions of python-mistune. Since the only user of python-m2r, python-automat, no longer needs it, we can safely drop this package. Fixes: http://autobuild.buildroot.net/results/9041acc5be4d2b33dee9ff0ad66dcd41d4dbfba1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ++++++ package/Config.in | 1 - package/python-m2r/Config.in | 8 -------- package/python-m2r/python-m2r.hash | 5 ----- package/python-m2r/python-m2r.mk | 16 ---------------- 5 files changed, 6 insertions(+), 30 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 9136ccd0e0..28c6822689 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_PYTHON_M2R + bool "python-m2r removed" + select BR2_LEGACY + help + The python-m2r package is unmaintained. + config BR2_PACKAGE_MESA3D_XVMC bool "mesa Gallium XvMC state tracker removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 10a0493b8d..914c3584e9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1112,7 +1112,6 @@ menu "External python modules" source "package/python-logstash/Config.in" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" - source "package/python-m2r/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-m2r/Config.in b/package/python-m2r/Config.in deleted file mode 100644 index 44dafaa464..0000000000 --- a/package/python-m2r/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_M2R - bool "python-m2r" - select BR2_PACKAGE_PYTHON_MISTUNE # runtime - select BR2_PACKAGE_PYTHON_DOCUTILS # runtime - help - Markdown to reStructuredText converter. - - https://github.com/miyakogi/m2r diff --git a/package/python-m2r/python-m2r.hash b/package/python-m2r/python-m2r.hash deleted file mode 100644 index 4bdd7160d8..0000000000 --- a/package/python-m2r/python-m2r.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/m2r/json -md5 255d080f56eb3d3a82d95194850c99c3 m2r-0.3.1.tar.gz -sha256 aafb67fc49cfb1d89e46a3443ac747e15f4bb42df20ed04f067ad9efbee256ab m2r-0.3.1.tar.gz -# Locally computed sha256 checksums -sha256 28728ec0ecbd8c171ebaeccebf69e3961282fd81f06abc7424c65546b6ae6f27 LICENSE diff --git a/package/python-m2r/python-m2r.mk b/package/python-m2r/python-m2r.mk deleted file mode 100644 index 8a4708f128..0000000000 --- a/package/python-m2r/python-m2r.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-m2r -# -################################################################################ - -PYTHON_M2R_VERSION = 0.3.1 -PYTHON_M2R_SOURCE = m2r-$(PYTHON_M2R_VERSION).tar.gz -PYTHON_M2R_SITE = https://files.pythonhosted.org/packages/94/65/fd40fbdc608298e760affb95869c3baed237dfe5649d62da1eaa1deca8f3 -PYTHON_M2R_SETUP_TYPE = setuptools -PYTHON_M2R_LICENSE = MIT -PYTHON_M2R_LICENSE_FILES = LICENSE -HOST_PYTHON_M2R_DEPENDENCIES = host-python-docutils host-python-mistune - -$(eval $(python-package)) -$(eval $(host-python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:56:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:15 -0000 Subject: [Buildroot] [git commit branch/next] board/freescale/imx28evk/readme.txt: update broken url Message-ID: <20230220205219.759F386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e54522caeeaec2e14065752cb3905d292f374e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next http://freescale.com/ urls are all redirected to the NXP homepage https://www.nxp.com/ Even if the link is not broken in the sense of a 404 http error, the pointed resource is not found. This commit updates the old Freescale link to the correct nxp.com location. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- board/freescale/imx28evk/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/imx28evk/readme.txt b/board/freescale/imx28evk/readme.txt index 2920cb04cd..3b77634fe1 100644 --- a/board/freescale/imx28evk/readme.txt +++ b/board/freescale/imx28evk/readme.txt @@ -54,4 +54,4 @@ Enjoy! References ========== -[1] http://cache.freescale.com/files/32bit/doc/user_guide/EVK_imx28_QuickStart.pdf +[1] https://www.nxp.com/docs/en/user-guide/EVK_imx28_QuickStart.pdf From thomas.petazzoni at bootlin.com Mon Feb 20 20:56:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:56:16 -0000 Subject: [Buildroot] [git commit branch/next] package/bearssl: fix build with make shuffle mode Message-ID: <20230220205217.87DB386494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1ecfe135747c28bcb3492e60f0d7aea630ead55 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The make targets in bearssl are missing the $(OBJDIR) target which causes build failures when using make with shuffle mode. Add a patch which adds the missing $(OBJDIR) targets. Fixes: Assembler messages: Fatal error: can't create build/obj/x509_minimal_full.o: No such file or directory make[2]: *** [mk/Rules.mk:1190: build/obj/x509_minimal_full.o] Error 1 shuffle=reverse Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../0001-Fix-missing-objdir-dependency.patch | 1252 ++++++++++++++++++++ 1 file changed, 1252 insertions(+) diff --git a/package/bearssl/0001-Fix-missing-objdir-dependency.patch b/package/bearssl/0001-Fix-missing-objdir-dependency.patch new file mode 100644 index 0000000000..4d4d9ee705 --- /dev/null +++ b/package/bearssl/0001-Fix-missing-objdir-dependency.patch @@ -0,0 +1,1252 @@ +From 6fddb4056e0b8f72c2602ef82dcd973704354962 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Mon, 12 Dec 2022 10:12:58 -0700 +Subject: [PATCH] Fix missing objdir dependency. + +Make targets within $(OBJDIR) must depend on the $(OBJDIR) +target. + +Fixes: +Assembler messages: +Fatal error: can't create build/obj/x509_minimal_full.o: No such file or directory +make[2]: *** [mk/Rules.mk:1190: build/obj/x509_minimal_full.o] Error 1 shuffle=reverse + +Signed-off-by: James Hilliard +Cc: Thomas Pornin +Cc: Thomas Pornin +[Upstream status: emailed patch to maintainer] +--- + mk/Rules.mk | 594 +++++++++++++++++++++++++------------------------- + mk/mkrules.sh | 8 +- + 2 files changed, 301 insertions(+), 301 deletions(-) + +diff --git a/mk/Rules.mk b/mk/Rules.mk +index b480bd6..a868977 100644 +--- a/mk/Rules.mk ++++ b/mk/Rules.mk +@@ -358,893 +358,893 @@ $(TESTSPEED): $(BEARSSLLIB) $(OBJTESTSPEED) + $(TESTX509): $(BEARSSLLIB) $(OBJTESTX509) + $(LD) $(LDFLAGS) $(LDOUT)$(TESTX509) $(OBJTESTX509) $(BEARSSLLIB) + +-$(OBJDIR)$Psettings$O: src$Psettings.c $(HEADERSPRIV) ++$(OBJDIR)$Psettings$O: $(OBJDIR) src$Psettings.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psettings$O src$Psettings.c + +-$(OBJDIR)$Pccm$O: src$Paead$Pccm.c $(HEADERSPRIV) ++$(OBJDIR)$Pccm$O: $(OBJDIR) src$Paead$Pccm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pccm$O src$Paead$Pccm.c + +-$(OBJDIR)$Peax$O: src$Paead$Peax.c $(HEADERSPRIV) ++$(OBJDIR)$Peax$O: $(OBJDIR) src$Paead$Peax.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Peax$O src$Paead$Peax.c + +-$(OBJDIR)$Pgcm$O: src$Paead$Pgcm.c $(HEADERSPRIV) ++$(OBJDIR)$Pgcm$O: $(OBJDIR) src$Paead$Pgcm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pgcm$O src$Paead$Pgcm.c + +-$(OBJDIR)$Pccopy$O: src$Pcodec$Pccopy.c $(HEADERSPRIV) ++$(OBJDIR)$Pccopy$O: $(OBJDIR) src$Pcodec$Pccopy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pccopy$O src$Pcodec$Pccopy.c + +-$(OBJDIR)$Pdec16be$O: src$Pcodec$Pdec16be.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec16be$O: $(OBJDIR) src$Pcodec$Pdec16be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec16be$O src$Pcodec$Pdec16be.c + +-$(OBJDIR)$Pdec16le$O: src$Pcodec$Pdec16le.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec16le$O: $(OBJDIR) src$Pcodec$Pdec16le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec16le$O src$Pcodec$Pdec16le.c + +-$(OBJDIR)$Pdec32be$O: src$Pcodec$Pdec32be.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec32be$O: $(OBJDIR) src$Pcodec$Pdec32be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec32be$O src$Pcodec$Pdec32be.c + +-$(OBJDIR)$Pdec32le$O: src$Pcodec$Pdec32le.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec32le$O: $(OBJDIR) src$Pcodec$Pdec32le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec32le$O src$Pcodec$Pdec32le.c + +-$(OBJDIR)$Pdec64be$O: src$Pcodec$Pdec64be.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec64be$O: $(OBJDIR) src$Pcodec$Pdec64be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec64be$O src$Pcodec$Pdec64be.c + +-$(OBJDIR)$Pdec64le$O: src$Pcodec$Pdec64le.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec64le$O: $(OBJDIR) src$Pcodec$Pdec64le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec64le$O src$Pcodec$Pdec64le.c + +-$(OBJDIR)$Penc16be$O: src$Pcodec$Penc16be.c $(HEADERSPRIV) ++$(OBJDIR)$Penc16be$O: $(OBJDIR) src$Pcodec$Penc16be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc16be$O src$Pcodec$Penc16be.c + +-$(OBJDIR)$Penc16le$O: src$Pcodec$Penc16le.c $(HEADERSPRIV) ++$(OBJDIR)$Penc16le$O: $(OBJDIR) src$Pcodec$Penc16le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc16le$O src$Pcodec$Penc16le.c + +-$(OBJDIR)$Penc32be$O: src$Pcodec$Penc32be.c $(HEADERSPRIV) ++$(OBJDIR)$Penc32be$O: $(OBJDIR) src$Pcodec$Penc32be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc32be$O src$Pcodec$Penc32be.c + +-$(OBJDIR)$Penc32le$O: src$Pcodec$Penc32le.c $(HEADERSPRIV) ++$(OBJDIR)$Penc32le$O: $(OBJDIR) src$Pcodec$Penc32le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc32le$O src$Pcodec$Penc32le.c + +-$(OBJDIR)$Penc64be$O: src$Pcodec$Penc64be.c $(HEADERSPRIV) ++$(OBJDIR)$Penc64be$O: $(OBJDIR) src$Pcodec$Penc64be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc64be$O src$Pcodec$Penc64be.c + +-$(OBJDIR)$Penc64le$O: src$Pcodec$Penc64le.c $(HEADERSPRIV) ++$(OBJDIR)$Penc64le$O: $(OBJDIR) src$Pcodec$Penc64le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc64le$O src$Pcodec$Penc64le.c + +-$(OBJDIR)$Ppemdec$O: src$Pcodec$Ppemdec.c $(HEADERSPRIV) ++$(OBJDIR)$Ppemdec$O: $(OBJDIR) src$Pcodec$Ppemdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppemdec$O src$Pcodec$Ppemdec.c + +-$(OBJDIR)$Ppemenc$O: src$Pcodec$Ppemenc.c $(HEADERSPRIV) ++$(OBJDIR)$Ppemenc$O: $(OBJDIR) src$Pcodec$Ppemenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppemenc$O src$Pcodec$Ppemenc.c + +-$(OBJDIR)$Pec_all_m15$O: src$Pec$Pec_all_m15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_all_m15$O: $(OBJDIR) src$Pec$Pec_all_m15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_all_m15$O src$Pec$Pec_all_m15.c + +-$(OBJDIR)$Pec_all_m31$O: src$Pec$Pec_all_m31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_all_m31$O: $(OBJDIR) src$Pec$Pec_all_m31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_all_m31$O src$Pec$Pec_all_m31.c + +-$(OBJDIR)$Pec_c25519_i15$O: src$Pec$Pec_c25519_i15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_i15$O: $(OBJDIR) src$Pec$Pec_c25519_i15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_i15$O src$Pec$Pec_c25519_i15.c + +-$(OBJDIR)$Pec_c25519_i31$O: src$Pec$Pec_c25519_i31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_i31$O: $(OBJDIR) src$Pec$Pec_c25519_i31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_i31$O src$Pec$Pec_c25519_i31.c + +-$(OBJDIR)$Pec_c25519_m15$O: src$Pec$Pec_c25519_m15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_m15$O: $(OBJDIR) src$Pec$Pec_c25519_m15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_m15$O src$Pec$Pec_c25519_m15.c + +-$(OBJDIR)$Pec_c25519_m31$O: src$Pec$Pec_c25519_m31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_m31$O: $(OBJDIR) src$Pec$Pec_c25519_m31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_m31$O src$Pec$Pec_c25519_m31.c + +-$(OBJDIR)$Pec_curve25519$O: src$Pec$Pec_curve25519.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_curve25519$O: $(OBJDIR) src$Pec$Pec_curve25519.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_curve25519$O src$Pec$Pec_curve25519.c + +-$(OBJDIR)$Pec_default$O: src$Pec$Pec_default.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_default$O: $(OBJDIR) src$Pec$Pec_default.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_default$O src$Pec$Pec_default.c + +-$(OBJDIR)$Pec_keygen$O: src$Pec$Pec_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_keygen$O: $(OBJDIR) src$Pec$Pec_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_keygen$O src$Pec$Pec_keygen.c + +-$(OBJDIR)$Pec_p256_m15$O: src$Pec$Pec_p256_m15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_p256_m15$O: $(OBJDIR) src$Pec$Pec_p256_m15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_p256_m15$O src$Pec$Pec_p256_m15.c + +-$(OBJDIR)$Pec_p256_m31$O: src$Pec$Pec_p256_m31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_p256_m31$O: $(OBJDIR) src$Pec$Pec_p256_m31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_p256_m31$O src$Pec$Pec_p256_m31.c + +-$(OBJDIR)$Pec_prime_i15$O: src$Pec$Pec_prime_i15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_prime_i15$O: $(OBJDIR) src$Pec$Pec_prime_i15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_prime_i15$O src$Pec$Pec_prime_i15.c + +-$(OBJDIR)$Pec_prime_i31$O: src$Pec$Pec_prime_i31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_prime_i31$O: $(OBJDIR) src$Pec$Pec_prime_i31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_prime_i31$O src$Pec$Pec_prime_i31.c + +-$(OBJDIR)$Pec_pubkey$O: src$Pec$Pec_pubkey.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_pubkey$O: $(OBJDIR) src$Pec$Pec_pubkey.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_pubkey$O src$Pec$Pec_pubkey.c + +-$(OBJDIR)$Pec_secp256r1$O: src$Pec$Pec_secp256r1.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_secp256r1$O: $(OBJDIR) src$Pec$Pec_secp256r1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_secp256r1$O src$Pec$Pec_secp256r1.c + +-$(OBJDIR)$Pec_secp384r1$O: src$Pec$Pec_secp384r1.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_secp384r1$O: $(OBJDIR) src$Pec$Pec_secp384r1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_secp384r1$O src$Pec$Pec_secp384r1.c + +-$(OBJDIR)$Pec_secp521r1$O: src$Pec$Pec_secp521r1.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_secp521r1$O: $(OBJDIR) src$Pec$Pec_secp521r1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_secp521r1$O src$Pec$Pec_secp521r1.c + +-$(OBJDIR)$Pecdsa_atr$O: src$Pec$Pecdsa_atr.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_atr$O: $(OBJDIR) src$Pec$Pecdsa_atr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_atr$O src$Pec$Pecdsa_atr.c + +-$(OBJDIR)$Pecdsa_default_sign_asn1$O: src$Pec$Pecdsa_default_sign_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_sign_asn1$O: $(OBJDIR) src$Pec$Pecdsa_default_sign_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_sign_asn1$O src$Pec$Pecdsa_default_sign_asn1.c + +-$(OBJDIR)$Pecdsa_default_sign_raw$O: src$Pec$Pecdsa_default_sign_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_sign_raw$O: $(OBJDIR) src$Pec$Pecdsa_default_sign_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_sign_raw$O src$Pec$Pecdsa_default_sign_raw.c + +-$(OBJDIR)$Pecdsa_default_vrfy_asn1$O: src$Pec$Pecdsa_default_vrfy_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_vrfy_asn1$O: $(OBJDIR) src$Pec$Pecdsa_default_vrfy_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_vrfy_asn1$O src$Pec$Pecdsa_default_vrfy_asn1.c + +-$(OBJDIR)$Pecdsa_default_vrfy_raw$O: src$Pec$Pecdsa_default_vrfy_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_vrfy_raw$O: $(OBJDIR) src$Pec$Pecdsa_default_vrfy_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_vrfy_raw$O src$Pec$Pecdsa_default_vrfy_raw.c + +-$(OBJDIR)$Pecdsa_i15_bits$O: src$Pec$Pecdsa_i15_bits.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_bits$O: $(OBJDIR) src$Pec$Pecdsa_i15_bits.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_bits$O src$Pec$Pecdsa_i15_bits.c + +-$(OBJDIR)$Pecdsa_i15_sign_asn1$O: src$Pec$Pecdsa_i15_sign_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_sign_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i15_sign_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_sign_asn1$O src$Pec$Pecdsa_i15_sign_asn1.c + +-$(OBJDIR)$Pecdsa_i15_sign_raw$O: src$Pec$Pecdsa_i15_sign_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_sign_raw$O: $(OBJDIR) src$Pec$Pecdsa_i15_sign_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_sign_raw$O src$Pec$Pecdsa_i15_sign_raw.c + +-$(OBJDIR)$Pecdsa_i15_vrfy_asn1$O: src$Pec$Pecdsa_i15_vrfy_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_vrfy_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i15_vrfy_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_vrfy_asn1$O src$Pec$Pecdsa_i15_vrfy_asn1.c + +-$(OBJDIR)$Pecdsa_i15_vrfy_raw$O: src$Pec$Pecdsa_i15_vrfy_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_vrfy_raw$O: $(OBJDIR) src$Pec$Pecdsa_i15_vrfy_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_vrfy_raw$O src$Pec$Pecdsa_i15_vrfy_raw.c + +-$(OBJDIR)$Pecdsa_i31_bits$O: src$Pec$Pecdsa_i31_bits.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_bits$O: $(OBJDIR) src$Pec$Pecdsa_i31_bits.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_bits$O src$Pec$Pecdsa_i31_bits.c + +-$(OBJDIR)$Pecdsa_i31_sign_asn1$O: src$Pec$Pecdsa_i31_sign_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_sign_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i31_sign_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_sign_asn1$O src$Pec$Pecdsa_i31_sign_asn1.c + +-$(OBJDIR)$Pecdsa_i31_sign_raw$O: src$Pec$Pecdsa_i31_sign_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_sign_raw$O: $(OBJDIR) src$Pec$Pecdsa_i31_sign_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_sign_raw$O src$Pec$Pecdsa_i31_sign_raw.c + +-$(OBJDIR)$Pecdsa_i31_vrfy_asn1$O: src$Pec$Pecdsa_i31_vrfy_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_vrfy_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i31_vrfy_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_vrfy_asn1$O src$Pec$Pecdsa_i31_vrfy_asn1.c + +-$(OBJDIR)$Pecdsa_i31_vrfy_raw$O: src$Pec$Pecdsa_i31_vrfy_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_vrfy_raw$O: $(OBJDIR) src$Pec$Pecdsa_i31_vrfy_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_vrfy_raw$O src$Pec$Pecdsa_i31_vrfy_raw.c + +-$(OBJDIR)$Pecdsa_rta$O: src$Pec$Pecdsa_rta.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_rta$O: $(OBJDIR) src$Pec$Pecdsa_rta.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_rta$O src$Pec$Pecdsa_rta.c + +-$(OBJDIR)$Pdig_oid$O: src$Phash$Pdig_oid.c $(HEADERSPRIV) ++$(OBJDIR)$Pdig_oid$O: $(OBJDIR) src$Phash$Pdig_oid.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdig_oid$O src$Phash$Pdig_oid.c + +-$(OBJDIR)$Pdig_size$O: src$Phash$Pdig_size.c $(HEADERSPRIV) ++$(OBJDIR)$Pdig_size$O: $(OBJDIR) src$Phash$Pdig_size.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdig_size$O src$Phash$Pdig_size.c + +-$(OBJDIR)$Pghash_ctmul$O: src$Phash$Pghash_ctmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_ctmul$O: $(OBJDIR) src$Phash$Pghash_ctmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_ctmul$O src$Phash$Pghash_ctmul.c + +-$(OBJDIR)$Pghash_ctmul32$O: src$Phash$Pghash_ctmul32.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_ctmul32$O: $(OBJDIR) src$Phash$Pghash_ctmul32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_ctmul32$O src$Phash$Pghash_ctmul32.c + +-$(OBJDIR)$Pghash_ctmul64$O: src$Phash$Pghash_ctmul64.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_ctmul64$O: $(OBJDIR) src$Phash$Pghash_ctmul64.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_ctmul64$O src$Phash$Pghash_ctmul64.c + +-$(OBJDIR)$Pghash_pclmul$O: src$Phash$Pghash_pclmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_pclmul$O: $(OBJDIR) src$Phash$Pghash_pclmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_pclmul$O src$Phash$Pghash_pclmul.c + +-$(OBJDIR)$Pghash_pwr8$O: src$Phash$Pghash_pwr8.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_pwr8$O: $(OBJDIR) src$Phash$Pghash_pwr8.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_pwr8$O src$Phash$Pghash_pwr8.c + +-$(OBJDIR)$Pmd5$O: src$Phash$Pmd5.c $(HEADERSPRIV) ++$(OBJDIR)$Pmd5$O: $(OBJDIR) src$Phash$Pmd5.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmd5$O src$Phash$Pmd5.c + +-$(OBJDIR)$Pmd5sha1$O: src$Phash$Pmd5sha1.c $(HEADERSPRIV) ++$(OBJDIR)$Pmd5sha1$O: $(OBJDIR) src$Phash$Pmd5sha1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmd5sha1$O src$Phash$Pmd5sha1.c + +-$(OBJDIR)$Pmgf1$O: src$Phash$Pmgf1.c $(HEADERSPRIV) ++$(OBJDIR)$Pmgf1$O: $(OBJDIR) src$Phash$Pmgf1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmgf1$O src$Phash$Pmgf1.c + +-$(OBJDIR)$Pmultihash$O: src$Phash$Pmultihash.c $(HEADERSPRIV) ++$(OBJDIR)$Pmultihash$O: $(OBJDIR) src$Phash$Pmultihash.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmultihash$O src$Phash$Pmultihash.c + +-$(OBJDIR)$Psha1$O: src$Phash$Psha1.c $(HEADERSPRIV) ++$(OBJDIR)$Psha1$O: $(OBJDIR) src$Phash$Psha1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psha1$O src$Phash$Psha1.c + +-$(OBJDIR)$Psha2big$O: src$Phash$Psha2big.c $(HEADERSPRIV) ++$(OBJDIR)$Psha2big$O: $(OBJDIR) src$Phash$Psha2big.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psha2big$O src$Phash$Psha2big.c + +-$(OBJDIR)$Psha2small$O: src$Phash$Psha2small.c $(HEADERSPRIV) ++$(OBJDIR)$Psha2small$O: $(OBJDIR) src$Phash$Psha2small.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psha2small$O src$Phash$Psha2small.c + +-$(OBJDIR)$Pi15_add$O: src$Pint$Pi15_add.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_add$O: $(OBJDIR) src$Pint$Pi15_add.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_add$O src$Pint$Pi15_add.c + +-$(OBJDIR)$Pi15_bitlen$O: src$Pint$Pi15_bitlen.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_bitlen$O: $(OBJDIR) src$Pint$Pi15_bitlen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_bitlen$O src$Pint$Pi15_bitlen.c + +-$(OBJDIR)$Pi15_decmod$O: src$Pint$Pi15_decmod.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_decmod$O: $(OBJDIR) src$Pint$Pi15_decmod.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_decmod$O src$Pint$Pi15_decmod.c + +-$(OBJDIR)$Pi15_decode$O: src$Pint$Pi15_decode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_decode$O: $(OBJDIR) src$Pint$Pi15_decode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_decode$O src$Pint$Pi15_decode.c + +-$(OBJDIR)$Pi15_decred$O: src$Pint$Pi15_decred.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_decred$O: $(OBJDIR) src$Pint$Pi15_decred.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_decred$O src$Pint$Pi15_decred.c + +-$(OBJDIR)$Pi15_encode$O: src$Pint$Pi15_encode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_encode$O: $(OBJDIR) src$Pint$Pi15_encode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_encode$O src$Pint$Pi15_encode.c + +-$(OBJDIR)$Pi15_fmont$O: src$Pint$Pi15_fmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_fmont$O: $(OBJDIR) src$Pint$Pi15_fmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_fmont$O src$Pint$Pi15_fmont.c + +-$(OBJDIR)$Pi15_iszero$O: src$Pint$Pi15_iszero.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_iszero$O: $(OBJDIR) src$Pint$Pi15_iszero.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_iszero$O src$Pint$Pi15_iszero.c + +-$(OBJDIR)$Pi15_moddiv$O: src$Pint$Pi15_moddiv.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_moddiv$O: $(OBJDIR) src$Pint$Pi15_moddiv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_moddiv$O src$Pint$Pi15_moddiv.c + +-$(OBJDIR)$Pi15_modpow$O: src$Pint$Pi15_modpow.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_modpow$O: $(OBJDIR) src$Pint$Pi15_modpow.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_modpow$O src$Pint$Pi15_modpow.c + +-$(OBJDIR)$Pi15_modpow2$O: src$Pint$Pi15_modpow2.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_modpow2$O: $(OBJDIR) src$Pint$Pi15_modpow2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_modpow2$O src$Pint$Pi15_modpow2.c + +-$(OBJDIR)$Pi15_montmul$O: src$Pint$Pi15_montmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_montmul$O: $(OBJDIR) src$Pint$Pi15_montmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_montmul$O src$Pint$Pi15_montmul.c + +-$(OBJDIR)$Pi15_mulacc$O: src$Pint$Pi15_mulacc.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_mulacc$O: $(OBJDIR) src$Pint$Pi15_mulacc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_mulacc$O src$Pint$Pi15_mulacc.c + +-$(OBJDIR)$Pi15_muladd$O: src$Pint$Pi15_muladd.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_muladd$O: $(OBJDIR) src$Pint$Pi15_muladd.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_muladd$O src$Pint$Pi15_muladd.c + +-$(OBJDIR)$Pi15_ninv15$O: src$Pint$Pi15_ninv15.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_ninv15$O: $(OBJDIR) src$Pint$Pi15_ninv15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_ninv15$O src$Pint$Pi15_ninv15.c + +-$(OBJDIR)$Pi15_reduce$O: src$Pint$Pi15_reduce.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_reduce$O: $(OBJDIR) src$Pint$Pi15_reduce.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_reduce$O src$Pint$Pi15_reduce.c + +-$(OBJDIR)$Pi15_rshift$O: src$Pint$Pi15_rshift.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_rshift$O: $(OBJDIR) src$Pint$Pi15_rshift.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_rshift$O src$Pint$Pi15_rshift.c + +-$(OBJDIR)$Pi15_sub$O: src$Pint$Pi15_sub.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_sub$O: $(OBJDIR) src$Pint$Pi15_sub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_sub$O src$Pint$Pi15_sub.c + +-$(OBJDIR)$Pi15_tmont$O: src$Pint$Pi15_tmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_tmont$O: $(OBJDIR) src$Pint$Pi15_tmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_tmont$O src$Pint$Pi15_tmont.c + +-$(OBJDIR)$Pi31_add$O: src$Pint$Pi31_add.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_add$O: $(OBJDIR) src$Pint$Pi31_add.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_add$O src$Pint$Pi31_add.c + +-$(OBJDIR)$Pi31_bitlen$O: src$Pint$Pi31_bitlen.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_bitlen$O: $(OBJDIR) src$Pint$Pi31_bitlen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_bitlen$O src$Pint$Pi31_bitlen.c + +-$(OBJDIR)$Pi31_decmod$O: src$Pint$Pi31_decmod.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_decmod$O: $(OBJDIR) src$Pint$Pi31_decmod.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_decmod$O src$Pint$Pi31_decmod.c + +-$(OBJDIR)$Pi31_decode$O: src$Pint$Pi31_decode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_decode$O: $(OBJDIR) src$Pint$Pi31_decode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_decode$O src$Pint$Pi31_decode.c + +-$(OBJDIR)$Pi31_decred$O: src$Pint$Pi31_decred.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_decred$O: $(OBJDIR) src$Pint$Pi31_decred.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_decred$O src$Pint$Pi31_decred.c + +-$(OBJDIR)$Pi31_encode$O: src$Pint$Pi31_encode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_encode$O: $(OBJDIR) src$Pint$Pi31_encode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_encode$O src$Pint$Pi31_encode.c + +-$(OBJDIR)$Pi31_fmont$O: src$Pint$Pi31_fmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_fmont$O: $(OBJDIR) src$Pint$Pi31_fmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_fmont$O src$Pint$Pi31_fmont.c + +-$(OBJDIR)$Pi31_iszero$O: src$Pint$Pi31_iszero.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_iszero$O: $(OBJDIR) src$Pint$Pi31_iszero.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_iszero$O src$Pint$Pi31_iszero.c + +-$(OBJDIR)$Pi31_moddiv$O: src$Pint$Pi31_moddiv.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_moddiv$O: $(OBJDIR) src$Pint$Pi31_moddiv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_moddiv$O src$Pint$Pi31_moddiv.c + +-$(OBJDIR)$Pi31_modpow$O: src$Pint$Pi31_modpow.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_modpow$O: $(OBJDIR) src$Pint$Pi31_modpow.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_modpow$O src$Pint$Pi31_modpow.c + +-$(OBJDIR)$Pi31_modpow2$O: src$Pint$Pi31_modpow2.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_modpow2$O: $(OBJDIR) src$Pint$Pi31_modpow2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_modpow2$O src$Pint$Pi31_modpow2.c + +-$(OBJDIR)$Pi31_montmul$O: src$Pint$Pi31_montmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_montmul$O: $(OBJDIR) src$Pint$Pi31_montmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_montmul$O src$Pint$Pi31_montmul.c + +-$(OBJDIR)$Pi31_mulacc$O: src$Pint$Pi31_mulacc.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_mulacc$O: $(OBJDIR) src$Pint$Pi31_mulacc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_mulacc$O src$Pint$Pi31_mulacc.c + +-$(OBJDIR)$Pi31_muladd$O: src$Pint$Pi31_muladd.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_muladd$O: $(OBJDIR) src$Pint$Pi31_muladd.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_muladd$O src$Pint$Pi31_muladd.c + +-$(OBJDIR)$Pi31_ninv31$O: src$Pint$Pi31_ninv31.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_ninv31$O: $(OBJDIR) src$Pint$Pi31_ninv31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_ninv31$O src$Pint$Pi31_ninv31.c + +-$(OBJDIR)$Pi31_reduce$O: src$Pint$Pi31_reduce.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_reduce$O: $(OBJDIR) src$Pint$Pi31_reduce.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_reduce$O src$Pint$Pi31_reduce.c + +-$(OBJDIR)$Pi31_rshift$O: src$Pint$Pi31_rshift.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_rshift$O: $(OBJDIR) src$Pint$Pi31_rshift.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_rshift$O src$Pint$Pi31_rshift.c + +-$(OBJDIR)$Pi31_sub$O: src$Pint$Pi31_sub.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_sub$O: $(OBJDIR) src$Pint$Pi31_sub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_sub$O src$Pint$Pi31_sub.c + +-$(OBJDIR)$Pi31_tmont$O: src$Pint$Pi31_tmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_tmont$O: $(OBJDIR) src$Pint$Pi31_tmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_tmont$O src$Pint$Pi31_tmont.c + +-$(OBJDIR)$Pi32_add$O: src$Pint$Pi32_add.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_add$O: $(OBJDIR) src$Pint$Pi32_add.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_add$O src$Pint$Pi32_add.c + +-$(OBJDIR)$Pi32_bitlen$O: src$Pint$Pi32_bitlen.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_bitlen$O: $(OBJDIR) src$Pint$Pi32_bitlen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_bitlen$O src$Pint$Pi32_bitlen.c + +-$(OBJDIR)$Pi32_decmod$O: src$Pint$Pi32_decmod.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_decmod$O: $(OBJDIR) src$Pint$Pi32_decmod.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_decmod$O src$Pint$Pi32_decmod.c + +-$(OBJDIR)$Pi32_decode$O: src$Pint$Pi32_decode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_decode$O: $(OBJDIR) src$Pint$Pi32_decode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_decode$O src$Pint$Pi32_decode.c + +-$(OBJDIR)$Pi32_decred$O: src$Pint$Pi32_decred.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_decred$O: $(OBJDIR) src$Pint$Pi32_decred.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_decred$O src$Pint$Pi32_decred.c + +-$(OBJDIR)$Pi32_div32$O: src$Pint$Pi32_div32.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_div32$O: $(OBJDIR) src$Pint$Pi32_div32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_div32$O src$Pint$Pi32_div32.c + +-$(OBJDIR)$Pi32_encode$O: src$Pint$Pi32_encode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_encode$O: $(OBJDIR) src$Pint$Pi32_encode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_encode$O src$Pint$Pi32_encode.c + +-$(OBJDIR)$Pi32_fmont$O: src$Pint$Pi32_fmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_fmont$O: $(OBJDIR) src$Pint$Pi32_fmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_fmont$O src$Pint$Pi32_fmont.c + +-$(OBJDIR)$Pi32_iszero$O: src$Pint$Pi32_iszero.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_iszero$O: $(OBJDIR) src$Pint$Pi32_iszero.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_iszero$O src$Pint$Pi32_iszero.c + +-$(OBJDIR)$Pi32_modpow$O: src$Pint$Pi32_modpow.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_modpow$O: $(OBJDIR) src$Pint$Pi32_modpow.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_modpow$O src$Pint$Pi32_modpow.c + +-$(OBJDIR)$Pi32_montmul$O: src$Pint$Pi32_montmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_montmul$O: $(OBJDIR) src$Pint$Pi32_montmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_montmul$O src$Pint$Pi32_montmul.c + +-$(OBJDIR)$Pi32_mulacc$O: src$Pint$Pi32_mulacc.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_mulacc$O: $(OBJDIR) src$Pint$Pi32_mulacc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_mulacc$O src$Pint$Pi32_mulacc.c + +-$(OBJDIR)$Pi32_muladd$O: src$Pint$Pi32_muladd.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_muladd$O: $(OBJDIR) src$Pint$Pi32_muladd.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_muladd$O src$Pint$Pi32_muladd.c + +-$(OBJDIR)$Pi32_ninv32$O: src$Pint$Pi32_ninv32.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_ninv32$O: $(OBJDIR) src$Pint$Pi32_ninv32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_ninv32$O src$Pint$Pi32_ninv32.c + +-$(OBJDIR)$Pi32_reduce$O: src$Pint$Pi32_reduce.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_reduce$O: $(OBJDIR) src$Pint$Pi32_reduce.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_reduce$O src$Pint$Pi32_reduce.c + +-$(OBJDIR)$Pi32_sub$O: src$Pint$Pi32_sub.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_sub$O: $(OBJDIR) src$Pint$Pi32_sub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_sub$O src$Pint$Pi32_sub.c + +-$(OBJDIR)$Pi32_tmont$O: src$Pint$Pi32_tmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_tmont$O: $(OBJDIR) src$Pint$Pi32_tmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_tmont$O src$Pint$Pi32_tmont.c + +-$(OBJDIR)$Pi62_modpow2$O: src$Pint$Pi62_modpow2.c $(HEADERSPRIV) ++$(OBJDIR)$Pi62_modpow2$O: $(OBJDIR) src$Pint$Pi62_modpow2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi62_modpow2$O src$Pint$Pi62_modpow2.c + +-$(OBJDIR)$Phkdf$O: src$Pkdf$Phkdf.c $(HEADERSPRIV) ++$(OBJDIR)$Phkdf$O: $(OBJDIR) src$Pkdf$Phkdf.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phkdf$O src$Pkdf$Phkdf.c + +-$(OBJDIR)$Phmac$O: src$Pmac$Phmac.c $(HEADERSPRIV) ++$(OBJDIR)$Phmac$O: $(OBJDIR) src$Pmac$Phmac.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phmac$O src$Pmac$Phmac.c + +-$(OBJDIR)$Phmac_ct$O: src$Pmac$Phmac_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Phmac_ct$O: $(OBJDIR) src$Pmac$Phmac_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phmac_ct$O src$Pmac$Phmac_ct.c + +-$(OBJDIR)$Paesctr_drbg$O: src$Prand$Paesctr_drbg.c $(HEADERSPRIV) ++$(OBJDIR)$Paesctr_drbg$O: $(OBJDIR) src$Prand$Paesctr_drbg.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paesctr_drbg$O src$Prand$Paesctr_drbg.c + +-$(OBJDIR)$Phmac_drbg$O: src$Prand$Phmac_drbg.c $(HEADERSPRIV) ++$(OBJDIR)$Phmac_drbg$O: $(OBJDIR) src$Prand$Phmac_drbg.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phmac_drbg$O src$Prand$Phmac_drbg.c + +-$(OBJDIR)$Psysrng$O: src$Prand$Psysrng.c $(HEADERSPRIV) ++$(OBJDIR)$Psysrng$O: $(OBJDIR) src$Prand$Psysrng.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psysrng$O src$Prand$Psysrng.c + +-$(OBJDIR)$Prsa_default_keygen$O: src$Prsa$Prsa_default_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_keygen$O: $(OBJDIR) src$Prsa$Prsa_default_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_keygen$O src$Prsa$Prsa_default_keygen.c + +-$(OBJDIR)$Prsa_default_modulus$O: src$Prsa$Prsa_default_modulus.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_modulus$O: $(OBJDIR) src$Prsa$Prsa_default_modulus.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_modulus$O src$Prsa$Prsa_default_modulus.c + +-$(OBJDIR)$Prsa_default_oaep_decrypt$O: src$Prsa$Prsa_default_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_default_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_oaep_decrypt$O src$Prsa$Prsa_default_oaep_decrypt.c + +-$(OBJDIR)$Prsa_default_oaep_encrypt$O: src$Prsa$Prsa_default_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_default_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_oaep_encrypt$O src$Prsa$Prsa_default_oaep_encrypt.c + +-$(OBJDIR)$Prsa_default_pkcs1_sign$O: src$Prsa$Prsa_default_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_default_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pkcs1_sign$O src$Prsa$Prsa_default_pkcs1_sign.c + +-$(OBJDIR)$Prsa_default_pkcs1_vrfy$O: src$Prsa$Prsa_default_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_default_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pkcs1_vrfy$O src$Prsa$Prsa_default_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_default_priv$O: src$Prsa$Prsa_default_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_priv$O: $(OBJDIR) src$Prsa$Prsa_default_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_priv$O src$Prsa$Prsa_default_priv.c + +-$(OBJDIR)$Prsa_default_privexp$O: src$Prsa$Prsa_default_privexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_privexp$O: $(OBJDIR) src$Prsa$Prsa_default_privexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_privexp$O src$Prsa$Prsa_default_privexp.c + +-$(OBJDIR)$Prsa_default_pub$O: src$Prsa$Prsa_default_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pub$O: $(OBJDIR) src$Prsa$Prsa_default_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pub$O src$Prsa$Prsa_default_pub.c + +-$(OBJDIR)$Prsa_default_pubexp$O: src$Prsa$Prsa_default_pubexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pubexp$O: $(OBJDIR) src$Prsa$Prsa_default_pubexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pubexp$O src$Prsa$Prsa_default_pubexp.c + +-$(OBJDIR)$Prsa_i15_keygen$O: src$Prsa$Prsa_i15_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_keygen$O: $(OBJDIR) src$Prsa$Prsa_i15_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_keygen$O src$Prsa$Prsa_i15_keygen.c + +-$(OBJDIR)$Prsa_i15_modulus$O: src$Prsa$Prsa_i15_modulus.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_modulus$O: $(OBJDIR) src$Prsa$Prsa_i15_modulus.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_modulus$O src$Prsa$Prsa_i15_modulus.c + +-$(OBJDIR)$Prsa_i15_oaep_decrypt$O: src$Prsa$Prsa_i15_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i15_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_oaep_decrypt$O src$Prsa$Prsa_i15_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i15_oaep_encrypt$O: src$Prsa$Prsa_i15_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i15_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_oaep_encrypt$O src$Prsa$Prsa_i15_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i15_pkcs1_sign$O: src$Prsa$Prsa_i15_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i15_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pkcs1_sign$O src$Prsa$Prsa_i15_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i15_pkcs1_vrfy$O: src$Prsa$Prsa_i15_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i15_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pkcs1_vrfy$O src$Prsa$Prsa_i15_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i15_priv$O: src$Prsa$Prsa_i15_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_priv$O: $(OBJDIR) src$Prsa$Prsa_i15_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_priv$O src$Prsa$Prsa_i15_priv.c + +-$(OBJDIR)$Prsa_i15_privexp$O: src$Prsa$Prsa_i15_privexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_privexp$O: $(OBJDIR) src$Prsa$Prsa_i15_privexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_privexp$O src$Prsa$Prsa_i15_privexp.c + +-$(OBJDIR)$Prsa_i15_pub$O: src$Prsa$Prsa_i15_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pub$O: $(OBJDIR) src$Prsa$Prsa_i15_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pub$O src$Prsa$Prsa_i15_pub.c + +-$(OBJDIR)$Prsa_i15_pubexp$O: src$Prsa$Prsa_i15_pubexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pubexp$O: $(OBJDIR) src$Prsa$Prsa_i15_pubexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pubexp$O src$Prsa$Prsa_i15_pubexp.c + +-$(OBJDIR)$Prsa_i31_keygen$O: src$Prsa$Prsa_i31_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_keygen$O: $(OBJDIR) src$Prsa$Prsa_i31_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_keygen$O src$Prsa$Prsa_i31_keygen.c + +-$(OBJDIR)$Prsa_i31_keygen_inner$O: src$Prsa$Prsa_i31_keygen_inner.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_keygen_inner$O: $(OBJDIR) src$Prsa$Prsa_i31_keygen_inner.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_keygen_inner$O src$Prsa$Prsa_i31_keygen_inner.c + +-$(OBJDIR)$Prsa_i31_modulus$O: src$Prsa$Prsa_i31_modulus.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_modulus$O: $(OBJDIR) src$Prsa$Prsa_i31_modulus.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_modulus$O src$Prsa$Prsa_i31_modulus.c + +-$(OBJDIR)$Prsa_i31_oaep_decrypt$O: src$Prsa$Prsa_i31_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i31_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_oaep_decrypt$O src$Prsa$Prsa_i31_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i31_oaep_encrypt$O: src$Prsa$Prsa_i31_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i31_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_oaep_encrypt$O src$Prsa$Prsa_i31_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i31_pkcs1_sign$O: src$Prsa$Prsa_i31_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i31_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pkcs1_sign$O src$Prsa$Prsa_i31_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i31_pkcs1_vrfy$O: src$Prsa$Prsa_i31_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i31_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pkcs1_vrfy$O src$Prsa$Prsa_i31_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i31_priv$O: src$Prsa$Prsa_i31_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_priv$O: $(OBJDIR) src$Prsa$Prsa_i31_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_priv$O src$Prsa$Prsa_i31_priv.c + +-$(OBJDIR)$Prsa_i31_privexp$O: src$Prsa$Prsa_i31_privexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_privexp$O: $(OBJDIR) src$Prsa$Prsa_i31_privexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_privexp$O src$Prsa$Prsa_i31_privexp.c + +-$(OBJDIR)$Prsa_i31_pub$O: src$Prsa$Prsa_i31_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pub$O: $(OBJDIR) src$Prsa$Prsa_i31_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pub$O src$Prsa$Prsa_i31_pub.c + +-$(OBJDIR)$Prsa_i31_pubexp$O: src$Prsa$Prsa_i31_pubexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pubexp$O: $(OBJDIR) src$Prsa$Prsa_i31_pubexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pubexp$O src$Prsa$Prsa_i31_pubexp.c + +-$(OBJDIR)$Prsa_i32_oaep_decrypt$O: src$Prsa$Prsa_i32_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i32_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_oaep_decrypt$O src$Prsa$Prsa_i32_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i32_oaep_encrypt$O: src$Prsa$Prsa_i32_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i32_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_oaep_encrypt$O src$Prsa$Prsa_i32_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i32_pkcs1_sign$O: src$Prsa$Prsa_i32_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i32_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_pkcs1_sign$O src$Prsa$Prsa_i32_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i32_pkcs1_vrfy$O: src$Prsa$Prsa_i32_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i32_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_pkcs1_vrfy$O src$Prsa$Prsa_i32_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i32_priv$O: src$Prsa$Prsa_i32_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_priv$O: $(OBJDIR) src$Prsa$Prsa_i32_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_priv$O src$Prsa$Prsa_i32_priv.c + +-$(OBJDIR)$Prsa_i32_pub$O: src$Prsa$Prsa_i32_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_pub$O: $(OBJDIR) src$Prsa$Prsa_i32_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_pub$O src$Prsa$Prsa_i32_pub.c + +-$(OBJDIR)$Prsa_i62_keygen$O: src$Prsa$Prsa_i62_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_keygen$O: $(OBJDIR) src$Prsa$Prsa_i62_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_keygen$O src$Prsa$Prsa_i62_keygen.c + +-$(OBJDIR)$Prsa_i62_oaep_decrypt$O: src$Prsa$Prsa_i62_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i62_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_oaep_decrypt$O src$Prsa$Prsa_i62_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i62_oaep_encrypt$O: src$Prsa$Prsa_i62_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i62_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_oaep_encrypt$O src$Prsa$Prsa_i62_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i62_pkcs1_sign$O: src$Prsa$Prsa_i62_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i62_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_pkcs1_sign$O src$Prsa$Prsa_i62_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i62_pkcs1_vrfy$O: src$Prsa$Prsa_i62_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i62_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_pkcs1_vrfy$O src$Prsa$Prsa_i62_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i62_priv$O: src$Prsa$Prsa_i62_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_priv$O: $(OBJDIR) src$Prsa$Prsa_i62_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_priv$O src$Prsa$Prsa_i62_priv.c + +-$(OBJDIR)$Prsa_i62_pub$O: src$Prsa$Prsa_i62_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_pub$O: $(OBJDIR) src$Prsa$Prsa_i62_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_pub$O src$Prsa$Prsa_i62_pub.c + +-$(OBJDIR)$Prsa_oaep_pad$O: src$Prsa$Prsa_oaep_pad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_oaep_pad$O: $(OBJDIR) src$Prsa$Prsa_oaep_pad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_oaep_pad$O src$Prsa$Prsa_oaep_pad.c + +-$(OBJDIR)$Prsa_oaep_unpad$O: src$Prsa$Prsa_oaep_unpad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_oaep_unpad$O: $(OBJDIR) src$Prsa$Prsa_oaep_unpad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_oaep_unpad$O src$Prsa$Prsa_oaep_unpad.c + +-$(OBJDIR)$Prsa_pkcs1_sig_pad$O: src$Prsa$Prsa_pkcs1_sig_pad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_pkcs1_sig_pad$O: $(OBJDIR) src$Prsa$Prsa_pkcs1_sig_pad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_pkcs1_sig_pad$O src$Prsa$Prsa_pkcs1_sig_pad.c + +-$(OBJDIR)$Prsa_pkcs1_sig_unpad$O: src$Prsa$Prsa_pkcs1_sig_unpad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_pkcs1_sig_unpad$O: $(OBJDIR) src$Prsa$Prsa_pkcs1_sig_unpad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_pkcs1_sig_unpad$O src$Prsa$Prsa_pkcs1_sig_unpad.c + +-$(OBJDIR)$Prsa_ssl_decrypt$O: src$Prsa$Prsa_ssl_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_ssl_decrypt$O: $(OBJDIR) src$Prsa$Prsa_ssl_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_ssl_decrypt$O src$Prsa$Prsa_ssl_decrypt.c + +-$(OBJDIR)$Pprf$O: src$Pssl$Pprf.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf$O: $(OBJDIR) src$Pssl$Pprf.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf$O src$Pssl$Pprf.c + +-$(OBJDIR)$Pprf_md5sha1$O: src$Pssl$Pprf_md5sha1.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf_md5sha1$O: $(OBJDIR) src$Pssl$Pprf_md5sha1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf_md5sha1$O src$Pssl$Pprf_md5sha1.c + +-$(OBJDIR)$Pprf_sha256$O: src$Pssl$Pprf_sha256.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf_sha256$O: $(OBJDIR) src$Pssl$Pprf_sha256.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf_sha256$O src$Pssl$Pprf_sha256.c + +-$(OBJDIR)$Pprf_sha384$O: src$Pssl$Pprf_sha384.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf_sha384$O: $(OBJDIR) src$Pssl$Pprf_sha384.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf_sha384$O src$Pssl$Pprf_sha384.c + +-$(OBJDIR)$Pssl_ccert_single_ec$O: src$Pssl$Pssl_ccert_single_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_ccert_single_ec$O: $(OBJDIR) src$Pssl$Pssl_ccert_single_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_ccert_single_ec$O src$Pssl$Pssl_ccert_single_ec.c + +-$(OBJDIR)$Pssl_ccert_single_rsa$O: src$Pssl$Pssl_ccert_single_rsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_ccert_single_rsa$O: $(OBJDIR) src$Pssl$Pssl_ccert_single_rsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_ccert_single_rsa$O src$Pssl$Pssl_ccert_single_rsa.c + +-$(OBJDIR)$Pssl_client$O: src$Pssl$Pssl_client.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_client$O: $(OBJDIR) src$Pssl$Pssl_client.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_client$O src$Pssl$Pssl_client.c + +-$(OBJDIR)$Pssl_client_default_rsapub$O: src$Pssl$Pssl_client_default_rsapub.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_client_default_rsapub$O: $(OBJDIR) src$Pssl$Pssl_client_default_rsapub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_client_default_rsapub$O src$Pssl$Pssl_client_default_rsapub.c + +-$(OBJDIR)$Pssl_client_full$O: src$Pssl$Pssl_client_full.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_client_full$O: $(OBJDIR) src$Pssl$Pssl_client_full.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_client_full$O src$Pssl$Pssl_client_full.c + +-$(OBJDIR)$Pssl_engine$O: src$Pssl$Pssl_engine.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine$O: $(OBJDIR) src$Pssl$Pssl_engine.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine$O src$Pssl$Pssl_engine.c + +-$(OBJDIR)$Pssl_engine_default_aescbc$O: src$Pssl$Pssl_engine_default_aescbc.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_aescbc$O: $(OBJDIR) src$Pssl$Pssl_engine_default_aescbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_aescbc$O src$Pssl$Pssl_engine_default_aescbc.c + +-$(OBJDIR)$Pssl_engine_default_aesccm$O: src$Pssl$Pssl_engine_default_aesccm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_aesccm$O: $(OBJDIR) src$Pssl$Pssl_engine_default_aesccm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_aesccm$O src$Pssl$Pssl_engine_default_aesccm.c + +-$(OBJDIR)$Pssl_engine_default_aesgcm$O: src$Pssl$Pssl_engine_default_aesgcm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_aesgcm$O: $(OBJDIR) src$Pssl$Pssl_engine_default_aesgcm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_aesgcm$O src$Pssl$Pssl_engine_default_aesgcm.c + +-$(OBJDIR)$Pssl_engine_default_chapol$O: src$Pssl$Pssl_engine_default_chapol.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_chapol$O: $(OBJDIR) src$Pssl$Pssl_engine_default_chapol.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_chapol$O src$Pssl$Pssl_engine_default_chapol.c + +-$(OBJDIR)$Pssl_engine_default_descbc$O: src$Pssl$Pssl_engine_default_descbc.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_descbc$O: $(OBJDIR) src$Pssl$Pssl_engine_default_descbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_descbc$O src$Pssl$Pssl_engine_default_descbc.c + +-$(OBJDIR)$Pssl_engine_default_ec$O: src$Pssl$Pssl_engine_default_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_ec$O: $(OBJDIR) src$Pssl$Pssl_engine_default_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_ec$O src$Pssl$Pssl_engine_default_ec.c + +-$(OBJDIR)$Pssl_engine_default_ecdsa$O: src$Pssl$Pssl_engine_default_ecdsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_ecdsa$O: $(OBJDIR) src$Pssl$Pssl_engine_default_ecdsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_ecdsa$O src$Pssl$Pssl_engine_default_ecdsa.c + +-$(OBJDIR)$Pssl_engine_default_rsavrfy$O: src$Pssl$Pssl_engine_default_rsavrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_rsavrfy$O: $(OBJDIR) src$Pssl$Pssl_engine_default_rsavrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_rsavrfy$O src$Pssl$Pssl_engine_default_rsavrfy.c + +-$(OBJDIR)$Pssl_hashes$O: src$Pssl$Pssl_hashes.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_hashes$O: $(OBJDIR) src$Pssl$Pssl_hashes.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_hashes$O src$Pssl$Pssl_hashes.c + +-$(OBJDIR)$Pssl_hs_client$O: src$Pssl$Pssl_hs_client.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_hs_client$O: $(OBJDIR) src$Pssl$Pssl_hs_client.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_hs_client$O src$Pssl$Pssl_hs_client.c + +-$(OBJDIR)$Pssl_hs_server$O: src$Pssl$Pssl_hs_server.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_hs_server$O: $(OBJDIR) src$Pssl$Pssl_hs_server.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_hs_server$O src$Pssl$Pssl_hs_server.c + +-$(OBJDIR)$Pssl_io$O: src$Pssl$Pssl_io.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_io$O: $(OBJDIR) src$Pssl$Pssl_io.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_io$O src$Pssl$Pssl_io.c + +-$(OBJDIR)$Pssl_keyexport$O: src$Pssl$Pssl_keyexport.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_keyexport$O: $(OBJDIR) src$Pssl$Pssl_keyexport.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_keyexport$O src$Pssl$Pssl_keyexport.c + +-$(OBJDIR)$Pssl_lru$O: src$Pssl$Pssl_lru.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_lru$O: $(OBJDIR) src$Pssl$Pssl_lru.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_lru$O src$Pssl$Pssl_lru.c + +-$(OBJDIR)$Pssl_rec_cbc$O: src$Pssl$Pssl_rec_cbc.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_cbc$O: $(OBJDIR) src$Pssl$Pssl_rec_cbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_cbc$O src$Pssl$Pssl_rec_cbc.c + +-$(OBJDIR)$Pssl_rec_ccm$O: src$Pssl$Pssl_rec_ccm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_ccm$O: $(OBJDIR) src$Pssl$Pssl_rec_ccm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_ccm$O src$Pssl$Pssl_rec_ccm.c + +-$(OBJDIR)$Pssl_rec_chapol$O: src$Pssl$Pssl_rec_chapol.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_chapol$O: $(OBJDIR) src$Pssl$Pssl_rec_chapol.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_chapol$O src$Pssl$Pssl_rec_chapol.c + +-$(OBJDIR)$Pssl_rec_gcm$O: src$Pssl$Pssl_rec_gcm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_gcm$O: $(OBJDIR) src$Pssl$Pssl_rec_gcm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_gcm$O src$Pssl$Pssl_rec_gcm.c + +-$(OBJDIR)$Pssl_scert_single_ec$O: src$Pssl$Pssl_scert_single_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_scert_single_ec$O: $(OBJDIR) src$Pssl$Pssl_scert_single_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_scert_single_ec$O src$Pssl$Pssl_scert_single_ec.c + +-$(OBJDIR)$Pssl_scert_single_rsa$O: src$Pssl$Pssl_scert_single_rsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_scert_single_rsa$O: $(OBJDIR) src$Pssl$Pssl_scert_single_rsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_scert_single_rsa$O src$Pssl$Pssl_scert_single_rsa.c + +-$(OBJDIR)$Pssl_server$O: src$Pssl$Pssl_server.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server$O: $(OBJDIR) src$Pssl$Pssl_server.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server$O src$Pssl$Pssl_server.c + +-$(OBJDIR)$Pssl_server_full_ec$O: src$Pssl$Pssl_server_full_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_full_ec$O: $(OBJDIR) src$Pssl$Pssl_server_full_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_full_ec$O src$Pssl$Pssl_server_full_ec.c + +-$(OBJDIR)$Pssl_server_full_rsa$O: src$Pssl$Pssl_server_full_rsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_full_rsa$O: $(OBJDIR) src$Pssl$Pssl_server_full_rsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_full_rsa$O src$Pssl$Pssl_server_full_rsa.c + +-$(OBJDIR)$Pssl_server_mine2c$O: src$Pssl$Pssl_server_mine2c.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_mine2c$O: $(OBJDIR) src$Pssl$Pssl_server_mine2c.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_mine2c$O src$Pssl$Pssl_server_mine2c.c + +-$(OBJDIR)$Pssl_server_mine2g$O: src$Pssl$Pssl_server_mine2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_mine2g$O: $(OBJDIR) src$Pssl$Pssl_server_mine2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_mine2g$O src$Pssl$Pssl_server_mine2g.c + +-$(OBJDIR)$Pssl_server_minf2c$O: src$Pssl$Pssl_server_minf2c.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minf2c$O: $(OBJDIR) src$Pssl$Pssl_server_minf2c.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minf2c$O src$Pssl$Pssl_server_minf2c.c + +-$(OBJDIR)$Pssl_server_minf2g$O: src$Pssl$Pssl_server_minf2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minf2g$O: $(OBJDIR) src$Pssl$Pssl_server_minf2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minf2g$O src$Pssl$Pssl_server_minf2g.c + +-$(OBJDIR)$Pssl_server_minr2g$O: src$Pssl$Pssl_server_minr2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minr2g$O: $(OBJDIR) src$Pssl$Pssl_server_minr2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minr2g$O src$Pssl$Pssl_server_minr2g.c + +-$(OBJDIR)$Pssl_server_minu2g$O: src$Pssl$Pssl_server_minu2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minu2g$O: $(OBJDIR) src$Pssl$Pssl_server_minu2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minu2g$O src$Pssl$Pssl_server_minu2g.c + +-$(OBJDIR)$Pssl_server_minv2g$O: src$Pssl$Pssl_server_minv2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minv2g$O: $(OBJDIR) src$Pssl$Pssl_server_minv2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minv2g$O src$Pssl$Pssl_server_minv2g.c + +-$(OBJDIR)$Paes_big_cbcdec$O: src$Psymcipher$Paes_big_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_big_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_cbcdec$O src$Psymcipher$Paes_big_cbcdec.c + +-$(OBJDIR)$Paes_big_cbcenc$O: src$Psymcipher$Paes_big_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_big_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_cbcenc$O src$Psymcipher$Paes_big_cbcenc.c + +-$(OBJDIR)$Paes_big_ctr$O: src$Psymcipher$Paes_big_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_ctr$O: $(OBJDIR) src$Psymcipher$Paes_big_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_ctr$O src$Psymcipher$Paes_big_ctr.c + +-$(OBJDIR)$Paes_big_ctrcbc$O: src$Psymcipher$Paes_big_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_big_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_ctrcbc$O src$Psymcipher$Paes_big_ctrcbc.c + +-$(OBJDIR)$Paes_big_dec$O: src$Psymcipher$Paes_big_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_dec$O: $(OBJDIR) src$Psymcipher$Paes_big_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_dec$O src$Psymcipher$Paes_big_dec.c + +-$(OBJDIR)$Paes_big_enc$O: src$Psymcipher$Paes_big_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_enc$O: $(OBJDIR) src$Psymcipher$Paes_big_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_enc$O src$Psymcipher$Paes_big_enc.c + +-$(OBJDIR)$Paes_common$O: src$Psymcipher$Paes_common.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_common$O: $(OBJDIR) src$Psymcipher$Paes_common.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_common$O src$Psymcipher$Paes_common.c + +-$(OBJDIR)$Paes_ct$O: src$Psymcipher$Paes_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct$O: $(OBJDIR) src$Psymcipher$Paes_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct$O src$Psymcipher$Paes_ct.c + +-$(OBJDIR)$Paes_ct64$O: src$Psymcipher$Paes_ct64.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64$O: $(OBJDIR) src$Psymcipher$Paes_ct64.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64$O src$Psymcipher$Paes_ct64.c + +-$(OBJDIR)$Paes_ct64_cbcdec$O: src$Psymcipher$Paes_ct64_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_ct64_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_cbcdec$O src$Psymcipher$Paes_ct64_cbcdec.c + +-$(OBJDIR)$Paes_ct64_cbcenc$O: src$Psymcipher$Paes_ct64_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_ct64_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_cbcenc$O src$Psymcipher$Paes_ct64_cbcenc.c + +-$(OBJDIR)$Paes_ct64_ctr$O: src$Psymcipher$Paes_ct64_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_ctr$O: $(OBJDIR) src$Psymcipher$Paes_ct64_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_ctr$O src$Psymcipher$Paes_ct64_ctr.c + +-$(OBJDIR)$Paes_ct64_ctrcbc$O: src$Psymcipher$Paes_ct64_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_ct64_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_ctrcbc$O src$Psymcipher$Paes_ct64_ctrcbc.c + +-$(OBJDIR)$Paes_ct64_dec$O: src$Psymcipher$Paes_ct64_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_dec$O: $(OBJDIR) src$Psymcipher$Paes_ct64_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_dec$O src$Psymcipher$Paes_ct64_dec.c + +-$(OBJDIR)$Paes_ct64_enc$O: src$Psymcipher$Paes_ct64_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_enc$O: $(OBJDIR) src$Psymcipher$Paes_ct64_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_enc$O src$Psymcipher$Paes_ct64_enc.c + +-$(OBJDIR)$Paes_ct_cbcdec$O: src$Psymcipher$Paes_ct_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_ct_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_cbcdec$O src$Psymcipher$Paes_ct_cbcdec.c + +-$(OBJDIR)$Paes_ct_cbcenc$O: src$Psymcipher$Paes_ct_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_ct_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_cbcenc$O src$Psymcipher$Paes_ct_cbcenc.c + +-$(OBJDIR)$Paes_ct_ctr$O: src$Psymcipher$Paes_ct_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_ctr$O: $(OBJDIR) src$Psymcipher$Paes_ct_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_ctr$O src$Psymcipher$Paes_ct_ctr.c + +-$(OBJDIR)$Paes_ct_ctrcbc$O: src$Psymcipher$Paes_ct_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_ct_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_ctrcbc$O src$Psymcipher$Paes_ct_ctrcbc.c + +-$(OBJDIR)$Paes_ct_dec$O: src$Psymcipher$Paes_ct_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_dec$O: $(OBJDIR) src$Psymcipher$Paes_ct_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_dec$O src$Psymcipher$Paes_ct_dec.c + +-$(OBJDIR)$Paes_ct_enc$O: src$Psymcipher$Paes_ct_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_enc$O: $(OBJDIR) src$Psymcipher$Paes_ct_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_enc$O src$Psymcipher$Paes_ct_enc.c + +-$(OBJDIR)$Paes_pwr8$O: src$Psymcipher$Paes_pwr8.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8$O: $(OBJDIR) src$Psymcipher$Paes_pwr8.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8$O src$Psymcipher$Paes_pwr8.c + +-$(OBJDIR)$Paes_pwr8_cbcdec$O: src$Psymcipher$Paes_pwr8_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_cbcdec$O src$Psymcipher$Paes_pwr8_cbcdec.c + +-$(OBJDIR)$Paes_pwr8_cbcenc$O: src$Psymcipher$Paes_pwr8_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_cbcenc$O src$Psymcipher$Paes_pwr8_cbcenc.c + +-$(OBJDIR)$Paes_pwr8_ctr$O: src$Psymcipher$Paes_pwr8_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_ctr$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_ctr$O src$Psymcipher$Paes_pwr8_ctr.c + +-$(OBJDIR)$Paes_pwr8_ctrcbc$O: src$Psymcipher$Paes_pwr8_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_ctrcbc$O src$Psymcipher$Paes_pwr8_ctrcbc.c + +-$(OBJDIR)$Paes_small_cbcdec$O: src$Psymcipher$Paes_small_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_small_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_cbcdec$O src$Psymcipher$Paes_small_cbcdec.c + +-$(OBJDIR)$Paes_small_cbcenc$O: src$Psymcipher$Paes_small_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_small_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_cbcenc$O src$Psymcipher$Paes_small_cbcenc.c + +-$(OBJDIR)$Paes_small_ctr$O: src$Psymcipher$Paes_small_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_ctr$O: $(OBJDIR) src$Psymcipher$Paes_small_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_ctr$O src$Psymcipher$Paes_small_ctr.c + +-$(OBJDIR)$Paes_small_ctrcbc$O: src$Psymcipher$Paes_small_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_small_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_ctrcbc$O src$Psymcipher$Paes_small_ctrcbc.c + +-$(OBJDIR)$Paes_small_dec$O: src$Psymcipher$Paes_small_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_dec$O: $(OBJDIR) src$Psymcipher$Paes_small_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_dec$O src$Psymcipher$Paes_small_dec.c + +-$(OBJDIR)$Paes_small_enc$O: src$Psymcipher$Paes_small_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_enc$O: $(OBJDIR) src$Psymcipher$Paes_small_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_enc$O src$Psymcipher$Paes_small_enc.c + +-$(OBJDIR)$Paes_x86ni$O: src$Psymcipher$Paes_x86ni.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni$O: $(OBJDIR) src$Psymcipher$Paes_x86ni.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni$O src$Psymcipher$Paes_x86ni.c + +-$(OBJDIR)$Paes_x86ni_cbcdec$O: src$Psymcipher$Paes_x86ni_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_cbcdec$O src$Psymcipher$Paes_x86ni_cbcdec.c + +-$(OBJDIR)$Paes_x86ni_cbcenc$O: src$Psymcipher$Paes_x86ni_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_cbcenc$O src$Psymcipher$Paes_x86ni_cbcenc.c + +-$(OBJDIR)$Paes_x86ni_ctr$O: src$Psymcipher$Paes_x86ni_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_ctr$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_ctr$O src$Psymcipher$Paes_x86ni_ctr.c + +-$(OBJDIR)$Paes_x86ni_ctrcbc$O: src$Psymcipher$Paes_x86ni_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_ctrcbc$O src$Psymcipher$Paes_x86ni_ctrcbc.c + +-$(OBJDIR)$Pchacha20_ct$O: src$Psymcipher$Pchacha20_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Pchacha20_ct$O: $(OBJDIR) src$Psymcipher$Pchacha20_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pchacha20_ct$O src$Psymcipher$Pchacha20_ct.c + +-$(OBJDIR)$Pchacha20_sse2$O: src$Psymcipher$Pchacha20_sse2.c $(HEADERSPRIV) ++$(OBJDIR)$Pchacha20_sse2$O: $(OBJDIR) src$Psymcipher$Pchacha20_sse2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pchacha20_sse2$O src$Psymcipher$Pchacha20_sse2.c + +-$(OBJDIR)$Pdes_ct$O: src$Psymcipher$Pdes_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_ct$O: $(OBJDIR) src$Psymcipher$Pdes_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_ct$O src$Psymcipher$Pdes_ct.c + +-$(OBJDIR)$Pdes_ct_cbcdec$O: src$Psymcipher$Pdes_ct_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_ct_cbcdec$O: $(OBJDIR) src$Psymcipher$Pdes_ct_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_ct_cbcdec$O src$Psymcipher$Pdes_ct_cbcdec.c + +-$(OBJDIR)$Pdes_ct_cbcenc$O: src$Psymcipher$Pdes_ct_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_ct_cbcenc$O: $(OBJDIR) src$Psymcipher$Pdes_ct_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_ct_cbcenc$O src$Psymcipher$Pdes_ct_cbcenc.c + +-$(OBJDIR)$Pdes_support$O: src$Psymcipher$Pdes_support.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_support$O: $(OBJDIR) src$Psymcipher$Pdes_support.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_support$O src$Psymcipher$Pdes_support.c + +-$(OBJDIR)$Pdes_tab$O: src$Psymcipher$Pdes_tab.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_tab$O: $(OBJDIR) src$Psymcipher$Pdes_tab.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_tab$O src$Psymcipher$Pdes_tab.c + +-$(OBJDIR)$Pdes_tab_cbcdec$O: src$Psymcipher$Pdes_tab_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_tab_cbcdec$O: $(OBJDIR) src$Psymcipher$Pdes_tab_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_tab_cbcdec$O src$Psymcipher$Pdes_tab_cbcdec.c + +-$(OBJDIR)$Pdes_tab_cbcenc$O: src$Psymcipher$Pdes_tab_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_tab_cbcenc$O: $(OBJDIR) src$Psymcipher$Pdes_tab_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_tab_cbcenc$O src$Psymcipher$Pdes_tab_cbcenc.c + +-$(OBJDIR)$Ppoly1305_ctmul$O: src$Psymcipher$Ppoly1305_ctmul.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_ctmul$O: $(OBJDIR) src$Psymcipher$Ppoly1305_ctmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_ctmul$O src$Psymcipher$Ppoly1305_ctmul.c + +-$(OBJDIR)$Ppoly1305_ctmul32$O: src$Psymcipher$Ppoly1305_ctmul32.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_ctmul32$O: $(OBJDIR) src$Psymcipher$Ppoly1305_ctmul32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_ctmul32$O src$Psymcipher$Ppoly1305_ctmul32.c + +-$(OBJDIR)$Ppoly1305_ctmulq$O: src$Psymcipher$Ppoly1305_ctmulq.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_ctmulq$O: $(OBJDIR) src$Psymcipher$Ppoly1305_ctmulq.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_ctmulq$O src$Psymcipher$Ppoly1305_ctmulq.c + +-$(OBJDIR)$Ppoly1305_i15$O: src$Psymcipher$Ppoly1305_i15.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_i15$O: $(OBJDIR) src$Psymcipher$Ppoly1305_i15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_i15$O src$Psymcipher$Ppoly1305_i15.c + +-$(OBJDIR)$Pasn1enc$O: src$Px509$Pasn1enc.c $(HEADERSPRIV) ++$(OBJDIR)$Pasn1enc$O: $(OBJDIR) src$Px509$Pasn1enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pasn1enc$O src$Px509$Pasn1enc.c + +-$(OBJDIR)$Pencode_ec_pk8der$O: src$Px509$Pencode_ec_pk8der.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_ec_pk8der$O: $(OBJDIR) src$Px509$Pencode_ec_pk8der.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_ec_pk8der$O src$Px509$Pencode_ec_pk8der.c + +-$(OBJDIR)$Pencode_ec_rawder$O: src$Px509$Pencode_ec_rawder.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_ec_rawder$O: $(OBJDIR) src$Px509$Pencode_ec_rawder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_ec_rawder$O src$Px509$Pencode_ec_rawder.c + +-$(OBJDIR)$Pencode_rsa_pk8der$O: src$Px509$Pencode_rsa_pk8der.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_rsa_pk8der$O: $(OBJDIR) src$Px509$Pencode_rsa_pk8der.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_rsa_pk8der$O src$Px509$Pencode_rsa_pk8der.c + +-$(OBJDIR)$Pencode_rsa_rawder$O: src$Px509$Pencode_rsa_rawder.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_rsa_rawder$O: $(OBJDIR) src$Px509$Pencode_rsa_rawder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_rsa_rawder$O src$Px509$Pencode_rsa_rawder.c + +-$(OBJDIR)$Pskey_decoder$O: src$Px509$Pskey_decoder.c $(HEADERSPRIV) ++$(OBJDIR)$Pskey_decoder$O: $(OBJDIR) src$Px509$Pskey_decoder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pskey_decoder$O src$Px509$Pskey_decoder.c + +-$(OBJDIR)$Px509_decoder$O: src$Px509$Px509_decoder.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_decoder$O: $(OBJDIR) src$Px509$Px509_decoder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_decoder$O src$Px509$Px509_decoder.c + +-$(OBJDIR)$Px509_knownkey$O: src$Px509$Px509_knownkey.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_knownkey$O: $(OBJDIR) src$Px509$Px509_knownkey.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_knownkey$O src$Px509$Px509_knownkey.c + +-$(OBJDIR)$Px509_minimal$O: src$Px509$Px509_minimal.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_minimal$O: $(OBJDIR) src$Px509$Px509_minimal.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_minimal$O src$Px509$Px509_minimal.c + +-$(OBJDIR)$Px509_minimal_full$O: src$Px509$Px509_minimal_full.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_minimal_full$O: $(OBJDIR) src$Px509$Px509_minimal_full.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_minimal_full$O src$Px509$Px509_minimal_full.c + +-$(OBJDIR)$Pbrssl$O: tools$Pbrssl.c $(HEADERSTOOLS) ++$(OBJDIR)$Pbrssl$O: $(OBJDIR) tools$Pbrssl.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pbrssl$O tools$Pbrssl.c + +-$(OBJDIR)$Pcerts$O: tools$Pcerts.c $(HEADERSTOOLS) ++$(OBJDIR)$Pcerts$O: $(OBJDIR) tools$Pcerts.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pcerts$O tools$Pcerts.c + +-$(OBJDIR)$Pchain$O: tools$Pchain.c $(HEADERSTOOLS) ++$(OBJDIR)$Pchain$O: $(OBJDIR) tools$Pchain.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pchain$O tools$Pchain.c + +-$(OBJDIR)$Pclient$O: tools$Pclient.c $(HEADERSTOOLS) ++$(OBJDIR)$Pclient$O: $(OBJDIR) tools$Pclient.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pclient$O tools$Pclient.c + +-$(OBJDIR)$Perrors$O: tools$Perrors.c $(HEADERSTOOLS) ++$(OBJDIR)$Perrors$O: $(OBJDIR) tools$Perrors.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Perrors$O tools$Perrors.c + +-$(OBJDIR)$Pfiles$O: tools$Pfiles.c $(HEADERSTOOLS) ++$(OBJDIR)$Pfiles$O: $(OBJDIR) tools$Pfiles.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pfiles$O tools$Pfiles.c + +-$(OBJDIR)$Pimpl$O: tools$Pimpl.c $(HEADERSTOOLS) ++$(OBJDIR)$Pimpl$O: $(OBJDIR) tools$Pimpl.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pimpl$O tools$Pimpl.c + +-$(OBJDIR)$Pkeys$O: tools$Pkeys.c $(HEADERSTOOLS) ++$(OBJDIR)$Pkeys$O: $(OBJDIR) tools$Pkeys.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pkeys$O tools$Pkeys.c + +-$(OBJDIR)$Pnames$O: tools$Pnames.c $(HEADERSTOOLS) ++$(OBJDIR)$Pnames$O: $(OBJDIR) tools$Pnames.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pnames$O tools$Pnames.c + +-$(OBJDIR)$Pserver$O: tools$Pserver.c $(HEADERSTOOLS) ++$(OBJDIR)$Pserver$O: $(OBJDIR) tools$Pserver.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pserver$O tools$Pserver.c + +-$(OBJDIR)$Pskey$O: tools$Pskey.c $(HEADERSTOOLS) ++$(OBJDIR)$Pskey$O: $(OBJDIR) tools$Pskey.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pskey$O tools$Pskey.c + +-$(OBJDIR)$Psslio$O: tools$Psslio.c $(HEADERSTOOLS) ++$(OBJDIR)$Psslio$O: $(OBJDIR) tools$Psslio.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psslio$O tools$Psslio.c + +-$(OBJDIR)$Pta$O: tools$Pta.c $(HEADERSTOOLS) ++$(OBJDIR)$Pta$O: $(OBJDIR) tools$Pta.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pta$O tools$Pta.c + +-$(OBJDIR)$Ptwrch$O: tools$Ptwrch.c $(HEADERSTOOLS) ++$(OBJDIR)$Ptwrch$O: $(OBJDIR) tools$Ptwrch.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ptwrch$O tools$Ptwrch.c + +-$(OBJDIR)$Pvector$O: tools$Pvector.c $(HEADERSTOOLS) ++$(OBJDIR)$Pvector$O: $(OBJDIR) tools$Pvector.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pvector$O tools$Pvector.c + +-$(OBJDIR)$Pverify$O: tools$Pverify.c $(HEADERSTOOLS) ++$(OBJDIR)$Pverify$O: $(OBJDIR) tools$Pverify.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pverify$O tools$Pverify.c + +-$(OBJDIR)$Pxmem$O: tools$Pxmem.c $(HEADERSTOOLS) ++$(OBJDIR)$Pxmem$O: $(OBJDIR) tools$Pxmem.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pxmem$O tools$Pxmem.c + +-$(OBJDIR)$Ptest_crypto$O: test$Ptest_crypto.c $(HEADERSPRIV) ++$(OBJDIR)$Ptest_crypto$O: $(OBJDIR) test$Ptest_crypto.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ptest_crypto$O test$Ptest_crypto.c + +-$(OBJDIR)$Ptest_speed$O: test$Ptest_speed.c $(HEADERSPRIV) ++$(OBJDIR)$Ptest_speed$O: $(OBJDIR) test$Ptest_speed.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ptest_speed$O test$Ptest_speed.c + +-$(OBJDIR)$Ptest_x509$O: test$Ptest_x509.c $(HEADERSPRIV) ++$(OBJDIR)$Ptest_x509$O: $(OBJDIR) test$Ptest_x509.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) -DSRCDIRNAME=".." $(CCOUT)$(OBJDIR)$Ptest_x509$O test$Ptest_x509.c +diff --git a/mk/mkrules.sh b/mk/mkrules.sh +index eea159b..cce7564 100755 +--- a/mk/mkrules.sh ++++ b/mk/mkrules.sh +@@ -531,23 +531,23 @@ EOF + (for f in $coresrc ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done + + for f in $toolssrc ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSTOOLS)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSTOOLS)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done + + for f in $testcryptosrc $testspeedsrc ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done + + for f in $testx509src ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) -DSRCDIRNAME=".." $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) -DSRCDIRNAME=".." $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done) >> Rules.mk +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:56:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:16 -0000 Subject: [Buildroot] [git commit branch/next] packaeg/libmbim: fix license files Message-ID: <20230220205209.9506C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3d1d5a2dab19a954915c807e90ac74708b7e9ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit i57bea338e95e49bf1f2405908462686306044825 forgot to update license files: https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/bb3091e2c8d44caccfb868505a730a4ac5a48b44 Fixes: - http://autobuild.buildroot.org/results/06cb9426d097657b669b7970994584592bac9868 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libmbim/libmbim.hash | 4 ++-- package/libmbim/libmbim.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libmbim/libmbim.hash b/package/libmbim/libmbim.hash index 2e2b46fcdb..8e7633cb94 100644 --- a/package/libmbim/libmbim.hash +++ b/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed sha256 cf74682c56f4c34ca4aee86de3b8c425a89fc2c0782052815295faf6a8e0a9fb libmbim-1.28.2.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-or-later.txt +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1-or-later.txt diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index e728cf58f9..59f55a57bc 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -7,7 +7,8 @@ LIBMBIM_VERSION = 1.28.2 LIBMBIM_SITE = https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION) LIBMBIM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs) -LIBMBIM_LICENSE_FILES = COPYING COPYING.LIB +LIBMBIM_LICENSE_FILES = \ + LICENSES/GPL-2.0-or-later.txt LICENSES/LGPL-2.1-or-later.txt LIBMBIM_CPE_ID_VENDOR = freedesktop LIBMBIM_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:56:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:17 -0000 Subject: [Buildroot] [git commit branch/next] package/php: bump version to 8.1.13 Message-ID: <20230220205209.BC5C48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=148ae3338c70881cc2caebdd9b45cc6212362a2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://news-web.php.net/php.announce/341 Changelog: https://www.php.net/ChangeLog-8.php#8.1.13 Signed-off-by: Bernd Kuhls 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 bf81ebf3e8..461dc36031 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 08243359e2204d842082269eedc15f08d2eca726d0e65b93fb11f4bfc51bbbab php-8.1.12.tar.xz +sha256 b15ef0ccdd6760825604b3c4e3e73558dcf87c75ef1d68ef4289d8fd261ac856 php-8.1.13.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index a400a38af7..1fdf5c68a2 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.1.12 +PHP_VERSION = 8.1.13 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:56:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:18 -0000 Subject: [Buildroot] [git commit branch/next] board/freescale/imx6ulevk/readme.txt: update broken url Message-ID: <20230220205219.931E386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01a3cb0f6eac48150c4bd246402025c0790e2625 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next http://freescale.com/ urls are all redirected to the NXP homepage https://www.nxp.com/ Even if the link is not broken in the sense of a 404 http error, the pointed resource is not found. This commit updates the old freescale link to the correct nxp.com location. Note: the link now requires a free registration to be accessed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- board/freescale/imx6ulevk/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/imx6ulevk/readme.txt b/board/freescale/imx6ulevk/readme.txt index 5bc03771f2..5a5b4ae5a3 100644 --- a/board/freescale/imx6ulevk/readme.txt +++ b/board/freescale/imx6ulevk/readme.txt @@ -71,4 +71,4 @@ Enjoy! References ========== -[1] http://cache.freescale.com/files/32bit/doc/quick_start_guide/IMX6ULTRALITEQSG.pdf +[1] https://www.nxp.com/webapp/Download?colCode=IMX6ULTRALITEQSG From peter at korsgaard.com Mon Feb 20 20:56:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:18 -0000 Subject: [Buildroot] [git commit branch/next] package/libdeflate: bump version to 1.15 Message-ID: <20230220205209.AFD74828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c31087182fa545784d9a0a01f0b32715d78c3955 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/ebiggers/libdeflate/blob/master/NEWS.md Switch to cmake. Added CFLAGS to fix uClibc build: /home/bernd/buildroot/output/build/libdeflate-1.15/programs/gzip.c:367:10: error: 'const struct stat' has no member named 'st_atim'; did you mean 'st_atime'? /home/bernd/buildroot/output/build/libdeflate-1.15/programs/gzip.c:367:26: error: 'const struct stat' has no member named 'st_mtim'; did you mean 'st_mtime'? Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libdeflate/libdeflate.hash | 2 +- package/libdeflate/libdeflate.mk | 27 ++++----------------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/package/libdeflate/libdeflate.hash b/package/libdeflate/libdeflate.hash index 7dae12921f..79de3439d7 100644 --- a/package/libdeflate/libdeflate.hash +++ b/package/libdeflate/libdeflate.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ba89fb167a5ab6bbdfa6ee3b1a71636e8140fa8471cce8a311697584948e4d06 libdeflate-1.12.tar.gz +sha256 58b95040df7383dc0413defb700d9893c194732474283cc4c8f144b00a68154b libdeflate-1.15.tar.gz sha256 5d246dd2537307b80fed9ba5fdddf5d0fe7a8f023393a071182b9daed56b40fe COPYING diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk index 93ec5909a5..2305af4dc9 100644 --- a/package/libdeflate/libdeflate.mk +++ b/package/libdeflate/libdeflate.mk @@ -4,31 +4,12 @@ # ################################################################################ -LIBDEFLATE_VERSION = 1.12 +LIBDEFLATE_VERSION = 1.15 LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) LIBDEFLATE_LICENSE = MIT LIBDEFLATE_LICENSE_FILES = COPYING LIBDEFLATE_INSTALL_STAGING = YES +LIBDEFLATE_CONF_OPTS = \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -D_DEFAULT_SOURCE" -ifeq ($(BR2_STATIC_LIBS),y) -LIBDEFLATE_MAKE_OPTS += DISABLE_SHARED=yes -endif - -define LIBDEFLATE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(LIBDEFLATE_MAKE_OPTS) -endef - -define LIBDEFLATE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(LIBDEFLATE_MAKE_OPTS) \ - DESTDIR="$(STAGING_DIR)" PREFIX=/usr install -endef - -define LIBDEFLATE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(LIBDEFLATE_MAKE_OPTS) \ - DESTDIR="$(TARGET_DIR)" PREFIX=/usr install -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:56:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:19 -0000 Subject: [Buildroot] [git commit branch/next] package/modem-manager: fix static build Message-ID: <20230220205219.5961686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d769cfc13f6c2544f8bc5b6339d23763319a2383 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: FAILED: src/ModemManager /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/bin/m68k-linux-gcc -o src/ModemManager src/ModemManager.p/meson-generated_.._mm-daemon-enums-types.c.o src/ModemManager.p/main.c.o src/ModemManager.p/mm-auth-provider.c.o src/ModemManager.p/mm-base-bearer.c.o src/ModemManager.p/mm-base-call.c.o src/ModemManager.p/mm-base-manager.c.o src/ModemManager.p/mm-base-modem-at.c.o src/ModemManager.p/mm-base-modem.c.o src/ModemManager.p/mm-base-sim.c.o src/ModemManager.p/mm-base-sms.c.o src/ModemManager.p/mm-bearer-list.c.o src/ModemManager.p/mm-broadband-bearer.c.o src/ModemManager.p/mm-broadband-modem.c.o src/ModemManager.p/mm-call-list.c.o src/ModemManager.p/mm-context.c.o src/ModemManager.p/mm-device.c.o src/ModemManager.p/mm-dispatcher.c.o src/ModemManager.p/mm-dispatcher-connection.c.o src/ModemManager.p/mm-dispatcher-fcc-unlock.c.o src/ModemManager.p/mm-filter.c.o src/ModemManager.p/mm-iface-modem-3gpp.c.o src/ModemManager.p/mm-iface-modem-3gpp-profile-manage r.c.o src/ModemManager.p/mm-iface-modem-3gpp-ussd.c.o src/ModemManager.p/mm-iface-modem.c.o src/ModemManager.p/mm-iface-modem-cdma.c.o src/ModemManager.p/mm-iface-modem-firmware.c.o src/ModemManager.p/mm-iface-modem-location.c.o src/ModemManager.p/mm-iface-modem-messaging.c.o src/ModemManager.p/mm-iface-modem-oma.c.o src/ModemManager.p/mm-iface-modem-sar.c.o src/ModemManager.p/mm-iface-modem-signal.c.o src/ModemManager.p/mm-iface-modem-simple.c.o src/ModemManager.p/mm-iface-modem-time.c.o src/ModemManager.p/mm-iface-modem-voice.c.o src/ModemManager.p/mm-plugin.c.o src/ModemManager.p/mm-plugin-manager.c.o src/ModemManager.p/mm-port-probe.c.o src/ModemManager.p/mm-port-probe-at.c.o src/ModemManager.p/mm-private-boxed-types.c.o src/ModemManager.p/mm-sms-list.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static '-Wl,-rpath,$ORIGIN/../libmm-glib' -Wl,-rpath-link,/home/autobuild/autobuild/instance-11/output-1/build/modem-manager-1.20.2/build/libmm-glib -Wl,--start-group src/libport.a sr c/libkerneldevice.a src/libhelpers.a libmm-glib/libmm-glib.so.0.9.0 libqcdm/src/libqcdm.a libmm-glib/generated/tests/libmm-test-generated.a -Wl,--export-dynamic /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libglib-2.0.a -pthread -lm /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpcre.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libffi.a /home/autob uild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libblkid.a -Wl,--end-group /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/opt/ext-toolchain/bin/../lib/gcc/m68k-buildroot-linux-uclibc/11.2.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `libmm-glib/libmm-glib.so.0.9.0' Fixes: - http://autobuild.buildroot.org/results/9803d593305df36c4a8d67aac2fb4c9a3120a072 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...son-Un-hardcode-building-a-shared-library.patch | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch b/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch new file mode 100644 index 0000000000..e99396d0d1 --- /dev/null +++ b/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch @@ -0,0 +1,54 @@ +From a9651f2390d3691dc74bcdb24b69a043fb0aacae Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 10:18:32 +0100 +Subject: [PATCH] meson: Un-hardcode building a shared library + +Use library() instead of shared_library() to allow specifying which kind +of library to build with "meson setup --default-library ..." + +This will avoid the following static build failure: + +FAILED: src/ModemManager +/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/bin/m68k-linux-gcc -o src/ModemManager src/ModemManager.p/meson-generated_.._mm-daemon-enums-types.c.o src/ModemManager.p/main.c.o src/ModemManager.p/mm-auth-provider.c.o src/ModemManager.p/mm-base-bearer.c.o src/ModemManager.p/mm-base-call.c.o src/ModemManager.p/mm-base-manager.c.o src/ModemManager.p/mm-base-modem-at.c.o src/ModemManager.p/mm-base-modem.c.o src/ModemManager.p/mm-base-sim.c.o src/ModemManager.p/mm-base-sms.c.o src/ModemManager.p/mm-bearer-list.c.o src/ModemManager.p/mm-broadband-bearer.c.o src/ModemManager.p/mm-broadband-modem.c.o src/ModemManager.p/mm-call-list.c.o src/ModemManager.p/mm-context.c.o src/ModemManager.p/mm-device.c.o src/ModemManager.p/mm-dispatcher.c.o src/ModemManager.p/mm-dispatcher-connection.c.o src/ModemManager.p/mm-dispatcher-fcc-unlock.c.o src/ModemManager.p/mm-filter.c.o src/ModemManager.p/mm-iface-modem-3gpp.c.o src/ModemManager.p/mm-iface-modem-3gpp-profile-manag er.c.o src/ModemManager.p/mm-iface-modem-3gpp-ussd.c.o src/ModemManager.p/mm-iface-modem.c.o src/ModemManager.p/mm-iface-modem-cdma.c.o src/ModemManager.p/mm-iface-modem-firmware.c.o src/ModemManager.p/mm-iface-modem-location.c.o src/ModemManager.p/mm-iface-modem-messaging.c.o src/ModemManager.p/mm-iface-modem-oma.c.o src/ModemManager.p/mm-iface-modem-sar.c.o src/ModemManager.p/mm-iface-modem-signal.c.o src/ModemManager.p/mm-iface-modem-simple.c.o src/ModemManager.p/mm-iface-modem-time.c.o src/ModemManager.p/mm-iface-modem-voice.c.o src/ModemManager.p/mm-plugin.c.o src/ModemManager.p/mm-plugin-manager.c.o src/ModemManager.p/mm-port-probe.c.o src/ModemManager.p/mm-port-probe-at.c.o src/ModemManager.p/mm-private-boxed-types.c.o src/ModemManager.p/mm-sms-list.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static '-Wl,-rpath,$ORIGIN/../libmm-glib' -Wl,-rpath-link,/home/autobuild/autobuild/instance-11/output-1/build/modem-manager-1.20.2/build/libmm-glib -Wl,--start-group src/libport.a s rc/libkerneldevice.a src/libhelpers.a libmm-glib/libmm-glib.so.0.9.0 libqcdm/src/libqcdm.a libmm-glib/generated/tests/libmm-test-generated.a -Wl,--export-dynamic /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libglib-2.0.a -pthread -lm /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpcre.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libffi.a /home/auto build/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libblkid.a -Wl,--end-group +/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/opt/ext-toolchain/bin/../lib/gcc/m68k-buildroot-linux-uclibc/11.2.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `libmm-glib/libmm-glib.so.0.9.0' + +Fixes: + - http://autobuild.buildroot.org/results/9803d593305df36c4a8d67aac2fb4c9a3120a072 + +Signed-off-by: Fabrice Fontaine +[yann.morin.1998 at free.fr: actual backport of upstreeam commit] +Signed-off-by: Yann E. MORIN +--- + libmm-glib/meson.build | 2 +- + plugins/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libmm-glib/meson.build b/libmm-glib/meson.build +index 42f8ac61..de668dab 100644 +--- a/libmm-glib/meson.build ++++ b/libmm-glib/meson.build +@@ -129,7 +129,7 @@ deps = [include_dep] + + libname = 'mm-glib' + +-libmm_glib = shared_library( ++libmm_glib = library( + libname, + version: mm_glib_version, + sources: sources, +diff --git a/plugins/meson.build b/plugins/meson.build +index f849bb53..9e081beb 100644 +--- a/plugins/meson.build ++++ b/plugins/meson.build +@@ -18,7 +18,7 @@ if enable_tests + libmm_test_generated_dep + ] + +- libmm_test_common = shared_library( ++ libmm_test_common = library( + 'mm-test-common', + sources: sources, + include_directories: top_inc, +-- +2.25.1 + From peter at korsgaard.com Mon Feb 20 20:56:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:19 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-input-libinput: bump version to 1.2.1 Message-ID: <20230220205209.E4353828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e250593ceabbdbc19365e56c679948f80ed6b9c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-January/003129.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash | 7 +++---- .../xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash index a2f295d6b5..480886b295 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-September/003110.html -sha256 f80da3c514fe1cbf57fa1b1bd6ff97f6b0a1f87466ad89247bac59cd0a5869f6 xf86-input-libinput-1.2.0.tar.bz2 -sha512 ebff9490d33fd7495df2e03203060a76b3274f0e638bc92f3d95257fac57cdb9dac308e90e54006fe9522b6de3b1f1c38fd5f0b0b75b7051e5422290f43de52d xf86-input-libinput-1.2.0.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-January/003129.html +sha256 8151db5b9ddb317c0ce92dcb62da9a8db5079e5b8a95b60abc854da21e7e971b xf86-input-libinput-1.2.1.tar.xz +sha512 3decf694861d1aa3c02d090e66c5ed5513818cb18e9863f1790e0c8122a972230fb903705062b8291e1709db9098623f1205c63ccfb68e552e104813414589c7 xf86-input-libinput-1.2.1.tar.xz # Locally computed sha256 4114220b281561e80f3422f0e7ae8d3e1fc85131ffc2e3b6265119e66f1adb27 COPYING diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk index 21d962aa52..d1f93ffb5b 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.2.0 -XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_LIBINPUT_SITE = https://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.2.1 +XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.xz +XDRIVER_XF86_INPUT_LIBINPUT_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT XDRIVER_XF86_INPUT_LIBINPUT_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_LIBINPUT_DEPENDENCIES = libinput xserver_xorg-server xorgproto From yann.morin.1998 at free.fr Mon Feb 20 20:56:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:20 -0000 Subject: [Buildroot] [git commit branch/next] package/qemu: refactor target emulator selection Message-ID: <20230220205219.27F9E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44be514b21fd94096702b80c62d46c31d72f15a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The current mechanism to select emulation targets works this way: - BR2_PACKAGE_QEMU_SYSTEM selects the "system" (softmmu) targets. It selects FDT and creates a dependency on the "dtc" package but this is not always necessary. Only 14 system targets, out of 31, actually require FDT. - BR2_PACKAGE_QEMU_LINUX_USER selects the "linux-user" targets. It does not select FDT, which is not required by linux-user emulators. - Alternatively, we fill BR2_PACKAGE_QEMU_CUSTOM_TARGETS with a list of emulators (e.g. "x86_64-softmmu x86_64-linux-user"). Then we pass "--enable-system --enable-linux-user --target-list="..." to the configure script, so QEMU builds its list of default targets, from which it checks if the specified subset is valid. Since CUSTOM_TARGETS does not select FDT, we can get build errors like this: ../meson.build:2778:2: ERROR: Problem encountered: fdt not available but required by targets x86_64-softmmu We could select FDT when CUSTOM_TARGETS is set, but this would force an unnecessary dependency on dtc, as BR2_PACKAGE_QEMU_SYSTEM does. In order to fix these problems, refactor the package configuration: - Keep BR2_PACKAGE_QEMU_SYSTEM and BR2_PACKAGE_QEMU_LINUX_USER, which by default build all corresponding target emulators. - Add a BR2_PACKAGE_QEMU_CHOOSE_TARGETS config, to permit choosing the desired emulators. - Add configs for each supported target. They select FDT, when needed. - Move QEMU to a separate menu, since the number of configuration itens became too large. - Select BR2_LEGACY if BR2_PACKAGE_QEMU_CUSTOM_TARGETS is set, because this situation requires user intervention to reconfigure the package. - Reorganize the make file accordingly. Selecting CHOOSE_TARGETS without choosing at least one emulator is considered an error. Notes about the list of enabled targets: - when the user enables both system and user emulation, we provide no way to be able to build all system bt only parts of user (or the other way around), because the qemu build system does not allow that: when a list of target is passed, it applies to both system and user emulation; - as a consequence and in the same spirit, we also do not sanity-check that at least one system, resp. user, target is enabled when system, resp. user, emulation is enabled; we only require that one target is enabled, so that the list is not empty. Signed-off-by: Carlos Santos [yann.morin.1998 at free.fr: - always build at least user or system - add help text to BR2_PACKAGE_QEMU_CHOOSE_TARGETS - simplify prompt for BR2_PACKAGE_QEMU_CHOOSE_TARGETS - simplify list of targets with unique QEMU_TARGET_LIST_y - extend the commit log with "Notes about the list of enabled targets" ] Signed-off-by: Yann E. MORIN --- Config.in.legacy | 11 ++ package/qemu/Config.in | 287 ++++++++++++++++++++++++++++++++++++++++--------- package/qemu/qemu.mk | 91 ++++++++++++++-- 3 files changed, 329 insertions(+), 60 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index ca25c18b16..6d66f1b958 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,17 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_QEMU_CUSTOM_TARGETS + string "the QEMU specific targets option has been removed" + help + This option has been replaced by a list of individual targets + for the many architectures supported by QEMU. + +config BR2_PACKAGE_QEMU_CUSTOM_TARGETS_WRAP + bool + default y if BR2_PACKAGE_QEMU_CUSTOM_TARGETS != "" + select BR2_LEGACY + config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD bool "xf86-input-keyboard removed" help diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 15d6c7d6b5..0f9e353510 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -17,7 +17,7 @@ comment "QEMU requires a toolchain with wchar, threads, gcc >= 8" depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR) || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_8 -config BR2_PACKAGE_QEMU +menuconfig BR2_PACKAGE_QEMU bool "QEMU" depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 @@ -27,6 +27,7 @@ config BR2_PACKAGE_QEMU select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_QEMU_SYSTEM if !BR2_PACKAGE_QEMU_LINUX_USER help QEMU is a generic and open source machine emulator and virtualizer. @@ -49,20 +50,13 @@ if BR2_PACKAGE_QEMU comment "Emulators selection" -config BR2_PACKAGE_QEMU_CUSTOM_TARGETS - string "Enable specific targets" +config BR2_PACKAGE_QEMU_SYSTEM + bool "Enable systems emulation" + depends on !BR2_STATIC_LIBS # dtc help - Enter here the list of QEMU targets you want to build. For - example: + Say 'y' to build system emulators/virtualisers. - System emulation | User-land emulation - ----------------------+----------------------- - i386-softmmu | i386-linux-user - arm-softmmu | ppc-linux-user - x86_64-softmmu | sparc-bsd-user - ... | ... - -comment "Networking options" +if BR2_PACKAGE_QEMU_SYSTEM config BR2_PACKAGE_QEMU_SLIRP bool "Enable user mode networking (SLIRP)" @@ -87,69 +81,264 @@ config BR2_PACKAGE_QEMU_SLIRP Notice that this option does not disable other networking modes. -if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = "" - -comment "... or you can select emulator families to enable, below:" +config BR2_PACKAGE_QEMU_SDL + bool "Enable SDL frontend" + select BR2_PACKAGE_SDL2 + help + Say 'y' to enable the SDL frontend, that is, a graphical + window presenting the VM's display. -config BR2_PACKAGE_QEMU_SYSTEM - bool "Enable all systems emulation" - depends on !BR2_STATIC_LIBS # dtc - select BR2_PACKAGE_QEMU_FDT +config BR2_PACKAGE_QEMU_FDT + bool "Enable FDT" + select BR2_PACKAGE_DTC help - Say 'y' to build all system emulators/virtualisers that QEMU - supports. + Say 'y' here to have QEMU capable of constructing Device + Trees, and passing them to the VMs. + +endif # BR2_PACKAGE_QEMU_SYSTEM comment "systems emulation needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS config BR2_PACKAGE_QEMU_LINUX_USER - bool "Enable all Linux user-land emulation" + bool "Enable Linux user-land emulation" # Incompatible "struct sigevent" definition on musl depends on !BR2_TOOLCHAIN_USES_MUSL help - Say 'y' to build all Linux user-land emulators that QEMU - supports. + Say 'y' to build Linux user-land emulators. # Note: bsd-user can not be build on Linux comment "Linux user-land emulation needs a glibc or uClibc toolchain" depends on BR2_TOOLCHAIN_USES_MUSL -endif # BR2_PACKAGE_QEMU_CUSTOM_TARGETS == "" +config BR2_PACKAGE_QEMU_CHOOSE_TARGETS + bool "Select individual emulator targets" + help + By default, all targets (system and/or user, subject to the + corresponding options, above) are built. If you only need a + subset of the emulated targets, say 'y' here and enable at + least one target, below. -config BR2_PACKAGE_QEMU_HAS_EMULS - def_bool y - depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER || BR2_PACKAGE_QEMU_CUSTOM_TARGETS != "" +if BR2_PACKAGE_QEMU_CHOOSE_TARGETS -if BR2_PACKAGE_QEMU_HAS_EMULS +config BR2_PACKAGE_QEMU_TARGET_AARCH64 + bool "aarch64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + ARM 64-bit architecture. -comment "Frontends" +config BR2_PACKAGE_QEMU_TARGET_AARCH64_BE + bool "aarch64_be (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + ARM 64-bit architecture, big-endian. -config BR2_PACKAGE_QEMU_SDL - bool "Enable SDL frontend" - depends on !BR2_STATIC_LIBS # sdl2 - select BR2_PACKAGE_SDL2 +config BR2_PACKAGE_QEMU_TARGET_ALPHA + bool "alpha" help - Say 'y' to enable the SDL frontend, that is, a graphical - window presenting the VM's display. + DEC Alpha 64-bit RISC architecture. -comment "SDL frontend needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +config BR2_PACKAGE_QEMU_TARGET_ARM + bool "arm" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + ARM EABI architecture, little-endian. -comment "Misc. features" +config BR2_PACKAGE_QEMU_TARGET_ARMEB + bool "armeb (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + ARM EABI architecture, big-endian. -config BR2_PACKAGE_QEMU_FDT - bool "Enable FDT" - depends on !BR2_STATIC_LIBS # dtc - select BR2_PACKAGE_DTC +config BR2_PACKAGE_QEMU_TARGET_AVR + bool "avr (system, only)" + depends on BR2_PACKAGE_QEMU_SYSTEM help - Say 'y' here to have QEMU capable of constructing Device - Trees, and passing them to the VMs. + AVR 8-bit microcontroller architecture. -comment "FDT support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +config BR2_PACKAGE_QEMU_TARGET_CRIS + bool "cris" + help + ETRAX CRIS microcontroller architecture. + +config BR2_PACKAGE_QEMU_TARGET_HEXAGON + bool "hexagon (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + Qualcomm's Hexagon VLSI DSP architecture. + +config BR2_PACKAGE_QEMU_TARGET_HPPA + bool "hppa" + help + HP PA-RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_I386 + bool "i386" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Intel i386 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_LOONGARCH64 + bool "loongarch64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Loongson 64-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_M68K + bool "m68k" + help + Motorola 68000 architecture. + +config BR2_PACKAGE_QEMU_TARGET_MICROBLAZE + bool "microblaze" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Xilinix MicroBlaze soft processor. + +config BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL + bool "microblazeel" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Xilinix MicroBlaze EL soft processor. + +config BR2_PACKAGE_QEMU_TARGET_MIPS + bool "mips" + help + MIPS 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_MIPSEL + bool "mipsel" + help + MIPS 32-bit architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_MIPS64 + bool "mips64" + help + MIPS 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_MIPS64EL + bool "mips64el" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + MIPS 64-bit architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_MIPSN32 + bool "mipsn32 (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + MIPS N32 architecture. + +config BR2_PACKAGE_QEMU_TARGET_MIPSN32EL + bool "mipsn32el (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + MIPS N32 architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_NIOS2 + bool "nios2" + help + Nios II architecture. + +config BR2_PACKAGE_QEMU_TARGET_OR1K + bool "or1k" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + OpenRISC 1000 architecture. + +config BR2_PACKAGE_QEMU_TARGET_PPC + bool "ppc" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + PoewerPC 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_PPC64 + bool "ppc64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + PoewerPC 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_PPC64LE + bool "ppc64le (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + PoewerPC 64-bit architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_RISCV32 + bool "riscv32" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + RISC-V 33-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_RISCV64 + bool "riscv64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + RISC-V 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_RX + bool "rx (system-only)" + depends on BR2_PACKAGE_QEMU_SYSTEM + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Renesas Electronics RX 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_S390X + bool "s390x" + help + IBM z/Architecture 64-bit mainframe (s390x) + +config BR2_PACKAGE_QEMU_TARGET_SH4 + bool "sh4" + help + Super-H 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_SH4EB + bool "sh4eb" + help + Super-H EB 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_SPARC + bool "sparc" + help + SPARC 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_SPARC32PLUS + bool "sparc32plus (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + SPARC 32-bit RISC architecture (Sun's v8plus). + +config BR2_PACKAGE_QEMU_TARGET_SPARC64 + bool "sparc64" + help + SPARC 64-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_TRICORE + bool "tricore (system, only)" + depends on BR2_PACKAGE_QEMU_SYSTEM + help + Infineon TriCore 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_X86_64 + bool "x86_64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Intel x86 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_XTENSA + bool "xtensa" + help + Xtensa 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_XTENSAEB + bool "xtensaeb" + help + Xtensa 32-bit RISC architecture, big-endian. + +endif # BR2_PACKAGE_QEMU_CHOOSE_TARGETS -endif # BR2_PACKAGE_QEMU_HAS_EMULS +comment "Tools selection" config BR2_PACKAGE_QEMU_TOOLS bool "Enable tools" diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 8725e7c8c4..5c7a8d504c 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,6 +4,8 @@ # ################################################################################ +# When updating the version, check whether the list of supported targets +# needs to be updated. QEMU_VERSION = 7.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org @@ -36,30 +38,97 @@ QEMU_OPTS = QEMU_VARS = LIBTOOL=$(HOST_DIR)/bin/libtool -# If we want to specify only a subset of targets, we must still enable all -# of them, so that QEMU properly builds its list of default targets, from -# which it then checks if the specified sub-set is valid. That's what we -# do in the first part of the if-clause. -# Otherwise, if we do not want to pass a sub-set of targets, we then need -# to either enable or disable -user and/or -system emulation appropriately. -# That's what we do in the else-clause. -ifneq ($(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS)),) -QEMU_OPTS += --enable-system --enable-linux-user -QEMU_OPTS += --target-list="$(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS))" -else +# If we want to build all emulation targets, we just need to either enable -user +# and/or -system emulation appropriately. +# Otherwise, if we want only a subset of targets, we must still enable all of +# them, so that QEMU properly builds a list of default targets from which it +# checks if the specified sub-set is valid. ifeq ($(BR2_PACKAGE_QEMU_SYSTEM),y) QEMU_OPTS += --enable-system +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64) += aarch64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ALPHA) += alpha-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARM) += arm-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AVR) += avr-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_CRIS) += cris-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HPPA) += hppa-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_I386) += i386-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_LOONGARCH64) += loongarch64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_M68K) += m68k-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZE) += microblaze-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL) += microblazeel-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS) += mips-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64) += mips64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64EL) += mips64el-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSEL) += mipsel-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_NIOS2) += nios2-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_OR1K) += or1k-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC) += ppc-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC64) += ppc64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV32) += riscv32-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV64) += riscv64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RX) += rx-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_S390X) += s390x-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4) += sh4-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4EB) += sh4eb-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC) += sparc-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC64) += sparc64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_TRICORE) += tricore-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_X86_64) += x86_64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSA) += xtensa-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSAEB) += xtensaeb-softmmu else QEMU_OPTS += --disable-system endif ifeq ($(BR2_PACKAGE_QEMU_LINUX_USER),y) QEMU_OPTS += --enable-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64) += aarch64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64_BE) += aarch64_be-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ALPHA) += alpha-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARM) += arm-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARMEB) += armeb-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_CRIS) += cris-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HEXAGON) += hexagon-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HPPA) += hppa-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_I386) += i386-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_LOONGARCH64) += loongarch64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_M68K) += m68k-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZE) += microblaze-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL) += microblazeel-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS) += mips-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64) += mips64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64EL) += mips64el-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSEL) += mipsel-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSN32) += mipsn32-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSN32EL) += mipsn32el-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_NIOS2) += nios2-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_OR1K) += or1k-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC) += ppc-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC64) += ppc64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC64LE) += ppc64le-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV32) += riscv32-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV64) += riscv64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_S390X) += s390x-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4) += sh4-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4EB) += sh4eb-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC) += sparc-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC32PLUS) += sparc32plus-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC64) += sparc64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_X86_64) += x86_64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSA) += xtensa-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSAEB) += xtensaeb-linux-user else QEMU_OPTS += --disable-linux-user endif +# Build the list of desired targets, if any. +ifeq ($(BR2_PACKAGE_QEMU_CHOOSE_TARGETS),y) +QEMU_TARGET_LIST = $(strip $(QEMU_TARGET_LIST_y)) +ifeq ($(BR_BUILDING).$(QEMU_TARGET_LIST),y.) +$(error "No emulator target has ben chosen") +endif +QEMU_OPTS += --target-list="$(QEMU_TARGET_LIST)" endif ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) From yann.morin.1998 at free.fr Mon Feb 20 20:56:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:20 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx/imx-alsa-plugins: update codeaurora URLs to github Message-ID: <20230220205220.074328648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ed90a96aa1f11fed19045036b4a10d9a8263a98 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Note 3: this commit also adds the github as project homepage in Config.in. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/imx-alsa-plugins/Config.in | 2 ++ package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash | 2 +- package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/freescale-imx/imx-alsa-plugins/Config.in b/package/freescale-imx/imx-alsa-plugins/Config.in index ec9b5b19cf..df47edd16d 100644 --- a/package/freescale-imx/imx-alsa-plugins/Config.in +++ b/package/freescale-imx/imx-alsa-plugins/Config.in @@ -13,6 +13,8 @@ config BR2_PACKAGE_IMX_ALSA_PLUGINS * Rate Converter Plugin Using Freescale ASRC Hardware Resampler (i.MX53 and most i.MX6) + https://github.com/nxp-imx/imx-alsa-plugins + comment "imx-alsa-libs needs an imx-specific Linux kernel to be built" depends on BR2_arm depends on !BR2_LINUX_KERNEL diff --git a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash index bb7beede9d..1ca7697f03 100644 --- a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash +++ b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 a9a5ef408a7329c2c5fa2a084ae7824afbfbebed68612bd72509488ccb0b94b3 imx-alsa-plugins-rel_imx_4.9.x_1.0.0_ga-br1.tar.gz +sha256 089bba009f82bf5e4a1e34b77a7d3badce2948619d92bec7a7ad42e766442d4c imx-alsa-plugins-rel_imx_4.9.x_1.0.0_ga.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL diff --git a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk index 9c81ff0df0..912cc7c68b 100644 --- a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk +++ b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk @@ -5,8 +5,7 @@ ################################################################################ IMX_ALSA_PLUGINS_VERSION = rel_imx_4.9.x_1.0.0_ga -IMX_ALSA_PLUGINS_SITE = https://source.codeaurora.org/external/imx/imx-alsa-plugins -IMX_ALSA_PLUGINS_SITE_METHOD = git +IMX_ALSA_PLUGINS_SITE = $(call github,nxp-imx,imx-alsa-plugins,$(IMX_ALSA_PLUGINS_VERSION)) IMX_ALSA_PLUGINS_LICENSE = GPL-2.0+ IMX_ALSA_PLUGINS_LICENSE_FILES = COPYING.GPL IMX_ALSA_PLUGINS_DEPENDENCIES = host-pkgconf alsa-lib From peter at korsgaard.com Mon Feb 20 20:56:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:21 -0000 Subject: [Buildroot] [git commit branch/next] nezha_defconfig: use upstream OpenSBI 1.1 release Message-ID: <20230220205210.1F34D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=300610e11e76bbd75469243f88ae243f03523ea3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The D1 support is now upstream, so we can use the upstream 1.1 release instead of a custom version. Signed-off-by: Peter Korsgaard --- configs/nezha_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 02f351d483..f845d918d9 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -15,8 +15,8 @@ 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_CUSTOM_TARBALL=y -BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,opensbi,e6793dc36a71537023f078034fe795c64a9992a3)/opensbi-e6793dc36a71537023f078034fe795c64a9992a3.tar.gz" +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y From yann.morin.1998 at free.fr Mon Feb 20 20:56:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:21 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6qsabreauto: update codeaurora URLs to github Message-ID: <20230220205220.D2F04828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67a98cdd94b03404bf91b203a998e37a6d5d4e0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6qsabreauto_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index 58b4a5f92d..72696ab1ad 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto" @@ -38,7 +37,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y From peter at korsgaard.com Mon Feb 20 20:56:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:22 -0000 Subject: [Buildroot] [git commit branch/next] package/libxkbcommon: add LIBXKBCOMMON_CPE_ID_VENDOR Message-ID: <20230220205210.0B382828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=32c0225b7240c24002038779ad2035a5c16c6299 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next cpe:2.3:a:xkbcommon:libxkbcommon is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Axkbcommon%3Alibxkbcommon Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Peter Korsgaard --- package/libxkbcommon/libxkbcommon.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index f2c49cc700..236bf4c5d9 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -9,6 +9,7 @@ LIBXKBCOMMON_SITE = https://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 LIBXKBCOMMON_LICENSE_FILES = LICENSE +LIBXKBCOMMON_CPE_ID_VENDOR = xkbcommon LIBXKBCOMMON_INSTALL_STAGING = YES LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex LIBXKBCOMMON_CONF_OPTS = \ From yann.morin.1998 at free.fr Mon Feb 20 20:56:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:22 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6qsabresd: update codeaurora URLs to github Message-ID: <20230220205220.E775D86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd42b159a5f752921ee602530d289c810ad7ee51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6qsabresd_defconfig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index f2ac993da0..86513d8072 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" @@ -39,6 +38,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y From peter at korsgaard.com Mon Feb 20 20:56:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:23 -0000 Subject: [Buildroot] [git commit branch/next] package/libglfw: bump version to 3.3.8 Message-ID: <20230220205209.F0EF08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=acf4a7d1c72c468e269058ba52df40c9734c8801 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://www.glfw.org/changelog.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libglfw/libglfw.hash | 2 +- package/libglfw/libglfw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libglfw/libglfw.hash b/package/libglfw/libglfw.hash index 5bffc55d26..9d38946f3c 100644 --- a/package/libglfw/libglfw.hash +++ b/package/libglfw/libglfw.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed07b90e334dcd39903e6288d90fa1ae0cf2d2119fec516cf743a0a404527c02 libglfw-3.3.6.tar.gz +sha256 f30f42e05f11e5fc62483e513b0488d5bceeab7d9c5da0ffe2252ad81816c713 libglfw-3.3.8.tar.gz sha256 149704059b5d0bf551637e50042dd4de9c2cae921021f6636298911e3a5f9462 LICENSE.md diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 0a3986f662..eee8e7b298 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGLFW_VERSION = 3.3.6 +LIBGLFW_VERSION = 3.3.8 LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) LIBGLFW_INSTALL_STAGING = YES LIBGLFW_LICENSE = Zlib From yann.morin.1998 at free.fr Mon Feb 20 20:56:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:23 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx8mpevk: update codeaurora URLs to github Message-ID: <20230220205221.4CBC486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5f10b73007487d5d19e34914ee0e1c35a127c4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mpevk_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig index 8d0e6e0f3e..5a72406b67 100644 --- a/configs/freescale_imx8mpevk_defconfig +++ b/configs/freescale_imx8mpevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mp-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-evk" @@ -19,16 +18,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mp_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From peter at korsgaard.com Mon Feb 20 20:56:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:24 -0000 Subject: [Buildroot] [git commit branch/next] nezha_defconfig: bump Linux to current top of d1/wip Message-ID: <20230220205210.2A084828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e8d312418e7eb4b0b2c14fdb17560d185f0ea9b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is now based on Linux 6.1-rc3. We don't have an option for 6.1 yes, so mark it as 6.0 headers. Signed-off-by: Peter Korsgaard --- configs/nezha_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index f845d918d9..2936746c49 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,12 +1,12 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/nezha/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,fe178cf0153d98b71cb01a46c8cc050826a17e77)/linux-fe178cf0153d98b71cb01a46c8cc050826a17e77.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="nezha" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-nezha" From yann.morin.1998 at free.fr Mon Feb 20 20:56:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:24 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx8mnevk: update codeaurora URLs to github Message-ID: <20230220205221.5D10086496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d93fe2f2ac6155db3bb8022a85cf89c9ff57f82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mnevk_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8mnevk_defconfig b/configs/freescale_imx8mnevk_defconfig index b24eb1566b..0653978d91 100644 --- a/configs/freescale_imx8mnevk_defconfig +++ b/configs/freescale_imx8mnevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-ddr4-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-ddr4-evk" @@ -20,16 +19,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_ddr4_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From peter at korsgaard.com Mon Feb 20 20:56:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:25 -0000 Subject: [Buildroot] [git commit branch/next] package/iproute2: bump to version 6.1.0 Message-ID: <20230220205210.55DC781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee8d02ea6d76493324180e0131fea6c227d1d284 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 45af05a200..9e8be43f2b 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 523139e9e72aec996374fa2de74be4c53d2dd05589488934d21ff97bae19580a iproute2-6.0.0.tar.xz +sha256 5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab iproute2-6.1.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 287c6b14e2..9792630f15 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.0.0 +IPROUTE2_VERSION = 6.1.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From yann.morin.1998 at free.fr Mon Feb 20 20:56:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:25 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx8qxpmek: update codeaurora URLs to github Message-ID: <20230220205221.85F5086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9bcc1c0ef7cfc5263925448c2b3c502318b37691 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8qxpmek_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8qxpmek_defconfig b/configs/freescale_imx8qxpmek_defconfig index 1ffbd123e0..ce8f6b7c84 100644 --- a/configs/freescale_imx8qxpmek_defconfig +++ b/configs/freescale_imx8qxpmek_defconfig @@ -6,9 +6,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qxp-mek" @@ -22,16 +21,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qx" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From peter at korsgaard.com Mon Feb 20 20:56:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:26 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xserver_xorg-server: security bump version to 21.1.5 Message-ID: <20230220205210.470668648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8881d4d7e4822337c222fadf4630a49eec1e9ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003303.html Security advisory: https://lists.x.org/archives/xorg-announce/2022-December/003302.html Fixes CVE-2022-46340, CVE-2022-46341, CVE-2022-46342, CVE-2022-46343, CVE-2022-46344 and CVE-2022-4283. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 7 +++---- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 4b2090fa99..654552c8b6 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-July/003193.html -sha256 5cc4be8ee47edb58d4a90e603a59d56b40291ad38371b0bd2471fc3cbee1c587 xorg-server-21.1.4.tar.xz -sha512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f xorg-server-21.1.4.tar.xz - +# From https://lists.x.org/archives/xorg-announce/2022-December/003303.html +sha256 05b0c8301cee7c5a78083df421ba3a071891553541a417b3d85adf5cf20f8720 xorg-server-21.1.5.tar.xz +sha512 a39c6ba36f94241d330b679a9a6fe2c5fda73fc3f5a9308a7a9cfd0d58503e407291759c9e553455c07cf5a3862952ae3904334eeca29c97ff5af7cffd2e6953 xorg-server-21.1.5.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 8dba9f1ed0..16b7438ee6 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.4 +XSERVER_XORG_SERVER_VERSION = 21.1.5 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From yann.morin.1998 at free.fr Mon Feb 20 20:56:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:26 -0000 Subject: [Buildroot] [git commit branch/next] configs/imx8mpico: update codeaurora URLs to github Message-ID: <20230220205221.9E8A8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8fd6036e3b2847f378363b8c0f0ba2cf1a30d1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates only the ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/imx8mpico_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/imx8mpico_defconfig b/configs/imx8mpico_defconfig index 55746fb67e..1df8c104ec 100644 --- a/configs/imx8mpico_defconfig +++ b/configs/imx8mpico_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.72-2.2.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.72-2.2.0)/imx-atf-lf-5.10.72-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y From peter at korsgaard.com Mon Feb 20 20:56:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:27 -0000 Subject: [Buildroot] [git commit branch/next] package/cairo: fix CVE-2019-6462 Message-ID: <20230220205210.7143381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b38286d7e5919693cad2dc5b19024b1c03d29c18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add an upstream patch to fix CVE-2019-6462: An issue was discovered in cairo 1.16.0. There is an infinite loop in the function _arc_error_normalized in the file cairo-arc.c, related to _arc_max_angle_for_tolerance_normalized. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Peter Korsgaard --- ...gle_for_tolerance_normalized-fix-infinite.patch | 39 ++++++++++++++++++++++ package/cairo/cairo.mk | 2 ++ 2 files changed, 41 insertions(+) diff --git a/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch b/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch new file mode 100644 index 0000000000..078e90fa42 --- /dev/null +++ b/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch @@ -0,0 +1,39 @@ +From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 +From: Heiko Lewin +Date: Sun, 1 Aug 2021 11:16:03 +0000 +Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop + +[Retrieved from: +https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0] +Signed-off-by: Quentin Schulz +--- + src/cairo-arc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/cairo-arc.c b/src/cairo-arc.c +index 390397bae..1c891d1a0 100644 +--- a/src/cairo-arc.c ++++ b/src/cairo-arc.c +@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) + { M_PI / 11.0, 9.81410988043554039085e-09 }, + }; + int table_size = ARRAY_LENGTH (table); ++ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ + + for (i = 0; i < table_size; i++) + if (table[i].error < tolerance) + return table[i].angle; + + ++i; ++ + do { + angle = M_PI / i++; + error = _arc_error_normalized (angle); +- } while (error > tolerance); ++ } while (error > tolerance && i < max_segments); + + return angle; + } +-- +2.38.1 + diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index f479aa252a..8bb7ca121d 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -14,6 +14,8 @@ CAIRO_INSTALL_STAGING = YES # 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch CAIRO_IGNORE_CVES += CVE-2018-19876 +# 0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch +CAIRO_IGNORE_CVES += CVE-2019-6462 CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" From yann.morin.1998 at free.fr Mon Feb 20 20:56:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:27 -0000 Subject: [Buildroot] [git commit branch/next] configs/imx8mqevk: update codeaurora URLs to github Message-ID: <20230220205221.A9BC586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e96e3c95452aa69dbaad2597146c6da520299fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/imx8mqevk_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/imx8mqevk_defconfig b/configs/imx8mqevk_defconfig index 73f3f3dcc5..943a479932 100644 --- a/configs/imx8mqevk_defconfig +++ b/configs/imx8mqevk_defconfig @@ -18,16 +18,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,rel_imx_5.4.24_2.1.0)/imx-atf-rel_imx_5.4.24_2.1.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,rel_imx_5.4.24_2.1.0)/uboot-imx-rel_imx_5.4.24_2.1.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From peter at korsgaard.com Mon Feb 20 20:56:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:34 -0000 Subject: [Buildroot] [git commit branch/next] package/libostree: bump to version 2022.7 Message-ID: <20230220205210.EB90C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9febd64bb01f0660a9ac877d2484525438955333 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index 582af4b7b9..ed31109fdb 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 835ef47d9a0b35a10c77ffd7f0fbd2e2b87f7cccb588da27442a05ff71ffad8c libostree-2022.6.tar.xz +sha256 8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f libostree-2022.7.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index e99da9d2cb..8e8ec63213 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2022.6 +LIBOSTREE_VERSION = 2022.7 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From peter at korsgaard.com Mon Feb 20 20:56:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:35 -0000 Subject: [Buildroot] [git commit branch/next] package/tinyxml: fix typo for TINYXML_CPE_ID_VENDOR Message-ID: <20230220205223.513BB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7792f539e440d40566bfab3dd86881a8f8edd7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/tinyxml/tinyxml.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index d173254e31..8e706f1a1e 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,7 +12,7 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README -TINYXML_CPE_ID_VENDOT = tinyxml_project +TINYXML_CPE_ID_VENDOR = tinyxml_project # 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch TINYXML_IGNORE_CVES += CVE-2021-42260 From peter at korsgaard.com Mon Feb 20 20:56:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:35 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libX11: bump version to 1.8.3 Message-ID: <20230220205211.2E8D5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de93736550f8443925dc218b04f82daedfc63c79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003305.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 4f5027d62d..62b67ad544 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003253.html -sha256 ed91d573d570db83b8ae546f4890dccfcd0b9dfe1e50a1b401b63a74c152ed04 libX11-1.8.2.tar.xz -sha512 662ee8043d9ba27df82f647515b701d6f302a52715f21afdaba391f3b70691753e3649e7ff8322e07858be4297df9cbb19227958d676ed6dea198cce64330d1d libX11-1.8.2.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003305.html +sha256 e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd libX11-1.8.3.tar.xz +sha512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 libX11-1.8.3.tar.xz # Locally computed sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 26d4b4d306..3bb3fffce0 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.8.2 +XLIB_LIBX11_VERSION = 1.8.3 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT From peter at korsgaard.com Mon Feb 20 20:56:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:36 -0000 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.1 Message-ID: <20230220205211.1DBCC86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b382fb4a0467a329c22e01a3feafe8029dfe3811 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-December/000697.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 d33d492ba7..e5988cad5e 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 = 22.3.0 +MESA3D_HEADERS_VERSION = 22.3.1 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 77223676ea..613ebce89f 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-November/000695.html -sha256 644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746 mesa-22.3.0.tar.xz -sha512 bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da mesa-22.3.0.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-December/000697.html +sha256 3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb mesa-22.3.1.tar.xz +sha512 8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b mesa-22.3.1.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index c3bd44c2fa..b6f1214102 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 = 22.3.0 +MESA3D_VERSION = 22.3.1 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From peter at korsgaard.com Mon Feb 20 20:56:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:36 -0000 Subject: [Buildroot] [git commit branch/next] package/i2pd: really install configuration files Message-ID: <20230220205223.7ED3E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa581bb3e6b45da2b7a0cfb9e5d6f869a7cd9b05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next While applying [1] the commit "fffbd2c9f7 i2pd: new package" unintentionally removed completely the post-install hooks, so I2PD_INSTALL_CONFIGURATION_FILES is declared but never called. Fix the install of configuration files by adding the defined symbol to the post-install hooks. [1] http://patchwork.ozlabs.org/project/buildroot/patch/20180327212401.5173-1-fontaine.fabrice at gmail.com/ Cc: Fabrice Fontaine Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/i2pd/i2pd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/i2pd/i2pd.mk b/package/i2pd/i2pd.mk index b99212be47..ad268a235c 100644 --- a/package/i2pd/i2pd.mk +++ b/package/i2pd/i2pd.mk @@ -44,6 +44,7 @@ define I2PD_INSTALL_CONFIGURATION_FILES mkdir -p $(TARGET_DIR)/var/lib/i2pd cp -a $(@D)/contrib/certificates $(TARGET_DIR)/var/lib/i2pd endef +I2PD_POST_INSTALL_TARGET_HOOKS += I2PD_INSTALL_CONFIGURATION_FILES define I2PD_USERS i2pd -1 i2pd -1 * /var/lib/i2pd - - I2P Daemon From peter at korsgaard.com Mon Feb 20 20:56:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:37 -0000 Subject: [Buildroot] [git commit branch/next] Revert "package/gperf: add _CPE_ID_VENDOR and _CPE_ID_PRODUCT" Message-ID: <20230220205211.47A3F86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7aeb6c654e16863dc9d7f0d5b92414b52669299f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit 3712e1dee7626b0c3262c054b5b9c2769fd2a61e. gperf -- the GNU perfect hash function generator https://www.gnu.org/software/gperf/ and gperftools -- the Google Performance Tools https://github.com/gperftools/gperftools are two different and unrelated projects. Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/gperf/gperf.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk index c2f042c464..4b928a0ebd 100644 --- a/package/gperf/gperf.mk +++ b/package/gperf/gperf.mk @@ -8,8 +8,6 @@ GPERF_VERSION = 3.1 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf GPERF_LICENSE = GPL-3.0+ GPERF_LICENSE_FILES = COPYING -GPERF_CPE_ID_VENDOR = gperftools_project -GPERF_CPE_ID_PRODUCT = gperftools $(eval $(autotools-package)) $(eval $(host-autotools-package)) From peter at korsgaard.com Mon Feb 20 20:56:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:37 -0000 Subject: [Buildroot] [git commit branch/next] Revert "pptp-linux: fix build with high BR2_JLEVEL settings" Message-ID: <20230220205223.BF0A886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4ce9d01c4244252e18302aa97653e573359dba6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit ffc4afe084a76e7246bd373c73b706f512a86c2b. Commit from 2012 "ffc4afe084 pptp-linux: fix build with high BR2_JLEVEL settings" added _MAKE to a generic package, but the generic infra does not take this symbol into account. The build issue was fixed in 2013 with commit "a5b8081b89 pptp-linux: fix parallel build" by adding a patch file. So drop the bogus PPTP_LINUX_MAKE. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/pptp-linux/pptp-linux.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk index 7fd0733977..b6c740e710 100644 --- a/package/pptp-linux/pptp-linux.mk +++ b/package/pptp-linux/pptp-linux.mk @@ -7,7 +7,6 @@ PPTP_LINUX_VERSION = 1.10.0 PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION) PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz -PPTP_LINUX_MAKE = $(MAKE1) PPTP_LINUX_LICENSE = GPL-2.0+ PPTP_LINUX_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 20:56:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:38 -0000 Subject: [Buildroot] [git commit branch/next] package/timescaledb: bump version to 2.9.0 Message-ID: <20230220205211.5472B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48a3fc3f361f2720007f7fd3851fab0cfa25f092 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/timescale/timescaledb/blob/2.9.0/CHANGELOG.md Signed-off-by: Maxim Kochetkov 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 f546b17d0a..a970ffa1ad 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 22a057c4472d23bf08778932e391f38f350ef0307cf99fb8e279c8245667d3e9 timescaledb-2.8.1.tar.gz +sha256 666f5427cb036500bca731d24d845285299cff82f576ad4474f85da682b2ee78 timescaledb-2.9.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 659d07bd0c..7530368498 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.8.1 +TIMESCALEDB_VERSION = 2.9.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:56:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:38 -0000 Subject: [Buildroot] [git commit branch/next] package/lsof: bump to version 4.96.5 Message-ID: <20230220205224.30F5D86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=848450f32bd3b877a7529f72e23c1d967f717552 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/lsof/lsof.hash | 2 +- package/lsof/lsof.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lsof/lsof.hash b/package/lsof/lsof.hash index 9649e24f7f..29cf443a24 100644 --- a/package/lsof/lsof.hash +++ b/package/lsof/lsof.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c lsof-4.96.3.tar.gz +sha256 e9030af1123ff052ab69e12ef55b8a17dc47ac4bccfba85ee1ca1f31acf29607 lsof-4.96.5.tar.gz sha256 32a728188b19bf86917659d904ab29d0a294b4506e1c98b8b7f1c70ab4975fe1 dialects/linux/dproto.h diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 8c8c46c4ed..fd5887141b 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -4,7 +4,7 @@ # ################################################################################ -LSOF_VERSION = 4.96.3 +LSOF_VERSION = 4.96.5 LSOF_SITE = $(call github,lsof-org,lsof,$(LSOF_VERSION)) LSOF_LICENSE = lsof license # License is repeated in each file, this is a relatively small one. From peter at korsgaard.com Mon Feb 20 20:56:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:39 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pip: bump to version 22.3.1 Message-ID: <20230220205211.7F937828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b869587c6c88a15dc2ecf6c417896de18501a17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-pip/python-pip.hash | 4 ++-- package/python-pip/python-pip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash index d1442ca39d..b41ce47d4c 100644 --- a/package/python-pip/python-pip.hash +++ b/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json -md5 f0dd02265e7ccd2f8758c840fba64810 pip-22.3.tar.gz -sha256 8182aec21dad6c0a49a2a3d121a87cd524b950e0b6092b181625f07ebdde7530 pip-22.3.tar.gz +md5 996f58a94fe0b8b82b6795c42bd171ba pip-22.3.1.tar.gz +sha256 65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38 pip-22.3.1.tar.gz # Locally computed sha256 checksums sha256 634300a669d49aeae65b12c6c48c924c51a4cdf3d1ff086dc3456dc8bcaa2104 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 0f2c5d8e02..8cf3aaa3ec 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 22.3 +PYTHON_PIP_VERSION = 22.3.1 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/f8/08/7f92782ff571c7c7cb6c5eeb8ebbb1f68cb02bdb24e55c5de4dd9ce98bc3 +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/a3/50/c4d2727b99052780aad92c7297465af5fe6eec2dbae490aa9763273ffdc1 PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 20 20:56:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:39 -0000 Subject: [Buildroot] [git commit branch/next] package/readline: bump to version 8.2 Message-ID: <20230220205224.6951986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1f5e9f15063443bae1b80af072c7a5b0ab91d24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/readline/readline.hash | 4 ++-- package/readline/readline.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/readline/readline.hash b/package/readline/readline.hash index b0530a2d72..627746d821 100644 --- a/package/readline/readline.hash +++ b/package/readline/readline.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/readline/readline-8.1.2.tar.gz.sig -sha256 7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6 readline-8.1.2.tar.gz +# https://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz.sig +sha256 3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35 readline-8.2.tar.gz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/readline/readline.mk b/package/readline/readline.mk index b1fd181b78..66812dee77 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -4,7 +4,7 @@ # ################################################################################ -READLINE_VERSION = 8.1.2 +READLINE_VERSION = 8.2 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses host-autoconf From peter at korsgaard.com Mon Feb 20 20:56:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:40 -0000 Subject: [Buildroot] [git commit branch/next] package/python-ipdb: bump to version 0.13.11 Message-ID: <20230220205211.8D81581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7165965fe57725c32ce3a9c69274d1a4c2c54c80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop no longer required setuptools runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-ipdb/Config.in | 1 - package/python-ipdb/python-ipdb.hash | 4 ++-- package/python-ipdb/python-ipdb.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-ipdb/Config.in b/package/python-ipdb/Config.in index a9d6af1684..9259421c6a 100644 --- a/package/python-ipdb/Config.in +++ b/package/python-ipdb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IPDB bool "python-ipdb" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_IPYTHON # runtime help IPython-enabled pdb. diff --git a/package/python-ipdb/python-ipdb.hash b/package/python-ipdb/python-ipdb.hash index 7d483e1777..1e8a45fbd6 100644 --- a/package/python-ipdb/python-ipdb.hash +++ b/package/python-ipdb/python-ipdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ipdb/json -md5 4f5ffb71cd6551319acf8cbceabd8936 ipdb-0.13.9.tar.gz -sha256 951bd9a64731c444fd907a5ce268543020086a697f6be08f7cc2c9a752a278c5 ipdb-0.13.9.tar.gz +md5 e624221cbc9261f68f412b748179d5e2 ipdb-0.13.11.tar.gz +sha256 c23b6736f01fd4586cc2ecbebdf79a5eb454796853e1cd8f2ed3b7b91d4a3e93 ipdb-0.13.11.tar.gz # Locally computed sha256 checksums sha256 4eeb49de04f4894f8ea1f69a04f500799041b750b3d554c06de5ca877258e734 COPYING.txt diff --git a/package/python-ipdb/python-ipdb.mk b/package/python-ipdb/python-ipdb.mk index 7828f83020..151a3d45a4 100644 --- a/package/python-ipdb/python-ipdb.mk +++ b/package/python-ipdb/python-ipdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPDB_VERSION = 0.13.9 +PYTHON_IPDB_VERSION = 0.13.11 PYTHON_IPDB_SOURCE = ipdb-$(PYTHON_IPDB_VERSION).tar.gz -PYTHON_IPDB_SITE = https://files.pythonhosted.org/packages/fc/56/9f67dcd4a4b9960373173a31be1b8c47fe351a1c9385677a7bdd82810e57 +PYTHON_IPDB_SITE = https://files.pythonhosted.org/packages/23/b2/c972cc266b0ba8508b42dab7f5dea1be03ea32213258441bf1b00baca555 PYTHON_IPDB_SETUP_TYPE = setuptools PYTHON_IPDB_LICENSE = BSD-3-Clause PYTHON_IPDB_LICENSE_FILES = COPYING.txt From peter at korsgaard.com Mon Feb 20 20:56:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:40 -0000 Subject: [Buildroot] [git commit branch/next] package/flare-{engine, game}: bump to version 1.14 Message-ID: <20230220205224.A4E1F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34f28a9399477f8fceff54976f838b4d9ff6fb22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next See: https://flarerpg.org/2022/01/31/flare-1-13/ https://flarerpg.org/2022/12/10/flare-1-14/ While at it, change URL to use https. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/flare-engine/Config.in | 2 +- package/flare-engine/flare-engine.hash | 2 +- package/flare-engine/flare-engine.mk | 2 +- package/flare-game/Config.in | 2 +- package/flare-game/flare-game.hash | 2 +- package/flare-game/flare-game.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in index 9c997c2b9a..136cae707e 100644 --- a/package/flare-engine/Config.in +++ b/package/flare-engine/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_FLARE_ENGINE Flare is not a reimplementation of an existing game or engine. It is a tribute to and exploration of the action RPG genre. - http://flarerpg.org + https://flarerpg.org comment "flare-engine needs a toolchain w/ C++, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/package/flare-engine/flare-engine.hash b/package/flare-engine/flare-engine.hash index 7f6169381c..2e1f87b237 100644 --- a/package/flare-engine/flare-engine.hash +++ b/package/flare-engine/flare-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 287a08532972fa3ac56ce7cb213d21be8be35b529339f61d4eeadbd501c78a8e flare-engine-1.12.tar.gz +sha256 2c1bafeaa5ac26c10449bfcb7151b06e8a22547aa7364d2a39bbcb135aa50a09 flare-engine-1.14.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index cbb7add4bb..e5fa947272 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLARE_ENGINE_VERSION = 1.12 +FLARE_ENGINE_VERSION = 1.14 FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION)) FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING diff --git a/package/flare-game/Config.in b/package/flare-game/Config.in index ca68d19a69..535a9b18a2 100644 --- a/package/flare-game/Config.in +++ b/package/flare-game/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_FLARE_GAME game engine itself is part of a separate package, flame-engine. - http://flarerpg.org + https://flarerpg.org diff --git a/package/flare-game/flare-game.hash b/package/flare-game/flare-game.hash index 3d6d678c94..9ae88c6daa 100644 --- a/package/flare-game/flare-game.hash +++ b/package/flare-game/flare-game.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 19a909f2c6e0868baae823bb491e8840d5fb3e0454f00201de8da119772e5160 flare-game-1.12.tar.gz +sha256 65758462070aa88842084f8ee69083d8226e93cfbf83481663276d8307494b8e flare-game-1.14.tar.gz sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f LICENSE.txt diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk index 41f02bec93..a1a0a5944a 100644 --- a/package/flare-game/flare-game.mk +++ b/package/flare-game/flare-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLARE_GAME_VERSION = 1.12 +FLARE_GAME_VERSION = 1.14 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) From peter at korsgaard.com Mon Feb 20 20:56:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:41 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xutil_makedepend: bump version to 1.0.8 Message-ID: <20230220205211.A6C36828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d005917d7256c79b2f50010d48f36846333a457a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003300.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xutil_makedepend/xutil_makedepend.hash | 6 +++--- package/x11r7/xutil_makedepend/xutil_makedepend.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.hash b/package/x11r7/xutil_makedepend/xutil_makedepend.hash index 3a7496e1a4..e2fe117f10 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.hash +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-October/003243.html -sha256 a729cfd3c0f4e16c0db1da351e7f53335222e058e3434e84f91251fd6d407065 makedepend-1.0.7.tar.xz -sha512 fd575de737aa56ef8e475d1ddb7b2392e730ee1b23c0b853bbb21975b757c3fc56f94d57ecc5a784dceed2be653feb10909e86fd96fdc074b50fbbd0e27a19db makedepend-1.0.7.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003300.html +sha256 bfb26f8025189b2a01286ce6daacc2af8fe647440b40bb741dd5c397572cba5b makedepend-1.0.8.tar.xz +sha512 6707b1107c07d4ffbcf008181e877d18a0bcc4aea03860ee1158f5630c7fdce4cf9ad7bee3b38ee420c3a44819ed4b56a6f2428a5b695c0dbd17fb3e60825a6d makedepend-1.0.8.tar.xz # Locally computed sha256 0530078db78c47ae978dc2bd77f4f427e6cd97df868672c95b1ef284113c8cb7 COPYING diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk index b16bbe0978..0c4a32c006 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk @@ -4,7 +4,7 @@ # ################################################################################ -XUTIL_MAKEDEPEND_VERSION = 1.0.7 +XUTIL_MAKEDEPEND_VERSION = 1.0.8 XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.xz XUTIL_MAKEDEPEND_SITE = https://xorg.freedesktop.org/archive/individual/util XUTIL_MAKEDEPEND_LICENSE = MIT From peter at korsgaard.com Mon Feb 20 20:56:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:41 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-mediadriver: bump version to 22.6.5 Message-ID: <20230220205225.10C5786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98613ad592828a3626400f52a1504fe5234fc7f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Removed patch included in upstream release. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-dont-include-va-dricommon-h.patch | 36 ---------------------- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 3 files changed, 2 insertions(+), 38 deletions(-) diff --git a/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch b/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch deleted file mode 100644 index 9d512f9c0b..0000000000 --- a/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e0d2caafcd5e583a01f7792eaec5d1f2d540bdf1 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Fri, 18 Nov 2022 22:44:52 +1100 -Subject: [PATCH] [Media Common] [VP] dont include va_dricommon.h - - is not in non-X11 libva 2.16.0 -The header "media_libva_putsurface_linux.h" is included - -Downloaded from upstream commit -https://github.com/intel/media-driver/commit/e0d2caafcd5e583a01f7792eaec5d1f2d540bdf1 - -Signed-off-by: Rudi Heitbaum -Signed-off-by: Bernd Kuhls ---- - media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp -index 8695d6c86..6719c07b3 100644 ---- a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp -+++ b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp -@@ -23,7 +23,6 @@ - //! \file ddi_vp_functions.cpp - //! \brief ddi vp functions implementaion. - //! --#include - #include "ddi_vp_functions.h" - #include "media_libva_util_next.h" - #include "media_libva_common_next.h" -@@ -4700,4 +4699,4 @@ VAStatus DdiVpFunctions::PutSurfaceLinuxHW( - - return VA_STATUS_SUCCESS; - } --#endif // !defined(ANDROID) && defined(X11_FOUND) -\ No newline at end of file -+#endif // !defined(ANDROID) && defined(X11_FOUND) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index a9b7c6407d..b2c45eb025 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0c04b9d74b92de41fd409b62913ce4afd799236c0b6bc1983a496990764e5d90 intel-media-22.6.4.tar.gz +sha256 cbb6a514564f8c3349b1f78fc0906b636ea2074d7605cb0e820c5b727ce88cdc intel-media-22.6.5.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index ff97445181..8d3fc09260 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.6.4 +INTEL_MEDIADRIVER_VERSION = 22.6.5 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 peter at korsgaard.com Mon Feb 20 20:56:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:42 -0000 Subject: [Buildroot] [git commit branch/next] package/libfreeglut: bump version to 3.4.0 Message-ID: <20230220205211.B495686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b879cfe0e2b03373bdedc7ae97b956aa102e486 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/FreeGLUTProject/freeglut/releases/tag/v3.4.0 Upstream switched to github: https://freeglut.sourceforge.net/news.php https://sourceforge.net/p/freeglut/mailman/message/37622871/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libfreeglut/libfreeglut.hash | 5 +---- package/libfreeglut/libfreeglut.mk | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/libfreeglut/libfreeglut.hash b/package/libfreeglut/libfreeglut.hash index ce9fb9e299..249a780f04 100644 --- a/package/libfreeglut/libfreeglut.hash +++ b/package/libfreeglut/libfreeglut.hash @@ -1,6 +1,3 @@ -# 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 c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50 freeglut-3.2.2.tar.gz +sha256 3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec freeglut-3.4.0.tar.gz sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING diff --git a/package/libfreeglut/libfreeglut.mk b/package/libfreeglut/libfreeglut.mk index 484b0f4b97..09309aeceb 100644 --- a/package/libfreeglut/libfreeglut.mk +++ b/package/libfreeglut/libfreeglut.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBFREEGLUT_VERSION = 3.2.2 +LIBFREEGLUT_VERSION = 3.4.0 LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz -LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut +LIBFREEGLUT_SITE = https://github.com/FreeGLUTProject/freeglut/releases/download/v$(LIBFREEGLUT_VERSION) LIBFREEGLUT_LICENSE = MIT LIBFREEGLUT_LICENSE_FILES = COPYING LIBFREEGLUT_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:56:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:43 -0000 Subject: [Buildroot] [git commit branch/next] package/exfat: drop dangling EXFAT_CFLAGS Message-ID: <20230220205225.3DE8086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbbbe50173ed4b3ef3323cc7df6c90e0d63678d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "98538bb0a2 exfat: bump to version 1.2.1" changed the package infra from generic to autotools, but dropped all usages of EXFAT_CFLAGS. This config is ignored by autotools package infra. So drop the dangling symbol. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/exfat/exfat.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk index 282a30aa5e..c0ef77a113 100644 --- a/package/exfat/exfat.mk +++ b/package/exfat/exfat.mk @@ -11,7 +11,6 @@ EXFAT_DEPENDENCIES = libfuse host-pkgconf EXFAT_LICENSE = GPL-2.0+ EXFAT_LICENSE_FILES = COPYING EXFAT_CPE_ID_VENDOR = exfat_project -EXFAT_CFLAGS = $(TARGET_CFLAGS) -std=c99 EXFAT_CONF_OPTS += --exec-prefix=/ From peter at korsgaard.com Mon Feb 20 20:56:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:44 -0000 Subject: [Buildroot] [git commit branch/next] package/gobject-introspection: drop bogus GOBJECT_INTROSPECTION_AUTORECONF Message-ID: <20230220205225.6E31386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec6e8c632bf372c1fad7889ca6323166b90e1599 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "7687a396e8 package/gobject-introspection: new package" added the package using the meson infra for both target and host variants. Meson infra does not support _AUTORECONF. So drop the bogus symbol. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/gobject-introspection/gobject-introspection.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index c8ad9b3c72..0d8c666ba1 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -9,7 +9,6 @@ GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz GOBJECT_INTROSPECTION_INSTALL_STAGING = YES -GOBJECT_INTROSPECTION_AUTORECONF = YES GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scannerlexer.l From peter at korsgaard.com Mon Feb 20 20:56:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:44 -0000 Subject: [Buildroot] [git commit branch/next] package/inih: bump version to 56 Message-ID: <20230220205211.C3DA8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30bc9e5aef772432a9c2753296d89984e0097159 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/benhoyt/inih/releases/tag/r56 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/inih/inih.hash | 2 +- package/inih/inih.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/inih/inih.hash b/package/inih/inih.hash index af921b294d..e2ed923c7a 100644 --- a/package/inih/inih.hash +++ b/package/inih/inih.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ba55f8ae2a8caf0653f30f48567241e14ea916acfc13481f502d8a9c8f507f68 inih-55.tar.gz +sha256 4f2ba6bd122d30281a8c7a4d5723b7af90b56aa828c0e88256d7fceda03a491a inih-56.tar.gz sha256 9ae3b39e83e9158e44b67733baa3bb2d84e80efdcfb14a5820210a42c7abdf7f LICENSE.txt diff --git a/package/inih/inih.mk b/package/inih/inih.mk index 7f36175576..c43412894a 100644 --- a/package/inih/inih.mk +++ b/package/inih/inih.mk @@ -4,7 +4,7 @@ # ################################################################################ -INIH_VERSION = 55 +INIH_VERSION = 56 INIH_SITE = $(call github,benhoyt,inih,r$(INIH_VERSION)) INIH_INSTALL_STAGING = YES INIH_LICENSE = BSD-3-Clause From peter at korsgaard.com Mon Feb 20 20:56:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:45 -0000 Subject: [Buildroot] [git commit branch/next] package/policycoreutils: drop bogus INSTALL_TARGET_LINUX_PAM_CONFS Message-ID: <20230220205225.9E47C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a4e154c9c583e74846f7ec80ad01d78811722b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "cb328f77f8 policycoreutils: new package" added a define that is never called: POLICYCOREUTILS_INSTALL_TARGET_LINUX_PAM_CONFS. The build system from the package already install these files to target. So just drop the bogus define. Cc: Clayton Shotwell Cc: Matt Weber Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/policycoreutils/policycoreutils.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 60575ac644..8505dbca3f 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -16,10 +16,6 @@ POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LINUX_PAM),y) POLICYCOREUTILS_DEPENDENCIES += linux-pam POLICYCOREUTILS_MAKE_OPTS += NAMESPACE_PRIV=y -define POLICYCOREUTILS_INSTALL_TARGET_LINUX_PAM_CONFS - $(INSTALL) -D -m 0644 $(@D)/newrole/newrole-lspp.pamd $(TARGET_DIR)/etc/pam.d/newrole - $(INSTALL) -D -m 0644 $(@D)/run_init/run_init.pamd $(TARGET_DIR)/etc/pam.d/run_init -endef endif ifeq ($(BR2_PACKAGE_AUDIT),y) From peter at korsgaard.com Mon Feb 20 20:56:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:45 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXft: bump version to 2.3.7 Message-ID: <20230220205211.D19C08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9c948df185f61131133d9d8a8cc39beae0ad299 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg/2022-November/061175.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXft/xlib_libXft.hash | 6 +++--- package/x11r7/xlib_libXft/xlib_libXft.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libXft/xlib_libXft.hash b/package/x11r7/xlib_libXft/xlib_libXft.hash index 484764be3d..5074365aed 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.hash +++ b/package/x11r7/xlib_libXft/xlib_libXft.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-September/003211.html -sha256 60a6e7319fc938bbb8d098c9bcc86031cc2327b5d086d3335fc5c76323c03022 libXft-2.3.6.tar.xz -sha512 732f8c635fcac6010012ba8c10c23d2dd6ec79b0f096d6bcc9b7e36d2ca0817387faa7ee5bb6f43cff02adc68e4234c1b8f95021ebc548f61c492e0b76836d90 libXft-2.3.6.tar.xz +# From https://lists.x.org/archives/xorg/2022-November/061175.html +sha256 79f0b37c45007381c371a790c2754644ad955166dbf2a48e3625032e9bdd4f71 libXft-2.3.7.tar.xz +sha512 9df29d3c7b88a21952df1015604511e5d79856d721b2a61eb2c5a062a9abccf16318132432a7c86c0ef816bf174ae86842fa67dabbaa0b163dfa56d99022de19 libXft-2.3.7.tar.xz # Locally computed sha256 7cda22286b1379b9b73df695f72cbad36595e65b039a5fbc5c89b69ecc44438c COPYING diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index a86501900c..845b612669 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXFT_VERSION = 2.3.6 +XLIB_LIBXFT_VERSION = 2.3.7 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.xz XLIB_LIBXFT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFT_LICENSE = MIT From peter at korsgaard.com Mon Feb 20 20:56:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:46 -0000 Subject: [Buildroot] [git commit branch/next] package/tvheadend: bump version Message-ID: <20230220205226.21D1B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1906e1fb7cb4104aa3e326f09926b2b3f5129991 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 98499eb955..45c8bd62b0 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed32401d1ed85f9e2d28d122a046c3f2c01b6ca5c0da1a7d78fa8f400e858107 tvheadend-fbc94aee8bfdd25baba87ab62a39234da20e8dd2.tar.gz +sha256 06c6d33a8e9d1d645cea9c63a06f6bddb309e5546177966d7b9285f68313bf5b tvheadend-c9a156a25a07f1f84c2f48a1b03b481430c8257d.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 8ceb7493c8..0ca8f46dc5 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = fbc94aee8bfdd25baba87ab62a39234da20e8dd2 +TVHEADEND_VERSION = c9a156a25a07f1f84c2f48a1b03b481430c8257d TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Mon Feb 20 20:56:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:46 -0000 Subject: [Buildroot] [git commit branch/next] package/git: bump to version 2.39.0 Message-ID: <20230220205211.664DC81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a6105112e82e3ca5162a56aa3a47bf6b49af2e0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The git package in Buildroot is quite lagging behind (v2.31.4, released on July 12, 2022 while the baseline v2.31.0 was released on March 15, 2021). Bump the package to v2.39.0 (released December 12, 2022). While at it, also replace patch fixing uclibc no threads build with two patches cherry-picked from upstream next branch, which fixes the same issue by fixing the handling of flockfile(), funlockfile(), and getc_unlocked() declarations. These patches missed the release but planned for next maintenance release (v2.39.1). The reason for replacing the patch is when original fix patch was upstreamed [1], Jeff King noted that the build failure root cause was flockfile() is defined regardless of whether uclibc is configured with threads support or not [2]. Release notes for v2.39.0 is available on release announcement on Git mailing list at [3]. [1]: https://lore.kernel.org/git/20221125092339.29433-1-bagasdotme at gmail.com/ [2]: https://lore.kernel.org/git/Y4RAr04vS%2FTOM5uh at coredump.intra.peff.net/ [3]: https://lore.kernel.org/git/xmqqlencspnl.fsf at gitster.g/ Signed-off-by: Bagas Sanjaya Signed-off-by: Peter Korsgaard --- package/git/0001-Fix-build-without-threads.patch | 100 ------------------- ...util-avoid-redefining-system-function-nam.patch | 107 +++++++++++++++++++++ ...util-undefine-system-names-before-redecla.patch | 55 +++++++++++ package/git/git.hash | 2 +- package/git/git.mk | 4 +- 5 files changed, 164 insertions(+), 104 deletions(-) diff --git a/package/git/0001-Fix-build-without-threads.patch b/package/git/0001-Fix-build-without-threads.patch deleted file mode 100644 index 7ce85ffaf8..0000000000 --- a/package/git/0001-Fix-build-without-threads.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 07d66af3b0800764087c4151d4f6562d4f8cce05 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Dec 2020 23:00:33 +0100 -Subject: [PATCH] Fix build without threads - -Build without threads is broken since version 2.29.0 and -https://github.com/git/git/commit/15b52a44e0c92a0658e891194a5b0610d1f53afc: - -In file included from cache.h:4, - from blame.c:1: -git-compat-util.h:1238:20: error: static declaration of 'flockfile' follows non-static declaration - static inline void flockfile(FILE *fh) - ^~~~~~~~~ -In file included from git-compat-util.h:168, - from cache.h:4, - from blame.c:1: -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/stdio.h:806:13: note: previous declaration of 'flockfile' was here - extern void flockfile (FILE *__stream) __THROW; - ^~~~~~~~~ -In file included from cache.h:4, - from blame.c:1: -git-compat-util.h:1242:20: error: static declaration of 'funlockfile' follows non-static declaration - static inline void funlockfile(FILE *fh) - ^~~~~~~~~~~ -In file included from git-compat-util.h:168, - from cache.h:4, - from blame.c:1: -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/stdio.h:813:13: note: previous declaration of 'funlockfile' was here - extern void funlockfile (FILE *__stream) __THROW; - ^~~~~~~~~~~ - -To avoid this build failure, check if flockfile is available before -defining flockfile, funlockfile and getc_unlocked - -Fixes: - - http://autobuild.buildroot.org/results/d41638d1ad8e78dd6f654367c905996b838ee649 - -Signed-off-by: Fabrice Fontaine ---- - Makefile | 5 +++++ - configure.ac | 6 ++++++ - git-compat-util.h | 2 +- - 3 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 6fb86c5862..58d0893a12 100644 ---- a/Makefile -+++ b/Makefile -@@ -232,6 +232,8 @@ all:: - # Define NO_STRUCT_ITIMERVAL if you don't have struct itimerval - # This also implies NO_SETITIMER - # -+# Define NO_FLOCKFILE if you don't have flockfile() -+# - # Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is - # generally faster on your platform than accessing the working directory. - # -@@ -1638,6 +1640,9 @@ endif - ifdef NO_SETITIMER - COMPAT_CFLAGS += -DNO_SETITIMER - endif -+ifdef NO_FLOCKFILE -+ COMPAT_CFLAGS += -DNO_FLOCKFILE -+endif - ifdef NO_PREAD - COMPAT_CFLAGS += -DNO_PREAD - COMPAT_OBJS += compat/pread.o -diff --git a/configure.ac b/configure.ac -index 66aedb9288..d4295b5c69 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1132,6 +1132,12 @@ GIT_CHECK_FUNC(setitimer, - [NO_SETITIMER=YesPlease]) - GIT_CONF_SUBST([NO_SETITIMER]) - # -+# Define NO_FLOCKFILE if you don't have flockfile. -+GIT_CHECK_FUNC(flockfile, -+[NO_FLOCKFILE=], -+[NO_FLOCKFILE=YesPlease]) -+GIT_CONF_SUBST([NO_FLOCKFILE]) -+# - # Define NO_STRCASESTR if you don't have strcasestr. - GIT_CHECK_FUNC(strcasestr, - [NO_STRCASESTR=], -diff --git a/git-compat-util.h b/git-compat-util.h -index 7d509c5022..279cdd941e 100644 ---- a/git-compat-util.h -+++ b/git-compat-util.h -@@ -1236,7 +1236,7 @@ int warn_on_fopen_errors(const char *path); - # define SHELL_PATH "/bin/sh" - #endif - --#ifndef _POSIX_THREAD_SAFE_FUNCTIONS -+#if !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(NO_FLOCKFILE) - static inline void flockfile(FILE *fh) - { - ; /* nothing */ --- -2.29.2 - diff --git a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch new file mode 100644 index 0000000000..dbde87940a --- /dev/null +++ b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch @@ -0,0 +1,107 @@ +From 385f67eb2254edb1fb4cf523e5e3d5a8f123d72c Mon Sep 17 00:00:00 2001 +From: Jeff King +Date: Wed, 30 Nov 2022 16:15:14 -0500 +Subject: [PATCH] git-compat-util: avoid redefining system function names +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Our git-compat-util header defines a few noop wrappers for system +functions if they are not available. This was originally done with a +macro, but in 15b52a44e0 (compat-util: type-check parameters of no-op +replacement functions, 2020-08-06) we switched to inline functions, +because it gives us basic type-checking. + +This can cause compilation failures when the system _does_ declare those +functions but we choose not to use them, since the compiler will +complain about the redeclaration. This was seen in the real world when +compiling against certain builds of uclibc, which may leave +_POSIX_THREAD_SAFE_FUNCTIONS unset, but still declare flockfile() and +funlockfile(). + +It can also be seen on any platform that has setitimer() if you choose +to compile without it (which plausibly could happen if the system +implementation is buggy). E.g., on Linux: + + $ make NO_SETITIMER=IWouldPreferNotTo git.o + CC git.o + In file included from builtin.h:4, + from git.c:1: + git-compat-util.h:344:19: error: conflicting types for ???setitimer???; have ???int(int, const struct itimerval *, struct itimerval *)??? + 344 | static inline int setitimer(int which UNUSED, + | ^~~~~~~~~ + In file included from git-compat-util.h:234: + /usr/include/x86_64-linux-gnu/sys/time.h:155:12: note: previous declaration of ???setitimer??? with type ???int(__itimer_which_t, const struct itimerval * restrict, struct itimerval * restrict)??? + 155 | extern int setitimer (__itimer_which_t __which, + | ^~~~~~~~~ + make: *** [Makefile:2714: git.o] Error 1 + +Here I think the compiler is complaining about the lack of "restrict" +annotations in our version, but even if we matched it completely (and +there is no way to match all platforms anyway), it would still complain +about a static declaration following a non-static one. Using macros +doesn't have this problem, because the C preprocessor rewrites the name +in our code before we hit this level of compilation. + +One way to fix this would just be to revert most of 15b52a44e0. What we +really cared about there was catching build problems with +precompose_argv(), which most platforms _don't_ build, and which is our +custom function. So we could just switch the system wrappers back to +macros; most people build the real versions anyway, and they don't +change. So the extra type-checking isn't likely to catch bugs. + +But with a little work, we can have our cake and eat it, too. If we +define the type-checking wrappers with a unique name, and then redirect +the system names to them with macros, we still get our type checking, +but without redeclaring the system function names. + +Signed-off-by: Jeff King +Signed-off-by: Junio C Hamano +[Bagas: cherry-picked from e0c08a4f738b3dea7a4e8fe3511c323cf1f41942 on next branch] +Signed-off-by: Bagas Sanjaya +--- + git-compat-util.h | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/git-compat-util.h b/git-compat-util.h +index a76d0526f7..e3456bdd0d 100644 +--- a/git-compat-util.h ++++ b/git-compat-util.h +@@ -341,11 +341,12 @@ struct itimerval { + #endif + + #ifdef NO_SETITIMER +-static inline int setitimer(int which UNUSED, +- const struct itimerval *value UNUSED, +- struct itimerval *newvalue UNUSED) { ++static inline int git_setitimer(int which, ++ const struct itimerval *value, ++ struct itimerval *newvalue) { + return 0; /* pretend success */ + } ++#define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) + #endif + + #ifndef NO_LIBGEN_H +@@ -1471,14 +1472,16 @@ int open_nofollow(const char *path, int flags); + #endif + + #ifndef _POSIX_THREAD_SAFE_FUNCTIONS +-static inline void flockfile(FILE *fh UNUSED) ++static inline void git_flockfile(FILE *fh) + { + ; /* nothing */ + } +-static inline void funlockfile(FILE *fh UNUSED) ++static inline void git_funlockfile(FILE *fh) + { + ; /* nothing */ + } ++#define flockfile(fh) git_flockfile(fh) ++#define funlockfile(fh) git_funlockfile(fh) + #define getc_unlocked(fh) getc(fh) + #endif + +-- +An old man doll... just what I always wanted! - Clara + diff --git a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch new file mode 100644 index 0000000000..9e3c9b662c --- /dev/null +++ b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch @@ -0,0 +1,55 @@ +From 6d406390b870fdb2cd9d18b12ebfabc12f5096df Mon Sep 17 00:00:00 2001 +From: Jeff King +Date: Fri, 2 Dec 2022 06:05:38 -0500 +Subject: [PATCH] git-compat-util: undefine system names before redeclaring + them + +When we define a macro to point a system function (e.g., flockfile) to +our custom wrapper, we should make sure that the system did not already +define it as a macro. This is rarely a problem, but can cause +compilation failures if both of these are true: + + - we decide to define our own wrapper even though the system provides + the function; we know this happens at least with uclibc, which may + declare flockfile, etc, without _POSIX_THREAD_SAFE_FUNCTIONS + + - the system version is declared as a macro; we know this happens at + least with uclibc's version of getc_unlocked() + +So just handling getc_unlocked() would be sufficient to deal with the +real-world case we've seen. But since it's easy to do, we may as well be +defensive about the other macro wrappers added in the previous patch. + +Signed-off-by: Jeff King +Signed-off-by: Junio C Hamano +[Bagas: cherry-picked from e1a95b78d8a26762ea04332de8b7c3878da51522 on next branch] +Signed-off-by: Bagas Sanjaya +--- + git-compat-util.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/git-compat-util.h b/git-compat-util.h +index e3456bdd0d..211861da0f 100644 +--- a/git-compat-util.h ++++ b/git-compat-util.h +@@ -346,6 +346,7 @@ static inline int git_setitimer(int which, + struct itimerval *newvalue) { + return 0; /* pretend success */ + } ++#undef setitimer + #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) + #endif + +@@ -1480,6 +1481,9 @@ static inline void git_funlockfile(FILE *fh) + { + ; /* nothing */ + } ++#undef flockfile ++#undef funlockfile ++#undef getc_unlocked + #define flockfile(fh) git_flockfile(fh) + #define funlockfile(fh) git_funlockfile(fh) + #define getc_unlocked(fh) getc(fh) +-- +An old man doll... just what I always wanted! - Clara + diff --git a/package/git/git.hash b/package/git/git.hash index af09ea817b..57a77b2810 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 dbc80f88d36fcde2c7acaaa9343cfab0f56effe9aee60e5eb00f3f36b8a619b4 git-2.31.5.tar.xz +sha256 ba199b13fb5a99ca3dec917b0bd736bc0eb5a9df87737d435eddfdf10d69265b git-2.39.0.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 653b4f46ad..9918d4c1ef 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.31.5 +GIT_VERSION = 2.39.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ @@ -12,8 +12,6 @@ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_CPE_ID_VENDOR = git-scm GIT_SELINUX_MODULES = apache git xdg GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) -# We're patching configure.ac -GIT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) GIT_DEPENDENCIES += host-pkgconf openssl From peter at korsgaard.com Mon Feb 20 20:56:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:47 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xserver_xorg-server: bump version to 21.1.6 Message-ID: <20230220205226.64B0D86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60b4b04dc23d32641981df984f383c1bb3078f8c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes a regression in XTestSwapFakeInput() introduced in the fix for CVE-2022-46340 in 21.1.5. Removed patches included in upstream release. Signed-off-by: Bernd Kuhls [Peter: mention regression fix] Signed-off-by: Peter Korsgaard --- ...etCountedString-against-request-length-at.patch | 35 ------------- ...some-possible-memleaks-in-XkbGetKbdByName.patch | 60 ---------------------- .../xserver_xorg-server/xserver_xorg-server.hash | 6 +-- .../xserver_xorg-server/xserver_xorg-server.mk | 8 +-- 4 files changed, 4 insertions(+), 105 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch b/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch deleted file mode 100644 index 8c1869504c..0000000000 --- a/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 11beef0b7f1ed290348e45618e5fa0d2bffcb72e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 5 Jul 2022 12:06:20 +1000 -Subject: [PATCH] xkb: proof GetCountedString against request length attacks - -GetCountedString did a check for the whole string to be within the -request buffer but not for the initial 2 bytes that contain the length -field. A swapped client could send a malformed request to trigger a -swaps() on those bytes, writing into random memory. - -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - xkb/xkb.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index f42f59ef3..1841cff26 100644 ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -5137,6 +5137,11 @@ _GetCountedString(char **wire_inout, ClientPtr client, char **str) - CARD16 len; - - wire = *wire_inout; -+ -+ if (client->req_len < -+ bytes_to_int32(wire + 2 - (char *) client->requestBuffer)) -+ return BadValue; -+ - len = *(CARD16 *) wire; - if (client->swapped) { - swaps(&len); --- -2.30.2 - diff --git a/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch b/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch deleted file mode 100644 index 39afec0988..0000000000 --- a/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 18f91b950e22c2a342a4fbc55e9ddf7534a707d2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 13 Jul 2022 11:23:09 +1000 -Subject: [PATCH] xkb: fix some possible memleaks in XkbGetKbdByName - -GetComponentByName returns an allocated string, so let's free that if we -fail somewhere. - -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - xkb/xkb.c | 26 ++++++++++++++++++++------ - 1 file changed, 20 insertions(+), 6 deletions(-) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index 4692895db..b79a269e3 100644 ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -5935,18 +5935,32 @@ ProcXkbGetKbdByName(ClientPtr client) - xkb = dev->key->xkbInfo->desc; - status = Success; - str = (unsigned char *) &stuff[1]; -- if (GetComponentSpec(&str, TRUE, &status)) /* keymap, unsupported */ -- return BadMatch; -+ { -+ char *keymap = GetComponentSpec(&str, TRUE, &status); /* keymap, unsupported */ -+ if (keymap) { -+ free(keymap); -+ return BadMatch; -+ } -+ } - names.keycodes = GetComponentSpec(&str, TRUE, &status); - names.types = GetComponentSpec(&str, TRUE, &status); - names.compat = GetComponentSpec(&str, TRUE, &status); - names.symbols = GetComponentSpec(&str, TRUE, &status); - names.geometry = GetComponentSpec(&str, TRUE, &status); -- if (status != Success) -+ if (status == Success) { -+ len = str - ((unsigned char *) stuff); -+ if ((XkbPaddedSize(len) / 4) != stuff->length) -+ status = BadLength; -+ } -+ -+ if (status != Success) { -+ free(names.keycodes); -+ free(names.types); -+ free(names.compat); -+ free(names.symbols); -+ free(names.geometry); - return status; -- len = str - ((unsigned char *) stuff); -- if ((XkbPaddedSize(len) / 4) != stuff->length) -- return BadLength; -+ } - - CHK_MASK_LEGAL(0x01, stuff->want, XkbGBN_AllComponentsMask); - CHK_MASK_LEGAL(0x02, stuff->need, XkbGBN_AllComponentsMask); --- -2.30.2 - diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 654552c8b6..0c3c807ff3 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003303.html -sha256 05b0c8301cee7c5a78083df421ba3a071891553541a417b3d85adf5cf20f8720 xorg-server-21.1.5.tar.xz -sha512 a39c6ba36f94241d330b679a9a6fe2c5fda73fc3f5a9308a7a9cfd0d58503e407291759c9e553455c07cf5a3862952ae3904334eeca29c97ff5af7cffd2e6953 xorg-server-21.1.5.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003310.html +sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz +sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 16b7438ee6..04eb5e90b7 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.5 +XSERVER_XORG_SERVER_VERSION = 21.1.6 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT @@ -12,12 +12,6 @@ XSERVER_XORG_SERVER_LICENSE_FILES = COPYING XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES -# 0002-xkb-proof-GetCountedString-against-request-length-at.patch -XSERVER_XORG_SERVER_IGNORE_CVES += CVE-2022-3550 - -# 0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch -XSERVER_XORG_SERVER_IGNORE_CVES += CVE-2022-3551 - XSERVER_XORG_SERVER_DEPENDENCIES = \ xutil_util-macros \ xlib_libX11 \ From peter at korsgaard.com Mon Feb 20 20:56:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:47 -0000 Subject: [Buildroot] [git commit branch/next] package/python-bleak: bump to version 0.19.5 Message-ID: <20230220205212.105A98648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8332d747df3dab5fbd038a3adf3726cc6a165c12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- package/python-bleak/python-bleak.hash | 4 ++-- package/python-bleak/python-bleak.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-bleak/python-bleak.hash b/package/python-bleak/python-bleak.hash index 9a8310b11c..001ef65b65 100644 --- a/package/python-bleak/python-bleak.hash +++ b/package/python-bleak/python-bleak.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bleak/json -md5 57564087d6e17ad1853109f530279b27 bleak-0.19.1.tar.gz -sha256 dff7c7f281dcb6629d0d722209c79ec3aa2a6c33867cb5c1ea3d44b72ca155c0 bleak-0.19.1.tar.gz +md5 d038483ec145c3d32c1ef03e04c42621 bleak-0.19.5.tar.gz +sha256 87845a96453c58c19031c735444a7b3156800534bcd3f23ba74e119e9ae3cd88 bleak-0.19.5.tar.gz # Locally computed sha256 checksums sha256 c4029a2b63b3824ab68be841f414addbdde20cb79cdbe272fa80c0b2abe65374 LICENSE diff --git a/package/python-bleak/python-bleak.mk b/package/python-bleak/python-bleak.mk index 00a4946ef6..95ac1d1766 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLEAK_VERSION = 0.19.1 +PYTHON_BLEAK_VERSION = 0.19.5 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz -PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/30/b9/60e1f455365e2340fe076cf7683f4e6d03db0b759d4f93fa45e68dc371e5 +PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/e6/b4/e63829826a157d180831a1c5d3720e75d613c1290cb239510d148b906836 PYTHON_BLEAK_SETUP_TYPE = setuptools PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:56:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:48 -0000 Subject: [Buildroot] [git commit branch/next] package/gobject-introspection: really use host python for host variant Message-ID: <20230220205226.A99D786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80c5be77ceb021e8319b9269b58d6373d378fac5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "abc110e362 package/gobject-introspection: bump to version 1.68.0" renamed the define that makes sure g-ir-tool-template uses the host python, but forgot to update its call on pre-configure hooks. Update it now. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/gobject-introspection/gobject-introspection.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 0d8c666ba1..12e5b81b1b 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -66,7 +66,7 @@ HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ define GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python3%' $(@D)/tools/g-ir-tool-template.in endef -HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH +HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH # Perform the following: # - Just as above, Ensure that g-ir-tool-template.in uses the host python. From peter at korsgaard.com Mon Feb 20 20:56:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:48 -0000 Subject: [Buildroot] [git commit branch/next] package/libnss: bump version to 3.86 Message-ID: <20230220205212.03F60828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08dc145a751aa2d5c13ace718438c8ef084fcc84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 e3c27170e5..50c5e583af 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_85_RTM/src/SHA256SUMS -sha256 afd9d64510b1154debbd6cab3571e9ff64a3373898e03483e4c85cdada13d297 nss-3.85.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_86_RTM/src/SHA256SUMS +sha256 3f385fc686476bbba811035fa6821b542475d55747b18c20c221d4d66573b975 nss-3.86.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 627bea7de8..cee0e596a1 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.85 +LIBNSS_VERSION = 3.86 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 peter at korsgaard.com Mon Feb 20 20:56:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:49 -0000 Subject: [Buildroot] [git commit branch/next] package/motion: bump to version 4.5.1 Message-ID: <20230220205212.51D9C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6081a48f0f6a238236091fb1b302848997e96f72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/Motion-Project/motion/releases/tag/release-4.5.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/motion/motion.hash | 2 +- package/motion/motion.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/motion/motion.hash b/package/motion/motion.hash index 9b99256864..21f74b481f 100644 --- a/package/motion/motion.hash +++ b/package/motion/motion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 42320a1c7b54a3f0b5a49cecf34a5d752760b28383bc573b3ca1240581786fe5 motion-4.5.0.tar.gz +sha256 0c824276bb23565b7cf10409ebdcb46b85fb1f6abca957252e52290bb1fe473e motion-4.5.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 18fe0eb630..4e9ccdc3f7 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOTION_VERSION = 4.5.0 +MOTION_VERSION = 4.5.1 MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 MOTION_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:56:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:50 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: fix host package Message-ID: <20230220205226.D7E7686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84e52a60b4044d3c54d6d4be5729a6d30aaf5aee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable webp and zstd on host package to avoid the following build failure with host-gdk-pixbuf raised since bump to version 4.5.0 in commit 5b62ea01369b11f5a4320bb2c909168b21c2642c: Run-time dependency libtiff-4 found: NO (tried cmake) ../output-1/build/host-gdk-pixbuf-2.42.10/meson.build:330:2: ERROR: Dependency lookup for libtiff-4 with method 'pkgconfig' failed: Could not generate cargs for libtiff-4: Package libwebp was not found in the pkg-config search path. Perhaps you should add the directory containing `libwebp.pc' to the PKG_CONFIG_PATH environment variable Package 'libwebp', required by 'libtiff-4', not found [...] Run-time dependency libtiff-4 found: NO (tried cmake) ../output-1/build/host-gdk-pixbuf-2.42.10/meson.build:330:2: ERROR: Dependency lookup for libtiff-4 with method 'pkgconfig' failed: Could not generate cargs for libtiff-4: Package libzstd was not found in the pkg-config search path. Perhaps you should add the directory containing `libzstd.pc' to the PKG_CONFIG_PATH environment variable Package 'libzstd', required by 'libtiff-4', not found While at it, also disable libdeflate even if no build failures are raised by autobuilders Fixes: - http://autobuild.buildroot.org/results/320083dfec4d126043b036cbaec7c7b85069a50a - http://autobuild.buildroot.org/results/8ff1cfa254920749a43e235c4084b8524d0edf6f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tiff/tiff.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index d3ab50b79e..e7de51ea1e 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -26,9 +26,12 @@ HOST_TIFF_CONF_OPTS = \ --disable-cxx \ --without-x \ --disable-zlib \ + --disable-libdeflate \ --disable-lzma \ --disable-jpeg \ - --disable-tests + --disable-tests \ + --disable-webp \ + --disable-zstd HOST_TIFF_DEPENDENCIES = host-pkgconf ifeq ($(BR2_INSTALL_LIBSTDCPP),y) From peter at korsgaard.com Mon Feb 20 20:56:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:50 -0000 Subject: [Buildroot] [git commit branch/next] package/atop: bump to version 2.8.0 Message-ID: <20230220205227.4053E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1e63188347b1e5bab9d524e2489d4f948ec719e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/atop/atop.hash | 2 +- package/atop/atop.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/atop/atop.hash b/package/atop/atop.hash index 18ba42340c..e42354739a 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 ca48d2f17e071deead5e6e9cc9e388bf6a3270d695e61976b3794d4d927b5c4e atop-2.7.1.tar.gz +sha256 3b002cb9774a7d6b3e820451773ae5e909b5e725738c6f375f14d1c1976d9fba atop-2.8.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index 8a0fcda33b..04a554b474 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATOP_VERSION = 2.7.1 +ATOP_VERSION = 2.8.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 20:56:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:50 -0000 Subject: [Buildroot] [git commit branch/next] package/davfs2: needs glibc Message-ID: <20230220205212.4533186494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af9454f8c1ca7f9dd02daaeb81a52690fac79a22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next davfs2 unconditionally uses fstab.h since https://git.savannah.nongnu.org/cgit/davfs2.git/commit/?id=6e2053cd7f44b0ca58af09905c044c178df34497 resulting in the following build failure since bump to version 1.7.0 in commit 76423bd3a657f0ca197e2301bbb21e4fc9eee992: mount_davfs.c:78:10: fatal error: fstab.h: No such file or directory 78 | #include | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/793c71e4f731a18e203d6eaa3ac8b6e2a9620c27 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/davfs2/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/davfs2/Config.in b/package/davfs2/Config.in index 162753be3e..31a680563c 100644 --- a/package/davfs2/Config.in +++ b/package/davfs2/Config.in @@ -1,10 +1,10 @@ -comment "davfs2 needs a glibc or uClibc toolchain" +comment "davfs2 needs a glibc toolchain" depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_DAVFS2 bool "davfs2" - depends on !BR2_TOOLCHAIN_USES_MUSL # error.h + depends on BR2_TOOLCHAIN_USES_GLIBC # fstab.h depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NEON select BR2_PACKAGE_NEON_XML From peter at korsgaard.com Mon Feb 20 20:56:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:51 -0000 Subject: [Buildroot] [git commit branch/next] configs/nezha_defconfig: use OpenSBI 1.2 Message-ID: <20230220205227.9C63C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b39bd50e0a4cfb9cd5bba02c6ae913be72f3771a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- configs/nezha_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 854392f929..dd94707905 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y From peter at korsgaard.com Mon Feb 20 20:56:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:51 -0000 Subject: [Buildroot] [git commit branch/next] package/hddtemp: link to libintl when needed Message-ID: <20230220205212.91E058648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7c99eaa307d1417c8c8e222290df6512ee872ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/e84/e84b7131f996302301dd0a8fd47362c9f2eab0bf/ http://autobuild.buildroot.net/results/524/52428940034d59887e0172fbd8481943d86db13b/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/hddtemp/hddtemp.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/hddtemp/hddtemp.mk b/package/hddtemp/hddtemp.mk index 7023e11e59..4f45647dff 100644 --- a/package/hddtemp/hddtemp.mk +++ b/package/hddtemp/hddtemp.mk @@ -15,7 +15,8 @@ HDDTEMP_GETTEXTIZE = YES HDDTEMP_DB_PATH = /usr/share/misc/hddtemp.db HDDTEMP_CONF_OPTS = --with-db-path=$(HDDTEMP_DB_PATH) -HDDTEMP_CONF_ENV = LIBS="$(HDDTEMP_LIBS)" +HDDTEMP_CONF_ENV = LIBS="$(HDDTEMP_LIBS) $(TARGET_NLS_LIBS)" +HDDTEMP_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) HDDTEMP_DEPENDENCIES += libexecinfo From peter at korsgaard.com Mon Feb 20 20:56:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:52 -0000 Subject: [Buildroot] [git commit branch/next] configs/qemu_riscv32_virt_defconfig: use OpenSBI 1.2 Message-ID: <20230220205227.C3A2B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a564f4da0ffbfd180186a34bdbdccf1cb5f9272f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Rather than the default (currently 0.9). Signed-off-by: Peter Korsgaard --- configs/qemu_riscv32_virt_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index faf4e1e312..f354e303e5 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -25,6 +25,8 @@ BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing From peter at korsgaard.com Mon Feb 20 20:56:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:52 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15}.x / 6.0.x series Message-ID: <20230220205212.5EDF98648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=298bcb0455d0cbf4231f4b87a8e132202120ac79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls 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 c1c690f4cc..fba3d90e6b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.0.12" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.0.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 9976a44489..9684dc5697 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 89b730edf8942b49e02f9894244205886c9a214d629b35b88c4ff06ee9304f01 linux-6.0.12.tar.xz +sha256 08d3118d6b755769f166de6babed54964393a7c0928029bef11bf55559a72da4 linux-6.0.13.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65 linux-5.15.82.tar.xz -sha256 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7 linux-5.10.158.tar.xz -sha256 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44 linux-5.4.226.tar.xz +sha256 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3 linux-5.15.83.tar.xz +sha256 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7 linux-5.10.159.tar.xz +sha256 5eefc5037415f31c942d3cfa430b96c2a273246cf7e51db1e51b1d89887f0593 linux-5.4.227.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 ed4fd861fe9f6cd09f409f00dcccfa691e6d1a61c585723e587575dcb60aeb29 linux-4.9.335.tar.xz -sha256 acd2ee8e03da098fe9f7e52871dd0790850fc32b78657606bdf65bdd94bbf99b linux-4.14.301.tar.xz -sha256 219bce1ac3f542d06fc606ae6bcb10f8ab1940a46c7903113be59afc486c204f linux-4.19.268.tar.xz +sha256 1f6de11306cc9f82fe1d4dd03565cdf43906fa6f77302913d942fd63b77b500c linux-4.9.336.tar.xz +sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz +sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 4c8b1fca27..93f443b78f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -388,13 +388,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.335" if BR2_KERNEL_HEADERS_4_9 - default "4.14.301" if BR2_KERNEL_HEADERS_4_14 - default "4.19.268" if BR2_KERNEL_HEADERS_4_19 - default "5.4.226" if BR2_KERNEL_HEADERS_5_4 - default "5.10.158" if BR2_KERNEL_HEADERS_5_10 - default "5.15.82" if BR2_KERNEL_HEADERS_5_15 - default "6.0.12" if BR2_KERNEL_HEADERS_6_0 + default "4.9.336" if BR2_KERNEL_HEADERS_4_9 + default "4.14.302" if BR2_KERNEL_HEADERS_4_14 + default "4.19.269" if BR2_KERNEL_HEADERS_4_19 + default "5.4.227" if BR2_KERNEL_HEADERS_5_4 + default "5.10.159" if BR2_KERNEL_HEADERS_5_10 + default "5.15.83" if BR2_KERNEL_HEADERS_5_15 + default "6.0.13" if BR2_KERNEL_HEADERS_6_0 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 Mon Feb 20 20:56:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:53 -0000 Subject: [Buildroot] [git commit branch/next] configs/hifive_unleashed_defconfig: explicitly use OpenSBI 0.9 Message-ID: <20230220205227.E84A28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fad36fa91d9a85ce548ea7f3fd42c1c4b31564ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Rather than relying on what is currently the default. Signed-off-by: Peter Korsgaard --- configs/hifive_unleashed_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index 0b87f2588f..2b6ee6c08e 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -37,6 +37,8 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # Bootloader BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="0.9" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y From peter at korsgaard.com Mon Feb 20 20:56:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:53 -0000 Subject: [Buildroot] [git commit branch/next] package/supertuxkart: bump version to 1.4 Message-ID: <20230220205212.C6C97828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f51e1f9522393864ea1543e581e485f2e7c1e683 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://github.com/supertuxkart/stk-code/blob/1.4/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/supertuxkart/supertuxkart.hash | 2 +- package/supertuxkart/supertuxkart.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/supertuxkart/supertuxkart.hash b/package/supertuxkart/supertuxkart.hash index 6ae3fae82b..446a9de8ec 100644 --- a/package/supertuxkart/supertuxkart.hash +++ b/package/supertuxkart/supertuxkart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd SuperTuxKart-1.3-src.tar.xz +sha256 9890392419baf4715313f14d5ad60746f276eed36eb580636caf44e2532c0f03 SuperTuxKart-1.4-src.tar.xz sha256 d27207a5213f746aac53893e9ecc18456e9595d3ffa662bd1ec9eb10787c214a COPYING diff --git a/package/supertuxkart/supertuxkart.mk b/package/supertuxkart/supertuxkart.mk index 8ec366f792..1f9ad4102b 100644 --- a/package/supertuxkart/supertuxkart.mk +++ b/package/supertuxkart/supertuxkart.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUPERTUXKART_VERSION = 1.3 +SUPERTUXKART_VERSION = 1.4 SUPERTUXKART_SOURCE = SuperTuxKart-$(SUPERTUXKART_VERSION)-src.tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. From yann.morin.1998 at free.fr Mon Feb 20 20:56:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:54 -0000 Subject: [Buildroot] [git commit branch/next] package/bustle: fix pcap-config call Message-ID: <20230220205228.379B4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a92e9e5fb87caff46fbbe8f368564eddf4ff389d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since bump of libpcap to version 1.10.2 in commit 6bee8635d90f3f9e3d04e03a9db2f37a387e077 and https://github.com/the-tcpdump-group/libpcap/commit/d0cba780dc2b2bb4f3ca9427d1a0f03479f45707: pcap-config: Invalid command-line option pcap-config specified Usage: pcap-config [ --help ] [ --static | --static-pcap-only ] [ --libs | --additional-libs ] perl -nle 'm/^Version:\s+(.*)$/ and print $1' \ bustle.cabal > dist/build/autogen/version.txt echo '#define BUSTLE_VERSION "'`cat dist/build/autogen/version.txt`'"' > dist/build/autogen/version.h /home/buildroot/autobuild/run/instance-2/output-1/host/bin/arm-linux-gcc -Idist/build/autogen -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ -o dist/build/bustle-pcap c-sources/pcap-reader.c c-sources/pcap-monitor.c c-sources/bustle-pcap.c \ -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0 -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/glib-2.0/include -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libmount -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/blkid -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/gio-unix-2.0 -pthread -L/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 /home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /tmp/cc5SQkTV.o: in function `bustle_pcap_reader_finalize': pcap-reader.c:(.text+0x254): undefined reference to `pcap_close' Fixes: - http://autobuild.buildroot.org/results/f3dcb617488e4172e639e3bd51a93bc9822ea186 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-Makefile-fix-pcap-config-call.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/package/bustle/0001-Makefile-fix-pcap-config-call.patch b/package/bustle/0001-Makefile-fix-pcap-config-call.patch new file mode 100644 index 0000000000..b02bea641b --- /dev/null +++ b/package/bustle/0001-Makefile-fix-pcap-config-call.patch @@ -0,0 +1,45 @@ +From 77e2de892cd359f779c84739682431a66eb8cf31 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 Jan 2023 11:03:52 +0100 +Subject: [PATCH] Makefile: fix pcap-config call + +Fix the following build failure raised since libpcap version 1.10.2 and +https://github.com/the-tcpdump-group/libpcap/commit/d0cba780dc2b2bb4f3ca9427d1a0f03479f45707: + +pcap-config: Invalid command-line option pcap-config specified +Usage: pcap-config [ --help ] [ --static | --static-pcap-only ] [ --libs | --additional-libs ] +perl -nle 'm/^Version:\s+(.*)$/ and print $1' \ + bustle.cabal > dist/build/autogen/version.txt +echo '#define BUSTLE_VERSION "'`cat dist/build/autogen/version.txt`'"' > dist/build/autogen/version.h +/home/buildroot/autobuild/run/instance-2/output-1/host/bin/arm-linux-gcc -Idist/build/autogen -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ + -o dist/build/bustle-pcap c-sources/pcap-reader.c c-sources/pcap-monitor.c c-sources/bustle-pcap.c \ + -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0 -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/glib-2.0/include -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libmount -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/blkid -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/gio-unix-2.0 -pthread -L/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 +/home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /tmp/cc5SQkTV.o: in function `bustle_pcap_reader_finalize': +pcap-reader.c:(.text+0x254): undefined reference to `pcap_close' + +Fixes: + - http://autobuild.buildroot.org/results/f3dcb617488e4172e639e3bd51a93bc9822ea186 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/bustle/bustle/-/merge_requests/21] +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8865819..721e714 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ CFLAGS = -g -O2 -Wall -Wunused -Waddress + DBUS_FLAGS = $(shell pkg-config --cflags --libs dbus-1) + GIO_FLAGS := $(shell pkg-config --cflags --libs 'glib-2.0 >= 2.26' gio-2.0 gio-unix-2.0) + PCAP_CONFIG ?= pcap-config +-PCAP_FLAGS := $(shell $(PCAP_CONFIG) --cflags pcap-config --libs) ++PCAP_FLAGS := $(shell $(PCAP_CONFIG) --cflags --libs) + DESTDIR = + PREFIX = /usr/local + BINDIR = $(DESTDIR)$(PREFIX)/bin +-- +2.39.0 + From peter at korsgaard.com Mon Feb 20 20:56:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:54 -0000 Subject: [Buildroot] [git commit branch/next] {toolchain, linux-headers}: add support for 6.1 headers Message-ID: <20230220205212.6C33A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79bb1ab519448993dbd88e21ddf55b5cfc283115 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 9684dc5697..c7bbb6be99 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb linux-6.1.tar.xz sha256 08d3118d6b755769f166de6babed54964393a7c0928029bef11bf55559a72da4 linux-6.0.13.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3 linux-5.15.83.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 93f443b78f..cd36c7c763 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_0 + default BR2_KERNEL_HEADERS_6_1 help Select the kernel version to get headers from. @@ -56,6 +56,10 @@ config BR2_KERNEL_HEADERS_5_15 config BR2_KERNEL_HEADERS_6_0 bool "Linux 6.0.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + +config BR2_KERNEL_HEADERS_6_1 + bool "Linux 6.1.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -133,8 +137,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1 + bool "6.1.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0 - bool "6.0.x or later" + bool "6.0.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19 @@ -395,6 +403,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.159" if BR2_KERNEL_HEADERS_5_10 default "5.15.83" if BR2_KERNEL_HEADERS_5_15 default "6.0.13" if BR2_KERNEL_HEADERS_6_0 + default "6.1" if BR2_KERNEL_HEADERS_6_1 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 \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 4947ab3aae..544b423001 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -591,6 +591,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -604,6 +608,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 default "6.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 default "5.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 default "5.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index a9cb61365f..1c39334ddd 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -127,8 +127,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_1 + bool "6.1.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_0 - bool "6.0.x or later" + bool "6.0.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_19 From yann.morin.1998 at free.fr Mon Feb 20 20:56:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:55 -0000 Subject: [Buildroot] [git commit branch/next] package/containerd: support crun as runtime Message-ID: <20230220205228.89ED386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0ecb9b2803b5b0b293acd7a5a6bba1ed1e3feab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next crun is a drop-in replacement for runc. If crun is enabled, but runc is not, we already install an impersonation symlink, so we do not need to force runc if crun is enabled. Still, runc is the default if crun is not enabled. Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart [yann.morin.1998 at free.fr: split into its own patch] Signed-off-by: Yann E. MORIN --- package/containerd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/containerd/Config.in b/package/containerd/Config.in index 0e3a55ef39..e69dd6768a 100644 --- a/package/containerd/Config.in +++ b/package/containerd/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_CONTAINERD depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc depends on BR2_USE_MMU # util-linux - select BR2_PACKAGE_RUNC # runtime dependency + select BR2_PACKAGE_RUNC if !BR2_PACKAGE_CRUN # runtime dependency select BR2_PACKAGE_UTIL_LINUX # runtime dependency select BR2_PACKAGE_UTIL_LINUX_BINARIES select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT From peter at korsgaard.com Mon Feb 20 20:56:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:55 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: bump to version 2022.12 Message-ID: <20230220205212.AC911828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ef654997caba04dffecdc4105b214abf7d02ae5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch which is now upstream. Update service files based on latest versions in: https://github.com/sbabic/meta-swupdate/tree/master/recipes-support/swupdate/swupdate Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...otloader.c-fix-build-without-reallocarray.patch | 35 ---------------------- package/swupdate/swupdate-usb at .service | 1 + package/swupdate/swupdate.hash | 2 +- package/swupdate/swupdate.mk | 2 +- package/swupdate/swupdate.service | 1 + 5 files changed, 4 insertions(+), 37 deletions(-) diff --git a/package/swupdate/0001-swupdate-core-bootloader.c-fix-build-without-reallocarray.patch b/package/swupdate/0001-swupdate-core-bootloader.c-fix-build-without-reallocarray.patch deleted file mode 100644 index d90ae7906e..0000000000 --- a/package/swupdate/0001-swupdate-core-bootloader.c-fix-build-without-reallocarray.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f30c4771e93cad7e77d7f2add94327865d226553 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 15 May 2022 14:53:35 +0200 -Subject: [PATCH] core/bootloader.c: fix build without reallocarray - -Use realloc instead of reallocarray to avoid the following build failure -with uclibc raised since version 2022.05 and -https://github.com/sbabic/swupdate/commit/b8897ed695e1cd954859142b14ec8546d2e7994a: - -microblaze-buildroot-linux-uclibc/bin/ld: core/built-in.o: in function `register_bootloader': -(.text.register_bootloader+0x30): undefined reference to `reallocarray' - -Fixes: - - http://autobuild.buildroot.org/results/7208e8189b4a6f35aaa4ed7777ecdd37421a7c7f - -Signed-off-by: Fabrice Fontaine -Backported from: f30c4771e93cad7e77d7f2add94327865d226553 -Signed-off-by: Ben Hutchings ---- - core/bootloader.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/bootloader.c b/core/bootloader.c -index f34cb414..5694d43d 100644 ---- a/core/bootloader.c -+++ b/core/bootloader.c -@@ -25,7 +25,7 @@ static unsigned int num_available = 0; - - int register_bootloader(const char *name, bootloader *bl) - { -- entry *tmp = reallocarray(available, num_available + 1, sizeof(entry)); -+ entry *tmp = realloc(available, (num_available + 1) * sizeof(entry)); - if (!tmp) { - return -ENOMEM; - } diff --git a/package/swupdate/swupdate-usb at .service b/package/swupdate/swupdate-usb at .service index eda9d1539c..df1a408421 100644 --- a/package/swupdate/swupdate-usb at .service +++ b/package/swupdate/swupdate-usb at .service @@ -1,5 +1,6 @@ [Unit] Description=usb media swupdate service +Requires=swupdate.service Requires=swupdate-progress.service [Service] diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index 638b586e8a..1b26f9e5e2 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1e819f71b19626bde1a4906ced39d3406ca240b458d3c4a998bd9c7333eba260 swupdate-2022.05.tar.gz +sha256 e6335e87812a98a87f1c55df03c9f4e4ef042789570002c5db120b09f64b0d86 swupdate-2022.12.tar.gz sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 1cd60d1b8f..8f05b83922 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2022.05 +SWUPDATE_VERSION = 2022.12 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, OFL-1.1 SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ diff --git a/package/swupdate/swupdate.service b/package/swupdate/swupdate.service index a3d8d1939e..94d4526acf 100644 --- a/package/swupdate/swupdate.service +++ b/package/swupdate/swupdate.service @@ -4,6 +4,7 @@ Documentation=https://github.com/sbabic/swupdate Documentation=https://sbabic.github.io/swupdate [Service] +Type=notify ExecStart=/usr/lib/swupdate/swupdate.sh KillMode=mixed From yann.morin.1998 at free.fr Mon Feb 20 20:56:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:56 -0000 Subject: [Buildroot] [git commit branch/next] package/pkgconf: disable ccache for host package Message-ID: <20230220205228.BE2D886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=006ea057e98afddd7d2b92e118ebefa8bdeb9a6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We need to disable ccache when building host-pkgconf as the upcoming ccache update depends on host-pkgconf indirectly due to host-cmake depending on host-pkgconf which will be required due to host-ccache migrating from autotools to cmake package infrastructure. Note: host-pkgconf does not need _AUTORECONF = YES, so it doesnot depend on any of host-gettext, host-automake, host-autoconf, or host-libtool. If it ever nees to in the future, then those should also be made to build without ccache. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: add note] Signed-off-by: Yann E. MORIN --- package/pkgconf/pkgconf.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk index 5d65f69c10..e9587fae6b 100644 --- a/package/pkgconf/pkgconf.mk +++ b/package/pkgconf/pkgconf.mk @@ -11,6 +11,11 @@ PKGCONF_LICENSE = pkgconf license PKGCONF_LICENSE_FILES = COPYING PKGCONF_CPE_ID_VENDOR = pkgconf +# We are a ccache dependency, so we can't use ccache +HOST_PKGCONF_CONF_ENV = \ + CC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" + PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/bin/pkg-config define PKGCONF_LINK_PKGCONFIG From peter at korsgaard.com Mon Feb 20 20:56:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:56 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8189fs: bump to 2022-10-30 version to fix build failure with Linux up to 6.1 Message-ID: <20230220205212.BA2938648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5aceee9b1dc2c1c3e7f22ff2892aa580378d741b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop local patch that has been upstreamed[0] and drop the endianness handling too since from this commit[1] on it's handled by using Linux macro __LITTLE_ENDIAN. [0]: https://github.com/jwrdegoede/rtl8189ES_linux/commit/4a555ffb77a5947814b6c7f330968318e265c496 [1]: https://github.com/jwrdegoede/rtl8189ES_linux/commit/b3da33576da5359d85c7cfe82716c9a08a592aff Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...ve-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch | 40 ---------------------- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 10 ++---- 3 files changed, 3 insertions(+), 49 deletions(-) diff --git a/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch b/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch deleted file mode 100644 index dc4deff9f1..0000000000 --- a/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4a555ffb77a5947814b6c7f330968318e265c496 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 28 Sep 2022 21:17:17 +0200 -Subject: [PATCH] Makefile: move 'EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)' at the - end of EXTRA_FLAGS assignment - -At the moment USER_EXTRA_CFLAGS can't override local Makfile EXTRA_CFLAGS -since it's assigned at the beginning of the Makefile. For example it's not -possible to undefine the hardcoded CONFIG_LITTLE_ENDIAN and this doesn't -allow to build these modules for big endian architectures. So let's move -the assignment of USER_EXTRA_CFLAGS to EXTRA_CFLAGS after the last -EXTRA_CFLAGS assignment. - -Signed-off-by: Giulio Benetti -[Upstream status: https://github.com/jwrdegoede/rtl8189ES_linux/pull/83] ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 8fcb7bd..e4664e9 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,3 @@ --EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) - EXTRA_CFLAGS += -O1 - #EXTRA_CFLAGS += -O3 - #EXTRA_CFLAGS += -Wall -@@ -2239,6 +2238,8 @@ ifneq ($(USER_MODULE_NAME),) - MODULE_NAME := $(USER_MODULE_NAME) - endif - -+EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -+ - ifneq ($(KERNELRELEASE),) - - ########### this part for *.mk ############################ --- -2.34.1 - diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index 1ab41db553..4f117cfd14 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7cc80cb85ed6e7f7d5480e6094c377d3dbcd18a57b58cfba43a7e42ea59fc8d3 rtl8189fs-c93cfd712a3acd2ecdeda19a66d269c20f8803f1.tar.gz +sha256 96347dbfedd95a217fb89b7b295fe417b711dbad3db896ef0c2fa733c6d150fd rtl8189fs-e58bd86c9d9408c648b1246a0dd76b16856ec172.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 8b7618fcc8..15a5329a45 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,20 +4,14 @@ # ################################################################################ -RTL8189FS_VERSION = c93cfd712a3acd2ecdeda19a66d269c20f8803f1 +RTL8189FS_VERSION = e58bd86c9d9408c648b1246a0dd76b16856ec172 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 -# Undefine the hardcoded CONFIG_LITTLE_ENDIAN -RTL8189FS_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN -# Set endianness -RTL8189FS_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN - RTL8189FS_MODULE_MAKE_OPTS = \ CONFIG_RTL8189FS=m \ KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) \ - USER_EXTRA_CFLAGS="$(RTL8189FS_USER_EXTRA_CLAGS)" + KSRC=$(LINUX_DIR) define RTL8189FS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) From yann.morin.1998 at free.fr Mon Feb 20 20:56:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:56:57 -0000 Subject: [Buildroot] [git commit branch/next] support/download: fix cargo vendoring Message-ID: <20230220205228.DC01686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac2b26fba2ad06fadf14244505319dc5c272906c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit de4cf253752d (package/{rust, rust-bin}: bump to version 1.66.0) forgot, despite the big comment above the version strings, to confirm that the vendoring was still working. Previously, we were adding the vendoring equivalence manually, but in commit 04154a651729 (support/download/cargo-post-process: cargo output for vendor config), we switched to using the output of "cargo vendor" (on stdout) to support cases were the vendoring equivalence would be more complex (e.g. when using crates not hosted on crates.io). With rust until and including 1.65.0, "cargo vendor" would output (for crates.io crates) the same output as our manual fixups, except it was preceded by an empty line. So, to avoid recompting all our hashes, we added a tweak to strip away the leading empty line in 04154a651729. But rust 1.66.0 includes [0] which changes the output (on stdout) of "cargo vendor", where the first empty line is no longer emitted. This means that our tweak for rust 1.65.0 now strips out an important part of the cargo vendor output, which renders the archives invalid, and thus generates different archives, which fail to validate against our hashes. Fix this by doing what the comment in the post-process helper states, and just keep the whole output of "cargo vendor", by just removing the "tail --lines=+2". Since that comment is no longer meaningful, we drop it too. Now, all our 6 cargo-based packages, as well as our 5 python packages that have rust code, can be vendored again, without changing our hashes, but most importantly, with valid archives. Still, we keep the comment above the versions strings, in the hope that a future bumper will notice and be more careful at validating the vendoring. [0] https://github.com/rust-lang/cargo/pull/11273 Fixes: http://autobuild.buildroot.org/results/bea/beac7674bbc9fd2f8777b5861f65afee9c485753/ (bat) http://autobuild.buildroot.org/results/d1e/d1ec1ebbde115628a4b8b9099544347242a97c1c/ (dust) http://autobuild.buildroot.org/results/f96/f968be895be9ca98b314fdd688ef8d3bdf4e5dfb/ (hyerfine) http://autobuild.buildroot.org/results/a0c/a0cdb6cc9493f5248d98f98b13da854e12adc2be/ (ripgrep) ... and so many others... Reported-by: Romain Naour Signed-off-by: Yann E. MORIN Cc: James Hilliard Cc: Simon Richter Reviewed-by: James Hilliard Reviewed-by: Romain Naour Tested-by: Romain Naour Signed-off-by: Yann E. MORIN --- support/download/cargo-post-process | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 186e9eb69b..21a6be8dbe 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -25,25 +25,11 @@ post_process_unpack "${base_name}" "${output}" pushd "${base_name}" > /dev/null # Create the local .cargo/config with vendor info -# -# The first line of the output to stdout is empty. -# So skip it to have the file start with the vendoring -# configuration (`tail --lines=+2`). -# -# NOTE: -# There is a patch for cargo to remove the first empty line: -# See: https://github.com/rust-lang/cargo/pull/11273 -# -# The patch already landed in +nightly and will end up -# in +stable soon. -# -# -> When updating rust/cargo, the call to `tail` must be removed. -# mkdir -p .cargo/ cargo vendor \ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ --locked VENDOR \ - | tail --lines=+2 | tee .cargo/config + | tee .cargo/config popd > /dev/null From peter at korsgaard.com Mon Feb 20 20:56:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:57 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8723ds-bt: new package Message-ID: <20230220205212.D73578648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a2db09451371d317ee119d742a62817d5f41c5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This package install the required firmware for enabling the Bluetooth device embedded in the RTL8723DS chip. The driver is included in Linux main tree and can be enabled with the BT_HCIUART_RTL symbol. Signed-off-by: Angelo Compagnucci Tested-by: Indrek Kruusa [Peter: use install -D] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/rtl8723ds-bt/Config.in | 6 ++++++ package/rtl8723ds-bt/rtl8723ds-bt.hash | 2 ++ package/rtl8723ds-bt/rtl8723ds-bt.mk | 18 ++++++++++++++++++ 5 files changed, 28 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3a0e3c14ab..b52a065dbc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -185,6 +185,7 @@ F: package/qt5/qt5coap/ F: package/qt5/qt5knx/ F: package/qt5/qt5mqtt/ F: package/rtl8723ds/ +F: package/rtl8723ds-bt/ F: package/sam-ba/ F: package/sshguard/ F: package/sunwait/ diff --git a/package/Config.in b/package/Config.in index 914c3584e9..999feae08a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -585,6 +585,7 @@ endmenu source "package/rtl8192eu/Config.in" source "package/rtl8723bu/Config.in" source "package/rtl8723ds/Config.in" + source "package/rtl8723ds-bt/Config.in" source "package/rtl8812au-aircrack-ng/Config.in" source "package/rtl8821au/Config.in" source "package/sane-backends/Config.in" diff --git a/package/rtl8723ds-bt/Config.in b/package/rtl8723ds-bt/Config.in new file mode 100644 index 0000000000..0a604310c0 --- /dev/null +++ b/package/rtl8723ds-bt/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_RTL8723DS_BT + bool "rtl8723ds-bt" + help + rtl8723ds UART attached Bluetooth module firmware. + + https://github.com/wsyco/RTL8723DS_BT_Linux diff --git a/package/rtl8723ds-bt/rtl8723ds-bt.hash b/package/rtl8723ds-bt/rtl8723ds-bt.hash new file mode 100644 index 0000000000..1ec4e350f9 --- /dev/null +++ b/package/rtl8723ds-bt/rtl8723ds-bt.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 9e70a981946abeeb6437d9a27d8437cea15aa4df72f8d56ded0ae28af484d2f4 rtl8723ds-bt-14cedf3a9fec1aa8c500fa52f3e3acc433cbcf08.tar.gz diff --git a/package/rtl8723ds-bt/rtl8723ds-bt.mk b/package/rtl8723ds-bt/rtl8723ds-bt.mk new file mode 100644 index 0000000000..423ad74df5 --- /dev/null +++ b/package/rtl8723ds-bt/rtl8723ds-bt.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# rtl8723ds-bt +# +################################################################################ + +RTL8723DS_BT_VERSION = 14cedf3a9fec1aa8c500fa52f3e3acc433cbcf08 +RTL8723DS_BT_SITE = $(call github,wsyco,RTL8723DS_BT_Linux,$(RTL8723DS_BT_VERSION)) +RTL8723DS_BT_LICENSE = PROPRIETARY + +define RTL8723DS_BT_INSTALL_TARGET_CMDS + $(INSTALL) -m 644 -D $(@D)/8723D/rtl8723d_fw \ + $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723ds_fw.bin + $(INSTALL) -m 644 -D $(@D)/8723D/rtl8723d_config \ + $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723ds_config.bin +endef + +$(eval $(generic-package)) From peter at korsgaard.com Mon Feb 20 20:56:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:58 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-gmmlib: bump version to 22.3.3 Message-ID: <20230220205229.46BFF86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56561f22b5b9971de67118bdb8db7f6b4af1c149 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 d36bd8b9b6..693d9d0905 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f725fbb4291ab67bbc7b31e1a268f523df384667360c931b40144db861be53d7 intel-gmmlib-22.3.2.tar.gz +sha256 86651bd2803c9f0afd82471bec784e65d2b418dee315a053d22215eb2a679be7 intel-gmmlib-22.3.3.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index ffd101808b..3eb3458ee7 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.2 +INTEL_GMMLIB_VERSION = 22.3.3 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Mon Feb 20 20:56:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:58 -0000 Subject: [Buildroot] [git commit branch/next] package/ipcalc: bump to version 1.0.2 Message-ID: <20230220205213.15AF28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d923d5f7e61b36f7deee32e1e09b279efd5dcd3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://gitlab.com/ipcalc/ipcalc/-/blob/1.0.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ipcalc/ipcalc.hash | 2 +- package/ipcalc/ipcalc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ipcalc/ipcalc.hash b/package/ipcalc/ipcalc.hash index bf9b34a610..50d08239fa 100644 --- a/package/ipcalc/ipcalc.hash +++ b/package/ipcalc/ipcalc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dac080c0773cc14c1d6f818899351d2286cace85751dd9dc704944e54c2c3565 ipcalc-1.0.1.tar.bz2 +sha256 47c866941916800270fca23496acc9976ca9488ce9053aeaedc5f47c5929b772 ipcalc-1.0.2.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ipcalc/ipcalc.mk b/package/ipcalc/ipcalc.mk index dfe35e2cdc..e63e174ce2 100644 --- a/package/ipcalc/ipcalc.mk +++ b/package/ipcalc/ipcalc.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPCALC_VERSION = 1.0.1 +IPCALC_VERSION = 1.0.2 IPCALC_SITE = $(call gitlab,ipcalc,ipcalc,$(IPCALC_VERSION)) IPCALC_SOURCE = ipcalc-$(IPCALC_VERSION).tar.bz2 IPCALC_LICENSE = GPL-2.0+ From peter at korsgaard.com Mon Feb 20 20:56:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:59 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_kria_kv260_defconfig: use CONFIG_MULTI_DTB_FIT Message-ID: <20230220205229.7136986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=250d7df53acdccdb3c65c941ad426f6cc0502996 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When using the buildroot compiler, it builds the u-boot.itb immediately after building the fit-dtb.blob. This causes a build failure when using the CONFIG_MULTI_DTB_FIT build configuration. This patch adds the necessary dependency to guarantee that the fit-dtb.blob has finished building before trying to build the u-boot.itb. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3310463281 This patch has been submitted to u-boot mainline: https://lore.kernel.org/all/20221221075446.47141-1-neal.frager at amd.com/ Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- board/zynqmp/kria/kv260/kv260.sh | 2 +- .../v1-0001-makefile-add-multi_dtb_fit-dep.patch | 32 ++++++++++++++++++++++ board/zynqmp/kria/uboot.fragment | 1 + configs/zynqmp_kria_kv260_defconfig | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/board/zynqmp/kria/kv260/kv260.sh b/board/zynqmp/kria/kv260/kv260.sh index e891852009..e3467f3068 100755 --- a/board/zynqmp/kria/kv260/kv260.sh +++ b/board/zynqmp/kria/kv260/kv260.sh @@ -8,5 +8,5 @@ UBOOT_DIR=$4 -fdtoverlay -o ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb -i ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb ${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo +fdtoverlay -o ${UBOOT_DIR}/fit-dtb.blob -i ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb ${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo ${UBOOT_DIR}/tools/mkimage -E -f ${UBOOT_DIR}/u-boot.its -B 0x8 ${BINARIES_DIR}/u-boot.itb diff --git a/board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch b/board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch new file mode 100644 index 0000000000..ddc04cacac --- /dev/null +++ b/board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch @@ -0,0 +1,32 @@ +From 8b181bf582c17cf709a62cf499f9709c94f49d33 Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Wed, 21 Dec 2022 07:51:42 +0000 +Subject: [PATCH v1 1/1] makefile: add multi_dtb_fit dep + +With certain gcc compilers, the u-boot.itb is built immediately after dtb +generation. If CONFIG_MULTI_DTB_FIT is used, it is possible that the +fit-dtb.blob is not finished in time. + +This patch adds a necessary dependency to guarantee that the fit-dtb.blob +is built before attempting to build the u-boot.itb. + +Signed-off-by: Neal Frager +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index b96e2ffa15..682a5d94fd 100644 +--- a/Makefile ++++ b/Makefile +@@ -1425,6 +1425,7 @@ MKIMAGEFLAGS_u-boot.itb += -B 0x8 + ifdef U_BOOT_ITS + u-boot.itb: u-boot-nodtb.bin \ + $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SANDBOX),dts/dt.dtb) \ ++ $(if $(CONFIG_MULTI_DTB_FIT),$(FINAL_DTB_CONTAINER)) \ + $(U_BOOT_ITS) FORCE + $(call if_changed,mkfitimage) + $(BOARD_SIZE_CHECK) +-- +2.17.1 + diff --git a/board/zynqmp/kria/uboot.fragment b/board/zynqmp/kria/uboot.fragment index 9e32edfb36..40709549dc 100644 --- a/board/zynqmp/kria/uboot.fragment +++ b/board/zynqmp/kria/uboot.fragment @@ -1,4 +1,5 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0xF80000 +CONFIG_MULTI_DTB_FIT=y CONFIG_DTB_RESELECT=y CONFIG_DMA=y CONFIG_XILINX_DPDMA=y diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 5c53122b46..3214d45fa9 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -38,3 +38,4 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/patches" From peter at korsgaard.com Mon Feb 20 20:56:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:59 -0000 Subject: [Buildroot] [git commit branch/next] configs/lichee_rv_dock: new defconfig Message-ID: <20230220205212.EE7E2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9ad317507cf8564200b88dda2463406d0171122 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Lichee RV Dock is a RISC-V Linux development kits with high integration, small size and affordable price designed for opensource developer. https://wiki.sipeed.com/hardware/en/lichee/RV/Dock.html Signed-off-by: Angelo Compagnucci Tested-by: Indrek Kruusa Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + board/sipeed/lichee_rv_dock/genimage.cfg | 19 +++++++++ board/sipeed/lichee_rv_dock/linux.fragment | 7 ++++ .../lichee_rv_dock/overlay/etc/network/interfaces | 6 +++ .../lichee_rv_dock/overlay/etc/wpa_supplicant.conf | 8 ++++ board/sipeed/lichee_rv_dock/readme.txt | 45 ++++++++++++++++++++++ configs/sipeed_lichee_rv_dock_defconfig | 41 ++++++++++++++++++++ 7 files changed, 127 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2f27ddb110..b0f10148b5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -158,6 +158,7 @@ F: package/rauc/ N: Angelo Compagnucci F: board/sipeed/lichee_rv/ +F: board/sipeed/lichee_rv_dock/ F: configs/sipeed_lichee_rv* F: package/apparmor/ F: package/corkscrew/ diff --git a/board/sipeed/lichee_rv_dock/genimage.cfg b/board/sipeed/lichee_rv_dock/genimage.cfg new file mode 100644 index 0000000000..38078f0ae3 --- /dev/null +++ b/board/sipeed/lichee_rv_dock/genimage.cfg @@ -0,0 +1,19 @@ +# Minimal SD card image for the sipeed Lichee RV dock + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + offset = 1M + } +} diff --git a/board/sipeed/lichee_rv_dock/linux.fragment b/board/sipeed/lichee_rv_dock/linux.fragment new file mode 100644 index 0000000000..10016889ab --- /dev/null +++ b/board/sipeed/lichee_rv_dock/linux.fragment @@ -0,0 +1,7 @@ +CONFIG_BT=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_SERDEV=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_RTL=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_SERIAL_DEV_CTRL_TTYPORT=y diff --git a/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces b/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces new file mode 100644 index 0000000000..89e7d74aff --- /dev/null +++ b/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces @@ -0,0 +1,6 @@ +auto lo +iface lo inet loopback + +auto wlan0 +iface wlan0 inet dhcp +wpa-conf /etc/wpa_supplicant.conf diff --git a/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf b/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf new file mode 100644 index 0000000000..b43292b0a7 --- /dev/null +++ b/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf @@ -0,0 +1,8 @@ +ap_scan=1 + +network={ + ssid="YOURSSID" + scan_ssid=1 + key_mgmt=WPA-PSK + psk="YOURPASSWD" +} diff --git a/board/sipeed/lichee_rv_dock/readme.txt b/board/sipeed/lichee_rv_dock/readme.txt new file mode 100644 index 0000000000..048ba64d26 --- /dev/null +++ b/board/sipeed/lichee_rv_dock/readme.txt @@ -0,0 +1,45 @@ +Lichee RV dock +=============== + +Lichee RV Dock is a RISC-V Linux development kits with high integration, small +size and affordable price designed for opensource developer. It's equipped with +HDMI interface and it supports many screen by its screen convert board. It's +also equipped with many peripherals, including a UAB-A port, 2.4G Wifi-BT module, +an analog microphone and a speaker jack interface. + +How to build +============ + +$ make sipeed_lichee_rv_dock_defconfig +$ make + +Wifi +========== + +Edit board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf or +/etc/wpa_supplicant.conf once connected to the board: + +* Replace YOURSSID with your AP ssid +* Replace YOURPASSWD with your AP password + +Bluetooth +========== + +To make the device discoverable and pairable, once connected to the board: + +* bluetoothctl power on +* bluetoothctl discoverable yes +* bluetoothctl pairable yes + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Connect a TTL UART to the debug connector, insert the microSD card and +plug in a USB-C cable to the PWR connector to boot the system. diff --git a/configs/sipeed_lichee_rv_dock_defconfig b/configs/sipeed_lichee_rv_dock_defconfig new file mode 100644 index 0000000000..7c8c6788fa --- /dev/null +++ b/configs/sipeed_lichee_rv_dock_defconfig @@ -0,0 +1,41 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay board/sipeed/lichee_rv_dock/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/lichee_rv_dock/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="nezha" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-lichee-rv-dock" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/lichee_rv_dock/linux.fragment" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_PACKAGE_RTL8723DS=y +BR2_PACKAGE_RTL8723DS_BT=y +BR2_PACKAGE_BLUEZ5_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y +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_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_PLAT="generic" +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set +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,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="lichee_rv_dock" +BR2_TARGET_UBOOT_NEEDS_DTC=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-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y From peter at korsgaard.com Mon Feb 20 20:57:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:00 -0000 Subject: [Buildroot] [git commit branch/next] package/gtest: bump to version 1.12.1 Message-ID: <20230220205213.3EA8D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58bb71089e52323aea8696a5de2d7687422bde74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/google/googletest/releases/tag/release-1.12.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gtest/gtest.hash | 2 +- package/gtest/gtest.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gtest/gtest.hash b/package/gtest/gtest.hash index 1a93684aeb..a6dd15a8d2 100644 --- a/package/gtest/gtest.hash +++ b/package/gtest/gtest.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2a4f11dce6188b256f3650061525d0fe352069e5c162452818efbbf8d0b5fe1c gtest-1.12.0.tar.gz +sha256 81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2 gtest-1.12.1.tar.gz sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 LICENSE diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 236c8f3730..a53253228e 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -4,7 +4,7 @@ # ################################################################################ -GTEST_VERSION = 1.12.0 +GTEST_VERSION = 1.12.1 GTEST_SITE = $(call github,google,googletest,release-$(GTEST_VERSION)) GTEST_INSTALL_STAGING = YES GTEST_INSTALL_TARGET = NO From peter at korsgaard.com Mon Feb 20 20:57:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:00 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-http-daemon: bump version to 6.14 Message-ID: <20230220205229.C5EA286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e69d76aae479ab2d5f15baa79f25fd480e12eab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Updated license hash due to typo/whitespace-only fixes in license file: https://github.com/libwww-perl/HTTP-Daemon/commit/605bc6efdabf39d2c9f9c7f613bf88d497454e5a#diff-b4668a52683f65fbc0528f6590ba160c9c64c88c302b6262c506266eb1d35180 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-http-daemon/perl-http-daemon.hash | 6 +++--- package/perl-http-daemon/perl-http-daemon.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-http-daemon/perl-http-daemon.hash b/package/perl-http-daemon/perl-http-daemon.hash index f8272a4fce..c19b3b9558 100644 --- a/package/perl-http-daemon/perl-http-daemon.hash +++ b/package/perl-http-daemon/perl-http-daemon.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 63674e3f81760a29075853413eb157d8 HTTP-Daemon-6.12.tar.gz -sha256 df47bed10c38670c780fd0116867d5fd4693604acde31ba63380dce04c4e1fa6 HTTP-Daemon-6.12.tar.gz +md5 3111b0081d08d8b225f52884033de349 HTTP-Daemon-6.14.tar.gz +sha256 f0767e7f3cbb80b21313c761f07ad8ed253bce9fa2d0ba806b3fb72d309b2e1d HTTP-Daemon-6.14.tar.gz # computed by scancpan -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENCE +sha256 311f168ba9a7819ffab4fea19858f9e880737baf6d112929d11530205035a4cc LICENCE diff --git a/package/perl-http-daemon/perl-http-daemon.mk b/package/perl-http-daemon/perl-http-daemon.mk index e475072628..fe50c768bf 100644 --- a/package/perl-http-daemon/perl-http-daemon.mk +++ b/package/perl-http-daemon/perl-http-daemon.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_DAEMON_VERSION = 6.12 +PERL_HTTP_DAEMON_VERSION = 6.14 PERL_HTTP_DAEMON_SOURCE = HTTP-Daemon-$(PERL_HTTP_DAEMON_VERSION).tar.gz PERL_HTTP_DAEMON_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_DAEMON_DEPENDENCIES = host-perl-module-build-tiny From peter at korsgaard.com Mon Feb 20 20:57:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:01 -0000 Subject: [Buildroot] [git commit branch/next] configs/sipeed_licheee_rv_defconfig: use 6.1 kernel headers Message-ID: <20230220205213.68EAF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73125c7412d4c73eb69d237f059718a1d1ba0bd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The kernel used is based on 6.1-rc3, so use the recently introduced 6.1 kernel headers version to fix a build issue: Incorrect selection of kernel headers: expected 6.0.x, got 6.1.x Signed-off-by: Peter Korsgaard --- configs/sipeed_lichee_rv_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sipeed_lichee_rv_defconfig b/configs/sipeed_lichee_rv_defconfig index f9782f870b..f03a6b4f69 100644 --- a/configs/sipeed_lichee_rv_defconfig +++ b/configs/sipeed_lichee_rv_defconfig @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/lichee_rv/genimage.cfg" From peter at korsgaard.com Mon Feb 20 20:57:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:01 -0000 Subject: [Buildroot] [git commit branch/next] configs/chiliboard: bump u-boot to 2023.01 Message-ID: <20230220205230.2C641828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93d0979fbf063a8b65fd9d4c58891b21805804c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- configs/grinn_chiliboard_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig index df483d991a..e7862d1738 100644 --- a/configs/grinn_chiliboard_defconfig +++ b/configs/grinn_chiliboard_defconfig @@ -16,7 +16,7 @@ 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_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="chiliboard" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From peter at korsgaard.com Mon Feb 20 20:57:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:02 -0000 Subject: [Buildroot] [git commit branch/next] configs/visionfive2_defconfig: new defconfig Message-ID: <20230220205213.4A7478648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=704c62bbc5d30df80002fdd1f6a63bebc0e1842d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add a defconfig for the Starfive VisionFive2 board, a board built around the Starfive JH7110 RISC-V 64bit SoC. This board comes with functional lowlevel and U-Boot bootloaders in SPI flash. The defconfig reuses these and only builds a (5.15 based) kernel and rootfs. The factory shipped U-Boot is hard coded to look at MMC partition 3. Signed-off-by: Francois Dugast [Peter: add to DEVELOPERS] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 +++ board/visionfive2/genimage.cfg | 21 +++++++++++++++ .../overlay/boot/extlinux/extlinux.conf | 4 +++ board/visionfive2/readme.txt | 30 ++++++++++++++++++++++ configs/visionfive2_defconfig | 18 +++++++++++++ 5 files changed, 77 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b0f10148b5..a200edb7f5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1029,6 +1029,10 @@ F: package/tbb/ N: Francisco Gonzalez F: package/ser2net/ +N: Francois Dugast +F: board/visionfive2/ +F: configs/visionfive2_defconfig + N: Francois Perrad F: board/freescale/ls1028ardb/ F: board/olimex/a20_olinuxino diff --git a/board/visionfive2/genimage.cfg b/board/visionfive2/genimage.cfg new file mode 100644 index 0000000000..c221b49c7b --- /dev/null +++ b/board/visionfive2/genimage.cfg @@ -0,0 +1,21 @@ +# Minimal SD card image for the Starfive VisionFive2 board + +image sdcard.img { + hdimage { + } + + # u-boot is hard coded to look at 3rd partition + partition dummy1 { + size = 512 + } + + partition dummy2 { + size = 512 + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + } +} diff --git a/board/visionfive2/overlay/boot/extlinux/extlinux.conf b/board/visionfive2/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..6e2c5660d6 --- /dev/null +++ b/board/visionfive2/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + devicetree /boot/jh7110-visionfive-v2.dtb + append console=ttyS0,115200 root=/dev/mmcblk1p3 diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt new file mode 100644 index 0000000000..2da98f3847 --- /dev/null +++ b/board/visionfive2/readme.txt @@ -0,0 +1,30 @@ +Starfive VisionFive2 +==================== + +The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a +Starfive JH7110 processor. + +How to build +============ + +$ make visionfive2_defconfig +$ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Preparing the board +=================== + +Connect a TTL UART cable to pin 6 (GND), 8 (TX) and 10 (RX). + +Insert your SD card. + +Power-up the board using an USB-C cable. diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig new file mode 100644 index 0000000000..5b07a8efbc --- /dev/null +++ b/configs/visionfive2_defconfig @@ -0,0 +1,18 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,7b7b4eddd8d5ae55f6e0ee09b93e16e23ab4f97b)/linux-7b7b4eddd8d5ae55f6e0ee09b93e16e23ab4f97b.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="starfive_visionfive2" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-visionfive-v2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_GENIMAGE=y From peter at korsgaard.com Mon Feb 20 20:57:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:05 -0000 Subject: [Buildroot] [git commit branch/next] package/python-weasyprint: bump to version 57.2 Message-ID: <20230220205230.C209B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6abb8721dbf0987ec43f248c84ce4f0f4d11b697 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-weasyprint/python-weasyprint.hash | 4 ++-- package/python-weasyprint/python-weasyprint.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash index 4da8ea479a..d6026cf034 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 bab389bdfb25e03d64591c56367fb344 weasyprint-57.1.tar.gz -sha256 397a9d11298f94485ec3b7b68aeef1c6106fb638350126d9d4a64109b73508a0 weasyprint-57.1.tar.gz +md5 497030cecafffca06bae2b161846b461 weasyprint-57.2.tar.gz +sha256 b8e9ef2dcbcfbc82e99215acfd68f947b2b5f1999b5b156db75fabe380ba7e9a weasyprint-57.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 d1e5e7983d..27b07226d9 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 57.1 +PYTHON_WEASYPRINT_VERSION = 57.2 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/32/3f/d305dc714c119e5b11c0ea1ecff9741407b6da90d6b684859d3b3e586692 +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/b1/88/335dd6cb71a9d58584c975bf1db0ab9a3a9f15f9bffef1cbfac0fb1ee72e PYTHON_WEASYPRINT_SETUP_TYPE = flit PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:57:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:05 -0000 Subject: [Buildroot] [git commit branch/next] package/python-web2py: bump to version 2.23.0 Message-ID: <20230220205230.E575C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f675fd79d57fc6c8fe0b15fe1c3e3d5aabcd8bd2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 dbf85437f2..a853497768 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d4a15fc15254d3fa9e9e9b5a726ae51a0989b7d740d53fd7c3d5b81ac6b8274e python-web2py-2.22.5.tar.gz +sha256 356f88b671e2bcdd9c89df526ee063ee9d6f4f57b60182ec2684adddcc426e99 python-web2py-2.23.0.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index b9a4e95609..4425b09d12 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.22.5 +PYTHON_WEB2PY_VERSION = 2.23.0 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:57:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:05 -0000 Subject: [Buildroot] [git commit branch/next] utils/scancpan: bump required perl version Message-ID: <20230220205213.C73CB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4cbef389f3e10d1cbdcd9961fb128dfd9b85debf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next As the comment in package/perl/perl.mk instructs, bumping the perl version must be propagated to utils/scancpan as well. However, commit 7c1ef8129f37 (package/perl: bump to version 5.34.0) forgot to do so. Fixes: 7c1ef8129f37 Signed-off-by: Yann E. MORIN --- utils/scancpan | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/scancpan b/utils/scancpan index 168619164f..48f8bd83b7 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -488,9 +488,9 @@ use Digest::SHA qw(sha256_hex); use Text::Wrap; $Text::Wrap::columns = 62; -# Below, 5.032 should be aligned with the version of perl actually +# Below, 5.034 should be aligned with the version of perl actually # bundled in Buildroot: -die <<"MSG" if $] < 5.032; +die <<"MSG" if $] < 5.034; This script needs a host perl with the same major version as Buildroot target perl. Your current host perl is: @@ -498,7 +498,7 @@ Your current host perl is: version $] You may install a local one by running: - perlbrew install perl-5.32.0 + perlbrew install perl-5.34.0 MSG my ($help, $man, $quiet, $force, $recommend, $test, $host); From peter at korsgaard.com Mon Feb 20 20:57:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:06 -0000 Subject: [Buildroot] [git commit branch/next] package/wireshark: fix legal info Message-ID: <20230220205231.1EAD486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb79d78554632e96df52f41333aa62f928b6817f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 4aca99f51cc97cfc3bcd3affa65f4694004dd444 forgot to update hash of COPYING file and add hash of README.md due to the following commit which moved the introductory note about the GPL from the COPYING license text file to the README: https://github.com/wireshark/wireshark/commit/d2b6b89b94bd3e18520c472affae9cd4a03283e2 Fixes: - http://autobuild.buildroot.org/results/aaed32b55cc56beb32152ed61ac9b7f69d3ebef5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 3 ++- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index ae06ab09b7..e9026b8caa 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -3,4 +3,5 @@ sha1 0127180ff18515b086fe5603f767f53ddaa64c1a wireshark-4.0.2.tar.xz sha256 f35915699f2f9b28ddb211202d40ec8984e5834d3c911483144a4984ba44411d wireshark-4.0.2.tar.xz # Locally calculated -sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 fce67c1558e448fac784ce9a30cb47956488bc3ef6ec16316c38b0668b3cad2e README.md diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index ee3d6b1905..e2a424ef0f 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -8,7 +8,7 @@ WIRESHARK_VERSION = 4.0.2 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license -WIRESHARK_LICENSE_FILES = COPYING +WIRESHARK_LICENSE_FILES = COPYING README.md WIRESHARK_CPE_ID_VENDOR = wireshark WIRESHARK_SELINUX_MODULES = wireshark WIRESHARK_DEPENDENCIES = \ From yann.morin.1998 at free.fr Mon Feb 20 20:57:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:07 -0000 Subject: [Buildroot] [git commit branch/next] utils/scancpan: update cpan.org and spdx.org URLs from http to https Message-ID: <20230220205213.BC86A81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=072df09e2f62e6d797df743b0ebf42a6a5910ff9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- utils/scancpan | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/scancpan b/utils/scancpan index 075f193563..168619164f 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -31,7 +31,7 @@ $fatpacked{"MetaCPAN/API/Tiny.pm"} = <<'METACPAN_API_TINY'; if $params{ua_args} && ref($params{ua_args}) ne 'ARRAY'; my $self = +{ - base_url => $params{base_url} || 'http://api.metacpan.org/v0', + base_url => $params{base_url} || 'https://api.metacpan.org/v0', ua => $params{ua} || HTTP::Tiny->new( $params{ua_args} ? @{$params{ua_args}} @@ -525,8 +525,8 @@ my %deps_build; # name -> list of host dependencies my %deps_runtime; # name -> list of target dependencies my %license_files; # name -> hash of license files my %checksum; # author -> list of checksum -my $mirror = 'http://cpan.metacpan.org'; # a CPAN mirror -my $mcpan = MetaCPAN::API::Tiny->new(base_url => 'http://fastapi.metacpan.org/v1'); +my $mirror = 'https://cpan.metacpan.org'; # a CPAN mirror +my $mcpan = MetaCPAN::API::Tiny->new(base_url => 'https://fastapi.metacpan.org/v1'); my $ua = HTTP::Tiny->new(); my $new_pkgs; @@ -698,7 +698,7 @@ sub brname { return uc $name; } -# Buildroot requires license name as in http://spdx.org/licenses/ +# Buildroot requires license name as in https://spdx.org/licenses/ sub brlicense { my $license = shift; $license =~ s|apache_1_1|Apache-1.1|; From peter at korsgaard.com Mon Feb 20 20:57:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:07 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: needs gcc >= 4.9 Message-ID: <20230220205231.4F50A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=035f18db042d218777394b868beadc575976a5ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next crun unconditionally uses atomic_bool when libgcrypt is found since version 1.7.1 and https://github.com/containers/crun/commit/40f66c0a74b8d918ecc7ae9228dca32a4fd71084 resulting in the following build failure with gcc 4.8 since commit 6987b92da510a8c8b9534a22506850c163d0f035: src/libcrun/seccomp.c: In function 'calculate_seccomp_checksum': src/libcrun/seccomp.c:374:3: error: unknown type name 'atomic_bool' static atomic_bool initialized = false; ^ Fixes: - http://autobuild.buildroot.org/results/924806ffd6d83cd6d8226577c3877b0b8ca2722d Signed-off-by: Fabrice Fontaine Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/crun/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/crun/Config.in b/package/crun/Config.in index fa0894e126..45c86f0655 100644 --- a/package/crun/Config.in +++ b/package/crun/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CRUN bool "crun" depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_YAJL # libocispec help @@ -8,5 +9,6 @@ config BR2_PACKAGE_CRUN https://github.com/containers/crun -comment "crun needs a glibc or musl toolchain" - depends on BR2_TOOLCHAIN_USES_UCLIBC +comment "crun needs a glibc or musl toolchain, gcc >= 4.9" + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From yann.morin.1998 at free.fr Mon Feb 20 20:57:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:08 -0000 Subject: [Buildroot] [git commit branch/next] package/skeleton-systemd: move /var factory tmpfiles out of /etc Message-ID: <20230220205213.EADB781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff0fd90c3e42dd00283a4eb192ce832f7c03ac30 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When the rootfs is not remounted read-write (thus assuming a read-only rootfs like squashfs), we create a tmpfiles.d factory for /var. However, we register those in /etc/tmpfiles.d/, but /etc could also be a tmpfs (for full state-less systems, or easy factory-reset, see [0]). So, we move our var factory to /usr/lib/tmpfiles.d/, which is also the location where systemd itself places its own tmpfiles, and where we already put all our other tmpfiles (see audit, avahi, cryptsetup, dhcp, lighttpd, nfs-utils, quagga, samba4, swupdate) and our handling of systemd's catalog files too. We also rename the file to a better name, so that it is obvious it is generated by us (systemd already installs a var.conf of its own, so we want to avoid name clashing). Last little detail: there is no need or reason to create .../tmpfiles.d/ at install time; it is only needed in the rootfs-pre-cmd hook, so we only create it just before we need it. [0] http://0pointer.de/blog/projects/stateless.html Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Romain Naour Cc: Je??re??my Rosen [yann.morin.1998 at free.fr: - split original patch in two - this one only moves out of /etc and into /usr/lib - adapt commit log accordingly ] Signed-off-by: Yann E. MORIN Acked-by: Norbert Lange [yann.morin.1998 at free.fr: - rename to 00-buildroot-var.conf as suggested by Norbert ] Signed-off-by: Yann E. MORIN --- package/skeleton-init-systemd/skeleton-init-systemd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 795a171809..ec908b4fac 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -29,7 +29,6 @@ else # a real (but empty) directory, and the "factory files" will be copied # back there by the tmpfiles.d mechanism. define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW - mkdir -p $(TARGET_DIR)/etc/systemd/tmpfiles.d echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab echo "tmpfs /var tmpfs mode=1777 0 0" >>$(TARGET_DIR)/etc/fstab endef @@ -38,6 +37,7 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR rm -rf $(TARGET_DIR)/usr/share/factory/var mv $(TARGET_DIR)/var $(TARGET_DIR)/usr/share/factory/var mkdir -p $(TARGET_DIR)/var + mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d for i in $(TARGET_DIR)/usr/share/factory/var/* \ $(TARGET_DIR)/usr/share/factory/var/lib/* \ $(TARGET_DIR)/usr/share/factory/var/lib/systemd/*; do \ @@ -51,7 +51,7 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR printf "C! %s - - - -\n" "$${j}" \ || exit 1; \ fi; \ - done >$(TARGET_DIR)/etc/tmpfiles.d/var-factory.conf + done >$(TARGET_DIR)/usr/lib/tmpfiles.d/00-buildroot-var.conf endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR From peter at korsgaard.com Mon Feb 20 20:57:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:08 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 4.9.x / 5.{10, 15}.x / 6.{0, 1}.x series Message-ID: <20230220205231.5EB3786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=479b042433447214cf318964cc7557b6b5f5d05f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 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 bca1b3fc8b..e18b515311 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.2" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.5" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 8ac04b60f9..157f267a9d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 ee41f3c4f599b2f46f08aae428c9243db403e7292eb2c9f04ee34909b038d1ae linux-6.1.2.tar.xz -sha256 842071bca611c1f080cbc39c7ab3a6b58d7951f4f41e553b3db4fbe3e0705ce4 linux-6.0.16.tar.xz +sha256 bc7f6d9a8a8bbe9a723e82346bba94b58d926f78bfba106b21e041e0290076fc linux-6.1.5.tar.xz +sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 80fcd9efa443502de9e2750f6dfb59e8de43a5d87a6d2be09dca748d79b5f2ee linux-5.15.86.tar.xz -sha256 7aaaf6d0bcd8a2cfa14ad75f02ca62bb2de08aad3bee3eff198de49ea5254079 linux-5.10.161.tar.xz +sha256 e7359bd2935b54fe8bb821cf748591c36a95bed019e752d3e4d5803d9da1ccb4 linux-5.15.87.tar.xz +sha256 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 linux-5.10.162.tar.xz sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 1f6de11306cc9f82fe1d4dd03565cdf43906fa6f77302913d942fd63b77b500c linux-4.9.336.tar.xz +sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz # Locally computed diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 216b496fe4..1ad9fffcd3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -396,14 +396,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.336" if BR2_KERNEL_HEADERS_4_9 + default "4.9.337" if BR2_KERNEL_HEADERS_4_9 default "4.14.302" if BR2_KERNEL_HEADERS_4_14 default "4.19.269" if BR2_KERNEL_HEADERS_4_19 default "5.4.228" if BR2_KERNEL_HEADERS_5_4 - default "5.10.161" if BR2_KERNEL_HEADERS_5_10 - default "5.15.86" if BR2_KERNEL_HEADERS_5_15 - default "6.0.16" if BR2_KERNEL_HEADERS_6_0 - default "6.1.2" if BR2_KERNEL_HEADERS_6_1 + default "5.10.162" if BR2_KERNEL_HEADERS_5_10 + default "5.15.87" if BR2_KERNEL_HEADERS_5_15 + default "6.0.19" if BR2_KERNEL_HEADERS_6_0 + default "6.1.5" if BR2_KERNEL_HEADERS_6_1 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 yann.morin.1998 at free.fr Mon Feb 20 20:57:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:09 -0000 Subject: [Buildroot] [git commit branch/next] package/skeleton-systemd: host the tmpfiles preparation script Message-ID: <20230220205214.109D18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d18176396a4b835615b71f254e1c00add265f4ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 0d9b84b7a83f (package/systemd: invoke systemd-tmpfilesd on final image) forcefully introduced a call to systemd-tmpfiles as a per-rootfs hook, on the premise that would help with read-only rootfs. However, that did not account for the then-pre-existing handling of /var as a factory when the user opted not to remount / read-write (by not setting BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW). This means that, for users who want to use a factory for /var, the generated filesystem contains the factory files twice: once as stored in the factory, and once as populated by systemd-tmpfilesd. In the hope to reconcile the two solutions, we move the handling of calling systemd-tmpfilesd to the skeleton-init-systemd package, where we already handle the /var factory. Having the two in the same package will make it easier, in the future, to provide the user with a choice whether to use one of the other. Note that it is very important to keep the order of the hooks as they are. Indeed, skeleton-init-systemd sorts before systemd, so its hooks were registered before systemd's hooks; now that we move the CREATE_TMPFILES hook, we must ensure it is called after the PRE_ROOTFS_VAR one, so that the behaviour of acting on the var factory remains. As a final note: we chose the move this way, rather than move the var factory into the systemd package, because it is more related to the system integration on the Buildroot side, rather than the integration of the systemd package in Buildroot. Similarly, the other four rootfs hooks, SYSTEMD_LOCALE_PURGE_CATALOGS, SYSTEMD_UPDATE_CATALOGS, SYSTEMD_RM_CATALOG_UPDATE_SERVICE, and specially SYSTEMD_PRESET_ALL, should also be moved out of the systemd package, because they too are more related to the Buildroot system, rather than to the systemd package itself; but the frontier is very porous in either way, for such a package as special as systemd. Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Je??re??my Rosen Cc: Yann E. MORIN Acked-by: Norbert Lange Signed-off-by: Yann E. MORIN --- package/{systemd => skeleton-init-systemd}/fakeroot_tmpfiles.sh | 0 package/skeleton-init-systemd/skeleton-init-systemd.mk | 6 ++++++ package/systemd/systemd.mk | 6 ------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/skeleton-init-systemd/fakeroot_tmpfiles.sh similarity index 100% rename from package/systemd/fakeroot_tmpfiles.sh rename to package/skeleton-init-systemd/fakeroot_tmpfiles.sh diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index ff8bc528c0..559a169aee 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -58,6 +58,12 @@ SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_V endif +define SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ + $(SKELETON_INIT_SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) +endef +SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK + define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/home mkdir -p $(TARGET_DIR)/srv diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 30a75b7a40..b96873b73f 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -744,12 +744,6 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE -define SYSTEMD_CREATE_TMPFILES_HOOK - HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ - $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) -endef -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK - define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef From peter at korsgaard.com Mon Feb 20 20:57:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:09 -0000 Subject: [Buildroot] [git commit branch/next] package/docker-cli: bump version to 20.10.22 Message-ID: <20230220205231.A0375828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e6fcd46fb6c671998c8508743abbc1e3938ce3b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/moby/moby/releases/tag/v20.10.22 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index d9477cf3af..c6db95f9b3 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f0f62ca1c80e8fd5b9e140ca64ef3e75dc7cf7a28040b3d10b260307128946e8 docker-cli-20.10.21.tar.gz +sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index a14edb2c31..cb44c68c1b 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.21 +DOCKER_CLI_VERSION = 20.10.22 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From peter at korsgaard.com Mon Feb 20 20:57:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:10 -0000 Subject: [Buildroot] [git commit branch/next] package/libcurl: security bump version to 7.87.0 Message-ID: <20230220205214.1D44781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b91fd750180dd4689cafc72b28696c239821f9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: - CVE-2022-43551: Another HSTS bypass via IDN https://curl.se/docs/CVE-2022-43551.html - CVE-2022-43552: HTTP Proxy deny use-after-free https://curl.se/docs/CVE-2022-43552.html Changelog: https://curl.se/changes.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index c0e2378cac..230ec8d704 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.84.0.tar.xz.asc +# https://curl.se/download/curl-7.87.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b curl-7.86.0.tar.xz +sha256 ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff curl-7.87.0.tar.xz sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 8de4358107..994b685d34 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.86.0 +LIBCURL_VERSION = 7.87.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From peter at korsgaard.com Mon Feb 20 20:57:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:10 -0000 Subject: [Buildroot] [git commit branch/next] package/network-manager: bump version to 1.40.10 Message-ID: <20230220205231.CDDCC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3587c27c8ef0a24507fa0eaa5602fae80aae45ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Peter Korsgaard --- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index f503665a9a..3895c1ffc3 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.6.sha256sum -sha256 2f025b2d5af7de593bbf47c17e4d98a2b9608ea90a8260fb08080be97439534e NetworkManager-1.40.6.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.10.sha256sum +sha256 fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7 NetworkManager-1.40.10.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 847c6a82ba..138ff46e4a 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -5,7 +5,7 @@ ################################################################################ NETWORK_MANAGER_VERSION_MAJOR = 1.40 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).6 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 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 From yann.morin.1998 at free.fr Mon Feb 20 20:57:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:11 -0000 Subject: [Buildroot] [git commit branch/next] support/testing: remove leftover kernel config fragment Message-ID: <20230220205214.41C348648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0627cb0e8a9e19d1ac19c1a72302b25ab7b938dc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 86d32208b62a (support/testing/tests/init/test_systemd.py: use downloaded kernel) stopped building a custom kernel for the systemd tests, but forgot to drop the associated kernel config fragment. That fragment is now not used in any test case, so we can drop it. Signed-off-by: Yann E. MORIN --- support/testing/conf/binfmt-misc-kernel-fragment.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/support/testing/conf/binfmt-misc-kernel-fragment.config b/support/testing/conf/binfmt-misc-kernel-fragment.config deleted file mode 100644 index 7c992ff71b..0000000000 --- a/support/testing/conf/binfmt-misc-kernel-fragment.config +++ /dev/null @@ -1,2 +0,0 @@ -# Needed for binfmt_misc service: "Arbitrary Executable File Formats File System" -CONFIG_BINFMT_MISC=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:11 -0000 Subject: [Buildroot] [git commit branch/next] package/libyang: bump version to 2.1.4 Message-ID: <20230220205232.16A1386496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3cd1090d9a7fd15eddf4dc843800256d846a9955 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libyang/libyang.hash | 2 +- package/libyang/libyang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index c064c2e69c..da8600351b 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94898ee391c238dcd29ff21092e5dcab4e17b9623e88862a55b72fc6168846f8 libyang-2.0.194.tar.gz +sha256 f30ee1c3e13f0c5d25c4d2fb628e4b262b483d0a500464a7c12008ccc393a69e libyang-2.1.4.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 36f452ca07..6c57a2dd42 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.0.194 +LIBYANG_VERSION = 2.1.4 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:13 -0000 Subject: [Buildroot] [git commit branch/next] support/download: fix concurrent cargo vendor Message-ID: <20230220205232.05A1786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbddd126011611e97cc920e40cd58784e29f242d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 8450b7691870 (package/pkg-cargo: move CARGO_HOME into DL_DIR) allowed for a shared cargo cache of crates. Internally, cargo is supposed to lock themselves when accessing that cache, and that commit even had some research in that area, pointing at [0] for complaints about too-coarse the lock, so it was deemed safe to have a shared cargo home. However, in practice, the locking as implemented by cargo, fails to properly protect the concurrent accesses to the crates cache, with random failures that manifest themselves like so: Blocking waiting for file lock on package cache Blocking waiting for file lock on package cache Downloading crates ... error: failed to sync Caused by: failed to download packages Caused by: failed to download `autocfg v1.1.0` Caused by: unable to get packages from source Caused by: failed to unpack package `autocfg v1.1.0` Caused by: failed to unpack entry at `autocfg-1.1.0/src/tests.rs` Caused by: No such file or directory (os error 2) while canonicalizing [...] with the last few errors sometime being: Caused by: failed to parse manifest at `[...]/aho-corasick-0.7.18/Cargo.toml` Caused by: can't find library `aho_corasick`, rename file to `src/lib.rs` or specify lib.path So, as we do not systematically use our own cargo build (we can use a pre-built one with host-rust-bin), we can't patch cargo (even if we knew what to do!). Instead, we implement a lock ourselves, by wrapping the call to "cargo vendor" with a flock(1) on cargo home. Note: the download wrapper is already flock-ed, but it is a per-package lock, so it does not prevent different packages from being downloaded in parallel; if those packages need cargo vendoring, that will not be protected by the flock on the dl wrapper. So we really do need a flock on cargo home. [0] https://github.com/rust-lang/cargo/issues/6930 Fixes: 8450b769187087751f83cbefcf0a88f70d9da670 Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Moritz Bitsch Signed-off-by: Thomas Petazzoni --- support/download/cargo-post-process | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 21a6be8dbe..aea2d8da7a 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -26,6 +26,8 @@ pushd "${base_name}" > /dev/null # Create the local .cargo/config with vendor info mkdir -p .cargo/ +mkdir -p "${CARGO_HOME}" +flock "${CARGO_HOME}"/.br-lock \ cargo vendor \ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ --locked VENDOR \ From peter at korsgaard.com Mon Feb 20 20:57:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:13 -0000 Subject: [Buildroot] [git commit branch/next] package/luaexpat: bump to version 1.5.1 Message-ID: <20230220205214.823B48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=31b7aecd7ef0b34095e72a1d4fbf41a05d5bd10b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/luaexpat/luaexpat.hash | 2 +- package/luaexpat/luaexpat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luaexpat/luaexpat.hash b/package/luaexpat/luaexpat.hash index be67e9be6f..621293a0b9 100644 --- a/package/luaexpat/luaexpat.hash +++ b/package/luaexpat/luaexpat.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 536a5eda09bb070d2de8ecdd15566d3a55e2afa5ded2ef183cd453bac8c41e98 luaexpat-1.5.0-1.src.rock +sha256 eb7abc4cc39dd50eecb30896686bac84e66fd3c0774d0749b391e7ac5d222f45 luaexpat-1.5.1-1.src.rock sha256 7e6a727e5b57cca713a2f2633f05d7e0cc1e261cc6a7613bbe266e625b2f14da luaexpat/LICENSE diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk index f56bf604b3..73675a8ee6 100644 --- a/package/luaexpat/luaexpat.mk +++ b/package/luaexpat/luaexpat.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAEXPAT_VERSION = 1.5.0-1 +LUAEXPAT_VERSION = 1.5.1-1 LUAEXPAT_SUBDIR = luaexpat LUAEXPAT_LICENSE = MIT LUAEXPAT_LICENSE_FILES = $(LUAEXPAT_SUBDIR)/LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:14 -0000 Subject: [Buildroot] [git commit branch/next] package/netopeer2: bump version to 2.1.42 Message-ID: <20230220205232.47C1C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06aa16e23490d03ef9098e61cdcf698af7317a96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch that is in upstream. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- ...BUGFIX-use-DESTDIR-when-executing-scripts.patch | 47 ---------------------- package/netopeer2/netopeer2.hash | 2 +- package/netopeer2/netopeer2.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) diff --git a/package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch b/package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch deleted file mode 100644 index 99febb56ad..0000000000 --- a/package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 696b6be8a623f4466def2a161baa26094e5592a4 Mon Sep 17 00:00:00 2001 -From: Michal Vasko -Date: Wed, 18 May 2022 09:14:35 +0200 -Subject: [PATCH] build BUGFIX use DESTDIR when executing scripts - -Fixes #1217 - -[Upstream accepted 696b6be8a623f4466def2a161baa26094e5592a4] -Signed-off-by: Heiko Thiery ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index efe922d..60e3150 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -351,7 +351,7 @@ if(INSTALL_MODULES) - set(ENV{NP2_MODULE_GROUP} \"${MODULES_GROUP}\") - set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\") - set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\") -- execute_process(COMMAND \"${SCRIPT_DIR}/setup.sh\" RESULT_VARIABLE SETUP_RES) -+ execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/setup.sh\" RESULT_VARIABLE SETUP_RES) - if(NOT SETUP_RES EQUAL \"0\") - message(FATAL_ERROR \" scripts/setup.sh failed: \${SETUP_RES}\") - endif() -@@ -364,7 +364,7 @@ if(GENERATE_HOSTKEY) - message(STATUS \"Generating a new RSA host key \\\"genkey\\\" if not already added...\") - set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\") - set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\") -- execute_process(COMMAND ${SCRIPT_DIR}/merge_hostkey.sh RESULT_VARIABLE MERGE_HOSTKEY_RES) -+ execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/merge_hostkey.sh\" RESULT_VARIABLE MERGE_HOSTKEY_RES) - if(NOT MERGE_HOSTKEY_RES EQUAL \"0\") - message(FATAL_ERROR \" scripts/merge_hostkey.sh failed: \${MERGE_HOSTKEY_RES}\") - endif() -@@ -375,7 +375,7 @@ if(MERGE_LISTEN_CONFIG) - message(STATUS \"Merging default server listen configuration if there is none...\") - set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\") - set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\") -- execute_process(COMMAND ${SCRIPT_DIR}/merge_config.sh RESULT_VARIABLE MERGE_CONFIG_RES) -+ execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/merge_config.sh\" RESULT_VARIABLE MERGE_CONFIG_RES) - if(NOT MERGE_CONFIG_RES EQUAL \"0\") - message(FATAL_ERROR \" scripts/merge_config.sh failed: \${MERGE_CONFIG_RES}\") - endif() --- -2.30.2 - diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index b352bbb239..cc71a2dab8 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 89f7572d188e7b04be4b10656d7161d65fb557bac222d8c4596a97eaf833b691 netopeer2-2.1.23.tar.gz +sha256 b166fe3425bb55b5f330fb7f53158f613bffc07493925ac437193e4d2defb3e7 netopeer2-2.1.42.tar.gz sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index d9a20d9969..7cb9202575 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETOPEER2_VERSION = 2.1.23 +NETOPEER2_VERSION = 2.1.42 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) NETOPEER2_DL_SUBDIR = netopeer2 NETOPEER2_LICENSE = BSD-3-Clause From yann.morin.1998 at free.fr Mon Feb 20 20:57:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:14 -0000 Subject: [Buildroot] [git commit branch/next] system: add options for /var factory and tmpfiles pre-seed Message-ID: <20230220205214.37D0681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f79611b3037cf505f00cc67011626deb4d8f5b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Currently, when one does not enable remounting the rootfs read-write, i.e. keep it read-only, for example because the filesystem is actually read-only by design, like squashfs, then two things happen: - we create a factory from the content of /var at build time, register tmpfiles entries for it, and mount a tmpfs on /var at runtime, so that systemd-tmpfiles does populate /var from the factory; this is only done when the rootfs is not remounted r/w; - we trigger systemd-tmpfiles at build time, which uses the tmpfiles db, of which our /var entries, to pre-populate the filesystem; this is always done, whether the rootfs is remounted r/w or not. Note that Buildroot mounts a tmpfs on /var, and leaves to the integrator to care for providing an actual filesystem, as there are too many variants and is very specific to each use-case. These two mechanisms are conflicting, semantically, but also technically: the files from the factory will be duplicated, but that may help in some situations when the actual /var filesystem is not mountable. In some cases, it might be preferable to have none, either, or both mechanisms enabled; it highly depends on the ultimate integration scheme chosen for a device. For example, some people will be very happy with a /var that is actually on a tmpfs and that it gets reseeded form scratch at every boot, while others may want to ensure that their system continue to work even when they can't mount something that makes /var writable. YMMV, as they used to say back in the day... So, we introduce two new options, in the system sub-menu, each to drive each mechanism. We default those options to y, to keep the previous behaviour by default, except the var factory is only available when the rootfs is not remounted r/w, as it were so far. We still hint in the help text that there might be some conflict between the two mechanisms, but since it has been that way for some time, it does not look too broken for most people. Since that introduces more options related to systemd being chosen as an init system, we gather those two options and the existing one inside a if-endif block, rather than adding more 'depends on' on each options. Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Je??re??my Rosen Cc: Yann E. MORIN Signed-off-by: Yann E. MORIN --- .../skeleton-init-systemd/skeleton-init-systemd.mk | 7 ++-- system/Config.in | 42 +++++++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 559a169aee..30783dfd26 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -32,6 +32,7 @@ define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab endef +ifeq ($(BR2_INIT_SYSTEMD_VAR_FACTORY),y) define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR rm -rf $(TARGET_DIR)/usr/share/factory/var mv $(TARGET_DIR)/var $(TARGET_DIR)/usr/share/factory/var @@ -55,14 +56,16 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR $(TARGET_DIR)/usr/lib/systemd/system/var.mount endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR +endif # BR2_INIT_SYSTEMD_VAR_FACTORY +endif # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW -endif - +ifeq ($(BR2_INIT_SYSTEMD_POPULATE_TMPFILES),y) define SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ $(SKELETON_INIT_SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK +endif # BR2_INIT_SYSTEMD_POPULATE_TMPFILES define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/home diff --git a/system/Config.in b/system/Config.in index 888c24ce81..806a747315 100644 --- a/system/Config.in +++ b/system/Config.in @@ -154,10 +154,48 @@ source "$BR2_BASE_DIR/.br2-external.in.init" endchoice +if BR2_INIT_SYSTEMD + +config BR2_INIT_SYSTEMD_VAR_FACTORY + bool "build a factory to populate a tmpfs on /var" + default y # legacy + depends on !BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW + help + Build a factory of the content of /var as installed by + packages, mount a tmpfs on /var at runtime, so that + systemd-tmpfiles can populate it from the factory. + + This may help on a read-only rootfs. + + It probably does not play very well with triggering a call + to systemd-tmpfiles at build time (below). + + Note: Buildroot mounts a tmpfs on /var to at least make the + system bootable out of the box; mounting a filesystem from + actual storage is left to the integration, as it is too + specific and may need preparatory work like partitionning a + device and/or formatting a filesystem first, so that falls + out of the scope of Buildroot. + + To use persistent storage, provide a systemd dropin for the + var.mount unit, that overrides the What and Type, and possibly + the Options and After, fields. + +config BR2_INIT_SYSTEMD_POPULATE_TMPFILES + bool "trigger systemd-tmpfiles during build" + default y # legacy + help + Act on the systemd-tmpfiles.d database at build time, when + assembling the root filesystems. + + This may help on a read-only filesystem. + + It probably does not play very well with the /var factory + (above). + config BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET string "The default unit systemd starts at bootup" default "multi-user.target" - depends on BR2_INIT_SYSTEMD help Specify the name of the unit configuration file to be started at bootup by systemd. Should end in ".target". @@ -165,6 +203,8 @@ config BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET https://www.freedesktop.org/software/systemd/man/systemd.special.html#default.target +endif # BR2_INIT_SYSTEMD + choice prompt "/dev management" if !BR2_INIT_SYSTEMD default BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS From yann.morin.1998 at free.fr Mon Feb 20 20:57:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:15 -0000 Subject: [Buildroot] [git commit branch/next] Cleanup/simplify copyright info Message-ID: <20230220205232.7A4A286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1d7155952d9abcad4d5d75b56508114469c2a1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Historically we have been (more-or-less consistently, sometimes forgetting some files) updating the end year of the copyright statements at the beginning of a new year. We're naturally not alone in that. Recently this was discussed in curl, and it turns out that copyright years are not really required: https://daniel.haxx.se/blog/2023/01/08/copyright-without-years/ So drop the years and simplify the copyright statements. While we're at it, also ensure the same syntax (capital C, email address) is used everywhere. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Makefile | 4 +--- docs/manual/manual.txt | 2 +- docs/website/copyright.txt | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index efa0b2a7a0..8517d563d5 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,6 @@ # Makefile for buildroot # -# Copyright (C) 1999-2005 by Erik Andersen -# Copyright (C) 2006-2014 by the Buildroot developers -# Copyright (C) 2014-2020 by the Buildroot developers +# Copyright (C) the Buildroot developers # # 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 diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt index fab66dbda5..d6534ca295 100644 --- a/docs/manual/manual.txt +++ b/docs/manual/manual.txt @@ -12,7 +12,7 @@ It is licensed under the GNU General Public License, version 2. Refer to the http://git.buildroot.org/buildroot/tree/COPYING?id={sys:git rev-parse HEAD}[COPYING] file in the Buildroot sources for the full text of this license. -Copyright (C) 2004-2020 The Buildroot developers +Copyright (C) The Buildroot developers image::logo.png[] diff --git a/docs/website/copyright.txt b/docs/website/copyright.txt index b15ac5f919..3fe19bab8b 100644 --- a/docs/website/copyright.txt +++ b/docs/website/copyright.txt @@ -1,7 +1,7 @@ The code and graphics on this website (and it's mirror sites, if any) are -Copyright (c) 1999-2005 by Erik Andersen, 2006-2020 The Buildroot -developers. All rights reserved. +Copyright (C) The Buildroot developers . All +rights reserved. Documents on this Web site including their graphical elements, design, and layout are protected by trade dress and other laws and MAY BE COPIED OR From peter at korsgaard.com Mon Feb 20 20:57:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:15 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: security bump to version 4.5.0 Message-ID: <20230220205214.5BE2781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b62ea01369b11f5a4320bb2c909168b21c2642c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-2056, CVE-2022-2057, CVE-2022-2058, CVE-2022-2519, CVE-2022-2520, CVE-2022-2521, CVE-2022-2953, CVE-2022-34526, CVE-2022-3570, CVE-2022-3597, CVE-2022-3598, CVE-2022-3599, CVE-2022-3626, CVE-2022-3627 and CVE-2022-3970 - COPYRIGHT renamed to LICENSE.md and year updated with https://gitlab.com/libtiff/libtiff/-/commit/fa1d6d787fc67a1eeb3abccb790b5bee969d424b - Use new --{en,dis}able options added by https://gitlab.com/libtiff/libtiff/-/commit/1ab0e2696a368a556b793a0941b5365e4d9f56ef http://www.simplesystems.org/libtiff/releases/v4.5.0.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tiff/tiff.hash | 4 ++-- package/tiff/tiff.mk | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 6bd28a0f59..73732892a5 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed tiff-4.4.0.tar.gz -sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 COPYRIGHT +sha256 c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464 tiff-4.5.0.tar.gz +sha256 0780558a8bfba0af1160ec1ff11ade4f41c0d7deafd6ecfc796b492a788e380d LICENSE.md diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 525712c9e9..7981bdf2c9 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,16 +4,18 @@ # ################################################################################ -TIFF_VERSION = 4.4.0 +TIFF_VERSION = 4.5.0 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license -TIFF_LICENSE_FILES = COPYRIGHT +TIFF_LICENSE_FILES = LICENSE.md TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES TIFF_CONF_OPTS = \ + --disable-contrib \ --disable-cxx \ + --disable-tests \ --without-x TIFF_DEPENDENCIES = host-pkgconf @@ -23,7 +25,8 @@ HOST_TIFF_CONF_OPTS = \ --without-x \ --disable-zlib \ --disable-lzma \ - --disable-jpeg + --disable-jpeg \ + --disable-tests HOST_TIFF_DEPENDENCIES = host-pkgconf ifneq ($(BR2_PACKAGE_TIFF_CCITT),y) @@ -84,12 +87,11 @@ ifneq ($(BR2_PACKAGE_TIFF_JBIG),y) TIFF_CONF_OPTS += --disable-jbig endif -TIFF_SUBDIRS = port libtiff ifeq ($(BR2_PACKAGE_TIFF_UTILITIES),y) -TIFF_SUBDIRS += tools +TIFF_CONF_OPTS += --enable-tools +else +TIFF_CONF_OPTS += --disable-tools endif -TIFF_MAKE = $(MAKE) SUBDIRS="$(TIFF_SUBDIRS)" - $(eval $(autotools-package)) $(eval $(host-autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:16 -0000 Subject: [Buildroot] [git commit branch/next] package/ipmitool: use the standard github helper Message-ID: <20230220205232.A954986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dce238f045f25d75b31681ea56ea5b9c668912dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Vincent Fazio Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni --- package/ipmitool/ipmitool.hash | 2 +- package/ipmitool/ipmitool.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/ipmitool/ipmitool.hash b/package/ipmitool/ipmitool.hash index bb0b0d80b0..c3b298e3ba 100644 --- a/package/ipmitool/ipmitool.hash +++ b/package/ipmitool/ipmitool.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 48b010e7bcdf93e4e4b6e43c53c7f60aa6873d574cbd45a8d86fa7aaeebaff9c IPMITOOL_1_8_19.tar.gz +sha256 48b010e7bcdf93e4e4b6e43c53c7f60aa6873d574cbd45a8d86fa7aaeebaff9c ipmitool-1_8_19.tar.gz sha256 b7e2382a8be43b5f6cb092f2d2bda163bf1a1938be9300f821a845cbcd535f56 COPYING diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index b9f60d8151..5e34434a03 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -5,8 +5,7 @@ ################################################################################ IPMITOOL_VERSION = 1_8_19 -IPMITOOL_SOURCE = IPMITOOL_$(IPMITOOL_VERSION).tar.gz -IPMITOOL_SITE = https://github.com/ipmitool/ipmitool/archive/refs/tags +IPMITOOL_SITE = $(call github,ipmitool,ipmitool,IPMITOOL_$(IPMITOOL_VERSION)) IPMITOOL_LICENSE = BSD-3-Clause IPMITOOL_LICENSE_FILES = COPYING IPMITOOL_CPE_ID_VENDOR = ipmitool_project From yann.morin.1998 at free.fr Mon Feb 20 20:57:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:17 -0000 Subject: [Buildroot] [git commit branch/next] package/python-cython: bump to version 0.29.33 Message-ID: <20230220205234.312EA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d31937ab88097a9ed3a34bf05fa07278abed77ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cython/python-cython.hash | 4 ++-- package/python-cython/python-cython.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 3ed9fb56a1..e7e86264d2 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 91c36ea86c00adcc5c1c11cf48b733c0 Cython-0.29.32.tar.gz -sha256 8733cf4758b79304f2a4e39ebfac5e92341bce47bcceb26c1254398b2f8c1af7 Cython-0.29.32.tar.gz +md5 bd42c555cb2298b8a94fa8de7ee679ba Cython-0.29.33.tar.gz +sha256 5040764c4a4d2ce964a395da24f0d1ae58144995dab92c6b96f44c3f4d72286a Cython-0.29.33.tar.gz # Locally computed sha256 checksums sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 9a90f6198e..b11d75b33d 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.32 +PYTHON_CYTHON_VERSION = 0.29.33 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0 +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/dc/f6/e8e302f9942cbebede88b1a0c33d0be3a738c3ac37abae87254d58ffc51c PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt From peter at korsgaard.com Mon Feb 20 20:57:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:17 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8821cu: new package Message-ID: <20230220205214.9DB1C81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=183de9155b138497783717383418544da00e0da7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Adds support for USB rtl8821cu wifi cards. Similar to rtl8821au and rtl8812au-aircrack-ng packages. https://github.com/morrownr/8821cu-20210118 Signed-off-by: Christian Stewart Reviewed-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/rtl8821cu/Config.in | 10 ++++++++++ package/rtl8821cu/rtl8821cu.hash | 3 +++ package/rtl8821cu/rtl8821cu.mk | 25 +++++++++++++++++++++++++ 5 files changed, 40 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a200edb7f5..5eed4a8455 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -564,6 +564,7 @@ F: package/mosh/ F: package/nerdctl/ F: package/pkg-golang.mk F: package/rtl8821au/ +F: package/rtl8821cu/ F: package/runc/ F: package/tini/ F: support/testing/tests/package/test_docker_compose.py diff --git a/package/Config.in b/package/Config.in index 999feae08a..0c77f7c022 100644 --- a/package/Config.in +++ b/package/Config.in @@ -588,6 +588,7 @@ endmenu source "package/rtl8723ds-bt/Config.in" source "package/rtl8812au-aircrack-ng/Config.in" source "package/rtl8821au/Config.in" + source "package/rtl8821cu/Config.in" source "package/sane-backends/Config.in" source "package/sdparm/Config.in" source "package/sedutil/Config.in" diff --git a/package/rtl8821cu/Config.in b/package/rtl8821cu/Config.in new file mode 100644 index 0000000000..a5a7b9d255 --- /dev/null +++ b/package/rtl8821cu/Config.in @@ -0,0 +1,10 @@ +comment "rtl8821cu needs a Linux kernel to be built" + depends on !BR2_LINUX_KERNEL + +config BR2_PACKAGE_RTL8821CU + bool "rtl8821cu" + depends on BR2_LINUX_KERNEL + help + rtl8821cu wifi driver + + https://github.com/brektrou/rtl8821CU diff --git a/package/rtl8821cu/rtl8821cu.hash b/package/rtl8821cu/rtl8821cu.hash new file mode 100644 index 0000000000..efb9871472 --- /dev/null +++ b/package/rtl8821cu/rtl8821cu.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 09b9fb4160003502d564d0d0d85d6f19b8b6d1627d1a339b3ddfca6a948d84fb rtl8821cu-86cc5ceb7c28b9b997838e1c796847f6c395c382.tar.gz +sha256 af54d00efc57cfce664171ac8be2a20c0f290b1b5c1a67bb2eba7b6380276c4e LICENSE diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk new file mode 100644 index 0000000000..18222e0014 --- /dev/null +++ b/package/rtl8821cu/rtl8821cu.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# rtl8821cu +# +################################################################################ + +RTL8821CU_VERSION = 86cc5ceb7c28b9b997838e1c796847f6c395c382 +RTL8821CU_SITE = $(call github,morrownr,8821cu-20210118,$(RTL8821CU_VERSION)) +RTL8821CU_LICENSE = GPL-2.0 +RTL8821CU_LICENSE_FILES = LICENSE + +RTL8821CU_USER_EXTRA_CFLAGS = \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error + +RTL8821CU_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_GENERIC=n \ + CONFIG_RTL8821CU=m \ + KVER=$(LINUX_VERSION_PROBED) \ + USER_EXTRA_CFLAGS="$(RTL8821CU_USER_EXTRA_CFLAGS)" + +$(eval $(kernel-module)) +$(eval $(generic-package)) From peter at korsgaard.com Mon Feb 20 20:57:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:17 -0000 Subject: [Buildroot] [git commit branch/next] package/dovecot: bump version to 2.3.20 Message-ID: <20230220205214.A9DB48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de584a78a37b99b99a4011020a17b3ae99f002c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://dovecot.org/pipermail/dovecot-news/2022-December/000479.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 124f834dca..7036df57a8 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 db5abcd87d7309659ea6b45b2cb6ee9c5f97486b2b719a5dd05a759e1f6a5c51 dovecot-2.3.19.1.tar.gz +sha256 caa832eb968148abdf35ee9d0f534b779fa732c0ce4a913d9ab8c3469b218552 dovecot-2.3.20.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 e28f500b7b..4b17784f93 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).19.1 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).20 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 yann.morin.1998 at free.fr Mon Feb 20 20:57:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:18 -0000 Subject: [Buildroot] [git commit branch/next] package/python-django: bump to version 4.1.5 Message-ID: <20230220205234.613E28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=203cf2d8b7e9668ba51dc8a72636896e656e7e1b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 40526bc0ff..1d3035bb98 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 02e2222d064d800f37c6a0ba78ce87f3 Django-4.1.4.tar.gz -sha256 d38a4e108d2386cb9637da66a82dc8d0733caede4c83c4afdbda78af4214211b Django-4.1.4.tar.gz +md5 6b6a47d7478ead15b0a0835841c433dc Django-4.1.5.tar.gz +sha256 ff56ebd7ead0fd5dbe06fe157b0024a7aaea2e0593bb3785fb594cf94dad58ef Django-4.1.5.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 96ec53f82c..e08de68954 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.4 +PYTHON_DJANGO_VERSION = 4.1.5 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/de/7d/ca5d224f7d345b0defd0a57c6deb0c6115fbe5304e4d9571f728b617f1a3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/41/c8/b3c469353f9d1b7f0e99b45520582b891da02cd87408bc867affa6e039a3 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:57:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:18 -0000 Subject: [Buildroot] [git commit branch/next] package/python-keyring: bump to version 23.13.1 Message-ID: <20230220205234.AE83986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c20f5be37a14fb32e4382a37a4cb79eddd0f06e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-keyring/python-keyring.hash | 4 ++-- package/python-keyring/python-keyring.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-keyring/python-keyring.hash b/package/python-keyring/python-keyring.hash index 791ee6563b..837743f5c2 100644 --- a/package/python-keyring/python-keyring.hash +++ b/package/python-keyring/python-keyring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/keyring/json -md5 edf0645c28f16884e2b121b2c51e0770 keyring-23.11.0.tar.gz -sha256 ad192263e2cdd5f12875dedc2da13534359a7e760e77f8d04b50968a821c2361 keyring-23.11.0.tar.gz +md5 a0640ab7525b4fe58061b5999cca5026 keyring-23.13.1.tar.gz +sha256 ba2e15a9b35e21908d0aaf4e0a47acc52d6ae33444df0da2b49d41a46ef6d678 keyring-23.13.1.tar.gz # Locally computed sha256 checksums sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-keyring/python-keyring.mk b/package/python-keyring/python-keyring.mk index c1f124cb3e..766139f525 100644 --- a/package/python-keyring/python-keyring.mk +++ b/package/python-keyring/python-keyring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_KEYRING_VERSION = 23.11.0 +PYTHON_KEYRING_VERSION = 23.13.1 PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz -PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/1c/35/c22960f14f5e17384296b2f09da259f8b5244fb3831eccec71cf948a49c6 +PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/55/fe/282f4c205add8e8bb3a1635cbbac59d6def2e0891b145aa553a0e40dd2d0 PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:57:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:18 -0000 Subject: [Buildroot] [git commit branch/next] package/exfat-utils: add CPE variables Message-ID: <20230220205214.E8E8C81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8036b087489c96dfc4a0baf9fbe284a049a58298 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next cpe:2.3:a:exfat_project:exfat is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aexfat_project%3Aexfat Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/exfat-utils/exfat-utils.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/exfat-utils/exfat-utils.mk b/package/exfat-utils/exfat-utils.mk index d13ec6bab8..fa471952f2 100644 --- a/package/exfat-utils/exfat-utils.mk +++ b/package/exfat-utils/exfat-utils.mk @@ -8,6 +8,8 @@ EXFAT_UTILS_VERSION = 1.3.0 EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION) EXFAT_UTILS_LICENSE = GPL-2.0+ EXFAT_UTILS_LICENSE_FILES = COPYING +EXFAT_UTILS_CPE_ID_VENDOR = exfat_project +EXFAT_UTILS_CPE_ID_PRODUCT = exfat EXFAT_UTILS_CONF_OPTS += --exec-prefix=/ From yann.morin.1998 at free.fr Mon Feb 20 20:57:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:19 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pybind: bump to version 2.10.3 Message-ID: <20230220205235.0251386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4364444cb31f60826e37cf3efa193c78a7c7947f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pybind/python-pybind.hash | 2 +- package/python-pybind/python-pybind.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash index 530cbf64af..971eceaa07 100644 --- a/package/python-pybind/python-pybind.hash +++ b/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad python-pybind-2.10.1.tar.gz +sha256 5d8c4c5dda428d3a944ba3d2a5212cb988c2fae4670d58075a5a49075a6ca315 python-pybind-2.10.3.tar.gz # License files, locally calculated sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index e89d77147e..1fd106b981 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.10.1 +PYTHON_PYBIND_VERSION = 2.10.3 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:57:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:19 -0000 Subject: [Buildroot] [git commit branch/next] package/ncurses: ignore CVE-2022-29458 Message-ID: <20230220205215.49FE281979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a782cfd23109d9e78726bd820cb89c8146f98b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixed in patch 20220416 Signed-off-by: Dennis Van Hoorick Signed-off-by: Yann E. MORIN --- package/ncurses/ncurses.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 79593d8084..4d93a992e4 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -12,6 +12,8 @@ NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING NCURSES_CPE_ID_VENDOR = gnu NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config +# patch 20220416 +NCURSES_IGNORE_CVES += CVE-2022-29458 NCURSES_PATCH = \ $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ ncurses-6.3-20211026.patch.gz \ From yann.morin.1998 at free.fr Mon Feb 20 20:57:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:20 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pydantic: bump to version 1.10.4 Message-ID: <20230220205235.1101A86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7cb432250dafc98b6517cfbe0b7d320426245d0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pydantic/python-pydantic.hash | 4 ++-- package/python-pydantic/python-pydantic.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index a5eb025fcb..e73a3099a8 100644 --- a/package/python-pydantic/python-pydantic.hash +++ b/package/python-pydantic/python-pydantic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic/json -md5 9691f29e97c1280ab56b7d0a2dade9c1 pydantic-1.10.2.tar.gz -sha256 91b8e218852ef6007c2b98cd861601c6a09f1aa32bbbb74fab5b1c33d4a1e410 pydantic-1.10.2.tar.gz +md5 2e036b5f993b93dd83f6a7009252ae78 pydantic-1.10.4.tar.gz +sha256 b9a3859f24eb4e097502a3be1fb4b2abb79b6103dd9e2e0edb70613a4459a648 pydantic-1.10.4.tar.gz # Locally computed sha256 checksums sha256 9e3946690ac88b6b73e8f001a0586af13568be8852fd514e4393f39761764387 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index 04014214e1..a1a4dc9b16 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 1.10.2 +PYTHON_PYDANTIC_VERSION = 1.10.4 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/7d/7d/58dd62f792b002fa28cce4e83cb90f4359809e6d12db86eedf26a752895c +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/53/17/34e54e352f6a3d304044e52d5ddd5cd621a62ec8fb7af08cc73af65dd3e1 PYTHON_PYDANTIC_SETUP_TYPE = setuptools PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:57:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:20 -0000 Subject: [Buildroot] [git commit branch/next] package/hiredis: bump to version 1.1.0 Message-ID: <20230220205214.C3C4C81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd7e90779861bb603fc1cca03f6fad4d951f7bd9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Replace first patch - Drop second and third patches (already in version) https://github.com/redis/hiredis/blob/v1.1.0/CHANGELOG.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-CMakeLists.txt-do-not-force-SHARED.patch | 47 ------ ...-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch | 171 +++++++++++++++++++++ ...s.txt-allow-building-without-a-C-compiler.patch | 57 ------- .../hiredis/0003-Explicitly-set-c99-in-CMake.patch | 28 ---- package/hiredis/hiredis.hash | 2 +- package/hiredis/hiredis.mk | 4 +- 6 files changed, 174 insertions(+), 135 deletions(-) diff --git a/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch b/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch deleted file mode 100644 index b7fdb87910..0000000000 --- a/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0ce382c275b087e866517c003e565f8cc4855bdd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 29 Aug 2020 23:19:26 +0200 -Subject: [PATCH] CMakeLists.txt: do not force SHARED - -Allow the user to build static libraries by removing SHARED from -ADD_LIBRARY calls. - -Here is an extract of -https://cmake.org/cmake/help/latest/command/add_library.html: - -"If no type is given explicitly the type is STATIC or SHARED based on -whether the current value of the variable BUILD_SHARED_LIBS is ON." - -Signed-off-by: Fabrice Fontaine -[Upstream status: probably not upstreamable as is because it will -conflict with https://github.com/redis/hiredis/pull/851. So, this patch -will probably have to be reworked for 1.0.x] ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1beccc6..fed79fd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,7 +40,7 @@ IF(WIN32) - ADD_COMPILE_DEFINITIONS(_CRT_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN) - ENDIF() - --ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) -+ADD_LIBRARY(hiredis ${hiredis_sources}) - - SET_TARGET_PROPERTIES(hiredis - PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE -@@ -97,7 +97,7 @@ IF(ENABLE_SSL) - FIND_PACKAGE(OpenSSL REQUIRED) - SET(hiredis_ssl_sources - ssl.c) -- ADD_LIBRARY(hiredis_ssl SHARED -+ ADD_LIBRARY(hiredis_ssl - ${hiredis_ssl_sources}) - - IF (APPLE) --- -2.28.0 - diff --git a/package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch new file mode 100644 index 0000000000..38e9282041 --- /dev/null +++ b/package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch @@ -0,0 +1,171 @@ +From 286ba29771611abfaf126527141cac1d406c7eaf Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 22 Dec 2022 23:00:56 +0100 +Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS + +To allow building hiredis on toolchain without dynamic library support, +respect standard cmake BUILD_SHARED_LIBS: +https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/redis/hiredis/pull/1147] +--- + CMakeLists.txt | 70 ++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 48 insertions(+), 22 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d52d0c..66a1383 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,6 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0) + ++OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON) + OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF) + OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF) + OPTION(ENABLE_SSL_TESTS "Should we test SSL connections" OFF) +@@ -44,35 +45,49 @@ IF(WIN32) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -DWIN32_LEAN_AND_MEAN) + ENDIF() + +-ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) + ADD_LIBRARY(hiredis_static STATIC ${hiredis_sources}) +-ADD_LIBRARY(hiredis::hiredis ALIAS hiredis) + ADD_LIBRARY(hiredis::hiredis_static ALIAS hiredis_static) ++SET(HIREDIS_DEFAULT_LIBRARY hiredis_static) ++SET(HIREDIS_TARGETS hiredis_static) + + IF(NOT MSVC) + SET_TARGET_PROPERTIES(hiredis_static + PROPERTIES OUTPUT_NAME hiredis) + ENDIF() + +-SET_TARGET_PROPERTIES(hiredis +- PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE +- VERSION "${HIREDIS_SONAME}") ++IF(BUILD_SHARED_LIBS) ++ ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) ++ ADD_LIBRARY(hiredis::hiredis ALIAS hiredis) ++ SET(HIREDIS_DEFAULT_LIBRARY hiredis) ++ SET(HIREDIS_TARGETS ${HIREDIS_TARGETS} hiredis) ++ SET_TARGET_PROPERTIES(hiredis ++ PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE ++ VERSION "${HIREDIS_SONAME}") ++ENDIF() + IF(MSVC) + SET_TARGET_PROPERTIES(hiredis_static + PROPERTIES COMPILE_FLAGS /Z7) + ENDIF() + IF(WIN32 OR MINGW) +- TARGET_LINK_LIBRARIES(hiredis PUBLIC ws2_32 crypt32) ++ IF(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(hiredis PUBLIC ws2_32 crypt32) ++ ENDIF() + TARGET_LINK_LIBRARIES(hiredis_static PUBLIC ws2_32 crypt32) + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +- TARGET_LINK_LIBRARIES(hiredis PUBLIC m) ++ IF(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(hiredis PUBLIC m) ++ ENDIF() + TARGET_LINK_LIBRARIES(hiredis_static PUBLIC m) + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "SunOS") +- TARGET_LINK_LIBRARIES(hiredis PUBLIC socket) ++ IF(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(hiredis PUBLIC socket) ++ ENDIF() + TARGET_LINK_LIBRARIES(hiredis_static PUBLIC socket) + ENDIF() + +-TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $ $) ++IF(BUILD_SHARED_LIBS) ++ TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $ $) ++ENDIF() + TARGET_INCLUDE_DIRECTORIES(hiredis_static PUBLIC $ $) + + CONFIGURE_FILE(hiredis.pc.in hiredis.pc @ONLY) +@@ -103,7 +118,7 @@ set(CPACK_RPM_PACKAGE_AUTOREQPROV ON) + + include(CPack) + +-INSTALL(TARGETS hiredis hiredis_static ++INSTALL(TARGETS ${HIREDIS_TARGETS} + EXPORT hiredis-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -161,39 +176,50 @@ IF(ENABLE_SSL) + FIND_PACKAGE(OpenSSL REQUIRED) + SET(hiredis_ssl_sources + ssl.c) +- ADD_LIBRARY(hiredis_ssl SHARED +- ${hiredis_ssl_sources}) ++ + ADD_LIBRARY(hiredis_ssl_static STATIC + ${hiredis_ssl_sources}) ++ SET(HIREDIS_SSL_DEFAULT_LIBRARY hiredis_ssl_static) ++ SET(HIREDIS_SSL_TARGETS hiredis_ssl_static) ++ IF(BUILD_SHARED_LIBS) ++ ADD_LIBRARY(hiredis_ssl SHARED ++ ${hiredis_ssl_sources}) ++ SET(HIREDIS_SSL_DEFAULT_LIBRARY hiredis_ssl) ++ SET(HIREDIS_SSL_TARGETS ${HIREDIS_SSL_TARGETS} hiredis_ssl) ++ ENDIF() + IF(NOT MSVC) + SET_TARGET_PROPERTIES(hiredis_ssl_static + PROPERTIES OUTPUT_NAME hiredis_ssl) + ENDIF() + +- IF (APPLE) ++ IF (APPLE AND BUILD_SHARED_LIBS) + SET_PROPERTY(TARGET hiredis_ssl PROPERTY LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup") + ENDIF() + +- SET_TARGET_PROPERTIES(hiredis_ssl +- PROPERTIES +- WINDOWS_EXPORT_ALL_SYMBOLS TRUE +- VERSION "${HIREDIS_SONAME}") ++ IF(BUILD_SHARED_LIBS) ++ SET_TARGET_PROPERTIES(hiredis_ssl ++ PROPERTIES ++ WINDOWS_EXPORT_ALL_SYMBOLS TRUE ++ VERSION "${HIREDIS_SONAME}") ++ ENDIF() + IF(MSVC) + SET_TARGET_PROPERTIES(hiredis_ssl_static + PROPERTIES COMPILE_FLAGS /Z7) + ENDIF() + +- TARGET_INCLUDE_DIRECTORIES(hiredis_ssl PRIVATE "${OPENSSL_INCLUDE_DIR}") + TARGET_INCLUDE_DIRECTORIES(hiredis_ssl_static PRIVATE "${OPENSSL_INCLUDE_DIR}") ++ IF(BUILD_SHARED_LIBS) ++ TARGET_INCLUDE_DIRECTORIES(hiredis_ssl PRIVATE "${OPENSSL_INCLUDE_DIR}") ++ TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE ${OPENSSL_LIBRARIES}) ++ ENDIF() + +- TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE ${OPENSSL_LIBRARIES}) + IF (WIN32 OR MINGW) + TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE hiredis) + TARGET_LINK_LIBRARIES(hiredis_ssl_static PUBLIC hiredis_static) + ENDIF() + CONFIGURE_FILE(hiredis_ssl.pc.in hiredis_ssl.pc @ONLY) + +- INSTALL(TARGETS hiredis_ssl hiredis_ssl_static ++ INSTALL(TARGETS ${HIREDIS_SSL_TARGETS} + EXPORT hiredis_ssl-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -236,10 +262,10 @@ ENDIF() + IF(NOT DISABLE_TESTS) + ENABLE_TESTING() + ADD_EXECUTABLE(hiredis-test test.c) +- TARGET_LINK_LIBRARIES(hiredis-test hiredis) ++ TARGET_LINK_LIBRARIES(hiredis-test ${HIREDIS_DEFAULT_LIBRARY}) + IF(ENABLE_SSL_TESTS) + ADD_DEFINITIONS(-DHIREDIS_TEST_SSL=1) +- TARGET_LINK_LIBRARIES(hiredis-test hiredis_ssl) ++ TARGET_LINK_LIBRARIES(hiredis-test ${HIREDIS_SSL_DEFAULT_LIBRARY}) + ENDIF() + IF(ENABLE_ASYNC_TESTS) + ADD_DEFINITIONS(-DHIREDIS_TEST_ASYNC=1) +-- +2.35.1 + diff --git a/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch b/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch deleted file mode 100644 index 08a9ef9854..0000000000 --- a/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch +++ /dev/null @@ -1,57 +0,0 @@ -From bb4a8937411a9e6ac2e5c12c0e7eeaa7dab251ba Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 5 Sep 2020 12:54:21 +0200 -Subject: [PATCH] CMakeLists.txt: allow building without a C++ compiler - -Define hiredis as a C project (and use a single PROJECT statement) to -avoid the following build failure if a C++ compiler is not found: - -CMake Error at CMakeLists.txt:3 (PROJECT): - The CMAKE_CXX_COMPILER: - - /srv/storage/autobuild/run/instance-1/output-1/host/bin/arm-linux-g++ - - is not a full path to an existing compiler tool. - - Tell CMake where to find the compiler by setting either the environment - variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path - to the compiler, or to the compiler name if it is in the PATH. - -The only cpp source file is examples/example-qt.cpp which is never -compiled with cmake buildsystem. This file is compiled only with the -Makefile buildsystem so perhaps it should be removed. If it is added to -the cmake buildsystem, a call to enable_language(CXX) will have to be -added. - -Fixes: - - http://autobuild.buildroot.org/results/830ec3398cd29b9fc5cde06a225ef531d7a9d850 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/redis/hiredis/pull/872] ---- - CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4cbd438..9d65b7f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,5 @@ - CMAKE_MINIMUM_REQUIRED(VERSION 3.4.0) - INCLUDE(GNUInstallDirs) --PROJECT(hiredis) - - OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF) - OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF) -@@ -20,7 +19,7 @@ getVersionBit(HIREDIS_SONAME) - SET(VERSION "${HIREDIS_MAJOR}.${HIREDIS_MINOR}.${HIREDIS_PATCH}") - MESSAGE("Detected version: ${VERSION}") - --PROJECT(hiredis VERSION "${VERSION}") -+PROJECT(hiredis LANGUAGES "C" VERSION "${VERSION}") - - # Hiredis requires C99 - SET(CMAKE_C_STANDARD 99) --- -2.28.0 - diff --git a/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch b/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch deleted file mode 100644 index 7e6ef8bca4..0000000000 --- a/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 13a35bdb64615e381c5e1151cdd4e78bba71a6db Mon Sep 17 00:00:00 2001 -From: michael-grunder -Date: Fri, 28 Aug 2020 12:35:01 -0700 -Subject: [PATCH] Explicitly set c99 in CMake - -See #869 - -[Retrieved from: -https://github.com/redis/hiredis/commit/13a35bdb64615e381c5e1151cdd4e78bba71a6db] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1beccc69a..4cbd438d7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,6 +22,9 @@ MESSAGE("Detected version: ${VERSION}") - - PROJECT(hiredis VERSION "${VERSION}") - -+# Hiredis requires C99 -+SET(CMAKE_C_STANDARD 99) -+ - SET(ENABLE_EXAMPLES OFF CACHE BOOL "Enable building hiredis examples") - - SET(hiredis_sources diff --git a/package/hiredis/hiredis.hash b/package/hiredis/hiredis.hash index a45cf68f99..cdcbef1525 100644 --- a/package/hiredis/hiredis.hash +++ b/package/hiredis/hiredis.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e0ab696e2f07deb4252dda45b703d09854e53b9703c7d52182ce5a22616c3819 hiredis-1.0.2.tar.gz +sha256 fe6d21741ec7f3fc9df409d921f47dfc73a4d8ff64f4ac6f1d95f951bf7f53d6 hiredis-1.1.0.tar.gz sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb COPYING diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index a571951fa3..d59933845c 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -4,8 +4,8 @@ # ################################################################################ -HIREDIS_VERSION_MAJOR = 1.0 -HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).2 +HIREDIS_VERSION_MAJOR = 1.1 +HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).0 HIREDIS_SITE = $(call github,redis,hiredis,v$(HIREDIS_VERSION)) HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:57:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:21 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pyopenssl: bump to version 23.0.0 Message-ID: <20230220205235.3F7C186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=208bf69626d25761f6e502b967b6d8ecf7d5df00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyopenssl/python-pyopenssl.hash | 4 ++-- package/python-pyopenssl/python-pyopenssl.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash index bc65bb5868..f9b1e4a86b 100644 --- a/package/python-pyopenssl/python-pyopenssl.hash +++ b/package/python-pyopenssl/python-pyopenssl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyopenssl/json -md5 6834da75e33d3c8dcd891b723bfcec9e pyOpenSSL-22.1.0.tar.gz -sha256 7a83b7b272dd595222d672f5ce29aa030f1fb837630ef229f62e72e395ce8968 pyOpenSSL-22.1.0.tar.gz +md5 1be2c02bf3c0c4e5e7c51b9ac90ebd72 pyOpenSSL-23.0.0.tar.gz +sha256 c1cc5f86bcacefc84dada7d31175cae1b1518d5f60d3d0bb595a67822a868a6f pyOpenSSL-23.0.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-pyopenssl/python-pyopenssl.mk b/package/python-pyopenssl/python-pyopenssl.mk index 85f856b319..1d89f5b696 100644 --- a/package/python-pyopenssl/python-pyopenssl.mk +++ b/package/python-pyopenssl/python-pyopenssl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYOPENSSL_VERSION = 22.1.0 +PYTHON_PYOPENSSL_VERSION = 23.0.0 PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/e7/2f/c6d89edac75482f11e231b644e365d31d5479b7b727734e6a8f3d00decd5 +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/af/6e/0706d5e0eac08fcff586366f5198c9bf0a8b46f0f45b1858324e0d94c295 PYTHON_PYOPENSSL_LICENSE = Apache-2.0 PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE PYTHON_PYOPENSSL_CPE_ID_VENDOR = pyopenssl From peter at korsgaard.com Mon Feb 20 20:57:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:21 -0000 Subject: [Buildroot] [git commit branch/next] package/xtables-addons: bump to version 3.22 Message-ID: <20230220205214.CFBC38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53f2999edfa5e67923d4d8a102c15fa3200e089c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Support for up to Linux 6.1 by fixing the following build failure: /tmp/instance-5/output-1/build/xtables-addons-3.21/extensions/xt_CHAOS.c: In function ???xt_chaos_total???: /tmp/instance-5/output-1/build/xtables-addons-3.21/extensions/xt_CHAOS.c:70:46: error: implicit declaration of function ???prandom_u32???; did you mean ???prandom_u32_max???? [-Werror=implicit-function-declaration] 70 | if (!ret || hotdrop || (unsigned int)prandom_u32() > delude_percentage) | ^~~~~~~~~~~ | prandom_u32_max https://fossies.org/linux/privat/xtables-addons-3.22.tar.xz/xtables-addons-3.22/doc/changelog.rst Fixes: - http://autobuild.buildroot.org/results/4564ba888156710819f6bd86117e0c0bdd513dba Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/xtables-addons/xtables-addons.hash | 2 +- package/xtables-addons/xtables-addons.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xtables-addons/xtables-addons.hash b/package/xtables-addons/xtables-addons.hash index 0d2434eeb1..840a31f947 100644 --- a/package/xtables-addons/xtables-addons.hash +++ b/package/xtables-addons/xtables-addons.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2e09ac129a14f5e9c23b115ebcdfff4aa84e2aeba1268dbdf39b2d752bd71e19 xtables-addons-3.21.tar.xz +sha256 faa16a27166275afbfe8df605f55c3a81ac693bf19da674d45ceded4137ae217 xtables-addons-3.22.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 83cc3266c4..77dcfd741c 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTABLES_ADDONS_VERSION = 3.21 +XTABLES_ADDONS_VERSION = 3.22 XTABLES_ADDONS_SOURCE = xtables-addons-$(XTABLES_ADDONS_VERSION).tar.xz XTABLES_ADDONS_SITE = https://inai.de/files/xtables-addons XTABLES_ADDONS_DEPENDENCIES = iptables linux host-pkgconf From yann.morin.1998 at free.fr Mon Feb 20 20:57:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:22 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pyrsistent: bump to version 0.19.3 Message-ID: <20230220205235.4D23A86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b6a466ea306d0e760b35fe84330d7f57a3a624b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyrsistent/python-pyrsistent.hash | 4 ++-- package/python-pyrsistent/python-pyrsistent.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyrsistent/python-pyrsistent.hash b/package/python-pyrsistent/python-pyrsistent.hash index bb55c7135d..d5c9a22656 100644 --- a/package/python-pyrsistent/python-pyrsistent.hash +++ b/package/python-pyrsistent/python-pyrsistent.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyrsistent/json -md5 23da81256b8817e123568a858bf78997 pyrsistent-0.19.2.tar.gz -sha256 bfa0351be89c9fcbcb8c9879b826f4353be10f58f8a677efab0c017bf7137ec2 pyrsistent-0.19.2.tar.gz +md5 761266eab1f9dc9280cdb0a6d2dedb08 pyrsistent-0.19.3.tar.gz +sha256 1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440 pyrsistent-0.19.3.tar.gz # Locally computed sha256 checksums sha256 3ea56753cbd0cc897d3f4414a902f5694991db7c1b3abb8230216381185f9112 LICENSE.mit diff --git a/package/python-pyrsistent/python-pyrsistent.mk b/package/python-pyrsistent/python-pyrsistent.mk index 6a5ac30a15..f3457feebe 100644 --- a/package/python-pyrsistent/python-pyrsistent.mk +++ b/package/python-pyrsistent/python-pyrsistent.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYRSISTENT_VERSION = 0.19.2 +PYTHON_PYRSISTENT_VERSION = 0.19.3 PYTHON_PYRSISTENT_SOURCE = pyrsistent-$(PYTHON_PYRSISTENT_VERSION).tar.gz -PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/b8/ef/325da441a385a8a931b3eeb70db23cb52da42799691988d8d943c5237f10 +PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/bf/90/445a7dbd275c654c268f47fa9452152709134f61f09605cf776407055a89 PYTHON_PYRSISTENT_SETUP_TYPE = setuptools PYTHON_PYRSISTENT_LICENSE = MIT PYTHON_PYRSISTENT_LICENSE_FILES = LICENSE.mit From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:31 -0000 Subject: [Buildroot] [git commit branch/next] support/tests: print failed command and output on assertRunOK error Message-ID: <20230220205216.38F11828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44161560dd52ebe9a41ee6e5ec8cacb2a9fe48ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Currently, when asserting that a command succeeded, we just capture the return code of the command. If that is not zero, the assertion fails, but the error message is not very splicit: AssertionError: 1 != 0 Replace the error message with an explicit message that dumps the failed command, the error code, and the resulting output. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/testing/infra/basetest.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 96c6848dfc..45bcd4c2e2 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -88,7 +88,12 @@ class BRTest(BRConfigTest): super(BRTest, self).tearDown() # Run the given 'cmd' with a 'timeout' on the target and - # assert that the command succeeded + # assert that the command succeeded; on error, print the + # faulty command and its output def assertRunOk(self, cmd, timeout=-1): - _, exit_code = self.emulator.run(cmd, timeout) - self.assertEqual(exit_code, 0) + out, exit_code = self.emulator.run(cmd, timeout) + self.assertEqual( + exit_code, + 0, + "\nFailed to run: {}\noutput was:\n{}".format(cmd, ' '+'\n '.join(out)) + ) From peter at korsgaard.com Mon Feb 20 20:57:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:31 -0000 Subject: [Buildroot] [git commit branch/next] package/apache: security bump version to 2.4.55 Message-ID: <20230220205237.204628648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60d8585570c8caf3267c702b902bbe847d713342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.apache.org/thread/xlp3od60fjl8nl44z4f56y0lhs7pglos Fixes CVE-2006-20001, CVE-2022-36760, CVE-2022-37436: https://httpd.apache.org/security/vulnerabilities_24.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 4 ++-- package/apache/apache.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 2c21a5bab8..a1185c5618 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ # From https://downloads.apache.org/httpd/httpd-2.4.54.tar.bz2.{sha256,sha512} -sha256 eb397feeefccaf254f8d45de3768d9d68e8e73851c49afd5b7176d1ecf80c340 httpd-2.4.54.tar.bz2 -sha512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18 httpd-2.4.54.tar.bz2 +sha256 11d6ba19e36c0b93ca62e47e6ffc2d2f2884942694bce0f23f39c71bdc5f69ac httpd-2.4.55.tar.bz2 +sha512 94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb httpd-2.4.55.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 315282baac..13018a9b1f 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.54 +APACHE_VERSION = 2.4.55 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 From peter at korsgaard.com Mon Feb 20 20:57:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:32 -0000 Subject: [Buildroot] [git commit branch/next] package/sudo: security bump to version 1.9.12p2 Message-ID: <20230220205237.2C93886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51e98499ff54496126d89e34751297ea9e1f61bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix https://nvd.nist.gov/vuln/detail/CVE-2023-22809 Signed-off-by: Yair Ben-Avraham Signed-off-by: Peter Korsgaard --- package/sudo/sudo.hash | 2 +- package/sudo/sudo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index a3476df96b..c920b9fe74 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,4 +1,4 @@ # From: https://www.sudo.ws/getting/download/ -sha256 475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8 sudo-1.9.12p1.tar.gz +sha256 b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539 sudo-1.9.12p2.tar.gz # Locally calculated sha256 d2f93a3b17ed5586fddd07be33ad767146c1a81a22682baa68bb4360a31d020a LICENSE.md diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index a16b6863aa..c4eaafa6b1 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -5,7 +5,7 @@ ################################################################################ SUDO_VERSION_MAJOR = 1.9.12 -SUDO_VERSION_MINOR = p1 +SUDO_VERSION_MINOR = p2 SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:32 -0000 Subject: [Buildroot] [git commit branch/next] package/orc: bump to version 0.4.33 Message-ID: <20230220205216.6C0CF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92a4f080b2721cc84248ebc98d41229469787688 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch (already in version) https://gitlab.freedesktop.org/gstreamer/orc/-/blob/0.4.33/RELEASE Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ccpu-powerpc.c-fix-build-with-kernel-4.11.patch | 70 ---------------------- package/orc/orc.hash | 4 +- package/orc/orc.mk | 2 +- 3 files changed, 3 insertions(+), 73 deletions(-) diff --git a/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch b/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch deleted file mode 100644 index 0a4e7010f2..0000000000 --- a/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a45f6d49ec090ad94333c0865c378d2d96ab2af4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 15 Feb 2021 20:17:43 +0100 -Subject: [PATCH] orc/orccpu-powerpc.c: fix build with kernel < 4.11 - -Build with powerpc and kernel < 4.11 is broken since version 0.4.30 and -https://gitlab.freedesktop.org/gstreamer/orc/-/commit/a999325abea6a5549d60d99ddeb0271d2aa00235: - -FAILED: orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/powerpc-linux-gcc -Iorc/liborc-0.4.so.0.32.0.p -Iorc -I../orc -I. -I.. -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -std=gnu99 -O3 -DHAVE_CONFIG_H -fvisibility=hidden -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -fPIC -pthread -DORC_ENABLE_UNSTABLE_API -D_GNU_SOURCE -DBUILDING_ORC -MD -MQ orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -MF orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o.d -o orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -c ../orc/orccpu-powerpc.c -../orc/orccpu-powerpc.c: In function 'orc_check_powerpc_proc_auxv': -../orc/orccpu-powerpc.c:164:21: error: 'AT_L1D_CACHESIZE' undeclared (first use in this function); did you mean 'AT_DCACHEBSIZE'? - 164 | if (buf[i] == AT_L1D_CACHESIZE) { - | ^~~~~~~~~~~~~~~~ - | AT_DCACHEBSIZE -../orc/orccpu-powerpc.c:164:21: note: each undeclared identifier is reported only once for each function it appears in -../orc/orccpu-powerpc.c:168:21: error: 'AT_L2_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'? - 168 | if (buf[i] == AT_L2_CACHESIZE) { - | ^~~~~~~~~~~~~~~ - | AT_ICACHEBSIZE -../orc/orccpu-powerpc.c:172:21: error: 'AT_L3_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'? - 172 | if (buf[i] == AT_L3_CACHESIZE) { - | ^~~~~~~~~~~~~~~ - | AT_ICACHEBSIZE - -Indeed, AT_{L1D,L2,L3}_CACHESIZE is only defined since kernel 4.11 and -https://github.com/torvalds/linux/commit/98a5f361b8625c6f4841d6ba013bbf0e80d08147 - -Fixes: - - http://autobuild.buildroot.org/results/0821e96cba3e455edd47b87485501d892fc7ac6a - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/56] ---- - orc/orccpu-powerpc.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/orc/orccpu-powerpc.c b/orc/orccpu-powerpc.c -index 6796f17..340cf05 100644 ---- a/orc/orccpu-powerpc.c -+++ b/orc/orccpu-powerpc.c -@@ -161,18 +161,24 @@ orc_check_powerpc_proc_auxv (void) - _orc_cpu_name = (char*)buf[i + 1]; - found++; - } -+#ifdef AT_L1D_CACHESIZE - if (buf[i] == AT_L1D_CACHESIZE) { - _orc_data_cache_size_level1 = buf[i + 1]; - found++; - } -+#endif -+#ifdef AT_L2_CACHESIZE - if (buf[i] == AT_L2_CACHESIZE) { - _orc_data_cache_size_level2 = buf[i + 1]; - found++; - } -+#endif -+#ifdef AT_L3_CACHESIZE - if (buf[i] == AT_L3_CACHESIZE) { - _orc_data_cache_size_level3 = buf[i + 1]; - found++; - } -+#endif - if (found == 6) - break; - } --- -2.30.0 - diff --git a/package/orc/orc.hash b/package/orc/orc.hash index f48c2932ab..136fc3ece4 100644 --- a/package/orc/orc.hash +++ b/package/orc/orc.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.32.tar.xz.sha256sum -sha256 a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0 orc-0.4.32.tar.xz +# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.33.tar.xz.sha256sum +sha256 844e6d7db8086f793f57618d3d4b68d29d99b16034e71430df3c21cfd3c3542a orc-0.4.33.tar.xz # Locally calculated sha256 4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf COPYING diff --git a/package/orc/orc.mk b/package/orc/orc.mk index a93a4f875a..be718e6f85 100644 --- a/package/orc/orc.mk +++ b/package/orc/orc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ORC_VERSION = 0.4.32 +ORC_VERSION = 0.4.33 ORC_SOURCE = orc-$(ORC_VERSION).tar.xz ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc ORC_LICENSE = BSD-2-Clause, BSD-3-Clause From peter at korsgaard.com Mon Feb 20 20:57:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:33 -0000 Subject: [Buildroot] [git commit branch/next] package/git: security bump to version 2.39.1 Message-ID: <20230220205237.54F658648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d18ef6a0cbe81c01118f12c72eb99c09fce0994 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - fixes CVE-2022-41903 and CVE-2022-23521 For details see [1]. [1] https://lore.kernel.org/git/xmqq7cxl9h0i.fsf at gitster.g/ Signed-off-by: Peter Seiderer Tested-by: Bagas Sanjaya [Peter: Mark as security bump] Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 57a77b2810..75398896e5 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 ba199b13fb5a99ca3dec917b0bd736bc0eb5a9df87737d435eddfdf10d69265b git-2.39.0.tar.xz +sha256 40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161 git-2.39.1.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 9918d4c1ef..1d728e1964 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.39.0 +GIT_VERSION = 2.39.1 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:33 -0000 Subject: [Buildroot] [git commit branch/next] package/libkcapi: Fix symver build error on non-ELF platforms Message-ID: <20230220205216.433138648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=216e201cd0f14aacac2e9727e8da8f64d734a064 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The following error is observed on Microblaze [1] build: ``` error: symver is only supported on ELF platforms ``` due to using __attribute__((symver)) on non-ELF platform. So, revert to using .symver in such case. Fixes: http://autobuild.buildroot.net/results/4470efb5a078c0e368f6bd4f5ec455eea5eeebb5/ Upstream status: commit f630ed1f807e26de04b3a5dfd7f1b39d1c5cb642 https://github.com/smuellerDD/libkcapi/pull/147 Signed-off-by: Tan En De Signed-off-by: Thomas Petazzoni --- ...x-symver-build-error-on-non-ELF-platforms.patch | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch b/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch new file mode 100644 index 0000000000..206ac7ec4a --- /dev/null +++ b/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch @@ -0,0 +1,84 @@ +From f630ed1f807e26de04b3a5dfd7f1b39d1c5cb642 Mon Sep 17 00:00:00 2001 +From: Tan En De +Date: Sat, 26 Nov 2022 07:47:39 +0800 +Subject: [PATCH] Fix symver build error on non-ELF platforms + +The following error is observed on Microblaze [1] build: +``` +error: symver is only supported on ELF platforms +``` +due to using __attribute__((symver)) on non-ELF platform. +So, revert to using .symver in such case. + +[1]: http://autobuild.buildroot.net/results/447/4470efb5a078c0e368f6bd4f5ec455eea5eeebb5/build-end.log + +Signed-off-by: Tan En De +Signed-off-by: Stephan Mueller +--- +Upstream status: commit f630ed1f807e26de04b3a5dfd7f1b39d1c5cb642 + + configure.ac | 2 ++ + lib/internal.h | 2 +- + m4/ac_check_attribute_symver.m4 | 24 ++++++++++++++++++++++++ + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 m4/ac_check_attribute_symver.m4 + +diff --git a/configure.ac b/configure.ac +index e230577..ba17404 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,6 +76,8 @@ AX_ADD_FORTIFY_SOURCE + + AC_CHECK_API_VERSION + ++AC_CHECK_ATTRIBUTE_SYMVER ++ + AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror], [Disable -Werror])], [with_werror=$enableval], [with_werror=yes]) + AM_CONDITIONAL([ENABLE_WERROR], [test "x$with_werror" = "xyes"]) + +diff --git a/lib/internal.h b/lib/internal.h +index 14844a9..7977b04 100644 +--- a/lib/internal.h ++++ b/lib/internal.h +@@ -352,7 +352,7 @@ static inline int io_getevents(__attribute__((unused)) aio_context_t ctx, + * Auxiliary macros + ************************************************************/ + +-#if __GNUC__ >= 10 ++#if HAVE_ATTRIBUTE_SYMVER && __GNUC__ >= 10 + # define IMPL_SYMVER(name, version) \ + __attribute__((__symver__("kcapi_" #name "@@LIBKCAPI_" version))) + +diff --git a/m4/ac_check_attribute_symver.m4 b/m4/ac_check_attribute_symver.m4 +new file mode 100644 +index 0000000..b484c5e +--- /dev/null ++++ b/m4/ac_check_attribute_symver.m4 +@@ -0,0 +1,24 @@ ++dnl Check compiler support for symver function attribute ++AC_DEFUN([AC_CHECK_ATTRIBUTE_SYMVER], [ ++ saved_CFLAGS=$CFLAGS ++ CFLAGS="-O0 -Werror" ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[ ++ void _test_attribute_symver(void); ++ __attribute__((__symver__("sym at VER_1.2.3"))) void _test_attribute_symver(void) {} ++ ]], ++ [[ ++ _test_attribute_symver() ++ ]] ++ )], ++ [ ++ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 if __attribute__((symver)) is supported]) ++ ], ++ [ ++ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 0, [Define to 0 if __attribute__((symver)) is not supported]) ++ ] ++ ) ++ CFLAGS=$saved_CFLAGS ++]) ++ +-- +2.34.1 + From peter at korsgaard.com Mon Feb 20 20:57:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:34 -0000 Subject: [Buildroot] [git commit branch/next] package/flashrom: bump to version 1.2.1 Message-ID: <20230220205237.6192F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a49f00010da29e904c07debea9fd1ab54f2f6c50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch (already in version) https://github.com/flashrom/flashrom/compare/v1.2...v1.2.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...01-Makefile-Fix-building-on-AArch64-NixOS.patch | 95 ---------------------- package/flashrom/flashrom.hash | 4 +- package/flashrom/flashrom.mk | 2 +- 3 files changed, 3 insertions(+), 98 deletions(-) diff --git a/package/flashrom/0001-Makefile-Fix-building-on-AArch64-NixOS.patch b/package/flashrom/0001-Makefile-Fix-building-on-AArch64-NixOS.patch deleted file mode 100644 index f835172e61..0000000000 --- a/package/flashrom/0001-Makefile-Fix-building-on-AArch64-NixOS.patch +++ /dev/null @@ -1,95 +0,0 @@ -From da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d Mon Sep 17 00:00:00 2001 -From: Pyry Kontio -Date: Mon, 6 Jul 2020 12:57:35 +0900 -Subject: [PATCH] Makefile: Fix building on AArch64 NixOS - -The parsing of the output of archtest.c produced an unexpected -value on AArch64 NixOS. For example, the make variable ARCH was set to: - -``` -bit outside of fd_set selected -arm -``` - -This made the arch and OS checks fail. - -This commit simplifies the parsing, making it more robust. - -The C files archtest.c, endiantest.c and os.h used to set the -TARGET_OS, ARCH and ENDIAN variables, respectively, output -the result of the test as the final line, so just extracting -the final line and removing double quoting is enough. - -This commit also fixes a bug with debug_shell lacking escaping -single quotes, which prevented using the single quote in the -debug_shell calls. It used to work by accident before this fix; -the line in the call happened to contain a balanced pair of double -quotes and lacked other characters that needed escaping, which -didn't break the debug_shell, but this was accidental and very -brittle. - -Signed-off-by: Pyry Kontio -Change-Id: Iaa4477a71e758cf9ecad2c22f3b77bc6508a3510 -Reviewed-on: https://review.coreboot.org/c/flashrom/+/43140 -Tested-by: build bot (Jenkins) -Reviewed-by: Angel Pons - -[Retrieved from: -https://github.com/flashrom/flashrom/commit/da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d] -Signed-off-by: Fabrice Fontaine ---- - Makefile | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index f3f7717e2..e475cbdbd 100644 ---- a/Makefile -+++ b/Makefile -@@ -83,7 +83,8 @@ dummy_for_make_3_80:=$(shell printf "Build started on %s\n\n" "$$(date)" >$(BUIL - - # Provide an easy way to execute a command, print its output to stdout and capture any error message on stderr - # in the build details file together with the original stdout output. --debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(1) ; }' >&2; { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE)) -+debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(subst ','\'',$(1)) ; }' >&2; \ -+ { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE)) - - ############################################################################### - # General OS-specific settings. -@@ -106,7 +107,8 @@ endif - # IMPORTANT: The following line must be placed before TARGET_OS is ever used - # (of course), but should come after any lines setting CC because the line - # below uses CC itself. --override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) -+override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null \ -+ | tail -1 | cut -f 2 -d'"')) - - ifeq ($(TARGET_OS), Darwin) - override CPPFLAGS += -I/opt/local/include -I/usr/local/include -@@ -490,8 +492,10 @@ endif - # IMPORTANT: The following line must be placed before ARCH is ever used - # (of course), but should come after any lines setting CC because the line - # below uses CC itself. --override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) --override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null | grep -v '^\#')) -+override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null \ -+ | tail -1 | cut -f 2 -d'"')) -+override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ -+ | tail -1)) - - # Disable the internal programmer on unsupported architectures (everything but x86 and mipsel) - ifneq ($(ARCH)-little, $(filter $(ARCH),x86 mips)-$(ENDIAN)) -@@ -1299,12 +1303,12 @@ compiler: featuresavailable - @printf "Target arch is " - @# FreeBSD wc will output extraneous whitespace. - @echo $(ARCH)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ -- ( echo "unknown. Aborting."; exit 1) -+ ( echo "unknown (\"$(ARCH)\"). Aborting."; exit 1) - @printf "%s\n" '$(ARCH)' - @printf "Target OS is " - @# FreeBSD wc will output extraneous whitespace. - @echo $(TARGET_OS)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ -- ( echo "unknown. Aborting."; exit 1) -+ ( echo "unknown (\"$(TARGET_OS)\"). Aborting."; exit 1) - @printf "%s\n" '$(TARGET_OS)' - ifeq ($(TARGET_OS), libpayload) - @$(CC) --version 2>&1 | grep -q coreboot || \ diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash index 97df4fe9a4..2ab463d93a 100644 --- a/package/flashrom/flashrom.hash +++ b/package/flashrom/flashrom.hash @@ -1,4 +1,4 @@ # Locally computed after checking pgp signature -# https://download.flashrom.org/releases/flashrom-v1.2.tar.bz2.asc -sha256 e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b flashrom-v1.2.tar.bz2 +# https://download.flashrom.org/releases/flashrom-v1.2.1.tar.bz2.asc +sha256 89a7ff5beb08c89b8795bbd253a51b9453547a864c31793302296b56bbc56d65 flashrom-v1.2.1.tar.bz2 sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 5554082bca..dd505987ed 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLASHROM_VERSION = 1.2 +FLASHROM_VERSION = 1.2.1 FLASHROM_SOURCE = flashrom-v$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = https://download.flashrom.org/releases FLASHROM_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:34 -0000 Subject: [Buildroot] [git commit branch/next] package/jitterentropy-library: bump to version 3.4.1 Message-ID: <20230220205216.795978648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8807ddbe269ef9aeee7b72f6d0a64719f8e6782 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patch (already in version) - Update hash of LICENSE file (year updated with https://github.com/smuellerDD/jitterentropy-library/commit/2e5019cfe63038faaa405ce53715effe4ea580e4) https://github.com/smuellerDD/jitterentropy-library/blob/v3.4.1/CHANGES.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch | 52 ---------------------- .../jitterentropy-library.hash | 4 +- .../jitterentropy-library/jitterentropy-library.mk | 2 +- 3 files changed, 3 insertions(+), 55 deletions(-) diff --git a/package/jitterentropy-library/0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch b/package/jitterentropy-library/0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch deleted file mode 100644 index c4388663b0..0000000000 --- a/package/jitterentropy-library/0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 272ee47892563e849f6b1bf59b0173f8aa33b631 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Dec 2021 11:36:13 +0100 -Subject: [PATCH] Makefile: add ENABLE_STACK_PROTECTOR - -Add ENABLE_STACK_PROTECTOR as build on embedded toolchains without -stack-protector is again broken since -https://github.com/smuellerDD/jitterentropy-library/commit/5b3cb7f35e41ba2f34a75d004cf095c965a1a0c4: - -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: src/jitterentropy-base.o: in function `jent_fips_enabled': -jitterentropy-base.c:(.text+0x131): undefined reference to `__stack_chk_fail_local' - -Fixes: - - http://autobuild.buildroot.org/results/8dee462d16d934dd173d58f17933c6911e4336bf - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Stephan Mueller -[Retrieved from: -https://github.com/smuellerDD/jitterentropy-library/commit/272ee47892563e849f6b1bf59b0173f8aa33b631] ---- - Makefile | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index dfb96a8..c999ef5 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,6 +2,7 @@ - - CC ?= gcc - #Hardening -+ENABLE_STACK_PROTECTOR ?= 1 - CFLAGS ?= -fwrapv --param ssp-buffer-size=4 -fvisibility=hidden -fPIE -Wcast-align -Wmissing-field-initializers -Wshadow -Wswitch-enum - CFLAGS +=-Wextra -Wall -pedantic -fPIC -O0 -fwrapv -Wconversion - LDFLAGS +=-Wl,-z,relro,-z,now -lpthread -@@ -13,10 +14,12 @@ else - GCC_GTEQ_490 := $(shell expr `$(CC) -dumpfullversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40900) - endif - --ifeq "$(GCC_GTEQ_490)" "1" -- CFLAGS += -fstack-protector-strong --else -- CFLAGS += -fstack-protector-all -+ifeq "$(ENABLE_STACK_PROTECTOR)" "1" -+ ifeq "$(GCC_GTEQ_490)" "1" -+ CFLAGS += -fstack-protector-strong -+ else -+ CFLAGS += -fstack-protector-all -+ endif - endif - - # Change as necessary diff --git a/package/jitterentropy-library/jitterentropy-library.hash b/package/jitterentropy-library/jitterentropy-library.hash index 760befab53..c7833f1428 100644 --- a/package/jitterentropy-library/jitterentropy-library.hash +++ b/package/jitterentropy-library/jitterentropy-library.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9fcc954763a1dd4afe614a1b360f53b600d3376bbcc4b19177f27abf191ebad5 jitterentropy-library-3.3.1.tar.xz -sha256 7e06574ff822594269083a796d06fa4e5e78c40efe5ca01a72d2a4662e8206df LICENSE +sha256 802f025f766c38abf663fd5a21482b8313b6d6e2c68c36a4ffd6bc105fe975ab jitterentropy-library-3.4.1.tar.xz +sha256 7a89069066f6c0b8767d3256e5ec5d765b2c7f3354a5a06fc8d5bd7b8103d8a3 LICENSE sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 LICENSE.bsd sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE.gplv2 diff --git a/package/jitterentropy-library/jitterentropy-library.mk b/package/jitterentropy-library/jitterentropy-library.mk index 4cdebf46a3..f405082d08 100644 --- a/package/jitterentropy-library/jitterentropy-library.mk +++ b/package/jitterentropy-library/jitterentropy-library.mk @@ -4,7 +4,7 @@ # ################################################################################ -JITTERENTROPY_LIBRARY_VERSION = 3.3.1 +JITTERENTROPY_LIBRARY_VERSION = 3.4.1 JITTERENTROPY_LIBRARY_SOURCE = \ jitterentropy-library-$(JITTERENTROPY_LIBRARY_VERSION).tar.xz JITTERENTROPY_LIBRARY_SITE = http://www.chronox.de/jent From yann.morin.1998 at free.fr Mon Feb 20 20:57:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:35 -0000 Subject: [Buildroot] [git commit branch/next] package/bitstream-vera: switch to https download Message-ID: <20230220205237.845CF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d3690e8628c29d96993e981a9cc8ef05f22a3cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/bitstream-vera/bitstream-vera.hash | 2 +- package/bitstream-vera/bitstream-vera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bitstream-vera/bitstream-vera.hash b/package/bitstream-vera/bitstream-vera.hash index bb31b17a4a..54deb2661c 100644 --- a/package/bitstream-vera/bitstream-vera.hash +++ b/package/bitstream-vera/bitstream-vera.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2.sha256sum +# From https://download.gnome.org/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2.sha256sum sha256 db5b27df7bbb318036ebdb75acd3e98f1bd6eb6608fb70a67d478cd243d178dc ttf-bitstream-vera-1.10.tar.bz2 # locally computed sha256 3361d054759a2fc686a2c058be82deaf9c2e6fe549be9004d7935a6c1736315d COPYRIGHT.TXT diff --git a/package/bitstream-vera/bitstream-vera.mk b/package/bitstream-vera/bitstream-vera.mk index f487d637c2..2c9dc1a5cb 100644 --- a/package/bitstream-vera/bitstream-vera.mk +++ b/package/bitstream-vera/bitstream-vera.mk @@ -5,7 +5,7 @@ ################################################################################ BITSTREAM_VERA_VERSION = 1.10 -BITSTREAM_VERA_SITE = http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/$(BITSTREAM_VERA_VERSION) +BITSTREAM_VERA_SITE = https://download.gnome.org/sources/ttf-bitstream-vera/$(BITSTREAM_VERA_VERSION) BITSTREAM_VERA_SOURCE = ttf-bitstream-vera-$(BITSTREAM_VERA_VERSION).tar.bz2 BITSTREAM_VERA_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/ttf-bitstream-vera BITSTREAM_VERA_LICENSE = BitstreamVera From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:35 -0000 Subject: [Buildroot] [git commit branch/next] package/upx: bump to version 4.0.1 Message-ID: <20230220205216.93080828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1567516d8984a4bddfbee30ee69c771cf3f8e224 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patch (already in version) - cmake must be used since https://github.com/upx/upx/commit/c7d8b6fed1b551158540e1d2e884dc224fce474c - ucl and zlib are directly included in upx since https://github.com/upx/upx/commit/61e1366122f8d1b9e2434a8103e7af00a35ea902 https://github.com/upx/upx/blob/v4.0.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...1-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch | 80 ---------------------- package/upx/upx.hash | 2 +- package/upx/upx.mk | 22 +----- 3 files changed, 4 insertions(+), 100 deletions(-) diff --git a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch b/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch deleted file mode 100644 index 6fae9cac0e..0000000000 --- a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001 -From: John Reiser -Date: Fri, 11 Dec 2020 13:38:18 -0800 -Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ - -https://github.com/upx/upx/issues/421 - modified: p_lx_elf.cpp - -[Retrieved from: -https://github.com/upx/upx/commit/3781df9da23840e596d5e9e8493f22666802fe6c] -Signed-off-by: Fabrice Fontaine ---- - src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 5 deletions(-) - -diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp -index 182db192f..3a4101cf7 100644 ---- a/src/p_lx_elf.cpp -+++ b/src/p_lx_elf.cpp -@@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack() - int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ]; - if (z_rel && z_rsz) { - unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val); -+ if ((unsigned)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_REL] %#x\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off]; - unsigned relsz = get_te32(&dynseg[-1+ z_rsz].d_val); -+ if ((unsigned)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_RELSZ] %#x\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp); - for (; rp < last; ++rp) { - unsigned r_va = get_te32(&rp->r_offset); -@@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack() - int z_rel = dt_table[Elf64_Dyn::DT_RELA]; - int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ]; - if (z_rel && z_rsz) { -- unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ if ((u64_t)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELA] %#llx\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off]; -- unsigned relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ upx_uint64_t relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ if ((u64_t)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELASZ] %#llx\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp); - for (; rp < last; ++rp) { -- unsigned r_va = get_te64(&rp->r_offset); -+ upx_uint64_t r_va = get_te64(&rp->r_offset); - if (r_va == user_init_ava) { // found the Elf64_Rela -- unsigned r_info = get_te64(&rp->r_info); -+ upx_uint64_t r_info = get_te64(&rp->r_info); - unsigned r_type = ELF64_R_TYPE(r_info); - if (Elf64_Ehdr::EM_AARCH64 == e_machine - && R_AARCH64_RELATIVE == r_type) { -@@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack() - } - else { - char msg[50]; snprintf(msg, sizeof(msg), -- "bad relocation %#x DT_INIT_ARRAY[0]", -+ "bad relocation %#llx DT_INIT_ARRAY[0]", - r_info); - throwCantPack(msg); - } diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 7f3698ca0d..9f7c40c819 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 47774df5c958f2868ef550fb258b97c73272cb1f44fe776b798e393465993714 upx-3.96-src.tar.xz +sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index e693a70db1..ef346b2310 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,28 +4,12 @@ # ################################################################################ -UPX_VERSION = 3.96 +UPX_VERSION = 4.0.1 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING UPX_CPE_ID_VENDOR = upx_project +UPX_SUPPORTS_IN_SOURCE_BUILD = NO -# 0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch -UPX_IGNORE_CVES += CVE-2021-20285 - -HOST_UPX_DEPENDENCIES = host-ucl host-zlib - -# We need to specify all, otherwise the default target only prints a message -# stating to "please choose a target for 'make'"... :-( -define HOST_UPX_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - UPX_UCLDIR=$(HOST_DIR) CXXFLAGS_WERROR= -C $(@D) all -endef - -# UPX has no install procedure, so install it manually. -define HOST_UPX_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/upx.out $(HOST_DIR)/bin/upx -endef - -$(eval $(host-generic-package)) +$(eval $(host-cmake-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:57:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:36 -0000 Subject: [Buildroot] [git commit branch/next] package/gconf: switch to https download Message-ID: <20230220205237.9C49B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=695dd042dbbe3eb3ccffb812b8dc38c2aa7202be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gconf/gconf.hash | 2 +- package/gconf/gconf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gconf/gconf.hash b/package/gconf/gconf.hash index 56d754a69e..ad0064fa99 100644 --- a/package/gconf/gconf.hash +++ b/package/gconf/gconf.hash @@ -1,4 +1,4 @@ -# http://ftp.acc.umu.se/pub/gnome/sources/GConf/3.2/GConf-3.2.6.sha256sum +# From https://download.gnome.org/sources/GConf/3.2/GConf-3.2.6.sha256sum sha256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c GConf-3.2.6.tar.xz # License files, locally calculated sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING diff --git a/package/gconf/gconf.mk b/package/gconf/gconf.mk index c468d1433c..b84fa96082 100644 --- a/package/gconf/gconf.mk +++ b/package/gconf/gconf.mk @@ -6,7 +6,7 @@ GCONF_VERSION = 3.2.6 GCONF_SOURCE = GConf-$(GCONF_VERSION).tar.xz -GCONF_SITE = http://ftp.gnome.org/pub/gnome/sources/GConf/3.2 +GCONF_SITE = https://download.gnome.org/sources/GConf/3.2 GCONF_CONF_OPTS = --disable-orbit GCONF_DEPENDENCIES = dbus dbus-glib libglib2 libxml2 \ host-intltool $(TARGET_NLS_DEPENDENCIES) From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:36 -0000 Subject: [Buildroot] [git commit branch/next] package/ucl: drop package Message-ID: <20230220205216.A2B0C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85c5af46ad6c18841576c0f7abe241a617a44cb7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next ucl is directly vendored in upx since version 3.99 and https://github.com/upx/upx/commit/61e1366122f8d1b9e2434a8103e7af00a35ea902 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ucl/ucl.hash | 3 --- package/ucl/ucl.mk | 15 --------------- 2 files changed, 18 deletions(-) diff --git a/package/ucl/ucl.hash b/package/ucl/ucl.hash deleted file mode 100644 index 0252f69297..0000000000 --- a/package/ucl/ucl.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 ucl-1.03.tar.gz -sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/package/ucl/ucl.mk b/package/ucl/ucl.mk deleted file mode 100644 index aac068ef60..0000000000 --- a/package/ucl/ucl.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# ucl -# -################################################################################ - -UCL_VERSION = 1.03 -UCL_SITE = http://www.oberhumer.com/opensource/ucl/download -UCL_LICENSE = GPL-2.0+ -UCL_LICENSE_FILES = COPYING - -# Fix ACC conformance test failure for host gcc 6.x -HOST_UCL_CONF_ENV += CPPFLAGS="$(HOST_CPPFLAGS) -std=iso9899:1990" - -$(eval $(host-autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:57:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:37 -0000 Subject: [Buildroot] [git commit branch/next] package/glib-networking: switch to https download Message-ID: <20230220205237.BFD208648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bbad80aeb21d9657d85b722b02fdf3e66decfb8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/glib-networking/glib-networking.hash | 2 +- package/glib-networking/glib-networking.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index 347ef6777c..766efd0ced 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.1.sha256sum +# From https://download.gnome.org/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 4adc13d39f..b6d29110ed 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -6,7 +6,7 @@ GLIB_NETWORKING_VERSION_MAJOR = 2.70 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_SITE = https://download.gnome.org/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES GLIB_NETWORKING_DEPENDENCIES = \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:37 -0000 Subject: [Buildroot] [git commit branch/next] package/collectd: add rrdcached support Message-ID: <20230220205216.CA9938648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d77db2df74a3ccb430cbc326edef2c4a588878b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The rrdcached plugin has status "supported": https://collectd.org/wiki/index.php/Plugin:RRDCacheD Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/collectd/Config.in | 9 +++++++++ package/collectd/collectd.mk | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index fb76a105dc..a431da79f1 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -724,6 +724,15 @@ config BR2_PACKAGE_COLLECTD_RRDTOOL comment "rrdtool support needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR +if BR2_PACKAGE_COLLECTD_RRDTOOL + +config BR2_PACKAGE_COLLECTD_RRDCACHED + bool "rrdcached" + help + Use the RRDtool caching daemon. + +endif + config BR2_PACKAGE_COLLECTD_RIEMANN bool "riemann" # riemann-c-client -> protobuf-c diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 5510c265e8..6c993827c4 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -21,7 +21,7 @@ COLLECTD_PLUGINS_DISABLE = \ gmond hddtemp intel_rdt java lpar \ madwifi mbmon mic multimeter netapp notify_desktop numa \ oracle perl pf pinba powerdns python routeros \ - rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ + sigrok tape target_v5upgrade teamspeak2 ted \ tokyotyrant turbostat uuid varnish vserver write_kafka \ write_mongodb xencpu xmms zfs_arc zone @@ -134,6 +134,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_REGEX),--enable-match_regex,--disable-match-regex) \ $(if $(BR2_PACKAGE_COLLECTD_REPLACE),--enable-target_replace,--disable-target_replace) \ $(if $(BR2_PACKAGE_COLLECTD_RIEMANN),--enable-write_riemann,--disable-write_riemann) \ + $(if $(BR2_PACKAGE_COLLECTD_RRDCACHED),--enable-rrdcached,--disable-rrdcached) \ $(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),--enable-rrdtool,--disable-rrdtool) \ $(if $(BR2_PACKAGE_COLLECTD_SCALE),--enable-target_scale,--disable-target_scale) \ $(if $(BR2_PACKAGE_COLLECTD_SENSORS),--enable-sensors,--disable-sensors) \ From yann.morin.1998 at free.fr Mon Feb 20 20:57:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:38 -0000 Subject: [Buildroot] [git commit branch/next] package/glibmm: switch to https download Message-ID: <20230220205237.CB3B886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2334adaa974a7984a4bd3a9cf65e2187d25d8b2d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/glibmm/glibmm.hash | 2 +- package/glibmm/glibmm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/glibmm/glibmm.hash b/package/glibmm/glibmm.hash index f0bc7f4e71..ea256c3add 100644 --- a/package/glibmm/glibmm.hash +++ b/package/glibmm/glibmm.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.68/glibmm-2.68.2.sha256sum +# From https://download.gnome.org/sources/glibmm/2.68/glibmm-2.68.2.sha256sum sha256 91e0a8618f7b82db4aaf2648932ea2bcfe626ad030068c18fa2d106fd838d8ad glibmm-2.68.2.tar.xz # License files, locally calculated sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk index 525da6b618..7f37da8449 100644 --- a/package/glibmm/glibmm.mk +++ b/package/glibmm/glibmm.mk @@ -9,7 +9,7 @@ GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).2 GLIBMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GLIBMM_LICENSE_FILES = COPYING COPYING.tools GLIBMM_SOURCE = glibmm-$(GLIBMM_VERSION).tar.xz -GLIBMM_SITE = http://ftp.gnome.org/pub/gnome/sources/glibmm/$(GLIBMM_VERSION_MAJOR) +GLIBMM_SITE = https://download.gnome.org/sources/glibmm/$(GLIBMM_VERSION_MAJOR) GLIBMM_INSTALL_STAGING = YES GLIBMM_DEPENDENCIES = libglib2 libsigc host-pkgconf GLIBMM_CONF_OPTS = -Dbuild-examples=false From yann.morin.1998 at free.fr Mon Feb 20 20:57:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:38 -0000 Subject: [Buildroot] [git commit branch/next] package/qemu: split long lines Message-ID: <20230220205217.13B7F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a04be749374c99790ee7d185427b352db84fb07a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Split the list of dependencies to ease further addition. Signed-off-by: Romain Naour [yann.morin.1998 at free.fr: move first item also on its own line] Signed-off-by: Yann E. MORIN --- package/qemu/qemu.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index a991d49993..cbcbbc2bc5 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -20,7 +20,13 @@ QEMU_CPE_ID_VENDOR = qemu # However, building is still done with configure and make as in previous versions of QEMU. # Target-qemu -QEMU_DEPENDENCIES = host-meson host-pkgconf libglib2 zlib pixman host-python3 +QEMU_DEPENDENCIES = \ + host-meson \ + host-pkgconf \ + libglib2 \ + zlib \ + pixman \ + host-python3 # Need the LIBS variable because librt and libm are # not automatically pulled. :-( @@ -246,7 +252,13 @@ $(eval $(generic-package)) #------------------------------------------------------------- # Host-qemu -HOST_QEMU_DEPENDENCIES = host-meson host-pkgconf host-zlib host-libglib2 host-pixman host-python3 +HOST_QEMU_DEPENDENCIES = \ + host-meson \ + host-pkgconf \ + host-zlib \ + host-libglib2 \ + host-pixman \ + host-python3 # BR ARCH qemu # ------- ---- From yann.morin.1998 at free.fr Mon Feb 20 20:57:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:39 -0000 Subject: [Buildroot] [git commit branch/next] package/gsettings-desktop-schemas: switch to https download Message-ID: <20230220205237.E2DAB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d7de5b2befe5a1703fbd583514aa46b457246d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash | 2 +- package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash index d530517cd1..bad8eab91d 100644 --- a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash +++ b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/gsettings-desktop-schemas/3.36/gsettings-desktop-schemas-3.36.1.sha256sum +# From https://download.gnome.org/sources/gsettings-desktop-schemas/3.36/gsettings-desktop-schemas-3.36.1.sha256sum sha256 004bdbe43cf8290f2de7d8537e14d8957610ca479a4fa368e34dbd03f03ec9d9 gsettings-desktop-schemas-3.36.1.tar.xz # Hash for license file diff --git a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk index 8573c75fde..b77397d565 100644 --- a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk +++ b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk @@ -7,7 +7,7 @@ GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR = 3.36 GSETTINGS_DESKTOP_SCHEMAS_VERSION = $(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR).1 GSETTINGS_DESKTOP_SCHEMAS_SOURCE = gsettings-desktop-schemas-$(GSETTINGS_DESKTOP_SCHEMAS_VERSION).tar.xz -GSETTINGS_DESKTOP_SCHEMAS_SITE = http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/$(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR) +GSETTINGS_DESKTOP_SCHEMAS_SITE = https://download.gnome.org/sources/gsettings-desktop-schemas/$(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR) GSETTINGS_DESKTOP_SCHEMAS_INSTALL_STAGING = YES GSETTINGS_DESKTOP_SCHEMAS_DEPENDENCIES = host-pkgconf libglib2 GSETTINGS_DESKTOP_SCHEMAS_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Mon Feb 20 20:57:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:40 -0000 Subject: [Buildroot] [git commit branch/next] package/slirp: add host variant for host-qemu Message-ID: <20230220205217.075D3828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f603aa8514279b56f7454726c95601b31e6064dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Qemu 7.2 removed the slirp submodule from their sources [1] so we have to provide slirp library as host package for host-qemu. [1] https://wiki.qemu.org/ChangeLog/7.2#GIT_submodules Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/slirp/slirp.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk index 10d367587d..2ad71f13d9 100644 --- a/package/slirp/slirp.mk +++ b/package/slirp/slirp.mk @@ -14,4 +14,7 @@ SLIRP_CPE_ID_PRODUCT = libslirp SLIRP_INSTALL_STAGING = YES SLIRP_DEPENDENCIES = libglib2 +HOST_SLIRP_DEPENDENCIES = host-libglib2 + $(eval $(meson-package)) +$(eval $(host-meson-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:57:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:40 -0000 Subject: [Buildroot] [git commit branch/next] package/gtk2-engines: switch to https download Message-ID: <20230220205238.05CB486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cb96dcaff49c259ad02fad428ab3ae3d210416e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gtk2-engines/gtk2-engines.hash | 2 +- package/gtk2-engines/gtk2-engines.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gtk2-engines/gtk2-engines.hash b/package/gtk2-engines/gtk2-engines.hash index 20125c706c..71a0ecd213 100644 --- a/package/gtk2-engines/gtk2-engines.hash +++ b/package/gtk2-engines/gtk2-engines.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.sha256sum +# From https://download.gnome.org/sources/gtk-engines/2.20/gtk-engines-2.20.2.sha256sum sha256 15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5 gtk-engines-2.20.2.tar.bz2 # Locally computed sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk index 5f145940b2..ea41bccaea 100644 --- a/package/gtk2-engines/gtk2-engines.mk +++ b/package/gtk2-engines/gtk2-engines.mk @@ -7,7 +7,7 @@ GTK2_ENGINES_VERSION_MAJOR = 2.20 GTK2_ENGINES_VERSION = $(GTK2_ENGINES_VERSION_MAJOR).2 GTK2_ENGINES_SOURCE = gtk-engines-$(GTK2_ENGINES_VERSION).tar.bz2 -GTK2_ENGINES_SITE = http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/$(GTK2_ENGINES_VERSION_MAJOR) +GTK2_ENGINES_SITE = https://download.gnome.org/sources/gtk-engines/$(GTK2_ENGINES_VERSION_MAJOR) GTK2_ENGINES_DEPENDENCIES = libgtk2 host-intltool GTK2_ENGINES_LICENSE = LGPL-2.1+ GTK2_ENGINES_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:41 -0000 Subject: [Buildroot] [git commit branch/next] package/libvncserver: bump to version 0.9.14 Message-ID: <20230220205216.BBCDA828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90a543de880010776b291193eb0d3bc8d27fe3e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patches (already in version) - examples and tests can be disabled since https://github.com/LibVNC/libvncserver/commit/0b8990784a81823eecc9089263ac1966d17bf399 https://github.com/LibVNC/libvncserver/releases/tag/LibVNCServer-0.9.14 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...to_openssl.c-fix-build-with-libressl-3.5..patch | 66 ---------------------- ...nt-free-vncRec-memory-in-rfbClientCleanup.patch | 28 --------- package/libvncserver/libvncserver.hash | 2 +- package/libvncserver/libvncserver.mk | 9 ++- 4 files changed, 5 insertions(+), 100 deletions(-) diff --git a/package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch b/package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch deleted file mode 100644 index 110976c4bb..0000000000 --- a/package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch +++ /dev/null @@ -1,66 +0,0 @@ -From 97fbbd678b2012e64acddd523677bc55a177bc58 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 12 May 2022 20:41:50 +0200 -Subject: [PATCH] common/crypto_openssl.c: fix build with libressl >= 3.5.0 - (#522) - -Fix the following build failure with libressl >= 3.5.0: - -/nvmedata/autobuild/instance-26/output-1/build/libvncserver-0.9.13/common/crypto_openssl.c: In function 'dh_generate_keypair': -/nvmedata/autobuild/instance-26/output-1/build/libvncserver-0.9.13/common/crypto_openssl.c:149:7: error: dereferencing pointer to incomplete type 'DH' {aka 'struct dh_st'} - 149 | dh->p = BN_bin2bn(prime, keylen, NULL); - | ^~ - -Fixes: - - http://autobuild.buildroot.org/results/49b3940b9d0432cb5fb0c5d22dfa017b18c6e233 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/LibVNC/libvncserver/commit/97fbbd678b2012e64acddd523677bc55a177bc58] ---- - common/crypto_openssl.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/common/crypto_openssl.c b/common/crypto_openssl.c -index 60d4bd4df..51d7ec2d9 100644 ---- a/common/crypto_openssl.c -+++ b/common/crypto_openssl.c -@@ -138,14 +138,16 @@ int dh_generate_keypair(uint8_t *priv_out, uint8_t *pub_out, const uint8_t *gen, - { - int result = 0; - DH *dh; --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || \ -+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000) - const BIGNUM *pub_key = NULL; - const BIGNUM *priv_key = NULL; - #endif - - if(!(dh = DH_new())) - goto out; --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000) - dh->p = BN_bin2bn(prime, keylen, NULL); - dh->g = BN_bin2bn(gen, gen_len, NULL); - #else -@@ -154,7 +156,8 @@ int dh_generate_keypair(uint8_t *priv_out, uint8_t *pub_out, const uint8_t *gen, - #endif - if(!DH_generate_key(dh)) - goto out; --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000) - if(BN_bn2bin(dh->priv_key, priv_out) == 0) - goto out; - if(BN_bn2bin(dh->pub_key, pub_out) == 0) -@@ -181,7 +184,8 @@ int dh_compute_shared_key(uint8_t *shared_out, const uint8_t *priv, const uint8_ - - if(!(dh = DH_new())) - goto out; --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER < 0x30500000) - dh->p = BN_bin2bn(prime, keylen, NULL); - dh->priv_key = BN_bin2bn(priv, keylen, NULL); - #else diff --git a/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch b/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch deleted file mode 100644 index 7658c112f3..0000000000 --- a/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bef41f6ec4097a8ee094f90a1b34a708fbd757ec Mon Sep 17 00:00:00 2001 -From: Christian Beier -Date: Sat, 21 Nov 2020 12:52:31 +0100 -Subject: [PATCH] libvncclient: free vncRec memory in rfbClientCleanup() - -Otherwise we leak memory. Spotted by Ramin Farajpour Cami -, thanks! - -[Retrieved from: -https://github.com/LibVNC/libvncserver/commit/bef41f6ec4097a8ee094f90a1b34a708fbd757ec] -Signed-off-by: Fabrice Fontaine ---- - libvncclient/vncviewer.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c -index d6b91f02b..0a1bdcf6a 100644 ---- a/libvncclient/vncviewer.c -+++ b/libvncclient/vncviewer.c -@@ -534,6 +534,8 @@ void rfbClientCleanup(rfbClient* client) { - client->clientData = next; - } - -+ free(client->vncRec); -+ - if (client->sock != RFB_INVALID_SOCKET) - rfbCloseSocket(client->sock); - if (client->listenSock != RFB_INVALID_SOCKET) diff --git a/package/libvncserver/libvncserver.hash b/package/libvncserver/libvncserver.hash index 8e61a3d0ea..225c42e46a 100644 --- a/package/libvncserver/libvncserver.hash +++ b/package/libvncserver/libvncserver.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a LibVNCServer-0.9.13.tar.gz +sha256 83104e4f7e28b02f8bf6b010d69b626fae591f887e949816305daebae527c9a5 LibVNCServer-0.9.14.tar.gz sha256 4d23c8c814e5baf007d854f01d8502e77dc56a41144934e003fb32c4e052d20f COPYING diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk index 8f24e2d098..700e26a8d6 100644 --- a/package/libvncserver/libvncserver.mk +++ b/package/libvncserver/libvncserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVNCSERVER_VERSION = 0.9.13 +LIBVNCSERVER_VERSION = 0.9.14 LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive LIBVNCSERVER_LICENSE = GPL-2.0+ @@ -14,14 +14,13 @@ LIBVNCSERVER_INSTALL_STAGING = YES LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON -# 0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch -LIBVNCSERVER_IGNORE_CVES += CVE-2020-29260 - # only used for examples LIBVNCSERVER_CONF_OPTS += \ + -DWITH_EXAMPLES=OFF \ -DWITH_FFMPEG=OFF \ -DWITH_GTK=OFF \ - -DWITH_SDL=OFF + -DWITH_SDL=OFF \ + -DWITH_TESTS=OFF ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBVNCSERVER_CONF_OPTS += -DWITH_THREADS=ON From peter at korsgaard.com Mon Feb 20 20:57:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:57:35 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: <20230220214958.19d88af8@windsurf> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-2-thomas.devoogdt@barco.com> <87edqkz1yv.fsf@dell.be.48ers.dk> <20230220214958.19d88af8@windsurf> Message-ID: <6d000223-f440-43bb-b9ba-2144375776be@korsgaard.com> On 20/02/2023 21.49, Thomas Petazzoni wrote: >> Maybe it is? Does at-spi2 work under wayland? > > Please note that we also have a series that removes atk, at-spi2-atk, > and bumps at-spi2-core, which now replaces both atk and at-spi2-atk: > > https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 Ahh yes, that is probably the way to go. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Mon Feb 20 20:57:41 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:41 -0000 Subject: [Buildroot] [git commit branch/next] package/gupnp-av: switch to https download Message-ID: <20230220205238.2565E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cfdd3fcd158031dfa2157454b9f5071e801171b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gupnp-av/gupnp-av.hash | 2 +- package/gupnp-av/gupnp-av.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gupnp-av/gupnp-av.hash b/package/gupnp-av/gupnp-av.hash index ceab42ef52..ab1739aaa4 100644 --- a/package/gupnp-av/gupnp-av.hash +++ b/package/gupnp-av/gupnp-av.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.14/gupnp-av-0.14.0.sha256sum: +# Hash from: https://download.gnome.org/sources/gupnp-av/0.14/gupnp-av-0.14.0.sha256sum: sha256 20aed546fc882e78a3f186a0c8bce5c841cc3a44b7ea528298fbdc82596fb156 gupnp-av-0.14.0.tar.xz # Hash for license file: diff --git a/package/gupnp-av/gupnp-av.mk b/package/gupnp-av/gupnp-av.mk index 655de87608..e83aa57bda 100644 --- a/package/gupnp-av/gupnp-av.mk +++ b/package/gupnp-av/gupnp-av.mk @@ -7,7 +7,7 @@ GUPNP_AV_VERSION_MAJOR = 0.14 GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).0 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz -GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) +GUPNP_AV_SITE = https://download.gnome.org/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) GUPNP_AV_LICENSE = LGPL-2.1+ GUPNP_AV_LICENSE_FILES = COPYING GUPNP_AV_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:42 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8192eu: fix build failure due to function and data types name conflict with Linux Message-ID: <20230220205217.46A46828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef3052674a7104990037b7da60cbbcb9d316e764 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add local patch to rename local sha256 data types and functions that conflict with Linux ones. Fixes: http://autobuild.buildroot.net/results/7a85a1e6df55bbb4dc6741821c849ad7ee5059af Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...ailure-due-to-redefition-of-local-sha256-.patch | 108 +++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch b/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch new file mode 100644 index 0000000000..52ef8c9005 --- /dev/null +++ b/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch @@ -0,0 +1,108 @@ +From 1f968bd58656f200347bd398b34aa9f1b6393302 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 18:54:48 +0100 +Subject: [PATCH] Fix build failure due to redefition of local sha256 data + types and functions + +Linux provides sha256_init() and 'struct sha256_state' in file +include/crypto/sha2.h so this leads to a build failure due to redefinition. +To avoid this let's prepend to all local exposed functions and data types +rtl_. sha256_process() and sha256_done() are not required to be renamed but +let's change them for consistency. + +[Upstream status: https://github.com/clnhub/rtl8192eu-linux/pull/69] +Signed-off-by: Giulio Benetti +--- + core/crypto/sha256-internal.c | 16 ++++++++-------- + core/crypto/sha256_i.h | 8 ++++---- + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/core/crypto/sha256-internal.c b/core/crypto/sha256-internal.c +index 4d61cb1..537bb2e 100644 +--- a/core/crypto/sha256-internal.c ++++ b/core/crypto/sha256-internal.c +@@ -26,17 +26,17 @@ + int sha256_vector(size_t num_elem, const u8 *addr[], const size_t *len, + u8 *mac) + { +- struct sha256_state ctx; ++ struct rtl_sha256_state ctx; + size_t i; + + if (TEST_FAIL()) + return -1; + +- sha256_init(&ctx); ++ rtl_sha256_init(&ctx); + for (i = 0; i < num_elem; i++) +- if (sha256_process(&ctx, addr[i], len[i])) ++ if (rtl_sha256_process(&ctx, addr[i], len[i])) + return -1; +- if (sha256_done(&ctx, mac)) ++ if (rtl_sha256_done(&ctx, mac)) + return -1; + return 0; + } +@@ -82,7 +82,7 @@ static const unsigned long K[64] = { + #endif + + /* compress 512-bits */ +-static int sha256_compress(struct sha256_state *md, unsigned char *buf) ++static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf) + { + u32 S[8], W[64], t0, t1; + u32 t; +@@ -125,7 +125,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) + + + /* Initialize the hash state */ +-void sha256_init(struct sha256_state *md) ++void rtl_sha256_init(struct rtl_sha256_state *md) + { + md->curlen = 0; + md->length = 0; +@@ -146,7 +146,7 @@ void sha256_init(struct sha256_state *md) + @param inlen The length of the data (octets) + @return CRYPT_OK if successful + */ +-int sha256_process(struct sha256_state *md, const unsigned char *in, ++int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, + unsigned long inlen) + { + unsigned long n; +@@ -186,7 +186,7 @@ int sha256_process(struct sha256_state *md, const unsigned char *in, + @param out [out] The destination of the hash (32 bytes) + @return CRYPT_OK if successful + */ +-int sha256_done(struct sha256_state *md, unsigned char *out) ++int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out) + { + int i; + +diff --git a/core/crypto/sha256_i.h b/core/crypto/sha256_i.h +index a502d2b..93a8858 100644 +--- a/core/crypto/sha256_i.h ++++ b/core/crypto/sha256_i.h +@@ -11,15 +11,15 @@ + + #define SHA256_BLOCK_SIZE 64 + +-struct sha256_state { ++struct rtl_sha256_state { + u64 length; + u32 state[8], curlen; + u8 buf[SHA256_BLOCK_SIZE]; + }; + +-void sha256_init(struct sha256_state *md); +-int sha256_process(struct sha256_state *md, const unsigned char *in, ++void rtl_sha256_init(struct rtl_sha256_state *md); ++int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, + unsigned long inlen); +-int sha256_done(struct sha256_state *md, unsigned char *out); ++int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out); + + #endif /* SHA256_I_H */ +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:57:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:43 -0000 Subject: [Buildroot] [git commit branch/next] package/gupnp: switch to https download Message-ID: <20230220205238.482137FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be4b3300085d1c2266a18e6615d9288759438d9c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gupnp/gupnp.hash | 2 +- package/gupnp/gupnp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index cc5e2b5775..823dbd7927 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.3.sha256sum: +# Hash from: https://download.gnome.org/sources/gupnp/1.4/gupnp-1.4.3.sha256sum: sha256 14eda777934da2df743d072489933bd9811332b7b5bf41626b8032efb28b33ba gupnp-1.4.3.tar.xz # Hash for license file: diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index dca747f064..f41f26d2dd 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -7,7 +7,7 @@ GUPNP_VERSION_MAJOR = 1.4 GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).3 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz -GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) +GUPNP_SITE = https://download.gnome.org/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+ GUPNP_LICENSE_FILES = COPYING GUPNP_CPE_ID_VENDOR = gnome From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:43 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl8723bu: bump to 2022-12-28 version to fix build failure with Linux 6.1 Message-ID: <20230220205217.398448648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=030cbe37033a3c179c5c51dbd0427cc443efb330 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Let's also drop local patch[0] that has been upstreamed. [0]: https://github.com/lwfinger/rtl8723bu/commit/dde7bddfddddb7212f2d9671391e2096d770c449 Fixes: http://autobuild.buildroot.net/results/cc8/cc84b5f62ca59572f0f52086f157acc0409c03f5/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...Fix-build-failure-on-PowerPc-architecture.patch | 47 ---------------------- package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) diff --git a/package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch b/package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch deleted file mode 100644 index 06cf2d64c1..0000000000 --- a/package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch +++ /dev/null @@ -1,47 +0,0 @@ -From dde7bddfddddb7212f2d9671391e2096d770c449 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sun, 23 Oct 2022 22:57:41 +0200 -Subject: [PATCH] Fix build failure on PowerPc architecture - -In PowerPc Linux only get_ra() exists[0] and conflicts with local get_ra() -that has a completely different purpose. So let's rename local get_ra() -to wifi_get_ra() to make it different from Linux's get_ra(). - -[0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/powerpc/include/asm/disassemble.h#n49 - -Upstream: https://github.com/lwfinger/rtl8723bu/pull/192 -Signed-off-by: Giulio Benetti ---- - hal/rtl8723bu_recv.c | 2 +- - include/wifi.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hal/rtl8723bu_recv.c b/hal/rtl8723bu_recv.c -index a2fc82b..39e5044 100644 ---- a/hal/rtl8723bu_recv.c -+++ b/hal/rtl8723bu_recv.c -@@ -288,7 +288,7 @@ void update_recvframe_phyinfo( - !pattrib->icv_err && !pattrib->crc_err && - _rtw_memcmp(get_hdr_bssid(wlanhdr), get_bssid(&padapter->mlmepriv), ETH_ALEN)); - -- pkt_info.bPacketToSelf = pkt_info.bPacketMatchBSSID && (_rtw_memcmp(get_ra(wlanhdr), myid(&padapter->eeprompriv), ETH_ALEN)); -+ pkt_info.bPacketToSelf = pkt_info.bPacketMatchBSSID && (_rtw_memcmp(wifi_get_ra(wlanhdr), myid(&padapter->eeprompriv), ETH_ALEN)); - - pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID && (GetFrameSubType(wlanhdr) == WIFI_BEACON); - sa = get_ta(wlanhdr); -diff --git a/include/wifi.h b/include/wifi.h -index 5dc32eb..23578cc 100644 ---- a/include/wifi.h -+++ b/include/wifi.h -@@ -373,7 +373,7 @@ __inline static int IS_MCAST(unsigned char *da) - return _FALSE; - } - --__inline static unsigned char * get_ra(unsigned char *pframe) -+__inline static unsigned char * wifi_get_ra(unsigned char *pframe) - { - unsigned char *ra; - ra = GetAddr1Ptr(pframe); --- -2.34.1 - diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 9119abad76..6a28c34773 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 07fece152704f4b5dbd0fd3af842816f95824317f3158fea774f15a6eddac009 rtl8723bu-d79a676a8d3f0bb6ac8af126689c6ac6869cb6f2.tar.gz +sha256 21372b654886c6d100f46636d7807428698bd618e00db1b8b49cfc3037e46d10 rtl8723bu-f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index 82c487b4e1..af1ac9454e 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = d79a676a8d3f0bb6ac8af126689c6ac6869cb6f2 +RTL8723BU_VERSION = f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) From yann.morin.1998 at free.fr Mon Feb 20 20:57:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:43 -0000 Subject: [Buildroot] [git commit branch/next] package/gvfs: switch to https download Message-ID: <20230220205238.62D2A7FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65c47725b02d00b6ffa5acf88176b6b1365c3f7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gvfs/gvfs.hash | 2 +- package/gvfs/gvfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index f4a5364f1f..fc068ddb94 100644 --- a/package/gvfs/gvfs.hash +++ b/package/gvfs/gvfs.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.48/gvfs-1.48.1.sha256sum +# From https://download.gnome.org/sources/gvfs/1.48/gvfs-1.48.1.sha256sum sha256 b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2 gvfs-1.48.1.tar.xz # Hash for license file diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index 4174592455..50efed1abb 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -7,7 +7,7 @@ GVFS_VERSION_MAJOR = 1.48 GVFS_VERSION = $(GVFS_VERSION_MAJOR).1 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz -GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) +GVFS_SITE = https://download.gnome.org/sources/gvfs/$(GVFS_VERSION_MAJOR) GVFS_INSTALL_STAGING = YES GVFS_DEPENDENCIES = \ host-pkgconf \ From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:44 -0000 Subject: [Buildroot] [git commit branch/next] package/rng-tools: fix build with updated jitterentropy-library Message-ID: <20230220205217.6D858828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d47f7279f516ba2bbc6d1fd9dd37636902b9bad3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit a8807ddbe2 bumped package jitterentropy-library to version 3.4.1 which broke building rng-tools. Add two upstream patches which improve jitterentropy-library detection. Fixes: http://autobuild.buildroot.net/results/a6f/a6f1381b3d1aa2a27412286167f5c8be5f6fdaf8/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...erentropy-detection-to-look-for-the-setti.patch | 30 +++++++++++++++++ ...erentropy-library-to-timeout-fail-on-long.patch | 39 ++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch b/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch new file mode 100644 index 0000000000..553842640d --- /dev/null +++ b/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch @@ -0,0 +1,30 @@ +From e2698477e8abf623c18ab28d33cc894ec882a706 Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Fri, 18 Mar 2022 18:59:52 -0400 +Subject: [PATCH] Adjust jitterentropy detection to look for the settick + function + +Theres no great way to detect if jitterentropy has the internal timer +feature enabled so we have to look for a function that is only defined +when it is enabled + +Signed-off-by: Bernd Kuhls +[downloaded from upstream commit + https://github.com/nhorman/rng-tools/commit/e2698477e8abf623c18ab28d33cc894ec882a706] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e16e1a0..0f5a38e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -94,7 +94,7 @@ AS_IF( + AC_SEARCH_LIBS(jent_version,jitterentropy, + [AM_CONDITIONAL([JITTER], [true]) + AC_DEFINE([HAVE_JITTER],1,[Enable JITTER]) +- AC_CHECK_LIB(jitterentropy, jent_entropy_switch_notime_impl, ++ AC_CHECK_LIB(jitterentropy, jent_notime_settick, + [AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])], + [],-lpthread)], + AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread) diff --git a/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch b/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch new file mode 100644 index 0000000000..9d8dbe2d0b --- /dev/null +++ b/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch @@ -0,0 +1,39 @@ +From c29424f10a0dcbd18ac25607fa1c81c18a960e81 Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Mon, 16 May 2022 13:38:54 -0400 +Subject: [PATCH] Adjust jitterentropy library to timeout/fail on long delay + +[Bernd: removed description of unrelated part of the patch] + +Also while we're at it, I might have a build solution for the presence +of internal timers. When jitterentropy is built without internal +timers, jent_notime_init is defined publically, but when it is built +with timers, its declared as a static symbol, preenting resolution, so +we can test to see if the function exists. If it does we _don't_ have +notime support. The logic is a bit backwards, but i think it works + +Signed-off-by: Bernd Kuhls +[downloaded configure.ac patch from upstream commit + https://github.com/nhorman/rng-tools/commit/57be6d4c90e78ea9ad036a3a6e9b09822ed4d219] +--- + configure.ac | 6 ++--- + rngd_jitter.c | 62 ++++++++++++++++++++++++++++++++++++++------------- + 2 files changed, 49 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 52f2bb5..0af64e7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,9 +101,9 @@ AS_IF( + AC_SEARCH_LIBS(jent_version,jitterentropy, + [AM_CONDITIONAL([JITTER], [true]) + AC_DEFINE([HAVE_JITTER],1,[Enable JITTER]) +- AC_CHECK_LIB(jitterentropy, jent_notime_settick, +- [AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])], +- [],-lpthread)], ++ AC_CHECK_LIB(jitterentropy, jent_notime_init, ++ [], ++ [AC_DEFINE([HAVE_JITTER_NOTIME],1, [Enable JITTER_NOTIME])],-lpthread)], + AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread) + ], [AC_MSG_NOTICE([Disabling JITTER entropy source])] + ) From yann.morin.1998 at free.fr Mon Feb 20 20:57:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:44 -0000 Subject: [Buildroot] [git commit branch/next] package/libgee: switch to https download Message-ID: <20230220205238.99BF27FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=500f40bbc7a7657393dd308490afec3effee6dea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/libgee/libgee.hash | 2 +- package/libgee/libgee.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgee/libgee.hash b/package/libgee/libgee.hash index ea723481e4..f733bf34a8 100644 --- a/package/libgee/libgee.hash +++ b/package/libgee/libgee.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.6.sha256sum +# From https://download.gnome.org/sources/libgee/0.20/libgee-0.20.6.sha256sum sha256 1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d libgee-0.20.6.tar.xz # Hash for license file: diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk index 5ce56a2b3b..36eddef171 100644 --- a/package/libgee/libgee.mk +++ b/package/libgee/libgee.mk @@ -6,7 +6,7 @@ LIBGEE_VERSION_MAJOR = 0.20 LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).6 -LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) +LIBGEE_SITE = https://download.gnome.org/sources/libgee/$(LIBGEE_VERSION_MAJOR) LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 LIBGEE_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:45 -0000 Subject: [Buildroot] [git commit branch/next] package/rsync: add xxhash support Message-ID: <20230220205217.CA0428648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a11ca5b218e42c970858ba1ef83ec8572c326c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 8c7ad462ac..3cdd820fc0 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -19,7 +19,6 @@ RSYNC_CONF_OPTS = \ --with-included-popt=no \ --disable-roll-simd \ --disable-openssl \ - --disable-xxhash \ --disable-zstd \ --disable-lz4 \ --disable-md5-asm @@ -30,4 +29,11 @@ else RSYNC_CONF_OPTS += --disable-acl-support endif +ifeq ($(BR2_PACKAGE_XXHASH),y) +RSYNC_DEPENDENCIES += xxhash +RSYNC_CONF_OPTS += --enable-xxhash +else +RSYNC_CONF_OPTS += --disable-xxhash +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:45 -0000 Subject: [Buildroot] [git commit branch/next] package/xxhash: fix static library install Message-ID: <20230220205217.BC96E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0945e4913fba932217278f484de04cc366415bd6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Install headers when building statically Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ile-add-install_libxxhash.includes-target.patch | 39 ++++++++++++++++++++++ package/xxhash/xxhash.mk | 15 +++++++-- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch b/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch new file mode 100644 index 0000000000..22c8cdaadf --- /dev/null +++ b/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch @@ -0,0 +1,39 @@ +From b7c91f761b6d0b79398d0a064d2d6e34de3dfa47 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 27 Dec 2022 23:12:37 +0100 +Subject: [PATCH] Makefile: add install_libxxhash.includes target + +Add install_libxxhash.includes to be able to install headers when +building and installing the static library + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/Cyan4973/xxHash/pull/776] +--- + Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index cfa5779..2276282 100644 +--- a/Makefile ++++ b/Makefile +@@ -557,6 +557,8 @@ install_libxxhash: libxxhash + $(Q)$(INSTALL_PROGRAM) $(LIBXXH) $(DESTDIR)$(LIBDIR) + $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT_MAJOR) + $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT) ++ ++install_libxxhash.includes: + $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR) # includes + $(Q)$(INSTALL_DATA) xxhash.h $(DESTDIR)$(INCLUDEDIR) + $(Q)$(INSTALL_DATA) xxh3.h $(DESTDIR)$(INCLUDEDIR) # for compatibility, will be removed in v0.9.0 +@@ -586,7 +588,7 @@ install_man: + $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 + + .PHONY: install +-install: install_libxxhash.a install_libxxhash install_libxxhash.pc install_xxhsum install_man ## install libraries, CLI, links and man page ++install: install_libxxhash.a install_libxxhash install_libxxhash.includes install_libxxhash.pc install_xxhsum install_man ## install libraries, CLI, links and man page + @echo xxhash installation completed + + .PHONY: uninstall +-- +2.35.1 + diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index a8f8d1d179..6932113f14 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -15,14 +15,23 @@ XXHASH_INSTALL_TARGETS = install_xxhsum ifeq ($(BR2_STATIC_LIBS),y) XXHASH_TARGETS += libxxhash.a libxxhash.pc -XXHASH_INSTALL_TARGETS += install_libxxhash.a install_libxxhash.pc +XXHASH_INSTALL_TARGETS += \ + install_libxxhash.a \ + install_libxxhash.includes \ + install_libxxhash.pc else ifeq ($(BR2_SHARED_LIBS),y) XXHASH_TARGETS += libxxhash libxxhash.pc -XXHASH_INSTALL_TARGETS += install_libxxhash install_libxxhash.pc +XXHASH_INSTALL_TARGETS += \ + install_libxxhash \ + install_libxxhash.includes \ + install_libxxhash.pc else ifeq ($(BR2_SHARED_STATIC_LIBS),y) XXHASH_TARGETS += libxxhash.a libxxhash libxxhash.pc XXHASH_INSTALL_TARGETS += \ - install_libxxhash.a install_libxxhash install_libxxhash.pc + install_libxxhash.a \ + install_libxxhash \ + install_libxxhash.includes \ + install_libxxhash.pc endif define XXHASH_BUILD_CMDS From yann.morin.1998 at free.fr Mon Feb 20 20:57:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:45 -0000 Subject: [Buildroot] [git commit branch/next] package/libgtk2: switch to https download Message-ID: <20230220205238.BBD34828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d7e304648ffa8f4d88bfd540176e492fcafb015 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/libgtk2/libgtk2.hash | 2 +- package/libgtk2/libgtk2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgtk2/libgtk2.hash b/package/libgtk2/libgtk2.hash index 9b10a1f0ce..7b9a46b697 100644 --- a/package/libgtk2/libgtk2.hash +++ b/package/libgtk2/libgtk2.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.33.sha256sum +# From https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.33.sha256sum sha256 ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da gtk+-2.24.33.tar.xz # Hash for license file: diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index d30e1d9d43..859925e8d3 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -7,7 +7,7 @@ LIBGTK2_VERSION_MAJOR = 2.24 LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).33 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz -LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJOR) +LIBGTK2_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK2_VERSION_MAJOR) LIBGTK2_INSTALL_STAGING = YES LIBGTK2_LICENSE = LGPL-2.0+ LIBGTK2_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:57:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:46 -0000 Subject: [Buildroot] [git commit branch/next] package/libgudev: switch to https download Message-ID: <20230220205238.D31BE86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=824c40d39d16191681baa3869e1f6c5588a31d76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/libgudev/libgudev.hash | 2 +- package/libgudev/libgudev.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgudev/libgudev.hash b/package/libgudev/libgudev.hash index 3933e55de4..90f27a02fc 100644 --- a/package/libgudev/libgudev.hash +++ b/package/libgudev/libgudev.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libgudev/237/libgudev-237.sha256sum +# From https://download.gnome.org/sources/libgudev/237/libgudev-237.sha256sum sha256 0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa libgudev-237.tar.xz # Hash for license file: diff --git a/package/libgudev/libgudev.mk b/package/libgudev/libgudev.mk index 27244c3072..ef0bd997fa 100644 --- a/package/libgudev/libgudev.mk +++ b/package/libgudev/libgudev.mk @@ -6,7 +6,7 @@ LIBGUDEV_VERSION = 237 LIBGUDEV_SOURCE = libgudev-$(LIBGUDEV_VERSION).tar.xz -LIBGUDEV_SITE = http://ftp.gnome.org/pub/GNOME/sources/libgudev/$(LIBGUDEV_VERSION) +LIBGUDEV_SITE = https://download.gnome.org/sources/libgudev/$(LIBGUDEV_VERSION) LIBGUDEV_INSTALL_STAGING = YES LIBGUDEV_DEPENDENCIES = host-pkgconf udev libglib2 LIBGUDEV_LICENSE = LGPL-2.1+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:46 -0000 Subject: [Buildroot] [git commit branch/next] package/modem-manager: bump version to 1.20.2 Message-ID: <20230220205217.970C3828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b95334b71fbdde0f7621b58ed35fa98df9e0966d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Switch package type to meson as the primary supported build system from now on is meson and the autotools support as deprecated. The package tarball is no longer supported, thus the MODEM_MANAGER_SOURCE is changed to the gitlab archive URL. All previously supported options are converted to the meson configuraiton options and support for new ones is added. The new options are: bash_completion, polkit, systemd, qrtr. The dbus build dependency is needed since the meson build system uses dbus pkg-config to determine install locations. The 'udevdir' has to be specified also in case dbus is not installed. Modem-manager will use its own built-in udev rule parser to determine modem specific values. For building with libqmi support version 1.32.2 is required and for libmbim version 1.28.2 is required. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/modem-manager/Config.in | 2 +- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 72 ++++++++++++++++++++++++-------- 3 files changed, 56 insertions(+), 20 deletions(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index c4c723776d..d211d68ee1 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_MODEM_MANAGER depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus - select BR2_PACKAGE_DBUS # runtime dependency + select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV help diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 40c8ad703f..e6967f8d62 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ #Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc -sha256 b464e4925d955a6ca86dd08616e763b26ae46d7fd37dbe281678e34065b1e430 ModemManager-1.18.12.tar.xz +sha256 ba56aa764edc148f58348a589743cf1c1e27c55dcd7ebd820dcedd52fb8d7179 ModemManager-1.20.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index d0c9b7377b..8a0dbba3a4 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,42 +4,78 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.18.12 -MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz -MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager +MODEM_MANAGER_VERSION = 1.20.2 +MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.gz +MODEM_MANAGER_SITE = https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEM_MANAGER_VERSION) MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB MODEM_MANAGER_SELINUX_MODULES = modemmanager -MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) +MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIES) host-libxslt MODEM_MANAGER_INSTALL_STAGING = YES -MODEM_MANAGER_CONF_OPTS = --disable-more-warnings +MODEM_MANAGER_CONF_OPTS = \ + -Dpowerd_suspend_resume=false \ + -Dudevdir=/usr/lib/udev -ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y) -MODEM_MANAGER_DEPENDENCIES += libqmi -MODEM_MANAGER_CONF_OPTS += --with-qmi +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) +MODEM_MANAGER_DEPENDENCIES += libgudev +MODEM_MANAGER_CONF_OPTS += -Dudev=true else -MODEM_MANAGER_CONF_OPTS += --without-qmi +MODEM_MANAGER_CONF_OPTS += -Dudev=false endif -ifeq ($(BR2_PACKAGE_LIBGUDEV),y) -MODEM_MANAGER_DEPENDENCIES += libgudev -MODEM_MANAGER_CONF_OPTS += --with-udev +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y) +MODEM_MANAGER_DEPENDENCIES += libqmi +MODEM_MANAGER_CONF_OPTS += -Dqmi=true else -MODEM_MANAGER_CONF_OPTS += --without-udev +MODEM_MANAGER_CONF_OPTS += -Dqmi=false endif ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBMBIM),y) MODEM_MANAGER_DEPENDENCIES += libmbim -MODEM_MANAGER_CONF_OPTS += --with-mbim +MODEM_MANAGER_CONF_OPTS += -Dmbim=true +else +MODEM_MANAGER_CONF_OPTS += -Dmbim=false +endif + +ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y) +MODEM_MANAGER_DEPENDENCIES += libqrtr-glib +MODEM_MANAGER_CONF_OPTS += -Dqrtr=true +else +MODEM_MANAGER_CONF_OPTS += -Dqrtr=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +MODEM_MANAGER_DEPENDENCIES += systemd +MODEM_MANAGER_CONF_OPTS += \ + -Dsystemd_journal=true \ + -Dsystemd_suspend_resume=true \ + -Dsystemdsystemunitdir=/usr/lib/systemd/system +else +MODEM_MANAGER_CONF_OPTS += \ + -Dsystemd_journal=false \ + -Dsystemd_suspend_resume=false \ + -Dsystemdsystemunitdir=no +endif + +ifeq ($(BR2_PACKAGE_POLKIT),y) +MODEM_MANAGER_DEPENDENCIES += polkit +MODEM_MANAGER_CONF_OPTS += -Dpolkit=strict else -MODEM_MANAGER_CONF_OPTS += --without-mbim +MODEM_MANAGER_CONF_OPTS += -Dpolkit=no endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) MODEM_MANAGER_DEPENDENCIES += gobject-introspection -MODEM_MANAGER_CONF_OPTS += --enable-introspection +MODEM_MANAGER_CONF_OPTS += -Dintrospection=true +else +MODEM_MANAGER_CONF_OPTS += -Dintrospection=false +endif + +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +MODEM_MANAGER_DEPENDENCIES += bash-completion +MODEM_MANAGER_CONF_OPTS += -Dbash_completion=true else -MODEM_MANAGER_CONF_OPTS += --disable-introspection +MODEM_MANAGER_CONF_OPTS += -Dbash_completion=false endif define MODEM_MANAGER_INSTALL_INIT_SYSV @@ -47,4 +83,4 @@ define MODEM_MANAGER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S44modem-manager endef -$(eval $(autotools-package)) +$(eval $(meson-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:57:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:47 -0000 Subject: [Buildroot] [git commit branch/next] package/libpeas: switch to https download Message-ID: <20230220205238.E9AB0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abe3c7f81bba9fea46cc9ea379c6dbab624e447e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/libpeas/libpeas.hash | 2 +- package/libpeas/libpeas.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpeas/libpeas.hash b/package/libpeas/libpeas.hash index c503558f85..f69fd2945f 100644 --- a/package/libpeas/libpeas.hash +++ b/package/libpeas/libpeas.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/GNOME/sources/libpeas/1.32/libpeas-1.32.0.sha256sum +# From https://download.gnome.org/sources/libpeas/1.32/libpeas-1.32.0.sha256sum sha256 d625520fa02e8977029b246ae439bc218968965f1e82d612208b713f1dcc3d0e libpeas-1.32.0.tar.xz # Locally calculated sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libpeas/libpeas.mk b/package/libpeas/libpeas.mk index 5550162e04..3d2e79452c 100644 --- a/package/libpeas/libpeas.mk +++ b/package/libpeas/libpeas.mk @@ -7,7 +7,7 @@ LIBPEAS_VERSION_MAJOR = 1.32 LIBPEAS_VERSION = $(LIBPEAS_VERSION_MAJOR).0 LIBPEAS_SOURCE = libpeas-$(LIBPEAS_VERSION).tar.xz -LIBPEAS_SITE = http://ftp.gnome.org/pub/gnome/sources/libpeas/$(LIBPEAS_VERSION_MAJOR) +LIBPEAS_SITE = https://download.gnome.org/sources/libpeas/$(LIBPEAS_VERSION_MAJOR) LIBPEAS_LICENSE = LGPL-2.1+ LIBPEAS_LICENSE_FILES = COPYING LIBPEAS_CPE_ID_VENDOR = gnome From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:47 -0000 Subject: [Buildroot] [git commit branch/next] package/dbus-cxx: bump to version 2.3.1 Message-ID: <20230220205218.3F20181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f99714d90e08994c697576ca2030cb9392d7b63e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/dbus-cxx/dbus-cxx.hash | 2 +- package/dbus-cxx/dbus-cxx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus-cxx/dbus-cxx.hash b/package/dbus-cxx/dbus-cxx.hash index acb059b91d..6a7a634ced 100644 --- a/package/dbus-cxx/dbus-cxx.hash +++ b/package/dbus-cxx/dbus-cxx.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 45663b6dbc289f133dfdcd8b8de771de3a2d54588954c2eec3f97888b03bd8ad dbus-cxx-2.3.0.tar.gz +sha256 88d4bd1d9af8563bda03f24b26ffe4efbc555ca82ac664ced572b053928f739a dbus-cxx-2.3.1.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 43556195c7..554acaa67d 100644 --- a/package/dbus-cxx/dbus-cxx.mk +++ b/package/dbus-cxx/dbus-cxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_CXX_VERSION = 2.3.0 +DBUS_CXX_VERSION = 2.3.1 DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION)) 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 From yann.morin.1998 at free.fr Mon Feb 20 20:57:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:48 -0000 Subject: [Buildroot] [git commit branch/next] package/libxml2: switch to https download Message-ID: <20230220205239.2805A7FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4426874cd337e59db0fed846e625ba45a4fd43fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/libxml2/libxml2.hash | 2 +- package/libxml2/libxml2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 00daa21a83..6957e2ed87 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.10/libxml2-2.10.3.sha256sum +# From https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.3.sha256sum sha256 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c libxml2-2.10.3.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 321e8b756b..7a01dc4259 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -8,7 +8,7 @@ LIBXML2_VERSION_MAJOR = 2.10 LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).3 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/libxml2/$(LIBXML2_VERSION_MAJOR) + https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = Copyright From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:48 -0000 Subject: [Buildroot] [git commit branch/next] package/lcms2: bump to version 2.14 Message-ID: <20230220205217.D5A8A86494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7589bafecd9153d2d7d31978b245e184098753d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://littlecms.com/blog/2022/11/02/lcms2-2.14 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lcms2/lcms2.hash | 6 +++--- package/lcms2/lcms2.mk | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/lcms2/lcms2.hash b/package/lcms2/lcms2.hash index d20cf601fb..700b9746f1 100644 --- a/package/lcms2/lcms2.hash +++ b/package/lcms2/lcms2.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.13 -sha1 72d0a0b7fbaeca12eb0186ab5728eb0f26806b22 lcms2-2.13.1.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.14 +sha1 94350a2638fe58da736e8726048c859b46a69e6f lcms2-2.14.tar.gz # Locally computed: -sha256 d473e796e7b27c5af01bd6d1552d42b45b43457e7182ce9903f38bb748203b88 lcms2-2.13.1.tar.gz +sha256 28474ea6f6591c4d4cee972123587001a4e6e353412a41b3e9e82219818d5740 lcms2-2.14.tar.gz sha256 46d4e05af3bce75332a12d01f19bcce7e32b6bac544be28a64043d0231291e31 COPYING diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index 63750c43f2..743b0ec858 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -4,9 +4,8 @@ # ################################################################################ -LCMS2_VERSION_MAJOR = 2.13 -LCMS2_VERSION = $(LCMS2_VERSION_MAJOR).1 -LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION_MAJOR) +LCMS2_VERSION = 2.14 +LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING LCMS2_CPE_ID_VENDOR = littlecms From yann.morin.1998 at free.fr Mon Feb 20 20:57:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:49 -0000 Subject: [Buildroot] [git commit branch/next] package/metacity: switch to https download Message-ID: <20230220205239.3CF0986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=86b0605de12023c930f530ebb32125556d265a0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/metacity/metacity.hash | 2 +- package/metacity/metacity.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/metacity/metacity.hash b/package/metacity/metacity.hash index 583db0f204..2aca099038 100644 --- a/package/metacity/metacity.hash +++ b/package/metacity/metacity.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/metacity/2.25/metacity-2.25.1.sha256sum +# From https://download.gnome.org/sources/metacity/2.25/metacity-2.25.1.sha256sum sha256 fb2ede4ac02d7da08d3c3323fb76afaf945c8cccc07cb2d3a4b7f44fb49f1c47 metacity-2.25.1.tar.bz2 # Locally computed diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk index f5a6d4afd9..5756658300 100644 --- a/package/metacity/metacity.mk +++ b/package/metacity/metacity.mk @@ -8,7 +8,7 @@ METACITY_VERSION_MAJOR = 2.25 METACITY_VERSION = $(METACITY_VERSION_MAJOR).1 METACITY_SOURCE = metacity-$(METACITY_VERSION).tar.bz2 -METACITY_SITE = http://ftp.gnome.org/pub/gnome/sources/metacity/$(METACITY_VERSION_MAJOR) +METACITY_SITE = https://download.gnome.org/sources/metacity/$(METACITY_VERSION_MAJOR) METACITY_LICENSE = GPL-2.0+ METACITY_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:50 -0000 Subject: [Buildroot] [git commit branch/next] package/mutt: bump to version 2.2.9 Message-ID: <20230220205217.F031A81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a2afdb7b1180bed3b6ad92c22c908805467ead3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Mutt 2.2.9 was released on November 12, 2022. This is a bug-fix release, fixing a build issue with recent GPGME releases. Mutt 2.2.8 was released on November 5, 2022. This is a bug-fix release, fixing a possible crash when using GPGME to view an application/pgp key block. It also makes some changes to resizing and window size logic, and enables batch-mode IMAP Fcc'ing. https://gitlab.com/muttmua/mutt/-/blob/mutt-2-2-9-rel/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index 27e439183a..c475641ab5 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eb13858f58bb369f477bf652d90e9b6aaddd0d610acbea3455049e5efad36df1 mutt-2.2.7.tar.gz +sha256 fa531b231d58fe1f30ceda0ed626683ea9ebdfb76ce47ef8bb27c2f77422cffb mutt-2.2.9.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 7a4bc1b10c..0a98396d88 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.2.7 +MUTT_VERSION = 2.2.9 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:50 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: add libdeflate optional dependency Message-ID: <20230220205218.189D38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08ca8ff727c87fce2c6edcb9fc2df0885c22543b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libdeflate is an optional dependency which is enabled by default since version 4.2.0 and https://gitlab.com/libtiff/libtiff/-/commit/3a2de853a932bd0ea79d1677d319841edb736c38 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tiff/Config.in | 5 +++++ package/tiff/tiff.mk | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index f842c2ead8..cc9aa5cfd0 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -11,6 +11,11 @@ config BR2_PACKAGE_TIFF_CCITT bool "CCITT Group 3 & 4 support" default y +config BR2_PACKAGE_TIFF_LIBDEFLATE + bool "Libdeflate usage (still requires Zlib)" + select BR2_PACKAGE_LIBDEFLATE + select BR2_PACKAGE_TIFF_ZLIB + config BR2_PACKAGE_TIFF_PACKBITS bool "Macintosh PackBits algorithm" default y diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 7981bdf2c9..a753065fde 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -33,6 +33,13 @@ ifneq ($(BR2_PACKAGE_TIFF_CCITT),y) TIFF_CONF_OPTS += --disable-ccitt endif +ifeq ($(BR2_PACKAGE_TIFF_LIBDEFLATE),y) +TIFF_CONF_OPTS += --enable-libdeflate +TIFF_DEPENDENCIES += libdeflate +else +TIFF_CONF_OPTS += --disable-libdeflate +endif + ifneq ($(BR2_PACKAGE_TIFF_PACKBITS),y) TIFF_CONF_OPTS += --disable-packbits endif From yann.morin.1998 at free.fr Mon Feb 20 20:57:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:50 -0000 Subject: [Buildroot] [git commit branch/next] package/mono-gtksharp3: switch to https download Message-ID: <20230220205239.52C03828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97ceb937a1f3c359b14b524f636f5fddfa09d48d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/mono-gtksharp3/mono-gtksharp3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mono-gtksharp3/mono-gtksharp3.mk b/package/mono-gtksharp3/mono-gtksharp3.mk index 126aabeda2..27fcda9482 100644 --- a/package/mono-gtksharp3/mono-gtksharp3.mk +++ b/package/mono-gtksharp3/mono-gtksharp3.mk @@ -6,7 +6,7 @@ MONO_GTKSHARP3_VERSION_MAJOR = 2.99 MONO_GTKSHARP3_VERSION = $(MONO_GTKSHARP3_VERSION_MAJOR).3 -MONO_GTKSHARP3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk-sharp/$(MONO_GTKSHARP3_VERSION_MAJOR) +MONO_GTKSHARP3_SITE = https://download.gnome.org/sources/gtk-sharp/$(MONO_GTKSHARP3_VERSION_MAJOR) MONO_GTKSHARP3_SOURCE = gtk-sharp-$(MONO_GTKSHARP3_VERSION).tar.xz MONO_GTKSHARP3_LICENSE = LGPL-2.0, MIT (cairo) MONO_GTKSHARP3_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:51 -0000 Subject: [Buildroot] [git commit branch/next] package/wilc-driver: fix build failure up to Linux 6.1 Message-ID: <20230220205217.A3F428648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=482d18a40d98dcc156437c9a01b869b510e93fc4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add patches pending upstream[0] to handle various data types and api changes up to Linux 6.1. [0]: https://github.com/embeddedTS/wilc3000-external-module/pull/2 Fixes: http://autobuild.buildroot.net/results/6aa7475a21a6060e9fce3552f73e6e7100a8b2aa Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...-fix-missing-prandom_u32-with-Linux-6.1.0.patch | 34 ++++ ...pi.c-fix-build-failure-on-remove-callback.patch | 44 +++++ ...fix-build-failure-with-Linux-5.19-and-6.1.patch | 98 ++++++++++ ...station_parameters-Linux-6.1-build-failur.patch | 216 +++++++++++++++++++++ 4 files changed, 392 insertions(+) diff --git a/package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch b/package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch new file mode 100644 index 0000000000..2f10627301 --- /dev/null +++ b/package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch @@ -0,0 +1,34 @@ +From f80e4343fa0a4d8b22933d1704c85a771fe234a4 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 19:56:46 +0100 +Subject: [PATCH] cfg80211.c: fix missing prandom_u32() with Linux >= 6.1.0 + +prandom_u32() previously was only calling get_random_u32() so it's been +dropped with Linux 6.1.0. So let's directly call get_random_u32() if Linux +version >= 6.1.0. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cfg80211.c b/cfg80211.c +index 016aa06..41edd02 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -1422,7 +1422,11 @@ static int mgmt_tx(struct wiphy *wiphy, + const u8 *vendor_ie; + int ret = 0; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ *cookie = get_random_u32(); ++#else + *cookie = prandom_u32(); ++#endif + priv->tx_cookie = *cookie; + mgmt = (const struct ieee80211_mgmt *)buf; + +-- +2.34.1 + diff --git a/package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch b/package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch new file mode 100644 index 0000000000..87306dfa12 --- /dev/null +++ b/package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch @@ -0,0 +1,44 @@ +From a88819bd63f977b5a33d72a2b9e264ce104726bd Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 21:02:12 +0100 +Subject: [PATCH] spi.c: fix build failure on remove callback + +Starting from Linux 5.18 remove callback returns void, so let's deal with +it depending on Linux version >= 5.18. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + spi.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/spi.c b/spi.c +index 96c51fe..f7b43e2 100644 +--- a/spi.c ++++ b/spi.c +@@ -211,7 +211,11 @@ free: + return ret; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)) ++static void wilc_bus_remove(struct spi_device *spi) ++#else + static int wilc_bus_remove(struct spi_device *spi) ++#endif + { + struct wilc *wilc = spi_get_drvdata(spi); + +@@ -220,7 +224,10 @@ static int wilc_bus_remove(struct spi_device *spi) + + wilc_netdev_cleanup(wilc); + wilc_bt_deinit(); ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)) + return 0; ++#endif + } + + static int wilc_spi_suspend(struct device *dev) +-- +2.34.1 + diff --git a/package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch b/package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch new file mode 100644 index 0000000000..785b8904b2 --- /dev/null +++ b/package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch @@ -0,0 +1,98 @@ +From a608cdd7903505217529317c04b5b58cb7e25081 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 21:06:43 +0100 +Subject: [PATCH] cfg80211.c: fix build failure with Linux 5.19 and 6.1 + +Starting from Linux 5.19 stop_ap() requires unsigned int link_id as +parameter. Then from Linux 6.1 on lot of other cfg80211 APIs require +int link_id to deal with MLO, so let's add that parameter too. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 35 +++++++++++++++++++++++++++++------ + 1 file changed, 29 insertions(+), 6 deletions(-) + +diff --git a/cfg80211.c b/cfg80211.c +index 41edd02..57c777d 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -674,8 +674,12 @@ static int wilc_wfi_cfg_copy_wpa_info(struct wilc_wfi_key *key_info, + return 0; + } + +-static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, +- bool pairwise, const u8 *mac_addr, struct key_params *params) ++static int add_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif ++ u8 key_index, bool pairwise, const u8 *mac_addr, ++ struct key_params *params) + + { + int ret = 0, keylen = params->key_len, seqlen = params->seq_len; +@@ -792,6 +796,9 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, + } + + static int del_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif + u8 key_index, + bool pairwise, + const u8 *mac_addr) +@@ -833,9 +840,13 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev, + return ret; + } + +-static int get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, +- bool pairwise, const u8 *mac_addr, void *cookie, +- void (*callback)(void *cookie, struct key_params *)) ++static int get_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif ++ u8 key_index, bool pairwise, const u8 *mac_addr, ++ void *cookie, void (*callback)(void *cookie, ++ struct key_params *)) + { + struct wilc_vif *vif = netdev_priv(netdev); + struct wilc_priv *priv = &vif->priv; +@@ -877,12 +888,18 @@ static int get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, + + /* wiphy_new() will WARN if not present*/ + static int set_default_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif + u8 key_index, bool unicast, bool multicast) + { + return 0; + } + + static int set_default_mgmt_key (struct wiphy *wiphy,struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif + u8 key_index) + { + return 0; +@@ -1814,7 +1831,13 @@ static int change_beacon(struct wiphy *wiphy, struct net_device *dev, + return wilc_add_beacon(vif, 0, 0, beacon); + } + +-static int stop_ap(struct wiphy *wiphy, struct net_device *dev) ++static int stop_ap(struct wiphy *wiphy, struct net_device *dev ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)) ++ , unsigned int link_id ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ , int link_id ++#endif ++ ) + { + int ret; + struct wilc_vif *vif = netdev_priv(dev); +-- +2.34.1 + diff --git a/package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch b/package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch new file mode 100644 index 0000000000..faee805b5a --- /dev/null +++ b/package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch @@ -0,0 +1,216 @@ +From 5f022c4d3be32493d500be82f51032ef4fb3cdc0 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 21:08:45 +0100 +Subject: [PATCH] Fix struct station_parameters Linux 6.1 build failure + +Starting from Linux 6.1 struct station_parameters has changed by moving +some member to its child struct link_station_parameters. Let's extract the +values of the needed members into local values at the beginning of +functions and substitute the member access with the local variables. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 48 ++++++++++++++++++++++++++++++++---------------- + hif.c | 44 ++++++++++++++++++++++++++++++++------------ + 2 files changed, 64 insertions(+), 28 deletions(-) + +diff --git a/cfg80211.c b/cfg80211.c +index 57c777d..bdd480c 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -1866,6 +1866,14 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev, + struct wilc_vif *vif = netdev_priv(dev); + struct wilc_priv *priv = &vif->priv; + u8 *assoc_bss = priv->assoc_stainfo.sta_associated_bss[params->aid]; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++#endif + + if (vif->iftype == WILC_AP_MODE || vif->iftype == WILC_GO_MODE) { + memcpy(assoc_bss, mac, ETH_ALEN); +@@ -1879,27 +1887,27 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev, + params->aid); + PRINT_INFO(vif->ndev, HOSTAPD_DBG, + "Number of supported rates = %d\n", +- params->supported_rates_len); ++ supported_rates_len); + + PRINT_INFO(vif->ndev, CFG80211_DBG, "IS HT supported = %d\n", +- (!params->ht_capa) ? false : true); ++ (!ht_capa) ? false : true); + +- if (params->ht_capa) { ++ if (ht_capa) { + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Capability Info = %d\n", +- params->ht_capa->cap_info); ++ ht_capa->cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "AMPDU Params = %d\n", +- params->ht_capa->ampdu_params_info); ++ ht_capa->ampdu_params_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "HT Extended params= %d\n", +- params->ht_capa->extended_ht_cap_info); ++ ht_capa->extended_ht_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Tx Beamforming Cap= %d\n", +- params->ht_capa->tx_BF_cap_info); ++ ht_capa->tx_BF_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Antenna selection info = %d\n", +- params->ht_capa->antenna_selection_info); ++ ht_capa->antenna_selection_info); + } + + PRINT_INFO(vif->ndev, CFG80211_DBG, "Flag Mask = %d\n", +@@ -1966,6 +1974,14 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev, + { + int ret = 0; + struct wilc_vif *vif = netdev_priv(dev); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++#endif + + PRINT_D(vif->ndev, CFG80211_DBG, "Change station parameters\n"); + +@@ -1976,25 +1992,25 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev, + params->aid); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Number of supported rates = %d\n", +- params->supported_rates_len); ++ supported_rates_len); + PRINT_INFO(vif->ndev, CFG80211_DBG, "IS HT supported = %d\n", +- (!params->ht_capa) ? false : true); +- if (params->ht_capa) { ++ (!ht_capa) ? false : true); ++ if (ht_capa) { + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Capability Info = %d\n", +- params->ht_capa->cap_info); ++ ht_capa->cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "AMPDU Params = %d\n", +- params->ht_capa->ampdu_params_info); ++ ht_capa->ampdu_params_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "HT Extended params= %d\n", +- params->ht_capa->extended_ht_cap_info); ++ ht_capa->extended_ht_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Tx Beamforming Cap= %d\n", +- params->ht_capa->tx_BF_cap_info); ++ ht_capa->tx_BF_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Antenna selection info = %d\n", +- params->ht_capa->antenna_selection_info); ++ ht_capa->antenna_selection_info); + } + PRINT_INFO(vif->ndev, CFG80211_DBG, "Flag Mask = %d\n", + params->sta_flags_mask); +diff --git a/hif.c b/hif.c +index 3f672a0..1a7365b 100644 +--- a/hif.c ++++ b/hif.c +@@ -2249,6 +2249,16 @@ int wilc_add_station(struct wilc_vif *vif, const u8 *mac, + int result; + struct host_if_msg *msg; + struct add_sta_param *sta_params; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++ const u8 *supported_rates = link_sta_params->supported_rates; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++ const u8 *supported_rates = params->supported_rates; ++#endif + + PRINT_INFO(vif->ndev, HOSTINF_DBG, + "Setting adding station message queue params\n"); +@@ -2260,20 +2270,20 @@ int wilc_add_station(struct wilc_vif *vif, const u8 *mac, + sta_params = &msg->body.add_sta_info; + memcpy(sta_params->bssid, mac, ETH_ALEN); + sta_params->aid = params->aid; +- if (!params->ht_capa) { ++ if (!ht_capa) { + sta_params->ht_supported = false; + } else { + sta_params->ht_supported = true; +- memcpy(&sta_params->ht_capa, params->ht_capa, ++ memcpy(&sta_params->ht_capa, ht_capa, + sizeof(struct ieee80211_ht_cap)); + } + sta_params->flags_mask = params->sta_flags_mask; + sta_params->flags_set = params->sta_flags_set; + +- sta_params->supported_rates_len = params->supported_rates_len; +- if (params->supported_rates_len > 0) { +- sta_params->supported_rates = kmemdup(params->supported_rates, +- params->supported_rates_len, ++ sta_params->supported_rates_len = supported_rates_len; ++ if (supported_rates_len > 0) { ++ sta_params->supported_rates = kmemdup(supported_rates, ++ supported_rates_len, + GFP_KERNEL); + if (!sta_params->supported_rates) { + kfree(msg); +@@ -2397,6 +2407,16 @@ int wilc_edit_station(struct wilc_vif *vif, const u8 *mac, + int result; + struct host_if_msg *msg; + struct add_sta_param *sta_params; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++ const u8 *supported_rates = link_sta_params->supported_rates; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++ const u8 *supported_rates = params->supported_rates; ++#endif + + PRINT_INFO(vif->ndev, HOSTINF_DBG, + "Setting editing station message queue params\n"); +@@ -2408,20 +2428,20 @@ int wilc_edit_station(struct wilc_vif *vif, const u8 *mac, + sta_params = &msg->body.edit_sta_info; + memcpy(sta_params->bssid, mac, ETH_ALEN); + sta_params->aid = params->aid; +- if (!params->ht_capa) { ++ if (!ht_capa) { + sta_params->ht_supported = false; + } else { + sta_params->ht_supported = true; +- memcpy(&sta_params->ht_capa, params->ht_capa, ++ memcpy(&sta_params->ht_capa, ht_capa, + sizeof(struct ieee80211_ht_cap)); + } + sta_params->flags_mask = params->sta_flags_mask; + sta_params->flags_set = params->sta_flags_set; + +- sta_params->supported_rates_len = params->supported_rates_len; +- if (params->supported_rates_len > 0) { +- sta_params->supported_rates = kmemdup(params->supported_rates, +- params->supported_rates_len, ++ sta_params->supported_rates_len = supported_rates_len; ++ if (supported_rates_len > 0) { ++ sta_params->supported_rates = kmemdup(supported_rates, ++ supported_rates_len, + GFP_KERNEL); + if (!sta_params->supported_rates) { + kfree(msg); +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:57:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:51 -0000 Subject: [Buildroot] [git commit branch/next] package/pangomm: switch to https download Message-ID: <20230220205239.68F2786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3ecb398b113439351e8e26122763028efce10cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/pangomm/pangomm.hash | 2 +- package/pangomm/pangomm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pangomm/pangomm.hash b/package/pangomm/pangomm.hash index 3fba695831..0fb40e6568 100644 --- a/package/pangomm/pangomm.hash +++ b/package/pangomm/pangomm.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/pangomm/2.48/pangomm-2.48.2.sha256sum +# From https://download.gnome.org/sources/pangomm/2.48/pangomm-2.48.2.sha256sum sha256 e1d75522c53f462799875cd247f9b49c91ced4b1abe68387ac35b271392d4ea5 pangomm-2.48.2.tar.xz # Locally computed sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/pangomm/pangomm.mk b/package/pangomm/pangomm.mk index af90d69c4e..e5b237197b 100644 --- a/package/pangomm/pangomm.mk +++ b/package/pangomm/pangomm.mk @@ -7,7 +7,7 @@ PANGOMM_VERSION_MAJOR = 2.48 PANGOMM_VERSION = $(PANGOMM_VERSION_MAJOR).2 PANGOMM_SOURCE = pangomm-$(PANGOMM_VERSION).tar.xz -PANGOMM_SITE = http://ftp.gnome.org/pub/gnome/sources/pangomm/$(PANGOMM_VERSION_MAJOR) +PANGOMM_SITE = https://download.gnome.org/sources/pangomm/$(PANGOMM_VERSION_MAJOR) PANGOMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) PANGOMM_LICENSE_FILES = COPYING COPYING.tools PANGOMM_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:52 -0000 Subject: [Buildroot] [git commit branch/next] package/python-aiohttp-remotes: bump to version 1.2.0 Message-ID: <20230220205218.6BBB681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65d14c82db6e6c4555cc83b65ff22578e4525601 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate from distutils to flit package infrastructure. Add a patch fixing incorrect flit requires/build-backend in pyproject.toml. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...0001-Fix-flit_core-build-requires-backend.patch | 32 ++++++++++++++++++++++ .../python-aiohttp-remotes.hash | 4 +-- .../python-aiohttp-remotes.mk | 6 ++-- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch b/package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch new file mode 100644 index 0000000000..cf940eaf87 --- /dev/null +++ b/package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch @@ -0,0 +1,32 @@ +From 3d39ee9a03a1c96b8e798dc6acf98165da31da1f Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 11 Mar 2022 12:59:53 -0700 +Subject: [PATCH] Fix flit_core build requires/backend. + +Only flit_core should be required by pyproject.toml, the regular flit +package is the pep517 frontend which is not what should be set for the +build system. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/aio-libs/aiohttp-remotes/pull/355] +--- + pyproject.toml | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 214d64d..8c6b882 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,6 +1,6 @@ + [build-system] +-requires=["flit"] +-build-backend="flit.buildapi" ++requires=["flit_core"] ++build-backend="flit_core.buildapi" + + [tool.flit.metadata] + module="aiohttp_remotes" +-- +2.38.1 + diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash index 595340d5d8..51c5cf08b4 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-remotes/json -md5 da13880f25ec3b9cf98c7baff92835a2 aiohttp_remotes-1.1.0.tar.gz -sha256 e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174 aiohttp_remotes-1.1.0.tar.gz +md5 c46a71df656e7f1e111684ced68a85d0 aiohttp_remotes-1.2.0.tar.gz +sha256 f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c aiohttp_remotes-1.2.0.tar.gz # Locally computed sha256 checksums sha256 4e7d0edf250abe2a28027788b8c55a53d1b5c9ff961b8a00643c76aed637ba13 LICENSE diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk index e2bc3e1c18..e0ec789f41 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_AIOHTTP_REMOTES_VERSION = 1.1.0 +PYTHON_AIOHTTP_REMOTES_VERSION = 1.2.0 PYTHON_AIOHTTP_REMOTES_SOURCE = aiohttp_remotes-$(PYTHON_AIOHTTP_REMOTES_VERSION).tar.gz -PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/e3/fc/5523010172e2d8685a8934fbb49d564118c9ebc1e4233a62b77310f979db -PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = distutils +PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/54/05/7c4be6171cc78a13171a4f89e5d308c4a636bdd8ee36101367e99e410ed8 +PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = flit PYTHON_AIOHTTP_REMOTES_LICENSE = MIT PYTHON_AIOHTTP_REMOTES_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:57:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:52 -0000 Subject: [Buildroot] [git commit branch/next] package/vte: switch to https download Message-ID: <20230220205239.8CDF48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4befb442e2fe1e5438fa5cee8c8a79ded69c832 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/vte/vte.hash | 2 +- package/vte/vte.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vte/vte.hash b/package/vte/vte.hash index 90818d31f3..8c84dfce1a 100644 --- a/package/vte/vte.hash +++ b/package/vte/vte.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/vte/0.66/vte-0.66.2.sha256sum +# Hash from: https://download.gnome.org/sources/vte/0.66/vte-0.66.2.sha256sum sha256 e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976 vte-0.66.2.tar.xz # Hash for license file: diff --git a/package/vte/vte.mk b/package/vte/vte.mk index ceb2f09d67..a68d96aa12 100644 --- a/package/vte/vte.mk +++ b/package/vte/vte.mk @@ -7,7 +7,7 @@ VTE_VERSION_MAJOR = 0.66 VTE_VERSION = $(VTE_VERSION_MAJOR).2 VTE_SOURCE = vte-$(VTE_VERSION).tar.xz -VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) +VTE_SITE = https://download.gnome.org/sources/vte/$(VTE_VERSION_MAJOR) VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) VTE_LICENSE = LGPL-3.0+ VTE_LICENSE_FILES = COPYING.LGPL3 From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:53 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-image-exiftool: new package Message-ID: <20230220205218.5DB278648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e4b0d8be54ce6dd9c54f1c04eeb752db2f0dcf3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/perl-image-exiftool/Config.in | 8 ++++++++ package/perl-image-exiftool/perl-image-exiftool.hash | 6 ++++++ package/perl-image-exiftool/perl-image-exiftool.mk | 14 ++++++++++++++ 4 files changed, 29 insertions(+) diff --git a/package/Config.in b/package/Config.in index 0c77f7c022..41e15ca77f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -839,6 +839,7 @@ menu "Perl libraries/modules" source "package/perl-http-multipartparser/Config.in" source "package/perl-http-negotiate/Config.in" source "package/perl-i18n/Config.in" + source "package/perl-image-exiftool/Config.in" source "package/perl-io-html/Config.in" source "package/perl-io-interface/Config.in" source "package/perl-io-socket-multicast/Config.in" diff --git a/package/perl-image-exiftool/Config.in b/package/perl-image-exiftool/Config.in new file mode 100644 index 0000000000..3bc72ba634 --- /dev/null +++ b/package/perl-image-exiftool/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PERL_IMAGE_EXIFTOOL + bool "perl-image-exiftool" + help + ExifTool is a customizable set of Perl modules plus a + full-featured command-line application for reading and writing + meta information in a wide variety of image files. + + https://metacpan.org/release/Image-ExifTool diff --git a/package/perl-image-exiftool/perl-image-exiftool.hash b/package/perl-image-exiftool/perl-image-exiftool.hash new file mode 100644 index 0000000000..ac148aa89b --- /dev/null +++ b/package/perl-image-exiftool/perl-image-exiftool.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 75dd9d375c1c4798a082dda79eaf6ba7 Image-ExifTool-12.50.tar.gz +sha256 bce841fc5c10302f0f3ef7678c3bf146953a8c065c0ba18c41f734007e2ec0a8 Image-ExifTool-12.50.tar.gz + +# computed by scancpan +sha256 63502bb7fd68b3b8265304d88932f70f1be82751cbc37936d1d62956582310fe README diff --git a/package/perl-image-exiftool/perl-image-exiftool.mk b/package/perl-image-exiftool/perl-image-exiftool.mk new file mode 100644 index 0000000000..42adb04d3a --- /dev/null +++ b/package/perl-image-exiftool/perl-image-exiftool.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-image-exiftool +# +################################################################################ + +PERL_IMAGE_EXIFTOOL_VERSION = 12.50 +PERL_IMAGE_EXIFTOOL_SOURCE = Image-ExifTool-$(PERL_IMAGE_EXIFTOOL_VERSION).tar.gz +PERL_IMAGE_EXIFTOOL_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/EX/EXIFTOOL +PERL_IMAGE_EXIFTOOL_LICENSE = Artistic or GPL-1.0+ +PERL_IMAGE_EXIFTOOL_LICENSE_FILES = README +PERL_IMAGE_EXIFTOOL_DISTNAME = Image-ExifTool + +$(eval $(perl-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:54 -0000 Subject: [Buildroot] [git commit branch/next] package/rsync: add openssl support Message-ID: <20230220205218.B433D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80fa5672da85a110e60be0d2143e85f9e08a0f4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 9c7824f575..d2fa47d39a 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -18,7 +18,6 @@ RSYNC_CONF_OPTS = \ --with-included-zlib=no \ --with-included-popt=no \ --disable-roll-simd \ - --disable-openssl \ --disable-md5-asm ifeq ($(BR2_PACKAGE_ACL),y) @@ -34,6 +33,13 @@ else RSYNC_CONF_OPTS += --disable-lz4 endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +RSYNC_DEPENDENCIES += openssl +RSYNC_CONF_OPTS += --enable-openssl +else +RSYNC_CONF_OPTS += --disable-openssl +endif + ifeq ($(BR2_PACKAGE_XXHASH),y) RSYNC_DEPENDENCIES += xxhash RSYNC_CONF_OPTS += --enable-xxhash From peter at korsgaard.com Mon Feb 20 20:57:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:54 -0000 Subject: [Buildroot] [git commit branch/next] package/timescaledb: bump version to 2.9.1 Message-ID: <20230220205239.D1ADC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5d73033b8683df83d0ca9eb172b885d33a5ea64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/timescale/timescaledb/releases/tag/2.9.1 Signed-off-by: Maxim Kochetkov 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 a970ffa1ad..a6560eb326 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 666f5427cb036500bca731d24d845285299cff82f576ad4474f85da682b2ee78 timescaledb-2.9.0.tar.gz +sha256 883638f2e79d25ec88ee58f603f3c81c999b6364cb4c799919d363f04089b47b timescaledb-2.9.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 7530368498..44e365285b 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.9.0 +TIMESCALEDB_VERSION = 2.9.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:55 -0000 Subject: [Buildroot] [git commit branch/next] package/python-munch: select missing runtime dependencies Message-ID: <20230220205219.046358648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72576a661faf8e9d8021a8b110ce9318a9bc8f38 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next munch requires python-setuptools and python-six packages at runtime. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-munch/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-munch/Config.in b/package/python-munch/Config.in index 9db2623674..ceb9fbaf32 100644 --- a/package/python-munch/Config.in +++ b/package/python-munch/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_MUNCH bool "python-munch" + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime help Munch is a dictionary that supports attribute-style access, a la JavaScript. From peter at korsgaard.com Mon Feb 20 20:57:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:55 -0000 Subject: [Buildroot] [git commit branch/next] package/tcpdump: bump to version 4.99.3 Message-ID: <20230220205239.EA972828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5bce041aec61ac9925d5059edf13c9499896daac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/tcpdump/tcpdump.hash | 4 ++-- package/tcpdump/tcpdump.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index a950d3fa66..e548e32626 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature at -# https://www.tcpdump.org/release/tcpdump-4.99.2.tar.gz.sig +# https://www.tcpdump.org/release/tcpdump-4.99.3.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 f4304357d34b79d46f4e17e654f1f91f9ce4e3d5608a1badbd53295a26fb44d5 tcpdump-4.99.2.tar.gz +sha256 ad75a6ed3dc0d9732945b2e5483cb41dc8b4b528a169315e499c6861952e73b3 tcpdump-4.99.3.tar.gz sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index c38d46e2cd..7a679ce4bf 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.99.2 +TCPDUMP_VERSION = 4.99.3 TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:56 -0000 Subject: [Buildroot] [git commit branch/next] package/wireshark: security bump to version 3.4.16 Message-ID: <20230220205218.7C3DF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b86de52da2141ed289ad2892c34d3110d02f7b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-3190: Infinite loop in the F5 Ethernet Trailer protocol dissector in Wireshark 3.6.0 to 3.6.7 and 3.4.0 to 3.4.15 allows denial of service via packet injection or crafted capture file https://www.wireshark.org/security/wnpa-sec-2022-06.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- 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 db1f71e9ef..56363e717f 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.12.txt -sha1 91ca69b0029e58b9c824266237ab392a62f0a248 wireshark-3.4.12.tar.xz -sha256 881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca wireshark-3.4.12.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.16.txt +sha1 b0e64d5fdd6701106d94bdc8f59dd40a34c7c807 wireshark-3.4.16.tar.xz +sha256 6acb3155b89b65bcdbcdac7a9e6a59013a6e21d8ae6a8249a9af4fe9ce3d91ba wireshark-3.4.16.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index e5d5e6f677..5da344fc55 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.12 +WIRESHARK_VERSION = 3.4.16 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:57 -0000 Subject: [Buildroot] [git commit branch/next] package/xxhash: optimize XXHASH_{TARGETS, INSTALL_TARGETS} Message-ID: <20230220205218.8A26186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3de4ae012141803bdf8abda12e27d10e55f6953f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Optimize XXHASH_{TARGETS,INSTALL_TARGETS} as suggested by Thomas Petazzoni in https://patchwork.ozlabs.org/project/buildroot/patch/20221228221522.280696-1-fontaine.fabrice at gmail.com/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xxhash/xxhash.mk | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 6932113f14..04bc98690f 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -10,28 +10,20 @@ XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) XXHASH_LICENSE_FILES = LICENSE cli/COPYING XXHASH_INSTALL_STAGING = YES -XXHASH_TARGETS = xxhsum -XXHASH_INSTALL_TARGETS = install_xxhsum - -ifeq ($(BR2_STATIC_LIBS),y) -XXHASH_TARGETS += libxxhash.a libxxhash.pc -XXHASH_INSTALL_TARGETS += \ - install_libxxhash.a \ - install_libxxhash.includes \ - install_libxxhash.pc -else ifeq ($(BR2_SHARED_LIBS),y) -XXHASH_TARGETS += libxxhash libxxhash.pc -XXHASH_INSTALL_TARGETS += \ - install_libxxhash \ - install_libxxhash.includes \ - install_libxxhash.pc -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -XXHASH_TARGETS += libxxhash.a libxxhash libxxhash.pc -XXHASH_INSTALL_TARGETS += \ - install_libxxhash.a \ - install_libxxhash \ +XXHASH_TARGETS = xxhsum libxxhash.pc +XXHASH_INSTALL_TARGETS = \ install_libxxhash.includes \ - install_libxxhash.pc + install_libxxhash.pc \ + install_xxhsum + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +XXHASH_TARGETS += libxxhash.a +XXHASH_INSTALL_TARGETS += install_libxxhash.a +endif + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +XXHASH_TARGETS += libxxhash +XXHASH_INSTALL_TARGETS += install_libxxhash endif define XXHASH_BUILD_CMDS From peter at korsgaard.com Mon Feb 20 20:57:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:58 -0000 Subject: [Buildroot] [git commit branch/next] package/c-icap-modules: bump to version 0.5.5 Message-ID: <20230220205240.4409081979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58cc22a6d095b9b589e5b001e005032589749084 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://sourceforge.net/p/c-icap/news/2021/03/the-c-icap-modules-055-is-released Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/c-icap-modules/c-icap-modules.hash | 6 +++--- package/c-icap-modules/c-icap-modules.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/c-icap-modules/c-icap-modules.hash b/package/c-icap-modules/c-icap-modules.hash index cc7949a092..110ffd4de3 100644 --- a/package/c-icap-modules/c-icap-modules.hash +++ b/package/c-icap-modules/c-icap-modules.hash @@ -1,7 +1,7 @@ # From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.5.x/ -md5 2f8c174f7a5414616f5a0a976ac4a221 c_icap_modules-0.5.4.tar.gz -sha1 ec7bb138d7775895cd8b2e12adc41dbf48eba1b7 c_icap_modules-0.5.4.tar.gz +md5 ca6d5d124a4668d63affcaa5ab083e57 c_icap_modules-0.5.5.tar.gz +sha1 67be484a93fe662a7735ee06e1d34d82b54469a8 c_icap_modules-0.5.5.tar.gz # Locally calculated -sha256 87409920c66027204e9cca5f20e137b63cd12daf6dfcd85c1fa62ab2bd1c57cc c_icap_modules-0.5.4.tar.gz +sha256 6a42f1fdd8c35ad38d29f7d3c10f925471977f217086352e146cf95e45f2b5b5 c_icap_modules-0.5.5.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/c-icap-modules/c-icap-modules.mk b/package/c-icap-modules/c-icap-modules.mk index 2eaa141afe..e9bbbdb284 100644 --- a/package/c-icap-modules/c-icap-modules.mk +++ b/package/c-icap-modules/c-icap-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ICAP_MODULES_VERSION = 0.5.4 +C_ICAP_MODULES_VERSION = 0.5.5 C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_MODULES_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:58 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: add webp optional dependency Message-ID: <20230220205218.D580C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fd6ada8dbca3370b9bb67feb2971e637cb4b11f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next webp is an optional dependency which is enabled by default since version 4.0.10 and https://gitlab.com/libtiff/libtiff/-/commit/9eacd59fecc4ef593ac17689bc530ab451c8ec14 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tiff/Config.in | 4 ++++ package/tiff/tiff.mk | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index d1004d6668..b9e3656e6f 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -72,6 +72,10 @@ config BR2_PACKAGE_TIFF_UTILITIES help Install all tiff utilities. +config BR2_PACKAGE_TIFF_WEBP + bool "WEBP compression" + select BR2_PACKAGE_WEBP + config BR2_PACKAGE_TIFF_ZSTD bool "ZSTD compression" select BR2_PACKAGE_ZSTD diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 90b28ff37a..6d761ad678 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -100,6 +100,13 @@ else TIFF_CONF_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_TIFF_WEBP),y) +TIFF_CONF_OPTS += --enable-webp +TIFF_DEPENDENCIES += webp +else +TIFF_CONF_OPTS += --disable-webp +endif + ifeq ($(BR2_PACKAGE_TIFF_ZSTD),y) TIFF_CONF_OPTS += --enable-zstd TIFF_DEPENDENCIES += zstd From peter at korsgaard.com Mon Feb 20 20:57:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:59 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_kria_kv260_defconfig: use Xilinx github for pmufw.elf Message-ID: <20230220205240.5767C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a200fc4ee34fa82a7f48107e6b76acd0db600c9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate kv260_pmufw.elf location from nealfrager github to Xilinx github. The image is identical, so this patch has zero impact on functionality. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynqmp_kria_kv260_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 94631da034..e180d5e7e7 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -31,7 +31,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.2/kv260/kv260_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/2022.2_br_1/kv260/kv260_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From yann.morin.1998 at free.fr Mon Feb 20 20:57:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:59 -0000 Subject: [Buildroot] [git commit branch/next] package/modem-manager: disable tests Message-ID: <20230220205219.489F28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed631bc7525356c2e086a307e93df7d71d2fdde7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next tests can be disabled since version 1.20.0 and https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/ba96ccc61587b7b6c31b94826ee7a3c44d795364 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modem-manager/modem-manager.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 8ef85b9b1d..5b8b9c5576 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -14,6 +14,7 @@ MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIE MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = \ -Dpowerd_suspend_resume=false \ + -Dtests=false \ -Dudevdir=/usr/lib/udev ifeq ($(BR2_PACKAGE_LIBGUDEV),y) From peter at korsgaard.com Mon Feb 20 20:58:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:00 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_zcu102_defconfig: use Xilinx github for pmufw.elf Message-ID: <20230220205240.618C581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1005feccf52ce260aa794f4bf3fe84aa780b84cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate zcu102_pmufw.elf location from nealfrager github to Xilinx github. The image is identical, so this patch has zero impact on functionality. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu102_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 6047d4299c..00b33261b6 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -29,7 +29,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.2/zcu102/zcu102_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/2022.2_br_1/zcu102/zcu102_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:00 -0000 Subject: [Buildroot] [git commit branch/next] package/modem-manager: qrtr needs qmi Message-ID: <20230220205219.38BF1828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bb4288dd08c688072a25bf60c3a60e0047c1668 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: ../output-1/build/modem-manager-1.20.2/meson.build:262:2: ERROR: Assert failed: QRTR support requires QMI enabled Fixes: - http://autobuild.buildroot.org/results/04b9a41c5edbc492ef640b27d4d3d896d230cf34 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modem-manager/Config.in | 12 ++++++++++++ package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index d211d68ee1..8489e6fc86 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -25,6 +25,18 @@ config BR2_PACKAGE_MODEM_MANAGER_LIBQMI select BR2_PACKAGE_LIBQMI help This option enables support for QMI protocol + +config BR2_PACKAGE_MODEM_MANAGER_LIBQRTR + bool "QRTR support" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 # libqrtr-glib + select BR2_PACKAGE_LIBQRTR_GLIB + select BR2_PACKAGE_MODEM_MANAGER_LIBQMI + help + This option enables support for QRTR protocol + +comment "QRTR support needs a toolchain w/ headers >= 4.15" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + endif comment "modemmanager needs a toolchain w/ wchar, threads" diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 8a0dbba3a4..8ef85b9b1d 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -37,7 +37,7 @@ else MODEM_MANAGER_CONF_OPTS += -Dmbim=false endif -ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y) +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQRTR),y) MODEM_MANAGER_DEPENDENCIES += libqrtr-glib MODEM_MANAGER_CONF_OPTS += -Dqrtr=true else From peter at korsgaard.com Mon Feb 20 20:58:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:01 -0000 Subject: [Buildroot] [git commit branch/next] package/lxc: security bump to version 5.0.2 Message-ID: <20230220205240.1CB647FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd7bfba252095ffaf93d22c7379b409bbdf64d46 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Fix CVE-2022-47952: lxc-user-nic in lxc through 5.0.1 is installed setuid root, and may allow local users to infer whether any file exists, even within a protected directory tree, because "Failed to open" often indicates that a file does not exist, whereas "does not refer to a network namespace path" often indicates that a file exists. NOTE: this is different from CVE-2018-6556 because the CVE-2018-6556 fix design was based on the premise that "we will report back to the user that the open() failed but the user has no way of knowing why it failed"; however, in many realistic cases, there are no plausible reasons for failing except that the file does not exist. - Drop patches (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...etect-where-struct-mount_attr-is-declared.patch | 186 --------------------- ...ll_method_async-to-replace-the-asyncv-one.patch | 47 ------ ...003-build-detect-sys-pidfd.h-availability.patch | 55 ------ package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 5 files changed, 2 insertions(+), 290 deletions(-) diff --git a/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch b/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch deleted file mode 100644 index 8de7adcc56..0000000000 --- a/package/lxc/0001-build-detect-where-struct-mount_attr-is-declared.patch +++ /dev/null @@ -1,186 +0,0 @@ -From c1115e1503bf955c97f4cf3b925a6a9f619764c3 Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Tue, 9 Aug 2022 16:14:25 +0200 -Subject: [PATCH] build: detect where struct mount_attr is declared - -Fixes: #4176 -Signed-off-by: Christian Brauner (Microsoft) -[Retrieved from: -https://github.com/lxc/lxc/commit/c1115e1503bf955c97f4cf3b925a6a9f619764c3] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 30 ++++++++++++++++++++++++++++-- - src/lxc/conf.c | 6 +++--- - src/lxc/conf.h | 2 +- - src/lxc/mount_utils.c | 6 +++--- - src/lxc/syscall_wrappers.h | 12 ++++++++++-- - 5 files changed, 45 insertions(+), 11 deletions(-) - -diff --git a/meson.build b/meson.build -index a145faf069..f679aabbc8 100644 ---- a/meson.build -+++ b/meson.build -@@ -590,7 +590,6 @@ decl_headers = ''' - foreach decl: [ - '__aligned_u64', - 'struct clone_args', -- 'struct mount_attr', - 'struct open_how', - 'struct rtnl_link_stats64', - ] -@@ -610,7 +609,6 @@ foreach tuple: [ - ['struct seccomp_notif_sizes'], - ['struct clone_args'], - ['__aligned_u64'], -- ['struct mount_attr'], - ['struct open_how'], - ['struct rtnl_link_stats64'], - ] -@@ -630,6 +628,34 @@ foreach tuple: [ - endif - endforeach - -+## Types. -+decl_headers = ''' -+#include -+''' -+ -+# We get -1 if the size cannot be determined -+if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 -+ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), true) -+ found_types += 'struct mount_attr (sys/mount.h)' -+else -+ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) -+ missing_types += 'struct mount_attr (sys/mount.h)' -+endif -+ -+## Types. -+decl_headers = ''' -+#include -+''' -+ -+# We get -1 if the size cannot be determined -+if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 -+ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), true) -+ found_types += 'struct mount_attr (linux/mount.h)' -+else -+ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), false) -+ missing_types += 'struct mount_attr (linux/mount.h)' -+endif -+ - ## Headers. - foreach ident: [ - ['bpf', '''#include -diff --git a/src/lxc/conf.c b/src/lxc/conf.c -index ffbe74c2f6..4193cd07f5 100644 ---- a/src/lxc/conf.c -+++ b/src/lxc/conf.c -@@ -2885,7 +2885,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) - struct lxc_mount_options opts = {}; - int dfd_from; - const char *source_relative, *target_relative; -- struct lxc_mount_attr attr = {}; -+ struct mount_attr attr = {}; - - ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts); - if (ret < 0) -@@ -3005,7 +3005,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) - - /* Set propagation mount options. */ - if (opts.attr.propagation) { -- attr = (struct lxc_mount_attr) { -+ attr = (struct mount_attr) { - .propagation = opts.attr.propagation, - }; - -@@ -4109,7 +4109,7 @@ int lxc_idmapped_mounts_parent(struct lxc_handler *handler) - - for (;;) { - __do_close int fd_from = -EBADF, fd_userns = -EBADF; -- struct lxc_mount_attr attr = {}; -+ struct mount_attr attr = {}; - struct lxc_mount_options opts = {}; - ssize_t ret; - -diff --git a/src/lxc/conf.h b/src/lxc/conf.h -index 7dc2f15b60..772479f9e1 100644 ---- a/src/lxc/conf.h -+++ b/src/lxc/conf.h -@@ -223,7 +223,7 @@ struct lxc_mount_options { - unsigned long mnt_flags; - unsigned long prop_flags; - char *data; -- struct lxc_mount_attr attr; -+ struct mount_attr attr; - char *raw_options; - }; - -diff --git a/src/lxc/mount_utils.c b/src/lxc/mount_utils.c -index bba75f933c..88dd73ee36 100644 ---- a/src/lxc/mount_utils.c -+++ b/src/lxc/mount_utils.c -@@ -31,7 +31,7 @@ lxc_log_define(mount_utils, lxc); - * setting in @attr_set, but must also specify MOUNT_ATTR__ATIME in the - * @attr_clr field. - */ --static inline void set_atime(struct lxc_mount_attr *attr) -+static inline void set_atime(struct mount_attr *attr) - { - switch (attr->attr_set & MOUNT_ATTR__ATIME) { - case MOUNT_ATTR_RELATIME: -@@ -272,7 +272,7 @@ int create_detached_idmapped_mount(const char *path, int userns_fd, - { - __do_close int fd_tree_from = -EBADF; - unsigned int open_tree_flags = OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC; -- struct lxc_mount_attr attr = { -+ struct mount_attr attr = { - .attr_set = MOUNT_ATTR_IDMAP | attr_set, - .attr_clr = attr_clr, - .userns_fd = userns_fd, -@@ -335,7 +335,7 @@ int __fd_bind_mount(int dfd_from, const char *path_from, __u64 o_flags_from, - __u64 attr_clr, __u64 propagation, int userns_fd, - bool recursive) - { -- struct lxc_mount_attr attr = { -+ struct mount_attr attr = { - .attr_set = attr_set, - .attr_clr = attr_clr, - .propagation = propagation, -diff --git a/src/lxc/syscall_wrappers.h b/src/lxc/syscall_wrappers.h -index a5e98b565c..c8a7d0c7b7 100644 ---- a/src/lxc/syscall_wrappers.h -+++ b/src/lxc/syscall_wrappers.h -@@ -18,6 +18,12 @@ - #include "macro.h" - #include "syscall_numbers.h" - -+#if HAVE_STRUCT_MOUNT_ATTR -+#include -+#elif HAVE_UAPI_STRUCT_MOUNT_ATTR -+#include -+#endif -+ - #ifdef HAVE_LINUX_MEMFD_H - #include - #endif -@@ -210,16 +216,18 @@ extern int fsmount(int fs_fd, unsigned int flags, unsigned int attr_flags); - /* - * mount_setattr() - */ --struct lxc_mount_attr { -+#if !HAVE_STRUCT_MOUNT_ATTR && !HAVE_UAPI_STRUCT_MOUNT_ATTR -+struct mount_attr { - __u64 attr_set; - __u64 attr_clr; - __u64 propagation; - __u64 userns_fd; - }; -+#endif - - #if !HAVE_MOUNT_SETATTR - static inline int mount_setattr(int dfd, const char *path, unsigned int flags, -- struct lxc_mount_attr *attr, size_t size) -+ struct mount_attr *attr, size_t size) - { - return syscall(__NR_mount_setattr, dfd, path, flags, attr, size); - } diff --git a/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch b/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch deleted file mode 100644 index 22013cb363..0000000000 --- a/package/lxc/0002-use-sd_bus_call_method_async-to-replace-the-asyncv-one.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Thu, 25 Aug 2022 05:45:53 -0700 -Subject: [PATCH] use sd_bus_call_method_async to replace the asyncv one - -The sd_bus_call_method_asyncv's 10th parameter is of type -va_list and supplying NULL when invoking it causes compilation -error. Just replace it with the async one. - -Signed-off-by: Chen Qi -[Retrieved from: -https://github.com/lxc/lxc/commit/b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 4 ++-- - src/lxc/cgroups/cgfsng.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 21955a0504..f8bdcf4e83 100644 ---- a/meson.build -+++ b/meson.build -@@ -295,9 +295,9 @@ if not want_sd_bus.disabled() - has_sd_bus = false - endif - -- if not cc.has_function('sd_bus_call_method_asyncv', prefix: '#include ', dependencies: libsystemd) -+ if not cc.has_function('sd_bus_call_method_async', prefix: '#include ', dependencies: libsystemd) - if not sd_bus_optional -- error('libsystemd misses required sd_bus_call_method_asyncv function') -+ error('libsystemd misses required sd_bus_call_method_async function') - endif - - has_sd_bus = false -diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c -index 8a3615893f..d90e5385e1 100644 ---- a/src/lxc/cgroups/cgfsng.c -+++ b/src/lxc/cgroups/cgfsng.c -@@ -1232,7 +1232,7 @@ static int unpriv_systemd_create_scope(struct cgroup_ops *ops, struct lxc_conf * - if (r < 0) - return log_error(SYSTEMD_SCOPE_FAILED, "Failed to connect to user bus: %s", strerror(-r)); - -- r = sd_bus_call_method_asyncv(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL, NULL); -+ r = sd_bus_call_method_async(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL); - if (r < 0) - return log_error(SYSTEMD_SCOPE_FAILED, "Failed to subscribe to signals: %s", strerror(-r)); - diff --git a/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch b/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch deleted file mode 100644 index 3aa598407f..0000000000 --- a/package/lxc/0003-build-detect-sys-pidfd.h-availability.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ef1e0607b82e27350c2d677d649c6a0a9693fd40 Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Tue, 9 Aug 2022 16:27:40 +0200 -Subject: [PATCH] build: detect sys/pidfd.h availability - -Fixes: #4176 -Signed-off-by: Christian Brauner (Microsoft) - -[Retrieved from: -https://github.com/lxc/lxc/commit/ef1e0607b82e27350c2d677d649c6a0a9693fd40] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 1 + - src/lxc/process_utils.h | 6 ++++++ - 2 files changed, 7 insertions(+) - -diff --git a/meson.build b/meson.build -index f679aabbc8..e999542336 100644 ---- a/meson.build -+++ b/meson.build -@@ -735,6 +735,7 @@ foreach tuple: [ - ['sys/resource.h'], - ['sys/memfd.h'], - ['sys/personality.h'], -+ ['sys/pidfd.h'], - ['sys/signalfd.h'], - ['sys/timerfd.h'], - ['pty.h'], -diff --git a/src/lxc/process_utils.h b/src/lxc/process_utils.h -index 9c15b15741..ed84741d0e 100644 ---- a/src/lxc/process_utils.h -+++ b/src/lxc/process_utils.h -@@ -15,6 +15,10 @@ - #include - #include - -+#if HAVE_SYS_PIDFD_H -+#include -+#endif -+ - #include "compiler.h" - #include "syscall_numbers.h" - -@@ -136,9 +140,11 @@ - #endif - - /* waitid */ -+#if !HAVE_SYS_PIDFD_H - #ifndef P_PIDFD - #define P_PIDFD 3 - #endif -+#endif - - #ifndef CLONE_ARGS_SIZE_VER0 - #define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index c18e062cc1..2dd983a361 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d8195423bb1e206f8521d24b6cde4789f043960c7cf065990a9cf741dcfd4222 lxc-5.0.1.tar.gz +sha256 bea08d2e49efcee34fa58acd2bc95c0adc64d291c07f4cfaf4ac1d8ac5a36f45 lxc-5.0.2.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index e1639c5f15..4a4d3a6212 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 5.0.1 +LXC_VERSION = 5.0.2 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 thomas.petazzoni at bootlin.com Mon Feb 20 20:58:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:01 -0000 Subject: [Buildroot] [git commit branch/next] support/testing: add test for python-munch Message-ID: <20230220205219.13889828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f0a2a43bbfcb2aef1569b48277933264ec25feb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ support/testing/tests/package/sample_python_munch.py | 20 ++++++++++++++++++++ support/testing/tests/package/test_python_munch.py | 12 ++++++++++++ 3 files changed, 34 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0eea9c33d9..3217823b6f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3133,10 +3133,12 @@ F: package/x11r7/xapp_xinput-calibrator/ F: package/zlog/ F: support/testing/tests/package/sample_python_dicttoxml2.py F: support/testing/tests/package/sample_python_dtschema.py +F: support/testing/tests/package/sample_python_munch.py F: support/testing/tests/package/test_libftdi1.py F: support/testing/tests/package/test_python_can.py F: support/testing/tests/package/test_python_dicttoxml2.py F: support/testing/tests/package/test_python_dtschema.py +F: support/testing/tests/package/test_python_munch.py F: utils/scanpypi N: Yunhao Tian diff --git a/support/testing/tests/package/sample_python_munch.py b/support/testing/tests/package/sample_python_munch.py new file mode 100644 index 0000000000..b45bec7b7e --- /dev/null +++ b/support/testing/tests/package/sample_python_munch.py @@ -0,0 +1,20 @@ +from munch import Munch + +b = Munch() +b.hello = 'world' +assert b.hello == 'world' +b['hello'] += "!" +assert b.hello == 'world!' +b.foo = Munch(lol=True) +assert b.foo.lol is True +assert b.foo is b['foo'] + +assert sorted(b.keys()) == ['foo', 'hello'] + +b.update({'ponies': 'are pretty!'}, hello=42) +assert b == Munch({'ponies': 'are pretty!', 'foo': Munch({'lol': True}), 'hello': 42}) + +assert sorted([(k, b[k]) for k in b]) == [('foo', Munch({'lol': True})), ('hello', 42), ('ponies', 'are pretty!')] + +format_munch = Munch(knights='lolcats', ni='can haz') +assert "The {knights} who say {ni}!".format(**format_munch) == 'The lolcats who say can haz!' diff --git a/support/testing/tests/package/test_python_munch.py b/support/testing/tests/package/test_python_munch.py new file mode 100644 index 0000000000..6853bbaac7 --- /dev/null +++ b/support/testing/tests/package/test_python_munch.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Munch(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MUNCH=y + """ + sample_scripts = ["tests/package/sample_python_munch.py"] + timeout = 40 From peter at korsgaard.com Mon Feb 20 20:58:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:02 -0000 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: add new package Message-ID: <20230220205240.A7E5A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fluent Bit is a super fast, lightweight, and highly scalable logging and metrics processor and forwarder. Signed-off-by: Thomas Devoogdt [Peter: add DEVELOPERS entry, drop STATIC_LIBS dependency] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/fluent-bit/Config.in | 12 +++++++ package/fluent-bit/S99fluent-bit | 72 ++++++++++++++++++++++++++++++++++++++ package/fluent-bit/fluent-bit.hash | 3 ++ package/fluent-bit/fluent-bit.mk | 49 ++++++++++++++++++++++++++ 6 files changed, 140 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b973c37b82..385a46ccf9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2820,6 +2820,9 @@ F: support/testing/tests/package/test_perl_lwp_protocol_https.py F: utils/size-stats-compare F: toolchain/ +N: Thomas Devoogdt +F: package/fluent-bit/ + N: Thomas Huth F: board/qemu/m68k-mcf5208/ F: configs/qemu_m68k_mcf5208_defconfig diff --git a/package/Config.in b/package/Config.in index 995dae2c57..b281a67157 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2610,6 +2610,7 @@ menu "System tools" source "package/efivar/Config.in" source "package/embiggen-disk/Config.in" source "package/emlog/Config.in" + source "package/fluent-bit/Config.in" source "package/ftop/Config.in" source "package/getent/Config.in" source "package/gkrellm/Config.in" diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in new file mode 100644 index 0000000000..11ceb55d4f --- /dev/null +++ b/package/fluent-bit/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_FLUENT_BIT + bool "fluent-bit" + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBYAML + help + Fast and Lightweight Logs and Metrics processor. + + https://github.com/fluent/fluent-bit + +comment "fluent-bit needs a glibc toolchain" + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/fluent-bit/S99fluent-bit b/package/fluent-bit/S99fluent-bit new file mode 100644 index 0000000000..f4ba0e4448 --- /dev/null +++ b/package/fluent-bit/S99fluent-bit @@ -0,0 +1,72 @@ +#!/bin/sh + +DAEMON="fluent-bit" +PID_FILE="/var/run/$DAEMON.pid" +CONF_FILE="/etc/$DAEMON/$DAEMON.conf" + +FLUENT_BIT_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -b -m -p "$PID_FILE" --exec "/usr/bin/$DAEMON" \ + -- -c "$CONF_FILE" $FLUENT_BIT_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PID_FILE" + status=$? + + if [ -f "$PID_FILE" ]; then + pid=$(cat "$PID_FILE") + rm -f "$PID_FILE" + + # https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/yaml/configuration-file#config_section + # The default grace time is set to 5 seconds, so use 6 seconds to have some margin. + timeout=6 + while kill -0 "$pid" 2>/dev/null; do + [ $timeout -eq 0 ] && status=1 && break + timeout=$((timeout - 1)) + sleep 1 + done + fi + + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + start +} + +case "$1" in +start) + start + ;; +stop) + stop + ;; +restart | reload) + restart + ;; +*) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash new file mode 100644 index 0000000000..ce7cea7b59 --- /dev/null +++ b/package/fluent-bit/fluent-bit.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 8ff5566389033669feabc9c69a5c6f417dad5c8b066454388e6a706507262acf fluent-bit-2.0.8.tar.gz +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk new file mode 100644 index 0000000000..f7727834dd --- /dev/null +++ b/package/fluent-bit/fluent-bit.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# fluent-bit +# +################################################################################ + +FLUENT_BIT_VERSION = 2.0.8 +FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) +FLUENT_BIT_LICENSE = Apache-2.0 +FLUENT_BIT_LICENSE_FILES = LICENSE +FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl + +FLUENT_BIT_CONF_OPTS += \ + -DFLB_DEBUG=No \ + -DFLB_RELEASE=Yes \ + -DFLB_EXAMPLES=No \ + -DFLB_CHUNK_TRACE=No \ + -DFLB_BACKTRACE=No + +ifeq ($(BR2_PACKAGE_LUAJIT),y) +FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=Yes +FLUENT_BIT_DEPENDENCIES += luajit +else +FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=No +endif + +# Force bundled miniz to be linked statically. +# https://github.com/fluent/fluent-bit/issues/6711 +FLUENT_BIT_CONF_OPTS += \ + -DBUILD_SHARED_LIBS=OFF + +# Move the config files from /usr/etc/ to /etc/. +# https://github.com/fluent/fluent-bit/issues/6619 +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_INSTALL_SYSCONFDIR="/etc/" + +# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h +# large file support. +# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information. +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" + +define FLUENT_BIT_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ + $(TARGET_DIR)/etc/init.d/S99fluent-bit +endef + +$(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 20 20:58:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:03 -0000 Subject: [Buildroot] [git commit branch/next] package/libraw: bump to version 0.21.1 Message-ID: <20230220205240.DE8BA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e3d5b7c6d6f7f1be82010c2d18e64f72f950aef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/LibRaw/LibRaw/blob/0.21.1/Changelog.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libraw/libraw.hash | 2 +- package/libraw/libraw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libraw/libraw.hash b/package/libraw/libraw.hash index 3076810cca..58bb1b4753 100644 --- a/package/libraw/libraw.hash +++ b/package/libraw/libraw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8747b34e8534cc2dd7ef8c92c436414b3578904fd4bf9b87ea60f17aa99fb0bd LibRaw-0.21.0.tar.gz +sha256 630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd LibRaw-0.21.1.tar.gz sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL sha256 7d6650cef6cf892abe95e55a6bda1e1c42f221fd411b807deb2fc0b805b868d4 README.md diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index 176acf6a44..b6616f0c10 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRAW_VERSION = 0.21.0 +LIBRAW_VERSION = 0.21.1 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data LIBRAW_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 20:58:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:03 -0000 Subject: [Buildroot] [git commit branch/next] board/freescale/imx6sabre/readme.txt: update broken urls Message-ID: <20230220205219.82D918648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfbbfd8fecf8623da4772f97ce208b3e4b69de80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next http://freescale.com/ urls are all redirected to the NXP homepage https://www.nxp.com/ Even if the links are not broken in the sense of a 404 http error, the pointed resources are not found. This commit updates the old freescale links to the correct nxp.com locations. Note: the link to the SABRE for Automotive Infotainment Quick Start Guide now requires a free registration to be accessed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- board/freescale/imx6sabre/readme.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/imx6sabre/readme.txt b/board/freescale/imx6sabre/readme.txt index 4b8db5233a..320ee463e2 100644 --- a/board/freescale/imx6sabre/readme.txt +++ b/board/freescale/imx6sabre/readme.txt @@ -8,15 +8,15 @@ as well as the Freescale SABRE Board for Automotive Infotainment. Read the i.MX 6 SABRESD Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/quick_start_guide/SABRESDB_IMX6_QSG.pdf +https://www.nxp.com/files-static/32bit/doc/quick_start_guide/SABRESDB_IMX6_QSG.pdf Read the i.MX 6 SoloX SABRESD Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/user_guide/IMX6SOLOXQSG.pdf +https://www.nxp.com/files-static/32bit/doc/quick_start_guide/IMX6SOLOXQSG.pdf Read the SABRE for Automotive Infotainment Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/user_guide/IMX6SABREINFOQSG.pdf +https://www.nxp.com/webapp/Download?colCode=IMX6SABREINFOQSG Building with NXP kernel and NXP U-Boot ======================================= @@ -166,6 +166,6 @@ Enjoy! References ========== -https://community.freescale.com/docs/DOC-95015 -https://community.freescale.com/docs/DOC-95017 -https://community.freescale.com/docs/DOC-99218 +https://community.nxp.com/docs/DOC-95015 +https://community.nxp.com/docs/DOC-95017 +https://community.nxp.com/docs/DOC-99218 From peter at korsgaard.com Mon Feb 20 20:58:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:04 -0000 Subject: [Buildroot] [git commit branch/next] package/mariadb: fix build with libressl >= 3.5.0 Message-ID: <20230220205241.28B478648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=22e926e9af915303180d35b5c41ea5fbf411d753 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with libressl raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': /tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) | ^~ Fixes: - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...sl_compat.h-fix-build-with-libressl-3.5.0.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch b/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 0000000000..fd3e6e6607 --- /dev/null +++ b/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,39 @@ +From 79ed770a37c8669390a58a4485dd8f5565fe2497 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 15 Jan 2023 19:12:05 +0100 +Subject: [PATCH] include/ssl_compat.h: fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: +/tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': +/tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} + 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/MariaDB/server/pull/2435] +--- + include/ssl_compat.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/ssl_compat.h b/include/ssl_compat.h +index 664f3aac87c..3678e5fa084 100644 +--- a/include/ssl_compat.h ++++ b/include/ssl_compat.h +@@ -19,7 +19,8 @@ + /* OpenSSL version specific definitions */ + #if defined(OPENSSL_VERSION_NUMBER) + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ ++ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + #define HAVE_OPENSSL11 1 + #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) + #define ERR_remove_state(X) ERR_clear_error() +-- +2.39.0 + From yann.morin.1998 at free.fr Mon Feb 20 20:58:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:04 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx: update SITE to directly use https Message-ID: <20230220205219.68DA4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc23c61e4d3fa9557db4977b8d30905a3f55e83d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next http://www.nxp.com/ has a redirect to https://www.nxp.com/ for quite some time now. It is also quite common to directly hit https:// urls now. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/freescale-imx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk index 5f32a098a2..b119d90ec3 100644 --- a/package/freescale-imx/freescale-imx.mk +++ b/package/freescale-imx/freescale-imx.mk @@ -4,6 +4,6 @@ # ################################################################################ -FREESCALE_IMX_SITE = http://www.nxp.com/lgfiles/NMG/MAD/YOCTO +FREESCALE_IMX_SITE = https://www.nxp.com/lgfiles/NMG/MAD/YOCTO include $(sort $(wildcard package/freescale-imx/*/*.mk)) From yann.morin.1998 at free.fr Mon Feb 20 20:58:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:05 -0000 Subject: [Buildroot] [git commit branch/next] package/fluidsynth: bump to version 2.3.1 Message-ID: <20230220205219.A47ED828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=faa8c35d117348f35c129c62a3d02447f47bde88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For change log since v2.3.0, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.3.1 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- 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 fdb0cf4117..3de41b1682 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1df5a1afb91acf3b945b7fdb89ac0d99877622161d9b5155533da59113eaaa20 fluidsynth-2.3.0.tar.gz +sha256 d734e4cf488be763cf123e5976f3154f0094815093eecdf71e0e9ae148431883 fluidsynth-2.3.1.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 20fbb644f5..ad1ed7df11 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.0 +FLUIDSYNTH_VERSION = 2.3.1 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:06 -0000 Subject: [Buildroot] [git commit branch/next] package/moarvm: bump to version 2022.12 Message-ID: <20230220205241.5039F7FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6ec214a09741b2de6e408832d89f4b3c4f93484 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- 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 45e8b56e98..624988215e 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 337ef04d16f826f99465c653b92006028fe220be68d3dcfd0729612f4f6b5b46 MoarVM-2022.07.tar.gz +sha256 51c3e9c9a7a191c148f213b65ae1f4fcfe5d4b7c16c86300e9ee8e18eaa8becb MoarVM-2022.12.tar.gz sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index 9820f318b6..ef9d29d5af 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2022.07 +MOARVM_VERSION = 2022.12 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:06 -0000 Subject: [Buildroot] [git commit branch/next] configs/qemu_s390x: bump kernel version to 6.1.4 Message-ID: <20230220205241.59A6086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea06798871d3a452011a8fa3c879a7a352032ff6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- configs/qemu_s390x_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 346df04ada..6bbcca0896 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -12,12 +12,12 @@ BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:06 -0000 Subject: [Buildroot] [git commit branch/next] package/imx-mkimage: update codeaurora URLs to github Message-ID: <20230220205219.B50548648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=153b91ed13174a9013393a8b8eb907a5ff511e58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/imx-mkimage/Config.in.host | 2 +- package/imx-mkimage/imx-mkimage.hash | 2 +- package/imx-mkimage/imx-mkimage.mk | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/imx-mkimage/Config.in.host b/package/imx-mkimage/Config.in.host index 8d273557a1..09df2a3c29 100644 --- a/package/imx-mkimage/Config.in.host +++ b/package/imx-mkimage/Config.in.host @@ -4,4 +4,4 @@ config BR2_PACKAGE_HOST_IMX_MKIMAGE imx-mkimage is used to combine input images and generate final boot image with appropriate IVT set. - https://source.codeaurora.org/external/imx/imx-mkimage + https://github.com/nxp-imx/imx-mkimage diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash index 81d99a5d1c..8346fd64b1 100644 --- a/package/imx-mkimage/imx-mkimage.hash +++ b/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 769b3d7376a1f7107ce2958a1babe361bfd29e2cbfbe47eeb2911acc460058e5 imx-mkimage-lf-5.10.72_2.2.0-br1.tar.gz +sha256 593bd94aac027844bc58c62aae55557c14e1f8a99e68ba235a46f083759df3d4 imx-mkimage-lf-5.10.72_2.2.0.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk index 0bfca72504..54c948e0d3 100644 --- a/package/imx-mkimage/imx-mkimage.mk +++ b/package/imx-mkimage/imx-mkimage.mk @@ -5,8 +5,7 @@ ################################################################################ IMX_MKIMAGE_VERSION = lf-5.10.72_2.2.0 -IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage -IMX_MKIMAGE_SITE_METHOD = git +IMX_MKIMAGE_SITE = $(call github,nxp-imx,imx-mkimage,$(IMX_MKIMAGE_VERSION)) IMX_MKIMAGE_LICENSE = GPL-2.0+ IMX_MKIMAGE_LICENSE_FILES = COPYING HOST_IMX_MKIMAGE_DEPENDENCIES = host-zlib From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:07 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add myself to postgresql package Message-ID: <20230220205241.71E968648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b7ef8030c829ac04c4e78d3f2c878f5c9483a78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 83fa9e403d..4ead3a71f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2087,6 +2087,7 @@ F: package/libgeos/ F: package/libosmium/ F: package/osm2pgsql/ F: package/postgis/ +F: package/postgresql/ F: package/protozero/ F: package/timescaledb/ From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:07 -0000 Subject: [Buildroot] [git commit branch/next] package/dieharder: bump to version 3.31.1.4 Message-ID: <20230220205217.5F01F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16b27f7cdbc8c203b3b957a33ade03739149021f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Switch to the maintenance "upstream" repo which regroup updates made for the Debian package - Drop all patches (already in version) - Drop DIEHARDER_M4_CLEAN which is not needed since https://github.com/eddelbuettel/dieharder/commit/c875e5d8196c4a79547281ff5f9fb04af734db97 - -fcommon is not needed since https://github.com/eddelbuettel/dieharder/commit/8feba3cc2bf92627f32ac637827ac760d3a17e63 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...includedir-as-include-search-path-for-bui.patch | 62 -- .../dieharder/0002-Fix-missing-type-intptr_t.patch | 27 - ...U_SOURCE-for-uint-and-M_PI-with-musl-libc.patch | 28 - .../0004-Add-static-to-inline-functions.patch | 65 -- .../dieharder/0005-Remove-defunct-rgb_operm.patch | 732 --------------------- package/dieharder/dieharder.hash | 2 +- package/dieharder/dieharder.mk | 25 +- 7 files changed, 4 insertions(+), 937 deletions(-) diff --git a/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch b/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch deleted file mode 100644 index b475e5c470..0000000000 --- a/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fbc9b7c3b83a99ac996c0a268487d1f800630328 Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Wed, 8 Feb 2017 21:26:58 +0100 -Subject: [PATCH] Do not use includedir as include search path for build - ---includedir is not used to specify where a program should -look for headers of libraries, but to tell where it should -install its own headers. - -Signed-off-by: Julien Viard de Galbert ---- - configure.ac | 6 +++--- - dieharder/Makefile.am | 2 +- - libdieharder/Makefile.am | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b336115..91f7c64 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -96,9 +96,9 @@ AC_TYPE_SIZE_T - AC_C_VOLATILE - AC_C_INLINE - --DIEHARDER_CFLAGS="-I$includedir" --dieharder_CFLAGS="-std=c99 -Wall -pedantic -I$includedir" --libdieharder_lo_CFLAGS="-Wall -pedantic -I$includedir" -+DIEHARDER_CFLAGS="" -+dieharder_CFLAGS="-std=c99 -Wall -pedantic" -+libdieharder_lo_CFLAGS="-Wall -pedantic" - DIEHARDER_LIBS="-L$libdir -ldieharder" - ACLOCAL_AMFLAGS="-I m4" - -diff --git a/dieharder/Makefile.am b/dieharder/Makefile.am -index e6fbff2..7bdac5c 100644 ---- a/dieharder/Makefile.am -+++ b/dieharder/Makefile.am -@@ -64,7 +64,7 @@ DEFINES = -DVERSION=$(VERSION) - # CC = gcc - - # Compile flags (use fairly standard -O3 as default) --AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES) -I ${includedir} -+AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES) - AM_CFLAGS = -O3 - - # Load flags (optional) -diff --git a/libdieharder/Makefile.am b/libdieharder/Makefile.am -index 5fd3396..0873f9c 100644 ---- a/libdieharder/Makefile.am -+++ b/libdieharder/Makefile.am -@@ -114,7 +114,7 @@ DEFINES = -DVERSION=$(VERSION) -DLITTLE_ENDIAN=$(LITTLE_ENDIAN) - # CC = gcc - - # Compile flags (use fairly standard -O3 as default) --AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include -I ${includedir} -+AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include - AM_CFLAGS = -O3 -Wall -pedantic -Wno-unused-variable - - #======================================================================== --- -2.1.4 - diff --git a/package/dieharder/0002-Fix-missing-type-intptr_t.patch b/package/dieharder/0002-Fix-missing-type-intptr_t.patch deleted file mode 100644 index 12ea5e7fa0..0000000000 --- a/package/dieharder/0002-Fix-missing-type-intptr_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6f550841943f19612af064b3d3a1db134078e03c Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Sat, 14 Jan 2017 14:18:10 +0100 -Subject: [PATCH] Fix missing type intptr_t - -With glibc-2.23 unistd.h need intptr_t when __USE_MISC is defined. - -Signed-off-by: Julien Viard de Galbert ---- - include/dieharder/libdieharder.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/dieharder/libdieharder.h b/include/dieharder/libdieharder.h -index 2138ebf..d98b758 100644 ---- a/include/dieharder/libdieharder.h -+++ b/include/dieharder/libdieharder.h -@@ -17,6 +17,7 @@ - - /* This turns on uint macro in c99 */ - #define __USE_MISC 1 -+#include - #include - #include - #include --- -2.1.4 - diff --git a/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch b/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch deleted file mode 100644 index d71cd57445..0000000000 --- a/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 526510a27ef47a16699dd34a2373ad9b6bb5e8f3 Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Sat, 14 Jan 2017 14:19:47 +0100 -Subject: [PATCH] Add _GNU_SOURCE for uint and M_PI with musl libc - -When building with musl libc _GNU_SOURCE need to be defined -to provide uint type and M_PI macro - -Signed-off-by: Julien Viard de Galbert ---- - include/dieharder/libdieharder.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/dieharder/libdieharder.h b/include/dieharder/libdieharder.h -index d98b758..c1a5023 100644 ---- a/include/dieharder/libdieharder.h -+++ b/include/dieharder/libdieharder.h -@@ -17,6 +17,7 @@ - - /* This turns on uint macro in c99 */ - #define __USE_MISC 1 -+#define _GNU_SOURCE 1 - #include - #include - #include --- -2.1.4 - diff --git a/package/dieharder/0004-Add-static-to-inline-functions.patch b/package/dieharder/0004-Add-static-to-inline-functions.patch deleted file mode 100644 index 64cde1d21d..0000000000 --- a/package/dieharder/0004-Add-static-to-inline-functions.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 9c71a211dcf20f53f747326f5bc3fee9fabe3f52 Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Tue, 27 Jun 2017 00:16:11 +0200 -Subject: [PATCH] Add static to inline functions - -This is needed to avoid a link error where the inline functions appear -missing at link time. -From c99 standard inline function should either be declared static or -have an extern instance in a c file for linking. -This fix is necessary to build with gcc 7; for some reason it was not -trigerred before. - -Signed-off-by: Julien Viard de Galbert ---- - libdieharder/dab_filltree.c | 4 ++-- - libdieharder/dab_filltree2.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libdieharder/dab_filltree.c b/libdieharder/dab_filltree.c -index 9cc5ce7..a377c3d 100644 ---- a/libdieharder/dab_filltree.c -+++ b/libdieharder/dab_filltree.c -@@ -34,7 +34,7 @@ static double targetData[] = { - 0.0, 0.0, 0.0, 0.0, 0.13333333, 0.20000000, 0.20634921, 0.17857143, 0.13007085, 0.08183633, 0.04338395, 0.01851828, 0.00617270, 0.00151193, 0.00023520, 0.00001680, 0.00000000, 0.00000000, 0.00000000, 0.00000000 - }; - --inline int insert(double x, double *array, unsigned int startVal); -+static inline int insert(double x, double *array, unsigned int startVal); - - int dab_filltree(Test **test,int irun) { - int size = (ntuple == 0) ? 32 : ntuple; -@@ -105,7 +105,7 @@ int dab_filltree(Test **test,int irun) { - } - - --inline int insert(double x, double *array, unsigned int startVal) { -+static inline int insert(double x, double *array, unsigned int startVal) { - uint d = (startVal + 1) / 2; - uint i = startVal; - while (d > 0) { -diff --git a/libdieharder/dab_filltree2.c b/libdieharder/dab_filltree2.c -index 1e33af2..59cbd52 100644 ---- a/libdieharder/dab_filltree2.c -+++ b/libdieharder/dab_filltree2.c -@@ -92,7 +92,7 @@ static double targetData[128] = { // size=128, generated from 6e9 samples - 0.00000000000e+00,0.00000000000e+00,0.00000000000e+00,0.00000000000e+00, - }; - --inline int insertBit(uint x, uchar *array, uint *i, uint *d); -+static inline int insertBit(uint x, uchar *array, uint *i, uint *d); - - int dab_filltree2(Test **test, int irun) { - int size = (ntuple == 0) ? 128 : ntuple; -@@ -181,7 +181,7 @@ int dab_filltree2(Test **test, int irun) { - * The function returns >= 0 if the path went too deep; the - * returned value is the last position of the path. - */ --inline int insertBit(uint x, uchar *array, uint *i, uint *d) { -+static inline int insertBit(uint x, uchar *array, uint *i, uint *d) { - if (x != 0) { - *i += *d; - } else { --- -2.13.2 - diff --git a/package/dieharder/0005-Remove-defunct-rgb_operm.patch b/package/dieharder/0005-Remove-defunct-rgb_operm.patch deleted file mode 100644 index efc311dbaa..0000000000 --- a/package/dieharder/0005-Remove-defunct-rgb_operm.patch +++ /dev/null @@ -1,732 +0,0 @@ -From 40d377b86c856f5a4510a6f5cd56be004873ad77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20M=C3=BCller?= -Date: Mon, 12 Oct 2020 21:30:12 +0200 -Subject: [PATCH] Remove defunct rgb_operm - -[Retrieved from: -https://github.com/eddelbuettel/dieharder/pull/2/commits/40d377b86c856f5a4510a6f5cd56be004873ad77] -Signed-off-by: Fabrice Fontaine ---- - include/Makefile.am | 1 - - include/dieharder/rgb_operm.h | 38 -- - include/dieharder/tests.h | 2 - - libdieharder/rgb_operm.c | 633 ---------------------------------- - 4 files changed, 674 deletions(-) - delete mode 100644 include/dieharder/rgb_operm.h - delete mode 100644 libdieharder/rgb_operm.c - -diff --git a/include/Makefile.am b/include/Makefile.am -index f80b4ff..e4659cd 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -33,7 +33,6 @@ nobase_include_HEADERS = dieharder/copyright.h \ - dieharder/rgb_lagged_sums.h \ - dieharder/rgb_lmn.h \ - dieharder/rgb_minimum_distance.h \ -- dieharder/rgb_operm.h \ - dieharder/rgb_persist.h \ - dieharder/rgb_permutations.h \ - dieharder/rgb_timing.h \ -diff --git a/include/dieharder/rgb_operm.h b/include/dieharder/rgb_operm.h -deleted file mode 100644 -index c48fa37..0000000 ---- a/include/dieharder/rgb_operm.h -+++ /dev/null -@@ -1,38 +0,0 @@ --/* -- * rgb_operm test header. -- */ -- --/* -- * function prototype -- */ --int rgb_operm(Test **test,int irun); -- --static Dtest rgb_operm_dtest __attribute__((unused)) = { -- "RGB Overlapping Permuations Test", -- "rgb_operm", -- "\n\ --#========================================================================\n\ --# RGB Overlapping Permutations Test\n\ --# Forms both the exact (expected) covariance matrix for overlapping\n\ --# permutations of random integer and an empirical covariance matrix\n\ --# formed from a long string of samples. The difference is expected\n\ --# to have a chisq distribution and hence can be transformed into a\n\ --# sample p-value. Note that this is one possible functional replacement\n\ --# for the broken/defunct diehard operm5 test, but one that permits k (the\n\ --# number of numbers in the overlapping permutation window) to be varied\n\ --# from 2 to perhaps 8.\n\ --#\n", -- 100, /* Default psamples */ -- 100000, /* Default tsamples */ -- 1, /* We magically make all the bit tests return a single histogram */ -- rgb_operm, -- 0 --}; -- --/* -- * Global variables. -- * -- * rgb_operm_k is the size of the overlapping window that is slid along -- * a data stream of rands from x_i to x_{i+k} to compute c[][]. -- */ --unsigned int rgb_operm_k; -diff --git a/include/dieharder/tests.h b/include/dieharder/tests.h -index 1674aed..b50dbe3 100644 ---- a/include/dieharder/tests.h -+++ b/include/dieharder/tests.h -@@ -11,7 +11,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -80,7 +79,6 @@ - RGB_PERMUTATIONS, - RGB_LAGGED_SUMS, - RGB_LMN, -- RGB_OPERM, - DAB_BYTEDISTRIB, - DAB_DCT, - DAB_FILLTREE, -diff --git a/libdieharder/rgb_operm.c b/libdieharder/rgb_operm.c -deleted file mode 100644 -index 15f8e9a..0000000 ---- a/libdieharder/rgb_operm.c -+++ /dev/null -@@ -1,633 +0,0 @@ --/* -- * ======================================================================== -- * $Id: rgb_operm.c 252 2006-10-10 13:17:36Z rgb $ -- * -- * See copyright in copyright.h and the accompanying file COPYING -- * ======================================================================== -- */ -- --/* -- * ======================================================================== -- * This is the revised Overlapping Permutations test. It directly -- * simulates the covariance matrix of overlapping permutations. The way -- * this works below (tentatively) is: -- * -- * For a bit ntuple of length N, slide a window of length N to the -- * right one bit at a time. Compute the permutation index of the -- * original ntuple, the permutation index of the window ntuple, and -- * accumulate the covariance matrix of the two positions. This -- * can be directly and precisely computed as well. The simulated -- * result should be distributed according to the chisq distribution, -- * so we subtract the two and feed it into the chisq program as a -- * vector to compute p. -- * -- * This MAY NOT BE RIGHT. I'm working from both Marsaglia's limited -- * documentation (in a program that doesn't do ANYTHING like what the -- * documentation says it does) and from Nilpotent Markov Processes. -- * But I confess to not quite understand how to actually perform the -- * test in the latter -- it is very good at describing the construction -- * of the target matrix, not so good at describing how to transform -- * this into a chisq and p. -- * -- * FWIW, as I get something that actually works here, I'm going to -- * THOROUGHLY document it in the book that will accompany the test. -- *======================================================================== -- */ -- --#include --#define RGB_OPERM_KMAX 10 -- --/* -- * Some globals that will eventually go in the test include where they -- * arguably belong. -- */ --double fpipi(int pi1,int pi2,int nkp); --uint piperm(size_t *data,int len); --void make_cexact(); --void make_cexpt(); --int nperms,noperms; --double **cexact,**ceinv,**cexpt,**idty; --double *cvexact,*cvein,*cvexpt,*vidty; -- --int rgb_operm(Test **test,int irun) --{ -- -- int i,j,n,nb,iv,s; -- uint csamples; /* rgb_operm_k^2 is vector size of cov matrix */ -- uint *count,ctotal; /* counters */ -- uint size; -- double pvalue,ntuple_prob,pbin; /* probabilities */ -- Vtest *vtest; /* Chisq entry vector */ -- -- gsl_matrix_view CEXACT,CEINV,CEXPT,IDTY; -- -- /* -- * For a given n = ntuple size in bits, there are n! bit orderings -- */ -- MYDEBUG(D_RGB_OPERM){ -- printf("#==================================================================\n"); -- printf("# rgb_operm: Running rgb_operm verbosely for k = %d.\n",rgb_operm_k); -- printf("# rgb_operm: Use -v = %d to focus.\n",D_RGB_OPERM); -- printf("# rgb_operm: ======================================================\n"); -- } -- -- /* -- * Sanity check first -- */ -- if((rgb_operm_k < 0) || (rgb_operm_k > RGB_OPERM_KMAX)){ -- printf("\nError: rgb_operm_k must be a positive integer <= %u. Exiting.\n",RGB_OPERM_KMAX); -- exit(0); -- } -- -- nperms = gsl_sf_fact(rgb_operm_k); -- noperms = gsl_sf_fact(3*rgb_operm_k-2); -- csamples = rgb_operm_k*rgb_operm_k; -- gsl_permutation * p = gsl_permutation_alloc(nperms); -- -- /* -- * Allocate memory for value_max vector of Vtest structs and counts, -- * PER TEST. Note that we must free both of these when we are done -- * or leak. -- */ -- vtest = (Vtest *)malloc(csamples*sizeof(Vtest)); -- count = (uint *)malloc(csamples*sizeof(uint)); -- Vtest_create(vtest,csamples+1); -- -- /* -- * We have to allocate and free the cexact and cexpt matrices here -- * or they'll be forgotten when these routines return. -- */ -- MYDEBUG(D_RGB_OPERM){ -- printf("# rgb_operm: Creating and zeroing cexact[][] and cexpt[][].\n"); -- } -- cexact = (double **)malloc(nperms*sizeof(double*)); -- ceinv = (double **)malloc(nperms*sizeof(double*)); -- cexpt = (double **)malloc(nperms*sizeof(double*)); -- idty = (double **)malloc(nperms*sizeof(double*)); -- cvexact = (double *)malloc(nperms*nperms*sizeof(double)); -- cvein = (double *)malloc(nperms*nperms*sizeof(double)); -- cvexpt = (double *)malloc(nperms*nperms*sizeof(double)); -- vidty = (double *)malloc(nperms*nperms*sizeof(double)); -- for(i=0;idata[k]; -- -- /* Not cruft, but quiet... -- MYDEBUG(D_RGB_OPERM){ -- printf("#------------------------------------------------------------------\n"); -- printf("# Generating offset sample permutation pi's\n"); -- } -- */ -- for(k=0;k<2*rgb_operm_k - 1;k++){ -- gsl_sort_index((size_t *) ps,&testv[k],1,rgb_operm_k); -- pi[k] = piperm((size_t *) ps,rgb_operm_k); -- -- /* Not cruft, but quiet... -- MYDEBUG(D_RGB_OPERM){ -- printf("# %u: ",k); -- for(ip=k;ipdata[ip]); -- } -- printf(" = %u\n",pi[k]); -- } -- */ -- } -- -- /* -- * This is the business end of things. The covariance matrix is the -- * the sum of a central function of the permutation indices that yields -- * nperms-1/nperms on diagonal, -1/nperms off diagonal, for all the -- * possible permutations, for the FIRST permutation in a sample (fi) -- * times the sum of the same function over all the overlapping permutations -- * drawn from the same sample. Quite simple, really. -- */ -- for(i=0;idata[rgb_operm_k-j-1] = lookup[i]->data[j]; -- } -- } else { -- gsl_permutation_memcpy(lookup[i],lookup[i-1]); -- gsl_permutation_next(lookup[i]); -- for(j=0;jdata[rgb_operm_k-j-1] = lookup[i]->data[j]; -- } -- } -- } -- */ -- MYDEBUG(D_RGB_OPERM){ -- for(i=0;i ",i); -- gsl_permutation_fprintf(stdout,lookup[i]," %u"); -- printf("\n"); -- } -- } -- -- } -- -- for(i=0;idata,len*sizeof(uint))==0){ -- /* Not cruft, but off: -- MYDEBUG(D_RGB_OPERM){ -- printf("# piperm(): "); -- gsl_permutation_fprintf(stdout,lookup[i]," %u"); -- printf(" = %u\n",i); -- } -- */ -- return(i); -- } -- } -- printf("We'd better not get here...\n"); -- -- return(0); -- --} -- --double fpipi(int pi1,int pi2,int nkp) --{ -- -- int i; -- double fret; -- -- /* -- * compute the k-permutation index from iperm for the window -- * at data[offset] of length len. If it matches pind, return -- * the first quantity, otherwise return the second. -- */ -- if(pi1 == pi2){ -- -- fret = (double) (nkp - 1.0)/nkp; -- if(verbose < 0){ -- printf(" f(%d,%d) = %10.6f\n",pi1,pi2,fret); -- } -- return(fret); -- -- } else { -- -- fret = (double) (-1.0/nkp); -- if(verbose < 0){ -- printf(" f(%d,%d) = %10.6f\n",pi1,pi2,fret); -- } -- return(fret); -- -- } -- -- --} -- -- -- -- diff --git a/package/dieharder/dieharder.hash b/package/dieharder/dieharder.hash index 65b60e7aa7..3d285d03cc 100644 --- a/package/dieharder/dieharder.hash +++ b/package/dieharder/dieharder.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6cff0ff8394c553549ac7433359ccfc955fb26794260314620dfa5e4cd4b727f dieharder-3.31.1.tgz +sha256 0fdd8a66a077e86652a47641589aa4667ae13d322a7214bb555ab37f082002dd dieharder-3.31.1.4.tar.gz sha256 c475bcd1afa6fc15a65174e31c599c0d23706a34e4b9f2fcb03a4dad5438d53f COPYING diff --git a/package/dieharder/dieharder.mk b/package/dieharder/dieharder.mk index cbf28922fd..6fe5b1f743 100644 --- a/package/dieharder/dieharder.mk +++ b/package/dieharder/dieharder.mk @@ -4,28 +4,14 @@ # ################################################################################ -DIEHARDER_VERSION = 3.31.1 -DIEHARDER_SITE = http://www.phy.duke.edu/~rgb/General/dieharder -DIEHARDER_SOURCE = dieharder-$(DIEHARDER_VERSION).tgz -DIEHARDER_STRIP_COMPONENTS = 2 +DIEHARDER_VERSION = 3.31.1.4 +DIEHARDER_SITE = $(call github,eddelbuettel,dieharder,$(DIEHARDER_VERSION)) DIEHARDER_LICENSE = GPL-2.0 with beverage clause DIEHARDER_LICENSE_FILES = COPYING DIEHARDER_DEPENDENCIES = gsl - -# The original configure does not use variables provided in the -# environment so _CONF_ENV does not work. (_CONF_OPTS does). -# -# Finally, we patch configure.ac and some Makefile.am so we need to -# autoreconf anyway +# configure retrieved from git is outdated DIEHARDER_AUTORECONF = YES -# The m4/*.m4 files are symlinks to /usr/share, which clearly doesn't -# work, and doing an autoreconf does not replace them. -define DIEHARDER_M4_CLEAN - rm -f $(@D)/m4/*.m4 -endef -DIEHARDER_POST_PATCH_HOOKS += DIEHARDER_M4_CLEAN - # fix endianness detection ifeq ($(BR2_ENDIAN),"BIG") DIEHARDER_CONF_ENV = ac_cv_c_endian=big @@ -36,9 +22,4 @@ endif # parallel build fail, disable it DIEHARDER_MAKE = $(MAKE1) -# Too many fixes needed to build with -fno-common which is default since gcc 10 -ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10),y) -DIEHARDER_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fcommon" -endif - $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:08 -0000 Subject: [Buildroot] [git commit branch/next] package/mobile-broadband-provider-info: bump version to 20221107 Message-ID: <20230220205241.8A6A886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e75f402ba6dbba26f4f35e0b064b269d75c9f6f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- .../mobile-broadband-provider-info.hash | 4 ++-- .../mobile-broadband-provider-info/mobile-broadband-provider-info.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash index b0c0db1b84..c965f5c783 100644 --- a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash +++ b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/mobile-broadband-provider-info/20190618/mobile-broadband-provider-info-20190618.sha256sum -sha256 c22d64a565d1975b9eecb6ed2eeaef18634bc6f385c8137d05e845d8fb3cce5b mobile-broadband-provider-info-20190618.tar.xz +# https://download.gnome.org/sources/mobile-broadband-provider-info/20221107/mobile-broadband-provider-info-20221107.sha256sum +sha256 d93392566c347a96eed95da8c66a5da0dd94f4115cfb3a305ff2682c64cfd810 mobile-broadband-provider-info-20221107.tar.xz # Locally computed sha256 3d510b215a33087b9ceb9592da21575ea1f9f98bd4d983a38e65fe851a552174 COPYING diff --git a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk index ca6a8387c5..2744844951 100644 --- a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk +++ b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20190618 +MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20221107 MOBILE_BROADBAND_PROVIDER_INFO_SITE = https://download.gnome.org/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION) MOBILE_BROADBAND_PROVIDER_INFO_SOURCE = mobile-broadband-provider-info-$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION).tar.xz MOBILE_BROADBAND_PROVIDER_INFO_LICENSE = Public domain From yann.morin.1998 at free.fr Mon Feb 20 20:58:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:08 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx/imx-kobs: update to NXPmicro github organization Message-ID: <20230220205220.1F81986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cec5a941b0867803045450688fbec8992e48d81d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next imx-kobs was removed from the github codeauroraforum organization. It is now redirecting to NXPmicro. This patch updates the link to directly point to the correct place. The commit also replaces the Config.in comment saying the package does not have an upstream by the github.com project page. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/imx-kobs/Config.in | 3 +-- package/freescale-imx/imx-kobs/imx-kobs.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/freescale-imx/imx-kobs/Config.in b/package/freescale-imx/imx-kobs/Config.in index 61be9f26d4..a81842b9a5 100644 --- a/package/freescale-imx/imx-kobs/Config.in +++ b/package/freescale-imx/imx-kobs/Config.in @@ -5,5 +5,4 @@ config BR2_PACKAGE_IMX_KOBS The imx-kobs tool is used for writing images to NAND on i.MX platforms. - This library is provided by Freescale as-is and doesn't have - an upstream. + https://github.com/NXPmicro/imx-kobs diff --git a/package/freescale-imx/imx-kobs/imx-kobs.mk b/package/freescale-imx/imx-kobs/imx-kobs.mk index d6a250cf72..91b39f6fa4 100644 --- a/package/freescale-imx/imx-kobs/imx-kobs.mk +++ b/package/freescale-imx/imx-kobs/imx-kobs.mk @@ -5,7 +5,7 @@ ################################################################################ IMX_KOBS_VERSION = a0e9adce2fb7fcd57e794d7f9a5deba0f94f521b -IMX_KOBS_SITE = $(call github,codeauroraforum,imx-kobs,$(IMX_KOBS_VERSION)) +IMX_KOBS_SITE = $(call github,NXPmicro,imx-kobs,$(IMX_KOBS_VERSION)) IMX_KOBS_LICENSE = GPL-2.0+ IMX_KOBS_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:09 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:09 -0000 Subject: [Buildroot] [git commit branch/next] package/linux-firmware: add rtl8761b/rtl8761bu firmware Message-ID: <20230220205241.A38588648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a8b4185c286fc842ba74d660ab7bfae0a1d648c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Deploy rtl8761b/rtl8761bu firmwares as well. Signed-off-by: Stefan Agner Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 6990ef38ad..9d9d12bd5f 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -71,7 +71,9 @@ LINUX_FIRMWARE_FILES += \ rtl_bt/rtl8723a_fw.bin rtl_bt/rtl8723b_fw.bin \ rtl_bt/rtl8723bs_config-OBDA8723.bin \ rtl_bt/rtl8723bs_fw.bin rtl_bt/rtl8723d_config.bin \ - rtl_bt/rtl8723d_fw.bin rtl_bt/rtl8761a_fw.bin + rtl_bt/rtl8723d_fw.bin rtl_bt/rtl8761a_fw.bin \ + rtl_bt/rtl8761b_fw.bin rtl_bt/rtl8761b_config.bin \ + rtl_bt/rtl8761bu_fw.bin rtl_bt/rtl8761bu_config.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt endif From yann.morin.1998 at free.fr Mon Feb 20 20:58:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:09 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx/imx-lib: update codeaurora URLs to github Message-ID: <20230220205220.34A54828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c74c6472b8caf31b34a5a57654ab0c3d18dad36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. The commit also: - removes the comment in Config.in that the package does not have an upstream, - adds the new github.com url as the package url Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/imx-lib/Config.in | 3 +-- package/freescale-imx/imx-lib/imx-lib.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/freescale-imx/imx-lib/Config.in b/package/freescale-imx/imx-lib/Config.in index 746788e4c5..0a89bf140f 100644 --- a/package/freescale-imx/imx-lib/Config.in +++ b/package/freescale-imx/imx-lib/Config.in @@ -11,5 +11,4 @@ config BR2_PACKAGE_IMX_LIB platform specific drivers. It requires a kernel that includes the i.MX specific headers to be built. - This library is provided by Freescale as-is and doesn't have - an upstream. + https://github.com/nxp-imx/imx-lib diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk index 721c20e5f8..f06453e8a6 100644 --- a/package/freescale-imx/imx-lib/imx-lib.mk +++ b/package/freescale-imx/imx-lib/imx-lib.mk @@ -5,7 +5,7 @@ ################################################################################ IMX_LIB_VERSION = 3f777974c0c146817e2ff5cb0340ca66a1f99e57 -IMX_LIB_SITE = https://source.codeaurora.org/external/imx/imx-lib +IMX_LIB_SITE = https://github.com/nxp-imx/imx-lib.git IMX_LIB_SITE_METHOD = git IMX_LIB_LICENSE = LGPL-2.1+ IMX_LIB_LICENSE_FILES = COPYING-LGPL-2.1 From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:10 -0000 Subject: [Buildroot] [git commit branch/next] package/python-greenlet: add missing C++ dependency Message-ID: <20230220205241.BC56E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3496f300a8ca2bb8b337db5d43be5b3293a4e9e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: - http://autobuild.buildroot.net/results/529/5291fe0fac1d5c7b6587e4a566991a764a2632fb Signed-off-by: James Hilliard Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-greenlet/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-greenlet/Config.in b/package/python-greenlet/Config.in index 9f66ebe119..ae092e3ffe 100644 --- a/package/python-greenlet/Config.in +++ b/package/python-greenlet/Config.in @@ -12,7 +12,12 @@ config BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_GREENLET bool "python-greenlet" depends on BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP help Lightweight in-process concurrent programming. https://github.com/python-greenlet/greenlet + +comment "python-greenlet needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP From yann.morin.1998 at free.fr Mon Feb 20 20:58:11 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:11 -0000 Subject: [Buildroot] [git commit branch/next] package/fmlib: update codeaurora URLs to github Message-ID: <20230220205219.E69E0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a94678cfd965ed11a4e2d18d840c03a41c148d6b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. The version fsl-sdk-v2.0 is an old tag from 2016. It was not migrated to github. This commit use instead the commit id corresponding to this tag. See: https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmlib/commit/?h=fsl-sdk-v2.0&id=43fa98fdbf0c697167e415c3f060896d5b482791 The commit id exists on github: https://github.com/nxp-qoriq/fmlib/commit/43fa98fdbf0c697167e415c3f060896d5b482791 Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/fmlib/Config.in | 2 +- package/fmlib/fmlib.hash | 2 +- package/fmlib/fmlib.mk | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/fmlib/Config.in b/package/fmlib/Config.in index 7bccfd7c83..97d55d1250 100644 --- a/package/fmlib/Config.in +++ b/package/fmlib/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_FMLIB configure driver parameters and PCD (parse - classify - distribute) rules. - http://git.freescale.com/git/cgit.cgi/ppc/sdk/fmlib.git/tree/README + https://github.com/nxp-qoriq/fmlib if BR2_PACKAGE_FMLIB choice diff --git a/package/fmlib/fmlib.hash b/package/fmlib/fmlib.hash index 47460d091c..d4dcf3be5c 100644 --- a/package/fmlib/fmlib.hash +++ b/package/fmlib/fmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 59415d346af1d22f510f2785be4c7e3606dc3181476a666e832270550f7d44a6 fmlib-fsl-sdk-v2.0-br1.tar.gz +sha256 6e9e6bdb42dc2a6a76cfd756a2d4cdfcc2be90925c1f439e8a11eafa871896a6 fmlib-43fa98fdbf0c697167e415c3f060896d5b482791.tar.gz sha256 837559e20d83910a005e7883b876cc5c42805fe4abcf7e5c5b3c8d036b7f61c8 COPYING diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk index 8cb779201d..9509f3de56 100644 --- a/package/fmlib/fmlib.mk +++ b/package/fmlib/fmlib.mk @@ -4,9 +4,8 @@ # ################################################################################ -FMLIB_VERSION = fsl-sdk-v2.0 -FMLIB_SITE = https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmlib -FMLIB_SITE_METHOD = git +FMLIB_VERSION = 43fa98fdbf0c697167e415c3f060896d5b482791 +FMLIB_SITE = $(call github,nxp-qoriq,fmlib,$(FMLIB_VERSION)) FMLIB_LICENSE = BSD-3-Clause, GPL-2.0+ FMLIB_LICENSE_FILES = COPYING FMLIB_DEPENDENCIES = linux From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:11 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-module-build: bump to version 0.4232 Message-ID: <20230220205241.EE3918648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e235a1daa4e24f1eb9f1d9307003fa29cfeedd88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-module-build/perl-module-build.hash | 4 ++-- package/perl-module-build/perl-module-build.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-module-build/perl-module-build.hash b/package/perl-module-build/perl-module-build.hash index 09bc5f374a..a2181290ee 100644 --- a/package/perl-module-build/perl-module-build.hash +++ b/package/perl-module-build/perl-module-build.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 066b193e461d7dfe1eca17a139353001 Module-Build-0.4231.tar.gz -sha256 7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717 Module-Build-0.4231.tar.gz +md5 144885f1cbaf9420017bbed696ec6b83 Module-Build-0.4232.tar.gz +sha256 67c82ee245d94ba06decfa25572ab75fdcd26a9009094289d8f45bc54041771b Module-Build-0.4232.tar.gz # computed by scancpan sha256 f35ac2cc6b808a38c42c2d230b875217b0a24bb51e5a497ebb630cbb3d806c3e LICENSE diff --git a/package/perl-module-build/perl-module-build.mk b/package/perl-module-build/perl-module-build.mk index f5cab36890..d95a30647a 100644 --- a/package/perl-module-build/perl-module-build.mk +++ b/package/perl-module-build/perl-module-build.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MODULE_BUILD_VERSION = 0.4231 +PERL_MODULE_BUILD_VERSION = 0.4232 PERL_MODULE_BUILD_SOURCE = Module-Build-$(PERL_MODULE_BUILD_VERSION).tar.gz PERL_MODULE_BUILD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT PERL_MODULE_BUILD_LICENSE = Artistic or GPL-1.0+ From yann.morin.1998 at free.fr Mon Feb 20 20:58:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:12 -0000 Subject: [Buildroot] [git commit branch/next] package/fmc: update codeaurora URLs to github Message-ID: <20230220205219.D066486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=774c39caf093943aa9416c636fe3b2ec31a64e21 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. This commit also: - changes the _SITE_METHOD from "git" to the default "wget", - updates an old and broken freescale.com app note link, - adds the github project page as project url. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. The version "fsl-sdk-v2.0" is an old tag from 2015. It was not migrated to github. This commit use instead the commit id corresponding to this tag. See: https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmc/commit/?h=fsl-sdk-v2.0&id=a079d2c844edd85dff85a317a63198e7988bcd09 The commit id exists on github: https://github.com/nxp-qoriq/fmc/commit/a079d2c844edd85dff85a317a63198e7988bcd09 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/fmc/Config.in | 4 +++- package/fmc/fmc.hash | 2 +- package/fmc/fmc.mk | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/fmc/Config.in b/package/fmc/Config.in index 4399aa2cab..c89a87c99e 100644 --- a/package/fmc/Config.in +++ b/package/fmc/Config.in @@ -21,5 +21,7 @@ config BR2_PACKAGE_FMC packets flow into hardware configuration. The tool provides an abstraction layer between the end customer's vision of the PCD task definition and real hardware implementation. + See application note: + https://www.nxp.com/docs/en/application-note/AN4760.pdf - http://cache.freescale.com/files/32bit/doc/app_note/AN4760.pdf + https://github.com/nxp-qoriq/fmc diff --git a/package/fmc/fmc.hash b/package/fmc/fmc.hash index fed33091cd..7309562b09 100644 --- a/package/fmc/fmc.hash +++ b/package/fmc/fmc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cb896ec1fac2fe9a3a9bb8be2221b79acf5f9b75841609a681db0d9e7bec02a0 fmc-fsl-sdk-v2.0-br1.tar.gz +sha256 e8594e37eb81e5b1f492f8494b98086f65180637b1e2e08d8a4475c23653a404 fmc-a079d2c844edd85dff85a317a63198e7988bcd09.tar.gz sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 COPYING diff --git a/package/fmc/fmc.mk b/package/fmc/fmc.mk index b385730138..6ac8c768df 100644 --- a/package/fmc/fmc.mk +++ b/package/fmc/fmc.mk @@ -4,9 +4,8 @@ # ################################################################################ -FMC_VERSION = fsl-sdk-v2.0 -FMC_SITE = https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmc -FMC_SITE_METHOD = git +FMC_VERSION = a079d2c844edd85dff85a317a63198e7988bcd09 +FMC_SITE = $(call github,nxp-qoriq,fmc,$(FMC_VERSION)) FMC_LICENSE = MIT FMC_LICENSE_FILES = COPYING FMC_DEPENDENCIES = libxml2 tclap fmlib From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:12 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-path-tiny: bump to version 0.144 Message-ID: <20230220205242.1D5398648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d263fe0a6e7d572514fb03ec383c4800e54ae31a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-path-tiny/perl-path-tiny.hash | 4 ++-- package/perl-path-tiny/perl-path-tiny.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-path-tiny/perl-path-tiny.hash b/package/perl-path-tiny/perl-path-tiny.hash index c6fe8bf92e..7874846b89 100644 --- a/package/perl-path-tiny/perl-path-tiny.hash +++ b/package/perl-path-tiny/perl-path-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 16dd03cded30d00167a03315d0e11e51 Path-Tiny-0.124.tar.gz -sha256 fa083144781e46817ec39d21962bbbb0533c201f3baf031d2999a785a2a013fd Path-Tiny-0.124.tar.gz +md5 7b2fc4f5edfd29b88d2cc3b96830e7d1 Path-Tiny-0.144.tar.gz +sha256 f6ea094ece845c952a02c2789332579354de8d410a707f9b7045bd241206487d Path-Tiny-0.144.tar.gz # computed by scancpan sha256 c1a19c0d83f668a784640c0b41e024f37b182ad38011b170f9200123e57f6070 LICENSE diff --git a/package/perl-path-tiny/perl-path-tiny.mk b/package/perl-path-tiny/perl-path-tiny.mk index a0575172f0..6d784a0d16 100644 --- a/package/perl-path-tiny/perl-path-tiny.mk +++ b/package/perl-path-tiny/perl-path-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PATH_TINY_VERSION = 0.124 +PERL_PATH_TINY_VERSION = 0.144 PERL_PATH_TINY_SOURCE = Path-Tiny-$(PERL_PATH_TINY_VERSION).tar.gz PERL_PATH_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN PERL_PATH_TINY_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Mon Feb 20 20:58:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:13 -0000 Subject: [Buildroot] [git commit branch/next] package/freescale-imx/imx-m4fwloader: update URLs to NXPmicro github organization Message-ID: <20230220205220.4DA7C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f496b36995c02f81b2404ef1f450ecbfba26aace branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next imx-m4fwloader was removed from the github codeauroraforum organization. It is now redirecting to NXPmicro. This patch updates the link to directly point to the correct place. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/imx-m4fwloader/Config.in | 2 +- package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-m4fwloader/Config.in b/package/freescale-imx/imx-m4fwloader/Config.in index 937f82f916..d75480a708 100644 --- a/package/freescale-imx/imx-m4fwloader/Config.in +++ b/package/freescale-imx/imx-m4fwloader/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_IMX_M4FWLOADER This package provides a tool to load a firmware to the Cortex-M4 core available in some i.MX processors. - https://github.com/codeauroraforum/imx-m4fwloader + https://github.com/NXPmicro/imx-m4fwloader diff --git a/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk b/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk index cc4849330c..320d5dc617 100644 --- a/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk +++ b/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk @@ -5,7 +5,7 @@ ################################################################################ IMX_M4FWLOADER_VERSION = 8cf4d17a09ba23250d43381b49ba00d92406fad9 -IMX_M4FWLOADER_SITE = $(call github,codeauroraforum,imx-m4fwloader,$(IMX_M4FWLOADER_VERSION)) +IMX_M4FWLOADER_SITE = $(call github,NXPmicro,imx-m4fwloader,$(IMX_M4FWLOADER_VERSION)) IMX_M4FWLOADER_LICENSE = GPL-2.0+ IMX_M4FWLOADER_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:13 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi-pvr-vuplus: bump version to 19.0.1-Matrix Message-ID: <20230220205242.289D586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26dabd73b4f75dd3a9e2b48f8e4a4f32d42e05f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash | 2 +- package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash index 92ccd0cbfe..b2a4031bd3 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 59e8b63e3b5a6dd4500fd2c1426e021b5b243909d326e173e84804618a6c2fc6 kodi-pvr-vuplus-19.0.0-Matrix.tar.gz +sha256 cd5658c5e40d42bc02e5c99b47c28cb24bdda4b6dd49029131ff147405d4c8a8 kodi-pvr-vuplus-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk index 6a50ce703a..81159e05f3 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VUPLUS_VERSION = 19.0.0-Matrix +KODI_PVR_VUPLUS_VERSION = 19.0.1-Matrix KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION)) KODI_PVR_VUPLUS_LICENSE = GPL-2.0+ KODI_PVR_VUPLUS_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:14 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi: fix armv5 build Message-ID: <20230220205242.4B22C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2952832a40b08e93bb3dc614bb2068b152b1919f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable neon support when not available. Fixes build error not yet found by autobuilders /tmp/cc8LvPwi.s: Assembler messages: /tmp/cc8LvPwi.s:28: Error: selected processor does not support `vldmia r1,{ q4-q7 }' in ARM mode /tmp/cc8LvPwi.s:29: Error: selected processor does not support `vldmia r0,{ q8-q11 }' in ARM mode /tmp/cc8LvPwi.s:30: Error: selected processor does not support `vmul.f32 q0,q8,d8[0]' in ARM mode /tmp/cc8LvPwi.s:31: Error: selected processor does not support `vmul.f32 q1,q8,d10[0]' in ARM mode /tmp/cc8LvPwi.s:32: Error: selected processor does not support `vmul.f32 q2,q8,d12[0]' in ARM mode /tmp/cc8LvPwi.s:33: Error: selected processor does not support `vmul.f32 q3,q8,d14[0]' in ARM mode /tmp/cc8LvPwi.s:34: Error: selected processor does not support `vmla.f32 q0,q9,d8[1]' in ARM mode /tmp/cc8LvPwi.s:35: Error: selected processor does not support `vmla.f32 q1,q9,d10[1]' in ARM mode /tmp/cc8LvPwi.s:36: Error: selected processor does not support `vmla.f32 q2,q9,d12[1]' in ARM mode /tmp/cc8LvPwi.s:37: Error: selected processor does not support `vmla.f32 q3,q9,d14[1]' in ARM mode /tmp/cc8LvPwi.s:38: Error: selected processor does not support `vmla.f32 q0,q10,d9[0]' in ARM mode /tmp/cc8LvPwi.s:39: Error: selected processor does not support `vmla.f32 q1,q10,d11[0]' in ARM mode /tmp/cc8LvPwi.s:40: Error: selected processor does not support `vmla.f32 q2,q10,d13[0]' in ARM mode /tmp/cc8LvPwi.s:41: Error: selected processor does not support `vmla.f32 q3,q10,d15[0]' in ARM mode /tmp/cc8LvPwi.s:42: Error: selected processor does not support `vmla.f32 q0,q11,d9[1]' in ARM mode /tmp/cc8LvPwi.s:43: Error: selected processor does not support `vmla.f32 q1,q11,d11[1]' in ARM mode /tmp/cc8LvPwi.s:44: Error: selected processor does not support `vmla.f32 q2,q11,d13[1]' in ARM mode /tmp/cc8LvPwi.s:45: Error: selected processor does not support `vmla.f32 q3,q11,d15[1]' in ARM mode /tmp/cc8LvPwi.s:46: Error: selected processor does not support `vstmia r0,{ q0-q3 }' in ARM mode with this defconfig: BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi/kodi.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index dbe6c1e8f6..7d15e992fb 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -144,6 +144,14 @@ else KODI_CONF_OPTS += -DWITH_CPU=$(BR2_ARCH) endif +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else ifeq ($(BR2_aarch64),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else +KODI_CONF_OPTS += -DENABLE_NEON=OFF +endif + ifeq ($(BR2_X86_CPU_HAS_SSE),y) KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON else From yann.morin.1998 at free.fr Mon Feb 20 20:58:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:15 -0000 Subject: [Buildroot] [git commit branch/next] package/mfgtools: update URLs to NXPmicro github organization Message-ID: <20230220205220.66318828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a03e57ccbf432f73275869cf9a3e6a7a234cb5de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next mfgtools was removed from the github codeauroraforum organization. It is now redirecting to NXPmicro. This patch updates the link to directly point to the correct place. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/mfgtools/Config.in.host | 2 +- package/mfgtools/mfgtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mfgtools/Config.in.host b/package/mfgtools/Config.in.host index 2b506c8f67..f1e7ab58e3 100644 --- a/package/mfgtools/Config.in.host +++ b/package/mfgtools/Config.in.host @@ -8,7 +8,7 @@ config BR2_PACKAGE_HOST_MFGTOOLS production. The communication is done over USB using the Freescale UTP protocol. - https://github.com/codeauroraforum/mfgtools + https://github.com/NXPmicro/mfgtools comment "host mfgtools needs a toolchain w/ host gcc >= 4.9" depends on BR2_arm diff --git a/package/mfgtools/mfgtools.mk b/package/mfgtools/mfgtools.mk index 48ce5dda28..3de93936b8 100644 --- a/package/mfgtools/mfgtools.mk +++ b/package/mfgtools/mfgtools.mk @@ -5,7 +5,7 @@ ################################################################################ MFGTOOLS_VERSION = 0.02 -MFGTOOLS_SITE = $(call github,codeauroraforum,mfgtools,v$(MFGTOOLS_VERSION)) +MFGTOOLS_SITE = $(call github,NXPmicro,mfgtools,v$(MFGTOOLS_VERSION)) MFGTOOLS_SUBDIR = MfgToolLib MFGTOOLS_LICENSE = BSD-3-Clause or CPOL MFGTOOLS_LICENSE_FILES = LICENSE README.txt From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:16 -0000 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.4 Message-ID: <20230220205242.72DA9828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08b680f6718746eeabf2b4a18111a0991744cda3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.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 c1765c3eaa..03bf635816 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 = 22.3.3 +MESA3D_HEADERS_VERSION = 22.3.4 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 c2ceaa6ead..e4de997f0e 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000699.html -sha256 bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922 mesa-22.3.3.tar.xz -sha512 dcf166bc7c80e6ad09337e0188219e5ea4bdc558bc4b4ca35ce30d5421568f6b5328e5508b3175a2696521214e466354d8652ade22468ce448d9f61d5709c8a1 mesa-22.3.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html +sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz +sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 9fa2c05230..cf2352a355 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 = 22.3.3 +MESA3D_VERSION = 22.3.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From yann.morin.1998 at free.fr Mon Feb 20 20:58:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:17 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-imx-viv: update codeaurora URLs to github Message-ID: <20230220205220.91425828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5bdaf71c7c53655b5526f1fb6973c8fe98da8db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- .../x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash | 2 +- package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash index 5873b4b11c..b79c236478 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash +++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 638a8aa8b64f860900d003527529689bc342d18ff5e41a9e1750884544898e67 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga-br1.tar.gz +sha256 8fe1f57334b22926d4ff3b0b9fdf50af835a99cdfd0ad3ba6a604b226b723e89 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga.tar.gz sha256 9d3e373f0440cc0c58853e963636a7c1ffda9308ec5f30ebe9adfb9c16a8a1e4 COPYING-MIT diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk index 0913427542..3b346f323a 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk +++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk @@ -5,8 +5,7 @@ ################################################################################ XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = rel_imx_4.9.x_1.0.0_ga -XDRIVER_XF86_VIDEO_IMX_VIV_SITE = https://source.codeaurora.org/external/imx/xf86-video-imx-vivante -XDRIVER_XF86_VIDEO_IMX_VIV_SITE_METHOD = git +XDRIVER_XF86_VIDEO_IMX_VIV_SITE = $(call github,nxp-imx,xf86-video-imx-vivante,$(XDRIVER_XF86_VIDEO_IMX_VIV_VERSION)) XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv imx-gpu-g2d xserver_xorg-server \ xorgproto libdrm XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE = MIT From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:17 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-qxl: bump version to 0.1.6 Message-ID: <20230220205242.7F37086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=760894b72ed465f426cf848f561200a4656eda4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003316.html Removed patch which was applied upstream. Switched tarball to xz and _SITE to https, added sha512 hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-Fix-a-build-error-with-Xorg-master.patch | 106 --------------------- .../xdriver_xf86-video-qxl.hash | 5 +- .../xdriver_xf86-video-qxl.mk | 6 +- 3 files changed, 6 insertions(+), 111 deletions(-) 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 deleted file mode 100644 index d3257fba20..0000000000 --- a/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch +++ /dev/null @@ -1,106 +0,0 @@ -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 - diff --git a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash index fdf0cc434d..2d728a7c03 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash +++ b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-December/002753.html -sha256 b18682e04503c6326f7bf7190f3ee50a3d4d69758a2a3cc9af102a6b3f114c92 xf86-video-qxl-0.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-January/003316.html +sha256 2ad39558db47a8fcc036e290e0b084671e58d43344a57b279abd870c4c67965f xf86-video-qxl-0.1.6.tar.xz +sha512 f6a42355915d2e8f8a842dc24fe6d012d123aa6d23eedea1a4771fb08f88e0298d76741755b88304d76c66b3aae15f9fca74d062be395e499a82ee8f4507c7e0 xf86-video-qxl-0.1.6.tar.xz # Locally calculated sha256 83f3bf7be3fbf5e66174b8184bd837a6b44264f8e340126ea4d9e9ce956a1866 COPYING diff --git a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk index ffbac05ec1..db0bbbaf65 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk +++ b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_QXL_VERSION = 0.1.5 -XDRIVER_XF86_VIDEO_QXL_SOURCE = xf86-video-qxl-$(XDRIVER_XF86_VIDEO_QXL_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_QXL_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_QXL_VERSION = 0.1.6 +XDRIVER_XF86_VIDEO_QXL_SOURCE = xf86-video-qxl-$(XDRIVER_XF86_VIDEO_QXL_VERSION).tar.xz +XDRIVER_XF86_VIDEO_QXL_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_QXL_LICENSE = MIT XDRIVER_XF86_VIDEO_QXL_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:17 -0000 Subject: [Buildroot] [git commit branch/next] package/sdl2: security bump to version 2.26.2 Message-ID: <20230220205242.A57488648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d33a8417bf1bc5d7276e19da5c37da210d4de31a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patch (already in version) - Fix CVE-2022-4743: A potential memory leak issue was discovered in SDL2 in GLES_CreateTexture() function in SDL_render_gles.c. The vulnerability allows an attacker to cause a denial of service attack. https://github.com/libsdl-org/SDL/releases/tag/release-2.26.0 https://github.com/libsdl-org/SDL/releases/tag/release-2.26.1 https://github.com/libsdl-org/SDL/releases/tag/release-2.26.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...oesn-t-have-a-mode-configured-use-the-pre.patch | 76 ---------------------- package/sdl2/sdl2.hash | 4 +- package/sdl2/sdl2.mk | 2 +- 3 files changed, 3 insertions(+), 79 deletions(-) diff --git a/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch b/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch deleted file mode 100644 index c8be280c56..0000000000 --- a/package/sdl2/0001-If-a-CRTC-doesn-t-have-a-mode-configured-use-the-pre.patch +++ /dev/null @@ -1,76 +0,0 @@ -From da9ba3a2a1536017e4ce1ee0f4276578d1ce6e29 Mon Sep 17 00:00:00 2001 -From: Sam Lantinga -Date: Fri, 18 Nov 2022 12:17:27 -0800 -Subject: [PATCH] If a CRTC doesn't have a mode configured, use the preferred - or largest mode as the default mode - -Fixes https://github.com/libsdl-org/SDL/issues/6421 - -[mf at go-sys.de: backport from upstream] -Signed-off-by: Michael Fischer -[yann.morin.1998 at free.fr: do an actual backport] -Signed-off-by: Yann E. MORIN ---- - src/video/kmsdrm/SDL_kmsdrmvideo.c | 35 +++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 6 deletions(-) - -diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c -index eae721455..eeeefef2b 100644 ---- a/src/video/kmsdrm/SDL_kmsdrmvideo.c -+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c -@@ -666,8 +666,8 @@ KMSDRM_CrtcGetVrr(uint32_t drm_fd, uint32_t crtc_id) - /* Gets a DRM connector, builds an SDL_Display with it, and adds it to the - list of SDL Displays in _this->displays[] */ - static void --KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) { -- -+KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) -+{ - SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata); - SDL_DisplayData *dispdata = NULL; - SDL_VideoDisplay display = {0}; -@@ -770,14 +770,37 @@ KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resources) { - drmModeModeInfo *mode = &connector->modes[i]; - - if (!SDL_memcmp(mode, &crtc->mode, sizeof(crtc->mode))) { -- mode_index = i; -- break; -+ mode_index = i; -+ break; - } - } - - if (mode_index == -1) { -- ret = SDL_SetError("Failed to find index of mode attached to the CRTC."); -- goto cleanup; -+ int current_area, largest_area = 0; -+ -+ /* Find the preferred mode or the highest resolution mode */ -+ for (i = 0; i < connector->count_modes; i++) { -+ drmModeModeInfo *mode = &connector->modes[i]; -+ -+ if (mode->type & DRM_MODE_TYPE_PREFERRED) { -+ mode_index = i; -+ break; -+ } -+ -+ current_area = mode->hdisplay * mode->vdisplay; -+ if (current_area > largest_area) { -+ mode_index = i; -+ largest_area = current_area; -+ } -+ } -+ if (mode_index != -1) { -+ crtc->mode = connector->modes[mode_index]; -+ } -+ } -+ -+ if (mode_index == -1) { -+ ret = SDL_SetError("Failed to find index of mode attached to the CRTC."); -+ goto cleanup; - } - - /*********************************************/ --- -2.25.1 - diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 923a900dc0..86e0d86e7c 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.24.2.tar.gz.sig -sha256 b35ef0a802b09d90ed3add0dcac0e95820804202914f5bb7b0feb710f1a1329f SDL2-2.24.2.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.2.tar.gz.sig +sha256 95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0 SDL2-2.26.2.tar.gz # Locally calculated sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index a1dc8b5b73..8995178e71 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.24.2 +SDL2_VERSION = 2.26.2 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From yann.morin.1998 at free.fr Mon Feb 20 20:58:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:18 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6dlsabresd: update codeaurora URLs to github Message-ID: <20230220205220.BC37F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f84cb1f03fda27df856cc4bfee36b9e5569b3d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6dlsabresd_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index 74debbfd46..976c180d6c 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd" @@ -37,7 +36,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:18 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6dlsabreauto: update codeaurora URLs to github Message-ID: <20230220205220.A76868648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30668cf9187726731611f7f5f6602098866f3286 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6dlsabreauto_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index 8fe10f6275..4081fa74a2 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto" @@ -38,7 +37,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:18 -0000 Subject: [Buildroot] [git commit branch/next] package/kvm-unit-tests: bump to version 2023-01-05 Message-ID: <20230220205242.B11FF86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e43a3c785b9666f3144e7905b27af920fff913e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A new kvm-unit-tests version has recently been tagged, so let's update to that version now. This new version now features a --disable-werror parameter for the configure script, so we can drop the patch for disabling this manually now. Signed-off-by: Thomas Huth Signed-off-by: Thomas Petazzoni --- ...ile-remove-Werror-to-avoid-build-failures.patch | 30 ---------------------- package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- package/kvm-unit-tests/kvm-unit-tests.mk | 3 ++- 3 files changed, 3 insertions(+), 32 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 deleted file mode 100644 index d07b9b6912..0000000000 --- a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 08e14a662b9e75daec29722e49150869952ba1b6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 20 Nov 2017 22:09:39 +0100 -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(-) - -diff --git a/Makefile b/Makefile -index 7231334..d9ad42b 100644 ---- a/Makefile -+++ b/Makefile -@@ -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), "") -- -2.14.2 - diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index 42c3b4a241..3b6d02dd8e 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 c2edf2b188033a5d634150ecc797c797a85e5af8e3ef4ac3e583f60b2ee7bcf3 kvm-unit-tests-v2022-03-08.tar.bz2 +sha256 9c9b093ffe3fa33145a53102de9c3e2d55cd0cdc8a20cf172b726296ffe22f4f kvm-unit-tests-v2023-01-05.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 dd8f153710..956f07b304 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -4,7 +4,7 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = 2022-03-08 +KVM_UNIT_TESTS_VERSION = 2023-01-05 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 = GPL-2.0, LGPL-2.0 @@ -31,6 +31,7 @@ KVM_UNIT_TESTS_ENDIAN = big endif KVM_UNIT_TESTS_CONF_OPTS =\ + --disable-werror \ --arch="$(KVM_UNIT_TESTS_ARCH)" \ --processor="$(GCC_TARGET_CPU)" \ --endian="$(KVM_UNIT_TESTS_ENDIAN)" From yann.morin.1998 at free.fr Mon Feb 20 20:58:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:19 -0000 Subject: [Buildroot] [git commit branch/next] package/multipath-tools: bump to version 0.9.4 Message-ID: <20230220205243.1964586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b535fd2a093eca5e8967a5c8004da55f7295d101 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Alexander Egorenkov Signed-off-by: Yann E. MORIN --- package/multipath-tools/multipath-tools.hash | 2 +- package/multipath-tools/multipath-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index 6f893d37ce..3f01408c76 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 7d5af5d86e43b757e253d1ba244aa8a9c09bfbb1677a72accb799b1bfcc0a9ac multipath-tools-0.9.3.tar.gz +sha256 6ed3cf6e786da20a451d9747cbd4c5817815388b8fc8022d1074b3018479031d multipath-tools-0.9.4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index d6abf68ca0..90394fae9f 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.9.3 +MULTIPATH_TOOLS_VERSION = 0.9.4 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ From yann.morin.1998 at free.fr Mon Feb 20 20:58:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:20 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6ullevk: update codeaurora URLs to github Message-ID: <20230220205221.1490B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=897a75a26679fd68276418ff49b79358b7ca2c7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6ullevk_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index 4c5c3b2524..7a8965be18 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -4,9 +4,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -15,9 +14,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:20 -0000 Subject: [Buildroot] [git commit branch/next] package/ethtool: fix musl-libc builds Message-ID: <20230220205243.3C56A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f97275bc78b717bec0c5d1efaaf73a0e6e36f53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Upstream commit 1fa60003a8b8 made a change to headers that broke compiles for musl-libc based builds. Apply the patch slated to address the issue. Fixes: - http://autobuild.buildroot.net/results/eafd07dddfe7e8b714fc3fcaf77a2d7150694ee2/ Signed-off-by: Vincent Fazio Signed-off-by: Yann E. MORIN --- .../0002-marvell.c-Fix-build-with-musl-libc.patch | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch b/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..f13edbbe50 --- /dev/null +++ b/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch @@ -0,0 +1,71 @@ +From a26296eea68aa6c16b253f34825c9b9007269672 Mon Sep 17 00:00:00 2001 +From: Florian Fainelli +Date: Sat, 14 Jan 2023 08:34:11 -0800 +Subject: [PATCH] marvell.c: Fix build with musl-libc + +After commit 1fa60003a8b8 ("misc: header includes cleanup") we stopped +including net/if.h which resolved the proper defines to pull in +sys/types.h and provide a definition for u_int32_t. With musl-libc we +would need to define _GNU_SOURCE to ensure that sys/types.h does provide a +definition for u_int32_t. + +Rather, just replace u_uint{16,32}_t with the more standard +uint{16,32}_t types from stdint.h + +Fixes: 1fa60003a8b8 ("misc: header includes cleanup") +Signed-off-by: Florian Fainelli + +[Upstream: https://patchwork.kernel.org/project/netdevbpf/patch/20230114163411.3290201-4-f.fainelli at gmail.com/] +Signed-off-by: Vincent Fazio +--- + marvell.c | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/marvell.c b/marvell.c +index d3d570e..3f3aed8 100644 +--- a/marvell.c ++++ b/marvell.c +@@ -31,23 +31,23 @@ static void dump_timer(const char *name, const void *p) + static void dump_queue(const char *name, const void *a, int rx) + { + struct desc { +- u_int32_t ctl; +- u_int32_t next; +- u_int32_t data_lo; +- u_int32_t data_hi; +- u_int32_t status; +- u_int32_t timestamp; +- u_int16_t csum2; +- u_int16_t csum1; +- u_int16_t csum2_start; +- u_int16_t csum1_start; +- u_int32_t addr_lo; +- u_int32_t addr_hi; +- u_int32_t count_lo; +- u_int32_t count_hi; +- u_int32_t byte_count; +- u_int32_t csr; +- u_int32_t flag; ++ uint32_t ctl; ++ uint32_t next; ++ uint32_t data_lo; ++ uint32_t data_hi; ++ uint32_t status; ++ uint32_t timestamp; ++ uint16_t csum2; ++ uint16_t csum1; ++ uint16_t csum2_start; ++ uint16_t csum1_start; ++ uint32_t addr_lo; ++ uint32_t addr_hi; ++ uint32_t count_lo; ++ uint32_t count_hi; ++ uint32_t byte_count; ++ uint32_t csr; ++ uint32_t flag; + }; + const struct desc *d = a; + +-- +2.25.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:58:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:21 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6sxsabresd: update codeaurora URLs to github Message-ID: <20230220205221.04A53828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2262e55b12fa032b5ab319a9e2c19babba6b1dc1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Reviewed-by: Fabio Estevam Signed-off-by: Yann E. MORIN --- configs/freescale_imx6sxsabresd_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index 9f48ef2da5..0c585c97f0 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb" @@ -36,8 +35,7 @@ BR2_PACKAGE_HOST_MTOOLS=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:21 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx7dsabresd: update codeaurora URLs to github Message-ID: <20230220205221.28B3F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=492d471968e83126cb0f10518e2deba3ff835b08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx7dsabresd_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index 5a9cff488d..d337865831 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -10,9 +10,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" @@ -25,9 +24,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:25 -0000 Subject: [Buildroot] [git commit branch/next] package/c-ares: security bump to version 1.19.0 Message-ID: <20230220205243.BE77786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=121a9d3649498c5f6f3a5ae8a37d6befe2cc8ef8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Low. Stack overflow in ares_set_sortlist() which is used during c-ares initialization and typically provided by an administrator and not an end user. https://c-ares.org/changelog.html#1_19_0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index af1f076aab..edf891674b 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 1a7d52a8a84a9fbffb1be9133c0f6e17217d91ea5a6fa61f6b4729cda78ebbcf c-ares-1.18.1.tar.gz +sha256 bfceba37e23fd531293829002cac0401ef49a6dc55923f7f92236585b7ad1dd3 c-ares-1.19.0.tar.gz # Hash for license file sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 0152759ebc..4332fc6919 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.18.1 +C_ARES_VERSION = 1.19.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From yann.morin.1998 at free.fr Mon Feb 20 20:58:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:25 -0000 Subject: [Buildroot] [git commit branch/next] configs/imx8mmpico: update codeaurora URLs to github Message-ID: <20230220205221.927ED86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e840a811e5c21f36524a1e334ba76cc90ae53411 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates only the ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/imx8mmpico_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/imx8mmpico_defconfig b/configs/imx8mmpico_defconfig index 7c19c8c81b..8c34c40fef 100644 --- a/configs/imx8mmpico_defconfig +++ b/configs/imx8mmpico_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.72-2.2.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.72-2.2.0)/imx-atf-lf-5.10.72-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:26 -0000 Subject: [Buildroot] [git commit branch/next] package/python-selenium: new package Message-ID: <20230220205243.B41E286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=352f4418e4ece05fc075f48e4af6f0918bf11873 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-selenium/Config.in | 11 +++++++++++ package/python-selenium/python-selenium.hash | 3 +++ package/python-selenium/python-selenium.mk | 13 +++++++++++++ 5 files changed, 29 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7e9e4df8f1..d0a51086cd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1396,6 +1396,7 @@ F: package/python-pydyf/ F: package/python-pypa-build/ F: package/python-pyphen/ F: package/python-rtoml/ +F: package/python-selenium/ F: package/python-snappy/ F: package/python-sniffio/ F: package/python-sockjs/ diff --git a/package/Config.in b/package/Config.in index 46679095b3..fc468148df 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1260,6 +1260,7 @@ menu "External python modules" source "package/python-sdnotify/Config.in" source "package/python-secretstorage/Config.in" source "package/python-see/Config.in" + source "package/python-selenium/Config.in" source "package/python-semver/Config.in" source "package/python-sentry-sdk/Config.in" source "package/python-serial/Config.in" diff --git a/package/python-selenium/Config.in b/package/python-selenium/Config.in new file mode 100644 index 0000000000..30820f07f8 --- /dev/null +++ b/package/python-selenium/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_SELENIUM + bool "python-selenium" + select BR2_PACKAGE_PYTHON_CERTIFI # runtime + select BR2_PACKAGE_PYTHON_PYSOCKS # runtime + select BR2_PACKAGE_PYTHON_TRIO # runtime + select BR2_PACKAGE_PYTHON_TRIO_WEBSOCKET # runtime + select BR2_PACKAGE_PYTHON_URLLIB3 # runtime + help + Python language bindings for Selenium WebDriver. + + https://www.selenium.dev diff --git a/package/python-selenium/python-selenium.hash b/package/python-selenium/python-selenium.hash new file mode 100644 index 0000000000..d462abc62b --- /dev/null +++ b/package/python-selenium/python-selenium.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/selenium/json +md5 e9054eb95920bb2a1d594090f0773f61 selenium-4.8.0.tar.gz +sha256 fee36724d6cf0b18c73781bb8ec7be4a35ab1e2564e64e64e64da75e50e052af selenium-4.8.0.tar.gz diff --git a/package/python-selenium/python-selenium.mk b/package/python-selenium/python-selenium.mk new file mode 100644 index 0000000000..6dbea6fb7e --- /dev/null +++ b/package/python-selenium/python-selenium.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-selenium +# +################################################################################ + +PYTHON_SELENIUM_VERSION = 4.8.0 +PYTHON_SELENIUM_SOURCE = selenium-$(PYTHON_SELENIUM_VERSION).tar.gz +PYTHON_SELENIUM_SITE = https://files.pythonhosted.org/packages/2e/3d/492cf1a6823c48369328572c6bc63b7a957ba25c0009ee6bdb507cd9a6a4 +PYTHON_SELENIUM_SETUP_TYPE = setuptools +PYTHON_SELENIUM_LICENSE = Apache-2.0 + +$(eval $(python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:58:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:26 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx8mmevk: update codeaurora URLs to github Message-ID: <20230220205221.69B2A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca0d4287185c5f7f7c4fea7b405effdc0d19c93c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mmevk_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8mmevk_defconfig b/configs/freescale_imx8mmevk_defconfig index ae82f29158..dcb4b42540 100644 --- a/configs/freescale_imx8mmevk_defconfig +++ b/configs/freescale_imx8mmevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk freescale/imx8mm-evk-revb-qca-wifi" @@ -19,16 +18,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:27 -0000 Subject: [Buildroot] [git commit branch/next] package/flatbuffers: build position independent code Message-ID: <20230220205243.E98C686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=730e50f520d15c6522153381e8fba57421e78d79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The upcoming tensorflow-lite package requires flatbuffers to be built with position independent code. Fixes: /home/buildroot/buildroot/output/per-package/tensorflow-lite/host/bin/../lib/gcc/aarch64-buildroot-linux-gnu/11.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: /home/buildroot/buildroot/output/per-package/tensorflow-lite/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libflatbuffers.a(util.cpp.o): relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `_ZN11flatbuffers11CharToUpperEc' which may bind externally can not be used when making a shared object; recompile with -fPIC Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/flatbuffers/flatbuffers.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/flatbuffers/flatbuffers.mk b/package/flatbuffers/flatbuffers.mk index 9d286bf9e1..487d85ee1f 100644 --- a/package/flatbuffers/flatbuffers.mk +++ b/package/flatbuffers/flatbuffers.mk @@ -14,6 +14,7 @@ FLATBUFFERS_DEPENDENCIES = host-flatbuffers FLATBUFFERS_CONF_OPTS += \ -DCMAKE_CXX_FLAGS="-std=c++11" \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DFLATBUFFERS_BUILD_TESTS=OFF \ -DFLATBUFFERS_FLATC_EXECUTABLE=$(HOST_DIR)/bin/flatc From yann.morin.1998 at free.fr Mon Feb 20 20:58:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:27 -0000 Subject: [Buildroot] [git commit branch/next] package/z3: introduce _ARCH_SUPPORTS Message-ID: <20230220205221.D73B28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=415c7af0796e1f2212170bcad5a13e9cd16d5d7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next z3 package was initially added with a depends on !BR2_nios2. This was detected by testing with "./utils/test-pkg -a -p z3". It turned out that few other architectures are also not supported. The actual z3 requirement is to have a libc that provides AND also provides all the four macros: FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD. Quoting glibc manual, or "man fenv": https://www.gnu.org/software/libc/manual/html_node/Rounding.html "fenv.h defines constants which you can use to refer to the various rounding modes. Each one will be defined if and only if the FPU supports the corresponding rounding mode." This patch introduces _ARCH_SUPPORTS to limit only to the architectures with a FPU that has those rounding modes. Fixes: - http://autobuild.buildroot.net/results/2809dd1ae2f3ada8ee7b3f3e388341c7cfb633fb Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/z3/Config.in | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/package/z3/Config.in b/package/z3/Config.in index 55b0e8bb3b..8cd3128687 100644 --- a/package/z3/Config.in +++ b/package/z3/Config.in @@ -1,11 +1,33 @@ +# z3 supports arch for which libc fenv.h provides all four macros: +# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD +# See for example in glibc https://sourceware.org/git/glibc.git +# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ +config BR2_PACKAGE_Z3_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arceb || BR2_arcle + default y if BR2_arm || BR2_armeb + default y if BR2_i386 + default y if BR2_m68k + # BR2_microblaze has only FE_TONEAREST + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + # BR2_nios2 has only FE_TONEAREST + default y if BR2_or1k + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_s390x + # BR2_sh has only FE_{TONEAREST,TOWARDZERO} + default y if BR2_sparc || BR2_sparc64 + default y if BR2_x86_64 + # BR2_xtensa supports only uclibc which does not have fenv.h + config BR2_PACKAGE_Z3 bool "z3" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # c++17 # z3 needs fenv.h which is not provided by uclibc depends on !BR2_TOOLCHAIN_USES_UCLIBC - # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 - depends on !BR2_nios2 + depends on BR2_PACKAGE_Z3_ARCH_SUPPORTS help Z3, also known as the Z3 Theorem Prover, is a cross-platform satisfiability modulo theories (SMT) solver. From yann.morin.1998 at free.fr Mon Feb 20 20:58:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:28 -0000 Subject: [Buildroot] [git commit branch/next] package/mono: bump to version 6.12.0.182 Message-ID: <20230220205243.DE7428648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9fb89785b9bbf4a3f7dba9e511332ba9b068146 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Angelo Compagnucci Signed-off-by: Yann E. MORIN --- 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 8b72ae68ed..1010f6d0ab 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23 mono-6.12.0.122.tar.xz +sha256 57366a6ab4f3b5ecf111d48548031615b3a100db87c679fc006e8c8a4efd9424 mono-6.12.0.182.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 219effc5d3..b88f2b379e 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 6.12.0.122 +MONO_VERSION = 6.12.0.182 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 yann.morin.1998 at free.fr Mon Feb 20 20:58:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:28 -0000 Subject: [Buildroot] [git commit branch/next] configs/ls1028ardb: update codeaurora URLs to github Message-ID: <20230220205221.B839D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76e610ef59f2c25577265a103dc37dce79b3e856 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Reviewed-by: Francois Perrad Signed-off-by: Yann E. MORIN --- configs/ls1028ardb_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/ls1028ardb_defconfig b/configs/ls1028ardb_defconfig index 1bc84f7b80..a46b94511a 100644 --- a/configs/ls1028ardb_defconfig +++ b/configs/ls1028ardb_defconfig @@ -17,9 +17,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1028ardb/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/linux" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="LSDK-21.08" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,LSDK-21.08)/linux-LSDK-21.08.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -37,9 +36,8 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="LSDK-21.08" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,LSDK-21.08)/atf-LSDK-21.08.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1028ardb" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW=y @@ -48,9 +46,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BOOT_MODE=sd" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="LSDK-21.08" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,LSDK-21.08)/u-boot-LSDK-21.08.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1028ardb_tfa" BR2_TARGET_UBOOT_NEEDS_DTC=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:29 -0000 Subject: [Buildroot] [git commit branch/next] board/beaglebone/readme.txt: update list of DTB files produced Message-ID: <20230220205244.6750086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=faa299ff8c94bea11345071a3d1d05c2681c2cdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Thomas Petazzoni --- board/beaglebone/readme.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/beaglebone/readme.txt b/board/beaglebone/readme.txt index 231e977a89..a11377eaee 100644 --- a/board/beaglebone/readme.txt +++ b/board/beaglebone/readme.txt @@ -28,6 +28,10 @@ Result of the build =================== output/images/ +-- am335x-boneblack.dtb ++-- am335x-boneblack-wireless.dtb ++-- am335x-boneblue.dtb ++-- am335x-bonegreen.dtb ++-- am335x-bonegreen-wireless.dtb +-- am335x-bone.dtb +-- am335x-evm.dtb +-- am335x-evmsk.dtb From peter at korsgaard.com Mon Feb 20 20:58:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:30 -0000 Subject: [Buildroot] [git commit branch/next] configs/spike_riscv64_defconfig: bump Linux kernel to 5.15.86 Message-ID: <20230220205222.31FB1828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05ebdba1fc3c8393f893dcca325276c21ff79ab9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- configs/spike_riscv64_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index cc145bcd8e..cd8fd8ee04 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -2,7 +2,7 @@ BR2_riscv=y BR2_RISCV_64=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_ROOTFS_CPIO=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:30 -0000 Subject: [Buildroot] [git commit branch/next] package/neon-2-sse: fix build without C++ toolchain Message-ID: <20230220205244.28B2B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36741b9461a629002296e5debae848fc7f6e152f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The cmake project for neon-2-sse doesn't correctly set the project language to C which causes cmake to try and detect a C++ compiler. Add a patch which fixes the project language setting. Fixes: - http://autobuild.buildroot.net/results/0eb/0ebb8c886e0a432b6fb43ab21010f625f6797b9e - http://autobuild.buildroot.net/results/a5d/a5db2f286dbd69e84d518d086df857ef434b936a Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/neon-2-sse/0001-Fix-cmake-languages.patch | 40 +++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/package/neon-2-sse/0001-Fix-cmake-languages.patch b/package/neon-2-sse/0001-Fix-cmake-languages.patch new file mode 100644 index 0000000000..e0becb1ffa --- /dev/null +++ b/package/neon-2-sse/0001-Fix-cmake-languages.patch @@ -0,0 +1,40 @@ +From 186ec82e033d8c718d760d14945535a9d7e160fd Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sun, 29 Jan 2023 21:00:27 -0700 +Subject: [PATCH] Fix cmake languages + +When no language is set cmake defaults to C and CXX, since we support +C by itself we should set the project language to C so that we don't +get a compiler error when building without a CXX toolchain. + +Fixes: +CMake Error at CMakeLists.txt:5 (project): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/intel/ARM_NEON_2_x86_SSE/pull/62] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e4b8980..8f58e79 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,7 +2,7 @@ + # Modification: Copyright (C) 2017 David Hirvonen + + cmake_minimum_required(VERSION 3.0) +-project(NEON_2_SSE VERSION 1.0.0) ++project(NEON_2_SSE VERSION 1.0.0 LANGUAGES C) + + add_library(${PROJECT_NAME} INTERFACE) + +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:58:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:31 -0000 Subject: [Buildroot] [git commit branch/next] security hardening: add support for glibc _FORTIFY_SOURCE=3 Message-ID: <20230220205221.E7E73828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f54c2a841861ba587c9bbdd66d5164b6774d9e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A new _FORTIFY_SOURCE=3 level was introduced in glibc, in commit: https://sourceware.org/git/?p=glibc.git;a=commit;h=c43c5796121bc5bcc0867f02e5536874aa8196c1 This commit was first included glibc 2.33. At that time, it was only supported by llvm/clang 9, and not by any released gcc version. To support _FORTIFY_SOURCE=3, the needed gcc features were introduced in version 12. The gcc 12 support was added in glibc commit: https://sourceware.org/git/?p=glibc.git;a=commit;h=86bf0feb0e3ec8e37872f72499d6ae33406561d7 This commit was first included in glibc 2.35. Buildroot updated to glibc 2.35 in commit: https://git.buildroot.org/buildroot/commit/?id=68d0aede597d32816c5b2ff32de0ce33cc14eb93 Buildroot introduced gcc 12 support in commit: https://git.buildroot.org/buildroot/commit/?id=0f1ad4fc93286adaba852c99d6e1c2565b5c4258 Support for _FORTIFY_SOURCE=3 can now be added. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- Config.in | 9 +++++++++ package/Makefile.in | 2 ++ 2 files changed, 11 insertions(+) diff --git a/Config.in b/Config.in index 64604a0aed..86699f58c6 100644 --- a/Config.in +++ b/Config.in @@ -930,6 +930,15 @@ config BR2_FORTIFY_SOURCE_2 Also adds checks at run-time (detected buffer overflow terminates the program) +config BR2_FORTIFY_SOURCE_3 + bool "Extended" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_12 + help + This option sets _FORTIFY_SOURCES to 3 and even more + checking is added compared to level 2. Extends checks at + run-time that can introduce an additional performance + overhead. + endchoice comment "Fortify Source needs a glibc toolchain and optimization" diff --git a/package/Makefile.in b/package/Makefile.in index 43d214bcbe..7f1b00ba24 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -160,6 +160,8 @@ ifeq ($(BR2_FORTIFY_SOURCE_1),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=1 else ifeq ($(BR2_FORTIFY_SOURCE_2),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=2 +else ifeq ($(BR2_FORTIFY_SOURCE_3),y) +TARGET_HARDENED += -D_FORTIFY_SOURCE=3 endif TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 From yann.morin.1998 at free.fr Mon Feb 20 20:58:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:31 -0000 Subject: [Buildroot] [git commit branch/next] package/fxdiv: new package Message-ID: <20230220205244.1DFAF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed6062efbcda90eee7f523b3d63deb1fc36e4a17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This package is required by tensorflow-lite. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/fxdiv/Config.in | 7 +++++++ package/fxdiv/fxdiv.hash | 4 ++++ package/fxdiv/fxdiv.mk | 19 +++++++++++++++++++ 5 files changed, 32 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8a652c7c12..706ee80ece 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1339,6 +1339,7 @@ N: James Hilliard F: package/apcupsd/ F: package/bpftool/ F: package/exfatprogs/ +F: package/fxdiv/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ diff --git a/package/Config.in b/package/Config.in index 96a44a3623..83fddf316f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2014,6 +2014,7 @@ menu "Other" source "package/flann/Config.in" source "package/flatbuffers/Config.in" source "package/flatcc/Config.in" + source "package/fxdiv/Config.in" source "package/gconf/Config.in" source "package/gdal/Config.in" source "package/gflags/Config.in" diff --git a/package/fxdiv/Config.in b/package/fxdiv/Config.in new file mode 100644 index 0000000000..5aa714e44a --- /dev/null +++ b/package/fxdiv/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FXDIV + bool "fxdiv" + help + Header-only library for division via fixed-point + multiplication by inverse. + + https://github.com/Maratyszcza/FXdiv diff --git a/package/fxdiv/fxdiv.hash b/package/fxdiv/fxdiv.hash new file mode 100644 index 0000000000..2142d84e09 --- /dev/null +++ b/package/fxdiv/fxdiv.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 ec74d882a0a47cfd9c0f95bc4fae9901a4ade802a96a3b76e02671bb7340a4c5 fxdiv-63058eff77e11aa15bf531df5dd34395ec3017c8.tar.gz +# License files, locally calculated +sha256 7cac00006125b1486a27e4801ed66357236e984c540bd323945ab7b66b078ec3 LICENSE diff --git a/package/fxdiv/fxdiv.mk b/package/fxdiv/fxdiv.mk new file mode 100644 index 0000000000..06dbf0648d --- /dev/null +++ b/package/fxdiv/fxdiv.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# fxdiv +# +################################################################################ + +FXDIV_VERSION = 63058eff77e11aa15bf531df5dd34395ec3017c8 +FXDIV_SITE = $(call github,Maratyszcza,FXdiv,$(FXDIV_VERSION)) +FXDIV_LICENSE = MIT +FXDIV_LICENSE_FILES = LICENSE +FXDIV_INSTALL_STAGING = YES +# Only installs a header +FXDIV_INSTALL_TARGET = NO + +FXDIV_CONF_OPTS = \ + -DFXDIV_BUILD_TESTS=OFF \ + -DFXDIV_BUILD_BENCHMARKS=OFF + +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:58:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:32 -0000 Subject: [Buildroot] [git commit branch/next] package/fxdiv: fix build without C++ toolchain Message-ID: <20230220205244.32F2F86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33c89f98377cb968b03eb1428af8a74eba9d13ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The cmake project for fxdiv sets the project language to C and CXX even when only C is required. Add a patch which disables CXX unless required. Fixes: - http://autobuild.buildroot.net/results/b0f/b0f3b6352429a5156a8c3a2b932331753887b65b - http://autobuild.buildroot.net/results/52f/52f634c06bdfe983280a2c01bb9fec4b0e1a4b34 - http://autobuild.buildroot.net/results/181/181b85d9dd505693ed23fab823085b001aa785f4 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- ...-enable-CXX-unless-building-tests-benchma.patch | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch b/package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch new file mode 100644 index 0000000000..0336f5e1cc --- /dev/null +++ b/package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch @@ -0,0 +1,49 @@ +From 8c2d8fc60306a8edd21182a1f5f267a7aca55763 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sun, 29 Jan 2023 21:18:28 -0700 +Subject: [PATCH] CMake: don't enable CXX unless building tests/benchmarks + +We only need CXX support when building tests/benchmarks. + +Fixes: +CMake Error at CMakeLists.txt:4 (PROJECT): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/Maratyszcza/FXdiv/pull/3] +--- + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bcae6b5..c75f558 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR) + + # ---[ Project +-PROJECT(FXdiv C CXX) ++PROJECT(FXdiv C) + + # ---[ Options. + OPTION(FXDIV_USE_INLINE_ASSEMBLY "Allow use of inline assembly in FXdiv" OFF) +@@ -16,6 +16,10 @@ ENDIF() + # ---[ CMake options + INCLUDE(GNUInstallDirs) + ++IF(FXDIV_BUILD_TESTS OR FXDIV_BUILD_BENCHMARKS) ++ ENABLE_LANGUAGE(CXX) ++ENDIF() ++ + IF(FXDIV_BUILD_TESTS) + ENABLE_TESTING() + ENDIF() +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:58:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:32 -0000 Subject: [Buildroot] [git commit branch/next] linux: fix builds for kernels < 5.6 and host-gcc >= 10 Message-ID: <20230220205222.008D286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e75f3962084045cf50f38f0adf8bfaa8da71dfd5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next During a linux-backports update, it was found that kernel v3.10.108 was failing to compile. See: https://lists.buildroot.org/pipermail/buildroot/2022-August/649507.html This issue was introduced by commit 9b41b54be07711c10ad13ce157be272ed1cf402e "linux: fix build with host-gcc 10+", which removes all declarations of "yylloc" symbols in the dtc parser. This symbol is generated by bison, if the "%locations" directive is provided in the parser. See: https://git.savannah.gnu.org/cgit/bison.git/tree/doc/bison.texi?h=v3.8.2#n5984 Kernel versions < 5.6 did not include this directive, so removing all yylloc declararions in the parser also was failing for those version. In the kernel, dtc was updated to v1.5.1-22-gc40aeb60b47a in: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0cec114e36606412908a35695a5db944cec2e3db This commit is included in kernel v5.6. This dtc update include the dtc commit: https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=7150286225476345bd6e7312331e3baf4d621c32 which adds the '%locations' directive. This commit fixes the issue by programmatically adding the '%locations' Bison directive, if it's not found in the parser file. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14971 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- linux/linux.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 6b547a68ed..7645b5f507 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -155,6 +155,7 @@ LINUX_MAKE_FLAGS = \ INSTALL_MOD_PATH=$(TARGET_DIR) \ CROSS_COMPILE="$(TARGET_CROSS)" \ WERROR=0 \ + REGENERATE_PARSERS=1 \ DEPMOD=$(HOST_DIR)/sbin/depmod ifeq ($(BR2_REPRODUCIBLE),y) @@ -286,6 +287,19 @@ define LINUX_DROP_YYLLOC endef LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC +# Kernel version < 5.6 breaks if host-gcc version is >= 10 and +# 'yylloc' symbol is removed in previous hook, due to missing +# '%locations' bison directive in dtc-parser.y. See: +# https://bugs.busybox.net/show_bug.cgi?id=14971 +define LINUX_ADD_DTC_LOCATIONS + $(Q)DTC_PARSER=$(@D)/scripts/dtc/dtc-parser.y; \ + if test -e "$${DTC_PARSER}" \ + && ! grep -Eq '^%locations$$' "$${DTC_PARSER}" ; then \ + $(SED) '/^%{$$/i %locations' "$${DTC_PARSER}"; \ + fi +endef +LINUX_POST_PATCH_HOOKS += LINUX_ADD_DTC_LOCATIONS + # Older linux kernels use deprecated perl constructs in timeconst.pl # that were removed for perl 5.22+ so it breaks on newer distributions # Try a dry-run patch to see if this applies, if it does go ahead From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:33 -0000 Subject: [Buildroot] [git commit branch/next] configs/beaglebone: add support for BeagleBone Green Wireless Message-ID: <20230220205244.5E00D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd1d0a9cbf6de2c30fcfcc181b466a5f2b44dc54 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This commit adds support for the BeagleBone Green Wireless to the existing beaglebone_defconfig, by making sure the relevant Device Tree is built and installed. Signed-off-by: Ramon Crichlow Signed-off-by: Thomas Petazzoni --- board/beaglebone/genimage.cfg | 1 + configs/beaglebone_defconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index 42ca2cf107..987d205075 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -11,6 +11,7 @@ image boot.vfat { "am335x-boneblack.dtb", "am335x-bonegreen.dtb", "am335x-boneblack-wireless.dtb", + "am335x-bonegreen-wireless.dtb", } } diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 06154d98b7..639b491e97 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -23,7 +23,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem From peter at korsgaard.com Mon Feb 20 20:58:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:33 -0000 Subject: [Buildroot] [git commit branch/next] package/libopenh264: bump version to 2.3.1 Message-ID: <20230220205222.5C26D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e59365629f882eb3e4ea012ab2cd396bc3d8a4fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/cisco/openh264/releases/tag/v2.3.1 https://github.com/cisco/openh264/releases/tag/v2.3.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libopenh264/libopenh264.hash | 2 +- package/libopenh264/libopenh264.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash index 712425a024..eecb0b9625 100644 --- a/package/libopenh264/libopenh264.hash +++ b/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e4e5c8ba48e64ba6ce61e8b6e2b76b2d870c74c270147649082feabb40f25905 libopenh264-2.2.0.tar.gz +sha256 453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 libopenh264-2.3.1.tar.gz sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk index ea41f72661..750ec41e4d 100644 --- a/package/libopenh264/libopenh264.mk +++ b/package/libopenh264/libopenh264.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENH264_VERSION = 2.2.0 +LIBOPENH264_VERSION = 2.3.1 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:58:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:34 -0000 Subject: [Buildroot] [git commit branch/next] package/tiff: explicitly disable webp Message-ID: <20230220205222.A19BD828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9db9f9b4dc7d7b728bf2ea9e6456a9fcc6d7098c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tiff/tiff.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f0b56150b1..d3ab50b79e 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -12,9 +12,12 @@ TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES +# webp has a (optional) dependency on tiff, so we can't have webp +# support in tiff, or that would create a circular dependency. TIFF_CONF_OPTS = \ --disable-contrib \ --disable-tests \ + --disable-webp \ --without-x TIFF_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Mon Feb 20 20:58:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:34 -0000 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: only require a C compiler Message-ID: <20230220205244.926038648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dedbc69022ba0beaf259463ac8082c86776f7e88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: - http://autobuild.buildroot.net/results/007/007c7c69e54b8ff663891da4535e2e95d40c42a2/build-end.log - http://autobuild.buildroot.net/results/ede/ede6f9fb67c0c26ff02e71a3d20e3d4344ea59f0/build-end.log Signed-off-by: Thomas Devoogdt [Peter: replace by upstream patch] Signed-off-by: Peter Korsgaard --- ...-CMakeLists.txt-only-require-a-C-compiler.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch b/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch new file mode 100644 index 0000000000..e71bcf0c0d --- /dev/null +++ b/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch @@ -0,0 +1,27 @@ +From 7bcb502ebdcd647d6b83c972805e734ad522eb1a Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 30 Jan 2023 09:10:37 +0100 +Subject: [PATCH] CMakeLists.txt: only require a C compiler + +Fluent-bit is mostly written in C, +so don't require CXX in the top-level project. + +Signed-off-by: Thomas Devoogdt +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a7adb02de..3ff7360d8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.12) +-project(fluent-bit) ++project(fluent-bit C) + + # CMP0069 ensures that LTO is enabled for all compilers + cmake_policy(SET CMP0069 NEW) +-- +2.30.2 + From peter at korsgaard.com Mon Feb 20 20:58:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:35 -0000 Subject: [Buildroot] [git commit branch/next] Revert "package/tiff: add webp optional dependency" Message-ID: <20230220205222.8F7A186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5cb87730fdf2eb5a7a5b1302c21afba71aeeb5e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit 3fd6ada8dbca3370b9bb67feb2971e637cb4b11f to fix the following build failure raised because tiff is already an optional dependency of webp: package/tiff/tiff.mk:122: *** Recursive variable 'TIFF_FINAL_RECURSIVE_DEPENDENCIES' references itself (eventually). Stop. Fixes: - http://autobuild.buildroot.org/results/d8486cd1d5e56fb3719dc88b8aebc76c3e23cdc9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tiff/Config.in | 4 ---- package/tiff/tiff.mk | 7 ------- 2 files changed, 11 deletions(-) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index b9e3656e6f..d1004d6668 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -72,10 +72,6 @@ config BR2_PACKAGE_TIFF_UTILITIES help Install all tiff utilities. -config BR2_PACKAGE_TIFF_WEBP - bool "WEBP compression" - select BR2_PACKAGE_WEBP - config BR2_PACKAGE_TIFF_ZSTD bool "ZSTD compression" select BR2_PACKAGE_ZSTD diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index c2a4108f35..f0b56150b1 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -105,13 +105,6 @@ else TIFF_CONF_OPTS += --disable-tools endif -ifeq ($(BR2_PACKAGE_TIFF_WEBP),y) -TIFF_CONF_OPTS += --enable-webp -TIFF_DEPENDENCIES += webp -else -TIFF_CONF_OPTS += --disable-webp -endif - ifeq ($(BR2_PACKAGE_TIFF_ZSTD),y) TIFF_CONF_OPTS += --enable-zstd TIFF_DEPENDENCIES += zstd From peter at korsgaard.com Mon Feb 20 20:58:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:36 -0000 Subject: [Buildroot] [git commit branch/next] package/libksba: update _SITE to https Message-ID: <20230220205222.C3C0F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83c4edf83953bb86257e6b6e3b07f974fc66a37e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Switch to https download for firewall compatibility and security. The https URL is also the one advertised on the package download page: https://gnupg.org/download/index.html Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/libksba/libksba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index 3a8b3fa502..727a836cf4 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -6,7 +6,7 @@ LIBKSBA_VERSION = 1.6.2 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 -LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba +LIBKSBA_SITE = https://gnupg.org/ftp/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3 LIBKSBA_CPE_ID_VENDOR = libksba_project From peter at korsgaard.com Mon Feb 20 20:58:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:36 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230220205244.DE76886496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=def789059af78cd65294cafa4288cb41691e86c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 4.9.x / 6.0.x is now EOL. 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 e18b515311..a0e9286bd3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.5" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 157f267a9d..927172e8fa 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 bc7f6d9a8a8bbe9a723e82346bba94b58d926f78bfba106b21e041e0290076fc linux-6.1.5.tar.xz +sha256 d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b linux-6.1.9.tar.xz sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e7359bd2935b54fe8bb821cf748591c36a95bed019e752d3e4d5803d9da1ccb4 linux-5.15.87.tar.xz -sha256 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 linux-5.10.162.tar.xz -sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz +sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz +sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz +sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz -sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz +sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz +sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1ad9fffcd3..3a5207e0b6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -397,13 +397,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.302" if BR2_KERNEL_HEADERS_4_14 - default "4.19.269" if BR2_KERNEL_HEADERS_4_19 - default "5.4.228" if BR2_KERNEL_HEADERS_5_4 - default "5.10.162" if BR2_KERNEL_HEADERS_5_10 - default "5.15.87" if BR2_KERNEL_HEADERS_5_15 + default "4.14.304" if BR2_KERNEL_HEADERS_4_14 + default "4.19.271" if BR2_KERNEL_HEADERS_4_19 + default "5.4.230" if BR2_KERNEL_HEADERS_5_4 + default "5.10.166" if BR2_KERNEL_HEADERS_5_10 + default "5.15.91" if BR2_KERNEL_HEADERS_5_15 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 - default "6.1.5" if BR2_KERNEL_HEADERS_6_1 + default "6.1.9" if BR2_KERNEL_HEADERS_6_1 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 yann.morin.1998 at free.fr Mon Feb 20 20:58:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:37 -0000 Subject: [Buildroot] [git commit branch/next] package/ncurses: Switch to git repo with snapshots Message-ID: <20230220205222.7C964828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d7c69a0c9e414b7112347c37e1424ec5f2863ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next ncurses does not release dot-versions, but the fixes are released as a set of cumulative patches against the latest version. So far, we carry the list of the patches against 6.3, and this is a tedious task to maintain that list (especially as we have a hash for each of them). Thomas E. Dickey (the ncurses maintainer, so we can trust him) hosts the ncurses snapshots on Github, with patches already applied. So, we switch to using that. This avoids needing to list all incremental patches, and will make future bumping easier. Signed-off-by: Dennis Van Hoorick [yann.morin.1998 at free.fr: - don't use 'v' in filename - rework the version string for when there's no snapshot ] Signed-off-by: Yann E. MORIN --- package/ncurses/ncurses.hash | 65 ++------------------------------------ package/ncurses/ncurses.mk | 75 ++++++-------------------------------------- 2 files changed, 11 insertions(+), 129 deletions(-) diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index c72a2abf46..c96bf77bce 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -1,65 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059 ncurses-6.3.tar.gz -sha256 51bad0e386d06d3a26d7f28087b2072658282452f209e7e5eb7722556b042570 ncurses-6.3-20211026.patch.gz -sha256 4e1b0694a2633cc681987c80091175cb2b17a6c882750a7c6afb0560f5447249 ncurses-6.3-20211030.patch.gz -sha256 de7e0b2c784342188da48147d3fa661be38d5b5d517bb224423f15893e27334f ncurses-6.3-20211106.patch.gz -sha256 df78f157336fce33d96ae1e3c2f7d7b48e9b728409d9a4ab59e77242255b03ab ncurses-6.3-20211113.patch.gz -sha256 b7bf59d9a8e243263b05b166c6fe321bfca8e67eb32ebc26a1c813df42d64fee ncurses-6.3-20211115.patch.gz -sha256 7cb46c897e2e54d5f085cd9edc8d523c13b8f4a13878dd01ce094ec52bd26aec ncurses-6.3-20211120.patch.gz -sha256 ee8cf6ab6db3a01f2533959d14a5e1cc8e1412fbce4b2ab4668c7d1101f71684 ncurses-6.3-20211127.patch.gz -sha256 9d9055badff9e15fc1fbe4f4b2cce7c76384d446ab857573cbb1d645430d8ac7 ncurses-6.3-20211204.patch.gz -sha256 6059625cac99819a3580955db377c0820b6be7ae5da4d8a82e9638948a7b0679 ncurses-6.3-20211211.patch.gz -sha256 acb77a09fe6ab37b96e9f70d9ebfde0aaf7bdee064761c605b47125bd31be2ae ncurses-6.3-20211219.patch.gz -sha256 f2786f19c85258da9e9255459480e5ac2efb61b6ea5d0866b9b8507fa8f5b036 ncurses-6.3-20211225.patch.gz -sha256 ca5736eda90cd7cb597be0fdb0ed10f04deb7304cc7ffb0b166dfa07c39ab1e7 ncurses-6.3-20220101.patch.gz -sha256 7e43911e6baa4a7cfeaad1880777bda352eb7b22493db5bc9f72a52aec8d6d78 ncurses-6.3-20220115.patch.gz -sha256 ecfdd8bed6ff3b1fae5050da555c77dd41035c35bebed30162862e343324443e ncurses-6.3-20220122.patch.gz -sha256 32ec2da0fe48c353489c4018b38f890a59eafeb37ab24b82e32ba553845438a4 ncurses-6.3-20220129.patch.gz -sha256 f74b0d1f7f96bf8609c6a62e268019289e4affec9e02f9182ab14817637180e7 ncurses-6.3-20220205.patch.gz -sha256 6506f709e745375f692d05f53c45b50f1e60d13a3e4346db46d14f69e19adbb1 ncurses-6.3-20220212.patch.gz -sha256 349433e684e96096cbacaa1014d3ccd285c441d1bd99a721ae0b705b02de4145 ncurses-6.3-20220219.patch.gz -sha256 2181cf581fcdabb5b534606ab81c4c625bf819f9d351c670972a7f3a85f36197 ncurses-6.3-20220226.patch.gz -sha256 1acd0f2d18ea7c783286658e550c4f61cbe750a907c9be5fc00e67f2ea8f7eb5 ncurses-6.3-20220305.patch.gz -sha256 ced13543cc19ee341d82eb7fd501e15a2f3d1bc08fbbeb9de7edbd6422ca4799 ncurses-6.3-20220312.patch.gz -sha256 450fce90a10b1ab0b20ba5efc222741fe96f8445d1e4528e2a7b7711c26a5254 ncurses-6.3-20220319.patch.gz -sha256 c97213841e41d33b50a8492ba252dc79a24b38721f7ac0966442b3176f5666c7 ncurses-6.3-20220326.patch.gz -sha256 4c6253ea2c3cf83fbac2fdb5af56914e6bdc5a7c6e6e7532a4f218b7af6d05eb ncurses-6.3-20220402.patch.gz -sha256 5b46bc2bec8f9192c2ed7d25f2080c57b7d7ecbe294d85ab8d3c7d4eb4a678fa ncurses-6.3-20220409.patch.gz -sha256 fddd3b7dea2db1dc70adfa46ccb52301c820854821ce35366056e8e8daba8360 ncurses-6.3-20220416.patch.gz -sha256 1dba62d927affe93face3d55710d8abce7b70a904a0dd0114894efff7ba8ac72 ncurses-6.3-20220423.patch.gz -sha256 f6289906a3be560da9240e0d4a7a1bbd213dd9316f0b395e6852524491ff6322 ncurses-6.3-20220430.patch.gz -sha256 a6f631b9b934d0012617c429834b370732084d6f3c1784d11d8f18f26ea9e0d4 ncurses-6.3-20220501.patch.gz -sha256 79e75286b2a3292058bbe0aa67d8ea49682f7942b108c3ffc725a34765d4fce7 ncurses-6.3-20220507.patch.gz -sha256 1dda27245cbd6634f89766624dc72c156312bf00635214ea7ac299c9330b18f2 ncurses-6.3-20220514.patch.gz -sha256 0a251674845e0669e92c8bee6b6e5bb317439f8707f3316424eae590322f87c6 ncurses-6.3-20220521.patch.gz -sha256 411c4fdfc2ea4f56fdb57ff758a13dffa4b2fff68e71b65cf3248c925f6c30ee ncurses-6.3-20220529.patch.gz -sha256 acc315edb22a04f6476d9cd2a43866d478e0f4b2a555f480c92a18983bec5ee7 ncurses-6.3-20220604.patch.gz -sha256 2dae4db33c73766cd63b2b700e09588750bae44622749ce007404e3e30420ada ncurses-6.3-20220612.patch.gz -sha256 1e4b5c3deaab601a9749da591952b66a53d96017967eeec033f3b4d30e12d2de ncurses-6.3-20220618.patch.gz -sha256 65379719532023cd77c80a495cf31ff773345173e919ec8eef8b3f9517969626 ncurses-6.3-20220625.patch.gz -sha256 028864b31ada91862f0d8f4aa016b62bc3fe7e3981d62e81110d5143e26d0e0d ncurses-6.3-20220703.patch.gz -sha256 06c2f6d967480d0bcf20f301db26c8e5c90caf6d3adf616bc277e21407e9c955 ncurses-6.3-20220709.patch.gz -sha256 66aa8564d09fcc7bbd85bbe79685772330633c14d70af2fef00d10491e6b22fb ncurses-6.3-20220716.patch.gz -sha256 fffcc8ec0eab3dcbb7b8d8a208d880a15fe128f6f2dbc63a87d5640d8ade95cf ncurses-6.3-20220724.patch.gz -sha256 1787619c0b5052121dc5816bdb4cbd9699e1b61ba6c98072a3733b17cc7009f9 ncurses-6.3-20220729.patch.gz -sha256 d7fb1f2e2246079527351c8b7c8847c28751c6a5bb46740681d4b6ba790b22cc ncurses-6.3-20220806.patch.gz -sha256 10a04d3189a34187e691e73435c210af3939025f07ff6c34c1bfc48fda6f5a5d ncurses-6.3-20220813.patch.gz -sha256 b9238267413c2fce5bfe4c029f28dbbbef7230cdf47792ecd4070b857fe1a869 ncurses-6.3-20220820.patch.gz -sha256 7d30766caaac9136ab0ff7164d33761b186b698ec237560cb8fce0eb937f90b8 ncurses-6.3-20220827.patch.gz -sha256 5f04fd2d954b3461671290c766f784a4151091eb4e9197a7745dcdbb9c030483 ncurses-6.3-20220903.patch.gz -sha256 b948a0efe45341ccc913cc67231ee1e6bc737f178bcd758ce9f2e856e575071f ncurses-6.3-20220910.patch.gz -sha256 f9ad5781a72d669bdd06fe075136cc79e6a570960f6f641a9c486fc102a45c3b ncurses-6.3-20220917.patch.gz -sha256 bbb9d5afaec836e66b9f919c97c81c0505fd111b479b59ab6e376822ff6df1d3 ncurses-6.3-20220924.patch.gz -sha256 7ffeae28a0f8416c6ab088a99807d0d1ee5be821828c288f0a572ea769a8e2e5 ncurses-6.3-20221001.patch.gz -sha256 204baff40926d29ec30b1def4d4cc5d7ce074918327d8e271a49c960032b5a49 ncurses-6.3-20221008.patch.gz -sha256 f578dbb3beb1976636c74b33ffe5d300fee5a7653bc4f64bb7870d1b9cf85e7b ncurses-6.3-20221015.patch.gz -sha256 b01fc81093a331d5d645dbcbacebf6e5d459430b38cbdae0db053c6e5dff7d7e ncurses-6.3-20221023.patch.gz -sha256 e6e819c78c78c3a0355e7da4360d084f5d69871fa556b51322980f22da4edcea ncurses-6.3-20221029.patch.gz -sha256 4da9b5bf14a1b7d6d8a4181e79a98b9e5782153bc7db93773ac43e0b758c4da2 ncurses-6.3-20221105.patch.gz -sha256 b3381da6071bbed04e6ddaabbd5375d280e50af429f94522e32e9d0f22766155 ncurses-6.3-20221112.patch.gz -sha256 bf30c435283a4483280e0433f6370d9eea1fb704323bd887e540592eb8203e2f ncurses-6.3-20221119.patch.gz -sha256 32dc21b671ead8b199d66111ebd3404e8cd5f8c4ca5587cfeb5c6a4913b2d103 ncurses-6.3-20221126.patch.gz -sha256 8fe3bcacaea784ac7971e102a8eb8ca58c4c2c4c13c1ec33f32334600b9e4f56 ncurses-6.3-20221203.patch.gz - +# Locally calculated +sha256 4057d800ee96623ae70d06b05b2dadb481a80c030e4968aa5d9bcea4439441da ncurses-6.3-20221224.tar.gz # Locally computed sha256 63de87399e9fc8860236082b6b0520e068e9eb1fad0ebd30202aa30bb6f690ac COPYING diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 4d93a992e4..73e3c3feb8 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -4,79 +4,22 @@ # ################################################################################ -NCURSES_VERSION = 6.3 -NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses +# When there is no snapshost yet for a new version, set it to the empty string +NCURSES_VERSION_MAJOR = 6.3 +NCURSES_SNAPSHOT_DATE = 20221224 +NCURSES_VERSION = $(NCURSES_VERSION_MAJOR)$(if $(NCURSES_SNAPSHOT_DATE),-$(NCURSES_SNAPSHOT_DATE)) +NCURSES_VERSION_GIT = $(subst .,_,$(subst -,_,$(NCURSES_VERSION))) +NCURSES_SITE = $(call github,ThomasDickey,ncurses-snapshots,v$(NCURSES_VERSION_GIT)) NCURSES_INSTALL_STAGING = YES NCURSES_DEPENDENCIES = host-ncurses NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING NCURSES_CPE_ID_VENDOR = gnu +NCURSES_CPE_ID_VERSION = $(NCURSES_VERSION_MAJOR) NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config -# patch 20220416 + +# Fixed since snapshot 20220416 NCURSES_IGNORE_CVES += CVE-2022-29458 -NCURSES_PATCH = \ - $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ - ncurses-6.3-20211026.patch.gz \ - ncurses-6.3-20211030.patch.gz \ - ncurses-6.3-20211106.patch.gz \ - ncurses-6.3-20211113.patch.gz \ - ncurses-6.3-20211115.patch.gz \ - ncurses-6.3-20211120.patch.gz \ - ncurses-6.3-20211127.patch.gz \ - ncurses-6.3-20211204.patch.gz \ - ncurses-6.3-20211211.patch.gz \ - ncurses-6.3-20211219.patch.gz \ - ncurses-6.3-20211225.patch.gz \ - ncurses-6.3-20220101.patch.gz \ - ncurses-6.3-20220115.patch.gz \ - ncurses-6.3-20220122.patch.gz \ - ncurses-6.3-20220129.patch.gz \ - ncurses-6.3-20220205.patch.gz \ - ncurses-6.3-20220212.patch.gz \ - ncurses-6.3-20220219.patch.gz \ - ncurses-6.3-20220226.patch.gz \ - ncurses-6.3-20220305.patch.gz \ - ncurses-6.3-20220312.patch.gz \ - ncurses-6.3-20220319.patch.gz \ - ncurses-6.3-20220326.patch.gz \ - ncurses-6.3-20220402.patch.gz \ - ncurses-6.3-20220409.patch.gz \ - ncurses-6.3-20220416.patch.gz \ - ncurses-6.3-20220423.patch.gz \ - ncurses-6.3-20220430.patch.gz \ - ncurses-6.3-20220501.patch.gz \ - ncurses-6.3-20220507.patch.gz \ - ncurses-6.3-20220514.patch.gz \ - ncurses-6.3-20220521.patch.gz \ - ncurses-6.3-20220529.patch.gz \ - ncurses-6.3-20220604.patch.gz \ - ncurses-6.3-20220612.patch.gz \ - ncurses-6.3-20220618.patch.gz \ - ncurses-6.3-20220625.patch.gz \ - ncurses-6.3-20220703.patch.gz \ - ncurses-6.3-20220709.patch.gz \ - ncurses-6.3-20220716.patch.gz \ - ncurses-6.3-20220724.patch.gz \ - ncurses-6.3-20220729.patch.gz \ - ncurses-6.3-20220806.patch.gz \ - ncurses-6.3-20220813.patch.gz \ - ncurses-6.3-20220820.patch.gz \ - ncurses-6.3-20220827.patch.gz \ - ncurses-6.3-20220903.patch.gz \ - ncurses-6.3-20220910.patch.gz \ - ncurses-6.3-20220917.patch.gz \ - ncurses-6.3-20220924.patch.gz \ - ncurses-6.3-20221001.patch.gz \ - ncurses-6.3-20221008.patch.gz \ - ncurses-6.3-20221015.patch.gz \ - ncurses-6.3-20221023.patch.gz \ - ncurses-6.3-20221029.patch.gz \ - ncurses-6.3-20221105.patch.gz \ - ncurses-6.3-20221112.patch.gz \ - ncurses-6.3-20221119.patch.gz \ - ncurses-6.3-20221126.patch.gz \ - ncurses-6.3-20221203.patch.gz \ - ) NCURSES_CONF_OPTS = \ --without-cxx \ From peter at korsgaard.com Mon Feb 20 20:58:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:37 -0000 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: fix -latomic on various platforms Message-ID: <20230220205244.9C44386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f692c548904c5ae130f6e17e303ff4ad0b482b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next /home/thomas/br-test-pkg/bootlin-nios2-glibc/host/opt/ext-toolchain/bin/../lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: /tmp/fluent-bit.6F9rEA.ltrans28.ltrans.o: undefined reference to symbol '__atomic_compare_exchange_8@@LIBATOMIC_1.0' /home/thomas/br-test-pkg/bootlin-nios2-glibc/host/opt/ext-toolchain/bin/../lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: /home/thomas/br-test-pkg/bootlin-nios2-glibc/host/nios2-buildroot-linux-gnu/sysroot/lib/libatomic.so.1: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index f7727834dd..c84042a0fa 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -41,6 +41,12 @@ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +# Uses __atomic_compare_exchange_8 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ $(TARGET_DIR)/etc/init.d/S99fluent-bit From peter at korsgaard.com Mon Feb 20 20:58:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:38 -0000 Subject: [Buildroot] [git commit branch/next] package/nerdctl: bump version to 1.2.0 Message-ID: <20230220205244.D1BCB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02658dcc01f62aef26045affe37d21e6d3250256 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/containerd/nerdctl/releases/tag/v1.2.0 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/nerdctl/nerdctl.hash | 2 +- package/nerdctl/nerdctl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash index e253fb74b2..8f2c678198 100644 --- a/package/nerdctl/nerdctl.hash +++ b/package/nerdctl/nerdctl.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 ae468c65480e9c6679e0dd23d466b723e7f19bff779d4e2e0fa4629be343af2a nerdctl-1.0.0.tar.gz +sha256 08a84b9481b37dbd8cc6f955dbec0c18a1934bcffeb135fd5d2dc23987152b7c nerdctl-1.2.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk index fdf60cb189..7556bcc391 100644 --- a/package/nerdctl/nerdctl.mk +++ b/package/nerdctl/nerdctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NERDCTL_VERSION = 1.0.0 +NERDCTL_VERSION = 1.2.0 NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) NERDCTL_LICENSE = Apache-2.0 From peter at korsgaard.com Mon Feb 20 20:58:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:46 -0000 Subject: [Buildroot] [git commit branch/next] package/sexpect: requires MMU Message-ID: <20230220205245.559A7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9717b303683ba7ec035de004c6f2ddd195d07808 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable when MMU is not available for target. Fixes: http://autobuild.buildroot.net/results/a2b69fdf67d520aa4d2718bd688d88d102842cdf Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/sexpect/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sexpect/Config.in b/package/sexpect/Config.in index bdf5c3bbf5..e558af26f0 100644 --- a/package/sexpect/Config.in +++ b/package/sexpect/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SEXPECT bool "sexpect" + depends on BR2_USE_MMU # fork() help sexpect is another implementation of Expect which is specifically designed for Shell scripts From peter at korsgaard.com Mon Feb 20 20:58:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:47 -0000 Subject: [Buildroot] [git commit branch/next] package/gst1-rtsp-server: bump version to 1.22.0 Message-ID: <20230220205245.E8B3786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbca109741661d39d7eeaf7ea0e2f25ecbd3bfb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard 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 b6a31f8796..f37e7bb292 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.4.tar.xz.sha256sum -sha256 88d9ef634e59aeb8cc183ad5ae444557c5a88dd49d833b9072bc6e1fae6a3d7d gst-rtsp-server-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.0.tar.xz.sha256sum +sha256 aea24eeb59ee5fadfac355de2f7cecb51966c3e147e5ad7cfb4c314f1a4086ed gst-rtsp-server-1.22.0.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 0b18c1fcf8..6b4bd49fde 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.4 +GST1_RTSP_SERVER_VERSION = 1.22.0 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 Feb 20 20:58:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:47 -0000 Subject: [Buildroot] [git commit branch/next] package/wpewebkit: bump to version 2.38.0 Message-ID: <20230220205223.328A6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=917f05975f9c60eca92988ea9974de55a9e91e44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update to a new major release which brings in improvements and a few new features. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.0.html This release also includes security fixes for CVE-2022-32886, CVE-2022-32891, and CVE-2022-32912. Accompanying security advisory: https://wpewebkit.org/security/WSA-2022-0009.html Both building documentation and support for gobject-introspection have been added in this release. Version 2.38.0 also introduces a new WebRTC implementation based on GstWebRTC. Options for them are explicitly left disabled to keep the configuration as it was, and may be enabled in follow-up patches. Lastly, the SILENCE_CROSS_COMPILATION_NOTICES option removed because it no longer exists. The patch that fixes the build on 32-bit ARM targets is also updated for the 2.38 release series. Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- ...NEON.cpp-fails-to-build-NEON-fast-path-se.patch | 30 ++++++++++++++++------ package/wpewebkit/wpewebkit.hash | 8 +++--- package/wpewebkit/wpewebkit.mk | 8 +++--- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch index b61909b2ac..ea1676abb6 100644 --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch @@ -1,4 +1,4 @@ -From 59c9e3a4aeb4753be97b3817d106816d9a4ebe73 Mon Sep 17 00:00:00 2001 +From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 11:19:06 +0300 Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems @@ -35,15 +35,28 @@ left for a follow-up fix. Signed-off-by: Adrian Perez de Castro [Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182] --- + Source/WebCore/Sources.txt | 1 + .../cpu/arm/filters/FELightingNEON.cpp | 4 +- - .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- + .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- .../graphics/filters/DistantLightSource.h | 4 ++ .../platform/graphics/filters/FELighting.h | 7 --- .../graphics/filters/PointLightSource.h | 4 ++ .../graphics/filters/SpotLightSource.h | 4 ++ .../software/FELightingSoftwareApplier.h | 16 ++++++ - 7 files changed, 56 insertions(+), 35 deletions(-) + 8 files changed, 58 insertions(+), 36 deletions(-) +diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt +index 8ce3510fe1a8..efd56bcb8746 100644 +--- a/Source/WebCore/Sources.txt ++++ b/Source/WebCore/Sources.txt +@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp + platform/graphics/WOFFFileFormat.cpp + platform/graphics/WidthIterator.cpp + platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp ++platform/graphics/cpu/arm/filters/FELightingNEON.cpp + platform/graphics/displaylists/DisplayList.cpp + platform/graphics/displaylists/DisplayListDrawingContext.cpp + platform/graphics/displaylists/DisplayListItems.cpp diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp index f6ff8c20a5a8..42a97ffc5372 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp @@ -67,7 +80,7 @@ index f6ff8c20a5a8..42a97ffc5372 100644 // Calling a powf function from the assembly code would require to save // and reload a lot of NEON registers. Since the base is in range [0..1] diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index b17c603d40d3..e4629cda0b7c 100644 +index b17c603d40d3..c6d17f573eca 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h @@ -24,14 +24,15 @@ @@ -98,9 +111,10 @@ index b17c603d40d3..e4629cda0b7c 100644 { - alignas(16) FELightingFloatArgumentsForNeon floatArguments; - FELightingPaintingDataForNeon neonData = { +- data.pixels->data(), + WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; + WebCore::FELightingPaintingDataForNeon neonData = { - data.pixels->data(), ++ data.pixels->bytes(), 1, - data.widthDecreasedByOne - 1, - data.heightDecreasedByOne - 1, @@ -244,7 +258,7 @@ index 0c073bc13f8c..e0db00545c17 100644 float m_surfaceScale; float m_diffuseConstant; diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h -index 5c9c7fb783e6..e53aa012ac1c 100644 +index 126b3b2350f6..d906db21aa9c 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ @@ -259,7 +273,7 @@ index 5c9c7fb783e6..e53aa012ac1c 100644 class PointLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h -index 04e331ec4ec0..763c8d400b00 100644 +index 641b205f986d..64380d9b6eb8 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ @@ -274,7 +288,7 @@ index 04e331ec4ec0..763c8d400b00 100644 class SpotLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h -index 3875b0a4b5de..6d3864aafb9a 100644 +index c974d92115ff..e2896660cfbd 100644 --- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h @@ -36,6 +36,7 @@ diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 9c8beecf2e..5dd64b34b7 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.36.8.tar.xz.sums -md5 939dc646bb6652fde9a5b6512c17fc58 wpewebkit-2.36.8.tar.xz -sha1 f45936c578f7dcfbb6064e87da6c098efe093e68 wpewebkit-2.36.8.tar.xz -sha256 8d42a349c910b2d0961b8d34fecef29cec3d21e3af5977346c90026692dc75eb wpewebkit-2.36.8.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.0.tar.xz.sums +md5 e0e6b98c86351c39e41da475afc50780 wpewebkit-2.38.0.tar.xz +sha1 66e6dd1c285a21ce50370fb4d60332838d801663 wpewebkit-2.38.0.tar.xz +sha256 e653e12eca63e6371c06d4cd9efcd5492db67f7d9ef324fd5d8668b1151e72b2 wpewebkit-2.38.0.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 0ff8204519..001c701ee9 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.36.8 +WPEWEBKIT_VERSION = 2.38.0 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -22,9 +22,11 @@ WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ -DENABLE_ACCESSIBILITY=OFF \ -DENABLE_API_TESTS=OFF \ + -DENABLE_DOCUMENTATION=OFF \ + -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=OFF \ - -DUSE_SOUP2=ON \ - -DSILENCE_CROSS_COMPILATION_NOTICES=ON + -DENABLE_WEB_RTC=OFF \ + -DUSE_SOUP2=ON ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) WPEWEBKIT_CONF_OPTS += \ From peter at korsgaard.com Mon Feb 20 20:58:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:48 -0000 Subject: [Buildroot] [git commit branch/next] package/gst1-plugins-ugly: bump version to 1.22.0 Message-ID: <20230220205245.BA6C48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f1fef1499427d508363c29920468e8f5a495709 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Remove xingmux config option which has been moved to the gst1-plugins-good package. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ package/gstreamer1/gst1-plugins-ugly/Config.in | 5 ----- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 8 +------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3fff2b1ddd..1c5af2652a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX + bool "xingmux moved" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX + help + The xingmux option has been moved to gst1-plugins-good. + config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE bool "videoscale removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in index ba19989892..54766ffa8c 100644 --- a/package/gstreamer1/gst1-plugins-ugly/Config.in +++ b/package/gstreamer1/gst1-plugins-ugly/Config.in @@ -26,11 +26,6 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB help DVD subtitle parser and decoder -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX - bool "xingmux" - help - Add XING tags to mpeg audio files - config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA bool "realmedia" help diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 4ec29e6894..21579216df 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.4.tar.xz.sha256sum -sha256 5c9ec6bab96517e438b3f9bae0ceb84d3436f3da9bbe180cf4d28e32a7251b59 gst-plugins-ugly-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz.sha256sum +sha256 a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c gst-plugins-ugly-1.22.0.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 20382719c3..9f16fa3da8 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.4 +GST1_PLUGINS_UGLY_VERSION = 1.22.0 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 @@ -51,12 +51,6 @@ else GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=enabled -else -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=enabled else From peter at korsgaard.com Mon Feb 20 20:58:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:48 -0000 Subject: [Buildroot] [git commit branch/next] package/qt5/qt5virtualkeyboard: really configure language layouts Message-ID: <20230220205223.9D17F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92219bdf2ece2a0ddfbc45691879a03acd5c7442 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "170777f342 package/qt5/qt5virtualkeyboard: convert to qmake infrastructure" changed most but not all _QMAKEFLAGS to _CONF_OPTS. As a consequence, BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS is ignored and all layouts are compiled in. Some layouts have different licenses (e.g. pinying), so the license information for a build that is configured to not include such layouts is wrong. Change the remaining _QMAKEFLAGS entry, fixing the config for which language layouts are compiled and installed. Cc: Giulio Benetti Cc: Julien Corjon Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index c31d455c4e..3fefdc874d 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -16,7 +16,7 @@ QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS = $(call qstrip,$(BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)) ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) -QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))" +QT5VIRTUALKEYBOARD_CONF_OPTS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))" ifneq ($(filter ja_JP all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (openwnn) From peter at korsgaard.com Mon Feb 20 20:58:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:49 -0000 Subject: [Buildroot] [git commit branch/next] package/gst1-vaapi: bump version to 1.22.0 Message-ID: <20230220205245.DD3858648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33d4c226e582f6c0086431c4d9154e462cb3cf34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update config option names and dependency requirements. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 37 +++++++++++++++++++++------ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 5baaa4dfb7..6dec625c93 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.4.tar.xz.sha256sum -sha256 ab12596144c05506e9782374c5d2cdfb3069fca89908d6de360d947bb77fd06a gstreamer-vaapi-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.0.tar.xz.sha256sum +sha256 593ccad19f88e5fa29f40f98356c007806bd535828707b1406944d16a90bdff5 gstreamer-vaapi-1.22.0.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 bd6c16be3e..3d9eb91ffb 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.4 +GST1_VAAPI_VERSION = 1.22.0 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+ @@ -18,19 +18,40 @@ GST1_VAAPI_DEPENDENCIES += \ libdrm GST1_VAAPI_CONF_OPTS += \ - -Dwith_drm=yes \ - -Dwith_x11=no \ - -Dwith_glx=no \ - -Dwith_wayland=no \ - -Dwith_egl=no \ + -Ddrm=enabled \ + -Degl=enabled \ -Dexamples=disabled \ -Dtests=disabled \ -Ddoc=disabled ifeq ($(BR2_PACKAGE_GST1_VAAPI_ENCODERS),y) -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=yes +GST1_VAAPI_CONF_OPTS += -Dencoders=enabled else -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=no +GST1_VAAPI_CONF_OPTS += -Dencoders=disabled +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) +GST1_VAAPI_CONF_OPTS += -Degl=enabled +GST1_VAAPI_DEPENDENCIES += libegl +else +GST1_VAAPI_CONF_OPTS += -Degl=disabled +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +GST1_VAAPI_CONF_OPTS += -Dwayland=enabled +else +GST1_VAAPI_CONF_OPTS += -Dwayland=disabled +endif + +ifeq ($(BR2_PACKAGE_XORG7),y) +GST1_VAAPI_CONF_OPTS += -Dx11=enabled +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +GST1_VAAPI_CONF_OPTS += -Dglx=enabled +else +GST1_VAAPI_CONF_OPTS += -Dglx=disabled +endif +else +GST1_VAAPI_CONF_OPTS += -Dx11=disabled -Dglx=disabled endif $(eval $(meson-package)) From peter at korsgaard.com Mon Feb 20 20:58:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:49 -0000 Subject: [Buildroot] [git commit branch/next] package/tekui: really disable parallel build Message-ID: <20230220205223.B0D77828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93036af53fbbd566a800a12fa8979000ea4fa31f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "c80789c917 tekui: disable parallel build" added TEKUI_MAKE but that is not a symbol used by the generic package infra. Ensure -j1 is passed to the build and install commands by using TEKUI_MAKE explicitly. Fixes: http://autobuild.buildroot.net/results/c6cd0d488581013a8b215b0ee2fd8f549a868d4b Cc: Francois Perrad Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/tekui/tekui.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tekui/tekui.mk b/package/tekui/tekui.mk index 13000edd3e..3cb7ff51e5 100644 --- a/package/tekui/tekui.mk +++ b/package/tekui/tekui.mk @@ -59,11 +59,11 @@ endif endif define TEKUI_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all + $(TARGET_MAKE_ENV) $(TEKUI_MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all endef define TEKUI_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install + $(TARGET_MAKE_ENV) $(TEKUI_MAKE) $(TEKUI_MAKE_OPTS) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install endef $(eval $(generic-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:53 -0000 Subject: [Buildroot] [git commit branch/next] configs/olimex_a10_olinuxino_lime_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230220205246.5767F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f54c7ffce70d583dbd85718f23d1bd7b18a0a744 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a10_olinuxino_lime_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a10_olinuxino_lime_defconfig b/configs/olimex_a10_olinuxino_lime_defconfig index d0e00301f7..9c454b1915 100644 --- a/configs/olimex_a10_olinuxino_lime_defconfig +++ b/configs/olimex_a10_olinuxino_lime_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a10-olinuxino" @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a10_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -33,7 +33,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A10-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From peter at korsgaard.com Mon Feb 20 20:58:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:53 -0000 Subject: [Buildroot] [git commit branch/next] package/ethtool: bump to version 6.1 Message-ID: <20230220205224.05ABF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=090ebb085f8d77b0d88dcb757835fad0aa530603 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 8a649876d9..609085aa5e 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 3b752a3329827907ac3812f2831dfecf51c8c41c55d2d69cfb9c53ca06449fc6 ethtool-5.19.tar.xz +sha256 c41fc881ffa5a40432d2dd829eb44c64a49dee482e716baacf9262c64daa8f90 ethtool-6.1.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index 32bd5e7db1..3381344e0a 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 5.19 +ETHTOOL_VERSION = 6.1 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:54 -0000 Subject: [Buildroot] [git commit branch/next] configs/olimex_a20_olinuxino_lime2_defconfig: bump Linux to 6.1.9 Message-ID: <20230220205246.6DBEA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=720d30f9d29327e326916457bb74eeeb976b3ff1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime2_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index a0ebcaed66..50a0986ab2 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.15 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" From peter at korsgaard.com Mon Feb 20 20:58:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:54 -0000 Subject: [Buildroot] [git commit branch/next] package/hwdata: bump to version 0.365 Message-ID: <20230220205224.133E08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e49d4fe20cbdf6195f23e4e920b1314786e1dac1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/hwdata/hwdata.hash | 2 +- package/hwdata/hwdata.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 6c5a091a06..4f56b0c12f 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 f0bb38588b9fcb43e15dac4ce8461b7580ef38ac20ecab83cef638413646decb hwdata-0.358.tar.gz +sha256 d6ae2436a69c6f5e04d926f5d753a99d90deb864065a2e2f8a8eda87b70dcdd5 hwdata-0.365.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index b2e1838074..00fe6c1455 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.358 +HWDATA_VERSION = 0.365 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:55 -0000 Subject: [Buildroot] [git commit branch/next] configs/olimex_a20_olinuxino_micro_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230220205246.8224B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f23405b39a850b54c61b719bf7d079664d773fc6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_micro_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index 1394c0b8b8..a7a6eb51a0 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-micro" @@ -33,7 +33,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino_MICRO" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From peter at korsgaard.com Mon Feb 20 20:58:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:56 -0000 Subject: [Buildroot] [git commit branch/next] package/libpcap: bump to version 1.10.2 Message-ID: <20230220205224.227C9828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6bee8635d90f3f9e3d04e03a9db2f37a387e077c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/libpcap/Config.in | 2 +- package/libpcap/libpcap.hash | 4 ++-- package/libpcap/libpcap.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libpcap/Config.in b/package/libpcap/Config.in index a5f64bdc81..7ffac64c46 100644 --- a/package/libpcap/Config.in +++ b/package/libpcap/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_LIBPCAP A system-independent library for user-level network packet capture. - http://www.tcpdump.org/ + https://www.tcpdump.org/ diff --git a/package/libpcap/libpcap.hash b/package/libpcap/libpcap.hash index 84c8e405df..b87d9d04ef 100644 --- a/package/libpcap/libpcap.hash +++ b/package/libpcap/libpcap.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz.sig -sha256 ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4 libpcap-1.10.1.tar.gz +# https://www.tcpdump.org/release/libpcap-1.10.2.tar.gz.sig +sha256 db6d79d4ad03b8b15fb16c42447d093ad3520c0ec0ae3d331104dcfb1ce77560 libpcap-1.10.2.tar.gz # Hash for license file: sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 21422b2c0a..173207de63 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPCAP_VERSION = 1.10.1 +LIBPCAP_VERSION = 1.10.2 LIBPCAP_SITE = https://www.tcpdump.org/release LIBPCAP_LICENSE = BSD-3-Clause LIBPCAP_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:56 -0000 Subject: [Buildroot] [git commit branch/next] configs/olimex_a33_olinuxino_defconfig: bump Linux to 6.1.9 and U-Boot to 2023.01 Message-ID: <20230220205246.8C2A286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4ac41042515944eafb892c8c26ea3b940211136 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a33_olinuxino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a33_olinuxino_defconfig b/configs/olimex_a33_olinuxino_defconfig index cdbc63efe1..35398ac6da 100644 --- a/configs/olimex_a33_olinuxino_defconfig +++ b/configs/olimex_a33_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a7=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="A33-olinuxino" @@ -15,7 +15,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A33-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -31,7 +31,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a33_olinuxino/boot # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y From peter at korsgaard.com Mon Feb 20 20:58:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:56 -0000 Subject: [Buildroot] [git commit branch/next] package/nano: bump to version 7.1 Message-ID: <20230220205224.400E186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a779b8966038bb3fa49c56eee1e134333fcb206 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- 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 86f414aca0..f49b712093 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/v7/nano-7.0.tar.xz.asc +# https://www.nano-editor.org/dist/v7/nano-7.1.tar.xz.asc # using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F -sha256 8dd6eac38b2b8786d82681f0e1afd84f6b75210d17391b6443c437e451552149 nano-7.0.tar.xz +sha256 57ba751e9b7519f0f6ddee505202e387c75dde440c1f7aa1b9310cc381406836 nano-7.1.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index f9338550d4..203c417f06 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 7 -NANO_VERSION = $(NANO_VERSION_MAJOR).0 +NANO_VERSION = $(NANO_VERSION_MAJOR).1 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 thomas.petazzoni at bootlin.com Mon Feb 20 20:58:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:57 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/post-image.sh: Don't insist on a xilinx/ prefix for .dts files. Message-ID: <20230220205246.AF1298648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70477e5fee6e92b1d783257a8b3e57a78007438e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from buildroot into the linux tree, these .dts files are copied to arch/arm64/boot. Unfortunately, the post-image.sh script expects to find them in arch/arm64/boot/xilinx. This patch does not require the xilinx/ prefix to be present when symlinking the device-tree to system.dtb where u-boot expects to find it. Signed-off-by: Graeme Smecher Reviewed-by: Luca Ceresoli Reviewed-by: Neal Frager Signed-off-by: Thomas Petazzoni --- board/zynqmp/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index ed6dbe188c..c5de2db820 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -5,7 +5,7 @@ # devicetree listed in the config. FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ ${BR2_CONFIG}) [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb From peter at korsgaard.com Mon Feb 20 20:58:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:57 -0000 Subject: [Buildroot] [git commit branch/next] package/pcre2: bump to version 10.42 Message-ID: <20230220205224.4EE67828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64a03682cc1a90a311b2331224deac62f8c8940f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/pcre2/pcre2.hash | 4 ++-- package/pcre2/pcre2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index e3fe6b2d53..f609bdaee2 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature: -# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2.sig -sha256 14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68 pcre2-10.40.tar.bz2 +# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2.sig +sha256 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840 pcre2-10.42.tar.bz2 # Locally computed sha256 87d884eceb7fc54611470ce9f74280d28612b0c877adfc767e9676892a638987 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index 06a0afc9b8..aba378cab6 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE2_VERSION = 10.40 +PCRE2_VERSION = 10.42 PCRE2_SITE = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(PCRE2_VERSION) PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause From yann.morin.1998 at free.fr Mon Feb 20 20:58:58 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:58 -0000 Subject: [Buildroot] [git commit branch/next] package/libfuse3: bump to version 3.13.1 Message-ID: <20230220205246.D869D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b439a721e0e74e3e97ee10a89853ab6a4b8a627 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/a98/a984d275d949e8dc989870d2d2b6f6c7168d52bb/ Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index 691bfbc9d6..f697f4ad3f 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 224544214204eb348b548d6faa7a9bc91b053aacfc92e8b5da3f478c76ae4a03 libfuse3-3.13.0.tar.gz +sha256 96399b09b91bc717a9e96ffea660d611e6a342547c1abd4d0e858b3dca9d5a13 libfuse3-3.13.1.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index d94f7d3d3a..a2e9775868 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.13.0 +LIBFUSE3_VERSION = 3.13.1 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:58:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:58 -0000 Subject: [Buildroot] [git commit branch/next] package/strace: bump to version 6.1 Message-ID: <20230220205224.77E0A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=261b2e25f8fe42395f750d170da313826c5157f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/strace/strace.hash | 4 ++-- package/strace/strace.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 1743a369b4..9478fbd459 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.0/strace-6.0.tar.xz.asc -sha256 92d720a666855e9f1c6a11512fd6e99674a82bbfe1442557815f2ce8e1293338 strace-6.0.tar.xz +# https://strace.io/files/6.1/strace-6.1.tar.xz.asc +sha256 2579e9cec37dbb786f6ea0bebd15f40dd561ef2bde2a2a2ecdce5963b01859fd strace-6.1.tar.xz sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 09e620530e..cbb574559e 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.0 +STRACE_VERSION = 6.1 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:59 -0000 Subject: [Buildroot] [git commit branch/next] package/elf2flt: fix error when building gdb for target on m68k Message-ID: <20230220205247.183198648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6f15e85b3ac58ba1d387ea86945d3fabf4f8990 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Thomas reported that m68k fails to build when enabling BR2_PACKAGE_GDB. It fails when building gdb for the target with the following error: elf2flt: ERROR: text=0x3c826 overlaps data=0x256e0 ? It turns out that the gdb binary has another problematic input section (.gcc_except_table), which causes elf2flt to try to append to the .text output section, after it has already moved on with appending sections to the .data output section. elf2flt cannot append to a previous output section once it has moved on to another output section. Update the existing elf2flt patch to also add an exception for .gcc_except_table. Reported-by: Thomas Petazzoni Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni --- ...-fatal-error-regression-on-m68k-xtensa-ri.patch | 47 +++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch index 278709cb1c..616bbc891f 100644 --- a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch +++ b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch @@ -1,8 +1,7 @@ -From 65ac5f9e69cfb989d970da74c41e478774d29be5 Mon Sep 17 00:00:00 2001 +From a8c9f650b82109abf7aa730f298ea5182ed62613 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 9 Aug 2022 21:06:05 +0200 -Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, - riscv64 +Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64 Commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") changed the condition of which input sections that should be included @@ -12,16 +11,15 @@ to: ((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == (SEC_DATA | SEC_READONLY | SEC_RELOC)) -On ARM, the .eh_frame input section does not have the SEC_RELOC flag -set, so this specific change had no effect on ARM. +On ARM, the .eh_frame input section does not have the SEC_RELOC flag set, +so on ARM, this change caused .eh_frame to move from .text to .data. -However, on e.g. m68k and riscv64, the .eh_frame input section does -have the SEC_RELOC flag set, which means that after commit ba379d08bb78 -("elf2flt: fix for segfault on some ARM ELFs"), read-only relocation -data sections were placed in .text output section, instead of .data -output section. +However, on e.g. m68k, xtensa and riscv64, the .eh_frame input section +does have the SEC_RELOC flag set, which means that the change in +commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") +caused .eh_frame to move in an opposite way, i.e. from .data to .text. -This will result in a fatal error on m68k, xtensa and riscv64: +This resulted in a fatal error on m68k, xtensa and riscv64: ERROR: text=0x3bab8 overlaps data=0x33f60 ? This is because elf2flt cannot append to .text after .data has been @@ -36,21 +34,26 @@ to .text after .data has been appended to (which will require elf2flt to move/relocate everything that has already been appended to .data, since the virtual addresses are contiguous). -However, for now, add an exception for m68k, xtensa and riscv64 -(specifically for the problematic input section, .eh_frame), so that we -get the same behavior as older elf2flt releases, where we put read-only -relocation data in .data, which was working perfectly fine. +However, for now, add an exception for input sections which have all +three flags SEC_DATA, SEC_READONLY, and SEC_RELOC set, and which have a +name equal to a problematic input section (.eh_frame, .gcc_except_table). +That way, we get the same behavior as older elf2flt releases for m68k, +xtensa and riscv64, where we put read-only relocation data in .data, +which was working perfectly fine. + +This exception will not change any behavior on ARM, as the .eh_frame +input section does not have flag SEC_RELOC set. Signed-off-by: Niklas Cassel --- - elf2flt.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) + elf2flt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/elf2flt.c b/elf2flt.c -index 9c32f9a..a680c89 100644 +index e0d7891..39d035f 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -340,8 +340,15 @@ compare_relocs (const void *pa, const void *pb) +@@ -341,8 +341,13 @@ compare_relocs (const void *pa, const void *pb) static bool ro_reloc_data_section_should_be_in_text(asection *s) { @@ -58,10 +61,8 @@ index 9c32f9a..a680c89 100644 - (SEC_DATA | SEC_READONLY | SEC_RELOC); + if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == + (SEC_DATA | SEC_READONLY | SEC_RELOC)) { -+#if defined(TARGET_m68k) || defined(TARGET_riscv64) || defined(TARGET_xtensa) -+ if (!strcmp(".eh_frame", s->name)) ++ if (!strcmp(".eh_frame", s->name) || !strcmp(".gcc_except_table", s->name)) + return false; -+#endif + return true; + } + return false; @@ -69,5 +70,5 @@ index 9c32f9a..a680c89 100644 static uint32_t * -- -2.37.1 +2.39.0 From peter at korsgaard.com Mon Feb 20 20:58:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:59 -0000 Subject: [Buildroot] [git commit branch/next] package/prosody: bump to version 0.11.14 Message-ID: <20230220205224.5BBB68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6e88fff91dd4702c725f47fb4fdd1a00b228f64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/prosody/prosody.hash | 8 ++++---- package/prosody/prosody.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index 3a3a363a4b..1fd1abafe9 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 7214ee57d4702585bd0d3428e69790b4 prosody-0.11.13.tar.gz -sha1 1cc5a72d98738872d0c1a4c34b1fcb8878348c7d prosody-0.11.13.tar.gz -sha256 39c61b346a09b5125b604cb969e14206cbbcb86c81156ffc6ba2d62527cf0432 prosody-0.11.13.tar.gz -sha512 7616785536b7b51767a26963a80c961ef2403609e1e78dda3f88cf68c00d5bb899278c70a22b006b58c36c62cbb1bbd390a9298bad5b8d6524928a1cd5457813 prosody-0.11.13.tar.gz +md5 93665d86c47e99c9c525610ac53400fb prosody-0.11.14.tar.gz +sha1 abbd0ad42e2b30051f4d3f198c54a52b4e9f39d0 prosody-0.11.14.tar.gz +sha256 ec0c7447ec07ed336b6912d06a2f533439cb16d60d8d3bffa8ce46269ee52c87 prosody-0.11.14.tar.gz +sha512 128e12427ae0b5080fd3cc2380974c04570b16f0f79de7b39ef85cec6e8f579bee2d1150ce70ca731222c487dba646cbcd48bdb4a102a14395644eb5f19f1c88 prosody-0.11.14.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 62ba073b9e..b5d89ebba4 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.13 +PROSODY_VERSION = 0.11.14 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:59:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:00 -0000 Subject: [Buildroot] [git commit branch/next] package/modsecurity2: security bump to version 2.9.7 Message-ID: <20230220205247.39C608648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42e34cf10f9eb037aa8c48a4fb9e8f521901b983 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads in ModSecurity before 2.9.7 may allow for Web Application Firewall bypasses and buffer overflows on the Web Application Firewall when executing rules that read the FILES_TMP_CONTENT collection. - host-pkgconf is mandatory and used to find libxml2 since https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 - pcre2 is supported since: https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modsecurity2/Config.in | 2 +- package/modsecurity2/modsecurity2.hash | 4 ++-- package/modsecurity2/modsecurity2.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in index 2870386a99..fb1bfc960e 100644 --- a/package/modsecurity2/Config.in +++ b/package/modsecurity2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_MODSECURITY2 bool "modsecurity2" depends on BR2_PACKAGE_APACHE select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help ModSecurity is an open source, cross-platform web application firewall (WAF) module. Known as the "Swiss Army Knife" of diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash index a19f4823a8..2c77ffd830 100644 --- a/package/modsecurity2/modsecurity2.hash +++ b/package/modsecurity2/modsecurity2.hash @@ -1,5 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.5/modsecurity-2.9.5.tar.gz.sha256 -sha256 e2bfc8cd8b8de1e21f054d310543373ea5d89adbd96784e832be0da3e4dc149e modsecurity-2.9.5.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz.sha256 +sha256 2a28fcfccfef21581486f98d8d5fe0397499749b8380f60ec7bb1c08478e1839 modsecurity-2.9.7.tar.gz # Locally computed sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index a1ad8fe5bc..c251291e64 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODSECURITY2_VERSION = 2.9.5 +MODSECURITY2_VERSION = 2.9.7 MODSECURITY2_SOURCE = modsecurity-$(MODSECURITY2_VERSION).tar.gz MODSECURITY2_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) MODSECURITY2_LICENSE = Apache-2.0 @@ -12,11 +12,10 @@ MODSECURITY2_LICENSE_FILES = LICENSE MODSECURITY2_CPE_ID_VENDOR = trustwave MODSECURITY2_CPE_ID_PRODUCT = modsecurity MODSECURITY2_INSTALL_STAGING = YES -MODSECURITY2_DEPENDENCIES = apache libxml2 pcre +MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 MODSECURITY2_CONF_OPTS = \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ - --with-libxml=$(STAGING_DIR)/usr \ + --with-pcre2=$(STAGING_DIR)/usr/bin/pcre2-config \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ --with-apu=$(STAGING_DIR)/usr/bin/apu-1-config \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ From peter at korsgaard.com Mon Feb 20 20:59:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:00 -0000 Subject: [Buildroot] [git commit branch/next] package/sqlite: security bump to version 3.40.1 Message-ID: <20230220205224.B28168648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99b3ea44295a2ec3aa841f83d81c9231f89cb6e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes the following security issues: CVE-2022-46908: SQLite through 3.40.0, when relying on --safe for execution of an untrusted CLI script, does not properly implement the azProhibitedFunctions protection mechanism, and instead allows UDF functions such as WRITEFILE. Release notes: https://sqlite.org/releaselog/3_40_1.html Signed-off-by: Bernd Kuhls [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- 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 ea4e30a463..36f6907fbc 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0333552076d2700c75352256e91c78bf5cd62491589ba0c69aed0a81868980e7 sqlite-autoconf-3400000.tar.gz +sha256 2c5dea207fa508d765af1ef620b637dcb06572afa6f01f0815bd5bbf864b33d9 sqlite-autoconf-3400100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 9d0b60ab59..789eddfa0a 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.40.0 -SQLITE_TAR_VERSION = 3400000 +SQLITE_VERSION = 3.40.1 +SQLITE_TAR_VERSION = 3400100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain From yann.morin.1998 at free.fr Mon Feb 20 20:59:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:01 -0000 Subject: [Buildroot] [git commit branch/next] package/rdma-core: new package Message-ID: <20230220205246.E5F0E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is the userspace components for the Linux Kernel's drivers/infiniband subsystem. https://github.com/linux-rdma/rdma-core Tested-by: Shamraiz Ashraf Signed-off-by: Julien Olivain [yann.morin.1998 at free.fr: - select iproute2 as it provides the 'rdma' utility ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 + package/Config.in | 1 + package/rdma-core/Config.in | 20 ++++++ package/rdma-core/rdma-core.hash | 5 ++ package/rdma-core/rdma-core.mk | 24 +++++++ package/rdma-core/readme.txt | 75 ++++++++++++++++++++++ support/testing/tests/package/test_rdma_core.py | 43 +++++++++++++ .../package/test_rdma_core/linux-rdma.fragment | 9 +++ 8 files changed, 180 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d526451ca3..73905748ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1695,6 +1695,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/tinycompress/ F: package/z3/ @@ -1710,6 +1711,8 @@ F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_rdma_core.py +F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py N: Julien Viard de Galbert diff --git a/package/Config.in b/package/Config.in index 83fddf316f..1f6db14d56 100644 --- a/package/Config.in +++ b/package/Config.in @@ -573,6 +573,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..59f5ef63ae --- /dev/null +++ b/package/rdma-core/Config.in @@ -0,0 +1,20 @@ +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_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_IPROUTE2 # runtime + 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 + +comment "rdma-core needs a toolchain w/ headers >= 3.4, threads, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \ + || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash new file mode 100644 index 0000000000..1aff44f7f4 --- /dev/null +++ b/package/rdma-core/rdma-core.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 4a2eec55b37ac25f25e7680a372f71c1781c23808542bd31fb68dc0448b8cba2 rdma-core-44.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..885821bf98 --- /dev/null +++ b/package/rdma-core/rdma-core.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# rdma-core +# +################################################################################ + +RDMA_CORE_VERSION = 44.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..9a95226ef4 --- /dev/null +++ b/package/rdma-core/readme.txt @@ -0,0 +1,75 @@ +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 configuration, 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). The Kernel +config fragment file used for package test can be used as a starting +point. See: + + support/testing/tests/package/test_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 -d 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..614fb51f48 --- /dev/null +++ b/support/testing/tests/package/test_rdma_core.py @@ -0,0 +1,43 @@ +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.91" + 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="{}" + 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 + """.format( + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") + ) + + 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") diff --git a/support/testing/tests/package/test_rdma_core/linux-rdma.fragment b/support/testing/tests/package/test_rdma_core/linux-rdma.fragment new file mode 100644 index 0000000000..e305f27e62 --- /dev/null +++ b/support/testing/tests/package/test_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 From peter at korsgaard.com Mon Feb 20 20:59:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:01 -0000 Subject: [Buildroot] [git commit branch/next] package/tcpdump: bump to version 4.99.2 Message-ID: <20230220205224.875238648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa2b795b2e48663cb2924a35e22fb47071ef9531 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/tcpdump/Config.in | 2 +- package/tcpdump/tcpdump.hash | 4 ++-- package/tcpdump/tcpdump.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/tcpdump/Config.in b/package/tcpdump/Config.in index 8b54c603df..7429471362 100644 --- a/package/tcpdump/Config.in +++ b/package/tcpdump/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_TCPDUMP help A tool for network monitoring and data acquisition. - http://www.tcpdump.org/ + https://www.tcpdump.org/ if BR2_PACKAGE_TCPDUMP diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index 1990aa797b..a950d3fa66 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature at -# https://www.tcpdump.org/release/tcpdump-4.99.1.tar.gz.sig +# https://www.tcpdump.org/release/tcpdump-4.99.2.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 79b36985fb2703146618d87c4acde3e068b91c553fb93f021a337f175fd10ebe tcpdump-4.99.1.tar.gz +sha256 f4304357d34b79d46f4e17e654f1f91f9ce4e3d5608a1badbd53295a26fb44d5 tcpdump-4.99.2.tar.gz sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 7741c3b58e..c38d46e2cd 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.99.1 +TCPDUMP_VERSION = 4.99.2 TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:59:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:02 -0000 Subject: [Buildroot] [git commit branch/next] package/upx: security bump to version 4.0.2 Message-ID: <20230220205247.441DB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02befac8f9404ae30d0d090221d21a8460c82ec7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to cause a denial of service (abort) via a crafted file. Fix CVE-2023-23457: A Segmentation fault was found in UPX in PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a crafted input file allows invalid memory address access that could lead to a denial of service. https://github.com/upx/upx/blob/v4.0.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/upx/upx.hash | 2 +- package/upx/upx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 9f7c40c819..7c24906152 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz +sha256 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f upx-4.0.2-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index ef346b2310..6018b0a63d 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPX_VERSION = 4.0.1 +UPX_VERSION = 4.0.2 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ From peter at korsgaard.com Mon Feb 20 20:59:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:02 -0000 Subject: [Buildroot] [git commit branch/next] package/vdr: bump version to 2.6.3 Message-ID: <20230220205224.C1AD086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d290f602b679043810dd658eba1f6f1f87faa9b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://github.com/vdr-projects/vdr/blob/master/HISTORY Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/vdr/vdr.hash | 2 +- package/vdr/vdr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vdr/vdr.hash b/package/vdr/vdr.hash index 2216e317fe..1b7ced0b77 100644 --- a/package/vdr/vdr.hash +++ b/package/vdr/vdr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dfb252a0466e95071ca16707914d14c7e5c2e45020e4dc530ea85b7b3c3ea17e vdr-2.6.1.tar.gz +sha256 70352c7558d627202c02e80d88c83d25d9df4c5e49a010f7d1d9ae631bd54ad0 vdr-2.6.3.tar.gz sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index 61acb9971f..a44e1ff512 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -VDR_VERSION = 2.6.1 +VDR_VERSION = 2.6.3 VDR_SITE = $(call github,vdr-projects,vdr,$(VDR_VERSION)) VDR_LICENSE = GPL-2.0+ VDR_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Mon Feb 20 20:59:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:03 -0000 Subject: [Buildroot] [git commit branch/next] package/z3: bump to version 4.12.1 Message-ID: <20230220205247.66BDE8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a7b1b913e756358b40359115c12fff241d4ca92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For change log since v4.12.0, see: - https://github.com/Z3Prover/z3/releases/tag/z3-4.12.1 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/z3/z3.hash | 2 +- package/z3/z3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/z3/z3.hash b/package/z3/z3.hash index 517e2f4923..8a511c3fe5 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5f575f0a3950760436217da1cc1a714569b6d4f664a75bb6775876328cf0a580 z3-4.12.0.tar.gz +sha256 a3735fabf00e1341adcc70394993c05fd3e2ae167a3e9bb46045e33084eb64a3 z3-4.12.1.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index ecd79325dc..45c412ad12 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.12.0 +Z3_VERSION = 4.12.1 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 20 20:59:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:03 -0000 Subject: [Buildroot] [git commit branch/next] package/minetest{-game}: bump to version 5.6.1 Message-ID: <20230220205224.9566286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e41117c64cada4a06fcb20fd17517354a42e948 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release announcement: 5.6.0: https://forum.minetest.net/viewtopic.php?f=18&t=28511 5.6.1: https://forum.minetest.net/viewtopic.php?f=18&t=28703 minetest: - Update license file hash due to new image file in the project sources. - IrrlichtMt 1.9.0mt8 is required to build Minetest >= 5.6.1. - Add xlib_libXi dependency for xinput2 support enabled by default for Linux. - Remove xlib_libXxf86vm dependency previously used by gamma ramp code [1]. [1] https://github.com/minetest/irrlicht/commit/538c9e5cde425ecee1e802fd53344111683b60be Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/minetest-game/minetest-game.hash | 2 +- package/minetest-game/minetest-game.mk | 2 +- package/minetest/Config.in | 2 +- package/minetest/minetest.hash | 6 +++--- package/minetest/minetest.mk | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/minetest-game/minetest-game.hash b/package/minetest-game/minetest-game.hash index 2b7eeffd8f..629871edbe 100644 --- a/package/minetest-game/minetest-game.hash +++ b/package/minetest-game/minetest-game.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 5a24fec4ed838744906f020096c35616e7ba76eeec2b93b980a40af011107e7c minetest-game-5.5.1.tar.gz +sha256 5dc857003d24bb489f126865fcd6bf0d9c0cb146ca4c1c733570699d15abd0e3 minetest-game-5.6.1.tar.gz sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt diff --git a/package/minetest-game/minetest-game.mk b/package/minetest-game/minetest-game.mk index e5ee45b6ab..ec8d5bff26 100644 --- a/package/minetest-game/minetest-game.mk +++ b/package/minetest-game/minetest-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_GAME_VERSION = 5.5.1 +MINETEST_GAME_VERSION = 5.6.1 MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION)) MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \ CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods) diff --git a/package/minetest/Config.in b/package/minetest/Config.in index 3e331dff7e..4e139ac3e2 100644 --- a/package/minetest/Config.in +++ b/package/minetest/Config.in @@ -28,7 +28,7 @@ config BR2_PACKAGE_MINETEST_CLIENT select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_JPEG - select BR2_PACKAGE_XLIB_LIBXXF86VM + select BR2_PACKAGE_XLIB_LIBXI help Build Minetest client. diff --git a/package/minetest/minetest.hash b/package/minetest/minetest.hash index e78f865969..ec67d4136d 100644 --- a/package/minetest/minetest.hash +++ b/package/minetest/minetest.hash @@ -1,6 +1,6 @@ # Locally calculated -sha256 dc0ae5188ef351db85c38b27f38f8549b133ed82aa46daea6deee148aa3454f4 minetest-5.5.1.tar.gz -sha256 6d38dd7f3e3c8d768e1f5776b98dd5359b184c2e6740ddf733f4dc8615191bef irrlicht-1.9.0mt5.tar.gz +sha256 1440603e19dca70e2691e86a74c822ee2c4a36fceee32b2d85ae74772149e9a3 minetest-5.6.1.tar.gz +sha256 27594242da8c7cc1e5ef45922e1dfdd130c37d77719b5d927359eb47992051e0 irrlicht-1.9.0mt8.tar.gz -sha256 d1d8a63f7f70d89a3a899f3b9fb5ca1ea7dbbd4eb449be2a7b2ff861b1f09192 LICENSE.txt +sha256 b38c8d428ceddf8e9b49dca63610c74499d952895d756b7eab5f5d4cef2954f6 LICENSE.txt sha256 ca38f1ba4ab901111f6eee50009bd46dbd866e6beb98d592d843f7c162d73409 lib/irrlichtmt/doc/irrlicht-license.txt diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk index 6d56c3222f..3904bd687c 100644 --- a/package/minetest/minetest.mk +++ b/package/minetest/minetest.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_VERSION = 5.5.1 +MINETEST_VERSION = 5.6.1 MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION)) MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds), Zlib (irrlicht) MINETEST_LICENSE_FILES = LICENSE.txt lib/irrlichtmt/doc/irrlicht-license.txt @@ -12,7 +12,7 @@ MINETEST_CPE_ID_VENDOR = minetest MINETEST_DEPENDENCIES = gmp jsoncpp luajit sqlite zlib zstd -MINETEST_IRRLICHTMT_VERSION = 1.9.0mt5 +MINETEST_IRRLICHTMT_VERSION = 1.9.0mt8 MINETEST_EXTRA_DOWNLOADS = $(call github,minetest,irrlicht,$(MINETEST_IRRLICHTMT_VERSION))/irrlicht-$(MINETEST_IRRLICHTMT_VERSION).tar.gz define MINETEST_IRRLICHTMT_EXTRACT @@ -36,7 +36,7 @@ MINETEST_CONF_OPTS = \ -DBUILD_UNITTESTS=OFF ifeq ($(BR2_PACKAGE_MINETEST_CLIENT),y) -MINETEST_DEPENDENCIES += bzip2 freetype jpeg libgl libpng xlib_libXxf86vm +MINETEST_DEPENDENCIES += bzip2 freetype jpeg libgl libpng xlib_libXi MINETEST_CONF_OPTS += -DBUILD_CLIENT=ON else MINETEST_CONF_OPTS += -DBUILD_CLIENT=OFF From peter at korsgaard.com Mon Feb 20 20:59:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:04 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-mediasdk: bump version to 22.6.5 Message-ID: <20230220205224.F2D31828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ebb0f810a21103af0bd6d988a24645503e7d10e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 7cbedb7127..903b6f3394 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 197acd056f81e9ff1c27068d50e8c84c2014d94c7ac17cad69d5c2d61e445fd3 intel-mediasdk-22.6.4.tar.gz +sha256 3a671cc692da5111c041088f5e32528b4346e122e8a134fad71310c572705106 intel-mediasdk-22.6.5.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 3bd6197779..f7bce30c74 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.6.4 +INTEL_MEDIASDK_VERSION = 22.6.5 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:59:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:04 -0000 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: fix openssl dependency Message-ID: <20230220205247.7189986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78e3637dd26766976d09e5d8286613f67975f8d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure raised since the addition of the package in commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: Makefile:576: *** libopenssl is in the dependency chain of fluent-bit that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Fixes: - http://autobuild.buildroot.org/results/9c3b8e19063f7587877fdb0598739b55abccb3e8 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/fluent-bit/fluent-bit.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 879437e5f4..13077e53cc 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -10,7 +10,7 @@ FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit -FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml libopenssl +FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ From peter at korsgaard.com Mon Feb 20 20:59:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:05 -0000 Subject: [Buildroot] [git commit branch/next] package/libsndfile: bump to version 1.2.0 Message-ID: <20230220205224.D1AC5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1757c1fe0556d7339d23c5726fb49cca1c7d7759 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/libsndfile/libsndfile/releases/tag/1.2.0 Drop patch (already in version). Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...bstitute-EXTERNAL_MPEG_LIBS-in-sndfile-pc.patch | 24 ---------------------- package/libsndfile/libsndfile.hash | 2 +- package/libsndfile/libsndfile.mk | 4 +--- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/package/libsndfile/0001-configure-ac-substitute-EXTERNAL_MPEG_LIBS-in-sndfile-pc.patch b/package/libsndfile/0001-configure-ac-substitute-EXTERNAL_MPEG_LIBS-in-sndfile-pc.patch deleted file mode 100644 index 44ed6dc2cb..0000000000 --- a/package/libsndfile/0001-configure-ac-substitute-EXTERNAL_MPEG_LIBS-in-sndfile-pc.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e4fdaeefddd39bae1db27d48ccb7db7733e0c009 Mon Sep 17 00:00:00 2001 -From: Michael Cho -Date: Sun, 17 Apr 2022 21:31:07 -0700 -Subject: [PATCH] configure.ac: substitute EXTERNAL_MPEG_LIBS in sndfile.pc - -[Retrieved from: -https://github.com/libsndfile/libsndfile/commit/e4fdaeefddd39bae1db27d48ccb7db7733e0c009] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 727b67bc0..a4c776d70 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -739,6 +739,7 @@ AC_SUBST(SNDIO_LIBS) - AC_SUBST(EXTERNAL_XIPH_CFLAGS) - AC_SUBST(EXTERNAL_XIPH_LIBS) - AC_SUBST(EXTERNAL_XIPH_REQUIRE) -+AC_SUBST(EXTERNAL_MPEG_LIBS) - AC_SUBST(EXTERNAL_MPEG_REQUIRE) - AC_SUBST(MPG123_CFLAGS) - AC_SUBST(MPG123_LIBS) diff --git a/package/libsndfile/libsndfile.hash b/package/libsndfile/libsndfile.hash index 67d10d03c4..be3ba41dc6 100644 --- a/package/libsndfile/libsndfile.hash +++ b/package/libsndfile/libsndfile.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 0f98e101c0f7c850a71225fb5feaf33b106227b3d331333ddc9bacee190bcf41 libsndfile-1.1.0.tar.xz +sha256 0e30e7072f83dc84863e2e55f299175c7e04a5902ae79cfb99d4249ee8f6d60a libsndfile-1.2.0.tar.xz # Locally calculated sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index 0b57a1fdd8..d8d1725444 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -4,15 +4,13 @@ # ################################################################################ -LIBSNDFILE_VERSION = 1.1.0 +LIBSNDFILE_VERSION = 1.2.0 LIBSNDFILE_SOURCE = libsndfile-$(LIBSNDFILE_VERSION).tar.xz LIBSNDFILE_SITE = https://github.com/libsndfile/libsndfile/releases/download/$(LIBSNDFILE_VERSION) LIBSNDFILE_INSTALL_STAGING = YES LIBSNDFILE_LICENSE = LGPL-2.1+ LIBSNDFILE_LICENSE_FILES = COPYING LIBSNDFILE_CPE_ID_VENDOR = libsndfile_project -# We're patching configure.ac -LIBSNDFILE_AUTORECONF = YES LIBSNDFILE_DEPENDENCIES = host-pkgconf LIBSNDFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From thomas.petazzoni at bootlin.com Mon Feb 6 09:14:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 10:14:11 +0100 Subject: [Buildroot] [git commit branch/next] package/libcamera-apps: fix overflow conversion error Message-ID: <20230220205247.A3E9A81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bbf8d89810479d2cc4777b84f3cc49bc3548d868 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Upstream commit: https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861 Fixes: - http://autobuild.buildroot.net/results/758631a9fcd62835844f78914a36dfb579e7beba/ Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- ...ore-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch b/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch new file mode 100644 index 0000000000..fbd1d2d4ba --- /dev/null +++ b/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch @@ -0,0 +1,35 @@ +From a65682a97e19f96b86aeceb3ca3befb1687e3861 Mon Sep 17 00:00:00 2001 +From: Marcus Folkesson +Date: Tue, 31 Jan 2023 09:14:15 +0100 +Subject: [PATCH] core: pass VIDIOC_QUERYCAP as unsigned long + +VIDIOC_QUARYCAP is an unsigned long and should be passed as one. + +Get rid of the following error: +core/libcamera_app.cpp:33:22: error: overflow in conversion from 'long unsigned int' to 'int' changes value from '2154321408' to '-2140645888' [-Werror=overflow] + 33 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); + +Upstream: https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861 +Signed-off-by: Marcus Folkesson +--- + core/libcamera_app.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/core/libcamera_app.cpp b/core/libcamera_app.cpp +index 04696fb..8cb6563 100644 +--- a/core/libcamera_app.cpp ++++ b/core/libcamera_app.cpp +@@ -30,7 +30,9 @@ static void check_camera_stack() + return; + + v4l2_capability caps; +- int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); ++ unsigned long request = VIDIOC_QUERYCAP; ++ ++ int ret = ioctl(fd, request, &caps); + close(fd); + + if (ret < 0 || strcmp((char *)caps.driver, "bm2835 mmal")) +-- +2.38.1 + From peter at korsgaard.com Mon Feb 6 10:01:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:01:01 +0100 Subject: [Buildroot] [git commit branch/next] package/mongoose: fix build with gcc 4.8 Message-ID: <20230220205247.C06F786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6139aeacd847487a296f1c7b8a9d302d678cd8ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with gcc 4.8 raised since bump to version 7.8 in commit f9e51e1150f59962577358b3da5c390ca4749291: /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c: In function 'mg_iotest': /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c:4484:3: error: 'for' loop initial declarations are only allowed in C99 mode for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) { ^ Fixes: - http://autobuild.buildroot.org/results/c538c6d8e87e4e24097c9878ee15083802276505 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mongoose/mongoose.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 8d06ed4689..0693f7553a 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -13,7 +13,7 @@ MONGOOSE_INSTALL_STAGING = YES # static library MONGOOSE_INSTALL_TARGET = NO -MONGOOSE_CFLAGS = $(TARGET_CFLAGS) +MONGOOSE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGOOSE_DEPENDENCIES += openssl From peter at korsgaard.com Mon Feb 20 20:59:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:06 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-gmmlib: bump version to 22.3.2 Message-ID: <20230220205224.E36EC8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=935f8774e5b10028c71d85c014380dd67714af5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 9491f23680..d36bd8b9b6 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4adcd33a07617e1c95c4bc6d85bac2e3a881ba19ffcca2857da765248295fd2c intel-gmmlib-22.3.1.tar.gz +sha256 f725fbb4291ab67bbc7b31e1a268f523df384667360c931b40144db861be53d7 intel-gmmlib-22.3.2.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 81c455eafd..ffd101808b 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.1 +INTEL_GMMLIB_VERSION = 22.3.2 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Mon Feb 6 10:01:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:01:01 +0100 Subject: [Buildroot] [git commit branch/next] package/gpsd: bump to version 3.25 Message-ID: <20230220205247.CBA5C81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c7fece853f3def9a425eccc384b9dacb1010051 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch (not needed anymore) https://gitlab.com/gpsd/gpsd/-/blob/release-3.25/NEWS Signed-off-by: Fabrice Fontaine Tested-by: Yann E. MORIN Acked-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- package/gpsd/0001-gpsctl-fix-yodaification.patch | 44 ------------------------ package/gpsd/gpsd.hash | 2 +- package/gpsd/gpsd.mk | 2 +- 3 files changed, 2 insertions(+), 46 deletions(-) diff --git a/package/gpsd/0001-gpsctl-fix-yodaification.patch b/package/gpsd/0001-gpsctl-fix-yodaification.patch deleted file mode 100644 index 753ff300eb..0000000000 --- a/package/gpsd/0001-gpsctl-fix-yodaification.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 72ae7ce646792b07061cbbb31ed47f55a1d2422c Mon Sep 17 00:00:00 2001 -Message-Id: <72ae7ce646792b07061cbbb31ed47f55a1d2422c.1663075350.git.yann.morin at orange.com> -From: "Yann E. MORIN" -Date: Tue, 13 Sep 2022 15:10:48 +0200 -Subject: [PATCH] gpsctl: fix yodaification - -Commit d5a672abd98a (gpsctl.c: Style tweaks. Yoda style, braces, // -comments.) claimed "No functional changes", but mis-treated a comparison -when it was converted to yoda-style (simplified diff): - - - if (write(gpsdata->gps_fd, buf, strlen(buf)) <= 0) { - + if (0 <= write(gpsdata->gps_fd, buf, strlen(buf))) { - -As one may notice, the comparison operator was not reversed while the -operands were. - -This got silently fixed in commit 3219ab9f6a89 (gpsctl.c: First cut at ---ship sending commands to running gpsd.) but this is completely -unrelated. - -Fix that comparison. - -Signed-off-by: Yann E. MORIN -Upstream status: not applicable as already fixed. ---- - gpsctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gpsctl.c b/gpsctl.c -index cb342af87..ef59a6622 100644 ---- a/gpsctl.c -+++ b/gpsctl.c -@@ -96,7 +96,7 @@ static bool gps_query(struct gps_data_t *gpsdata, - if ('\n' != buf[strnlen(buf, sizeof(buf) - 1) - 1]) { - (void)strlcat(buf, "\n", sizeof(buf)); - } -- if (0 <= write(gpsdata->gps_fd, buf, strnlen(buf, sizeof(buf)))) { -+ if (0 >= write(gpsdata->gps_fd, buf, strnlen(buf, sizeof(buf)))) { - GPSD_LOG(LOG_ERROR, &context.errout, "gps_query(), write failed\n"); - return false; - } --- -2.25.1 - diff --git a/package/gpsd/gpsd.hash b/package/gpsd/gpsd.hash index f415c3af0f..15e1181ed9 100644 --- a/package/gpsd/gpsd.hash +++ b/package/gpsd/gpsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c gpsd-3.24.tar.gz +sha256 b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2 gpsd-3.25.tar.gz sha256 fdf339997bbca9eaf507476b82fbcac608fc39a3d89b86b51e16db4c9f933716 COPYING diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 961ebde649..d7425513fd 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSD_VERSION = 3.24 +GPSD_VERSION = 3.25 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-2-Clause GPSD_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 20:59:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:07 -0000 Subject: [Buildroot] [git commit branch/next] configs/amarula_vyasa_rk3288_defconfig: bump to Linux version 6.1.2 and U-Boot 2022.10 Message-ID: <20230220205225.1E0FF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5424bd0a827ef2a36707b5c12a11251169622160 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- configs/amarula_vyasa_rk3288_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig index ff96019e1e..7976537225 100644 --- a/configs/amarula_vyasa_rk3288_defconfig +++ b/configs/amarula_vyasa_rk3288_defconfig @@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" From peter at korsgaard.com Mon Feb 6 10:17:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:17:15 +0100 Subject: [Buildroot] [git commit branch/next] package/iwd: bump to version 2.3 Message-ID: <20230220205247.ED56281979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6929c0cdd944c86b0affbe04cf72c2c0398da64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 be048b3da6..1647f93d9e 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 dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570 iwd-2.2.tar.xz +sha256 b0506d797a8bfb88f3c3eeea5e49dcf4ee8e6cef118f57c118e587eeb377ac64 iwd-2.3.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index b0a2f6e9ed..c54031b102 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 2.2 +IWD_VERSION = 2.3 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 Mon Feb 20 20:59:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:08 -0000 Subject: [Buildroot] [git commit branch/next] package/re2: bump to version 2022-12-01 Message-ID: <20230220205225.2D229828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4432cf65ee7ec0fe9cc23bcac251adca16aeb014 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 380b547658..9019867db4 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd4f4508bee946ab0f re2-2022-06-01.tar.gz +sha256 665b65b6668156db2b46dddd33405cd422bd611352c5052ab3dae6a5fbac5506 re2-2022-12-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 39b2c8d990..07bb9378de 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2022-06-01 +RE2_VERSION = 2022-12-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:59:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:09 -0000 Subject: [Buildroot] [git commit branch/next] package/glib-networking: drop dangling GLIB_NETWORKING_INSTALL_TARGET_OPTS Message-ID: <20230220205225.5D7008648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4f2459e8a94c1f30c0fcbeb3cd72b62b5ee3e64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In 2015, commit "3fe434bf35 glib-networking: specify GIO_MODULE_DIR for target" correctly used _INSTALL_TARGET_OPTS with an autotools package. But later on, in 2018, commit "928a72c49f package/glib-networking: bump version to 2.56.1" changed the package to use the meson infra, that does not support _INSTALL_TARGET_OPTS. So this symbol is bogus since 2018. Drop it now. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/glib-networking/glib-networking.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index e8905dfff4..4adc13d39f 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -21,8 +21,6 @@ GLIB_NETWORKING_CONF_OPTS = \ GLIB_NETWORKING_LICENSE = LGPL-2.0+ GLIB_NETWORKING_LICENSE_FILES = COPYING GLIB_NETWORKING_CPE_ID_VENDOR = gnome -GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \ - GIO_MODULE_DIR=/usr/lib/gio/modules install ifeq ($(BR2_PACKAGE_GNUTLS),y) GLIB_NETWORKING_DEPENDENCIES += gnutls From peter at korsgaard.com Mon Feb 6 10:19:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:19:32 +0100 Subject: [Buildroot] [git commit branch/next] package/tmux: bump to version 3.3a Message-ID: <20230220205248.03EA78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e279599d255a79c08ef20b97b96eb248689d52a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next systemd is an optional dependency since https://github.com/tmux/tmux/commit/fc7f1e7acb3539a43df46136e971f770515e0b0d https://github.com/tmux/tmux/blob/3.3a/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tmux/tmux.hash | 2 +- package/tmux/tmux.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index 75538e09ae..b5c0fe58d0 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386 tmux-3.1c.tar.gz +sha256 e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f tmux-3.3a.tar.gz sha256 c031bd37f464c534277814f6aa38686fa023d094261d57fd2545ad592bb53ccd COPYING diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index b1c0af1a83..47ee9b16ca 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,13 +4,20 @@ # ################################################################################ -TMUX_VERSION = 3.1c +TMUX_VERSION = 3.3a TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +TMUX_DEPENDENCIES += systemd +TMUX_CONF_OPTS += --enable-systemd +else +TMUX_CONF_OPTS += --disable-systemd +endif + ifeq ($(BR2_PACKAGE_UTF8PROC),y) TMUX_DEPENDENCIES += utf8proc TMUX_CONF_OPTS += --enable-utf8proc From peter at korsgaard.com Mon Feb 6 10:24:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:24:31 +0100 Subject: [Buildroot] [git commit branch/next] Config.in.legacy: fix typo on BR2_PACKAGE_MEDIAART_BACKEND_QT Message-ID: <20230220205248.40F898648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=316e149611a761db04171ee6141048d9057183c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Currently using this minimal .config: BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF=y triggers: *** Legacy options removed in 2018.05 *** [ ] libmediaart none backend option renamed (NEW) [*] libmediaart gdk-pixbuf backend option renamed [*] libmediaart qt backend option renamed Commit "8553b39887 libmediaart: rename options to have proper prefix", part of the 2018.05 release had a copy&paste error. As stated in the beginning of the file: The oldest symbols will be removed again after about two years. But while we carry these legacy symbols, let's fix the typo. Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 4d82a54208..e5cfcea8fa 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2700,7 +2700,7 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF +config BR2_PACKAGE_MEDIAART_BACKEND_QT bool "libmediaart qt backend option renamed" select BR2_LEGACY help From thomas.petazzoni at bootlin.com Mon Feb 6 10:57:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:57:08 +0100 Subject: [Buildroot] [git commit branch/next] boot/barebox: explicitly set the timezone for the kbuild timestamp Message-ID: <20230220205248.6CE9B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11e75ecbf092420f00f0fc88a7183d5d99887ff1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This adjusts the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") to explicitly set the timezone when calculating KBUILD_BUILD_TIMESTAMP, like is already done in linux/linux.mk. Signed-off-by: Thomas Petazzoni --- boot/barebox/barebox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index a0cfaffe09..d7bcafe436 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -78,7 +78,7 @@ ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C TZ='UTC' date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From peter at korsgaard.com Mon Feb 20 20:59:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:11 -0000 Subject: [Buildroot] [git commit branch/next] package/libtalloc: drop bogus LIBTALLOC_{C, LD}FLAGS Message-ID: <20230220205225.7DF09828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ad6b4e10e4538532c00f8c04363da64f19c313a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "f0d37e275a package/libtalloc: new package" added these symbols but they are not used in the package and also not recognized by the waf package infra. So drop the ignored symbols. Cc: David GOUARIN Cc: Matt Weber Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/libtalloc/libtalloc.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/libtalloc/libtalloc.mk b/package/libtalloc/libtalloc.mk index 75d3da263b..ca15180d22 100644 --- a/package/libtalloc/libtalloc.mk +++ b/package/libtalloc/libtalloc.mk @@ -31,8 +31,6 @@ LIBTALLOC_CONF_OPTS += --cross-compile \ --with-libiconv=$(STAGING_DIR)/usr ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -LIBTALLOC_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` -LIBTALLOC_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` LIBTALLOC_DEPENDENCIES += libtirpc host-pkgconf endif From thomas.petazzoni at bootlin.com Mon Feb 6 10:57:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 11:57:29 +0100 Subject: [Buildroot] [git commit branch/next] package/libass: bump version to 0.17.0 Message-ID: <20230220205248.78D1686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06646238303b974e4bce81143a6c022fdf790568 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/libass/libass/releases/tag/0.17.0 Added new optional dependency to libunibreak introduced by this bump. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libass/libass.hash | 2 +- package/libass/libass.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/libass/libass.hash b/package/libass/libass.hash index b8952a4730..beb7639b1f 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5dbde9e22339119cf8eed59eea6c623a0746ef5a90b689e68a090109078e3c08 libass-0.16.0.tar.xz +sha256 971e2e1db59d440f88516dcd1187108419a370e64863f70687da599fdf66cc1a libass-0.17.0.tar.xz sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING diff --git a/package/libass/libass.mk b/package/libass/libass.mk index 4ba812e3fc..1cc8310312 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.16.0 +LIBASS_VERSION = 0.17.0 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. @@ -33,4 +33,11 @@ else LIBASS_CONF_OPTS += --disable-fontconfig --disable-require-system-font-provider endif +ifeq ($(BR2_PACKAGE_LIBUNIBREAK),y) +LIBASS_DEPENDENCIES += libunibreak +LIBASS_CONF_OPTS += --enable-libunibreak +else +LIBASS_CONF_OPTS += --disable-libunibreak +endif + $(eval $(autotools-package)) From peter at korsgaard.com Mon Feb 6 10:26:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 11:26:41 +0100 Subject: [Buildroot] [git commit branch/next] utils/checkpackagelib: warn about redefined config Message-ID: <20230220205248.4B91086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bbda72743d39df29dfc91e0f52be02b2d465f6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Warn the developer in the case the same config is declared more than once in the same Config.in file. But take into account the conditional code that lets the config be visible and warn only when it is declared more than once in the same conditions. For instance, do not warn for: if BR2_PACKAGE_BUSYBOX config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_config.py | 38 ++++++++++++++++ utils/checkpackagelib/test_lib_config.py | 78 ++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index b05831f2c3..f26ca0d898 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -233,3 +233,41 @@ class Indent(_CheckFunction): return ["{}:{}: should not be indented" .format(self.filename, lineno), text] + + +class RedefinedConfig(_CheckFunction): + CONFIG = re.compile(r"^\s*(menu|)config\s+(BR2_\w+)\b") + IF = re.compile(r"^\s*if\s+([^#]*)\b") + ENDIF = re.compile(r"^\s*endif\b") + + def before(self): + self.configs = {} + self.conditional = [] + + def check_line(self, lineno, text): + if _empty_or_comment(text) or _part_of_help_text(text): + return + + m = self.IF.search(text) + if m is not None: + condition = m.group(1) + self.conditional.append(condition) + return + + m = self.ENDIF.search(text) + if m is not None: + self.conditional.pop() + return + + m = self.CONFIG.search(text) + if m is None: + return + config = m.group(2) + + key = (config, ' AND '.join(self.conditional)) + if key in self.configs.keys(): + previous_line = self.configs[key] + return ["{}:{}: config {} redeclared (previous line: {})" + .format(self.filename, lineno, config, previous_line), + text] + self.configs[key] = lineno diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py index 91a549adf2..474d17105e 100644 --- a/utils/checkpackagelib/test_lib_config.py +++ b/utils/checkpackagelib/test_lib_config.py @@ -385,3 +385,81 @@ Indent = [ def test_Indent(testname, filename, string, expected): warnings = util.check_file(m.Indent, filename, string) assert warnings == expected + + +RedefinedConfig = [ + ('no redefinition', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO_BAR\n' + 'bool "foo"\n', + []), + ('no conditional', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('three times', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:3: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n'], + ['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('same conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:6: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:8: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('not equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if !BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', RedefinedConfig) +def test_RedefinedConfig(testname, filename, string, expected): + warnings = util.check_file(m.RedefinedConfig, filename, string) + assert warnings == expected From peter at korsgaard.com Mon Feb 20 20:59:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:13 -0000 Subject: [Buildroot] [git commit branch/next] package/swupdate: drop dangling SWUPDATE_BUILD_CONFIG Message-ID: <20230220205225.CF057828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca5cd8d67554c568daee4da1f058bcf3b35b2976 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next "6c63e4de4a boot/swupdate: don't specify .config to munge" dropped all usages of this define but the define itself was left dangling. Drop it now. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/swupdate/swupdate.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 8f05b83922..11a3946753 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -208,8 +208,6 @@ define SWUPDATE_SET_WEBSERVER endef endif -SWUPDATE_BUILD_CONFIG = $(@D)/.config - SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)) SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig From peter at korsgaard.com Mon Feb 20 20:59:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:14 -0000 Subject: [Buildroot] [git commit branch/next] package/qoriq-rcw: drop bogus QORIQ_RCW_FILE_BIN Message-ID: <20230220205225.AD89D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41aa369d01a4dd6646390066f44135d99f926fe4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next While applying [1] and cleaning up, the commit "d167f7006e package/qoriq-rcw: add in-tree rcw source support" ended up keeping an unused define. Drop it now. [1] http://patchwork.ozlabs.org/project/buildroot/patch/20200207083857.28058-4-jerry.huang at nxp.com/ Cc: Matt Weber Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/qoriq-rcw/qoriq-rcw.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index 8b1ceacfce..b9c9e99222 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -59,7 +59,6 @@ endef else ifneq ($(QORIQ_RCW_INTREE),) QORIQ_RCW_PLATFORM = $(firstword $(subst /, ,$(QORIQ_RCW_INTREE))) -QORIQ_RCW_FILE_BIN = $(lastword $(subst /, ,$(QORIQ_RCW_INTREE))) define HOST_QORIQ_RCW_BUILD_CMDS $(MAKE) -C $(@D)/$(QORIQ_RCW_PLATFORM) From thomas.petazzoni at bootlin.com Mon Feb 6 11:13:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 12:13:36 +0100 Subject: [Buildroot] [git commit branch/next] package/postgresql: work around gcc bug 43744 Message-ID: <20230220205248.AFC0886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3def0679e3a424983354346eb517bbaa07b905df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Package postgresql suffers from gcc bug 43744 other than 85180, so let's work around disabling compiler optimization for this gcc bug too. Fixes: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 5313e03b12..2ffcac6595 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -101,7 +101,7 @@ endif POSTGRESQL_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_43744)$(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),) POSTGRESQL_CFLAGS += -O0 endif From peter at korsgaard.com Mon Feb 20 20:59:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:15 -0000 Subject: [Buildroot] [git commit branch/next] package/rhash: drop dangling RHASH_ADDLDFLAGS Message-ID: <20230220205225.BDB218648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eae97036f34e69e2ca197cd31fd87c673f2ebe37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "ead2afda13 package/rhash: bump version to 1.4.0" dropped the only usage of this define but the define itself was left dangling. Drop it now. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/rhash/rhash.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index 8c33de1862..1f7456e4e7 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -12,7 +12,6 @@ RHASH_LICENSE_FILES = COPYING RHASH_CPE_ID_VENDOR = rhash_project RHASH_INSTALL_STAGING = YES RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) RHASH_CONF_OPTS += --enable-gettext From yann.morin.1998 at free.fr Mon Feb 6 11:00:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:00:14 +0100 Subject: [Buildroot] [git commit branch/next] package/crudini: add host-crudini Message-ID: <20230220205248.9AD5C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c96b2b21f7aedd78094fd009f03d8f82361e5105 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Make the host variant of crudini package. This can be useful in post-{build,image} scripts. Signed-off-by: Konstantin Menyaev Reviewed-by: Heiko Thiery [yann.morin.1998 at free.fr: select python3, don't depend on it] Signed-off-by: Yann E. MORIN --- package/Config.in.host | 1 + package/crudini/Config.in.host | 9 +++++++++ package/crudini/crudini.mk | 1 + 3 files changed, 11 insertions(+) diff --git a/package/Config.in.host b/package/Config.in.host index 0f612d7872..8d28f426d1 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -14,6 +14,7 @@ menu "Host utilities" source "package/checksec/Config.in.host" source "package/cmake/Config.in.host" source "package/cramfs/Config.in.host" + source "package/crudini/Config.in.host" source "package/cryptsetup/Config.in.host" source "package/dbus-python/Config.in.host" source "package/delve/Config.in.host" diff --git a/package/crudini/Config.in.host b/package/crudini/Config.in.host new file mode 100644 index 0000000000..4e77095627 --- /dev/null +++ b/package/crudini/Config.in.host @@ -0,0 +1,9 @@ +config BR2_PACKAGE_HOST_CRUDINI + bool "host crudini" + select BR2_PACKAGE_HOST_PYTHON3 + select BR2_PACKAGE_HOST_PYTHON_INIPARSE # runtime + help + A utility for handling ini files from the command line and + shell scripts + + https://pypi.python.org/pypi/crudini diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk index 7141e2b2a0..c376c5f777 100644 --- a/package/crudini/crudini.mk +++ b/package/crudini/crudini.mk @@ -11,3 +11,4 @@ CRUDINI_LICENSE = GPL-2.0 CRUDINI_LICENSE_FILES = COPYING $(eval $(python-package)) +$(eval $(host-python-package)) From peter at korsgaard.com Mon Feb 20 20:59:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:16 -0000 Subject: [Buildroot] [git commit branch/next] package/wpa_supplicant: drop dangling WPA_SUPPLICANT_{LDFLAGS, MAKE_ENV} Message-ID: <20230220205225.E210386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11479db32c5ea6bbdd7ce9b77873561a2ca07cfb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "0340b45da0 wpa_supplicant: bump to version 1.0" from 2012 converted the package to use the generic infra, but added a bogus WPA_SUPPLICANT_LDFLAGS end left a dangling WPA_SUPPLICANT_MAKE_ENV. Drop the symbols that are not used since 2012. Cc: Matt Weber Cc: Sergey Matyukevich Cc: Yegor Yefremov Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/wpa_supplicant/wpa_supplicant.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index e5e3938be1..42c6f772ac 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -13,7 +13,6 @@ WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config WPA_SUPPLICANT_SUBDIR = wpa_supplicant WPA_SUPPLICANT_DBUS_SERVICE = fi.w1.wpa_supplicant1 WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ -WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) WPA_SUPPLICANT_SELINUX_MODULES = networkmanager # install the wpa_client library @@ -157,9 +156,6 @@ endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS),y) WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus -WPA_SUPPLICANT_MAKE_ENV = \ - PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_NEW define WPA_SUPPLICANT_INSTALL_DBUS_NEW $(INSTALL) -m 0644 -D \ From yann.morin.1998 at free.fr Mon Feb 6 11:36:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 12:36:56 +0100 Subject: [Buildroot] [git commit branch/next] package/Config.in.host: fix missing double-quote Message-ID: <20230220205248.D5CED8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3cab8f29eb9c7e573099a4a0e45f251e4f15f97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit c96b2b21f7ae (package/python-iniparse: add host-python-iniparse) missed that. Reported-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in.host b/package/Config.in.host index 8d28f426d1..dcadbfdfc1 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -78,7 +78,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python-cython/Config.in.host" source "package/python-greenlet/Config.in.host" - source "package/python-iniparse/Config.in.host + source "package/python-iniparse/Config.in.host" source "package/python-kflash/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-pyyaml/Config.in.host" From yann.morin.1998 at free.fr Mon Feb 6 13:21:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 6 Feb 2023 14:21:42 +0100 Subject: [Buildroot] [git commit branch/next] Makefile: fix build when $(O) ends in _defconfig Message-ID: <20230220205248.EF25F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5bd2cafc326141eede4f917069ed21b6d38f88c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit e6195c53041f (Makefile: fix use of many br2-external trees) fixed a slowdown with many br2-external trees. In doing so, it changed the type of the %_defconfig rule: the stem is no longer present in the prerequisites, so it changes from a pattern rule to an implicit pattern rule [0]. It is not unusual to name the build directory after the defconfig that is being built, so we may end up with a build directory named meh_defconfig. Before e6195c53041f, the pattern rule would not match [1], but now it does, which causes somewhat-cryptic build failures: Makefile:1015: *** "Can't find /some/path/meh_defconfig". Stop. The issue is that we have this set of rules and assignments (elided and reordered for legibility): all: world world: target-post-image target-post-image: staging-finalize staging-finalize: $(STAGING_DIR_SYMLINK) $(STAGING_DIR_SYMLINK): | $(BASE_DIR) BASE_DIR := $(CANONICAL_O) CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) So, there is a rule that (eventually) has a dependency on $(O), but we have no rule that provides it explicitly, so the %_defconfig rule kicks in, with the stem as "/some/path/meh". When the loop searches all the ".../configs/" directories for a file named ".../configs/%_defconfig", it actually looks for a file named ".../configs//some/path/meh_defconfig" and that indeed never matches anything. The solution is to provide an actual rule for $(BASE_DIR), so that the implicit rule does not kick in. [0] Terminology and behaviour in make is hard, so the terms we used here may be wrong or incorrectly used, and/or the explanations for the behaviour be wrong or incomplete... Still, the reasoning stands, and the root cause is the removal of the stem in the RHS of the rule (adding one back does fix the issue). [1] not sure how the prerequisite was solved before e6195c53041f, though... Fixes: e6195c53041f Reported-by: Romain Naour Signed-off-by: Yann E. MORIN Cc: Nevo Hed Cc: Peter Korsgaard Tested-by: Sebastian Weyer Signed-off-by: Yann E. MORIN --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8517d563d5..f39af5eae9 100644 --- a/Makefile +++ b/Makefile @@ -1042,7 +1042,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile # staging and target directories do NOT list these as # dependencies anywhere else -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): @mkdir -p $@ # outputmakefile generates a Makefile in the output directory, if using a From peter at korsgaard.com Mon Feb 20 20:59:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:17 -0000 Subject: [Buildroot] [git commit branch/next] package/checkpolicy: drop bogus CHECKPOLICY_STAGING_CMDS Message-ID: <20230220205226.105058648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14956d8908776e52ea9ace2fbb3f41716ebb4262 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "b06110621d checkpolicy: allow compiling for target" contains a typo that prevents installing to staging. It also forgot to enable CHECKPOLICY_INSTALL_STAGING. But the package does not install headers or libraries, only ELF and manual files. So instead of fixing the install to staging, drop the bogus CHECKPOLICY_STAGING_CMDS. Cc: Clayton Shotwell Cc: Matt Weber Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/checkpolicy/checkpolicy.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index af9a58cee8..baf16fb802 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -20,11 +20,6 @@ define CHECKPOLICY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR) endef -define CHECKPOLICY_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install - -endef - define CHECKPOLICY_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install endef From peter at korsgaard.com Mon Feb 6 13:22:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:37 +0100 Subject: [Buildroot] [git commit branch/next] package/fwts: use ifeq instead of ifdef Message-ID: <20230220205249.0F20C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6ae82531928662764536cadbe2d6f3c558e7de2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The conditional code using ifdef was added in 2018 and works as expected. But there is no reason to use ifdef instead of ifeq. For consistence, switch to use ifeq like almost all packages already do. Cc: Arnout Vandecappelle Cc: Erico Nunes Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/fwts/fwts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index b208aa0c14..f04c7a848f 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -15,7 +15,7 @@ FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) -ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE +ifeq ($(BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE),y) FWTS_MODULE_SUBDIRS = efi_runtime $(eval $(kernel-module)) endif From peter at korsgaard.com Mon Feb 20 20:59:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:18 -0000 Subject: [Buildroot] [git commit branch/next] bash: bump version to 5.2.15 Message-ID: <20230220205225.F4051828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8a2e1dc08a4de2db903a4a5a41c8541e6abfe81 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Martin Hundeb??ll Signed-off-by: Peter Korsgaard --- ...typo-local_shiftstates-vs.-locale_shiftst.patch | 72 ---------------------- ...ix-dequote_pathname-vs.-udequote_pathname.patch | 40 ------------ package/bash/bash.hash | 4 +- package/bash/bash.mk | 2 +- 4 files changed, 3 insertions(+), 115 deletions(-) diff --git a/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch b/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch deleted file mode 100644 index 1636c18036..0000000000 --- a/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 3d6b9e18506ad9daf4ec7b7d406b38d58ec88009 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 11 Mar 2021 20:48:36 +0100 -Subject: [PATCH] locale: fix typo local_shiftstates vs. locale_shiftstates -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - locale.c:94:3: error: ???local_shiftstates??? undeclared (first use in this function); did you mean ???locale_shiftstates???? - 94 | local_shiftstates = 0; - | ^~~~~~~~~~~~~~~~~ - | locale_shiftstates - -Signed-off-by: Peter Seiderer ---- - locale.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/locale.c b/locale.c -index 17ccc58..d6dd95a 100644 ---- a/locale.c -+++ b/locale.c -@@ -91,7 +91,7 @@ set_default_locale () - #if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - #else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - #endif - } - -@@ -117,7 +117,7 @@ set_default_locale_vars () - # if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - # else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - # endif - - u32reset (); -@@ -226,7 +226,7 @@ set_locale_var (var, value) - # if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - # else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - # endif - u32reset (); - return r; -@@ -250,7 +250,7 @@ set_locale_var (var, value) - #if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - #else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - #endif - u32reset (); - } -@@ -391,7 +391,7 @@ reset_locale_vars () - # if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - # else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - # endif - u32reset (); - #endif --- -2.30.1 - diff --git a/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch b/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch deleted file mode 100644 index a801f68236..0000000000 --- a/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a60ab1e5e88863acf9b0e9bcaa7919bbf093da05 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 11 Mar 2021 20:55:52 +0100 -Subject: [PATCH] glob: fix dequote_pathname vs. udequote_pathname -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - glob.c:123:28: error: static declaration of ???udequote_pathname??? follows non-static declaration - 123 | # define dequote_pathname udequote_pathname - | ^~~~~~~~~~~~~~~~~ - glob.c:125:13: note: in expansion of macro ???dequote_pathname??? - 125 | static void dequote_pathname PARAMS((char *)); - | ^~~~~~~~~~~~~~~~ - glob.c:118:6: note: previous declaration of ???udequote_pathname??? was here - 118 | void udequote_pathname PARAMS((char *)); - | ^~~~~~~~~~~~~~~~~ - -Signed-off-by: Peter Seiderer ---- - lib/glob/glob.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lib/glob/glob.c b/lib/glob/glob.c -index eb6277f..c903b15 100644 ---- a/lib/glob/glob.c -+++ b/lib/glob/glob.c -@@ -117,6 +117,5 @@ static int mbskipname PARAMS((char *, char *, int)); - #else - # define dequote_pathname udequote_pathname - #endif --static void dequote_pathname PARAMS((char *)); - static int glob_testdir PARAMS((char *, int)); - static char **glob_dir_to_array PARAMS((char *, char **, int)); - --- -2.30.1 - diff --git a/package/bash/bash.hash b/package/bash/bash.hash index 4660e9d38a..e0a1ebac91 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/bash/bash-5.1.16.tar.gz.sig -sha256 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558 bash-5.1.16.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.2.15.tar.gz.sig +sha256 13720965b5f4fc3a0d4b61dd37e7565c741da9a5be24edc2ae00182fc1b3588c bash-5.2.15.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 3aca22898e..ec5e2d722f 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.1.16 +BASH_VERSION = 5.2.15 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ From peter at korsgaard.com Mon Feb 20 20:59:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:19 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xdriinfo: bump version to 1.0.7 Message-ID: <20230220205226.32C37828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43b13ebbdc89f3d7597f476123bcddb7e0a1655d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003308.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash | 8 +++----- package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash index 21c50184c7..ce11d06977 100644 --- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash +++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002858.html -md5 480e63cd365f03eb2515a6527d5f4ca6 xdriinfo-1.0.6.tar.bz2 -sha1 11682ae1f04a311b832651d78bbf4c6ac77f0ed9 xdriinfo-1.0.6.tar.bz2 -sha256 d9ccd2c3e87899417acc9ea1f3e319a4198112babe1dc711273584f607449d51 xdriinfo-1.0.6.tar.bz2 -sha512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f xdriinfo-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003308.html +sha256 dd838bae9d2b19ddd71fe6d30ed33abc7c85e19d223e79d35600db3fa44bf734 xdriinfo-1.0.7.tar.xz +sha512 a368cf32c606ca78f3a23bc5d88fb57b9c1a3827d0fec3e48cee153703135e47cecd3db8ee0eba93f309d7f03b4306c3f2e7f46f36d0d2970671c5e5b78093ad xdriinfo-1.0.7.tar.xz # Locally computed sha256 de2fbb160bbb64c48975d7a3ebe3636a312b73227df1efe37488a8cecb9c1932 COPYING diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk index 7f7aac9e15..7672dc8899 100644 --- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk +++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDRIINFO_VERSION = 1.0.6 -XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2 -XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDRIINFO_VERSION = 1.0.7 +XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.xz +XAPP_XDRIINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDRIINFO_LICENSE = MIT XAPP_XDRIINFO_LICENSE_FILES = COPYING XAPP_XDRIINFO_DEPENDENCIES = libgl xlib_libX11 xorgproto From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit branch/next] package/busybox: add comment about variable override Message-ID: <20230220205249.4BC61828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01c0fb3862bce6605881d9e32c29b5f7373bb2f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The same comment already exists for UCLIBC_CONFIG_FILE. Both variables can be override from command-line, as described in the manual, at section 'Environment variables'. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index ef628e90e9..0f14bf999d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -108,6 +108,8 @@ BUSYBOX_MAKE_OPTS = \ CONFIG_PREFIX="$(TARGET_DIR)" \ SKIP_STRIP=y +# specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config +# setting. ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif From peter at korsgaard.com Mon Feb 20 20:59:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:21 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libSM: bump version to 1.2.4 Message-ID: <20230220205226.431808648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a70e0bdfdabad5e9d789db181e0f4c37544a426b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003307.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libSM/xlib_libSM.hash | 8 +++----- package/x11r7/xlib_libSM/xlib_libSM.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libSM/xlib_libSM.hash b/package/x11r7/xlib_libSM/xlib_libSM.hash index 7ac288ba4e..3068c85b93 100644 --- a/package/x11r7/xlib_libSM/xlib_libSM.hash +++ b/package/x11r7/xlib_libSM/xlib_libSM.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-October/002922.html -md5 87c7fad1c1813517979184c8ccd76628 libSM-1.2.3.tar.bz2 -sha1 437d7b13fa2eba325df3a106f177df46ccec6546 libSM-1.2.3.tar.bz2 -sha256 2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb libSM-1.2.3.tar.bz2 -sha512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903 libSM-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003307.html +sha256 fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84 libSM-1.2.4.tar.xz +sha512 7f1d41b7b6c5dd456c49ccad7740c3ba9791a2793fa50fd94814a4164ce2e20c4a0a0ad42a87708e494ed5c23f611be6d3ccd9ef1e9add6d46ac545e2b0f6f86 libSM-1.2.4.tar.xz # Locally computed sha256 af7926a14d85ad367622688636e8c9c6f7807c8a6867536af1c530b5c262bfba COPYING diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk index 708224e2d1..8e5c90127a 100644 --- a/package/x11r7/xlib_libSM/xlib_libSM.mk +++ b/package/x11r7/xlib_libSM/xlib_libSM.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBSM_VERSION = 1.2.3 -XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.bz2 -XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBSM_VERSION = 1.2.4 +XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.xz +XLIB_LIBSM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBSM_LICENSE = MIT XLIB_LIBSM_LICENSE_FILES = COPYING XLIB_LIBSM_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit branch/next] boot/uboot: remove use of legacy xloader symbol Message-ID: <20230220205249.6AE65828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b1b1763b754f8a25cf0f2a7fe05e53d256fe675 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "070b183d0c boot/xloader: remove package", from release 2018.11, removed the package, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 282418c3ed..f5c20f5168 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -450,7 +450,6 @@ endif config BR2_TARGET_UBOOT_SPL bool "Install U-Boot SPL binary image" - depends on !BR2_TARGET_XLOADER help Install the U-Boot SPL binary image to the images directory. From peter at korsgaard.com Mon Feb 20 20:59:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:22 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xcb-util: bump version to 0.4.1 Message-ID: <20230220205226.54A96828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b249eca85819761140f670cc52dcf8fb09ef5b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003306.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xcb-util/xcb-util.hash | 4 +++- package/x11r7/xcb-util/xcb-util.mk | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xcb-util/xcb-util.hash b/package/x11r7/xcb-util/xcb-util.hash index c088a62bab..b9d6687752 100644 --- a/package/x11r7/xcb-util/xcb-util.hash +++ b/package/x11r7/xcb-util/xcb-util.hash @@ -1,3 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2022-December/003306.html +sha256 5abe3bbbd8e54f0fa3ec945291b7e8fa8cfd3cccc43718f8758430f94126e512 xcb-util-0.4.1.tar.xz +sha512 da67f2f017d2a1788dcf35f28d6956e171303a622a1dd085cd3d69fdb2ed77965d83c557cc926ebf9b32e905eb2cbb5921987250192d78a2f5edc4d437ed7d2b xcb-util-0.4.1.tar.xz # locally computed -sha256 46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9 xcb-util-0.4.0.tar.bz2 sha256 325b64f0b0284e08bbb7a78ae3e55c1edc2a7cd77f603225ae4b8ffc35423e37 COPYING diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk index bb73530f94..793c3dc7f2 100644 --- a/package/x11r7/xcb-util/xcb-util.mk +++ b/package/x11r7/xcb-util/xcb-util.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_VERSION = 0.4.0 -XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2 -XCB_UTIL_SITE = http://xcb.freedesktop.org/dist +XCB_UTIL_VERSION = 0.4.1 +XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.xz +XCB_UTIL_SITE = https://xorg.freedesktop.org/archive/individual/lib XCB_UTIL_LICENSE = MIT XCB_UTIL_LICENSE_FILES = COPYING XCB_UTIL_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit branch/next] package/linux-headers: remove bogus symbol BR2_PACKAGE_HOST_LINUX_HEADERS Message-ID: <20230220205249.8147586496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=367bd65f3c216426e2fc21742dbff11ea8d896d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The package host-linux-headers does not exist and there were never references to this symbol in the tree, do drop it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3a5207e0b6..1146231e41 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -1,8 +1,5 @@ comment "Kernel Header Options" -config BR2_PACKAGE_HOST_LINUX_HEADERS - bool - choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL From peter at korsgaard.com Mon Feb 20 20:59:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:23 -0000 Subject: [Buildroot] [git commit branch/next] package/check: disable doc Message-ID: <20230220205226.75268828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7d48b9840d242acf1b8bfb141c89904e53301fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next documentation can be disabled since version 0.13.0 and https://github.com/libcheck/check/commit/8ca1f79a73c374e9e9172937938947584c921659 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/check/check.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/check/check.mk b/package/check/check.mk index be82539469..ccffd08ee3 100644 --- a/package/check/check.mk +++ b/package/check/check.mk @@ -10,6 +10,7 @@ CHECK_INSTALL_STAGING = YES CHECK_DEPENDENCIES = host-pkgconf CHECK_LICENSE = LGPL-2.1+ CHECK_LICENSE_FILES = COPYING.LESSER +CHECK_CONF_OPTS = --disable-build-docs # Having checkmk in the target makes no sense define CHECK_REMOVE_CHECKMK From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit branch/next] toolchain/toolchain-buildroot: add comment about using virtual package infra Message-ID: <20230220205249.6115F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abcecd737b198e8a1a48bf4533e5c2b8de8b8cf4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "9a8ec9195c toolchain/toolchain-buildroot: migrate to virtual package infrastructure" made the packages toolchain and toolchain-buildroot to use the virtual package infra even they being generic packages. This works because on package/pkg-virtual.mk when a package do not define neither _PROVIDES_ or _HAS_ symbols, only _IS_VIRTUAL is set to YES and _VERSION and _SOURCE are set to empty before relaying the call to inner-generic-package. Add a comment explaining why the virtual package infra is used in these cases. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Yann E. MORIN Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- toolchain/toolchain-buildroot/toolchain-buildroot.mk | 3 +++ toolchain/toolchain/toolchain.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk index b30cc332d2..6da64b7c77 100644 --- a/toolchain/toolchain-buildroot/toolchain-buildroot.mk +++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk @@ -14,4 +14,7 @@ TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-buildroot-virtual +# instead of toolchain-buildroot-undefined) $(eval $(virtual-package)) diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index 18f1dbea1a..ac60a7b248 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -47,4 +47,7 @@ endef TOOLCHAIN_POST_INSTALL_TARGET_HOOKS += TOOLCHAIN_GLIBC_COPY_NSSWITCH_FILE endif +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-virtual instead +# of toolchain-undefined) $(eval $(virtual-package)) From peter at korsgaard.com Mon Feb 20 20:59:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:24 -0000 Subject: [Buildroot] [git commit branch/next] package/janus-gateway: bump to version 1.1.1 Message-ID: <20230220205226.87F728648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01518e5660366be41e6a8e0a0f2b487d7cdf48a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/meetecho/janus-gateway/blob/v1.1.1/CHANGELOG.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/janus-gateway/janus-gateway.hash | 2 +- package/janus-gateway/janus-gateway.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash index 5d73ede87f..7a87ae737a 100644 --- a/package/janus-gateway/janus-gateway.hash +++ b/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5b8a7304761783585bfa8db7471bf8c393fa2a0ffc346747afadc0c1a9d213f5 janus-gateway-1.0.3.tar.gz +sha256 bb83c19d6137e39833e8eb2b1deeecb33b5d19d4f503d51703bdcc478c447940 janus-gateway-1.1.1.tar.gz sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 9a74350b2c..0d906f1b62 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = 1.0.3 +JANUS_GATEWAY_VERSION = 1.1.1 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION)) JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception JANUS_GATEWAY_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 6 13:22:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:22:38 +0100 Subject: [Buildroot] [git commit branch/next] package/lua: properly handle legacy for removed version Message-ID: <20230220205249.A75AF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f461543d9c0f8ea1586004e51561ba0a37b8aecf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "297613f1c7 package/lua: remove 5.2.x version" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2019.02, following the example described in the beginning of the file. Cc: Francois Perrad Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- package/lua/Config.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 73d8ab4ca7..22d7fbe4be 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2224,9 +2224,9 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD config BR2_PACKAGE_LUA_5_2 bool "Lua 5.2.x version removed" select BR2_LEGACY - select BR2_PACKAGE_LUA_5_3 help The Lua 5.2.x version was removed. +# Note: BR2_PACKAGE_LUA_5_2 is still referenced from package/lua/Config.in config BR2_TARGET_GENERIC_PASSWD_MD5 bool "target passwd md5 format support has been removed" diff --git a/package/lua/Config.in b/package/lua/Config.in index 456f3b8c12..888c34b21d 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER choice prompt "Lua Version" + default BR2_PACKAGE_LUA_5_3 if BR2_PACKAGE_LUA_5_2 # legacy default BR2_PACKAGE_LUA_5_4 help Select the version of Lua API/ABI you wish to use. From peter at korsgaard.com Mon Feb 20 20:59:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:25 -0000 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.2 Message-ID: <20230220205226.97A2D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a16221834a0c7a8744f620c2cada751c693279d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.freedesktop.org/archives/mesa-dev/2022-December/225903.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 e5988cad5e..f6b3ade3ea 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 = 22.3.1 +MESA3D_HEADERS_VERSION = 22.3.2 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 613ebce89f..e902e6b828 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-December/000697.html -sha256 3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb mesa-22.3.1.tar.xz -sha512 8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b mesa-22.3.1.tar.xz +# From https://lists.freedesktop.org/archives/mesa-dev/2022-December/225903.html +sha256 c15df758a8795f53e57f2a228eb4593c22b16dffd9b38f83901f76cd9533140b mesa-22.3.2.tar.xz +sha512 32934dd23cfcd6165c365597d9a469da0b806b72ea98a200f499344c3b47815db3bf78875b4ea766d2d28d9c70b50c1615d2d3fcbfd4769447fe0a9d3b32951f mesa-22.3.2.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index b6f1214102..523b642d0c 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 = 22.3.1 +MESA3D_VERSION = 22.3.2 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From thomas.petazzoni at bootlin.com Mon Feb 6 21:10:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:10:57 +0100 Subject: [Buildroot] [git commit branch/next] Makefile: check-package should use the ignore list Message-ID: <20230220205250.94F468648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=394afb3c3b97ec4db28b19c27539c4d653f22e5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For now, we need to ignore a number of check-package warning checks. Signed-off-by: Thomas Petazzoni --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 49ee4ff119..4880b426b5 100644 --- a/Makefile +++ b/Makefile @@ -1257,7 +1257,8 @@ check-flake8: | xargs -- python3 -m flake8 --statistics check-package: - $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` + $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` \ + --ignore-list=$(TOPDIR)/.checkpackageignore .PHONY: .checkpackageignore .checkpackageignore: From peter at korsgaard.com Mon Feb 20 20:59:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:30 -0000 Subject: [Buildroot] [git commit branch/next] package/wireshark: add minizip-zlib optional dependency Message-ID: <20230220205227.01ACE8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8702cecb142e42c6fd522d8256732ec54bab1711 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next minizip-zlib is an optional dependency which is enabled by default since version 3.1.0 and https://github.com/wireshark/wireshark/commit/390071ed0bc8aaf378c3468989ccde1c93817542 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index f7fd72558e..c1efef2280 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -115,6 +115,13 @@ else WIRESHARK_CONF_OPTS += -DENABLE_LZ4=OFF endif +ifeq ($(BR2_PACKAGE_MINIZIP_ZLIB),y) +WIRESHARK_CONF_OPTS += -DENABLE_MINIZIP=ON +WIRESHARK_DEPENDENCIES += minizip-zlib +else +WIRESHARK_CONF_OPTS += -DENABLE_MINIZIP=OFF +endif + ifeq ($(BR2_PACKAGE_NGHTTP2),y) WIRESHARK_CONF_OPTS += -DENABLE_NGHTTP2=ON WIRESHARK_DEPENDENCIES += nghttp2 From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit branch/next] support/testing: test check-package ignore list Message-ID: <20230220205250.60DB381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d631615eb1b833977003039626a0194589334f45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Extend test_check_package to also check the ignore list functionality. Check: - the entries in the ignore list use relative path; - an entry in the ignore list actually ignores the warning; - an outdated entry in the ignore list generates a warning by its own, preventing the ignoring list to grow indefinitely. For this to work, add 3 test fixtures, listing entries for an pre-existing file in the br2-external used in the test. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .../tests/utils/br2-external/.checkpackageignore | 1 + .../utils/br2-external/package/.checkpackageignore | 1 + .../package/.checkpackageignore_outdated | 1 + support/testing/tests/utils/test_check_package.py | 31 ++++++++++++++++++++++ 4 files changed, 34 insertions(+) diff --git a/support/testing/tests/utils/br2-external/.checkpackageignore b/support/testing/tests/utils/br2-external/.checkpackageignore new file mode 100644 index 0000000000..efb7680173 --- /dev/null +++ b/support/testing/tests/utils/br2-external/.checkpackageignore @@ -0,0 +1 @@ +package/external/external.mk PackageHeader diff --git a/support/testing/tests/utils/br2-external/package/.checkpackageignore b/support/testing/tests/utils/br2-external/package/.checkpackageignore new file mode 100644 index 0000000000..5f4a5e1187 --- /dev/null +++ b/support/testing/tests/utils/br2-external/package/.checkpackageignore @@ -0,0 +1 @@ +external/external.mk PackageHeader diff --git a/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated b/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated new file mode 100644 index 0000000000..1df59f3bed --- /dev/null +++ b/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated @@ -0,0 +1 @@ +external/external.mk Indent NewlineAtEof PackageHeader diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index c70ba02324..ce1998753c 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -75,6 +75,12 @@ class TestCheckPackage(unittest.TestCase): generated = int(stderr[1].split()[0]) self.assertGreater(generated, 0) + def assert_no_warnings_generated_for_file(self, stderr): + """Infer from check-package stderr if no warning was generated and fail otherwise.""" + self.assertIn("warnings generated", stderr[1], stderr) + generated = int(stderr[1].split()[0]) + self.assertEqual(generated, 0) + def test_run(self): """Test the various ways the script can be called in a simple top to bottom sequence.""" @@ -201,3 +207,28 @@ class TestCheckPackage(unittest.TestCase): self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) + + # br2-external with ignore list + topdir_path = infra.filepath("tests/utils/br2-external") + topdir_file = os.path.join(topdir_path, "package/external/external.mk") + subdir_path = infra.filepath("tests/utils/br2-external/package") + subdir_file = os.path.join(subdir_path, "external/external.mk") + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore", "-b", topdir_file], + self.WITH_UTILS_IN_PATH, topdir_path) + self.assert_file_was_processed(m) + self.assert_no_warnings_generated_for_file(m) + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore", "-b", subdir_file], + self.WITH_UTILS_IN_PATH, subdir_path) + self.assert_file_was_processed(m) + self.assert_no_warnings_generated_for_file(m) + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore_outdated", "-b", subdir_file], + self.WITH_UTILS_IN_PATH, subdir_path) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: Indent was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + .format(subdir_file), w) + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + .format(subdir_file), w) From peter at korsgaard.com Mon Feb 20 20:59:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:31 -0000 Subject: [Buildroot] [git commit branch/next] package/ulogd: add libdbi support Message-ID: <20230220205227.3106E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b3dbd0183265c3f7da49b0b331688fb7573383f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ulogd/ulogd.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 65280a2ba6..561429599c 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -7,7 +7,6 @@ ULOGD_VERSION = 2.0.8 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files -ULOGD_CONF_OPTS = --disable-dbi ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ libnfnetlink @@ -17,6 +16,12 @@ ULOGD_SELINUX_MODULES = ulogd # DB backends need threads ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ifeq ($(BR2_PACKAGE_LIBDBI),y) +ULOGD_CONF_OPTS += --enable-dbi +ULOGD_DEPENDENCIES += libdbi +else +ULOGD_CONF_OPTS += --disable-dbi +endif ifeq ($(BR2_PACKAGE_MYSQL),y) ULOGD_CONF_OPTS += --enable-mysql ULOGD_DEPENDENCIES += mysql From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit branch/next] Makefile: add target to update .checkpackageignore Message-ID: <20230220205250.6AEAE8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd28acc1e8085c15d12e233090550580dafe1f96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When a developer fixes an ignored warning from check-package, he/she needs to update .checkpackageignore By running './utils/docker-run make check-package' the developer receives a warning about this. Make that change easier to make, by adding a helper target on Makefile. Add an option --failed-only to check-package that generates output in the format: [ ...] This is the very same format used by check-package ignore file. Add the phony target .checkpackageignore So one can update the ignore file using: $ ./utils/docker-run make .checkpackageignore Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- Makefile | 5 +++++ utils/check-package | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f39af5eae9..817cfed13c 100644 --- a/Makefile +++ b/Makefile @@ -1261,6 +1261,11 @@ check-package: -a -not -name '*.orig' -a -not -name '*.rej' \ -exec ./utils/check-package --exclude=Sob {} + +.PHONY: .checkpackageignore +.checkpackageignore: + find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ + -exec ./utils/check-package --exclude=Sob --failed-only {} > .checkpackageignore + + include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) diff --git a/utils/check-package b/utils/check-package index f08e76b374..848311bac8 100755 --- a/utils/check-package +++ b/utils/check-package @@ -63,11 +63,17 @@ def parse_args(): help="do not run the specified functions (debug)") parser.add_argument("--dry-run", action="store_true", help="print the " "functions that would be called for each file (debug)") + parser.add_argument("--failed-only", action="store_true", help="print only" + " the name of the functions that failed (debug)") flags = parser.parse_args() flags.ignore_list = get_ignored_parsers_per_file(flags.intree_only, flags.ignore_filename) + if flags.failed_only: + flags.dry_run = False + flags.verbose = -1 + return flags @@ -221,6 +227,11 @@ def check_file_using_lib(fname): .format(fname, should_fail, flags.ignore_filename)) nwarnings += 1 + if flags.failed_only: + if len(failed) > 0: + f = " ".join(sorted(failed)) + print("{} {}".format(fname, f)) + return nwarnings, nlines @@ -259,7 +270,7 @@ def __main__(): print("{} lines processed".format(total_lines), file=sys.stderr) print("{} warnings generated".format(total_warnings), file=sys.stderr) - if total_warnings > 0: + if total_warnings > 0 and not flags.failed_only: sys.exit(1) From peter at korsgaard.com Mon Feb 6 21:39:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 22:39:15 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: require FindBin perl package for libopenssl Message-ID: <20230220205250.C3FD67FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5aab8c59d5b310540105166e7b48faf3d5bd200b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/5d1/5d10f4f545dccf126e3f5b5efce777a393c5e7bc/ http://autobuild.buildroot.net/results/7c2/7c2df31c6eb34b68e460e092d8c262bdc6c8f25a/ The configure script of (host-)libopenssl needs the FindBin perl module on the host: Can't locate FindBin.pm in @INC (you may need to install the FindBin module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./Configure line 15. BEGIN failed--compilation aborted at ./Configure line 15. As this is needed for both libopenssl and host-libopenssl (which does not have a corresponding config symbol in the .config), we have to require it unconditionally. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 4b5012b807..afd30008e8 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -268,6 +268,7 @@ fi required_perl_modules="Data::Dumper" # Needed to build host-autoconf required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake +required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" From thomas.petazzoni at bootlin.com Mon Feb 20 20:59:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:59:32 -0000 Subject: [Buildroot] [git commit branch/next] package/libgpg-error: add configure option to install gpg-error-config Message-ID: <20230220205227.4F0EF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a22b009992883ad57553ffb3f194303f90ad1a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Upstream commit[1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff;h=0b47de9c719b0ed0da0791f0525de073737bde5a changed behaviour: "gpg-error-config is now only installed when enabled" Fixes: http://autobuild.buildroot.net/results/bc1/bc1566a0fa42f68f1f15f74a61d4081e269e1689/ [1] included in version 1.46, added in buildroot with commit b5bdcb4cc5 Signed-off-by: Bernd Kuhls Reviewed-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/libgpg-error/libgpg-error.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index ab3c7c3bf2..3f4a45a7e4 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -15,6 +15,7 @@ LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LIBGPG_ERROR_CONF_OPTS = \ --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) \ + --enable-install-gpg-error-config \ --disable-tests \ --disable-languages From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit branch/next] Makefile: make check-package assume a git tree Message-ID: <20230220205250.74FDF86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aeec8faf3189b5dde90c465a9b14897406b1fc08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next ... just like check-flake8 already does. When a new check_function is added to check-package, often there are files in the tree that would generate warnings. An example is the Sob check_function for patch files: | $ ./utils/check-package --i Sob $(git ls-files) >/dev/null | 369301 lines processed | 46 warnings generated Currently these warnings are listed when calling check-package directly, and also at the output of pkg-stats, but the check_function does not run on 'make check-package' (that is used to catch regressions on GitLab CI 'check-package' job) until all warnings in the tree are fixed. This (theoretically) allows new .patch files be added without SoB, without the GitLab CI catching it. Since now check-package has an ignore file to list all warnings in the tree, that will eventually be fixed, there is no need to filter the files passed to check-package. So test all files in the tree when 'make check-package' is called. It brings following advantages; - any new check_function added to check-package takes place immediately for new files; - adding new check_functions is less traumatic to the developer doing this, since he/she does not need anymore to fix all warnings in the tree before the new check_function takes effect; - prevent regressions, e.g. ANY new .patch file must have SoB; - as a side-effect, print a single statistics line as output of 'make ckeck-package'. But just enabling the check would generate many warnings when 'make check-package' is called, so update the ignore file by using: $ ./utils/docker-run make .checkpackageignore Notice: in order to ensure reproducible results, one should run 'make check-package' and 'make .checkpackageignore' inside the docker image, otherwise a variation in shellcheck version (installed in the host) can produce different results. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 8 +-- 2 files changed, 183 insertions(+), 5 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index e69de29bb2..b1f2d99b99 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -0,0 +1,180 @@ +package/alsamixergui/0001-misc-fixes.patch Sob +package/am33x-cm3/S93-am335x-pm-firmware-load Variables +package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch Sob +package/apache/S50apache Indent Shellcheck Variables +package/at/S99at Indent Variables +package/audit/S02auditd Shellcheck Variables +package/avahi/S05avahi-setup.sh Indent Variables +package/avahi/S50avahi-daemon Indent Variables +package/babeld/S50babeld Indent Shellcheck Variables +package/bind/S81named Indent Shellcheck Variables +package/bluez5_utils/S40bluetooth NotExecutable Variables +package/boinc/S99boinc-client Indent Shellcheck Variables +package/brickd/S70brickd Indent Shellcheck Variables +package/brltty/S10brltty Indent Shellcheck Variables +package/busybox/S02sysctl Variables +package/busybox/S10mdev ConsecutiveEmptyLines Indent Shellcheck +package/busybox/S15watchdog Indent Variables +package/busybox/S50telnet Indent Shellcheck Variables +package/c-icap/S96cicap Indent Shellcheck Variables +package/cfm/S65cfm Indent Variables +package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables +package/chrony/S49chrony Indent Shellcheck Variables +package/connman/S45connman Variables +package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob +package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob +package/curlftpfs/0003-nocache-memleak-fix.patch Sob +package/dante/S50dante Indent Shellcheck Variables +package/darkhttpd/S50darkhttpd Indent Shellcheck Variables +package/dbus/S30dbus Indent Shellcheck TrailingSpace Variables +package/dcron/S90dcron Variables +package/dhcp/S80dhcp-relay Shellcheck Variables +package/dhcp/S80dhcp-server Shellcheck Variables +package/dhcpcd/S41dhcpcd Indent Variables +package/dhrystone/0001-cmdline-nruns.patch Sob +package/dhrystone/0002-HZ.patch Sob +package/dhrystone/0003-exit.patch Sob +package/dhrystone/0004-headers.patch Sob +package/dhrystone/0005-prototypes.patch Sob +package/directfb-examples/0001-remove-bzero.patch Sob +package/dmraid/S20dmraid Variables +package/dnsmasq/S80dnsmasq Shellcheck Variables +package/docker-engine/S60dockerd Indent Shellcheck Variables +package/domoticz/S99domoticz Shellcheck +package/dropbear/S50dropbear Indent Shellcheck Variables +package/earlyoom/S02earlyoom Indent Shellcheck +package/ejabberd/S50ejabberd Indent Shellcheck Variables +package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables +package/exim/S86exim Indent Variables +package/fail2ban/S60fail2ban Shellcheck Variables +package/fbv/0001-cross.patch Sob +package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob +package/fbv/0005-include.patch Sob +package/freescale-imx/imx-uuc/S80imx-uuc Indent Shellcheck Variables +package/frr/S50frr Shellcheck +package/gamin/0002-no-const-return.patch Sob +package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch Sob +package/genromfs/0001-build-system.patch Sob +package/gerbera/S99gerbera Indent +package/gpsd/S50gpsd Indent Shellcheck Variables +package/haveged/S21haveged Shellcheck Variables +package/htpdate/S43htpdate Shellcheck +package/i2pd/S99i2pd Indent Shellcheck Variables +package/ifplugd/0001-cross.patch Sob +package/ifplugd/0002-fix-headers.patch Sob +package/ifupdown-scripts/S40network EmptyLastLine Indent Shellcheck Variables +package/igd2-for-linux/S99upnpd Indent Shellcheck Variables +package/inadyn/S70inadyn Indent NotExecutable +package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Variables +package/iptables/S35iptables Shellcheck +package/irda-utils/0001-daemon.patch Sob +package/irda-utils/0002-nommu.patch Sob +package/irda-utils/0003-subdir.patch Sob +package/irqbalance/S13irqbalance Indent Shellcheck Variables +package/iucode-tool/S00iucode-tool Variables +package/iwd/S40iwd Shellcheck Variables +package/keyutils/0002-cifs.patch Sob +package/kodi/S50kodi Shellcheck Variables +package/libart/0001-art-config-cross.patch Sob +package/libcgicc/0001-disable-documentation-option.patch Sob +package/libfcgi/0002-disable-examples.patch Sob +package/libftdi/0001-pkgconfig_libusb.patch Sob +package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch Sob +package/libiio/S99iiod Shellcheck Variables +package/libmad/0001-mips-h-constraint-removal.patch Sob +package/lighttpd/S50lighttpd EmptyLastLine Indent Shellcheck Variables +package/linux-tools/S10hyperv Indent Variables +package/linuxptp/S65ptp4l Indent Shellcheck +package/linuxptp/S66phc2sys Indent Shellcheck +package/lirc-tools/S25lircd Indent Variables +package/lite/0001-dfbspy-stat.patch Sob +package/lite/0002-no-tests.patch Sob +package/lite/0003-pkg-config.patch Sob +package/lldpd/S60lldpd Indent Shellcheck Variables +package/lockfile-progs/0001-sus3v-legacy.patch Sob +package/madplay/0001-switch-to-new-alsa-api.patch Sob +package/mariadb/S97mysqld Indent Shellcheck Variables +package/mender-connect/S43mender-connect Shellcheck +package/mii-diag/0001-strchr.patch Sob +package/minidlna/S60minidlnad Indent Shellcheck Variables +package/minissdpd/S50minissdpd Indent Shellcheck Variables +package/modem-manager/S44modem-manager Shellcheck Variables +package/mosquitto/S50mosquitto Indent Shellcheck Variables +package/motion/S99motion Indent Shellcheck Variables +package/mpd/S95mpd Variables +package/mrouted/S41mrouted NotExecutable +package/mrp/S65mrp Indent Variables +package/multipath-tools/S60multipathd Shellcheck +package/neard/S53neard Indent Shellcheck Variables +package/netatalk/S50netatalk EmptyLastLine Indent Variables +package/netcat/0001-signed-bit-counting.patch Sob +package/netopeer2/S52netopeer2 Shellcheck Variables +package/netplug/0001-makefile-flags.patch Sob +package/netplug/S29netplug Indent Shellcheck Variables +package/netsnmp/S59snmpd Indent Shellcheck Variables +package/network-manager/S45network-manager ConsecutiveEmptyLines EmptyLastLine Shellcheck Variables +package/nfs-utils/S60nfs ConsecutiveEmptyLines Shellcheck Variables +package/nginx/S50nginx Indent Variables +package/nodm/S90nodm Indent Shellcheck Variables +package/nss-pam-ldapd/S45nslcd EmptyLastLine Indent Shellcheck Variables +package/ntp/S49ntp.in Variables +package/ofono/S46ofono Variables +package/olsr/S50olsr Indent Shellcheck Variables +package/openntpd/S49ntp Shellcheck Variables +package/openssh/S50sshd EmptyLastLine Indent Variables +package/openvpn/S60openvpn Indent Shellcheck Variables +package/oracle-mysql/S97mysqld Shellcheck Variables +package/owfs/S55owserver Shellcheck Variables +package/owfs/S60owfs Shellcheck Variables +package/pigpio/S50pigpio Shellcheck Variables +package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob +package/postgresql/S50postgresql Variables +package/procps-ng/S02sysctl Variables +package/proftpd/S50proftpd Indent Shellcheck Variables +package/prosody/S50prosody Indent Shellcheck Variables +package/ptpd/S65ptpd Indent Shellcheck Variables +package/ptpd2/S65ptpd2 Indent Shellcheck Variables +package/pulseaudio/S50pulseaudio ConsecutiveEmptyLines EmptyLastLine Indent Variables +package/python-web2py/S51web2py Shellcheck Variables +package/rdesktop/0001-8bit-colors.patch Sob +package/redis/S50redis Shellcheck Variables +package/restorecond/S02restorecond Shellcheck +package/rng-tools/S21rngd Shellcheck Variables +package/rpcbind/S30rpcbind EmptyLastLine Indent Variables +package/rubix/0002-misc-fixes.patch Sob +package/rygel/S99rygel Indent Shellcheck Variables +package/samba4/S91smb Indent Shellcheck Variables +package/seatd/S70seatd NotExecutable Variables +package/ser2net/S50ser2net Indent Shellcheck Variables +package/shairport-sync/S99shairport-sync Indent Shellcheck Variables +package/smcroute/S41smcroute Indent NotExecutable Variables +package/smstools3/S50smsd Shellcheck Variables +package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch Sob +package/squid/S97squid Indent Shellcheck Variables +package/sshguard/S49sshguard Indent +package/sslh/S35sslh Indent Shellcheck Variables +package/stunnel/S50stunnel Indent Shellcheck Variables +package/supervisor/S99supervisord Variables +package/suricata/S99suricata Shellcheck +package/sysrepo/S51sysrepo-plugind Indent Shellcheck +package/targetcli-fb/S50target Shellcheck Variables +package/tcf-agent/S55tcf-agent Shellcheck Variables +package/tftpd/S80tftpd-hpa Indent Shellcheck Variables +package/ti-gfx/S80ti-gfx Shellcheck Variables +package/ti-sgx-um/S80ti-sgx Variables +package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables +package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables +package/triggerhappy/S10triggerhappy Indent Shellcheck Variables +package/tvheadend/S99tvheadend Indent Shellcheck Variables +package/unbound/S70unbound Shellcheck +package/unscd/S46unscd Indent Shellcheck Variables +package/upmpdcli/S99upmpdcli Indent Shellcheck Variables +package/urandom-scripts/S20urandom Variables +package/usbguard/S20usbguard Indent Shellcheck Variables +package/vsftpd/S70vsftpd Indent Shellcheck Variables +package/watchdogd/S01watchdogd Indent NotExecutable +package/x11r7/xapp_xdm/S99xdm Indent Variables +package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob +package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob +package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob +package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables diff --git a/Makefile b/Makefile index 817cfed13c..49ee4ff119 100644 --- a/Makefile +++ b/Makefile @@ -1257,14 +1257,12 @@ check-flake8: | xargs -- python3 -m flake8 --statistics check-package: - find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ - -a -not -name '*.orig' -a -not -name '*.rej' \ - -exec ./utils/check-package --exclude=Sob {} + + $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` .PHONY: .checkpackageignore .checkpackageignore: - find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ - -exec ./utils/check-package --exclude=Sob --failed-only {} > .checkpackageignore + + $(Q)./utils/check-package --failed-only `git ls-tree -r --name-only HEAD` \ + > .checkpackageignore include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) From peter at korsgaard.com Mon Feb 20 20:59:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:33 -0000 Subject: [Buildroot] [git commit branch/next] package/wireshark: bump to version 4.0.2 Message-ID: <20230220205227.215328648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4aca99f51cc97cfc3bcd3affa65f4694004dd444 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - pcre2 is mandatory since version 3.7.0 and https://github.com/wireshark/wireshark/commit/b9f2e4b7fa091719b93f6256ac34be8e32bd8e94 - Set HAVE_C99_VSNPRINTF to avoid a build failure due to check_c_source_runs - DISABLE_WERROR was renamed to ENABLE_WERROR 4.x series is the new stable release https://www.wireshark.org/news/20221207.html https://www.wireshark.org/docs/relnotes/wireshark-4.0.2.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/Config.in | 1 + package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in index cd92beb1d1..8b05599ecb 100644 --- a/package/wireshark/Config.in +++ b/package/wireshark/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_WIRESHARK select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_SPEEXDSP help Network traffic sniffer and protocol decoder. diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 56363e717f..ae06ab09b7 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.16.txt -sha1 b0e64d5fdd6701106d94bdc8f59dd40a34c7c807 wireshark-3.4.16.tar.xz -sha256 6acb3155b89b65bcdbcdac7a9e6a59013a6e21d8ae6a8249a9af4fe9ce3d91ba wireshark-3.4.16.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.2.txt +sha1 0127180ff18515b086fe5603f767f53ddaa64c1a wireshark-4.0.2.tar.xz +sha256 f35915699f2f9b28ddb211202d40ec8984e5834d3c911483144a4984ba44411d wireshark-4.0.2.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index d9314fb211..ee3d6b1905 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.16 +WIRESHARK_VERSION = 4.0.2 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license @@ -18,13 +18,15 @@ WIRESHARK_DEPENDENCIES = \ libgcrypt \ libglib2 \ libpcap \ + pcre2 \ speexdsp WIRESHARK_CONF_OPTS = \ - -DDISABLE_WERROR=ON \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ + -DENABLE_WERROR=OFF \ + -DHAVE_C99_VSNPRINTF=ON \ -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) From thomas.petazzoni at bootlin.com Mon Feb 6 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit branch/next] fs/cpio: allow users to provide their own dracut modules Message-ID: <20230220205250.DC17386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb6e466c102306cfcb1b459d91aa5440f6b8a621 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Dracut modules can only be looked for in HOST_DIR/lib/dracut/modules.d/ as dracut does not offer the possibility to look elsewhere. Installing files in HOST_DIR/ can do done either from a host-package, or via a post-built script; there is no overlay like there is for target/. This is a bit cumbersome. Additional modules are most probably developped in a relatively tight loop with the configuration files, so it makes sense to expose both close together. Add an option to the fs/cpio filesystem, so users can point to a list of modules to install. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Thierry Bultel Cc: Adam Duskett Signed-off-by: Thomas Petazzoni --- fs/cpio/Config.in | 5 +++++ fs/cpio/cpio.mk | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in index bec2d9dca2..4d38276c88 100644 --- a/fs/cpio/Config.in +++ b/fs/cpio/Config.in @@ -29,6 +29,11 @@ endchoice if BR2_TARGET_ROOTFS_CPIO_DRACUT +config BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES + string "extra dracut modules" + help + Space-separated list of directories containing dracut modules. + config BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES string "dracut configuration files" default "fs/cpio/dracut.conf" diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk index 061f4a18f1..00ab6a8f82 100644 --- a/fs/cpio/cpio.mk +++ b/fs/cpio/cpio.mk @@ -50,6 +50,13 @@ else ifeq ($(BR2_TARGET_ROOTFS_CPIO_DRACUT),y) ROOTFS_CPIO_DEPENDENCIES += host-dracut +ROOTFS_CPIO_DRACUT_MODULES = $(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES)) +ifeq ($(BR_BUILDING),y) +ifneq ($(words $(ROOTFS_CPIO_DRACUT_MODULES)),$(words $(sort $(notdir $(ROOTFS_CPIO_DRACUT_MODULES))))) +$(error No two dracut modules can have the same basename, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES setting) +endif +endif + ROOTFS_CPIO_DRACUT_CONF_FILES = $(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES)) ifeq ($(BR_BUILDING),y) ifeq ($(ROOTFS_CPIO_DRACUT_CONF_FILES),) @@ -68,11 +75,14 @@ ROOTFS_CPIO_OPTS += --no-kernel endif define ROOTFS_CPIO_CMD - mkdir -p $(ROOTFS_CPIO_DIR)/tmp $(ROOTFS_CPIO_DIR)/confdir + mkdir -p $(ROOTFS_CPIO_DIR)/tmp $(ROOTFS_CPIO_DIR)/confdir $(HOST_DIR)/lib/dracut/modules.d touch $(ROOTFS_CPIO_DIR)/empty-config $(foreach cfg,$(ROOTFS_CPIO_DRACUT_CONF_FILES), \ cp $(cfg) $(ROOTFS_CPIO_DIR)/confdir/$(notdir $(cfg)) ) + $(foreach m,$(ROOTFS_CPIO_DRACUT_MODULES), \ + cp -a $(m)/* $(HOST_DIR)/lib/dracut/modules.d/ + ) $(HOST_DIR)/bin/dracut \ $(ROOTFS_CPIO_OPTS) \ -c $(ROOTFS_CPIO_DIR)/empty-config \ From peter at korsgaard.com Mon Feb 20 20:59:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:34 -0000 Subject: [Buildroot] [git commit branch/next] package/libnss: bump version to 3.87 Message-ID: <20230220205227.5DB8E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c8eefa6a4e2a40ee9b832d5f1e71bf4ddfd9f1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 50c5e583af..f847ec4f77 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_86_RTM/src/SHA256SUMS -sha256 3f385fc686476bbba811035fa6821b542475d55747b18c20c221d4d66573b975 nss-3.86.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_87_RTM/src/SHA256SUMS +sha256 68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d nss-3.87.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index cee0e596a1..90fd9259d5 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.86 +LIBNSS_VERSION = 3.87 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 peter at korsgaard.com Mon Feb 6 22:32:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 23:32:13 +0100 Subject: [Buildroot] [git commit branch/next] package/libcamera: bump to version 0.0.4 Message-ID: <20230220205251.1685E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce3d349384f4d80ed8fc50a82ff864bd5bcf6375 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcus Folkesson Reviewed-by: Quentin Schulz Signed-off-by: Peter Korsgaard --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 033e318910..ea204aee98 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 d7100286616550aca487b46ae9de2a70bb471352a332b8214901b4148739990f libcamera-v0.0.3-br1.tar.gz +sha256 13e53b33652b16454264b6eff0a6f032aa9331f919b07b6d0e622917ed7f7dd8 libcamera-v0.0.4-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 8979a43aca..01c4cb2ff2 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = v0.0.3 +LIBCAMERA_VERSION = v0.0.4 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ From peter at korsgaard.com Mon Feb 20 20:59:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:35 -0000 Subject: [Buildroot] [git commit branch/next] package/fmlib: bump to version LSDK-21.08 Message-ID: <20230220205227.6FBD38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b68271287d470f4dfeab074a1222da869328f4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next License file was updated in commit: https://github.com/nxp-qoriq/fmlib/commit/22126510006f366981c078a340e012a1e0415429 Notable changes in the license update are: - GPL-2.0+ option was removed, - Copyright years updated, - NXP was added, - License text was reflowed. Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/fmlib/fmlib.hash | 4 ++-- package/fmlib/fmlib.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/fmlib/fmlib.hash b/package/fmlib/fmlib.hash index d4dcf3be5c..f81b017869 100644 --- a/package/fmlib/fmlib.hash +++ b/package/fmlib/fmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6e9e6bdb42dc2a6a76cfd756a2d4cdfcc2be90925c1f439e8a11eafa871896a6 fmlib-43fa98fdbf0c697167e415c3f060896d5b482791.tar.gz -sha256 837559e20d83910a005e7883b876cc5c42805fe4abcf7e5c5b3c8d036b7f61c8 COPYING +sha256 64dc76c0adc3aa58bce6aba470dee7dee001d4964ccb1958e899a59d9917b21d fmlib-LSDK-21.08.tar.gz +sha256 5d7770fa9f70f0c6f0b4784bbca8401811259a4b1e03455dbd863ffd0d34d2ca COPYING diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk index 9509f3de56..3d185979d5 100644 --- a/package/fmlib/fmlib.mk +++ b/package/fmlib/fmlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -FMLIB_VERSION = 43fa98fdbf0c697167e415c3f060896d5b482791 +FMLIB_VERSION = LSDK-21.08 FMLIB_SITE = $(call github,nxp-qoriq,fmlib,$(FMLIB_VERSION)) -FMLIB_LICENSE = BSD-3-Clause, GPL-2.0+ +FMLIB_LICENSE = BSD-3-Clause FMLIB_LICENSE_FILES = COPYING FMLIB_DEPENDENCIES = linux FMLIB_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Tue Feb 7 08:31:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:31:41 +0100 Subject: [Buildroot] [git commit branch/next] support/tests: allow top-level parallel builds Message-ID: <20230220205251.34CAC8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c41fb6225632ecea0b7008969bb70cf8e2636ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Running tests with top-level parallel builds can speed up running some tests, expecially those that have a lot of packages like the systemd init tests. Trigger TLPB when the configuration enables per-package directories. We're using the jlevel argument, which normally is used for BR2_JLEVEL as the value for calling make -j at the top-level. In fact, BR2_JLEVEL is "unused" when using TLPB, because the top-level make acts as the job server that distributes tokens to sub-makes (except for the few build systems like waf or scons that don't support this), so it's really the top-level make -j that determines the level of parallelism, and BR2_JLEVEL doesn't really have an effect. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni [Thomas: extend explanation a bit] Signed-off-by: Thomas Petazzoni --- support/testing/infra/basetest.py | 2 +- support/testing/infra/builder.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 45bcd4c2e2..670c7213d6 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -52,7 +52,7 @@ class BRConfigTest(unittest.TestCase): def setUp(self): self.show_msg("Starting") - self.b = Builder(self.config, self.builddir, self.logtofile) + self.b = Builder(self.config, self.builddir, self.logtofile, self.jlevel) if not self.keepbuilds: self.b.delete() diff --git a/support/testing/infra/builder.py b/support/testing/infra/builder.py index 922a707220..a2abb9ed89 100644 --- a/support/testing/infra/builder.py +++ b/support/testing/infra/builder.py @@ -6,11 +6,12 @@ import infra class Builder(object): - def __init__(self, config, builddir, logtofile): + def __init__(self, config, builddir, logtofile, jlevel=None): self.config = '\n'.join([line.lstrip() for line in config.splitlines()]) + '\n' self.builddir = builddir self.logfile = infra.open_log_file(builddir, "build", logtofile) + self.jlevel = jlevel def is_defconfig_valid(self, configfile, defconfig): """Check if the .config is contains all lines present in the defconfig.""" @@ -87,6 +88,8 @@ class Builder(object): env.update(make_extra_env) cmd = ["make", "-C", self.builddir] + if "BR2_PER_PACKAGE_DIRECTORIES=y" in self.config.splitlines() and self.jlevel: + cmd.append(f"-j{self.jlevel}") cmd += make_extra_opts ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, From peter at korsgaard.com Mon Feb 20 20:59:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:36 -0000 Subject: [Buildroot] [git commit branch/next] package/fmc: bump to version LSDK-21.08 Message-ID: <20230220205227.80D30828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c943cb38e4174cd349b4bb80e5e16269b25079d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This commit also updates the sed pattern, as the default platform was changed in: https://github.com/nxp-qoriq/fmc/commit/4377bfc24626a0db3bedb6e1cbb201f6f6df964c Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/fmc/fmc.hash | 2 +- package/fmc/fmc.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fmc/fmc.hash b/package/fmc/fmc.hash index 7309562b09..961ce18ac7 100644 --- a/package/fmc/fmc.hash +++ b/package/fmc/fmc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e8594e37eb81e5b1f492f8494b98086f65180637b1e2e08d8a4475c23653a404 fmc-a079d2c844edd85dff85a317a63198e7988bcd09.tar.gz +sha256 a58514816108a16d07307f924ebceb67c7d61709e4449978763fc44ed6e1fc44 fmc-LSDK-21.08.tar.gz sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 COPYING diff --git a/package/fmc/fmc.mk b/package/fmc/fmc.mk index 6ac8c768df..4f25545ffd 100644 --- a/package/fmc/fmc.mk +++ b/package/fmc/fmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMC_VERSION = a079d2c844edd85dff85a317a63198e7988bcd09 +FMC_VERSION = LSDK-21.08 FMC_SITE = $(call github,nxp-qoriq,fmc,$(FMC_VERSION)) FMC_LICENSE = MIT FMC_LICENSE_FILES = COPYING @@ -26,7 +26,7 @@ endif FMC_PLATFORM = $(call qstrip,$(BR2_PACKAGE_FMLIB_PLATFORM)) define FMC_BUILD_CMDS - $(SED) "s:P4080:$(FMC_PLATFORM):g" $(@D)/source/Makefile + $(SED) "s:LS1043:$(FMC_PLATFORM):g" $(@D)/source/Makefile # The linking step has dependency issues so using MAKE1 $(TARGET_MAKE_ENV) $(MAKE1) $(FMC_MAKE_OPTS) -C $(@D)/source endef From thomas.petazzoni at bootlin.com Tue Feb 7 09:05:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:05:19 +0100 Subject: [Buildroot] [git commit branch/next] configs/beaglebone: bump U-Boot version to 2022.10 Message-ID: <20230220205251.5D7D78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=588ccf38618e1d9401f6636c7565424d438a51b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Starting from version 2021.10 only distro booting is supported, as reported by commit ff8f277e9121 ("ti: am335x_evm: Switch to DISTRO_BOOT only"). The patch allows to update U-Boot to versions later than 2021.10. Tested on beaglebone black. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- board/beaglebone/extlinux.conf | 4 ++++ board/beaglebone/genimage.cfg | 1 + board/beaglebone/post-build.sh | 2 ++ configs/beaglebone_defconfig | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/board/beaglebone/extlinux.conf b/board/beaglebone/extlinux.conf new file mode 100644 index 0000000000..13affcabd4 --- /dev/null +++ b/board/beaglebone/extlinux.conf @@ -0,0 +1,4 @@ +label beaglebone-buildroot + kernel /zImage + fdtdir / + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index 987d205075..4b026fda84 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -12,6 +12,7 @@ image boot.vfat { "am335x-bonegreen.dtb", "am335x-boneblack-wireless.dtb", "am335x-bonegreen-wireless.dtb", + "extlinux" } } diff --git a/board/beaglebone/post-build.sh b/board/beaglebone/post-build.sh index ffdd19138c..b7afd92ffe 100755 --- a/board/beaglebone/post-build.sh +++ b/board/beaglebone/post-build.sh @@ -2,3 +2,5 @@ BOARD_DIR="$(dirname $0)" cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 3ce5721265..d0aa5ad860 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -34,7 +34,7 @@ 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="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set From peter at korsgaard.com Mon Feb 20 20:59:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:37 -0000 Subject: [Buildroot] [git commit branch/next] configs/sipeed_lichee_rv_defconfig: use OpenSBI 1.2 Message-ID: <20230220205227.A8C38828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f9a31bb8ce5567c8b3a59e50c44302f69788e02 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- configs/sipeed_lichee_rv_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sipeed_lichee_rv_defconfig b/configs/sipeed_lichee_rv_defconfig index f03a6b4f69..750d2d6e3b 100644 --- a/configs/sipeed_lichee_rv_defconfig +++ b/configs/sipeed_lichee_rv_defconfig @@ -15,7 +15,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y From thomas.petazzoni at bootlin.com Tue Feb 7 09:05:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 10:05:19 +0100 Subject: [Buildroot] [git commit branch/next] configs/beaglebone: bump Linux version to 5.10.162-ti-r56 Message-ID: <20230220205251.52EB586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=010de6d5c7e2ebafe08234e32818bc0db2ebc569 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The previous version failed to boot from sd card with a log reported by the document [1]. In my case it always failed, a 100% failure against 75% reported by the document. Instead of adding the patch to fix the problem, I preferred to update the kernel version. Tested on beaglebone black. [1] https://forum.beagleboard.org/t/5-10-x-beaglebone-black-fails-to-boot-from-sd-card/33297 Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- configs/beaglebone_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 639b491e97..3ce5721265 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.162-ti-r56)/linux-5.10.162-ti-r56.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" From peter at korsgaard.com Mon Feb 20 20:59:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:38 -0000 Subject: [Buildroot] [git commit branch/next] package/qemu: pixman only used for system emulation Message-ID: <20230220205227.907E68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0a428f135e1b220f8fc6043a7a1b8067f3bb8e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When we initially introduced the target qemu in 98e1a6b9619c (package/qemu: build for the target (i386 or x86_64 only)), we unconditionally enabled all the system and user emulation without distinction, so pixman was made a mandatory dependency. However, soon afterwards, in 68ec49acc7be (package/qemu: add basic target selection), we added an option to enable/disable the system emulation, but the dependency on pixman was not moved to that new option. Fix that now, and only depend on pixman when system emulation is enabled. Signed-off-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- package/qemu/Config.in | 2 +- package/qemu/qemu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 2bbc6a14c0..154b98a541 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -25,7 +25,6 @@ menuconfig BR2_PACKAGE_QEMU depends on BR2_USE_WCHAR # gettext depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_ZLIB select BR2_PACKAGE_QEMU_TOOLS if !BR2_PACKAGE_QEMU_SYSTEM && !BR2_PACKAGE_QEMU_LINUX_USER help @@ -53,6 +52,7 @@ comment "Emulators selection" config BR2_PACKAGE_QEMU_SYSTEM bool "Enable systems emulation" depends on !BR2_STATIC_LIBS # dtc + select BR2_PACKAGE_PIXMAN help Say 'y' to build system emulators/virtualisers. diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 5c7a8d504c..58b4ff10a5 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -27,7 +27,6 @@ QEMU_DEPENDENCIES = \ host-pkgconf \ host-python3 \ libglib2 \ - pixman \ zlib # Need the LIBS variable because librt and libm are @@ -45,6 +44,7 @@ QEMU_VARS = LIBTOOL=$(HOST_DIR)/bin/libtool # checks if the specified sub-set is valid. ifeq ($(BR2_PACKAGE_QEMU_SYSTEM),y) +QEMU_DEPENDENCIES += pixman QEMU_OPTS += --enable-system QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64) += aarch64-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ALPHA) += alpha-softmmu From peter at korsgaard.com Tue Feb 7 09:06:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 10:06:28 +0100 Subject: [Buildroot] [git commit branch/next] support/testing: test_check_package.py: fix flake8 line length error Message-ID: <20230220205251.67D6E86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63da115085ca0cb369ab3c644200ba4b025da48b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit d631615eb1b8 (support/testing: test check-package ignore list) added a too long line causing the check-flake8 target to fail: support/testing/tests/utils/test_check_package.py:233:133: E501 line too long (138 > 132 characters) https://gitlab.com/buildroot.org/buildroot/-/jobs/3726245521 Signed-off-by: Peter Korsgaard --- support/testing/tests/utils/test_check_package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index ce1998753c..580ad56d42 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -230,5 +230,6 @@ class TestCheckPackage(unittest.TestCase): self.assert_warnings_generated_for_file(m) self.assertIn("{}:0: Indent was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" .format(subdir_file), w) - self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update " + ".checkpackageignore_outdated?" .format(subdir_file), w) From peter at korsgaard.com Mon Feb 20 20:59:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:40 -0000 Subject: [Buildroot] [git commit branch/next] configs/sipeed_lichee_rv_dock_defconfig: use OpenSBI 1.2 Message-ID: <20230220205227.B80A286496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1d22c7331d5888c4d1bac0504e35862d72829fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard Reviewed-by: Julien Olivain Tested-by: Julien Olivain Signed-off-by: Peter Korsgaard --- configs/sipeed_lichee_rv_dock_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sipeed_lichee_rv_dock_defconfig b/configs/sipeed_lichee_rv_dock_defconfig index 807209eeec..a228cd8cb7 100644 --- a/configs/sipeed_lichee_rv_dock_defconfig +++ b/configs/sipeed_lichee_rv_dock_defconfig @@ -23,7 +23,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y From thomas.petazzoni at bootlin.com Mon Feb 6 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit branch/next] package/mesa3d-demos: bump version to 8.5.0 Message-ID: <20230220205250.F18238648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa75c4a3054e0cd3457f9e50deb1b9c06325c242 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The package build system changed from autotools to meson. Autotools was deprecated in commit [1], which is included in this 8.5.0 version. It was definitevely removed soon after, in commit [2]. The package patch file making libgl optional was fully rewritten for meson. This patch also updates the old ftp _SITE url to the new https one, published in the project README.rst file. See [3]. This patch also removes openvg and freetype2 dependencies, as their support was removed in commit [4]. The 'gbm' option is removed, and the option 'libdrm' is added. The md5 and sha1 entries in hash files are also removed, to keep only sha256 and sha512 from the release announce email [5]. For change log, see the release announce [5]. [1] https://gitlab.freedesktop.org/mesa/demos/-/commit/2df8e9710834c3b42ce5cfb67b7662c110ab904e [2] https://gitlab.freedesktop.org/mesa/demos/-/commit/abfead37587f1f2e124bdfcde755b6e90421b538 [3] https://gitlab.freedesktop.org/mesa/demos/-/blob/mesa-demos-8.5.0/README.rst [4] https://gitlab.freedesktop.org/mesa/demos/-/commit/e6d0d9a8682c544870fd41983ea2e0484b9767b1 [5] https://lists.freedesktop.org/archives/mesa-announce/2022-May/000677.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...-demos-makes-opengl-an-optional-component.patch | 157 +++++++++++---------- package/mesa3d-demos/mesa3d-demos.hash | 8 +- package/mesa3d-demos/mesa3d-demos.mk | 56 ++++---- 3 files changed, 112 insertions(+), 109 deletions(-) diff --git a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch index b328fca810..e51b6f1a2a 100644 --- a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch +++ b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch @@ -1,88 +1,101 @@ -From bb0ffae7164d296d32da24fa5499534de259169a Mon Sep 17 00:00:00 2001 -From: Spenser Gilliland -Date: Sat, 24 Feb 2018 11:36:17 +0100 +From 9ec9f7b4d0ef5e799ca4cc5103163e4630d184d8 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 16 Sep 2022 22:30:59 +0200 Subject: [PATCH] demos: makes opengl an optional component -Signed-off-by: Spenser Gilliland -[Romain: convert to git patch, rebase on 8.4.0] -Signed-off-by: Romain Naour +This patch is a port of [1] for the new meson build system. + +[1]. +https://git.busybox.net/buildroot/tree/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch?h=2022.08 + +Signed-off-by: Julien Olivain --- - configure.ac | 12 +++++++++++- - src/egl/opengl/Makefile.am | 2 ++ - src/util/Makefile.am | 2 ++ - 3 files changed, 15 insertions(+), 1 deletion(-) + meson.build | 19 ++++++++++++------- + meson_options.txt | 1 + + src/egl/meson.build | 5 ++++- + src/meson.build | 4 +++- + 4 files changed, 20 insertions(+), 9 deletions(-) -diff --git a/configure.ac b/configure.ac -index 0b5e9a76..24298c44 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -51,6 +51,14 @@ m4_ifndef([PKG_PROG_PKG_CONFIG], - ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])]) - PKG_PROG_PKG_CONFIG() +diff --git a/meson.build b/meson.build +index e1968fab..a15699d6 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,7 +38,10 @@ add_project_arguments( + dep_m = cc.find_library('m', required : false) + dep_winmm = cc.find_library('winmm', required : false) -+AC_ARG_ENABLE([gl], -+ [AS_HELP_STRING([--enable-gl], -+ [enable GL library @<:@default=no@:>@])], -+ [gl_enabled="$enableval"], -+ [gl_enabled=auto]) -+ -+if test "x$gl_enabled" != "xno"; then -+ - dnl Get the pkg-config definitions for libGL. We include a fallback - dnl path for GL implementation that don't provide a .pc file - PKG_CHECK_MODULES(GL, [gl], [], [ -@@ -112,6 +120,8 @@ PKG_CHECK_MODULES(GLU, [glu], [], - DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" - DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" +-dep_gl = dependency('gl') ++dep_gl = dependency('gl', required : get_option('gl')) ++if not dep_gl.found() ++ add_project_arguments('-DEGL_NO_X11=1', language: 'c') ++endif -+fi -+ - AC_ARG_ENABLE([egl], - [AS_HELP_STRING([--enable-egl], - [enable EGL library @<:@default=auto@:>@])], -@@ -302,7 +312,7 @@ AC_SUBST([MESA_GLAPI]) - AC_SUBST([WAYLAND_CFLAGS]) - AC_SUBST([WAYLAND_LIBS]) + dep_gles1 = dependency('glesv1_cm', required : get_option('gles1')) + dep_gles2 = dependency('glesv2', required : get_option('gles2')) +@@ -75,13 +78,15 @@ endif -- -+AM_CONDITIONAL(HAVE_GL, test "x$gl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") -diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am -index 6d184ff6..219ab850 100644 ---- a/src/egl/opengl/Makefile.am -+++ b/src/egl/opengl/Makefile.am -@@ -56,6 +56,7 @@ endif - endif + dep_threads = dependency('threads') - if HAVE_EGL -+if HAVE_GL - bin_PROGRAMS = \ - eglinfo - noinst_PROGRAMS = \ -@@ -64,6 +65,7 @@ noinst_PROGRAMS = \ - $(EGL_X11_DEMOS) \ - $(EGL_WL_DEMOS) +-dep_glu = dependency('glu', required : dep_x11.found()) +-if not dep_glu.found() +- _glu_name = 'GLU' +- if host_machine.system() == 'windows' +- _glu_name = 'glu32' ++if dep_gl.found() ++ dep_glu = dependency('glu', required : dep_x11.found()) ++ if not dep_glu.found() ++ _glu_name = 'GLU' ++ if host_machine.system() == 'windows' ++ _glu_name = 'glu32' ++ endif ++ dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h') + endif +- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h') endif + + # GBM is needed for EGL on KMS +diff --git a/meson_options.txt b/meson_options.txt +index ddadd2e3..f5405698 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,5 +1,6 @@ + option('with-glut', type : 'string') + option('egl', type : 'feature') ++option('gl', type : 'feature') + option('gles1', type : 'feature') + option('gles2', type : 'feature') + option('osmesa', type : 'feature') +diff --git a/src/egl/meson.build b/src/egl/meson.build +index d1846921..42bf8ecd 100644 +--- a/src/egl/meson.build ++++ b/src/egl/meson.build +@@ -19,7 +19,10 @@ + # SOFTWARE. + + subdir('eglut') +-subdir('opengl') ++ ++if dep_gl.found() ++ subdir('opengl') +endif - egltri_x11_SOURCES = egltri.c - eglgears_x11_SOURCES = eglgears.c -diff --git a/src/util/Makefile.am b/src/util/Makefile.am -index 759a293a..012b9c75 100644 ---- a/src/util/Makefile.am -+++ b/src/util/Makefile.am -@@ -27,7 +27,9 @@ AM_CFLAGS = \ - AM_LDFLAGS = \ - $(DEMO_LIBS) + if dep_gles1.found() + subdir('opengles1') +diff --git a/src/meson.build b/src/meson.build +index 39cac78d..7607c6de 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -20,7 +20,9 @@ + + subdir('glad') -+if HAVE_GL - noinst_LTLIBRARIES = libutil.la +-subdir('util') ++if dep_gl.found() ++ subdir('util') +endif - if HAVE_GLUT - AM_CFLAGS += \ + if dep_glut.found() + subdir('demos') -- -2.14.3 +2.37.3 diff --git a/package/mesa3d-demos/mesa3d-demos.hash b/package/mesa3d-demos/mesa3d-demos.hash index 8a4955f120..b0cfb88816 100644 --- a/package/mesa3d-demos/mesa3d-demos.hash +++ b/package/mesa3d-demos/mesa3d-demos.hash @@ -1,5 +1,3 @@ -# From https://lists.freedesktop.org/archives/mesa-dev/2018-February/186542.html -md5 6b65a02622765522176d00f553086fa3 mesa-demos-8.4.0.tar.bz2 -sha1 57ba892e919fa22ce3db9f25e7331a6fa33c652c mesa-demos-8.4.0.tar.bz2 -sha256 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d mesa-demos-8.4.0.tar.bz2 -sha512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957 mesa-demos-8.4.0.tar.bz2 +# From https://lists.freedesktop.org/archives/mesa-announce/2022-May/000677.html +sha256 cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1 mesa-demos-8.5.0.tar.bz2 +sha512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8 mesa-demos-8.5.0.tar.bz2 diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index 6b5262a2e9..5f7fe8e24d 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -4,77 +4,69 @@ # ################################################################################ -MESA3D_DEMOS_VERSION = 8.4.0 +MESA3D_DEMOS_VERSION = 8.5.0 MESA3D_DEMOS_SOURCE = mesa-demos-$(MESA3D_DEMOS_VERSION).tar.bz2 -MESA3D_DEMOS_SITE = ftp://ftp.freedesktop.org/pub/mesa/demos -# 0001-demos-makes-opengl-an-optional-component.patch -MESA3D_DEMOS_AUTORECONF = YES +MESA3D_DEMOS_SITE = https://archive.mesa3d.org/demos/$(MESA3D_DEMOS_VERSION) MESA3D_DEMOS_DEPENDENCIES = host-pkgconf MESA3D_DEMOS_LICENSE = MIT MESA3D_DEMOS_CONF_OPTS += \ - --disable-gles1 + -Dgles1=disabled ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy) MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext -MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11 +MESA3D_DEMOS_CONF_OPTS += -Dgl=enabled -Dx11=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-gl --disable-x11 +MESA3D_DEMOS_CONF_OPTS += -Dgl=disabled -Dx11=disabled endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) MESA3D_DEMOS_DEPENDENCIES += libegl -MESA3D_DEMOS_CONF_OPTS += --enable-egl +MESA3D_DEMOS_CONF_OPTS += -Degl=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-egl +MESA3D_DEMOS_CONF_OPTS += -Degl=disabled endif ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) MESA3D_DEMOS_DEPENDENCIES += libgles -MESA3D_DEMOS_CONF_OPTS += --enable-gles2 +MESA3D_DEMOS_CONF_OPTS += -Dgles2=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-gles2 +MESA3D_DEMOS_CONF_OPTS += -Dgles2=disabled endif -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -MESA3D_DEMOS_DEPENDENCIES += libopenvg -MESA3D_DEMOS_CONF_OPTS += --enable-vg +ifeq ($(BR2_PACKAGE_LIBDRM),y) +MESA3D_DEMOS_DEPENDENCIES += libdrm +MESA3D_DEMOS_CONF_OPTS += -Dlibdrm=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-vg +MESA3D_DEMOS_CONF_OPTS += -Dlibdrm=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) +# Meson search for gbm, but has no option to enable/disable it. See: +# https://gitlab.freedesktop.org/mesa/demos/-/blob/mesa-demos-8.5.0/meson.build#L88 +# We still add the dependency, if needed, to make sure it will always +# be detected. MESA3D_DEMOS_DEPENDENCIES += mesa3d -MESA3D_DEMOS_CONF_OPTS += --enable-gbm -else -MESA3D_DEMOS_CONF_OPTS += --disable-gbm -endif - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -MESA3D_DEMOS_DEPENDENCIES += freetype -MESA3D_DEMOS_CONF_OPTS += --enable-freetype2 -else -MESA3D_DEMOS_CONF_OPTS += --disable-freetype2 endif ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MESA3D_DEMOS_DEPENDENCIES += libfreeglut -MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr +MESA3D_DEMOS_CONF_OPTS += -Dwith-glut=$(STAGING_DIR)/usr # osmesa support depends on glut ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) -MESA3D_DEMOS_CONF_OPTS += --enable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif else -MESA3D_DEMOS_CONF_OPTS += --without-glut --disable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif ifeq ($(BR2_PACKAGE_WAYLAND),y) MESA3D_DEMOS_DEPENDENCIES += wayland -MESA3D_DEMOS_CONF_OPTS += --enable-wayland +MESA3D_DEMOS_CONF_OPTS += -Dwayland=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-wayland +MESA3D_DEMOS_CONF_OPTS += -Dwayland=disabled endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From peter at korsgaard.com Mon Feb 20 20:59:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:41 -0000 Subject: [Buildroot] [git commit branch/next] configs/spike_riscv64_defconfig: use OpenSBI 1.2 Message-ID: <20230220205227.DA9D2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5db2e5d45e75b44e7c7c5ad8c61d1be2a2748cbc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard Reviewed-by: Julien Olivain Tested-by: Julien Olivain Signed-off-by: Peter Korsgaard --- configs/spike_riscv64_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index 26103682f9..e23f1ce32c 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -9,7 +9,7 @@ BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y BR2_PACKAGE_HOST_RISCV_ISA_SIM=y From peter at korsgaard.com Mon Feb 20 20:59:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:41 -0000 Subject: [Buildroot] [git commit branch/next] configs/qemu_riscv64_virt_defconfig: use OpenSBI 1.2 Message-ID: <20230220205227.CF07586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=035cc3caf998a71dea37eefb852d20867fd89b39 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Rather than the default (currently 0.9). Signed-off-by: Peter Korsgaard --- configs/qemu_riscv64_virt_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index c455680ee0..b3174a152c 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -25,6 +25,8 @@ BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing From peter at korsgaard.com Tue Feb 7 09:50:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 10:50:36 +0100 Subject: [Buildroot] [git commit branch/next] package/python-bunch: remove package Message-ID: <20230220205251.80D938648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29fd8481e22fd7e8ac00e0bc47614ff06be33706 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since the python3 bump to version 3.11 in commit 738500c296c8b1206f20e94ca3e7c5932a6a0486 python-bunch has failed to build. This is due to open() which no longer accepts 'U' (???universal newline???) in the file mode. Remove this package as it has not had a release since 2011 and is unmaintained upstream. Details: https://docs.python.org/3.11/whatsnew/3.11.html#porting-to-python-3-11 Fixes: - http://autobuild.buildroot.net/results/2ba/2ba72fc9837605a36ea63bbd3e6e181a40cdf360 Signed-off-by: James Hilliard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-bunch/Config.in | 6 ------ package/python-bunch/python-bunch.hash | 5 ----- package/python-bunch/python-bunch.mk | 14 -------------- 6 files changed, 7 insertions(+), 27 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 61686fdd11..ad80522451 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_PYTHON_BUNCH + bool "python-bunch removed" + select BR2_LEGACY + help + The python-bunch package is unmaintained and is replaced + by the python-munch package. + config BR2_TARGET_GUMMIBOOT bool "gummiboot removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f8acf8776c..cad8d6affa 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2040,7 +2040,6 @@ F: package/policycoreutils/ F: package/proftpd/ F: package/protobuf-c/ F: package/protobuf/ -F: package/python-bunch/ F: package/python-colorama/ F: package/python-filelock/ F: package/python-flask-cors/ diff --git a/package/Config.in b/package/Config.in index b6211f1102..8b9570c447 100644 --- a/package/Config.in +++ b/package/Config.in @@ -985,7 +985,6 @@ menu "External python modules" source "package/python-bottle/Config.in" source "package/python-brotli/Config.in" source "package/python-bsdiff4/Config.in" - source "package/python-bunch/Config.in" source "package/python-cached-property/Config.in" source "package/python-can/Config.in" source "package/python-canopen/Config.in" diff --git a/package/python-bunch/Config.in b/package/python-bunch/Config.in deleted file mode 100644 index 89eae742b8..0000000000 --- a/package/python-bunch/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_BUNCH - bool "python-bunch" - help - A dot-accessible dictionary (a la JavaScript objects). - - http://github.com/dsc/bunch diff --git a/package/python-bunch/python-bunch.hash b/package/python-bunch/python-bunch.hash deleted file mode 100644 index cfde2db603..0000000000 --- a/package/python-bunch/python-bunch.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/bunch/json -md5 0a829d64e95ed96defbcae2bf9061bb0 bunch-1.0.1.tar.gz -sha256 50c77a0fc0cb372dfe48b5e11937d5f70e743adbf42683f3a6d2857645a76aaa bunch-1.0.1.tar.gz -# Locally computed sha256 checksums -sha256 57ca95c92059c8380625192462979bd32994aae3fcdf902ff6eb1e467eeb0469 LICENSE.txt diff --git a/package/python-bunch/python-bunch.mk b/package/python-bunch/python-bunch.mk deleted file mode 100644 index 18fdc223bb..0000000000 --- a/package/python-bunch/python-bunch.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-bunch -# -################################################################################ - -PYTHON_BUNCH_VERSION = 1.0.1 -PYTHON_BUNCH_SOURCE = bunch-$(PYTHON_BUNCH_VERSION).tar.gz -PYTHON_BUNCH_SITE = https://files.pythonhosted.org/packages/ef/bf/a4cf1779a4ffb4f610903fa08e15d1f4a8a2f4e3353a02afbe097c5bf4a8 -PYTHON_BUNCH_SETUP_TYPE = setuptools -PYTHON_BUNCH_LICENSE = MIT -PYTHON_BUNCH_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:59:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:42 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: fix static build Message-ID: <20230220205228.482678648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f37af1800c82ae255c202ea8cfc7e11a65d489f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following static build failure raised since bump to version 1.7.2 in commit 6987b92da510a8c8b9534a22506850c163d0f035 and https://github.com/containers/crun/commit/5837234e9840cd067edd9f6cd2ed9cae9a0e6570: src/crun.c:26:10: fatal error: dlfcn.h: No such file or directory 26 | #include | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/a5f52a7ee757c92c9571261c0ed884d05caeaf2f Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: make it an actual backport now] Signed-off-by: Yann E. MORIN --- ...0001-src-crun.c-fix-build-without-dlfcn.h.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch b/package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch new file mode 100644 index 0000000000..104c19a40f --- /dev/null +++ b/package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch @@ -0,0 +1,39 @@ +From 278b9b447bec3fb81bf252eb2fe2c856892ec802 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 30 Dec 2022 18:40:15 +0100 +Subject: [PATCH] src/crun.c: fix build without dlfcn.h + +Fix the following build failure without dlfcn.h raised since version 1.7 +and +https://github.com/containers/crun/commit/5837234e9840cd067edd9f6cd2ed9cae9a0e6570: + +src/crun.c:26:10: fatal error: dlfcn.h: No such file or directory + 26 | #include + | ^~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a5f52a7ee757c92c9571261c0ed884d05caeaf2f + +[fontaine.fabrice at gmail.com: backport upstream commit] +Signed-off-by: Fabrice Fontaine +--- + src/crun.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/crun.c b/src/crun.c +index cbfe900..af0cc97 100644 +--- a/src/crun.c ++++ b/src/crun.c +@@ -23,7 +23,9 @@ + #include + #include + ++#ifdef HAVE_DLOPEN + #include ++#endif + + #include "crun.h" + #include "libcrun/utils.h" +-- +2.25.1 + From thomas.petazzoni at bootlin.com Tue Feb 7 10:30:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:30:47 +0100 Subject: [Buildroot] [git commit branch/next] toolchain/toolchain-external: handle case of dangling symlink Message-ID: <20230220205251.B2EFF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b11ed25c4a0a6a4f7b9ee38390578d724caa081d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next copy_toolchain_lib_root was not handling the case of "readlink" returning nothing, which will happen if the symlink it is trying to resolve does not point to a valid file on the build host. This shouldn't happen, but it can. The end result of this situation would be an endless loop of error messages that would only end if aborted manually. [...] cp: missing destination file operand after '/local/users/mmayer/buildroot/output/arm64/target//' Try 'cp --help' for more information. readlink: missing operand Try 'readlink --help' for more information. basename: missing operand Try 'basename --help' for more information. dirname: missing operand Try 'dirname --help' for more information. ^C make[1]: *** [package/pkg-generic.mk:384: Instead of looping endlessly without explanation, let's abort and inform the user that something seems amiss with their setup. Signed-off-by: Markus Mayer Signed-off-by: Thomas Petazzoni --- toolchain/helpers.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index eec46d44c6..1cd7494fdb 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -19,7 +19,12 @@ copy_toolchain_lib_root = \ rm -fr $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ if test -h $${LIBPATH} ; then \ cp -d $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ + OLD_LIBPATH="$${LIBPATH}"; \ LIBPATH="`readlink -f $${LIBPATH}`"; \ + if [ "$${LIBPATH}" = "" ]; then \ + echo "LIBPATH empty after trying to resolve symlink $${OLD_LIBPATH}" 1>&2; \ + exit 1; \ + fi; \ elif test -f $${LIBPATH}; then \ $(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ break ; \ From yann.morin.1998 at free.fr Mon Feb 20 20:59:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:43 -0000 Subject: [Buildroot] [git commit branch/next] Makefile: fix use of many br2-external trees Message-ID: <20230220205228.25C1986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6195c53041f5a8aa375b9715f90beb5188d33e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The top level Makefile in buildroot has a recursive rule which causes the appearance of a hang as the number of directories in BR2_EXTERNAL increases. When the number of directories in BR2_EXTERNAL is small, the recursion occurs, but make detects the recursion and determines the target does not have to be remade. This allows make to progress. This is the failing rule: define percent_defconfig # Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig %_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig outputmakefile @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) endef $(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent_defconfig,$(d))$(sep))) The rule for %defconfig is created for each directory in BR2_EXTERNAL. When the rule is matched, the stem is 'defconfig_name'. The second prerequisite is expanded to $(1)/configs/defconfig_name_defconfig. The rule, and all of the other rules defined by this macro, are invoked again, but the stem is now $(1)/configs/defconfig_name_defconfig. The second prerequisite is now expanded to $(1)/configs/($1)/configs/defconfig_name_defconfig. This expansion continues until make detects the infinite recursion. With up to 5 br2-external trees, the time is very small, so that it is not noticeable. But starting with 6 br2-external trees, the time is insanely big (so much so that we did not even let it finish after it ran for hours); see timings toward the end of the commit log. We fix that by adding a single %_defconfig rule, which is now rsponsible to find the actual defconfig file that triggered the rule, by iterating on the reverse list of br2-external trees and then in main tree. Of course, now, there is no way for make to warn that there is no such defconfig, as it is no longer part of the prerequisites of the rule. So, we delegate to the recipe the responsibility to check for that. Timing (seconds) of `make pc_x86_64_bios_defconfig` with 1..1000 external trees, with make 4.2.1 (* with make 4.3), on a Core i7-7700HQ: #trees Before After 1 0.312 0.319 2 0.319 0.323 3 0.325 0.327 4 0.353 0.339 5 0.993 0.349 6 1.26* 0.347 7 9.10* 0.362 8 85.93* 0.360 9 n/a 0.373 10 n/a 0.374 50 n/a 0.738 100 n/a 1.228 500 n/a 7.483 1000 n/a 16.076 How to reproduce: #!/usr/bin/env bash N="${1:-1000}" for i in $(seq 1 1000); do [ -d "br2-external/${i}/configs" ] && break mkdir -p br2-external/${i}/configs touch br2-external/${i}/{Config.in,external.mk} echo "name: BR_TEST_${i}" >br2-external/${i}/external.desc touch br2-external/${i}/configs/foo{,_${i}}_defconfig done time make \ BR2_EXTERNAL="$( for i in $(seq 1 ${N}); do printf '%s\n' "$(pwd)/br2-external/${i}" done )" \ foo_1_defconfig Notes: the timings are very dependent on how much the CPU is otherwise loaded, but having a multi-core CPU slightly loaded helps maintain a high frequency on the siblings, and that can reduce the above timings in half! Best to try on an otherwise-idle system. Fixes: #14996 Reported-by: David Lawson Signed-off-by: Nevo Hed [yann.morin.1998 at free.fr: - split long foreach - drastically extend the commit log - provide reproducer script and redo timings ] Signed-off-by: Yann E. MORIN --- Makefile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 88f90cd2fa..efa0b2a7a0 100644 --- a/Makefile +++ b/Makefile @@ -1013,13 +1013,18 @@ oldconfig syncconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf outputmake defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN) -define percent_defconfig -# Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig -%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig outputmakefile - @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ - $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) -endef -$(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent_defconfig,$(d))$(sep))) +%_defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile + @defconfig=$(or \ + $(firstword \ + $(foreach d, \ + $(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)), \ + $(wildcard $(d)/configs/$@) \ + ) \ + ), \ + $(error "Can't find $@") \ + ); \ + $(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$${defconfig} \ + $< --defconfig=$${defconfig} $(CONFIG_CONFIG_IN) update-defconfig: savedefconfig From thomas.petazzoni at bootlin.com Tue Feb 7 10:30:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:30:53 +0100 Subject: [Buildroot] [git commit branch/next] package/rtl8192eu: disable package for s390x architecture Message-ID: <20230220205251.BD56786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26893ab1c67d7df8c1b71269051ad41b5ea03e5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this package for this architecture. Fixes: http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8192eu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rtl8192eu/Config.in b/package/rtl8192eu/Config.in index 4d71b711c3..969ba090ce 100644 --- a/package/rtl8192eu/Config.in +++ b/package/rtl8192eu/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTL8192EU bool "rtl8192eu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help A standalone driver for the RTL8192EU USB Wi-Fi adapter. @@ -10,4 +11,5 @@ config BR2_PACKAGE_RTL8192EU https://github.com/clnhub/rtl8192eu-linux comment "rtl8192eu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL From peter at korsgaard.com Mon Feb 20 20:59:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:44 -0000 Subject: [Buildroot] [git commit branch/next] package/{glibc, localedef}: bump to version 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c Message-ID: <20230220205228.17B318648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87ee360f3a18db33d50b5826590c55e37ee9f993 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patches which are now upstream. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...ix-MAKEFLAGS-assignment-for-upcoming-make.patch | 117 --------------------- package/glibc/0002-x86-Fix-Os-build-BZ-29576.patch | 48 --------- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- package/localedef/localedef.mk | 2 +- 5 files changed, 3 insertions(+), 168 deletions(-) diff --git a/package/glibc/0002-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch b/package/glibc/0002-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch deleted file mode 100644 index 0c82d7abbe..0000000000 --- a/package/glibc/0002-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 2d7ed98add14f75041499ac189696c9bd3d757fe Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Tue, 13 Sep 2022 13:39:13 -0400 -Subject: [PATCH] Makerules: fix MAKEFLAGS assignment for upcoming make-4.4 - [BZ# 29564] - -make-4.4 will add long flags to MAKEFLAGS variable: - - * WARNING: Backward-incompatibility! - Previously only simple (one-letter) options were added to the MAKEFLAGS - variable that was visible while parsing makefiles. Now, all options - are available in MAKEFLAGS. - -This causes locale builds to fail when long options are used: - - $ make --shuffle - ... - make -C localedata install-locales - make: invalid shuffle mode: '1662724426r' - -The change fixes it by passing eash option via whitespace and dashes. -That way option is appended to both single-word form and whitespace -separated form. - -While at it fixed --silent mode detection in $(MAKEFLAGS) by filtering -out --long-options. Otherwise options like --shuffle flag enable silent -mode unintentionally. $(silent-make) variable consolidates the checks. - -Resolves: BZ# 29564 - -CC: Paul Smith -CC: Siddhesh Poyarekar -Signed-off-by: Sergei Trofimovich -Reviewed-by: Siddhesh Poyarekar -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -2d7ed98add14f75041499ac189696c9bd3d757fe] ---- - Makeconfig | 18 +++++++++++++++++- - Makerules | 4 ++-- - elf/rtld-Rules | 2 +- - 3 files changed, 20 insertions(+), 4 deletions(-) - -diff --git a/Makeconfig b/Makeconfig -index f8164a0025..842f49eb58 100644 ---- a/Makeconfig -+++ b/Makeconfig -@@ -43,6 +43,22 @@ else - $(error objdir must be defined by the build-directory Makefile) - endif - -+# Did we request 'make -s' run? "yes" or "no". -+# Starting from make-4.4 MAKEFLAGS now contains long -+# options like '--shuffle'. To detect presence of 's' -+# we pick first word with short options. Long options -+# are guaranteed to come after whitespace. We use '-' -+# prefix to always have a word before long options -+# even if no short options were passed. -+# Typical MAKEFLAGS values to watch for: -+# "rs --shuffle=42" (silent) -+# " --shuffle" (not silent) -+ifeq ($(findstring s, $(firstword -$(MAKEFLAGS))),) -+silent-make := no -+else -+silent-make := yes -+endif -+ - # Root of the sysdeps tree. - sysdep_dir := $(..)sysdeps - export sysdep_dir := $(sysdep_dir) -@@ -917,7 +933,7 @@ endif - # umpteen zillion filenames along with it (we use `...' instead) - # but we don't want this echoing done when the user has said - # he doesn't want to see commands echoed by using -s. --ifneq "$(findstring s,$(MAKEFLAGS))" "" # if -s -+ifeq ($(silent-make),yes) # if -s - +cmdecho := echo >/dev/null - else # not -s - +cmdecho := echo -diff --git a/Makerules b/Makerules -index d1e139d03c..09c0cf8357 100644 ---- a/Makerules -+++ b/Makerules -@@ -794,7 +794,7 @@ endif - # Maximize efficiency by minimizing the number of rules. - .SUFFIXES: # Clear the suffix list. We don't use suffix rules. - # Don't define any builtin rules. --MAKEFLAGS := $(MAKEFLAGS)r -+MAKEFLAGS := $(MAKEFLAGS) -r - - # Generic rule for making directories. - %/: -@@ -811,7 +811,7 @@ MAKEFLAGS := $(MAKEFLAGS)r - .PRECIOUS: $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c)) - - # Use the verbose option of ar and tar when not running silently. --ifeq "$(findstring s,$(MAKEFLAGS))" "" # if not -s -+ifeq ($(silent-make),no) # if not -s - verbose := v - else # -s - verbose := -diff --git a/elf/rtld-Rules b/elf/rtld-Rules -index ca00dd1fe2..3c5e273f2b 100644 ---- a/elf/rtld-Rules -+++ b/elf/rtld-Rules -@@ -52,7 +52,7 @@ $(objpfx)rtld-libc.a: $(foreach dir,$(rtld-subdirs),\ - mv -f $@T $@ - - # Use the verbose option of ar and tar when not running silently. --ifeq "$(findstring s,$(MAKEFLAGS))" "" # if not -s -+ifeq ($(silent-make),no) # if not -s - verbose := v - else # -s - verbose := --- -2.34.1 - diff --git a/package/glibc/0002-x86-Fix-Os-build-BZ-29576.patch b/package/glibc/0002-x86-Fix-Os-build-BZ-29576.patch deleted file mode 100644 index 4470324f1c..0000000000 --- a/package/glibc/0002-x86-Fix-Os-build-BZ-29576.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3935b543adcb9a46ab79f8931bc489068b049378 Mon Sep 17 00:00:00 2001 -From: Adhemerval Zanella Netto -Date: Wed, 21 Sep 2022 10:51:08 -0300 -Subject: [PATCH] x86: Fix -Os build (BZ #29576) - -The compiler might transform __stpcpy calls (which are routed to -__builtin_stpcpy as an optimization) to strcpy and x86_64 strcpy -multiarch implementation does not build any working symbol due -ISA_SHOULD_BUILD not being evaluated for IS_IN(rtld). - -Checked on x86_64-linux-gnu. -Reviewed-by: Carlos O'Donell -Tested-by: Carlos O'Donell - -(cherry picked from commit 9dc4e29f630c6ef8299120b275e503321dc0c8c7) -Signed-off-by: Romain Naour ---- - sysdeps/x86_64/multiarch/rtld-strcpy.S | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - create mode 100644 sysdeps/x86_64/multiarch/rtld-strcpy.S - -diff --git a/sysdeps/x86_64/multiarch/rtld-strcpy.S b/sysdeps/x86_64/multiarch/rtld-strcpy.S -new file mode 100644 -index 0000000000..19439c553d ---- /dev/null -+++ b/sysdeps/x86_64/multiarch/rtld-strcpy.S -@@ -0,0 +1,18 @@ -+/* Copyright (C) 2022 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. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY 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 the GNU C Library; if not, see -+ . */ -+ -+#include "../strcpy.S" --- -2.34.3 - diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 16290461ac..4ce4c6f6d1 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 51b946f6c8dddd2b0c9902f7792ecf594497da6b0cc8fb9246fa30f108cbb422 glibc-2.36-66-ga1dc0be03c9dd850b864bd7a9c03cf8e396eb7ca.tar.gz +sha256 666482e657c319f7e139121121a0d97d303c65207b9f9730f42a3ee83c79f686 glibc-2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index bb7c9e9a05..354f035d33 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.36-66-ga1dc0be03c9dd850b864bd7a9c03cf8e396eb7ca +GLIBC_VERSION = 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 05db7fa423..6699840854 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.36-66-ga1dc0be03c9dd850b864bd7a9c03cf8e396eb7ca +LOCALEDEF_VERSION = 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From thomas.petazzoni at bootlin.com Tue Feb 7 10:41:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:41:37 +0100 Subject: [Buildroot] [git commit branch/next] package/versal-firmware: use Xilinx github for versal-firmware Message-ID: <20230220205251.E37CF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0781f44c0a9b46d9119557708918948a769e6881 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate versal-firmware package from nealfrager github to Xilinx github. The images are identical, so this patch has zero impact on functionality. Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- configs/versal_vck190_defconfig | 2 +- package/versal-firmware/Config.in | 2 +- package/versal-firmware/versal-firmware.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index fcda6eb431..2808fa522b 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_PACKAGE_VERSAL_FIRMWARE=y -BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="v2022.2" +BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="2022.2_br_1" BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/package/versal-firmware/Config.in b/package/versal-firmware/Config.in index 8d13816149..b4b63282d8 100644 --- a/package/versal-firmware/Config.in +++ b/package/versal-firmware/Config.in @@ -10,7 +10,7 @@ if BR2_PACKAGE_VERSAL_FIRMWARE config BR2_PACKAGE_VERSAL_FIRMWARE_VERSION string "firmware version" - default "v2022.2" + default "2022.2_br_1" help Release version of Versal firmware. diff --git a/package/versal-firmware/versal-firmware.mk b/package/versal-firmware/versal-firmware.mk index 3e4b9e558d..0bc5a00bc6 100644 --- a/package/versal-firmware/versal-firmware.mk +++ b/package/versal-firmware/versal-firmware.mk @@ -5,7 +5,7 @@ ################################################################################ VERSAL_FIRMWARE_VERSION = $(call qstrip,$(BR2_PACKAGE_VERSAL_FIRMWARE_VERSION)) -VERSAL_FIRMWARE_SITE = $(call github,nealfrager,buildroot-firmware,$(VERSAL_FIRMWARE_VERSION)) +VERSAL_FIRMWARE_SITE = $(call github,Xilinx,ubuntu-firmware,$(VERSAL_FIRMWARE_VERSION)) VERSAL_FIRMWARE_LICENSE = Xilinx-Binary-Only VERSAL_FIRMWARE_LICENSE_FILES = LICENSE VERSAL_FIRMWARE_INSTALL_TARGET = NO From peter at korsgaard.com Mon Feb 20 20:59:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:45 -0000 Subject: [Buildroot] [git commit branch/next] package/ntpsec: bump version to 1.2.2 Message-ID: <20230220205228.05DDC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=658ece1afa84e916503e3e949c40b3c0d24c6335 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - remove 001-ntptime-fix-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch (upstream applied, see [1]) - rename 0002-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch to 0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch - remove 0003-fix-build-with-libressl.patch (upstream applied, see [2]) - update license file list (change from LICENSE.adoc to LICENSES/BSD-2, LICENSES/BSD-3, LICENSES/CC-BY-4.0, LICENSES/MIT, LICENSES/NTP) For details see [3]. [1] https://gitlab.com/NTPsec/ntpsec/-/commit/0bea0bef36ff9cfa3ff52de25a839c283cf46cf7 [2] https://gitlab.com/NTPsec/ntpsec/-/commit/128b66ae122d7b41ce4b99f427383fd6a5923d71 [3] https://gitlab.com/NTPsec/ntpsec/-/blob/master/NEWS.adoc Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch | 90 ---------------------- ...ve-checks-for-bsd-string.h-fixes-host-co.patch} | 0 package/ntpsec/0003-fix-build-with-libressl.patch | 80 ------------------- package/ntpsec/ntpsec.hash | 8 +- package/ntpsec/ntpsec.mk | 12 ++- 5 files changed, 15 insertions(+), 175 deletions(-) diff --git a/package/ntpsec/0001-ntptime-fix-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch b/package/ntpsec/0001-ntptime-fix-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch deleted file mode 100644 index aa3cb183c3..0000000000 --- a/package/ntpsec/0001-ntptime-fix-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch +++ /dev/null @@ -1,90 +0,0 @@ -From aa9ed14c7f4d0edbda9370760b44be045638f8a0 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 4 Oct 2021 22:25:58 +0200 -Subject: [PATCH] ntptime: fix jfmt5/ofmt5 jfmt6/ofmt6 related compile failure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use same define guard for definiton as for usage ('HAVE_STRUCT_NTPTIMEVAL_TAI' -instead of 'NTP_API && NTP_API > 3'). - -While at it use HAVE_STRUCT_NTPTIMEVAL_TAI define guard for the two remaining -places using NTP_API (which is not defined by the uclibc sys/timex.h header). - -Fixes: - - ../../ntptime/ntptime.c: In function ???main???: - ../../ntptime/ntptime.c:349:17: error: ???jfmt5??? undeclared (first use in this function); did you mean ???jfmt6???? - 349 | printf(json ? jfmt5 : ofmt5, (long)ntv.tai); - | ^~~~~ - | jfmt6 - ../../ntptime/ntptime.c:349:17: note: each undeclared identifier is reported only once for each function it appears in - ../../ntptime/ntptime.c:349:25: error: ???ofmt5??? undeclared (first use in this function); did you mean ???ofmt6???? - 349 | printf(json ? jfmt5 : ofmt5, (long)ntv.tai); - | ^~~~~ - | ofmt6 - ../../ntptime/ntptime.c:321:15: warning: unused variable ???jfmt6??? [-Wunused-variable] - 321 | const char *jfmt6 = ""; - | ^~~~~ - ../../ntptime/ntptime.c:311:15: warning: unused variable ???ofmt6??? [-Wunused-variable] - 311 | const char *ofmt6 = "\n"; - | ^~~~~ - -[Upstream: https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1245] -Signed-off-by: Peter Seiderer ---- - ntptime/ntptime.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/ntptime/ntptime.c b/ntptime/ntptime.c -index ff861cb3b..7fbd09977 100644 ---- a/ntptime/ntptime.c -+++ b/ntptime/ntptime.c -@@ -138,7 +138,7 @@ main( - ntx.modes |= MOD_NANO; - break; - #endif --#if defined NTP_API && NTP_API > 3 -+#if defined(HAVE_STRUCT_NTPTIMEVAL_TAI) - case 'T': - ntx.modes = MOD_TAI; - ntx.constant = atoi(ntp_optarg); -@@ -222,7 +222,7 @@ main( - #else - "", - #endif --#if defined NTP_API && NTP_API > 3 -+#if defined(HAVE_STRUCT_NTPTIMEVAL_TAI) - "-T tai_offset set TAI offset\n", - #else - "", -@@ -305,21 +305,21 @@ main( - const char *ofmt2 = " time %s, (.%0*d),\n"; - const char *ofmt3 = " maximum error %lu us, estimated error %lu us"; - const char *ofmt4 = " ntptime=%x.%x unixtime=%x.%0*d %s"; --#if defined NTP_API && NTP_API > 3 -+#if defined(HAVE_STRUCT_NTPTIMEVAL_TAI) - const char *ofmt5 = ", TAI offset %ld\n"; - #else - const char *ofmt6 = "\n"; --#endif /* NTP_API */ -+#endif /* HAVE_STRUCT_NTPTIMEVAL_TAI */ - /* JSON formats */ - const char *jfmt1 = "{\"gettime-code\":%d,\"gettime-status\":\"%s\","; - const char *jfmt2 = "\"time\":\"%s\",\"fractional-time\":\".%0*d\","; - const char *jfmt3 = "\"maximum-error\":%lu,\"estimated-error\":%lu,"; - const char *jfmt4 = "\"raw-ntp-time\":\"%x.%x\",\"raw-unix-time\":\"%x.%0*d %s\","; --#if defined NTP_API && NTP_API > 3 -+#if defined(HAVE_STRUCT_NTPTIMEVAL_TAI) - const char *jfmt5 = "\"TAI-offset\":%d,"; - #else - const char *jfmt6 = ""; --#endif /* NTP_API */ -+#endif /* HAVE_STRUCT_NTPTIMEVAL_TAI */ - printf(json ? jfmt1 : ofmt1, status, timex_state(status)); - time_frac = ntv.time.tv_frac_sec; - #ifdef STA_NANO --- -2.34.1 - diff --git a/package/ntpsec/0002-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch b/package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch similarity index 100% rename from package/ntpsec/0002-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch rename to package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch diff --git a/package/ntpsec/0003-fix-build-with-libressl.patch b/package/ntpsec/0003-fix-build-with-libressl.patch deleted file mode 100644 index a5c9543157..0000000000 --- a/package/ntpsec/0003-fix-build-with-libressl.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 743f16fb3fed9a05e601226f184be236614efe9a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 12 Aug 2022 23:35:52 +0200 -Subject: [PATCH] fix build with libressl - -Fix the following build failure with libressl: - -/home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/armeb-buildroot-linux-gnueabi/11.3.0/../../../../armeb-buildroot-linux-gnueabi/bin/ld: libntp/libntp.a(ntp_random.c.1.o): in function `ntp_RAND_priv_bytes': -ntp_random.c:(.text+0xac): undefined reference to `RAND_priv_bytes' - -Fixes: - - http://autobuild.buildroot.org/results/a6a825b7f0efc7c82e8ecf792a1f9951ffb047c5 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1285] ---- - attic/cmac-timing.c | 2 ++ - attic/random.c | 8 ++++++++ - libntp/ntp_random.c | 2 +- - 3 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/attic/cmac-timing.c b/attic/cmac-timing.c -index 464daa76b..4f2fd3338 100644 ---- a/attic/cmac-timing.c -+++ b/attic/cmac-timing.c -@@ -204,7 +204,9 @@ static void DoPKEY( - printf("## Oops, EVP_MD_CTX_new() failed.\n"); - return; - } -+#ifdef EVP_MD_CTX_FLAG_FINALISE - EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_FINALISE); -+#endif - - clock_gettime(CLOCK_MONOTONIC, &start); - for (int i = 0; i < SAMPLESIZE; i++) { -diff --git a/attic/random.c b/attic/random.c -index 446c68535..8530ecd25 100644 ---- a/attic/random.c -+++ b/attic/random.c -@@ -127,7 +127,11 @@ static int do_avg_priv(unsigned int bytes) { - - clock_gettime(CLOCK_REALTIME, &start); - for (int i = 0; i < BATCHSIZE; i++) { -+#ifdef LIBRESSL_VERSION_NUMBER -+ err += RAND_bytes((unsigned char *)&rnd, bytes); -+#else - err += RAND_priv_bytes((unsigned char *)&rnd, bytes); -+#endif - } - clock_gettime(CLOCK_REALTIME, &stop); - -@@ -209,7 +213,11 @@ static int do_fast_priv(unsigned bytes) { - - for (int i = 0; i < BATCHSIZE; i++) { - clock_gettime(CLOCK_REALTIME, &start); -+#ifdef LIBRESSL_VERSION_NUMBER -+ err += RAND_bytes((unsigned char *)&rnd, bytes); -+#else - err += RAND_priv_bytes((unsigned char *)&rnd, bytes); -+#endif - clock_gettime(CLOCK_REALTIME, &stop); - sec = (stop.tv_sec-start.tv_sec); - nanos = sec*BILLION + (stop.tv_nsec-start.tv_nsec); -diff --git a/libntp/ntp_random.c b/libntp/ntp_random.c -index 9304a790d..adb375b24 100644 ---- a/libntp/ntp_random.c -+++ b/libntp/ntp_random.c -@@ -29,7 +29,7 @@ void ntp_RAND_bytes(unsigned char *buf, int num) { - - void ntp_RAND_priv_bytes(unsigned char *buf, int num) { - int err; --#if (OPENSSL_VERSION_NUMBER > 0x1010100fL) -+#if (OPENSSL_VERSION_NUMBER > 0x1010100fL) && !defined(LIBRESSL_VERSION_NUMBER) - err = RAND_priv_bytes(buf, num); - #else - err = RAND_bytes(buf, num); --- -2.35.1 - diff --git a/package/ntpsec/ntpsec.hash b/package/ntpsec/ntpsec.hash index 49dc4e4d52..44e04b2403 100644 --- a/package/ntpsec/ntpsec.hash +++ b/package/ntpsec/ntpsec.hash @@ -1,4 +1,8 @@ # Locally calculated -sha256 71c9f4bde6953bbc048bbaf278da81c451a56cc08d6772542b4ad37c67d72e89 ntpsec-NTPsec_1_2_1.tar.bz2 -sha256 b4db4de3317c3b0554ed91eb692968800bdfd6ad2c16ffbeee8ce4895ed91da4 LICENSE.adoc +sha256 ad45f5b88d08a159bc9f44ecb79e08358d26d3d22bb6c96ab7aaa3734de130e6 ntpsec-NTPsec_1_2_2.tar.bz2 +sha256 899261d6eb6c922cf8f051225411f27b738ba0014be18c2eaf6afbf30d421bb1 LICENSES/BSD-2 +sha256 5fe38d8724c53ff4e69f0a3492a368b4a6719700ac16f706efeb01a45c62f2b5 LICENSES/BSD-3 +sha256 9ba9550ad48438d0836ddab3da480b3b69ffa0aac7b7878b5a0039e7ab429411 LICENSES/CC-BY-4.0 +sha256 074415b57c6ba1780483d89e55f40dec3ded96c28aaf47d63c486683ba553e7c LICENSES/MIT +sha256 62fec6cd79721af81b7c12f1a679535235fdd22800ab17653042f024187ff274 LICENSES/NTP sha256 d3b21470adadd9abd9c6d675378f8c371ac5a4ea6dbec91859e02fadca3c0856 docs/copyright.adoc diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index ac4b90e37a..c7fa2f85a8 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -6,12 +6,18 @@ NTPSEC_VERSION_MAJOR = 1 NTPSEC_VERSION_MINOR = 2 -NTPSEC_VERSION_POINT = 1 +NTPSEC_VERSION_POINT = 2 NTPSEC_VERSION = $(NTPSEC_VERSION_MAJOR)_$(NTPSEC_VERSION_MINOR)_$(NTPSEC_VERSION_POINT) NTPSEC_SOURCE = ntpsec-NTPsec_$(NTPSEC_VERSION).tar.bz2 NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(NTPSEC_VERSION) -NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT -NTPSEC_LICENSE_FILES = LICENSE.adoc docs/copyright.adoc +NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT, CC-BY-4.0 (docs) +NTPSEC_LICENSE_FILES = \ + LICENSES/BSD-2 \ + LICENSES/BSD-3 \ + LICENSES/CC-BY-4.0 \ + LICENSES/MIT \ + LICENSES/NTP \ + docs/copyright.adoc NTPSEC_CPE_ID_VENDOR = ntpsec NTPSEC_CPE_ID_VERSION = $(NTPSEC_VERSION_MAJOR).$(NTPSEC_VERSION_MINOR) From yann.morin.1998 at free.fr Tue Feb 7 10:06:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:06:53 +0100 Subject: [Buildroot] [git commit branch/next] package/docker-proxy: drop package Message-ID: <20230220205251.9A8AC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ae48b70aedf38bf6e90a7bbea5bf28a7c55bdbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The docker-proxy binary (libnetwork) has been merged into the docker-engine source (moby). Drop the docker-proxy package and add cmd/docker-proxy as a build target of docker-engine instead. https://github.com/moby/libnetwork/commit/563fe8e248f3afac75a270f693f38bdc3eea7bf3 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/docker-engine/Config.in | 1 - package/docker-engine/docker-engine.mk | 2 +- package/docker-proxy/Config.in | 19 ------------------- package/docker-proxy/docker-proxy.hash | 3 --- package/docker-proxy/docker-proxy.mk | 21 --------------------- 8 files changed, 9 insertions(+), 47 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index ad80522451..72deb03c35 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy removed" + select BR2_LEGACY + select BR2_PACKAGE_DOCKER_ENGINE + help + docker-proxy has been dropped by upstream since version + 563fe8. it has been merged into docker-engine (moby). + config BR2_PACKAGE_PYTHON_BUNCH bool "python-bunch removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index cad8d6affa..f10036f7f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -545,7 +545,6 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-compose/ F: package/docker-engine/ -F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ diff --git a/package/Config.in b/package/Config.in index 8b9570c447..aa87f1305d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2618,7 +2618,6 @@ menu "System tools" source "package/docker-cli/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" - source "package/docker-proxy/Config.in" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 1f0efb8fcc..b5a356eab9 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_USE_MMU # containerd select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency - select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency help Docker is a platform to build, ship, diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index c50f08245d..ca1aa27b0a 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -24,7 +24,7 @@ DOCKER_ENGINE_LDFLAGS = \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs -DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_ENGINE_DEPENDENCIES += libapparmor diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in deleted file mode 100644 index 7e40536537..0000000000 --- a/package/docker-proxy/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_DOCKER_PROXY - bool "docker-proxy" - 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 - help - Libnetwork is a Container Network Model that provides a - consistent programming interface and the required network - abstractions for applications. - - This package provides docker-proxy, a run-time dependency of - Docker. - - https://github.com/docker/libnetwork - -comment "docker-proxy needs a 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_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash deleted file mode 100644 index 63296f14c1..0000000000 --- a/package/docker-proxy/docker-proxy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 05bf95637bae134d12d02bd7a7854cd0c768e6fccb662c2c64523f05b997b204 docker-proxy-f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk deleted file mode 100644 index fe7982e8f6..0000000000 --- a/package/docker-proxy/docker-proxy.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# docker-proxy -# -################################################################################ - -DOCKER_PROXY_VERSION = f6ccccb1c082a432c2a5814aaedaca56af33d9ea -DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) - -DOCKER_PROXY_LICENSE = Apache-2.0 -DOCKER_PROXY_LICENSE_FILES = LICENSE - -DOCKER_PROXY_DEPENDENCIES = host-pkgconf - -DOCKER_PROXY_BUILD_TARGETS = cmd/proxy - -define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy -endef - -$(eval $(golang-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:59:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:46 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: add libgcrypt optional dependency Message-ID: <20230220205228.69A168648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d5fd84496ac0ec65e7aed73a9386ab62f2a2c19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libgcrypt is an optional dependency which is enabled by default since version 1.7 and https://github.com/containers/crun/commit/dd310aaf5aee336d0f6236c1c2add7b7cb030482 Unfortunately, thetre are no associated --enable/disable flags; it all depends on auto-detection. Signed-off-by: Fabrice Fontaine Reviewed-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/crun/crun.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/crun/crun.mk b/package/crun/crun.mk index 8c9993993c..fd8bfb0981 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -26,6 +26,10 @@ else CRUN_CONF_OPTS += --disable-caps endif +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +CRUN_DEPENDENCIES += libgcrypt +endif + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) CRUN_DEPENDENCIES += libseccomp CRUN_CONF_OPTS += --enable-seccomp From peter at korsgaard.com Tue Feb 7 11:35:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 12:35:46 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: correct check for open perl module Message-ID: <20230220205252.18E9886496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b63e155e5fb7104e6660aa0570befa9498259cd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 4cdd99190e89 (support/dependencies/dependencies.sh: require open perl package for libxcrypt) added a check for the "open" perl module for libxcrypt, but it does not work as "open" cannot be directly used with "require" as an argument is needed: perl -e "require open" Not enough arguments for open at -e line 1, at EOF Execution of -e aborted due to compilation errors. So special case the check to instead check with "use open ':std'". Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 353817f8fb..88eabe921d 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -271,10 +271,6 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl -if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then - required_perl_modules="$required_perl_modules open" -fi - if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" @@ -291,6 +287,13 @@ fi # This variable will keep the modules that are missing in your system. missing_perl_modules="" +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + # open cannot be used with require + if ! perl -e "use open ':std'" > /dev/null 2>&1 ; then + missing_perl_modules="$missing_perl_modules open" + fi +fi + for pm in $required_perl_modules ; do if ! perl -e "require $pm" > /dev/null 2>&1 ; then missing_perl_modules="$missing_perl_modules $pm" From yann.morin.1998 at free.fr Mon Feb 20 20:59:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:48 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: impersonate runc Message-ID: <20230220205228.7A534828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=680f28af58364f4152f3d9b582b312538fa0e500 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next crun is a drop-in replacement for runc, so we can use the former to impersonate the latter when it is not enabled. To do so, we create a runc symlink pointing to crun, when runc is not enabled. See: https://github.com/containerd/containerd/discussions/6162 Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart [yann.morin.1998 at free.fr: split into its own patch] Signed-off-by: Yann E. MORIN --- package/crun/crun.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/crun/crun.mk b/package/crun/crun.mk index fd8bfb0981..ddb96a0b33 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -44,4 +44,11 @@ else CRUN_CONF_OPTS += --disable-systemd endif +ifeq ($(BR2_PACKAGE_RUNC),) +define CRUN_CREATE_SYMLINK + ln -sf crun $(TARGET_DIR)/usr/bin/runc +endef +CRUN_POST_INSTALL_TARGET_HOOKS += CRUN_CREATE_SYMLINK +endif + $(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:59:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:49 -0000 Subject: [Buildroot] [git commit branch/next] package/crun: needs fexecve Message-ID: <20230220205228.58775828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0e134a05342507bd9ac47da03abca4c9c113a64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next crun unconditionally uses fexecve since its addition in commit 530d6f661e506a4774b7236cb93d65f669adbc92 and https://github.com/containers/crun/commit/ce4dfbb97a8a05bef125030eaa6c46c07a5f9344: resulting in the following uclibc build failure: /tmp/instance-11/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arceb-snps-linux-uclibc/9.2.1/../../../../arceb-snps-linux-uclibc/bin/ld: src/libcrun/crun-cloned_binary.o: in function `ensure_cloned_binary': cloned_binary.c:(.text+0x1006): undefined reference to `fexecve' In 6e3f7fbc072c (package/runc: add upstream security fix for CVE-2019-5736), we made runc unavailable for uclibc toolchains, and crun uses fexecve for that same reason, to fix CVE-2019-5736. So, also make crun unavailable for uclibc toolchains. Fixes: - http://autobuild.buildroot.org/results/e1f4ef2b392c0e7161390ba0f97d6eef3bd12e9c Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/crun/Config.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/crun/Config.in b/package/crun/Config.in index 5def7001c1..fa0894e126 100644 --- a/package/crun/Config.in +++ b/package/crun/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_CRUN bool "crun" - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve + select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_YAJL # libocispec help crun is a fast and low-memory OCI Container Runtime in C. https://github.com/containers/crun + +comment "crun needs a glibc or musl toolchain" + depends on BR2_TOOLCHAIN_USES_UCLIBC From thomas.petazzoni at bootlin.com Tue Feb 7 11:32:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 12:32:35 +0100 Subject: [Buildroot] [git commit branch/next] package/python-idna: set _SETUP_TYPE = flit Message-ID: <20230220205252.0E9E2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a9da9a8cad5f77902547fab3b24d04175749a7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Python idna package switched to pyproject.toml in commit: https://github.com/kjd/idna/commit/2a00e518efe55d2eeb62cd3f88ace7db41338603 which is included in idna v3.4. When using the old setuptools infra, the package is incorrectly installed as v0.0, which is then incorrectly detected by other packages when using setuptools pkg_resources. The issue can be reproduced with the command: python3 <= 2.5"] import pkg_resources EOF which will fail with output: pkg_resources.ContextualVersionConflict: (idna 0.0.0 (/usr/lib/python3.11/site-packages), Requirement.parse('idna>=2.5'), {'hyperlink'}) pkg_resources.DistributionNotFound: The 'idna>=2.5' distribution was not found and is required by hyperlink This commit changes _SETUP_TYPE to "flit" to fix this issue. Signed-off-by: Julien Olivain Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-idna/python-idna.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 4d9994a9c7..3976cb1518 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -9,7 +9,7 @@ PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/8b/e1/43beb3d38dba6cb420cefa297822eac205a277ab43e5ba5d5c46faf96438 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md -PYTHON_IDNA_SETUP_TYPE = setuptools +PYTHON_IDNA_SETUP_TYPE = flit $(eval $(python-package)) $(eval $(host-python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:59:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:50 -0000 Subject: [Buildroot] [git commit branch/next] package/hiredis: enable host package Message-ID: <20230220205228.9B5C68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=359205b4f5b151a6ddff93cd75fd569a6f5c54b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The host-hiredis package is needed for the upcoming ccache update. So, being a dependency of ccache, we can't use ccache, so we must unset the options set by the cmake infra (this will be true only when we eventually bump ccache, but hiredis builds very fast even without ccache so we don't care about ccache even now). Reorder CONF_OPTS assignments so that comments apply equally to the host and target variants. Cc: Dominik Michael Rauh Cc: Anders F Bj??rklund Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: - add Dominik and Anders in Cc to ack they provided inspiration - use -Ufoo instead of -Dfoo="" (as per Dominik & Anders) - reorder CONF_OPTS assignments ] Signed-off-by: Yann E. MORIN --- package/hiredis/hiredis.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index f79b6c757a..a2f7627b58 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -11,9 +11,14 @@ HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING HIREDIS_CPE_ID_VENDOR = redislabs HIREDIS_INSTALL_STAGING = YES + +HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON +HOST_HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON -DENABLE_SSL=OFF + # Set CMAKE_BUILD_TYPE to Release or the libraries will be suffixed with "d" -# resulting in a build failure with collectd -HIREDIS_CONF_OPTS = -DCMAKE_BUILD_TYPE=Release -DDISABLE_TESTS=ON +# resulting in build failures when linking. +HIREDIS_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release +HOST_HIREDIS_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy) HIREDIS_CONF_OPTS += -DENABLE_SSL=ON @@ -22,4 +27,11 @@ else HIREDIS_CONF_OPTS += -DENABLE_SSL=OFF endif +# We may be a ccache dependency, so we can't use ccache; reset the +# options set by the cmake infra. +HOST_HIREDIS_CONF_OPTS += \ + -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER + $(eval $(cmake-package)) +$(eval $(host-cmake-package)) From yann.morin.1998 at free.fr Tue Feb 7 11:47:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:47:08 +0100 Subject: [Buildroot] [git commit branch/next] package/bash: fix strtoimax builtin inclusion logic Message-ID: <20230220205252.251628648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12d85e9646ed89552c732775de000ad0b436a139 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Backport fixes from upstream to fix an issue where the strtoimax builtin got built when not necessary. This resolves bash static builds issues when using musl and uClibc. We fix both the m4 file and configure in that order, to be safe andnot trigger an automatic autoreconf (even though bash does not have a rule to automatically regenerate configure if an m4 file changes). Fixes: http://autobuild.buildroot.org/results/f8c/f8cb91f7f9ac6a46bb2ecfc22c1e42cf699f28d3// http://autobuild.buildroot.org/results/b0e/b0e5fcab9eeb799e31bca27fcb7280b728349bc6// Upstream: https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 Signed-off-by: Vincent Fazio [yann.morin.1998 at free.fr: - patch configure after the m4 file - add blurb in commit log to explain that ] Signed-off-by: Yann E. MORIN --- ...re-invert-condition-for-strtoimax-builtin.patch | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch new file mode 100644 index 0000000000..c412dcfce2 --- /dev/null +++ b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch @@ -0,0 +1,62 @@ +From 754e0d1edc1c01b18f4890de7c58f7610e589d76 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 03:55:28 -0600 +Subject: [PATCH] configure: invert condition for strtoimax builtin + +Previously, bash would attempt to build a replacement for strtoimax if +it found that the C library had the function already declared. + +This caused build errors when linking against static libraries that did +not define the function as a weak alias but, in reality, was a logic +error since bash should only provide it's own implementation if one is +not provided by the C library. + +Now, fix this by inverting the logic. + +Upstream: + https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 + +Signed-off-by: Vincent Fazio +[yann.morin.1998 at free.fr: patch configure after the m file] +Signed-off-by: Yann E. MORIN +--- + configure | 6 +++++- + m4/strtoimax.m4 | 5 ++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 +index 30985723..fa43ac7b 100644 +--- a/m4/strtoimax.m4 ++++ b/m4/strtoimax.m4 +@@ -29,7 +29,10 @@ AC_CACHE_VAL(bash_cv_func_strtoimax, + fi + ]) + AC_MSG_RESULT($bash_cv_func_strtoimax) +-if test $bash_cv_func_strtoimax = yes; then ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then ++AC_DEFINE([HAVE_DECL_STRTOIMAX], [1]) ++fi ++if test $bash_cv_func_strtoimax = no; then + AC_LIBOBJ(strtoimax) + fi + ]) +diff --git a/configure b/configure +index 47313753..6039cee7 100755 +--- a/configure ++++ b/configure +@@ -20443,7 +20443,11 @@ fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bash_cv_func_strtoimax" >&5 + printf "%s\n" "$bash_cv_func_strtoimax" >&6; } +-if test $bash_cv_func_strtoimax = yes; then ++if test "$ac_cv_have_decl_strtoimax" = "yes" ; then ++printf "%s\n" "#define HAVE_DECL_STRTOIMAX 1" >>confdefs.h ++ ++fi ++if test $bash_cv_func_strtoimax = no; then + case " $LIBOBJS " in + *" strtoimax.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strtoimax.$ac_objext" +-- +2.25.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:59:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:51 -0000 Subject: [Buildroot] [git commit branch/next] package/pkg-gemneric: don't add host-ccache dependency to host-{hiredis, pkgconf, zstd} Message-ID: <20230220205228.CEFF98648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75519b19c8d0763fc02647c6df55c67fbe3ac89e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Now that we made those three package never use ccache to build, we don't need to add the dependency to host-ccache for those packages. So far, this is harmless, but when we eventually bump ccache, those packages will be actual dependency of host-ccache, so we will then really want to not have them depend on host-ccache. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: split off into its own patch] Signed-off-by: Yann E. MORIN --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f24e03a325..f2bea01d7d 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -792,7 +792,7 @@ $(2)_EXTRACT_DEPENDENCIES += \ endif ifeq ($$(BR2_CCACHE),y) -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-hiredis host-pkgconf host-zstd,$(1)),) $(2)_DEPENDENCIES += host-ccache endif endif From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:07 +0100 Subject: [Buildroot] [git commit branch/next] package/rtl8821cu: fix build failure due to missing Linux options Message-ID: <20230220205254.515DB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=737964e2f12057a0d968a2f10197e80e91ba65eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/aea/aea6bc1e4f89bd1010dfdc9caa54c37edb567d5f/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8821cu/rtl8821cu.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk index 18222e0014..97f50d9633 100644 --- a/package/rtl8821cu/rtl8821cu.mk +++ b/package/rtl8821cu/rtl8821cu.mk @@ -9,6 +9,14 @@ RTL8821CU_SITE = $(call github,morrownr,8821cu-20210118,$(RTL8821CU_VERSION)) RTL8821CU_LICENSE = GPL-2.0 RTL8821CU_LICENSE_FILES = LICENSE +define RTL8821CU_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB) +endef + RTL8821CU_USER_EXTRA_CFLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ -DCONFIG_IOCTL_CFG80211 \ From peter at korsgaard.com Mon Feb 20 21:00:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:06 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-uri: bump version to 5.17 Message-ID: <20230220205230.03CD7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d924b20fc4fc2c2dc5476d2e8975cb127e8868e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-uri/perl-uri.hash | 4 ++-- package/perl-uri/perl-uri.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-uri/perl-uri.hash b/package/perl-uri/perl-uri.hash index a169fc067d..daf043347f 100644 --- a/package/perl-uri/perl-uri.hash +++ b/package/perl-uri/perl-uri.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d7fc1b1c88d03357aed2f03b455a223e URI-5.12.tar.gz -sha256 66abe0eaddd76b74801ecd28ec1411605887550fc0a45ef6aa744fdad768d9b3 URI-5.12.tar.gz +md5 63675c429cfb1df73d7d21a9302e1000 URI-5.17.tar.gz +sha256 5f7e42b769cb27499113cfae4b786c37d49e7c7d32dbb469602cd808308568f8 URI-5.17.tar.gz # computed by scancpan sha256 d4f0b7a8771dcb1eee79a38c2e466eb997e23565a6687dd1900a2027eabe12a0 LICENSE diff --git a/package/perl-uri/perl-uri.mk b/package/perl-uri/perl-uri.mk index b0ac885c10..d4bfcb44ef 100644 --- a/package/perl-uri/perl-uri.mk +++ b/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 5.12 +PERL_URI_VERSION = 5.17 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_URI_LICENSE = Artistic or GPL-1.0+ From peter at korsgaard.com Mon Feb 20 21:00:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:07 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-net-dns: bump version to 1.36 Message-ID: <20230220205229.E81A78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6375be324460f2e2de888e36f6b255b9033d5120 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-net-dns/perl-net-dns.hash | 4 ++-- package/perl-net-dns/perl-net-dns.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-net-dns/perl-net-dns.hash b/package/perl-net-dns/perl-net-dns.hash index 52f2f2bff2..a98ac3525d 100644 --- a/package/perl-net-dns/perl-net-dns.hash +++ b/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 f10276a44ce157cd5f709be4c70c34a8 Net-DNS-1.34.tar.gz -sha256 de756e3fb6addbd32beafc869c4dd1c6a0b3783c5ef56dbefc6809443a4b1d15 Net-DNS-1.34.tar.gz +md5 b70b74481908d995f57569ab7cfe6432 Net-DNS-1.36.tar.gz +sha256 143ba0e530f8b727be61ec052974cbf52df5b0afc0582d75b04809e0b2a95ebe Net-DNS-1.36.tar.gz # computed by scancpan sha256 1e44fcf65509b47a251eda0ce1f8bd6aefa13517e38cb1e95b8d36120fb15452 LICENSE diff --git a/package/perl-net-dns/perl-net-dns.mk b/package/perl-net-dns/perl-net-dns.mk index cfb16d8ded..f4c20c07ad 100644 --- a/package/perl-net-dns/perl-net-dns.mk +++ b/package/perl-net-dns/perl-net-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_DNS_VERSION = 1.34 +PERL_NET_DNS_VERSION = 1.36 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS PERL_NET_DNS_LICENSE = MIT From peter at korsgaard.com Tue Feb 7 21:26:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 22:26:57 +0100 Subject: [Buildroot] [git commit branch/next] package/libgtk3: bump to version 3.24.36 Message-ID: <20230220205253.A91A48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40866ae0ce6e71d01a132dfb7694daa2ec559184 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/37c/37c7db88622c93f1c58aff7431b638143ae741d3/ As the 3.24.5 release tarball was missing a file: https://gitlab.gnome.org/GNOME/gtk/-/issues/5355 Switch to meson infra and remove autotools specific patches as the autotools support has been dropped: https://download.gnome.org/sources/gtk+/3.24/gtk%2B-3.24.36.news host-libgtk3 is a hack which builds only gtk-update-icon-cache host-libgtk3 is used by libgtk3 & adwaita-icon-theme Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- ...-bridge.patch => 0001-disable-atk-bridge.patch} | 28 +++---- package/libgtk3/0001-no-gtk-doc.patch | 25 ------- ...-dependency-from-gtk-encode-symbolic-svg.patch} | 0 package/libgtk3/0002-fix-introspection-check.patch | 28 ------- package/libgtk3/Config.in | 1 + package/libgtk3/libgtk3.hash | 4 +- package/libgtk3/libgtk3.mk | 87 +++++----------------- 7 files changed, 35 insertions(+), 138 deletions(-) diff --git a/package/libgtk3/0003-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch similarity index 62% rename from package/libgtk3/0003-disable-atk-bridge.patch rename to package/libgtk3/0001-disable-atk-bridge.patch index 390fc012fa..f3e9bff2ba 100644 --- a/package/libgtk3/0003-disable-atk-bridge.patch +++ b/package/libgtk3/0001-disable-atk-bridge.patch @@ -5,21 +5,6 @@ add two new packages just for it: at-spi2-core and at-spi2-atk. Signed-off-by: Hadrien Boutteville ---- a/configure.ac -+++ b/configure.ac -@@ -1386,11 +1386,7 @@ - # Check for Accessibility Toolkit flags - ######################################## - --if test x$enable_x11_backend = xyes; then -- ATK_PACKAGES="atk atk-bridge-2.0" --else -- ATK_PACKAGES="atk" --fi -+ATK_PACKAGES="atk" - - PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) - --- a/gtk/a11y/gtkaccessibility.c +++ b/gtk/a11y/gtkaccessibility.c @@ -37,10 +37,6 @@ @@ -33,7 +18,7 @@ Signed-off-by: Hadrien Boutteville static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, -@@ -988,9 +984,5 @@ +@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) _gtk_accessibility_override_atk_util (); do_window_event_initialization (); @@ -43,3 +28,14 @@ Signed-off-by: Hadrien Boutteville - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); } +--- a/meson.build ++++ b/meson.build +@@ -564,7 +564,7 @@ if x11_enabled + xfixes_dep = dependency('xfixes', required: false) + xcomposite_dep = dependency('xcomposite', required: false) + fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) +- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) ++ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) + + backend_immodules += ['xim'] + diff --git a/package/libgtk3/0001-no-gtk-doc.patch b/package/libgtk3/0001-no-gtk-doc.patch deleted file mode 100644 index e1d3208022..0000000000 --- a/package/libgtk3/0001-no-gtk-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -Same patch as for systemd in commit -http://git.buildroot.net/buildroot/commit/?id=7144f2f04b70553 - -Fix deactivation of gtk-doc - -The tarball contains the Makefile for building documentation with gtk-doc, -Unfortunately the AM_CONDITIONAL variable is not the correct one, which -results in an error when running autoreconf. - -This patch fixes this issue. - -Signed-off-by: Eric Le Bihan -Signed-off-by: Hadrien Boutteville - ---- a/gtk-doc.make -+++ b/gtk-doc.make -@@ -300,7 +300,7 @@ - # - # Require gtk-doc when making dist - # --if HAVE_GTK_DOC -+if ENABLE_GTK_DOC - dist-check-gtkdoc: docs - else - dist-check-gtkdoc: diff --git a/package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch b/package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch similarity index 100% rename from package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch rename to package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch diff --git a/package/libgtk3/0002-fix-introspection-check.patch b/package/libgtk3/0002-fix-introspection-check.patch deleted file mode 100644 index 7edf7db71f..0000000000 --- a/package/libgtk3/0002-fix-introspection-check.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix HAVE_INTROSPECTION does not appear in AM_CONDITIONAL - -During autoreconf GOBJECT_INTROSPECTION_CHECK could not be resolved because we -don't have introspection which provides its custom m4 macro. Reconfigure fails -with: - -gdk/Makefile.am:196: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL -gtk/Makefile.am:1347: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL - -We avoid to add a copy of introspection.m4 in the m4 directory of libgtk3 by -adding a check, as performed in Systemd. - -Signed-off-by: Hadrien Boutteville - ---- a/configure.ac -+++ b/configure.ac -@@ -1690,7 +1690,10 @@ - # GObject introspection - ################################################## - --GOBJECT_INTROSPECTION_CHECK(introspection_required_version) -+m4_ifdef([GOBJECT_INTROSPECTION_CHECK], -+ [GOBJECT_INTROSPECTION_CHECK(introspection_required_version)], -+ [AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) -+ enable_introspection=no]) - - ################################################## - # colord module diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index bc8cacd9f5..82ca68d2da 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -88,6 +88,7 @@ config BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXI help diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 1715b94e73..9fed2c9df2 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.35.sha256sum -sha256 ec10fe6d712ef0b3c63b5f932639c9d1ae99fce94f500f6f06965629fef60bd1 gtk+-3.24.35.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.36.sha256sum +sha256 27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691 gtk+-3.24.36.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 4c93413fb2..283c129cef 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).35 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).36 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ @@ -13,69 +13,42 @@ LIBGTK3_LICENSE_FILES = COPYING LIBGTK3_CPE_ID_VENDOR = gnome LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_AUTORECONF = YES - -LIBGTK3_CONF_ENV = \ - ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/bin/gtk-update-icon-cache \ - ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/bin/gdk-pixbuf-csource \ - PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf - -LIBGTK3_CONF_OPTS = \ - --disable-glibtest \ - --enable-explicit-deps=no -HOST_LIBGTK3_CONF_OPTS = --disable-introspection - -# Override pkg-config pkgdatadir variable, it needs the prefix -LIBGTK3_MAKE_OPTS = \ - WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols \ - LIBS=$(TARGET_NLS_LIBS) LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \ gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrender xlib_libXi - -LIBGTK3_CONF_OPTS += \ - --enable-x11-backend \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib +LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrandr xlib_libXrender xlib_libXi +LIBGTK3_CONF_OPTS += -Dx11_backend=true else -LIBGTK3_CONF_OPTS += --disable-x11-backend +LIBGTK3_CONF_OPTS += -Dx11_backend=false endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBGTK3_CONF_OPTS += --enable-introspection +LIBGTK3_CONF_OPTS += -Dintrospection=true LIBGTK3_DEPENDENCIES += gobject-introspection else -LIBGTK3_CONF_OPTS += --disable-introspection +LIBGTK3_CONF_OPTS += -Dintrospection=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) LIBGTK3_DEPENDENCIES += wayland wayland-protocols libxkbcommon -LIBGTK3_CONF_OPTS += --enable-wayland-backend +LIBGTK3_CONF_OPTS += -Dwayland_backend=true else -LIBGTK3_CONF_OPTS += --disable-wayland-backend +LIBGTK3_CONF_OPTS += -Dwayland_backend=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_BROADWAY),y) -LIBGTK3_CONF_OPTS += --enable-broadway-backend +LIBGTK3_CONF_OPTS += -Dbroadway_backend=true else -LIBGTK3_CONF_OPTS += --disable-broadway-backend +LIBGTK3_CONF_OPTS += -Dbroadway_backend=false endif ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -LIBGTK3_CONF_OPTS += --enable-xinerama +LIBGTK3_CONF_OPTS += -Dxinerama=yes LIBGTK3_DEPENDENCIES += xlib_libXinerama else -LIBGTK3_CONF_OPTS += --disable-xinerama -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -LIBGTK3_CONF_OPTS += --enable-xrandr -LIBGTK3_DEPENDENCIES += xlib_libXrandr -else -LIBGTK3_CONF_OPTS += --disable-xrandr +LIBGTK3_CONF_OPTS += -Dxinerama=no endif ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) @@ -83,55 +56,35 @@ LIBGTK3_DEPENDENCIES += xlib_libXcursor endif ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) -LIBGTK3_CONF_OPTS += --enable-xfixes LIBGTK3_DEPENDENCIES += xlib_libXfixes -else -LIBGTK3_CONF_OPTS += --disable-xfixes endif ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) -LIBGTK3_CONF_OPTS += --enable-xcomposite LIBGTK3_DEPENDENCIES += xlib_libXcomposite -else -LIBGTK3_CONF_OPTS += --disable-xcomposite endif ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y) -LIBGTK3_CONF_OPTS += --enable-xdamage LIBGTK3_DEPENDENCIES += xlib_libXdamage -else -LIBGTK3_CONF_OPTS += --disable-xdamage -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y) -LIBGTK3_CONF_OPTS += --enable-xkb -LIBGTK3_DEPENDENCIES += xlib_libxkbfile -else -LIBGTK3_CONF_OPTS += --disable-xkb endif ifeq ($(BR2_PACKAGE_CUPS),y) -LIBGTK3_CONF_OPTS += --enable-cups -LIBGTK3_CONF_ENV += ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config +LIBGTK3_CONF_OPTS += -Dprint_backends=cups LIBGTK3_DEPENDENCIES += cups else -LIBGTK3_CONF_OPTS += --disable-cups +LIBGTK3_CONF_OPTS += -Dprint_backends=auto endif ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y) +LIBGTK3_CONF_OPTS += -Ddemos=true -Dexamples=true LIBGTK3_DEPENDENCIES += hicolor-icon-theme shared-mime-info else -define LIBGTK3_REMOVE_DEMOS - $(RM) $(TARGET_DIR)/usr/bin/gtk3-demo \ - $(TARGET_DIR)/usr/bin/gtk3-demo-application -endef -LIBGTK3_POST_INSTALL_TARGET_HOOKS += LIBGTK3_REMOVE_DEMOS +LIBGTK3_CONF_OPTS += -Ddemos=false -Dexamples=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_TESTS),y) -LIBGTK3_CONF_OPTS += --enable-installed-tests +LIBGTK3_CONF_OPTS += -Dtests=true -Dinstalled_tests=true else -LIBGTK3_CONF_OPTS += --disable-installed-tests +LIBGTK3_CONF_OPTS += -Dtests=false -Dinstalled_tests=false endif define LIBGTK3_COMPILE_GLIB_SCHEMAS @@ -198,5 +151,5 @@ define LIBGTK3_UPDATE_ICON_CACHE endef LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-generic-package)) From peter at korsgaard.com Mon Feb 20 21:00:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:08 -0000 Subject: [Buildroot] [git commit branch/next] package/iw: bump version to 5.19 Message-ID: <20230220205230.152128648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c21710040224448d71d4417e166cdd2c7f6a06b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Nicolas Cavallari Signed-off-by: Peter Korsgaard --- package/iw/iw.hash | 2 +- package/iw/iw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iw/iw.hash b/package/iw/iw.hash index 33dd117368..376dc3b499 100644 --- a/package/iw/iw.hash +++ b/package/iw/iw.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/iw/sha256sums.asc -sha256 4c44e42762f903f9094ba5a598998c800a97a62afd6fd31ec1e0a799e308659c iw-5.16.tar.xz +sha256 f167bbe947dd53bb9ebc0c1dcef5db6ad73ac1d6084f2c6f9376c5c360cc4d4e iw-5.19.tar.xz # Locally calculated sha256 5932fb70481e128940168a5fdf133e6454293c0865c7e757874b235cb6daa2af COPYING diff --git a/package/iw/iw.mk b/package/iw/iw.mk index 9bf6ddbfc6..60ada9d57f 100644 --- a/package/iw/iw.mk +++ b/package/iw/iw.mk @@ -4,7 +4,7 @@ # ################################################################################ -IW_VERSION = 5.16 +IW_VERSION = 5.19 IW_SOURCE = iw-$(IW_VERSION).tar.xz IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw IW_LICENSE = ISC From thomas.petazzoni at bootlin.com Tue Feb 7 21:57:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:57:06 +0100 Subject: [Buildroot] [git commit branch/next] package/xz: fix microblaze compiles Message-ID: <20230220205254.2CE348648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bed21bb9b462bece7cd1b9741643aa553ced4d35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Patch xz to check if __attribute__((symver ..)) is supported via a compile check during configure. Fixes: http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni --- .../xz/0001-Detect-symver-attribute-support.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch new file mode 100644 index 0000000000..9ec43ea7a0 --- /dev/null +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -0,0 +1,61 @@ +From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 08:51:24 -0600 +Subject: [PATCH] Detect symver attribute support + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://github.com/tukaani-project/xz/pull/32 +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vincent Fazio +--- + configure.ac | 9 +++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5ad5589..08c623a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -791,6 +791,15 @@ else + time with Libtool if neither --with-pic nor + --without-pic is used). This define must be + used together with liblzma_linux.map.]) ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE( ++ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ])], ++ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], ++ [Define to 1 if GCC supports the symver attribute])], ++ []) ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic +diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h +index 11fec52..1d2ef9c 100644 +--- a/src/liblzma/common/common.h ++++ b/src/liblzma/common/common.h +@@ -76,7 +76,7 @@ + // too (which doesn't support __symver__) so use it to detect if __symver__ + // is available. This should be far more reliable than looking at compiler + // version macros as nowadays especially __GNUC__ is defined by many compilers. +-# if lzma_has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define LZMA_SYMVER_API(extnamever, type, intname) \ + extern __attribute__((__symver__(extnamever))) \ + LZMA_API(type) intname +-- +2.25.1 + From peter at korsgaard.com Mon Feb 20 21:00:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:09 -0000 Subject: [Buildroot] [git commit branch/next] configs/chiliboard: bump linux to 6.1.4 Message-ID: <20230220205230.2167886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3842ca3c66c6368fd13a7329a518c4d02b1beb6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- configs/grinn_chiliboard_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig index 80f3077b76..df483d991a 100644 --- a/configs/grinn_chiliboard_defconfig +++ b/configs/grinn_chiliboard_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/chiliboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-chiliboard" From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:33 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Giulio Benetti to package rtl8821cu Message-ID: <20230220205254.5C7B28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfad9bef35e984f00ae70f1cd51cc75b89ff5efc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index d7c4d03c4c..2cb3361c83 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1163,6 +1163,7 @@ F: package/rtl8723bu/ F: package/rtl8723ds/ F: package/rtl8812au-aircrack-ng/ F: package/rtl8821au/ +F: package/rtl8821cu/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ F: package/sunxi-tools/ From thomas.petazzoni at bootlin.com Wed Feb 8 08:54:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:54:14 +0100 Subject: [Buildroot] [git commit branch/next] package/libva: switch to meson Message-ID: <20230220205254.8C23A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17be7d028c193dc1160a4cb9313efe37326e7aa9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The time between version 2.17.0 being tagged and the release of its tarball version containing autoconf scripts was three weeks now. With the switch to meson we can directly use the github-generated tarball while not needing to run autoreconf. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libva/libva.hash | 4 +--- package/libva/libva.mk | 19 +++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 700ace0378..780c186069 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,5 +1,3 @@ -# From https://github.com/intel/libva/releases/download/2.17.0/libva-2.17.0.tar.bz2.sha1sum -sha1 997f7b3111bc5a4d32ec72e9d7f9fcfca41e4923 libva-2.17.0.tar.bz2 # Locally computed -sha256 f3e5eb27c305e05a9bb62703d1915a127301cc0c4f9f209025767432230c4eac libva-2.17.0.tar.bz2 +sha256 8940541980ef998a36cd8f6ad905e81838ea4ddf56dc479ed2bebd12711e6001 libva-2.17.0.tar.gz sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index c6b9f63b10..f50010d9fc 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -5,8 +5,7 @@ ################################################################################ LIBVA_VERSION = 2.17.0 -LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 -LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) +LIBVA_SITE = $(call github,intel,libva,$(LIBVA_VERSION)) LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING LIBVA_INSTALL_STAGING = YES @@ -14,25 +13,25 @@ LIBVA_DEPENDENCIES = host-pkgconf libdrm # libdrm is a hard-dependency LIBVA_CONF_OPTS = \ - --enable-drm \ - --with-drivers-path="/usr/lib/va" + -Ddisable_drm=false \ + -Ddriverdir="/usr/lib/va" ifeq ($(BR2_PACKAGE_XORG7),y) LIBVA_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes -LIBVA_CONF_OPTS += --enable-x11 +LIBVA_CONF_OPTS += -Dwith_x11=yes ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) LIBVA_DEPENDENCIES += libgl -LIBVA_CONF_OPTS += --enable-glx +LIBVA_CONF_OPTS += -Dwith_glx=yes endif else -LIBVA_CONF_OPTS += --disable-glx --disable-x11 +LIBVA_CONF_OPTS += -Dwith_glx=no -Dwith_x11=no endif ifeq ($(BR2_PACKAGE_WAYLAND),y) LIBVA_DEPENDENCIES += wayland -LIBVA_CONF_OPTS += --enable-wayland +LIBVA_CONF_OPTS += -Dwith_wayland=yes else -LIBVA_CONF_OPTS += --disable-wayland +LIBVA_CONF_OPTS += -Dwith_wayland=no endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From peter at korsgaard.com Mon Feb 20 21:00:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:10 -0000 Subject: [Buildroot] [git commit branch/next] configs/liteboard: bump linux to 6.1.4 Message-ID: <20230220205230.390EF81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5c509bcc0e28a71d58248158e904315486624bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- configs/grinn_liteboard_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig index 9cad66e15a..ab22911d66 100644 --- a/configs/grinn_liteboard_defconfig +++ b/configs/grinn_liteboard_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/liteboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard" From thomas.petazzoni at bootlin.com Wed Feb 8 08:54:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:54:35 +0100 Subject: [Buildroot] [git commit branch/next] package/libva-utils: bump version to 2.17.1 Message-ID: <20230220205254.981828648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9231fe0d6eeb6cdf373715d35b2203d34fd9e859 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/intel/libva-utils/blob/v2.17-branch/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libva-utils/libva-utils.hash | 2 +- package/libva-utils/libva-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 95bcee782b..41374a2ff6 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 646c9bfff6a83504c48de2c786c9514ca30c5e916127faf00f143ef8147ee950 libva-utils-2.16.0.tar.gz +sha256 6ea5993c3eba230a979fa9d35b4cad8df06d4474a773dc0918033bf50353f966 libva-utils-2.17.1.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index 5feaa36995..3dc8cdacde 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.16.0 +LIBVA_UTILS_VERSION = 2.17.1 LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 21:00:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:12 -0000 Subject: [Buildroot] [git commit branch/next] configs/liteboard: bump u-boot to 2023.01 Message-ID: <20230220205230.4B9D7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=895a5562c02b7f1ac762f17dcd08ee8b2a39e4f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- configs/grinn_liteboard_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig index ab22911d66..3ae4a2a0b5 100644 --- a/configs/grinn_liteboard_defconfig +++ b/configs/grinn_liteboard_defconfig @@ -16,7 +16,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="liteboard" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y From peter at korsgaard.com Mon Feb 20 21:00:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:12 -0000 Subject: [Buildroot] [git commit branch/next] package/libsigc: bump to version 3.4.0 Message-ID: <20230220205230.767D08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb066af7f9d84abf890c5692879477aaca36bff8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/libsigcplusplus/libsigcplusplus/blob/3.4.0/NEWS Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- package/libsigc/libsigc.hash | 4 ++-- package/libsigc/libsigc.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libsigc/libsigc.hash b/package/libsigc/libsigc.hash index 046584fc2b..a358732faa 100644 --- a/package/libsigc/libsigc.hash +++ b/package/libsigc/libsigc.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.2/libsigc++-3.2.0.sha256sum -sha256 8cdcb986e3f0a7c5b4474aa3c833d676e62469509f4899110ddf118f04082651 libsigc++-3.2.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.4/libsigc++-3.4.0.sha256sum +sha256 02e2630ffb5ce93cd52c38423521dfe7063328863a6e96d41d765a6116b8707e libsigc++-3.4.0.tar.xz # Locally calculated sha256 97628afebc60f026f5c2b25d7491c46a5c4ee61f693e7cfa07fbd2c03605979b COPYING diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk index eca4111ff6..2de49a0c1c 100644 --- a/package/libsigc/libsigc.mk +++ b/package/libsigc/libsigc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSIGC_VERSION_MAJOR = 3.2 +LIBSIGC_VERSION_MAJOR = 3.4 LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).0 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) @@ -13,6 +13,7 @@ LIBSIGC_LICENSE = LGPL-3.0+ LIBSIGC_LICENSE_FILES = COPYING LIBSIGC_CONF_OPTS = \ -Dbuild-examples=false \ + -Dbuild-tests=false \ -Dvalidation=false $(eval $(meson-package)) From peter at korsgaard.com Wed Feb 8 10:47:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:47:01 +0100 Subject: [Buildroot] [git commit branch/next] package/timescaledb: bump version to 2.9.3 Message-ID: <20230220205254.BAE328648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35423540c4eb0155f73b898539e00b72ed5f2b32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/timescale/timescaledb/releases/tag/2.9.3 Signed-off-by: Maxim Kochetkov 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 a6560eb326..2fd14e6c1a 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 883638f2e79d25ec88ee58f603f3c81c999b6364cb4c799919d363f04089b47b timescaledb-2.9.1.tar.gz +sha256 ff0820891646a772aceab19ee0f7da0a5343dc53b9a72c965ab70f723d231d5c timescaledb-2.9.3.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 44e365285b..e3c94ed2fe 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.9.1 +TIMESCALEDB_VERSION = 2.9.3 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 21:00:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:14 -0000 Subject: [Buildroot] [git commit branch/next] board/orangepi-zero-plus: bump Linux/U-Boot and switch to extlinux Message-ID: <20230220205230.6785D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19eaece70a9c7aac8b26bd09c1a49b30e29f824a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Follow changes to other OrangePi boards, most importantly orangepi-zero-plus2, which this board support is based on. This includes switching to extlinux as boot mechanism and dropping custom U-Boot boot script. Rootfs image no longer fits into default 60M (mostly due to Linux modules), so increase it to 120M. While at it, bump Linux to 6.1.4 and U-Boot to 2023.01. Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-zero-plus/boot.cmd | 6 ---- board/orangepi/orangepi-zero-plus/genimage.cfg | 40 -------------------------- configs/orangepi_zero_plus_defconfig | 27 +++++++++-------- 3 files changed, 15 insertions(+), 58 deletions(-) diff --git a/board/orangepi/orangepi-zero-plus/boot.cmd b/board/orangepi/orangepi-zero-plus/boot.cmd deleted file mode 100644 index 18c4d521af..0000000000 --- a/board/orangepi/orangepi-zero-plus/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero-plus/genimage.cfg b/board/orangepi/orangepi-zero-plus/genimage.cfg deleted file mode 100644 index a8f3161c39..0000000000 --- a/board/orangepi/orangepi-zero-plus/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-zero-plus.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig index e8de5c203d..26a25bd9f8 100644 --- a/configs/orangepi_zero_plus_defconfig +++ b/configs/orangepi_zero_plus_defconfig @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" @@ -17,35 +17,38 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=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_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-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-zero-plus/boot.cmd" +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# 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-plus/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" From arnout at mind.be Tue Feb 7 16:26:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 17:26:31 +0100 Subject: [Buildroot] [git commit branch/next] package/{rust, rust-bin}: bump to version 1.67.0 Message-ID: <20230220205253.3C779828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cffe45f91bc5aed2a2a56f84e3a34b6385f70ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Link to Rust 1.67.0 announcement: https://blog.rust-lang.org/2023/01/26/Rust-1.67.0.html Signed-off-by: James Hilliard Tested-by: Sebastian Weyer Signed-off-by: Arnout Vandecappelle --- package/rust-bin/rust-bin.hash | 252 ++++++++++++++++++++--------------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index adf1799ad7..d00e6342e8 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 a1279760f91b3571733e0b0268128d143be2734916753900b5fe7b8ecc3c0900 rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 835b4e1b4d396674f7866a83b9a4f44db16fd12f01a7eaed527282b3700a9b92 rust-1.66.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc -sha256 c7349617c42274bf50f6e3662dfb4f6832a93780099c3bb510be1a5b93d04c37 rust-1.66.1-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 fc38663870f0af47a27241d980ca886c3f7d432267920deb412ac8576bef68f0 rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 2b1a6c54db49a9e62d60cc96c1768f405e0f4c59d698186bf3a28a1bb017b6b5 rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 777d3a650448c15048710282388e90d10740540f570f5d17ed4a2dbdabb89552 rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 875bb310bae7c8c1d2d228a49aa4b547608b6c807ddc9ec44bc87272c77d869b rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 89164ccf75909b3d02bdcb787e33876cad87e55ab0e6239b030b4b6631ed356a rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 e83f9fc473072db23376783595a008cdd9b2f2e9b3be109e55939392864840eb rust-1.66.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 a201aa4595ec8015662b7103b1409a4787c6d1f1d540bb68746633527d855858 rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24 rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc -sha256 520ac446f20490685cc4d73192cfbb4c9b9e55c884aa4ae2b098e3a54d891de8 rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 42afd189ef64988f64976f767a734734bccd7c71e578780e902148c98226fa29 rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 506126773af9c3dacc506776a0b2e12fe6fa0c95eaf4f4ebb5cdbd335feb83fa rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 3d21b478fbf07bd27902bdd189e6988341f0c2c0108b538f926cea3031bc8ea6 rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.asc -sha256 5282fc97111a7eafbead3463ed7bc0f3065332f21aec6a39a740157fe42f943a rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 0ebf0178bbe9c5572d1db89e190dee23aef0e2f667995abedbd66e33d0bd73ab rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 938e7442c21ea0895c44ec78fa718ea1d3abe32ed0425ed328c905e188af250e rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 bdc491f4c05669e7a3382b6bfdaeaa20e2cfa5ef553305df0e0d73729a45e6e4 rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 d75c6dc3c00d662b0d3f6ce7fde0f76057542edfbc97a20b29247842c8a711d2 rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 830285e5388081c68fac9dc955aa824a4d919b0e24eadc6e0b95b30103d79db9 rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 d720bd1e493f53797f90d83dbe6d52ecbe1ff3cae282f4b2e18c37fe92c9adf6 rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.asc -sha256 90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17 rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.asc -sha256 c4bab2d63223d0c6e63806082e30d8c38b37eefc10ee2e7380971e3012c00bca rust-std-1.66.1-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.asc -sha256 52013329eb6697d94f5dce01dd509b4b93b473c18a3a2c05d0230b9dfeab14d1 rust-std-1.66.1-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.asc -sha256 e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568 rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.asc -sha256 23f917eccaca59d4c911eb96d8ffefe86834dbcdf902c9ab6dad8558c31c4575 rust-std-1.66.1-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 70d1406e0981d5d31c1d3f85c848bba0476e0ff6203e7706f66b4d2212f01b66 rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 0fd221d4b4205ce548e83f0e7416c8332eb12b64d5a43c0b3ed61e9f7d6edf13 rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 132d6d5750a877972ebc6f23e831f2ef3077465b2ab24ca645d32ea83c496fe3 rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 533f370368ac8b6192e1450289c64544ebf9cacc38c3a52ef6c0ecded7ee6fa5 rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.asc -sha256 d7028820888d0decde047a6e77b866e690532aa09522c9a23a3fbf8780a72257 rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1 rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35 rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770 rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062 rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927 rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377 rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc -sha256 a9710727ba28955deb7fbec799faed19486c9af3c7e3088ec6659a257515ffca rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc +sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc +sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc +sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc +sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index 89009288f4..d62ce39cfc 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.66.1 +RUST_BIN_VERSION = 1.67.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 545a452bf0..2a260ca64f 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc -sha256 07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe rustc-1.66.1-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc +sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 691683b492..d14ad3a3e7 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.66.1 +RUST_VERSION = 1.67.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From peter at korsgaard.com Mon Feb 20 21:00:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:15 -0000 Subject: [Buildroot] [git commit branch/next] package/libsigc: switch to https download Message-ID: <20230220205230.86695828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21175102a0cd544a789c3cedead7d5141191275c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- package/libsigc/libsigc.hash | 2 +- package/libsigc/libsigc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsigc/libsigc.hash b/package/libsigc/libsigc.hash index a358732faa..6becfb19ce 100644 --- a/package/libsigc/libsigc.hash +++ b/package/libsigc/libsigc.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.4/libsigc++-3.4.0.sha256sum +# From https://download.gnome.org/sources/libsigc++/3.4/libsigc++-3.4.0.sha256sum sha256 02e2630ffb5ce93cd52c38423521dfe7063328863a6e96d41d765a6116b8707e libsigc++-3.4.0.tar.xz # Locally calculated diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk index 2de49a0c1c..c054575ea6 100644 --- a/package/libsigc/libsigc.mk +++ b/package/libsigc/libsigc.mk @@ -7,7 +7,7 @@ LIBSIGC_VERSION_MAJOR = 3.4 LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).0 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz -LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) +LIBSIGC_SITE = https://download.gnome.org/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) LIBSIGC_INSTALL_STAGING = YES LIBSIGC_LICENSE = LGPL-3.0+ LIBSIGC_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for widgets gtk backend Message-ID: <20230220205255.1866386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=889f451caf22f5b36ff8430d7927e8cb3a56681e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2a0afa6d27..911375aa6d 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -217,6 +217,15 @@ endif ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON + +# only enable gtk support if libgtk3 X11 backend is enabled +ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy) +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=ON +QT6BASE_DEPENDENCIES += libgtk3 +else +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif From peter at korsgaard.com Mon Feb 20 21:00:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:16 -0000 Subject: [Buildroot] [git commit branch/next] package/python-ujson: bump to version 5.7.0 Message-ID: <20230220205230.A291F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f397197b3658968931a5a4b273fcebf5fdca1569 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-ujson/python-ujson.hash | 4 ++-- package/python-ujson/python-ujson.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-ujson/python-ujson.hash b/package/python-ujson/python-ujson.hash index 3dfc681167..759cafc250 100644 --- a/package/python-ujson/python-ujson.hash +++ b/package/python-ujson/python-ujson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ujson/json -md5 45a74680e2936470821bf74a8f043a71 ujson-5.6.0.tar.gz -sha256 f881e2d8a022e9285aa2eab6ba8674358dbcb2b57fa68618d88d62937ac3ff04 ujson-5.6.0.tar.gz +md5 f93bd7aa33e3e6ed41c9e3782abe7b48 ujson-5.7.0.tar.gz +sha256 e788e5d5dcae8f6118ac9b45d0b891a0d55f7ac480eddcb7f07263f2bcf37b23 ujson-5.7.0.tar.gz # Locally computed sha256 checksums sha256 6a00a8f8b4050303368b694147bde1aed9c96bdff869c181dbbf3ccb784a1501 LICENSE.txt diff --git a/package/python-ujson/python-ujson.mk b/package/python-ujson/python-ujson.mk index 24ad4822b8..3afd33cb5a 100644 --- a/package/python-ujson/python-ujson.mk +++ b/package/python-ujson/python-ujson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UJSON_VERSION = 5.6.0 +PYTHON_UJSON_VERSION = 5.7.0 PYTHON_UJSON_SOURCE = ujson-$(PYTHON_UJSON_VERSION).tar.gz -PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/45/48/466d672c53fcb93d64a2817e3a0306214103e3baba109821c88e1150c100 +PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/43/1a/b0a027144aa5c8f4ea654f4afdd634578b450807bb70b9f8bad00d6f6d3c PYTHON_UJSON_SETUP_TYPE = setuptools PYTHON_UJSON_LICENSE = BSD-3-Clause PYTHON_UJSON_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Wed Feb 8 10:48:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:48:59 +0100 Subject: [Buildroot] [git commit branch/next] package/osm2pgsql: bump version to 1.8.0 Message-ID: <20230220205254.D276086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d27f4c311c19f5ae130ec1941e964976d3a4f2b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.8.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index 505a4496c8..b5b76c15c6 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94c72ceb3c401c816499339f8765c62efbf40685a798dcdf9a4bf7dbedf6c7a5 osm2pgsql-1.7.2.tar.gz +sha256 b266b50f46fe4d1caddab61d26b39f10ea33b896ec23b8b3e294be4666e7b927 osm2pgsql-1.8.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 2bc8d41e6e..9cdfb44ce0 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.7.2 +OSM2PGSQL_VERSION = 1.8.0 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 21:00:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:17 -0000 Subject: [Buildroot] [git commit branch/next] package/redis: bump to v7.0.7 Message-ID: <20230220205230.D32128648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbdc0f8ef8bdbe919925e281b2d5ce1583fd1aab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next >From the release notes (https://github.com/redis/redis/blob/7.0.7/00-RELEASENOTES) ================================================================================ Redis 7.0.7 Released Fri Dec 16 12:00:00 IST 2022 ================================================================================ Upgrade urgency: MODERATE, Contains fix for a regression in Geo commands. ================================================================================ Redis 7.0.6 Released Mon Dec 12 12:00:00 IST 2022 ================================================================================ Upgrade urgency: MODERATE, Contains fixes for a few non-critical or unlikely bugs, and some dramatic optimizations to Geo, EVAL, and Sorted sets commands. Signed-off-by: Titouan Christophe Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 2 +- package/redis/redis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index a10df46031..eb8c21be98 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 67054cc37b58c125df93bd78000261ec0ef4436a26b40f38262c780e56315cc3 redis-7.0.5.tar.gz +sha256 8d327d7e887d1bb308fc37aaf717a0bf79f58129e3739069aaeeae88955ac586 redis-7.0.7.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 7a637c106c..b08be11538 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 7.0.5 +REDIS_VERSION = 7.0.7 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Wed Feb 8 10:50:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:50:37 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for fontconfig/harfbuzz Message-ID: <20230220205254.E9C908648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf5c0db35a06455182f6568ab2cfa69346f8b3a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Additionally the harfbuzz license file is added and the hash for this is also added to the hash file Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 17 +++++++++++++++++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 1810b1586d..ac2058c901 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -59,6 +59,23 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_FONTCONFIG + bool "fontconfig support" + select BR2_PACKAGE_FONTCONFIG + help + This option enables Fontconfig support using the system + fontconfig library. + +config BR2_PACKAGE_QT6BASE_HARFBUZZ + bool "harfbuzz support" + select BR2_PACKAGE_HARFBUZZ if \ + BR2_TOOLCHAIN_HAS_SYNC_4 && \ + BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + This option enables HarfBuzz support (either system harfbuzz + if the toolchain supports __sync for 4 bytes, or the qt + provided one which avoids this dependency by using QAtomic). + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 6544a371c6..fedbbba79f 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -11,3 +11,4 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt sha256 d040359701c01996a017d5c515678929cd1b0625e64cb86db44025fbb6cdf1fc LICENSES/MIT.txt sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index bcf2464590..6c155a4abb 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -172,6 +172,29 @@ else QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_HARFBUZZ),y) +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=ON +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y) +# system harfbuzz in case __sync for 4 bytes is supported +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=OFF +QT6BASE_DEPENDENCIES += harfbuzz +else #BR2_TOOLCHAIN_HAS_SYNC_4 +# qt harfbuzz otherwise (using QAtomic instead) +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=ON +QT6BASE_LICENSE += , MIT (harfbuzz) +QT6BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON +QT6BASE_DEPENDENCIES += fontconfig +else +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From peter at korsgaard.com Mon Feb 20 21:00:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:18 -0000 Subject: [Buildroot] [git commit branch/next] package/python-watchdog: bump to version 2.2.1 Message-ID: <20230220205230.B3343828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a598dedd8090d3c7ba4ea8c323a702289586647 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-watchdog/python-watchdog.hash | 4 ++-- package/python-watchdog/python-watchdog.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-watchdog/python-watchdog.hash b/package/python-watchdog/python-watchdog.hash index 3bacccf2d6..0653787110 100644 --- a/package/python-watchdog/python-watchdog.hash +++ b/package/python-watchdog/python-watchdog.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/watchdog/json -md5 d029b806814bcba26745c26769a847bc watchdog-2.2.0.tar.gz -sha256 83cf8bc60d9c613b66a4c018051873d6273d9e45d040eed06d6a96241bd8ec01 watchdog-2.2.0.tar.gz +md5 04cda210c7ffd04582d2466328ee7368 watchdog-2.2.1.tar.gz +sha256 cdcc23c9528601a8a293eb4369cbd14f6b4f34f07ae8769421252e9c22718b6f watchdog-2.2.1.tar.gz # Locally computed sha256 checksums sha256 02c8760f988a76e92a9d6cb525456a86f7b0fd1953870dd491de5955cb974d41 COPYING sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-watchdog/python-watchdog.mk b/package/python-watchdog/python-watchdog.mk index bb9f145e16..9c058e38ad 100644 --- a/package/python-watchdog/python-watchdog.mk +++ b/package/python-watchdog/python-watchdog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WATCHDOG_VERSION = 2.2.0 +PYTHON_WATCHDOG_VERSION = 2.2.1 PYTHON_WATCHDOG_SOURCE = watchdog-$(PYTHON_WATCHDOG_VERSION).tar.gz -PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/c3/fb/bd960970258366b0704307ccd12617d64201407bfb6d31ae412d2762ccf1 +PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/11/6f/0396d373e039b89c60e23a1a9025edc6dd203121fe0af7d1427e85d5ec98 PYTHON_WATCHDOG_SETUP_TYPE = setuptools PYTHON_WATCHDOG_LICENSE = Apache-2.0 PYTHON_WATCHDOG_LICENSE_FILES = LICENSE COPYING From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for tslib Message-ID: <20230220205255.3C0D48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73d6df812d9eaccfad9cf4b5cb4fc53d30205e20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 3af6fd9f72..da42b2ae0c 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -216,6 +216,12 @@ config BR2_PACKAGE_QT6BASE_TEST help This options enables the Qt6Test library. +config BR2_PACKAGE_QT6BASE_TSLIB + bool "Enable Tslib support" + select BR2_PACKAGE_TSLIB + help + This options enables the Tslib plugin + config BR2_PACKAGE_QT6BASE_XML bool "XML module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 828fe57d0b..8db59bbc31 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -229,6 +229,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) +QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON +QT6BASE_DEPENDENCIES += tslib +else +QT6BASE_CONF_OPTS += -DFEATURE_tslib=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON QT6BASE_DEPENDENCIES += libegl libgbm From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for printsupport/cups Message-ID: <20230220205255.6085E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d195622f2388edd021c6f71ba78eb3d2f9539f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 8 ++++++++ package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index da42b2ae0c..7927975bff 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -153,6 +153,14 @@ config BR2_PACKAGE_QT6BASE_WIDGETS help This option enables the Qt6Widgets library. +config BR2_PACKAGE_QT6BASE_PRINTSUPPORT + bool "printing support" + # yes, print support needs widgets + depends on BR2_PACKAGE_QT6BASE_WIDGETS + help + This option enables printing support, optionally using CUPS + if available. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index f4e63ab8d9..7b57eba4ab 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -207,6 +207,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT),y) +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON +ifeq ($(BR2_PACKAGE_CUPS),y) +QT6BASE_CONF_OPTS += -DFEATURE_cups=ON +QT6BASE_DEPENDENCIES += cups +else +QT6BASE_CONF_OPTS += -DFEATURE_cups=OFF +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF +endif + ifeq ($(BR2_PACKAGE_LIBDRM),y) QT6BASE_CONF_OPTS += -DFEATURE_kms=ON QT6BASE_DEPENDENCIES += libdrm From peter at korsgaard.com Mon Feb 20 21:00:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:20 -0000 Subject: [Buildroot] [git commit branch/next] package/python-xlsxwriter: bump to version 3.0.6 Message-ID: <20230220205231.003B18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=431683def0785583705fb32dc1a54f82da65e423 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next License hash changed due to date update: https://github.com/jmcnamara/XlsxWriter/commit/ba92afc31a232322597709bf7ad4a3b14ca7b293 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-xlsxwriter/python-xlsxwriter.hash | 6 +++--- package/python-xlsxwriter/python-xlsxwriter.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-xlsxwriter/python-xlsxwriter.hash b/package/python-xlsxwriter/python-xlsxwriter.hash index 4363799079..4a4b946fcb 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.hash +++ b/package/python-xlsxwriter/python-xlsxwriter.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/xlsxwriter/json -md5 b08fcc4753c14aa64b9d99219475d91e XlsxWriter-3.0.3.tar.gz -sha256 e89f4a1d2fa2c9ea15cde77de95cd3fd8b0345d0efb3964623f395c8c4988b7f XlsxWriter-3.0.3.tar.gz +md5 3df433a1b6427d40af6e7cac36f0b5c4 XlsxWriter-3.0.6.tar.gz +sha256 2f9e5ea13343fe85486e349d4e5fdf746bb69dc7bc1dedfa9b5fae2bb48c0795 XlsxWriter-3.0.6.tar.gz # Locally computed sha256 checksums -sha256 6287be39bd007c8729f5c3cf8dfda9b462af725c1d06e3bf0e17b1532196a08f LICENSE.txt +sha256 b3b494c7e7456dad12ac1b3e61c60e850d60d3ce865fa056c4ce0ae680c03677 LICENSE.txt diff --git a/package/python-xlsxwriter/python-xlsxwriter.mk b/package/python-xlsxwriter/python-xlsxwriter.mk index 4055e52622..f05b10670c 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.mk +++ b/package/python-xlsxwriter/python-xlsxwriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLSXWRITER_VERSION = 3.0.3 +PYTHON_XLSXWRITER_VERSION = 3.0.6 PYTHON_XLSXWRITER_SOURCE = XlsxWriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz -PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/53/04/91ff43803c3e88c32aa272fdbda5859fc3c3b50b0de3a1e439cc57455330 +PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/d4/b5/cef6fadeaf316a3bbe82a506252081f2e6533cdf4b69ed64f8831ac01fb0 PYTHON_XLSXWRITER_SETUP_TYPE = setuptools PYTHON_XLSXWRITER_LICENSE = BSD-2-Clause PYTHON_XLSXWRITER_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Wed Feb 8 10:52:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:52:45 +0100 Subject: [Buildroot] [git commit branch/next] package/tinycompress: install to staging Message-ID: <20230220205255.6B77D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ee78c0a8b7854b4e8b260e1791909b8591ae5ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This will be needed for upcoming pipewire compress offload support. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/tinycompress/tinycompress.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinycompress/tinycompress.mk b/package/tinycompress/tinycompress.mk index 062233ec80..c9cfbb574b 100644 --- a/package/tinycompress/tinycompress.mk +++ b/package/tinycompress/tinycompress.mk @@ -9,5 +9,6 @@ TINYCOMPRESS_SOURCE = tinycompress-$(TINYCOMPRESS_VERSION).tar.bz2 TINYCOMPRESS_SITE = https://www.alsa-project.org/files/pub/tinycompress TINYCOMPRESS_LICENSE = BSD-3-Clause and LGPL-2.1 TINYCOMPRESS_LICENSE_FILES = COPYING +TINYCOMPRESS_INSTALL_STAGING = YES $(eval $(autotools-package)) From peter at korsgaard.com Mon Feb 20 21:00:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:21 -0000 Subject: [Buildroot] [git commit branch/next] package/libpjsip: security bump to version 2.13 Message-ID: <20230220205231.1027781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbc80c75570f535e991297602191c724ff33a04d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Fix CVE-2022-39269, CVE-2022-39244 and CVE-2022-31031: https://github.com/pjsip/pjproject/security/advisories/GHSA-wx5m-cj97-4wwg https://github.com/pjsip/pjproject/security/advisories/GHSA-fq45-m3f7-3mhj https://github.com/pjsip/pjproject/security/advisories/GHSA-26j7-ww69-c4qj - Drop patch (already in version) - libuuid configure option is available since https://github.com/pjsip/pjproject/commit/0b0488f17b41c5323028b522cc7323f2cd9b684c - libupnp is an optional dependency since https://github.com/pjsip/pjproject/commit/82247cb8c0441d0eafd18cb69e6c7bf55fc6a088 - libsrtp is optional since https://github.com/pjsip/pjproject/commit/fe6cbbc39764cae8ff6789a98f8ef8e85c63445c https://github.com/pjsip/pjproject/releases/tag/2.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...rge-pull-request-from-GHSA-26j7-ww69-c4qj.patch | 44 ---------------------- package/libpjsip/Config.in | 1 - package/libpjsip/libpjsip.hash | 2 +- package/libpjsip/libpjsip.mk | 28 ++++++++++---- 4 files changed, 22 insertions(+), 53 deletions(-) diff --git a/package/libpjsip/0001-Merge-pull-request-from-GHSA-26j7-ww69-c4qj.patch b/package/libpjsip/0001-Merge-pull-request-from-GHSA-26j7-ww69-c4qj.patch deleted file mode 100644 index 42b842a616..0000000000 --- a/package/libpjsip/0001-Merge-pull-request-from-GHSA-26j7-ww69-c4qj.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 450baca94f475345542c6953832650c390889202 Mon Sep 17 00:00:00 2001 -From: sauwming -Date: Tue, 7 Jun 2022 12:00:13 +0800 -Subject: [PATCH] Merge pull request from GHSA-26j7-ww69-c4qj - -[Retrieved from: -https://github.com/pjsip/pjproject/commit/450baca94f475345542c6953832650c390889202] -Signed-off-by: Fabrice Fontaine ---- - pjlib-util/src/pjlib-util/stun_simple.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/pjlib-util/src/pjlib-util/stun_simple.c b/pjlib-util/src/pjlib-util/stun_simple.c -index 722519584..d0549176d 100644 ---- a/pjlib-util/src/pjlib-util/stun_simple.c -+++ b/pjlib-util/src/pjlib-util/stun_simple.c -@@ -54,6 +54,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, - { - pj_uint16_t msg_type, msg_len; - char *p_attr; -+ int attr_max_cnt = PJ_ARRAY_SIZE(msg->attr); - - PJ_CHECK_STACK(); - -@@ -83,7 +84,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, - msg->attr_count = 0; - p_attr = (char*)buf + sizeof(pjstun_msg_hdr); - -- while (msg_len > 0) { -+ while (msg_len > 0 && msg->attr_count < attr_max_cnt) { - pjstun_attr_hdr **attr = &msg->attr[msg->attr_count]; - pj_uint32_t len; - pj_uint16_t attr_type; -@@ -111,6 +112,10 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, - p_attr += len; - ++msg->attr_count; - } -+ if (msg->attr_count == attr_max_cnt) { -+ PJ_LOG(4, (THIS_FILE, "Warning: max number attribute %d reached.", -+ attr_max_cnt)); -+ } - - return PJ_SUCCESS; - } diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in index 727d2ec3d0..980fada3d5 100644 --- a/package/libpjsip/Config.in +++ b/package/libpjsip/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_LIBPJSIP bool "libpjsip" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBSRTP help PJSIP is a free and open source multimedia communication library written in C language implementing standard based diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index b1ccdb2f37..9935575567 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d0feef6963b07934e821ba4328aecb4c36358515c1b3e507da5874555d713533 pjproject-2.12.1.tar.gz +sha256 4178bb9f586299111463fc16ea04e461adca4a73e646f8ddef61ea53dafa92d9 pjproject-2.13.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 4134d40da8..5cc0423f5d 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,11 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.12.1 +LIBPJSIP_VERSION = 2.13 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING LIBPJSIP_CPE_ID_VENDOR = teluu @@ -16,9 +15,6 @@ LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) -# 0001-Merge-pull-request-from-GHSA-26j7-ww69-c4qj.patch -LIBPJSIP_IGNORE_CVES += CVE-2022-31031 - LIBPJSIP_CFLAGS = $(TARGET_CFLAGS) -DPJ_HAS_IPV6=1 # relocation truncated to fit: R_68K_GOT16O @@ -40,8 +36,7 @@ LIBPJSIP_CONF_OPTS = \ --disable-l16-codec \ --disable-g722-codec \ --disable-ipp \ - --disable-silk \ - --with-external-srtp + --disable-silk # Note: aconfigure.ac is broken: --enable-epoll or --disable-epoll will # both enable it. But that's OK, epoll is better than the alternative, @@ -103,6 +98,22 @@ else LIBPJSIP_CONF_OPTS += --disable-libsamplerate endif +ifeq ($(BR2_PACKAGE_LIBSRTP),y) +LIBPJSIP_DEPENDENCIES += libsrtp +LIBPJSIP_CONF_OPTS += \ + --enable-libsrtp \ + --with-external-srtp +else +LIBPJSIP_CONF_OPTS += --disable-libsrtp +endif + +ifeq ($(BR2_PACKAGE_LIBUPNP),y) +LIBPJSIP_DEPENDENCIES += libupnp +LIBPJSIP_CONF_OPTS += --with-upnp=$(STAGING_DIR)/usr +else +LIBPJSIP_CONF_OPTS += --disable-upnp +endif + ifeq ($(BR2_PACKAGE_LIBV4L),y) # --enable-v4l2 is broken (check for libv4l2 will be omitted) LIBPJSIP_DEPENDENCIES += libv4l @@ -161,6 +172,9 @@ endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) LIBPJSIP_DEPENDENCIES += util-linux +LIBPJSIP_CONF_OPTS += --enable-libuuid +else +LIBPJSIP_CONF_OPTS += --disable-libuuid endif # disable build of test binaries From peter at korsgaard.com Wed Feb 8 10:55:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:55:07 +0100 Subject: [Buildroot] [git commit branch/next] package/pipewire: bump to version 0.3.65 Message-ID: <20230220205255.7646186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=247e2d0eb1e60f483044d58bed58c5ed321528f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add support for new compress-offload and pw-cat-ffmpeg features. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index d8b5b0cc86..0e027aaa55 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 24b218cf3bb1fb279c8c489c14cc9ae483e1da7b4c8215b2ee5a5ee831bae94f pipewire-0.3.62.tar.bz2 +sha256 c78c95cdff2774418f0a9468e94a1b2800761d322f13104df6501e1a0dc92558 pipewire-0.3.65.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 6bcda0a93d..976d7783b9 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.62 +PIPEWIRE_VERSION = 0.3.65 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) @@ -122,10 +122,10 @@ PIPEWIRE_CONF_OPTS += -Dbluez5=disabled -Dbluez5-codec-opus=disabled endif ifeq ($(BR2_PACKAGE_FFMPEG),y) -PIPEWIRE_CONF_OPTS += -Dffmpeg=enabled +PIPEWIRE_CONF_OPTS += -Dffmpeg=enabled -Dpw-cat-ffmpeg=enabled PIPEWIRE_DEPENDENCIES += ffmpeg else -PIPEWIRE_CONF_OPTS += -Dffmpeg=disabled +PIPEWIRE_CONF_OPTS += -Dffmpeg=disabled -Dpw-cat-ffmpeg=disabled endif ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) @@ -215,6 +215,13 @@ else PIPEWIRE_CONF_OPTS += -Dsdl2=disabled endif +ifeq ($(BR2_PACKAGE_TINYCOMPRESS),y) +PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled +PIPEWIRE_DEPENDENCIES += tinycompress +else +PIPEWIRE_CONF_OPTS += -Dcompress-offload=disabled +endif + ifeq ($(WEBRTC_AUDIO_PROCESSING),y) PIPEWIRE_CONF_OPTS += -Decho-cancel-webrtc=enabled PIPEWIRE_DEPENDENCIES += webrtc-audio-processing From peter at korsgaard.com Mon Feb 20 21:00:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:22 -0000 Subject: [Buildroot] [git commit branch/next] package/trinity: fix build with kernel >= 6.1 Message-ID: <20230220205231.2D7508648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49ca11e339c41ea2dd0484556b7b5beacff9fee9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with kernel >= 6.1: net/proto-decnet.c:5:10: fatal error: linux/dn.h: No such file or directory 5 | #include | ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/47e0a5e0b6fcf33ab4f9848d5d8c2be9e5283950 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/trinity/0004-drop-decnet.patch | 130 +++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/package/trinity/0004-drop-decnet.patch b/package/trinity/0004-drop-decnet.patch new file mode 100644 index 0000000000..15ba7f8e82 --- /dev/null +++ b/package/trinity/0004-drop-decnet.patch @@ -0,0 +1,130 @@ +From ec8dcc7faf13c57f5f6d785e4429818f1239a058 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 Jan 2023 20:50:18 +0100 +Subject: [PATCH] drop decnet + +Drop decnet as it has been removed since kernel 6.1 and +https://github.com/torvalds/linux/commit/1202cdd665315c525b5237e96e0bedc76d7e754f +resulting in the following build failure: + +net/proto-decnet.c:5:10: fatal error: linux/dn.h: No such file or directory + 5 | #include + | ^~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/47e0a5e0b6fcf33ab4f9848d5d8c2be9e5283950 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/kernelslacker/trinity/pull/41] +--- + include/net.h | 1 - + net/proto-decnet.c | 59 ---------------------------------------------- + net/proto-unix.c | 1 - + net/protocols.c | 1 - + 4 files changed, 62 deletions(-) + delete mode 100644 net/proto-decnet.c + +diff --git a/include/net.h b/include/net.h +index 99d55363..791e8090 100644 +--- a/include/net.h ++++ b/include/net.h +@@ -80,7 +80,6 @@ extern const struct netproto proto_atmpvc; + extern const struct netproto proto_atmsvc; + extern const struct netproto proto_x25; + extern const struct netproto proto_rose; +-extern const struct netproto proto_decnet; + extern const struct netproto proto_llc; + extern const struct netproto proto_netlink; + extern const struct netproto proto_packet; +diff --git a/net/proto-decnet.c b/net/proto-decnet.c +deleted file mode 100644 +index 7711cf00..00000000 +--- a/net/proto-decnet.c ++++ /dev/null +@@ -1,59 +0,0 @@ +-#include +-#include +-#include +-#include +-#include +-#include +-#include "net.h" +-#include "random.h" +-#include "utils.h" // RAND_ARRAY +-#include "compat.h" +- +-static void decnet_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen) +-{ +- struct sockaddr_dn *dn; +- unsigned int i; +- +- dn = zmalloc(sizeof(struct sockaddr_dn)); +- +- dn->sdn_family = PF_DECnet; +- dn->sdn_flags = rnd(); +- dn->sdn_objnum = rnd(); +- dn->sdn_objnamel = rnd() % 16; +- for (i = 0; i < dn->sdn_objnamel; i++) +- dn->sdn_objname[i] = rnd(); +- dn->sdn_add.a_len = RAND_BOOL(); +- dn->sdn_add.a_addr[0] = rnd(); +- dn->sdn_add.a_addr[1] = rnd(); +- *addr = (struct sockaddr *) dn; +- *addrlen = sizeof(struct sockaddr_dn); +-} +- +-static const unsigned int decnet_opts[] = { +- SO_CONDATA, SO_CONACCESS, SO_PROXYUSR, SO_LINKINFO, +- DSO_CONDATA, DSO_DISDATA, DSO_CONACCESS, DSO_ACCEPTMODE, +- DSO_CONACCEPT, DSO_CONREJECT, DSO_LINKINFO, DSO_STREAM, +- DSO_SEQPACKET, DSO_MAXWINDOW, DSO_NODELAY, DSO_CORK, +- DSO_SERVICES, DSO_INFO +-}; +- +-static void decnet_setsockopt(struct sockopt *so, __unused__ struct socket_triplet *triplet) +-{ +- so->level = SOL_DECNET; +- so->optname = RAND_ARRAY(decnet_opts); +- +- // TODO: set optlen correctly +-} +- +-static struct socket_triplet decnet_triplets[] = { +- { .family = PF_DECnet, .protocol = DNPROTO_NSP, .type = SOCK_SEQPACKET }, +- { .family = PF_DECnet, .protocol = DNPROTO_NSP, .type = SOCK_STREAM }, +-}; +- +-const struct netproto proto_decnet = { +- .name = "decnet", +- .setsockopt = decnet_setsockopt, +- .gen_sockaddr = decnet_gen_sockaddr, +- .valid_triplets = decnet_triplets, +- .nr_triplets = ARRAY_SIZE(decnet_triplets), +-}; +diff --git a/net/proto-unix.c b/net/proto-unix.c +index f7427a22..119c1429 100644 +--- a/net/proto-unix.c ++++ b/net/proto-unix.c +@@ -2,7 +2,6 @@ + #include + #include + #include +-#include + #include + #include "net.h" + #include "random.h" +diff --git a/net/protocols.c b/net/protocols.c +index ea64d5f5..278f08b5 100644 +--- a/net/protocols.c ++++ b/net/protocols.c +@@ -18,7 +18,6 @@ const struct protoptr net_protocols[TRINITY_PF_MAX] = { + #ifdef USE_IPV6 + [PF_INET6] = { .proto = &proto_inet6 }, + #endif +- [PF_DECnet] = { .proto = &proto_decnet }, + [PF_PACKET] = { .proto = &proto_packet }, + #ifdef USE_NETECONET + [PF_ECONET] = { .proto = &proto_econet }, +-- +2.39.0 + From thomas.petazzoni at bootlin.com Wed Feb 8 11:19:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:19:56 +0100 Subject: [Buildroot] [git commit branch/next] configs/olimex_stmp157: bump Linux and U-Boot Message-ID: <20230220205255.9A8268648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=019bf138eaf634ba1781037755c6cc594371ada0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_stmp157_olinuxino_lime_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index a63394fa0b..49670dbe4f 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -16,8 +16,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/stmp1_olinuxino/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/OLIMEX/linux-olimex.git" -# branch release-20220413-v5.10.105 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="d417808c240d55576ee76e5cbb40413ad444ecfd" +# branch release-20221011-v5.10.105 +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1b955f3ee7ef3234f290f65dbea108063996aea0" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olimex/stmp1_olinuxino/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -34,8 +34,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/OLIMEX/u-boot-olinuxino.git" -# release-20220413, based on 2021.04 -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="b39c5a7c93a2d8efaecc9cad4284378af857c3f7" +# release-20220927, based on 2021.04 +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="98ab5ecb0a16eeb426f34b2a1a28e56658c1a59c" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y From peter at korsgaard.com Mon Feb 20 21:00:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:23 -0000 Subject: [Buildroot] [git commit branch/next] package/perl: bump to version 5.36.0 Message-ID: <20230220205231.3FE63828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9103c8f2e94f69d7ef392746aa53bbf2f468a008 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/perl/perl.hash | 8 ++++---- package/perl/perl.mk | 4 ++-- utils/scancpan | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 9ec2b42e34..b21023f730 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,7 +1,7 @@ -# 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://www.cpan.org/src/5.0/perl-5.36.0.tar.xz.{md5,sha1,sha256}.txt +md5 826e42da130011699172fd655e49cfa2 perl-5.36.0.tar.xz +sha1 938c56a77ae094eb7f5019318a5e4efb2d9c74fa perl-5.36.0.tar.xz +sha256 0f386dccbee8e26286404b2cca144e1005be65477979beb9b1ba272d4819bcf0 perl-5.36.0.tar.xz # Hash from: https://github.com/arsv/perl-cross/releases/download/1.4/perl-cross-1.4.hash sha256 be9d9f9f7148edff7a2f9695ba3cb7e3975eff6b25a9a81dd311725fd757aa91 perl-cross-1.4.tar.gz diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 27acfaeff2..9be00e1b2c 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, also update utils/scancpan -PERL_VERSION_MAJOR = 34 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 +PERL_VERSION_MAJOR = 36 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ diff --git a/utils/scancpan b/utils/scancpan index 48f8bd83b7..e7739a8ad1 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -488,9 +488,9 @@ use Digest::SHA qw(sha256_hex); use Text::Wrap; $Text::Wrap::columns = 62; -# Below, 5.034 should be aligned with the version of perl actually +# Below, 5.036 should be aligned with the version of perl actually # bundled in Buildroot: -die <<"MSG" if $] < 5.034; +die <<"MSG" if $] < 5.036; This script needs a host perl with the same major version as Buildroot target perl. Your current host perl is: @@ -498,7 +498,7 @@ Your current host perl is: version $] You may install a local one by running: - perlbrew install perl-5.34.0 + perlbrew install perl-5.36.0 MSG my ($help, $man, $quiet, $force, $recommend, $test, $host); @@ -967,7 +967,7 @@ in order to work with the right CoreList data. =head1 LICENSE -Copyright (C) 2013-2020 by Francois Perrad +Copyright (C) 2013-2023 by Francois Perrad 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 From arnout at mind.be Wed Feb 8 12:31:04 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 13:31:04 +0100 Subject: [Buildroot] [git commit branch/next] .checkpackageignore: remove package/urandom-scripts/S20urandom Message-ID: <20230220205255.C588F86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30624cf777b84ead9c788cee911fb1c387d358fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 4a6f9d2516820c296a8af788b259ca96926cd60d removed package/urandom-scripts/S20urandom but didn't remove it from .checkpackageignore. Do so now. The commit actually renamed it to S20seedrng, but it also fixed the Variables errors so it no longer needs to be ignored. Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index b1f2d99b99..c4d07c1d7d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -169,7 +169,6 @@ package/tvheadend/S99tvheadend Indent Shellcheck Variables package/unbound/S70unbound Shellcheck package/unscd/S46unscd Indent Shellcheck Variables package/upmpdcli/S99upmpdcli Indent Shellcheck Variables -package/urandom-scripts/S20urandom Variables package/usbguard/S20usbguard Indent Shellcheck Variables package/vsftpd/S70vsftpd Indent Shellcheck Variables package/watchdogd/S01watchdogd Indent NotExecutable From peter at korsgaard.com Mon Feb 20 21:00:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:24 -0000 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.3 Message-ID: <20230220205231.6DBE7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6469c513d5ee9b46c1a7484b93f1c50162aa359 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-January/000699.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 f6b3ade3ea..c1765c3eaa 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 = 22.3.2 +MESA3D_HEADERS_VERSION = 22.3.3 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 e902e6b828..c2ceaa6ead 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-dev/2022-December/225903.html -sha256 c15df758a8795f53e57f2a228eb4593c22b16dffd9b38f83901f76cd9533140b mesa-22.3.2.tar.xz -sha512 32934dd23cfcd6165c365597d9a469da0b806b72ea98a200f499344c3b47815db3bf78875b4ea766d2d28d9c70b50c1615d2d3fcbfd4769447fe0a9d3b32951f mesa-22.3.2.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000699.html +sha256 bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922 mesa-22.3.3.tar.xz +sha512 dcf166bc7c80e6ad09337e0188219e5ea4bdc558bc4b4ca35ce30d5421568f6b5328e5508b3175a2696521214e466354d8652ade22468ce448d9f61d5709c8a1 mesa-22.3.3.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 523b642d0c..9fa2c05230 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 = 22.3.2 +MESA3D_VERSION = 22.3.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From thomas.petazzoni at bootlin.com Wed Feb 8 12:24:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:24:16 +0100 Subject: [Buildroot] [git commit branch/next] package/gstreamer1/gst1-plugins-bad: add zxing plugin support Message-ID: <20230220205255.BBDCD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11b2ab5ee261e8af1065f15e2e69290e15e9e4ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/Config.in | 9 +++++++++ package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 1e89cd124f..d477924eec 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -738,6 +738,15 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 +config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING + bool "zxing" + depends on !BR2_STATIC_LIBS # zxing-cpp + depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp + select BR2_PACKAGE_ZXING_CPP + +comment "zxing plugin needs a toolchain w/ C++, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP + endif comment "gst1-plugins-bad needs a toolchain w/ C++" diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index dfe1f1c9eb..edac818985 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -70,7 +70,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dsvthevcenc=disabled \ -Dtranscode=disabled \ -Dwasapi2=disabled \ - -Dzxing=disabled \ -Dmagicleap=disabled \ -Disac=disabled \ -Diqa=disabled \ @@ -812,6 +811,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dzbar=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += zxing-cpp +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=disabled +endif + # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dgpl=enabled From peter at korsgaard.com Mon Feb 20 21:00:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:25 -0000 Subject: [Buildroot] [git commit branch/next] package/docker-engine: bump version to 20.10.22 Message-ID: <20230220205231.921D486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de51efc543775cf32456c1090d1b396d0b67f9bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bug fixes and enhancements - Improve error message when attempting to pull an unsupported image format or OCI artifact (moby/moby#44413, moby/moby#44569) - Fix an issue where the host's ephemeral port-range was ignored when selecting random ports for containers (moby/moby#44476). - Fix ssh: parse error in message type 27 errors during docker build on hosts using OpenSSH 8.9 or above (moby/moby#3862). - seccomp: block socket calls to AF_VSOCK in default profile (moby/moby#44564). https://github.com/moby/moby/releases/tag/v20.10.22 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 10e9727a08..d15b1359cb 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 61f4c3a2d0426e1bbbda1b0e5dd33ec203776f7d99d1a61522c77c04c4ed09fe docker-engine-20.10.21.tar.gz +sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 36c66485ba..2a9b72ca78 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.21 +DOCKER_ENGINE_VERSION = 20.10.22 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Wed Feb 8 13:35:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 14:35:21 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6serialport: use DESTDIR instead of --prefix for installation Message-ID: <20230220205256.0B3C986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d8e207e7aaf035f48252e19013b610893d2fce0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Even though it works, overriding --prefix at installation time is a bit weird. In order to be more consistent with what is done with other build systems, use DESTDIR instead at installation time. Note that $(DESTDIR) comes in addition to the -DCMAKE_INSTALL_PREFIX=/usr that is passed at configure time, so with this commit, the files continue to be installed in $(STAGING_DIR)/usr and $(TARGET_DIR)/usr as they should be. Signed-off-by: Thomas Petazzoni --- package/qt6/qt6serialport/qt6serialport.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt6/qt6serialport/qt6serialport.mk b/package/qt6/qt6serialport/qt6serialport.mk index 9656e97c96..497719d4ec 100644 --- a/package/qt6/qt6serialport/qt6serialport.mk +++ b/package/qt6/qt6serialport/qt6serialport.mk @@ -41,11 +41,11 @@ define QT6SERIALPORT_BUILD_CMDS endef define QT6SERIALPORT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) --prefix $(STAGING_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) endef define QT6SERIALPORT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) --prefix $(TARGET_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) endef $(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 20 21:00:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:26 -0000 Subject: [Buildroot] [git commit branch/next] package/tor: security bump version to 0.4.7.13 Message-ID: <20230220205231.BD50186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=beeb4a2aad034d201a13caecd9ddbfb19761beb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://gitlab.torproject.org/tpo/core/tor/-/blob/main/ChangeLog?expanded=true&viewer=simple Fixes CVE-2023-23589 aka TROVE-2022-002: https://gitlab.torproject.org/tpo/core/tor/-/issues/40730 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 4 ++-- package/tor/tor.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 2a2953dc29..51892f15c3 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.7.12.tar.gz.sha256sum -sha256 3b5d969712c467851bd028f314343ef15a97ea457191e93ffa97310b05b9e395 tor-0.4.7.12.tar.gz +# From https://dist.torproject.org/tor-0.4.7.13.tar.gz.sha256sum +sha256 2079172cce034556f110048e26083ce9bea751f3154b0ad2809751815b11ea9d tor-0.4.7.13.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 6812005618..03bd998708 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.7.12 +TOR_VERSION = 0.4.7.13 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 8 14:28:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:31 +0100 Subject: [Buildroot] [git commit branch/next] utils/docker-run: fix shellcheck errors Message-ID: <20230220205256.37E7A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c3466bbeeedad1cfc8fda5120d452fd786d68e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In utils/docker-run line 10: --user $(id -u):$(id -g) \ ^------^ SC2046: Quote this to prevent word splitting. ^------^ SC2046: Quote this to prevent word splitting. The suggestions from shellcheck can be applied. Signed-off-by: Arnout Vandecappelle --- utils/docker-run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 5653764254..164e11c0e6 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -7,7 +7,7 @@ IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') exec docker run -it --rm \ - --user $(id -u):$(id -g) \ + --user "$(id -u):$(id -g)" \ --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ --workdir "${MAIN_DIR}" \ "${IMAGE}" "${@}" From peter at korsgaard.com Mon Feb 20 21:00:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:27 -0000 Subject: [Buildroot] [git commit branch/next] package/network-manager-openvpn: bump to version 1.10.2 Message-ID: <20230220205231.DE1698648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=346bd6a20c22fc3b95f2e27030289de726fcfdf0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Peter Korsgaard --- package/network-manager-openvpn/network-manager-openvpn.hash | 4 ++-- package/network-manager-openvpn/network-manager-openvpn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network-manager-openvpn/network-manager-openvpn.hash b/package/network-manager-openvpn/network-manager-openvpn.hash index d0cbc7ca87..11fb28f8c8 100644 --- a/package/network-manager-openvpn/network-manager-openvpn.hash +++ b/package/network-manager-openvpn/network-manager-openvpn.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.14.sha256sum -sha256 e7419053fc3b5a7e25f1a7517c313ad4531b6ea280255524ebb85a70c76fdbeb NetworkManager-openvpn-1.8.14.tar.xz +# From https://download.gnome.org/sources/NetworkManager-openvpn/1.10/NetworkManager-openvpn-1.10.2.sha256sum +sha256 62f0f2a8782221b923f212ac2a8ebbc1002efd6a90ee945dad4adfb56d076d21 NetworkManager-openvpn-1.10.2.tar.xz # Locally computed sha256 c39e345d992dfba62db265f8c6d6ff1d90c61d92876635ae05adbfa2f45fff46 COPYING diff --git a/package/network-manager-openvpn/network-manager-openvpn.mk b/package/network-manager-openvpn/network-manager-openvpn.mk index d5d4c5da42..ccc86e45f7 100644 --- a/package/network-manager-openvpn/network-manager-openvpn.mk +++ b/package/network-manager-openvpn/network-manager-openvpn.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.8 -NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).14 +NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.10 +NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).2 NETWORK_MANAGER_OPENVPN_SOURCE = NetworkManager-openvpn-$(NETWORK_MANAGER_OPENVPN_VERSION).tar.xz NETWORK_MANAGER_OPENVPN_SITE = https://download.gnome.org/sources/NetworkManager-openvpn/$(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR) NETWORK_MANAGER_OPENVPN_DEPENDENCIES = network-manager openvpn From thomas.petazzoni at bootlin.com Wed Feb 8 13:00:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 14:00:10 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6serialbus: new package Message-ID: <20230220205256.005E48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e447f56408f9308cc0e527f97dcc1844f2d6c850 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 1 + package/qt6/qt6serialbus/Config.in | 15 ++++++++++ package/qt6/qt6serialbus/qt6serialbus.hash | 11 ++++++++ package/qt6/qt6serialbus/qt6serialbus.mk | 45 ++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 831ae72c3c..655fa8392a 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -44,6 +44,7 @@ menuconfig BR2_PACKAGE_QT6 if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" endif diff --git a/package/qt6/qt6serialbus/Config.in b/package/qt6/qt6serialbus/Config.in new file mode 100644 index 0000000000..1f24310e61 --- /dev/null +++ b/package/qt6/qt6serialbus/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_QT6SERIALBUS + bool "qt6serialbus" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD + select BR2_PACKAGE_QT6SERIALPORT + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6serialbus module. + + https://doc.qt.io/qt-6/qtserialbus-index.html + +comment "qt6serialbus needs headers >= 3.6" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash new file mode 100644 index 0000000000..be01f13363 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialbus-everywhere-src-6.4.2.tar.xz.sha256 +sha256 604013657c7327899aa50748deb4bcb5e545ab37ff4964795b9e6f617d48bf1b qtserialbus-everywhere-src-6.4.2.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.mk b/package/qt6/qt6serialbus/qt6serialbus.mk new file mode 100644 index 0000000000..0717736387 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qt6serialbus +# +################################################################################ + +QT6SERIALBUS_VERSION = $(QT6_VERSION) +QT6SERIALBUS_SITE = $(QT6_SITE) +QT6SERIALBUS_SOURCE = qtserialbus-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALBUS_VERSION).tar.xz +QT6SERIALBUS_INSTALL_STAGING = YES +QT6SERIALBUS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SERIALBUS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6SERIALBUS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6SERIALBUS_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SERIALBUS_DEPENDENCIES = \ + qt6serialport + +define QT6SERIALBUS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) +endef + +$(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 20 21:00:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:28 -0000 Subject: [Buildroot] [git commit branch/next] package/modem-manager: bump version to 1.20.4 Message-ID: <20230220205231.AF5898648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2e2da2e70f638889f3aa0aeb7125f3bf16a7f67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch that is now upstream. Signed-off-by: Heiko Thiery Signed-off-by: Peter Korsgaard --- ...son-Un-hardcode-building-a-shared-library.patch | 54 ---------------------- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 3 files changed, 2 insertions(+), 56 deletions(-) diff --git a/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch b/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch deleted file mode 100644 index e99396d0d1..0000000000 --- a/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch +++ /dev/null @@ -1,54 +0,0 @@ -From a9651f2390d3691dc74bcdb24b69a043fb0aacae Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 31 Dec 2022 10:18:32 +0100 -Subject: [PATCH] meson: Un-hardcode building a shared library - -Use library() instead of shared_library() to allow specifying which kind -of library to build with "meson setup --default-library ..." - -This will avoid the following static build failure: - -FAILED: src/ModemManager -/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/bin/m68k-linux-gcc -o src/ModemManager src/ModemManager.p/meson-generated_.._mm-daemon-enums-types.c.o src/ModemManager.p/main.c.o src/ModemManager.p/mm-auth-provider.c.o src/ModemManager.p/mm-base-bearer.c.o src/ModemManager.p/mm-base-call.c.o src/ModemManager.p/mm-base-manager.c.o src/ModemManager.p/mm-base-modem-at.c.o src/ModemManager.p/mm-base-modem.c.o src/ModemManager.p/mm-base-sim.c.o src/ModemManager.p/mm-base-sms.c.o src/ModemManager.p/mm-bearer-list.c.o src/ModemManager.p/mm-broadband-bearer.c.o src/ModemManager.p/mm-broadband-modem.c.o src/ModemManager.p/mm-call-list.c.o src/ModemManager.p/mm-context.c.o src/ModemManager.p/mm-device.c.o src/ModemManager.p/mm-dispatcher.c.o src/ModemManager.p/mm-dispatcher-connection.c.o src/ModemManager.p/mm-dispatcher-fcc-unlock.c.o src/ModemManager.p/mm-filter.c.o src/ModemManager.p/mm-iface-modem-3gpp.c.o src/ModemManager.p/mm-iface-modem-3gpp-profile-manag er.c.o src/ModemManager.p/mm-iface-modem-3gpp-ussd.c.o src/ModemManager.p/mm-iface-modem.c.o src/ModemManager.p/mm-iface-modem-cdma.c.o src/ModemManager.p/mm-iface-modem-firmware.c.o src/ModemManager.p/mm-iface-modem-location.c.o src/ModemManager.p/mm-iface-modem-messaging.c.o src/ModemManager.p/mm-iface-modem-oma.c.o src/ModemManager.p/mm-iface-modem-sar.c.o src/ModemManager.p/mm-iface-modem-signal.c.o src/ModemManager.p/mm-iface-modem-simple.c.o src/ModemManager.p/mm-iface-modem-time.c.o src/ModemManager.p/mm-iface-modem-voice.c.o src/ModemManager.p/mm-plugin.c.o src/ModemManager.p/mm-plugin-manager.c.o src/ModemManager.p/mm-port-probe.c.o src/ModemManager.p/mm-port-probe-at.c.o src/ModemManager.p/mm-private-boxed-types.c.o src/ModemManager.p/mm-sms-list.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static '-Wl,-rpath,$ORIGIN/../libmm-glib' -Wl,-rpath-link,/home/autobuild/autobuild/instance-11/output-1/build/modem-manager-1.20.2/build/libmm-glib -Wl,--start-group src/libport.a s rc/libkerneldevice.a src/libhelpers.a libmm-glib/libmm-glib.so.0.9.0 libqcdm/src/libqcdm.a libmm-glib/generated/tests/libmm-test-generated.a -Wl,--export-dynamic /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libglib-2.0.a -pthread -lm /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpcre.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libffi.a /home/auto build/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libblkid.a -Wl,--end-group -/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/opt/ext-toolchain/bin/../lib/gcc/m68k-buildroot-linux-uclibc/11.2.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `libmm-glib/libmm-glib.so.0.9.0' - -Fixes: - - http://autobuild.buildroot.org/results/9803d593305df36c4a8d67aac2fb4c9a3120a072 - -Signed-off-by: Fabrice Fontaine -[yann.morin.1998 at free.fr: actual backport of upstreeam commit] -Signed-off-by: Yann E. MORIN ---- - libmm-glib/meson.build | 2 +- - plugins/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libmm-glib/meson.build b/libmm-glib/meson.build -index 42f8ac61..de668dab 100644 ---- a/libmm-glib/meson.build -+++ b/libmm-glib/meson.build -@@ -129,7 +129,7 @@ deps = [include_dep] - - libname = 'mm-glib' - --libmm_glib = shared_library( -+libmm_glib = library( - libname, - version: mm_glib_version, - sources: sources, -diff --git a/plugins/meson.build b/plugins/meson.build -index f849bb53..9e081beb 100644 ---- a/plugins/meson.build -+++ b/plugins/meson.build -@@ -18,7 +18,7 @@ if enable_tests - libmm_test_generated_dep - ] - -- libmm_test_common = shared_library( -+ libmm_test_common = library( - 'mm-test-common', - sources: sources, - include_directories: top_inc, --- -2.25.1 - diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index e6967f8d62..4b8b795af7 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ #Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc -sha256 ba56aa764edc148f58348a589743cf1c1e27c55dcd7ebd820dcedd52fb8d7179 ModemManager-1.20.2.tar.gz +sha256 9c16b47547faac9515f2d03d1e8175de9c5e6769b1ee16b608ba6cfe6f04b03e ModemManager-1.20.4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index f1fc17523a..979a80a8e9 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.20.2 +MODEM_MANAGER_VERSION = 1.20.4 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.gz MODEM_MANAGER_SITE = https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEM_MANAGER_VERSION) MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) From arnout at mind.be Wed Feb 8 14:28:30 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:30 +0100 Subject: [Buildroot] [git commit branch/next] utils/config: fix shellcheck errors Message-ID: <20230220205256.2E2EB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7150edc790cda61270eb0ec1af7ab78255c90003 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In utils/config line 54: ARG="`echo $ARG | tr a-z- A-Z_`" ^------------------------^ SC2006: Use $(...) notation instead of legacy backticked `...`. ^--^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: ARG="$(echo "$ARG" | tr a-z- A-Z_)" In utils/config line 87: local tmpfile="$infile.swp" ^-----^ SC2034: tmpfile appears unused. Verify use (or export if used externally). In utils/config line 182: if [ $? != 0 ] ; then ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. For more information: https://www.shellcheck.net/wiki/SC2034 -- tmpfile appears unused. Verify us... https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ... https://www.shellcheck.net/wiki/SC2006 -- Use $(...) notation instead of le... The suggestions from shellcheck can be applied. The unused variable tmpfile in fact occurs in several functions, all of them can be removed. For the check exit code, the condition is swapped to avoid negative logic. Signed-off-by: Arnout Vandecappelle --- utils/config | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/utils/config b/utils/config index c5e2d723ea..5f5e4362e5 100755 --- a/utils/config +++ b/utils/config @@ -51,7 +51,7 @@ checkarg() { usage fi if [ "$MUNGE_CASE" = "yes" ] ; then - ARG="`echo $ARG | tr a-z- A-Z_`" + ARG="$(echo "$ARG" | tr a-z- A-Z_)" fi case "$ARG" in ${BR2_PREFIX}*) @@ -64,7 +64,6 @@ txt_append() { local anchor="$1" local insert="$2" local infile="$3" - local tmpfile="$infile.swp" # sed append cmd: 'a\' + newline + text + newline cmd="$(printf "a\\%b$insert" "\n")" @@ -76,7 +75,6 @@ txt_subst() { local before="$1" local after="$2" local infile="$3" - local tmpfile="$infile.swp" sed -i -e "s:$before:$after:" "$infile" } @@ -84,7 +82,6 @@ txt_subst() { txt_delete() { local text="$1" local infile="$2" - local tmpfile="$infile.swp" sed -i -e "/$text/d" "$infile" } @@ -178,15 +175,14 @@ while [ "$1" != "" ] ; do if grep -q "# ${BR2_PREFIX}$ARG is not set" $FN ; then echo n else - V="$(grep "^${BR2_PREFIX}$ARG=" $FN)" - if [ $? != 0 ] ; then - echo undef - else + if V="$(grep "^${BR2_PREFIX}$ARG=" $FN)"; then V="${V/#${BR2_PREFIX}$ARG=/}" V="${V/#\"/}" V="${V/%\"/}" V="${V//\\\"/\"}" echo "${V}" + else + echo undef fi fi ;; From arnout at mind.be Wed Feb 8 14:28:32 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:32 +0100 Subject: [Buildroot] [git commit branch/next] utils/docker-run: fix shellcheck errors Message-ID: <20230220205256.421E786496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dab7a877148adad499a07c5ed785c42707593175 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In utils/test-pkg line 8: if [ ! -z "${TEMP_CONF}" ]; then ^-- SC2236: Use -n instead of ! -z. In utils/test-pkg line 75: TEMP_CONF=$(mktemp /tmp/test-${pkg}-config.XXXXXX) ^----^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: TEMP_CONF=$(mktemp /tmp/test-"${pkg}"-config.XXXXXX) In utils/test-pkg line 76: echo "${pkg_br_name}=y" > ${TEMP_CONF} ^----------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: echo "${pkg_br_name}=y" > "${TEMP_CONF}" In utils/test-pkg line 86: if [ ${random} -gt 0 ]; then ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${random}" -gt 0 ]; then In utils/test-pkg line 90: if [ ${number} -gt 0 ]; then ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${number}" -gt 0 ]; then In utils/test-pkg line 109: toolchains=($(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ ^-- SC2207: Prefer mapfile or read -a to split command output (or quote to avoid splitting). In utils/test-pkg line 110: |if [ ${random} -gt 0 ]; then \ ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: |if [ "${random}" -gt 0 ]; then \ In utils/test-pkg line 111: sort -R |head -n ${random} ^-------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: sort -R |head -n "${random}" In utils/test-pkg line 121: if [ ${nb_tc} -eq 0 ]; then ^------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${nb_tc}" -eq 0 ]; then In utils/test-pkg line 134: printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} ${nb} ${nb_tc} ^---^ SC2086: Double quote to prevent globbing and word splitting. ^------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} "${nb}" "${nb_tc}" In utils/test-pkg line 146: ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} ^---^ SC2086: Double quote to prevent globbing and word splitting. ^--------^ SC2086: Double quote to prevent globbing and word splitting. ^--------^ SC2086: Double quote to prevent globbing and word splitting. ^---------^ SC2086: Double quote to prevent globbing and word splitting. ^--------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: "${nb}" "${nb_skip}" "${nb_fail}" "${nb_legal}" "${nb_show}" In utils/test-pkg line 160: CONFIG_= support/kconfig/merge_config.sh -O "${dir}" \ ^-- SC1007: Remove space after = if trying to assign a value (for empty string, use var='' ... ). In utils/test-pkg line 181: if [ ${prepare_only} -eq 1 ]; then ^-------------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: if [ "${prepare_only}" -eq 1 ]; then For more information: https://www.shellcheck.net/wiki/SC1007 -- Remove space after = if trying to... https://www.shellcheck.net/wiki/SC2207 -- Prefer mapfile or read -a to spli... https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ... The suggestions from shellcheck can be applied. This script already uses bash so we can rely on mapfile. The warning about CONFIG_= assignment misinterpreted the intention: we don't want to assign to CONFIG_, we want to clear it from the environment. Spell this as CONFIG_="". Signed-off-by: Arnout Vandecappelle --- utils/test-pkg | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/utils/test-pkg b/utils/test-pkg index e7f5464817..19d8713d6a 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -5,7 +5,7 @@ TOOLCHAINS_CSV='support/config-fragments/autobuild/toolchain-configs.csv' TEMP_CONF="" do_clean() { - if [ ! -z "${TEMP_CONF}" ]; then + if [ -n "${TEMP_CONF}" ]; then rm -f "${TEMP_CONF}" fi } @@ -72,8 +72,8 @@ main() { if [ -z "${cfg}" ]; then pkg_br_name="${pkg//-/_}" pkg_br_name="BR2_PACKAGE_${pkg_br_name^^}" - TEMP_CONF=$(mktemp /tmp/test-${pkg}-config.XXXXXX) - echo "${pkg_br_name}=y" > ${TEMP_CONF} + TEMP_CONF="$(mktemp /tmp/test-"${pkg}"-config.XXXXXX)" + echo "${pkg_br_name}=y" > "${TEMP_CONF}" cfg="${TEMP_CONF}" fi if [ ! -e "${cfg}" ]; then @@ -83,15 +83,15 @@ main() { dir="${HOME}/br-test-pkg" fi - if [ ${random} -gt 0 ]; then + if [ "${random}" -gt 0 ]; then mode=$((mode+1)) fi - if [ ${number} -gt 0 ]; then + if [ "${number}" -gt 0 ]; then mode=$((mode+1)) fi - if [ ${all} -eq 1 ]; then + if [ "${all}" -eq 1 ]; then mode=$((mode+1)) fi @@ -106,19 +106,18 @@ main() { # Extract the URLs of the toolchains; drop internal toolchains # E.g.: http://server/path/to/name.config,arch,libc # --> http://server/path/to/name.config - toolchains=($(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ - |if [ ${random} -gt 0 ]; then \ - sort -R |head -n ${random} - elif [ ${number} -gt 0 ]; then \ - head -n ${number} - else - sort - fi - ) - ) + mapfile -t toolchains < <(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ + | if [ "${random}" -gt 0 ]; then \ + sort -R | head -n "${random}" + elif [ "${number}" -gt 0 ]; then \ + head -n "${number}" + else + sort + fi + ) nb_tc="${#toolchains[@]}" - if [ ${nb_tc} -eq 0 ]; then + if [ "${nb_tc}" -eq 0 ]; then printf "error: no toolchain found (networking issue?)\n" >&2; exit 1 fi @@ -131,7 +130,7 @@ main() { : $((nb++)) toolchain="$(basename "${toolchainconfig}" .config)" build_dir="${dir}/${toolchain}" - printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} ${nb} ${nb_tc} + printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} "${nb}" "${nb_tc}" build_one "${build_dir}" "${toolchainconfig}" "${cfg}" "${pkg}" "${prepare_only}" && ret=0 || ret=${?} case ${ret} in (0) printf "OK\n";; @@ -143,7 +142,7 @@ main() { done printf "%d builds, %d skipped, %d build failed, %d legal-info failed, %d show-info failed\n" \ - ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} + "${nb}" "${nb_skip}" "${nb_fail}" "${nb_legal}" "${nb_show}" return $((nb_fail + nb_legal)) } @@ -157,7 +156,7 @@ build_one() { mkdir -p "${dir}" - CONFIG_= support/kconfig/merge_config.sh -O "${dir}" \ + CONFIG_="" support/kconfig/merge_config.sh -O "${dir}" \ "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" \ >> "${dir}/logfile" 2>&1 # We want all the options from the snippet to be present as-is (set @@ -178,7 +177,7 @@ build_one() { rm -f "${dir}/missing.config" # Defer building the job to the caller (e.g. a gitlab pipeline) - if [ ${prepare_only} -eq 1 ]; then + if [ "${prepare_only}" -eq 1 ]; then return 0 fi From peter at korsgaard.com Mon Feb 20 21:00:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:29 -0000 Subject: [Buildroot] [git commit branch/next] package/unbound: bump version to 1.17.1 Message-ID: <20230220205231.EDC56828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16d83fa724e97c51b78d516674842a1f33c9a71b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Kyle Harding Signed-off-by: Peter Korsgaard --- 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 147ac7b13a..91e1d82dd2 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.0.tar.gz.sha256 -sha256 dcbc95d7891d9f910c66e4edc9f1f2fde4dea2eec18e3af9f75aed44a02f1341 unbound-1.17.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz.sha256 +sha256 ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 unbound-1.17.1.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 7b62522727..fa7884e937 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.17.0 +UNBOUND_VERSION = 1.17.1 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl From arnout at mind.be Wed Feb 8 12:31:06 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 13:31:06 +0100 Subject: [Buildroot] [git commit branch/next] utils/check-package: check all shell scripts Message-ID: <20230220205255.D108886496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5a3dfb9a4a6550b9097b22b1c96a99f90880a64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Currently only SysV init scripts are checked using shellcheck and a few other rules (e.g. variable naming, file naming). Extend the check using shellcheck to all shell scripts in the tree. This is actually limited to the list of directories that check-package knows that can check, but that list can be expanded later. In order to apply the check to all shell scripts, use python3-magic to determine the file type. Unfortunately, there are two different python modules called "magic". Support both by detecting which one is installed and defining get_filetype accordingly. Keep testing first for name pattern, and only in the case there is no match, check the file type. This ensures, for instance, that SysV init scripts follow specific rules. Apply these checks for shell scripts: - shellcheck; - trailing space; - consecutive empty lines; - empty last line on file; - newline at end of file. Update the list of ignored warnings. Do not add unit tests since no function was added, they were just reused. But expand the runtime test for check-package using as fixture a file that generates a shellcheck warning. Signed-off-by: Ricardo Martincoski [Arnout: support both variants of the "magic" module] Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 21 ++++++++++++++++ .../tests/utils/br2-external/utils/x-shellscript | 2 ++ support/testing/tests/utils/test_check_package.py | 17 +++++++++++++ utils/check-package | 28 +++++++++++++++++++++- utils/checkpackagelib/lib_shellscript.py | 5 ++++ 5 files changed, 72 insertions(+), 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index c4d07c1d7d..405e1c5677 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -16,11 +16,13 @@ package/busybox/S02sysctl Variables package/busybox/S10mdev ConsecutiveEmptyLines Indent Shellcheck package/busybox/S15watchdog Indent Variables package/busybox/S50telnet Indent Shellcheck Variables +package/busybox/udhcpc.script Shellcheck package/c-icap/S96cicap Indent Shellcheck Variables package/cfm/S65cfm Indent Variables package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables package/chrony/S49chrony Indent Shellcheck Variables package/connman/S45connman Variables +package/coremark-pro/coremark-pro.sh.in Shellcheck package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob package/curlftpfs/0003-nocache-memleak-fix.patch Sob @@ -30,6 +32,7 @@ package/dbus/S30dbus Indent Shellcheck TrailingSpace Variables package/dcron/S90dcron Variables package/dhcp/S80dhcp-relay Shellcheck Variables package/dhcp/S80dhcp-server Shellcheck Variables +package/dhcp/dhclient-script Shellcheck TrailingSpace package/dhcpcd/S41dhcpcd Indent Variables package/dhrystone/0001-cmdline-nruns.patch Sob package/dhrystone/0002-HZ.patch Sob @@ -41,12 +44,15 @@ package/dmraid/S20dmraid Variables package/dnsmasq/S80dnsmasq Shellcheck Variables package/docker-engine/S60dockerd Indent Shellcheck Variables package/domoticz/S99domoticz Shellcheck +package/dracut/merged-usr-module-setup.sh Shellcheck package/dropbear/S50dropbear Indent Shellcheck Variables package/earlyoom/S02earlyoom Indent Shellcheck package/ejabberd/S50ejabberd Indent Shellcheck Variables +package/ejabberd/check-erlang-lib Shellcheck package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables package/exim/S86exim Indent Variables package/fail2ban/S60fail2ban Shellcheck Variables +package/fakedate/fakedate Shellcheck package/fbv/0001-cross.patch Sob package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob package/fbv/0005-include.patch Sob @@ -56,6 +62,7 @@ package/gamin/0002-no-const-return.patch Sob package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch Sob package/genromfs/0001-build-system.patch Sob package/gerbera/S99gerbera Indent +package/google-breakpad/gen-syms.sh Shellcheck package/gpsd/S50gpsd Indent Shellcheck Variables package/haveged/S21haveged Shellcheck Variables package/htpdate/S43htpdate Shellcheck @@ -63,8 +70,12 @@ package/i2pd/S99i2pd Indent Shellcheck Variables package/ifplugd/0001-cross.patch Sob package/ifplugd/0002-fix-headers.patch Sob package/ifupdown-scripts/S40network EmptyLastLine Indent Shellcheck Variables +package/ifupdown-scripts/network/if-pre-up.d/wait_iface EmptyLastLine Shellcheck +package/ifupdown-scripts/nfs_check Shellcheck package/igd2-for-linux/S99upnpd Indent Shellcheck Variables package/inadyn/S70inadyn Indent NotExecutable +package/initscripts/init.d/rcK ConsecutiveEmptyLines EmptyLastLine Shellcheck +package/initscripts/init.d/rcS ConsecutiveEmptyLines EmptyLastLine Shellcheck package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Variables package/iptables/S35iptables Shellcheck package/irda-utils/0001-daemon.patch Sob @@ -94,6 +105,7 @@ package/lldpd/S60lldpd Indent Shellcheck Variables package/lockfile-progs/0001-sus3v-legacy.patch Sob package/madplay/0001-switch-to-new-alsa-api.patch Sob package/mariadb/S97mysqld Indent Shellcheck Variables +package/matchbox-keyboard/mb-applet-kbd-wrapper.sh Shellcheck TrailingSpace package/mender-connect/S43mender-connect Shellcheck package/mii-diag/0001-strchr.patch Sob package/minidlna/S60minidlnad Indent Shellcheck Variables @@ -111,6 +123,7 @@ package/netcat/0001-signed-bit-counting.patch Sob package/netopeer2/S52netopeer2 Shellcheck Variables package/netplug/0001-makefile-flags.patch Sob package/netplug/S29netplug Indent Shellcheck Variables +package/netplug/netplug-script ConsecutiveEmptyLines Shellcheck package/netsnmp/S59snmpd Indent Shellcheck Variables package/network-manager/S45network-manager ConsecutiveEmptyLines EmptyLastLine Shellcheck Variables package/nfs-utils/S60nfs ConsecutiveEmptyLines Shellcheck Variables @@ -122,11 +135,13 @@ package/ofono/S46ofono Variables package/olsr/S50olsr Indent Shellcheck Variables package/openntpd/S49ntp Shellcheck Variables package/openssh/S50sshd EmptyLastLine Indent Variables +package/openvmtools/shutdown Shellcheck package/openvpn/S60openvpn Indent Shellcheck Variables package/oracle-mysql/S97mysqld Shellcheck Variables package/owfs/S55owserver Shellcheck Variables package/owfs/S60owfs Shellcheck Variables package/pigpio/S50pigpio Shellcheck Variables +package/pkgconf/pkg-config.in Shellcheck package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob package/postgresql/S50postgresql Variables package/procps-ng/S02sysctl Variables @@ -147,6 +162,7 @@ package/samba4/S91smb Indent Shellcheck Variables package/seatd/S70seatd NotExecutable Variables package/ser2net/S50ser2net Indent Shellcheck Variables package/shairport-sync/S99shairport-sync Indent Shellcheck Variables +package/skeleton-init-systemd/fakeroot_tmpfiles.sh Shellcheck package/smcroute/S41smcroute Indent NotExecutable Variables package/smstools3/S50smsd Shellcheck Variables package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch Sob @@ -156,11 +172,13 @@ package/sslh/S35sslh Indent Shellcheck Variables package/stunnel/S50stunnel Indent Shellcheck Variables package/supervisor/S99supervisord Variables package/suricata/S99suricata Shellcheck +package/swupdate/swupdate.sh Shellcheck package/sysrepo/S51sysrepo-plugind Indent Shellcheck package/targetcli-fb/S50target Shellcheck Variables package/tcf-agent/S55tcf-agent Shellcheck Variables package/tftpd/S80tftpd-hpa Indent Shellcheck Variables package/ti-gfx/S80ti-gfx Shellcheck Variables +package/ti-gfx/esrev.sh Shellcheck package/ti-sgx-um/S80ti-sgx Variables package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables @@ -170,10 +188,13 @@ package/unbound/S70unbound Shellcheck package/unscd/S46unscd Indent Shellcheck Variables package/upmpdcli/S99upmpdcli Indent Shellcheck Variables package/usbguard/S20usbguard Indent Shellcheck Variables +package/vala/vala-wrapper Shellcheck package/vsftpd/S70vsftpd Indent Shellcheck Variables package/watchdogd/S01watchdogd Indent NotExecutable +package/wpa_supplicant/ifupdown.sh Shellcheck package/x11r7/xapp_xdm/S99xdm Indent Variables package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables +package/xl2tp/xl2tpd TrailingSpace diff --git a/support/testing/tests/utils/br2-external/utils/x-shellscript b/support/testing/tests/utils/br2-external/utils/x-shellscript new file mode 100755 index 0000000000..a7de4124bd --- /dev/null +++ b/support/testing/tests/utils/br2-external/utils/x-shellscript @@ -0,0 +1,2 @@ +#!/bin/bash +unused="text" diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index 580ad56d42..d2c1556845 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -233,3 +233,20 @@ class TestCheckPackage(unittest.TestCase): self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update " ".checkpackageignore_outdated?" .format(subdir_file), w) + + # shell scripts are tested using shellcheck + rel_file = "utils/x-shellscript" + abs_path = infra.filepath("tests/utils/br2-external") + abs_file = os.path.join(abs_path, rel_file) + + w, m = call_script(["check-package", "-b", rel_file], + self.WITH_UTILS_IN_PATH, abs_path) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(rel_file), w) + + w, m = call_script(["check-package", "-b", abs_file], + self.WITH_UTILS_IN_PATH, infra.basepath()) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(abs_file), w) diff --git a/utils/check-package b/utils/check-package index 848311bac8..12009b2476 100755 --- a/utils/check-package +++ b/utils/check-package @@ -3,6 +3,7 @@ import argparse import inspect +import magic import os import re import six @@ -13,11 +14,27 @@ import checkpackagelib.lib_config import checkpackagelib.lib_hash import checkpackagelib.lib_mk import checkpackagelib.lib_patch +import checkpackagelib.lib_shellscript import checkpackagelib.lib_sysv VERBOSE_LEVEL_TO_SHOW_IGNORED_FILES = 3 flags = None # Command line arguments. +# There are two Python packages called 'magic': +# https://pypi.org/project/file-magic/ +# https://pypi.org/project/python-magic/ +# Both allow to return a MIME file type, but with a slightly different +# interface. Detect which one of the two we have based on one of the +# attributes. +if hasattr(magic, 'FileMagic'): + # https://pypi.org/project/file-magic/ + def get_filetype(fname): + return magic.detect_from_filename(fname).mime_type +else: + # https://pypi.org/project/python-magic/ + def get_filetype(fname): + return magic.from_file(fname, mime=True) + def get_ignored_parsers_per_file(intree_only, ignore_filename): ignored = dict() @@ -77,6 +94,15 @@ def parse_args(): return flags +def get_lib_from_filetype(fname): + if not os.path.isfile(fname): + return None + filetype = get_filetype(fname) + if filetype == "text/x-shellscript": + return checkpackagelib.lib_shellscript + return None + + CONFIG_IN_FILENAME = re.compile(r"Config\.\S*$") DO_CHECK_INTREE = re.compile(r"|".join([ r"Config.in", @@ -120,7 +146,7 @@ def get_lib_from_filename(fname): return checkpackagelib.lib_patch if SYSV_INIT_SCRIPT_FILENAME.search(fname): return checkpackagelib.lib_sysv - return None + return get_lib_from_filetype(fname) def common_inspect_rules(m): diff --git a/utils/checkpackagelib/lib_shellscript.py b/utils/checkpackagelib/lib_shellscript.py new file mode 100644 index 0000000000..9b4f4aed58 --- /dev/null +++ b/utils/checkpackagelib/lib_shellscript.py @@ -0,0 +1,5 @@ +from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 +from checkpackagelib.lib import EmptyLastLine # noqa: F401 +from checkpackagelib.lib import NewlineAtEof # noqa: F401 +from checkpackagelib.lib import TrailingSpace # noqa: F401 +from checkpackagelib.tool import Shellcheck # noqa: F401 From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:30 -0000 Subject: [Buildroot] [git commit branch/next] package/libnetconf2: bump version to 2.1.25. Message-ID: <20230220205232.26AD3828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c9259635564f799ff4b0e63b1baff62505571938 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libnetconf2/libnetconf2.hash | 2 +- package/libnetconf2/libnetconf2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 001a51d682..34e934089e 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0b0f0c84291710b0ca2497e1e02504a5ded7b83d49deeb4992bea7936e1d74b9 libnetconf2-2.1.11.tar.gz +sha256 2f1a6559e8e43ea18ea337ab5f194f8443695c7ab4dde5d7b2560603f9bf702a libnetconf2-2.1.25.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 6aa9aa9498..0d4294d8d3 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 2.1.11 +LIBNETCONF2_VERSION = 2.1.25 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause From peter at korsgaard.com Mon Feb 20 21:00:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:39 -0000 Subject: [Buildroot] [git commit branch/next] package/{rust, rust-bin}: security bump to version 1.66.1 Message-ID: <20230220205231.824A28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0da2742abbe2123d8bafe30e307b94c2b72f94cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes CVE-2022-46176: Cargo did not perform SSH host key verification when cloning indexes and dependencies via SSH https://blog.rust-lang.org/2023/01/10/cve-2022-46176.html Link to Rust 1.66.1 announcement: https://blog.rust-lang.org/2023/01/10/Rust-1.66.1.html Newest version of the source archives have been retrieved with their hash values, and the signature of the .asc files have been verified as follows: $ curl -fsSL https://static.rust-lang.org/rust-key.gpg.ascii | gpg --import $ gpg --verify There is no typographical error in the packages according to the check-pakage utility: $ ./utils/check-package package/rust-bin/* $ ./utils/check-package package/rust/* The testsuite tool were successfully run for rust and rust-bin packages to test the Rust toolchain under 1.66.1: $ ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_rust.TestRustBin $ ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_rust.TestRust In order to verify the compatibility of packages depending on Rust 1.66.1, tests using `./utils/test-pkg` were run. You may want to execute the test-pkg command after creating a `.config` file enabling the corresponding BR2_PACKAGE, for example: Create a file `buildroot/ripgrep.config` containing "BR2_PACKAGE_RIPGREP=y" Then execute: $ ./utils/test-pkg -d test-pkg -c ripgrep.config -p ripgrep Results: librsvg OK ripgrep OK suricata OK bat OK Signed-off-by: James Hilliard [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- package/rust-bin/rust-bin.hash | 252 ++++++++++++++++++++--------------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 7cc1052dd9..adf1799ad7 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 e8d853383355aa17fd8d7efae740ac0f18b3a5f452c9ac62f5042fc96ebda3e9 rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 c9551f9650fcaf74ea4fb6874b6853f9ffecb6925e7a087afb4f36840e5b7b8d rust-1.66.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 ec49ef94889c88f8fd107e9c263003aa6dcd9fb4d17ba057ffab4e4dc28fefd4 rust-1.66.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 755bcca28ee9d4504b7bd87265dc492a8e39550211f8081740940ada9e48cc7e rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 eaaca0295a75a180082456eb3606e6c3fbc16a4f2b54bd754caab5a69b192f88 rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 a194c1a8f1bd8c450872ad2220bfe74e590c5706d4ec939577c69a013a0bbcff rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 9fa197239eb374e071ef4486939c4713a2d662c5e7ebca0505626a3a53a7ed75 rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 6331e676198af2e75734f6566ca62ae22bb61b1d55e749494c454e777a73f195 rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 8d7053db5ea68f4801c7a808a222473076b8a602af70379975e81eede8a7e0ea rust-1.66.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 a656328e1cd36b253bf39807b5a3eacdf0ce7d982fc9fb51a026f273386de84a rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 b5ac5985a8fefd2a0de67197f7c2549aacee502cc784a3c3c93921b005aa31fa rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 ca62347018d1ace5e13a4a2f898dd2b19d5cb96db41482119418538f6482e2db rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 c8d10c558605673fe975b3b1c8ec8d2a9887f18cb97690bf900c19668b6d05ba rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 70650b3a8c04c183a83a2a4ebee7047d6546e69a81e227c24afa6d34ad54fe9b rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 262a2024250e4aa7865a33d52d9b6826b5f059f0562a73f6067a04020879d4f0 rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 e41c5f840d73ed1073ef3a8abb125e6f41a66008ad7817fb2a1e703cf93f0a8b rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 8b8ab8fe4af3ce9604e264fada7ddaed610d8e517d8425d5d85184ea4f111b52 rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 ec0552562348852c487e401168a0ad5f9e90cfc4cf03f5200f80b6594aa47d6d rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 5d166402813621d8c426bdb7dc857f97c72c921c2f2b52a893639a4c73862838 rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 a7170034ddb9218f4f78d6a1d8f8d7ce8c17419015393a96a24aa13f9c89da2d rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 fbc7e7565196fb7ec18b9b2ef0c8a1267fb4825bf68ff0559c0956841d5ade14 rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 7caecb4b926d78ec879e53eaaa4d8001ef575cd80e6340e0518545fd8500eb8f rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 b22aaa59dee87dfc504f7e37ec1f297bbbe3f9ca5a7e4177d40975f2b4b32570 rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-musl.tar.xz.asc -sha256 b538209ea82733f25d88e3a9dc7d7b00f23f61ede128142412404c37846bad69 rust-std-1.66.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 5c7da9cc8d71e72021bfcc8040a6d2c248127d1fbed12d81e2e4bdf61c70b8d6 rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-musl.tar.xz.asc -sha256 3f14c6381c74b175e32ce0f2e6337811a5ea2cc048239fc55101b6319b0ce7f8 rust-std-1.66.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 8909dff6e3fd2c0a2f7c747d8c31003cf6d4fd2ea877ddb933b3fd7861c1cf87 rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-musl.tar.xz.asc -sha256 e76c5fea6da85b42a6f313cc326d064067314532d6a057cfc95f733c2f019de1 rust-std-1.66.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 26e5304dc5d592b2a34933794c4636220ad86d78e9c639e36c18f46d3a8c0235 rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 a621c95eef9b548d59234beeea031cc369d5744312a5ebfe4ac2250cb1b900e8 rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 41b2e528e2b123220b2dbc8b6bf93986c22d86091f7cd653ac55d1b169720e1f rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 28de7df8cead0a09a6c4dbb3be6898f7bb495c803e5d1f15945dd66a60ebb2c4 rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 519403a99b0859f21d4cabd347bada629f24fff913dafc54af255e4776d18f1b rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 d1a8d76bd7549b3845dad92cdab45876c987e7ba6a27ea67f39414d498a66761 rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 b68691f94417033b612f0fdb510d385499558ea19dcf2caf02a5c1d7141816fd rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 0be870ead23d432b83981a45b37bb173315965485ef9ad6dcee1418702a26a3a rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ed05f169784776c94c4880281fbabab66b49ed05a221d8e06c6926e1161b8bbe rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 93a8b0514106c8039a8767b961090e8a0f8e4b62d1488e70e93e2e553860f70c rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 304008a504385f91672ab6ddf86b50f05a588432f01537049f4fbe95f8d41402 rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 107045313c7b6678579eba1fb0b96519585a2e282570635c64c02ef4544aacaa rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 c59ca7959a019f3f660c1f46bea3c13e7769b67732731469c0c42d02f28d08e7 rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 b4dbc07eb417f77d9b794546d647f014d1650e1e0c0e76ff3d878dc09479e320 rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 a1279760f91b3571733e0b0268128d143be2734916753900b5fe7b8ecc3c0900 rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 835b4e1b4d396674f7866a83b9a4f44db16fd12f01a7eaed527282b3700a9b92 rust-1.66.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 c7349617c42274bf50f6e3662dfb4f6832a93780099c3bb510be1a5b93d04c37 rust-1.66.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 fc38663870f0af47a27241d980ca886c3f7d432267920deb412ac8576bef68f0 rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 2b1a6c54db49a9e62d60cc96c1768f405e0f4c59d698186bf3a28a1bb017b6b5 rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 777d3a650448c15048710282388e90d10740540f570f5d17ed4a2dbdabb89552 rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 875bb310bae7c8c1d2d228a49aa4b547608b6c807ddc9ec44bc87272c77d869b rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 89164ccf75909b3d02bdcb787e33876cad87e55ab0e6239b030b4b6631ed356a rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 e83f9fc473072db23376783595a008cdd9b2f2e9b3be109e55939392864840eb rust-1.66.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 a201aa4595ec8015662b7103b1409a4787c6d1f1d540bb68746633527d855858 rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24 rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 520ac446f20490685cc4d73192cfbb4c9b9e55c884aa4ae2b098e3a54d891de8 rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 42afd189ef64988f64976f767a734734bccd7c71e578780e902148c98226fa29 rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 506126773af9c3dacc506776a0b2e12fe6fa0c95eaf4f4ebb5cdbd335feb83fa rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 3d21b478fbf07bd27902bdd189e6988341f0c2c0108b538f926cea3031bc8ea6 rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 5282fc97111a7eafbead3463ed7bc0f3065332f21aec6a39a740157fe42f943a rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 0ebf0178bbe9c5572d1db89e190dee23aef0e2f667995abedbd66e33d0bd73ab rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 938e7442c21ea0895c44ec78fa718ea1d3abe32ed0425ed328c905e188af250e rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 bdc491f4c05669e7a3382b6bfdaeaa20e2cfa5ef553305df0e0d73729a45e6e4 rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 d75c6dc3c00d662b0d3f6ce7fde0f76057542edfbc97a20b29247842c8a711d2 rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 830285e5388081c68fac9dc955aa824a4d919b0e24eadc6e0b95b30103d79db9 rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 d720bd1e493f53797f90d83dbe6d52ecbe1ff3cae282f4b2e18c37fe92c9adf6 rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17 rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.asc +sha256 c4bab2d63223d0c6e63806082e30d8c38b37eefc10ee2e7380971e3012c00bca rust-std-1.66.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.asc +sha256 52013329eb6697d94f5dce01dd509b4b93b473c18a3a2c05d0230b9dfeab14d1 rust-std-1.66.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568 rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.asc +sha256 23f917eccaca59d4c911eb96d8ffefe86834dbcdf902c9ab6dad8558c31c4575 rust-std-1.66.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 70d1406e0981d5d31c1d3f85c848bba0476e0ff6203e7706f66b4d2212f01b66 rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 0fd221d4b4205ce548e83f0e7416c8332eb12b64d5a43c0b3ed61e9f7d6edf13 rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 132d6d5750a877972ebc6f23e831f2ef3077465b2ab24ca645d32ea83c496fe3 rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 533f370368ac8b6192e1450289c64544ebf9cacc38c3a52ef6c0ecded7ee6fa5 rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 d7028820888d0decde047a6e77b866e690532aa09522c9a23a3fbf8780a72257 rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1 rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35 rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770 rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062 rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927 rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377 rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 a9710727ba28955deb7fbec799faed19486c9af3c7e3088ec6659a257515ffca rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index b341bc4b7c..89009288f4 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.66.0 +RUST_BIN_VERSION = 1.66.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 35028b304b..545a452bf0 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.xz.asc -sha256 0dc176e34fae9871f855a6ba4cb30fa19d69c5b4428d29281a07419c4950715c rustc-1.66.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc +sha256 07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe rustc-1.66.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 55fa38df18..691683b492 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.66.0 +RUST_VERSION = 1.66.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From peter at korsgaard.com Fri Feb 10 14:10:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:10:59 +0100 Subject: [Buildroot] [git commit branch/next] package/jack2: fix build with host python >= 3.11 Message-ID: <20230220205257.4092C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8fe92584446bba2bb81f454c5ebbcb4f80a371b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/5ce/5ce5ebd20e0e509b31b51d2ec1aed56fdb8f45aa/ The bundled waf script is too old (2.0.12) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Jack unfortunately uses a modified waf, so we cannot just set JACK2_NEEDS_EXTERNAL_WAF, so instead backport an upstream patch fixing the compatibility issue: https://github.com/jackaudio/jack2/pull/884 Signed-off-by: Peter Korsgaard --- ...e-of-U-mode-bit-for-opening-files-in-pyth.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch new file mode 100644 index 0000000000..9ee5a43e18 --- /dev/null +++ b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch @@ -0,0 +1,55 @@ +From 328c58967dce8be426f9208ba7717ab5afc2c4f3 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Mon, 11 Jul 2022 00:56:28 +0200 +Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python + +The 'U' mode bit is removed in python 3.11. It has been +deprecated for a long time. The 'U' mode bit has no effect +so this change doesn't change any behavior. + +See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api + +Signed-off-by: Peter Korsgaard +--- + waflib/ConfigSet.py | 2 +- + waflib/Context.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index b300bb56..84736c9c 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -312,7 +312,7 @@ class ConfigSet(object): + :type filename: string + """ + tbl = self.table +- code = Utils.readf(filename, m='rU') ++ code = Utils.readf(filename, m='r') + for m in re_imp.finditer(code): + g = m.group + tbl[g(2)] = eval(g(3)) +diff --git a/waflib/Context.py b/waflib/Context.py +index 9fee3fa1..761b521f 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -266,7 +266,7 @@ class Context(ctx): + cache[node] = True + self.pre_recurse(node) + try: +- function_code = node.read('rU', encoding) ++ function_code = node.read('r', encoding) + exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict) + finally: + self.post_recurse(node) +@@ -662,7 +662,7 @@ def load_module(path, encoding=None): + + module = imp.new_module(WSCRIPT_FILE) + try: +- code = Utils.readf(path, m='rU', encoding=encoding) ++ code = Utils.readf(path, m='r', encoding=encoding) + except EnvironmentError: + raise Errors.WafError('Could not read the file %r' % path) + +-- +2.30.2 + From yann.morin.1998 at free.fr Mon Feb 20 21:00:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:40 -0000 Subject: [Buildroot] [git commit branch/next] package/{python-}protobuf: bump to version 21.12 Message-ID: <20230220205233.4C5F68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59461ec52ef6d70d08d0e68cd24a6a3db2dbb7fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 2 +- package/python-protobuf/python-protobuf.hash | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index f1f5fa77cd..b092c9303f 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 96f0ab99b7414e44e7bf9b218bb59510d61549ca68e648f19e3622f9999bec00 protobuf-cpp-3.21.11.tar.gz +sha256 4eab9b524aa5913c6fffb20b2a8abf5ef7f95a80bc0701f3a6dbb4c607f73460 protobuf-cpp-3.21.12.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 33a7c40f40..8cd4e99e06 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,7 +7,7 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works and to update its hash, # as they share the same version/site variables. -PROTOBUF_VERSION = 21.11 +PROTOBUF_VERSION = 21.12 PROTOBUF_SOURCE = protobuf-cpp-3.$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index c2afc3955a..e7af678b97 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ae4ca6e1da635f31019d8911923163f372d9d333e8857510f513acba33172d0c protobuf-python-4.21.11.tar.gz +sha256 e2b976e67d6fcf7078f799143a73f2a4d9cf3126ca68a1a6f1bda30fe5f3585c protobuf-python-4.21.12.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE From peter at korsgaard.com Fri Feb 10 15:26:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:26:48 +0100 Subject: [Buildroot] [git commit branch/next] package/webkitgtk: Build with ninja Message-ID: <20230220205257.65A9486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16e5c92ff5fd2b44a1126bd7d7538c68ce838213 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b42ac3b644..a6974db926 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -139,4 +139,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# webkitgtk needs cmake >= 3.20 when not building with ninja, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WEBKITGTK_CONF_OPTS += -GNinja +WEBKITGTK_DEPENDENCIES += host-ninja + +define WEBKITGTK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:41 -0000 Subject: [Buildroot] [git commit branch/next] package/at-spi2-core: switch to https download Message-ID: <20230220205233.3463A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dde078790a965dfd469ec6ed745e4f7b5edc60ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/at-spi2-core/at-spi2-core.hash | 2 +- package/at-spi2-core/at-spi2-core.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index e2cc403e71..764e4c3661 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum +# From https://download.gnome.org/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz # locally calculated diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index cf7fdd297c..f0b019c0ed 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -7,7 +7,7 @@ AT_SPI2_CORE_VERSION_MAJOR = 2.36 AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz -AT_SPI2_CORE_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) +AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) AT_SPI2_CORE_LICENSE = LGPL-2.1+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES From peter at korsgaard.com Fri Feb 10 15:53:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:53:27 +0100 Subject: [Buildroot] [git commit branch/next] package/elixir: drop package Message-ID: <20230220205257.8FF2B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=406698de03a9c9e4ded5a50070de2249398380ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Elixir was a dependency of rabbitmq-server which got dropped in 89815bad0a531d01ee2733dd9c17576a7647e1d9. It is a host package with no other users, hence it is no longer required. Additionally, newer versions require Erlang 23+. Signed-off-by: Frank Vanbever Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - package/elixir/elixir.hash | 3 --- package/elixir/elixir.mk | 21 --------------------- 3 files changed, 25 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 32c6e54919..e8e0671709 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1089,7 +1089,6 @@ F: package/upx/ F: package/zxing-cpp/ N: Frank Vanbever -F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ diff --git a/package/elixir/elixir.hash b/package/elixir/elixir.hash deleted file mode 100644 index 6d083e72de..0000000000 --- a/package/elixir/elixir.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Computed locally -sha256 f3465d8a8e386f3e74831bf9594ee39e6dfde6aa430fe9260844cfe46aa10139 elixir-1.9.4.tar.gz -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE diff --git a/package/elixir/elixir.mk b/package/elixir/elixir.mk deleted file mode 100644 index 6d935516f4..0000000000 --- a/package/elixir/elixir.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# elixir -# -################################################################################ - -ELIXIR_VERSION = 1.9.4 -ELIXIR_SITE = $(call github,elixir-lang,elixir,v$(ELIXIR_VERSION)) -ELIXIR_LICENSE = Apache-2.0 -ELIXIR_LICENSE_FILES = LICENSE -HOST_ELIXIR_DEPENDENCIES = host-erlang - -define HOST_ELIXIR_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) compile -endef - -define HOST_ELIXIR_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX="$(HOST_DIR)" -C $(@D) install -endef - -$(eval $(host-generic-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:00:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:42 -0000 Subject: [Buildroot] [git commit branch/next] package/python-aioblescan: bump to version 0.2.14 Message-ID: <20230220205233.62BD8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c35f2393327abab5d21a9155d468067482af383b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aioblescan/python-aioblescan.hash | 4 ++-- package/python-aioblescan/python-aioblescan.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioblescan/python-aioblescan.hash b/package/python-aioblescan/python-aioblescan.hash index 9a40ca4560..c754325fb1 100644 --- a/package/python-aioblescan/python-aioblescan.hash +++ b/package/python-aioblescan/python-aioblescan.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioblescan/json -md5 0601cf9335e5d89166a88f53597c79bf aioblescan-0.2.13.tar.gz -sha256 28632e32c8180ea4b792f4cf9b88968dd100f4d3cee0cf16d27c193cf954422a aioblescan-0.2.13.tar.gz +md5 10014cfd24b8f9f54099bbf7e2ea528a aioblescan-0.2.14.tar.gz +sha256 3a47c5292186ee87fc49cb076a5271c766510f44749b93ac4a32bbb4cb5258a0 aioblescan-0.2.14.tar.gz # Locally computed sha256 checksums sha256 c2066cd44079e0c706234001af18cb6ad4b62fc68d0d08d29fdc7319916647e0 LICENSE.txt diff --git a/package/python-aioblescan/python-aioblescan.mk b/package/python-aioblescan/python-aioblescan.mk index f0e277d528..7e0cde6c85 100644 --- a/package/python-aioblescan/python-aioblescan.mk +++ b/package/python-aioblescan/python-aioblescan.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOBLESCAN_VERSION = 0.2.13 +PYTHON_AIOBLESCAN_VERSION = 0.2.14 PYTHON_AIOBLESCAN_SOURCE = aioblescan-$(PYTHON_AIOBLESCAN_VERSION).tar.gz -PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/bd/04/c6798c76704d57da22f19c2e47485821d4b23144ef75f9c0e18dbfe47565 +PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/45/15/faf503083bc5a2d81f1b17fbbe30d15f35217b6c5e944c771c8760354d59 PYTHON_AIOBLESCAN_SETUP_TYPE = setuptools PYTHON_AIOBLESCAN_LICENSE = MIT PYTHON_AIOBLESCAN_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Fri Feb 10 22:30:30 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:30:30 +0100 Subject: [Buildroot] [git commit branch/next] configs/asus_tinker_rk3288: bump Linux to 6.1.2 and U-boot to 2022.10 Message-ID: <20230220205257.D00CA81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fdf20249574b64285979f109bef74eb9cdbf0db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/asus_tinker_rk3288_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 02b340a7f1..40f4125880 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" From yann.morin.1998 at free.fr Mon Feb 20 21:00:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:43 -0000 Subject: [Buildroot] [git commit branch/next] package/python-asgiref: bump to version 3.6.0 Message-ID: <20230220205233.8AF4686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=823e3e98671bf70135d526298346a8c72beacd8a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-asgiref/python-asgiref.hash | 4 ++-- package/python-asgiref/python-asgiref.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-asgiref/python-asgiref.hash b/package/python-asgiref/python-asgiref.hash index fec707ce02..26d8e78e47 100644 --- a/package/python-asgiref/python-asgiref.hash +++ b/package/python-asgiref/python-asgiref.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asgiref/json -md5 b3cf42bb1f9191196f9ed1678f9dc106 asgiref-3.5.2.tar.gz -sha256 4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424 asgiref-3.5.2.tar.gz +md5 562ecd896dcbf5576db8c29cb1881ca4 asgiref-3.6.0.tar.gz +sha256 9567dfe7bd8d3c8c892227827c41cce860b368104c3431da67a0c5a65a949506 asgiref-3.6.0.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-asgiref/python-asgiref.mk b/package/python-asgiref/python-asgiref.mk index afc083fb1f..bfd90f10e8 100644 --- a/package/python-asgiref/python-asgiref.mk +++ b/package/python-asgiref/python-asgiref.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASGIREF_VERSION = 3.5.2 +PYTHON_ASGIREF_VERSION = 3.6.0 PYTHON_ASGIREF_SOURCE = asgiref-$(PYTHON_ASGIREF_VERSION).tar.gz -PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/1f/35/e7d59b92ceffb1dc62c65156278de378670b46ab2364a3ea7216fe194ba3 +PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/78/2d/797c0537426266d6c9377a2ed6a4ac61e50c2d5b1ab4da101a4b9bfe26e2 PYTHON_ASGIREF_SETUP_TYPE = setuptools PYTHON_ASGIREF_LICENSE = BSD-3-Clause PYTHON_ASGIREF_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Fri Feb 10 22:26:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:26:56 +0100 Subject: [Buildroot] [git commit branch/next] package/gtest: drop patch adding debug 'd' to library names in pkg-config files Message-ID: <20230220205257.A99AA81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f661c00342befb21c0032e593c758dfb2d336007 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - drop patch adding debug 'd' to gmock/gtest library names in pkg-config files (not longer needed since gtest version bump to 1.22 ([1]) and upstream commit 'FIX #2174 -- remove `DEBUG_POSTFIX`' ([2]). Fixes: http://autobuild.buildroot.net/results/5ea8f180e4909f8157565238b25f567fcf1f3beb .../host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/7.3.1/../../../../aarch64-linux-gnu/bin/ld: cannot find -lgtestd [1] https://git.buildroot.net/buildroot/commit/?id=a336b731af5979a25213b33c5840de6d1ed88bdc [2] https://github.com/google/googletest/commit/ca3ffd90f2726f6c0c6e790f05c7c88491a16466 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...fix-gtest.pc-gmock.pc-library-names-for-t.patch | 62 ---------------------- 1 file changed, 62 deletions(-) diff --git a/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch b/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch deleted file mode 100644 index c47e8fc8f8..0000000000 --- a/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cf5a3177159ca832470e7f876cab0a1923fa666f Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 22 Oct 2021 20:17:36 +0200 -Subject: [PATCH] pkg-config: fix gtest.pc/gmock.pc library names for the debug - build - -In case CMAKE_BUILD_TYPE is set to Debug the gtest library is -name libgtestd.a but the link command returned from gtest.pc is -'-lgtest' (without the debug d) and so the linking of dependent -packages fails (see [1] for a buildroot failure example). - -Enhance the gtest.pc ang gmock.pc generation to honour the debug 'd'. - -[1] http://lists.busybox.net/pipermail/buildroot/2021-October/626382.html - -[Upstream: https://github.com/google/googletest/pull/3625] -Signed-off-by: Peter Seiderer ---- - googlemock/cmake/gmock.pc.in | 2 +- - googletest/cmake/gtest.pc.in | 2 +- - googletest/cmake/internal_utils.cmake | 3 +++ - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in -index 23c67b5c..0f469857 100644 ---- a/googlemock/cmake/gmock.pc.in -+++ b/googlemock/cmake/gmock.pc.in -@@ -6,5 +6,5 @@ Description: GoogleMock (without main() function) - Version: @PROJECT_VERSION@ - URL: https://github.com/google/googletest - Requires: gtest = @PROJECT_VERSION@ --Libs: -L${libdir} -lgmock @CMAKE_THREAD_LIBS_INIT@ -+Libs: -L${libdir} -lgmock at DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@ - Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ -diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in -index b4148fae..225bba81 100644 ---- a/googletest/cmake/gtest.pc.in -+++ b/googletest/cmake/gtest.pc.in -@@ -5,5 +5,5 @@ Name: gtest - Description: GoogleTest (without main() function) - Version: @PROJECT_VERSION@ - URL: https://github.com/google/googletest --Libs: -L${libdir} -lgtest @CMAKE_THREAD_LIBS_INIT@ -+Libs: -L${libdir} -lgtest at DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@ - Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ -diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake -index 58fc9bfb..fd81b825 100644 ---- a/googletest/cmake/internal_utils.cmake -+++ b/googletest/cmake/internal_utils.cmake -@@ -335,6 +335,9 @@ function(install_project) - # Configure and install pkgconfig files. - foreach(t ${ARGN}) - set(configured_pc "${generated_dir}/${t}.pc") -+ if(CMAKE_BUILD_TYPE MATCHES Debug) -+ set(DEBUG_POSTFIX "d") -+ endif() - configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in" - "${configured_pc}" @ONLY) - install(FILES "${configured_pc}" --- -2.33.1 - From yann.morin.1998 at free.fr Mon Feb 20 21:00:44 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:44 -0000 Subject: [Buildroot] [git commit branch/next] package/python-attrs: bump to version 22.2.0 Message-ID: <20230220205233.A0C53828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f8d6264d79f6645ce4f2bbf0b76a919db29fcb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-attrs/python-attrs.hash | 4 ++-- package/python-attrs/python-attrs.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash index d5548c0ed3..66b2082cff 100644 --- a/package/python-attrs/python-attrs.hash +++ b/package/python-attrs/python-attrs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/attrs/json -md5 0487081b7ead8753fc46cf7c6d1e28e3 attrs-22.1.0.tar.gz -sha256 29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 attrs-22.1.0.tar.gz +md5 eff16b3bbd0d9b72e118cca83a19d380 attrs-22.2.0.tar.gz +sha256 c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99 attrs-22.2.0.tar.gz # Locally computed sha256 checksums sha256 882115c95dfc2af1eeb6714f8ec6d5cbcabf667caff8729f42420da63f714e9f LICENSE diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 33651ee80a..0462f7cb0b 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ATTRS_VERSION = 22.1.0 +PYTHON_ATTRS_VERSION = 22.2.0 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/1a/cb/c4ffeb41e7137b23755a45e1bfec9cbb76ecf51874c6f1d113984ecaa32c +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/21/31/3f468da74c7de4fcf9b25591e682856389b3400b4b62f201e65f15ea3e07 PYTHON_ATTRS_SETUP_TYPE = setuptools PYTHON_ATTRS_LICENSE = MIT PYTHON_ATTRS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Feb 11 11:00:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 12:00:55 +0100 Subject: [Buildroot] [git commit branch/next] package/pkg-waf: add one more missing $ Message-ID: <20230220205258.36A8686496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33107962eb29d2d33fcf4bed429d5239c1b2d278 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Further fix on top on 9d1b223b91b0 (package/pkg-waf: add missing $). Repeat after me: all variables in an inner-package macro must be expanded, except for: parameters, pkgdir, and pkgname. Signed-off-by: Yann E. MORIN --- package/pkg-waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index c3e965bdf3..0529bb6dda 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -42,7 +42,7 @@ define inner-waf-package # otherwise waf errors out with: # Waf script 'X' and library 'Y' do not match define WAF_PACKAGE_REMOVE_WAF_LIB - $(RM) -fr $$(@D)/waf $$(@D)/waflib + $$(RM) -fr $$(@D)/waf $$(@D)/waflib endef # We need host-python3 to run waf From thomas.petazzoni at bootlin.com Wed Feb 15 21:45:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:45:26 +0100 Subject: [Buildroot] [git commit branch/next] package/dmalloc: convert existing patch to git format Message-ID: <20230220205301.1BB188648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7bd0fdb88a15b15d4b41bdc82a37cf35ab2b268 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We're going to add more patches, so let's cleanup our historical baggage... Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../dmalloc/0001-configure-fix-build-on-mips.patch | 90 ++++++++++++++++++++++ package/dmalloc/0001-mips.patch | 45 ----------- 2 files changed, 90 insertions(+), 45 deletions(-) diff --git a/package/dmalloc/0001-configure-fix-build-on-mips.patch b/package/dmalloc/0001-configure-fix-build-on-mips.patch new file mode 100644 index 0000000000..9b1525d0d1 --- /dev/null +++ b/package/dmalloc/0001-configure-fix-build-on-mips.patch @@ -0,0 +1,90 @@ +From af6adb3f5f05be4faa88a5aa83296c388c8085e7 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 12:30:10 +0100 +Subject: [PATCH] configure: fix build on mips + +This patch is a historical baggage that Buildroot has carried for ages +(since 2006), and the reason for it are notentirely clear. + +Since dmalloc is pretty tricky, and as this patch has not been +identified as causing issues, we keep it; we just add the configure.ac +patchlet to match the one in configure. + +As for the title, the original patch was named dmalloc-mips.patch, so +presumably it fixes some mips issue; let's title the commit that way. + +[Fabrice: Updated for 5.6.5] +Signed-off-by: Fabrice Fontaine +[yann.morin.1998 at free.fr: make it a git-formatted patch] +Signed-off-by: Yann E. MORIN +--- + configure | 4 ++-- + configure.ac | 2 +- + return.h | 16 +++------------- + 3 files changed, 6 insertions(+), 16 deletions(-) + +diff --git a/configure b/configure +index d52a1e8..c18dfb2 100755 +--- a/configure ++++ b/configure +@@ -5413,8 +5413,8 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 + $as_echo_n "checking return.h macros work... " >&6; } + if test "$cross_compiling" = yes; then : +- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assume yes (cross-compiling)" >&5 + $as_echo "no" >&6; } + + else +diff --git a/configure.ac b/configure.ac +index a5295f1..9740fdc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -705,7 +705,7 @@ int main() + ])], + [ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([yes]) ], + [ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ], +-[ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ] ++[ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([assume yes (cross-compiling)]) ] + ) + + ############################################################################## +diff --git a/return.h b/return.h +index 9d3f5f1..d916c7a 100644 +--- a/return.h ++++ b/return.h +@@ -117,26 +117,16 @@ + /*************************************/ + + /* +- * For DEC Mips machines running Ultrix ++ * For Mips machines running Linux + */ + #if __mips + +-/* +- * I have no idea how to get inline assembly with the default cc. +- * Anyone know how? +- */ +- +-#if 0 +- + /* + * NOTE: we assume here that file is global. + * +- * $31 is the frame pointer. $2 looks to be the return address but maybe +- * not consistently. ++ * $31 is the return address. + */ +-#define GET_RET_ADDR(file) asm("sw $2, file") +- +-#endif ++#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) + + #endif /* __mips */ + +-- +2.25.1 + diff --git a/package/dmalloc/0001-mips.patch b/package/dmalloc/0001-mips.patch deleted file mode 100644 index 3150d030ec..0000000000 --- a/package/dmalloc/0001-mips.patch +++ /dev/null @@ -1,45 +0,0 @@ -[Fabrice: Updated for 5.6.5] -Signed-off-by: Fabrice Fontaine ---- a/configure -+++ b/configure -@@ -7107,7 +7107,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 - $as_echo_n "checking return.h macros work... " >&6; } - if test "$cross_compiling" = yes; then : -- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h -+ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - ---- a/return.h -+++ b/return.h -@@ -106,26 +106,16 @@ - /*************************************/ - - /* -- * For DEC Mips machines running Ultrix -+ * For Mips machines running Linux - */ - #if __mips - - /* -- * I have no idea how to get inline assembly with the default cc. -- * Anyone know how? -- */ -- --#if 0 -- --/* - * NOTE: we assume here that file is global. - * -- * $31 is the frame pointer. $2 looks to be the return address but maybe -- * not consistently. -+ * $31 is the return address. - */ --#define GET_RET_ADDR(file) asm("sw $2, file") -- --#endif -+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) - - #endif /* __mips */ - From yann.morin.1998 at free.fr Mon Feb 20 21:01:16 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:16 -0000 Subject: [Buildroot] [git commit branch/next] package/z3: bump to version 4.12.0 Message-ID: <20230220205236.1D7398648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8eef1e1488bce0732dbce137baa4f506a29dd13f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For change log since v4.11.2, see: - https://github.com/Z3Prover/z3/releases/tag/z3-4.12.0 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/z3/z3.hash | 2 +- package/z3/z3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/z3/z3.hash b/package/z3/z3.hash index d38c5f1971..517e2f4923 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e3a82431b95412408a9c994466fad7252135c8ed3f719c986cd75c8c5f234c7e z3-4.11.2.tar.gz +sha256 5f575f0a3950760436217da1cc1a714569b6d4f664a75bb6775876328cf0a580 z3-4.12.0.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index 2252e05395..ecd79325dc 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.11.2 +Z3_VERSION = 4.12.0 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Wed Feb 15 21:46:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:46:35 +0100 Subject: [Buildroot] [git commit branch/next] package/dmalloc: don't use SSP Message-ID: <20230220205301.35B1E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3481674ee36fe9fa695e2e6c255bf02b5ab380b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next dmalloc directly calls into $(LD) to generate a shared library our of the static one. To detect what command it should run, ./configure tries various incantations of ld with various command line options until one does not fail. One of those is (basically): $(LD) --whole-archive -o contest.o.t contest.a This makes ./configure conclude what the command to link a shared library in the Makefile should be, and thus stores that in a variable: shlinkargs='$(LD) --whole-archive -o $@' ... which is then AC_SUBST()ed into Makefile.in with a rule like: $(SHLIB): $(LIBRARY) @shlinkargs@ $(LIRARY) which once substiuted, gives: $(SHLIB): $(LIBRARY) $(LD) --whole-archive -o $@ $(LIRARY) However, when SSP is enabled, the __stack_chk_fail_local and co symbols are provided by additional libraries or object files, and that is the responsibility of gcc to pass those when linking. But as dmalloc directly calls ld, it misses those. Changing dmalloc to use $(CC) is not trivial, however. First, we can't pass LD=$(TARGET_CC), otherwise the whole package explodes [0]: indeed --whole-archive is unknown to gcc, so it must be passed as -Wl,--whole archive instead. So we'd need to add a new test that uses $(CC), like so: $(CC) -Wl,--whole-archive -o contest.o.t contest.a However, in that case, gcc does pass additional libs/objs (like, for eample, the SSP ones) to the linker. But then those are also included in the whole-archive section. This causes the linker to add all the symbols form those libs/objs, even those not needed for SSP; on some archs, like PPC, that may require floating point symbols (__muldiv3 et al.) which are in another library, and thus the linker can't find them. The proper solution wouild be to add -Wl,--no-whole-archive, but that would have to be added _after_ the library we want to link, i.e.e we should be able to evntually run: $(CC) -Wl,--whole-archive -o $@ $(LIRARY) -Wl,--no-whole-archive That would require that we introduce a new variable that is added _after_ the $(LIBRARY), e.g. @shlinkargs_post@ or so... This is a bigger endeavour than we want to pursue... Since dmalloc is a debugging utility, it is not supposed to go into production builds, and during debugging, it would not be surprising that it needs to poke around arrays to debug them. So, we go the easier route: disable SSP altogether. [0] with lots of nice colors, but that's not the point, is it? Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dmalloc/dmalloc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 6b90f810b2..5bd6691725 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -14,6 +14,13 @@ DMALLOC_LICENSE_FILES = LICENSE.txt DMALLOC_INSTALL_STAGING = YES DMALLOC_CFLAGS = $(TARGET_CFLAGS) +# dmalloc uses $(LD) to link, and thus misses the object files or libs that +# are needed to provide the __stack_chk_fail_local and co. symbols. Changing +# to use $(CC) is really more complex that we'd like. Since dmalloc is +# involved in debugging memory allocation, it is not expected to be a +# production library, so we do not care that much that it has SSP. +DMALLOC_CFLAGS += -fno-stack-protector + ifeq ($(BR2_STATIC_LIBS),y) DMALLOC_CONF_OPTS += --disable-shlib else From yann.morin.1998 at free.fr Mon Feb 20 21:01:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:17 -0000 Subject: [Buildroot] [git commit branch/next] package/sscep: requires des support in openssl Message-ID: <20230220205236.2BDE3828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af8200a4c3543403ca653f4064f6649a052440e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Enable des in openssl to fix the following build failure raised since the addition of the package in commit 72fa60dc102679f51b228336ec38f5af78ff7646: src/sscep.c: In function 'get_cipher_alg': src/sscep.c:119:32: warning: implicit declaration of function 'EVP_des_ede3_cbc'; did you mean 'NID_des_ede3_cbc'? [-Wimplicit-function-declaration] 119 | return EVP_des_ede3_cbc(); | ^~~~~~~~~~~~~~~~ | NID_des_ede3_cbc Fixes: - http://autobuild.buildroot.net/results/34bd76e8e5e7df0db31918d610a0dadf531f369d Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/sscep/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sscep/Config.in b/package/sscep/Config.in index 2e5e29f7c8..549c65274b 100644 --- a/package/sscep/Config.in +++ b/package/sscep/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SSCEP bool "sscep" select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL help SSCEP is a client-only implementation of the SCEP From thomas.petazzoni at bootlin.com Fri Feb 17 13:28:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:28:47 +0100 Subject: [Buildroot] [git commit branch/next] package/dotconf: new package Message-ID: <20230220205301.876B48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5336566668bd2ac9cd458a051eb6e8105d4b4544 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/dotconf/Config.in | 6 ++++++ package/dotconf/dotconf.hash | 3 +++ package/dotconf/dotconf.mk | 15 +++++++++++++++ 5 files changed, 28 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f8451c7fec..b9d54feb46 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2297,6 +2297,9 @@ F: package/wireguard-linux-compat/ F: package/wireguard-tools/ F: support/testing/tests/package/test_docker_compose.py +N: Peter Seiderer +F: package/dotconf/ + N: Peter Thompson F: package/sdl2_gfx/ F: package/sdl2_image/ diff --git a/package/Config.in b/package/Config.in index 0af4adffa5..b2808cc6f8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2019,6 +2019,7 @@ menu "Other" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" source "package/ding-libs/Config.in" + source "package/dotconf/Config.in" source "package/double-conversion/Config.in" source "package/eigen/Config.in" source "package/elfutils/Config.in" diff --git a/package/dotconf/Config.in b/package/dotconf/Config.in new file mode 100644 index 0000000000..21a74fa065 --- /dev/null +++ b/package/dotconf/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_DOTCONF + bool "dotconf" + help + Configuration file parser. + + https://github.com/williamh/dotconf diff --git a/package/dotconf/dotconf.hash b/package/dotconf/dotconf.hash new file mode 100644 index 0000000000..3233ea62c8 --- /dev/null +++ b/package/dotconf/dotconf.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7f1ecf40de1ad002a065a321582ed34f8c14242309c3547ad59710ae3c805653 dotconf-1.3.tar.gz +sha256 a50cc98d5044a7bbddabe61fc0ec42aa671c73bf414d0c6b50da83ea8ae041c6 COPYING diff --git a/package/dotconf/dotconf.mk b/package/dotconf/dotconf.mk new file mode 100644 index 0000000000..26e78b3c7a --- /dev/null +++ b/package/dotconf/dotconf.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# dotconf +# +################################################################################ + +DOTCONF_VERSION = 1.3 +DOTCONF_SITE = $(call github,williamh,dotconf,v$(DOTCONF_VERSION)) +DOTCONF_LICENSE = LGPL-2.1 +DOTCONF_LICENSE_FILES = COPYING +DOTCONF_INSTALL_STAGING = YES +# dotconf source code is released without configure script +DOTCONF_AUTORECONF = YES + +$(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:01:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:18 -0000 Subject: [Buildroot] [git commit branch/next] package/lua-cffi: bump to version 0.2.3 Message-ID: <20230220205236.4A1608648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aac8ce4999c3c2e105347fd247ba65304ab0d26a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-cffi/lua-cffi.hash | 2 +- package/lua-cffi/lua-cffi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lua-cffi/lua-cffi.hash b/package/lua-cffi/lua-cffi.hash index e710199936..318f60fefe 100644 --- a/package/lua-cffi/lua-cffi.hash +++ b/package/lua-cffi/lua-cffi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 34fb4eea7a0abec2095f08596f604ac01c81b979bead7d2f5cb084b3e2b46cbc lua-cffi-0.2.2.tar.gz +sha256 1d2577a62a843e5e6db35af1b58300d279b4df58eccef5e823441501f960d388 lua-cffi-0.2.3.tar.gz sha256 f5653a4d5864a3920ea1e07dacfd646067314be647598f0acaaf685beaa2e396 COPYING.md diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk index ac351f7f98..30427ac34c 100644 --- a/package/lua-cffi/lua-cffi.mk +++ b/package/lua-cffi/lua-cffi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CFFI_VERSION = 0.2.2 +LUA_CFFI_VERSION = 0.2.3 LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) LUA_CFFI_LICENSE = MIT LUA_CFFI_LICENSE_FILES = COPYING.md From thomas.petazzoni at bootlin.com Fri Feb 17 13:45:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 14:45:57 +0100 Subject: [Buildroot] [git commit branch/next] package/speechd: new package Message-ID: <20230220205301.9353E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/speechd/Config.in | 20 ++++++++++++++++++++ package/speechd/speechd.hash | 5 +++++ package/speechd/speechd.mk | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b9d54feb46..319ea9f4dc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2299,6 +2299,7 @@ F: support/testing/tests/package/test_docker_compose.py N: Peter Seiderer F: package/dotconf/ +F: package/speechd/ N: Peter Thompson F: package/sdl2_gfx/ diff --git a/package/Config.in b/package/Config.in index b2808cc6f8..e9746862b4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -51,6 +51,7 @@ menu "Audio and video applications" source "package/pipewire-media-session/Config.in" source "package/pulseaudio/Config.in" source "package/sox/Config.in" + source "package/speechd/Config.in" source "package/squeezelite/Config.in" source "package/tinycompress/Config.in" source "package/tovid/Config.in" diff --git a/package/speechd/Config.in b/package/speechd/Config.in new file mode 100644 index 0000000000..8fdc452d19 --- /dev/null +++ b/package/speechd/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_SPEECHD + bool "speechd" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_DOTCONF + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSNDFILE + help + Speech Dispatcher project provides a high-level device + independent layer for access to speech synthesis through + a simple, stable and well documented interface. + + https://freebsoft.org/speechd + +comment "speechd needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/speechd/speechd.hash b/package/speechd/speechd.hash new file mode 100644 index 0000000000..4eb4cd09d2 --- /dev/null +++ b/package/speechd/speechd.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 628d4446894b47f0df099123924c1070180b5b5b09c5b637ebe80d8578fba92f speechd-0.11.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL-2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL-3 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk new file mode 100644 index 0000000000..0d43e4b6fb --- /dev/null +++ b/package/speechd/speechd.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# speechd +# +################################################################################ + +SPEECHD_VERSION = 0.11.4 +SPEECHD_SITE = $(call github,brailcom,speechd,$(SPEECHD_VERSION)) +SPEECHD_LICENSE = GPL-2.0+, GPL-3.0+ (buildsystem), LGPL-2.1+ +SPEECHD_LICENSE_FILES = COPYING.GPL-2 COPYING.GPL-3 COPYING.LGPL +SPEECHD_INSTALL_STAGING = YES +# speechd source code is released without configure script +SPEECHD_AUTORECONF = YES +SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile + +# fix missing config.rpath (needed for autoreconf) in the codebase +define SPEECHD_TOUCH_CONFIG_RPATH + touch $(@D)/config.rpath +endef +SPEECHD_PRE_CONFIGURE_HOOKS += SPEECHD_TOUCH_CONFIG_RPATH + +ifeq ($(BR2_PACKAGE_LIBTOOL),y) +SPEECHD_DEPENDENCIES += libtool +SPEECHD_CONF_OPTS += --with-libltdl +else +SPEECHD_CONF_OPTS += --without-libltdl +endif + +define SPEECHD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/speech-dispatcherd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/speech-dispatcherd.service +endef + +$(eval $(autotools-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:01:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:19 -0000 Subject: [Buildroot] [git commit branch/next] package/go: set GOCACHE for download post-process Message-ID: <20230220205236.58C4A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07a745e55d76616802a20dcbfd72dfe6fe8e3b05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The go mod vendor call in support/download/go-post-process accesses the go cache, so pass GOCACHE= in the environment to ensure our cache directory is used. The go cache defaults to ~/.cache/go-build if not set, so this fixes builds where that location (or GOCACHE if set in the environment) is not writable: rm -rf ~/.cache/go-build chmod -w ~/.cache make docker-compose-source .. failed to initialize build cache at /home/peko/.cache/go-build: mkdir /home/peko/.cache/go-build: permission denied make[1]: *** [package/pkg-generic.mk:189: /home/peko/source/buildroot/output/build/docker-compose-2.14.0/.stamp_downloaded] Error 1 We use two different cache directories for target and host builds, but the download/vendoring should be independent of the architecture, so use the target variant even for host-only packages for simplicity. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/go/go.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/go/go.mk b/package/go/go.mk index d3ed07f03b..c4f72d403c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -25,6 +25,7 @@ HOST_GO_COMMON_ENV = \ GOFLAGS=-mod=vendor \ GOROOT="$(HOST_GO_ROOT)" \ GOPATH="$(HOST_GO_GOPATH)" \ + GOCACHE="$(HOST_GO_TARGET_CACHE)" \ GOPROXY=off \ PATH=$(BR_PATH) \ GOBIN= \ @@ -75,7 +76,6 @@ HOST_GO_TARGET_ENV = \ $(HOST_GO_COMMON_ENV) \ GOOS="linux" \ GOARCH=$(GO_GOARCH) \ - GOCACHE="$(HOST_GO_TARGET_CACHE)" \ CC="$(TARGET_CC)" \ CXX="$(TARGET_CXX)" \ CGO_CFLAGS="$(TARGET_CFLAGS)" \ From thomas.petazzoni at bootlin.com Fri Feb 17 15:02:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 16:02:28 +0100 Subject: [Buildroot] [git commit branch/next] package/openipmi: add libexecinfo optional dependency Message-ID: <20230220205301.C84C08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5357f650d7e58043a5b8ab820972984eb07fef4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add libexecinfo optional dependency as upstream rejected the patch to add --with-execinfo=no Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-configure.ac-add-without-execinfo-option.patch | 55 ---------------------- package/openipmi/openipmi.mk | 6 ++- 2 files changed, 5 insertions(+), 56 deletions(-) diff --git a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch deleted file mode 100644 index e1838a06f4..0000000000 --- a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 388033e3d0129510c3884333bc428cefeb75e0b8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 3 Jan 2022 23:27:21 +0100 -Subject: [PATCH] configure.ac: add --without-execinfo option - -Add an option to allow the user to disable execinfo to avoid the -following build failure on musl with -https://github.com/mikroskeem/libexecinfo: - -/home/buildroot/autobuild/instance-3/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-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' - -Fixes: - - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://sourceforge.net/p/openipmi/patches/36] ---- - configure.ac | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 607864b9..f369166f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -77,6 +77,16 @@ AC_ARG_WITH(poptlibs, - POPTLIBS="$withval" - ) - -+tryexecinfo=yes -+AC_ARG_WITH(execinfo, -+[ --with-execinfo[[=yes|no]] Look for execinfo.], -+ if test "x$withval" = "xyes"; then -+ tryexecinfo=yes -+ elif test "x$withval" = "xno"; then -+ tryexecinfo=no -+ fi, -+) -+ - # If UCD SNMP requires OpenSSL, this tells where to find the crypto lib - tryopenssl=yes - AC_ARG_WITH(openssl, -@@ -275,7 +285,9 @@ AM_PROG_CC_C_O - AC_PROG_LIBTOOL - AC_STDC_HEADERS - --AC_CHECK_HEADERS(execinfo.h) -+if test "x$tryexecinfo" != "xno"; then -+ AC_CHECK_HEADERS(execinfo.h) -+fi - AC_CHECK_HEADERS([netinet/ether.h]) - AC_CHECK_HEADERS([sys/ethernet.h]) - --- -2.34.1 - diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index b3a4d90d4b..81492ec131 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -15,7 +15,6 @@ OPENIPMI_INSTALL_STAGING = YES OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" OPENIPMI_CONF_OPTS = \ - --with-execinfo=no \ --with-glib=no \ --with-tcl=no \ --with-perl=no \ @@ -26,6 +25,11 @@ ifeq ($(BR2_PACKAGE_GDBM),y) OPENIPMI_DEPENDENCIES += gdbm endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +OPENIPMI_DEPENDENCIES += libexecinfo +OPENIPMI_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPENIPMI_DEPENDENCIES += openssl OPENIPMI_CONF_OPTS += --with-openssl=yes From yann.morin.1998 at free.fr Mon Feb 20 21:01:20 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:20 -0000 Subject: [Buildroot] [git commit branch/next] fs/erofs: enable support for reproducible build Message-ID: <20230220205236.72D978648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac5ecaf86809a999d68d851c2200705a8f10a7b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next By default, mkfs.erofs will sue the current date to set some metadata in the filesystem it generates, and will also use generate a random UUID for that filesystem. This is not reproducible. When BR2_REPRODUCIBLE is selected, set the filesystem timestamps to $SOURCE_DATE_EPOCH, and the filesystem UUID to the nil uuid (as good as any other arbitrary one). Signed-off-by: Casey Reeves [yann.morin.1998 at free.fr: - one multi-line assignment, not two - slightly rephrase the commit log ] Signed-off-by: Yann E. MORIN --- fs/erofs/erofs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/erofs/erofs.mk b/fs/erofs/erofs.mk index 0e9d4401a9..e43d74927b 100644 --- a/fs/erofs/erofs.mk +++ b/fs/erofs/erofs.mk @@ -10,6 +10,12 @@ ifeq ($(BR2_TARGET_ROOTFS_EROFS_LZ4HC),y) ROOTFS_EROFS_ARGS += -zlz4hc endif +ifeq ($(BR2_REPRODUCIBLE),y) +ROOTFS_EROFS_ARGS += \ + -T $(SOURCE_DATE_EPOCH) \ + -U 00000000-0000-0000-0000-000000000000 +endif + ifneq ($(BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE),0) ROOTFS_EROFS_ARGS += -C$(strip $(BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE)) endif From thomas.petazzoni at bootlin.com Sat Feb 18 11:15:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 12:15:05 +0100 Subject: [Buildroot] [git commit branch/next] package/python-webargs: fix formatting in hash file Message-ID: <20230220205302.0748E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6085c00d0feece6f3ba635e7847ea653bc5fac3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: package/python-webargs/python-webargs.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Thomas Petazzoni --- package/python-webargs/python-webargs.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-webargs/python-webargs.hash b/package/python-webargs/python-webargs.hash index 619b584807..10bb3651f0 100644 --- a/package/python-webargs/python-webargs.hash +++ b/package/python-webargs/python-webargs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/webargs/json -md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz +md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz sha256 99d68940c452e07726485a15fef43f12f8ae6c0c5b391bcba76065d4527fb85d webargs-8.2.0.tar.gz # Locally computed sha256 checksums sha256 5973e5dcc20b65e4eb4b4acdf273bb78a18522914ab626f496f1b070f7e6294d LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:01:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:21 -0000 Subject: [Buildroot] [git commit branch/next] package/frr: bump to version 8.4.2 Message-ID: <20230220205236.840FB81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ccaf9f316544f0c8c3546b70568ed48c265e801b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changes since 8.3.1: - https://frrouting.org/release/8.4 - https://frrouting.org/release/8.4.1 Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/frr/frr.hash | 2 +- package/frr/frr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/frr/frr.hash b/package/frr/frr.hash index 87ade19c16..836f130b93 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9b0430d01f8da2d780ac5e41de2cf4e53abff0ed06a0cc75d745f4b1f29e5b9e frr-8.3.1.tar.gz +sha256 8a6b0e0fa1e89493ba84cf176674e55c7a814821fd02a7188095b76c37c3935f frr-8.4.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 72c46ba4aa..abae784c40 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 8.3.1 +FRR_VERSION = 8.4.2 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 19 16:52:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:52:09 +0100 Subject: [Buildroot] [git commit branch/next] package/python3: bump version to 3.11.2 Message-ID: <20230220205302.1343A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be235c048f004617851d7ef752ee5f4dc2373e28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://docs.python.org/release/3.11.2/whatsnew/changelog.html#python-3-11-2 Updated license hash due to copyright year bump: https://github.com/python/cpython/commit/07d1f99e8faefcf24dab2113fb0df27202fa6f71 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/python3/python3.hash | 4 ++-- package/python3/python3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 7f079865d9..f235347efb 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f Python-3.11.1.tar.xz -sha256 d4a223f033419313218c9b8444167e91e87a5bebdb43fb8490df441df5220a8b LICENSE +sha256 29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af Python-3.11.2.tar.xz +sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index fb6dbf2e64..56fe95cd07 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From peter at korsgaard.com Mon Feb 20 21:01:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:01:22 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.11.1 Message-ID: <20230220205236.A304981979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a796cfb2e0343730a1232d0f5aff405a9788a15d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard (cherry picked from commit d48a8beb39275a479185ab9b3232cd15dcfb87ab) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 6de79c7d35..e23cd4eaf8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,53 @@ +2022.11.1, released January 18th, 2023 + + Important / security related fixes. + + Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + Go: Ensure our go build and module cache is used, even for the + download step. + + Legal-info: Stop warning about not saving sources for local / + override packages if _REDISTRIBUTE is set to NO. + + Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + Defconfigs: zcu106, kria kv260: Fix U-Boot build + + Updated/fixed packages: asterisk, bearssl, botan, cairo, + capnproto, check, checkpolicy, connman, containerd, crun, + dbus-cxx, docker-cli, docker-engine, exempi, exfat, + exfat-utils, falcosecurity-libs, fluidsynth, fmc, fmlib, + freeradius-server, gcc, glib-networking, go, + gobject-introspection, gperf, i2pd, ima-evm-utils, + imx-alsa-plugins, imx-kobs, imx-lib, imx-m4fwloader, + imx-mkimage, intel-microcode, janus-gateway, libcurl, + libdeflate, libftdi1, libkcapi, libksba, libmbim, libmng, + libpjsip, libtalloc, libuwsc, libxkbcommon, lpeg, lrzsz, + lttng-tools, lua-cqueues, mali-driver, mbedtls, mfgtools, + moby-buildkit, mutt, opensc, php, policycoreutils, polkit, + postgresql, pptp-linux, qcom-db410c-firmware, qemu, qoriq-rcw, + qt5virtualkeyboard, redis, rhash, rtl8189es, rtl8192eu, + rtl_433, ruby, sqlite, swupdate, tealdeer, tekui, tiff, + tinyxml, tor, webkitgtk, wireshark, wpasupplicant, wpewebkit, + xr819-xradio, xdriver_xf86-video-imx-viv, xserver_xorg-server, + xxhash, zip + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + 2022.11, released December 5th, 2022 Fixes all over the tree. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 02fe6bca67..9eee9955ec 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2022.11' +RELEASE='2022.11.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Sun Feb 19 16:52:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:52:32 +0100 Subject: [Buildroot] [git commit branch/next] package/php: security bump version to 8.2.3 Message-ID: <20230220205302.1E3E186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66b1926764582a628b0b6b68a3aebe4b9790ab12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://www.php.net/ChangeLog-8.php#8.2.3 Fixes CVE-2023-0567, CVE-2023-0568 & CVE-2023-0662. Signed-off-by: Bernd Kuhls 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 869cb9b94f..41aa326156 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz +sha256 b9b566686e351125d67568a33291650eb8dfa26614d205d70d82e6e92613d457 php-8.2.3.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 9ce153f4fa..bd7d5a8c3c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.2 +PHP_VERSION = 8.2.3 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 21:01:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:23 -0000 Subject: [Buildroot] [git commit branch/next] package/xxhash: set XXH_NO_INLINE_HINTS Message-ID: <20230220205236.DDF958648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94b66fb49cd57d0863245fbe0a3dc0833e76aad0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Set XXH_NO_INLINE_HINTS to marks all internal functions as static, giving the compiler full control on whether to inline or not. This will fix the following build failure raised since bump to version 0.8.1 in commit 5dbdb2535c649ee617595b8c4ae3cbba0ee37b97: In file included from xxhash.c:43: In function 'XXH3_accumulate', inlined from 'XXH3_hashLong_internal_loop' at xxhash.h:4390:9, inlined from 'XXH3_hashLong_64b_internal' at xxhash.h:4453:5, inlined from 'XXH3_hashLong_64b_withSecret' at xxhash.h:4473:12, inlined from 'XXH3_64bits_internal' at xxhash.h:4554:12, inlined from 'XXH3_64bits_withSecret' at xxhash.h:4570:12: xxhash.h:4196:1: error: inlining failed in call to 'always_inline' 'XXH3_accumulate_512_scalar': function not considered for inlining 4196 | XXH3_accumulate_512_scalar(void* XXH_RESTRICT acc, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/f2c52238df97cc4c13117d8dc1423235231a094c Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/xxhash/xxhash.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 04bc98690f..40e3c2696c 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -28,6 +28,7 @@ endif define XXHASH_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + CFLAGS="$(TARGET_CFLAGS) -DXXH_NO_INLINE_HINTS" \ $(XXHASH_TARGETS) endef From peter at korsgaard.com Sun Feb 19 16:55:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:55:03 +0100 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: fix build with libexecinfo Message-ID: <20230220205302.5C1827FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=364511933811d76d4b866fe3aa04adff449cf94b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with libexecinfo raised since commit d649bcd3805a26cedb30120ebbdcf12f8fbf449f: /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/10.4.0/../../../../mips-buildroot-linux-musl/bin/ld: ../lib/monkey/library/libmonkey.a(mk_utils.c.o): in function `mk_utils_stacktrace': mk_utils.c:(.text+0x1578): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index d618fdf1e2..8ba16399bb 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -56,6 +56,11 @@ FLUENT_BIT_CXXFLAGS += -fcommon FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +FLUENT_BIT_DEPENDENCIES += libexecinfo +FLUENT_BIT_LDFLAGS += -lexecinfo +endif + ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) FLUENT_BIT_DEPENDENCIES += musl-fts FLUENT_BIT_LDFLAGS += -lfts From peter at korsgaard.com Mon Feb 20 21:01:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:01:24 -0000 Subject: [Buildroot] [git commit branch/next] docs/website: update for 2022.11.1 Message-ID: <20230220205236.AF3D88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=281e51f00b838dc26be5babf4acf9730f8ad87be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 7fc5d1169b..0b62522043 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@
            -

            Latest stable release: 2022.11

            +

            Latest stable release: 2022.11.1

            - +
            - +
            -

            buildroot-2022.11.tar.gz

            -

            PGP signature

            +

            buildroot-2022.11.1.tar.gz

            +

            PGP signature

            - +
            - +
            -

            buildroot-2022.11.tar.xz

            -

            PGP signature

            +

            buildroot-2022.11.1.tar.xz

            +

            PGP signature

            +
            Source code
            diff --git a/docs/website/news.html b/docs/website/news.html index 687efeb377..8acf454052 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

            News

              +
            • +
              +
              +
              +

              2023.02-rc1 released

              +

              20 February 2023

              +
              +
              +

              We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

              + +

              Go to the downloads page to pick up the + 2023.02-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

              +
              +
              +
              • +
            • From peter at korsgaard.com Sun Feb 19 17:11:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:11:02 +0100 Subject: [Buildroot] [git commit branch/next] package/lighttpd: bump to version 1.4.69 Message-ID: <20230220205302.8C5677FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c9622ae5084473b9eeb15b04673d081f5c9fa11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: - https://www.lighttpd.net/2023/1/3/1.4.68/ - https://www.lighttpd.net/2023/2/10/1.4.69/ In this commit: - rebased patch & dropped server.use-ipv6 option [1] - fix changed meson options [2] [1]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/376d20f1617f2c0202fb415e4cc66d3f780db5ca [2]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/6b31f76cd9b36b6033607181238fbf41c5b81e07 Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...default-lighttpd-configuration-file-to-ha.patch | 33 +++++------ package/lighttpd/lighttpd.hash | 4 +- package/lighttpd/lighttpd.mk | 64 +++++++++++----------- 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch index 1a887655b8..2eab2a84e5 100644 --- a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +++ b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch @@ -1,11 +1,11 @@ -From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001 +From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Dec 2021 22:07:17 +0100 Subject: [PATCH] Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames - * Disable IPv6 + * Disable IPv6 (Dropped since 1.4.68) * Do not setuid to a user that doesn't exist on the system * Change the network backend to writev since linux-sendfile fails on buildroot @@ -13,13 +13,15 @@ Signed-off-by: Maxime Ripard Signed-off-by: Simon Dawson [Gustavo: update for 1.4.37] Signed-off-by: Gustavo Zacarias +[Thomas: update for 1.4.69 - drop server.use-ipv6] +Signed-off-by: Thomas Devoogdt --- doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) + doc/config/lighttpd.conf | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf -index e685d43..92cff4f 100644 +index e685d437..92cff4f0 100644 --- a/doc/config/conf.d/access_log.conf +++ b/doc/config/conf.d/access_log.conf @@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) @@ -32,7 +34,7 @@ index e685d43..92cff4f 100644 ## ## The default format produces CLF compatible output. diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index 495d2a1..c3e1446 100644 +index d45a284d..4e926d5a 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -13,8 +13,8 @@ @@ -46,16 +48,7 @@ index 495d2a1..c3e1446 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ server.port = 80 - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" +@@ -97,8 +97,8 @@ server.port = 80 ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -66,7 +59,7 @@ index 495d2a1..c3e1446 100644 ## ## Enable lighttpd to serve requests on sockets received from systemd -@@ -118,7 +118,7 @@ server.groupname = "lighttpd" +@@ -114,7 +114,7 @@ server.groupname = "lighttpd" ## ## Document root ## @@ -75,7 +68,7 @@ index 495d2a1..c3e1446 100644 ## ## The value for the "Server:" response field. -@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid" +@@ -140,7 +140,7 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## @@ -84,7 +77,7 @@ index 495d2a1..c3e1446 100644 ## ## If you want to log to syslog you have to unset the -@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf" +@@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf" ## and write(). Every modern OS provides its own syscall to help network ## servers transfer files as fast as possible ## @@ -94,5 +87,5 @@ index 495d2a1..c3e1446 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.34.1 +2.39.0 diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 8353857ad9..29bf5124b6 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.67.sha512sum -sha512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627 lighttpd-1.4.67.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum +sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index d3440040fb..ca2035b6b3 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).67 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -13,49 +13,49 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=false \ - -Dwith_fam=false \ + -Dwith_dbi=disabled \ + -Dwith_fam=disabled \ -Dwith_gnutls=false \ - -Dwith_libev=false \ - -Dwith_libunwind=false \ + -Dwith_libev=disabled \ + -Dwith_libunwind=disabled \ -Dwith_mbedtls=false \ -Dwith_nettle=false \ -Dwith_nss=false \ - -Dwith_pcre=false \ - -Dwith_sasl=false \ + -Dwith_pcre=disabled \ + -Dwith_sasl=disabled \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=true \ + -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli -LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +LIGHTTPD_CONF_OPTS += -Dwith_brotli=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +LIGHTTPD_CONF_OPTS += -Dwith_bzip=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 -LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +LIGHTTPD_CONF_OPTS += -Dwith_krb5=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) LIGHTTPD_DEPENDENCIES += openldap -LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +LIGHTTPD_CONF_OPTS += -Dwith_ldap=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) @@ -67,16 +67,16 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) LIGHTTPD_DEPENDENCIES += libmaxminddb -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mysql -LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) @@ -88,9 +88,9 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += -Dwith_pam=true +LIGHTTPD_CONF_OPTS += -Dwith_pam=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pam=false +LIGHTTPD_CONF_OPTS += -Dwith_pam=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) @@ -102,36 +102,36 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) LIGHTTPD_DEPENDENCIES += postgresql -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=enabled ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=enabled LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=disabled endif else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true +LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) LIGHTTPD_DEPENDENCIES += zstd -LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +LIGHTTPD_CONF_OPTS += -Dwith_zstd=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +LIGHTTPD_CONF_OPTS += -Dwith_zstd=disabled endif define LIGHTTPD_INSTALL_CONFIG From thomas.petazzoni at bootlin.com Sun Feb 19 22:04:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 23:04:04 +0100 Subject: [Buildroot] [git commit branch/next] package/ipmiutil: fix uclibc build without wchar Message-ID: <20230220205302.F1AE38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b4937a1709a88f90abbeac48e2e2db33b83d44b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For an unknown reason, wchar_t is incorrectly detected with uclibc resulting in the following build failure: In file included from igetevent.c:136: imb_api.h:150:5: error: unknown type name 'wchar_t' 150 | wchar_t *Buffer; | ^~~~~~~ The build failure can be reproduced even when reverting bump to version 3.1.8. Fixes: - http://autobuild.buildroot.org/results/e9ff3bd08e106dc834968bf5e4296ce8299027f8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipmiutil/ipmiutil.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk index ad9fbfc24c..b48eaa7cb2 100644 --- a/package/ipmiutil/ipmiutil.mk +++ b/package/ipmiutil/ipmiutil.mk @@ -10,6 +10,7 @@ IPMIUTIL_LICENSE = BSD-3-Clause IPMIUTIL_LICENSE_FILES = COPYING IPMIUTIL_MAKE = $(MAKE1) +IPMIUTIL_CONF_ENV = ac_cv_type_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) ifeq ($(BR2_PACKAGE_OPENSSL),y) # tests against distro libcrypto so it might get a false positive when From peter at korsgaard.com Mon Feb 20 17:05:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:05:06 +0100 Subject: [Buildroot] [git commit branch/next] package/less: fix CVE-2022-46663 Message-ID: <20230220205303.17500828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=924ca9414fa962ce767c39b277489a0bdcbfad79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In GNU Less before 609, crafted data can result in "less -R" not filtering ANSI escape sequences sent to the terminal. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...rlink-on-invalid-embedded-escape-sequence.patch | 27 ++++++++++++++++++++++ package/less/less.mk | 3 +++ 2 files changed, 30 insertions(+) diff --git a/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch new file mode 100644 index 0000000000..233f949e24 --- /dev/null +++ b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch @@ -0,0 +1,27 @@ +From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 +From: Mark Nudelman +Date: Fri, 7 Oct 2022 19:25:46 -0700 +Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. + +[Retrieved from: +https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c] +Signed-off-by: Fabrice Fontaine +--- + line.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/line.c b/line.c +index 236c49ae..cba7bdd1 100644 +--- a/line.c ++++ b/line.c +@@ -633,8 +633,8 @@ ansi_step(pansi, ch) + /* Hyperlink ends with \7 or ESC-backslash. */ + if (ch == '\7') + return ANSI_END; +- if (pansi->prev_esc && ch == '\\') +- return ANSI_END; ++ if (pansi->prev_esc) ++ return (ch == '\\') ? ANSI_END : ANSI_ERR; + pansi->prev_esc = (ch == ESC); + return ANSI_MID; + } diff --git a/package/less/less.mk b/package/less/less.mk index 7d7a6d5fe5..f01f94d6c8 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -11,6 +11,9 @@ LESS_LICENSE_FILES = COPYING LESS_CPE_ID_VENDOR = gnu LESS_DEPENDENCIES = ncurses +# 0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch +LESS_IGNORE_CVES += CVE-2022-46663 + define LESS_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less endef From thomas.petazzoni at bootlin.com Sat Feb 18 11:14:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 18 Feb 2023 12:14:21 +0100 Subject: [Buildroot] [git commit branch/next] package/python-flask-smorest: fix formatting in hash file Message-ID: <20230220205301.EDFE7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41cca5274a8afce269f9b2bdc9e113e073e28abb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: package/python-flask-smorest/python-flask-smorest.hash:5: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Thomas Petazzoni --- package/python-flask-smorest/python-flask-smorest.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-flask-smorest/python-flask-smorest.hash b/package/python-flask-smorest/python-flask-smorest.hash index 5abe0c5033..941535c503 100644 --- a/package/python-flask-smorest/python-flask-smorest.hash +++ b/package/python-flask-smorest/python-flask-smorest.hash @@ -2,4 +2,4 @@ md5 1dad52f26c59ca2dcaf0c5d109879605 flask-smorest-0.40.0.tar.gz sha256 9b46b4937ccf78702d99fed8cfd1cd5c37608ddefd65ff16a86d1ad5c7f7d8c0 flask-smorest-0.40.0.tar.gz # Locally computed sha256 checksums -sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE +sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE From peter at korsgaard.com Mon Feb 20 17:22:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:22:29 +0100 Subject: [Buildroot] [git commit branch/next] package/webkitgtk: security bump to version 2.38.5 Message-ID: <20230220205303.7EA908648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c7fcbbe75de5c535e8d5dd7182900b6d09e2b03 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bugfix release, with many security fixes, including (but not limited to) a patch for CVE-2023-23529. Release notes: https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0002.html Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, we do check on >= GCC 8, because we can't check on >= GCC 8.3. https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b Signed-off-by: Thomas Devoogdt Acked-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 4 ++-- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index dc5d738dae..976341093e 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 34fd19d3de..c771297b5a 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums -md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz -sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz -sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums +md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz +sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz +sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index a6974db926..3263f7fea0 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.4 +WEBKITGTK_VERSION = 2.38.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From peter at korsgaard.com Sun Feb 19 16:53:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 17:53:44 +0100 Subject: [Buildroot] [git commit branch/next] package/x11r7/xdriver_xf86-video-trident: bump version to 1.4.0 Message-ID: <20230220205302.359A181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05de8e14ce9bf9ea109aa028b34aba559aa18aad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003326.html Removed patch which was applied upstream. Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-Remove-ramdac.patch | 56 ---------------------- .../xdriver_xf86-video-trident.hash | 5 +- .../xdriver_xf86-video-trident.mk | 6 +-- 3 files changed, 6 insertions(+), 61 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch b/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch deleted file mode 100644 index 38ca9afebf..0000000000 --- a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 07a5c4732f1c28ffcb873ee04500e3cb813c50b4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Dec 2021 22:28:04 +0100 -Subject: [PATCH] Remove ramdac - -ramdac drivers have been removed from xserver since version 21.0.99.1 -and -https://gitlab.freedesktop.org/xorg/xserver/-/commit/f0385fb420158ac3bc1c4c325431ffc5c62344bb -resulting in the following build failure: - -In file included from trident_bank.c:37: -trident.h:41:10: fatal error: xf86RamDac.h: No such file or directory - 41 | #include "xf86RamDac.h" - | ^~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/c81ac8075af257e8626d9d097270be7a7b4a1496 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/merge_requests/1] ---- - src/trident.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/trident.h b/src/trident.h -index 5cadf52..c82de4c 100644 ---- a/src/trident.h -+++ b/src/trident.h -@@ -38,7 +38,6 @@ - #include "xaa.h" - #endif - #include "xf86fbman.h" --#include "xf86RamDac.h" - #include "compiler.h" - #include "vgaHW.h" - #include "xf86i2c.h" -@@ -103,7 +102,6 @@ typedef struct { - int useEXA; - int Chipset; - int DACtype; -- int RamDac; - int ChipRev; - int HwBpp; - int BppShift; -@@ -169,7 +167,6 @@ typedef struct { - CARD32 BltScanDirection; - CARD32 DrawFlag; - CARD16 LinePattern; -- RamDacRecPtr RamDacRec; - int CursorOffset; - xf86CursorInfoPtr CursorInfoRec; - xf86Int10InfoPtr Int10; --- -2.33.0 - diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash index 321f35d4f0..2ef664487c 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002762.html -sha256 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f xf86-video-trident-1.3.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003326.html +sha256 7f76219ca7d7dc6061aa3c2aa59bc2a63895b8e6217e413ce315949f57b0189b xf86-video-trident-1.4.0.tar.xz +sha512 86f349ccfcf7c704e77a95882f63ac92f55819a3a00388f294777762fed04dde2197dd6124cded9e787af1982fecc43ad4d0af34307845e616a73d5a2ba750b9 xf86-video-trident-1.4.0.tar.xz # Locally calculated sha256 4f065198c49eac1513b915bc4478152c21119f31a97919a6ea8f3e1d10133d15 COPYING diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk index 20ec4bbc24..53fe150420 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.8 -XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.4.0 +XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.xz +XDRIVER_XF86_VIDEO_TRIDENT_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT XDRIVER_XF86_VIDEO_TRIDENT_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xorgproto From thomas.petazzoni at bootlin.com Fri Feb 17 14:57:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 17 Feb 2023 15:57:08 +0100 Subject: [Buildroot] [git commit branch/next] package/catch2: new package Message-ID: <20230220205301.BCE9E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5b597d5d839486e82a80f1c59c2a91a5af87c06 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Catch2 is a modern C++ unit testing framework which is increasing in popularity. This package is staging only and allows to build tests to be run on the target. - https://github.com/catchorg/Catch2 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/catch2/Config.in | 28 ++++++++++++++++++++++++++++ package/catch2/catch2.hash | 3 +++ package/catch2/catch2.mk | 22 ++++++++++++++++++++++ 5 files changed, 55 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3d9c51a094..7894b10e38 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2035,6 +2035,7 @@ F: package/sdl2/ N: Michael Nosthoff F: package/boost/ +F: package/catch2/ F: package/fmt/ F: package/grpc/ F: package/gtest/ diff --git a/package/Config.in b/package/Config.in index 523cf7cbdf..6c5238a9b0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2012,6 +2012,7 @@ menu "Other" source "package/boost/Config.in" source "package/c-capnproto/Config.in" source "package/capnproto/Config.in" + source "package/catch2/Config.in" source "package/cctz/Config.in" source "package/cereal/Config.in" source "package/clang/Config.in" diff --git a/package/catch2/Config.in b/package/catch2/Config.in new file mode 100644 index 0000000000..2f53d197b2 --- /dev/null +++ b/package/catch2/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_CATCH2 + bool "catch2" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_USE_MMU # fork() + help + Catch2 is mainly a unit testing framework for C++, but it + also provides basic micro-benchmarking features, and simple + BDD macros. + + Catch2's main advantage is that using it is both simple and + natural. Tests autoregister themselves and do not have to + be named with valid identifiers, assertions look like + normal C++ code, and sections provide a nice way to share + set-up and tear-down code in tests. + + This package allows running testsuites on the target which + might be advantageous in certain cases. + + https://github.com/catchorg/Catch2 + +comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash new file mode 100644 index 0000000000..664164fd76 --- /dev/null +++ b/package/catch2/catch2.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 2106bccfec18c8ce673623d56780220e38527dd8f283ccba26aa4b8758737d0e catch2-3.1.1.tar.gz +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk new file mode 100644 index 0000000000..ab62cc943b --- /dev/null +++ b/package/catch2/catch2.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# catch2 +# +################################################################################ + +CATCH2_VERSION = 3.1.1 +CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) +CATCH2_INSTALL_STAGING = YES +CATCH2_INSTALL_TARGET = NO +CATCH2_LICENSE = BSL-1.0 +CATCH2_LICENSE_FILES = LICENSE.txt +CATCH2_SUPPORTS_IN_SOURCE_BUILD = NO + +# We force building a static library only as building a dynamic +# library is not really supported officially: +# https://github.com/catchorg/Catch2/blob/devel/docs/faq.md#can-i-compile-catch2-into-a-dynamic-library +CATCH2_CONF_OPTS = \ + -DCATCH_INSTALL_DOCS=OFF \ + -DBUILD_SHARED_LIBS=OFF + +$(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 20 17:12:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:12:11 +0100 Subject: [Buildroot] [git commit branch/next] package/glslsandbox-player: add wayland-protocols optional dependency Message-ID: <20230220205303.59467828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee13e3fb41dc7c0c001127733b5a599c1e509747 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next wayland-protocols is an optional dependency which is enabled by default resulting in the following wayland build failure since the addition of the package in commit f201ca9d0d25b491ec5e1ed4e1d02fd52d027997: checking for wayland_client... yes checking for wayland_egl... yes configure: Wayland EGL support enabled checking for wayland_protocols... no configure: error: Package requirements (wayland-protocols >= 1.12) were not met: Package 'wayland-protocols', required by 'virtual:world', not found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables wayland_protocols_CFLAGS and wayland_protocols_LIBS to avoid the need to call pkg-config. Fixes: - http://autobuild.buildroot.org/results/865af860f9e52fe5311bb0c6a246ff871ae5a989 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/glslsandbox-player/Config.in | 5 ++++- package/glslsandbox-player/glslsandbox-player.mk | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 132705584e..530c158fc3 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -111,8 +111,11 @@ endchoice if BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI bool "Wayland IVI shell support" -endif +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG + bool "Wayland XDG shell support" + select BR2_PACKAGE_WAYLAND_PROTOCOLS +endif endif comment "glslsandbox-player needs openGL ES and EGL driver" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index f0a9475aa6..241f3475d2 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -72,6 +72,12 @@ GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-ivi else GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-ivi endif +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += wayland-protocols +GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-wlxdg +else +GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-wlxdg +endif else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += xlib_libX11 GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=x11 From peter at korsgaard.com Mon Feb 20 20:57:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:23 -0000 Subject: [Buildroot] [git commit branch/next] package/rtl_433: bump to version 22.11 Message-ID: <20230220205215.2892581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f848c068f8ab0cc67fb48582e00221158ddc8cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop all patches (already in version) - Threads is not mandatory since https://github.com/merbanan/rtl_433/commit/4f5231bef29f42acc0ce5700584e8c4df5dc0aa2 https://github.com/merbanan/rtl_433/releases/tag/22.11 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...001-minor-Fix-a-compiler-flag-needs-GCC-7.patch | 27 ---------- ...parse.c-fix-build-without-__has_attribute.patch | 34 ------------- ...overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch | 58 ---------------------- .../0004-Fix-overflow-in-Acurite-00275rm.patch | 35 ------------- package/rtl_433/Config.in | 5 -- package/rtl_433/rtl_433.hash | 2 +- package/rtl_433/rtl_433.mk | 14 +++--- 7 files changed, 8 insertions(+), 167 deletions(-) diff --git a/package/rtl_433/0001-minor-Fix-a-compiler-flag-needs-GCC-7.patch b/package/rtl_433/0001-minor-Fix-a-compiler-flag-needs-GCC-7.patch deleted file mode 100644 index dd3debf7ee..0000000000 --- a/package/rtl_433/0001-minor-Fix-a-compiler-flag-needs-GCC-7.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2010e8f949ab7b4555b99dbf184e149a3f33df46 Mon Sep 17 00:00:00 2001 -From: "Christian W. Zuckschwerdt" -Date: Fri, 24 Dec 2021 11:03:06 +0100 -Subject: [PATCH] minor: Fix a compiler flag needs GCC 7 - -[Retrieved from: -https://github.com/merbanan/rtl_433/commit/2010e8f949ab7b4555b99dbf184e149a3f33df46] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3f11ac99..bfa6595ca 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,7 +74,9 @@ if(("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" MATCHES - ADD_DEFINITIONS(-pedantic) - ADD_DEFINITIONS(-Wshadow) - ADD_DEFINITIONS(-Wmissing-prototypes) -- ADD_DEFINITIONS(-Wimplicit-fallthrough) -+ if("${CMAKE_C_COMPILER_ID}" MATCHES "Clang" OR NOT "7.0.0" VERSION_GREATER CMAKE_C_COMPILER_VERSION) -+ ADD_DEFINITIONS(-Wimplicit-fallthrough) -+ endif() - #ADD_DEFINITIONS(-Wfloat-equal) - #ADD_DEFINITIONS(-Wbad-function-cast) - #ADD_DEFINITIONS(-Wdocumentation) diff --git a/package/rtl_433/0002-src-optparse.c-fix-build-without-__has_attribute.patch b/package/rtl_433/0002-src-optparse.c-fix-build-without-__has_attribute.patch deleted file mode 100644 index 683754845f..0000000000 --- a/package/rtl_433/0002-src-optparse.c-fix-build-without-__has_attribute.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b74826f155406f86846d5c97b3534aab87cf6da Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 26 Dec 2021 15:21:39 +0100 -Subject: [PATCH] src/optparse.c: fix build without __has_attribute - -Fix build failure without __has_attribute (e.g. gcc 4.8) which is raised -since -https://github.com/merbanan/rtl_433/commit/6c8af75c757712bd58b169317795484a72e9a16c - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/merbanan/rtl_433/pull/1918] ---- - src/optparse.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/optparse.c b/src/optparse.c -index aa3d0b53..b5e2d37e 100644 ---- a/src/optparse.c -+++ b/src/optparse.c -@@ -232,9 +232,11 @@ int atoi_time(char const *str, char const *error_hint) - } - // intentional fallthrough - #if defined(__GNUC__) || defined(__clang__) -+#if defined __has_attribute - #if __has_attribute(fallthrough) - __attribute__((fallthrough)); - #endif -+#endif - #endif - case ':': - ++colons; --- -2.33.0 - 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 deleted file mode 100644 index e2088b29e7..0000000000 --- a/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch +++ /dev/null @@ -1,58 +0,0 @@ -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/0004-Fix-overflow-in-Acurite-00275rm.patch b/package/rtl_433/0004-Fix-overflow-in-Acurite-00275rm.patch deleted file mode 100644 index 057bf9cf64..0000000000 --- a/package/rtl_433/0004-Fix-overflow-in-Acurite-00275rm.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 37455483889bd1c641bdaafc493d1cc236b74904 Mon Sep 17 00:00:00 2001 -From: "Christian W. Zuckschwerdt" -Date: Fri, 18 Mar 2022 08:09:15 +0100 -Subject: [PATCH] Fix overflow in Acurite-00275rm (closes #2012) - -[Retrieved from: -https://github.com/merbanan/rtl_433/commit/37455483889bd1c641bdaafc493d1cc236b74904] -Signed-off-by: Fabrice Fontaine ---- - src/devices/acurite.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/devices/acurite.c b/src/devices/acurite.c -index 6879e52da..4f3e83eb3 100644 ---- a/src/devices/acurite.c -+++ b/src/devices/acurite.c -@@ -1318,15 +1318,15 @@ static int acurite_00275rm_decode(r_device *decoder, bitbuffer_t *bitbuffer) - - // Combine signal if exactly three repeats were found - if (n_rows == 3) { -- uint8_t *b = bitbuffer->bb[bitbuffer->num_rows]; -+ bitbuffer_add_row(bitbuffer); -+ uint8_t *b = bitbuffer->bb[bitbuffer->num_rows - 1]; - for (int i = 0; i < 11; ++i) { - // The majority bit count wins - b[i] = (b_rows[0][i] & b_rows[1][i]) | - (b_rows[1][i] & b_rows[2][i]) | - (b_rows[2][i] & b_rows[0][i]); - } -- bitbuffer->bits_per_row[bitbuffer->num_rows] = 88; -- bitbuffer->num_rows += 1; -+ bitbuffer->bits_per_row[bitbuffer->num_rows - 1] = 88; - } - - // Output the first valid row diff --git a/package/rtl_433/Config.in b/package/rtl_433/Config.in index a6db00f477..01c1e2f5cd 100644 --- a/package/rtl_433/Config.in +++ b/package/rtl_433/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_RTL_433 bool "rtl_433" depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK if BR2_PACKAGE_LIBOPENSSL help rtl_433 (despite the name) is a generic data receiver, mainly @@ -9,7 +8,3 @@ config BR2_PACKAGE_RTL_433 MHz ISM bands. https://github.com/merbanan/rtl_433 - -comment "rtl_433 needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/rtl_433/rtl_433.hash b/package/rtl_433/rtl_433.hash index fd479dfd21..51fb29c78e 100644 --- a/package/rtl_433/rtl_433.hash +++ b/package/rtl_433/rtl_433.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b362ef3410adec64aee7ad8e6d4d74875f1b3d59ef6fb4856e96adc03876dc65 rtl_433-21.12.tar.gz +sha256 61a9163d69cc4b1da46aebbcaf969bd180a055a6b90f42ad281218cc4fbefb86 rtl_433-22.11.tar.gz # License file, locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk index 74a0b54a3d..e3be0e5ecf 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL_433_VERSION = 21.12 +RTL_433_VERSION = 22.11 RTL_433_SITE = $(call github,merbanan,rtl_433,$(RTL_433_VERSION)) RTL_433_LICENSE = GPL-2.0+ RTL_433_LICENSE_FILES = COPYING @@ -18,12 +18,6 @@ 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 - -# 0004-Fix-overflow-in-Acurite-00275rm.patch -RTL_433_IGNORE_CVES += CVE-2022-27419 - ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) RTL_433_DEPENDENCIES += librtlsdr RTL_433_CONF_OPTS += -DENABLE_RTLSDR=ON @@ -38,4 +32,10 @@ else RTL_433_CONF_OPTS += -DENABLE_OPENSSL=OFF endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +RTL_433_CONF_OPTS += -DENABLE_THREADS=ON +else +RTL_433_CONF_OPTS += -DENABLE_THREADS=OFF +endif + $(eval $(cmake-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:57:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:24 -0000 Subject: [Buildroot] [git commit branch/next] package/python-tempora: bump to version 5.2.0 Message-ID: <20230220205235.C4C6E86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c60f09bf11cd465caa51c7f099508c44d6359a01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-tempora/python-tempora.hash | 4 ++-- package/python-tempora/python-tempora.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-tempora/python-tempora.hash b/package/python-tempora/python-tempora.hash index 39249eb4fa..ac6483b77f 100644 --- a/package/python-tempora/python-tempora.hash +++ b/package/python-tempora/python-tempora.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tempora/json -md5 f9954a8c3b091f9769eb7bbe0faddccf tempora-5.1.0.tar.gz -sha256 3e7c4a5369a1788c88a99b6be3a4c74c0c7728d3b62fd768a7e81bd0be0e88df tempora-5.1.0.tar.gz +md5 87fc0d99edd557323e61a16017707a8b tempora-5.2.0.tar.gz +sha256 af82eb016decda8daf566d1e4836f94f7f8ba8c7153637460156e081aadc64df tempora-5.2.0.tar.gz # Locally computed sha256 checksums sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-tempora/python-tempora.mk b/package/python-tempora/python-tempora.mk index 68516a8388..3074ad0de2 100644 --- a/package/python-tempora/python-tempora.mk +++ b/package/python-tempora/python-tempora.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEMPORA_VERSION = 5.1.0 +PYTHON_TEMPORA_VERSION = 5.2.0 PYTHON_TEMPORA_SOURCE = tempora-$(PYTHON_TEMPORA_VERSION).tar.gz -PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/a9/4e/41863232e77742b3a5b30a81e1398abd102aa0a67657bc86a53800966b8e +PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/97/70/5cf5031a83ca6d0431a53459b2a98aa387ba23d06710a5e48d681ff3956f PYTHON_TEMPORA_LICENSE = MIT PYTHON_TEMPORA_LICENSE_FILES = LICENSE PYTHON_TEMPORA_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Mon Feb 20 20:57:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:24 -0000 Subject: [Buildroot] [git commit branch/next] package/multipath-tools: drop patch Message-ID: <20230220205215.6CB1D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54a8cb19331c8e75f6a48cb529c18619379414d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop path and set SYSTEMD="" if needed following upstream feedback: https://github.com/opensvc/multipath-tools/pull/34 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...c-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch | 35 ---------------------- package/multipath-tools/multipath-tools.mk | 3 +- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch b/package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch deleted file mode 100644 index 133094a7f7..0000000000 --- a/package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8370da992c752e4238de7a8b02ce0e179353c959 Mon Sep 17 00:00:00 2001 -From: Alexander Egorenkov -Date: Sun, 6 Sep 2020 10:37:41 +0200 -Subject: [PATCH] Makefile.inc: Enable systemd if ENABLE_SYSTEMD is defined - -systemd is disabled by default, to activate it set ENABLE_SYSTEMD. - -Signed-off-by: Alexander Egorenkov ---- - Makefile.inc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile.inc b/Makefile.inc -index d4d1e0dd..32bc1846 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -35,6 +35,7 @@ ifndef RUN - endif - endif - -+ifdef ENABLE_SYSTEMD - ifndef SYSTEMD - ifeq ($(shell pkg-config --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) - SYSTEMD = $(shell pkg-config --modversion libsystemd) -@@ -45,6 +46,7 @@ ifndef SYSTEMD - endif - endif - endif -+endif - - ifndef SYSTEMDPATH - SYSTEMDPATH=usr/lib --- -2.28.0 - diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index df3d5138e8..d6abf68ca0 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -31,7 +31,8 @@ MULTIPATH_TOOLS_MAKE_OPTS = \ ifeq ($(BR2_PACKAGE_SYSTEMD),y) MULTIPATH_TOOLS_DEPENDENCIES += systemd -MULTIPATH_TOOLS_MAKE_OPTS += ENABLE_SYSTEMD=1 +else +MULTIPATH_TOOLS_MAKE_OPTS += SYSTEMD="" endif define MULTIPATH_TOOLS_BUILD_CMDS From yann.morin.1998 at free.fr Mon Feb 20 20:57:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:25 -0000 Subject: [Buildroot] [git commit branch/next] package/python-simplejson: bump to version 3.18.1 Message-ID: <20230220205235.B8CC78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9779ba9cc603df2b75156fcc8979175d8b2ff665 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-simplejson/python-simplejson.hash | 4 ++-- package/python-simplejson/python-simplejson.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-simplejson/python-simplejson.hash b/package/python-simplejson/python-simplejson.hash index 1c99b87590..a8b946b2c4 100644 --- a/package/python-simplejson/python-simplejson.hash +++ b/package/python-simplejson/python-simplejson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplejson/json -md5 83e24e662f024e06af2fffe698227da4 simplejson-3.18.0.tar.gz -sha256 58a429d2c2fa80834115b923ff689622de8f214cf0dc4afa9f59e824b444ab31 simplejson-3.18.0.tar.gz +md5 ecd07fca7a7fa0bcc9acdf9d82e41eb1 simplejson-3.18.1.tar.gz +sha256 746086e3ef6d74b53599df31b491d88a355abf2e31c837137dd90f8c4561cafa simplejson-3.18.1.tar.gz # Locally computed sha256 checksums sha256 fcaa1e313a99304322e2e0836ea4ee7d839ce9a480438f3922a853edfdde129f LICENSE.txt diff --git a/package/python-simplejson/python-simplejson.mk b/package/python-simplejson/python-simplejson.mk index 1607d9c90c..5782626387 100644 --- a/package/python-simplejson/python-simplejson.mk +++ b/package/python-simplejson/python-simplejson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEJSON_VERSION = 3.18.0 +PYTHON_SIMPLEJSON_VERSION = 3.18.1 PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz -PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/17/3d/b8bfe1f40558f6a16f70c349adf97480dc71a7d11b2b1a5dc0824a87faa0 +PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/0f/a0/79d2bec499cb53678bc20d41f9706ca02777f0876efa9b29a69fb3d55dfd PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt PYTHON_SIMPLEJSON_CPE_ID_VENDOR = simplejson_project From yann.morin.1998 at free.fr Mon Feb 20 20:57:25 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:25 -0000 Subject: [Buildroot] [git commit branch/next] package/liboping: fix build with ncurses-6.3 Message-ID: <20230220205215.613E88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9b155e45faa9fb941c1a4fc51baea82b6496dff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://git.busybox.net/buildroot/commit/?id=a38a30eb3a46570705642dc37235ddcc1471b434 bumped ncurses to version 6.3 which breaks build of liboping. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...-always-use-s-style-format-for-printf-sty.patch | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch b/package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch new file mode 100644 index 0000000000..3b68feea3d --- /dev/null +++ b/package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch @@ -0,0 +1,59 @@ +From 670834fd8fbd2533ea25ca83065800e924116579 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 15 Nov 2021 08:05:43 +0000 +Subject: [PATCH] src/oping.c: always use "%s"-style format for + printf()-style functions + +`ncuses-6.3` added printf-style function attributes and now makes +it easier to catch cases when user input is used in palce of format +string when built with CFLAGS=-Werror=format-security: + + oping.c:1265:41: error: format not a string literal and no format arguments [-Werror=format-security] + 1265 | hist_symbols_utf8[index]); + | ^~~~~~~~~~~~~~~~~ + +Let's wrap all the missing places with "%s" format. + +Downloaded from upstream PR https://github.com/octo/liboping/pull/61 + +Signed-off-by: Bernd Kuhls +[Bernd: rebased for liboping version 1.10.0] +--- + src/oping.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/oping.c b/src/oping.c +index c087c80..af4a0cb 100644 +--- a/src/oping.c ++++ b/src/oping.c +@@ -1156,7 +1156,7 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */ + wattron (ctx->window, COLOR_PAIR(color)); + + if (has_utf8()) +- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol); ++ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", symbol); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc); + +@@ -1262,7 +1262,7 @@ static int update_graph_histogram (ping_context_t *ctx) /* {{{ */ + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' '); + else if (has_utf8 ()) + mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, +- hist_symbols_utf8[index]); ++ "%s", hist_symbols_utf8[index]); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, + hist_symbols_acs[index] | A_ALTCHARSET); +@@ -1639,8 +1639,7 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ + + HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ", + data_len, context->host, context->addr, +- sequence, recv_ttl, +- format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str))); ++ sequence, recv_ttl); + if ((recv_qos != 0) || (opt_send_qos != 0)) + { + HOST_PRINTF ("qos=%s ", +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:57:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:26 -0000 Subject: [Buildroot] [git commit branch/next] package/sscep: fix linking error Message-ID: <20230220205236.3B0D786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=04fc02a8b7a70bc0afe17fe0625cfd2b4c55b776 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Apply the patch to fix the following build failure raised since the addition of the package in commit 72fa60dc102679f51b228336ec38f5af78ff7646: uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `__GI_getopt': getopt.c:(.text+0x598): multiple definition of `getopt'; src/getopt.o:getopt.c:(.text+0x0): first defined here The patch has been submitted and accepted upstream to address this issue. Fixes: - http://autobuild.buildroot.net/results/844c7dd79f69ef2ea8f293bb73a2d4b7533aa97c Signed-off-by: Dario Binacchi [yann.morin.1998 at free.fr: do an actual bacport] Signed-off-by: Yann E. MORIN --- package/sscep/0001-Fix-getopt-linking-error.patch | 57 +++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/package/sscep/0001-Fix-getopt-linking-error.patch b/package/sscep/0001-Fix-getopt-linking-error.patch new file mode 100644 index 0000000000..9427593cc3 --- /dev/null +++ b/package/sscep/0001-Fix-getopt-linking-error.patch @@ -0,0 +1,57 @@ +From 65561b53344b834877e6b63320066a1e26038a3c Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Fri, 9 Dec 2022 18:18:27 +0100 +Subject: [PATCH] Fix getopt linking error + +The buildroot project, to which the sscep application was added, has +configurations that raise the following linking error: +buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os):(.data+0x8): multiple definition of `optind'; src/getopt.o:(.data+0x0): first defined here +buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `__GI_getopt': +getopt.c:(.text+0x5a4): multiple definition of `getopt'; src/getopt.o:getopt.c:(.text+0x0): first defined here +buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `getopt_long': +getopt.c:(.text+0x5b0): multiple definition of `getopt_long'; src/getopt.o:getopt.c:(.text+0x128): first defined here +collect2: error: ld returned 1 exit status +make[2]: *** [Makefile:507: sscep] Error 1 +make[1]: *** [package/pkg-generic.mk:293: buildroot/output/build/sscep-0.10.0/.stamp_built] Error 2 + +The patch re-added a check that commit +81f56f635259b9 ("Replaced GNU getopt by a BSD licensed alternative") +removed. + +Signed-off-by: Dario Binacchi +[yann.morin.1998 at free.fr: make that an actual backport] +Signed-off-by: Yann E. MORIN +--- + src/getopt.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/getopt.c b/src/getopt.c +index eae36a6..0109406 100644 +--- a/src/getopt.c ++++ b/src/getopt.c +@@ -31,6 +31,16 @@ + #include + #include + ++#define GETOPT_INTERFACE_VERSION 2 ++#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 ++# include ++# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION ++# define ELIDE_CODE ++# endif ++#endif ++ ++#ifndef ELIDE_CODE ++ + char* optarg; + int optopt; + /* The variable optind [...] shall be initialized to 1 by the system. */ +@@ -226,3 +236,5 @@ int getopt_long(int argc, char* const argv[], const char* optstring, + ++optind; + return retval; + } ++ ++#endif /* Not ELIDE_CODE. */ +-- +2.25.1 + From yann.morin.1998 at free.fr Mon Feb 20 20:57:26 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:26 -0000 Subject: [Buildroot] [git commit branch/next] package/lua-ev: bump to version 1.5 Message-ID: <20230220205215.A1A3D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=327b72f32bcfc01d580fa47f3e06cd42a828cd99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-ev/lua-ev.hash | 4 ++-- package/lua-ev/lua-ev.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lua-ev/lua-ev.hash b/package/lua-ev/lua-ev.hash index eb4f4cf74c..278f5f8f7f 100644 --- a/package/lua-ev/lua-ev.hash +++ b/package/lua-ev/lua-ev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4e26e05830955fdd882a1b48b535be94356582eea310327f839f830cd9250d3a lua-ev-339426fbe528f11cb3cd1af69a88f06bba367981.tar.gz -sha256 c224cc31feec52e33b621ccdbc245e21316a20a134a4cd8706438a3b3382e8ac README +sha256 26ac116722a241bf59daf5315ce0ffe751c1babea9a146ffc0a389f1af3facca lua-ev-1.5.tar.gz +sha256 3b6f8a25e3443c8be61fc7a91e1d27b5514d489bb3ea5986eace6fe1531aabcc README diff --git a/package/lua-ev/lua-ev.mk b/package/lua-ev/lua-ev.mk index 39394875b8..eec078944b 100644 --- a/package/lua-ev/lua-ev.mk +++ b/package/lua-ev/lua-ev.mk @@ -4,8 +4,8 @@ # ################################################################################ -LUA_EV_VERSION = 339426fbe528f11cb3cd1af69a88f06bba367981 -LUA_EV_SITE = $(call github,brimworks,lua-ev,$(LUA_EV_VERSION)) +LUA_EV_VERSION = 1.5 +LUA_EV_SITE = $(call github,brimworks,lua-ev,v$(LUA_EV_VERSION)) LUA_EV_DEPENDENCIES = luainterpreter libev LUA_EV_LICENSE = MIT LUA_EV_LICENSE_FILES = README From yann.morin.1998 at free.fr Mon Feb 20 20:57:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:27 -0000 Subject: [Buildroot] [git commit branch/next] package/go: explicitly set GOMODCACHE Message-ID: <20230220205236.6888E81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=162f656884185662d85e5366871284adca87a465 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next go mod vendor caches downloaded modules to the Go module cache, which defaults to $GOPATH/pkg/mod - But can be overridden with the GOMODCACHE environment variable: https://go.dev/ref/mod#module-cache So explicitly set GOMODCACHE= for reproducibility. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/go/go.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/go/go.mk b/package/go/go.mk index c4f72d403c..c38ae0b99c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -26,6 +26,7 @@ HOST_GO_COMMON_ENV = \ GOROOT="$(HOST_GO_ROOT)" \ GOPATH="$(HOST_GO_GOPATH)" \ GOCACHE="$(HOST_GO_TARGET_CACHE)" \ + GOMODCACHE="$(HOST_GO_GOPATH)/pkg/mod" \ GOPROXY=off \ PATH=$(BR_PATH) \ GOBIN= \ From yann.morin.1998 at free.fr Mon Feb 20 20:57:27 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:27 -0000 Subject: [Buildroot] [git commit branch/next] ncurses: bump to 6.3 Message-ID: <20230220205215.3F3628648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a38a30eb3a46570705642dc37235ddcc1471b434 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next remove 0001-gcc-5.x-MKlib_gen.patch as it has already been applied upstream. Signed-off-by: Dennis Van Hoorick Signed-off-by: Yann E. MORIN --- package/ncurses/0001-gcc-5.x-MKlib_gen.patch | 44 ----------- package/ncurses/ncurses.hash | 98 ++++++++++++++++--------- package/ncurses/ncurses.mk | 106 +++++++++++++++------------ 3 files changed, 123 insertions(+), 125 deletions(-) diff --git a/package/ncurses/0001-gcc-5.x-MKlib_gen.patch b/package/ncurses/0001-gcc-5.x-MKlib_gen.patch deleted file mode 100644 index 0106e8077f..0000000000 --- a/package/ncurses/0001-gcc-5.x-MKlib_gen.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix gcc 5.x build failure - -Extracted from upstream commit -http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39bbff30ba2825df9517. - -+ modify MKlib_gen.sh to work around change in development version of - gcc introduced here: - https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html - https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html - (reports by Marcus Shawcroft, Maohui Lei). - -Original author: Thomas E. Dickey -Signed-off-by: Mikhail Peselnik -[Adam Duskett: Refresh for 6.1] -Signed-off-by: Adam Duskett ---- a/ncurses/base/MKlib_gen.sh 2015-08-06 20:48:24.000000000 -0400 -+++ b/ncurses/base/MKlib_gen.sh 2017-02-07 10:09:01.293962392 -0500 -@@ -505,11 +505,22 @@ - -e 's/gen_$//' \ - -e 's/ / /g' >>$TMP - -+cat >$ED1 < $ED2 -+cat $ED2 >$TMP -+ - $preprocessor $TMP 2>/dev/null \ --| sed \ -- -e 's/ / /g' \ -- -e 's/^ //' \ -- -e 's/_Bool/NCURSES_BOOL/g' \ -+| sed -f $ED1 \ - | $AWK -f $AW2 \ - | sed -f $ED3 \ - | sed \ diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index 69115f5caf..1029c1ddcb 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -1,39 +1,65 @@ # Locally calculated after checking pgp signature -sha256 aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 ncurses-6.1.tar.gz -sha256 cf9038be62c49a6b5fe93f33b32f983649b2f4c4c31cc99bd18e1e5871c31443 ncurses-6.1-20190609-patch.sh.bz2 -sha256 4b0a4c6abce4543ac4fd4c3389b14825e73b7cddcbb01a687c5dd837f21a3b04 ncurses-6.1-20190615.patch.gz -sha256 b2302625ec2fa6dce79622670452e56ff6130dc02e655b52177264cfeff84c51 ncurses-6.1-20190623.patch.gz -sha256 48b004a3e5409a02a5e751f996fe487f5ce45be1fff38572f7cc8167b22179bf ncurses-6.1-20190630.patch.gz -sha256 faf849eed92161ac09782badf84a19ad6beae472e87d460905865e08a6ed46e4 ncurses-6.1-20190706.patch.gz -sha256 62d4954bf818659105aa1c21cc27cb2c133e02bdc7d3f6aa548caae2d1db7440 ncurses-6.1-20190713.patch.gz -sha256 0c1a54bd5de9c890d1fabcfa92bf5bf46f7eccc54a48051367e82bdb29636450 ncurses-6.1-20190720.patch.gz -sha256 0bbd08d3bd12686d4427c242d6a8fde2e299698039cd597303af713c5f538f17 ncurses-6.1-20190727.patch.gz -sha256 40e5f350a921dbd03e3d9ff93bc477ec4f1f65878f307c534882fba3b0b40507 ncurses-6.1-20190728.patch.gz -sha256 9648104311e209d17db9556d6efc898d5c80ed5fc80e8aa3cd08769544c839b8 ncurses-6.1-20190803.patch.gz -sha256 fa1f583575717b2538d3a4ea59a67bc17dd07ed46cb99fe2beaf23d1b006e9df ncurses-6.1-20190810.patch.gz -sha256 5e9ae4f1b3e2e2d567a01a8fb2c9b7f3804cae97f28cd483d239afee781b8c2b ncurses-6.1-20190817.patch.gz -sha256 7592e5e610b3e9eeca78897da2330b7518f00e0a59d20df873c88a9b26bc4da9 ncurses-6.1-20190824.patch.gz -sha256 1a9800a5ccc4f2cb572b63cdc8f1431642e014a58a30151af73977614d5c4aac ncurses-6.1-20190831.patch.gz -sha256 87685a6b90225efcd03375eb11b124fd9e95ee4b0f36bcbc82e56a70cd466b33 ncurses-6.1-20190907.patch.gz -sha256 4ddebb6e0e5a67028eb3aca2352c9bd48cf122a512719f93e449e00a3c6634f8 ncurses-6.1-20190914.patch.gz -sha256 4c725fa729d754f4e75af78fda4cf67d60e71c1625b5f4f49b7930c95bb8dd36 ncurses-6.1-20190921.patch.gz -sha256 a830b879b57906b1e480e4785b32cec05081b7849c06c4b116459c4d343ba21b ncurses-6.1-20190928.patch.gz -sha256 d5eae35d920409613f565825e1e215fed89828040aab541328455da38e1a9b7c ncurses-6.1-20191005.patch.gz -sha256 136dbd07254810728c1fcb7614b566e7c3cb6af8c0783019bbb6b4b5e3c1e2c6 ncurses-6.1-20191012.patch.gz -sha256 1d5125b20792e9f534432c3ef2aa68984c713416addeb2c4364c5ae897a3b8b7 ncurses-6.1-20191015.patch.gz -sha256 a6475c05312ba0b12b72b83529c1d283a14c4470414c505fa45451e35f3ffcf5 ncurses-6.1-20191019.patch.gz -sha256 f6c7469f33065faf1d04ac9e9bea1a88142b00b82e3db3674cca9ec24920b4af ncurses-6.1-20191026.patch.gz -sha256 0d0443937b9c04663de25b405bb95e658e7c87e1dd7a726b3813aa7f9b55f69a ncurses-6.1-20191102.patch.gz -sha256 f3b75787918d2f02a2005877e81fdc054c45b8249b43aabb531e3b817bcf7576 ncurses-6.1-20191109.patch.gz -sha256 801d138b55986719aea7f42dc8c0cb618fa9a6edf92d1789a6ba5d61678f7761 ncurses-6.1-20191116.patch.gz -sha256 45f447cf2c7a24295c7b9210473e943a238c57ca80581d121c9a1a3aa05332a6 ncurses-6.1-20191123.patch.gz -sha256 ea758e3b0162348c4d5d6dac56f95809da3b7d0589205661a13430eb93f72f75 ncurses-6.1-20191130.patch.gz -sha256 16b5a588c56a53c468d2359b21d5d8a007c4ef7696de12c964a1b661ed185f72 ncurses-6.1-20191207.patch.gz -sha256 8725a2dc8f1cfdab41cb5fe56f930e070f8cdc81a77f303ef2658f65cd0b8edd ncurses-6.1-20191214.patch.gz -sha256 7e2a06fb0af6c84269d23ffe06c689bf1a8a57af39369690ee0698778d4b6cda ncurses-6.1-20191221.patch.gz -sha256 d052bcdb38f8b45a00c0a3190dec7ac1e72d5682f3a16d8accda239308aad62f ncurses-6.1-20191228.patch.gz -sha256 7b6253bae438154a88c7f3e301b872ed7ad71f943c873f4e6c82d8d36a5df72b ncurses-6.1-20200104.patch.gz -sha256 e438f28025c7d97c7f8fabf40eeab68bbf8ca871a0ba349e3fdec9165efe85cb ncurses-6.1-20200111.patch.gz -sha256 06d002c33f727c4a36a0b502c226ea3c3c5b80770703d2f783fffa6a0db04d92 ncurses-6.1-20200118.patch.gz +sha256 97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059 ncurses-6.3.tar.gz +sha256 51bad0e386d06d3a26d7f28087b2072658282452f209e7e5eb7722556b042570 ncurses-6.3-20211026.patch.gz +sha256 4e1b0694a2633cc681987c80091175cb2b17a6c882750a7c6afb0560f5447249 ncurses-6.3-20211030.patch.gz +sha256 de7e0b2c784342188da48147d3fa661be38d5b5d517bb224423f15893e27334f ncurses-6.3-20211106.patch.gz +sha256 df78f157336fce33d96ae1e3c2f7d7b48e9b728409d9a4ab59e77242255b03ab ncurses-6.3-20211113.patch.gz +sha256 b7bf59d9a8e243263b05b166c6fe321bfca8e67eb32ebc26a1c813df42d64fee ncurses-6.3-20211115.patch.gz +sha256 7cb46c897e2e54d5f085cd9edc8d523c13b8f4a13878dd01ce094ec52bd26aec ncurses-6.3-20211120.patch.gz +sha256 ee8cf6ab6db3a01f2533959d14a5e1cc8e1412fbce4b2ab4668c7d1101f71684 ncurses-6.3-20211127.patch.gz +sha256 9d9055badff9e15fc1fbe4f4b2cce7c76384d446ab857573cbb1d645430d8ac7 ncurses-6.3-20211204.patch.gz +sha256 6059625cac99819a3580955db377c0820b6be7ae5da4d8a82e9638948a7b0679 ncurses-6.3-20211211.patch.gz +sha256 acb77a09fe6ab37b96e9f70d9ebfde0aaf7bdee064761c605b47125bd31be2ae ncurses-6.3-20211219.patch.gz +sha256 f2786f19c85258da9e9255459480e5ac2efb61b6ea5d0866b9b8507fa8f5b036 ncurses-6.3-20211225.patch.gz +sha256 ca5736eda90cd7cb597be0fdb0ed10f04deb7304cc7ffb0b166dfa07c39ab1e7 ncurses-6.3-20220101.patch.gz +sha256 7e43911e6baa4a7cfeaad1880777bda352eb7b22493db5bc9f72a52aec8d6d78 ncurses-6.3-20220115.patch.gz +sha256 ecfdd8bed6ff3b1fae5050da555c77dd41035c35bebed30162862e343324443e ncurses-6.3-20220122.patch.gz +sha256 32ec2da0fe48c353489c4018b38f890a59eafeb37ab24b82e32ba553845438a4 ncurses-6.3-20220129.patch.gz +sha256 f74b0d1f7f96bf8609c6a62e268019289e4affec9e02f9182ab14817637180e7 ncurses-6.3-20220205.patch.gz +sha256 6506f709e745375f692d05f53c45b50f1e60d13a3e4346db46d14f69e19adbb1 ncurses-6.3-20220212.patch.gz +sha256 349433e684e96096cbacaa1014d3ccd285c441d1bd99a721ae0b705b02de4145 ncurses-6.3-20220219.patch.gz +sha256 2181cf581fcdabb5b534606ab81c4c625bf819f9d351c670972a7f3a85f36197 ncurses-6.3-20220226.patch.gz +sha256 1acd0f2d18ea7c783286658e550c4f61cbe750a907c9be5fc00e67f2ea8f7eb5 ncurses-6.3-20220305.patch.gz +sha256 ced13543cc19ee341d82eb7fd501e15a2f3d1bc08fbbeb9de7edbd6422ca4799 ncurses-6.3-20220312.patch.gz +sha256 450fce90a10b1ab0b20ba5efc222741fe96f8445d1e4528e2a7b7711c26a5254 ncurses-6.3-20220319.patch.gz +sha256 c97213841e41d33b50a8492ba252dc79a24b38721f7ac0966442b3176f5666c7 ncurses-6.3-20220326.patch.gz +sha256 4c6253ea2c3cf83fbac2fdb5af56914e6bdc5a7c6e6e7532a4f218b7af6d05eb ncurses-6.3-20220402.patch.gz +sha256 5b46bc2bec8f9192c2ed7d25f2080c57b7d7ecbe294d85ab8d3c7d4eb4a678fa ncurses-6.3-20220409.patch.gz +sha256 fddd3b7dea2db1dc70adfa46ccb52301c820854821ce35366056e8e8daba8360 ncurses-6.3-20220416.patch.gz +sha256 1dba62d927affe93face3d55710d8abce7b70a904a0dd0114894efff7ba8ac72 ncurses-6.3-20220423.patch.gz +sha256 f6289906a3be560da9240e0d4a7a1bbd213dd9316f0b395e6852524491ff6322 ncurses-6.3-20220430.patch.gz +sha256 a6f631b9b934d0012617c429834b370732084d6f3c1784d11d8f18f26ea9e0d4 ncurses-6.3-20220501.patch.gz +sha256 79e75286b2a3292058bbe0aa67d8ea49682f7942b108c3ffc725a34765d4fce7 ncurses-6.3-20220507.patch.gz +sha256 1dda27245cbd6634f89766624dc72c156312bf00635214ea7ac299c9330b18f2 ncurses-6.3-20220514.patch.gz +sha256 0a251674845e0669e92c8bee6b6e5bb317439f8707f3316424eae590322f87c6 ncurses-6.3-20220521.patch.gz +sha256 411c4fdfc2ea4f56fdb57ff758a13dffa4b2fff68e71b65cf3248c925f6c30ee ncurses-6.3-20220529.patch.gz +sha256 acc315edb22a04f6476d9cd2a43866d478e0f4b2a555f480c92a18983bec5ee7 ncurses-6.3-20220604.patch.gz +sha256 2dae4db33c73766cd63b2b700e09588750bae44622749ce007404e3e30420ada ncurses-6.3-20220612.patch.gz +sha256 1e4b5c3deaab601a9749da591952b66a53d96017967eeec033f3b4d30e12d2de ncurses-6.3-20220618.patch.gz +sha256 65379719532023cd77c80a495cf31ff773345173e919ec8eef8b3f9517969626 ncurses-6.3-20220625.patch.gz +sha256 028864b31ada91862f0d8f4aa016b62bc3fe7e3981d62e81110d5143e26d0e0d ncurses-6.3-20220703.patch.gz +sha256 06c2f6d967480d0bcf20f301db26c8e5c90caf6d3adf616bc277e21407e9c955 ncurses-6.3-20220709.patch.gz +sha256 66aa8564d09fcc7bbd85bbe79685772330633c14d70af2fef00d10491e6b22fb ncurses-6.3-20220716.patch.gz +sha256 fffcc8ec0eab3dcbb7b8d8a208d880a15fe128f6f2dbc63a87d5640d8ade95cf ncurses-6.3-20220724.patch.gz +sha256 1787619c0b5052121dc5816bdb4cbd9699e1b61ba6c98072a3733b17cc7009f9 ncurses-6.3-20220729.patch.gz +sha256 d7fb1f2e2246079527351c8b7c8847c28751c6a5bb46740681d4b6ba790b22cc ncurses-6.3-20220806.patch.gz +sha256 10a04d3189a34187e691e73435c210af3939025f07ff6c34c1bfc48fda6f5a5d ncurses-6.3-20220813.patch.gz +sha256 b9238267413c2fce5bfe4c029f28dbbbef7230cdf47792ecd4070b857fe1a869 ncurses-6.3-20220820.patch.gz +sha256 7d30766caaac9136ab0ff7164d33761b186b698ec237560cb8fce0eb937f90b8 ncurses-6.3-20220827.patch.gz +sha256 5f04fd2d954b3461671290c766f784a4151091eb4e9197a7745dcdbb9c030483 ncurses-6.3-20220903.patch.gz +sha256 b948a0efe45341ccc913cc67231ee1e6bc737f178bcd758ce9f2e856e575071f ncurses-6.3-20220910.patch.gz +sha256 f9ad5781a72d669bdd06fe075136cc79e6a570960f6f641a9c486fc102a45c3b ncurses-6.3-20220917.patch.gz +sha256 bbb9d5afaec836e66b9f919c97c81c0505fd111b479b59ab6e376822ff6df1d3 ncurses-6.3-20220924.patch.gz +sha256 7ffeae28a0f8416c6ab088a99807d0d1ee5be821828c288f0a572ea769a8e2e5 ncurses-6.3-20221001.patch.gz +sha256 204baff40926d29ec30b1def4d4cc5d7ce074918327d8e271a49c960032b5a49 ncurses-6.3-20221008.patch.gz +sha256 f578dbb3beb1976636c74b33ffe5d300fee5a7653bc4f64bb7870d1b9cf85e7b ncurses-6.3-20221015.patch.gz +sha256 b01fc81093a331d5d645dbcbacebf6e5d459430b38cbdae0db053c6e5dff7d7e ncurses-6.3-20221023.patch.gz +sha256 e6e819c78c78c3a0355e7da4360d084f5d69871fa556b51322980f22da4edcea ncurses-6.3-20221029.patch.gz +sha256 4da9b5bf14a1b7d6d8a4181e79a98b9e5782153bc7db93773ac43e0b758c4da2 ncurses-6.3-20221105.patch.gz +sha256 b3381da6071bbed04e6ddaabbd5375d280e50af429f94522e32e9d0f22766155 ncurses-6.3-20221112.patch.gz +sha256 bf30c435283a4483280e0433f6370d9eea1fb704323bd887e540592eb8203e2f ncurses-6.3-20221119.patch.gz +sha256 32dc21b671ead8b199d66111ebd3404e8cd5f8c4ca5587cfeb5c6a4913b2d103 ncurses-6.3-20221126.patch.gz +sha256 8fe3bcacaea784ac7971e102a8eb8ca58c4c2c4c13c1ec33f32334600b9e4f56 ncurses-6.3-20221203.patch.gz + # Locally computed sha256 4d1fde61868c73776a539366dccf5d5a4857e7fd7299efb1f02e07c2afe9ea87 COPYING diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 2881ca1308..79593d8084 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -4,62 +4,78 @@ # ################################################################################ -NCURSES_VERSION = 6.1 +NCURSES_VERSION = 6.3 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses NCURSES_INSTALL_STAGING = YES NCURSES_DEPENDENCIES = host-ncurses NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING NCURSES_CPE_ID_VENDOR = gnu -# Commit 4b21273d71d09 added upstream (security) patches up to 20200118 -NCURSES_IGNORE_CVES += CVE-2018-10754 -NCURSES_IGNORE_CVES += CVE-2018-19211 -NCURSES_IGNORE_CVES += CVE-2018-19217 -NCURSES_IGNORE_CVES += CVE-2019-17594 -NCURSES_IGNORE_CVES += CVE-2019-17595 NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config NCURSES_PATCH = \ $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ - ncurses-6.1-20190609-patch.sh.bz2 \ - ncurses-6.1-20190615.patch.gz \ - ncurses-6.1-20190623.patch.gz \ - ncurses-6.1-20190630.patch.gz \ - ncurses-6.1-20190706.patch.gz \ - ncurses-6.1-20190713.patch.gz \ - ncurses-6.1-20190720.patch.gz \ - ncurses-6.1-20190727.patch.gz \ - ncurses-6.1-20190728.patch.gz \ - ncurses-6.1-20190803.patch.gz \ - ncurses-6.1-20190810.patch.gz \ - ncurses-6.1-20190817.patch.gz \ - ncurses-6.1-20190824.patch.gz \ - ncurses-6.1-20190831.patch.gz \ - ncurses-6.1-20190907.patch.gz \ - ncurses-6.1-20190914.patch.gz \ - ncurses-6.1-20190921.patch.gz \ - ncurses-6.1-20190928.patch.gz \ - ncurses-6.1-20191005.patch.gz \ - ncurses-6.1-20191012.patch.gz \ - ncurses-6.1-20191015.patch.gz \ - ncurses-6.1-20191019.patch.gz \ - ncurses-6.1-20191026.patch.gz \ - ncurses-6.1-20191102.patch.gz \ - ncurses-6.1-20191109.patch.gz \ - ncurses-6.1-20191116.patch.gz \ - ncurses-6.1-20191123.patch.gz \ - ncurses-6.1-20191130.patch.gz \ - ncurses-6.1-20191207.patch.gz \ - ncurses-6.1-20191214.patch.gz \ - ncurses-6.1-20191221.patch.gz \ - ncurses-6.1-20191228.patch.gz \ - ncurses-6.1-20200104.patch.gz \ - ncurses-6.1-20200111.patch.gz \ - ncurses-6.1-20200118.patch.gz \ + ncurses-6.3-20211026.patch.gz \ + ncurses-6.3-20211030.patch.gz \ + ncurses-6.3-20211106.patch.gz \ + ncurses-6.3-20211113.patch.gz \ + ncurses-6.3-20211115.patch.gz \ + ncurses-6.3-20211120.patch.gz \ + ncurses-6.3-20211127.patch.gz \ + ncurses-6.3-20211204.patch.gz \ + ncurses-6.3-20211211.patch.gz \ + ncurses-6.3-20211219.patch.gz \ + ncurses-6.3-20211225.patch.gz \ + ncurses-6.3-20220101.patch.gz \ + ncurses-6.3-20220115.patch.gz \ + ncurses-6.3-20220122.patch.gz \ + ncurses-6.3-20220129.patch.gz \ + ncurses-6.3-20220205.patch.gz \ + ncurses-6.3-20220212.patch.gz \ + ncurses-6.3-20220219.patch.gz \ + ncurses-6.3-20220226.patch.gz \ + ncurses-6.3-20220305.patch.gz \ + ncurses-6.3-20220312.patch.gz \ + ncurses-6.3-20220319.patch.gz \ + ncurses-6.3-20220326.patch.gz \ + ncurses-6.3-20220402.patch.gz \ + ncurses-6.3-20220409.patch.gz \ + ncurses-6.3-20220416.patch.gz \ + ncurses-6.3-20220423.patch.gz \ + ncurses-6.3-20220430.patch.gz \ + ncurses-6.3-20220501.patch.gz \ + ncurses-6.3-20220507.patch.gz \ + ncurses-6.3-20220514.patch.gz \ + ncurses-6.3-20220521.patch.gz \ + ncurses-6.3-20220529.patch.gz \ + ncurses-6.3-20220604.patch.gz \ + ncurses-6.3-20220612.patch.gz \ + ncurses-6.3-20220618.patch.gz \ + ncurses-6.3-20220625.patch.gz \ + ncurses-6.3-20220703.patch.gz \ + ncurses-6.3-20220709.patch.gz \ + ncurses-6.3-20220716.patch.gz \ + ncurses-6.3-20220724.patch.gz \ + ncurses-6.3-20220729.patch.gz \ + ncurses-6.3-20220806.patch.gz \ + ncurses-6.3-20220813.patch.gz \ + ncurses-6.3-20220820.patch.gz \ + ncurses-6.3-20220827.patch.gz \ + ncurses-6.3-20220903.patch.gz \ + ncurses-6.3-20220910.patch.gz \ + ncurses-6.3-20220917.patch.gz \ + ncurses-6.3-20220924.patch.gz \ + ncurses-6.3-20221001.patch.gz \ + ncurses-6.3-20221008.patch.gz \ + ncurses-6.3-20221015.patch.gz \ + ncurses-6.3-20221023.patch.gz \ + ncurses-6.3-20221029.patch.gz \ + ncurses-6.3-20221105.patch.gz \ + ncurses-6.3-20221112.patch.gz \ + ncurses-6.3-20221119.patch.gz \ + ncurses-6.3-20221126.patch.gz \ + ncurses-6.3-20221203.patch.gz \ ) -# ncurses-6.1-20191012.patch.gz -NCURSES_IGNORE_CVES += CVE-2019-17594 CVE-2019-17595 - NCURSES_CONF_OPTS = \ --without-cxx \ --without-cxx-binding \ From yann.morin.1998 at free.fr Mon Feb 20 20:57:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:28 -0000 Subject: [Buildroot] [git commit branch/next] package/lua-utf8: bump to version 0.1.5 Message-ID: <20230220205215.ADDF18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3ce4fa930419e2968f844db4c7bc7a09ef473ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-utf8/Config.in | 2 +- package/lua-utf8/lua-utf8.hash | 4 ++-- package/lua-utf8/lua-utf8.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lua-utf8/Config.in b/package/lua-utf8/Config.in index 313fa4e45d..5815936df5 100644 --- a/package/lua-utf8/Config.in +++ b/package/lua-utf8/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LUA_UTF8 This module adds UTF-8 support to Lua. It's compatible with Lua "string" module. - http://github.com/starwing/luautf8 + https://github.com/starwing/luautf8 diff --git a/package/lua-utf8/lua-utf8.hash b/package/lua-utf8/lua-utf8.hash index b6720b3603..b4d455ceb7 100644 --- a/package/lua-utf8/lua-utf8.hash +++ b/package/lua-utf8/lua-utf8.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 88c456bc0f00d28201b33551d83fa6e5c3ae6025aebec790c37afb317290e4fa luautf8-0.1.3-1.src.rock -sha256 74506285923bcc3e58aaca1b774db26461021783d02b2dc26bafcaa02ef7a00b luautf8-0.1.3/LICENSE +sha256 68bd8e3c3e20f98fceb9e20d5a7a50168202c22eb45b87eff3247a0608f465ae luautf8-0.1.5-2.src.rock +sha256 74506285923bcc3e58aaca1b774db26461021783d02b2dc26bafcaa02ef7a00b luautf8-0.1.5/LICENSE diff --git a/package/lua-utf8/lua-utf8.mk b/package/lua-utf8/lua-utf8.mk index 52aaf5c71e..33c34a4eb2 100644 --- a/package/lua-utf8/lua-utf8.mk +++ b/package/lua-utf8/lua-utf8.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_UTF8_VERSION = 0.1.3-1 +LUA_UTF8_VERSION = 0.1.5-2 LUA_UTF8_NAME_UPSTREAM = luautf8 LUA_UTF8_LICENSE = MIT LUA_UTF8_LICENSE_FILES = $(LUA_UTF8_SUBDIR)/LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:57:28 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:28 -0000 Subject: [Buildroot] [git commit branch/next] package/ipmitool: fix broken IANA PEN registry URL Message-ID: <20230220205236.9033C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b6ccffcfb84938d2f0813d7c98907d75b49b842 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Backport the upstream fix for the IANA Private Enterprise Numbers registry URL so the correct file gets downloaded and installed. Signed-off-by: Vincent Fazio Signed-off-by: Vincent Fazio Signed-off-by: Yann E. MORIN --- .../ipmitool/0002-Fix-enterprise-numbers-URL.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/ipmitool/0002-Fix-enterprise-numbers-URL.patch b/package/ipmitool/0002-Fix-enterprise-numbers-URL.patch new file mode 100644 index 0000000000..07cdbd4527 --- /dev/null +++ b/package/ipmitool/0002-Fix-enterprise-numbers-URL.patch @@ -0,0 +1,36 @@ +From 1edb0e27e44196d1ebe449aba0b9be22d376bcb6 Mon Sep 17 00:00:00 2001 +From: Alexander Amelkin +Date: Tue, 22 Nov 2022 13:55:33 +0300 +Subject: [PATCH] Fix enterprise-numbers URL + +IANA has changed their URL scheme, and the content at the old URL for +enterprise-numbers switched from text/plain to text/html. + +Fix Makefile.am to use the new URL + +Resolves ipmitool/ipmitool#377 + +Signed-off-by: Alexander Amelkin + +[vfazio: backport from upstream 1edb0e27e44196d1ebe449aba0b9be22d376bcb6] +Signed-off-by: Vincent Fazio +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index ce3267f..3182a52 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -41,7 +41,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure configure-stamp \ + $(distdir).tar.gz $(distdir).tar.bz2 + + SUBDIRS = lib src include doc contrib control +-IANA_PEN = http://www.iana.org/assignments/enterprise-numbers ++IANA_PEN = http://www.iana.org/assignments/enterprise-numbers.txt + + dist-hook: + cp control/ipmitool.spec $(distdir) +-- +2.25.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:29 -0000 Subject: [Buildroot] [git commit branch/next] package/libpwquality: bump to version 1.4.5 Message-ID: <20230220205215.EB904828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a58d1aa9eb3a83d07fd445875c79722b609a78b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/libpwquality/libpwquality/blob/libpwquality-1.4.5/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libpwquality/libpwquality.hash | 2 +- package/libpwquality/libpwquality.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpwquality/libpwquality.hash b/package/libpwquality/libpwquality.hash index 1469bc0b7a..e64fb4bf50 100644 --- a/package/libpwquality/libpwquality.hash +++ b/package/libpwquality/libpwquality.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d43baf23dc6887fe8f8e9b75cabaabc5f4bbbaa0f9eff44278d276141752a545 libpwquality-1.4.4.tar.bz2 +sha256 6fcf18b75d305d99d04d2e42982ed5b787a081af2842220ed63287a2d6a10988 libpwquality-1.4.5.tar.bz2 sha256 aa44d09f651bf99b56253187c7778a240740c767d28453ab7fdc9804c842baee COPYING diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index d4f7a47120..ae6babbcae 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPWQUALITY_VERSION = 1.4.4 +LIBPWQUALITY_VERSION = 1.4.5 LIBPWQUALITY_SOURCE = libpwquality-$(LIBPWQUALITY_VERSION).tar.bz2 LIBPWQUALITY_SITE = https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$(LIBPWQUALITY_VERSION) LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ From peter at korsgaard.com Mon Feb 20 20:57:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:29 -0000 Subject: [Buildroot] [git commit branch/next] Update for 2022.02.9 Message-ID: <20230220205236.C19FC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b56604060a9bb6d06e790934421909dc1b763d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Peter Korsgaard (cherry picked from commit ae835e094f607d69f1c2581593a4c55723486c39) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/CHANGES b/CHANGES index e23cd4eaf8..dbf62e5a63 100644 --- a/CHANGES +++ b/CHANGES @@ -580,6 +580,50 @@ #14731: BR2_PACKAGE_IOSTAT #14751: LVM2 Outdated Link +2022.02.9, released January 18th, 2023 + + Important / security related fixes. + + Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + Go: Ensure our go build and module cache is used, even for the + download step. + + Legal-info: Stop warning about not saving sources for local / + override packages if _REDISTRIBUTE is set to NO. + + Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + Updated/fixed packages: asterisk, bearssl, botan, cairo, + capnproto, check, checkpolicy, connman, containerd, + docker-cli, docker-engine, exempi, exfat, exfat-utils, fmc, + fmlib, glib-networking, go, gobject-introspection, gperf, + i2pd, ima-evm-utils, imx-alsa-plugins, imx-kobs, imx-lib, + imx-m4fwloader, imx-mkimage, intel-microcode, janus-gateway, + libcurl, libftdi1, libksba, libmbim, libmng, libpjsip, + libtalloc, libuwsc, libxkbcommon, linux, lpeg, lrzsz, + lttng-tools, lua-cqueues, mbedtls, mfgtools, mutt, php, + policycoreutils, polkit, postgresql, pptp-linux, + qcom-db410c-firmware, qemu, qoriq-rcw, qt5virtualkeyboard, + rhash, rtl_433, ruby, sqlite, swupdate, tekui, tiff, tinyxml, + tor, wayland, wireshark, wpa_supplicant, + xdriver_xf86-video-imx-viv, xserver_xorg-server, xxhash, zip + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + 2022.02.8, released December 10th, 2022 Important / security related fixes. From yann.morin.1998 at free.fr Mon Feb 20 20:57:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:30 -0000 Subject: [Buildroot] [git commit branch/next] package/proftpd: sftpd does not build with libressl Message-ID: <20230220205236.EBCAE828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7797603d260b498c864d089b107d01679edf0a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next sftp doesn't build with libressl >= 3.5.0 resulting in the following build failure since commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: mac.c: In function 'init_mac': mac.c:189:3: warning: implicit declaration of function 'HMAC_CTX_init'; did you mean 'HMAC_CTX_new'? [-Wimplicit-function-declaration] 189 | HMAC_CTX_init(hmac_ctx); | ^~~~~~~~~~~~~ | HMAC_CTX_new mac.c: In function 'set_mac_key': mac.c:435:14: error: storage size of 'ctx' isn't known 435 | EVP_MD_CTX ctx; | ^~~ So force use of openssl for sftpd, as no feedback was received on https://github.com/proftpd/proftpd/pull/1481 Fixes: - http://autobuild.buildroot.org/results/a16ccd7cc78eb63de06a6d738fccc6b947da13e7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/proftpd/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in index 83094028a0..aed1958b8d 100644 --- a/package/proftpd/Config.in +++ b/package/proftpd/Config.in @@ -29,7 +29,8 @@ config BR2_PACKAGE_PROFTPD_MOD_REDIS config BR2_PACKAGE_PROFTPD_MOD_SFTP bool "mod_sftp support" select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 help Compile ProFTPD with mod_sftp support From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:57:31 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi: bump version to 19.5-Matrix Message-ID: <20230220205216.0E78D8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=95a16926ed78c905d38f6eeb8bc46c9d3d3bb5a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Removed two upstream patches included in this version. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- ...t-as-char-as-formatting-of-non-void-point.patch | 54 ---------------------- ...1-cast-as-char-as-formatting-of-non-void-.patch | 33 ------------- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 6 files changed, 4 insertions(+), 91 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 8cc2297bdb..a13fb91afe 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.4-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 19.5-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 4733399edc..9432e4bbd6 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.4-Matrix +KODI_TEXTUREPACKER_VERSION = 19.5-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/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch b/package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch deleted file mode 100644 index af68de220c..0000000000 --- a/package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 44b30c116682968bacf8aec566fc9c193026ecc9 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Wed, 6 Jul 2022 22:48:35 +1000 -Subject: [PATCH] GLUtils: cast as char as formatting of non-void pointers - is disallowed - -Downloaded from upstream commit: -https://github.com/xbmc/xbmc/commit/44b30c116682968bacf8aec566fc9c193026ecc9 - -Signed-off-by: Bernd Kuhls ---- - xbmc/utils/GLUtils.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp -index 1ef804709f..c36dcf6a20 100644 ---- a/xbmc/utils/GLUtils.cpp -+++ b/xbmc/utils/GLUtils.cpp -@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno) - void LogGraphicsInfo() - { - #if defined(HAS_GL) || defined(HAS_GLES) -- const GLubyte *s; -+ const char* s; - -- s = glGetString(GL_VENDOR); -+ s = reinterpret_cast(glGetString(GL_VENDOR)); - if (s) - CLog::Log(LOGINFO, "GL_VENDOR = %s", s); - else - CLog::Log(LOGINFO, "GL_VENDOR = NULL"); - -- s = glGetString(GL_RENDERER); -+ s = reinterpret_cast(glGetString(GL_RENDERER)); - if (s) - CLog::Log(LOGINFO, "GL_RENDERER = %s", s); - else - CLog::Log(LOGINFO, "GL_RENDERER = NULL"); - -- s = glGetString(GL_VERSION); -+ s = reinterpret_cast(glGetString(GL_VERSION)); - if (s) - CLog::Log(LOGINFO, "GL_VERSION = %s", s); - else - CLog::Log(LOGINFO, "GL_VERSION = NULL"); - -- s = glGetString(GL_SHADING_LANGUAGE_VERSION); -+ s = reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION)); - if (s) - CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s); - else --- -2.30.2 - diff --git a/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch b/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch deleted file mode 100644 index 41dc3356bd..0000000000 --- a/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 651c82853fe69dc5aa3e6a50f2eb2f752caafba0 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Mon, 11 Jul 2022 09:39:02 +0000 -Subject: [PATCH] WinSystemX11: cast as char as formatting of non-void - pointers is disallowed - -Downloaded from upstream commit: -https://github.com/xbmc/xbmc/commit/651c82853fe69dc5aa3e6a50f2eb2f752caafba0 - -Signed-off-by: Bernd Kuhls ---- - xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp -index 8a18288fd8..033c0f77bf 100644 ---- a/xbmc/windowing/X11/WinSystemX11.cpp -+++ b/xbmc/windowing/X11/WinSystemX11.cpp -@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager() - - if(status == Success && items_read) - { -- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data); -+ const char* s; -+ -+ s = reinterpret_cast(data); -+ CLog::Log(LOGDEBUG, "Window Manager Name: {}", s); - } - else - CLog::Log(LOGDEBUG,"Window Manager Name: "); --- -2.30.2 - diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index a17e0fb29f..e0f548879e 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz +sha256 56e0074f27f08496b2a21af5704a15378a2f0979ae3e9fa9a50a2630d0313d19 kodi-19.5-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 c41c515d10..dbe6c1e8f6 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.4 +KODI_VERSION_MAJOR = 19.5 KODI_VERSION_NAME = Matrix KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) From yann.morin.1998 at free.fr Mon Feb 20 20:57:53 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:53 -0000 Subject: [Buildroot] [git commit branch/next] package/ssdp-responder: fix misspelled define directive Message-ID: <20230220205239.B90228648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e0ba6bfc2d28a8079d336a18cc50f0825952ec2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/ssdp-responder/ssdp-responder.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index fd7b1ea44b..d40f6f8c57 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,7 +25,7 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP-RESPONDER_INSTALL_INIT_SYSTEMD +define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service endef From yann.morin.1998 at free.fr Mon Feb 20 20:58:21 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:21 -0000 Subject: [Buildroot] [git commit branch/next] package/python-greenlet: bump to version 2.0.2 Message-ID: <20230220205243.535EF86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b86cc6a313773ac90bceabf376e33bba789c2950 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-greenlet/python-greenlet.hash | 4 ++-- package/python-greenlet/python-greenlet.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-greenlet/python-greenlet.hash b/package/python-greenlet/python-greenlet.hash index 4e9e96398a..f378436beb 100644 --- a/package/python-greenlet/python-greenlet.hash +++ b/package/python-greenlet/python-greenlet.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/greenlet/json -md5 8d0f10b807144a86b54841cfab2620a9 greenlet-2.0.1.tar.gz -sha256 42e602564460da0e8ee67cb6d7236363ee5e131aa15943b6670e44e5c2ed0f67 greenlet-2.0.1.tar.gz +md5 e6637d59015cba7e86f2111e6aa8168b greenlet-2.0.2.tar.gz +sha256 e7c8dc13af7db097bed64a051d2dd49e9f0af495c26995c00a9ee842690d34c0 greenlet-2.0.2.tar.gz # Locally computed sha256 checksums sha256 769831d6e5dfaf2c20802faccff1fafb4c2025dd8f6253dfa47fcad59d4d0979 LICENSE sha256 e5ff3c23c110e494cd7d736c10fd96d462457bafeca310840db6527298c7d46b LICENSE.PSF diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index 232e2820f8..40f05f667e 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GREENLET_VERSION = 2.0.1 +PYTHON_GREENLET_VERSION = 2.0.2 PYTHON_GREENLET_SOURCE = greenlet-$(PYTHON_GREENLET_VERSION).tar.gz -PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/fd/6a/f07b0028baff9bca61ecfcd9ee021e7e33369da8094f00eff409f2ff32be +PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/1e/1e/632e55a04d732c8184201238d911207682b119c35cecbb9a573a6c566731 PYTHON_GREENLET_SETUP_TYPE = setuptools PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:22 -0000 Subject: [Buildroot] [git commit branch/next] package/rng-tools: bump to version 6.16 Message-ID: <20230220205243.0E7208648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a97ab5d2faf4c0498e1c7b4eb68f98fc2eb78060 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patches (already in version) - libcap is a mandatory dependency since https://github.com/nhorman/rng-tools/commit/50afdce9d3fed6244a0cf772d38f2d8475312bc5 - Add Qrypt support: https://github.com/nhorman/rng-tools/commit/7ab7f540da567467055f77016590744d828fc9eb https://github.com/nhorman/rng-tools/releases/tag/v6.16 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...configure.ac-fix-build-without-sys-auxv.h.patch | 52 ---------------------- ...erentropy-detection-to-look-for-the-setti.patch | 30 ------------- ...erentropy-library-to-timeout-fail-on-long.patch | 39 ---------------- package/rng-tools/Config.in | 16 +++++++ package/rng-tools/rng-tools.hash | 2 +- package/rng-tools/rng-tools.mk | 11 ++++- 6 files changed, 26 insertions(+), 124 deletions(-) diff --git a/package/rng-tools/0001-configure.ac-fix-build-without-sys-auxv.h.patch b/package/rng-tools/0001-configure.ac-fix-build-without-sys-auxv.h.patch deleted file mode 100644 index 0c15ab6b7d..0000000000 --- a/package/rng-tools/0001-configure.ac-fix-build-without-sys-auxv.h.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 6ea89861c300a732d1bbcffd085d92f5c4c9228e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 15 Aug 2022 11:57:21 +0200 -Subject: [PATCH] configure.ac: fix build without sys/auxv.h - -Fix the following build failure on aarch64 without sys/auxv.h (e.g. on -uclibc) raised since version 6.13 and -https://github.com/nhorman/rng-tools/commit/9070a04adfcd21ec3839ee8ff190e7130ccd5c9b: - -rngd_rndr.c:34:10: fatal error: sys/auxv.h: No such file or directory - 34 | #include - | ^~~~~~~~~~~~ - -The same issue could be raised on powerpc64le since version 6.11 and -https://github.com/nhorman/rng-tools/commit/ade348cdb90c25b44b203fd4e9c33ec4bccff323 - -Fixes: - - http://autobuild.buildroot.org/results/41d5ab9e67eb0d8af8d789fc94d4366f130a7fb2 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/nhorman/rng-tools/commit/6ea89861c300a732d1bbcffd085d92f5c4c9228e] ---- - configure.ac | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0af64e7..411c7b8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,14 +76,17 @@ AC_PROG_GCC_TRADITIONAL - - AX_PTHREAD - -+dnl Checks for header files. -+AC_CHECK_HEADERS(sys/auxv.h) -+ - AM_CONDITIONAL([RDRAND], [test $host_cpu = x86_64 || test $host_cpu = i686]) - AS_IF([test $host_cpu = x86_64 || test $host_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[]) - --AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le]) --AS_IF([test $host_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[]) -+AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le -a "$ac_cv_header_sys_auxv_h" = "yes"]) -+AS_IF([test $host_cpu = powerpc64le -a "$ac_cv_header_sys_auxv_h" = "yes"], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[]) - --AM_CONDITIONAL([RNDR], [test $host_cpu = aarch64]) --AS_IF([test $host_cpu = aarch64], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[]) -+AM_CONDITIONAL([RNDR], [test $host_cpu = aarch64 -a "$ac_cv_header_sys_auxv_h" = "yes"]) -+AS_IF([test $host_cpu = aarch64 -a "$ac_cv_header_sys_auxv_h" = "yes"], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[]) - AM_CONDITIONAL([JITTER], [false]) - - AC_ARG_ENABLE(jitterentropy, diff --git a/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch b/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch deleted file mode 100644 index 553842640d..0000000000 --- a/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e2698477e8abf623c18ab28d33cc894ec882a706 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Fri, 18 Mar 2022 18:59:52 -0400 -Subject: [PATCH] Adjust jitterentropy detection to look for the settick - function - -Theres no great way to detect if jitterentropy has the internal timer -feature enabled so we have to look for a function that is only defined -when it is enabled - -Signed-off-by: Bernd Kuhls -[downloaded from upstream commit - https://github.com/nhorman/rng-tools/commit/e2698477e8abf623c18ab28d33cc894ec882a706] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e16e1a0..0f5a38e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -94,7 +94,7 @@ AS_IF( - AC_SEARCH_LIBS(jent_version,jitterentropy, - [AM_CONDITIONAL([JITTER], [true]) - AC_DEFINE([HAVE_JITTER],1,[Enable JITTER]) -- AC_CHECK_LIB(jitterentropy, jent_entropy_switch_notime_impl, -+ AC_CHECK_LIB(jitterentropy, jent_notime_settick, - [AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])], - [],-lpthread)], - AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread) diff --git a/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch b/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch deleted file mode 100644 index 9d8dbe2d0b..0000000000 --- a/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c29424f10a0dcbd18ac25607fa1c81c18a960e81 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Mon, 16 May 2022 13:38:54 -0400 -Subject: [PATCH] Adjust jitterentropy library to timeout/fail on long delay - -[Bernd: removed description of unrelated part of the patch] - -Also while we're at it, I might have a build solution for the presence -of internal timers. When jitterentropy is built without internal -timers, jent_notime_init is defined publically, but when it is built -with timers, its declared as a static symbol, preenting resolution, so -we can test to see if the function exists. If it does we _don't_ have -notime support. The logic is a bit backwards, but i think it works - -Signed-off-by: Bernd Kuhls -[downloaded configure.ac patch from upstream commit - https://github.com/nhorman/rng-tools/commit/57be6d4c90e78ea9ad036a3a6e9b09822ed4d219] ---- - configure.ac | 6 ++--- - rngd_jitter.c | 62 ++++++++++++++++++++++++++++++++++++++------------- - 2 files changed, 49 insertions(+), 19 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 52f2bb5..0af64e7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -101,9 +101,9 @@ AS_IF( - AC_SEARCH_LIBS(jent_version,jitterentropy, - [AM_CONDITIONAL([JITTER], [true]) - AC_DEFINE([HAVE_JITTER],1,[Enable JITTER]) -- AC_CHECK_LIB(jitterentropy, jent_notime_settick, -- [AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])], -- [],-lpthread)], -+ AC_CHECK_LIB(jitterentropy, jent_notime_init, -+ [], -+ [AC_DEFINE([HAVE_JITTER_NOTIME],1, [Enable JITTER_NOTIME])],-lpthread)], - AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread) - ], [AC_MSG_NOTICE([Disabling JITTER entropy source])] - ) diff --git a/package/rng-tools/Config.in b/package/rng-tools/Config.in index 0dd269c818..be3f078a0b 100644 --- a/package/rng-tools/Config.in +++ b/package/rng-tools/Config.in @@ -2,7 +2,9 @@ config BR2_PACKAGE_RNG_TOOLS bool "rng-tools" # pthread_setaffinity_np depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU # libcap select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_OPENSSL help Daemon to use hardware random number generators. @@ -35,7 +37,21 @@ config BR2_PACKAGE_RNG_TOOLS_NISTBEACON never be used for cryptographic purposes, or any use case in which random data should be known only by a single entity. +config BR2_PACKAGE_RNG_TOOLS_QRYPT + bool "Qrypt Entropy Beacon support" + select BR2_PACKAGE_JANSSON + select BR2_PACKAGE_LIBCURL + help + Enable Qrypt NIST-Beacon like entropy support. + + Entropy gathered from Qrypt server based entropy beacons. Like + NIST, it should likely not be used directly in cryptographic + operation, as the entropy may be intercepted over a network, + but can provide copius amounts of entropy for non-crypto + purposes. + endif comment "rng-tools needs a toolchain w/ NPTL" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash index be2ee13969..4c86791267 100644 --- a/package/rng-tools/rng-tools.hash +++ b/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a rng-tools-6.15.tar.gz +sha256 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 rng-tools-6.16.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index f736193a23..3e565103e4 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,14 +4,14 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.15 +RNG_TOOLS_VERSION = 6.16 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project RNG_TOOLS_SELINUX_MODULES = rngd -RNG_TOOLS_DEPENDENCIES = host-pkgconf openssl +RNG_TOOLS_DEPENDENCIES = host-pkgconf libcap openssl # From git RNG_TOOLS_AUTORECONF = YES @@ -45,6 +45,13 @@ else RNG_TOOLS_CONF_OPTS += --without-nistbeacon endif +ifeq ($(BR2_PACKAGE_RNG_TOOLS_QRYPT),y) +RNG_TOOLS_DEPENDENCIES += jansson libcurl +RNG_TOOLS_CONF_OPTS += --with-qrypt +else +RNG_TOOLS_CONF_OPTS += --without-qrypt +endif + define RNG_TOOLS_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/rng-tools/S21rngd \ $(TARGET_DIR)/etc/init.d/S21rngd From peter at korsgaard.com Mon Feb 20 20:59:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:58 -0000 Subject: [Buildroot] [git commit branch/next] package/parted: bump to version 3.5 Message-ID: <20230220205229.374E6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57817fe05a4250a260a08201812c6652b306a0e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- package/parted/parted.hash | 2 +- package/parted/parted.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/parted/parted.hash b/package/parted/parted.hash index 392436ec4b..8a167d9bb8 100644 --- a/package/parted/parted.hash +++ b/package/parted/parted.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342 parted-3.4.tar.xz +sha256 4938dd5c1c125f6c78b1f4b3e297526f18ee74aa43d45c248578b1d2470c05a2 parted-3.5.tar.xz # Locally calculated sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING diff --git a/package/parted/parted.mk b/package/parted/parted.mk index 23158179e4..6d4626e2e6 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -4,7 +4,7 @@ # ################################################################################ -PARTED_VERSION = 3.4 +PARTED_VERSION = 3.5 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(BR2_GNU_MIRROR)/parted PARTED_DEPENDENCIES = host-pkgconf util-linux From thomas.petazzoni at bootlin.com Tue Feb 7 17:10:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:10:35 +0100 Subject: [Buildroot] [git commit branch/next] package/uclibc: don't let uClibc build system strip uClibc Message-ID: <20230220205253.50CB28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf92dcfaa92f6564830d10d4e18ae00fd8102ab2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Let Buildroot handle this, so we can have an unstripped uClibc if needed. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 125aa4cdcf..d2baffc95e 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -397,6 +397,7 @@ define UCLIBC_KCONFIG_FIXUP_CMDS $(call KCONFIG_SET_OPT,RUNTIME_PREFIX,"/") $(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr") $(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib") + $(call KCONFIG_DISABLE_OPT,DOSTRIP) $(UCLIBC_MMU_CONFIG) $(UCLIBC_BINFMT_CONFIG) $(UCLIBC_AARCH64_PAGE_SIZE_CONFIG) From peter at korsgaard.com Mon Feb 20 20:59:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:59 -0000 Subject: [Buildroot] [git commit branch/next] package/fetchmail: bump version to 6.4.35 Message-ID: <20230220205229.6486D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a029f6e8855b7c6b0b558a4f715d25faf1dba32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://sourceforge.net/p/fetchmail/mailman/message/37756758/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/fetchmail/fetchmail.hash | 4 ++-- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 4b2cf90ed8..bb03dcf94a 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37721221/ -sha256 c3bdded1b5ce236960bd1ceeee3f3257220ed99c3eec84a5d76bb5618e3258d4 fetchmail-6.4.34.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37756758/ +sha256 7b0b56cbc0fca854504f167795fab532d5a54d5a7d3b6e3e36a33f34a0960a01 fetchmail-6.4.35.tar.xz # Locally computed: sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index 063e41b2e1..d6053508a5 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).34 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).35 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING From yann.morin.1998 at free.fr Tue Feb 7 17:14:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:14:59 +0100 Subject: [Buildroot] [git commit branch/next] support/docker: update Debian distro to a newer tag/date Message-ID: <20230220205253.6F9D28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d24c6f4b15f4794046e8e1ee220298c90ddecd19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/docker/Dockerfile | 2 +- support/docker/apt-sources.list | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index d775ae23e1..de1534e77a 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -6,7 +6,7 @@ # We use a specific tag for the base image *and* the corresponding date # for the repository., so do not forget to update the apt-sources.list # file that is shipped next to this Dockerfile. -FROM debian:bullseye-20210902 +FROM debian:bullseye-20230202 LABEL maintainer="Buildroot mailing list " \ vendor="Buildroot" \ diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list index 0f872fd398..849996d9f7 100644 --- a/support/docker/apt-sources.list +++ b/support/docker/apt-sources.list @@ -1,4 +1,4 @@ -# Latest just before 20210817T000000Z: -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20210902T193650Z/ bullseye-security main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main +# Latest just before 20230207T102800Z: +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20230206T092119Z/ bullseye-security main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye-updates main From peter at korsgaard.com Mon Feb 20 21:00:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:00 -0000 Subject: [Buildroot] [git commit branch/next] package/intel-mediadriver: bump version to 22.6.6 Message-ID: <20230220205229.55EAC8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c163b2c782e6034f0ae6d60c479d092a539263e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 b2c45eb025..a5e9c64e97 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cbb6a514564f8c3349b1f78fc0906b636ea2074d7605cb0e820c5b727ce88cdc intel-media-22.6.5.tar.gz +sha256 b553290e829dfd824eb62295c9f07dbe8062ce7998f7c527cc92856d0792562d intel-media-22.6.6.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 8d3fc09260..8fa93218fa 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.6.5 +INTEL_MEDIADRIVER_VERSION = 22.6.6 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 thomas.petazzoni at bootlin.com Tue Feb 7 17:10:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:10:35 +0100 Subject: [Buildroot] [git commit branch/next] package/uclibc: pass $(TARGET_DEBUGGING) flags Message-ID: <20230220205253.5B606828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17481bd0bf6abff260ccc579974b813050f91d4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In order to have debugging symbols in uClibc, let's pass $(TARGET_DEBUGGING) in UCLIBC_EXTRA_CFLAGS. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index d2baffc95e..342d841087 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -375,7 +375,7 @@ endif # Commands # -UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) +UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) $(TARGET_DEBUGGING) # uClibc-ng does not build with LTO, so explicitly disable it # when using a compiler that may have support for LTO From peter at korsgaard.com Mon Feb 20 21:00:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:01 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_kria_kv260_defconfig: fix linux dts name Message-ID: <20230220205229.81107828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3f5c5cb87b2f5d0e24b291697d959b8773e8b86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The Linux DTS name has changed for the zynqmp_kria_kv260 with Xilinx 2022.2. smk-k26-revA-sck-kv-g-revB has become zynqmp-smk-k26-revA-sck-kv-g-revB. This DTS corresponds to generating the zynqmp-smk-k26-revA.dtb for the k26 som and applying the zynqmp-sck-kv-g-revB.dtbo for the kv260 carrier board. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3477506541 Signed-off-by: Neal Frager Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/zynqmp_kria_kv260_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 3214d45fa9..94631da034 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -8,7 +8,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/smk-k26-revA-sck-kv-g-revB" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y From thomas.petazzoni at bootlin.com Tue Feb 7 17:10:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:10:35 +0100 Subject: [Buildroot] [git commit branch/next] package/uclibc: enable DODEBUG when BR2_ENABLE_RUNTIME_DEBUG Message-ID: <20230220205253.662B186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9867a725c12975af52dda9dffbdc33c3b0312db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The DODEBUG=y option of uClibc causes uClibc to be built with -O0 and -DDEBUG, which has a significant runtime performance impact. Currently, DODEBUG=y is passed when BR2_ENABLE_DEBUG=y, but BR2_ENABLE_DEBUG is only about enabling debugging symbols, not about runtime debugging additions. The more recently added BR2_ENABLE_RUNTIME_DEBUG option is precisely designed for that, so we changed the logic to pass DODEBUG=y when BR2_ENABLE_RUNTIME_DEBUG=y, and not BR2_ENABLE_DEBUG=y. This allows to build uClibc with debugging symbols when BR2_ENABLE_DEBUG=y, without disabling optimizations and adding more debugging features that have a runtime performance impact. Signed-off-by: Ben Wolsieffer [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20220803200629.3172370-1-Ben.Wolsieffer at hefring.com/ and split into its own independent patch.] Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 342d841087..4c05d36ab3 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -217,7 +217,7 @@ endif # # Debug # -ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) define UCLIBC_DEBUG_CONFIG $(call KCONFIG_ENABLE_OPT,DODEBUG) endef From peter at korsgaard.com Mon Feb 20 21:00:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:02 -0000 Subject: [Buildroot] [git commit branch/next] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot Message-ID: <20230220205229.906C48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e9929e9a826d93ff47060267fe6cc1d9ec35718 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_lime2_defconfig | 4 ++-- configs/olimex_a20_olinuxino_lime_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 1bb628b56b..a0ebcaed66 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.71" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -44,7 +44,7 @@ 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="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 7105ea9962..f685d19421 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.71" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -44,7 +44,7 @@ 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="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From peter at korsgaard.com Tue Feb 7 17:24:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 18:24:10 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: silence gcc plugin test Message-ID: <20230220205253.8D2B786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fbd2f6d2cf26225f73f584c3a0cacb1b2476f5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The gcc plugin test was not using the -q option to grep causing it to print the line to stdout, so fix that. While we're at it, adjust the locale check to use grep -q instead of redirecting to /dev/null for consistency with the other checks. Signed-off-by: Peter Korsgaard --- 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 88eabe921d..0aa5e59274 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -194,7 +194,7 @@ if [ "${PATCH_MAJOR}" -lt 2 ] || [ "${PATCH_MAJOR}" -eq 2 -a "${PATCH_MINOR}" -l exit 1; fi -if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then +if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then if ! which locale > /dev/null ; then echo echo "You need locale support on your build machine to build a toolchain supporting locales" @@ -254,7 +254,7 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then fi fi -if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then +if grep -q ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then if ! echo "#include " | $HOSTCXX_NOCCACHE -I$($HOSTCXX_NOCCACHE -print-file-name=plugin)/include -x c++ -c - -o /dev/null ; then echo echo "Your Buildroot configuration needs a host compiler capable of building gcc plugins." From arnout at mind.be Tue Feb 7 21:51:26 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:26 +0100 Subject: [Buildroot] [git commit branch/next] system: Warn if systemd is used with kernel < 4.15 Message-ID: <20230220205254.095CC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a095643b4dd34eb7acb69662aa64fa945f4b542 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next To quote the README: > Kernel versions below 4.15 have significant gaps in functionality and > are not recommended for use with this version of systemd. Taint flag > 'old-kernel' will be set. Systemd will most likely still function, but > upstream support and testing are limited. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- system/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/Config.in b/system/Config.in index 6100d965e7..1ca7690ea3 100644 --- a/system/Config.in +++ b/system/Config.in @@ -140,6 +140,10 @@ comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and targe !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 +comment "systemd highly recommends Linux >= 4.15" + depends on BR2_INIT_SYSTEMD + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + config BR2_INIT_NONE bool "None" select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT From peter at korsgaard.com Mon Feb 20 21:00:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:03 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-html-parser: bump version to 3.80 Message-ID: <20230220205229.B403B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e35750b5246e1cd7bce0c53b6e32cca592c4f3ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Updated license hash due to typo/whitespace-only fixes in license file: https://github.com/libwww-perl/HTML-Parser/commit/96192e7cb1f31559e8ad834fd5d7642d04e35f65#diff-c693279643b8cd5d248172d9c22cb7cf4ed163a3c98c8a3f69c2717edd3eacb7 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-html-parser/perl-html-parser.hash | 6 +++--- package/perl-html-parser/perl-html-parser.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-html-parser/perl-html-parser.hash b/package/perl-html-parser/perl-html-parser.hash index 36b094a7cb..ccd115d6c9 100644 --- a/package/perl-html-parser/perl-html-parser.hash +++ b/package/perl-html-parser/perl-html-parser.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 60e266d5a07fbea671a0383dd8af7b6c HTML-Parser-3.76.tar.gz -sha256 64d9e2eb2b420f1492da01ec0e6976363245b4be9290f03f10b7d2cb63fa2f61 HTML-Parser-3.76.tar.gz +md5 8e7151d08f30457a2ba80020b936285f HTML-Parser-3.80.tar.gz +sha256 63411db03016747e37c2636db11b05f8cc71608ef5bff36d04ddb0dc92f7835b HTML-Parser-3.80.tar.gz # computed by scancpan -sha256 0e57338bc10d5fb8891012ebee65a7b504b247f5bb485e121b8b48d7a118a60b LICENSE +sha256 9081922eb873ec1809c20672a7385a65f3c6b1163166bf69b2bbe986fb5b0159 LICENSE diff --git a/package/perl-html-parser/perl-html-parser.mk b/package/perl-html-parser/perl-html-parser.mk index 097564dbcb..1e1f8e6050 100644 --- a/package/perl-html-parser/perl-html-parser.mk +++ b/package/perl-html-parser/perl-html-parser.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTML_PARSER_VERSION = 3.76 +PERL_HTML_PARSER_VERSION = 3.80 PERL_HTML_PARSER_SOURCE = HTML-Parser-$(PERL_HTML_PARSER_VERSION).tar.gz PERL_HTML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTML_PARSER_LICENSE = Artistic or GPL-1.0+ From arnout at mind.be Tue Feb 7 21:51:22 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:22 +0100 Subject: [Buildroot] [git commit branch/next] package/systemd: bump to version 252.4 Message-ID: <20230220205253.D9DA78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2c823d1f548d5a0120d27d6c000603192360f7b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Following files changed *license* from CC0-1.0 to MIT-0: - src/systemctl/systemd-sysv-install.SKELETON - config files - examples under /network The file LICENSES/MIT-0.txt has been added for this reason, hashes added, corrected for LICENSES/README.md. Kernel version 3.15 is now the bare minimum, but only version 4.15 and higher are fully supported and tested: - bump kernel header dependencies - correct kconfig description - improvements to make the kconfig description better reflect the information from the README Set new options to their default, remove -Defi-cc option. Set -Ddbus=false to ensure dbus dependency is runtime only. Set -Ddbus-interfaces-dir=no as interface XML file generation is not supported when cross compiling. Set -Ddefault-user-shell=/bin/sh to the always available shell. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/systemd/Config.in | 12 +++++++++--- package/systemd/systemd.hash | 5 +++-- package/systemd/systemd.mk | 16 ++++++++++++++-- system/Config.in | 6 +++--- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 33ac03e584..0d4147840d 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on !BR2_STATIC_LIBS # kmod depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV @@ -51,7 +51,11 @@ menuconfig BR2_PACKAGE_SYSTEMD an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. - Systemd requires a Linux kernel >= 3.13 with the following + Kernel versions below 4.15 ("recommended baseline") have + significant gaps in functionality and are not recommended + for use with this version of systemd. + + Systemd requires a Linux kernel >= 3.15 with the following options enabled: - CONFIG_DEVTMPFS @@ -66,9 +70,11 @@ menuconfig BR2_PACKAGE_SYSTEMD - CONFIG_PROC_FS - CONFIG_FHANDLE (libudev, mount and bind mount handling) - - CONFIG_NET_NS (needed by PrivateNetwork=, used in some + - CONFIG_NET_NS (Required for PrivateNetwork=, used in some systemd units) + - CONFIG_USER_NS (Required for PrivateUsers=) + - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS - CONFIG_TMPFS_POSIX_ACL - CONFIG_TMPFS_XATTR diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 3b98566f32..00c08edcd9 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 638a2fc78828765fc97bc73f428205b6dc1d359149b6c6bfe4d2a649cba2cca8 systemd-250.8.tar.gz +sha256 cf2d27e67663d599a045101c7178cf0ec63d9df2962a54adf7de0d0357724f00 systemd-252.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt @@ -8,7 +8,8 @@ sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENS sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 LICENSES/LGPL-2.0-or-later.txt sha256 5bcef4fedbfc08776630e65d5d0d074dd31208037eddb167ca46a9ec4f737764 LICENSES/Linux-syscall-note.txt sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENSES/lookup3-public-domain.txt +sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENSES/MIT-0.txt sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md +sha256 da9b2c7b8cd10516fd2c4279b82496ea61787148f13e899c62fc8988c5fac34f LICENSES/README.md diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index f191542866..a38eeba1a8 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.8 +SYSTEMD_VERSION = 252.4 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ @@ -29,6 +29,7 @@ SYSTEMD_LICENSE = \ BSD-3-Clause (tools/chromiumos), \ CC0-1.0 (few source files, see LICENSES/README.md), \ GPL-2.0 with Linux-syscall-note (linux kernel headers), \ + MIT-0 (few source files, see LICENSES/README.md), \ MIT (few source files, see LICENSES/README.md), \ OFL-1.1 (Heebo fonts) SYSTEMD_LICENSE_FILES = \ @@ -40,6 +41,7 @@ SYSTEMD_LICENSE_FILES = \ LICENSES/LGPL-2.0-or-later.txt \ LICENSES/Linux-syscall-note.txt \ LICENSES/lookup3-public-domain.txt \ + LICENSES/MIT-0.txt \ LICENSES/MIT.txt \ LICENSES/murmurhash2-public-domain.txt \ LICENSES/OFL-1.1.txt \ @@ -61,7 +63,13 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ + -Ddbus=false \ + -Ddbus-interfaces-dir=no \ + -Ddefault-compression='auto' \ -Ddefault-hierarchy=unified \ + -Ddefault-locale='C.UTF-8' \ + -Ddefault-user-shell=/bin/sh \ + -Dfirst-boot-full-preset=false \ -Didn=true \ -Dima=false \ -Dkexec-path=/usr/sbin/kexec \ @@ -72,6 +80,7 @@ SYSTEMD_CONF_OPTS += \ -Dman=false \ -Dmount-path=/usr/bin/mount \ -Dmode=release \ + -Dnspawn-locale='C.UTF-8' \ -Dnss-systemd=true \ -Dquotacheck-path=/usr/sbin/quotacheck \ -Dquotaon-path=/usr/sbin/quotaon \ @@ -82,6 +91,7 @@ SYSTEMD_CONF_OPTS += \ -Dsulogin-path=/usr/sbin/sulogin \ -Dsystem-gid-max=999 \ -Dsystem-uid-max=999 \ + -Dsysupdate=false \ -Dsysvinit-path= \ -Dsysvrcnd-path= \ -Dtelinit-path= \ @@ -558,7 +568,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi SYSTEMD_CONF_OPTS += \ -Defi=true \ -Dgnu-efi=true \ - -Defi-cc=$(TARGET_CC) \ -Defi-ld=bfd \ -Defi-libdir=$(STAGING_DIR)/usr/lib \ -Defi-includedir=$(STAGING_DIR)/usr/include/efi @@ -798,6 +807,8 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dbinfmt=false \ -Drepart=false \ -Dcoredump=false \ + -Ddbus=false \ + -Ddbus-interfaces-dir=no \ -Dpstore=false \ -Doomd=false \ -Dlogind=false \ @@ -806,6 +817,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dmachined=false \ -Dportabled=false \ -Dsysext=false \ + -Dsysupdate=false \ -Duserdb=false \ -Dhomed=false \ -Dnetworkd=false \ diff --git a/system/Config.in b/system/Config.in index deb464f4d0..6100d965e7 100644 --- a/system/Config.in +++ b/system/Config.in @@ -124,19 +124,19 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5" +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_HAS_SSP || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 From peter at korsgaard.com Mon Feb 20 21:00:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:04 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-file-listing: bump version to 6.15 Message-ID: <20230220205229.A2411828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57a907fb3b1c303c2402268450616a13f8571a5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Updated license hash due to typo/whitespace-only fixes in license file. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-file-listing/perl-file-listing.hash | 6 +++--- package/perl-file-listing/perl-file-listing.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-file-listing/perl-file-listing.hash b/package/perl-file-listing/perl-file-listing.hash index 2358965714..cb52c127cd 100644 --- a/package/perl-file-listing/perl-file-listing.hash +++ b/package/perl-file-listing/perl-file-listing.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 cf60a79563185391831613178a79b4cd File-Listing-6.14.tar.gz -sha256 15b3a4871e23164a36f226381b74d450af41f12cc94985f592a669fcac7b48ff File-Listing-6.14.tar.gz +md5 8ba34641a6c5a2ec1b0bf7064f68c535 File-Listing-6.15.tar.gz +sha256 46c4fb9f9eb9635805e26b7ea55b54455e47302758a10ed2a0b92f392713770c File-Listing-6.15.tar.gz # computed by scancpan -sha256 7f0ccec295e6d7d2be1439cedd7caf6cc6247191f4c10ac56d91ee9bc265ba02 LICENSE +sha256 287e6f0fdf2db790a24975b492cde64b210c16af7137f44373cbd03fcf844212 LICENSE diff --git a/package/perl-file-listing/perl-file-listing.mk b/package/perl-file-listing/perl-file-listing.mk index 61bbc18eb8..c8584ffa8a 100644 --- a/package/perl-file-listing/perl-file-listing.mk +++ b/package/perl-file-listing/perl-file-listing.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_FILE_LISTING_VERSION = 6.14 +PERL_FILE_LISTING_VERSION = 6.15 PERL_FILE_LISTING_SOURCE = File-Listing-$(PERL_FILE_LISTING_VERSION).tar.gz PERL_FILE_LISTING_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PL/PLICEASE PERL_FILE_LISTING_LICENSE = Artistic or GPL-1.0+ From peter at korsgaard.com Sat Feb 11 22:20:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:20:15 +0100 Subject: [Buildroot] [git commit branch/next] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 Message-ID: <20230220205258.7A72186495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8f0c02574b485e3250030d8cbf5c057ced578a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003321.html Fixes CVE-2023-0494: https://lists.x.org/archives/xorg-announce/2023-February/003320.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 0c3c807ff3..e2a2a251c3 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003310.html -sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz -sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003321.html +sha256 d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb xorg-server-21.1.7.tar.xz +sha512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5 xorg-server-21.1.7.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 04eb5e90b7..33b35b7979 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.6 +XSERVER_XORG_SERVER_VERSION = 21.1.7 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From yann.morin.1998 at free.fr Mon Feb 20 21:00:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:49 -0000 Subject: [Buildroot] [git commit branch/next] package/python-canopen: bump to version 2.1.0 Message-ID: <20230220205234.0AAE0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7be2ff33abdd049dc3670c5a6e2e385c1fba6f41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Verified license remains MIT after hash changed. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-canopen/python-canopen.hash | 6 +++--- package/python-canopen/python-canopen.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-canopen/python-canopen.hash b/package/python-canopen/python-canopen.hash index 610dca3f34..e6485e72f0 100644 --- a/package/python-canopen/python-canopen.hash +++ b/package/python-canopen/python-canopen.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/canopen/json -md5 0719b73bd8ccaeaa9fb758c5338fd030 canopen-2.0.0.tar.gz -sha256 bcc8aa9ea83f7ada5da0dade81038977be52a93802c2657649729eb1f82065d9 canopen-2.0.0.tar.gz +md5 d51443bdc8a55faea63c9da82196dd47 canopen-2.1.0.tar.gz +sha256 bc126bb1dcb62e3b34d8a12e38a07b5aa8319c17457c9bfe208f0bbbda90ff61 canopen-2.1.0.tar.gz # Locally computed sha256 checksums -sha256 0740d30978affcd91c0fc817b7cf942a332381bf0380fe17e60c6a0b377c6e0d LICENSE.txt +sha256 d9035caf7b8b135899da92a2730e2ac2e9f5ae3220dc98bd661be18045fcf689 LICENSE.txt diff --git a/package/python-canopen/python-canopen.mk b/package/python-canopen/python-canopen.mk index bd0a3bfba7..a0f5220ded 100644 --- a/package/python-canopen/python-canopen.mk +++ b/package/python-canopen/python-canopen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CANOPEN_VERSION = 2.0.0 +PYTHON_CANOPEN_VERSION = 2.1.0 PYTHON_CANOPEN_SOURCE = canopen-$(PYTHON_CANOPEN_VERSION).tar.gz -PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/9e/d6/6ced4b410b904aeee5f7d0227187eae95a5ad769f01014a74fc0e016845e +PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/29/d1/54462c949c384b1a9a2bd260143a8ec6f4259a18d119bd122e8f8a791b50 PYTHON_CANOPEN_SETUP_TYPE = setuptools PYTHON_CANOPEN_LICENSE = MIT PYTHON_CANOPEN_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Sun Feb 12 08:28:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:28:57 +0100 Subject: [Buildroot] [git commit branch/next] package/re2: bump to version 2023-02-01 Message-ID: <20230220205258.8FAFB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d758b054b496619999e03c60c63b6636d818f3e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 9019867db4..a39dece7a9 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 665b65b6668156db2b46dddd33405cd422bd611352c5052ab3dae6a5fbac5506 re2-2022-12-01.tar.gz +sha256 cbce8b7803e856827201a132862e41af386e7afd9cc6d9a9bc7a4fa4d8ddbdde re2-2023-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 07bb9378de..5587366b1f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2022-12-01 +RE2_VERSION = 2023-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:00:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:50 -0000 Subject: [Buildroot] [git commit branch/next] package/python-crontab: bump to version 2.7.1 Message-ID: <20230220205234.1C4B486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3030baaa67dcafcc9f2c0802278c51f2ea016936 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-crontab/python-crontab.hash | 4 ++-- package/python-crontab/python-crontab.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-crontab/python-crontab.hash b/package/python-crontab/python-crontab.hash index b3aa96fc1b..d9519096df 100644 --- a/package/python-crontab/python-crontab.hash +++ b/package/python-crontab/python-crontab.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-crontab/json -md5 2982bdce2d9b7789f32da649a9507c4b python-crontab-2.6.0.tar.gz -sha256 1e35ed7a3cdc3100545b43e196d34754e6551e7f95e4caebbe0e1c0ca41c2f1b python-crontab-2.6.0.tar.gz +md5 0a71aa83eed18752c2850632d84cfd89 python-crontab-2.7.1.tar.gz +sha256 b21af4647c7bbb848fef2f020616c6b0289dcb9f94b4f991a55310ff9bec5749 python-crontab-2.7.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/python-crontab/python-crontab.mk b/package/python-crontab/python-crontab.mk index 9b29e11ccd..1c2802ef61 100644 --- a/package/python-crontab/python-crontab.mk +++ b/package/python-crontab/python-crontab.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CRONTAB_VERSION = 2.6.0 -PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/06/b0/c270a1b5c83d9e0f83ab654d3153c39d80f61ba49fefde50fd23ab351381 +PYTHON_CRONTAB_VERSION = 2.7.1 +PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/6a/b6/94d861e868698b8e3f288f7e4684e30535b0d9a6b38316ee0a3d4d31e6ae PYTHON_CRONTAB_SETUP_TYPE = setuptools PYTHON_CRONTAB_LICENSE = LGPL-3.0+ PYTHON_CRONTAB_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 12 08:38:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:38:54 +0100 Subject: [Buildroot] [git commit branch/next] support/download: catch post-process errors Message-ID: <20230220205258.99B4086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a39116b5dba6cf0695620e2ba5302f21fa80a4a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/12a/12a63ae177fe3ed0c9a1ef2fa01870f334f36b0f/ Currently, when the post-process helper fails while downloading from upstream, there is no fallback to the backup mirror. In case the post-process helper fails, we must consider that to be a download failure, so we must bail out as if the download backend itself did fail, but we fail to do so. Duplicate the logic we have for the download helper: if the post-process helper fails, remove the downloaded stuff, and continue on to the next URI, which will ultimately hit the backup mirror (if one has been configured). Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/download/dl-wrapper | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 09a6ac1f1a..1e8d6058f6 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -138,9 +138,15 @@ main() { fi if [ -n "${post_process}" ] ; then - "${OLDPWD}/support/download/${post_process}-post-process" \ - -o "${tmpf}" \ - -n "${raw_base_name}" + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + then + # cd back to keep path coherence + cd "${OLDPWD}" + rm -rf "${tmpd}" + continue + fi fi # cd back to free the temp-dir, so we can remove it later From yann.morin.1998 at free.fr Mon Feb 20 21:00:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:51 -0000 Subject: [Buildroot] [git commit branch/next] package/python-dbus-fast: bump to version 1.84.0 Message-ID: <20230220205234.43095828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f29c7f18d6267e65863aedb6d0c515cf8f9404f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-dbus-fast/python-dbus-fast.hash | 4 ++-- package/python-dbus-fast/python-dbus-fast.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dbus-fast/python-dbus-fast.hash b/package/python-dbus-fast/python-dbus-fast.hash index f0dceeb43d..e9a3992f8e 100644 --- a/package/python-dbus-fast/python-dbus-fast.hash +++ b/package/python-dbus-fast/python-dbus-fast.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dbus-fast/json -md5 eebf2c558dd1af0f8f32b361e91f2fa3 dbus_fast-1.61.1.tar.gz -sha256 bda4a7d559047b74f409eda278f68f610a418e86ad3efa0368fa2ed240daa6b6 dbus_fast-1.61.1.tar.gz +md5 21e3675168e3dbe807c6c8a29267241f dbus_fast-1.84.0.tar.gz +sha256 d64f1b68c1c81268e846471caeb9264a9306a6c6ad356c30d5cdf7d1ecc251a1 dbus_fast-1.84.0.tar.gz # Locally computed sha256 checksums sha256 c37e9c75110e01d1f0c5360dc7d7776a30ac5f70d2440db214423e4b7a77a6af LICENSE diff --git a/package/python-dbus-fast/python-dbus-fast.mk b/package/python-dbus-fast/python-dbus-fast.mk index de7049ba22..9dd88f613f 100644 --- a/package/python-dbus-fast/python-dbus-fast.mk +++ b/package/python-dbus-fast/python-dbus-fast.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DBUS_FAST_VERSION = 1.61.1 +PYTHON_DBUS_FAST_VERSION = 1.84.0 PYTHON_DBUS_FAST_SOURCE = dbus_fast-$(PYTHON_DBUS_FAST_VERSION).tar.gz -PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/dd/f4/a280d46b119d59f6a3d84abf474452ae76651558b0963ab8c48ae13b5a44 +PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/81/67/a83522d6692a72911c3586e2fcd2363ce22d1522a7e17e1012f255a6083b PYTHON_DBUS_FAST_SETUP_TYPE = setuptools PYTHON_DBUS_FAST_LICENSE = MIT PYTHON_DBUS_FAST_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Feb 12 20:03:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 21:03:01 +0100 Subject: [Buildroot] [git commit branch/next] package/log4cplus: bump to version 2.1.0 Message-ID: <20230220205258.BD4158648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bb77eb8f14585bc79307fd672cab79b7e4e476d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/log4cplus/log4cplus/blob/REL_2_1_0/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/log4cplus/log4cplus.hash | 2 +- package/log4cplus/log4cplus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/log4cplus/log4cplus.hash b/package/log4cplus/log4cplus.hash index c4540c9d56..1779b30949 100644 --- a/package/log4cplus/log4cplus.hash +++ b/package/log4cplus/log4cplus.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f5949e713cf8635fc554384ab99b04716e3430f28eed6dd7d71ad03d959b91a0 log4cplus-2.0.8.tar.xz +sha256 d84ac8b1c46645122fbf72691f8eacef68c71b587403ee833bd9a252e06d46cc log4cplus-2.1.0.tar.xz sha256 91d7e42ff80e74c4c94e5ad353375fa0358cd0abbf43f5fe957097cdbd4e2c4d LICENSE diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk index 2dab661654..28eb4ed8f4 100644 --- a/package/log4cplus/log4cplus.mk +++ b/package/log4cplus/log4cplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOG4CPLUS_VERSION = 2.0.8 +LOG4CPLUS_VERSION = 2.1.0 LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION) LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) From yann.morin.1998 at free.fr Mon Feb 20 21:00:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:52 -0000 Subject: [Buildroot] [git commit branch/next] package/python-dicttoxml: bump to version 1.7.16 Message-ID: <20230220205234.526C886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc457e3d320bea68eac1bab8bd759c1ba0f7b40b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-dicttoxml/python-dicttoxml.hash | 4 ++-- package/python-dicttoxml/python-dicttoxml.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dicttoxml/python-dicttoxml.hash b/package/python-dicttoxml/python-dicttoxml.hash index dcde7cf1b6..1c94d3446a 100644 --- a/package/python-dicttoxml/python-dicttoxml.hash +++ b/package/python-dicttoxml/python-dicttoxml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dicttoxml/json -md5 234550e3aa875c6f3520aa9a2dff1ef1 dicttoxml-1.7.15.tar.gz -sha256 5540fe7dfde2d2ed9467e67fcc981cbd2e164dc3120c862bdb7333202ac48838 dicttoxml-1.7.15.tar.gz +md5 f4853a05c41f9056172447d4e59517b9 dicttoxml-1.7.16.tar.gz +sha256 6f36ce644881db5cd8940bee9b7cb3f3f6b7b327ba8a67d83d3e2caa0538bf9d dicttoxml-1.7.16.tar.gz # Locally computed sha256 checksums sha256 4514114bd9da0b2fbf8c4fa264c0e6cc80fd41e6ac7f09d7a39a215662951c7c LICENCE.txt diff --git a/package/python-dicttoxml/python-dicttoxml.mk b/package/python-dicttoxml/python-dicttoxml.mk index 3e5f90e9de..c26c16b72a 100644 --- a/package/python-dicttoxml/python-dicttoxml.mk +++ b/package/python-dicttoxml/python-dicttoxml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DICTTOXML_VERSION = 1.7.15 +PYTHON_DICTTOXML_VERSION = 1.7.16 PYTHON_DICTTOXML_SOURCE = dicttoxml-$(PYTHON_DICTTOXML_VERSION).tar.gz -PYTHON_DICTTOXML_SITE = https://files.pythonhosted.org/packages/45/b5/efa170fd88e8b8bc025c59592eade0fb7de6ae02ed3dd63957956adc1396 +PYTHON_DICTTOXML_SITE = https://files.pythonhosted.org/packages/ee/c9/3132427f9e64d572688e6a1cbe3d542d1a03f676b81fb600f3d1fd7d2ec5 PYTHON_DICTTOXML_SETUP_TYPE = distutils PYTHON_DICTTOXML_LICENSE = GPL-2.0 PYTHON_DICTTOXML_LICENSE_FILES = LICENCE.txt From yann.morin.1998 at free.fr Sun Feb 12 20:20:30 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:20:30 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Julien Olivain for z3 runtime test files Message-ID: <20230220205258.D2FD486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0dc2fa3865b0dbb2a6c103d6bc3bbc294ada604 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index ece0d986ae..dcc607ba60 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1724,6 +1724,7 @@ F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py +F: support/testing/tests/package/test_z3/ N: Julien Viard de Galbert F: package/dieharder/ From yann.morin.1998 at free.fr Mon Feb 20 21:00:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:54 -0000 Subject: [Buildroot] [git commit branch/next] package/python-filelock: bump to version 3.9.0 Message-ID: <20230220205234.6F4C0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b88d0f7b9775db73da55504f3968bc0ff25687a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate from setuptools to hatchling pep517 build backend. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-filelock/python-filelock.hash | 4 ++-- package/python-filelock/python-filelock.mk | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-filelock/python-filelock.hash b/package/python-filelock/python-filelock.hash index f9e6bc03e8..4ef7afed00 100644 --- a/package/python-filelock/python-filelock.hash +++ b/package/python-filelock/python-filelock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/filelock/json -md5 d66099b8823ebbdd980cde0dae8f7341 filelock-3.8.2.tar.gz -sha256 7565f628ea56bfcd8e54e42bdc55da899c85c1abfe1b5bcfd147e9188cebb3b2 filelock-3.8.2.tar.gz +md5 40eeb4a2963e1b07b8eab12b5db08418 filelock-3.9.0.tar.gz +sha256 7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de filelock-3.9.0.tar.gz # Locally computed sha256 checksums sha256 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd LICENSE diff --git a/package/python-filelock/python-filelock.mk b/package/python-filelock/python-filelock.mk index 86f1220b54..02759935ad 100644 --- a/package/python-filelock/python-filelock.mk +++ b/package/python-filelock/python-filelock.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_FILELOCK_VERSION = 3.8.2 +PYTHON_FILELOCK_VERSION = 3.9.0 PYTHON_FILELOCK_SOURCE = filelock-$(PYTHON_FILELOCK_VERSION).tar.gz -PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/d8/73/292d9ea2370840a163e6dd2d2816a571244e9335e2f6ad957bf0527c492f -PYTHON_FILELOCK_SETUP_TYPE = setuptools +PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/0b/dc/eac02350f06c6ed78a655ceb04047df01b02c6b7ea3fc02d4df24ca87d24 +PYTHON_FILELOCK_SETUP_TYPE = pep517 PYTHON_FILELOCK_LICENSE = Public Domain PYTHON_FILELOCK_LICENSE_FILES = LICENSE +PYTHON_FILELOCK_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs $(eval $(python-package)) From yann.morin.1998 at free.fr Sun Feb 12 20:30:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:30:05 +0100 Subject: [Buildroot] [git commit branch/next] package/opencv3: bump to version 3.4.19 Message-ID: <20230220205259.003C28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d40cab45e21cd1c66bfffa911b1310e29c321486 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This bump will fix the following build failure with gcc >= 12: /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp: In function 'bool base64::base64_valid(const uint8_t*, size_t, size_t)': /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp:167:31: error: comparing the result of pointer addition '(src + ((sizetype)off))' and NULL [-Werror=address] 167 | if (src == 0 || src + off == 0) | ~~~~~~~~~~^~~~ cc1plus: some warnings being treated as errors Update hash of LICENSE file (update in year: https://github.com/opencv/opencv/commit/f6fe5c07f61eb0bc934672200b2bfd453f2fc41d) https://github.com/opencv/opencv/wiki/ChangeLog#version3419 Fixes: - http://autobuild.buildroot.org/results/cb9c120c15c8042e6919858d6885c1cc4d996c0c Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/opencv3/opencv3.hash | 4 ++-- package/opencv3/opencv3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash index 30308188aa..3d6fd2ed8a 100644 --- a/package/opencv3/opencv3.hash +++ b/package/opencv3/opencv3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1353eec67849aadb20df71d8bae18b83708e18fc5da080fe5efeabb1e99b2ee8 opencv3-3.4.17.tar.gz -sha256 9076d3d934839a2f8e7bfe549abda6faea4751f1edd6e9460ff703559890ad5f LICENSE +sha256 9b913e74299ce4416a5c94000da577c592bf670fd53bad16220eb115a0821529 opencv3-3.4.19.tar.gz +sha256 c1fed9cd2f557ba23a1b37a21e2c90629d1a60bdb61e92d0e79369bb6fca3390 LICENSE diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 8e4c90786e..29fb246e65 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV3_VERSION = 3.4.17 +OPENCV3_VERSION = 3.4.19 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause From yann.morin.1998 at free.fr Mon Feb 20 21:01:01 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:01 -0000 Subject: [Buildroot] [git commit branch/next] package/python-posix-ipc: bump to version 1.1.1 Message-ID: <20230220205234.E6E76828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46d6bd7820622c67ed11ca09a1161a574f6af9e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-posix-ipc/python-posix-ipc.hash | 4 ++-- package/python-posix-ipc/python-posix-ipc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-posix-ipc/python-posix-ipc.hash b/package/python-posix-ipc/python-posix-ipc.hash index 74d2db0f5e..427e4c7b55 100644 --- a/package/python-posix-ipc/python-posix-ipc.hash +++ b/package/python-posix-ipc/python-posix-ipc.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/posix-ipc/json -md5 81baeabebd3e4064972ec62fd9eace0b posix_ipc-1.1.0.tar.gz -sha256 f86a15b32b38573c78e305ebd9100d8198a3d9facc03ffafe39edc35833738e3 posix_ipc-1.1.0.tar.gz +md5 523a31c4dbd56e0d4fd677f33e126e5d posix_ipc-1.1.1.tar.gz +sha256 e2456ba0cfb2ee5ba14121450e8d825b3c4a1461fca0761220aab66d4111cbb7 posix_ipc-1.1.1.tar.gz # Locally computed sha256 checksums sha256 2b58f0bf31a8cbd7e56bfef030e9f7f02758ce8a810d073ccf41753bdc2a0747 LICENSE diff --git a/package/python-posix-ipc/python-posix-ipc.mk b/package/python-posix-ipc/python-posix-ipc.mk index c25af9ecbd..bdd2f1d4af 100644 --- a/package/python-posix-ipc/python-posix-ipc.mk +++ b/package/python-posix-ipc/python-posix-ipc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_POSIX_IPC_VERSION = 1.1.0 +PYTHON_POSIX_IPC_VERSION = 1.1.1 PYTHON_POSIX_IPC_SOURCE = posix_ipc-$(PYTHON_POSIX_IPC_VERSION).tar.gz -PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/41/72/90b6702782921c0e3e0b10a66f2a47d8cfaf9c2255d763ab45cc8cea25eb +PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/07/7f/b954f224a226960a4aa98b6c5fa3d4f3fafb20bb8461446e41b563aee863 PYTHON_POSIX_IPC_LICENSE = BSD-3-Clause PYTHON_POSIX_IPC_LICENSE_FILES = LICENSE PYTHON_POSIX_IPC_SETUP_TYPE = setuptools From peter at korsgaard.com Tue Feb 14 17:11:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:11:38 +0100 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230220205259.998DF86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36a8be4770d93c0a4346008c56f6ab6862b9b509 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next 4.9.x / 6.0.x is now EOL. 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 774f1e0975..11dc5cce07 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.11" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" 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 e88abe5bb8..f797d5a61a 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,14 +1,14 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b linux-6.1.9.tar.xz +sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz -sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz -sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz +sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz +sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz +sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz -sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz +sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz +sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1146231e41..8a76f93d62 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -394,13 +394,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.304" if BR2_KERNEL_HEADERS_4_14 - default "4.19.271" if BR2_KERNEL_HEADERS_4_19 - default "5.4.230" if BR2_KERNEL_HEADERS_5_4 - default "5.10.166" if BR2_KERNEL_HEADERS_5_10 - default "5.15.91" if BR2_KERNEL_HEADERS_5_15 + default "4.14.305" if BR2_KERNEL_HEADERS_4_14 + default "4.19.272" if BR2_KERNEL_HEADERS_4_19 + default "5.4.231" if BR2_KERNEL_HEADERS_5_4 + default "5.10.167" if BR2_KERNEL_HEADERS_5_10 + default "5.15.93" if BR2_KERNEL_HEADERS_5_15 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 - default "6.1.9" if BR2_KERNEL_HEADERS_6_1 + default "6.1.11" if BR2_KERNEL_HEADERS_6_1 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 yann.morin.1998 at free.fr Mon Feb 20 21:01:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:02 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pygments: bump to version 2.14.0 Message-ID: <20230220205235.22D498648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1f426de2e67018d8b57c03457dbf1d719ac3b19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pygments/python-pygments.hash | 4 ++-- package/python-pygments/python-pygments.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pygments/python-pygments.hash b/package/python-pygments/python-pygments.hash index 610acb96d7..f7396cb3d6 100644 --- a/package/python-pygments/python-pygments.hash +++ b/package/python-pygments/python-pygments.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pygments/json -md5 6ccae578d28d18968b30a4711652fd9a Pygments-2.13.0.tar.gz -sha256 56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1 Pygments-2.13.0.tar.gz +md5 447be4afb076c8325a7dc659aff5b931 Pygments-2.14.0.tar.gz +sha256 b3ed06a9e8ac9a9aae5a6f5dbe78a8a58655d17b43b93c078f094ddc476ae297 Pygments-2.14.0.tar.gz # Locally computed sha256 checksums sha256 a9d66f1d526df02e29dce73436d34e56e8632f46c275bbdffc70569e882f9f17 LICENSE diff --git a/package/python-pygments/python-pygments.mk b/package/python-pygments/python-pygments.mk index c09350c42b..9c4f0be6c8 100644 --- a/package/python-pygments/python-pygments.mk +++ b/package/python-pygments/python-pygments.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYGMENTS_VERSION = 2.13.0 +PYTHON_PYGMENTS_VERSION = 2.14.0 PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/e0/ef/5905cd3642f2337d44143529c941cc3a02e5af16f0f65f81cbef7af452bb +PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/da/6a/c427c06913204e24de28de5300d3f0e809933f376e0b7df95194b2bb3f71 PYTHON_PYGMENTS_LICENSE = BSD-2-Clause PYTHON_PYGMENTS_LICENSE_FILES = LICENSE PYTHON_PYGMENTS_CPE_ID_VENDOR = pygments From peter at korsgaard.com Tue Feb 14 17:12:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:48 +0100 Subject: [Buildroot] [git commit branch/next] package/zabbix: bump to version 6.2.7 Message-ID: <20230220205259.CA5E5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89fa774a191d41ed5d125d87d812ff3478902251 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - host-pkgconf is now mandatory - switch to pcre2 which is supported since version 6.0.0 and https://github.com/zabbix/zabbix/commit/18917f919a68abc863a5c79ba88c0cb156255fdc - Update hash of README (links updated with https://github.com/zabbix/zabbix/commit/067f5f873fb18ae7b22c5eaef40f0898b98edeb5 https://github.com/zabbix/zabbix/commit/499dbc81b987513233d579610335b8938f1ae91d) https://github.com/zabbix/zabbix/blob/6.2.7/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/zabbix/Config.in | 2 +- package/zabbix/zabbix.hash | 4 ++-- package/zabbix/zabbix.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index 0f7a0b0003..377c0ff692 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ZABBIX bool "zabbix" depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Zabbix is an enterprise-class open source distributed monitoring solution. Zabbix is free of cost. Zabbix is diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash index 42cc0bda57..bb6127e5ec 100644 --- a/package/zabbix/zabbix.hash +++ b/package/zabbix/zabbix.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 19686628df76e8d5ef7c2ed2975b258c7ca3ec7d151b1bb59d7e132f9fc7c941 zabbix-5.4.9.tar.gz -sha256 10d68ec3abacc29222c07748fc5e5cb9474fd7cd9ccdde1b92ff941ded946b78 README +sha256 6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d zabbix-6.2.7.tar.gz +sha256 f8fc3fd12521b60d53d8c5d48a883eb3c9c5ddec9de986a273e1b77f69d811db README sha256 444fe54aecc95ac0f3314289c300afc73b3946a4dc9fbd7e022709b3e0924dd0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e00d693ba5..db9efed78b 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -4,8 +4,8 @@ # ################################################################################ -ZABBIX_VERSION_MAJOR = 5.4 -ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 +ZABBIX_VERSION_MAJOR = 6.2 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).7 ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING @@ -13,9 +13,8 @@ ZABBIX_CPE_ID_VENDOR = zabbix # We're patching m4/netsnmp.m4 ZABBIX_AUTORECONF = YES -ZABBIX_DEPENDENCIES = pcre +ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ - --with-libpcre=$(STAGING_DIR)/usr/bin/ \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \ From yann.morin.1998 at free.fr Mon Feb 20 21:01:04 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:04 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pysmb: bump to version 1.2.9 Message-ID: <20230220205235.5F6B5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ffc7b4bb1241eb64272aa78448aac35d67ff4ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pysmb/python-pysmb.hash | 2 +- package/python-pysmb/python-pysmb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pysmb/python-pysmb.hash b/package/python-pysmb/python-pysmb.hash index 025e47d030..87b1edf595 100644 --- a/package/python-pysmb/python-pysmb.hash +++ b/package/python-pysmb/python-pysmb.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9215356c446e4c6b335b4a481f52d746ff60926badfecbc33524b94908fdc0e1 pysmb-1.2.8.tar.gz +sha256 30558c11ba141e9ad26e5edb1b85b94813a335ed5c0fe11df8046942b0c7e813 pysmb-1.2.9.tar.gz sha256 8c487d5c10f024e44a9cf1df21d1fd28a80bd2dfddd9f1dcd109a47d721f497f LICENSE diff --git a/package/python-pysmb/python-pysmb.mk b/package/python-pysmb/python-pysmb.mk index 36993ce42c..394a9d806c 100644 --- a/package/python-pysmb/python-pysmb.mk +++ b/package/python-pysmb/python-pysmb.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYSMB_VERSION = 1.2.8 +PYTHON_PYSMB_VERSION = 1.2.9 PYTHON_PYSMB_SOURCE = pysmb-$(PYTHON_PYSMB_VERSION).tar.gz PYTHON_PYSMB_SITE = https://miketeo.net/files/Projects/pysmb PYTHON_PYSMB_LICENSE = Libpng From peter at korsgaard.com Tue Feb 14 17:14:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:57 +0100 Subject: [Buildroot] [git commit branch/next] package/sdl2: bump version to 2.26.3 Message-ID: <20230220205300.06E8481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=910aae1e23806fff74b16088c8975827e6664c2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update the license hash because of a change in copyright year: - Copyright (C) 1997-2022 Sam Lantinga + Copyright (C) 1997-2023 Sam Lantinga Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.hash | 6 +++--- package/sdl2/sdl2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 86e0d86e7c..e26dcee301 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.2.tar.gz.sig -sha256 95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0 SDL2-2.26.2.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.3.tar.gz.sig +sha256 c661205a553b7d252425f4b751ff13209e5e020b876bbfa1598494af61790057 SDL2-2.26.3.tar.gz # Locally calculated -sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt +sha256 9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 8995178e71..c01f12d12c 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.26.2 +SDL2_VERSION = 2.26.3 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From yann.morin.1998 at free.fr Mon Feb 20 21:01:05 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:05 -0000 Subject: [Buildroot] [git commit branch/next] package/{, python-py}mupdf: bump to version 1.21.1 Message-ID: <20230220205235.3174C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e52a5966ec9be07d846ca3a0264cbd892d256b53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/mupdf/mupdf.hash | 4 ++-- package/mupdf/mupdf.mk | 2 +- package/python-pymupdf/python-pymupdf.hash | 4 ++-- package/python-pymupdf/python-pymupdf.mk | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mupdf/mupdf.hash b/package/mupdf/mupdf.hash index 6785aa163a..ef91abee18 100644 --- a/package/mupdf/mupdf.hash +++ b/package/mupdf/mupdf.hash @@ -1,8 +1,8 @@ # From https://mupdf.com/downloads/index.html: -sha1 27d75cae256450abb9f50cd00b3e5a895fc684cf mupdf-1.21.0-source.tar.lz +sha1 f759d914ec6ad6a3b96f994630ff70b75823831b mupdf-1.21.1-source.tar.lz # Locally computed: -sha256 f23fc1ad9081375d9c5f2318d6e6e5c5be490ecb70b10ed7167932afbe1ccfb5 mupdf-1.21.0-source.tar.lz +sha256 66a43490676c7f7c2ff74067328ef13285506fcc758d365ae27ea3668bd5e620 mupdf-1.21.1-source.tar.lz # Hash for license files: sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index e93a41bd00..d6cc407c49 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -5,7 +5,7 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -MUPDF_VERSION = 1.21.0 +MUPDF_VERSION = 1.21.1 MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.lz MUPDF_SITE = https://mupdf.com/downloads/archive MUPDF_LICENSE = AGPL-3.0+ diff --git a/package/python-pymupdf/python-pymupdf.hash b/package/python-pymupdf/python-pymupdf.hash index d930d04335..bda356d905 100644 --- a/package/python-pymupdf/python-pymupdf.hash +++ b/package/python-pymupdf/python-pymupdf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymupdf/json -md5 ae24d77d44369e46bbcd5457fe97d776 PyMuPDF-1.21.0.tar.gz -sha256 a63dfc289e127a16ab60310ee6005fe83121c7a97f7c120db688f9281c9e5d0f PyMuPDF-1.21.0.tar.gz +md5 be10963679ac6d52b7aed2311ca7e3c5 PyMuPDF-1.21.1.tar.gz +sha256 f815741a435c62a0036bbcbf5fa6c533567bd69c5338d413714fc57b22db93e0 PyMuPDF-1.21.1.tar.gz # Locally computed sha256 checksums sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index 38212dc44b..70448e8d90 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -5,9 +5,9 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -PYTHON_PYMUPDF_VERSION = 1.21.0 +PYTHON_PYMUPDF_VERSION = 1.21.1 PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz -PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/61/14/632eefe5568ee7a4ec95aa7fc9c63996ff6a6d2464d4e3a9dc35da11a409 +PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/30/44/9fce79689e5df7deebe2d17cb2b9b2a6b888439c241e71296e732aefa649 PYTHON_PYMUPDF_SETUP_TYPE = setuptools PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING From peter at korsgaard.com Tue Feb 14 17:15:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:11 +0100 Subject: [Buildroot] [git commit branch/next] package/gnuplot: bump version to 5.4.6 Message-ID: <20230220205300.1187C86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df50979e7bf0ff7f0b8a2461ed7ae9dbd103d836 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard --- package/gnuplot/gnuplot.hash | 8 ++++---- package/gnuplot/gnuplot.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index 1ee6b53694..de0741d609 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.5/ -md5 c10cf81faa69d77e255a1dcfc625ba78 gnuplot-5.4.5.tar.gz -sha1 1179a768fd5f585a5dcb6aedea76cfa7a8dd5dfe gnuplot-5.4.5.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.6/ +md5 da719235bb2f46830f9d2101d04b14a5 gnuplot-5.4.6.tar.gz +sha1 31ea0c00af5c156e5d068e3b1cc2fb1847f471ab gnuplot-5.4.6.tar.gz # Locally computed -sha256 66f679115dd30559e110498fc94d926949d4d370b4999a042e724b8e910ee478 gnuplot-5.4.5.tar.gz +sha256 02fc27918200ed64d8f0c3b84fe81b95b59cd47ad99f270939ae497c19f27419 gnuplot-5.4.6.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 1ee49cb6ce..c49fbc497d 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.5 +GNUPLOT_VERSION = 5.4.6 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright From peter at korsgaard.com Tue Feb 14 17:15:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:15:39 +0100 Subject: [Buildroot] [git commit branch/next] package/libmdbx: bump version to 0.11.14 "Sergey Kapitsa" Message-ID: <20230220205300.1C75286496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efdcc850be902de2596412dbf0f142c3f679ce35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This is stable bugfix release of libmdbx, in memory of Sergey Kapitsa (Russian physicist and demographer) on his 95th birthday. It is reasonable to backport this patch to all applicable releases/branches of Buildroot, at least this release fixes build for sh4 arch. Release notes for v0.11.14 -------------------------- Fixes: - backport: Refined the `__cold`/`__hot` macros to avoid the `error: inlining failed in call to ???always_inline FOO(...)???: target specific option mismatch` issue during build using GCC >10.x for SH4 arch. Actually this is GCC' SH4-backend bug which triggered by the `__attribute__((__optimize__("Os")))` used in conjunction with the `__attribute__((__cold__))`. - backport: Fixed `SIGSEGV` or an erroneous call to `free()` in case where errors occur when reopening by `mdbx_env_open()` of a previously used environment. - backport: Fixed `cursor_put_nochecklen()` internals for case when dupsort'ed named subDb contains a single key with multiple values (aka duplicates), which are replaced with a single value by put-operation with the `MDBX_UPSERT+MDBX_ALLDUPS` flags. In this case, the database becomes completely empty, without any pages. However exactly this condition was not considered and thus wasn't handled correctly. See [issue#8](https://gitflic.ru/project/erthink/libmdbx/issue/8) for more information. - backport: Fixed extra assertion inside `override_meta()`, which could lead to false-positive failing of the assertion in a debug builds during DB recovery and/or auto-rollback. Minors: - backport: Fixed typos. - backport: Refined `const` and `noexcept` for few C++ API methods. - backport: Resolve false-posirive `used uninitialized` warning from GCC >10.x while build for SH4 arch. - backport: Fixed insignificant typo of `||` inside `#if` byte-order condition. The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md Signed-off-by: ???????????? ?????????? (Leonid Yuriev) Signed-off-by: Peter Korsgaard --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index e3fb309461..b1a2891b91 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 9449fd357119e19902363ab90134d82c9a713b706394c2a1389b5bb4787b5164 libmdbx-amalgamated-0.11.13.tar.xz +sha256 97b03965b5b61727dc4232c50ccb174c632470a3d24438b3c52315bef6fb4033 libmdbx-amalgamated-0.11.14.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index a139e062f6..5e7995f8c8 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.13 +LIBMDBX_VERSION = 0.11.14 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From yann.morin.1998 at free.fr Mon Feb 20 21:01:06 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:06 -0000 Subject: [Buildroot] [git commit branch/next] package/python-scapy: bump to version 2.5.0 Message-ID: <20230220205235.93DCD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c2d7e401296e4b17ba9c6d521eca62eaff15159 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-scapy/python-scapy.hash | 4 ++-- package/python-scapy/python-scapy.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-scapy/python-scapy.hash b/package/python-scapy/python-scapy.hash index 4dccffd39a..7b21e6cb30 100644 --- a/package/python-scapy/python-scapy.hash +++ b/package/python-scapy/python-scapy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/scapy/json -md5 54072af118e9291b6c7898b4ea87cdaf scapy-2.4.5.tar.gz -sha256 bc707e3604784496b6665a9e5b2a69c36cc9fb032af4864b29051531b24c8593 scapy-2.4.5.tar.gz +md5 f546b1c82c2c98e0dae1a436219dd042 scapy-2.5.0.tar.gz +sha256 5b260c2b754fd8d409ba83ee7aee294ecdbb2c235f9f78fe90bc11cb6e5debc2 scapy-2.5.0.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-scapy/python-scapy.mk b/package/python-scapy/python-scapy.mk index 9cf17db671..a2c6cc6872 100644 --- a/package/python-scapy/python-scapy.mk +++ b/package/python-scapy/python-scapy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCAPY_VERSION = 2.4.5 +PYTHON_SCAPY_VERSION = 2.5.0 PYTHON_SCAPY_SOURCE = scapy-$(PYTHON_SCAPY_VERSION).tar.gz -PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/85/47/c919432ca258f354bb2c1e645623f891603f185bfc7563d4a21f6432e7ed +PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/67/a1/2a60d5b6f0fed297dd0c0311c887d5e8a30ba1250506585b897e5a662f4c PYTHON_SCAPY_SETUP_TYPE = setuptools PYTHON_SCAPY_LICENSE = GPL-2.0 PYTHON_SCAPY_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 15 09:14:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:14:25 +0100 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: bump to version 2.0.9 Message-ID: <20230220205300.328BA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=656af31891cc68eb8b27866cb9e9a7ca428a2b16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Release Notes: https://fluentbit.io/announcements/v2.0.9/ - Patch dropped, as it is upstream: https://github.com/fluent/fluent-bit/commit/7bcb502ebdcd647d6b83c972805e734ad522eb1a Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...-CMakeLists.txt-only-require-a-C-compiler.patch | 27 ---------------------- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch b/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch deleted file mode 100644 index e71bcf0c0d..0000000000 --- a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7bcb502ebdcd647d6b83c972805e734ad522eb1a Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 30 Jan 2023 09:10:37 +0100 -Subject: [PATCH] CMakeLists.txt: only require a C compiler - -Fluent-bit is mostly written in C, -so don't require CXX in the top-level project. - -Signed-off-by: Thomas Devoogdt ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7adb02de..3ff7360d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.12) --project(fluent-bit) -+project(fluent-bit C) - - # CMP0069 ensures that LTO is enabled for all compilers - cmake_policy(SET CMP0069 NEW) --- -2.30.2 - diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index ce7cea7b59..0caadcd56f 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8ff5566389033669feabc9c69a5c6f417dad5c8b066454388e6a706507262acf fluent-bit-2.0.8.tar.gz +sha256 393ad4a6ced48c327607653d610ef273843085a17b6e5c8013877abdf31e6945 fluent-bit-2.0.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 13077e53cc..c10ef613d7 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.0.8 +FLUENT_BIT_VERSION = 2.0.9 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:01:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:07 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pyspnego: bump to version 0.7.0 Message-ID: <20230220205235.6CA1C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc64eb6d1238515b4c53b2b34d89fc3bd09fb59b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyspnego/python-pyspnego.hash | 4 ++-- package/python-pyspnego/python-pyspnego.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyspnego/python-pyspnego.hash b/package/python-pyspnego/python-pyspnego.hash index 400e380b5d..0ae6cf1d4e 100644 --- a/package/python-pyspnego/python-pyspnego.hash +++ b/package/python-pyspnego/python-pyspnego.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pyspnego/json -md5 67114f5e59c6d5b45fe2b38c128c2140 pyspnego-0.6.3.tar.gz -sha256 6060a0e683171090adcf92c9d319ddd334f15117fa199a703d8c9bd094d9f6c0 pyspnego-0.6.3.tar.gz +md5 93ab1a088d65e6a7c97efdb567ba37b0 pyspnego-0.7.0.tar.gz +sha256 da78096fd7c9f40e716f6fbe3e30d913103d75fd676f839f98fc3a6fee92fbe3 pyspnego-0.7.0.tar.gz # Locally computed sha256 286517c93031c343f809f64b38563a783614b762e1367242af6cdd4107335471 LICENSE diff --git a/package/python-pyspnego/python-pyspnego.mk b/package/python-pyspnego/python-pyspnego.mk index 0910c57b7d..2fbb779d98 100644 --- a/package/python-pyspnego/python-pyspnego.mk +++ b/package/python-pyspnego/python-pyspnego.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYSPNEGO_VERSION = 0.6.3 +PYTHON_PYSPNEGO_VERSION = 0.7.0 PYTHON_PYSPNEGO_SOURCE = pyspnego-$(PYTHON_PYSPNEGO_VERSION).tar.gz -PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/ba/13/7b4e7dcff1eb24a13e0a631a4b49eab361678e4490d691c03253ae736da4 +PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/97/f3/bdf3cd5f4c5a1bf9e1d4bb771c133850ee08241c18cafd90a6d872937a9f PYTHON_PYSPNEGO_SETUP_TYPE = setuptools PYTHON_PYSPNEGO_LICENSE = MIT PYTHON_PYSPNEGO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:05 +0100 Subject: [Buildroot] [git commit branch/next] package/libnetconf2: bump version to 2.1.28 Message-ID: <20230220205300.6AE3686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d22988bfbdca479b18cce6a60b7d51b59e125a6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libnetconf2/libnetconf2.hash | 2 +- package/libnetconf2/libnetconf2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 34e934089e..675c76a500 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2f1a6559e8e43ea18ea337ab5f194f8443695c7ab4dde5d7b2560603f9bf702a libnetconf2-2.1.25.tar.gz +sha256 72e9a6461fadbd22f0cf0d23ba68d62b297c8f564f7f2bee069748fb67fc3a24 libnetconf2-2.1.28.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 0d4294d8d3..e349c1bce4 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 2.1.25 +LIBNETCONF2_VERSION = 2.1.28 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause From yann.morin.1998 at free.fr Mon Feb 20 21:01:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:08 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pytz: bump to version 2022.7 Message-ID: <20230220205235.8774A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9af376f6da76c7c8b38e01d9d3cae04948d5f758 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pytz/python-pytz.hash | 4 ++-- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index e71e77e5b7..6d6e1b606c 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 bf46b54a7e9bcb65ea38f54646181979 pytz-2022.6.tar.gz -sha256 e89512406b793ca39f5971bc999cc538ce125c0e51c27941bef4568b460095e2 pytz-2022.6.tar.gz +md5 3b9356e4dcd441df922cc01e8eb15983 pytz-2022.7.tar.gz +sha256 7ccfae7b4b2c067464a6733c6261673fdb8fd1be905460396b97a073e9fa683a pytz-2022.7.tar.gz # Locally computed sha256 checksums sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 58f06e1993..057a3ef173 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2022.6 +PYTHON_PYTZ_VERSION = 2022.7 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/76/63/1be349ff0a44e4795d9712cc0b2d806f5e063d4d34631b71b832fac715a8 +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/6d/37/54f2d7c147e42dc85ffbc6910862bb4f141fb3fc14d9a88efaa1a76c7df2 PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Wed Feb 15 09:23:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 15 Feb 2023 10:23:35 +0100 Subject: [Buildroot] [git commit branch/next] support/config-fragments: add a bootlin s390x toolchain Message-ID: <20230220205300.52C3B7FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=740d923423f18d94d62e60d0efe8200c7bd889d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next I do constantly get mails that fluent-bit fails to build for s390x. So added this to ensure that the s390x architecture is checked as well if I manually do: $ ./utils/test-pkg -p fluent-bit -a Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config | 5 +++++ support/config-fragments/autobuild/toolchain-configs.csv | 1 + 2 files changed, 6 insertions(+) diff --git a/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config new file mode 100644 index 0000000000..fe3f0380c9 --- /dev/null +++ b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config @@ -0,0 +1,5 @@ +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 diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 0b19051543..a65e9bacc3 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -38,6 +38,7 @@ support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv32-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-sh4-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc64-glibc.config,x86_64 From yann.morin.1998 at free.fr Mon Feb 20 21:01:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:09 -0000 Subject: [Buildroot] [git commit branch/next] package/python-sentry-sdk: bump to version 1.12.1 Message-ID: <20230220205235.A018386496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b341e0cc646665ccda1c6997fb845503c12a0d06 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-sentry-sdk/python-sentry-sdk.hash | 4 ++-- package/python-sentry-sdk/python-sentry-sdk.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index 2aa739f398..38ae3380a8 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 4980e01dc73c6bcf794b0b7d3f3e08d7 sentry-sdk-1.11.1.tar.gz -sha256 675f6279b6bb1fea09fd61751061f9a90dca3b5929ef631dd50dc8b3aeb245e9 sentry-sdk-1.11.1.tar.gz +md5 ea2d728c847879f66c3d24cfbade2026 sentry-sdk-1.12.1.tar.gz +sha256 5bbe4b72de22f9ac1e67f2a4e6efe8fbd595bb59b7b223443f50fe5802a5551c sentry-sdk-1.12.1.tar.gz # Locally computed sha256 checksums sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index 056a015952..c3092a5184 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 1.11.1 +PYTHON_SENTRY_SDK_VERSION = 1.12.1 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/a3/d5/db26377e9817407ae8d7b65e15b3c3b8d817c301633be15bd2aef61f38a3 +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/32/03/496a7c8313658dec419303e8add969f314b7538c29f4ec5ebe6d86fb8ce2 PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 15 20:56:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 21:56:13 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: drop Matt Weber Message-ID: <20230220205300.8FD0B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b5b92019ba30aecdaa7ba34c255d15e0c0489e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next I regret that my work situation doesn't sustain me contributing. Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 105 ------------------------------------------------------------- 1 file changed, 105 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index df2b98ad53..72a56deb4c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1984,111 +1984,6 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ -N: Matt Weber -F: board/freescale/p* -F: board/freescale/t* -F: board/qemu/ppc64-e5500/ -F: configs/freescale_p* -F: configs/freescale_t* -F: configs/qemu_ppc64_e5500_defconfig -F: package/ace/ -F: package/argp-standalone/ -F: package/aufs/ -F: package/aufs-util/ -F: package/bc/ -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/ -F: package/davici/ -F: package/dnsmasq/ -F: package/dosfstools/ -F: package/eigen/ -F: package/ethtool/ -F: package/flashbench/ -F: package/fmc/ -F: package/fmlib/ -F: package/freeradius-server/ -F: package/git/ -F: package/gnutls/ -F: package/hostapd/ -F: package/i2c-tools/ -F: package/ifplugd/ -F: package/igmpproxy/ -F: package/iperf/ -F: package/iperf3/ -F: package/iputils/ -F: package/iw/ -F: package/jitterentropy-library/ -F: package/kvm-unit-tests/ -F: package/kvmtool/ -F: package/libcsv/ -F: package/libcurl/ -F: package/libeastl/ -F: package/libfcgi/ -F: package/libopenssl/ -F: package/libselinux/ -F: package/libsemanage/ -F: package/libsepol/ -F: package/libssh2/ -F: package/libtalloc/ -F: package/libqmi/ -F: package/lighttpd/ -F: package/logrotate/ -F: package/makedevs/ -F: package/memtester/ -F: package/mii-diag/ -F: package/mrouted/ -F: package/mtd/ -F: package/mtools/ -F: package/nginx-upload/ -F: package/omniorb/ -F: package/openresolv/ -F: package/paxtest/ -F: package/picocom/ -F: package/policycoreutils/ -F: package/proftpd/ -F: package/protobuf-c/ -F: package/protobuf/ -F: package/python-colorama/ -F: package/python-filelock/ -F: package/python-flask-cors/ -F: package/python-iptables/ -F: package/python-ipy/ -F: package/python-iwlib/ -F: package/python-posix-ipc/ -F: package/python-pycairo/ -F: package/python-pysftp/ -F: package/python-tinyrpc/ -F: package/python-txdbus/ -F: package/qoriq-rcw/ -F: package/raptor/ -F: package/rng-tools/ -F: package/rsyslog/ -F: package/setools/ -F: package/sloci-image/ -F: package/smcroute/ -F: package/tclap/ -F: package/tini/ -F: package/uboot-tools/ -F: package/unionfs/ -F: package/valijson/ -F: package/wpa_supplicant/ -F: package/wireless_tools/ -F: package/xen/ -F: package/xml-security-c/ -F: support/testing/tests/fs/test_oci.py -F: support/testing/tests/package/br2-external/clang-compiler-rt/ -F: support/testing/tests/package/br2-external/openjdk/ -F: support/testing/tests/package/test_clang.py -F: support/testing/tests/package/test_openjdk.py -F: support/testing/tests/package/test_opkg/ -F: support/testing/tests/package/test_opkg.py - N: Mauro Condarelli F: package/mc/ F: package/python-autobahn/ From yann.morin.1998 at free.fr Mon Feb 20 21:01:10 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:10 -0000 Subject: [Buildroot] [git commit branch/next] package/python-setuptools-scm: bump to version 7.1.0 Message-ID: <20230220205235.AC7AA828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3dfa2421e1840758f9ec5292da85a9c884567318 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop no longer required host-python-tomli dependency. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-setuptools-scm/python-setuptools-scm.hash | 4 ++-- package/python-setuptools-scm/python-setuptools-scm.mk | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 8ef125840a..8cfe07d1d9 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.hash +++ b/package/python-setuptools-scm/python-setuptools-scm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json -md5 0df4e7fd923e4983cd65786efaa0e0d0 setuptools_scm-7.0.5.tar.gz -sha256 031e13af771d6f892b941adb6ea04545bbf91ebc5ce68c78aaf3fff6e1fb4844 setuptools_scm-7.0.5.tar.gz +md5 158dc741637fb4fa4b955c62bd2c08be setuptools_scm-7.1.0.tar.gz +sha256 6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 setuptools_scm-7.1.0.tar.gz # sha256 locally computed sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index 87d5dd290d..5a35c35a1f 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,16 +4,15 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 7.0.5 +PYTHON_SETUPTOOLS_SCM_VERSION = 7.1.0 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/d0/43/f038b5009f93bcd77b1b8da9e6d424b739ab17aec9726f3a99eba23d53ca +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/98/12/2c1e579bb968759fc512391473340d0661b1a8c96a59fb7c65b02eec1321 PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = \ host-python-packaging \ - host-python-tomli \ host-python-typing-extensions $(eval $(host-python-package)) From arnout at mind.be Wed Feb 15 21:23:17 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:23:17 +0100 Subject: [Buildroot] [git commit branch/next] package/pipewire: compress-offload needs kernel >= 5.7 Message-ID: <20230220205300.C045C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=854314d15361dc3b69b97ee29d483ee920b9098f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next SND_AUDIOCODEC_A{LAC,PE} are only available since kernel 5.7 and https://github.com/torvalds/linux/commit/0f546d6f0292fb624b4cf0cc70096ddb9ea070e6 resulting in the following build failure since bump to version 0.3.65 in commit 247e2d0eb1e60f483044d58bed58c5ed321528f7 and https://git.buildroot.net/buildroot/commit/?id=247e2d0eb1e60f483044d58bed58c5ed321528f7: ../spa/plugins/alsa/alsa-compress-offload-sink.c:183:11: error: 'SND_AUDIOCODEC_ALAC' undeclared here (not in a function); did you mean 'SND_AUDIOCODEC_AAC'? 183 | { SND_AUDIOCODEC_ALAC, }, | ^~~~~~~~~~~~~~~~~~~ | SND_AUDIOCODEC_AAC Moreover, flac_d is also only available since kernel 5.5 and https://github.com/torvalds/linux/commit/d2522335c92c090bf58531a2b696d7fe80ab2a7a Take this opportunity to make compress offload an explicit option rather than automatic based on the availability of tinycompress. The relationship between them is not obvious. Fixes: - http://autobuild.buildroot.org/results/9ecd9aca5edc3756154da59573157954f06e6537 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/pipewire/Config.in | 12 ++++++++++++ package/pipewire/pipewire.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/pipewire/Config.in b/package/pipewire/Config.in index f038291e87..4929e5d3d1 100644 --- a/package/pipewire/Config.in +++ b/package/pipewire/Config.in @@ -15,6 +15,18 @@ config BR2_PACKAGE_PIPEWIRE if BR2_PACKAGE_PIPEWIRE +config BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD + bool "pipewire Compress-Offload" + depends on !BR2_STATIC_LIBS # tinycompress + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + select BR2_PACKAGE_TINYCOMPRESS + help + Enable ALSA Compress-Offload support + +comment "pipewire Compress-Offload needs a toolchain w/ dynamic library, headers >= 5.7" + depends on BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + config BR2_PACKAGE_PIPEWIRE_EXAMPLES bool "pipewire examples" help diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 976d7783b9..ecf4a035ec 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -215,7 +215,7 @@ else PIPEWIRE_CONF_OPTS += -Dsdl2=disabled endif -ifeq ($(BR2_PACKAGE_TINYCOMPRESS),y) +ifeq ($(BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD),y) PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled PIPEWIRE_DEPENDENCIES += tinycompress else From yann.morin.1998 at free.fr Mon Feb 20 21:01:12 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:12 -0000 Subject: [Buildroot] [git commit branch/next] package/python-termcolor: bump to version 2.2.0 Message-ID: <20230220205235.D0F458648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e85e54729ece9fd7285c2e4d3f7ea537aabe0a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-termcolor/python-termcolor.hash | 4 ++-- package/python-termcolor/python-termcolor.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-termcolor/python-termcolor.hash b/package/python-termcolor/python-termcolor.hash index 73fb9129ed..9be0ad00c8 100644 --- a/package/python-termcolor/python-termcolor.hash +++ b/package/python-termcolor/python-termcolor.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/termcolor/json -md5 f7f59efd147dd1ec2a25e667616e8a52 termcolor-2.1.1.tar.gz -sha256 67cee2009adc6449c650f6bcf3bdeed00c8ba53a8cda5362733c53e0a39fb70b termcolor-2.1.1.tar.gz +md5 ba0af4ee713cd0030c2d436091af4241 termcolor-2.2.0.tar.gz +sha256 dfc8ac3f350788f23b2947b3e6cfa5a53b630b612e6cd8965a015a776020b99a termcolor-2.2.0.tar.gz # Locally computed sha256 checksums sha256 e79b6bd82962c1330caaa7c42278567b08667777673f8e2371a624d5715d4c0e COPYING.txt diff --git a/package/python-termcolor/python-termcolor.mk b/package/python-termcolor/python-termcolor.mk index d7511d692f..5cbedfb396 100644 --- a/package/python-termcolor/python-termcolor.mk +++ b/package/python-termcolor/python-termcolor.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TERMCOLOR_VERSION = 2.1.1 +PYTHON_TERMCOLOR_VERSION = 2.2.0 PYTHON_TERMCOLOR_SOURCE = termcolor-$(PYTHON_TERMCOLOR_VERSION).tar.gz -PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/19/da/ff1f0906818a5bd2e69e773d88801ca3c9e92d0d7caa99db1665658819ea +PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/e5/4e/b2a54a21092ad2d5d70b0140e4080811bee06a39cc8481651579fe865c89 PYTHON_TERMCOLOR_SETUP_TYPE = pep517 PYTHON_TERMCOLOR_LICENSE = MIT PYTHON_TERMCOLOR_LICENSE_FILES = COPYING.txt From arnout at mind.be Wed Feb 15 21:00:04 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 15 Feb 2023 22:00:04 +0100 Subject: [Buildroot] [git commit branch/next] toolchain/helper: check the arch sysroot Message-ID: <20230220205300.9AAF086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4433ad8f5c88fafe3f0aebbaff1abdae17aadcb7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since the commit [1], the utils/genrandconfig script improved the configuration randomization used by autobuilders. Since then it can generate a configuration that is not suitable for an external toolchain such the "Codescape IMG GNU Linux Toolchain". Indeed this toolchain can be selected for mips32r5 or mips64r5 while only mips32r2 or mips64r2 are really supported. The toolchain issue will be fixed in a followup change. We want to catch such issue in check_unusable_toolchain function otherwise it is detected late during the sysroot import into staging and trigger a weird error message: ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot/usr//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory This is similar test than for the main sysroot check but this time we have to use the toolchain cflags to check the architecture sysroot. If the architecture sysroot doesn't exist, the toolchain will reply with "libc.a". Either the toolchain is really broken or we used a wrong target architecture variant. In the later case, the toolchain infrastructure will print a meaningful error message. Note: We also may get a similar issue using the toolchain-external-custom package if a toolchain is used with a wrong target architecture variant. Fixes: http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ [1] aeee90ec109b83c42779e6a2617f7d57e25a2b65 Signed-off-by: Romain Naour Cc: Giulio Benetti Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- toolchain/helpers.mk | 11 +++++++++++ toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 1cd7494fdb..24c482923a 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -422,12 +422,16 @@ check_cross_compiler_exists = \ # the host tuple. # - Exclude distro-class toolchains which are not relocatable. # - Exclude broken toolchains which return "libc.a" with -print-file-name. +# - Exclude toolchains used with wrong toolchain cflags or broken toolchains +# which return "libc.a" with -print-file-name and toolchain cflags. # - Exclude toolchains which doesn't support --sysroot option. # # $1: cross-gcc path +# $1: toolchain cflags # check_unusable_toolchain = \ __CROSS_CC=$(strip $1) ; \ + __TOOLCHAIN_CFLAGS=$(strip $2) ; \ vendor=`$${__CROSS_CC} -dumpmachine | cut -f2 -d'-'` ; \ if test "$${vendor}" = "angstrom" ; then \ echo "Angstrom toolchains are not pure toolchains: they contain" ; \ @@ -449,6 +453,13 @@ check_unusable_toolchain = \ echo "Unable to detect the toolchain sysroot, Buildroot cannot use this toolchain." ; \ exit 1 ; \ fi ; \ + libc_a_archsysroot_path=`$${__CROSS_CC} $${__TOOLCHAIN_CFLAGS} -print-file-name=libc.a` ; \ + if test "$${libc_a_archsysroot_path}" = "libc.a" ; then \ + echo "Unable to detect the toolchain architecture sysroot." ; \ + echo "Please check the Target Architecture Variant selected, the toolchains may not support it." ; \ + echo "Buildroot cannot use this toolchain." ; \ + exit 1 ; \ + fi; \ sysroot_dir="$(call toolchain_find_sysroot,$${__CROSS_CC})" ; \ if test -z "$${sysroot_dir}" ; then \ echo "External toolchain doesn't support --sysroot. Cannot use." ; \ diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 299b6008aa..c37f3500d9 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -563,7 +563,7 @@ endif # kernel headers version, type of C library and all C library features. define $(2)_CONFIGURE_CMDS $$(Q)$$(call check_cross_compiler_exists,$$(TOOLCHAIN_EXTERNAL_CC)) - $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC)) + $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC),"$$(TOOLCHAIN_EXTERNAL_CFLAGS)") $$(Q)SYSROOT_DIR="$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC))" ; \ $$(call check_kernel_headers_version,\ $$(BUILD_DIR),\ From yann.morin.1998 at free.fr Mon Feb 20 21:01:13 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:13 -0000 Subject: [Buildroot] [git commit branch/next] package/python-traitlets: bump to version 5.8.0 Message-ID: <20230220205235.DDE09828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e68d50ffb27acc6b89d55ebc7d19c3daae269a40 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-traitlets/python-traitlets.hash | 4 ++-- package/python-traitlets/python-traitlets.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-traitlets/python-traitlets.hash b/package/python-traitlets/python-traitlets.hash index 0c68e04518..80fa8d4d44 100644 --- a/package/python-traitlets/python-traitlets.hash +++ b/package/python-traitlets/python-traitlets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/traitlets/json -md5 74ad03a0c8dd45d5621b12e0be0ab38f traitlets-5.7.1.tar.gz -sha256 fde8f62c05204ead43c2c1b9389cfc85befa7f54acb5da28529d671175bb4108 traitlets-5.7.1.tar.gz +md5 95b21c721316bbc06922df9d97af5158 traitlets-5.8.0.tar.gz +sha256 6cc57d6dc28c85d5365961726ffd19b538739347749e13ebe34e03323a0e8f84 traitlets-5.8.0.tar.gz # Locally computed sha256 checksums sha256 3dcd47086529bf178cf7d10f35a8c188a1e9710391acecceef700898a4cf099b COPYING.md diff --git a/package/python-traitlets/python-traitlets.mk b/package/python-traitlets/python-traitlets.mk index 8cda56817f..7054557a48 100644 --- a/package/python-traitlets/python-traitlets.mk +++ b/package/python-traitlets/python-traitlets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TRAITLETS_VERSION = 5.7.1 +PYTHON_TRAITLETS_VERSION = 5.8.0 PYTHON_TRAITLETS_SOURCE = traitlets-$(PYTHON_TRAITLETS_VERSION).tar.gz -PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/0b/db/9adbbb2bef9a43ecfa4f1cbcec1d662adade10262328a4b7ef65effc6341 +PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/56/48/0eb99357330a02974d537be8e4096bc58cfac1089e3153570119ccea7a40 PYTHON_TRAITLETS_LICENSE = BSD-3-Clause PYTHON_TRAITLETS_LICENSE_FILES = COPYING.md PYTHON_TRAITLETS_SETUP_TYPE = pep517 From thomas.petazzoni at bootlin.com Wed Feb 15 21:37:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:37:52 +0100 Subject: [Buildroot] [git commit branch/next] package/rtl8812au-aircrack-ng: bump to 2023-02-03 version to fix build failure with Linux 6.1 Message-ID: <20230220205300.E25D58648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d69ea9664f067e5660e13ddf65c52df46f2eca07 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/e128298929fce31374687a566e50b00c150131b8/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index bc3a926314..cdf5f3b4e2 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eed4888da9cfdc0f83ad3335beaf73af33ce0796b0a2637aeec102d47e1eb8f0 rtl8812au-aircrack-ng-e7a4a390ccbdd768411e1b2a8922c47837f76b47.tar.gz +sha256 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index 45a6ce5729..ab3ebe2077 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = e7a4a390ccbdd768411e1b2a8922c47837f76b47 +RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:01:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:14 -0000 Subject: [Buildroot] [git commit branch/next] package/python-orjson: bump to version 3.8.4 Message-ID: <20230220205236.0C044828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=627c38caf07de44e26b187e40f0cfed9e2e6591a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-orjson/python-orjson.hash | 2 +- package/python-orjson/python-orjson.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-orjson/python-orjson.hash b/package/python-orjson/python-orjson.hash index 515590795b..f1298c05ce 100644 --- a/package/python-orjson/python-orjson.hash +++ b/package/python-orjson/python-orjson.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 0c8d161dfd8b9e4133beabd81e3e1473c246efe55abec571845f72a2ba7b74e4 orjson-3.8.3.tar.gz +sha256 b932fc1e43598fb91022b1dc651afeaef650793a2a590ca4fbeef57a3808abf5 orjson-3.8.4.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/python-orjson/python-orjson.mk b/package/python-orjson/python-orjson.mk index bda0a8ab48..8eeadecb3d 100644 --- a/package/python-orjson/python-orjson.mk +++ b/package/python-orjson/python-orjson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ORJSON_VERSION = 3.8.3 +PYTHON_ORJSON_VERSION = 3.8.4 PYTHON_ORJSON_SOURCE = orjson-$(PYTHON_ORJSON_VERSION).tar.gz -PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/1c/b9/a0b4fb195ded02820e0a933ffe28b782b7e5ef7a4f8c1e1c742d619548e4 +PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/8f/2d/ae31eddf7e097eec5e25c7da954ef6e944f4dbf79153676f94cea3dc5116 PYTHON_ORJSON_SETUP_TYPE = pep517 PYTHON_ORJSON_LICENSE = Apache-2.0 or MIT PYTHON_ORJSON_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT From thomas.petazzoni at bootlin.com Wed Feb 15 21:38:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 15 Feb 2023 22:38:54 +0100 Subject: [Buildroot] [git commit branch/next] package/open-iscsi: fix libressl build Message-ID: <20230220205301.05D0886495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=295baf16a181b110eba09007f6ad7ac384914581 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following libressl build failure raised since the addition of the package in commit 2a571acddd0badaf9636649d98fd095757878348: /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' Fixes: - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-SHA3-is-not-supported-by-libressl.patch | 144 +++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch new file mode 100644 index 0000000000..0423179d93 --- /dev/null +++ b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch @@ -0,0 +1,144 @@ +From 29a4c3a518d13bfc0a07915e7e87fbec2b66597c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 13 Feb 2023 08:55:11 +0100 +Subject: [PATCH] SHA3 is not supported by libressl + +Disable SHA3 with libressl as it is not supported resulting in the +following build failure: + +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': +auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' + +Fixes: + - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/open-iscsi/open-iscsi/pull/396] +--- + libopeniscsiusr/idbm.h | 2 ++ + usr/auth.c | 13 ++++++++++++- + usr/auth.h | 4 ++++ + usr/idbm.c | 2 ++ + 4 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h +index be5986f..1043b27 100644 +--- a/libopeniscsiusr/idbm.h ++++ b/libopeniscsiusr/idbm.h +@@ -56,7 +56,9 @@ enum iscsi_chap_algs { + ISCSI_AUTH_CHAP_ALG_MD5 = 5, + ISCSI_AUTH_CHAP_ALG_SHA1 = 6, + ISCSI_AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + ISCSI_AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5, + }; + +diff --git a/usr/auth.c b/usr/auth.c +index 46c328e..5f50e26 100644 +--- a/usr/auth.c ++++ b/usr/auth.c +@@ -181,9 +181,11 @@ static int auth_hash_init(EVP_MD_CTX **context, int chap_alg) { + case AUTH_CHAP_ALG_SHA256: + digest = EVP_sha256(); + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + digest = EVP_sha3_256(); + break; ++#endif + } + + if (*context == NULL) +@@ -298,7 +300,9 @@ static int + acl_chk_chap_alg_optn(int chap_algorithm) + { + if (chap_algorithm == AUTH_OPTION_NONE || ++#ifndef LIBRESSL_VERSION_NUMBER + chap_algorithm == AUTH_CHAP_ALG_SHA3_256 || ++#endif + chap_algorithm == AUTH_CHAP_ALG_SHA256 || + chap_algorithm == AUTH_CHAP_ALG_SHA1 || + chap_algorithm == AUTH_CHAP_ALG_MD5) +@@ -711,9 +715,11 @@ acl_chk_chap_alg_key(struct iscsi_acl *client) + case AUTH_CHAP_ALG_SHA256: + client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN; + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN; + break; ++#endif + } + return; + } +@@ -862,7 +868,10 @@ acl_local_auth(struct iscsi_acl *client) + client->local_state = AUTH_LOCAL_STATE_ERROR; + client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT; + break; +- } else if ((client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++ } else if ( ++#ifndef LIBRESSL_VERSION_NUMBER ++ (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++#endif + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) { +@@ -1824,6 +1833,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA256 due to crypto lib configuration"); + } + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) { + value_list[i++] = AUTH_CHAP_ALG_SHA3_256; +@@ -1832,6 +1842,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA3-256 due to crypto lib configuration"); + } + break; ++#endif + case ~0: + /* unset value in array, just ignore */ + break; +diff --git a/usr/auth.h b/usr/auth.h +index 16cdb24..9357772 100644 +--- a/usr/auth.h ++++ b/usr/auth.h +@@ -32,7 +32,9 @@ enum { + AUTH_CHAP_MD5_RSP_LEN = 16, + AUTH_CHAP_SHA1_RSP_LEN = 20, + AUTH_CHAP_SHA256_RSP_LEN = 32, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_SHA3_256_RSP_LEN = 32, ++#endif + AUTH_CHAP_RSP_MAX = 32, + }; + +@@ -67,7 +69,9 @@ enum { + AUTH_CHAP_ALG_MD5 = 5, + AUTH_CHAP_ALG_SHA1 = 6, + AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5 + }; + +diff --git a/usr/idbm.c b/usr/idbm.c +index 90bc142..082e1c6 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -200,7 +200,9 @@ static struct int_list_tbl { + { "MD5", AUTH_CHAP_ALG_MD5 }, + { "SHA1", AUTH_CHAP_ALG_SHA1 }, + { "SHA256", AUTH_CHAP_ALG_SHA256 }, ++#ifndef LIBRESSL_VERSION_NUMBER + { "SHA3-256", AUTH_CHAP_ALG_SHA3_256 }, ++#endif + }; + + static void +-- +2.39.0 + From yann.morin.1998 at free.fr Mon Feb 20 21:01:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:15 -0000 Subject: [Buildroot] [git commit branch/next] package/python-cryptography: bump to version 39.0.0 Message-ID: <20230220205235.F1A388648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c81ab9f8a978ee6d2d6a882d6e9ba6ce93dd6a23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cryptography/python-cryptography.hash | 2 +- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index a01c8810e3..3f2204eeb1 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 2abbeb6d42e8844de036bf2e0d78a42feeee1d57ebf29a07684490f98bdcab37 cryptography-38.0.4.tar.gz +sha256 2d00e023261719f85caf360ee061d37ee27654a0344d1376441c8a29ea3bac86 cryptography-39.0.0.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 4254fa3557..6868ff4633 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 38.0.4 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.0 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/e3/3f/41186b1f2fd86a542d399175f6b8e43f82cd4dfa51235a0b030a042b811a +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/12/e3/c46c274cf466b24e5d44df5d5cd31a31ff23e57f074a2bb30931a8c9b01a PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From peter at korsgaard.com Mon Feb 20 17:07:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:07:55 +0100 Subject: [Buildroot] [git commit branch/next] package/libostree: bump to version 2023.1 Message-ID: <20230220205303.35D088648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d37b3916a1ce75085da8232db95cfd354137e540 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index ed31109fdb..63dfe98d80 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f libostree-2022.7.tar.xz +sha256 dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55 libostree-2023.1.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 8e8ec63213..4b17fcf391 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2022.7 +LIBOSTREE_VERSION = 2023.1 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From peter at korsgaard.com Mon Feb 20 21:01:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:01:30 -0000 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libXpm: security bump version to 3.5.15 Message-ID: <20230220205237.487DC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0dfd717f3ff888b4ab6d8c40bb6a01a939370cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003313.html Fixes CVE-2022-4883, CVE-2022-44617 & CVE-2022-46285: https://lists.x.org/archives/xorg-announce/2023-January/003312.html Updated license hash due to upstream commit: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/501494c6c68a84114fdd0b44d4b67ef9cde776c9 Added configure option to disable compressed pixmaps support: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/4841039e5385f264d12757903894f47c64f59361 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 8 ++++---- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index 9ccfb4c8de..733c404543 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003261.html -sha256 f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2 libXpm-3.5.14.tar.xz -sha512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-January/003313.html +sha256 60bb906c5c317a6db863e39b69c4a83fdbd2ae2154fcf47640f8fefc9fdfd1c1 libXpm-3.5.15.tar.xz +sha512 955d716fcea2c9d868ab941c56f017b39bfa0f47fd2904e9b04c6a9be17f23f8b8c906da9c90a89a789f1f399d419641705ff5b6f9921820e34d4807c7a1992f libXpm-3.5.15.tar.xz # Locally calculated -sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING +sha256 a80d706759624a04aa90fd62bc644a360fc3d72e08dcbfb129f167c11ca285de COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 417dcfec38..970ec93407 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.14 +XLIB_LIBXPM_VERSION = 3.5.15 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT @@ -16,6 +16,7 @@ XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(TARGET_NLS_DEPENDENCIES) XLIB_LIBXPM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +XLIB_LIBXPM_CONF_OPTS = --disable-open-zfile ifeq ($(BR2_SYSTEM_ENABLE_NLS),) XLIB_LIBXPM_CONF_ENV += ac_cv_search_gettext=no From peter at korsgaard.com Mon Feb 20 17:10:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:10:37 +0100 Subject: [Buildroot] [git commit branch/next] package/python-django: security bump to version 4.1.7 Message-ID: <20230220205303.4218081979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a85ed5d21c14cbe3ec2864206fe792152598e4db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2023-23969 and CVE-2023-24580 https://docs.djangoproject.com/en/dev/releases/4.1.6 https://docs.djangoproject.com/en/dev/releases/4.1.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 1d3035bb98..cb03b33bfe 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 6b6a47d7478ead15b0a0835841c433dc Django-4.1.5.tar.gz -sha256 ff56ebd7ead0fd5dbe06fe157b0024a7aaea2e0593bb3785fb594cf94dad58ef Django-4.1.5.tar.gz +md5 626f96c63ddfab24bab90d80c87a7aad Django-4.1.7.tar.gz +sha256 44f714b81c5f190d9d2ddad01a532fe502fa01c4cb8faf1d081f4264ed15dcd8 Django-4.1.7.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index e08de68954..e8c91cf51f 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.5 +PYTHON_DJANGO_VERSION = 4.1.7 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/41/c8/b3c469353f9d1b7f0e99b45520582b891da02cd87408bc867affa6e039a3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/9f/a7/07939866241b7e8f8d3bf164b7d6ad428163723e29dd472700f8ab0e5fd5 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:01:31 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:31 -0000 Subject: [Buildroot] [git commit branch/next] package/cantarell: switch to https download Message-ID: <20230220205237.90BD381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e483a7340a4aeecf1d362328e06c2fcdec1dcae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/cantarell/cantarell.hash | 2 +- package/cantarell/cantarell.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cantarell/cantarell.hash b/package/cantarell/cantarell.hash index 49b4634063..18e0fc2cfa 100644 --- a/package/cantarell/cantarell.hash +++ b/package/cantarell/cantarell.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.25.sha256sum +# From https://download.gnome.org/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.25.sha256sum sha256 14a228aa0b516dfc367b434a850f955a00c57fc549cbb05348e2b150196a737f cantarell-fonts-0.0.25.tar.xz # locally computed sha256 79a9d6198c0d9192c1b0bf55bcbc404a39390bd0d8c650cf20d652c2eaa284d8 COPYING diff --git a/package/cantarell/cantarell.mk b/package/cantarell/cantarell.mk index 2769b35c1f..59e65b25c1 100644 --- a/package/cantarell/cantarell.mk +++ b/package/cantarell/cantarell.mk @@ -6,7 +6,7 @@ CANTARELL_VERSION_MAJOR = 0.0 CANTARELL_VERSION = $(CANTARELL_VERSION_MAJOR).25 -CANTARELL_SITE = http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/$(CANTARELL_VERSION_MAJOR) +CANTARELL_SITE = https://download.gnome.org/sources/cantarell-fonts/$(CANTARELL_VERSION_MAJOR) CANTARELL_SOURCE = cantarell-fonts-$(CANTARELL_VERSION).tar.xz CANTARELL_DEPENDENCIES = host-pkgconf CANTARELL_LICENSE = OFL-1.1 From peter at korsgaard.com Mon Feb 20 17:17:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:17:14 +0100 Subject: [Buildroot] [git commit branch/next] Revert "xorg-server: not available with musl on ARM" Message-ID: <20230220205303.72E9F81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b21cd8be3f9469d6bdbbaed951ae7c59efb46a24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit 9daafbcb75a7ab593ce8a1f21c6149c8437bc0bc. Fixed since https://gitlab.freedesktop.org/xorg/xserver/-/issues/840 (xserver 1.20.6). Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 865917c4ec..b933bd0285 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -1,11 +1,6 @@ -comment "xorg-server needs a glibc or uClibc toolchain" - depends on BR2_arm && BR2_TOOLCHAIN_USES_MUSL - config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" depends on BR2_USE_MMU # fork() - # xserver uses inb/outb on arm, which aren't available with musl - depends on !(BR2_arm && BR2_TOOLCHAIN_USES_MUSL) # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. From yann.morin.1998 at free.fr Mon Feb 20 21:01:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:32 -0000 Subject: [Buildroot] [git commit branch/next] package/atkmm: switch to https download Message-ID: <20230220205237.7954B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11bb66247bc364ab46b9bf10d769cecdb7b6fdc0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/atkmm/atkmm.hash | 2 +- package/atkmm/atkmm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/atkmm/atkmm.hash b/package/atkmm/atkmm.hash index f965ad29cb..9e2bb2830c 100644 --- a/package/atkmm/atkmm.hash +++ b/package/atkmm/atkmm.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atkmm/2.36/atkmm-2.36.1.sha256sum +# From https://download.gnome.org/sources/atkmm/2.36/atkmm-2.36.1.sha256sum sha256 e11324bfed1b6e330a02db25cecc145dca03fb0dff47f0710c85e317687da458 atkmm-2.36.1.tar.xz # locally computed sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk index 3bcb941c9f..7ceb87b047 100644 --- a/package/atkmm/atkmm.mk +++ b/package/atkmm/atkmm.mk @@ -7,7 +7,7 @@ ATKMM_VERSION_MAJOR = 2.36 ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).1 ATKMM_SOURCE = atkmm-$(ATKMM_VERSION).tar.xz -ATKMM_SITE = http://ftp.gnome.org/pub/gnome/sources/atkmm/$(ATKMM_VERSION_MAJOR) +ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR) ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) ATKMM_LICENSE_FILES = COPYING COPYING.tools ATKMM_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sun Feb 19 20:57:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:57:47 +0100 Subject: [Buildroot] [git commit branch/next] package/catch2: bump to version 3.3.1 Message-ID: <20230220205302.D1B728648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3a462e85a786401964d522124e4f431d79339e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next raise the minimum gcc to 5 as stated in release notes for 3.1.0 [0]. [0] https://github.com/catchorg/Catch2/releases/tag/v3.1.0 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/catch2/Config.in | 6 +++--- package/catch2/catch2.hash | 2 +- package/catch2/catch2.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/catch2/Config.in b/package/catch2/Config.in index 2f53d197b2..40d2d12434 100644 --- a/package/catch2/Config.in +++ b/package/catch2/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_CATCH2 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 depends on BR2_USE_MMU # fork() help Catch2 is mainly a unit testing framework for C++, but it @@ -21,8 +21,8 @@ config BR2_PACKAGE_CATCH2 https://github.com/catchorg/Catch2 -comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash index 664164fd76..b533792f8f 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2106bccfec18c8ce673623d56780220e38527dd8f283ccba26aa4b8758737d0e catch2-3.1.1.tar.gz +sha256 d90351cdc55421f640c553cfc0875a8c834428679444e8062e9187d05b18aace catch2-3.3.1.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index ab62cc943b..6e4af3d670 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.1.1 +CATCH2_VERSION = 3.3.1 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO From yann.morin.1998 at free.fr Mon Feb 20 21:01:33 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:33 -0000 Subject: [Buildroot] [git commit branch/next] package/gdk-pixbuf: switch to https download Message-ID: <20230220205237.AA1CF81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b0d9d97b3434e41879046c0994dd1b5708c46007 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gdk-pixbuf/gdk-pixbuf.hash | 2 +- package/gdk-pixbuf/gdk-pixbuf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.hash b/package/gdk-pixbuf/gdk-pixbuf.hash index 23a7c3fc05..c3953e15a6 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.hash +++ b/package/gdk-pixbuf/gdk-pixbuf.hash @@ -1,3 +1,3 @@ -# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.sha256sum +# From https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.sha256sum sha256 ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b gdk-pixbuf-2.42.10.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 561e191569..e041d2cbde 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -7,7 +7,7 @@ GDK_PIXBUF_VERSION_MAJOR = 2.42 GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).10 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz -GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) +GDK_PIXBUF_SITE = https://download.gnome.org/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) GDK_PIXBUF_LICENSE = LGPL-2.1+ GDK_PIXBUF_LICENSE_FILES = COPYING GDK_PIXBUF_CPE_ID_VENDOR = gnome From thomas.petazzoni at bootlin.com Sun Feb 19 21:09:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 22:09:25 +0100 Subject: [Buildroot] [git commit branch/next] package/s390-tools: bump to version 2.26.0 Message-ID: <20230220205302.DC9AC86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d782c0682f559d407e64698470b511512a5bdc78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- 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 a0dde477c3..37b67c5cb1 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ccb20954e748309a50fd56edd9abd94c6f897081e9a1a33e9d965a56f650990d s390-tools-2.25.0.tar.gz +sha256 da81c55fb11d84923c0ebaed703f557052eb1a273495f60ebe3d20a74627303e s390-tools-2.26.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index cb6278dfb8..8cd5491405 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.25.0 +S390_TOOLS_VERSION = 2.26.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 yann.morin.1998 at free.fr Mon Feb 20 21:01:34 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:34 -0000 Subject: [Buildroot] [git commit branch/next] package/gdk-pixbuf-xlib: switch to https download Message-ID: <20230220205237.B5224828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14d70068be395f47a034e4275e9a26e19b2804db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash | 2 +- package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash index e7f74e2b4b..7298ef50c4 100644 --- a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-2.40.2.sha256sum +# From https://download.gnome.org/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 diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk index 3e61373b3a..5af33c6aea 100644 --- a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk @@ -7,7 +7,7 @@ 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_SITE = https://download.gnome.org/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 From peter at korsgaard.com Sun Feb 19 17:10:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 19 Feb 2023 18:10:18 +0100 Subject: [Buildroot] [git commit branch/next] package/wlroots: add XWayland support Message-ID: <20230220205302.7F6B286496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5945a71d87c988cb6b864600dd8dbecae0ef30fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The new option enables the XWayland support, so X11 application can be running on a wlroots based compositor. Also, do not enable the XWayland support if the X11 backend is active, as it is unrelated to it. Signed-off-by: Raphael Pavlidis Signed-off-by: Peter Korsgaard --- package/wlroots/Config.in | 19 +++++++++++++++++++ package/wlroots/wlroots.mk | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 84a4ef846e..b2d3f3c3b1 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -41,4 +41,23 @@ config BR2_PACKAGE_WLROOTS_X11 help Support Wayland sessions nested inside a X11 window +config BR2_PACKAGE_WLROOTS_XWAYLAND + bool "XWayland support" + depends on BR2_PACKAGE_XORG7 # libxcb, xcb-util-wm, xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_XWAYLAND + help + Support for running X11 applications under wayland + +comment "XWayland support needs X.org enabled" + depends on !BR2_PACKAGE_XORG7 + +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + endif diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 4f14d20b11..5b930a51be 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -30,8 +30,12 @@ WLROOTS_BACKENDS = libinput drm ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) WLROOTS_BACKENDS += x11 -WLROOTS_CONF_OPTS += -Dxwayland=enabled WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 +endif + +ifeq ($(BR2_PACKAGE_WLROOTS_XWAYLAND),y) +WLROOTS_CONF_OPTS += -Dxwayland=enabled +WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xwayland else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif From yann.morin.1998 at free.fr Mon Feb 20 21:01:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:35 -0000 Subject: [Buildroot] [git commit branch/next] package/gobject-introspection: switch to https download Message-ID: <20230220205237.D6F8281979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01e4f72b6bc8120437dd462673fdfccb4ef7df20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gobject-introspection/gobject-introspection.hash | 2 +- package/gobject-introspection/gobject-introspection.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index 8f9d323d9a..fa3fdfe306 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,4 +1,4 @@ -#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.70/gobject-introspection-1.72.0.sha256sum +#From https://download.gnome.org/sources/gobject-introspection/1.72/gobject-introspection-1.72.0.sha256sum sha256 02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc gobject-introspection-1.72.0.tar.xz sha256 faa2e414bd5f91d2d2c39e85c7cc3f2ccde05c3306f96b404f8ed8cf0266c279 COPYING.LGPL sha256 4c1cedcbb4a12ea964f1160dbbf36099e5a59b96129a99a1a1a61f2cb09271fb COPYING.GPL diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 12e5b81b1b..37e1b2c64a 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -6,7 +6,7 @@ GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.72 GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 -GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) +GOBJECT_INTROSPECTION_SITE = https://download.gnome.org/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz GOBJECT_INTROSPECTION_INSTALL_STAGING = YES GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause From peter at korsgaard.com Mon Feb 20 17:05:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:05:58 +0100 Subject: [Buildroot] [git commit branch/next] package/libcurl: bump version to 7.88.0 Message-ID: <20230220205303.216337FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14ca6b5fdb6a5e0fa99b04461240772d93076b2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://curl.se/changes.html#7_88_0 Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/2bc1d775f510196154283374284f98d3eae03544#diff-400d38e5cfee181230373a8b02d38f50271a5bf62c62410382efddb8e8b19e22 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 230ec8d704..714b02acb0 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.87.0.tar.xz.asc +# https://curl.se/download/curl-7.88.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff curl-7.87.0.tar.xz -sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING +sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 994b685d34..eb481e4782 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.87.0 +LIBCURL_VERSION = 7.88.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From yann.morin.1998 at free.fr Mon Feb 20 21:01:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:37 -0000 Subject: [Buildroot] [git commit branch/next] package/gssdp: switch to https download Message-ID: <20230220205237.EE956828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9086723227c535010986d831954ec932d3e783fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gssdp/gssdp.hash | 2 +- package/gssdp/gssdp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gssdp/gssdp.hash b/package/gssdp/gssdp.hash index c9bbd66083..34ccfa8044 100644 --- a/package/gssdp/gssdp.hash +++ b/package/gssdp/gssdp.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.4/gssdp-1.4.0.1.sha256sum: +# Hash from: https://download.gnome.org/sources/gssdp/1.4/gssdp-1.4.0.1.sha256sum: sha256 8676849d57fb822b8728856dbadebf3867f89ee47a0ec47a20045d011f431582 gssdp-1.4.0.1.tar.xz # Hash for license file: diff --git a/package/gssdp/gssdp.mk b/package/gssdp/gssdp.mk index f1fed3713d..f7ebb44acd 100644 --- a/package/gssdp/gssdp.mk +++ b/package/gssdp/gssdp.mk @@ -7,7 +7,7 @@ GSSDP_VERSION_MAJOR = 1.4 GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).0.1 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz -GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR) +GSSDP_SITE = https://download.gnome.org/sources/gssdp/$(GSSDP_VERSION_MAJOR) GSSDP_LICENSE = LGPL-2.1+ GSSDP_LICENSE_FILES = COPYING GSSDP_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 17:13:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:13:07 +0100 Subject: [Buildroot] [git commit branch/next] package/rockchip-mali: needs C++ Message-ID: <20230220205303.6693C86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f1858e859833da272fce70bf445ca1b53ebffe1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next rockchip-mali pre-built libraries needs C++ since the addition of the package in commit 97c74a73e5dee17530647f89b2c7d8692781eb14: readelf -a output/build/rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427/lib/aarch64-linux-gnu/libmali-bifrost-g31-rxp0-gbm.so|grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libpthread.so.0] 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] 0x0000000000000001 (NEEDED) Shared library: [librt.so.1] 0x0000000000000001 (NEEDED) Shared library: [libdrm.so.2] 0x0000000000000001 (NEEDED) Shared library: [libm.so.6] 0x0000000000000001 (NEEDED) Shared library: [libstdc++.so.6] 0x0000000000000001 (NEEDED) Shared library: [libgcc_s.so.1] 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] While at it, add a comment when dependencies are not met Fixes: - No autobuilder failures (yet), found when debugging an issue with rockchip-mali and glslsandbox-player Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/rockchip-mali/Config.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/rockchip-mali/Config.in b/package/rockchip-mali/Config.in index d616284911..5a23954af3 100644 --- a/package/rockchip-mali/Config.in +++ b/package/rockchip-mali/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ROCKCHIP_MALI bool "rockchip-mali" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_ARM_EABIHF || BR2_aarch64 # lidbrm. This would normally need a Config.in comment, but @@ -30,3 +31,8 @@ config BR2_PACKAGE_PROVIDES_LIBGBM default "rockchip-mali" endif + +comment "rockchip-mali needs a glibc toolchain w/ C++, threads" + depends on BR2_ARM_EABIHF || BR2_aarch64 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS From yann.morin.1998 at free.fr Mon Feb 20 21:01:37 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:37 -0000 Subject: [Buildroot] [git commit branch/next] package/gtkmm3: switch to https download Message-ID: <20230220205238.1093E81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30b916546b7c5000130db461880e7d21b5741952 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gtkmm3/gtkmm3.hash | 2 +- package/gtkmm3/gtkmm3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gtkmm3/gtkmm3.hash b/package/gtkmm3/gtkmm3.hash index 26687507f4..fc7e33339e 100644 --- a/package/gtkmm3/gtkmm3.hash +++ b/package/gtkmm3/gtkmm3.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.0.sha256sum +# From https://download.gnome.org/sources/gtkmm/3.22/gtkmm-3.22.0.sha256sum sha256 05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5 gtkmm-3.22.0.tar.xz # Locally computed sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gtkmm3/gtkmm3.mk b/package/gtkmm3/gtkmm3.mk index 009889142e..d717c08bd8 100644 --- a/package/gtkmm3/gtkmm3.mk +++ b/package/gtkmm3/gtkmm3.mk @@ -7,7 +7,7 @@ GTKMM3_VERSION_MAJOR = 3.22 GTKMM3_VERSION = $(GTKMM3_VERSION_MAJOR).0 GTKMM3_SOURCE = gtkmm-$(GTKMM3_VERSION).tar.xz -GTKMM3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtkmm/$(GTKMM3_VERSION_MAJOR) +GTKMM3_SITE = https://download.gnome.org/sources/gtkmm/$(GTKMM3_VERSION_MAJOR) GTKMM3_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GTKMM3_LICENSE_FILES = COPYING COPYING.tools GTKMM3_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 17:11:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 18:11:07 +0100 Subject: [Buildroot] [git commit branch/next] package/python-cryptography: security bump to version 39.0.1 Message-ID: <20230220205303.4C7047FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67c967c2d16c29f193fde43b3c48edf0911baccd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2023-23931: cryptography is a package designed to expose cryptographic primitives and recipes to Python developers. In affected versions `Cipher.update_into` would accept Python objects which implement the buffer protocol, but provide only immutable buffers. This would allow immutable objects (such as `bytes`) to be mutated, thus violating fundamental rules of Python and resulting in corrupted output. This now correctly raises an exception. This issue has been present since `update_into` was originally introduced in cryptography 1.8. https://github.com/pyca/cryptography/security/advisories/GHSA-w7pp-m8wf-vj6r https://cryptography.io/en/latest/changelog/#v39-0-1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-cryptography/python-cryptography.hash | 2 +- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 3f2204eeb1..a23944a06f 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 2d00e023261719f85caf360ee061d37ee27654a0344d1376441c8a29ea3bac86 cryptography-39.0.0.tar.gz +sha256 531348679f144d118156be5b17ddac750974cdcd9f44bb0a7cfd7ddcfee79c80 cryptography-39.0.1.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 6868ff4633..a130b2d10d 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 39.0.0 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.1 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/12/e3/c46c274cf466b24e5d44df5d5cd31a31ff23e57f074a2bb30931a8c9b01a +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/6a/f5/a729774d087e50fffd1438b3877a91e9281294f985bda0fd15bf99016c78 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From yann.morin.1998 at free.fr Mon Feb 20 21:01:39 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:39 -0000 Subject: [Buildroot] [git commit branch/next] package/gtksourceview: switch to https download Message-ID: <20230220205238.1B055828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76c0ac9725cb798487ec44b1b67057d5cb895070 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gtksourceview/gtksourceview.hash | 2 +- package/gtksourceview/gtksourceview.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gtksourceview/gtksourceview.hash b/package/gtksourceview/gtksourceview.hash index 2e3c430ac0..7a9cf00655 100644 --- a/package/gtksourceview/gtksourceview.hash +++ b/package/gtksourceview/gtksourceview.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/gtksourceview-3.24.7.sha256sum: +# Hash from: https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.7.sha256sum: sha256 a5c20d3a6347533689358f3ea52486409f6dd41d5a69c65eab7570cfaffee8e6 gtksourceview-3.24.7.tar.xz # Locally computed: diff --git a/package/gtksourceview/gtksourceview.mk b/package/gtksourceview/gtksourceview.mk index ae1d3ff295..3f5aaea4ae 100644 --- a/package/gtksourceview/gtksourceview.mk +++ b/package/gtksourceview/gtksourceview.mk @@ -8,7 +8,7 @@ GTKSOURCEVIEW_VERSION_MAJOR = 3.24 GTKSOURCEVIEW_VERSION = $(GTKSOURCEVIEW_VERSION_MAJOR).7 GTKSOURCEVIEW_SOURCE = gtksourceview-$(GTKSOURCEVIEW_VERSION).tar.xz GTKSOURCEVIEW_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/gtksourceview/$(GTKSOURCEVIEW_VERSION_MAJOR) + https://download.gnome.org/sources/gtksourceview/$(GTKSOURCEVIEW_VERSION_MAJOR) GTKSOURCEVIEW_LICENSE = LGPL-2.1+ GTKSOURCEVIEW_LICENSE_FILES = COPYING GTKSOURCEVIEW_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sun Feb 19 20:54:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 19 Feb 2023 21:54:39 +0100 Subject: [Buildroot] [git commit branch/next] package/speechd: disable kali support Message-ID: <20230220205302.ADFCA86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8797f3fb272e9c1a5fe6a1953cacf6e5065a133a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable kali support as it is not needed and raises the following build failure without C++ since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: CXX sd_kali-kali.o /bin/sh: line 1: no: command not found Fixes: - http://autobuild.buildroot.org/results/2f6c8b3674753d6a9f165117c70e7dad88505505 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 0d43e4b6fb..46c0672f59 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,6 +12,7 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile +SPEECHD_CONF_OPTS = --without-kali # fix missing config.rpath (needed for autoreconf) in the codebase define SPEECHD_TOUCH_CONFIG_RPATH From yann.morin.1998 at free.fr Mon Feb 20 21:01:40 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:40 -0000 Subject: [Buildroot] [git commit branch/next] package/gupnp-dlna: switch to https download Message-ID: <20230220205238.30B2F81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b443913bcc4809c3fd29d8fa12e940e51225913a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN --- package/gupnp-dlna/gupnp-dlna.hash | 2 +- package/gupnp-dlna/gupnp-dlna.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gupnp-dlna/gupnp-dlna.hash b/package/gupnp-dlna/gupnp-dlna.hash index dd9f2e4e4f..c7cab2601c 100644 --- a/package/gupnp-dlna/gupnp-dlna.hash +++ b/package/gupnp-dlna/gupnp-dlna.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-dlna/0.12/gupnp-dlna-0.12.0.sha256sum: +# Hash from: https://download.gnome.org/sources/gupnp-dlna/0.12/gupnp-dlna-0.12.0.sha256sum: sha256 3d53b96f85bc5628d33e367ec9bf2adb38ef2b34d7ad0434a6ba0cf4ad9048e6 gupnp-dlna-0.12.0.tar.xz # Locally computed: diff --git a/package/gupnp-dlna/gupnp-dlna.mk b/package/gupnp-dlna/gupnp-dlna.mk index 64146f894b..0064700fd2 100644 --- a/package/gupnp-dlna/gupnp-dlna.mk +++ b/package/gupnp-dlna/gupnp-dlna.mk @@ -8,7 +8,7 @@ GUPNP_DLNA_VERSION_MAJOR = 0.12 GUPNP_DLNA_VERSION = $(GUPNP_DLNA_VERSION_MAJOR).0 GUPNP_DLNA_SOURCE = gupnp-dlna-$(GUPNP_DLNA_VERSION).tar.xz GUPNP_DLNA_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/gupnp-dlna/$(GUPNP_DLNA_VERSION_MAJOR) + https://download.gnome.org/sources/gupnp-dlna/$(GUPNP_DLNA_VERSION_MAJOR) # COPYING contains LGPL-2.1 but all source files contain LPGL-2.0+ GUPNP_DLNA_LICENSE = LGPL-2.0+ GUPNP_DLNA_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Feb 20 21:01:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:01:59 -0000 Subject: [Buildroot] [git commit branch/next] package/libosmium: bump version to 2.19.0 Message-ID: <20230220205239.DDFF586496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3621312a840306e38573c667459b5dee4db19531 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release-notes: https://github.com/osmcode/libosmium/releases/tag/v2.19.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/libosmium/libosmium.hash | 2 +- package/libosmium/libosmium.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libosmium/libosmium.hash b/package/libosmium/libosmium.hash index cb53a91c67..b055aa21ea 100644 --- a/package/libosmium/libosmium.hash +++ b/package/libosmium/libosmium.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c05a3e95c9c811521ebad8637e90f43ab8fb053b310875acce741cc4c17d6f59 libosmium-2.18.0.tar.gz +sha256 6911a8ca8e81d49205357177982df908af11376919f93b814cccf02f1d4d63e3 libosmium-2.19.0.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE diff --git a/package/libosmium/libosmium.mk b/package/libosmium/libosmium.mk index f7ced04de3..2725130e72 100644 --- a/package/libosmium/libosmium.mk +++ b/package/libosmium/libosmium.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSMIUM_VERSION = 2.18.0 +LIBOSMIUM_VERSION = 2.19.0 LIBOSMIUM_SITE = $(call github,osmcode,libosmium,v$(LIBOSMIUM_VERSION)) LIBOSMIUM_LICENSE = BSL-1.0 LIBOSMIUM_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:02:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:02:00 -0000 Subject: [Buildroot] [git commit branch/next] package/systemd: reenable utmp support Message-ID: <20230220205239.A9F24828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6789e8b8b5f39e0efb9f4a9af492de416c121c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This patch provides a way to enable utmp support when using systemd, with it disabled by default, as some security concerns may apply. Still, there are cases where having utmp is desirable, even though it is rare, so let's make this configurable. See commit 32f53bdfb482d0d78308e548c654898089b5c183. Signed-off-by: Casey Reeves Signed-off-by: Yann E. MORIN --- package/systemd/Config.in | 20 ++++++++++++++++++++ package/systemd/systemd.mk | 9 +++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 45a9e2d644..33ac03e584 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -518,6 +518,26 @@ config BR2_PACKAGE_SYSTEMD_USERDB https://www.freedesktop.org/software/systemd/man/systemd-userdbd.service.html +config BR2_PACKAGE_SYSTEMD_UTMP + bool "enable utmp support" + help + systemd-update-utmp-runlevel.service is a service that writes + SysV runlevel changes to utmp and wtmp, as well as the audit + logs, as they occur. systemd-update-utmp.service does the + same for system reboots and shutdown requests. + + https://www.freedesktop.org/software/systemd/man/systemd-update-utmp.service.html + + Utmp keeps track of what users do on the system (where they + logged from, on which terminal, ...) along with a general + status of the system (list of reboots, current uptime, current + number of users logged in). + + You should only enable this if your system will have actual + users who log in. + + https://man7.org/linux/man-pages/man5/utmp.5.html + config BR2_PACKAGE_SYSTEMD_VCONSOLE bool "enable vconsole tool" default y diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b96873b73f..f191542866 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -87,8 +87,7 @@ SYSTEMD_CONF_OPTS += \ -Dtelinit-path= \ -Dtests=false \ -Dtmpfiles=true \ - -Dumount-path=/usr/bin/umount \ - -Dutmp=false + -Dumount-path=/usr/bin/umount SYSTEMD_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_OPTIMIZE_FAST),y) @@ -331,6 +330,12 @@ else SYSTEMD_CONF_OPTS += -Dbinfmt=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_UTMP),y) +SYSTEMD_CONF_OPTS += -Dutmp=true +else +SYSTEMD_CONF_OPTS += -Dutmp=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_VCONSOLE),y) SYSTEMD_CONF_OPTS += -Dvconsole=true else From peter at korsgaard.com Mon Feb 20 21:02:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:00 -0000 Subject: [Buildroot] [git commit branch/next] package/libgit2: security bump to 1.5.1 Message-ID: <20230220205239.C57D681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc47da516cf5b76752d63361a8a7579d93e6fbbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes CVE-2023-22742: when compiled with BR2_PACKAGE_LIBSSH2, libgit2 fails to verify SSH keys by default. https://github.com/libgit2/libgit2/blob/v1.5.1/docs/changelog.md Signed-off-by: Nicolas Cavallari Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index fb760fd4cc..e834525df5 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e libgit2-1.5.0.tar.gz +sha256 7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88 libgit2-1.5.1.tar.gz sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 9409011eb4..c962c8030f 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.5.0 +LIBGIT2_VERSION = 1.5.1 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From peter at korsgaard.com Mon Feb 20 21:03:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:03:01 -0000 Subject: [Buildroot] [git commit branch/next] package/luaposix: bump to version 36.1 Message-ID: <20230220205245.62E2781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2c3e8ea8b2107ac514baddaed97921112a90cb7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/luaposix/luaposix.hash | 2 +- package/luaposix/luaposix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash index fc0b5fa747..2d54a6901e 100644 --- a/package/luaposix/luaposix.hash +++ b/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e0fcb4996f76aa49ae3e5edf69978171091e3d69d5de5589d591d227f8a427c1 luaposix-36.0.tar.gz +sha256 7944c2b4fbcef0667d407302740d87645325e751fd8d819f2b253c5d9ad0d497 luaposix-36.1.tar.gz sha256 ea0fdaae50b0d31a81c2c99f4354264783c71043fd40522feaa40eecc069599b LICENSE diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index 1a537defc4..d17c8188b5 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 36.0 +LUAPOSIX_VERSION = 36.1 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 21:03:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:03:02 -0000 Subject: [Buildroot] [git commit branch/next] package/libarchive: Only add "iconv" to the .pc file if needed Message-ID: <20230220205245.46BA886496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9525bc7e64e8f44c31ab9dfd3f516ecb35982429 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with fwup raised since bump to version 3.6.2 in commit 380341b249175382691f268de4b41d3843ff0acc and https://github.com/libarchive/libarchive/commit/a83f3d327aefe8d628230f326621b014d82f55b4 checking for pkg-config... /tmp/instance-19/output-1/host/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for ARCHIVE... no configure: error: Requires libarchive. Libarchive must be built with zlib support. Fixes: http://autobuild.buildroot.net/results/f5d/f5d549fb4f08156ba5952ce75926f7fd2242bfdf/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...1-Only-add-iconv-to-the-pc-file-if-needed.patch | 44 ++++++++++++++++++++++ package/libarchive/libarchive.mk | 4 ++ 2 files changed, 48 insertions(+) diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch new file mode 100644 index 0000000000..c93944f789 --- /dev/null +++ b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch @@ -0,0 +1,44 @@ +From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 +From: Peter Pentchev +Date: Thu, 29 Dec 2022 00:04:40 +0200 +Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) + +Hi, + +Thanks for writing and maintaining libarchive! + +What do you think about this trivial change that does not add "iconv" to +the pkg-config file's list of required packages unless it is actually +needed? On at least Debian GNU/Linux systems, the iconv(3) function is +part of the system C library and there is no Debian package that +installs an iconv.pc file, so I had to make this change to the Debian +package of libarchive. + +Thanks again, and keep up the great work! + +G'luck, +Peter + +Downloaded from upstream commit: +https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99bff20d1..e2715cfde 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then + AC_CHECK_HEADERS([localcharset.h]) + am_save_LIBS="$LIBS" + LIBS="${LIBS} ${LIBICONV}" +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" ++ if test -n "$LIBICONV"; then ++ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" ++ fi + AC_CHECK_FUNCS([locale_charset]) + LIBS="${am_save_LIBS}" + if test "x$ac_cv_func_locale_charset" != "xyes"; then diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cfc148d01d..cd7c13fbed 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -11,6 +11,10 @@ LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING LIBARCHIVE_CPE_ID_VENDOR = libarchive +# We're patching configure.ac +LIBARCHIVE_AUTORECONF = YES +# needed for autoreconf +LIBARCHIVE_DEPENDENCIES += host-pkgconf ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) From thomas.petazzoni at bootlin.com Mon Feb 6 17:54:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 6 Feb 2023 18:54:18 +0100 Subject: [Buildroot] [git commit branch/next] docs/manual: check-package before submitting patch Message-ID: <20230220205250.7FBC781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efccb2a7dd909f8f9b316d809859b9434a2737b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add 'utils/docker-run make check-package' to the default workflow of submitting patches, just after the rebase and before using format-patch. Cc: Thomas De Schampheleire Cc: Romain Naour Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- docs/manual/contribute.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index e588c69be6..94f1c64496 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -294,6 +294,12 @@ $ git fetch --all --tags $ git rebase origin/master --------------------- +Now check the coding style for the changes you committed: + +--------------------- +$ utils/docker-run make check-package +--------------------- + Now, you are ready to generate then submit your patch set. To generate it, run: From thomas.petazzoni at bootlin.com Tue Feb 7 08:24:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:24:16 +0100 Subject: [Buildroot] [git commit branch/next] utils/get-developers: bail out on parsing errors Message-ID: <20230220205251.20CF4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ee1dd85a34b6228c634a66450deefadbb2c9b50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Currently 4 types of parsing errors/warnings can be found: - entry for a file that is not in the tree anymore (warning) - developer entry with no file entry (error) - file entry with no developer (error) - entry that is not a developer, a file or a comment (hard error) Currently only the last one ends the script with -v with error code. Make all 3 error types into hard errors and bail out at the first error found, because the rest of the state machine is not designed to handle malformed input. Suggested-by: Thomas Petazzoni Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/testing/tests/utils/test_get_developers.py | 9 ++++----- utils/getdeveloperlib.py | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/testing/tests/utils/test_get_developers.py b/support/testing/tests/utils/test_get_developers.py index 12710fe8d3..0b313c7c59 100644 --- a/support/testing/tests/utils/test_get_developers.py +++ b/support/testing/tests/utils/test_get_developers.py @@ -70,11 +70,11 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) self.assertIn("Syntax error in DEVELOPERS file, line 1", err) - self.assertEqual(rc, 0) + self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) - # -v generating error for developer entry with no file entries + # -v generating error for developer entry with no file entries, stopping on first error developers = b'# comment\n' \ b'# comment\n' \ b'\n' \ @@ -84,10 +84,9 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) self.assertIn("Syntax error in DEVELOPERS file, line 1", err) - self.assertIn("Syntax error in DEVELOPERS file, line 2", err) - self.assertEqual(rc, 0) + self.assertEqual(rc, 1) self.assertEqual(len(out), 0) - self.assertEqual(len(err), 2) + self.assertEqual(len(err), 1) # -v not generating error for developer entry with empty list of file entries developers = b'# comment\n' \ diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index 2a8d5c213c..dbd21af443 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -243,6 +243,7 @@ def parse_developers(filename=None): if name is not None or len(files) != 0: print("Syntax error in DEVELOPERS file, line %d" % linen, file=sys.stderr) + return None name = line[2:].strip() elif line.startswith("F:"): fname = line[2:].strip() From thomas.petazzoni at bootlin.com Tue Feb 7 08:24:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 09:24:16 +0100 Subject: [Buildroot] [git commit branch/next] utils/get-developers: print error for correct line Message-ID: <20230220205251.2B38381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de03312db0190adc5b7dfa5b7658b2275801c933 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Start counting the line numbers in 1 instead of 0, in case an error must be printed. Both the error about a developer entry with no file entry and the error about a file entry with no developer entry actually belong to the non-empty line previous the one being analysed, so in these cases print the line number from the line before. Also count empty and comment lines, so a developer fixing the file can jump to the correct line (or the nearest one). At same time standardize the messages, printing the line number also in the case of a warning for a file that is not in the tree anymore. Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/testing/tests/utils/test_get_developers.py | 16 ++++++++-------- utils/getdeveloperlib.py | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/support/testing/tests/utils/test_get_developers.py b/support/testing/tests/utils/test_get_developers.py index 0b313c7c59..ffc01f6ce7 100644 --- a/support/testing/tests/utils/test_get_developers.py +++ b/support/testing/tests/utils/test_get_developers.py @@ -48,7 +48,7 @@ class TestGetDevelopers(unittest.TestCase): # -v generating error, called from the main dir developers = b'text1\n' out, err, rc = call_get_developers("./utils/get-developers", ["-v"], self.WITH_EMPTY_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 0: 'text1'", err) + self.assertIn("Syntax error in DEVELOPERS file, line 1: 'text1'", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -56,7 +56,7 @@ class TestGetDevelopers(unittest.TestCase): # -v generating error, called from path developers = b'text2\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 0: 'text2'", err) + self.assertIn("Syntax error in DEVELOPERS file, line 1: 'text2'", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -69,7 +69,7 @@ class TestGetDevelopers(unittest.TestCase): b'N:\tAuthor2 \n' \ b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 1", err) + self.assertIn("Syntax error in DEVELOPERS file, line 4", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -83,7 +83,7 @@ class TestGetDevelopers(unittest.TestCase): b'N:\tAuthor3 \n' \ b'F:\tutils/get-developers\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("Syntax error in DEVELOPERS file, line 1", err) + self.assertIn("Syntax error in DEVELOPERS file, line 4", err) self.assertEqual(rc, 1) self.assertEqual(len(out), 0) self.assertEqual(len(err), 1) @@ -108,8 +108,8 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tpath/that/does/not/exists/1\n' \ b'F:\tpath/that/does/not/exists/2\n' out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) - self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file", err) - self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file", err) + self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file, line 2", err) + self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file, line 3", err) self.assertEqual(rc, 0) self.assertEqual(len(out), 0) self.assertEqual(len(err), 2) @@ -119,8 +119,8 @@ class TestGetDevelopers(unittest.TestCase): b'F:\tpath/that/does/not/exists/1\n' \ b'F:\tpath/that/does/not/exists/2\n' out, err, rc = call_get_developers("./utils/get-developers", ["-c"], self.WITH_EMPTY_PATH, topdir, developers) - self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file", err) - self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file", err) + self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file, line 2", err) + self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file, line 3", err) self.assertEqual(rc, 0) self.assertGreater(len(out), 1000) self.assertEqual(len(err), 2) diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index dbd21af443..e7d0d23e49 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -236,12 +236,13 @@ def parse_developers(filename=None): files = [] name = None for line in f: + linen += 1 line = line.strip() if line.startswith("#"): continue elif line.startswith("N:"): if name is not None or len(files) != 0: - print("Syntax error in DEVELOPERS file, line %d" % linen, + print("Syntax error in DEVELOPERS file, line %d" % (linen - 1), file=sys.stderr) return None name = line[2:].strip() @@ -249,7 +250,7 @@ def parse_developers(filename=None): fname = line[2:].strip() dev_files = glob.glob(os.path.join(brpath, fname)) if len(dev_files) == 0: - print("WARNING: '%s' doesn't match any file" % fname, + print("WARNING: '%s' doesn't match any file, line %d" % (fname, linen), file=sys.stderr) for f in dev_files: dev_file = os.path.relpath(f, brpath) @@ -267,7 +268,6 @@ def parse_developers(filename=None): print("Syntax error in DEVELOPERS file, line %d: '%s'" % (linen, line), file=sys.stderr) return None - linen += 1 # handle last developer if name is not None: developers.append(Developer(name, files)) From peter at korsgaard.com Tue Feb 7 08:39:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 09:39:29 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: require English perl package for host-libxml-parser-perl Message-ID: <20230220205251.48C5781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f8085e63a4a755d587a25a73dbaafe33b23f867 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes http://autobuild.buildroot.net/results/166/1667b4ebd8e16e7d8b47bc3ca128a76daf27b4d9/ The configure script of host-libxml-parser-perl needs the English perl module on the host: ERROR from evaluation of /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/Expat/Makefile.PL: Can't locate English.pm in @INC (you may need to install the English module) (@INC contains: /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/inc /home/buildroot/autobuild/instance-1/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at ./Makefile.PL line 3. So add a check for it in dependencies.sh similar to the existing check for ExtUtils::MakeMaker. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index afd30008e8..ea16a21e20 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -266,6 +266,7 @@ fi # Check that the Perl installation is complete enough for Buildroot. required_perl_modules="Data::Dumper" # Needed to build host-autoconf +required_perl_modules="$required_perl_modules English" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl From peter at korsgaard.com Tue Feb 7 09:33:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 10:33:33 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: require open perl package for libxcrypt Message-ID: <20230220205251.717F5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4cdd99190e89d538c25a8fc701372775fbde3b97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/16c/16cba783be11cc5024f9c56bb0a7abb0acf13ef8/ The configure script of libxcrypt needs the open perl module on the host: Can't locate open.pm in @INC (you may need to install the open module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./build-aux/scripts/expand-selected-hashes line 20. So add a check for it in dependencies.sh similar to how it is done for mpv. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index ea16a21e20..353817f8fb 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -271,6 +271,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules open" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From thomas.petazzoni at bootlin.com Tue Feb 7 10:39:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:39:38 +0100 Subject: [Buildroot] [git commit branch/next] package/uuu: bump to version 1.5.21 Message-ID: <20230220205251.CBCBC81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ff52ac09b1c21fdce65deae39127b31d47858e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Fixed android super.img loop download 52byte after some block - Use login header as in curl - Skip sleep in usb_add - Add empty line after input password - linux prompt ask user name and password for http(s) download - fix linux build failure Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/uuu/uuu.hash | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index cc1cd83266..a5b665620c 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 932c0a4acde0f52b907f5693c6d133c83142c4ca6e9df05a38b3ac1e50628883 uuu_source-1.5.11.tar.gz +sha256 e89d3665af499ab71360d948176cf64619b082f8272a994d1fbfc000e67c0f14 uuu_source-1.5.21.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE sha256 584bfbb18b4c08b872d48b80419dd453307212a144134fb516bd6ddc0700c2e8 README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 647015e2dd..1a5f84ce4d 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.11 +UUU_VERSION = 1.5.21 UUU_SOURCE = uuu_source-$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License From yann.morin.1998 at free.fr Tue Feb 7 10:06:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:06:55 +0100 Subject: [Buildroot] [git commit branch/next] package/docker-cli: bump version to v23.0.0 Message-ID: <20230220205251.A72EC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5599cb1b41289adcff86ecf91ee6c069fefa9c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Like docker-engine, docker-cli uses a non-standard vendor/ directory structure, so we use the same fixes as we introduced for docker-engine (see commit: package/docker-engine: bump version to v23.0.0): - remove the problematic vendor/modules.txt - create a go.mod Signed-off-by: Christian Stewart [yann.morin.1998 at free.fr: - use post-extract hook - simplify commit message to refer to docker-engine ] Signed-off-by: Yann E. MORIN --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index c6db95f9b3..ff981be963 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz +sha256 3379d06cd6177832b91f4796c680b6bf15c7895773448716b4c3c5253f611d1b docker-cli-23.0.0.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index cb44c68c1b..d61f47e46e 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.22 +DOCKER_CLI_VERSION = 23.0.0 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 @@ -29,6 +29,15 @@ DOCKER_CLI_TAGS += osusergo netgo DOCKER_CLI_GO_ENV = CGO_ENABLED=no endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_FIX_VENDORING + printf "module $(DOCKER_CLI_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef +DOCKER_CLI_POST_EXTRACT_HOOKS += DOCKER_CLI_FIX_VENDORING + DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) $(eval $(golang-package)) From yann.morin.1998 at free.fr Tue Feb 7 10:05:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 11:05:45 +0100 Subject: [Buildroot] [git commit branch/next] package/docker-engine: bump version to v23.0.0 Message-ID: <20230220205251.8B31E81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=485b47e025541a58358d8852c600b8e7644b4ec6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This update requires a few workaround for the non-standard vendor/ structure in the docker-engine repository. First, as the vendor/ directory exists, our go-post-process script does not do the vendoring, and exits early, which is exactly what we need. Second, docker-engine does not use the "new" go.mod mechanism, so it does not ship any go.mod file, so our go-post-proces, exiting early, does not check that the go.mod file exists, and thus does not fail, which is again exactly what we need. Third, docker-engine has an invalid vendor/modules.txt file that we need to remove or go would fail to build. Since our go-post-process exits early, there is no vendoring, and thus it does not break at download, which once more is exactly what we need. However, the missing go.mod and the problematic vendor/modules.txt cause go to fail at build time, which this time is not really, even really not, what we want... So, we fix it up in two ways. First, the easy part: we just remove the problematic vendor/modules.txt file. Second, we create a go.mod to tell the Go compiler the root import path prefix for the module and the language version. Note that the language version in go.mod is not required to be equal the version of the Go compiler. Reference: https://github.com/moby/moby/issues/44618#issuecomment-1343565705 Note that as of v23.0.0 docker-engine expects containerd to be started by systemd if --containerd= flag is set in dockerd.service, whereas in previous versions containerd was started by the docker daemon as a sub-process. There is no sysv unit for containerd, but this is OK: in the Docker sysv init file S60dockerd, we do not set the --containerd flag. The docker daemon will start containerd as a sub-process automatically due to the absence of this flag. Signed-off-by: Christian Stewart [yann.morin.1998 at free.fr: - run fixups in post-extract hook - rework commit log for (hopefully) better explanations ] Signed-off-by: Yann E. MORIN --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d15b1359cb..670cbd414b 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz +sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 2a9b72ca78..c50f08245d 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.22 +DOCKER_ENGINE_VERSION = 23.0.0 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -62,6 +62,15 @@ else DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_ENGINE_FIX_VENDORING + printf "module $(DOCKER_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef +DOCKER_ENGINE_POST_EXTRACT_HOOKS += DOCKER_ENGINE_FIX_VENDORING + DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD From yann.morin.1998 at free.fr Tue Feb 7 11:28:32 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:28:32 +0100 Subject: [Buildroot] [git commit branch/next] toolchain/toolchain-wrapper.c: set CCACHE env variables only when ccache is enabled Message-ID: <20230220205252.03BDF86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=231d00e63ac08c98d7e823c3bd60a618ff322577 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This commit modifies the toolchain-wrapper to make sure that the CCACHE_COMPILERCHECK and CCACHE_BASEDIR are only set if ccache support is enabled. Indeed, when BR2_USE_CCACHE is not set (or to a value different than 1), we don't call the compiler with ccache, so there is no reason to set those ccache environment variables, and they could potentially conflict with a separate usage of ccache, outside of Buildroot, for example when using the Buildroot SDK. In particular, the value of CCACHE_BASEDIR doesn't not make any sense when the Buildroot toolchain is not used during the Buildroot build, as it points to the output directory $(BASE_DIR). We pay attention to also not show those variables as being set in the BR2_DEBUG_WRAPPER dump. To help a little bit with this, a ccache_enabled boolean is introduced to indicate when ccache is being used. There is still quite a bit of #ifdef-ery involved, but it's not easy to find a simpler way to organize the code. Signed-off-by: Thomas Petazzoni Tested-By: Vincent Fazio Signed-off-by: Yann E. MORIN --- toolchain/toolchain-wrapper.c | 49 ++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 4c08e97237..f66e588bfd 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -494,10 +494,28 @@ int main(int argc, char **argv) exec_args = args; #ifdef BR_CCACHE - /* If BR2_USE_CCACHE is not defined, or its value is not 1, - * skip the ccache call */ + /* If BR2_USE_CCACHE is set and its value is 1, enable ccache + * usage */ char *br_use_ccache = getenv("BR2_USE_CCACHE"); - if (!br_use_ccache || strncmp(br_use_ccache, "1", strlen("1"))) + bool ccache_enabled = br_use_ccache && !strncmp(br_use_ccache, "1", strlen("1")); + + if (ccache_enabled) { +#ifdef BR_CCACHE_HASH + /* Allow compilercheck to be overridden through the environment */ + if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { + perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); + return 3; + } +#endif +#ifdef BR_CCACHE_BASEDIR + /* Allow compilercheck to be overridden through the environment */ + if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { + perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); + return 3; + } +#endif + } else + /* ccache is disabled, skip it */ exec_args++; #endif @@ -505,12 +523,14 @@ int main(int argc, char **argv) if (debug > 0) { fprintf(stderr, "Toolchain wrapper executing:"); #ifdef BR_CCACHE_HASH - fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", - (debug == 2) ? "\n " : " "); + if (ccache_enabled) + fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", + (debug == 2) ? "\n " : " "); #endif #ifdef BR_CCACHE_BASEDIR - fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", - (debug == 2) ? "\n " : " "); + if (ccache_enabled) + fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", + (debug == 2) ? "\n " : " "); #endif for (i = 0; exec_args[i]; i++) fprintf(stderr, "%s'%s'", @@ -518,21 +538,6 @@ int main(int argc, char **argv) fprintf(stderr, "\n"); } -#ifdef BR_CCACHE_HASH - /* Allow compilercheck to be overridden through the environment */ - if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { - perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); - return 3; - } -#endif -#ifdef BR_CCACHE_BASEDIR - /* Allow compilercheck to be overridden through the environment */ - if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { - perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); - return 3; - } -#endif - if (execv(exec_args[0], exec_args)) perror(path); From thomas.petazzoni at bootlin.com Tue Feb 7 10:39:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 11:39:41 +0100 Subject: [Buildroot] [git commit branch/next] package/mcelog: bump to version 191 Message-ID: <20230220205251.D516D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=537daa143b237e88f2e272056bb05771db7f48d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Create .os_version to specify the version since there is no git checkout available. https://github.com/andikleen/mcelog/releases/tag/v191 https://github.com/andikleen/mcelog/releases/tag/v190 Signed-off-by: Jordan Speicher Signed-off-by: Thomas Petazzoni --- package/mcelog/mcelog.hash | 2 +- package/mcelog/mcelog.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash index e0350b085d..23fd4e50f3 100644 --- a/package/mcelog/mcelog.hash +++ b/package/mcelog/mcelog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 30364d134ff416f3f9469720add84bdccea226268d334f06022110f484550cd9 mcelog-189.tar.gz +sha256 b3b2616acde7afba4752d4dc447a2c2ad5a75da65e7496e0da30f8f8d2015cfa mcelog-191.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk index 8b5876d32e..9f7194e376 100644 --- a/package/mcelog/mcelog.mk +++ b/package/mcelog/mcelog.mk @@ -4,13 +4,14 @@ # ################################################################################ -MCELOG_VERSION = 189 +MCELOG_VERSION = 191 MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION)) MCELOG_LICENSE = GPL-2.0 MCELOG_LICENSE_FILES = LICENSE MCELOG_SELINUX_MODULES = mcelog define MCELOG_BUILD_CMDS + echo "$(MCELOG_VERSION)" > $(@D)/.os_version $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all endef From yann.morin.1998 at free.fr Tue Feb 7 11:10:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 12:10:46 +0100 Subject: [Buildroot] [git commit branch/next] package/balena-engine: bump to version 20.10.26 Message-ID: <20230220205251.EDBDB81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a1081dcbf8d706b08df53fe2ff2d652caf889ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Like docker-engine and docker-cli, balena-engine uses a non-standard vendor/ directory structure, so we use the same fixes as we introduced for docker-engine ((see commit: package/docker-engine: bump version to v23.0.0): - remove the problematic vendor/modules.txt - create a go.mod Also remove the vendor/archive/ sub-tree (fixes a build error) because Go no longer allows having duplicate packages in GOPATH and GOROOT. vendor/archive/tar cannot be in vendor/ because it exists in the standard library. Since we remove the full vendor/archive/, that is also fixed. https://github.com/balena-os/balena-engine/releases/tag/v20.10.26 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 4adb8ce561..6a92a40cc8 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz +sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index ecfb62bfbf..49d526a465 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 20.10.21 +BALENA_ENGINE_VERSION = 20.10.26 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 @@ -34,6 +34,17 @@ BALENA_ENGINE_TAGS = \ BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# remove the conflicting vendor/archive (not allowed in go1.20) +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define BALENA_ENGINE_FIX_VENDORING + printf "module $(BALENA_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt + rm -rf $(@D)/vendor/archive +endef +BALENA_ENGINE_POST_EXTRACT_HOOKS += BALENA_ENGINE_FIX_VENDORING + ifeq ($(BR2_INIT_SYSTEMD),y) BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald From thomas.petazzoni at bootlin.com Tue Feb 7 11:50:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 12:50:27 +0100 Subject: [Buildroot] [git commit branch/next] package/python-hkdf: new package Message-ID: <20230220205252.3387B81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=433ce2966f787248d5b8a62c46634e2f86250f8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next HMAC-based Extract-and-Expand Key Derivation Function (HKDF). https://github.com/casebeer/python-hkdf Signed-off-by: Julien Olivain [Thomas: justify the license.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/python-hkdf/Config.in | 7 +++++++ package/python-hkdf/python-hkdf.hash | 3 +++ package/python-hkdf/python-hkdf.mk | 17 +++++++++++++++++ .../testing/tests/package/sample_python_hkdf.py | 22 ++++++++++++++++++++++ support/testing/tests/package/test_python_hkdf.py | 11 +++++++++++ 7 files changed, 63 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f10036f7f2..69e73636be 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1693,6 +1693,7 @@ F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ +F: package/python-hkdf/ F: package/python-pyalsa/ F: package/rdma-core/ F: package/riscv-isa-sim/ @@ -1709,6 +1710,7 @@ F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py +F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_rdma_core.py diff --git a/package/Config.in b/package/Config.in index aa87f1305d..b28949500e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1073,6 +1073,7 @@ menu "External python modules" source "package/python-h11/Config.in" source "package/python-h2/Config.in" source "package/python-hiredis/Config.in" + source "package/python-hkdf/Config.in" source "package/python-hpack/Config.in" source "package/python-html5lib/Config.in" source "package/python-httplib2/Config.in" diff --git a/package/python-hkdf/Config.in b/package/python-hkdf/Config.in new file mode 100644 index 0000000000..2add348ca2 --- /dev/null +++ b/package/python-hkdf/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_HKDF + bool "python-hkdf" + help + HMAC-based Extract-and-Expand Key Derivation Function + (HKDF). + + https://github.com/casebeer/python-hkdf diff --git a/package/python-hkdf/python-hkdf.hash b/package/python-hkdf/python-hkdf.hash new file mode 100644 index 0000000000..87702b4582 --- /dev/null +++ b/package/python-hkdf/python-hkdf.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/hkdf/json +md5 d10471ad0ec891cdbe165d78282c943e hkdf-0.0.3.tar.gz +sha256 622a31c634bc185581530a4b44ffb731ed208acf4614f9c795bdd70e77991dca hkdf-0.0.3.tar.gz diff --git a/package/python-hkdf/python-hkdf.mk b/package/python-hkdf/python-hkdf.mk new file mode 100644 index 0000000000..8b68c5cc9f --- /dev/null +++ b/package/python-hkdf/python-hkdf.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-hkdf +# +################################################################################ + +PYTHON_HKDF_VERSION = 0.0.3 +PYTHON_HKDF_SOURCE = hkdf-$(PYTHON_HKDF_VERSION).tar.gz +PYTHON_HKDF_SITE = https://files.pythonhosted.org/packages/c3/be/327e072850db181ce56afd51e26ec7aa5659b18466c709fa5ea2548c935f +PYTHON_HKDF_SETUP_TYPE = setuptools +# No license file in the tree, but +# https://github.com/casebeer/python-hkdf/blob/master/LICENSE shows +# it's BSD-2-Clause. Issue already reported upstream: +# https://github.com/casebeer/python-hkdf/issues/6 +PYTHON_HKDF_LICENSE = BSD-2-Clause + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_hkdf.py b/support/testing/tests/package/sample_python_hkdf.py new file mode 100644 index 0000000000..a730c633e1 --- /dev/null +++ b/support/testing/tests/package/sample_python_hkdf.py @@ -0,0 +1,22 @@ +import hashlib +from binascii import hexlify, unhexlify + +from hkdf import Hkdf, hkdf_expand, hkdf_extract + +salt = b"ThisIsTheSalt." +key_in = b"ThisIsTheSecretKey" +key_info = b"KeyInfo1" +key_len = 16 +expected_key = unhexlify(b"b49d6cc9065b72f3a0859377d8bb7299") + +prk = hkdf_extract(salt, input_key_material=key_in, hash=hashlib.sha512) +key1 = hkdf_expand(prk, info=key_info, length=key_len) + +print("key1:", hexlify(key1)) +assert key1 == expected_key + +kdf = Hkdf(salt, input_key_material=key_in, hash=hashlib.sha512) +key2 = kdf.expand(info=key_info, length=key_len) + +print("key2:", hexlify(key2)) +assert key2 == expected_key diff --git a/support/testing/tests/package/test_python_hkdf.py b/support/testing/tests/package/test_python_hkdf.py new file mode 100644 index 0000000000..e93c24ff60 --- /dev/null +++ b/support/testing/tests/package/test_python_hkdf.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Hkdf(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_HKDF=y + """ + sample_scripts = ["tests/package/sample_python_hkdf.py"] From thomas.petazzoni at bootlin.com Tue Feb 7 12:41:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:41:48 +0100 Subject: [Buildroot] [git commit branch/next] package/python-spake2: new package Message-ID: <20230220205252.428C5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9aaef2a07780a200512ccadb2381c559c4ffd8e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next SPAKE2 password-authenticated key exchange (in pure python). This library implements the SPAKE2 password-authenticated key exchange ("PAKE") algorithm. This allows two parties, who share a weak password, to safely derive a strong shared secret (and therefore build an encrypted+authenticated channel). https://github.com/warner/python-spake2 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-spake2/Config.in | 13 +++++++++++++ package/python-spake2/python-spake2.hash | 5 +++++ package/python-spake2/python-spake2.mk | 14 ++++++++++++++ .../testing/tests/package/sample_python_spake2.py | 22 ++++++++++++++++++++++ .../testing/tests/package/test_python_spake2.py | 11 +++++++++++ 7 files changed, 69 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 69e73636be..a631c32405 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1695,6 +1695,7 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-hkdf/ F: package/python-pyalsa/ +F: package/python-spake2/ F: package/rdma-core/ F: package/riscv-isa-sim/ F: package/tinycompress/ @@ -1703,6 +1704,7 @@ 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/sample_python_pyalsa.py +F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py @@ -1713,6 +1715,7 @@ F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_z3.py diff --git a/package/Config.in b/package/Config.in index b28949500e..ec7a6483f6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1290,6 +1290,7 @@ menu "External python modules" source "package/python-sockjs/Config.in" source "package/python-sortedcontainers/Config.in" source "package/python-soupsieve/Config.in" + source "package/python-spake2/Config.in" source "package/python-spidev/Config.in" source "package/python-sqlalchemy/Config.in" source "package/python-sqliteschema/Config.in" diff --git a/package/python-spake2/Config.in b/package/python-spake2/Config.in new file mode 100644 index 0000000000..1c2e3a49af --- /dev/null +++ b/package/python-spake2/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_SPAKE2 + bool "python-spake2" + select BR2_PACKAGE_PYTHON_HKDF # runtime + help + SPAKE2 password-authenticated key exchange (in pure python). + + This library implements the SPAKE2 password-authenticated + key exchange ("PAKE") algorithm. This allows two parties, + who share a weak password, to safely derive a strong shared + secret (and therefore build an encrypted+authenticated + channel). + + https://github.com/warner/python-spake2 diff --git a/package/python-spake2/python-spake2.hash b/package/python-spake2/python-spake2.hash new file mode 100644 index 0000000000..30052b1b36 --- /dev/null +++ b/package/python-spake2/python-spake2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/spake2/json +md5 0155bad518bb49c39994fe0b7d9fb32c spake2-0.8.tar.gz +sha256 c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4 spake2-0.8.tar.gz +# Locally computed sha256 checksums +sha256 2a8a1200c3a2769d1815727f3b4439bd800f3bc88163118a36ff30b007d30031 LICENSE diff --git a/package/python-spake2/python-spake2.mk b/package/python-spake2/python-spake2.mk new file mode 100644 index 0000000000..99ce7dae13 --- /dev/null +++ b/package/python-spake2/python-spake2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-spake2 +# +################################################################################ + +PYTHON_SPAKE2_VERSION = 0.8 +PYTHON_SPAKE2_SOURCE = spake2-$(PYTHON_SPAKE2_VERSION).tar.gz +PYTHON_SPAKE2_SITE = https://files.pythonhosted.org/packages/60/0b/bb5eca8e18c38a10b1c207bbe6103df091e5cf7b3e5fdc0efbcad7b85b60 +PYTHON_SPAKE2_SETUP_TYPE = setuptools +PYTHON_SPAKE2_LICENSE = MIT +PYTHON_SPAKE2_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_spake2.py b/support/testing/tests/package/sample_python_spake2.py new file mode 100644 index 0000000000..49dd914ca8 --- /dev/null +++ b/support/testing/tests/package/sample_python_spake2.py @@ -0,0 +1,22 @@ +from binascii import hexlify + +from spake2 import SPAKE2_A, SPAKE2_B + + +shared_password = b"This Is The Password!" + +alice = SPAKE2_A(shared_password) +alice_msg = alice.start() + +bob = SPAKE2_B(shared_password) +bob_msg = bob.start() + +# Alice and Bob exchange their messages... + +alice_key = alice.finish(bob_msg) +bob_key = bob.finish(alice_msg) + +print("alice_key:", hexlify(alice_key)) +print(" bob_key:", hexlify(bob_key)) + +assert alice_key == bob_key diff --git a/support/testing/tests/package/test_python_spake2.py b/support/testing/tests/package/test_python_spake2.py new file mode 100644 index 0000000000..fb47a0802c --- /dev/null +++ b/support/testing/tests/package/test_python_spake2.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Spake2(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_SPAKE2=y + """ + sample_scripts = ["tests/package/sample_python_spake2.py"] From thomas.petazzoni at bootlin.com Tue Feb 7 12:47:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:47:55 +0100 Subject: [Buildroot] [git commit branch/next] package/python-magic-wormhole: new package Message-ID: <20230220205252.5083581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb013c3757548f3153a9da59906c388d32a376fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Securely transfer data between computers. This package provides a library and a command-line tool named "wormhole", which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. The two endpoints are identified by using identical "wormhole codes": in general, the sending machine generates and displays the code, which must then be typed into the receiving machine. https://github.com/magic-wormhole/magic-wormhole Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-magic-wormhole/Config.in | 27 ++++++++++++++++++++++ .../python-magic-wormhole.hash | 5 ++++ .../python-magic-wormhole/python-magic-wormhole.mk | 14 +++++++++++ 5 files changed, 48 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a631c32405..8d1d9340bb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1694,6 +1694,7 @@ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ F: package/python-hkdf/ +F: package/python-magic-wormhole/ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ diff --git a/package/Config.in b/package/Config.in index ec7a6483f6..cb9a2b829f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1120,6 +1120,7 @@ menu "External python modules" source "package/python-logstash/Config.in" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" + source "package/python-magic-wormhole/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-magic-wormhole/Config.in b/package/python-magic-wormhole/Config.in new file mode 100644 index 0000000000..e8429d203b --- /dev/null +++ b/package/python-magic-wormhole/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE + bool "python-magic-wormhole" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime + select BR2_PACKAGE_PYTHON_AUTOMAT # runtime + select BR2_PACKAGE_PYTHON_CLICK # runtime + select BR2_PACKAGE_PYTHON_HKDF # runtime + select BR2_PACKAGE_PYTHON_HUMANIZE # runtime + select BR2_PACKAGE_PYTHON_PYNACL # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_SPAKE2 # runtime + select BR2_PACKAGE_PYTHON_TQDM # runtime + select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_TXTORCON # runtime + help + Securely transfer data between computers. + + This package provides a library and a command-line tool + named "wormhole", which makes it possible to get + arbitrary-sized files and directories (or short pieces of + text) from one computer to another. The two endpoints are + identified by using identical "wormhole codes": in general, + the sending machine generates and displays the code, which + must then be typed into the receiving machine. + + https://github.com/magic-wormhole/magic-wormhole diff --git a/package/python-magic-wormhole/python-magic-wormhole.hash b/package/python-magic-wormhole/python-magic-wormhole.hash new file mode 100644 index 0000000000..5e880d5427 --- /dev/null +++ b/package/python-magic-wormhole/python-magic-wormhole.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole/json +md5 ca190d92f56fe32ec8dfd4fc5aab8337 magic-wormhole-0.12.0.tar.gz +sha256 1b0fd8a334da978f3dd96b620fa9b9348cabedf26a87f74baac7a37052928160 magic-wormhole-0.12.0.tar.gz +# Locally computed sha256 checksums +sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE diff --git a/package/python-magic-wormhole/python-magic-wormhole.mk b/package/python-magic-wormhole/python-magic-wormhole.mk new file mode 100644 index 0000000000..91f0f826d5 --- /dev/null +++ b/package/python-magic-wormhole/python-magic-wormhole.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_VERSION = 0.12.0 +PYTHON_MAGIC_WORMHOLE_SOURCE = magic-wormhole-$(PYTHON_MAGIC_WORMHOLE_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_SITE = https://files.pythonhosted.org/packages/d4/62/5e4a86f7c4b111e016577f1b304063ebe604f430db15465ac58b13993608 +PYTHON_MAGIC_WORMHOLE_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 13:01:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:01:05 +0100 Subject: [Buildroot] [git commit branch/next] support/testing/tests/package/test_python_magic_wormhole.py: new runtime test Message-ID: <20230220205252.7859481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e23807372370974a307b3c70ef9d77964a149ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../tests/package/test_python_magic_wormhole.py | 62 ++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5776d6d7a5..8dde37bd67 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1717,6 +1717,7 @@ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py +F: support/testing/tests/package/test_python_magic_wormhole.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py diff --git a/support/testing/tests/package/test_python_magic_wormhole.py b/support/testing/tests/package/test_python_magic_wormhole.py new file mode 100644 index 0000000000..d6541a2480 --- /dev/null +++ b/support/testing/tests/package/test_python_magic_wormhole.py @@ -0,0 +1,62 @@ +import os + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3MagicWormhole(TestPythonPackageBase): + __test__ = True + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE=y + BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER=y + BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + timeout = 60 + + def twistd_cmd(self, command): + s = "twistd" + s += " --pidfile=/tmp/{}.pid".format(command) + s += " --logfile=/tmp/{}.log".format(command) + s += " {}".format(command) + + return s + + def test_run(self): + code = "123-hello-buildroot" + text = "Hello Buildroot!" + + relay_url = "ws://localhost:4000/v1" + transit_helper = "tcp:localhost:4001" + + img = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", kernel="builtin", + options=["-initrd", img]) + + self.emulator.login() + + cmd = self.twistd_cmd("wormhole-mailbox") + self.assertRunOk(cmd, timeout=30) + + cmd = self.twistd_cmd("transitrelay") + self.assertRunOk(cmd, timeout=30) + + wormhole_cmd = "wormhole --relay-url={} --transit-helper={}".format( + relay_url, transit_helper) + + cmd = wormhole_cmd + " send --code={} --text=\"{}\" & ".format(code, text) + cmd += "sleep 25" + self.assertRunOk(cmd, timeout=30) + + cmd = wormhole_cmd + " receive {}".format(code) + output, exit_code = self.emulator.run(cmd, timeout=35) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], text) From peter at korsgaard.com Tue Feb 7 13:52:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 14:52:26 +0100 Subject: [Buildroot] [git commit branch/next] package/mesa3d-headers: only check for conflicts when building Message-ID: <20230220205252.A962981979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=509956da4cdba6a76214322b1ace979bbe6cd6a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 03bf635816..9177adceda 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -6,7 +6,7 @@ # mesa3d-headers is inherently incompatible with mesa3d, so error out # if both are enabled. -ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yy) +ifeq ($(BR_BUILDING)$(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yyy) $(error mesa3d-headers enabled, but mesa3d enabled too) endif From thomas.petazzoni at bootlin.com Tue Feb 7 12:54:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:54:07 +0100 Subject: [Buildroot] [git commit branch/next] package/python-magic-wormhole-mailbox-server: new package Message-ID: <20230220205252.5E55C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9244052f28d87d6d85b73402e7d15f730eb66c4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This package is the main server that Magic-Wormhole clients connect to. The server performs store-and-forward delivery for small key-exchange and control messages. Bulk data is sent over a direct TCP connection, or through a transit-relay. https://github.com/magic-wormhole/magic-wormhole-mailbox-server Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...move-the-U-open-mode-removed-in-Python-3..patch | 39 ++++++++++++++++++++++ .../python-magic-wormhole-mailbox-server/Config.in | 15 +++++++++ .../python-magic-wormhole-mailbox-server.hash | 5 +++ .../python-magic-wormhole-mailbox-server.mk | 14 ++++++++ 6 files changed, 75 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8d1d9340bb..afc079a609 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1695,6 +1695,7 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-hkdf/ F: package/python-magic-wormhole/ +F: package/python-magic-wormhole-mailbox-server/ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ diff --git a/package/Config.in b/package/Config.in index cb9a2b829f..2ef403168a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1121,6 +1121,7 @@ menu "External python modules" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" source "package/python-magic-wormhole/Config.in" + source "package/python-magic-wormhole-mailbox-server/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch b/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch new file mode 100644 index 0000000000..8afe7c9546 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch @@ -0,0 +1,39 @@ +From df6126ee86c1f84c7e0c25fcf69543b83b1b32c6 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 5 Nov 2022 13:06:07 +0100 +Subject: [PATCH] setup.py: remove the 'U' open mode removed in Python 3.11 + +The 'U' open mode was removed in Python 3.11. See: +https://docs.python.org/3.11/library/functions.html#open + +Installing with Python 3.11 fails with: + + /path/to/python-magic-wormhole-mailbox-server-0.4.1/setup.py", line 20, in + long_description=open('README.md', 'rU').read(), + ^^^^^^^^^^^^^^^^^^^^^^^ + ValueError: invalid mode: 'rU' + +This patch removes the 'U' open mode. + +Upstream: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/commit/df6126ee86c1f84c7e0c25fcf69543b83b1b32c6 +Signed-off-by: Julien Olivain +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 6ef292f..ad9ff5a 100644 +--- a/setup.py ++++ b/setup.py +@@ -17,7 +17,7 @@ trove_classifiers = [ + setup(name="magic-wormhole-mailbox-server", + version=versioneer.get_version(), + description="Securely transfer data between computers", +- long_description=open('README.md', 'rU').read(), ++ long_description=open('README.md', 'r').read(), + long_description_content_type='text/markdown', + author="Brian Warner", + author_email="warner-magic-wormhole at lothar.com", +-- +2.38.1 + diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in new file mode 100644 index 0000000000..db20d3e7b6 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER + bool "python-magic-wormhole-mailbox-server" + select BR2_PACKAGE_PYTHON3_SQLITE # runtime + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_TWISTED # runtime + help + This package is the main server that Magic-Wormhole clients + connect to. The server performs store-and-forward delivery + for small key-exchange and control messages. Bulk data is + sent over a direct TCP connection, or through a + transit-relay. + + https://github.com/magic-wormhole/magic-wormhole-mailbox-server diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash new file mode 100644 index 0000000000..c714712641 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole-mailbox-server/json +md5 3da441df1f354a8399a728da3421ac8f magic-wormhole-mailbox-server-0.4.1.tar.gz +sha256 1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb magic-wormhole-mailbox-server-0.4.1.tar.gz +# Locally computed sha256 checksums +sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk new file mode 100644 index 0000000000..a3394c7dcd --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole-mailbox-server +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION = 0.4.1 +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SOURCE = magic-wormhole-mailbox-server-$(PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SITE = https://files.pythonhosted.org/packages/5b/ba/cbb211bc8f8bfdf7fb620d33331f07bcd889c7a28e7fd8a0de9029bb5a2f +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit branch/next] package/cli11: new package Message-ID: <20230220205252.D640781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f25b760186b72d2224d7087324ca5f2baeafb8b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/cli11/Config.in | 13 +++++++++++++ package/cli11/cli11.hash | 3 +++ package/cli11/cli11.mk | 15 +++++++++++++++ 5 files changed, 33 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8dde37bd67..830dab56f0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2787,6 +2787,7 @@ N: Sven Oliver Moll F: package/most/ N: TIAN Yuanhao +F: package/cli11/ F: package/open-isns/ N: Tan En De diff --git a/package/Config.in b/package/Config.in index b5418c56f6..3773901552 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2150,6 +2150,7 @@ endmenu menu "Text and terminal handling" source "package/augeas/Config.in" + source "package/cli11/Config.in" source "package/docopt-cpp/Config.in" source "package/enchant/Config.in" source "package/fmt/Config.in" diff --git a/package/cli11/Config.in b/package/cli11/Config.in new file mode 100644 index 0000000000..87db9ac8f7 --- /dev/null +++ b/package/cli11/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_CLI11 + bool "cli11" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + CLI11 is a command line parser for C++11 and beyond that + provides a rich feature set with a simple and intuitive + interface. + + https://github.com/CLIUtils/CLI11 + +comment "cli11 needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/cli11/cli11.hash b/package/cli11/cli11.hash new file mode 100644 index 0000000000..12e5b4fb55 --- /dev/null +++ b/package/cli11/cli11.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 378da73d2d1d9a7b82ad6ed2b5bda3e7bc7093c4034a1d680a2e009eb067e7b2 cli11-2.3.1.tar.gz +sha256 89022151dbf5827a22430557ef2f8a75808dd25fa1e9a12709ef5421d363e66d LICENSE diff --git a/package/cli11/cli11.mk b/package/cli11/cli11.mk new file mode 100644 index 0000000000..b02bd4478f --- /dev/null +++ b/package/cli11/cli11.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# cli11 +# +################################################################################ + +CLI11_VERSION = 2.3.1 +CLI11_SITE = $(call github,CLIUtils,CLI11,v$(CLI11_VERSION)) +CLI11_LICENSE = BSD-3-Clause +CLI11_LICENSE_FILES = LICENSE +CLI11_INSTALL_STAGING = YES +CLI11_INSTALL_TARGET = NO +CLI11_CONF_OPTS = -DCLI11_BUILD_DOCS=OFF -DCLI11_BUILD_EXAMPLES=OFF + +$(eval $(cmake-package)) From arnout at mind.be Tue Feb 7 13:30:56 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 14:30:56 +0100 Subject: [Buildroot] [git commit branch/next] package/busybox: update to 1.36.0 Message-ID: <20230220205252.8491B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d68b617993bd2f5c82a4936ed1e24e4fec6b94a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Remove upstream patch 0003-awk-fix-use-after-free-CVE-2022-30065.patch and update _IGNORE_CVES accordingly. The two other CVE fixes are still not applied upstream. Renumber the patches and update the comment in the .mk file. Refresh busybox.config. All configs are set to the new defaults, except for CONFIG_UDHCPC_DEFAULT_SCRIPT: for this one, reuse the script we also use for DHCPv4. This is matches the behaviour previous to the bump, where we had a single script handling both. Signed-off-by: Arnout Vandecappelle --- ...003-awk-fix-use-after-free-CVE-2022-30065.patch | 52 ---------------------- ...dr2str-ensure-only-printable-characters-.patch} | 0 ...itize-all-printed-strings-with-printable.patch} | 0 package/busybox/busybox.config | 23 +++++++--- package/busybox/busybox.hash | 2 +- package/busybox/busybox.mk | 8 ++-- 6 files changed, 21 insertions(+), 64 deletions(-) diff --git a/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch b/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch deleted file mode 100644 index f9bfee328e..0000000000 --- a/package/busybox/0003-awk-fix-use-after-free-CVE-2022-30065.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e06b1f0839972cc3f5b432849d574d14a8f17613 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Fri, 17 Jun 2022 17:45:34 +0200 -Subject: [PATCH] awk: fix use after free (CVE-2022-30065) - -fixes https://bugs.busybox.net/show_bug.cgi?id=14781 - -function old new delta -evaluate 3343 3357 +14 - -Signed-off-by: Natanael Copa -Signed-off-by: Denys Vlasenko -Backport: https://git.busybox.net/busybox/commit/?id=e63d7cdfdac78c6fd27e9e63150335767592b85e -[straightforward conflict resolution in testsuite/awk.tests] -Signed-off-by: Quentin Schulz ---- - editors/awk.c | 3 +++ - testsuite/awk.tests | 6 ++++++ - 2 files changed, 9 insertions(+) - -diff --git a/editors/awk.c b/editors/awk.c -index f6314ac72..654cbac33 100644 ---- a/editors/awk.c -+++ b/editors/awk.c -@@ -3114,6 +3114,9 @@ static var *evaluate(node *op, var *res) - - case XC( OC_MOVE ): - debug_printf_eval("MOVE\n"); -+ /* make sure that we never return a temp var */ -+ if (L.v == TMPVAR0) -+ L.v = res; - /* if source is a temporary string, jusk relink it to dest */ - if (R.v == TMPVAR1 - && !(R.v->type & VF_NUMBER) -diff --git a/testsuite/awk.tests b/testsuite/awk.tests -index bcaafe8fd..156aa65eb 100755 ---- a/testsuite/awk.tests -+++ b/testsuite/awk.tests -@@ -469,4 +469,10 @@ testing 'awk printf %% prints one %' \ - "%\n" \ - '' '' - -+testing 'awk assign while test' \ -+ "awk '\$1==\$1=\"foo\" {print \$1}'" \ -+ "foo\n" \ -+ "" \ -+ "foo" -+ - exit $FAILCOUNT --- -2.37.3 - diff --git a/package/busybox/0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch b/package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch similarity index 100% rename from package/busybox/0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch rename to package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch diff --git a/package/busybox/0005-nslookup-sanitize-all-printed-strings-with-printable.patch b/package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch similarity index 100% rename from package/busybox/0005-nslookup-sanitize-all-printed-strings-with-printable.patch rename to package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index e7f628ca6d..4826fb8242 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.35.0 -# Thu Jan 27 10:16:54 2022 +# Busybox version: 1.36.0 +# Tue Feb 7 12:34:02 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA1_SMALL=3 +CONFIG_SHA1_HWACCEL=y +CONFIG_SHA256_HWACCEL=y CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_NON_POSIX_CP=y # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set @@ -123,6 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=0 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets @@ -338,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y CONFIG_TRUNCATE=y +CONFIG_TSORT=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux" @@ -520,7 +527,7 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y -# CONFIG_USE_BB_CRYPT_SHA is not set +CONFIG_USE_BB_CRYPT_SHA=y # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set CONFIG_ADDGROUP=y @@ -811,10 +818,10 @@ CONFIG_FEATURE_LESS_TRUNCATE=y CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_FEATURE_LESS_WINCH is not set # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set +CONFIG_FEATURE_LESS_DASHCMD=y # CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_FEATURE_LESS_RAW is not set -# CONFIG_FEATURE_LESS_ENV is not set +CONFIG_FEATURE_LESS_RAW=y +CONFIG_FEATURE_LESS_ENV=y CONFIG_LSSCSI=y CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set @@ -831,10 +838,12 @@ CONFIG_PARTPROBE=y # CONFIG_RFKILL is not set CONFIG_RUNLEVEL=y # CONFIG_RX is not set +CONFIG_SEEDRNG=y CONFIG_SETFATTR=y CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y +CONFIG_TREE=y CONFIG_TS=y # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set @@ -1007,6 +1016,7 @@ CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC6_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" # CONFIG_UDHCPC6 is not set # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set @@ -1141,6 +1151,7 @@ CONFIG_ASH_IDLE_TIMEOUT=y CONFIG_ASH_ECHO=y CONFIG_ASH_PRINTF=y CONFIG_ASH_TEST=y +CONFIG_ASH_SLEEP=y CONFIG_ASH_HELP=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 2091cdaf65..6d1c36906d 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ # From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 -sha256 faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 busybox-1.35.0.tar.bz2 +sha256 542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5 busybox-1.36.0.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index f8f9cb5616..1633ca525d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,17 +4,15 @@ # ################################################################################ -BUSYBOX_VERSION = 1.35.0 +BUSYBOX_VERSION = 1.36.0 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 BUSYBOX_LICENSE_FILES = LICENSE archival/libarchive/bz/LICENSE BUSYBOX_CPE_ID_VENDOR = busybox -# 0003-awk-fix-use-after-free-CVE-2022-30065.patch -BUSYBOX_IGNORE_CVES += CVE-2022-30065 -# 0004-libbb-sockaddr2str-ensure-only-printable-characters-.patch -# 0005-nslookup-sanitize-all-printed-strings-with-printable.patch +# 0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch +# 0004-nslookup-sanitize-all-printed-strings-with-printable.patch BUSYBOX_IGNORE_CVES += CVE-2022-28391 BUSYBOX_CFLAGS = \ From arnout at mind.be Tue Feb 7 15:03:27 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 16:03:27 +0100 Subject: [Buildroot] [git commit branch/next] package/urandom-scripts: actually credit seed files via seedrng Message-ID: <20230220205252.C3366828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a6f9d2516820c296a8af788b259ca96926cd60d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, Busybox 1.36.0 contains SeedRNG, a tiny program meant to be called at startup and shutdown (and at arbitrary other points in between if desired). Note that initially, the way seedrng was included in busybox broke things quite severely, but now it's been reverted to a reasonably acceptable version. This is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. Because seedrng is part of busybox, urandom-scripts now depends on BR2_PACKAGE_BUSYBOX. This can be removed again if later we add a standalone seedrng package. Add a decent explanation to the init script about the need for a persistent directory to make this actually work. Signed-off-by: Jason A. Donenfeld [Arnout: - Remove busybox patch, it's now part of busybox 1.36.0. - Depend on busybox. - Fix shellcheck errors. - Use DAEMON and SEEDRNG_ARGS. - Don't bother with "seed_dir" and "skip_credit" variables. - Rename to S20seedrng. ] Signed-off-by: Arnout Vandecappelle --- package/urandom-scripts/Config.in | 5 +-- package/urandom-scripts/S20seedrng | 40 +++++++++++++++++ package/urandom-scripts/S20urandom | 70 ------------------------------ package/urandom-scripts/urandom-scripts.mk | 4 +- 4 files changed, 43 insertions(+), 76 deletions(-) diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in index 987e442e22..6b4a609f95 100644 --- a/package/urandom-scripts/Config.in +++ b/package/urandom-scripts/Config.in @@ -1,10 +1,7 @@ config BR2_PACKAGE_URANDOM_SCRIPTS bool "urandom-initscripts" default y if BR2_PACKAGE_INITSCRIPTS + depends on BR2_PACKAGE_BUSYBOX 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/S20seedrng b/package/urandom-scripts/S20seedrng new file mode 100644 index 0000000000..0fea0bea83 --- /dev/null +++ b/package/urandom-scripts/S20seedrng @@ -0,0 +1,40 @@ +#! /bin/sh +# +# Preserve the random seed between reboots. See urandom(4). +# +# This script can be called multiple times during operation (e.g. with +# "reload" argument) to refresh the seed. + +# The following arguments can be added to SEEDRNG_ARGS in +# /etc/default/seedrng: +# --seed-dir=/path/to/seed/directory +# Path to the directory where the seed and the lock files are stored. +# for optimal operation, this should be a persistent, writeable +# location. Default is /var/lib/seedrng +# +# --skip-credit +# 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. +# +# Example: +# SEEDRNG_ARGS="--seed-dir=/data/seedrng --skip-credit" +# + +DAEMON="seedrng" +SEEDRNG_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +case "$1" in + start|stop|restart|reload) + # Never fail, as this isn't worth making a fuss + # over if it doesn't go as planned. + # shellcheck disable=SC2086 # we need the word splitting + seedrng $SEEDRNG_ARGS || true;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom deleted file mode 100644 index 6c6aea9eee..0000000000 --- a/package/urandom-scripts/S20urandom +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/sh -# -# 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" - -# 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() { - [ -f "$URANDOM_SEED" ] || return 0 - 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;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 2c09728c46..32f3e09343 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -5,8 +5,8 @@ ################################################################################ define URANDOM_SCRIPTS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ - $(TARGET_DIR)/etc/init.d/S20urandom + $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20seedrng \ + $(TARGET_DIR)/etc/init.d/S20seedrng endef $(eval $(generic-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit branch/next] package/libsolv: new package Message-ID: <20230220205253.13AC481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93ce3c1be0753189d6af3ee9968b935037519c25 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Required by micromamba. Signed-off-by: TIAN Yuanhao [Thomas: - rework shared/static lib handling - don't pass ENABLE_CONDA=ON based on BR2_PACKAGE_MICROMAMBA=y as it's weird that a dependency does something different depending on which of its reverse dependencies is enabled] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libsolv/Config.in | 9 +++++++++ package/libsolv/libsolv.hash | 3 +++ package/libsolv/libsolv.mk | 27 +++++++++++++++++++++++++++ 5 files changed, 41 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 220a326adc..e8ddad71cd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2788,6 +2788,7 @@ F: package/most/ N: TIAN Yuanhao F: package/cli11/ +F: package/libsolv/ F: package/open-isns/ F: package/termcolor/ F: package/tl-expected/ diff --git a/package/Config.in b/package/Config.in index fa0713c311..6ca4c61959 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2085,6 +2085,7 @@ menu "Other" source "package/libshdata/Config.in" source "package/libsigc/Config.in" source "package/libsigsegv/Config.in" + source "package/libsolv/Config.in" source "package/libspatialindex/Config.in" source "package/libtalloc/Config.in" source "package/libtasn1/Config.in" diff --git a/package/libsolv/Config.in b/package/libsolv/Config.in new file mode 100644 index 0000000000..1415d2bc2b --- /dev/null +++ b/package/libsolv/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBSOLV + bool "libsolv" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_ZLIB + help + A free package dependency solver using a satisfiability + algorithm. + + https://github.com/openSUSE/libsolv diff --git a/package/libsolv/libsolv.hash b/package/libsolv/libsolv.hash new file mode 100644 index 0000000000..162e46e54d --- /dev/null +++ b/package/libsolv/libsolv.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 968aef452b5493751fa0168cd58745a77c755e202a43fe8d549d791eb16034d5 libsolv-0.7.22.tar.gz +sha256 57f15acfb29fbef7749779e096a5885c60b716633e34484a21bb717554c0198f LICENSE.BSD diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk new file mode 100644 index 0000000000..144ce68a83 --- /dev/null +++ b/package/libsolv/libsolv.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# libsolv +# +################################################################################ + +LIBSOLV_VERSION = 0.7.22 +LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) +LIBSOLV_LICENSE = BSD-3-Clause +LIBSOLV_LICENSE_FILES = LICENSE.BSD +LIBSOLV_INSTALL_STAGING = YES +LIBSOLV_DEPENDENCIES = zlib +LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON +else +LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON +endif + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON +else +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON +endif + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit branch/next] package/tl-expected: new package Message-ID: <20230220205253.06C1F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ffbc3a9cb9d4386f6ae171207f7b85ef182e8a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/tl-expected/Config.in | 12 ++++++++++++ package/tl-expected/tl-expected.hash | 3 +++ package/tl-expected/tl-expected.mk | 20 ++++++++++++++++++++ 5 files changed, 37 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 9cc080f7a4..220a326adc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2790,6 +2790,7 @@ N: TIAN Yuanhao F: package/cli11/ F: package/open-isns/ F: package/termcolor/ +F: package/tl-expected/ N: Tan En De F: package/libkcapi/ diff --git a/package/Config.in b/package/Config.in index e1a1b153b1..fa0713c311 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2132,6 +2132,7 @@ endif source "package/startup-notification/Config.in" source "package/tbb/Config.in" source "package/tinycbor/Config.in" + source "package/tl-expected/Config.in" source "package/tz/Config.in" source "package/tzdata/Config.in" source "package/uvw/Config.in" diff --git a/package/tl-expected/Config.in b/package/tl-expected/Config.in new file mode 100644 index 0000000000..92758ffee5 --- /dev/null +++ b/package/tl-expected/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TL_EXPECTED + bool "tl-expected" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + C++11/14/17 std::expected with functional-style extensions and + reference support. + + https://github.com/TartanLlama/expected + +comment "tl-expected needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/tl-expected/tl-expected.hash b/package/tl-expected/tl-expected.hash new file mode 100644 index 0000000000..e5c9cc2a3e --- /dev/null +++ b/package/tl-expected/tl-expected.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 2611769546cedcaef233ef587e71420d1f079a794eb7bb19b888dedf991ace7c tl-expected-v1.0.0-br1.tar.gz +sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 COPYING diff --git a/package/tl-expected/tl-expected.mk b/package/tl-expected/tl-expected.mk new file mode 100644 index 0000000000..8d62c75fea --- /dev/null +++ b/package/tl-expected/tl-expected.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# tl-expected +# +################################################################################ + +TL_EXPECTED_VERSION = v1.0.0 +TL_EXPECTED_SITE = https://github.com/TartanLlama/expected +TL_EXPECTED_SITE_METHOD = git +TL_EXPECTED_GIT_SUBMODULES = YES +TL_EXPECTED_LICENSE = CC0-1.0 +TL_EXPECTED_LICENSE_FILES = COPYING +TL_EXPECTED_INSTALL_STAGING = YES +TL_EXPECTED_INSTALL_TARGET = NO +TL_EXPECTED_CONF_OPTS = \ + -DCMAKE_MODULE_PATH=$(TL_EXPECTED_DIR)/cmake/tl-cmake \ + -DEXPECTED_ENABLE_TESTS=OFF \ + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Tue Feb 7 16:48:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 17:48:42 +0100 Subject: [Buildroot] [git commit branch/next] utils/test-pkg: proper output on host without jq installed Message-ID: <20230220205253.4665581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09ac5a9e18e96ba6d3cd13e5e8d34aeccfcb603d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next On host without jq installed, test-pkg's output is as following: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) ... Since test-pkg handles this case we can hide this error message and have proper output: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK Signed-off-by: S??bastien Szymanski Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN --- utils/test-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test-pkg b/utils/test-pkg index 4ebfd9af66..e7f5464817 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -201,7 +201,7 @@ build_one() { # Validate that we generate proper json as show-info { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; - JQ="$(which jq)" + JQ="$(which jq 2> /dev/null)" if [ -z "${JQ}" ]; then make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 JQ="${dir}/host/bin/jq" From yann.morin.1998 at free.fr Tue Feb 7 15:48:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 16:48:49 +0100 Subject: [Buildroot] [git commit branch/next] package/python3: use pure python UUID backend for host variant Message-ID: <20230220205253.314C086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b635bda5bc5ea9db15cb83390d8e3908b85c2629 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next host-python3 currently does not build if util-linux-uuid option is not enabled, failing with the following error messages: """ /usr/lib64/ccache/gcc -fPIC -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -O2 -I/home/qschulz/work/upstream/buildroot/output/host/include -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I./Include -I. -I/home/qschulz/work/upstream/buildroot/output/host/include -I/usr/local/include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Include -I/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1 -c /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c -o build/temp.linux-x86_64-3.11/home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.o /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c: In function ???py_uuid_generate_time_safe???: /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: error: storage size of ???uui ??? isn???t known 27 | uuid_t uuid; | ^~~~ /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:31:11: error: implicit declaration of function ???uuid_generate_time_safe???; did you mean ???py_uuid_generate_time_safe???? [-Werror=implicit-function-declaration] 31 | res = uuid_generate_time_safe(uuid); | ^~~~~~~~~~~~~~~~~~~~~~~ | py_uuid_generate_time_safe /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:27:12: warning: unused variable ???uuid??? [-Wunused-variable] 27 | uuid_t uuid; | ^~~~ /home/qschulz/work/upstream/buildroot/output/build/host-python3-3.11.1/Modules/_uuidmodule.c:47:1: warning: control reaches end of non-void function [-Wreturn-type] 47 | } | ^ cc1: some warnings being treated as errors The necessary bits to build these optional modules were not found: _dbm _gdbm _tkinter nis readline To find the necessary bits, look in setup.py in detect_modules() for the module's name. The following modules found by detect_modules() in setup.py have not been built, they are *disabled* by configure: _ctypes_test _sqlite3 _testbuffer _testcapi _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz Failed to build these modules: _uuid """ Therefore, let's disable building the _uuid extension the same way it's done for the target package since commit 0b68713aae28 ("python3: use pure python UUID backend"). Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Yann E. MORIN --- package/python3/python3.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 219d135b3f..fb6dbf2e64 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -31,6 +31,7 @@ HOST_PYTHON3_CONF_OPTS += \ --enable-unicodedata \ --disable-test-modules \ --disable-idle3 \ + --disable-uuid \ --disable-ossaudiodev # Make sure that LD_LIBRARY_PATH overrides -rpath. From yann.morin.1998 at free.fr Tue Feb 7 17:14:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:14:59 +0100 Subject: [Buildroot] [git commit branch/next] support/docker: use APT::Retries in apt-get calls to retry Message-ID: <20230220205253.791FD81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a7c6725f6ca5c1108e6fb76fad414132555b373 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next snapshot.debian.org is notoriously slow, and quite often leads to timeouts when downloading packages. To give us a better chance of succeeding, let's retry 3 times before failing. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index de1534e77a..a16c1e3849 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -20,8 +20,8 @@ COPY apt-sources.list /etc/apt/sources.list # The container has no package lists, so need to update first RUN dpkg --add-architecture i386 && \ - apt-get update -y -RUN apt-get install -y --no-install-recommends \ + apt-get -o APT::Retries=3 update -y +RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ bc \ build-essential \ bzr \ From yann.morin.1998 at free.fr Tue Feb 7 17:15:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 18:15:00 +0100 Subject: [Buildroot] [git commit branch/next] .gitlab-ci.yml: update Docker image to use Message-ID: <20230220205253.81EC7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bde165f7ad4922e218cabdb6eb7c40e1661179f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We have a new Docker image, updated with the new requirements from bcd15aa08aab1e8292b93995c44dc765a9801632 ("support/docker: add python3-magic"), but also with an updated Debian Bullseye installation. Let's use it. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cad35c96bc..ed17bb14b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # Configuration for Gitlab-CI. # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines -image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1756 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123 stages: - generate-gitlab-ci From thomas.petazzoni at bootlin.com Tue Feb 7 21:37:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:37:15 +0100 Subject: [Buildroot] [git commit branch/next] package/wolfssl: handle ARM Thumb situation Message-ID: <20230220205253.C10C481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f79a9c775ff0a59027f274a237d98b5f8d31c022 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next By default on ARM32, wolfssl uses assembly instructions that are not supported on Thumb (original Thumb, not Thumb 2), causing a build failure: /tmp/ccgn33X7.s:299: Error: selected processor does not support `umlal r4,r5,r10,ip' in Thumb mode /tmp/ccgn33X7.s:386: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' /tmp/ccgn33X7.s:387: Error: unshifted register required -- `adc r3,r3,#0' /tmp/ccgn33X7.s:395: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' Fix that by passing --with-arm-target=thumb, which tells wolfssl to use a different set of assembly routines. Fixes: http://autobuild.buildroot.net/results/907/907a5967439c3157c426023b0be1e613092d7bfe/ Signed-off-by: Thomas Petazzoni --- package/wolfssl/wolfssl.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index f415e11bb5..8f6cba56ec 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -43,4 +43,8 @@ else WOLFSSL_CONF_OPTS += --disable-armasm endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +WOLFSSL_CONF_OPTS += --with-arm-target=thumb +endif + $(eval $(autotools-package)) From arnout at mind.be Tue Feb 7 21:51:25 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:25 +0100 Subject: [Buildroot] [git commit branch/next] package/systemd: support dnssec if openssl is available Message-ID: <20230220205253.F2D6E81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b16ae93c85355aad3440737bc4ef7c3ec2d534f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Set -Ddefault-dnssec=allow-downgrade if openssl is available as both openssl and gcrypt are now supported for dnssec. Move this out of the gcrypt condition into a joint openssl/gcrypt condition. So the dependency and the openssl/gcrypt config is set in the individual openssl and gcrypt conditions, while the default-dnssec option is set in a joint openssl or gcrypt condition. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/systemd/systemd.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 6536a2740d..cce9162f6d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -245,9 +245,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) SYSTEMD_DEPENDENCIES += libgcrypt -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade -Dgcrypt=true +SYSTEMD_CONF_OPTS += -Dgcrypt=true else -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no -Dgcrypt=false +SYSTEMD_CONF_OPTS += -Dgcrypt=false endif ifeq ($(BR2_PACKAGE_P11_KIT),y) @@ -317,6 +317,12 @@ else SYSTEMD_CONF_OPTS += -Dselinux=false endif +ifneq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_LIBOPENSSL),) +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade +else +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true define SYSTEMD_BUILD_HWDB From arnout at mind.be Tue Feb 7 21:51:23 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 7 Feb 2023 22:51:23 +0100 Subject: [Buildroot] [git commit branch/next] package/systemd: Add config option for sysupdate feature Message-ID: <20230220205253.E5E79828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=545f8c4b5a4f95e204f31ecb496ae93aa91fcd86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Support the new feature added with v251, requires openssl. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/systemd/Config.in | 16 ++++++++++++++++ package/systemd/systemd.mk | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 0d4147840d..9f4d933779 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -481,6 +481,22 @@ config BR2_PACKAGE_SYSTEMD_SYSEXT https://www.freedesktop.org/software/systemd/man/systemd-sysext.html +config BR2_PACKAGE_SYSTEMD_SYSUPDATE + bool "enable sysupdate support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + systemd-sysupdate atomically updates the host OS, container + images, portable service images or other sources, based on + the transfer configuration files described in sysupdate.d. + + Note that the bootloader must be configured specifically to + support the A/B update mechanism defined by sysupdate. Only + systemd-boot does this out of the box. + + https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html + config BR2_PACKAGE_SYSTEMD_SYSUSERS bool "enable sysusers support" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index a38eeba1a8..6536a2740d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -91,7 +91,6 @@ SYSTEMD_CONF_OPTS += \ -Dsulogin-path=/usr/sbin/sulogin \ -Dsystem-gid-max=999 \ -Dsystem-uid-max=999 \ - -Dsysupdate=false \ -Dsysvinit-path= \ -Dsysvrcnd-path= \ -Dtelinit-path= \ @@ -494,6 +493,12 @@ else SYSTEMD_CONF_OPTS += -Dsysext=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) +SYSTEMD_CONF_OPTS += -Dsysupdate=true +else +SYSTEMD_CONF_OPTS += -Dsysupdate=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management From thomas.petazzoni at bootlin.com Tue Feb 7 17:38:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 18:38:53 +0100 Subject: [Buildroot] [git commit branch/next] package/nfs-utils: handle pkg-config in the Autotools standard way for nfsrahead Message-ID: <20230220205253.9C2CB81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=700fc2d7bdb53d33368046840ea91c6c4e6b12b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next While using the correct PKG_CHECK_MODULES() approach for libmount we end up having host-nfs-utils needing libmount. But libmount is only needed by nfsrahead that we don't need in host-nfs-utils. But we need host-nfs-utils itself(rpcgen tool specifically) to build nfs-utils. To solve this recursive situation: 1) Update the first patch with the upstreamed one that handles libmount using PKG_CHECK_MODULES(). 2) Add another patch to allow to disable nfsrahead during building for host since this tool is not needed and requires libmount. This way the first patch approach can be correctly used. 3) Add --disable-nfsrahead to HOST_NFS_UTILS_CONF_OPTS 4) Remove en/disable-uuid since now it's required by default: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=c5528f40f9db5061e06dcf1f9b7fce5185b376c6 Both patches have been committed: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=627c95b2b853161b359095e7fdf05d3b07d51379 https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=844d3ad5376603bc9c205a6084d38a2d25146179 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...fsrahead-fix-linking-while-static-linking.patch | 41 ++++++++----- ...figure.ac-allow-to-disable-nfsrahead-tool.patch | 68 ++++++++++++++++++++++ package/nfs-utils/nfs-utils.mk | 7 +-- 3 files changed, 97 insertions(+), 19 deletions(-) diff --git a/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch b/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch index b8dcea63f7..e1d57f30cf 100644 --- a/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch +++ b/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch @@ -1,31 +1,46 @@ -From a69014a1b4e5b8068630abe3109f31eb64b6a076 Mon Sep 17 00:00:00 2001 +From d9abb221cea81dee5956bd987c6efa680c03571a Mon Sep 17 00:00:00 2001 From: Giulio Benetti -Date: Wed, 10 Aug 2022 00:10:51 +0200 +Date: Wed, 10 Aug 2022 23:38:17 +0200 Subject: [PATCH] nfsrahead: fix linking while static linking --lmount must preceed -lblkid and to obtain this let's add: -`pkg-config --libs mount` -in place of: -`-lmount` -This ways the library order will always be correct. +-lmount must preceed -lblkid and to obtain this let's add in configure.ac: +PKG_CHECK_MODULES([LIBMOUNT], [mount]) +and in tools/nfsrahead/Makefile.am let's substitute explicit `-lmount` +with: +$(LIBMOUNT_LIBS) +This way all the required libraries will be present and in the right order +when static linking. Signed-off-by: Giulio Benetti +[Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=627c95b2b853161b359095e7fdf05d3b07d51379] --- -Pending Upstream: -https://patchwork.kernel.org/project/linux-nfs/patch/20220809223308.1421081-1-giulio.benetti at benettiengineering.com/ ---- + configure.ac | 3 +++ tools/nfsrahead/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 2 files changed, 4 insertions(+), 1 deletion(-) +diff --git a/configure.ac b/configure.ac +index f1c46c5c..ff85200b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -273,6 +273,9 @@ AC_LIBCAP + dnl Check for -lxml2 + AC_LIBXML2 + ++dnl Check for -lmount ++PKG_CHECK_MODULES([LIBMOUNT], [mount]) ++ + # Check whether user wants TCP wrappers support + AC_TCP_WRAPPERS + diff --git a/tools/nfsrahead/Makefile.am b/tools/nfsrahead/Makefile.am -index 845ea0d5..280a2eb4 100644 +index 845ea0d5..7e08233a 100644 --- a/tools/nfsrahead/Makefile.am +++ b/tools/nfsrahead/Makefile.am @@ -1,6 +1,6 @@ libexec_PROGRAMS = nfsrahead nfsrahead_SOURCES = main.c -nfsrahead_LDFLAGS= -lmount -+nfsrahead_LDFLAGS= `pkg-config --libs mount` ++nfsrahead_LDFLAGS= $(LIBMOUNT_LIBS) nfsrahead_LDADD = ../../support/nfs/libnfsconf.la man5_MANS = nfsrahead.man diff --git a/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch b/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch new file mode 100644 index 0000000000..ee5e3fa251 --- /dev/null +++ b/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch @@ -0,0 +1,68 @@ +From 9a0002978eb32b78d22f053302e012a4255dc4ef Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 19 Sep 2022 23:43:28 +0200 +Subject: [PATCH] configure.ac: allow to disable nfsrahead tool + +This allows to make libmount not mandatory but depending on nfsrahead +since it only requires it. This is useful when cross-compiling because +in that case we need rpcgen only built for host but not nfsrahead that +also require libmount. So this reduces the dependencies for host +building. + +Signed-off-by: Giulio Benetti +[Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=844d3ad5376603bc9c205a6084d38a2d25146179] +--- + configure.ac | 13 ++++++++++--- + tools/Makefile.am | 6 +++++- + 2 files changed, 15 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ff85200b..5d9cbf31 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -249,6 +249,16 @@ AC_ARG_ENABLE(nfsdcld, + enable_nfsdcld=$enableval, + enable_nfsdcld="yes") + ++AC_ARG_ENABLE(nfsrahead, ++ [AS_HELP_STRING([--disable-nfsrahead],[disable nfsrahead command @<:@default=no@:>@])], ++ enable_nfsrahead=$enableval, ++ enable_nfsrahead="yes") ++ AM_CONDITIONAL(CONFIG_NFSRAHEAD, [test "$enable_nfsrahead" = "yes" ]) ++ if test "$enable_nfsrahead" = yes; then ++ dnl Check for -lmount ++ PKG_CHECK_MODULES([LIBMOUNT], [mount]) ++ fi ++ + AC_ARG_ENABLE(nfsdcltrack, + [AS_HELP_STRING([--disable-nfsdcltrack],[disable NFSv4 clientid tracking programs @<:@default=no@:>@])], + enable_nfsdcltrack=$enableval, +@@ -273,9 +283,6 @@ AC_LIBCAP + dnl Check for -lxml2 + AC_LIBXML2 + +-dnl Check for -lmount +-PKG_CHECK_MODULES([LIBMOUNT], [mount]) +- + # Check whether user wants TCP wrappers support + AC_TCP_WRAPPERS + +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 40c17c37..48fd0cdf 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -12,6 +12,10 @@ if CONFIG_NFSDCLD + OPTDIRS += nfsdclddb + endif + +-SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcctl nfsdclnts nfsrahead $(OPTDIRS) ++if CONFIG_NFSRAHEAD ++OPTDIRS += nfsrahead ++endif ++ ++SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcctl nfsdclnts $(OPTDIRS) + + MAINTAINERCLEANFILES = Makefile.in +-- +2.34.1 + diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index ed205a26b1..1a4a99f566 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -34,6 +34,7 @@ HOST_NFS_UTILS_CONF_OPTS = \ --without-tcp-wrappers \ --with-statedir=/run/nfs \ --disable-caps \ + --disable-nfsrahead \ --without-systemd \ --with-rpcgen=internal \ --with-tirpcinclude=$(HOST_DIR)/include/tirpc @@ -68,12 +69,6 @@ else NFS_UTILS_CONF_OPTS += --disable-caps endif -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) -NFS_UTILS_CONF_OPTS += --enable-uuid -else -NFS_UTILS_CONF_OPTS += --disable-uuid -endif - define NFS_UTILS_INSTALL_FIXUP cd $(TARGET_DIR) && rm -f $(NFS_UTILS_TARGETS_) touch $(TARGET_DIR)/etc/exports From thomas.petazzoni at bootlin.com Tue Feb 7 21:37:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:37:15 +0100 Subject: [Buildroot] [git commit branch/next] package/wolfssl: disable broken asm implementations on 32-bit Arm Message-ID: <20230220205253.B444B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36b8c9494b56b877fea62f17926f747c7c7bfb8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next wolfSSL has ARMv8-A assembly implementations of some functions for both A64 and A32 ISAs. However, some of the A32 versions use r11, which is usually not allowed: wolfcrypt/src/port/arm/armv8-aes.c: In function 'wc_AesCbcEncrypt': wolfcrypt/src/port/arm/armv8-aes.c:3303:5: error: fp cannot be used in 'asm' here 3303 | } | ^ That can be fixed by adding the compiler flag -fomit-frame-pointer, but then there is another failure: /tmp/ccV19DQV.s: Assembler messages: /tmp/ccV19DQV.s:248: Error: first transfer register must be even -- `ldrd r11,r10,[r14,#4*14]' make[3]: *** [Makefile:5858: wolfcrypt/src/port/arm/src_libwolfssl_la-armv8-chacha.lo] Error 1 This is definitely not a valid instruction in A32, which suggests that this code isn't being tested at all upstream. So disable it here. Fixes: http://autobuild.buildroot.net/results/502/502a2b217845eb290c1961d4740b032462f8ae53/ Signed-off-by: Ben Hutchings Signed-off-by: Thomas Petazzoni --- package/wolfssl/wolfssl.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index cd3acd9411..f415e11bb5 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -33,14 +33,12 @@ WOLFSSL_CONF_OPTS += --disable-sslv3 endif # enable ARMv8 hardware acceleration -ifeq ($(BR2_ARM_CPU_ARMV8A),y) +ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm # the flag -mstrict-align is needed to prevent build errors caused by # some inline assembly in parts of the AES structure using the "m" # constraint -ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -mstrict-align" -endif else WOLFSSL_CONF_OPTS += --disable-armasm endif From thomas.petazzoni at bootlin.com Tue Feb 7 21:55:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:55:49 +0100 Subject: [Buildroot] [git commit branch/next] gitlab-ci: don't use before_script in job templates Message-ID: <20230220205254.13F4A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e92bb8f1c9523227413500380df16bfc64053fad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When gitlab prepares a job to run, it checks out the repository with a non-root user, and spawns a container that runs as root, with some UID mapping that makes the files be owned by root in the container. However, our pipelines run as a nont-root user. Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated the docker image that is used to run in our pipelines. That new image includes a git version that is stricter about the ownership of the git tree it is acting in: git aborts in error when the user running it does not own the repository. We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} rules, so they all fail (in various ways). To fix this, we either need to fix the ownership or tell git to ignore the situation. In either case, we'll need to run a scriptlet before all our jobs. Gitlab-ci allows to provide a global before_script, that is inherited by all jobs. However, some of our jobs already declare a before_script, and that would shadow the global before_script. There is no technical reason to do our before_script separately from the actual script, so we move the code from the before_scripts to the corresponding scripts. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/misc/gitlab-ci.yml.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 0ccf36665e..9c1faf0d5f 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -23,9 +23,8 @@ - utils/check-symbols .defconfig_check: - before_script: - - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') script: + - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - support/scripts/check-dotconfig.py .config configs/${DEFCONFIG_NAME} @@ -44,10 +43,9 @@ } .defconfig_base: - before_script: + script: - DEFCONFIG_NAME=${CI_JOB_NAME} - OUTPUT_DIR=output - script: - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} @@ -72,13 +70,12 @@ - runtime-test.log .runtime_test_base: - before_script: - - TEST_CASE_NAME=${CI_JOB_NAME} # Keep build directories so the rootfs can be an artifact of the job. The # runner will clean up those files for us. # Multiply every emulator timeout by 10 to avoid sporadic failures in # elastic runners. script: + - TEST_CASE_NAME=${CI_JOB_NAME} - echo "Starting runtime test ${TEST_CASE_NAME}" - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} artifacts: @@ -91,9 +88,8 @@ .test_pkg: stage: build - before_script: - - OUTPUT_DIR=${CI_JOB_NAME} script: + - OUTPUT_DIR=${CI_JOB_NAME} - echo "Configure Buildroot for ${OUTPUT_DIR}" - make O=${OUTPUT_DIR} syncconfig - make O=${OUTPUT_DIR} savedefconfig From thomas.petazzoni at bootlin.com Tue Feb 7 22:03:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:03:03 +0100 Subject: [Buildroot] [git commit branch/next] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring Message-ID: <20230220205254.3AA00828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c8ee42bbe6ebb7f20978b06a581c42733197ae2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The vendoring done for cargo / go packages (may) need git, so ensure we check for it in dependencies, similar to how it is done for packages directly using git. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5d618c6b39..82187d7db9 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1250,6 +1250,13 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD +# cargo/go vendoring (may) need git +ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),cargo) +DL_TOOLS_DEPENDENCIES += git +else ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),go) +DL_TOOLS_DEPENDENCIES += git +endif + DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. From thomas.petazzoni at bootlin.com Tue Feb 7 22:03:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:03:10 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: ensure git is >= 2.0.0 for vendoring Message-ID: <20230220205254.4579F81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f229564c36ec64c1f1292b7281ae0bd33840d7a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The go vendoring fails on CentOS 7 (which uses git 1.8.3.1) with errors related to shallow clones: make docker-compose-source .. go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 github.com/docker/compose/v2/pkg/mocks imports github.com/theupdateframework/notary/client imports github.com/docker/go/canonical/json: github.com/docker/go at v1.5.1-1.0.20160303222718-d30aec9fd63c: invalid pseudo-version: git fetch --unshallow -f origin in /home/jacmet/source/buildroot-mirror/output/host/share/go-path/pkg/mod/cache/vcs/48fbd2dfabec81f4c93170677bfc89087d4bec07a2d08f6ca5ce3d17962677ee: exit status 128: fatal: git fetch-pack: expected shallow list make[1]: *** [/home/jacmet/source/buildroot-mirror/output/build/docker-compose-2.15.1/.stamp_downloaded] Error 1 It works with git 2.0.0 (released May 2014, included in Debian 8), so check for >= 2.0.0 with logic similar to the GNU patch version check. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 0aa5e59274..cf6635bff6 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -174,6 +174,16 @@ for prog in perl tar wget cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do echo " xargs is usually part of the findutils package in your distribution" fi fi + + # we need git >= 2.0.0 for shallow clones / vendoring + if test $prog = "git" ; then + GIT_VERSION="$(git --version | sed -n 's/^git version \(.*\)/\1/p')" + GIT_MAJOR="$(echo "${GIT_VERSION}" | cut -d . -f 1)" + if [ "${GIT_MAJOR}" -lt 2 ]; then + echo "You have git '${GIT_VERSION}' installed. Git >= 2.0.0 is required" + exit 1 + fi + fi done if test "${missing_progs}" = "yes" ; then From thomas.petazzoni at bootlin.com Tue Feb 7 21:55:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:55:49 +0100 Subject: [Buildroot] [git commit branch/next] gitlab-ci: fix pipelines Message-ID: <20230220205254.1E64181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a016b693f7830f3c8ae815851d3204b8b6e99821 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When gitlab prepares a job to run, it checks out the repository with a non-root user, and spawns a container that runs as root, with some UID mapping that makes the files be owned by root in the container. However, our pipelines run as a nont-root user. Commit bde165f7ad (.gitlab-ci.yml: update Docker image to use) updated the docker image that is used to run in our pipelines. That new image includes a git version that is stricter about the ownership of the git tree it is acting in: git aborts in error when the user running it does not own the repository. We use `git ls-tree` quite a lot in our check-{flake8,package,symbols} rules, so they all fail (in various ways). To fix this, we either need to fix the ownership or tell git to ignore the situation. It is most probably impossible to change the ownership of the files: we run as non-root,and the files belong to root (in the container). So we're stuck. The alternative, is to do as git suggest, and tell it to ignore the situation. In a local setup, this would be very insecure, but in the pipelines, this is in a throw-away container, where a single user exists and is running, so we don't care much (if at all). Add a global before_script that registers the git config to ignore ownership issues in the buildroot repository; see [0] for the definition of the CI_PROJECT_DIR variable. Note: unlike what is said in there, and in [1], the value actually seen in CI_PROJECT_DIR is already prefixed with CI_BUILDS_DIR (the documentation is unclear about that point). [0] https://docs.gitlab.com/ee/ci/variables/predefined_variables.html [1] https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/misc/gitlab-ci.yml.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 9c1faf0d5f..38aca31fb5 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -1,3 +1,6 @@ +before_script: + - git config --global --add safe.directory ${CI_PROJECT_DIR} + .check-check-package_base: script: - python3 -m pytest -v utils/checkpackagelib/ From thomas.petazzoni at bootlin.com Tue Feb 7 22:13:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:13:52 +0100 Subject: [Buildroot] [git commit branch/next] package/perl-mail-dkim: bump version to 1.20220520 Message-ID: <20230220205254.679E6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57a64a702a1c162a33097db7ee7e069fb64b39df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/perl-mail-dkim/perl-mail-dkim.hash | 4 ++-- package/perl-mail-dkim/perl-mail-dkim.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-mail-dkim/perl-mail-dkim.hash b/package/perl-mail-dkim/perl-mail-dkim.hash index e94adfc6ed..6edeaa9d8b 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.hash +++ b/package/perl-mail-dkim/perl-mail-dkim.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9de35f8aa77a85dc17423cbcce2bf46d Mail-DKIM-1.20200824.tar.gz -sha256 871d329830acb4840423aa59036622fb2ee394efc1d09316dcc32ae94454e916 Mail-DKIM-1.20200824.tar.gz +md5 5a0dec58f0c2526521b2952a3c126906 Mail-DKIM-1.20220520.tar.gz +sha256 8ac4b8c84bbfad00a3d24bf676493d207dd3cd4a735efabb9e17181534f23646 Mail-DKIM-1.20220520.tar.gz # computed by scancpan sha256 ffaa40feb768566e52d93879fedd2c5483828b6de483874f30a0a4425351555f LICENSE diff --git a/package/perl-mail-dkim/perl-mail-dkim.mk b/package/perl-mail-dkim/perl-mail-dkim.mk index e67bf5ee18..f3383a02bf 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.mk +++ b/package/perl-mail-dkim/perl-mail-dkim.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MAIL_DKIM_VERSION = 1.20200824 +PERL_MAIL_DKIM_VERSION = 1.20220520 PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MB/MBRADSHAW PERL_MAIL_DKIM_LICENSE = Artistic or GPL-1.0+ From thomas.petazzoni at bootlin.com Tue Feb 7 22:17:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 23:17:46 +0100 Subject: [Buildroot] [git commit branch/next] package/php: bump version to 8.2.1 Message-ID: <20230220205254.7463D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90ab065162a35b8aa2c429903e3d59d4ad2c0d7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_2 Updated license hash due to copyright year bump: https://github.com/php/php-src/commit/bf2867bc7235dfb65675ff4e9c21c8bc537726e2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/php/php.hash | 4 ++-- package/php/php.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 23ec84f19f..a9c3b7640b 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 e16e47a872d58685913ac848ce92ec49f42c1828110c98c65fb6265a08724a1a php-8.1.14.tar.xz +sha256 650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af php-8.2.1.tar.xz # License file -sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE +sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 23dd4ba96f..372d55f68a 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.1.14 +PHP_VERSION = 8.2.1 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Tue Feb 7 22:23:19 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 7 Feb 2023 23:23:19 +0100 Subject: [Buildroot] [git commit branch/next] package/gcc: map debug prefix when reproducible Message-ID: <20230220205254.8040F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9a92ea1cb1dd2aa9b3f9c83c04d7d01c1f6e148 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When building with BR2_REPRODUCIBLE the toolchain wrapper passes -fdebug-prefix-map for all packages that are built. But this doesn't affect the target libraries (like libgcc) built by GCC's build system. GCC 4.3 added a configure option to set the debug prefix map for these libraries, which is used here to avoid encoding potentially non-reproducible build paths into the debug data. Signed-off-by: John Keeping Signed-off-by: Yann E. MORIN --- package/gcc/gcc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index ec6f3b550a..6dfd93f2a4 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -84,6 +84,10 @@ HOST_GCC_COMMON_CONF_OPTS = \ --with-bugurl="http://bugs.buildroot.net/" \ --without-zstd +ifeq ($(BR2_REPRODUCIBLE),y) +HOST_GCC_COMMON_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot +endif + # Don't build documentation. It takes up extra space / build time, # and sometimes needs specific makeinfo versions to work HOST_GCC_COMMON_CONF_ENV = \ From thomas.petazzoni at bootlin.com Wed Feb 8 08:54:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:54:49 +0100 Subject: [Buildroot] [git commit branch/next] package/intel-mediadriver: bump version to 23.1.0 Message-ID: <20230220205254.A434381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19447f02f729ff373e138a74f3c2477739f425df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 a5e9c64e97..e4e41e4ad3 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b553290e829dfd824eb62295c9f07dbe8062ce7998f7c527cc92856d0792562d intel-media-22.6.6.tar.gz +sha256 edae1bdc07b694bd6e42099feddcf875e3b5d7254894f4b3fb292128577baf82 intel-media-23.1.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 8fa93218fa..6cc862dce4 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.6.6 +INTEL_MEDIADRIVER_VERSION = 23.1.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 thomas.petazzoni at bootlin.com Wed Feb 8 08:55:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 09:55:42 +0100 Subject: [Buildroot] [git commit branch/next] package/intel-mediasdk: bump version to 23.1.0 Message-ID: <20230220205254.AF5E0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5997d0d63557488f2cbd06d4425fa3410adf336b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 903b6f3394..a2c4243790 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3a671cc692da5111c041088f5e32528b4346e122e8a134fad71310c572705106 intel-mediasdk-22.6.5.tar.gz +sha256 9208c35641ba995760d662689426a6c433973cf5283b8510f9cfb774e4b9cb38 intel-mediasdk-23.1.0.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index f7bce30c74..462d487ebe 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.6.5 +INTEL_MEDIASDK_VERSION = 23.1.0 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 8 10:47:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:47:10 +0100 Subject: [Buildroot] [git commit branch/next] package/libressl: security bump to version 3.6.2 Message-ID: <20230220205254.C73D381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02f80f5c224a1d8830fab48ae0c19a9e28f2c082 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next security fix: A malicious certificate revocation list or timestamp response token would allow an attacker to read arbitrary memory. Signed-off-by: Francois Perrad 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 0988e6a36d..907b9cdd06 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 acfac61316e93b919c28d62d53037ca734de85c46b4d703f19fd8395cf006774 libressl-3.6.1.tar.gz +sha256 4be80fff073746cf50b4a8e5babe2795acae98c6b132a9e02519b445dfbfd033 libressl-3.6.2.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 8fd7bccbc4..b5fae7e26e 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.6.1 +LIBRESSL_VERSION = 3.6.2 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 thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for widgets Message-ID: <20230220205255.0D1BD828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05e4ad9c7e64e85d56126db8396dcf98138e84ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 5 +++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 394b2d8745..973fb2f11c 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -95,6 +95,11 @@ config BR2_PACKAGE_QT6BASE_PNG This option enables PNG support using the system libpng library. +config BR2_PACKAGE_QT6BASE_WIDGETS + bool "widgets module" + help + This option enables the Qt6Widgets library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index b368cd6dca..2a0afa6d27 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -215,6 +215,12 @@ else QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:17 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for jpeg/png/gif image format Message-ID: <20230220205255.00BA681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6d91bc90afab2d601f55990e94c4cef9f0317ce6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 19 +++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index ac2058c901..394b2d8745 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -76,6 +76,25 @@ config BR2_PACKAGE_QT6BASE_HARFBUZZ if the toolchain supports __sync for 4 bytes, or the qt provided one which avoids this dependency by using QAtomic). +config BR2_PACKAGE_QT6BASE_GIF + bool "GIF support" + help + This compiles and installs the plugin for GIF reading support. + +config BR2_PACKAGE_QT6BASE_JPEG + bool "JPEG support" + select BR2_PACKAGE_JPEG + help + This option enables JPEG support using the system libjpeg + library. + +config BR2_PACKAGE_QT6BASE_PNG + bool "PNG support" + select BR2_PACKAGE_LIBPNG + help + This option enables PNG support using the system libpng + library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 6c155a4abb..b368cd6dca 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -188,6 +188,26 @@ else QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PNG),y) +QT6BASE_CONF_OPTS += -DFEATURE_png=ON -DFEATURE_system_png=ON +QT6BASE_DEPENDENCIES += libpng +else +QT6BASE_CONF_OPTS += -DFEATURE_png=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_GIF),y) +QT6BASE_CONF_OPTS += -DFEATURE_gif=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_gif=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_JPEG),y) +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=ON +QT6BASE_DEPENDENCIES += jpeg +else +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig From thomas.petazzoni at bootlin.com Wed Feb 8 10:50:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:50:37 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for gui module Message-ID: <20230220205254.DE12B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c189e7462103591eb17d34a6e33430ddc636c84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 31 +++++++++++++++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index e8357a675c..1810b1586d 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,37 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_GUI + bool "gui module" + select BR2_PACKAGE_FREETYPE + # At least one graphic backend must be enabled, so enable + # linuxfb if nothing is enabled. + select BR2_PACKAGE_QT6BASE_LINUXFB if \ + !BR2_PACKAGE_QT6BASE_XCB + help + This option enables the Qt6Gui library. + +if BR2_PACKAGE_QT6BASE_GUI + +config BR2_PACKAGE_QT6BASE_LINUXFB + bool "linuxfb support" + +config BR2_PACKAGE_QT6BASE_XCB + bool "X.org XCB support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_IMAGE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_LIBXKBCOMMON + +comment "X.org XCB backend available if X.org is enabled" + depends on !BR2_PACKAGE_XORG7 + +endif + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2f159f380b..bcf2464590 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -40,7 +40,6 @@ QT6BASE_INSTALL_STAGING = YES QT6BASE_CONF_OPTS = \ -GNinja \ -DQT_HOST_PATH=$(HOST_DIR) \ - -DFEATURE_gui=OFF \ -DFEATURE_concurrent=OFF \ -DFEATURE_xml=OFF \ -DFEATURE_sql=OFF \ @@ -141,6 +140,42 @@ else QT6BASE_CONF_OPTS += -DFEATURE_glib=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_gui=ON \ + -DFEATURE_freetype=ON \ + -DINPUT_opengl=no \ + -DFEATURE_vulkan=OFF +QT6BASE_DEPENDENCIES += freetype + +ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_xcb=ON \ + -DFEATURE_xcb_xlib=ON \ + -DFEATURE_xkbcommon=ON \ + -DFEATURE_xkbcommon_x11=ON +QT6BASE_DEPENDENCIES += \ + libxcb \ + libxkbcommon \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xlib_libX11 +else +QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add QPA backend selection Message-ID: <20230220205255.30917828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bd9a456b2e2c818f35d22a212812087c3f28e4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/Config.in | 13 +++++++++++++ package/qt6/qt6base/qt6base.mk | 3 +++ 2 files changed, 16 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 131dfadc1b..3af6fd9f72 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -67,6 +67,19 @@ config BR2_PACKAGE_QT6BASE_EGLFS depends on BR2_PACKAGE_QT6_GL_SUPPORTS select BR2_PACKAGE_QT6BASE_OPENGL +config BR2_PACKAGE_QT6BASE_DEFAULT_QPA + string "Default graphical platform" + help + Choose the default platform abstraction to use for graphical + applications (e.g xcb, linuxfb, eglfs, ...). If this is + empty, the default for your architecture will be used + (usually this is eglfs). + + You can get a list of supported platforms by running a Qt + application with the option "-platform help" on your + target. You can choose a different platform at runtime with + the -platform option. + config BR2_PACKAGE_QT6BASE_OPENGL bool "OpenGL support" depends on BR2_PACKAGE_QT6_GL_SUPPORTS diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2540fbb59c..828fe57d0b 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -250,6 +250,9 @@ else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif +QT6BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT6BASE_DEFAULT_QPA)) +QT6BASE_CONF_OPTS += $(if $(QT6BASE_DEFAULT_QPA),-DQT_QPA_DEFAULT_PLATFORM=$(QT6BASE_DEFAULT_QPA)) + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add opengl support Message-ID: <20230220205255.243F181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=beeae174f9fffe6ea9c50a717a9b45c71ed45ea9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/Config.in | 5 +++++ package/qt6/qt6base/Config.in | 42 +++++++++++++++++++++++++++++++++++++++++- package/qt6/qt6base/qt6base.mk | 18 +++++++++++++++++- 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 4b2b9a1174..831ae72c3c 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -12,6 +12,11 @@ config BR2_PACKAGE_QT6_ARCH_SUPPORTS default y if BR2_sparc64 depends on BR2_USE_MMU +config BR2_PACKAGE_QT6_GL_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + comment "qt6 needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, host gcc >= 8" depends on !BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT6_ARCH_SUPPORTS diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 973fb2f11c..131dfadc1b 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -36,7 +36,8 @@ config BR2_PACKAGE_QT6BASE_GUI # At least one graphic backend must be enabled, so enable # linuxfb if nothing is enabled. select BR2_PACKAGE_QT6BASE_LINUXFB if \ - !BR2_PACKAGE_QT6BASE_XCB + !BR2_PACKAGE_QT6BASE_XCB && \ + !BR2_PACKAGE_QT6BASE_EGLFS help This option enables the Qt6Gui library. @@ -59,6 +60,45 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_EGLFS + bool "eglfs support" + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGBM + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_QT6BASE_OPENGL + +config BR2_PACKAGE_QT6BASE_OPENGL + bool "OpenGL support" + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + help + This option enables OpenGL support. + +comment "OpenGL support needs an OpenGL-capable backend" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS + +if BR2_PACKAGE_QT6BASE_OPENGL + +choice + prompt "OpenGL API" + help + Select OpenGL API. + +config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP + bool "Desktop OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL + help + Use desktop OpenGL. + +config BR2_PACKAGE_QT6BASE_OPENGL_ES2 + bool "OpenGL ES 2.0+" + depends on BR2_PACKAGE_HAS_LIBGLES + help + Use OpenGL ES 2.0 and later versions. + +endchoice + +endif + config BR2_PACKAGE_QT6BASE_FONTCONFIG bool "fontconfig support" select BR2_PACKAGE_FONTCONFIG diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 911375aa6d..2540fbb59c 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -144,7 +144,6 @@ ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) QT6BASE_CONF_OPTS += \ -DFEATURE_gui=ON \ -DFEATURE_freetype=ON \ - -DINPUT_opengl=no \ -DFEATURE_vulkan=OFF QT6BASE_DEPENDENCIES += freetype @@ -230,6 +229,23 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) +QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON +QT6BASE_DEPENDENCIES += libegl libgbm +else +QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON +QT6BASE_DEPENDENCIES += libgl +else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON +QT6BASE_DEPENDENCIES += libgles +else +QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for libinput Message-ID: <20230220205255.477AD81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2db19af40179d6c2dfd78e08c005e67b01cdc01e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 8db59bbc31..49a61e4d25 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -229,6 +229,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_LIBINPUT),y) +QT6BASE_CONF_OPTS += -DFEATURE_libinput=ON +QT6BASE_DEPENDENCIES += libinput +else +QT6BASE_CONF_OPTS += -DFEATURE_libinput=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON QT6BASE_DEPENDENCIES += tslib From thomas.petazzoni at bootlin.com Wed Feb 8 10:51:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 11:51:20 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: add support for kms Message-ID: <20230220205255.5577486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=653e573436398ed58e0d4323d684c237b55f9378 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 49a61e4d25..f4e63ab8d9 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -207,6 +207,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT6BASE_CONF_OPTS += -DFEATURE_kms=ON +QT6BASE_DEPENDENCIES += libdrm +else +QT6BASE_CONF_OPTS += -DFEATURE_kms=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig From peter at korsgaard.com Wed Feb 8 10:57:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 11:57:26 +0100 Subject: [Buildroot] [git commit branch/next] package/neon-2-sse: bump to version 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f Message-ID: <20230220205255.819BC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c419ef62d84b5be65599452ab84f7ed719bbe470 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/neon-2-sse/0001-Fix-cmake-languages.patch | 40 ----------------------- package/neon-2-sse/neon-2-sse.hash | 2 +- package/neon-2-sse/neon-2-sse.mk | 2 +- 3 files changed, 2 insertions(+), 42 deletions(-) diff --git a/package/neon-2-sse/0001-Fix-cmake-languages.patch b/package/neon-2-sse/0001-Fix-cmake-languages.patch deleted file mode 100644 index e0becb1ffa..0000000000 --- a/package/neon-2-sse/0001-Fix-cmake-languages.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 186ec82e033d8c718d760d14945535a9d7e160fd Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sun, 29 Jan 2023 21:00:27 -0700 -Subject: [PATCH] Fix cmake languages - -When no language is set cmake defaults to C and CXX, since we support -C by itself we should set the project language to C so that we don't -get a compiler error when building without a CXX toolchain. - -Fixes: -CMake Error at CMakeLists.txt:5 (project): - No CMAKE_CXX_COMPILER could be found. - - Tell CMake where to find the compiler by setting either the environment - variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path - to the compiler, or to the compiler name if it is in the PATH. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/intel/ARM_NEON_2_x86_SSE/pull/62] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e4b8980..8f58e79 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,7 +2,7 @@ - # Modification: Copyright (C) 2017 David Hirvonen - - cmake_minimum_required(VERSION 3.0) --project(NEON_2_SSE VERSION 1.0.0) -+project(NEON_2_SSE VERSION 1.0.0 LANGUAGES C) - - add_library(${PROJECT_NAME} INTERFACE) - --- -2.34.1 - diff --git a/package/neon-2-sse/neon-2-sse.hash b/package/neon-2-sse/neon-2-sse.hash index ded20d58f5..f964d2fa61 100644 --- a/package/neon-2-sse/neon-2-sse.hash +++ b/package/neon-2-sse/neon-2-sse.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 019fbc7ec25860070a1d90e12686fc160cfb33e22aa063c80f52b363f1361e9d neon-2-sse-a15b489e1222b2087007546b4912e21293ea86ff.tar.gz +sha256 4567ca8c8cbc8ce0ea3ddb9dc0f158707eb85c631cb400fd7010cd299cdc5377 neon-2-sse-097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f.tar.gz # License files, locally calculated sha256 7022f51b439a5915e933ecc270c83e24ca0cb2cceeb08b0132dcd4dbb03ed2dc LICENSE diff --git a/package/neon-2-sse/neon-2-sse.mk b/package/neon-2-sse/neon-2-sse.mk index 3e87c62e21..ee6f5446b6 100644 --- a/package/neon-2-sse/neon-2-sse.mk +++ b/package/neon-2-sse/neon-2-sse.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEON_2_SSE_VERSION = a15b489e1222b2087007546b4912e21293ea86ff +NEON_2_SSE_VERSION = 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f NEON_2_SSE_SITE = $(call github,intel,ARM_NEON_2_x86_SSE,$(NEON_2_SSE_VERSION)) NEON_2_SSE_LICENSE = BSD-2-Clause NEON_2_SSE_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 8 11:19:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 12:19:56 +0100 Subject: [Buildroot] [git commit branch/next] configs/olimex_stmp157: configure eth0 with DHCP Message-ID: <20230220205255.A5182828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4ad6d332b9e47e432f9934405946621b2e0c09a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_stmp157_olinuxino_lime_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index 49670dbe4f..60c34d7fa1 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -8,6 +8,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="stmp1-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/stmp1_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/stmp1_olinuxino/genimage.cfg" From peter at korsgaard.com Mon Feb 20 20:58:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:39 -0000 Subject: [Buildroot] [git commit branch/next] {linux, linux-headers}: bump 5.15.x / 6.{0, 1}.x series Message-ID: <20230220205222.4CF5686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a94567b4b5481c14352be3e293672572a326836c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 6 +++--- package/linux-headers/Config.in.host | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index b5c65eded4..bca1b3fc8b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.2" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 8d85dc4c6f..8ac04b60f9 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,8 +1,8 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 a3e61377cf4435a9e2966b409a37a1056f6aaa59e561add9125a88e3c0971dfb linux-6.1.1.tar.xz -sha256 d484eb3d4f88be14b42507a85ad4b0932e92e7a742acbce74e8be007124a6820 linux-6.0.15.tar.xz +sha256 ee41f3c4f599b2f46f08aae428c9243db403e7292eb2c9f04ee34909b038d1ae linux-6.1.2.tar.xz +sha256 842071bca611c1f080cbc39c7ab3a6b58d7951f4f41e553b3db4fbe3e0705ce4 linux-6.0.16.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 2c0bae29fac98e0a9408914a4551b2971365ac0000351cb255d6bd9aa0849808 linux-5.15.85.tar.xz +sha256 80fcd9efa443502de9e2750f6dfb59e8de43a5d87a6d2be09dca748d79b5f2ee linux-5.15.86.tar.xz sha256 7aaaf6d0bcd8a2cfa14ad75f02ca62bb2de08aad3bee3eff198de49ea5254079 linux-5.10.161.tar.xz sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 60bbe5b768..216b496fe4 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -401,9 +401,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.269" if BR2_KERNEL_HEADERS_4_19 default "5.4.228" if BR2_KERNEL_HEADERS_5_4 default "5.10.161" if BR2_KERNEL_HEADERS_5_10 - default "5.15.85" if BR2_KERNEL_HEADERS_5_15 - default "6.0.15" if BR2_KERNEL_HEADERS_6_0 - default "6.1.1" if BR2_KERNEL_HEADERS_6_1 + default "5.15.86" if BR2_KERNEL_HEADERS_5_15 + default "6.0.16" if BR2_KERNEL_HEADERS_6_0 + default "6.1.2" if BR2_KERNEL_HEADERS_6_1 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 Mon Feb 20 20:58:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:39 -0000 Subject: [Buildroot] [git commit branch/next] package/cni-plugins: bump version to 1.2.0 Message-ID: <20230220205244.BCCBD86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb6410b09b339a372e1cc9b9f09901635ebdf406 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Adds new device driver main/dummy and various bug fixes/cleanups. https://github.com/containernetworking/plugins/releases/tag/v1.2.0 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/cni-plugins/cni-plugins.hash | 2 +- package/cni-plugins/cni-plugins.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/cni-plugins/cni-plugins.hash b/package/cni-plugins/cni-plugins.hash index fc3b5a7ead..0c3e07c91c 100644 --- a/package/cni-plugins/cni-plugins.hash +++ b/package/cni-plugins/cni-plugins.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c86c44877c47f69cd23611e22029ab26b613f620195b76b3ec20f589367a7962 cni-plugins-1.1.1.tar.gz +sha256 f3496ddda9c7770a0b695b67ae7ee80a4ee331ac2745af4830054b81627f79b7 cni-plugins-1.2.0.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/cni-plugins/cni-plugins.mk b/package/cni-plugins/cni-plugins.mk index b30937095a..be02c2ff45 100644 --- a/package/cni-plugins/cni-plugins.mk +++ b/package/cni-plugins/cni-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_VERSION = 1.1.1 +CNI_PLUGINS_VERSION = 1.2.0 CNI_PLUGINS_SITE = $(call github,containernetworking,plugins,v$(CNI_PLUGINS_VERSION)) CNI_PLUGINS_LICENSE = Apache-2.0 CNI_PLUGINS_LICENSE_FILES = LICENSE @@ -12,6 +12,7 @@ CNI_PLUGINS_LICENSE_FILES = LICENSE CNI_PLUGINS_BUILD_TARGETS = \ plugins/ipam/dhcp \ plugins/main/bridge \ + plugins/main/dummy \ plugins/main/host-device \ plugins/main/ipvlan \ plugins/main/loopback \ From peter at korsgaard.com Mon Feb 20 20:58:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:40 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Julien Olivain for package/gnupg2 Message-ID: <20230220205222.F3DB4828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f02b4ba5d17922e52d17f00c3ecaa40563522f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8399dcc7af..86e3f0e7b1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1682,6 +1682,7 @@ F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ +F: package/gnupg2/ F: package/glslsandbox-player/ F: package/octave/ F: package/ola/ From peter at korsgaard.com Mon Feb 20 20:58:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:40 -0000 Subject: [Buildroot] [git commit branch/next] package/libwpe: bump to version 1.14.0 Message-ID: <20230220205223.1033786495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ae7a1a22146e817b8d5cac03d321b5eece65bb4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This version is the first stable release with support for gamepad input events and configuring target frame rates. These will be used by a follow-up update of the wpewebkit package. Release notes: https://wpewebkit.org/release/libwpe-1.14.0.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/libwpe/libwpe.hash | 8 ++++---- package/libwpe/libwpe.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash index 2bbe1f0749..28b7685b93 100644 --- a/package/libwpe/libwpe.hash +++ b/package/libwpe/libwpe.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.12.3.tar.xz.sums -md5 e538eb8e521d92f2bde3c4cd864abaa1 libwpe-1.12.3.tar.xz -sha1 9d94c411a502a10e68f69bd1fa273539cc6af2ca libwpe-1.12.3.tar.xz -sha256 b84fdbfbc849ce4fdf084bb28b58e5463b1b4b6cc8f200dc77b41f8545d5329d libwpe-1.12.3.tar.xz +# From https://wpewebkit.org/releases/libwpe-1.14.0.tar.xz.sums +md5 f9737912975f979f9e4e01eec174a271 libwpe-1.14.0.tar.xz +sha1 7a5d51c99254fc14ffcbcca9e8550cc7940fe871 libwpe-1.14.0.tar.xz +sha256 c073305bbac5f4402cc1c8a4753bfa3d63a408901f86182051eaa5a75dd89c00 libwpe-1.14.0.tar.xz # Hashes for license files: sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk index ac533642d9..e7b3ce9eaf 100644 --- a/package/libwpe/libwpe.mk +++ b/package/libwpe/libwpe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWPE_VERSION = 1.12.3 +LIBWPE_VERSION = 1.14.0 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz LIBWPE_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:58:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:40 -0000 Subject: [Buildroot] [git commit branch/next] package/moby-buildkit: bump to version 0.11.2 Message-ID: <20230220205244.C79BE8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c7c179e9a50b908b14aa2dd2f11c5df5a42109a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/moby/buildkit/releases/tag/v0.11.2 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- 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 43ee1b12c9..ef927636d9 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5ffe5a2d11736719649dae962461f66df394ae4cc1e58294e5f2bd4d4632d9d0 moby-buildkit-0.10.6.tar.gz +sha256 b1746575f37715a8a2f2df5bab77ea081ba8436854e241792702109fc9e3653d moby-buildkit-0.11.2.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 59d68a7dca..a25f676710 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.10.6 +MOBY_BUILDKIT_VERSION = 0.11.2 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 20:58:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:41 -0000 Subject: [Buildroot] [git commit branch/next] package/libksba: security bump to version 1.6.3 Message-ID: <20230220205222.D39FB828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=456f18409861a0bee1d553d530cef8bf3482ee7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-47629 See also: https://gnupg.org/blog/20221017-pepe-left-the-ksba.html For changelog see: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libksba.git;a=log;h=libksba-1.6.3 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/libksba/libksba.hash | 2 +- package/libksba/libksba.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libksba/libksba.hash b/package/libksba/libksba.hash index 77485c0cb6..5c6c5eda7a 100644 --- a/package/libksba/libksba.hash +++ b/package/libksba/libksba.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971 libksba-1.6.2.tar.bz2 +sha256 3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c libksba-1.6.3.tar.bz2 # Hash for license files: sha256 8f1b87e551d97b2b23b6d3403a5d598c63ea89824cb8ee351f631f6cab2beaa5 AUTHORS diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index 727a836cf4..b7c0508df8 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKSBA_VERSION = 1.6.2 +LIBKSBA_VERSION = 1.6.3 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = https://gnupg.org/ftp/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) From peter at korsgaard.com Mon Feb 20 20:58:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:41 -0000 Subject: [Buildroot] [git commit branch/next] package/ell: bump to version 0.56 Message-ID: <20230220205245.1B22286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=607eafa2cd0656929db4bc8a743b28b0c48df8e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard 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 68832c3201..c0f1731676 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 a7d0df846af839bbea1b80f292166371070328854b3fa785b5c607fe600552ad ell-0.53.tar.xz +sha256 58eb8b2b64087f7479d5db6a830a0656c536d93e5f11d4c9a4443ce8760a1b63 ell-0.56.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index b27d6feb65..994b0e19f0 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.53 +ELL_VERSION = 0.56 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 Mon Feb 20 20:58:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:42 -0000 Subject: [Buildroot] [git commit branch/next] package/libgpg-error: bump to version 1.46 Message-ID: <20230220205222.E5DEB8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5bdcb4cc562942cac592519c710bc67d1decf8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For the changelog, see: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=log;h=libgpg-error-1.46 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/libgpg-error/libgpg-error.hash | 6 +++--- package/libgpg-error/libgpg-error.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index b29ec37598..ffe27e9d99 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,10 +1,10 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 fe724ed37b4935964059a47b7c64d5f8246659d8 libgpg-error-1.45.tar.bz2 +sha1 a6e5efdd72e848aab4064e5ef4c6835ba344bcf1 libgpg-error-1.46.tar.bz2 # Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.45.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.46.tar.bz2.sig # using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26 libgpg-error-1.45.tar.bz2 +sha256 b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d libgpg-error-1.46.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 252d95ac7f..ab3c7c3bf2 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.45 +LIBGPG_ERROR_VERSION = 1.46 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:42 -0000 Subject: [Buildroot] [git commit branch/next] configs/qemu_arm_ebbr: new defconfig Message-ID: <20230220205244.7312186496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7115ab39189a6c660745267d8bf0bf41cf8b3db7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add a defconfig to build a 32b ARMv7-A U-Boot based firmware implementing the subset of UEFI defined by EBBR[1], as well as a Linux OS disk image booting with UEFI, to run on Qemu. The generated firmware binary can also be used to install or run another OS supporting the EBBR specification. [1]: https://github.com/ARM-software/ebbr Signed-off-by: Vincent Stehl?? Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ board/qemu/arm-ebbr/genimage.cfg | 31 ++++++++++++++++ board/qemu/arm-ebbr/grub.cfg | 6 ++++ board/qemu/arm-ebbr/linux.fragment | 2 ++ board/qemu/arm-ebbr/post-image.sh | 11 ++++++ board/qemu/arm-ebbr/readme.txt | 71 +++++++++++++++++++++++++++++++++++++ board/qemu/arm-ebbr/u-boot.fragment | 35 ++++++++++++++++++ configs/qemu_arm_ebbr_defconfig | 57 +++++++++++++++++++++++++++++ 8 files changed, 215 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 706ee80ece..e19087c577 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2986,7 +2986,9 @@ F: package/utp_com/ N: Vincent Stehl?? F: board/qemu/aarch64-ebbr/ +F: board/qemu/arm-ebbr/ F: configs/qemu_aarch64_ebbr_defconfig +F: configs/qemu_arm_ebbr_defconfig F: package/edk2-non-osi/ N: Vincent Stehl?? diff --git a/board/qemu/arm-ebbr/genimage.cfg b/board/qemu/arm-ebbr/genimage.cfg new file mode 100644 index 0000000000..3d4c9cff1a --- /dev/null +++ b/board/qemu/arm-ebbr/genimage.cfg @@ -0,0 +1,31 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file zImage { + image = "zImage" + } + } + + size = 128M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = U + offset = 32K + bootable = true + } + + partition root { + partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 + image = "rootfs.ext2" + } +} diff --git a/board/qemu/arm-ebbr/grub.cfg b/board/qemu/arm-ebbr/grub.cfg new file mode 100644 index 0000000000..ab3a6ec26b --- /dev/null +++ b/board/qemu/arm-ebbr/grub.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /zImage root=PARTLABEL=root rootwait +} diff --git a/board/qemu/arm-ebbr/linux.fragment b/board/qemu/arm-ebbr/linux.fragment new file mode 100644 index 0000000000..07554cf843 --- /dev/null +++ b/board/qemu/arm-ebbr/linux.fragment @@ -0,0 +1,2 @@ +CONFIG_TEE=y +CONFIG_OPTEE=y diff --git a/board/qemu/arm-ebbr/post-image.sh b/board/qemu/arm-ebbr/post-image.sh new file mode 100755 index 0000000000..c884a8b6f6 --- /dev/null +++ b/board/qemu/arm-ebbr/post-image.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -eu + +BOARD_DIR=$(dirname "$0") + +# Create flash.bin TF-A FIP image from bl1.bin and fip.bin +dd if="${BINARIES_DIR}/bl1.bin" of="${BINARIES_DIR}/flash.bin" bs=1M +dd if="${BINARIES_DIR}/fip.bin" of="${BINARIES_DIR}/flash.bin" seek=64 bs=4096 conv=notrunc + +# Override the default GRUB configuration file with our own. +cp -f "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" diff --git a/board/qemu/arm-ebbr/readme.txt b/board/qemu/arm-ebbr/readme.txt new file mode 100644 index 0000000000..085e723fe6 --- /dev/null +++ b/board/qemu/arm-ebbr/readme.txt @@ -0,0 +1,71 @@ +Introduction +============ + +The qemu_arm_ebbr_defconfig is meant to illustrate some aspects of the Arm +EBBR specification[1] and the Arm SystemReady IR[2] compliance program. +It allows building a 32b ARMv7-A U-Boot based firmware implementing the subset +of UEFI defined by EBBR, as well as a Linux OS disk image booting with UEFI, to +run on Qemu. + +Building +======== + + $ make qemu_arm_ebbr_defconfig + $ make + +Generated files under output/images: + +* flash.bin: A firmware image comprising TF-A, OP-TEE and the U-Boot bootloader. + +* disk.img: An OS disk image comprising the GRUB bootloader, the Linux kernel + and the root filesystem. + +Running under Qemu +================== + +Run the emulation with: + + qemu-system-arm \ + -M virt,secure=on \ + -bios output/images/flash.bin \ + -cpu cortex-a15 \ + -device virtio-blk-device,drive=hd0 \ + -device virtio-net-device,netdev=eth0 \ + -device virtio-rng-device,rng=rng0 \ + -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ + -m 1024 \ + -netdev user,id=eth0 \ + -no-acpi \ + -nographic \ + -object rng-random,filename=/dev/urandom,id=rng0 \ + -rtc base=utc,clock=host \ + -smp 2 # qemu_arm_ebbr_defconfig + +The login prompt will appear in the terminal that started Qemu. + +Using the EBBR firmware to run another OS under Qemu +---------------------------------------------------- + +It is possible to use the generated firmware binary to run another OS +supporting the EBBR specification. + +To run another OS on emulation using a live or pre-installed image, use the same +Qemu command line as for the generated OS but adapt the OS image path in the +-drive stanza. +The 32b Arm ACS-IR image[3] is an example of a pre-installed OS image. +Linux distributions such as Debian or openSUSE provide a pre-installed OS +image. + +Miscellaneous +============= + +This configuration is inspired by the qemu_arm_vexpress_tz_defconfig, the +qemu_aarch64_ebbr_defconfig and the Arm SystemReady IR IoT Integration, Test, +and Certification Guide[4]. + +Firmware update is currently not supported. + +[1]: https://github.com/ARM-software/ebbr +[2]: https://developer.arm.com/Architectures/Arm%20SystemReady%20IR +[3]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images +[4]: https://developer.arm.com/documentation/DUI1101/1-1/?lang=en diff --git a/board/qemu/arm-ebbr/u-boot.fragment b/board/qemu/arm-ebbr/u-boot.fragment new file mode 100644 index 0000000000..bfc382cde9 --- /dev/null +++ b/board/qemu/arm-ebbr/u-boot.fragment @@ -0,0 +1,35 @@ +CONFIG_BOOTM_EFI=y +CONFIG_CMD_BOOTEFI=y +CONFIG_CMD_BOOTEFI_HELLO=y +CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y +CONFIG_CMD_BOOTEFI_SELFTEST=y +CONFIG_CMD_EFIDEBUG=y +CONFIG_CMD_EFI_VARIABLE_FILE_STORE=y +CONFIG_CMD_GPT=y +CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_RNG=y +CONFIG_CMD_RTC=y +CONFIG_DM_RTC=y +CONFIG_EFI_DEVICE_PATH_TO_TEXT=y +CONFIG_EFI_GET_TIME=y +CONFIG_EFI_HAVE_RUNTIME_RESET=y +CONFIG_EFI_LOADER=y +CONFIG_EFI_LOADER_HII=y +CONFIG_EFI_MM_COMM_TEE=y +CONFIG_EFI_PARTITION=y +CONFIG_EFI_SECURE_BOOT=y +CONFIG_EFI_SET_TIME=y +CONFIG_EFI_UNICODE_CAPITALIZATION=y +CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y +CONFIG_EFI_VARIABLE_FILE_STORE=y +CONFIG_FAT_WRITE=y +CONFIG_FIT=y +CONFIG_FS_FAT=y +CONFIG_OF_LIBFDT=y +CONFIG_OPTEE=y +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_RNG_OPTEE=y +CONFIG_RTC_EMULATION=y +CONFIG_SCMI_FIRMWARE=y +CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_TEE=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig new file mode 100644 index 0000000000..f3e2d42a54 --- /dev/null +++ b/configs/qemu_arm_ebbr_defconfig @@ -0,0 +1,57 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15=y + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post-image.sh support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" + +# Linux headers +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.9" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" + +# Packages +BR2_PACKAGE_OPTEE_CLIENT=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set + +# Firmware and bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_RAM_LOCATION=tdram" +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_ARM_EFI=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_NEEDS_DTC=y +BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y + +# Host tools +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From peter at korsgaard.com Mon Feb 20 20:58:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:43 -0000 Subject: [Buildroot] [git commit branch/next] package/libmng: fix optional dependency to lcms2 Message-ID: <20230220205223.703C28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7aeeb632d66dd59e0dbcff8ad6fee724c4e829d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next "0ce9b533e3 libmng: new package" introduced a typo that makes the optional dependency to lcms2 ineffective. Fix the typo LIBMNG_DEPDENDENCIES -> LIBMNG_DEPENDENCIES. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/libmng/libmng.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmng/libmng.mk b/package/libmng/libmng.mk index 090fe18380..8ffd74c05b 100644 --- a/package/libmng/libmng.mk +++ b/package/libmng/libmng.mk @@ -14,7 +14,7 @@ LIBMNG_LICENSE = libmng license LIBMNG_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_LCMS2),y) -LIBMNG_DEPDENDENCIES += lcms2 +LIBMNG_DEPENDENCIES += lcms2 else LIBMNG_CONF_OPTS += --without-lcms2 endif From yann.morin.1998 at free.fr Mon Feb 20 20:58:43 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:43 -0000 Subject: [Buildroot] [git commit branch/next] package/wpewebkit: security bump to version 2.38.4 Message-ID: <20230220205245.0D90F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02ace135ee0d31d30021cd000d0594bb6360ca94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.4.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index ccd928b3df..dcd082e045 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums -md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz -sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz -sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums +md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz +sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz +sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b2bbc0301b..54f37fd702 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.3 +WPEWEBKIT_VERSION = 2.38.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:58:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:44 -0000 Subject: [Buildroot] [git commit branch/next] package/qcom-db410c-firmware: fix typo for _LICENSE Message-ID: <20230220205223.60865828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa35d8d071faf68abc4538be2a3bb636ea6b4a2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Cc: Mike Frampton Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/qcom-db410c-firmware/qcom-db410c-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qcom-db410c-firmware/qcom-db410c-firmware.mk b/package/qcom-db410c-firmware/qcom-db410c-firmware.mk index 9ef32cc9d4..cf4b59b72e 100644 --- a/package/qcom-db410c-firmware/qcom-db410c-firmware.mk +++ b/package/qcom-db410c-firmware/qcom-db410c-firmware.mk @@ -8,7 +8,7 @@ QCOM_DB410C_FIRMWARE_VERSION = 1034.2.1 QCOM_DB410C_FIRMWARE_BASE = linux-board-support-package-r$(QCOM_DB410C_FIRMWARE_VERSION) QCOM_DB410C_FIRMWARE_SOURCE = $(QCOM_DB410C_FIRMWARE_BASE).zip QCOM_DB410C_FIRMWARE_SITE = https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware -QCOM_DB410C_FIRMWARE_LICENCE = Qualcomm firmware license +QCOM_DB410C_FIRMWARE_LICENSE = Qualcomm firmware license QCOM_DB410C_FIRMWARE_LICENSE_FILES = LICENSE QCOM_DB410C_FIRMWARE_DEPENDENCIES = host-mtools From peter at korsgaard.com Mon Feb 20 20:58:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:44 -0000 Subject: [Buildroot] [git commit branch/next] package/gstreamer1: bump to version 1.22.0 Message-ID: <20230220205245.7B5DB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e30ce907d58e5f675704545599ca77ce2035acd2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard 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 5fb52606fe..db0ed5bede 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.4.tar.xz.sha256sum -sha256 67c1edf8c3c339cda5dde85f4f7b953bb9607c2d13ae970e2491c5c4c055ef5f gstreamer-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.0.tar.xz.sha256sum +sha256 78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09 gstreamer-1.22.0.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 16c016b145..09d1a10ce7 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.20.4 +GSTREAMER1_VERSION = 1.22.0 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 Feb 20 20:58:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:45 -0000 Subject: [Buildroot] [git commit branch/next] package/libnice: bump to version 0.1.21 Message-ID: <20230220205245.6E8468648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c392e8b76f73d2b8ebfba2117ed6b03d902b8243 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/libnice/libnice.hash | 2 +- package/libnice/libnice.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnice/libnice.hash b/package/libnice/libnice.hash index 83b28a9ad9..cf6d825f83 100644 --- a/package/libnice/libnice.hash +++ b/package/libnice/libnice.hash @@ -1,5 +1,5 @@ # Locally computed after checking pgp signature -sha256 6747af710998cf708a2e8ceef51cccd181373d94201dd4b8d40797a070ed47cc libnice-0.1.19.tar.gz +sha256 72e73a2acf20f59093e21d5601606e405873503eb35f346fa621de23e99b3b39 libnice-0.1.21.tar.gz # Hash for license files: sha256 9246b2ee8b1db30cf03d5d9719ad8bb5edce1cadc85f8cfef319c23d24d950b5 COPYING diff --git a/package/libnice/libnice.mk b/package/libnice/libnice.mk index 2b223bedd3..56ee35e452 100644 --- a/package/libnice/libnice.mk +++ b/package/libnice/libnice.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNICE_VERSION = 0.1.19 -LIBNICE_SITE = http://nice.freedesktop.org/releases +LIBNICE_VERSION = 0.1.21 +LIBNICE_SITE = https://libnice.freedesktop.org/releases LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL LIBNICE_DEPENDENCIES = libglib2 host-pkgconf From peter at korsgaard.com Mon Feb 20 20:58:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:45 -0000 Subject: [Buildroot] [git commit branch/next] package/cog: bump to version 0.16.0 Message-ID: <20230220205223.41F1F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43c833e6cb44d4ffe59629cd83344caa9f63a0c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This new version includes support for setting proxy options and gamepad support. Release notes: https://wpewebkit.org/release/cog-0.16.0.html This imports a small patch to properly pick libdrm compiler flags, fetched from the upstream repository. Signed-off-by: Adrian Perez de Castro Tested-by: Gary Bisson Tested-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...libdrm-dependency-when-protocols-are-used.patch | 36 +++++++++++++++++++++ package/cog/cog.hash | 8 ++--- package/cog/cog.mk | 37 ++++++++++++---------- 3 files changed, 60 insertions(+), 21 deletions(-) diff --git a/package/cog/0001-wl-Fix-libdrm-dependency-when-protocols-are-used.patch b/package/cog/0001-wl-Fix-libdrm-dependency-when-protocols-are-used.patch new file mode 100644 index 0000000000..44e555c121 --- /dev/null +++ b/package/cog/0001-wl-Fix-libdrm-dependency-when-protocols-are-used.patch @@ -0,0 +1,36 @@ +From 9a1982c563e218b7695e6a174c8230d3b063eb27 Mon Sep 17 00:00:00 2001 +From: Gary Bisson +Date: Thu, 6 Oct 2022 09:04:22 +0200 +Subject: [PATCH] wl: Fix libdrm dependency when protocols are used + +As the comment says, cog-platform-wl.c needs drm_fourcc.h to build +properly when wayland_weston_direct_display is enabled. + +However, libdrm.pc doesn't specify "include/libdrm" as part of its +includedir but whether in its cflags. So use the compile_args dep +instead of includes to fix the build failure. + +Signed-off-by: Gary Bisson +(cherry picked from commit 32c1d9533bcdc22cbc01d02bf2e6ac0d4bda2dc2) +Signed-off-by: Adrian Perez de Castro +[Upstream status: https://github.com/Igalia/cog/pull/501] +--- + platform/wayland/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/platform/wayland/meson.build b/platform/wayland/meson.build +index f1e18ec..31e4460 100644 +--- a/platform/wayland/meson.build ++++ b/platform/wayland/meson.build +@@ -67,7 +67,7 @@ if wayland_platform_weston_protocols.length() > 0 + + # The code uses definitions from the drm_fourcc.h header, but does not + # need to link the library; libdrm here is only a build-time dependency. +- wayland_platform_dependencies += [dependency('libdrm').partial_dependency(includes: true)] ++ wayland_platform_dependencies += [dependency('libdrm').partial_dependency(compile_args: true)] + endif + + +-- +2.38.0 + diff --git a/package/cog/cog.hash b/package/cog/cog.hash index aa128d73d8..a2c55c4b94 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.14.1.tar.xz.sums -md5 69d72ac046a0fc485ea7b61b96e7e7fc cog-0.14.1.tar.xz -sha1 6236972b0ae0bce38a0a017610f161b349723862 cog-0.14.1.tar.xz -sha256 fb91104e25e1dde27189c91c70acc356e387f47acebaa8997e01ce5879c3a600 cog-0.14.1.tar.xz +# From https://wpewebkit.org/releases/cog-0.16.0.tar.xz.sums +md5 2705472ea4f333290973722c0862b21d cog-0.16.0.tar.xz +sha1 ef16e5e3d91d0da056fe5e4f596c211af7453b4e cog-0.16.0.tar.xz +sha256 2956f719d36c9a6368f63901a0d1ceaf4d27f529f7df441b3748c36d72906fc6 cog-0.16.0.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 1f24bebee4..241c4e309c 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.14.1 +COG_VERSION = 0.16.0 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES @@ -12,37 +12,40 @@ COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo wayland COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \ - -DCOG_BUILD_PROGRAMS=ON \ - -DCOG_PLATFORM_HEADLESS=ON \ - -DINSTALL_MAN_PAGES=OFF \ - -DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \ - -DUSE_SOUP2=ON + -Ddocumentation=false \ + -Dmanpages=false \ + -Dprograms=true \ + -Dsoup2=enabled \ + -Dcog_home_uri='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \ + -Dplatforms='$(subst $(space),$(comma),$(strip $(COG_PLATFORMS_LIST)))' + +COG_PLATFORMS_LIST = headless ifeq ($(BR2_PACKAGE_WESTON),y) -COG_CONF_OPTS += -DCOG_WESTON_DIRECT_DISPLAY=ON +COG_CONF_OPTS += -Dwayland_weston_direct_display=true COG_DEPENDENCIES += weston else -COG_CONF_OPTS += -DCOG_WESTON_DIRECT_DISPLAY=OFF +COG_CONF_OPTS += -Dwayland_weston_direct_display=false endif ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y) -COG_CONF_OPTS += -DCOG_PLATFORM_WL=ON +COG_PLATFORMS_LIST += wayland COG_DEPENDENCIES += libxkbcommon wayland-protocols -else -COG_CONF_OPTS += -DCOG_PLATFORM_WL=OFF endif ifeq ($(BR2_PACKAGE_COG_PLATFORM_DRM),y) -COG_CONF_OPTS += -DCOG_PLATFORM_DRM=ON +COG_PLATFORMS_LIST += drm COG_DEPENDENCIES += libdrm libinput libgbm libegl udev -else -COG_CONF_OPTS += -DCOG_PLATFORM_DRM=OFF endif ifeq ($(BR2_PACKAGE_COG_USE_SYSTEM_DBUS),y) -COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=ON +COG_CONF_OPTS += -Dcog_dbus_control=system else -COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=OFF +COG_CONF_OPTS += -Dcog_dbus_control=user +endif + +ifeq ($(BR2_PACKAGE_LIBMANETTE),y) +COG_DEPENDENCIES += libmanette endif -$(eval $(cmake-package)) +$(eval $(meson-package)) From peter at korsgaard.com Mon Feb 20 20:58:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:46 -0000 Subject: [Buildroot] [git commit branch/next] package/ima-evm-utils: really install to staging Message-ID: <20230220205223.8DA8D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee73336da98a7de04301a90c9b5a881761274a47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "8229196d41 package/ima-evm-utils: new package" added IMA_EVM_UTILS_INSTALL_STAGING_CMDS without enabling IMA_EVM_UTILS_INSTALL_STAGING, so currently the package is not installed to staging. Enable installing to staging. Cc: Petr Vorel Signed-off-by: Ricardo Martincoski Reviewed-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/ima-evm-utils/ima-evm-utils.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ima-evm-utils/ima-evm-utils.mk b/package/ima-evm-utils/ima-evm-utils.mk index 7ee34d5e1a..01984402ce 100644 --- a/package/ima-evm-utils/ima-evm-utils.mk +++ b/package/ima-evm-utils/ima-evm-utils.mk @@ -8,6 +8,7 @@ IMA_EVM_UTILS_VERSION = 1.4 IMA_EVM_UTILS_SITE = http://downloads.sourceforge.net/project/linux-ima/ima-evm-utils IMA_EVM_UTILS_LICENSE = GPL-2.0 IMA_EVM_UTILS_LICENSE_FILES = COPYING +IMA_EVM_UTILS_INSTALL_STAGING = YES IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl tpm2-tss # Tarball doesn't contain configure From yann.morin.1998 at free.fr Mon Feb 20 20:58:50 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:50 -0000 Subject: [Buildroot] [git commit branch/next] package/libks: bump version to 1.8.2 Message-ID: <20230220205246.3708B8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e09e7987b986d01e86e4ec45319e2dd5945259c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Needed for upcoming bump of freeswitch to version 1.10.9. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- 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 d4ad7ebbbc..dba442bdd2 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz +sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index 4aca5c5c4c..c4f0cd5c78 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.8.0 +LIBKS_VERSION = 1.8.2 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright From peter at korsgaard.com Mon Feb 20 20:58:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:50 -0000 Subject: [Buildroot] [git commit branch/next] Revert "package/zip: install to staging" Message-ID: <20230220205223.CF8358648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11614fdde1611f846b8e5d99f55af7c6c131b817 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This reverts commit c5b5b5ccabe35e11f0ca8db4361bb3f335fc59fb. Commit "c5b5b5ccab package/zip: install to staging" contains a typo that prevents installing to staging. ZIP_INSTALLING_STAGING_CMDS -> ZIP_INSTALL_STAGING_CMDS But the package does not install headers or libraries, only ELF and manual files. So instead of fixing the install to staging, revert the bogus commit. Cc: Jan Pedersen Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/zip/zip.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/zip/zip.mk b/package/zip/zip.mk index 2d11e1c763..67958a4a66 100644 --- a/package/zip/zip.mk +++ b/package/zip/zip.mk @@ -11,7 +11,6 @@ ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src ZIP_LICENSE = Info-ZIP ZIP_LICENSE_FILES = LICENSE ZIP_CPE_ID_VENDOR = info-zip_project -ZIP_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_BZIP2),y) ZIP_DEPENDENCIES += bzip2 @@ -41,11 +40,6 @@ define ZIP_INSTALL_TARGET_CMDS prefix=$(TARGET_DIR)/usr endef -define ZIP_INSTALLING_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ - prefix=$(STAGING_DIR)/usr -endef - define HOST_ZIP_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \ From peter at korsgaard.com Mon Feb 20 20:58:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:51 -0000 Subject: [Buildroot] [git commit branch/next] package/grpc: bump to version 1.51.1 Message-ID: <20230220205223.EAEE086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cb6906eeb5a79bf222e881b7170d6d97280370a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- 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 4d838703cc..e6b76dcb5e 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 76900ab068da86378395a8e125b5cc43dfae671e09ff6462ddfef18676e2165a grpc-1.50.0.tar.gz +sha256 b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229 grpc-1.51.1.tar.gz sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 9aac241e47..9125b1f9f6 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.50.0 +GRPC_VERSION = 1.51.1 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 peter at korsgaard.com Mon Feb 20 20:58:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:51 -0000 Subject: [Buildroot] [git commit branch/next] package/gst1-python: bump version to 1.22.0 Message-ID: <20230220205246.1C67A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b53e11f2ec049002a4c3c2829aaa0e7a31551f1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard 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 adb116ac4c..128a739c2c 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.4.tar.xz.sha256sum -sha256 5eb4136d03e2a495f4499c8b2e6d9d3e7b5e73c5a8b8acf9213d57bc6a7bd3c1 gst-python-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.0.tar.xz.sha256sum +sha256 6c63ad364ca4617eb2cbb3975ab26c66760eb3c7a6adf5be69f99c11e21ef3a5 gst-python-1.22.0.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index feb2de718a..2fc268b0ac 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.4 +GST1_PYTHON_VERSION = 1.22.0 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 Feb 20 20:58:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:52 -0000 Subject: [Buildroot] [git commit branch/next] package/freeswitch: security bump version to 1.10.9 Message-ID: <20230220205246.2B4C686495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46683dd4a6e65b5ae3188440e9ae8eaf055d9a85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.9 Upstream removed zrtp support: https://github.com/signalwire/freeswitch/pull/1848 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/freeswitch/freeswitch.hash | 5 ++--- package/freeswitch/freeswitch.mk | 11 +---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 18a36ff23c..3497a3283f 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,11 +1,10 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.8.-release.tar.xz.sha256 -sha256 1176b26b2f463de2980e5be953f81ced94d23c784452bd41e086d3933a88be5f freeswitch-1.10.8.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.9.-release.tar.xz.sha256 +sha256 f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 freeswitch-1.10.9.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 6234dd8e97..7497cc4964 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.8 +FREESWITCH_VERSION = 1.10.9 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -81,15 +81,6 @@ FREESWITCH_CONF_OPTS = \ --without-python \ --disable-system-xmlrpc-c -# zrtp supports a limited set of archs, sparc support is also broken due -# to a broken ld call by gcc, see libs/libzrtp/include/zrtp_config.h -ifeq ($(BR2_i386)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le)$(BR2_x86_64),y) -FREESWITCH_LICENSE_FILES += libs/libzrtp/src/zrtp_legal.c -FREESWITCH_CONF_OPTS += --enable-zrtp -else -FREESWITCH_CONF_OPTS += --disable-zrtp -endif - # Enable optional modules FREESWITCH_ENABLED_MODULES += \ applications/mod_avmd \ From yann.morin.1998 at free.fr Mon Feb 20 21:00:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:36 -0000 Subject: [Buildroot] [git commit branch/next] package/lpeg: add missing LPEG_LICENSE_FILES Message-ID: <20230220205232.9B0CC8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52afc0b3b504c9616b3875dcdf67ab7be41455f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The lpeg.html file declares the licensing terms at its bottom, so it should work as a license file. Signed-off-by: Nicolas Carrier [yann.morin.1998 at free.fr: use LPEG_SUBDIR] Signed-off-by: Yann E. MORIN --- package/lpeg/lpeg.hash | 2 ++ package/lpeg/lpeg.mk | 1 + 2 files changed, 3 insertions(+) diff --git a/package/lpeg/lpeg.hash b/package/lpeg/lpeg.hash index 1ccaf242c4..cb995bde2c 100644 --- a/package/lpeg/lpeg.hash +++ b/package/lpeg/lpeg.hash @@ -1,2 +1,4 @@ # computed by luarocks/buildroot sha256 e0d0d687897f06588558168eeb1902ac41a11edd1b58f1aa61b99d0ea0abbfbc lpeg-1.0.2-1.src.rock +# computed locally +sha256 2b80a8cce793e008ba433e5e0184f20aca4a67ec741439fafd86a874a6a91c49 lpeg-1.0.2/lpeg.html diff --git a/package/lpeg/lpeg.mk b/package/lpeg/lpeg.mk index cdb2e81a5f..7326e59e01 100644 --- a/package/lpeg/lpeg.mk +++ b/package/lpeg/lpeg.mk @@ -6,5 +6,6 @@ LPEG_VERSION = 1.0.2-1 LPEG_LICENSE = MIT +LPEG_LICENSE_FILES = $(LPEG_SUBDIR)/lpeg.html $(eval $(luarocks-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:00:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:55 -0000 Subject: [Buildroot] [git commit branch/next] package/python-hatchling: bump to version 1.12.2 Message-ID: <20230220205234.7EE7F8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=194c0247e796e9d1b3c6682b3cf37395d05f95d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-hatchling/python-hatchling.hash | 4 ++-- package/python-hatchling/python-hatchling.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatchling/python-hatchling.hash b/package/python-hatchling/python-hatchling.hash index 41d7be977e..154c1fdcac 100644 --- a/package/python-hatchling/python-hatchling.hash +++ b/package/python-hatchling/python-hatchling.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatchling/json -md5 e06cc65ac646f9b01df5406aa1f97022 hatchling-1.11.1.tar.gz -sha256 9f84361f70cf3a7ab9543b0c3ecc64211ed2ba8a606a71eb6a473c1c9b08e1d0 hatchling-1.11.1.tar.gz +md5 5a6e2fd0c877feea7e71b9d72bbdbed9 hatchling-1.12.2.tar.gz +sha256 8a6d719d96653a0f3901072b12710c9c3cc934f9061b443775c6789b45333495 hatchling-1.12.2.tar.gz # Locally computed sha256 checksums sha256 7f143a8127ad4873862d70854b5bd2abd0085aa73e64fd2b08704a3b9f5c07fc LICENSE.txt diff --git a/package/python-hatchling/python-hatchling.mk b/package/python-hatchling/python-hatchling.mk index 13155a20a4..61aa1a6c23 100644 --- a/package/python-hatchling/python-hatchling.mk +++ b/package/python-hatchling/python-hatchling.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCHLING_VERSION = 1.11.1 +PYTHON_HATCHLING_VERSION = 1.12.2 PYTHON_HATCHLING_SOURCE = hatchling-$(PYTHON_HATCHLING_VERSION).tar.gz -PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/24/20/3e21d2bc57229822ac9fb9b314d7892c16f829f34a0eb247c55fc11e09a8 +PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/f5/ea/3ed5a7ecdd8a8f7e84cffd3b5ec24279a09ce2694c218ff922c35c6f1a77 PYTHON_HATCHLING_LICENSE = MIT PYTHON_HATCHLING_LICENSE_FILES = LICENSE.txt PYTHON_HATCHLING_SETUP_TYPE = pep517 From yann.morin.1998 at free.fr Mon Feb 20 21:00:56 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:56 -0000 Subject: [Buildroot] [git commit branch/next] package/python-iniconfig: bump to version 2.0.0 Message-ID: <20230220205234.90AD6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f947ac259692879cf651c13dc595236103b0d1f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate from setuptools to hatchling pep517 build backend. Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-iniconfig/python-iniconfig.hash | 4 ++-- package/python-iniconfig/python-iniconfig.mk | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-iniconfig/python-iniconfig.hash b/package/python-iniconfig/python-iniconfig.hash index b2469db99b..541ae3e3f3 100644 --- a/package/python-iniconfig/python-iniconfig.hash +++ b/package/python-iniconfig/python-iniconfig.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/iniconfig/json -md5 0b7f3be87481211c183eae095bcea6f1 iniconfig-1.1.1.tar.gz -sha256 bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32 iniconfig-1.1.1.tar.gz +md5 3c030b3f51dcc3aca585de05635600e4 iniconfig-2.0.0.tar.gz +sha256 2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 iniconfig-2.0.0.tar.gz # Locally computed sha256 checksums sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE diff --git a/package/python-iniconfig/python-iniconfig.mk b/package/python-iniconfig/python-iniconfig.mk index 5c31c69957..99e946f0ab 100644 --- a/package/python-iniconfig/python-iniconfig.mk +++ b/package/python-iniconfig/python-iniconfig.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_INICONFIG_VERSION = 1.1.1 +PYTHON_INICONFIG_VERSION = 2.0.0 PYTHON_INICONFIG_SOURCE = iniconfig-$(PYTHON_INICONFIG_VERSION).tar.gz -PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/23/a2/97899f6bd0e873fed3a7e67ae8d3a08b21799430fb4da15cfedf10d6e2c2 -PYTHON_INICONFIG_SETUP_TYPE = setuptools +PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/d7/4b/cbd8e699e64a6f16ca3a8220661b5f83792b3017d0f79807cb8708d33913 +PYTHON_INICONFIG_SETUP_TYPE = pep517 PYTHON_INICONFIG_LICENSE = MIT PYTHON_INICONFIG_LICENSE_FILES = LICENSE +PYTHON_INICONFIG_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs $(eval $(python-package)) From yann.morin.1998 at free.fr Sun Feb 12 20:34:14 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:34:14 +0100 Subject: [Buildroot] [git commit branch/next] package/libsolv: fix build without C++ Message-ID: <20230220205259.15E7486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=add76a41c3c68e649ecae69aa896d5f8b627d1be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure without C++ raised since the addition ot the package in commit 93ce3c1be0753189d6af3ee9968b935037519c25: CMake Error at CMakeLists.txt:1 (PROJECT): No CMAKE_CXX_COMPILER could be found. Tell CMake where to find the compiler by setting either the environment variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path to the compiler, or to the compiler name if it is in the PATH. Fixes: - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsolv/0001-Fix-build-without-C.patch | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/package/libsolv/0001-Fix-build-without-C.patch b/package/libsolv/0001-Fix-build-without-C.patch new file mode 100644 index 0000000000..2389aebcde --- /dev/null +++ b/package/libsolv/0001-Fix-build-without-C.patch @@ -0,0 +1,49 @@ +From 5691f58d1f8ce1332b02536e48f1ac5864629c6c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 12 Feb 2023 15:27:27 +0100 +Subject: [PATCH] Fix build without C++ + +Fix the following build failure without C++: + +CMake Error at CMakeLists.txt:1 (PROJECT): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Fixes: + - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/openSUSE/libsolv/pull/520] +--- + CMakeLists.txt | 2 +- + ext/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3541f496..f899c49a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-PROJECT (libsolv) ++PROJECT (libsolv C) + + CMAKE_MINIMUM_REQUIRED (VERSION 2.8.5) + +diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt +index f01c0238..589fa946 100644 +--- a/ext/CMakeLists.txt ++++ b/ext/CMakeLists.txt +@@ -103,6 +103,7 @@ IF (ENABLE_CUDFREPO) + ENDIF (ENABLE_CUDFREPO) + + IF (ENABLE_HAIKU) ++ enable_language(CXX) + SET (libsolvext_SRCS ${libsolvext_SRCS} + repo_haiku.cpp) + SET (libsolvext_HEADERS ${libsolvext_HEADERS} +-- +2.39.0 + From yann.morin.1998 at free.fr Mon Feb 20 21:00:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:57 -0000 Subject: [Buildroot] [git commit branch/next] package/python-ipython: bump to version 8.8.0 Message-ID: <20230220205234.A07EB81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d88b18fd42fceb375339c7255cc1d07f755f85c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 aae34f6f9b..f11ad1e18c 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 3adf9fca317512e5b3516a9ac25b3442 ipython-8.7.0.tar.gz -sha256 882899fe78d5417a0aa07f995db298fa28b58faeba2112d2e3a4c95fe14bb738 ipython-8.7.0.tar.gz +md5 a1ea9b6e43c5568e5031974eb3a6acb0 ipython-8.8.0.tar.gz +sha256 f3bf2c08505ad2c3f4ed5c46ae0331a8547d36bf4b21a451e8ae80c0791db95b ipython-8.8.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 1af1081741..f5a114c2f3 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 8.7.0 +PYTHON_IPYTHON_VERSION = 8.8.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/82/2b/026af47da09998404f51064d328f5f1f68c78829082d2945be489343fde6 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/f5/39/89664d8c3e4dfb0a73862cbbff8eb4028a1e3d4305da80ab0a493848ed9b PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From yann.morin.1998 at free.fr Sun Feb 12 20:46:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:46:22 +0100 Subject: [Buildroot] [git commit branch/next] package/python-magic-wormhole-mailbox-server: add missing reverse dependency on host-rustc Message-ID: <20230220205259.2BB238648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0c933adab99e1767bb673610b69de5eedf42c5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next As reported by Yann in [1], Kconfig warns about an unmet dependency. The issue can be reproduced on master branch at commit 451672e, with the command: KCONFIG_SEED=0x1D15B9D4 make randconfig The patch adds the missing dependency. Fixes: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_AUTOBAHN Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER [=y] && BR2_PACKAGE_PYTHON3 [=y] [1] https://lists.buildroot.org/pipermail/buildroot/2023-February/661898.html Cc: Yann E. MORIN Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/python-magic-wormhole-mailbox-server/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in index db20d3e7b6..a0721e866f 100644 --- a/package/python-magic-wormhole-mailbox-server/Config.in +++ b/package/python-magic-wormhole-mailbox-server/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER bool "python-magic-wormhole-mailbox-server" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime From yann.morin.1998 at free.fr Mon Feb 20 21:00:58 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:58 -0000 Subject: [Buildroot] [git commit branch/next] package/python-multidict: bump to version 6.0.4 Message-ID: <20230220205234.BB87286496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89a2bafaa4bd5aee71a13fb1542a15c7410cd6af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-multidict/python-multidict.hash | 4 ++-- package/python-multidict/python-multidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index eae60af37c..568c320c53 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 b5875cf0a0578956dcfffc123d8344ca multidict-6.0.3.tar.gz -sha256 2523a29006c034687eccd3ee70093a697129a3ffe8732535d3b2df6a4ecc279d multidict-6.0.3.tar.gz +md5 ec06a613d871dadfb66f2be3a1f2f3fa multidict-6.0.4.tar.gz +sha256 3666906492efb76453c0e7b97f2cf459b0682e7402c0489a95484965dbc1da49 multidict-6.0.4.tar.gz # Locally computed sha256 checksums sha256 06a240ea10ba868fda2de58df859886961df873aa74bbab1e0f13eaf99f92b7b LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index bfffb84709..cd35dcb4cb 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 6.0.3 +PYTHON_MULTIDICT_VERSION = 6.0.4 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/b5/5b/1dd3b9cf73c474ea1d0f0b1f8b7b712b0f13817493fd93101256ec856b59 +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/4a/15/bd620f7a6eb9aa5112c4ef93e7031bcd071e0611763d8e17706ef8ba65e0 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sun Feb 12 20:53:55 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:53:55 +0100 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_beforelight: bump version to 1.0.6 Message-ID: <20230220205259.4CE897FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa93d0cdd7adf1051cdb1643e978c81ae183327c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003317.html The license file was previously a stub, but it now contains the proper license text since upstream commit: https://gitlab.freedesktop.org/xorg/app/beforelight/-/commit/fa1e473dd64673a36a73a01a84a8db61eaa425dc Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls [yann.morin.1998 at free.fr: properly explain the license hash change] Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_beforelight/xapp_beforelight.hash | 7 ++++--- package/x11r7/xapp_beforelight/xapp_beforelight.mk | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.hash b/package/x11r7/xapp_beforelight/xapp_beforelight.hash index 00aff75779..f5b0cb21a4 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.hash +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002131.html -sha256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 beforelight-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-January/003317.html +sha256 53f0bf085b7272ebbf626d1b9b0ad320d1a07bc1fe7f3ae260c86a71a857ad28 beforelight-1.0.6.tar.xz +sha512 48a165d151676f6d213883bee98b34007403a77e025253c8649f9a0f5ea258b09381ab523a5e906030ac9fc8245fce2c6beaf9ad0f81116e302d51ad4a0fad5a beforelight-1.0.6.tar.xz # Locally computed -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING +sha256 3909739fae1ee37c3c7167a91f53d29317965aaf932813e16ef733f033619a7b COPYING diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk index 7dcb715ef3..6b753833f7 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_BEFORELIGHT_VERSION = 1.0.5 -XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2 -XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_BEFORELIGHT_VERSION = 1.0.6 +XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.xz +XAPP_BEFORELIGHT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_BEFORELIGHT_LICENSE = MIT XAPP_BEFORELIGHT_LICENSE_FILES = COPYING XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt From yann.morin.1998 at free.fr Mon Feb 20 21:00:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:59 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pillow: bump to version 9.4.0 Message-ID: <20230220205234.D9B728648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64848d5dcddad89dd0b151282d3b5060d96dffaf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next License hash changed due to year update: https://github.com/python-pillow/Pillow/commit/13306974e749871822dac413be66e699a0f4645e Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pillow/python-pillow.hash | 6 +++--- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index 46da25dddc..d514bdfe56 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 a6507c1e811a51071d2d6de83070e703 Pillow-9.3.0.tar.gz -sha256 c935a22a557a560108d780f9a0fc426dd7459940dc54faa49d83249c8d3e760f Pillow-9.3.0.tar.gz +md5 ee6e9a6c729ed9e9a78ccd3f6e9d7143 Pillow-9.4.0.tar.gz +sha256 a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e Pillow-9.4.0.tar.gz # Locally computed sha256 checksums -sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE +sha256 4e1755595052d843e2f350c930759f945ecf707bf812883948d181016b12dd0f LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 5ea9fcf264..c02968610f 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 9.3.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/16/11/da8d395299ca166aa56d9436e26fe8440e5443471de16ccd9a1d06f5993a +PYTHON_PILLOW_VERSION = 9.4.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/bc/07/830784e061fb94d67649f3e438ff63cfb902dec6d48ac75aeaaac7c7c30e PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sun Feb 12 21:07:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 22:07:18 +0100 Subject: [Buildroot] [git commit branch/next] package/x11r7/xapp_xvidtune: bump version to 1.0.4 Message-ID: <20230220205259.651AB7FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89710c804ede6879db45c8e41aca3607bd2bb051 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003319.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xvidtune/xapp_xvidtune.hash | 5 +++-- package/x11r7/xapp_xvidtune/xapp_xvidtune.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash index ecf7d0330b..0e7e231383 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002129.html -sha256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 xvidtune-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003319.html +sha256 0d4eecd54e440cc11f1bdaaa23180fcf890f003444343f533f639086b05b2cc5 xvidtune-1.0.4.tar.xz +sha512 747d5358f4f7d3d7db508c3f034711ce4b9dd278160d35312e9c4d1604623e84a2438d039b536546fd2df7db8c5ea1907e8a6101985fad2932b6dee5a62c7b80 xvidtune-1.0.4.tar.xz # Locally computed sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk index d7c4d5bf56..cc40d39098 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XVIDTUNE_VERSION = 1.0.3 -XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2 -XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XVIDTUNE_VERSION = 1.0.4 +XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.xz +XAPP_XVIDTUNE_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XVIDTUNE_LICENSE = MIT XAPP_XVIDTUNE_LICENSE_FILES = COPYING XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm From yann.morin.1998 at free.fr Mon Feb 20 21:01:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:01:00 -0000 Subject: [Buildroot] [git commit branch/next] package/python-networkx: bump to version 3.0 Message-ID: <20230220205234.C8DCD81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5a1a38c8975153838f4e3f43ea03820613e4882 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop no longer required decorator dependency. License hash changed due to year update: https://github.com/networkx/networkx/commit/49f20fe11d2a804a83d538759e06511eb90ad5a3 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-networkx/Config.in | 1 - package/python-networkx/python-networkx.hash | 6 +++--- package/python-networkx/python-networkx.mk | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in index 0f3e86f497..e2fc6ae478 100644 --- a/package/python-networkx/Config.in +++ b/package/python-networkx/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_NETWORKX bool "python-networkx" - select BR2_PACKAGE_PYTHON_DECORATOR # runtime help A Python package for the creation, manipulation, and study of the structure, dynamics, and diff --git a/package/python-networkx/python-networkx.hash b/package/python-networkx/python-networkx.hash index d166f0b8d8..96ef9777da 100644 --- a/package/python-networkx/python-networkx.hash +++ b/package/python-networkx/python-networkx.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/networkx/json -md5 22139ab5a47818fa00cbaa91eb126381 networkx-2.8.8.tar.gz -sha256 230d388117af870fce5647a3c52401fcf753e94720e6ea6b4197a5355648885e networkx-2.8.8.tar.gz +md5 1bfbb5cd184b486feae8345f541a5e50 networkx-3.0.tar.gz +sha256 9a9992345353618ae98339c2b63d8201c381c2944f38a2ab49cb45a4c667e412 networkx-3.0.tar.gz # Locally computed sha256 checksums -sha256 aae9f809fb1a1592ed72e9f52df10cfad8fe226b8d4d28385f90dd4341ce7119 LICENSE.txt +sha256 50b5a27cb43f7a20cede7aa7b9ab2033552e0412c9a1fde51d38885c1417e95f LICENSE.txt diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk index f097671d66..d369df1a04 100644 --- a/package/python-networkx/python-networkx.mk +++ b/package/python-networkx/python-networkx.mk @@ -4,15 +4,14 @@ # ################################################################################ -PYTHON_NETWORKX_VERSION = 2.8.8 +PYTHON_NETWORKX_VERSION = 3.0 PYTHON_NETWORKX_SOURCE = networkx-$(PYTHON_NETWORKX_VERSION).tar.gz -PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/cd/16/c44e8550012735b8f21b3df7f39e8ba5a987fb764ac017ad5f3589735889 +PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/99/f9/d45c9ecf50a6b67a200e0bbd324201b5cd777dfc0e6c8f6d1620ce5a7ada PYTHON_NETWORKX_LICENSE = BSD-3-Clause PYTHON_NETWORKX_LICENSE_FILES = LICENSE.txt PYTHON_NETWORKX_CPE_ID_VENDOR = python PYTHON_NETWORKX_CPE_ID_PRODUCT = networkx PYTHON_NETWORKX_SETUP_TYPE = setuptools -HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator $(eval $(python-package)) $(eval $(host-python-package)) From peter at korsgaard.com Tue Feb 14 17:11:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:11:29 +0100 Subject: [Buildroot] [git commit branch/next] package/mpd: update to version 0.23.12 Message-ID: <20230220205259.8DD8A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=86a3bd33c2d52b2d3e014913857abaa7f24f428c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next List of changes: decoder::mad: fix integer underflow with very small files input::curl: require CURL 7.55.0 or later output::pipewire: adjust to PipeWire 0.3.64 API change tags:: fix crash bug due to race condition fix build failures with GCC 13 Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.12/NEWS Commit: https://github.com/MusicPlayerDaemon/MPD/commit/b1422fb Tested on: i386 (build) x86_64 (build, run) Aarch64 (build) Signed-off-by: Andreas Ziegler Signed-off-by: Peter Korsgaard --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 8c488d0357..2521238f64 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 edb4e7a8f9dff238b5610f9e2461940ea98c727a5462fafb1cdf836304dfdca9 mpd-0.23.11.tar.xz +sha256 b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7 mpd-0.23.12.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 449600eda2..6c25c9b46f 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).11 +MPD_VERSION = $(MPD_VERSION_MAJOR).12 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 Mon Feb 20 21:02:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:01 -0000 Subject: [Buildroot] [git commit branch/next] package/nano: bump to version 7.2 Message-ID: <20230220205240.02DE981979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ec326fb97e51baa9f874d309a8fb2c69d6c8c18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- 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 f49b712093..3ca37c6337 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/v7/nano-7.1.tar.xz.asc +# https://www.nano-editor.org/dist/v7/nano-7.2.tar.xz.asc # using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F -sha256 57ba751e9b7519f0f6ddee505202e387c75dde440c1f7aa1b9310cc381406836 nano-7.1.tar.xz +sha256 86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526 nano-7.2.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 203c417f06..8a2003b92a 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 7 -NANO_VERSION = $(NANO_VERSION_MAJOR).1 +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 yann.morin.1998 at free.fr Mon Feb 20 21:02:02 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:02:02 -0000 Subject: [Buildroot] [git commit branch/next] package/ipmitool: allow configuring PEN registry source Message-ID: <20230220205239.9CF6B81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0901160666852eaea15eeac4a1905cfff94bab1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The default, the IANA PEN registry used by ipmitool is large (4 MiB+) and changes at the whim of IANA, meaning reproducible builds may not be possible by using the default package. Add a configuration option to specify the source of the registry file. Remote and local files are supported. If no source is specified, no registry file will be installed to the target. Backport upstream patches to allow this to add requisite support: Make a missing registry file non-fatal Make downloading/installing the registry optional Signed-off-by: Vincent Fazio Co-Developed-by: Yann E. MORIN [yann.morin.1998 at free.fr: - use https for the default URL - use simple assignment for first _CONF_OPTS - squeeze empty lines, comment closing endif ] Signed-off-by: Yann E. MORIN --- ...Do-not-require-the-IANA-PEN-registry-file.patch | 115 +++++++++++++++++++++ ...ure.ac-allow-disabling-registry-downloads.patch | 75 ++++++++++++++ package/ipmitool/Config.in | 12 +++ package/ipmitool/ipmitool.mk | 18 ++++ 4 files changed, 220 insertions(+) diff --git a/package/ipmitool/0003-Do-not-require-the-IANA-PEN-registry-file.patch b/package/ipmitool/0003-Do-not-require-the-IANA-PEN-registry-file.patch new file mode 100644 index 0000000000..3f35a78af2 --- /dev/null +++ b/package/ipmitool/0003-Do-not-require-the-IANA-PEN-registry-file.patch @@ -0,0 +1,115 @@ +From 26b088193a55624df4cbe2a0d33c7bba5bca108d Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Sat, 7 Jan 2023 21:02:48 -0600 +Subject: [PATCH] Do not require the IANA PEN registry file + +Previously, ipmitool would fail to run if the local copy of the IANA PEN +registry could not be parsed. + +When the registry is not available the manufacturer will be "Unknown" but +ipmitool will otherwise function so should not be considered fatal. + +Also, fix an issue with improperly handling the `oem_info_list_load` +return value. Previously, in `ipmi_oem_info_init`, if `oem_info_list_load` +returned a negative value due to the registry file not existing, an +improper count would cause `oem_info_init_from_list` to aallocate a list +that didn't encompass the full header/tail list. + + IANA PEN registry open failed: No such file or directory + Allocating 3 entries + [ 1] 16777214 | A Debug Assisting Company, Ltd. + [ 0] 1048575 | Unspecified + +Now, use a signed int and ensure a valid count of loaded OEMs is used. + +Signed-off-by: Vincent Fazio + +[vfazio: backport from upstream 26b088193a55624df4cbe2a0d33c7bba5bca108d] +Signed-off-by: Vincent Fazio +--- + include/ipmitool/ipmi_strings.h | 2 +- + lib/ipmi_main.c | 5 +---- + lib/ipmi_strings.c | 19 +++++-------------- + 3 files changed, 7 insertions(+), 19 deletions(-) + +diff --git a/include/ipmitool/ipmi_strings.h b/include/ipmitool/ipmi_strings.h +index 17c37c6..d60179c 100644 +--- a/include/ipmitool/ipmi_strings.h ++++ b/include/ipmitool/ipmi_strings.h +@@ -55,7 +55,7 @@ extern const struct valstr ipmi_integrity_algorithms[]; + extern const struct valstr ipmi_encryption_algorithms[]; + extern const struct valstr ipmi_user_enable_status_vals[]; + extern const struct valstr *ipmi_oem_info; +-int ipmi_oem_info_init(); ++void ipmi_oem_info_init(); + void ipmi_oem_info_free(); + + extern const struct valstr picmg_frucontrol_vals[]; +diff --git a/lib/ipmi_main.c b/lib/ipmi_main.c +index a673a30..510bc2d 100644 +--- a/lib/ipmi_main.c ++++ b/lib/ipmi_main.c +@@ -853,10 +853,7 @@ ipmi_main(int argc, char ** argv, + } + + /* load the IANA PEN registry */ +- if (ipmi_oem_info_init()) { +- lprintf(LOG_ERR, "Failed to initialize the OEM info dictionary"); +- goto out_free; +- } ++ ipmi_oem_info_init(); + + /* run OEM setup if found */ + if (oemtype && +diff --git a/lib/ipmi_strings.c b/lib/ipmi_strings.c +index 26b359f..c8fc2d0 100644 +--- a/lib/ipmi_strings.c ++++ b/lib/ipmi_strings.c +@@ -1719,39 +1719,30 @@ out: + return rc; + } + +-int ipmi_oem_info_init() ++void ipmi_oem_info_init() + { + oem_valstr_list_t terminator = { { -1, NULL}, NULL }; /* Terminator */ + oem_valstr_list_t *oemlist = &terminator; + bool free_strings = true; +- size_t count; +- int rc = -4; ++ int count; + + lprintf(LOG_INFO, "Loading IANA PEN Registry..."); + + if (ipmi_oem_info) { + lprintf(LOG_INFO, "IANA PEN Registry is already loaded"); +- rc = 0; + goto out; + } + +- if (!(count = oem_info_list_load(&oemlist))) { +- /* +- * We can't identify OEMs without a loaded registry. +- * Set the pointer to dummy and return. +- */ +- ipmi_oem_info = ipmi_oem_info_dummy; +- goto out; ++ if ((count = oem_info_list_load(&oemlist)) < 1) { ++ lprintf(LOG_WARN, "Failed to load entries from IANA PEN Registry"); ++ count = 0; + } + + /* In the array was allocated, don't free the strings at cleanup */ + free_strings = !oem_info_init_from_list(oemlist, count); + +- rc = IPMI_CC_OK; +- + out: + oem_info_list_free(&oemlist, free_strings); +- return rc; + } + + void ipmi_oem_info_free() +-- +2.25.1 + diff --git a/package/ipmitool/0004-configure.ac-allow-disabling-registry-downloads.patch b/package/ipmitool/0004-configure.ac-allow-disabling-registry-downloads.patch new file mode 100644 index 0000000000..9a995b9a14 --- /dev/null +++ b/package/ipmitool/0004-configure.ac-allow-disabling-registry-downloads.patch @@ -0,0 +1,75 @@ +From be11d948f89b10be094e28d8a0a5e8fb532c7b60 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Wed, 11 Jan 2023 22:55:51 -0600 +Subject: [PATCH] configure.ac: allow disabling registry downloads + +Some environments require reproducible builds. Since the IANA PEN +registry is constantly updating and there is no snapshot available, +installing ipmitool via `make install` is not reproducible. + +Provide a configure mechanism to disable the registry download/install.. + +[vfazio: backport from upstream be11d948f89b10be094e28d8a0a5e8fb532c7b60] +Signed-off-by: Vincent Fazio +--- + configure.ac | 30 ++++++++++++++++++++---------- + 1 file changed, 20 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4ee1be8..1dd2742 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,8 +18,6 @@ AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_CHECK_PROG([RPMBUILD], [rpmbuild], [rpmbuild], [rpm]) + AC_CHECK_PROG([SED], [sed], [sed]) +-AC_CHECK_PROG([WGET], [wget], [wget]) +-AC_CHECK_PROG([CURL], [curl], [curl]) + + AC_HEADER_STDC + AC_CHECK_HEADERS([stdlib.h string.h sys/ioctl.h sys/stat.h unistd.h paths.h]) +@@ -56,21 +54,33 @@ if test "x$exec_prefix" = "xNONE"; then + exec_prefix="$prefix" + fi + +-if test "x$WGET" = "x"; then +- if test "x$CURL" = "x"; then ++dnl allow enabling/disabling the fetching of the IANA PEN registry ++AC_ARG_ENABLE([registry-download], ++ [AC_HELP_STRING([--enable-registry-download], ++ [download/install the IANA PEN registry [default=yes]])], ++ [xenable_registry_download=$enableval], ++ [xenable_registry_download=yes]) ++ ++AM_CONDITIONAL([DOWNLOAD], [false]) ++ ++if test "x$xenable_registry_download" = "xyes"; then ++ AC_CHECK_PROG([WGET], [wget], [wget]) ++ AC_CHECK_PROG([CURL], [curl], [curl]) ++ ++ if test "x$WGET" = "x" && test "x$CURL" = "x"; then + AC_MSG_WARN([** Neither wget nor curl could be found.]) + AC_MSG_WARN([** IANA PEN database will not be installed by `make install` !]) + else +- DOWNLOAD="$CURL --location --progress-bar" + AM_CONDITIONAL([DOWNLOAD], [true]) ++ if test "x$WGET" != "x"; then ++ DOWNLOAD="$WGET -c -nd -O -" ++ else ++ DOWNLOAD="$CURL --location --progress-bar" ++ fi + fi +-else +- DOWNLOAD="$WGET -c -nd -O -" +- AM_CONDITIONAL([DOWNLOAD], [true]) + fi + +-AC_MSG_WARN([** Download is:]) +-AC_MSG_WARN($DOWNLOAD) ++AC_MSG_WARN([** Download is: $DOWNLOAD]) + AC_SUBST(DOWNLOAD, $DOWNLOAD) + + dnl +-- +2.25.1 + diff --git a/package/ipmitool/Config.in b/package/ipmitool/Config.in index dbd6483110..9516ff8596 100644 --- a/package/ipmitool/Config.in +++ b/package/ipmitool/Config.in @@ -9,6 +9,18 @@ config BR2_PACKAGE_IPMITOOL if BR2_PACKAGE_IPMITOOL +config BR2_PACKAGE_IPMITOOL_PEN_REG_URI + string "IANA PEN registry URL or path" + default "https://www.iana.org/assignments/enterprise-numbers.txt" + help + Enter an URL or a file path to the PEN registry to use. + + Note that the official registry is 4MiB+ and may change any + time and is thus not guaranteed to be reproducible. + + Leave empty to not use a registry; vendor IDs will be + displayed instead of the corresponding names. + config BR2_PACKAGE_IPMITOOL_LANPLUS bool "enable lanplus interface" select BR2_PACKAGE_OPENSSL diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index 5e34434a03..b3f1e217ff 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -13,6 +13,8 @@ IPMITOOL_CPE_ID_VENDOR = ipmitool_project IPMITOOL_AUTORECONF = YES IPMITOOL_DEPENDENCIES = host-pkgconf +IPMITOOL_CONF_OPTS = --disable-registry-download + ifeq ($(BR2_PACKAGE_FREEIPMI),y) IPMITOOL_DEPENDENCIES += freeipmi IPMITOOL_CONF_OPTS += --enable-intf-free @@ -47,4 +49,20 @@ endef IPMITOOL_POST_INSTALL_TARGET_HOOKS += IPMITOOL_REMOVE_IPMIEVD endif +IPMITOOL_PEN_REG_URI = $(call qstrip,$(BR2_PACKAGE_IPMITOOL_PEN_REG_URI)) +ifneq ($(IPMITOOL_PEN_REG_URI),) +ifneq ($(findstring ://,$(IPMITOOL_PEN_REG_URI)),) +IPMITOOL_EXTRA_DOWNLOADS += $(IPMITOOL_PEN_REG_URI) +BR_NO_CHECK_HASH_FOR += $(notdir $(IPMITOOL_PEN_REG_URI)) +IPMITOOL_PEN_REG = $(IPMITOOL_DL_DIR)/$(notdir $(IPMITOOL_PEN_REG_URI)) +else +IPMITOOL_PEN_REG = $(IPMITOOL_PEN_REG_URI) +endif #findstring +define IPMITOOL_INSTALL_PEN_REG + $(INSTALL) -D -m 0644 $(IPMITOOL_PEN_REG) \ + $(TARGET_DIR)/usr/share/misc/enterprise-numbers +endef +IPMITOOL_POST_INSTALL_TARGET_HOOKS += IPMITOOL_INSTALL_PEN_REG +endif # IPMITOOL_PEN_REG_URI !empty + $(eval $(autotools-package)) From peter at korsgaard.com Mon Feb 20 21:02:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:03 -0000 Subject: [Buildroot] [git commit branch/next] package/python-future: security bump to version 0.18.3 Message-ID: <20230220205240.29E90828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51eb81ddcf340457cff13286fd1aa04082c4903a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-40899: An issue discovered in Python Charmers Future 0.18.2 and earlier allows remote attackers to cause a denial of service via crafted Set-Cookie header from malicious web server. https://github.com/PythonCharmers/python-future/releases/tag/v0.18.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-future/python-future.hash | 6 +++--- package/python-future/python-future.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-future/python-future.hash b/package/python-future/python-future.hash index 4fb5d2a2d7..3b2bbb0212 100644 --- a/package/python-future/python-future.hash +++ b/package/python-future/python-future.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.python.org/pypi/future/json -md5 e4579c836b9c025872efe230f6270349 future-0.18.2.tar.gz -sha256 b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d future-0.18.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/future/json +md5 dedcb70d14b23388670d54145aab8be4 future-0.18.3.tar.gz +sha256 34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307 future-0.18.3.tar.gz # Locally computed sha256 checksums sha256 916e561392d48471b9c23437f56e2652f320cb3b119ceaa162edf41016f746b9 LICENSE.txt diff --git a/package/python-future/python-future.mk b/package/python-future/python-future.mk index 76f32180ac..57bf13d83b 100644 --- a/package/python-future/python-future.mk +++ b/package/python-future/python-future.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FUTURE_VERSION = 0.18.2 +PYTHON_FUTURE_VERSION = 0.18.3 PYTHON_FUTURE_SOURCE = future-$(PYTHON_FUTURE_VERSION).tar.gz -PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/45/0b/38b06fd9b92dc2b68d58b75f900e97884c45bedd2ff83203d933cf5851c9 +PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/8f/2e/cf6accf7415237d6faeeebdc7832023c90e0282aa16fd3263db0eb4715ec PYTHON_FUTURE_SETUP_TYPE = setuptools PYTHON_FUTURE_LICENSE = MIT PYTHON_FUTURE_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 20 21:02:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:04 -0000 Subject: [Buildroot] [git commit branch/next] package/c-icap: bump to version 0.5.10 Message-ID: <20230220205240.370038648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb6ad853d67d3c3a83093924ae305f35213793bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://sourceforge.net/p/c-icap/news/2021/10/the-c-icap-0510-is-released https://sourceforge.net/p/c-icap/news/2021/09/the-c-icap-059-is-released https://sourceforge.net/p/c-icap/news/2021/03/the-c-icap-058-is-released Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/c-icap/c-icap.hash | 6 +++--- package/c-icap/c-icap.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/c-icap/c-icap.hash b/package/c-icap/c-icap.hash index 6aa81c2641..9a596cf375 100644 --- a/package/c-icap/c-icap.hash +++ b/package/c-icap/c-icap.hash @@ -1,6 +1,6 @@ # Retrieved from https://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/ -md5 82fd2fba1a08a8a0cf3567fe24aa035d c_icap-0.5.7.tar.gz -sha1 3b2470e00abd1418bec3a440d3073d7a6231c4c1 c_icap-0.5.7.tar.gz +md5 c8329684588a906d10a687e84ba4a478 c_icap-0.5.10.tar.gz +sha1 2901aa19c8c4b09b700164290942290c34132076 c_icap-0.5.10.tar.gz # Locally calculated -sha256 01ef17d7999d3476fe705abc56d0da562c2f180aafe08fc1269f419cad8521a9 c_icap-0.5.7.tar.gz +sha256 541d503354907f06d1d72fa90fffd031002f0f4346150fb7b2203ad5825ae49d c_icap-0.5.10.tar.gz sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk index fb66c75e61..707069870d 100644 --- a/package/c-icap/c-icap.mk +++ b/package/c-icap/c-icap.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ICAP_VERSION = 0.5.7 +C_ICAP_VERSION = 0.5.10 C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz C_ICAP_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_LICENSE = LGPL-2.1+ From peter at korsgaard.com Mon Feb 20 21:02:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:05 -0000 Subject: [Buildroot] [git commit branch/next] board/zynqmp/kria/uboot.fragment: remove unnecessary configs Message-ID: <20230220205240.4D97C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa341f029832a658865ed4b5849efc4b765452f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Reduce the configs in the kria/uboot.fragment to only what is necessary. These 4 configs are already included in the xilinx_zynqmp_virt_defconfig, so it is redundant to include them in the kria/uboot.fragment file. Applying this patch has zero impact on the u-boot binaries that are built. This patch has been build and run tested on a kria kv260 starter kit. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- board/zynqmp/kria/uboot.fragment | 4 ---- 1 file changed, 4 deletions(-) diff --git a/board/zynqmp/kria/uboot.fragment b/board/zynqmp/kria/uboot.fragment index 40709549dc..d8efc230a0 100644 --- a/board/zynqmp/kria/uboot.fragment +++ b/board/zynqmp/kria/uboot.fragment @@ -7,9 +7,5 @@ CONFIG_PHY=y CONFIG_PHY_XILINX_ZYNQMP=y CONFIG_PINCTRL=y CONFIG_PINCONF=y -CONFIG_POWER_DOMAIN=y -CONFIG_ZYNQMP_POWER_DOMAIN=y -CONFIG_DM_RESET=y -CONFIG_RESET_ZYNQMP=y CONFIG_VIDEO_ZYNQMP_DPSUB=y CONFIG_SF_DEFAULT_SPEED=40000000 From peter at korsgaard.com Mon Feb 20 21:02:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:06 -0000 Subject: [Buildroot] [git commit branch/next] configs/zynqmp_zcu106_defconfig: use Xilinx github for pmufw.elf Message-ID: <20230220205240.6C0988648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0939cecb401fa3a4227649b36bc4298790544928 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate zcu106_pmufw.elf location from nealfrager github to Xilinx github. The image is identical, so this patch has zero impact on functionality. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu106_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 699e528f32..88295571af 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -29,7 +29,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/nealfrager/buildroot-firmware/raw/v2022.2/zcu106/zcu106_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/2022.2_br_1/zcu106/zcu106_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From peter at korsgaard.com Mon Feb 20 21:02:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:08 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Marcus Folkesson for libcamera/libcamera-apps Message-ID: <20230220205240.9521C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c373ca0572e2017e04bd48a9ce63151fb23e378a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libcamera-apps is orphaned, so take care of it. Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e8e0dffcd3..b973c37b82 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1890,6 +1890,8 @@ F: support/testing/tests/package/test_python_pytest.py F: support/testing/tests/package/test_python_pytest_asyncio.py N: Marcus Folkesson +F: package/libcamera/ +F: package/libcamera-apps/ F: package/libostree/ F: package/libselinux/ F: package/libsemanage/ From peter at korsgaard.com Mon Feb 20 21:02:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:08 -0000 Subject: [Buildroot] [git commit branch/next] package/nginx: bump to version 1.22.1 Message-ID: <20230220205240.0FC468648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=722b84eafa5e3d9540e0a80bae0c971a3a778358 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop eleventh patch (already in version) - Update hash of LICENSE file (update in year) - pcre2 is supported (and enabled by default) since https://github.com/nginx/nginx/commit/c6fec0b027569a4e0b1d8aaee7dea0f2e4d6052b http://nginx.org/en/CHANGES-1.22 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../nginx/0011-Mp4-disabled-duplicate-atoms.patch | 315 --------------------- package/nginx/Config.in | 2 +- package/nginx/nginx.hash | 4 +- package/nginx/nginx.mk | 11 +- 4 files changed, 7 insertions(+), 325 deletions(-) diff --git a/package/nginx/0011-Mp4-disabled-duplicate-atoms.patch b/package/nginx/0011-Mp4-disabled-duplicate-atoms.patch deleted file mode 100644 index 7baa810b56..0000000000 --- a/package/nginx/0011-Mp4-disabled-duplicate-atoms.patch +++ /dev/null @@ -1,315 +0,0 @@ -From 6b022a5556af22b6e18532e547a6ae46b0d8c6ea Mon Sep 17 00:00:00 2001 -From: Roman Arutyunyan -Date: Wed, 19 Oct 2022 10:53:17 +0300 -Subject: [PATCH] Mp4: disabled duplicate atoms. - -Most atoms should not appear more than once in a container. Previously, -this was not enforced by the module, which could result in worker process -crash, memory corruption and disclosure. - -Signed-off-by: Peter Korsgaard ---- - src/http/modules/ngx_http_mp4_module.c | 147 +++++++++++++++++++++++++ - 1 file changed, 147 insertions(+) - -diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c -index 9c3f627f..4eff01e9 100644 ---- a/src/http/modules/ngx_http_mp4_module.c -+++ b/src/http/modules/ngx_http_mp4_module.c -@@ -1121,6 +1121,12 @@ ngx_http_mp4_read_ftyp_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - return NGX_ERROR; - } - -+ if (mp4->ftyp_atom.buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 ftyp atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; - - ftyp_atom = ngx_palloc(mp4->request->pool, atom_size); -@@ -1179,6 +1185,12 @@ ngx_http_mp4_read_moov_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - return NGX_DECLINED; - } - -+ if (mp4->moov_atom.buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 moov atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - conf = ngx_http_get_module_loc_conf(mp4->request, ngx_http_mp4_module); - - if (atom_data_size > mp4->buffer_size) { -@@ -1246,6 +1258,12 @@ ngx_http_mp4_read_mdat_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mdat atom"); - -+ if (mp4->mdat_atom.buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 mdat atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - data = &mp4->mdat_data_buf; - data->file = &mp4->file; - data->in_file = 1; -@@ -1372,6 +1390,12 @@ ngx_http_mp4_read_mvhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mvhd atom"); - -+ if (mp4->mvhd_atom.buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 mvhd atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom_header = ngx_mp4_atom_header(mp4); - mvhd_atom = (ngx_mp4_mvhd_atom_t *) atom_header; - mvhd64_atom = (ngx_mp4_mvhd64_atom_t *) atom_header; -@@ -1637,6 +1661,13 @@ ngx_http_mp4_read_tkhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_TKHD_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 tkhd atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->tkhd_size = atom_size; - trak->movie_duration = duration; - -@@ -1676,6 +1707,12 @@ ngx_http_mp4_read_mdia_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_MDIA_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 mdia atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->mdia_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -1799,6 +1836,13 @@ ngx_http_mp4_read_mdhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_MDHD_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 mdhd atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->mdhd_size = atom_size; - trak->timescale = timescale; - trak->duration = duration; -@@ -1862,6 +1906,12 @@ ngx_http_mp4_read_hdlr_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_HDLR_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 hdlr atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->hdlr_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -1890,6 +1940,12 @@ ngx_http_mp4_read_minf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_MINF_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 minf atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->minf_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -1933,6 +1989,15 @@ ngx_http_mp4_read_vmhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf -+ || trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf) -+ { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 vmhd/smhd atom in \"%s\"", -+ mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->vmhd_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -1964,6 +2029,15 @@ ngx_http_mp4_read_smhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf -+ || trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf) -+ { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 vmhd/smhd atom in \"%s\"", -+ mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->smhd_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -1995,6 +2069,12 @@ ngx_http_mp4_read_dinf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_DINF_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 dinf atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->dinf_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -2023,6 +2103,12 @@ ngx_http_mp4_read_stbl_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_STBL_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stbl atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->stbl_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -2144,6 +2230,12 @@ ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - - trak = ngx_mp4_last_trak(mp4); - -+ if (trak->out[NGX_HTTP_MP4_STSD_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stsd atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - atom = &trak->stsd_atom_buf; - atom->temporary = 1; - atom->pos = atom_header; -@@ -2212,6 +2304,13 @@ ngx_http_mp4_read_stts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - atom_end = atom_table + entries * sizeof(ngx_mp4_stts_entry_t); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_STTS_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stts atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->time_to_sample_entries = entries; - - atom = &trak->stts_atom_buf; -@@ -2480,6 +2579,13 @@ ngx_http_mp4_read_stss_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - "sync sample entries:%uD", entries); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_STSS_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stss atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->sync_samples_entries = entries; - - atom_table = atom_header + sizeof(ngx_http_mp4_stss_atom_t); -@@ -2678,6 +2784,13 @@ ngx_http_mp4_read_ctts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - "composition offset entries:%uD", entries); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_CTTS_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 ctts atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->composition_offset_entries = entries; - - atom_table = atom_header + sizeof(ngx_mp4_ctts_atom_t); -@@ -2881,6 +2994,13 @@ ngx_http_mp4_read_stsc_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - atom_end = atom_table + entries * sizeof(ngx_mp4_stsc_entry_t); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_STSC_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stsc atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->sample_to_chunk_entries = entries; - - atom = &trak->stsc_atom_buf; -@@ -3213,6 +3333,13 @@ ngx_http_mp4_read_stsz_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - "sample uniform size:%uD, entries:%uD", size, entries); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_STSZ_ATOM].buf) { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stsz atom in \"%s\"", mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->sample_sizes_entries = entries; - - atom_table = atom_header + sizeof(ngx_mp4_stsz_atom_t); -@@ -3396,6 +3523,16 @@ ngx_http_mp4_read_stco_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - atom_end = atom_table + entries * sizeof(uint32_t); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_STCO_ATOM].buf -+ || trak->out[NGX_HTTP_MP4_CO64_ATOM].buf) -+ { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stco/co64 atom in \"%s\"", -+ mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->chunks = entries; - - atom = &trak->stco_atom_buf; -@@ -3602,6 +3739,16 @@ ngx_http_mp4_read_co64_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) - atom_end = atom_table + entries * sizeof(uint64_t); - - trak = ngx_mp4_last_trak(mp4); -+ -+ if (trak->out[NGX_HTTP_MP4_STCO_ATOM].buf -+ || trak->out[NGX_HTTP_MP4_CO64_ATOM].buf) -+ { -+ ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, -+ "duplicate mp4 stco/co64 atom in \"%s\"", -+ mp4->file.name.data); -+ return NGX_ERROR; -+ } -+ - trak->chunks = entries; - - atom = &trak->co64_atom_buf; --- -2.30.2 - diff --git a/package/nginx/Config.in b/package/nginx/Config.in index 90a0822298..406a1c861a 100644 --- a/package/nginx/Config.in +++ b/package/nginx/Config.in @@ -214,7 +214,7 @@ config BR2_PACKAGE_NGINX_HTTP_REFERER_MODULE config BR2_PACKAGE_NGINX_HTTP_REWRITE_MODULE bool "ngx_http_rewrite_module" default y - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Enable ngx_http_rewrite_module diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 06d3392a2e..06454c5e32 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49 nginx-1.20.1.tar.gz +sha256 9ebb333a9e82b952acd3e2b4aeb1d4ff6406f72491bab6cd9fe69f0dea737f31 nginx-1.22.1.tar.gz # License files, locally calculated -sha256 b57270c1f73eb6624b38b2d0a1affcec56b21fab39efbf8c837428f05cef1d73 LICENSE +sha256 ececed0b0e7243a4766cbc62b26df4bd3513b41de3a07425da1679c836d06320 LICENSE diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 62ea379ffc..10cc95d90e 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.20.1 +NGINX_VERSION = 1.22.1 NGINX_SITE = http://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE @@ -19,9 +19,6 @@ NGINX_CONF_OPTS = \ --with-cpp="$(TARGET_CC)" \ --with-ld-opt="$(TARGET_LDFLAGS)" -# 0011-Mp4-disabled-duplicate-atoms.patch -NGINX_IGNORE_CVES += CVE-2022-41741 CVE-2022-41742 - # www-data user and group are used for nginx. Because these user and group # are already set by buildroot, it is not necessary to redefine them. # See system/skeleton/etc/passwd @@ -83,8 +80,8 @@ else NGINX_CONF_ENV += ngx_force_have_libatomic=no endif -ifeq ($(BR2_PACKAGE_PCRE),y) -NGINX_DEPENDENCIES += pcre +ifeq ($(BR2_PACKAGE_PCRE2),y) +NGINX_DEPENDENCIES += pcre2 NGINX_CONF_OPTS += --with-pcre else NGINX_CONF_OPTS += --without-pcre @@ -167,7 +164,7 @@ NGINX_CONF_OPTS += --without-http_gzip_module endif ifeq ($(BR2_PACKAGE_NGINX_HTTP_REWRITE_MODULE),y) -NGINX_DEPENDENCIES += pcre +NGINX_DEPENDENCIES += pcre2 else NGINX_CONF_OPTS += --without-http_rewrite_module endif From peter at korsgaard.com Mon Feb 20 21:02:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:09 -0000 Subject: [Buildroot] [git commit branch/next] package/s390-tools: bump to version 2.25 Message-ID: <20230220205240.B553A7FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11d7fb7013d0fbdb959897e00acc5955427a31de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Alexander Egorenkov Signed-off-by: Peter Korsgaard --- 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 f74695b81d..a0dde477c3 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c04d1f7d7f4c941f19a293188eb6302194cc298171f88a4dc17a08a8001c6c01 s390-tools-2.23.0.tar.gz +sha256 ccb20954e748309a50fd56edd9abd94c6f897081e9a1a33e9d965a56f650990d s390-tools-2.25.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index 99fc669ce7..cb6278dfb8 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.23.0 +S390_TOOLS_VERSION = 2.25.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 peter at korsgaard.com Mon Feb 20 21:02:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:11 -0000 Subject: [Buildroot] [git commit branch/next] package/libcamera-apps: bump to version 1.1.0 Message-ID: <20230220205240.892FD81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fac163b9315a26f2ad041e0624fac283078d795 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- ...e-Werror-and-Wfatal-errors-compiler-comma.patch | 37 -------------------- ...-egl_preview-compile-conversion-from-Wind.patch | 39 ---------------------- package/libcamera-apps/libcamera-apps.hash | 2 +- package/libcamera-apps/libcamera-apps.mk | 4 +-- 4 files changed, 3 insertions(+), 79 deletions(-) diff --git a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch deleted file mode 100644 index 988d89cca3..0000000000 --- a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6bd733b52f0b4039407c676cd3126a9e2f79456b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 5 Feb 2021 18:24:08 +0100 -Subject: [PATCH] cmake: remove -Werror and -Wfatal-errors compiler command - line option -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes (with bootlin-riscv64-musl toolchain): - - .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/core/libcamera_app.cpp:30:22: error: overflow in conversion from ???long unsigned int??? to ???int??? changes value from ???2154321408??? to ???-2140645888??? [-Werror=overflow] - 30 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); - | ^~~~~~~~~~~~~~~ - cc1plus: all warnings being treated as errors - -Signed-off-by: Peter Seiderer ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 748c6dd..1ca1e39 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 -Werror -Wfatal-errors) -+add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new) - add_definitions(-D_FILE_OFFSET_BITS=64) - - if (CMAKE_COMPILER_IS_GNUCXX) --- -2.34.1 - 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 deleted file mode 100644 index cc9069aa86..0000000000 --- a/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 - diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash index 2dbb74d463..cc2d3b6926 100644 --- a/package/libcamera-apps/libcamera-apps.hash +++ b/package/libcamera-apps/libcamera-apps.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 611aec06dd24de6586580164d9b7c55da0698ac4cf129944b2fc41fe67210597 libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5.tar.gz +sha256 2d895ad5d11a6004b1e84eb8d486d5dca64dda1b41e0f4f3f87904666f249e3e libcamera-apps-1.1.0.tar.gz sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index f4fc019c17..a5d9227250 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCAMERA_APPS_VERSION = 2d1009e3badcc8047361ff81149ad6cba3b911b5 -LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) +LIBCAMERA_APPS_VERSION = 1.1.0 +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,v$(LIBCAMERA_APPS_VERSION)) LIBCAMERA_APPS_LICENSE = BSD-2-Clause LIBCAMERA_APPS_LICENSE_FILES = license.txt LIBCAMERA_APPS_DEPENDENCIES = \ From peter at korsgaard.com Mon Feb 20 21:02:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:12 -0000 Subject: [Buildroot] [git commit branch/next] package/openlayers: bump to version 7.2.2 Message-ID: <20230220205240.C2D5A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ccd391bfd94fdcaed77a2fe31c577e428cefc0ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Thomas Claveirole Signed-off-by: Peter Korsgaard --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index 1b3f3cce51..7e33716f78 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 37a0e5fde4df3db6e6c11ed0ceb8e20608121afe5f8f7f91cf03990e89a919ca v7.1.0-package.zip +sha256 31b848cc55967c7de63fece8cd1699fc51152421d04653b859103c7391ad5bbe v7.2.2-package.zip sha256 6c4347b83a8c9feef18d57b18e3b6c44cf901b3c344a4a1fbd837e421555ab8e LICENSE.md diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 7396e38fb9..852f5f1dcf 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 7.1.0 +OPENLAYERS_VERSION = 7.2.2 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-package.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause From peter at korsgaard.com Mon Feb 20 21:02:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:13 -0000 Subject: [Buildroot] [git commit branch/next] package/sexpect: new package Message-ID: <20230220205240.D23C37FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c157330da49dcfe41fe7cef9fe4ec77636f326f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next sexpect is useful for shell controlled testing. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/sexpect/Config.in | 8 ++++++++ package/sexpect/sexpect.hash | 3 +++ package/sexpect/sexpect.mk | 13 +++++++++++++ 5 files changed, 26 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 385a46ccf9..83fa9e403d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -294,6 +294,7 @@ F: package/ebtables/ F: package/i2c-tools/ F: package/libcurl/ F: package/libpcap/ +F: package/sexpect/ F: package/socat/ F: package/strace/ F: package/tcpdump/ diff --git a/package/Config.in b/package/Config.in index b281a67157..eabb0d5201 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2568,6 +2568,7 @@ comment "Utilities" source "package/rtty/Config.in" source "package/screen/Config.in" source "package/screenfetch/Config.in" + source "package/sexpect/Config.in" source "package/sudo/Config.in" source "package/terminology/Config.in" source "package/time/Config.in" diff --git a/package/sexpect/Config.in b/package/sexpect/Config.in new file mode 100644 index 0000000000..bdf5c3bbf5 --- /dev/null +++ b/package/sexpect/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SEXPECT + bool "sexpect" + help + sexpect is another implementation of Expect which is + specifically designed for Shell scripts + (sh, bash, ksh, zsh, ...) + + https://github.com/clarkwang/sexpect diff --git a/package/sexpect/sexpect.hash b/package/sexpect/sexpect.hash new file mode 100644 index 0000000000..d512117626 --- /dev/null +++ b/package/sexpect/sexpect.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f6801c8b979d56eec54aedd7ede06e2342f382cee291beea88b52869186c557c sexpect-2.3.14.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/sexpect/sexpect.mk b/package/sexpect/sexpect.mk new file mode 100644 index 0000000000..7b878600e4 --- /dev/null +++ b/package/sexpect/sexpect.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# sexpect +# +################################################################################ + +SEXPECT_VERSION = 2.3.14 +SEXPECT_SITE = $(call github,clarkwang,sexpect,v$(SEXPECT_VERSION)) +SEXPECT_LICENSE = GPL-3.0 +SEXPECT_LICENSE_FILES = LICENSE +SEXPECT_SUPPORTS_IN_SOURCE_BUILD = NO + +$(eval $(cmake-package)) From peter at korsgaard.com Mon Feb 20 21:02:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:14 -0000 Subject: [Buildroot] [git commit branch/next] package/libpsl: bump to version 0.21.2 Message-ID: <20230220205240.EB2D3828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33703b32bf5fbb18a25546403527e7140292eba0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Drop patch (already in version) - Update hash of COPYING (update in year: https://github.com/rockdaboot/libpsl/commit/927b202c69bcd9be4c30ba51c74925f2575e1a69) - builtin is a boolean since https://github.com/rockdaboot/libpsl/commit/aa4909766c24c17bd1d9000ca419f6dc6b32c238 https://github.com/rockdaboot/libpsl/releases/tag/0.21.2 Signed-off-by: Fabrice Fontaine Reviewed-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- ...001-Add-libiconv-dep-to-meson-build-again.patch | 60 ---------------------- package/libpsl/libpsl.hash | 4 +- package/libpsl/libpsl.mk | 9 ++-- 3 files changed, 7 insertions(+), 66 deletions(-) diff --git a/package/libpsl/0001-Add-libiconv-dep-to-meson-build-again.patch b/package/libpsl/0001-Add-libiconv-dep-to-meson-build-again.patch deleted file mode 100644 index 72f50aa593..0000000000 --- a/package/libpsl/0001-Add-libiconv-dep-to-meson-build-again.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5b63816e82287808e81b8603a528af3cc6fab354 Mon Sep 17 00:00:00 2001 -From: Zhao Zhili -Date: Thu, 7 Jan 2021 20:59:17 +0800 -Subject: [PATCH] Add libiconv dep to meson build again - -Build success on macOS and ubuntu. - -[Retrieved from: -https://github.com/rockdaboot/libpsl/commit/5b63816e82287808e81b8603a528af3cc6fab354] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 14 ++++++++++++++ - src/meson.build | 2 +- - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index f248171..fb2de31 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,6 +20,7 @@ libicu_dep = notfound - libidn_dep = notfound - libunistring = notfound - networking_deps = notfound -+libiconv_dep = notfound - - # FIXME: Cleanup this when Meson gets 'feature-combo': - # https://github.com/mesonbuild/meson/issues/4566 -@@ -86,6 +87,19 @@ endif - if libidn2_dep.found() or libidn_dep.found() - # Check for libunistring, we need it for psl_str_to_utf8lower() - libunistring = cc.find_library('unistring') -+ found_iconv = false -+ if cc.has_function('iconv_open') -+ libiconv_dep = [] -+ found_iconv = true -+ endif -+ if not found_iconv and cc.has_header_symbol('iconv.h', 'iconv_open') -+ libiconv_dep = [cc.find_library('iconv')] -+ found_iconv = true -+ endif -+ -+ if not found_iconv -+ error('iconv implementation not found') -+ endif - endif - - if host_machine.system() == 'windows' -diff --git a/src/meson.build b/src/meson.build -index 0d1dcdf..746bf44 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -19,7 +19,7 @@ cargs = [ - libpsl = library('psl', sources, suffixes_dafsa_h, - include_directories : [configinc, includedir], - c_args : cargs, -- dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps], -+ dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps, libiconv_dep], - version: lt_version, - install: true, - ) diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash index 552935e9ec..a35a609ff2 100644 --- a/package/libpsl/libpsl.hash +++ b/package/libpsl/libpsl.hash @@ -1,6 +1,6 @@ # Locally generated -sha256 ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c libpsl-0.21.1.tar.gz +sha256 e35991b6e17001afa2c0ca3b10c357650602b92596209b7492802f3768a6285f libpsl-0.21.2.tar.gz # Hashes for license files: -sha256 7903413e7aa0bbcb77aa19150a3f1034edc0a760cff174f9a53efe4de6f056a4 COPYING +sha256 776cd11d54f0ea3e5efdd25ff1a0d952a1744215bb5858ea7aeb91808e70c9f7 COPYING sha256 1d7f52747a9169751cdf2641a8299c0098e9ecdf9429296ffd55bdb14c9ed5b3 src/LICENSE.chromium diff --git a/package/libpsl/libpsl.mk b/package/libpsl/libpsl.mk index 742117e8ea..ef3c524b4f 100644 --- a/package/libpsl/libpsl.mk +++ b/package/libpsl/libpsl.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBPSL_VERSION = 0.21.1 +LIBPSL_VERSION = 0.21.2 LIBPSL_SITE = https://github.com/rockdaboot/libpsl/releases/download/$(LIBPSL_VERSION) LIBPSL_LICENSE = MIT, BSD-3-Clause LIBPSL_LICENSE_FILES = COPYING src/LICENSE.chromium +LIBPSL_CONF_OPTS = -Dbuiltin=true LIBPSL_DEPENDENCIES = host-pkgconf LIBPSL_INSTALL_STAGING = YES @@ -17,13 +18,13 @@ endif # The order of checks is the same as done by libpsl when configured. ifeq ($(BR2_PACKAGE_LIBIDN2)$(BR2_PACKAGE_LIBUNISTRING),yy) -LIBPSL_CONF_OPTS += -Druntime=libidn2 -Dbuiltin=libidn2 +LIBPSL_CONF_OPTS += -Druntime=libidn2 LIBPSL_DEPENDENCIES += libidn2 libunistring else ifeq ($(BR2_PACKAGE_ICU),y) -LIBPSL_CONF_OPTS += -Druntime=libicu -Dbuiltin=libicu +LIBPSL_CONF_OPTS += -Druntime=libicu LIBPSL_DEPENDENCIES += icu else -LIBPSL_CONF_OPTS += -Druntime=libidn -Dbuiltin=libidn +LIBPSL_CONF_OPTS += -Druntime=libidn LIBPSL_DEPENDENCIES += libidn libunistring endif From peter at korsgaard.com Mon Feb 20 21:02:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:15 -0000 Subject: [Buildroot] [git commit branch/next] package/libmodsecurity: bump to version 3.0.8 Message-ID: <20230220205241.1075D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b20c52a5bb13fde04f4ad47fafd1daca664c2bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/SpiderLabs/ModSecurity/releases/tag/v3.0.8 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libmodsecurity/libmodsecurity.hash | 4 ++-- package/libmodsecurity/libmodsecurity.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index 087157d162..7ba0ef7f18 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.7/modsecurity-v3.0.7.tar.gz.sha256 -sha256 cfd8b7e7e6a0e9ca4e19b9adeb07594ba75eba16a66da5e9b0974c0117c21a34 modsecurity-v3.0.7.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.8/modsecurity-v3.0.8.tar.gz.sha256 +sha256 e241c89b3cd7e58a863d0d0d6b9b8ba4d33ffb0f51171044c258c62e3e7956c7 modsecurity-v3.0.8.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 916ba8fbcb..e83fda895f 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.7 +LIBMODSECURITY_VERSION = 3.0.8 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 21:02:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:16 -0000 Subject: [Buildroot] [git commit branch/next] package/bubblewrap: bump to version 0.7.0 Message-ID: <20230220205241.1CDA8828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9735d0e74fb8588ebbf2d888b40caac0aa8fa98 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This version contains a few minor fixes, provides better error messages, and includes a new option to set the size of created tmpfs volumes. Release notes: https://github.com/containers/bubblewrap/releases/tag/v0.7.0 Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- 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 98fafc3679..0475f8882a 100644 --- a/package/bubblewrap/bubblewrap.hash +++ b/package/bubblewrap/bubblewrap.hash @@ -1,5 +1,5 @@ -# From https://github.com/containers/bubblewrap/releases/tag/v0.6.2 -sha256 8a0ec802d1b3e956c5bb0a40a81c9ce0b055a31bf30a8efa547433603b8af20b bubblewrap-0.6.2.tar.xz +# From https://github.com/containers/bubblewrap/releases/tag/v0.7.0 +sha256 764ab7100bd037ea53d440d362e099d7a425966bc62d1f00ab26b8fbb882a9dc bubblewrap-0.7.0.tar.xz # Hash for license files: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 91864d2b76..658e6e113c 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUBBLEWRAP_VERSION = 0.6.2 +BUBBLEWRAP_VERSION = 0.7.0 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 thomas.petazzoni at bootlin.com Mon Feb 20 21:02:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:17 -0000 Subject: [Buildroot] [git commit branch/next] package/luajit: bump to version d0e88930ddde28ff662503f9f20facf34f7265aa Message-ID: <20230220205241.4455A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b83a41ccd8c75caff009a826d938fd74a70a10f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/luajit/luajit.hash | 2 +- package/luajit/luajit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash index d00cea4ee0..c655e9931c 100644 --- a/package/luajit/luajit.hash +++ b/package/luajit/luajit.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 19a911fdd77af69e48fa50749606a9009696f543cc88e898b4480d8d3c8828f5 luajit-6c4826f12c4d33b8b978004bc681eb1eef2be977.tar.gz +sha256 aa354d1265814db5a1ee9dfff6049e19b148e1fd818f1ecfa4fcf2b19f6e4dd9 luajit-d0e88930ddde28ff662503f9f20facf34f7265aa.tar.gz # Locally calculated sha256 52fc5b15ac968ed81aabb4c1e23ab3bce50f57a5764e9cdca86b463a11072921 COPYRIGHT diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index c79f18bf62..09bde3590f 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAJIT_VERSION = 6c4826f12c4d33b8b978004bc681eb1eef2be977 +LUAJIT_VERSION = d0e88930ddde28ff662503f9f20facf34f7265aa LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:18 -0000 Subject: [Buildroot] [git commit branch/next] package/postgresql: bump version to 15.1 Message-ID: <20230220205241.66D7381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af2788ea2ff34e5795ed10df8703bf0f89fda1d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://www.postgresql.org/docs/release/15.1/ Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 26bb626943..ef2806c2dd 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v14.6/postgresql-14.6.tar.bz2.sha256 -sha256 508840fc1809d39ab72274d5f137dabb9fd7fb4f933da4168aeebb20069edf22 postgresql-14.6.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v14.6/postgresql-15.1.tar.bz2.sha256 +sha256 64fdf23d734afad0dfe4077daca96ac51dcd697e68ae2d3d4ca6c45cb14e21ae postgresql-15.1.tar.bz2 # License file, Locally calculated sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 502860bc99..5313e03b12 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 14.6 +POSTGRESQL_VERSION = 15.1 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 Mon Feb 20 21:02:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:19 -0000 Subject: [Buildroot] [git commit branch/next] package/janet: bump to version 1.26.0 Message-ID: <20230220205241.353A181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c6f32bd255fc97823d464beacfa905a141066ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next diff LICENCE: -Copyright (c) 2021 Calvin Rose and contributors +Copyright (c) 2023 Calvin Rose and contributors Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/janet/janet.hash | 4 ++-- package/janet/janet.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/janet/janet.hash b/package/janet/janet.hash index 5cd3db1c29..47e0de4a0f 100644 --- a/package/janet/janet.hash +++ b/package/janet/janet.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 5bf9b680adbc5511835aec3787117df37032eef796e1664edbbcfd540b6acaf3 janet-1.25.0.tar.gz +sha256 c95dab93e8e4ebcab5c293d5ee448fb43ab8bd2f6391fd66a6ca92fe1ec72c03 janet-1.26.0.tar.gz # Locally calculated -sha256 e2d2ae8360d95386af751ac7d1a3da36ea8ceb230e5f0eba7eb762547b1c58c9 LICENSE +sha256 95fca700e8dce9699248e7cc80ac88ce2357874c8352cd2be4d18f183dc9710b LICENSE diff --git a/package/janet/janet.mk b/package/janet/janet.mk index 284e6c2642..db1eb2a5c4 100644 --- a/package/janet/janet.mk +++ b/package/janet/janet.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANET_VERSION = 1.25.0 +JANET_VERSION = 1.26.0 JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION)) JANET_LICENSE = MIT JANET_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 21:02:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:20 -0000 Subject: [Buildroot] [git commit branch/next] package/iptables: bump to version 1.8.9 Message-ID: <20230220205241.03CE48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef2af4b67f3403fc0feaca8a07d1733f17c6b316 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patches (already in version) https://netfilter.org/projects/iptables/files/changes-iptables-1.8.9.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...fix-build-for-missing-ETH_ALEN-definition.patch | 69 --------- .../0002-treewide-use-uint-instead-of-u_int.patch | 167 --------------------- package/iptables/0003-netfilter-add-nf_log.h.patch | 38 ----- package/iptables/iptables.hash | 2 +- package/iptables/iptables.mk | 4 +- 5 files changed, 3 insertions(+), 277 deletions(-) diff --git a/package/iptables/0001-Revert-fix-build-for-missing-ETH_ALEN-definition.patch b/package/iptables/0001-Revert-fix-build-for-missing-ETH_ALEN-definition.patch deleted file mode 100644 index 4f3831d9e4..0000000000 --- a/package/iptables/0001-Revert-fix-build-for-missing-ETH_ALEN-definition.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 0e7cf0ad306cdf95dc3c28d15a254532206a888e Mon Sep 17 00:00:00 2001 -Message-Id: <0e7cf0ad306cdf95dc3c28d15a254532206a888e.1656908815.git.baruch at tkos.co.il> -From: Phil Sutter -Date: Wed, 18 May 2022 16:04:09 +0200 -Subject: [PATCH] Revert "fix build for missing ETH_ALEN definition" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit c5d9a723b5159a28f547b577711787295a14fd84 as it broke -compiling against musl libc. Might be a bug in the latter, but for the -time being try to please both by avoiding the include and instead -defining ETH_ALEN if unset. - -While being at it, move netinet/ether.h include up. - -Fixes: 1bdb5535f561a ("libxtables: Extend MAC address printing/parsing support") -Signed-off-by: Phil Sutter -Reviewed-by: Maciej ??enczykowski -Signed-off-by: Baruch Siach ---- -Upstream status: commit 0e7cf0ad306cdf95dc3c28d15a254532206a888e - - libxtables/xtables.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/libxtables/xtables.c b/libxtables/xtables.c -index 96fd783a066c..0638f9271c60 100644 ---- a/libxtables/xtables.c -+++ b/libxtables/xtables.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -45,7 +46,6 @@ - - #include - #include /* INT_MAX in ip_tables.h/ip6_tables.h */ --#include /* ETH_ALEN */ - #include - #include - #include -@@ -72,6 +72,10 @@ - #define PROC_SYS_MODPROBE "/proc/sys/kernel/modprobe" - #endif - -+#ifndef ETH_ALEN -+#define ETH_ALEN 6 -+#endif -+ - /* we need this for ip6?tables-restore. ip6?tables-restore.c sets line to the - * current line of the input file, in order to give a more precise error - * message. ip6?tables itself doesn't need this, so it is initialized to the -@@ -2245,8 +2249,6 @@ void xtables_print_num(uint64_t number, unsigned int format) - printf(FMT("%4lluT ","%lluT "), (unsigned long long)number); - } - --#include -- - static const unsigned char mac_type_unicast[ETH_ALEN] = {}; - static const unsigned char msk_type_unicast[ETH_ALEN] = {1}; - static const unsigned char mac_type_multicast[ETH_ALEN] = {1}; --- -2.35.1 - diff --git a/package/iptables/0002-treewide-use-uint-instead-of-u_int.patch b/package/iptables/0002-treewide-use-uint-instead-of-u_int.patch deleted file mode 100644 index e254c061af..0000000000 --- a/package/iptables/0002-treewide-use-uint-instead-of-u_int.patch +++ /dev/null @@ -1,167 +0,0 @@ -From f319389525b066b7dc6d389c88f16a0df3b8f189 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Nick Hainke -Date: Mon, 16 May 2022 18:16:41 +0200 -Subject: [PATCH] treewide: use uint* instead of u_int* - -Gcc complains about missing types. Some commits introduced u_int* instead -of uint*. Use uint treewide. - -Fixes errors in the form of: -In file included from xtables-legacy-multi.c:5: -xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'? - 83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, - | ^~~~~~~~~ - | uint16_t -make[6]: *** [Makefile:712: xtables_legacy_multi-xtables-legacy-multi.o] Error 1 - -Avoid libipq API breakage by adjusting libipq.h include accordingly. For -arpt_mangle.h kernel uAPI header, apply same change as in kernel commit -e91ded8db5747 ("uapi: netfilter_arp: use __u8 instead of u_int8_t"). - -Signed-off-by: Nick Hainke -Signed-off-by: Phil Sutter -Signed-off-by: Baruch Siach ---- -Upstream status: commit f319389525b066b7dc6d389c88f16a0df3b8f189 - - extensions/libxt_conntrack.c | 2 +- - include/libipq/libipq.h | 8 ++++---- - include/libiptc/libxtc.h | 2 +- - include/linux/netfilter_arp/arpt_mangle.h | 2 +- - iptables/xshared.c | 2 +- - iptables/xshared.h | 2 +- - libipq/ipq_create_handle.3 | 2 +- - libipq/ipq_set_mode.3 | 2 +- - 8 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c -index 64018ce152b7..234085c5211c 100644 ---- a/extensions/libxt_conntrack.c -+++ b/extensions/libxt_conntrack.c -@@ -778,7 +778,7 @@ matchinfo_print(const void *ip, const struct xt_entry_match *match, int numeric, - - static void - conntrack_dump_ports(const char *prefix, const char *opt, -- u_int16_t port_low, u_int16_t port_high) -+ uint16_t port_low, uint16_t port_high) - { - if (port_high == 0 || port_low == port_high) - printf(" %s%s %u", prefix, opt, port_low); -diff --git a/include/libipq/libipq.h b/include/libipq/libipq.h -index 3cd1329217a0..dd0cb205179c 100644 ---- a/include/libipq/libipq.h -+++ b/include/libipq/libipq.h -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -48,19 +48,19 @@ typedef unsigned long ipq_id_t; - struct ipq_handle - { - int fd; -- u_int8_t blocking; -+ uint8_t blocking; - struct sockaddr_nl local; - struct sockaddr_nl peer; - }; - --struct ipq_handle *ipq_create_handle(u_int32_t flags, u_int32_t protocol); -+struct ipq_handle *ipq_create_handle(uint32_t flags, uint32_t protocol); - - int ipq_destroy_handle(struct ipq_handle *h); - - ssize_t ipq_read(const struct ipq_handle *h, - unsigned char *buf, size_t len, int timeout); - --int ipq_set_mode(const struct ipq_handle *h, u_int8_t mode, size_t len); -+int ipq_set_mode(const struct ipq_handle *h, uint8_t mode, size_t len); - - ipq_packet_msg_t *ipq_get_packet(const unsigned char *buf); - -diff --git a/include/libiptc/libxtc.h b/include/libiptc/libxtc.h -index 37010188b64f..a1d16ef996d7 100644 ---- a/include/libiptc/libxtc.h -+++ b/include/libiptc/libxtc.h -@@ -10,7 +10,7 @@ extern "C" { - #endif - - #ifndef XT_MIN_ALIGN --/* xt_entry has pointers and u_int64_t's in it, so if you align to -+/* xt_entry has pointers and uint64_t's in it, so if you align to - it, you'll also align to any crazy matches and targets someone - might write */ - #define XT_MIN_ALIGN (__alignof__(struct xt_entry)) -diff --git a/include/linux/netfilter_arp/arpt_mangle.h b/include/linux/netfilter_arp/arpt_mangle.h -index 250f502902bb..8c2b16a1f5a0 100644 ---- a/include/linux/netfilter_arp/arpt_mangle.h -+++ b/include/linux/netfilter_arp/arpt_mangle.h -@@ -13,7 +13,7 @@ struct arpt_mangle - union { - struct in_addr tgt_ip; - } u_t; -- u_int8_t flags; -+ __u8 flags; - int target; - }; - -diff --git a/iptables/xshared.c b/iptables/xshared.c -index a8512d380815..9b5e5b5bddc2 100644 ---- a/iptables/xshared.c -+++ b/iptables/xshared.c -@@ -1025,7 +1025,7 @@ static const int inverse_for_options[NUMBER_OF_OPT] = - }; - - void --set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, -+set_option(unsigned int *options, unsigned int option, uint16_t *invflg, - bool invert) - { - if (*options & option) -diff --git a/iptables/xshared.h b/iptables/xshared.h -index 14568bb00fb6..f82129883968 100644 ---- a/iptables/xshared.h -+++ b/iptables/xshared.h -@@ -80,7 +80,7 @@ struct xtables_target; - #define IPT_INV_ARPHRD 0x0800 - - void --set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, -+set_option(unsigned int *options, unsigned int option, uint16_t *invflg, - bool invert); - - /** -diff --git a/libipq/ipq_create_handle.3 b/libipq/ipq_create_handle.3 -index 11ef95c4b79f..ebe46daab92d 100644 ---- a/libipq/ipq_create_handle.3 -+++ b/libipq/ipq_create_handle.3 -@@ -24,7 +24,7 @@ ipq_create_handle, ipq_destroy_handle \(em create and destroy libipq handles. - .br - .B #include - .sp --.BI "struct ipq_handle *ipq_create_handle(u_int32_t " flags ", u_int32_t " protocol ");" -+.BI "struct ipq_handle *ipq_create_handle(uint32_t " flags ", uint32_t " protocol ");" - .br - .BI "int ipq_destroy_handle(struct ipq_handle *" h ); - .SH DESCRIPTION -diff --git a/libipq/ipq_set_mode.3 b/libipq/ipq_set_mode.3 -index 0edd3c00a84f..e206886c8c62 100644 ---- a/libipq/ipq_set_mode.3 -+++ b/libipq/ipq_set_mode.3 -@@ -24,7 +24,7 @@ ipq_set_mode \(em set the ip_queue queuing mode - .br - .B #include - .sp --.BI "int ipq_set_mode(const struct ipq_handle *" h ", u_int8_t " mode ", size_t " range ); -+.BI "int ipq_set_mode(const struct ipq_handle *" h ", uint8_t " mode ", size_t " range ); - .SH DESCRIPTION - The - .B ipq_set_mode --- -2.35.1 - diff --git a/package/iptables/0003-netfilter-add-nf_log.h.patch b/package/iptables/0003-netfilter-add-nf_log.h.patch deleted file mode 100644 index 50112faf86..0000000000 --- a/package/iptables/0003-netfilter-add-nf_log.h.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 15ea3fa147dea25d8cae3c2ac417142f2e0f029e Mon Sep 17 00:00:00 2001 -From: Markus Mayer -To: Netfilter Mailing List -Date: Thu, 16 Jun 2022 15:29:58 -0700 -Subject: [PATCH] netfilter: add nf_log.h - -Since libxt_NFLOG is now using the UAPI version of nf_log.h, it should -be bundled alongside the other netfilter kernel headers. - -This copy of nf_log.h was taken from Linux 5.18. - -Signed-off-by: Markus Mayer -Upstream: https://git.netfilter.org/iptables/commit/?id=9ea7e6aa638d0dfa14613f6f97e6dc06c857e609 ---- -diff --git a/include/linux/netfilter/nf_log.h b/include/linux/netfilter/nf_log.h -new file mode 100644 -index 000000000000..2ae00932d3d2 ---- /dev/null -+++ b/include/linux/netfilter/nf_log.h -@@ -0,0 +1,15 @@ -+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -+#ifndef _NETFILTER_NF_LOG_H -+#define _NETFILTER_NF_LOG_H -+ -+#define NF_LOG_TCPSEQ 0x01 /* Log TCP sequence numbers */ -+#define NF_LOG_TCPOPT 0x02 /* Log TCP options */ -+#define NF_LOG_IPOPT 0x04 /* Log IP options */ -+#define NF_LOG_UID 0x08 /* Log UID owning local socket */ -+#define NF_LOG_NFLOG 0x10 /* Unsupported, don't reuse */ -+#define NF_LOG_MACDECODE 0x20 /* Decode MAC header */ -+#define NF_LOG_MASK 0x2f -+ -+#define NF_LOG_PREFIXLEN 128 -+ -+#endif /* _NETFILTER_NF_LOG_H */ --- -2.25.1 - diff --git a/package/iptables/iptables.hash b/package/iptables/iptables.hash index f4e5ae1593..a908b9cbc1 100644 --- a/package/iptables/iptables.hash +++ b/package/iptables/iptables.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/iptables/downloads.html -sha256 71c75889dc710676631553eb1511da0177bbaaf1b551265b912d236c3f51859f iptables-1.8.8.tar.bz2 +sha256 ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f iptables-1.8.9.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index a6143677d1..561c82ca0b 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,8 +4,8 @@ # ################################################################################ -IPTABLES_VERSION = 1.8.8 -IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 +IPTABLES_VERSION = 1.8.9 +IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.xz IPTABLES_SITE = https://netfilter.org/projects/iptables/files IPTABLES_INSTALL_STAGING = YES IPTABLES_DEPENDENCIES = host-pkgconf From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:21 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-io-socket-ssl: bump to version 2.080 Message-ID: <20230220205241.E223B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e1dde2258755213710d3f5afd716025d2140f16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-io-socket-ssl/perl-io-socket-ssl.hash | 4 ++-- package/perl-io-socket-ssl/perl-io-socket-ssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash index 8c6bb30523..a4abcc33cd 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 8f0f6bff4db5e4be6e848aa49fd29380 IO-Socket-SSL-2.075.tar.gz -sha256 c30ee2220b1e181a968ebbc81861d0cadf334b001377a44105ae5a8637ddae8c IO-Socket-SSL-2.075.tar.gz +md5 eaea5b17592ccbd925aff47747f41dde IO-Socket-SSL-2.080.tar.gz +sha256 cd0ed303b08a72c5c256a9ec3bbb6ff61360be3a2ff6d775e4f6e25375fa8d1f IO-Socket-SSL-2.080.tar.gz # computed by scancpan sha256 090aff5421fd55a9dceeaf6c612c36360402e8d29c1284aef88c87be565ce032 README diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk index daa46acf95..d5c09d9082 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_IO_SOCKET_SSL_VERSION = 2.075 +PERL_IO_SOCKET_SSL_VERSION = 2.080 PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPL-1.0+ From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:22 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-exporter-tiny: bump to version 1.006000 Message-ID: <20230220205241.D736A81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ab730250b1da4ec72569f8cf95bc9df26ecb80d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next diff LICENSE: -This software is copyright (c) 2020 by Toby Inkster. +This software is copyright (c) 2022 by Toby Inkster. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-exporter-tiny/perl-exporter-tiny.hash | 7 +++---- package/perl-exporter-tiny/perl-exporter-tiny.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/perl-exporter-tiny/perl-exporter-tiny.hash b/package/perl-exporter-tiny/perl-exporter-tiny.hash index c714ef902e..0ecdf78482 100644 --- a/package/perl-exporter-tiny/perl-exporter-tiny.hash +++ b/package/perl-exporter-tiny/perl-exporter-tiny.hash @@ -1,7 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 485897322a2514b4d6ca90b2daacb7cd Exporter-Tiny-1.002002.tar.gz -sha256 00f0b95716b18157132c6c118ded8ba31392563d19e490433e9a65382e707101 Exporter-Tiny-1.002002.tar.gz +md5 2d555e289eac6450052e8683c292cbf7 Exporter-Tiny-1.006000.tar.gz +sha256 d95479ff085699d6422f7fc8306db085e34b626438deb82ec82d41df2295f400 Exporter-Tiny-1.006000.tar.gz # computed by scancpan -sha256 f4cb223c8ac37d6ccd0e78b2892ca54a48a6adbe6a271c3c17c0226646297e66 COPYRIGHT -sha256 1fb7395e76eabf94c421912d7d0a4f7fa745d49e1acb76b222c21d605b66bd25 LICENSE +sha256 a4f85c6f4d6e8bdd37b7ab08013e3e3bee1fe8e910e20f8f54d5025ffe40f384 LICENSE diff --git a/package/perl-exporter-tiny/perl-exporter-tiny.mk b/package/perl-exporter-tiny/perl-exporter-tiny.mk index c7abfbae2d..489ee54e17 100644 --- a/package/perl-exporter-tiny/perl-exporter-tiny.mk +++ b/package/perl-exporter-tiny/perl-exporter-tiny.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_EXPORTER_TINY_VERSION = 1.002002 +PERL_EXPORTER_TINY_VERSION = 1.006000 PERL_EXPORTER_TINY_SOURCE = Exporter-Tiny-$(PERL_EXPORTER_TINY_VERSION).tar.gz PERL_EXPORTER_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOBYINK PERL_EXPORTER_TINY_LICENSE = Artistic or GPL-1.0+ -PERL_EXPORTER_TINY_LICENSE_FILES = COPYRIGHT LICENSE +PERL_EXPORTER_TINY_LICENSE_FILES = LICENSE PERL_EXPORTER_TINY_DISTNAME = Exporter-Tiny $(eval $(perl-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:23 -0000 Subject: [Buildroot] [git commit branch/next] configs/acmesystems_acqua_a5_*: bump to Linux v5.15 Message-ID: <20230220205241.94892828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e84d84886daab3208dc209f362aabb4436ba00a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The updated device tree is provided by Acme Systems: https://www.acmesystems.it/compile_kernel_5_15 It is released under GPLv2 or later. Signed-off-by: Edgar Bonet Signed-off-by: Thomas Petazzoni --- board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts | 51 +++++++++++++++++++---- configs/acmesystems_acqua_a5_256mb_defconfig | 4 +- configs/acmesystems_acqua_a5_512mb_defconfig | 4 +- 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts index 264af29809..39fa4df1b1 100644 --- a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts +++ b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts @@ -4,7 +4,7 @@ * Copyright (C) 2014 Atmel, * 2014 Nicolas Ferre * - * 2020 Sergio Tanzilli + * 2022 Sergio Tanzilli * * Licensed under GPLv2 or later. */ @@ -17,7 +17,7 @@ chosen { stdout-path = "serial0:115200n8"; - bootargs = "mem=256M console=ttyS0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait consoleblank=0"; + bootargs = "mem=256M console=ttyS0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait net.ifnames=0"; }; memory { @@ -128,15 +128,19 @@ i2c3@ { compatible = "i2c-gpio"; - gpios = <&pioE 1 0 /* SDA */ - &pioE 2 0 /* SCK */ - >; - i2c-gpio,delay-us = <4>; /* ~178 kHz */ + + sda-gpios = <&pioE 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + scl-gpios = <&pioE 2 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3_gpio>; + + i2c-gpio,delay-us = <4>; /* ~178 kHz */ #address-cells = <1>; #size-cells = <0>; - + /* EEPROM contains the eth0 MAC address */ - + eeprom at 58 { compatible = "atmel,24mac402"; pagesize = <256>; @@ -149,6 +153,7 @@ reg = <0x0 0x06>; }; }; + }; pwm0: pwm at f002c000 { @@ -204,6 +209,17 @@ }; pinctrl at fffff200 { + + atmel,mux-mask = < + /* A B C */ + 0xffffffff 0xc0fc0000 0xc0ff0000 /* pioA */ + 0xffffffff 0x0ff8ffff 0x00000000 /* pioB */ + 0xffffffff 0xbc00f1ff 0x7c00fc00 /* pioC */ + 0xffffffff 0xc001c0e0 0x0001c1e0 /* pioD */ + 0xfffffff9 0xbf9f8000 0x18000000 /* pioE */ + /* 0xffffffff 0xb8000000 0x18000000 */ /* pioE */ + >; + board { pinctrl_i2c0_pu: i2c0_pu { atmel,pins = @@ -217,6 +233,13 @@ ; }; + pinctrl_i2c3_gpio: i2c3-gpio { + atmel,pins = + ; + }; + + pinctrl_key_gpio: key_gpio_0 { atmel,pins = ; @@ -236,12 +259,20 @@ atmel,pins = ; /* PE9, conflicts with A9 */ }; + + pinctrl_gpio_leds: gpio_leds_default { + atmel,pins = + ; + }; }; }; }; usb0: gadget at 500000 { - status = "okay"; + status = "disabled"; }; usb1: ohci at 600000 { @@ -272,6 +303,8 @@ leds { compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_leds>; led0 { label = "led0"; diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index f8129f3780..5a5b9559d6 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.107" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.90" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index e399d4a9ff..bb5bb1964e 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.107" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.90" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:24 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-mozilla-ca: bump to version 20221114 Message-ID: <20230220205242.11D1D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57ee214f608ca862bed6ccfec044b3d46d85e800 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-mozilla-ca/perl-mozilla-ca.hash | 4 ++-- package/perl-mozilla-ca/perl-mozilla-ca.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-mozilla-ca/perl-mozilla-ca.hash b/package/perl-mozilla-ca/perl-mozilla-ca.hash index 07966f9906..799a531fe6 100644 --- a/package/perl-mozilla-ca/perl-mozilla-ca.hash +++ b/package/perl-mozilla-ca/perl-mozilla-ca.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 843e42f367ea3c7abc5de5b6225791dc Mozilla-CA-20211001.tar.gz -sha256 122c8900000a9d388aa8e44f911cab6c118fe8497417917a84a8ec183971b449 Mozilla-CA-20211001.tar.gz +md5 2f136d096352a418e546e4afb70e7aa9 Mozilla-CA-20221114.tar.gz +sha256 701bea67be670add5a102f9f8c879402b4983096b1cb0e20dd47d52d7a10666b Mozilla-CA-20221114.tar.gz # computed by scancpan sha256 95cd63dae5c2bf6e7cf33435981614a36c85ef01fc7a02464e05e58a5355398e README diff --git a/package/perl-mozilla-ca/perl-mozilla-ca.mk b/package/perl-mozilla-ca/perl-mozilla-ca.mk index 6b970c0f94..a124860b7a 100644 --- a/package/perl-mozilla-ca/perl-mozilla-ca.mk +++ b/package/perl-mozilla-ca/perl-mozilla-ca.mk @@ -4,9 +4,9 @@ # ################################################################################ -PERL_MOZILLA_CA_VERSION = 20211001 +PERL_MOZILLA_CA_VERSION = 20221114 PERL_MOZILLA_CA_SOURCE = Mozilla-CA-$(PERL_MOZILLA_CA_VERSION).tar.gz -PERL_MOZILLA_CA_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AB/ABH +PERL_MOZILLA_CA_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG PERL_MOZILLA_CA_LICENSE = MPL-2.0 PERL_MOZILLA_CA_LICENSE_FILES = README PERL_MOZILLA_CA_DISTNAME = Mozilla-CA From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:25 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi-peripheral-xarcade: bump version to 19.0.5-Matrix Message-ID: <20230220205242.3F7D0828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=acc4570bf41d10573c73cda08defb385324becc6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash | 2 +- package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash index 0ae1ffaa50..5467513a0b 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1327ecd05e2e66a4faf809efee4c5b99627912d971db26a0a905f0299e4f876b kodi-peripheral-xarcade-19.0.4-Matrix.tar.gz +sha256 11f746cfeeffdfc1de6829d17aad999c8b598ca2239fcddb64801738546be6c9 kodi-peripheral-xarcade-19.0.5-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk index 9ee26ea2fe..2d9e33b625 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_XARCADE_VERSION = 19.0.4-Matrix +KODI_PERIPHERAL_XARCADE_VERSION = 19.0.5-Matrix KODI_PERIPHERAL_XARCADE_SITE = $(call github,kodi-game,peripheral.xarcade,$(KODI_PERIPHERAL_XARCADE_VERSION)) KODI_PERIPHERAL_XARCADE_LICENSE = GPL-2.0+ KODI_PERIPHERAL_XARCADE_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:26 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-mojolicious: security bump to version 9.31 Message-ID: <20230220205242.06F47828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fb59f913d0e21a51491e64ea781702400cfcd5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next see https://metacpan.org/dist/Mojolicious/changes#L3 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-mojolicious/perl-mojolicious.hash | 4 ++-- package/perl-mojolicious/perl-mojolicious.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-mojolicious/perl-mojolicious.hash b/package/perl-mojolicious/perl-mojolicious.hash index 97625d1290..989eaf3419 100644 --- a/package/perl-mojolicious/perl-mojolicious.hash +++ b/package/perl-mojolicious/perl-mojolicious.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 494db2d1529e84a2575527dae8f3672d Mojolicious-9.26.tar.gz -sha256 9e428c5512698f05e151338d8fa12aede287ab3a5e429ec3d38c80a4a82c8d88 Mojolicious-9.26.tar.gz +md5 523193316a839ff56a447f0f0c2e5b36 Mojolicious-9.31.tar.gz +sha256 cb96ccd7a5319321ec6f57633c88bf17193d45169f4d7846da254bb6f9ed8312 Mojolicious-9.31.tar.gz # computed by scancpan sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE diff --git a/package/perl-mojolicious/perl-mojolicious.mk b/package/perl-mojolicious/perl-mojolicious.mk index dbf2e61737..618327d09d 100644 --- a/package/perl-mojolicious/perl-mojolicious.mk +++ b/package/perl-mojolicious/perl-mojolicious.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOJOLICIOUS_VERSION = 9.26 +PERL_MOJOLICIOUS_VERSION = 9.31 PERL_MOJOLICIOUS_SOURCE = Mojolicious-$(PERL_MOJOLICIOUS_VERSION).tar.gz PERL_MOJOLICIOUS_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SR/SRI PERL_MOJOLICIOUS_LICENSE = Artistic-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:27 -0000 Subject: [Buildroot] [git commit branch/next] package/kodi-peripheral-joystick: bump version to 19.0.4-Matrix Message-ID: <20230220205242.3463181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d183a6d333eaf57b6a5f5c1a7eb323b5ada7cd6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 5ac4247cbf..0b483f70bf 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0a595933998565902f112f0d476ada1cd732a1961ed10b8a2b9a52ed8bd8c652 kodi-peripheral-joystick-19.0.3-Matrix.tar.gz +sha256 a5c7c6b8b1f39c92d00289bd602ea2db13a3d3f73a50bd3f95ec08cf110a570e kodi-peripheral-joystick-19.0.4-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index 1b2b3f4984..db1bc2c50f 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.3-Matrix +KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.4-Matrix KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Feb 20 21:02:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:02:47 -0000 Subject: [Buildroot] [git commit branch/next] package/neon-2-sse: new package Message-ID: <20230220205244.02B0A81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee399a868957fbf963db525adeeb4ab2dd3f04fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This package is required by tensorflow-lite. Tested-by: Stefan Hager Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/neon-2-sse/Config.in | 9 +++++++++ package/neon-2-sse/neon-2-sse.hash | 4 ++++ package/neon-2-sse/neon-2-sse.mk | 14 ++++++++++++++ 5 files changed, 29 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d0a51086cd..8a652c7c12 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1344,6 +1344,7 @@ F: package/lua-std-debug/ F: package/lua-std-normalize/ F: package/lilv/ F: package/lv2/ +F: package/neon-2-sse/ F: package/pipewire/ F: package/python-aioconsole/ F: package/python-aiodns/ diff --git a/package/Config.in b/package/Config.in index fc468148df..96a44a3623 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2107,6 +2107,7 @@ endif source "package/msgpack/Config.in" source "package/musl-compat-headers/Config.in" source "package/musl-fts/Config.in" + source "package/neon-2-sse/Config.in" source "package/openblas/Config.in" source "package/orc/Config.in" source "package/p11-kit/Config.in" diff --git a/package/neon-2-sse/Config.in b/package/neon-2-sse/Config.in new file mode 100644 index 0000000000..25613c5ec4 --- /dev/null +++ b/package/neon-2-sse/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_NEON_2_SSE + bool "neon-2-sse" + help + The platform independent header allowing to compile any + C/C++ code containing ARM NEON intrinsic functions for + x86 target systems using SIMD up to SSE4 intrinsic + functions. + + https://github.com/intel/ARM_NEON_2_x86_SSE diff --git a/package/neon-2-sse/neon-2-sse.hash b/package/neon-2-sse/neon-2-sse.hash new file mode 100644 index 0000000000..ded20d58f5 --- /dev/null +++ b/package/neon-2-sse/neon-2-sse.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 019fbc7ec25860070a1d90e12686fc160cfb33e22aa063c80f52b363f1361e9d neon-2-sse-a15b489e1222b2087007546b4912e21293ea86ff.tar.gz +# License files, locally calculated +sha256 7022f51b439a5915e933ecc270c83e24ca0cb2cceeb08b0132dcd4dbb03ed2dc LICENSE diff --git a/package/neon-2-sse/neon-2-sse.mk b/package/neon-2-sse/neon-2-sse.mk new file mode 100644 index 0000000000..0e9d066abd --- /dev/null +++ b/package/neon-2-sse/neon-2-sse.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# neon-2-sse +# +################################################################################ + +NEON_2_SSE_VERSION = a15b489e1222b2087007546b4912e21293ea86ff +NEON_2_SSE_SITE = $(call github,intel,ARM_NEON_2_x86_SSE,$(NEON_2_SSE_VERSION)) +NEON_2_SSE_LICENSE = BSD-2-Clause +NEON_2_SSE_LICENSE_FILES = LICENSE +NEON_2_SSE_INSTALL_STAGING = YES +NEON_2_SSE_INSTALL_TARGET = NO + +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:02:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:02:48 -0000 Subject: [Buildroot] [git commit branch/next] package/{, lib}apparmor: bump to version 3.1.2 Message-ID: <20230220205243.D3F7B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15864d79130479aa8d0c6990a95d9921892e822c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the location where the hashes are retrieved from. Signed-off-by: Angelo Compagnucci [yann.morin.1998 at free.fr: hashes location changed] Signed-off-by: Yann E. MORIN --- package/apparmor/apparmor.hash | 4 ++-- package/apparmor/apparmor.mk | 4 ++-- package/libapparmor/libapparmor.hash | 4 ++-- package/libapparmor/libapparmor.mk | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/apparmor/apparmor.hash b/package/apparmor/apparmor.hash index 497491b6c9..22037e3e11 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 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz +# From https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.2 +sha256 7cbd0b2f6393abf57acaf25dc2b32b2ae197c0b5b0d661e14be46127df93a5eb apparmor-3.1.2.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 76c9f2cafe..eeedd805e6 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, please also update the libapparmor package -APPARMOR_VERSION_MAJOR = 3.0 -APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).4 +APPARMOR_VERSION_MAJOR = 3.1 +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).2 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/libapparmor.hash b/package/libapparmor/libapparmor.hash index 9fbfe3b92e..574ff95b60 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 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz +# From https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.2 +sha256 7cbd0b2f6393abf57acaf25dc2b32b2ae197c0b5b0d661e14be46127df93a5eb apparmor-3.1.2.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index af59335933..7f3cfcab2f 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, please also update the apparmor package -LIBAPPARMOR_VERSION_MAJOR = 3.0 -LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).4 +LIBAPPARMOR_VERSION_MAJOR = 3.1 +LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).2 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 thomas.petazzoni at bootlin.com Mon Feb 20 21:02:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:49 -0000 Subject: [Buildroot] [git commit branch/next] package/libva: bump version to 2.17.0 Message-ID: <20230220205244.47D2D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76152e95a9749d05c0e334e1fa6affdf9aeafb7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/intel/libva/blob/v2.17-branch/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 2916898c31..700ace0378 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,5 +1,5 @@ -# From https://github.com/intel/libva/releases/download/2.16.0/libva-2.16.0.tar.bz2.sha1sum -sha1 ba1c0e196d69a26e54b065dc0f645bdf3be147a7 libva-2.16.0.tar.bz2 +# From https://github.com/intel/libva/releases/download/2.17.0/libva-2.17.0.tar.bz2.sha1sum +sha1 997f7b3111bc5a4d32ec72e9d7f9fcfca41e4923 libva-2.17.0.tar.bz2 # Locally computed -sha256 115faca0db2c417a37da49830870e260450fa13066f5e24e252a20c36d920a1c libva-2.16.0.tar.bz2 +sha256 f3e5eb27c305e05a9bb62703d1915a127301cc0c4f9f209025767432230c4eac libva-2.17.0.tar.bz2 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 3b6e9580d3..c6b9f63b10 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.16.0 +LIBVA_VERSION = 2.17.0 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) LIBVA_LICENSE = MIT From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:50 -0000 Subject: [Buildroot] [git commit branch/next] boot/uboot: add BR2_TARGET_UBOOT_NEEDS_XXD option Message-ID: <20230220205244.54BE2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=319cc24aca38d6cb8898400694135b855731940f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A host dependency to xxd is required if the U-Boot board configuration has CONFIG_USE_DEFAULT_ENV_FILE enabled. So introduce a new BR U-Boot config option BR2_TARGET_UBOOT_NEEDS_XXD to solve this problem. xxd is provided by host-vim. Signed-off-by: Jerry Kooyman Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 8 ++++++++ boot/uboot/uboot.mk | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index a729280060..282418c3ed 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -198,6 +198,14 @@ config BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX This is typically the case when the board configuration has CONFIG_TOOLS_MKEFICAPSULE enabled. +config BR2_TARGET_UBOOT_NEEDS_XXD + bool "U-Boot needs xxd" + help + Select this option if your U-Boot board configuration + requires xxd to be available on the host. This is + typically the case when the board configuration has + CONFIG_USE_DEFAULT_ENV_FILE enabled. + config BR2_TARGET_UBOOT_NEEDS_ATF_BL31 bool "U-Boot needs ATF BL31" depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 99e80ea5a1..4eae8e95c3 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -239,6 +239,10 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX),y) UBOOT_DEPENDENCIES += host-util-linux endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) +UBOOT_DEPENDENCIES += host-vim +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:51 -0000 Subject: [Buildroot] [git commit branch/next] package/ulogd: fix mysql build Message-ID: <20230220205244.8836D81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=039dfca25290c4cebe1b7d859a03944598f4c104 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following mysql build failure raised since bump to version 2.0.8 in commit 6fc4b59ffd3007ca9e436d33647acc5dfff62970: checking for mysql_config... no configure: error: libmysqlclient not found Fixes: - http://autobuild.buildroot.org/results/a059be353b7464d4e6a7830a685b43bdd7ecd5fa Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ulogd/ulogd.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 7d4a1fde4d..033acb06c2 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -23,7 +23,9 @@ else ULOGD_CONF_OPTS += --disable-dbi endif ifeq ($(BR2_PACKAGE_MYSQL),y) -ULOGD_CONF_OPTS += --enable-mysql +ULOGD_CONF_OPTS += \ + --enable-mysql \ + --with-mysql-config=$(STAGING_DIR)/usr/bin/mysql_config ULOGD_DEPENDENCIES += mysql else ULOGD_CONF_OPTS += --disable-mysql From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:52 -0000 Subject: [Buildroot] [git commit branch/next] package/ulogd: dbi needs threads Message-ID: <20230220205244.7D9DE828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7316a0c2c22c8207edff531544e6eb0d6326b45c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 3b3dbd0183265c3f7da49b0b331688fb7573383f forgot to disable dbi without threads Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ulogd/ulogd.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 561429599c..7d4a1fde4d 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -41,7 +41,11 @@ else ULOGD_CONF_OPTS += --disable-sqlite3 endif else -ULOGD_CONF_OPTS += --disable-mysql --disable-pgsql --disable-sqlite3 +ULOGD_CONF_OPTS += \ + --disable-dbi \ + --disable-mysql \ + --disable-pgsql \ + --disable-sqlite3 endif ifeq ($(BR2_PACKAGE_LIBPCAP),y) From peter at korsgaard.com Mon Feb 20 21:02:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:53 -0000 Subject: [Buildroot] [git commit branch/next] package/docker-compose: security bump version to 2.15.1 Message-ID: <20230220205244.B237781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67c92fbd5004a750e6af253dd1eba4c3f669ef42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix CVE-2022-27664 and CVE-2022-32149 high-risk vulnerability. Many other bugfixes, enhancements, and improvements. https://github.com/docker/compose/releases/tag/v2.15.1 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 7a7ab5f110..2c924d5080 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5cbf6cd1dd8ce98c5e2d62ca7f622e96abce444979b8e8852b033213a98e2049 docker-compose-2.14.0.tar.gz +sha256 346571ca487bf3f4b3dc9caeadc88a645354b0e098fa60f350249ec35ab3f240 docker-compose-2.15.1.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index ef9ee97196..3bced8bb7b 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.14.0 +DOCKER_COMPOSE_VERSION = 2.15.1 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 20 21:02:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:54 -0000 Subject: [Buildroot] [git commit branch/next] package/fluent-bit: needs arch support and C++ for wasm Message-ID: <20230220205244.A6C16828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aff4317797c34c78747f4c6c5ee8d9a1bc0ae270 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next See: https://github.com/fluent/fluent-bit/tree/master/lib/wasm-micro-runtime-WAMR-1.1.1#supported-architectures-and-platforms MIPS & RISCV32 are mentioned in the supported list, but that seems to be wrong, so excluded those. Fixes: - http://autobuild.buildroot.org/results/dfb/dfb8f71d7e016cdfd3beb4b8196081898bd49ae2/build-end.log - http://autobuild.buildroot.org/results/ecf/ecfe7b67af68cd7f397a50360900cd9a7afc830e/build-end.log Signed-off-by: Thomas Devoogdt [Peter: Move arch dependency to _WASM_ARCH_SUPPORTS blind option, add help text, use normal style for prompt and fix indentation] Signed-off-by: Peter Korsgaard --- package/fluent-bit/Config.in | 21 +++++++++++++++++++++ package/fluent-bit/fluent-bit.mk | 6 ++++++ 2 files changed, 27 insertions(+) diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 11ceb55d4f..6c2299e695 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -8,5 +8,26 @@ config BR2_PACKAGE_FLUENT_BIT https://github.com/fluent/fluent-bit +if BR2_PACKAGE_FLUENT_BIT + +config BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + bool + # see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms + default y if BR2_arc + default y if BR2_arm || BR2_armeb + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + default y if BR2_RISCV_64 + default y if BR2_xtensa + +config BR2_PACKAGE_FLUENT_BIT_WASM + bool "wasm runtime support" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + help + Support for WASM-based plugins. + +endif + comment "fluent-bit needs a glibc toolchain" depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index c84042a0fa..6e9a33e02e 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -17,6 +17,12 @@ FLUENT_BIT_CONF_OPTS += \ -DFLB_CHUNK_TRACE=No \ -DFLB_BACKTRACE=No +ifeq ($(BR2_PACKAGE_FLUENT_BIT_WASM),y) +FLUENT_BIT_CONF_OPTS += -DFLB_WASM=Yes +else +FLUENT_BIT_CONF_OPTS += -DFLB_WASM=No +endif + ifeq ($(BR2_PACKAGE_LUAJIT),y) FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=Yes FLUENT_BIT_DEPENDENCIES += luajit From thomas.petazzoni at bootlin.com Mon Feb 20 21:02:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:02:56 -0000 Subject: [Buildroot] [git commit branch/next] configs/imx8mn_bsh_smm_s2_defconfig: new defconfig Message-ID: <20230220205242.CC3D581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c65ab5fab325b5abfe34652c1236c3b8b10d752 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next BSH SMM S2 (SystemMaster S2) Board is an add-on board which provide input and output interfaces to a dedicated carrier board. It is designed mainly to provide graphical/video and connectivity interfaces to the appliance. Board support package includes the following components: - mainline Linux kernel 6.1.6 - mainline U-Boot 2022-07 - default packages from buildroot https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ The smm s2 board is basically the same as the pro except it boots from NAND instead of eMMC. Co-authored-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 + board/bsh/imx8mn-bsh-smm-s2/flash.sh | 26 + board/bsh/imx8mn-bsh-smm-s2/linux.fragment | 895 +++++++++++++++++++++ board/bsh/imx8mn-bsh-smm-s2/nand-full.lst | 29 + ...figs-Remove-rootwait-1-to-all-the-affecte.patch | 160 ++++ board/bsh/imx8mn-bsh-smm-s2/post-build.sh | 4 + board/bsh/imx8mn-bsh-smm-s2/readme.txt | 75 ++ configs/imx8mn_bsh_smm_s2_defconfig | 41 + 8 files changed, 1234 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 4ead3a71f2..2e187d7b03 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -686,6 +686,8 @@ F: package/luaexpat/ F: package/xinetd/ N: Dario Binacchi +F: board/bsh/ +F: configs/imx8mn_bsh_smm_s2_defconfig F: package/sscep/ F: package/uuu/ @@ -2118,6 +2120,8 @@ F: package/python-crc16/ F: package/python-pyzmq/ N: Michael Trimarchi +F: board/bsh/ +F: configs/imx8mn_bsh_smm_s2_defconfig F: package/python-spidev/ N: Michael Vetter diff --git a/board/bsh/imx8mn-bsh-smm-s2/flash.sh b/board/bsh/imx8mn-bsh-smm-s2/flash.sh new file mode 100755 index 0000000000..1f343d516d --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/flash.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +if [ $# -eq 0 ]; then + OUTPUT_DIR=output +else + OUTPUT_DIR=$1 +fi + +if ! test -d "${OUTPUT_DIR}" ; then + echo "ERROR: no output directory specified." + echo "Usage: $0 OUTPUT_DIR" + echo "" + echo "Arguments:" + echo " OUTPUT_DIR The Buildroot output directory." + exit 1 +fi + +IMAGES_DIR=${OUTPUT_DIR}/images + +${OUTPUT_DIR}/host/bin/uuu -v -b ${IMAGES_DIR}/nand-full.lst \ + ${IMAGES_DIR}/flash.bin \ + ${IMAGES_DIR}/flash.bin \ + ${IMAGES_DIR}/rootfs.ubifs \ + ${IMAGES_DIR}/Image \ + ${IMAGES_DIR}/freescale/imx8mn-bsh-smm-s2.dtb + diff --git a/board/bsh/imx8mn-bsh-smm-s2/linux.fragment b/board/bsh/imx8mn-bsh-smm-s2/linux.fragment new file mode 100644 index 0000000000..80803ab088 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/linux.fragment @@ -0,0 +1,895 @@ +# CONFIG_BPF_SYSCALL is not set +CONFIG_TASK_DELAY_ACCT=y +CONFIG_CGROUP_FREEZER=y +# CONFIG_CGROUP_BPF is not set +CONFIG_RELAY=y +# CONFIG_ARCH_ACTIONS is not set +# CONFIG_ARCH_SUNXI is not set +# CONFIG_ARCH_ALPINE is not set +# CONFIG_ARCH_APPLE is not set +# CONFIG_ARCH_BCM2835 is not set +# CONFIG_ARCH_BCM4908 is not set +# CONFIG_ARCH_BCM_IPROC is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_BRCMSTB is not set +# CONFIG_ARCH_EXYNOS is not set +# CONFIG_ARCH_K3 is not set +# CONFIG_ARCH_LAYERSCAPE is not set +# CONFIG_ARCH_LG1K is not set +# CONFIG_ARCH_HISI is not set +# CONFIG_ARCH_KEEMBAY is not set +# CONFIG_ARCH_MEDIATEK is not set +# CONFIG_ARCH_MESON is not set +# CONFIG_ARCH_MVEBU is not set +# CONFIG_ARCH_QCOM is not set +# CONFIG_ARCH_RENESAS is not set +# CONFIG_ARCH_ROCKCHIP is not set +# CONFIG_ARCH_S32 is not set +# CONFIG_ARCH_SEATTLE is not set +# CONFIG_ARCH_INTEL_SOCFPGA is not set +# CONFIG_ARCH_SYNQUACER is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_TESLA_FSD is not set +# CONFIG_ARCH_SPRD is not set +# CONFIG_ARCH_THUNDER is not set +# CONFIG_ARCH_THUNDER2 is not set +# CONFIG_ARCH_UNIPHIER is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_VISCONTI is not set +# CONFIG_ARCH_XGENE is not set +# CONFIG_ARCH_ZYNQMP is not set +# CONFIG_KEXEC is not set +# CONFIG_KEXEC_FILE is not set +# CONFIG_XEN is not set +# CONFIG_ARM64_PTR_AUTH is not set +# CONFIG_ARM64_TLB_RANGE is not set +# CONFIG_ARM64_MTE is not set +CONFIG_PM_DEBUG=y +CONFIG_PM_TEST_SUSPEND=y +# CONFIG_HIBERNATION is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +# CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set +# CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set +CONFIG_ARM_IMX_CPUFREQ_DT=y +# CONFIG_ARM_QCOM_CPUFREQ_NVMEM is not set +# CONFIG_ARM_QCOM_CPUFREQ_HW is not set +# CONFIG_ARM_RASPBERRYPI_CPUFREQ is not set +# CONFIG_ARM_SCMI_CPUFREQ is not set +# CONFIG_ARM_TEGRA186_CPUFREQ is not set +# CONFIG_ARM_MEDIATEK_CPUFREQ is not set +# CONFIG_QORIQ_CPUFREQ is not set +# CONFIG_ACPI_APEI_PCIEAER is not set +# CONFIG_VIRTUALIZATION is not set +# CONFIG_KVM is not set +# CONFIG_GCC_PLUGINS is not set +CONFIG_IPV6=y +CONFIG_MODVERSIONS=y +CONFIG_IPV6_SIT=m +CONFIG_NET_DSA_TAG_OCELOT=m +CONFIG_VLAN_8021Q=y +CONFIG_LLC2=y +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_PKTGEN=m +CONFIG_BT=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=y +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=y +# CONFIG_CAN_RCAR is not set +# CONFIG_CAN_RCAR_CANFD is not set +# CONFIG_CAN_MCP251XFD is not set +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIVHCI=y +CONFIG_CFG80211=y +CONFIG_NL80211_TESTMODE=y +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=y +# CONFIG_BT_HCIUART_MRVL is not set +# CONFIG_BT_MRVL is not set +# CONFIG_BT_MRVL_SDIO is not set +# CONFIG_BT_QCOMSMD is not set +# CONFIG_RFKILL is not set +# CONFIG_PCI is not set +# CONFIG_PCIEPORTBUS is not set +# CONFIG_PCIEAER is not set +# CONFIG_PCI_IOV is not set +# CONFIG_PCI_PASID is not set +# CONFIG_HOTPLUG_PCI is not set +# CONFIG_HOTPLUG_PCI_ACPI is not set +# CONFIG_PCI_AARDVARK is not set +# CONFIG_PCI_TEGRA is not set +# CONFIG_PCIE_RCAR_HOST is not set +# CONFIG_PCIE_RCAR_EP is not set +# CONFIG_PCI_HOST_GENERIC is not set +# CONFIG_PCI_XGENE is not set +# CONFIG_PCIE_ALTERA is not set +# CONFIG_PCIE_ALTERA_MSI is not set +# CONFIG_PCI_HOST_THUNDER_PEM is not set +# CONFIG_PCI_HOST_THUNDER_ECAM is not set +# CONFIG_PCIE_ROCKCHIP_HOST is not set +# CONFIG_PCIE_BRCMSTB is not set +# CONFIG_PCI_IMX6 is not set +# CONFIG_PCI_LAYERSCAPE is not set +# CONFIG_PCI_HISI is not set +# CONFIG_PCIE_QCOM is not set +# CONFIG_PCIE_ARMADA_8K is not set +# CONFIG_PCIE_KIRIN is not set +# CONFIG_PCIE_HISI_STB is not set +# CONFIG_PCIE_TEGRA194_HOST is not set +# CONFIG_PCIE_VISCONTI_HOST is not set +# CONFIG_PCIE_LAYERSCAPE_GEN4 is not set +# CONFIG_PCI_ENDPOINT is not set +# CONFIG_PCI_ENDPOINT_CONFIGFS is not set +# CONFIG_PCI_EPF_TEST is not set +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_BRCMSTB_GISB_ARB=y +CONFIG_VEXPRESS_CONFIG=y +# CONFIG_HISILICON_LPC is not set +# CONFIG_TEGRA_ACONNECT is not set +# CONFIG_RASPBERRYPI_FIRMWARE is not set +# CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_STRATIX10_RSU is not set +CONFIG_IMX_DSP=y +# CONFIG_GNSS is not set +# CONFIG_GNSS_MTK_SERIAL is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_NAND_BRCMNAND is not set +CONFIG_MTD_NAND_GPMI_NAND=y +# CONFIG_MTD_NAND_MARVELL is not set +# CONFIG_MTD_NAND_FSL_IFC is not set +# CONFIG_MTD_NAND_QCOM is not set +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_MTD_UBI=y +# CONFIG_BLK_DEV_NVME is not set +# CONFIG_PCI_ENDPOINT_TEST is not set +CONFIG_RAID_ATTRS=m +# CONFIG_SCSI_HISI_SAS_PCI is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT3SAS is not set +# CONFIG_SCSI_UFS_QCOM is not set +# CONFIG_SCSI_UFS_HISI is not set +# CONFIG_SCSI_UFS_EXYNOS is not set +# CONFIG_SATA_AHCI is not set +CONFIG_AHCI_IMX=y +# CONFIG_AHCI_BRCM is not set +# CONFIG_AHCI_MVEBU is not set +# CONFIG_SATA_SIL24 is not set +# CONFIG_SATA_RCAR is not set +CONFIG_DM_CRYPT=m +# CONFIG_NET_DSA_BCM_SF2 is not set +# CONFIG_NET_DSA_MSCC_FELIX is not set +# CONFIG_NET_XGENE is not set +# CONFIG_ATL1C is not set +# CONFIG_SYSTEMPORT is not set +# CONFIG_BNX2X is not set +# CONFIG_THUNDER_NIC_PF is not set +CONFIG_FSL_XGMAC_MDIO=y +CONFIG_FSL_ENETC_IERB=y +# CONFIG_FSL_FMAN is not set +# CONFIG_FSL_DPAA_ETH is not set +# CONFIG_FSL_DPAA2_ETH is not set +# CONFIG_FSL_ENETC is not set +# CONFIG_FSL_ENETC_VF is not set +# CONFIG_FSL_ENETC_QOS is not set +CONFIG_MVMDIO=y +CONFIG_MSCC_OCELOT_SWITCH=m +# CONFIG_HNS3 is not set +# CONFIG_HNS3_HCLGE is not set +# CONFIG_HNS3_ENET is not set +# CONFIG_E1000 is not set +# CONFIG_E1000E is not set +# CONFIG_IGB is not set +# CONFIG_IGBVF is not set +# CONFIG_MVNETA is not set +# CONFIG_MVPP2 is not set +# CONFIG_SKY2 is not set +# CONFIG_MLX4_EN is not set +# CONFIG_MLX5_CORE is not set +# CONFIG_MLX5_CORE_EN is not set +# CONFIG_R8169 is not set +# CONFIG_SH_ETH is not set +# CONFIG_RAVB is not set +CONFIG_STMMAC_ETH=y +CONFIG_DWMAC_GENERIC=m +CONFIG_MICROCHIP_PHY=y +CONFIG_NXP_TJA11XX_PHY=y +CONFIG_MDIO_BITBANG=y +# CONFIG_SNI_AVE is not set +# CONFIG_SNI_NETSEC is not set +# CONFIG_TI_K3_AM65_CPSW_NUSS is not set +# CONFIG_QCOM_IPA is not set +# CONFIG_MESON_GXL_PHY is not set +# CONFIG_AQUANTIA_PHY is not set +# CONFIG_BCM54140_PHY is not set +# CONFIG_MARVELL_PHY is not set +# CONFIG_MARVELL_10G_PHY is not set +# CONFIG_MICREL_PHY is not set +# CONFIG_MICROSEMI_PHY is not set +# CONFIG_AT803X_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_ROCKCHIP_PHY is not set +# CONFIG_DP83867_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_USB_BRCMSTB is not set +CONFIG_USB_RTL8152=y +CONFIG_USB_USBNET=y +CONFIG_BRCMFMAC=y +CONFIG_HOSTAP=y +# CONFIG_ATH10K is not set +# CONFIG_ATH10K_PCI is not set +# CONFIG_ATH10K_SNOC is not set +# CONFIG_WCN36XX is not set +# CONFIG_MWIFIEX is not set +# CONFIG_MWIFIEX_SDIO is not set +# CONFIG_MWIFIEX_PCIE is not set +CONFIG_KEYBOARD_SNVS_PWRKEY=y +# CONFIG_KEYBOARD_IMX_SC_KEY is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_INPUT_PM8941_PWRKEY is not set +# CONFIG_INPUT_PM8XXX_VIBRATOR is not set +# CONFIG_INPUT_PWM_BEEPER is not set +# CONFIG_INPUT_PWM_VIBRA is not set +# CONFIG_INPUT_HISI_POWERKEY is not set +# CONFIG_SERIAL_8250_BCM2835AUX is not set +# CONFIG_SERIAL_8250_OMAP is not set +# CONFIG_SERIAL_8250_MT6577 is not set +# CONFIG_SERIAL_8250_UNIPHIER is not set +# CONFIG_SERIAL_MESON is not set +# CONFIG_SERIAL_MESON_CONSOLE is not set +# CONFIG_SERIAL_SAMSUNG is not set +# CONFIG_SERIAL_SAMSUNG_CONSOLE is not set +# CONFIG_SERIAL_TEGRA is not set +# CONFIG_SERIAL_TEGRA_TCU is not set +# CONFIG_SERIAL_SH_SCI is not set +# CONFIG_SERIAL_MSM is not set +# CONFIG_SERIAL_MSM_CONSOLE is not set +# CONFIG_SERIAL_QCOM_GENI is not set +# CONFIG_SERIAL_QCOM_GENI_CONSOLE is not set +# CONFIG_SERIAL_MVEBU_UART is not set +# CONFIG_SERIAL_OWL is not set +# CONFIG_I2C_MUX is not set +# CONFIG_I2C_BCM2835 is not set +# CONFIG_I2C_MESON is not set +# CONFIG_I2C_MT65XX is not set +# CONFIG_I2C_MV64XXX is not set +# CONFIG_I2C_OMAP is not set +# CONFIG_I2C_OWL is not set +# CONFIG_I2C_PXA is not set +# CONFIG_I2C_QCOM_CCI is not set +# CONFIG_I2C_QCOM_GENI is not set +# CONFIG_I2C_QUP is not set +# CONFIG_I2C_RIIC is not set +# CONFIG_I2C_S3C2410 is not set +# CONFIG_I2C_SH_MOBILE is not set +# CONFIG_I2C_TEGRA is not set +# CONFIG_I2C_UNIPHIER_F is not set +# CONFIG_I2C_RCAR is not set +# CONFIG_SPI_ARMADA_3700 is not set +# CONFIG_SPI_BCM2835 is not set +# CONFIG_SPI_BCM2835AUX is not set +# CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI_DW_DMA is not set +# CONFIG_SPI_DW_MMIO is not set +CONFIG_SPI_IMX=y +# CONFIG_SPI_FSL_DSPI is not set +# CONFIG_SPI_MESON_SPICC is not set +# CONFIG_SPI_MESON_SPIFC is not set +# CONFIG_SPI_ORION is not set +CONFIG_SPI_SPIDEV=y +CONFIG_SPI_SLAVE=y +CONFIG_SPI_SLAVE_TIME=y +CONFIG_SPI_SLAVE_SYSTEM_CONTROL=y +CONFIG_PINCTRL=y +# CONFIG_SPI_RPCIF is not set +# CONFIG_SPI_RSPI is not set +# CONFIG_SPI_QCOM_QSPI is not set +# CONFIG_SPI_QUP is not set +# CONFIG_SPI_QCOM_GENI is not set +# CONFIG_SPI_S3C64XX is not set +# CONFIG_SPI_SH_MSIOF is not set +# CONFIG_SPI_SUN6I is not set +# CONFIG_SPMI is not set +# CONFIG_PINCTRL_OWL is not set +# CONFIG_PINCTRL_S700 is not set +# CONFIG_PINCTRL_S900 is not set +CONFIG_GPIOLIB=y +# CONFIG_PINCTRL_MSM is not set +# CONFIG_PINCTRL_IPQ8074 is not set +# CONFIG_PINCTRL_IPQ6018 is not set +# CONFIG_PINCTRL_MSM8916 is not set +# CONFIG_PINCTRL_MSM8994 is not set +# CONFIG_PINCTRL_MSM8996 is not set +# CONFIG_PINCTRL_MSM8998 is not set +# CONFIG_PINCTRL_QCS404 is not set +# CONFIG_PINCTRL_QDF2XXX is not set +# CONFIG_PINCTRL_QCOM_SPMI_PMIC is not set +# CONFIG_PINCTRL_SC7180 is not set +# CONFIG_PINCTRL_SC7280 is not set +# CONFIG_PINCTRL_SDM845 is not set +# CONFIG_PINCTRL_SM8150 is not set +# CONFIG_PINCTRL_SM8250 is not set +# CONFIG_PINCTRL_SM8350 is not set +# CONFIG_PINCTRL_SM8450 is not set +# CONFIG_PINCTRL_LPASS_LPI is not set +# CONFIG_GPIO_DAVINCI is not set +# CONFIG_GPIO_MPC8XXX is not set +# CONFIG_GPIO_RCAR is not set +# CONFIG_GPIO_UNIPHIER is not set +# CONFIG_GPIO_VISCONTI is not set +# CONFIG_GPIO_XGENE_SB is not set +CONFIG_POWER_RESET_BRCMSTB=y +# CONFIG_GPIO_MAX77620 is not set +# CONFIG_GPIO_SL28CPLD is not set +# CONFIG_POWER_RESET_MSM is not set +# CONFIG_POWER_RESET_QCOM_PON is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_BQ25890 is not set +# CONFIG_CHARGER_BQ25980 is not set +# CONFIG_SENSORS_JC42 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_RASPBERRYPI_HWMON is not set +# CONFIG_SENSORS_SL28CPLD is not set +CONFIG_THERMAL_WRITABLE_TRIPS=y +CONFIG_IMX_SC_THERMAL=y +CONFIG_IMX8MM_THERMAL=y +CONFIG_QORIQ_THERMAL=y +# CONFIG_SUN8I_THERMAL is not set +# CONFIG_ROCKCHIP_THERMAL is not set +# CONFIG_RCAR_THERMAL is not set +# CONFIG_RCAR_GEN3_THERMAL is not set +# CONFIG_RZG2L_THERMAL is not set +# CONFIG_ARMADA_THERMAL is not set +# CONFIG_BCM2711_THERMAL is not set +# CONFIG_BCM2835_THERMAL is not set +# CONFIG_BRCMSTB_THERMAL is not set +# CONFIG_EXYNOS_THERMAL is not set +# CONFIG_TEGRA_SOCTHERM is not set +# CONFIG_TEGRA_BPMP_THERMAL is not set +# CONFIG_QCOM_TSENS is not set +# CONFIG_QCOM_SPMI_TEMP_ALARM is not set +# CONFIG_QCOM_LMH is not set +# CONFIG_UNIPHIER_THERMAL is not set +# CONFIG_SL28CPLD_WATCHDOG is not set +# CONFIG_S3C2410_WATCHDOG is not set +# CONFIG_BCM7038_WDT is not set +# CONFIG_SUNXI_WATCHDOG is not set +CONFIG_IMX_SC_WDT=y +CONFIG_IMX7ULP_WDT=y +# CONFIG_QCOM_WDT is not set +# CONFIG_MESON_GXBB_WATCHDOG is not set +# CONFIG_MESON_WATCHDOG is not set +# CONFIG_RENESAS_WDT is not set +# CONFIG_RENESAS_RZG2LWDT is not set +# CONFIG_UNIPHIER_WATCHDOG is not set +# CONFIG_BCM2835_WDT is not set +# CONFIG_MFD_ALTERA_SYSMGR is not set +# CONFIG_MFD_AXP20X_RSB is not set +# CONFIG_MFD_EXYNOS_LPASS is not set +# CONFIG_MFD_HI655X_PMIC is not set +# CONFIG_MFD_MT6397 is not set +# CONFIG_MFD_SPMI_PMIC is not set +# CONFIG_MFD_SL28CPLD is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_HI655X is not set +# CONFIG_REGULATOR_MP8859 is not set +# CONFIG_REGULATOR_MT6358 is not set +# CONFIG_REGULATOR_MT6397 is not set +# CONFIG_REGULATOR_PF8X00 is not set +# CONFIG_REGULATOR_QCOM_RPMH is not set +# CONFIG_REGULATOR_QCOM_SMD_RPM is not set +# CONFIG_REGULATOR_QCOM_SPMI is not set +# CONFIG_REGULATOR_TPS65132 is not set +CONFIG_MEDIA_SUPPORT=y +# CONFIG_RC_CORE is not set +# CONFIG_RC_DECODERS is not set +# CONFIG_RC_DEVICES is not set +# CONFIG_IR_MESON is not set +# CONFIG_IR_SUNXI is not set +CONFIG_SDR_PLATFORM_DRIVERS=y +# CONFIG_VIDEO_QCOM_CAMSS is not set +# CONFIG_VIDEO_RCAR_CSI2 is not set +# CONFIG_VIDEO_RCAR_VIN is not set +# CONFIG_VIDEO_SUN6I_CSI is not set +# CONFIG_VIDEO_RCAR_ISP is not set +# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set +# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set +# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set +# CONFIG_VIDEO_RENESAS_FDP1 is not set +# CONFIG_VIDEO_RENESAS_FCP is not set +# CONFIG_VIDEO_RENESAS_VSP1 is not set +# CONFIG_VIDEO_QCOM_VENUS is not set +# CONFIG_VIDEO_RCAR_DRIF is not set +CONFIG_VIDEO_OV5640=y +CONFIG_DRM=y +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +# CONFIG_DRM_NOUVEAU is not set +# CONFIG_DRM_EXYNOS is not set +# CONFIG_DRM_EXYNOS5433_DECON is not set +# CONFIG_DRM_EXYNOS7_DECON is not set +# CONFIG_DRM_EXYNOS_DSI is not set +# CONFIG_DRM_EXYNOS_DP is not set +# CONFIG_DRM_EXYNOS_HDMI is not set +# CONFIG_DRM_EXYNOS_MIC is not set +# CONFIG_DRM_ROCKCHIP is not set +# CONFIG_ROCKCHIP_ANALOGIX_DP is not set +# CONFIG_ROCKCHIP_CDN_DP is not set +# CONFIG_ROCKCHIP_DW_HDMI is not set +# CONFIG_ROCKCHIP_DW_MIPI_DSI is not set +# CONFIG_ROCKCHIP_INNO_HDMI is not set +# CONFIG_ROCKCHIP_LVDS is not set +# CONFIG_DRM_RCAR_DU is not set +# CONFIG_DRM_RCAR_MIPI_DSI is not set +# CONFIG_DRM_SUN4I is not set +# CONFIG_DRM_SUN6I_DSI is not set +# CONFIG_DRM_SUN8I_DW_HDMI is not set +# CONFIG_DRM_SUN8I_MIXER is not set +# CONFIG_DRM_MSM is not set +# CONFIG_DRM_TEGRA is not set +# CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set +# CONFIG_DRM_PANEL_LVDS is not set +# CONFIG_DRM_PANEL_SIMPLE is not set +# CONFIG_DRM_PANEL_EDP is not set +# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set +CONFIG_DRM_DISPLAY_CONNECTOR=m +# CONFIG_DRM_LONTIUM_LT8912B is not set +CONFIG_DRM_NWL_MIPI_DSI=y +# CONFIG_DRM_LONTIUM_LT9611UXC is not set +# CONFIG_DRM_PARADE_PS8640 is not set +CONFIG_DRM_I2C_ADV7511=y +CONFIG_DRM_DW_HDMI_I2S_AUDIO=m +CONFIG_DRM_IMX_DCSS=y +# CONFIG_DRM_VC4 is not set +# CONFIG_DRM_HISI_HIBMC is not set +CONFIG_DRM_MXSFB=y +# CONFIG_DRM_MEDIATEK is not set +# CONFIG_DRM_MEDIATEK_HDMI is not set +# CONFIG_DRM_MESON is not set +CONFIG_DRM_LEGACY=y +# CONFIG_FB is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_EFI is not set +# CONFIG_BACKLIGHT_PWM is not set +# CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_LOGO is not set +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_ALOOP=m +# CONFIG_SND_SPI is not set +# CONFIG_SND_USB is not set +# CONFIG_SND_HDA_TEGRA is not set +# CONFIG_SND_HDA_CODEC_HDMI is not set +CONFIG_SND_SOC_FSL_ASRC=y +CONFIG_SND_SOC_FSL_EASRC=y +CONFIG_SND_IMX_SOC=y +CONFIG_SND_SOC_FSL_ASOC_CARD=y +CONFIG_SND_SOC_SOF_TOPLEVEL=y +CONFIG_SND_SOC_SOF_OF=m +CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y +CONFIG_SND_SOC_AK4458=y +CONFIG_SND_SOC_AK5558=y +CONFIG_SND_SOC_PCM512x_I2C=y +CONFIG_SND_SIMPLE_CARD=y +CONFIG_SND_AUDIO_GRAPH_CARD=y +CONFIG_USB_CONN_GPIO=y +# CONFIG_SND_BCM2835_SOC_I2S is not set +# CONFIG_SND_SOC_FSL_MICFIL is not set +# CONFIG_SND_SOC_IMX_SGTL5000 is not set +# CONFIG_SND_SOC_IMX_SPDIF is not set +# CONFIG_SND_SOC_IMX_AUDMIX is not set +# CONFIG_SND_MESON_AXG_SOUND_CARD is not set +# CONFIG_SND_MESON_GX_SOUND_CARD is not set +# CONFIG_SND_SOC_QCOM is not set +# CONFIG_SND_SOC_APQ8016_SBC is not set +# CONFIG_SND_SOC_MSM8996 is not set +# CONFIG_SND_SOC_SDM845 is not set +# CONFIG_SND_SOC_SM8250 is not set +# CONFIG_SND_SOC_ROCKCHIP is not set +# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set +# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set +# CONFIG_SND_SOC_RK3399_GRU_SOUND is not set +# CONFIG_SND_SOC_SAMSUNG is not set +# CONFIG_SND_SOC_RCAR is not set +# CONFIG_SND_SOC_RZ is not set +# CONFIG_SND_SUN4I_I2S is not set +# CONFIG_SND_SUN4I_SPDIF is not set +# CONFIG_SND_SOC_TEGRA is not set +# CONFIG_SND_SOC_TEGRA210_AHUB is not set +# CONFIG_SND_SOC_TEGRA210_DMIC is not set +# CONFIG_SND_SOC_TEGRA210_I2S is not set +# CONFIG_SND_SOC_TEGRA186_DSPK is not set +# CONFIG_SND_SOC_TEGRA210_ADMAIF is not set +# CONFIG_SND_SOC_TEGRA210_MVC is not set +# CONFIG_SND_SOC_TEGRA210_SFC is not set +# CONFIG_SND_SOC_TEGRA210_AMX is not set +# CONFIG_SND_SOC_TEGRA210_ADX is not set +# CONFIG_SND_SOC_TEGRA210_MIXER is not set +# CONFIG_SND_SOC_TEGRA_AUDIO_GRAPH_CARD is not set +# CONFIG_SND_SOC_AK4613 is not set +# CONFIG_SND_SOC_ES7134 is not set +# CONFIG_SND_SOC_ES7241 is not set +# CONFIG_SND_SOC_GTM601 is not set +# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set +# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_PCM3168A_I2C is not set +# CONFIG_SND_SOC_RT5659 is not set +# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set +# CONFIG_SND_SOC_SIMPLE_MUX is not set +# CONFIG_SND_SOC_TAS571X is not set +# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set +# CONFIG_SND_SOC_WCD934X is not set +# CONFIG_SND_SOC_WM8904 is not set +# CONFIG_SND_SOC_WM8960 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_WSA881X is not set +# CONFIG_SND_SOC_NAU8822 is not set +# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set +# CONFIG_SND_SOC_LPASS_VA_MACRO is not set +# CONFIG_SND_AUDIO_GRAPH_CARD2 is not set +# CONFIG_HID_MULTITOUCH is not set +# CONFIG_I2C_HID_ACPI is not set +# CONFIG_I2C_HID_OF is not set +# CONFIG_USB_XHCI_PCI_RENESAS is not set +# CONFIG_USB_XHCI_TEGRA is not set +# CONFIG_USB_EHCI_EXYNOS is not set +# CONFIG_USB_OHCI_EXYNOS is not set +CONFIG_USB_HCD_TEST_MODE=y +# CONFIG_USB_RENESAS_USBHS_HCD is not set +# CONFIG_USB_RENESAS_USBHS is not set +CONFIG_USB_UAS=y +# CONFIG_USB_CDNS_SUPPORT is not set +# CONFIG_USB_CDNS3 is not set +# CONFIG_USB_CDNS3_GADGET is not set +# CONFIG_USB_CDNS3_HOST is not set +# CONFIG_USB_MTU3 is not set +# CONFIG_USB_MUSB_SUNXI is not set +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=y +CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_TEST=m +CONFIG_USB_EHSET_TEST_FIXTURE=y +# CONFIG_USB_SERIAL_CP210X is not set +# CONFIG_USB_SERIAL_OPTION is not set +CONFIG_USB_MXS_PHY=y +CONFIG_USB_ULPI=y +CONFIG_USB_SNP_UDC_PLAT=y +CONFIG_USB_BDC_UDC=y +CONFIG_USB_CONFIGFS=y +# CONFIG_USB_RENESAS_USBHS_UDC is not set +# CONFIG_USB_RENESAS_USB3 is not set +# CONFIG_USB_TEGRA_XUDC is not set +CONFIG_USB_CONFIGFS_F_LB_SS=y +CONFIG_USB_CONFIGFS_F_UAC1=y +CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y +CONFIG_USB_CONFIGFS_F_UAC2=y +CONFIG_USB_CONFIGFS_F_MIDI=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_USB_CONFIGFS_F_UVC=y +CONFIG_USB_ZERO=m +CONFIG_USB_AUDIO=m +CONFIG_USB_ETH=m +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_SERIAL=m +CONFIG_TYPEC=y +CONFIG_TYPEC_TCPM=y +CONFIG_TYPEC_TCPCI=y +# CONFIG_TYPEC_TPS6598X is not set +# CONFIG_MMC_SDHCI_ACPI is not set +# CONFIG_MMC_SDHCI_TEGRA is not set +# CONFIG_MMC_MESON_GX is not set +# CONFIG_MMC_SDHCI_MSM is not set +# CONFIG_MMC_SDHI is not set +# CONFIG_MMC_UNIPHIER is not set +# CONFIG_MMC_DW_ROCKCHIP is not set +# CONFIG_MMC_SUNXI is not set +# CONFIG_MMC_BCM2835 is not set +# CONFIG_MMC_MTK is not set +# CONFIG_MMC_OWL is not set +# CONFIG_LEDS_LM3692X is not set +# CONFIG_LEDS_PCA9532 is not set +# CONFIG_EDAC_LAYERSCAPE is not set +# CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_PCF85063 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_RV3028 is not set +# CONFIG_RTC_DRV_FSL_FTM_ALARM is not set +# CONFIG_RTC_DRV_S3C is not set +CONFIG_RTC_DRV_SNVS=y +CONFIG_RTC_DRV_IMX_SC=y +# CONFIG_RTC_DRV_SUN6I is not set +# CONFIG_RTC_DRV_ARMADA38X is not set +# CONFIG_RTC_DRV_PM8XXX is not set +# CONFIG_RTC_DRV_TEGRA is not set +# CONFIG_RTC_DRV_XGENE is not set +# CONFIG_RTC_DRV_MT6397 is not set +CONFIG_BCM_SBA_RAID=m +# CONFIG_DMA_BCM2835 is not set +# CONFIG_DMA_SUN6I is not set +CONFIG_FSL_QDMA=m +CONFIG_IMX_SDMA=y +# CONFIG_K3_DMA is not set +# CONFIG_MV_XOR is not set +CONFIG_MXS_DMA=y +# CONFIG_OWL_DMA is not set +# CONFIG_TEGRA186_GPC_DMA is not set +# CONFIG_TEGRA20_APB_DMA is not set +# CONFIG_TEGRA210_ADMA is not set +# CONFIG_QCOM_BAM_DMA is not set +CONFIG_DMATEST=y +CONFIG_DMABUF_HEAPS=y +CONFIG_DMABUF_HEAPS_SYSTEM=y +CONFIG_DMABUF_HEAPS_CMA=y +# CONFIG_RCAR_DMAC is not set +# CONFIG_RENESAS_USB_DMAC is not set +# CONFIG_RZ_DMAC is not set +# CONFIG_TI_K3_UDMA is not set +# CONFIG_TI_K3_UDMA_GLUE_LAYER is not set +# CONFIG_VFIO_PCI is not set +# CONFIG_VIRTIO_PCI is not set +# CONFIG_XEN_GNTDEV is not set +# CONFIG_XEN_GRANT_DEV_ALLOC is not set +# CONFIG_VIDEO_HANTRO is not set +# CONFIG_VIDEO_IMX_MEDIA is not set +# CONFIG_COMMON_CLK_SCMI is not set +# CONFIG_COMMON_CLK_FSL_SAI is not set +CONFIG_COMMON_CLK_XGENE=y +# CONFIG_COMMON_CLK_BD718XX is not set +# CONFIG_CLK_RASPBERRYPI is not set +# CONFIG_CLK_IMX8MM is not set +# CONFIG_CLK_IMX8MP is not set +# CONFIG_CLK_IMX8MQ is not set +# CONFIG_CLK_IMX8QXP is not set +# CONFIG_CLK_IMX8ULP is not set +# CONFIG_TI_SCI_CLK is not set +# CONFIG_COMMON_CLK_QCOM is not set +# CONFIG_QCOM_A53PLL is not set +# CONFIG_QCOM_CLK_APCS_MSM8916 is not set +# CONFIG_QCOM_CLK_APCC_MSM8996 is not set +# CONFIG_QCOM_CLK_SMD_RPM is not set +# CONFIG_QCOM_CLK_RPMH is not set +# CONFIG_IPQ_GCC_6018 is not set +# CONFIG_IPQ_GCC_8074 is not set +# CONFIG_MSM_GCC_8916 is not set +# CONFIG_MSM_GCC_8994 is not set +# CONFIG_MSM_MMCC_8996 is not set +# CONFIG_MSM_GCC_8998 is not set +# CONFIG_QCS_GCC_404 is not set +# CONFIG_SC_GCC_7180 is not set +# CONFIG_SC_GCC_7280 is not set +# CONFIG_SDM_CAMCC_845 is not set +# CONFIG_SDM_GPUCC_845 is not set +# CONFIG_SDM_VIDEOCC_845 is not set +# CONFIG_SDM_DISPCC_845 is not set +# CONFIG_SM_GCC_8350 is not set +# CONFIG_SM_GCC_8450 is not set +# CONFIG_SM_GPUCC_8150 is not set +# CONFIG_SM_GPUCC_8250 is not set +# CONFIG_QCOM_HFPLL is not set +# CONFIG_CLK_GFM_LPASS_SM8250 is not set +# CONFIG_CLK_RCAR_USB2_CLOCK_SEL is not set +# CONFIG_HWSPINLOCK_QCOM is not set +# CONFIG_RENESAS_OSTM is not set +# CONFIG_BCM2835_MBOX is not set +# CONFIG_QCOM_APCS_IPC is not set +# CONFIG_QCOM_IPCC is not set +# CONFIG_ROCKCHIP_IOMMU is not set +# CONFIG_TEGRA_IOMMU_SMMU is not set +# CONFIG_MTK_IOMMU is not set +# CONFIG_QCOM_IOMMU is not set +CONFIG_IMX_REMOTEPROC=y +CONFIG_IMX_DSP_REMOTEPROC=y +CONFIG_RPMSG_CHAR=y +# CONFIG_QCOM_Q6V5_MSS is not set +# CONFIG_QCOM_Q6V5_PAS is not set +# CONFIG_QCOM_SYSMON is not set +# CONFIG_QCOM_WCNSS_PIL is not set +# CONFIG_RPMSG_QCOM_GLINK_SMEM is not set +# CONFIG_RPMSG_QCOM_SMD is not set +CONFIG_SOC_BRCMSTB=y +# CONFIG_OWL_PM_DOMAINS is not set +# CONFIG_RASPBERRYPI_POWER is not set +# CONFIG_FSL_DPAA is not set +# CONFIG_FSL_MC_DPIO is not set +CONFIG_SOC_TI=y +# CONFIG_MTK_DEVAPC is not set +# CONFIG_MTK_PMIC_WRAP is not set +# CONFIG_QCOM_AOSS_QMP is not set +# CONFIG_QCOM_COMMAND_DB is not set +# CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_GENI_SE is not set +# CONFIG_QCOM_RMTFS_MEM is not set +# CONFIG_QCOM_RPMH is not set +# CONFIG_QCOM_RPMHPD is not set +# CONFIG_QCOM_RPMPD is not set +# CONFIG_QCOM_SMEM is not set +# CONFIG_QCOM_SMD_RPM is not set +# CONFIG_QCOM_SMP2P is not set +# CONFIG_QCOM_SMSM is not set +# CONFIG_QCOM_SOCINFO is not set +# CONFIG_QCOM_STATS is not set +# CONFIG_QCOM_WCNSS_CTRL is not set +# CONFIG_QCOM_APR is not set +# CONFIG_ARCH_R8A77995 is not set +# CONFIG_ARCH_R8A77990 is not set +# CONFIG_ARCH_R8A77950 is not set +# CONFIG_ARCH_R8A77951 is not set +# CONFIG_ARCH_R8A77965 is not set +# CONFIG_ARCH_R8A77960 is not set +# CONFIG_ARCH_R8A77961 is not set +# CONFIG_ARCH_R8A779F0 is not set +# CONFIG_ARCH_R8A77980 is not set +# CONFIG_ARCH_R8A77970 is not set +# CONFIG_ARCH_R8A779A0 is not set +# CONFIG_ARCH_R8A774C0 is not set +# CONFIG_ARCH_R8A774E1 is not set +# CONFIG_ARCH_R8A774A1 is not set +# CONFIG_ARCH_R8A774B1 is not set +# CONFIG_ARCH_R9A07G044 is not set +# CONFIG_ROCKCHIP_IODOMAIN is not set +# CONFIG_ROCKCHIP_PM_DOMAINS is not set +# CONFIG_ARCH_TEGRA_132_SOC is not set +# CONFIG_ARCH_TEGRA_210_SOC is not set +# CONFIG_ARCH_TEGRA_186_SOC is not set +# CONFIG_ARCH_TEGRA_194_SOC is not set +# CONFIG_ARCH_TEGRA_234_SOC is not set +# CONFIG_TI_SCI_PM_DOMAINS is not set +# CONFIG_ARM_IMX_BUS_DEVFREQ is not set +# CONFIG_ARM_IMX8M_DDRC_DEVFREQ is not set +CONFIG_MEMORY=y +# CONFIG_RENESAS_RPCIF is not set +CONFIG_IMX8QXP_ADC=y +# CONFIG_EXYNOS_ADC is not set +# CONFIG_QCOM_SPMI_VADC is not set +# CONFIG_QCOM_SPMI_ADC5 is not set +# CONFIG_ROCKCHIP_SARADC is not set +# CONFIG_RZG2L_ADC is not set +# CONFIG_TI_ADS1015 is not set +CONFIG_IIO_ST_LSM6DSX=y +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_VCNL4000 is not set +# CONFIG_IIO_ST_MAGN_3AXIS is not set +# CONFIG_MPL3115 is not set +# CONFIG_PWM_BCM2835 is not set +# CONFIG_PWM_BRCMSTB is not set +CONFIG_PWM_FSL_FTM=m +CONFIG_PWM_IMX27=y +# CONFIG_PWM_MESON is not set +# CONFIG_PWM_MTK_DISP is not set +# CONFIG_PWM_MEDIATEK is not set +# CONFIG_PWM_RCAR is not set +# CONFIG_PWM_RENESAS_TPU is not set +# CONFIG_PWM_ROCKCHIP is not set +# CONFIG_PWM_SAMSUNG is not set +# CONFIG_PWM_SL28CPLD is not set +# CONFIG_PWM_SUN4I is not set +# CONFIG_PWM_TEGRA is not set +# CONFIG_PWM_VISCONTI is not set +# CONFIG_SL28CPLD_INTC is not set +# CONFIG_QCOM_PDC is not set +# CONFIG_RESET_QCOM_AOSS is not set +# CONFIG_RESET_QCOM_PDC is not set +# CONFIG_RESET_RZG2L_USBPHY_CTRL is not set +# CONFIG_RESET_TI_SCI is not set +CONFIG_PHY_CADENCE_SALVO=y +CONFIG_PHY_MIXEL_MIPI_DPHY=y +# CONFIG_PHY_SUN4I_USB is not set +# CONFIG_PHY_CADENCE_SIERRA is not set +# CONFIG_PHY_FSL_IMX8M_PCIE is not set +# CONFIG_PHY_HI6220_USB is not set +# CONFIG_PHY_HISTB_COMBPHY is not set +# CONFIG_PHY_HISI_INNO_USB2 is not set +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set +# CONFIG_PHY_MTK_TPHY is not set +# CONFIG_PHY_QCOM_QMP is not set +# CONFIG_PHY_QCOM_QUSB2 is not set +CONFIG_PHY_SAMSUNG_USB2=y +# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set +# CONFIG_PHY_RCAR_GEN3_PCIE is not set +# CONFIG_PHY_RCAR_GEN3_USB2 is not set +# CONFIG_PHY_RCAR_GEN3_USB3 is not set +# CONFIG_PHY_ROCKCHIP_EMMC is not set +# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set +# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set +# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set +# CONFIG_PHY_ROCKCHIP_PCIE is not set +# CONFIG_PHY_ROCKCHIP_TYPEC is not set +# CONFIG_PHY_SAMSUNG_UFS is not set +# CONFIG_PHY_UNIPHIER_USB2 is not set +# CONFIG_PHY_UNIPHIER_USB3 is not set +# CONFIG_PHY_TEGRA_XUSB is not set +# CONFIG_PHY_AM654_SERDES is not set +# CONFIG_PHY_J721E_WIZ is not set +CONFIG_FSL_IMX8_DDR_PMU=y +# CONFIG_QCOM_L2_PMU is not set +# CONFIG_QCOM_L3_PMU is not set +# CONFIG_MTK_EFUSE is not set +# CONFIG_QCOM_QFPROM is not set +# CONFIG_ROCKCHIP_EFUSE is not set +# CONFIG_NVMEM_SUNXI_SID is not set +# CONFIG_UNIPHIER_EFUSE is not set +# CONFIG_MESON_EFUSE is not set +# CONFIG_NVMEM_RMEM is not set +# CONFIG_NVMEM_LAYERSCAPE_SFP is not set +# CONFIG_FPGA_MGR_ALTERA_CVP is not set +# CONFIG_FPGA_MGR_STRATIX10_SOC is not set +# CONFIG_SLIMBUS is not set +# CONFIG_SLIM_QCOM_NGD_CTRL is not set +# CONFIG_INTERCONNECT_IMX is not set +# CONFIG_INTERCONNECT_IMX8MM is not set +# CONFIG_INTERCONNECT_IMX8MN is not set +# CONFIG_INTERCONNECT_IMX8MQ is not set +# CONFIG_INTERCONNECT_QCOM is not set +# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set +# CONFIG_INTERCONNECT_QCOM_OSM_L3 is not set +# CONFIG_INTERCONNECT_QCOM_SC7280 is not set +# CONFIG_INTERCONNECT_QCOM_SDM845 is not set +# CONFIG_INTERCONNECT_QCOM_SM8150 is not set +# CONFIG_INTERCONNECT_QCOM_SM8250 is not set +# CONFIG_INTERCONNECT_QCOM_SM8350 is not set +# CONFIG_INTERCONNECT_QCOM_SM8450 is not set +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_UBIFS_FS=y +CONFIG_SQUASHFS_XZ=y +CONFIG_CRYPTO_USER=y +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_DH=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_CFB=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_OFB=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_STREEBOG=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_AEAD=m +# CONFIG_CRYPTO_DEV_SUN8I_CE is not set +# CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM is not set +# CONFIG_CRYPTO_DEV_QCOM_RNG is not set +CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m +CONFIG_INDIRECT_PIO=y +CONFIG_CRC_CCITT=m +# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set +# CONFIG_CRYPTO_DEV_HISI_ZIP is not set +# CONFIG_CRYPTO_DEV_HISI_HPRE is not set +# CONFIG_CRYPTO_DEV_HISI_TRNG is not set +CONFIG_IRQ_POLL=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_INFO_REDUCED is not set +CONFIG_CORESIGHT=y +CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y +CONFIG_CORESIGHT_SOURCE_ETM4X=y diff --git a/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst b/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst new file mode 100644 index 0000000000..c01d2d6c1d --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst @@ -0,0 +1,29 @@ +# @_flash.bin | bootloader +# @_image [_flash.bin] | image burn to nand, default is the same as bootloader +# @_filesystem | filesystem to burn +# @_kernel | kernel image +# @_dtb | dtb image + +# This command will be run when ROM support stream mode +# i.MX8QXP, i.MX8QM +SDPS: boot -f _flash.bin + +FB: ucmd setenv fastboot_buffer ${loadaddr} +FB: download -f _image +# Burn image to nandfit partition if needed +FB: ucmd if env exists nandfit_part; then nand erase.part nandfit; nand write ${fastboot_buffer} nandfit ${filesize}; else true; fi; +FB: ucmd nandbcb init ${fastboot_buffer} nandboot ${filesize} + +FB[-t 10000]: ucmd ubi part nandrootfs +FB[-t 10000]: ucmd ubi create root - +FB: download -f _filesystem +FB[-t 60000]: ucmd ubi write ${loadaddr} root ${filesize} + +FB: download -f _kernel +FB[-t 10000]: ucmd nand write ${loadaddr} nandkernel ${filesize} + +FB: download -f _dtb +FB[-t 8000]: ucmd nand write ${loadaddr} nanddtb ${filesize} + +FB: reboot +FB: done diff --git a/board/bsh/imx8mn-bsh-smm-s2/patches/uboot/0001-include-configs-Remove-rootwait-1-to-all-the-affecte.patch b/board/bsh/imx8mn-bsh-smm-s2/patches/uboot/0001-include-configs-Remove-rootwait-1-to-all-the-affecte.patch new file mode 100644 index 0000000000..59db559b93 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/patches/uboot/0001-include-configs-Remove-rootwait-1-to-all-the-affecte.patch @@ -0,0 +1,160 @@ +From 3878b941c6bde84e29b2725e4261d85bea828752 Mon Sep 17 00:00:00 2001 +From: Michael Trimarchi +Date: Sun, 22 May 2022 15:22:08 +0200 +Subject: [PATCH] include/configs: Remove rootwait=1 to all the affected boards + +rootwait=1 is not a valid kernel boot parameters. According +to the documenation is only rootwait + +rootwait [KNL] Wait (indefinitely) for root device to show up. + Useful for devices that are detected asynchronously + (e.g. USB and MMC devices). + +Fix: +Unknown kernel command line parameters "rootwait=1", will be passed to user space. + +Signed-off-by: Michael Trimarchi +Reviewed-by: Heiko Schocher +Link: https://patchwork.ozlabs.org/project/uboot/patch/20220520110013.32811-1-michael at amarulasolutions.com/ +Signed-off-by: Dario Binacchi +--- + include/configs/am335x_evm.h | 2 +- + include/configs/am43xx_evm.h | 2 +- + include/configs/baltos.h | 2 +- + include/configs/chiliboard.h | 2 +- + include/configs/etamin.h | 2 +- + include/configs/imx8mn_bsh_smm_s2.h | 2 +- + include/configs/siemens-am33x-common.h | 4 ++-- + include/configs/ti_armv7_keystone2.h | 2 +- + include/environment/ti/nand.h | 2 +- + 9 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h +index fd5b209a52db..f301a6dc835b 100644 +--- a/include/configs/am335x_evm.h ++++ b/include/configs/am335x_evm.h +@@ -34,7 +34,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ +diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h +index 5057441f7506..1f5c3cd04e88 100644 +--- a/include/configs/am43xx_evm.h ++++ b/include/configs/am43xx_evm.h +@@ -166,7 +166,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,4096\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ +diff --git a/include/configs/baltos.h b/include/configs/baltos.h +index b881d8c03fd7..7b43741fde7c 100644 +--- a/include/configs/baltos.h ++++ b/include/configs/baltos.h +@@ -37,7 +37,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=5\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "setenv loadaddr 0x84000000; " \ +diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h +index 82acda595f09..8bad0f9ac4b6 100644 +--- a/include/configs/chiliboard.h ++++ b/include/configs/chiliboard.h +@@ -20,7 +20,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdt_addr} NAND.u-boot-spl-os; " \ +diff --git a/include/configs/etamin.h b/include/configs/etamin.h +index 9cf93924df93..1c0a86d1ed10 100644 +--- a/include/configs/etamin.h ++++ b/include/configs/etamin.h +@@ -113,7 +113,7 @@ + "nand_active_ubi_vol=rootfs_a\0" \ + "rootfs_name=rootfs\0" \ + "kernel_name=uImage\0"\ +- "nand_root_fs_type=ubifs rootwait=1\0" \ ++ "nand_root_fs_type=ubifs rootwait\0" \ + "nand_args=run bootargs_defaults;" \ + "mtdparts default;" \ + "setenv ${partitionset_active} true;" \ +diff --git a/include/configs/imx8mn_bsh_smm_s2.h b/include/configs/imx8mn_bsh_smm_s2.h +index d09c2ab01610..0dc514f00684 100644 +--- a/include/configs/imx8mn_bsh_smm_s2.h ++++ b/include/configs/imx8mn_bsh_smm_s2.h +@@ -22,7 +22,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:root rw ubi.mtd=nandrootfs\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdt_addr_r} nanddtb; " \ +diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h +index 08c4d52d658f..9f1a6cd51b40 100644 +--- a/include/configs/siemens-am33x-common.h ++++ b/include/configs/siemens-am33x-common.h +@@ -237,7 +237,7 @@ + "nand_active_ubi_vol=rootfs_a\0" \ + "nand_active_ubi_vol_A=rootfs_a\0" \ + "nand_active_ubi_vol_B=rootfs_b\0" \ +- "nand_root_fs_type=ubifs rootwait=1\0" \ ++ "nand_root_fs_type=ubifs rootwait\0" \ + "nand_src_addr=0x280000\0" \ + "nand_src_addr_A=0x280000\0" \ + "nand_src_addr_B=0x780000\0" \ +@@ -314,7 +314,7 @@ + "nand_active_ubi_vol=rootfs_a\0" \ + "rootfs_name=rootfs\0" \ + "kernel_name=uImage\0"\ +- "nand_root_fs_type=ubifs rootwait=1\0" \ ++ "nand_root_fs_type=ubifs rootwait\0" \ + "nand_args=run bootargs_defaults;" \ + "mtdparts default;" \ + "setenv ${partitionset_active} true;" \ +diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h +index 57f013cbf846..133daecf7164 100644 +--- a/include/configs/ti_armv7_keystone2.h ++++ b/include/configs/ti_armv7_keystone2.h +@@ -180,7 +180,7 @@ + "sf write ${loadaddr} 0 ${filesize}\0" \ + "burn_uboot_nand=nand erase 0 0x100000; " \ + "nand write ${loadaddr} 0 ${filesize}\0" \ +- "args_all=setenv bootargs console=ttyS0,115200n8 rootwait=1 " \ ++ "args_all=setenv bootargs console=ttyS0,115200n8 rootwait " \ + KERNEL_MTD_PARTS \ + "args_net=setenv bootargs ${bootargs} rootfstype=nfs " \ + "root=/dev/nfs rw nfsroot=${serverip}:${nfs_root}," \ +diff --git a/include/environment/ti/nand.h b/include/environment/ti/nand.h +index 11dcefcc41ca..7d00afa2b10f 100644 +--- a/include/environment/ti/nand.h ++++ b/include/environment/ti/nand.h +@@ -14,7 +14,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ +-- +2.32.0 + diff --git a/board/bsh/imx8mn-bsh-smm-s2/post-build.sh b/board/bsh/imx8mn-bsh-smm-s2/post-build.sh new file mode 100755 index 0000000000..49df4cd6fb --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +cp ${BOARD_DIR}/nand-full.lst ${BINARIES_DIR} diff --git a/board/bsh/imx8mn-bsh-smm-s2/readme.txt b/board/bsh/imx8mn-bsh-smm-s2/readme.txt new file mode 100644 index 0000000000..37081091e8 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/readme.txt @@ -0,0 +1,75 @@ +i.MX8MN BSH SMM S2 +================== + +This tutorial describes how to use the predefined Buildroot +configuration for the i.MX8MN BSH SMM S2 PRO board. + +Building +-------- + +Configure buildroot: + + $ make imx8mn_bsh_smm_s2_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +------------------- + +After building, the output/images directory contains: + + output/images/ + ????????? bl31.bin + ????????? ddr3* + ????????? flash.bin + ????????? freescale/imx8mn-bsh-smm-s2.dtb + ????????? Image + ????????? nand-full.lst + ????????? rootfs.ext2 + ????????? rootfs.ext4 -> rootfs.ext2 + ????????? rootfs.tar + ????????? rootfs.ubifs + ????????? u-boot.bin + ????????? u-boot-spl.bin + + +Preparing the board +------------------- + +Plug the USB type A to micro B cable into the USB Debug +Connector (DBG UART). Use serial port settings 115200 8N1 +to access the debug console. + +Plug another USB type A to micro B cable into the USB-OTG +Connector (USB1). This connection is used to flash the board +firmware using the Freescale/NXP UUU tool. + +Connect the power supply/adaptor to the DC Power Jack (labelled ++5V). + + +Flashing +-------- + +Power up the board by switching on the Power ON Switch, which is +placed right next to the DC Jack. + +Enter the following U-Boot commands on the debug serial console: + + $ nand erase.chip + $ reset + +Flash the built images directly to board???s memory. On your computer, +run: + + $ board/bsh/imx8mn-bsh-smm-s2/flash.sh output/ + +It will flash the bootloader, the Device Tree Blob, the kernel image +and the UBI root file system. diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig new file mode 100644 index 0000000000..4b03d2e89e --- /dev/null +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GLOBAL_PATCH_DIR="board/bsh/imx8mn-bsh-smm-s2/patches" +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2/post-build.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.6" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/imx8mn-bsh-smm-s2/linux.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y +BR2_TARGET_ROOTFS_UBIFS=y +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 +BR2_TARGET_ROOTFS_UBIFS_RT_NONE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_UUU=y From peter at korsgaard.com Mon Feb 20 21:02:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:57 -0000 Subject: [Buildroot] [git commit branch/next] package/containerd: bump to version 1.6.16 Message-ID: <20230220205244.EAB6881979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7ea83dd2df315ba4f492a9ef6b24152ba4cc4f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bugfixes and improvements. We now install the containerd.service systemd unit. https://github.com/containerd/containerd/releases/tag/v1.6.16 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 04a29949d7..16474089d1 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 b86e5c42f58b8348422c972513ff49783c0d505ed84e498d0d0245c5992e4320 containerd-1.6.12.tar.gz +sha256 e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a containerd-1.6.16.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 192175800c..4a0d6ec38b 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.12 +CONTAINERD_VERSION = 1.6.16 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE @@ -41,4 +41,10 @@ else CONTAINERD_TAGS += no_btrfs endif +define CONTAINERD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/containerd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/containerd.service + $(SED) 's,/usr/local/bin,/usr/bin,g' $(TARGET_DIR)/usr/lib/systemd/system/containerd.service +endef + $(eval $(golang-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:02:58 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:02:58 -0000 Subject: [Buildroot] [git commit branch/next] package/openvpn: get rid of -e in S60openvpn shebang Message-ID: <20230220205245.361D781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=28ca1da23433d58112304c191c319ac11edc5d77 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The -e switch makes the script terminate on error from start-stop-daemon, rendering unreachable the code that checks the exit status. There is no need in the -e switch in the first place either, as the script takes care of errors handling. Signed-off-by: Sergey Organov Signed-off-by: Yann E. MORIN --- package/openvpn/S60openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn index f097cf11ec..00156c80db 100644 --- a/package/openvpn/S60openvpn +++ b/package/openvpn/S60openvpn @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # # Original version by Robert Leslie # , edited by iwj and cs From peter at korsgaard.com Mon Feb 20 21:02:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:02:59 -0000 Subject: [Buildroot] [git commit branch/next] package/iwd: bump to version 2.2 Message-ID: <20230220205245.27FAA828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13de1138f89909890e945b6e433e64ebbaab01ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 e7971cd637..be048b3da6 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 9fd13512dc27d83efb8d341f7df98f5488f70131686021fcd0d93fc97af013b8 iwd-1.30.tar.xz +sha256 dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570 iwd-2.2.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 5ffbde334e..b0a2f6e9ed 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.30 +IWD_VERSION = 2.2 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Mon Feb 20 21:03:00 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:03:00 -0000 Subject: [Buildroot] [git commit branch/next] package/webkitgtk: security bump to version 2.38.4 Message-ID: <20230220205245.02B73828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca203080d132d44fc0b62148066b85cce66628fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://webkitgtk.org/2023/02/02/webkitgtk2.38.4-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index eff7f5c18f..34fd19d3de 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums -md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz -sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz -sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums +md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz +sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz +sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b1bca7b88a..b42ac3b644 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.3 +WEBKITGTK_VERSION = 2.38.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Wed Feb 8 12:43:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:43:19 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6/qt6base: use DESTDIR instead of --prefix for installation Message-ID: <20230220205255.DD26081979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfb5035c6fae1285ff0100275083fabc2b9816c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Even though it works, overriding --prefix at installation time is a bit weird. In order to be more consistent with what is done with other build systems, use DESTDIR instead at installation time. Note that $(DESTDIR) comes in addition to the -DCMAKE_INSTALL_PREFIX=/usr that is passed at configure time, so with this commit, the files continue to be installed in $(STAGING_DIR)/usr and $(TARGET_DIR)/usr as they should be. Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 7b57eba4ab..212b2d689e 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -79,11 +79,11 @@ define QT6BASE_BUILD_CMDS endef define QT6BASE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) --prefix $(STAGING_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) endef define QT6BASE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) --prefix $(TARGET_DIR)/usr + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) endef HOST_QT6BASE_DEPENDENCIES = \ From thomas.petazzoni at bootlin.com Wed Feb 8 12:23:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:23:49 +0100 Subject: [Buildroot] [git commit branch/next] package/zxing-cpp: bump to version 1.4.0 Message-ID: <20230220205255.B07A881979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=456a7398316655ad0b669635f580e4887c24a700 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patches which are no longer required. Verified license remains Apache-2.0 after hash change. Rework config options for 1.4.0. Add new host-pkgconf and stb build dependency. Drop optional libiconv dependency which is no longer used. Add optional python module support. Add optional qt5 support. Add optional opencv4 support. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...ke-libs-private-not-exported-to-the-users.patch | 43 ------------------- ...02-CMakeLists-txt-add-BUILD_OPENCV-option.patch | 39 ------------------ package/zxing-cpp/Config.in | 2 + package/zxing-cpp/zxing-cpp.hash | 4 +- package/zxing-cpp/zxing-cpp.mk | 48 +++++++++++++++++----- 5 files changed, 42 insertions(+), 94 deletions(-) diff --git a/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch b/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch deleted file mode 100644 index 90b2320384..0000000000 --- a/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9e5dfa57f3b998bc3049bfa893b20e81dea656df Mon Sep 17 00:00:00 2001 -From: Yuri -Date: Sat, 20 Apr 2019 07:28:26 -0700 -Subject: [PATCH] Link library with OpenCV, not only the executable, make libs - PRIVATE. - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/86] ---- - CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 738f4e1..efe3aee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,10 +60,12 @@ include_directories(core/src) - add_library(libzxing ${LIBZXING_FILES}) - set_target_properties(libzxing PROPERTIES PREFIX "") - -+set(libzxing_LIBS "") -+ - find_package(Iconv) - if(ICONV_FOUND) - include_directories(${ICONV_INCLUDE_DIR}) -- target_link_libraries(libzxing ${ICONV_LIBRARIES}) -+ set(libzxing_LIBS ${libzxing_LIBS} ${ICONV_LIBRARIES}) - else() - add_definitions(-DNO_ICONV=1) - endif() -@@ -75,9 +77,12 @@ if(OpenCV_FOUND) - "./opencv-cli/src/*.h" - ) - add_executable(zxing-cv ${OPENCV_ZXING_FILES}) -+ set(libzxing_LIBS ${libzxing_LIBS} ${OpenCV_LIBRARIES}) - target_link_libraries(zxing-cv libzxing ${OpenCV_LIBRARIES}) - endif() - -+target_link_libraries(libzxing PRIVATE ${libzxing_LIBS}) -+ - # Add cli executable. - file(GLOB_RECURSE ZXING_FILES - "./cli/src/*.cpp" diff --git a/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch b/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch deleted file mode 100644 index 31753d7c24..0000000000 --- a/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fe740316af970f57ec511cdeafb512510e4842a9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 9 Nov 2019 17:21:13 +0100 -Subject: [PATCH] CMakeLists.txt: add BUILD_OPENCV option - -Add BUILD_OPENCV option to allow the user to disable OpenCV. It is -especially useful as opencv library can be built without highgui support - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/90] ---- - CMakeLists.txt | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 738f4e1..12913cd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.0) - project(zxing) - - option(BUILD_TESTING "Enable generation of test targets" OFF) -+option(BUILD_OPENCV "Enable OpenCV classes and OpenCV cli executable" ON) - - set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH}) - -@@ -44,8 +45,10 @@ else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - --# OpenCV classes --find_package(OpenCV) -+if (BUILD_OPENCV) -+ # OpenCV classes -+ find_package(OpenCV) -+endif() - if(OpenCV_FOUND) - list(APPEND LIBZXING_FILES - opencv/src/zxing/MatSource.cpp diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index c1109219a0..6c17565d2a 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_ZXING_CPP bool "zxing-cpp" depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_STB + select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 help ZXing-cpp (pronounced "zebra crossing") is an open-source, multi-format 1D/2D barcode image processing library diff --git a/package/zxing-cpp/zxing-cpp.hash b/package/zxing-cpp/zxing-cpp.hash index cabe3e70d4..5457ede44a 100644 --- a/package/zxing-cpp/zxing-cpp.hash +++ b/package/zxing-cpp/zxing-cpp.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4c2b8601d0e3377143c1a0bbab220146af9fa5a5e29e8fbef42862fe3d38f8e6 zxing-cpp-e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10.tar.gz +sha256 126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862 zxing-cpp-1.4.0.tar.gz # License files -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 COPYING +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index e9c80b4453..1051376808 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -4,23 +4,51 @@ # ################################################################################ -ZXING_CPP_VERSION = e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10 -ZXING_CPP_SITE = $(call github,glassechidna,zxing-cpp,$(ZXING_CPP_VERSION)) +ZXING_CPP_VERSION = 1.4.0 +ZXING_CPP_SITE = $(call github,zxing-cpp,zxing-cpp,v$(ZXING_CPP_VERSION)) ZXING_CPP_LICENSE = Apache-2.0 -ZXING_CPP_LICENSE_FILES = COPYING +ZXING_CPP_LICENSE_FILES = LICENSE ZXING_CPP_INSTALL_STAGING = YES ZXING_CPP_SUPPORTS_IN_SOURCE_BUILD = NO -ZXING_CPP_CONF_OPTS = -DBUILD_TESTING=OFF +ZXING_CPP_DEPENDENCIES = host-pkgconf stb +ZXING_CPP_CONF_OPTS = \ + -DBUILD_READERS=ON \ + -DBUILD_WRITERS=ON \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_BLACKBOX_TESTS=OFF \ + -DBUILD_UNIT_TESTS=OFF \ + -DBUILD_DEPENDENCIES=LOCAL -ifeq ($(BR2_PACKAGE_LIBICONV),y) -ZXING_CPP_DEPENDENCIES += libiconv +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV4_LIB_HIGHGUI),y) +ifeq ($(BR2_PACKAGE_OPENCV3),y) +ZXING_CPP_DEPENDENCIES += opencv3 +endif +ifeq ($(BR2_PACKAGE_OPENCV4),y) +ZXING_CPP_DEPENDENCIES += opencv4 +endif +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_OpenCV=TRUE +else +ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV=TRUE endif -ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y) -ZXING_CPP_DEPENDENCIES += opencv3 -ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON +ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy) +ZXING_CPP_DEPENDENCIES += python3 python-pybind +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=ON +else +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF +endif + +ifeq ($(BR2_PACKAGE_QT5BASE),y) +ZXING_CPP_DEPENDENCIES += qt5base +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yy) +ZXING_CPP_DEPENDENCIES += qt5declarative qt5multimedia +endif +# Only set qt5 as required when all optional qt5 dependencies are present +ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yyy) +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_Qt5=TRUE +endif else -ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFF +ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE endif $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Wed Feb 8 12:52:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 13:52:39 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6: bump version to 6.4.2 Message-ID: <20230220205255.E85D9828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74686296a4a20438f1e94e22a5a3372df2e830cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next For details see [1] and [2]. [1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.1/release-note.md [2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.2/release-note.md Signed-off-by: Peter Seiderer Tested-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/qt6/qt6.mk | 2 +- package/qt6/qt6base/qt6base.hash | 4 ++-- package/qt6/qt6serialport/qt6serialport.hash | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 575b2f826c..431bb8c9d3 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -5,7 +5,7 @@ ################################################################################ QT6_VERSION_MAJOR = 6.4 -QT6_VERSION = $(QT6_VERSION_MAJOR).0 +QT6_VERSION = $(QT6_VERSION_MAJOR).2 QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index fedbbba79f..63af373836 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtbase-everywhere-src-6.4.0.tar.xz.sha256 -sha256 cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d qtbase-everywhere-src-6.4.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 +sha256 a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d qtbase-everywhere-src-6.4.2.tar.xz # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash index 54a45681fa..1eaa3d6150 100644 --- a/package/qt6/qt6serialport/qt6serialport.hash +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtserialport-everywhere-src-6.4.0.tar.xz.sha256 -sha256 f148cc9e87ce2228e82bff7a64d9521339ece66c4c66aa43b91bac614f4a4483 qtserialport-everywhere-src-6.4.0.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialport-everywhere-src-6.4.2.tar.xz.sha256 +sha256 336d95919037800184b3c3de8ccb6f62954b20f3756c05adce8d5010504340fa qtserialport-everywhere-src-6.4.2.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt From peter at korsgaard.com Fri Feb 10 15:36:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:36:24 +0100 Subject: [Buildroot] [git commit branch/next] package/python-flit-core: set license path Message-ID: <20230220205257.7E86E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1613273542554776b089b3df2b6b71c1af2cc0da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When generating legal info with a configuration enabling a package which uses flit as setup type, we get a warning about python-flit-core license: WARNING: python-flit-core-3.8.0: cannot save license (HOST_PYTHON_FLIT_CORE_LICENSE_FILES not defined) Add missing variable to point to python-flit-core license file Signed-off-by: Alexis Lothor?? [Peter: add sha256sum to .hash file] Signed-off-by: Peter Korsgaard --- package/python-flit-core/python-flit-core.hash | 2 ++ package/python-flit-core/python-flit-core.mk | 1 + 2 files changed, 3 insertions(+) diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash index 9281635f1a..f63a64ed1b 100644 --- a/package/python-flit-core/python-flit-core.hash +++ b/package/python-flit-core/python-flit-core.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flit_core/json md5 7c41da13273f7787709a24f74e0f5a99 flit_core-3.8.0.tar.gz sha256 b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3 flit_core-3.8.0.tar.gz +# Locally computed +sha256 35b4f1dec512e617077fd6980dbb43ef8c2887adc5d0185edb4c04da175dd816 LICENSE diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 4d7bee81da..f96191ade6 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -8,6 +8,7 @@ PYTHON_FLIT_CORE_VERSION = 3.8.0 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/10/e5/be08751d07b30889af130cec20955c987a74380a10058e6e8856e4010afc PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause +PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap # Use flit built in bootstrap_install for installing host-python-flit-core. From thomas.petazzoni at bootlin.com Fri Feb 10 22:29:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:29:10 +0100 Subject: [Buildroot] [git commit branch/next] configs/asus_tinker_rk3288: fix boot by prepending tpl to spl+u-boot Message-ID: <20230220205257.B530A828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e738d5b7251918a62922f3f3b6491b642f9ec182 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next During the last U-boot version bump it's not been noted that the TPL was not prepended to SPL anymore preventing the board to boot, so let's copy TPL to the image folder, prepend it to u-boot-spl-dtb.bin and place it at offset 32KB, where RK3288 bootrom expects to find it. Let's also place u-boot-dtb separated from SPL at offset 8M, where the SPL expects it to find it. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/genimage.cfg | 11 +++++++++-- board/asus/tinker/post-build.sh | 4 ++-- configs/asus_tinker_rk3288_defconfig | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/board/asus/tinker/genimage.cfg b/board/asus/tinker/genimage.cfg index a4b1e8d608..fa7fd734f2 100644 --- a/board/asus/tinker/genimage.cfg +++ b/board/asus/tinker/genimage.cfg @@ -2,12 +2,19 @@ image sdcard.img { hdimage { } - partition u-boot-spl-dtb { + partition u-boot-tpl-spl-dtb { in-partition-table = "no" - image = "u-boot-spl-dtb.img" + image = "u-boot-tpl-spl-dtb.img" offset = 32K } + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 8M + size = 30M + } + partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/asus/tinker/post-build.sh b/board/asus/tinker/post-build.sh index 8108ed83ff..ffbbcdeb58 100755 --- a/board/asus/tinker/post-build.sh +++ b/board/asus/tinker/post-build.sh @@ -3,7 +3,7 @@ MKIMAGE=$HOST_DIR/bin/mkimage BOARD_DIR="$(dirname $0)" -$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img -cat $BINARIES_DIR/u-boot-dtb.bin >> $BINARIES_DIR/u-boot-spl-dtb.img +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl-dtb.bin > $BINARIES_DIR/u-boot-tpl-spl-dtb.img install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 6963fa939f..02b340a7f1 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y From thomas.petazzoni at bootlin.com Fri Feb 10 22:30:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:30:08 +0100 Subject: [Buildroot] [git commit branch/next] board/asus/tinker: rename label linux-next to linux in extlinux.conf Message-ID: <20230220205257.C30A88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4b46bc3c6997e32050b332d7578f0cb289b57be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We're not using next branch so let's rename label linux-next to linux. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf index 136af0debd..bb96ddb893 100644 --- a/board/asus/tinker/extlinux.conf +++ b/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ -label Tinker linux-next +label Tinker linux kernel /boot/uImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait From thomas.petazzoni at bootlin.com Fri Feb 10 22:05:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:05:38 +0100 Subject: [Buildroot] [git commit branch/next] package/gnupg2: bump to version 2.4.0 Message-ID: <20230220205257.9CD7986495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f868e97f6b42ccaa0844880775f86002656227d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next See announce: https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html This commit also drop a patch which is now included in the new version. See: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7011286ce6e1fb56c2989fdafbd11b931c489faa Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gnupg2/0001-ks_ldap_free_state.patch | 21 --------------------- package/gnupg2/gnupg2.hash | 10 +++++----- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch deleted file mode 100644 index fa55d27c04..0000000000 --- a/package/gnupg2/0001-ks_ldap_free_state.patch +++ /dev/null @@ -1,21 +0,0 @@ - -Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is not -installed - -Backported from: 7011286ce6e1fb56c2989fdafbd11b931c489faa - -Signed-off-by: Michael Fischer - ---- a/dirmngr/server.c -+++ b/dirmngr/server.c -@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) - ctrl->refcount); - else - { -+#if USE_LDAP - ks_ldap_free_state (ctrl->ks_get_state); - ctrl->ks_get_state = NULL; -+#endif - release_ctrl_ocsp_certs (ctrl); - xfree (ctrl->server_local); - dirmngr_deinit_default_ctrl (ctrl); diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index f9c071ad45..c642862fe2 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html -sha1 1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc gnupg-2.3.8.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html +sha1 63dde155a8df0d5e1987efa5fc17438beca83ac1 gnupg-2.4.0.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.8.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA and AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD -sha256 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed gnupg-2.3.8.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2.sig +# using key 6DAA6E64A76D2840571B4902528897B826403ADA +sha256 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 gnupg-2.4.0.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 9dc29ca99e..5935ce6939 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.3.8 +GNUPG2_VERSION = 2.4.0 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From thomas.petazzoni at bootlin.com Fri Feb 10 22:31:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:31:15 +0100 Subject: [Buildroot] [git commit branch/next] board/asus/tinker: add a note to readme.txt for power supply Message-ID: <20230220205257.E0067828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d87d6281869d4023e0ff888b99cdd5bdf2a0326 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/readme.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/board/asus/tinker/readme.txt b/board/asus/tinker/readme.txt index 7372d29520..110e2168c9 100644 --- a/board/asus/tinker/readme.txt +++ b/board/asus/tinker/readme.txt @@ -35,3 +35,9 @@ You can write this image directly to an SD card device (i.e. /dev/xxx): $ sudo sync Finally, you can insert the SD card to the Tinker RK3288 board and boot it. + +NOTE: +USB power supply requires more than the standard 500mA USB current, so +this board must be supplied from a capable port or from an external +AC/DC adapter. Otherwise it will hang forever while loading the kernel +image. From thomas.petazzoni at bootlin.com Fri Feb 10 22:38:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:38:44 +0100 Subject: [Buildroot] [git commit branch/next] package/ssdp-responder; drop systemd unit installation, not needed Message-ID: <20230220205258.081B88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6e3d36a85f19acedd2ed58f5b8616dbf24f57a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next When systemd is enabled the ssdp-responder build system already installs the unit file, with the correct name, so we can safely drop this. This fixes the recurring autobuilder problems that cropped up the last week+ or so after fixing the spelling error in 6e0ba6b. - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/ssdp-responder/ssdp-responder.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index d40f6f8c57..5193966908 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,9 +25,4 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service -endef - $(eval $(autotools-package)) From yann.morin.1998 at free.fr Sat Feb 11 10:02:49 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 11:02:49 +0100 Subject: [Buildroot] [git commit branch/next] package/pkg-waf: add missing $ Message-ID: <20230220205258.2C8B481979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d1b223b91b08acdb52611864ae5921b9f3c757b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We want to have $(@D) expanded at the time the recipe is run, so like all other variables, we need to $$-expand it. Fixes: 1b4d7f6e13212b4c65ec2832681719fd960e75e6 Fixes: http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826 Signed-off-by: Romain Naour Cc: Yann E. MORIN Cc: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/pkg-waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index 0e752072c8..c3e965bdf3 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -42,7 +42,7 @@ define inner-waf-package # otherwise waf errors out with: # Waf script 'X' and library 'Y' do not match define WAF_PACKAGE_REMOVE_WAF_LIB - $(RM) -fr $(@D)/waf $(@D)/waflib + $(RM) -fr $$(@D)/waf $$(@D)/waflib endef # We need host-python3 to run waf From yann.morin.1998 at free.fr Sat Feb 11 12:12:51 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 13:12:51 +0100 Subject: [Buildroot] [git commit branch/next] configs/stm32f429_xip_defconfig: bump Linux version to 6.1.10 Message-ID: <20230220205258.40CD08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2bf4d02ff35bd8a0d5aace354c987a166437db88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The size of xipImage has grown by 84KB but there are still 278KB left before running out of 2MB of flash memory. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- configs/stm32f429_disco_xip_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index f9b3270ecd..872e4b6a30 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_m4=y -BR2_KERNEL_HEADERS_5_15=y +BR2_KERNEL_HEADERS_6_1=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f429-disco/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From thomas.petazzoni at bootlin.com Fri Feb 10 22:36:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 10 Feb 2023 23:36:16 +0100 Subject: [Buildroot] [git commit branch/next] support/testing/tests/package/test_gnupg2.py: new runtime test Message-ID: <20230220205257.EEF8381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a82eec628c25f96a15ed7f1443923ff625e0d2bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_gnupg2.py | 114 +++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e8e0671709..0af1323340 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1708,6 +1708,7 @@ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py diff --git a/support/testing/tests/package/test_gnupg2.py b/support/testing/tests/package/test_gnupg2.py new file mode 100644 index 0000000000..4505e1c339 --- /dev/null +++ b/support/testing/tests/package/test_gnupg2.py @@ -0,0 +1,114 @@ +import os + +import infra.basetest + + +class TestGnupg2(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_GNUPG2=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Some common data for all the tests + plain_data = "Some plain text data" + plain_file = "file.txt" + gpg_file = plain_file + ".gpg" + asc_file = plain_file + ".asc" + sig_file = plain_file + ".sig" + good_passphrase = "Good Passphrase" + gpg_userid = "br-test at buildroot" + + # Test the program can execute + self.assertRunOk("gpg --version") + + # Generate plain text data + cmd = "echo '{}' > {}".format(plain_data, plain_file) + self.assertRunOk(cmd) + + # Test symmetric encrypt + cmd = "gpg --batch --symmetric" + cmd += " --passphrase '{}' {}".format(good_passphrase, plain_file) + self.assertRunOk(cmd) + + # Test symmetric decrypt + cmd = "gpg --batch --decrypt" + cmd += " --passphrase '{}' {}".format(good_passphrase, gpg_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + + # Test a failed decrypt with a bad password + cmd = "gpg --batch --decrypt" + cmd += " --passphrase 'A-Bad-Password' {}".format(gpg_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Test the generation of an asymmetric key + cmd = "gpg --batch --passphrase ''" + cmd += " --quick-generate-key {} default default".format(gpg_userid) + self.assertRunOk(cmd) + + # Test asymmetric encrypt+sign + cmd = "gpg --batch --yes --encrypt --sign" + cmd += " --recipient {} {}".format(gpg_userid, plain_file) + self.assertRunOk(cmd) + + # Test asymmetric decrypt+verify + cmd = "gpg --decrypt {}".format(gpg_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test asymmetric armored encrypt+sign + cmd = "gpg --batch --yes --armor --encrypt --sign" + cmd += " --recipient {} {}".format(gpg_userid, plain_file) + self.assertRunOk(cmd) + + # Test asymmetric armored decrypt+verify + cmd = "gpg --armor --decrypt {}".format(asc_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test detached signature + cmd = "gpg --batch --yes --detach-sign {}".format(plain_file) + self.assertRunOk(cmd) + + # Test detached signature verification + cmd = "gpg --verify {}".format(sig_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test detached armored signature + cmd = "gpg --batch --yes --armor --detach-sign {}".format(plain_file) + self.assertRunOk(cmd) + + # Test detached armored signature verification + cmd = "gpg --armor --verify {}".format(asc_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test the signature verification of a corrupted file actually fails + cmd = "echo 'CORRUPTED' >> {}".format(plain_file) + self.assertRunOk(cmd) + + cmd = "gpg --verify {}".format(sig_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + cmd = "gpg --armor --verify {}".format(asc_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) From peter at korsgaard.com Sat Feb 11 22:18:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:26 +0100 Subject: [Buildroot] [git commit branch/next] package/x11r7/xlib_libX11: bump version to 1.8.4 Message-ID: <20230220205258.60CB28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b9bea584c2f2c14122395eba7cdbf325ed7256c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003318.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 62b67ad544..ed68164d5f 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003305.html -sha256 e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd libX11-1.8.3.tar.xz -sha512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 libX11-1.8.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003318.html +sha256 c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518 libX11-1.8.4.tar.xz +sha512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e libX11-1.8.4.tar.xz # Locally computed sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 3bb3fffce0..add16f49db 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.8.3 +XLIB_LIBX11_VERSION = 1.8.4 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT From yann.morin.1998 at free.fr Sat Feb 11 14:58:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 15:58:35 +0100 Subject: [Buildroot] [git commit branch/next] package/chrony: run as unprivileged user Message-ID: <20230220205258.4B21381979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=451672e890b5f605aa9ad7a386491a31397c737f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next There are three ways to run chronyd: - start as root, and continue running as root; - start as root, then setuid() to a non-root user via either a command line option or a configuration directive; - start as root, and setuid() to a build-time specified non-root user. Currently, the first situation is used by Buildroot, which does not follow security best practices of dropping elevated privileges for daemon at runtime when that is possible. We switch to the third situation, where a compile-time default non-root user is then used at runtime to drop privileges, with libcap used to keep the capabilities required to call the appropriate syscalls to adjust the system time (typically, CAP_SYS_TIME to call adjtimex() or clock_settime() et al.). This means that libcap is now a mandatory dependency. To be noted: users who previously had configured their systems to run chronyd as non root, would have done so with either the command-line option (`-u`), or the configuration directive (`user`). Those take precedence over the compile-time default, so this should not break their systems (presumably, they also run as the `chrony` user). They would also have taken care to run chronyc as the appropriate user to manipulate chronyd at runtime via the UNIX socket. For those who were running chronyd as root, this does not change either: the functionality is unchanged, and they were running chronyc as root, which should still be capable of manipulating chronyd via its UNIX socket. Take that opportunity to brine chrony's Config.in to current coding style: enclose sub-option in an if-endif block. Signed-off-by: James Kent Signed-off-by: Yann E. MORIN --- package/chrony/Config.in | 6 +++++- package/chrony/chrony.mk | 11 +++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/package/chrony/Config.in b/package/chrony/Config.in index 158dc20530..c22b756c11 100644 --- a/package/chrony/Config.in +++ b/package/chrony/Config.in @@ -1,16 +1,20 @@ config BR2_PACKAGE_CHRONY bool "chrony" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBCAP help Chrony is a pair of programs which are used to maintain the accuracy of the system clock. http://chrony.tuxfamily.org/ +if BR2_PACKAGE_CHRONY + config BR2_PACKAGE_CHRONY_DEBUG_LOGGING bool "enable debug logging support" - depends on BR2_PACKAGE_CHRONY help Enable support for debug logging output from Chrony when enabled at runtime. If disabled, code for debug logging will not be compiled in. + +endif diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 379e95a778..86f23d9060 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -10,20 +10,19 @@ CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING CHRONY_CPE_ID_VENDOR = tuxfamily CHRONY_SELINUX_MODULES = chronyd -CHRONY_DEPENDENCIES = host-pkgconf +CHRONY_DEPENDENCIES = host-pkgconf libcap CHRONY_CONF_OPTS = \ --host-system=Linux \ --host-machine=$(BR2_ARCH) \ --prefix=/usr \ --without-tomcrypt \ + --with-user=chrony \ $(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug) -ifeq ($(BR2_PACKAGE_LIBCAP),y) -CHRONY_DEPENDENCIES += libcap -else -CHRONY_CONF_OPTS += --without-libcap -endif +define CHRONY_USERS + chrony -1 chrony -1 * /run/chrony - - Time daemon +endef ifeq ($(BR2_PACKAGE_LIBNSS),y) CHRONY_DEPENDENCIES += libnss From peter at korsgaard.com Sat Feb 11 22:18:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:48 +0100 Subject: [Buildroot] [git commit branch/next] package/libdrm: bump version to 2.4.115 Message-ID: <20230220205258.6E84F81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e1fdd144300106704e21176673e465163245669 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003323.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 387beadc3f..87cc170617 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003250.html -sha256 3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026 libdrm-2.4.114.tar.xz -sha512 8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644 libdrm-2.4.114.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003323.html +sha256 554cfbfe0542bddb391b4e3e05bfbbfc3e282b955bd56218d21c0616481f65eb libdrm-2.4.115.tar.xz +sha512 0c38d3cfd76f627b899f052527c2939d5fc87a417422dceb0761839ba21e69736703a87ba170b5ba7a4aca2506a240760c8c97ca1781a7fb78468225295293bd libdrm-2.4.115.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 56366b6c48..52ac13b7d0 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.114 +LIBDRM_VERSION = 2.4.115 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From peter at korsgaard.com Sun Feb 12 08:39:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:39:19 +0100 Subject: [Buildroot] [git commit branch/next] support/download: fix the cargo post-process in face of failed vendoring Message-ID: <20230220205258.A4AA981979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59b2e826f2a6c1874c5d032d3a5852326028bc0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In commit 04154a651729 (support/download/cargo-post-process: cargo output for vendor config), we switched away from our hand-crafted cargo.toml mangling, to use cargo itself to update that file. In doing so, we enabled the shell pipefail option, so that we could catch cargo failures, while redirecting its output through tee to the cargo.toml. However, pipefail is overzealous, and will hit us even for pipes we do not want to globally fail, like the one that actually checks whether an archive is already vendored or not: if tar tf "${output}" | grep -q "^[^/]*/VENDOR" ; then ... with pipefail, the above may always fail: - if the tarball is already vendored, grep will exit on the first match because of -q (it only needs a single match to decide that its return code will be zero), so the | will get closed, and tar may get -EPIPE before it had a chance to finish listing the archive, and thus would terminate in error; - if the tarball is not vendored, grep will exit in error. It turns out that the tee was only added so that we could see the messages emitted by cargo, and still fill the cargo.tom with the output of cargo. But that's a bit overkill: the cargo messages are going to stderr, and the blurb to add to cargo.toml to stdout, so we just need to redirect stdout. Yes, we do not see what cargo added to cargo.toml, but that is not so interesting. Still, cargo ends its messages with a suggestion for the user to modify cargo.toml, with: To use vendored sources, add this to your .cargo/config.toml for this project: But since we've already redirected that to cargo.toml, there is nothing for the user to edit, so the above can get confusing. Emit a little blurb that states that everything is under control. And then we can drop pipefail. Note: the go-post-process initially had pipefail too, but it was dropped in bfd1a31d0e59 (support/download/go-post-process: drop -o pipefail) as it was causing spurious breakage when extracting the archive before vendoring, so it is only reasonable that we also remove it from the cargo-post-process. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Simon Richter Signed-off-by: Peter Korsgaard --- support/download/cargo-post-process | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index aea2d8da7a..3f4666c006 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -e -set -o pipefail . "${0%/*}/helpers" @@ -31,7 +30,13 @@ flock "${CARGO_HOME}"/.br-lock \ cargo vendor \ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ --locked VENDOR \ - | tee .cargo/config + > .cargo/config + +# "cargo vendor' outputs on stderr a message directing to add some data +# to the project's .cargo/config.toml, data that it outputs on stdout. +# Since we redirect stdout to .cargo/config.toml, the message on stderr +# gets confusing, so instruct the user that it's been handled. +printf '(note: .cargo/config.toml automatically updated by Buildroot)\n\n' popd > /dev/null From yann.morin.1998 at free.fr Sun Feb 12 20:20:15 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:20:15 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: reorder entries for Julien Olivain Message-ID: <20230220205258.C7A7A81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f33c8490fe8d110c13a1f28bd5a2063983002fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Entries for "gnupg2" and "test_python_hkdf.py" were not at the right position. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ae698f87c5..ece0d986ae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1685,8 +1685,8 @@ F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ -F: package/gnupg2/ F: package/glslsandbox-player/ +F: package/gnupg2/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1716,8 +1716,8 @@ F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py -F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_gnupg.py +F: support/testing/tests/package/test_python_hkdf.py F: support/testing/tests/package/test_python_magic_wormhole.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py From peter at korsgaard.com Sun Feb 12 20:02:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 21:02:14 +0100 Subject: [Buildroot] [git commit branch/next] package/libnss: bump version to 3.88.1 Message-ID: <20230220205258.B21B5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99024eca8f154062ea88af985ff10e12ae7016b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 f847ec4f77..ec3fe0d777 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_87_RTM/src/SHA256SUMS -sha256 68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d nss-3.87.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_88_1_RTM/src/SHA256SUMS +sha256 27d243edf87d1cf1bb9c861f03d387e0e9230ce5017f4308c941f558b54b3496 nss-3.88.1.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 90fd9259d5..ac342cf3af 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.87 +LIBNSS_VERSION = 3.88.1 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 yann.morin.1998 at free.fr Sun Feb 12 20:27:42 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:27:42 +0100 Subject: [Buildroot] [git commit branch/next] package/zxing-cpp: update homepage Message-ID: <20230220205258.DD8DF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6dbf3909dd4816230001f0d71dd31d9e96939083 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 456a7398316655ad0b669635f580e4887c24a700 decided to switch to an active fork but forgot to update homepage in Config.in Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zxing-cpp/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 6c17565d2a..2550dcf023 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_ZXING_CPP implemented in Java, with ports to other languages. This compiles the C++ port. - https://github.com/glassechidna/zxing-cpp + https://github.com/zxing-cpp/zxing-cpp From yann.morin.1998 at free.fr Sun Feb 12 20:27:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:27:47 +0100 Subject: [Buildroot] [git commit branch/next] package/zxing-cpp: needs wchar Message-ID: <20230220205258.E857881979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=631d0289fe880952d9bedf37cc10b043c70c1482 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next wchar is mandatory since switch to an active fork in commit 456a7398316655ad0b669635f580e4887c24a700: In file included from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Result.h:12, from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/GTIN.cpp:9: /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Content.h:40:14: error: 'wstring' in namespace 'std' does not name a type 40 | std::wstring render(bool withECI) const; | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/4f97f1b291a99218f4706fce8b2934bd845755e1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-bad/Config.in | 6 ++++-- package/zxing-cpp/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index d477924eec..d2ef450d74 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -741,11 +741,13 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING bool "zxing" depends on !BR2_STATIC_LIBS # zxing-cpp + depends on BR2_USE_WCHAR # zxing-cpp depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp select BR2_PACKAGE_ZXING_CPP -comment "zxing plugin needs a toolchain w/ C++, dynamic library" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP +comment "zxing plugin needs a toolchain w/ C++, wchar, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_INSTALL_LIBSTDCPP endif diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 2550dcf023..0d8b79538d 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -1,9 +1,11 @@ -comment "zxing-cpp needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "zxing-cpp needs a toolchain w/ C++, wchar, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + BR2_STATIC_LIBS config BR2_PACKAGE_ZXING_CPP bool "zxing-cpp" depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_STB select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 From yann.morin.1998 at free.fr Sun Feb 12 20:34:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:34:09 +0100 Subject: [Buildroot] [git commit branch/next] package/libsolv: drop unrecognized variables Message-ID: <20230220205259.0B25F828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4706e04e3ca7428c755bffd79ddf8ef8628141e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop unrecognized variables: CMake Warning: Manually-specified variables were not used by the project: BUILD_DOC BUILD_DOCS BUILD_EXAMPLE BUILD_EXAMPLES BUILD_TEST BUILD_TESTING BUILD_TESTS CMAKE_CXX_COMPILER_FORCED DISABLE_STATIC ENABLE_SHARED Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsolv/libsolv.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 29f8a6a3d2..04fdb387fd 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -11,16 +11,15 @@ LIBSOLV_LICENSE_FILES = LICENSE.BSD LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib -LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON else -LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=OFF endif ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=OFF else LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON endif From yann.morin.1998 at free.fr Sun Feb 12 20:37:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:37:48 +0100 Subject: [Buildroot] [git commit branch/next] package/zabbix: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230220205259.2115981979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=895686180fa73a23f2e4e9ee374618fa259a79ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next zabbix uses custom --enable-{static,shared} options, instead of standard libtool directives resulting in the following build failure with openssl or libcurl: configure:13132: /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib conftest.c -lssl -lcrypto -lm >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): in function `dlfcn_globallookup': dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): in function `BIO_lookup_ex': b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): in function `BIO_gethostbyname': b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /tmp/cceWHjDi.o: in function `main': conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' [...] configure: error: OpenSSL library libssl or libcrypto not found Signed-off-by: Yann E. MORIN --- package/zabbix/zabbix.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index adc54028ad..e00d693ba5 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -125,6 +125,13 @@ endif endif # BR2_PACKAGE_ZABBIX_SERVER +# zabbix uses custom --enable-{static,shared} options, instead of +# standard libtool directives resulting in a build failure with libcurl +# or openssl. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ZABBIX_CONF_OPTS += --disable-static +endif + define ZABBIX_INSTALL_INIT_SYSTEMD $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ From yann.morin.1998 at free.fr Sun Feb 12 21:06:38 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 22:06:38 +0100 Subject: [Buildroot] [git commit branch/next] package/cryptsetup: bump version to 2.6.1 Message-ID: <20230220205259.5ABE38648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=888ac96e55c0c53bf5ada2f3f6d58e9e1179d91b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 149d1e71f1..87cdf840c3 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc -sha256 44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735 cryptsetup-2.6.0.tar.xz +sha256 410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 cryptsetup-2.6.1.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 659fdfa2a4..3f3034475f 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.6 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From yann.morin.1998 at free.fr Sun Feb 12 20:48:36 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:48:36 +0100 Subject: [Buildroot] [git commit branch/next] package/rtl8723ds: bump to 2023-02-11 version with new license file Message-ID: <20230220205259.363CB828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27f38e175346c09eed003e95daa0f065b43e27e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next A COPYING file has been added to rtl8723ds as of the most recent commit. Update the version of the package and add the license file hash. Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/rtl8723ds/rtl8723ds.hash | 3 ++- package/rtl8723ds/rtl8723ds.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index d5abf9913c..e94a7b40ef 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 97f3ebc5d977ba35d10c9c06e6817e4a00458727b651b56fc00c207c05a61995 rtl8723ds-a638cc8639015b8b9390af3350fab0366b6c87e7.tar.gz +sha256 672787c3f3d1f795b750cd74de8ca34bb661b8ae60f5aa50fb279ec08ff3f05f rtl8723ds-ec85dc6b9f72bfe413bff464ed01a272e29c8dbe.tar.gz +sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 COPYING diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index f303a24041..1bb164fa86 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,9 +4,10 @@ # ################################################################################ -RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 +RTL8723DS_VERSION = ec85dc6b9f72bfe413bff464ed01a272e29c8dbe RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 +RTL8723DS_LICENSE_FILES = COPYING RTL8723DS_USER_EXTRA_CLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ From yann.morin.1998 at free.fr Sun Feb 12 20:49:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 12 Feb 2023 21:49:09 +0100 Subject: [Buildroot] [git commit branch/next] board/visionfive2: add link to documentation Message-ID: <20230220205259.42D2181979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f48b3983cdb32dfcd59e7e549c8eaa1503fe342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add a link to RVspace Documentation Center, which did not exist when readme.txt was first submitted. It provides datasheet, quick start, schematics, and so on. Signed-off-by: Francois Dugast Signed-off-by: Yann E. MORIN --- board/visionfive2/readme.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt index 2da98f3847..1924cbc12b 100644 --- a/board/visionfive2/readme.txt +++ b/board/visionfive2/readme.txt @@ -4,6 +4,8 @@ Starfive VisionFive2 The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a Starfive JH7110 processor. +https://doc-en.rvspace.org/Doc_Center/visionfive_2.html + How to build ============ From peter at korsgaard.com Sun Feb 12 08:28:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 12 Feb 2023 09:28:45 +0100 Subject: [Buildroot] [git commit branch/next] support/dependencies/dependencies.sh: require diagnostics perl package for mosh Message-ID: <20230220205258.848CC828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5be2d9bb621e3f3aa552516c8887a7821ed62788 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' perl -Mdiagnostics -c ./mosh.pl Can't locate diagnostics.pm in @INC (you may need to install the diagnostics module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5). BEGIN failed--compilation aborted. So add a check for it in dependencies.sh similar to the other perl modules. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index cf6635bff6..4353e9585e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -281,6 +281,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules diagnostics" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From peter at korsgaard.com Tue Feb 14 17:12:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:05 +0100 Subject: [Buildroot] [git commit branch/next] package/linux-headers: drop 4.9.x option Message-ID: <20230220205259.A741E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6634710cdb12ec5b972c2c4068636dfd591cae4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The 4.9.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 72deb03c35..e2dc854c78 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_4_9 + bool "kernel headers version 4.9.x are no longer supported" + select BR2_LEGACY + help + Version 4.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_DOCKER_PROXY bool "docker-proxy removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index f797d5a61a..ae8b5e5f62 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -6,7 +6,6 @@ sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux- sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz # Locally computed diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8a76f93d62..6970090855 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -24,11 +24,6 @@ config BR2_KERNEL_HEADERS_AS_KERNEL depends on BR2_LINUX_KERNEL select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION -config BR2_KERNEL_HEADERS_4_9 - bool "Linux 4.9.x kernel headers" - depends on !BR2_riscv - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 - config BR2_KERNEL_HEADERS_4_14 bool "Linux 4.14.x kernel headers" depends on !BR2_riscv @@ -393,7 +388,6 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.337" if BR2_KERNEL_HEADERS_4_9 default "4.14.305" if BR2_KERNEL_HEADERS_4_14 default "4.19.272" if BR2_KERNEL_HEADERS_4_19 default "5.4.231" if BR2_KERNEL_HEADERS_5_4 From peter at korsgaard.com Tue Feb 14 17:12:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:17 +0100 Subject: [Buildroot] [git commit branch/next] package/linux-headers: drop 6.0.x option Message-ID: <20230220205259.B49CD81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2b70aa9492517717f948f199e99f055a5c1dde1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The 6.0.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e2dc854c78..7f69462f2e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_6_0 + bool "kernel headers version 6.0.x are no longer supported" + select BR2_LEGACY + help + Version 6.0.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_KERNEL_HEADERS_4_9 bool "kernel headers version 4.9.x are no longer supported" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index ae8b5e5f62..52eb534b40 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz -sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6970090855..18c179ec8d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -45,10 +45,6 @@ config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 -config BR2_KERNEL_HEADERS_6_0 - bool "Linux 6.0.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 - config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 @@ -393,7 +389,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.231" if BR2_KERNEL_HEADERS_5_4 default "5.10.167" if BR2_KERNEL_HEADERS_5_10 default "5.15.93" if BR2_KERNEL_HEADERS_5_15 - default "6.0.19" if BR2_KERNEL_HEADERS_6_0 default "6.1.11" if BR2_KERNEL_HEADERS_6_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From thomas.petazzoni at bootlin.com Mon Feb 13 22:18:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 23:18:03 +0100 Subject: [Buildroot] [git commit branch/next] package/highway: new package Message-ID: <20230220205259.72B05828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4733f9bd5774171b8309e5c42e0419a0e8264308 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Highway is a C++ library that provides portable SIMD/vector intrinsics. https://github.com/google/highway Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + package/Config.in | 1 + ...0001-Check-for-the-presence-of-sys-auxv.h.patch | 62 ++++++++++++++++++++++ package/highway/Config.in | 34 ++++++++++++ package/highway/highway.hash | 3 ++ package/highway/highway.mk | 50 +++++++++++++++++ support/testing/tests/package/test_highway.py | 22 ++++++++ 7 files changed, 174 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index dcc607ba60..28cad8f58f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1687,6 +1687,7 @@ F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/gnupg2/ +F: package/highway/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1709,6 +1710,7 @@ F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_gnupg2.py +F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py diff --git a/package/Config.in b/package/Config.in index 511e691ed3..d205bcd816 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2034,6 +2034,7 @@ menu "Other" source "package/gsl/Config.in" source "package/gtest/Config.in" source "package/gumbo-parser/Config.in" + source "package/highway/Config.in" source "package/jemalloc/Config.in" source "package/lapack/Config.in" source "package/libabseil-cpp/Config.in" diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch new file mode 100644 index 0000000000..df86798613 --- /dev/null +++ b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch @@ -0,0 +1,62 @@ +From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Wed, 23 Nov 2022 23:27:11 +0100 +Subject: [PATCH] Check for the presence of + +Not all gcc versions are providing . Checking for +HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not +sufficient and fail to build in some situations (it was observed for +some gcc armv7m toolchains). + +This patch adds a check for and include it only if present. + +Signed-off-by: Julien Olivain +--- + CMakeLists.txt | 3 +++ + hwy/detect_targets.h | 2 +- + hwy/targets.cc | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b6b14ab..df6b5ab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,6 +84,9 @@ check_cxx_source_compiles( + HWY_RISCV + ) + ++include(CheckIncludeFile) ++check_include_file(sys/auxv.h HAVE_SYS_AUXV_H) ++ + if (HWY_ENABLE_CONTRIB) + # Glob all the traits so we don't need to modify this file when adding + # additional special cases. +diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h +index 7f7e179..f0c6f94 100644 +--- a/hwy/detect_targets.h ++++ b/hwy/detect_targets.h +@@ -392,7 +392,7 @@ + #define HWY_HAVE_RUNTIME_DISPATCH 1 + // On Arm, currently only GCC does, and we require Linux to detect CPU + // capabilities. +-#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX ++#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX && HAVE_SYS_AUXV_H + #define HWY_HAVE_RUNTIME_DISPATCH 1 + #else + #define HWY_HAVE_RUNTIME_DISPATCH 0 +diff --git a/hwy/targets.cc b/hwy/targets.cc +index 2fde4db..abd6a94 100644 +--- a/hwy/targets.cc ++++ b/hwy/targets.cc +@@ -42,7 +42,7 @@ + #include + #endif // HWY_COMPILER_MSVC + +-#elif HWY_ARCH_ARM && HWY_OS_LINUX ++#elif HWY_ARCH_ARM && HWY_OS_LINUX && HAVE_SYS_AUXV_H + #include + #include + #endif // HWY_ARCH_* +-- +2.38.1 + diff --git a/package/highway/Config.in b/package/highway/Config.in new file mode 100644 index 0000000000..f4cef30e01 --- /dev/null +++ b/package/highway/Config.in @@ -0,0 +1,34 @@ +config BR2_PACKAGE_HIGHWAY + bool "highway" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_INSTALL_LIBSTDCPP + # For gcc bug 58969, see: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58969 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++11, GCC_BUG_58969 + help + Highway is a C++ library that provides portable SIMD/vector + intrinsics. + + https://github.com/google/highway + +if BR2_PACKAGE_HIGHWAY + +config BR2_PACKAGE_HIGHWAY_CONTRIB + bool "Enable Contrib" + help + Build Highway contrib library which contains extra + SIMD-related utilities: an image class with aligned rows, a + math library (16 functions already implemented, mostly + trigonometry), and functions for computing dot products and + sorting. + +config BR2_PACKAGE_HIGHWAY_EXAMPLES + bool "Enable Examples" + help + Build Highway examples + +endif + +comment "highway needs a toolchain w/ C++, gcc >= 7" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/highway/highway.hash b/package/highway/highway.hash new file mode 100644 index 0000000000..3ff468443e --- /dev/null +++ b/package/highway/highway.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db highway-1.0.2.tar.gz +sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE diff --git a/package/highway/highway.mk b/package/highway/highway.mk new file mode 100644 index 0000000000..ed7f6ca871 --- /dev/null +++ b/package/highway/highway.mk @@ -0,0 +1,50 @@ +################################################################################ +# +# highway +# +################################################################################ + +HIGHWAY_VERSION = 1.0.2 +HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) +HIGHWAY_LICENSE = Apache-2.0 +HIGHWAY_LICENSE_FILES = LICENSE +HIGHWAY_INSTALL_STAGING = YES + +HIGHWAY_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_PACKAGE_HIGHWAY_CONTRIB),y) +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=ON +else +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=OFF +endif + +ifeq ($(BR2_PACKAGE_HIGHWAY_EXAMPLES),y) +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=ON +# Examples are not installed by cmake. This binary can be useful for +# quick testing and debug. +define HIGHWAY_INSTALL_EXAMPLES + $(INSTALL) -m 0755 \ + $(@D)/examples/hwy_benchmark \ + $(TARGET_DIR)/usr/bin/hwy_benchmark +endef +HIGHWAY_POST_INSTALL_TARGET_HOOKS += HIGHWAY_INSTALL_EXAMPLES +else +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=OFF +endif + +ifeq ($(BR2_ARM_FPU_VFPV4),y) +HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=ON +else +HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=OFF +endif + +# Workaround for gcc bug 104028 on m68k. +# See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104028 +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_104028),y) +HIGHWAY_CXXFLAGS += -O0 +endif + +HIGHWAY_CONF_OPTS += \ + -DCMAKE_CXX_FLAGS="$(HIGHWAY_CXXFLAGS)" + +$(eval $(cmake-package)) diff --git a/support/testing/tests/package/test_highway.py b/support/testing/tests/package/test_highway.py new file mode 100644 index 0000000000..f32363e26f --- /dev/null +++ b/support/testing/tests/package/test_highway.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestHighway(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_HIGHWAY=y + BR2_PACKAGE_HIGHWAY_EXAMPLES=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("hwy_benchmark", timeout=20) From thomas.petazzoni at bootlin.com Mon Feb 13 22:18:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 13 Feb 2023 23:18:05 +0100 Subject: [Buildroot] [git commit branch/next] package/libjxl: new package Message-ID: <20230220205259.837B27FF06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e648d399d8bd609697e78f13f7fa76be06d91a57 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libjxl is the reference implementation of JPEG XL (encoder and decoder). https://github.com/libjxl/libjxl Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/libjxl/Config.in | 25 +++++++++++++ package/libjxl/libjxl.hash | 4 +++ package/libjxl/libjxl.mk | 33 +++++++++++++++++ support/testing/tests/package/test_libjxl.py | 53 ++++++++++++++++++++++++++++ toolchain/Config.in | 5 +++ 7 files changed, 123 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 28cad8f58f..df2b98ad53 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1688,6 +1688,7 @@ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/gnupg2/ F: package/highway/ +F: package/libjxl/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1712,6 +1713,7 @@ F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py diff --git a/package/Config.in b/package/Config.in index d205bcd816..fff2fb7a93 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1603,6 +1603,7 @@ menu "Graphics" source "package/libgta/Config.in" source "package/libgtk2/Config.in" source "package/libgtk3/Config.in" + source "package/libjxl/Config.in" source "package/libmediaart/Config.in" source "package/libmng/Config.in" source "package/libpng/Config.in" diff --git a/package/libjxl/Config.in b/package/libjxl/Config.in new file mode 100644 index 0000000000..da04b89f9b --- /dev/null +++ b/package/libjxl/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_LIBJXL + bool "libjxl" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # highway + depends on BR2_TOOLCHAIN_HAS_ATOMIC # highway + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP # highway + # libjxl fail to link statically due to libatomic issue + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + select BR2_PACKAGE_BROTLI + select BR2_PACKAGE_HIGHWAY + select BR2_PACKAGE_LCMS2 + help + libjxl is the reference implementation of JPEG XL (encoder + and decoder). + + https://github.com/libjxl/libjxl + +comment "libjxl needs a toolchain with C++, threads, gcc >= 7, dynamic library" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash new file mode 100644 index 0000000000..e71d32e61d --- /dev/null +++ b/package/libjxl/libjxl.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e libjxl-0.7.0.tar.gz +sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE +sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk new file mode 100644 index 0000000000..cc24ba258c --- /dev/null +++ b/package/libjxl/libjxl.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# libjxl +# +################################################################################ + +LIBJXL_VERSION = 0.7.0 +LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) +LIBJXL_LICENSE = BSD-3-Clause +LIBJXL_LICENSE_FILES = LICENSE PATENTS +LIBJXL_CPE_ID_VENDOR = libjxl_project +LIBJXL_INSTALL_STAGING = YES + +LIBJXL_DEPENDENCIES = \ + brotli \ + lcms2 \ + highway + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +LIBJXL_DEPENDENCIES += libpng +endif + +LIBJXL_CONF_OPTS = \ + -DJPEGXL_BUNDLE_LIBPNG=OFF \ + -DJPEGXL_BUNDLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_DOXYGEN=OFF \ + -DJPEGXL_ENABLE_JNI=OFF \ + -DJPEGXL_ENABLE_MANPAGES=OFF \ + -DJPEGXL_ENABLE_OPENEXR=OFF \ + -DJPEGXL_ENABLE_SJPEG=OFF \ + -DJPEGXL_ENABLE_SKCMS=OFF + +$(eval $(cmake-package)) diff --git a/support/testing/tests/package/test_libjxl.py b/support/testing/tests/package/test_libjxl.py new file mode 100644 index 0000000000..b6d5ffc9ce --- /dev/null +++ b/support/testing/tests/package/test_libjxl.py @@ -0,0 +1,53 @@ +import os + +import infra.basetest + + +class TestLibJXL(infra.basetest.BRTest): + # infra.basetest.BASIC_TOOLCHAIN_CONFIG is not used as it is armv5 + # and the image encoding would take too long (several minutes). + # We also add GraphicsMagick to generate and compare images for + # the test. + 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.79" + 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_GRAPHICSMAGICK=y + BR2_PACKAGE_LIBJXL=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", "256M", "-initrd", img]) + self.emulator.login() + + ref = "/var/tmp/reference.ppm" + jxl = "/var/tmp/encoded.jxl" + dec = "/var/tmp/decoded.ppm" + + cmd = "gm convert IMAGE:LOGO {}".format(ref) + self.assertRunOk(cmd) + + cmd = "cjxl {} {}".format(ref, jxl) + self.assertRunOk(cmd, timeout=30) + + cmd = "djxl {} {}".format(jxl, dec) + self.assertRunOk(cmd) + + cmd = "gm compare -metric mse -maximum-error 1e-3 {} {}".format( + ref, dec) + self.assertRunOk(cmd) diff --git a/toolchain/Config.in b/toolchain/Config.in index 01215e0e96..08e4ccad9e 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -141,6 +141,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_68485 bool default y if BR2_microblaze +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81426 +config BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + bool + default y if BR2_sh + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83143 # Error: invalid operands (*UND* and .text sections) for `-' on sh4. # This bug no longer exists in gcc 10.x but reappeared on gcc 11.x and From peter at korsgaard.com Tue Feb 14 17:13:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:13:18 +0100 Subject: [Buildroot] [git commit branch/next] package/postgresql: fix legal info Message-ID: <20230220205259.D509681979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3cd0132561ecfb471d76409f40aa565612f10208 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 57e297a215193c92f6a178139db53616f2ee23b5 forgot to update hash of COPYRIGHT file (year updated with https://github.com/postgres/postgres/commit/1fbcb1360bc19b89369209203ea7cc19b8cde224) Fixes: - http://autobuild.buildroot.org/results/93f40dc71619745ddc6741598c9a488c81ea440f Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index e6a9bd6658..3e89d3ec35 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ # From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated -sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT +sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT From peter at korsgaard.com Tue Feb 14 17:14:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:14:21 +0100 Subject: [Buildroot] [git commit branch/next] package/dnsmasq: bump version to 2.89 Message-ID: <20230220205259.E20FD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38101cea6ed695901ec54e52ae3db528f5e19979 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Tested-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/dnsmasq/dnsmasq.hash | 4 ++-- package/dnsmasq/dnsmasq.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index fd015d38ac..02ffb2656b 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.88.tar.xz.asc -sha256 23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3 dnsmasq-2.88.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc +sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 3945e4256a..58c5390433 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.88 +DNSMASQ_VERSION = 2.89 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" From peter at korsgaard.com Tue Feb 14 17:12:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 14 Feb 2023 18:12:33 +0100 Subject: [Buildroot] [git commit branch/next] package/apr-util: security bump to version 1.6.3 Message-ID: <20230220205259.BF4628648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4231054b05436978795267330202f72be0d3a4d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next *) SECURITY: CVE-2022-25147 (cve.mitre.org) Integer Overflow or Wraparound vulnerability in apr_base64 functions of Apache Portable Runtime Utility (APR-util) allows an attacker to write beyond bounds of a buffer. https://downloads.apache.org/apr/Announcement-aprutil-1.x.html https://downloads.apache.org/apr/CHANGES-APR-UTIL-1.6 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/apr-util/apr-util.hash | 4 ++-- package/apr-util/apr-util.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apr-util/apr-util.hash b/package/apr-util/apr-util.hash index 59ef590109..7e2793cd77 100644 --- a/package/apr-util/apr-util.hash +++ b/package/apr-util/apr-util.hash @@ -1,4 +1,4 @@ -# From http://www.apache.org/dist/apr/apr-util-1.6.1.tar.bz2.sha256 -sha256 d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b apr-util-1.6.1.tar.bz2 +# From http://www.apache.org/dist/apr/apr-util-1.6.3.tar.bz2.sha256 +sha256 a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5 apr-util-1.6.3.tar.bz2 # Locally calculated sha256 ef5609d18601645ad6fe22c6c122094be40e976725c1d0490778abacc836e7a2 LICENSE diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index fb0735f5e7..02b6d5e277 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -4,7 +4,7 @@ # ################################################################################ -APR_UTIL_VERSION = 1.6.1 +APR_UTIL_VERSION = 1.6.3 APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2 APR_UTIL_SITE = https://archive.apache.org/dist/apr APR_UTIL_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 20:57:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:57:24 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/nginx-naxsi: fix build with pcre2 In-Reply-To: <20230219173536.615233-1-fontaine.fabrice@gmail.com> References: <20230219173536.615233-1-fontaine.fabrice@gmail.com> Message-ID: <20230220215724.538719dd@windsurf> On Sun, 19 Feb 2023 18:35:36 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump of nginx to version > 1.22.1 in commit 722b84eafa5e3d9540e0a80bae0c971a3a778358: > > /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c: In function 'ngx_http_process_basic_rule_buffer': > /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c:205:61: error: invalid use of incomplete typedef 'ngx_regex_t' {aka 'struct pcre2_real_code_8'} > 205 | (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, > | ^~ > > Fixes: > - http://autobuild.buildroot.org/results/7fff888bd36710e2d2f5bb39a38597e8c04305ce > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Fix patch number Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 20 20:56:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:33 -0000 Subject: [Buildroot] [git commit branch/next] package/webkitgtk: security bump to version 2.38.3 Message-ID: <20230220205222.B16A78648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d64a089a64aff7c8cbf197beea460d644646243d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bugfix release, with a security patch for CVE-2022-42799, CVE-2022-42823, CVE-2022-42824, CVE-2022-42852, CVE-2022-42856, CVE-2022-42863, CVE-2022-42867, CVE-2022-46691, CVE-2022-46692, CVE-2022-46698, CVE-2022-46699 and CVE-2022-46700. Release notes: https://webkitgtk.org/2022/10/20/webkitgtk2.38.1-released.html https://webkitgtk.org/2022/11/04/webkitgtk2.38.2-released.html https://webkitgtk.org/2022/12/22/webkitgtk2.38.3-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2022-0010.html https://webkitgtk.org/security/WSA-2022-0011.html Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index c2512be9c6..eff7f5c18f 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.0.tar.xz.sums -md5 a69cd8fc05f7299458b4faf1bc99b875 webkitgtk-2.38.0.tar.xz -sha1 6dcb65b8dc56c52f086bfeecfca7920e9cc78348 webkitgtk-2.38.0.tar.xz -sha256 f9ce6375a3b6e1329b0b609f46921e2627dc7ad6224b37b967ab2ea643bc0fbd webkitgtk-2.38.0.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums +md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz +sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz +sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 336744954e..b1bca7b88a 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.0 +WEBKITGTK_VERSION = 2.38.3 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:56:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:33 -0000 Subject: [Buildroot] [git commit branch/next] package/arp-scan: bump to version 1.10.0 Message-ID: <20230220205211.116D18648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1975c531764828fbdaff673e4cf1f25ea009aa2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Use official tarball and so drop autoreconf - libcap is an optional dependency since https://github.com/royhills/arp-scan/commit/923f123a281139f1ec3daceb1db4bc7317ec6978 https://github.com/royhills/arp-scan/releases/tag/1.10.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/arp-scan/arp-scan.hash | 2 +- package/arp-scan/arp-scan.mk | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/arp-scan/arp-scan.hash b/package/arp-scan/arp-scan.hash index b18c6ceb38..3a2977f906 100644 --- a/package/arp-scan/arp-scan.hash +++ b/package/arp-scan/arp-scan.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b9b75ceaef6348f5951b06c773ec7a243a9e780e160eafebc369f9c27f6a7d3f arp-scan-1.9.8.tar.gz +sha256 a078fe8711ecbb8b99121c3d8be26ae7e7f339f11010ef61318be4f33394d012 arp-scan-1.10.0.tar.gz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/arp-scan/arp-scan.mk b/package/arp-scan/arp-scan.mk index 73d1b99bc7..89644be9d3 100644 --- a/package/arp-scan/arp-scan.mk +++ b/package/arp-scan/arp-scan.mk @@ -4,12 +4,11 @@ # ################################################################################ -ARP_SCAN_VERSION = 1.9.8 -ARP_SCAN_SITE = $(call github,royhills,arp-scan,$(ARP_SCAN_VERSION)) +ARP_SCAN_VERSION = 1.10.0 +ARP_SCAN_SITE = https://github.com/royhills/arp-scan/releases/download/$(ARP_SCAN_VERSION) ARP_SCAN_LICENSE = GPL-3.0+ ARP_SCAN_LICENSE_FILES = COPYING ARP_SCAN_DEPENDENCIES = libpcap -ARP_SCAN_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) ARP_SCAN_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" @@ -17,4 +16,11 @@ endif ARP_SCAN_CONF_ENV = pgac_cv_snprintf_long_long_int_format='%lld' +ifeq ($(BR2_PACKAGE_LIBCAP),y) +ARP_SCAN_DEPENDENCIES += libcap +ARP_SCAN_CONF_OPTS += --with-libcap +else +ARP_SCAN_CONF_OPTS += --without-libcap +endif + $(eval $(autotools-package)) From peter at korsgaard.com Mon Feb 20 20:56:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:56:34 -0000 Subject: [Buildroot] [git commit branch/next] package/wpebackend-fdo: bump to version 1.14.0 Message-ID: <20230220205223.231BD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76dfd8d0278d75dabfe2871cd4e683b7a2790d26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This new version contains only small fixes after 1.12.1. Release notes: https://wpewebkit.org/release/wpebackend-fdo-1.14.0.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index 49c60fce0f..e2f2c6c89f 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.12.1.tar.xz.sums -md5 494f4a5b2bd89dacef37b69534b2e1ce wpebackend-fdo-1.12.1.tar.xz -sha1 72a85e4615e085926f7ad8fc8414f9c6a878ef28 wpebackend-fdo-1.12.1.tar.xz -sha256 45aa833c44ec292f31fa943b01b8cc75e54eb623ad7ba6a66fc2f118fe69e629 wpebackend-fdo-1.12.1.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.14.0.tar.xz.sums +md5 ea62dfa9ecb366598a837d7446ed48ac wpebackend-fdo-1.14.0.tar.xz +sha1 1500be9212381a404f4a46b22b90a9880ba11c01 wpebackend-fdo-1.14.0.tar.xz +sha256 e75b0cb2c7145448416e8696013d8883f675c66c11ed750e06865efec5809155 wpebackend-fdo-1.14.0.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk index 2e2bdee94e..afe37b086e 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.12.1 +WPEBACKEND_FDO_VERSION = 1.14.0 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 20 20:57:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:02 -0000 Subject: [Buildroot] [git commit branch/next] package/python-maturin: bump to version 0.14.9 Message-ID: <20230220205230.5A8A086495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3949fe31120917b2bac139fbfc6f285ef0f780ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index 9d68751c03..b104b1fbbe 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 383f60977a330ec8699a51c37ea9c5175ee7e95fc36b06d9415e0eec1f3acaf0 maturin-0.14.5.tar.gz +sha256 59157a06c0a482aec750d64746f2b23e556ce3ec62d9cdce74fcb7b4658b722b maturin-0.14.9.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index 4570ad4535..3484e09d22 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.5 +PYTHON_MATURIN_VERSION = 0.14.9 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/36/83/2bdec738921e253d774ab8b9e99f4540a406ad0d8a1442c84575e5506686 +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/90/f9/f4242c0e8bc5def9a7135c12574449dbb411ecc595cf72202ca97a79c2ad PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From peter at korsgaard.com Mon Feb 20 20:57:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:03 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Daniel Lang for package/libsigc Message-ID: <20230220205230.92D5A86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=189543e4ab6c421001209423cce45c75e3242d75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8e1d68c026..e8e0dffcd3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -639,6 +639,7 @@ F: package/dacapo/ N: Daniel Lang F: package/dbus-cxx/ +F: package/libsigc/ F: package/paho-mqtt-cpp/ N: Damien Lanson From peter at korsgaard.com Mon Feb 20 20:57:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:03 -0000 Subject: [Buildroot] [git commit branch/next] package/gcnano-binaries: bump version to 6.4.9 Message-ID: <20230220205213.75DAB81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ddf15854deb5f03a4c98afa6c86f9f3b4d6893c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Update to the latest version of the gcnano-binaries blobs, which are compatible with the last v5.15-stm32mp-r2 kernel from the STMicroelectronics BSP. The management of libraries links have now changed. We moved on from a version with several links present but few of them missing to no links at all. Now, all the links are made by the build system. The loop mechanism to make them are imported from the ST Yocto layer. The packageconfig have also changed, no need to update prefix and version value anymore. Signed-off-by: Kory Maincent Signed-off-by: Peter Korsgaard --- package/gcnano-binaries/gcnano-binaries.hash | 2 +- package/gcnano-binaries/gcnano-binaries.mk | 30 +++++++++++----------------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/package/gcnano-binaries/gcnano-binaries.hash b/package/gcnano-binaries/gcnano-binaries.hash index 1ed66e3753..7bb942e6da 100644 --- a/package/gcnano-binaries/gcnano-binaries.hash +++ b/package/gcnano-binaries/gcnano-binaries.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d3aebbc87ca27e743fdd21d71025cdf0761af748907bbdd7b193262eb48ab3c7 gcnano-binaries-a20611434ef048d3d0c04f55b6cd7d75a2156d43.tar.gz +sha256 b122a0cd7a1bd2cee8c6117b259ef977a765d24e48655f639694cbef471da99b gcnano-binaries-0ac1a89d7a59d040a69745a85f0da7e98644cc4b.tar.gz sha256 7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57 EULA diff --git a/package/gcnano-binaries/gcnano-binaries.mk b/package/gcnano-binaries/gcnano-binaries.mk index d9c47bf64e..83261f3b7c 100644 --- a/package/gcnano-binaries/gcnano-binaries.mk +++ b/package/gcnano-binaries/gcnano-binaries.mk @@ -4,10 +4,10 @@ # ################################################################################ -GCNANO_BINARIES_LIB_VERSION = 6.4.7 +GCNANO_BINARIES_LIB_VERSION = 6.4.9 GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION) -GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20220524 -GCNANO_BINARIES_VERSION = a20611434ef048d3d0c04f55b6cd7d75a2156d43 +GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20221206 +GCNANO_BINARIES_VERSION = 0ac1a89d7a59d040a69745a85f0da7e98644cc4b GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION)) GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms @@ -38,31 +38,25 @@ GCNANO_BINARIES_POST_EXTRACT_HOOKS += GCNANO_BINARIES_EXTRACT_HELPER GCNANO_BINARIES_MODULE_MAKE_OPTS = \ KERNEL_DIR=$(LINUX_DIR) \ - SOC_PLATFORM=st-st \ + SOC_PLATFORM=st-mp1 \ AQROOT=$(@D) \ DEBUG=0 GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION) -# This creates: -# libGLESv2.so.2 -> libGLESv2.so -# libGLESv1_CM.so.1 -> libGLESv1_CM.so -# symlinks, as most OpenGL implementations have them, and they are -# expected by some users such as libepoxy. define GCNANO_BINARIES_INSTALL cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/drivers/ ; \ find . -type f -exec $(INSTALL) -D -m 0755 {} $(1)/usr/lib/{} \; ; \ - find . -type l -exec cp -a {} $(1)/usr/lib \; - ln -sf libGLESv2.so $(1)/usr/lib/libGLESv2.so.2 - ln -sf libGLESv1_CM.so $(1)/usr/lib/libGLESv1_CM.so.1 + for sharelib in *.so.*; do \ + dev_lib_name=`echo $${sharelib} | awk -F'.so' '{print $$1}'`.so ; \ + link_name=`$(TARGET_OBJDUMP) -x $${sharelib} 2>/dev/null | grep SONAME | sed 's/.* //'` ; \ + ln -sf $${sharelib} $(1)/usr/lib/$${dev_lib_name} ; \ + ln -sf $${sharelib} $(1)/usr/lib/$${link_name} ; \ + done mkdir -p $(1)/usr/include cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/* $(1)/usr/include/ - ln -sf gbm/gbm.h $(1)/usr/include/gbm.h - cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/ ; \ - for file in *.pc ; do \ - sed -e "s|#PREFIX#|/usr|" -e "s|#VERSION#|21.1.1|" $$file > $$file.temp ; \ - $(INSTALL) -D -m 0644 $$file.temp $(1)/usr/lib/pkgconfig/$$file ; \ - done + mkdir -p $(1)/usr/lib/pkgconfig/ + cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/* $(1)/usr/lib/pkgconfig/ endef define GCNANO_BINARIES_INSTALL_TARGET_CMDS From peter at korsgaard.com Mon Feb 20 20:57:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:57:22 -0000 Subject: [Buildroot] [git commit branch/next] package/memcached: bump to version 1.6.17 Message-ID: <20230220205215.101B58648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f81b1358fc115fc854a9c9699daaca4be713f873 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Refresh second patch - Drop fourth patch (already in version) https://github.com/memcached/memcached/wiki/ReleaseNotes1617 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/memcached/0002-check-for-sys-auxv.h.patch | 10 +- ...ure-ac-use-pkg-config-to-retrieve-openssl.patch | 181 --------------------- package/memcached/memcached.hash | 6 +- package/memcached/memcached.mk | 2 +- 4 files changed, 9 insertions(+), 190 deletions(-) diff --git a/package/memcached/0002-check-for-sys-auxv.h.patch b/package/memcached/0002-check-for-sys-auxv.h.patch index 8c41bb4f01..a7d0dfdd00 100644 --- a/package/memcached/0002-check-for-sys-auxv.h.patch +++ b/package/memcached/0002-check-for-sys-auxv.h.patch @@ -37,14 +37,14 @@ index 26df879..05e61ff 100644 --- a/crc32c.c +++ b/crc32c.c @@ -273,7 +273,7 @@ void crc32c_init(void) { - } } --#elif defined(__aarch64__) && defined(__linux__) -+#elif defined(__aarch64__) && defined(__linux__) && defined(HAVE_SYS_AUX_H) + #elif defined(__aarch64__) && (defined(__linux__) || defined(__APPLE__)) +-#if defined(__linux__) ++#if defined(__linux__) && defined(HAVE_SYS_AUX_H) #include - - #if defined(HWCAP_CRC32) + #elif defined(__APPLE__) + #include -- 2.35.1 diff --git a/package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch b/package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch deleted file mode 100644 index 402fa03b3b..0000000000 --- a/package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 656dedad48c81541060448d008b90290196263c5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 6 Sep 2020 23:38:19 +0200 -Subject: [PATCH] configure.ac: use pkg-config to retrieve openssl - -Use pkg-config to retrieve openssl dependencies such as -latomic or -lz - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/memcached/memcached/commit/656dedad48c81541060448d008b90290196263c5] ---- - README.md | 2 +- - configure.ac | 133 ++++++++++++++++++++++++++------------------------- - 2 files changed, 69 insertions(+), 66 deletions(-) - -diff --git a/README.md b/README.md -index 3ce1bc2156..8fe067b767 100644 ---- a/README.md -+++ b/README.md -@@ -21,7 +21,7 @@ list to ask questions, github issues aren't seen by everyone! - * libseccomp (optional, experimental, linux) - enables process restrictions for - better security. Tested only on x86-64 architectures. - * openssl (optional) - enables TLS support. need relatively up to date -- version. -+ version. pkg-config is needed to find openssl dependencies (such as -lz). - - ## Environment - -diff --git a/configure.ac b/configure.ac -index a0851f2131..2959a86c89 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -437,80 +437,83 @@ AC_ARG_WITH(libssl, - dnl ---------------------------------------------------------------------------- - dnl libssl detection. swiped from libevent. modified for openssl detection. - -+PKG_PROG_PKG_CONFIG - OPENSSL_URL=https://www.openssl.org/ - if test "x$enable_tls" = "xyes"; then -- AC_CACHE_CHECK([for libssl directory], ac_cv_libssl_dir, [ -- saved_LIBS="$LIBS" -- saved_LDFLAGS="$LDFLAGS" -- saved_CPPFLAGS="$CPPFLAGS" -- le_found=no -- for ledir in $trylibssldir "" $prefix /usr/local ; do -+ PKG_CHECK_MODULES(OPENSSL, openssl, [LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_CFLAGS"], [ -+ AC_CACHE_CHECK([for libssl directory], ac_cv_libssl_dir, [ -+ saved_LIBS="$LIBS" -+ saved_LDFLAGS="$LDFLAGS" -+ saved_CPPFLAGS="$CPPFLAGS" -+ le_found=no -+ for ledir in $trylibssldir "" $prefix /usr/local ; do -+ LDFLAGS="$saved_LDFLAGS" -+ LIBS="-lssl -lcrypto $saved_LIBS" -+ -+ # Skip the directory if it isn't there. -+ if test ! -z "$ledir" -a ! -d "$ledir" ; then -+ continue; -+ fi -+ if test ! -z "$ledir" ; then -+ if test -d "$ledir/lib" ; then -+ LDFLAGS="-L$ledir/lib $LDFLAGS" -+ else -+ LDFLAGS="-L$ledir $LDFLAGS" -+ fi -+ if test -d "$ledir/include" ; then -+ CPPFLAGS="-I$ledir/include $CPPFLAGS" -+ else -+ CPPFLAGS="-I$ledir $CPPFLAGS" -+ fi -+ fi -+ # Can I compile and link it? -+ AC_TRY_LINK([#include -+ #include -+ #include -+ #include ], [ SSL_CTX* ssl_ctx = SSL_CTX_new(TLS_server_method()); -+ assert(OPENSSL_VERSION_NUMBER >= 0x10100000L);], -+ [ libssl_linked=yes ], [ libssl_linked=no ]) -+ if test $libssl_linked = yes; then -+ if test ! -z "$ledir" ; then -+ ac_cv_libssl_dir=$ledir -+ _myos=`echo $target_os | cut -f 1 -d .` -+ AS_IF(test "$SUNCC" = "yes" -o "x$_myos" = "xsolaris2", -+ [saved_LDFLAGS="$saved_LDFLAGS -Wl,-R$ledir/lib"], -+ [AS_IF(test "$GCC" = "yes", -+ [saved_LDFLAGS="$saved_LDFLAGS -Wl,-rpath,$ledir/lib"])]) -+ else -+ ac_cv_libssl_dir="(system)" -+ fi -+ le_found=yes -+ break -+ fi -+ done -+ LIBS="$saved_LIBS" - LDFLAGS="$saved_LDFLAGS" -- LIBS="-lssl -lcrypto $saved_LIBS" -+ CPPFLAGS="$saved_CPPFLAGS" -+ if test $le_found = no ; then -+ AC_MSG_ERROR([libssl (at least version 1.1.0) is required. You can get it from $OPENSSL_URL - -- # Skip the directory if it isn't there. -- if test ! -z "$ledir" -a ! -d "$ledir" ; then -- continue; -+ If it's already installed, specify its path using --with-libssl=/dir/ -+ ]) - fi -- if test ! -z "$ledir" ; then -- if test -d "$ledir/lib" ; then -- LDFLAGS="-L$ledir/lib $LDFLAGS" -- else -- LDFLAGS="-L$ledir $LDFLAGS" -- fi -- if test -d "$ledir/include" ; then -- CPPFLAGS="-I$ledir/include $CPPFLAGS" -- else -- CPPFLAGS="-I$ledir $CPPFLAGS" -- fi -+ ]) -+ LIBS="-lssl -lcrypto $LIBS" -+ if test $ac_cv_libssl_dir != "(system)"; then -+ if test -d "$ac_cv_libssl_dir/lib" ; then -+ LDFLAGS="-L$ac_cv_libssl_dir/lib $LDFLAGS" -+ le_libdir="$ac_cv_libssl_dir/lib" -+ else -+ LDFLAGS="-L$ac_cv_libssl_dir $LDFLAGS" -+ le_libdir="$ac_cv_libssl_dir" - fi -- # Can I compile and link it? -- AC_TRY_LINK([#include -- #include -- #include -- #include ], [ SSL_CTX* ssl_ctx = SSL_CTX_new(TLS_server_method()); -- assert(OPENSSL_VERSION_NUMBER >= 0x10100000L);], -- [ libssl_linked=yes ], [ libssl_linked=no ]) -- if test $libssl_linked = yes; then -- if test ! -z "$ledir" ; then -- ac_cv_libssl_dir=$ledir -- _myos=`echo $target_os | cut -f 1 -d .` -- AS_IF(test "$SUNCC" = "yes" -o "x$_myos" = "xsolaris2", -- [saved_LDFLAGS="$saved_LDFLAGS -Wl,-R$ledir/lib"], -- [AS_IF(test "$GCC" = "yes", -- [saved_LDFLAGS="$saved_LDFLAGS -Wl,-rpath,$ledir/lib"])]) -- else -- ac_cv_libssl_dir="(system)" -- fi -- le_found=yes -- break -+ if test -d "$ac_cv_libssl_dir/include" ; then -+ CPPFLAGS="-I$ac_cv_libssl_dir/include $CPPFLAGS" -+ else -+ CPPFLAGS="-I$ac_cv_libssl_dir $CPPFLAGS" - fi -- done -- LIBS="$saved_LIBS" -- LDFLAGS="$saved_LDFLAGS" -- CPPFLAGS="$saved_CPPFLAGS" -- if test $le_found = no ; then -- AC_MSG_ERROR([libssl (at least version 1.1.0) is required. You can get it from $OPENSSL_URL -- -- If it's already installed, specify its path using --with-libssl=/dir/ -- ]) - fi - ]) -- LIBS="-lssl -lcrypto $LIBS" -- if test $ac_cv_libssl_dir != "(system)"; then -- if test -d "$ac_cv_libssl_dir/lib" ; then -- LDFLAGS="-L$ac_cv_libssl_dir/lib $LDFLAGS" -- le_libdir="$ac_cv_libssl_dir/lib" -- else -- LDFLAGS="-L$ac_cv_libssl_dir $LDFLAGS" -- le_libdir="$ac_cv_libssl_dir" -- fi -- if test -d "$ac_cv_libssl_dir/include" ; then -- CPPFLAGS="-I$ac_cv_libssl_dir/include $CPPFLAGS" -- else -- CPPFLAGS="-I$ac_cv_libssl_dir $CPPFLAGS" -- fi -- fi - fi - - if test "x$enable_static" = "xyes"; then diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 3bdd1e5e33..78875dde66 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.6.16.tar.gz.sha1 -sha1 724f31c3462fb6b07264d72d0043fd65545fd84a memcached-1.6.16.tar.gz +# From http://www.memcached.org/files/memcached-1.6.17.tar.gz.sha1 +sha1 e25639473e15f1bd9516b915fb7e03ab8209030f memcached-1.6.17.tar.gz # Locally computed -sha256 3051a93bf1dd0c3af2d0e589ff6ef6511f876385a35b18e9ff8741e4a1ab34da memcached-1.6.16.tar.gz +sha256 2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224 memcached-1.6.17.tar.gz sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 7b4069e820..7183da6c14 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.6.16 +MEMCACHED_VERSION = 1.6.17 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From yann.morin.1998 at free.fr Mon Feb 20 20:57:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:57:23 -0000 Subject: [Buildroot] [git commit branch/next] package/python-pytest-asyncio: bump to version 0.20.3 Message-ID: <20230220205235.7AB0286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cec8c511127ccb6223a133399a88b3fd5cd8ded9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-pytest-asyncio/python-pytest-asyncio.hash | 4 ++-- package/python-pytest-asyncio/python-pytest-asyncio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.hash b/package/python-pytest-asyncio/python-pytest-asyncio.hash index b683c60553..051670aa51 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.hash +++ b/package/python-pytest-asyncio/python-pytest-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest-asyncio/json -md5 894109d45a7b6f46718bbe4611aa7817 pytest-asyncio-0.20.1.tar.gz -sha256 626699de2a747611f3eeb64168b3575f70439b06c3d0206e6ceaeeb956e65519 pytest-asyncio-0.20.1.tar.gz +md5 dce438c7b0081d7f580b5a79d7105570 pytest-asyncio-0.20.3.tar.gz +sha256 83cbf01169ce3e8eb71c6c278ccb0574d1a7a3bb8eaaf5e50e0ad342afb33b36 pytest-asyncio-0.20.3.tar.gz # Locally computed sha256 checksums sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.mk b/package/python-pytest-asyncio/python-pytest-asyncio.mk index b70e0ad0f4..c94c9ea876 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.mk +++ b/package/python-pytest-asyncio/python-pytest-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_ASYNCIO_VERSION = 0.20.1 +PYTHON_PYTEST_ASYNCIO_VERSION = 0.20.3 PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/9e/8f/5a918ac4e2366b61156e16fa9bfb3be52401d81f5309efb1f4e04d99ac39 +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/6e/06/38b0ca5d53582bb49697626975b5540435ea064762d852b5c66646c729e9 PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 20 20:58:22 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:22 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx8mqevk: update codeaurora URLs to github Message-ID: <20230220205221.3D1378648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a01cb853fe978d85037d9a4dd762113c9132dc4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mqevk_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8mqevk_defconfig b/configs/freescale_imx8mqevk_defconfig index 7f5dd87b5f..e3f88dc44c 100644 --- a/configs/freescale_imx8mqevk_defconfig +++ b/configs/freescale_imx8mqevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-evk" @@ -19,16 +18,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From thomas.petazzoni at bootlin.com Mon Feb 20 20:58:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:58:23 -0000 Subject: [Buildroot] [git commit branch/next] configs/imx8mn_bsh_smm_s2_pro_defconfig: new defconfig Message-ID: <20230220205242.D919E8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=498797acce390a8c91b6a3c306a4655e83ae9f6f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next BSH SMM S2 PRO (SystemMaster S2 Pro) Board is an add-on board which provide input and output interfaces to a dedicated carrier board. It is designed mainly to provide graphical/video and connectivity interfaces to the appliance. Board support package includes the following components: - mainline Linux kernel 6.1.6 - mainline U-Boot 2022-07 - Default packages from buildroot https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ Add Ariel D'Alessandro and Dario Binacchi as co-maintainer, we work together on platform mainline Build and tested using: docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 Cc: Ariel D'Alessandro Cc: Jagan Teki Cc: Heiko Thiery Cc: Giulio Benetti Reviewed-by: Giulio Benetti Reviewed-by: Heiko Thiery Signed-off-by: Michael Trimarchi Tested-by: Ariel D'Alessandro Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++ .../{ => common}/imx8mn-bsh-smm-s2/linux.fragment | 0 board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf | 4 ++ board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh | 23 +++++++ board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg | 17 +++++ board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh | 7 +++ board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh | 3 + board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt | 73 ++++++++++++++++++++++ configs/imx8mn_bsh_smm_s2_defconfig | 2 +- ...2_defconfig => imx8mn_bsh_smm_s2_pro_defconfig} | 19 +++--- 10 files changed, 142 insertions(+), 10 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 2e187d7b03..e942b4b3f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -225,6 +225,8 @@ F: configs/snps_archs38_haps_defconfig F: configs/snps_archs38_hsdk_defconfig N: Ariel D'Alessandro +F: board/bsh/ +F: configs/imx8mn_bsh_smm_s2_pro_defconfig F: package/axfsutils/ F: package/mali-t76x/ @@ -688,6 +690,7 @@ F: package/xinetd/ N: Dario Binacchi F: board/bsh/ F: configs/imx8mn_bsh_smm_s2_defconfig +F: configs/imx8mn_bsh_smm_s2_pro_defconfig F: package/sscep/ F: package/uuu/ @@ -2122,6 +2125,7 @@ F: package/python-pyzmq/ N: Michael Trimarchi F: board/bsh/ F: configs/imx8mn_bsh_smm_s2_defconfig +F: configs/imx8mn_bsh_smm_s2_pro_defconfig F: package/python-spidev/ N: Michael Vetter diff --git a/board/bsh/imx8mn-bsh-smm-s2/linux.fragment b/board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment similarity index 100% rename from board/bsh/imx8mn-bsh-smm-s2/linux.fragment rename to board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf b/board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf new file mode 100644 index 0000000000..9111354742 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh b/board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh new file mode 100755 index 0000000000..17b20f0097 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +if [ $# -eq 0 ]; then + OUTPUT_DIR=output +else + OUTPUT_DIR=$1 +fi + +if ! test -d "${OUTPUT_DIR}" ; then + echo "ERROR: no output directory specified." + echo "Usage: $0 OUTPUT_DIR" + echo "" + echo "Arguments:" + echo " OUTPUT_DIR The Buildroot output directory." + exit 1 +fi + +IMAGES_DIR=${OUTPUT_DIR}/images + +${OUTPUT_DIR}/host/bin/uuu -v -b emmc_all \ + ${IMAGES_DIR}/flash.bin \ + ${IMAGES_DIR}/sdcard.img + diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg b/board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg new file mode 100644 index 0000000000..10c52548cd --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 32K + } + + partition rootfs { + offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh b/board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh b/board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh new file mode 100755 index 0000000000..3452fd4501 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt b/board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt new file mode 100644 index 0000000000..5763f164fe --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt @@ -0,0 +1,73 @@ +i.MX8MN BSH SMM S2 PRO +====================== + +How to build it +--------------- + +Configure buildroot: + + $ make imx8mn_bsh_smm_s2_pro_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +------------------- + +After building, the output/images directory contains: + + output/images/ + ????????? bl31.bin + ????????? Image + ????????? flash.bin + ????????? ddr3* + ????????? rootfs.ext2 + ????????? rootfs.ext4 -> rootfs.ext2 + ????????? rootfs.tar + ????????? sdcard.img + ????????? u-boot.bin + ????????? u-boot-nodtb.bin + ????????? u-boot-spl.bin + + +Preparing the board +------------------- + +Plug the USB type A to micro B cable into the USB Debug +Connector (DBG UART). Use serial port settings 115200 8N1 +to access the debug console. + +Plug another USB type A to micro B cable into the USB-OTG +Connector (USB1). This connection is used to flash the board +firmware using the Freescale/NXP UUU tool. + +Connect the power supply/adaptor to the DC Power Jack (labelled ++5V). + + +Flashing the emmc card image +---------------------------- + +Power up the board by switching on the Power ON Switch, which is +placed right next to the DC Jack. + +Enter the following U-Boot commands on the debug serial console: + + $ fastboot usb 0 + +Flash the images on eMMC. On your computer, run: + + $ board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh output/ + + +Booting the board +----------------- + +By default the bootloader will search for the first valid image, +starting with the internal eMMC. diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig index 4b03d2e89e..9b8ac8bfe2 100644 --- a/configs/imx8mn_bsh_smm_s2_defconfig +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -7,7 +7,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.6" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/imx8mn-bsh-smm-s2/linux.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2" BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_pro_defconfig similarity index 69% copy from configs/imx8mn_bsh_smm_s2_defconfig copy to configs/imx8mn_bsh_smm_s2_pro_defconfig index 4b03d2e89e..ebef4e5932 100644 --- a/configs/imx8mn_bsh_smm_s2_defconfig +++ b/configs/imx8mn_bsh_smm_s2_pro_defconfig @@ -1,35 +1,35 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y -BR2_GLOBAL_PATCH_DIR="board/bsh/imx8mn-bsh-smm-s2/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2/post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.6" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/imx8mn-bsh-smm-s2/linux.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y BR2_PACKAGE_FIRMWARE_IMX=y BR2_PACKAGE_FIRMWARE_IMX_DDR3=y -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 -BR2_TARGET_ROOTFS_UBIFS_RT_NONE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -38,4 +38,5 @@ BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UUU=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:23 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:23 -0000 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx8qmmek: update codeaurora URLs to github Message-ID: <20230220205221.7A7A98648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47f2896fe36b4439b80b149f86f1975c53b1e5bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8qmmek_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8qmmek_defconfig b/configs/freescale_imx8qmmek_defconfig index 8a0e866cee..75777646df 100644 --- a/configs/freescale_imx8qmmek_defconfig +++ b/configs/freescale_imx8qmmek_defconfig @@ -4,9 +4,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qm-mek.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qm-mek" @@ -20,16 +19,14 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From yann.morin.1998 at free.fr Mon Feb 20 20:58:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:24 -0000 Subject: [Buildroot] [git commit branch/next] package/python-trio: new package Message-ID: <20230220205243.87A3D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c09481f7f0419e8a69a2813052bc56895a598353 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-trio/Config.in | 12 ++++++++++++ package/python-trio/python-trio.hash | 7 +++++++ package/python-trio/python-trio.mk | 14 ++++++++++++++ 5 files changed, 35 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b686dbd87a..9fdc66f60b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1402,6 +1402,7 @@ F: package/python-sockjs/ F: package/python-terminaltables/ F: package/python-tinycss2/ F: package/python-tomli/ +F: package/python-trio/ F: package/python-typeguard/ F: package/python-typing-inspect/ F: package/python-uhid/ diff --git a/package/Config.in b/package/Config.in index 195398b844..aa6bb7bce3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1306,6 +1306,7 @@ menu "External python modules" source "package/python-tqdm/Config.in" source "package/python-traitlets/Config.in" source "package/python-treq/Config.in" + source "package/python-trio/Config.in" source "package/python-twisted/Config.in" source "package/python-txaio/Config.in" source "package/python-txdbus/Config.in" diff --git a/package/python-trio/Config.in b/package/python-trio/Config.in new file mode 100644 index 0000000000..0aa53c90ca --- /dev/null +++ b/package/python-trio/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_TRIO + bool "python-trio" + select BR2_PACKAGE_PYTHON_ASYNC_GENERATOR # runtime + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_IDNA # runtime + select BR2_PACKAGE_PYTHON_OUTCOME # runtime + select BR2_PACKAGE_PYTHON_SNIFFIO # runtime + select BR2_PACKAGE_PYTHON_SORTEDCONTAINERS # runtime + help + A friendly Python library for async concurrency and I/O. + + https://github.com/python-trio/trio diff --git a/package/python-trio/python-trio.hash b/package/python-trio/python-trio.hash new file mode 100644 index 0000000000..487194662e --- /dev/null +++ b/package/python-trio/python-trio.hash @@ -0,0 +1,7 @@ +# md5, sha256 from https://pypi.org/pypi/trio/json +md5 f7dbfa6a8722065f09da188641d8ed93 trio-0.22.0.tar.gz +sha256 ce68f1c5400a47b137c5a4de72c7c901bd4e7a24fbdebfe9b41de8c6c04eaacf trio-0.22.0.tar.gz +# Locally computed sha256 checksums +sha256 418d025e1284311f2690263e6efa6bf51585e5741818ece63e5862487e505bb9 LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE2 +sha256 faa301d72dcc023b432bd77dc08a773ca3449e5c27440b9d66eb46fb8500b430 LICENSE.MIT diff --git a/package/python-trio/python-trio.mk b/package/python-trio/python-trio.mk new file mode 100644 index 0000000000..80da203c15 --- /dev/null +++ b/package/python-trio/python-trio.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-trio +# +################################################################################ + +PYTHON_TRIO_VERSION = 0.22.0 +PYTHON_TRIO_SOURCE = trio-$(PYTHON_TRIO_VERSION).tar.gz +PYTHON_TRIO_SITE = https://files.pythonhosted.org/packages/0b/b8/1b81d2149c3e2c25900d40b8e6c8d3ca502a3cc844b90c962b0854aaf3f3 +PYTHON_TRIO_SETUP_TYPE = setuptools +PYTHON_TRIO_LICENSE = Apache-2.0 or MIT +PYTHON_TRIO_LICENSE_FILES = LICENSE LICENSE.APACHE2 LICENSE.MIT + +$(eval $(python-package)) From yann.morin.1998 at free.fr Mon Feb 20 20:58:24 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:58:24 -0000 Subject: [Buildroot] [git commit branch/next] package/modem-manager: disable man pages Message-ID: <20230220205221.C808E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bca2c28fc9ed2ebca91e6f1347d947389997a4c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modem-manager/modem-manager.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 5b8b9c5576..f1fc17523a 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -13,6 +13,7 @@ MODEM_MANAGER_SELINUX_MODULES = modemmanager MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIES) host-libxslt MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = \ + -Dman=false \ -Dpowerd_suspend_resume=false \ -Dtests=false \ -Dudevdir=/usr/lib/udev From peter at korsgaard.com Mon Feb 20 20:58:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:58:52 -0000 Subject: [Buildroot] [git commit branch/next] boot/ti-k3-r5-loader: drop bogus TI_K3_R5_LOADER_BOARD Message-ID: <20230220205223.DD4CF828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90e65e46b7c00218058e32efd079df291b736c4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "0189bcb47c boot/ti-k3-r5-loader: new package" added an unused define. The define value is calculated from an inexistent option BR2_TARGET_TI_K3_R5_LOADER_BOARD, so drop the line. Cc: Anand Gadiyar Cc: Xuanhao Shi Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 422ab20d71..afa309aa98 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -26,7 +26,6 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ $(BR2_BISON_HOST_DEPENDENCY) \ $(BR2_FLEX_HOST_DEPENDENCY) -TI_K3_R5_LOADER_BOARD = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD)) ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) From peter at korsgaard.com Mon Feb 20 20:59:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:10 -0000 Subject: [Buildroot] [git commit branch/next] package/falcosecurity-libs: drop bogus FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD Message-ID: <20230220205225.4DBF1828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbb6a55e6e03ea0b4e0a9b744f289e11da963c62 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "a15e35c4eb falcosecurity-libs: add new package" uses the infras kernel-module and generic-package. Neither of them support _SUPPORTS_IN_SOURCE_BUILD, only the CMake infra does. So drop the bogus symbol. Cc: Francis Laniel Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/falcosecurity-libs/falcosecurity-libs.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/falcosecurity-libs/falcosecurity-libs.mk b/package/falcosecurity-libs/falcosecurity-libs.mk index f2c389948f..92d5c61832 100644 --- a/package/falcosecurity-libs/falcosecurity-libs.mk +++ b/package/falcosecurity-libs/falcosecurity-libs.mk @@ -9,7 +9,6 @@ FALCOSECURITY_LIBS_SITE = $(call github,falcosecurity,libs,$(FALCOSECURITY_LIBS_ FALCOSECURITY_LIBS_LICENSE = Apache-2.0 (userspace), MIT or GPL-2.0 (driver) FALCOSECURITY_LIBS_LICENSE_FILES = COPYING driver/MIT.txt driver/GPL2.txt FALCOSECURITY_LIBS_CPE_ID_VENDOR = falco -FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD = NO FALCOSECURITY_LIBS_DEPENDENCIES = \ c-ares \ From peter at korsgaard.com Mon Feb 20 20:59:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:12 -0000 Subject: [Buildroot] [git commit branch/next] package/lrzsz: drop bogus LRZSZ_BUILD_HOOKS Message-ID: <20230220205225.8E7F68648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5fde4abc8d67ac2317b1de7a1b4cde8091f4e3c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "4f3f291a3b lrzsz: convert to autotools infrastructure" converted the package to use autotools infra but added a define that is never called. Drop the bogus define. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/lrzsz/lrzsz.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 45c88619e0..3897975d73 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -18,10 +18,6 @@ define LRZSZ_POST_CONFIGURE_HOOKS $(SED) "s~\(#define ENABLE_SYSLOG.*\)~/* \1 */~;" $(@D)/config.h endef -define LRZSZ_BUILD_HOOKS - $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(@D) -endef - define LRZSZ_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz $(INSTALL) -m 0755 -D $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz From peter at korsgaard.com Mon Feb 6 13:28:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:28:08 +0100 Subject: [Buildroot] [git commit branch/next] package/sunxi-mali-utgard: properly handle legacy for renamed options Message-ID: <20230220205249.CB1B28648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efc223abd4fe764f8af8238aec67e8cb700db45e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit "6a7a652b14 package/sunxi-mali-utgard: rename from sunxi-mali-mainline" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2022.02, following the example described in the beginning of the file. Cc: Giulio Benetti Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/sunxi-mali-utgard/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 53fe2f0b97..4bfebe3f89 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -761,20 +761,22 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 bool "sunxi-mali-mainline-r6p2 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 bool "sunxi-mali-mainline-r8p1 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_QT5WEBKIT_EXAMPLES bool "qt5webkit-examples removed" diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in index ff49ea03f1..59ac21f5ab 100644 --- a/package/sunxi-mali-utgard/Config.in +++ b/package/sunxi-mali-utgard/Config.in @@ -20,6 +20,8 @@ config BR2_PACKAGE_PROVIDES_LIBGLES choice prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 # legacy + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 # legacy default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help Select the version of the userspace module. From peter at korsgaard.com Mon Feb 20 20:59:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:26 -0000 Subject: [Buildroot] [git commit branch/next] package/php: security bump version to 8.1.14 Message-ID: <20230220205226.B9AC6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16168abd26b06656bcc24c2b511c29a0f047ebf4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog: https://www.php.net/ChangeLog-8.php#8.1.14 Fixes CVE 2022-31631: https://bugs.php.net/bug.php?id=81740 Signed-off-by: Bernd Kuhls 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 461dc36031..23ec84f19f 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 b15ef0ccdd6760825604b3c4e3e73558dcf87c75ef1d68ef4289d8fd261ac856 php-8.1.13.tar.xz +sha256 e16e47a872d58685913ac848ce92ec49f42c1828110c98c65fb6265a08724a1a php-8.1.14.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 1fdf5c68a2..23dd4ba96f 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.1.13 +PHP_VERSION = 8.1.14 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 6 13:40:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 14:40:32 +0100 Subject: [Buildroot] [git commit branch/next] Config.in.legacy: select BR2_LEGACY from _XF86_INPUT_KEYBOARD Message-ID: <20230220205249.E4B648648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00410ab668833d822f645fffd782ce11253457b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 1100ead7b318 (package/x11r7/xdriver_xf86-input-keyboard: remove package) added a legacy symbol for BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD, but forgot to select BR2_LEGACY. Fix that. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 1 + 1 file changed, 1 insertion(+) diff --git a/Config.in.legacy b/Config.in.legacy index 4bfebe3f89..191a209eeb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -210,6 +210,7 @@ config BR2_PACKAGE_QEMU_CUSTOM_TARGETS_WRAP config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD bool "xf86-input-keyboard removed" + select BR2_LEGACY help The X.org keyboard input driver no longer support Linux. From peter at korsgaard.com Mon Feb 20 20:59:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:27 -0000 Subject: [Buildroot] [git commit branch/next] package/hiredis: fix debug install Message-ID: <20230220205226.C8FDA8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ff5f7ff0a5ffb8de98d132740fe2fbe4fb71b5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next hiredis suffix its debug libraries with "d" since version 1.1.0 and https://github.com/redis/hiredis/commit/dde6916b42a4723b364355eff8fbb477723a789a resulting in the following build failure with collectd since commit bd7e90779861bb603fc1cca03f6fad4d951f7bd9: redis . . . . . . . . no (symbol 'redisCommand' not found) (dependency error) Fixes: - http://autobuild.buildroot.org/results/394ebf2b6816c69dbdd7901491c0e3fd52befedc Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/hiredis/hiredis.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index d59933845c..f79b6c757a 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -11,7 +11,9 @@ HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING HIREDIS_CPE_ID_VENDOR = redislabs HIREDIS_INSTALL_STAGING = YES -HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON +# Set CMAKE_BUILD_TYPE to Release or the libraries will be suffixed with "d" +# resulting in a build failure with collectd +HIREDIS_CONF_OPTS = -DCMAKE_BUILD_TYPE=Release -DDISABLE_TESTS=ON ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy) HIREDIS_CONF_OPTS += -DENABLE_SSL=ON From peter at korsgaard.com Mon Feb 6 15:30:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:19 +0100 Subject: [Buildroot] [git commit branch/next] package/libvirt: drop reference to legacy BR2_PACKAGE_QEMU_CUSTOM_TARGETS Message-ID: <20230220205250.0541B86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01ce9e95eb4f7fb731b20f3973edd582d4640084 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit 44be514b21fd9409 (package/qemu: refactor target emulator selection) dropped BR2_PACKAGE_QEMU_CUSTOM_TARGETS, but didn't remove the reference from libvirt. Fix that. Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index f0687cd5db..3f4fc70e62 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -73,7 +73,7 @@ config BR2_PACKAGE_LIBVIRT_QEMU select BR2_PACKAGE_HWDATA_PCI_IDS # libpciaccess select BR2_PACKAGE_LIBSECCOMP select BR2_PACKAGE_QEMU - select BR2_PACKAGE_QEMU_SYSTEM if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = "" + select BR2_PACKAGE_QEMU_SYSTEM select BR2_PACKAGE_YAJL help QEMU/KVM support From peter at korsgaard.com Mon Feb 6 15:30:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 6 Feb 2023 16:30:20 +0100 Subject: [Buildroot] [git commit branch/next] utils/check-symbols: new script Message-ID: <20230220205250.3DA9081979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c5472ace2490b2db7f26a79d12b01a8bb5a42dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This script checks for inconsistencies on symbols declared in Config.in and used in .mk files. Currently it checks only symbols following the pattern BR2_\w+ . The script first gets the list of all files in the repository (using git ls-files like 'make check-flake8' already do). Then it parses all relevant files, searching for symbol definitions and usages, and add entries into a database. At the end, the database is searched for inconsistencies: - symbol that is part of "choice" and is referenced with "select"; - legacy symbol being referenced in packages; - legacy symbol being redefined in packages; - symbol referenced but not defined; - symbol defined but not referenced; - legacy symbol that has a Note stating it is referenced by a package (for legacy handling) but is referenced in the package without a comment "# legacy"; - legacy symbol that has a Note stating it is referenced by a package but it is not actually referenced. There is also a debug parameter --search that dumps any filename or symbol entries from the database that matches a regexp. Sample usages: $ utils/check-symbols $ utils/docker-run utils/check-symbols $ utils/check-symbols --search 'GETTEXT\b|\/openssl' At same time the script is created: - add unit tests for it, they can be run using: utils/docker-run python3 -m pytest -v utils/checksymbolslib/ - add two more GitLab CI jobs: check-symbols (to check current tree using the script) and check-check-symbols (to check the script against its unit tests) Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski [Peter: print warnings to stderr, rename change_current_dir() to change_to_top_dir()] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/misc/gitlab-ci.yml.in | 8 + support/scripts/generate-gitlab-ci-yml | 2 +- utils/check-symbols | 78 ++++++ utils/checksymbolslib/__init__.py | 0 utils/checksymbolslib/br.py | 140 +++++++++++ utils/checksymbolslib/db.py | 205 +++++++++++++++ utils/checksymbolslib/file.py | 83 +++++++ utils/checksymbolslib/kconfig.py | 139 +++++++++++ utils/checksymbolslib/makefile.py | 100 ++++++++ utils/checksymbolslib/test_db.py | 286 +++++++++++++++++++++ utils/checksymbolslib/test_file.py | 152 ++++++++++++ utils/checksymbolslib/test_kconfig.py | 438 +++++++++++++++++++++++++++++++++ utils/checksymbolslib/test_makefile.py | 304 +++++++++++++++++++++++ utils/checksymbolslib/test_util.py | 15 ++ 15 files changed, 1951 insertions(+), 1 deletion(-) Patch is too large, so refusing to show it From peter at korsgaard.com Mon Feb 20 20:59:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:28 -0000 Subject: [Buildroot] [git commit branch/next] package/wireshark: add zlib optional dependency Message-ID: <20230220205226.E6887828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6365126e731a1d0bf40eea91cb51b98b6918ecf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next zlib is an optional dependency which is enabled by default since at least version 1.8.0 and https://github.com/wireshark/wireshark/commit/7133f6944dc26740f5ebf56c2ca33be86a6e0f09 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 5da344fc55..f7fd72558e 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -157,6 +157,13 @@ else WIRESHARK_CONF_OPTS += -DBUILD_sdjournal=OFF endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +WIRESHARK_CONF_OPTS += -DENABLE_ZLIB=ON +WIRESHARK_DEPENDENCIES += zlib +else +WIRESHARK_CONF_OPTS += -DENABLE_ZLIB=OFF +endif + ifeq ($(BR2_PACKAGE_ZSTD),y) WIRESHARK_CONF_OPTS += -DENABLE_ZSTD=ON WIRESHARK_DEPENDENCIES += zstd From peter at korsgaard.com Mon Feb 20 20:59:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:29 -0000 Subject: [Buildroot] [git commit branch/next] package/wireshark: add libcap optional dependency Message-ID: <20230220205227.12312828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f70149c80cda5d2f6bbe2266b247d52818391cda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libcap is an optional dependency which is enabled by default since at least version 1.8.0 and https://github.com/wireshark/wireshark/commit/9250a69a9976617c735679aa5383e53802e5b43e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index c1efef2280..d9314fb211 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -65,6 +65,13 @@ else WIRESHARK_CONF_OPTS += -DENABLE_GNUTLS=OFF endif +ifeq ($(BR2_PACKAGE_LIBCAP),y) +WIRESHARK_CONF_OPTS += -DENABLE_CAP=ON +WIRESHARK_DEPENDENCIES += libcap +else +WIRESHARK_CONF_OPTS += -DENABLE_CAP=OFF +endif + ifeq ($(BR2_PACKAGE_LIBKRB5),y) WIRESHARK_CONF_OPTS += -DENABLE_KERBEROS=ON WIRESHARK_DEPENDENCIES += libkrb5 From yann.morin.1998 at free.fr Mon Feb 20 20:59:52 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 20:59:52 -0000 Subject: [Buildroot] [git commit branch/next] package/zstd: disable ccache for host package Message-ID: <20230220205228.AEFD2828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9fba87b8d708caa51ac674a56b9f2a50ed5fdc36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next We need to disable ccache when building host-zstd as the upcoming ccache update depends on host-zstd. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: introduce HOST_ZSTD_ENV] Signed-off-by: Yann E. MORIN --- package/zstd/zstd.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index e8f6315222..73bb97a793 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -96,14 +96,18 @@ define ZSTD_INSTALL_TARGET_CMDS endef HOST_ZSTD_OPTS += PREFIX=$(HOST_DIR) +HOST_ZSTD_ENV = $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) + +# We are a ccache dependency, so we can't use ccache +HOST_ZSTD_ENV += CC="$(HOSTCC_NOCCACHE)" CXX="$(HOSTCXX_NOCCACHE)" define HOST_ZSTD_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ + $(HOST_ZSTD_ENV) $(MAKE) $(HOST_ZSTD_OPTS) \ -C $(@D) zstd-release lib-release endef define HOST_ZSTD_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ + $(HOST_ZSTD_ENV) $(MAKE) $(HOST_ZSTD_OPTS) \ -C $(@D) install endef From thomas.petazzoni at bootlin.com Tue Feb 7 13:44:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:44:02 +0100 Subject: [Buildroot] [git commit branch/next] package/dahdi-linux: update URL in Config.in help text Message-ID: <20230220205252.9DC7C8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e06975b38047fe1ef47650248f154ecf88fe09b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next http://www.asterisk.org/downloads/dahdi no longer works, use the Github page instead. Signed-off-by: Thomas Petazzoni --- package/dahdi-linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dahdi-linux/Config.in b/package/dahdi-linux/Config.in index 7b6ce79422..b6086fdc6c 100644 --- a/package/dahdi-linux/Config.in +++ b/package/dahdi-linux/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_DAHDI_LINUX DAHDI Linux is the open source device driver framework used to interface Asterisk with telephony hardware. - http://www.asterisk.org/downloads/dahdi + https://github.com/asterisk/dahdi-linux comment "dahdi-linux needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL From peter at korsgaard.com Mon Feb 20 20:59:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:53 -0000 Subject: [Buildroot] [git commit branch/next] boot/barebox: bump version to 2022.12.0 Message-ID: <20230220205229.16110828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=693c88d9d276c16e7a3aad333cb20e56cfffbf20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 726f0f980b..3961c69c56 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 "2022.04.0" + bool "2022.12.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2022.04.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2022.12.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 3a92f7fd82..161fc43d43 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 e4970687cf7943eadf71b1ae6d344ff7 barebox-2022.04.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2022.12.0.tar.bz2.md5 +md5 e4bf25cbf1e0b0c9a67ee56214617b9c barebox-2022.12.0.tar.bz2 # Locally calculated -sha256 f751b506deb0a5d82682a85cf65e329dd562e48ea057533dc5c8876120a09ebc barebox-2022.04.0.tar.bz2 +sha256 9f570d4ae089560bd6c17b2b7d21cdb6557ecb00612c77ecee72ac47575a6b74 barebox-2022.12.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING From thomas.petazzoni at bootlin.com Tue Feb 7 12:56:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 13:56:25 +0100 Subject: [Buildroot] [git commit branch/next] package/python-magic-wormhole-transit-relay: new package Message-ID: <20230220205252.6BEF08648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=037dbe64d861e3d5580ecac608bd278afc9bbcc6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Transit Relay server for Magic-Wormhole. This repository implements the Magic-Wormhole "Transit Relay", a server that helps clients establish bulk-data transit connections even when both are behind NAT boxes. Each side makes a TCP connection to this server and presents a handshake. Two connections with identical handshakes are glued together, allowing them to pretend they have a direct connection. https://github.com/magic-wormhole/magic-wormhole-transit-relay Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-magic-wormhole-transit-relay/Config.in | 15 +++++++++++++++ .../python-magic-wormhole-transit-relay.hash | 5 +++++ .../python-magic-wormhole-transit-relay.mk | 14 ++++++++++++++ 5 files changed, 36 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index afc079a609..5776d6d7a5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1696,6 +1696,7 @@ F: package/python-gnupg/ F: package/python-hkdf/ F: package/python-magic-wormhole/ F: package/python-magic-wormhole-mailbox-server/ +F: package/python-magic-wormhole-transit-relay/ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ diff --git a/package/Config.in b/package/Config.in index 2ef403168a..b5418c56f6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1122,6 +1122,7 @@ menu "External python modules" source "package/python-m2crypto/Config.in" source "package/python-magic-wormhole/Config.in" source "package/python-magic-wormhole-mailbox-server/Config.in" + source "package/python-magic-wormhole-transit-relay/Config.in" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" diff --git a/package/python-magic-wormhole-transit-relay/Config.in b/package/python-magic-wormhole-transit-relay/Config.in new file mode 100644 index 0000000000..1a743c10fe --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY + bool "python-magic-wormhole-transit-relay" + select BR2_PACKAGE_PYTHON_TWISTED # runtime + help + Transit Relay server for Magic-Wormhole. + + This repository implements the Magic-Wormhole "Transit + Relay", a server that helps clients establish bulk-data + transit connections even when both are behind NAT + boxes. Each side makes a TCP connection to this server and + presents a handshake. Two connections with identical + handshakes are glued together, allowing them to pretend they + have a direct connection. + + https://github.com/magic-wormhole/magic-wormhole-transit-relay diff --git a/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash new file mode 100644 index 0000000000..f131477a40 --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole-transit-relay/json +md5 aa575a4e22b3d5099674ba88b136a9a2 magic-wormhole-transit-relay-0.2.1.tar.gz +sha256 cb4801b46890eaff97286e0e3fec62d1d52ffe317d140083b6336a1fb4e8fa5e magic-wormhole-transit-relay-0.2.1.tar.gz +# Locally computed sha256 checksums +sha256 d70f6469bb210c2aa4c0dfd74f498ef5f0467a137d8296479088e7243c5884eb LICENSE diff --git a/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk new file mode 100644 index 0000000000..e4ffe6e7a6 --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole-transit-relay +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_VERSION = 0.2.1 +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SOURCE = magic-wormhole-transit-relay-$(PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SITE = https://files.pythonhosted.org/packages/21/c9/be25bb30e327037e009657960fc594d089b118c0d81cc6a200cad1bb3852 +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From peter at korsgaard.com Mon Feb 20 20:59:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:54 -0000 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: remove Bartosz Golaszewski Message-ID: <20230220205229.061668648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24c532c9f6885174ddf1a9621cc1d55412139676 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next It's been a while since I've even used buildroot at all and I don't really have any spare cycles to spend on maintaining its packages. Let's face reality and drop me from the DEVELOPERS file. Signed-off-by: Bartosz Golaszewski Signed-off-by: Peter Korsgaard --- DEVELOPERS | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 86e3f0e7b1..8e1d68c026 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -283,17 +283,6 @@ F: package/ttyd/ F: package/qt5/qt5scxml/ F: package/qt5/qt5webview/ -N: Bartosz Golaszewski -F: package/autoconf-archive/ -F: package/doxygen/ -F: package/libgpiod/ -F: package/libserialport/ -F: package/libsigrok/ -F: package/libsigrokdecode/ -F: package/libzip/ -F: package/pulseview/ -F: package/sigrok-cli/ - N: Baruch Siach F: board/solidrun/clearfog_gt_8k/ F: configs/solidrun_clearfog_gt_8k_defconfig From thomas.petazzoni at bootlin.com Tue Feb 7 13:44:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 14:44:02 +0100 Subject: [Buildroot] [git commit branch/next] package/dahdi-linux: fix build with kernel >= 6.1 Message-ID: <20230220205252.926AB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33bdf7bb037c05863aa69bbe219e1cb78d596a3a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following build failure with kernel >= 6.1 In file included from ./include/linux/string.h:20, from ./include/linux/bitmap.h:11, from ./include/linux/cpumask.h:12, from ./include/linux/mm_types_task.h:14, from ./include/linux/mm_types.h:5, from ./include/linux/buildid.h:5, from ./include/linux/module.h:14, from /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:24: ./arch/powerpc/include/asm/string.h:27:22: note: expected ???void *??? but argument is of type ???const unsigned char *??? 27 | extern void * memcpy(void *,const void *,__kernel_size_t); | ^~~~~~ /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:661:9: error: too many arguments to function ???netif_napi_add??? 661 | netif_napi_add(netdev, &wc->napi, &wctc4xxp_poll, 64); | ^~~~~~~~~~~~~~ In file included from ./include/net/inet_sock.h:19, from ./include/linux/udp.h:16, from /home/autobuild/autobuild/instance-11/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c:38: ./include/linux/netdevice.h:2562:1: note: declared here 2562 | netif_napi_add(struct net_device *dev, struct napi_struct *napi, | ^~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/d7ce103a886329c68c04ebe05571be8f95a873ce Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0004-next-fix-kernel-6-1-build.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch b/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch new file mode 100644 index 0000000000..b910c4b775 --- /dev/null +++ b/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch @@ -0,0 +1,32 @@ +From a759a578277bde98eba7ef4bf86bdf819a900de9 Mon Sep 17 00:00:00 2001 +From: John Thomson +Date: Sun, 23 Oct 2022 13:42:52 +1000 +Subject: [PATCH] fix kernel 6.1 build + +kernel 6.1 includes b48b89f9c189 ("net: drop the weight argument from netif_napi_add") [0] + +[0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b48b89f9c189d24eb5e2b4a0ac067da5a24ee86d + +Signed-off-by: John Thomson +[Retrieved from: +https://github.com/asterisk/dahdi-linux/pull/14/commits/a759a578277bde98eba7ef4bf86bdf819a900de9] +Signed-off-by: Fabrice Fontaine +--- + include/dahdi/kernel.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h +index 35e93bc4..fd64a15e 100644 +--- a/include/dahdi/kernel.h ++++ b/include/dahdi/kernel.h +@@ -58,6 +58,10 @@ + + #include + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++#define netif_napi_add netif_napi_add_weight ++#endif ++ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) + #include + #include From peter at korsgaard.com Mon Feb 20 20:59:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 20:59:55 -0000 Subject: [Buildroot] [git commit branch/next] package/go: bump version to 1.19.5 Message-ID: <20230220205229.282D48648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab8a8066f5cf397d98c76a06757a9523d25d6500 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next go1.19.5 (released 2023-01-10) includes fixes to the compiler, the linker, and the crypto/x509, net/http, sync/atomic, and syscall packages. https://github.com/golang/go/issues?q=milestone%3AGo1.19.5+label%3ACherryPickApproved 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 d35db10213..4c22f0f274 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368 go1.19.4.src.tar.gz +sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 44e0c622c9..d3ed07f03b 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.4 +GO_VERSION = 1.19.5 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Tue Feb 7 13:52:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 7 Feb 2023 14:52:27 +0100 Subject: [Buildroot] [git commit branch/next] package/pkg-generic.mk: only check for virtual package conflicts when building Message-ID: <20230220205252.B76608648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7231701a290ba447fde9807ba9d260022ddfc8e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 2f8ba39edf..5d618c6b39 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1182,10 +1182,12 @@ ifeq ($$($$($(2)_KCONFIG_VAR)),y) # Ensure the calling package is the declared provider for all the virtual # packages it claims to be an implementation of. +ifeq ($(BR_BUILDING),y) ifneq ($$($(2)_PROVIDES),) $$(foreach pkg,$$($(2)_PROVIDES),\ $$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep))) endif +endif # Register package as a reverse-dependencies of all its dependencies $$(eval $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),\ From thomas.petazzoni at bootlin.com Mon Feb 20 20:59:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 20:59:56 -0000 Subject: [Buildroot] [git commit branch/next] docs/website: update sponsors.html page Message-ID: <20230220205228.EC10E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fce9f0eea00ed9aaeca12c1529ea380617baa477 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Thank Smile for sponsoring the Buildroot Developers Meeting of February 2023 by providing the meeting room - Thank Armadeus and Logilin for their financial sponsoring in 2022 - Move older sponsors to the "Past sponsors" section - Remove section about the Buildroot.org domain sponsor, as that sponsoring ended in 2019. Signed-off-by: Thomas Petazzoni --- docs/website/images/armadeus-systems-logo.png | Bin 0 -> 43363 bytes docs/website/sponsors.html | 69 +++++++++++++++++--------- 2 files changed, 46 insertions(+), 23 deletions(-) diff --git a/docs/website/images/armadeus-systems-logo.png b/docs/website/images/armadeus-systems-logo.png new file mode 100644 index 0000000000..9b6080fb13 Binary files /dev/null and b/docs/website/images/armadeus-systems-logo.png differ diff --git a/docs/website/sponsors.html b/docs/website/sponsors.html index 2f3f6309ae..9c17bed0c7 100644 --- a/docs/website/sponsors.html +++ b/docs/website/sponsors.html @@ -9,18 +9,40 @@
              +
              - - + +
              - Tap2Open - financially sponsored the Buildroot Association - in 2020.
              + Smile sponsored the + Buildroot project by hosting + the Buildroot + Developers Meeting of February 2023 in Brussels, + after the FOSDEM + conference. +
              +
              +
              +
              + +
              +
              +
              +
              + + + +
              +
              + Armadeus + Systems financially sponsored + the Buildroot + Association in 2022.
              @@ -36,7 +58,7 @@
              Logilin financially sponsored the Buildroot Association - in 2020.
              + in 2022.
            @@ -44,23 +66,6 @@
        -
        -
        Sponsor of the Buildroot.org domain
        -
        -
        -

        The Buildroot community would like to thank - Zillabit for - donating the buildroot.org domain name and sponsoring - the registration fees 2009 - 2019.

        -
        -
        - - - -
        -
        -
        -
        Past sponsors
        @@ -343,6 +348,24 @@
        +
        +
        +
        +
        +
        + + + +
        +
        + Tap2Open + financially sponsored the Buildroot Association + in 2020.
        +
        +
        +
        +
        +
        From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit branch/next] package/termcolor: new package Message-ID: <20230220205252.E80238648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e4402d4efb86256a3cff9c17c03f7300e427e1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/termcolor/Config.in | 12 ++++++++++++ package/termcolor/termcolor.hash | 3 +++ package/termcolor/termcolor.mk | 14 ++++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 830dab56f0..9cc080f7a4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2789,6 +2789,7 @@ F: package/most/ N: TIAN Yuanhao F: package/cli11/ F: package/open-isns/ +F: package/termcolor/ N: Tan En De F: package/libkcapi/ diff --git a/package/Config.in b/package/Config.in index 3773901552..e1a1b153b1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2176,6 +2176,7 @@ menu "Text and terminal handling" source "package/readline/Config.in" source "package/slang/Config.in" source "package/tclap/Config.in" + source "package/termcolor/Config.in" source "package/utf8proc/Config.in" endmenu diff --git a/package/termcolor/Config.in b/package/termcolor/Config.in new file mode 100644 index 0000000000..979ad61d81 --- /dev/null +++ b/package/termcolor/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TERMCOLOR + bool "termcolor" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + Termcolor is a header-only C++ library for printing colored + messages to the terminal. + + https://github.com/ikalnytskyi/termcolor + +comment "termcolor needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/termcolor/termcolor.hash b/package/termcolor/termcolor.hash new file mode 100644 index 0000000000..dede06c9b0 --- /dev/null +++ b/package/termcolor/termcolor.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 435994c32557674469404cb1527c283fdcf45746f7df75fd2996bb200d6a759f termcolor-2.1.0.tar.gz +sha256 bab0f53c36b248df22e2298ddf9eeea14b28783f187fcbff6a38f2c47b3a3a7d LICENSE diff --git a/package/termcolor/termcolor.mk b/package/termcolor/termcolor.mk new file mode 100644 index 0000000000..0374ce8b73 --- /dev/null +++ b/package/termcolor/termcolor.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# termcolor +# +################################################################################ + +TERMCOLOR_VERSION = 2.1.0 +TERMCOLOR_SITE = $(call github,ikalnytskyi,termcolor,v$(TERMCOLOR_VERSION)) +TERMCOLOR_LICENSE = BSD-3-Clause +TERMCOLOR_LICENSE_FILES = LICENSE +TERMCOLOR_INSTALL_STAGING = YES +TERMCOLOR_INSTALL_TARGET = NO + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 7 15:18:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 16:18:37 +0100 Subject: [Buildroot] [git commit branch/next] package/reproc: new package Message-ID: <20230220205253.238B88648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26dd70e954a7c9142b078837ab1bbfad54d0e5cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Required by micromamba. Signed-off-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/reproc/Config.in | 14 ++++++++++++++ package/reproc/reproc.hash | 3 +++ package/reproc/reproc.mk | 17 +++++++++++++++++ 5 files changed, 36 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e8ddad71cd..d7c4d03c4c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2790,6 +2790,7 @@ N: TIAN Yuanhao F: package/cli11/ F: package/libsolv/ F: package/open-isns/ +F: package/reproc/ F: package/termcolor/ F: package/tl-expected/ diff --git a/package/Config.in b/package/Config.in index 6ca4c61959..06d0a05854 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2126,6 +2126,7 @@ endif source "package/protozero/Config.in" source "package/qhull/Config.in" source "package/qlibc/Config.in" + source "package/reproc/Config.in" source "package/riemann-c-client/Config.in" source "package/shapelib/Config.in" source "package/skalibs/Config.in" diff --git a/package/reproc/Config.in b/package/reproc/Config.in new file mode 100644 index 0000000000..a4e9c893b1 --- /dev/null +++ b/package/reproc/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_REPROC + bool "reproc" + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # uses wchar_t + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + help + reproc is a cross-platform C/C++ library that simplifies + starting, stopping and communicating with external programs. + + https://github.com/DaanDeMeyer/reproc + +comment "reproc needs a toolchain w/ threads, wchar" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/reproc/reproc.hash b/package/reproc/reproc.hash new file mode 100644 index 0000000000..6da6d0a0bb --- /dev/null +++ b/package/reproc/reproc.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 55c780f7faa5c8cabd83ebbb84b68e5e0e09732de70a129f6b3c801e905415dd reproc-14.2.4.tar.gz +sha256 8f91afbe266bebac2cf1b220e0e67ace4cb9a97d2b21940abef20eb6691cfa91 LICENSE diff --git a/package/reproc/reproc.mk b/package/reproc/reproc.mk new file mode 100644 index 0000000000..3167911c4d --- /dev/null +++ b/package/reproc/reproc.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# reproc +# +################################################################################ + +REPROC_VERSION = 14.2.4 +REPROC_SITE = $(call github,DaanDeMeyer,reproc,v$(REPROC_VERSION)) +REPROC_LICENSE = MIT +REPROC_LICENSE_FILES = LICENSE +REPROC_INSTALL_STAGING = YES + +ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),yy) # C++11 +REPROC_CONF_OPTS += -DREPROC++=ON +endif + +$(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 8 11:13:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 12:13:44 +0100 Subject: [Buildroot] [git commit branch/next] package/gstreamer1/gstd: bump to version 0.15.0 Message-ID: <20230220205255.8D93881979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbd06adac50e304f413689febf676911ae29d967 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patches which are now upstream. Add new libedit dependency. License hash changed due to LGPL-2.1+ relicense: https://github.com/RidgeRun/gstd-1.x/commit/2cb6bb8b6c3bba24098a83557c5fa58a8a15ff58 https://github.com/RidgeRun/gstd-1.x/commit/76d9fb61a05973b30220fcae5ff87de9d618ea49 Signed-off-by: James Hilliard [Peter: add BSD-3-Clause license change commit for clarity] Signed-off-by: Peter Korsgaard --- ...e-gstd-check-user-xenv.sh-for-systemd-se.patch} | 0 .../gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch | 27 -------- ...ve-meson-python-module-for-python-install.patch | 78 ---------------------- .../0004-meson.build-add-missing-init-subdir.patch | 28 -------- ...uild-use-dependency-function-for-readline.patch | 51 -------------- package/gstreamer1/gstd/Config.in | 5 +- package/gstreamer1/gstd/gstd.hash | 4 +- package/gstreamer1/gstd/gstd.mk | 5 +- 8 files changed, 8 insertions(+), 190 deletions(-) diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch b/package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch similarity index 100% rename from package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch rename to package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch diff --git a/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch b/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch deleted file mode 100644 index 79a65ffbdc..0000000000 --- a/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f1c953b9077619a83ab21c24dc343c7e21cd220d Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 01:46:25 -0600 -Subject: [PATCH] Fix gstd_chmod.sh DESTDIR path. - -This should fix the chmod path when cross compiling. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/247] ---- - gstd/gstd_chmod.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gstd/gstd_chmod.sh b/gstd/gstd_chmod.sh -index 8e58bce..fa7fa80 100755 ---- a/gstd/gstd_chmod.sh -+++ b/gstd/gstd_chmod.sh -@@ -3,4 +3,4 @@ - # $1 mode - # $2 file - --chmod $1 $2 -+chmod $1 ${DESTDIR}/$2 --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch b/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch deleted file mode 100644 index a27d79a0e9..0000000000 --- a/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1067f6138e947d18fd835e4a39f229ae2293f864 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 23:37:03 -0600 -Subject: [PATCH] Use native meson python module for python install. - -Signed-off-by: James Hilliard -[upstreeam: https://github.com/RidgeRun/gstd-1.x/pull/253] -Signed-off-by: Yann E. MORIN ---- - libgstc/meson.build | 4 +++- - libgstc/python/meson.build | 26 +++++++++++++++++++++++++- - meson_options.txt | 2 ++ - 3 files changed, 30 insertions(+), 2 deletions(-) - -diff --git a/libgstc/meson.build b/libgstc/meson.build -index e94dcd1..582cbb8 100644 ---- a/libgstc/meson.build -+++ b/libgstc/meson.build -@@ -1,2 +1,4 @@ - subdir('c') --subdir('python') -+if not get_option('enable-python').disabled() -+ subdir('python') -+endif -diff --git a/libgstc/python/meson.build b/libgstc/python/meson.build -index 057114b..24e3242 100644 ---- a/libgstc/python/meson.build -+++ b/libgstc/python/meson.build -@@ -1 +1,25 @@ --run_command('pip3', 'install', '.') -+pymod = import('python') -+python = pymod.find_installation( -+ get_option('with-python-version'), -+ required : get_option('enable-python').enabled(), -+ disabler : true -+) -+ -+pythonver = python.language_version() -+if pythonver.version_compare('<3.7') -+ error('Python @0@ is not supported anymore, please port your code to python3.7 or newer.'.format(python.language_version())) -+endif -+ -+pygstc_src_files = [ -+ 'pygstc/__init__.py', -+ 'pygstc/gstc.py', -+ 'pygstc/gstcerror.py', -+ 'pygstc/logger.py', -+ 'pygstc/tcp.py' -+] -+ -+python.install_sources( -+ pygstc_src_files, -+ subdir : 'pygstc', -+ pure : true -+) -diff --git a/meson_options.txt b/meson_options.txt -index f50e540..25292e6 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,6 +4,7 @@ option('enable-examples', type : 'feature', value : 'auto', yield : true, descri - option('enable-gtk-doc', type : 'boolean', value : false, description : 'Use gtk-doc to build documentation') - option('enable-systemd', type : 'feature', value : 'auto', description : 'Enable systemd gstd.service install') - option('enable-initd', type : 'feature', value : 'disabled', description : 'Enable init script install') -+option('enable-python', type : 'feature', value : 'auto', description : 'Install the pygstc library') - - # String options - option('with-gstd-runstatedir', type : 'string', value : '${prefix}/var/run/gstd', description : 'Specify the location of the gstd\'s PID file') -@@ -11,6 +12,7 @@ option('with-gstd-logstatedir', type : 'string', value : '${prefix}/var/log/gstd - option('with-gstd-systemddir', type : 'string', value : 'Systemd default systemduserunitdir', description : 'Specify the location of gstd.service file') - option('with-gstd-initddir', type : 'string', value : '${sysconfdir}/init.d', description : 'Specify the location of gstd init script') - option('with-statedir-owner', type : 'string', value : 'root', description : 'Specify the owner of gstd\'s run and log dirs created by the initd script') -+option('with-python-version', type : 'string', value : 'python3', description : 'Specify the python version for pygstc installation') - - # Common options - option('package-name', type : 'string', yield : true, --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0004-meson.build-add-missing-init-subdir.patch b/package/gstreamer1/gstd/0004-meson.build-add-missing-init-subdir.patch deleted file mode 100644 index ed3738e3d4..0000000000 --- a/package/gstreamer1/gstd/0004-meson.build-add-missing-init-subdir.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 689265cd522c770ad3e0391cae80ee884a8c475c Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 21 Apr 2022 01:14:52 -0500 -Subject: [PATCH] meson.build: add missing init subdir - -Seems this got accidentially removed in: -9f4490138c8892b1c86008134438b2ab405c9b0f - -Restore it so that init files are properly installed. - -Signed-off-by: James Hilliard -[upstreeam: https://github.com/RidgeRun/gstd-1.x/pull/291] ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index a30f776..7a8690a 100644 ---- a/meson.build -+++ b/meson.build -@@ -300,3 +300,4 @@ subdir('gst_client') - subdir('tests') - subdir('examples') - subdir('docs') -+subdir('init') --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0005-meson.build-use-dependency-function-for-readline.patch b/package/gstreamer1/gstd/0005-meson.build-use-dependency-function-for-readline.patch deleted file mode 100644 index 51422e56d6..0000000000 --- a/package/gstreamer1/gstd/0005-meson.build-use-dependency-function-for-readline.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3ef45c41105e61efe84c9be3a9a22988dfe10db8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 22 Oct 2021 07:33:04 +0200 -Subject: [PATCH] meson.build: use dependency function for readline - -Use meson dependency function to find readline instead of -cc.find_library. This function will retrieve readline pkg-config file -which is available since version 7 (released 5 years ago) and -https://git.savannah.gnu.org/cgit/readline.git/commit/readline.pc.in?id=d49a9082c0e15bba8cd3d8cc0a994409cf823cac. -readline.pc sets tinfo in Requires.Private which will avoid the -following static build failure: - -/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/lib/libreadline.a(display.o): in function `_rl_move_cursor_relative': -display.c:(.text+0xbb5): undefined reference to `tputs' - -Fixes: - - http://autobuild.buildroot.org/results/77c10947ddc749c54c7c233e3143f5cdf1edc73d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/RidgeRun/gstd-1.x/pull/261] ---- - meson.build | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index 7a8690a..44ed5c2 100644 ---- a/meson.build -+++ b/meson.build -@@ -32,8 +32,8 @@ systemd_required = get_option('enable-systemd').enabled() - systemd_dep = dependency('systemd', required : systemd_required, version : '>=232') - - cc = meson.get_compiler('c') --readline = cc.find_library('readline', required: true) --if readline.found() -+readline_dep = dependency('readline') -+if readline_dep.found() - add_project_arguments('-DHAVE_LIBREADLINE', language: 'c') - add_project_arguments('-DHAVE_READLINE_HISTORY', language: 'c') - # Add arguments to the compiler command line. -@@ -48,8 +48,6 @@ if readline.found() - else - add_project_arguments('-DHAVE_HISTORY_H', language: 'c') - endif -- -- readline_dep = readline - endif - - ## Dependencies --- -2.37.1 - diff --git a/package/gstreamer1/gstd/Config.in b/package/gstreamer1/gstd/Config.in index f36d25f11f..df1d2f59c3 100644 --- a/package/gstreamer1/gstd/Config.in +++ b/package/gstreamer1/gstd/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_GSTD bool "gstd" - depends on BR2_USE_WCHAR # libglib2 -> gettext, libsoup + depends on BR2_USE_WCHAR # libglib2 -> gettext, libedit, libsoup depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libsoup - depends on BR2_USE_MMU # libdaemon, libglib2 + depends on BR2_USE_MMU # libdaemon, libedit, libglib2 select BR2_PACKAGE_GSTREAMER1_GST_DEBUG # gst_debug_bin_to_dot_data select BR2_PACKAGE_JANSSON select BR2_PACKAGE_JSON_GLIB select BR2_PACKAGE_LIBDAEMON + select BR2_PACKAGE_LIBEDIT select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_READLINE diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash index 20c821a27f..632f83f8e8 100644 --- a/package/gstreamer1/gstd/gstd.hash +++ b/package/gstreamer1/gstd/gstd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 56afd58530b63d0d88dd818fd4e6c9230861819b3e131c6a87a46084c3f3fa96 gstd-0.14.0.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 f4a83765d2cf2948c38abc5107ab07d49a01b4101047f188fed7204f1d4e49c7 gstd-0.15.0.tar.gz +sha256 10162be9f7ddb9e98c22c3edd0f78d62ab88f0ca8b1cc968bd85d5d665489d90 COPYING diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk index 817e9143ae..ccb3b3e1bc 100644 --- a/package/gstreamer1/gstd/gstd.mk +++ b/package/gstreamer1/gstd/gstd.mk @@ -4,10 +4,10 @@ # ################################################################################ -GSTD_VERSION = 0.14.0 +GSTD_VERSION = 0.15.0 GSTD_SITE = $(call github,RidgeRun,gstd-1.x,v$(GSTD_VERSION)) GSTD_LICENSE_FILES = COPYING -GSTD_LICENSE = GPL-2.0+ +GSTD_LICENSE = LGPL-2.1+ GSTD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ @@ -15,6 +15,7 @@ GSTD_DEPENDENCIES = \ jansson \ json-glib \ libdaemon \ + libedit \ libglib2 \ libsoup \ readline From arnout at mind.be Wed Feb 8 14:28:33 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:33 +0100 Subject: [Buildroot] [git commit branch/next] utils/check-package: check files in utils/ Message-ID: <20230220205256.4C34D828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b021bc1d77ce485ac46114482024d12339d6b5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next All the errors in existing scripts in utils/ have been fixed, so nothing needs to be added to .checkpackageignore. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle --- utils/check-package | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/check-package b/utils/check-package index 12009b2476..98a25bd0b2 100755 --- a/utils/check-package +++ b/utils/check-package @@ -113,6 +113,7 @@ DO_CHECK_INTREE = re.compile(r"|".join([ r"package/", r"system/", r"toolchain/", + r"utils/", ])) DO_NOT_CHECK_INTREE = re.compile(r"|".join([ r"boot/barebox/barebox\.mk$", From arnout at mind.be Wed Feb 8 14:28:28 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 8 Feb 2023 15:28:28 +0100 Subject: [Buildroot] [git commit branch/next] utils/brmake: fix shellcheck errors Message-ID: <20230220205256.23DEA81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc364c6ae65d3167409380b8883123a55270b18d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next In utils/brmake line 6: local found ret start d h m mf ^---^ SC2034: found appears unused. Verify use (or export if used externally). In utils/brmake line 16: > >( while read line; do ^--^ SC2162: read without -r will mangle backslashes. For both, the suggestions from shellcheck can be applied. Signed-off-by: Arnout Vandecappelle --- utils/brmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/brmake b/utils/brmake index e30119dd10..70dfb6cdc8 100755 --- a/utils/brmake +++ b/utils/brmake @@ -3,7 +3,7 @@ # License: WTFPL, https://spdx.org/licenses/WTFPL.html main() { - local found ret start d h m mf + local ret start d h m mf if ! which unbuffer >/dev/null 2>&1; then printf "you need to install 'unbuffer' (from package expect or expect-dev)\n" >&2 @@ -13,7 +13,7 @@ main() { start=${SECONDS} ( exec 2>&1; unbuffer make "${@}"; ) \ - > >( while read line; do + > >( while read -r line; do printf "%(%Y-%m-%dT%H:%M:%S)T %s\n" -1 "${line}" done \ |tee -a br.log \ From peter at korsgaard.com Wed Feb 8 14:34:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 15:34:42 +0100 Subject: [Buildroot] [git commit branch/next] package/rust: fix bootstrap build Message-ID: <20230220205256.56E2781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7df32882203fdd525156ddb785d171b193e5b282 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The update to v1.67.0 of rust broke the bootstrap build. This patch applies an upstream patch to fix this: https://github.com/rust-lang/rust/commit/3fe64ebbce21e79adb64099984e96dfb79bdd0f9 Fixes: http://autobuild.buildroot.org/results/214/214fcbb3458893784b7f85b60f7ee1edb428c77f/build-end.log Signed-off-by: Sebastian Weyer Cc: Eric Le Bihan Cc: James Hilliard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...1-fix-unsoundness-in-bootstrap-cache-code.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch new file mode 100644 index 0000000000..3eae34642f --- /dev/null +++ b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch @@ -0,0 +1,43 @@ +From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 +From: Michael Goulet +Date: Mon, 12 Dec 2022 18:29:33 +0000 +Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= + =?UTF-8?q?ap=20cache=20code?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) +Signed-off-by: Sebastian Weyer +--- + src/bootstrap/cache.rs | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs +index be5c9bb0788..05f25af68ea 100644 +--- a/src/bootstrap/cache.rs ++++ b/src/bootstrap/cache.rs +@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { + + impl Deref for Interned { + type Target = T::Target; +- fn deref(&self) -> &'static Self::Target { ++ fn deref(&self) -> &Self::Target { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } ++ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } + } + } + + impl, U: ?Sized> AsRef for Interned { +- fn as_ref(&self) -> &'static U { ++ fn as_ref(&self) -> &U { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } ++ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } + } + } + +-- +2.25.1 + From peter at korsgaard.com Wed Feb 8 13:55:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 14:55:31 +0100 Subject: [Buildroot] [git commit branch/next] package/sway: new package Message-ID: <20230220205256.19703828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b739d6bd98e8ee12ec2150563ef9cdef35d2ea35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next i3-compatible Wayland compositor This Wayland compositor can be used as a kiosk compositor like cage, but with the advantage of better configuration of multiple monitor and windows. For example, move a window by title to the output X or set the resolution of Y to Z. Signed-off-by: Raphael Pavlidis [Peter: Fix white space, add gdk-pixbuf to _DEPENDENCIES] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 ++- package/Config.in | 1 + package/sway/Config.in | 42 ++++++++++++++++++++++++++++++++++++++++++ package/sway/sway.hash | 3 +++ package/sway/sway.mk | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 2cb3361c83..0bb4db81bb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2507,8 +2507,9 @@ F: support/testing/tests/package/test_python_jmespath.py F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py -N: Raphael Pavlidis +N: Raphael Pavlidis F: package/slirp4netns/ +F: package/sway/ N: Refik Tuzakli F: package/freescale-imx/ diff --git a/package/Config.in b/package/Config.in index 06d0a05854..2adfcdbb1d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -327,6 +327,7 @@ comment "Graphic applications" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in" source "package/stellarium/Config.in" + source "package/sway/Config.in" source "package/tesseract-ocr/Config.in" source "package/tinifier/Config.in" diff --git a/package/sway/Config.in b/package/sway/Config.in new file mode 100644 index 0000000000..f8d073520f --- /dev/null +++ b/package/sway/Config.in @@ -0,0 +1,42 @@ +config BR2_PACKAGE_SWAY + bool "sway" + depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider + depends on !BR2_STATIC_LIBS # wlroots + depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots + depends on BR2_PACKAGE_HAS_LIBGLES # wlroots + depends on BR2_PACKAGE_HAS_UDEV # wlroots + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_USE_WCHAR # pango + depends on BR2_TOOLCHAIN_HAS_THREADS # pango + depends on BR2_USE_MMU # pango + depends on BR2_INSTALL_LIBSTDCPP # pango + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango + select BR2_PACKAGE_WLROOTS + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_PANGO + help + i3-compatible Wayland compositor + + https://github.com/swaywm/sway + +comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" + depends on !BR2_PACKAGE_SYSTEMD || \ + !BR2_PACKAGE_HAS_UDEV || \ + !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + !BR2_PACKAGE_HAS_LIBGLES + +comment "sway needs a toolchain w/ wchar, threads, C++, dynamic library, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_INSTALL_LIBSTDCPP || \ + BR2_STATIC_LIBS diff --git a/package/sway/sway.hash b/package/sway/sway.hash new file mode 100644 index 0000000000..6dfa71730f --- /dev/null +++ b/package/sway/sway.hash @@ -0,0 +1,3 @@ +# Locally computed, tarball verified with GPG signature +sha256 0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84 sway-1.7.tar.gz +sha256 bd35722bff46327f5eded1d211207277bbe043d2a22048b282c42ef801593b8b LICENSE diff --git a/package/sway/sway.mk b/package/sway/sway.mk new file mode 100644 index 0000000000..802371c827 --- /dev/null +++ b/package/sway/sway.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# sway +# +################################################################################ + +SWAY_VERSION = 1.7 +SWAY_SITE = $(call github,swaywm,sway,v$(SWAY_VERSION)) +SWAY_LICENSE = MIT +SWAY_LICENSE_FILES = LICENSE +SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango +SWAY_CONF_OPTS = \ + -Dwerror=false \ + -Ddefault-wallpaper=false \ + -Dzsh-completions=false \ + -Dbash-completions=false \ + -Dfish-completions=false \ + -Dswaybar=false \ + -Dswaynag=false \ + -Dtray=disabled \ + -Dman-pages=disabled \ + -Dsd-bus-provider=libsystemd + +ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) +SWAY_CONF_OPTS += -Dxwayland=enabled +else +SWAY_CONF_OPTS += -Dxwayland=disabled +endif + +ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y) +SWAY_CONF_OPTS += -Dgdk-pixbuf=enabled +SWAY_DEPENDENCIES += gdk-pixbuf +else +SWAY_CONF_OPTS += -Dgdk-pixbuf=disabled +endif + +$(eval $(meson-package)) From thomas.petazzoni at bootlin.com Wed Feb 8 16:41:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:41:33 +0100 Subject: [Buildroot] [git commit branch/next] package/qt6base: additional disable FEATURE_avx512vbmi2 and FEATURE_vaes Message-ID: <20230220205256.8826781979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ff07d3e60d23816a958aae413d4dc7e2dd17003 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - additional disable new FEATURE_avx512vbmi2/FEATURE_vaes (added with upstream commit [1]) [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=38e6b637b71fae274caedc1d326f641b904e00a4 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 212b2d689e..e6cf4f14bb 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -72,7 +72,9 @@ QT6BASE_CONF_OPTS += \ -DFEATURE_avx512ifma=OFF \ -DFEATURE_avx512pf=OFF \ -DFEATURE_avx512vbmi=OFF \ - -DFEATURE_avx512vl=OFF + -DFEATURE_avx512vbmi2=OFF \ + -DFEATURE_avx512vl=OFF \ + -DFEATURE_vaes=OFF define QT6BASE_BUILD_CMDS $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6BASE_BUILDDIR) From thomas.petazzoni at bootlin.com Wed Feb 8 19:23:13 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:23:13 +0100 Subject: [Buildroot] [git commit branch/next] package/xr819-xradio: bump to 2022-12-30 version on branch master Message-ID: <20230220205256.BA3AB81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd2e9a2a0d7fd4e407e831503979cc00aa2c4858 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This version allows to build with Linux 6.1 Fixes: Still not reported Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/xr819-xradio/xr819-xradio.hash | 2 +- package/xr819-xradio/xr819-xradio.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index 08a3b6e8cc..60185db736 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 839fdae93eba29121d4116de335b00a026ef63874caf516747dbdf24c17f208b xr819-xradio-58d597bcf081e44904335916e6033bc8ef28b043.tar.gz +sha256 2b297fbcc9b5ed190bcfff9f6f808c170632ac3d69dbd92156a7f4f57142dec9 xr819-xradio-005f28cfe9e20b7f2dfd9d32d38ee97060dc707f.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index 8c1cb1587f..e5daaa6051 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 58d597bcf081e44904335916e6033bc8ef28b043 +XR819_XRADIO_VERSION = 005f28cfe9e20b7f2dfd9d32d38ee97060dc707f XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 8 19:27:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 20:27:34 +0100 Subject: [Buildroot] [git commit branch/next] package/rtl8723ds: change CFLAGS approach Message-ID: <20230220205256.C53C7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=672544148b3cafa1cda47cd6e4b88210fc693e14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Instead of undefining endiannes CFLAGS let's change the approach. Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default involving the endianness to be set to little. This way we can set the CFLAGS according to architecture with some default define like: -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -Wno-error Suggested-by: Arnout Vandecappelle Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8723ds/rtl8723ds.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 7e27fa75ea..f303a24041 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -8,12 +8,14 @@ RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 -# Undefine the hardcoded CONFIG_LITTLE_ENDIAN -RTL8723DS_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN -# Set endianness -RTL8723DS_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN +RTL8723DS_USER_EXTRA_CLAGS = \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error RTL8723DS_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_I386_PC=n \ CONFIG_RTL8723DS=m \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) \ From arnout at mind.be Thu Feb 9 20:28:47 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:28:47 +0100 Subject: [Buildroot] [git commit branch/next] lksctp-tools: bump to version 1.0.19 Message-ID: <20230220205256.D016386495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=554d79f5cc01c20d886cbe9c676195159947f066 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://github.com/sctp/lksctp-tools/blob/v1.0.19/ChangeLog Signed-off-by: Maxim Kochetkov Tested-by: Maksim Kiselev Signed-off-by: Arnout Vandecappelle --- package/lksctp-tools/lksctp-tools.hash | 4 ++-- package/lksctp-tools/lksctp-tools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lksctp-tools/lksctp-tools.hash b/package/lksctp-tools/lksctp-tools.hash index fb892fdc3b..b3a1f59d86 100644 --- a/package/lksctp-tools/lksctp-tools.hash +++ b/package/lksctp-tools/lksctp-tools.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ -md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz -sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz +md5 0fbb288c9f9625b88d3ab21c9ed9f011 lksctp-tools-1.0.19.tar.gz +sha1 d410a596485c38464177a38ae7c7081444e6589e lksctp-tools-1.0.19.tar.gz # Locally computed sha256 dee5f35e583183abb9212938643ecb2d858fd89e2e286f4b1d903f65d49d6c76 COPYING.lib sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk index 5ac794e842..af86a28516 100644 --- a/package/lksctp-tools/lksctp-tools.mk +++ b/package/lksctp-tools/lksctp-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -LKSCTP_TOOLS_VERSION = 1.0.17 -LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools +LKSCTP_TOOLS_VERSION = 1.0.19 +LKSCTP_TOOLS_SITE = $(call github,sctp,lksctp-tools,v$(LKSCTP_TOOLS_VERSION)) LKSCTP_TOOLS_INSTALL_STAGING = YES # configure not shipped LKSCTP_TOOLS_AUTORECONF = YES From arnout at mind.be Thu Feb 9 20:44:31 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:44:31 +0100 Subject: [Buildroot] [git commit branch/next] package/open-iscsi: add OPEN_ISCSI_CPE_ID_VENDOR Message-ID: <20230220205256.E9C188648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4856c75b2fe0cbab36fcae7f5f223026b24e884f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next cpe:2.3:a:open-iscsi_project:open-iscsi is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen-iscsi_project%3Aopen-iscsi Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/open-iscsi/open-iscsi.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk index 249253c64f..e5b965b80d 100644 --- a/package/open-iscsi/open-iscsi.mk +++ b/package/open-iscsi/open-iscsi.mk @@ -10,6 +10,7 @@ OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) # well. See https://github.com/open-iscsi/open-iscsi/issues/379 OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ OPEN_ISCSI_LICENSE_FILES = COPYING +OPEN_ISCSI_CPE_ID_VENDOR = open-iscsi_project OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi From thomas.petazzoni at bootlin.com Wed Feb 8 16:42:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:42:32 +0100 Subject: [Buildroot] [git commit branch/next] package/libopenssl: security bump to version 1.1.1t Message-ID: <20230220205256.98013828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=040896bd4338f7ca419766578db49af154b762c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Changelog (for details see [1] and [2]): Changes between 1.1.1s and 1.1.1t [7 Feb 2023] *) Fixed X.400 address type confusion in X.509 GeneralName. There is a type confusion vulnerability relating to X.400 address processing inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This vulnerability may allow an attacker who can provide a certificate chain and CRL (neither of which need have a valid signature) to pass arbitrary pointers to a memcmp call, creating a possible read primitive, subject to some constraints. Refer to the advisory for more information. Thanks to David Benjamin for discovering this issue. (CVE-2023-0286) This issue has been fixed by changing the public header file definition of GENERAL_NAME so that x400Address reflects the implementation. It was not possible for any existing application to successfully use the existing definition; however, if any application references the x400Address field (e.g. in dead code), note that the type of this field has changed. There is no ABI change. [Hugo Landau] *) Fixed Use-after-free following BIO_new_NDEF. The public API function BIO_new_NDEF is a helper function used for streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL to support the SMIME, CMS and PKCS7 streaming capabilities, but may also be called directly by end user applications. The function receives a BIO from the caller, prepends a new BIO_f_asn1 filter BIO onto the front of it to form a BIO chain, and then returns the new head of the BIO chain to the caller. Under certain conditions, for example if a CMS recipient public key is invalid, the new filter BIO is freed and the function returns a NULL result indicating a failure. However, in this case, the BIO chain is not properly cleaned up and the BIO passed by the caller still retains internal pointers to the previously freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO then a use-after-free will occur. This will most likely result in a crash. (CVE-2023-0215) [Viktor Dukhovni, Matt Caswell] *) Fixed Double free after calling PEM_read_bio_ex. The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload data. If the function succeeds then the "name_out", "header" and "data" arguments are populated with pointers to buffers containing the relevant decoded data. The caller is responsible for freeing those buffers. It is possible to construct a PEM file that results in 0 bytes of payload data. In this case PEM_read_bio_ex() will return a failure code but will populate the header argument with a pointer to a buffer that has already been freed. If the caller also frees this buffer then a double free will occur. This will most likely lead to a crash. The functions PEM_read_bio() and PEM_read() are simple wrappers around PEM_read_bio_ex() and therefore these functions are also directly affected. These functions are also called indirectly by a number of other OpenSSL functions including PEM_X509_INFO_read_bio_ex() and SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL internal uses of these functions are not vulnerable because the caller does not free the header argument if PEM_read_bio_ex() returns a failure code. (CVE-2022-4450) [Kurt Roeckx, Matt Caswell] *) Fixed Timing Oracle in RSA Decryption. A timing based side channel exists in the OpenSSL RSA Decryption implementation which could be sufficient to recover a plaintext across a network in a Bleichenbacher style attack. To achieve a successful decryption an attacker would have to be able to send a very large number of trial messages for decryption. The vulnerability affects all RSA padding modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. (CVE-2022-4304) [Dmitry Belyavsky, Hubert Kario] Changes between 1.1.1r and 1.1.1s [1 Nov 2022] *) Fixed a regression introduced in 1.1.1r version not refreshing the certificate data to be signed before signing the certificate. [Gibeom Gwon] Changes between 1.1.1q and 1.1.1r [11 Oct 2022] *) Fixed the linux-mips64 Configure target which was missing the SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that platform. [Adam Joseph] *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was causing incorrect results in some cases as a result. [Paul Dale] *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to report correct results in some cases [Matt Caswell] *) Fixed a regression introduced in 1.1.1o for re-signing certificates with different key sizes [Todd Short] *) Added the loongarch64 target [Shi Pujin] *) Fixed a DRBG seed propagation thread safety issue [Bernd Edlinger] *) Fixed a memory leak in tls13_generate_secret [Bernd Edlinger] *) Fixed reported performance degradation on aarch64. Restored the implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid 32-bit lane assignment in CTR mode") for 64bit targets only, since it is reportedly 2-17% slower and the silicon errata only affects 32bit targets. The new algorithm is still used for 32 bit targets. [Bernd Edlinger] *) Added a missing header for memcmp that caused compilation failure on some platforms [Gregor Jasny] [1] https://www.openssl.org/news/cl111.txt [2] https://www.openssl.org/news/vulnerabilities.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- 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 8457df6c0a..ebc56b11dd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1q.tar.gz.sha256 -sha256 d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca openssl-1.1.1q.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 +sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index fc22c20467..6e84f06175 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1q +LIBOPENSSL_VERSION = 1.1.1t LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From arnout at mind.be Thu Feb 9 20:46:10 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:46:10 +0100 Subject: [Buildroot] [git commit branch/next] package/libsolv: add LIBSOLV_CPE_ID_VENDOR Message-ID: <20230220205257.02A53828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8cee8fb37c6ad0164d3f7bad8cfd0f812592ad6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next cpe:2.3:a:opensuse:libsolv is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopensuse%3Alibsolv Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libsolv/libsolv.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 144ce68a83..29f8a6a3d2 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -8,6 +8,7 @@ LIBSOLV_VERSION = 0.7.22 LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) LIBSOLV_LICENSE = BSD-3-Clause LIBSOLV_LICENSE_FILES = LICENSE.BSD +LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON From peter at korsgaard.com Fri Feb 10 14:11:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:11:16 +0100 Subject: [Buildroot] [git commit branch/next] package/norm: use external waf Message-ID: <20230220205257.4CE0881979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8012a86f5cf751f9c4d5d4a63f6502a6ac60d13a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/ee1/ee15cadf8af10dee6c83b9726a034367e8ae81a7/ The bundled waf script is too old (2.0.7) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/norm/norm.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/norm/norm.mk b/package/norm/norm.mk index 2f9fc7b657..a3fa1b4f80 100644 --- a/package/norm/norm.mk +++ b/package/norm/norm.mk @@ -11,6 +11,9 @@ NORM_INSTALL_STAGING = YES NORM_LICENSE = NRL License NORM_LICENSE_FILES = LICENSE.TXT +# The bundled waf script is too old for >= python3.11 +NORM_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y) NORM_DEPENDENCIES += libnetfilter_queue endif From peter at korsgaard.com Fri Feb 10 14:10:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:10:42 +0100 Subject: [Buildroot] [git commit branch/next] package/glmark2: use external waf Message-ID: <20230220205257.34214828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e331da62fb7612b7a52a40e37312753cc1c1eef5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fixes: http://autobuild.buildroot.net/results/bbd/bbd90f11975b691f694412a6fc3446f37dd7c0aa/ The bundled waf script is too old (1.9.3) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/glmark2/glmark2.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index e8d6f71dad..bac9d9ff6f 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -10,6 +10,9 @@ GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng +# The bundled waf script is too old for >= python3.11 +GLMARK2_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y) GLMARK2_DEPENDENCIES += libdrm libgbm libgles udev GLMARK2_FLAVORS += drm-glesv2 From peter at korsgaard.com Fri Feb 10 14:10:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:10:35 +0100 Subject: [Buildroot] [git commit branch/next] package/aubio: drop AUBIO_REMOVE_OLD_WAF hook Message-ID: <20230220205257.27D7F81979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4543911494b2a485f159eae21bb703b676ec2c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next As that is now handled by the waf-package infrastructure. Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/aubio/aubio.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index c995fdfac7..64174a113d 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -21,12 +21,6 @@ AUBIO_CONF_OPTS = \ # https://github.com/jackaudio/jack2/issues/898 AUBIO_NEEDS_EXTERNAL_WAF = YES -# The old waf script bundled in aubio 0.4.9 need to be removed first. -define AUBIO_REMOVE_OLD_WAF - $(RM) -fr $(@D)/waf $(@D)/waflib -endef -AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF - # Add --notests for each build step to avoid running unit tests on the # build machine. AUBIO_WAF_OPTS = --notests From peter at korsgaard.com Fri Feb 10 14:14:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:14:10 +0100 Subject: [Buildroot] [git commit branch/next] package/postgresql: bump version to 15.2 Message-ID: <20230220205257.59AF5828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57e297a215193c92f6a178139db53616f2ee23b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://www.postgresql.org/docs/release/15.2/ Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index ef2806c2dd..e6a9bd6658 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v14.6/postgresql-15.1.tar.bz2.sha256 -sha256 64fdf23d734afad0dfe4077daca96ac51dcd697e68ae2d3d4ca6c45cb14e21ae postgresql-15.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 +sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 2ffcac6595..e90aa794b0 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 15.1 +POSTGRESQL_VERSION = 15.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 Fri Feb 10 15:26:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 16:26:54 +0100 Subject: [Buildroot] [git commit branch/next] package/wpewebkit: Build with ninja Message-ID: <20230220205257.7198581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78d499409f71d8a22b0632c8ebc06f67ee6ae6dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 54f37fd702..b9c2fef395 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -103,4 +103,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# wpewebkit needs cmake >= 3.20 when building with the make backend, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WPEWEBKIT_CONF_OPTS += -GNinja +WPEWEBKIT_DEPENDENCIES += host-ninja + +define WPEWEBKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + $(eval $(cmake-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:07:18 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 22:07:18 +0100 Subject: [Buildroot] [git commit] package/tmux: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230220210739.2E1878649D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54237eec447abd4bd788b0a8ac5d48293c2c4eb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master tmux uses custom --enable-static option to drive whether a static link should be attempted, which is not what the standard libtool directive is about and that we pass in our autotools-package infra. This results in the following build failure with systemd or utf8proc raised since commits 1f618aa388535181c281c85e2b5264532de4ef0f and e279599d255a79c08ef20b97b96eb248689d52a9: checking for utf8proc.h... yes checking for library containing utf8proc_charwidth... no configure: error: "utf8proc not found" In file included from tmux.h:34, from alerts.c:23: compat.h:379:18: error: conflicting types for 'forkpty'; have 'pid_t(int *, char *, struct termios *, struct winsize *)' {aka 'int(int *, char *, struct termios *, struct winsize *)'} 379 | pid_t forkpty(int *, char *, struct termios *, struct winsize *); | ^~~~~~~ Link to (closed) upstream issue: https://github.com/tmux/tmux/issues/3290 Fixes: - http://autobuild.buildroot.org/results/6e8523d8d514bf6d8fc3377d05e5edbe7fc2d5bb - http://autobuild.buildroot.org/results/cba06f3bb6d9be25e91f56c390a70ddf9904832e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/tmux/tmux.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 47ee9b16ca..af06c8570b 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -25,6 +25,12 @@ else TMUX_CONF_OPTS += --disable-utf8proc endif +# tmux uses custom --enable-static option, instead of standard libtool +# directive resulting in a build failure with systemd or utf8proc +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +TMUX_CONF_OPTS += --disable-static +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS From thomas.petazzoni at bootlin.com Mon Feb 20 21:07:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:07:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: fix BR2_SHARED_STATIC_LIBS In-Reply-To: <20230219232301.1795196-1-fontaine.fabrice@gmail.com> References: <20230219232301.1795196-1-fontaine.fabrice@gmail.com> Message-ID: <20230220220741.1f38012c@windsurf> Hello Fabrice, On Mon, 20 Feb 2023 00:23:01 +0100 Fabrice Fontaine wrote: > tmux uses custom --enable-static option, instead of standard libtool > directive resulting in the following build failure with systemd or > utf8proc raised since commits > 1f618aa388535181c281c85e2b5264532de4ef0f and > e279599d255a79c08ef20b97b96eb248689d52a9: I am rather confused by the reasoning here. > checking for utf8proc.h... yes > checking for library containing utf8proc_charwidth... no > configure: error: "utf8proc not found" So this one is: http://autobuild.buildroot.net/results/6e8/6e8523d8d514bf6d8fc3377d05e5edbe7fc2d5bb/build-end.log http://autobuild.buildroot.net/results/623/62309091c9da69eb29c3e9464aa95d089ce886f8/build-end.log I think here the problem is indeed that tmux interprets --enable-static as "please provide a statically linked binary" instead of the standard "please build/install static libraries". So, when it tries to detect libutf8proc, it doesn't find it: /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/or1k-buildroot-linux-musl/11.3.0/../../../../or1k-buildroot-linux-musl/bin/ld: cannot find -lutf8proc: No such file or directory because utf8proc is based on CMake, and CMake is not able to build both shared and static libraries, so in the BR2_STATIC_SHARED_LIBS=y case, it only installs shared libraries. Because the above utf8proc library test is done with -static, it requires a static variant of libutf8proc, which isn't there. So indeed, for this case, it makes sense to not pass --enable-static to tmux, but it's both due to tmux having a non-standard behavior for --enable-static *AND* the fact that utf8proc also doesn't behave properly in the BR2_STATIC_SHARED_LIBS=y case. > In file included from tmux.h:34, > from alerts.c:23: > compat.h:379:18: error: conflicting types for 'forkpty'; have 'pid_t(int *, char *, struct termios *, struct winsize *)' {aka 'int(int *, char *, struct termios *, struct winsize *)'} > 379 | pid_t forkpty(int *, char *, struct termios *, struct winsize *); > | ^~~~~~~ However this one, I am really, really confused as to how it can be related to BR2_STATIC_SHARED_LIBS and --enable-static. Could you provide some more details on the reasoning? Thanks! 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 Mon Feb 20 21:10:17 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 22:10:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: fix BR2_SHARED_STATIC_LIBS In-Reply-To: <20230219232301.1795196-1-fontaine.fabrice@gmail.com> References: <20230219232301.1795196-1-fontaine.fabrice@gmail.com> Message-ID: <20230220211017.GF2718518@scaer> Fabrice, All, On 2023-02-20 00:23 +0100, Fabrice Fontaine spake thusly: > tmux uses custom --enable-static option, instead of standard libtool > directive In fact, the purpose is also different: libtool's --enable-static drives whether to generate static libraries, while tmux' --enable-static drives whether to link against static libraries. So, not unrelated, but still different. > resulting in the following build failure with systemd or > utf8proc raised since commits > 1f618aa388535181c281c85e2b5264532de4ef0f and > e279599d255a79c08ef20b97b96eb248689d52a9: > > checking for utf8proc.h... yes > checking for library containing utf8proc_charwidth... no > configure: error: "utf8proc not found" > > In file included from tmux.h:34, > from alerts.c:23: > compat.h:379:18: error: conflicting types for 'forkpty'; have 'pid_t(int *, char *, struct termios *, struct winsize *)' {aka 'int(int *, char *, struct termios *, struct winsize *)'} > 379 | pid_t forkpty(int *, char *, struct termios *, struct winsize *); > | ^~~~~~~ > > Link to (closed) upstream issue: > https://github.com/tmux/tmux/issues/3290 > > Fixes: > - http://autobuild.buildroot.org/results/6e8523d8d514bf6d8fc3377d05e5edbe7fc2d5bb > - http://autobuild.buildroot.org/results/cba06f3bb6d9be25e91f56c390a70ddf9904832e > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/tmux/tmux.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk > index 47ee9b16ca..af06c8570b 100644 > --- a/package/tmux/tmux.mk > +++ b/package/tmux/tmux.mk > @@ -25,6 +25,12 @@ else > TMUX_CONF_OPTS += --disable-utf8proc > endif > > +# tmux uses custom --enable-static option, instead of standard libtool > +# directive resulting in a build failure with systemd or utf8proc > +ifeq ($(BR2_SHARED_STATIC_LIBS),y) > +TMUX_CONF_OPTS += --disable-static > +endif > + > # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear > # can reject the user connection. See man shells. > define TMUX_ADD_TMUX_TO_SHELLS > -- > 2.39.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 thomas.petazzoni at bootlin.com Mon Feb 20 21:17:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:17:21 +0100 Subject: [Buildroot] [PATCH v2] package/libcamera-apps: enable LIBAV only if libdrm is present In-Reply-To: <20230220071846.2334907-1-marcus.folkesson@gmail.com> References: <20230220071846.2334907-1-marcus.folkesson@gmail.com> Message-ID: <20230220221721.3ebb047b@windsurf> Hello Marcus, On Mon, 20 Feb 2023 08:18:46 +0100 Marcus Folkesson wrote: > Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps > does enable LIBAV by default which depends on libdrm. > > Fixes: > - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ > > /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory > 13 | #include > | ^~~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: Marcus Folkesson I need to do some test builds, but I believe this patch is not correct. What the error message seems to say is that when you build libav support in libcamera-apps, then libdrm support is needed. But what you're patch is doing is that it's forcing to have libva as soon as libdrm is available, which I'm not sure is needed. > diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in > index 711fd6de05..d0cc6a4210 100644 > --- a/package/libcamera-apps/Config.in > +++ b/package/libcamera-apps/Config.in > @@ -15,6 +15,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS > 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_FFMPEG if BR2_PACKAGE_LIBDRM > 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 > diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk > index 290ee9a026..1464875298 100644 > --- a/package/libcamera-apps/libcamera-apps.mk > +++ b/package/libcamera-apps/libcamera-apps.mk > @@ -23,10 +23,12 @@ LIBCAMERA_APPS_CONF_OPTS = \ > -DENABLE_TFLITE=0 > > ifeq ($(BR2_PACKAGE_LIBDRM),y) > -LIBCAMERA_APPS_DEPENDENCIES += libdrm > +LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm > LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=1 > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 > else > LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 > +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 > endif Could you instead try something like this: ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_LIBDRM),yy) LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 endif To test this, you need to test 4 different cases: - libcamera-apps enabled, ffmpeg disabled, libdrm disabled - libcamera-apps enabled, ffmpeg enabled, libdrm disabled - libcamera-apps enabled, ffmpeg disabled, libdrm enabled - libcamera-apps enabled, ffmpeg enabled, libdrm enabled Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 21:32:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:32:47 +0100 Subject: [Buildroot] [git commit] package/python-webargs: add CPE variables Message-ID: <20230220213258.1F8B8864B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81de6207f1237f17ec3e17e3afaae25474c7aca5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:webargs_project:webargs is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Awebargs_project%3Awebargs Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-webargs/python-webargs.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-webargs/python-webargs.mk b/package/python-webargs/python-webargs.mk index e048d8a4ac..ce270842c1 100644 --- a/package/python-webargs/python-webargs.mk +++ b/package/python-webargs/python-webargs.mk @@ -10,5 +10,7 @@ PYTHON_WEBARGS_SITE = https://files.pythonhosted.org/packages/4b/7d/fece8e6547b3 PYTHON_WEBARGS_SETUP_TYPE = setuptools PYTHON_WEBARGS_LICENSE = MIT PYTHON_WEBARGS_LICENSE_FILES = LICENSE +PYTHON_WEBARGS_CPE_ID_VENDOR = webargs_project +PYTHON_WEBARGS_CPE_ID_PRODUCT = webargs $(eval $(python-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 21:32:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:32:40 +0100 Subject: [Buildroot] [git commit] package/python-marshmallow: add CPE variables Message-ID: <20230220213258.16B92864AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=555f128feb3bc1e3f8f3bd52315abff5cc308aaa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:marshmallow_project:marshmallow is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Amarshmallow_project%3Amarshmallow Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-marshmallow/python-marshmallow.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-marshmallow/python-marshmallow.mk b/package/python-marshmallow/python-marshmallow.mk index 6427296508..ba6da6b29c 100644 --- a/package/python-marshmallow/python-marshmallow.mk +++ b/package/python-marshmallow/python-marshmallow.mk @@ -10,5 +10,7 @@ PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/5e/59/dd465e5a PYTHON_MARSHMALLOW_SETUP_TYPE = setuptools PYTHON_MARSHMALLOW_LICENSE = MIT PYTHON_MARSHMALLOW_LICENSE_FILES = LICENSE +PYTHON_MARSHMALLOW_CPE_ID_VENDOR = marshmallow_project +PYTHON_MARSHMALLOW_CPE_ID_PRODUCT = marshmallow $(eval $(python-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 21:34:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:34:17 +0100 Subject: [Buildroot] [PATCH v2] package/libcamera-apps: enable LIBAV only if libdrm is present In-Reply-To: <20230220221721.3ebb047b@windsurf> References: <20230220071846.2334907-1-marcus.folkesson@gmail.com> <20230220221721.3ebb047b@windsurf> Message-ID: <20230220223417.5b1c3c08@windsurf> On Mon, 20 Feb 2023 22:17:21 +0100 Thomas Petazzoni wrote: > I need to do some test builds, but I believe this patch is not correct. I confirm the patch is not correct: if you have a configuration with libcamera-apps and libdrm (but ffmpeg disabled), it builds just fine, and DRM support in camera-apps is enabled. In this configuration, your patch forces a dependency on ffmpeg, which is not correct. Could you have a look at my previous suggestion instead? Thanks a lot, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 21:34:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:34:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-marshmallow: add CPE variables In-Reply-To: <20230215225947.26078-1-fontaine.fabrice@gmail.com> References: <20230215225947.26078-1-fontaine.fabrice@gmail.com> Message-ID: <20230220223449.1c38bdb4@windsurf> On Wed, 15 Feb 2023 23:59:47 +0100 Fabrice Fontaine wrote: > cpe:2.3:a:marshmallow_project:marshmallow is a valid CPE identifier for > this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Amarshmallow_project%3Amarshmallow > > Signed-off-by: Fabrice Fontaine > --- > package/python-marshmallow/python-marshmallow.mk | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 21:34:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:34:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-webargs: add CPE variables In-Reply-To: <20230215230413.28610-1-fontaine.fabrice@gmail.com> References: <20230215230413.28610-1-fontaine.fabrice@gmail.com> Message-ID: <20230220223455.318a2fbf@windsurf> On Thu, 16 Feb 2023 00:04:13 +0100 Fabrice Fontaine wrote: > cpe:2.3:a:webargs_project:webargs is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Awebargs_project%3Awebargs > > Signed-off-by: Fabrice Fontaine > --- > package/python-webargs/python-webargs.mk | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 21:39:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:39:07 +0100 Subject: [Buildroot] [git commit] package/network-manager: add patch to set mobile-broadband-provider-info-database location Message-ID: <20230220213917.5D2FE864B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c36f6938858d3246ca493dacc925717586e2ea0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When building network-manager in cross-compile environment pkg-config returns the wrong path to the mobile-broadband-provider-info database. By adding the option 'mobile_broadband_provider_info_database' to set the correct path to the datafile this can be solved. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- ...-add-option-to-set-the-mobile-broadband-p.patch | 60 ++++++++++++++++++++++ package/network-manager/network-manager.mk | 1 + 2 files changed, 61 insertions(+) diff --git a/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch b/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch new file mode 100644 index 0000000000..4336472e45 --- /dev/null +++ b/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch @@ -0,0 +1,60 @@ +From 03ba04d4784fa4fc7ec31455070fb5ecf25ade23 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Fri, 27 Jan 2023 22:38:42 +0100 +Subject: [PATCH] build: meson: add option to set the + mobile-broadband-provider-info database + +When building network-manager in cross-compile environment meson is not able +to detect the right location of the mobile-broadband-provider-info +database by using the pkg-config module. + +By adding the option 'mobile_broadband_provider_info_database' to set the +correct path to the datafile this can be solved. + +Signed-off-by: Heiko Thiery + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1519 +--- + meson.build | 6 +++++- + meson_options.txt | 1 + + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 0adc42f738..84ce52c736 100644 +--- a/meson.build ++++ b/meson.build +@@ -584,7 +584,10 @@ enable_modem_manager = get_option('modem_manager') + if enable_modem_manager + mm_glib_dep = dependency('mm-glib', version: '>= 0.7.991') + +- mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ mobile_broadband_provider_info_database = get_option('mobile_broadband_provider_info_database') ++ if mobile_broadband_provider_info_database == '' ++ mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ endif + config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_database) + endif + +@@ -1054,6 +1057,7 @@ output += ' jansson: ' + jansson_msg + '\n' + output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n' + output += ' nft: ' + config_h.get('NFT_PATH') + '\n' + output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n' ++output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' + output += ' ofono: ' + enable_ofono.to_string() + '\n' + output += ' concheck: ' + enable_concheck.to_string() + '\n' + output += ' libteamdctl: ' + enable_teamdctl.to_string() + '\n' +diff --git a/meson_options.txt b/meson_options.txt +index 8b1d32e645..4e359f9e92 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -32,6 +32,7 @@ option('ppp', type: 'boolean', value: true, description: 'enable PPP/PPPoE suppo + option('pppd', type: 'string', value: '', description: 'path to pppd binary') + option('pppd_plugin_dir', type: 'string', value: '', description: 'path to the pppd plugins directory') + option('modem_manager', type: 'boolean', value: true, description: 'Enable new ModemManager1 interface support') ++option('mobile_broadband_provider_info_database', type: 'string', value: '', description: 'path to the mobile-broadband-provider-info database') + option('ofono', type: 'boolean', value: false, description: 'Enable oFono support (experimental)') + option('concheck', type: 'boolean', value: true, description: 'enable connectivity checking support') + option('teamdctl', type: 'boolean', value: false, description: 'enable Teamd control support') +-- +2.20.1 + diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 138ff46e4a..87932c75e4 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -96,6 +96,7 @@ endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true +NETWORK_MANAGER_CONF_OPTS += -Dmobile_broadband_provider_info_database=/usr/share/mobile-broadband-provider-info/serviceproviders.xml else NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif From thomas.petazzoni at bootlin.com Mon Feb 20 21:39:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 22:39:20 +0100 Subject: [Buildroot] [PATCH 1/2] package/network-manager: add patch to set mobile-broadband-provider-info-database location In-Reply-To: <20230213124021.12522-1-heiko.thiery@gmail.com> References: <20230213124021.12522-1-heiko.thiery@gmail.com> Message-ID: <20230220223920.43c5921c@windsurf> On Mon, 13 Feb 2023 13:40:21 +0100 Heiko Thiery wrote: > When building network-manager in cross-compile environment pkg-config returns > the wrong path to the mobile-broadband-provider-info database. > > By adding the option 'mobile_broadband_provider_info_database' to set the > correct path to the datafile this can be solved. > > Signed-off-by: Heiko Thiery > --- > ...option-to-set-the-mobile-broadband-p.patch | 60 +++++++++++++++++++ > package/network-manager/network-manager.mk | 1 + > 2 files changed, 61 insertions(+) > create mode 100644 package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Mon Feb 20 22:23:55 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 23:23:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: fix BR2_SHARED_STATIC_LIBS In-Reply-To: <20230220220741.1f38012c@windsurf> References: <20230219232301.1795196-1-fontaine.fabrice@gmail.com> <20230220220741.1f38012c@windsurf> Message-ID: Le lun. 20 f?vr. 2023 ? 22:07, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > Hello Fabrice, > > On Mon, 20 Feb 2023 00:23:01 +0100 > Fabrice Fontaine wrote: > > > tmux uses custom --enable-static option, instead of standard libtool > > directive resulting in the following build failure with systemd or > > utf8proc raised since commits > > 1f618aa388535181c281c85e2b5264532de4ef0f and > > e279599d255a79c08ef20b97b96eb248689d52a9: > > I am rather confused by the reasoning here. > > > checking for utf8proc.h... yes > > checking for library containing utf8proc_charwidth... no > > configure: error: "utf8proc not found" > > So this one is: > > > http://autobuild.buildroot.net/results/6e8/6e8523d8d514bf6d8fc3377d05e5edbe7fc2d5bb/build-end.log > > http://autobuild.buildroot.net/results/623/62309091c9da69eb29c3e9464aa95d089ce886f8/build-end.log > > I think here the problem is indeed that tmux interprets --enable-static > as "please provide a statically linked binary" instead of the standard > "please build/install static libraries". > > So, when it tries to detect libutf8proc, it doesn't find it: > > /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/or1k-buildroot-linux-musl/11.3.0/../../../../or1k-buildroot-linux-musl/bin/ld: > cannot find -lutf8proc: No such file or directory > > because utf8proc is based on CMake, and CMake is not able to build both > shared and static libraries, so in the BR2_STATIC_SHARED_LIBS=y case, > it only installs shared libraries. Because the above utf8proc library > test is done with -static, it requires a static variant of libutf8proc, > which isn't there. > > So indeed, for this case, it makes sense to not pass --enable-static to > tmux, but it's both due to tmux having a non-standard behavior for > --enable-static *AND* the fact that utf8proc also doesn't behave > properly in the BR2_STATIC_SHARED_LIBS=y case. > > > In file included from tmux.h:34, > > from alerts.c:23: > > compat.h:379:18: error: conflicting types for 'forkpty'; have 'pid_t(int > *, char *, struct termios *, struct winsize *)' {aka 'int(int *, char *, > struct termios *, struct winsize *)'} > > 379 | pid_t forkpty(int *, char *, struct termios *, struct > winsize *); > > | ^~~~~~~ > > > However this one, I am really, really confused as to how it can be > related to BR2_STATIC_SHARED_LIBS and --enable-static. Could you > provide some more details on the reasoning? > This is the same issue, availability of forkpty in systemd is wrongly detected because of --static. Here is an extract of http://autobuild.buildroot.org/results/cba/cba06f3bb6d9be25e91f56c390a70ddf9904832e//tmux-3.3a/config.log : configure:7278: /home/autobuild/autobuild/instance-12/output-1/host/bin/powerpc64-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -D_FORTIFY_SOURCE=2 -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lutil -L/home/autobuild/autobuild/instance-12/output-1/host/bin/../powerpc64-buildroot-linux-gnu/sysroot/usr/lib -lsystemd -lncurses -L/home/autobuild/autobuild/instance-12/output-1/host/bin/../powerpc64-buildroot-linux-gnu/sysroot/usr/lib -levent_core -lm >&5 /home/autobuild/autobuild/instance-12/output-1/host/lib/gcc/powerpc64-buildroot-linux-gnu/11.3.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: cannot find -lsystemd > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Mon Feb 20 22:31:25 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 23:31:25 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/libmodsecurity: needs dynamic library with libcurl, libssh2 and mbedtls In-Reply-To: <20230220215531.7b3a1783@windsurf> References: <20230219172440.519540-1-fontaine.fabrice@gmail.com> <20230220215531.7b3a1783@windsurf> Message-ID: Hello, Le lun. 20 f?vr. 2023 ? 21:55, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > Hello Fabrice, > > On Sun, 19 Feb 2023 18:24:40 +0100 > Fabrice Fontaine wrote: > > > Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as > > mbedtls can be pulled in libcurl through libssh2 resulting in the > > following build failure: > > > > > /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: > /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): > in function `mbedtls_md5_init': > > md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; > ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): > first defined here > > > > Fixes: > > - > http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a > > > > Signed-off-by: Fabrice Fontaine > > --- > > Changes v2 -> v3: > > - Fix syntax > > Changes v1 -> v2: > > - Update nginx-modsecurity > > Isn't that a bit madness? If libmodsecurity has its copy of parts of > mbedtls, but didn't take care of renaming the symbols, then ultimately > what we should conclude is that using libmodsecurity in a statically > linked configuration is not supported. > > So I would advocate for simplifying the whole thing and just make > libmodsecurity and its reverse dependencies depends on !BR2_STATIC_LIBS > and be done with it. > > What do you think? > OK, I'll send a v4 > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Mon Feb 20 22:31:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:31:42 +0100 Subject: [Buildroot] [git commit] package/postgresql: add lz4 and zstd support Message-ID: <20230220223154.39624864C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9cd2e6e090449f9d2f371d24152580c038892f3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PostgreSQL has optional compression support (LZ4 and Zstandard). So enable it if libraries are available. Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index e90aa794b0..5e3601cb46 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -91,6 +91,20 @@ else POSTGRESQL_CONF_OPTS += --without-libxml endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +POSTGRESQL_DEPENDENCIES += zstd +POSTGRESQL_CONF_OPTS += --with-zstd +else +POSTGRESQL_CONF_OPTS += --without-zstd +endif + +ifeq ($(BR2_PACKAGE_LZ4),y) +POSTGRESQL_DEPENDENCIES += lz4 +POSTGRESQL_CONF_OPTS += --with-lz4 +else +POSTGRESQL_CONF_OPTS += --without-lz4 +endif + # required for postgresql.service Type=notify ifeq ($(BR2_PACKAGE_SYSTEMD),y) POSTGRESQL_DEPENDENCIES += systemd From fontaine.fabrice at gmail.com Mon Feb 20 22:31:51 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 20 Feb 2023 23:31:51 +0100 Subject: [Buildroot] [PATCH v4, 1/1] package/libmodsecurity: needs dynamic library Message-ID: <20230220223151.12965-1-fontaine.fabrice@gmail.com> Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as mbedtls can be pulled in libcurl through libssh2 resulting in the following build failure: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init': md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a Signed-off-by: Fabrice Fontaine --- Changes v3 -> v4 (after review of Thomas Petazzoni): - Disable building statically Changes v2 -> v3: - Fix syntax Changes v1 -> v2: - Update nginx-modsecurity package/libmodsecurity/Config.in | 10 ++++------ package/nginx-modsecurity/Config.in | 9 +++------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index b15d808759..2186d216f4 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBMODSECURITY depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity embeds several mbedtls source files - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_PCRE2 help Libmodsecurity is one component of the ModSecurity @@ -17,8 +17,6 @@ config BR2_PACKAGE_LIBMODSECURITY https://github.com/SpiderLabs/ModSecurity -comment "libmodsecurity needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "libmodsecurity needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS +comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in index 5cbe57a866..f3c270ff31 100644 --- a/package/nginx-modsecurity/Config.in +++ b/package/nginx-modsecurity/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY depends on BR2_PACKAGE_NGINX_HTTP depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) # libmodsecurity + depends on !BR2_STATIC_LIBS # libmodsecurity select BR2_PACKAGE_LIBMODSECURITY help The ModSecurity-nginx connector is the connection @@ -14,8 +14,5 @@ config BR2_PACKAGE_NGINX_MODSECURITY comment "nginx-modsecurity needs a toolchain w/ C++, threads" depends on BR2_PACKAGE_NGINX_HTTP - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "nginx-modsecurity needs a toolchain w/ dynamic library" - depends on BR2_PACKAGE_NGINX_HTTP - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS -- 2.39.0 From thomas.petazzoni at bootlin.com Mon Feb 20 22:32:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:32:04 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/postgresql: add lz4 and zstd support In-Reply-To: <20230208071226.33697-1-fido_max@inbox.ru> References: <20230208071226.33697-1-fido_max@inbox.ru> Message-ID: <20230220233204.056b091a@windsurf> On Wed, 8 Feb 2023 10:12:26 +0300 Maxim Kochetkov via buildroot wrote: > PostgreSQL has optional compression support (LZ4 and Zstandard). > So enable it if libraries are available. > > Signed-off-by: Maxim Kochetkov > --- > package/postgresql/postgresql.mk | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 22:32:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:32:47 +0100 Subject: [Buildroot] [git commit branch/next] package/tinyalsa: add option to enable utility tools Message-ID: <20230220223303.7886D864C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2c1e10b8ac3531ab5a48e23c23b702cd24b3f73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Add option to enable useful tools, like tinyplay, tinymix, etc. Signed-off-by: Konstantin Menyaev Signed-off-by: Thomas Petazzoni --- package/tinyalsa/Config.in | 9 +++++++++ package/tinyalsa/tinyalsa.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/tinyalsa/Config.in b/package/tinyalsa/Config.in index d9ce22c8a7..b4d4aeb276 100644 --- a/package/tinyalsa/Config.in +++ b/package/tinyalsa/Config.in @@ -13,5 +13,14 @@ config BR2_PACKAGE_TINYALSA https://github.com/tinyalsa/tinyalsa +if BR2_PACKAGE_TINYALSA + +config BR2_PACKAGE_TINYALSA_TOOLS + bool "tinyalsa tools" + help + Build utility tools (tinyplay, tinycap, tinymix, tinypcminfo) + +endif #BR2_PACKAGE_TINYALSA + comment "tinyalsa needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index b5c39e35d6..fe6d373ec8 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -9,6 +9,12 @@ TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3-Clause TINYALSA_LICENSE_FILES = NOTICE TINYALSA_INSTALL_STAGING = YES -TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled +TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled + +ifeq ($(BR2_PACKAGE_TINYALSA_TOOLS),y) +TINYALSA_CONF_OPTS += -Dutils=enabled +else +TINYALSA_CONF_OPTS += -Dutils=disabled +endif $(eval $(meson-package)) From thomas.petazzoni at bootlin.com Mon Feb 20 22:33:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:33:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinyalsa: add option to enable utility tools In-Reply-To: <20230201060001.134150-1-KAMenyaev@sberdevices.ru> References: <20230201060001.134150-1-KAMenyaev@sberdevices.ru> Message-ID: <20230220233303.77bc24dd@windsurf> On Wed, 1 Feb 2023 09:00:01 +0300 Konstantin Menyaev via buildroot wrote: > From: Konstantin Menyaev > > Add option to enable useful tools, > like tinyplay, tinymix, etc. > > Signed-off-by: Konstantin Menyaev > --- > package/tinyalsa/Config.in | 9 +++++++++ > package/tinyalsa/tinyalsa.mk | 8 +++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 22:47:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:47:21 +0100 Subject: [Buildroot] [git commit branch/next] package/openjdk{-bin}: bump versions to 11.0.18+10 and 17.0.6+10 Message-ID: <20230220224732.1DBAE864D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc0d6bdd66e477ee0e3de0538e37d49bdfd7a9e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/openjdk-bin/openjdk-bin.hash | 8 ++++---- package/openjdk-bin/openjdk-bin.mk | 4 ++-- ...01-Add-ARCv2-ISA-processors-support-to-Zero.patch | 20 ++++++++++---------- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 4d3942125f..241ca34a04 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,10 +1,10 @@ # https://github.com/adoptium/temurin17-binaries/releases -sha256 288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48 OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz -sha256 302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz +sha256 a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289 OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz +sha256 9e0e88bbd9fa662567d0c1e22d469268c68ac078e9e5fe5a7244f56fec71f55f OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz # From https://github.com/adoptium/temurin11-binaries/releases -sha256 43fb84f8063ad9bf6b6d694a67b8f64c8827552b920ec5ce794dfe5602edffe7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz -sha256 79572f5172c6a040591d34632f98a20ed148702bbce2f57649e8ac01c0d2e3db OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14.1_1.tar.gz +sha256 4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz +sha256 04d5eeff6a6449bcdca0f52cd97bafd43ce09d40ef1e73fa0e1add63bea4a9c8 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index 608a0bc3ac..c3eb0b05e6 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_8 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.6_10 else HOST_OPENJDK_BIN_VERSION_MAJOR = 11 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.14.1_1 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.18_10 endif ifeq ($(HOSTARCH),x86_64) diff --git a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 83% rename from package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index 1ef523a419..dfd3b07bea 100644 --- a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -23,8 +23,8 @@ diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 index 5120918aed2..f7a99955874 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 -@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], - BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread" +@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], + fi fi + # Libatomic library @@ -55,7 +55,7 @@ index c0f2446dbd7..dc416ece885 100644 arm*) VAR_CPU=arm VAR_CPU_ARCH=arm -@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], +@@ -563,6 +569,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], HOTSPOT_$1_CPU_DEFINE=PPC64 # The cpu defines below are for zero, we don't support them directly. @@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c index b08caf4d5d3..2bf084895ba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,12 +95,12 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { - static Elf32_Half running_arch_code=EM_RISCV; +@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { + static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ -- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc -+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc +- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc ++ AARCH64, ALPHA, ARC ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc #endif // Identify compatibility class for VM's architecture and library's architecture diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 293787792d..0a67e7a3ec 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2fdd23261526362d4aaf58323441d4c31d29de2e374ba94bbf2727a00adc0ea7 openjdk-17.0.2+8.tar.gz -sha256 0e859cc03378439023e17ee82aecee5a52265fb38906a8bebf16027aa2b2bcf5 openjdk-11.0.14.1+1.tar.gz +sha256 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472 openjdk-17.0.6+10.tar.gz +sha256 04af71fc7adda41a49861870f9ec0ac0f059c2cf9393ce32995ea8ef4279a1b1 openjdk-11.0.18+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 42d52d57c4..0fe506bbfd 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.2+8 +OPENJDK_VERSION_MINOR = 0.6+10 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.14.1+1 +OPENJDK_VERSION_MINOR = 0.18+10 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) From thomas.petazzoni at bootlin.com Mon Feb 20 22:47:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:47:38 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/openjdk{-bin}: bump versions to 11.0.18+10 and 17.0.6+10 In-Reply-To: <20230215224712.487272-1-aduskett@gmail.com> References: <20230215224712.487272-1-aduskett@gmail.com> Message-ID: <20230220234738.40b492d3@windsurf> On Wed, 15 Feb 2023 14:47:12 -0800 Adam Duskett wrote: > Signed-off-by: Adam Duskett > --- > v1 -> v2: Add missing openjdk-bin updates Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 20 22:48:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:48:27 +0100 Subject: [Buildroot] [PATCH 1/2] configs/bananapi_m2_ultra_defconfig: bump Linux to 6.1 and U-Boot to 2023.01 In-Reply-To: <20230215200902.538238-1-giulio.benetti@benettiengineering.com> References: <20230215200902.538238-1-giulio.benetti@benettiengineering.com> Message-ID: <20230220234827.28c6b92f@windsurf> On Wed, 15 Feb 2023 21:09:01 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti > --- > configs/bananapi_m2_ultra_defconfig | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Both applied to next, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 7 21:37:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 7 Feb 2023 22:37:15 +0100 Subject: [Buildroot] [git commit branch/next] package/wolfssl: disable assembly when not supported Message-ID: <20230220205253.CD9DF86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8dc5315eb712eca0a5cbf793a6714a47ab6e57e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next wolfssl contains some assembly code and its configure.ac script enables the assembly code depending on the CPU architecture. However, the detection logic is not sufficient and leads to using the assembly code in situation where it should not. Here are two examples: - As soon as the architecture is mips64/mips64el, it uses assembly code, but that assembly code is not mips64r6 compatible. - As soon as the architecture is RISC-V, it uses assembly code, but that assembly code uses multiplication instructions, without paying attention that the "M" extension may not be available in the RISC-V CPU instruction set. In order to avoid this, we introduce a BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS hidden boolean to decide when to enable/disable assembly code. We set an initial value with the supported CPU architectures, with the exclusion of the problematic cases described above. It is pretty likely that this variable will need tuning progressively, as it is difficult to determine which CPU variants exactly are supported by the assembly code in wolfssl. Fixes: - MIPS64 case: http://autobuild.buildroot.net/results/43e/43ee1a457cbeb986d958c9a70cac0676377661c0/ - RISC-V case: http://autobuild.buildroot.net/results/f05/f056ebe7749a69994afba39a9d4967e2774c45ea/ Signed-off-by: Thomas Petazzoni --- package/wolfssl/Config.in | 12 ++++++++++++ package/wolfssl/wolfssl.mk | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/package/wolfssl/Config.in b/package/wolfssl/Config.in index 3a97125e8d..c41bdb6888 100644 --- a/package/wolfssl/Config.in +++ b/package/wolfssl/Config.in @@ -1,3 +1,15 @@ +config BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm || BR2_armeb + default y if BR2_powerpc + default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_mips64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64el && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips || BR2_mipsel + default y if BR2_riscv && BR2_RISCV_ISA_RVM + default y if BR2_s390x + config BR2_PACKAGE_WOLFSSL bool "wolfssl" depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 8f6cba56ec..9f06bb1b4b 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -32,6 +32,12 @@ else WOLFSSL_CONF_OPTS += --disable-sslv3 endif +ifeq ($(BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS),y) +WOLFSSL_CONF_OPTS += --enable-asm +else +WOLFSSL_CONF_OPTS += --disable-asm +endif + # enable ARMv8 hardware acceleration ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm From peter at korsgaard.com Mon Feb 20 21:00:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 20 Feb 2023 21:00:05 -0000 Subject: [Buildroot] [git commit branch/next] package/perl-http-message: bump version to 6.44 Message-ID: <20230220205229.D5FF1828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79e8aad721099eb05e60b449432136691275022f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-http-message/perl-http-message.hash | 4 ++-- package/perl-http-message/perl-http-message.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-http-message/perl-http-message.hash b/package/perl-http-message/perl-http-message.hash index 0e05da644e..94b5c06a4f 100644 --- a/package/perl-http-message/perl-http-message.hash +++ b/package/perl-http-message/perl-http-message.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 17ca8ec3be118d50c5299b232f3109d7 HTTP-Message-6.37.tar.gz -sha256 0e59da0a85e248831327ebfba66796314cb69f1bfeeff7a9da44ad766d07d802 HTTP-Message-6.37.tar.gz +md5 926a077669a7828c5ca39b5cf7735625 HTTP-Message-6.44.tar.gz +sha256 398b647bf45aa972f432ec0111f6617742ba32fc773c6612d21f64ab4eacbca1 HTTP-Message-6.44.tar.gz # computed by scancpan sha256 f2f428b5f8a3bf4e6a71cd5ea92558a3d123d3d7c5075d34923e71e46dea94df LICENSE diff --git a/package/perl-http-message/perl-http-message.mk b/package/perl-http-message/perl-http-message.mk index 79402c3298..67b68b0de2 100644 --- a/package/perl-http-message/perl-http-message.mk +++ b/package/perl-http-message/perl-http-message.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_MESSAGE_VERSION = 6.37 +PERL_HTTP_MESSAGE_VERSION = 6.44 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_MESSAGE_LICENSE = Artistic or GPL-1.0+ From peter at korsgaard.com Wed Feb 8 15:24:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 8 Feb 2023 16:24:25 +0100 Subject: [Buildroot] [git commit branch/next] package/xz: patch configure due to microblaze patch Message-ID: <20230220205256.61FDD8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5a83df8da04f5854c2e248e23dea3af620954cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Commit bed21bb9b added a patch to change configure.ac but failed to update configure which caused build failures due to the timestamp difference between configure and configure.ac and the makefile attempting to run aclocal. XZ_AUTORECONF = YES creates a circular dependency where the host autotools need host-xz which also gets patched. Because of this, we need to patch xz's configure script manually and NOT patch configure.ac so its timestamp stays older than Makefile.in. While we're doing this, correct the language in the commit body of the patch, remove a stray whitespace, and fix the offset for configure.ac Fixes: bed21bb9b ("package/xz: fix microblaze compiles") Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685/ Signed-off-by: Vincent Fazio [Peter: Only patch configure] Signed-off-by: Peter Korsgaard --- .../xz/0001-Detect-symver-attribute-support.patch | 71 ++++++++++++---------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch index 9ec43ea7a0..462fa9d86b 100644 --- a/package/xz/0001-Detect-symver-attribute-support.patch +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -1,11 +1,11 @@ -From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From f0e0e8bd08b4d4e7c89a5a3b7d9a3c083f7e5432 Mon Sep 17 00:00:00 2001 From: Vincent Fazio -Date: Tue, 7 Feb 2023 08:51:24 -0600 +Date: Wed, 8 Feb 2023 12:58:37 +0000 Subject: [PATCH] Detect symver attribute support -On non-ELF platforms, such as microblaze, builds will fail when trying -to add symver information because __attribute__((symver ..)) is not -supported even though __has_attribute(__symver__) returns true. +On Microblaze, builds will fail when trying to add symver information +because __attribute__((symver ..)) is not supported even though +__has_attribute(__symver__) returns true. Support for symver needs to be detected via a compile test since __has_attribute can report false positives [0]. @@ -18,33 +18,16 @@ it is supported and define a variable to advertise support. Upstream: https://github.com/tukaani-project/xz/pull/32 Signed-off-by: Thomas Petazzoni Signed-off-by: Vincent Fazio +[Peter: patch configure instead of configure.ac so autoreconf isn't +triggered at build time] +Signed-off-by: Peter Korsgaard --- - configure.ac | 9 +++++++++ - src/liblzma/common/common.h | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) + configure | 15 +++++++++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 5ad5589..08c623a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -791,6 +791,15 @@ else - time with Libtool if neither --with-pic nor - --without-pic is used). This define must be - used together with liblzma_linux.map.]) -+ OLD_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE( -+ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } -+ ])], -+ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], -+ [Define to 1 if GCC supports the symver attribute])], -+ []) -+ CFLAGS="$OLD_CFLAGS" - ;; - *) - enable_symbol_versions=generic diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h -index 11fec52..1d2ef9c 100644 +index 671d3bc..27b56ee 100644 --- a/src/liblzma/common/common.h +++ b/src/liblzma/common/common.h @@ -76,7 +76,7 @@ @@ -52,10 +35,36 @@ index 11fec52..1d2ef9c 100644 // is available. This should be far more reliable than looking at compiler // version macros as nowadays especially __GNUC__ is defined by many compilers. -# if lzma_has_attribute(__symver__) -+# if defined(HAVE_SYMVER_ATTRIBUTE) ++# if defined(HAVE_SYMVER_ATTRIBUTE) # define LZMA_SYMVER_API(extnamever, type, intname) \ extern __attribute__((__symver__(extnamever))) \ LZMA_API(type) intname +diff --git a/configure b/configure +index ff0eed5..e685b30 100755 +--- a/configure ++++ b/configure +@@ -16687,6 +16687,21 @@ printf "%s\n" "" >&6; } + + printf "%s\n" "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h + ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO" ++then : ++ ++printf "%s\n" "#define HAVE_SYMVER_ATTRIBUTE 1" >>confdefs.h ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic -- -2.25.1 +2.34.1 From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:31 -0000 Subject: [Buildroot] [git commit branch/next] package/libnetconf2: bump version 2.2.12 Message-ID: <20230220205232.36E2A8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=113e3a8fed6c89e947bea2f44672c47338d08c96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/sysrepo/sysrepo.hash | 2 +- package/sysrepo/sysrepo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index 1db33df626..a90d8259bf 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 357a50851e4cc052b484b924ed0a5808c29159a7c9d48d9b1b8c42784c4b6917 sysrepo-2.1.64.tar.gz +sha256 1bc866f13e41ba5e7e4acd52b5c3d42b1a2a1e032775e0a9b094f3265844cd25 sysrepo-2.2.12.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 0ed27e3cfb..9da8c22ca2 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.1.64 +SYSREPO_VERSION = 2.2.12 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause From thomas.petazzoni at bootlin.com Wed Feb 8 16:43:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:43:31 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: update e-mail for Frank Vanbever Message-ID: <20230220205256.AE7CB86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=416213be39c6adb860a9d3e85f0a634139c27cac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0e116e92a3..32c6e54919 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1088,7 +1088,7 @@ F: package/sane-backends/ F: package/upx/ F: package/zxing-cpp/ -N: Frank Vanbever +N: Frank Vanbever F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:32 -0000 Subject: [Buildroot] [git commit branch/next] package/janus-gateway: add libcurl optional dependency Message-ID: <20230220205232.5BF22828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60cf07079b78d4c4bb495fd18cb2a145a4cb3635 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next libcurl is an optional dependency which is enabled by default since at least version 0.0.9 and https://github.com/meetecho/janus-gateway/commit/ca9c0a86f975f88fbdd791af3cb4f8986883c1c2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/janus-gateway/janus-gateway.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 0d906f1b62..dd898563e5 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -128,6 +128,13 @@ else JANUS_GATEWAY_CONF_OPTS += --disable-websockets endif +ifeq ($(BR2_PACKAGE_LIBCURL),y) +JANUS_GATEWAY_DEPENDENCIES += libcurl +JANUS_GATEWAY_CONF_OPTS += --enable-turn-rest-api +else +JANUS_GATEWAY_CONF_OPTS += --disable-turn-rest-api +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) JANUS_GATEWAY_DEPENDENCIES += systemd JANUS_GATEWAY_CONF_OPTS += --enable-systemd-sockets From thomas.petazzoni at bootlin.com Wed Feb 8 15:54:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:54:35 +0100 Subject: [Buildroot] [git commit branch/next] boot/afboot-stm32: disable stack-protector Message-ID: <20230220205256.7CFCA86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c33a133704166d602090b0b0d394aa9428e6acd4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Disable stack-protector to avoid the following build failure: /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0003-Makefile-disable-stack-protector.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch new file mode 100644 index 0000000000..27a81b45d5 --- /dev/null +++ b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch @@ -0,0 +1,36 @@ +From d65b07d6fe438e760fdbc33a8e42650a27d5b417 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 11:09:38 +0100 +Subject: [PATCH] Makefile: disable stack-protector + +Disable stack-protector to avoid the following build failure: + +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': +stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 8f42be1..8da7a25 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ CFLAGS := -mthumb -mcpu=cortex-m4 + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Os -std=gnu99 -Wall + CFLAGS += -fno-builtin ++CFLAGS += -fno-stack-protector + LINKERFLAGS := --gc-sections + + obj-y += gpio.o mpu.o qspi.o start_kernel.o +-- +2.35.1 + From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:34 -0000 Subject: [Buildroot] [git commit branch/next] package/janus-gateway: fix libcurl build Message-ID: <20230220205232.6C2258648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=664897295a3667db2ff95c5c1b458b16c1192a47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Fix the following libcurl build failure raised since bump to version 1.1.1 in commit 01518e5660366be41e6a8e0a0f2b487d7cdf48a2: In file included from /home/autobuild/autobuild/instance-11/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/curl/curl.h:3195, from turnrest.c:21: turnrest.c: In function 'janus_turnrest_request': turnrest.c:168:2: error: void value not ignored as it ought to be 168 | curl_easy_setopt(curl, api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST, 1); | ^ Fixes: - http://autobuild.buildroot.org/results/11bb0079f5a7d06d3494a61b411f0af2e8c4d342 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...003-Use-parentheses-to-ensure-compilation.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch b/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch new file mode 100644 index 0000000000..f91c13d1f6 --- /dev/null +++ b/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch @@ -0,0 +1,27 @@ +From 51431c36cd5f2997c0f7723909195b9883ae0486 Mon Sep 17 00:00:00 2001 +From: Benson Muite +Date: Wed, 4 Jan 2023 13:33:36 +0300 +Subject: [PATCH] Use parentheses to ensure compilation (#3138) + +Compiler fails with latest Curl release. Use parenthesis to ensure compiler evaluates expression correctly. + +[Retrieved from: +https://github.com/meetecho/janus-gateway/commit/51431c36cd5f2997c0f7723909195b9883ae0486] +Signed-off-by: Fabrice Fontaine +--- + src/turnrest.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/turnrest.c b/src/turnrest.c +index b8560d22f2..42e6114de8 100644 +--- a/src/turnrest.c ++++ b/src/turnrest.c +@@ -165,7 +165,7 @@ janus_turnrest_response *janus_turnrest_request(const char *user) { + JANUS_LOG(LOG_VERB, "Sending request: %s\n", request_uri); + janus_mutex_unlock(&api_mutex); + curl_easy_setopt(curl, CURLOPT_URL, request_uri); +- curl_easy_setopt(curl, api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST, 1); ++ curl_easy_setopt(curl, (api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST), 1); + if(!api_http_get) { + /* FIXME Some servers don't like a POST with no data */ + curl_easy_setopt(curl, CURLOPT_POSTFIELDS, query_string); From thomas.petazzoni at bootlin.com Wed Feb 8 15:34:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 16:34:15 +0100 Subject: [Buildroot] [git commit branch/next] package/open-iscsi: new package Message-ID: <20230220205256.6F9EE86495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a571acddd0badaf9636649d98fd095757878348 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: TIAN Yuanhao Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/open-iscsi/Config.in | 18 ++++++++++++++++++ package/open-iscsi/open-iscsi.hash | 3 +++ package/open-iscsi/open-iscsi.mk | 29 +++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0bb4db81bb..0e116e92a3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2791,6 +2791,7 @@ F: package/most/ N: TIAN Yuanhao F: package/cli11/ F: package/libsolv/ +F: package/open-iscsi/ F: package/open-isns/ F: package/reproc/ F: package/termcolor/ diff --git a/package/Config.in b/package/Config.in index 2adfcdbb1d..511e691ed3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2408,6 +2408,7 @@ endif source "package/odhcp6c/Config.in" source "package/odhcploc/Config.in" source "package/olsr/Config.in" + source "package/open-iscsi/Config.in" source "package/open-lldp/Config.in" source "package/open-plc-utils/Config.in" source "package/openntpd/Config.in" diff --git a/package/open-iscsi/Config.in b/package/open-iscsi/Config.in new file mode 100644 index 0000000000..e55bbfd867 --- /dev/null +++ b/package/open-iscsi/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_OPEN_ISCSI + bool "open-iscsi" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + depends on !BR2_STATIC_LIBS # kmod + select BR2_PACKAGE_KMOD + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPEN_ISNS + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + help + iSCSI tools for Linux. + + https://www.open-iscsi.com + +comment "open-iscsi needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/open-iscsi/open-iscsi.hash b/package/open-iscsi/open-iscsi.hash new file mode 100644 index 0000000000..9fd651cae8 --- /dev/null +++ b/package/open-iscsi/open-iscsi.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2 open-iscsi-2.1.8.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk new file mode 100644 index 0000000000..249253c64f --- /dev/null +++ b/package/open-iscsi/open-iscsi.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# open-iscsi +# +################################################################################ + +OPEN_ISCSI_VERSION = 2.1.8 +OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) +# The COPYING file says GPL-2.0, but there is some GPL-3.0+ code as +# well. See https://github.com/open-iscsi/open-iscsi/issues/379 +OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ +OPEN_ISCSI_LICENSE_FILES = COPYING +OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux + +OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +OPEN_ISCSI_DEPENDENCIES += systemd +OPEN_ISCSI_CONF_OPTS += -Dno_systemd=false +else +OPEN_ISCSI_CONF_OPTS += -Dno_systemd=true +endif + +define OPEN_ISCSI_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_SCSI_LOWLEVEL) + $(call KCONFIG_ENABLE_OPT,CONFIG_ISCSI_TCP) +endef + +$(eval $(meson-package)) From yann.morin.1998 at free.fr Mon Feb 20 21:00:35 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:35 -0000 Subject: [Buildroot] [git commit branch/next] package/pkg-generic.mk: no legal info WARNING if REDISTRIBUTE = NO Message-ID: <20230220205232.8C4F6828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c541df41806f0940128ab333d693fb7766e98da7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Packages making use of OVERRIDE_SRC_DIR or of the local SITE_METHOD, will trigger a warning when the legal-info target is built, for example: WARNING: foo: sources not saved (local packages not handled) But in the situation where the packages has explicitly defined FOO_REDISTRIBUTE = NO in its .mk file, it makes no sense since the sources wouldn't be saved anyway. This patch swap the conditions on the type of package and on the REDISTRIBUTE value, so that the warnings get issued only if REDISTRIBUTE equals YES. Signed-off-by: Nicolas Carrier Signed-off-by: Yann E. MORIN --- package/pkg-generic.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f2bea01d7d..2f8ba39edf 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1145,6 +1145,7 @@ else $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$($(2)_HASH_FILE),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) endif # license files +ifeq ($$($(2)_REDISTRIBUTE),YES) ifeq ($$($(2)_SITE_METHOD),local) # Packages without a tarball: don't save and warn @$$(call legal-warning-nosource,$$($(2)_RAWNAME),local) @@ -1155,7 +1156,6 @@ else ifneq ($$($(2)_OVERRIDE_SRCDIR),) else # Other packages -ifeq ($$($(2)_REDISTRIBUTE),YES) # Save the source tarball and any extra downloads, but not # patches, as they are handled specially afterwards. $$(foreach e,$$($(2)_ACTUAL_SOURCE_TARBALL) $$(notdir $$($(2)_EXTRA_DOWNLOADS)),\ @@ -1169,9 +1169,9 @@ ifeq ($$($(2)_REDISTRIBUTE),YES) $$($(2)_REDIST_SOURCES_DIR) || exit 1; \ printf "%s\n" "$$$${f##*/}" >>$$($(2)_REDIST_SOURCES_DIR)/series || exit 1; \ done <$$($(2)_DIR)/.applied_patches_list -endif # redistribute - endif # other packages + +endif # redistribute @$$(call legal-manifest,$$(call UPPERCASE,$(4)),$$($(2)_RAWNAME),$$($(2)_VERSION),$$(subst $$(space)$$(comma),$$(comma),$$($(2)_LICENSE)),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_ACTUAL_SOURCE_TARBALL),$$($(2)_ACTUAL_SOURCE_SITE),$$(call legal-deps,$(1))) endif # ifneq ($$(call qstrip,$$($(2)_SOURCE)),) $$(foreach hook,$$($(2)_POST_LEGAL_INFO_HOOKS),$$(call $$(hook))$$(sep)) From arnout at mind.be Thu Feb 9 20:51:47 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:51:47 +0100 Subject: [Buildroot] [git commit branch/next] package/ply: add dependency on Linux headers >= 5.5 Message-ID: <20230220205257.0F05286495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2fd606b91784ced64c7312e02fcbf95f3e736d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Version 2.3.0 of ply now requires Linux headers >= 5.5 This was missing in commit b9612601b037e6deb79af300e64e0557dda1be5c ("package/ply: bump to version 2.3.0") Fixes: http://autobuild.buildroot.net/results/ce37039991cb0fb02b97d341d78327e54d0e1d26 http://autobuild.buildroot.net/results/c00714847ae92dd609bc8990df318bee58be38b8 http://autobuild.buildroot.net/results/8210bd2b9c67d6d7616ada525019b2658195416a Signed-off-by: Andreas Klinger Signed-off-by: Arnout Vandecappelle --- package/ply/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ply/Config.in b/package/ply/Config.in index 0500e7883f..f7507095c1 100644 --- a/package/ply/Config.in +++ b/package/ply/Config.in @@ -5,16 +5,16 @@ config BR2_PACKAGE_PLY_ARCH_SUPPORTS default y if BR2_powerpc default y if BR2_x86_64 -comment "ply needs a toolchain w/ dynamic library, headers >= 4.14" +comment "ply needs a toolchain w/ dynamic library, headers >= 5.5" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 || BR2_STATIC_LIBS config BR2_PACKAGE_PLY bool "ply" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # BPF_JLT + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 # BPF_JLT depends on !BR2_STATIC_LIBS help ply is a light-weight dynamic tracer for Linux. By means of From thomas.petazzoni at bootlin.com Wed Feb 8 16:43:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 8 Feb 2023 17:43:26 +0100 Subject: [Buildroot] [git commit branch/next] package/nginx-modsecurity: bump to version 1.0.3 Message-ID: <20230220205256.A40638648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41671deec7b00de10dcc372cdeee4400df1d76ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni --- package/nginx-modsecurity/nginx-modsecurity.hash | 4 ++-- package/nginx-modsecurity/nginx-modsecurity.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nginx-modsecurity/nginx-modsecurity.hash b/package/nginx-modsecurity/nginx-modsecurity.hash index fbaf1ca239..0cd2ee07cd 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.hash +++ b/package/nginx-modsecurity/nginx-modsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.2/modsecurity-nginx-v1.0.2.tar.gz.sha256 -sha256 41a6660c50508c60df59f8f09c444d18ef8112a4c118cdc791a3992390b78c32 modsecurity-nginx-v1.0.2.tar.gz +# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.3/modsecurity-nginx-v1.0.3.tar.gz.sha256 +sha256 ae811c7208ac029cb7a99d6f63e03d3971797607517187f47620df39c1f78add modsecurity-nginx-v1.0.3.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/nginx-modsecurity/nginx-modsecurity.mk b/package/nginx-modsecurity/nginx-modsecurity.mk index 90ef8ecd51..a00c200469 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.mk +++ b/package/nginx-modsecurity/nginx-modsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_MODSECURITY_VERSION = 1.0.2 +NGINX_MODSECURITY_VERSION = 1.0.3 NGINX_MODSECURITY_SOURCE = modsecurity-nginx-v$(NGINX_MODSECURITY_VERSION).tar.gz NGINX_MODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v$(NGINX_MODSECURITY_VERSION) NGINX_MODSECURITY_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:37 -0000 Subject: [Buildroot] [git commit branch/next] package/libbpf: bump to version 1.1.0 Message-ID: <20230220205232.B96E9828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c9d6f0e1c8a99eec548b1690e1bb58d90189a44d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...-Fix-cross-compilation-for-32-bit-targets.patch | 38 ---------------------- package/libbpf/libbpf.hash | 2 +- package/libbpf/libbpf.mk | 2 +- 3 files changed, 2 insertions(+), 40 deletions(-) diff --git a/package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch b/package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch deleted file mode 100644 index 12c22f3147..0000000000 --- a/package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 68e6f83f223ebf3fbf0d94c0f4592e5e6773f0c1 Mon Sep 17 00:00:00 2001 -From: Tobias Waldekranz -Date: Fri, 14 Oct 2022 21:14:14 +0200 -Subject: [PATCH] Makefile: Fix cross-compilation for 32-bit targets - -Determining the correct library installation path (lib vs. lib64) -using uname(1) breaks in cross compilation scenarios where word widths -differ between the host and target system. - -Instead, source the information from the compilers '-dumpmachine' -option (supported by both GCC and Clang). - -We call this the "host" architecture, using the same nomenclature as -Autotools (--host configure option). - -Upstream: https://github.com/libbpf/libbpf/commit/68e6f83f223ebf3fbf0d94c0f4592e5e6773f0c1 -Signed-off-by: Tobias Waldekranz ---- - src/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 3cd0854..d535f81 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -77,7 +77,8 @@ INSTALL = install - - DESTDIR ?= - --ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(shell uname -m)),) -+HOSTARCH = $(firstword $(subst -, ,$(shell $(CC) -dumpmachine))) -+ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(HOSTARCH)),) - LIBSUBDIR := lib64 - else - LIBSUBDIR := lib --- -2.34.1 - diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index 4305872d9f..75f2b1695c 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 3d6afde67682c909e341bf194678a8969f17628705af25f900d5f68bd299cb03 libbpf-1.0.1.tar.gz +sha256 5da826c968fdb8a2f714701cfef7a4b7078be030cf58b56143b245816301cbb8 libbpf-1.1.0.tar.gz sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE sha256 e1638b9a0c68ca90fad3df1d6b4e430804d2fbdc15e58d02cffddfae38953bbf LICENSE.BSD-2-Clause sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 820f1dc4bf..b498136ace 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBPF_VERSION = 1.0.1 +LIBBPF_VERSION = 1.1.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 peter at korsgaard.com Fri Feb 10 14:08:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 10 Feb 2023 15:08:54 +0100 Subject: [Buildroot] [git commit branch/next] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used Message-ID: <20230220205257.1C1FE86496@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b4d7f6e13212b4c65ec2832681719fd960e75e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Waf requires that the version of the waf script matches the version of waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as otherwise waf errors out with errors like: Waf script '2.0.24' and library '1.9.3' do not match Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour [Peter: Run as a post-patch hook as suggested by Yann] Signed-off-by: Peter Korsgaard --- package/pkg-waf.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index e090afa9e6..0e752072c8 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) define inner-waf-package +# The version of waflib has to match with the version of waf, +# otherwise waf errors out with: +# Waf script 'X' and library 'Y' do not match +define WAF_PACKAGE_REMOVE_WAF_LIB + $(RM) -fr $(@D)/waf $(@D)/waflib +endef + # We need host-python3 to run waf $(2)_DEPENDENCIES += host-python3 @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) $(2)_DEPENDENCIES += host-waf $(2)_WAF = $$(HOST_DIR)/bin/waf +$(2)_POST_PATCH_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB else $(2)_WAF ?= ./waf endif From thomas.petazzoni at bootlin.com Mon Feb 20 21:00:38 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 21:00:38 -0000 Subject: [Buildroot] [git commit branch/next] package/bpftool: bump to version 7.1.0 Message-ID: <20230220205232.CEBBF8648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4db36b268d8978b65bb5ed46e8f7e57412f3097f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Use install-bin for installation instead of install as we don't want bash-completion files to be installed. Set empty host installation prefix so that we install to: $(HOST_DIR)/sbin/bpftool Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/bpftool/bpftool.hash | 2 +- package/bpftool/bpftool.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash index 92b9359fe3..cfd3c54515 100644 --- a/package/bpftool/bpftool.hash +++ b/package/bpftool/bpftool.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 465a50fea4afbacd326f2209d81ae0dcff637fbb2c9d1a315e94f79a788ce960 bpftool-v7.0.0-br1.tar.gz +sha256 35ff149cab4a3ab209b0c04cab2707243ab7ee753de5f4b5678296c975cf7fe0 bpftool-v7.1.0-br1.tar.gz sha256 7c588754d5e81e92e2a12e47cf78949d485c9c22b4850f12d21b3835c85947d1 LICENSE sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0 diff --git a/package/bpftool/bpftool.mk b/package/bpftool/bpftool.mk index 3b27698130..cd68d89799 100644 --- a/package/bpftool/bpftool.mk +++ b/package/bpftool/bpftool.mk @@ -4,7 +4,7 @@ # ################################################################################ -BPFTOOL_VERSION = v7.0.0 +BPFTOOL_VERSION = v7.1.0 BPFTOOL_SITE = https://github.com/libbpf/bpftool BPFTOOL_SITE_METHOD = git BPFTOOL_GIT_SUBMODULES = YES @@ -33,12 +33,12 @@ endef define BPFTOOL_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ - -C $(@D)/src install DESTDIR="$(TARGET_DIR)" prefix=/usr + -C $(@D)/src install-bin DESTDIR="$(TARGET_DIR)" prefix=/usr endef define HOST_BPFTOOL_INSTALL_CMDS $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - -C $(@D)/src install DESTDIR="$(HOST_DIR)" prefix=/usr + -C $(@D)/src install-bin DESTDIR="$(HOST_DIR)" prefix= endef $(eval $(generic-package)) From arnout at mind.be Thu Feb 9 20:32:43 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 9 Feb 2023 21:32:43 +0100 Subject: [Buildroot] [git commit branch/next] package/pipewire-media-session: bump to version 0.4.2 Message-ID: <20230220205256.DC16581979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1bceb4b51581e0c7b3953181ee3a2c31f0094f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Explicitly set installed_tests to disabled. Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- ...eson-remove-session-managers-option-check.patch | 36 ---------------------- .../pipewire-media-session.hash | 2 +- .../pipewire-media-session.mk | 7 +++-- 3 files changed, 6 insertions(+), 39 deletions(-) diff --git a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch b/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch deleted file mode 100644 index fc1d25edb3..0000000000 --- a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1923c97fbd0b3d8cacdb72386886f860c818bccf Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Wed, 10 Nov 2021 08:54:06 -0700 -Subject: [PATCH] meson: remove session-managers option check. - -This option no longer exists and causes a build failure if building -with the systemd system service enabled. - -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/pipewire/media-session/-/merge_requests/24] ---- - systemd/system/meson.build | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/systemd/system/meson.build b/systemd/system/meson.build -index ab0d49064..0e9885b0f 100644 ---- a/systemd/system/meson.build -+++ b/systemd/system/meson.build -@@ -4,9 +4,7 @@ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunit - systemd_config = configuration_data() - systemd_config.set('PW_MEDIA_SESSION_BINARY', media_session_bindir / 'pipewire-media-session') - --if get_option('session-managers').contains('media-session') -- configure_file(input : 'pipewire-media-session.service.in', -- output : 'pipewire-media-session.service', -- configuration : systemd_config, -- install_dir : systemd_system_services_dir) --endif -+configure_file(input : 'pipewire-media-session.service.in', -+ output : 'pipewire-media-session.service', -+ configuration : systemd_config, -+ install_dir : systemd_system_services_dir) --- -2.25.1 - diff --git a/package/pipewire-media-session/pipewire-media-session.hash b/package/pipewire-media-session/pipewire-media-session.hash index e335fd8913..e6b176eea2 100644 --- a/package/pipewire-media-session/pipewire-media-session.hash +++ b/package/pipewire-media-session/pipewire-media-session.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ebdf9f8e389896fdc4b58da5f909afce18441b4b53d5b4f2104dd53586ea8681 media-session-0.4.1.tar.bz2 +sha256 26e21852e0834a4418b40eae342ac5178dfe40342b9c5afe204d43ef8aafa14e media-session-0.4.2.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 77b9c867237ef919e33c0fdbcf22ab84b1cf24a63f9431ec68759026b658c994 LICENSE diff --git a/package/pipewire-media-session/pipewire-media-session.mk b/package/pipewire-media-session/pipewire-media-session.mk index d349fd7454..cc7317f925 100644 --- a/package/pipewire-media-session/pipewire-media-session.mk +++ b/package/pipewire-media-session/pipewire-media-session.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.1 +PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.2 PIPEWIRE_MEDIA_SESSION_SOURCE = media-session-$(PIPEWIRE_MEDIA_SESSION_VERSION).tar.bz2 PIPEWIRE_MEDIA_SESSION_SITE = https://gitlab.freedesktop.org/pipewire/media-session/-/archive/$(PIPEWIRE_MEDIA_SESSION_VERSION) PIPEWIRE_MEDIA_SESSION_LICENSE = MIT @@ -17,7 +17,10 @@ PIPEWIRE_MEDIA_SESSION_DEPENDENCIES = \ pipewire \ $(TARGET_NLS_DEPENDENCIES) -PIPEWIRE_MEDIA_SESSION_CONF_OPTS = -Ddocs=disabled -Dtests=disabled +PIPEWIRE_MEDIA_SESSION_CONF_OPTS = \ + -Ddocs=disabled \ + -Dtests=disabled \ + -Dinstalled_tests=disabled PIPEWIRE_MEDIA_SESSION_MODULE_SETS_LIST = alsa From yann.morin.1998 at free.fr Mon Feb 20 21:00:45 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:45 -0000 Subject: [Buildroot] [git commit branch/next] package/python-autobahn: bump to version 22.12.1 Message-ID: <20230220205233.B29278648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0cd7fadb263decfa5b4566f6ad71c02914726146 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-autobahn/python-autobahn.hash | 4 ++-- package/python-autobahn/python-autobahn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 4ae158be03..f9b68dcb22 100644 --- a/package/python-autobahn/python-autobahn.hash +++ b/package/python-autobahn/python-autobahn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/autobahn/json -md5 2921fb2bdea60b4cb36ccec367625995 autobahn-22.7.1.tar.gz -sha256 8b462ea2e6aad6b4dc0ed45fb800b6cbfeb0325e7fe6983907f122f2be4a1fe9 autobahn-22.7.1.tar.gz +md5 98d8451385ccd8ece2d2fac023c61a19 autobahn-22.12.1.tar.gz +sha256 43b4e8b1aeaeb20a0cc0a81572e613dc958057c0ab248a7d6b41b2763270f925 autobahn-22.12.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk index fb3a7b84de..4c14151960 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 22.7.1 +PYTHON_AUTOBAHN_VERSION = 22.12.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/c5/b5/c92d6640fd55cbbdd97c05800ab534d84197f7b485d89a9df981ab67cce3 +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/a8/6f/78b90951f263232e468439627f31a2c0846e36043c95af96dc527a4aeee6 PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar From yann.morin.1998 at free.fr Fri Feb 10 23:11:29 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 00:11:29 +0100 Subject: [Buildroot] [git commit branch/next] package/nodejs: add patch to adjust default NodeJS search path Message-ID: <20230220205258.1535E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0de216f95fc28c57cc430f39f011d5f88ead083b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next By default, NodeJS searches global modules in /usr/lib/node, but NPM installs them in /usr/lib/node_modules/. Therefore by default, if one installs modules with BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL, they are not accessible by NodeJS, unless by passing a NODE_PATH=/usr/lib/node_modules/ variable. Since this is not obvious, and it's nicer when things work out of the box, we simply patch NodeJS to look for modules at the right place. See https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package for some discussions on this topic. Signed-off-by: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN --- ...l-modules-cjs-loader.js-adjust-default-pa.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch new file mode 100644 index 0000000000..5b93998e5e --- /dev/null +++ b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch @@ -0,0 +1,36 @@ +From a31425bdfcb5d695ab25c3d295898326784cffec Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 25 Sep 2022 11:10:06 +0200 +Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to + search modules + +NPM installs modules in /usr/lib/node_modules/, but by default NodeJS +searches for them only in /usr/lib/node/. We could also set the +NODE_PATH environment variable, but it is more convienient to have +NodeJS configured by default to find modules where they are installed. + +This issue is discussed at +https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package. + +Signed-off-by: Thomas Petazzoni +--- + lib/internal/modules/cjs/loader.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js +index f1971c40a4..5fe3884156 100644 +--- a/lib/internal/modules/cjs/loader.js ++++ b/lib/internal/modules/cjs/loader.js +@@ -1261,7 +1261,8 @@ Module._initPaths = function() { + path.resolve(process.execPath, '..') : + path.resolve(process.execPath, '..', '..'); + +- const paths = [path.resolve(prefixDir, 'lib', 'node')]; ++ const paths = [path.resolve(prefixDir, 'lib', 'node'), ++ path.resolve(prefixDir, 'lib', 'node_modules')]; + + if (homeDir) { + ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); +-- +2.37.3 + From yann.morin.1998 at free.fr Mon Feb 20 21:00:46 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:46 -0000 Subject: [Buildroot] [git commit branch/next] package/python-bidict: bump to version 0.22.1 Message-ID: <20230220205233.C5F0586495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1db8f1edf859a501fb8444e90a2af7916f48de42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-bidict/python-bidict.hash | 4 ++-- package/python-bidict/python-bidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-bidict/python-bidict.hash b/package/python-bidict/python-bidict.hash index fe9a94af53..bcb9ea3f34 100644 --- a/package/python-bidict/python-bidict.hash +++ b/package/python-bidict/python-bidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bidict/json -md5 da3d37ae93c740c191b5666918c3164f bidict-0.22.0.tar.gz -sha256 5c826b3e15e97cc6e615de295756847c282a79b79c5430d3bfc909b1ac9f5bd8 bidict-0.22.0.tar.gz +md5 67dd74f41341e7ff437d69e00a6fd514 bidict-0.22.1.tar.gz +sha256 1e0f7f74e4860e6d0943a05d4134c63a2fad86f3d4732fb265bd79e4e856d81d bidict-0.22.1.tar.gz # Locally computed sha256 checksums sha256 be0487398bba08e7772b4077b637787b94973b53c44b3cbdd6c7dab10ed15035 LICENSE diff --git a/package/python-bidict/python-bidict.mk b/package/python-bidict/python-bidict.mk index 7ba15db605..ae3a1ee024 100644 --- a/package/python-bidict/python-bidict.mk +++ b/package/python-bidict/python-bidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BIDICT_VERSION = 0.22.0 +PYTHON_BIDICT_VERSION = 0.22.1 PYTHON_BIDICT_SOURCE = bidict-$(PYTHON_BIDICT_VERSION).tar.gz -PYTHON_BIDICT_SITE = https://files.pythonhosted.org/packages/2b/84/159749556b9c49ea4489dadeb94d44f05d6033d1db3af4c83120ecac5b15 +PYTHON_BIDICT_SITE = https://files.pythonhosted.org/packages/f2/be/b31e6ea9c94096a323e7a0e2c61480db01f07610bb7e7ea72a06fd1a23a8 PYTHON_BIDICT_SETUP_TYPE = setuptools PYTHON_BIDICT_LICENSE = MPL-2.0 PYTHON_BIDICT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Fri Feb 10 23:13:08 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 11 Feb 2023 00:13:08 +0100 Subject: [Buildroot] [git commit branch/next] support/testing/tests: add NodeJS tests Message-ID: <20230220205258.2136486495@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f25b0b6d1dcc8580f6b880eb57872b5c4064b89f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This commit adds two new test cases: - TestNodeJSBasic which builds a target configuration with just NodeJS enabled, and which runs a very simple NodeJS script on the target. - TestNodeJSModule, which builds a target configuration with NodeJS enabled + the installation of one extra module, which means npm on the host (from host-nodejs) is used, and which runs a very simple NodeJS script on the target that uses this extra module. Having both tests separately allows to validate that both nodejs-only and nodejs+host-nodejs configurations behave correctly, at least in minimal scenarios. Signed-off-by: Thomas Petazzoni Tested-by: Romain Naour Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 ++ .../testing/tests/package/sample_nodejs_basic.js | 3 ++ .../testing/tests/package/sample_nodejs_module.js | 7 +++ support/testing/tests/package/test_nodejs.py | 52 ++++++++++++++++++++++ 4 files changed, 65 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0af1323340..ae698f87c5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2944,11 +2944,14 @@ F: package/weston/ F: support/testing/tests/boot/test_grub.py F: support/testing/tests/boot/test_grub/ F: support/testing/tests/boot/test_syslinux.py +F: support/testing/tests/package/sample_nodejs_basic.js +F: support/testing/tests/package/sample_nodejs_module.js F: support/testing/tests/package/sample_python_augeas.py F: support/testing/tests/package/sample_python_flask.py F: support/testing/tests/package/sample_python_flask_expects_json.py F: support/testing/tests/package/sample_python_git.py F: support/testing/tests/package/sample_python_unittest_xml_reporting.py +F: support/testing/tests/package/test_nodejs.py F: support/testing/tests/package/test_python_augeas.py F: support/testing/tests/package/test_python_flask.py F: support/testing/tests/package/test_python_flask_expects_json.py diff --git a/support/testing/tests/package/sample_nodejs_basic.js b/support/testing/tests/package/sample_nodejs_basic.js new file mode 100644 index 0000000000..7633173c64 --- /dev/null +++ b/support/testing/tests/package/sample_nodejs_basic.js @@ -0,0 +1,3 @@ +var assert = require('assert'); +assert.strictEqual(1, 1); +console.log("Hello World"); diff --git a/support/testing/tests/package/sample_nodejs_module.js b/support/testing/tests/package/sample_nodejs_module.js new file mode 100644 index 0000000000..57aee73408 --- /dev/null +++ b/support/testing/tests/package/sample_nodejs_module.js @@ -0,0 +1,7 @@ +var assert = require('assert'); +var lodash = require('lodash'); +result = lodash.chunk(['a', 'b', 'c', 'd'], 2); +expected = [ [ 'a', 'b' ], [ 'c', 'd' ] ]; +assert.deepStrictEqual(result, expected) + + diff --git a/support/testing/tests/package/test_nodejs.py b/support/testing/tests/package/test_nodejs.py new file mode 100644 index 0000000000..9463c76b72 --- /dev/null +++ b/support/testing/tests/package/test_nodejs.py @@ -0,0 +1,52 @@ +import os + +import infra.basetest + + +class TestNodeJSBasic(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_NODEJS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), + infra.filepath("tests/package/sample_nodejs_basic.js")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + self.assertRunOk("node sample_nodejs_basic.js") + + +class TestNodeJSModule(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_NODEJS=y + BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="lodash" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), + infra.filepath("tests/package/sample_nodejs_module.js")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + self.assertRunOk("node sample_nodejs_module.js") From yann.morin.1998 at free.fr Mon Feb 20 21:00:47 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:47 -0000 Subject: [Buildroot] [git commit branch/next] package/python-boto3: bump to version 1.26.45 Message-ID: <20230220205233.D6EF7828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63f59977dd884c36fe9a4fe4a51e3bd5d183705a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-boto3/python-boto3.hash | 4 ++-- package/python-boto3/python-boto3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-boto3/python-boto3.hash b/package/python-boto3/python-boto3.hash index 60fd07681c..eecc87ab2d 100644 --- a/package/python-boto3/python-boto3.hash +++ b/package/python-boto3/python-boto3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/boto3/json -md5 9d5447419233a259b3ade6fb86d86cb6 boto3-1.26.27.tar.gz -sha256 255a7565226c21c5d500f69aabb977e1ac07dbaf576f4428d00558e8e508a23b boto3-1.26.27.tar.gz +md5 e3777333a201a2511dd7c814782fe9f0 boto3-1.26.45.tar.gz +sha256 cc7f652df93e1ce818413fd82ffd645d4f92a64fec67c72946212d3750eaa80f boto3-1.26.45.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/python-boto3/python-boto3.mk b/package/python-boto3/python-boto3.mk index e40ac92f09..4d8fe58701 100644 --- a/package/python-boto3/python-boto3.mk +++ b/package/python-boto3/python-boto3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTO3_VERSION = 1.26.27 +PYTHON_BOTO3_VERSION = 1.26.45 PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz -PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/62/7b/7cdcb980d9d90c910a6abec2cdee0ff6aa7a3d8afea4044ffd968d5c107c +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/f5/5d/62bfcda02d90699d41d5ff2573f88b5555354fb87308e8a3427fef3956c5 PYTHON_BOTO3_SETUP_TYPE = setuptools PYTHON_BOTO3_LICENSE = Apache-2.0 PYTHON_BOTO3_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Feb 11 22:18:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 11 Feb 2023 23:18:12 +0100 Subject: [Buildroot] [git commit branch/next] package/php: bump version to 8.2.2 Message-ID: <20230220205258.55C7E828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a54bb2a2d99b835f672ae194dc4934757881e08b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://news-web.php.net/php.announce/345 Changelog: https://www.php.net/ChangeLog-8.php#8.2.2 Signed-off-by: Bernd Kuhls 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 a9c3b7640b..869cb9b94f 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af php-8.2.1.tar.xz +sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 372d55f68a..9ce153f4fa 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.1 +PHP_VERSION = 8.2.2 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Mon Feb 20 21:00:48 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 20 Feb 2023 21:00:48 -0000 Subject: [Buildroot] [git commit branch/next] package/python-botocore: bump to version 1.29.45 Message-ID: <20230220205233.EA8878648F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2abc0d6a3809eaa9c71043368b3915572f5d0735 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-botocore/python-botocore.hash | 4 ++-- package/python-botocore/python-botocore.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-botocore/python-botocore.hash b/package/python-botocore/python-botocore.hash index 8314c534e9..0e9d0572d7 100644 --- a/package/python-botocore/python-botocore.hash +++ b/package/python-botocore/python-botocore.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/botocore/json -md5 488df64a4fcd884f9fbcf990bdc8b34c botocore-1.29.27.tar.gz -sha256 0932b22d8737b11037adf7e734f9b90425b575d0757e4c1a035e99f382955221 botocore-1.29.27.tar.gz +md5 3946a693e09b65a0f6615a1a30f606d7 botocore-1.29.45.tar.gz +sha256 62ae03e591ff25555854aa338da35190ffe18c0b1be2ebf5cfb277164233691f botocore-1.29.45.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt diff --git a/package/python-botocore/python-botocore.mk b/package/python-botocore/python-botocore.mk index 4b14af4368..ceb3fbe6ea 100644 --- a/package/python-botocore/python-botocore.mk +++ b/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.29.27 +PYTHON_BOTOCORE_VERSION = 1.29.45 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/08/3f/e9f97b0700e0be670404a7d4a9ac62fd59495897f15c928dd38874e98ef7 +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/9d/4f/1c24126941d1f8c1f2ecf459f88959d59566af34a55a81d926368fd2e6e5 PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt From fontaine.fabrice at gmail.com Mon Feb 20 23:19:02 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 00:19:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build without C++ Message-ID: <20230220231902.340496-1-fontaine.fabrice@gmail.com> Commit dedbc69022ba0beaf259463ac8082c86776f7e88 was incomplete resuling in the following build failure since the addition of the package in commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: -- Check for working CXX compiler: /usr/bin/c++ - broken CMake Error at /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message): The C++ compiler "/usr/bin/c++" is not able to compile a simple test program. It fails with the following output: Change Dir: /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp Run Build Command(s):/home/autobuild/make/make -f Makefile cmTC_bfb29/fast && make[1]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make CMakeFiles/cmTC_bfb29.dir/build make[2]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o /usr/bin/c++ --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx c++: error: unrecognized command-line option '-mlongcalls' c++: error: unrecognized command-line option '-mauto-litpools' make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 make[2]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 make[1]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' CMake will not be able to correctly generate this project. Call Stack (most recent call first): lib/msgpack-c/CMakeLists.txt:2 (project) While at it, add missing comment about C++ dependency for wasm Fixes: - http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda Signed-off-by: Fabrice Fontaine --- .../fluent-bit/0003-fix-build-without-C.patch | 131 ++++++++++++++++++ package/fluent-bit/Config.in | 4 + 2 files changed, 135 insertions(+) create mode 100644 package/fluent-bit/0003-fix-build-without-C.patch diff --git a/package/fluent-bit/0003-fix-build-without-C.patch b/package/fluent-bit/0003-fix-build-without-C.patch new file mode 100644 index 0000000000..16afec3fe5 --- /dev/null +++ b/package/fluent-bit/0003-fix-build-without-C.patch @@ -0,0 +1,131 @@ +From 014e44808ebaf29b0c25b5a3fa2e35a99a30f628 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 00:09:57 +0100 +Subject: [PATCH] fix build without C++ + +Fix the following build failure without C++: + +-- Check for working CXX compiler: /usr/bin/c++ - broken +CMake Error at /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message): + The C++ compiler + + "/usr/bin/c++" + + is not able to compile a simple test program. + + It fails with the following output: + + Change Dir: /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp + + Run Build Command(s):/home/autobuild/make/make -f Makefile cmTC_bfb29/fast && make[1]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make CMakeFiles/cmTC_bfb29.dir/build + make[2]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o + /usr/bin/c++ --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx + c++: error: unrecognized command-line option '-mlongcalls' + c++: error: unrecognized command-line option '-mauto-litpools' + make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 + make[2]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 + make[1]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + + CMake will not be able to correctly generate this project. +Call Stack (most recent call first): + lib/msgpack-c/CMakeLists.txt:2 (project) + +Fixes: + - http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/fluent/fluent-bit/pull/6893] +--- + lib/chunkio/CMakeLists.txt | 2 +- + lib/lwrb/CMakeLists.txt | 2 +- + lib/msgpack-c/CMakeLists.txt | 2 +- + lib/onigmo/CMakeLists.txt | 2 +- + lib/snappy-fef67ac/CMakeLists.txt | 2 +- + lib/tutf8e/CMakeLists.txt | 2 +- + src/stream_processor/CMakeLists.txt | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt +index 233bce35c..8bfe5199d 100644 +--- a/lib/chunkio/CMakeLists.txt ++++ b/lib/chunkio/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.0) +-project(chunk-io) ++project(chunk-io C) + + set(CIO_VERSION_MAJOR 1) + set(CIO_VERSION_MINOR 4) +diff --git a/lib/lwrb/CMakeLists.txt b/lib/lwrb/CMakeLists.txt +index 2fabd6319..031cbc1dd 100644 +--- a/lib/lwrb/CMakeLists.txt ++++ b/lib/lwrb/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.0) + + # Setup project +-project(LwLibPROJECT) ++project(LwLibPROJECT C) + + # ------------------------------------------------- + # This CMakeLists.txt is used only if it is a top-level file. +diff --git a/lib/msgpack-c/CMakeLists.txt b/lib/msgpack-c/CMakeLists.txt +index 810ad609a..ffbbc5ddb 100644 +--- a/lib/msgpack-c/CMakeLists.txt ++++ b/lib/msgpack-c/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(msgpack-c) ++project(msgpack-c C) + + set(src + src/objectc.c +diff --git a/lib/onigmo/CMakeLists.txt b/lib/onigmo/CMakeLists.txt +index 4a3b30d7d..66865130a 100644 +--- a/lib/onigmo/CMakeLists.txt ++++ b/lib/onigmo/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.4) +-project(onigmo) ++project(onigmo C) + + # Onigmo Version + set(ONIGMO_VERSION_MAJOR 6) +diff --git a/lib/snappy-fef67ac/CMakeLists.txt b/lib/snappy-fef67ac/CMakeLists.txt +index 8bb1e9598..ae9225c49 100644 +--- a/lib/snappy-fef67ac/CMakeLists.txt ++++ b/lib/snappy-fef67ac/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(snappy-c) ++project(snappy-c C) + + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +diff --git a/lib/tutf8e/CMakeLists.txt b/lib/tutf8e/CMakeLists.txt +index 35cbe01ad..a056ef83c 100644 +--- a/lib/tutf8e/CMakeLists.txt ++++ b/lib/tutf8e/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(tutf8e) ++project(tutf8e C) + + # Not supported: -std=c90 (lacks support for inline) + # Supported: -std=gnu90, -std=c99 or -std=gnu99 +diff --git a/src/stream_processor/CMakeLists.txt b/src/stream_processor/CMakeLists.txt +index 8c5d70d13..de2c2fe38 100644 +--- a/src/stream_processor/CMakeLists.txt ++++ b/src/stream_processor/CMakeLists.txt +@@ -1,4 +1,4 @@ +-project(stream-processor) ++project(stream-processor C) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +-- +2.39.0 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index f53eacb447..bfdea895b0 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -30,6 +30,10 @@ config BR2_PACKAGE_FLUENT_BIT_WASM help Support for WASM-based plugins. +comment "wasm runtime support needs a toolchain w/ C++" + depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP + endif comment "fluent-bit needs a toolchain w/ threads, dynamic library" -- 2.39.0 From ju.o at free.fr Mon Feb 20 23:42:00 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 21 Feb 2023 00:42:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/highway: bump to version 1.0.3 Message-ID: <20230220234200.464390-1-ju.o@free.fr> - Dropped patch upstreamed in: https://github.com/google/highway/commit/1cab22047a6ef750ef2bc38ad47d6e765d6d376a - Add an upstream patch, not in 1.0.3 release: https://github.com/google/highway/commit/411300d0eec10d5635cbdd064299630c507348e1 - Add a new patch, to fix armv7 builds with vfp < v4. Proposed upstream in: https://github.com/google/highway/pull/1143 - Add a comment about -DHWY_CMAKE_ARM7=OFF since the name is a bit misleading. It should better be ARMV7 or ARMV7_VFPV4. For change log since 1.0.2, see: - https://github.com/google/highway/releases/tag/1.0.3 Signed-off-by: Julien Olivain --- Tested on top of branch master at commit 9cd2e6e with commands: make check-package ... 0 warnings generated support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_highway ... OK utils/test-pkg -a -p highway ... 45 builds, 7 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- ...Check-for-the-presence-of-sys-auxv.h.patch | 62 --------- ...Fix-compilation-for-armv7-with-gcc-8.patch | 46 +++++++ ...for-armv7-targets-with-vfp-v4-and-gc.patch | 118 ++++++++++++++++++ package/highway/highway.hash | 2 +- package/highway/highway.mk | 5 +- 5 files changed, 169 insertions(+), 64 deletions(-) delete mode 100644 package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch create mode 100644 package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch create mode 100644 package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch deleted file mode 100644 index df86798613..0000000000 --- a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Wed, 23 Nov 2022 23:27:11 +0100 -Subject: [PATCH] Check for the presence of - -Not all gcc versions are providing . Checking for -HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not -sufficient and fail to build in some situations (it was observed for -some gcc armv7m toolchains). - -This patch adds a check for and include it only if present. - -Signed-off-by: Julien Olivain ---- - CMakeLists.txt | 3 +++ - hwy/detect_targets.h | 2 +- - hwy/targets.cc | 2 +- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b6b14ab..df6b5ab 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -84,6 +84,9 @@ check_cxx_source_compiles( - HWY_RISCV - ) - -+include(CheckIncludeFile) -+check_include_file(sys/auxv.h HAVE_SYS_AUXV_H) -+ - if (HWY_ENABLE_CONTRIB) - # Glob all the traits so we don't need to modify this file when adding - # additional special cases. -diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h -index 7f7e179..f0c6f94 100644 ---- a/hwy/detect_targets.h -+++ b/hwy/detect_targets.h -@@ -392,7 +392,7 @@ - #define HWY_HAVE_RUNTIME_DISPATCH 1 - // On Arm, currently only GCC does, and we require Linux to detect CPU - // capabilities. --#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX -+#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX && HAVE_SYS_AUXV_H - #define HWY_HAVE_RUNTIME_DISPATCH 1 - #else - #define HWY_HAVE_RUNTIME_DISPATCH 0 -diff --git a/hwy/targets.cc b/hwy/targets.cc -index 2fde4db..abd6a94 100644 ---- a/hwy/targets.cc -+++ b/hwy/targets.cc -@@ -42,7 +42,7 @@ - #include - #endif // HWY_COMPILER_MSVC - --#elif HWY_ARCH_ARM && HWY_OS_LINUX -+#elif HWY_ARCH_ARM && HWY_OS_LINUX && HAVE_SYS_AUXV_H - #include - #include - #endif // HWY_ARCH_* --- -2.38.1 - diff --git a/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch b/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch new file mode 100644 index 0000000000..0634460453 --- /dev/null +++ b/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch @@ -0,0 +1,46 @@ +From 94cda9cc8cd12345a6dbe70e40f3119d5bf7ee78 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 10 Feb 2023 21:25:36 +0100 +Subject: [PATCH] Fix compilation for armv7 with gcc < 8 + +Highway uses the construct __attribute__((target(+neon-vfpv4)) for +Armv7. The target "+neon-vfpv4" was introduced in gcc 8, in commit [1]. +When using a gcc < 8 (for example, like [2]), compilation fails with +message: + + In file included from /build/highway-1.0.3/hwy/foreach_target.h:81:0, + from /build/highway-1.0.3/hwy/per_target.cc:20: + /build/highway-1.0.3/hwy/per_target.cc: At global scope: + /build/highway-1.0.3/hwy/per_target.cc:23:22: error: attribute(target("+neon-vfpv4")) is unknown + +This commit protects the definition of HWY_TARGET_STR only when gcc +version 8 or greater is used for armv7. + +[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e87afe54b86c478ae63569e51e7abb67d3fe3fce +[2] https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/arm-linux-gnueabihf/gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz + +Signed-off-by: Julien Olivain +--- + hwy/ops/set_macros-inl.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/hwy/ops/set_macros-inl.h b/hwy/ops/set_macros-inl.h +index 051dbb3..00b4b1b 100644 +--- a/hwy/ops/set_macros-inl.h ++++ b/hwy/ops/set_macros-inl.h +@@ -230,7 +230,12 @@ + // Can use pragmas instead of -march compiler flag + #if HWY_HAVE_RUNTIME_DISPATCH + #if HWY_ARCH_ARM_V7 ++#if HWY_COMPILER_GCC_ACTUAL >= 800 ++// The __attribute__((target(+neon-vfpv4)) was introduced in gcc >= 8. ++// In case we have a gcc < 8, we can still compile by keeping ++// HWY_TARGET_STR undefined. + #define HWY_TARGET_STR "+neon-vfpv4" ++#endif + #else + #define HWY_TARGET_STR "+crypto" + #endif // HWY_ARCH_ARM_V7 +-- +2.39.2 + diff --git a/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch b/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch new file mode 100644 index 0000000000..f9b1a1aa91 --- /dev/null +++ b/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch @@ -0,0 +1,118 @@ +From 93d4579f90dd6ad26fd0dcda6420b3bb2fdcbc02 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Mon, 20 Feb 2023 23:22:28 +0100 +Subject: [PATCH] Fix compilation for armv7 targets with vfp < v4 and gcc >= 8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When using a armv7 gcc >= 8 toolchain (like [1]) with Highway +configured with -DHWY_CMAKE_ARM7=OFF and HWY_ENABLE_CONTRIB=ON, +compilation fails with error: + + In file included from /build/highway-1.0.3/hwy/ops/arm_neon-inl.h:33, + from /build/highway-1.0.3/hwy/highway.h:358, + from /build/highway-1.0.3/hwy/contrib/sort/shared-inl.h:104, + from /build/highway-1.0.3/hwy/contrib/sort/traits128-inl.h:27, + from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:23, + from /build/highway-1.0.3/hwy/foreach_target.h:81, + from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:20: + /toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h: In function 'void hwy::N_NEON::StoreU(Vec128, Full128, uint64_t*)': + /toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h:11052:1: error: inlining failed in call to 'always_inline' 'void vst1q_u64(uint64_t*, uint64x2_t)': target specific option mismatch + 11052 | vst1q_u64 (uint64_t * __a, uint64x2_t __b) + | ^~~~~~~~~ + /build/highway-1.0.3/hwy/ops/arm_neon-inl.h:2786:12: note: called from here + 2786 | vst1q_u64(unaligned, v.raw); + | ~~~~~~~~~^~~~~~~~~~~~~~~~~~ + +The same errors happen when configured with HWY_ENABLE_EXAMPLES=ON, +or from client libraries like libjxl (at other places). + +The issue is that Highway Arm NEON ops have a dependency on the +Advanced SIMD (Neon) v2 and the VFPv4 floating-point instructions. +The SIMD (Neon) v1 and VFPv3 instructions are not supported. + +There was several attempts to fix variants of this issues. +See #834 and #1032. + +HWY_NEON target is selected only if __ARM_NEON is defined. See: +https://github.com/google/highway/blob/1.0.3/hwy/detect_targets.h#L251 + +This test is not sufficient since __ARM_NEON will be predefined in +any cases when Neon is enabled (neon-vfpv3, neon-vfpv4). + +The issue is that HWY_CMAKE_ARM7=ON implies VFPv4 / NEON SIMD v2. +When setting HWY_CMAKE_ARM7=OFF, "neon-vfpv4" will not be forced, +but the code is still using intrinsics assuming VFPv4. Gcc will fail +with error because code cannot be generated for the selected +architecture. + +This issue can be avoided by adding "-DHWY_DISABLED_TARGETS=HWY_NEON" in +CXXFLAGS. The problem with this solution is that every client program will +also need to do the same. This goes against the very purpose of +"hwy/detect_targets.h". + +Technically, Armv7-a processors with VFPv4 can be detected using some +ACLE (Arm C Language Extensions [2]) predefined macros: + +Basically, we want Highway to define HWY_NEON only when the target +supports SIMDv2/VFPv4 or higher. An older target with vfpv3 only +(e.g. Cortex-A8, A9, ...) would NOT define HWY_NEON, and therefore +would fallback on HWY_SCALAR implementation. + +However, not all compiler completely support ACLE. There is also +several versions too. So we cannot easily rely on macros like +"__ARM_VFPV4__" (which clang predefine, but not gcc). + +The alternative solution proposed in this patch, is to declare the +HWY_NEON target architecture as broken, when we detect the target is +Armv7-A, but mandatory features for vfpv4 (namely half-float, FMA) +are missing. Half-floats are tested using the macro __ARM_NEON_FP, +and the FMA with the macro __ARM_FEATURE_FMA. See ACLE [2]. The +intent of declaring the target as broken, rather than selecting +HWY_NEON only if vfpv4 features are detected is to remain a bit +conservative, since the detection is slithly inaccurate. + +For a given compiler/cflags, predefined macros for Arm/ACLE can be +reviewed with commands like: + + arm-linux-gnueabihf-gcc -mcpu=cortex-a9 -mfpu=neon-vfpv3 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + arm-linux-gnueabihf-gcc -mcpu=cortex-a7 -mfpu=neon-vfpv4 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + clang -target armv7a -mcpu=cortex-a9 -mfpu=neon-vfpv3 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + clang -target armv7a -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + +The different values of __ARM_NEON_FP can be seen, depending which +"-mfpu" is passed. Same for __ARM_FEATURE_FMA. + +[1] https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2022.08-1.tar.bz2 +[2] https://github.com/ARM-software/acle/ + +Signed-off-by: Julien Olivain +--- + hwy/detect_targets.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h +index 2beca95..40ae7fe 100644 +--- a/hwy/detect_targets.h ++++ b/hwy/detect_targets.h +@@ -154,6 +154,16 @@ + (defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN)) + #define HWY_BROKEN_TARGETS (HWY_NEON) + ++// armv7-a without a detected vfpv4 is not supported ++// (for example Cortex-A8, Cortex-A9) ++// vfpv4 always have neon half-float _and_ FMA. ++#elif HWY_ARCH_ARM_V7 && \ ++ (__ARM_ARCH_PROFILE == 'A') && \ ++ !defined(__ARM_VFPV4__) && \ ++ !((__ARM_NEON_FP & 0x2 /* half-float */) && \ ++ (__ARM_FEATURE_FMA == 1)) ++#define HWY_BROKEN_TARGETS (HWY_NEON) ++ + // SVE[2] require recent clang or gcc versions. + #elif (HWY_COMPILER_CLANG && HWY_COMPILER_CLANG < 1100) || \ + (HWY_COMPILER_GCC_ACTUAL && HWY_COMPILER_GCC_ACTUAL < 1000) +-- +2.39.2 + diff --git a/package/highway/highway.hash b/package/highway/highway.hash index 3ff468443e..16a9282176 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db highway-1.0.2.tar.gz +sha256 566fc77315878473d9a6bd815f7de78c73734acdcb745c3dde8579560ac5440e highway-1.0.3.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE diff --git a/package/highway/highway.mk b/package/highway/highway.mk index ed7f6ca871..56d63a83f9 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.0.2 +HIGHWAY_VERSION = 1.0.3 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 HIGHWAY_LICENSE_FILES = LICENSE @@ -35,6 +35,9 @@ endif ifeq ($(BR2_ARM_FPU_VFPV4),y) HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=ON else +# Highway Armv7 Neon support requires in fact vfpv4 / neon v2. When we +# are in a vfpv3 case (e.g. Cortex-A8, Cortex-A9) this flag need to be +# set to off. HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=OFF endif -- 2.39.2 From james.hilliard1 at gmail.com Tue Feb 21 01:22:38 2023 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 20 Feb 2023 18:22:38 -0700 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.67.1 Message-ID: <20230221012238.3809280-1-james.hilliard1@gmail.com> Link to Rust 1.67.1 announcement: https://blog.rust-lang.org/2023/02/09/Rust-1.67.1.html Drop patch which is now upstream. Signed-off-by: James Hilliard --- package/rust-bin/rust-bin.hash | 252 +++++++++--------- package/rust-bin/rust-bin.mk | 2 +- ...-unsoundness-in-bootstrap-cache-code.patch | 43 --- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 5 files changed, 131 insertions(+), 174 deletions(-) delete mode 100644 package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d00e6342e8..11cfae5e9b 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc -sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc -sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc -sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 b7b8e8b70cae457092661894efa5a4861ef4f0e20f2f617d05d6f17b1f780a68 rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 b686a2d0d1648e1b84def715dd65a85a3d2802b33ecf65808bdb2ed639aec7d3 rust-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 c9df968487707eb63207f63086daed4fe1484829fb6221bd9414de2700424995 rust-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 4f56194a354b1413fb973d25f1c895aaa8e85211d316755508d6848e3a4fe18b rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 852e5a714ea8d2737f2cd5b0d6a12ecfa712b75238c643ba8138b490fc39fc43 rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0a5bc85383d5d9d077dccaad1fb213d9498b6137112aaaabced6eb079fe12c9e rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 574851ff8503df9cb0dd04e6a1cd0ce5d709b5ea8b9c1265b314b9e182c818da rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 50e98fefef58218bd2c09c826308d43abe11b05f528b08ecca3d2657d7996630 rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 6e8629ace0c1b9cc0c2bc6225e6716df852370e5c7e907815ff8e6241e427699 rust-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 7dbb718bdb09adad7e36b9a413e571863913682495527f7f2d6507ea2c068542 rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 35027409400faaaa38ea2855b92dea6b553b2e656dff735da730f67ac02e57e6 rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 dcd3926c151cdd33d4de2860f021c86a18556809c4d06cbddebc1b377638710a rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 da42d5b07984dac9a41719511eeb47cbb6c5e70b32a6eacba96c9f860ced0307 rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 3b95c9595db3e10077c4eca8f63d80414bf3a50c1f0f6b2ac33f1992ee0940db rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 767761d99846174dfb7dfb579e2e2be63800478858a82f3f7050cc9555209a89 rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 1e53306124de9f282452bd6085e86918e5e9f6f1940fc79809a1b284272e2d2b rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 3e8bb4265c8c6d8984b69eeefe015131ea140148a58179b3abec5653d93bea7d rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 cbfce327b623e341c1243f0d29ef2f60e5fb205d406c79eb8be1433652c3c9a5 rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 b6d00c4e338744ce1bf5b314f1056472acf1eb416f65057a8b3ca0a992fb04df rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 8a7e46b15adb0718b4e4ee33cd46529117411e8d73c29043778b05e7412c2b46 rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 6102f98617dd37874f3d755d0a325b45d47c6e1715c39d5e9bc037992e4d3cd6 rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 720958bc039c9ff00e7e399adf45f044484c5695a71bde0d07e0c895a819fe74 rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 22cbbf0b22d9b0894cfbd6e1dd6b95b71c7ad02cee4e477d375dcf81af8d1337 rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.asc +sha256 49beb678732f34a0bfc22f94900c3d4a17ec05effdb7377864042df73b2a2819 rust-std-1.67.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 aab2d7aa76793e78c9c8810e93ed8978f6422843b1277e9c60337b0f943a4409 rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.asc +sha256 a2c6e55a8a2987d0c306d2c164347a70ab7a6a18f6562039a772b33e25934972 rust-std-1.67.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 048b3da190212b742f7a052618b57683dc96ee2b6c25fc7f5ae751143cb79bad rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.asc +sha256 b9ef413b764a92d42e07a2e588268ece09994d2cd1ab2a93858c27f85a250349 rust-std-1.67.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 ef7fe3160de629f0d38788f2c270f87b0631480e5b0d848595b460528de719e4 rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 15fdb3e8b39c8a122e9beee0c4c909ee8ec356e57aaaaae5f2b9e94f58d73c87 rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 6ccfd98fd920cc2f1199bcf9a842430c27f6fcd2cc46c18421e487309ff7811e rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 78477c45f5b848b156adaf0e0f6f2954ae73e2903321d1636c155020175eaaf5 rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 94410897626546dde806a114299c3c32abb6b4b294af5daea5c4d136751fe063 rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 b3f1a338e69428f1611f059c67b8afafa78ce5c7ed0799f8a90795390261d3a4 rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 26efe78c09ed36da34964c0d023cf9aa404766ab790a94d9becd373b8879cb5a rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 135f5e6ab6d8f077a14521d387d3f31831abdb840ca4e6a15b6f0d0d5b7dbc81 rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 364c47ed22e4268edf238d221c40007d7d8792a66ca325d3937596a9c911ea48 rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 63a7e6a6c889a3d01bb3c66a3def3e41963511ea52e13906669da5b29b2fd9da rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 04573298d9e815c1e8c47a2f9548ea55d4a2afc538eceaa6a704d44a5e1f7e3e rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 addf0b0beb1966787e599f32849f18c28d5cb65515272b7d9608d4a1dddee2e7 rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 f4dc8468dfc1dbd86f865b10f06e0e4b4e76f5a3a1cc27317a520ab1660844e9 rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 89741cd2ac00c3a3f565bcccdf442cc1f9ec58ea419f1f0d09e911be0ff86c87 rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index d62ce39cfc..bb66de5ec5 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.67.0 +RUST_BIN_VERSION = 1.67.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch deleted file mode 100644 index 3eae34642f..0000000000 --- a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 -From: Michael Goulet -Date: Mon, 12 Dec 2022 18:29:33 +0000 -Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= - =?UTF-8?q?ap=20cache=20code?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) -Signed-off-by: Sebastian Weyer ---- - src/bootstrap/cache.rs | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs -index be5c9bb0788..05f25af68ea 100644 ---- a/src/bootstrap/cache.rs -+++ b/src/bootstrap/cache.rs -@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { - - impl Deref for Interned { - type Target = T::Target; -- fn deref(&self) -> &'static Self::Target { -+ fn deref(&self) -> &Self::Target { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } -+ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } - } - } - - impl, U: ?Sized> AsRef for Interned { -- fn as_ref(&self) -> &'static U { -+ fn as_ref(&self) -> &U { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } -+ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } - } - } - --- -2.25.1 - diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 2a260ca64f..1b4b08cecc 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc -sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.asc +sha256 77e0615011f887d9533d5374bf9c15c590c3caf32bbb035b392d1c2ae502a682 rustc-1.67.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index d14ad3a3e7..814a3c1dd4 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.67.0 +RUST_VERSION = 1.67.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT -- 2.34.1 From thomas.petazzoni at bootlin.com Tue Feb 21 07:38:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 07:38:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-20 Message-ID: <20230221073840.84D8442A6B@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-20 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 13 | 12 | 0 | 25 | master | 153 | 139 | 2 | 294 | next | 2 | 0 | 0 | 2 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 8 host-pahole-1.24 | 7 linux-6.1.11 | 7 unknown | 7 host-binutils-2.38 | 5 host-go-1.19.6 | 5 elfutils-0.186 | 4 speechd-0.11.4 | 4 busybox-1.36.0 | 3 glibc-2.36-81-g4f4d7a13edfd... | 3 host-binutils-2.37 | 3 host-libarchive-3.6.2 | 3 host-rust-1.67.0 | 3 libgcrypt-1.10.1 | 3 libglib2-2.72.3 | 3 systemd-252.4 | 3 brltty-6.5 | 2 fftw-quad-3.3.8 | 2 fontconfig-2.13.1 | 2 freeradius-client-1.1.7 | 2 gerbera-1.10.0 | 2 gobject-introspection | 2 host-binutils-2.39 | 2 netsurf-3.10 | 2 olsr-0.9.8 | 2 python-numpy-1.23.5 | 2 valgrind-3.19.0 | 2 xfsprogs-5.14.2 | 2 zabbix-6.2.7 | 2 acpid-2.0.34 | 1 android-tools-4.2.2+git2013... | 1 boost-1.80.0 | 1 btrfs-progs-5.16.2 | 1 containerd-1.6.16 | 1 docker-cli-23.0.0 | 1 fdk-aac-2.0.2 | 1 flac-1.4.2 | 1 fluent-bit-2.0.9 | 1 fs/ubi/ubi.mk:51: /home/bui... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fstrcmp-0.7.D001 | 1 glslsandbox-player-2021.08.24 | 1 gvfs-1.48.1 | 1 host-gcc-final-11.3.0 | 1 host-gcc-final-12.2.0 | 1 libcpprestsdk-2.10.18 | 1 libgpg-error-1.46 | 1 libjxl-0.7.0 | 1 libnss-3.88.1 | 1 linux-5.10.162-cip24 | 1 linux-5.10.162-cip24-rt10 | 1 lirc-tools-0.10.2 | 1 ltp-testsuite-20220930 | 1 multipath-tools-0.9.4 | 1 mutt-2.2.9 | 1 ntp-4.2.8p15 | 1 optee-client-3.19.0 | 1 opus-1.3.1 | 1 perl-5.36.0 | 1 php-8.2.3 | 1 pixz-1.0.7 | 1 qemu-7.2.0 | 1 quickjs-2021-03-27 | 1 ruby-3.1.3 | 1 syslinux-6.03 | 1 uclibc-1.0.42 | 1 ulog-0389d243352255f6182326... | 1 uqmi-0a19b5b77140465c29e2af... | 1 wolfssl-5.5.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/e3180b157da82a873e26d82a214bf45209a1e3b8 | ORPH powerpc64le | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/4cbc60e95e38bbb1d0c5d4ecc504e5da8ae22af4 | arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/4cf51b37c785eed8f5e950fe26e79e8fb20c8566 | microblaze | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/2529778cc04100e9b901323808d3274ea83bd4f8 | microblaze | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/d496753fa4e5f47dec317b1b81c098bdbbae0238 | or1k | btrfs-progs-5.16.2 | NOK | http://autobuild.buildroot.net/results/893288c3b7ab58a8d15e1f96ee30ae19d2e8312a | ORPH mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/a67bbd05aa05e926512a58f5e534635b73c4d03a | ORPH mips64 | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/3ad70dc07bbae130b74bf699e249cbf116d81010 | ORPH arm | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/6ed313724af39600c19e639e7ae7aeb60109828a | ORPH arm | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/8cae16a62a81d9ea998a1248bb377d129db33ea5 | x86_64 | docker-cli-23.0.0 | NOK | http://autobuild.buildroot.net/results/c8be4259dd17753f79eee10c36a3f5f80b7672fc | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/1ee3401edeae9430303ffdea35bfbea5921a2b3d | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/62ad9d9e29485e57df6fccdb55e736f984dd4ae5 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/77f471b242682c7af39d5c42becd1ba03f67e68e | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/d10e2fb80131f6358d297dff596ab6141c28c603 | ORPH x86_64 | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/8ec43c2db6dd7f308bcf02bec4e12ab33632e3f5 | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/e5524c2e43dbb7fe5f517b553e18e55927fdde5f | ORPH powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/1d9c3980b45c0d8d1bd3880983e83893e5e54a53 | ORPH sh4a | flac-1.4.2 | NOK | http://autobuild.buildroot.net/results/7d426e2650e409ca73cf289b4d7dab7dcbf214e3 | xtensa | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/cb5a21a6f5bf39e09919c4ec915d5aa6480f7aa9 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/21ac1bdc72848aeaefe85fff95700f1c761a65f5 | ORPH riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/22d258b0b35ce5cea180d392c4259d2a85dd5d17 | riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/b11001f71bed7b5ea58f8b70f7539b4f4ee32a0f | mips | fs/ubi/ubi.mk:51: /home/bui... | NOK | http://autobuild.buildroot.net/results/a70b5a8fbac22269ac5d21ee10542131214b5ff8 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/6480b3aef0e0aa2adea1da0d35f3573c9d6b2f16 | microblaze | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/af49f968088530b66082641464d5b2df7b5ec63e | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/e60048d62b7ac4c5651cf98c7842840f6db765b3 | or1k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/33e2b14f31d1faf1b41df11db113a5c3fb347924 | or1k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/e5c0bc96e2b8c7fa9b50096b0021c92f62753019 | armeb | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/56dda0c224c04d68747cfc4c2045165fc2bc2d71 | aarch64_be | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/0c9cc1d43daccd21b16de1ea21322c7b1e9a1bbd | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/22275e769ac373961971fb44695d645d7687f123 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/fa8e220621a2ac472346fa14ad9a7006a1274b8d | powerpc64 | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/3ed5e504e7f994b1e103e9fa6a8b324126eff5f7 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/2aec85e60080e8abcb0200bf2b60807f35eba2bf | aarch64 | glslsandbox-player-2021.08.24 | NOK | http://autobuild.buildroot.net/results/ac765b0ff5f914df4087ae4691fe711dc912f03b | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/9303b861da97521c25bd2898ea044f37c01ad5bf | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/3bead068b84e8a40077c8bef57d90a5ab47a18c2 | microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/358bc905ee73e70dd41a1347174577c905bd82a0 | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/86adfc65a263e02ebf1f9acf75574c7c1f212dfd | ORPH powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/4657f21099bfa7d52dcec08dc09d8bf6b74fa34b | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/fab352ec1be76fca9b4133ab58b109a56a75ceb3 | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/55df3b1bc4aed899f9bf673045f633f0e27a05ec | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1d7775d5538c765d23bf5619219739679824e3ab | ORPH mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/60cd771ca50accf6cf19f66226c42a9edb7930f1 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f2a649a36e9cc5a27dc1a5bfd7af85e703e282c8 | ORPH x86_64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/98dc4b415115cca65b53e4cd986144ef85bf17ad | ORPH mips64 | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/86b4f7b620c5ed46a94f2835d4f1f142717db952 | mips64el | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/7c53e187e2b87ca0262f55a54cc110de9f1e247d | armeb | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/8d95190345d3072345cad2bf4c87faee33c9e302 | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/aa8912eb231b5810fb89323c19e82230ec3b6cbb | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/3e6534f937518ff34f0bc92c0355661db86fc81f | or1k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/b56524f4bd95d1726140c0330de87bc10d37e4d1 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/7b34fe3de9396d6d721e88e1c35f2a1a1d2e5dc3 | arm | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/effb52b4257096c107997ddc172801894bdc6aa4 | riscv32 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/42c3383a825966d9cb0944149313cf20f5ed8169 | xtensa | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/5bc22eda781d23e4e0dc574d3f7eba6a2fa81381 | microblazeel | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/ee7821580f8cc59cd1d4992eafcc8de43e7a9668 | armeb | host-gcc-final-12.2.0 | NOK | http://autobuild.buildroot.net/results/e6ceec6b459b37ffbbb277355986e9ec549cc786 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/9612b79f94fae7160b67f349b9b7bca93b1c9b61 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/402c0e7d55677602b81cba7b7b7e478f643b9314 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/57b236ce192b2879786b5140364d836dfc4a0b4f | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/a4c4c3e20c4ac313ef3ddcb6e7847ca4a1bacb4c | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/4a3b0e8239d3a7a150cc3ed6169176ee78366e21 | mips64 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/ee687375ebd7cc912378664308c46a0f83b6c335 | arc | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/11868e9bc4916843a7fc76f7b5e4c251f89e33dc | riscv32 | host-libarchive-3.6.2 | NOK | http://autobuild.buildroot.net/results/bed12b7f41bb42b009b366a6e7de87ba543f7c9f | sh4eb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/23c8297c18d5e2c9375e001b4264bae290e82309 | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/eddbeedc7249a9ea6943c4078f190de891bc356a | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/94d07202bbb84cbde0eb8cc6debd7c9bcdd666f5 | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/0d41179361f2cdde07ef8d9b0df58e167ba54155 | mipsel | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/a385950474714b5adb117f9b1151fab5c9b16542 | i686 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/1797d9e956d5fdbcb847399b54939b4bb244c17d | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/5defc47a6efca1e061642868663f36c2f81e1e57 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/b6a153fc8319e6454d4b7d042c38fa9334ca40d9 | mips | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/a13012dc03256c45aa3f7f69b96d14c86d0f2dd4 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/a90f58bcf2cf05bdd6917def8fb01ceba1f7cf8e | arc | libcpprestsdk-2.10.18 | NOK | http://autobuild.buildroot.net/results/e6778e60cc1ea455f5b4511d5824f04d8040f67b | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/7fa10c8b2d0e48641e247b457f76de88a5c2e127 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/ecb0c243ac4766acc39af8d286c36486837318e1 | ORPH i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/1cbbc0b4bcbf86170ee797a55226002e2e631785 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/31291a8707f6fb0c8567fe73e136059062f92d8b | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/ef1a0ff1a9d4b060cf0e259144befd42979e093f | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/a5cbff35ed4b5d6b74cdf2ac7173d8be571a4401 | aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/7d26d0f05815c529d4d7ebd1de1e7019484d8eef | ORPH arc | libjxl-0.7.0 | NOK | http://autobuild.buildroot.net/results/9893a0da313e77a47550595b71befcece76bb206 | mipsel | libnss-3.88.1 | NOK | http://autobuild.buildroot.net/results/26871866e8f2b4a79ef32c114ac5295a3b4d7762 | s390x | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/a4d183f54ab5d149613f6ad432331b2a4db4b94c | ORPH mips64el | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/248fca028f60e7659d1f66b635eb071f162995ef | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/b5aa7990927abc9fcaed9e23506950c6b550d71c | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4af79f7293316522f49137ffd44a62585780d3ab | ORPH sh4a | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/dab96083e4de1fc5f3e63900aaf2e2bd20d80e87 | ORPH m68k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/8f6c7cf4636ef5149b210c0de8a8766876d6e3d2 | ORPH m68k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/7f3c829796e55eee4b64fb2c2e8dc4c0ae01df1e | ORPH i686 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/a9522c0e9bfa4a23f31573c3fb43939b54fa79ff | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/41e178fa6b4c03a69c986207741c315cb9255e50 | ORPH sparc64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/8d0d603a04380b2305fdce4295df42e426e05368 | ORPH s390x | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/0f21f69e11fb52b320de306c69b8844ed90417ec | aarch64_be | multipath-tools-0.9.4 | NOK | http://autobuild.buildroot.net/results/e8542b8a733b23450a697d67fbb40042e4dfd4ed | powerpc64le | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/4291c582a750a7bd794f1d862f67a7d624165c3e | mips64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/d47cad90021082b972bbaa597078ffa31cf5456a | powerpc64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/94d5b30d7d297813828d4476d20ea6c926d8f8be | riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/72ab327ea556ffab1997db5d8089a913f34103f1 | ORPH powerpc64le | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/e5354c926b61d4f3dd9170bf019c24a74166cf06 | ORPH arc | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/d34acbc52c200a0b76ad8e2f8f8f5d4f83264883 | ORPH arceb | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/ba922e5d5afc1a8e96dbe1c814495dd26fdddf36 | armeb | opus-1.3.1 | NOK | http://autobuild.buildroot.net/results/9966147849708b47df5137b88c319c01961b2c7c | ORPH arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/8c190f0a7ee54a45c79b925087d16a2b6f0687a7 | microblaze | php-8.2.3 | NOK | http://autobuild.buildroot.net/results/93ccccd233cf83aadce01bf8171317bfe8be492d | arc | pixz-1.0.7 | NOK | http://autobuild.buildroot.net/results/52efcad081d94e9800723bc5bac52a0f1f8c3f76 | i686 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/20ce30249942f92ba17c40a27867f7c128fe59a1 | sh4 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/6601739b21ae44c8d685affc2524e14fd9d110f8 | riscv32 | qemu-7.2.0 | NOK | http://autobuild.buildroot.net/results/9b3a4007a776dec173ed6347167f9971ac8843e9 | sh4a | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/71a29398d5dffa04a01b495e95fd7121b1803c4e | sh4 | ruby-3.1.3 | NOK | http://autobuild.buildroot.net/results/5eaac7cb81a496fdc3432a31d6786561bd3776f1 | x86_64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/b91c6f19cceccf064a90e27d7ca082e3b82cc6d0 | sparc64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/583306d5210ab35da1400a8b9b56e9d3e066a64b | nios2 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/cc1817efb4a5d54ffd2e7ac2f4fc773535f70972 | sparc64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/215507ff5cfc779ad095156b384bf45cb84b8461 | i586 | syslinux-6.03 | NOK | http://autobuild.buildroot.net/results/de88089888b2ca354b28af3550abf846560da7d5 | ORPH mipsel | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/5cfb6c51fe8da507fd547c15170169d84ee36abd | sh4aeb | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/be2198865ad16d565816590768948910a9f612f9 | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/dfc23dfa90556becd4c882e893a0f72f78574c7c | riscv64 | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/40315d6915c1d72144da8f9c10d73587eae6b21c | aarch64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/ff50155db80ac1c57034b23dd994f701a0fea8bb | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/f64ce692967cf043fe8dbd82e789ccb8b4d86901 | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/f8b3abd256ff40d04aed63c5676ab54b31cf4b68 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/634e1da40c275bcf51e9d8bbd48e96c0f074c223 | sparc | unknown | NOK | http://autobuild.buildroot.net/results/7f868232e74ed44c11a8662e53568607531f742a | or1k | unknown | NOK | http://autobuild.buildroot.net/results/ade13ceb9b7d88105be2b292c49a31f6a8647a9b | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/3ce8c243b77bed8c69475a5f293d8fe24beaa310 | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/b8f0df18ae70a2b511441f44dd5fc939c0a71b55 | x86_64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/e991e633e9f4bc2b074dab07a500c735120aecff | ORPH powerpc | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/38015111b9d410840eb1c19f4c2ea7748160feb8 | ORPH i686 | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/a9c418e1bfea6d0fe797d252ed104c8945d7a3d8 | ORPH mips64 | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/ab27cb2c835b9325c061c6ee50234ccfa6839c02 | mips64 | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/dc6bd721bcc2b59581bb49d10e0c404d8ea5da46 | ORPH mipsel | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/35fc9dfe97e2d9dd8a0fefea51882e97c308742d | ORPH mips64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/bc4fc8ff640aa538e1ec70485d47e3ea3d606d8a | mips64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/5bc66df6a7dd22cbafd4749ee1626113af6cf6e5 | Classification of failures by reason for 2022.11.x -------------------------------------------------- netsurf-3.10 | 2 xxhash-0.8.1 | 2 collectd-5.12.0 | 1 coreutils-9.1 | 1 dieharder-3.31.1 | 1 gobject-introspection-1.72.0 | 1 linux-5.10.145-cip17 | 1 mutt-2.2.9 | 1 unknown | 1 zabbix-5.4.9 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | collectd-5.12.0 | NOK | http://autobuild.buildroot.net/results/64543c5e5a1abdcbeeb09aa53b30d0c2aa390f62 | sh4 | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/ab4e284f4d67e22ea0d02505829e970b605fd7ae | ORPH microblaze | dieharder-3.31.1 | NOK | http://autobuild.buildroot.net/results/8ab826577b203ae89559d427b6aa1611540342aa | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/117a607f0cba5827e7cccb185a7a6e9603b20efd | ORPH m68k | linux-5.10.145-cip17 | NOK | http://autobuild.buildroot.net/results/35e256ea6d48f9f35363fee3f924c541d49b1d31 | ORPH i686 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/2ff1b2d4a5ef54d47b03a50fe0785dd3d9679fbc | s390x | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/c9ee089b3fe01158a7b3e65724696f6a18767ff8 | arc | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/534ce0af5a26d52d145242a518cb4b71e2daf89a | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/7ce89193d8a00bb5f6d8abd60a274893acfc4053 | or1k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/e79b34a1d7c058ebc0a0eb0982381ed71341a2b6 | ORPH mipsel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/cfc5eda527f53e9109572aefe1a84826c636126d | ORPH sparc64 | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/e71836f4cba58e791785ac73add1d282afc9fa21 | -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Mon Feb 20 22:49:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:49:24 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Giulio Benetti as maintainer for board bananapi-m2-ultra Message-ID: <20230221081921.82111864D6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60ab36a931f5d88cccb08575076e68d5e3757ae9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2eff5b23ef..caa73698f9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1135,9 +1135,11 @@ F: package/webp/ F: package/xapian/ N: Giulio Benetti +F: board/bananapi/bananapi-m2-ultra/ F: board/olimex/a* F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig +F: configs/bananapi_m2_ultra_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ From thomas.petazzoni at bootlin.com Tue Feb 21 08:19:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:19:02 +0100 Subject: [Buildroot] [git commit branch/next] DEVELOPERS: add Giulio Benetti to board imx6ullevk for both mainline and NXP(Freescale) versions Message-ID: <20230221081921.A514C86509@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d7dd1b79145a34f861d30d09750f6e988e10fd5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index caa73698f9..599cfe6886 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1136,10 +1136,13 @@ F: package/xapian/ N: Giulio Benetti F: board/bananapi/bananapi-m2-ultra/ +F: board/freescale/imx6ullevk/ F: board/olimex/a* F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig F: configs/bananapi_m2_ultra_defconfig +F: configs/freescale_imx6ullevk_defconfig +F: configs/imx6ullevk_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ From thomas.petazzoni at bootlin.com Mon Feb 20 22:58:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:58:21 +0100 Subject: [Buildroot] [git commit branch/next] configs/imx6ullevk_defconfig: bump Linux to 6.1.12 and U-Boot to 2023.01 Message-ID: <20230221081921.8D0C486506@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=497e60a2fa7e11644a41cf4a9441f7fde6c782ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Let's also reorder BR2_UBOOT_ options by moving BR2_TARGET_UBOOT_FORMAT_DTB_IMX after BR2_TARGET_UBOOT_NEEDS_OPENSSL since this reflects the order in boot/uboot/Config.in file. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/imx6ullevk_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/imx6ullevk_defconfig b/configs/imx6ullevk_defconfig index c6e2981697..b507d1c0d6 100644 --- a/configs/imx6ullevk_defconfig +++ b/configs/imx6ullevk_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -22,10 +22,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" -BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y From thomas.petazzoni at bootlin.com Mon Feb 20 22:47:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:47:53 +0100 Subject: [Buildroot] [git commit branch/next] configs/bananapi_m2_ultra_defconfig: bump Linux to 6.1 and U-Boot to 2023.01 Message-ID: <20230221081921.784B786501@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d7f902eb127eb9dd1334cda04a2008d14945a7d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/bananapi_m2_ultra_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 2ec0e60e8d..0f267021f8 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Ultra" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-ultra/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-r40-bananapi-m2-ultra" @@ -16,7 +16,7 @@ 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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From thomas.petazzoni at bootlin.com Mon Feb 20 22:58:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 20 Feb 2023 23:58:25 +0100 Subject: [Buildroot] [git commit branch/next] configs/freescale_imx6ullevk_defconfig: bump Linux and U-Boot to lf-5.15.71-2.2.0 Message-ID: <20230221081921.98C9C86508@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9e09ac2c02d1ff8d3872ebc72e915e9baa7fbd0d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Let's also enable BR2_TARGET_UBOOT_NEEDS_OPENSSL required by uboot to build correctly. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/freescale_imx6ullevk_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index 7a8965be18..db4fa69f71 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -1,11 +1,11 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.15.71-2.2.0)/linux-imx-lf-5.15.71-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -15,8 +15,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.15.71-2.2.0)/uboot-imx-lf-5.15.71-2.2.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y From thomas.petazzoni at bootlin.com Tue Feb 21 08:21:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:21:15 +0100 Subject: [Buildroot] [PATCH 1/3] configs/imx6ullevk_defconfig: bump Linux to 6.1.12 and U-Boot to 2023.01 In-Reply-To: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> References: <20230216212553.2591068-1-giulio.benetti@benettiengineering.com> Message-ID: <20230221092115.1041a5ed@windsurf> On Thu, 16 Feb 2023 22:25:51 +0100 Giulio Benetti wrote: > Let's also reorder BR2_UBOOT_ options by moving > BR2_TARGET_UBOOT_FORMAT_DTB_IMX after BR2_TARGET_UBOOT_NEEDS_OPENSSL since > this reflects the order in boot/uboot/Config.in file. > > Signed-off-by: Giulio Benetti > --- > configs/imx6ullevk_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Series applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:23:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.67.1 In-Reply-To: <20230221012238.3809280-1-james.hilliard1@gmail.com> References: <20230221012238.3809280-1-james.hilliard1@gmail.com> Message-ID: <20230221092310.3d532276@windsurf> On Mon, 20 Feb 2023 18:22:38 -0700 James Hilliard wrote: > Link to Rust 1.67.1 announcement: https://blog.rust-lang.org/2023/02/09/Rust-1.67.1.html > > Drop patch which is now upstream. > > Signed-off-by: James Hilliard > --- > package/rust-bin/rust-bin.hash | 252 +++++++++--------- > package/rust-bin/rust-bin.mk | 2 +- > ...-unsoundness-in-bootstrap-cache-code.patch | 43 --- > package/rust/rust.hash | 6 +- > package/rust/rust.mk | 2 +- > 5 files changed, 131 insertions(+), 174 deletions(-) > delete mode 100644 package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:23:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/highway: bump to version 1.0.3 In-Reply-To: <20230220234200.464390-1-ju.o@free.fr> References: <20230220234200.464390-1-ju.o@free.fr> Message-ID: <20230221092316.12468ad1@windsurf> On Tue, 21 Feb 2023 00:42:00 +0100 Julien Olivain wrote: > - Dropped patch upstreamed in: > https://github.com/google/highway/commit/1cab22047a6ef750ef2bc38ad47d6e765d6d376a > > - Add an upstream patch, not in 1.0.3 release: > https://github.com/google/highway/commit/411300d0eec10d5635cbdd064299630c507348e1 > > - Add a new patch, to fix armv7 builds with vfp < v4. > Proposed upstream in: > https://github.com/google/highway/pull/1143 > > - Add a comment about -DHWY_CMAKE_ARM7=OFF since the name is a bit > misleading. It should better be ARMV7 or ARMV7_VFPV4. > > For change log since 1.0.2, see: > - https://github.com/google/highway/releases/tag/1.0.3 > > Signed-off-by: Julien Olivain > --- > Tested on top of branch master at commit 9cd2e6e with commands: Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:23:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-iptvsimple: bump version to 19.3.0-Matrix In-Reply-To: <20230220192534.103145-1-bernd.kuhls@t-online.de> References: <20230220192534.103145-1-bernd.kuhls@t-online.de> Message-ID: <20230221092335.6539378b@windsurf> On Mon, 20 Feb 2023 20:25:34 +0100 Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls > --- > package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- > package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:23:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:29 +0100 Subject: [Buildroot] [git commit branch/next] package/kodi-pvr-iptvsimple: bump version to 19.3.0-Matrix Message-ID: <20230221082339.9C61C8654B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3927054736881e5807b86fe9b1e5b275d941d6fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 47dd202258..de71703c53 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 57710d3add72301d47a9eef016916ee5f61b7b8604c73450d67b9ba962eff60c kodi-pvr-iptvsimple-19.2.2-Matrix.tar.gz +sha256 421a883054dd31ad512866236c364e5a564d7db9fa595dadc3e37b9169b7fe79 kodi-pvr-iptvsimple-19.3.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 5b91c35c0c..e5976a7d3a 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 19.2.2-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 19.3.0-Matrix KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Tue Feb 21 08:23:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:07 +0100 Subject: [Buildroot] [git commit branch/next] package/highway: bump to version 1.0.3 Message-ID: <20230221082339.90E0286549@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a789cd0d1badf7f68749b304f7b2e3d9f9ca2c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Dropped patch upstreamed in: https://github.com/google/highway/commit/1cab22047a6ef750ef2bc38ad47d6e765d6d376a - Add an upstream patch, not in 1.0.3 release: https://github.com/google/highway/commit/411300d0eec10d5635cbdd064299630c507348e1 - Add a new patch, to fix armv7 builds with vfp < v4. Proposed upstream in: https://github.com/google/highway/pull/1143 - Add a comment about -DHWY_CMAKE_ARM7=OFF since the name is a bit misleading. It should better be ARMV7 or ARMV7_VFPV4. For change log since 1.0.2, see: - https://github.com/google/highway/releases/tag/1.0.3 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...0001-Check-for-the-presence-of-sys-auxv.h.patch | 62 ----------- ...0001-Fix-compilation-for-armv7-with-gcc-8.patch | 46 ++++++++ ...tion-for-armv7-targets-with-vfp-v4-and-gc.patch | 118 +++++++++++++++++++++ package/highway/highway.hash | 2 +- package/highway/highway.mk | 5 +- 5 files changed, 169 insertions(+), 64 deletions(-) diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch deleted file mode 100644 index df86798613..0000000000 --- a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Wed, 23 Nov 2022 23:27:11 +0100 -Subject: [PATCH] Check for the presence of - -Not all gcc versions are providing . Checking for -HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not -sufficient and fail to build in some situations (it was observed for -some gcc armv7m toolchains). - -This patch adds a check for and include it only if present. - -Signed-off-by: Julien Olivain ---- - CMakeLists.txt | 3 +++ - hwy/detect_targets.h | 2 +- - hwy/targets.cc | 2 +- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b6b14ab..df6b5ab 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -84,6 +84,9 @@ check_cxx_source_compiles( - HWY_RISCV - ) - -+include(CheckIncludeFile) -+check_include_file(sys/auxv.h HAVE_SYS_AUXV_H) -+ - if (HWY_ENABLE_CONTRIB) - # Glob all the traits so we don't need to modify this file when adding - # additional special cases. -diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h -index 7f7e179..f0c6f94 100644 ---- a/hwy/detect_targets.h -+++ b/hwy/detect_targets.h -@@ -392,7 +392,7 @@ - #define HWY_HAVE_RUNTIME_DISPATCH 1 - // On Arm, currently only GCC does, and we require Linux to detect CPU - // capabilities. --#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX -+#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX && HAVE_SYS_AUXV_H - #define HWY_HAVE_RUNTIME_DISPATCH 1 - #else - #define HWY_HAVE_RUNTIME_DISPATCH 0 -diff --git a/hwy/targets.cc b/hwy/targets.cc -index 2fde4db..abd6a94 100644 ---- a/hwy/targets.cc -+++ b/hwy/targets.cc -@@ -42,7 +42,7 @@ - #include - #endif // HWY_COMPILER_MSVC - --#elif HWY_ARCH_ARM && HWY_OS_LINUX -+#elif HWY_ARCH_ARM && HWY_OS_LINUX && HAVE_SYS_AUXV_H - #include - #include - #endif // HWY_ARCH_* --- -2.38.1 - diff --git a/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch b/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch new file mode 100644 index 0000000000..0634460453 --- /dev/null +++ b/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch @@ -0,0 +1,46 @@ +From 94cda9cc8cd12345a6dbe70e40f3119d5bf7ee78 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 10 Feb 2023 21:25:36 +0100 +Subject: [PATCH] Fix compilation for armv7 with gcc < 8 + +Highway uses the construct __attribute__((target(+neon-vfpv4)) for +Armv7. The target "+neon-vfpv4" was introduced in gcc 8, in commit [1]. +When using a gcc < 8 (for example, like [2]), compilation fails with +message: + + In file included from /build/highway-1.0.3/hwy/foreach_target.h:81:0, + from /build/highway-1.0.3/hwy/per_target.cc:20: + /build/highway-1.0.3/hwy/per_target.cc: At global scope: + /build/highway-1.0.3/hwy/per_target.cc:23:22: error: attribute(target("+neon-vfpv4")) is unknown + +This commit protects the definition of HWY_TARGET_STR only when gcc +version 8 or greater is used for armv7. + +[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e87afe54b86c478ae63569e51e7abb67d3fe3fce +[2] https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/arm-linux-gnueabihf/gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz + +Signed-off-by: Julien Olivain +--- + hwy/ops/set_macros-inl.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/hwy/ops/set_macros-inl.h b/hwy/ops/set_macros-inl.h +index 051dbb3..00b4b1b 100644 +--- a/hwy/ops/set_macros-inl.h ++++ b/hwy/ops/set_macros-inl.h +@@ -230,7 +230,12 @@ + // Can use pragmas instead of -march compiler flag + #if HWY_HAVE_RUNTIME_DISPATCH + #if HWY_ARCH_ARM_V7 ++#if HWY_COMPILER_GCC_ACTUAL >= 800 ++// The __attribute__((target(+neon-vfpv4)) was introduced in gcc >= 8. ++// In case we have a gcc < 8, we can still compile by keeping ++// HWY_TARGET_STR undefined. + #define HWY_TARGET_STR "+neon-vfpv4" ++#endif + #else + #define HWY_TARGET_STR "+crypto" + #endif // HWY_ARCH_ARM_V7 +-- +2.39.2 + diff --git a/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch b/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch new file mode 100644 index 0000000000..f29b385501 --- /dev/null +++ b/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch @@ -0,0 +1,118 @@ +From 93d4579f90dd6ad26fd0dcda6420b3bb2fdcbc02 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Mon, 20 Feb 2023 23:22:28 +0100 +Subject: [PATCH] Fix compilation for armv7 targets with vfp < v4 and gcc >= 8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When using a armv7 gcc >= 8 toolchain (like [1]) with Highway +configured with -DHWY_CMAKE_ARM7=OFF and HWY_ENABLE_CONTRIB=ON, +compilation fails with error: + + In file included from /build/highway-1.0.3/hwy/ops/arm_neon-inl.h:33, + from /build/highway-1.0.3/hwy/highway.h:358, + from /build/highway-1.0.3/hwy/contrib/sort/shared-inl.h:104, + from /build/highway-1.0.3/hwy/contrib/sort/traits128-inl.h:27, + from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:23, + from /build/highway-1.0.3/hwy/foreach_target.h:81, + from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:20: + /toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h: In function 'void hwy::N_NEON::StoreU(Vec128, Full128, uint64_t*)': + /toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h:11052:1: error: inlining failed in call to 'always_inline' 'void vst1q_u64(uint64_t*, uint64x2_t)': target specific option mismatch + 11052 | vst1q_u64 (uint64_t * __a, uint64x2_t __b) + | ^~~~~~~~~ + /build/highway-1.0.3/hwy/ops/arm_neon-inl.h:2786:12: note: called from here + 2786 | vst1q_u64(unaligned, v.raw); + | ~~~~~~~~~^~~~~~~~~~~~~~~~~~ + +The same errors happen when configured with HWY_ENABLE_EXAMPLES=ON, +or from client libraries like libjxl (at other places). + +The issue is that Highway Arm NEON ops have a dependency on the +Advanced SIMD (Neon) v2 and the VFPv4 floating-point instructions. +The SIMD (Neon) v1 and VFPv3 instructions are not supported. + +There was several attempts to fix variants of this issues. +See #834 and #1032. + +HWY_NEON target is selected only if __ARM_NEON is defined. See: +https://github.com/google/highway/blob/1.0.3/hwy/detect_targets.h#L251 + +This test is not sufficient since __ARM_NEON will be predefined in +any cases when Neon is enabled (neon-vfpv3, neon-vfpv4). + +The issue is that HWY_CMAKE_ARM7=ON implies VFPv4 / NEON SIMD v2. +When setting HWY_CMAKE_ARM7=OFF, "neon-vfpv4" will not be forced, +but the code is still using intrinsics assuming VFPv4. Gcc will fail +with error because code cannot be generated for the selected +architecture. + +This issue can be avoided by adding "-DHWY_DISABLED_TARGETS=HWY_NEON" in +CXXFLAGS. The problem with this solution is that every client program will +also need to do the same. This goes against the very purpose of +"hwy/detect_targets.h". + +Technically, Armv7-a processors with VFPv4 can be detected using some +ACLE (Arm C Language Extensions [2]) predefined macros: + +Basically, we want Highway to define HWY_NEON only when the target +supports SIMDv2/VFPv4 or higher. An older target with vfpv3 only +(e.g. Cortex-A8, A9, ...) would NOT define HWY_NEON, and therefore +would fallback on HWY_SCALAR implementation. + +However, not all compiler completely support ACLE. There is also +several versions too. So we cannot easily rely on macros like +"__ARM_VFPV4__" (which clang predefine, but not gcc). + +The alternative solution proposed in this patch, is to declare the +HWY_NEON target architecture as broken, when we detect the target is +Armv7-A, but mandatory features for vfpv4 (namely half-float, FMA) +are missing. Half-floats are tested using the macro __ARM_NEON_FP, +and the FMA with the macro __ARM_FEATURE_FMA. See ACLE [2]. The +intent of declaring the target as broken, rather than selecting +HWY_NEON only if vfpv4 features are detected is to remain a bit +conservative, since the detection is slithly inaccurate. + +For a given compiler/cflags, predefined macros for Arm/ACLE can be +reviewed with commands like: + + arm-linux-gnueabihf-gcc -mcpu=cortex-a9 -mfpu=neon-vfpv3 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + arm-linux-gnueabihf-gcc -mcpu=cortex-a7 -mfpu=neon-vfpv4 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + clang -target armv7a -mcpu=cortex-a9 -mfpu=neon-vfpv3 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + clang -target armv7a -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + +The different values of __ARM_NEON_FP can be seen, depending which +"-mfpu" is passed. Same for __ARM_FEATURE_FMA. + +[1] https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2022.08-1.tar.bz2 +[2] https://github.com/ARM-software/acle/ + +Signed-off-by: Julien Olivain +--- + hwy/detect_targets.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h +index 2beca95..40ae7fe 100644 +--- a/hwy/detect_targets.h ++++ b/hwy/detect_targets.h +@@ -154,6 +154,16 @@ + (defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN)) + #define HWY_BROKEN_TARGETS (HWY_NEON) + ++// armv7-a without a detected vfpv4 is not supported ++// (for example Cortex-A8, Cortex-A9) ++// vfpv4 always have neon half-float _and_ FMA. ++#elif HWY_ARCH_ARM_V7 && \ ++ (__ARM_ARCH_PROFILE == 'A') && \ ++ !defined(__ARM_VFPV4__) && \ ++ !((__ARM_NEON_FP & 0x2 /* half-float */) && \ ++ (__ARM_FEATURE_FMA == 1)) ++#define HWY_BROKEN_TARGETS (HWY_NEON) ++ + // SVE[2] require recent clang or gcc versions. + #elif (HWY_COMPILER_CLANG && HWY_COMPILER_CLANG < 1100) || \ + (HWY_COMPILER_GCC_ACTUAL && HWY_COMPILER_GCC_ACTUAL < 1000) +-- +2.39.2 + diff --git a/package/highway/highway.hash b/package/highway/highway.hash index 3ff468443e..16a9282176 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db highway-1.0.2.tar.gz +sha256 566fc77315878473d9a6bd815f7de78c73734acdcb745c3dde8579560ac5440e highway-1.0.3.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE diff --git a/package/highway/highway.mk b/package/highway/highway.mk index ed7f6ca871..56d63a83f9 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.0.2 +HIGHWAY_VERSION = 1.0.3 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 HIGHWAY_LICENSE_FILES = LICENSE @@ -35,6 +35,9 @@ endif ifeq ($(BR2_ARM_FPU_VFPV4),y) HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=ON else +# Highway Armv7 Neon support requires in fact vfpv4 / neon v2. When we +# are in a vfpv3 case (e.g. Cortex-A8, Cortex-A9) this flag need to be +# set to off. HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=OFF endif From thomas.petazzoni at bootlin.com Tue Feb 21 08:21:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:21:24 +0100 Subject: [Buildroot] [git commit branch/next] package/{rust, rust-bin}: bump to version 1.67.1 Message-ID: <20230221082339.839B486546@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=792f1975175cb995600f7e3ac092fc3c741aa096 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Link to Rust 1.67.1 announcement: https://blog.rust-lang.org/2023/02/09/Rust-1.67.1.html Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.hash | 252 ++++++++++----------- package/rust-bin/rust-bin.mk | 2 +- ...1-fix-unsoundness-in-bootstrap-cache-code.patch | 43 ---- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 5 files changed, 131 insertions(+), 174 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d00e6342e8..11cfae5e9b 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc -sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc -sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc -sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 b7b8e8b70cae457092661894efa5a4861ef4f0e20f2f617d05d6f17b1f780a68 rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 b686a2d0d1648e1b84def715dd65a85a3d2802b33ecf65808bdb2ed639aec7d3 rust-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 c9df968487707eb63207f63086daed4fe1484829fb6221bd9414de2700424995 rust-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 4f56194a354b1413fb973d25f1c895aaa8e85211d316755508d6848e3a4fe18b rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 852e5a714ea8d2737f2cd5b0d6a12ecfa712b75238c643ba8138b490fc39fc43 rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0a5bc85383d5d9d077dccaad1fb213d9498b6137112aaaabced6eb079fe12c9e rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 574851ff8503df9cb0dd04e6a1cd0ce5d709b5ea8b9c1265b314b9e182c818da rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 50e98fefef58218bd2c09c826308d43abe11b05f528b08ecca3d2657d7996630 rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 6e8629ace0c1b9cc0c2bc6225e6716df852370e5c7e907815ff8e6241e427699 rust-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 7dbb718bdb09adad7e36b9a413e571863913682495527f7f2d6507ea2c068542 rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 35027409400faaaa38ea2855b92dea6b553b2e656dff735da730f67ac02e57e6 rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 dcd3926c151cdd33d4de2860f021c86a18556809c4d06cbddebc1b377638710a rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 da42d5b07984dac9a41719511eeb47cbb6c5e70b32a6eacba96c9f860ced0307 rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 3b95c9595db3e10077c4eca8f63d80414bf3a50c1f0f6b2ac33f1992ee0940db rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 767761d99846174dfb7dfb579e2e2be63800478858a82f3f7050cc9555209a89 rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 1e53306124de9f282452bd6085e86918e5e9f6f1940fc79809a1b284272e2d2b rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 3e8bb4265c8c6d8984b69eeefe015131ea140148a58179b3abec5653d93bea7d rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 cbfce327b623e341c1243f0d29ef2f60e5fb205d406c79eb8be1433652c3c9a5 rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 b6d00c4e338744ce1bf5b314f1056472acf1eb416f65057a8b3ca0a992fb04df rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 8a7e46b15adb0718b4e4ee33cd46529117411e8d73c29043778b05e7412c2b46 rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 6102f98617dd37874f3d755d0a325b45d47c6e1715c39d5e9bc037992e4d3cd6 rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 720958bc039c9ff00e7e399adf45f044484c5695a71bde0d07e0c895a819fe74 rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 22cbbf0b22d9b0894cfbd6e1dd6b95b71c7ad02cee4e477d375dcf81af8d1337 rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.asc +sha256 49beb678732f34a0bfc22f94900c3d4a17ec05effdb7377864042df73b2a2819 rust-std-1.67.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 aab2d7aa76793e78c9c8810e93ed8978f6422843b1277e9c60337b0f943a4409 rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.asc +sha256 a2c6e55a8a2987d0c306d2c164347a70ab7a6a18f6562039a772b33e25934972 rust-std-1.67.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 048b3da190212b742f7a052618b57683dc96ee2b6c25fc7f5ae751143cb79bad rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.asc +sha256 b9ef413b764a92d42e07a2e588268ece09994d2cd1ab2a93858c27f85a250349 rust-std-1.67.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 ef7fe3160de629f0d38788f2c270f87b0631480e5b0d848595b460528de719e4 rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 15fdb3e8b39c8a122e9beee0c4c909ee8ec356e57aaaaae5f2b9e94f58d73c87 rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 6ccfd98fd920cc2f1199bcf9a842430c27f6fcd2cc46c18421e487309ff7811e rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 78477c45f5b848b156adaf0e0f6f2954ae73e2903321d1636c155020175eaaf5 rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 94410897626546dde806a114299c3c32abb6b4b294af5daea5c4d136751fe063 rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 b3f1a338e69428f1611f059c67b8afafa78ce5c7ed0799f8a90795390261d3a4 rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 26efe78c09ed36da34964c0d023cf9aa404766ab790a94d9becd373b8879cb5a rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 135f5e6ab6d8f077a14521d387d3f31831abdb840ca4e6a15b6f0d0d5b7dbc81 rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 364c47ed22e4268edf238d221c40007d7d8792a66ca325d3937596a9c911ea48 rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 63a7e6a6c889a3d01bb3c66a3def3e41963511ea52e13906669da5b29b2fd9da rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 04573298d9e815c1e8c47a2f9548ea55d4a2afc538eceaa6a704d44a5e1f7e3e rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 addf0b0beb1966787e599f32849f18c28d5cb65515272b7d9608d4a1dddee2e7 rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 f4dc8468dfc1dbd86f865b10f06e0e4b4e76f5a3a1cc27317a520ab1660844e9 rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 89741cd2ac00c3a3f565bcccdf442cc1f9ec58ea419f1f0d09e911be0ff86c87 rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index d62ce39cfc..bb66de5ec5 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.67.0 +RUST_BIN_VERSION = 1.67.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch deleted file mode 100644 index 3eae34642f..0000000000 --- a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 -From: Michael Goulet -Date: Mon, 12 Dec 2022 18:29:33 +0000 -Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= - =?UTF-8?q?ap=20cache=20code?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) -Signed-off-by: Sebastian Weyer ---- - src/bootstrap/cache.rs | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs -index be5c9bb0788..05f25af68ea 100644 ---- a/src/bootstrap/cache.rs -+++ b/src/bootstrap/cache.rs -@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { - - impl Deref for Interned { - type Target = T::Target; -- fn deref(&self) -> &'static Self::Target { -+ fn deref(&self) -> &Self::Target { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } -+ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } - } - } - - impl, U: ?Sized> AsRef for Interned { -- fn as_ref(&self) -> &'static U { -+ fn as_ref(&self) -> &U { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } -+ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } - } - } - --- -2.25.1 - diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 2a260ca64f..1b4b08cecc 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc -sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.asc +sha256 77e0615011f887d9533d5374bf9c15c590c3caf32bbb035b392d1c2ae502a682 rustc-1.67.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index d14ad3a3e7..814a3c1dd4 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.67.0 +RUST_VERSION = 1.67.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From thomas.petazzoni at bootlin.com Tue Feb 21 08:23:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 22.3.5 In-Reply-To: <20230220191822.99026-1-bernd.kuhls@t-online.de> References: <20230220191822.99026-1-bernd.kuhls@t-online.de> Message-ID: <20230221092352.3fe46a32@windsurf> On Mon, 20 Feb 2023 20:18:22 +0100 Bernd Kuhls wrote: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.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 next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:28:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:28:21 +0100 Subject: [Buildroot] [PATCH] package/grpc: bump to version 1.52.1 In-Reply-To: <20230220124945.1842532-1-buildroot@heine.tech> References: <20230220124945.1842532-1-buildroot@heine.tech> Message-ID: <20230221092821.2f227afc@windsurf> Hello Michael, Thanks for the new iteration! On Mon, 20 Feb 2023 13:49:45 +0100 Michael Nosthoff via buildroot wrote: > +comment "grpc needs a toolchain w/ C++, gcc >= 7.3" It's a bit annoying that it depends on gcc >= 7.3 and not gcc >= 7, because technically BR2_TOOLCHAIN_GCC_AT_LEAST_7 only implies >= 7.x, and not >= 7.3. Did you check what happens with gcc 7.0, 7.1 or 7.2 ? https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2017.11-1.tar.bz2 uses gcc 7.2.0 for example. Here is a fragment to use it: https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/fragments/armv7-eabihf--glibc--bleeding-edge-2017.11-1.frag. I don't easily find a toolchain with gcc 7.0 or 7.1 unfortunately. Worst case, we could make this dependency >= 8.0. But clearly, a comment that says >= 7.3, but with a dependency on BR2_TOOLCHAIN_GCC_AT_LEAST_7 is going to be very misleading. 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 Feb 21 08:23:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:23:46 +0100 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.5 Message-ID: <20230221082849.3FA5586561@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ab0431b70e3d963ff3bbc8f10a1871d9f628789 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.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 9177adceda..ad1999a30d 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 = 22.3.4 +MESA3D_HEADERS_VERSION = 22.3.5 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 e4de997f0e..50c5bcc7fc 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html -sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz -sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.html +sha256 3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9 mesa-22.3.5.tar.xz +sha512 a4cad9b7e6501678fac279bd88a37e522633c7128afa8df04982f469c930e3557bb1d05b4b0f5ae16704d8d04e50c90a7489943a48861df17dd947704c329b85 mesa-22.3.5.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index cf2352a355..1e919d73f2 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 = 22.3.4 +MESA3D_VERSION = 22.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From thomas.petazzoni at bootlin.com Tue Feb 21 08:28:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:28:39 +0100 Subject: [Buildroot] [git commit branch/next] package/ssdp-responder: bump to v2.0 Message-ID: <20230221082849.4889386544@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07634619d9738154e46e9b309d0697d223639167 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next ChangeLog: - https://github.com/troglobit/ssdp-responder/releases/tag/v2.0 - https://github.com/troglobit/ssdp-responder/blob/v2.0/ChangeLog.md Critical Fixes: - Fix periodic busy loop causing intermittent 100% CPU load - Fix invalid uuid:uuid:... in description.xml (dup uuid:) Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/ssdp-responder/ssdp-responder.hash | 2 +- package/ssdp-responder/ssdp-responder.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.hash b/package/ssdp-responder/ssdp-responder.hash index 425ad86e08..8b4f3e4e45 100644 --- a/package/ssdp-responder/ssdp-responder.hash +++ b/package/ssdp-responder/ssdp-responder.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 974c244abd4ba8c87532867a84756182a1460c99072ffb1eb91c5a1f73311d89 ssdp-responder-1.9.tar.gz +sha256 d8888f2ac59febfb3b2473a1402041014052ad4dc1eeb4168c78aeca1692aae3 ssdp-responder-2.0.tar.gz sha256 68d6fdc22e337f725fe719bf9ae6d92b1d8d0ca4cff8219b303ab76706670a8d LICENSE diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index 5193966908..20e7219386 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSDP_RESPONDER_VERSION = 1.9 +SSDP_RESPONDER_VERSION = 2.0 SSDP_RESPONDER_SITE = https://github.com/troglobit/ssdp-responder/releases/download/v$(SSDP_RESPONDER_VERSION) SSDP_RESPONDER_LICENSE = ISC SSDP_RESPONDER_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 21 08:28:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:28:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/ssdp-responder: bump to v2.0 In-Reply-To: <20230219222048.22093-2-troglobit@gmail.com> References: <20230219222048.22093-1-troglobit@gmail.com> <20230219222048.22093-2-troglobit@gmail.com> Message-ID: <20230221092855.0385f44e@windsurf> On Sun, 19 Feb 2023 23:20:47 +0100 Joachim Wiberg wrote: > ChangeLog: > - https://github.com/troglobit/ssdp-responder/releases/tag/v2.0 > - https://github.com/troglobit/ssdp-responder/blob/v2.0/ChangeLog.md > > Critical Fixes: > - Fix periodic busy loop causing intermittent 100% CPU load > - Fix invalid uuid:uuid:... in description.xml (dup uuid:) > > Signed-off-by: Joachim Wiberg > --- > package/ssdp-responder/ssdp-responder.hash | 2 +- > package/ssdp-responder/ssdp-responder.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:30:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:30:41 +0100 Subject: [Buildroot] [git commit] package/libmodsecurity: needs dynamic library Message-ID: <20230221083059.6EB9E86580@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97bdc0616c6027fe4b92bfa80dd9e7d43df20505 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as mbedtls can be pulled in libcurl through libssh2 resulting in the following build failure: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init': md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libmodsecurity/Config.in | 14 +++++++------- package/nginx-modsecurity/Config.in | 11 ++++------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index b15d808759..69bb0494cc 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -2,8 +2,10 @@ config BR2_PACKAGE_LIBMODSECURITY bool "libmodsecurity" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - # libmodsecurity embeds several mbedtls source files - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) + # libmodsecurity embeds several mbedtls source files, causing + # various issues when static linking and other dependencies of + # libmodsecurity in turn use mbedtls + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_PCRE2 help Libmodsecurity is one component of the ModSecurity @@ -17,8 +19,6 @@ config BR2_PACKAGE_LIBMODSECURITY https://github.com/SpiderLabs/ModSecurity -comment "libmodsecurity needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "libmodsecurity needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS +comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in index 5cbe57a866..0bbf05fad9 100644 --- a/package/nginx-modsecurity/Config.in +++ b/package/nginx-modsecurity/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY depends on BR2_PACKAGE_NGINX_HTTP depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) # libmodsecurity + depends on !BR2_STATIC_LIBS # libmodsecurity select BR2_PACKAGE_LIBMODSECURITY help The ModSecurity-nginx connector is the connection @@ -12,10 +12,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY https://github.com/SpiderLabs/ModSecurity-nginx -comment "nginx-modsecurity needs a toolchain w/ C++, threads" +comment "nginx-modsecurity needs a toolchain w/ C++, threads, dynamic library" depends on BR2_PACKAGE_NGINX_HTTP - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "nginx-modsecurity needs a toolchain w/ dynamic library" - depends on BR2_PACKAGE_NGINX_HTTP - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS From thomas.petazzoni at bootlin.com Tue Feb 21 08:32:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:32:15 +0100 Subject: [Buildroot] [PATCH v4, 1/1] package/libmodsecurity: needs dynamic library In-Reply-To: <20230220223151.12965-1-fontaine.fabrice@gmail.com> References: <20230220223151.12965-1-fontaine.fabrice@gmail.com> Message-ID: <20230221093215.419fcf40@windsurf> Hello Fabrice, On Mon, 20 Feb 2023 23:31:51 +0100 Fabrice Fontaine wrote: > diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in > index b15d808759..2186d216f4 100644 > --- a/package/libmodsecurity/Config.in > +++ b/package/libmodsecurity/Config.in > @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBMODSECURITY > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_TOOLCHAIN_HAS_THREADS > # libmodsecurity embeds several mbedtls source files I've expanded a bit this comment, as it was not very clear why this causes problem with static linking. > - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) > + depends on !BR2_STATIC_LIBS > select BR2_PACKAGE_PCRE2 > help > comment "nginx-modsecurity needs a toolchain w/ C++, threads" > depends on BR2_PACKAGE_NGINX_HTTP > - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS > - > -comment "nginx-modsecurity needs a toolchain w/ dynamic library" > - depends on BR2_PACKAGE_NGINX_HTTP > - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS > + depends on !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS Something was wrong here: you forgot to update the comment prompt itself to mention the dependency on dynamic library. I fixed both minor issues and applied to master. Thanks a lot! 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 Feb 21 08:37:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:37:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build without C++ In-Reply-To: <20230220231902.340496-1-fontaine.fabrice@gmail.com> References: <20230220231902.340496-1-fontaine.fabrice@gmail.com> Message-ID: <20230221093719.5215ef5d@windsurf> On Tue, 21 Feb 2023 00:19:02 +0100 Fabrice Fontaine wrote: > Commit dedbc69022ba0beaf259463ac8082c86776f7e88 was incomplete resuling > in the following build failure since the addition of the package in > commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: > > -- Check for working CXX compiler: /usr/bin/c++ - broken > CMake Error at /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message): > The C++ compiler > > "/usr/bin/c++" > > is not able to compile a simple test program. > > It fails with the following output: > > Change Dir: /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp > > Run Build Command(s):/home/autobuild/make/make -f Makefile cmTC_bfb29/fast && make[1]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make CMakeFiles/cmTC_bfb29.dir/build > make[2]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o > /usr/bin/c++ --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx > c++: error: unrecognized command-line option '-mlongcalls' > c++: error: unrecognized command-line option '-mauto-litpools' > make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 > make[2]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 > make[1]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > > CMake will not be able to correctly generate this project. > Call Stack (most recent call first): > lib/msgpack-c/CMakeLists.txt:2 (project) > > While at it, add missing comment about C++ dependency for wasm > > Fixes: > - http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda > > Signed-off-by: Fabrice Fontaine > --- > .../fluent-bit/0003-fix-build-without-C.patch | 131 ++++++++++++++++++ > package/fluent-bit/Config.in | 4 + > 2 files changed, 135 insertions(+) > create mode 100644 package/fluent-bit/0003-fix-build-without-C.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:37:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:37:36 +0100 Subject: [Buildroot] [git commit] package/multipath-tools: fix path to kernel headers Message-ID: <20230221083752.B23E9865A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=762b3f743dd0687841a2edb64c4b56a522058d5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master With change 6b7d47be3b23 ("multipath-tools: Makefiles: simplify code for include dirs") the Makefile variable 'LINUX_HEADERS_INCDIR' has been replaced with 'kernel_incdir'. fpin_handlers.c:355:32: note: each undeclared identifier is reported only once for each function it appears in fpin_handlers.c:360:37: error: ???ELS_DTAG_LNK_INTEGRITY??? undeclared (first use in this function) 360 | if (dtag == ELS_DTAG_LNK_INTEGRITY) { | ^~~~~~~~~~~~~~~~~~~~~~ make[2]: *** [../Makefile.inc:116: fpin_handlers.o] Error 1 Fixes: http://autobuild.buildroot.net/results/e0f56ef924c13d6b1535fdc350ad8ecc06ea0a58 Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- package/multipath-tools/multipath-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index 90394fae9f..23b3cc9442 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -22,7 +22,7 @@ MULTIPATH_TOOLS_CPE_ID_VENDOR = opensvc MULTIPATH_TOOLS_DEPENDENCIES = lvm2 json-c readline udev liburcu libaio host-pkgconf MULTIPATH_TOOLS_MAKE_OPTS = \ - LINUX_HEADERS_INCDIR=$(STAGING_DIR)/usr/include \ + kernel_incdir=$(STAGING_DIR)/usr/include \ LIB="lib" \ RUN="run" \ OPTFLAGS="" \ From thomas.petazzoni at bootlin.com Tue Feb 21 08:37:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:37:06 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: fix build without C++ Message-ID: <20230221083752.A82F58659D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ceb9c36b921f5237f823c34ab369ef521f3ba12b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit dedbc69022ba0beaf259463ac8082c86776f7e88 was incomplete resuling in the following build failure since the addition of the package in commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: -- Check for working CXX compiler: /usr/bin/c++ - broken CMake Error at /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message): The C++ compiler "/usr/bin/c++" is not able to compile a simple test program. It fails with the following output: Change Dir: /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp Run Build Command(s):/home/autobuild/make/make -f Makefile cmTC_bfb29/fast && make[1]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make CMakeFiles/cmTC_bfb29.dir/build make[2]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o /usr/bin/c++ --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx c++: error: unrecognized command-line option '-mlongcalls' c++: error: unrecognized command-line option '-mauto-litpools' make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 make[2]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 make[1]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' CMake will not be able to correctly generate this project. Call Stack (most recent call first): lib/msgpack-c/CMakeLists.txt:2 (project) While at it, add missing comment about C++ dependency for wasm Fixes: - http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/fluent-bit/0003-fix-build-without-C.patch | 131 ++++++++++++++++++++++ package/fluent-bit/Config.in | 4 + 2 files changed, 135 insertions(+) diff --git a/package/fluent-bit/0003-fix-build-without-C.patch b/package/fluent-bit/0003-fix-build-without-C.patch new file mode 100644 index 0000000000..3bc5f46de9 --- /dev/null +++ b/package/fluent-bit/0003-fix-build-without-C.patch @@ -0,0 +1,131 @@ +From 014e44808ebaf29b0c25b5a3fa2e35a99a30f628 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 00:09:57 +0100 +Subject: [PATCH] fix build without C++ + +Fix the following build failure without C++: + +-- Check for working CXX compiler: /usr/bin/c++ - broken +CMake Error at /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message): + The C++ compiler + + "/usr/bin/c++" + + is not able to compile a simple test program. + + It fails with the following output: + + Change Dir: /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp + + Run Build Command(s):/home/autobuild/make/make -f Makefile cmTC_bfb29/fast && make[1]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make CMakeFiles/cmTC_bfb29.dir/build + make[2]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o + /usr/bin/c++ --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx + c++: error: unrecognized command-line option '-mlongcalls' + c++: error: unrecognized command-line option '-mauto-litpools' + make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 + make[2]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 + make[1]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + + CMake will not be able to correctly generate this project. +Call Stack (most recent call first): + lib/msgpack-c/CMakeLists.txt:2 (project) + +Fixes: + - http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/fluent/fluent-bit/pull/6893] +--- + lib/chunkio/CMakeLists.txt | 2 +- + lib/lwrb/CMakeLists.txt | 2 +- + lib/msgpack-c/CMakeLists.txt | 2 +- + lib/onigmo/CMakeLists.txt | 2 +- + lib/snappy-fef67ac/CMakeLists.txt | 2 +- + lib/tutf8e/CMakeLists.txt | 2 +- + src/stream_processor/CMakeLists.txt | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt +index 233bce35c..8bfe5199d 100644 +--- a/lib/chunkio/CMakeLists.txt ++++ b/lib/chunkio/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.0) +-project(chunk-io) ++project(chunk-io C) + + set(CIO_VERSION_MAJOR 1) + set(CIO_VERSION_MINOR 4) +diff --git a/lib/lwrb/CMakeLists.txt b/lib/lwrb/CMakeLists.txt +index 2fabd6319..031cbc1dd 100644 +--- a/lib/lwrb/CMakeLists.txt ++++ b/lib/lwrb/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.0) + + # Setup project +-project(LwLibPROJECT) ++project(LwLibPROJECT C) + + # ------------------------------------------------- + # This CMakeLists.txt is used only if it is a top-level file. +diff --git a/lib/msgpack-c/CMakeLists.txt b/lib/msgpack-c/CMakeLists.txt +index 810ad609a..ffbbc5ddb 100644 +--- a/lib/msgpack-c/CMakeLists.txt ++++ b/lib/msgpack-c/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(msgpack-c) ++project(msgpack-c C) + + set(src + src/objectc.c +diff --git a/lib/onigmo/CMakeLists.txt b/lib/onigmo/CMakeLists.txt +index 4a3b30d7d..66865130a 100644 +--- a/lib/onigmo/CMakeLists.txt ++++ b/lib/onigmo/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.4) +-project(onigmo) ++project(onigmo C) + + # Onigmo Version + set(ONIGMO_VERSION_MAJOR 6) +diff --git a/lib/snappy-fef67ac/CMakeLists.txt b/lib/snappy-fef67ac/CMakeLists.txt +index 8bb1e9598..ae9225c49 100644 +--- a/lib/snappy-fef67ac/CMakeLists.txt ++++ b/lib/snappy-fef67ac/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(snappy-c) ++project(snappy-c C) + + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +diff --git a/lib/tutf8e/CMakeLists.txt b/lib/tutf8e/CMakeLists.txt +index 35cbe01ad..a056ef83c 100644 +--- a/lib/tutf8e/CMakeLists.txt ++++ b/lib/tutf8e/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(tutf8e) ++project(tutf8e C) + + # Not supported: -std=c90 (lacks support for inline) + # Supported: -std=gnu90, -std=c99 or -std=gnu99 +diff --git a/src/stream_processor/CMakeLists.txt b/src/stream_processor/CMakeLists.txt +index 8c5d70d13..de2c2fe38 100644 +--- a/src/stream_processor/CMakeLists.txt ++++ b/src/stream_processor/CMakeLists.txt +@@ -1,4 +1,4 @@ +-project(stream-processor) ++project(stream-processor C) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +-- +2.39.0 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index f53eacb447..bfdea895b0 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -30,6 +30,10 @@ config BR2_PACKAGE_FLUENT_BIT_WASM help Support for WASM-based plugins. +comment "wasm runtime support needs a toolchain w/ C++" + depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP + endif comment "fluent-bit needs a toolchain w/ threads, dynamic library" From thomas.petazzoni at bootlin.com Tue Feb 21 08:37:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:37:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/multipath-tools: fix path to kernel headers In-Reply-To: <20230218092943.2598-1-egorenar-dev@posteo.net> References: <20230218092943.2598-1-egorenar-dev@posteo.net> Message-ID: <20230221093756.06a8f7c5@windsurf> On Sat, 18 Feb 2023 09:29:43 +0000 Alexander Egorenkov wrote: > With change 6b7d47be3b23 ("multipath-tools: Makefiles: simplify code for > include dirs") the Makefile variable 'LINUX_HEADERS_INCDIR' has been replaced > with 'kernel_incdir'. > > fpin_handlers.c:355:32: note: each undeclared identifier is reported only once for each function it appears in > fpin_handlers.c:360:37: error: ?ELS_DTAG_LNK_INTEGRITY? undeclared (first use in this function) > 360 | if (dtag == ELS_DTAG_LNK_INTEGRITY) { > | ^~~~~~~~~~~~~~~~~~~~~~ > make[2]: *** [../Makefile.inc:116: fpin_handlers.o] Error 1 > > Fixes: http://autobuild.buildroot.net/results/e0f56ef924c13d6b1535fdc350ad8ecc06ea0a58 > Signed-off-by: Alexander Egorenkov > --- > package/multipath-tools/multipath-tools.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:38:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:38:41 +0100 Subject: [Buildroot] [git commit branch/next] configs/qemu_arm_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 Message-ID: <20230221083905.3EF99865B9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a86bbb4ae4a6f5580e4cbfad8ecf8ebf81b6e053 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Bump Linux kernel version to 6.1.12. - Bump U-Boot version to 2023.01 and follow CONFIG_SYS_TEXT_BASE renaming. Signed-off-by: Vincent Stehl?? Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- board/qemu/arm-ebbr/u-boot.fragment | 2 +- configs/qemu_arm_ebbr_defconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/qemu/arm-ebbr/u-boot.fragment b/board/qemu/arm-ebbr/u-boot.fragment index bfc382cde9..66fe910f16 100644 --- a/board/qemu/arm-ebbr/u-boot.fragment +++ b/board/qemu/arm-ebbr/u-boot.fragment @@ -31,5 +31,5 @@ CONFIG_PARTITION_TYPE_GUID=y CONFIG_RNG_OPTEE=y CONFIG_RTC_EMULATION=y CONFIG_SCMI_FIRMWARE=y -CONFIG_SYS_TEXT_BASE=0x60000000 CONFIG_TEE=y +CONFIG_TEXT_BASE=0x60000000 diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index f3e2d42a54..8fbb3069bc 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" @@ -42,7 +42,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From thomas.petazzoni at bootlin.com Tue Feb 21 08:38:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:38:48 +0100 Subject: [Buildroot] [git commit branch/next] configs/qemu_aarch64_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 Message-ID: <20230221083905.4C18C865BA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2215548546af47f3cfce89a15bfc31f736cd74bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Bump Linux kernel version to 6.1.12. - Bump U-Boot version to 2023.01 and rename config fragment to make it clearer that it is not a complete config file. Signed-off-by: Vincent Stehl?? Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- board/qemu/aarch64-ebbr/{u-boot.config => u-boot.fragment} | 0 configs/qemu_aarch64_ebbr_defconfig | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/qemu/aarch64-ebbr/u-boot.config b/board/qemu/aarch64-ebbr/u-boot.fragment similarity index 100% rename from board/qemu/aarch64-ebbr/u-boot.config rename to board/qemu/aarch64-ebbr/u-boot.fragment diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index d293ad0e60..e3157089a9 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -39,9 +39,9 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.config" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Host tools From thomas.petazzoni at bootlin.com Tue Feb 21 08:39:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:39:23 +0100 Subject: [Buildroot] [PATCH 1/2] configs/qemu_arm_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 In-Reply-To: <20230216100751.446662-1-vincent.stehle@arm.com> References: <20230216100751.446662-1-vincent.stehle@arm.com> Message-ID: <20230221093923.76ea5ef7@windsurf> On Thu, 16 Feb 2023 11:07:50 +0100 Vincent Stehl? wrote: > - Bump Linux kernel version to 6.1.12. > - Bump U-Boot version to 2023.01 and follow CONFIG_SYS_TEXT_BASE renaming. > > Signed-off-by: Vincent Stehl? > Cc: Romain Naour > --- > board/qemu/arm-ebbr/u-boot.fragment | 2 +- > configs/qemu_arm_ebbr_defconfig | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) Both applied to next, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:40:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:40:50 +0100 Subject: [Buildroot] [PATCH v2] package/zstd: bump to version 1.5.4 In-Reply-To: <20230216084714.85507-1-nolange79@gmail.com> References: <20230216084714.85507-1-nolange79@gmail.com> Message-ID: <20230221094050.22a51eb7@windsurf> On Thu, 16 Feb 2023 09:47:13 +0100 Norbert Lange wrote: > The LICENSE text has changed, nominally the copyright owner changed > from "Facebook" to "Meta Platforms, Inc. and affiliates", > reflecting the name change of that company. > > Add upstream patch to fix zstd-dll build. > > Signed-off-by: Norbert Lange > --- > v1->v2: recreate upstream patch with git-formatpatch > --- > ...-dll-build-missing-dependencies-3496.patch | 321 ++++++++++++++++++ > package/zstd/zstd.hash | 6 +- > package/zstd/zstd.mk | 2 +- > 3 files changed, 325 insertions(+), 4 deletions(-) > create mode 100644 package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:41:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:41:07 +0100 Subject: [Buildroot] [PATCH 2/2] package/network-manager: bump version to 1.42.0 In-Reply-To: <20230213124021.12522-2-heiko.thiery@gmail.com> References: <20230213124021.12522-1-heiko.thiery@gmail.com> <20230213124021.12522-2-heiko.thiery@gmail.com> Message-ID: <20230221094107.2b149b02@windsurf> On Mon, 13 Feb 2023 13:40:23 +0100 Heiko Thiery wrote: > Signed-off-by: Heiko Thiery > --- > package/network-manager/network-manager.hash | 4 ++-- > package/network-manager/network-manager.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:43:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:43:29 +0100 Subject: [Buildroot] [PATCH v2] package/dbus-broker: bump to release 33 In-Reply-To: <29cebb7af48c3652e440c61cc90fafa4fe3f8046.1676300324.git.stefan@agner.ch> References: <29cebb7af48c3652e440c61cc90fafa4fe3f8046.1676300324.git.stefan@agner.ch> Message-ID: <20230221094329.79cf0b8e@windsurf> Hello Stefan, On Mon, 13 Feb 2023 15:58:57 +0100 Stefan Agner wrote: > This release contains mostly a bugfixes, with some improvements around > error handling for unimplemented functionality and resiliency against > runtime changes of dbus service-files. > > Signed-off-by: Stefan Agner Thanks a lot for the update. However see below for a comment. > --- > package/dbus-broker/dbus-broker.hash | 6 +++--- > package/dbus-broker/dbus-broker.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash > index f6c2cbe160..06c8f229b7 100644 > --- a/package/dbus-broker/dbus-broker.hash > +++ b/package/dbus-broker/dbus-broker.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz > +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz > sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE > sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS > sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md > @@ -11,7 +11,7 @@ sha256 23f24eeaaded5fedd6e7840b6f7b73838f9a4e2112ad6a12fe1ef958f73d0214 subpro > sha256 05113a24aca4c537819dd0d91b95b13edb85bea4b6a77a6d9269becb397ed374 subprojects/libcrbtree-3/README.md > sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS > sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md > -sha256 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 subprojects/libcstdaux-1/AUTHORS > -sha256 7c4b6c325b0bc02150089112f65132ee999b0f44500b73d1fc06d96c93161037 subprojects/libcstdaux-1/README.md > +sha256 e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 subprojects/libcstdaux-1/AUTHORS > +sha256 92006886d7f28894fef08bf97e35ef52147067bd3c4d4d6381da7c59f9901dae subprojects/libcstdaux-1/README.md When there are changes in the license files, we need to have a short explanation in the commit log about these. Indeed, if we simply "blindly" update the hashes, then having those hashes in the first place is completely useless: the whole point of having hashes for license files is to detect changes in the license files, analyze them and justify if they require or not a change in how the licensing of the package is described in Buildroot. Could you resend with an updated commit message that explain the changes in the license files? Even if they are minimal/trivial, having this explanation in the commit log will help the reviewers/maintainers to make sure the changes in those license files have been verified. Thanks a lot! 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 Feb 21 08:50:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:50:18 +0100 Subject: [Buildroot] [PATCH] package/networkd-dispatcher: bump to version 2.2.4 In-Reply-To: <20230213151039.4073397-1-buildroot@heine.tech> References: <20230213151039.4073397-1-buildroot@heine.tech> Message-ID: <20230221095018.35fe1c66@windsurf> On Mon, 13 Feb 2023 16:10:39 +0100 Michael Nosthoff via buildroot wrote: > Signed-off-by: Michael Nosthoff > --- > package/networkd-dispatcher/networkd-dispatcher.hash | 2 +- > package/networkd-dispatcher/networkd-dispatcher.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:40:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:40:59 +0100 Subject: [Buildroot] [git commit branch/next] package/network-manager: bump version to 1.42.0 Message-ID: <20230221085502.136AA865D9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3706f1e0b7008674169809166c414825a551d04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 3895c1ffc3..270699d63a 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.10.sha256sum -sha256 fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7 NetworkManager-1.40.10.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.42/NetworkManager-1.42.0.sha256sum +sha256 2f6756d507bb6b46716594b67e6fe7491891e1b5b167bbafc5157dfa7753d5b4 NetworkManager-1.42.0.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 138ff46e4a..3001530930 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.40 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 +NETWORK_MANAGER_VERSION_MAJOR = 1.42 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 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 From thomas.petazzoni at bootlin.com Tue Feb 21 08:48:50 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:48:50 +0100 Subject: [Buildroot] [git commit branch/next] package/networkd-dispatcher: bump to version 2.2.4 Message-ID: <20230221085502.22A3C865DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b851097ba6db559042183eb31dc48dc1533fac04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/networkd-dispatcher/networkd-dispatcher.hash | 2 +- package/networkd-dispatcher/networkd-dispatcher.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash index ffb4fa846a..f50dd75163 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.hash +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 61270b4c2f39c36da4b0a62724a3cc01f6732493fed0f166ee675bafedff11df networkd-dispatcher-2.2.3.tar.bz2 +sha256 993086fa2dab11ba6b54a121adaccbd4c679ce3c8b3193cfa5c00500c28cbdf9 networkd-dispatcher-2.2.4.tar.bz2 sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk index 2b1aa257ce..a3e0319c10 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.mk +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETWORKD_DISPATCHER_VERSION = 2.2.3 +NETWORKD_DISPATCHER_VERSION = 2.2.4 NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) NETWORKD_DISPATCHER_LICENSE = GPL-3.0 From thomas.petazzoni at bootlin.com Tue Feb 21 08:40:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:40:39 +0100 Subject: [Buildroot] [git commit branch/next] package/zstd: bump to version 1.5.4 Message-ID: <20230221085502.087C7865D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e464dc4033d0437c337e8cf0998a95c9deeeee12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The LICENSE text has changed, nominally the copyright owner changed from "Facebook" to "Meta Platforms, Inc. and affiliates", reflecting the name change of that company. Add upstream patch to fix zstd-dll build. Signed-off-by: Norbert Lange Signed-off-by: Thomas Petazzoni --- ...-zstd-dll-build-missing-dependencies-3496.patch | 321 +++++++++++++++++++++ package/zstd/zstd.hash | 6 +- package/zstd/zstd.mk | 2 +- 3 files changed, 325 insertions(+), 4 deletions(-) diff --git a/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch new file mode 100644 index 0000000000..60737159c6 --- /dev/null +++ b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch @@ -0,0 +1,321 @@ +From e47c7c0d5a923dcdc3b302f9944eb4a70b7ee0be Mon Sep 17 00:00:00 2001 +From: Yonatan Komornik <11005061+yoniko at users.noreply.github.com> +Date: Sun, 12 Feb 2023 12:32:31 -0800 +Subject: [PATCH] Fix zstd-dll build missing dependencies (#3496) + +* Fixes zstd-dll build (https://github.com/facebook/zstd/issues/3492): +- Adds pool.o and threading.o dependency to the zstd-dll target +- Moves custom allocation functions into header to avoid needing to add dependency on common.o +- Adds test target for zstd-dll +- Adds github workflow that buildis zstd-dll + +[nolange79: backport from upstream c78f434aa4f5f1097c8edb975f4c1635817a5a71] +Signed-off-by: Norbert Lange +--- + .github/workflows/dev-short-tests.yml | 9 +++- + contrib/linux-kernel/zstd_common_module.c | 3 -- + lib/common/allocations.h | 55 +++++++++++++++++++++++ + lib/common/pool.c | 2 +- + lib/common/zstd_common.c | 35 --------------- + lib/common/zstd_internal.h | 5 --- + lib/compress/zstd_compress.c | 1 + + lib/compress/zstd_cwksp.h | 1 + + lib/compress/zstdmt_compress.c | 1 + + lib/decompress/zstd_ddict.c | 1 + + lib/decompress/zstd_decompress.c | 1 + + programs/Makefile | 2 +- + tests/Makefile | 8 +++- + 13 files changed, 76 insertions(+), 48 deletions(-) + create mode 100644 lib/common/allocations.h + +diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml +index 132dbb99..3ae2e9da 100644 +--- a/.github/workflows/dev-short-tests.yml ++++ b/.github/workflows/dev-short-tests.yml +@@ -55,6 +55,14 @@ jobs: + run: | + make c89build V=1 + ++ build-zstd-dll: ++ runs-on: ubuntu-latest ++ steps: ++ - uses: actions/checkout at ac593985615ec2ede58e132d2e21d2b1cbd6127c # tag=v3 ++ - name: build zstd bin against a dynamic lib (debuglevel for more dependencies) ++ run: | ++ make -C lib lib-mt-release ++ DEBUGLEVEL=2 make -C programs zstd-dll + + gcc-7-libzstd: + runs-on: ubuntu-latest +@@ -328,7 +336,6 @@ jobs: + make -j -C programs allVariants MOREFLAGS=-O0 + ./tests/test-variants.sh + +- + qemu-consistency: + name: QEMU ${{ matrix.name }} + runs-on: ubuntu-20.04 +diff --git a/contrib/linux-kernel/zstd_common_module.c b/contrib/linux-kernel/zstd_common_module.c +index 2fead39e..466828e3 100644 +--- a/contrib/linux-kernel/zstd_common_module.c ++++ b/contrib/linux-kernel/zstd_common_module.c +@@ -24,9 +24,6 @@ EXPORT_SYMBOL_GPL(HUF_readStats_wksp); + EXPORT_SYMBOL_GPL(ZSTD_isError); + EXPORT_SYMBOL_GPL(ZSTD_getErrorName); + EXPORT_SYMBOL_GPL(ZSTD_getErrorCode); +-EXPORT_SYMBOL_GPL(ZSTD_customMalloc); +-EXPORT_SYMBOL_GPL(ZSTD_customCalloc); +-EXPORT_SYMBOL_GPL(ZSTD_customFree); + + MODULE_LICENSE("Dual BSD/GPL"); + MODULE_DESCRIPTION("Zstd Common"); +diff --git a/lib/common/allocations.h b/lib/common/allocations.h +new file mode 100644 +index 00000000..a3153c4b +--- /dev/null ++++ b/lib/common/allocations.h +@@ -0,0 +1,55 @@ ++/* ++ * Copyright (c) Meta Platforms, Inc. and affiliates. ++ * All rights reserved. ++ * ++ * This source code is licensed under both the BSD-style license (found in the ++ * LICENSE file in the root directory of this source tree) and the GPLv2 (found ++ * in the COPYING file in the root directory of this source tree). ++ * You may select, at your option, one of the above-listed licenses. ++ */ ++ ++/* This file provides custom allocation primitives ++ */ ++ ++#define ZSTD_DEPS_NEED_MALLOC ++#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ ++ ++#include "mem.h" /* MEM_STATIC */ ++#define ZSTD_STATIC_LINKING_ONLY ++#include "../zstd.h" /* ZSTD_customMem */ ++ ++#ifndef ZSTD_ALLOCATIONS_H ++#define ZSTD_ALLOCATIONS_H ++ ++/* custom memory allocation functions */ ++ ++MEM_STATIC void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) ++ return customMem.customAlloc(customMem.opaque, size); ++ return ZSTD_malloc(size); ++} ++ ++MEM_STATIC void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) { ++ /* calloc implemented as malloc+memset; ++ * not as efficient as calloc, but next best guess for custom malloc */ ++ void* const ptr = customMem.customAlloc(customMem.opaque, size); ++ ZSTD_memset(ptr, 0, size); ++ return ptr; ++ } ++ return ZSTD_calloc(1, size); ++} ++ ++MEM_STATIC void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) ++{ ++ if (ptr!=NULL) { ++ if (customMem.customFree) ++ customMem.customFree(customMem.opaque, ptr); ++ else ++ ZSTD_free(ptr); ++ } ++} ++ ++#endif /* ZSTD_ALLOCATIONS_H */ +diff --git a/lib/common/pool.c b/lib/common/pool.c +index f3d9d085..d5ca5a78 100644 +--- a/lib/common/pool.c ++++ b/lib/common/pool.c +@@ -10,9 +10,9 @@ + + + /* ====== Dependencies ======= */ ++#include "../common/allocations.h" /* ZSTD_customCalloc, ZSTD_customFree */ + #include "zstd_deps.h" /* size_t */ + #include "debug.h" /* assert */ +-#include "zstd_internal.h" /* ZSTD_customCalloc, ZSTD_customFree */ + #include "pool.h" + + /* ====== Compiler specifics ====== */ +diff --git a/lib/common/zstd_common.c b/lib/common/zstd_common.c +index 32085524..3f04c22a 100644 +--- a/lib/common/zstd_common.c ++++ b/lib/common/zstd_common.c +@@ -14,7 +14,6 @@ + * Dependencies + ***************************************/ + #define ZSTD_DEPS_NEED_MALLOC +-#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ + #include "error_private.h" + #include "zstd_internal.h" + +@@ -47,37 +46,3 @@ ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); } + /*! ZSTD_getErrorString() : + * provides error code string from enum */ + const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); } +- +- +- +-/*=************************************************************** +-* Custom allocator +-****************************************************************/ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) +- return customMem.customAlloc(customMem.opaque, size); +- return ZSTD_malloc(size); +-} +- +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) { +- /* calloc implemented as malloc+memset; +- * not as efficient as calloc, but next best guess for custom malloc */ +- void* const ptr = customMem.customAlloc(customMem.opaque, size); +- ZSTD_memset(ptr, 0, size); +- return ptr; +- } +- return ZSTD_calloc(1, size); +-} +- +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) +-{ +- if (ptr!=NULL) { +- if (customMem.customFree) +- customMem.customFree(customMem.opaque, ptr); +- else +- ZSTD_free(ptr); +- } +-} +diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h +index 37836dc7..1f942f27 100644 +--- a/lib/common/zstd_internal.h ++++ b/lib/common/zstd_internal.h +@@ -350,11 +350,6 @@ typedef struct { + const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx); /* compress & dictBuilder */ + int ZSTD_seqToCodes(const seqStore_t* seqStorePtr); /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */ + +-/* custom memory allocation functions */ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem); +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem); +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem); +- + + /* ZSTD_invalidateRepCodes() : + * ensures next compression will not use repcodes from previous block. +diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c +index b55f684c..173ce242 100644 +--- a/lib/compress/zstd_compress.c ++++ b/lib/compress/zstd_compress.c +@@ -11,6 +11,7 @@ + /*-************************************* + * Dependencies + ***************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* INT_MAX, ZSTD_memset, ZSTD_memcpy */ + #include "../common/mem.h" + #include "hist.h" /* HIST_countFast_wksp */ +diff --git a/lib/compress/zstd_cwksp.h b/lib/compress/zstd_cwksp.h +index 97676693..9113cdbd 100644 +--- a/lib/compress/zstd_cwksp.h ++++ b/lib/compress/zstd_cwksp.h +@@ -14,6 +14,7 @@ + /*-************************************* + * Dependencies + ***************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ + #include "../common/zstd_internal.h" + + #if defined (__cplusplus) +diff --git a/lib/compress/zstdmt_compress.c b/lib/compress/zstdmt_compress.c +index 7a2c7172..bf2de4a7 100644 +--- a/lib/compress/zstdmt_compress.c ++++ b/lib/compress/zstdmt_compress.c +@@ -20,6 +20,7 @@ + + + /* ====== Dependencies ====== */ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memset, INT_MAX, UINT_MAX */ + #include "../common/mem.h" /* MEM_STATIC */ + #include "../common/pool.h" /* threadpool */ +diff --git a/lib/decompress/zstd_ddict.c b/lib/decompress/zstd_ddict.c +index ad5c34a7..309ec0d0 100644 +--- a/lib/decompress/zstd_ddict.c ++++ b/lib/decompress/zstd_ddict.c +@@ -14,6 +14,7 @@ + /*-******************************************************* + * Dependencies + *********************************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ + #include "../common/cpu.h" /* bmi2 */ + #include "../common/mem.h" /* low level memory routines */ +diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c +index d487966c..3f3ca57c 100644 +--- a/lib/decompress/zstd_decompress.c ++++ b/lib/decompress/zstd_decompress.c +@@ -55,6 +55,7 @@ + /*-******************************************************* + * Dependencies + *********************************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ + #include "../common/mem.h" /* low level memory routines */ + #define FSE_STATIC_LINKING_ONLY +diff --git a/programs/Makefile b/programs/Makefile +index fcff41dc..8507abef 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -225,7 +225,7 @@ zstd-noxz : zstd + .PHONY: zstd-dll + zstd-dll : LDFLAGS+= -L$(LIBZSTD) + zstd-dll : LDLIBS += -lzstd +-zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c ++zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c pool.c threading.c + zstd-dll : zstd + + +diff --git a/tests/Makefile b/tests/Makefile +index 3eed19ea..778c7d67 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -95,7 +95,7 @@ allnothread: fullbench fuzzer paramgrill datagen decodecorpus + dll: fuzzer-dll zstreamtest-dll + + .PHONY: zstd zstd32 zstd-nolegacy # only external makefile knows how to build or update them +-zstd zstd32 zstd-nolegacy: ++zstd zstd32 zstd-nolegacy zstd-dll: + $(MAKE) -C $(PRGDIR) $@ MOREFLAGS+="$(DEBUGFLAGS)" + + .PHONY: libzstd +@@ -328,13 +328,17 @@ test-all: test test32 test-decodecorpus-cli + test-zstd: ZSTD = $(PRGDIR)/zstd + test-zstd: zstd + ++.PHONY: test-zstd-dll ++test-zstd-dll: ZSTD = $(PRGDIR)/zstd ++test-zstd-dll: zstd-dll ++ + test-zstd32: ZSTD = $(PRGDIR)/zstd32 + test-zstd32: zstd32 + + test-zstd-nolegacy: ZSTD = $(PRGDIR)/zstd-nolegacy + test-zstd-nolegacy: zstd-nolegacy + +-test-zstd test-zstd32 test-zstd-nolegacy: datagen ++test-zstd test-zstd32 test-zstd-nolegacy test-zstd-dll: datagen + file $(ZSTD) + EXE_PREFIX="$(QEMU_SYS)" ZSTD_BIN="$(ZSTD)" DATAGEN_BIN=./datagen ./playTests.sh $(ZSTDRTTEST) + +-- +2.39.1 + diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index eca44b89f0..ca4e2fa0b9 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,6 +1,6 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 -sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.gz.sha256 +sha256 0f470992aedad543126d06efab344dc5f3e171893810455787d38347343a4424 zstd-1.5.4.tar.gz # License files (locally computed) -sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE +sha256 7055266497633c9025b777c78eb7235af13922117480ed5c674677adc381c9d8 LICENSE sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 73bb97a793..45e8bf1bc2 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.2 +ZSTD_VERSION = 1.5.4 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 From thomas.petazzoni at bootlin.com Tue Feb 21 08:50:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:50:26 +0100 Subject: [Buildroot] [git commit branch/next] package/python-maturin: bump to version 0.14.13 Message-ID: <20230221085502.30853865D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db97a1d196da07d2c1d1f41061dcac851c110915 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index b104b1fbbe..d1344f2744 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 59157a06c0a482aec750d64746f2b23e556ce3ec62d9cdce74fcb7b4658b722b maturin-0.14.9.tar.gz +sha256 7ed1234824ef2b0c919c6d24550540bf044fe992612b322a6abda1253f5bb500 maturin-0.14.13.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index 3484e09d22..7781a1070b 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.9 +PYTHON_MATURIN_VERSION = 0.14.13 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/90/f9/f4242c0e8bc5def9a7135c12574449dbb411ecc595cf72202ca97a79c2ad +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/a9/a9/bcff9592d7ad68052432e6369bd310606e2ddeb9bcc0b52d5f69e4140290 PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From thomas.petazzoni at bootlin.com Tue Feb 21 08:55:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:55:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-maturin: bump to version 0.14.13 In-Reply-To: <20230214202541.2485669-1-james.hilliard1@gmail.com> References: <20230214202541.2485669-1-james.hilliard1@gmail.com> Message-ID: <20230221095506.13a27e52@windsurf> On Tue, 14 Feb 2023 13:25:41 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-maturin/python-maturin.hash | 2 +- > package/python-maturin/python-maturin.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:57:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:57:05 +0100 Subject: [Buildroot] [PATCH 1/5] DEVELOPERS: add Julien Olivain for package/openmpi In-Reply-To: <20230207220941.58066-1-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> Message-ID: <20230221095705.1dc184ff@windsurf> On Tue, 7 Feb 2023 23:09:37 +0100 Julien Olivain wrote: > The package has been orphan since commit ee58353 (2018-12-22). > > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 08:56:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 09:56:47 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Julien Olivain for package/openmpi Message-ID: <20230221085829.7341F865DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d02eab8bcf57495c8c7675021c69fc2e3edd508 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The package has been orphan since commit ee58353 (2018-12-22). Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2eff5b23ef..6256576e02 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1691,6 +1691,7 @@ F: package/highway/ F: package/libjxl/ F: package/octave/ F: package/ola/ +F: package/openmpi/ F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ From thomas.petazzoni at bootlin.com Tue Feb 21 09:10:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 10:10:39 +0100 Subject: [Buildroot] [PATCH 3/5] package/openmpi: enable mpi compiler wrapper scripts In-Reply-To: <20230207220941.58066-3-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> <20230207220941.58066-3-ju.o@free.fr> Message-ID: <20230221101039.2d86fdcb@windsurf> Hello Julien, On Tue, 7 Feb 2023 23:09:39 +0100 Julien Olivain wrote: > openmpi normally includes compiler wrapper binary programs (e.g. mpicc, > mpicxx, etc...). Those programs are inconvenient when cross compiling. > Those target binary wrappers are useless in Buildroot, as the target > root filesystem does not include compilers. For cross compilation, > openmpi also ships Perl scripts providing a subset of those functions. > With those compiler wrappers, openmpi programs can now be cross > compiled properly in Buildroot. This patch enables those wrappers. > > Signed-off-by: Julien Olivain > --- > package/openmpi/openmpi.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk > index f14b55ced5..e6f5cd0250 100644 > --- a/package/openmpi/openmpi.mk > +++ b/package/openmpi/openmpi.mk > @@ -17,7 +17,9 @@ OPENMPI_INSTALL_STAGING = YES > # found. This makes the configuration fail. See: > # https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 > # Disable explicitly to avoid the issue. > -OPENMPI_CONF_OPTS = --without-ime > +OPENMPI_CONF_OPTS = \ > + --enable-script-wrapper-compilers \ So if I look at your PATCH 4/5, this means that "mpicc" is one of those wrapper script, installed in $(STAGING_DIR), but meant to be executed on the host? As you're saying it's written in Perl, did you test it with a minimal Fedora installation, to see if it has requirements beyond the base Perl installation? (compared to Debian/Ubuntu, Fedora has a much more fine-grained packaging of basic Perl modules, this recently lead to a small amount of additional checks in dependencies.sh, see https://gitlab.com/buildroot.org/buildroot/-/commits/master/support/dependencies/dependencies.sh). Best regards, 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 Feb 21 09:12:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 10:12:33 +0100 Subject: [Buildroot] [PATCH 4/5] package/openmpi-examples: new package In-Reply-To: <20230207220941.58066-4-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> <20230207220941.58066-4-ju.o@free.fr> Message-ID: <20230221101233.039af4c5@windsurf> Hello Julien, On Tue, 7 Feb 2023 23:09:40 +0100 Julien Olivain wrote: > diff --git a/package/openmpi-examples/Config.in b/package/openmpi-examples/Config.in > new file mode 100644 > index 0000000000..caaa02d802 > --- /dev/null > +++ b/package/openmpi-examples/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_OPENMPI_EXAMPLES > + bool "openmpi-examples" > + select BR2_PACKAGE_OPENMPI > + help > + This package includes the hello_c example from openmpi. It > + is mainly used as a simple openmpi program to test the > + libraries. It is also a recipe example for cross compiling > + an openmpi program with the mpicc wrappers. > diff --git a/package/openmpi-examples/openmpi-examples.hash b/package/openmpi-examples/openmpi-examples.hash > new file mode 120000 > index 0000000000..b8afe5e2d9 > --- /dev/null > +++ b/package/openmpi-examples/openmpi-examples.hash > @@ -0,0 +1 @@ > +../openmpi/openmpi.hash > \ No newline at end of file > diff --git a/package/openmpi-examples/openmpi-examples.mk b/package/openmpi-examples/openmpi-examples.mk > new file mode 100644 > index 0000000000..be679333c7 > --- /dev/null > +++ b/package/openmpi-examples/openmpi-examples.mk > @@ -0,0 +1,29 @@ > +################################################################################ > +# > +# openmpi-examples > +# > +################################################################################ > + > +OPENMPI_EXAMPLES_VERSION = $(OPENMPI_VERSION) > +OPENMPI_EXAMPLES_SOURCE = $(OPENMPI_SOURCE) > +OPENMPI_EXAMPLES_DL_SUBDIR = openmpi > +OPENMPI_EXAMPLES_SITE = $(OPENMPI_SITE) > +OPENMPI_EXAMPLES_LICENSE = $(OPENMPI_LINCENSE) > +OPENMPI_EXAMPLES_LICENSE_FILES = $(OPENMPI_LICENSE_FILES) Why is this a separate package? If those examples come with openmpi, then building the examples should be a suboption of the openmpi package. > +OPENMPI_EXAMPLES_DEPENDENCIES = openmpi > + > +define OPENMPI_EXAMPLES_BUILD_CMDS > + $(TARGET_MAKE_ENV) PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) OPAL_DESTDIR=$(STAGING_DIR)/usr \ Adding $(STAGING_DIR)/usr/bin in the PATH is a bad idea, as it contains a lot of tools/binaries cross-compiled for the target. > + mpicc \ > + $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ > + -o $(@D)/examples/hello_c \ > + $(@D)/examples/hello_c.c So either, we need to change things so that mpicc is installed to $(HOST_DIR), or you need to invoke it as $(STAGING_DIR)/usr/bin/mpicc. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Feb 21 11:29:11 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 12:29:11 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-synopsys-arc: drop locale Message-ID: <20230221112911.177963-1-fontaine.fabrice@gmail.com> locale is not enabled resulting in the following libcpprestsdk build failure: In file included from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/json.h:18, from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/pch/stdafx.h:88, from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/http/client/http_client_msg.cpp:13: /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/asyncrt_utils.h:317:13: error: 'locale_t' does not name a type 317 | typedef locale_t xplat_locale; | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e6778e60cc1ea455f5b4511d5824f04d8040f67b Signed-off-by: Fabrice Fontaine --- .../toolchain-external/toolchain-external-synopsys-arc/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in index c3483f331c..37c7b82644 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -4,7 +4,6 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC depends on BR2_HOSTARCH = "x86_64" select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP - select BR2_ENABLE_LOCALE select BR2_USE_WCHAR select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_NPTL -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 11:34:32 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 12:34:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build without C++ In-Reply-To: <20230221093719.5215ef5d@windsurf> References: <20230220231902.340496-1-fontaine.fabrice@gmail.com> <20230221093719.5215ef5d@windsurf> Message-ID: Le mar. 21 f?vr. 2023 ? 09:37, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > On Tue, 21 Feb 2023 00:19:02 +0100 > Fabrice Fontaine wrote: > > > Commit dedbc69022ba0beaf259463ac8082c86776f7e88 was incomplete resuling > > in the following build failure since the addition of the package in > > commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: > > > > -- Check for working CXX compiler: /usr/bin/c++ - broken > > CMake Error at > /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 > (message): > > The C++ compiler > > > > "/usr/bin/c++" > > > > is not able to compile a simple test program. > > > > It fails with the following output: > > > > Change Dir: > /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp > > > > Run Build Command(s):/home/autobuild/make/make -f Makefile > cmTC_bfb29/fast && make[1]: Entering directory > '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > > /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make > CMakeFiles/cmTC_bfb29.dir/build > > make[2]: Entering directory > '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > > Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o > > /usr/bin/c++ > --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE > -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c > /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx > > c++: error: unrecognized command-line option '-mlongcalls' > > c++: error: unrecognized command-line option '-mauto-litpools' > > make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: > CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 > > make[2]: Leaving directory > '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > > make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 > > make[1]: Leaving directory > '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' > > > > CMake will not be able to correctly generate this project. > > Call Stack (most recent call first): > > lib/msgpack-c/CMakeLists.txt:2 (project) > > > > While at it, add missing comment about C++ dependency for wasm > > > > Fixes: > > - > http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda > > > > Signed-off-by: Fabrice Fontaine > > --- > > .../fluent-bit/0003-fix-build-without-C.patch | 131 ++++++++++++++++++ > > package/fluent-bit/Config.in | 4 + > > 2 files changed, 135 insertions(+) > > create mode 100644 package/fluent-bit/0003-fix-build-without-C.patch > > Applied to master, thanks. > A build failure is raised when applying patch because of line ending in lib/snappy-fef67ac/CMakeLists.txt > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Tue Feb 21 11:50:01 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 12:50:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcre2: drop JIT sparc Message-ID: <20230221115001.190317-1-fontaine.fabrice@gmail.com> JIT sparc support has been dropped since version 10.41 and https://github.com/PCRE2Project/pcre2/commit/b67d5682019fd192a615a1d5ed254b564f54126b resulting in the following build failure since bump to version 10.42 in commit 64a03682cc1a90a311b2331224deac62f8c8940f: src/pcre2_jit_compile.c:82:2: error: #error Unsupported architecture 82 | #error Unsupported architecture | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/d8246c9e3e54547cdb7d94dcdbf376d292dfd787 Signed-off-by: Fabrice Fontaine --- package/pcre2/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pcre2/Config.in b/package/pcre2/Config.in index f06f1914f3..ba4719dd3d 100644 --- a/package/pcre2/Config.in +++ b/package/pcre2/Config.in @@ -29,7 +29,6 @@ config BR2_PACKAGE_PCRE2_JIT_ARCH_SUPPORTS default y if BR2_i386 || BR2_x86_64 default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el default y if BR2_powerpc - default y if BR2_sparc config BR2_PACKAGE_PCRE2_JIT bool "enable JIT support" -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 13:00:40 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 14:00:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: fix build with -Dmodem_manager=false Message-ID: <20230221130040.868693-1-fontaine.fabrice@gmail.com> Fix the following build failure with -Dmodem_manager=false raised since commit c36f6938858d3246ca493dacc925717586e2ea0f: ../output-1/build/network-manager-1.40.10/meson.build:1060:0: ERROR: Unknown variable "mobile_broadband_provider_info_database". Fixes: - http://autobuild.buildroot.org/results/896879c8e8ce022556ee834216ced2f962ff279c Signed-off-by: Fabrice Fontaine --- ...build-failure-with-Dmodem_manager-fa.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch diff --git a/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch b/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch new file mode 100644 index 0000000000..648be027e0 --- /dev/null +++ b/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch @@ -0,0 +1,38 @@ +From 736a2c356c1c4871e8c4e70be622c65c87d3bca8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 13:03:00 +0100 +Subject: [PATCH] meson.build: fix build failure with -Dmodem_manager=false + +Fix the following build failure with -Dmodem_manager=false raised since +https://gitlab.freedesktop.org/ffontaine/NetworkManager/-/commit/03ba04d4784fa4fc7ec31455070fb5ecf25ade23: + +../output-1/build/network-manager-1.40.10/meson.build:1060:0: ERROR: Unknown variable "mobile_broadband_provider_info_database". + +Fixes: + - http://autobuild.buildroot.org/results/896879c8e8ce022556ee834216ced2f962ff279c + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1544] +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 84ce52c736..b79240efc0 100644 +--- a/meson.build ++++ b/meson.build +@@ -1057,7 +1057,9 @@ output += ' jansson: ' + jansson_msg + '\n' + output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n' + output += ' nft: ' + config_h.get('NFT_PATH') + '\n' + output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n' +-output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' ++if enable_modem_manager ++ output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' ++endif + output += ' ofono: ' + enable_ofono.to_string() + '\n' + output += ' concheck: ' + enable_concheck.to_string() + '\n' + output += ' libteamdctl: ' + enable_teamdctl.to_string() + '\n' +-- +2.39.0 + -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 13:05:54 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 14:05:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/rdma-core: needs NPTL Message-ID: <20230221130554.871679-1-fontaine.fabrice@gmail.com> rdma-core unconditionally uses pthread_spin_lock since its addition in commit ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 resulting in the following build failure: /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/sh4-buildroot-linux-uclibc/12.2.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: CMakeFiles/hfi1verbs-rdmav34.dir/verbs.c.o: in function `post_recv': verbs.c:(.text+0xc4): undefined reference to `pthread_spin_lock' Fixes: - http://autobuild.buildroot.org/results/a943e03b79c4cc328b7712046ecff09706045f81 Signed-off-by: Fabrice Fontaine --- package/rdma-core/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rdma-core/Config.in b/package/rdma-core/Config.in index 59f5ef63ae..3360e6873d 100644 --- a/package/rdma-core/Config.in +++ b/package/rdma-core/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_RDMA_CORE depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 depends on !BR2_STATIC_LIBS # dlopen() - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_IPROUTE2 # runtime select BR2_PACKAGE_LIBNL help @@ -13,8 +13,8 @@ config BR2_PACKAGE_RDMA_CORE https://github.com/linux-rdma/rdma-core -comment "rdma-core needs a toolchain w/ headers >= 3.4, threads, dynamic library" +comment "rdma-core needs a toolchain w/ headers >= 3.4, NPTL, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \ - || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 13:30:41 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 14:30:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/ace: fix build with libressl >= 3.5.0 Message-ID: <20230221133041.963258-1-fontaine.fabrice@gmail.com> Fix the following build failure with libressl raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: /tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type 45 | static BIO_METHOD methods_ACE = | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb Signed-off-by: Fabrice Fontaine --- ...Asynch_BIO.cpp-fix-build-with-libres.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch diff --git a/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch b/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch new file mode 100644 index 0000000000..4f9fde5579 --- /dev/null +++ b/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch @@ -0,0 +1,56 @@ +From 82b139f921ddb549c1bd236030bbc86e314852b3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 14:20:11 +0100 +Subject: [PATCH] ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >= + 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +/tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type + 45 | static BIO_METHOD methods_ACE = + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/DOCGroup/ACE_TAO/pull/2053] +--- + ACE/ace/SSL/SSL_Asynch_BIO.cpp | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp +index 0faa775fc0..5543598873 100644 +--- a/ace/SSL/SSL_Asynch_BIO.cpp ++++ b/ace/SSL/SSL_Asynch_BIO.cpp +@@ -41,7 +41,8 @@ extern "C" + + #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK ) + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + static BIO_METHOD methods_ACE = + { + BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER, +@@ -68,14 +69,15 @@ static BIO_METHOD methods_ACE = + #else + static BIO_METHOD* methods_ACE; + # define BIO_set_num(b, val) +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ ++#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) */ + + ACE_BEGIN_VERSIONED_NAMESPACE_DECL + + BIO * + ACE_SSL_make_BIO (void * ssl_asynch_stream) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + BIO * const pBIO = BIO_new (&methods_ACE); + #else + if (!methods_ACE) +-- +2.39.0 + -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 13:36:08 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 14:36:08 +0100 Subject: [Buildroot] [PATCH 1/1] support/dependencies/dependencies.sh: require FileHandle perl package for ace Message-ID: <20230221133608.966158-1-fontaine.fabrice@gmail.com> ace needs FileHandle module: Can't locate FileHandle.pm in @INC (you may need to install the FileHandle module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/ace-7.0.6/MPC/prj_install.pl line 17. BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/ace-7.0.6/MPC/prj_install.pl line 17. Fixes: - http://autobuild.buildroot.org/results/9dee7c09fd7b41d276df0285a0f3dcae1a71f041 Signed-off-by: Fabrice Fontaine --- support/dependencies/dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index a692856d31..078559f086 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -298,7 +298,7 @@ if grep -q -E '^BR2_PACKAGE_(WEBKITGTK|WPEWEBKIT)=y' $BR2_CONFIG ; then required_perl_modules="${required_perl_modules} JSON::PP" fi -if grep -q ^BR2_TARGET_SYSLINUX=y $BR2_CONFIG ; then +if grep -q -E '^BR2_(PACKAGE_ACE|TARGET_SYSLINUX)=y' $BR2_CONFIG ; then required_perl_modules="$required_perl_modules FileHandle" fi -- 2.39.0 From thomas.petazzoni at bootlin.com Tue Feb 21 13:47:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 14:47:18 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: fix line endings in part of 0003-fix-build-without-C.patch Message-ID: <20230221135006.DD0E7865EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c6e45f7eb4981810883961dd3af37ec0dc9d229 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/894/894cd923baa25643d9aea21678c4bca105e86b45/ Reported-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/fluent-bit/0003-fix-build-without-C.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/fluent-bit/0003-fix-build-without-C.patch b/package/fluent-bit/0003-fix-build-without-C.patch index 3bc5f46de9..0f0b239216 100644 --- a/package/fluent-bit/0003-fix-build-without-C.patch +++ b/package/fluent-bit/0003-fix-build-without-C.patch @@ -1,4 +1,4 @@ -From 014e44808ebaf29b0c25b5a3fa2e35a99a30f628 Mon Sep 17 00:00:00 2001 +From f2aeca6fcc37bf22dd7307cab8fc9db6b53dd652 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 00:09:57 +0100 Subject: [PATCH] fix build without C++ @@ -99,12 +99,12 @@ index 8bb1e9598..ae9225c49 100644 --- a/lib/snappy-fef67ac/CMakeLists.txt +++ b/lib/snappy-fef67ac/CMakeLists.txt @@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 2.8) --project(snappy-c) -+project(snappy-c C) - - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - + cmake_minimum_required(VERSION 2.8) +-project(snappy-c) ++project(snappy-c C) + + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + diff --git a/lib/tutf8e/CMakeLists.txt b/lib/tutf8e/CMakeLists.txt index 35cbe01ad..a056ef83c 100644 --- a/lib/tutf8e/CMakeLists.txt @@ -127,5 +127,5 @@ index 8c5d70d13..de2c2fe38 100644 include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -- -2.39.0 +2.39.1 From thomas.petazzoni at bootlin.com Tue Feb 21 13:50:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 14:50:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluent-bit: fix build without C++ In-Reply-To: References: <20230220231902.340496-1-fontaine.fabrice@gmail.com> <20230221093719.5215ef5d@windsurf> Message-ID: <20230221145035.363e3b06@windsurf> On Tue, 21 Feb 2023 12:34:32 +0100 Fabrice Fontaine wrote: > A build failure is raised when applying patch because of line ending in > lib/snappy-fef67ac/CMakeLists.txt Thanks for pointing this out. Fixed in https://gitlab.com/buildroot.org/buildroot/-/commit/5c6e45f7eb4981810883961dd3af37ec0dc9d229 Best regards, Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Feb 21 13:56:58 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 14:56:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/nut: ensure time_t is defined Message-ID: <20230221135658.1489271-1-fontaine.fabrice@gmail.com> Ensure time_t is defined to fix the following collectd build failure on musl: src/nut.c:40:2: error: #error "Unable to determine the UPS connection type." 40 | #error "Unable to determine the UPS connection type." | ^~~~~ src/nut.c:46:3: error: unknown type name 'collectd_upsconn_t' 46 | collectd_upsconn_t *conn; | ^~~~~~~~~~~~~~~~~~ libupsclient is an optional dependency of nut plugin since version 5.10.0 of collectd and https://github.com/collectd/collectd/commit/bc2d94024d0250211c1e498db1b43bb4525324da Fixes: - http://autobuild.buildroot.org/results/22b758097e8fb72c68e41329cbc7abc748d81ca6 Signed-off-by: Fabrice Fontaine --- ...upsclient-h-ensure-time_t-is-defined.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch diff --git a/package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch b/package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch new file mode 100644 index 0000000000..c9fb04b8cd --- /dev/null +++ b/package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch @@ -0,0 +1,35 @@ +From cafd77993ec5e16634b774b65bf6da9b34a21fc5 Mon Sep 17 00:00:00 2001 +From: Jim Klimov +Date: Wed, 31 Aug 2022 11:24:19 +0200 +Subject: [PATCH] clients/upsclient.h: ensure time_t is defined + +[Retrieved from: +https://github.com/networkupstools/nut/commit/cafd77993ec5e16634b774b65bf6da9b34a21fc5] +Signed-off-by: Fabrice Fontaine +--- + clients/upsclient.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/clients/upsclient.h b/clients/upsclient.h +index 08574b8f8b..e346d8f519 100644 +--- a/clients/upsclient.h ++++ b/clients/upsclient.h +@@ -41,6 +41,18 @@ + #include + #endif + ++/* Not including NUT timehead.h because this is part of end-user API */ ++#ifdef TIME_WITH_SYS_TIME ++# include ++# include ++#else ++# ifdef HAVE_SYS_TIME_H ++# include ++# else ++# include ++# endif ++#endif ++ + #ifdef __cplusplus + /* *INDENT-OFF* */ + extern "C" { -- 2.39.0 From thomas.petazzoni at bootlin.com Tue Feb 21 14:01:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 15:01:22 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-synopsys-arc: drop locale In-Reply-To: <20230221112911.177963-1-fontaine.fabrice@gmail.com> References: <20230221112911.177963-1-fontaine.fabrice@gmail.com> Message-ID: <20230221150122.63e353f7@windsurf> On Tue, 21 Feb 2023 12:29:11 +0100 Fabrice Fontaine wrote: > locale is not enabled resulting in the following libcpprestsdk build > failure: > > In file included from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/json.h:18, > from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/pch/stdafx.h:88, > from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/http/client/http_client_msg.cpp:13: > /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/asyncrt_utils.h:317:13: error: 'locale_t' does not name a type > 317 | typedef locale_t xplat_locale; > | ^~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/e6778e60cc1ea455f5b4511d5824f04d8040f67b > > Signed-off-by: Fabrice Fontaine The thing is that the toolchain claims to have locale support: $ grep LOCALE output/host/opt/ext-toolchain/arc-snps-linux-uclibc/sysroot/usr/include/bits/uClibc_config.h #define __UCLIBC_HAS_LOCALE__ 1 #define __UCLIBC_BUILD_MINIMAL_LOCALE__ 1 #undef __UCLIBC_BUILD_ALL_LOCALE__ #define __UCLIBC_BUILD_MINIMAL_LOCALES__ "en_US" #undef __UCLIBC_HAS_XLOCALE__ Are you sure your commit doesn't break the build? Indeed normally for external toolchains, we verify that the Buildroot configuration matches the toolchain, and abort the build if not. So if the toolchain supports locale (which it does here according to __UCLIBC_HAS_LOCALE__) but your Buildroot configuration doesn't say so, the build should normally abort with: XYZ available in C library, please enable ABC See in toolchains/helpers.mk: check_uclibc_feature = \ IS_IN_LIBC=`grep -q "\#define $(1) 1" $(3) && echo y` ; \ if [ -z "$(2)" ] ; then \ if [ "$${IS_IN_LIBC}" != "y" ] ; then \ echo "$(4) not available in C library, toolchain unsuitable for Buildroot" ; \ exit 1 ; \ fi ; \ else \ if [ "$($(2))" != "y" -a "$${IS_IN_LIBC}" = "y" ] ; then \ echo "$(4) available in C library, please enable $(2)" ; \ exit 1 ; \ fi ; \ if [ "$($(2))" = "y" -a "$${IS_IN_LIBC}" != "y" ] ; then \ echo "$(4) not available in C library, please disable $(2)" ; \ exit 1 ; \ fi ; \ fi check_uclibc = \ [...] $(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Feb 21 14:09:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 15:09:47 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-synopsys-arc: drop locale In-Reply-To: <20230221150122.63e353f7@windsurf> References: <20230221112911.177963-1-fontaine.fabrice@gmail.com> <20230221150122.63e353f7@windsurf> Message-ID: Le mar. 21 f?vr. 2023 ? 15:01, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > On Tue, 21 Feb 2023 12:29:11 +0100 > Fabrice Fontaine wrote: > > > locale is not enabled resulting in the following libcpprestsdk build > > failure: > > > > In file included from > /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/json.h:18, > > from > /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/pch/stdafx.h:88, > > from > /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/http/client/http_client_msg.cpp:13: > > > /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/asyncrt_utils.h:317:13: > error: 'locale_t' does not name a type > > 317 | typedef locale_t xplat_locale; > > | ^~~~~~~~ > > > > Fixes: > > - > http://autobuild.buildroot.org/results/e6778e60cc1ea455f5b4511d5824f04d8040f67b > > > > Signed-off-by: Fabrice Fontaine > > The thing is that the toolchain claims to have locale support: > > $ grep LOCALE > output/host/opt/ext-toolchain/arc-snps-linux-uclibc/sysroot/usr/include/bits/uClibc_config.h > > #define __UCLIBC_HAS_LOCALE__ 1 > #define __UCLIBC_BUILD_MINIMAL_LOCALE__ 1 > #undef __UCLIBC_BUILD_ALL_LOCALE__ > #define __UCLIBC_BUILD_MINIMAL_LOCALES__ "en_US" > #undef __UCLIBC_HAS_XLOCALE__ > I think the issue is that __UCLIBC_HAS_XLOCALE__ is disabled. To my understanding, locale_t is defined in xlocale.h: https://github.com/wbx-github/uclibc-ng/blob/ab1dd83bec59c9e65c31efd6e887182948f627be/include/xlocale.h#L46 I'm far from being an expert in locale/uclibc-ng so I'm a bit lost between all those variables ... In uclibc.mk, we're enabling UCLIBC_HAS_XLOCALE in UCLIBC_LOCALE_CONFIG hook. > > Are you sure your commit doesn't break the build? Indeed normally for > external toolchains, we verify that the Buildroot configuration matches > the toolchain, and abort the build if not. So if the toolchain supports > locale (which it does here according to __UCLIBC_HAS_LOCALE__) but your > Buildroot configuration doesn't say so, the build should normally abort > with: > > XYZ available in C library, please enable ABC > > See in toolchains/helpers.mk: > > check_uclibc_feature = \ > IS_IN_LIBC=`grep -q "\#define $(1) 1" $(3) && echo y` ; \ > if [ -z "$(2)" ] ; then \ > if [ "$${IS_IN_LIBC}" != "y" ] ; then \ > echo "$(4) not available in C library, toolchain > unsuitable for Buildroot" ; \ > exit 1 ; \ > fi ; \ > else \ > if [ "$($(2))" != "y" -a "$${IS_IN_LIBC}" = "y" ] ; then \ > echo "$(4) available in C library, please enable > $(2)" ; \ > exit 1 ; \ > fi ; \ > if [ "$($(2))" = "y" -a "$${IS_IN_LIBC}" != "y" ] ; then \ > echo "$(4) not available in C library, please > disable $(2)" ; \ > exit 1 ; \ > fi ; \ > fi > > check_uclibc = \ > [...] > $(call > check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale > support) ;\ > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From gwenj at trabucayre.com Tue Feb 21 13:30:54 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Tue, 21 Feb 2023 14:30:54 +0100 Subject: [Buildroot] [PATCH] package/volk: bump version to 3.0.0 Message-ID: <1676986254-52744-1-git-send-email-gwenj@trabucayre.com> From: Gwenhael Goavec-Merou Remove GPL-3.0+ license, no more COPYING-LGPL: merged into COPYING Signed-off-by: Gwenhael Goavec-Merou --- package/volk/volk.hash | 5 ++--- package/volk/volk.mk | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/volk/volk.hash b/package/volk/volk.hash index 4c62c6d315..8047a68bab 100644 --- a/package/volk/volk.hash +++ b/package/volk/volk.hash @@ -1,4 +1,3 @@ # Locally computed -sha256 eff53206cd1ec3314755e0b2bde3c7aaea21dd0f0ad8d753bff07d98e93ddee2 volk-2.5.2.tar.xz -sha256 6dcdafa9e750545f5f65c2e6f53820184822db728ac2b8bfe1d4a47da09ec0d6 COPYING -sha256 258f450f060a161fb9f9e2e7c07c6b1ee73e5142297e6792dc1ee76b028cf0ca COPYING-LGPL +sha256 88fd80638a3683f23a8cae6c551a8cfe9ea55735c701846f3eeeeeea8a14f6a3 volk-3.0.0.tar.xz +sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING diff --git a/package/volk/volk.mk b/package/volk/volk.mk index af5bd4306b..c9c098f237 100644 --- a/package/volk/volk.mk +++ b/package/volk/volk.mk @@ -4,13 +4,13 @@ # ################################################################################ -VOLK_VERSION = 2.5.2 +VOLK_VERSION = 3.0.0 VOLK_SITE = https://github.com/gnuradio/volk/releases/download/v$(VOLK_VERSION) VOLK_SOURCE = volk-$(VOLK_VERSION).tar.xz # See https://github.com/gnuradio/volk/tree/v2.5.1#license for some # details on the licensing. -VOLK_LICENSE = GPL-3.0+, LGPL-3.0+ -VOLK_LICENSE_FILES = COPYING COPYING-LGPL +VOLK_LICENSE = LGPL-3.0+ +VOLK_LICENSE_FILES = COPYING VOLK_SUPPORTS_IN_SOURCE_BUILD = NO -- 2.30.2 From thomas.petazzoni at bootlin.com Tue Feb 21 14:21:00 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 15:21:00 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-synopsys-arc: drop locale In-Reply-To: References: <20230221112911.177963-1-fontaine.fabrice@gmail.com> <20230221150122.63e353f7@windsurf> Message-ID: <20230221152100.27549e20@windsurf> On Tue, 21 Feb 2023 15:09:47 +0100 Fabrice Fontaine wrote: > I think the issue is that __UCLIBC_HAS_XLOCALE__ is disabled. > To my understanding, locale_t is defined in xlocale.h: > https://github.com/wbx-github/uclibc-ng/blob/ab1dd83bec59c9e65c31efd6e887182948f627be/include/xlocale.h#L46 Possible indeed. There are newer versions of the ARC toolchain available at https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases, but I checked the latest and it still has xlocale disabled. One option is to ask the ARC/Synopsys people to enable XLOCALE in their uClibc configuration. Another option is to drop the ARC/Synopsys toolchain entirely. A third option is to change the check done by Buildroot to verify __UCLIBC_HAS_XLOCALE__ instead of __UCLIBC_HAS_LOCALE__. This way it will be valid to say that the ARC toolchain does not have locale support. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Feb 21 14:21:44 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 15:21:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast Message-ID: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> systemd can't be built with -Ofast since version 252 and https://github.com/systemd/systemd/commit/60f97fee2d2f948c8e8963ea8ff767008cb93cae resulting in the following build failure since bump to version 252.4 in commit a2c823d1f548d5a0120d27d6c000603192360f7b: ../output-1/build/systemd-252.4/meson.build:397:8: ERROR: Problem encountered: -Ofast, -ffast-math, or -ffinite-math-only is specified in c_args. While at it, revert changes made by commit 9cd084b54e2223e49c37962b0cbefae7bea26ef5 Fixes: - http://autobuild.buildroot.org/results/8f41c4984b645851724e554c3162b83bc312bee7 Signed-off-by: Fabrice Fontaine --- package/systemd/Config.in | 1 + package/systemd/systemd.mk | 5 ----- system/Config.in | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 9f4d933779..5bbdbb405f 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -25,6 +25,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd + depends on !BR2_OPTIMIZE_FAST select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime select BR2_PACKAGE_LIBCAP diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index cce9162f6d..edba8c2677 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -98,11 +98,6 @@ SYSTEMD_CONF_OPTS += \ -Dtmpfiles=true \ -Dumount-path=/usr/bin/umount -SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_OPTIMIZE_FAST),y) -SYSTEMD_CFLAGS += -O3 -endif - ifeq ($(BR2_nios2),y) # Nios2 ld emits warnings, make warnings not to be treated as errors SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings diff --git a/system/Config.in b/system/Config.in index 1ca7690ea3..8a8b198fcd 100644 --- a/system/Config.in +++ b/system/Config.in @@ -127,6 +127,7 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 + depends on !BR2_OPTIMIZE_FAST select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT @@ -140,6 +141,9 @@ comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and targe !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 +comment "systemd can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST + comment "systemd highly recommends Linux >= 4.15" depends on BR2_INIT_SYSTEMD depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 14:29:19 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 15:29:19 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-synopsys-arc: drop locale In-Reply-To: <20230221152100.27549e20@windsurf> References: <20230221112911.177963-1-fontaine.fabrice@gmail.com> <20230221150122.63e353f7@windsurf> <20230221152100.27549e20@windsurf> Message-ID: Le mar. 21 f?vr. 2023 ? 15:21, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > On Tue, 21 Feb 2023 15:09:47 +0100 > Fabrice Fontaine wrote: > > > I think the issue is that __UCLIBC_HAS_XLOCALE__ is disabled. > > To my understanding, locale_t is defined in xlocale.h: > > > https://github.com/wbx-github/uclibc-ng/blob/ab1dd83bec59c9e65c31efd6e887182948f627be/include/xlocale.h#L46 > > Possible indeed. There are newer versions of the ARC toolchain > available at > https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases > , > but I checked the latest and it still has xlocale disabled. > > One option is to ask the ARC/Synopsys people to enable XLOCALE in their > uClibc configuration. > I added a comment to an issue opened in 2020: https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/issues/241 > > Another option is to drop the ARC/Synopsys toolchain entirely. > > A third option is to change the check done by Buildroot to verify > __UCLIBC_HAS_XLOCALE__ instead of __UCLIBC_HAS_LOCALE__. This way it > will be valid to say that the ARC toolchain does not have locale > support. > I'll send a patch. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Tue Feb 21 14:35:33 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 15:35:33 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/helpers.mk: fix uclibc locale support Message-ID: <20230221143533.1510153-1-fontaine.fabrice@gmail.com> locale_t is defined by uclibc in xlocale.h: https://github.com/wbx-github/uclibc-ng/blob/ab1dd83bec59c9e65c31efd6e887182948f627be/include/xlocale.h#L46 As a result, without xlocale, locale is not fully enabled which will result in the following build failure with toolchain-external-synopsys-arc and libcpprestsdk: In file included from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/json.h:18, from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/pch/stdafx.h:88, from /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/src/http/client/http_client_msg.cpp:13: /home/thomas/autobuild/instance-0/output-1/build/libcpprestsdk-2.10.18/Release/include/cpprest/asyncrt_utils.h:317:13: error: 'locale_t' does not name a type 317 | typedef locale_t xplat_locale; | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e6778e60cc1ea455f5b4511d5824f04d8040f67b Signed-off-by: Fabrice Fontaine --- toolchain/helpers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index f8fc933914..601a64f191 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -307,7 +307,7 @@ check_uclibc = \ $(call check_uclibc_feature,__UCLIBC_HAS_LFS__,,$${UCLIBC_CONFIG_FILE},Large file support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_NATIVE_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\ - $(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ + $(call check_uclibc_feature,__UCLIBC_HAS_XLOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support) ;\ $(call check_uclibc_feature,__PTHREADS_DEBUG_SUPPORT__,BR2_TOOLCHAIN_HAS_THREADS_DEBUG,$${UCLIBC_CONFIG_FILE},Thread debugging support) ;\ -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 14:45:05 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 15:45:05 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add ubi handling Message-ID: <20230221144505.1515495-1-fontaine.fabrice@gmail.com> Add a custom case to make sure that a random configuration with an empty configuration file for ubi doesn't fail. ubinize: error!: no sections found the ini-file "/home/buildroot/autobuild/instance-2/output-1/build/ubinize.cfg" Fixes: - http://autobuild.buildroot.org/results/f678c17cc4df06fb2737467e769cd8f72a3ea420 Signed-off-by: Fabrice Fontaine --- utils/genrandconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index dbace1b07f..d192c5b324 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -508,6 +508,12 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_ROOTFS_F2FS_SIZE="100M"\n') configlines.append('BR2_TARGET_ROOTFS_F2FS_SIZE="%s"\n' % ROOTFS_SIZE) + if 'BR2_TARGET_ROOTFS_UBI=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE=""\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y\n') + configlines.remove('BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE=""\n') + if 'BR2_TARGET_S500_BOOTLOADER=y\n' in configlines and \ 'BR2_TARGET_S500_BOOTLOADER_BOARD=""\n' in configlines: return False -- 2.39.0 From thomas.petazzoni at bootlin.com Tue Feb 21 14:48:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 15:48:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast In-Reply-To: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> References: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> Message-ID: <20230221154827.7e737960@windsurf> Hello Fabrice, On Tue, 21 Feb 2023 15:21:44 +0100 Fabrice Fontaine wrote: > systemd can't be built with -Ofast since version 252 and > https://github.com/systemd/systemd/commit/60f97fee2d2f948c8e8963ea8ff767008cb93cae > resulting in the following build failure since bump to version 252.4 in > commit a2c823d1f548d5a0120d27d6c000603192360f7b: > > ../output-1/build/systemd-252.4/meson.build:397:8: ERROR: Problem encountered: -Ofast, -ffast-math, or -ffinite-math-only is specified in c_args. > > While at it, revert changes made by commit 9cd084b54e2223e49c37962b0cbefae7bea26ef5 > > Fixes: > - http://autobuild.buildroot.org/results/8f41c4984b645851724e554c3162b83bc312bee7 > > Signed-off-by: Fabrice Fontaine > --- > package/systemd/Config.in | 1 + > package/systemd/systemd.mk | 5 ----- > system/Config.in | 4 ++++ > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index 9f4d933779..5bbdbb405f 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -25,6 +25,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd > + depends on !BR2_OPTIMIZE_FAST I really dislike this. > -SYSTEMD_CFLAGS = $(TARGET_CFLAGS) > -ifeq ($(BR2_OPTIMIZE_FAST),y) > -SYSTEMD_CFLAGS += -O3 > -endif And this should work. It's really systemd that is stupid to look for -Ofast in c_flags without seeing that -O3 later overrides it. 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 Feb 21 14:49:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 15:49:40 +0100 Subject: [Buildroot] [PATCH] package/volk: bump version to 3.0.0 In-Reply-To: <1676986254-52744-1-git-send-email-gwenj@trabucayre.com> References: <1676986254-52744-1-git-send-email-gwenj@trabucayre.com> Message-ID: <20230221154940.17aa2764@windsurf> On Tue, 21 Feb 2023 14:30:54 +0100 Gwenhael Goavec-Merou wrote: > From: Gwenhael Goavec-Merou > > Remove GPL-3.0+ license, no more COPYING-LGPL: merged into COPYING Do you have some source information on the removal of GPL-3.0+ ? > # See https://github.com/gnuradio/volk/tree/v2.5.1#license for some > # details on the licensing. Is this comment still up to date? Probably not based on the URL of the link :) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Feb 21 15:11:28 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 16:11:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl_433: fix build without threads Message-ID: <20230221151128.1926887-1-fontaine.fabrice@gmail.com> Fix the following build failure without threads raised since bump to version 22.11 in commit 6f848c068f8ab0cc67fb48582e00221158ddc8cb: In file included from /home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/src/data_tag.c:17: /home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/include/mongoose.h:407:10: fatal error: pthread.h: No such file or directory 407 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/9f1677fc5a4568be0b9c121060c5d821ac2ae21b Signed-off-by: Fabrice Fontaine --- ...r-Fix-mongoose-build-without-threads.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch diff --git a/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch b/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch new file mode 100644 index 0000000000..85bc45147a --- /dev/null +++ b/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch @@ -0,0 +1,42 @@ +From 707b51ecbc5598eed2fb67962232bf3fe0e96f81 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 27 Dec 2022 21:30:54 +0100 +Subject: [PATCH] minor: Fix mongoose build without threads (#2291) + +Fix the following build failure without threads: + +In file included from /home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/src/data_tag.c:17: +/home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/include/mongoose.h:407:10: fatal error: pthread.h: No such file or directory + 407 | #include + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/9f1677fc5a4568be0b9c121060c5d821ac2ae21b + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/707b51ecbc5598eed2fb67962232bf3fe0e96f81] +--- + include/mongoose.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/mongoose.h b/include/mongoose.h +index 1173b3fc7..b111ea34e 100644 +--- a/include/mongoose.h ++++ b/include/mongoose.h +@@ -404,7 +404,6 @@ unsigned int sleep(unsigned int seconds); + #include + #include + #include +-#include + #include + #include + #include +@@ -4658,6 +4657,7 @@ size_t mg_fwrite(const void *ptr, size_t size, size_t count, FILE *f); + #endif /* MG_ENABLE_FILESYSTEM */ + + #if MG_ENABLE_THREADS ++#include + /* + * Starts a new detached thread. + * Arguments and semantics are the same as pthead's `pthread_create()`. -- 2.39.0 From gwenj at trabucayre.com Tue Feb 21 14:40:18 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Tue, 21 Feb 2023 15:40:18 +0100 Subject: [Buildroot] [PATCH v2] package/volk: bump version to 3.0.0 Message-ID: <1676990418-53157-1-git-send-email-gwenj@trabucayre.com> From: Gwenhael Goavec-Merou As mentionned into release message [1], github license page [2] and announce [3], this release is primarly dedicated to fully removing GPL-3.0+ license, no more COPYING-LGPL: merged into COPYING [1]: https://github.com/gnuradio/volk/releases/tag/v3.0.0 [2]: https://github.com/gnuradio/volk/tree/v3.0.0#license [3]: https://lists.gnu.org/archive/html/discuss-gnuradio/2023-01/msg00046.html Signed-off-by: Gwenhael Goavec-Merou --- Changes v1 -> v2: - update commit message with links related to GPL-3.0+ license removing - remove .mk note about license details --- package/volk/volk.hash | 5 ++--- package/volk/volk.mk | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package/volk/volk.hash b/package/volk/volk.hash index 4c62c6d315..8047a68bab 100644 --- a/package/volk/volk.hash +++ b/package/volk/volk.hash @@ -1,4 +1,3 @@ # Locally computed -sha256 eff53206cd1ec3314755e0b2bde3c7aaea21dd0f0ad8d753bff07d98e93ddee2 volk-2.5.2.tar.xz -sha256 6dcdafa9e750545f5f65c2e6f53820184822db728ac2b8bfe1d4a47da09ec0d6 COPYING -sha256 258f450f060a161fb9f9e2e7c07c6b1ee73e5142297e6792dc1ee76b028cf0ca COPYING-LGPL +sha256 88fd80638a3683f23a8cae6c551a8cfe9ea55735c701846f3eeeeeea8a14f6a3 volk-3.0.0.tar.xz +sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING diff --git a/package/volk/volk.mk b/package/volk/volk.mk index af5bd4306b..67475d5c90 100644 --- a/package/volk/volk.mk +++ b/package/volk/volk.mk @@ -4,13 +4,11 @@ # ################################################################################ -VOLK_VERSION = 2.5.2 +VOLK_VERSION = 3.0.0 VOLK_SITE = https://github.com/gnuradio/volk/releases/download/v$(VOLK_VERSION) VOLK_SOURCE = volk-$(VOLK_VERSION).tar.xz -# See https://github.com/gnuradio/volk/tree/v2.5.1#license for some -# details on the licensing. -VOLK_LICENSE = GPL-3.0+, LGPL-3.0+ -VOLK_LICENSE_FILES = COPYING COPYING-LGPL +VOLK_LICENSE = LGPL-3.0+ +VOLK_LICENSE_FILES = COPYING VOLK_SUPPORTS_IN_SOURCE_BUILD = NO -- 2.30.2 From fontaine.fabrice at gmail.com Tue Feb 21 15:27:22 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 16:27:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/janet: needs gcc >= 4.9 Message-ID: <20230221152722.2418893-1-fontaine.fabrice@gmail.com> janet needs gcc >= 4.9 for stdatomic.h since version 1.26.0 and https://github.com/janet-lang/janet/commit/bfcfd58259911b92ff516bab9216831b34653805 resulting in the following build failure since commit 5c6f32bd255fc97823d464beacfa905a141066ec: src/core/abstract.c:35:23: fatal error: stdatomic.h: No such file or directory Fixes: - http://autobuild.buildroot.org/results/a2b40adb93b751221ba2cdf9a705f86c30499021 Signed-off-by: Fabrice Fontaine --- package/janet/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/janet/Config.in b/package/janet/Config.in index 0e25ce34e3..7b78c14bf4 100644 --- a/package/janet/Config.in +++ b/package/janet/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_JANET bool "janet" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h help Janet is a functional and imperative programming language. The entire language (core library, interpreter, compiler, @@ -8,3 +9,6 @@ config BR2_PACKAGE_JANET and two headers. https://janet-lang.org/ + +comment "janet needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 15:48:45 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 16:48:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/janet: fix build without threads Message-ID: <20230221154845.2896796-1-fontaine.fabrice@gmail.com> Fix the following build failure without threads raised since bump to version 1.26.0 in commit 5c6f32bd255fc97823d464beacfa905a141066ec: ffi.c:(.text+0x9d8): undefined reference to `janet_abstract_threaded' Fixes: - http://autobuild.buildroot.org/results/20108e76990d8af7f47d474eadbbea8562ef6728 Signed-off-by: Fabrice Fontaine --- .../0001-Update-for-more-minimal-builds.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/janet/0001-Update-for-more-minimal-builds.patch diff --git a/package/janet/0001-Update-for-more-minimal-builds.patch b/package/janet/0001-Update-for-more-minimal-builds.patch new file mode 100644 index 0000000000..ba36a9beba --- /dev/null +++ b/package/janet/0001-Update-for-more-minimal-builds.patch @@ -0,0 +1,29 @@ +From 746ff5307d309536984b648460e7b5c5dac44453 Mon Sep 17 00:00:00 2001 +From: Calvin Rose +Date: Sun, 12 Feb 2023 12:14:11 -0600 +Subject: [PATCH] Update for more minimal builds. + +[Retrieved (and backported) from: +https://github.com/janet-lang/janet/commit/746ff5307d309536984b648460e7b5c5dac44453] +Signed-off-by: Fabrice Fontaine +--- + src/core/ffi.c | 4 ++++ + src/core/marsh.c | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/core/ffi.c b/src/core/ffi.c +index 45a498c7..b453f1f6 100644 +--- a/src/core/ffi.c ++++ b/src/core/ffi.c +@@ -1311,7 +1311,11 @@ JANET_CORE_FN(cfun_ffi_jitfn, + size_t alloc_size = ((size_t) bytes.len + FFI_PAGE_MASK) & ~FFI_PAGE_MASK; + + #ifdef JANET_FFI_JIT ++#ifdef JANET_EV + JanetFFIJittedFn *fn = janet_abstract_threaded(&janet_type_ffijit, sizeof(JanetFFIJittedFn)); ++#else ++ JanetFFIJittedFn *fn = janet_abstract(&janet_type_ffijit, sizeof(JanetFFIJittedFn)); ++#endif + fn->function_pointer = NULL; + fn->size = 0; + #ifdef JANET_WINDOWS -- 2.39.0 From thomas at devoogdt.com Tue Feb 21 15:52:49 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 21 Feb 2023 16:52:49 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge In-Reply-To: <6d000223-f440-43bb-b9ba-2144375776be@korsgaard.com> References: <20230220090923.2155635-1-thomas.devoogdt@barco.com> <20230220090923.2155635-2-thomas.devoogdt@barco.com> <87edqkz1yv.fsf@dell.be.48ers.dk> <20230220214958.19d88af8@windsurf> <6d000223-f440-43bb-b9ba-2144375776be@korsgaard.com> Message-ID: Hi The reason for this patch was to fix this bug: ``` Package 'atk-bridge-2.0', required by 'gtk+-3.0', not found Package atk-bridge-2.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `atk-bridge-2.0.pc' to the PKG_CONFIG_PATH environment variable ``` Right now, the upstream 2.38.5 is not compiling (or at least not my branch which is rebased on 2023.02-rc1). So it will be important to have the proposed patch series from Thomas Petazzoni merged into the master before 2023.02 lands. My original patch can be dropped then. Also, it would require Xorg to be built, even if build for e.g. Wayland. Unfortunately, I could not apply the patch series myself due to some weird encoding (UTF-16?). But if I find out how to do that, then I can double-check. Kr, Thomas ``` >>> webkitgtk 2.38.5 Building PATH="/home/thomas/buildroot/output/host/bin:/home/thomas/buildroot/output/host/sbin:/home/thomas/.local/bin:/home/thomas/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin:/home/thomas/.dotnet/tools:/home/thomas/.local/bin" /usr/bin/cmake --build /home/thomas/buildroot/output/build/webkitgtk-2.38.5/ [773/5265] Generating ../../WebCore/DerivedSources/CSSProperties.jso..., ../../WebCore/DerivedSources/CSSStyleDeclaration+PropertyNames.idl 1 input keys have identical hash values, examine output carefully... [995/5265] Building CXX object Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/API/glib/JSCOptions.cpp.o /home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/JavaScriptCore/API/glib/JSCOptions.cpp: In function ?GOptionGroup* jsc_options_get_option_group()?: /home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/JavaScriptCore/API/glib/JSCOptions.cpp:703:84: warning: cast from ?gchar*? {aka ?char*?} to ?GOptionEntry*? {aka ?_GOptionEntry*?} increases required alignment of target type [-Wcast-align] g_option_group_add_entries(group, reinterpret_cast(entries->data)); ^ [1910/5265] Building CXX object Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o FAILED: Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o /home/thomas/buildroot/output/host/bin/arm-linux-g++ --sysroot=/home/thomas/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot -DBUILDING_GTK__=1 -DBUILDING_PAL -DBUILDING_WITH_CMAKE=1 -DGETTEXT_PACKAGE=\"WebKit2GTK-4.1\" -DHAVE_CONFIG_H=1 -DJSC_GLIB_API_ENABLED -DPAS_BMALLOC=1 -DWEBKITGTK_API_VERSION_STRING=\"4.1\" -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5 -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/PAL/DerivedSources -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/crypto -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/system -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/text -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/JavaScriptCore/Headers -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/JavaScriptCore/PrivateHeaders -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/JavaScriptCoreGLib/Headers -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/JavaScriptCoreGLib/DerivedSources -I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/WTF/Headers -fdiagnostics-color=always -Wextra -Wall -pipe -Wno-odr -Wno-stringop-overflow -Wno-nonnull -Wno-array-bounds -Wno-expansion-to-defined -Wno-noexcept-type -Wno-psabi -Wno-misleading-indentation -Wno-maybe-uninitialized -Wwrite-strings -Wundef -Wpointer-arith -Wmissing-format-attribute -Wformat-security -Wcast-align -Wno-tautological-compare -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -fno-strict-aliasing -fno-exceptions -fno-rtti -DNDEBUG -fPIC -fvisibility=hidden -std=c++2a -MD -MT Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o -MF Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o.d -o Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o -c /home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/text/TextCodecICU.cpp In file included from /home/thomas/buildroot/output/build/webkitgtk-2.38.5/WTF/Headers/wtf/URL.h:31, from /home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/text/TextEncoding.h:29, from /home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/text/TextCodecICU.cpp:30: /home/thomas/buildroot/output/build/webkitgtk-2.38.5/WTF/Headers/wtf/glib/GRefPtr.h:28:10: fatal error: glib.h: No such file or directory #include ^~~~~~~~ compilation terminated. [1923/5265] Generating ../../inspector-resources.stamp ninja: build stopped: subcommand failed. make[1]: *** [package/pkg-generic.mk:293: /home/thomas/buildroot/output/build/webkitgtk-2.38.5/.stamp_built] Error 1 make: *** [Makefile:82: _all] Error 2 ``` Op ma 20 feb. 2023 om 21:57 schreef Peter Korsgaard : > > On 20/02/2023 21.49, Thomas Petazzoni wrote: > >> Maybe it is? Does at-spi2 work under wayland? > > > > Please note that we also have a series that removes atk, at-spi2-atk, > > and bumps at-spi2-core, which now replaces both atk and at-spi2-atk: > > > > https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 > > Ahh yes, that is probably the way to go. > > -- > Bye, Peter Korsgaard > > From fontaine.fabrice at gmail.com Tue Feb 21 16:00:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 17:00:36 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-codescape-mti-mips: disable gdbserver Message-ID: <20230221160036.2903448-1-fontaine.fabrice@gmail.com> Fix the following build failure: >>> toolchain-external-codescape-mti-mips 2018.09-02 Copying gdbserver Could not find gdbserver in external toolchain Fixes: - http://autobuild.buildroot.org/results/ead304285a9cf32bf6b9dcc7fc30acece25ec680 Signed-off-by: Fabrice Fontaine --- .../toolchain-external-codescape-mti-mips/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index 8217ddc38c..720d705d14 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -5,6 +5,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 -- 2.39.0 From fontaine.fabrice at gmail.com Tue Feb 21 16:01:37 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 17:01:37 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external/toolchain-external-codescape-img-mips: disable gdbserver Message-ID: <20230221160137.2904208-1-fontaine.fabrice@gmail.com> Fix the following build failure: >>> toolchain-external-codescape-img-mips 2018.09-02 Copying gdbserver Could not find gdbserver in external toolchain Fixes: - http://autobuild.buildroot.org/results/b0786965e0b249c8168df855682e54cfe95fa0cc Signed-off-by: Fabrice Fontaine --- .../toolchain-external-codescape-img-mips/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in index 2341d08832..d49c610237 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in @@ -5,6 +5,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 -- 2.39.0 From giulio.benetti at benettiengineering.com Tue Feb 21 16:15:21 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 21 Feb 2023 17:15:21 +0100 Subject: [Buildroot] [PATCH] package/webkitgtk: fix build failure with mixed boolean types Message-ID: <20230221161522.3749804-1-giulio.benetti@benettiengineering.com> Add local patch pending upstream[0] to fix build failure due to mixed typedef enum { FALSE = 0, TRUE = 1 } boolean; and Fixes: still not failed [0]: https://github.com/WebKit/WebKit/pull/10447 Signed-off-by: Giulio Benetti --- ...oder-boolean-enum-and-define-TRUE-FA.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/webkitgtk/0001-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch diff --git a/package/webkitgtk/0001-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch b/package/webkitgtk/0001-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch new file mode 100644 index 0000000000..7648ce8f29 --- /dev/null +++ b/package/webkitgtk/0001-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch @@ -0,0 +1,53 @@ +From 37f07b014126f8ca56b60b3a4ed38f96f07d2ec9 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Tue, 21 Feb 2023 16:43:05 +0100 +Subject: [PATCH] Fix JPEGImageDecoder boolean enum and #define TRUE/FALSE mix + https://bugs.webkit.org/show_bug.cgi?id=252666 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reviewed by NOBODY (OOPS!). + +jpeglib.h contains a typedef enum for boolean type but LCMSUniquePtr.h +include files that can contain #define TRUE/FALSE. This way build fails +with: +JPEGImageDecoder.cpp:343:43: error: invalid conversion from ?int? to ?boolean? + +This is because TRUE or FALSE should be an enum instead they get defined +as 1 or 0. To fix this move jpeglib.h inclusion after LCMSUniquePtr.h +inclusion. + +Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h: + +Signed-off-by: Giulio Benetti +--- + .../platform/image-decoders/jpeg/JPEGImageDecoder.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h +index aa875de00faa..c396e1086d41 100644 +--- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h ++++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h +@@ -32,14 +32,15 @@ + // ICU defines TRUE and FALSE macros, breaking libjpeg v9 headers + #undef TRUE + #undef FALSE +-extern "C" { +-#include "jpeglib.h" +-} + + #if USE(LCMS) + #include "LCMSUniquePtr.h" + #endif + ++extern "C" { ++#include "jpeglib.h" ++} ++ + namespace WebCore { + + class JPEGImageReader; +-- +2.34.1 + -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Feb 21 16:15:22 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 21 Feb 2023 17:15:22 +0100 Subject: [Buildroot] [PATCH] package/wpewebkit: fix build failure with mixed boolean types In-Reply-To: <20230221161522.3749804-1-giulio.benetti@benettiengineering.com> References: <20230221161522.3749804-1-giulio.benetti@benettiengineering.com> Message-ID: <20230221161522.3749804-2-giulio.benetti@benettiengineering.com> Add local patch pending upstream[0] to fix build failure due to mixed typedef enum { FALSE = 0, TRUE = 1 } boolean; and #define FALSE 0 #define TRUE 1 Fixes: still not failed [0]: https://github.com/WebKit/WebKit/pull/10447 Signed-off-by: Giulio Benetti --- ...oder-boolean-enum-and-define-TRUE-FA.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/wpewebkit/0002-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch diff --git a/package/wpewebkit/0002-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch b/package/wpewebkit/0002-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch new file mode 100644 index 0000000000..7648ce8f29 --- /dev/null +++ b/package/wpewebkit/0002-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch @@ -0,0 +1,53 @@ +From 37f07b014126f8ca56b60b3a4ed38f96f07d2ec9 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Tue, 21 Feb 2023 16:43:05 +0100 +Subject: [PATCH] Fix JPEGImageDecoder boolean enum and #define TRUE/FALSE mix + https://bugs.webkit.org/show_bug.cgi?id=252666 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reviewed by NOBODY (OOPS!). + +jpeglib.h contains a typedef enum for boolean type but LCMSUniquePtr.h +include files that can contain #define TRUE/FALSE. This way build fails +with: +JPEGImageDecoder.cpp:343:43: error: invalid conversion from ?int? to ?boolean? + +This is because TRUE or FALSE should be an enum instead they get defined +as 1 or 0. To fix this move jpeglib.h inclusion after LCMSUniquePtr.h +inclusion. + +Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h: + +Signed-off-by: Giulio Benetti +--- + .../platform/image-decoders/jpeg/JPEGImageDecoder.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h +index aa875de00faa..c396e1086d41 100644 +--- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h ++++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h +@@ -32,14 +32,15 @@ + // ICU defines TRUE and FALSE macros, breaking libjpeg v9 headers + #undef TRUE + #undef FALSE +-extern "C" { +-#include "jpeglib.h" +-} + + #if USE(LCMS) + #include "LCMSUniquePtr.h" + #endif + ++extern "C" { ++#include "jpeglib.h" ++} ++ + namespace WebCore { + + class JPEGImageReader; +-- +2.34.1 + -- 2.34.1 From vfazio at xes-inc.com Tue Feb 21 17:21:51 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:51 -0600 Subject: [Buildroot] [PATCH 01/15] package/pkg-autotools: drop FOO_GETTEXTIZE_OPTS support Message-ID: <20230221172205.2450111-1-vfazio@xes-inc.com> From: Vincent Fazio No package in the current tree is currently utilizing this option. The long term solution is to use autopoint over gettextize in which case these options aren't relevant anyway. Signed-off-by: Vincent Fazio --- package/pkg-autotools.mk | 6 +----- package/pkg-generic.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 717ff81593..55d95d204e 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -92,7 +92,7 @@ endef # define GETTEXTIZE_HOOK @$(call MESSAGE,"Gettextizing") - $(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE) $($(PKG)_GETTEXTIZE_OPTS) + $(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE) endef # @@ -152,10 +152,6 @@ ifndef $(2)_GETTEXTIZE endif endif -ifeq ($(4),host) - $(2)_GETTEXTIZE_OPTS ?= $$($(3)_GETTEXTIZE_OPTS) -endif - ifeq ($(4),host) $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS) endif diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 82187d7db9..a6ef5efb5f 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1206,9 +1206,16 @@ $(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_ $(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS)) $(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS)) $(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)) +# Check for deprecated variables that have no replacement +ifneq ($$($(2)_GETTEXTIZE_OPT),) +$$(error "$(2)_GETTEXTIZE_OPT is no longer supported. Please fix your .mk file.") +endif +ifneq ($$($(2)_GETTEXTIZE_OPTS),) +$$(error "$(2)_GETTEXTIZE_OPTS is no longer supported. Please fix your .mk file.") +endif + PACKAGES += $(1) ifneq ($$($(2)_PERMISSIONS),) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:52 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:52 -0600 Subject: [Buildroot] [PATCH 02/15] manual: remove LIBFOO_GETTEXTIZE_OPTS In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-2-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- docs/manual/adding-packages-autotools.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt index a041d91eb6..8655a79693 100644 --- a/docs/manual/adding-packages-autotools.txt +++ b/docs/manual/adding-packages-autotools.txt @@ -136,12 +136,6 @@ cases, typical packages will therefore only use a few of them. 'gettextize'.) Only valid when +LIBFOO_AUTORECONF=YES+. Valid values are +YES+ and +NO+. The default is +NO+. -* +LIBFOO_GETTEXTIZE_OPTS+, to specify additional options passed to - the 'gettextize' program, if +LIBFOO_GETTEXTIZE=YES+. You may - use that if, for example, the +.po+ files are not located in the - standard place (i.e. in +po/+ at the root of the package.) By - default, '-f'. - * +LIBFOO_LIBTOOL_PATCH+ tells whether the Buildroot patch to fix libtool cross-compilation issues should be applied or not. Valid values are +YES+ and +NO+. By -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:54 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:54 -0600 Subject: [Buildroot] [PATCH 04/15] package/pkg-autotools: add FOO_AUTOPOINT flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-4-vfazio@xes-inc.com> From: Vincent Fazio Add a new variable to run autopoint during autoreconf. This variable depends on FOO_AUTORECONF = YES. It is mutually exclusive to FOO_GETTEXTIZE. If both are set, FOO_AUTOPOINT is ignored to preserve previous behavior. This support is being added per a previous discussion [1]. The usage of gettextize needs to be removed cuz mama says so [2]. ... is not part of the GNU build system, in the sense that it should not be invoked automatically, and not be invoked by someone who doesn?t assume the responsibilities of a package maintainer. For the latter purpose, a separate tool is provided, see Invoking the autopoint Program [3] Using gettextize has the unintended consequence of updating the package based on the version of host-gettext vs what was chosen by the upstream maintainer. As mama said above, we should use autopoint. Do as she says to avoid further scolding (gettextize shoehorning and package patching). [1] https://patchwork.ozlabs.org/project/buildroot/patch/20170827110920.15579-1-aleksander at aleksander.es/ [2] https://www.gnu.org/software/gettext/manual/html_node/gettextize-Invocation.html [3] https://www.gnu.org/software/gettext/manual/html_node/autopoint-Invocation.html Signed-off-by: Vincent Fazio --- package/pkg-autotools.mk | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 418cd10945..48485567d7 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -152,6 +152,15 @@ ifndef $(2)_GETTEXTIZE endif endif +ifndef $(2)_AUTOPOINT + ifdef $(3)_AUTOPOINT + $(2)_AUTOPOINT = $$($(3)_AUTOPOINT) + else + $(2)_AUTOPOINT ?= NO + endif +endif + + ifeq ($(4),host) $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS) endif @@ -240,8 +249,14 @@ ifeq ($$($(2)_AUTORECONF),YES) ifeq ($$($(2)_GETTEXTIZE),YES) $(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK $(2)_DEPENDENCIES += host-gettext -endif $(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true +# autopoint is provided by gettext +else ifeq ($$($(2)_AUTOPOINT),YES) +$(2)_DEPENDENCIES += host-gettext +$(2)_AUTORECONF_ENV += AUTOPOINT=$$(HOST_DIR)/bin/autopoint +else +$(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true +endif $(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK # default values are not evaluated yet, so don't rely on this defaulting to YES ifneq ($$($(2)_LIBTOOL_PATCH),NO) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:53 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:53 -0600 Subject: [Buildroot] [PATCH 03/15] package/pkg-autotools: set AUTOPOINT via AUTOCONF_ENV In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-3-vfazio@xes-inc.com> From: Vincent Fazio Previously, AUTOPOINT was hardcoded to /bin/true in autoconf.mk. Moving the definition of this variable into AUTOCONF_ENV as part of the autotools infrastructure will allow us to conditionally set the variable based on package flags to support migrating away from FOO_GETTEXTIZE. Signed-off-by: Vincent Fazio --- package/autoconf/autoconf.mk | 2 +- package/pkg-autotools.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 7e0850422b..3cac20cc34 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -23,4 +23,4 @@ $(eval $(host-autotools-package)) # variables used by other packages AUTOCONF = $(HOST_DIR)/bin/autoconf -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" AUTOHEADER = $(HOST_DIR)/bin/autoheader -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" -AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true GTKDOCIZE=/bin/true $(HOST_DIR)/bin/autoreconf -f -i +AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" GTKDOCIZE=/bin/true $(HOST_DIR)/bin/autoreconf -f -i diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 55d95d204e..418cd10945 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -241,6 +241,7 @@ ifeq ($$($(2)_GETTEXTIZE),YES) $(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK $(2)_DEPENDENCIES += host-gettext endif +$(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true $(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK # default values are not evaluated yet, so don't rely on this defaulting to YES ifneq ($$($(2)_LIBTOOL_PATCH),NO) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:55 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:55 -0600 Subject: [Buildroot] [PATCH 05/15] package/aumix: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-5-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- package/aumix/aumix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/aumix/aumix.mk b/package/aumix/aumix.mk index a4001f5bbb..03072d5d35 100644 --- a/package/aumix/aumix.mk +++ b/package/aumix/aumix.mk @@ -8,7 +8,7 @@ AUMIX_VERSION = 2.9.1 AUMIX_SOURCE = aumix-$(AUMIX_VERSION).tar.bz2 AUMIX_SITE = http://jpj.net/~trevor/aumix/releases AUMIX_AUTORECONF = YES -AUMIX_GETTEXTIZE = YES +AUMIX_AUTOPOINT = YES AUMIX_LICENSE = GPL-2.0+ AUMIX_LICENSE_FILES = COPYING -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:22:05 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:22:05 -0600 Subject: [Buildroot] [PATCH 15/15] manual: drop LIBFOO_GETTEXTIZE, add LIBFOO_AUTOPOINT In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-15-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- docs/manual/adding-packages-autotools.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt index 8655a79693..ad96957f3d 100644 --- a/docs/manual/adding-packages-autotools.txt +++ b/docs/manual/adding-packages-autotools.txt @@ -130,10 +130,9 @@ cases, typical packages will therefore only use a few of them. passed to the 'autoreconf' program if +LIBFOO_AUTORECONF=YES+. By default, empty. -* +LIBFOO_GETTEXTIZE+, tells whether the package should be - gettextized or not (i.e. if the package uses a different gettext - version than Buildroot provides, and it is needed to run - 'gettextize'.) Only valid when +LIBFOO_AUTORECONF=YES+. Valid +* +LIBFOO_AUTOPOINT+, tells whether the package should be + autopointed or not (i.e. if the package needs I18N infrastructure + copied in.) Only valid when +LIBFOO_AUTORECONF=YES+. Valid values are +YES+ and +NO+. The default is +NO+. * +LIBFOO_LIBTOOL_PATCH+ tells whether the Buildroot -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:59 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:59 -0600 Subject: [Buildroot] [PATCH 09/15] package/libuio: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-9-vfazio@xes-inc.com> From: Vincent Fazio Drop patch that is no longer necessary after moving to new package flag. Add patch to fix builds due to missing required files. Signed-off-by: Vincent Fazio --- ...0001-configure-remove-po-Makefile.in.patch | 26 ---------------- ...c-set-automake-strictness-to-foreign.patch | 31 +++++++++++++++++++ package/libuio/libuio.mk | 2 +- 3 files changed, 32 insertions(+), 27 deletions(-) delete mode 100644 package/libuio/0001-configure-remove-po-Makefile.in.patch create mode 100644 package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch diff --git a/package/libuio/0001-configure-remove-po-Makefile.in.patch b/package/libuio/0001-configure-remove-po-Makefile.in.patch deleted file mode 100644 index 067465cc31..0000000000 --- a/package/libuio/0001-configure-remove-po-Makefile.in.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c5fa0b778e1c2a7d03ff6e661bdfa2faef878f68 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 1 Jul 2016 17:56:30 +0200 -Subject: [PATCH] configure: remove po/Makefile.in - -The file po/Makefile.in is automatically added to AC_OUTPUT while using gettexize - -Signed-off-by: Romain Naour ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f7fb40f..a25e463 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,5 +55,4 @@ dnl last but not least - AC_OUTPUT([Makefile - libuio.dox - libuio-uninstalled.pc -- libuio.pc -- po/Makefile.in]) -+ libuio.pc]) --- -2.5.5 - diff --git a/package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch b/package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch new file mode 100644 index 0000000000..1ce91f01f3 --- /dev/null +++ b/package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch @@ -0,0 +1,31 @@ +From 546e07b2405455c03b7eb0d392c331e189913bc4 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 31 Jan 2023 19:06:29 -0600 +Subject: [PATCH] configure.ac: set automake strictness to foreign + +libuio does not conform to the GNU's strict layout requirements. [1] + +Set the strictness to foreign to account for this. + +[1] https://www.gnu.org/software/automake/manual/html_node/Strictness.html + +Signed-off-by: Vincent Fazio +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 101abd3..ef46171 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,6 +1,6 @@ + dnl Every other copy of the package version number gets its value from here + AC_INIT(libuio, 0.2.8, https://github.com/linutronix/libuio/issues) +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + + AM_CONFIG_HEADER(config.h) + +-- +2.25.1 + diff --git a/package/libuio/libuio.mk b/package/libuio/libuio.mk index a0285277ab..d5019af594 100644 --- a/package/libuio/libuio.mk +++ b/package/libuio/libuio.mk @@ -14,7 +14,7 @@ LIBUIO_LIBS = $(TARGET_NLS_LIBS) LIBUIO_INSTALL_STAGING = YES # Fetched from github, no pre-generated configure script provided -LIBUIO_GETTEXTIZE = YES +LIBUIO_AUTOPOINT = YES LIBUIO_AUTORECONF = YES # Avoid build issue when makeinfo is missing -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:57 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:57 -0600 Subject: [Buildroot] [PATCH 07/15] package/flex: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-7-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- package/flex/flex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 85da5ddae8..f1e731ce2e 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -20,7 +20,7 @@ HOST_FLEX_DEPENDENCIES = host-m4 # 0002-build-make-it-possible-to-disable-the-build-of-the-f.patch # 0003-build-make-it-possible-to-disable-the-build-of-the-d.patch FLEX_AUTORECONF = YES -FLEX_GETTEXTIZE = YES +FLEX_AUTOPOINT = YES FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4 \ ac_cv_func_reallocarray=no -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:56 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:56 -0600 Subject: [Buildroot] [PATCH 06/15] package/dc3dd: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-6-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- package/dc3dd/dc3dd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dc3dd/dc3dd.mk b/package/dc3dd/dc3dd.mk index cc89bb63d0..4d94194af6 100644 --- a/package/dc3dd/dc3dd.mk +++ b/package/dc3dd/dc3dd.mk @@ -13,6 +13,6 @@ DC3DD_LICENSE_FILES = COPYING # We are patching Makefile.am, so we need to autoreconf. We also need to # enable gettextize as dc3dd comes with an old gettext infra. DC3DD_AUTORECONF = YES -DC3DD_GETTEXTIZE = YES +DC3DD_AUTOPOINT = YES $(eval $(autotools-package)) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:21:58 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:21:58 -0600 Subject: [Buildroot] [PATCH 08/15] package/hddtemp: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-8-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- package/hddtemp/hddtemp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hddtemp/hddtemp.mk b/package/hddtemp/hddtemp.mk index 4f45647dff..42dcb3d416 100644 --- a/package/hddtemp/hddtemp.mk +++ b/package/hddtemp/hddtemp.mk @@ -11,7 +11,7 @@ HDDTEMP_LICENSE_FILES = GPL-2 # Fetched from Github with no configure script HDDTEMP_AUTORECONF = YES -HDDTEMP_GETTEXTIZE = YES +HDDTEMP_AUTOPOINT = YES HDDTEMP_DB_PATH = /usr/share/misc/hddtemp.db HDDTEMP_CONF_OPTS = --with-db-path=$(HDDTEMP_DB_PATH) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:22:00 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:22:00 -0600 Subject: [Buildroot] [PATCH 10/15] package/motion: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-10-vfazio@xes-inc.com> From: Vincent Fazio Drop patch that is no longer necessary. Signed-off-by: Vincent Fazio --- ...1-configure.ac-remove-po-Makefile.in.patch | 29 ------------------- package/motion/motion.mk | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 package/motion/0001-configure.ac-remove-po-Makefile.in.patch diff --git a/package/motion/0001-configure.ac-remove-po-Makefile.in.patch b/package/motion/0001-configure.ac-remove-po-Makefile.in.patch deleted file mode 100644 index 9b514bafcd..0000000000 --- a/package/motion/0001-configure.ac-remove-po-Makefile.in.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0e05d4116678de3a7d913177a8fc63f10e58ad24 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 18 Jan 2020 00:00:21 +0100 -Subject: [PATCH] configure.ac: remove po/Makefile.in - -The file po/Makefile.in is automatically added to AC_OUTPUT while using -gettexize - -Signed-off-by: Fabrice Fontaine -[Upstream status: not upstreamable] ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3876adb..221dacf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -471,7 +471,6 @@ LDFLAGS="$TEMP_LDFLAGS" - AC_CONFIG_FILES([ - Makefile - src/Makefile -- po/Makefile.in - man/Makefile - data/camera1-dist.conf - data/camera2-dist.conf --- -2.24.1 - diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 4e9ccdc3f7..2cce6cd1ff 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -12,7 +12,7 @@ MOTION_CPE_ID_VENDOR = motion_project MOTION_DEPENDENCIES = host-pkgconf jpeg libmicrohttpd $(TARGET_NLS_DEPENDENCIES) # From git MOTION_AUTORECONF = YES -MOTION_GETTEXTIZE = YES +MOTION_AUTOPOINT = YES MOTION_CONF_OPTS += --without-optimizecpu -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:22:03 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:22:03 -0600 Subject: [Buildroot] [PATCH 13/15] package/pkg-autotools: drop support for FOO_GETTEXTIZE In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-13-vfazio@xes-inc.com> From: Vincent Fazio Remove all support for FOO_GETTEXTIZE and alert users to FOO_AUTOPOINT as the recommended solution in its stead. Signed-off-by: Vincent Fazio --- package/pkg-autotools.mk | 23 +---------------------- package/pkg-generic.mk | 3 +++ 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 48485567d7..f17186dfe4 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -87,14 +87,6 @@ define CONFIGURE_FIX_POWERPC64_HOOK support/scripts/fix-configure-powerpc64.sh $($(PKG)_DIR) endef -# -# Hook to gettextize the package if needed -# -define GETTEXTIZE_HOOK - @$(call MESSAGE,"Gettextizing") - $(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE) -endef - # # Hook to autoreconf the package if needed # @@ -144,14 +136,6 @@ ifndef $(2)_AUTORECONF endif endif -ifndef $(2)_GETTEXTIZE - ifdef $(3)_GETTEXTIZE - $(2)_GETTEXTIZE = $$($(3)_GETTEXTIZE) - else - $(2)_GETTEXTIZE ?= NO - endif -endif - ifndef $(2)_AUTOPOINT ifdef $(3)_AUTOPOINT $(2)_AUTOPOINT = $$($(3)_AUTOPOINT) @@ -245,13 +229,8 @@ $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK ifeq ($$($(2)_AUTORECONF),YES) -# This has to come before autoreconf -ifeq ($$($(2)_GETTEXTIZE),YES) -$(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK -$(2)_DEPENDENCIES += host-gettext -$(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true # autopoint is provided by gettext -else ifeq ($$($(2)_AUTOPOINT),YES) +ifeq ($$($(2)_AUTOPOINT),YES) $(2)_DEPENDENCIES += host-gettext $(2)_AUTORECONF_ENV += AUTOPOINT=$$(HOST_DIR)/bin/autopoint else diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a6ef5efb5f..6be28db623 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1215,6 +1215,9 @@ endif ifneq ($$($(2)_GETTEXTIZE_OPTS),) $$(error "$(2)_GETTEXTIZE_OPTS is no longer supported. Please fix your .mk file.") endif +ifneq ($$($(2)_GETTEXTIZE),) +$$(error "$(2)_GETTEXTIZE is no longer supported in favor of $(2)_AUTOPOINT. Please update your package.") +endif PACKAGES += $(1) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:22:04 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:22:04 -0600 Subject: [Buildroot] [PATCH 14/15] package/gettext: drop GETTEXTIZE variable In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-14-vfazio@xes-inc.com> From: Vincent Fazio This variable is no longer used anywhere in the tree so remove it. Signed-off-by: Vincent Fazio --- package/gettext/gettext.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 146d40e13b..a86e26f69e 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -4,7 +4,5 @@ # ################################################################################ -GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/bin/autom4te $(HOST_DIR)/bin/gettextize -f - $(eval $(virtual-package)) $(eval $(host-virtual-package)) -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:22:02 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:22:02 -0600 Subject: [Buildroot] [PATCH 12/15] package/popt: remove POPT_GETTEXTIZE In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-12-vfazio@xes-inc.com> From: Vincent Fazio Commit 895bfba dropped POPT_AUTORECONF but did not drop POPT_GETTEXTIZE, which requires POPT_AUTORECONF = YES. Fixes: 895bfba ("package/popt: bump to version 1.19") Signed-off-by: Vincent Fazio --- package/popt/popt.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/popt/popt.mk b/package/popt/popt.mk index 842cf0d035..5cee8e9673 100644 --- a/package/popt/popt.mk +++ b/package/popt/popt.mk @@ -11,7 +11,6 @@ POPT_LICENSE = MIT POPT_LICENSE_FILES = COPYING POPT_CPE_ID_VENDOR = popt_project -POPT_GETTEXTIZE = YES POPT_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) POPT_CONF_ENV = ac_cv_va_copy=yes -- 2.25.1 From vfazio at xes-inc.com Tue Feb 21 17:22:01 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 21 Feb 2023 11:22:01 -0600 Subject: [Buildroot] [PATCH 11/15] package/rrdtool: migrate to new autopoint flag In-Reply-To: <20230221172205.2450111-1-vfazio@xes-inc.com> References: <20230221172205.2450111-1-vfazio@xes-inc.com> Message-ID: <20230221172205.2450111-11-vfazio@xes-inc.com> From: Vincent Fazio Signed-off-by: Vincent Fazio --- package/rrdtool/rrdtool.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk index 2731b7b39d..b2cceccedc 100644 --- a/package/rrdtool/rrdtool.mk +++ b/package/rrdtool/rrdtool.mk @@ -12,7 +12,7 @@ RRDTOOL_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) # autoreconf needed to avoid link failure due to missing -lintl, # gettextize needed as a consequence of autoreconf RRDTOOL_AUTORECONF = YES -RRDTOOL_GETTEXTIZE = YES +RRDTOOL_AUTOPOINT = YES RRDTOOL_INSTALL_STAGING = YES RRDTOOL_CONF_OPTS = \ --disable-examples \ -- 2.25.1 From fontaine.fabrice at gmail.com Tue Feb 21 17:28:29 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 18:28:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/mutt: fix build failure when host provides an old gpgrt-config Message-ID: <20230221172829.3407641-1-fontaine.fabrice@gmail.com> As already done for gnupg2 in commit d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8, apply the same fix to mutt to avoid the following build failure: /home/thomas/autobuild/instance-2/output-1/host/bin/i686-buildroot-linux-uclibc-gcc -DPKGDATADIR=\"/usr/share/mutt\" -DSYSCONFDIR=\"/etc\" -DBINDIR=\"/usr/bin\" -DMUTTLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H=1 -I. -I. -I. -I/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -pedantic -Wno-long-long -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -c -o txt2c.o txt2c.c i686-buildroot-linux-uclibc-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' Fixes: - http://autobuild.buildroot.org/results/98010be4ef70e58819ea2d17315bdac66a619b23 Signed-off-by: Fabrice Fontaine --- package/mutt/mutt.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 0a98396d88..5cf1b6bad2 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -37,6 +37,10 @@ MUTT_DEPENDENCIES += libgpgme MUTT_CONF_OPTS += \ --enable-gpgme \ --with-gpgme-prefix=$(STAGING_DIR)/usr + +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +MUTT_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config else MUTT_CONF_OPTS += --disable-gpgme endif -- 2.39.0 From gwenj at trabucayre.com Tue Feb 21 17:27:16 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Tue, 21 Feb 2023 18:27:16 +0100 Subject: [Buildroot] [PATCH] package/openfpgaloader: bump to version 0.10.0 Message-ID: <1677000436-53977-1-git-send-email-gwenj@trabucayre.com> From: Gwenhael Goavec-Merou Also adds libgpiod support. Signed-off-by: Gwenhael Goavec-Merou --- package/openfpgaloader/Config.in | 10 ++++++++++ package/openfpgaloader/openfpgaloader.hash | 2 +- package/openfpgaloader/openfpgaloader.mk | 9 ++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in index 054278c256..4ba01d12d3 100644 --- a/package/openfpgaloader/Config.in +++ b/package/openfpgaloader/Config.in @@ -24,6 +24,16 @@ config BR2_PACAKGE_OPENFPGALOADER_CMSIS comment "openfpgaloader CMSIS-DAP needs udev /dev management and a toolchain w/ NPTL threads" depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS_NPTL +config BR2_PACKAGE_OPENFPGALOADER_LIBGPIOD + bool "libgpiod support" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 # libgpiod + select BR2_PACKAGE_LIBGPIOD + help + openfpgaloader libgpiod support + +comment "openfpgaloader libgpiod needs kernel headers >= 4.8" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + endif comment "openfpgaloader needs a toolchain w/ threads, C++, gcc >= 4.9" diff --git a/package/openfpgaloader/openfpgaloader.hash b/package/openfpgaloader/openfpgaloader.hash index 6c9d8a2b91..a8b537782c 100644 --- a/package/openfpgaloader/openfpgaloader.hash +++ b/package/openfpgaloader/openfpgaloader.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a862a209d696becff915a77512e6a8c22f92d73480a45cc12273d9ad1db60d23 openfpgaloader-0.6.1.tar.gz +sha256 966b4629df86b1d520ddd8a4e0a3fc00060b26b5ab4e172b596bd9d4659a196e openfpgaloader-0.10.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk index 0c39aad687..042b16612e 100644 --- a/package/openfpgaloader/openfpgaloader.mk +++ b/package/openfpgaloader/openfpgaloader.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENFPGALOADER_VERSION = 0.6.1 +OPENFPGALOADER_VERSION = 0.10.0 OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,v$(OPENFPGALOADER_VERSION)) OPENFPGALOADER_LICENSE = Apache-2.0 OPENFPGALOADER_LICENSE_FILES = LICENSE @@ -24,4 +24,11 @@ else OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=OFF endif +ifeq ($(BR2_PACAKGE_OPENFPGALOADER_LIBGPIOD),y) +OPENFPGALOADER_DEPENDENCIES += libgpiod +OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=ON +else +OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=OFF +endif + $(eval $(cmake-package)) -- 2.30.2 From giulio.benetti at benettiengineering.com Tue Feb 21 18:30:51 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 21 Feb 2023 19:30:51 +0100 Subject: [Buildroot] [PATCH] package/jpeg: fix build failure when qt5base tries to use libjpeg Message-ID: <20230221183051.4011311-1-giulio.benetti@benettiengineering.com> Qt5 fails to build with libjpeg since the API is different from libjpeg-turbo and libjpeg-turbo is pointed as the library Qt5 usually link against to[0]. So let's default jpeg variant to libjpeg-turbo if BR2_PACKAGE_QT5BASE_JPEG is selected. Fixes: still not failed [0]: https://doc.qt.io/qt-5/qtgui-index.html#licenses-and-attributions Signed-off-by: Giulio Benetti --- package/jpeg/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index 371f89aa49..3a39a0dfb8 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -16,7 +16,8 @@ if BR2_PACKAGE_JPEG choice prompt "jpeg variant" - default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT + default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT || \ + BR2_PACKAGE_QT5BASE_JPEG help Select the normal libjpeg or libjpeg-turbo. -- 2.34.1 From thomas at devoogdt.com Tue Feb 21 19:27:59 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 21 Feb 2023 20:27:59 +0100 Subject: [Buildroot] [PATCH v3 1/4] package/at-spi2-core: bump to version 2.47.1 In-Reply-To: References: Message-ID: <20230221192802.4117856-1-thomas.devoogdt@barco.com> From: Daniel Lang https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_47_1/NEWS - X11 is now optional. - libxml2 is no longer optional. - atk and at-spi2-atk have been merged into at-spi2-core. - atk introspection option added. Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) --- package/at-spi2-core/Config.in | 8 ++------ package/at-spi2-core/at-spi2-core.hash | 4 ++-- package/at-spi2-core/at-spi2-core.mk | 20 +++++++++++++++++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/package/at-spi2-core/Config.in b/package/at-spi2-core/Config.in index f56c5b93c4..1f6c421777 100644 --- a/package/at-spi2-core/Config.in +++ b/package/at-spi2-core/Config.in @@ -1,12 +1,12 @@ config BR2_PACKAGE_AT_SPI2_CORE bool "at-spi2-core" - depends on BR2_PACKAGE_XORG7 # xlib-libxtst depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2 depends on BR2_USE_MMU # glib2 depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_XORG7 # optionally for X11 help The At-Spi2 Core package is a part of the GNOME Accessibility Project. It provides a Service Provider @@ -19,7 +19,3 @@ config BR2_PACKAGE_AT_SPI2_CORE comment "at-spi2-core needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -comment "at-spi2-core depends on X.org" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_XORG7 diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index 764e4c3661..4531bf396c 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum -sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz +# From https://download.gnome.org/sources/at-spi2-core/2.47/at-spi2-core-2.47.1.sha256sum +sha256 c6ba7c160434edebf09d2936933569c936f6ec972301766f2bdac5a4d418153c at-spi2-core-2.47.1.tar.xz # locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index f0b019c0ed..e98e779884 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -4,17 +4,31 @@ # ################################################################################ -AT_SPI2_CORE_VERSION_MAJOR = 2.36 -AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 +AT_SPI2_CORE_VERSION_MAJOR = 2.47 +AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).1 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) AT_SPI2_CORE_LICENSE = LGPL-2.1+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES -AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \ +AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 libxml2 \ $(TARGET_NLS_DEPENDENCIES) AT_SPI2_CORE_CONF_OPTS = -Ddbus_daemon=/usr/bin/dbus-daemon +ifeq ($(BR2_PACKAGE_XORG7),y) +AT_SPI2_CORE_CONF_OPTS += -Dx11=enabled +AT_SPI2_CORE_DEPENDENCIES += xlib_libXtst +else +AT_SPI2_CORE_CONF_OPTS += -Dx11=disabled +endif + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +AT_SPI2_CORE_CONF_OPTS += -Dintrospection=enabled +AT_SPI2_CORE_DEPENDENCIES += gobject-introspection +else +AT_SPI2_CORE_CONF_OPTS += -Dintrospection=disabled +endif + AT_SPI2_CORE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) $(eval $(meson-package)) -- 2.39.2 From thomas at devoogdt.com Tue Feb 21 19:28:00 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 21 Feb 2023 20:28:00 +0100 Subject: [Buildroot] [PATCH v3 2/4] package/at-spi2-atk: remove package In-Reply-To: <20230221192802.4117856-1-thomas.devoogdt@barco.com> References: <20230221192802.4117856-1-thomas.devoogdt@barco.com> Message-ID: <20230221192802.4117856-2-thomas.devoogdt@barco.com> From: Daniel Lang at-spi2-atk has been merged into at-spi2-core with version 2.45.1. https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_45_1/NEWS https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78 Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) --- Config.in.legacy | 7 +++ DEVELOPERS | 1 - package/Config.in | 1 - .../0001-meson-add-tests-option.patch | 43 ------------------- package/at-spi2-atk/Config.in | 22 ---------- package/at-spi2-atk/at-spi2-atk.hash | 5 --- package/at-spi2-atk/at-spi2-atk.mk | 19 -------- 7 files changed, 7 insertions(+), 91 deletions(-) delete mode 100644 package/at-spi2-atk/0001-meson-add-tests-option.patch delete mode 100644 package/at-spi2-atk/Config.in delete mode 100644 package/at-spi2-atk/at-spi2-atk.hash delete mode 100644 package/at-spi2-atk/at-spi2-atk.mk diff --git a/Config.in.legacy b/Config.in.legacy index 7f69462f2e..0de7e6e6d6 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_AT_SPI2_ATK + bool "at-spi2-atk removed" + select BR2_LEGACY + select BR2_PACKAGE_AT_SPI2_CORE + help + at-spi2-atk is now part of at-spi2-core. + config BR2_KERNEL_HEADERS_6_0 bool "kernel headers version 6.0.x are no longer supported" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 6256576e02..9530c4cfb2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1612,7 +1612,6 @@ F: support/testing/tests/package/test_avocado.py F: support/testing/tests/package/test_python_aexpect.py N: Joseph Kogut -F: package/at-spi2-atk/ F: package/at-spi2-core/ F: package/clang/ F: package/earlyoom/ diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..fe64b2a8e1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1553,7 +1553,6 @@ endmenu menu "Graphics" source "package/assimp/Config.in" - source "package/at-spi2-atk/Config.in" source "package/at-spi2-core/Config.in" source "package/atk/Config.in" source "package/atkmm/Config.in" diff --git a/package/at-spi2-atk/0001-meson-add-tests-option.patch b/package/at-spi2-atk/0001-meson-add-tests-option.patch deleted file mode 100644 index 3a2aefa090..0000000000 --- a/package/at-spi2-atk/0001-meson-add-tests-option.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 466d04a57b32417dbf2d5e818af1b7593af5f802 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 May 2020 10:29:36 +0200 -Subject: [PATCH] meson: add tests option - -Add tests option to allow the user to build at-spi2-atk without tests, -it is especially useful as one of the test requires libxml-2.0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/at-spi2-atk/-/merge_requests/22] ---- - meson.build | 4 +++- - meson_options.txt | 4 ++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9fce5d6..61bc93d 100644 ---- a/meson.build -+++ b/meson.build -@@ -61,4 +61,6 @@ install_data('at-spi2-atk.desktop', - - subdir('droute') - subdir('atk-adaptor') --subdir('tests') -+if get_option('tests') -+ subdir('tests') -+endif -diff --git a/meson_options.txt b/meson_options.txt -index 24c9228..a4abdc2 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -2,3 +2,7 @@ option('disable_p2p', - description: 'Disable peer-to-peer DBus connections', - type: 'boolean', - value: false) -+option('tests', -+ description: 'Whether to build tests', -+ type: 'boolean', -+ value: true) --- -2.26.2 - diff --git a/package/at-spi2-atk/Config.in b/package/at-spi2-atk/Config.in deleted file mode 100644 index 9a7cfde0af..0000000000 --- a/package/at-spi2-atk/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_AT_SPI2_ATK - bool "at-spi2-atk" - depends on BR2_PACKAGE_XORG7 # at-spi2-core - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_USE_WCHAR # glib2 - select BR2_PACKAGE_ATK - select BR2_PACKAGE_AT_SPI2_CORE - select BR2_PACKAGE_LIBGLIB2 - help - The At-Spi2 Atk package contains a library that bridges - ATK to At-Spi2 D-Bus service. - - https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/ - -comment "at-spi2-atk needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -comment "at-spi2-atk depends on X.org" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_XORG7 diff --git a/package/at-spi2-atk/at-spi2-atk.hash b/package/at-spi2-atk/at-spi2-atk.hash deleted file mode 100644 index 9c564c32af..0000000000 --- a/package/at-spi2-atk/at-spi2-atk.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.sha256sum -sha256 901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0 at-spi2-atk-2.34.2.tar.xz - -# locally calculated -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-atk/at-spi2-atk.mk b/package/at-spi2-atk/at-spi2-atk.mk deleted file mode 100644 index 232b577230..0000000000 --- a/package/at-spi2-atk/at-spi2-atk.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# at-spi2-atk -# -################################################################################ - -AT_SPI2_ATK_VERSION_MAJOR = 2.34 -AT_SPI2_ATK_VERSION = $(AT_SPI2_ATK_VERSION_MAJOR).2 -AT_SPI2_ATK_SOURCE = at-spi2-atk-$(AT_SPI2_ATK_VERSION).tar.xz -AT_SPI2_ATK_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) -AT_SPI2_ATK_LICENSE = LGPL-2.1+ -AT_SPI2_ATK_LICENSE_FILES = COPYING -AT_SPI2_ATK_CPE_ID_VENDOR = gnome -AT_SPI2_ATK_INSTALL_STAGING = YES -AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf -AT_SPI2_ATK_CONF_OPTS = -Dtests=false - -$(eval $(meson-package)) -- 2.39.2 From thomas at devoogdt.com Tue Feb 21 19:28:01 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 21 Feb 2023 20:28:01 +0100 Subject: [Buildroot] [PATCH v3 3/4] package/atk: remove package In-Reply-To: <20230221192802.4117856-1-thomas.devoogdt@barco.com> References: <20230221192802.4117856-1-thomas.devoogdt@barco.com> Message-ID: <20230221192802.4117856-3-thomas.devoogdt@barco.com> From: Daniel Lang atk has been merged into at-spi2-core with version 2.45.1. https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_45_1/NEWS https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78 Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/atk/Config.in | 14 -------------- package/atk/atk.hash | 5 ----- package/atk/atk.mk | 25 ------------------------- package/atkmm/Config.in | 8 ++++---- package/atkmm/atkmm.mk | 2 +- package/libglade/Config.in | 2 +- package/libglade/libglade.mk | 2 +- package/libgtk2/Config.in | 2 +- package/libgtk2/libgtk2.mk | 2 +- package/libgtk3/Config.in | 2 +- package/libgtk3/libgtk3.mk | 2 +- 13 files changed, 18 insertions(+), 56 deletions(-) delete mode 100644 package/atk/Config.in delete mode 100644 package/atk/atk.hash delete mode 100644 package/atk/atk.mk diff --git a/Config.in.legacy b/Config.in.legacy index 0de7e6e6d6..0bdfc6cf73 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_ATK + bool "atk removed" + select BR2_LEGACY + select BR2_PACKAGE_AT_SPI2_CORE + help + atk is now part of at-spi2-core. + config BR2_PACKAGE_AT_SPI2_ATK bool "at-spi2-atk removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index fe64b2a8e1..64876eb7f1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1554,7 +1554,6 @@ endmenu menu "Graphics" source "package/assimp/Config.in" source "package/at-spi2-core/Config.in" - source "package/atk/Config.in" source "package/atkmm/Config.in" source "package/bayer2rgb-neon/Config.in" source "package/bullet/Config.in" diff --git a/package/atk/Config.in b/package/atk/Config.in deleted file mode 100644 index d9371b879b..0000000000 --- a/package/atk/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_ATK - bool "atk" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - The ATK accessibility toolkit, needed to build GTK+-2.x. - - https://gitlab.gnome.org/GNOME/atk - -comment "atk needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/atk/atk.hash b/package/atk/atk.hash deleted file mode 100644 index d8cd69ff1f..0000000000 --- a/package/atk/atk.hash +++ /dev/null @@ -1,5 +0,0 @@ -# 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 deleted file mode 100644 index 2820fb486d..0000000000 --- a/package/atk/atk.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# atk -# -################################################################################ - -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) -ATK_LICENSE = LGPL-2.0+ -ATK_LICENSE_FILES = COPYING -ATK_INSTALL_STAGING = YES -ATK_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) - -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -ATK_CONF_OPTS += -Dintrospection=true -ATK_DEPENDENCIES += gobject-introspection -else -ATK_CONF_OPTS += -Dintrospection=false -endif - -ATK_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) - -$(eval $(meson-package)) diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in index aa58f8d593..f6f2ca8fc2 100644 --- a/package/atkmm/Config.in +++ b/package/atkmm/Config.in @@ -2,10 +2,10 @@ config BR2_PACKAGE_ATKMM bool "atkmm" depends on BR2_INSTALL_LIBSTDCPP # glibmm depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc - depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 - depends on BR2_USE_MMU # atk/glibmm -> libglib2 - depends on BR2_USE_WCHAR # atk/glibmm -> libglib2 - select BR2_PACKAGE_ATK + depends on BR2_TOOLCHAIN_HAS_THREADS # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_MMU # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_WCHAR # at-spi2-core/glibmm -> libglib2 + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_GLIBMM select BR2_PACKAGE_LIBSIGC diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk index 7ceb87b047..da763c8386 100644 --- a/package/atkmm/atkmm.mk +++ b/package/atkmm/atkmm.mk @@ -11,6 +11,6 @@ ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR) ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) ATKMM_LICENSE_FILES = COPYING COPYING.tools ATKMM_INSTALL_STAGING = YES -ATKMM_DEPENDENCIES = atk glibmm libsigc host-pkgconf +ATKMM_DEPENDENCIES = at-spi2-core glibmm libsigc host-pkgconf $(eval $(meson-package)) diff --git a/package/libglade/Config.in b/package/libglade/Config.in index c97c9becd2..8d0d26f159 100644 --- a/package/libglade/Config.in +++ b/package/libglade/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBGLADE depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_LIBXML2 help Libglade allows you to load glade interface files in a program diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk index 21aed60605..af73d8bd00 100644 --- a/package/libglade/libglade.mk +++ b/package/libglade/libglade.mk @@ -9,7 +9,7 @@ LIBGLADE_VERSION = $(LIBGLADE_VERSION_MAJOR).4 LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2 LIBGLADE_SITE = https://download.gnome.org/sources/libglade/$(LIBGLADE_VERSION_MAJOR) LIBGLADE_INSTALL_STAGING = YES -LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2 +LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 at-spi2-core libxml2 LIBGLADE_LICENSE = LGPL-2.0+ LIBGLADE_LICENSE_FILES = COPYING diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index c75c37fb63..f2888b2f51 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 859925e8d3..608c263e4d 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -23,7 +23,7 @@ LIBGTK2_CONF_ENV = \ LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no -LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk \ +LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango at-spi2-core \ gdk-pixbuf $(TARGET_NLS_DEPENDENCIES) LIBGTK2_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS) diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 82ca68d2da..34b8d49eb3 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -23,7 +23,7 @@ config BR2_PACKAGE_LIBGTK3 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 283c129cef..2821c7eb52 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -14,7 +14,7 @@ LIBGTK3_CPE_ID_VENDOR = gnome LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \ +LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 at-spi2-core libglib2 cairo pango \ gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -- 2.39.2 From thomas at devoogdt.com Tue Feb 21 19:28:02 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 21 Feb 2023 20:28:02 +0100 Subject: [Buildroot] [PATCH v3 4/4] package/libgtk3: only update-icon-cache when the demos are built In-Reply-To: <20230221192802.4117856-1-thomas.devoogdt@barco.com> References: <20230221192802.4117856-1-thomas.devoogdt@barco.com> Message-ID: <20230221192802.4117856-4-thomas.devoogdt@barco.com> Similar to: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4358/diffs Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) --- package/libgtk3/libgtk3.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 2821c7eb52..b78578d568 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -145,11 +145,13 @@ endef # Create icon-theme.cache for each of the icon directories/themes # It's not strictly necessary but speeds up lookups +ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y) define LIBGTK3_UPDATE_ICON_CACHE find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; endef LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE +endif $(eval $(meson-package)) $(eval $(host-generic-package)) -- 2.39.2 From peter at korsgaard.com Tue Feb 21 19:58:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 20:58:01 +0100 Subject: [Buildroot] [git commit] package/elf2flt: fix error when building gdb for target on m68k In-Reply-To: <20230205141346.2F75283842@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Sun, 5 Feb 2023 15:13:15 +0100") References: <20230205141346.2F75283842@busybox.osuosl.org> Message-ID: <87wn4ayenq.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=f6f15e85b3ac58ba1d387ea86945d3fabf4f8990 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Thomas reported that m68k fails to build when enabling BR2_PACKAGE_GDB. > It fails when building gdb for the target with the following error: > elf2flt: ERROR: text=0x3c826 overlaps data=0x256e0 ? > It turns out that the gdb binary has another problematic input section > (.gcc_except_table), which causes elf2flt to try to append to the .text > output section, after it has already moved on with appending sections > to the .data output section. > elf2flt cannot append to a previous output section once it has moved on > to another output section. > Update the existing elf2flt patch to also add an exception for > .gcc_except_table. > Reported-by: Thomas Petazzoni > Signed-off-by: Niklas Cassel > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Tue Feb 21 20:01:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:01:45 +0100 Subject: [Buildroot] [git commit branch/next] package/openmpi: bump to version 4.1.4 Message-ID: <20230221200211.6B5768660C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec7258f3f4ea4442cd1f8c78a066a062a4d0cbd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Notable changes in this commit: - change from v4.0.x to v4.1.x "current" version series, - move the sha256 hash out of the "Locally computed" section, as the value comes from the download page, - the LICENSE file hash changed, as the file was updated (copyright years updated and new contributors added), - the IME (Infinite Memory Engine), introduced in v4.1.x, is disabled to workaround a failure when cross-compiled, - the package now requires a toolchain with atomic support, and needs to link against libatomic when needed. For change log since v4.0.0, see: - https://github.com/open-mpi/ompi/blob/v4.1.4/NEWS#L61 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/openmpi/Config.in | 2 ++ package/openmpi/openmpi.hash | 10 +++++----- package/openmpi/openmpi.mk | 17 ++++++++++++++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/package/openmpi/Config.in b/package/openmpi/Config.in index 4413c55f9c..e64eb81c3e 100644 --- a/package/openmpi/Config.in +++ b/package/openmpi/Config.in @@ -1,5 +1,6 @@ comment "openmpi needs a toolchain w/ dynamic library, NPTL, wchar, C++" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_sparc depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP @@ -8,6 +9,7 @@ config BR2_PACKAGE_OPENMPI bool "openmpi" depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # dlfcn.h diff --git a/package/openmpi/openmpi.hash b/package/openmpi/openmpi.hash index a399adc758..745ed7c580 100644 --- a/package/openmpi/openmpi.hash +++ b/package/openmpi/openmpi.hash @@ -1,6 +1,6 @@ -# From: https://www.open-mpi.org/software/ompi/v4.0/ -md5 e3da67df1e968c8798827e0e5fe9a510 openmpi-4.0.0.tar.bz2 -sha1 fee1d0287abfb150bae16957de342752c9bdd4e8 openmpi-4.0.0.tar.bz2 +# From: https://www.open-mpi.org/software/ompi/v4.1/ +md5 f057e12aabaf7dd5a6a658180fca404e openmpi-4.1.4.tar.bz2 +sha1 357c61a8e06e103d987c0e4a054e8780a034c8b1 openmpi-4.1.4.tar.bz2 +sha256 92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d openmpi-4.1.4.tar.bz2 # Locally computed -sha256 2f0b8a36cfeb7354b45dda3c5425ef8393c9b04115570b615213faaa3f97366b openmpi-4.0.0.tar.bz2 -sha256 8298a80ed5f09cfd007bae1c0e7d67d1c2810c6389876778dad070c31a691dac LICENSE +sha256 2db71de9577ebfe15c186605844c470dcecd3717f4ef0118c9440d801c0f58f8 LICENSE diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index 8bdc3fa188..f14b55ced5 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -4,14 +4,21 @@ # ################################################################################ -OPENMPI_VERSION_MAJOR = 4.0 -OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).0 +OPENMPI_VERSION_MAJOR = 4.1 +OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).4 OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2 OPENMPI_LICENSE = BSD-3-Clause OPENMPI_LICENSE_FILES = LICENSE OPENMPI_INSTALL_STAGING = YES +# The macro searching for IME (Infinite Memory Engine) filesystem +# brings "-I/usr/local/include" in the CPPFLAGS, even if not +# found. This makes the configuration fail. See: +# https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 +# Disable explicitly to avoid the issue. +OPENMPI_CONF_OPTS = --without-ime + # Enabling Fortran support requires pre-seeding the configure script # with various values that cannot be guessed, so we provide cache # files for various architectures. @@ -43,6 +50,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) OPENMPI_CFLAGS += -O0 endif -OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +OPENMPI_LIBS += -latomic +endif + +OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" LIBS="$(OPENMPI_LIBS)" $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Tue Feb 21 20:04:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:04:10 +0100 Subject: [Buildroot] [PATCH] package/jpeg: fix build failure when qt5base tries to use libjpeg In-Reply-To: <20230221183051.4011311-1-giulio.benetti@benettiengineering.com> References: <20230221183051.4011311-1-giulio.benetti@benettiengineering.com> Message-ID: <20230221210410.61bd1054@windsurf> On Tue, 21 Feb 2023 19:30:51 +0100 Giulio Benetti wrote: > Qt5 fails to build with libjpeg since the API is different from > libjpeg-turbo and libjpeg-turbo is pointed as the library Qt5 usually link > against to[0]. So let's default jpeg variant to libjpeg-turbo if > BR2_PACKAGE_QT5BASE_JPEG is selected. > > Fixes: > still not failed > > [0]: https://doc.qt.io/qt-5/qtgui-index.html#licenses-and-attributions > > Signed-off-by: Giulio Benetti > --- > package/jpeg/Config.in | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in > index 371f89aa49..3a39a0dfb8 100644 > --- a/package/jpeg/Config.in > +++ b/package/jpeg/Config.in > @@ -16,7 +16,8 @@ if BR2_PACKAGE_JPEG > > choice > prompt "jpeg variant" > - default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT > + default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT || \ > + BR2_PACKAGE_QT5BASE_JPEG I don't think this will work, as it doesn't prevent from using classic libjpeg with Qt5, it only changes the default. So a user can still select Qt5 + classic libjpeg, and the autobuilder randomization will also generate such configurations. If really classic libjpeg are jpeg-turbo are no longer compatible, then we probably need to drop the virtual package entirely... but it's going to be a lot of work to handle both variants in all packages using jpeg... 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 Feb 21 20:06:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:06:06 +0100 Subject: [Buildroot] [PATCH 2/5] package/openmpi: bump to version 4.1.4 In-Reply-To: <20230207220941.58066-2-ju.o@free.fr> References: <20230207220941.58066-1-ju.o@free.fr> <20230207220941.58066-2-ju.o@free.fr> Message-ID: <20230221210606.03e4b536@windsurf> Hello Julien, On Tue, 7 Feb 2023 23:09:38 +0100 Julien Olivain wrote: > diff --git a/package/openmpi/Config.in b/package/openmpi/Config.in > index 4413c55f9c..80b01a26e1 100644 > --- a/package/openmpi/Config.in > +++ b/package/openmpi/Config.in > @@ -8,6 +8,7 @@ config BR2_PACKAGE_OPENMPI > bool "openmpi" > depends on BR2_USE_MMU # fork() > depends on BR2_USE_WCHAR > + depends on BR2_TOOLCHAIN_HAS_ATOMIC This should affect the dependencies of the Config.in comment, so I fixed that up and applied your patch to the next branch. Thanks! 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 Tue Feb 21 20:08:57 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 21 Feb 2023 21:08:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast In-Reply-To: <20230221154827.7e737960@windsurf> References: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> <20230221154827.7e737960@windsurf> Message-ID: <20230221200857.GG2718518@scaer> Fabrice, all, On 2023-02-21 15:48 +0100, Thomas Petazzoni spake thusly: > Hello Fabrice, > > On Tue, 21 Feb 2023 15:21:44 +0100 > Fabrice Fontaine wrote: > > > systemd can't be built with -Ofast since version 252 and > > https://github.com/systemd/systemd/commit/60f97fee2d2f948c8e8963ea8ff767008cb93cae > > resulting in the following build failure since bump to version 252.4 in > > commit a2c823d1f548d5a0120d27d6c000603192360f7b: > > > > ../output-1/build/systemd-252.4/meson.build:397:8: ERROR: Problem encountered: -Ofast, -ffast-math, or -ffinite-math-only is specified in c_args. > > > > While at it, revert changes made by commit 9cd084b54e2223e49c37962b0cbefae7bea26ef5 > > > > Fixes: > > - http://autobuild.buildroot.org/results/8f41c4984b645851724e554c3162b83bc312bee7 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/systemd/Config.in | 1 + > > package/systemd/systemd.mk | 5 ----- > > system/Config.in | 4 ++++ > > 3 files changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > > index 9f4d933779..5bbdbb405f 100644 > > --- a/package/systemd/Config.in > > +++ b/package/systemd/Config.in > > @@ -25,6 +25,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > > depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 > > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > > depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd > > + depends on !BR2_OPTIMIZE_FAST > I really dislike this. Agreed. > > -SYSTEMD_CFLAGS = $(TARGET_CFLAGS) > > -ifeq ($(BR2_OPTIMIZE_FAST),y) > > -SYSTEMD_CFLAGS += -O3 > > -endif > > And this should work. It's really systemd that is stupid to look for > -Ofast in c_flags without seeing that -O3 later overrides it. Indeed. Probably something along the lines of: SYSTEMD_CFLAGS = $(filter-out -Ofast,$(TARGET_CFLAGS)) would do the trick? Alternatively, as the upstream commit also implies, maybe we should in this case keep -Ofast and just add: SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-finite-math-only 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 thomas.petazzoni at bootlin.com Tue Feb 21 20:26:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:26:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast In-Reply-To: <20230221200857.GG2718518@scaer> References: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> <20230221154827.7e737960@windsurf> <20230221200857.GG2718518@scaer> Message-ID: <20230221212634.736f8d70@windsurf> On Tue, 21 Feb 2023 21:08:57 +0100 "Yann E. MORIN" wrote: > Alternatively, as the upstream commit also implies, maybe we should in > this case keep -Ofast and just add: > > SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-finite-math-only But the upstream commit causes the build to bail out as soon as -Ofast is in the CFLAGS, so even if you specify -Ofast -fno-finite-math-only, systemd's meson machinery will bail out. So your other idea of: SYSTEMD_CFLAGS = $(filter-out -Ofast,$(TARGET_CFLAGS)) certainly looks very relevant. Fabrice, could you give it a try? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Tue Feb 21 20:32:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:32:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/opusfile: fix CVE-2022-47021 In-Reply-To: <20230205130600.18051-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 5 Feb 2023 14:06:00 +0100") References: <20230205130600.18051-1-fontaine.fabrice@gmail.com> Message-ID: <87sfeyyd1p.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > A null pointer dereference issue was discovered in functions op_get_data > and op_open1 in opusfile.c in xiph opusfile 0.9 thru 0.12 allows > attackers to cause denial of service or other unspecified impacts. > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Tue Feb 21 20:34:03 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 21 Feb 2023 21:34:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast In-Reply-To: <20230221212634.736f8d70@windsurf> References: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> <20230221154827.7e737960@windsurf> <20230221200857.GG2718518@scaer> <20230221212634.736f8d70@windsurf> Message-ID: <20230221203403.GH2718518@scaer> On 2023-02-21 21:26 +0100, Thomas Petazzoni spake thusly: > On Tue, 21 Feb 2023 21:08:57 +0100 > "Yann E. MORIN" wrote: > > > Alternatively, as the upstream commit also implies, maybe we should in > > this case keep -Ofast and just add: > > > > SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-finite-math-only > > But the upstream commit causes the build to bail out as soon as -Ofast > is in the CFLAGS, so even if you specify -Ofast -fno-finite-math-only, > systemd's meson machinery will bail out. The upstream code is (split for readability): if (('-Ofast' in c_args or '-ffast-math' in c_args or '-ffinite-math-only' in c_args ) and not '-fno-finite-math-only' in c_args ) So, if -fno-finite-math-only is in c_args, then the whole condition should evaluate to false, and thus it should not error out, right? Or did I lose more than my grep-fu? ;-) Regards, Yann E. MORIN. > So your other idea of: > > SYSTEMD_CFLAGS = $(filter-out -Ofast,$(TARGET_CFLAGS)) > > certainly looks very relevant. > > Fabrice, could you give it a try? > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com -- .-----------------.--------------------.------------------.--------------------. | 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 Tue Feb 21 20:34:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:34:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/modsecurity2: security bump to version 2.9.7 In-Reply-To: <20230205140002.154492-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 5 Feb 2023 15:00:02 +0100") References: <20230205140002.154492-1-fontaine.fabrice@gmail.com> Message-ID: <87o7pmycz2.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads > in ModSecurity before 2.9.7 may allow for Web Application Firewall > bypasses and buffer overflows on the Web Application Firewall when > executing rules that read the FILES_TMP_CONTENT collection. > - host-pkgconf is mandatory and used to find libxml2 since > https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 > - pcre2 is supported since: > https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 > https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:34:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:34:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/modsecurity2: disable pcre In-Reply-To: <20230219165638.147772-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 19 Feb 2023 17:56:38 +0100") References: <20230219165638.147772-1-fontaine.fabrice@gmail.com> Message-ID: <87k00aycye.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable pcre to avoid the following build failure if pcre-config is > found on host raised since bump to version 2.9.7 in commit > 42e34cf10f9eb037aa8c48a4fb9e8f521901b983: > /home/thomas/autobuild/instance-0/output-1/per-package/modsecurity2/host/bin/../lib/gcc/mips64el-buildroot-linux-gnu/11.3.0/../../../../mips64el-buildroot-linux-gnu/bin/ld: > cannot find -lpcre: No such file or directory > Fixes: > - http://autobuild.buildroot.org/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:38:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:38:33 +0100 Subject: [Buildroot] [PATCH 1/2] package/upx: bump to version 4.0.1 In-Reply-To: <20221223173818.51581-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 23 Dec 2022 18:38:17 +0100") References: <20221223173818.51581-1-fontaine.fabrice@gmail.com> Message-ID: <87fsayycs6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Drop patch (already in version) > - cmake must be used since > https://github.com/upx/upx/commit/c7d8b6fed1b551158540e1d2e884dc224fce474c > - ucl and zlib are directly included in upx since > https://github.com/upx/upx/commit/61e1366122f8d1b9e2434a8103e7af00a35ea902 > https://github.com/upx/upx/blob/v4.0.1/NEWS > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:38:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:38:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/upx: security bump to version 4.0.2 In-Reply-To: <20230205140602.161881-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 5 Feb 2023 15:06:02 +0100") References: <20230205140602.161881-1-fontaine.fabrice@gmail.com> Message-ID: <87bklmycrt.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in > UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to > cause a denial of service (abort) via a crafted file. > Fix CVE-2023-23457: A Segmentation fault was found in UPX in > PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a > crafted input file allows invalid memory address access that could lead > to a denial of service. > https://github.com/upx/upx/blob/v4.0.2/NEWS > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:43:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:43:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 4.0.3 In-Reply-To: <20230205142543.285695-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 5 Feb 2023 15:25:43 +0100") References: <20230205142543.285695-1-fontaine.fabrice@gmail.com> Message-ID: <877cwayckl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-0411, CVE-2023-0412, CVE-2023-0413, CVE-2023-0414, > CVE-2023-0415, CVE-2023-0416 and CVE-2023-0417 > https://www.wireshark.org/security/wnpa-sec-2023-01 > https://www.wireshark.org/security/wnpa-sec-2023-02 > https://www.wireshark.org/security/wnpa-sec-2023-03 > https://www.wireshark.org/security/wnpa-sec-2023-04 > https://www.wireshark.org/security/wnpa-sec-2023-05 > https://www.wireshark.org/security/wnpa-sec-2023-06 > https://www.wireshark.org/security/wnpa-sec-2023-07 > https://www.wireshark.org/docs/relnotes/wireshark-4.0.3.html It looks like these issues do not affect 3.4.x, so I have NOT backported this. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:46:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:46:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/tmux: add utf8proc optional dependency In-Reply-To: <20230205132307.41753-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 5 Feb 2023 14:23:07 +0100") References: <20230205132307.41753-1-fontaine.fabrice@gmail.com> Message-ID: <87356yycf9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > utf8proc is an optional dependency since version 2.3 and > https://github.com/tmux/tmux/commit/6c94774b70f72952c4c512e4aa59a207ca1c34f2 > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x and 2022.02.x, thanks. > --- > package/tmux/tmux.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk > index 281b7d8ee6..b1c0af1a83 100644 > --- a/package/tmux/tmux.mk > +++ b/package/tmux/tmux.mk > @@ -11,6 +11,13 @@ TMUX_LICENSE_FILES = COPYING > TMUX_CPE_ID_VENDOR = tmux_project > TMUX_DEPENDENCIES = libevent ncurses host-pkgconf > +ifeq ($(BR2_PACKAGE_UTF8PROC),y) > +TMUX_DEPENDENCIES += utf8proc > +TMUX_CONF_OPTS += --enable-utf8proc > +else > +TMUX_CONF_OPTS += --disable-utf8proc > +endif > + > # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear > # can reject the user connection. See man shells. > define TMUX_ADD_TMUX_TO_SHELLS > -- > 2.39.0 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:47:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:47:42 +0100 Subject: [Buildroot] [git commit] package/xxhash: use MOREFLAGS instead of overriding CFLAGS In-Reply-To: <20230206083621.0D5EB83950@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Mon, 6 Feb 2023 09:34:39 +0100") References: <20230206083621.0D5EB83950@busybox.osuosl.org> Message-ID: <87y1oqwxsh.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=bfef88762d19b2fd8f99b55cee5c9ebaf986e1c7 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Set MOREFLAGS instead of overriding CFLAGS to avoid the following build > failure raised since commit 94b66fb49cd57d0863245fbe0a3dc0833e76aad0: > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /tmp/ccabb8cF.o: relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC > Fixes: > - http://autobuild.buildroot.org/results/953133575d8c13266f1450fa545e70e4a518508d > Signed-off-by: Fabrice Fontaine > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:32:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:32:16 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/opusfile: fix CVE-2022-47021 Message-ID: <20230221204754.881978662D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3959f94377fd1d36c5779791320bbaee0f383e24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x A null pointer dereference issue was discovered in functions op_get_data and op_open1 in opusfile.c in xiph opusfile 0.9 thru 0.12 allows attackers to cause denial of service or other unspecified impacts. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ae65870e652088dd65ca41d63304893d1d4443a2) Signed-off-by: Peter Korsgaard --- ...e-allocation-failure-from-ogg_sync_buffer.patch | 44 ++++++++++++++++++++++ package/opusfile/opusfile.mk | 3 ++ 2 files changed, 47 insertions(+) diff --git a/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch new file mode 100644 index 0000000000..2ef08502ab --- /dev/null +++ b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch @@ -0,0 +1,44 @@ +From 0a4cd796df5b030cb866f3f4a5e41a4b92caddf5 Mon Sep 17 00:00:00 2001 +From: Ralph Giles +Date: Tue, 6 Sep 2022 19:04:31 -0700 +Subject: [PATCH] Propagate allocation failure from ogg_sync_buffer. + +Instead of segfault, report OP_EFAULT if ogg_sync_buffer returns +a null pointer. This allows more graceful recovery by the caller +in the unlikely event of a fallible ogg_malloc call. + +We do check the return value elsewhere in the code, so the new +checks make the code more consistent. + +Thanks to https://github.com/xiph/opusfile/issues/36 for reporting. + +Signed-off-by: Timothy B. Terriberry +Signed-off-by: Mark Harris + +[Retrieved from: +https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5] +Signed-off-by: Fabrice Fontaine +--- + src/opusfile.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/opusfile.c b/src/opusfile.c +index ca219b2..3c3c81e 100644 +--- a/src/opusfile.c ++++ b/src/opusfile.c +@@ -148,6 +148,7 @@ static int op_get_data(OggOpusFile *_of,int _nbytes){ + int nbytes; + OP_ASSERT(_nbytes>0); + buffer=(unsigned char *)ogg_sync_buffer(&_of->oy,_nbytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + nbytes=(int)(*_of->callbacks.read)(_of->stream,buffer,_nbytes); + OP_ASSERT(nbytes<=_nbytes); + if(OP_LIKELY(nbytes>0))ogg_sync_wrote(&_of->oy,nbytes); +@@ -1527,6 +1528,7 @@ static int op_open1(OggOpusFile *_of, + if(_initial_bytes>0){ + char *buffer; + buffer=ogg_sync_buffer(&_of->oy,(long)_initial_bytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + memcpy(buffer,_initial_data,_initial_bytes*sizeof(*buffer)); + ogg_sync_wrote(&_of->oy,(long)_initial_bytes); + } diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk index 72ae82e801..63553a81e7 100644 --- a/package/opusfile/opusfile.mk +++ b/package/opusfile/opusfile.mk @@ -11,6 +11,9 @@ OPUSFILE_LICENSE = BSD-3-Clause OPUSFILE_LICENSE_FILES = COPYING OPUSFILE_INSTALL_STAGING = YES +# 0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch +OPUSFILE_IGNORE_CVES += CVE-2022-47021 + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPUSFILE_DEPENDENCIES += openssl else From peter at korsgaard.com Tue Feb 21 20:33:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:33:45 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/modsecurity2: disable pcre Message-ID: <20230221204754.A291186630@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cefcf40163f6fe0be7023571d1488f6133e29ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Disable pcre to avoid the following build failure if pcre-config is found on host raised since bump to version 2.9.7 in commit 42e34cf10f9eb037aa8c48a4fb9e8f521901b983: /home/thomas/autobuild/instance-0/output-1/per-package/modsecurity2/host/bin/../lib/gcc/mips64el-buildroot-linux-gnu/11.3.0/../../../../mips64el-buildroot-linux-gnu/bin/ld: cannot find -lpcre: No such file or directory Fixes: - http://autobuild.buildroot.org/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 06af305874abc1eb4bb98dbd8aabe071fa5d77bc) Signed-off-by: Peter Korsgaard --- package/modsecurity2/modsecurity2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index c251291e64..88bbf3bb29 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -21,6 +21,7 @@ MODSECURITY2_CONF_OPTS = \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ --without-curl \ --without-lua \ + --without-pcre \ --without-yajl \ --without-ssdeep From peter at korsgaard.com Tue Feb 21 20:33:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:33:34 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/modsecurity2: security bump to version 2.9.7 Message-ID: <20230221204754.945BA8662F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3665ba04bc683ccb9e44a182c8992cfd00ec76c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads in ModSecurity before 2.9.7 may allow for Web Application Firewall bypasses and buffer overflows on the Web Application Firewall when executing rules that read the FILES_TMP_CONTENT collection. - host-pkgconf is mandatory and used to find libxml2 since https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 - pcre2 is supported since: https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 42e34cf10f9eb037aa8c48a4fb9e8f521901b983) Signed-off-by: Peter Korsgaard --- package/modsecurity2/Config.in | 2 +- package/modsecurity2/modsecurity2.hash | 4 ++-- package/modsecurity2/modsecurity2.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in index 2870386a99..fb1bfc960e 100644 --- a/package/modsecurity2/Config.in +++ b/package/modsecurity2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_MODSECURITY2 bool "modsecurity2" depends on BR2_PACKAGE_APACHE select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help ModSecurity is an open source, cross-platform web application firewall (WAF) module. Known as the "Swiss Army Knife" of diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash index a19f4823a8..2c77ffd830 100644 --- a/package/modsecurity2/modsecurity2.hash +++ b/package/modsecurity2/modsecurity2.hash @@ -1,5 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.5/modsecurity-2.9.5.tar.gz.sha256 -sha256 e2bfc8cd8b8de1e21f054d310543373ea5d89adbd96784e832be0da3e4dc149e modsecurity-2.9.5.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz.sha256 +sha256 2a28fcfccfef21581486f98d8d5fe0397499749b8380f60ec7bb1c08478e1839 modsecurity-2.9.7.tar.gz # Locally computed sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index a1ad8fe5bc..c251291e64 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODSECURITY2_VERSION = 2.9.5 +MODSECURITY2_VERSION = 2.9.7 MODSECURITY2_SOURCE = modsecurity-$(MODSECURITY2_VERSION).tar.gz MODSECURITY2_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) MODSECURITY2_LICENSE = Apache-2.0 @@ -12,11 +12,10 @@ MODSECURITY2_LICENSE_FILES = LICENSE MODSECURITY2_CPE_ID_VENDOR = trustwave MODSECURITY2_CPE_ID_PRODUCT = modsecurity MODSECURITY2_INSTALL_STAGING = YES -MODSECURITY2_DEPENDENCIES = apache libxml2 pcre +MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 MODSECURITY2_CONF_OPTS = \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ - --with-libxml=$(STAGING_DIR)/usr \ + --with-pcre2=$(STAGING_DIR)/usr/bin/pcre2-config \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ --with-apu=$(STAGING_DIR)/usr/bin/apu-1-config \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ From peter at korsgaard.com Tue Feb 21 20:43:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:43:55 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/tmux: add utf8proc optional dependency Message-ID: <20230221204754.C88638662F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=527e770697eec7cbc8c7b18bb44fd8e014c33f68 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x utf8proc is an optional dependency since version 2.3 and https://github.com/tmux/tmux/commit/6c94774b70f72952c4c512e4aa59a207ca1c34f2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 1f618aa388535181c281c85e2b5264532de4ef0f) Signed-off-by: Peter Korsgaard --- package/tmux/tmux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 281b7d8ee6..b1c0af1a83 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -11,6 +11,13 @@ TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_UTF8PROC),y) +TMUX_DEPENDENCIES += utf8proc +TMUX_CONF_OPTS += --enable-utf8proc +else +TMUX_CONF_OPTS += --disable-utf8proc +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS From peter at korsgaard.com Tue Feb 21 19:53:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 20:53:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/elf2flt: fix error when building gdb for target on m68k Message-ID: <20230221204754.7C2A48662C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26df863eb6f8f91f2d8167cecff35a6a98d03cc5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Thomas reported that m68k fails to build when enabling BR2_PACKAGE_GDB. It fails when building gdb for the target with the following error: elf2flt: ERROR: text=0x3c826 overlaps data=0x256e0 ? It turns out that the gdb binary has another problematic input section (.gcc_except_table), which causes elf2flt to try to append to the .text output section, after it has already moved on with appending sections to the .data output section. elf2flt cannot append to a previous output section once it has moved on to another output section. Update the existing elf2flt patch to also add an exception for .gcc_except_table. Reported-by: Thomas Petazzoni Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni (cherry picked from commit f6f15e85b3ac58ba1d387ea86945d3fabf4f8990) Signed-off-by: Peter Korsgaard --- ...-fatal-error-regression-on-m68k-xtensa-ri.patch | 47 +++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch index 278709cb1c..616bbc891f 100644 --- a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch +++ b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch @@ -1,8 +1,7 @@ -From 65ac5f9e69cfb989d970da74c41e478774d29be5 Mon Sep 17 00:00:00 2001 +From a8c9f650b82109abf7aa730f298ea5182ed62613 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 9 Aug 2022 21:06:05 +0200 -Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, - riscv64 +Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64 Commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") changed the condition of which input sections that should be included @@ -12,16 +11,15 @@ to: ((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == (SEC_DATA | SEC_READONLY | SEC_RELOC)) -On ARM, the .eh_frame input section does not have the SEC_RELOC flag -set, so this specific change had no effect on ARM. +On ARM, the .eh_frame input section does not have the SEC_RELOC flag set, +so on ARM, this change caused .eh_frame to move from .text to .data. -However, on e.g. m68k and riscv64, the .eh_frame input section does -have the SEC_RELOC flag set, which means that after commit ba379d08bb78 -("elf2flt: fix for segfault on some ARM ELFs"), read-only relocation -data sections were placed in .text output section, instead of .data -output section. +However, on e.g. m68k, xtensa and riscv64, the .eh_frame input section +does have the SEC_RELOC flag set, which means that the change in +commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") +caused .eh_frame to move in an opposite way, i.e. from .data to .text. -This will result in a fatal error on m68k, xtensa and riscv64: +This resulted in a fatal error on m68k, xtensa and riscv64: ERROR: text=0x3bab8 overlaps data=0x33f60 ? This is because elf2flt cannot append to .text after .data has been @@ -36,21 +34,26 @@ to .text after .data has been appended to (which will require elf2flt to move/relocate everything that has already been appended to .data, since the virtual addresses are contiguous). -However, for now, add an exception for m68k, xtensa and riscv64 -(specifically for the problematic input section, .eh_frame), so that we -get the same behavior as older elf2flt releases, where we put read-only -relocation data in .data, which was working perfectly fine. +However, for now, add an exception for input sections which have all +three flags SEC_DATA, SEC_READONLY, and SEC_RELOC set, and which have a +name equal to a problematic input section (.eh_frame, .gcc_except_table). +That way, we get the same behavior as older elf2flt releases for m68k, +xtensa and riscv64, where we put read-only relocation data in .data, +which was working perfectly fine. + +This exception will not change any behavior on ARM, as the .eh_frame +input section does not have flag SEC_RELOC set. Signed-off-by: Niklas Cassel --- - elf2flt.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) + elf2flt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/elf2flt.c b/elf2flt.c -index 9c32f9a..a680c89 100644 +index e0d7891..39d035f 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -340,8 +340,15 @@ compare_relocs (const void *pa, const void *pb) +@@ -341,8 +341,13 @@ compare_relocs (const void *pa, const void *pb) static bool ro_reloc_data_section_should_be_in_text(asection *s) { @@ -58,10 +61,8 @@ index 9c32f9a..a680c89 100644 - (SEC_DATA | SEC_READONLY | SEC_RELOC); + if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == + (SEC_DATA | SEC_READONLY | SEC_RELOC)) { -+#if defined(TARGET_m68k) || defined(TARGET_riscv64) || defined(TARGET_xtensa) -+ if (!strcmp(".eh_frame", s->name)) ++ if (!strcmp(".eh_frame", s->name) || !strcmp(".gcc_except_table", s->name)) + return false; -+#endif + return true; + } + return false; @@ -69,5 +70,5 @@ index 9c32f9a..a680c89 100644 static uint32_t * -- -2.37.1 +2.39.0 From peter at korsgaard.com Tue Feb 21 20:47:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:47:23 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/xxhash: use MOREFLAGS instead of overriding CFLAGS Message-ID: <20230221204754.DC68385DB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81344a37d6640a75ab3c9e37fb1cc769fa5ec5b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Set MOREFLAGS instead of overriding CFLAGS to avoid the following build failure raised since commit 94b66fb49cd57d0863245fbe0a3dc0833e76aad0: /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /tmp/ccabb8cF.o: relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC Fixes: - http://autobuild.buildroot.org/results/953133575d8c13266f1450fa545e70e4a518508d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit bfef88762d19b2fd8f99b55cee5c9ebaf986e1c7) Signed-off-by: Peter Korsgaard --- package/xxhash/xxhash.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 40e3c2696c..75d375a2fa 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -28,8 +28,7 @@ endif define XXHASH_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - CFLAGS="$(TARGET_CFLAGS) -DXXH_NO_INLINE_HINTS" \ - $(XXHASH_TARGETS) + MOREFLAGS=-DXXH_NO_INLINE_HINTS $(XXHASH_TARGETS) endef define XXHASH_INSTALL_STAGING_CMDS From peter at korsgaard.com Tue Feb 21 20:36:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:36:37 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/upx: bump to version 4.0.1 Message-ID: <20230221204754.ADB3885DB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b87222f6bfb424e15039c59722415558d7ff18ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x - Drop patch (already in version) - cmake must be used since https://github.com/upx/upx/commit/c7d8b6fed1b551158540e1d2e884dc224fce474c - ucl and zlib are directly included in upx since https://github.com/upx/upx/commit/61e1366122f8d1b9e2434a8103e7af00a35ea902 https://github.com/upx/upx/blob/v4.0.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 1567516d8984a4bddfbee30ee69c771cf3f8e224) Signed-off-by: Peter Korsgaard --- ...1-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch | 80 ---------------------- package/upx/upx.hash | 2 +- package/upx/upx.mk | 22 +----- 3 files changed, 4 insertions(+), 100 deletions(-) diff --git a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch b/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch deleted file mode 100644 index 6fae9cac0e..0000000000 --- a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001 -From: John Reiser -Date: Fri, 11 Dec 2020 13:38:18 -0800 -Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ - -https://github.com/upx/upx/issues/421 - modified: p_lx_elf.cpp - -[Retrieved from: -https://github.com/upx/upx/commit/3781df9da23840e596d5e9e8493f22666802fe6c] -Signed-off-by: Fabrice Fontaine ---- - src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 5 deletions(-) - -diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp -index 182db192f..3a4101cf7 100644 ---- a/src/p_lx_elf.cpp -+++ b/src/p_lx_elf.cpp -@@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack() - int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ]; - if (z_rel && z_rsz) { - unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val); -+ if ((unsigned)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_REL] %#x\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off]; - unsigned relsz = get_te32(&dynseg[-1+ z_rsz].d_val); -+ if ((unsigned)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_RELSZ] %#x\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp); - for (; rp < last; ++rp) { - unsigned r_va = get_te32(&rp->r_offset); -@@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack() - int z_rel = dt_table[Elf64_Dyn::DT_RELA]; - int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ]; - if (z_rel && z_rsz) { -- unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ if ((u64_t)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELA] %#llx\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off]; -- unsigned relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ upx_uint64_t relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ if ((u64_t)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELASZ] %#llx\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp); - for (; rp < last; ++rp) { -- unsigned r_va = get_te64(&rp->r_offset); -+ upx_uint64_t r_va = get_te64(&rp->r_offset); - if (r_va == user_init_ava) { // found the Elf64_Rela -- unsigned r_info = get_te64(&rp->r_info); -+ upx_uint64_t r_info = get_te64(&rp->r_info); - unsigned r_type = ELF64_R_TYPE(r_info); - if (Elf64_Ehdr::EM_AARCH64 == e_machine - && R_AARCH64_RELATIVE == r_type) { -@@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack() - } - else { - char msg[50]; snprintf(msg, sizeof(msg), -- "bad relocation %#x DT_INIT_ARRAY[0]", -+ "bad relocation %#llx DT_INIT_ARRAY[0]", - r_info); - throwCantPack(msg); - } diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 7f3698ca0d..9f7c40c819 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 47774df5c958f2868ef550fb258b97c73272cb1f44fe776b798e393465993714 upx-3.96-src.tar.xz +sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index e693a70db1..ef346b2310 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,28 +4,12 @@ # ################################################################################ -UPX_VERSION = 3.96 +UPX_VERSION = 4.0.1 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING UPX_CPE_ID_VENDOR = upx_project +UPX_SUPPORTS_IN_SOURCE_BUILD = NO -# 0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch -UPX_IGNORE_CVES += CVE-2021-20285 - -HOST_UPX_DEPENDENCIES = host-ucl host-zlib - -# We need to specify all, otherwise the default target only prints a message -# stating to "please choose a target for 'make'"... :-( -define HOST_UPX_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - UPX_UCLDIR=$(HOST_DIR) CXXFLAGS_WERROR= -C $(@D) all -endef - -# UPX has no install procedure, so install it manually. -define HOST_UPX_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/upx.out $(HOST_DIR)/bin/upx -endef - -$(eval $(host-generic-package)) +$(eval $(host-cmake-package)) From peter at korsgaard.com Tue Feb 21 20:37:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:37:06 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/upx: security bump to version 4.0.2 Message-ID: <20230221204754.BA3D686631@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5e565d9b2e9e2ec5098293b160ded29db2d03a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to cause a denial of service (abort) via a crafted file. Fix CVE-2023-23457: A Segmentation fault was found in UPX in PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a crafted input file allows invalid memory address access that could lead to a denial of service. https://github.com/upx/upx/blob/v4.0.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 02befac8f9404ae30d0d090221d21a8460c82ec7) Signed-off-by: Peter Korsgaard --- package/upx/upx.hash | 2 +- package/upx/upx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 9f7c40c819..7c24906152 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz +sha256 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f upx-4.0.2-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index ef346b2310..6018b0a63d 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPX_VERSION = 4.0.1 +UPX_VERSION = 4.0.2 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ From peter at korsgaard.com Tue Feb 21 20:32:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:32:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/opusfile: fix CVE-2022-47021 Message-ID: <20230221204903.1ADAA8666F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4aaa7f20775d3ef01df8544f5ebc21e54b91a67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x A null pointer dereference issue was discovered in functions op_get_data and op_open1 in opusfile.c in xiph opusfile 0.9 thru 0.12 allows attackers to cause denial of service or other unspecified impacts. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ae65870e652088dd65ca41d63304893d1d4443a2) Signed-off-by: Peter Korsgaard --- ...e-allocation-failure-from-ogg_sync_buffer.patch | 44 ++++++++++++++++++++++ package/opusfile/opusfile.mk | 3 ++ 2 files changed, 47 insertions(+) diff --git a/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch new file mode 100644 index 0000000000..2ef08502ab --- /dev/null +++ b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch @@ -0,0 +1,44 @@ +From 0a4cd796df5b030cb866f3f4a5e41a4b92caddf5 Mon Sep 17 00:00:00 2001 +From: Ralph Giles +Date: Tue, 6 Sep 2022 19:04:31 -0700 +Subject: [PATCH] Propagate allocation failure from ogg_sync_buffer. + +Instead of segfault, report OP_EFAULT if ogg_sync_buffer returns +a null pointer. This allows more graceful recovery by the caller +in the unlikely event of a fallible ogg_malloc call. + +We do check the return value elsewhere in the code, so the new +checks make the code more consistent. + +Thanks to https://github.com/xiph/opusfile/issues/36 for reporting. + +Signed-off-by: Timothy B. Terriberry +Signed-off-by: Mark Harris + +[Retrieved from: +https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5] +Signed-off-by: Fabrice Fontaine +--- + src/opusfile.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/opusfile.c b/src/opusfile.c +index ca219b2..3c3c81e 100644 +--- a/src/opusfile.c ++++ b/src/opusfile.c +@@ -148,6 +148,7 @@ static int op_get_data(OggOpusFile *_of,int _nbytes){ + int nbytes; + OP_ASSERT(_nbytes>0); + buffer=(unsigned char *)ogg_sync_buffer(&_of->oy,_nbytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + nbytes=(int)(*_of->callbacks.read)(_of->stream,buffer,_nbytes); + OP_ASSERT(nbytes<=_nbytes); + if(OP_LIKELY(nbytes>0))ogg_sync_wrote(&_of->oy,nbytes); +@@ -1527,6 +1528,7 @@ static int op_open1(OggOpusFile *_of, + if(_initial_bytes>0){ + char *buffer; + buffer=ogg_sync_buffer(&_of->oy,(long)_initial_bytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + memcpy(buffer,_initial_data,_initial_bytes*sizeof(*buffer)); + ogg_sync_wrote(&_of->oy,(long)_initial_bytes); + } diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk index 72ae82e801..63553a81e7 100644 --- a/package/opusfile/opusfile.mk +++ b/package/opusfile/opusfile.mk @@ -11,6 +11,9 @@ OPUSFILE_LICENSE = BSD-3-Clause OPUSFILE_LICENSE_FILES = COPYING OPUSFILE_INSTALL_STAGING = YES +# 0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch +OPUSFILE_IGNORE_CVES += CVE-2022-47021 + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPUSFILE_DEPENDENCIES += openssl else From peter at korsgaard.com Tue Feb 21 20:33:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:33:58 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/modsecurity2: security bump to version 2.9.7 Message-ID: <20230221204903.28F1886670@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f09b5bec825e039130b3400461b067bb535e3434 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Fix CVE-2023-24021: Incorrect handling of '\0' bytes in file uploads in ModSecurity before 2.9.7 may allow for Web Application Firewall bypasses and buffer overflows on the Web Application Firewall when executing rules that read the FILES_TMP_CONTENT collection. - host-pkgconf is mandatory and used to find libxml2 since https://github.com/SpiderLabs/ModSecurity/commit/baa38ddbaf55a87afecad7a1e1760c69a2689787 - pcre2 is supported since: https://github.com/SpiderLabs/ModSecurity/commit/8fc0b519b7a6c023259753a21f33bf3649a25b14 https://github.com/SpiderLabs/ModSecurity/blob/v2.9.7/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 42e34cf10f9eb037aa8c48a4fb9e8f521901b983) Signed-off-by: Peter Korsgaard --- package/modsecurity2/Config.in | 2 +- package/modsecurity2/modsecurity2.hash | 4 ++-- package/modsecurity2/modsecurity2.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in index 2870386a99..fb1bfc960e 100644 --- a/package/modsecurity2/Config.in +++ b/package/modsecurity2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_MODSECURITY2 bool "modsecurity2" depends on BR2_PACKAGE_APACHE select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help ModSecurity is an open source, cross-platform web application firewall (WAF) module. Known as the "Swiss Army Knife" of diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash index a19f4823a8..2c77ffd830 100644 --- a/package/modsecurity2/modsecurity2.hash +++ b/package/modsecurity2/modsecurity2.hash @@ -1,5 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.5/modsecurity-2.9.5.tar.gz.sha256 -sha256 e2bfc8cd8b8de1e21f054d310543373ea5d89adbd96784e832be0da3e4dc149e modsecurity-2.9.5.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz.sha256 +sha256 2a28fcfccfef21581486f98d8d5fe0397499749b8380f60ec7bb1c08478e1839 modsecurity-2.9.7.tar.gz # Locally computed sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index a1ad8fe5bc..c251291e64 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODSECURITY2_VERSION = 2.9.5 +MODSECURITY2_VERSION = 2.9.7 MODSECURITY2_SOURCE = modsecurity-$(MODSECURITY2_VERSION).tar.gz MODSECURITY2_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) MODSECURITY2_LICENSE = Apache-2.0 @@ -12,11 +12,10 @@ MODSECURITY2_LICENSE_FILES = LICENSE MODSECURITY2_CPE_ID_VENDOR = trustwave MODSECURITY2_CPE_ID_PRODUCT = modsecurity MODSECURITY2_INSTALL_STAGING = YES -MODSECURITY2_DEPENDENCIES = apache libxml2 pcre +MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 MODSECURITY2_CONF_OPTS = \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ - --with-libxml=$(STAGING_DIR)/usr \ + --with-pcre2=$(STAGING_DIR)/usr/bin/pcre2-config \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ --with-apu=$(STAGING_DIR)/usr/bin/apu-1-config \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ From peter at korsgaard.com Tue Feb 21 20:34:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:34:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/modsecurity2: disable pcre Message-ID: <20230221204903.354C88666E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12123bd4a5fc1e63e6b4adc07a3ec5eef8c4f743 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Disable pcre to avoid the following build failure if pcre-config is found on host raised since bump to version 2.9.7 in commit 42e34cf10f9eb037aa8c48a4fb9e8f521901b983: /home/thomas/autobuild/instance-0/output-1/per-package/modsecurity2/host/bin/../lib/gcc/mips64el-buildroot-linux-gnu/11.3.0/../../../../mips64el-buildroot-linux-gnu/bin/ld: cannot find -lpcre: No such file or directory Fixes: - http://autobuild.buildroot.org/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 06af305874abc1eb4bb98dbd8aabe071fa5d77bc) Signed-off-by: Peter Korsgaard --- package/modsecurity2/modsecurity2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index c251291e64..88bbf3bb29 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -21,6 +21,7 @@ MODSECURITY2_CONF_OPTS = \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ --without-curl \ --without-lua \ + --without-pcre \ --without-yajl \ --without-ssdeep From peter at korsgaard.com Tue Feb 21 19:55:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 20:55:50 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/elf2flt: fix error when building gdb for target on m68k Message-ID: <20230221204903.0DEB18666E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fe181faa9a055c3b172f87bc7b519f65450529b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Thomas reported that m68k fails to build when enabling BR2_PACKAGE_GDB. It fails when building gdb for the target with the following error: elf2flt: ERROR: text=0x3c826 overlaps data=0x256e0 ? It turns out that the gdb binary has another problematic input section (.gcc_except_table), which causes elf2flt to try to append to the .text output section, after it has already moved on with appending sections to the .data output section. elf2flt cannot append to a previous output section once it has moved on to another output section. Update the existing elf2flt patch to also add an exception for .gcc_except_table. Reported-by: Thomas Petazzoni Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni (cherry picked from commit f6f15e85b3ac58ba1d387ea86945d3fabf4f8990) Signed-off-by: Peter Korsgaard --- ...-fatal-error-regression-on-m68k-xtensa-ri.patch | 47 +++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch index 278709cb1c..616bbc891f 100644 --- a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch +++ b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch @@ -1,8 +1,7 @@ -From 65ac5f9e69cfb989d970da74c41e478774d29be5 Mon Sep 17 00:00:00 2001 +From a8c9f650b82109abf7aa730f298ea5182ed62613 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 9 Aug 2022 21:06:05 +0200 -Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, - riscv64 +Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64 Commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") changed the condition of which input sections that should be included @@ -12,16 +11,15 @@ to: ((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == (SEC_DATA | SEC_READONLY | SEC_RELOC)) -On ARM, the .eh_frame input section does not have the SEC_RELOC flag -set, so this specific change had no effect on ARM. +On ARM, the .eh_frame input section does not have the SEC_RELOC flag set, +so on ARM, this change caused .eh_frame to move from .text to .data. -However, on e.g. m68k and riscv64, the .eh_frame input section does -have the SEC_RELOC flag set, which means that after commit ba379d08bb78 -("elf2flt: fix for segfault on some ARM ELFs"), read-only relocation -data sections were placed in .text output section, instead of .data -output section. +However, on e.g. m68k, xtensa and riscv64, the .eh_frame input section +does have the SEC_RELOC flag set, which means that the change in +commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") +caused .eh_frame to move in an opposite way, i.e. from .data to .text. -This will result in a fatal error on m68k, xtensa and riscv64: +This resulted in a fatal error on m68k, xtensa and riscv64: ERROR: text=0x3bab8 overlaps data=0x33f60 ? This is because elf2flt cannot append to .text after .data has been @@ -36,21 +34,26 @@ to .text after .data has been appended to (which will require elf2flt to move/relocate everything that has already been appended to .data, since the virtual addresses are contiguous). -However, for now, add an exception for m68k, xtensa and riscv64 -(specifically for the problematic input section, .eh_frame), so that we -get the same behavior as older elf2flt releases, where we put read-only -relocation data in .data, which was working perfectly fine. +However, for now, add an exception for input sections which have all +three flags SEC_DATA, SEC_READONLY, and SEC_RELOC set, and which have a +name equal to a problematic input section (.eh_frame, .gcc_except_table). +That way, we get the same behavior as older elf2flt releases for m68k, +xtensa and riscv64, where we put read-only relocation data in .data, +which was working perfectly fine. + +This exception will not change any behavior on ARM, as the .eh_frame +input section does not have flag SEC_RELOC set. Signed-off-by: Niklas Cassel --- - elf2flt.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) + elf2flt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/elf2flt.c b/elf2flt.c -index 9c32f9a..a680c89 100644 +index e0d7891..39d035f 100644 --- a/elf2flt.c +++ b/elf2flt.c -@@ -340,8 +340,15 @@ compare_relocs (const void *pa, const void *pb) +@@ -341,8 +341,13 @@ compare_relocs (const void *pa, const void *pb) static bool ro_reloc_data_section_should_be_in_text(asection *s) { @@ -58,10 +61,8 @@ index 9c32f9a..a680c89 100644 - (SEC_DATA | SEC_READONLY | SEC_RELOC); + if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == + (SEC_DATA | SEC_READONLY | SEC_RELOC)) { -+#if defined(TARGET_m68k) || defined(TARGET_riscv64) || defined(TARGET_xtensa) -+ if (!strcmp(".eh_frame", s->name)) ++ if (!strcmp(".eh_frame", s->name) || !strcmp(".gcc_except_table", s->name)) + return false; -+#endif + return true; + } + return false; @@ -69,5 +70,5 @@ index 9c32f9a..a680c89 100644 static uint32_t * -- -2.37.1 +2.39.0 From peter at korsgaard.com Tue Feb 21 20:44:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:44:09 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/tmux: add utf8proc optional dependency Message-ID: <20230221204903.5E9938666E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11374681baa1b7eedc30c5bd04ad3b10c3488155 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x utf8proc is an optional dependency since version 2.3 and https://github.com/tmux/tmux/commit/6c94774b70f72952c4c512e4aa59a207ca1c34f2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 1f618aa388535181c281c85e2b5264532de4ef0f) Signed-off-by: Peter Korsgaard --- package/tmux/tmux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 281b7d8ee6..b1c0af1a83 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -11,6 +11,13 @@ TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_UTF8PROC),y) +TMUX_DEPENDENCIES += utf8proc +TMUX_CONF_OPTS += --enable-utf8proc +else +TMUX_CONF_OPTS += --disable-utf8proc +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS From peter at korsgaard.com Tue Feb 21 20:37:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:37:22 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/upx: security bump to version 4.0.2 Message-ID: <20230221204903.51BEE86670@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3820c4b934ddc90c7f34c923254f0b2c9fad2c4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix CVE-2023-23456: A heap-based buffer overflow issue was discovered in UPX in PackTmt::pack() in p_tmt.cpp file. The flow allows an attacker to cause a denial of service (abort) via a crafted file. Fix CVE-2023-23457: A Segmentation fault was found in UPX in PackLinuxElf64::invert_pt_dynamic() in p_lx_elf.cpp. An attacker with a crafted input file allows invalid memory address access that could lead to a denial of service. https://github.com/upx/upx/blob/v4.0.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 02befac8f9404ae30d0d090221d21a8460c82ec7) Signed-off-by: Peter Korsgaard --- package/upx/upx.hash | 2 +- package/upx/upx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 9f7c40c819..7c24906152 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz +sha256 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f upx-4.0.2-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index ef346b2310..6018b0a63d 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPX_VERSION = 4.0.1 +UPX_VERSION = 4.0.2 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ From peter at korsgaard.com Tue Feb 21 20:47:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:47:16 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/xxhash: use MOREFLAGS instead of overriding CFLAGS Message-ID: <20230221204903.6BDB486671@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02ea469db39bb3774093cbcf5c327873febeb0f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Set MOREFLAGS instead of overriding CFLAGS to avoid the following build failure raised since commit 94b66fb49cd57d0863245fbe0a3dc0833e76aad0: /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /tmp/ccabb8cF.o: relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC Fixes: - http://autobuild.buildroot.org/results/953133575d8c13266f1450fa545e70e4a518508d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit bfef88762d19b2fd8f99b55cee5c9ebaf986e1c7) Signed-off-by: Peter Korsgaard --- package/xxhash/xxhash.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 40e3c2696c..75d375a2fa 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -28,8 +28,7 @@ endif define XXHASH_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - CFLAGS="$(TARGET_CFLAGS) -DXXH_NO_INLINE_HINTS" \ - $(XXHASH_TARGETS) + MOREFLAGS=-DXXH_NO_INLINE_HINTS $(XXHASH_TARGETS) endef define XXHASH_INSTALL_STAGING_CMDS From peter at korsgaard.com Tue Feb 21 20:37:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:37:19 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/upx: bump to version 4.0.1 Message-ID: <20230221204903.43D2F8666F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a425a8926c8b546de085ab0f691891005482771 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Drop patch (already in version) - cmake must be used since https://github.com/upx/upx/commit/c7d8b6fed1b551158540e1d2e884dc224fce474c - ucl and zlib are directly included in upx since https://github.com/upx/upx/commit/61e1366122f8d1b9e2434a8103e7af00a35ea902 https://github.com/upx/upx/blob/v4.0.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 1567516d8984a4bddfbee30ee69c771cf3f8e224) Signed-off-by: Peter Korsgaard --- ...1-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch | 80 ---------------------- package/upx/upx.hash | 2 +- package/upx/upx.mk | 22 +----- 3 files changed, 4 insertions(+), 100 deletions(-) diff --git a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch b/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch deleted file mode 100644 index 6fae9cac0e..0000000000 --- a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001 -From: John Reiser -Date: Fri, 11 Dec 2020 13:38:18 -0800 -Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ - -https://github.com/upx/upx/issues/421 - modified: p_lx_elf.cpp - -[Retrieved from: -https://github.com/upx/upx/commit/3781df9da23840e596d5e9e8493f22666802fe6c] -Signed-off-by: Fabrice Fontaine ---- - src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 5 deletions(-) - -diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp -index 182db192f..3a4101cf7 100644 ---- a/src/p_lx_elf.cpp -+++ b/src/p_lx_elf.cpp -@@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack() - int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ]; - if (z_rel && z_rsz) { - unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val); -+ if ((unsigned)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_REL] %#x\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off]; - unsigned relsz = get_te32(&dynseg[-1+ z_rsz].d_val); -+ if ((unsigned)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_RELSZ] %#x\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp); - for (; rp < last; ++rp) { - unsigned r_va = get_te32(&rp->r_offset); -@@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack() - int z_rel = dt_table[Elf64_Dyn::DT_RELA]; - int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ]; - if (z_rel && z_rsz) { -- unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ if ((u64_t)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELA] %#llx\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off]; -- unsigned relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ upx_uint64_t relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ if ((u64_t)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELASZ] %#llx\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp); - for (; rp < last; ++rp) { -- unsigned r_va = get_te64(&rp->r_offset); -+ upx_uint64_t r_va = get_te64(&rp->r_offset); - if (r_va == user_init_ava) { // found the Elf64_Rela -- unsigned r_info = get_te64(&rp->r_info); -+ upx_uint64_t r_info = get_te64(&rp->r_info); - unsigned r_type = ELF64_R_TYPE(r_info); - if (Elf64_Ehdr::EM_AARCH64 == e_machine - && R_AARCH64_RELATIVE == r_type) { -@@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack() - } - else { - char msg[50]; snprintf(msg, sizeof(msg), -- "bad relocation %#x DT_INIT_ARRAY[0]", -+ "bad relocation %#llx DT_INIT_ARRAY[0]", - r_info); - throwCantPack(msg); - } diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 7f3698ca0d..9f7c40c819 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 47774df5c958f2868ef550fb258b97c73272cb1f44fe776b798e393465993714 upx-3.96-src.tar.xz +sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index e693a70db1..ef346b2310 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,28 +4,12 @@ # ################################################################################ -UPX_VERSION = 3.96 +UPX_VERSION = 4.0.1 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING UPX_CPE_ID_VENDOR = upx_project +UPX_SUPPORTS_IN_SOURCE_BUILD = NO -# 0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch -UPX_IGNORE_CVES += CVE-2021-20285 - -HOST_UPX_DEPENDENCIES = host-ucl host-zlib - -# We need to specify all, otherwise the default target only prints a message -# stating to "please choose a target for 'make'"... :-( -define HOST_UPX_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - UPX_UCLDIR=$(HOST_DIR) CXXFLAGS_WERROR= -C $(@D) all -endef - -# UPX has no install procedure, so install it manually. -define HOST_UPX_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/upx.out $(HOST_DIR)/bin/upx -endef - -$(eval $(host-generic-package)) +$(eval $(host-cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 21 20:49:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:49:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast In-Reply-To: <20230221203403.GH2718518@scaer> References: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> <20230221154827.7e737960@windsurf> <20230221200857.GG2718518@scaer> <20230221212634.736f8d70@windsurf> <20230221203403.GH2718518@scaer> Message-ID: <20230221214948.0b7ba737@windsurf> On Tue, 21 Feb 2023 21:34:03 +0100 "Yann E. MORIN" wrote: > The upstream code is (split for readability): > > if (('-Ofast' in c_args or > '-ffast-math' in c_args or > '-ffinite-math-only' in c_args > ) and > not '-fno-finite-math-only' in c_args > ) > > So, if -fno-finite-math-only is in c_args, then the whole condition > should evaluate to false, and thus it should not error out, right? > > Or did I lose more than my grep-fu? ;-) No, tonight your grep-fu is better than mine: you're totally right! :-) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Tue Feb 21 20:50:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:50:08 +0100 Subject: [Buildroot] [PATCH 2/2] boot/barebox: pass required environment variables for reproducible build In-Reply-To: <20230119121004.3416962-3-casey@xogium.me> (Casey Reeves's message of "Thu, 19 Jan 2023 13:10:04 +0100") References: <20230119121004.3416962-1-casey@xogium.me> <20230119121004.3416962-3-casey@xogium.me> Message-ID: <87sfeywxof.fsf@dell.be.48ers.dk> >>>>> "Casey" == Casey Reeves writes: > Barebox makes use of the same variables as the linux kernel does for > handling reproducible build -- KBUILD_BUILD_HOST, > KBUILD_BUILD_TIMESTAMP, KBUILD_BUILD_USER. This patch sets the proper > variables based on linux/linux.mk, and passes them to the make > invocation when building, to ensure a reproducible build is possible > when BR2_REPRODUCIBLE is enabled. > Signed-off-by: Casey Reeves Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 21 20:48:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:48:58 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] boot/barebox: pass required environment variables for reproducible build Message-ID: <20230221210052.7D1EB8667C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=caca4a1ff13298736718d3eb6bda4e209550dc2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Barebox makes use of the same variables as the linux kernel does for handling reproducible build -- KBUILD_BUILD_HOST, KBUILD_BUILD_TIMESTAMP, KBUILD_BUILD_USER. This patch sets the proper variables based on linux/linux.mk, and passes them to the make invocation when building, to ensure a reproducible build is possible when BR2_REPRODUCIBLE is enabled. Signed-off-by: Casey Reeves Signed-off-by: Thomas Petazzoni (cherry picked from commit c90bd74ebb264ccc925f10a142ccd82ef63a4601) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index da151d3c25..90be8c1ecc 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -74,6 +74,13 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) +ifeq ($(BR2_REPRODUCIBLE),y) +$(1)_MAKE_ENV += \ + KBUILD_BUILD_USER=buildroot \ + KBUILD_BUILD_HOST=buildroot \ + KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" +endif + ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) $(1)_KCONFIG_DEFCONFIG = $$(call qstrip,$$(BR2_TARGET_$(1)_BOARD_DEFCONFIG))_defconfig else ifeq ($$(BR2_TARGET_$(1)_USE_CUSTOM_CONFIG),y) @@ -121,7 +128,7 @@ endef define $(1)_BUILD_CMDS $$($(1)_BUILD_BAREBOXENV_CMDS) - $$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) + $$($(1)_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) $$($(1)_BUILD_CUSTOM_ENV) endef From peter at korsgaard.com Tue Feb 21 20:48:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 21 Feb 2023 21:48:49 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] boot/barebox: pass required environment variables for reproducible build Message-ID: <20230221210052.29A158667C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c42880d994c3162efdd583d4a6097538cd185eb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Barebox makes use of the same variables as the linux kernel does for handling reproducible build -- KBUILD_BUILD_HOST, KBUILD_BUILD_TIMESTAMP, KBUILD_BUILD_USER. This patch sets the proper variables based on linux/linux.mk, and passes them to the make invocation when building, to ensure a reproducible build is possible when BR2_REPRODUCIBLE is enabled. Signed-off-by: Casey Reeves Signed-off-by: Thomas Petazzoni (cherry picked from commit c90bd74ebb264ccc925f10a142ccd82ef63a4601) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 6506294d6d..05629bb4e3 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -74,6 +74,13 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) +ifeq ($(BR2_REPRODUCIBLE),y) +$(1)_MAKE_ENV += \ + KBUILD_BUILD_USER=buildroot \ + KBUILD_BUILD_HOST=buildroot \ + KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" +endif + ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) $(1)_KCONFIG_DEFCONFIG = $$(call qstrip,$$(BR2_TARGET_$(1)_BOARD_DEFCONFIG))_defconfig else ifeq ($$(BR2_TARGET_$(1)_USE_CUSTOM_CONFIG),y) @@ -121,7 +128,7 @@ endef define $(1)_BUILD_CMDS $$($(1)_BUILD_BAREBOXENV_CMDS) - $$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) + $$($(1)_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) $$($(1)_BUILD_CUSTOM_ENV) endef From yann.morin.1998 at free.fr Tue Feb 21 21:15:54 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 21 Feb 2023 22:15:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: disable with -Ofast In-Reply-To: <20230221214948.0b7ba737@windsurf> References: <20230221142144.1503123-1-fontaine.fabrice@gmail.com> <20230221154827.7e737960@windsurf> <20230221200857.GG2718518@scaer> <20230221212634.736f8d70@windsurf> <20230221203403.GH2718518@scaer> <20230221214948.0b7ba737@windsurf> Message-ID: <20230221211554.GI2718518@scaer> Thomas, All, On 2023-02-21 21:49 +0100, Thomas Petazzoni spake thusly: > On Tue, 21 Feb 2023 21:34:03 +0100 > "Yann E. MORIN" wrote: > > > The upstream code is (split for readability): > > > > if (('-Ofast' in c_args or > > '-ffast-math' in c_args or > > '-ffinite-math-only' in c_args > > ) and > > not '-fno-finite-math-only' in c_args > > ) > > > > So, if -fno-finite-math-only is in c_args, then the whole condition > > should evaluate to false, and thus it should not error out, right? > > > > Or did I lose more than my grep-fu? ;-) > > No, tonight your grep-fu is better than mine: you're totally right! :-) Note however that upstream code is anyway buggy. If CFLAGS contain, in that order: -fno-finite-math-only -ffinite-math-only then the condition will evaluate to false, and thus the test will not abort, but still this would be incorrect, as -ffinite-math-only would win the setting because it comes last... So presumably, we should even be able to do: SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-finite-math-only -ffinite-math-only which would again break the build.... Even if we do not do that ourselves, nothing prevents a suer from providing that in their BR2_TARGET_OPTIMIZATION. But then, we can't protect people from shooting themselves in the foot... ;-) 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 thomas.petazzoni at bootlin.com Tue Feb 21 20:16:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:16:10 +0100 Subject: [Buildroot] [git commit branch/next] package/cmake: disable ccache for host-cmake Message-ID: <20230221212251.E2DB886692@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6c05b47f71a6e140a0743dda276267f653f94f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next The upcoming ccache update will depend on host-cmake, so we must ensure host-cmake doesn't use ccache when being built. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/cmake/cmake.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 053658fad6..dc92c8bb4e 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -40,9 +40,16 @@ CMAKE_CONF_OPTS = \ HOST_CMAKE_CFLAGS = $(shell echo $(HOST_CFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%") HOST_CMAKE_CXXFLAGS = $(shell echo $(HOST_CXXFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%") +# We may be a ccache dependency, so we can't use ccache +HOST_CMAKE_CONFIGURE_OPTS = \ + $(HOST_CONFIGURE_OPTS) \ + CC="$(HOSTCC_NOCCACHE)" \ + GCC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" + define HOST_CMAKE_CONFIGURE_CMDS (cd $(@D); \ - $(HOST_CONFIGURE_OPTS) \ + $(HOST_CMAKE_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CMAKE_CFLAGS)" \ ./bootstrap --prefix=$(HOST_DIR) \ --parallel=$(PARALLEL_JOBS) -- \ From thomas.petazzoni at bootlin.com Tue Feb 21 20:16:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 21:16:19 +0100 Subject: [Buildroot] [git commit branch/next] package/ccache: bump to version 4.7.4 Message-ID: <20230221212251.F261F8660B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7087e5286d8419f4625f5f6e52aa84567c6b7ed0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Migrate to cmake package infrastructure. Add new host-hiredis host-zstd dependencies. Add new ccache dependency exclusions to pkg-generic. Migrate HOST_CCACHE_PATCH_CONFIGURATION to handle updated source files/format. License hashes changed due to migrating urls to https: https://github.com/ccache/ccache/commit/a0f32f161f1b8b9c5d287ca8abe88e3fd1e940a2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/ccache/ccache.hash | 6 +++--- package/ccache/ccache.mk | 38 +++++++++++++++++--------------------- package/pkg-generic.mk | 2 +- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 16cfad602c..9b11f026ec 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400 ccache-3.7.12.tar.xz -sha256 ec6b1a326ff93b2cc21df88a697ae470ff6927a55b8929e7e491b315e1563361 GPL-3.0.txt -sha256 4f63223bcdee822d55a6768cc8399ffe06401d7a03cfe79e1dc305f50dc22c59 LICENSE.adoc +sha256 df0c64d15d3efaf0b4f6837dd6b1467e40eeaaa807db25ce79c3a08a46a84e36 ccache-4.7.4.tar.xz +sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt +sha256 56cf64f68b7b8150300acd79899941615523ea5c56c120e92f5b175b7cc78e3c LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 97aa8b1c75..6b7d57b40c 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,27 +4,19 @@ # ################################################################################ -CCACHE_VERSION = 3.7.12 +CCACHE_VERSION = 4.7.4 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others CCACHE_LICENSE_FILES = LICENSE.adoc GPL-3.0.txt - -# Force ccache to use its internal zlib. The problem is that without -# this, ccache would link against the zlib of the build system, but we -# might build and install a different version of zlib in $(O)/host -# afterwards, which ccache will pick up. This might break if there is -# a version mismatch. A solution would be to add host-zlib has a -# dependency of ccache, but it would require tuning the zlib .mk file -# to use HOSTCC_NOCCACHE as the compiler. Instead, we take the easy -# path: tell ccache to use its internal copy of zlib, so that ccache -# has zero dependency besides the C library. -HOST_CCACHE_CONF_OPTS += --with-bundled-zlib +HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd # We are ccache, so we can't use ccache -HOST_CCACHE_CONF_ENV = \ - CC="$(HOSTCC_NOCCACHE)" \ - CXX="$(HOSTCXX_NOCCACHE)" +HOST_CCACHE_CONF_OPTS += \ + -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER \ + -DZSTD_FROM_INTERNET=OFF \ + -DHIREDIS_FROM_INTERNET=OFF # Patch host-ccache as follows: # - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR @@ -33,13 +25,17 @@ HOST_CCACHE_CONF_ENV = \ # BR2_CCACHE_DIR. # - Change hard-coded last-ditch default to match path in .config, to avoid # the need to specify BR_CACHE_DIR when invoking ccache directly. -# CCache replaces "%s" with the home directory of the current user, -# So rewrite BR_CACHE_DIR to take that into consideration for SDK purpose -HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,\%s/%,$(BR_CACHE_DIR)) +# CCache replaces "home_dir" with the home directory of the current user, +# so rewrite BR_CACHE_DIR to take that into consideration for SDK purpose +HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,%,$(BR_CACHE_DIR)) define HOST_CCACHE_PATCH_CONFIGURATION - sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/ccache.c - sed -i 's,"%s/.ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/conf.c + sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/Config.cpp + sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp + sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp + sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp + sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/Config.cpp + sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/Config.cpp endef HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION @@ -62,7 +58,7 @@ endef HOST_CCACHE_POST_INSTALL_HOOKS += HOST_CCACHE_DO_INITIAL_SETUP endif -$(eval $(host-autotools-package)) +$(eval $(host-cmake-package)) ifeq ($(BR2_CCACHE),y) ccache-stats: host-ccache diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 82187d7db9..d460251f48 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -792,7 +792,7 @@ $(2)_EXTRACT_DEPENDENCIES += \ endif ifeq ($$(BR2_CCACHE),y) -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-hiredis host-pkgconf host-zstd,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd,$(1)),) $(2)_DEPENDENCIES += host-ccache endif endif From thomas.petazzoni at bootlin.com Tue Feb 21 21:24:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:24:06 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/cmake: disable ccache for host-cmake In-Reply-To: <20230109001037.641422-1-james.hilliard1@gmail.com> References: <20230109001037.641422-1-james.hilliard1@gmail.com> Message-ID: <20230221222406.7f4d974d@windsurf> Hello James, On Sun, 8 Jan 2023 17:10:36 -0700 James Hilliard wrote: > The upcoming ccache update will depend on host-cmake, so we must > ensure host-cmake doesn't use ccache when being built. > > Signed-off-by: James Hilliard > --- > package/cmake/cmake.mk | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) I've applied both patches to the next branch. There's quite some trickery in the ccache package itself to tweak the paths, so hopefully it will work alright. In my limited testing, it was working fine. Let's give it some broader testing by having it in the next branch. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 21:24:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:24:36 +0100 Subject: [Buildroot] [git commit branch/next] package/openfpgaloader: bump to version 0.10.0 Message-ID: <20230221212504.A9C898669D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fd1f8a892a89d1b6d27b8e9884d645f71192813 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Also adds libgpiod support. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/openfpgaloader/Config.in | 10 ++++++++++ package/openfpgaloader/openfpgaloader.hash | 2 +- package/openfpgaloader/openfpgaloader.mk | 9 ++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in index 054278c256..4ba01d12d3 100644 --- a/package/openfpgaloader/Config.in +++ b/package/openfpgaloader/Config.in @@ -24,6 +24,16 @@ config BR2_PACAKGE_OPENFPGALOADER_CMSIS comment "openfpgaloader CMSIS-DAP needs udev /dev management and a toolchain w/ NPTL threads" depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS_NPTL +config BR2_PACKAGE_OPENFPGALOADER_LIBGPIOD + bool "libgpiod support" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 # libgpiod + select BR2_PACKAGE_LIBGPIOD + help + openfpgaloader libgpiod support + +comment "openfpgaloader libgpiod needs kernel headers >= 4.8" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + endif comment "openfpgaloader needs a toolchain w/ threads, C++, gcc >= 4.9" diff --git a/package/openfpgaloader/openfpgaloader.hash b/package/openfpgaloader/openfpgaloader.hash index 6c9d8a2b91..a8b537782c 100644 --- a/package/openfpgaloader/openfpgaloader.hash +++ b/package/openfpgaloader/openfpgaloader.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a862a209d696becff915a77512e6a8c22f92d73480a45cc12273d9ad1db60d23 openfpgaloader-0.6.1.tar.gz +sha256 966b4629df86b1d520ddd8a4e0a3fc00060b26b5ab4e172b596bd9d4659a196e openfpgaloader-0.10.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk index 0c39aad687..042b16612e 100644 --- a/package/openfpgaloader/openfpgaloader.mk +++ b/package/openfpgaloader/openfpgaloader.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENFPGALOADER_VERSION = 0.6.1 +OPENFPGALOADER_VERSION = 0.10.0 OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,v$(OPENFPGALOADER_VERSION)) OPENFPGALOADER_LICENSE = Apache-2.0 OPENFPGALOADER_LICENSE_FILES = LICENSE @@ -24,4 +24,11 @@ else OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=OFF endif +ifeq ($(BR2_PACAKGE_OPENFPGALOADER_LIBGPIOD),y) +OPENFPGALOADER_DEPENDENCIES += libgpiod +OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=ON +else +OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=OFF +endif + $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Tue Feb 21 21:25:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:25:08 +0100 Subject: [Buildroot] [PATCH] package/openfpgaloader: bump to version 0.10.0 In-Reply-To: <1677000436-53977-1-git-send-email-gwenj@trabucayre.com> References: <1677000436-53977-1-git-send-email-gwenj@trabucayre.com> Message-ID: <20230221222508.6f2ba8f0@windsurf> On Tue, 21 Feb 2023 18:27:16 +0100 Gwenhael Goavec-Merou wrote: > From: Gwenhael Goavec-Merou > > Also adds libgpiod support. > > Signed-off-by: Gwenhael Goavec-Merou > --- > package/openfpgaloader/Config.in | 10 ++++++++++ > package/openfpgaloader/openfpgaloader.hash | 2 +- > package/openfpgaloader/openfpgaloader.mk | 9 ++++++++- > 3 files changed, 19 insertions(+), 2 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 21:25:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:25:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/mutt: fix build failure when host provides an old gpgrt-config In-Reply-To: <20230221172829.3407641-1-fontaine.fabrice@gmail.com> References: <20230221172829.3407641-1-fontaine.fabrice@gmail.com> Message-ID: <20230221222552.17c73eca@windsurf> On Tue, 21 Feb 2023 18:28:29 +0100 Fabrice Fontaine wrote: > As already done for gnupg2 in commit > d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8, apply the same fix to mutt to > avoid the following build failure: > > /home/thomas/autobuild/instance-2/output-1/host/bin/i686-buildroot-linux-uclibc-gcc -DPKGDATADIR=\"/usr/share/mutt\" -DSYSCONFDIR=\"/etc\" -DBINDIR=\"/usr/bin\" -DMUTTLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H=1 -I. -I. -I. -I/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -pedantic -Wno-long-long -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -c -o txt2c.o txt2c.c > i686-buildroot-linux-uclibc-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' > > Fixes: > - http://autobuild.buildroot.org/results/98010be4ef70e58819ea2d17315bdac66a619b23 > > Signed-off-by: Fabrice Fontaine > --- > package/mutt/mutt.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 21:25:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:25:31 +0100 Subject: [Buildroot] [git commit] package/mutt: fix build failure when host provides an old gpgrt-config Message-ID: <20230221212652.F253A866A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a39e328bb2835cd157ee1622d5117ba252d44733 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As already done for gnupg2 in commit d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8, apply the same fix to mutt to avoid the following build failure: /home/thomas/autobuild/instance-2/output-1/host/bin/i686-buildroot-linux-uclibc-gcc -DPKGDATADIR=\"/usr/share/mutt\" -DSYSCONFDIR=\"/etc\" -DBINDIR=\"/usr/bin\" -DMUTTLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H=1 -I. -I. -I. -I/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -pedantic -Wno-long-long -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -c -o txt2c.o txt2c.c i686-buildroot-linux-uclibc-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' Fixes: - http://autobuild.buildroot.org/results/98010be4ef70e58819ea2d17315bdac66a619b23 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mutt/mutt.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 0a98396d88..5cf1b6bad2 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -37,6 +37,10 @@ MUTT_DEPENDENCIES += libgpgme MUTT_CONF_OPTS += \ --enable-gpgme \ --with-gpgme-prefix=$(STAGING_DIR)/usr + +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +MUTT_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config else MUTT_CONF_OPTS += --disable-gpgme endif From colin.foster at in-advantage.com Tue Feb 21 21:36:04 2023 From: colin.foster at in-advantage.com (Colin Foster) Date: Tue, 21 Feb 2023 13:36:04 -0800 Subject: [Buildroot] [PATCH] package/rauc-hawkbit-updater: new package In-Reply-To: <20230208185516.858096-1-colin.foster@in-advantage.com> References: <20230208185516.858096-1-colin.foster@in-advantage.com> Message-ID: On Wed, Feb 08, 2023 at 10:55:16AM -0800, Colin Foster wrote: > Add useful tool for bridging RAUC with the Hawkbit API. > > Signed-off-by: Colin Foster I'm just sending this follow up to see if it fell through the cracks. I can re-send otherwise. I think Eric's email bounced, so hopefully that isn't the issue. > --- > package/Config.in | 1 + > package/rauc-hawkbit-updater/Config.in | 14 ++++++++++++++ > .../rauc-hawkbit-updater.hash | 3 +++ > .../rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 15 +++++++++++++++ > 4 files changed, 33 insertions(+) > create mode 100644 package/rauc-hawkbit-updater/Config.in > create mode 100644 package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash > create mode 100644 package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk > > diff --git a/package/Config.in b/package/Config.in > index 511e691ed3..84e5efa856 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2677,6 +2677,7 @@ menu "System tools" > source "package/quota/Config.in" > source "package/quotatool/Config.in" > source "package/rauc/Config.in" > + source "package/rauc-hawkbit-updater/Config.in" > source "package/rsyslog/Config.in" > source "package/runc/Config.in" > source "package/s390-tools/Config.in" > diff --git a/package/rauc-hawkbit-updater/Config.in b/package/rauc-hawkbit-updater/Config.in > new file mode 100644 > index 0000000000..bd7b8d7cf5 > --- /dev/null > +++ b/package/rauc-hawkbit-updater/Config.in > @@ -0,0 +1,14 @@ > +config BR2_PACKAGE_RAUC_HAWKBIT_UPDATER > + bool "rauc-hawkbit-updater" > + depends on BR2_PACKAGE_RAUC > + depends on BR2_PACKAGE_JSON_GLIB > + help > + rauc-hawkbit-updater is a link between Pengutronix > + RAUC and the Eclipse Hawkbit API. Hawkbit can > + communicate to remote update servers, and use the > + d-bus interface to trigger updates from RAUC. > + > + http://rauc.io/ > + > +comment "rauc-hawkbit-updater needs rauc and json-glib" > + depends on !BR2_PACKAGE_RAUC || !BR2_PACKAGE_JSON_GLIB > diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash > new file mode 100644 > index 0000000000..c65ead3784 > --- /dev/null > +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 42318e96a464e6c716edb45c48bd3ec3b874462973db902fbe099a395e4acb4b rauc-hawkbit-updater-1.3.tar.xz > +sha256 041234c81fd6fe6c531ea1a886b9e740b9ee06759d1a910a14edbd06f4aa62c7 LICENSE > diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk > new file mode 100644 > index 0000000000..5a74181361 > --- /dev/null > +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk > @@ -0,0 +1,15 @@ > +############################################################################### > +# > +# rauc-hawkbit-updater > +# > +############################################################################### > + > +RAUC_HAWKBIT_UPDATER_VERSION = 1.3 > +RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/releases/download/v$(RAUC_HAWKBIT_UPDATER_VERSION) > +RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz > +RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 > +RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE > +RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix > +RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib > + > +$(eval $(meson-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Tue Feb 21 21:34:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:34:27 +0100 Subject: [Buildroot] [git commit branch/next] boot/arm-trusted-firmware: allow using Barebox as BL33 Message-ID: <20230221214836.AEDE9866B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48d9042e5d2e0bc8bd0efc3a2516b156c4b89190 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Since version 2022.04.0, Barebox now supports a generic image built for platforms, to be used as BL33 to generate FIP images. This patch makes it available as a choice of BL33 to be used with ATF and is based on the similar work put into U-Boot as BL33. Signed-off-by: Casey Reeves Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 21 +++++++++++++++++++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 6 ++++++ 2 files changed, 27 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index a9b9bbcc5a..cb54c6c9d8 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -129,6 +129,27 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE endchoice +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 + bool "Use Barebox as BL33" + depends on BR2_TARGET_BAREBOX + help + This option allows to embed the Barebox generic BL33 image in + the ARM Trusted Firmware. It ensures that the Barebox package + gets built before ATF, and that the appropriate BL33 + variable pointing to the generic bl33 image is passed + when building ATF. + +if BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE + string "Barebox BL33 image name" + default "*-generic-bl33.img" + help + Name of the Barebox BL33 image to include in ATF, it must + have been installed to BINARIES_DIR by the Barebox package. + +endif + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 bool "Use U-Boot as BL33" depends on BR2_TARGET_UBOOT diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 1164c81410..648f62ed85 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -105,6 +105,12 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += AARCH32_SP=optee endif endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33),y) +ARM_TRUSTED_FIRMWARE_BAREBOX_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE)) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_BAREBOX_BIN) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += barebox +endif + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33),y) ARM_TRUSTED_FIRMWARE_DEPENDENCIES += edk2 # Since the flash device name vary between platforms, we use the variable From thomas.petazzoni at bootlin.com Tue Feb 21 21:48:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:48:40 +0100 Subject: [Buildroot] [PATCH v2] boot/arm-trusted-firmware: Barebox available as BL33 In-Reply-To: <20230119185041.3430421-1-casey@xogium.me> References: <20230119183026.3428277-1-casey@xogium.me> <20230119185041.3430421-1-casey@xogium.me> Message-ID: <20230221224840.668f2559@windsurf> On Thu, 19 Jan 2023 19:50:40 +0100 Casey Reeves wrote: > Since version 2022.04.0, Barebox now support a generic image built for > platforms, to be used as BL33 to generate FIP images. This patch makes > it available as choice of BL33 to be used with ATF and is based on the > similar work put into U-Boot as BL33. > > Signed-off-by: Casey Reeves > > --- > Changes v1 -> v2: > - fixed quoting issue in the default image name > --- > boot/arm-trusted-firmware/Config.in | 21 +++++++++++++++++++ > .../arm-trusted-firmware.mk | 6 ++++++ > 2 files changed, 27 insertions(+) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 21 21:49:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:49:03 +0100 Subject: [Buildroot] [PATCH] boot/arm-trusted-firmware: introduce a choice to select the BL33 image Message-ID: <20230221214904.454053-1-thomas.petazzoni@bootlin.com> We now have 3 different options to select an image as the BL33 stage of TF-A: Barebox, U-Boot or EDK2. Technically speaking, they are mutually exclusive: they all specify a BL33= variable to the TF-A build, and TF-A can only support a single BL33 stage. However, as pointed out by Vincent Fazio in [0] there is nothing that prevents selecting Barebox, U-Boot and EDK2 together, even though it doesn't make sense. To address this, this commit introduces a choice...endchoice block, into which the Barebox, U-Boot and EDK2 options are moved. An additional "none" option is added, which is the default, and corresponds to not having any BL33 image. Since we keep the same name for the options, no legacy handling is necessary. [0] https://lore.kernel.org/buildroot/PH1P110MB1603A4AA1638838DA56BAA069FDA9 at PH1P110MB1603.NAMP110.PROD.OUTLOOK.COM/ Reported-by: Vincent Fazio Cc: Vincent Fazio Cc: Casey Reeves Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 57 +++++++++++++++++------------ 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index cb54c6c9d8..a5ac987172 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -129,8 +129,17 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE endchoice +choice + prompt "BL33" + default BR2_TARGET_ARM_TRUSTED_FIRMWARE_NONE_AS_BL33 + help + Select the image to include as BL33. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NONE_AS_BL33 + bool "None" + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 - bool "Use Barebox as BL33" + bool "Barebox" depends on BR2_TARGET_BAREBOX help This option allows to embed the Barebox generic BL33 image in @@ -139,6 +148,30 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 variable pointing to the generic bl33 image is passed when building ATF. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 + bool "U-Boot" + depends on BR2_TARGET_UBOOT + help + This option allows to embed u-boot.bin as the BL33 part of + the ARM Trusted Firmware. It ensures that the u-boot package + gets built before ATF, and that the appropriate BL33 + variable pointing to u-boot.bin is passed when building ATF. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 + bool "EDK2" + depends on BR2_TARGET_EDK2 + help + This option allows to embed EDK2 as the BL33 part of + the ARM Trusted Firmware. It ensures that the EDK2 package + gets built before ATF, and that the appropriate BL33 + variable pointing to the EDK2 is passed when building ATF. + + Do not choose this option if you intend to build ATF and EDK2 + for the 'qemu_sbsa' platform. In this case, due to the EDK2 + build system, the dependency between ATF and EDK is reversed. + +endchoice + if BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE @@ -150,15 +183,6 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE endif -config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 - bool "Use U-Boot as BL33" - depends on BR2_TARGET_UBOOT - help - This option allows to embed u-boot.bin as the BL33 part of - the ARM Trusted Firmware. It ensures that the u-boot package - gets built before ATF, and that the appropriate BL33 - variable pointing to u-boot.bin is passed when building ATF. - if BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE @@ -170,19 +194,6 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE endif -config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 - bool "Use EDK2 as BL33" - depends on BR2_TARGET_EDK2 - help - This option allows to embed EDK2 as the BL33 part of - the ARM Trusted Firmware. It ensures that the EDK2 package - gets built before ATF, and that the appropriate BL33 - variable pointing to the EDK2 is passed when building ATF. - - Do not choose this option if you intend to build ATF and EDK2 - for the 'qemu_sbsa' platform. In this case, due to the EDK2 - build system, the dependency between ATF and EDK is reversed. - config BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW bool "Include NXP RCW in BL2" depends on BR2_PACKAGE_HOST_QORIQ_RCW -- 2.39.1 From thomas.petazzoni at bootlin.com Tue Feb 21 21:54:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:54:06 +0100 Subject: [Buildroot] [External] - [PATCH v2] boot/arm-trusted-firmware: Barebox available as BL33 In-Reply-To: References: <20230119183026.3428277-1-casey@xogium.me> <20230119185041.3430421-1-casey@xogium.me> Message-ID: <20230221225406.1bb8d63b@windsurf> Hello Vincent, On Mon, 6 Feb 2023 13:36:09 +0000 Vincent Fazio wrote: > Does TFA allow multiple BL33 images to be defined? I don't see a guard if some other package such as U-Boot or EDK2 has been enabled as well. > If only one image is supported but multiple images are supplied via BL33 on the make command line, is it last declared wins? This is absolutely true, so I have submitted https://patchwork.ozlabs.org/project/buildroot/patch/20230221214904.454053-1-thomas.petazzoni at bootlin.com/ to move to a choice..endchoice in Config.in to select the BL33. Thanks for reporting this! Best regards, 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 Feb 21 21:59:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 22:59:18 +0100 Subject: [Buildroot] [git commit branch/next] boot/grub2: add details on grub.cfg location Message-ID: <20230221215944.C9336866C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7692d5beb2d9e4d0b463f0f26a177829e5bcc1ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Signed-off-by: AndreiCherniaev Signed-off-by: Thomas Petazzoni --- boot/grub2/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in index 92b5dd501b..f05f33ccc7 100644 --- a/boot/grub2/Config.in +++ b/boot/grub2/Config.in @@ -27,6 +27,10 @@ config BR2_TARGET_GRUB2 Amongst others, GRUB2 offers EFI support, which GRUB Legacy doesn't provide. + The file boot/grub2/grub.cfg is used by default as the Grub + configuration file. It can be overridden using a rootfs + overlay or post-build script. + For additional notes on using Grub 2 with Buildroot, see boot/grub2/readme.txt From thomas.petazzoni at bootlin.com Tue Feb 21 22:01:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 21 Feb 2023 23:01:55 +0100 Subject: [Buildroot] [PATCH] boot/grub2: add information where is configuration file In-Reply-To: <20230109073353.11701-1-cherniaev.andrei@kairo.space> References: <20230109073353.11701-1-cherniaev.andrei@kairo.space> Message-ID: <20230221230155.0e21a186@windsurf> Hello Andrei, On Mon, 9 Jan 2023 16:33:52 +0900 AndreiCherniaev wrote: > diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in > index 92b5dd501b..bf0400c08f 100644 > --- a/boot/grub2/Config.in > +++ b/boot/grub2/Config.in > @@ -125,6 +125,7 @@ config BR2_TARGET_GRUB2_BUILTIN_CONFIG_PC > into the Grub image itself. This allows to set the root > device and other configuration parameters, but however menu > entries cannot be described in this embedded configuration. > + Use boot/grub2/grub.cfg to edit menu entries. Actually no, you probably don't want to change boot/grub2/grub.cfg: it is part of Buildroot itself, and you probably don't want to have project-specific changes in there. Instead, you should override it using a rootfs overlay (if grub.cfg is in $(TARGET_DIR)/boot) or a post-build/post-image script (if it's in the EFI partition). I have nevertheless applied your patch, but after tweaking the message in the help text, and moving it to the main Grub2 option. See: https://gitlab.com/buildroot.org/buildroot/-/commit/7692d5beb2d9e4d0b463f0f26a177829e5bcc1ec Best regards, Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Feb 21 22:47:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 21 Feb 2023 23:47:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/gcc/gcc-initial: fix typo Message-ID: <20230221224747.117361-1-fontaine.fabrice@gmail.com> Fix typo: am internal step -> an internal step Signed-off-by: Fabrice Fontaine --- package/gcc/gcc-initial/gcc-initial.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index ebd8e8f017..a8ac20c5d8 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -9,7 +9,7 @@ GCC_INITIAL_SITE = $(GCC_SITE) GCC_INITIAL_SOURCE = $(GCC_SOURCE) # We do not have a 'gcc' package per-se; we only have two incarnations, -# gcc-initial and gcc-final. gcc-initial is just am internal step that +# gcc-initial and gcc-final. gcc-initial is just an internal step that # users should not care about, while gcc-final is the one they shall see. HOST_GCC_INITIAL_DL_SUBDIR = gcc -- 2.39.0 From christian at paral.in Wed Feb 22 07:23:37 2023 From: christian at paral.in (Christian Stewart) Date: Tue, 21 Feb 2023 23:23:37 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/docker-cli-buildx: new package Message-ID: <20230222072337.2953461-1-christian@paral.in> buildx is a docker CLI plugin implementing extended build features. buildx is the default builder as of Docker v23.x, and if the plugin is not present, the CLI will output an error warning that it is using the deprecated built-in builder instead of the buildx builder. However, buildx is a separate repository from docker-cli: it is a plugin that needs to be installed at /usr/lib/docker/cli-plugins on the target. https://github.com/docker/buildx Signed-off-by: Christian Stewart --- package/Config.in | 1 + package/docker-cli-buildx/Config.in | 15 ++++++++ .../docker-cli-buildx/docker-cli-buildx.hash | 3 ++ .../docker-cli-buildx/docker-cli-buildx.mk | 36 +++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 package/docker-cli-buildx/Config.in create mode 100644 package/docker-cli-buildx/docker-cli-buildx.hash create mode 100644 package/docker-cli-buildx/docker-cli-buildx.mk diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..140c2417d9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2639,6 +2639,7 @@ menu "System tools" source "package/ddrescue/Config.in" source "package/debianutils/Config.in" source "package/docker-cli/Config.in" + source "package/docker-cli-buildx/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" source "package/earlyoom/Config.in" diff --git a/package/docker-cli-buildx/Config.in b/package/docker-cli-buildx/Config.in new file mode 100644 index 0000000000..a6b343a794 --- /dev/null +++ b/package/docker-cli-buildx/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_DOCKER_CLI_BUILDX + bool "docker-cli-buildx" + 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 + select BR2_PACKAGE_DOCKER_CLI + help + buildx is a Docker CLI plugin for extended build capabilities with BuildKit. + + https://github.com/docker/buildx + +comment "docker-cli-buildx needs a 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_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-cli-buildx/docker-cli-buildx.hash b/package/docker-cli-buildx/docker-cli-buildx.hash new file mode 100644 index 0000000000..6a360a5ead --- /dev/null +++ b/package/docker-cli-buildx/docker-cli-buildx.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 e21ce4b222cfcc5fe981a1ee51fca1f7c7d59de0f1911ae3f64f6d9a969695a3 docker-cli-buildx-0.10.3.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/docker-cli-buildx/docker-cli-buildx.mk b/package/docker-cli-buildx/docker-cli-buildx.mk new file mode 100644 index 0000000000..9aafcac85e --- /dev/null +++ b/package/docker-cli-buildx/docker-cli-buildx.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# docker-cli-buildx +# +################################################################################ + +DOCKER_CLI_BUILDX_VERSION = 0.10.3 +DOCKER_CLI_BUILDX_SITE = $(call github,docker,buildx,v$(DOCKER_CLI_BUILDX_VERSION)) + +DOCKER_CLI_BUILDX_LICENSE = Apache-2.0 +DOCKER_CLI_BUILDX_LICENSE_FILES = LICENSE + +DOCKER_CLI_BUILDX_DEPENDENCIES = host-pkgconf + +DOCKER_CLI_BUILDX_BUILD_TARGETS = cmd/buildx +DOCKER_CLI_BUILDX_GOMOD = github.com/docker/buildx + +DOCKER_CLI_BUILDX_LDFLAGS = \ + -X $(DOCKER_CLI_BUILDX_GOMOD)/version.Revision=$(DOCKER_CLI_BUILDX_VERSION) \ + -X $(DOCKER_CLI_BUILDX_GOMOD)/version.Version=$(DOCKER_CLI_BUILDX_VERSION) + +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_BUILDX_FIX_VENDORING + printf "module $(DOCKER_CLI_BUILDX_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +endef +DOCKER_CLI_BUILDX_POST_EXTRACT_HOOKS += DOCKER_CLI_BUILDX_FIX_VENDORING + +define DOCKER_CLI_BUILDX_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/bin/buildx \ + $(TARGET_DIR)/usr/lib/docker/cli-plugins/buildx +endef + +$(eval $(golang-package)) -- 2.39.2 From thomas.petazzoni at bootlin.com Wed Feb 22 07:37:02 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 07:37:02 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-21 Message-ID: <20230222073710.0E33941762@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-21 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 12 | 15 | 0 | 27 | master | 137 | 152 | 3 | 292 | next | 18 | 23 | 0 | 41 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 8 glibc-2.36-81-g4f4d7a13edfd... | 7 host-binutils-2.38 | 7 linux-6.1.11 | 7 elfutils-0.186 | 6 fluent-bit-2.0.9 | 4 host-go-1.19.6 | 4 linux-5.10.162-cip24 | 4 perl-5.36.0 | 4 unknown | 4 gobject-introspection | 3 host-pahole-1.24 | 3 libglib2-2.72.3 | 3 network-manager-1.40.10 | 3 olsr-0.9.8 | 3 systemd-252.4 | 3 uqmi-0a19b5b77140465c29e2af... | 3 check-0.15.2 | 2 coreutils-9.1 | 2 dc3dd-7.2.641 | 2 host-gdb-arc-2020.09-releas... | 2 host-rust-1.67.0 | 2 libgcrypt-1.10.1 | 2 libgpg-error-1.46 | 2 linux-5.10.162-cip24-rt10 | 2 mutt-2.2.9 | 2 sudo-1.9.12p2 | 2 uccp420wlan-6.9.1 | 2 uclibc-ng-test-6790eafe897b... | 2 ulog-0389d243352255f6182326... | 2 ace-7.0.6 | 1 asterisk-16.29.1 | 1 bat-0.19.0 | 1 collectd-5.12.0 | 1 ding-libs-0.6.2 | 1 efivar-38 | 1 ffmpeg-4.4.3 | 1 fftw-quad-3.3.8 | 1 file-5.43 | 1 freerdp-2.10.0 | 1 fs/axfs/axfs.mk:32: /home/t... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gerbera-1.10.0 | 1 glmark2-06e78b67702b5413335... | 1 gnuradio-3.10.4.0 | 1 host-gcc-final-10.4.0 | 1 host-wine-7.0 | 1 janet-1.26.0 | 1 jemalloc-5.3.0 | 1 libabseil-cpp-20220623.1 | 1 libev-4.33 | 1 libuhttpd-3.14.1 | 1 libunwind-1.6.2 | 1 libxml2-2.10.3 | 1 linux-pam-1.5.2 | 1 lirc-tools-0.10.2 | 1 ltp-testsuite-20220930 | 1 matio-1.5.23 | 1 mesa3d-22.3.4 | 1 mxs-bootlets-10.12.01 | 1 netsurf-3.10 | 1 openblas-0.3.21 | 1 pcre2-10.42 | 1 php-8.2.3 | 1 proxychains-ng-4.16 | 1 pv-1.6.20 | 1 python-numpy-1.23.5 | 1 rdma-core-44.0 | 1 rtl_433-22.11 | 1 sigrok-cli-0.7.2 | 1 speechd-0.11.4 | 1 toolchain-external-codescap... | 1 xenomai-3.0.10 | 1 xfsprogs-5.14.2 | 1 xvisor-0.3.1 | 1 zabbix-6.2.7 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/7f40d6dde03134238151c248fbbd66e4713546cb | ORPH powerpc64le | asterisk-16.29.1 | NOK | http://autobuild.buildroot.net/results/97c6e74cffc06c0e7ab757d9e9470100edec9198 | mips | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/7632451fc322cc125e7b873167a5aeab7341ad3f | mips | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/97c6e6cdf8346c1b08fb6e4b44cc4fa6a29b6a4d | ORPH i686 | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/a2b265f02cd14a4687312259e0ae0adecd8aa585 | ORPH x86_64 | collectd-5.12.0 | NOK | http://autobuild.buildroot.net/results/91b1886c9dcbeb11f0e52cbdad03ea12a233dca5 | sh4a | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/95379249acac7d328f215c48700b9d6557bc2521 | ORPH sh4a | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/1df8a8d804b358c4ffcaba8581a20ee1404a4d3b | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/509103bddf96936928a7f1332e041bc2b95e8cae | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/ae64181ae51dafeb22be30ab98ded83a190c82da | ORPH arc | ding-libs-0.6.2 | NOK | http://autobuild.buildroot.net/results/7d38d90b72f3a4b8cffcba3c65e301b9ac462119 | mips64el | efivar-38 | NOK | http://autobuild.buildroot.net/results/f2da14f91dc602a32dd5b2b7bdf3d3aa43afa7f4 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/5aa9f0f466d09fbff69085059c66dae32aff515c | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/0b612c682c605db5bd3e8b2cb0ca0b2b7dc1f651 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/84873ce870309ea33962c4fa4ca666040323e208 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/60f8f264c9e27e3c7a792df74cbd208281321a62 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/51e78ed823820f4e3a4032f86f6d6725dfba0667 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/ceef84f4d86e7ac2d62c7cdc98a90a9b920d6216 | ORPH arm | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/4abfe6b56d94f79c8cfb56f9accf7121245080c9 | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/aab750c13efd25ec414885d72cedc41b141c0ead | ORPH armeb | file-5.43 | NOK | http://autobuild.buildroot.net/results/1dff61124fadb65f96816d8521f69ca0ea3ec0b8 | ORPH x86_64 | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/894cd923baa25643d9aea21678c4bca105e86b45 | s390x | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/170afd36536aef86755b48b5f274bad35f9aef48 | powerpc64 | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/3d47f9ea8dd9ce7fe8413f06ff67ef9bc28cbfb7 | microblaze | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/b1b0d02876d9760a193e3b0f60a3ea5ffab14830 | mips64 | freerdp-2.10.0 | NOK | http://autobuild.buildroot.net/results/e96848576ac292799636abe7485c37aa54196a2c | i686 | fs/axfs/axfs.mk:32: /home/t... | NOK | http://autobuild.buildroot.net/results/e9b489fa8d6c2e4075a3e30c23e22f6f133c51a0 | sh4aeb | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/bd5c4da18f4191c7d4c98ef0a5f3a68e47aa0f6d | x86_64 | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/bafc2c9127673569d67bfb74c70302283428da7b | mips64el | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/bb78e1253bdfb6d24ab0611b25e98eb411dc6346 | mips | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/8205140af8e774c6a9eaddf4c7091194ac05082b | arceb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/da346a8bbb94dd1698126d6b9942691315063920 | microblaze | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/bb2cd65d22ee996c994ca17a2e4510bb8e93b0cc | mips64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/3a41e94e88cf5dc7ff2886b4907ebfda7b5b06cb | aarch64_be | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/fee875dfc8965d2b7b915a5e4697d9a74f2bd6d0 | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/d2a1088939052a538a14eccfab2c2a33c03da1d3 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b97fabce6ffe19854837649ea37763475d4b8290 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/8bf7b39d5632305ac0277480e03fa6e50943ba3f | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/ab09697b65bdd6d04f2089f9f48403ab9e52ef39 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/a07d4a8d11357a29e081e3e41da0d13161137a29 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/83d9608457a9858fbcf5ec08ba754959bda13238 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/62e13d92d28bc966e7a9cfe4118d3f6c4741d01a | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b807fa9bff3e32de6053c3c79501e5d85103b20c | aarch64 | glmark2-06e78b67702b5413335... | NOK | http://autobuild.buildroot.net/results/b3245c4ee8e0b3592b09e0bc57bc0928018936c2 | i686 | gnuradio-3.10.4.0 | NOK | http://autobuild.buildroot.net/results/047866cdd799090db4e93620ed58638d52a96f65 | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/fd6b9990f359f12fa9a283752a3f02c087b8e793 | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/4db435e44a620396e32ae1dccf8ff0c4a34f62d5 | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/297da024b72322a1321ba18bec050b0e51bddb90 | powerpc64le | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0cc5693888bda210cc0a603a24d0ef7236601042 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/96ff10b0d3f3e5b95a20c9c532494d6b7f6a33d3 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/7894e8d382774ff354ac6b1b1dfd4e4c1eafa7f5 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/c82a01af19a244215ab7f46a1ea5c03e7b37928c | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/b3341b28d21885078368e829773e9dd4ca9e8769 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/ca19947023641b027f057b5c06eb5e6cb84f57ff | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3269e501df5c3d2b04b05f7f48d5271666253238 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/52169862bb9ae73edf6ee1d9605552770aa1de4e | ORPH xtensa | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/5c01104910fe7eb1b592efc054cfdc988bb1b461 | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/77c677e86e4b671bb38314523f0e54ff174e1dd9 | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1b0333984b1c90a219b9801b6f2690f938194f61 | nios2 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2f6544193846822416e0d126e2e273f72d5afab4 | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/ff4a2fa691da6f4b87e68d6fe0b62c1051103e15 | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6f3a5b3e42d1ee0bf494fd6d862aa744d61bd006 | or1k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e5fd96ff62e529bdcc1b92c52c0b09f4d4ccef44 | microblazeel | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/7249ccf43f466f346e6a0355081a7b2304bb1cc0 | arceb | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/ced6dec91623b0b572a02dd662ee02b2059c07a3 | ORPH arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/0070763ac9d3f54e108bf8366073e4bb520f8e8e | ORPH mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/ed91bdabe4f1904ba1d94682a10a2d67685e7950 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e86d106113f7072e765a6af633cc16009e8f02da | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/537626cd91f349974d119025492f236878d49305 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/bfbd0c6c80a0c2799ff6ed5485cf7e233664d07c | microblaze | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ee95db1c3b740f0d0b4e1e25d7c7c2299a30093a | sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/dc026c4b0f6311b5516d1572f6634a59e60af352 | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/127ae88888cf9d3457c7daf5b4f98f6984ed2485 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/46f734aece37922ad25cecfdf99df94aa09eec9a | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/8a5b6d8cd40d25f8e6279df9949a2480347f33ea | i686 | host-wine-7.0 | NOK | http://autobuild.buildroot.net/results/62228252348e33d7b0501596c329bd8eb4828d99 | riscv64 | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/20108e76990d8af7f47d474eadbbea8562ef6728 | sh4a | jemalloc-5.3.0 | NOK | http://autobuild.buildroot.net/results/3de02468e8822d875670f03c5d30322df50fc225 | mips64el | libabseil-cpp-20220623.1 | NOK | http://autobuild.buildroot.net/results/7d8ddb2726483fc5711cbed1a51a3dc7d726614e | arm | libev-4.33 | NOK | http://autobuild.buildroot.net/results/1c597c9da724d6cac06b09b1ecd456a28440a3a3 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/2e63572493cbc7c676085dd4c08cb1b19b390282 | ORPH armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/4b96f4e41724e5c9c806a6c7df397a58d1ae1b1e | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/f2ec691eed8220620fc16bbf9a7832d1c06fad62 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/403457e4dfe0c39112b6b9f900ce9a8718b1d4cf | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/bdfc093d0a8ed7c6084f414f59ace240d5619fd2 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/84bcb4726bafe55ee8587bf0b38121153d625811 | ORPH aarch64 | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/99abe06cfea2d143a722b4a515f9c5a13faf3674 | ORPH mips64 | libuhttpd-3.14.1 | NOK | http://autobuild.buildroot.net/results/aaf9b7a3ddf2eb8ab322b167f09f184f0dfb75b3 | arm | libunwind-1.6.2 | NOK | http://autobuild.buildroot.net/results/1175e15122506113ac85051c4ec435a69415f6ef | ORPH armeb | libxml2-2.10.3 | NOK | http://autobuild.buildroot.net/results/9cf1fa9e27b9a79a36c9732deaac5e3a2f19f499 | mips64 | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/8ae153d06313c2bb9033ff06018549ffa9707c02 | ORPH mips64el | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/e493ba5c49858f5cecdb164a95f55a380d6c19aa | ORPH mips64 | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/8d9eeaa33f8a82cac1acd324c2fab03180fe0f1d | ORPH arceb | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/a57e329a9882a39209439b7061843ecb4fbafafd | ORPH m68k | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/12f3281312eb920a27c5c668c40354b2d3b37d79 | ORPH mips64 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/8f345b8e489af415059f71d5a591db74d4c9eee9 | ORPH sparc | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/ecbd8057145cf3f4ae49619883854b5885d25280 | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/08ed0f5a51752c3e4bb98f4da01f2ce863bb0831 | ORPH or1k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4d1411950519ede2336637c43c468db2ca3ad90a | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/69d963ee153f5af43aac221dc98dc26956d99d94 | ORPH mipsel | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/a47b8ff3183489b9c5e3daf544281178d61bad2d | ORPH powerpc64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4370b26c25e4f4a938ab4b0aa63038b16e4961f5 | ORPH arceb | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/3cfe26ea27ebc447409fd9d0ee4db5bec97ab1e4 | ORPH xtensa | linux-pam-1.5.2 | NOK | http://autobuild.buildroot.net/results/011bf863339450d8b2b6665d42c2cd56bf147c93 | ORPH microblaze | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/df75af1cd7cc351332b32ec3d75c48718b6db8c8 | ORPH x86_64 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/5a2afd7b4c7eb9025f50df6b75aa9963335f7527 | nios2 | matio-1.5.23 | NOK | http://autobuild.buildroot.net/results/65e3fe45e1b049e53f31db884627982045a3f4ae | powerpc | mesa3d-22.3.4 | NOK | http://autobuild.buildroot.net/results/8077f4b8c2dd6f3824d7aa498843c3afabdf3673 | sparc64 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/f0724f3a8fcf79620d7af9d756af37d762608712 | i686 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/98010be4ef70e58819ea2d17315bdac66a619b23 | arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/d3a6a492638b4305cac33273fd8de2e74351d9e3 | ORPH powerpc64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/19942f35c9a6cdb72c9a386711f18bcb43bd7ba1 | or1k | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/9eef5574efbbb6d651e04079467724bc643c497a | ORPH powerpc64le | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/896879c8e8ce022556ee834216ced2f962ff279c | ORPH microblaze | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/cf61c42d5be29c132ae8e963151d7d30e0037a32 | ORPH m68k | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/6f4744d1e49cd0a59f039ee22d2085dd28925343 | ORPH s390x | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/53dd28d062f630b30aa122c1ce1203aba9ef9211 | ORPH sh4a | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/a33b79e1fce7c7dafef55bb8e6794c488721544b | ORPH i686 | openblas-0.3.21 | NOK | http://autobuild.buildroot.net/results/6c8b926e497af3c4a6b9bd965c71b8323913ae0c | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/00d3d815b00778d7c67d76461688e77689327949 | ORPH aarch64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/de41975fa2590e13a558642dc67cd80c9d512c9c | mips64el | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/157a4dda7ffe397f72f3dbb18fb34b480d482862 | arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/a994142c97e5de0ba00275f135ef1f00e9a7e758 | powerpc64le | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/98de64b42e5b838a130d365e369c13007235117c | microblazeel | php-8.2.3 | NOK | http://autobuild.buildroot.net/results/faa23037cd14cd5c9af9034a7300ad073bb7ee43 | mips | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/2ffb857cdc3cc1b3ad6a5a68806789d3e7ce2555 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/14f9571dcd65696b1cac5d11bfd148b50a94374c | ORPH x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/6ea08926398c3d534787b0b85076a5a4e137f462 | sh4 | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/a943e03b79c4cc328b7712046ecff09706045f81 | xtensa | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/81e9bc4b0882a4d9bbbccd0d7e766de112d3d41a | powerpc64le | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/8a4b0432870ae6753ffee01d998ae53648295a92 | ORPH powerpc | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/502f1fa93757f96f6f60fe371a0824cc694fccff | sparc | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/f24a8c19c86a19303bf9158d2602a527ad05915c | ORPH arc | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/d45a1184d0ef8c89b371c777510d239025b0e065 | ORPH mips64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/7840662fb987efd3a3be5073b5182439430a8664 | armeb | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/8f41c4984b645851724e554c3162b83bc312bee7 | mips | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/7d44204580448d09d31ca6e0752aca166daa87bf | mips64el | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/1c708d8399e9b5652a3f21d0b7d4074f67b059ee | ORPH powerpc64 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/da20d07682760b1c840f60dab8b5fd22f384e992 | ORPH or1k | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/6870303c9e2c4abba0f3b3d33730b63f5307609a | ORPH mips64 | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/3adf5988f17a964cba9ee833fd0831e318fafa5f | mips | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/fc9854089a9c6036f026420253dc5f4e0ac63549 | aarch64_be | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/7ab27d8aab13abebc3fb6a4a14499b67654d687a | sh4 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/46617161034c4fcdba5eb4102e4e1756c1030bc7 | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/9a909474a8d31ad4cd4bc274f4537a89679879ab | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/5e76dbabbfc8c3912421a133f68f07c28a38b8c3 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/dd1109a71f926db810832fb378805a27be238d5c | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd | powerpc | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/3f31292046bdca618c1c7c901acc236cfe47fb1c | ORPH x86_64 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/7b7d7ae9b457fb6af8b9ff2131eace37ffb2cd39 | ORPH or1k | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/037650f61f4da50b273d7f8cda4ae62507d764dc | ORPH x86_64 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/cd10c1890995256c7bbfe0116f7fa554b3e0e1c0 | mipsel | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/73e586930253e843036f5c5f15687240d7cd345a | ORPH x86_64 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/a7e5183785c6da4c9ee96985ffeb950d81a30657 | powerpc64 | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/cfb046b80fa140e28aa14d969804edcf000ee64c | Classification of failures by reason for next --------------------------------------------- brltty-6.5 | 2 host-binutils-2.38 | 2 python-numpy-1.23.5 | 2 fluent-bit-2.0.9 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 gerbera-1.10.0 | 1 gnu-efi-3.0.15 | 1 gobject-introspection-1.72.0 | 1 host-binutils-2.37 | 1 host-go-1.19.6 | 1 jailhouse-0.12 | 1 libdeflate-1.15 | 1 libgcrypt-1.10.1 | 1 pcre2-10.42 | 1 python-pyicu-2.10.2 | 1 sudo-1.9.12p2 | 1 systemd-252.4 | 1 unknown | 1 xfsprogs-5.14.2 | 1 Detail of failures for next --------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/434c780a0758ecf0de3a42b15988035846913b60 | mips | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/84e5c6adb430f4d0a909492286ad589af4cb20f8 | i686 | fluent-bit-2.0.9 | NOK | http://autobuild.buildroot.net/results/9555fea983902219eaf7471758c1d40dbdb5991d | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/1a4b73695077a6eb9c13e9210074e1586868ed85 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/8f9365dc3d2f797d580ac4e63d5532a982ebbf5d | arc | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/50b4ef0f9f8dd77c1bcbd01ffc8b395adb96f47a | mips64el | gnu-efi-3.0.15 | NOK | http://autobuild.buildroot.net/results/bc2d56fa2d634c7bc9275216e2c2d7d592e23e9e | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/affbf93571e54dc15cace555e3aaa6a775b96adc | ORPH arm | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/942f515190fb6a9779781c1ed806768d1b240cdf | riscv32 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/a29b5bd2fc0feb81d9a547bd19492e0c7f5ffedc | x86_64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/5d81ec35c7617aa7a262024ea2f869db561b49da | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/2d9b9d122ea66997282503d61b41a8ec92ab8813 | aarch64 | jailhouse-0.12 | NOK | http://autobuild.buildroot.net/results/8fb6f6382843e5e64810bb36af95e8049862f736 | armeb | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/9b2c347ad4390fc536a17e4b642dfaca5c0e6b0c | i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/745e45e5aac54cfa0f7eb50f81826c1d6df0585b | ORPH sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/93a0c7fbbe0847fab03e5e9351fbc76480b1fe92 | ORPH mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/a3831200316ea0909ffabb655f66cd044be5ed49 | arm | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/fa2137348eedd72a63ab900665221fe74b2493e6 | sh4 | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/10f78bdd9d9665178469447bb3b2894d739df8be | sparc | sudo-1.9.12p2 | NOK | http://autobuild.buildroot.net/results/8be59dd94e4916f9457cb435104e36e62a28373b | ORPH s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/1f3a18843ea07fc54ab1d59b624a26a7ae03ea50 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/a1798321cdc624cdaa2e516f8f5b4de3a7fcc7b7 | mips | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/2c9fef8fa21a775371c746511c65394a9bdfbb8f | ORPH Classification of failures by reason for 2022.11.x -------------------------------------------------- android-tools-4.2.2+git2013... | 1 fs/ubi/ubi.mk:51: /home/bui... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 host-go-1.19.5 | 1 jemalloc-5.3.0 | 1 libgcrypt-1.10.1 | 1 libuci-4b3db1179747b6a67790... | 1 libxml2-2.10.3 | 1 linux-5.10.145-cip17-rt7 | 1 mutt-2.2.9 | 1 python-numpy-1.23.4 | 1 unknown | 1 xz-5.2.7 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/f30b9b32d7ece8a6b97093379341a552ea4a6d3d | xtensa | fs/ubi/ubi.mk:51: /home/bui... | NOK | http://autobuild.buildroot.net/results/f678c17cc4df06fb2737467e769cd8f72a3ea420 | microblazeel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/ce4399484dfc37497db75fd8e8190b353594743a | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/d1491bf8dd8c063cdf203ab935a96a0123b95d86 | mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0cb1f51e93b9503ceaf0ba56b92791c374bb9adf | ORPH powerpc64le | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/28f87e8ee0a22a82cbe3915bcc215a4513ec133d | sh4 | jemalloc-5.3.0 | NOK | http://autobuild.buildroot.net/results/ac1cecabf95bab9924d20cadce88f51dbe1b25f9 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/3cb24dbed26c8ccbd3ef5b9b91d7813c54dba1dd | ORPH mips64 | libuci-4b3db1179747b6a67790... | NOK | http://autobuild.buildroot.net/results/e1240855ef29037a52dfca0851625fa7497f415f | mips64el | libxml2-2.10.3 | NOK | http://autobuild.buildroot.net/results/1a72ff1cf82ef9c5cd331c35e74beab3f811196e | sh4aeb | linux-5.10.145-cip17-rt7 | NOK | http://autobuild.buildroot.net/results/f0c97e48fc03379dc89594864803eab3d52c108d | ORPH sparc | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/dfd674161046447a2ffb45ce6912277325d1daed | mipsel | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/2f3e4b083cb70dc2c02890388fc2163e61a2034d | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/55b7d50b7f9d6c9c61869c4f0bfa974c455d9fe7 | microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/4e10965f7aa890d6d1c66689e9d32e5769d5cba1 | ORPH Gitlab CI results for 2023-02-21 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestAarch64Pages64kGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454778 | ORPH TestAarch64Pages64kMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454782 | ORPH TestAarch64Pages64kuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454784 | ORPH TestCheckPackage | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455189 | TestClangCompilerRT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454401 | ORPH ...ioDracutGlibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454282 | ORPH TestCrudiniPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454404 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454410 | ORPH ...rch64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454804 | ORPH ...tlinAarch64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454805 | ORPH ...arch64MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454806 | ORPH ...otlinAarch64MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454807 | ORPH ...ch64UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454808 | ORPH ...linAarch64UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454810 | ORPH ...h64beGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454812 | ORPH ...inAarch64beGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454813 | ORPH ...64beUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454815 | ORPH ...nAarch64beUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454817 | ORPH ...750dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454819 | ORPH ...nArcle750dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454821 | ORPH ...ehs38GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454822 | ORPH ...inArclehs38GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454826 | ORPH ...hs38UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454827 | ORPH ...nArclehs38UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454829 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454830 | ORPH ...mebv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454832 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454833 | ORPH ...rmebv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454835 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454836 | ORPH ...ebv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454839 | ORPH ...5eabiGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454841 | ORPH ...inArmv5eabiGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454842 | ORPH ...v5eabiMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454844 | ORPH ...linArmv5eabiMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454846 | ORPH ...eabiUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454848 | ORPH ...nArmv5eabiUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454851 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454852 | ORPH ...Armv6eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454855 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454857 | ORPH ...nArmv6eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454860 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454861 | ORPH ...rmv6eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454862 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454863 | ORPH ...Armv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454864 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454865 | ORPH ...nArmv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454866 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454868 | ORPH ...rmv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454871 | ORPH ...mv7mUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454873 | ORPH ...tlinArmv7mUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454876 | ORPH ...8xxxUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454878 | ORPH ...nM68k68xxxUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454879 | ORPH ...fireUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454881 | ORPH ...8kcoldfireUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454882 | ORPH ...azebeGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454883 | ORPH ...icroblazebeGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454885 | ORPH ...lazebeMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454888 | ORPH ...MicroblazebeMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454889 | ORPH ...zebeUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454891 | ORPH ...croblazebeUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454892 | ORPH ...azeelGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454894 | ORPH ...icroblazeelGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454895 | ORPH ...lazeelMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454896 | ORPH ...MicroblazeelMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454897 | ORPH ...zeelUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454900 | ORPH ...croblazeelUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454902 | ORPH ...ips32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454904 | ORPH ...otlinMips32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454905 | ORPH ...Mips32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454906 | ORPH ...ootlinMips32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454908 | ORPH ...ps32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454909 | ORPH ...tlinMips32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454910 | ORPH ...s32elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454912 | ORPH ...linMips32elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454913 | ORPH ...ps32elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454914 | ORPH ...tlinMips32elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454915 | ORPH ...32elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454917 | ORPH ...inMips32elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454918 | ORPH ...2r5elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454920 | ORPH ...nMips32r5elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454921 | ORPH ...32r5elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454922 | ORPH ...inMips32r5elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454925 | ORPH ...r5elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454928 | ORPH ...Mips32r5elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454932 | ORPH ...2r6elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454936 | ORPH ...nMips32r6elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454941 | ORPH ...32r6elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454944 | ORPH ...inMips32r6elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454948 | ORPH ...r6elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454952 | ORPH ...Mips32r6elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454953 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454954 | ORPH ...Mips64eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454955 | ORPH ...4eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454957 | ORPH ...nMips64eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454958 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454959 | ORPH ...ips64eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454960 | ORPH ...64n32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454962 | ORPH ...inMips64n32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454963 | ORPH ...s64n32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454964 | ORPH ...linMips64n32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454967 | ORPH ...4n32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454968 | ORPH ...nMips64n32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454969 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454970 | ORPH ...ps64r6eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454971 | ORPH ...6eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454972 | ORPH ...ips64r6eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454975 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454976 | ORPH ...s64r6eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454977 | ORPH ...Nios2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454979 | ORPH ...ootlinNios2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454981 | ORPH ...nriscGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454983 | ORPH ...linOpenriscGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454986 | ORPH ...enriscMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454988 | ORPH ...tlinOpenriscMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454990 | ORPH ...riscUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454993 | ORPH ...inOpenriscUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454994 | ORPH ...440fpGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454996 | ORPH ...owerpc440fpGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454997 | ORPH ...c440fpMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454999 | ORPH ...Powerpc440fpMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455000 | ORPH ...40fpUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455003 | ORPH ...werpc440fpUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455004 | ORPH ...e5500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455006 | ORPH ...erpc64e5500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455008 | ORPH ...e6500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455009 | ORPH ...erpc64e6500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455010 | ORPH ...4e6500MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455011 | ORPH ...werpc64e6500MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455012 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455014 | ORPH ...c64lepower8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455016 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455017 | ORPH ...pc64lepower8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455019 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455020 | ORPH ...rpc64power8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455022 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455023 | ORPH ...erpc64power8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455033 | ORPH ...300c3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455036 | ORPH ...werpce300c3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455039 | ORPH ...e300c3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455042 | ORPH ...owerpce300c3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455047 | ORPH ...00c3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455049 | ORPH ...erpce300c3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455053 | ORPH ...500mcGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455055 | ORPH ...werpce500mcGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455057 | ORPH ...e500mcMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455059 | ORPH ...owerpce500mcMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455060 | ORPH ...00mcUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455061 | ORPH ...erpce500mcUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455066 | ORPH ...lp32dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455069 | ORPH ...lp64dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455072 | ORPH ...iscv64lp64dGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455077 | ORPH ...4lp64dMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455079 | ORPH ...Riscv64lp64dMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455080 | ORPH ...p64dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455082 | ORPH ...scv64lp64dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455084 | ORPH ...0xz13GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455086 | ORPH ...linS390xz13GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455088 | ORPH ...Shsh4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455090 | ORPH ...ootlinShsh4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455092 | ORPH ...nShsh4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455093 | ORPH ...BootlinShsh4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455096 | ORPH ...hsh4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455098 | ORPH ...otlinShsh4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455101 | ORPH ...h4aebGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455103 | ORPH ...linShsh4aebGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455104 | ORPH ...sh4aebMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455105 | ORPH ...tlinShsh4aebMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455108 | ORPH ...arc64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455109 | ORPH ...tlinSparc64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455111 | ORPH ...rcv8UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455115 | ORPH ...linSparcv8UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455117 | ORPH ...X8664GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455121 | ORPH ...ootlinX8664GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455123 | ORPH ...nX8664MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455124 | ORPH ...BootlinX8664MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455125 | ORPH ...8664UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455126 | ORPH ...otlinX8664UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455128 | ORPH ...orei7GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455130 | ORPH ...X8664corei7GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455132 | ORPH ...corei7MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455134 | ORPH ...nX8664corei7MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455138 | ORPH ...rei7UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455141 | ORPH ...8664corei7UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455144 | ORPH ...664v2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455146 | ORPH ...tlinX8664v2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455148 | ORPH ...8664v2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455149 | ORPH ...otlinX8664v2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455150 | ORPH ...64v2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455152 | ORPH ...linX8664v2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455153 | ORPH ...664v3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455154 | ORPH ...tlinX8664v3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455155 | ORPH ...8664v3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455156 | ORPH ...otlinX8664v3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455157 | ORPH ...64v3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455158 | ORPH ...linX8664v3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455159 | ORPH ...664v4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455160 | ORPH ...tlinX8664v4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455162 | ORPH ...8664v4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455163 | ORPH ...otlinX8664v4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455165 | ORPH ...64v4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455166 | ORPH ...linX8664v4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455167 | ORPH ...core2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455169 | ORPH ...linX86core2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455170 | ORPH ...6core2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455171 | ORPH ...tlinX86core2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455172 | ORPH ...ore2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455174 | ORPH ...inX86core2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455176 | ORPH ...6i686GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455179 | ORPH ...tlinX86i686GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455181 | ORPH ...86i686MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455183 | ORPH ...otlinX86i686MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455184 | ORPH ...i686UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455185 | ORPH ...linX86i686UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455186 | ORPH ...lx60UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455187 | ORPH ...Xtensalx60UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455188 | ORPH ...ToolchainBuildrootMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454786 | ORPH ...olchainBuildrootuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454788 | ORPH ...xternalToolchainCCache | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454790 | ORPH ...ernalToolchainCtngMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454792 | ORPH ...rnalToolchainLinaroArm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454793 | ORPH ...ToolchainSourceryArmv4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454797 | ORPH ...ToolchainSourceryArmv5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454800 | ORPH ...ToolchainSourceryArmv7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454802 | ORPH TestFileCapabilities | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454235 | ORPH TestGdbserverOnly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454450 | ORPH TestGetDevelopers | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798455191 | ORPH TestGlibcAllTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454265 | ORPH ...DefaultLimitedTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454268 | ORPH TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454455 | ORPH TestGnupg2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454461 | ORPH TestGst1Python | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454465 | ORPH TestHWLoc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454470 | ORPH TestHighway | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454468 | ORPH TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454476 | ORPH ...InitSystemBusyboxRoNet | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454342 | ORPH TestInitSystemBusyboxRw | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454344 | ORPH TestInitSystemNone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454349 | ORPH ...IfupdownDbusbrokerDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454362 | ORPH ...ystemSystemdRoNetworkd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454365 | ORPH TestIso9660Grub2EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454306 | ORPH TestIso9660Grub2External | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454307 | ORPH ...0Grub2ExternalCompress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454309 | ORPH TestIso9660Grub2Hybrid | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454313 | ORPH TestIso9660Grub2Internal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454316 | ORPH ...so9660SyslinuxExternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454317 | ORPH ...slinuxExternalCompress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454320 | ORPH ...so9660SyslinuxInternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454321 | ORPH TestJffs2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454324 | ORPH TestLibJXL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454480 | ORPH TestLibshdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454483 | ORPH TestLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454495 | ORPH TestLuaHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454524 | ORPH TestLuaInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454526 | ORPH TestLuaLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454485 | ORPH TestLuaLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454491 | ORPH TestLuaLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454498 | ORPH TestLuaLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454505 | ORPH TestLuaLuaCffi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454514 | ORPH TestLuaLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454518 | ORPH TestLuaLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454543 | ORPH TestLuaLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454546 | ORPH TestLuaLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454522 | ORPH TestLuaLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454548 | ORPH TestLuaLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454532 | ORPH TestLuaLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454553 | ORPH TestLuaLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454537 | ORPH TestLuaLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454555 | ORPH TestLuaLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454559 | ORPH TestLuaLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454520 | ORPH TestLuaLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454550 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454562 | ORPH TestLuaLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454541 | ORPH TestLuaLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454528 | ORPH TestLuaLzlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454578 | ORPH TestLuaRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454746 | ORPH TestLuaUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454539 | ORPH TestLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454496 | ORPH TestLuajitHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454525 | ORPH TestLuajitInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454527 | ORPH TestLuajitLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454488 | ORPH TestLuajitLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454494 | ORPH TestLuajitLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454500 | ORPH TestLuajitLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454513 | ORPH TestLuajitLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454519 | ORPH TestLuajitLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454544 | ORPH TestLuajitLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454547 | ORPH TestLuajitLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454523 | ORPH TestLuajitLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454549 | ORPH TestLuajitLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454534 | ORPH TestLuajitLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454554 | ORPH TestLuajitLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454538 | ORPH TestLuajitLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454558 | ORPH TestLuajitLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454561 | ORPH TestLuajitLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454521 | ORPH TestLuajitLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454551 | ORPH TestLuajitLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454564 | ORPH TestLuajitLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454542 | ORPH TestLuajitLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454530 | ORPH TestLuajitRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454747 | ORPH TestLuajitTurbolua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454764 | ORPH TestLuajitUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454540 | ORPH TestLuvi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454569 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454576 | ORPH TestMender | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454579 | ORPH TestMsrTools | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454582 | ORPH TestNcdu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454583 | ORPH TestNetdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454584 | ORPH TestNodeJSBasic | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454587 | ORPH TestNodeJSModule | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454588 | ORPH TestOctave | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454591 | ORPH TestOla | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454592 | ORPH TestOpenJdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454594 | ORPH TestOpenSshGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454595 | ORPH TestOpenSshuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454597 | ORPH TestOpkg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454598 | ORPH TestPerftest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454600 | ORPH TestPerl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454601 | ORPH TestPerlClassLoad | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454602 | ORPH TestPerlDBDmysql | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454604 | ORPH TestPerlEncodeDetect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454605 | ORPH TestPerlGDGraph | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454606 | ORPH TestPerlHTMLParser | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454609 | ORPH TestPerlIOSocketMulticast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454613 | ORPH TestPerlIOSocketSSL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454617 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454620 | ORPH TestPerlMailDKIM | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454621 | ORPH TestPerlX10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454623 | ORPH TestPerlXMLLibXML | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454626 | ORPH TestPerllibwwwperl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454618 | ORPH TestPhpApcu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454627 | ORPH TestPhpLuaLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454630 | ORPH TestPhpLuaLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454633 | ORPH TestPhpPam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454635 | ORPH TestPhpPeclDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454638 | ORPH TestPixz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454641 | ORPH TestPolkitInitd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454643 | ORPH TestPolkitSystemd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454645 | ORPH TestProsodyLua51 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454648 | ORPH TestProsodyLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454651 | ORPH TestPyNdiff | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454722 | ORPH TestPython3Py | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454653 | ORPH TestPython3PyPyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454655 | ORPH TestPython3Pyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454657 | ORPH TestPythonAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454665 | ORPH TestPythonAvro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454668 | ORPH TestPythonPahoMQTT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454715 | ORPH TestPythonPy3Aexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454658 | ORPH TestPythonPy3Argh | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454660 | ORPH TestPythonPy3Attrs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454661 | ORPH TestPythonPy3Autobahn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454666 | ORPH TestPythonPy3Automat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454667 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454670 | ORPH TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454673 | ORPH TestPythonPy3Botocore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454676 | ORPH TestPythonPy3Can | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454679 | ORPH TestPythonPy3Cbor | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454680 | ORPH TestPythonPy3Click | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454682 | ORPH TestPythonPy3Colorzero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454683 | ORPH TestPythonPy3Constantly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454685 | ORPH TestPythonPy3Construct | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454687 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454688 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454689 | ORPH TestPythonPy3DBusFast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454690 | ORPH TestPythonPy3DBusNext | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454692 | ORPH TestPythonPy3Dicttoxml2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454693 | ORPH TestPythonPy3Distro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454694 | ORPH TestPythonPy3Django | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454695 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454698 | ORPH TestPythonPy3Flask | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454700 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454701 | ORPH TestPythonPy3Git | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454702 | ORPH TestPythonPy3Gitdb2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454703 | ORPH TestPythonPy3GnuPG | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454705 | ORPH TestPythonPy3Gobject | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454706 | ORPH TestPythonPy3Gpiozero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454707 | ORPH TestPythonPy3Hkdf | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454708 | ORPH TestPythonPy3Incremental | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454710 | ORPH TestPythonPy3Iptables | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454711 | ORPH TestPythonPy3Jmespath | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454712 | ORPH TestPythonPy3Libftdi1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454478 | ORPH ...PythonPy3MagicWormhole | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454713 | ORPH TestPythonPy3Munch | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454714 | ORPH TestPythonPy3Passlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454716 | ORPH TestPythonPy3Pexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454717 | ORPH TestPythonPy3PyAlsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454719 | ORPH TestPythonPy3Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454721 | ORPH TestPythonPy3Pytest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454723 | ORPH ...PythonPy3PytestAsyncio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454724 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454725 | ORPH TestPythonPy3Qrcode | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454726 | ORPH TestPythonPy3RSA | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454728 | ORPH TestPythonPy3RpiGpio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454727 | ORPH TestPythonPy3S3transfer | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454731 | ORPH TestPythonPy3SciPy | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454732 | ORPH ...thonPy3ServiceIdentity | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454733 | ORPH TestPythonPy3Smmap2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454734 | ORPH TestPythonPy3Spake2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454735 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454736 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454737 | ORPH TestPythonPy3Txaio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454738 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454740 | ORPH TestPythonPy3Ubjson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454741 | ORPH ...y3UnitTestXmlReporting | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454742 | ORPH TestPythonPy3rtoml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454729 | ORPH TestPythonPybind | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454720 | ORPH TestRdmaCore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454743 | ORPH TestRedis | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454744 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454748 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454750 | ORPH TestS6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454752 | ORPH TestS6Networking | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454754 | ORPH TestS6PortableUtils | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454756 | ORPH TestS6Rc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454758 | ORPH TestSquashfsMaxBlocksize | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454331 | ORPH TestSudo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454759 | ORPH TestSyslogNg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454761 | ORPH TestTmux | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454762 | ORPH TestUbootOpensslPkgConfig | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454766 | ORPH TestZ3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454768 | ORPH TestZerofree | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454769 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454771 | ORPH TestZfsMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454773 | ORPH TestZfsUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3798454775 | ORPH -- http://autobuild.buildroot.net From cherniaev.andrei at kairo.space Wed Feb 22 09:30:55 2023 From: cherniaev.andrei at kairo.space (Andrei Cherniaev) Date: Wed, 22 Feb 2023 18:30:55 +0900 Subject: [Buildroot] [RE]Re: [PATCH] boot/grub2: add information where isconfiguration file Message-ID: <167705825735.1345689.5559147157105378409@wmail10.mailplug.com> Hello Thomas Petazzoni"boot/grub2/grub.cfg: it is part of Buildroot itself, and you probably don't want to have project-specific changes in there."You say that I try to set project-specific settings. Look at Buildroot, it set project-specific set default="0"set timeout="5"Why? Why 5, not 6? Buildroot shouldn't set project-specific settings, isn't it? May be maintainer should just removeset default="0"set timeout="5"from grub.cfg ?Andrei Cherniaev----- Original Message -----From : Thomas Petazzoni To : "AndreiCherniaev" Cc : Sent : 2023-02-22 07:02:02Subject : Re: [Buildroot] [PATCH] boot/grub2: add information where isconfiguration fileHello Andrei,On Mon, 9 Jan 2023 16:33:52 +0900AndreiCherniaev wrote:> diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in> index 92b5dd501b..bf0400c08f 100644> --- a/boot/grub2/Config.in> +++ b/boot/grub2/Config.in> @@ -125,6 +125,7 @@ config BR2_TARGET_GRUB2_BUILTIN_CONFIG_PC> into the Grub image itself. This allows to set the root> device and other configuration parameters, but however menu> entries cannot be described in this embedded configuration.> + Use boot/grub2/grub.cfg to edit menu entries.Actually no, you probably don't want to change boot/grub2/grub.cfg: itis part of Buildroot itself, and you probably don't want to haveproject-specific changes in there.Instead, you should override it using a rootfs overlay (if grub.cfg isin $(TARGET_DIR)/boot) or a post-build/post-image script (if it's inthe EFI partition).I have nevertheless applied your patch, but after tweaking the messagein the help text, and moving it to the main Grub2 option. See: https://gitlab.com/buildroot.org/buildroot/-/commit/7692d5beb2d9e4d0b463f0f26a177829e5bcc1ecBest regards,Thomas Petazzoni-- Thomas Petazzoni, co-owner and CEO, BootlinEmbedded Linux and Kernel engineering and traininghttps://bootlin.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Wed Feb 22 09:41:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 10:41:22 +0100 Subject: [Buildroot] [RE]Re: [PATCH] boot/grub2: add information where isconfiguration file In-Reply-To: <167705825735.1345689.5559147157105378409@wmail10.mailplug.com> References: <167705825735.1345689.5559147157105378409@wmail10.mailplug.com> Message-ID: <20230222104122.6eff1ef1@windsurf> Hello Andrei, Sorry but the plain text version of your e-mail is unreadable. Could you use an e-mail client that sends a proper plain text version of its e-mails? Thanks a lot, Thomas Petazzoni On Wed, 22 Feb 2023 18:30:55 +0900 Andrei Cherniaev wrote: > Hello Thomas Petazzoni"boot/grub2/grub.cfg: it is part of Buildroot itself, and you probably don't want to have project-specific changes in there."You say that I try to set project-specific settings. Look at Buildroot, it set project-specific set default="0"set timeout="5"Why? Why 5, not 6? Buildroot shouldn't set project-specific settings, isn't it? May be maintainer should just removeset default="0"set timeout="5"from grub.cfg ?Andrei Cherniaev----- Original Message -----From : Thomas Petazzoni To : "AndreiCherniaev" Cc : Sent : 2023-02-22 07:02:02Subject : Re: [Buildroot] [PATCH] boot/grub2: add information where isconfiguration fileHello Andrei,On Mon, 9 Jan 2023 16:33:52 +0900AndreiCherniaev wrote:> diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in> index 92b5dd501b..bf0400c08f 100644> --- a/boot/grub2/Config.in> +++ b/boot/grub2/Config.in> @@ -125,6 +125 ,7 @@ config BR2_TARGET_GRUB2_BUILTIN_CONFIG_PC> into the Grub image itself. This allows to set the root> device and other configuration parameters, but however menu> entries cannot be described in this embedded configuration.> + Use boot/grub2/grub.cfg to edit menu entries.Actually no, you probably don't want to change boot/grub2/grub.cfg: itis part of Buildroot itself, and you probably don't want to haveproject-specific changes in there.Instead, you should override it using a rootfs overlay (if grub.cfg isin $(TARGET_DIR)/boot) or a post-build/post-image script (if it's inthe EFI partition).I have nevertheless applied your patch, but after tweaking the messagein the help text, and moving it to the main Grub2 option. See: https://gitlab.com/buildroot.org/buildroot/-/commit/7692d5beb2d9e4d0b463f0f26a177829e5bcc1ecBest regards,Thomas Petazzoni-- Thomas Petazzoni, co-owner and CEO, BootlinEmbedded Linux and Kernel engineering and traininghttps://bootlin.com -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Wed Feb 22 09:44:41 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 10:44:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/sudo: fix openssl static build Message-ID: <20230222094441.439014-1-fontaine.fabrice@gmail.com> Fix the following build failure with sparc raised since bump to version 1.9.11p2 in commit 9b7f8da96be549a52630cd87b30851d600f163a4 and https://github.com/sudo-project/sudo/commit/9fbbca7b7a4cc60a8aa27d73de54278004a704c0: hecking for X509_STORE_CTX_get0_cert configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 /home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' [...] In file included from ./hostcheck.c:38: ../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) | ^~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b Signed-off-by: Fabrice Fontaine --- ...onfigure.ac-fix-openssl-static-build.patch | 49 +++++++++++++++++++ package/sudo/sudo.mk | 2 + 2 files changed, 51 insertions(+) create mode 100644 package/sudo/0001-configure.ac-fix-openssl-static-build.patch diff --git a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch new file mode 100644 index 0000000000..32edd148a0 --- /dev/null +++ b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch @@ -0,0 +1,49 @@ +From 5cfc7e277d0b262a1d12e867c47a36301fb7edb7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 22 Feb 2023 10:01:25 +0100 +Subject: [PATCH] configure.ac: fix openssl static build + +Do not use AX_APPEND_FLAG as it will break static builds by removing +duplicates such as -lz or -latomic which are needed by -lssl and +-lcrypto. This will fix the following build failure with sparc which +needs -latomic: + +Checking for X509_STORE_CTX_get0_cert +configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 +/home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': +x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' + +[...] + +In file included from ./hostcheck.c:38: +../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' + 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) + | ^~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/sudo-project/sudo/pull/244] +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8eccad7e4..523d8e56b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3082,7 +3082,9 @@ if test "${enable_openssl-no}" != no; then + SUDO_APPEND_LIBPATH([LIBTLS], [$f]) + ;; + *) +- AX_APPEND_FLAG([$f], [LIBTLS]) ++ # Do not use AX_APPEND_FLAG as it will break static builds by removing ++ # duplicates such as -lz or -latomic which are needed by -lssl and -lcrypto ++ LIBTLS="$LIBTLS $f" + ;; + esac + done +-- +2.39.0 + diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index c4eaafa6b1..3b5c898917 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -13,6 +13,8 @@ SUDO_LICENSE_FILES = LICENSE.md SUDO_CPE_ID_VERSION = $(SUDO_VERSION_MAJOR) SUDO_CPE_ID_UPDATE = $(SUDO_VERSION_MINOR) SUDO_SELINUX_MODULES = sudo +# We're patching configure.ac +SUDO_AUTORECONF = YES # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \ -- 2.39.0 From diego.hdmp at gmail.com Wed Feb 22 09:49:16 2023 From: diego.hdmp at gmail.com (Diego Hurtado de Mendoza) Date: Wed, 22 Feb 2023 10:49:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/hackrf: bump to version 2023.01.1 Message-ID: <20230222094916.1853413-1-diego.hdmp@gmail.com> https://github.com/greatscottgadgets/hackrf/releases/tag/v2023.01.1 Signed-off-by: Diego Hurtado de Mendoza --- package/hackrf/hackrf.hash | 2 +- package/hackrf/hackrf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hackrf/hackrf.hash b/package/hackrf/hackrf.hash index 16ccb9dcfb..0426009dd3 100644 --- a/package/hackrf/hackrf.hash +++ b/package/hackrf/hackrf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bacd4e7937467ffa14654624444c8b5c716ab470d8c1ee8d220d2094ae2adb3e hackrf-2022.09.1.tar.xz +sha256 32a03f943a30be4ba478e94bf69f14a5b7d55be6761007f4a4f5453418206a11 hackrf-2023.01.1.tar.xz sha256 49b60a6288f90f49074228cc1fae0fb16871ba36b756013abdf7c2fc92f01fad COPYING diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 4317da60bc..0d7533815d 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -4,7 +4,7 @@ # ################################################################################ -HACKRF_VERSION = 2022.09.1 +HACKRF_VERSION = 2023.01.1 HACKRF_SITE = https://github.com/greatscottgadgets/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause -- 2.39.2 From fontaine.fabrice at gmail.com Wed Feb 22 09:54:34 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 10:54:34 +0100 Subject: [Buildroot] [PATCH 1/1] boot/opensbi: fix build with empty OPENSBI_PLAT Message-ID: <20230222095434.444552-1-fontaine.fabrice@gmail.com> Fix the following build failure when OPENSBI_PLAT is empty raised since commit 9b5b7165deb91bad3cdb1ea0dd8f940eff75f3a9: /usr/bin/install -m 0644 -D /nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin /nvmedata/autobuild/instance-4/output-1/images/fw_jump.bin /usr/bin/install: cannot stat '/nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin': No such file or directory Fixes: - http://autobuild.buildroot.org/results/8033327f090e4a3d84a7fce1f62b14fdf89dbd89 Signed-off-by: Fabrice Fontaine --- boot/opensbi/opensbi.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk index 06ec87b2c3..dd113a0bf8 100644 --- a/boot/opensbi/opensbi.mk +++ b/boot/opensbi/opensbi.mk @@ -71,6 +71,7 @@ OPENSBI_INSTALL_IMAGES = YES OPENSBI_FW_IMAGES += payload endif +ifneq ($(OPENSBI_PLAT),) define OPENSBI_INSTALL_IMAGES_CMDS $(foreach f,$(OPENSBI_FW_IMAGES),\ $(INSTALL) -m 0644 -D $(@D)/build/platform/$(OPENSBI_PLAT)/firmware/fw_$(f).bin \ @@ -79,6 +80,7 @@ define OPENSBI_INSTALL_IMAGES_CMDS $(BINARIES_DIR)/fw_$(f).elf ) endef +endif # libsbi.a is not a library meant to be linked in user-space code, but # with bare metal code, which is why we don't install it in -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 10:32:42 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 11:32:42 +0100 Subject: [Buildroot] [PATCH 1/1] boot/at91dataflashboot: disable stack-protector Message-ID: <20230222103242.755918-1-fontaine.fabrice@gmail.com> Disable stack-protector to avoid the following build failure: /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T elf32-littlearm.lds -Ttext 0 -n -o DataflashBoot-1.05.out objs/cstartup_ram.o objs/at45.o objs/com.o objs/dataflash.o objs/div0.o objs/init.o objs/main.o objs/stdio.o objs/asm_isr.o objs/jump.o objs/_udivsi3.o objs/_umodsi3.o objs/led.o /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: objs/main.o: in function `main': main.c:(.text.startup+0x834): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/502c54be4978e628724d72ee2a75d4c5e0a6ace8 Signed-off-by: Fabrice Fontaine --- boot/at91dataflashboot/at91dataflashboot.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk index 0ad8b6fc44..c66f27e343 100644 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ b/boot/at91dataflashboot/at91dataflashboot.mk @@ -12,7 +12,8 @@ AT91DATAFLASHBOOT_INSTALL_TARGET = NO AT91DATAFLASHBOOT_INSTALL_IMAGES = YES define AT91DATAFLASHBOOT_BUILD_CMDS - make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) + make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \ + CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector" endef define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS -- 2.39.0 From marcus.folkesson at gmail.com Wed Feb 22 10:39:17 2023 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Wed, 22 Feb 2023 11:39:17 +0100 Subject: [Buildroot] [PATCH v3] package/libcamera-apps: enable LIBAV only if libdrm and ffmpeg is present Message-ID: <20230222103917.2709112-1-marcus.folkesson@gmail.com> Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps does enable LIBAV by default which depends on libdrm and ffpmeg. Fixes: - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 13 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Marcus Folkesson --- Notes: v3: - Only enable libav if both libdrm and ffmpeg is selected - Tested with these four combinations: - libcamera-apps enabled, ffmpeg disabled, libdrm disabled - libcamera-apps enabled, ffmpeg enabled, libdrm disabled - libcamera-apps enabled, ffmpeg disabled, libdrm enabled - libcamera-apps enabled, ffmpeg enabled, libdrm enabled v2: -Add dependency to ffmpeg package/libcamera-apps/libcamera-apps.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 290ee9a026..fe402ec3f4 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -29,6 +29,13 @@ else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 endif +ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_LIBDRM),yy) +LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 +endif + ifeq ($(BR2_PACKAGE_XORG7),y) LIBCAMERA_APPS_DEPENDENCIES += \ $(if $(BR2_PACKAGE_LIBEPOXY),libepoxy) \ -- 2.39.2 From fontaine.fabrice at gmail.com Wed Feb 22 11:10:59 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 12:10:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: fix libressl build Message-ID: <20230222111059.887398-1-fontaine.fabrice@gmail.com> Fix the following build failure with libressl raised since bump to version 2.10.0 in commit 03bab7117d232c9dcd784a74eefc0e48ea51ee53: /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c: In function 'crypto_cert_get_signature_alg': /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c:980:8: error: 'NID_sha3_224' undeclared (first use in this function) case NID_sha3_224: ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e96848576ac292799636abe7485c37aa54196a2c Signed-off-by: Fabrice Fontaine --- ...e-sha3-and-shake-hashes-for-libressl.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch diff --git a/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch b/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch new file mode 100644 index 0000000000..14f615e2e7 --- /dev/null +++ b/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch @@ -0,0 +1,38 @@ +From bd093454fe126163634c00b7484ab7fee6ffe670 Mon Sep 17 00:00:00 2001 +From: akallabeth +Date: Mon, 20 Feb 2023 16:23:39 +0100 +Subject: [PATCH] Fix #8702: Disable sha3 and shake hashes for libressl + +[Retrieved (and backported) from: +https://github.com/FreeRDP/FreeRDP/pull/8708/commits/bd093454fe126163634c00b7484ab7fee6ffe670] +Signed-off-by: Fabrice Fontaine +--- + libfreerdp/crypto/x509_utils.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c +index 6e87a88b8d8..62cf2939be7 100644 +--- a/libfreerdp/crypto/crypto.c ++++ b/libfreerdp/crypto/crypto.c +@@ -748,7 +748,7 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) + return WINPR_MD_SHA512; + case NID_ripemd160: + return WINPR_MD_RIPEMD160; +-#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) && !defined(LIBRESSL_VERSION_NUMBER) + case NID_sha3_224: + return WINPR_MD_SHA3_224; + case NID_sha3_256: +@@ -757,11 +757,11 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) + return WINPR_MD_SHA3_384; + case NID_sha3_512: + return WINPR_MD_SHA3_512; +-#endif + case NID_shake128: + return WINPR_MD_SHAKE128; + case NID_shake256: + return WINPR_MD_SHAKE256; ++#endif + case NID_undef: + default: + return WINPR_MD_NONE; -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 14:35:12 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 15:35:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/audit: force arm mode instead of Thumb mode Message-ID: <20230222143512.1555539-1-fontaine.fabrice@gmail.com> Fix the following build failure: /tmp/ccY5gl3z.s:2145: Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/9d18a0d360b2e2f9e87c55daedda62d6ce198bb9 Signed-off-by: Fabrice Fontaine --- package/audit/audit.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/audit/audit.mk b/package/audit/audit.mk index cbb174b980..af81dabac0 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -15,6 +15,13 @@ AUDIT_INSTALL_STAGING = YES AUDIT_CONF_OPTS = --without-python --without-python3 +# src/libev has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) AUDIT_DEPENDENCIES += libcap-ng AUDIT_CONF_OPTS += --with-libcap-ng=yes -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 14:37:53 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 15:37:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/libev: force arm mode instead of Thumb mode Message-ID: <20230222143753.1563322-1-fontaine.fabrice@gmail.com> Fix the following build failure: /tmp/ccHc3Awn.s:825: Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/1c597c9da724d6cac06b09b1ecd456a28440a3a3 Signed-off-by: Fabrice Fontaine --- package/libev/libev.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libev/libev.mk b/package/libev/libev.mk index 9f3c19d46c..cbd5433d76 100644 --- a/package/libev/libev.mk +++ b/package/libev/libev.mk @@ -10,6 +10,13 @@ LIBEV_INSTALL_STAGING = YES LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+ LIBEV_LICENSE_FILES = LICENSE +# libev has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBEV_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + # The 'compatibility' event.h header conflicts with libevent # It's completely unnecessary for BR packages so remove it define LIBEV_DISABLE_EVENT_H_INSTALL -- 2.39.0 From thomas.petazzoni at bootlin.com Wed Feb 22 14:51:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:51:34 +0100 Subject: [Buildroot] [git commit] package/freerdp: fix libressl build Message-ID: <20230222145144.65618866DE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0af2840b1b16dd95b9a468e46b6e275186e5447 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with libressl raised since bump to version 2.10.0 in commit 03bab7117d232c9dcd784a74eefc0e48ea51ee53: /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c: In function 'crypto_cert_get_signature_alg': /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c:980:8: error: 'NID_sha3_224' undeclared (first use in this function) case NID_sha3_224: ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e96848576ac292799636abe7485c37aa54196a2c Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...isable-sha3-and-shake-hashes-for-libressl.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch b/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch new file mode 100644 index 0000000000..14f615e2e7 --- /dev/null +++ b/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch @@ -0,0 +1,38 @@ +From bd093454fe126163634c00b7484ab7fee6ffe670 Mon Sep 17 00:00:00 2001 +From: akallabeth +Date: Mon, 20 Feb 2023 16:23:39 +0100 +Subject: [PATCH] Fix #8702: Disable sha3 and shake hashes for libressl + +[Retrieved (and backported) from: +https://github.com/FreeRDP/FreeRDP/pull/8708/commits/bd093454fe126163634c00b7484ab7fee6ffe670] +Signed-off-by: Fabrice Fontaine +--- + libfreerdp/crypto/x509_utils.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c +index 6e87a88b8d8..62cf2939be7 100644 +--- a/libfreerdp/crypto/crypto.c ++++ b/libfreerdp/crypto/crypto.c +@@ -748,7 +748,7 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) + return WINPR_MD_SHA512; + case NID_ripemd160: + return WINPR_MD_RIPEMD160; +-#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) && !defined(LIBRESSL_VERSION_NUMBER) + case NID_sha3_224: + return WINPR_MD_SHA3_224; + case NID_sha3_256: +@@ -757,11 +757,11 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) + return WINPR_MD_SHA3_384; + case NID_sha3_512: + return WINPR_MD_SHA3_512; +-#endif + case NID_shake128: + return WINPR_MD_SHAKE128; + case NID_shake256: + return WINPR_MD_SHAKE256; ++#endif + case NID_undef: + default: + return WINPR_MD_NONE; From thomas.petazzoni at bootlin.com Wed Feb 22 14:51:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:51:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: fix libressl build In-Reply-To: <20230222111059.887398-1-fontaine.fabrice@gmail.com> References: <20230222111059.887398-1-fontaine.fabrice@gmail.com> Message-ID: <20230222155152.336584d6@windsurf> On Wed, 22 Feb 2023 12:10:59 +0100 Fabrice Fontaine wrote: > Fix the following build failure with libressl raised since bump to > version 2.10.0 in commit 03bab7117d232c9dcd784a74eefc0e48ea51ee53: > > /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c: In function 'crypto_cert_get_signature_alg': > /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c:980:8: error: 'NID_sha3_224' undeclared (first use in this function) > case NID_sha3_224: > ^~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/e96848576ac292799636abe7485c37aa54196a2c > > Signed-off-by: Fabrice Fontaine > --- > ...e-sha3-and-shake-hashes-for-libressl.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 14:52:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:52:12 +0100 Subject: [Buildroot] [PATCH v3] package/libcamera-apps: enable LIBAV only if libdrm and ffmpeg is present In-Reply-To: <20230222103917.2709112-1-marcus.folkesson@gmail.com> References: <20230222103917.2709112-1-marcus.folkesson@gmail.com> Message-ID: <20230222155212.4aecfc97@windsurf> On Wed, 22 Feb 2023 11:39:17 +0100 Marcus Folkesson wrote: > Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps > does enable LIBAV by default which depends on libdrm and ffpmeg. > > Fixes: > - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ > > /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory > 13 | #include > | ^~~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: Marcus Folkesson > --- Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Wed Feb 22 14:52:22 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 22 Feb 2023 15:52:22 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 7.0.1 In-Reply-To: <20230222145059.1939094-1-giulio.benetti@benettiengineering.com> References: <20230222145059.1939094-1-giulio.benetti@benettiengineering.com> Message-ID: Pardon, this is for-next Best regards -- CEO/CTO at Benetti Engineering sas On 22/02/23 15:50, Giulio Benetti wrote: > Since the major release changed all the packages that have direct > dependency to harfbuzz has been succesfully built: > - efl > - libass > - mupdf > - pango > - qt5base > - qt5webengine > - qt6base > - sdl2_ttf > - supertuxkart > - vlc > - webkitgtk > - wpewebkit > > Signed-off-by: Giulio Benetti > --- > 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 9489f25c6a..eee48c0b68 100644 > --- a/package/harfbuzz/harfbuzz.hash > +++ b/package/harfbuzz/harfbuzz.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d harfbuzz-5.3.1.tar.xz > +sha256 2cf4d3d8f225007511990a36a34195f0d6562ca56df0a8b0885b382837948199 harfbuzz-7.0.1.tar.xz > sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING > diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk > index b0112168e1..f8724793a9 100644 > --- a/package/harfbuzz/harfbuzz.mk > +++ b/package/harfbuzz/harfbuzz.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HARFBUZZ_VERSION = 5.3.1 > +HARFBUZZ_VERSION = 7.0.1 > 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 thomas.petazzoni at bootlin.com Wed Feb 22 14:52:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:52:36 +0100 Subject: [Buildroot] [PATCH 1/1] boot/at91dataflashboot: disable stack-protector In-Reply-To: <20230222103242.755918-1-fontaine.fabrice@gmail.com> References: <20230222103242.755918-1-fontaine.fabrice@gmail.com> Message-ID: <20230222155236.3f6e3ba8@windsurf> On Wed, 22 Feb 2023 11:32:42 +0100 Fabrice Fontaine wrote: > Disable stack-protector to avoid the following build failure: > > /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T elf32-littlearm.lds -Ttext 0 -n -o DataflashBoot-1.05.out objs/cstartup_ram.o objs/at45.o objs/com.o objs/dataflash.o objs/div0.o objs/init.o objs/main.o objs/stdio.o objs/asm_isr.o objs/jump.o objs/_udivsi3.o objs/_umodsi3.o objs/led.o > /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: objs/main.o: in function `main': > main.c:(.text.startup+0x834): undefined reference to `__stack_chk_guard' > > Fixes: > - http://autobuild.buildroot.org/results/502c54be4978e628724d72ee2a75d4c5e0a6ace8 > > Signed-off-by: Fabrice Fontaine > --- > boot/at91dataflashboot/at91dataflashboot.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 14:52:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:52:01 +0100 Subject: [Buildroot] [git commit] package/libcamera-apps: enable LIBAV only if libdrm and ffmpeg is present Message-ID: <20230222145311.53FA0866E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf4c94de51eb5c303a3e9ee62e97baa8b37d7461 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps does enable LIBAV by default which depends on libdrm and ffpmeg. Fixes: - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 13 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- package/libcamera-apps/libcamera-apps.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 290ee9a026..fe402ec3f4 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -29,6 +29,13 @@ else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 endif +ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_LIBDRM),yy) +LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 +endif + ifeq ($(BR2_PACKAGE_XORG7),y) LIBCAMERA_APPS_DEPENDENCIES += \ $(if $(BR2_PACKAGE_LIBEPOXY),libepoxy) \ From thomas.petazzoni at bootlin.com Wed Feb 22 14:52:22 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:52:22 +0100 Subject: [Buildroot] [git commit] boot/at91dataflashboot: disable stack-protector Message-ID: <20230222145311.60B0A866EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d868d09d3a0c0db2c5112964139e5ecae8b1da51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable stack-protector to avoid the following build failure: /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T elf32-littlearm.lds -Ttext 0 -n -o DataflashBoot-1.05.out objs/cstartup_ram.o objs/at45.o objs/com.o objs/dataflash.o objs/div0.o objs/init.o objs/main.o objs/stdio.o objs/asm_isr.o objs/jump.o objs/_udivsi3.o objs/_umodsi3.o objs/led.o /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: objs/main.o: in function `main': main.c:(.text.startup+0x834): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/502c54be4978e628724d72ee2a75d4c5e0a6ace8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- boot/at91dataflashboot/at91dataflashboot.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk index 0ad8b6fc44..c66f27e343 100644 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ b/boot/at91dataflashboot/at91dataflashboot.mk @@ -12,7 +12,8 @@ AT91DATAFLASHBOOT_INSTALL_TARGET = NO AT91DATAFLASHBOOT_INSTALL_IMAGES = YES define AT91DATAFLASHBOOT_BUILD_CMDS - make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) + make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \ + CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector" endef define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS From thomas.petazzoni at bootlin.com Wed Feb 22 14:55:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:55:33 +0100 Subject: [Buildroot] [git commit] boot/opensbi: fix build with empty OPENSBI_PLAT Message-ID: <20230222145543.A0657866EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd061466f90e3f17d47d4e1641590d60c07a6cac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure when OPENSBI_PLAT is empty raised since commit 9b5b7165deb91bad3cdb1ea0dd8f940eff75f3a9: /usr/bin/install -m 0644 -D /nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin /nvmedata/autobuild/instance-4/output-1/images/fw_jump.bin /usr/bin/install: cannot stat '/nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin': No such file or directory Fixes: - http://autobuild.buildroot.org/results/8033327f090e4a3d84a7fce1f62b14fdf89dbd89 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- boot/opensbi/opensbi.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk index 06ec87b2c3..dd113a0bf8 100644 --- a/boot/opensbi/opensbi.mk +++ b/boot/opensbi/opensbi.mk @@ -71,6 +71,7 @@ OPENSBI_INSTALL_IMAGES = YES OPENSBI_FW_IMAGES += payload endif +ifneq ($(OPENSBI_PLAT),) define OPENSBI_INSTALL_IMAGES_CMDS $(foreach f,$(OPENSBI_FW_IMAGES),\ $(INSTALL) -m 0644 -D $(@D)/build/platform/$(OPENSBI_PLAT)/firmware/fw_$(f).bin \ @@ -79,6 +80,7 @@ define OPENSBI_INSTALL_IMAGES_CMDS $(BINARIES_DIR)/fw_$(f).elf ) endef +endif # libsbi.a is not a library meant to be linked in user-space code, but # with bare metal code, which is why we don't install it in From thomas.petazzoni at bootlin.com Wed Feb 22 14:55:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:55:43 +0100 Subject: [Buildroot] [PATCH 1/1] boot/opensbi: fix build with empty OPENSBI_PLAT In-Reply-To: <20230222095434.444552-1-fontaine.fabrice@gmail.com> References: <20230222095434.444552-1-fontaine.fabrice@gmail.com> Message-ID: <20230222155543.0b46db89@windsurf> On Wed, 22 Feb 2023 10:54:34 +0100 Fabrice Fontaine wrote: > Fix the following build failure when OPENSBI_PLAT is empty raised since > commit 9b5b7165deb91bad3cdb1ea0dd8f940eff75f3a9: > > /usr/bin/install -m 0644 -D /nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin /nvmedata/autobuild/instance-4/output-1/images/fw_jump.bin > /usr/bin/install: cannot stat '/nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin': No such file or directory > > Fixes: > - http://autobuild.buildroot.org/results/8033327f090e4a3d84a7fce1f62b14fdf89dbd89 > > Signed-off-by: Fabrice Fontaine > --- > boot/opensbi/opensbi.mk | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 14:56:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:56:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/sudo: fix openssl static build In-Reply-To: <20230222094441.439014-1-fontaine.fabrice@gmail.com> References: <20230222094441.439014-1-fontaine.fabrice@gmail.com> Message-ID: <20230222155601.279070c4@windsurf> On Wed, 22 Feb 2023 10:44:41 +0100 Fabrice Fontaine wrote: > Fix the following build failure with sparc raised since bump to version > 1.9.11p2 in commit 9b7f8da96be549a52630cd87b30851d600f163a4 and > https://github.com/sudo-project/sudo/commit/9fbbca7b7a4cc60a8aa27d73de54278004a704c0: > > hecking for X509_STORE_CTX_get0_cert > configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 > /home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': > x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' > > [...] > > In file included from ./hostcheck.c:38: > ../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' > 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) > | ^~~~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b > > Signed-off-by: Fabrice Fontaine > --- > ...onfigure.ac-fix-openssl-static-build.patch | 49 +++++++++++++++++++ > package/sudo/sudo.mk | 2 + > 2 files changed, 51 insertions(+) > create mode 100644 package/sudo/0001-configure.ac-fix-openssl-static-build.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 14:56:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:56:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/gcc/gcc-initial: fix typo In-Reply-To: <20230221224747.117361-1-fontaine.fabrice@gmail.com> References: <20230221224747.117361-1-fontaine.fabrice@gmail.com> Message-ID: <20230222155625.5444048e@windsurf> On Tue, 21 Feb 2023 23:47:47 +0100 Fabrice Fontaine wrote: > Fix typo: am internal step -> an internal step > > Signed-off-by: Fabrice Fontaine > --- > package/gcc/gcc-initial/gcc-initial.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 14:55:51 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:55:51 +0100 Subject: [Buildroot] [git commit] package/sudo: fix openssl static build Message-ID: <20230222145706.44E1A86705@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4655d84ff567e8ecc2665ac0760ef01023aae91d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with sparc raised since bump to version 1.9.11p2 in commit 9b7f8da96be549a52630cd87b30851d600f163a4 and https://github.com/sudo-project/sudo/commit/9fbbca7b7a4cc60a8aa27d73de54278004a704c0: hecking for X509_STORE_CTX_get0_cert configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 /home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' [...] In file included from ./hostcheck.c:38: ../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) | ^~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...001-configure.ac-fix-openssl-static-build.patch | 49 ++++++++++++++++++++++ package/sudo/sudo.mk | 2 + 2 files changed, 51 insertions(+) diff --git a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch new file mode 100644 index 0000000000..32edd148a0 --- /dev/null +++ b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch @@ -0,0 +1,49 @@ +From 5cfc7e277d0b262a1d12e867c47a36301fb7edb7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 22 Feb 2023 10:01:25 +0100 +Subject: [PATCH] configure.ac: fix openssl static build + +Do not use AX_APPEND_FLAG as it will break static builds by removing +duplicates such as -lz or -latomic which are needed by -lssl and +-lcrypto. This will fix the following build failure with sparc which +needs -latomic: + +Checking for X509_STORE_CTX_get0_cert +configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 +/home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': +x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' + +[...] + +In file included from ./hostcheck.c:38: +../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' + 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) + | ^~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/sudo-project/sudo/pull/244] +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8eccad7e4..523d8e56b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3082,7 +3082,9 @@ if test "${enable_openssl-no}" != no; then + SUDO_APPEND_LIBPATH([LIBTLS], [$f]) + ;; + *) +- AX_APPEND_FLAG([$f], [LIBTLS]) ++ # Do not use AX_APPEND_FLAG as it will break static builds by removing ++ # duplicates such as -lz or -latomic which are needed by -lssl and -lcrypto ++ LIBTLS="$LIBTLS $f" + ;; + esac + done +-- +2.39.0 + diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index c4eaafa6b1..3b5c898917 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -13,6 +13,8 @@ SUDO_LICENSE_FILES = LICENSE.md SUDO_CPE_ID_VERSION = $(SUDO_VERSION_MAJOR) SUDO_CPE_ID_UPDATE = $(SUDO_VERSION_MINOR) SUDO_SELINUX_MODULES = sudo +# We're patching configure.ac +SUDO_AUTORECONF = YES # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \ From thomas.petazzoni at bootlin.com Wed Feb 22 14:56:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:56:10 +0100 Subject: [Buildroot] [git commit] package/gcc/gcc-initial: fix typo Message-ID: <20230222145706.4FA5A86708@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51793e0d56eef07d9f68c676f9c84be3f425082b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix typo: am internal step -> an internal step Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gcc/gcc-initial/gcc-initial.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index ebd8e8f017..a8ac20c5d8 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -9,7 +9,7 @@ GCC_INITIAL_SITE = $(GCC_SITE) GCC_INITIAL_SOURCE = $(GCC_SOURCE) # We do not have a 'gcc' package per-se; we only have two incarnations, -# gcc-initial and gcc-final. gcc-initial is just am internal step that +# gcc-initial and gcc-final. gcc-initial is just an internal step that # users should not care about, while gcc-final is the one they shall see. HOST_GCC_INITIAL_DL_SUBDIR = gcc From thomas.petazzoni at bootlin.com Wed Feb 22 14:58:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:58:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/hackrf: bump to version 2023.01.1 In-Reply-To: <20230222094916.1853413-1-diego.hdmp@gmail.com> References: <20230222094916.1853413-1-diego.hdmp@gmail.com> Message-ID: <20230222155803.3789d84b@windsurf> On Wed, 22 Feb 2023 10:49:16 +0100 Diego Hurtado de Mendoza wrote: > https://github.com/greatscottgadgets/hackrf/releases/tag/v2023.01.1 > > Signed-off-by: Diego Hurtado de Mendoza > --- > package/hackrf/hackrf.hash | 2 +- > package/hackrf/hackrf.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Wed Feb 22 14:50:59 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 22 Feb 2023 15:50:59 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 7.0.1 Message-ID: <20230222145059.1939094-1-giulio.benetti@benettiengineering.com> Since the major release changed all the packages that have direct dependency to harfbuzz has been succesfully built: - efl - libass - mupdf - pango - qt5base - qt5webengine - qt6base - sdl2_ttf - supertuxkart - vlc - webkitgtk - wpewebkit Signed-off-by: Giulio Benetti --- 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 9489f25c6a..eee48c0b68 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d harfbuzz-5.3.1.tar.xz +sha256 2cf4d3d8f225007511990a36a34195f0d6562ca56df0a8b0885b382837948199 harfbuzz-7.0.1.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index b0112168e1..f8724793a9 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 5.3.1 +HARFBUZZ_VERSION = 7.0.1 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 22 14:56:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:56:46 +0100 Subject: [Buildroot] [git commit branch/next] package/hackrf: bump to version 2023.01.1 Message-ID: <20230222145854.4CE8386715@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9793454bd2f0ada2b3928896aaf90b4d753d0399 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next https://github.com/greatscottgadgets/hackrf/releases/tag/v2023.01.1 Signed-off-by: Diego Hurtado de Mendoza Signed-off-by: Thomas Petazzoni --- package/hackrf/hackrf.hash | 2 +- package/hackrf/hackrf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hackrf/hackrf.hash b/package/hackrf/hackrf.hash index 16ccb9dcfb..0426009dd3 100644 --- a/package/hackrf/hackrf.hash +++ b/package/hackrf/hackrf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bacd4e7937467ffa14654624444c8b5c716ab470d8c1ee8d220d2094ae2adb3e hackrf-2022.09.1.tar.xz +sha256 32a03f943a30be4ba478e94bf69f14a5b7d55be6761007f4a4f5453418206a11 hackrf-2023.01.1.tar.xz sha256 49b60a6288f90f49074228cc1fae0fb16871ba36b756013abdf7c2fc92f01fad COPYING diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 4317da60bc..0d7533815d 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -4,7 +4,7 @@ # ################################################################################ -HACKRF_VERSION = 2022.09.1 +HACKRF_VERSION = 2023.01.1 HACKRF_SITE = https://github.com/greatscottgadgets/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause From fontaine.fabrice at gmail.com Wed Feb 22 15:04:49 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 16:04:49 +0100 Subject: [Buildroot] [PATCH RFC,1/1] package/gcc: fix GCC_DL_DIR Message-ID: <20230222150449.2005824-1-fontaine.fabrice@gmail.com> GCC_DL_DIR is empty as gcc is not a "real" package, as a result, the following (silent) error is raised when BR2_CCACHE is set: /home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/bin/ccache /usr/bin/gcc -O2 -I/home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/include -DBR_CROSS_PATH_SUFFIX='".br_real"' -DBR_CCACHE_HASH=\"` printf '%s\n' --target=aarch64_be-buildroot-linux-gnu --with-sysroot=@HOST_DIR@/aarch64_be-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto --with-gmp=@HOST_DIR@ --with-mpc=@HOST_DIR@ --with-mpfr=@HOST_DIR@ --with-bugurl="http://bugs.buildroot.net/" --without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads --without-isl --without-cloog --with-abi="lp64" --with-cpu=cortex-a53 --enable-languages=c --disable-shared --without-headers --disable-threads --with-newlib --disable-largefile | sha256sum - /gcc-11.3.0.tar.xz package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch | cut -c -64 | tr -d '\n'`\" -DBR_SYSROOT='"aarch64_be-buildroot-linux-gnu/sysroot"' -DBR_ADDITIONAL_CFLAGS='"-Wl,-z,max-page-size=65536", "-Wl,-z,common-page-size=65536", "-fstack-protector-strong",' -DBR_CCACHE -DBR2_RELRO_PARTIAL -s -Wl,--hash-style=both toolchain/toolchain-wrapper.c -o /home/thomas/autobuild/instance-0/output-1/build/host-gcc-initial-11.3.0/toolchain-wrapper sha256sum: /gcc-11.3.0.tar.xz: No such file or directory This patch replaces GCC_DL_DIR by HOST_GCC_INITIAL_DL_DIR. As, this can be considered as a "hack", any comment to improve this patch is appreciated Fixes: - Found when investigating: http://autobuild.buildroot.org/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd Signed-off-by: Fabrice Fontaine --- package/gcc/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 6dfd93f2a4..0755b59e96 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -284,7 +284,7 @@ HOST_GCC_COMMON_MAKE_OPTS = \ gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) ifeq ($(BR2_CCACHE),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(GCC_DL_DIR)/$(GCC_SOURCE) +HOST_GCC_COMMON_CCACHE_HASH_FILES += $(HOST_GCC_INITIAL_DL_DIR)/$(GCC_SOURCE) # Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned # and unversioned patches unconditionally. Moreover, to facilitate the -- 2.39.0 From thomas.petazzoni at bootlin.com Wed Feb 22 15:05:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 16:05:18 +0100 Subject: [Buildroot] [PATCH] package/wilc-driver: fix build failure due to wrong pointer casts In-Reply-To: <20221231174208.1999716-1-giulio.benetti@benettiengineering.com> References: <20221231174208.1999716-1-giulio.benetti@benettiengineering.com> Message-ID: <20230222160518.3361b224@windsurf> On Sat, 31 Dec 2022 18:42:08 +0100 Giulio Benetti wrote: > Add local patch pending upstream[0] to fix the bug. > > [0]: https://github.com/embeddedTS/wilc3000-external-module/pull/3 > > Fixes: > http://autobuild.buildroot.net/results/0a0/0a022d5c053bf8f7a53349b8bae4b2168a9cd134/ > > Signed-off-by: Giulio Benetti > --- > .../wilc-driver/0005-Fix-cast-warnings.patch | 43 +++++++++++++++++++ > 1 file changed, 43 insertions(+) > create mode 100644 package/wilc-driver/0005-Fix-cast-warnings.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 15:06:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 16:06:17 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/rtl8812au-aircrack-ng: bump to 2022-12-22 version of v5.6.4.2 branch In-Reply-To: <20221230025221.1051537-1-christian@paral.in> References: <20221230025221.1051537-1-christian@paral.in> Message-ID: <20230222160617.4728e771@windsurf> Hello Christian, On Thu, 29 Dec 2022 18:52:21 -0800 Christian Stewart via buildroot wrote: > Fixes: > http://autobuild.buildroot.net/results/4f6/4f65b521d5c6cffdf5f6294ce0257b9a19e441fc/ > > Reviewed-by: Giulio Benetti > Signed-off-by: Christian Stewart > > --- In the mean time, we merged "package/rtl8812au-aircrack-ng: bump to 2023-02-03 version to fix build failure with Linux 6.1", which updates to a even newer version, and therefore should hopefully address the same problems. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Wed Feb 22 15:37:24 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 22 Feb 2023 16:37:24 +0100 Subject: [Buildroot] [PATCH 2/2] package/harfbuzz: bump to version 6.0.0 In-Reply-To: <20230208230721.3269610-3-giulio.benetti@benettiengineering.com> References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> <20230208230721.3269610-3-giulio.benetti@benettiengineering.com> Message-ID: This patch is superseded by this one: https://patchwork.ozlabs.org/project/buildroot/patch/20230222145059.1939094-1-giulio.benetti at benettiengineering.com/ Best regards -- CEO/CTO at Benetti Engineering sas On 09/02/23 00:07, Giulio Benetti wrote: > Since the major release changed all the packages that have direct > dependency to harfbuzz has been succesfully built: > - efl > - libass > - mupdf > - pango > - qt5base > - qt5webengine > - qt6base > - sdl2_ttf > - supertuxkart > - vlc > - webkitgtk > - wpewebkit > > Signed-off-by: Giulio Benetti > --- > 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 9489f25c6a..faae7b91e3 100644 > --- a/package/harfbuzz/harfbuzz.hash > +++ b/package/harfbuzz/harfbuzz.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d harfbuzz-5.3.1.tar.xz > +sha256 1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4 harfbuzz-6.0.0.tar.xz > sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING > diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk > index b0112168e1..02fe4ecec3 100644 > --- a/package/harfbuzz/harfbuzz.mk > +++ b/package/harfbuzz/harfbuzz.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HARFBUZZ_VERSION = 5.3.1 > +HARFBUZZ_VERSION = 6.0.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 peter at korsgaard.com Wed Feb 22 15:48:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:48:54 +0100 Subject: [Buildroot] [PATCH v2] toolchain/Config.in: extend gcc bug 43744 to every sh architecture In-Reply-To: <20230205212521.903480-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sun, 5 Feb 2023 22:25:21 +0100") References: <20230205131559.6f79944f@windsurf> <20230205212521.903480-1-giulio.benetti@benettiengineering.com> Message-ID: <87mt55wvix.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Gcc bug 43744 affects seems to affect all SH family because it already > affects: > 1) sh4, here you can find a buildroot defconfig that fails to build: > http://autobuild.buildroot.net/results/1db/1db6c59c98e3c09fa13277076ee2fbe7967f1f6b/defconfig > 2) sh4a, here you can find a buildroot defconfig that fails to build: > http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a/defconfig > Note also that gcc bugzilla entry reports the bug for SH and not for > sub-architectures: > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43744 > So let's extend the bug to BR2_sh to match the entire SH architecture. > Signed-off-by: Giulio Benetti > --- V1-> V2: > * add a commit log with details about gcc bug 43744 as pointed by Thomas Petazzoni Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 15:50:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:50:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongoose: fix build with gcc 4.8 In-Reply-To: <20230114170738.1101463-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 14 Jan 2023 18:07:38 +0100") References: <20230114170738.1101463-1-fontaine.fabrice@gmail.com> Message-ID: <87ilftwvge.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with gcc 4.8 raised since bump to > version 7.8 in commit f9e51e1150f59962577358b3da5c390ca4749291: > /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c: In function 'mg_iotest': > /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c:4484:3: error: 'for' loop initial declarations are only allowed in C99 mode > for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) { > ^ > Fixes: > - http://autobuild.buildroot.org/results/c538c6d8e87e4e24097c9878ee15083802276505 > Signed-off-by: Fabrice Fontaine Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 15:52:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:52:27 +0100 Subject: [Buildroot] [git commit] package/yajl: explicitly request a tag in _SITE In-Reply-To: <20230206100315.9B99A839FF@busybox.osuosl.org> (Arnout Vandecappelle's message of "Mon, 6 Feb 2023 11:02:53 +0100") References: <20230206100315.9B99A839FF@busybox.osuosl.org> Message-ID: <87edqhwvd0.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > commit: https://git.buildroot.net/buildroot/commit/?id=5be76a39d3a0c21d6f3ceeab0889edc3cec9f2f3 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The yajl repository has both a branch and a tag names 2.1.0. Because of > this, when we use the usual github URL [1], github doesn't return a > tarball but rather an ASCII string: > the given path has multiple possibilities: #, # > This obviously (and fortunately) leads to a hash check failure. > To make sure we get the tag and not the branch, we should use a URL that > explicitly asks for refs/tags/2.1.0 [2]. We can't change VERSION to > include refs/tags, because that also affects the _SOURCE default, the > contents of the tarball, the CPE ID and the release-monitoring access. > Therefore, add the refs/tags/ prefix to the github helper call. > [1] https://github.com/lloyd/yajl/archive/2.1.0/yajl-2.1.0.tar.gz > [1] https://github.com/lloyd/yajl/archive/refs/tags/2.1.0/yajl-2.1.0.tar.gz > Signed-off-by: Arnout Vandecappelle Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 15:53:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:53:35 +0100 Subject: [Buildroot] [next] package/thermald: bump to 2.5.1 In-Reply-To: <20221127141926.1976657-1-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 11:19:26 -0300") References: <20221127141926.1976657-1-ricardo.martincoski@gmail.com> Message-ID: <87a615wvb4.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > README.txt states only these changes: > - Static analysis fixes > - Missing init, which causes skipping of conditions in a Dell system > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 15:51:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:51:59 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/yajl: explicitly request a tag in _SITE Message-ID: <20230222155428.B464F86727@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6751cb90fef4f745c499cdeacd9559d6a9b2a17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The yajl repository has both a branch and a tag names 2.1.0. Because of this, when we use the usual github URL [1], github doesn't return a tarball but rather an ASCII string: the given path has multiple possibilities: #, # This obviously (and fortunately) leads to a hash check failure. To make sure we get the tag and not the branch, we should use a URL that explicitly asks for refs/tags/2.1.0 [2]. We can't change VERSION to include refs/tags, because that also affects the _SOURCE default, the contents of the tarball, the CPE ID and the release-monitoring access. Therefore, add the refs/tags/ prefix to the github helper call. [1] https://github.com/lloyd/yajl/archive/2.1.0/yajl-2.1.0.tar.gz [1] https://github.com/lloyd/yajl/archive/refs/tags/2.1.0/yajl-2.1.0.tar.gz Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5be76a39d3a0c21d6f3ceeab0889edc3cec9f2f3) Signed-off-by: Peter Korsgaard --- package/yajl/yajl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index 1fb16f50e9..d14a68b402 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -5,7 +5,7 @@ ################################################################################ YAJL_VERSION = 2.1.0 -YAJL_SITE = $(call github,lloyd,yajl,$(YAJL_VERSION)) +YAJL_SITE = $(call github,lloyd,yajl,refs/tags/$(YAJL_VERSION)) YAJL_INSTALL_STAGING = YES YAJL_LICENSE = ISC YAJL_LICENSE_FILES = COPYING From fontaine.fabrice at gmail.com Wed Feb 22 15:55:29 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 16:55:29 +0100 Subject: [Buildroot] [PATCH 2/2] package/harfbuzz: bump to version 6.0.0 In-Reply-To: References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> <20230208230721.3269610-3-giulio.benetti@benettiengineering.com> Message-ID: Hi, Le mer. 22 f?vr. 2023 ? 16:37, Giulio Benetti < giulio.benetti at benettiengineering.com> a ?crit : > This patch is superseded by this one: > > https://patchwork.ozlabs.org/project/buildroot/patch/20230222145059.1939094-1-giulio.benetti at benettiengineering.com/ This bump should be tagged as a security bump as it includes a fix for CVE-2023-25193 (or you could backport fix on master). > > > Best regards > -- > CEO/CTO at Benetti Engineering sas > > On 09/02/23 00:07, Giulio Benetti wrote: > > Since the major release changed all the packages that have direct > > dependency to harfbuzz has been succesfully built: > > - efl > > - libass > > - mupdf > > - pango > > - qt5base > > - qt5webengine > > - qt6base > > - sdl2_ttf > > - supertuxkart > > - vlc > > - webkitgtk > > - wpewebkit > > > > Signed-off-by: Giulio Benetti > > --- > > 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 9489f25c6a..faae7b91e3 100644 > > --- a/package/harfbuzz/harfbuzz.hash > > +++ b/package/harfbuzz/harfbuzz.hash > > @@ -1,3 +1,3 @@ > > # Locally computed > > -sha256 > 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d > harfbuzz-5.3.1.tar.xz > > +sha256 > 1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4 > harfbuzz-6.0.0.tar.xz > > sha256 > 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING > > diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk > > index b0112168e1..02fe4ecec3 100644 > > --- a/package/harfbuzz/harfbuzz.mk > > +++ b/package/harfbuzz/harfbuzz.mk > > @@ -4,7 +4,7 @@ > > # > > > ################################################################################ > > > > -HARFBUZZ_VERSION = 5.3.1 > > +HARFBUZZ_VERSION = 6.0.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) > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Wed Feb 22 15:51:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:51:12 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/yajl: explicitly request a tag in _SITE Message-ID: <20230222155544.9AB5486743@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd67740aa9946be0c272f89fc5795ff597664cf6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The yajl repository has both a branch and a tag names 2.1.0. Because of this, when we use the usual github URL [1], github doesn't return a tarball but rather an ASCII string: the given path has multiple possibilities: #, # This obviously (and fortunately) leads to a hash check failure. To make sure we get the tag and not the branch, we should use a URL that explicitly asks for refs/tags/2.1.0 [2]. We can't change VERSION to include refs/tags, because that also affects the _SOURCE default, the contents of the tarball, the CPE ID and the release-monitoring access. Therefore, add the refs/tags/ prefix to the github helper call. [1] https://github.com/lloyd/yajl/archive/2.1.0/yajl-2.1.0.tar.gz [1] https://github.com/lloyd/yajl/archive/refs/tags/2.1.0/yajl-2.1.0.tar.gz Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5be76a39d3a0c21d6f3ceeab0889edc3cec9f2f3) Signed-off-by: Peter Korsgaard --- package/yajl/yajl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index 1fb16f50e9..d14a68b402 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -5,7 +5,7 @@ ################################################################################ YAJL_VERSION = 2.1.0 -YAJL_SITE = $(call github,lloyd,yajl,$(YAJL_VERSION)) +YAJL_SITE = $(call github,lloyd,yajl,refs/tags/$(YAJL_VERSION)) YAJL_INSTALL_STAGING = YES YAJL_LICENSE = ISC YAJL_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 22 15:52:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:52:58 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/thermald: bump to 2.5.1 Message-ID: <20230222155544.A584C86744@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4adcd3c4b229bd73df34980160f7647606e50936 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x README.txt states only these changes: - Static analysis fixes - Missing init, which causes skipping of conditions in a Dell system Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 11d98385f56e61e2928707f056c001ceec5d06e9) Signed-off-by: Peter Korsgaard --- package/thermald/thermald.hash | 2 +- package/thermald/thermald.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/thermald/thermald.hash b/package/thermald/thermald.hash index eceff77d37..9693813ca9 100644 --- a/package/thermald/thermald.hash +++ b/package/thermald/thermald.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e6515678ce8ff37978a453e1617a087a40ba3a31809a42c1768b6f816e564cc9 thermald-2.5.tar.gz +sha256 75c165df45b3d09c904d314c8c19789158e9538f46e3d2b606457dc631eb3af5 thermald-2.5.1.tar.gz sha256 e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d COPYING diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk index 38f6b5a00f..fd0246745f 100644 --- a/package/thermald/thermald.mk +++ b/package/thermald/thermald.mk @@ -4,7 +4,7 @@ # ################################################################################ -THERMALD_VERSION = 2.5 +THERMALD_VERSION = 2.5.1 THERMALD_SITE = $(call github,intel,thermal_daemon,v$(THERMALD_VERSION)) # fetched from Github, with no configure script THERMALD_AUTORECONF = YES From peter at korsgaard.com Wed Feb 22 15:46:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:46:24 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] toolchain/Config.in: extend gcc bug 43744 to every sh architecture Message-ID: <20230222155544.807AE86740@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b15b33fc57949b49f2b347b99e8b5d7d085f0e32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Gcc bug 43744 affects seems to affect all SH family because it already affects: 1) sh4, here you can find a buildroot defconfig that fails to build: http://autobuild.buildroot.net/results/1db/1db6c59c98e3c09fa13277076ee2fbe7967f1f6b/defconfig 2) sh4a, here you can find a buildroot defconfig that fails to build: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a/defconfig Note also that gcc bugzilla entry reports the bug for SH and not for sub-architectures: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43744 So let's extend the bug to BR2_sh to match the entire SH architecture. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit ee7cf14b5188aca5f17dd38ab0b6673d5789942b) Signed-off-by: Peter Korsgaard --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 4947ab3aae..a00a486bed 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -115,7 +115,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_43744 bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 - depends on BR2_sh4 + depends on BR2_sh # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63261. This bug no # longer exists in gcc 8.x. From peter at korsgaard.com Wed Feb 22 15:50:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:50:03 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/mongoose: fix build with gcc 4.8 Message-ID: <20230222155544.8FC0686741@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5efc9e326d033b52da69bd1670127d894dfd59b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fix the following build failure with gcc 4.8 raised since bump to version 7.8 in commit f9e51e1150f59962577358b3da5c390ca4749291: /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c: In function 'mg_iotest': /home/buildroot/autobuild/run/instance-2/output-1/build/mongoose-7.8/mongoose.c:4484:3: error: 'for' loop initial declarations are only allowed in C99 mode for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) { ^ Fixes: - http://autobuild.buildroot.org/results/c538c6d8e87e4e24097c9878ee15083802276505 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 6139aeacd847487a296f1c7b8a9d302d678cd8ab) Signed-off-by: Peter Korsgaard --- package/mongoose/mongoose.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 8d06ed4689..0693f7553a 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -13,7 +13,7 @@ MONGOOSE_INSTALL_STAGING = YES # static library MONGOOSE_INSTALL_TARGET = NO -MONGOOSE_CFLAGS = $(TARGET_CFLAGS) +MONGOOSE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGOOSE_DEPENDENCIES += openssl From fontaine.fabrice at gmail.com Wed Feb 22 16:05:10 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 17:05:10 +0100 Subject: [Buildroot] [PATCH 1/5] package/gnuradio: drop unrecognized volk variables Message-ID: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Volk submodule has been removed since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/80c04479da962d048d41165081b026aafdaa0316 orc dependency can also be dropped as it was only used by volk submodule Signed-off-by: Fabrice Fontaine --- package/gnuradio/gnuradio.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index cc41f1e12b..c2fcba9586 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -22,9 +22,7 @@ GNURADIO_DEPENDENCIES = \ GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ - -DENABLE_VOLK=ON \ -DENABLE_GNURADIO_RUNTIME=ON \ - -DENABLE_INTERNAL_VOLK=OFF \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND @@ -36,13 +34,6 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) GNURADIO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif -ifeq ($(BR2_PACKAGE_ORC),y) -GNURADIO_DEPENDENCIES += orc -GNURADIO_CONF_OPTS += -DENABLE_ORC=ON -else -GNURADIO_CONF_OPTS += -DENABLE_ORC=OFF -endif - ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON else -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 16:05:11 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 17:05:11 +0100 Subject: [Buildroot] [PATCH 2/5] package/gnuradio: disable examples In-Reply-To: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Message-ID: <20230222160514.2069544-2-fontaine.fabrice@gmail.com> Examples can be disabled since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/530262c6df3fb9b87a80133dbde5650dbe948c4c Signed-off-by: Fabrice Fontaine --- package/gnuradio/gnuradio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index c2fcba9586..c2e5ec5cad 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -22,6 +22,7 @@ GNURADIO_DEPENDENCIES = \ GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ + -DENABLE_EXAMPLES=OFF \ -DENABLE_GNURADIO_RUNTIME=ON \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 16:05:12 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 17:05:12 +0100 Subject: [Buildroot] [PATCH 3/5] package/gnuradio: add libsndfile optional dependency In-Reply-To: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Message-ID: <20230222160514.2069544-3-fontaine.fabrice@gmail.com> libsndfile is an optional dependency since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/18f64ba685cfc2533e2d7726aa43c524b007d97b Signed-off-by: Fabrice Fontaine --- package/gnuradio/gnuradio.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index c2e5ec5cad..59fb23d89d 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -55,6 +55,9 @@ endif ifeq ($(BR2_PACKAGE_GNURADIO_BLOCKS),y) GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=ON +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +GNURADIO_DEPENDENCIES += libsndfile +endif else GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=OFF endif -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 16:05:13 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 17:05:13 +0100 Subject: [Buildroot] [PATCH 4/5] package/gnuradio: add gr-network block support In-Reply-To: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Message-ID: <20230222160514.2069544-4-fontaine.fabrice@gmail.com> grnet networking block support is available since version version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/cc37c3e8cd5eabcb5c9d919e5fffc5d938690140 gr-network is a mandatory dependency of latest gqrx Signed-off-by: Fabrice Fontaine --- package/gnuradio/Config.in | 6 ++++++ package/gnuradio/gnuradio.mk | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 1824589263..51237e62b9 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -134,6 +134,12 @@ config BR2_PACKAGE_GNURADIO_FILTER help Filter signal processing blocks +config BR2_PACKAGE_GNURADIO_NETWORK + bool "gr-network support" + select BR2_PACKAGE_GNURADIO_BLOCKS + help + TCP and UDP source/sink blocks + config BR2_PACKAGE_GNURADIO_QTGUI bool "gr-qtgui" depends on BR2_PACKAGE_GNURADIO_PYTHON diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 59fb23d89d..d9218b533d 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -106,6 +106,12 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_NETWORK),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GNURADIO_DEPENDENCIES += python3 python-pybind \ host-python-numpy host-python-packaging -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 16:05:14 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 17:05:14 +0100 Subject: [Buildroot] [PATCH 5/5] package/gqrx: bump to version 2.15.9 In-Reply-To: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Message-ID: <20230222160514.2069544-5-fontaine.fabrice@gmail.com> This bump will fix the following build failure raised since bump pf gnuradio to version 3.10.4.0 in commit e37c110bead8b7b35cd97915673fa785ccb39f2d: In file included from /home/buildroot/autobuild/instance-2/output-1/build/gqrx-2.14.4/src/applications/gqrx/receiver.cpp:32: /home/buildroot/autobuild/instance-2/output-1/build/gqrx-2.14.4/src/applications/gqrx/receiver.h:34:10: fatal error: gnuradio/blocks/wavfile_sink.h: No such file or directory 34 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/gqrx-sdr/gqrx/blob/v2.15.9/resources/news.txt Fixes: - http://autobuild.buildroot.org/results/42b5ab2e555063273ea55fd1c09a9be6d8b620e2 Signed-off-by: Fabrice Fontaine --- package/gqrx/Config.in | 2 ++ package/gqrx/gqrx.hash | 2 +- package/gqrx/gqrx.mk | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in index 442b28e546..97f0b7de07 100644 --- a/package/gqrx/Config.in +++ b/package/gqrx/Config.in @@ -34,7 +34,9 @@ config BR2_PACKAGE_GQRX select BR2_PACKAGE_GNURADIO_DIGITAL select BR2_PACKAGE_GNURADIO_FFT select BR2_PACKAGE_GNURADIO_FILTER + select BR2_PACKAGE_GNURADIO_NETWORK select BR2_PACKAGE_GR_OSMOSDR + select BR2_PACKAGE_LIBSNDFILE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5SVG diff --git a/package/gqrx/gqrx.hash b/package/gqrx/gqrx.hash index 1991dfea82..567ff947f9 100644 --- a/package/gqrx/gqrx.hash +++ b/package/gqrx/gqrx.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 aec35c77ebde9c71a5f973c509eec3d6aa2f18a6e052b180fcd9029d88273e5b gqrx-2.14.4.tar.gz +sha256 4a826b468b2fb38a59cbe1f1b566e62c3114509186a7a25ba27dc92833f3eb44 gqrx-2.15.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK diff --git a/package/gqrx/gqrx.mk b/package/gqrx/gqrx.mk index 4d464298ca..d2518213b8 100644 --- a/package/gqrx/gqrx.mk +++ b/package/gqrx/gqrx.mk @@ -4,11 +4,11 @@ # ################################################################################ -GQRX_VERSION = 2.14.4 +GQRX_VERSION = 2.15.9 GQRX_SITE = $(call github,csete,gqrx,v$(GQRX_VERSION)) GQRX_LICENSE = GPL-3.0+, Apache-2.0 GQRX_LICENSE_FILES = COPYING LICENSE-CTK -GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg +GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr libsndfile qt5base qt5svg GQRX_CONF_OPTS = -DLINUX_AUDIO_BACKEND=Gr-audio -- 2.39.0 From peter at korsgaard.com Wed Feb 22 16:08:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:08:08 +0100 Subject: [Buildroot] [next 01/25] *: fix typo for separate(d|) in text In-Reply-To: <20221127130739.1862398-2-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:15 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-2-ricardo.martincoski@gmail.com> Message-ID: <875ybtwumv.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > seperate is a common misspelling of separate > Fix all the typos in the tree that are not related to patch files. > CHANGES > seperate -> separate, in the list of changes > Config.in.legacy > seperate -> separate, in option name and help texts > package/leafnode2/leafnode2.mk > seperate -> separate, in a comment > system/Config.in > seperated -> separated, in a help text > Cc: Bernd Kuhls > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:08:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:08:14 +0100 Subject: [Buildroot] [next 02/25] package, legacy: fix typo for "daemon" on help text In-Reply-To: <20221127130739.1862398-3-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:16 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-3-ricardo.martincoski@gmail.com> Message-ID: <871qmhwump.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > deamon -> daemon > At same time, in Config.in.legacy fix other typos in the same help text: > spae -> space > monolitic -> monolithic > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:08:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:08:28 +0100 Subject: [Buildroot] [next 03/25] Config.in.legacy: fix typo on BR2_PACKAGE_MEDIAART_BACKEND_QT In-Reply-To: <20221127130739.1862398-4-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:17 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-4-ricardo.martincoski@gmail.com> Message-ID: <87wn49vg1v.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Currently using this minimal .config: > BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF=y > triggers: > *** Legacy options removed in 2018.05 *** > [ ] libmediaart none backend option renamed (NEW) > [*] libmediaart gdk-pixbuf backend option renamed > [*] libmediaart qt backend option renamed > Commit "8553b39887 libmediaart: rename options to have proper prefix", > part of the 2018.05 release had a copy&paste error. > As stated in the beginning of the file: > The oldest symbols will be removed again after about two years. > But while we carry these legacy symbols, let's fix the typo. > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski > --- > NOTE: Maybe it is time to drop old legacy symbols again? > If so, some patches in this series can be dropped. Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:09:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:09:08 +0100 Subject: [Buildroot] [next 04/25] utils/checkpackagelib: warn about redefined config In-Reply-To: <20221127130739.1862398-5-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:18 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-5-ricardo.martincoski@gmail.com> Message-ID: <87sfexvg0r.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Warn the developer in the case the same config is declared more than > once in the same Config.in file. > But take into account the conditional code that lets the config be > visible and warn only when it is declared more than once in the same > conditions. > For instance, do not warn for: > if BR2_PACKAGE_BUSYBOX > config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > endif > if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else > config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > endif > Signed-off-by: Ricardo Martincoski > --- > Applying only this patch on current master, check-package returns: > Config.in.legacy:2597: config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF > redeclared (previous line: 2589) Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 15:57:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:57:34 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package, legacy: fix typo for "daemon" on help text Message-ID: <20230222161022.A77798675D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42743a9503e83365ffa7b57f4423527cf2b672eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x deamon -> daemon At same time, in Config.in.legacy fix other typos in the same help text: spae -> space monolitic -> monolithic Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 6a9feaabbce4f21dd2a688d35a5027cb0e2a7a22) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 4 ++-- package/ngircd/Config.in | 2 +- package/rp-pppoe/Config.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 40bbcd41ba..896e75a9d6 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4338,8 +4338,8 @@ config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - - a monolitic user space library - - a user spae deamon driver + - a monolithic user space library + - a user space daemon driver config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" diff --git a/package/ngircd/Config.in b/package/ngircd/Config.in index 9b3d430922..1e93a5702c 100644 --- a/package/ngircd/Config.in +++ b/package/ngircd/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_NGIRCD bool "ngircd" depends on BR2_USE_MMU # fork() help - Next Generation IRC server deamon. + Next Generation IRC server daemon. http://ngircd.barton.de diff --git a/package/rp-pppoe/Config.in b/package/rp-pppoe/Config.in index 2ac81cbb2d..6ff005a1e1 100644 --- a/package/rp-pppoe/Config.in +++ b/package/rp-pppoe/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_RP_PPPOE select BR2_PACKAGE_PPPD help An implementation of the Point-to-point protocol over - Ethernet. Has userspace client and server deamons. You + Ethernet. Has userspace client and server daemons. You likely only need this package if you are implementing the pppoe server that will service other pppoe client devices. Otherwise the normal client functionality already From peter at korsgaard.com Wed Feb 22 16:08:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:08:58 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] utils/checkpackagelib: warn about redefined config Message-ID: <20230222161022.C25D886759@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eace3a9a0323098cbdd2774de6b09823865ba377 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Warn the developer in the case the same config is declared more than once in the same Config.in file. But take into account the conditional code that lets the config be visible and warn only when it is declared more than once in the same conditions. For instance, do not warn for: if BR2_PACKAGE_BUSYBOX config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 4bbda72743d39df29dfc91e0f52be02b2d465f6d) Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_config.py | 38 ++++++++++++++++ utils/checkpackagelib/test_lib_config.py | 78 ++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index b05831f2c3..f26ca0d898 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -233,3 +233,41 @@ class Indent(_CheckFunction): return ["{}:{}: should not be indented" .format(self.filename, lineno), text] + + +class RedefinedConfig(_CheckFunction): + CONFIG = re.compile(r"^\s*(menu|)config\s+(BR2_\w+)\b") + IF = re.compile(r"^\s*if\s+([^#]*)\b") + ENDIF = re.compile(r"^\s*endif\b") + + def before(self): + self.configs = {} + self.conditional = [] + + def check_line(self, lineno, text): + if _empty_or_comment(text) or _part_of_help_text(text): + return + + m = self.IF.search(text) + if m is not None: + condition = m.group(1) + self.conditional.append(condition) + return + + m = self.ENDIF.search(text) + if m is not None: + self.conditional.pop() + return + + m = self.CONFIG.search(text) + if m is None: + return + config = m.group(2) + + key = (config, ' AND '.join(self.conditional)) + if key in self.configs.keys(): + previous_line = self.configs[key] + return ["{}:{}: config {} redeclared (previous line: {})" + .format(self.filename, lineno, config, previous_line), + text] + self.configs[key] = lineno diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py index 91a549adf2..474d17105e 100644 --- a/utils/checkpackagelib/test_lib_config.py +++ b/utils/checkpackagelib/test_lib_config.py @@ -385,3 +385,81 @@ Indent = [ def test_Indent(testname, filename, string, expected): warnings = util.check_file(m.Indent, filename, string) assert warnings == expected + + +RedefinedConfig = [ + ('no redefinition', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO_BAR\n' + 'bool "foo"\n', + []), + ('no conditional', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('three times', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:3: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n'], + ['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('same conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:6: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:8: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('not equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if !BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', RedefinedConfig) +def test_RedefinedConfig(testname, filename, string, expected): + warnings = util.check_file(m.RedefinedConfig, filename, string) + assert warnings == expected From peter at korsgaard.com Wed Feb 22 15:54:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:54:42 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] *: fix typo for separate(d|) in text Message-ID: <20230222161022.96FD186759@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcd81208ad9bbbd6368262a89b9a9122d5a4be1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x seperate is a common misspelling of separate Fix all the typos in the tree that are not related to patch files. CHANGES seperate -> separate, in the list of changes Config.in.legacy seperate -> separate, in option name and help texts package/leafnode2/leafnode2.mk seperate -> separate, in a comment system/Config.in seperated -> separated, in a help text Cc: Bernd Kuhls Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 4092d2a3546c1edfcb27f9d00fd4e7cac9878d2f) Signed-off-by: Peter Korsgaard --- CHANGES | 4 ++-- Config.in.legacy | 6 +++--- package/leafnode2/leafnode2.mk | 2 +- system/Config.in | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index e501fcb4c6..d8507a5a25 100644 --- a/CHANGES +++ b/CHANGES @@ -7661,7 +7661,7 @@ Architecture: Default to bf532 CPU variant for blackfin, Fix flat one memory region support for m68k and disable flat - seperate data support because of compatibility issues. + separate data support because of compatibility issues. Defconfigs: Minnowboard and Raspberrypi: Fix errors with post-build scripts when systemd is used. @@ -8197,7 +8197,7 @@ Minor fixes. - Merged/seperate /usr handling is now also performed for + Merged/separate /usr handling is now also performed for staging so cross-gdb / gdbserver can find the libraries. Updated/fixed packages: autossh, conntrack-tools, dcron, diff --git a/Config.in.legacy b/Config.in.legacy index 49f63fd14c..40bbcd41ba 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -3254,7 +3254,7 @@ config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND select BR2_PACKAGE_RESTORECOND help The policycoreutils package no longer offers restorecond - as a option. This package has been moved into a seperate + as a option. This package has been moved into a separate package maintained by the SELinux maintainers. config BR2_PACKAGE_SEPOLGEN @@ -3848,7 +3848,7 @@ config BR2_GDB_VERSION_7_9 comment "Legacy options removed in 2016.11" config BR2_PACKAGE_PHP_SAPI_CLI_CGI - bool "PHP CGI and CLI options are now seperate" + bool "PHP CGI and CLI options are now separate" select BR2_PACKAGE_PHP_SAPI_CLI select BR2_PACKAGE_PHP_SAPI_CGI select BR2_LEGACY @@ -4878,7 +4878,7 @@ config BR2_PACKAGE_KODI_PVR_ADDONS select BR2_PACKAGE_KODI_PVR_VUPLUS select BR2_PACKAGE_KODI_PVR_WMC help - Kodi PVR addon was split into seperate modules + Kodi PVR addon was split into separate modules config BR2_BINUTILS_VERSION_2_23_2 bool "binutils 2.23 option renamed" diff --git a/package/leafnode2/leafnode2.mk b/package/leafnode2/leafnode2.mk index a02aad4302..e82ca2e1ee 100644 --- a/package/leafnode2/leafnode2.mk +++ b/package/leafnode2/leafnode2.mk @@ -23,7 +23,7 @@ LEAFNODE2_CONF_OPTS = \ --enable-runas-user=root # Leafnode2 needs the host version of b_sortnl during -# compilation. Instead of creating a seperate host package and +# compilation. Instead of creating a separate host package and # installing b_sortnl to $(HOST_DIR) this binary is compiled # on-the-fly, host-pcre is needed for this define LEAFNODE2_BUILD_SORTNL_TOOL diff --git a/system/Config.in b/system/Config.in index 888c24ce81..e6dcd25455 100644 --- a/system/Config.in +++ b/system/Config.in @@ -443,7 +443,7 @@ config BR2_ENABLE_LOCALE_WHITELIST default "C en_US" depends on BR2_ENABLE_LOCALE_PURGE help - Whitespace seperated list of locales to allow on target. + Whitespace separated list of locales to allow on target. Locales not listed here will be removed from the target. See 'locale -a' on your host for a list of locales available on your build host, or have a look in /usr/share/locale in From peter at korsgaard.com Wed Feb 22 16:07:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:07:19 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] Config.in.legacy: fix typo on BR2_PACKAGE_MEDIAART_BACKEND_QT Message-ID: <20230222161022.B53478675F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d981ed04c8359db048730ca1acd7b68e69b19616 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Currently using this minimal .config: BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF=y triggers: *** Legacy options removed in 2018.05 *** [ ] libmediaart none backend option renamed (NEW) [*] libmediaart gdk-pixbuf backend option renamed [*] libmediaart qt backend option renamed Commit "8553b39887 libmediaart: rename options to have proper prefix", part of the 2018.05 release had a copy&paste error. As stated in the beginning of the file: The oldest symbols will be removed again after about two years. But while we carry these legacy symbols, let's fix the typo. Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 316e149611a761db04171ee6141048d9057183c8) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 896e75a9d6..98861137d2 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2608,7 +2608,7 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF +config BR2_PACKAGE_MEDIAART_BACKEND_QT bool "libmediaart qt backend option renamed" select BR2_LEGACY help From peter at korsgaard.com Wed Feb 22 16:11:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:11:13 +0100 Subject: [Buildroot] [git commit] boot/barebox: use $$ instead of $ where needed In-Reply-To: <20230206105723.71FF4838DC@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Mon, 6 Feb 2023 11:57:08 +0100") References: <20230206105723.71FF4838DC@busybox.osuosl.org> Message-ID: <87o7plvfxa.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=75c313816eb526fe09a6baab8b327279e01be5ef > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass > required environment variables for reproducible build") caused the > build to generate a spurious error message due to the $(shell > ... date -d @$(SOURCE_DATE_EPOCH)) command being executed even when > BR2_REPRODUCIBLE was disabled. > This is due to the fact that variable references must be done using $$ > within macros. This commit fixes that for the two variables that we > are referencing in the code added in commit > c90bd74ebb264ccc925f10a142ccd82ef63a4601. > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 15:57:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:57:29 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package, legacy: fix typo for "daemon" on help text Message-ID: <20230222161136.48F4B86789@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d75ea9fdba8d6797d505e45e43af55b70663c6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x deamon -> daemon At same time, in Config.in.legacy fix other typos in the same help text: spae -> space monolitic -> monolithic Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 6a9feaabbce4f21dd2a688d35a5027cb0e2a7a22) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 4 ++-- package/ngircd/Config.in | 2 +- package/rp-pppoe/Config.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 1c76eb918a..3a2e6883e9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4163,8 +4163,8 @@ config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - - a monolitic user space library - - a user spae deamon driver + - a monolithic user space library + - a user space daemon driver config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" diff --git a/package/ngircd/Config.in b/package/ngircd/Config.in index 9b3d430922..1e93a5702c 100644 --- a/package/ngircd/Config.in +++ b/package/ngircd/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_NGIRCD bool "ngircd" depends on BR2_USE_MMU # fork() help - Next Generation IRC server deamon. + Next Generation IRC server daemon. http://ngircd.barton.de diff --git a/package/rp-pppoe/Config.in b/package/rp-pppoe/Config.in index 2ac81cbb2d..6ff005a1e1 100644 --- a/package/rp-pppoe/Config.in +++ b/package/rp-pppoe/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_RP_PPPOE select BR2_PACKAGE_PPPD help An implementation of the Point-to-point protocol over - Ethernet. Has userspace client and server deamons. You + Ethernet. Has userspace client and server daemons. You likely only need this package if you are implementing the pppoe server that will service other pppoe client devices. Otherwise the normal client functionality already From peter at korsgaard.com Wed Feb 22 16:07:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:07:24 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] Config.in.legacy: fix typo on BR2_PACKAGE_MEDIAART_BACKEND_QT Message-ID: <20230222161136.56F878678A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd8decd5811c44d742188e31e61b34f116f32335 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Currently using this minimal .config: BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF=y triggers: *** Legacy options removed in 2018.05 *** [ ] libmediaart none backend option renamed (NEW) [*] libmediaart gdk-pixbuf backend option renamed [*] libmediaart qt backend option renamed Commit "8553b39887 libmediaart: rename options to have proper prefix", part of the 2018.05 release had a copy&paste error. As stated in the beginning of the file: The oldest symbols will be removed again after about two years. But while we carry these legacy symbols, let's fix the typo. Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 316e149611a761db04171ee6141048d9057183c8) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3a2e6883e9..5000c7a7be 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2433,7 +2433,7 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF +config BR2_PACKAGE_MEDIAART_BACKEND_QT bool "libmediaart qt backend option renamed" select BR2_LEGACY help From peter at korsgaard.com Wed Feb 22 15:54:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 16:54:57 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] *: fix typo for separate(d|) in text Message-ID: <20230222161136.3B83886785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ca1305d64b30c0b98dc375e4b9f2d39694b9bb9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x seperate is a common misspelling of separate Fix all the typos in the tree that are not related to patch files. CHANGES seperate -> separate, in the list of changes Config.in.legacy seperate -> separate, in option name and help texts package/leafnode2/leafnode2.mk seperate -> separate, in a comment system/Config.in seperated -> separated, in a help text Cc: Bernd Kuhls Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 4092d2a3546c1edfcb27f9d00fd4e7cac9878d2f) Signed-off-by: Peter Korsgaard --- CHANGES | 4 ++-- Config.in.legacy | 6 +++--- package/leafnode2/leafnode2.mk | 2 +- system/Config.in | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 8af15d3b1e..c0e144755d 100644 --- a/CHANGES +++ b/CHANGES @@ -7097,7 +7097,7 @@ Architecture: Default to bf532 CPU variant for blackfin, Fix flat one memory region support for m68k and disable flat - seperate data support because of compatibility issues. + separate data support because of compatibility issues. Defconfigs: Minnowboard and Raspberrypi: Fix errors with post-build scripts when systemd is used. @@ -7633,7 +7633,7 @@ Minor fixes. - Merged/seperate /usr handling is now also performed for + Merged/separate /usr handling is now also performed for staging so cross-gdb / gdbserver can find the libraries. Updated/fixed packages: autossh, conntrack-tools, dcron, diff --git a/Config.in.legacy b/Config.in.legacy index 8db70cae5a..1c76eb918a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -3079,7 +3079,7 @@ config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND select BR2_PACKAGE_RESTORECOND help The policycoreutils package no longer offers restorecond - as a option. This package has been moved into a seperate + as a option. This package has been moved into a separate package maintained by the SELinux maintainers. config BR2_PACKAGE_SEPOLGEN @@ -3673,7 +3673,7 @@ config BR2_GDB_VERSION_7_9 comment "Legacy options removed in 2016.11" config BR2_PACKAGE_PHP_SAPI_CLI_CGI - bool "PHP CGI and CLI options are now seperate" + bool "PHP CGI and CLI options are now separate" select BR2_PACKAGE_PHP_SAPI_CLI select BR2_PACKAGE_PHP_SAPI_CGI select BR2_LEGACY @@ -4703,7 +4703,7 @@ config BR2_PACKAGE_KODI_PVR_ADDONS select BR2_PACKAGE_KODI_PVR_VUPLUS select BR2_PACKAGE_KODI_PVR_WMC help - Kodi PVR addon was split into seperate modules + Kodi PVR addon was split into separate modules config BR2_BINUTILS_VERSION_2_23_2 bool "binutils 2.23 option renamed" diff --git a/package/leafnode2/leafnode2.mk b/package/leafnode2/leafnode2.mk index a02aad4302..e82ca2e1ee 100644 --- a/package/leafnode2/leafnode2.mk +++ b/package/leafnode2/leafnode2.mk @@ -23,7 +23,7 @@ LEAFNODE2_CONF_OPTS = \ --enable-runas-user=root # Leafnode2 needs the host version of b_sortnl during -# compilation. Instead of creating a seperate host package and +# compilation. Instead of creating a separate host package and # installing b_sortnl to $(HOST_DIR) this binary is compiled # on-the-fly, host-pcre is needed for this define LEAFNODE2_BUILD_SORTNL_TOOL diff --git a/system/Config.in b/system/Config.in index a4ffbfa18c..34b0a9a3a4 100644 --- a/system/Config.in +++ b/system/Config.in @@ -432,7 +432,7 @@ config BR2_ENABLE_LOCALE_WHITELIST default "C en_US" depends on BR2_ENABLE_LOCALE_PURGE help - Whitespace seperated list of locales to allow on target. + Whitespace separated list of locales to allow on target. Locales not listed here will be removed from the target. See 'locale -a' on your host for a list of locales available on your build host, or have a look in /usr/share/locale in From peter at korsgaard.com Wed Feb 22 16:08:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:08:43 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] utils/checkpackagelib: warn about redefined config Message-ID: <20230222161136.62B4786785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8b6ca8bcfe202d2472500aec38514cced11e30b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Warn the developer in the case the same config is declared more than once in the same Config.in file. But take into account the conditional code that lets the config be visible and warn only when it is declared more than once in the same conditions. For instance, do not warn for: if BR2_PACKAGE_BUSYBOX config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS endif Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 4bbda72743d39df29dfc91e0f52be02b2d465f6d) Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_config.py | 38 ++++++++++++++++ utils/checkpackagelib/test_lib_config.py | 78 ++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index b05831f2c3..f26ca0d898 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -233,3 +233,41 @@ class Indent(_CheckFunction): return ["{}:{}: should not be indented" .format(self.filename, lineno), text] + + +class RedefinedConfig(_CheckFunction): + CONFIG = re.compile(r"^\s*(menu|)config\s+(BR2_\w+)\b") + IF = re.compile(r"^\s*if\s+([^#]*)\b") + ENDIF = re.compile(r"^\s*endif\b") + + def before(self): + self.configs = {} + self.conditional = [] + + def check_line(self, lineno, text): + if _empty_or_comment(text) or _part_of_help_text(text): + return + + m = self.IF.search(text) + if m is not None: + condition = m.group(1) + self.conditional.append(condition) + return + + m = self.ENDIF.search(text) + if m is not None: + self.conditional.pop() + return + + m = self.CONFIG.search(text) + if m is None: + return + config = m.group(2) + + key = (config, ' AND '.join(self.conditional)) + if key in self.configs.keys(): + previous_line = self.configs[key] + return ["{}:{}: config {} redeclared (previous line: {})" + .format(self.filename, lineno, config, previous_line), + text] + self.configs[key] = lineno diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py index 91a549adf2..474d17105e 100644 --- a/utils/checkpackagelib/test_lib_config.py +++ b/utils/checkpackagelib/test_lib_config.py @@ -385,3 +385,81 @@ Indent = [ def test_Indent(testname, filename, string, expected): warnings = util.check_file(m.Indent, filename, string) assert warnings == expected + + +RedefinedConfig = [ + ('no redefinition', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO_BAR\n' + 'bool "foo"\n', + []), + ('no conditional', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('three times', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:3: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n'], + ['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('same conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:6: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:8: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('not equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if !BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', RedefinedConfig) +def test_RedefinedConfig(testname, filename, string, expected): + warnings = util.check_file(m.RedefinedConfig, filename, string) + assert warnings == expected From peter at korsgaard.com Wed Feb 22 16:11:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:11:43 +0100 Subject: [Buildroot] [git commit] boot/barebox: explicitly set the timezone for the kbuild timestamp In-Reply-To: <20230206105723.7A6F7838E3@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Mon, 6 Feb 2023 11:57:08 +0100") References: <20230206105723.7A6F7838E3@busybox.osuosl.org> Message-ID: <87k009vfwg.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=11e75ecbf092420f00f0fc88a7183d5d99887ff1 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > This adjusts the code added in commit > c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required > environment variables for reproducible build") to explicitly set the > timezone when calculating KBUILD_BUILD_TIMESTAMP, like is already done > in linux/linux.mk. > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:11:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:11:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] boot/barebox: explicitly set the timezone for the kbuild timestamp Message-ID: <20230222161315.3C8D68679F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=427095a091c68f7c670e535ecf08a521af49b619 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This adjusts the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") to explicitly set the timezone when calculating KBUILD_BUILD_TIMESTAMP, like is already done in linux/linux.mk. Signed-off-by: Thomas Petazzoni (cherry picked from commit 11e75ecbf092420f00f0fc88a7183d5d99887ff1) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 39f656c599..281013ed0f 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -78,7 +78,7 @@ ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C TZ='UTC' date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From peter at korsgaard.com Wed Feb 22 16:10:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:10:41 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] boot/barebox: use $$ instead of $ where needed Message-ID: <20230222161315.30ED18679E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8cd934489ac0c38bfb1f0a6223083652bf85de53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") caused the build to generate a spurious error message due to the $(shell ... date -d @$(SOURCE_DATE_EPOCH)) command being executed even when BR2_REPRODUCIBLE was disabled. This is due to the fact that variable references must be done using $$ within macros. This commit fixes that for the two variables that we are referencing in the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601. Signed-off-by: Thomas Petazzoni (cherry picked from commit 75c313816eb526fe09a6baab8b327279e01be5ef) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 05629bb4e3..39f656c599 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -74,11 +74,11 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) -ifeq ($(BR2_REPRODUCIBLE),y) +ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From peter at korsgaard.com Wed Feb 22 16:10:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:10:47 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] boot/barebox: use $$ instead of $ where needed Message-ID: <20230222161342.1604B83CA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41aade348afab8e876d114f4e16dddb8f5b21b96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") caused the build to generate a spurious error message due to the $(shell ... date -d @$(SOURCE_DATE_EPOCH)) command being executed even when BR2_REPRODUCIBLE was disabled. This is due to the fact that variable references must be done using $$ within macros. This commit fixes that for the two variables that we are referencing in the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601. Signed-off-by: Thomas Petazzoni (cherry picked from commit 75c313816eb526fe09a6baab8b327279e01be5ef) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 90be8c1ecc..a0cfaffe09 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -74,11 +74,11 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) -ifeq ($(BR2_REPRODUCIBLE),y) +ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From peter at korsgaard.com Wed Feb 22 16:11:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:11:28 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] boot/barebox: explicitly set the timezone for the kbuild timestamp Message-ID: <20230222161342.1F1A88679F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4027a4dddd92ab8b65c30733241a0a5751d3530 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x This adjusts the code added in commit c90bd74ebb264ccc925f10a142ccd82ef63a4601 ("boot/barebox: pass required environment variables for reproducible build") to explicitly set the timezone when calculating KBUILD_BUILD_TIMESTAMP, like is already done in linux/linux.mk. Signed-off-by: Thomas Petazzoni (cherry picked from commit 11e75ecbf092420f00f0fc88a7183d5d99887ff1) Signed-off-by: Peter Korsgaard --- boot/barebox/barebox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index a0cfaffe09..d7bcafe436 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -78,7 +78,7 @@ ifeq ($$(BR2_REPRODUCIBLE),y) $(1)_MAKE_ENV += \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C TZ='UTC' date -d @$(SOURCE_DATE_EPOCH))" endif ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) From peter at korsgaard.com Wed Feb 22 16:22:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:22:54 +0100 Subject: [Buildroot] [PATCH 2/2] package/postgresql: work around gcc bug 43744 In-Reply-To: <20230202154239.325711-2-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Thu, 2 Feb 2023 16:42:39 +0100") References: <20230202154239.325711-1-giulio.benetti@benettiengineering.com> <20230202154239.325711-2-giulio.benetti@benettiengineering.com> Message-ID: <87fsaxvfdt.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Package postgresql suffers from gcc bug 43744 other than 85180, so let's > work around disabling compiler optimization for this gcc bug too. > Fixes: > http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a > Signed-off-by: Giulio Benetti Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From gwenj at trabucayre.com Wed Feb 22 16:19:41 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Wed, 22 Feb 2023 17:19:41 +0100 Subject: [Buildroot] [PATCH 2/5] package/gnuradio: disable examples In-Reply-To: <20230222160514.2069544-2-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> <20230222160514.2069544-2-fontaine.fabrice@gmail.com> Message-ID: <20230222171942.11601e98@x230> On Wed, 22 Feb 2023 17:05:11 +0100 Fabrice Fontaine wrote: > Examples can be disabled since version 3.9.0.0 and > https://github.com/gnuradio/gnuradio/commit/530262c6df3fb9b87a80133dbde5650dbe948c4c > > Signed-off-by: Fabrice Fontaine > --- > package/gnuradio/gnuradio.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk > index c2fcba9586..c2e5ec5cad 100644 > --- a/package/gnuradio/gnuradio.mk > +++ b/package/gnuradio/gnuradio.mk > @@ -22,6 +22,7 @@ GNURADIO_DEPENDENCIES = \ > GNURADIO_CONF_OPTS = \ > -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > -DENABLE_DEFAULT=OFF \ > + -DENABLE_EXAMPLES=OFF \ > -DENABLE_GNURADIO_RUNTIME=ON \ > -DENABLE_TESTING=OFF \ > -DXMLTO_EXECUTABLE=NOTFOUND > -- > 2.39.0 > Acked-by: Gwenhael Goavec-merou Regargs, Gwen From gwenj at trabucayre.com Wed Feb 22 16:14:44 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Wed, 22 Feb 2023 17:14:44 +0100 Subject: [Buildroot] [PATCH 1/5] package/gnuradio: drop unrecognized volk variables In-Reply-To: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Message-ID: <20230222171444.5e9e8f2f@x230> On Wed, 22 Feb 2023 17:05:10 +0100 Fabrice Fontaine wrote: > Volk submodule has been removed since version 3.9.0.0 and > https://github.com/gnuradio/gnuradio/commit/80c04479da962d048d41165081b026aafdaa0316 > > orc dependency can also be dropped as it was only used by volk submodule > > Signed-off-by: Fabrice Fontaine > --- > package/gnuradio/gnuradio.mk | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk > index cc41f1e12b..c2fcba9586 100644 > --- a/package/gnuradio/gnuradio.mk > +++ b/package/gnuradio/gnuradio.mk > @@ -22,9 +22,7 @@ GNURADIO_DEPENDENCIES = \ > GNURADIO_CONF_OPTS = \ > -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > -DENABLE_DEFAULT=OFF \ > - -DENABLE_VOLK=ON \ > -DENABLE_GNURADIO_RUNTIME=ON \ > - -DENABLE_INTERNAL_VOLK=OFF \ > -DENABLE_TESTING=OFF \ > -DXMLTO_EXECUTABLE=NOTFOUND > > @@ -36,13 +34,6 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > GNURADIO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > endif > > -ifeq ($(BR2_PACKAGE_ORC),y) > -GNURADIO_DEPENDENCIES += orc > -GNURADIO_CONF_OPTS += -DENABLE_ORC=ON > -else > -GNURADIO_CONF_OPTS += -DENABLE_ORC=OFF > -endif > - > ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) > GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON > else > -- > 2.39.0 > Acked-by: Gwenhael Goavec-merou Regargs, Gwen From gwenj at trabucayre.com Wed Feb 22 16:26:42 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Wed, 22 Feb 2023 17:26:42 +0100 Subject: [Buildroot] [PATCH 4/5] package/gnuradio: add gr-network block support In-Reply-To: <20230222160514.2069544-4-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> <20230222160514.2069544-4-fontaine.fabrice@gmail.com> Message-ID: <20230222172621.4994893c@x230> On Wed, 22 Feb 2023 17:05:13 +0100 Fabrice Fontaine wrote: > grnet networking block support is available since version version > 3.9.0.0 and > https://github.com/gnuradio/gnuradio/commit/cc37c3e8cd5eabcb5c9d919e5fffc5d938690140 > > gr-network is a mandatory dependency of latest gqrx > > Signed-off-by: Fabrice Fontaine > --- > package/gnuradio/Config.in | 6 ++++++ > package/gnuradio/gnuradio.mk | 6 ++++++ > 2 files changed, 12 insertions(+) > > diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in > index 1824589263..51237e62b9 100644 > --- a/package/gnuradio/Config.in > +++ b/package/gnuradio/Config.in > @@ -134,6 +134,12 @@ config BR2_PACKAGE_GNURADIO_FILTER > help > Filter signal processing blocks > > +config BR2_PACKAGE_GNURADIO_NETWORK > + bool "gr-network support" > + select BR2_PACKAGE_GNURADIO_BLOCKS > + help > + TCP and UDP source/sink blocks > + > config BR2_PACKAGE_GNURADIO_QTGUI > bool "gr-qtgui" > depends on BR2_PACKAGE_GNURADIO_PYTHON > diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk > index 59fb23d89d..d9218b533d 100644 > --- a/package/gnuradio/gnuradio.mk > +++ b/package/gnuradio/gnuradio.mk > @@ -106,6 +106,12 @@ else > GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF > endif > > +ifeq ($(BR2_PACKAGE_GNURADIO_NETWORK),y) > +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=ON > +else > +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=OFF > +endif > + > ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) > GNURADIO_DEPENDENCIES += python3 python-pybind \ > host-python-numpy host-python-packaging > -- > 2.39.0 > Acked-by: Gwenhael Goavec-merou Regargs, Gwen From peter at korsgaard.com Wed Feb 22 16:30:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:30:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/netopeer2: fix sysv init script, does not start In-Reply-To: <20230131142003.1354787-1-troglobit@gmail.com> (Joachim Wiberg's message of "Tue, 31 Jan 2023 15:20:03 +0100") References: <20230131142003.1354787-1-troglobit@gmail.com> Message-ID: <87bkllvf1l.fsf@dell.be.48ers.dk> >>>>> "Joachim" == Joachim Wiberg writes: > - The netopeer server forks to background by default, no need for '-b' > - The path to the daemon is /usr/sbin, not /usr/bin > Signed-off-by: Joachim Wiberg Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:31:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:31:46 +0100 Subject: [Buildroot] [PATCH] Makefile: fix build when $(O) ends in _defconfig In-Reply-To: <038b530f-18f1-fd5e-f926-32e73d434a63@smile.fr> (Sebastian WEYER's message of "Mon, 6 Feb 2023 11:57:11 +0100") References: <20230122090947.1369673-1-yann.morin.1998@free.fr> <038b530f-18f1-fd5e-f926-32e73d434a63@smile.fr> Message-ID: <877cw9vez1.fsf@dell.be.48ers.dk> >>>>> "Sebastian" == Sebastian WEYER writes: > Hi all, > On 22/01/2023 10:09, Yann E. MORIN wrote: >> Commit e6195c53041f (Makefile: fix use of many br2-external trees) fixed >> a slowdown with many br2-external trees. In doing so, it changed the >> type of the %_defconfig rule: the stem is no longer present in the >> prerequisites, so it changes from a pattern rule to an implicit pattern >> rule [0]. >> >> It is not unusual to name the build directory after the defconfig that >> is being built, so we may end up with a build directory named >> meh_defconfig. Before e6195c53041f, the pattern rule would not match >> [1], but now it does, which causes somewhat-cryptic build failures: >> >> Makefile:1015: *** "Can't find /some/path/meh_defconfig". Stop. >> >> The issue is that we have this set of rules and assignments (elided and >> reordered for legibility): >> >> all: world >> world: target-post-image >> target-post-image: staging-finalize >> staging-finalize: $(STAGING_DIR_SYMLINK) >> $(STAGING_DIR_SYMLINK): | $(BASE_DIR) >> BASE_DIR := $(CANONICAL_O) >> CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) >> >> So, there is a rule that (eventually) has a dependency on $(O), but we >> have no rule that provides it explicitly, so the %_defconfig rule kicks >> in, with the stem as "/some/path/meh". When the loop searches all the >> ".../configs/" directories for a file named ".../configs/%_defconfig", >> it actually lookes for a file named ".../configs//some/path/meh_defconfig" >> and that indeed never matches anything. >> >> The solution is to provide an actual rule for $(BASE_DIR), so that the >> implicit rule does not kick in. >> >> [0] Terminology and behaviour in make is hard, so the terms we used here >> may be wrong or incorrectly used, and/or the explanations for the >> behavious be wrong or incomplete... Still, the reasoning stands, and >> the root cause is the removal of the stem in the RHS of the rule >> (adding one back does fix the issue). >> >> [1] not sure how the prerequisite was solved before e6195c53041f, >> though... >> >> Fixes: e6195c53041f >> >> Reported-by: Romain Naour >> Signed-off-by: Yann E. MORIN >> Cc: Nevo Hed >> Cc: Peter Korsgaard >> --- >> Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/Makefile b/Makefile >> index 8517d563d5..f39af5eae9 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -1042,7 +1042,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile >> >> # staging and target directories do NOT list these as >> # dependencies anywhere else >> -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): >> +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): >> @mkdir -p $@ >> >> # outputmakefile generates a Makefile in the output directory, if using a > I first verified that the build fails when the output folder's name ends in > "_defconfig" with "make O=./test/second_defconfig qemu_aarch64_virt_defconfig" > followed by "make O=./test/second_defconfig". > I then applied the patch and redid "make O=./test/second_defconfig" and verified > that the build succeeded. > Tested-by: Sebastian Weyer Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From gwenj at trabucayre.com Wed Feb 22 16:31:56 2023 From: gwenj at trabucayre.com (Gwenhael Goavec-Merou) Date: Wed, 22 Feb 2023 17:31:56 +0100 Subject: [Buildroot] [PATCH 3/5] package/gnuradio: add libsndfile optional dependency In-Reply-To: <20230222160514.2069544-3-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> <20230222160514.2069544-3-fontaine.fabrice@gmail.com> Message-ID: <20230222173156.0f63bb68@x230> On Wed, 22 Feb 2023 17:05:12 +0100 Fabrice Fontaine wrote: > libsndfile is an optional dependency since version 3.9.0.0 and > https://github.com/gnuradio/gnuradio/commit/18f64ba685cfc2533e2d7726aa43c524b007d97b > > Signed-off-by: Fabrice Fontaine > --- > package/gnuradio/gnuradio.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk > index c2e5ec5cad..59fb23d89d 100644 > --- a/package/gnuradio/gnuradio.mk > +++ b/package/gnuradio/gnuradio.mk > @@ -55,6 +55,9 @@ endif > > ifeq ($(BR2_PACKAGE_GNURADIO_BLOCKS),y) > GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=ON > +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) > +GNURADIO_DEPENDENCIES += libsndfile > +endif > else > GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=OFF > endif > -- > 2.39.0 > Acked-by: Gwenhael Goavec-merou Regargs, Gwen From peter at korsgaard.com Wed Feb 22 16:22:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:22:32 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/postgresql: work around gcc bug 43744 Message-ID: <20230222163514.A04BE867C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39d4aaf32f4147ac2bccc8fe290753e3e6761b43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Package postgresql suffers from gcc bug 43744 other than 85180, so let's work around disabling compiler optimization for this gcc bug too. Fixes: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 3def0679e3a424983354346eb517bbaa07b905df) Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 2de7f3eede..3c190c34e3 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -101,7 +101,7 @@ endif POSTGRESQL_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_43744)$(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),) POSTGRESQL_CFLAGS += -O0 endif From peter at korsgaard.com Wed Feb 22 16:29:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:29:07 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/netopeer2: fix sysv init script, does not start Message-ID: <20230222163514.AB933867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9292cf956b1ef5f7cda75fc3cbf140611360640c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - The netopeer server forks to background by default, no need for '-b' - The path to the daemon is /usr/sbin, not /usr/bin Signed-off-by: Joachim Wiberg Acked-by: Heiko Thiery Signed-off-by: Yann E. MORIN (cherry picked from commit 6ddc29708d3c82f2f6055b596e484a6d963a6eae) Signed-off-by: Peter Korsgaard --- package/netopeer2/S52netopeer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netopeer2/S52netopeer2 b/package/netopeer2/S52netopeer2 index cf53a8f109..cadd6b9feb 100644 --- a/package/netopeer2/S52netopeer2 +++ b/package/netopeer2/S52netopeer2 @@ -8,7 +8,7 @@ NETOPEER2_SERVER_ARGS="" start() { printf 'Starting %s: ' "$DAEMON" - start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -p $PIDFILE -x "/usr/sbin/$DAEMON" \ -- $NETOPEER2_SERVER_ARGS status=$? if [ "$status" -eq 0 ]; then From peter at korsgaard.com Wed Feb 22 16:31:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:31:06 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] Makefile: fix build when $(O) ends in _defconfig Message-ID: <20230222163514.B85F1867CB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8d59bec22a31e3faafc77db97dc7fa8fa79fa15 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit e6195c53041f (Makefile: fix use of many br2-external trees) fixed a slowdown with many br2-external trees. In doing so, it changed the type of the %_defconfig rule: the stem is no longer present in the prerequisites, so it changes from a pattern rule to an implicit pattern rule [0]. It is not unusual to name the build directory after the defconfig that is being built, so we may end up with a build directory named meh_defconfig. Before e6195c53041f, the pattern rule would not match [1], but now it does, which causes somewhat-cryptic build failures: Makefile:1015: *** "Can't find /some/path/meh_defconfig". Stop. The issue is that we have this set of rules and assignments (elided and reordered for legibility): all: world world: target-post-image target-post-image: staging-finalize staging-finalize: $(STAGING_DIR_SYMLINK) $(STAGING_DIR_SYMLINK): | $(BASE_DIR) BASE_DIR := $(CANONICAL_O) CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) So, there is a rule that (eventually) has a dependency on $(O), but we have no rule that provides it explicitly, so the %_defconfig rule kicks in, with the stem as "/some/path/meh". When the loop searches all the ".../configs/" directories for a file named ".../configs/%_defconfig", it actually looks for a file named ".../configs//some/path/meh_defconfig" and that indeed never matches anything. The solution is to provide an actual rule for $(BASE_DIR), so that the implicit rule does not kick in. [0] Terminology and behaviour in make is hard, so the terms we used here may be wrong or incorrectly used, and/or the explanations for the behaviour be wrong or incomplete... Still, the reasoning stands, and the root cause is the removal of the stem in the RHS of the rule (adding one back does fix the issue). [1] not sure how the prerequisite was solved before e6195c53041f, though... Fixes: e6195c53041f Reported-by: Romain Naour Signed-off-by: Yann E. MORIN Cc: Nevo Hed Cc: Peter Korsgaard Tested-by: Sebastian Weyer Signed-off-by: Yann E. MORIN (cherry picked from commit 5bd2cafc326141eede4f917069ed21b6d38f88c2) Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3bdc2f08c9..3828cf26ed 100644 --- a/Makefile +++ b/Makefile @@ -1044,7 +1044,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile # staging and target directories do NOT list these as # dependencies anywhere else -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): @mkdir -p $@ # outputmakefile generates a Makefile in the output directory, if using a From peter at korsgaard.com Wed Feb 22 16:28:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:28:55 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/netopeer2: fix sysv init script, does not start Message-ID: <20230222163531.7EAB9867CB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3fd22e80cdf15465cf2297e8a1817ea79e638fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x - The netopeer server forks to background by default, no need for '-b' - The path to the daemon is /usr/sbin, not /usr/bin Signed-off-by: Joachim Wiberg Acked-by: Heiko Thiery Signed-off-by: Yann E. MORIN (cherry picked from commit 6ddc29708d3c82f2f6055b596e484a6d963a6eae) Signed-off-by: Peter Korsgaard --- package/netopeer2/S52netopeer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netopeer2/S52netopeer2 b/package/netopeer2/S52netopeer2 index cf53a8f109..cadd6b9feb 100644 --- a/package/netopeer2/S52netopeer2 +++ b/package/netopeer2/S52netopeer2 @@ -8,7 +8,7 @@ NETOPEER2_SERVER_ARGS="" start() { printf 'Starting %s: ' "$DAEMON" - start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -p $PIDFILE -x "/usr/sbin/$DAEMON" \ -- $NETOPEER2_SERVER_ARGS status=$? if [ "$status" -eq 0 ]; then From peter at korsgaard.com Wed Feb 22 16:31:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:31:16 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] Makefile: fix build when $(O) ends in _defconfig Message-ID: <20230222163531.89130867D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2759b8a3081e806c10b3c2ff7f04efcdef8a8212 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit e6195c53041f (Makefile: fix use of many br2-external trees) fixed a slowdown with many br2-external trees. In doing so, it changed the type of the %_defconfig rule: the stem is no longer present in the prerequisites, so it changes from a pattern rule to an implicit pattern rule [0]. It is not unusual to name the build directory after the defconfig that is being built, so we may end up with a build directory named meh_defconfig. Before e6195c53041f, the pattern rule would not match [1], but now it does, which causes somewhat-cryptic build failures: Makefile:1015: *** "Can't find /some/path/meh_defconfig". Stop. The issue is that we have this set of rules and assignments (elided and reordered for legibility): all: world world: target-post-image target-post-image: staging-finalize staging-finalize: $(STAGING_DIR_SYMLINK) $(STAGING_DIR_SYMLINK): | $(BASE_DIR) BASE_DIR := $(CANONICAL_O) CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) So, there is a rule that (eventually) has a dependency on $(O), but we have no rule that provides it explicitly, so the %_defconfig rule kicks in, with the stem as "/some/path/meh". When the loop searches all the ".../configs/" directories for a file named ".../configs/%_defconfig", it actually looks for a file named ".../configs//some/path/meh_defconfig" and that indeed never matches anything. The solution is to provide an actual rule for $(BASE_DIR), so that the implicit rule does not kick in. [0] Terminology and behaviour in make is hard, so the terms we used here may be wrong or incorrectly used, and/or the explanations for the behaviour be wrong or incomplete... Still, the reasoning stands, and the root cause is the removal of the stem in the RHS of the rule (adding one back does fix the issue). [1] not sure how the prerequisite was solved before e6195c53041f, though... Fixes: e6195c53041f Reported-by: Romain Naour Signed-off-by: Yann E. MORIN Cc: Nevo Hed Cc: Peter Korsgaard Tested-by: Sebastian Weyer Signed-off-by: Yann E. MORIN (cherry picked from commit 5bd2cafc326141eede4f917069ed21b6d38f88c2) Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ab5f97aeff..804ae58689 100644 --- a/Makefile +++ b/Makefile @@ -1041,7 +1041,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile # staging and target directories do NOT list these as # dependencies anywhere else -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): @mkdir -p $@ # outputmakefile generates a Makefile in the output directory, if using a From peter at korsgaard.com Wed Feb 22 16:22:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:22:28 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/postgresql: work around gcc bug 43744 Message-ID: <20230222163531.72F80867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=45f5c85ee5eae562467b84a88b067fc57232952f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Package postgresql suffers from gcc bug 43744 other than 85180, so let's work around disabling compiler optimization for this gcc bug too. Fixes: http://autobuild.buildroot.net/results/cf272cdc5be2faf4070de3d235ec7a0f7190867a Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 3def0679e3a424983354346eb517bbaa07b905df) Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 502860bc99..549a47f42e 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -101,7 +101,7 @@ endif POSTGRESQL_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_43744)$(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),) POSTGRESQL_CFLAGS += -O0 endif From peter at korsgaard.com Wed Feb 22 16:38:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:38:34 +0100 Subject: [Buildroot] [next 05/25] support/scripts/generate-gitlab-ci-yml: improve test-pkg support In-Reply-To: <20221127130739.1862398-6-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:19 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-6-ricardo.martincoski@gmail.com> Message-ID: <87356xvenp.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Following the example of test-pkg config described in commit > "12c7a05da1 utils/test-pkg: add gitlab-ci support" to test a defconfig > fragment that contains a disabled option is currently possible, but > it do requires one to change the git config core.commentChart so the > lines starting with "#" are not discarded by git when creating/editing > the commit message. > For instance, without the indentation the 3rd line below would be > excluded from the commit message when the editor is closed: > test-pkg config: > SOME_OPTION=y > # OTHER_OPTION is not set > SOME_VARIABLE="some value" > Requiring to change git configs is not very nice. > So make the developer's life easier by changing the sed expression to > remove indentation with spaces from a defconfig fragment found on a > commit message. > For instance these lines become valid and generate a defconfig fragment > without the indentation of one space to be tested in GitLab CI: > test-pkg config: > SOME_OPTION=y > # OTHER_OPTION is not set > SOME_VARIABLE="some value" > Signed-off-by: Ricardo Martincoski > --- > Example usage: > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704846763 Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:38:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:38:40 +0100 Subject: [Buildroot] [next 06/25] package/fwts: use ifeq instead of ifdef In-Reply-To: <20221127130739.1862398-7-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:20 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-7-ricardo.martincoski@gmail.com> Message-ID: <87y1opu033.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The conditional code using ifdef was added in 2018 and works as > expected. > But there is no reason to use ifdef instead of ifeq. > For consistence, switch to use ifeq like almost all packages already do. > Cc: Arnout Vandecappelle > Cc: Erico Nunes > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:38:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:38:46 +0100 Subject: [Buildroot] [next 07/25] package/live555: fix build config with locale In-Reply-To: <20221127130739.1862398-8-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:21 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-8-ricardo.martincoski@gmail.com> Message-ID: <87ttzdu02x.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Using current conditional code, added in 2014: > ifndef ($(BR2_ENABLE_LOCALE),y) > LIVE555_CFLAGS += -DLOCALE_NOT_USED > endif > the define LOCALE_NOT_USED is always passed on CFLAGS, because there is > no symbol with following names defined: > "(y,y)" -> not defined when BR2_ENABLE_LOCALE=y > "(,y)" -> not defined when BR2_ENABLE_LOCALE is not set > So fix the typo, switching ifndef to ifneq. > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:39:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:39:15 +0100 Subject: [Buildroot] [next 08/25] package/pugixml: unconditionally set BUILD_DEFINES In-Reply-To: <20221127130739.1862398-9-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:22 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-9-ricardo.martincoski@gmail.com> Message-ID: <87pma1u024.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The ifdef construct intended to avoid passing -DBUILD_DEFINES="" was > never needed, because even upstream version v1.9 used in 2019 when the > configuration options were added, can handle an empty string for > BUILD_DEFINES. > In fact an empty string is the default for v1.9 if it is not passed > during configure. > Also, the host variant already sets BUILD_DEFINES unconditionally. > So remove the unneeded conditional. > Cc: Arnout Vandecappelle > Cc: Theo Debrouwere > Signed-off-by: Ricardo Martincoski > --- > NOTE 1: > For versions starting from v1.11 this flag BUILD_DEFINES is ignored, but > it will be fixed in the next patch. > I had split into 2 patches because this first one applies to old > versions of the package too. Someone could theoretically decide to > backport to a local copy of buildroot 2020.05.x for instance. > NOTE 2: > It doesn't test much, since BUILD_DEFINES is ignored, but anyway: > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/704554673 > 44 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > test-pkg config: > BR2_PACKAGE_PUGIXML=y Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:40:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:40:01 +0100 Subject: [Buildroot] [next 09/25] package/pugixml: fix configuration options In-Reply-To: <20221127130739.1862398-10-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:23 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-10-ricardo.martincoski@gmail.com> Message-ID: <87lekpu00u.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit upstream 1c5a0bb32583fd294022e68e66b541bf6ff71a67 > ":sparkles: Update CMake to modern approach" removed all feature > toogles, so starting from release v1.11 any flag passed in BUILD_DEFINES > was completely ignored during the build. > Version 1.11.4 was in use in buildroot since February 2021. > Commit upstream 0f1e75a902ef1751dd63a67fe223b5e8daf4c7f1 > "Re-introduced the custom build defines" added PUGIXML_BUILD_DEFINES to > release v1.12, but BUILD_DEFINES is still completely ignored during the > build. > Version 1.12.1 is in use in buildroot since March 2022. > So switch the config options to use PUGIXML_BUILD_DEFINES instead of > BUILD_DEFINES. > Cc: Arnout Vandecappelle > Cc: Theo Debrouwere > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:41:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:41:09 +0100 Subject: [Buildroot] [next 10/25] package/pugixml: use explicit build options In-Reply-To: <20221127130739.1862398-11-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:24 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-11-ricardo.martincoski@gmail.com> Message-ID: <87h6vdtzyy.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit upstream 986b7ffd01aedcd4f2aa16e78e4cad9313b6d7b2 > "Add Cmake options for pugiconfig.hpp" added feature toogles to release > v1.12, including PUGIXML_NO_XPATH and PUGIXML_COMPACT. > Commit upstream 5f49f2c6575cc2b7d343f8d41581fe92d69d7b52 > "Mark advanced options and removed redundant ones" removed CMake > specific support for PUGIXML_HEADER_ONLY and PUGIXML_HAS_LONG_LONG, but > they can still be provided using PUGIXML_BUILD_DEFINES, starting from > release v1.12. > So use the explicit build options PUGIXML_NO_XPATH and PUGIXML_COMPACT, > but keep using PUGIXML_BUILD_DEFINES to set PUGIXML_HEADER_ONLY and > PUGIXML_HAS_LONG_LONG. > Cc: Arnout Vandecappelle > Cc: Theo Debrouwere > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x, thanks (2022.02.x uses v1.11.4). -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:41:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:41:41 +0100 Subject: [Buildroot] [next 11/25] package/busybox: add comment about variable override In-Reply-To: <20221127130739.1862398-12-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:25 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-12-ricardo.martincoski@gmail.com> Message-ID: <87cz61tzy2.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The same comment already exists for UCLIBC_CONFIG_FILE. > Both variables can be override from command-line, as described in the > manual, at section 'Environment variables'. > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:44:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:44:09 +0100 Subject: [Buildroot] [next 12/25] utils/checkpackagelib: warn about ifdef on .mk In-Reply-To: <20221127130739.1862398-13-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:26 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-13-ricardo.martincoski@gmail.com> Message-ID: <878rgptzty.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > There are two legitimate cases to prefer ifdef over ifeq in package > recipes: command-line overrides are allowed for busybox and uclibc > configs. > Except for that, all package in tree already use ifeq, so warn the > developer adding/changing a package to use ifeq instead of ifdef, in > order to keep consistence across packages. > file.mk:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL > file.mk:5: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL > The difference between ifeq and ifdef is that ifdef doesn't expand > recursively. > Add comments to busybox and uclibc packages to avoid a warning in such > special cases. > Cc: Arnout Vandecappelle > Signed-off-by: Ricardo Martincoski > --- > NOTE 1: > I only state "all package in tree already use ifeq" because earlier in > the series other 3 (2 ifdef and 1 ifndef) uses were removed. Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:44:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:44:55 +0100 Subject: [Buildroot] [next 13/25] toolchain/toolchain-buildroot: add comment about using virtual package infra In-Reply-To: <20221127130739.1862398-14-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:27 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-14-ricardo.martincoski@gmail.com> Message-ID: <874jrdtzso.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "9a8ec9195c toolchain/toolchain-buildroot: migrate to virtual > package infrastructure" made the packages toolchain and > toolchain-buildroot to use the virtual package infra even they being > generic packages. > This works because on package/pkg-virtual.mk when a package do not > define neither _PROVIDES_ or _HAS_ symbols, only _IS_VIRTUAL is set to > YES and _VERSION and _SOURCE are set to empty before relaying the call > to inner-generic-package. > Add a comment explaining why the virtual package infra is used in these > cases. > Cc: Giulio Benetti > Cc: Romain Naour > Cc: Thomas De Schampheleire > Cc: Thomas Petazzoni > Cc: Yann E. MORIN > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:45:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:45:24 +0100 Subject: [Buildroot] [next 14/25] boot/uboot: remove use of legacy xloader symbol In-Reply-To: <20221127130739.1862398-15-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:28 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-15-ricardo.martincoski@gmail.com> Message-ID: <87zg95sl7f.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "070b183d0c boot/xloader: remove package", from release 2018.11, > removed the package, but the symbol is still referenced. > Remove the reference to it. > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:45:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:45:51 +0100 Subject: [Buildroot] [next 15/25] system: remove use of legacy md5 option In-Reply-To: <20221127130739.1862398-16-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:29 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-16-ricardo.martincoski@gmail.com> Message-ID: <87v8jtsl6o.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "bf3626002f system cfg: remove mkpasswd MD5 format option", from > release 2019.02, moved the symbol to legacy handling, but the symbol is > still referenced. > Remove the reference to it. > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:46:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:46:25 +0100 Subject: [Buildroot] [next 16/25] package/linux-headers: remove bogus symbol BR2_PACKAGE_HOST_LINUX_HEADERS In-Reply-To: <20221127130739.1862398-17-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:30 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-17-ricardo.martincoski@gmail.com> Message-ID: <87r0uhsl5q.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > The package host-linux-headers does not exist and there were never > references to this symbol in the tree, do drop it. > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:47:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:47:26 +0100 Subject: [Buildroot] [next 18/25] package/openpowerlink: properly handle legacy options In-Reply-To: <20221127130739.1862398-19-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:32 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-19-ricardo.martincoski@gmail.com> Message-ID: <87mt55sl41.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "b1063a0136 package/openpowerlink: bump to v2.2.2" tried to add > legacy handling but the new symbols are part of a choice, and Kconfig > does not enforce the select of a option from a choice. > Update the legacy entry for 2016.02, following the example described in > the beginning of the file. > Cc: Romain Naour > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:47:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:47:57 +0100 Subject: [Buildroot] [next 19/25] package/gcc: properly handle legacy for renamed ARC option In-Reply-To: <20221127130739.1862398-20-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:33 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-20-ricardo.martincoski@gmail.com> Message-ID: <87ilftsl36.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "50332a530b gcc: rename option for ARC gcc" tried to add legacy > handling but the new symbol is part of a choice, and Kconfig does not > enforce the select of a option from a choice. > Update the legacy entry for 2016.11, following the example described in > the beginning of the file. > Cc: Giulio Benetti > Cc: Romain Naour > Cc: Thomas Petazzoni > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:48:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:48:28 +0100 Subject: [Buildroot] [next 20/25] package/lua: properly handle legacy for removed version In-Reply-To: <20221127130739.1862398-21-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:34 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-21-ricardo.martincoski@gmail.com> Message-ID: <87edqhsl2b.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "297613f1c7 package/lua: remove 5.2.x version" tried to add > legacy handling but the new symbols are part of a choice, and Kconfig > does not enforce the select of a option from a choice. > Update the legacy entry for 2019.02, following the example described in > the beginning of the file. > Cc: Francois Perrad > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:49:04 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:49:04 +0100 Subject: [Buildroot] [next 21/25] package/ti-sgx-km: properly handle legacy for removed options In-Reply-To: <20221127130739.1862398-22-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:35 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-22-ricardo.martincoski@gmail.com> Message-ID: <87a615sl1b.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "c38b5566fe package/ti-sgx-{km, um, demos}: bump to latest TI > version", added in release 2020.02, removed some options that were > previously renamed in release 2018.05. > Update the legacy entry for 2018.05 and add the corresponding legacy > entries for 2020.02. > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:49:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:49:39 +0100 Subject: [Buildroot] [next 22/25] package/openjdk: properly handle legacy for renamed options In-Reply-To: <20221127130739.1862398-23-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:36 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-23-ricardo.martincoski@gmail.com> Message-ID: <875ybtsl0c.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "a610bf9967 package/openjdk{-bin}: bump version to 17.0.1+12" > tried to add legacy handling but the new symbols are part of a choice, > and Kconfig does not enforce the select of a option from a choice. > Update the legacy entry for 2021.11, following the example described in > the beginning of the file. > Cc: Tudor Holton > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:50:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:50:22 +0100 Subject: [Buildroot] [next 23/25] package/sunxi-mali-utgard: properly handle legacy for renamed options In-Reply-To: <20221127130739.1862398-24-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 27 Nov 2022 10:07:37 -0300") References: <20221127130739.1862398-1-ricardo.martincoski@gmail.com> <20221127130739.1862398-24-ricardo.martincoski@gmail.com> Message-ID: <871qmhskz5.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Commit "6a7a652b14 package/sunxi-mali-utgard: rename from > sunxi-mali-mainline" tried to add legacy handling but the new symbols > are part of a choice, and Kconfig does not enforce the select of a > option from a choice. > Update the legacy entry for 2022.02, following the example described in > the beginning of the file. > Cc: Giulio Benetti > Signed-off-by: Ricardo Martincoski Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 16:36:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:36:45 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/scripts/generate-gitlab-ci-yml: improve test-pkg support Message-ID: <20230222170816.19523867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f63e64d9c8782987c2fc1fafe3ada2f8762e809 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Following the example of test-pkg config described in commit "12c7a05da1 utils/test-pkg: add gitlab-ci support" to test a defconfig fragment that contains a disabled option is currently possible, but it do requires one to change the git config core.commentChart so the lines starting with "#" are not discarded by git when creating/editing the commit message. For instance, without the indentation the 3rd line below would be excluded from the commit message when the editor is closed: test-pkg config: SOME_OPTION=y # OTHER_OPTION is not set SOME_VARIABLE="some value" Requiring to change git configs is not very nice. So make the developer's life easier by changing the sed expression to remove indentation with spaces from a defconfig fragment found on a commit message. For instance these lines become valid and generate a defconfig fragment without the indentation of one space to be tested in GitLab CI: test-pkg config: SOME_OPTION=y # OTHER_OPTION is not set SOME_VARIABLE="some value" Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 0ad3ae14c52ed0aac872875ca7f87cdcf6942128) Signed-off-by: Peter Korsgaard --- support/scripts/generate-gitlab-ci-yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index aa43aac019..27f586f1b6 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -91,7 +91,7 @@ gen_tests() { # Retrieve defconfig for test-pkg from the git commit message (if any) if grep -q -E '^test-pkg config:$' <<<"${CI_COMMIT_DESCRIPTION}"; then - sed -r -n -e '/^test-pkg config:$/{:a;n;p;ba;}' \ + sed -r -n -e '/^test-pkg config:$/{:a;n;s/^ +//;p;ba;}' \ <<<"${CI_COMMIT_DESCRIPTION}" \ >defconfig.frag if [ ! -s defconfig.frag ]; then From peter at korsgaard.com Wed Feb 22 16:38:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:38:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/live555: fix build config with locale Message-ID: <20230222170816.2E3E8867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa019b8d64d549541d8f4a754b5d418017a14b85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Using current conditional code, added in 2014: ifndef ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif the define LOCALE_NOT_USED is always passed on CFLAGS, because there is no symbol with following names defined: "(y,y)" -> not defined when BR2_ENABLE_LOCALE=y "(,y)" -> not defined when BR2_ENABLE_LOCALE is not set So fix the typo, switching ifndef to ifneq. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 04a4b86a982e307268d660a38d231315134572fb) Signed-off-by: Peter Korsgaard --- package/live555/live555.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/live555/live555.mk b/package/live555/live555.mk index effd4517cf..56ed705783 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -39,7 +39,7 @@ else LIVE555_CFLAGS += -DNO_OPENSSL endif -ifndef ($(BR2_ENABLE_LOCALE),y) +ifneq ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif From peter at korsgaard.com Wed Feb 22 16:37:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:37:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/fwts: use ifeq instead of ifdef Message-ID: <20230222170816.23AFF867D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a54bc3316155ae95eefc597d5780cb5d3078e13 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The conditional code using ifdef was added in 2018 and works as expected. But there is no reason to use ifdef instead of ifeq. For consistence, switch to use ifeq like almost all packages already do. Cc: Arnout Vandecappelle Cc: Erico Nunes Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit e6ae82531928662764536cadbe2d6f3c558e7de2) Signed-off-by: Peter Korsgaard --- package/fwts/fwts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index 6634cdc40e..cd9bccae2c 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -15,7 +15,7 @@ FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) -ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE +ifeq ($(BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE),y) FWTS_MODULE_SUBDIRS = efi_runtime $(eval $(kernel-module)) endif From peter at korsgaard.com Wed Feb 22 16:41:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:41:57 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] utils/checkpackagelib: warn about ifdef on .mk Message-ID: <20230222170816.5AD56867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13c79ad4a57930f42516763937eb8f4d731fa1c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x There are two legitimate cases to prefer ifdef over ifeq in package recipes: command-line overrides are allowed for busybox and uclibc configs. Except for that, all package in tree already use ifeq, so warn the developer adding/changing a package to use ifeq instead of ifdef, in order to keep consistence across packages. file.mk:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL file.mk:5: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL The difference between ifeq and ifdef is that ifdef doesn't expand recursively. Add comments to busybox and uclibc packages to avoid a warning in such special cases. Cc: Arnout Vandecappelle Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 29c9b4435503d1b3130ce37dcab88c89156b1481) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 1 + package/uclibc/uclibc.mk | 1 + utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++ utils/checkpackagelib/test_lib_mk.py | 48 ++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 0f14bf999d..f8f9cb5616 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -110,6 +110,7 @@ BUSYBOX_MAKE_OPTS = \ # specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config # setting. +# check-package disable Ifdef ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 5006aa0cb6..2621361157 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -22,6 +22,7 @@ UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting. +# check-package disable Ifdef ifndef UCLIBC_CONFIG_FILE UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG)) endif diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index b50a19ac62..8adf844e9a 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -21,6 +21,24 @@ continue_conditional = ["elif", "else"] end_conditional = ["endif"] +class Ifdef(_CheckFunction): + IFDEF = re.compile(r"^\s*(else\s+|)(ifdef|ifndef)\s") + + def check_line(self, lineno, text): + m = self.IFDEF.search(text) + if m is None: + return + word = m.group(2) + if word == 'ifdef': + return ["{}:{}: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL" + .format(self.filename, lineno), + text] + else: + return ["{}:{}: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL" + .format(self.filename, lineno), + text] + + class Indent(_CheckFunction): COMMENT = re.compile(r"^\s*#") CONDITIONAL = re.compile(r"^\s*({})\s".format("|".join(start_conditional + end_conditional + continue_conditional))) diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 49fa216fcd..80a1736b4e 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -3,6 +3,54 @@ import checkpackagelib.test_util as util import checkpackagelib.lib_mk as m +Ifdef = [ + ('ignore commented line', + 'any', + '# ifdef\n', + []), + ('simple', + 'any', + '\n' + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n' + 'endif\n', + [['any:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n']]), + ('ignore indentation', + 'any', + ' ifdef FOO\n' + ' endif\n' + '\tifdef BAR\n' + 'endif\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + ' ifdef FOO\n'], + ['any:3: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + '\tifdef BAR\n']]), + ('typo', + 'any', + '\n' + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n' + 'endif\n', + [['any:2: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n']]), + ('else ifdef', + 'any', + 'else ifdef SYMBOL # comment\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'else ifdef SYMBOL # comment\n']]), + ('else ifndef', + 'any', + '\t else ifndef\t($(SYMBOL),y) # comment\n', + [['any:1: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + '\t else ifndef\t($(SYMBOL),y) # comment\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Ifdef) +def test_Ifdef(testname, filename, string, expected): + warnings = util.check_file(m.Ifdef, filename, string) + assert warnings == expected + + Indent = [ ('ignore comment at beginning of line', 'any', From peter at korsgaard.com Wed Feb 22 16:39:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:39:44 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pugixml: fix configuration options Message-ID: <20230222170816.4608B867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef6d357f261bb9209e781f9ca7e33b7bd28b653d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit upstream 1c5a0bb32583fd294022e68e66b541bf6ff71a67 ":sparkles: Update CMake to modern approach" removed all feature toogles, so starting from release v1.11 any flag passed in BUILD_DEFINES was completely ignored during the build. Version 1.11.4 was in use in buildroot since February 2021. Commit upstream 0f1e75a902ef1751dd63a67fe223b5e8daf4c7f1 "Re-introduced the custom build defines" added PUGIXML_BUILD_DEFINES to release v1.12, but BUILD_DEFINES is still completely ignored during the build. Version 1.12.1 is in use in buildroot since March 2022. So switch the config options to use PUGIXML_BUILD_DEFINES instead of BUILD_DEFINES. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit cc3a4a7b1de7b158354c650d234339e8a969a730) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index e77ab1a799..bbcb913da6 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -29,11 +29,11 @@ ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif -PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" +PUGIXML_CONF_OPTS += -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" HOST_PUGIXML_CONF_OPTS += \ -DBUILD_PKGCONFIG=ON \ - -DBUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" + -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" $(eval $(cmake-package)) $(eval $(host-cmake-package)) From peter at korsgaard.com Wed Feb 22 16:39:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:39:07 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pugixml: unconditionally set BUILD_DEFINES Message-ID: <20230222170816.38F88867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fe2713152e60fe63e8fc78d9baf58fee18a3473 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The ifdef construct intended to avoid passing -DBUILD_DEFINES="" was never needed, because even upstream version v1.9 used in 2019 when the configuration options were added, can handle an empty string for BUILD_DEFINES. In fact an empty string is the default for v1.9 if it is not passed during configure. Also, the host variant already sets BUILD_DEFINES unconditionally. So remove the unneeded conditional. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 01cb02cfaecb34fd7d413775673e78272c68f85f) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index bc018180ef..e77ab1a799 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -29,9 +29,7 @@ ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif -ifdef PUGIXML_BUILD_DEFINES PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" -endif HOST_PUGIXML_CONF_OPTS += \ -DBUILD_PKGCONFIG=ON \ From peter at korsgaard.com Wed Feb 22 16:45:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:45:46 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] system: remove use of legacy md5 option Message-ID: <20230222170816.76169867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=253ee5b11f643a08fa7d144c5d5abeb4fb6ce1a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "bf3626002f system cfg: remove mkpasswd MD5 format option", from release 2019.02, moved the symbol to legacy handling, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 032cfbc716749869b185f83dab450ec47f969765) Signed-off-by: Peter Korsgaard --- system/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/system/Config.in b/system/Config.in index 34b0a9a3a4..3db03dce64 100644 --- a/system/Config.in +++ b/system/Config.in @@ -78,7 +78,6 @@ endchoice # Passwd encoding config BR2_TARGET_GENERIC_PASSWD_METHOD string - default "md5" if BR2_TARGET_GENERIC_PASSWD_MD5 default "sha-256" if BR2_TARGET_GENERIC_PASSWD_SHA256 default "sha-512" if BR2_TARGET_GENERIC_PASSWD_SHA512 From peter at korsgaard.com Wed Feb 22 16:44:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:44:48 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] toolchain/toolchain-buildroot: add comment about using virtual package infra Message-ID: <20230222170816.63A29867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48351fe47d2d0390687f9a401fc684076eae2936 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "9a8ec9195c toolchain/toolchain-buildroot: migrate to virtual package infrastructure" made the packages toolchain and toolchain-buildroot to use the virtual package infra even they being generic packages. This works because on package/pkg-virtual.mk when a package do not define neither _PROVIDES_ or _HAS_ symbols, only _IS_VIRTUAL is set to YES and _VERSION and _SOURCE are set to empty before relaying the call to inner-generic-package. Add a comment explaining why the virtual package infra is used in these cases. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Yann E. MORIN Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit abcecd737b198e8a1a48bf4533e5c2b8de8b8cf4) Signed-off-by: Peter Korsgaard --- toolchain/toolchain-buildroot/toolchain-buildroot.mk | 3 +++ toolchain/toolchain/toolchain.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk index b30cc332d2..6da64b7c77 100644 --- a/toolchain/toolchain-buildroot/toolchain-buildroot.mk +++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk @@ -14,4 +14,7 @@ TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-buildroot-virtual +# instead of toolchain-buildroot-undefined) $(eval $(virtual-package)) diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index 18f1dbea1a..ac60a7b248 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -47,4 +47,7 @@ endef TOOLCHAIN_POST_INSTALL_TARGET_HOOKS += TOOLCHAIN_GLIBC_COPY_NSSWITCH_FILE endif +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-virtual instead +# of toolchain-undefined) $(eval $(virtual-package)) From peter at korsgaard.com Wed Feb 22 16:50:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:50:12 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/sunxi-mali-utgard: properly handle legacy for renamed options Message-ID: <20230222170816.C88FF867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fb4e35b33d42cb43c605d1e3d63ebbbfcb334e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "6a7a652b14 package/sunxi-mali-utgard: rename from sunxi-mali-mainline" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2022.02, following the example described in the beginning of the file. Cc: Giulio Benetti Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit efc223abd4fe764f8af8238aec67e8cb700db45e) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/sunxi-mali-utgard/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e9159782b8..6cc4f47609 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -470,20 +470,22 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 bool "sunxi-mali-mainline-r6p2 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 bool "sunxi-mali-mainline-r8p1 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_QT5WEBKIT_EXAMPLES bool "qt5webkit-examples removed" diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in index ff49ea03f1..59ac21f5ab 100644 --- a/package/sunxi-mali-utgard/Config.in +++ b/package/sunxi-mali-utgard/Config.in @@ -20,6 +20,8 @@ config BR2_PACKAGE_PROVIDES_LIBGLES choice prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 # legacy + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 # legacy default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help Select the version of the userspace module. From peter at korsgaard.com Wed Feb 22 16:37:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:37:20 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/fwts: use ifeq instead of ifdef Message-ID: <20230222170818.76CD382261@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4236802adc320e130c3838a9225584bfc0bf57c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The conditional code using ifdef was added in 2018 and works as expected. But there is no reason to use ifdef instead of ifeq. For consistence, switch to use ifeq like almost all packages already do. Cc: Arnout Vandecappelle Cc: Erico Nunes Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit e6ae82531928662764536cadbe2d6f3c558e7de2) Signed-off-by: Peter Korsgaard --- package/fwts/fwts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index b208aa0c14..f04c7a848f 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -15,7 +15,7 @@ FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) -ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE +ifeq ($(BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE),y) FWTS_MODULE_SUBDIRS = efi_runtime $(eval $(kernel-module)) endif From peter at korsgaard.com Wed Feb 22 16:47:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:47:45 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gcc: properly handle legacy for renamed ARC option Message-ID: <20230222170816.99422867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85dcee4664d8d293aeb16c116c374bf528975334 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "50332a530b gcc: rename option for ARC gcc" tried to add legacy handling but the new symbol is part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2016.11, following the example described in the beginning of the file. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit eb8f38891b16e5fb0f010c658b271e22670a1633) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 3 ++- package/gcc/Config.in.host | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6f5d01709a..47e2d48e58 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -3809,10 +3809,11 @@ config BR2_LINUX_KERNEL_TOOL_SELFTESTS config BR2_GCC_VERSION_4_8_ARC bool "gcc arc option renamed" select BR2_LEGACY - select BR2_GCC_VERSION_ARC help The option that selects the gcc version for the ARC architecture has been renamed to BR2_GCC_VERSION_ARC. +# Note: BR2_GCC_VERSION_4_8_ARC is still referenced from +# package/gcc/Config.in.host config BR2_KERNEL_HEADERS_4_0 bool "kernel headers version 4.0.x are no longer supported" diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 84f7a71c9c..48aa8785f0 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -2,6 +2,7 @@ comment "GCC Options" choice prompt "GCC compiler Version" + default BR2_GCC_VERSION_ARC if BR2_GCC_VERSION_4_8_ARC # legacy default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_POWERPC_SPE if BR2_powerpc_SPE default BR2_GCC_VERSION_10_X From peter at korsgaard.com Wed Feb 22 16:48:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:48:21 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/lua: properly handle legacy for removed version Message-ID: <20230222170816.A45E2867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=22b99575bdd79222c0f6e78eb401261abc930de7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "297613f1c7 package/lua: remove 5.2.x version" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2019.02, following the example described in the beginning of the file. Cc: Francois Perrad Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit f461543d9c0f8ea1586004e51561ba0a37b8aecf) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- package/lua/Config.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 47e2d48e58..0ed989f8b0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -1933,9 +1933,9 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD config BR2_PACKAGE_LUA_5_2 bool "Lua 5.2.x version removed" select BR2_LEGACY - select BR2_PACKAGE_LUA_5_3 help The Lua 5.2.x version was removed. +# Note: BR2_PACKAGE_LUA_5_2 is still referenced from package/lua/Config.in config BR2_TARGET_GENERIC_PASSWD_MD5 bool "target passwd md5 format support has been removed" diff --git a/package/lua/Config.in b/package/lua/Config.in index 309dd6eec2..8fa9f9b7ab 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER choice prompt "Lua Version" + default BR2_PACKAGE_LUA_5_3 if BR2_PACKAGE_LUA_5_2 # legacy default BR2_PACKAGE_LUA_5_4 help Select the version of Lua API/ABI you wish to use. From peter at korsgaard.com Wed Feb 22 16:45:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:45:13 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] boot/uboot: remove use of legacy xloader symbol Message-ID: <20230222170816.6C4B8867D5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ba34e0e3d59917e9c3645e738ba1faa472b48a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "070b183d0c boot/xloader: remove package", from release 2018.11, removed the package, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 9b1b1763b754f8a25cf0f2a7fe05e53d256fe675) Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 953c36135e..3fe2a94ff9 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -414,7 +414,6 @@ endif config BR2_TARGET_UBOOT_SPL bool "Install U-Boot SPL binary image" - depends on !BR2_TARGET_XLOADER help Install the U-Boot SPL binary image to the images directory. From peter at korsgaard.com Wed Feb 22 16:43:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:43:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/pugixml: fix configuration options Message-ID: <20230222170818.98AB0867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85b4570d63762886188122aec3771d79fbab3660 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit upstream 1c5a0bb32583fd294022e68e66b541bf6ff71a67 ":sparkles: Update CMake to modern approach" removed all feature toogles, so starting from release v1.11 any flag passed in BUILD_DEFINES was completely ignored during the build. Version 1.11.4 was in use in buildroot since February 2021. Commit upstream 0f1e75a902ef1751dd63a67fe223b5e8daf4c7f1 "Re-introduced the custom build defines" added PUGIXML_BUILD_DEFINES to release v1.12, but BUILD_DEFINES is still completely ignored during the build. Version 1.12.1 is in use in buildroot since March 2022. So switch the config options to use PUGIXML_BUILD_DEFINES instead of BUILD_DEFINES. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit cc3a4a7b1de7b158354c650d234339e8a969a730) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 6c756e9c29..c54148d98f 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -29,11 +29,11 @@ ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif -PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" +PUGIXML_CONF_OPTS += -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" HOST_PUGIXML_CONF_OPTS += \ -DBUILD_PKGCONFIG=ON \ - -DBUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" + -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" $(eval $(cmake-package)) $(eval $(host-cmake-package)) From peter at korsgaard.com Wed Feb 22 16:37:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:37:09 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/scripts/generate-gitlab-ci-yml: improve test-pkg support Message-ID: <20230222170818.69B09867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=feebcb90a245e9293b1eb50f3aed64e9d1574134 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Following the example of test-pkg config described in commit "12c7a05da1 utils/test-pkg: add gitlab-ci support" to test a defconfig fragment that contains a disabled option is currently possible, but it do requires one to change the git config core.commentChart so the lines starting with "#" are not discarded by git when creating/editing the commit message. For instance, without the indentation the 3rd line below would be excluded from the commit message when the editor is closed: test-pkg config: SOME_OPTION=y # OTHER_OPTION is not set SOME_VARIABLE="some value" Requiring to change git configs is not very nice. So make the developer's life easier by changing the sed expression to remove indentation with spaces from a defconfig fragment found on a commit message. For instance these lines become valid and generate a defconfig fragment without the indentation of one space to be tested in GitLab CI: test-pkg config: SOME_OPTION=y # OTHER_OPTION is not set SOME_VARIABLE="some value" Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 0ad3ae14c52ed0aac872875ca7f87cdcf6942128) Signed-off-by: Peter Korsgaard --- support/scripts/generate-gitlab-ci-yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index aa43aac019..27f586f1b6 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -91,7 +91,7 @@ gen_tests() { # Retrieve defconfig for test-pkg from the git commit message (if any) if grep -q -E '^test-pkg config:$' <<<"${CI_COMMIT_DESCRIPTION}"; then - sed -r -n -e '/^test-pkg config:$/{:a;n;p;ba;}' \ + sed -r -n -e '/^test-pkg config:$/{:a;n;s/^ +//;p;ba;}' \ <<<"${CI_COMMIT_DESCRIPTION}" \ >defconfig.frag if [ ! -s defconfig.frag ]; then From peter at korsgaard.com Wed Feb 22 16:44:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:44:43 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] toolchain/toolchain-buildroot: add comment about using virtual package infra Message-ID: <20230222170818.C3A38867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=972ad2022e2757eb43d2cea328fc583fbfdaf408 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "9a8ec9195c toolchain/toolchain-buildroot: migrate to virtual package infrastructure" made the packages toolchain and toolchain-buildroot to use the virtual package infra even they being generic packages. This works because on package/pkg-virtual.mk when a package do not define neither _PROVIDES_ or _HAS_ symbols, only _IS_VIRTUAL is set to YES and _VERSION and _SOURCE are set to empty before relaying the call to inner-generic-package. Add a comment explaining why the virtual package infra is used in these cases. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Yann E. MORIN Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit abcecd737b198e8a1a48bf4533e5c2b8de8b8cf4) Signed-off-by: Peter Korsgaard --- toolchain/toolchain-buildroot/toolchain-buildroot.mk | 3 +++ toolchain/toolchain/toolchain.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk index b30cc332d2..6da64b7c77 100644 --- a/toolchain/toolchain-buildroot/toolchain-buildroot.mk +++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk @@ -14,4 +14,7 @@ TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-buildroot-virtual +# instead of toolchain-buildroot-undefined) $(eval $(virtual-package)) diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index 18f1dbea1a..ac60a7b248 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -47,4 +47,7 @@ endef TOOLCHAIN_POST_INSTALL_TARGET_HOOKS += TOOLCHAIN_GLIBC_COPY_NSSWITCH_FILE endif +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-virtual instead +# of toolchain-undefined) $(eval $(virtual-package)) From peter at korsgaard.com Wed Feb 22 16:41:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:41:33 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/busybox: add comment about variable override Message-ID: <20230222170816.50479867D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0776d7c18e95fe0d33e832c578ec59e3dbf00f9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The same comment already exists for UCLIBC_CONFIG_FILE. Both variables can be override from command-line, as described in the manual, at section 'Environment variables'. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 01c0fb3862bce6605881d9e32c29b5f7373bb2f9) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index ef628e90e9..0f14bf999d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -108,6 +108,8 @@ BUSYBOX_MAKE_OPTS = \ CONFIG_PREFIX="$(TARGET_DIR)" \ SKIP_STRIP=y +# specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config +# setting. ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif From peter at korsgaard.com Wed Feb 22 16:49:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:49:31 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openjdk: properly handle legacy for renamed options Message-ID: <20230222170816.BE522867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=749129b54a81a9b798202e355c31dff62930b434 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "a610bf9967 package/openjdk{-bin}: bump version to 17.0.1+12" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2021.11, following the example described in the beginning of the file. Cc: Tudor Holton Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit a97a4a74aa993b09b958639e2276e7f5cf7a75d2) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/openjdk/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 1b8d197882..e9159782b8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -541,18 +541,20 @@ comment "Legacy options removed in 2021.11" config BR2_OPENJDK_VERSION_LTS bool "OpenJDK LTS version was renamed to OpenJDK 11" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_11 help The LTS version option was renamed to OpenJDK 11 to make it clear what LTS version is. +# Note: BR2_OPENJDK_VERSION_LTS is still referenced from +# package/openjdk/Config.in config BR2_OPENJDK_VERSION_LATEST bool "OpenJDK latest version (16.x) was removed" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_17 help OpenJDK 16.x is no longer mainted, so the option has been removed. Use OpenJDK 17.x instead. +# Note: BR2_OPENJDK_VERSION_LATEST is still referenced from +# package/openjdk/Config.in config BR2_PACKAGE_MPD_TIDAL bool "mpd tidal option removed" diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 8b7fd4653e..7671356fdd 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -56,6 +56,8 @@ if BR2_PACKAGE_OPENJDK choice prompt "openjdk version" + default BR2_PACKAGE_OPENJDK_VERSION_11 if BR2_OPENJDK_VERSION_LTS # legacy + default BR2_PACKAGE_OPENJDK_VERSION_17 if BR2_OPENJDK_VERSION_LATEST # legacy default BR2_PACKAGE_OPENJDK_VERSION_17 help Select the version of OpenJDK you wish to use. From peter at korsgaard.com Wed Feb 22 16:43:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:43:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/pugixml: unconditionally set BUILD_DEFINES Message-ID: <20230222170818.8E7FF867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4dd50584123986cb032776a3ede0c62eeb11fab7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The ifdef construct intended to avoid passing -DBUILD_DEFINES="" was never needed, because even upstream version v1.9 used in 2019 when the configuration options were added, can handle an empty string for BUILD_DEFINES. In fact an empty string is the default for v1.9 if it is not passed during configure. Also, the host variant already sets BUILD_DEFINES unconditionally. So remove the unneeded conditional. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 01cb02cfaecb34fd7d413775673e78272c68f85f) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 9137f04630..6c756e9c29 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -29,9 +29,7 @@ ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif -ifdef PUGIXML_BUILD_DEFINES PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" -endif HOST_PUGIXML_CONF_OPTS += \ -DBUILD_PKGCONFIG=ON \ From peter at korsgaard.com Wed Feb 22 16:46:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:46:56 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/openpowerlink: properly handle legacy options Message-ID: <20230222170818.EB8D282261@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9afadcbe5cef8346caa4fc6569c151dbabae43f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "b1063a0136 package/openpowerlink: bump to v2.2.2" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2016.02, following the example described in the beginning of the file. Cc: Romain Naour Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit e1e4f3950719dd92a2456e2c45856f8cf5dc587e) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/openpowerlink/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 98861137d2..5ffeb01af3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4327,19 +4327,21 @@ config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB help openpowerlink kernel modules are built if the kernel stack library is selected. +# Note: BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE is still referenced from +# package/openpowerlink/Config.in config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - a monolithic user space library - a user space daemon driver +# Note: BR2_PACKAGE_OPENPOWERLINK_LIBPCAP is still referenced from +# package/openpowerlink/Config.in config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in index 1a3dd62acd..ef59a04baf 100644 --- a/package/openpowerlink/Config.in +++ b/package/openpowerlink/Config.in @@ -38,6 +38,8 @@ endchoice choice prompt "stack type" + default BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB if BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE # legacy + default BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB if BR2_PACKAGE_OPENPOWERLINK_LIBPCAP # legacy config BR2_PACKAGE_OPENPOWERLINK_STACK_MONOLITHIC_USER_STACK_LIB bool "linked into application" From peter at korsgaard.com Wed Feb 22 16:48:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:48:49 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/ti-sgx-km: properly handle legacy for removed options Message-ID: <20230222170816.AF508867D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a01ee07c7925b3a8f0ced7c7b85a8b714cb2aba9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "c38b5566fe package/ti-sgx-{km, um, demos}: bump to latest TI version", added in release 2020.02, removed some options that were previously renamed in release 2018.05. Update the legacy entry for 2018.05 and add the corresponding legacy entries for 2020.02. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit b2661fe63990386cf2626ce1dd26919346ca86c0) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 66 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 0ed989f8b0..1b8d197882 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -1468,6 +1468,35 @@ config BR2_PACKAGE_RPI_USERLAND_START_VCFILED help The vcfiled support was removed upstream. +config BR2_PACKAGE_TI_SGX_KM_AM335X + bool "ti-sgx-km AM335X option removed" + select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM437X + bool "ti-sgx-km AM437X option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM4430 + bool "ti-sgx-km AM4430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM5430 + bool "ti-sgx-km AM5430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + comment "Legacy options removed in 2019.11" config BR2_PACKAGE_OPENVMTOOLS_PROCPS @@ -2441,45 +2470,34 @@ config BR2_PACKAGE_MEDIAART_BACKEND_QT BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_QT -# Note: BR2_PACKAGE_TI_SGX_AM335X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM335X - bool "ti-sgx-km AM335X option renamed" + bool "ti-sgx-km AM335X option removed" select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM335X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM335X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM437X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM437X - bool "ti-sgx-km AM437X option renamed" + bool "ti-sgx-km AM437X option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM437X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM437X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM4430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM4430 - bool "ti-sgx-km AM4430 option renamed" + bool "ti-sgx-km AM4430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM4430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM4430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM5430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM5430 - bool "ti-sgx-km AM5430 option renamed" + bool "ti-sgx-km AM5430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM5430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM5430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. config BR2_PACKAGE_JANUS_AUDIO_BRIDGE bool "janus-gateway audio-bridge option renamed" From peter at korsgaard.com Wed Feb 22 16:48:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:48:58 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/ti-sgx-km: properly handle legacy for removed options Message-ID: <20230222170819.1957982261@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c573c30a2e76b9c711288ae9a902d415491f9c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "c38b5566fe package/ti-sgx-{km, um, demos}: bump to latest TI version", added in release 2020.02, removed some options that were previously renamed in release 2018.05. Update the legacy entry for 2018.05 and add the corresponding legacy entries for 2020.02. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit b2661fe63990386cf2626ce1dd26919346ca86c0) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 66 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5758d408f6..aa1e31d8d6 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -1643,6 +1643,35 @@ config BR2_PACKAGE_RPI_USERLAND_START_VCFILED help The vcfiled support was removed upstream. +config BR2_PACKAGE_TI_SGX_KM_AM335X + bool "ti-sgx-km AM335X option removed" + select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM437X + bool "ti-sgx-km AM437X option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM4430 + bool "ti-sgx-km AM4430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM5430 + bool "ti-sgx-km AM5430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + comment "Legacy options removed in 2019.11" config BR2_PACKAGE_OPENVMTOOLS_PROCPS @@ -2616,45 +2645,34 @@ config BR2_PACKAGE_MEDIAART_BACKEND_QT BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_QT -# Note: BR2_PACKAGE_TI_SGX_AM335X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM335X - bool "ti-sgx-km AM335X option renamed" + bool "ti-sgx-km AM335X option removed" select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM335X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM335X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM437X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM437X - bool "ti-sgx-km AM437X option renamed" + bool "ti-sgx-km AM437X option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM437X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM437X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM4430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM4430 - bool "ti-sgx-km AM4430 option renamed" + bool "ti-sgx-km AM4430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM4430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM4430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM5430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM5430 - bool "ti-sgx-km AM5430 option renamed" + bool "ti-sgx-km AM5430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM5430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM5430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. config BR2_PACKAGE_JANUS_AUDIO_BRIDGE bool "janus-gateway audio-bridge option renamed" From peter at korsgaard.com Wed Feb 22 16:45:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:45:42 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] system: remove use of legacy md5 option Message-ID: <20230222170818.D6798867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f513808d04edee344bcbab3ec7951bd9110c482d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "bf3626002f system cfg: remove mkpasswd MD5 format option", from release 2019.02, moved the symbol to legacy handling, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 032cfbc716749869b185f83dab450ec47f969765) Signed-off-by: Peter Korsgaard --- system/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/system/Config.in b/system/Config.in index e6dcd25455..bf65b07a76 100644 --- a/system/Config.in +++ b/system/Config.in @@ -78,7 +78,6 @@ endchoice # Passwd encoding config BR2_TARGET_GENERIC_PASSWD_METHOD string - default "md5" if BR2_TARGET_GENERIC_PASSWD_MD5 default "sha-256" if BR2_TARGET_GENERIC_PASSWD_SHA256 default "sha-512" if BR2_TARGET_GENERIC_PASSWD_SHA512 From peter at korsgaard.com Wed Feb 22 16:46:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:46:15 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/linux-headers: remove bogus symbol BR2_PACKAGE_HOST_LINUX_HEADERS Message-ID: <20230222170816.828FA867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d91470731e28e3c6c42e95e5c405b6e8ff975feb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The package host-linux-headers does not exist and there were never references to this symbol in the tree, do drop it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 367bd65f3c216426e2fc21742dbff11ea8d896d7) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f6654f8578..775ec2cb67 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -1,8 +1,5 @@ comment "Kernel Header Options" -config BR2_PACKAGE_HOST_LINUX_HEADERS - bool - choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL From peter at korsgaard.com Wed Feb 22 16:43:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:43:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] utils/checkpackagelib: warn about ifdef on .mk Message-ID: <20230222170818.BA79A867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21691c1a49426e765ab5fb321ea7002d5b3bf6d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x There are two legitimate cases to prefer ifdef over ifeq in package recipes: command-line overrides are allowed for busybox and uclibc configs. Except for that, all package in tree already use ifeq, so warn the developer adding/changing a package to use ifeq instead of ifdef, in order to keep consistence across packages. file.mk:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL file.mk:5: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL The difference between ifeq and ifdef is that ifdef doesn't expand recursively. Add comments to busybox and uclibc packages to avoid a warning in such special cases. Cc: Arnout Vandecappelle Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 29c9b4435503d1b3130ce37dcab88c89156b1481) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 1 + package/uclibc/uclibc.mk | 1 + utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++ utils/checkpackagelib/test_lib_mk.py | 48 ++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 0f14bf999d..f8f9cb5616 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -110,6 +110,7 @@ BUSYBOX_MAKE_OPTS = \ # specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config # setting. +# check-package disable Ifdef ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 0ddf7dfa6d..125aa4cdcf 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -22,6 +22,7 @@ UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting. +# check-package disable Ifdef ifndef UCLIBC_CONFIG_FILE UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG)) endif diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index b50a19ac62..8adf844e9a 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -21,6 +21,24 @@ continue_conditional = ["elif", "else"] end_conditional = ["endif"] +class Ifdef(_CheckFunction): + IFDEF = re.compile(r"^\s*(else\s+|)(ifdef|ifndef)\s") + + def check_line(self, lineno, text): + m = self.IFDEF.search(text) + if m is None: + return + word = m.group(2) + if word == 'ifdef': + return ["{}:{}: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL" + .format(self.filename, lineno), + text] + else: + return ["{}:{}: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL" + .format(self.filename, lineno), + text] + + class Indent(_CheckFunction): COMMENT = re.compile(r"^\s*#") CONDITIONAL = re.compile(r"^\s*({})\s".format("|".join(start_conditional + end_conditional + continue_conditional))) diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 49fa216fcd..80a1736b4e 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -3,6 +3,54 @@ import checkpackagelib.test_util as util import checkpackagelib.lib_mk as m +Ifdef = [ + ('ignore commented line', + 'any', + '# ifdef\n', + []), + ('simple', + 'any', + '\n' + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n' + 'endif\n', + [['any:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n']]), + ('ignore indentation', + 'any', + ' ifdef FOO\n' + ' endif\n' + '\tifdef BAR\n' + 'endif\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + ' ifdef FOO\n'], + ['any:3: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + '\tifdef BAR\n']]), + ('typo', + 'any', + '\n' + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n' + 'endif\n', + [['any:2: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n']]), + ('else ifdef', + 'any', + 'else ifdef SYMBOL # comment\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'else ifdef SYMBOL # comment\n']]), + ('else ifndef', + 'any', + '\t else ifndef\t($(SYMBOL),y) # comment\n', + [['any:1: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + '\t else ifndef\t($(SYMBOL),y) # comment\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Ifdef) +def test_Ifdef(testname, filename, string, expected): + warnings = util.check_file(m.Ifdef, filename, string) + assert warnings == expected + + Indent = [ ('ignore comment at beginning of line', 'any', From peter at korsgaard.com Wed Feb 22 16:47:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:47:06 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openpowerlink: properly handle legacy options Message-ID: <20230222170816.8E8A1867D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=693f779fe85292ae9cae612867afe4de05f3cfcc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit "b1063a0136 package/openpowerlink: bump to v2.2.2" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2016.02, following the example described in the beginning of the file. Cc: Romain Naour Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit e1e4f3950719dd92a2456e2c45856f8cf5dc587e) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/openpowerlink/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5000c7a7be..6f5d01709a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -4152,19 +4152,21 @@ config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB help openpowerlink kernel modules are built if the kernel stack library is selected. +# Note: BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE is still referenced from +# package/openpowerlink/Config.in config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - a monolithic user space library - a user space daemon driver +# Note: BR2_PACKAGE_OPENPOWERLINK_LIBPCAP is still referenced from +# package/openpowerlink/Config.in config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in index 1a3dd62acd..ef59a04baf 100644 --- a/package/openpowerlink/Config.in +++ b/package/openpowerlink/Config.in @@ -38,6 +38,8 @@ endchoice choice prompt "stack type" + default BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB if BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE # legacy + default BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB if BR2_PACKAGE_OPENPOWERLINK_LIBPCAP # legacy config BR2_PACKAGE_OPENPOWERLINK_STACK_MONOLITHIC_USER_STACK_LIB bool "linked into application" From peter at korsgaard.com Wed Feb 22 16:48:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:48:16 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/lua: properly handle legacy for removed version Message-ID: <20230222170819.0C995867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=768ecb25b245feb5b1269f2b449590486e843401 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "297613f1c7 package/lua: remove 5.2.x version" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2019.02, following the example described in the beginning of the file. Cc: Francois Perrad Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit f461543d9c0f8ea1586004e51561ba0a37b8aecf) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- package/lua/Config.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6c3384f445..5758d408f6 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2108,9 +2108,9 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD config BR2_PACKAGE_LUA_5_2 bool "Lua 5.2.x version removed" select BR2_LEGACY - select BR2_PACKAGE_LUA_5_3 help The Lua 5.2.x version was removed. +# Note: BR2_PACKAGE_LUA_5_2 is still referenced from package/lua/Config.in config BR2_TARGET_GENERIC_PASSWD_MD5 bool "target passwd md5 format support has been removed" diff --git a/package/lua/Config.in b/package/lua/Config.in index 309dd6eec2..8fa9f9b7ab 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER choice prompt "Lua Version" + default BR2_PACKAGE_LUA_5_3 if BR2_PACKAGE_LUA_5_2 # legacy default BR2_PACKAGE_LUA_5_4 help Select the version of Lua API/ABI you wish to use. From peter at korsgaard.com Wed Feb 22 16:43:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:43:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/live555: fix build config with locale Message-ID: <20230222170818.80416867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a6d8ee54041bd23af01064d125b37cad99f6e68d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Using current conditional code, added in 2014: ifndef ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif the define LOCALE_NOT_USED is always passed on CFLAGS, because there is no symbol with following names defined: "(y,y)" -> not defined when BR2_ENABLE_LOCALE=y "(,y)" -> not defined when BR2_ENABLE_LOCALE is not set So fix the typo, switching ifndef to ifneq. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 04a4b86a982e307268d660a38d231315134572fb) Signed-off-by: Peter Korsgaard --- package/live555/live555.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/live555/live555.mk b/package/live555/live555.mk index effd4517cf..56ed705783 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -39,7 +39,7 @@ else LIVE555_CFLAGS += -DNO_OPENSSL endif -ifndef ($(BR2_ENABLE_LOCALE),y) +ifneq ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif From peter at korsgaard.com Wed Feb 22 16:49:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:49:26 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/openjdk: properly handle legacy for renamed options Message-ID: <20230222170819.27475867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0734a1da838393d640dac8cf5e01c133b82bfde9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "a610bf9967 package/openjdk{-bin}: bump version to 17.0.1+12" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2021.11, following the example described in the beginning of the file. Cc: Tudor Holton Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit a97a4a74aa993b09b958639e2276e7f5cf7a75d2) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/openjdk/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index aa1e31d8d6..f3f5b6cf66 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -716,18 +716,20 @@ comment "Legacy options removed in 2021.11" config BR2_OPENJDK_VERSION_LTS bool "OpenJDK LTS version was renamed to OpenJDK 11" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_11 help The LTS version option was renamed to OpenJDK 11 to make it clear what LTS version is. +# Note: BR2_OPENJDK_VERSION_LTS is still referenced from +# package/openjdk/Config.in config BR2_OPENJDK_VERSION_LATEST bool "OpenJDK latest version (16.x) was removed" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_17 help OpenJDK 16.x is no longer mainted, so the option has been removed. Use OpenJDK 17.x instead. +# Note: BR2_OPENJDK_VERSION_LATEST is still referenced from +# package/openjdk/Config.in config BR2_PACKAGE_MPD_TIDAL bool "mpd tidal option removed" diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 8fbe51a27f..24a56e6b84 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -57,6 +57,8 @@ if BR2_PACKAGE_OPENJDK choice prompt "openjdk version" + default BR2_PACKAGE_OPENJDK_VERSION_11 if BR2_OPENJDK_VERSION_LTS # legacy + default BR2_PACKAGE_OPENJDK_VERSION_17 if BR2_OPENJDK_VERSION_LATEST # legacy default BR2_PACKAGE_OPENJDK_VERSION_17 help Select the version of OpenJDK you wish to use. From peter at korsgaard.com Wed Feb 22 16:50:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:50:16 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/sunxi-mali-utgard: properly handle legacy for renamed options Message-ID: <20230222170819.34A93867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fa653b1180646cf2ab3965514c10d6ad1f109f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "6a7a652b14 package/sunxi-mali-utgard: rename from sunxi-mali-mainline" tried to add legacy handling but the new symbols are part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2022.02, following the example described in the beginning of the file. Cc: Giulio Benetti Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit efc223abd4fe764f8af8238aec67e8cb700db45e) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++-- package/sunxi-mali-utgard/Config.in | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f3f5b6cf66..ceb7adfd7c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -645,20 +645,22 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 bool "sunxi-mali-mainline-r6p2 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 bool "sunxi-mali-mainline-r8p1 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_QT5WEBKIT_EXAMPLES bool "qt5webkit-examples removed" diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in index ff49ea03f1..59ac21f5ab 100644 --- a/package/sunxi-mali-utgard/Config.in +++ b/package/sunxi-mali-utgard/Config.in @@ -20,6 +20,8 @@ config BR2_PACKAGE_PROVIDES_LIBGLES choice prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 # legacy + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 # legacy default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help Select the version of the userspace module. From peter at korsgaard.com Wed Feb 22 16:43:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:43:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/busybox: add comment about variable override Message-ID: <20230222170818.AC2FF867D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f188f8aa499ab5a8feddf3bc98ced0eecaf9f215 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The same comment already exists for UCLIBC_CONFIG_FILE. Both variables can be override from command-line, as described in the manual, at section 'Environment variables'. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 01c0fb3862bce6605881d9e32c29b5f7373bb2f9) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index ef628e90e9..0f14bf999d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -108,6 +108,8 @@ BUSYBOX_MAKE_OPTS = \ CONFIG_PREFIX="$(TARGET_DIR)" \ SKIP_STRIP=y +# specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config +# setting. ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif From peter at korsgaard.com Wed Feb 22 16:43:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:43:46 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/pugixml: use explicit build options Message-ID: <20230222170818.A1D2382261@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01f08ce374237ecb7f021194370ddbca04de08e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit upstream 986b7ffd01aedcd4f2aa16e78e4cad9313b6d7b2 "Add Cmake options for pugiconfig.hpp" added feature toogles to release v1.12, including PUGIXML_NO_XPATH and PUGIXML_COMPACT. Commit upstream 5f49f2c6575cc2b7d343f8d41581fe92d69d7b52 "Mark advanced options and removed redundant ones" removed CMake specific support for PUGIXML_HEADER_ONLY and PUGIXML_HAS_LONG_LONG, but they can still be provided using PUGIXML_BUILD_DEFINES, starting from release v1.12. So use the explicit build options PUGIXML_NO_XPATH and PUGIXML_COMPACT, but keep using PUGIXML_BUILD_DEFINES to set PUGIXML_HEADER_ONLY and PUGIXML_HAS_LONG_LONG. Cc: Arnout Vandecappelle Cc: Theo Debrouwere Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit f043f928674e94687d1d3173394142271ca3d397) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index c54148d98f..1cf81c45f3 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -12,6 +12,18 @@ PUGIXML_CPE_ID_VENDOR = pugixml_project PUGIXML_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),y) +PUGIXML_CONF_OPTS += -DPUGIXML_NO_XPATH=OFF +else +PUGIXML_CONF_OPTS += -DPUGIXML_NO_XPATH=ON +endif + +ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y) +PUGIXML_CONF_OPTS += -DPUGIXML_COMPACT=ON +else +PUGIXML_CONF_OPTS += -DPUGIXML_COMPACT=OFF +endif + # Pugixml will automatically enable 'long long' support on C++11 compilers, # which means gcc 4.8+. As gcc always supports the 'long long' type, # force-enable this option to support older gcc versions. See also: @@ -19,12 +31,6 @@ PUGIXML_INSTALL_STAGING = YES PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG HOST_PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG -ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),) -PUGIXML_BUILD_DEFINES += PUGIXML_NO_XPATH -endif -ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y) -PUGIXML_BUILD_DEFINES += PUGIXML_COMPACT -endif ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY endif From peter at korsgaard.com Wed Feb 22 16:45:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:45:18 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] boot/uboot: remove use of legacy xloader symbol Message-ID: <20230222170818.CD19C82261@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89d06caa82ddd0ba259a5c1d302155fa904ac4bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "070b183d0c boot/xloader: remove package", from release 2018.11, removed the package, but the symbol is still referenced. Remove the reference to it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 9b1b1763b754f8a25cf0f2a7fe05e53d256fe675) Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 557472b58b..7b7cad53f1 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -430,7 +430,6 @@ endif config BR2_TARGET_UBOOT_SPL bool "Install U-Boot SPL binary image" - depends on !BR2_TARGET_XLOADER help Install the U-Boot SPL binary image to the images directory. From peter at korsgaard.com Wed Feb 22 16:46:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:46:19 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/linux-headers: remove bogus symbol BR2_PACKAGE_HOST_LINUX_HEADERS Message-ID: <20230222170818.DFBE9867D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d2f70b381a1a13c8913799f4172dcbc3c9cebe2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The package host-linux-headers does not exist and there were never references to this symbol in the tree, do drop it. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit 367bd65f3c216426e2fc21742dbff11ea8d896d7) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 00cc18ea62..7ce514a5fa 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -1,8 +1,5 @@ comment "Kernel Header Options" -config BR2_PACKAGE_HOST_LINUX_HEADERS - bool - choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL From peter at korsgaard.com Wed Feb 22 16:47:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 17:47:50 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/gcc: properly handle legacy for renamed ARC option Message-ID: <20230222170819.01EE7867CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35b29aaa3cf1feb67fea1d4ac17d8185d95d1d6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit "50332a530b gcc: rename option for ARC gcc" tried to add legacy handling but the new symbol is part of a choice, and Kconfig does not enforce the select of a option from a choice. Update the legacy entry for 2016.11, following the example described in the beginning of the file. Cc: Giulio Benetti Cc: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard (cherry picked from commit eb8f38891b16e5fb0f010c658b271e22670a1633) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 3 ++- package/gcc/Config.in.host | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5ffeb01af3..6c3384f445 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -3984,10 +3984,11 @@ config BR2_LINUX_KERNEL_TOOL_SELFTESTS config BR2_GCC_VERSION_4_8_ARC bool "gcc arc option renamed" select BR2_LEGACY - select BR2_GCC_VERSION_ARC help The option that selects the gcc version for the ARC architecture has been renamed to BR2_GCC_VERSION_ARC. +# Note: BR2_GCC_VERSION_4_8_ARC is still referenced from +# package/gcc/Config.in.host config BR2_KERNEL_HEADERS_4_0 bool "kernel headers version 4.0.x are no longer supported" diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index d7fedc9591..cd1b9fa46d 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -2,6 +2,7 @@ comment "GCC Options" choice prompt "GCC compiler Version" + default BR2_GCC_VERSION_ARC if BR2_GCC_VERSION_4_8_ARC # legacy default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_POWERPC_SPE if BR2_powerpc_SPE default BR2_GCC_VERSION_11_X From fontaine.fabrice at gmail.com Wed Feb 22 18:12:54 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 19:12:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/xerces: drop patch Message-ID: <20230222181254.2533041-1-fontaine.fabrice@gmail.com> Drop patch which is not needed since commit 62cab101356c97432da482e168adaf065de65c4f. This patch is actually raising a build failure since bump to version 3.2.4 in commit d2d8f146a9f0ed3b66c4dd470bb76efdbb630a75 and https://github.com/apache/xerces-c/commit/af1935b567c18c8b2de71d6ea97239be60876335: CMake Error at src/CMakeLists.txt:1271 (add_library): Target "xerces-c" links to target "CURL::libcurl" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Fixes: - http://autobuild.buildroot.org/results/c62856a5eeb34714f26235b2d6f8adc4ea612686 Signed-off-by: Fabrice Fontaine --- .../0001-fix-static-linking-with-curl.patch | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 package/xerces/0001-fix-static-linking-with-curl.patch diff --git a/package/xerces/0001-fix-static-linking-with-curl.patch b/package/xerces/0001-fix-static-linking-with-curl.patch deleted file mode 100644 index db38de79fc..0000000000 --- a/package/xerces/0001-fix-static-linking-with-curl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 26e3f1440bbc75c704fc93ff43a2abbfbe4c0203 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 11 Oct 2018 22:56:50 +0200 -Subject: [PATCH] fix static linking with curl - -When curl is statically built with openssl support, xerces needs to -link with openssl libraries so use pkg_check_modules to get any -needed dependencies - -Fixes: - - http://autobuild.buildroot.org/results/29ca90fff2c8e38f2edf7240eca3aa3fe7397c45 - -Signed-off-by: Fabrice Fontaine ---- - cmake/XercesNetAccessorSelection.cmake | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/cmake/XercesNetAccessorSelection.cmake b/cmake/XercesNetAccessorSelection.cmake -index 7a63f1f6b..e90fcf034 100644 ---- a/cmake/XercesNetAccessorSelection.cmake -+++ b/cmake/XercesNetAccessorSelection.cmake -@@ -31,7 +31,13 @@ if(network) - - # Requires select() which is UNIX only - if(UNIX) -- find_package(CURL) -+ find_package(PkgConfig) -+ if (PkgConfig_FOUND) -+ pkg_check_modules(CURL libcurl) -+ if (NOT CURL_FOUND) -+ find_package(CURL) -+ endif() -+ endif() - if(CURL_FOUND) - list(APPEND netaccessors curl) - endif() --- -2.17.1 - -- 2.39.0 From fontaine.fabrice at gmail.com Wed Feb 22 18:22:10 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 19:22:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/lightning: needs threads Message-ID: <20230222182210.2539248-1-fontaine.fabrice@gmail.com> threads are mandatory since bump to version 2.2.0 in commit af6f7aa76db5aed1eada0b27bd0375610a2fc728 and https://git.savannah.gnu.org/cgit/lightning.git/commit/?id=d5a7c8e4ad719e84dbb4904c532f906a1ef5a77b: In file included from incr.c:2: ../include/lightning.h:27:10: fatal error: pthread.h: No such file or directory 27 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/62205869159d4a73c59a9795140fa77e9c3310ae Signed-off-by: Fabrice Fontaine --- package/lightning/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/lightning/Config.in b/package/lightning/Config.in index a0542edce9..3cf7c28ae2 100644 --- a/package/lightning/Config.in +++ b/package/lightning/Config.in @@ -1,13 +1,14 @@ -comment "lightning needs a toolchain w/ dynamic library" +comment "lightning needs a toolchain w/ dynamic library, threads" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_LIGHTNING bool "lightning" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS help GNU lightning is a library that generates assembly language code at run-time. -- 2.39.0 From ckhardin at gmail.com Wed Feb 22 18:34:26 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 10:34:26 -0800 Subject: [Buildroot] [PATCH 1/4] linux: create a scmversion file based on the custom repo variables In-Reply-To: <1f6626fc-12c0-d1f0-2a8a-2fa2fd0431b6@mind.be> References: <20230209231518.9458-1-ckhardin@gmail.com> <1f6626fc-12c0-d1f0-2a8a-2fa2fd0431b6@mind.be> Message-ID: > On Feb 14, 2023, at 1:46 PM, Arnout Vandecappelle wrote: > > Hi Charles, > > First of all, in patchwork [1] there are about twelve patches from you about this subject, but I think all except these four are superseded. Is that correct? Could you update patchwork and mark the old ones as superseded? > Yeah, sorry - had some mail server changes that kept saying an error but apparently the mail went thru. > > On 10/02/2023 00:15, ckhardin at gmail.com wrote: >> From: Charles Hardin >> When using the custom repositories, the archive creation will >> omit the source history to get reproducible hashes. This has >> the side effect of making the setlocalversion scripts within the >> builds to not create the tracking information as expected. So, >> just generate a .scmversion so that kernels will be labelled >> with where buildroot referenced them. > > This is less than ideal because it's completely different than the normal git describe output. In particular, if you first develop something in an OVERRIDE_SRCDIR (after applying patch 4) and then change the config to point to the exact same commit with BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION, it will create a completely different UTS_RELEASE string... Agreed -I would argue that the OVERRIDE_SRCDIR patch is functionally correct and what is desired particularly for local dev but the CUSTOM_REPO is a bit hackish and broken. Trying to figure out a way to do that. > > I think a better solution would be to extend the git download wrapper with a hook that gets called in the git tree itself. E.g.: > > LINUX_SCMVERSION_HOOK = ./scripts/setlocalversion --save-scmversion > > The same hook could then also be used for rsync. And it would be easy to add the same feature to barebox, tf-a, ... That is a good idea - but, from what I can tell the git download script does a pull and extract all at once with no hooks being run from support/download/git ``` #!/usr/bin/env bash # NOTE: if the output of this backend has to change (e.g. we change what gets # included in the archive (e.g. LFS), or we change the format of the archive # (e.g. tar options, compression ratio or method)), we MUST update the format # version in the variable BR_FMT_VERSION_git, in package/pkg-download.mk. # We want to catch any unexpected failure, and exit immediately set -E ? snip snip ? Download from git repo in here ? snip snip ? # Generate the archive. # We do not want the .git dir; we keep other .git files, in case they are the # only files in their directory. # The .git dir would generate non reproducible tarballs as it depends on # the state of the remote server. It also would generate large tarballs # (gigabytes for some linux trees) when a full clone took place. mk_tar_gz "${git_cache}" "${basename}" "${date}" "${output}" ".git/*? ``` So from the above I don?t see where to put a HOOK in from the make scripts - is there an example for this because we cann?t run the hook from the tarball because there is no ?.git? history in the tarball and the hook would need to be done at the creation? right? > > Regards, > Arnout > > >> For example (line wrapped) >> #define UTS_RELEASE "5.4.70-repo-version-" \ >> "92c23d10d0031e0a13244a1a97e7530d3b53fc6e" >> Signed-off-by: Charles Hardin >> --- >> linux/linux.mk | 14 ++++++++++++++ >> 1 file changed, 14 insertions(+) >> diff --git a/linux/linux.mk b/linux/linux.mk >> index 7645b5f507..0b27c8dee2 100644 >> --- a/linux/linux.mk >> +++ b/linux/linux.mk >> @@ -596,6 +596,20 @@ endif >> ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)),) >> $(error No custom repo URL set. Check your BR2_LINUX_KERNEL_CUSTOM_REPO_URL setting) >> endif >> + >> +# Create a custom scm version file to reflect the source version since the >> +# archive will omit source directories like .git to maintain reproducible >> +# hashes for the archives >> +LINUX_CUSTOM_REPO_SCMVERSION = \ >> + "-repo-version-$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION))" >> +define LINUX_CUSTOM_REPO_SCMVERSION_HOOK >> + (cd $(@D); \ >> + if [ ! -f .scmversion ]; then \ >> + echo $(LINUX_CUSTOM_REPO_SCMVERSION) > .scmversion; \ >> + fi) >> +endef >> + >> +LINUX_POST_EXTRACT_HOOKS += LINUX_CUSTOM_REPO_SCMVERSION_HOOK >> endif >> ifeq ($(BR_BUILDING),y) -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Wed Feb 22 19:18:50 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 20:18:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgcrypt: fix Thumb mode workaround Message-ID: <20230222191850.182174-1-fontaine.fabrice@gmail.com> Fix the following build failure: /tmp/ccRqWxnA.s:98: Error: instruction not supported in Thumb16 mode -- `adds ip,fp,r0' Fixes: - http://autobuild.buildroot.org/results/4b96f4e41724e5c9c806a6c7df397a58d1ae1b1e Signed-off-by: Fabrice Fontaine --- package/libgcrypt/libgcrypt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 6cf9b235f3..dc19116df6 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -27,8 +27,8 @@ LIBGCRYPT_CONF_OPTS += --disable-asm endif # Code doesn't build in thumb mode -ifeq ($(BR2_arm),y) -LIBGCRYPT_CONF_ENV += CFLAGS="$(patsubst -mthumb,,$(TARGET_CFLAGS))" +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBGCRYPT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" endif $(eval $(autotools-package)) -- 2.39.1 From peter at korsgaard.com Wed Feb 22 19:44:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:44:38 +0100 Subject: [Buildroot] [git commit] package/gitlab-runner: use LIBCURL_FORCE_TLS to enforce TLS support in curl In-Reply-To: <20230206153040.1FC2B83CA5@busybox.osuosl.org> (Peter Korsgaard's message of "Mon, 6 Feb 2023 16:30:20 +0100") References: <20230206153040.1FC2B83CA5@busybox.osuosl.org> Message-ID: <87wn49qyc9.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=b95f7591bd83a0e483d2b6db49258d2ea8b44f3d > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > BR2_PACKAGE_LIBCURL_OPENSSL is part of a "choice" option so it cannot be > selected. What seems to be really be needed is HTTPS support in curl, so > use the blind LIBCURL_FORCE_TLS option instead (openssl is already > selected). > Signed-off-by: Peter Korsgaard Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 19:29:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:29:39 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/gitlab-runner: use LIBCURL_FORCE_TLS to enforce TLS support in curl Message-ID: <20230222194454.03B5E867D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=227bfb48661865a2496ce28236d1aba0ca831bae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x BR2_PACKAGE_LIBCURL_OPENSSL is part of a "choice" option so it cannot be selected. What seems to be really be needed is HTTPS support in curl, so use the blind LIBCURL_FORCE_TLS option instead (openssl is already selected). Signed-off-by: Peter Korsgaard (cherry picked from commit b95f7591bd83a0e483d2b6db49258d2ea8b44f3d) Signed-off-by: Peter Korsgaard --- package/gitlab-runner/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gitlab-runner/Config.in b/package/gitlab-runner/Config.in index 89e3e87b5c..4289613ab9 100644 --- a/package/gitlab-runner/Config.in +++ b/package/gitlab-runner/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_GITLAB_RUNNER select BR2_PACKAGE_GIT # runtime select BR2_PACKAGE_LIBCURL # runtime select BR2_PACKAGE_LIBCURL_CURL # runtime - select BR2_PACKAGE_LIBCURL_OPENSSL # runtime, for ca-certificates. + select BR2_PACKAGE_LIBCURL_FORCE_TLS # runtime select BR2_PACKAGE_OPENSSL # runtime select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL # runtime select BR2_PACKAGE_LIBOPENSSL_BIN # runtime From peter at korsgaard.com Wed Feb 22 19:47:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:47:20 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require FindBin perl package for libopenssl In-Reply-To: <20230206213956.B167A83D34@busybox.osuosl.org> (Peter Korsgaard's message of "Mon, 6 Feb 2023 22:39:15 +0100") References: <20230206213956.B167A83D34@busybox.osuosl.org> Message-ID: <87sfexqy7r.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=5aab8c59d5b310540105166e7b48faf3d5bd200b > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes: > http://autobuild.buildroot.net/results/5d1/5d10f4f545dccf126e3f5b5efce777a393c5e7bc/ > http://autobuild.buildroot.net/results/7c2/7c2df31c6eb34b68e460e092d8c262bdc6c8f25a/ > The configure script of (host-)libopenssl needs the FindBin perl module on the host: > Can't locate FindBin.pm in @INC (you may need to install the FindBin module) > (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl > /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 > /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 > /usr/share/perl5) at ./Configure line 15. BEGIN failed--compilation aborted > at ./Configure line 15. > As this is needed for both libopenssl and host-libopenssl (which does not > have a corresponding config symbol in the .config), we have to require it > unconditionally. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 19:47:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:47:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: require FindBin perl package for libopenssl Message-ID: <20230222195028.256DE867EB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=703781013b150c1dae011e43935d89dc9cc69d50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes: http://autobuild.buildroot.net/results/5d1/5d10f4f545dccf126e3f5b5efce777a393c5e7bc/ http://autobuild.buildroot.net/results/7c2/7c2df31c6eb34b68e460e092d8c262bdc6c8f25a/ The configure script of (host-)libopenssl needs the FindBin perl module on the host: Can't locate FindBin.pm in @INC (you may need to install the FindBin module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./Configure line 15. BEGIN failed--compilation aborted at ./Configure line 15. As this is needed for both libopenssl and host-libopenssl (which does not have a corresponding config symbol in the .config), we have to require it unconditionally. Signed-off-by: Peter Korsgaard (cherry picked from commit 5aab8c59d5b310540105166e7b48faf3d5bd200b) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 2b678ae8c4..906781ab78 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -277,6 +277,7 @@ fi required_perl_modules="Data::Dumper" # Needed to build host-autoconf required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake +required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" From peter at korsgaard.com Wed Feb 22 19:46:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:46:56 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: require FindBin perl package for libopenssl Message-ID: <20230222195137.78DC3867F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=579945a3baa365aae556b886b9e2405a9176d1a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes: http://autobuild.buildroot.net/results/5d1/5d10f4f545dccf126e3f5b5efce777a393c5e7bc/ http://autobuild.buildroot.net/results/7c2/7c2df31c6eb34b68e460e092d8c262bdc6c8f25a/ The configure script of (host-)libopenssl needs the FindBin perl module on the host: Can't locate FindBin.pm in @INC (you may need to install the FindBin module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./Configure line 15. BEGIN failed--compilation aborted at ./Configure line 15. As this is needed for both libopenssl and host-libopenssl (which does not have a corresponding config symbol in the .config), we have to require it unconditionally. Signed-off-by: Peter Korsgaard (cherry picked from commit 5aab8c59d5b310540105166e7b48faf3d5bd200b) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 2b678ae8c4..906781ab78 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -277,6 +277,7 @@ fi required_perl_modules="Data::Dumper" # Needed to build host-autoconf required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake +required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" From peter at korsgaard.com Wed Feb 22 19:52:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:52:24 +0100 Subject: [Buildroot] [PATCH v2] package/qt5: fix build failure due to libressl use In-Reply-To: <20230206234520.4a140264@windsurf> (Thomas Petazzoni via buildroot's message of "Mon, 6 Feb 2023 23:45:20 +0100") References: <20220928205527.GH1419013@scaer> <20220929104648.324977-1-giulio.benetti@benettiengineering.com> <20230206234520.4a140264@windsurf> Message-ID: <87o7plqxzb.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Thu, 29 Sep 2022 12:46:48 +0200 > Giulio Benetti wrote: >> Qt5 only supports openssl, check [0] and [1]. So in qt5base.mk let's check >> if BR2_PACKAGE_LIBOPENSSL is enabled instead of BR2_PACKAGE_OPENSSL(that >> could be openssl or libressl) and for qt5enginio and qt5webkit let's select >> BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of only BR2_PACKAGE_OPENSSL. >> This way we make sure that only openssl is selected and not libressl or >> other future openssl-like implementations. >> >> Fixes: >> http://autobuild.buildroot.net/results/a956b48b782dbaa055d7146360465e2493a809d9/ >> >> [0]: https://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support >> [1]: https://bugreports.qt.io/browse/QTBUG-68374 >> >> Signed-off-by: Giulio Benetti >> --- V1-> V2: >> * select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of BR2_PACKAGE_LIBOPENSSL >> --- >> package/qt5/qt5base/qt5base.mk | 4 ++-- >> package/qt5/qt5enginio/Config.in | 1 + >> package/qt5/qt5webkit/Config.in | 1 + >> 3 files changed, 4 insertions(+), 2 deletions(-) > Applied to master, thanks. Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 19:56:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:56:47 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require English perl package for host-libxml-parser-perl In-Reply-To: <20230207083951.455AD83F4E@busybox.osuosl.org> (Peter Korsgaard's message of "Tue, 7 Feb 2023 09:39:29 +0100") References: <20230207083951.455AD83F4E@busybox.osuosl.org> Message-ID: <87k009qxs0.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=8f8085e63a4a755d587a25a73dbaafe33b23f867 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes http://autobuild.buildroot.net/results/166/1667b4ebd8e16e7d8b47bc3ca128a76daf27b4d9/ > The configure script of host-libxml-parser-perl needs the English perl > module on the host: > ERROR from evaluation of > /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/Expat/Makefile.PL: > Can't locate English.pm in @INC (you may need to install the English module) > (@INC contains: > /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/inc > /home/buildroot/autobuild/instance-1/output-1/host/lib/perl > /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 > /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 > /usr/share/perl5 .) at ./Makefile.PL line 3. > So add a check for it in dependencies.sh similar to the existing check for > ExtUtils::MakeMaker. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 20:02:27 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 21:02:27 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require open perl package for libxcrypt In-Reply-To: <20230207093548.1B15A83F98@busybox.osuosl.org> (Peter Korsgaard's message of "Tue, 7 Feb 2023 10:33:33 +0100") References: <20230207093548.1B15A83F98@busybox.osuosl.org> Message-ID: <87fsaxqxik.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=4cdd99190e89d538c25a8fc701372775fbde3b97 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes: > http://autobuild.buildroot.net/results/16c/16cba783be11cc5024f9c56bb0a7abb0acf13ef8/ > The configure script of libxcrypt needs the open perl module on the host: > Can't locate open.pm in @INC (you may need to install the open module) (@INC > contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl > /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 > /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 > /usr/share/perl5) at ./build-aux/scripts/expand-selected-hashes line 20. > So add a check for it in dependencies.sh similar to how it is done for mpv. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 19:56:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:56:21 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: require English perl package for host-libxml-parser-perl Message-ID: <20230222200317.7DE0386811@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea68d30c344899e7f890ec0996b7c8554c2fa61e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes http://autobuild.buildroot.net/results/166/1667b4ebd8e16e7d8b47bc3ca128a76daf27b4d9/ The configure script of host-libxml-parser-perl needs the English perl module on the host: ERROR from evaluation of /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/Expat/Makefile.PL: Can't locate English.pm in @INC (you may need to install the English module) (@INC contains: /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/inc /home/buildroot/autobuild/instance-1/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at ./Makefile.PL line 3. So add a check for it in dependencies.sh similar to the existing check for ExtUtils::MakeMaker. Signed-off-by: Peter Korsgaard (cherry picked from commit 8f8085e63a4a755d587a25a73dbaafe33b23f867) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 906781ab78..b879c58ff2 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -275,6 +275,7 @@ fi # Check that the Perl installation is complete enough for Buildroot. required_perl_modules="Data::Dumper" # Needed to build host-autoconf +required_perl_modules="$required_perl_modules English" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl From peter at korsgaard.com Wed Feb 22 20:02:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 21:02:13 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: require open perl package for libxcrypt Message-ID: <20230222200317.87F5F86812@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=18db3685293a7865d9eb11cbee1ae5ed506cd429 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes: http://autobuild.buildroot.net/results/16c/16cba783be11cc5024f9c56bb0a7abb0acf13ef8/ The configure script of libxcrypt needs the open perl module on the host: Can't locate open.pm in @INC (you may need to install the open module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./build-aux/scripts/expand-selected-hashes line 20. So add a check for it in dependencies.sh similar to how it is done for mpv. Signed-off-by: Peter Korsgaard (cherry picked from commit 4cdd99190e89d538c25a8fc701372775fbde3b97) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index b879c58ff2..683bb5cb7e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -280,6 +280,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules open" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From peter at korsgaard.com Wed Feb 22 19:51:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:51:33 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5: fix build failure due to libressl use Message-ID: <20230222200317.73DF086810@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c667302fd6a0f16a36925a77d0e2e6b7ec64bbc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Qt5 only supports openssl, check [0] and [1]. So in qt5base.mk let's check if BR2_PACKAGE_LIBOPENSSL is enabled instead of BR2_PACKAGE_OPENSSL(that could be openssl or libressl) and for qt5enginio and qt5webkit let's select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of only BR2_PACKAGE_OPENSSL. This way we make sure that only openssl is selected and not libressl or other future openssl-like implementations. Fixes: http://autobuild.buildroot.net/results/a956b48b782dbaa055d7146360465e2493a809d9/ [0]: https://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support [1]: https://bugreports.qt.io/browse/QTBUG-68374 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit a94d39d693d84f96f996a6a3decfecc60a9625bd) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 4 ++-- package/qt5/qt5enginio/Config.in | 2 ++ package/qt5/qt5webkit/Config.in | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index f880f806cc..ab6c579fdb 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -216,8 +216,8 @@ else QT5BASE_CONFIGURE_OPTS += -no-eglfs endif -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBOPENSSL),-openssl,-no-openssl) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBOPENSSL),openssl) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig) diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in index b738f0db7c..a1ac6f8ca0 100644 --- a/package/qt5/qt5enginio/Config.in +++ b/package/qt5/qt5enginio/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_QT5ENGINIO bool "qt5enginio" select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_NETWORK help diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 26c3897d1d..9b84ac5f96 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -16,6 +16,8 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS From peter at korsgaard.com Wed Feb 22 20:02:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 21:02:05 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: require open perl package for libxcrypt Message-ID: <20230222200429.00F7C86844@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a007e20b33ddc224d014392f5490218a12c94add branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes: http://autobuild.buildroot.net/results/16c/16cba783be11cc5024f9c56bb0a7abb0acf13ef8/ The configure script of libxcrypt needs the open perl module on the host: Can't locate open.pm in @INC (you may need to install the open module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at ./build-aux/scripts/expand-selected-hashes line 20. So add a check for it in dependencies.sh similar to how it is done for mpv. Signed-off-by: Peter Korsgaard (cherry picked from commit 4cdd99190e89d538c25a8fc701372775fbde3b97) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index b879c58ff2..683bb5cb7e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -280,6 +280,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules open" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From peter at korsgaard.com Wed Feb 22 19:51:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:51:21 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/qt5: fix build failure due to libressl use Message-ID: <20230222200428.DC61D86828@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5094adb260ddabb1ae54db71fd9cf95c09499633 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Qt5 only supports openssl, check [0] and [1]. So in qt5base.mk let's check if BR2_PACKAGE_LIBOPENSSL is enabled instead of BR2_PACKAGE_OPENSSL(that could be openssl or libressl) and for qt5enginio and qt5webkit let's select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL instead of only BR2_PACKAGE_OPENSSL. This way we make sure that only openssl is selected and not libressl or other future openssl-like implementations. Fixes: http://autobuild.buildroot.net/results/a956b48b782dbaa055d7146360465e2493a809d9/ [0]: https://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support [1]: https://bugreports.qt.io/browse/QTBUG-68374 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit a94d39d693d84f96f996a6a3decfecc60a9625bd) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 4 ++-- package/qt5/qt5enginio/Config.in | 2 ++ package/qt5/qt5webkit/Config.in | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index a81892422c..efa0e16e9a 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -229,8 +229,8 @@ else QT5BASE_CONFIGURE_OPTS += -no-eglfs endif -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBOPENSSL),-openssl,-no-openssl) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBOPENSSL),openssl) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig) diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in index b738f0db7c..a1ac6f8ca0 100644 --- a/package/qt5/qt5enginio/Config.in +++ b/package/qt5/qt5enginio/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_QT5ENGINIO bool "qt5enginio" select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_NETWORK help diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 26c3897d1d..9b84ac5f96 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -16,6 +16,8 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS From peter at korsgaard.com Wed Feb 22 19:56:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 20:56:28 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: require English perl package for host-libxml-parser-perl Message-ID: <20230222200428.E8EC48683E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a17c925e063b3531202a67500879e39599ed1a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes http://autobuild.buildroot.net/results/166/1667b4ebd8e16e7d8b47bc3ca128a76daf27b4d9/ The configure script of host-libxml-parser-perl needs the English perl module on the host: ERROR from evaluation of /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/Expat/Makefile.PL: Can't locate English.pm in @INC (you may need to install the English module) (@INC contains: /home/buildroot/autobuild/instance-1/output-1/build/host-libxml-parser-perl-2.46/inc /home/buildroot/autobuild/instance-1/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at ./Makefile.PL line 3. So add a check for it in dependencies.sh similar to the existing check for ExtUtils::MakeMaker. Signed-off-by: Peter Korsgaard (cherry picked from commit 8f8085e63a4a755d587a25a73dbaafe33b23f867) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 906781ab78..b879c58ff2 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -275,6 +275,7 @@ fi # Check that the Perl installation is complete enough for Buildroot. required_perl_modules="Data::Dumper" # Needed to build host-autoconf +required_perl_modules="$required_perl_modules English" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl From peter at korsgaard.com Wed Feb 22 20:10:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 21:10:51 +0100 Subject: [Buildroot] [PATCH] package/rtl8192eu: disable package for s390x architecture In-Reply-To: <20230206133149.910237-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Mon, 6 Feb 2023 14:31:49 +0100") References: <20230206133149.910237-1-giulio.benetti@benettiengineering.com> Message-ID: <87bkllqx4k.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this > package for this architecture. > Fixes: > http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2/ > Signed-off-by: Giulio Benetti Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 22 20:09:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 22 Feb 2023 21:09:45 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/rtl8192eu: disable package for s390x architecture Message-ID: <20230222201137.705E18684A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc5a107fd3f4bd5c72e48fd4df12abe1319e401d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this package for this architecture. Fixes: http://autobuild.buildroot.net/results/9987dfc041c7cc3327b73b8d97e8d482b20555e2/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 26893ab1c67d7df8c1b71269051ad41b5ea03e5e) Signed-off-by: Peter Korsgaard --- package/rtl8192eu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rtl8192eu/Config.in b/package/rtl8192eu/Config.in index 4d71b711c3..969ba090ce 100644 --- a/package/rtl8192eu/Config.in +++ b/package/rtl8192eu/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTL8192EU bool "rtl8192eu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help A standalone driver for the RTL8192EU USB Wi-Fi adapter. @@ -10,4 +11,5 @@ config BR2_PACKAGE_RTL8192EU https://github.com/clnhub/rtl8192eu-linux comment "rtl8192eu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL From ju.o at free.fr Wed Feb 22 20:41:33 2023 From: ju.o at free.fr (Julien Olivain) Date: Wed, 22 Feb 2023 21:41:33 +0100 Subject: [Buildroot] [PATCH next 1/2] package/opencsd: new package Message-ID: <20230222204134.38884-1-ju.o@free.fr> This library provides an API suitable for the decode of ARM(r) CoreSight(tm) trace streams. OpenCSD is for example an optional dependency in the Linux "perf" tool, starting from kernel version 5.1. https://github.com/Linaro/OpenCSD Signed-off-by: Julien Olivain --- Patch tested on branch next at commit 9793454 with commands: make check-package ... 0 warnings generated ./utils/test-pkg -a -p opencsd arm-aarch64 [ 1/45]: OK bootlin-aarch64-glibc [ 2/45]: OK bootlin-arcle-hs38-uclibc [ 3/45]: SKIPPED bootlin-armv5-uclibc [ 4/45]: OK bootlin-armv7-glibc [ 5/45]: OK bootlin-armv7m-uclibc [ 6/45]: SKIPPED bootlin-armv7-musl [ 7/45]: OK bootlin-m68k-5208-uclibc [ 8/45]: SKIPPED bootlin-m68k-68040-uclibc [ 9/45]: SKIPPED bootlin-microblazeel-uclibc [10/45]: SKIPPED bootlin-mipsel32r6-glibc [11/45]: SKIPPED bootlin-mipsel-uclibc [12/45]: SKIPPED bootlin-nios2-glibc [13/45]: SKIPPED bootlin-openrisc-uclibc [14/45]: SKIPPED bootlin-powerpc64le-power8-glibc [15/45]: SKIPPED bootlin-powerpc-e500mc-uclibc [16/45]: SKIPPED bootlin-riscv32-glibc [17/45]: SKIPPED bootlin-riscv64-glibc [18/45]: SKIPPED bootlin-riscv64-musl [19/45]: SKIPPED bootlin-s390x-z13-glibc [20/45]: SKIPPED bootlin-sh4-uclibc [21/45]: SKIPPED bootlin-sparc64-glibc [22/45]: SKIPPED bootlin-sparc-uclibc [23/45]: SKIPPED bootlin-x86-64-glibc [24/45]: SKIPPED bootlin-x86-64-musl [25/45]: SKIPPED bootlin-x86-64-uclibc [26/45]: SKIPPED bootlin-xtensa-uclibc [27/45]: SKIPPED br-arm-basic [28/45]: SKIPPED br-arm-full-nothread [29/45]: OK br-arm-full-static [30/45]: SKIPPED br-i386-pentium4-full [31/45]: SKIPPED br-i386-pentium-mmx-musl [32/45]: SKIPPED br-mips64-n64-full [33/45]: SKIPPED br-mips64r6-el-hf-glibc [34/45]: SKIPPED br-powerpc-603e-basic-cpp [35/45]: SKIPPED br-powerpc64-power7-glibc [36/45]: SKIPPED 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-mips64 [43/45]: SKIPPED sourcery-mips [44/45]: SKIPPED sourcery-nios2 [45/45]: SKIPPED 45 builds, 33 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- DEVELOPERS | 1 + package/Config.in | 1 + package/opencsd/Config.in | 27 +++++++++++++++++++++++++++ package/opencsd/opencsd.hash | 3 +++ package/opencsd/opencsd.mk | 31 +++++++++++++++++++++++++++++++ 5 files changed, 63 insertions(+) create mode 100644 package/opencsd/Config.in create mode 100644 package/opencsd/opencsd.hash create mode 100644 package/opencsd/opencsd.mk diff --git a/DEVELOPERS b/DEVELOPERS index 599cfe6886..32524c152a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1696,6 +1696,7 @@ F: package/highway/ F: package/libjxl/ F: package/octave/ F: package/ola/ +F: package/opencsd/ F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..fcbf8e8b6c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1708,6 +1708,7 @@ menu "Hardware handling" source "package/mtdev/Config.in" source "package/ne10/Config.in" source "package/neardal/Config.in" + source "package/opencsd/Config.in" source "package/opensc/Config.in" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" diff --git a/package/opencsd/Config.in b/package/opencsd/Config.in new file mode 100644 index 0000000000..0e63d99251 --- /dev/null +++ b/package/opencsd/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_OPENCSD_ARCH_SUPPORTS + bool + default y if BR2_arm + default y if BR2_armeb + default y if BR2_aarch64 + default y if BR2_aarch64_be + +config BR2_PACKAGE_OPENCSD + bool "OpenCSD" + depends on BR2_PACKAGE_OPENCSD_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + This library provides an API suitable for the decode of + ARM(r) CoreSight(tm) trace streams. + + OpenCSD is for example an optional dependency in the Linux + "perf" tool, starting from kernel version 5.1. + + https://github.com/Linaro/OpenCSD + +comment "OpenCSD needs a toolchain w/ C++11, gcc >= 4.8, dynamic libraries" + depends on BR2_PACKAGE_OPENCSD_ARCH_SUPPORTS + depends on BR2_STATIC_LIBS \ + || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/opencsd/opencsd.hash b/package/opencsd/opencsd.hash new file mode 100644 index 0000000000..84a762fb36 --- /dev/null +++ b/package/opencsd/opencsd.hash @@ -0,0 +1,3 @@ +# Locally Computed: +sha256 e1bb6d8d09e87974cb5ca6db2a13b0e1ba9e51117ca2ed71879df07ff7af4de2 opencsd-1.4.0.tar.gz +sha256 980eef4b0744e63834e3ec0d50c2a4ff6d81d7ec62dd8ba8c66acae0ec5a2e88 LICENSE diff --git a/package/opencsd/opencsd.mk b/package/opencsd/opencsd.mk new file mode 100644 index 0000000000..680364d01d --- /dev/null +++ b/package/opencsd/opencsd.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# opencsd +# +################################################################################ + +OPENCSD_VERSION = 1.4.0 +OPENCSD_SITE = $(call github,Linaro,OpenCSD,v$(OPENCSD_VERSION)) +OPENCSD_LICENSE = BSD-3-Clause +OPENCSD_LICENSE_FILES = LICENSE +OPENCSD_INSTALL_STAGING = YES + +OPENCSD_MAKE_OPTS = \ + CROSS_COMPILE="$(TARGET_CROSS)" + +define OPENCSD_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/decoder/build/linux \ + $(OPENCSD_MAKE_OPTS) all +endef + +define OPENCSD_INSTALL_TARGET_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/decoder/build/linux \ + $(OPENCSD_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install +endef + +define OPENCSD_INSTALL_STAGING_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/decoder/build/linux \ + $(OPENCSD_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install +endef + +$(eval $(generic-package)) -- 2.39.2 From ju.o at free.fr Wed Feb 22 20:41:34 2023 From: ju.o at free.fr (Julien Olivain) Date: Wed, 22 Feb 2023 21:41:34 +0100 Subject: [Buildroot] [PATCH next 2/2] package/linux-tools: perf: add OpenCSD support In-Reply-To: <20230222204134.38884-1-ju.o@free.fr> References: <20230222204134.38884-1-ju.o@free.fr> Message-ID: <20230222204134.38884-2-ju.o@free.fr> This commit adds the Arm CoreSight trace data Decoder support to perf. See: https://docs.kernel.org/trace/coresight/coresight-perf.html Signed-off-by: Julien Olivain --- package/linux-tools/linux-tool-perf.mk.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index dda63cccec..3a16705087 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -119,6 +119,13 @@ else PERF_MAKE_FLAGS += NO_LZMA=1 endif +ifeq ($(BR2_PACKAGE_OPENCSD),y) +PERF_DEPENDENCIES += opencsd +PERF_MAKE_FLAGS += CORESIGHT=1 +# There is no "else CORESIGHT=0" case, because "perf" Makefile uses +# bare "ifdef CORESIGHT" constructs. +endif + # We really do not want to build the perf documentation, because it # has stringent requirement on the documentation generation tools, # like xmlto and asciidoc), which may be lagging behind on some -- 2.39.2 From thomas.petazzoni at bootlin.com Wed Feb 22 15:07:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 16:07:35 +0100 Subject: [Buildroot] [git commit branch/next] package/rtl8192eu: bump to 2022-12-29 version on branch 5.11.2.1 Message-ID: <20230222205617.795D586881@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8beed8ac56a51d4d6a9dd81b81b8025cb7f8d99b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Drop local patch since it's been merged[0]. [0]: https://github.com/clnhub/rtl8192eu-linux/pull/69 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...ailure-due-to-redefition-of-local-sha256-.patch | 108 --------------------- package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 3 files changed, 2 insertions(+), 110 deletions(-) diff --git a/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch b/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch deleted file mode 100644 index 52ef8c9005..0000000000 --- a/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 1f968bd58656f200347bd398b34aa9f1b6393302 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 28 Dec 2022 18:54:48 +0100 -Subject: [PATCH] Fix build failure due to redefition of local sha256 data - types and functions - -Linux provides sha256_init() and 'struct sha256_state' in file -include/crypto/sha2.h so this leads to a build failure due to redefinition. -To avoid this let's prepend to all local exposed functions and data types -rtl_. sha256_process() and sha256_done() are not required to be renamed but -let's change them for consistency. - -[Upstream status: https://github.com/clnhub/rtl8192eu-linux/pull/69] -Signed-off-by: Giulio Benetti ---- - core/crypto/sha256-internal.c | 16 ++++++++-------- - core/crypto/sha256_i.h | 8 ++++---- - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/core/crypto/sha256-internal.c b/core/crypto/sha256-internal.c -index 4d61cb1..537bb2e 100644 ---- a/core/crypto/sha256-internal.c -+++ b/core/crypto/sha256-internal.c -@@ -26,17 +26,17 @@ - int sha256_vector(size_t num_elem, const u8 *addr[], const size_t *len, - u8 *mac) - { -- struct sha256_state ctx; -+ struct rtl_sha256_state ctx; - size_t i; - - if (TEST_FAIL()) - return -1; - -- sha256_init(&ctx); -+ rtl_sha256_init(&ctx); - for (i = 0; i < num_elem; i++) -- if (sha256_process(&ctx, addr[i], len[i])) -+ if (rtl_sha256_process(&ctx, addr[i], len[i])) - return -1; -- if (sha256_done(&ctx, mac)) -+ if (rtl_sha256_done(&ctx, mac)) - return -1; - return 0; - } -@@ -82,7 +82,7 @@ static const unsigned long K[64] = { - #endif - - /* compress 512-bits */ --static int sha256_compress(struct sha256_state *md, unsigned char *buf) -+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf) - { - u32 S[8], W[64], t0, t1; - u32 t; -@@ -125,7 +125,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) - - - /* Initialize the hash state */ --void sha256_init(struct sha256_state *md) -+void rtl_sha256_init(struct rtl_sha256_state *md) - { - md->curlen = 0; - md->length = 0; -@@ -146,7 +146,7 @@ void sha256_init(struct sha256_state *md) - @param inlen The length of the data (octets) - @return CRYPT_OK if successful - */ --int sha256_process(struct sha256_state *md, const unsigned char *in, -+int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, - unsigned long inlen) - { - unsigned long n; -@@ -186,7 +186,7 @@ int sha256_process(struct sha256_state *md, const unsigned char *in, - @param out [out] The destination of the hash (32 bytes) - @return CRYPT_OK if successful - */ --int sha256_done(struct sha256_state *md, unsigned char *out) -+int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out) - { - int i; - -diff --git a/core/crypto/sha256_i.h b/core/crypto/sha256_i.h -index a502d2b..93a8858 100644 ---- a/core/crypto/sha256_i.h -+++ b/core/crypto/sha256_i.h -@@ -11,15 +11,15 @@ - - #define SHA256_BLOCK_SIZE 64 - --struct sha256_state { -+struct rtl_sha256_state { - u64 length; - u32 state[8], curlen; - u8 buf[SHA256_BLOCK_SIZE]; - }; - --void sha256_init(struct sha256_state *md); --int sha256_process(struct sha256_state *md, const unsigned char *in, -+void rtl_sha256_init(struct rtl_sha256_state *md); -+int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, - unsigned long inlen); --int sha256_done(struct sha256_state *md, unsigned char *out); -+int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out); - - #endif /* SHA256_I_H */ --- -2.34.1 - diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index 0cb9961345..2d6498f19d 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 827e9592336744cbcfca5de988d8f4e14a62690302d3cabf72aa4bedebded2b7 rtl8192eu-94bce7798bbb18de6d8b1646dedb2511f24867d3.tar.gz +sha256 72d1d97c6d2038885e5666f3271609b4dcbe45633c19a5606dc59745ff8ab543 rtl8192eu-865656c3a1d1aee8c4ba459ce7608756d17c712f.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index d967db90b8..da6fe42e99 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = 94bce7798bbb18de6d8b1646dedb2511f24867d3 +RTL8192EU_VERSION = 865656c3a1d1aee8c4ba459ce7608756d17c712f RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 From thomas.petazzoni at bootlin.com Wed Feb 22 20:56:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:56:32 +0100 Subject: [Buildroot] [PATCH] package/rtl8192eu: bump to 2022-12-29 version on branch 5.11.2.1 In-Reply-To: <20221229184520.68111-1-giulio.benetti@benettiengineering.com> References: <20221229184520.68111-1-giulio.benetti@benettiengineering.com> Message-ID: <20230222215632.11f5f7b0@windsurf> On Thu, 29 Dec 2022 19:45:20 +0100 Giulio Benetti wrote: > Drop local patch since it's been merged[0]. > > [0]: https://github.com/clnhub/rtl8192eu-linux/pull/69 > > Signed-off-by: Giulio Benetti > --- > ...e-due-to-redefition-of-local-sha256-.patch | 108 ------------------ > package/rtl8192eu/rtl8192eu.hash | 2 +- > package/rtl8192eu/rtl8192eu.mk | 2 +- > 3 files changed, 2 insertions(+), 110 deletions(-) > delete mode 100644 package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 14:59:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 15:59:37 +0100 Subject: [Buildroot] [git commit] package/wilc-driver: fix build failure due to wrong pointer casts Message-ID: <20230222205839.53BF4868BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=293a878ae268cd0561fc3ab81c04b9a438acf921 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add local patch pending upstream[0] to fix the bug. [0]: https://github.com/embeddedTS/wilc3000-external-module/pull/3 Fixes: http://autobuild.buildroot.net/results/0a0/0a022d5c053bf8f7a53349b8bae4b2168a9cd134/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/wilc-driver/0005-Fix-cast-warnings.patch | 43 ++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/package/wilc-driver/0005-Fix-cast-warnings.patch b/package/wilc-driver/0005-Fix-cast-warnings.patch new file mode 100644 index 0000000000..713a15e667 --- /dev/null +++ b/package/wilc-driver/0005-Fix-cast-warnings.patch @@ -0,0 +1,43 @@ +From ebd083223883d479b2dd6f8a0da272797f90d236 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Sat, 31 Dec 2022 18:38:33 +0100 +Subject: [PATCH] Fix cast warnings + +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 2 +- + netdev.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cfg80211.c b/cfg80211.c +index 016aa06..2f40c9d 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -1794,7 +1794,7 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev, + if (ret != 0) + netdev_err(dev, "Error in setting channel\n"); + +- wilc_wlan_set_bssid(dev, dev->dev_addr, WILC_AP_MODE); ++ wilc_wlan_set_bssid(dev, (u8 *)dev->dev_addr, WILC_AP_MODE); + + return wilc_add_beacon(vif, settings->beacon_interval, + settings->dtim_period, &settings->beacon); +diff --git a/netdev.c b/netdev.c +index 824afea..5a1a51d 100644 +--- a/netdev.c ++++ b/netdev.c +@@ -899,9 +899,9 @@ static int wilc_mac_open(struct net_device *ndev) + vif->idx); + + if (is_valid_ether_addr(ndev->dev_addr)) +- wilc_set_mac_address(vif, ndev->dev_addr); ++ wilc_set_mac_address(vif, (u8 *)ndev->dev_addr); + else +- wilc_get_mac_address(vif, ndev->dev_addr); ++ wilc_get_mac_address(vif, (u8 *)ndev->dev_addr); + netdev_dbg(ndev, "Mac address: %pM\n", ndev->dev_addr); + + if (!is_valid_ether_addr(ndev->dev_addr)) { +-- +2.34.1 + From thomas.petazzoni at bootlin.com Wed Feb 22 20:57:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:57:18 +0100 Subject: [Buildroot] [git commit] package/gnuradio: disable examples Message-ID: <20230222205839.6B89A868BF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f4dec2107354ab7d6a3fa4fe6646a2c7c517418 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Examples can be disabled since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/530262c6df3fb9b87a80133dbde5650dbe948c4c Signed-off-by: Fabrice Fontaine Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/gnuradio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index c2fcba9586..c2e5ec5cad 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -22,6 +22,7 @@ GNURADIO_DEPENDENCIES = \ GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ + -DENABLE_EXAMPLES=OFF \ -DENABLE_GNURADIO_RUNTIME=ON \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND From thomas.petazzoni at bootlin.com Wed Feb 22 20:58:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:58:20 +0100 Subject: [Buildroot] [git commit] package/gqrx: bump to version 2.15.9 Message-ID: <20230222205839.94E61868BE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5893d2d1f19168a12e823d78882d6037b791e276 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure raised since bump pf gnuradio to version 3.10.4.0 in commit e37c110bead8b7b35cd97915673fa785ccb39f2d: In file included from /home/buildroot/autobuild/instance-2/output-1/build/gqrx-2.14.4/src/applications/gqrx/receiver.cpp:32: /home/buildroot/autobuild/instance-2/output-1/build/gqrx-2.14.4/src/applications/gqrx/receiver.h:34:10: fatal error: gnuradio/blocks/wavfile_sink.h: No such file or directory 34 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/gqrx-sdr/gqrx/blob/v2.15.9/resources/news.txt Fixes: - http://autobuild.buildroot.org/results/42b5ab2e555063273ea55fd1c09a9be6d8b620e2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gqrx/Config.in | 2 ++ package/gqrx/gqrx.hash | 2 +- package/gqrx/gqrx.mk | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in index 442b28e546..97f0b7de07 100644 --- a/package/gqrx/Config.in +++ b/package/gqrx/Config.in @@ -34,7 +34,9 @@ config BR2_PACKAGE_GQRX select BR2_PACKAGE_GNURADIO_DIGITAL select BR2_PACKAGE_GNURADIO_FFT select BR2_PACKAGE_GNURADIO_FILTER + select BR2_PACKAGE_GNURADIO_NETWORK select BR2_PACKAGE_GR_OSMOSDR + select BR2_PACKAGE_LIBSNDFILE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5SVG diff --git a/package/gqrx/gqrx.hash b/package/gqrx/gqrx.hash index 1991dfea82..567ff947f9 100644 --- a/package/gqrx/gqrx.hash +++ b/package/gqrx/gqrx.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 aec35c77ebde9c71a5f973c509eec3d6aa2f18a6e052b180fcd9029d88273e5b gqrx-2.14.4.tar.gz +sha256 4a826b468b2fb38a59cbe1f1b566e62c3114509186a7a25ba27dc92833f3eb44 gqrx-2.15.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK diff --git a/package/gqrx/gqrx.mk b/package/gqrx/gqrx.mk index 4d464298ca..d2518213b8 100644 --- a/package/gqrx/gqrx.mk +++ b/package/gqrx/gqrx.mk @@ -4,11 +4,11 @@ # ################################################################################ -GQRX_VERSION = 2.14.4 +GQRX_VERSION = 2.15.9 GQRX_SITE = $(call github,csete,gqrx,v$(GQRX_VERSION)) GQRX_LICENSE = GPL-3.0+, Apache-2.0 GQRX_LICENSE_FILES = COPYING LICENSE-CTK -GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg +GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr libsndfile qt5base qt5svg GQRX_CONF_OPTS = -DLINUX_AUDIO_BACKEND=Gr-audio From thomas.petazzoni at bootlin.com Wed Feb 22 20:57:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:57:15 +0100 Subject: [Buildroot] [git commit] package/gnuradio: drop unrecognized volk variables Message-ID: <20230222205839.5F3FD868BE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=802cfb90d68f866bc8f61d9c6c3a764abae2580f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Volk submodule has been removed since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/80c04479da962d048d41165081b026aafdaa0316 orc dependency can also be dropped as it was only used by volk submodule Signed-off-by: Fabrice Fontaine Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/gnuradio.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index cc41f1e12b..c2fcba9586 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -22,9 +22,7 @@ GNURADIO_DEPENDENCIES = \ GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ - -DENABLE_VOLK=ON \ -DENABLE_GNURADIO_RUNTIME=ON \ - -DENABLE_INTERNAL_VOLK=OFF \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND @@ -36,13 +34,6 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) GNURADIO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif -ifeq ($(BR2_PACKAGE_ORC),y) -GNURADIO_DEPENDENCIES += orc -GNURADIO_CONF_OPTS += -DENABLE_ORC=ON -else -GNURADIO_CONF_OPTS += -DENABLE_ORC=OFF -endif - ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON else From thomas.petazzoni at bootlin.com Wed Feb 22 20:58:17 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:58:17 +0100 Subject: [Buildroot] [git commit] package/gnuradio: add gr-network block support Message-ID: <20230222205839.878B6868BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25c8c00b98e37186d23ea6515e944060e59cfa8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master grnet networking block support is available since version version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/cc37c3e8cd5eabcb5c9d919e5fffc5d938690140 gr-network is a mandatory dependency of latest gqrx Signed-off-by: Fabrice Fontaine Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/Config.in | 6 ++++++ package/gnuradio/gnuradio.mk | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 1824589263..51237e62b9 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -134,6 +134,12 @@ config BR2_PACKAGE_GNURADIO_FILTER help Filter signal processing blocks +config BR2_PACKAGE_GNURADIO_NETWORK + bool "gr-network support" + select BR2_PACKAGE_GNURADIO_BLOCKS + help + TCP and UDP source/sink blocks + config BR2_PACKAGE_GNURADIO_QTGUI bool "gr-qtgui" depends on BR2_PACKAGE_GNURADIO_PYTHON diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 59fb23d89d..d9218b533d 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -106,6 +106,12 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_NETWORK),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GNURADIO_DEPENDENCIES += python3 python-pybind \ host-python-numpy host-python-packaging From thomas.petazzoni at bootlin.com Wed Feb 22 20:57:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:57:28 +0100 Subject: [Buildroot] [git commit] package/gnuradio: add libsndfile optional dependency Message-ID: <20230222205839.79FF3868C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55dff4a30b7b7a577ac84768466ee88a8c6fa262 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libsndfile is an optional dependency since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/18f64ba685cfc2533e2d7726aa43c524b007d97b Signed-off-by: Fabrice Fontaine Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/gnuradio.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index c2e5ec5cad..59fb23d89d 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -55,6 +55,9 @@ endif ifeq ($(BR2_PACKAGE_GNURADIO_BLOCKS),y) GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=ON +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +GNURADIO_DEPENDENCIES += libsndfile +endif else GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=OFF endif From thomas.petazzoni at bootlin.com Wed Feb 22 20:58:55 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 21:58:55 +0100 Subject: [Buildroot] [PATCH 1/5] package/gnuradio: drop unrecognized volk variables In-Reply-To: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> References: <20230222160514.2069544-1-fontaine.fabrice@gmail.com> Message-ID: <20230222215855.32deb357@windsurf> On Wed, 22 Feb 2023 17:05:10 +0100 Fabrice Fontaine wrote: > Volk submodule has been removed since version 3.9.0.0 and > https://github.com/gnuradio/gnuradio/commit/80c04479da962d048d41165081b026aafdaa0316 > > orc dependency can also be dropped as it was only used by volk submodule > > Signed-off-by: Fabrice Fontaine > --- > package/gnuradio/gnuradio.mk | 9 --------- > 1 file changed, 9 deletions(-) Series applied to master. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 21:00:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 22:00:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/xerces: drop patch In-Reply-To: <20230222181254.2533041-1-fontaine.fabrice@gmail.com> References: <20230222181254.2533041-1-fontaine.fabrice@gmail.com> Message-ID: <20230222220045.5508e055@windsurf> On Wed, 22 Feb 2023 19:12:54 +0100 Fabrice Fontaine wrote: > Drop patch which is not needed since commit > 62cab101356c97432da482e168adaf065de65c4f. This patch is actually raising > a build failure since bump to version 3.2.4 in commit > d2d8f146a9f0ed3b66c4dd470bb76efdbb630a75 and > https://github.com/apache/xerces-c/commit/af1935b567c18c8b2de71d6ea97239be60876335: > > CMake Error at src/CMakeLists.txt:1271 (add_library): > Target "xerces-c" links to target "CURL::libcurl" but the target was not > found. Perhaps a find_package() call is missing for an IMPORTED target, or > an ALIAS target is missing? > > Fixes: > - http://autobuild.buildroot.org/results/c62856a5eeb34714f26235b2d6f8adc4ea612686 > > Signed-off-by: Fabrice Fontaine > --- > .../0001-fix-static-linking-with-curl.patch | 39 ------------------- > 1 file changed, 39 deletions(-) > delete mode 100644 package/xerces/0001-fix-static-linking-with-curl.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 21:00:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 22:00:40 +0100 Subject: [Buildroot] [git commit] package/xerces: drop patch Message-ID: <20230222210118.9D1BE868C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5178b092a820e328434490cad47c2ea8342f392 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch which is not needed since commit 62cab101356c97432da482e168adaf065de65c4f. This patch is actually raising a build failure since bump to version 3.2.4 in commit d2d8f146a9f0ed3b66c4dd470bb76efdbb630a75 and https://github.com/apache/xerces-c/commit/af1935b567c18c8b2de71d6ea97239be60876335: CMake Error at src/CMakeLists.txt:1271 (add_library): Target "xerces-c" links to target "CURL::libcurl" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Fixes: - http://autobuild.buildroot.org/results/c62856a5eeb34714f26235b2d6f8adc4ea612686 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../xerces/0001-fix-static-linking-with-curl.patch | 39 ---------------------- 1 file changed, 39 deletions(-) diff --git a/package/xerces/0001-fix-static-linking-with-curl.patch b/package/xerces/0001-fix-static-linking-with-curl.patch deleted file mode 100644 index db38de79fc..0000000000 --- a/package/xerces/0001-fix-static-linking-with-curl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 26e3f1440bbc75c704fc93ff43a2abbfbe4c0203 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 11 Oct 2018 22:56:50 +0200 -Subject: [PATCH] fix static linking with curl - -When curl is statically built with openssl support, xerces needs to -link with openssl libraries so use pkg_check_modules to get any -needed dependencies - -Fixes: - - http://autobuild.buildroot.org/results/29ca90fff2c8e38f2edf7240eca3aa3fe7397c45 - -Signed-off-by: Fabrice Fontaine ---- - cmake/XercesNetAccessorSelection.cmake | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/cmake/XercesNetAccessorSelection.cmake b/cmake/XercesNetAccessorSelection.cmake -index 7a63f1f6b..e90fcf034 100644 ---- a/cmake/XercesNetAccessorSelection.cmake -+++ b/cmake/XercesNetAccessorSelection.cmake -@@ -31,7 +31,13 @@ if(network) - - # Requires select() which is UNIX only - if(UNIX) -- find_package(CURL) -+ find_package(PkgConfig) -+ if (PkgConfig_FOUND) -+ pkg_check_modules(CURL libcurl) -+ if (NOT CURL_FOUND) -+ find_package(CURL) -+ endif() -+ endif() - if(CURL_FOUND) - list(APPEND netaccessors curl) - endif() --- -2.17.1 - From thomas.petazzoni at bootlin.com Wed Feb 22 21:01:08 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 22:01:08 +0100 Subject: [Buildroot] [git commit] package/lightning: needs threads Message-ID: <20230222210118.A7158868C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f665acb88c7a9a50e6b93a0daefb53ca3bcc2f79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master threads are mandatory since bump to version 2.2.0 in commit af6f7aa76db5aed1eada0b27bd0375610a2fc728 and https://git.savannah.gnu.org/cgit/lightning.git/commit/?id=d5a7c8e4ad719e84dbb4904c532f906a1ef5a77b: In file included from incr.c:2: ../include/lightning.h:27:10: fatal error: pthread.h: No such file or directory 27 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/62205869159d4a73c59a9795140fa77e9c3310ae Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lightning/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/lightning/Config.in b/package/lightning/Config.in index a0542edce9..3cf7c28ae2 100644 --- a/package/lightning/Config.in +++ b/package/lightning/Config.in @@ -1,13 +1,14 @@ -comment "lightning needs a toolchain w/ dynamic library" +comment "lightning needs a toolchain w/ dynamic library, threads" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_LIGHTNING bool "lightning" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS help GNU lightning is a library that generates assembly language code at run-time. From thomas.petazzoni at bootlin.com Wed Feb 22 21:01:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 22:01:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/lightning: needs threads In-Reply-To: <20230222182210.2539248-1-fontaine.fabrice@gmail.com> References: <20230222182210.2539248-1-fontaine.fabrice@gmail.com> Message-ID: <20230222220120.5b3f3d48@windsurf> On Wed, 22 Feb 2023 19:22:10 +0100 Fabrice Fontaine wrote: > threads are mandatory since bump to version 2.2.0 in commit > af6f7aa76db5aed1eada0b27bd0375610a2fc728 and > https://git.savannah.gnu.org/cgit/lightning.git/commit/?id=d5a7c8e4ad719e84dbb4904c532f906a1ef5a77b: > > In file included from incr.c:2: > ../include/lightning.h:27:10: fatal error: pthread.h: No such file or directory > 27 | #include > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/62205869159d4a73c59a9795140fa77e9c3310ae > > Signed-off-by: Fabrice Fontaine > --- > package/lightning/Config.in | 5 +++-- > 1 file changed, 3 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 Wed Feb 22 21:03:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 22:03:18 +0100 Subject: [Buildroot] [git commit branch/next] package/qemu: add option to install blobs Message-ID: <20230222210330.DD7F1868CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97c40266b1b69e101ce035c8aa73bf2665c5c256 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Binary blobs are BIOS of some sorts for the various machines emulated by QEMU. There is no option to individually install blobs; it's an all-or-nothing option. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in | 11 +++++++++++ package/qemu/qemu.mk | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 154b98a541..a446c0cf68 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -58,6 +58,17 @@ config BR2_PACKAGE_QEMU_SYSTEM if BR2_PACKAGE_QEMU_SYSTEM +config BR2_PACKAGE_QEMU_BLOBS + bool "Install binary blobs" + default y + help + Say 'y' here (the default) to install binary blobs (such as + BIOS or firmwares for the different machines simulated by + QEMU). Say 'n' to not install those blobs. + + Note: Some machines may be unbootable without those blobs. + If unsure, say 'y'. + config BR2_PACKAGE_QEMU_SLIRP bool "Enable user mode networking (SLIRP)" select BR2_PACKAGE_SLIRP diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 58b4ff10a5..d514a2285c 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -246,6 +246,12 @@ ifeq ($(BR2_STATIC_LIBS),y) QEMU_OPTS += --static endif +ifeq ($(BR2_PACKAGE_QEMU_BLOBS),y) +QEMU_OPTS += --enable-install-blobs +else +QEMU_OPTS += --disable-install-blobs +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define QEMU_CONFIGURE_CMDS From thomas.petazzoni at bootlin.com Wed Feb 22 21:03:49 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 22:03:49 +0100 Subject: [Buildroot] [PATCH] package/qemu: add option to install blobs In-Reply-To: <20230101143232.187601-1-yann.morin.1998@free.fr> References: <20230101143232.187601-1-yann.morin.1998@free.fr> Message-ID: <20230222220349.3cb1cbc5@windsurf> On Sun, 1 Jan 2023 15:32:32 +0100 "Yann E. MORIN" wrote: > Binary blobs are BIOS of some sorts for the various machines emulated > by QEMU. There is no option to individually install blobs; it's an > all-or-nothing option. > > Signed-off-by: "Yann E. MORIN" > --- > package/qemu/Config.in | 11 +++++++++++ > package/qemu/qemu.mk | 6 ++++++ > 2 files changed, 17 insertions(+) Applied to next, thanks. Should we install them unconditionally in the host variant? Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Wed Feb 22 21:22:35 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 22:22:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/netsurf: force libopenssl Message-ID: <20230222212235.16202-1-fontaine.fabrice@gmail.com> netsurf raises the following build failure since bump of libressl to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: content/fetchers/about.c: In function 'ns_X509_get_signature_nid': content/fetchers/about.c:548:25: error: dereferencing pointer to incomplete type 'X509 {aka struct x509_st}' return OBJ_obj2nid(cert->cert_info->key->algor->algorithm); ^~ Fixes: - http://autobuild.buildroot.org/results/c225aaac31398ba495921bd4b85e588199822561 Signed-off-by: Fabrice Fontaine --- package/netsurf/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/netsurf/Config.in b/package/netsurf/Config.in index 4f7d5c2713..394befcf28 100644 --- a/package/netsurf/Config.in +++ b/package/netsurf/Config.in @@ -20,6 +20,7 @@ config BR2_PACKAGE_NETSURF select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL if BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if BR2_PACKAGE_LIBCURL help NetSurf is a compact graphical web browser which aims for HTML5, CSS and JavaScript support. -- 2.39.1 From fontaine.fabrice at gmail.com Wed Feb 22 22:08:35 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 23:08:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/optee-client: fix BR2_PACKAGE_OPTEE_CLIENT_TEEACL Message-ID: <20230222220835.355342-1-fontaine.fabrice@gmail.com> Fix typo added by commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82 resulting in the following build failure: -- Checking for module 'uuid' -- Package 'uuid', required by 'virtual:world', not found CMake Error at /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:603 (message): A required package was not found Call Stack (most recent call first): /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:825 (_pkg_check_modules_internal) CMakeLists.txt:43 (pkg_check_modules) Fixes: - http://autobuild.buildroot.org/results/e1c6b5c9e841a003037045b2ff7afd9836e7c640 Signed-off-by: Fabrice Fontaine --- package/optee-client/optee-client.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 311ca191b0..ef113c838f 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -27,7 +27,7 @@ OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF endif ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y) -OPTEE_CLIENT_EXT_DEPENDENCIES += host-pkgconf util-linux +OPTEE_CLIENT_DEPENDENCIES += host-pkgconf util-linux OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=ON else OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=OFF -- 2.39.1 From ckhardin at gmail.com Wed Feb 22 22:11:31 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:11:31 -0800 Subject: [Buildroot] [PATCH v2 0/3] RFC source control tracking for linux/uboot In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230222221134.25904-1-ckhardin@gmail.com> Adding source control tracking into the linux and uboot packages specifically. The generic problem is that buildroot needs to make reproducible tarballs for verification which means the ".git" directories have to exlcuded from the archive since they can change even thought the contents from the git reference has not changed. This leads to the problem that common setlocalversion script will not work in the build because after the extract there is no access to the history information given the reasons above. To mitigate this problem and allow change control tracking for local development and remote references a somewhat intruisive change needs to be introduced at the download step for the archive to add an scmversion during the creation when both the revision history in the source tree exists and the archive is being created. Charles Hardin (3): support/download: add a helper scipt to generate scmversions boot/uboot: add a scmversion rsync hook when overriding srcdir linux: add a scmversion rsync hook when overriding srcdir boot/uboot/uboot.mk | 12 +++++++ linux/linux.mk | 12 +++++++ package/pkg-download.mk | 1 + support/download/dl-wrapper | 5 +-- support/download/git | 10 ++++++ support/download/hg | 10 ++++++ support/download/scmversion | 63 +++++++++++++++++++++++++++++++++++++ support/download/svn | 10 ++++++ 8 files changed, 121 insertions(+), 2 deletions(-) create mode 100755 support/download/scmversion -- 2.24.3 (Apple Git-128) From ckhardin at gmail.com Wed Feb 22 22:11:32 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:11:32 -0800 Subject: [Buildroot] [PATCH v2 1/3] support/download: add a helper scipt to generate scmversions In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230222221134.25904-2-ckhardin@gmail.com> Primarily focused on uboot and linux, getting the scmversion from the custom repository references is required for change control tracking off of different builds and pipelines. So, extend the download framework to generate these files while the locks are being held for the generation to avoid the git information from changes during the download process. Signed-off-by: Charles Hardin --- package/pkg-download.mk | 1 + support/download/dl-wrapper | 5 +-- support/download/git | 10 ++++++ support/download/hg | 10 ++++++ support/download/scmversion | 63 +++++++++++++++++++++++++++++++++++++ support/download/svn | 10 ++++++ 6 files changed, 97 insertions(+), 2 deletions(-) create mode 100755 support/download/scmversion diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 0718f21aad..333a53ce7e 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -119,6 +119,7 @@ define DOWNLOAD -n '$($(2)_BASENAME_RAW)' \ -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ + $(if $($(2)_SCMVERSION),-s) \ $(if $($(2)_GIT_SUBMODULES),-r) \ $(if $($(2)_GIT_LFS),-l) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 1e8d6058f6..dfb02f7fe8 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -25,7 +25,7 @@ main() { local -a uris # Parse our options; anything after '--' is for the backend - while getopts ":c:d:D:o:n:N:H:lrf:u:qp:" OPT; do + while getopts ":c:d:D:o:n:N:H:slrf:u:qp:" OPT; do case "${OPT}" in c) cset="${OPTARG}";; d) dl_dir="${OPTARG}";; @@ -34,6 +34,7 @@ main() { n) raw_base_name="${OPTARG}";; N) base_name="${OPTARG}";; H) hfile="${OPTARG}";; + s) scmversion="-s";; l) large_file="-l";; r) recurse="-r";; f) filename="${OPTARG}";; @@ -129,7 +130,7 @@ main() { -f "${filename}" \ -u "${uri}" \ -o "${tmpf}" \ - ${quiet} ${large_file} ${recurse} -- "${@}" + ${quiet} ${scmversion} ${large_file} ${recurse} -- "${@}" then # cd back to keep path coherence cd "${OLDPWD}" diff --git a/support/download/git b/support/download/git index 1a1c315f73..0a640bbec9 100755 --- a/support/download/git +++ b/support/download/git @@ -12,6 +12,7 @@ set -E # # Options: # -q Be quiet. +# -s Generate an scmversion file # -r Clone and archive sub-modules. # -o FILE Generate archive in FILE. # -u URI Clone from repository at URI. @@ -51,11 +52,13 @@ _on_error() { } quiet= +scmversion=0 large_file=0 recurse=0 while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q; exec >/dev/null;; + s) scmversion=1;; l) large_file=1;; r) recurse=1;; o) output="${OPTARG}";; @@ -229,3 +232,10 @@ popd >/dev/null # the state of the remote server. It also would generate large tarballs # (gigabytes for some linux trees) when a full clone took place. mk_tar_gz "${git_cache}" "${basename}" "${date}" "${output}" ".git/*" + +# If an scmversion is needed then generate the version information +if [ ${scmversion} -eq 1 ]; then + post_process_unpack "${base_name}" "${output}" + support/download/scmversion "${git_cache}" "${base_name}/.scmversion" + post_process_repack "$(pwd)" "${base_name}" "${output}" +fi diff --git a/support/download/hg b/support/download/hg index 768a27e06f..6bf058f0a7 100755 --- a/support/download/hg +++ b/support/download/hg @@ -7,6 +7,7 @@ set -e # # Options: # -q Be quiet. +# -s Generate an scmversion file # -o FILE Generate archive in FILE. # -u URI Clone from repository at URI. # -c CSET Use changeset (or revision) CSET. @@ -16,9 +17,11 @@ set -e # HG : the hg command to call quiet= +scmversion= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q;; + s) scmversion=1;; o) output="${OPTARG}";; u) uri="${OPTARG}";; c) cset="${OPTARG}";; @@ -48,3 +51,10 @@ _hg clone ${quiet} "${@}" --noupdate "'${uri}'" "'${basename}'" _plain_hg archive ${quiet} --repository "'${basename}'" --type tgz \ --prefix "'${basename}'" --rev "'${cset}'" \ - >"${output}" + +# If an scmversion is needed then generate the version information +if [ ${scmversion} -eq 1 ]; then + post_process_unpack "${base_name}" "${output}" + support/download/scmversion "${git_cache}" "${base_name}/.scmversion" + post_process_repack "$(pwd)" "${base_name}" "${output}" +fi diff --git a/support/download/scmversion b/support/download/scmversion new file mode 100755 index 0000000000..16868a11e5 --- /dev/null +++ b/support/download/scmversion @@ -0,0 +1,63 @@ +#!/usr/bin/env bash +set -x +set -e + +# Helper to generate an scmversion in a dowload script before +# the tarball is created. Because the tarball has to exclude +# repository directories like .git and .hg to make reproducible +# archives on subsequent downloads the version information is +# not available during the builds for a script like setlocalversion +# to run. +# +# So, this is hook to call right before the make tarball gz that +# will generate a .scmversion file that will be included in an +# archive and then available during the build steps. +# +# Call it with: +# $1: the path to the srctree (see mk_tar_gz in helpers) +# $2: output file +# +# Because this can fail for a variety of reason, there is no exit +# code to avoid build breakage. It is assumed the scripts will be +# reproducible because they are based on the contents that get generated + +while getopts :q OPT; do + case "${OPT}" in + q) exec >/dev/null;; + \?) exit 1;; + esac +done +shift $((OPTIND-1)) + +srctree="${1}" +scmversion="${2}" + +# Bail early if no srctree or scmversion +if [ -z "${srctree}" -o -z "${scmversion}" ]; then + exit 0 +fi + +# Does the scmversion exist and readonly +if [ -f "${scmversion}" -a ! -w "${scmversion}" ]; then + printf "WARNING: scmversion %s is readonly\n" "${scmversion}" >&2 + exit 0 +fi + +# +# Generate the scmversion from some expected locations in srctree +# and fallback to the buildroot version of setlocalversion another +# script is not used +# +if [ -x "${srctree}/setlocalversion" ]; then + res=$(cd "${srctree}"; ./setlocalversion) +elif [ -x "${srctree}/scripts/setlocalversion" ]; then + res=$(cd "${srctree}"; ./scripts/setlocalversion) +elif [ -x "${srctree}/tools/setlocalversion" ]; then + res=$(cd "${srctree}"; ./tools/setlocalversion) +fi +if [ -z "${res}" ]; then + res=$("${0%/*}/../scripts/setlocalversion" "${srctree}") +fi + +[ -n "${res}" ] && (echo "${res}" > "${scmversion}") +exit 0 diff --git a/support/download/svn b/support/download/svn index b23b7773d3..89da736172 100755 --- a/support/download/svn +++ b/support/download/svn @@ -12,6 +12,7 @@ set -e # # Options: # -q Be quiet. +# -s Generate an scmversion file # -o FILE Generate archive in FILE. # -u URI Checkout from repository at URI. # -c REV Use revision REV. @@ -23,9 +24,11 @@ set -e . "${0%/*}/helpers" quiet= +scmversion=0 while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q;; + s) scmversion=1;; o) output="${OPTARG}";; u) uri="${OPTARG}";; c) rev="${OPTARG}";; @@ -65,3 +68,10 @@ date="$( _plain_svn info "'${uri}@${rev}'" \ # We did a 'svn export' above, so it's not a working copy (there is no .svn # directory or file to ignore). mk_tar_gz "${basename}" "${basename}" "${date}" "${output}" + +# If an scmversion is needed then generate the version information +if [ ${scmversion} -eq 1 ]; then + post_process_unpack "${base_name}" "${output}" + support/download/scmversion "${git_cache}" "${base_name}/.scmversion" + post_process_repack "$(pwd)" "${base_name}" "${output}" +fi -- 2.24.3 (Apple Git-128) From ckhardin at gmail.com Wed Feb 22 22:11:33 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:11:33 -0800 Subject: [Buildroot] [PATCH v2 2/3] boot/uboot: add a scmversion rsync hook when overriding srcdir In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230222221134.25904-3-ckhardin@gmail.com> During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define PLAIN_VERSION "2018.03-01358-gbda75d6a8b" #define U_BOOT_VERSION "U-Boot " PLAIN_VERSION Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..edb6c646c7 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -28,18 +28,30 @@ UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL)) else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = git +UBOOT_SCMVERSION = YES else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_HG),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = hg +UBOOT_SCMVERSION = YES else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_SVN),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = svn +UBOOT_SCMVERSION = YES else # Handle stable official U-Boot versions UBOOT_SITE = https://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 endif +ifneq ($(UBOOT_OVERRIDE_SRCDIR),) +define UBOOT_SCMVERSION_HOOK + $(TOPDIR)/support/download/scmversion \ + $(abspath $(UBOOT_OVERRIDE_SRCDIR)) $(@D)/.scmversion +endef + +UBOOT_POST_RSYNC_HOOKS += UBOOT_SCMVERSION_HOOK +endif + ifeq ($(BR2_TARGET_UBOOT)$(BR2_TARGET_UBOOT_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) endif -- 2.24.3 (Apple Git-128) From ckhardin at gmail.com Wed Feb 22 22:11:34 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:11:34 -0800 Subject: [Buildroot] [PATCH v2 3/3] linux: add a scmversion rsync hook when overriding srcdir In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <20230222221134.25904-4-ckhardin@gmail.com> During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define UTS_RELEASE "5.4.70-00031-g92c23d10d003" Signed-off-by: Charles Hardin --- linux/linux.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..b72318e3f2 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -24,12 +24,15 @@ LINUX_SOURCE = $(notdir $(LINUX_TARBALL)) else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = git +LINUX_SCMVERSION = YES else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_HG),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = hg +LINUX_SCMVERSION = YES else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_SVN),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = svn +LINUX_SCMVERSION = YES else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION),y) LINUX_SOURCE = linux-cip-$(LINUX_VERSION).tar.gz LINUX_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot @@ -46,6 +49,15 @@ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_ endif endif +ifneq ($(LINUX_OVERRIDE_SRCDIR),) +define LINUX_SCMVERSION_HOOK + $(TOPDIR)/support/download/scmversion \ + $(abspath $(LINUX_OVERRIDE_SRCDIR)) $(@D)/.scmversion +endef + +LINUX_POST_RSYNC_HOOKS += LINUX_SCMVERSION_HOOK +endif + ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) endif -- 2.24.3 (Apple Git-128) From fontaine.fabrice at gmail.com Wed Feb 22 22:17:50 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 22 Feb 2023 23:17:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/optee-client: fix uclibc build Message-ID: <20230222221750.558885-1-fontaine.fabrice@gmail.com> Fix the following uclibc build failure raised since bump to version 3.19.0 in commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82: /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c: In function 'teeacl_user_is_member_of': /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c:75:12: error: implicit declaration of function 'reallocarray' [-Werror=implicit-function-declaration] 75 | groups = reallocarray(groups, grouplistsize, sizeof(gid_t)); | ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/03eba71ab9b87676f2606ecf2a9b5a151fc396bb Signed-off-by: Fabrice Fontaine --- ...-use-realloc-instead-of-reallocarray.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch diff --git a/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch new file mode 100644 index 0000000000..88f5a4f87e --- /dev/null +++ b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch @@ -0,0 +1,34 @@ +From dde6306458331371be5df15e3ca953697d2463ef Mon Sep 17 00:00:00 2001 +From: Eero Aaltonen +Date: Thu, 2 Feb 2023 17:22:29 +0200 +Subject: [PATCH] libteeacl: use realloc() instead of reallocarray() + +Use realloc() instead of reallocarray(), since uClibc apparently does +not implement reallocarray(). + +Fixes: https://github.com/OP-TEE/optee_client/issues/339 + +Signed-off-by: Eero Aaltonen +Reviewed-by: Jerome Forissier + +[Retrieved from: +https://github.com/OP-TEE/optee_client/commit/dde6306458331371be5df15e3ca953697d2463ef] +Signed-off-by: Fabrice Fontaine +--- + libteeacl/src/group.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libteeacl/src/group.c b/libteeacl/src/group.c +index 10965dd0..bd165a11 100644 +--- a/libteeacl/src/group.c ++++ b/libteeacl/src/group.c +@@ -72,7 +72,8 @@ enum rv_groupmember teeacl_user_is_member_of(const char *user, gid_t group) + if (ret == -1) { + p_groups = groups; + +- groups = reallocarray(groups, grouplistsize, sizeof(gid_t)); ++ /* we use realloc, since uClibc does not implement reallocarray */ ++ groups = realloc(groups, grouplistsize * sizeof(gid_t)); + if (!groups) { + free(p_groups); + return E_MEMORY; -- 2.39.1 From thomas.petazzoni at bootlin.com Wed Feb 22 22:19:04 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:19:04 +0100 Subject: [Buildroot] [git commit branch/next] package/shadow: new package Message-ID: <20230222222058.23633868E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f78c5cb5cae93a9e63dad4361d78e1787759382f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next shadow provides utilities to deal with user accounts. The shadow package includes the necessary programs for converting UNIX password files to the shadow password format, plus programs for managing user and group accounts. Especially it is useful if rootless podman container should be used, which requires newuidmap and newgidmap. Co-authored-by: Nicolas Carrier [Nicolas.Carrier at orolia.com provided the test case] Signed-off-by: Raphael Pavlidis Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/shadow/Config.in | 62 ++++++++++++ package/shadow/shadow.hash | 3 + package/shadow/shadow.mk | 135 +++++++++++++++++++++++++++ support/testing/tests/package/test_shadow.py | 55 +++++++++++ 6 files changed, 257 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 599cfe6886..d052e59122 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2429,6 +2429,7 @@ F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py N: Raphael Pavlidis +F: package/shadow/ F: package/slirp4netns/ F: package/sway/ F: package/x11r7/xwayland/ diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..7c32305129 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2701,6 +2701,7 @@ menu "System tools" source "package/sdbus-cpp/Config.in" source "package/sdbusplus/Config.in" source "package/seatd/Config.in" + source "package/shadow/Config.in" source "package/smack/Config.in" source "package/start-stop-daemon/Config.in" source "package/supervisor/Config.in" diff --git a/package/shadow/Config.in b/package/shadow/Config.in new file mode 100644 index 0000000000..e3580c2cf5 --- /dev/null +++ b/package/shadow/Config.in @@ -0,0 +1,62 @@ +menuconfig BR2_PACKAGE_SHADOW + bool "shadow" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + help + Utilities to deal with user accounts. + + https://github.com/shadow-maint/shadow + +if BR2_PACKAGE_SHADOW + +config BR2_PACKAGE_SHADOW_SHADOWGRP + bool "shadowgrp" + help + Enable shadow group support. + +config BR2_PACKAGE_SHADOW_ACCOUNT_TOOLS_SETUID + bool "account-tools-setuid" + depends on BR2_USE_MMU # linux-pam + depends on BR2_ENABLE_LOCALE # linux-pam + depends on BR2_USE_WCHAR # linux-pam + depends on !BR2_STATIC_LIBS # linux-pam + select BR2_PACKAGE_LINUX_PAM + help + Install the user and group management tools (e.g. groupadd) + with setuid and authenticate the callers via PAM. + +comment "account-tools-setuid needs a toolchain w/ dynamic library, wchar, locale" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_ENABLE_LOCALE + +config BR2_PACKAGE_SHADOW_UTMPX + bool "utmpx" + help + Enable loggin in utmpx / wtmpx. + +config BR2_PACKAGE_SHADOW_SUBORDINATE_IDS + bool "subordinate-ids" + help + Support subordinate ids. Helpful to use container solution + like podman without root. + +config BR2_PACKAGE_SHADOW_SHA_CRYPT + bool "sha-crypt" + default y + help + Allow the SHA256 and SHA512 password encryption algorithms. + +config BR2_PACKAGE_SHADOW_BCRYPT + bool "bcrypt" + help + Allow the bcrypt password encryption algorithm. + +config BR2_PACKAGE_SHADOW_YESCRYPT + bool "yescrypt" + help + Allow the yescrypt password encryption algorithm. + +endif # BR2_PACKAGE_SHADOW + +comment "shadow needs a toolchain w/ headers >= 4.14, dynamic library" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash new file mode 100644 index 0000000000..2e5c4a8168 --- /dev/null +++ b/package/shadow/shadow.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9afe245d79a2e7caac5f1ed62519b17416b057ec89df316df1c3935502f9dd2c shadow-4.13.tar.xz +sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk new file mode 100644 index 0000000000..d8f913a648 --- /dev/null +++ b/package/shadow/shadow.mk @@ -0,0 +1,135 @@ +################################################################################ +# +# shadow +# +################################################################################ + +SHADOW_VERSION = 4.13 +SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION) +SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz +SHADOW_LICENSE = BSD-3-Clause +SHADOW_LICENSE_FILES = COPYING +SHADOW_CPE_ID_VENDOR = debian + +SHADOW_CONF_OPTS = \ + --disable-man \ + --without-btrfs \ + --without-nscd \ + --without-skey \ + --without-sssd \ + --without-su \ + --without-tcb + +ifeq ($(BR2_PACKAGE_SHADOW_SHADOWGRP),y) +SHADOW_CONF_OPTS += --enable-shadowgrp +else +SHADOW_CONF_OPTS += --disable-shadowgrp +endif + +ifeq ($(BR2_PACKAGE_SHADOW_ACCOUNT_TOOLS_SETUID),y) +SHADOW_CONF_OPTS += --enable-account-tools-setuid +define SHADOW_ACCOUNT_TOOLS_SETUID_PERMISSIONS + /usr/sbin/chgpasswd f 4755 0 0 - - - - - + /usr/sbin/chpasswd f 4755 0 0 - - - - - + /usr/sbin/groupadd f 4755 0 0 - - - - - + /usr/sbin/groupdel f 4755 0 0 - - - - - + /usr/sbin/groupmod f 4755 0 0 - - - - - + /usr/sbin/newusers f 4755 0 0 - - - - - + /usr/sbin/useradd f 4755 0 0 - - - - - + /usr/sbin/userdel f 4755 0 0 - - - - - + /usr/sbin/usermod f 4755 0 0 - - - - - +endef +else +SHADOW_CONF_OPTS += --disable-account-tools-setuid +endif + +ifeq ($(BR2_PACKAGE_SHADOW_UTMPX),y) +SHADOW_CONF_OPTS += --enable-utmpx +else +SHADOW_CONF_OPTS += --disable-utmpx +endif + +ifeq ($(BR2_PACKAGE_SHADOW_SUBORDINATE_IDS),y) +SHADOW_CONF_OPTS += --enable-subordinate-ids +define SHADOW_SUBORDINATE_IDS_PERMISSIONS + /usr/bin/newuidmap f 4755 0 0 - - - - - + /usr/bin/newgidmap f 4755 0 0 - - - - - +endef +else +SHADOW_CONF_OPTS += --disable-subordinate-ids +endif + +ifeq ($(BR2_PACKAGE_ACL),y) +SHADOW_CONF_OPTS += --with-acl +SHADOW_DEPENDENCIES += acl +else +SHADOW_CONF_OPTS += --without-acl +endif + +ifeq ($(BR2_PACKAGE_ATTR),y) +SHADOW_CONF_OPTS += --with-attr +SHADOW_DEPENDENCIES += attr +else +SHADOW_CONF_OPTS += --without-attr +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +SHADOW_CONF_OPTS += --with-audit +SHADOW_DEPENDENCIES += audit +else +SHADOW_CONF_OPTS += --without-audit +endif + +ifeq ($(BR2_PACKAGE_CRACKLIB),y) +SHADOW_CONF_OPTS += --with-libcrack +SHADOW_DEPENDENCIES += cracklib +else +SHADOW_CONF_OPTS += --without-libcrack +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +SHADOW_CONF_OPTS += --with-selinux +SHADOW_DEPENDENCIES += libselinux libsemanage +else +SHADOW_CONF_OPTS += --without-selinux +endif + +# linux-pam is also used without account-tools-setuid enabled +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +SHADOW_CONF_OPTS += --with-libpam +SHADOW_DEPENDENCIES += linux-pam +else +SHADOW_CONF_OPTS += --without-libpam +endif + +ifeq ($(BR2_PACKAGE_SHADOW_SHA_CRYPT),y) +SHADOW_CONF_OPTS += --with-sha-crypt +else +SHADOW_CONF_OPTS += --without-sha-crypt +endif + +ifeq ($(BR2_PACKAGE_SHADOW_BCRYPT),y) +SHADOW_CONF_OPTS += --with-bcrypt +else +SHADOW_CONF_OPTS += --without-bcrypt +endif + +ifeq ($(BR2_PACKAGE_SHADOW_YESCRYPT),y) +SHADOW_CONF_OPTS += --with-yescrypt +else +SHADOW_CONF_OPTS += --without-yescrypt +endif + +define SHADOW_PERMISSIONS + /usr/bin/chage f 4755 0 0 - - - - - + /usr/bin/chfn f 4755 0 0 - - - - - + /usr/bin/chsh f 4755 0 0 - - - - - + /usr/bin/expiry f 4755 0 0 - - - - - + /usr/bin/gpasswd f 4755 0 0 - - - - - + /usr/bin/newgrp f 4755 0 0 - - - - - + /usr/bin/passwd f 4755 0 0 - - - - - + $(SHADOW_ACCOUNT_TOOLS_SETUID_PERMISSIONS) + $(SHADOW_SUBORDINATE_IDS_PERMISSIONS) +endef + +$(eval $(autotools-package)) diff --git a/support/testing/tests/package/test_shadow.py b/support/testing/tests/package/test_shadow.py new file mode 100644 index 0000000000..c5151b4fdb --- /dev/null +++ b/support/testing/tests/package/test_shadow.py @@ -0,0 +1,55 @@ +import os + +from infra.basetest import BRTest, BASIC_TOOLCHAIN_CONFIG + + +class TestShadow(BRTest): + username = 'user_test' + config = BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_arm=y + BR2_PACKAGE_SHADOW=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="65536" + """ + timeout = 60 + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.ext4") + self.emulator.boot(arch="armv7", + kernel="builtin", + kernel_cmdline=["root=/dev/mmcblk0", + "rootfstype=ext4"], + options=["-drive", f"file={img},if=sd,format=raw"]) + self.emulator.login() + + def test_nologin(self): + self.login() + + self.assertRunOk("! nologin") + cmd = 'test "$(nologin)" = "This account is currently not available."' + self.assertRunOk(cmd) + + def test_useradd_del(self): + username = self.username + self.login() + + self.assertRunOk(f'userdel {username} || true') + self.assertRunOk(f'groupdel {username} || true') + self.assertRunOk(f'useradd -s /bin/sh {username}') + self.assertRunOk(f'test $(su {username} -c "whoami") = {username}') + self.assertRunOk(f'userdel {username}') + + def test_usermod(self): + username = self.username + new_home = '/tmp' + self.login() + + self.assertRunOk(f'userdel {username} || true') + self.assertRunOk(f'groupdel {username} || true') + self.assertRunOk(f'useradd -s /bin/sh {username}') + self.assertRunOk(f'usermod {username} --home {new_home}') + self.assertRunOk(f'test $(su {username} -c \'echo $HOME\') = {new_home}') + self.assertRunOk(f'userdel {username}') + From thomas.petazzoni at bootlin.com Wed Feb 22 22:21:57 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:21:57 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: <20221224171920.11256-1-raphael.pavlidis@gmail.com> References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> Message-ID: <20230222232157.380b6109@windsurf> On Sat, 24 Dec 2022 18:19:20 +0100 Raphael Pavlidis wrote: > shadow provides utilities to deal with user accounts. > > The shadow package includes the necessary programs for converting UNIX > password files to the shadow password format, plus programs for managing > user and group accounts. Especially it is useful if rootless podman > container should be used, which requires newuidmap and newgidmap. > > Co-authored-by: Nicolas Carrier > [Nicolas.Carrier at orolia.com provided the test case] > Signed-off-by: Raphael Pavlidis > --- > Changes v3 -> v4: > - fix formatting issues in Config.in and shadow.mk. > - bump to version 4.13. > - add SHADOW_CPE_ID_VENDOR in shadow.mk. > - add userdel in the setuid list. > - fix typo in SHADOW_ACCOUNT_TOOLS_SETUID_PERMISSIONS. I have finally applied your patch. I fixed only two things: - Added a dependency on !BR2_STATIC_LIBS, because shadow uses unconditionally - Fixed the Config.in comment that already existed that said "shared libs", while we normally use "dynamic library". With those changes, applied to our next branch. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 22:22:11 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:22:11 +0100 Subject: [Buildroot] [git commit branch/next] package/wine: bump to version 8.0 Message-ID: <20230222222235.331C4868E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=463d0dd49454669e7d72179319aeb967686c129e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Multiple library checks are obsolete, either due to removal or due to built-in solutions. License file changed due to update of copyright year. Signed-off-by: Andr?? Zwing Signed-off-by: Thomas Petazzoni --- ...codeca-avoid-mpg123-functions-with-suffix.patch | 21 ------------- ...p3dmod-avoid-mpg123-functions-with-suffix.patch | 21 ------------- package/wine/wine.hash | 4 +-- package/wine/wine.mk | 35 ++-------------------- 4 files changed, 5 insertions(+), 76 deletions(-) diff --git a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch b/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 8332db4b38..0000000000 --- a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 75b70efdaa2d4baa064271098878b79f66df155f -Author: Andr?? Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - l3codeca.acm: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/75b70efdaa2d4baa064271098878b79f66df155f] -Signed-off-by: Andr?? Zwing - -diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in -index 451794b2624..31765766d4e 100644 ---- a/dlls/l3codeca.acm/Makefile.in -+++ b/dlls/l3codeca.acm/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = l3codeca.acm - IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mpegl3.c diff --git a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch b/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 16f2ba2898..0000000000 --- a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 8d441659f7c7ae359e06a99e7abaae57792356a0 -Author: Andr?? Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - mp3dmod: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/8d441659f7c7ae359e06a99e7abaae57792356a0] -Signed-off-by: Andr?? Zwing - -diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in -index dabbb1dfeae..3ba343a4d34 100644 ---- a/dlls/mp3dmod/Makefile.in -+++ b/dlls/mp3dmod/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = mp3dmod.dll - IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mp3dmod.c diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 9a7a1c342a..b87964da12 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 5b43e27d5c085cb18f97394e46180310d5eef7c1d91c6895432a3889b2de086b wine-7.0.tar.xz +sha256 0272c20938f8721ae4510afaa8b36037457dd57661e4d664231079b9e91c792e wine-8.0.tar.xz # Locally calculated sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB -sha256 7c360930e51d56c8fa12fe1df8ed348ac77a9ad73f9582a303919469399b3ce4 LICENSE +sha256 793d045546467c8f49e35fbd6e02859e57e78f8bb53571e8200bffd0e966dfa8 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index a1c65bef4e..a629bf0dd6 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 7.0 +WINE_VERSION = 8.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/7.0 +WINE_SITE = https://dl.winehq.org/wine/source/8.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_CPE_ID_VENDOR = winehq @@ -27,7 +27,6 @@ WINE_CONF_OPTS = \ --without-mingw \ --without-opencl \ --without-oss \ - --without-vkd3d \ --without-vulkan # Wine uses a wrapper around gcc, and uses the value of --host to @@ -131,20 +130,6 @@ else WINE_CONF_OPTS += --without-v4l2 endif -ifeq ($(BR2_PACKAGE_OPENAL),y) -WINE_CONF_OPTS += --with-openal -WINE_DEPENDENCIES += openal -else -WINE_CONF_OPTS += --without-openal -endif - -ifeq ($(BR2_PACKAGE_OPENLDAP),y) -WINE_CONF_OPTS += --with-ldap -WINE_DEPENDENCIES += openldap -else -WINE_CONF_OPTS += --without-ldap -endif - ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) WINE_CONF_OPTS += --with-osmesa WINE_DEPENDENCIES += mesa3d @@ -266,19 +251,8 @@ endif # Wine only needs the host tools to be built, so cut-down the # build time by building just what we need. -HOST_WINE_TOOLS = \ - tools \ - tools/sfnt2fon \ - tools/widl \ - tools/winebuild \ - tools/winegcc \ - tools/wmc \ - tools/wrc - define HOST_WINE_BUILD_CMDS - $(foreach t, $(HOST_WINE_TOOLS), - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/$(t) - ) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) __tooldeps__ endef # Wine only needs its host variant to be built, not that it is @@ -304,10 +278,8 @@ HOST_WINE_CONF_OPTS += \ --without-gssapi \ --without-gstreamer \ --without-krb5 \ - --without-ldap \ --without-mingw \ --without-netapi \ - --without-openal \ --without-opencl \ --without-opengl \ --without-osmesa \ @@ -318,7 +290,6 @@ HOST_WINE_CONF_OPTS += \ --without-sdl \ --without-usb \ --without-v4l2 \ - --without-vkd3d \ --without-vulkan \ --without-x \ --without-xcomposite \ From thomas.petazzoni at bootlin.com Wed Feb 22 22:22:35 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:22:35 +0100 Subject: [Buildroot] [PATCH] package/wine: bump to version 8.0 In-Reply-To: <20230201192157.1631613-1-nerv@dawncrow.de> References: <20230201192157.1631613-1-nerv@dawncrow.de> Message-ID: <20230222232235.076e7017@windsurf> On Wed, 1 Feb 2023 20:21:57 +0100 Andr? Zwing wrote: > Multiple library checks are obsolete, either due to removal or due to built-in solutions. > > License file changed due to update of copyright year. > > Signed-off-by: Andr? Zwing > --- > ...a-avoid-mpg123-functions-with-suffix.patch | 21 ----------- > ...d-avoid-mpg123-functions-with-suffix.patch | 21 ----------- > package/wine/wine.hash | 4 +-- > package/wine/wine.mk | 35 ++----------------- > 4 files changed, 5 insertions(+), 76 deletions(-) > delete mode 100644 package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch > delete mode 100644 package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 22:23:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:23:31 +0100 Subject: [Buildroot] [git commit] package/netsurf: force libopenssl Message-ID: <20230222222356.8F4C086905@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efe2734fc58cc6bfcc8fa1b696bba81a9797efb9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master netsurf raises the following build failure since bump of libressl to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: content/fetchers/about.c: In function 'ns_X509_get_signature_nid': content/fetchers/about.c:548:25: error: dereferencing pointer to incomplete type 'X509 {aka struct x509_st}' return OBJ_obj2nid(cert->cert_info->key->algor->algorithm); ^~ Fixes: - http://autobuild.buildroot.org/results/c225aaac31398ba495921bd4b85e588199822561 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/netsurf/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/netsurf/Config.in b/package/netsurf/Config.in index 4f7d5c2713..394befcf28 100644 --- a/package/netsurf/Config.in +++ b/package/netsurf/Config.in @@ -20,6 +20,7 @@ config BR2_PACKAGE_NETSURF select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL if BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if BR2_PACKAGE_LIBCURL help NetSurf is a compact graphical web browser which aims for HTML5, CSS and JavaScript support. From thomas.petazzoni at bootlin.com Wed Feb 22 22:23:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:23:45 +0100 Subject: [Buildroot] [git commit] package/optee-client: fix BR2_PACKAGE_OPTEE_CLIENT_TEEACL Message-ID: <20230222222356.9C95686906@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02a6b77ed8214d837f7d1d43b10321ec5672fea9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix typo added by commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82 resulting in the following build failure: -- Checking for module 'uuid' -- Package 'uuid', required by 'virtual:world', not found CMake Error at /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:603 (message): A required package was not found Call Stack (most recent call first): /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:825 (_pkg_check_modules_internal) CMakeLists.txt:43 (pkg_check_modules) Fixes: - http://autobuild.buildroot.org/results/e1c6b5c9e841a003037045b2ff7afd9836e7c640 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/optee-client/optee-client.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 311ca191b0..ef113c838f 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -27,7 +27,7 @@ OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF endif ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y) -OPTEE_CLIENT_EXT_DEPENDENCIES += host-pkgconf util-linux +OPTEE_CLIENT_DEPENDENCIES += host-pkgconf util-linux OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=ON else OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=OFF From thomas.petazzoni at bootlin.com Wed Feb 22 22:23:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 22 Feb 2023 23:23:15 +0100 Subject: [Buildroot] [git commit] package/optee-client: fix uclibc build Message-ID: <20230222222356.829AC86904@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5be4abc574d6f2acfde4e523c73f4cee7ac373e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following uclibc build failure raised since bump to version 3.19.0 in commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82: /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c: In function 'teeacl_user_is_member_of': /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c:75:12: error: implicit declaration of function 'reallocarray' [-Werror=implicit-function-declaration] 75 | groups = reallocarray(groups, grouplistsize, sizeof(gid_t)); | ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/03eba71ab9b87676f2606ecf2a9b5a151fc396bb Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...eeacl-use-realloc-instead-of-reallocarray.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch new file mode 100644 index 0000000000..88f5a4f87e --- /dev/null +++ b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch @@ -0,0 +1,34 @@ +From dde6306458331371be5df15e3ca953697d2463ef Mon Sep 17 00:00:00 2001 +From: Eero Aaltonen +Date: Thu, 2 Feb 2023 17:22:29 +0200 +Subject: [PATCH] libteeacl: use realloc() instead of reallocarray() + +Use realloc() instead of reallocarray(), since uClibc apparently does +not implement reallocarray(). + +Fixes: https://github.com/OP-TEE/optee_client/issues/339 + +Signed-off-by: Eero Aaltonen +Reviewed-by: Jerome Forissier + +[Retrieved from: +https://github.com/OP-TEE/optee_client/commit/dde6306458331371be5df15e3ca953697d2463ef] +Signed-off-by: Fabrice Fontaine +--- + libteeacl/src/group.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libteeacl/src/group.c b/libteeacl/src/group.c +index 10965dd0..bd165a11 100644 +--- a/libteeacl/src/group.c ++++ b/libteeacl/src/group.c +@@ -72,7 +72,8 @@ enum rv_groupmember teeacl_user_is_member_of(const char *user, gid_t group) + if (ret == -1) { + p_groups = groups; + +- groups = reallocarray(groups, grouplistsize, sizeof(gid_t)); ++ /* we use realloc, since uClibc does not implement reallocarray */ ++ groups = realloc(groups, grouplistsize * sizeof(gid_t)); + if (!groups) { + free(p_groups); + return E_MEMORY; From ckhardin at gmail.com Wed Feb 22 22:30:50 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:30:50 -0800 Subject: [Buildroot] RFC [PATCH v2 0/3] scmversion tracking for linux and uboot In-Reply-To: <20230209231518.9458-1-ckhardin@gmail.com> References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: Adding source control tracking into the linux and uboot packages specifically. The generic problem is that buildroot needs to make reproducible tarballs for verification which means the ".git" directories have to be excluded from the archive since they can change even though the contents from the git reference has not changed. This leads to the problem that a setlocalversion script will not work in the build because after the extract there is no access to the history information given the reasons above. To mitigate this problem and allow change control tracking for local development and remote references a somewhat intruisive change needs to be introduced at the download step for the archive to add an scmversion during the creation when both the revision history in the source tree exists and the archive is being created. Charles Hardin (3): support/download: add a helper scipt to generate scmversions boot/uboot: add a scmversion rsync hook when overriding srcdir linux: add a scmversion rsync hook when overriding srcdir boot/uboot/uboot.mk | 12 +++++++ linux/linux.mk | 12 +++++++ package/pkg-download.mk | 1 + support/download/dl-wrapper | 5 +-- support/download/git | 10 ++++++ support/download/hg | 10 ++++++ support/download/scmversion | 63 +++++++++++++++++++++++++++++++++++++ support/download/svn | 10 ++++++ 8 files changed, 121 insertions(+), 2 deletions(-) create mode 100755 support/download/scmversion -- 2.24.3 (Apple Git-128) From ckhardin at gmail.com Wed Feb 22 22:30:51 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:30:51 -0800 Subject: [Buildroot] [PATCH v2 1/3] support/download: add a helper scipt to generate scmversions In-Reply-To: References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: Primarily focused on uboot and linux, getting the scmversion from the custom repository references is required for change control tracking off of different builds and pipelines. So, extend the download framework to generate these files while the locks are being held for the generation to avoid the git information from changes during the download process. Signed-off-by: Charles Hardin wip scmversion Signed-off-by: Charles Hardin --- package/pkg-download.mk | 1 + support/download/dl-wrapper | 5 +-- support/download/git | 10 ++++++ support/download/hg | 10 ++++++ support/download/scmversion | 63 +++++++++++++++++++++++++++++++++++++ support/download/svn | 10 ++++++ 6 files changed, 97 insertions(+), 2 deletions(-) create mode 100755 support/download/scmversion diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 0718f21aad..333a53ce7e 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -119,6 +119,7 @@ define DOWNLOAD -n '$($(2)_BASENAME_RAW)' \ -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ + $(if $($(2)_SCMVERSION),-s) \ $(if $($(2)_GIT_SUBMODULES),-r) \ $(if $($(2)_GIT_LFS),-l) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 1e8d6058f6..dfb02f7fe8 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -25,7 +25,7 @@ main() { local -a uris # Parse our options; anything after '--' is for the backend - while getopts ":c:d:D:o:n:N:H:lrf:u:qp:" OPT; do + while getopts ":c:d:D:o:n:N:H:slrf:u:qp:" OPT; do case "${OPT}" in c) cset="${OPTARG}";; d) dl_dir="${OPTARG}";; @@ -34,6 +34,7 @@ main() { n) raw_base_name="${OPTARG}";; N) base_name="${OPTARG}";; H) hfile="${OPTARG}";; + s) scmversion="-s";; l) large_file="-l";; r) recurse="-r";; f) filename="${OPTARG}";; @@ -129,7 +130,7 @@ main() { -f "${filename}" \ -u "${uri}" \ -o "${tmpf}" \ - ${quiet} ${large_file} ${recurse} -- "${@}" + ${quiet} ${scmversion} ${large_file} ${recurse} -- "${@}" then # cd back to keep path coherence cd "${OLDPWD}" diff --git a/support/download/git b/support/download/git index 1a1c315f73..277c412e26 100755 --- a/support/download/git +++ b/support/download/git @@ -12,6 +12,7 @@ set -E # # Options: # -q Be quiet. +# -s Generate an scmversion file # -r Clone and archive sub-modules. # -o FILE Generate archive in FILE. # -u URI Clone from repository at URI. @@ -51,11 +52,13 @@ _on_error() { } quiet= +scmversion=0 large_file=0 recurse=0 while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q; exec >/dev/null;; + s) scmversion=1;; l) large_file=1;; r) recurse=1;; o) output="${OPTARG}";; @@ -229,3 +232,10 @@ popd >/dev/null # the state of the remote server. It also would generate large tarballs # (gigabytes for some linux trees) when a full clone took place. mk_tar_gz "${git_cache}" "${basename}" "${date}" "${output}" ".git/*" + +# If an scmversion is needed then generate the version information +if [ ${scmversion} -eq 1 ]; then + post_process_unpack "${basename}" "${output}" + support/download/scmversion "${git_cache}" "${basename}/.scmversion" + post_process_repack "$(pwd)" "${basename}" "${output}" +fi diff --git a/support/download/hg b/support/download/hg index 768a27e06f..dcf36e6e1f 100755 --- a/support/download/hg +++ b/support/download/hg @@ -7,6 +7,7 @@ set -e # # Options: # -q Be quiet. +# -s Generate an scmversion file # -o FILE Generate archive in FILE. # -u URI Clone from repository at URI. # -c CSET Use changeset (or revision) CSET. @@ -16,9 +17,11 @@ set -e # HG : the hg command to call quiet= +scmversion= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q;; + s) scmversion=1;; o) output="${OPTARG}";; u) uri="${OPTARG}";; c) cset="${OPTARG}";; @@ -48,3 +51,10 @@ _hg clone ${quiet} "${@}" --noupdate "'${uri}'" "'${basename}'" _plain_hg archive ${quiet} --repository "'${basename}'" --type tgz \ --prefix "'${basename}'" --rev "'${cset}'" \ - >"${output}" + +# If an scmversion is needed then generate the version information +if [ ${scmversion} -eq 1 ]; then + post_process_unpack "${basename}" "${output}" + support/download/scmversion "${@}" "${basename}/.scmversion" + post_process_repack "$(pwd)" "${basename}" "${output}" +fi diff --git a/support/download/scmversion b/support/download/scmversion new file mode 100755 index 0000000000..16868a11e5 --- /dev/null +++ b/support/download/scmversion @@ -0,0 +1,63 @@ +#!/usr/bin/env bash +set -x +set -e + +# Helper to generate an scmversion in a dowload script before +# the tarball is created. Because the tarball has to exclude +# repository directories like .git and .hg to make reproducible +# archives on subsequent downloads the version information is +# not available during the builds for a script like setlocalversion +# to run. +# +# So, this is hook to call right before the make tarball gz that +# will generate a .scmversion file that will be included in an +# archive and then available during the build steps. +# +# Call it with: +# $1: the path to the srctree (see mk_tar_gz in helpers) +# $2: output file +# +# Because this can fail for a variety of reason, there is no exit +# code to avoid build breakage. It is assumed the scripts will be +# reproducible because they are based on the contents that get generated + +while getopts :q OPT; do + case "${OPT}" in + q) exec >/dev/null;; + \?) exit 1;; + esac +done +shift $((OPTIND-1)) + +srctree="${1}" +scmversion="${2}" + +# Bail early if no srctree or scmversion +if [ -z "${srctree}" -o -z "${scmversion}" ]; then + exit 0 +fi + +# Does the scmversion exist and readonly +if [ -f "${scmversion}" -a ! -w "${scmversion}" ]; then + printf "WARNING: scmversion %s is readonly\n" "${scmversion}" >&2 + exit 0 +fi + +# +# Generate the scmversion from some expected locations in srctree +# and fallback to the buildroot version of setlocalversion another +# script is not used +# +if [ -x "${srctree}/setlocalversion" ]; then + res=$(cd "${srctree}"; ./setlocalversion) +elif [ -x "${srctree}/scripts/setlocalversion" ]; then + res=$(cd "${srctree}"; ./scripts/setlocalversion) +elif [ -x "${srctree}/tools/setlocalversion" ]; then + res=$(cd "${srctree}"; ./tools/setlocalversion) +fi +if [ -z "${res}" ]; then + res=$("${0%/*}/../scripts/setlocalversion" "${srctree}") +fi + +[ -n "${res}" ] && (echo "${res}" > "${scmversion}") +exit 0 diff --git a/support/download/svn b/support/download/svn index b23b7773d3..b0e9f69a6b 100755 --- a/support/download/svn +++ b/support/download/svn @@ -12,6 +12,7 @@ set -e # # Options: # -q Be quiet. +# -s Generate an scmversion file # -o FILE Generate archive in FILE. # -u URI Checkout from repository at URI. # -c REV Use revision REV. @@ -23,9 +24,11 @@ set -e . "${0%/*}/helpers" quiet= +scmversion=0 while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q;; + s) scmversion=1;; o) output="${OPTARG}";; u) uri="${OPTARG}";; c) rev="${OPTARG}";; @@ -65,3 +68,10 @@ date="$( _plain_svn info "'${uri}@${rev}'" \ # We did a 'svn export' above, so it's not a working copy (there is no .svn # directory or file to ignore). mk_tar_gz "${basename}" "${basename}" "${date}" "${output}" + +# If an scmversion is needed then generate the version information +if [ ${scmversion} -eq 1 ]; then + post_process_unpack "${basename}" "${output}" + support/download/scmversion "${basename}" "${basename}/.scmversion" + post_process_repack "$(pwd)" "${basename}" "${output}" +fi -- 2.24.3 (Apple Git-128) From ckhardin at gmail.com Wed Feb 22 22:30:52 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:30:52 -0800 Subject: [Buildroot] [PATCH v2 2/3] boot/uboot: add a scmversion rsync hook when overriding srcdir In-Reply-To: References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: <70c8c0b4e34438c96257697086ff8b62fb6f2cd7.1677104777.git.ckhardin@gmail.com> During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define PLAIN_VERSION "2018.03-01358-gbda75d6a8b" #define U_BOOT_VERSION "U-Boot " PLAIN_VERSION Signed-off-by: Charles Hardin --- boot/uboot/uboot.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c3..edb6c646c7 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -28,18 +28,30 @@ UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL)) else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = git +UBOOT_SCMVERSION = YES else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_HG),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = hg +UBOOT_SCMVERSION = YES else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_SVN),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = svn +UBOOT_SCMVERSION = YES else # Handle stable official U-Boot versions UBOOT_SITE = https://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 endif +ifneq ($(UBOOT_OVERRIDE_SRCDIR),) +define UBOOT_SCMVERSION_HOOK + $(TOPDIR)/support/download/scmversion \ + $(abspath $(UBOOT_OVERRIDE_SRCDIR)) $(@D)/.scmversion +endef + +UBOOT_POST_RSYNC_HOOKS += UBOOT_SCMVERSION_HOOK +endif + ifeq ($(BR2_TARGET_UBOOT)$(BR2_TARGET_UBOOT_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) endif -- 2.24.3 (Apple Git-128) From ckhardin at gmail.com Wed Feb 22 22:30:53 2023 From: ckhardin at gmail.com (Charles Hardin) Date: Wed, 22 Feb 2023 14:30:53 -0800 Subject: [Buildroot] [PATCH v2 3/3] linux: add a scmversion rsync hook when overriding srcdir In-Reply-To: References: <20230209231518.9458-1-ckhardin@gmail.com> Message-ID: During development the override srcdir is often used with a local git repo and branch. To help track the builds used in those flows it is useful to have the scm version available as part of the info. With this hook, the auto generated version include will include the example. #define UTS_RELEASE "5.4.70-00031-g92c23d10d003" Signed-off-by: Charles Hardin --- linux/linux.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..b72318e3f2 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -24,12 +24,15 @@ LINUX_SOURCE = $(notdir $(LINUX_TARBALL)) else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = git +LINUX_SCMVERSION = YES else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_HG),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = hg +LINUX_SCMVERSION = YES else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_SVN),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = svn +LINUX_SCMVERSION = YES else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION),y) LINUX_SOURCE = linux-cip-$(LINUX_VERSION).tar.gz LINUX_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot @@ -46,6 +49,15 @@ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_ endif endif +ifneq ($(LINUX_OVERRIDE_SRCDIR),) +define LINUX_SCMVERSION_HOOK + $(TOPDIR)/support/download/scmversion \ + $(abspath $(LINUX_OVERRIDE_SRCDIR)) $(@D)/.scmversion +endef + +LINUX_POST_RSYNC_HOOKS += LINUX_SCMVERSION_HOOK +endif + ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) endif -- 2.24.3 (Apple Git-128) From thomas.petazzoni at bootlin.com Wed Feb 22 23:01:24 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 00:01:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/netsurf: force libopenssl In-Reply-To: <20230222212235.16202-1-fontaine.fabrice@gmail.com> References: <20230222212235.16202-1-fontaine.fabrice@gmail.com> Message-ID: <20230223000124.587fcdfa@windsurf> On Wed, 22 Feb 2023 22:22:35 +0100 Fabrice Fontaine wrote: > netsurf raises the following build failure since bump of libressl to > version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: > > content/fetchers/about.c: In function 'ns_X509_get_signature_nid': > content/fetchers/about.c:548:25: error: dereferencing pointer to incomplete type 'X509 {aka struct x509_st}' > return OBJ_obj2nid(cert->cert_info->key->algor->algorithm); > ^~ > > Fixes: > - http://autobuild.buildroot.org/results/c225aaac31398ba495921bd4b85e588199822561 > > Signed-off-by: Fabrice Fontaine > --- > package/netsurf/Config.in | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 23:01:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 00:01:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/optee-client: fix BR2_PACKAGE_OPTEE_CLIENT_TEEACL In-Reply-To: <20230222220835.355342-1-fontaine.fabrice@gmail.com> References: <20230222220835.355342-1-fontaine.fabrice@gmail.com> Message-ID: <20230223000129.0f8c4d51@windsurf> On Wed, 22 Feb 2023 23:08:35 +0100 Fabrice Fontaine wrote: > Fix typo added by commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82 > resulting in the following build failure: > > -- Checking for module 'uuid' > -- Package 'uuid', required by 'virtual:world', not found > CMake Error at /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:603 (message): > A required package was not found > Call Stack (most recent call first): > /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:825 (_pkg_check_modules_internal) > CMakeLists.txt:43 (pkg_check_modules) > > Fixes: > - http://autobuild.buildroot.org/results/e1c6b5c9e841a003037045b2ff7afd9836e7c640 > > Signed-off-by: Fabrice Fontaine > --- > package/optee-client/optee-client.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 22 23:01:33 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 00:01:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/optee-client: fix uclibc build In-Reply-To: <20230222221750.558885-1-fontaine.fabrice@gmail.com> References: <20230222221750.558885-1-fontaine.fabrice@gmail.com> Message-ID: <20230223000133.6e7cd7f3@windsurf> On Wed, 22 Feb 2023 23:17:50 +0100 Fabrice Fontaine wrote: > Fix the following uclibc build failure raised since bump to version > 3.19.0 in commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82: > > /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c: In function 'teeacl_user_is_member_of': > /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c:75:12: error: implicit declaration of function 'reallocarray' [-Werror=implicit-function-declaration] > 75 | groups = reallocarray(groups, grouplistsize, sizeof(gid_t)); > | ^~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/03eba71ab9b87676f2606ecf2a9b5a151fc396bb > > Signed-off-by: Fabrice Fontaine > --- > ...-use-realloc-instead-of-reallocarray.patch | 34 +++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From Alberto.Fahrenkrog at rigtechnologies.com.au Thu Feb 23 04:42:53 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Thu, 23 Feb 2023 04:42:53 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build Message-ID: Hello all, I'm trying to build a very simple custom python package following the instructions on the manual, yet I must be doing something very wrong as I get this result: $ make python-koala make[1]: *** No rule to make target 'python-koala'. Stop. make: *** [Makefile:23: _all] Error 2 I create my out of tree build with: make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads br_build_defconfig On my "br_build" folder I have a Config.in file: menu "Python-Libs" source "~/Projects/br_build/package/python-koala/Config.in" endmenu In "br_build/packages/python-koala/Config.in" config BR2_PACKAGE_PYTHON_KOALA ??????bool "python-koala" depends on BR2_PACKAGE_PYTHON3 ??????help ?????? Python implementation of Koala Library In "br_build/packages/python-koala/python-koala.mk" ################################################################################ # # python-koala # ################################################################################ PYTHON_KOALA_VERSION = 1.3.3 PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz PYTHON_KOALA_SITE = https://mywebsite.com.au/ExternalCode/koala/archive/ PYTHON_KOALA_SETUP_TYPE = setuptools $(eval $(python-koala)) If I run "make menuconfig" I can select or deselect the package, and it's selected per default on the br_build_defconfig (and in .config): BR2_PACKAGE_PYTHON_KOALA=y But if I try to run "make python-koala" I get the "no target" error. I'll still have a read and see what I might be doing wrong, but I'm very confused. Any ideas are very welcome. Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image900784.png Type: image/png Size: 14270 bytes Desc: image900784.png URL: From Alberto.Fahrenkrog at rigtechnologies.com.au Thu Feb 23 04:47:35 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Thu, 23 Feb 2023 04:47:35 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: References: Message-ID: Update, if I change $(eval $(python-koala)) to $(eval $(python-package)) I still get the same error. I assume that might have been one mistake. Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: buildroot on behalf of Alberto Fahrenkrog Sent: Thursday, February 23, 2023 12:42 PM To: buildroot at buildroot.org Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is important Hello all, I'm trying to build a very simple custom python package following the instructions on the manual, yet I must be doing something very wrong as I get this result: $ make python-koala make[1]: *** No rule to make target 'python-koala'. Stop. make: *** [Makefile:23: _all] Error 2 I create my out of tree build with: make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads br_build_defconfig On my "br_build" folder I have a Config.in file: menu "Python-Libs" source "~/Projects/br_build/package/python-koala/Config.in" endmenu In "br_build/packages/python-koala/Config.in" config BR2_PACKAGE_PYTHON_KOALA ??????bool "python-koala" depends on BR2_PACKAGE_PYTHON3 ??????help ?????? Python implementation of Koala Library In "br_build/packages/python-koala/python-koala.mk" ################################################################################ # # python-koala # ################################################################################ PYTHON_KOALA_VERSION = 1.3.3 PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz PYTHON_KOALA_SITE = https://mywebsite.com.au/ExternalCode/koala/archive/ PYTHON_KOALA_SETUP_TYPE = setuptools $(eval $(python-koala)) If I run "make menuconfig" I can select or deselect the package, and it's selected per default on the br_build_defconfig (and in .config): BR2_PACKAGE_PYTHON_KOALA=y But if I try to run "make python-koala" I get the "no target" error. I'll still have a read and see what I might be doing wrong, but I'm very confused. Any ideas are very welcome. Cheers, Alberto [cid:image900784.png at 3A858536.258EC748] Alberto? Fahrenkrog Senior Embedded Engineer Orica ? Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image900784.png Type: image/png Size: 14270 bytes Desc: image900784.png URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image261033.png Type: image/png Size: 14270 bytes Desc: image261033.png URL: From vfazio at xes-inc.com Wed Feb 22 15:32:34 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Wed, 22 Feb 2023 15:32:34 +0000 Subject: [Buildroot] [External] - [PATCH] boot/arm-trusted-firmware: introduce a choice to select the BL33 image In-Reply-To: <20230221214904.454053-1-thomas.petazzoni@bootlin.com> References: <20230221214904.454053-1-thomas.petazzoni@bootlin.com> Message-ID: > -----Original Message----- > From: Thomas Petazzoni > Sent: Tuesday, February 21, 2023 3:49 PM > To: buildroot at buildroot.org > Cc: Thomas Petazzoni ; Vincent Fazio > ; Casey Reeves ; Dick Olsson > ; Sergey Matyukevich > Subject: [External] - [PATCH] boot/arm-trusted-firmware: introduce a choice > to select the BL33 image > > We now have 3 different options to select an image as the BL33 stage of TF- > A: Barebox, U-Boot or EDK2. Technically speaking, they are mutually > exclusive: they all specify a BL33= variable to the TF-A build, and TF-A can > only support a single BL33 stage. > > However, as pointed out by Vincent Fazio in [0] there is nothing that > prevents selecting Barebox, U-Boot and EDK2 together, even though it > doesn't make sense. > > To address this, this commit introduces a choice...endchoice block, into which > the Barebox, U-Boot and EDK2 options are moved. An additional "none" > option is added, which is the default, and corresponds to not having any BL33 > image. > > Since we keep the same name for the options, no legacy handling is > necessary. > > [0] > https://lore.kernel.org/buildroot/PH1P110MB1603A4AA1638838DA56BAA06 > 9FDA9 at PH1P110MB1603.NAMP110.PROD.OUTLOOK.COM/ > > Reported-by: Vincent Fazio > Cc: Vincent Fazio > Cc: Casey Reeves > Signed-off-by: Thomas Petazzoni > --- > boot/arm-trusted-firmware/Config.in | 57 +++++++++++++++++------------ > 1 file changed, 34 insertions(+), 23 deletions(-) > > diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted- > firmware/Config.in > index cb54c6c9d8..a5ac987172 100644 > --- a/boot/arm-trusted-firmware/Config.in > +++ b/boot/arm-trusted-firmware/Config.in > @@ -129,8 +129,17 @@ config > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE > > endchoice > > +choice > + prompt "BL33" > + default BR2_TARGET_ARM_TRUSTED_FIRMWARE_NONE_AS_BL33 > + help > + Select the image to include as BL33. > + > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NONE_AS_BL33 > + bool "None" > + > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 > - bool "Use Barebox as BL33" > + bool "Barebox" > depends on BR2_TARGET_BAREBOX > help > This option allows to embed the Barebox generic BL33 image in @@ - > 139,6 +148,30 @@ config > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 > variable pointing to the generic bl33 image is passed > when building ATF. > > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 > + bool "U-Boot" > + depends on BR2_TARGET_UBOOT > + help > + This option allows to embed u-boot.bin as the BL33 part of > + the ARM Trusted Firmware. It ensures that the u-boot package > + gets built before ATF, and that the appropriate BL33 > + variable pointing to u-boot.bin is passed when building ATF. > + > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 > + bool "EDK2" > + depends on BR2_TARGET_EDK2 > + help > + This option allows to embed EDK2 as the BL33 part of > + the ARM Trusted Firmware. It ensures that the EDK2 package > + gets built before ATF, and that the appropriate BL33 > + variable pointing to the EDK2 is passed when building ATF. > + > + Do not choose this option if you intend to build ATF and EDK2 > + for the 'qemu_sbsa' platform. In this case, due to the EDK2 > + build system, the dependency between ATF and EDK is reversed. > + > +endchoice > + > if BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 > > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE > @@ -150,15 +183,6 @@ config > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE > > endif > > -config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 > - bool "Use U-Boot as BL33" > - depends on BR2_TARGET_UBOOT > - help > - This option allows to embed u-boot.bin as the BL33 part of > - the ARM Trusted Firmware. It ensures that the u-boot package > - gets built before ATF, and that the appropriate BL33 > - variable pointing to u-boot.bin is passed when building ATF. > - > if BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 > > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE > @@ -170,19 +194,6 @@ config > BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE > > endif > > -config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 > - bool "Use EDK2 as BL33" > - depends on BR2_TARGET_EDK2 > - help > - This option allows to embed EDK2 as the BL33 part of > - the ARM Trusted Firmware. It ensures that the EDK2 package > - gets built before ATF, and that the appropriate BL33 > - variable pointing to the EDK2 is passed when building ATF. > - > - Do not choose this option if you intend to build ATF and EDK2 > - for the 'qemu_sbsa' platform. In this case, due to the EDK2 > - build system, the dependency between ATF and EDK is reversed. > - > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW > bool "Include NXP RCW in BL2" > depends on BR2_PACKAGE_HOST_QORIQ_RCW > -- > 2.39.1 > Tested-by: Vincent Fazio From yann.morin.1998 at free.fr Thu Feb 23 06:22:59 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 23 Feb 2023 07:22:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/audit: force arm mode instead of Thumb mode In-Reply-To: <20230222143512.1555539-1-fontaine.fabrice@gmail.com> References: <20230222143512.1555539-1-fontaine.fabrice@gmail.com> Message-ID: <20230223062259.GJ2718518@scaer> Fabrice, All, On 2023-02-22 15:35 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure: > > /tmp/ccY5gl3z.s:2145: Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode > > Fixes: > - http://autobuild.buildroot.org/results/9d18a0d360b2e2f9e87c55daedda62d6ce198bb9 > > Signed-off-by: Fabrice Fontaine > --- > package/audit/audit.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/audit/audit.mk b/package/audit/audit.mk > index cbb174b980..af81dabac0 100644 > --- a/package/audit/audit.mk > +++ b/package/audit/audit.mk > @@ -15,6 +15,13 @@ AUDIT_INSTALL_STAGING = YES > > AUDIT_CONF_OPTS = --without-python --without-python3 > > +# src/libev has some assembly function that is not present in Thumb mode: > +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode > +# so, we desactivate Thumb mode > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > +AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" > +endif But then it would not work on systems that have a armv7m: BR2_cortex_m3, BR2_cortex_m4, or BR2_cortex_m7. I looked at the code, and it's going to be very complex to patch it to support armv7m, i.e. thumb-only. So, we will have to disallow audit in this case. It is going to be easy, as it already have a _ARCH_SUPPORTS, but it going to neeed a bit of cleanup: config BR2_PACKAGE_AUDIT_ARCH_SUPPORTS bool default y if BR2_aarch64 default y if (BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc || BR2_powerpc64 And then, the only 'select' is from libsemanage, which already depends on AUDIT_ARCH_SUPPORT, so all is going to be alright (in the end). Regards, Yann E. MORIN. > ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) > AUDIT_DEPENDENCIES += libcap-ng > AUDIT_CONF_OPTS += --with-libcap-ng=yes > -- > 2.39.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 Thu Feb 23 06:36:07 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 23 Feb 2023 07:36:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/libev: force arm mode instead of Thumb mode In-Reply-To: <20230222143753.1563322-1-fontaine.fabrice@gmail.com> References: <20230222143753.1563322-1-fontaine.fabrice@gmail.com> Message-ID: <20230223063607.GK2718518@scaer> Fabrice, All, On 2023-02-22 15:37 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure: > > /tmp/ccHc3Awn.s:825: Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode > > Fixes: > - http://autobuild.buildroot.org/results/1c597c9da724d6cac06b09b1ecd456a28440a3a3 > > Signed-off-by: Fabrice Fontaine > --- > package/libev/libev.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/libev/libev.mk b/package/libev/libev.mk > index 9f3c19d46c..cbd5433d76 100644 > --- a/package/libev/libev.mk > +++ b/package/libev/libev.mk > @@ -10,6 +10,13 @@ LIBEV_INSTALL_STAGING = YES > LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+ > LIBEV_LICENSE_FILES = LICENSE > > +# libev has some assembly function that is not present in Thumb mode: > +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode > +# so, we desactivate Thumb mode > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > +LIBEV_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" > +endif Same as for the audit change, this is going to fail for armv7m machines, so we need to hide away libeve for those. Unfortuantely, libev does not already have an _ARCH_SUPPORTS, and adding one just for this is a bit overkill. However, libeve has 12 reverse dependencies, so it's going to be a little pain. If we expect that libeve has more arch-dependencies, then it might be a good idea, but I have no clue there... In fact, re-reading the libev code, it seems that the situation is more coplex that "not thumb": 814 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \ 815 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ \ 816 || defined __ARM_ARCH_6T2__ 817 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory") 818 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \ 819 || defined __ARM_ARCH_7R__ || defined __ARM_ARCH_7M__ 820 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") So, it goes through the armv6 case, and it looks like it does have support for Thumb2 (6T2) or armv7m. So, the condition is a bit more complex. It is OK for ARM full or Thumb2 (armv7m implies Thumb2). So, adding an LIBEVE_ARCH_SUPPORT is maybe a good idea, in the end: config BR2_PACKAGE_LIBEV_ARCH_SUPPORTS bool default y if !(BR2_arm || BR2_armeb) || BR2_ARM_CPU_HAS_ARM || BR2_ARM_CPU_HAS_THUMB2 Regards, Yann E. MORIN. > # The 'compatibility' event.h header conflicts with libevent > # It's completely unnecessary for BR packages so remove it > define LIBEV_DISABLE_EVENT_H_INSTALL > -- > 2.39.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 Thu Feb 23 06:41:29 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 23 Feb 2023 07:41:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/audit: force arm mode instead of Thumb mode In-Reply-To: <20230223062259.GJ2718518@scaer> References: <20230222143512.1555539-1-fontaine.fabrice@gmail.com> <20230223062259.GJ2718518@scaer> Message-ID: <20230223064129.GL2718518@scaer> Fabrice, All, On 2023-02-23 07:22 +0100, Yann E. MORIN spake thusly: > On 2023-02-22 15:35 +0100, Fabrice Fontaine spake thusly: > > Fix the following build failure: > > > > /tmp/ccY5gl3z.s:2145: Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode > > > > Fixes: > > - http://autobuild.buildroot.org/results/9d18a0d360b2e2f9e87c55daedda62d6ce198bb9 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/audit/audit.mk | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/package/audit/audit.mk b/package/audit/audit.mk > > index cbb174b980..af81dabac0 100644 > > --- a/package/audit/audit.mk > > +++ b/package/audit/audit.mk > > @@ -15,6 +15,13 @@ AUDIT_INSTALL_STAGING = YES > > > > AUDIT_CONF_OPTS = --without-python --without-python3 > > > > +# src/libev has some assembly function that is not present in Thumb mode: > > +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode > > +# so, we desactivate Thumb mode > > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > > +AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" > > +endif > > But then it would not work on systems that have a armv7m: BR2_cortex_m3, > BR2_cortex_m4, or BR2_cortex_m7. > > I looked at the code, and it's going to be very complex to patch it to > support armv7m, i.e. thumb-only. > > So, we will have to disallow audit in this case. It is going to be easy, > as it already have a _ARCH_SUPPORTS, but it going to neeed a bit of > cleanup: > > config BR2_PACKAGE_AUDIT_ARCH_SUPPORTS > bool > default y if BR2_aarch64 > default y if (BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM As I wrote in the libev review for the same issue, the condition is a bit more complex: default y if (BR2_arm || BR2_armeb) && (BR2_ARM_CPU_HAS_ARM || BR2_ARM_CPU_HAS_THUMB2) Regards, Yann E. MORIN. > default y if BR2_i386 || BR2_x86_64 > default y if BR2_powerpc || BR2_powerpc64 > > And then, the only 'select' is from libsemanage, which already depends > on AUDIT_ARCH_SUPPORT, so all is going to be alright (in the end). > > Regards, > Yann E. MORIN. > > > ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) > > AUDIT_DEPENDENCIES += libcap-ng > > AUDIT_CONF_OPTS += --with-libcap-ng=yes > > -- > > 2.39.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. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > 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 br015 at umbiko.net Thu Feb 23 06:49:25 2023 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 23 Feb 2023 06:49:25 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: References: Message-ID: <40f9568e5843d49c2afd808bec856bde@umbiko.net> Hi Alberto, On 2023-02-23 04:47, Alberto Fahrenkrog wrote: > Update, > > if I change $(eval $(python-koala)) to $(eval $(python-package)) I > still get the same error. I assume that might have been one mistake. > > Cheers, > > Alberto > > Alberto Fahrenkrog Senior Embedded Engineer > Orica - Perth Technology Centre > p: +61 (0) 8 6365 4056 > e: Alberto.Fahrenkrog at rigtechnologies.com.au > ________________________________ > From: buildroot on behalf of Alberto > Fahrenkrog > Sent: Thursday, February 23, 2023 12:42 PM > To: buildroot at buildroot.org > Subject: [Buildroot] [Help] Struggling to build external python package > on out of tree build > > You don't often get email from > alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is > important > Hello all, > > I'm trying to build a very simple custom python package following the > instructions on the manual, yet I must be doing something very wrong as > I get this result: > > $ make python-koala > make[1]: *** No rule to make target 'python-koala'. Stop. > make: *** [Makefile:23: _all] Error 2 > > I create my out of tree build with: > make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build > O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads > br_build_defconfig > > On my "br_build" folder I have a Config.in file: > menu "Python-Libs" > source "~/Projects/br_build/package/python-koala/Config.in" > endmenu Similar to the include file for configs, you also need an external.mk file for the project make files, with this content: include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) Otherwise your .mk files will not be picked up. > In "br_build/packages/python-koala/Config.in" The package directory is usually named 'package', not sure if this is relevant (but Config.in /external.mk have to match it). > config BR2_PACKAGE_PYTHON_KOALA > ??????bool "python-koala" > depends on BR2_PACKAGE_PYTHON3 > ??????help > ?????? Python implementation of Koala Library > > In "br_build/packages/python-koala/python-koala.mk" > ################################################################################ > # > # python-koala > # > ################################################################################ > > PYTHON_KOALA_VERSION = 1.3.3 > PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz > PYTHON_KOALA_SITE = > https://mywebsite.com.au/ExternalCode/koala/archive/ > PYTHON_KOALA_SETUP_TYPE = setuptools > > $(eval $(python-koala)) > > If I run "make menuconfig" I can select or deselect the package, and > it's selected per default on the br_build_defconfig (and in .config): > BR2_PACKAGE_PYTHON_KOALA=y > > But if I try to run "make python-koala" I get the "no target" error. > I'll still have a read and see what I might be doing wrong, but I'm > very confused. Any ideas are very welcome. > > Cheers, > > Alberto Kind regards, Andreas From francois.perrad at gadz.org Thu Feb 23 06:58:30 2023 From: francois.perrad at gadz.org (=?UTF-8?Q?Fran=C3=A7ois_Perrad?=) Date: Thu, 23 Feb 2023 07:58:30 +0100 Subject: [Buildroot] [PATCH v3 4/4] package/libgtk3: only update-icon-cache when the demos are built In-Reply-To: <20230221192802.4117856-4-thomas.devoogdt@barco.com> References: <20230221192802.4117856-1-thomas.devoogdt@barco.com> <20230221192802.4117856-4-thomas.devoogdt@barco.com> Message-ID: Le mar. 21 f?vr. 2023 ? 20:29, Thomas Devoogdt a ?crit : > Similar to: > https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4358/diffs > > Signed-off-by: Thomas Devoogdt > --- > v3: > - rebased on > https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 > - needed to fix the webkitgtk 2.38.5 compilation > ( > https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/ > ) > --- > package/libgtk3/libgtk3.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk > index 2821c7eb52..b78578d568 100644 > --- a/package/libgtk3/libgtk3.mk > +++ b/package/libgtk3/libgtk3.mk > @@ -145,11 +145,13 @@ endef > > # Create icon-theme.cache for each of the icon directories/themes > # It's not strictly necessary but speeds up lookups > +ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y) > I disagree with this logic. At this time, icons could installed by 2 packages: - hicolor-icon-theme which is selected by libgtk3-demo - adwaita-icon-theme >From my point of view, this finalize hook must be always enabled as actually, but it must never fails even when there is no icons. Fran?ois > define LIBGTK3_UPDATE_ICON_CACHE > find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d > \ > -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; > endef > LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE > +endif > > $(eval $(meson-package)) > $(eval $(host-generic-package)) > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From Alberto.Fahrenkrog at rigtechnologies.com.au Thu Feb 23 07:09:00 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Thu, 23 Feb 2023 07:09:00 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: <40f9568e5843d49c2afd808bec856bde@umbiko.net> References: <40f9568e5843d49c2afd808bec856bde@umbiko.net> Message-ID: Hi Andreas, Thank you so much! That did it! Where in the manual is external.mk explained? I missed it for sure... Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: buildroot on behalf of Andreas Ziegler Sent: Thursday, February 23, 2023 2:49 PM To: Alberto Fahrenkrog Cc: buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build [You don't often get email from br015 at umbiko.net. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] Hi Alberto, On 2023-02-23 04:47, Alberto Fahrenkrog wrote: > Update, > > if I change $(eval $(python-koala)) to $(eval $(python-package)) I > still get the same error. I assume that might have been one mistake. > > Cheers, > > Alberto > > Alberto Fahrenkrog Senior Embedded Engineer > Orica - Perth Technology Centre > p: +61 (0) 8 6365 4056 > e: Alberto.Fahrenkrog at rigtechnologies.com.au > ________________________________ > From: buildroot on behalf of Alberto > Fahrenkrog > Sent: Thursday, February 23, 2023 12:42 PM > To: buildroot at buildroot.org > Subject: [Buildroot] [Help] Struggling to build external python package > on out of tree build > > You don't often get email from > alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is > important > Hello all, > > I'm trying to build a very simple custom python package following the > instructions on the manual, yet I must be doing something very wrong as > I get this result: > > $ make python-koala > make[1]: *** No rule to make target 'python-koala'. Stop. > make: *** [Makefile:23: _all] Error 2 > > I create my out of tree build with: > make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build > O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads > br_build_defconfig > > On my "br_build" folder I have a Config.in file: > menu "Python-Libs" > source "~/Projects/br_build/package/python-koala/Config.in" > endmenu Similar to the include file for configs, you also need an external.mk file for the project make files, with this content: include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) Otherwise your .mk files will not be picked up. > In "br_build/packages/python-koala/Config.in" The package directory is usually named 'package', not sure if this is relevant (but Config.in /external.mk have to match it). > config BR2_PACKAGE_PYTHON_KOALA > ??????bool "python-koala" > depends on BR2_PACKAGE_PYTHON3 > ??????help > ?????? Python implementation of Koala Library > > In "br_build/packages/python-koala/python-koala.mk" > ################################################################################ > # > # python-koala > # > ################################################################################ > > PYTHON_KOALA_VERSION = 1.3.3 > PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz > PYTHON_KOALA_SITE = > https://mywebsite.com.au/ExternalCode/koala/archive/ > PYTHON_KOALA_SETUP_TYPE = setuptools > > $(eval $(python-koala)) > > If I run "make menuconfig" I can select or deselect the package, and > it's selected per default on the br_build_defconfig (and in .config): > BR2_PACKAGE_PYTHON_KOALA=y > > But if I try to run "make python-koala" I get the "no target" error. > I'll still have a read and see what I might be doing wrong, but I'm > very confused. Any ideas are very welcome. > > Cheers, > > Alberto Kind regards, Andreas _______________________________________________ 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: image479269.png Type: image/png Size: 14270 bytes Desc: image479269.png URL: From Alberto.Fahrenkrog at rigtechnologies.com.au Thu Feb 23 07:13:50 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Thu, 23 Feb 2023 07:13:50 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: References: <40f9568e5843d49c2afd808bec856bde@umbiko.net> Message-ID: Ok, I see now that external.mk is explained in chapter 9. I jumped straight to chapter 18 and missed external.mk completely. And for some reason I never found external.mk on my google searches. Thanks all for your help! Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: buildroot on behalf of Alberto Fahrenkrog Sent: Thursday, February 23, 2023 3:09 PM To: buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is important Hi Andreas, Thank you so much! That did it! Where in the manual is external.mk explained? I missed it for sure... Cheers, Alberto [cid:image479269.png at DC79B523.511A6FAF] Alberto? Fahrenkrog Senior Embedded Engineer Orica ? Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: buildroot on behalf of Andreas Ziegler Sent: Thursday, February 23, 2023 2:49 PM To: Alberto Fahrenkrog Cc: buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build [You don't often get email from br015 at umbiko.net. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] Hi Alberto, On 2023-02-23 04:47, Alberto Fahrenkrog wrote: > Update, > > if I change $(eval $(python-koala)) to $(eval $(python-package)) I > still get the same error. I assume that might have been one mistake. > > Cheers, > > Alberto > > Alberto Fahrenkrog Senior Embedded Engineer > Orica - Perth Technology Centre > p: +61 (0) 8 6365 4056 > e: Alberto.Fahrenkrog at rigtechnologies.com.au > ________________________________ > From: buildroot on behalf of Alberto > Fahrenkrog > Sent: Thursday, February 23, 2023 12:42 PM > To: buildroot at buildroot.org > Subject: [Buildroot] [Help] Struggling to build external python package > on out of tree build > > You don't often get email from > alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is > important > Hello all, > > I'm trying to build a very simple custom python package following the > instructions on the manual, yet I must be doing something very wrong as > I get this result: > > $ make python-koala > make[1]: *** No rule to make target 'python-koala'. Stop. > make: *** [Makefile:23: _all] Error 2 > > I create my out of tree build with: > make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build > O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads > br_build_defconfig > > On my "br_build" folder I have a Config.in file: > menu "Python-Libs" > source "~/Projects/br_build/package/python-koala/Config.in" > endmenu Similar to the include file for configs, you also need an external.mk file for the project make files, with this content: include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) Otherwise your .mk files will not be picked up. > In "br_build/packages/python-koala/Config.in" The package directory is usually named 'package', not sure if this is relevant (but Config.in /external.mk have to match it). > config BR2_PACKAGE_PYTHON_KOALA > ??????bool "python-koala" > depends on BR2_PACKAGE_PYTHON3 > ??????help > ?????? Python implementation of Koala Library > > In "br_build/packages/python-koala/python-koala.mk" > ################################################################################ > # > # python-koala > # > ################################################################################ > > PYTHON_KOALA_VERSION = 1.3.3 > PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz > PYTHON_KOALA_SITE = > https://mywebsite.com.au/ExternalCode/koala/archive/ > PYTHON_KOALA_SETUP_TYPE = setuptools > > $(eval $(python-koala)) > > If I run "make menuconfig" I can select or deselect the package, and > it's selected per default on the br_build_defconfig (and in .config): > BR2_PACKAGE_PYTHON_KOALA=y > > But if I try to run "make python-koala" I get the "no target" error. > I'll still have a read and see what I might be doing wrong, but I'm > very confused. Any ideas are very welcome. > > Cheers, > > Alberto Kind regards, Andreas _______________________________________________ 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: image479269.png Type: image/png Size: 14270 bytes Desc: image479269.png URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image003669.png Type: image/png Size: 14270 bytes Desc: image003669.png URL: From thomas at devoogdt.com Thu Feb 23 08:01:13 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 23 Feb 2023 09:01:13 +0100 Subject: [Buildroot] [PATCH v3 4/4] package/libgtk3: only update-icon-cache when the demos are built In-Reply-To: References: <20230221192802.4117856-1-thomas.devoogdt@barco.com> <20230221192802.4117856-4-thomas.devoogdt@barco.com> Message-ID: Hi, Ok, the proposed solution makes sense. And would be safer anyway. I adapt the last patch. Kr, Thomas Op do 23 feb. 2023 om 07:58 schreef Fran?ois Perrad : > > > > Le mar. 21 f?vr. 2023 ? 20:29, Thomas Devoogdt a ?crit : >> >> Similar to: >> https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4358/diffs >> >> Signed-off-by: Thomas Devoogdt >> --- >> v3: >> - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 >> - needed to fix the webkitgtk 2.38.5 compilation >> (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) >> --- >> package/libgtk3/libgtk3.mk | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk >> index 2821c7eb52..b78578d568 100644 >> --- a/package/libgtk3/libgtk3.mk >> +++ b/package/libgtk3/libgtk3.mk >> @@ -145,11 +145,13 @@ endef >> >> # Create icon-theme.cache for each of the icon directories/themes >> # It's not strictly necessary but speeds up lookups >> +ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y) > > > I disagree with this logic. > At this time, icons could installed by 2 packages: > - hicolor-icon-theme which is selected by libgtk3-demo > - adwaita-icon-theme > > From my point of view, this finalize hook must be always enabled as actually, > but it must never fails even when there is no icons. > > Fran?ois > > >> >> define LIBGTK3_UPDATE_ICON_CACHE >> find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ >> -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; >> endef >> LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE >> +endif >> >> $(eval $(meson-package)) >> $(eval $(host-generic-package)) >> -- >> 2.39.2 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From Alberto.Fahrenkrog at rigtechnologies.com.au Thu Feb 23 09:13:28 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Thu, 23 Feb 2023 09:13:28 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: References: <40f9568e5843d49c2afd808bec856bde@umbiko.net> Message-ID: Hi all, I'm slowly getting ahead with this, and I still have a few more questions... I'm trying to get a tar.gz file from a git repo, which needs authentication. The command that works manually is: wget https://outwebsite.com/koala/archive/release1.2.3.tar.gz --header 'Authorization: token MY_TOKEN' And the .mk file is configured as: PYTHON_KOALA_SITE_METHOD = wget PYTHON_KOALA_DL_OPTS = --header 'Authorization: token MY_TOKEN' PYTHON_KOALA_SITE = https://outwebsite.com/koala/archive/ The .mk file is being read correctly, but I can't figure out how to use DL_OPTS. The manual says DL_OPTS is a space separated list, but i see wget tries to use "token" or "MY_TOKEN" as the address. I tried a few different combinations of inverted commas, but none worked. Thanks again, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: Alberto Fahrenkrog Sent: Thursday, February 23, 2023 3:13 PM To: buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build Ok, I see now that external.mk is explained in chapter 9. I jumped straight to chapter 18 and missed external.mk completely. And for some reason I never found external.mk on my google searches. Thanks all for your help! Cheers, Alberto ________________________________ From: buildroot on behalf of Alberto Fahrenkrog Sent: Thursday, February 23, 2023 3:09 PM To: buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is important Hi Andreas, Thank you so much! That did it! Where in the manual is external.mk explained? I missed it for sure... Cheers, Alberto [cid:image479269.png at DC79B523.511A6FAF] Alberto? Fahrenkrog Senior Embedded Engineer Orica ? Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: buildroot on behalf of Andreas Ziegler Sent: Thursday, February 23, 2023 2:49 PM To: Alberto Fahrenkrog Cc: buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build [You don't often get email from br015 at umbiko.net. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] Hi Alberto, On 2023-02-23 04:47, Alberto Fahrenkrog wrote: > Update, > > if I change $(eval $(python-koala)) to $(eval $(python-package)) I > still get the same error. I assume that might have been one mistake. > > Cheers, > > Alberto > > Alberto Fahrenkrog Senior Embedded Engineer > Orica - Perth Technology Centre > p: +61 (0) 8 6365 4056 > e: Alberto.Fahrenkrog at rigtechnologies.com.au > ________________________________ > From: buildroot on behalf of Alberto > Fahrenkrog > Sent: Thursday, February 23, 2023 12:42 PM > To: buildroot at buildroot.org > Subject: [Buildroot] [Help] Struggling to build external python package > on out of tree build > > You don't often get email from > alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is > important > Hello all, > > I'm trying to build a very simple custom python package following the > instructions on the manual, yet I must be doing something very wrong as > I get this result: > > $ make python-koala > make[1]: *** No rule to make target 'python-koala'. Stop. > make: *** [Makefile:23: _all] Error 2 > > I create my out of tree build with: > make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build > O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads > br_build_defconfig > > On my "br_build" folder I have a Config.in file: > menu "Python-Libs" > source "~/Projects/br_build/package/python-koala/Config.in" > endmenu Similar to the include file for configs, you also need an external.mk file for the project make files, with this content: include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) Otherwise your .mk files will not be picked up. > In "br_build/packages/python-koala/Config.in" The package directory is usually named 'package', not sure if this is relevant (but Config.in /external.mk have to match it). > config BR2_PACKAGE_PYTHON_KOALA > ??????bool "python-koala" > depends on BR2_PACKAGE_PYTHON3 > ??????help > ?????? Python implementation of Koala Library > > In "br_build/packages/python-koala/python-koala.mk" > ################################################################################ > # > # python-koala > # > ################################################################################ > > PYTHON_KOALA_VERSION = 1.3.3 > PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz > PYTHON_KOALA_SITE = > https://mywebsite.com.au/ExternalCode/koala/archive/ > PYTHON_KOALA_SETUP_TYPE = setuptools > > $(eval $(python-koala)) > > If I run "make menuconfig" I can select or deselect the package, and > it's selected per default on the br_build_defconfig (and in .config): > BR2_PACKAGE_PYTHON_KOALA=y > > But if I try to run "make python-koala" I get the "no target" error. > I'll still have a read and see what I might be doing wrong, but I'm > very confused. Any ideas are very welcome. > > Cheers, > > Alberto Kind regards, Andreas _______________________________________________ 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: image479269.png Type: image/png Size: 14270 bytes Desc: image479269.png URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image793626.png Type: image/png Size: 14270 bytes Desc: image793626.png URL: From fontaine.fabrice at gmail.com Thu Feb 23 09:52:54 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 10:52:54 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/audit: force arm mode instead of Thumb mode Message-ID: <20230223095254.9141-1-fontaine.fabrice@gmail.com> Fix the following build failure: /tmp/ccY5gl3z.s:2145: Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/9d18a0d360b2e2f9e87c55daedda62d6ce198bb9 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Update BR2_PACKAGE_AUDIT_ARCH_SUPPORTS package/audit/Config.in | 8 +++++--- package/audit/audit.mk | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package/audit/Config.in b/package/audit/Config.in index 6e5761533f..89341dfe31 100644 --- a/package/audit/Config.in +++ b/package/audit/Config.in @@ -1,9 +1,11 @@ # audit has some builtin per-architecture system call tables config BR2_PACKAGE_AUDIT_ARCH_SUPPORTS bool - default y if BR2_aarch64 || BR2_arm || BR2_armeb || \ - BR2_i386 || BR2_powerpc || BR2_powerpc64 || \ - BR2_x86_64 + default y if BR2_aarch64 + default y if (BR2_arm || BR2_armeb) && \ + (BR2_ARM_CPU_HAS_ARM || BR2_ARM_CPU_HAS_THUMB2) + default y if BR2_i386 || BR2_x86_64 + default y if BR2_powerpc || BR2_powerpc64 config BR2_PACKAGE_AUDIT bool "audit" diff --git a/package/audit/audit.mk b/package/audit/audit.mk index cbb174b980..af81dabac0 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -15,6 +15,13 @@ AUDIT_INSTALL_STAGING = YES AUDIT_CONF_OPTS = --without-python --without-python3 +# src/libev has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) AUDIT_DEPENDENCIES += libcap-ng AUDIT_CONF_OPTS += --with-libcap-ng=yes -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 10:10:32 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 11:10:32 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/libev: force arm mode instead of Thumb mode Message-ID: <20230223101032.19265-1-fontaine.fabrice@gmail.com> Fix the following build failure: /tmp/ccHc3Awn.s:825: Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/1c597c9da724d6cac06b09b1ecd456a28440a3a3 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Add BR2_PACKAGE_LIBEV_ARCH_SUPPORTS package/atest/Config.in | 2 ++ package/cfm/Config.in | 2 ++ package/dvblast/Config.in | 2 ++ package/libev/Config.in | 6 ++++++ package/libev/libev.mk | 7 +++++++ package/libpagekite/Config.in | 2 ++ package/libuhttpd/Config.in | 2 ++ package/libuwsc/Config.in | 1 + package/lua-ev/Config.in | 1 + package/mrp/Config.in | 2 ++ package/rtty/Config.in | 1 + package/shadowsocks-libev/Config.in | 1 + package/uacme/Config.in | 2 ++ package/unclutter-xfixes/Config.in | 1 + 14 files changed, 32 insertions(+) diff --git a/package/atest/Config.in b/package/atest/Config.in index 647b2163ea..44caff1954 100644 --- a/package/atest/Config.in +++ b/package/atest/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ATEST bool "atest" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_LIBEV @@ -10,4 +11,5 @@ config BR2_PACKAGE_ATEST https://github.com/amouiche/atest comment "atest needs a toolchain w/ threads" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/cfm/Config.in b/package/cfm/Config.in index 1c2e92be67..81f8d8eb8b 100644 --- a/package/cfm/Config.in +++ b/package/cfm/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_CFM bool "cfm" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 select BR2_PACKAGE_LIBEV @@ -13,5 +14,6 @@ config BR2_PACKAGE_CFM https://github.com/microchip-ung/cfm comment "cfm needs a toolchain w/ threads, kernel headers >= 5.0" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 diff --git a/package/dvblast/Config.in b/package/dvblast/Config.in index 973eee88c6..93da42b785 100644 --- a/package/dvblast/Config.in +++ b/package/dvblast/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_DVBLAST bool "dvblast" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_BITSTREAM select BR2_PACKAGE_LIBEV @@ -11,4 +12,5 @@ config BR2_PACKAGE_DVBLAST http://www.videolan.org/projects/dvblast.html comment "dvblast needs a toolchain w/ threads" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libev/Config.in b/package/libev/Config.in index 71abe7737d..820f01e8c0 100644 --- a/package/libev/Config.in +++ b/package/libev/Config.in @@ -1,5 +1,11 @@ + config BR2_PACKAGE_LIBEV_ARCH_SUPPORTS + bool + default y if !(BR2_arm || BR2_armeb) || \ + BR2_ARM_CPU_HAS_ARM || BR2_ARM_CPU_HAS_THUMB2 + config BR2_PACKAGE_LIBEV bool "libev" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS help Userspace library for handling asynchronous notifications diff --git a/package/libev/libev.mk b/package/libev/libev.mk index 9f3c19d46c..cbd5433d76 100644 --- a/package/libev/libev.mk +++ b/package/libev/libev.mk @@ -10,6 +10,13 @@ LIBEV_INSTALL_STAGING = YES LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+ LIBEV_LICENSE_FILES = LICENSE +# libev has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBEV_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + # The 'compatibility' event.h header conflicts with libevent # It's completely unnecessary for BR packages so remove it define LIBEV_DISABLE_EVENT_H_INSTALL diff --git a/package/libpagekite/Config.in b/package/libpagekite/Config.in index 0ecf4f97e1..11972d40c7 100644 --- a/package/libpagekite/Config.in +++ b/package/libpagekite/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBPAGEKITE bool "libpagekite" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBEV select BR2_PACKAGE_OPENSSL @@ -21,4 +22,5 @@ config BR2_PACKAGE_LIBPAGEKITE https://github.com/pagekite/libpagekite comment "libpagekite needs a toolchain with threads" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in index a552a88f0c..63cc246092 100644 --- a/package/libuhttpd/Config.in +++ b/package/libuhttpd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBUHTTPD bool "libuhttpd" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBEV @@ -12,5 +13,6 @@ config BR2_PACKAGE_LIBUHTTPD https://github.com/zhaojh329/libuhttpd comment "libuhttpd needs a toolchain w/ gcc >= 4.9" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libuwsc/Config.in b/package/libuwsc/Config.in index ae99b6d2dc..1675aca88b 100644 --- a/package/libuwsc/Config.in +++ b/package/libuwsc/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBUWSC bool "libuwsc" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev select BR2_PACKAGE_LIBEV help A Lightweight and fully asynchronous WebSocket client diff --git a/package/lua-ev/Config.in b/package/lua-ev/Config.in index 1e89c270a0..75c4862f8a 100644 --- a/package/lua-ev/Config.in +++ b/package/lua-ev/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LUA_EV bool "lua-ev" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev select BR2_PACKAGE_LIBEV help Get access to the libev library from Lua. diff --git a/package/mrp/Config.in b/package/mrp/Config.in index ac42fa4773..56353baef2 100644 --- a/package/mrp/Config.in +++ b/package/mrp/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MRP bool "mrp" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 select BR2_PACKAGE_LIBEV @@ -14,5 +15,6 @@ config BR2_PACKAGE_MRP https://github.com/microchip-ung/mrp comment "mrp needs a toolchain w/ threads, kernel headers >= 5.0" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 diff --git a/package/rtty/Config.in b/package/rtty/Config.in index 198d465713..ed154af6e1 100644 --- a/package/rtty/Config.in +++ b/package/rtty/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTTY bool "rtty" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBEV help diff --git a/package/shadowsocks-libev/Config.in b/package/shadowsocks-libev/Config.in index fefb27bcc1..25e7ea7b77 100644 --- a/package/shadowsocks-libev/Config.in +++ b/package/shadowsocks-libev/Config.in @@ -17,6 +17,7 @@ config BR2_PACKAGE_SHADOWSOCKS_LIBEV config BR2_PACKAGE_SHADOWSOCKS_LIBEV_CONNMARKTOS bool "connmarktos support in ss-server" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_PACKAGE_SHADOWSOCKS_LIBEV select BR2_PACKAGE_LIBNETFILTER_CONNTRACK help diff --git a/package/uacme/Config.in b/package/uacme/Config.in index 2c6864871c..94367cb220 100644 --- a/package/uacme/Config.in +++ b/package/uacme/Config.in @@ -19,6 +19,7 @@ if BR2_PACKAGE_UACME config BR2_PACKAGE_UACME_UALPN bool "enable ualpn" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBEV select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL \ @@ -28,6 +29,7 @@ config BR2_PACKAGE_UACME_UALPN challenge responder. comment "ualpn needs a toolchain w/ threads" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS endif diff --git a/package/unclutter-xfixes/Config.in b/package/unclutter-xfixes/Config.in index 852a8cfda9..ed266c3f82 100644 --- a/package/unclutter-xfixes/Config.in +++ b/package/unclutter-xfixes/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_UNCLUTTER_XFIXES bool "unclutter-xfixes" + depends on BR2_PACKAGE_LIBEV_ARCH_SUPPORTS # libev depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBEV select BR2_PACKAGE_XLIB_LIBX11 -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 10:20:23 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 11:20:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/multipath-tools: fix legal-info Message-ID: <20230223102023.25489-1-fontaine.fabrice@gmail.com> Commit b535fd2a093eca5e8967a5c8004da55f7295d101 forgot to update hash of README.md (updates not related to license) Fixes: - http://autobuild.buildroot.org/results/21bc3aa3e1b89ace5aebe771b8c34d5bd0cb9c3d Signed-off-by: Fabrice Fontaine --- package/multipath-tools/multipath-tools.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index 3f01408c76..ecaad05e25 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -4,4 +4,4 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENS sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1 -sha256 1e6095ac219062b8ddb2416d2a3cc40560619cd6b3ba609f5602bbd320413be0 README.md +sha256 b8b4369c539d6a61ad2a5a359a1ecdfb9f630a89590216d490314e19bf07aa0c README.md -- 2.39.1 From martin at geanix.com Thu Feb 23 10:40:48 2023 From: martin at geanix.com (=?UTF-8?q?Martin=20Hundeb=C3=B8ll?=) Date: Thu, 23 Feb 2023 11:40:48 +0100 Subject: [Buildroot] [PATCH] ifupdown: bump to 0.8.41 Message-ID: <20230223104048.333575-1-martin@geanix.com> From: Martin Hundeboll Musl is not supported since June 2017, where use of fnmatch() was introduced to support wildcard matching on interfaces. Signed-off-by: Martin Hundeb?ll --- package/ifupdown/Config.in | 1 + package/ifupdown/ifupdown.hash | 4 ++-- package/ifupdown/ifupdown.mk | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/ifupdown/Config.in b/package/ifupdown/Config.in index 97d02b4c37..999a2e7e0c 100644 --- a/package/ifupdown/Config.in +++ b/package/ifupdown/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_IFUPDOWN bool "ifupdown" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 + depends on !BR2_TOOLCHAIN_USES_MUSL # missing FNM_EXTMATCH define depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # runtime for ip binary select BR2_PACKAGE_IPROUTE2 if !BR2_PACKAGE_BUSYBOX diff --git a/package/ifupdown/ifupdown.hash b/package/ifupdown/ifupdown.hash index f8844a60a6..f5c2d2d34c 100644 --- a/package/ifupdown/ifupdown.hash +++ b/package/ifupdown/ifupdown.hash @@ -1,4 +1,4 @@ -# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.16.dsc -sha256 601416c12e39ac29022951a2867aed5c607f732ac57fd51517bfba92a4cc4fb0 ifupdown_0.8.16.tar.xz +# From http://snapshot.debian.org/archive/debian/20230222T205615Z/pool/main/i/ifupdown/ifupdown_0.8.41.dsc +sha256 222c5bef313a9e71d9be4b946c73c8606c98f9e0229153191d9c6d8fb9b3599c ifupdown_0.8.41.tar.xz # Locally computed sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk index e62c2a79c5..14c36db0db 100644 --- a/package/ifupdown/ifupdown.mk +++ b/package/ifupdown/ifupdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -IFUPDOWN_VERSION = 0.8.16 +IFUPDOWN_VERSION = 0.8.41 IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz -IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160922T165503Z/pool/main/i/ifupdown +IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20230222T205615Z/pool/main/i/ifupdown IFUPDOWN_LICENSE = GPL-2.0+ IFUPDOWN_LICENSE_FILES = COPYING IFUPDOWN_CPE_ID_VENDOR = debian @@ -14,6 +14,7 @@ IFUPDOWN_CPE_ID_VENDOR = debian define IFUPDOWN_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -D'IFUPDOWN_VERSION=\"$(IFUPDOWN_VERSION)\"'" \ + ARCH=linux \ -C $(@D) endef -- 2.39.2 From fontaine.fabrice at gmail.com Thu Feb 23 10:53:03 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 11:53:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/efivar: fix build without threads Message-ID: <20230223105303.290875-1-fontaine.fabrice@gmail.com> Fix the following build failure without threads raised since bump to version 38 in commit f24029b561fbda0953c7dbd93d2485b03873996d and https://github.com/rhboot/efivar/commit/cff88dd96b9d43e2c5875a24ba6180b196890ded: thread-test.c:14:10: fatal error: pthread.h: No such file or directory 14 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/f2da14f91dc602a32dd5b2b7bdf3d3aa43afa7f4 Signed-off-by: Fabrice Fontaine --- .../efivar/0005-Add-NO_THREADS-variable.patch | 54 +++++++++++++++++++ package/efivar/efivar.mk | 4 ++ 2 files changed, 58 insertions(+) create mode 100644 package/efivar/0005-Add-NO_THREADS-variable.patch diff --git a/package/efivar/0005-Add-NO_THREADS-variable.patch b/package/efivar/0005-Add-NO_THREADS-variable.patch new file mode 100644 index 0000000000..fdd874ab70 --- /dev/null +++ b/package/efivar/0005-Add-NO_THREADS-variable.patch @@ -0,0 +1,54 @@ +From 9fd025945212ab2b2bf71328588b2a5377655176 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 11:46:38 +0100 +Subject: [PATCH] Add NO_THREADS variable + +Allow the user to disable building thread-test to avoid the following +build failure without threads raised since version 38 and +https://github.com/rhboot/efivar/commit/cff88dd96b9d43e2c5875a24ba6180b196890ded: + +thread-test.c:14:10: fatal error: pthread.h: No such file or directory + 14 | #include + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/277f783c33102a0cea7c82ca902119ab90f37ad4 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rhboot/efivar/pull/238] +--- + src/Makefile | 5 ++++- + src/include/defaults.mk | 1 + + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index ec1eabe..eb0427e 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -7,7 +7,10 @@ include $(TOPDIR)/src/include/defaults.mk + + LIBTARGETS=libefivar.so libefiboot.so libefisec.so + STATICLIBTARGETS=libefivar.a libefiboot.a libefisec.a +-BINTARGETS=efivar efisecdb thread-test ++BINTARGETS=efivar efisecdb ++ifeq ($(NO_THREADS),) ++BINTARGETS += thread-test ++endif + STATICBINTARGETS=efivar-static efisecdb-static + PCTARGETS=efivar.pc efiboot.pc efisec.pc + TARGETS=$(LIBTARGETS) $(BINTARGETS) $(PCTARGETS) +diff --git a/src/include/defaults.mk b/src/include/defaults.mk +index 630da23..9632887 100644 +--- a/src/include/defaults.mk ++++ b/src/include/defaults.mk +@@ -8,6 +8,7 @@ BINDIR ?= $(EXEC_PREFIX)/bin + PCDIR ?= $(LIBDIR)/pkgconfig + DESTDIR ?= + PKGS ?= ++NO_THREADS ?= + + CROSS_COMPILE ?= + COMPILER ?= gcc +-- +2.39.1 + diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk index 8b1d338bec..27ad7a39e2 100644 --- a/package/efivar/efivar.mk +++ b/package/efivar/efivar.mk @@ -23,6 +23,10 @@ EFIVAR_MAKE_OPTS = \ SUBDIRS=src \ LD_DASH_T=-T +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +EFIVAR_MAKE_OPTS += NO_THREADS=1 +endif + define HOST_EFIVAR_BUILD_CMDS # makeguids is an internal host tool and must be built separately with # $(HOST_CC), otherwise it gets cross-built. -- 2.39.1 From giulio.benetti at benettiengineering.com Thu Feb 23 11:14:08 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 23 Feb 2023 12:14:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/harfbuzz: bump to version 6.0.0 In-Reply-To: References: <20230208230721.3269610-1-giulio.benetti@benettiengineering.com> <20230208230721.3269610-3-giulio.benetti@benettiengineering.com> Message-ID: <5bce1e75-8d41-1275-d599-e95aca1c1c1e@benettiengineering.com> Hi Fabrice, Thomas, On 22/02/23 16:55, Fabrice Fontaine wrote: > Hi, > > Le?mer. 22 f?vr. 2023 ??16:37, Giulio Benetti > > a ?crit?: > > This patch is superseded by this one: > https://patchwork.ozlabs.org/project/buildroot/patch/20230222145059.1939094-1-giulio.benetti at benettiengineering.com/ > > > This bump should be tagged as a security bump as it includes a fix for > CVE-2023-25193 (or you could backport fix on master). Thanks a lot for pointing. I've found that the CVE is present in version 6.0.0 only. So as discussed on IRC with Thomas we're going to keep version 5.3.1 for Buildroot 2023.02 and apply the patch to bump harfbuzz to 7.0.1 to next. Best regards -- Giulio Benetti CEO/CTO at Benetti Engineering sas > > > > Best regards > -- > CEO/CTO at Benetti Engineering sas > > On 09/02/23 00:07, Giulio Benetti wrote: > > Since the major release changed all the packages that have direct > > dependency to harfbuzz has been succesfully built: > > - efl > > - libass > > - mupdf > > - pango > > - qt5base > > - qt5webengine > > - qt6base > > - sdl2_ttf > > - supertuxkart > > - vlc > > - webkitgtk > > - wpewebkit > > > > Signed-off-by: Giulio Benetti > > > > --- > >? ?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 9489f25c6a..faae7b91e3 100644 > > --- a/package/harfbuzz/harfbuzz.hash > > +++ b/package/harfbuzz/harfbuzz.hash > > @@ -1,3 +1,3 @@ > >? ?# Locally computed > > -sha256 > 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d > harfbuzz-5.3.1.tar.xz > > +sha256 > 1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4 > harfbuzz-6.0.0.tar.xz > >? ?sha256 > 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 > COPYING > > diff --git a/package/harfbuzz/harfbuzz.mk > b/package/harfbuzz/harfbuzz.mk > > index b0112168e1..02fe4ecec3 100644 > > --- a/package/harfbuzz/harfbuzz.mk > > +++ b/package/harfbuzz/harfbuzz.mk > > @@ -4,7 +4,7 @@ > >? ?# > > > ?################################################################################ > > > > -HARFBUZZ_VERSION = 5.3.1 > > +HARFBUZZ_VERSION = 6.0.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) > > > Best Regards, > > Fabrice From fontaine.fabrice at gmail.com Thu Feb 23 11:19:03 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 12:19:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/s6-linux-utils: fix build with glibc < 2.25 Message-ID: <20230223111903.315678-1-fontaine.fabrice@gmail.com> Fix the following build failure with glibc < 2.25 raised since bump to version 2.6.0.0 in commit 5aac1d0105a73133fd886acc6c5195ca28f7e17f and https://github.com/skarnet/s6-linux-utils/commit/ad5973028c42d947440cdae5e4f106152c3dda28: src/minutils/rngseed.c:15:24: fatal error: sys/random.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/214bcecfc389cb412b68627c831300478d614a3a Signed-off-by: Fabrice Fontaine --- ...utils-rngseed.c-fix-build-with-glibc.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch diff --git a/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch b/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch new file mode 100644 index 0000000000..2df8a99700 --- /dev/null +++ b/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch @@ -0,0 +1,39 @@ +From 3ab8bdc1c657f91a2a96f4e6db308d17098de0c4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 12:09:11 +0100 +Subject: [PATCH] src/s6-linux-utils/rngseed.c: fix build with glibc < + +getrandom and sys/random.h are only available since glibc 2.25 resulting +in the following build failure since version 2.6.0.0 and +https://github.com/skarnet/s6-linux-utils/commit/ad5973028c42d947440cdae5e4f106152c3dda28: + +src/minutils/rngseed.c:15:24: fatal error: sys/random.h: No such file or directory + #include + ^ + +Fixes: + - http://autobuild.buildroot.org/results/214bcecfc389cb412b68627c831300478d614a3a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/skarnet/s6-linux-utils/pull/2] +--- + src/s6-linux-utils/rngseed.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/minutils/rngseed.c b/src/minutils/rngseed.c +index 2b1772c..223f50a 100644 +--- a/src/minutils/rngseed.c ++++ b/src/minutils/rngseed.c +@@ -12,7 +12,9 @@ + #include + #include + #include ++#ifdef SKALIBS_HASGETRANDOM + #include ++#endif + #include + + #include +-- +2.39.1 + -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 12:36:44 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 13:36:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/lttng-babeltrace: fix popt static build with libiconv Message-ID: <20230223123644.402595-1-fontaine.fabrice@gmail.com> Fix the following popt static build failure with libiconv: configure:18149: checking for poptGetContext in -lpopt configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5 /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': poptint.c:(.text+0x28a): undefined reference to `libiconv_open' [...] checking for poptGetContext in -lpopt... no configure: error: Cannot find popt. Fixes: - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f Signed-off-by: Fabrice Fontaine --- ...2-configure.ac-fix-popt-static-build.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch diff --git a/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch b/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch new file mode 100644 index 0000000000..896c67470f --- /dev/null +++ b/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch @@ -0,0 +1,48 @@ +From 35076fd4592ca23136ff5eacdf8eaebc926e0224 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 13:04:08 +0100 +Subject: [PATCH] configure.ac: fix popt static build + +Fix the following popt static build failure: + +configure:18149: checking for poptGetContext in -lpopt +configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5 +/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': +poptint.c:(.text+0x28a): undefined reference to `libiconv_open' + +[...] + +checking for poptGetContext in -lpopt... no +configure: error: Cannot find popt. + +Fixes: + - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f + +Signed-off-by: Fabrice Fontaine +[Upstream status: not upstreamable as popt has been removed with +https://github.com/efficios/babeltrace/commit/916d0d910ad5407bc7826505aa05b277f5739a34] +--- + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a17c23c3..8f700d3e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -223,8 +223,11 @@ AC_CHECK_LIB([c], [faccessat], + ] + ) + +-AC_CHECK_LIB([popt], [poptGetContext], [], +- [AC_MSG_ERROR([Cannot find popt.])] ++PKG_CHECK_MODULES([POPT], [popt], [LIBS="${POPT_LIBS} ${LIBS}"], ++[ ++ AC_CHECK_LIB([popt], [poptGetContext], [], ++ [AC_MSG_ERROR([Cannot find popt.])]) ++] + ) + + # For Python +-- +2.39.1 + -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 12:52:42 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 13:52:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/mender: force libopenssl Message-ID: <20230223125242.411118-1-fontaine.fabrice@gmail.com> mender raises the following build failure with libressl since at least version 3.1.0 (and probably since the addition of the package): vendor/github.com/mendersoftware/openssl/conn.go:103:61: could not determine kind of name for C.X509_V_ERR_DANE_NO_MATCH Fixes: - http://autobuild.buildroot.org/results/2b032d2a4e7cfbb20444c13821003120a4d00abd - http://autobuild.buildroot.org/results/621c057c0b8b627c8140456a2b0af4f95d239dcc Signed-off-by: Fabrice Fontaine --- package/mender/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mender/Config.in b/package/mender/Config.in index cccb46361b..7d768cebec 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -4,8 +4,9 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 help Mender is an open source over-the-air (OTA) software updater for embedded Linux devices. Mender comprises a client -- 2.39.1 From thomas at devoogdt.com Thu Feb 23 12:56:12 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Thu, 23 Feb 2023 13:56:12 +0100 Subject: [Buildroot] [PATCH v4 4/4] package/libgtk3: fix update-icon-cache on empty directory In-Reply-To: References: Message-ID: <20230223125612.3156012-1-thomas.devoogdt@barco.com> If both, hicolor-icon-theme (selected by libgtk3-demo) and adwaita-icon-theme is not selected, then the /usr/share/icons folder is empty, causing find to fail. Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) v4: - replace only update-icon-cache when the demos are built to a dir check --- package/libgtk3/libgtk3.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 2821c7eb52..e2dc8eabfb 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -146,6 +146,7 @@ endef # Create icon-theme.cache for each of the icon directories/themes # It's not strictly necessary but speeds up lookups define LIBGTK3_UPDATE_ICON_CACHE +[ ! -d $(TARGET_DIR)/usr/share/icons ] || \ find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; endef -- 2.39.2 From fontaine.fabrice at gmail.com Thu Feb 23 14:06:06 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 15:06:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/erlang: fix build with libressl >= 3.5.0 Message-ID: <20230223140606.208040-1-fontaine.fabrice@gmail.com> Fix the following build failure with libressl >= 3.5.0 raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: api_ng.c: In function 'EVP_CIPHER_CTX_copy': api_ng.c:392:28: error: invalid use of incomplete typedef 'EVP_CIPHER_CTX' {aka 'const struct evp_cipher_ctx_st'} 392 | if ((in == NULL) || (in->cipher == NULL)) | ^~ Fixes: - http://autobuild.buildroot.org/results/90f7365d8477d35fca452b7b3f38babba086375e Signed-off-by: Fabrice Fontaine --- ...0003-crypto-Fixes-for-LibreSSL-3-5-0.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch diff --git a/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch b/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch new file mode 100644 index 0000000000..84c75fef83 --- /dev/null +++ b/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch @@ -0,0 +1,30 @@ +From 8e5170d79e387d7e898d948a78e0c70407a4030c Mon Sep 17 00:00:00 2001 +From: Hans Nilsson +Date: Mon, 14 Feb 2022 15:51:35 +0100 +Subject: [PATCH] crypto: Fixes for LibreSSL 3.5.0 + +[Retrieved (and backported) from: +https://github.com/erlang/otp/commit/8e5170d79e387d7e898d948a78e0c70407a4030c] +Signed-off-by: Fabrice Fontaine +--- + lib/crypto/c_src/openssl_config.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h +index 6fdd049fb30a..39e4b2d9d7c0 100644 +--- a/lib/crypto/c_src/openssl_config.h ++++ b/lib/crypto/c_src/openssl_config.h +@@ -122,7 +122,14 @@ + # endif + #endif + ++#ifdef HAS_LIBRESSL ++# if LIBRESSL_VERSION_NUMBER >= 0x3050000fL ++# define HAS_EVP_PKEY_CTX ++# define HAVE_EVP_CIPHER_CTX_COPY ++# endif ++#endif ++ + #ifndef HAS_LIBRESSL + # if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0) + # define HAS_EVP_PKEY_CTX -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 14:17:45 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 15:17:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: fix build with fmt >= 9.0.0 Message-ID: <20230223141745.303457-1-fontaine.fabrice@gmail.com> Fix the following build failure with fmt >= 9.0.0 raised since commit 5c83dc5451fb59ffa5cd40d30c4c532dd25e8333: /tmp/instance-5/output-1/build/gerbera-1.10.0/src/database/sql_database.cc:1688:26: required from here /tmp/instance-5/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/fmt/format.h:3973:36: error: passing 'const fmt::v9::formatter >, __gnu_cxx::__normal_iterator >, char>, char, void>::formatter_type' {aka 'const fmt::v9::formatter'} as 'this' argument discards qualifiers [-fpermissive] 3973 | out = value_formatter_.format(map(*it), ctx); | ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/56c46fa7e922360d2c4b4093f8a030cc83726799 Signed-off-by: Fabrice Fontaine --- .../gerbera/0001-Fix-build-with-fmt-9-0.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/gerbera/0001-Fix-build-with-fmt-9-0.patch diff --git a/package/gerbera/0001-Fix-build-with-fmt-9-0.patch b/package/gerbera/0001-Fix-build-with-fmt-9-0.patch new file mode 100644 index 0000000000..63ae8382a3 --- /dev/null +++ b/package/gerbera/0001-Fix-build-with-fmt-9-0.patch @@ -0,0 +1,36 @@ +From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001 +From: Felix Yan +Date: Fri, 19 Aug 2022 15:22:10 +0300 +Subject: [PATCH] Fix build with fmt 9.0 + +Fixes #2681 + +[Retrieved from: +https://github.com/gerbera/gerbera/commit/d7b8fafbc94405c20753fed569abd8878cccde89] +Signed-off-by: Fabrice Fontaine +--- + src/database/sql_format.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/database/sql_format.h b/src/database/sql_format.h +index 32dc00efa..e4e1909a8 100644 +--- a/src/database/sql_format.h ++++ b/src/database/sql_format.h +@@ -42,7 +42,7 @@ struct SQLIdentifier { + template <> + struct fmt::formatter : formatter { + template +- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end); + } +@@ -61,7 +61,7 @@ struct ColumnUpdate { + template <> + struct fmt::formatter : formatter { + template +- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{} = {}", a.column, a.value); + } -- 2.39.1 From sebastien.szymanski at armadeus.com Thu Feb 23 08:56:04 2023 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Thu, 23 Feb 2023 09:56:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/rt-tests: bump version to 2.5 Message-ID: <20230223085604.28572-1-sebastien.szymanski@armadeus.com> Signed-off-by: S?bastien Szymanski --- package/rt-tests/rt-tests.hash | 2 +- package/rt-tests/rt-tests.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rt-tests/rt-tests.hash b/package/rt-tests/rt-tests.hash index 49df8313f9..eb28f4d441 100644 --- a/package/rt-tests/rt-tests.hash +++ b/package/rt-tests/rt-tests.hash @@ -1,4 +1,4 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc -sha256 393457f0c91cce57e82b876ecb9b672871f898e6cecafc751548079512bcc808 rt-tests-2.4.tar.xz +sha256 2ed2e4c965c7f336a15d3354dec090e27a0b1e9ada91ae0b9ef18bbcb993874e rt-tests-2.5.tar.xz # locally computed hash sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk index 74290211ce..8ad4215ee1 100644 --- a/package/rt-tests/rt-tests.mk +++ b/package/rt-tests/rt-tests.mk @@ -6,7 +6,7 @@ RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 2.4 +RT_TESTS_VERSION = 2.5 RT_TESTS_LICENSE = GPL-2.0+ RT_TESTS_LICENSE_FILES = COPYING -- 2.39.2 From frank.vanbever at mind.be Thu Feb 23 15:01:41 2023 From: frank.vanbever at mind.be (Frank Vanbever) Date: Thu, 23 Feb 2023 16:01:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmodsecurity: bump to version 3.0.8 In-Reply-To: <20230115173240.81077-1-fontaine.fabrice@gmail.com> References: <20230115173240.81077-1-fontaine.fabrice@gmail.com> Message-ID: <2902185.e9J7NaK4W3@wintermute> Hi all, Any version of libmodsecurity < 3.0.8 is affected by CVE-2022-48279 [1] so this bump is also relevant for 2022.11.x (3.0.7) and 2022.02.x (3.0.6) I originally backported the fix from 3.0.8 to 3.0.7 and it comes in at just under 1MB. This rightfully triggered a quarantine in the mailing list and is a pretty good sign that a version bump might be a better course of action here. Best regards, Frank [1] https://nvd.nist.gov/vuln/detail/CVE-2022-48279 On zondag 15 januari 2023 18:32:40 CET Fabrice Fontaine wrote: > https://github.com/SpiderLabs/ModSecurity/releases/tag/v3.0.8 > > Signed-off-by: Fabrice Fontaine > --- > package/libmodsecurity/libmodsecurity.hash | 4 ++-- > package/libmodsecurity/libmodsecurity.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libmodsecurity/libmodsecurity.hash > b/package/libmodsecurity/libmodsecurity.hash index 087157d162..7ba0ef7f18 > 100644 > --- a/package/libmodsecurity/libmodsecurity.hash > +++ b/package/libmodsecurity/libmodsecurity.hash > @@ -1,4 +1,4 @@ > -# From > https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.7/modsecur > ity-v3.0.7.tar.gz.sha256 -sha256 > cfd8b7e7e6a0e9ca4e19b9adeb07594ba75eba16a66da5e9b0974c0117c21a34 > modsecurity-v3.0.7.tar.gz +# From > https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.8/modsecur > ity-v3.0.8.tar.gz.sha256 +sha256 > e241c89b3cd7e58a863d0d0d6b9b8ba4d33ffb0f51171044c258c62e3e7956c7 > modsecurity-v3.0.8.tar.gz # Localy calculated > sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 > LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk > b/package/libmodsecurity/libmodsecurity.mk index 916ba8fbcb..e83fda895f > 100644 > --- a/package/libmodsecurity/libmodsecurity.mk > +++ b/package/libmodsecurity/libmodsecurity.mk > @@ -4,7 +4,7 @@ > # > ########################################################################### > ##### > > -LIBMODSECURITY_VERSION = 3.0.7 > +LIBMODSECURITY_VERSION = 3.0.8 > LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz > LIBMODSECURITY_SITE = > https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURI > TY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES From fontaine.fabrice at gmail.com Thu Feb 23 15:32:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 16:32:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/cairo: fix pthread detection Message-ID: <20230223153236.914358-1-fontaine.fabrice@gmail.com> pthreads detection fails if a warning is emitted resulting in the following build failure with some toolchains: onfigure:34189: checking for cairo's pthread feature configure:34300: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm -lpthread >&5 /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker configure:34300: $? = 0 configure:34419: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm >&5 /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker configure:34419: $? = 0 configure:34500: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm >&5 /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker configure:34500: $? = 0 configure:34555: checking whether cairo's pthread feature could be enabled configure:34557: result: no (can't link with -lpthread or -pthread) [...] In file included from cairo-mutex-type-private.h:45, from cairo-scaled-font-private.h:45, from cairoint.h:434, from cairo-analysis-surface.c:37: cairo-mutex-impl-private.h:262:3: error: #error "XXX: No mutex implementation found. Cairo will not work with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile cairo without thread-safety support." 262 | # error "XXX: No mutex implementation found. Cairo will not work with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile cairo without thread-safety support." | ^~~~~ To avoid this build failure, add a patch that overrides this broken mechanism Fixes: - http://autobuild.buildroot.org/results/5420beaf94855e47eeb08627e8e3c169dc00419a Signed-off-by: Fabrice Fontaine --- ...e.ac.pthread-respect-enable-pthreads.patch | 59 +++++++++++++++++++ package/cairo/cairo.mk | 13 ++-- 2 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch diff --git a/package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch b/package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch new file mode 100644 index 0000000000..c350c596cf --- /dev/null +++ b/package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch @@ -0,0 +1,59 @@ +From 243fe7f3d51c23159e25f36adee7e953fee29f6c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 16:07:04 +0100 +Subject: [PATCH] build/configure.ac.pthread: respect --enable-pthreads + +Respect --enable-pthreads as pthreads detection fails if a warning is +emitted resulting in the following build failure with some toolchains: + +onfigure:34189: checking for cairo's pthread feature +configure:34300: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm -lpthread >&5 +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker +configure:34300: $? = 0 +configure:34419: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm >&5 +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker +configure:34419: $? = 0 +configure:34500: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm >&5 +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker +configure:34500: $? = 0 +configure:34555: checking whether cairo's pthread feature could be enabled +configure:34557: result: no (can't link with -lpthread or -pthread) + +[...] + +In file included from cairo-mutex-type-private.h:45, + from cairo-scaled-font-private.h:45, + from cairoint.h:434, + from cairo-analysis-surface.c:37: +cairo-mutex-impl-private.h:262:3: error: #error "XXX: No mutex implementation found. Cairo will not work with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile cairo without thread-safety support." + 262 | # error "XXX: No mutex implementation found. Cairo will not work with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile cairo without thread-safety support." + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/5420beaf94855e47eeb08627e8e3c169dc00419a + +Signed-off-by: Fabrice Fontaine +--- + build/configure.ac.pthread | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build/configure.ac.pthread b/build/configure.ac.pthread +index 29c930da9..084445587 100644 +--- a/build/configure.ac.pthread ++++ b/build/configure.ac.pthread +@@ -244,7 +244,8 @@ AC_DEFUN([CAIRO_CONFIGURE_PTHREAD],[dnl + + dnl Make sure we scored some pthreads. + if test "x$enable_pthread" = "xyes" -a "x$have_pthread" != "xyes"; then +- AC_MSG_ERROR([pthread requested but not found]) ++ AC_MSG_WARN([pthread requested but not found]) ++ have_pthread=yes + fi + + dnl Set the output variables for CAIRO_ENABLE. +-- +2.39.1 + diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index e8a704c7da..9034068403 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -11,6 +11,8 @@ CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 CAIRO_CPE_ID_VENDOR = cairographics CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES +# We're patching build/configure.ac.pthread +CAIRO_AUTORECONF = YES # 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch CAIRO_IGNORE_CVES += CVE-2018-19876 @@ -26,10 +28,6 @@ ifeq ($(BR2_m68k_cf),y) CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" -endif - # cairo can use C++11 atomics when available, so we need to link with # libatomic for the architectures who need libatomic. ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) @@ -70,6 +68,13 @@ HOST_CAIRO_DEPENDENCIES = \ host-pixman \ host-pkgconf +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +CAIRO_CONF_OPTS += --enable-pthread +else +CAIRO_CONF_OPTS += --disable-pthread +CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" +endif + # DirectFB svg support rely on Cairo and Cairo DirectFB support depends on # DirectFB. Break circular dependency by disabling DirectFB support in Cairo # (which is experimental) -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 16:07:14 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 17:07:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/xtables-addons: drop XTABLES_ADDONS_DISABLE_GEOIP_HELPERS Message-ID: <20230223160714.1210026-1-fontaine.fabrice@gmail.com> Drop XTABLES_ADDONS_DISABLE_GEOIP_HELPERS which raises the following build failure (probably since the addition of the package): make[3]: *** No rule to make target '/xt_geoip_query', needed by 'all-am'. Stop. unzip and perl don't seem to be needed Fixes: - http://autobuild.buildroot.org/results/f2d596b510f027b94a6b1fad10c363922c50cbec Signed-off-by: Fabrice Fontaine --- package/xtables-addons/xtables-addons.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 77dcfd741c..b656ab0e81 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -16,12 +16,6 @@ XTABLES_ADDONS_CONF_OPTS = \ --with-xtables="$(STAGING_DIR)/usr" \ --with-xtlibdir="/usr/lib/xtables" -# geoip helpers need perl with modules and unzip so disable -define XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - $(SED) 's/ geoip//' $(@D)/Makefile.in -endef -XTABLES_ADDONS_POST_PATCH_HOOKS += XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - define XTABLES_ADDONS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) endef -- 2.39.1 From fontaine.fabrice at gmail.com Thu Feb 23 16:28:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 17:28:47 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/efivar: needs threads Message-ID: <20230223162847.9247-1-fontaine.fabrice@gmail.com> Add a thread dependency as Upstream quickly closed https://github.com/rhboot/efivar/pull/238 to fix the following build failure without threads raised since bump to version 38 in commit f24029b561fbda0953c7dbd93d2485b03873996d and https://github.com/rhboot/efivar/commit/cff88dd96b9d43e2c5875a24ba6180b196890ded: thread-test.c:14:10: fatal error: pthread.h: No such file or directory 14 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/f2da14f91dc602a32dd5b2b7bdf3d3aa43afa7f4 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Add a thread dependency package/efibootmgr/Config.in | 5 +++-- package/efivar/Config.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index 98ff71c996..5800e6c143 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_EFIBOOTMGR bool "efibootmgr" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS # efivar depends on !BR2_STATIC_LIBS # efivar + depends on BR2_TOOLCHAIN_HAS_THREADS # efivar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS @@ -15,9 +16,9 @@ config BR2_PACKAGE_EFIBOOTMGR https://github.com/rhboot/efibootmgr -comment "efibootmgr needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efibootmgr needs a toolchain w/ dynamic library, threads, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/package/efivar/Config.in b/package/efivar/Config.in index 74f2bb5abb..d4402dbcf7 100644 --- a/package/efivar/Config.in +++ b/package/efivar/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_EFIVAR depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # linux/nvme.h + depends on BR2_TOOLCHAIN_HAS_THREADS # linux/nvme.h has been renamed to linux/nvme_ioctl.h since 4.4, # and the efivar source handles that situation. However, some # Sourcery CodeBench toolchains use 4.4 kernel headers but they @@ -22,9 +23,9 @@ config BR2_PACKAGE_EFIVAR https://github.com/rhboot/efivar -comment "efivar needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efivar needs a toolchain w/ dynamic library, threads, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS -- 2.39.1 From geomatsi at gmail.com Thu Feb 23 16:47:47 2023 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Thu, 23 Feb 2023 19:47:47 +0300 Subject: [Buildroot] [PATCH 1/1] package/wpa_supplicant: fix builds with missing sha384 hash functions Message-ID: <20230223164747.1653580-1-geomatsi@gmail.com> SAE, unlike OWE or DPP, does not explicitly enable support for sha384 hash functions. Possible WPA3 build issue is masked, since all three SAE/OWE/DPP are included. However, there exist other configurations that enable only SAE. For instance, one such build configuration is wpa_supplicant AP mode with mesh support. This change adds upstream patch that includes sha384 and sha256 hash functions to builds with SAE support. Fixes: http://autobuild.buildroot.net/results/f349130985870f4a781cca56c3f551108f81aa3e/ Signed-off-by: Sergey Matyukevich --- ...384-512-KDF-for-SAE-if-SHA384-512-is.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch diff --git a/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch b/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch new file mode 100644 index 0000000000..d85e343380 --- /dev/null +++ b/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch @@ -0,0 +1,62 @@ +From c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sun, 17 Apr 2022 12:28:41 +0300 +Subject: [PATCH] Include HMAC-SHA384/512 KDF for SAE if SHA384/512 is included + +It was possible to miss the HMAC functions if some other build +configuration parameters ended up setting NEED_SHA384/512=y. + +Upstream: https://w1.fi/cgit/hostap/commit/?id=c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 +Signed-off-by: Jouni Malinen +--- + wpa_supplicant/Android.mk | 11 +++++++++++ + wpa_supplicant/Makefile | 11 +++++++++++ + 2 files changed, 22 insertions(+) + +diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk +index 0e0ce467c..bcdbd6c90 100644 +--- a/wpa_supplicant/Android.mk ++++ b/wpa_supplicant/Android.mk +@@ -1361,6 +1361,17 @@ endif + endif + endif + ++ifdef CONFIG_SAE ++ifdef NEED_SHA384 ++# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. ++NEED_HMAC_SHA384_KDF=y ++endif ++ifdef NEED_SHA512 ++# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. ++NEED_HMAC_SHA512_KDF=y ++endif ++endif ++ + SHA256OBJS = # none by default + L_CFLAGS += -DCONFIG_SHA256 + ifneq ($(CONFIG_TLS), openssl) +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index ed49aa972..69c80121c 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -1475,6 +1475,17 @@ endif + endif + endif + ++ifdef CONFIG_SAE ++ifdef NEED_SHA384 ++# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. ++NEED_HMAC_SHA384_KDF=y ++endif ++ifdef NEED_SHA512 ++# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. ++NEED_HMAC_SHA512_KDF=y ++endif ++endif ++ + SHA256OBJS = # none by default + CFLAGS += -DCONFIG_SHA256 + ifneq ($(CONFIG_TLS), openssl) +-- +2.39.2 + -- 2.39.2 From vincent.stehle at arm.com Thu Feb 23 18:08:45 2023 From: vincent.stehle at arm.com (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Thu, 23 Feb 2023 19:08:45 +0100 Subject: [Buildroot] [PATCH 0/2] Bump Arm Foundation Message-ID: <20230223180847.2512056-1-vincent.stehle@arm.com> Hi, Here are a couple of patches to bump boot-wrapper and the arm_foundationv8_defconfig. They should be applied in order, please. The updated model version mentioned in the second patch will not run the older boot-wrapper "as is"; it would need option `--arm-v8.0' for example. Best regards, Vincent. Vincent Stehl? (2): boot/boot-wrapper-aarch64: bump version configs/arm_foundationv8: bump to Linux 6.1.13 board/arm/foundation-v8/readme.txt | 4 ++-- boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +- configs/arm_foundationv8_defconfig | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) -- 2.39.1 From vincent.stehle at arm.com Thu Feb 23 18:08:46 2023 From: vincent.stehle at arm.com (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Thu, 23 Feb 2023 19:08:46 +0100 Subject: [Buildroot] [PATCH 1/2] boot/boot-wrapper-aarch64: bump version In-Reply-To: <20230223180847.2512056-1-vincent.stehle@arm.com> References: <20230223180847.2512056-1-vincent.stehle@arm.com> Message-ID: <20230223180847.2512056-2-vincent.stehle@arm.com> Bump boot-wrapper to the latest version. Signed-off-by: Vincent Stehl? Cc: Thomas Petazzoni --- boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index 30b352f8e7..95f7e22760 100644 --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a +BOOT_WRAPPER_AARCH64_VERSION = 9f26a1c1f27bd6b5b66c265114848007fc22e4aa BOOT_WRAPPER_AARCH64_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git BOOT_WRAPPER_AARCH64_SITE_METHOD = git BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause -- 2.39.1 From vincent.stehle at arm.com Thu Feb 23 18:08:47 2023 From: vincent.stehle at arm.com (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Thu, 23 Feb 2023 19:08:47 +0100 Subject: [Buildroot] [PATCH 2/2] configs/arm_foundationv8: bump to Linux 6.1.13 In-Reply-To: <20230223180847.2512056-1-vincent.stehle@arm.com> References: <20230223180847.2512056-1-vincent.stehle@arm.com> Message-ID: <20230223180847.2512056-3-vincent.stehle@arm.com> - Bump Linux kernel to v6.1.13 and increase the rootfs size accordingly. - Bump the FVP in the readme to version 11.20 build 15 and update the command line. Signed-off-by: Vincent Stehl? Cc: Masahiro Yamada --- board/arm/foundation-v8/readme.txt | 4 ++-- configs/arm_foundationv8_defconfig | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/board/arm/foundation-v8/readme.txt b/board/arm/foundation-v8/readme.txt index b5106f015e..cb0fe08b87 100644 --- a/board/arm/foundation-v8/readme.txt +++ b/board/arm/foundation-v8/readme.txt @@ -3,14 +3,14 @@ ARM software simulator of the AArch64 architecture. First, one has to download the AArch64 software simulator from: - https://silver.arm.com/download/download.tm?pv=4807186 + https://armkeil.blob.core.windows.net/developer/Files/downloads/ecosystem-models/Foundation_Platform_11.20_15_Linux64.tgz Then, use the arm_foundationv8_defconfig configuration to build your Buildroot system. Finally, boot your system with: - ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-6.4/Foundation_Platform \ + ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-9.3/Foundation_Platform \ --image output/images/linux-system.axf \ --block-device output/images/rootfs.ext2 \ --network=nat \ diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig index 3c63f5dc76..102fe8fd09 100644 --- a/configs/arm_foundationv8_defconfig +++ b/configs/arm_foundationv8_defconfig @@ -1,15 +1,16 @@ BR2_aarch64=y -# Linux headers same as kernel, a 5.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.20" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.13" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8-gicv3-psci" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BOOT_WRAPPER_AARCH64=y BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8-gicv3-psci" -- 2.39.1 From peter at korsgaard.com Thu Feb 23 19:02:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:02:31 +0100 Subject: [Buildroot] [PATCH next v2 1/7] package/python-idna: set _SETUP_TYPE = flit In-Reply-To: <7b2f79e7-0880-f210-5c35-d58f7dfaf367@othermo.de> (Marcus Hoffmann via buildroot's message of "Wed, 21 Dec 2022 23:21:26 +0100") References: <20221122203130.184496-1-ju.o@free.fr> <7b2f79e7-0880-f210-5c35-d58f7dfaf367@othermo.de> Message-ID: <87zg94p5mg.fsf@dell.be.48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > On 22.11.22 21:31, Julien Olivain wrote: >> Python idna package switched to pyproject.toml in commit: >> https://github.com/kjd/idna/commit/2a00e518efe55d2eeb62cd3f88ace7db41338603 >> which is included in idna v3.4. >> >> When using the old setuptools infra, the package is incorrectly >> installed as v0.0, which is then incorrectly detected by other >> packages when using setuptools pkg_resources. >> >> The issue can be reproduced with the command: >> >> python3 <> __requires__ = ["idna >= 2.5"] >> import pkg_resources >> EOF >> >> which will fail with output: >> >> pkg_resources.ContextualVersionConflict: (idna 0.0.0 >> (/usr/lib/python3.11/site-packages), Requirement.parse('idna>=2.5'), >> {'hyperlink'}) >> pkg_resources.DistributionNotFound: The 'idna>=2.5' >> distribution was not found and is required by hyperlink >> >> This commit changes _SETUP_TYPE to "flit" to fix this issue. >> >> Signed-off-by: Julien Olivain > Reviewed-by: Marcus Hoffmann Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 23 19:03:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:03:22 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: correct check for open perl module In-Reply-To: <20230207113647.F360184086@busybox.osuosl.org> (Peter Korsgaard's message of "Tue, 7 Feb 2023 12:35:46 +0100") References: <20230207113647.F360184086@busybox.osuosl.org> Message-ID: <87v8jsp5l1.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=b63e155e5fb7104e6660aa0570befa9498259cd7 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Commit 4cdd99190e89 (support/dependencies/dependencies.sh: require open perl > package for libxcrypt) added a check for the "open" perl module for > libxcrypt, but it does not work as "open" cannot be directly used with > "require" as an argument is needed: > perl -e "require open" > Not enough arguments for open at -e line 1, at EOF > Execution of -e aborted due to compilation errors. > So special case the check to instead check with "use open ':std'". > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 23 19:03:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:03:06 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: correct check for open perl module Message-ID: <20230223190725.A71E786927@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00cbf0095cdc1da96ddd1d991ac1e5979bd05d08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit 4cdd99190e89 (support/dependencies/dependencies.sh: require open perl package for libxcrypt) added a check for the "open" perl module for libxcrypt, but it does not work as "open" cannot be directly used with "require" as an argument is needed: perl -e "require open" Not enough arguments for open at -e line 1, at EOF Execution of -e aborted due to compilation errors. So special case the check to instead check with "use open ':std'". Signed-off-by: Peter Korsgaard (cherry picked from commit b63e155e5fb7104e6660aa0570befa9498259cd7) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 683bb5cb7e..cd0e900ff6 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -280,10 +280,6 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl -if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then - required_perl_modules="$required_perl_modules open" -fi - if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" @@ -300,6 +296,13 @@ fi # This variable will keep the modules that are missing in your system. missing_perl_modules="" +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + # open cannot be used with require + if ! perl -e "use open ':std'" > /dev/null 2>&1 ; then + missing_perl_modules="$missing_perl_modules open" + fi +fi + for pm in $required_perl_modules ; do if ! perl -e "require $pm" > /dev/null 2>&1 ; then missing_perl_modules="$missing_perl_modules $pm" From peter at korsgaard.com Thu Feb 23 19:08:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:08:20 +0100 Subject: [Buildroot] [git commit] package/dahdi-linux: update URL in Config.in help text In-Reply-To: <20230207134415.6E95E84194@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Tue, 7 Feb 2023 14:44:02 +0100") References: <20230207134415.6E95E84194@busybox.osuosl.org> Message-ID: <87r0ugp5cr.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=e06975b38047fe1ef47650248f154ecf88fe09b5 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > http://www.asterisk.org/downloads/dahdi no longer works, use the > Github page instead. > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 23 19:03:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:03:02 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: correct check for open perl module Message-ID: <20230223190839.A459F86931@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df702ada1056305086fbd9f36e9cdf2092b19704 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit 4cdd99190e89 (support/dependencies/dependencies.sh: require open perl package for libxcrypt) added a check for the "open" perl module for libxcrypt, but it does not work as "open" cannot be directly used with "require" as an argument is needed: perl -e "require open" Not enough arguments for open at -e line 1, at EOF Execution of -e aborted due to compilation errors. So special case the check to instead check with "use open ':std'". Signed-off-by: Peter Korsgaard (cherry picked from commit b63e155e5fb7104e6660aa0570befa9498259cd7) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 683bb5cb7e..cd0e900ff6 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -280,10 +280,6 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl -if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then - required_perl_modules="$required_perl_modules open" -fi - if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" @@ -300,6 +296,13 @@ fi # This variable will keep the modules that are missing in your system. missing_perl_modules="" +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + # open cannot be used with require + if ! perl -e "use open ':std'" > /dev/null 2>&1 ; then + missing_perl_modules="$missing_perl_modules open" + fi +fi + for pm in $required_perl_modules ; do if ! perl -e "require $pm" > /dev/null 2>&1 ; then missing_perl_modules="$missing_perl_modules $pm" From peter at korsgaard.com Thu Feb 23 19:01:20 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:01:20 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/python-idna: set _SETUP_TYPE = flit Message-ID: <20230223190839.995CC86930@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3dad2c0c146157fe6256af69ee39b7af90a8f5ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Python idna package switched to pyproject.toml in commit: https://github.com/kjd/idna/commit/2a00e518efe55d2eeb62cd3f88ace7db41338603 which is included in idna v3.4. When using the old setuptools infra, the package is incorrectly installed as v0.0, which is then incorrectly detected by other packages when using setuptools pkg_resources. The issue can be reproduced with the command: python3 <= 2.5"] import pkg_resources EOF which will fail with output: pkg_resources.ContextualVersionConflict: (idna 0.0.0 (/usr/lib/python3.11/site-packages), Requirement.parse('idna>=2.5'), {'hyperlink'}) pkg_resources.DistributionNotFound: The 'idna>=2.5' distribution was not found and is required by hyperlink This commit changes _SETUP_TYPE to "flit" to fix this issue. Signed-off-by: Julien Olivain Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit 8a9da9a8cad5f77902547fab3b24d04175749a7c) Signed-off-by: Peter Korsgaard --- package/python-idna/python-idna.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 4d9994a9c7..3976cb1518 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -9,7 +9,7 @@ PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/8b/e1/43beb3d38dba6cb420cefa297822eac205a277ab43e5ba5d5c46faf96438 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md -PYTHON_IDNA_SETUP_TYPE = setuptools +PYTHON_IDNA_SETUP_TYPE = flit $(eval $(python-package)) $(eval $(host-python-package)) From peter at korsgaard.com Thu Feb 23 19:09:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:09:09 +0100 Subject: [Buildroot] [git commit] package/pkg-generic.mk: only check for virtual package conflicts when building In-Reply-To: <20230207135235.D0949841B7@busybox.osuosl.org> (Peter Korsgaard's message of "Tue, 7 Feb 2023 14:52:27 +0100") References: <20230207135235.D0949841B7@busybox.osuosl.org> Message-ID: <87mt54p5be.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=7231701a290ba447fde9807ba9d260022ddfc8e4 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The configuration checks should only be done when building so that > make allyespackageconfig && make source works. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 23 19:09:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:09:14 +0100 Subject: [Buildroot] [git commit] package/mesa3d-headers: only check for conflicts when building In-Reply-To: <20230207135235.C34CC841B6@busybox.osuosl.org> (Peter Korsgaard's message of "Tue, 7 Feb 2023 14:52:26 +0100") References: <20230207135235.C34CC841B6@busybox.osuosl.org> Message-ID: <87ilfsp5b9.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=509956da4cdba6a76214322b1ace979bbe6cd6a8 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The configuration checks should only be done when building so that > make allyespackageconfig && make source works. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 23 19:08:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:08:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/dahdi-linux: update URL in Config.in help text Message-ID: <20230223190957.ABAC18694A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efd9ca6df67298ed1b60fd05d9d2d783dee1bd98 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x http://www.asterisk.org/downloads/dahdi no longer works, use the Github page instead. Signed-off-by: Thomas Petazzoni (cherry picked from commit e06975b38047fe1ef47650248f154ecf88fe09b5) Signed-off-by: Peter Korsgaard --- package/dahdi-linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dahdi-linux/Config.in b/package/dahdi-linux/Config.in index 7b6ce79422..b6086fdc6c 100644 --- a/package/dahdi-linux/Config.in +++ b/package/dahdi-linux/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_DAHDI_LINUX DAHDI Linux is the open source device driver framework used to interface Asterisk with telephony hardware. - http://www.asterisk.org/downloads/dahdi + https://github.com/asterisk/dahdi-linux comment "dahdi-linux needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL From peter at korsgaard.com Thu Feb 23 19:08:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:08:49 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pkg-generic.mk: only check for virtual package conflicts when building Message-ID: <20230223190957.C506F8694D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=421f58cfa996a27d85b01775521b3c52125de264 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard (cherry picked from commit 7231701a290ba447fde9807ba9d260022ddfc8e4) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a88934b866..6c3b64b4c8 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1182,10 +1182,12 @@ ifeq ($$($$($(2)_KCONFIG_VAR)),y) # Ensure the calling package is the declared provider for all the virtual # packages it claims to be an implementation of. +ifeq ($(BR_BUILDING),y) ifneq ($$($(2)_PROVIDES),) $$(foreach pkg,$$($(2)_PROVIDES),\ $$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep))) endif +endif # Register package as a reverse-dependencies of all its dependencies $$(eval $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),\ From peter at korsgaard.com Thu Feb 23 19:08:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:08:32 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/mesa3d-headers: only check for conflicts when building Message-ID: <20230223190957.B896E8694B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f5a9f375ecbe6adf83966e646f460f12ccac54f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard (cherry picked from commit 509956da4cdba6a76214322b1ace979bbe6cd6a8) Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 871cf2f495..abfa0e9b55 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -6,7 +6,7 @@ # mesa3d-headers is inherently incompatible with mesa3d, so error out # if both are enabled. -ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yy) +ifeq ($(BR_BUILDING)$(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yyy) $(error mesa3d-headers enabled, but mesa3d enabled too) endif From peter at korsgaard.com Thu Feb 23 19:08:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:08:38 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/mesa3d-headers: only check for conflicts when building Message-ID: <20230223191106.09CE58696A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81b082a4fe581fe3729b0eb4155a2781f99be2fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard (cherry picked from commit 509956da4cdba6a76214322b1ace979bbe6cd6a8) Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 3712c79db0..83830ba23b 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -6,7 +6,7 @@ # mesa3d-headers is inherently incompatible with mesa3d, so error out # if both are enabled. -ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yy) +ifeq ($(BR_BUILDING)$(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yyy) $(error mesa3d-headers enabled, but mesa3d enabled too) endif From peter at korsgaard.com Thu Feb 23 19:08:44 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:08:44 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/pkg-generic.mk: only check for virtual package conflicts when building Message-ID: <20230223191106.16D4D8697C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc12f089b6f102b97497c287fa44e2ce5707639e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The configuration checks should only be done when building so that make allyespackageconfig && make source works. Signed-off-by: Peter Korsgaard (cherry picked from commit 7231701a290ba447fde9807ba9d260022ddfc8e4) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b31c563ae5..f9c0ea71e1 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1182,10 +1182,12 @@ ifeq ($$($$($(2)_KCONFIG_VAR)),y) # Ensure the calling package is the declared provider for all the virtual # packages it claims to be an implementation of. +ifeq ($(BR_BUILDING),y) ifneq ($$($(2)_PROVIDES),) $$(foreach pkg,$$($(2)_PROVIDES),\ $$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep))) endif +endif # Register package as a reverse-dependencies of all its dependencies $$(eval $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),\ From peter at korsgaard.com Thu Feb 23 19:07:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 23 Feb 2023 20:07:56 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/dahdi-linux: update URL in Config.in help text Message-ID: <20230223191105.F32D686968@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3ed1e376b5ba51c129ccd09bc56104073525037 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x http://www.asterisk.org/downloads/dahdi no longer works, use the Github page instead. Signed-off-by: Thomas Petazzoni (cherry picked from commit e06975b38047fe1ef47650248f154ecf88fe09b5) Signed-off-by: Peter Korsgaard --- package/dahdi-linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dahdi-linux/Config.in b/package/dahdi-linux/Config.in index 7b6ce79422..b6086fdc6c 100644 --- a/package/dahdi-linux/Config.in +++ b/package/dahdi-linux/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_DAHDI_LINUX DAHDI Linux is the open source device driver framework used to interface Asterisk with telephony hardware. - http://www.asterisk.org/downloads/dahdi + https://github.com/asterisk/dahdi-linux comment "dahdi-linux needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL From arnout at mind.be Thu Feb 23 19:18:32 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 23 Feb 2023 20:18:32 +0100 Subject: [Buildroot] [PATCH] package/rauc-hawkbit-updater: new package In-Reply-To: References: <20230208185516.858096-1-colin.foster@in-advantage.com> Message-ID: On 21/02/2023 22:36, Colin Foster wrote: > On Wed, Feb 08, 2023 at 10:55:16AM -0800, Colin Foster wrote: >> Add useful tool for bridging RAUC with the Hawkbit API. >> >> Signed-off-by: Colin Foster > > I'm just sending this follow up to see if it fell through the cracks. > I can re-send otherwise. No, it's still in patchwork [1] along with 286 other patches, so we'll get around to it at some point. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20230208185516.858096-1-colin.foster at in-advantage.com/ > > I think Eric's email bounced, so hopefully that isn't the issue. > >> --- >> package/Config.in | 1 + >> package/rauc-hawkbit-updater/Config.in | 14 ++++++++++++++ >> .../rauc-hawkbit-updater.hash | 3 +++ >> .../rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 15 +++++++++++++++ >> 4 files changed, 33 insertions(+) >> create mode 100644 package/rauc-hawkbit-updater/Config.in >> create mode 100644 package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash >> create mode 100644 package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk >> >> diff --git a/package/Config.in b/package/Config.in >> index 511e691ed3..84e5efa856 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -2677,6 +2677,7 @@ menu "System tools" >> source "package/quota/Config.in" >> source "package/quotatool/Config.in" >> source "package/rauc/Config.in" >> + source "package/rauc-hawkbit-updater/Config.in" >> source "package/rsyslog/Config.in" >> source "package/runc/Config.in" >> source "package/s390-tools/Config.in" >> diff --git a/package/rauc-hawkbit-updater/Config.in b/package/rauc-hawkbit-updater/Config.in >> new file mode 100644 >> index 0000000000..bd7b8d7cf5 >> --- /dev/null >> +++ b/package/rauc-hawkbit-updater/Config.in >> @@ -0,0 +1,14 @@ >> +config BR2_PACKAGE_RAUC_HAWKBIT_UPDATER >> + bool "rauc-hawkbit-updater" >> + depends on BR2_PACKAGE_RAUC >> + depends on BR2_PACKAGE_JSON_GLIB >> + help >> + rauc-hawkbit-updater is a link between Pengutronix >> + RAUC and the Eclipse Hawkbit API. Hawkbit can >> + communicate to remote update servers, and use the >> + d-bus interface to trigger updates from RAUC. >> + >> + http://rauc.io/ >> + >> +comment "rauc-hawkbit-updater needs rauc and json-glib" >> + depends on !BR2_PACKAGE_RAUC || !BR2_PACKAGE_JSON_GLIB >> diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash >> new file mode 100644 >> index 0000000000..c65ead3784 >> --- /dev/null >> +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash >> @@ -0,0 +1,3 @@ >> +# Locally calculated >> +sha256 42318e96a464e6c716edb45c48bd3ec3b874462973db902fbe099a395e4acb4b rauc-hawkbit-updater-1.3.tar.xz >> +sha256 041234c81fd6fe6c531ea1a886b9e740b9ee06759d1a910a14edbd06f4aa62c7 LICENSE >> diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk >> new file mode 100644 >> index 0000000000..5a74181361 >> --- /dev/null >> +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk >> @@ -0,0 +1,15 @@ >> +############################################################################### >> +# >> +# rauc-hawkbit-updater >> +# >> +############################################################################### >> + >> +RAUC_HAWKBIT_UPDATER_VERSION = 1.3 >> +RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/releases/download/v$(RAUC_HAWKBIT_UPDATER_VERSION) >> +RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz >> +RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 >> +RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE >> +RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix >> +RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib >> + >> +$(eval $(meson-package)) >> -- >> 2.25.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 arnout at mind.be Thu Feb 23 19:24:17 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 23 Feb 2023 20:24:17 +0100 Subject: [Buildroot] [PATCH RFC,1/1] package/gcc: fix GCC_DL_DIR In-Reply-To: <20230222150449.2005824-1-fontaine.fabrice@gmail.com> References: <20230222150449.2005824-1-fontaine.fabrice@gmail.com> Message-ID: <7a565459-473d-a5c4-cf25-13f688e2a295@mind.be> On 22/02/2023 16:04, Fabrice Fontaine wrote: > GCC_DL_DIR is empty as gcc is not a "real" package, as a result, the > following (silent) error is raised when BR2_CCACHE is set: > > /home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/bin/ccache /usr/bin/gcc -O2 -I/home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/include -DBR_CROSS_PATH_SUFFIX='".br_real"' -DBR_CCACHE_HASH=\"` printf '%s\n' --target=aarch64_be-buildroot-linux-gnu --with-sysroot=@HOST_DIR@/aarch64_be-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto --with-gmp=@HOST_DIR@ --with-mpc=@HOST_DIR@ --with-mpfr=@HOST_DIR@ --with-bugurl="http://bugs.buildroot.net/" --without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads --without-isl --without-cloog --with-abi="lp64" --with-cpu=cortex-a53 --enable-languages=c --disable-shared --without-headers --disable-threads --with-newlib --disable-largefile | sha256sum - /gcc-11.3.0.tar.xz package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch package/ > gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch | cut -c -64 | tr -d '\n'`\" -DBR_SYSROOT='"aarch64_be-buildroot-linux-gnu/sysroot"' -DBR_ADDITIONAL_CFLAGS='"-Wl,-z,max-page-size=65536", "-Wl,-z,common-page-size=65536", "-fstack-protector-strong",' -DBR_CCACHE -DBR2_RELRO_PARTIAL -s -Wl,--hash-style=both toolchain/toolchain-wrapper.c -o /home/thomas/autobuild/instance-0/output-1/build/host-gcc-initial-11.3.0/toolchain-wrapper > sha256sum: /gcc-11.3.0.tar.xz: No such file or directory > > This patch replaces GCC_DL_DIR by HOST_GCC_INITIAL_DL_DIR. As, this can > be considered as a "hack", any comment to improve this patch is > appreciated > > Fixes: > - Found when investigating: http://autobuild.buildroot.org/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd > > Signed-off-by: Fabrice Fontaine > --- > package/gcc/gcc.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk > index 6dfd93f2a4..0755b59e96 100644 > --- a/package/gcc/gcc.mk > +++ b/package/gcc/gcc.mk > @@ -284,7 +284,7 @@ HOST_GCC_COMMON_MAKE_OPTS = \ > gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) > > ifeq ($(BR2_CCACHE),y) > -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(GCC_DL_DIR)/$(GCC_SOURCE) > +HOST_GCC_COMMON_CCACHE_HASH_FILES += $(HOST_GCC_INITIAL_DL_DIR)/$(GCC_SOURCE) How about HOST_GCC_COMMON_CCACHE_HASH_FILES += $($(PKG)_DL_DIR)/$(GCC_SOURCE) ? Regards, Arnout > > # Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned > # and unversioned patches unconditionally. Moreover, to facilitate the From AdamG at esdemc.com Thu Feb 23 19:27:03 2023 From: AdamG at esdemc.com (Adam Gausmann) Date: Thu, 23 Feb 2023 13:27:03 -0600 Subject: [Buildroot] [PATCH v2 1/1] add package/python-pyqtchart In-Reply-To: <11b5699c-ebc7-7a6c-e8f8-c3824fe166d3@mind.be> References: <20220518213933.2475-1-adamg@esdemc.com> <11b5699c-ebc7-7a6c-e8f8-c3824fe166d3@mind.be> Message-ID: (Apologies to Arnout; I forgot to click reply-all) Hi Arnout, thanks for the review; On Tue, Feb 7, 2023 at 4:55 AM Arnout Vandecappelle wrote: > > +# > > +################################################################################ > > + > > +PYTHON_PYQTCHART_VERSION = 5.7 > > Why this ancient version released 7 years ago? > > +PYTHON_PYQTCHART_SOURCE = PyQtChart_gpl-$(PYTHON_PYQTCHART_VERSION).tar.gz > > +PYTHON_PYQTCHART_SITE = http://downloads.sourceforge.net/project/pyqt/PyQtChart/PyQtChart-$(PYT HON_PYQTCHART_VERSION) > > As mentioned earlier, better download from pypi Keep in mind, I wrote this almost a year ago! This is the version and site that was used for python-pyqt5 back then. I will certainly update these in the next revision of the patch. > Wouldn't it make more sense to call this python-pyqt5chart, given that there's > python-pyqt5, and that there's PyQt6-Charts? Normally we prefer to use the > upstream name, which is pyqtchart (or PyQt-Charts or PyQtChart, depending on > where you look), but in this case I feel OK calling it python-pyqt5chart. The PyPI packages are "PyQtChart" (The original/legacy name for the Qt5 version) and "PyQt6-Charts"; the download page refers to them as "PyQt-Charts for PyQt5" and "PyQt-Charts for PyQt6". (https://www.riverbankcomputing.com/software/pyqtchart/download) My suggestion is to keep it the same as the official PyPI packages; either keep the legacy name "PyQtChart" (python-pyqtchart) or if you want to include the version number, retroactively use the naming scheme from "PyQt6-Charts" to make "PyQt5-Charts" (python-pyqt5-charts). However, I don't have a strong preference; I'll use whatever name works best for you all. Thanks, Adam From arnout at mind.be Thu Feb 23 19:39:18 2023 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 23 Feb 2023 20:39:18 +0100 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: References: <40f9568e5843d49c2afd808bec856bde@umbiko.net> Message-ID: <03da8459-7360-1391-7e64-86d3fd75f145@mind.be> On 23/02/2023 10:13, Alberto Fahrenkrog wrote: > Hi all, I'm slowly getting ahead with this, and I still have a few more questions... > > I'm trying to get a tar.gz file from a git repo, which needs authentication. The > command that works manually is: > /wget https://outwebsite.com/koala/archive/release1.2.3.tar.gz --header > 'Authorization: token MY_TOKEN'/ > / > / > And the .mk file is configured as: > PYTHON_KOALA_SITE_METHOD?= wget > PYTHON_KOALA_DL_OPTS?= --header 'Authorization: token MY_TOKEN' Since commit 3f2bdd0701de4f2bca7e6d96f96972e7bcabdd93 (by Yann, in Cc), it is necessary to twice-quote the arguments to wget (and wget only). So PYTHON_KOALA_DL_OPTS = --header "'Authorization: token MY_TOKEN'" Yann, I honestly don't understand why this eval is needed, instead of simply passing BR2_HG unquoted... But I didn't look too deeply into it. Regards, Arnout > PYTHON_KOALA_SITE?= https://outwebsite.com/koala/archive/ > > > The .mk file is being read correctly, but I can't figure out how to use DL_OPTS. > The manual says DL_OPTS is a space separated list, but i see wget tries to use > "token" or "MY_TOKEN" as the address. I tried a few different combinations of > inverted commas, but none worked. > > Thanks again, > > Alberto > / > / > / > / > Alberto??Fahrenkrog > > Senior?Embedded?Engineer > > Orica???Perth?Technology?Centre > > p:?+61?(0)?8?6365?4056 > > e: *Alberto.Fahrenkrog at rigtechnologies.com.au* > > > -------------------------------------------------------------------------------- > *From:* Alberto Fahrenkrog > *Sent:* Thursday, February 23, 2023 3:13 PM > *To:* buildroot at buildroot.org > *Subject:* Re: [Buildroot] [Help] Struggling to build external python package on > out of tree build > Ok, I see now that external.mk is explained in chapter 9. I jumped straight to > chapter 18 and missed external.mk completely. And for some reason I never found > external.mk on my google searches. > > Thanks all for your help! > > Cheers, > > Alberto > -------------------------------------------------------------------------------- > *From:* buildroot on behalf of Alberto > Fahrenkrog > *Sent:* Thursday, February 23, 2023 3:09 PM > *To:* buildroot at buildroot.org > *Subject:* Re: [Buildroot] [Help] Struggling to build external python package on > out of tree build > > You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. Learn > why this is important > > > Hi Andreas, > > Thank you so much! That did it! Where in the manual is external.mk explained? I > missed it for sure... > > Cheers, > > Alberto > Alberto??Fahrenkrog > > Senior?Embedded?Engineer > > Orica???Perth?Technology?Centre > > p:?+61?(0)?8?6365?4056 > > e: *Alberto.Fahrenkrog at rigtechnologies.com.au* > > > -------------------------------------------------------------------------------- > *From:* buildroot on behalf of Andreas Ziegler > > *Sent:* Thursday, February 23, 2023 2:49 PM > *To:* Alberto Fahrenkrog > *Cc:* buildroot at buildroot.org > *Subject:* Re: [Buildroot] [Help] Struggling to build external python package on > out of tree build > [You don't often get email from br015 at umbiko.net. Learn why this is important at > https://aka.ms/LearnAboutSenderIdentification > ] > > Hi Alberto, > > On 2023-02-23 04:47, Alberto Fahrenkrog wrote: >> Update, >> >> if I change? $(eval $(python-koala)) to $(eval $(python-package)) I >> still get the same error. I assume that might have been one mistake. >> >> Cheers, >> >> Alberto >> >> Alberto Fahrenkrog Senior Embedded Engineer >> Orica - Perth Technology Centre >> p: +61 (0) 8 6365 4056 >> e: Alberto.Fahrenkrog at rigtechnologies.com.au >> ________________________________ >> From: buildroot on behalf of Alberto >> Fahrenkrog >> Sent: Thursday, February 23, 2023 12:42 PM >> To: buildroot at buildroot.org >> Subject: [Buildroot] [Help] Struggling to build external python package >> on out of tree build >> >> You don't often get email from >> alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is >> important > >> Hello all, >> >> I'm trying to build a very simple custom python package following the >> instructions on the manual, yet I must be doing something very wrong as >> I get this result: >> >> $ make python-koala >> make[1]: *** No rule to make target 'python-koala'.? Stop. >> make: *** [Makefile:23: _all] Error 2 >> >> I create my out of tree build with: >> make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build >> O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads >> br_build_defconfig >> >> On my "br_build" folder I have a Config.in file: >> menu "Python-Libs" >>???? source "~/Projects/br_build/package/python-koala/Config.in" >> endmenu > > Similar to the include file for configs, you also need an external.mk > file for the project make files, with this content: > > ?? include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) > > Otherwise your .mk files will not be picked up. > >> In "br_build/packages/python-koala/Config.in" > > The package directory is usually named 'package', not sure if this is > relevant (but Config.in /external.mk have to match it). > >> config BR2_PACKAGE_PYTHON_KOALA >> ??????bool "python-koala" >>?? depends on BR2_PACKAGE_PYTHON3 >> ??????help >> ??????? Python implementation of Koala Library >> >> In "br_build/packages/python-koala/python-koala.mk" >> ################################################################################ >> # >> # python-koala >> # >> ################################################################################ >> >> PYTHON_KOALA_VERSION = 1.3.3 >> PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz >> PYTHON_KOALA_SITE = >> https://mywebsite.com.au/ExternalCode/koala/archive/ > >> PYTHON_KOALA_SETUP_TYPE = setuptools >> >> $(eval $(python-koala)) >> >> If I run "make menuconfig" I can select or deselect the package, and >> it's selected per default on the br_build_defconfig (and in .config): >> BR2_PACKAGE_PYTHON_KOALA=y >> >> But if I try to run "make python-koala" I get the "no target" error. >> I'll still have a read and see what I might be doing wrong, but I'm >> very confused. Any ideas are very welcome. >> >> Cheers, >> >> Alberto > > > > Kind regards, > Andreas > _______________________________________________ > 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 yann.morin.1998 at free.fr Thu Feb 23 19:54:09 2023 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 23 Feb 2023 20:54:09 +0100 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: <03da8459-7360-1391-7e64-86d3fd75f145@mind.be> References: <40f9568e5843d49c2afd808bec856bde@umbiko.net> <03da8459-7360-1391-7e64-86d3fd75f145@mind.be> Message-ID: <20230223195409.GM2718518@scaer> Arnout, All, On 2023-02-23 20:39 +0100, Arnout Vandecappelle spake thusly: > On 23/02/2023 10:13, Alberto Fahrenkrog wrote: > >Hi all, I'm slowly getting ahead with this, and I still have a few more questions... > > > >I'm trying to get a tar.gz file from a git repo, which needs > >authentication. The command that works manually is: > >/wget https://outwebsite.com/koala/archive/release1.2.3.tar.gz --header > >'Authorization: token MY_TOKEN'/ > >/ > >/ > >And the .mk file is configured as: > >PYTHON_KOALA_SITE_METHOD?= wget > >PYTHON_KOALA_DL_OPTS?= --header 'Authorization: token MY_TOKEN' > > Since commit 3f2bdd0701de4f2bca7e6d96f96972e7bcabdd93 (by Yann, in Cc), it > is necessary to twice-quote the arguments to wget (and wget only). So Oh dang, a commit from 7 years ago... ;-) > PYTHON_KOALA_DL_OPTS = --header "'Authorization: token MY_TOKEN'" > > Yann, I honestly don't understand why this eval is needed, instead of > simply passing BR2_HG unquoted... But I didn't look too deeply into it. That's because that does not work? $ cat ess #!/usr/bin/env bash bar() { for i in "${@}"; do printf '__%s__\n' "${i}" done } MY_CMD="bar '1 2 3' a b 'C D'" ${MY_CMD} START "${@}" END echo MY_CMD="./foo '1 2 3' a b 'C D'" ${MY_CMD} START "${@}" END $ cat foo #!/usr/bin/env bash for i in "${@}"; do printf '>>%s<<\n' "${i}" done $ ./ess wee woo "woot woot" __'1__ __2__ __3'__ __a__ __b__ __'C__ __D'__ __START__ __wee__ __woo__ __woot woot__ __END__ >>'1<< >>2<< >>3'<< >>a<< >>b<< >>'C<< >>D'<< >>START<< >>wee<< >>woo<< >>woot woot<< >>END<< So, if the command for a downloader, as provided in the .config, contains quoted material, the quotes would be part of the word. Regards, Yann E. MORIN. > Regards, > Arnout > > > >PYTHON_KOALA_SITE?= https://outwebsite.com/koala/archive/ > > > > > >The .mk file is being read correctly, but I can't figure out how to use > >DL_OPTS. The manual says DL_OPTS is a space separated list, but i see wget > >tries to use "token" or "MY_TOKEN" as the address. I tried a few different > >combinations of inverted commas, but none worked. > > > >Thanks again, > > > >Alberto > >/ > >/ > >/ > >/ > >Alberto??Fahrenkrog > > > > Senior?Embedded?Engineer > > > >Orica???Perth?Technology?Centre > > > >p:?+61?(0)?8?6365?4056 > > > >e: *Alberto.Fahrenkrog at rigtechnologies.com.au* > > > > > >-------------------------------------------------------------------------------- > >*From:* Alberto Fahrenkrog > >*Sent:* Thursday, February 23, 2023 3:13 PM > >*To:* buildroot at buildroot.org > >*Subject:* Re: [Buildroot] [Help] Struggling to build external python > >package on out of tree build > >Ok, I see now that external.mk is explained in chapter 9. I jumped > >straight to chapter 18 and missed external.mk completely. And for some > >reason I never found external.mk on my google searches. > > > >Thanks all for your help! > > > >Cheers, > > > >Alberto > >-------------------------------------------------------------------------------- > >*From:* buildroot on behalf of Alberto > >Fahrenkrog > >*Sent:* Thursday, February 23, 2023 3:09 PM > >*To:* buildroot at buildroot.org > >*Subject:* Re: [Buildroot] [Help] Struggling to build external python > >package on out of tree build > > > >You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. > >Learn why this is important > > > > > > > >Hi Andreas, > > > >Thank you so much! That did it! Where in the manual is external.mk > >explained? I missed it for sure... > > > >Cheers, > > > >Alberto > >Alberto??Fahrenkrog > > > > Senior?Embedded?Engineer > > > >Orica???Perth?Technology?Centre > > > >p:?+61?(0)?8?6365?4056 > > > >e: *Alberto.Fahrenkrog at rigtechnologies.com.au* > > > > > >-------------------------------------------------------------------------------- > >*From:* buildroot on behalf of Andreas > >Ziegler > >*Sent:* Thursday, February 23, 2023 2:49 PM > >*To:* Alberto Fahrenkrog > >*Cc:* buildroot at buildroot.org > >*Subject:* Re: [Buildroot] [Help] Struggling to build external python > >package on out of tree build > >[You don't often get email from br015 at umbiko.net. Learn why this is > >important at https://aka.ms/LearnAboutSenderIdentification > > ] > > > >Hi Alberto, > > > >On 2023-02-23 04:47, Alberto Fahrenkrog wrote: > >>Update, > >> > >>if I change? $(eval $(python-koala)) to $(eval $(python-package)) I > >>still get the same error. I assume that might have been one mistake. > >> > >>Cheers, > >> > >>Alberto > >> > >>Alberto Fahrenkrog Senior Embedded Engineer > >>Orica - Perth Technology Centre > >>p: +61 (0) 8 6365 4056 > >>e: Alberto.Fahrenkrog at rigtechnologies.com.au > >>________________________________ > >>From: buildroot on behalf of Alberto > >>Fahrenkrog > >>Sent: Thursday, February 23, 2023 12:42 PM > >>To: buildroot at buildroot.org > >>Subject: [Buildroot] [Help] Struggling to build external python package > >>on out of tree build > >> > >>You don't often get email from > >>alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is > >>important >> > >>Hello all, > >> > >>I'm trying to build a very simple custom python package following the > >>instructions on the manual, yet I must be doing something very wrong as > >>I get this result: > >> > >>$ make python-koala > >>make[1]: *** No rule to make target 'python-koala'.? Stop. > >>make: *** [Makefile:23: _all] Error 2 > >> > >>I create my out of tree build with: > >>make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build > >>O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads > >>br_build_defconfig > >> > >>On my "br_build" folder I have a Config.in file: > >>menu "Python-Libs" > >>???? source "~/Projects/br_build/package/python-koala/Config.in" > >>endmenu > > > >Similar to the include file for configs, you also need an external.mk > >file for the project make files, with this content: > > > > ?? include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) > > > >Otherwise your .mk files will not be picked up. > > > >>In "br_build/packages/python-koala/Config.in" > > > >The package directory is usually named 'package', not sure if this is > >relevant (but Config.in /external.mk have to match it). > > > >>config BR2_PACKAGE_PYTHON_KOALA > >>??????bool "python-koala" > >>?? depends on BR2_PACKAGE_PYTHON3 > >>??????help > >>??????? Python implementation of Koala Library > >> > >>In "br_build/packages/python-koala/python-koala.mk" > >>################################################################################ > >># > >># python-koala > >># > >>################################################################################ > >> > >>PYTHON_KOALA_VERSION = 1.3.3 > >>PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz > >>PYTHON_KOALA_SITE = > >>https://mywebsite.com.au/ExternalCode/koala/archive/ > > > >>PYTHON_KOALA_SETUP_TYPE = setuptools > >> > >>$(eval $(python-koala)) > >> > >>If I run "make menuconfig" I can select or deselect the package, and > >>it's selected per default on the br_build_defconfig (and in .config): > >>BR2_PACKAGE_PYTHON_KOALA=y > >> > >>But if I try to run "make python-koala" I get the "no target" error. > >>I'll still have a read and see what I might be doing wrong, but I'm > >>very confused. Any ideas are very welcome. > >> > >>Cheers, > >> > >>Alberto > > > > > > > >Kind regards, > >Andreas > >_______________________________________________ > >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 -- .-----------------.--------------------.------------------.--------------------. | 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 contact at martb.dev Thu Feb 23 20:15:10 2023 From: contact at martb.dev (=?UTF-8?q?Martin=20B=C3=B6h?=) Date: Thu, 23 Feb 2023 21:15:10 +0100 Subject: [Buildroot] [PATCH 1/2] package/gnuradio: bump to 3.10.5.1 Message-ID: <20230223201511.217372-1-contact@martb.dev> Signed-off-by: Martin B?h --- ...g-missing-vector-in-blockinterleaver.patch | 42 ------------------- ...rleaving.h-add-missing-cstddef-heade.patch | 33 --------------- package/gnuradio/gnuradio.hash | 2 +- package/gnuradio/gnuradio.mk | 2 +- 4 files changed, 2 insertions(+), 77 deletions(-) delete mode 100644 package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch delete mode 100644 package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch diff --git a/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch b/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch deleted file mode 100644 index 39b8c0b51e..0000000000 --- a/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 45fe4ac55ad88b6793d225e676205c30388ec138 Mon Sep 17 00:00:00 2001 -From: Ryan Volz -Date: Fri, 16 Sep 2022 21:05:51 -0400 -Subject: [PATCH] blocks: Including missing in blockinterleaver. - -Signed-off-by: Ryan Volz -[Retrieved (and backported) from: -https://github.com/gnuradio/gnuradio/commit/463c3477549b26b32d9b73eef30044e97c4eee64] -Signed-off-by: Gwenhael Goavec-Merou ---- - gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 2 +- - gr-blocks/lib/blockinterleaving.cc | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -index 9d4e0f249..df831fe5a 100644 ---- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -+++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -@@ -12,7 +12,7 @@ - #define INCLUDED_GR_BLOCKS_BLOCKINTERLEAVING_H - - #include -- -+#include - - namespace gr { - namespace blocks { -diff --git a/gr-blocks/lib/blockinterleaving.cc b/gr-blocks/lib/blockinterleaving.cc -index fc5873e11..768ad9ea7 100644 ---- a/gr-blocks/lib/blockinterleaving.cc -+++ b/gr-blocks/lib/blockinterleaving.cc -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - - namespace gr { - namespace blocks { --- -2.35.1 - diff --git a/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch b/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch deleted file mode 100644 index f1ad77580f..0000000000 --- a/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 901c2ad1ac88908a2e6db5615d5af39a218d826d Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Fri, 23 Sep 2022 08:41:26 +0200 -Subject: [PATCH] blocks/blockinterleaving.h: add missing cstddef header - (required for size_t) - -Fix build failure like: - -gnuradio/gr-blocks/lib/../include/gnuradio/blocks/blockinterleaving.h:25:36: error: ?size_t? was not declared in this scope - -This failure is due to the miss of cstddef include - -Signed-off-by: Gwenhael Goavec-Merou -[Upstream status: https://github.com/gnuradio/gnuradio/pull/6188] ---- - gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -index df831fe5a..33c59e35b 100644 ---- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -+++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -@@ -13,6 +13,7 @@ - - #include - #include -+#include - - namespace gr { - namespace blocks { --- -2.35.1 - diff --git a/package/gnuradio/gnuradio.hash b/package/gnuradio/gnuradio.hash index efa0bb462b..44bb6562df 100644 --- a/package/gnuradio/gnuradio.hash +++ b/package/gnuradio/gnuradio.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c6b9f59447a842559b00b3a67b4ca1186e9adb8db742b25400507fedc747f2bd gnuradio-3.10.4.0.tar.gz +sha256 85d90147f7f28450bff75eeefd2b44adc88b231d29fe8e86cc3a65437dba6d9f gnuradio-3.10.5.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index cc41f1e12b..8004ef0554 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNURADIO_VERSION = 3.10.4.0 +GNURADIO_VERSION = 3.10.5.1 GNURADIO_SITE = $(call github,gnuradio,gnuradio,v$(GNURADIO_VERSION)) GNURADIO_LICENSE = GPL-3.0+ GNURADIO_LICENSE_FILES = COPYING -- 2.39.2 From contact at martb.dev Thu Feb 23 20:15:11 2023 From: contact at martb.dev (=?UTF-8?q?Martin=20B=C3=B6h?=) Date: Thu, 23 Feb 2023 21:15:11 +0100 Subject: [Buildroot] [PATCH 2/2] package/gnuradio: remove pybind target suffix when crosscompiling In-Reply-To: <20230223201511.217372-1-contact@martb.dev> References: <20230223201511.217372-1-contact@martb.dev> Message-ID: <20230223201511.217372-2-contact@martb.dev> This is required as pybind11 uses host python3 and therefore the host platform suffixes. Without this change gnuradio and all plugins relying on its GrPybind macros, use the wrong suffixes. This leads to module load failures when crosscompiling. See: - https://github.com/gnuradio/gnuradio/issues/5455 - https://github.com/pybind/pybind11/issues/3640 Signed-off-by: Martin B?h --- ...nd-remove-suffix-when-crosscompiling.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch diff --git a/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch b/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch new file mode 100644 index 0000000000..0ac4395e58 --- /dev/null +++ b/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch @@ -0,0 +1,56 @@ +From c58760b002c1a954a9ab628352900fcd8e6e199c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20B=C3=B6h?= +Date: Wed, 22 Feb 2023 03:05:08 +0100 +Subject: [PATCH] grPyBind: fix invalid suffix + +This is required as pybind11 uses host python3 and therefore the host platform suffixes. +--- + cmake/Modules/GrPybind.cmake | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/cmake/Modules/GrPybind.cmake b/cmake/Modules/GrPybind.cmake +index 5a6fb7633..c2df17c2d 100644 +--- a/cmake/Modules/GrPybind.cmake ++++ b/cmake/Modules/GrPybind.cmake +@@ -8,6 +8,12 @@ macro(GR_PYBIND_MAKE name updir filter files) + ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) + + pybind11_add_module(${name}_python ${files}) ++ ++ # Use normal .so suffix when crosscompiling ++ # See https://github.com/gnuradio/gnuradio/issues/5455 ++ if (CMAKE_CROSSCOMPILING) ++ set_target_properties(${name}_python PROPERTIES SUFFIX ".so") ++ endif() + + set(MODULE_NAME ${name}) + if(${name} STREQUAL gr) +@@ -135,6 +141,12 @@ macro(GR_PYBIND_MAKE_CHECK_HASH name updir filter files) + + pybind11_add_module(${name}_python ${files}) + ++ # Use normal .so suffix when crosscompiling ++ # See https://github.com/gnuradio/gnuradio/issues/5455 ++ if (CMAKE_CROSSCOMPILING) ++ set_target_properties(${name}_python PROPERTIES SUFFIX ".so") ++ endif() ++ + set(MODULE_NAME ${name}) + if(${name} STREQUAL gr) + set(MODULE_NAME "runtime") +@@ -286,6 +298,12 @@ macro(GR_PYBIND_MAKE_OOT name updir filter files) + + pybind11_add_module(${name}_python ${files}) + ++ # Use normal .so suffix when crosscompiling ++ # See https://github.com/gnuradio/gnuradio/issues/5455 ++ if (CMAKE_CROSSCOMPILING) ++ set_target_properties(${name}_python PROPERTIES SUFFIX ".so") ++ endif() ++ + set(MODULE_NAME ${name}) + if(${name} STREQUAL gr) + set(MODULE_NAME "runtime") +-- +2.39.1 + -- 2.39.2 From contact at martb.dev Thu Feb 23 20:17:33 2023 From: contact at martb.dev (=?UTF-8?q?Martin=20B=C3=B6h?=) Date: Thu, 23 Feb 2023 21:17:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/gr-osmosdr: add missing host-python-six dependency to python support Message-ID: <20230223201733.222573-1-contact@martb.dev> Osmosdr failed to build docs when python support is enabled. [ 41%] Copying osmosdr docstring templates as pybind headers ... Traceback (most recent call last): File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/update_pydoc.py", line 22, in from doxyxml import DoxyIndex, DoxyClass, DoxyFriend, DoxyFunction, DoxyFile File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/__init__.py", line 69, in from .doxyindex import DoxyIndex, DoxyFunction, DoxyParam, DoxyClass, DoxyFile, DoxyNamespace, DoxyGroup, DoxyFriend, DoxyOther File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/doxyindex.py", line 31, in from .generated import index File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/index.py", line 13, in from . import compound File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compound.py", line 15, in from . import compoundsuper as supermod File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compoundsuper.py", line 15, in import six ModuleNotFoundError: No module named 'six' make[2]: *** [python/bindings/CMakeFiles/osmosdr_docstrings.dir/build.make:73: python/bindings/docstring_status] Fehler 1 make[1]: *** [CMakeFiles/Makefile2:332: python/bindings/CMakeFiles/osmosdr_docstrings.dir/all] Fehler 2 Signed-off-by: Martin B?h --- package/gr-osmosdr/gr-osmosdr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index 89907c1baa..b96a32a221 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -24,7 +24,7 @@ GR_OSMOSDR_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_GR_OSMOSDR_PYTHON),y) GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=ON -GR_OSMOSDR_DEPENDENCIES += python3 +GR_OSMOSDR_DEPENDENCIES += python3 host-python-six else GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=OFF endif -- 2.39.2 From contact at martb.dev Thu Feb 23 20:18:17 2023 From: contact at martb.dev (=?UTF-8?q?Martin=20B=C3=B6h?=) Date: Thu, 23 Feb 2023 21:18:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/gr-osmosdr: add support for HACKRF receivers Message-ID: <20230223201817.224238-1-contact@martb.dev> Signed-off-by: Martin B?h --- package/gr-osmosdr/Config.in | 6 ++++++ package/gr-osmosdr/gr-osmosdr.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/gr-osmosdr/Config.in b/package/gr-osmosdr/Config.in index 04fa10be80..05b5c46a63 100644 --- a/package/gr-osmosdr/Config.in +++ b/package/gr-osmosdr/Config.in @@ -43,4 +43,10 @@ config BR2_PACKAGE_GR_OSMOSDR_RFSPACE help Enable RFSPACE Receivers support +config BR2_PACKAGE_GR_OSMOSDR_HACKRF + bool "Osmocom HACKRF support" + depends on BR2_PACKAGE_HACKRF + help + Enable Osmocom HACKRF support + endif diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index b96a32a221..78c7fa30da 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -54,4 +54,11 @@ else GR_OSMOSDR_CONF_OPTS += -DENABLE_RFSPACE=OFF endif +ifeq ($(BR2_PACKAGE_GR_OSMOSDR_HACKRF),y) +GR_OSMOSDR_CONF_OPTS += -DENABLE_HACKRF=ON +GR_OSMOSDR_DEPENDENCIES += hackrf +else +GR_OSMOSDR_CONF_OPTS += -DENABLE_HACKRF=OFF +endif + $(eval $(cmake-package)) -- 2.39.2 From thomas.petazzoni at bootlin.com Thu Feb 23 21:42:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 22:42:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/audit: force arm mode instead of Thumb mode In-Reply-To: <20230223062259.GJ2718518@scaer> References: <20230222143512.1555539-1-fontaine.fabrice@gmail.com> <20230223062259.GJ2718518@scaer> Message-ID: <20230223224201.0e351b16@windsurf> Hello Yann, On Thu, 23 Feb 2023 07:22:59 +0100 "Yann E. MORIN" wrote: > > +# src/libev has some assembly function that is not present in Thumb mode: > > +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode > > +# so, we desactivate Thumb mode > > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > > +AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" > > +endif > > But then it would not work on systems that have a armv7m: BR2_cortex_m3, > BR2_cortex_m4, or BR2_cortex_m7. BR2_ARM_INSTRUCTIONS_THUMB is for "classic" Thumb, not Thumb2. BR2_ARM_INSTRUCTIONS_THUMB2 is used for Thumb2 platforms, such as ARMv7-M. So the above condition will only trigger for ARMv4/ARMv5/ARMv6 cores, and they all support both classic Thumb and regular ARM instruction set. So to me, the above proposal from Fabrice works fine. > I looked at the code, and it's going to be very complex to patch it to > support armv7m, i.e. thumb-only. Thumb2-only, which is totally different. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Thu Feb 23 22:09:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 23:09:47 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/gcc: fix GCC_DL_DIR Message-ID: <20230223220947.8226-1-fontaine.fabrice@gmail.com> GCC_DL_DIR is empty as gcc is not a "real" package, as a result, the following (silent) error is raised when BR2_CCACHE is set: /home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/bin/ccache /usr/bin/gcc -O2 -I/home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/include -DBR_CROSS_PATH_SUFFIX='".br_real"' -DBR_CCACHE_HASH=\"` printf '%s\n' --target=aarch64_be-buildroot-linux-gnu --with-sysroot=@HOST_DIR@/aarch64_be-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto --with-gmp=@HOST_DIR@ --with-mpc=@HOST_DIR@ --with-mpfr=@HOST_DIR@ --with-bugurl="http://bugs.buildroot.net/" --without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads --without-isl --without-cloog --with-abi="lp64" --with-cpu=cortex-a53 --enable-languages=c --disable-shared --without-headers --disable-threads --with-newlib --disable-largefile | sha256sum - /gcc-11.3.0.tar.xz package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch | cut -c -64 | tr -d '\n'`\" -DBR_SYSROOT='"aarch64_be-buildroot-linux-gnu/sysroot"' -DBR_ADDITIONAL_CFLAGS='"-Wl,-z,max-page-size=65536", "-Wl,-z,common-page-size=65536", "-fstack-protector-strong",' -DBR_CCACHE -DBR2_RELRO_PARTIAL -s -Wl,--hash-style=both toolchain/toolchain-wrapper.c -o /home/thomas/autobuild/instance-0/output-1/build/host-gcc-initial-11.3.0/toolchain-wrapper sha256sum: /gcc-11.3.0.tar.xz: No such file or directory This patch replaces GCC_DL_DIR by $($(PKG)_DL_DIR) as suggested by Arnout Vandecappelle. Fixes: - Found when investigating: http://autobuild.buildroot.org/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Arnout Vandecappelle): - Use $($(PKG)_DL_DIR) package/gcc/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 6dfd93f2a4..25cb4ce8e2 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -284,7 +284,7 @@ HOST_GCC_COMMON_MAKE_OPTS = \ gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) ifeq ($(BR2_CCACHE),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(GCC_DL_DIR)/$(GCC_SOURCE) +HOST_GCC_COMMON_CCACHE_HASH_FILES += $($(PKG)_DL_DIR)/$(GCC_SOURCE) # Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned # and unversioned patches unconditionally. Moreover, to facilitate the -- 2.39.1 From thomas.petazzoni at bootlin.com Thu Feb 23 22:12:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:12:58 +0100 Subject: [Buildroot] [PATCH 2/2] package/gnuradio: remove pybind target suffix when crosscompiling In-Reply-To: <20230223201511.217372-2-contact@martb.dev> References: <20230223201511.217372-1-contact@martb.dev> <20230223201511.217372-2-contact@martb.dev> Message-ID: <20230223231258.0e07045c@windsurf> Hello Martin, Thanks for your patch. Some comment/question below. On Thu, 23 Feb 2023 21:15:11 +0100 Martin B?h via buildroot wrote: > This is required as pybind11 uses host python3 and therefore the host platform suffixes. > Without this change gnuradio and all plugins relying on its GrPybind macros, use the wrong suffixes. > This leads to module load failures when crosscompiling. > > See: > - https://github.com/gnuradio/gnuradio/issues/5455 > - https://github.com/pybind/pybind11/issues/3640 > > Signed-off-by: Martin B?h > --- > ...nd-remove-suffix-when-crosscompiling.patch | 56 +++++++++++++++++++ > 1 file changed, 56 insertions(+) > create mode 100644 package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch > > diff --git a/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch b/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch > new file mode 100644 > index 0000000000..0ac4395e58 > --- /dev/null > +++ b/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch > @@ -0,0 +1,56 @@ > +From c58760b002c1a954a9ab628352900fcd8e6e199c Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Martin=20B=C3=B6h?= > +Date: Wed, 22 Feb 2023 03:05:08 +0100 > +Subject: [PATCH] grPyBind: fix invalid suffix > + > +This is required as pybind11 uses host python3 and therefore the host platform suffixes. We need your Signed-off-by here, and also the upstream status of this patch. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:13:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:13:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/gr-osmosdr: add missing host-python-six dependency to python support In-Reply-To: <20230223201733.222573-1-contact@martb.dev> References: <20230223201733.222573-1-contact@martb.dev> Message-ID: <20230223231341.4dcc6d21@windsurf> Hello Martin, On Thu, 23 Feb 2023 21:17:33 +0100 Martin B?h via buildroot wrote: > Osmosdr failed to build docs when python support is enabled. > [ 41%] Copying osmosdr docstring templates as pybind headers ... > Traceback (most recent call last): > File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/update_pydoc.py", line 22, in > from doxyxml import DoxyIndex, DoxyClass, DoxyFriend, DoxyFunction, DoxyFile > File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/__init__.py", line 69, in > from .doxyindex import DoxyIndex, DoxyFunction, DoxyParam, DoxyClass, DoxyFile, DoxyNamespace, DoxyGroup, DoxyFriend, DoxyOther > File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/doxyindex.py", line 31, in > from .generated import index > File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/index.py", line 13, in > from . import compound > File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compound.py", line 15, in > from . import compoundsuper as supermod > File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compoundsuper.py", line 15, in > import six > ModuleNotFoundError: No module named 'six' > make[2]: *** [python/bindings/CMakeFiles/osmosdr_docstrings.dir/build.make:73: python/bindings/docstring_status] Fehler 1 > make[1]: *** [CMakeFiles/Makefile2:332: python/bindings/CMakeFiles/osmosdr_docstrings.dir/all] Fehler 2 > > Signed-off-by: Martin B?h Is there potentially a way to disable building documentation instead? Of course, adding host-python-six in the dependencies is not a huge deal, but we really don't care about building documentation in the context of Buildroot. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Thu Feb 23 22:25:39 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 23:25:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmad: force arm mode instead of Thumb mode Message-ID: <20230223222539.294264-1-fontaine.fabrice@gmail.com> Fix the following build failure: /tmp/ccv8mDeW.s:93: Error: selected processor does not support `smull r6,r7,r3,r1' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/92a3f19b4fa12a7724f9e3d99284da4ad2beecb2 Signed-off-by: Fabrice Fontaine --- package/libmad/libmad.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 684b8a2261..5555bf5a36 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -32,6 +32,13 @@ LIBMAD_IGNORE_CVES += CVE-2017-8374 # is able to properly behave in the face of a missing C++ compiler. LIBMAD_AUTORECONF = YES +# libmad has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `smull r6,r7,r3,r1' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBMAD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + define LIBMAD_INSTALL_STAGING_PC $(INSTALL) -D package/libmad/mad.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/mad.pc -- 2.39.1 From thomas.petazzoni at bootlin.com Thu Feb 23 22:33:31 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:33:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/gr-osmosdr: add support for HACKRF receivers In-Reply-To: <20230223201817.224238-1-contact@martb.dev> References: <20230223201817.224238-1-contact@martb.dev> Message-ID: <20230223233331.75b619b1@windsurf> Hello Martin, On Thu, 23 Feb 2023 21:18:17 +0100 Martin B?h via buildroot wrote: > +config BR2_PACKAGE_GR_OSMOSDR_HACKRF > + bool "Osmocom HACKRF support" > + depends on BR2_PACKAGE_HACKRF We would normally use a select BR2_PACKAGE_HACKRF here, which means you have to replicate the depends on from hackrf: depends on !BR2_STATIC_LIBS # hackrf depends on BR2_TOOLCHAIN_HAS_THREADS # hackrf depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # hackrf and the corresponding Config.in comment: comment "hackrf support needs a toolchain w/ threads, dynamic library, gcc >= 4.9" depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:34:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:34:20 +0100 Subject: [Buildroot] [git commit] package/efivar: needs threads Message-ID: <20230223223441.F029E8698D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c29f6d63e0adebc8502dd707d3e4050af254d342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a thread dependency as Upstream quickly closed https://github.com/rhboot/efivar/pull/238 to fix the following build failure without threads raised since bump to version 38 in commit f24029b561fbda0953c7dbd93d2485b03873996d and https://github.com/rhboot/efivar/commit/cff88dd96b9d43e2c5875a24ba6180b196890ded: thread-test.c:14:10: fatal error: pthread.h: No such file or directory 14 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/f2da14f91dc602a32dd5b2b7bdf3d3aa43afa7f4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/efibootmgr/Config.in | 5 +++-- package/efivar/Config.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index 98ff71c996..5800e6c143 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_EFIBOOTMGR bool "efibootmgr" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS # efivar depends on !BR2_STATIC_LIBS # efivar + depends on BR2_TOOLCHAIN_HAS_THREADS # efivar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS @@ -15,9 +16,9 @@ config BR2_PACKAGE_EFIBOOTMGR https://github.com/rhboot/efibootmgr -comment "efibootmgr needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efibootmgr needs a toolchain w/ dynamic library, threads, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/package/efivar/Config.in b/package/efivar/Config.in index 74f2bb5abb..d4402dbcf7 100644 --- a/package/efivar/Config.in +++ b/package/efivar/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_EFIVAR depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # linux/nvme.h + depends on BR2_TOOLCHAIN_HAS_THREADS # linux/nvme.h has been renamed to linux/nvme_ioctl.h since 4.4, # and the efivar source handles that situation. However, some # Sourcery CodeBench toolchains use 4.4 kernel headers but they @@ -22,9 +23,9 @@ config BR2_PACKAGE_EFIVAR https://github.com/rhboot/efivar -comment "efivar needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efivar needs a toolchain w/ dynamic library, threads, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS From thomas.petazzoni at bootlin.com Thu Feb 23 22:34:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:34:45 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/efivar: needs threads In-Reply-To: <20230223162847.9247-1-fontaine.fabrice@gmail.com> References: <20230223162847.9247-1-fontaine.fabrice@gmail.com> Message-ID: <20230223233445.47f2a4af@windsurf> On Thu, 23 Feb 2023 17:28:47 +0100 Fabrice Fontaine wrote: > Add a thread dependency as Upstream quickly closed > https://github.com/rhboot/efivar/pull/238 to fix the following build > failure without threads raised since bump to version 38 in commit > f24029b561fbda0953c7dbd93d2485b03873996d and > https://github.com/rhboot/efivar/commit/cff88dd96b9d43e2c5875a24ba6180b196890ded: > > thread-test.c:14:10: fatal error: pthread.h: No such file or directory > 14 | #include > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/f2da14f91dc602a32dd5b2b7bdf3d3aa43afa7f4 > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Add a thread dependency Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:35:45 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:35:45 +0100 Subject: [Buildroot] [git commit] package/wpa_supplicant: fix builds with missing sha384 hash functions Message-ID: <20230223224320.0D7CB8699F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93b461bb5e34ec25c9aac3024b41d132736c5dd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master SAE, unlike OWE or DPP, does not explicitly enable support for sha384 hash functions. Possible WPA3 build issue is masked, since all three SAE/OWE/DPP are included. However, there exist other configurations that enable only SAE. For instance, one such build configuration is wpa_supplicant AP mode with mesh support. This change adds upstream patch that includes sha384 and sha256 hash functions to builds with SAE support. Fixes: http://autobuild.buildroot.net/results/f349130985870f4a781cca56c3f551108f81aa3e/ Signed-off-by: Sergey Matyukevich Signed-off-by: Thomas Petazzoni --- ...C-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch b/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch new file mode 100644 index 0000000000..98df56e540 --- /dev/null +++ b/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch @@ -0,0 +1,64 @@ +From c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sun, 17 Apr 2022 12:28:41 +0300 +Subject: [PATCH] Include HMAC-SHA384/512 KDF for SAE if SHA384/512 is included + +It was possible to miss the HMAC functions if some other build +configuration parameters ended up setting NEED_SHA384/512=y. + +Upstream: https://w1.fi/cgit/hostap/commit/?id=c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 + +Signed-off-by: Jouni Malinen +Signed-off-by: Sergey Matyukevich +--- + wpa_supplicant/Android.mk | 11 +++++++++++ + wpa_supplicant/Makefile | 11 +++++++++++ + 2 files changed, 22 insertions(+) + +diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk +index 0e0ce467c..bcdbd6c90 100644 +--- a/wpa_supplicant/Android.mk ++++ b/wpa_supplicant/Android.mk +@@ -1361,6 +1361,17 @@ endif + endif + endif + ++ifdef CONFIG_SAE ++ifdef NEED_SHA384 ++# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. ++NEED_HMAC_SHA384_KDF=y ++endif ++ifdef NEED_SHA512 ++# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. ++NEED_HMAC_SHA512_KDF=y ++endif ++endif ++ + SHA256OBJS = # none by default + L_CFLAGS += -DCONFIG_SHA256 + ifneq ($(CONFIG_TLS), openssl) +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index ed49aa972..69c80121c 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -1475,6 +1475,17 @@ endif + endif + endif + ++ifdef CONFIG_SAE ++ifdef NEED_SHA384 ++# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. ++NEED_HMAC_SHA384_KDF=y ++endif ++ifdef NEED_SHA512 ++# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. ++NEED_HMAC_SHA512_KDF=y ++endif ++endif ++ + SHA256OBJS = # none by default + CFLAGS += -DCONFIG_SHA256 + ifneq ($(CONFIG_TLS), openssl) +-- +2.39.2 + From thomas.petazzoni at bootlin.com Thu Feb 23 22:43:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:43:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpa_supplicant: fix builds with missing sha384 hash functions In-Reply-To: <20230223164747.1653580-1-geomatsi@gmail.com> References: <20230223164747.1653580-1-geomatsi@gmail.com> Message-ID: <20230223234321.427b3772@windsurf> On Thu, 23 Feb 2023 19:47:47 +0300 Sergey Matyukevich wrote: > SAE, unlike OWE or DPP, does not explicitly enable support for sha384 > hash functions. Possible WPA3 build issue is masked, since all three > SAE/OWE/DPP are included. However, there exist other configurations > that enable only SAE. For instance, one such build configuration is > wpa_supplicant AP mode with mesh support. > > This change adds upstream patch that includes sha384 and sha256 hash > functions to builds with SAE support. > > Fixes: http://autobuild.buildroot.net/results/f349130985870f4a781cca56c3f551108f81aa3e/ > > Signed-off-by: Sergey Matyukevich > --- > ...384-512-KDF-for-SAE-if-SHA384-512-is.patch | 62 +++++++++++++++++++ > 1 file changed, 62 insertions(+) > create mode 100644 package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:43:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:43:56 +0100 Subject: [Buildroot] [PATCH 1/2] boot/boot-wrapper-aarch64: bump version In-Reply-To: <20230223180847.2512056-2-vincent.stehle@arm.com> References: <20230223180847.2512056-1-vincent.stehle@arm.com> <20230223180847.2512056-2-vincent.stehle@arm.com> Message-ID: <20230223234356.1ebf1e50@windsurf> On Thu, 23 Feb 2023 19:08:46 +0100 Vincent Stehl? wrote: > Bump boot-wrapper to the latest version. > > Signed-off-by: Vincent Stehl? > Cc: Thomas Petazzoni > --- > boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Series applied to next. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:43:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:43:32 +0100 Subject: [Buildroot] [git commit branch/next] boot/boot-wrapper-aarch64: bump version Message-ID: <20230223224433.D92ED869E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3254a2886a4e20111e5c87614f6f374ec626b755 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next Bump boot-wrapper to the latest version. Signed-off-by: Vincent Stehl?? Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index 30b352f8e7..95f7e22760 100644 --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a +BOOT_WRAPPER_AARCH64_VERSION = 9f26a1c1f27bd6b5b66c265114848007fc22e4aa BOOT_WRAPPER_AARCH64_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git BOOT_WRAPPER_AARCH64_SITE_METHOD = git BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause From thomas.petazzoni at bootlin.com Thu Feb 23 22:44:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:44:23 +0100 Subject: [Buildroot] [git commit] package/gcc: fix GCC_DL_DIR Message-ID: <20230223224433.83D41869E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6455558f6202663f21d8d72e430d73b13d5339cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master GCC_DL_DIR is empty as gcc is not a "real" package, as a result, the following (silent) error is raised when BR2_CCACHE is set: /home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/bin/ccache /usr/bin/gcc -O2 -I/home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/include -DBR_CROSS_PATH_SUFFIX='".br_real"' -DBR_CCACHE_HASH=\"` printf '%s\n' --target=aarch64_be-buildroot-linux-gnu --with-sysroot=@HOST_DIR@/aarch64_be-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto --with-gmp=@HOST_DIR@ --with-mpc=@HOST_DIR@ --with-mpfr=@HOST_DIR@ --with-bugurl="http://bugs.buildroot.net/" --without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads --without-isl --without-cloog --with-abi="lp64" --with-cpu=cortex-a53 --enable-languages=c --disable-shared --without-headers --disable-threads --with-newlib --disable-largefile | sha256sum - /gcc-11.3.0.tar.xz package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch package/ gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch | cut -c -64 | tr -d '\n'`\" -DBR_SYSROOT='"aarch64_be-buildroot-linux-gnu/sysroot"' -DBR_ADDITIONAL_CFLAGS='"-Wl,-z,max-page-size=65536", "-Wl,-z,common-page-size=65536", "-fstack-protector-strong",' -DBR_CCACHE -DBR2_RELRO_PARTIAL -s -Wl,--hash-style=both toolchain/toolchain-wrapper.c -o /home/thomas/autobuild/instance-0/output-1/build/host-gcc-initial-11.3.0/toolchain-wrapper sha256sum: /gcc-11.3.0.tar.xz: No such file or directory This patch replaces GCC_DL_DIR by $($(PKG)_DL_DIR) as suggested by Arnout Vandecappelle. Fixes: - Found when investigating: http://autobuild.buildroot.org/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gcc/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 6dfd93f2a4..25cb4ce8e2 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -284,7 +284,7 @@ HOST_GCC_COMMON_MAKE_OPTS = \ gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) ifeq ($(BR2_CCACHE),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(GCC_DL_DIR)/$(GCC_SOURCE) +HOST_GCC_COMMON_CCACHE_HASH_FILES += $($(PKG)_DL_DIR)/$(GCC_SOURCE) # Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned # and unversioned patches unconditionally. Moreover, to facilitate the From thomas.petazzoni at bootlin.com Thu Feb 23 22:43:46 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:43:46 +0100 Subject: [Buildroot] [git commit branch/next] configs/arm_foundationv8: bump to Linux 6.1.13 Message-ID: <20230223224433.E3E25869E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b793f3a49e1ef8a48671ce19579586a0b018179d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next - Bump Linux kernel to v6.1.13 and increase the rootfs size accordingly. - Bump the FVP in the readme to version 11.20 build 15 and update the command line. Signed-off-by: Vincent Stehl?? Cc: Masahiro Yamada Signed-off-by: Thomas Petazzoni --- board/arm/foundation-v8/readme.txt | 4 ++-- configs/arm_foundationv8_defconfig | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/board/arm/foundation-v8/readme.txt b/board/arm/foundation-v8/readme.txt index b5106f015e..cb0fe08b87 100644 --- a/board/arm/foundation-v8/readme.txt +++ b/board/arm/foundation-v8/readme.txt @@ -3,14 +3,14 @@ ARM software simulator of the AArch64 architecture. First, one has to download the AArch64 software simulator from: - https://silver.arm.com/download/download.tm?pv=4807186 + https://armkeil.blob.core.windows.net/developer/Files/downloads/ecosystem-models/Foundation_Platform_11.20_15_Linux64.tgz Then, use the arm_foundationv8_defconfig configuration to build your Buildroot system. Finally, boot your system with: - ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-6.4/Foundation_Platform \ + ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-9.3/Foundation_Platform \ --image output/images/linux-system.axf \ --block-device output/images/rootfs.ext2 \ --network=nat \ diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig index 3c63f5dc76..102fe8fd09 100644 --- a/configs/arm_foundationv8_defconfig +++ b/configs/arm_foundationv8_defconfig @@ -1,15 +1,16 @@ BR2_aarch64=y -# Linux headers same as kernel, a 5.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.20" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.13" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8-gicv3-psci" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BOOT_WRAPPER_AARCH64=y BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8-gicv3-psci" From thomas.petazzoni at bootlin.com Thu Feb 23 22:44:34 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:44:34 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/gcc: fix GCC_DL_DIR In-Reply-To: <20230223220947.8226-1-fontaine.fabrice@gmail.com> References: <20230223220947.8226-1-fontaine.fabrice@gmail.com> Message-ID: <20230223234434.5875481b@windsurf> On Thu, 23 Feb 2023 23:09:47 +0100 Fabrice Fontaine wrote: > GCC_DL_DIR is empty as gcc is not a "real" package, as a result, the > following (silent) error is raised when BR2_CCACHE is set: > > /home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/bin/ccache /usr/bin/gcc -O2 -I/home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/include -DBR_CROSS_PATH_SUFFIX='".br_real"' -DBR_CCACHE_HASH=\"` printf '%s\n' --target=aarch64_be-buildroot-linux-gnu --with-sysroot=@HOST_DIR@/aarch64_be-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto --with-gmp=@HOST_DIR@ --with-mpc=@HOST_DIR@ --with-mpfr=@HOST_DIR@ --with-bugurl="http://bugs.buildroot.net/" --without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads --without-isl --without-cloog --with-abi="lp64" --with-cpu=cortex-a53 --enable-languages=c --disable-shared --without-headers --disable-threads --with-newlib --disable-largefile | sha256sum - /gcc-11.3.0.tar.xz package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch packag e/ > gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch | cut -c -64 | tr -d '\n'`\" -DBR_SYSROOT='"aarch64_be-buildroot-linux-gnu/sysroot"' -DBR_ADDITIONAL_CFLAGS='"-Wl,-z,max-page-size=65536", "-Wl,-z,common-page-size=65536", "-fstack-protector-strong",' -DBR_CCACHE -DBR2_RELRO_PARTIAL -s -Wl,--hash-style=both toolchain/toolchain-wrapper.c -o /home/thomas/autobuild/instance-0/output-1/build/host-gcc-initial-11.3.0/toolchain-wrapper > sha256sum: /gcc-11.3.0.tar.xz: No such file or directory > > This patch replaces GCC_DL_DIR by $($(PKG)_DL_DIR) as suggested by > Arnout Vandecappelle. > > Fixes: > - Found when investigating: http://autobuild.buildroot.org/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Arnout Vandecappelle): > - Use $($(PKG)_DL_DIR) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:44:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:44:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/erlang: fix build with libressl >= 3.5.0 In-Reply-To: <20230223140606.208040-1-fontaine.fabrice@gmail.com> References: <20230223140606.208040-1-fontaine.fabrice@gmail.com> Message-ID: <20230223234459.0f7483fc@windsurf> On Thu, 23 Feb 2023 15:06:06 +0100 Fabrice Fontaine wrote: > Fix the following build failure with libressl >= 3.5.0 raised since bump > to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: > > api_ng.c: In function 'EVP_CIPHER_CTX_copy': > api_ng.c:392:28: error: invalid use of incomplete typedef 'EVP_CIPHER_CTX' {aka 'const struct evp_cipher_ctx_st'} > 392 | if ((in == NULL) || (in->cipher == NULL)) > | ^~ > > Fixes: > - http://autobuild.buildroot.org/results/90f7365d8477d35fca452b7b3f38babba086375e > > Signed-off-by: Fabrice Fontaine > --- > ...0003-crypto-Fixes-for-LibreSSL-3-5-0.patch | 30 +++++++++++++++++++ > 1 file changed, 30 insertions(+) > create mode 100644 package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:45:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:45:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: fix build with fmt >= 9.0.0 In-Reply-To: <20230223141745.303457-1-fontaine.fabrice@gmail.com> References: <20230223141745.303457-1-fontaine.fabrice@gmail.com> Message-ID: <20230223234518.032c0b0a@windsurf> On Thu, 23 Feb 2023 15:17:45 +0100 Fabrice Fontaine wrote: > Fix the following build failure with fmt >= 9.0.0 raised since commit > 5c83dc5451fb59ffa5cd40d30c4c532dd25e8333: > > /tmp/instance-5/output-1/build/gerbera-1.10.0/src/database/sql_database.cc:1688:26: required from here > /tmp/instance-5/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/fmt/format.h:3973:36: error: passing 'const fmt::v9::formatter >, __gnu_cxx::__normal_iterator >, char>, char, void>::formatter_type' {aka 'const fmt::v9::formatter'} as 'this' argument discards qualifiers [-fpermissive] > 3973 | out = value_formatter_.format(map(*it), ctx); > | ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/56c46fa7e922360d2c4b4093f8a030cc83726799 > > Signed-off-by: Fabrice Fontaine > --- > .../gerbera/0001-Fix-build-with-fmt-9-0.patch | 36 +++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 package/gerbera/0001-Fix-build-with-fmt-9-0.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 23 22:44:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:44:54 +0100 Subject: [Buildroot] [git commit] package/erlang: fix build with libressl >= 3.5.0 Message-ID: <20230223224636.777A3869F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26254066439596b88783b80a3a87f67570c0b0b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with libressl >= 3.5.0 raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: api_ng.c: In function 'EVP_CIPHER_CTX_copy': api_ng.c:392:28: error: invalid use of incomplete typedef 'EVP_CIPHER_CTX' {aka 'const struct evp_cipher_ctx_st'} 392 | if ((in == NULL) || (in->cipher == NULL)) | ^~ Fixes: - http://autobuild.buildroot.org/results/90f7365d8477d35fca452b7b3f38babba086375e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0003-crypto-Fixes-for-LibreSSL-3-5-0.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch b/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch new file mode 100644 index 0000000000..84c75fef83 --- /dev/null +++ b/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch @@ -0,0 +1,30 @@ +From 8e5170d79e387d7e898d948a78e0c70407a4030c Mon Sep 17 00:00:00 2001 +From: Hans Nilsson +Date: Mon, 14 Feb 2022 15:51:35 +0100 +Subject: [PATCH] crypto: Fixes for LibreSSL 3.5.0 + +[Retrieved (and backported) from: +https://github.com/erlang/otp/commit/8e5170d79e387d7e898d948a78e0c70407a4030c] +Signed-off-by: Fabrice Fontaine +--- + lib/crypto/c_src/openssl_config.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h +index 6fdd049fb30a..39e4b2d9d7c0 100644 +--- a/lib/crypto/c_src/openssl_config.h ++++ b/lib/crypto/c_src/openssl_config.h +@@ -122,7 +122,14 @@ + # endif + #endif + ++#ifdef HAS_LIBRESSL ++# if LIBRESSL_VERSION_NUMBER >= 0x3050000fL ++# define HAS_EVP_PKEY_CTX ++# define HAVE_EVP_CIPHER_CTX_COPY ++# endif ++#endif ++ + #ifndef HAS_LIBRESSL + # if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0) + # define HAS_EVP_PKEY_CTX From thomas.petazzoni at bootlin.com Thu Feb 23 22:45:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:45:14 +0100 Subject: [Buildroot] [git commit] package/gerbera: fix build with fmt >= 9.0.0 Message-ID: <20230223224636.84BF9869F8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b911c8e8fe52914c1578b846914d7399450067b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with fmt >= 9.0.0 raised since commit 5c83dc5451fb59ffa5cd40d30c4c532dd25e8333: /tmp/instance-5/output-1/build/gerbera-1.10.0/src/database/sql_database.cc:1688:26: required from here /tmp/instance-5/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/fmt/format.h:3973:36: error: passing 'const fmt::v9::formatter >, __gnu_cxx::__normal_iterator >, char>, char, void>::formatter_type' {aka 'const fmt::v9::formatter'} as 'this' argument discards qualifiers [-fpermissive] 3973 | out = value_formatter_.format(map(*it), ctx); | ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/56c46fa7e922360d2c4b4093f8a030cc83726799 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gerbera/0001-Fix-build-with-fmt-9-0.patch | 36 +++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/gerbera/0001-Fix-build-with-fmt-9-0.patch b/package/gerbera/0001-Fix-build-with-fmt-9-0.patch new file mode 100644 index 0000000000..63ae8382a3 --- /dev/null +++ b/package/gerbera/0001-Fix-build-with-fmt-9-0.patch @@ -0,0 +1,36 @@ +From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001 +From: Felix Yan +Date: Fri, 19 Aug 2022 15:22:10 +0300 +Subject: [PATCH] Fix build with fmt 9.0 + +Fixes #2681 + +[Retrieved from: +https://github.com/gerbera/gerbera/commit/d7b8fafbc94405c20753fed569abd8878cccde89] +Signed-off-by: Fabrice Fontaine +--- + src/database/sql_format.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/database/sql_format.h b/src/database/sql_format.h +index 32dc00efa..e4e1909a8 100644 +--- a/src/database/sql_format.h ++++ b/src/database/sql_format.h +@@ -42,7 +42,7 @@ struct SQLIdentifier { + template <> + struct fmt::formatter : formatter { + template +- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end); + } +@@ -61,7 +61,7 @@ struct ColumnUpdate { + template <> + struct fmt::formatter : formatter { + template +- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{} = {}", a.column, a.value); + } From fontaine.fabrice at gmail.com Thu Feb 23 22:47:45 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 23:47:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/cairo: fix pthread detection In-Reply-To: <20230223153236.914358-1-fontaine.fabrice@gmail.com> References: <20230223153236.914358-1-fontaine.fabrice@gmail.com> Message-ID: Le jeu. 23 f?vr. 2023 ? 16:32, Fabrice Fontaine a ?crit : > pthreads detection fails if a warning is emitted resulting in the > following build failure with some toolchains: > > onfigure:34189: checking for cairo's pthread feature > configure:34300: > /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > conftest.c -lrt -latomic -lexecinfo -lm -lpthread >&5 > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > warning: > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: > missing .note.GNU-stack section implies executable stack > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > NOTE: This behaviour is deprecated and will be removed in a future version > of the linker > configure:34300: $? = 0 > configure:34419: > /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -pthread > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > conftest.c -lrt -latomic -lexecinfo -lm >&5 > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > warning: > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: > missing .note.GNU-stack section implies executable stack > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > NOTE: This behaviour is deprecated and will be removed in a future version > of the linker > configure:34419: $? = 0 > configure:34500: > /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > conftest.c -lrt -latomic -lexecinfo -lm >&5 > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > warning: > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: > missing .note.GNU-stack section implies executable stack > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > NOTE: This behaviour is deprecated and will be removed in a future version > of the linker > configure:34500: $? = 0 > configure:34555: checking whether cairo's pthread feature could be enabled > configure:34557: result: no (can't link with -lpthread or -pthread) > It should be noted that shellinabox has the same kind of issue, a warning is preventing the correct detection of ptsname_r: http://autobuild.buildroot.org/results/287/2872b26253ecb5a1550268fcbcefe8fd974ff70d//shellinabox-2.20/config.log So there is something fishy with those recent autobuilder failures. > > [...] > > In file included from cairo-mutex-type-private.h:45, > from cairo-scaled-font-private.h:45, > from cairoint.h:434, > from cairo-analysis-surface.c:37: > cairo-mutex-impl-private.h:262:3: error: #error "XXX: No mutex > implementation found. Cairo will not work with multiple threads. Define > CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile > cairo without thread-safety support." > 262 | # error "XXX: No mutex implementation found. Cairo will not work > with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and > accept this limitation and compile cairo without thread-safety support." > | ^~~~~ > > To avoid this build failure, add a patch that overrides this broken > mechanism > > Fixes: > - > http://autobuild.buildroot.org/results/5420beaf94855e47eeb08627e8e3c169dc00419a > > Signed-off-by: Fabrice Fontaine > --- > ...e.ac.pthread-respect-enable-pthreads.patch | 59 +++++++++++++++++++ > package/cairo/cairo.mk | 13 ++-- > 2 files changed, 68 insertions(+), 4 deletions(-) > create mode 100644 > package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch > > diff --git > a/package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch > b/package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch > new file mode 100644 > index 0000000000..c350c596cf > --- /dev/null > +++ > b/package/cairo/0005-build-configure.ac.pthread-respect-enable-pthreads.patch > @@ -0,0 +1,59 @@ > +From 243fe7f3d51c23159e25f36adee7e953fee29f6c Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Thu, 23 Feb 2023 16:07:04 +0100 > +Subject: [PATCH] build/configure.ac.pthread: respect --enable-pthreads > + > +Respect --enable-pthreads as pthreads detection fails if a warning is > +emitted resulting in the following build failure with some toolchains: > + > +onfigure:34189: checking for cairo's pthread feature > +configure:34300: > /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > conftest.c -lrt -latomic -lexecinfo -lm -lpthread >&5 > +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > warning: > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: > missing .note.GNU-stack section implies executable stack > +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > NOTE: This behaviour is deprecated and will be removed in a future version > of the linker > +configure:34300: $? = 0 > +configure:34419: > /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -pthread > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > conftest.c -lrt -latomic -lexecinfo -lm >&5 > +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > warning: > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: > missing .note.GNU-stack section implies executable stack > +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > NOTE: This behaviour is deprecated and will be removed in a future version > of the linker > +configure:34419: $? = 0 > +configure:34500: > /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > conftest.c -lrt -latomic -lexecinfo -lm >&5 > +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > warning: > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: > missing .note.GNU-stack section implies executable stack > +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > NOTE: This behaviour is deprecated and will be removed in a future version > of the linker > +configure:34500: $? = 0 > +configure:34555: checking whether cairo's pthread feature could be enabled > +configure:34557: result: no (can't link with -lpthread or -pthread) > + > +[...] > + > +In file included from cairo-mutex-type-private.h:45, > + from cairo-scaled-font-private.h:45, > + from cairoint.h:434, > + from cairo-analysis-surface.c:37: > +cairo-mutex-impl-private.h:262:3: error: #error "XXX: No mutex > implementation found. Cairo will not work with multiple threads. Define > CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile > cairo without thread-safety support." > + 262 | # error "XXX: No mutex implementation found. Cairo will not work > with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and > accept this limitation and compile cairo without thread-safety support." > + | ^~~~~ > + > +Fixes: > + - > http://autobuild.buildroot.org/results/5420beaf94855e47eeb08627e8e3c169dc00419a > + > +Signed-off-by: Fabrice Fontaine > +--- > + build/configure.ac.pthread | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/build/configure.ac.pthread b/build/configure.ac.pthread > +index 29c930da9..084445587 100644 > +--- a/build/configure.ac.pthread > ++++ b/build/configure.ac.pthread > +@@ -244,7 +244,8 @@ AC_DEFUN([CAIRO_CONFIGURE_PTHREAD],[dnl > + > + dnl Make sure we scored some pthreads. > + if test "x$enable_pthread" = "xyes" -a "x$have_pthread" != "xyes"; > then > +- AC_MSG_ERROR([pthread requested but not found]) > ++ AC_MSG_WARN([pthread requested but not found]) > ++ have_pthread=yes > + fi > + > + dnl Set the output variables for CAIRO_ENABLE. > +-- > +2.39.1 > + > diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk > index e8a704c7da..9034068403 100644 > --- a/package/cairo/cairo.mk > +++ b/package/cairo/cairo.mk > @@ -11,6 +11,8 @@ CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 > COPYING-MPL-1.1 > CAIRO_CPE_ID_VENDOR = cairographics > CAIRO_SITE = http://cairographics.org/releases > CAIRO_INSTALL_STAGING = YES > +# We're patching build/configure.ac.pthread > +CAIRO_AUTORECONF = YES > > # > 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch > CAIRO_IGNORE_CVES += CVE-2018-19876 > @@ -26,10 +28,6 @@ ifeq ($(BR2_m68k_cf),y) > CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" > endif > > -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) > -CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" > -endif > - > # cairo can use C++11 atomics when available, so we need to link with > # libatomic for the architectures who need libatomic. > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > @@ -70,6 +68,13 @@ HOST_CAIRO_DEPENDENCIES = \ > host-pixman \ > host-pkgconf > > +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) > +CAIRO_CONF_OPTS += --enable-pthread > +else > +CAIRO_CONF_OPTS += --disable-pthread > +CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" > +endif > + > # DirectFB svg support rely on Cairo and Cairo DirectFB support depends on > # DirectFB. Break circular dependency by disabling DirectFB support in > Cairo > # (which is experimental) > -- > 2.39.1 > > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Thu Feb 23 22:58:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 23 Feb 2023 23:58:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/xtables-addons: drop XTABLES_ADDONS_DISABLE_GEOIP_HELPERS In-Reply-To: <20230223160714.1210026-1-fontaine.fabrice@gmail.com> References: <20230223160714.1210026-1-fontaine.fabrice@gmail.com> Message-ID: <20230223235801.6b4a2c05@windsurf> Hello Fabrice, On Thu, 23 Feb 2023 17:07:14 +0100 Fabrice Fontaine wrote: > Drop XTABLES_ADDONS_DISABLE_GEOIP_HELPERS which raises the following > build failure (probably since the addition of the package): No, it is not since the addition of the package. Upstream commit 7ad55ad6210d450521664f64453f854b3ba13d8d looks like this: commit 7ad55ad6210d450521664f64453f854b3ba13d8d Author: Jan Engelhardt Date: Tue Aug 16 10:44:56 2022 +0200 build: eliminate geoip/ make recursion diff --git a/Makefile.am b/Makefile.am index c051d53..0518bb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,16 @@ # -*- Makefile -*- ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = extensions extensions/ACCOUNT extensions/pknock geoip - -pkglibexec_SCRIPTS = asn/xt_asn_build asn/xt_asn_dl asn/xt_asn_fetch -man_MANS = xtables-addons.8 asn/xt_asn_build.1 asn/xt_asn_dl.1 +SUBDIRS = extensions extensions/ACCOUNT extensions/pknock + +bin_SCRIPTS = geoip/xt_geoip_query +pkglibexec_SCRIPTS = asn/xt_asn_build asn/xt_asn_dl asn/xt_asn_fetch \ + geoip/xt_geoip_build geoip/xt_geoip_build_maxmind \ + geoip/xt_geoip_dl geoip/xt_geoip_dl_maxmind +man_MANS = xtables-addons.8 asn/xt_asn_build.1 asn/xt_asn_dl.1 \ + geoip/xt_geoip_build.1 geoip/xt_geoip_dl.1 \ + geoip/xt_geoip_build_maxmind.1 geoip/xt_geoip_dl_maxmind.1 \ + geoip/xt_geoip_query.1 .PHONY: FORCE FORCE: So up to this commit (which was part of the xtables-addons v3.22 release), the $(SED) invocation was working fine to drop geoip from the SUBDIRS variable. Now that they have removed the recursive make, replace " geoip" with nothing causes: bin_SCRIPTS = geoip/xt_geoip_query to become: bin_SCRIPTS = xt_geoip_query causing the build breakage. So it's actually Buildroot commit 53f2999edfa5e67923d4d8a102c15fa3200e089c (from you!) that broke this :-) > make[3]: *** No rule to make target '/xt_geoip_query', needed by 'all-am'. Stop. > > unzip and perl don't seem to be needed They are, but not at build time. The comment was referring to the fact that they are needed at runtime: the scripts in the geoip/ subdir are written in Perl, and one of them uses unzip. So practically speaking, installing them on the target is useless because xtables-addons does not force installing Perl on the target. However, the package anyway also installs asn/xt_asn_fetch and asn/xt_asn_build which are also written in Perl. So perhaps what needs to be done is simply to remove these scripts in a POST_INSTALL_TARGET_HOOKS ? (And indeed drop the SED expression as you did). Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Thu Feb 23 22:59:42 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 23 Feb 2023 23:59:42 +0100 Subject: [Buildroot] [PATCH 1/1] support/dependencies/dependencies.sh: require MD5 perl package for netsurf Message-ID: <20230223225942.313435-1-fontaine.fabrice@gmail.com> Fix the following build failure: Can't locate object method "hexhash" via package "MD5" at utils/git-testament.pl line 47 Fixes: - http://autobuild.buildroot.org/results/3dddcbbe7f6ecae5a2db6fac11fb659719452f73 Signed-off-by: Fabrice Fontaine --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 078559f086..58f44c8723 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -290,6 +290,10 @@ if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigRat" fi +if grep -q ^BR2_PACKAGE_NETSURF=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules Digest::MD5" +fi + if grep -q ^BR2_PACKAGE_WHOIS=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules autodie" fi -- 2.39.1 From thomas.petazzoni at bootlin.com Thu Feb 23 23:00:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 24 Feb 2023 00:00:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/cairo: fix pthread detection In-Reply-To: <20230223153236.914358-1-fontaine.fabrice@gmail.com> References: <20230223153236.914358-1-fontaine.fabrice@gmail.com> Message-ID: <20230224000059.367730f1@windsurf> Hello, On Thu, 23 Feb 2023 16:32:36 +0100 Fabrice Fontaine wrote: > pthreads detection fails if a warning is emitted resulting in the > following build failure with some toolchains: > > onfigure:34189: checking for cairo's pthread feature > configure:34300: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm -lpthread >&5 > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker > configure:34300: $? = 0 So this returns success. > configure:34419: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm >&5 > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker > configure:34419: $? = 0 This as well. > configure:34500: /home/buildroot/autobuild/instance-1/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O0 -g2 -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lrt -latomic -lexecinfo -lm >&5 > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: warning: /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/crtend.o: missing .note.GNU-stack section implies executable stack > /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/11.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker > configure:34500: $? = 0 This as well. > configure:34555: checking whether cairo's pthread feature could be enabled > configure:34557: result: no (can't link with -lpthread or -pthread) So why does it conclude that thread support is not available? > + dnl Make sure we scored some pthreads. > + if test "x$enable_pthread" = "xyes" -a "x$have_pthread" != "xyes"; then > +- AC_MSG_ERROR([pthread requested but not found]) > ++ AC_MSG_WARN([pthread requested but not found]) > ++ have_pthread=yes This looks odd because you're basically "ignoring" the detection/validation of thread support. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From Alberto.Fahrenkrog at rigtechnologies.com.au Thu Feb 23 23:47:01 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Thu, 23 Feb 2023 23:47:01 +0000 Subject: [Buildroot] [Help] Struggling to build external python package on out of tree build In-Reply-To: <20230223195409.GM2718518@scaer> References: <40f9568e5843d49c2afd808bec856bde@umbiko.net> <03da8459-7360-1391-7e64-86d3fd75f145@mind.be> <20230223195409.GM2718518@scaer> Message-ID: Yann, Arnout, thanks a lot. I just tried this and it worked beautifully! I really appreciate your support. Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: Yann E. MORIN Sent: Friday, February 24, 2023 3:54 AM To: Arnout Vandecappelle Cc: Alberto Fahrenkrog ; buildroot at buildroot.org Subject: Re: [Buildroot] [Help] Struggling to build external python package on out of tree build Arnout, All, On 2023-02-23 20:39 +0100, Arnout Vandecappelle spake thusly: > On 23/02/2023 10:13, Alberto Fahrenkrog wrote: > >Hi all, I'm slowly getting ahead with this, and I still have a few more questions... > > > >I'm trying to get a tar.gz file from a git repo, which needs > >authentication. The command that works manually is: > >/wget https://outwebsite.com/koala/archive/release1.2.3.tar.gz --header > >'Authorization: token MY_TOKEN'/ > >/ > >/ > >And the .mk file is configured as: > >PYTHON_KOALA_SITE_METHOD = wget > >PYTHON_KOALA_DL_OPTS = --header 'Authorization: token MY_TOKEN' > > Since commit 3f2bdd0701de4f2bca7e6d96f96972e7bcabdd93 (by Yann, in Cc), it > is necessary to twice-quote the arguments to wget (and wget only). So Oh dang, a commit from 7 years ago... ;-) > PYTHON_KOALA_DL_OPTS = --header "'Authorization: token MY_TOKEN'" > > Yann, I honestly don't understand why this eval is needed, instead of > simply passing BR2_HG unquoted... But I didn't look too deeply into it. That's because that does not work? $ cat ess #!/usr/bin/env bash bar() { for i in "${@}"; do printf '__%s__\n' "${i}" done } MY_CMD="bar '1 2 3' a b 'C D'" ${MY_CMD} START "${@}" END echo MY_CMD="./foo '1 2 3' a b 'C D'" ${MY_CMD} START "${@}" END $ cat foo #!/usr/bin/env bash for i in "${@}"; do printf '>>%s<<\n' "${i}" done $ ./ess wee woo "woot woot" __'1__ __2__ __3'__ __a__ __b__ __'C__ __D'__ __START__ __wee__ __woo__ __woot woot__ __END__ >>'1<< >>2<< >>3'<< >>a<< >>b<< >>'C<< >>D'<< >>START<< >>wee<< >>woo<< >>woot woot<< >>END<< So, if the command for a downloader, as provided in the .config, contains quoted material, the quotes would be part of the word. Regards, Yann E. MORIN. > Regards, > Arnout > > > >PYTHON_KOALA_SITE = https://outwebsite.com/koala/archive/ > > > > > >The .mk file is being read correctly, but I can't figure out how to use > >DL_OPTS. The manual says DL_OPTS is a space separated list, but i see wget > >tries to use "token" or "MY_TOKEN" as the address. I tried a few different > >combinations of inverted commas, but none worked. > > > >Thanks again, > > > >Alberto > >/ > >/ > >/ > >/ > >Alberto? Fahrenkrog > > > > Senior Embedded Engineer > > > >Orica ? Perth Technology Centre > > > >p: +61 (0) 8 6365 4056 > > > >e: *Alberto.Fahrenkrog at rigtechnologies.com.au* > > > > > >-------------------------------------------------------------------------------- > >*From:* Alberto Fahrenkrog > >*Sent:* Thursday, February 23, 2023 3:13 PM > >*To:* buildroot at buildroot.org > >*Subject:* Re: [Buildroot] [Help] Struggling to build external python > >package on out of tree build > >Ok, I see now that external.mk is explained in chapter 9. I jumped > >straight to chapter 18 and missed external.mk completely. And for some > >reason I never found external.mk on my google searches. > > > >Thanks all for your help! > > > >Cheers, > > > >Alberto > >-------------------------------------------------------------------------------- > >*From:* buildroot on behalf of Alberto > >Fahrenkrog > >*Sent:* Thursday, February 23, 2023 3:09 PM > >*To:* buildroot at buildroot.org > >*Subject:* Re: [Buildroot] [Help] Struggling to build external python > >package on out of tree build > > > >You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. > >Learn why this is important > > > > > > > >Hi Andreas, > > > >Thank you so much! That did it! Where in the manual is external.mk > >explained? I missed it for sure... > > > >Cheers, > > > >Alberto > >Alberto? Fahrenkrog > > > > Senior Embedded Engineer > > > >Orica ? Perth Technology Centre > > > >p: +61 (0) 8 6365 4056 > > > >e: *Alberto.Fahrenkrog at rigtechnologies.com.au* > > > > > >-------------------------------------------------------------------------------- > >*From:* buildroot on behalf of Andreas > >Ziegler > >*Sent:* Thursday, February 23, 2023 2:49 PM > >*To:* Alberto Fahrenkrog > >*Cc:* buildroot at buildroot.org > >*Subject:* Re: [Buildroot] [Help] Struggling to build external python > >package on out of tree build > >[You don't often get email from br015 at umbiko.net. Learn why this is > >important at https://aka.ms/LearnAboutSenderIdentification > > ] > > > >Hi Alberto, > > > >On 2023-02-23 04:47, Alberto Fahrenkrog wrote: > >>Update, > >> > >>if I change $(eval $(python-koala)) to $(eval $(python-package)) I > >>still get the same error. I assume that might have been one mistake. > >> > >>Cheers, > >> > >>Alberto > >> > >>Alberto Fahrenkrog Senior Embedded Engineer > >>Orica - Perth Technology Centre > >>p: +61 (0) 8 6365 4056 > >>e: Alberto.Fahrenkrog at rigtechnologies.com.au > >>________________________________ > >>From: buildroot on behalf of Alberto > >>Fahrenkrog > >>Sent: Thursday, February 23, 2023 12:42 PM > >>To: buildroot at buildroot.org > >>Subject: [Buildroot] [Help] Struggling to build external python package > >>on out of tree build > >> > >>You don't often get email from > >>alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is > >>important >> > >>Hello all, > >> > >>I'm trying to build a very simple custom python package following the > >>instructions on the manual, yet I must be doing something very wrong as > >>I get this result: > >> > >>$ make python-koala > >>make[1]: *** No rule to make target 'python-koala'. Stop. > >>make: *** [Makefile:23: _all] Error 2 > >> > >>I create my out of tree build with: > >>make -C ~/opt/buildroot-2021.02/ BR2_EXTERNAL=~/Projects/br_build > >>O=~/Projects/br_build BR2_DL_DIR=~/Projects/br_build/downloads > >>br_build_defconfig > >> > >>On my "br_build" folder I have a Config.in file: > >>menu "Python-Libs" > >> source "~/Projects/br_build/package/python-koala/Config.in" > >>endmenu > > > >Similar to the include file for configs, you also need an external.mk > >file for the project make files, with this content: > > > > include $(sort $(wildcard ~/Projects/br_build/package/*/*.mk)) > > > >Otherwise your .mk files will not be picked up. > > > >>In "br_build/packages/python-koala/Config.in" > > > >The package directory is usually named 'package', not sure if this is > >relevant (but Config.in /external.mk have to match it). > > > >>config BR2_PACKAGE_PYTHON_KOALA > >>??????bool "python-koala" > >> depends on BR2_PACKAGE_PYTHON3 > >>??????help > >>?????? Python implementation of Koala Library > >> > >>In "br_build/packages/python-koala/python-koala.mk" > >>################################################################################ > >># > >># python-koala > >># > >>################################################################################ > >> > >>PYTHON_KOALA_VERSION = 1.3.3 > >>PYTHON_KOALA_SOURCE = $(PYTHON_KOALA_VERSION).tar.gz > >>PYTHON_KOALA_SITE = > >>https://mywebsite.com.au/ExternalCode/koala/archive/ > > > >>PYTHON_KOALA_SETUP_TYPE = setuptools > >> > >>$(eval $(python-koala)) > >> > >>If I run "make menuconfig" I can select or deselect the package, and > >>it's selected per default on the br_build_defconfig (and in .config): > >>BR2_PACKAGE_PYTHON_KOALA=y > >> > >>But if I try to run "make python-koala" I get the "no target" error. > >>I'll still have a read and see what I might be doing wrong, but I'm > >>very confused. Any ideas are very welcome. > >> > >>Cheers, > >> > >>Alberto > > > > > > > >Kind regards, > >Andreas > >_______________________________________________ > >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 -- .-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------' -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image506347.png Type: image/png Size: 14270 bytes Desc: image506347.png URL: From contact at martb.dev Fri Feb 24 01:04:45 2023 From: contact at martb.dev (=?UTF-8?Q?Martin_B=c3=b6h?=) Date: Fri, 24 Feb 2023 02:04:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/gr-osmosdr: add missing host-python-six dependency to python support In-Reply-To: References: Message-ID: Hey Thomas, thanks for taking a look. Sadly this is part of the pybind11 build process and there is no way to get rid of these docs, the ENABLE_DOXYGEN does not affect it. I found no viable solution to get rid of them. Same with gnuradio, it also has a lot of docs that cant be disabled. Kind regards, Martin B?h Am 23.02.23 um 23:13 schrieb Thomas Petazzoni: > Hello Martin, > > On Thu, 23 Feb 2023 21:17:33 +0100 > Martin B?h via buildroot wrote: > >> Osmosdr failed to build docs when python support is enabled. >> [ 41%] Copying osmosdr docstring templates as pybind headers ... >> Traceback (most recent call last): >> File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/update_pydoc.py", line 22, in >> from doxyxml import DoxyIndex, DoxyClass, DoxyFriend, DoxyFunction, DoxyFile >> File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/__init__.py", line 69, in >> from .doxyindex import DoxyIndex, DoxyFunction, DoxyParam, DoxyClass, DoxyFile, DoxyNamespace, DoxyGroup, DoxyFriend, DoxyOther >> File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/doxyindex.py", line 31, in >> from .generated import index >> File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/index.py", line 13, in >> from . import compound >> File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compound.py", line 15, in >> from . import compoundsuper as supermod >> File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compoundsuper.py", line 15, in >> import six >> ModuleNotFoundError: No module named 'six' >> make[2]: *** [python/bindings/CMakeFiles/osmosdr_docstrings.dir/build.make:73: python/bindings/docstring_status] Fehler 1 >> make[1]: *** [CMakeFiles/Makefile2:332: python/bindings/CMakeFiles/osmosdr_docstrings.dir/all] Fehler 2 >> >> Signed-off-by: Martin B?h > Is there potentially a way to disable building documentation instead? > Of course, adding host-python-six in the dependencies is not a huge > deal, but we really don't care about building documentation in the > context of Buildroot. > > Best regards, > > Thomas From thomas.petazzoni at bootlin.com Fri Feb 24 07:35:53 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 24 Feb 2023 07:35:53 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-23 Message-ID: <20230224073602.0E9FC40327@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-23 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 12 | 10 | 0 | 22 | master | 138 | 139 | 1 | 278 | next | 16 | 27 | 0 | 43 | Classification of failures by reason for master ----------------------------------------------- unknown | 8 glibc-2.36-81-g4f4d7a13edfd... | 6 gobject-introspection-1.72.0 | 6 host-binutils-2.38 | 6 host-pahole-1.24 | 6 python-numpy-1.23.5 | 6 elfutils-0.186 | 5 host-go-1.19.6 | 5 host-rust-1.67.0 | 3 libglib2-2.72.3 | 3 linux-6.1.11 | 3 systemd-252.4 | 3 boost-1.80.0 | 2 cairo-1.16.0 | 2 fs/cramfs/cramfs.mk:46: /ho... | 2 fs/ubifs/ubifs.mk:49: /home... | 2 gerbera-1.10.0 | 2 kexec-2.0.25 | 2 libcap-ng-0.8.3 | 2 libgpg-error-1.46 | 2 lirc-tools-0.10.2 | 2 mender-3.4.0 | 2 ocf-linux-20171122 | 2 olsr-0.9.8 | 2 package/multipath-tools/mul... | 2 putty-0.76 | 2 rdma-core-44.0 | 2 speechd-0.11.4 | 2 uqmi-0a19b5b77140465c29e2af... | 2 busybox-1.36.0 | 1 check-0.15.2 | 1 erlang-22.3.4.22 | 1 exim-4.96 | 1 frr-8.4.2 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fstrcmp-0.7.D001 | 1 gdal-3.5.2 | 1 gocryptfs-2.3 | 1 gtkmm3-3.22.0 | 1 host-binutils-2.37 | 1 host-binutils-2.39 | 1 host-gcc-final-10.4.0 | 1 json-c-0.16 | 1 kmod-30 | 1 kvmtool-f77d646ba01d04be5aa... | 1 libgcrypt-1.10.1 | 1 libmad-0.15.1b | 1 libnfc-1.8.0 | 1 libudfread-1.1.2 | 1 linux-5.10.162-cip24 | 1 mariadb-10.3.36 | 1 mawk | 1 netsniff-ng-0.6.8 | 1 netsurf-3.10 | 1 openssh-9.1p1 | 1 perl-5.36.0 | 1 php-8.2.3 | 1 quickjs-2021-03-27 | 1 reaver-1.6.6 | 1 s6-linux-utils-2.6.0.0 | 1 shellinabox-2.20 | 1 skalibs-2.12.0.1 | 1 tcf-agent-1.7.0 | 1 ti-sgx-km-cf7f48cb30abfd5df... | 1 uccp420wlan-6.9.1 | 1 valgrind-3.19.0 | 1 xenomai-3.0.10 | 1 xtables-addons-3.22 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/ad60da197a64f186595e2ec626f044e922da00f4 | arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/16ffef680a4ff393c992c3863d265e3251183ec0 | mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/ae787a8e73c7d6a5ade7551689c5acbf7b6113b7 | ORPH xtensa | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/5420beaf94855e47eeb08627e8e3c169dc00419a | xtensa | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/8598e1f68673c1754d02a770806099e1f6bb7b2e | powerpc64le | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/81fb9ac90dbf6ff1c76afd5f380fdcdeb7884cf5 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/81e8c2505fa175d6f4a4fe224577b21d708742b3 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/a75c7b19bf1d8c1f01dd0ba928335c38950f1578 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/0672c1b5af6b1af3c52e028bc61c8da938a04359 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/e8e7bf3aa8737dc9c5a6c04ccb75de6c2e0fef43 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/388a684b264c95d211a151c91198abea7980b277 | ORPH x86_64 | erlang-22.3.4.22 | NOK | http://autobuild.buildroot.net/results/36c74201f05f52b8e2fc7cbd6e42dbc6dfcfa045 | arm | exim-4.96 | NOK | http://autobuild.buildroot.net/results/fa5bc99a93473e9ab640a558b388833dbcafc94b | xtensa | frr-8.4.2 | NOK | http://autobuild.buildroot.net/results/a6542e2d41ff104cd5eaa35c2892b648bb88b85c | mips64el | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/537bcf98b0137a40c0b558289a811df5d3cd2065 | arm | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/c3da7d6f00be505e6f713e4b4770fd5ed9c4b058 | microblaze | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/e0f1a55e324688bc2aa56e0a73ea75c3e08e1bb1 | mipsel | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/647801e2b6500cdc6869ee090f39edbeaa0a2912 | sh4eb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/7a74b54a7568d17db3cd70430cb5469e461c51d5 | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/24e4e12456d31ed4cf0af28012c9b2cda262d2b3 | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/d7ee50fae8fa01e1ace6d8ef6c79b1d21778a9c6 | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/5d4c375a1f64b33f80bb9d4149376eb5ddeca245 | sparc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/fe9fd607c4a6384084790a11731835063d6a41fb | aarch64 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/2be92d0ea9b7d949bcd0baddb4935a373152b7a2 | s390x | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/0992ccbc272b86a16ab8f650406bb89eb615711c | riscv32 | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/b11ed715f4aa7027775bc5a1846d3d1ec3d7908a | mipsel | fstrcmp-0.7.D001 | NOK | http://autobuild.buildroot.net/results/2b77e06af7547f34ab2405194cb83f8fee82ba08 | sh4 | gdal-3.5.2 | NOK | http://autobuild.buildroot.net/results/4e34ad89caeabd4443011f96cf4f635af5912fd7 | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/56c46fa7e922360d2c4b4093f8a030cc83726799 | sparc64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/f14c54a190b1453e0413f7f75c74d2fa6e335041 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/5549551b3d3eabc1e30e504b7d074537a9a96782 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/0afe67afafa3986d1e5255ea15e8da7efac2d743 | powerpc64 | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/d6ddc9ac4fcb1ab2522f4e5801891b8efbf9b635 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/bdea93970781a7219b3d36581d3ce23140f56757 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/6a363a0373e627acdb06e81de9693c6e1125a345 | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/13f6957545ca286cc8cfed2afe3e6e323351670c | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/b52569bb531e8aa33203033278e31ad272f7ba2f | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/59045ff4df658c242042433ecb4ae51de23aab82 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/6a2eeef3b5bb29974edd7f641e18aad674aaae13 | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/217569dcd6e0857ce6e3331c461515fff8f91645 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/bbb63a44bfc55e4ef49e18c1aa52bdd4c43a4fec | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/e24eef231eae4bdf9fbcf1e4d1a71679aa26b555 | ORPH x86_64 | gocryptfs-2.3 | NOK | http://autobuild.buildroot.net/results/18f0dfaa5dec76deac30e4947231194af47c13ca | aarch64_be | gtkmm3-3.22.0 | NOK | http://autobuild.buildroot.net/results/912b870d6483aa5e3533fb4b8515c5b872cfabd1 | mipsel | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/de5016ed30fe888f039e856cb0e08de31036ee6a | sparc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e1eb5ac94e1a2be459d0b999d2a5ec4484ad6c1b | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/f2bb8b9a1b539365257a706fefcf3a9f988a7b70 | mipsel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/b087bf6a64184cdbe35901c1bbe49235790fb343 | aarch64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/a0c8f2f07150d9be0af0cd361d549daeac84fe63 | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/9d17c96b4b1ab52adbd629f7cbda17e452fa6854 | i686 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/c500b73d8c0339cca4d2d7d42b435fd7be0ff60f | x86_64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/036ad6f59279405b01fa3529caeb2b78cd895550 | arceb | host-gcc-final-10.4.0 | NOK | http://autobuild.buildroot.net/results/ee593cf22bfc11d4ccb52d7407cd55840a47684f | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/f0dd3dab511ee13e56f409a6eac62e771d2e4f15 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/23a54f54efbec94d74a49639bb71edc139162a55 | aarch64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/3b850ca2b6c51cf28eb230e78ed9eb97599a4fad | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/9dc2d77eaeb49b84adcdba0d2de56e56d6e73b99 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/bcae3c97f94db3cf21509c11b30d3e269902b5e6 | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2363ba61b4df285bbd60237eb32f49b10f5a3dd7 | sparc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/9d9fc6e24735de49583df40cd050c5a67f0553d1 | aarch64_be | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ea21636a588aad04ad7793912b46844726cb4c85 | s390x | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ed4db2e03a5d4036cc757c067cff1311b11047d9 | arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/3119be2906530a556205320771ee8a8fce7025fb | microblaze | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2a608d7490d2f14dbcb6dea0c24498ad3e175309 | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/9bdf41aa2f04394693d1fa2822edf648de1ce75c | aarch64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/ec9bf8fa13a995ef068508ab8755b48c8a2a6465 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/f3316d5c9fa4728e5ccc55cb4bfc82c250e2cfe6 | riscv64 | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/d37420015b230798611253aa121bf2122514d808 | armeb | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/90418c5239d596a4ee4ef70bbd5875cd3305de26 | ORPH sh4 | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/49771da00c31741063a12ee78eaa44539b230ec4 | ORPH arm | kmod-30 | NOK | http://autobuild.buildroot.net/results/c3ab3dcc55ec43b275e8f2e673fa7da817d07a37 | i686 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/3aaf26b96d25e9bf6e2c76035eb550dfecaf0228 | ORPH riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/0fba229d25f05e450365b6c903bd92a219550b7b | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/76d8ff47149c02dbe2ec68f66ac8152bed85f6d8 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/746df16ce64a879c8defc128cea6d026cbc33387 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/95f7ba434cfb6d5f0c0937619275482c4df1b346 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/d5deb31857091e0d44f01d94818d877b5deeb470 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/915f6b953ae88fed06c19e140c24f10089ea6d36 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/133152f7810c2e4354b102144b79d36d37630aec | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/61f92f8dd99fa7a8364438c531fafd4a4b1dc8f1 | ORPH armeb | libmad-0.15.1b | NOK | http://autobuild.buildroot.net/results/92a3f19b4fa12a7724f9e3d99284da4ad2beecb2 | ORPH or1k | libnfc-1.8.0 | NOK | http://autobuild.buildroot.net/results/64024ca6a7b070bb633ca3a80efd618357705625 | arm | libudfread-1.1.2 | NOK | http://autobuild.buildroot.net/results/30a2ba15186688d0211da8c9bdb7ca53e171a03a | mips | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/413b95a1962447bf7d52b6d10c5e8b1383617c85 | ORPH arceb | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/feef141784f2c8ddb7469baabf79bd1815cfd055 | ORPH riscv32 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/30d5816e7d8c105f3925a297e29d1f967778c387 | ORPH arm | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/4135396a30d8411d4b72f34a2784dce6ba21663a | ORPH aarch64_be | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/e0e98ce16ecf70c9de48b25bd925b867090c64cd | ORPH i686 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/b08d307a235975fbbaa12f484136b7e9e438c70f | ORPH sparc | mariadb-10.3.36 | NOK | http://autobuild.buildroot.net/results/e6bf8871d438d272a08d977a87fe23ffc261c77c | ORPH m68k | mawk | TIM | http://autobuild.buildroot.net/results/c30e6acfc89d9b23400f76a6efd471aab512f132 | i686 | mender-3.4.0 | NOK | http://autobuild.buildroot.net/results/2b032d2a4e7cfbb20444c13821003120a4d00abd | i686 | mender-3.4.0 | NOK | http://autobuild.buildroot.net/results/f22e6d74d2511a71a6835bcf58290b892ab9a9c0 | x86_64 | netsniff-ng-0.6.8 | NOK | http://autobuild.buildroot.net/results/ff6cc5a2aff1f79fa361e6265514af16c58a20c6 | microblazeel | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/3dddcbbe7f6ecae5a2db6fac11fb659719452f73 | i586 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/5bcf0767ceea96c837aabc49558ea1bbd9bfd2c4 | ORPH powerpc64 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/dc669ea62e9a75a454d4281bae18ed93cd642497 | ORPH aarch64_be | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/5c36fc50a28dc2342c1ad0359ac2f3549c6e9750 | ORPH mipsel | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/40ddc2fc4a1552810aadc0f55ff2b0f3e57a37e6 | ORPH m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/55cfe103675557590faab5073aaee776377b5d33 | ORPH s390x | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/21bc3aa3e1b89ace5aebe771b8c34d5bd0cb9c3d | aarch64_be | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/5aa82ae809473f959ce49516c18a3ed11c4b1734 | s390x | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/1be343f89db372e78de5c6e7b916db08d7aec3da | microblazeel | php-8.2.3 | NOK | http://autobuild.buildroot.net/results/d4a6eb20005badca84214a55680cc2336b557528 | aarch64 | putty-0.76 | NOK | http://autobuild.buildroot.net/results/91dd5c89cbdf4068d06b42df25b66435b3cb6005 | aarch64 | putty-0.76 | NOK | http://autobuild.buildroot.net/results/6a4065b432887107b8e054b43a79708ce5e42307 | arm | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/e62abbcf18f15d4791fdbafa515662bb5c4a975b | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/36bb9349ee7e7e760eff679c83e21e84cb51a1aa | powerpc64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/7b6809f5f5bbcc6027ebef1cb76a721f69724c54 | sh4aeb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/6bbfa1e76a79340727a9405fd3020c46780b729e | sh4 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/218a64ea89209e3370a703a713a65adfae45fd2b | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/2e3a624c24991413d52559d55b34262204fb64f2 | microblazeel | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/1529211d0fb4fc802420518485c581f32b737799 | m68k | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/abc85841893e97f058f22e012e99c7d1200ee7d7 | i586 | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/aa8e9a8fed8764d7e63580882f3f05909fcf3843 | arc | reaver-1.6.6 | NOK | http://autobuild.buildroot.net/results/926c9c7839023ec240f8fd4ba065ef15bd35a397 | mips64el | s6-linux-utils-2.6.0.0 | NOK | http://autobuild.buildroot.net/results/214bcecfc389cb412b68627c831300478d614a3a | xtensa | shellinabox-2.20 | NOK | http://autobuild.buildroot.net/results/2872b26253ecb5a1550268fcbcefe8fd974ff70d | or1k | skalibs-2.12.0.1 | NOK | http://autobuild.buildroot.net/results/c4d8dea9ba085a65e45b43e0b26d4cbb4325d65f | aarch64_be | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/4473bdfaa74b932f02957b7642ce8aaec41dae2f | x86_64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/500352a7678c21f4c66e5a3f2beea1cc791db872 | aarch64_be | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/6227df3a53f8a322fae400291207c2093e861dcf | mips64el | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/9826151cdc64c2e633da5f2b984b1205c5899df9 | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/b1796e6bf853560de9c7685b670edef7d2abe6b1 | microblazeel | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/7aab9a839d4ae8f5081e487f71796f73a46a1279 | arm | ti-sgx-km-cf7f48cb30abfd5df... | NOK | http://autobuild.buildroot.net/results/89149fe01a3d2a8d046bec7899486292567bb37d | s390x | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/c3a4e424916f1474b444e831d72fb4e2c5e65004 | ORPH aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/4f4820647f5839cc1c6b725dd3dd7665c5275aa1 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/82f02cee961f7df18e1f79bfc5ae86bf66b85169 | arceb | unknown | NOK | http://autobuild.buildroot.net/results/3ca012ce9b6a7e7d9ecd8949e8ee8b7750cc3e61 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/2eb02664c4524f65507b38b66de57f1ec1fcf535 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/fd766e4ad4815b92e44a8488bfba51fa2f8f6110 | mips | unknown | NOK | http://autobuild.buildroot.net/results/6cd359b3429f33b74f156b99550839e75348c694 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/aaf03f8cdad4c02bf1881e74ac1263193d9587fa | mips | unknown | NOK | http://autobuild.buildroot.net/results/addb9c2ed80e61bae4ce18421a163d2bb2cb1160 | s390x | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/d6bc02326877435a9479d9231cba43ea66556f15 | ORPH nios2 | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/f6261181b0726c62703818ddc6772b87cd40a9a9 | ORPH mips | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/19b58969ca4a768804022eadb32922130ab600c3 | ORPH powerpc | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/b44bafe2e9229d0031df35a3a700635d009a1140 | arc | xtables-addons-3.22 | NOK | http://autobuild.buildroot.net/results/f2d596b510f027b94a6b1fad10c363922c50cbec | ORPH Classification of failures by reason for next --------------------------------------------- linux-6.1.11 | 4 host-binutils-2.38 | 2 host-rust-1.67.1 | 2 libgcrypt-1.10.1 | 2 acpid-2.0.34 | 1 elfutils-0.186 | 1 fwup-1.9.1 | 1 gmp-6.2.1 | 1 gqrx-2.14.4 | 1 host-pahole-1.24 | 1 hwloc-2.8.0 | 1 libcamera-apps-1.1.1 | 1 libglib2-2.72.3 | 1 ltp-testsuite-20220930 | 1 lttng-babeltrace-1.5.7 | 1 mutt-2.2.9 | 1 pv-1.6.20 | 1 uccp420wlan-6.9.1 | 1 ulog-0389d243352255f6182326... | 1 unknown | 1 xfsprogs-5.14.2 | 1 Detail of failures for next --------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acpid-2.0.34 | NOK | http://autobuild.buildroot.net/results/35368c241971ca36db7e4e62929131898d707f4c | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/c171c695cb4ceb5745cce22aac2b880e74f790fc | ORPH mipsel | fwup-1.9.1 | NOK | http://autobuild.buildroot.net/results/a522676bf5ce7b8bce4a9c2fac90599afc10e529 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/8c259722ad084da709644b02f272a79d210659ad | ORPH mipsel | gqrx-2.14.4 | NOK | http://autobuild.buildroot.net/results/5f224d0f40fe38e58cd48354b4053f6ae243f2c8 | mips64el | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/f10e828deb87773bc8d5f030342acfba6e507cf7 | powerpc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/b7ae1443ea956f3ba7291ad7c9fb73095e97c513 | sparc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/256b80c8192581091d37e0a2eed4c5492b666962 | mipsel | host-rust-1.67.1 | NOK | http://autobuild.buildroot.net/results/a664aed4764312378e9aa9da937923c44dca0b47 | x86_64 | host-rust-1.67.1 | NOK | http://autobuild.buildroot.net/results/98a203801ed1c06e80b0702f7b2be75ba185ae19 | x86_64 | hwloc-2.8.0 | NOK | http://autobuild.buildroot.net/results/aaf4faa3964df8bff747fb2069f632fb9fcd6f7a | mips64 | libcamera-apps-1.1.1 | NOK | http://autobuild.buildroot.net/results/a14e2548af4d39a47f3916384e48135413c621e2 | i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/9929386044ff8f37f998203a0c6cbbd78a510ec9 | ORPH arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/c2cfe1769a231db897e945ca17159fa06b0e5f92 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/bc4cf3975c784a6b3b9eee72d9bfda3becf7a7be | mipsel | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/184eebcbb0769400388bc176ad04fd8ca1bea2c0 | ORPH powerpc64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/e67a61eff21e51ad1a918729146f9720ea324e09 | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/8be1e703bd3738aedd80bac93565d56ce23aa1a9 | ORPH sh4a | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/db2d0efa501959943febce11f5dbfdefa2cf2cf8 | ORPH arm | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/b713e4294a891ae08ad4afd8031e46bd1d09bd57 | m68k | lttng-babeltrace-1.5.7 | NOK | http://autobuild.buildroot.net/results/4f465fe15664b1f9df3f26c331dc550852972f2f | aarch64_be | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/2399a6d8eba249e2e880a0a060bb38a92f5e047e | armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/499042067b2cdb54127275cc90f580f5f9b306f6 | ORPH i586 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/f85427ba27fdc3fa2bf1b936baab017259fbac71 | ORPH sparc64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/d2bd9e5271e16794e6aa47d001a88f15eb1bfb7e | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/fb707d74d9cc0e6069ba9297c544ea3ad8d7ef3d | mipsel | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/1187a079fb2d0aafcce899575e6e43f396df41f8 | ORPH Classification of failures by reason for 2022.11.x -------------------------------------------------- ace-7.0.6 | 1 boost-1.80.0 | 1 dropbear-2022.82 | 1 efivar-38 | 1 elfutils-0.186 | 1 gerbera-1.10.0 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 luajit-6c4826f12c4d33b8b978... | 1 open62541-v1.3.3 | 1 zabbix-5.4.9 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | ace-7.0.6 | NOK | http://autobuild.buildroot.net/results/549727e0f7066e9d4467899089f698b5cdb186be | ORPH arc | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/1575b04c32dff0cc702bf722fcaad2fee06d5ccb | riscv64 | dropbear-2022.82 | NOK | http://autobuild.buildroot.net/results/330a84cb6471e86d4bdf191e61f5e35a710a77f4 | arm | efivar-38 | NOK | http://autobuild.buildroot.net/results/277f783c33102a0cea7c82ca902119ab90f37ad4 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/9166cdf54f9523d24a79dc2aeaae5139c91be178 | ORPH aarch64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/739b57ae928aed1d734e32fcd732c4b63a1e8e32 | arc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/1539bf86643d38f9a16081978c46b7ef14aca7ce | powerpc | luajit-6c4826f12c4d33b8b978... | NOK | http://autobuild.buildroot.net/results/37cba5632c67b3c5eabbd47f208297849dc51eef | riscv32 | open62541-v1.3.3 | NOK | http://autobuild.buildroot.net/results/79de0744f5c4cbd4d7e4b8348008eb9c04c0acc0 | ORPH s390x | zabbix-5.4.9 | NOK | http://autobuild.buildroot.net/results/5cd9212264e61ca43cbdbb0995939c247a549f4c | Gitlab CI results for 2023-02-23 ================================ Detail of defconfig failures for 2023.02-rc1 -------------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ qemu_s390x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3819524265 | Detail of runtime-test failures for 2023.02-rc1 ----------------------------------------------- runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ DetectBadArchTest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787630 | ORPH TestAarch64Pages64kGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788057 | ORPH TestAarch64Pages64kMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788058 | ORPH TestAarch64Pages64kuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788059 | ORPH TestAtop | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787779 | ORPH TestAvocado | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787781 | ORPH TestClangCompilerRT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787789 | ORPH TestCpioDracutGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787667 | ORPH ...ioDracutGlibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787668 | ORPH TestCpioDracutMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787669 | ORPH ...pioDracutMuslMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787670 | ORPH TestCpioDracutUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787671 | ORPH ...oDracutUclibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787672 | ORPH TestCpioFull | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787673 | ORPH TestCrudiniPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787792 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787795 | ORPH TestDropbear | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787797 | ORPH TestDtbocfg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787799 | ORPH TestExecline | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787800 | ORPH TestExt2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787674 | ORPH TestExt2r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787677 | ORPH TestExt3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787678 | ORPH TestExt4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787680 | ORPH ...rch64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788069 | ORPH ...tlinAarch64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788070 | ORPH ...arch64MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788071 | ORPH ...otlinAarch64MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788072 | ORPH ...ch64UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788073 | ORPH ...linAarch64UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788074 | ORPH ...h64beGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788075 | ORPH ...inAarch64beGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788076 | ORPH ...64beUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788077 | ORPH ...nAarch64beUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788078 | ORPH ...750dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788079 | ORPH ...nArcle750dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788080 | ORPH ...ehs38GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788081 | ORPH ...inArclehs38GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788082 | ORPH ...hs38UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788084 | ORPH ...nArclehs38UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788085 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788086 | ORPH ...mebv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788087 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788088 | ORPH ...rmebv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788089 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788090 | ORPH ...ebv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788091 | ORPH ...5eabiGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788092 | ORPH ...inArmv5eabiGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788093 | ORPH ...v5eabiMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788094 | ORPH ...linArmv5eabiMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788095 | ORPH ...eabiUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788096 | ORPH ...nArmv5eabiUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788097 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788098 | ORPH ...Armv6eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788099 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788100 | ORPH ...nArmv6eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788101 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788102 | ORPH ...rmv6eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788104 | ORPH ...abihfGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788106 | ORPH ...Armv7eabihfGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788108 | ORPH ...eabihfMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788111 | ORPH ...nArmv7eabihfMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788112 | ORPH ...bihfUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788113 | ORPH ...rmv7eabihfUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788114 | ORPH ...mv7mUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788115 | ORPH ...tlinArmv7mUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788116 | ORPH ...8xxxUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788117 | ORPH ...nM68k68xxxUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788118 | ORPH ...fireUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788119 | ORPH ...8kcoldfireUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788120 | ORPH ...azebeGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788121 | ORPH ...icroblazebeGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788122 | ORPH ...lazebeMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788123 | ORPH ...MicroblazebeMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788125 | ORPH ...zebeUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788127 | ORPH ...croblazebeUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788128 | ORPH ...azeelGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788130 | ORPH ...icroblazeelGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788131 | ORPH ...lazeelMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788133 | ORPH ...MicroblazeelMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788135 | ORPH ...zeelUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788137 | ORPH ...croblazeelUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788138 | ORPH ...ips32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788140 | ORPH ...otlinMips32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788142 | ORPH ...Mips32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788144 | ORPH ...ootlinMips32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788146 | ORPH ...ps32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788148 | ORPH ...tlinMips32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788150 | ORPH ...s32elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788151 | ORPH ...linMips32elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788153 | ORPH ...ps32elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788154 | ORPH ...tlinMips32elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788156 | ORPH ...32elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788157 | ORPH ...inMips32elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788159 | ORPH ...2r5elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788160 | ORPH ...nMips32r5elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788162 | ORPH ...32r5elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788163 | ORPH ...inMips32r5elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788164 | ORPH ...r5elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788165 | ORPH ...Mips32r5elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788166 | ORPH ...2r6elGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788167 | ORPH ...nMips32r6elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788168 | ORPH ...32r6elMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788169 | ORPH ...inMips32r6elMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788170 | ORPH ...r6elUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788171 | ORPH ...Mips32r6elUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788172 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788173 | ORPH ...Mips64eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788174 | ORPH ...4eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788175 | ORPH ...nMips64eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788176 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788177 | ORPH ...ips64eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788179 | ORPH ...64n32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788180 | ORPH ...inMips64n32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788182 | ORPH ...s64n32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788183 | ORPH ...linMips64n32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788184 | ORPH ...4n32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788185 | ORPH ...nMips64n32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788186 | ORPH ...eln32GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788187 | ORPH ...ps64r6eln32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788188 | ORPH ...6eln32MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788189 | ORPH ...ips64r6eln32MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788190 | ORPH ...ln32UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788191 | ORPH ...s64r6eln32UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788192 | ORPH ...Nios2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788193 | ORPH ...ootlinNios2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788194 | ORPH ...nriscGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788195 | ORPH ...linOpenriscGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788196 | ORPH ...enriscMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788197 | ORPH ...tlinOpenriscMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788198 | ORPH ...riscUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788199 | ORPH ...inOpenriscUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788201 | ORPH ...440fpGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788202 | ORPH ...owerpc440fpGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788204 | ORPH ...c440fpMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788206 | ORPH ...Powerpc440fpMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788208 | ORPH ...40fpUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788212 | ORPH ...werpc440fpUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788214 | ORPH ...e5500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788216 | ORPH ...erpc64e5500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788220 | ORPH ...e6500GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788224 | ORPH ...erpc64e6500GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788228 | ORPH ...4e6500MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788230 | ORPH ...werpc64e6500MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788231 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788233 | ORPH ...c64lepower8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788235 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788236 | ORPH ...pc64lepower8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788238 | ORPH ...ower8GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788241 | ORPH ...rpc64power8GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788242 | ORPH ...power8MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788244 | ORPH ...erpc64power8MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788246 | ORPH ...300c3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788247 | ORPH ...werpce300c3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788250 | ORPH ...e300c3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788252 | ORPH ...owerpce300c3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788253 | ORPH ...00c3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788256 | ORPH ...erpce300c3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788260 | ORPH ...500mcGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788261 | ORPH ...werpce500mcGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788263 | ORPH ...e500mcMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788265 | ORPH ...owerpce500mcMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788267 | ORPH ...00mcUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788268 | ORPH ...erpce500mcUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788270 | ORPH ...lp32dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788271 | ORPH ...lp64dGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788272 | ORPH ...iscv64lp64dGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788273 | ORPH ...4lp64dMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788274 | ORPH ...Riscv64lp64dMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788276 | ORPH ...p64dUclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788278 | ORPH ...scv64lp64dUclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788279 | ORPH ...0xz13GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788280 | ORPH ...linS390xz13GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788282 | ORPH ...Shsh4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788283 | ORPH ...ootlinShsh4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788284 | ORPH ...nShsh4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788285 | ORPH ...BootlinShsh4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788286 | ORPH ...hsh4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788287 | ORPH ...otlinShsh4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788288 | ORPH ...h4aebGlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788289 | ORPH ...linShsh4aebGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788290 | ORPH ...sh4aebMuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788291 | ORPH ...tlinShsh4aebMuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788292 | ORPH ...arc64GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788293 | ORPH ...tlinSparc64GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788294 | ORPH ...rcv8UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788295 | ORPH ...linSparcv8UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788297 | ORPH ...X8664GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788300 | ORPH ...ootlinX8664GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788302 | ORPH ...nX8664MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788304 | ORPH ...BootlinX8664MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788307 | ORPH ...8664UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788309 | ORPH ...otlinX8664UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788311 | ORPH ...orei7GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788312 | ORPH ...X8664corei7GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788314 | ORPH ...corei7MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788315 | ORPH ...nX8664corei7MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788317 | ORPH ...rei7UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788318 | ORPH ...8664corei7UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788319 | ORPH ...664v2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788320 | ORPH ...tlinX8664v2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788322 | ORPH ...8664v2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788323 | ORPH ...otlinX8664v2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788324 | ORPH ...64v2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788325 | ORPH ...linX8664v2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788326 | ORPH ...664v3GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788327 | ORPH ...tlinX8664v3GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788328 | ORPH ...8664v3MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788329 | ORPH ...otlinX8664v3MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788330 | ORPH ...64v3UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788331 | ORPH ...linX8664v3UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788332 | ORPH ...664v4GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788333 | ORPH ...tlinX8664v4GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788334 | ORPH ...8664v4MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788335 | ORPH ...otlinX8664v4MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788336 | ORPH ...64v4UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788337 | ORPH ...linX8664v4UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788338 | ORPH ...core2GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788339 | ORPH ...linX86core2GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788340 | ORPH ...6core2MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788341 | ORPH ...tlinX86core2MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788342 | ORPH ...ore2UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788343 | ORPH ...inX86core2UclibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788344 | ORPH ...6i686GlibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788345 | ORPH ...tlinX86i686GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788346 | ORPH ...86i686MuslBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788347 | ORPH ...otlinX86i686MuslStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788348 | ORPH ...i686UclibcBleedingEdge | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788349 | ORPH ...ToolchainBuildrootMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788060 | ORPH ...olchainBuildrootuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788061 | ORPH ...xternalToolchainCCache | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788062 | ORPH ...ernalToolchainCtngMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788063 | ORPH ...rnalToolchainLinaroArm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788064 | ORPH ...ToolchainSourceryArmv4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788065 | ORPH ...ToolchainSourceryArmv5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788066 | ORPH ...ToolchainSourceryArmv7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788067 | ORPH TestF2FS | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787684 | ORPH TestFileCapabilities | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787631 | ORPH TestFortifyConserv | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787633 | ORPH TestFortifyNone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787634 | ORPH TestGdbArc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787803 | ORPH TestGdbFullTarget | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787805 | ORPH ...GdbHostOnlyAllFeatures | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787807 | ORPH TestGdbHostOnlyDefault | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787810 | ORPH TestGdbserverOnly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787814 | ORPH TestGitHash | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787659 | ORPH TestGitHub | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787662 | ORPH TestGitLab | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787664 | ORPH TestGitRefs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787661 | ORPH TestGlibcAllTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787654 | ORPH ...DefaultLimitedTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787655 | ORPH TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787815 | ORPH TestGnupg2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787818 | ORPH TestGrubAArch64EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787621 | ORPH TestGrubX8664EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787622 | ORPH TestGrubi386BIOS | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787623 | ORPH TestGrubi386EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787625 | ORPH TestGst1Python | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787821 | ORPH TestHWLoc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787826 | ORPH TestHighway | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787823 | ORPH TestHostBmapTools | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787782 | ORPH TestIPythonPy3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787829 | ORPH TestInitSystemBusyboxRo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787726 | ORPH ...InitSystemBusyboxRoNet | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787728 | ORPH TestInitSystemBusyboxRw | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787730 | ORPH ...InitSystemBusyboxRwNet | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787733 | ORPH TestInitSystemNone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787734 | ORPH ...InitSystemOpenrcRoFull | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787738 | ORPH ...InitSystemOpenrcRwFull | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787740 | ORPH ...nitSystemSystemdRoFull | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787744 | ORPH ...ystemSystemdRoIfupdown | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787747 | ORPH ...mdRoIfupdownDbusbroker | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787750 | ORPH ...IfupdownDbusbrokerDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787753 | ORPH ...ystemSystemdRoNetworkd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787756 | ORPH ...nitSystemSystemdRwFull | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787758 | ORPH ...ystemSystemdRwIfupdown | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787761 | ORPH ...mdRwIfupdownDbusbroker | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787765 | ORPH ...IfupdownDbusbrokerDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787767 | ORPH ...ystemSystemdRwNetworkd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787770 | ORPH TestIso9660Grub2EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787685 | ORPH TestIso9660Grub2External | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787689 | ORPH ...0Grub2ExternalCompress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787692 | ORPH TestIso9660Grub2Hybrid | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787695 | ORPH TestIso9660Grub2Internal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787699 | ORPH ...so9660SyslinuxExternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787702 | ORPH ...slinuxExternalCompress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787704 | ORPH ...so9660SyslinuxInternal | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787707 | ORPH TestJffs2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787710 | ORPH TestLibJXL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787835 | ORPH TestLibshdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787837 | ORPH TestLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787848 | ORPH TestLuaHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787875 | ORPH TestLuaInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787878 | ORPH TestLuaLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787841 | ORPH TestLuaLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787844 | ORPH TestLuaLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787854 | ORPH TestLuaLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787857 | ORPH TestLuaLuaCffi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787862 | ORPH TestLuaLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787863 | ORPH TestLuaLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787893 | ORPH TestLuaLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787895 | ORPH TestLuaLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787872 | ORPH TestLuaLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787897 | ORPH TestLuaLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787884 | ORPH TestLuaLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787901 | ORPH TestLuaLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787886 | ORPH TestLuaLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787903 | ORPH TestLuaLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787905 | ORPH TestLuaLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787869 | ORPH TestLuaLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787899 | ORPH TestLuaLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787907 | ORPH TestLuaLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787891 | ORPH TestLuaLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787881 | ORPH TestLuaLzlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787911 | ORPH TestLuaRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788038 | ORPH TestLuaUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787889 | ORPH TestLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787851 | ORPH TestLuajitHttp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787877 | ORPH TestLuajitInotify | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787880 | ORPH TestLuajitLPeg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787843 | ORPH TestLuajitLsqlite3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787846 | ORPH TestLuajitLuaArgon2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787855 | ORPH TestLuajitLuaAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787859 | ORPH TestLuajitLuaCqueues | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787866 | ORPH TestLuajitLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787894 | ORPH TestLuajitLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787896 | ORPH TestLuajitLuaGD | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787873 | ORPH TestLuajitLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787898 | ORPH TestLuajitLuaLyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787885 | ORPH TestLuajitLuaPosix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787902 | ORPH TestLuajitLuaSDL2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787888 | ORPH TestLuajitLuaSec | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787904 | ORPH TestLuajitLuaSocket | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787906 | ORPH TestLuajitLuacURL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787870 | ORPH TestLuajitLuaossl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787900 | ORPH TestLuajitLuasyslog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787908 | ORPH TestLuajitLuazlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787892 | ORPH TestLuajitLunix | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787882 | ORPH TestLuajitRings | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788039 | ORPH TestLuajitTurbolua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788050 | ORPH TestLuajitUtf8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787890 | ORPH TestLuvi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787909 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787910 | ORPH TestMender | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787912 | ORPH TestMsrTools | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787913 | ORPH TestNcdu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787914 | ORPH TestNetdata | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787915 | ORPH TestNoTimezone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787657 | ORPH TestNodeJSBasic | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787916 | ORPH TestNodeJSModule | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787917 | ORPH TestOci | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787712 | ORPH TestOctave | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787918 | ORPH TestOla | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787920 | ORPH TestOpenJdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787921 | ORPH TestOpenSshGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787922 | ORPH TestOpenSshuClibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787923 | ORPH TestOpkg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787924 | ORPH TestPerftest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787925 | ORPH TestPerl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787926 | ORPH TestPerlClassLoad | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787927 | ORPH TestPerlDBDmysql | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787928 | ORPH TestPerlEncodeDetect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787929 | ORPH TestPerlGDGraph | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787930 | ORPH TestPerlHTMLParser | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787931 | ORPH TestPerlIOSocketMulticast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787932 | ORPH TestPerlIOSocketSSL | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787933 | ORPH TestPerlLWPProtocolhttps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787935 | ORPH TestPerlMailDKIM | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787936 | ORPH TestPerlX10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787937 | ORPH TestPerlXMLLibXML | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787938 | ORPH TestPerllibwwwperl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787934 | ORPH TestPhpApcu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787939 | ORPH TestPhpLuaLua | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787940 | ORPH TestPhpLuaLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787941 | ORPH TestPhpPam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787942 | ORPH TestPhpPeclDbus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787943 | ORPH TestPixz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787944 | ORPH TestPolkitInitd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787945 | ORPH TestPolkitSystemd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787946 | ORPH TestPostScripts | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787639 | ORPH TestProsodyLua51 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787947 | ORPH TestProsodyLuajit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787948 | ORPH TestPy3BmapTools | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787786 | ORPH TestPyNdiff | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788009 | ORPH TestPython3Py | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787949 | ORPH TestPython3PyPyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787950 | ORPH TestPython3Pyc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787951 | ORPH TestPythonAugeas | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787955 | ORPH TestPythonAvro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787958 | ORPH TestPythonPahoMQTT | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788003 | ORPH TestPythonPy3Aexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787952 | ORPH TestPythonPy3Argh | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787953 | ORPH TestPythonPy3Attrs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787954 | ORPH TestPythonPy3Autobahn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787956 | ORPH TestPythonPy3Automat | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787957 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787959 | ORPH TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787960 | ORPH TestPythonPy3Botocore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787961 | ORPH TestPythonPy3Can | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787963 | ORPH TestPythonPy3Cbor | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787964 | ORPH TestPythonPy3Click | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787965 | ORPH TestPythonPy3Colorzero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787966 | ORPH TestPythonPy3Constantly | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787968 | ORPH TestPythonPy3Construct | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787970 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787972 | ORPH TestPythonPy3Cryptography | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787973 | ORPH TestPythonPy3DBusFast | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787975 | ORPH TestPythonPy3DBusNext | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787977 | ORPH TestPythonPy3Dicttoxml2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787979 | ORPH TestPythonPy3Distro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787980 | ORPH TestPythonPy3Django | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787982 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787984 | ORPH TestPythonPy3Flask | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787986 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787987 | ORPH TestPythonPy3Git | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787989 | ORPH TestPythonPy3Gitdb2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787991 | ORPH TestPythonPy3GnuPG | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787993 | ORPH TestPythonPy3Gobject | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787994 | ORPH TestPythonPy3Gpiozero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787995 | ORPH TestPythonPy3Hkdf | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787996 | ORPH TestPythonPy3Incremental | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787997 | ORPH TestPythonPy3Iptables | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787999 | ORPH TestPythonPy3Jmespath | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788000 | ORPH TestPythonPy3Libftdi1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787832 | ORPH ...PythonPy3MagicWormhole | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788001 | ORPH TestPythonPy3Munch | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788002 | ORPH TestPythonPy3Passlib | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788004 | ORPH TestPythonPy3Pexpect | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788005 | ORPH TestPythonPy3PyAlsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788006 | ORPH TestPythonPy3Pynacl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788008 | ORPH TestPythonPy3Pytest | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788010 | ORPH ...PythonPy3PytestAsyncio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788011 | ORPH TestPythonPy3Pyyaml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788012 | ORPH TestPythonPy3Qrcode | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788013 | ORPH TestPythonPy3RSA | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788015 | ORPH TestPythonPy3RpiGpio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788014 | ORPH TestPythonPy3S3transfer | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788017 | ORPH TestPythonPy3SciPy | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788018 | ORPH ...thonPy3ServiceIdentity | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788019 | ORPH TestPythonPy3Smmap2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788020 | ORPH TestPythonPy3Spake2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788021 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788023 | ORPH TestPythonPy3Twisted | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788025 | ORPH TestPythonPy3Txaio | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788027 | ORPH TestPythonPy3Txtorcon | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788029 | ORPH TestPythonPy3Ubjson | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788030 | ORPH ...y3UnitTestXmlReporting | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788032 | ORPH TestPythonPy3rtoml | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788016 | ORPH TestPythonPybind | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788007 | ORPH TestRdmaCore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788034 | ORPH TestRedis | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788037 | ORPH TestRelro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787635 | ORPH TestRelroPartial | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787636 | ORPH TestRootPassword | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787640 | ORPH TestRootfsOverlay | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787642 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788040 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788041 | ORPH TestS6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788042 | ORPH TestS6Networking | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788043 | ORPH TestS6PortableUtils | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788045 | ORPH TestS6Rc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788046 | ORPH TestSCP | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787665 | ORPH TestSELinuxCustomGit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787645 | ORPH TestSELinuxExtraModules | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787648 | ORPH ...ELinuxExtraModulesDirs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787649 | ORPH TestSELinuxPackage | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787652 | ORPH TestSELinuxSystemdExt4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787773 | ORPH ...SELinuxSystemdSquashfs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787776 | ORPH TestSFTP | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787666 | ORPH TestSquashfs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787714 | ORPH TestSquashfsMaxBlocksize | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787717 | ORPH TestSquashfsMinBlocksize | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787718 | ORPH TestSspNone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787637 | ORPH TestSspStrong | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787638 | ORPH TestSudo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788047 | ORPH TestSysLinuxX86EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787626 | ORPH TestSysLinuxX86LegacyBios | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787627 | ORPH TestSysLinuxX86_64EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787628 | ORPH ...sLinuxX86_64LegacyBios | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787629 | ORPH TestSyslogNg | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788048 | ORPH TestTmux | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788049 | ORPH TestUbi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787720 | ORPH TestUbootOpensslPkgConfig | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788051 | ORPH TestYaffs2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804787723 | ORPH TestZ3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788052 | ORPH TestZerofree | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788053 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788054 | ORPH TestZfsMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788055 | ORPH TestZfsUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3804788056 | ORPH -- http://autobuild.buildroot.net From peter at korsgaard.com Fri Feb 24 07:35:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 24 Feb 2023 08:35:59 +0100 Subject: [Buildroot] [PATCH 1/1] utils/test-pkg: proper output on host without jq installed In-Reply-To: <20230207165109.GJ4124@scaer> (Yann E. MORIN's message of "Tue, 7 Feb 2023 17:51:09 +0100") References: <20221012164831.10476-1-sebastien.szymanski@armadeus.com> <20230207165109.GJ4124@scaer> Message-ID: <87edqfplb4.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > S?bastien, All, > On 2022-10-12 18:48 +0200, S?bastien Szymanski spake thusly: >> On host without jq installed, test-pkg's output is as following: >> >> $ ./utils/test-pkg -p mmc-utils >> bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) >> JQ IS >> OK >> bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) >> JQ IS >> OK >> bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) >> ... >> >> Since test-pkg handles this case we can hide this error message and have >> proper output: >> >> $ ./utils/test-pkg -p mmc-utils >> bootlin-armv5-uclibc [1/6]: OK >> bootlin-armv7-glibc [2/6]: OK >> bootlin-armv7m-uclibc [3/6]: OK >> >> Signed-off-by: S?bastien Szymanski > Applied to master, thanks. Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Feb 24 07:35:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 24 Feb 2023 08:35:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] utils/test-pkg: proper output on host without jq installed Message-ID: <20230224073609.A805686A03@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c4fb99b80ae2925e04676cfc9ecffd0c35c430c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x On host without jq installed, test-pkg's output is as following: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) ... Since test-pkg handles this case we can hide this error message and have proper output: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK Signed-off-by: S??bastien Szymanski Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 09ac5a9e18e96ba6d3cd13e5e8d34aeccfcb603d) Signed-off-by: Peter Korsgaard --- utils/test-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test-pkg b/utils/test-pkg index 4ebfd9af66..e7f5464817 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -201,7 +201,7 @@ build_one() { # Validate that we generate proper json as show-info { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; - JQ="$(which jq)" + JQ="$(which jq 2> /dev/null)" if [ -z "${JQ}" ]; then make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 JQ="${dir}/host/bin/jq" From peter at korsgaard.com Fri Feb 24 07:35:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 24 Feb 2023 08:35:16 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] utils/test-pkg: proper output on host without jq installed Message-ID: <20230224073716.4F3A386A0B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=626cd6827cb2ac8caee295350195fe282121807f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x On host without jq installed, test-pkg's output is as following: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7-glibc [2/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) JQ IS OK bootlin-armv7m-uclibc [3/6]: which: no jq in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/14/bin:/usr/lib/llvm/13/bin:/usr/lib64/opencascade/bin) ... Since test-pkg handles this case we can hide this error message and have proper output: $ ./utils/test-pkg -p mmc-utils bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK Signed-off-by: S??bastien Szymanski Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 09ac5a9e18e96ba6d3cd13e5e8d34aeccfcb603d) Signed-off-by: Peter Korsgaard --- utils/test-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test-pkg b/utils/test-pkg index 4ebfd9af66..e7f5464817 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -201,7 +201,7 @@ build_one() { # Validate that we generate proper json as show-info { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; - JQ="$(which jq)" + JQ="$(which jq 2> /dev/null)" if [ -z "${JQ}" ]; then make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 JQ="${dir}/host/bin/jq" From d.lang at abatec.at Fri Feb 24 08:42:18 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:42:18 +0000 Subject: [Buildroot] [PATCH 0/6] package/gtkmm3: duplicate needed packages Message-ID: As discussed some time ago [0], gtkmm3 doesn't support newer versions of the other C++ binding packages. According to the gtkmm mailing list [1] there were no plans to every support them, back then the API change was introduced in all the other packages. gtkmm4, which targets libgtk4 supports them. Recent interest in gtkmm3 let me to try and put together a series that would duplicate the needed packages. The alternative to this series would be to drop gtkmm3. All of them support installing and using both versions side-by-side. [0]: https://lists.buildroot.org/pipermail/buildroot/2021-October/625850.html [1]: https://mail.gnome.org/archives/gtkmm-list/2021-May/msg00000.html [2]: https://lists.buildroot.org/pipermail/buildroot/2023-February/661803.html Daniel Lang (6): package/libsigc2: new package package/glibmm2_66: new package package/atkmm2_28: new package package/cairomm1_14: new package package/pangomm2_46: new package package/gtkmm3: use correct versions of mm packages DEVELOPERS | 10 ++++++++++ package/Config.in | 5 +++++ package/atkmm/Config.in | 2 +- package/atkmm2_28/Config.in | 23 +++++++++++++++++++++++ package/atkmm2_28/atkmm2_28.hash | 5 +++++ package/atkmm2_28/atkmm2_28.mk | 16 ++++++++++++++++ package/cairomm/Config.in | 2 +- package/cairomm1_14/Config.in | 22 ++++++++++++++++++++++ package/cairomm1_14/cairomm1_14.hash | 3 +++ package/cairomm1_14/cairomm1_14.mk | 16 ++++++++++++++++ package/glibmm/Config.in | 2 +- package/glibmm2_66/Config.in | 21 +++++++++++++++++++++ package/glibmm2_66/glibmm2_66.hash | 5 +++++ package/glibmm2_66/glibmm2_66.mk | 23 +++++++++++++++++++++++ package/gtkmm3/Config.in | 16 ++++++++-------- package/gtkmm3/gtkmm3.mk | 2 +- package/libsigc/Config.in | 2 +- package/libsigc2/Config.in | 17 +++++++++++++++++ package/libsigc2/libsigc2.hash | 5 +++++ package/libsigc2/libsigc2.mk | 19 +++++++++++++++++++ package/pangomm/Config.in | 2 +- package/pangomm2_46/Config.in | 25 +++++++++++++++++++++++++ package/pangomm2_46/pangomm2_46.hash | 5 +++++ package/pangomm2_46/pangomm2_46.mk | 16 ++++++++++++++++ 24 files changed, 250 insertions(+), 14 deletions(-) create mode 100644 package/atkmm2_28/Config.in create mode 100644 package/atkmm2_28/atkmm2_28.hash create mode 100644 package/atkmm2_28/atkmm2_28.mk create mode 100644 package/cairomm1_14/Config.in create mode 100644 package/cairomm1_14/cairomm1_14.hash create mode 100644 package/cairomm1_14/cairomm1_14.mk create mode 100644 package/glibmm2_66/Config.in create mode 100644 package/glibmm2_66/glibmm2_66.hash create mode 100644 package/glibmm2_66/glibmm2_66.mk create mode 100644 package/libsigc2/Config.in create mode 100644 package/libsigc2/libsigc2.hash create mode 100644 package/libsigc2/libsigc2.mk create mode 100644 package/pangomm2_46/Config.in create mode 100644 package/pangomm2_46/pangomm2_46.hash create mode 100644 package/pangomm2_46/pangomm2_46.mk -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:42:34 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:42:34 +0000 Subject: [Buildroot] [PATCH 1/6] package/libsigc2: new package Message-ID: This is the version of libsigc needed for gtkmm3. Signed-off-by: Daniel Lang --- DEVELOPERS | 1 + package/Config.in | 1 + package/libsigc/Config.in | 2 +- package/libsigc2/Config.in | 17 +++++++++++++++++ package/libsigc2/libsigc2.hash | 5 +++++ package/libsigc2/libsigc2.mk | 19 +++++++++++++++++++ 6 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 package/libsigc2/Config.in create mode 100644 package/libsigc2/libsigc2.hash create mode 100644 package/libsigc2/libsigc2.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6256576e02..e6fa139bd5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -642,6 +642,7 @@ F: package/dacapo/ N: Daniel Lang F: package/dbus-cxx/ F: package/libsigc/ +F: package/libsigc2/ F: package/paho-mqtt-cpp/ N: Damien Lanson diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..18327ef3d3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2096,6 +2096,7 @@ menu "Other" source "package/libseccomp/Config.in" source "package/libshdata/Config.in" source "package/libsigc/Config.in" + source "package/libsigc2/Config.in" source "package/libsigsegv/Config.in" source "package/libsolv/Config.in" source "package/libspatialindex/Config.in" diff --git a/package/libsigc/Config.in b/package/libsigc/Config.in index 428774a3ab..4bea596579 100644 --- a/package/libsigc/Config.in +++ b/package/libsigc/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_LIBSIGC - bool "libsigc++" + bool "libsigc++ (latest)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_INSTALL_LIBSTDCPP help diff --git a/package/libsigc2/Config.in b/package/libsigc2/Config.in new file mode 100644 index 0000000000..e302e27af0 --- /dev/null +++ b/package/libsigc2/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_LIBSIGC2 + bool "libsigc++ (2.x.x)" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_INSTALL_LIBSTDCPP + help + libsigc++ implements a typesafe callback system for standard + C++. It allows you to define signals and to connect those + signals to any callback function, either global or a member + function, regardless of whether it is static or virtual. + + This is the last version before the API and ABI change + introduced in 3.0.0 which requires C++17. + + https://libsigcplusplus.github.io/libsigcplusplus/ + +comment "libsigc++ (2.x.x) needs a toolchain w/ C++, gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libsigc2/libsigc2.hash b/package/libsigc2/libsigc2.hash new file mode 100644 index 0000000000..4811213568 --- /dev/null +++ b/package/libsigc2/libsigc2.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/libsigc++/2.12/libsigc++-2.12.0.sha256sum +sha256 1c466d2e64b34f9b118976eb21b138c37ed124d0f61497df2a90ce6c3d9fa3b5 libsigc++-2.12.0.tar.xz + +# Locally calculated +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/libsigc2/libsigc2.mk b/package/libsigc2/libsigc2.mk new file mode 100644 index 0000000000..845d03ba85 --- /dev/null +++ b/package/libsigc2/libsigc2.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# libsigc2 +# +################################################################################ + +LIBSIGC2_VERSION_MAJOR = 2.12 +LIBSIGC2_VERSION = $(LIBSIGC2_VERSION_MAJOR).0 +LIBSIGC2_SOURCE = libsigc++-$(LIBSIGC2_VERSION).tar.xz +LIBSIGC2_SITE = https://download.gnome.org/sources/libsigc++/$(LIBSIGC2_VERSION_MAJOR) +LIBSIGC2_INSTALL_STAGING = YES +LIBSIGC2_LICENSE = LGPL-2.1+ +LIBSIGC2_LICENSE_FILES = COPYING +LIBSIGC2_CONF_OPTS = \ + -Dbuild-examples=false \ + -Dbuild-tests=false \ + -Dvalidation=false + +$(eval $(meson-package)) -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:42:44 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:42:44 +0000 Subject: [Buildroot] [PATCH 2/6] package/glibmm2_66: new package Message-ID: This is the version needed for gtkmm3. Signed-off-by: Daniel Lang --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/glibmm/Config.in | 2 +- package/glibmm2_66/Config.in | 21 +++++++++++++++++++++ package/glibmm2_66/glibmm2_66.hash | 5 +++++ package/glibmm2_66/glibmm2_66.mk | 23 +++++++++++++++++++++++ 6 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 package/glibmm2_66/Config.in create mode 100644 package/glibmm2_66/glibmm2_66.hash create mode 100644 package/glibmm2_66/glibmm2_66.mk diff --git a/DEVELOPERS b/DEVELOPERS index e6fa139bd5..20ad528243 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -641,6 +641,8 @@ F: package/dacapo/ N: Daniel Lang F: package/dbus-cxx/ +F: package/glibmm/ +F: package/glibmm2_66/ F: package/libsigc/ F: package/libsigc2/ F: package/paho-mqtt-cpp/ diff --git a/package/Config.in b/package/Config.in index 18327ef3d3..f62b1f8b0b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2038,6 +2038,7 @@ menu "Other" source "package/gflags/Config.in" source "package/gli/Config.in" source "package/glibmm/Config.in" + source "package/glibmm2_66/Config.in" source "package/glm/Config.in" source "package/gmp/Config.in" source "package/gobject-introspection/Config.in" diff --git a/package/glibmm/Config.in b/package/glibmm/Config.in index 2dfc861817..b7bed195e9 100644 --- a/package/glibmm/Config.in +++ b/package/glibmm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_GLIBMM - bool "glibmm" + bool "glibmm (latest)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # libglib2 diff --git a/package/glibmm2_66/Config.in b/package/glibmm2_66/Config.in new file mode 100644 index 0000000000..628584cae5 --- /dev/null +++ b/package/glibmm2_66/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_GLIBMM2_66 + bool "glibmm (2.66.x)" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # regex_replace + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSIGC2 + help + The GLibmm package is a set of C++ bindings for GLib. + + This is the last version before the API and ABI change + introduced in 2.68.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "glibmm (2.66.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/glibmm2_66/glibmm2_66.hash b/package/glibmm2_66/glibmm2_66.hash new file mode 100644 index 0000000000..b7d19b261c --- /dev/null +++ b/package/glibmm2_66/glibmm2_66.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/glibmm/2.66/glibmm-2.66.5.sha256sum +sha256 7b384662dd6ec3b86c0570331d32af05db2bd99a791602b767b4a0b2566ec149 glibmm-2.66.5.tar.xz +# License files, locally calculated +sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/glibmm2_66/glibmm2_66.mk b/package/glibmm2_66/glibmm2_66.mk new file mode 100644 index 0000000000..b58c7ca8df --- /dev/null +++ b/package/glibmm2_66/glibmm2_66.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# glibmm2_66 +# +################################################################################ + +GLIBMM2_66_VERSION_MAJOR = 2.66 +GLIBMM2_66_VERSION = $(GLIBMM2_66_VERSION_MAJOR).5 +GLIBMM2_66_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) +GLIBMM2_66_LICENSE_FILES = COPYING COPYING.tools +GLIBMM2_66_SOURCE = glibmm-$(GLIBMM2_66_VERSION).tar.xz +GLIBMM2_66_SITE = https://download.gnome.org/sources/glibmm/$(GLIBMM2_66_VERSION_MAJOR) +GLIBMM2_66_INSTALL_STAGING = YES +GLIBMM2_66_DEPENDENCIES = libglib2 libsigc2 host-pkgconf +GLIBMM2_66_CONF_OPTS = -Dbuild-examples=false + +GLIBMM2_66_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +GLIBMM2_66_CXXFLAGS += -O0 +endif + +$(eval $(meson-package)) -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:42:52 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:42:52 +0000 Subject: [Buildroot] [PATCH 3/6] package/atkmm2_28: new package Message-ID: This is the version needed for gtkmm3. Signed-off-by: Daniel Lang --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/atkmm/Config.in | 2 +- package/atkmm2_28/Config.in | 23 +++++++++++++++++++++++ package/atkmm2_28/atkmm2_28.hash | 5 +++++ package/atkmm2_28/atkmm2_28.mk | 16 ++++++++++++++++ 6 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 package/atkmm2_28/Config.in create mode 100644 package/atkmm2_28/atkmm2_28.hash create mode 100644 package/atkmm2_28/atkmm2_28.mk diff --git a/DEVELOPERS b/DEVELOPERS index 20ad528243..a1294addea 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -640,6 +640,8 @@ N: Daniel J. Leach F: package/dacapo/ N: Daniel Lang +F: package/atkmm/ +F: package/atkmm2_28/ F: package/dbus-cxx/ F: package/glibmm/ F: package/glibmm2_66/ diff --git a/package/Config.in b/package/Config.in index f62b1f8b0b..03fcd9096c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1557,6 +1557,7 @@ menu "Graphics" source "package/at-spi2-core/Config.in" source "package/atk/Config.in" source "package/atkmm/Config.in" + source "package/atkmm2_28/Config.in" source "package/bayer2rgb-neon/Config.in" source "package/bullet/Config.in" source "package/cairo/Config.in" diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in index aa58f8d593..1f370356ea 100644 --- a/package/atkmm/Config.in +++ b/package/atkmm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_ATKMM - bool "atkmm" + bool "atkmm (latest)" depends on BR2_INSTALL_LIBSTDCPP # glibmm depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 diff --git a/package/atkmm2_28/Config.in b/package/atkmm2_28/Config.in new file mode 100644 index 0000000000..2340465b20 --- /dev/null +++ b/package/atkmm2_28/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_ATKMM2_28 + bool "atkmm (2.28.x)" + depends on BR2_INSTALL_LIBSTDCPP # glibmm + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 + depends on BR2_USE_MMU # atk/glibmm -> libglib2 + depends on BR2_USE_WCHAR # atk/glibmm -> libglib2 + select BR2_PACKAGE_ATK + select BR2_PACKAGE_GLIBMM2_66 + select BR2_PACKAGE_LIBSIGC2 + + help + The atkmm package is a set of C++ bindings for Atk. + + This is the last version before the API and ABI change + introduced in 2.36.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "atkmm (2.28.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/atkmm2_28/atkmm2_28.hash b/package/atkmm2_28/atkmm2_28.hash new file mode 100644 index 0000000000..776c9851b8 --- /dev/null +++ b/package/atkmm2_28/atkmm2_28.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/atkmm/2.28/atkmm-2.28.3.sha256sum +sha256 7c2088b486a909be8da2b18304e56c5f90884d1343c8da7367ea5cd3258b9969 atkmm-2.28.3.tar.xz +# locally computed +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/atkmm2_28/atkmm2_28.mk b/package/atkmm2_28/atkmm2_28.mk new file mode 100644 index 0000000000..dc57363cf5 --- /dev/null +++ b/package/atkmm2_28/atkmm2_28.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# atkmm2_28 +# +################################################################################ + +ATKMM2_28_VERSION_MAJOR = 2.28 +ATKMM2_28_VERSION = $(ATKMM2_28_VERSION_MAJOR).3 +ATKMM2_28_SOURCE = atkmm-$(ATKMM2_28_VERSION).tar.xz +ATKMM2_28_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM2_28_VERSION_MAJOR) +ATKMM2_28_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) +ATKMM2_28_LICENSE_FILES = COPYING COPYING.tools +ATKMM2_28_INSTALL_STAGING = YES +ATKMM2_28_DEPENDENCIES = atk glibmm2_66 libsigc2 host-pkgconf + +$(eval $(meson-package)) -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:42:58 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:42:58 +0000 Subject: [Buildroot] [PATCH 4/6] package/cairomm1_14: new package Message-ID: This is the version needed by gtkmm3. Signed-off-by: Daniel Lang --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/cairomm/Config.in | 2 +- package/cairomm1_14/Config.in | 22 ++++++++++++++++++++++ package/cairomm1_14/cairomm1_14.hash | 3 +++ package/cairomm1_14/cairomm1_14.mk | 16 ++++++++++++++++ 6 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 package/cairomm1_14/Config.in create mode 100644 package/cairomm1_14/cairomm1_14.hash create mode 100644 package/cairomm1_14/cairomm1_14.mk diff --git a/DEVELOPERS b/DEVELOPERS index a1294addea..de36a0cdcb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -642,6 +642,8 @@ F: package/dacapo/ N: Daniel Lang F: package/atkmm/ F: package/atkmm2_28/ +F: package/cairomm/ +F: package/cairomm1_14/ F: package/dbus-cxx/ F: package/glibmm/ F: package/glibmm2_66/ diff --git a/package/Config.in b/package/Config.in index 03fcd9096c..e5e9d7f875 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1562,6 +1562,7 @@ menu "Graphics" source "package/bullet/Config.in" source "package/cairo/Config.in" source "package/cairomm/Config.in" + source "package/cairomm1_14/Config.in" source "package/chipmunk/Config.in" source "package/exempi/Config.in" source "package/exiv2/Config.in" diff --git a/package/cairomm/Config.in b/package/cairomm/Config.in index dae52f01f7..75f6692b8a 100644 --- a/package/cairomm/Config.in +++ b/package/cairomm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_CAIROMM - bool "cairomm" + bool "cairomm (latest)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 diff --git a/package/cairomm1_14/Config.in b/package/cairomm1_14/Config.in new file mode 100644 index 0000000000..6e767d2428 --- /dev/null +++ b/package/cairomm1_14/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_CAIROMM1_14 + bool "cairomm (1.14.x)" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSIGC2 + help + The cairomm package is a set of C++ bindings for Cairo. + + This is the last version before the API and ABI change + introduced in 1.16.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "cairomm (1.14.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package/cairomm1_14/cairomm1_14.hash b/package/cairomm1_14/cairomm1_14.hash new file mode 100644 index 0000000000..521e7cc546 --- /dev/null +++ b/package/cairomm1_14/cairomm1_14.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 ee12b920b2d47cea1b6e20c367690d726eb22b4ca9fc711db329d03adcc0c8e0 cairomm-1.14.4.tar.gz +sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/package/cairomm1_14/cairomm1_14.mk b/package/cairomm1_14/cairomm1_14.mk new file mode 100644 index 0000000000..5d076ddf0a --- /dev/null +++ b/package/cairomm1_14/cairomm1_14.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# cairomm1_14 +# +################################################################################ + +CAIROMM1_14_VERSION = 1.14.4 +CAIROMM1_14_LICENSE = LGPL-2.0+ +CAIROMM1_14_LICENSE_FILES = COPYING +CAIROMM1_14_SOURCE = cairomm-$(CAIROMM1_14_VERSION).tar.gz +CAIROMM1_14_SITE = https://gitlab.freedesktop.org/cairo/cairomm/-/archive/$(CAIROMM1_14_VERSION) +CAIROMM1_14_INSTALL_STAGING = YES +CAIROMM1_14_DEPENDENCIES = cairo libglib2 libsigc2 host-pkgconf +CAIROMM1_14_CONF_OPTS = -Dbuild-examples=false -Dbuild-tests=false + +$(eval $(meson-package)) -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:43:02 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:43:02 +0000 Subject: [Buildroot] [PATCH 5/6] package/pangomm2_46: new package Message-ID: This is the version needed by gtkmm3. Signed-off-by: Daniel Lang --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/pangomm/Config.in | 2 +- package/pangomm2_46/Config.in | 25 +++++++++++++++++++++++++ package/pangomm2_46/pangomm2_46.hash | 5 +++++ package/pangomm2_46/pangomm2_46.mk | 16 ++++++++++++++++ 6 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 package/pangomm2_46/Config.in create mode 100644 package/pangomm2_46/pangomm2_46.hash create mode 100644 package/pangomm2_46/pangomm2_46.mk diff --git a/DEVELOPERS b/DEVELOPERS index de36a0cdcb..c183c9a2df 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -650,6 +650,8 @@ F: package/glibmm2_66/ F: package/libsigc/ F: package/libsigc2/ F: package/paho-mqtt-cpp/ +F: package/pangomm/ +F: package/pangomm2_46/ N: Damien Lanson F: package/libvdpau/ diff --git a/package/Config.in b/package/Config.in index e5e9d7f875..b940eea2af 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1636,6 +1636,7 @@ menu "Graphics" source "package/openjpeg/Config.in" source "package/pango/Config.in" source "package/pangomm/Config.in" + source "package/pangomm2_46/Config.in" source "package/pixman/Config.in" source "package/poppler/Config.in" source "package/powervr/Config.in" diff --git a/package/pangomm/Config.in b/package/pangomm/Config.in index c23ac4aaa8..6ddad9e6ef 100644 --- a/package/pangomm/Config.in +++ b/package/pangomm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_PANGOMM - bool "pangomm" + bool "pangomm (latest)" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # glibmm/pango depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc diff --git a/package/pangomm2_46/Config.in b/package/pangomm2_46/Config.in new file mode 100644 index 0000000000..772b523c83 --- /dev/null +++ b/package/pangomm2_46/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_PANGOMM2_46 + bool "pangomm (2.46.x)" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz + depends on BR2_INSTALL_LIBSTDCPP # glibmm/pango + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/pango -> libglib2 + depends on BR2_USE_MMU # *mm/pango -> libglib2 + depends on BR2_USE_WCHAR # *mm/pango -> libglib2 + select BR2_PACKAGE_CAIROMM1_14 + select BR2_PACKAGE_GLIBMM2_66 + select BR2_PACKAGE_PANGO + select BR2_PACKAGE_LIBSIGC2 + help + The pangomm package is a set of C++ bindings for Pango. + + This is the last version before the API and ABI change + introduced in 2.48.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "pangomm (2.46.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/pangomm2_46/pangomm2_46.hash b/package/pangomm2_46/pangomm2_46.hash new file mode 100644 index 0000000000..8d05dbc2ff --- /dev/null +++ b/package/pangomm2_46/pangomm2_46.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/pangomm/2.46/pangomm-2.46.3.sha256sum +sha256 410fe04d471a608f3f0273d3a17d840241d911ed0ff2c758a9859c66c6f24379 pangomm-2.46.3.tar.xz +# Locally computed +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/pangomm2_46/pangomm2_46.mk b/package/pangomm2_46/pangomm2_46.mk new file mode 100644 index 0000000000..1725158491 --- /dev/null +++ b/package/pangomm2_46/pangomm2_46.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# pangomm2_46 +# +################################################################################ + +PANGOMM2_46_VERSION_MAJOR = 2.46 +PANGOMM2_46_VERSION = $(PANGOMM2_46_VERSION_MAJOR).3 +PANGOMM2_46_SOURCE = pangomm-$(PANGOMM2_46_VERSION).tar.xz +PANGOMM2_46_SITE = https://download.gnome.org/sources/pangomm/$(PANGOMM2_46_VERSION_MAJOR) +PANGOMM2_46_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) +PANGOMM2_46_LICENSE_FILES = COPYING COPYING.tools +PANGOMM2_46_INSTALL_STAGING = YES +PANGOMM2_46_DEPENDENCIES = glibmm2_66 cairomm1_14 libsigc2 pango host-pkgconf + +$(eval $(meson-package)) -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:43:23 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:43:23 +0000 Subject: [Buildroot] [PATCH 6/6] package/gtkmm3: use correct versions of mm packages Message-ID: Many of the C++ wrapper packages had API changes. These changes where never introduced in gtkmm3, meaning that older, but still maintained versions are needed to build gtkmm3. Fixes: - http://autobuild.buildroot.net/results/172/17263ac51f197031106eb7fd595126a2720f0397 Signed-off-by: Daniel Lang --- DEVELOPERS | 1 + package/gtkmm3/Config.in | 16 ++++++++-------- package/gtkmm3/gtkmm3.mk | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index c183c9a2df..c42ebeb6c9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -647,6 +647,7 @@ F: package/cairomm1_14/ F: package/dbus-cxx/ F: package/glibmm/ F: package/glibmm2_66/ +F: package/gtkmm3/ F: package/libsigc/ F: package/libsigc2/ F: package/paho-mqtt-cpp/ diff --git a/package/gtkmm3/Config.in b/package/gtkmm3/Config.in index 3c1c6f36e8..6b924c856b 100644 --- a/package/gtkmm3/Config.in +++ b/package/gtkmm3/Config.in @@ -1,7 +1,7 @@ -comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 7" +comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \ + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ || !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 \ || !BR2_TOOLCHAIN_HAS_THREADS @@ -14,16 +14,16 @@ config BR2_PACKAGE_GTKMM3 depends on !BR2_nios2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pangomm, libgtk3 -> pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # glibmm, libpangomm -> glibmm/pango - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/libgtk3 -> libglib2 depends on BR2_USE_MMU # *mm/libgtk3 -> libglib2 depends on BR2_USE_WCHAR # *mm/libgtk3 -> libglib2 depends on BR2_PACKAGE_LIBGTK3 - select BR2_PACKAGE_ATKMM - select BR2_PACKAGE_CAIROMM - select BR2_PACKAGE_GLIBMM - select BR2_PACKAGE_LIBSIGC - select BR2_PACKAGE_PANGOMM + select BR2_PACKAGE_ATKMM2_28 + select BR2_PACKAGE_CAIROMM1_14 + select BR2_PACKAGE_GLIBMM2_66 + select BR2_PACKAGE_LIBSIGC2 + select BR2_PACKAGE_PANGOMM2_46 help The gtkmm3 package is a set of C++ bindings for GTK 3. diff --git a/package/gtkmm3/gtkmm3.mk b/package/gtkmm3/gtkmm3.mk index d717c08bd8..8bbcf224e6 100644 --- a/package/gtkmm3/gtkmm3.mk +++ b/package/gtkmm3/gtkmm3.mk @@ -11,6 +11,6 @@ GTKMM3_SITE = https://download.gnome.org/sources/gtkmm/$(GTKMM3_VERSION_MAJOR) GTKMM3_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GTKMM3_LICENSE_FILES = COPYING COPYING.tools GTKMM3_INSTALL_STAGING = YES -GTKMM3_DEPENDENCIES = atkmm cairomm glibmm libgtk3 libsigc pangomm host-pkgconf +GTKMM3_DEPENDENCIES = atkmm2_28 cairomm1_14 glibmm2_66 libgtk3 libsigc2 pangomm2_46 host-pkgconf $(eval $(autotools-package)) -- 2.25.1 From d.lang at abatec.at Fri Feb 24 08:53:24 2023 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 24 Feb 2023 08:53:24 +0000 Subject: [Buildroot] Dependency problem for gtkmm3 In-Reply-To: <87ad276e-999c-2503-4dbb-37f54d2b6e15@mind.be> References: <20230210231454.4f3aedbd@windsurf> <20230213084735.5318a511@windsurf> <87ad276e-999c-2503-4dbb-37f54d2b6e15@mind.be> Message-ID: > On 13/02/2023 15:52, Lang Daniel via buildroot wrote: >> Hi Thomas, Dirk, >> >>> Hello Dirk, >>> >>> On Sun, 12 Feb 2023 08:51:17 +0000 >>> Dirk De Becker wrote: >>> >>>> Thank you for your quick reply. >>>> Will this issue be fixed in the 2023.02 release? >>> >>> It all depends on whether someone submits a fix for the issue. Do you >>> think you could have a look? >> >> The problem comes down to an incompatibility that I tried to point out some >> time ago [0]. Current versions of cairomm, pangomm, glibmm have a different >> ABI that's not supported in gtkmm 3.x.y. >> Even the most recent version of gtkmm 3.24.x doesn't support the current >> version of of the other -mm packages and according to the mailing list of >> gtkmm [1] there are no plans to support it. The are compatible with gtk4. >> >> As it stands gtkmm3 isn't usable and fixing it brings up the same problems >> of duplicating packages. > > So we have two options: > > 1. Drop gtkmm3. It has no internal users. > > 2. Create cairomm112 etc. packages (or whatever the latest working version was) > and live with their unmaintained status. I have just submitted a patch series [0] that would duplicate the needed packages. So far it is only compile tested for all of the toolchains that support it via utils/test-pkg. As it stands right now, all of these pre-API versions are still maintained, each seeing their last release about 5 months ago. If dropping gtkmm3 is the preferred way, let me know. > > Eventually we'll end up with option 1, of course, since gtkmm3 is EOL itself > (they're only working on gtkmm4 AFAIU). Just like libgtk3 gtkmm3 is still being worked on, at least for bug fix releases. > > @Dirk in conclusion: the best you can expect for 2023.02 is for the package to > be dropped, which isn't going to help you, of course. I guess I'm to late with my series for 2023.02. Regards, Daniel > > Regards, > Arnout > > >> >> [0]: https://lists.buildroot.org/pipermail/buildroot/2021-October/625850.html >> [1]: https://mail.gnome.org/archives/gtkmm-list/2021-May/msg00000.html >> >>> >>> Best regards, >>> >>> Thomas >> >> Regards >> Daniel >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Fri Feb 24 09:25:35 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 10:25:35 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/xtables-addons: replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS Message-ID: <20230224092535.306646-1-fontaine.fabrice@gmail.com> Replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS by XTABLES_ADDONS_REMOVE_GEOIP_HELPERS to avoid the following build failure raised since bump to version 3.22 in commit 53f2999edfa5e67923d4d8a102c15fa3200e089c: make[3]: *** No rule to make target '/xt_geoip_query', needed by 'all-am'. Stop. Fixes: - http://autobuild.buildroot.org/results/f2d596b510f027b94a6b1fad10c363922c50cbec Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni): - Add XTABLES_ADDONS_REMOVE_GEOIP_HELPERS package/xtables-addons/xtables-addons.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 77dcfd741c..e794538956 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -16,12 +16,6 @@ XTABLES_ADDONS_CONF_OPTS = \ --with-xtables="$(STAGING_DIR)/usr" \ --with-xtlibdir="/usr/lib/xtables" -# geoip helpers need perl with modules and unzip so disable -define XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - $(SED) 's/ geoip//' $(@D)/Makefile.in -endef -XTABLES_ADDONS_POST_PATCH_HOOKS += XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - define XTABLES_ADDONS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) endef @@ -30,6 +24,15 @@ define XTABLES_ADDONS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install endef +# geoip helpers need perl with modules and unzip so remove them +define XTABLES_ADDONS_REMOVE_GEOIP_HELPERS + $(RM) $(TARGET_DIR)/usr/bin/xt_geoip* + $(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_asn* + $(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_geoip* +endef + +XTABLES_ADDONS_POST_INSTALL_TARGET_HOOKS += XTABLES_ADDONS_REMOVE_GEOIP_HELPERS + define XTABLES_ADDONS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 09:50:45 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 10:50:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/asterisk: fix build with libressl Message-ID: <20230224095045.782119-1-fontaine.fabrice@gmail.com> Fix the following build failure with libressl by using SSL_is_server which is available since version 2.7.0 and https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: iostream.c: In function 'ast_iostream_close': iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} 559 | if (!stream->ssl->server) { | ^~ Fixes: - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 Signed-off-by: Fabrice Fontaine --- ...n-iostream.c-fix-build-with-libressl.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch diff --git a/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch b/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch new file mode 100644 index 0000000000..cdd3aa8cfb --- /dev/null +++ b/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch @@ -0,0 +1,38 @@ +From 9569fa20fec49f530170a3042afb99556cf66a2e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Apr 2022 10:52:42 +0200 +Subject: [PATCH] main/iostream.c: fix build with libressl + +Fix the following build failure with libressl by using SSL_is_server +which is available since version 2.7.0 and +https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: + +iostream.c: In function 'ast_iostream_close': +iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} + 559 | if (!stream->ssl->server) { + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 + +Signed-off-by: Fabrice Fontaine +--- + main/iostream.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main/iostream.c b/main/iostream.c +index d060b6d6d4..b8ab80ec91 100644 +--- a/main/iostream.c ++++ b/main/iostream.c +@@ -553,7 +553,7 @@ int ast_iostream_close(struct ast_iostream *stream) + ERR_error_string(sslerr, err), ssl_error_to_string(sslerr, res)); + } + +-#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if !(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x2070000L)) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + if (!SSL_is_server(stream->ssl)) { + #else + if (!stream->ssl->server) { +-- +2.35.1 + -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 10:10:39 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 11:10:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/libblockdev: needs locale Message-ID: <20230224101039.1445129-1-fontaine.fabrice@gmail.com> locale_t is unconditionally used since version 1.5 and https://github.com/storaged-project/libblockdev/commit/4ed6f0b3a46fc77554dab661c22150829aa75966 resulting in the following build failure since the addition of the package in commit 0c52826291d1884db0f8f35130216065fbc7b574: module.c:33:37: error: unknown type name 'locale_t' 33 | static char *strerror_l(int errnum, locale_t locale UNUSED) | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ede9eb1f13d56c77005cc448416fb2efa9d16ff0 Signed-off-by: Fabrice Fontaine --- package/libblockdev/Config.in | 6 ++++-- package/udisks/Config.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 4389fd794c..4f98621bd8 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBBLOCKDEV depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_ENABLE_LOCALE select BR2_PACKAGE_KMOD select BR2_PACKAGE_LIBGLIB2 help @@ -66,7 +67,8 @@ config BR2_PACKAGE_LIBBLOCKDEV_SWAP endif -comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library" +comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library, locale" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_ENABLE_LOCALE diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 253d5cdc6b..b1d02a31b2 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_UDISKS bool "udisks" - depends on BR2_ENABLE_LOCALE # parted + depends on BR2_ENABLE_LOCALE # libblockdev, parted depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # polkit -> C++17 depends on BR2_TOOLCHAIN_HAS_THREADS # polkit -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 10:17:20 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 11:17:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: add linux-pam optional dependency Message-ID: <20230224101720.1458102-1-fontaine.fabrice@gmail.com> Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=15316 Signed-off-by: Fabrice Fontaine --- package/xscreensaver/xscreensaver.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 6cc7e8febe..dc5f8b7e1e 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -42,6 +42,13 @@ else XSCREENSAVER_CONF_OPTS += --with-png=no endif +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +XSCREENSAVER_CONF_OPTS += --with-pam=yes +XSCREENSAVER_DEPENDENCIES += linux-pam +else +XSCREENSAVER_CONF_OPTS += --with-pam=no +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) XSCREENSAVER_CONF_OPTS += --with-systemd=yes XSCREENSAVER_DEPENDENCIES += systemd -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 10:51:48 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 11:51:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/ntpsec: fix build without stack-protector Message-ID: <20230224105148.1780818-1-fontaine.fabrice@gmail.com> Fix the following build failure without stack-protector raised since the addition of the package in commit 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a: Checking for library ssp : not found Checking for library ssp_nonshared : not found Checking if C compiler supports -fstack-protector-all : yes [...] The configuration failed (complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log) Fixes: - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a - http://autobuild.buildroot.org/results/62be818e2f2eac07b4a2de6f4a8898cc4cc05b1f Signed-off-by: Fabrice Fontaine --- ...pt-fix-build-without-stack-protector.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch diff --git a/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch b/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch new file mode 100644 index 0000000000..f494bf479c --- /dev/null +++ b/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch @@ -0,0 +1,50 @@ +From 0a3ce09c14eb9c7e36aa30a4dafe40e56676d678 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 Feb 2023 11:33:32 +0100 +Subject: [PATCH] wscript: fix build without stack-protector + +-fstack-protector-all can depends on ssp library availability (e.g. on musl) so +move the test from cc_test_flags to ld_hardening_flags, this will avoid the +following build failure: + +Checking for library ssp : not found +Checking for library ssp_nonshared : not found +Checking if C compiler supports -fstack-protector-all : yes + +[...] + +The configuration failed +(complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log) + +Fixes: + - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ntpsec/ntpsec/pull/6] +--- + wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index be396b33b..f301809fc 100644 +--- a/wscript ++++ b/wscript +@@ -298,7 +298,6 @@ def configure(ctx): + ctx.env.LDFLAGS += ["-lssp_nonshared"] + + cc_test_flags = [ +- ('f_stack_protector_all', '-fstack-protector-all'), + ('PIC', '-fPIC'), + ('PIE', '-pie -fPIE'), + # this quiets most of macOS warnings on -fpie +@@ -332,6 +331,7 @@ def configure(ctx): + + # Check which linker flags are supported + ld_hardening_flags = [ ++ ('f_stack_protector_all', '-fstack-protector-all'), + ("z_now", "-Wl,-z,now"), # no deferred symbol resolution + ] + +-- +2.39.1 + -- 2.39.1 From thomas at devoogdt.com Fri Feb 24 11:15:07 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Fri, 24 Feb 2023 12:15:07 +0100 Subject: [Buildroot] [PATCH v1 1/3] pkg-cmake: add option to select the Ninja generator Message-ID: <20230224111509.2434694-1-thomas.devoogdt@barco.com> E.g. Commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213, and 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd can now be replaced by: WEBKITGTK_CMAKE_NINJA = YES Packages that are selecting Ninja, should also use the NINJA_{ENV,OPTS} variables iso the MAKE variables. Signed-off-by: Thomas Devoogdt --- package/pkg-cmake.mk | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 8c375779cb..4ce3e6bada 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -65,6 +65,13 @@ else $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build endif +ifeq ($$($(3)_CMAKE_NINJA),YES) +$(2)_DEPENDENCIES += host-ninja +$(2)_GENERATOR = "Ninja" +else +$(2)_GENERATOR = "Unix Makefiles" +endif + # # Configure step. Only define it if not already defined by the package # .mk file. And take care of the differences between host and target @@ -88,7 +95,7 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ @@ -119,7 +126,7 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -165,45 +172,75 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) # ifndef $(2)_BUILD_CMDS ifeq ($(4),target) +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_BUILD_CMDS + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) +endef +else define $(2)_BUILD_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) endef +endif +else +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_BUILD_CMDS + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) +endef else define $(2)_BUILD_CMDS $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif endif +endif # # Host installation step. Only define it if not already defined by the # package .mk file. # ifndef $(2)_INSTALL_CMDS +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_INSTALL_CMDS + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) +endef +else define $(2)_INSTALL_CMDS $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif +endif # # Staging installation step. Only define it if not already defined by # the package .mk file. # ifndef $(2)_INSTALL_STAGING_CMDS +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_INSTALL_STAGING_CMDS + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR install +endef +else define $(2)_INSTALL_STAGING_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif +endif # # Target installation step. Only define it if not already defined by # the package .mk file. # ifndef $(2)_INSTALL_TARGET_CMDS +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_INSTALL_TARGET_CMDS + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install +endef +else define $(2)_INSTALL_TARGET_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif +endif # Call the generic package infrastructure to generate the necessary # make targets -- 2.39.2 From thomas at devoogdt.com Fri Feb 24 11:15:09 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Fri, 24 Feb 2023 12:15:09 +0100 Subject: [Buildroot] [PATCH v1 3/3] package/wpewebkit: use the CMAKE_NINJA flag In-Reply-To: <20230224111509.2434694-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-1-thomas.devoogdt@barco.com> Message-ID: <20230224111509.2434694-3-thomas.devoogdt@barco.com> Replaces: commit 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd Author: Peter Korsgaard Date: Thu Feb 9 18:07:06 2023 +0100 package/wpewebkit: Build with ninja Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Devoogdt --- package/wpewebkit/wpewebkit.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 48e5c2f8cd..c1b5dee121 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -14,6 +14,7 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit +WPEWEBKIT_CMAKE_NINJA = YES WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo @@ -103,23 +104,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# wpewebkit needs cmake >= 3.20 when building with the make backend, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WPEWEBKIT_CONF_OPTS += -GNinja -WPEWEBKIT_DEPENDENCIES += host-ninja - -define WPEWEBKIT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - $(eval $(cmake-package)) -- 2.39.2 From thomas at devoogdt.com Fri Feb 24 11:15:08 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Fri, 24 Feb 2023 12:15:08 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/webkitgtk: use the CMAKE_NINJA flag In-Reply-To: <20230224111509.2434694-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-1-thomas.devoogdt@barco.com> Message-ID: <20230224111509.2434694-2-thomas.devoogdt@barco.com> Replaces: commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 Author: Peter Korsgaard Date: Thu Feb 9 18:07:05 2023 +0100 package/webkitgtk: Build with ninja Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Devoogdt --- package/webkitgtk/webkitgtk.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 3263f7fea0..b43f97f0ca 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -13,6 +13,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk +WEBKITGTK_CMAKE_NINJA = YES WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 @@ -139,23 +140,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# webkitgtk needs cmake >= 3.20 when not building with ninja, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WEBKITGTK_CONF_OPTS += -GNinja -WEBKITGTK_DEPENDENCIES += host-ninja - -define WEBKITGTK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - $(eval $(cmake-package)) -- 2.39.2 From fontaine.fabrice at gmail.com Fri Feb 24 11:21:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 12:21:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix libcurl build In-Reply-To: <20230220214423.1a42a0e5@windsurf> References: <20230220093336.77462-1-fontaine.fabrice@gmail.com> <20230220214423.1a42a0e5@windsurf> Message-ID: Hello, Le lun. 20 f?vr. 2023 ? 21:44, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > Hello Fabrice, > > On Mon, 20 Feb 2023 10:33:36 +0100 > Fabrice Fontaine wrote: > > > Fix the following libcurl build failure: > > > > In file included from > /tmp/instance-1/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/include/curl/curl.h:3195, > > from ../../../../include/sysinc.h:384, > > from ../../../../include/common.h:23, > > from simple.c:20: > > simple.c: In function 'check_https': > > simple.c:167:65: error: invalid use of void expression > > 167 | if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt > = CURLOPT_USERAGENT, "Zabbix " ZABBIX_VERSION)) || > > | ^ > > > > Fixes: > > - > http://autobuild.buildroot.org/results/053a62e9969046a7f8a0e1890c24d2bfb099ae42 > > > > Signed-off-by: Fabrice Fontaine > > --- > > ...se-parentheses-to-ensure-compilation.patch | 65 +++++++++++++++++++ > > 1 file changed, 65 insertions(+) > > create mode 100644 > package/zabbix/0002-Use-parentheses-to-ensure-compilation.patch > > This was reported to curl upstream in > https://github.com/curl/curl/issues/10148, and apparently fixed in curl > by > > https://github.com/curl/curl/commit/e2aed004302e51cfa5b6ce8c8ab65ef92aa83196 > . > > So it apparently was considered a bug in curl, so perhaps it should be > fixed in curl rather than in zabbix? > Indeed, I'll set this patch as not applicable as the build failure is not raised since commit 14ca6b5fdb6a5e0fa99b04461240772d93076b2e > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Fri Feb 24 11:43:20 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 12:43:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix build with libressl >= 3.5.0 Message-ID: <20230224114320.2152346-1-fontaine.fabrice@gmail.com> Fix the following build failure with libressl >= 3.5.0 raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration 113 | static void OPENSSL_cleanup(void) | ^~~~~~~~~~~~~~~ In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, from ../../../include/zbxcomms.h:65, from tls.c:20: /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' 565 | void OPENSSL_cleanup(void); | ^~~~~~~~~~~~~~~ In file included from tls.c:20: tls.c: In function 'zbx_log_ciphersuites': ../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) | ^~ tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); | ^~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 Signed-off-by: Fabrice Fontaine --- .../0002-fix-build-with-libressl-3.5.0.patch | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 package/zabbix/0002-fix-build-with-libressl-3.5.0.patch diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 0000000000..7e32ad5745 --- /dev/null +++ b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,71 @@ +From 5c8511384f1d41f9c2a131604d5cb2dbc1c0aec9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 Feb 2023 12:23:56 +0100 +Subject: [PATCH] fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration + 113 | static void OPENSSL_cleanup(void) + | ^~~~~~~~~~~~~~~ +In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, + from ../../../include/zbxcomms.h:65, + from tls.c:20: +/home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' + 565 | void OPENSSL_cleanup(void); + | ^~~~~~~~~~~~~~~ +In file included from tls.c:20: +tls.c: In function 'zbx_log_ciphersuites': +../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} + 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) + | ^~ +tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' + 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); + | ^~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent (no feedback on first patch)] +--- + include/zbxcomms.h | 3 ++- + src/libs/zbxcomms/tls.c | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/include/zbxcomms.h b/include/zbxcomms.h +index e7d74dbd0f..d6efa358fe 100644 +--- a/include/zbxcomms.h ++++ b/include/zbxcomms.h +@@ -253,7 +253,8 @@ int zbx_telnet_execute(ZBX_SOCKET socket_fd, const char *command, AGENT_RESULT * + /* TLS BLOCK */ + #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) + +-#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) ++#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL + # if !defined(LIBRESSL_VERSION_NUMBER) + # define OPENSSL_INIT_LOAD_SSL_STRINGS 0 + # define OPENSSL_INIT_LOAD_CRYPTO_STRINGS 0 +diff --git a/src/libs/zbxcomms/tls.c b/src/libs/zbxcomms/tls.c +index 54ab0a6ef4..bd4075b3e4 100644 +--- a/src/libs/zbxcomms/tls.c ++++ b/src/libs/zbxcomms/tls.c +@@ -30,8 +30,9 @@ + #include "zbxstr.h" + #include "zbxtime.h" + +-#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) +-/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ ++#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x300000fL ++/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL (before 3.5.0) */ + + /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and example in crypto/threads/mttest.c) */ + +-- +2.39.1 + -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 13:40:28 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 14:40:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/hawktracer: update URL in Config.in Message-ID: <20230224134028.307983-1-fontaine.fabrice@gmail.com> Current website is down: https://github.com/amzn/hawktracer/issues/87 Signed-off-by: Fabrice Fontaine --- package/hawktracer/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hawktracer/Config.in b/package/hawktracer/Config.in index 7648707404..bee9c27b7d 100644 --- a/package/hawktracer/Config.in +++ b/package/hawktracer/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_HAWKTRACER profiling tool built in Amazon Video for getting performance metrics from low-end devices. - https://www.hawktracer.org/ + https://hawktracer.github.io/ if BR2_PACKAGE_HAWKTRACER -- 2.39.1 From sebastien.szymanski at armadeus.com Fri Feb 24 10:53:15 2023 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Fri, 24 Feb 2023 11:53:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/freescale-imx/imx-gpu-g2d: drop BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES Message-ID: <20230224105315.16171-1-sebastien.szymanski@armadeus.com> Arm and aarch64 packages don't contain examples anymore so drop the config option to install them to prevent build failure when selected: >>> imx-gpu-g2d 6.4.3.p4.4-arm Installing to target mkdir -p /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ cp -a /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/* /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ cp: cannot stat '/home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/*': No such file or directory make: *** [package/pkg-generic.mk:384: /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/.stamp_target_installed] Error 1 Fixes: b84557b588b3 ("package/freescale-imx/imx-gpu-g2d: bump version to 6.4.3.p4.4") Signed-off-by: S?bastien Szymanski --- Config.in.legacy | 6 ++++++ package/freescale-imx/imx-gpu-g2d/Config.in | 9 --------- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 8 -------- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7f69462f2ec1..af1d8cc1dc9f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES + bool "imx-gpu-g2d examples removed" + select BR2_LEGACY + help + The examples are not provided by NXP anymore. + config BR2_KERNEL_HEADERS_6_0 bool "kernel headers version 6.0.x are no longer supported" select BR2_LEGACY diff --git a/package/freescale-imx/imx-gpu-g2d/Config.in b/package/freescale-imx/imx-gpu-g2d/Config.in index aeca087f865b..c143b17c47ff 100644 --- a/package/freescale-imx/imx-gpu-g2d/Config.in +++ b/package/freescale-imx/imx-gpu-g2d/Config.in @@ -18,12 +18,3 @@ config BR2_PACKAGE_IMX_GPU_G2D This library is provided by NXP as-is and doesn't have an upstream. - -if BR2_PACKAGE_IMX_GPU_G2D - -config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES - bool "install examples" - help - Copy the Vivante G2D examples to the target. - -endif diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index d94da24d8f0e..42a1fe70cf11 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -26,15 +26,7 @@ define IMX_GPU_G2D_INSTALL_STAGING_CMDS cp -a $(@D)/g2d/usr/* $(STAGING_DIR)/usr endef -ifeq ($(BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES),y) -define IMX_GPU_G2D_INSTALL_EXAMPLES - mkdir -p $(TARGET_DIR)/usr/share/examples/ - cp -a $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/ -endef -endif - define IMX_GPU_G2D_INSTALL_TARGET_CMDS - $(IMX_GPU_G2D_INSTALL_EXAMPLES) cp -a $(@D)/g2d/usr/lib $(TARGET_DIR)/usr endef -- 2.39.2 From fontaine.fabrice at gmail.com Fri Feb 24 16:15:43 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 17:15:43 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/systemd: fix build with -Ofast Message-ID: <20230224161543.27879-1-fontaine.fabrice@gmail.com> Update -Ofast workaround as suggested by Yann E. Morin to avoid the following build failure raised since bump to version 252.4 in commit a2c823d1f548d5a0120d27d6c000603192360f7b and https://github.com/systemd/systemd/commit/60f97fee2d2f948c8e8963ea8ff767008cb93cae: ../output-1/build/systemd-252.4/meson.build:397:8: ERROR: Problem encountered: -Ofast, -ffast-math, or -ffinite-math-only is specified in c_args. Fixes: - http://autobuild.buildroot.org/results/8f41c4984b645851724e554c3162b83bc312bee7 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni and Yann E. Morin): - Update workaround instead of disabling with -Ofast package/systemd/systemd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index cce9162f6d..63467171ed 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -100,7 +100,7 @@ SYSTEMD_CONF_OPTS += \ SYSTEMD_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_OPTIMIZE_FAST),y) -SYSTEMD_CFLAGS += -O3 +SYSTEMD_CFLAGS += -O3 -fno-finite-math-only endif ifeq ($(BR2_nios2),y) -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 16:31:16 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 17:31:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/hawktracer: bump to 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 Message-ID: <20230224163116.46934-1-fontaine.fabrice@gmail.com> This bump will fix the following build failure with gcc >= 12: /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp: In function 'HT_Thread* ht_thread_create(ht_thread_callback_t, void*)': /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp:1006:28: error: no matching function for call to 'operator new(sizetype, std::thread*)' 1006 | new(&th->th) HT_Thread(); | ^ https://github.com/amzn/hawktracer/compare/e53b07bc812c4cfe8f6253ddb48ac43de8fa74a8...2ec19d71923344148928ef45fce549eda67030a4 Fixes: - http://autobuild.buildroot.org/results/d18a1b2ee6cdcb289567ae90b2d836844427b5f6 Signed-off-by: Fabrice Fontaine --- package/hawktracer/hawktracer.hash | 2 +- package/hawktracer/hawktracer.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hawktracer/hawktracer.hash b/package/hawktracer/hawktracer.hash index 47a8b35b6b..29d00e29ec 100644 --- a/package/hawktracer/hawktracer.hash +++ b/package/hawktracer/hawktracer.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 a48e26082fd644222d4a20ecfd5a34700865cf572d41b7eac5b0c8242fef9c5f hawktracer-2ec19d71923344148928ef45fce549eda67030a4.tar.gz +sha256 099f76d5be18ad5d714fded0c6f889f588986cdde2b31f2c0058413698a5f35c hawktracer-3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5.tar.gz sha256 2f377333e64ad08ad3afec8ed6c2c96ced2a6d7d67443eb2784a931bb7b3fd59 LICENSE diff --git a/package/hawktracer/hawktracer.mk b/package/hawktracer/hawktracer.mk index fd635e350d..462d073755 100644 --- a/package/hawktracer/hawktracer.mk +++ b/package/hawktracer/hawktracer.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAWKTRACER_VERSION = 2ec19d71923344148928ef45fce549eda67030a4 +HAWKTRACER_VERSION = 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 HAWKTRACER_SITE = $(call github,amzn,hawktracer,$(HAWKTRACER_VERSION)) HAWKTRACER_LICENSE = MIT HAWKTRACER_LICENSE_FILES = LICENSE -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 16:40:53 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 17:40:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-gmmlib: needs threads Message-ID: <20230224164053.53287-1-fontaine.fabrice@gmail.com> threads are mandatory since version 19.1.1 and https://github.com/intel/gmmlib/commit/9e4aa143fb7e7e87332fcb7c9871040ff4a1a1da resulting in the following build failure since commit cd206d9b808a322a00294b4caad203a892ed4c92: CMake Error at /home/thomas/autobuild/instance-2/output-1/host/share/cmake-3.22/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find Threads (missing: Threads_FOUND) Fixes: - http://autobuild.buildroot.org/results/c1120932e8c212820b239ee8cd4a057623a73376 Signed-off-by: Fabrice Fontaine --- package/intel-gmmlib/Config.in | 6 ++++-- package/intel-mediadriver/Config.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/intel-gmmlib/Config.in b/package/intel-gmmlib/Config.in index b6f93f7416..a3d0d2610b 100644 --- a/package/intel-gmmlib/Config.in +++ b/package/intel-gmmlib/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_INTEL_GMMLIB depends on BR2_x86_64 depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS help The Intel(R) Graphics Memory Management Library provides device specific and buffer management for the Intel(R) @@ -11,5 +12,6 @@ config BR2_PACKAGE_INTEL_GMMLIB https://github.com/intel/gmmlib -comment "intel-gmmlib needs a toolchain w/ dynamic library, C++" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP +comment "intel-gmmlib needs a toolchain w/ dynamic library, C++, threads" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/intel-mediadriver/Config.in b/package/intel-mediadriver/Config.in index ad56590008..537e4abd2f 100644 --- a/package/intel-mediadriver/Config.in +++ b/package/intel-mediadriver/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER depends on !BR2_STATIC_LIBS # mesa3d, libva depends on BR2_INSTALL_LIBSTDCPP # intel-gmmlib, mesa3d depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d - depends on BR2_TOOLCHAIN_HAS_THREADS # libva + depends on BR2_TOOLCHAIN_HAS_THREADS # intel-gmmlib, libva depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d select BR2_PACKAGE_INTEL_GMMLIB select BR2_PACKAGE_LIBPCIACCESS -- 2.39.1 From fontaine.fabrice at gmail.com Fri Feb 24 16:57:53 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 24 Feb 2023 17:57:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/ntpsec: fix CPE ID version Message-ID: <20230224165753.64394-1-fontaine.fabrice@gmail.com> CPE ID is wrong since the addition of the package in commit 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a, the correct CPE ID is cpe:2.3:a:ntpsec:ntpsec:1.2.2:*:*:*:*:*:*:*, not cpe:2.3:a:ntpsec:ntpsec:1.2:2:*:*:*:*:*:* Signed-off-by: Fabrice Fontaine --- package/ntpsec/ntpsec.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index c7fa2f85a8..e612e982ec 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -4,12 +4,9 @@ # ################################################################################ -NTPSEC_VERSION_MAJOR = 1 -NTPSEC_VERSION_MINOR = 2 -NTPSEC_VERSION_POINT = 2 -NTPSEC_VERSION = $(NTPSEC_VERSION_MAJOR)_$(NTPSEC_VERSION_MINOR)_$(NTPSEC_VERSION_POINT) -NTPSEC_SOURCE = ntpsec-NTPsec_$(NTPSEC_VERSION).tar.bz2 -NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(NTPSEC_VERSION) +NTPSEC_VERSION = 1.2.2 +NTPSEC_SOURCE = ntpsec-NTPsec_$(subst .,_,$(NTPSEC_VERSION)).tar.bz2 +NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(subst .,_,$(NTPSEC_VERSION)) NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT, CC-BY-4.0 (docs) NTPSEC_LICENSE_FILES = \ LICENSES/BSD-2 \ @@ -20,8 +17,6 @@ NTPSEC_LICENSE_FILES = \ docs/copyright.adoc NTPSEC_CPE_ID_VENDOR = ntpsec -NTPSEC_CPE_ID_VERSION = $(NTPSEC_VERSION_MAJOR).$(NTPSEC_VERSION_MINOR) -NTPSEC_CPE_ID_UPDATE = $(NTPSEC_VERSION_POINT) NTPSEC_DEPENDENCIES = \ host-bison \ -- 2.39.1 From john at metanate.com Fri Feb 24 17:53:24 2023 From: john at metanate.com (John Keeping) Date: Fri, 24 Feb 2023 17:53:24 +0000 Subject: [Buildroot] [PATCH v1 1/3] pkg-cmake: add option to select the Ninja generator In-Reply-To: <20230224111509.2434694-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-1-thomas.devoogdt@barco.com> Message-ID: On Fri, Feb 24, 2023 at 12:15:07PM +0100, Thomas Devoogdt wrote: > E.g. Commit > 16e5c92ff5fd2b44a1126bd7d7538c68ce838213, and > 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd > can now be replaced by: WEBKITGTK_CMAKE_NINJA = YES > > Packages that are selecting Ninja, should also use the NINJA_{ENV,OPTS} variables iso the MAKE variables. The current webkitgtk build commands use `cmake --build` and `cmake --install`, wouldn't it be better to use those here? I wonder if it makes more sense to replace anything generator-specific (like $(PKG)_MAKE_OPTS or $(PKG)_NINJA_OPTS) with general $(PKG)_CMAKE_BUILD_OPTS and $(PKG)_CMAKE_INSTALL_OPTS so that packages become independent of the generator. If those options are at the end of the command, then packages still have the option (in the build phase) to pass built-tool specific options by including `--` in the value. > Signed-off-by: Thomas Devoogdt > --- > package/pkg-cmake.mk | 41 +++++++++++++++++++++++++++++++++++++++-- No change in docs/? ;-) > 1 file changed, 39 insertions(+), 2 deletions(-) > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > index 8c375779cb..4ce3e6bada 100644 > --- a/package/pkg-cmake.mk > +++ b/package/pkg-cmake.mk > @@ -65,6 +65,13 @@ else > $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build > endif > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +$(2)_DEPENDENCIES += host-ninja > +$(2)_GENERATOR = "Ninja" > +else > +$(2)_GENERATOR = "Unix Makefiles" > +endif > + > # > # Configure step. Only define it if not already defined by the package > # .mk file. And take care of the differences between host and target > @@ -88,7 +95,7 @@ define $(2)_CONFIGURE_CMDS > rm -f CMakeCache.txt && \ > PATH=$$(BR_PATH) \ > $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > - -G"Unix Makefiles" \ > + -G$$($$(PKG)_GENERATOR) \ > -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ > -DCMAKE_INSTALL_PREFIX="/usr" \ > -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ > @@ -119,7 +126,7 @@ define $(2)_CONFIGURE_CMDS > PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ > $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > - -G"Unix Makefiles" \ > + -G$$($$(PKG)_GENERATOR) \ > -DCMAKE_INSTALL_SO_NO_EXE=0 \ > -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ > -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ > @@ -165,45 +172,75 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) > # > ifndef $(2)_BUILD_CMDS > ifeq ($(4),target) > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +define $(2)_BUILD_CMDS > + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) > +endef > +else > define $(2)_BUILD_CMDS > $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) > endef > +endif > +else > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +define $(2)_BUILD_CMDS > + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) > +endef > else > define $(2)_BUILD_CMDS > $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) > endef > endif > endif > +endif > > # > # Host installation step. Only define it if not already defined by the > # package .mk file. > # > ifndef $(2)_INSTALL_CMDS > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +define $(2)_INSTALL_CMDS > + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) > +endef > +else > define $(2)_INSTALL_CMDS > $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) > endef > endif > +endif > > # > # Staging installation step. Only define it if not already defined by > # the package .mk file. > # > ifndef $(2)_INSTALL_STAGING_CMDS > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +define $(2)_INSTALL_STAGING_CMDS > + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR install > +endef > +else > define $(2)_INSTALL_STAGING_CMDS > $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) > endef > endif > +endif > > # > # Target installation step. Only define it if not already defined by > # the package .mk file. > # > ifndef $(2)_INSTALL_TARGET_CMDS > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +define $(2)_INSTALL_TARGET_CMDS > + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install > +endef > +else > define $(2)_INSTALL_TARGET_CMDS > $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) > endef > endif > +endif > > # Call the generic package infrastructure to generate the necessary > # make targets > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas at devoogdt.com Fri Feb 24 18:12:21 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Fri, 24 Feb 2023 19:12:21 +0100 Subject: [Buildroot] [PATCH v1 1/3] pkg-cmake: add option to select the Ninja generator In-Reply-To: References: <20230224111509.2434694-1-thomas.devoogdt@barco.com> Message-ID: Hi, I don't disagree to have a more generic keyword to add build options. I just took the meson example. Before I rewrite further, I would like to have also feedback from others. About webkit, yes it uses --build very recently. If I can fit the existing MAKE_OPTS with that --build flag, then I will change it. About the doc, I never came to the point where I had to change that, my bad. But would prefer to first get this in to the code base. Documentation can follow if everything stabilizes. Kr, Thomas Op vr 24 feb. 2023 18:53 schreef John Keeping : > On Fri, Feb 24, 2023 at 12:15:07PM +0100, Thomas Devoogdt wrote: > > E.g. Commit > > 16e5c92ff5fd2b44a1126bd7d7538c68ce838213, and > > 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd > > can now be replaced by: WEBKITGTK_CMAKE_NINJA = YES > > > > Packages that are selecting Ninja, should also use the NINJA_{ENV,OPTS} > variables iso the MAKE variables. > > The current webkitgtk build commands use `cmake --build` and `cmake > --install`, wouldn't it be better to use those here? > > I wonder if it makes more sense to replace anything generator-specific > (like $(PKG)_MAKE_OPTS or $(PKG)_NINJA_OPTS) with general > $(PKG)_CMAKE_BUILD_OPTS and $(PKG)_CMAKE_INSTALL_OPTS so that packages > become independent of the generator. > > If those options are at the end of the command, then packages still have > the option (in the build phase) to pass built-tool specific options by > including `--` in the value. > > > Signed-off-by: Thomas Devoogdt > > --- > > package/pkg-cmake.mk | 41 +++++++++++++++++++++++++++++++++++++++-- > > No change in docs/? ;-) > > > 1 file changed, 39 insertions(+), 2 deletions(-) > > > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > > index 8c375779cb..4ce3e6bada 100644 > > --- a/package/pkg-cmake.mk > > +++ b/package/pkg-cmake.mk > > @@ -65,6 +65,13 @@ else > > $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build > > endif > > > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > > +$(2)_DEPENDENCIES += host-ninja > > +$(2)_GENERATOR = "Ninja" > > +else > > +$(2)_GENERATOR = "Unix Makefiles" > > +endif > > + > > # > > # Configure step. Only define it if not already defined by the package > > # .mk file. And take care of the differences between host and target > > @@ -88,7 +95,7 @@ define $(2)_CONFIGURE_CMDS > > rm -f CMakeCache.txt && \ > > PATH=$$(BR_PATH) \ > > $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > > - -G"Unix Makefiles" \ > > + -G$$($$(PKG)_GENERATOR) \ > > > -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ > > -DCMAKE_INSTALL_PREFIX="/usr" \ > > -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ > > @@ -119,7 +126,7 @@ define $(2)_CONFIGURE_CMDS > > PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > > PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ > > $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > > - -G"Unix Makefiles" \ > > + -G$$($$(PKG)_GENERATOR) \ > > -DCMAKE_INSTALL_SO_NO_EXE=0 \ > > -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ > > -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ > > @@ -165,45 +172,75 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) > > # > > ifndef $(2)_BUILD_CMDS > > ifeq ($(4),target) > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > > +define $(2)_BUILD_CMDS > > + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) > $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) > > +endef > > +else > > define $(2)_BUILD_CMDS > > $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) > $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) > > endef > > +endif > > +else > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > > +define $(2)_BUILD_CMDS > > + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) > $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) > > +endef > > else > > define $(2)_BUILD_CMDS > > $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) > $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) > > endef > > endif > > endif > > +endif > > > > # > > # Host installation step. Only define it if not already defined by the > > # package .mk file. > > # > > ifndef $(2)_INSTALL_CMDS > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > > +define $(2)_INSTALL_CMDS > > + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) > -C $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) > > +endef > > +else > > define $(2)_INSTALL_CMDS > > $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) > $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) > > endef > > endif > > +endif > > > > # > > # Staging installation step. Only define it if not already defined by > > # the package .mk file. > > # > > ifndef $(2)_INSTALL_STAGING_CMDS > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > > +define $(2)_INSTALL_STAGING_CMDS > > + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) > $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR install > > +endef > > +else > > define $(2)_INSTALL_STAGING_CMDS > > $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) > $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C > $$($$(PKG)_BUILDDIR) > > endef > > endif > > +endif > > > > # > > # Target installation step. Only define it if not already defined by > > # the package .mk file. > > # > > ifndef $(2)_INSTALL_TARGET_CMDS > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > > +define $(2)_INSTALL_TARGET_CMDS > > + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) > $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install > > +endef > > +else > > define $(2)_INSTALL_TARGET_CMDS > > $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) > $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C > $$($$(PKG)_BUILDDIR) > > endef > > endif > > +endif > > > > # Call the generic package infrastructure to generate the necessary > > # make targets > > -- > > 2.39.2 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Fri Feb 24 22:00:19 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 24 Feb 2023 22:00:19 +0000 Subject: [Buildroot] [Bug 15181] Building libcurl fails due to faulty package definition In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15181 --- Comment #2 from Jookia --- My friend Xogium hit this issue this month and after a few debugging sessions we tracked this down. Here's what I've found: - Arch Linux's host toolchain now sets runpath instead of rpath - libcurl sets LD_LIBRARY_PATH to /lib:/usr/lib - Buildroot pkgconf and Arch Linux pkgconf versions line up - Arch Linux pkgconf library is installed to /usr/lib/libpkgconf.so - Buildroot pkgconf uses the host libpkgconf.so due to LD_LIBRARY_PATH - this is respected because rpath does not override it - The Buildroot pkg-conf script sets LIBPATH to build/host/bin/../sysroot/... and SYSROOT to build/host/sysroot - pkgconf 1.8 silently ignores LIBPATH if it's outside sysroot - pkgconf 1.8 does not normalize paths - pkgconf reverted LIBPATH to the one in the host's libpkg.so, /lib and /usr/lib - curl build tries to find openssl but can't Two fixes are needed: - libcurl build should not set LD_LIBRARY_PATH - the pkg-config wrapper should use normalized paths -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Sat Feb 25 07:39:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 07:39:36 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-24 Message-ID: <20230225073943.A5D7E60E4E@smtp3.osuosl.org> Hello, Autobuild statistics for 2023-02-24 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 10 | 17 | 0 | 27 | master | 146 | 124 | 0 | 270 | next | 13 | 21 | 0 | 34 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 9 host-go-1.19.6 | 7 elfutils-0.186 | 6 glibc-2.36-81-g4f4d7a13edfd... | 6 host-pahole-1.24 | 6 python-numpy-1.23.5 | 5 systemd-252.4 | 4 host-binutils-2.38 | 3 lirc-tools-0.10.2 | 3 netsurf-3.10 | 3 ulog-0389d243352255f6182326... | 3 libcap-ng-0.8.3 | 2 libgcrypt-1.10.1 | 2 libglib2-2.72.3 | 2 linux-5.10.162-cip24-rt10 | 2 network-manager-1.40.10 | 2 ntpsec-1_2_2 | 2 olsr-0.9.8 | 2 sdl-1.2.15 | 2 unknown | 2 android-tools-4.2.2+git2013... | 1 asterisk-16.29.1 | 1 dahdi-linux-3.2.0 | 1 duma-2.5.15 | 1 fdk-aac-2.0.2 | 1 fftw-quad-3.3.8 | 1 flannel-0.14.0 | 1 fontconfig-2.13.1 | 1 fs/axfs/axfs.mk:32: /tmp/in... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 hawktracer-2ec19d7192334414... | 1 host-binutils-2.37 | 1 host-binutils-2.39 | 1 host-wine-7.0 | 1 intel-gmmlib-22.3.3 | 1 janet-1.26.0 | 1 kexec-2.0.25 | 1 kvmtool-f77d646ba01d04be5aa... | 1 libblockdev-2.26 | 1 libcamera-v0.0.4 | 1 libev-4.33 | 1 libfreeimage-3.18.0 | 1 libgpg-error-1.46 | 1 libnl-3.7.0 | 1 linux-6.1.11 | 1 lttng-modules-2.13.7 | 1 nginx-1.22.1 | 1 ntp-4.2.8p15 | 1 openvmtools-11.3.5-18557794 | 1 package/multipath-tools/mul... | 1 pcre2-10.42 | 1 perl-5.36.0 | 1 php-8.2.3 | 1 proxychains-ng-4.16 | 1 python-bcrypt-4.0.1 | 1 python-orjson-3.8.4 | 1 quickjs-2021-03-27 | 1 rsyslog-8.2204.1 | 1 skalibs-2.12.0.1 | 1 uclibc-ng-test-6790eafe897b... | 1 uqmi-0a19b5b77140465c29e2af... | 1 wolfssl-5.5.3 | 1 xfsprogs-5.14.2 | 1 zabbix-6.2.7 | 1 zeek-4.1.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/f7b3e83b2aa61d6d0176b2c788acdc08c6d254b4 | x86_64 | asterisk-16.29.1 | NOK | http://autobuild.buildroot.net/results/e3d9da661b02236c7306d30bcff5386759da17b2 | x86_64 | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/a4eacc63a9d3948db260a56aae77beaac04a04ca | sparc64 | duma-2.5.15 | NOK | http://autobuild.buildroot.net/results/553e673cb404f62f03d20a6e58b528d13f5a072f | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/3544ba3422612db91a11377d362ec2b2a4fd6e29 | ORPH arceb | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/939128e3080768d5ad2caef2dde8f0277e9c468e | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/0ca940b239a41333481ce07e9a6f3f15c64f177b | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/a5f372c6c858fb78b3e9078d961b6482f73fb6d4 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/02b5daebba4b6c87168039bd9e4dcd51719e6557 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/63e0c08e4651f11ced53bd7818d2d1134404dd61 | ORPH mipsel | fdk-aac-2.0.2 | NOK | http://autobuild.buildroot.net/results/2dcfb380b4187ad02b88bde9e6702f3e726b6cf8 | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/066433efe70c5662c932fdf80bd307205a0969bb | ORPH s390x | flannel-0.14.0 | NOK | http://autobuild.buildroot.net/results/6a517df1a1575a2796c7a59d12869b2d24e2a715 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/b3a9d140c76ac7a5edadab7b71929cf5f056d6ac | ORPH s390x | fs/axfs/axfs.mk:32: /tmp/in... | NOK | http://autobuild.buildroot.net/results/0cc980f29478575d6db5ed9ffbc98c10729f8d4d | aarch64_be | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/4b3ebdc8af9576e7e8fd7b487a35aa164be7c55f | mips64el | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/4ff0ff4ecc2ac7b8e4f00c08af3a5014bd92cbcc | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/f35c21732c3f9fde6a80963b98c1f8e9974986a7 | powerpc64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/5a370c0ff0011ebf559a0faa46ad487b67abba0d | mips64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/60ae6c0a8926ebd284f61cb6a0a6cee423d84c6a | microblazeel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/181664494ee18a77d327e24bc5b184e7ac84ae75 | i686 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/0a32ab120903f77a03c8dae0bf5438862b53b55e | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e46add0564797e425a292ac9ce80aa58e6b498a0 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/19b1dc6fea570914c8034d9f0471959dc03dfdf8 | riscv64 | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b4f78c046112edb9fab1e576bd547352430e6054 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/d74f0401d25942770bb5aa66dd62f17a63eeee03 | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/5a5e2093b317b4d44cbec4cf2b9ab38340676d8e | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/f6eb1199e3639fca53ba22eda2a79bd62d23abd7 | mipsel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1569485719ad0e6c61164012988b9aeabd98a306 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/caefad691bf88a6a18ad947129ef015a0239f659 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/cb9a5b322c8e2edb3e80a80a918d23541ddd0b45 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/baa186a92d06a24cefb54602201354c1dad5988b | ORPH powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f2770f474bcc553deea2c3088ef03174e3714a5a | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/52460aa74e2ac681b6f88f7dd28d16612f9a9df1 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/acd635636d6d5ed99843598518e5578747eeda35 | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/788acda9badd553f6a2e2b569b59eb87c0e1a61d | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/bfc1b7b6a412ad72490b2b33511c4d07aaae06f3 | ORPH powerpc64le | hawktracer-2ec19d7192334414... | NOK | http://autobuild.buildroot.net/results/3002d6cde21a49fa82c48e72c6bb9a112724032a | mips | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/f6354e3351fd9408d9449db973d1ee40d1460d71 | mips64el | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/5a67c70100e6eb4f839fa41f942d7be117a3fcf0 | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2cbad4f71884a20c57724c15a00d3fd8702c1225 | powerpc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/eb6fc3e1ba14911bf22f6af788f6d64c5bd057c5 | sparc64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/102d4e7ed503b12760d63461ba9fde6aa514b01f | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/8c217b8b081267665b95cc09ca5f9257cb67d3e7 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/8701f281e6c19c58e0fff3730c296ebe06bc6cd3 | powerpc64le | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/e595f8156eb5ae79448622f516da1ca85bd1c6c4 | riscv64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/7f29b6db185d1d8aef51893ba638bee6702adbe4 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/bb0ee79e4c101c3bf52ade4c6ef2475b8325209e | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/c6f58ae9c1ec2d13073d8085aeb126b47d63c37f | powerpc64le | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/02ef299a16a8f42e298ffab70856ec994a9ca2ab | arc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/75441f53bd62d3de3a588887a806ae7eba2bdbd0 | mips64el | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/77df82bf0ec4947809c5ecf6d7d448c009dd3e3e | arc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/57a7b16a9b1878f88bb051b5b8a28fba1cf9c081 | m68k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/e142bc1e79edb8c9da462057d7ff248d7ce7df43 | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/bd8722008628f1138a324578af54060220d9cf99 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d594fbd8a98528349f3e37e07ae0987f7abc23a7 | i686 | host-wine-7.0 | NOK | http://autobuild.buildroot.net/results/e60d8a433cd8352ef3df875210583aba24bb4444 | x86_64 | intel-gmmlib-22.3.3 | NOK | http://autobuild.buildroot.net/results/813da152d8e22778132e208902421e61f760d01e | mips64el | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/265720597fa22d1447f0ff6a0a02a057980682b3 | arm | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/59a3259aa9574cd48f1814325597059707e3d089 | ORPH i686 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/a51055f15636cfeeb01d1fcdb48b6cc2a61bfe6a | ORPH sparc | libblockdev-2.26 | NOK | http://autobuild.buildroot.net/results/ede9eb1f13d56c77005cc448416fb2efa9d16ff0 | ORPH or1k | libcamera-v0.0.4 | NOK | http://autobuild.buildroot.net/results/f3586ebc835dd189bc0335dd89858133c5423808 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/12d7aa8e2b8b7e0ce10360186d4be955881ceb34 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/2f2785f4c05e6b91b6259d010782cd560ec0b478 | armeb | libev-4.33 | NOK | http://autobuild.buildroot.net/results/b348d0669e34218b5ada73a344382cb2b26cd718 | ORPH mips | libfreeimage-3.18.0 | NOK | http://autobuild.buildroot.net/results/180cea9806fff2d8e022dd9fac313a5877376022 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/6b13dfb9122403696430ce3c10a15c4588e0d47b | ORPH arm | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/8cb64e800a7ecd7dcdeb80142ab56a8a6f251028 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/06fdc4bb89f895933364f614f92609d88978575d | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/78abc1140800e1eda13e66e9a92b5a35563c5b2c | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/2592972d3b9b16d3de7172b62edb21606aabd183 | ORPH mips64 | libnl-3.7.0 | NOK | http://autobuild.buildroot.net/results/a357e480781bd58364b5fdc958f5a975fbb3f427 | ORPH nios2 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/9b184ba9bc88727747d36873e20d243443fb0f08 | ORPH microblaze | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/8212366e7f8a53a48f86614453bafb5f0e1f5085 | ORPH riscv32 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/9e070a2822f3ee339704482a2f028ad4b9cfd70b | ORPH sparc64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/a59f6d3e509bf5bd09974a8417fe19e4b1ea3c32 | ORPH mipsel | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/cf377a92f4df3f82960507784b33491d0261282b | ORPH sparc | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/85359d3f678b49e46821a1c10da5f14edfb5e6d0 | ORPH aarch64_be | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/c73232a7fea00db72606be54dd5d98d47bf44a55 | aarch64_be | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/bcb48536431046eb7531debbfa55ab861b5e6bfe | nios2 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/5c4f6d3926913daab6aa8c787e8cc737635e6338 | sparc64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/81844aeadcedf73179f9f9fd3ecb5d76ec31c332 | sh4aeb | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/8739deb2a7b9de4257e3f10cebad258d67275ced | ORPH powerpc64 | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/f8483b98d1038029b0de34b3fed9365184cd6818 | ORPH powerpc64 | nginx-1.22.1 | NOK | http://autobuild.buildroot.net/results/9033346dd04c9c9cf307400eca7a235298115135 | riscv64 | ntp-4.2.8p15 | NOK | http://autobuild.buildroot.net/results/7f96b486b541819bb7d9a59494f427e0198315f2 | ORPH i686 | ntpsec-1_2_2 | NOK | http://autobuild.buildroot.net/results/f38abc6b7f8464836231192cfe078a5b27319a8a | ORPH m68k | ntpsec-1_2_2 | NOK | http://autobuild.buildroot.net/results/5470b3f8b163f5ae2d10abca181f4d0feba6598e | ORPH nios2 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/7663b4fe18289c4da8b7073c6f3d3e11cdf1f700 | ORPH arc | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/47a22c0deacfb57b3cfb2d7fa19dd3f940bdc927 | ORPH x86_64 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/2328c77a20eb00dbaed6546a8df44fef183acfe2 | sparc64 | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/a1807f038f7fa400963fd7115653568ca804d0c5 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/5b7d05fa4ab80b51929fa42850b01f70c37e2ae1 | ORPH arm | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/df4c18a050464482d14719627ffcf87e4bcd5b48 | microblazeel | php-8.2.3 | NOK | http://autobuild.buildroot.net/results/3c44e4fda8faa23c5fd033f6082b1c2a0e71c238 | mips64el | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/69677ea90d1229ec900010a3e8bb4a6d887ae176 | ORPH mips64el | python-bcrypt-4.0.1 | NOK | http://autobuild.buildroot.net/results/c52abc122b805f1c16a42d8979a90e7ab05a34ee | aarch64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/46e68772eb2d73630ea3eca2d16371e1889ef2bd | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/cbd23821abb15237e1bee3a1d237348ffe92d893 | powerpc | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/812191aaf0c241a776bee984096142fd7bccf9e6 | mips | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/2f64df95a38c7a217674ac1a14498871778a0896 | sh4 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/172a312de5cf03aea85d1bc29dbee499411384c0 | mips | python-orjson-3.8.4 | NOK | http://autobuild.buildroot.net/results/0a91bd206cd114c075cc0ef3f328c2372f33cec5 | sh4aeb | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/56e98b1b1ab804c58b677d9557b145f026d723f0 | arceb | rsyslog-8.2204.1 | NOK | http://autobuild.buildroot.net/results/1d07cd52ef2da7fb00a79e722a8d9edbf04569ae | ORPH sh4eb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/20271dbd5f31dd87766179f9e25d8a2eadfec8f9 | ORPH sh4a | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/0ede8b97d66a729f9c2a3fe447c8c56fdd05251e | ORPH or1k | skalibs-2.12.0.1 | NOK | http://autobuild.buildroot.net/results/3911f194418ffbafee61db9d9b3179f249a233a7 | sparc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/4192f18c053b268238a66e7231434637ef35fbc6 | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/a6d563cd65f40816a73b7f237e011492841f40f1 | mips64el | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/33da864a48a289234b9eeb9d4e6821dc6643573e | powerpc64le | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/f05d1d44a0f667eeb63cb9c906416019988e1f21 | mips64el | uclibc-ng-test-6790eafe897b... | NOK | http://autobuild.buildroot.net/results/47b5a5b3a938ade6773062bdfb47906e2da9b91f | sparc64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/03bf110beb45ab746093520cd9b8ba6a51661a1f | aarch64_be | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/8cffe81496d1c77dab4ad30fb13bbc2776ebf50a | sh4aeb | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/8acdfcc0a50caf73966af0138565cc2f85206539 | sparc64 | unknown | NOK | http://autobuild.buildroot.net/results/229e85b778e84e4cb5672a113939cf983edbe542 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/3aedf3b5c0cb7e924fa01518302ca677d891638f | mips64el | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/1858135e0042ca51251ce8a94a2e34a5ca66e41b | ORPH mipsel | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/3bfa444ea08baa704f2ea54b9d7102fd42ed3523 | mips64el | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/bf0909ffafbc4802bfca1c661c7ff50470b1a53f | ORPH mips | zabbix-6.2.7 | NOK | http://autobuild.buildroot.net/results/acdfcb17b39d438ccf5e4621707a10f60577d233 | sparc | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/45387d5aa0f08c1db137b0e639e9e67cbf06d956 | Classification of failures by reason for next --------------------------------------------- python-numpy-1.23.5 | 3 glibc-2.36-81-g4f4d7a13edfd... | 2 host-go-1.19.6 | 2 elfutils-0.186 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 gnu-efi-3.0.15 | 1 host-binutils-2.38 | 1 host-binutils-2.39 | 1 host-pahole-1.24 | 1 libcap-ng-0.8.3 | 1 libglib2-2.72.3 | 1 optee-client-3.19.0 | 1 quickjs-2021-03-27 | 1 stress-ng-0.13.05 | 1 systemd-252.4 | 1 toolchain-external-codescap... | 1 unknown | 1 Detail of failures for next --------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/073d029087bc2506070862cb7f0c6d9bfc387f6c | ORPH powerpc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/deea68496b6c9da3f8da9b5dd5ec3b7e171e1338 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e8671855fba77240348f8d789a5668ad40b881b7 | powerpc64le | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/dc86ab1036fabf1e760af4e27cf47f7c34b5d472 | mips64el | gnu-efi-3.0.15 | NOK | http://autobuild.buildroot.net/results/148215fa2fac98eb0d71ac0f34a0230c16bfb8e8 | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6df3b13ddf1ccb33c3c8660e103f7d3676da21e0 | mips64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/23d52d9c5c6d5c10e868c24e65debfcd6b3fc122 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/77823d7ff448adbb154fe9e57f3dde60e742af47 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/95555037cf97ed6c3bf8c320ee73072207e9b283 | arc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d7953cedc8f3356036d18586e0f8d51aaddf3424 | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/c0ec92ef2ba15104e7b8bc84acaff567ab73ba5d | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/86fbfc77f10d94c97b145d8b0a4b282e507a55c5 | arceb | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/649cfd5c375e83af0ac3913ae883ca86dd4026e8 | arm | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/994d9de3f78bd576295395e96d6d6e9fca8c1779 | powerpc | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/a21660b39ea2d6d41652247e5b71a584d8fd895b | mips | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/7cde446f1ba174490ad65b1aa88beeaa41502b2f | microblaze | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/e40640b1d51a80130873da3a5b40a20b0534beda | sparc | stress-ng-0.13.05 | NOK | http://autobuild.buildroot.net/results/d217493756824318ffdc48767cf8a3577cfcdd80 | sparc64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/8db81160b19e4f7e58d213883b0ce5683ea7e497 | mips64 | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/437786d42025034193c30dc4bf6d8721c6b9e8ab | ORPH powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/e1cd48b17ec8beb72a5675e817bd0394a4132f4a | Classification of failures by reason for 2022.11.x -------------------------------------------------- host-rust-1.64.0 | 3 host-binutils-2.38 | 2 host-pahole-1.24 | 2 elfutils-0.186 | 1 frr-8.3.1 | 1 gobject-introspection-1.72.0 | 1 gummiboot-2bcd919c681c952eb... | 1 libglib2-2.72.3 | 1 s6-linux-utils-2.6.0.0 | 1 ulog-0389d243352255f6182326... | 1 unknown | 1 wolfssl-5.5.3 | 1 xz-5.2.7 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/8331c8b9780552fa3f0088488d2b3643d80b54ec | ORPH arceb | frr-8.3.1 | NOK | http://autobuild.buildroot.net/results/fe1e945b5627f8d601c55af5d3e4a55e40d908af | i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d7380c8442d4c1c3428f61c87c2a1d6728e70ca6 | ORPH x86_64 | gummiboot-2bcd919c681c952eb... | NOK | http://autobuild.buildroot.net/results/a270cd4cd5a75a344e8af735e2746a5d149ea181 | mipsel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/390e91c1b6b780cefa8f2287ef9e08aab73c5249 | aarch64_be | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/f28017f2486b959f1e330683f88e310ec6215b3c | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/0f90bd3691c16bb66c25d85f330430a82de15cae | nios2 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/387d27fc29e8ea039436496abbc825b40cd12583 | sparc64 | host-rust-1.64.0 | NOK | http://autobuild.buildroot.net/results/1e100d56271d0b84844cc16130fb60edf3d03056 | armeb | host-rust-1.64.0 | NOK | http://autobuild.buildroot.net/results/5572adce8e555d9cb9b213729cb08ef490e13c79 | mips | host-rust-1.64.0 | NOK | http://autobuild.buildroot.net/results/381e5c4660303c82ee0d3eb54dcb30f6a3f9a778 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/08d6090acf12d0e08762a02cf16e8adf52e6bcad | mips64el | s6-linux-utils-2.6.0.0 | NOK | http://autobuild.buildroot.net/results/731427c2db251121866a8279e1a079630d274b10 | i686 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/1b3bebba4bb2abbf217ecf5ec9a759bb64e7787c | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/b4ac81ba02647bb42b4c69c2d81fecc0d7cfef92 | arm | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/27dcca13f5089b7343474655984340bc462ebccb | microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/d07fed316ccc7b0c305b36f25f4b316601df8960 | ORPH Gitlab CI results for 2023-02-24 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820927991 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820927995 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928002 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928003 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928004 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928005 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928006 | avenger96 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928007 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928008 | bananapi_m2_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928009 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928010 | ORPH beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928011 | beaglebone | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928012 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928013 | beagleboneai | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928014 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928015 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928016 | broadcom_northstar | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928017 | canaan_kd233 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928018 | chromebook_elm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928019 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928020 | ci20 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928022 | cubieboard2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928023 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928024 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928026 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928027 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928029 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928030 | freescale_imx28evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928032 | freescale_imx6dlsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928033 | freescale_imx6dlsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928034 | freescale_imx6qsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928036 | freescale_imx6qsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928037 | freescale_imx6sxsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928039 | freescale_imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928040 | freescale_imx7dsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928041 | freescale_imx8mmevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928043 | freescale_imx8mnevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928044 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928045 | freescale_imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928046 | freescale_imx8qmmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928047 | freescale_imx8qxpmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928048 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928049 | ORPH freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928050 | ORPH freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928051 | ORPH friendlyarm_nanopi_r2s | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928052 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928053 | globalscale_espressobin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928054 | grinn_chiliboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928055 | grinn_liteboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928056 | hifive_unleashed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928057 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928058 | imx6-sabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928059 | imx6-sabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928060 | imx6-sabresd_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928061 | imx6slevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928062 | imx6sx-sdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928063 | imx6ulevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928064 | imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928065 | imx6ulpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928066 | imx7d-sdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928068 | imx7dpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928069 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928070 | imx8mn_bsh_smm_s2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928072 | imx8mn_bsh_smm_s2_pro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928073 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928074 | imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928076 | kontron_bl_imx8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928077 | kontron_pitx_imx8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928079 | kontron_smarc_sal28 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928080 | lafrite | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928081 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928082 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928084 | linksprite_pcduino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928085 | ls1028ardb | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928087 | mender_x86_64_efi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928089 | ORPH microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928090 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928092 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928094 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928095 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928098 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928100 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928101 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928103 | minnowboard_max | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928104 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928106 | mx51evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928107 | mx53loco | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928109 | mx6cubox | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928110 | mx6sx_udoo_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928111 | mx6udoo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928112 | nexbox_a95x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928113 | nezha | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928114 | nitrogen6sx | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928115 | nitrogen6x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928116 | nitrogen7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928117 | nitrogen8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928118 | nitrogen8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928119 | nitrogen8mn | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928120 | nitrogen8mp | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928121 | octavo_osd32mp1_brk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928122 | octavo_osd32mp1_red | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928123 | odroidc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928124 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928125 | olimex_a10_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928126 | olimex_a13_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928127 | olimex_a20_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928129 | olimex_a20_olinuxino_lime2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928128 | olimex_a20_olinuxino_micro | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928130 | olimex_a33_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928131 | olimex_a64_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928132 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928133 | olimex_stmp157_olinuxino_lime | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928134 | olpc_xo1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928136 | olpc_xo175 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928135 | openblocks_a6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928137 | orangepi_lite | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928139 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928138 | orangepi_one | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928140 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928141 | orangepi_pc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928142 | orangepi_pc_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928143 | orangepi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928144 | orangepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928145 | orangepi_zero_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928147 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928146 | pandaboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928148 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928149 | pc_x86_64_efi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928150 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928151 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928152 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928153 | qemu_aarch64_ebbr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928154 | qemu_aarch64_sbsa | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928155 | qemu_aarch64_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928156 | qemu_arm_ebbr | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928157 | qemu_arm_versatile | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928158 | qemu_arm_vexpress | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928159 | qemu_arm_vexpress_tz | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928160 | qemu_m68k_mcf5208 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928161 | qemu_m68k_q800 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928162 | qemu_microblazebe_mmu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928163 | qemu_microblazeel_mmu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928164 | qemu_mips32r2_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928165 | qemu_mips32r2el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928166 | qemu_mips32r6_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928167 | qemu_mips32r6el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928168 | qemu_mips64_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928169 | qemu_mips64el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928170 | qemu_mips64r6_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928171 | qemu_mips64r6el_malta | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928172 | qemu_nios2_10m50 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928173 | qemu_or1k | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928174 | qemu_ppc64_e5500 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928175 | qemu_ppc64_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928176 | qemu_ppc64le_powernv8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928177 | qemu_ppc64le_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928179 | qemu_ppc_bamboo | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928180 | qemu_ppc_e500mc | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928181 | qemu_ppc_g3beige | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928182 | qemu_ppc_mac99 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928183 | qemu_ppc_mpc8544ds | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928184 | qemu_riscv32_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928185 | qemu_riscv64_nommu_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928186 | qemu_riscv64_virt | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928187 | qemu_s390x | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928188 | qemu_sh4_r2d | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928189 | qemu_sh4eb_r2d | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928191 | qemu_sparc64_sun4u | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928193 | qemu_sparc_ss10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928194 | qemu_x86 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928198 | qemu_x86_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928195 | qemu_xtensa_lx60 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928199 | qemu_xtensa_lx60_nommu | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928201 | raspberrypi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928216 | ORPH raspberrypi0 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928203 | ORPH raspberrypi0w | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928206 | ORPH raspberrypi2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928208 | ORPH raspberrypi3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928211 | raspberrypi3_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928209 | ORPH raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928212 | ORPH raspberrypi4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928215 | ORPH raspberrypi4_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928213 | ORPH raspberrypicm4io | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928219 | ORPH raspberrypicm4io_64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928218 | ORPH raspberrypizero2w | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928221 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928222 | rock64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928224 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928225 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928226 | roseapplepi | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928229 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928230 | sheevaplug | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928232 | sipeed_lichee_rv | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928233 | sipeed_lichee_rv_dock | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928234 | sipeed_maix_bit | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928235 | sipeed_maix_bit_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928237 | sipeed_maix_dock | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928238 | sipeed_maix_dock_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928239 | sipeed_maix_go | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928241 | sipeed_maix_go_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928242 | sipeed_maixduino | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928243 | sipeed_maixduino_sdcard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928246 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928247 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928248 | snps_archs38_haps | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928249 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928252 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928253 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928254 | solidrun_clearfog_gt_8k | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928255 | solidrun_macchiatobin | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928257 | ORPH spike_riscv64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928258 | stm32f429_disco_xip | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928259 | stm32f469_disco_sd | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928262 | stm32f469_disco_xip | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928263 | stm32mp157a_dk1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928265 | stm32mp157c_dk2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928266 | stm32mp157c_odyssey | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928267 | terasic_de10nano_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928268 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928269 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928270 | ts5500 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928271 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928273 | uevm5432 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928274 | versal_vck190 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928275 | visionfive | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928277 | visionfive2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928276 | wandboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928278 | warp7 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928279 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928281 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928282 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928283 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928284 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928285 | zynqmp_kria_kv260 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928286 | zynqmp_zcu102 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928287 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/3820928288 | -- http://autobuild.buildroot.net From fontaine.fabrice at gmail.com Sat Feb 25 09:22:27 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 10:22:27 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add ti-k3-r5-loader handling Message-ID: <20230225092227.9308-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 0189bcb47c7733c36fcbcb88fbf26f57958db576: make[2]: *** No rule to make target '_defconfig'. Stop. Fixes: - http://autobuild.buildroot.org/results/d7449b2b2f2349af672bfeee832b89a223a7d9cc Signed-off-by: Fabrice Fontaine --- utils/genrandconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index d192c5b324..64b9be69db 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -518,6 +518,11 @@ def fixup_config(sysinfo, configfile): 'BR2_TARGET_S500_BOOTLOADER_BOARD=""\n' in configlines: return False + if 'BR2_TARGET_TI_K3_R5_LOADER=y\n' in configlines and \ + 'BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG=y\n' in configlines and \ + 'BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG=""\n' in configlines: + return False + if 'BR2_TARGET_UBOOT=y\n' in configlines and \ 'BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y\n' in configlines and \ 'BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y\n' in configlines and \ -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 09:35:27 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 10:35:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: add host-pkgconf dependency Message-ID: <20230225093527.16587-1-fontaine.fabrice@gmail.com> host-pkgconf is mandatory to find lz4 and zstd resulting in the following build failure since commit 9cd2e6e090449f9d2f371d24152580c038892f3d: configure: error: in `/home/autobuild/autobuild/instance-5/output-1/build/postgresql-15.2': configure: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. Alternatively, you may set the environment variables LZ4_CFLAGS and LZ4_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. Fixes: - http://autobuild.buildroot.org/results/8744277ebe9910635ef8fe290c8ba4eee420b538 Signed-off-by: Fabrice Fontaine --- package/postgresql/postgresql.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 1e9e4b83df..f087c0c964 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -92,14 +92,14 @@ POSTGRESQL_CONF_OPTS += --without-libxml endif ifeq ($(BR2_PACKAGE_ZSTD),y) -POSTGRESQL_DEPENDENCIES += zstd +POSTGRESQL_DEPENDENCIES += host-pkgconf zstd POSTGRESQL_CONF_OPTS += --with-zstd else POSTGRESQL_CONF_OPTS += --without-zstd endif ifeq ($(BR2_PACKAGE_LZ4),y) -POSTGRESQL_DEPENDENCIES += lz4 +POSTGRESQL_DEPENDENCIES += host-pkgconf lz4 POSTGRESQL_CONF_OPTS += --with-lz4 else POSTGRESQL_CONF_OPTS += --without-lz4 -- 2.39.1 From thomas.petazzoni at bootlin.com Sat Feb 25 09:37:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:37:19 +0100 Subject: [Buildroot] [git commit] package/systemd: fix build with -Ofast Message-ID: <20230225093924.AF2198691D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=45e2aa588d7d10941032c1661b9cf1e6c52b2680 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update -Ofast workaround as suggested by Yann E. Morin to avoid the following build failure raised since bump to version 252.4 in commit a2c823d1f548d5a0120d27d6c000603192360f7b and https://github.com/systemd/systemd/commit/60f97fee2d2f948c8e8963ea8ff767008cb93cae: ../output-1/build/systemd-252.4/meson.build:397:8: ERROR: Problem encountered: -Ofast, -ffast-math, or -ffinite-math-only is specified in c_args. Fixes: - http://autobuild.buildroot.org/results/8f41c4984b645851724e554c3162b83bc312bee7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index cce9162f6d..63467171ed 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -100,7 +100,7 @@ SYSTEMD_CONF_OPTS += \ SYSTEMD_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_OPTIMIZE_FAST),y) -SYSTEMD_CFLAGS += -O3 +SYSTEMD_CFLAGS += -O3 -fno-finite-math-only endif ifeq ($(BR2_nios2),y) From thomas.petazzoni at bootlin.com Sat Feb 25 09:37:14 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:37:14 +0100 Subject: [Buildroot] [git commit] package/hawktracer: update URL in Config.in Message-ID: <20230225093924.A2EE586911@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=edc6350d427bdd47552a276d80c6ad055add86af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Current website is down: https://github.com/amzn/hawktracer/issues/87 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hawktracer/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hawktracer/Config.in b/package/hawktracer/Config.in index 7648707404..bee9c27b7d 100644 --- a/package/hawktracer/Config.in +++ b/package/hawktracer/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_HAWKTRACER profiling tool built in Amazon Video for getting performance metrics from low-end devices. - https://www.hawktracer.org/ + https://hawktracer.github.io/ if BR2_PACKAGE_HAWKTRACER From thomas.petazzoni at bootlin.com Sat Feb 25 09:37:39 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:37:39 +0100 Subject: [Buildroot] [git commit] package/intel-gmmlib: needs threads Message-ID: <20230225093924.C90AC8690E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5d310772d71f547146684673c7113f208a31b5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master threads are mandatory since version 19.1.1 and https://github.com/intel/gmmlib/commit/9e4aa143fb7e7e87332fcb7c9871040ff4a1a1da resulting in the following build failure since commit cd206d9b808a322a00294b4caad203a892ed4c92: CMake Error at /home/thomas/autobuild/instance-2/output-1/host/share/cmake-3.22/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find Threads (missing: Threads_FOUND) Fixes: - http://autobuild.buildroot.org/results/c1120932e8c212820b239ee8cd4a057623a73376 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/intel-gmmlib/Config.in | 6 ++++-- package/intel-mediadriver/Config.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/intel-gmmlib/Config.in b/package/intel-gmmlib/Config.in index b6f93f7416..a3d0d2610b 100644 --- a/package/intel-gmmlib/Config.in +++ b/package/intel-gmmlib/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_INTEL_GMMLIB depends on BR2_x86_64 depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS help The Intel(R) Graphics Memory Management Library provides device specific and buffer management for the Intel(R) @@ -11,5 +12,6 @@ config BR2_PACKAGE_INTEL_GMMLIB https://github.com/intel/gmmlib -comment "intel-gmmlib needs a toolchain w/ dynamic library, C++" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP +comment "intel-gmmlib needs a toolchain w/ dynamic library, C++, threads" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/intel-mediadriver/Config.in b/package/intel-mediadriver/Config.in index ad56590008..537e4abd2f 100644 --- a/package/intel-mediadriver/Config.in +++ b/package/intel-mediadriver/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER depends on !BR2_STATIC_LIBS # mesa3d, libva depends on BR2_INSTALL_LIBSTDCPP # intel-gmmlib, mesa3d depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d - depends on BR2_TOOLCHAIN_HAS_THREADS # libva + depends on BR2_TOOLCHAIN_HAS_THREADS # intel-gmmlib, libva depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d select BR2_PACKAGE_INTEL_GMMLIB select BR2_PACKAGE_LIBPCIACCESS From thomas.petazzoni at bootlin.com Sat Feb 25 09:37:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:37:23 +0100 Subject: [Buildroot] [git commit] package/hawktracer: bump to 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 Message-ID: <20230225093924.BB06786922@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=656aec42d96f1286b4acb3ad0e9c84073db3c6b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure with gcc >= 12: /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp: In function 'HT_Thread* ht_thread_create(ht_thread_callback_t, void*)': /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp:1006:28: error: no matching function for call to 'operator new(sizetype, std::thread*)' 1006 | new(&th->th) HT_Thread(); | ^ https://github.com/amzn/hawktracer/compare/e53b07bc812c4cfe8f6253ddb48ac43de8fa74a8...2ec19d71923344148928ef45fce549eda67030a4 Fixes: - http://autobuild.buildroot.org/results/d18a1b2ee6cdcb289567ae90b2d836844427b5f6 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hawktracer/hawktracer.hash | 2 +- package/hawktracer/hawktracer.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hawktracer/hawktracer.hash b/package/hawktracer/hawktracer.hash index 47a8b35b6b..29d00e29ec 100644 --- a/package/hawktracer/hawktracer.hash +++ b/package/hawktracer/hawktracer.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 a48e26082fd644222d4a20ecfd5a34700865cf572d41b7eac5b0c8242fef9c5f hawktracer-2ec19d71923344148928ef45fce549eda67030a4.tar.gz +sha256 099f76d5be18ad5d714fded0c6f889f588986cdde2b31f2c0058413698a5f35c hawktracer-3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5.tar.gz sha256 2f377333e64ad08ad3afec8ed6c2c96ced2a6d7d67443eb2784a931bb7b3fd59 LICENSE diff --git a/package/hawktracer/hawktracer.mk b/package/hawktracer/hawktracer.mk index fd635e350d..462d073755 100644 --- a/package/hawktracer/hawktracer.mk +++ b/package/hawktracer/hawktracer.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAWKTRACER_VERSION = 2ec19d71923344148928ef45fce549eda67030a4 +HAWKTRACER_VERSION = 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 HAWKTRACER_SITE = $(call github,amzn,hawktracer,$(HAWKTRACER_VERSION)) HAWKTRACER_LICENSE = MIT HAWKTRACER_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sat Feb 25 09:38:37 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:38:37 +0100 Subject: [Buildroot] [git commit] package/ntpsec: fix CPE ID version Message-ID: <20230225093924.D575986911@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=723ecc92979183a08a28176c6bf65c5555a88263 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master CPE ID is wrong since the addition of the package in commit 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a, the correct CPE ID is cpe:2.3:a:ntpsec:ntpsec:1.2.2:*:*:*:*:*:*:*, not cpe:2.3:a:ntpsec:ntpsec:1.2:2:*:*:*:*:*:* Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ntpsec/ntpsec.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index c7fa2f85a8..e612e982ec 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -4,12 +4,9 @@ # ################################################################################ -NTPSEC_VERSION_MAJOR = 1 -NTPSEC_VERSION_MINOR = 2 -NTPSEC_VERSION_POINT = 2 -NTPSEC_VERSION = $(NTPSEC_VERSION_MAJOR)_$(NTPSEC_VERSION_MINOR)_$(NTPSEC_VERSION_POINT) -NTPSEC_SOURCE = ntpsec-NTPsec_$(NTPSEC_VERSION).tar.bz2 -NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(NTPSEC_VERSION) +NTPSEC_VERSION = 1.2.2 +NTPSEC_SOURCE = ntpsec-NTPsec_$(subst .,_,$(NTPSEC_VERSION)).tar.bz2 +NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(subst .,_,$(NTPSEC_VERSION)) NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT, CC-BY-4.0 (docs) NTPSEC_LICENSE_FILES = \ LICENSES/BSD-2 \ @@ -20,8 +17,6 @@ NTPSEC_LICENSE_FILES = \ docs/copyright.adoc NTPSEC_CPE_ID_VENDOR = ntpsec -NTPSEC_CPE_ID_VERSION = $(NTPSEC_VERSION_MAJOR).$(NTPSEC_VERSION_MINOR) -NTPSEC_CPE_ID_UPDATE = $(NTPSEC_VERSION_POINT) NTPSEC_DEPENDENCIES = \ host-bison \ From thomas.petazzoni at bootlin.com Sat Feb 25 09:39:05 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:39:05 +0100 Subject: [Buildroot] [git commit] utils/genrandconfig: add ti-k3-r5-loader handling Message-ID: <20230225093924.E275A8691D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02b6af266340638d154257bf2634ccc13d47ec69 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 0189bcb47c7733c36fcbcb88fbf26f57958db576: make[2]: *** No rule to make target '_defconfig'. Stop. Fixes: - http://autobuild.buildroot.org/results/d7449b2b2f2349af672bfeee832b89a223a7d9cc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index b3576f8a51..ea8548d42c 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -519,6 +519,11 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_S500_BOOTLOADER=y\n') configlines.remove('BR2_TARGET_S500_BOOTLOADER_BOARD=""\n') + if 'BR2_TARGET_TI_K3_R5_LOADER=y\n' in configlines and \ + 'BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG=y\n' in configlines and \ + 'BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG=""\n' in configlines: + return False + if 'BR2_TARGET_UBOOT=y\n' in configlines and \ 'BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y\n' in configlines and \ 'BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y\n' in configlines and \ From thomas.petazzoni at bootlin.com Sat Feb 25 09:39:12 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:39:12 +0100 Subject: [Buildroot] [git commit] package/postgresql: add host-pkgconf dependency Message-ID: <20230225093924.EF1B486922@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5215f56e5bed387575b35de65b78d815b96ba6f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-pkgconf is mandatory to find lz4 and zstd resulting in the following build failure since commit 9cd2e6e090449f9d2f371d24152580c038892f3d: configure: error: in `/home/autobuild/autobuild/instance-5/output-1/build/postgresql-15.2': configure: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. Alternatively, you may set the environment variables LZ4_CFLAGS and LZ4_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. Fixes: - http://autobuild.buildroot.org/results/8744277ebe9910635ef8fe290c8ba4eee420b538 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 5e3601cb46..a2aed9a2eb 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -92,14 +92,14 @@ POSTGRESQL_CONF_OPTS += --without-libxml endif ifeq ($(BR2_PACKAGE_ZSTD),y) -POSTGRESQL_DEPENDENCIES += zstd +POSTGRESQL_DEPENDENCIES += host-pkgconf zstd POSTGRESQL_CONF_OPTS += --with-zstd else POSTGRESQL_CONF_OPTS += --without-zstd endif ifeq ($(BR2_PACKAGE_LZ4),y) -POSTGRESQL_DEPENDENCIES += lz4 +POSTGRESQL_DEPENDENCIES += host-pkgconf lz4 POSTGRESQL_CONF_OPTS += --with-lz4 else POSTGRESQL_CONF_OPTS += --without-lz4 From thomas.petazzoni at bootlin.com Sat Feb 25 09:37:07 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:37:07 +0100 Subject: [Buildroot] [git commit] package/zabbix: fix build with libressl >= 3.5.0 Message-ID: <20230225093924.95C5F8690E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7edb4a6a4db7d864c6c1560f3fdc1ef4fbd7f0fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with libressl >= 3.5.0 raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration 113 | static void OPENSSL_cleanup(void) | ^~~~~~~~~~~~~~~ In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, from ../../../include/zbxcomms.h:65, from tls.c:20: /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' 565 | void OPENSSL_cleanup(void); | ^~~~~~~~~~~~~~~ In file included from tls.c:20: tls.c: In function 'zbx_log_ciphersuites': ../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) | ^~ tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); | ^~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0002-fix-build-with-libressl-3.5.0.patch | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 0000000000..7e32ad5745 --- /dev/null +++ b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,71 @@ +From 5c8511384f1d41f9c2a131604d5cb2dbc1c0aec9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 Feb 2023 12:23:56 +0100 +Subject: [PATCH] fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration + 113 | static void OPENSSL_cleanup(void) + | ^~~~~~~~~~~~~~~ +In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, + from ../../../include/zbxcomms.h:65, + from tls.c:20: +/home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' + 565 | void OPENSSL_cleanup(void); + | ^~~~~~~~~~~~~~~ +In file included from tls.c:20: +tls.c: In function 'zbx_log_ciphersuites': +../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} + 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) + | ^~ +tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' + 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); + | ^~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent (no feedback on first patch)] +--- + include/zbxcomms.h | 3 ++- + src/libs/zbxcomms/tls.c | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/include/zbxcomms.h b/include/zbxcomms.h +index e7d74dbd0f..d6efa358fe 100644 +--- a/include/zbxcomms.h ++++ b/include/zbxcomms.h +@@ -253,7 +253,8 @@ int zbx_telnet_execute(ZBX_SOCKET socket_fd, const char *command, AGENT_RESULT * + /* TLS BLOCK */ + #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) + +-#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) ++#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL + # if !defined(LIBRESSL_VERSION_NUMBER) + # define OPENSSL_INIT_LOAD_SSL_STRINGS 0 + # define OPENSSL_INIT_LOAD_CRYPTO_STRINGS 0 +diff --git a/src/libs/zbxcomms/tls.c b/src/libs/zbxcomms/tls.c +index 54ab0a6ef4..bd4075b3e4 100644 +--- a/src/libs/zbxcomms/tls.c ++++ b/src/libs/zbxcomms/tls.c +@@ -30,8 +30,9 @@ + #include "zbxstr.h" + #include "zbxtime.h" + +-#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) +-/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ ++#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x300000fL ++/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL (before 3.5.0) */ + + /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and example in crypto/threads/mttest.c) */ + +-- +2.39.1 + From thomas.petazzoni at bootlin.com Sat Feb 25 09:40:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix build with libressl >= 3.5.0 In-Reply-To: <20230224114320.2152346-1-fontaine.fabrice@gmail.com> References: <20230224114320.2152346-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104001.7df24464@windsurf> On Fri, 24 Feb 2023 12:43:20 +0100 Fabrice Fontaine wrote: > Fix the following build failure with libressl >= 3.5.0 raised since bump > to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: > > tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration > 113 | static void OPENSSL_cleanup(void) > | ^~~~~~~~~~~~~~~ > In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, > from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, > from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, > from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, > from ../../../include/zbxcomms.h:65, > from tls.c:20: > /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' > 565 | void OPENSSL_cleanup(void); > | ^~~~~~~~~~~~~~~ > In file included from tls.c:20: > tls.c: In function 'zbx_log_ciphersuites': > ../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} > 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) > | ^~ > tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' > 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); > | ^~~~~~~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 > > Signed-off-by: Fabrice Fontaine > --- > .../0002-fix-build-with-libressl-3.5.0.patch | 71 +++++++++++++++++++ > 1 file changed, 71 insertions(+) > create mode 100644 package/zabbix/0002-fix-build-with-libressl-3.5.0.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:40:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/hawktracer: update URL in Config.in In-Reply-To: <20230224134028.307983-1-fontaine.fabrice@gmail.com> References: <20230224134028.307983-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104006.25c03674@windsurf> On Fri, 24 Feb 2023 14:40:28 +0100 Fabrice Fontaine wrote: > Current website is down: > https://github.com/amzn/hawktracer/issues/87 > > Signed-off-by: Fabrice Fontaine > --- > package/hawktracer/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:40:15 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:15 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/systemd: fix build with -Ofast In-Reply-To: <20230224161543.27879-1-fontaine.fabrice@gmail.com> References: <20230224161543.27879-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104015.3f24e165@windsurf> On Fri, 24 Feb 2023 17:15:43 +0100 Fabrice Fontaine wrote: > Update -Ofast workaround as suggested by Yann E. Morin to avoid the > following build failure raised since bump to version 252.4 in commit > a2c823d1f548d5a0120d27d6c000603192360f7b and > https://github.com/systemd/systemd/commit/60f97fee2d2f948c8e8963ea8ff767008cb93cae: > > ../output-1/build/systemd-252.4/meson.build:397:8: ERROR: Problem encountered: -Ofast, -ffast-math, or -ffinite-math-only is specified in c_args. > > Fixes: > - http://autobuild.buildroot.org/results/8f41c4984b645851724e554c3162b83bc312bee7 > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Thomas Petazzoni and Yann E. Morin): > - Update workaround instead of disabling with -Ofast Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:40:20 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/hawktracer: bump to 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 In-Reply-To: <20230224163116.46934-1-fontaine.fabrice@gmail.com> References: <20230224163116.46934-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104020.1495fb25@windsurf> On Fri, 24 Feb 2023 17:31:16 +0100 Fabrice Fontaine wrote: > This bump will fix the following build failure with gcc >= 12: > > /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp: In function 'HT_Thread* ht_thread_create(ht_thread_callback_t, void*)': > /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp:1006:28: error: no matching function for call to 'operator new(sizetype, std::thread*)' > 1006 | new(&th->th) HT_Thread(); > | ^ > > https://github.com/amzn/hawktracer/compare/e53b07bc812c4cfe8f6253ddb48ac43de8fa74a8...2ec19d71923344148928ef45fce549eda67030a4 > > Fixes: > - http://autobuild.buildroot.org/results/d18a1b2ee6cdcb289567ae90b2d836844427b5f6 > > Signed-off-by: Fabrice Fontaine > --- > package/hawktracer/hawktracer.hash | 2 +- > package/hawktracer/hawktracer.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 Sat Feb 25 09:40:25 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-gmmlib: needs threads In-Reply-To: <20230224164053.53287-1-fontaine.fabrice@gmail.com> References: <20230224164053.53287-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104025.23e4e21c@windsurf> On Fri, 24 Feb 2023 17:40:53 +0100 Fabrice Fontaine wrote: > threads are mandatory since version 19.1.1 and > https://github.com/intel/gmmlib/commit/9e4aa143fb7e7e87332fcb7c9871040ff4a1a1da > resulting in the following build failure since commit > cd206d9b808a322a00294b4caad203a892ed4c92: > > CMake Error at /home/thomas/autobuild/instance-2/output-1/host/share/cmake-3.22/Modules/FindPackageHandleStandardArgs.cmake:230 (message): > Could NOT find Threads (missing: Threads_FOUND) > > Fixes: > - http://autobuild.buildroot.org/results/c1120932e8c212820b239ee8cd4a057623a73376 > > Signed-off-by: Fabrice Fontaine > --- > package/intel-gmmlib/Config.in | 6 ++++-- > package/intel-mediadriver/Config.in | 2 +- > 2 files changed, 5 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 Sat Feb 25 09:40:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/ntpsec: fix CPE ID version In-Reply-To: <20230224165753.64394-1-fontaine.fabrice@gmail.com> References: <20230224165753.64394-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104029.7ace5a7e@windsurf> On Fri, 24 Feb 2023 17:57:53 +0100 Fabrice Fontaine wrote: > CPE ID is wrong since the addition of the package in commit > 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a, the correct CPE ID is > cpe:2.3:a:ntpsec:ntpsec:1.2.2:*:*:*:*:*:*:*, not > cpe:2.3:a:ntpsec:ntpsec:1.2:2:*:*:*:*:*:* > > Signed-off-by: Fabrice Fontaine > --- > package/ntpsec/ntpsec.mk | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:40:40 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:40 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add ti-k3-r5-loader handling In-Reply-To: <20230225092227.9308-1-fontaine.fabrice@gmail.com> References: <20230225092227.9308-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104040.2aaf653b@windsurf> On Sat, 25 Feb 2023 10:22:27 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit 0189bcb47c7733c36fcbcb88fbf26f57958db576: > > make[2]: *** No rule to make target '_defconfig'. Stop. > > Fixes: > - http://autobuild.buildroot.org/results/d7449b2b2f2349af672bfeee832b89a223a7d9cc > > Signed-off-by: Fabrice Fontaine > --- > utils/genrandconfig | 5 +++++ > 1 file changed, 5 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:40:44 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:40:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: add host-pkgconf dependency In-Reply-To: <20230225093527.16587-1-fontaine.fabrice@gmail.com> References: <20230225093527.16587-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104044.0c68f497@windsurf> On Sat, 25 Feb 2023 10:35:27 +0100 Fabrice Fontaine wrote: > host-pkgconf is mandatory to find lz4 and zstd resulting in the > following build failure since commit > 9cd2e6e090449f9d2f371d24152580c038892f3d: > > configure: error: in `/home/autobuild/autobuild/instance-5/output-1/build/postgresql-15.2': > configure: error: The pkg-config script could not be found or is too old. Make sure it > is in your PATH or set the PKG_CONFIG environment variable to the full > path to pkg-config. > > Alternatively, you may set the environment variables LZ4_CFLAGS > and LZ4_LIBS to avoid the need to call pkg-config. > See the pkg-config man page for more details. > > Fixes: > - http://autobuild.buildroot.org/results/8744277ebe9910635ef8fe290c8ba4eee420b538 > > Signed-off-by: Fabrice Fontaine > --- > package/postgresql/postgresql.mk | 4 ++-- > 1 file 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 Sat Feb 25 09:41:29 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:41:29 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/xtables-addons: replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS In-Reply-To: <20230224092535.306646-1-fontaine.fabrice@gmail.com> References: <20230224092535.306646-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104129.71eef68c@windsurf> On Fri, 24 Feb 2023 10:25:35 +0100 Fabrice Fontaine wrote: > Replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS by > XTABLES_ADDONS_REMOVE_GEOIP_HELPERS to avoid the following build failure > raised since bump to version 3.22 in commit > 53f2999edfa5e67923d4d8a102c15fa3200e089c: > > make[3]: *** No rule to make target '/xt_geoip_query', needed by 'all-am'. Stop. > > Fixes: > - http://autobuild.buildroot.org/results/f2d596b510f027b94a6b1fad10c363922c50cbec > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Thomas Petazzoni): > - Add XTABLES_ADDONS_REMOVE_GEOIP_HELPERS Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:42:16 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:42:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/asterisk: fix build with libressl In-Reply-To: <20230224095045.782119-1-fontaine.fabrice@gmail.com> References: <20230224095045.782119-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104216.6f9f39b6@windsurf> On Fri, 24 Feb 2023 10:50:45 +0100 Fabrice Fontaine wrote: > Fix the following build failure with libressl by using SSL_is_server > which is available since version 2.7.0 and > https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: > > iostream.c: In function 'ast_iostream_close': > iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} > 559 | if (!stream->ssl->server) { > | ^~ > > Fixes: > - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 > > Signed-off-by: Fabrice Fontaine > --- > ...n-iostream.c-fix-build-with-libressl.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch Applied to master, thanks. What is the upstream status of this patch? Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:43:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:43:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/libblockdev: needs locale In-Reply-To: <20230224101039.1445129-1-fontaine.fabrice@gmail.com> References: <20230224101039.1445129-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104336.1ffa8dc8@windsurf> On Fri, 24 Feb 2023 11:10:39 +0100 Fabrice Fontaine wrote: > locale_t is unconditionally used since version 1.5 and > https://github.com/storaged-project/libblockdev/commit/4ed6f0b3a46fc77554dab661c22150829aa75966 > resulting in the following build failure since the addition of the > package in commit 0c52826291d1884db0f8f35130216065fbc7b574: > > module.c:33:37: error: unknown type name 'locale_t' > 33 | static char *strerror_l(int errnum, locale_t locale UNUSED) > | ^~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/ede9eb1f13d56c77005cc448416fb2efa9d16ff0 > > Signed-off-by: Fabrice Fontaine > --- > package/libblockdev/Config.in | 6 ++++-- > package/udisks/Config.in | 2 +- > 2 files changed, 5 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 Sat Feb 25 09:44:23 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:44:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: add linux-pam optional dependency In-Reply-To: <20230224101720.1458102-1-fontaine.fabrice@gmail.com> References: <20230224101720.1458102-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104423.3a9cc6ab@windsurf> On Fri, 24 Feb 2023 11:17:20 +0100 Fabrice Fontaine wrote: > +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) > +XSCREENSAVER_CONF_OPTS += --with-pam=yes > +XSCREENSAVER_DEPENDENCIES += linux-pam > +else > +XSCREENSAVER_CONF_OPTS += --with-pam=no > +endif Any reason not to use --with-pam/--without-pam like we do in Buildroot, rather than --with-pam=yes/--with-pam=no? 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 Sat Feb 25 09:49:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:49:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/ntpsec: fix build without stack-protector In-Reply-To: <20230224105148.1780818-1-fontaine.fabrice@gmail.com> References: <20230224105148.1780818-1-fontaine.fabrice@gmail.com> Message-ID: <20230225104926.28b9bb48@windsurf> On Fri, 24 Feb 2023 11:51:48 +0100 Fabrice Fontaine wrote: > Fix the following build failure without stack-protector raised since the > addition of the package in commit > 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a: > > Checking for library ssp : not found > Checking for library ssp_nonshared : not found > Checking if C compiler supports -fstack-protector-all : yes > > [...] > > The configuration failed > (complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log) > > Fixes: > - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a > - http://autobuild.buildroot.org/results/62be818e2f2eac07b4a2de6f4a8898cc4cc05b1f > > Signed-off-by: Fabrice Fontaine > --- > ...pt-fix-build-without-stack-protector.patch | 50 +++++++++++++++++++ > 1 file changed, 50 insertions(+) > create mode 100644 package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:41:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:41:18 +0100 Subject: [Buildroot] [git commit] package/xtables-addons: replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS Message-ID: <20230225095001.9FA9986A88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7243e9394c53c7e0e6e10c3d149a2afa999635ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS by XTABLES_ADDONS_REMOVE_GEOIP_HELPERS to avoid the following build failure raised since bump to version 3.22 in commit 53f2999edfa5e67923d4d8a102c15fa3200e089c: make[3]: *** No rule to make target '/xt_geoip_query', needed by 'all-am'. Stop. Fixes: - http://autobuild.buildroot.org/results/f2d596b510f027b94a6b1fad10c363922c50cbec Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xtables-addons/xtables-addons.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 77dcfd741c..e794538956 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -16,12 +16,6 @@ XTABLES_ADDONS_CONF_OPTS = \ --with-xtables="$(STAGING_DIR)/usr" \ --with-xtlibdir="/usr/lib/xtables" -# geoip helpers need perl with modules and unzip so disable -define XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - $(SED) 's/ geoip//' $(@D)/Makefile.in -endef -XTABLES_ADDONS_POST_PATCH_HOOKS += XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - define XTABLES_ADDONS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) endef @@ -30,6 +24,15 @@ define XTABLES_ADDONS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install endef +# geoip helpers need perl with modules and unzip so remove them +define XTABLES_ADDONS_REMOVE_GEOIP_HELPERS + $(RM) $(TARGET_DIR)/usr/bin/xt_geoip* + $(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_asn* + $(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_geoip* +endef + +XTABLES_ADDONS_POST_INSTALL_TARGET_HOOKS += XTABLES_ADDONS_REMOVE_GEOIP_HELPERS + define XTABLES_ADDONS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) From thomas.petazzoni at bootlin.com Sat Feb 25 09:49:52 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:49:52 +0100 Subject: [Buildroot] [git commit] package/freescale-imx/imx-gpu-g2d: drop BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES Message-ID: <20230225095001.CFAFA86A88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=333580b68037ef756fa637bbfc49f34f1ad5e0ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Arm and aarch64 packages don't contain examples anymore so drop the config option to install them to prevent build failure when selected: >>> imx-gpu-g2d 6.4.3.p4.4-arm Installing to target mkdir -p /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ cp -a /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/* /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ cp: cannot stat '/home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/*': No such file or directory make: *** [package/pkg-generic.mk:384: /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/.stamp_target_installed] Error 1 Fixes: b84557b588b3 ("package/freescale-imx/imx-gpu-g2d: bump version to 6.4.3.p4.4") Signed-off-by: S??bastien Szymanski Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ++++++ package/freescale-imx/imx-gpu-g2d/Config.in | 9 --------- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 8 -------- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7f69462f2e..af1d8cc1dc 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES + bool "imx-gpu-g2d examples removed" + select BR2_LEGACY + help + The examples are not provided by NXP anymore. + config BR2_KERNEL_HEADERS_6_0 bool "kernel headers version 6.0.x are no longer supported" select BR2_LEGACY diff --git a/package/freescale-imx/imx-gpu-g2d/Config.in b/package/freescale-imx/imx-gpu-g2d/Config.in index aeca087f86..c143b17c47 100644 --- a/package/freescale-imx/imx-gpu-g2d/Config.in +++ b/package/freescale-imx/imx-gpu-g2d/Config.in @@ -18,12 +18,3 @@ config BR2_PACKAGE_IMX_GPU_G2D This library is provided by NXP as-is and doesn't have an upstream. - -if BR2_PACKAGE_IMX_GPU_G2D - -config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES - bool "install examples" - help - Copy the Vivante G2D examples to the target. - -endif diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index d94da24d8f..42a1fe70cf 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -26,15 +26,7 @@ define IMX_GPU_G2D_INSTALL_STAGING_CMDS cp -a $(@D)/g2d/usr/* $(STAGING_DIR)/usr endef -ifeq ($(BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES),y) -define IMX_GPU_G2D_INSTALL_EXAMPLES - mkdir -p $(TARGET_DIR)/usr/share/examples/ - cp -a $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/ -endef -endif - define IMX_GPU_G2D_INSTALL_TARGET_CMDS - $(IMX_GPU_G2D_INSTALL_EXAMPLES) cp -a $(@D)/g2d/usr/lib $(TARGET_DIR)/usr endef From thomas.petazzoni at bootlin.com Sat Feb 25 09:43:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:43:26 +0100 Subject: [Buildroot] [git commit] package/libblockdev: needs locale Message-ID: <20230225095001.B7CDE86A8C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a6b4217312815379a7c52bf5d53752dbe0838645 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master locale_t is unconditionally used since version 1.5 and https://github.com/storaged-project/libblockdev/commit/4ed6f0b3a46fc77554dab661c22150829aa75966 resulting in the following build failure since the addition of the package in commit 0c52826291d1884db0f8f35130216065fbc7b574: module.c:33:37: error: unknown type name 'locale_t' 33 | static char *strerror_l(int errnum, locale_t locale UNUSED) | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ede9eb1f13d56c77005cc448416fb2efa9d16ff0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libblockdev/Config.in | 6 ++++-- package/udisks/Config.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 4389fd794c..4f98621bd8 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBBLOCKDEV depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_ENABLE_LOCALE select BR2_PACKAGE_KMOD select BR2_PACKAGE_LIBGLIB2 help @@ -66,7 +67,8 @@ config BR2_PACKAGE_LIBBLOCKDEV_SWAP endif -comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library" +comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library, locale" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_ENABLE_LOCALE diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 253d5cdc6b..b1d02a31b2 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_UDISKS bool "udisks" - depends on BR2_ENABLE_LOCALE # parted + depends on BR2_ENABLE_LOCALE # libblockdev, parted depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # polkit -> C++17 depends on BR2_TOOLCHAIN_HAS_THREADS # polkit From thomas.petazzoni at bootlin.com Sat Feb 25 09:48:28 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:48:28 +0100 Subject: [Buildroot] [git commit] package/ntpsec: fix build without stack-protector Message-ID: <20230225095001.C2CA986A8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a99d6611f0de6b1844cdbdc81d0ff25949c2b16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without stack-protector raised since the addition of the package in commit 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a: Checking for library ssp : not found Checking for library ssp_nonshared : not found Checking if C compiler supports -fstack-protector-all : yes [...] The configuration failed (complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log) Fixes: - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a - http://autobuild.buildroot.org/results/62be818e2f2eac07b4a2de6f4a8898cc4cc05b1f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...wscript-fix-build-without-stack-protector.patch | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch b/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch new file mode 100644 index 0000000000..f494bf479c --- /dev/null +++ b/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch @@ -0,0 +1,50 @@ +From 0a3ce09c14eb9c7e36aa30a4dafe40e56676d678 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 Feb 2023 11:33:32 +0100 +Subject: [PATCH] wscript: fix build without stack-protector + +-fstack-protector-all can depends on ssp library availability (e.g. on musl) so +move the test from cc_test_flags to ld_hardening_flags, this will avoid the +following build failure: + +Checking for library ssp : not found +Checking for library ssp_nonshared : not found +Checking if C compiler supports -fstack-protector-all : yes + +[...] + +The configuration failed +(complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log) + +Fixes: + - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ntpsec/ntpsec/pull/6] +--- + wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index be396b33b..f301809fc 100644 +--- a/wscript ++++ b/wscript +@@ -298,7 +298,6 @@ def configure(ctx): + ctx.env.LDFLAGS += ["-lssp_nonshared"] + + cc_test_flags = [ +- ('f_stack_protector_all', '-fstack-protector-all'), + ('PIC', '-fPIC'), + ('PIE', '-pie -fPIE'), + # this quiets most of macOS warnings on -fpie +@@ -332,6 +331,7 @@ def configure(ctx): + + # Check which linker flags are supported + ld_hardening_flags = [ ++ ('f_stack_protector_all', '-fstack-protector-all'), + ("z_now", "-Wl,-z,now"), # no deferred symbol resolution + ] + +-- +2.39.1 + From thomas.petazzoni at bootlin.com Sat Feb 25 09:41:59 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:41:59 +0100 Subject: [Buildroot] [git commit] package/asterisk: fix build with libressl Message-ID: <20230225095001.A9F6986904@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8985cf50cca852cc5cc840a605e01713e758d40 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with libressl by using SSL_is_server which is available since version 2.7.0 and https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: iostream.c: In function 'ast_iostream_close': iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} 559 | if (!stream->ssl->server) { | ^~ Fixes: - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...6-main-iostream.c-fix-build-with-libressl.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch b/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch new file mode 100644 index 0000000000..cdd3aa8cfb --- /dev/null +++ b/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch @@ -0,0 +1,38 @@ +From 9569fa20fec49f530170a3042afb99556cf66a2e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Apr 2022 10:52:42 +0200 +Subject: [PATCH] main/iostream.c: fix build with libressl + +Fix the following build failure with libressl by using SSL_is_server +which is available since version 2.7.0 and +https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: + +iostream.c: In function 'ast_iostream_close': +iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} + 559 | if (!stream->ssl->server) { + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 + +Signed-off-by: Fabrice Fontaine +--- + main/iostream.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main/iostream.c b/main/iostream.c +index d060b6d6d4..b8ab80ec91 100644 +--- a/main/iostream.c ++++ b/main/iostream.c +@@ -553,7 +553,7 @@ int ast_iostream_close(struct ast_iostream *stream) + ERR_error_string(sslerr, err), ssl_error_to_string(sslerr, res)); + } + +-#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if !(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x2070000L)) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + if (!SSL_is_server(stream->ssl)) { + #else + if (!stream->ssl->server) { +-- +2.35.1 + From thomas.petazzoni at bootlin.com Sat Feb 25 09:50:03 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:50:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/freescale-imx/imx-gpu-g2d: drop BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES In-Reply-To: <20230224105315.16171-1-sebastien.szymanski@armadeus.com> References: <20230224105315.16171-1-sebastien.szymanski@armadeus.com> Message-ID: <20230225105003.632fa577@windsurf> On Fri, 24 Feb 2023 11:53:15 +0100 S?bastien Szymanski wrote: > Arm and aarch64 packages don't contain examples anymore so drop the > config option to install them to prevent build failure when selected: > > >>> imx-gpu-g2d 6.4.3.p4.4-arm Installing to target > mkdir -p /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ > cp -a /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/* /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ > cp: cannot stat '/home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/*': No such file or directory > make: *** [package/pkg-generic.mk:384: /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/.stamp_target_installed] Error 1 > > Fixes: b84557b588b3 ("package/freescale-imx/imx-gpu-g2d: bump version to 6.4.3.p4.4") > Signed-off-by: S?bastien Szymanski > --- > Config.in.legacy | 6 ++++++ > package/freescale-imx/imx-gpu-g2d/Config.in | 9 --------- > package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 8 -------- > 3 files changed, 6 insertions(+), 17 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:52:10 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:52:10 +0100 Subject: [Buildroot] [PATCH v4 4/4] package/libgtk3: fix update-icon-cache on empty directory In-Reply-To: <20230223125612.3156012-1-thomas.devoogdt@barco.com> References: <20230223125612.3156012-1-thomas.devoogdt@barco.com> Message-ID: <20230225105210.248b646a@windsurf> Hello Thomas, On Thu, 23 Feb 2023 13:56:12 +0100 Thomas Devoogdt wrote: > If both, hicolor-icon-theme (selected by libgtk3-demo) and > adwaita-icon-theme is not selected, then the /usr/share/icons > folder is empty, causing find to fail. > > Signed-off-by: Thomas Devoogdt Thanks for this work on gtk! Could you please always resend complete series, even if only one patch is changed? Otherwise, it's super confusing. We see just PATCH 4/4 in version 4, and we wonder if the other patches (1/4, 2/4, 3/4) were lost. > @@ -146,6 +146,7 @@ endef > # Create icon-theme.cache for each of the icon directories/themes > # It's not strictly necessary but speeds up lookups > define LIBGTK3_UPDATE_ICON_CACHE > +[ ! -d $(TARGET_DIR)/usr/share/icons ] || \ Indentation is not correct, this line should be indented with one tab. > find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ > -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; > endef Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 09:52:18 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:52:18 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: require MD5 perl package for netsurf Message-ID: <20230225095226.A7CA086A8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b83a9675cb81d4281594e5a59e7a8805e8561bd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure: Can't locate object method "hexhash" via package "MD5" at utils/git-testament.pl line 47 Fixes: - http://autobuild.buildroot.org/results/3dddcbbe7f6ecae5a2db6fac11fb659719452f73 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index a692856d31..563dbe1595 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -290,6 +290,10 @@ if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigRat" fi +if grep -q ^BR2_PACKAGE_NETSURF=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules Digest::MD5" +fi + if grep -q ^BR2_PACKAGE_WHOIS=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules autodie" fi From thomas.petazzoni at bootlin.com Sat Feb 25 09:52:26 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 10:52:26 +0100 Subject: [Buildroot] [PATCH 1/1] support/dependencies/dependencies.sh: require MD5 perl package for netsurf In-Reply-To: <20230223225942.313435-1-fontaine.fabrice@gmail.com> References: <20230223225942.313435-1-fontaine.fabrice@gmail.com> Message-ID: <20230225105226.0e62e4cb@windsurf> On Thu, 23 Feb 2023 23:59:42 +0100 Fabrice Fontaine wrote: > Fix the following build failure: > > Can't locate object method "hexhash" via package "MD5" at utils/git-testament.pl line 47 > > Fixes: > - http://autobuild.buildroot.org/results/3dddcbbe7f6ecae5a2db6fac11fb659719452f73 > > Signed-off-by: Fabrice Fontaine > --- > support/dependencies/dependencies.sh | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 10:07:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 11:07:36 +0100 Subject: [Buildroot] [git commit] package/lttng-babeltrace: fix popt static build with libiconv Message-ID: <20230225100802.39B7586A96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34625d54c9ba4f9e19fdc350fcf0a48a05c98576 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following popt static build failure with libiconv: configure:18149: checking for poptGetContext in -lpopt configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5 /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': poptint.c:(.text+0x28a): undefined reference to `libiconv_open' [...] checking for poptGetContext in -lpopt... no configure: error: Cannot find popt. Fixes: - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0002-configure.ac-fix-popt-static-build.patch | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch b/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch new file mode 100644 index 0000000000..896c67470f --- /dev/null +++ b/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch @@ -0,0 +1,48 @@ +From 35076fd4592ca23136ff5eacdf8eaebc926e0224 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 13:04:08 +0100 +Subject: [PATCH] configure.ac: fix popt static build + +Fix the following popt static build failure: + +configure:18149: checking for poptGetContext in -lpopt +configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5 +/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': +poptint.c:(.text+0x28a): undefined reference to `libiconv_open' + +[...] + +checking for poptGetContext in -lpopt... no +configure: error: Cannot find popt. + +Fixes: + - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f + +Signed-off-by: Fabrice Fontaine +[Upstream status: not upstreamable as popt has been removed with +https://github.com/efficios/babeltrace/commit/916d0d910ad5407bc7826505aa05b277f5739a34] +--- + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a17c23c3..8f700d3e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -223,8 +223,11 @@ AC_CHECK_LIB([c], [faccessat], + ] + ) + +-AC_CHECK_LIB([popt], [poptGetContext], [], +- [AC_MSG_ERROR([Cannot find popt.])] ++PKG_CHECK_MODULES([POPT], [popt], [LIBS="${POPT_LIBS} ${LIBS}"], ++[ ++ AC_CHECK_LIB([popt], [poptGetContext], [], ++ [AC_MSG_ERROR([Cannot find popt.])]) ++] + ) + + # For Python +-- +2.39.1 + From thomas.petazzoni at bootlin.com Sat Feb 25 10:08:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 11:08:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/lttng-babeltrace: fix popt static build with libiconv In-Reply-To: <20230223123644.402595-1-fontaine.fabrice@gmail.com> References: <20230223123644.402595-1-fontaine.fabrice@gmail.com> Message-ID: <20230225110801.6c7053fa@windsurf> On Thu, 23 Feb 2023 13:36:44 +0100 Fabrice Fontaine wrote: > Fix the following popt static build failure with libiconv: > > configure:18149: checking for poptGetContext in -lpopt > configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5 > /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': > poptint.c:(.text+0x28a): undefined reference to `libiconv_open' > > [...] > > checking for poptGetContext in -lpopt... no > configure: error: Cannot find popt. > > Fixes: > - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f > > Signed-off-by: Fabrice Fontaine > --- > ...2-configure.ac-fix-popt-static-build.patch | 48 +++++++++++++++++++ > 1 file changed, 48 insertions(+) > create mode 100644 package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sat Feb 25 10:35:14 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 11:35:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/asterisk: fix build with libressl In-Reply-To: <20230225104216.6f9f39b6@windsurf> References: <20230224095045.782119-1-fontaine.fabrice@gmail.com> <20230225104216.6f9f39b6@windsurf> Message-ID: Le sam. 25 f?vr. 2023 ? 10:42, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > On Fri, 24 Feb 2023 10:50:45 +0100 > Fabrice Fontaine wrote: > > > Fix the following build failure with libressl by using SSL_is_server > > which is available since version 2.7.0 and > > > https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7 > : > > > > iostream.c: In function 'ast_iostream_close': > > iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka > 'struct ssl_st'} > > 559 | if (!stream->ssl->server) { > > | ^~ > > > > Fixes: > > - > http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 > > > > Signed-off-by: Fabrice Fontaine > > --- > > ...n-iostream.c-fix-build-with-libressl.patch | 38 +++++++++++++++++++ > > 1 file changed, 38 insertions(+) > > create mode 100644 > package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch > > Applied to master, thanks. What is the upstream status of this patch? > I finally sent it today ( https://issues.asterisk.org/jira/browse/ASTERISK-30107), I really hate gerrit ... > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Sat Feb 25 10:39:23 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 11:39:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: add linux-pam optional dependency In-Reply-To: <20230225104423.3a9cc6ab@windsurf> References: <20230224101720.1458102-1-fontaine.fabrice@gmail.com> <20230225104423.3a9cc6ab@windsurf> Message-ID: Le sam. 25 f?vr. 2023 ? 10:44, Thomas Petazzoni < thomas.petazzoni at bootlin.com> a ?crit : > On Fri, 24 Feb 2023 11:17:20 +0100 > Fabrice Fontaine wrote: > > > +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) > > +XSCREENSAVER_CONF_OPTS += --with-pam=yes > > +XSCREENSAVER_DEPENDENCIES += linux-pam > > +else > > +XSCREENSAVER_CONF_OPTS += --with-pam=no > > +endif > > Any reason not to use --with-pam/--without-pam like we do in Buildroot, > rather than --with-pam=yes/--with-pam=no? > The only reason is for consistency with the other options in xscreensaver.mk . > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > Best Regards, Fabrice -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Sat Feb 25 10:57:15 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 11:57:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix second patch Message-ID: <20230225105715.1265130-1-fontaine.fabrice@gmail.com> Fix patch added by commit 7edb4a6a4db7d864c6c1560f3fdc1ef4fbd7f0fd: 0x300000fL -> 0x3050000fL Signed-off-by: Fabrice Fontaine --- package/zabbix/0002-fix-build-with-libressl-3.5.0.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch index 7e32ad5745..acb5cfc9a6 100644 --- a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch +++ b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch @@ -61,7 +61,7 @@ index 54ab0a6ef4..bd4075b3e4 100644 -#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) -/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ +#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ -+ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x300000fL ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL +/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL (before 3.5.0) */ /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and example in crypto/threads/mttest.c) */ -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 11:12:52 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 12:12:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsigrokdecode: fix build with python > 3.10 Message-ID: <20230225111252.1658233-1-fontaine.fabrice@gmail.com> Fix the following build failure with sigrok-cli and python > 3.10: /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mips64-buildroot-linux-gnu/11.3.0/../../../../mips64-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/bin/../mips64-buildroot-linux-gnu/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyTuple_SetItem' Fixes: - http://autobuild.buildroot.org/results/435ad19597a1e216a7974bc9ccaf17064d1eccea Signed-off-by: Fabrice Fontaine --- ...c-Use-python3-embed-pc-as-a-fallback.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch diff --git a/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch b/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch new file mode 100644 index 0000000000..8e9c6f0063 --- /dev/null +++ b/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch @@ -0,0 +1,30 @@ +From a6a5e2c8b0e9ecf5d69d0c237c8e8b717b82b36f Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras +Date: Thu, 3 Dec 2020 19:17:00 +0200 +Subject: [PATCH] configure.ac: Use python3-embed.pc as a fallback + +This provides some future-proofing against newer Python versions. + +[Retrieved from: +https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commit;h=a6a5e2c8b0e9ecf5d69d0c237c8e8b717b82b36f] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b8841f8..c1314bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python3-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + +-- +2.30.2 + -- 2.39.1 From casey at xogium.me Sat Feb 25 11:28:38 2023 From: casey at xogium.me (Casey Reeves) Date: Sat, 25 Feb 2023 12:28:38 +0100 Subject: [Buildroot] [PATCH] package/lzop: bump to version 1.04 Message-ID: <20230225112838.4061103-1-casey@xogium.me> lzop 1.04 uses libtool 2.4.2.418, which is right between 2.4.2 and 2.4.4. While our patch for 2.4 is also supposed to work up to and including 2.4.2.x, it does not work for libtool 2.4.2.418, which requires the patch for 2.4.4. We could change our infra to better pick the appropriate patch, but we do not know exactly which 2.4.2.x version is actually the cutting point that requires the 2.4.4 patch. Until we have more data point, let's handle the case in an ad-hoc manner for lzop. Additionally, this lzop bump carries the patch from florian B?uerle, which allows to set the mtime of the lzop archive for reproducible build support using SOURCE_DATE_EPOCH. https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch --- ...1-allow-overriding-modification-time.patch | 35 ++++++ package/lzop/0001-build-with-gcc6.patch | 37 ------- ...es-as-the-external-inline-definition.patch | 102 ------------------ package/lzop/lzop.hash | 2 +- package/lzop/lzop.mk | 9 +- 5 files changed, 44 insertions(+), 141 deletions(-) create mode 100644 package/lzop/0001-allow-overriding-modification-time.patch delete mode 100644 package/lzop/0001-build-with-gcc6.patch delete mode 100644 package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch diff --git a/package/lzop/0001-allow-overriding-modification-time.patch b/package/lzop/0001-allow-overriding-modification-time.patch new file mode 100644 index 0000000000..192d73c2b2 --- /dev/null +++ b/package/lzop/0001-allow-overriding-modification-time.patch @@ -0,0 +1,35 @@ +From: =?UTF-8?q?Florian=20B=C3=A4uerle?= +Date: Thu, 25 Oct 2018 17:26:30 +0200 +Subject: [PATCH] allow overriding modification time + +--- + src/lzop.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/lzop.c b/src/lzop.c +index a540ad9c4d33..c2f877d16f92 100644 +--- a/src/lzop.c ++++ b/src/lzop.c +@@ -712,6 +712,7 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + assert(opt_method > 0); + assert(opt_level > 0); + assert(fip->st.st_mode == 0 || S_ISREG(fip->st.st_mode)); ++ const char *source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + + memset(h,0,sizeof(header_t)); + +@@ -748,7 +749,13 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + + h->mode = fix_mode_for_header(fip->st.st_mode); + +- if (fip->st.st_mtime > 0) ++ if (source_date_epoch) ++ { ++ time_t mtime = strtoul(source_date_epoch, NULL, 0); ++ h->mtime_low = (lzo_uint32) (mtime); ++ h->mtime_high = (lzo_uint32) ((mtime >> 16) >> 16); ++ } ++ else if (fip->st.st_mtime > 0) + { + h->mtime_low = (lzo_uint32) (fip->st.st_mtime); + h->mtime_high = (lzo_uint32) ((fip->st.st_mtime >> 16) >> 16); diff --git a/package/lzop/0001-build-with-gcc6.patch b/package/lzop/0001-build-with-gcc6.patch deleted file mode 100644 index 03bd887d51..0000000000 --- a/package/lzop/0001-build-with-gcc6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Jaap Crezee -Date: Sat, 25 june 2016 13:13:00 +0200 -Subject: [PATCH] fix compilation host-lzop with gcc-6 - -This patch allows host-lzop to be compiled with host systems containing gcc-6 - -Upstream patch found here: -https://build.opensuse.org/package/view_file/Archiving/lzop/lzop-1.03-gcc6.patch?expand=1 - -Signed-off-by: Jaap Crezee - ---- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100 -+++ b/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 -@@ -4469,12 +4469,12 @@ - #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) -+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) - #endif - ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) - #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) -+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) - #endif - ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) - #if defined(acc_int16e_t) -@@ -4703,7 +4703,7 @@ - #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) -- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) -+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) - #endif - #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) - # pragma option pop diff --git a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch b/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch deleted file mode 100644 index f6d076a9f7..0000000000 --- a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch +++ /dev/null @@ -1,102 +0,0 @@ -From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 16 Aug 2015 10:35:47 -0700 -Subject: [PATCH] use static inlines as the external inline definition has - changed with gcc5 - -[Patch from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch] -Signed-off-by: Khem Raj -Signed-off-by: Peter Korsgaard ---- -Upstream-Status: Pending - - src/miniacc.h | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - -diff --git a/src/miniacc.h b/src/miniacc.h -index 09e6f0c..cae98d1 100644 ---- a/src/miniacc.h -+++ b/src/miniacc.h -@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } --- -2.5.0 - diff --git a/package/lzop/lzop.hash b/package/lzop/lzop.hash index adc20648b6..99796dc8c9 100644 --- a/package/lzop/lzop.hash +++ b/package/lzop/lzop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 lzop-1.03.tar.gz +sha256 7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41 lzop-1.04.tar.gz sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk index 55157c4d48..2eeedaab34 100644 --- a/package/lzop/lzop.mk +++ b/package/lzop/lzop.mk @@ -4,13 +4,20 @@ # ################################################################################ -LZOP_VERSION = 1.03 +LZOP_VERSION = 1.04 LZOP_SITE = http://www.lzop.org/download LZOP_LICENSE = GPL-2.0+ LZOP_LICENSE_FILES = COPYING LZOP_DEPENDENCIES = lzo HOST_LZOP_DEPENDENCIES = host-lzo +LZOP_LIBTOOL_PATCH=NO +LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP + +define LZOP_LIBTOOL_FIXUP + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $(@D)/autoconf/ltmain.sh +endef + $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.39.2 From fontaine.fabrice at gmail.com Sat Feb 25 12:30:22 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 13:30:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtty: bump to version 8.1.0 Message-ID: <20230225123022.1987160-1-fontaine.fabrice@gmail.com> This bump will fix the following build failure with wolfssl raised, at least, since bump of wolfssl to version 5.5.0 in commit 1891419db38e4d85595b2111db448f68eef684b8: /tmp/instance-18/output-1/build/rtty-7.4.0/src/ssl.c:75:5: error: unknown type name 'SSL_CTX' 75 | SSL_CTX *ctx; | ^~~~~~~ https://github.com/zhaojh329/rtty/compare/v7.4.0...v8.1.0 Fixes: - http://autobuild.buildroot.org/results/d045d85890ca97accfcea6c13c94757485d867c2 Signed-off-by: Fabrice Fontaine --- package/rtty/rtty.hash | 2 +- package/rtty/rtty.mk | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package/rtty/rtty.hash b/package/rtty/rtty.hash index b2e9db2436..a6ccb5c2e6 100644 --- a/package/rtty/rtty.hash +++ b/package/rtty/rtty.hash @@ -1,2 +1,2 @@ -sha256 9bc5d30dfa9bd664a62711b6229f47505b83adb364907f24e3a404aad52a4802 rtty-7.4.0.tar.gz +sha256 e634939bae62bf3d52ceebae5df00179629d214634b93464eeb2294406512b30 rtty-8.1.0.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index 4ec220394c..964ec04ec4 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTTY_VERSION = 7.4.0 +RTTY_VERSION = 8.1.0 RTTY_SITE = https://github.com/zhaojh329/rtty/releases/download/v$(RTTY_VERSION) RTTY_LICENSE = MIT RTTY_LICENSE_FILES = LICENSE @@ -13,26 +13,26 @@ RTTY_DEPENDENCIES = libev ifeq ($(BR2_PACKAGE_MBEDTLS),y) RTTY_DEPENDENCIES += mbedtls RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=ON \ - -DRTTY_USE_OPENSSL=OFF \ - -DRTTY_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=ON \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_OPENSSL),y) RTTY_DEPENDENCIES += host-pkgconf openssl RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=OFF \ - -DRTTY_USE_OPENSSL=ON \ - -DRTTY_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=ON \ + -DUSE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_WOLFSSL),y) RTTY_DEPENDENCIES += wolfssl RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=OFF \ - -DRTTY_USE_OPENSSL=OFF \ - -DRTTY_USE_WOLFSSL=ON + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=ON else -RTTY_CONF_OPTS += -DRTTY_SSL_SUPPORT=OFF +RTTY_CONF_OPTS += -DSSL_SUPPORT=OFF endif $(eval $(cmake-package)) -- 2.39.1 From ju.o at free.fr Sat Feb 25 12:55:44 2023 From: ju.o at free.fr (Julien Olivain) Date: Sat, 25 Feb 2023 13:55:44 +0100 Subject: [Buildroot] [PATCH next 1/1] package/ptm2human: bump to latest commit d0b8b6b Message-ID: <20230225125544.390204-1-ju.o@free.fr> For change log since commit d0b8b6b, see project commit log: https://github.com/hwangcc23/ptm2human/commits/c8c5e7d5bdacd73114f4f244355e88c7f4e7d64a Signed-off-by: Julien Olivain --- Patch tested on branch next at commit b793f3a with commands: make check-package ... 0 warnings generated utils/test-pkg -a -p ptm2human ... 45 builds, 30 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/ptm2human/ptm2human.hash | 2 +- package/ptm2human/ptm2human.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ptm2human/ptm2human.hash b/package/ptm2human/ptm2human.hash index 0346019667..d581491bde 100644 --- a/package/ptm2human/ptm2human.hash +++ b/package/ptm2human/ptm2human.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 28947eeb458d8b6a362cbeb8c5cb6098006274af04ebb4f5da70eac89f927d95 ptm2human-d0b8b6be9897ea5b04fd6460038a4773cec078bc.tar.gz +sha256 4c66e9429dfb92b5f4332b08050db0436511581102d1ec56555eb8229d9c2c74 ptm2human-c8c5e7d5bdacd73114f4f244355e88c7f4e7d64a.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/ptm2human/ptm2human.mk b/package/ptm2human/ptm2human.mk index 28a7b7ab48..edba21d401 100644 --- a/package/ptm2human/ptm2human.mk +++ b/package/ptm2human/ptm2human.mk @@ -4,7 +4,7 @@ # ################################################################################ -PTM2HUMAN_VERSION = d0b8b6be9897ea5b04fd6460038a4773cec078bc +PTM2HUMAN_VERSION = c8c5e7d5bdacd73114f4f244355e88c7f4e7d64a PTM2HUMAN_SITE = $(call github,hwangcc23,ptm2human,$(PTM2HUMAN_VERSION)) PTM2HUMAN_LICENSE = GPL-2.0 PTM2HUMAN_LICENSE_FILES = LICENSE -- 2.39.2 From casey at xogium.me Sat Feb 25 13:29:27 2023 From: casey at xogium.me (Casey Reeves) Date: Sat, 25 Feb 2023 14:29:27 +0100 Subject: [Buildroot] [PATCH v2] package/lzop: bump to version 1.04 In-Reply-To: <20230225112838.4061103-1-casey@xogium.me> References: <20230225112838.4061103-1-casey@xogium.me> Message-ID: <20230225132927.4067626-1-casey@xogium.me> lzop 1.04 uses libtool 2.4.2.418, which is right between 2.4.2 and 2.4.4. While our patch for 2.4 is also supposed to work up to and including 2.4.2.x, it does not work for libtool 2.4.2.418, which requires the patch for 2.4.4. We could change our infra to better pick the appropriate patch, but we do not know exactly which 2.4.2.x version is actually the cutting point that requires the 2.4.4 patch. Until we have more data point, let's handle the case in an ad-hoc manner for lzop. Additionally, this lzop bump carries the patch from florian B?uerle, which allows to set the mtime of the lzop archive for reproducible build support using SOURCE_DATE_EPOCH. https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch Signed-off-by: Casey Reeves --- Changes v1 -> v2: - added missing SoB for both the commit and the included patch - provided explanation and origin of the patch in its file --- ...1-allow-overriding-modification-time.patch | 42 ++++++++ package/lzop/0001-build-with-gcc6.patch | 37 ------- ...es-as-the-external-inline-definition.patch | 102 ------------------ package/lzop/lzop.hash | 2 +- package/lzop/lzop.mk | 11 +- 5 files changed, 53 insertions(+), 141 deletions(-) create mode 100644 package/lzop/0001-allow-overriding-modification-time.patch delete mode 100644 package/lzop/0001-build-with-gcc6.patch delete mode 100644 package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch diff --git a/package/lzop/0001-allow-overriding-modification-time.patch b/package/lzop/0001-allow-overriding-modification-time.patch new file mode 100644 index 0000000000..5ffc64cd30 --- /dev/null +++ b/package/lzop/0001-allow-overriding-modification-time.patch @@ -0,0 +1,42 @@ +From: =?UTF-8?q?Florian=20B=C3=A4uerle?= +Date: Thu, 25 Oct 2018 17:26:30 +0200 +Subject: [PATCH] allow overriding modification time + +This patch allows to set the mtime of the lzop archive to +$SOURCE_DATE_EPOCH, required for reproducible build. It was submitted to +pengutronix by florian B?uerle in october 2018. + +https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch + +Signed-off-by: Casey Reeves +--- + src/lzop.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/lzop.c b/src/lzop.c +index a540ad9c4d33..c2f877d16f92 100644 +--- a/src/lzop.c ++++ b/src/lzop.c +@@ -712,6 +712,7 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + assert(opt_method > 0); + assert(opt_level > 0); + assert(fip->st.st_mode == 0 || S_ISREG(fip->st.st_mode)); ++ const char *source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + + memset(h,0,sizeof(header_t)); + +@@ -748,7 +749,13 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + + h->mode = fix_mode_for_header(fip->st.st_mode); + +- if (fip->st.st_mtime > 0) ++ if (source_date_epoch) ++ { ++ time_t mtime = strtoul(source_date_epoch, NULL, 0); ++ h->mtime_low = (lzo_uint32) (mtime); ++ h->mtime_high = (lzo_uint32) ((mtime >> 16) >> 16); ++ } ++ else if (fip->st.st_mtime > 0) + { + h->mtime_low = (lzo_uint32) (fip->st.st_mtime); + h->mtime_high = (lzo_uint32) ((fip->st.st_mtime >> 16) >> 16); diff --git a/package/lzop/0001-build-with-gcc6.patch b/package/lzop/0001-build-with-gcc6.patch deleted file mode 100644 index 03bd887d51..0000000000 --- a/package/lzop/0001-build-with-gcc6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Jaap Crezee -Date: Sat, 25 june 2016 13:13:00 +0200 -Subject: [PATCH] fix compilation host-lzop with gcc-6 - -This patch allows host-lzop to be compiled with host systems containing gcc-6 - -Upstream patch found here: -https://build.opensuse.org/package/view_file/Archiving/lzop/lzop-1.03-gcc6.patch?expand=1 - -Signed-off-by: Jaap Crezee - ---- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100 -+++ b/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 -@@ -4469,12 +4469,12 @@ - #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) -+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) - #endif - ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) - #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) -+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) - #endif - ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) - #if defined(acc_int16e_t) -@@ -4703,7 +4703,7 @@ - #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) -- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) -+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) - #endif - #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) - # pragma option pop diff --git a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch b/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch deleted file mode 100644 index f6d076a9f7..0000000000 --- a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch +++ /dev/null @@ -1,102 +0,0 @@ -From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 16 Aug 2015 10:35:47 -0700 -Subject: [PATCH] use static inlines as the external inline definition has - changed with gcc5 - -[Patch from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch] -Signed-off-by: Khem Raj -Signed-off-by: Peter Korsgaard ---- -Upstream-Status: Pending - - src/miniacc.h | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - -diff --git a/src/miniacc.h b/src/miniacc.h -index 09e6f0c..cae98d1 100644 ---- a/src/miniacc.h -+++ b/src/miniacc.h -@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } --- -2.5.0 - diff --git a/package/lzop/lzop.hash b/package/lzop/lzop.hash index adc20648b6..99796dc8c9 100644 --- a/package/lzop/lzop.hash +++ b/package/lzop/lzop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 lzop-1.03.tar.gz +sha256 7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41 lzop-1.04.tar.gz sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk index 55157c4d48..056d724a7b 100644 --- a/package/lzop/lzop.mk +++ b/package/lzop/lzop.mk @@ -4,13 +4,22 @@ # ################################################################################ -LZOP_VERSION = 1.03 +LZOP_VERSION = 1.04 LZOP_SITE = http://www.lzop.org/download LZOP_LICENSE = GPL-2.0+ LZOP_LICENSE_FILES = COPYING LZOP_DEPENDENCIES = lzo HOST_LZOP_DEPENDENCIES = host-lzo +LZOP_LIBTOOL_PATCH=NO +#LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP + +define LZOP_LIBTOOL_FIXUP + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $(@D)/autoconf/ltmain.sh +endef + +LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP + $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.39.2 From fontaine.fabrice at gmail.com Sat Feb 25 14:14:12 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 15:14:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/lirc-tools: fix python build Message-ID: <20230225141412.2968950-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 0.10.2 in commit 58cc3977e83487bdaa1df232cf7adf6383d49cd7: In file included from /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/python3.11/Python.h:38, from lirc/_client.c:1: /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/python3.11/pyport.h:601:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 601 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/85359d3f678b49e46821a1c10da5f14edfb5e6d0 Signed-off-by: Fabrice Fontaine --- package/lirc-tools/lirc-tools.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk index 5263330741..a3ad6bd5a0 100644 --- a/package/lirc-tools/lirc-tools.mk +++ b/package/lirc-tools/lirc-tools.mk @@ -48,7 +48,9 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3),y) LIRC_TOOLS_DEPENDENCIES += python3 host-python-setuptools -LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' +LIRC_TOOLS_MAKE_ENV += \ + CC="$(TARGET_CC)" \ + SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' endif define LIRC_TOOLS_INSTALL_INIT_SYSV -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 14:49:04 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 15:49:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-numpy: needs C++ Message-ID: <20230225144904.3033289-1-fontaine.fabrice@gmail.com> C++ is mandatory since at least version 1.23.0 and https://github.com/numpy/numpy/commit/c91a7d0c5691c9d78bd75284777fda73f225155d resulting in the following build failure since bump to version 1.23.4 in commit 32d8e23b977a5bba1f23e3821709c6aa9ff3bc55: RuntimeError: Broken toolchain: cannot link a simple C++ program. note: A compiler with support for C++11 language features is required. Fixes: - http://autobuild.buildroot.org/results/2d048d9b669ad60f37eeb2162b0a4f9fb425be1e Signed-off-by: Fabrice Fontaine --- package/piglit/Config.in | 6 ++++-- package/python-numpy/Config.in | 6 ++++-- package/python-zlmdb/Config.in | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package/piglit/Config.in b/package/piglit/Config.in index 736fd95d71..5e957a555a 100644 --- a/package/piglit/Config.in +++ b/package/piglit/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_PIGLIT BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND || \ BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL || \ BR2_PACKAGE_WAFFLE_SUPPORTS_GBM + depends on BR2_INSTALL_LIBSTDCPP # python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBPNG @@ -31,5 +32,6 @@ config BR2_PACKAGE_PIGLIT https://piglit.freedesktop.org -comment "piglit needs glibc or musl" - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) +comment "piglit needs a glibc or musl toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index a65164d9d5..132c3f7a82 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP # python-numpy needs fenv.h which is not provided by uclibc depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL help @@ -27,6 +28,7 @@ config BR2_PACKAGE_PYTHON_NUMPY http://www.numpy.org/ -comment "python-numpy needs glibc or musl" +comment "python-numpy needs a glibc or musl toolchain w/ C++" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-zlmdb/Config.in b/package/python-zlmdb/Config.in index ac4ee05442..8eba2d7946 100644 --- a/package/python-zlmdb/Config.in +++ b/package/python-zlmdb/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB bool "python-zlmdb" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_INSTALL_LIBSTDCPP # python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_PYTHON_CBOR2 # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime @@ -17,6 +18,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB https://github.com/crossbario/zlmdb -comment "python-zlmdb needs glibc or musl" +comment "python-zlmdb needs a glibc or musl toolchain w/ C++" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 16:01:23 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 17:01:23 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add lpc32xxcdl handling Message-ID: <20230225160123.264914-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 20695936ad63f602662bc4c6124a26312c46ff52: make[2]: *** /tmp/instance-0/output-1/build/lpc32xxcdl-2.11/csps/lpc32xx/bsps//source: No such file or directory. Stop. Fixes: - http://autobuild.buildroot.org/results/72c9a4080318b1b247ca3517c95c689dff1068d2 Signed-off-by: Fabrice Fontaine --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 64b9be69db..a3d98119c7 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -487,6 +487,10 @@ def fixup_config(sysinfo, configfile): 'BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n' in configlines: return False + if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ + 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: + return False + if 'BR2_TARGET_OPTEE_OS=y\n' in configlines and \ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y\n' in configlines and \ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION=""\n' in configlines: -- 2.39.1 From bugzilla at busybox.net Sat Feb 25 16:30:48 2023 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sat, 25 Feb 2023 16:30:48 +0000 Subject: [Buildroot] [Bug 15356] New: package gobject-introspection-1.72.0 fails to build Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15356 Bug ID: 15356 Summary: package gobject-introspection-1.72.0 fails to build Product: buildroot Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: hydrosaure at gmail.com CC: buildroot at uclibc.org Target Milestone: --- Hello, When building with target architecture "x86_64" and setting an architecture variant as anything other than "x86_64" ie. "haswell" or "broadwell", package "gobject-introspection" fails to build and ends erroring out with messages like: qemu: uncaught target signal 4 (Illegal instruction) - core dumped Illegal instruction (core dumped) Many examples of this error can be found on the buildbot at http://autobuild.buildroot.org/?arch=x86_64&reason=gobject-introspection-1.72.0&step=50&start=0 and checking out endlog data. When building with target architecture "x86_64" and architecture variant "x86_64" it completes correctly. Could it be there is some confusion between host and target for the wrapper commands? -- You are receiving this mail because: You are on the CC list for the bug. From fontaine.fabrice at gmail.com Sat Feb 25 17:02:29 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 18:02:29 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix CIP RT kernel on microblaze Message-ID: <20230225170229.358936-1-fontaine.fabrice@gmail.com> Fix the following build failure with CIP RT kernel on microblaze raised since bump to version 5.10.83-cip1-rt1 in commit b5778d7b76c098010a4abc339938f2694e8cf57f and https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?id=32ac92b5a39e2ef91308929bf5ed0804094b4183: arch/microblaze/mm/init.c:71:2: error: #endif without #if 71 | #endif /* CONFIG_HIGHMEM */ | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33 Signed-off-by: Fabrice Fontaine --- ...-arch-microblaze-mm-init.c-fix-build.patch | 37 +++++++++++++++++++ linux/linux.mk | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch diff --git a/linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch b/linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch new file mode 100644 index 0000000000..4760d9e4fb --- /dev/null +++ b/linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch @@ -0,0 +1,37 @@ +From 1fc03e1fdc8bb606d1c95e9fa557a9e5f6df17ec Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Feb 2023 17:26:56 +0100 +Subject: [PATCH] arch/microblaze/mm/init.c: fix build + +Fix the following build failure on microblaze raised since +https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/arch/microblaze/mm/init.c?h=v5.10.168-cip27-rt11&id=32ac92b5a39e2ef91308929bf5ed0804094b4183: + +arch/microblaze/mm/init.c:71:2: error: #endif without #if + 71 | #endif /* CONFIG_HIGHMEM */ + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to +Sebastian Andrzej Siewior ] +--- + arch/microblaze/mm/init.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c +index 1f4b5b34e600..a444778e59de 100644 +--- a/arch/microblaze/mm/init.c ++++ b/arch/microblaze/mm/init.c +@@ -49,6 +49,7 @@ unsigned long lowmem_size; + EXPORT_SYMBOL(min_low_pfn); + EXPORT_SYMBOL(max_low_pfn); + ++#ifdef CONFIG_HIGHMEM + static void __init highmem_init(void) + { + pr_debug("%x\n", (u32)PKMAP_BASE); +-- +2.39.1 + diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..f3fdc40328 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -33,6 +33,7 @@ LINUX_SITE_METHOD = svn else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION),y) LINUX_SOURCE = linux-cip-$(LINUX_VERSION).tar.gz LINUX_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot +LINUX_PATCHES += linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch else ifneq ($(findstring -rc,$(LINUX_VERSION)),) # Since 4.12-rc1, -rc kernels are generated from cgit. This also works for # older -rc kernels. @@ -50,7 +51,7 @@ ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) endif -LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH)) +LINUX_PATCHES += $(call qstrip,$(BR2_LINUX_KERNEL_PATCH)) # We have no way to know the hashes for user-supplied patches. BR_NO_CHECK_HASH_FOR += $(notdir $(LINUX_PATCHES)) -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 17:28:06 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 18:28:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/pistache: fix libressl build Message-ID: <20230225172806.9444-1-fontaine.fabrice@gmail.com> Fix the following libressl build failure which is probably raised since the addition of the package in commit 65d891efc2fb069f9cf707f47302776f7076b80c: ../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': ../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? 582 | (SSL_verify_cb)cb | ^~~~~~~~~~~~~ | RSA_verify Fixes: - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 Signed-off-by: Fabrice Fontaine --- ...erver-listener.cc-fix-libressl-build.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch diff --git a/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch b/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch new file mode 100644 index 0000000000..f2fe2183ae --- /dev/null +++ b/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch @@ -0,0 +1,38 @@ +From 656bff21c1d20b25058da9dbc27d28ad2ac7ae6e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Feb 2023 18:09:39 +0100 +Subject: [PATCH] src/server/listener.cc: fix libressl build + +Fix the following libressl build failure: + +../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': +../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? + 582 | (SSL_verify_cb)cb + | ^~~~~~~~~~~~~ + | RSA_verify + +Fixes: + - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/pistacheio/pistache/pull/1124] +--- + src/server/listener.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/server/listener.cc b/src/server/listener.cc +index 38d2661..c09cb36 100644 +--- a/src/server/listener.cc ++++ b/src/server/listener.cc +@@ -609,7 +609,7 @@ namespace Pistache::Tcp + SSL_CTX_set_verify(GetSSLContext(ssl_ctx_), + SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE, + /* Callback type did change in 1.0.1 */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + (int (*)(int, X509_STORE_CTX*))cb + #else + (SSL_verify_cb)cb +-- +2.39.1 + -- 2.39.1 From thomas.petazzoni at bootlin.com Sat Feb 25 20:46:19 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:46:19 +0100 Subject: [Buildroot] [git commit] package/zabbix: fix second patch Message-ID: <20230225205333.0BC9586AE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21a3097e7e227e8a26075f4f036324706e20d54f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix patch added by commit 7edb4a6a4db7d864c6c1560f3fdc1ef4fbd7f0fd: 0x300000fL -> 0x3050000fL Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/zabbix/0002-fix-build-with-libressl-3.5.0.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch index 7e32ad5745..acb5cfc9a6 100644 --- a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch +++ b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch @@ -61,7 +61,7 @@ index 54ab0a6ef4..bd4075b3e4 100644 -#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) -/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ +#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ -+ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x300000fL ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL +/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL (before 3.5.0) */ /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and example in crypto/threads/mttest.c) */ From thomas.petazzoni at bootlin.com Sat Feb 25 20:53:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:53:06 +0100 Subject: [Buildroot] [git commit] package/python-numpy: needs C++ Message-ID: <20230225205333.35EAA86AE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc5a6c4af7e7809fccdb72b7140b33dacbbd1a94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master C++ is mandatory since at least version 1.23.0 and https://github.com/numpy/numpy/commit/c91a7d0c5691c9d78bd75284777fda73f225155d resulting in the following build failure since bump to version 1.23.4 in commit 32d8e23b977a5bba1f23e3821709c6aa9ff3bc55: RuntimeError: Broken toolchain: cannot link a simple C++ program. note: A compiler with support for C++11 language features is required. Fixes: - http://autobuild.buildroot.org/results/2d048d9b669ad60f37eeb2162b0a4f9fb425be1e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/piglit/Config.in | 6 ++++-- package/python-numpy/Config.in | 6 ++++-- package/python-zlmdb/Config.in | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package/piglit/Config.in b/package/piglit/Config.in index 736fd95d71..5e957a555a 100644 --- a/package/piglit/Config.in +++ b/package/piglit/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_PIGLIT BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND || \ BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL || \ BR2_PACKAGE_WAFFLE_SUPPORTS_GBM + depends on BR2_INSTALL_LIBSTDCPP # python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBPNG @@ -31,5 +32,6 @@ config BR2_PACKAGE_PIGLIT https://piglit.freedesktop.org -comment "piglit needs glibc or musl" - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) +comment "piglit needs a glibc or musl toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index a65164d9d5..132c3f7a82 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP # python-numpy needs fenv.h which is not provided by uclibc depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL help @@ -27,6 +28,7 @@ config BR2_PACKAGE_PYTHON_NUMPY http://www.numpy.org/ -comment "python-numpy needs glibc or musl" +comment "python-numpy needs a glibc or musl toolchain w/ C++" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-zlmdb/Config.in b/package/python-zlmdb/Config.in index ac4ee05442..8eba2d7946 100644 --- a/package/python-zlmdb/Config.in +++ b/package/python-zlmdb/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB bool "python-zlmdb" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_INSTALL_LIBSTDCPP # python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_PYTHON_CBOR2 # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime @@ -17,6 +18,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB https://github.com/crossbario/zlmdb -comment "python-zlmdb needs glibc or musl" +comment "python-zlmdb needs a glibc or musl toolchain w/ C++" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) From thomas.petazzoni at bootlin.com Sat Feb 25 20:49:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:49:06 +0100 Subject: [Buildroot] [git commit] package/lirc-tools: fix python build Message-ID: <20230225205333.2B25586AE8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ec2a9d4383b3370da39d70805b7c7854cefeded branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 0.10.2 in commit 58cc3977e83487bdaa1df232cf7adf6383d49cd7: In file included from /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/python3.11/Python.h:38, from lirc/_client.c:1: /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/python3.11/pyport.h:601:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 601 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/85359d3f678b49e46821a1c10da5f14edfb5e6d0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lirc-tools/lirc-tools.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk index 5263330741..a3ad6bd5a0 100644 --- a/package/lirc-tools/lirc-tools.mk +++ b/package/lirc-tools/lirc-tools.mk @@ -48,7 +48,9 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3),y) LIRC_TOOLS_DEPENDENCIES += python3 host-python-setuptools -LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' +LIRC_TOOLS_MAKE_ENV += \ + CC="$(TARGET_CC)" \ + SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' endif define LIRC_TOOLS_INSTALL_INIT_SYSV From thomas.petazzoni at bootlin.com Sat Feb 25 20:47:01 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:47:01 +0100 Subject: [Buildroot] [git commit] package/rtty: bump to version 8.1.0 Message-ID: <20230225205333.2117686AE6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e608885a2df51ba77378f210f4c0e8cb59d5b8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure with wolfssl raised, at least, since bump of wolfssl to version 5.5.0 in commit 1891419db38e4d85595b2111db448f68eef684b8: /tmp/instance-18/output-1/build/rtty-7.4.0/src/ssl.c:75:5: error: unknown type name 'SSL_CTX' 75 | SSL_CTX *ctx; | ^~~~~~~ https://github.com/zhaojh329/rtty/compare/v7.4.0...v8.1.0 Fixes: - http://autobuild.buildroot.org/results/d045d85890ca97accfcea6c13c94757485d867c2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rtty/rtty.hash | 2 +- package/rtty/rtty.mk | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package/rtty/rtty.hash b/package/rtty/rtty.hash index b2e9db2436..a6ccb5c2e6 100644 --- a/package/rtty/rtty.hash +++ b/package/rtty/rtty.hash @@ -1,2 +1,2 @@ -sha256 9bc5d30dfa9bd664a62711b6229f47505b83adb364907f24e3a404aad52a4802 rtty-7.4.0.tar.gz +sha256 e634939bae62bf3d52ceebae5df00179629d214634b93464eeb2294406512b30 rtty-8.1.0.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index 4ec220394c..964ec04ec4 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTTY_VERSION = 7.4.0 +RTTY_VERSION = 8.1.0 RTTY_SITE = https://github.com/zhaojh329/rtty/releases/download/v$(RTTY_VERSION) RTTY_LICENSE = MIT RTTY_LICENSE_FILES = LICENSE @@ -13,26 +13,26 @@ RTTY_DEPENDENCIES = libev ifeq ($(BR2_PACKAGE_MBEDTLS),y) RTTY_DEPENDENCIES += mbedtls RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=ON \ - -DRTTY_USE_OPENSSL=OFF \ - -DRTTY_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=ON \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_OPENSSL),y) RTTY_DEPENDENCIES += host-pkgconf openssl RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=OFF \ - -DRTTY_USE_OPENSSL=ON \ - -DRTTY_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=ON \ + -DUSE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_WOLFSSL),y) RTTY_DEPENDENCIES += wolfssl RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=OFF \ - -DRTTY_USE_OPENSSL=OFF \ - -DRTTY_USE_WOLFSSL=ON + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=ON else -RTTY_CONF_OPTS += -DRTTY_SSL_SUPPORT=OFF +RTTY_CONF_OPTS += -DSSL_SUPPORT=OFF endif $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Sat Feb 25 20:46:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:46:32 +0100 Subject: [Buildroot] [git commit] package/libsigrokdecode: fix build with python > 3.10 Message-ID: <20230225205333.162E886AE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11ba2c5b8d23e086d589e025b7a31cdd7bae14a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with sigrok-cli and python > 3.10: /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mips64-buildroot-linux-gnu/11.3.0/../../../../mips64-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/bin/../mips64-buildroot-linux-gnu/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyTuple_SetItem' Fixes: - http://autobuild.buildroot.org/results/435ad19597a1e216a7974bc9ccaf17064d1eccea Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ure-ac-Use-python3-embed-pc-as-a-fallback.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch b/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch new file mode 100644 index 0000000000..8e9c6f0063 --- /dev/null +++ b/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch @@ -0,0 +1,30 @@ +From a6a5e2c8b0e9ecf5d69d0c237c8e8b717b82b36f Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras +Date: Thu, 3 Dec 2020 19:17:00 +0200 +Subject: [PATCH] configure.ac: Use python3-embed.pc as a fallback + +This provides some future-proofing against newer Python versions. + +[Retrieved from: +https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commit;h=a6a5e2c8b0e9ecf5d69d0c237c8e8b717b82b36f] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b8841f8..c1314bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python3-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + +-- +2.30.2 + From thomas.petazzoni at bootlin.com Sat Feb 25 20:53:48 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:53:48 +0100 Subject: [Buildroot] [git commit] utils/genrandconfig: add lpc32xxcdl handling Message-ID: <20230225210124.6E3A286B0C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e1a50e4e67b6a650f9d13729ee955e8332de951 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 20695936ad63f602662bc4c6124a26312c46ff52: make[2]: *** /tmp/instance-0/output-1/build/lpc32xxcdl-2.11/csps/lpc32xx/bsps//source: No such file or directory. Stop. Fixes: - http://autobuild.buildroot.org/results/72c9a4080318b1b247ca3517c95c689dff1068d2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index ea8548d42c..6ec398851a 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -492,6 +492,10 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_BAREBOX_USE_DEFCONFIG=y\n') configlines.remove('BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n') + if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ + 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: + return False + if 'BR2_TARGET_OPTEE_OS=y\n' in configlines and \ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y\n' in configlines and \ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION=""\n' in configlines: From thomas.petazzoni at bootlin.com Sat Feb 25 20:58:41 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 21:58:41 +0100 Subject: [Buildroot] [git commit] package/pistache: fix libressl build Message-ID: <20230225210124.783F286B0D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b9dda434f9b0fa48c817fe29f949fea0abc53ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following libressl build failure which is probably raised since the addition of the package in commit 65d891efc2fb069f9cf707f47302776f7076b80c: ../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': ../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? 582 | (SSL_verify_cb)cb | ^~~~~~~~~~~~~ | RSA_verify Fixes: - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...src-server-listener.cc-fix-libressl-build.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch b/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch new file mode 100644 index 0000000000..f2fe2183ae --- /dev/null +++ b/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch @@ -0,0 +1,38 @@ +From 656bff21c1d20b25058da9dbc27d28ad2ac7ae6e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Feb 2023 18:09:39 +0100 +Subject: [PATCH] src/server/listener.cc: fix libressl build + +Fix the following libressl build failure: + +../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': +../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? + 582 | (SSL_verify_cb)cb + | ^~~~~~~~~~~~~ + | RSA_verify + +Fixes: + - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/pistacheio/pistache/pull/1124] +--- + src/server/listener.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/server/listener.cc b/src/server/listener.cc +index 38d2661..c09cb36 100644 +--- a/src/server/listener.cc ++++ b/src/server/listener.cc +@@ -609,7 +609,7 @@ namespace Pistache::Tcp + SSL_CTX_set_verify(GetSSLContext(ssl_ctx_), + SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE, + /* Callback type did change in 1.0.1 */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + (int (*)(int, X509_STORE_CTX*))cb + #else + (SSL_verify_cb)cb +-- +2.39.1 + From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:21 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: fix second patch In-Reply-To: <20230225105715.1265130-1-fontaine.fabrice@gmail.com> References: <20230225105715.1265130-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220221.47b9f651@windsurf> On Sat, 25 Feb 2023 11:57:15 +0100 Fabrice Fontaine wrote: > Fix patch added by commit 7edb4a6a4db7d864c6c1560f3fdc1ef4fbd7f0fd: > > 0x300000fL -> 0x3050000fL > > Signed-off-by: Fabrice Fontaine > --- > package/zabbix/0002-fix-build-with-libressl-3.5.0.patch | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:27 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsigrokdecode: fix build with python > 3.10 In-Reply-To: <20230225111252.1658233-1-fontaine.fabrice@gmail.com> References: <20230225111252.1658233-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220227.0b3b6385@windsurf> On Sat, 25 Feb 2023 12:12:52 +0100 Fabrice Fontaine wrote: > Fix the following build failure with sigrok-cli and python > 3.10: > > /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mips64-buildroot-linux-gnu/11.3.0/../../../../mips64-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/bin/../mips64-buildroot-linux-gnu/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyTuple_SetItem' > > Fixes: > - http://autobuild.buildroot.org/results/435ad19597a1e216a7974bc9ccaf17064d1eccea > > Signed-off-by: Fabrice Fontaine > --- > ...c-Use-python3-embed-pc-as-a-fallback.patch | 30 +++++++++++++++++++ > 1 file changed, 30 insertions(+) > create mode 100644 package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtty: bump to version 8.1.0 In-Reply-To: <20230225123022.1987160-1-fontaine.fabrice@gmail.com> References: <20230225123022.1987160-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220232.1f210f1e@windsurf> On Sat, 25 Feb 2023 13:30:22 +0100 Fabrice Fontaine wrote: > This bump will fix the following build failure with wolfssl raised, at > least, since bump of wolfssl to version 5.5.0 in commit > 1891419db38e4d85595b2111db448f68eef684b8: > > /tmp/instance-18/output-1/build/rtty-7.4.0/src/ssl.c:75:5: error: unknown type name 'SSL_CTX' > 75 | SSL_CTX *ctx; > | ^~~~~~~ > > https://github.com/zhaojh329/rtty/compare/v7.4.0...v8.1.0 > > Fixes: > - http://autobuild.buildroot.org/results/d045d85890ca97accfcea6c13c94757485d867c2 > > Signed-off-by: Fabrice Fontaine > --- > package/rtty/rtty.hash | 2 +- > package/rtty/rtty.mk | 28 ++++++++++++++-------------- > 2 files changed, 15 insertions(+), 15 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:36 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/lirc-tools: fix python build In-Reply-To: <20230225141412.2968950-1-fontaine.fabrice@gmail.com> References: <20230225141412.2968950-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220236.416f2462@windsurf> On Sat, 25 Feb 2023 15:14:12 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 0.10.2 in > commit 58cc3977e83487bdaa1df232cf7adf6383d49cd7: > > In file included from /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/python3.11/Python.h:38, > from lirc/_client.c:1: > /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/python3.11/pyport.h:601:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > 601 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > | ^~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/85359d3f678b49e46821a1c10da5f14edfb5e6d0 > > Signed-off-by: Fabrice Fontaine > --- > package/lirc-tools/lirc-tools.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:42 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-numpy: needs C++ In-Reply-To: <20230225144904.3033289-1-fontaine.fabrice@gmail.com> References: <20230225144904.3033289-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220242.2761cbe6@windsurf> On Sat, 25 Feb 2023 15:49:04 +0100 Fabrice Fontaine wrote: > C++ is mandatory since at least version 1.23.0 and > https://github.com/numpy/numpy/commit/c91a7d0c5691c9d78bd75284777fda73f225155d > resulting in the following build failure since bump to version 1.23.4 in > commit 32d8e23b977a5bba1f23e3821709c6aa9ff3bc55: > > RuntimeError: Broken toolchain: cannot link a simple C++ program. note: A compiler with support for C++11 language features is required. > > Fixes: > - http://autobuild.buildroot.org/results/2d048d9b669ad60f37eeb2162b0a4f9fb425be1e > > Signed-off-by: Fabrice Fontaine > --- > package/piglit/Config.in | 6 ++++-- > package/python-numpy/Config.in | 6 ++++-- > package/python-zlmdb/Config.in | 6 ++++-- > 3 files changed, 12 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:47 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:47 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add lpc32xxcdl handling In-Reply-To: <20230225160123.264914-1-fontaine.fabrice@gmail.com> References: <20230225160123.264914-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220247.4bdfa321@windsurf> On Sat, 25 Feb 2023 17:01:23 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit 20695936ad63f602662bc4c6124a26312c46ff52: > > make[2]: *** /tmp/instance-0/output-1/build/lpc32xxcdl-2.11/csps/lpc32xx/bsps//source: No such file or directory. Stop. > > Fixes: > - http://autobuild.buildroot.org/results/72c9a4080318b1b247ca3517c95c689dff1068d2 > > Signed-off-by: Fabrice Fontaine > --- > utils/genrandconfig | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Feb 25 21:02:54 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 25 Feb 2023 22:02:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/pistache: fix libressl build In-Reply-To: <20230225172806.9444-1-fontaine.fabrice@gmail.com> References: <20230225172806.9444-1-fontaine.fabrice@gmail.com> Message-ID: <20230225220254.69e933f2@windsurf> On Sat, 25 Feb 2023 18:28:06 +0100 Fabrice Fontaine wrote: > Fix the following libressl build failure which is probably raised since > the addition of the package in commit > 65d891efc2fb069f9cf707f47302776f7076b80c: > > ../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': > ../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? > 582 | (SSL_verify_cb)cb > | ^~~~~~~~~~~~~ > | RSA_verify > > Fixes: > - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 > > Signed-off-by: Fabrice Fontaine > --- > ...erver-listener.cc-fix-libressl-build.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Sat Feb 25 21:03:57 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 25 Feb 2023 22:03:57 +0100 Subject: [Buildroot] [PATCH] package/rtl8723bu: fix module installation Message-ID: <20230225210357.1449825-1-giulio.benetti@benettiengineering.com> At the moment module is build but not installed to target/. To fix this let's bump package to 2023-02-18 version on master branch to fix module installation. Signed-off-by: Giulio Benetti --- package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 6a28c34773..bc3b8fc727 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 21372b654886c6d100f46636d7807428698bd618e00db1b8b49cfc3037e46d10 rtl8723bu-f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255.tar.gz +sha256 d0db523f256795d8f3284fa2ec03855f231747ede8337e878bc096325b965654 rtl8723bu-92c19318cb54ef96c2cfb4a22b2c98eb512812d8.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index af1ac9454e..ad9bb9a462 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255 +RTL8723BU_VERSION = 92c19318cb54ef96c2cfb4a22b2c98eb512812d8 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 25 22:50:31 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 25 Feb 2023 23:50:31 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add boot-wrapper-aarch64 handling Message-ID: <20230225225031.9260-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 7689b72e00fd4d8c017880004e83a1c79144ab7b: configure: error: Could not find DTB file: /home/autobuild/autobuild/instance-9/output-1/build/linux-6.1.9/arch/arm64/boot/dts/.dtb Fixes: - http://autobuild.buildroot.org/results/44287ccc8cc9767704642919e6d928d1f57b436d Signed-off-by: Fabrice Fontaine --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index a3d98119c7..ca465547d8 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -487,6 +487,10 @@ def fixup_config(sysinfo, configfile): 'BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n' in configlines: return False + if 'BR2_TARGET_BOOT_WRAPPER_AARCH64=y\n' in configlines and \ + 'BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS=""\n' in configlines: + return False + if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: return False -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 23:14:19 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 00:14:19 +0100 Subject: [Buildroot] [PATCH 1/1] boot/mxs-bootlets: fix build without any bootstream Message-ID: <20230225231419.22342-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 2a636d15217cd326b4546e7017538c7a9e9d399c: sed -i 's,[^ *]power_prep.*;,\tpower_prep="/home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/power_prep/power_prep";,' /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/ sed: couldn't edit /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/: not a regular file Fixes: - http://autobuild.buildroot.org/results/b4b26f6b02fd1991f46eba5db240e5050b96d333 Signed-off-by: Fabrice Fontaine --- boot/mxs-bootlets/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in index b3e392afa8..8f9334b610 100644 --- a/boot/mxs-bootlets/Config.in +++ b/boot/mxs-bootlets/Config.in @@ -1,6 +1,8 @@ config BR2_TARGET_MXS_BOOTLETS bool "mxs-bootlets" depends on BR2_arm + depends on BR2_TARGET_BAREBOX || BR2_LINUX_KERNEL || \ + BR2_TARGET_UBOOT help Stage1 bootloaders for Freescale iMX23/iMX28 SoCs -- 2.39.1 From fontaine.fabrice at gmail.com Sat Feb 25 23:22:17 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 00:22:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/flac: drop unrecognized option Message-ID: <20230225232217.27171-1-fontaine.fabrice@gmail.com> xmms-plugin has been dropped since version 1.4.2 and https://github.com/xiph/flac/commit/8fbeff238c41464fe220cd23c45861c9302d1172 Signed-off-by: Fabrice Fontaine --- package/flac/flac.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/flac/flac.mk b/package/flac/flac.mk index ebb4778521..595c2379b0 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -17,7 +17,6 @@ FLAC_CONF_OPTS = \ $(if $(BR2_POWERPC_CPU_HAS_ALTIVEC),--enable-altivec,--disable-altivec) \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ $(if $(BR2_POWERPC_CPU_HAS_VSX),--enable-vsx,--disable-vsx) \ - --disable-xmms-plugin \ --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) -- 2.39.1 From baruch at tkos.co.il Sun Feb 26 06:07:34 2023 From: baruch at tkos.co.il (Baruch Siach) Date: Sun, 26 Feb 2023 08:07:34 +0200 Subject: [Buildroot] [PATCH v2] package/lzop: bump to version 1.04 In-Reply-To: <20230225132927.4067626-1-casey@xogium.me> References: <20230225112838.4061103-1-casey@xogium.me> <20230225132927.4067626-1-casey@xogium.me> Message-ID: <87mt51ez6l.fsf@tarshish> Hi Casey, On Sat, Feb 25 2023, Casey Reeves wrote: > diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk > index 55157c4d48..056d724a7b 100644 > --- a/package/lzop/lzop.mk > +++ b/package/lzop/lzop.mk > @@ -4,13 +4,22 @@ > # > ################################################################################ > > -LZOP_VERSION = 1.03 > +LZOP_VERSION = 1.04 > LZOP_SITE = http://www.lzop.org/download > LZOP_LICENSE = GPL-2.0+ > LZOP_LICENSE_FILES = COPYING > LZOP_DEPENDENCIES = lzo > HOST_LZOP_DEPENDENCIES = host-lzo > > +LZOP_LIBTOOL_PATCH=NO > +#LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP This commit looks redundant. baruch > + > +define LZOP_LIBTOOL_FIXUP > + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $(@D)/autoconf/ltmain.sh > +endef > + > +LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP > + > $(eval $(autotools-package)) > $(eval $(host-autotools-package)) -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From thomas.petazzoni at bootlin.com Sun Feb 26 07:39:06 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 26 Feb 2023 07:39:06 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-25 Message-ID: <20230226073912.8315A409F1@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-25 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 7 | 11 | 0 | 18 | master | 128 | 110 | 1 | 239 | next | 19 | 15 | 1 | 35 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 7 host-pahole-1.24 | 6 host-go-1.19.6 | 5 libglib2-2.72.3 | 4 linux-6.1.11 | 4 python-numpy-1.23.5 | 4 elfutils-0.186 | 3 host-binutils-2.38 | 3 libgpg-error-1.46 | 3 perl-5.36.0 | 3 libcap-ng-0.8.3 | 2 linux-5.10.162-cip24-rt10 | 2 network-manager-1.40.10 | 2 sigrok-cli-0.7.2 | 2 systemd-252.4 | 2 boost-1.80.0 | 1 brltty-6.5 | 1 bullet-3.21 | 1 containerd-1.6.16 | 1 expat-2.5.0 | 1 fftw-quad-3.3.8 | 1 flac-1.4.2 | 1 fontconfig-2.13.1 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/ubi/ubi.mk:51: /home/aut... | 1 fs/ubi/ubi.mk:51: /home/tho... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 glibc-2.36-81-g4f4d7a13edfd... | 1 gobject-introspection | 1 host-binutils-2.37 | 1 host-binutils-2.39 | 1 host-gcc-initial-12.2.0 | 1 host-runc-1.1.4 | 1 host-rust-1.67.0 | 1 ipmitool-1_8_19 | 1 kexec-2.0.25 | 1 kvmtool-f77d646ba01d04be5aa... | 1 libdeflate-1.15 | 1 libgcrypt-1.10.1 | 1 libnss-3.88.1 | 1 lirc-tools-0.10.2 | 1 lpc32xxcdl-2.11 | 1 mxs-bootlets-10.12.01 | 1 netsurf-3.10 | 1 olsr-0.9.8 | 1 package/multipath-tools/mul... | 1 pcre2-10.42 | 1 pistache-3ec9d7c4f8b828fdd3... | 1 postgresql-15.2 | 1 python3-3.11.2 | 1 quickjs-2021-03-27 | 1 rdma-core-44.0 | 1 rtl_433-22.11 | 1 rtty-7.4.0 | 1 speechd-0.11.4 | 1 tcf-agent-1.7.0 | 1 ti-k3-r5-loader-2022.10 | 1 tpm2-tss-3.1.0 | 1 uccp420wlan-6.9.1 | 1 uclibc-1.0.42 | 1 ulog-0389d243352255f6182326... | 1 unknown | 1 uqmi-0a19b5b77140465c29e2af... | 1 xenomai-3.0.10 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/dadad1a59d57220ce6e407f46cc89c2dc3868237 | mips | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/abb287ecab6c2815d33af3de327e758cf5212b8f | sh4a | bullet-3.21 | NOK | http://autobuild.buildroot.net/results/073ff5c5b7d04990243aa0afe5f2e358d66c1b80 | x86_64 | containerd-1.6.16 | NOK | http://autobuild.buildroot.net/results/464e56a0d8ac63dabef4c90d6ea80a34dbb1f711 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/bb46f54644dc764d919998158e1a76b910b3abbe | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/8d82ef956709bd2396de7fc3e1533a73d9b35f5d | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/798356fa474295972eb898555f55b8a1c0c53123 | ORPH powerpc64le | expat-2.5.0 | NOK | http://autobuild.buildroot.net/results/95f929aec1f0da398b2aab1351c7812170f47655 | powerpc64le | fftw-quad-3.3.8 | NOK | http://autobuild.buildroot.net/results/20c3918f7d2d998b4e522debe764a1609415e20b | ORPH sh4a | flac-1.4.2 | NOK | http://autobuild.buildroot.net/results/6f66ebf6eabb923c5ca6858fddf2bcefe9643bff | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/dfb0611c0eb85962355274d16d2c7d7b7708600f | ORPH mips64 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/88268819a4ff09bbb0d8ee90d6a72eebfcdc9204 | mips64 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/0ef8b525052c5a48be04d7690268f27eb9b9ce7f | aarch64_be | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/df3d9aedb16faa3ce05943411c4ea1adc5b7942b | s390x | fs/ubi/ubi.mk:51: /home/aut... | NOK | http://autobuild.buildroot.net/results/2e60ee03e5c10f572e5e31978ecd495f8b3014ef | arceb | fs/ubi/ubi.mk:51: /home/tho... | NOK | http://autobuild.buildroot.net/results/344bc0000cbcaddc193e0da51a8cd36313957a85 | arm | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/7e8f187db0bbff8ad2a244cc9b398f8c52e84510 | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/8fb9028e70caa9c1286a262a1d406fa2728c623b | m68k | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/441c8e0bb0f5c59e1d0d5fa481fe87c9060524f4 | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/23067dc98f39f09f5ed6b8e16dceb1b9cb76daa7 | mips | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/0b08f3e904eab616ce47577ff173e8d63666274b | mipsel | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/9f6fc0db12ec866b55ea966d610149e88a8469b8 | xtensa | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/9989710e5afa52faf898e4e58bc8322cb1666de9 | powerpc64le | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/24b7f713da5cdb2753e27a7e6ee37d4115a4ef36 | arceb | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/8d07293748d0f0919b6c838fba4e771645c4c7c9 | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/b6753eee36b188c32e47464820b3069eca4e992d | armeb | gobject-introspection | TIM | http://autobuild.buildroot.net/results/4f7885dc1b98af163c04cef08ab44fac2c9e3eac | s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/bb5a27b609d8ff37d07a3cd9c5b3914ecaa43444 | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/6e2993c24521b512eebf71a4b24a916715e03344 | ORPH microblazeel | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1c48c53d7c10e95f1bd4c6843934b90ad8697150 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/db55f10777f9cf79932c9bf09e40e7cee64501ba | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f30e73661bab691144fbcc0d9029d286260f0729 | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8248e1896e53c9c1c5aabb33bd8c5da7503abbb5 | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/f7b0a6c8e0bbca321c2147602db0b1cef471ccdc | ORPH arc | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/69c3421f0d0537c2876820c0bd90616146d79176 | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/3bccc59e4acf9f1f0aa60ccf6db9a2e718ee9384 | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6262d41380e59ffb899a934922991bd9afdd3f10 | arc | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/1f7b414286f3716e0c65495e73cef0e6ddfd2360 | aarch64_be | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/beb2769a29ef7f4174c1be76c3c62d036a806556 | riscv64 | host-gcc-initial-12.2.0 | NOK | http://autobuild.buildroot.net/results/1abc834430587d6a5a4381392fdf544c9945ad53 | i586 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/d3c7faedd46d611c5da49505b769e8a4754ba387 | riscv64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/4611642b5f9d755b9759974586371b29334bc49a | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/580d2cff313313eb28158c9741d1ab533a519d08 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/40e5052eff8329d7998e115c962320b2ed6e3e72 | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/4babee8a65c27a9fe289ba637ff0db4ccf2628ce | powerpc64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/73afbf64f0619bf358e89719804db61b831d1441 | armeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ea21ad00d4a7cce927b9af86d71f49412ec2000a | or1k | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/9b8b04603a6503e083048364601c7b9ca64cbb71 | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d099c7b2c04830e499e4a590d6aa65616f3a3493 | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/2ecb20b8b3ce43b83cc02e9068b39e7c4dea4dc2 | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/e783dfc38aedf31f81fa2a614d234db79647279b | xtensa | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/41c77cdf19cd097854e79fe02bde8eb8c0f0279f | mips64el | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/2b696473aed057b70e9b00597506e33d5367bf6f | or1k | ipmitool-1_8_19 | NOK | http://autobuild.buildroot.net/results/763b866d0383141407e52288ed3729d3094b9b74 | sh4 | kexec-2.0.25 | NOK | http://autobuild.buildroot.net/results/abf7b9578f1a3dbc39e87add33b98c5ea20c70d9 | ORPH i586 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/2fa8b9414b2a4739c5114d6aa0d59d1c5d4d485d | ORPH riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/227da9d6b6ae6c7bee32672750defa87a275b81d | or1k | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/c11e8353eaccb9a16c83b436b7b653e4bf5afda0 | arm | libdeflate-1.15 | NOK | http://autobuild.buildroot.net/results/3d1d7d8c2b485238275d8f6ecd5c44c030046350 | i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/d8c835b0b3b477a3d8fa35b13abcb3846a2af406 | ORPH arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/cbeefbf14fa545a6dd556648a6d88f2bd211105e | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/a93b1864371f30dbc6440d548546c447da2b1166 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/675648d04552b97dcaf7205f2f04e0e300c2729d | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/373547fc7e0cb6c8e8ef551fd5a97b9a918c2e57 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/5a63509d4febcef0a60324129ee10caaff63de84 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/f576bd1db0625c6e4ac63c773bf16ff81fa1bae9 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/4003d9cae794a8c4ec010f667eed674cc02990f7 | ORPH aarch64 | libnss-3.88.1 | NOK | http://autobuild.buildroot.net/results/5ec967926229907c9084492d73832e512fa4dd13 | microblaze | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/160da79ce9e005ab91b33824f3e93783bbfcb482 | ORPH microblaze | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/27291870cf7539d26e45c45f34322d24a6dbca33 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/8591c8aa01fcd2e5154720826196d7c43dd3a2dc | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/24f9adb6cdfd1eaf3792228483f6c2687bbb0771 | ORPH m68k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/3d3f77f5b48eac3359399a84f5062b88a8519fc3 | ORPH m68k | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/963e52d5b10d3cc80f1d89f698ef48a4ea04991a | ORPH sparc64 | lirc-tools-0.10.2 | NOK | http://autobuild.buildroot.net/results/0aec444765dc0168c31177983ed244a05fea3a12 | ORPH armeb | lpc32xxcdl-2.11 | NOK | http://autobuild.buildroot.net/results/72c9a4080318b1b247ca3517c95c689dff1068d2 | ORPH arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/25ee1a649fa511e7a0ae33b30d27ba44e5a7ee4f | ORPH powerpc64 | netsurf-3.10 | NOK | http://autobuild.buildroot.net/results/ba7377538a21477eecae6e5594df325bc7de7edf | nios2 | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/a1004c149f830263f9169680d4c3a13475457e0f | ORPH mips | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/daac2fe8a0ac2c22ace2af3a7cf59b5866b1b498 | ORPH powerpc64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/c4859aa362eda44caad9fee812aee49d2849afcd | ORPH sparc64 | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/dadd91a9ab0e845f699ea4345eccd987587f4f98 | sparc | pcre2-10.42 | NOK | http://autobuild.buildroot.net/results/e070099d2a426d1f10c738082d55872ea6e7c6c9 | ORPH arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/987e6697994c7cf74b7afffb0ab62bbdeda0051e | sparc64 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/87fcbc45e9095d8f969a55a53db5fa4ab3e1bc56 | xtensa | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/78c2d522a71ea97e38bb128053071675ff678b2c | sparc64 | pistache-3ec9d7c4f8b828fdd3... | NOK | http://autobuild.buildroot.net/results/066fc078980e5216f38411eee455088e15fa1101 | ORPH armeb | postgresql-15.2 | NOK | http://autobuild.buildroot.net/results/8744277ebe9910635ef8fe290c8ba4eee420b538 | armeb | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/0986c206a2e1504b233a4cef5398abb641949bb4 | arm | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/28eec96baf7d383ae982ccfab4fc8069fda8b433 | sh4a | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/2d048d9b669ad60f37eeb2162b0a4f9fb425be1e | x86_64 | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/85a426be3e4508e7872fc35a6b92b65ea7791f27 | x86_64 | python3-3.11.2 | NOK | http://autobuild.buildroot.net/results/1f37b94f7c6946103a48d321b66c668edcb3fce4 | or1k | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/5fae32e9491fe08fb37251e135df34ecb02474b1 | xtensa | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/ff2f5c53361d19b165773e070777ca84a58ae0a4 | x86_64 | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/a0fa40b74c0395821364c21f6c4297c0db4d0a6a | powerpc | rtty-7.4.0 | NOK | http://autobuild.buildroot.net/results/d045d85890ca97accfcea6c13c94757485d867c2 | mips64 | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/435ad19597a1e216a7974bc9ccaf17064d1eccea | ORPH mips64el | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/7a63bd0586bc3c4c983a9b6ea161b84aefec863a | ORPH powerpc64le | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/283333290c5adb48d0c6e592b3261992537f92d3 | x86_64 | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/2164bdf4debe41fd4bf56962da206cdd07facd39 | s390x | systemd-252.4 | NOK | http://autobuild.buildroot.net/results/090b09034feb37ef86e10734f86d16d445556039 | microblazeel | tcf-agent-1.7.0 | NOK | http://autobuild.buildroot.net/results/4afccfe3e08510d1aa6ab6fd342ece699ffb695c | aarch64 | ti-k3-r5-loader-2022.10 | NOK | http://autobuild.buildroot.net/results/d7449b2b2f2349af672bfeee832b89a223a7d9cc | powerpc64 | tpm2-tss-3.1.0 | NOK | http://autobuild.buildroot.net/results/95522de6d5a3988155cdc48bdadb49d7aeaec336 | ORPH powerpc64 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/7ed5969e02f962aa793773e00b9fe198ae7809c2 | ORPH powerpc | uclibc-1.0.42 | NOK | http://autobuild.buildroot.net/results/87e75c7f517fa56b6865c10694a1a5dc3f1f6bde | aarch64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/643945805ed6201124646eaf45f1ac215d9fc930 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/355abd317d83bae8b04169cccd99d325e9698635 | arm | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/1568cfc513476991722eb0c68114f036026f27fb | ORPH arm | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/048fa89fdbcfc8a54d3d4d3c0d98e7beedb1cc8f | Classification of failures by reason for next --------------------------------------------- unknown | 4 elfutils-0.186 | 2 host-pahole-1.24 | 2 ffmpeg-4.4.3 | 1 gerbera-1.10.0 | 1 glibc-2.36-81-g4f4d7a13edfd... | 1 gobject-introspection | 1 gobject-introspection-1.72.0 | 1 linux-6.1.11 | 1 pv-1.6.20 | 1 speechd-0.11.4 | 1 Detail of failures for next --------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/87f9e78f3b66a19d386487e638672b29efe94046 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/7a7132c4fe8ca681da04616cbedb9822a87dc7d7 | ORPH arceb | ffmpeg-4.4.3 | NOK | http://autobuild.buildroot.net/results/f423d6965bccc60b33b010f6288be6d1684e5d4e | or1k | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/1f8c57916c8c37018b1ad19199507a17fecbb31b | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/d58ee93e1cfc6776e6c3addec1b9434c6980b4e2 | microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/9700b87bb89be7965fe5af181eaee61a44c16a0c | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/2828a72e91b566b70fa0e57b8dea8a7887c67883 | ORPH x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/f9cee7c967b8ec9e233da1ea004cadee39056498 | mips64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/5f94ae0d4532d6bfee9c3723a85f336fcbb87096 | mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/06598b8095f73e9bf8fd670bb53c944a3ee4af03 | ORPH armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/81a4646e2bae975138ac7d340a6187a52f423ec9 | ORPH arceb | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/c74187cd6430c6f2095fc408573a81ab3f7c503e | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/4d6e181bdfdbc25c712230942ab5167bd9687f5d | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/b9dae374f225ed17664121ce350109d5e66b2fc1 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/29eb7f004a6db9a93dfd0c3a2883d1608f4ac290 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/7d02f27f7597158e90a451f87afc2e25ffa7e31b | Classification of failures by reason for 2022.11.x -------------------------------------------------- janus-gateway-1.0.3 | 3 frr-8.3.1 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 host-pahole-1.24 | 1 ocf-linux-20171122 | 1 wolfssl-5.5.3 | 1 xz-5.2.7 | 1 zstd-1.5.2 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | frr-8.3.1 | NOK | http://autobuild.buildroot.net/results/64498486878d0fdaebfede03d7b3a5fa038f47c5 | powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/881737f47efe675c3f875ff42a03434747ebed9d | powerpc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d5f98e5a7854245fd8894db6d7110246aed0e811 | ORPH arm | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/d84b37aaff881ec32b0a0747c480af7c511e0f89 | microblaze | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/10e3941c8d436b2d49ea7282c3f252de0c7e5567 | powerpc64le | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/bfe183af06ef76f1d0cbc8258f3a81220b72a95a | aarch64_be | janus-gateway-1.0.3 | NOK | http://autobuild.buildroot.net/results/a174ebb138de04a63db3a6e67f17dff35cacc081 | arc | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/5214d1aaf1100edc114ddcc5222e21ef296054ec | ORPH mips64el | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/40bdf7b5b0ae3b354eff1dcac887e9368c90824e | microblaze | xz-5.2.7 | NOK | http://autobuild.buildroot.net/results/5765f24b27d3ba58548ba3374333ab6075f3b396 | ORPH microblaze | zstd-1.5.2 | NOK | http://autobuild.buildroot.net/results/1553700c129076437c62c67737312cd2fd07a64b | -- http://autobuild.buildroot.net From fontaine.fabrice at gmail.com Sun Feb 26 10:22:23 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 11:22:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/php-xdebug: bump to version 3.2.0 Message-ID: <20230226102223.325041-1-fontaine.fabrice@gmail.com> - Use official tarball - This bump will fix the following build failure raised since bump of php to version 8.2.1 in commit 90ab065162a35b8aa2c429903e3d59d4ad2c0d7f: checking Check for supported PHP versions... configure: error: not supported. Need a PHP version >= 7.2.0 and < 8.2.0 (found 8.2.1) https://xdebug.org/announcements/2022-12-08 https://xdebug.org/updates#x_3_2_0 Fixes: - http://autobuild.buildroot.org/results/092a6d388fc6801c109eb46635e8df80d06a803e Signed-off-by: Fabrice Fontaine --- package/php-xdebug/php-xdebug.hash | 2 +- package/php-xdebug/php-xdebug.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/php-xdebug/php-xdebug.hash b/package/php-xdebug/php-xdebug.hash index 72bfac67ce..fa92ee82ed 100644 --- a/package/php-xdebug/php-xdebug.hash +++ b/package/php-xdebug/php-xdebug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7e4f28fc65c8b535de43b6d2ec57429476a6de1d53c4d440a9108ae8d28e01f4 php-xdebug-3.0.4.tar.gz +sha256 7769b20eecdadf5fbe9f582512c10b394fb575b6f7a8c3a3a82db6883e0032b7 xdebug-3.2.0.tgz sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272 LICENSE diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk index 18ebc32592..9429d4afee 100644 --- a/package/php-xdebug/php-xdebug.mk +++ b/package/php-xdebug/php-xdebug.mk @@ -4,8 +4,9 @@ # ################################################################################ -PHP_XDEBUG_VERSION = 3.0.4 -PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION)) +PHP_XDEBUG_VERSION = 3.2.0 +PHP_XDEBUG_SOURCE = xdebug-$(PHP_XDEBUG_VERSION).tgz +PHP_XDEBUG_SITE = https://xdebug.org/files PHP_XDEBUG_INSTALL_STAGING = YES PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like) PHP_XDEBUG_LICENSE_FILES = LICENSE -- 2.39.1 From casey at xogium.me Sun Feb 26 11:04:00 2023 From: casey at xogium.me (Casey R.) Date: Sun, 26 Feb 2023 12:04:00 +0100 Subject: [Buildroot] [PATCH v2] package/lzop: bump to version 1.04 In-Reply-To: <87mt51ez6l.fsf@tarshish> References: <20230225112838.4061103-1-casey@xogium.me> <20230225132927.4067626-1-casey@xogium.me> <87mt51ez6l.fsf@tarshish> Message-ID: Hi, damn. I forgot to remove my commented out hook definition. More accurately I forgot to git add the file again after I did that. Ugh. Time for a v3, I guess ? Unless someone is kind enough to just take that out ? Thanks. On Sun Feb 26, 2023 at 7:07 AM CET, Baruch Siach wrote: > Hi Casey, > > On Sat, Feb 25 2023, Casey Reeves wrote: > > diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk > > index 55157c4d48..056d724a7b 100644 > > --- a/package/lzop/lzop.mk > > +++ b/package/lzop/lzop.mk > > @@ -4,13 +4,22 @@ > > # > > ################################################################################ > > > > -LZOP_VERSION = 1.03 > > +LZOP_VERSION = 1.04 > > LZOP_SITE = http://www.lzop.org/download > > LZOP_LICENSE = GPL-2.0+ > > LZOP_LICENSE_FILES = COPYING > > LZOP_DEPENDENCIES = lzo > > HOST_LZOP_DEPENDENCIES = host-lzo > > > > +LZOP_LIBTOOL_PATCH=NO > > +#LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP > > This commit looks redundant. > > baruch > > > + > > +define LZOP_LIBTOOL_FIXUP > > + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $(@D)/autoconf/ltmain.sh > > +endef > > + > > +LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP > > + > > $(eval $(autotools-package)) > > $(eval $(host-autotools-package)) > > > -- > ~. .~ Tk Open Systems > =}------------------------------------------------ooO--U--Ooo------------{= > - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - -- Casey Reeves they/them From casey at xogium.me Sun Feb 26 11:33:08 2023 From: casey at xogium.me (Casey Reeves) Date: Sun, 26 Feb 2023 12:33:08 +0100 Subject: [Buildroot] [PATCH v3] package/lzop: bump to version 1.04 Message-ID: <20230226113307.4088933-1-casey@xogium.me> lzop 1.04 uses libtool 2.4.2.418, which is right between 2.4.2 and 2.4.4. While our patch for 2.4 is also supposed to work up to and including 2.4.2.x, it does not work for libtool 2.4.2.418, which requires the patch for 2.4.4. We could change our infra to better pick the appropriate patch, but we do not know exactly which 2.4.2.x version is actually the cutting point that requires the 2.4.4 patch. Until we have more data point, let's handle the case in an ad-hoc manner for lzop. Additionally, this lzop bump carries the patch from florian B?uerle, which allows to set the mtime of the lzop archive for reproducible build support using SOURCE_DATE_EPOCH. https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch Signed-off-by: Casey Reeves --- Changes v2 -> v3: - removed commented line which called the fixup hook before its creation Changes v1 -> v2: - added missing SoB for both the commit and the included patch - provided explanation and origin of the patch in its file --- ...1-allow-overriding-modification-time.patch | 42 ++++++++ package/lzop/0001-build-with-gcc6.patch | 37 ------- ...es-as-the-external-inline-definition.patch | 102 ------------------ package/lzop/lzop.hash | 2 +- package/lzop/lzop.mk | 10 +- 5 files changed, 52 insertions(+), 141 deletions(-) create mode 100644 package/lzop/0001-allow-overriding-modification-time.patch delete mode 100644 package/lzop/0001-build-with-gcc6.patch delete mode 100644 package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch diff --git a/package/lzop/0001-allow-overriding-modification-time.patch b/package/lzop/0001-allow-overriding-modification-time.patch new file mode 100644 index 0000000000..5ffc64cd30 --- /dev/null +++ b/package/lzop/0001-allow-overriding-modification-time.patch @@ -0,0 +1,42 @@ +From: =?UTF-8?q?Florian=20B=C3=A4uerle?= +Date: Thu, 25 Oct 2018 17:26:30 +0200 +Subject: [PATCH] allow overriding modification time + +This patch allows to set the mtime of the lzop archive to +$SOURCE_DATE_EPOCH, required for reproducible build. It was submitted to +pengutronix by florian B?uerle in october 2018. + +https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch + +Signed-off-by: Casey Reeves +--- + src/lzop.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/lzop.c b/src/lzop.c +index a540ad9c4d33..c2f877d16f92 100644 +--- a/src/lzop.c ++++ b/src/lzop.c +@@ -712,6 +712,7 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + assert(opt_method > 0); + assert(opt_level > 0); + assert(fip->st.st_mode == 0 || S_ISREG(fip->st.st_mode)); ++ const char *source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + + memset(h,0,sizeof(header_t)); + +@@ -748,7 +749,13 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + + h->mode = fix_mode_for_header(fip->st.st_mode); + +- if (fip->st.st_mtime > 0) ++ if (source_date_epoch) ++ { ++ time_t mtime = strtoul(source_date_epoch, NULL, 0); ++ h->mtime_low = (lzo_uint32) (mtime); ++ h->mtime_high = (lzo_uint32) ((mtime >> 16) >> 16); ++ } ++ else if (fip->st.st_mtime > 0) + { + h->mtime_low = (lzo_uint32) (fip->st.st_mtime); + h->mtime_high = (lzo_uint32) ((fip->st.st_mtime >> 16) >> 16); diff --git a/package/lzop/0001-build-with-gcc6.patch b/package/lzop/0001-build-with-gcc6.patch deleted file mode 100644 index 03bd887d51..0000000000 --- a/package/lzop/0001-build-with-gcc6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Jaap Crezee -Date: Sat, 25 june 2016 13:13:00 +0200 -Subject: [PATCH] fix compilation host-lzop with gcc-6 - -This patch allows host-lzop to be compiled with host systems containing gcc-6 - -Upstream patch found here: -https://build.opensuse.org/package/view_file/Archiving/lzop/lzop-1.03-gcc6.patch?expand=1 - -Signed-off-by: Jaap Crezee - ---- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100 -+++ b/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 -@@ -4469,12 +4469,12 @@ - #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) -+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) - #endif - ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) - #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) -+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) - #endif - ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) - #if defined(acc_int16e_t) -@@ -4703,7 +4703,7 @@ - #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) -- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) -+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) - #endif - #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) - # pragma option pop diff --git a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch b/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch deleted file mode 100644 index f6d076a9f7..0000000000 --- a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch +++ /dev/null @@ -1,102 +0,0 @@ -From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 16 Aug 2015 10:35:47 -0700 -Subject: [PATCH] use static inlines as the external inline definition has - changed with gcc5 - -[Patch from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch] -Signed-off-by: Khem Raj -Signed-off-by: Peter Korsgaard ---- -Upstream-Status: Pending - - src/miniacc.h | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - -diff --git a/src/miniacc.h b/src/miniacc.h -index 09e6f0c..cae98d1 100644 ---- a/src/miniacc.h -+++ b/src/miniacc.h -@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } --- -2.5.0 - diff --git a/package/lzop/lzop.hash b/package/lzop/lzop.hash index adc20648b6..99796dc8c9 100644 --- a/package/lzop/lzop.hash +++ b/package/lzop/lzop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 lzop-1.03.tar.gz +sha256 7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41 lzop-1.04.tar.gz sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk index 55157c4d48..e946206a42 100644 --- a/package/lzop/lzop.mk +++ b/package/lzop/lzop.mk @@ -4,13 +4,21 @@ # ################################################################################ -LZOP_VERSION = 1.03 +LZOP_VERSION = 1.04 LZOP_SITE = http://www.lzop.org/download LZOP_LICENSE = GPL-2.0+ LZOP_LICENSE_FILES = COPYING LZOP_DEPENDENCIES = lzo HOST_LZOP_DEPENDENCIES = host-lzo +LZOP_LIBTOOL_PATCH=NO + +define LZOP_LIBTOOL_FIXUP + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $(@D)/autoconf/ltmain.sh +endef + +LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP + $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.39.2 From fontaine.fabrice at gmail.com Sun Feb 26 12:06:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 13:06:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcm-tools: needs NPTL Message-ID: <20230226120636.39100-1-fontaine.fabrice@gmail.com> pcm-tools needs NPTL since its addition in commit 60eb2cec80e5258a0c43090f539749606744e182: cpucounters.cpp: In constructor 'pcm::TemporalThreadAffinity::TemporalThreadAffinity(pcm::uint32, bool)': cpucounters.cpp:252:9: error: 'pthread_getaffinity_np' was not declared in this scope; did you mean 'sched_getaffinity'? 252 | pthread_getaffinity_np(pthread_self(), set_size, old_affinity); | ^~~~~~~~~~~~~~~~~~~~~~ | sched_getaffinity Fixes: - http://autobuild.buildroot.org/results/8bbf9c36af332bbf5e7c1abcbb594a0b231ef97e Signed-off-by: Fabrice Fontaine --- package/pcm-tools/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/pcm-tools/Config.in b/package/pcm-tools/Config.in index ca9719dc5f..6bf05f32d7 100644 --- a/package/pcm-tools/Config.in +++ b/package/pcm-tools/Config.in @@ -1,11 +1,13 @@ -comment "pcm-tools needs a toolchain w/ C++" +comment "pcm-tools needs a toolchain w/ C++, NPTL" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_INSTALL_LIBSTDCPP + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL config BR2_PACKAGE_PCM_TOOLS bool "pcm-tools" depends on BR2_i386 || BR2_x86_64 depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_HWDATA select BR2_PACKAGE_HWDATA_PCI_IDS help -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 12:07:32 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 13:07:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: fix build without NPTL Message-ID: <20230226120732.39710-1-fontaine.fabrice@gmail.com> Fix the following build failure without NPTL raised since the addition of the package in commit 1e64fa2956171cdc9d6e6c8896b4b589ce573513: /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: error: 'pthread_spin_init' was not declared in this scope; did you mean 'pthread_cond_init'? 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) | ^~~~~~~~~~~~~~~~~ | pthread_cond_init Fixes: - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f Signed-off-by: Fabrice Fontaine --- .../0001-fix-uclibc-build-without-NPTL.patch | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 package/gdal/0001-fix-uclibc-build-without-NPTL.patch diff --git a/package/gdal/0001-fix-uclibc-build-without-NPTL.patch b/package/gdal/0001-fix-uclibc-build-without-NPTL.patch new file mode 100644 index 0000000000..6ecbfc7f95 --- /dev/null +++ b/package/gdal/0001-fix-uclibc-build-without-NPTL.patch @@ -0,0 +1,102 @@ +From 0d3ee8a7661dcd85a9d7b636124af32de8d1b2f1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 11:31:23 +0100 +Subject: [PATCH] fix uclibc build without NPTL + +Check for pthread_spin_lock instead of pthread_spin_lock_t to avoid the +following uclibc build failure: + +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: error: 'pthread_spin_init' was not declared in this scope; did you mean 'pthread_cond_init'? + 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) + | ^~~~~~~~~~~~~~~~~ + | pthread_cond_init +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'int CPLAcquireSpinLock(CPLSpinLock*)': +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2283:12: error: 'pthread_spin_lock' was not declared in this scope; did you mean 'pthread_spinlock_t'? + 2283 | return pthread_spin_lock( &(psSpin->spin) ) == 0; + | ^~~~~~~~~~~~~~~~~ + | pthread_spinlock_t + +Fixes: + - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OSGeo/gdal/pull/7318] +--- + cmake/helpers/configure.cmake | 4 ++-- + cmake/template/cpl_config.h.in | 4 ++-- + port/cpl_config.h.in | 4 ++-- + port/cpl_multiproc.cpp | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/cmake/helpers/configure.cmake b/cmake/helpers/configure.cmake +index 08549df434..62a4f636ba 100644 +--- a/cmake/helpers/configure.cmake ++++ b/cmake/helpers/configure.cmake +@@ -110,9 +110,9 @@ else () + " + #define _GNU_SOURCE + #include +- int main() { pthread_spinlock_t spin; return 1; } ++ int main() { pthread_spinlock_t spin; return pthread_spin_lock(&spin); } + " +- HAVE_PTHREAD_SPINLOCK) ++ HAVE_PTHREAD_SPIN_LOCK) + + check_c_source_compiles( + " +diff --git a/cmake/template/cpl_config.h.in b/cmake/template/cpl_config.h.in +index cfa7da94aa..d1fd80bda9 100644 +--- a/cmake/template/cpl_config.h.in ++++ b/cmake/template/cpl_config.h.in +@@ -61,8 +61,8 @@ + /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ + #cmakedefine HAVE_PTHREAD_MUTEX_ADAPTIVE_NP 1 + +-/* Define to 1 if you have the `pthread_spinlock_t' type. */ +-#cmakedefine HAVE_PTHREAD_SPINLOCK 1 ++/* Define to 1 if you have the `pthread_spin_lock' function. */ ++#cmakedefine HAVE_PTHREAD_SPIN_LOCK 1 + + /* Define to 1 if you have the `pthread_atfork' function. */ + #cmakedefine HAVE_PTHREAD_ATFORK 1 +diff --git a/port/cpl_config.h.in b/port/cpl_config.h.in +index ea28efb3f0..09a48f242d 100644 +--- a/port/cpl_config.h.in ++++ b/port/cpl_config.h.in +@@ -51,8 +51,8 @@ + /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ + #undef HAVE_PTHREAD_MUTEX_ADAPTIVE_NP + +-/* Define to 1 if you have the `pthread_spinlock_t' type. */ +-#undef HAVE_PTHREAD_SPINLOCK ++/* Define to 1 if you have the `pthread_spin_lock' function. */ ++#undef HAVE_PTHREAD_SPIN_LOCK + + /* Define to 1 if you have the 5 args `mremap' function. */ + #undef HAVE_5ARGS_MREMAP +diff --git a/port/cpl_multiproc.cpp b/port/cpl_multiproc.cpp +index 7f5bcd9127..474ff5bb29 100644 +--- a/port/cpl_multiproc.cpp ++++ b/port/cpl_multiproc.cpp +@@ -2232,7 +2232,7 @@ void CPLCleanupTLS() + /* CPLCreateSpinLock() */ + /************************************************************************/ + +-#if defined(HAVE_PTHREAD_SPINLOCK) ++#if defined(HAVE_PTHREAD_SPIN_LOCK) + #define HAVE_SPINLOCK_IMPL + + struct _CPLSpinLock +@@ -2310,7 +2310,7 @@ void CPLDestroySpinLock(CPLSpinLock *psSpin) + pthread_spin_destroy(&(psSpin->spin)); + free(psSpin); + } +-#endif // HAVE_PTHREAD_SPINLOCK ++#endif // HAVE_PTHREAD_SPIN_LOCK + + #endif // def CPL_MULTIPROC_PTHREAD + +-- +2.39.1 + -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 12:23:36 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 13:23:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xwayland: xlib_libxshmfence is mandatory Message-ID: <20230226122336.49814-1-fontaine.fabrice@gmail.com> xlib_libxshmfence is mandatory, not optional, since the addition of the package in commit 05c3177493aa8447d5cb568c8c13e0c09eded18b: ../miext/sync/misyncshm.c:36:10: fatal error: X11/xshmfence.h: No such file or directory 36 | #include | ^~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/cccc8f97d452ed2adbcbc4624f159a00287a3d38 Signed-off-by: Fabrice Fontaine --- package/weston/Config.in | 4 ++++ package/wlroots/Config.in | 4 ++++ package/x11r7/xwayland/Config.in | 5 +++++ package/x11r7/xwayland/xwayland.mk | 5 +++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 09119edaaa..d5dbf27bbd 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -114,6 +114,8 @@ config BR2_PACKAGE_WESTON_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 @@ -125,6 +127,8 @@ comment "XWayland support needs libepoxy and X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS # Weston needs at least one shell; this can be one of the bundled ones, diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index b2d3f3c3b1..fb23e9069c 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -47,6 +47,8 @@ config BR2_PACKAGE_WLROOTS_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XCB_UTIL_WM select BR2_PACKAGE_XWAYLAND @@ -58,6 +60,8 @@ comment "XWayland support needs X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS endif diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in index 4f14f2cc36..241ab73ad3 100644 --- a/package/x11r7/xwayland/Config.in +++ b/package/x11r7/xwayland/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_XWAYLAND # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. + depends on !BR2_RISCV_32 # xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_WAYLAND @@ -14,6 +16,7 @@ config BR2_PACKAGE_XWAYLAND select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XLIB_LIBXKBFILE select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXSHMFENCE select BR2_PACKAGE_XLIB_XTRANS select BR2_PACKAGE_XORGPROTO help @@ -23,4 +26,6 @@ config BR2_PACKAGE_XWAYLAND comment "xwayland needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 174b440b07..7aef1156d3 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -18,6 +18,7 @@ XWAYLAND_DEPENDENCIES = \ xlib_libXfont2 \ xlib_libxkbfile \ xlib_libXrandr \ + xlib_libxshmfence \ xlib_xtrans \ xorgproto XWAYLAND_CONF_OPTS = \ @@ -77,9 +78,9 @@ XWAYLAND_CONF_OPTS += -Dsha1=libsha1 XWAYLAND_DEPENDENCIES += libsha1 endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_LIBDRM),yy) +ifeq ($(BR2_PACKAGE_LIBDRM),y) XWAYLAND_CONF_OPTS += -Ddri3=true -XWAYLAND_DEPENDENCIES += xlib_libxshmfence libdrm +XWAYLAND_DEPENDENCIES += libdrm else XWAYLAND_CONF_OPTS += -Ddri3=false endif -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 13:10:48 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 14:10:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-werkzeug: security bump to version 2.2.3 Message-ID: <20230226131048.75813-1-fontaine.fabrice@gmail.com> Fix CVE-2023-23934 and CVE-2023-25577 https://github.com/pallets/werkzeug/security/advisories/GHSA-px8h-6qxv-m22q https://github.com/pallets/werkzeug/security/advisories/GHSA-xg9f-g7g7-2323 https://werkzeug.palletsprojects.com/en/2.2.x/changes/#version-2-2-3 Signed-off-by: Fabrice Fontaine --- package/python-werkzeug/python-werkzeug.hash | 6 +++--- package/python-werkzeug/python-werkzeug.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash index 13b95bc448..0b60a40066 100644 --- a/package/python-werkzeug/python-werkzeug.hash +++ b/package/python-werkzeug/python-werkzeug.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/Werkzeug/json -md5 9d7e50c5bb3a9fc12823b5faf374b90e Werkzeug-2.2.2.tar.gz -sha256 7ea2d48322cc7c0f8b3a215ed73eabd7b5d75d0b50e31ab006286ccff9e00b8f Werkzeug-2.2.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/werkzeug/json +md5 28c3ec6a4b1ce8f06c85612c1dfa351a Werkzeug-2.2.3.tar.gz +sha256 2e1ccc9417d4da358b9de6f174e3ac094391ea1d4fbef2d667865d819dfd0afe Werkzeug-2.2.3.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk index 3ebae3c165..0dd27d145f 100644 --- a/package/python-werkzeug/python-werkzeug.mk +++ b/package/python-werkzeug/python-werkzeug.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 2.2.2 +PYTHON_WERKZEUG_VERSION = 2.2.3 PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/f8/c1/1c8e539f040acd80f844c69a5ef8e2fccdf8b442dabb969e497b55d544e1 +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/02/3c/baaebf3235c87d61d6593467056d5a8fba7c75ac838b8d100a5e64eba7a0 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst -- 2.39.1 From ju.o at free.fr Sun Feb 26 13:18:38 2023 From: ju.o at free.fr (Julien Olivain) Date: Sun, 26 Feb 2023 14:18:38 +0100 Subject: [Buildroot] [PATCH next 1/1] configs/spike_riscv64: bump kernel to 6.1.14 Message-ID: <20230226131838.509224-1-ju.o@free.fr> Linux Kernel 6.1 now being officially promoted to be a LTS, this commit bump the kernel version of this defconfig to 6.1.14. A Kernel config fragment "linux.fragment" is now needed as the kernel no longer enable SBI v0.1 support and the earlycon RISC-V SBI in its riscv arch defconfig. See [1] [2]. The Spike riscv-isa-sim was updated upstream accordingly [3]. In order to keep a smooth transition, this kernel config fragment re-enable those options to make sure this kernel will work with both old Spike versions (not including commit [3] like the v1.1.0 currently included in Buildroot), and newer versions. This commit was also successfully tested with riscv-isa-sim at commit 0d1a48c0c0. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6f562570b9c5d6a3e30d87aec60a9d8f22a3203c [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3938d5a2f9369d1ebd56320629fed395ce327e9c [3] https://github.com/riscv-software-src/riscv-isa-sim/commit/191634d2854dfed448fc323195f9b65c305e2d77 Signed-off-by: Julien Olivain --- Patch tested on top of branch next at commit b793f3a with commands: make spike_riscv64_defconfig make board/spike/riscv64/start.sh --- board/spike/riscv64/linux.fragment | 3 +++ configs/spike_riscv64_defconfig | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 board/spike/riscv64/linux.fragment diff --git a/board/spike/riscv64/linux.fragment b/board/spike/riscv64/linux.fragment new file mode 100644 index 0000000000..b443b0ab36 --- /dev/null +++ b/board/spike/riscv64/linux.fragment @@ -0,0 +1,3 @@ +CONFIG_RISCV_SBI_V01=y +CONFIG_HVC_RISCV_SBI=y +CONFIG_SERIAL_EARLYCON_RISCV_SBI=y diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index e23f1ce32c..73ea566084 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -2,9 +2,10 @@ BR2_riscv=y BR2_RISCV_64=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/spike/riscv64/linux.fragment" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y -- 2.39.2 From fontaine.fabrice at gmail.com Sun Feb 26 13:20:26 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 14:20:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/bind: security bump to version 9.16.38 Message-ID: <20230226132026.82185-1-fontaine.fabrice@gmail.com> - Fix CVE-2022-3094, CVE-2022-3736 and CVE-2022-3924 - Update hash of COPYRIGHT (year updated with https://gitlab.isc.org/isc-projects/bind9/-/commit/1a5d707f52282117c9912a27dcc89f2ec412577a) https://downloads.isc.org/isc/bind9/9.16.38/doc/arm/html/notes.html Signed-off-by: Fabrice Fontaine --- package/bind/bind.hash | 6 +++--- package/bind/bind.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index d41a9bbc5e..32804b5ce0 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.16.33/bind-9.16.33.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.38/bind-9.16.38.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 ec4fbea4b2e368d1824971509e33fa159224ad14b436034c6bcd46104c328d91 bind-9.16.33.tar.xz -sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT +sha256 8df44c9d9a84a28ab8b49d55f3c33b624b90ef8f6a8b9ee6a4c33cc17c14c50f bind-9.16.38.tar.xz +sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index abc3100e6d..c6e992f76c 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.33 +BIND_VERSION = 9.16.38 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 13:27:47 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 14:27:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-m2crypto: fix CVE-2020-25657 Message-ID: <20230226132747.86908-1-fontaine.fabrice@gmail.com> A flaw was found in all released versions of m2crypto, where they are vulnerable to Bleichenbacher timing attacks in the RSA decryption API via the timed processing of valid PKCS#1 v1.5 Ciphertext. The highest threat from this vulnerability is to confidentiality. Signed-off-by: Fabrice Fontaine --- ...he-RSA-decryption-API-CVE-2020-25657.patch | 174 ++++++++++++++++++ package/python-m2crypto/python-m2crypto.mk | 3 + 2 files changed, 177 insertions(+) create mode 100644 package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch diff --git a/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch b/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch new file mode 100644 index 0000000000..68200b7d9b --- /dev/null +++ b/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch @@ -0,0 +1,174 @@ +From 84c53958def0f510e92119fca14d74f94215827a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= +Date: Tue, 28 Jun 2022 21:17:01 +0200 +Subject: [PATCH] Mitigate the Bleichenbacher timing attacks in the RSA + decryption API (CVE-2020-25657) + +Fixes #282 + +[Retrieved from: +https://gitlab.com/m2crypto/m2crypto/-/commit/84c53958def0f510e92119fca14d74f94215827a] +Signed-off-by: Fabrice Fontaine +--- + src/SWIG/_m2crypto_wrap.c | 20 ++++++++++++-------- + src/SWIG/_rsa.i | 20 ++++++++++++-------- + tests/test_rsa.py | 15 +++++++-------- + 3 files changed, 31 insertions(+), 24 deletions(-) + +diff --git a/src/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c +index aba9eb6d..a9f30da9 100644 +--- a/src/SWIG/_m2crypto_wrap.c ++++ b/src/SWIG/_m2crypto_wrap.c +@@ -7040,9 +7040,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7070,9 +7071,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7097,9 +7099,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7124,9 +7127,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); + +diff --git a/src/SWIG/_rsa.i b/src/SWIG/_rsa.i +index bc714e01..1377b8be 100644 +--- a/src/SWIG/_rsa.i ++++ b/src/SWIG/_rsa.i +@@ -239,9 +239,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -269,9 +270,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -296,9 +298,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -323,9 +326,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); + +diff --git a/tests/test_rsa.py b/tests/test_rsa.py +index 7bb3af75..5e75d681 100644 +--- a/tests/test_rsa.py ++++ b/tests/test_rsa.py +@@ -109,8 +109,9 @@ class RSATestCase(unittest.TestCase): + # The other paddings. + for padding in self.s_padding_nok: + p = getattr(RSA, padding) +- with self.assertRaises(RSA.RSAError): +- priv.private_encrypt(self.data, p) ++ # Exception disabled as a part of mitigation against CVE-2020-25657 ++ # with self.assertRaises(RSA.RSAError): ++ priv.private_encrypt(self.data, p) + # Type-check the data to be encrypted. + with self.assertRaises(TypeError): + priv.private_encrypt(self.gen_callback, RSA.pkcs1_padding) +@@ -127,10 +128,12 @@ class RSATestCase(unittest.TestCase): + self.assertEqual(ptxt, self.data) + + # no_padding +- with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): +- priv.public_encrypt(self.data, RSA.no_padding) ++ # Exception disabled as a part of mitigation against CVE-2020-25657 ++ # with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): ++ priv.public_encrypt(self.data, RSA.no_padding) + + # Type-check the data to be encrypted. ++ # Exception disabled as a part of mitigation against CVE-2020-25657 + with self.assertRaises(TypeError): + priv.public_encrypt(self.gen_callback, RSA.pkcs1_padding) + +@@ -146,10 +149,6 @@ class RSATestCase(unittest.TestCase): + b'\000\000\000\003\001\000\001') # aka 65537 aka 0xf4 + with self.assertRaises(RSA.RSAError): + setattr(rsa, 'e', '\000\000\000\003\001\000\001') +- with self.assertRaises(RSA.RSAError): +- rsa.private_encrypt(1) +- with self.assertRaises(RSA.RSAError): +- rsa.private_decrypt(1) + assert rsa.check_key() + + def test_loadpub_bad(self): +-- +GitLab + diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 02ad76d3f4..3c28fa3b0d 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -15,4 +15,7 @@ PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr +# 0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch +PYTHON_M2CRYPTO_IGNORE_CVES += CVE-2020-25657 + $(eval $(python-package)) -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 13:33:57 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 14:33:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/haproxy: security bump to version 2.6.9 Message-ID: <20230226133357.97330-1-fontaine.fabrice@gmail.com> Fix CVE-2023-25725 https://www.mail-archive.com/haproxy at formilux.org/msg43229.html https://www.mail-archive.com/haproxy at formilux.org/msg43224.html Signed-off-by: Fabrice Fontaine --- 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 2cd8ff1806..f5540ee44a 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.5.tar.gz.sha256 -sha256 ce9e19ebfcdd43e51af8a6090f1df8d512d972ddf742fa648a643bbb19056605 haproxy-2.6.5.tar.gz +# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.9.tar.gz.sha256 +sha256 f01a1c5f465dc1b5cd175d0b28b98beb4dfe82b5b5b63ddcc68d1df433641701 haproxy-2.6.9.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 35b1770d38..2c54e1c2c3 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.6 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).5 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).9 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 -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 13:39:46 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 14:39:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/tiff: fix CVE-2022-48281 Message-ID: <20230226133946.102275-1-fontaine.fabrice@gmail.com> processCropSelections in tools/tiffcrop.c in LibTIFF through 4.5.0 has a heap-based buffer overflow (e.g., "WRITE of size 307203") via a crafted TIFF image. Signed-off-by: Fabrice Fontaine --- ...rect-simple-copy-paste-error-Fix-488.patch | 28 +++++++++++++++++++ package/tiff/tiff.mk | 3 ++ 2 files changed, 31 insertions(+) create mode 100644 package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch diff --git a/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch b/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch new file mode 100644 index 0000000000..73c0d10ffc --- /dev/null +++ b/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch @@ -0,0 +1,28 @@ +From 97d65859bc29ee334012e9c73022d8a8e55ed586 Mon Sep 17 00:00:00 2001 +From: Su Laus +Date: Sat, 21 Jan 2023 15:58:10 +0000 +Subject: [PATCH] tiffcrop: Correct simple copy paste error. Fix #488. + +[Retrieved from: +https://gitlab.com/libtiff/libtiff/-/commit/97d65859bc29ee334012e9c73022d8a8e55ed586] +Signed-off-by: Fabrice Fontaine +--- + tools/tiffcrop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c +index 14fa18da..7db69883 100644 +--- a/tools/tiffcrop.c ++++ b/tools/tiffcrop.c +@@ -8591,7 +8591,7 @@ static int processCropSelections(struct image_data *image, + cropsize + NUM_BUFF_OVERSIZE_BYTES); + else + { +- prev_cropsize = seg_buffs[0].size; ++ prev_cropsize = seg_buffs[i].size; + if (prev_cropsize < cropsize) + { + next_buff = _TIFFrealloc( +-- +GitLab + diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index e7de51ea1e..f9754a4b49 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -12,6 +12,9 @@ TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES +# 0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch +TIFF_IGNORE_CVES += CVE-2022-48281 + # webp has a (optional) dependency on tiff, so we can't have webp # support in tiff, or that would create a circular dependency. TIFF_CONF_OPTS = \ -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 13:55:03 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 14:55:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpjsip: fix CVE-2022-235{3,4}7 Message-ID: <20230226135503.112605-1-fontaine.fabrice@gmail.com> https://github.com/pjsip/pjproject/security/advisories/GHSA-9pfh-r8x4-w26w https://github.com/pjsip/pjproject/security/advisories/GHSA-cxwq-5g9x-x7fr Signed-off-by: Fabrice Fontaine --- ...ull-request-from-GHSA-9pfh-r8x4-w26w.patch | 99 +++++++++++++++++++ package/libpjsip/libpjsip.mk | 6 ++ 2 files changed, 105 insertions(+) create mode 100644 package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch diff --git a/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch new file mode 100644 index 0000000000..01e1878189 --- /dev/null +++ b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch @@ -0,0 +1,99 @@ +From d8440f4d711a654b511f50f79c0445b26f9dd1e1 Mon Sep 17 00:00:00 2001 +From: Nanang Izzuddin +Date: Tue, 20 Dec 2022 11:39:12 +0700 +Subject: [PATCH] Merge pull request from GHSA-9pfh-r8x4-w26w + +* Fix buffer overread in STUN message decoder + +* Updates based on comments + +[Retrieved from: +https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1] +Signed-off-by: Fabrice Fontaine +--- + pjnath/include/pjnath/stun_msg.h | 4 ++++ + pjnath/src/pjnath/stun_msg.c | 14 +++++++++++--- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h +index b52f95c586..e49f096f3a 100644 +--- a/pjnath/include/pjnath/stun_msg.h ++++ b/pjnath/include/pjnath/stun_msg.h +@@ -442,6 +442,7 @@ typedef enum pj_stun_status + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_msg_hdr + { + /** +@@ -473,6 +474,7 @@ typedef struct pj_stun_msg_hdr + pj_uint8_t tsx_id[12]; + + } pj_stun_msg_hdr; ++#pragma pack() + + + /** +@@ -490,6 +492,7 @@ typedef struct pj_stun_msg_hdr + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_attr_hdr + { + /** +@@ -506,6 +509,7 @@ typedef struct pj_stun_attr_hdr + pj_uint16_t length; + + } pj_stun_attr_hdr; ++#pragma pack() + + + /** +diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c +index 3def6b3eac..e904a0ba47 100644 +--- a/pjnath/src/pjnath/stun_msg.c ++++ b/pjnath/src/pjnath/stun_msg.c +@@ -746,7 +746,7 @@ PJ_DEF(int) pj_stun_set_padding_char(int chr) + + #define INIT_ATTR(a,t,l) (a)->hdr.type=(pj_uint16_t)(t), \ + (a)->hdr.length=(pj_uint16_t)(l) +-#define ATTR_HDR_LEN 4 ++#define ATTR_HDR_LEN sizeof(pj_stun_attr_hdr) + + static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos) + { +@@ -2327,6 +2327,14 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + status = pj_stun_msg_check(pdu, pdu_len, options); + if (status != PJ_SUCCESS) + return status; ++ } else { ++ /* For safety, verify packet length at least */ ++ pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20; ++ if (msg_len > pdu_len || ++ ((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len)) ++ { ++ return PJNATH_EINSTUNMSGLEN; ++ } + } + + /* Create the message, copy the header, and convert to host byte order */ +@@ -2345,7 +2353,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + p_response = NULL; + + /* Parse attributes */ +- while (pdu_len >= 4) { ++ while (pdu_len >= ATTR_HDR_LEN) { + unsigned attr_type, attr_val_len; + const struct attr_desc *adesc; + +@@ -2357,7 +2365,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + attr_val_len = (attr_val_len + 3) & (~3); + + /* Check length */ +- if (pdu_len < attr_val_len) { ++ if (pdu_len < attr_val_len + ATTR_HDR_LEN) { + pj_str_t err_msg; + char err_msg_buf[80]; + diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 5cc0423f5d..24db641446 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -15,6 +15,12 @@ LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) +# 0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch +LIBPJSIP_IGNORE_CVES += CVE-2022-23537 + +# 0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch +LIBPJSIP_IGNORE_CVES += CVE-2022-23547 + LIBPJSIP_CFLAGS = $(TARGET_CFLAGS) -DPJ_HAS_IPV6=1 # relocation truncated to fit: R_68K_GOT16O -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 15:44:21 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 16:44:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/proxychains-ng: set -fPIC Message-ID: <20230226154421.47285-1-fontaine.fabrice@gmail.com> Set -fPIC to avoid the following build failure with some architectures such as mips or aarch64 raised since bump to version 4.14 in commit 35953d1e61aa8581be09c9dca39365955b10590e and https://github.com/rofl0r/proxychains-ng/commit/35a674bdbc294730429a1007c9e7ce01e65b49b5: checking what's the option to use in linker to set library name ... cannot find an option to set library name Fixes: - http://autobuild.buildroot.org/results/8ed1481e29321ed3da40251f700cb3bd66f62c94 - http://autobuild.buildroot.org/results/fd01df6eb9a37257894740d44a33eece9123355a Signed-off-by: Fabrice Fontaine --- package/proxychains-ng/proxychains-ng.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk index c4d487c7db..beb8909088 100644 --- a/package/proxychains-ng/proxychains-ng.mk +++ b/package/proxychains-ng/proxychains-ng.mk @@ -13,7 +13,8 @@ PROXYCHAINS_NG_CPE_ID_VENDOR = proxychains-ng_project define PROXYCHAINS_NG_CONFIGURE_CMDS cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) ./configure --prefix=/usr --sysconfdir=/etc + $(TARGET_CONFIGURE_OPTS) CPPFLAGS="$(TARGET_CPPFLAGS) -fPIC" \ + ./configure --prefix=/usr --sysconfdir=/etc endef define PROXYCHAINS_NG_BUILD_CMDS -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 16:20:21 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 17:20:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/uccp420wlan: drop package Message-ID: <20230226162021.67158-1-fontaine.fabrice@gmail.com> uccp420wlan is not maintained anymore (no commit since 2017) and fails to build with any "recent" kernel (e.g. >= 4.7 which includes https://github.com/torvalds/linux/commit/57fbcce37be7c1d2622b56587c10ade00e96afa3 or https://github.com/torvalds/linux/commit/8552a434b6a05cc38006733afe6a239ad4d600a2): /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c: In function ?uccp420wlan_tx_free_buff_req?: /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c:1142:49: error: ?IEEE80211_BAND_2GHZ? undeclared (first use in this function); did you mean ?IEEE80211_CHAN_2GHZ?? 1142 | if (ets_band == IEEE80211_BAND_2GHZ) | ^~~~~~~~~~~~~~~~~~~ | IEEE80211_CHAN_2GHZ [...] /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/core.c:428:29: error: implicit declaration of function ?ieee80211_csa_is_complete?; did you mean ?ieee80211_scan_completed?? [-Werror=implicit-function-declaration] 428 | if (ieee80211_csa_is_complete(uvif->vif)) | ^~~~~~~~~~~~~~~~~~~~~~~~~ | ieee80211_scan_completed Fixes: - http://autobuild.buildroot.org/results/7cd7151e390b8f7a0df3e647fe4cd5d6319a830b Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 7 +++++++ package/uccp420wlan/Config.in | 16 ---------------- package/uccp420wlan/uccp420wlan.hash | 4 ---- package/uccp420wlan/uccp420wlan.mk | 18 ------------------ 4 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 package/uccp420wlan/Config.in delete mode 100644 package/uccp420wlan/uccp420wlan.hash delete mode 100644 package/uccp420wlan/uccp420wlan.mk diff --git a/Config.in.legacy b/Config.in.legacy index af1d8cc1dc..381e1e3a8c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_UCCP420WLAN + bool "uccp420wlan removed" + select BR2_LEGACY + help + The uccp420wlan package is unmaintained and doesn't build + with any "recent" kernel (e.g. >= 4.7). + config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES bool "imx-gpu-g2d examples removed" select BR2_LEGACY diff --git a/package/uccp420wlan/Config.in b/package/uccp420wlan/Config.in deleted file mode 100644 index ef6a9db865..0000000000 --- a/package/uccp420wlan/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_UCCP420WLAN - bool "uccp420wlan" - depends on BR2_LINUX_KERNEL - help - SoftMAC (mac80211) based WiFi driver for Imagination's - Explorer RPU uccp420. This supports Dual Band WiFi with - 2.4GHz - 2x2 b/g/n 40MHz, 5GHz - 2x2 a/n/11ac 80MHz modes - - Used in creator ci40 board. - - This module needs a Linux kernel >= v4.2. - - https://github.com/CreatorDev/uccp420wlan - -comment "uccp420wlan needs a Linux kernel >= 4.2 to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package/uccp420wlan/uccp420wlan.hash b/package/uccp420wlan/uccp420wlan.hash deleted file mode 100644 index 905fa4299d..0000000000 --- a/package/uccp420wlan/uccp420wlan.hash +++ /dev/null @@ -1,4 +0,0 @@ -# locally computed hash -sha256 1d4de62fc842dbab739708cf0d9ebce270fcdf63c1c13ac676cbc253acdaa3bb uccp420wlan-6.9.1.tar.gz -sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING -sha256 9ac431585fddfe624b08cf7464876a5e96061047ff26a9e926da3d89d21a2a73 firmware/LICENSE.imagination diff --git a/package/uccp420wlan/uccp420wlan.mk b/package/uccp420wlan/uccp420wlan.mk deleted file mode 100644 index 7256b92774..0000000000 --- a/package/uccp420wlan/uccp420wlan.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# uccp420wlan -# -################################################################################ - -UCCP420WLAN_VERSION = 6.9.1 -UCCP420WLAN_SITE = $(call github,CreatorDev,uccp420wlan,v$(UCCP420WLAN_VERSION)) -UCCP420WLAN_LICENSE = GPL-2.0 (kernel module), proprietary (firmware blob) -UCCP420WLAN_LICENSE_FILES = COPYING firmware/LICENSE.imagination - -define UCCP420WLAN_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware/img/uccp420wlan - cp $(@D)/firmware/*.ldr $(TARGET_DIR)/lib/firmware/img/uccp420wlan -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 17:23:28 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 18:23:28 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/uccp420wlan: drop package Message-ID: <20230226172328.114504-1-fontaine.fabrice@gmail.com> uccp420wlan is not maintained anymore (no commit since 2017) and fails to build with any "recent" kernel (e.g. >= 4.7 which includes https://github.com/torvalds/linux/commit/57fbcce37be7c1d2622b56587c10ade00e96afa3 or https://github.com/torvalds/linux/commit/8552a434b6a05cc38006733afe6a239ad4d600a2): /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c: In function ?uccp420wlan_tx_free_buff_req?: /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c:1142:49: error: ?IEEE80211_BAND_2GHZ? undeclared (first use in this function); did you mean ?IEEE80211_CHAN_2GHZ?? 1142 | if (ets_band == IEEE80211_BAND_2GHZ) | ^~~~~~~~~~~~~~~~~~~ | IEEE80211_CHAN_2GHZ [...] /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/core.c:428:29: error: implicit declaration of function ?ieee80211_csa_is_complete?; did you mean ?ieee80211_scan_completed?? [-Werror=implicit-function-declaration] 428 | if (ieee80211_csa_is_complete(uvif->vif)) | ^~~~~~~~~~~~~~~~~~~~~~~~~ | ieee80211_scan_completed Fixes: - http://autobuild.buildroot.org/results/7cd7151e390b8f7a0df3e647fe4cd5d6319a830b Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Update package/Config.in Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/uccp420wlan/Config.in | 16 ---------------- package/uccp420wlan/uccp420wlan.hash | 4 ---- package/uccp420wlan/uccp420wlan.mk | 18 ------------------ 5 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 package/uccp420wlan/Config.in delete mode 100644 package/uccp420wlan/uccp420wlan.hash delete mode 100644 package/uccp420wlan/uccp420wlan.mk diff --git a/Config.in.legacy b/Config.in.legacy index af1d8cc1dc..381e1e3a8c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_UCCP420WLAN + bool "uccp420wlan removed" + select BR2_LEGACY + help + The uccp420wlan package is unmaintained and doesn't build + with any "recent" kernel (e.g. >= 4.7). + config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES bool "imx-gpu-g2d examples removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 0800984cf9..93e080f955 100644 --- a/package/Config.in +++ b/package/Config.in @@ -621,7 +621,6 @@ endmenu source "package/triggerhappy/Config.in" source "package/uboot-tools/Config.in" source "package/ubus/Config.in" - source "package/uccp420wlan/Config.in" source "package/udev/Config.in" source "package/udev-gentoo-scripts/Config.in" source "package/udisks/Config.in" diff --git a/package/uccp420wlan/Config.in b/package/uccp420wlan/Config.in deleted file mode 100644 index ef6a9db865..0000000000 --- a/package/uccp420wlan/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_UCCP420WLAN - bool "uccp420wlan" - depends on BR2_LINUX_KERNEL - help - SoftMAC (mac80211) based WiFi driver for Imagination's - Explorer RPU uccp420. This supports Dual Band WiFi with - 2.4GHz - 2x2 b/g/n 40MHz, 5GHz - 2x2 a/n/11ac 80MHz modes - - Used in creator ci40 board. - - This module needs a Linux kernel >= v4.2. - - https://github.com/CreatorDev/uccp420wlan - -comment "uccp420wlan needs a Linux kernel >= 4.2 to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package/uccp420wlan/uccp420wlan.hash b/package/uccp420wlan/uccp420wlan.hash deleted file mode 100644 index 905fa4299d..0000000000 --- a/package/uccp420wlan/uccp420wlan.hash +++ /dev/null @@ -1,4 +0,0 @@ -# locally computed hash -sha256 1d4de62fc842dbab739708cf0d9ebce270fcdf63c1c13ac676cbc253acdaa3bb uccp420wlan-6.9.1.tar.gz -sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING -sha256 9ac431585fddfe624b08cf7464876a5e96061047ff26a9e926da3d89d21a2a73 firmware/LICENSE.imagination diff --git a/package/uccp420wlan/uccp420wlan.mk b/package/uccp420wlan/uccp420wlan.mk deleted file mode 100644 index 7256b92774..0000000000 --- a/package/uccp420wlan/uccp420wlan.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# uccp420wlan -# -################################################################################ - -UCCP420WLAN_VERSION = 6.9.1 -UCCP420WLAN_SITE = $(call github,CreatorDev,uccp420wlan,v$(UCCP420WLAN_VERSION)) -UCCP420WLAN_LICENSE = GPL-2.0 (kernel module), proprietary (firmware blob) -UCCP420WLAN_LICENSE_FILES = COPYING firmware/LICENSE.imagination - -define UCCP420WLAN_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware/img/uccp420wlan - cp $(@D)/firmware/*.ldr $(TARGET_DIR)/lib/firmware/img/uccp420wlan -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) -- 2.39.1 From thomas.petazzoni at bootlin.com Sun Feb 26 17:43:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 26 Feb 2023 18:43:32 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix CIP RT kernel on microblaze In-Reply-To: <20230225170229.358936-1-fontaine.fabrice@gmail.com> References: <20230225170229.358936-1-fontaine.fabrice@gmail.com> Message-ID: <20230226184332.39c3a9b2@windsurf> On Sat, 25 Feb 2023 18:02:29 +0100 Fabrice Fontaine wrote: > diff --git a/linux/linux.mk b/linux/linux.mk > index 7645b5f507..f3fdc40328 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -33,6 +33,7 @@ LINUX_SITE_METHOD = svn > else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION),y) > LINUX_SOURCE = linux-cip-$(LINUX_VERSION).tar.gz > LINUX_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot > +LINUX_PATCHES += linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch Why not put the patch in linux/5.10.162-cip24-rt10/ directly? This way it would automatically be applied, with the need to tweak LINUX_PATCHES. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 26 17:44:32 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 26 Feb 2023 18:44:32 +0100 Subject: [Buildroot] [git commit] package/uccp420wlan: drop package Message-ID: <20230226174443.1A33786A91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a34ac4453553a5d86b91e038db3acf0e7eb6931f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master uccp420wlan is not maintained anymore (no commit since 2017) and fails to build with any "recent" kernel (e.g. >= 4.7 which includes https://github.com/torvalds/linux/commit/57fbcce37be7c1d2622b56587c10ade00e96afa3 or https://github.com/torvalds/linux/commit/8552a434b6a05cc38006733afe6a239ad4d600a2): /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c: In function ???uccp420wlan_tx_free_buff_req???: /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c:1142:49: error: ???IEEE80211_BAND_2GHZ??? undeclared (first use in this function); did you mean ???IEEE80211_CHAN_2GHZ???? 1142 | if (ets_band == IEEE80211_BAND_2GHZ) | ^~~~~~~~~~~~~~~~~~~ | IEEE80211_CHAN_2GHZ [...] /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/core.c:428:29: error: implicit declaration of function ???ieee80211_csa_is_complete???; did you mean ???ieee80211_scan_completed???? [-Werror=implicit-function-declaration] 428 | if (ieee80211_csa_is_complete(uvif->vif)) | ^~~~~~~~~~~~~~~~~~~~~~~~~ | ieee80211_scan_completed Fixes: - http://autobuild.buildroot.org/results/7cd7151e390b8f7a0df3e647fe4cd5d6319a830b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/uccp420wlan/Config.in | 16 ---------------- package/uccp420wlan/uccp420wlan.hash | 4 ---- package/uccp420wlan/uccp420wlan.mk | 18 ------------------ 5 files changed, 7 insertions(+), 39 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index af1d8cc1dc..381e1e3a8c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_UCCP420WLAN + bool "uccp420wlan removed" + select BR2_LEGACY + help + The uccp420wlan package is unmaintained and doesn't build + with any "recent" kernel (e.g. >= 4.7). + config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES bool "imx-gpu-g2d examples removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..3ace25c665 100644 --- a/package/Config.in +++ b/package/Config.in @@ -621,7 +621,6 @@ endmenu source "package/triggerhappy/Config.in" source "package/uboot-tools/Config.in" source "package/ubus/Config.in" - source "package/uccp420wlan/Config.in" source "package/udev/Config.in" source "package/udev-gentoo-scripts/Config.in" source "package/udisks/Config.in" diff --git a/package/uccp420wlan/Config.in b/package/uccp420wlan/Config.in deleted file mode 100644 index ef6a9db865..0000000000 --- a/package/uccp420wlan/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_UCCP420WLAN - bool "uccp420wlan" - depends on BR2_LINUX_KERNEL - help - SoftMAC (mac80211) based WiFi driver for Imagination's - Explorer RPU uccp420. This supports Dual Band WiFi with - 2.4GHz - 2x2 b/g/n 40MHz, 5GHz - 2x2 a/n/11ac 80MHz modes - - Used in creator ci40 board. - - This module needs a Linux kernel >= v4.2. - - https://github.com/CreatorDev/uccp420wlan - -comment "uccp420wlan needs a Linux kernel >= 4.2 to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package/uccp420wlan/uccp420wlan.hash b/package/uccp420wlan/uccp420wlan.hash deleted file mode 100644 index 905fa4299d..0000000000 --- a/package/uccp420wlan/uccp420wlan.hash +++ /dev/null @@ -1,4 +0,0 @@ -# locally computed hash -sha256 1d4de62fc842dbab739708cf0d9ebce270fcdf63c1c13ac676cbc253acdaa3bb uccp420wlan-6.9.1.tar.gz -sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING -sha256 9ac431585fddfe624b08cf7464876a5e96061047ff26a9e926da3d89d21a2a73 firmware/LICENSE.imagination diff --git a/package/uccp420wlan/uccp420wlan.mk b/package/uccp420wlan/uccp420wlan.mk deleted file mode 100644 index 7256b92774..0000000000 --- a/package/uccp420wlan/uccp420wlan.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# uccp420wlan -# -################################################################################ - -UCCP420WLAN_VERSION = 6.9.1 -UCCP420WLAN_SITE = $(call github,CreatorDev,uccp420wlan,v$(UCCP420WLAN_VERSION)) -UCCP420WLAN_LICENSE = GPL-2.0 (kernel module), proprietary (firmware blob) -UCCP420WLAN_LICENSE_FILES = COPYING firmware/LICENSE.imagination - -define UCCP420WLAN_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware/img/uccp420wlan - cp $(@D)/firmware/*.ldr $(TARGET_DIR)/lib/firmware/img/uccp420wlan -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Sun Feb 26 17:44:56 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 26 Feb 2023 18:44:56 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/uccp420wlan: drop package In-Reply-To: <20230226172328.114504-1-fontaine.fabrice@gmail.com> References: <20230226172328.114504-1-fontaine.fabrice@gmail.com> Message-ID: <20230226184456.550cc7dc@windsurf> On Sun, 26 Feb 2023 18:23:28 +0100 Fabrice Fontaine wrote: > uccp420wlan is not maintained anymore (no commit since 2017) and fails > to build with any "recent" kernel (e.g. >= 4.7 which includes > https://github.com/torvalds/linux/commit/57fbcce37be7c1d2622b56587c10ade00e96afa3 > or > https://github.com/torvalds/linux/commit/8552a434b6a05cc38006733afe6a239ad4d600a2): > > /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c: In function ?uccp420wlan_tx_free_buff_req?: > /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c:1142:49: error: ?IEEE80211_BAND_2GHZ? undeclared (first use in this function); did you mean ?IEEE80211_CHAN_2GHZ?? > 1142 | if (ets_band == IEEE80211_BAND_2GHZ) > | ^~~~~~~~~~~~~~~~~~~ > | IEEE80211_CHAN_2GHZ > > [...] > > /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/core.c:428:29: error: implicit declaration of function ?ieee80211_csa_is_complete?; did you mean ?ieee80211_scan_completed?? [-Werror=implicit-function-declaration] > 428 | if (ieee80211_csa_is_complete(uvif->vif)) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > | ieee80211_scan_completed > > Fixes: > - http://autobuild.buildroot.org/results/7cd7151e390b8f7a0df3e647fe4cd5d6319a830b > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Update package/Config.in Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sun Feb 26 19:44:27 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 20:44:27 +0100 Subject: [Buildroot] [PATCH v2,1/1] linux: fix CIP RT kernel on microblaze Message-ID: <20230226194427.979515-1-fontaine.fabrice@gmail.com> Fix the following build failure with CIP RT kernel on microblaze raised since bump to version 5.10.83-cip1-rt1 in commit b5778d7b76c098010a4abc339938f2694e8cf57f and https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?id=32ac92b5a39e2ef91308929bf5ed0804094b4183: arch/microblaze/mm/init.c:71:2: error: #endif without #if 71 | #endif /* CONFIG_HIGHMEM */ | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni): - Move patch to correct directory ...-arch-microblaze-mm-init.c-fix-build.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch diff --git a/linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch b/linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch new file mode 100644 index 0000000000..4760d9e4fb --- /dev/null +++ b/linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch @@ -0,0 +1,37 @@ +From 1fc03e1fdc8bb606d1c95e9fa557a9e5f6df17ec Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Feb 2023 17:26:56 +0100 +Subject: [PATCH] arch/microblaze/mm/init.c: fix build + +Fix the following build failure on microblaze raised since +https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/arch/microblaze/mm/init.c?h=v5.10.168-cip27-rt11&id=32ac92b5a39e2ef91308929bf5ed0804094b4183: + +arch/microblaze/mm/init.c:71:2: error: #endif without #if + 71 | #endif /* CONFIG_HIGHMEM */ + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to +Sebastian Andrzej Siewior ] +--- + arch/microblaze/mm/init.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c +index 1f4b5b34e600..a444778e59de 100644 +--- a/arch/microblaze/mm/init.c ++++ b/arch/microblaze/mm/init.c +@@ -49,6 +49,7 @@ unsigned long lowmem_size; + EXPORT_SYMBOL(min_low_pfn); + EXPORT_SYMBOL(max_low_pfn); + ++#ifdef CONFIG_HIGHMEM + static void __init highmem_init(void) + { + pr_debug("%x\n", (u32)PKMAP_BASE); +-- +2.39.1 + -- 2.39.1 From fontaine.fabrice at gmail.com Sun Feb 26 19:53:15 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 26 Feb 2023 20:53:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtty: fix openssl static build with -latomic Message-ID: <20230226195315.1184297-1-fontaine.fabrice@gmail.com> Fix the following openssl static build failure with -latomic raised since bump to version 8.1.0 in commit 7e608885a2df51ba77378f210f4c0e8cb59d5b8b: /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 Signed-off-by: Fabrice Fontaine --- ...keLists.txt-prefer-pkg_check_modules.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch diff --git a/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch new file mode 100644 index 0000000000..3714050445 --- /dev/null +++ b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch @@ -0,0 +1,40 @@ +From 565c003ac412c9b0fa39d208d4a911f4300477c3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 20:39:11 +0100 +Subject: [PATCH] CMakeLists.txt: prefer pkg_check_modules + +Prefer pkg_check_modules over find_package to avoid the following static +build failure with openssl and -latomic: + +/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': +ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' + +Fixes: + - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zhaojh329/ssl/pull/4] +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ssl/CMakeLists.txt b/src/ssl/CMakeLists.txt +index 4868bf7..36488c7 100644 +--- a/src/ssl/CMakeLists.txt ++++ b/src/ssl/CMakeLists.txt +@@ -14,10 +14,10 @@ endif() + + find_package(PkgConfig QUIET) + +-find_package(OpenSSL) ++pkg_check_modules(OPENSSL openssl) + + if (NOT OPENSSL_FOUND) +- pkg_check_modules(OPENSSL openssl) ++ find_package(OpenSSL) + endif() + + find_package(WolfSSL) +-- +2.39.1 + -- 2.39.1 From Alberto.Fahrenkrog at rigtechnologies.com.au Mon Feb 27 00:17:25 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Mon, 27 Feb 2023 00:17:25 +0000 Subject: [Buildroot] [Help] Building from a private PyPi server Message-ID: Hello all, In our company we have custom Python packages stored in a private PyPi server. To install them we simply add the --extra-index-url in our requirements.txt file when using pip. The packages are also available for manual download from the server, however all URLs to any .tar.gz file are in the form https://git.ourserver.com/packages/pypi/package-name/version-number/files/1234. This leads me to the following options (I think): * Try to get Buildroot to use the private PyPi server. I had a look at the "scanpypi" script and it generated the .mk and .in files for a regular PyPi package, but I could not find a way to tell scanpypi to use an extra url or private pypi address * Find a way, using wget, to download the package from the address above. Unfortunately I've had no luck with that yet. With the command: wget https://ourserver.com/-/packages/pypi/package-name/version_nr/files/5525 --header 'Authorization: token AUTH_TOKEN' --output-document=filename.tar.gz I was not able to get a correct tar.gz file. But that's more my problem than a Buildroot issue. * Download the file manually and have Buildroot use a local file. I will try that for the time being, although it seems the least automated possibility. If you guys have any other ideas I'd like to hear them. Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image497442.png Type: image/png Size: 14270 bytes Desc: image497442.png URL: From Alberto.Fahrenkrog at rigtechnologies.com.au Mon Feb 27 00:21:46 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Mon, 27 Feb 2023 00:21:46 +0000 Subject: [Buildroot] [Help] Building from a private PyPi server In-Reply-To: References: Message-ID: Apologies, Forgot to mention that I can also get a .whl file of the python package manually. Can Buildroot work with a .whl file? Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: buildroot on behalf of Alberto Fahrenkrog Sent: Monday, February 27, 2023 8:17 AM To: buildroot at buildroot.org Subject: [Buildroot] [Help] Building from a private PyPi server You don't often get email from alberto.fahrenkrog at rigtechnologies.com.au. Learn why this is important Hello all, In our company we have custom Python packages stored in a private PyPi server. To install them we simply add the --extra-index-url in our requirements.txt file when using pip. The packages are also available for manual download from the server, however all URLs to any .tar.gz file are in the form https://git.ourserver.com/packages/pypi/package-name/version-number/files/1234. This leads me to the following options (I think): * Try to get Buildroot to use the private PyPi server. I had a look at the "scanpypi" script and it generated the .mk and .in files for a regular PyPi package, but I could not find a way to tell scanpypi to use an extra url or private pypi address * Find a way, using wget, to download the package from the address above. Unfortunately I've had no luck with that yet. With the command: wget https://ourserver.com/-/packages/pypi/package-name/version_nr/files/5525 --header 'Authorization: token AUTH_TOKEN' --output-document=filename.tar.gz I was not able to get a correct tar.gz file. But that's more my problem than a Buildroot issue. * Download the file manually and have Buildroot use a local file. I will try that for the time being, although it seems the least automated possibility. If you guys have any other ideas I'd like to hear them. Cheers, Alberto [cid:image497442.png at 9FC6413F.5C1BC59F] Alberto? Fahrenkrog Senior Embedded Engineer Orica ? Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image497442.png Type: image/png Size: 14270 bytes Desc: image497442.png URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image695658.png Type: image/png Size: 14270 bytes Desc: image695658.png URL: From fido_max at inbox.ru Mon Feb 27 05:12:14 2023 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Mon, 27 Feb 2023 08:12:14 +0300 Subject: [Buildroot] [PATCH 1/1] package/postgresql: add host-pkgconf dependency In-Reply-To: <20230225093527.16587-1-fontaine.fabrice@gmail.com> References: <20230225093527.16587-1-fontaine.fabrice@gmail.com> Message-ID: On 25.02.2023 12:35, Fabrice Fontaine wrote: > host-pkgconf is mandatory to find lz4 and zstd resulting in the > following build failure since commit > 9cd2e6e090449f9d2f371d24152580c038892f3d: > > configure: error: in `/home/autobuild/autobuild/instance-5/output-1/build/postgresql-15.2': > configure: error: The pkg-config script could not be found or is too old. Make sure it > is in your PATH or set the PKG_CONFIG environment variable to the full > path to pkg-config. > > Alternatively, you may set the environment variables LZ4_CFLAGS > and LZ4_LIBS to avoid the need to call pkg-config. > See the pkg-config man page for more details. > > Fixes: > - http://autobuild.buildroot.org/results/8744277ebe9910635ef8fe290c8ba4eee420b538 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov From giulio.benetti at benettiengineering.com Mon Feb 27 08:22:30 2023 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 27 Feb 2023 09:22:30 +0100 Subject: [Buildroot] [PATCH] package/rtl8189es: fix build failure on PowerPC64 Message-ID: <20230227082230.429997-1-giulio.benetti@benettiengineering.com> Add local patches pending upstream[0] to fix conflict of get_ra(). get_ra() is present both in PowerPC64 Linux header and in rtl8189es driver so in the patch we rename all the occurences to rtl_get_ra(). Fixes: http://autobuild.buildroot.net/results/45efdb0806d0bb2f7d542be80ed02bf2dc080df4/ [0]: https://github.com/jwrdegoede/rtl8189ES_linux/pull/94 Signed-off-by: Giulio Benetti --- .../0001-Fix-build-failure-on-PowerPC64.patch | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch diff --git a/package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch b/package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch new file mode 100644 index 0000000000..8c876f16ee --- /dev/null +++ b/package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch @@ -0,0 +1,113 @@ +From c7bf7590bc0d7252005fd0496898ad420a85e1ae Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 27 Feb 2023 09:12:39 +0100 +Subject: [PATCH] Fix build failure on PowerPC64 + +get_ra() is defined in Linux kernel for PowerPC64 architecture and it +conflicts with local get_ra() definition so let's rename local definition +as rtl_get_ra(). + +Signed-off-by: Giulio Benetti +--- + core/rtw_odm.c | 6 +++--- + core/rtw_recv.c | 4 ++-- + hal/hal_com.c | 2 +- + include/wifi.h | 2 +- + os_dep/linux/ioctl_cfg80211.c | 2 +- + 5 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/core/rtw_odm.c b/core/rtw_odm.c +index 8a35816..d74e134 100644 +--- a/core/rtw_odm.c ++++ b/core/rtw_odm.c +@@ -273,7 +273,7 @@ void rtw_odm_parse_rx_phy_status_chinfo(union recv_frame *rframe, u8 *phys) + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u)\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t0->band, phys_t0->channel, phys_t0->rxsc + ); +@@ -383,7 +383,7 @@ type1_end: + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, rf_mode:%u, l_rxsc:%u, ht_rxsc:%u) => %u,%u\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t1->band, phys_t1->channel, phys_t1->rf_mode, phys_t1->l_rxsc, phys_t1->ht_rxsc + , pkt_cch, pkt_bw +@@ -401,7 +401,7 @@ type1_end: + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u, ht_rxsc:%u)\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t2->band, phys_t2->channel, phys_t2->l_rxsc, phys_t2->ht_rxsc + ); +diff --git a/core/rtw_recv.c b/core/rtw_recv.c +index dc65adf..a5a65f9 100644 +--- a/core/rtw_recv.c ++++ b/core/rtw_recv.c +@@ -4678,7 +4678,7 @@ void rx_query_phy_status( + wlanhdr = get_recvframe_data(precvframe); + + ta = get_ta(wlanhdr); +- ra = get_ra(wlanhdr); ++ ra = rtl_get_ra(wlanhdr); + is_ra_bmc = IS_MCAST(ra); + + if (_rtw_memcmp(adapter_mac_addr(padapter), ta, ETH_ALEN) == _TRUE) { +@@ -4818,7 +4818,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status) + { + s32 ret = _SUCCESS; + u8 *pbuf = precvframe->u.hdr.rx_data; +- u8 *pda = get_ra(pbuf); ++ u8 *pda = rtl_get_ra(pbuf); + u8 ra_is_bmc = IS_MCAST(pda); + _adapter *primary_padapter = precvframe->u.hdr.adapter; + #ifdef CONFIG_CONCURRENT_MODE +diff --git a/hal/hal_com.c b/hal/hal_com.c +index c28ae39..27b0825 100644 +--- a/hal/hal_com.c ++++ b/hal/hal_com.c +@@ -13406,7 +13406,7 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe) + + /*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __FUNCTION__);*/ + if (psta) { +- if (IS_MCAST(get_ra(get_recvframe_data(prframe)))) ++ if (IS_MCAST(rtl_get_ra(get_recvframe_data(prframe)))) + psta_dframe_info = &psta->sta_dframe_info_bmc; + else + psta_dframe_info = &psta->sta_dframe_info; +diff --git a/include/wifi.h b/include/wifi.h +index def77a4..c2e7afb 100644 +--- a/include/wifi.h ++++ b/include/wifi.h +@@ -456,7 +456,7 @@ __inline static int IS_MCAST(const u8 *da) + return _FALSE; + } + +-__inline static unsigned char *get_ra(unsigned char *pframe) ++__inline static unsigned char *rtl_get_ra(unsigned char *pframe) + { + unsigned char *ra; + ra = GetAddr1Ptr(pframe); +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index 4e810e5..e744d69 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -6347,7 +6347,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *adapter, union recv_frame *rfra + indicate: + #endif + #if defined(RTW_DEDICATED_P2P_DEVICE) +- if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), get_ra(frame), &wdev)) ++ if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), rtl_get_ra(frame), &wdev)) + if (0) + RTW_INFO("redirect to pd_wdev:%p\n", wdev); + #endif +-- +2.34.1 + -- 2.34.1 From frank.vanbever at mind.be Mon Feb 20 14:57:47 2023 From: frank.vanbever at mind.be (Frank Vanbever) Date: Mon, 20 Feb 2023 15:57:47 +0100 Subject: [Buildroot] [PATCH 2022.11.x 1/1] package/libmodsecurity: fix CVE-2022-48279 Message-ID: <20230220145747.53482-1-frank.vanbever@mind.be> In ModSecurity before 2.9.6 and 3.x before 3.0.8, HTTP multipart requests were incorrectly parsed and could bypass the Web Application Firewall. NOTE: this is related to CVE-2022-39956 but can be considered independent changes to the ModSecurity (C language) codebase. Signed-off-by: Frank Vanbever --- ...g-fixes-and-new-MULTIPART_PART_HEADE.patch | 19602 ++++++++++++++++ package/libmodsecurity/libmodsecurity.mk | 3 + 2 files changed, 19605 insertions(+) create mode 100644 package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch diff --git a/package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch b/package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch new file mode 100644 index 0000000000..ebecea983e --- /dev/null +++ b/package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch @@ -0,0 +1,19602 @@ +From 1abda9e196ff9db978efba3ad770f9a74ae00444 Mon Sep 17 00:00:00 2001 +From: Martin Vierula +Date: Wed, 7 Sep 2022 06:29:20 -0700 +Subject: [PATCH] Multipart parsing fixes and new MULTIPART_PART_HEADERS + collection + +Signed-off-by: Frank Vanbever +--- + CHANGES | 5 + + Makefile.am | 1 + + headers/modsecurity/transaction.h | 2 + + src/parser/seclang-parser.cc | 3226 +++---- + src/parser/seclang-parser.hh | 1342 +-- + src/parser/seclang-parser.yy | 14 + + src/parser/seclang-scanner.cc | 7767 +++++++++-------- + src/parser/seclang-scanner.ll | 3 + + src/request_body_processor/multipart.cc | 205 +- + src/request_body_processor/multipart.h | 20 + + src/variables/multipart_part_headers.h | 40 + + test/cppcheck_suppressions.txt | 2 +- + .../variable-MULTIPART_PART_HEADERS.json | 166 + + 13 files changed, 6606 insertions(+), 6187 deletions(-) + create mode 100644 src/variables/multipart_part_headers.h + create mode 100644 test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json + +diff --git a/CHANGES b/CHANGES +index 2f9cec67..94dcc218 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -1,3 +1,8 @@ ++v3.0.8 backports ++-------------------- ++ - Multipart parsing fixes and new MULTIPART_PART_HEADERS collection ++ [Issue #2795 - @terjanq, @martinhsv] ++ + v3.0.7 - 2022-May-30 + -------------------- + +diff --git a/Makefile.am b/Makefile.am +index 93c3de01..17eb62b0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -225,6 +225,7 @@ TESTS+=test/test-cases/regression/variable-MULTIPART_CRLF_LF_LINES.json + TESTS+=test/test-cases/regression/variable-MULTIPART_FILENAME.json + TESTS+=test/test-cases/regression/variable-MULTIPART_INVALID_HEADER_FOLDING.json + TESTS+=test/test-cases/regression/variable-MULTIPART_NAME.json ++TESTS+=test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json + TESTS+=test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json + TESTS+=test/test-cases/regression/variable-MULTIPART_UNMATCHED_BOUNDARY.json + TESTS+=test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json +diff --git a/headers/modsecurity/transaction.h b/headers/modsecurity/transaction.h +index 194b544c..4244ddd3 100644 +--- a/headers/modsecurity/transaction.h ++++ b/headers/modsecurity/transaction.h +@@ -201,6 +201,7 @@ class TransactionAnchoredVariables { + m_variableGeo(t, "GEO"), + m_variableRequestCookiesNames(t, "REQUEST_COOKIES_NAMES"), + m_variableFilesTmpNames(t, "FILES_TMPNAMES"), ++ m_variableMultipartPartHeaders(t, "MULTIPART_PART_HEADERS"), + m_variableOffset(0), + m_variableArgsNames("ARGS_NAMES", &m_variableArgs), + m_variableArgsGetNames("ARGS_GET_NAMES", &m_variableArgsGet), +@@ -282,6 +283,7 @@ class TransactionAnchoredVariables { + AnchoredSetVariable m_variableGeo; + AnchoredSetVariable m_variableRequestCookiesNames; + AnchoredSetVariable m_variableFilesTmpNames; ++ AnchoredSetVariable m_variableMultipartPartHeaders; + + int m_variableOffset; + +diff --git a/src/parser/seclang-parser.cc b/src/parser/seclang-parser.cc +index 98af1904..c8423b36 100644 +--- a/src/parser/seclang-parser.cc ++++ b/src/parser/seclang-parser.cc +@@ -42,7 +42,7 @@ + + + // Unqualified %code blocks. +-#line 326 "seclang-parser.yy" ++#line 327 "seclang-parser.yy" + + #include "src/parser/driver.h" + +@@ -1318,7 +1318,7 @@ namespace yy { + + + // User initialization code. +-#line 319 "seclang-parser.yy" ++#line 320 "seclang-parser.yy" + { + // Initialize the initial location. + yyla.location.begin.filename = yyla.location.end.filename = new std::string(driver.file); +@@ -1690,7 +1690,7 @@ namespace yy { + switch (yyn) + { + case 2: // input: "end of file" +-#line 713 "seclang-parser.yy" ++#line 715 "seclang-parser.yy" + { + return 0; + } +@@ -1698,7 +1698,7 @@ namespace yy { + break; + + case 6: // audit_log: "CONFIG_DIR_AUDIT_DIR_MOD" +-#line 726 "seclang-parser.yy" ++#line 728 "seclang-parser.yy" + { + driver.m_auditLog->setStorageDirMode(strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 8)); + } +@@ -1706,7 +1706,7 @@ namespace yy { + break; + + case 7: // audit_log: "CONFIG_DIR_AUDIT_DIR" +-#line 732 "seclang-parser.yy" ++#line 734 "seclang-parser.yy" + { + driver.m_auditLog->setStorageDir(yystack_[0].value.as < std::string > ()); + } +@@ -1714,7 +1714,7 @@ namespace yy { + break; + + case 8: // audit_log: "CONFIG_DIR_AUDIT_ENG" "CONFIG_VALUE_RELEVANT_ONLY" +-#line 738 "seclang-parser.yy" ++#line 740 "seclang-parser.yy" + { + driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::RelevantOnlyAuditLogStatus); + } +@@ -1722,7 +1722,7 @@ namespace yy { + break; + + case 9: // audit_log: "CONFIG_DIR_AUDIT_ENG" "CONFIG_VALUE_OFF" +-#line 742 "seclang-parser.yy" ++#line 744 "seclang-parser.yy" + { + driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::OffAuditLogStatus); + } +@@ -1730,7 +1730,7 @@ namespace yy { + break; + + case 10: // audit_log: "CONFIG_DIR_AUDIT_ENG" "CONFIG_VALUE_ON" +-#line 746 "seclang-parser.yy" ++#line 748 "seclang-parser.yy" + { + driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::OnAuditLogStatus); + } +@@ -1738,7 +1738,7 @@ namespace yy { + break; + + case 11: // audit_log: "CONFIG_DIR_AUDIT_FLE_MOD" +-#line 752 "seclang-parser.yy" ++#line 754 "seclang-parser.yy" + { + driver.m_auditLog->setFileMode(strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 8)); + } +@@ -1746,7 +1746,7 @@ namespace yy { + break; + + case 12: // audit_log: "CONFIG_DIR_AUDIT_LOG2" +-#line 758 "seclang-parser.yy" ++#line 760 "seclang-parser.yy" + { + driver.m_auditLog->setFilePath2(yystack_[0].value.as < std::string > ()); + } +@@ -1754,7 +1754,7 @@ namespace yy { + break; + + case 13: // audit_log: "CONFIG_DIR_AUDIT_LOG_P" +-#line 764 "seclang-parser.yy" ++#line 766 "seclang-parser.yy" + { + driver.m_auditLog->setParts(yystack_[0].value.as < std::string > ()); + } +@@ -1762,7 +1762,7 @@ namespace yy { + break; + + case 14: // audit_log: "CONFIG_DIR_AUDIT_LOG" +-#line 770 "seclang-parser.yy" ++#line 772 "seclang-parser.yy" + { + driver.m_auditLog->setFilePath1(yystack_[0].value.as < std::string > ()); + } +@@ -1770,7 +1770,7 @@ namespace yy { + break; + + case 15: // audit_log: CONFIG_DIR_AUDIT_LOG_FMT JSON +-#line 775 "seclang-parser.yy" ++#line 777 "seclang-parser.yy" + { + driver.m_auditLog->setFormat(modsecurity::audit_log::AuditLog::JSONAuditLogFormat); + } +@@ -1778,7 +1778,7 @@ namespace yy { + break; + + case 16: // audit_log: CONFIG_DIR_AUDIT_LOG_FMT NATIVE +-#line 780 "seclang-parser.yy" ++#line 782 "seclang-parser.yy" + { + driver.m_auditLog->setFormat(modsecurity::audit_log::AuditLog::NativeAuditLogFormat); + } +@@ -1786,7 +1786,7 @@ namespace yy { + break; + + case 17: // audit_log: "CONFIG_DIR_AUDIT_STS" +-#line 786 "seclang-parser.yy" ++#line 788 "seclang-parser.yy" + { + std::string relevant_status(yystack_[0].value.as < std::string > ()); + driver.m_auditLog->setRelevantStatus(relevant_status); +@@ -1795,7 +1795,7 @@ namespace yy { + break; + + case 18: // audit_log: "CONFIG_DIR_AUDIT_TPE" "CONFIG_VALUE_SERIAL" +-#line 793 "seclang-parser.yy" ++#line 795 "seclang-parser.yy" + { + driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::SerialAuditLogType); + } +@@ -1803,7 +1803,7 @@ namespace yy { + break; + + case 19: // audit_log: "CONFIG_DIR_AUDIT_TPE" "CONFIG_VALUE_PARALLEL" +-#line 797 "seclang-parser.yy" ++#line 799 "seclang-parser.yy" + { + driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::ParallelAuditLogType); + } +@@ -1811,7 +1811,7 @@ namespace yy { + break; + + case 20: // audit_log: "CONFIG_DIR_AUDIT_TPE" "CONFIG_VALUE_HTTPS" +-#line 801 "seclang-parser.yy" ++#line 803 "seclang-parser.yy" + { + driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::HttpsAuditLogType); + } +@@ -1819,7 +1819,7 @@ namespace yy { + break; + + case 21: // audit_log: "CONFIG_UPDLOAD_KEEP_FILES" "CONFIG_VALUE_ON" +-#line 807 "seclang-parser.yy" ++#line 809 "seclang-parser.yy" + { + driver.m_uploadKeepFiles = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -1827,7 +1827,7 @@ namespace yy { + break; + + case 22: // audit_log: "CONFIG_UPDLOAD_KEEP_FILES" "CONFIG_VALUE_OFF" +-#line 811 "seclang-parser.yy" ++#line 813 "seclang-parser.yy" + { + driver.m_uploadKeepFiles = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -1835,7 +1835,7 @@ namespace yy { + break; + + case 23: // audit_log: "CONFIG_UPDLOAD_KEEP_FILES" "CONFIG_VALUE_RELEVANT_ONLY" +-#line 815 "seclang-parser.yy" ++#line 817 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecUploadKeepFiles RelevantOnly is not currently supported. Accepted values are On or Off"); + YYERROR; +@@ -1844,7 +1844,7 @@ namespace yy { + break; + + case 24: // audit_log: "CONFIG_UPLOAD_FILE_LIMIT" +-#line 820 "seclang-parser.yy" ++#line 822 "seclang-parser.yy" + { + driver.m_uploadFileLimit.m_set = true; + driver.m_uploadFileLimit.m_value = strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 10); +@@ -1853,7 +1853,7 @@ namespace yy { + break; + + case 25: // audit_log: "CONFIG_UPLOAD_FILE_MODE" +-#line 825 "seclang-parser.yy" ++#line 827 "seclang-parser.yy" + { + driver.m_uploadFileMode.m_set = true; + driver.m_uploadFileMode.m_value = strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 8); +@@ -1862,7 +1862,7 @@ namespace yy { + break; + + case 26: // audit_log: "CONFIG_UPLOAD_DIR" +-#line 830 "seclang-parser.yy" ++#line 832 "seclang-parser.yy" + { + driver.m_uploadDirectory.m_set = true; + driver.m_uploadDirectory.m_value = yystack_[0].value.as < std::string > (); +@@ -1871,7 +1871,7 @@ namespace yy { + break; + + case 27: // audit_log: "CONFIG_UPDLOAD_SAVE_TMP_FILES" "CONFIG_VALUE_ON" +-#line 835 "seclang-parser.yy" ++#line 837 "seclang-parser.yy" + { + driver.m_tmpSaveUploadedFiles = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -1879,7 +1879,7 @@ namespace yy { + break; + + case 28: // audit_log: "CONFIG_UPDLOAD_SAVE_TMP_FILES" "CONFIG_VALUE_OFF" +-#line 839 "seclang-parser.yy" ++#line 841 "seclang-parser.yy" + { + driver.m_tmpSaveUploadedFiles = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -1887,7 +1887,7 @@ namespace yy { + break; + + case 29: // actions: "QUOTATION_MARK" actions_may_quoted "QUOTATION_MARK" +-#line 846 "seclang-parser.yy" ++#line 848 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[1].value.as < std::unique_ptr > > > ()); + } +@@ -1895,7 +1895,7 @@ namespace yy { + break; + + case 30: // actions: actions_may_quoted +-#line 850 "seclang-parser.yy" ++#line 852 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[0].value.as < std::unique_ptr > > > ()); + } +@@ -1903,7 +1903,7 @@ namespace yy { + break; + + case 31: // actions_may_quoted: actions_may_quoted "," act +-#line 857 "seclang-parser.yy" ++#line 859 "seclang-parser.yy" + { + ACTION_INIT(yystack_[0].value.as < std::unique_ptr > (), yystack_[3].location) + yystack_[2].value.as < std::unique_ptr > > > ()->push_back(std::move(yystack_[0].value.as < std::unique_ptr > ())); +@@ -1913,7 +1913,7 @@ namespace yy { + break; + + case 32: // actions_may_quoted: act +-#line 863 "seclang-parser.yy" ++#line 865 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + ACTION_INIT(yystack_[0].value.as < std::unique_ptr > (), yystack_[1].location) +@@ -1924,7 +1924,7 @@ namespace yy { + break; + + case 33: // op: op_before_init +-#line 873 "seclang-parser.yy" ++#line 875 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[0].value.as < std::unique_ptr > ()); + std::string error; +@@ -1937,7 +1937,7 @@ namespace yy { + break; + + case 34: // op: "NOT" op_before_init +-#line 882 "seclang-parser.yy" ++#line 884 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[0].value.as < std::unique_ptr > ()); + yylhs.value.as < std::unique_ptr > ()->m_negation = true; +@@ -1951,7 +1951,7 @@ namespace yy { + break; + + case 35: // op: run_time_string +-#line 892 "seclang-parser.yy" ++#line 894 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + std::string error; +@@ -1964,7 +1964,7 @@ namespace yy { + break; + + case 36: // op: "NOT" run_time_string +-#line 901 "seclang-parser.yy" ++#line 903 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + yylhs.value.as < std::unique_ptr > ()->m_negation = true; +@@ -1978,7 +1978,7 @@ namespace yy { + break; + + case 37: // op_before_init: "OPERATOR_UNCONDITIONAL_MATCH" +-#line 914 "seclang-parser.yy" ++#line 916 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::UnconditionalMatch()); + } +@@ -1986,7 +1986,7 @@ namespace yy { + break; + + case 38: // op_before_init: "OPERATOR_DETECT_SQLI" +-#line 918 "seclang-parser.yy" ++#line 920 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::DetectSQLi()); + } +@@ -1994,7 +1994,7 @@ namespace yy { + break; + + case 39: // op_before_init: "OPERATOR_DETECT_XSS" +-#line 922 "seclang-parser.yy" ++#line 924 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::DetectXSS()); + } +@@ -2002,7 +2002,7 @@ namespace yy { + break; + + case 40: // op_before_init: "OPERATOR_VALIDATE_URL_ENCODING" +-#line 926 "seclang-parser.yy" ++#line 928 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateUrlEncoding()); + } +@@ -2010,7 +2010,7 @@ namespace yy { + break; + + case 41: // op_before_init: "OPERATOR_VALIDATE_UTF8_ENCODING" +-#line 930 "seclang-parser.yy" ++#line 932 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateUtf8Encoding()); + } +@@ -2018,7 +2018,7 @@ namespace yy { + break; + + case 42: // op_before_init: "OPERATOR_INSPECT_FILE" run_time_string +-#line 934 "seclang-parser.yy" ++#line 936 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::InspectFile(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2026,7 +2026,7 @@ namespace yy { + break; + + case 43: // op_before_init: "OPERATOR_FUZZY_HASH" run_time_string +-#line 938 "seclang-parser.yy" ++#line 940 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::FuzzyHash(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2034,7 +2034,7 @@ namespace yy { + break; + + case 44: // op_before_init: "OPERATOR_VALIDATE_BYTE_RANGE" run_time_string +-#line 942 "seclang-parser.yy" ++#line 944 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateByteRange(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2042,7 +2042,7 @@ namespace yy { + break; + + case 45: // op_before_init: "OPERATOR_VALIDATE_DTD" run_time_string +-#line 946 "seclang-parser.yy" ++#line 948 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateDTD(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2050,7 +2050,7 @@ namespace yy { + break; + + case 46: // op_before_init: "OPERATOR_VALIDATE_HASH" run_time_string +-#line 950 "seclang-parser.yy" ++#line 952 "seclang-parser.yy" + { + /* $$ = new operators::ValidateHash($1); */ + OPERATOR_NOT_SUPPORTED("ValidateHash", yystack_[2].location); +@@ -2059,7 +2059,7 @@ namespace yy { + break; + + case 47: // op_before_init: "OPERATOR_VALIDATE_SCHEMA" run_time_string +-#line 955 "seclang-parser.yy" ++#line 957 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateSchema(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2067,7 +2067,7 @@ namespace yy { + break; + + case 48: // op_before_init: "OPERATOR_VERIFY_CC" run_time_string +-#line 959 "seclang-parser.yy" ++#line 961 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifyCC(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2075,7 +2075,7 @@ namespace yy { + break; + + case 49: // op_before_init: "OPERATOR_VERIFY_CPF" run_time_string +-#line 963 "seclang-parser.yy" ++#line 965 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifyCPF(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2083,7 +2083,7 @@ namespace yy { + break; + + case 50: // op_before_init: "OPERATOR_VERIFY_SSN" run_time_string +-#line 967 "seclang-parser.yy" ++#line 969 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifySSN(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2091,7 +2091,7 @@ namespace yy { + break; + + case 51: // op_before_init: "OPERATOR_VERIFY_SVNR" run_time_string +-#line 971 "seclang-parser.yy" ++#line 973 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifySVNR(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2099,7 +2099,7 @@ namespace yy { + break; + + case 52: // op_before_init: "OPERATOR_GSB_LOOKUP" run_time_string +-#line 975 "seclang-parser.yy" ++#line 977 "seclang-parser.yy" + { + /* $$ = new operators::GsbLookup($1); */ + OPERATOR_NOT_SUPPORTED("GsbLookup", yystack_[2].location); +@@ -2108,7 +2108,7 @@ namespace yy { + break; + + case 53: // op_before_init: "OPERATOR_RSUB" run_time_string +-#line 980 "seclang-parser.yy" ++#line 982 "seclang-parser.yy" + { + /* $$ = new operators::Rsub($1); */ + OPERATOR_NOT_SUPPORTED("Rsub", yystack_[2].location); +@@ -2117,7 +2117,7 @@ namespace yy { + break; + + case 54: // op_before_init: "OPERATOR_WITHIN" run_time_string +-#line 985 "seclang-parser.yy" ++#line 987 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Within(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2125,7 +2125,7 @@ namespace yy { + break; + + case 55: // op_before_init: "OPERATOR_CONTAINS_WORD" run_time_string +-#line 989 "seclang-parser.yy" ++#line 991 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ContainsWord(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2133,7 +2133,7 @@ namespace yy { + break; + + case 56: // op_before_init: "OPERATOR_CONTAINS" run_time_string +-#line 993 "seclang-parser.yy" ++#line 995 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Contains(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2141,7 +2141,7 @@ namespace yy { + break; + + case 57: // op_before_init: "OPERATOR_ENDS_WITH" run_time_string +-#line 997 "seclang-parser.yy" ++#line 999 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::EndsWith(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2149,7 +2149,7 @@ namespace yy { + break; + + case 58: // op_before_init: "OPERATOR_EQ" run_time_string +-#line 1001 "seclang-parser.yy" ++#line 1003 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Eq(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2157,7 +2157,7 @@ namespace yy { + break; + + case 59: // op_before_init: "OPERATOR_GE" run_time_string +-#line 1005 "seclang-parser.yy" ++#line 1007 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Ge(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2165,7 +2165,7 @@ namespace yy { + break; + + case 60: // op_before_init: "OPERATOR_GT" run_time_string +-#line 1009 "seclang-parser.yy" ++#line 1011 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Gt(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2173,7 +2173,7 @@ namespace yy { + break; + + case 61: // op_before_init: "OPERATOR_IP_MATCH_FROM_FILE" run_time_string +-#line 1013 "seclang-parser.yy" ++#line 1015 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::IpMatchF(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2181,7 +2181,7 @@ namespace yy { + break; + + case 62: // op_before_init: "OPERATOR_IP_MATCH" run_time_string +-#line 1017 "seclang-parser.yy" ++#line 1019 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::IpMatch(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2189,7 +2189,7 @@ namespace yy { + break; + + case 63: // op_before_init: "OPERATOR_LE" run_time_string +-#line 1021 "seclang-parser.yy" ++#line 1023 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Le(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2197,7 +2197,7 @@ namespace yy { + break; + + case 64: // op_before_init: "OPERATOR_LT" run_time_string +-#line 1025 "seclang-parser.yy" ++#line 1027 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Lt(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2205,7 +2205,7 @@ namespace yy { + break; + + case 65: // op_before_init: "OPERATOR_PM_FROM_FILE" run_time_string +-#line 1029 "seclang-parser.yy" ++#line 1031 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::PmFromFile(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2213,7 +2213,7 @@ namespace yy { + break; + + case 66: // op_before_init: "OPERATOR_PM" run_time_string +-#line 1033 "seclang-parser.yy" ++#line 1035 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Pm(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2221,7 +2221,7 @@ namespace yy { + break; + + case 67: // op_before_init: "OPERATOR_RBL" run_time_string +-#line 1037 "seclang-parser.yy" ++#line 1039 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rbl(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2229,7 +2229,7 @@ namespace yy { + break; + + case 68: // op_before_init: "OPERATOR_RX" run_time_string +-#line 1041 "seclang-parser.yy" ++#line 1043 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2237,7 +2237,7 @@ namespace yy { + break; + + case 69: // op_before_init: "OPERATOR_RX_GLOBAL" run_time_string +-#line 1045 "seclang-parser.yy" ++#line 1047 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::RxGlobal(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2245,7 +2245,7 @@ namespace yy { + break; + + case 70: // op_before_init: "OPERATOR_STR_EQ" run_time_string +-#line 1049 "seclang-parser.yy" ++#line 1051 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::StrEq(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2253,7 +2253,7 @@ namespace yy { + break; + + case 71: // op_before_init: "OPERATOR_STR_MATCH" run_time_string +-#line 1053 "seclang-parser.yy" ++#line 1055 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::StrMatch(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2261,7 +2261,7 @@ namespace yy { + break; + + case 72: // op_before_init: "OPERATOR_BEGINS_WITH" run_time_string +-#line 1057 "seclang-parser.yy" ++#line 1059 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::BeginsWith(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2269,7 +2269,7 @@ namespace yy { + break; + + case 73: // op_before_init: "OPERATOR_GEOLOOKUP" +-#line 1061 "seclang-parser.yy" ++#line 1063 "seclang-parser.yy" + { + #if defined(WITH_GEOIP) or defined(WITH_MAXMIND) + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::GeoLookup()); +@@ -2284,7 +2284,7 @@ namespace yy { + break; + + case 75: // expression: "DIRECTIVE" variables op actions +-#line 1076 "seclang-parser.yy" ++#line 1078 "seclang-parser.yy" + { + std::vector *a = new std::vector(); + std::vector *t = new std::vector(); +@@ -2318,7 +2318,7 @@ namespace yy { + break; + + case 76: // expression: "DIRECTIVE" variables op +-#line 1106 "seclang-parser.yy" ++#line 1108 "seclang-parser.yy" + { + variables::Variables *v = new variables::Variables(); + for (auto &i : *yystack_[1].value.as < std::unique_ptr > > > ().get()) { +@@ -2341,7 +2341,7 @@ namespace yy { + break; + + case 77: // expression: "CONFIG_DIR_SEC_ACTION" actions +-#line 1125 "seclang-parser.yy" ++#line 1127 "seclang-parser.yy" + { + std::vector *a = new std::vector(); + std::vector *t = new std::vector(); +@@ -2364,7 +2364,7 @@ namespace yy { + break; + + case 78: // expression: "DIRECTIVE_SECRULESCRIPT" actions +-#line 1144 "seclang-parser.yy" ++#line 1146 "seclang-parser.yy" + { + std::string err; + std::vector *a = new std::vector(); +@@ -2396,7 +2396,7 @@ namespace yy { + break; + + case 79: // expression: "CONFIG_DIR_SEC_DEFAULT_ACTION" actions +-#line 1172 "seclang-parser.yy" ++#line 1174 "seclang-parser.yy" + { + bool hasDisruptive = false; + std::vector *actions = new std::vector(); +@@ -2457,7 +2457,7 @@ namespace yy { + break; + + case 80: // expression: "CONFIG_DIR_SEC_MARKER" +-#line 1229 "seclang-parser.yy" ++#line 1231 "seclang-parser.yy" + { + driver.addSecMarker(modsecurity::utils::string::removeBracketsIfNeeded(yystack_[0].value.as < std::string > ()), + /* file name */ std::unique_ptr(new std::string(*yystack_[0].location.end.filename)), +@@ -2468,7 +2468,7 @@ namespace yy { + break; + + case 81: // expression: "CONFIG_DIR_RULE_ENG" "CONFIG_VALUE_OFF" +-#line 1236 "seclang-parser.yy" ++#line 1238 "seclang-parser.yy" + { + driver.m_secRuleEngine = modsecurity::RulesSet::DisabledRuleEngine; + } +@@ -2476,7 +2476,7 @@ namespace yy { + break; + + case 82: // expression: "CONFIG_DIR_RULE_ENG" "CONFIG_VALUE_ON" +-#line 1240 "seclang-parser.yy" ++#line 1242 "seclang-parser.yy" + { + driver.m_secRuleEngine = modsecurity::RulesSet::EnabledRuleEngine; + } +@@ -2484,7 +2484,7 @@ namespace yy { + break; + + case 83: // expression: "CONFIG_DIR_RULE_ENG" "CONFIG_VALUE_DETC" +-#line 1244 "seclang-parser.yy" ++#line 1246 "seclang-parser.yy" + { + driver.m_secRuleEngine = modsecurity::RulesSet::DetectionOnlyRuleEngine; + } +@@ -2492,7 +2492,7 @@ namespace yy { + break; + + case 84: // expression: "CONFIG_DIR_REQ_BODY" "CONFIG_VALUE_ON" +-#line 1248 "seclang-parser.yy" ++#line 1250 "seclang-parser.yy" + { + driver.m_secRequestBodyAccess = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -2500,7 +2500,7 @@ namespace yy { + break; + + case 85: // expression: "CONFIG_DIR_REQ_BODY" "CONFIG_VALUE_OFF" +-#line 1252 "seclang-parser.yy" ++#line 1254 "seclang-parser.yy" + { + driver.m_secRequestBodyAccess = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -2508,7 +2508,7 @@ namespace yy { + break; + + case 86: // expression: "CONFIG_DIR_RES_BODY" "CONFIG_VALUE_ON" +-#line 1256 "seclang-parser.yy" ++#line 1258 "seclang-parser.yy" + { + driver.m_secResponseBodyAccess = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -2516,7 +2516,7 @@ namespace yy { + break; + + case 87: // expression: "CONFIG_DIR_RES_BODY" "CONFIG_VALUE_OFF" +-#line 1260 "seclang-parser.yy" ++#line 1262 "seclang-parser.yy" + { + driver.m_secResponseBodyAccess = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -2524,7 +2524,7 @@ namespace yy { + break; + + case 88: // expression: "CONFIG_SEC_ARGUMENT_SEPARATOR" +-#line 1264 "seclang-parser.yy" ++#line 1266 "seclang-parser.yy" + { + if (yystack_[0].value.as < std::string > ().length() != 1) { + driver.error(yystack_[1].location, "Argument separator should be set to a single character."); +@@ -2537,7 +2537,7 @@ namespace yy { + break; + + case 89: // expression: "CONFIG_COMPONENT_SIG" +-#line 1273 "seclang-parser.yy" ++#line 1275 "seclang-parser.yy" + { + driver.m_components.push_back(yystack_[0].value.as < std::string > ()); + } +@@ -2545,7 +2545,7 @@ namespace yy { + break; + + case 90: // expression: "CONFIG_CONN_ENGINE" "CONFIG_VALUE_ON" +-#line 1277 "seclang-parser.yy" ++#line 1279 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecConnEngine is not yet supported."); + YYERROR; +@@ -2554,14 +2554,14 @@ namespace yy { + break; + + case 91: // expression: "CONFIG_CONN_ENGINE" "CONFIG_VALUE_OFF" +-#line 1282 "seclang-parser.yy" ++#line 1284 "seclang-parser.yy" + { + } + #line 2561 "seclang-parser.cc" + break; + + case 92: // expression: "CONFIG_SEC_WEB_APP_ID" +-#line 1285 "seclang-parser.yy" ++#line 1287 "seclang-parser.yy" + { + driver.m_secWebAppId.m_value = yystack_[0].value.as < std::string > (); + driver.m_secWebAppId.m_set = true; +@@ -2570,7 +2570,7 @@ namespace yy { + break; + + case 93: // expression: "CONFIG_SEC_SERVER_SIG" +-#line 1290 "seclang-parser.yy" ++#line 1292 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecServerSignature is not supported."); + YYERROR; +@@ -2579,7 +2579,7 @@ namespace yy { + break; + + case 94: // expression: "CONFIG_SEC_CACHE_TRANSFORMATIONS" +-#line 1295 "seclang-parser.yy" ++#line 1297 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecCacheTransformations is not supported."); + YYERROR; +@@ -2588,7 +2588,7 @@ namespace yy { + break; + + case 95: // expression: "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" "CONFIG_VALUE_ON" +-#line 1300 "seclang-parser.yy" ++#line 1302 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecDisableBackendCompression is not supported."); + YYERROR; +@@ -2597,14 +2597,14 @@ namespace yy { + break; + + case 96: // expression: "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" "CONFIG_VALUE_OFF" +-#line 1305 "seclang-parser.yy" ++#line 1307 "seclang-parser.yy" + { + } + #line 2604 "seclang-parser.cc" + break; + + case 97: // expression: "CONFIG_CONTENT_INJECTION" "CONFIG_VALUE_ON" +-#line 1308 "seclang-parser.yy" ++#line 1310 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecContentInjection is not yet supported."); + YYERROR; +@@ -2613,14 +2613,14 @@ namespace yy { + break; + + case 98: // expression: "CONFIG_CONTENT_INJECTION" "CONFIG_VALUE_OFF" +-#line 1313 "seclang-parser.yy" ++#line 1315 "seclang-parser.yy" + { + } + #line 2620 "seclang-parser.cc" + break; + + case 99: // expression: "CONFIG_SEC_CHROOT_DIR" +-#line 1316 "seclang-parser.yy" ++#line 1318 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecChrootDir is not supported."); + YYERROR; +@@ -2629,7 +2629,7 @@ namespace yy { + break; + + case 100: // expression: "CONFIG_SEC_HASH_ENGINE" "CONFIG_VALUE_ON" +-#line 1321 "seclang-parser.yy" ++#line 1323 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecHashEngine is not yet supported."); + YYERROR; +@@ -2638,14 +2638,14 @@ namespace yy { + break; + + case 101: // expression: "CONFIG_SEC_HASH_ENGINE" "CONFIG_VALUE_OFF" +-#line 1326 "seclang-parser.yy" ++#line 1328 "seclang-parser.yy" + { + } + #line 2645 "seclang-parser.cc" + break; + + case 102: // expression: "CONFIG_SEC_HASH_KEY" +-#line 1329 "seclang-parser.yy" ++#line 1331 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashKey is not yet supported."); + YYERROR; +@@ -2654,7 +2654,7 @@ namespace yy { + break; + + case 103: // expression: "CONFIG_SEC_HASH_PARAM" +-#line 1334 "seclang-parser.yy" ++#line 1336 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashParam is not yet supported."); + YYERROR; +@@ -2663,7 +2663,7 @@ namespace yy { + break; + + case 104: // expression: "CONFIG_SEC_HASH_METHOD_RX" +-#line 1339 "seclang-parser.yy" ++#line 1341 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashMethodRx is not yet supported."); + YYERROR; +@@ -2672,7 +2672,7 @@ namespace yy { + break; + + case 105: // expression: "CONFIG_SEC_HASH_METHOD_PM" +-#line 1344 "seclang-parser.yy" ++#line 1346 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashMethodPm is not yet supported."); + YYERROR; +@@ -2681,7 +2681,7 @@ namespace yy { + break; + + case 106: // expression: "CONFIG_DIR_GSB_DB" +-#line 1349 "seclang-parser.yy" ++#line 1351 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecGsbLookupDb is not supported."); + YYERROR; +@@ -2690,7 +2690,7 @@ namespace yy { + break; + + case 107: // expression: "CONFIG_SEC_GUARDIAN_LOG" +-#line 1354 "seclang-parser.yy" ++#line 1356 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecGuardianLog is not supported."); + YYERROR; +@@ -2699,7 +2699,7 @@ namespace yy { + break; + + case 108: // expression: "CONFIG_SEC_INTERCEPT_ON_ERROR" "CONFIG_VALUE_ON" +-#line 1359 "seclang-parser.yy" ++#line 1361 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecInterceptOnError is not yet supported."); + YYERROR; +@@ -2708,14 +2708,14 @@ namespace yy { + break; + + case 109: // expression: "CONFIG_SEC_INTERCEPT_ON_ERROR" "CONFIG_VALUE_OFF" +-#line 1364 "seclang-parser.yy" ++#line 1366 "seclang-parser.yy" + { + } + #line 2715 "seclang-parser.cc" + break; + + case 110: // expression: "CONFIG_SEC_CONN_R_STATE_LIMIT" +-#line 1367 "seclang-parser.yy" ++#line 1369 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecConnReadStateLimit is not yet supported."); + YYERROR; +@@ -2724,7 +2724,7 @@ namespace yy { + break; + + case 111: // expression: "CONFIG_SEC_CONN_W_STATE_LIMIT" +-#line 1372 "seclang-parser.yy" ++#line 1374 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecConnWriteStateLimit is not yet supported."); + YYERROR; +@@ -2733,7 +2733,7 @@ namespace yy { + break; + + case 112: // expression: "CONFIG_SEC_SENSOR_ID" +-#line 1377 "seclang-parser.yy" ++#line 1379 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecSensorId is not yet supported."); + YYERROR; +@@ -2742,7 +2742,7 @@ namespace yy { + break; + + case 113: // expression: "CONFIG_SEC_RULE_INHERITANCE" "CONFIG_VALUE_ON" +-#line 1382 "seclang-parser.yy" ++#line 1384 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecRuleInheritance is not yet supported."); + YYERROR; +@@ -2751,14 +2751,14 @@ namespace yy { + break; + + case 114: // expression: "CONFIG_SEC_RULE_INHERITANCE" "CONFIG_VALUE_OFF" +-#line 1387 "seclang-parser.yy" ++#line 1389 "seclang-parser.yy" + { + } + #line 2758 "seclang-parser.cc" + break; + + case 115: // expression: "CONFIG_SEC_RULE_PERF_TIME" +-#line 1390 "seclang-parser.yy" ++#line 1392 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecRulePerfTime is not yet supported."); + YYERROR; +@@ -2767,7 +2767,7 @@ namespace yy { + break; + + case 116: // expression: "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" +-#line 1395 "seclang-parser.yy" ++#line 1397 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecStreamInBodyInspection is not supported."); + YYERROR; +@@ -2776,7 +2776,7 @@ namespace yy { + break; + + case 117: // expression: "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" +-#line 1400 "seclang-parser.yy" ++#line 1402 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecStreamOutBodyInspection is not supported."); + YYERROR; +@@ -2785,7 +2785,7 @@ namespace yy { + break; + + case 118: // expression: "CONFIG_SEC_RULE_REMOVE_BY_ID" +-#line 1405 "seclang-parser.yy" ++#line 1407 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.load(yystack_[0].value.as < std::string > (), &error) == false) { +@@ -2802,7 +2802,7 @@ namespace yy { + break; + + case 119: // expression: "CONFIG_SEC_RULE_REMOVE_BY_TAG" +-#line 1418 "seclang-parser.yy" ++#line 1420 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadRemoveRuleByTag(yystack_[0].value.as < std::string > (), &error) == false) { +@@ -2819,7 +2819,7 @@ namespace yy { + break; + + case 120: // expression: "CONFIG_SEC_RULE_REMOVE_BY_MSG" +-#line 1431 "seclang-parser.yy" ++#line 1433 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadRemoveRuleByMsg(yystack_[0].value.as < std::string > (), &error) == false) { +@@ -2836,7 +2836,7 @@ namespace yy { + break; + + case 121: // expression: "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" variables_pre_process +-#line 1444 "seclang-parser.yy" ++#line 1446 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadUpdateTargetByTag(yystack_[1].value.as < std::string > (), std::move(yystack_[0].value.as < std::unique_ptr > > > ()), &error) == false) { +@@ -2853,7 +2853,7 @@ namespace yy { + break; + + case 122: // expression: "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" variables_pre_process +-#line 1457 "seclang-parser.yy" ++#line 1459 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadUpdateTargetByMsg(yystack_[1].value.as < std::string > (), std::move(yystack_[0].value.as < std::unique_ptr > > > ()), &error) == false) { +@@ -2870,7 +2870,7 @@ namespace yy { + break; + + case 123: // expression: "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" variables_pre_process +-#line 1470 "seclang-parser.yy" ++#line 1472 "seclang-parser.yy" + { + std::string error; + double ruleId; +@@ -2900,7 +2900,7 @@ namespace yy { + break; + + case 124: // expression: "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" actions +-#line 1496 "seclang-parser.yy" ++#line 1498 "seclang-parser.yy" + { + std::string error; + double ruleId; +@@ -2931,7 +2931,7 @@ namespace yy { + break; + + case 125: // expression: "CONFIG_DIR_DEBUG_LVL" +-#line 1524 "seclang-parser.yy" ++#line 1526 "seclang-parser.yy" + { + if (driver.m_debugLog != NULL) { + driver.m_debugLog->setDebugLogLevel(atoi(yystack_[0].value.as < std::string > ().c_str())); +@@ -2947,7 +2947,7 @@ namespace yy { + break; + + case 126: // expression: "CONFIG_DIR_DEBUG_LOG" +-#line 1536 "seclang-parser.yy" ++#line 1538 "seclang-parser.yy" + { + if (driver.m_debugLog != NULL) { + std::string error; +@@ -2970,7 +2970,7 @@ namespace yy { + break; + + case 127: // expression: "CONFIG_DIR_GEO_DB" +-#line 1556 "seclang-parser.yy" ++#line 1558 "seclang-parser.yy" + { + #if defined(WITH_GEOIP) or defined(WITH_MAXMIND) + std::string err; +@@ -3001,7 +3001,7 @@ namespace yy { + break; + + case 128: // expression: "CONFIG_DIR_ARGS_LIMIT" +-#line 1583 "seclang-parser.yy" ++#line 1585 "seclang-parser.yy" + { + driver.m_argumentsLimit.m_set = true; + driver.m_argumentsLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3010,7 +3010,7 @@ namespace yy { + break; + + case 129: // expression: "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" +-#line 1588 "seclang-parser.yy" ++#line 1590 "seclang-parser.yy" + { + driver.m_requestBodyJsonDepthLimit.m_set = true; + driver.m_requestBodyJsonDepthLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3019,7 +3019,7 @@ namespace yy { + break; + + case 130: // expression: "CONFIG_DIR_REQ_BODY_LIMIT" +-#line 1594 "seclang-parser.yy" ++#line 1596 "seclang-parser.yy" + { + driver.m_requestBodyLimit.m_set = true; + driver.m_requestBodyLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3028,7 +3028,7 @@ namespace yy { + break; + + case 131: // expression: "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" +-#line 1599 "seclang-parser.yy" ++#line 1601 "seclang-parser.yy" + { + driver.m_requestBodyNoFilesLimit.m_set = true; + driver.m_requestBodyNoFilesLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3037,7 +3037,7 @@ namespace yy { + break; + + case 132: // expression: "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" +-#line 1604 "seclang-parser.yy" ++#line 1606 "seclang-parser.yy" + { + std::stringstream ss; + ss << "As of ModSecurity version 3.0, SecRequestBodyInMemoryLimit is no longer "; +@@ -3050,7 +3050,7 @@ namespace yy { + break; + + case 133: // expression: "CONFIG_DIR_RES_BODY_LIMIT" +-#line 1613 "seclang-parser.yy" ++#line 1615 "seclang-parser.yy" + { + driver.m_responseBodyLimit.m_set = true; + driver.m_responseBodyLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3059,7 +3059,7 @@ namespace yy { + break; + + case 134: // expression: "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" "CONFIG_VALUE_PROCESS_PARTIAL" +-#line 1618 "seclang-parser.yy" ++#line 1620 "seclang-parser.yy" + { + driver.m_requestBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::ProcessPartialBodyLimitAction; + } +@@ -3067,7 +3067,7 @@ namespace yy { + break; + + case 135: // expression: "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" "CONFIG_VALUE_REJECT" +-#line 1622 "seclang-parser.yy" ++#line 1624 "seclang-parser.yy" + { + driver.m_requestBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::RejectBodyLimitAction; + } +@@ -3075,7 +3075,7 @@ namespace yy { + break; + + case 136: // expression: "CONFIG_DIR_RES_BODY_LIMIT_ACTION" "CONFIG_VALUE_PROCESS_PARTIAL" +-#line 1626 "seclang-parser.yy" ++#line 1628 "seclang-parser.yy" + { + driver.m_responseBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::ProcessPartialBodyLimitAction; + } +@@ -3083,7 +3083,7 @@ namespace yy { + break; + + case 137: // expression: "CONFIG_DIR_RES_BODY_LIMIT_ACTION" "CONFIG_VALUE_REJECT" +-#line 1630 "seclang-parser.yy" ++#line 1632 "seclang-parser.yy" + { + driver.m_responseBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::RejectBodyLimitAction; + } +@@ -3091,7 +3091,7 @@ namespace yy { + break; + + case 138: // expression: "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" "CONFIG_VALUE_ABORT" +-#line 1634 "seclang-parser.yy" ++#line 1636 "seclang-parser.yy" + { + driver.m_remoteRulesActionOnFailed = RulesSet::OnFailedRemoteRulesAction::AbortOnFailedRemoteRulesAction; + } +@@ -3099,7 +3099,7 @@ namespace yy { + break; + + case 139: // expression: "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" "CONFIG_VALUE_WARN" +-#line 1638 "seclang-parser.yy" ++#line 1640 "seclang-parser.yy" + { + driver.m_remoteRulesActionOnFailed = RulesSet::OnFailedRemoteRulesAction::WarnOnFailedRemoteRulesAction; + } +@@ -3107,7 +3107,7 @@ namespace yy { + break; + + case 142: // expression: "CONGIG_DIR_RESPONSE_BODY_MP" +-#line 1652 "seclang-parser.yy" ++#line 1654 "seclang-parser.yy" + { + std::istringstream buf(yystack_[0].value.as < std::string > ()); + std::istream_iterator beg(buf), end; +@@ -3123,7 +3123,7 @@ namespace yy { + break; + + case 143: // expression: "CONGIG_DIR_RESPONSE_BODY_MP_CLEAR" +-#line 1664 "seclang-parser.yy" ++#line 1666 "seclang-parser.yy" + { + driver.m_responseBodyTypeToBeInspected.m_set = true; + driver.m_responseBodyTypeToBeInspected.m_clear = true; +@@ -3133,7 +3133,7 @@ namespace yy { + break; + + case 144: // expression: "CONFIG_XML_EXTERNAL_ENTITY" "CONFIG_VALUE_OFF" +-#line 1670 "seclang-parser.yy" ++#line 1672 "seclang-parser.yy" + { + driver.m_secXMLExternalEntity = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -3141,7 +3141,7 @@ namespace yy { + break; + + case 145: // expression: "CONFIG_XML_EXTERNAL_ENTITY" "CONFIG_VALUE_ON" +-#line 1674 "seclang-parser.yy" ++#line 1676 "seclang-parser.yy" + { + driver.m_secXMLExternalEntity = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -3149,7 +3149,7 @@ namespace yy { + break; + + case 146: // expression: "CONGIG_DIR_SEC_TMP_DIR" +-#line 1678 "seclang-parser.yy" ++#line 1680 "seclang-parser.yy" + { + /* Parser error disabled to avoid breaking default installations with modsecurity.conf-recommended + std::stringstream ss; +@@ -3164,7 +3164,7 @@ namespace yy { + break; + + case 149: // expression: "CONGIG_DIR_SEC_COOKIE_FORMAT" +-#line 1699 "seclang-parser.yy" ++#line 1701 "seclang-parser.yy" + { + if (atoi(yystack_[0].value.as < std::string > ().c_str()) == 1) { + driver.error(yystack_[1].location, "SecCookieFormat 1 is not yet supported."); +@@ -3175,7 +3175,7 @@ namespace yy { + break; + + case 150: // expression: "CONFIG_SEC_COOKIEV0_SEPARATOR" +-#line 1706 "seclang-parser.yy" ++#line 1708 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecCookieV0Separator is not yet supported."); + YYERROR; +@@ -3184,7 +3184,7 @@ namespace yy { + break; + + case 152: // expression: "CONFIG_DIR_UNICODE_MAP_FILE" +-#line 1716 "seclang-parser.yy" ++#line 1718 "seclang-parser.yy" + { + std::string error; + std::vector param; +@@ -3242,7 +3242,7 @@ namespace yy { + break; + + case 153: // expression: "CONFIG_SEC_COLLECTION_TIMEOUT" +-#line 1770 "seclang-parser.yy" ++#line 1772 "seclang-parser.yy" + { + /* Parser error disabled to avoid breaking default CRS installations with crs-setup.conf-recommended + driver.error(@0, "SecCollectionTimeout is not yet supported."); +@@ -3253,7 +3253,7 @@ namespace yy { + break; + + case 154: // expression: "CONFIG_SEC_HTTP_BLKEY" +-#line 1777 "seclang-parser.yy" ++#line 1779 "seclang-parser.yy" + { + driver.m_httpblKey.m_set = true; + driver.m_httpblKey.m_value = yystack_[0].value.as < std::string > (); +@@ -3262,7 +3262,7 @@ namespace yy { + break; + + case 155: // variables: variables_pre_process +-#line 1785 "seclang-parser.yy" ++#line 1787 "seclang-parser.yy" + { + std::unique_ptr > > originalList = std::move(yystack_[0].value.as < std::unique_ptr > > > ()); + std::unique_ptr>> newList(new std::vector>()); +@@ -3300,7 +3300,7 @@ namespace yy { + break; + + case 156: // variables_pre_process: variables_may_be_quoted +-#line 1822 "seclang-parser.yy" ++#line 1824 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[0].value.as < std::unique_ptr > > > ()); + } +@@ -3308,7 +3308,7 @@ namespace yy { + break; + + case 157: // variables_pre_process: "QUOTATION_MARK" variables_may_be_quoted "QUOTATION_MARK" +-#line 1826 "seclang-parser.yy" ++#line 1828 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[1].value.as < std::unique_ptr > > > ()); + } +@@ -3316,7 +3316,7 @@ namespace yy { + break; + + case 158: // variables_may_be_quoted: variables_may_be_quoted PIPE var +-#line 1833 "seclang-parser.yy" ++#line 1835 "seclang-parser.yy" + { + yystack_[2].value.as < std::unique_ptr > > > ()->push_back(std::move(yystack_[0].value.as < std::unique_ptr > ())); + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[2].value.as < std::unique_ptr > > > ()); +@@ -3325,7 +3325,7 @@ namespace yy { + break; + + case 159: // variables_may_be_quoted: variables_may_be_quoted PIPE VAR_EXCLUSION var +-#line 1838 "seclang-parser.yy" ++#line 1840 "seclang-parser.yy" + { + std::unique_ptr c(new VariableModificatorExclusion(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + yystack_[3].value.as < std::unique_ptr > > > ()->push_back(std::move(c)); +@@ -3335,7 +3335,7 @@ namespace yy { + break; + + case 160: // variables_may_be_quoted: variables_may_be_quoted PIPE VAR_COUNT var +-#line 1844 "seclang-parser.yy" ++#line 1846 "seclang-parser.yy" + { + std::unique_ptr c(new VariableModificatorCount(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + yystack_[3].value.as < std::unique_ptr > > > ()->push_back(std::move(c)); +@@ -3345,7 +3345,7 @@ namespace yy { + break; + + case 161: // variables_may_be_quoted: var +-#line 1850 "seclang-parser.yy" ++#line 1852 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + b->push_back(std::move(yystack_[0].value.as < std::unique_ptr > ())); +@@ -3355,7 +3355,7 @@ namespace yy { + break; + + case 162: // variables_may_be_quoted: VAR_EXCLUSION var +-#line 1856 "seclang-parser.yy" ++#line 1858 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + std::unique_ptr c(new VariableModificatorExclusion(std::move(yystack_[0].value.as < std::unique_ptr > ()))); +@@ -3366,7 +3366,7 @@ namespace yy { + break; + + case 163: // variables_may_be_quoted: VAR_COUNT var +-#line 1863 "seclang-parser.yy" ++#line 1865 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + std::unique_ptr c(new VariableModificatorCount(std::move(yystack_[0].value.as < std::unique_ptr > ()))); +@@ -3377,7 +3377,7 @@ namespace yy { + break; + + case 164: // var: VARIABLE_ARGS "Dictionary element" +-#line 1873 "seclang-parser.yy" ++#line 1875 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Args_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3385,7 +3385,7 @@ namespace yy { + break; + + case 165: // var: VARIABLE_ARGS "Dictionary element, selected by regexp" +-#line 1877 "seclang-parser.yy" ++#line 1879 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Args_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3393,7 +3393,7 @@ namespace yy { + break; + + case 166: // var: VARIABLE_ARGS +-#line 1881 "seclang-parser.yy" ++#line 1883 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Args_NoDictElement()); + } +@@ -3401,7 +3401,7 @@ namespace yy { + break; + + case 167: // var: VARIABLE_ARGS_POST "Dictionary element" +-#line 1885 "seclang-parser.yy" ++#line 1887 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPost_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3409,7 +3409,7 @@ namespace yy { + break; + + case 168: // var: VARIABLE_ARGS_POST "Dictionary element, selected by regexp" +-#line 1889 "seclang-parser.yy" ++#line 1891 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPost_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3417,7 +3417,7 @@ namespace yy { + break; + + case 169: // var: VARIABLE_ARGS_POST +-#line 1893 "seclang-parser.yy" ++#line 1895 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPost_NoDictElement()); + } +@@ -3425,7 +3425,7 @@ namespace yy { + break; + + case 170: // var: VARIABLE_ARGS_GET "Dictionary element" +-#line 1897 "seclang-parser.yy" ++#line 1899 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGet_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3433,7 +3433,7 @@ namespace yy { + break; + + case 171: // var: VARIABLE_ARGS_GET "Dictionary element, selected by regexp" +-#line 1901 "seclang-parser.yy" ++#line 1903 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGet_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3441,7 +3441,7 @@ namespace yy { + break; + + case 172: // var: VARIABLE_ARGS_GET +-#line 1905 "seclang-parser.yy" ++#line 1907 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGet_NoDictElement()); + } +@@ -3449,7 +3449,7 @@ namespace yy { + break; + + case 173: // var: VARIABLE_FILES_SIZES "Dictionary element" +-#line 1909 "seclang-parser.yy" ++#line 1911 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesSizes_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3457,7 +3457,7 @@ namespace yy { + break; + + case 174: // var: VARIABLE_FILES_SIZES "Dictionary element, selected by regexp" +-#line 1913 "seclang-parser.yy" ++#line 1915 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesSizes_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3465,7 +3465,7 @@ namespace yy { + break; + + case 175: // var: VARIABLE_FILES_SIZES +-#line 1917 "seclang-parser.yy" ++#line 1919 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesSizes_NoDictElement()); + } +@@ -3473,7 +3473,7 @@ namespace yy { + break; + + case 176: // var: VARIABLE_FILES_NAMES "Dictionary element" +-#line 1921 "seclang-parser.yy" ++#line 1923 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesNames_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3481,7 +3481,7 @@ namespace yy { + break; + + case 177: // var: VARIABLE_FILES_NAMES "Dictionary element, selected by regexp" +-#line 1925 "seclang-parser.yy" ++#line 1927 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3489,7 +3489,7 @@ namespace yy { + break; + + case 178: // var: VARIABLE_FILES_NAMES +-#line 1929 "seclang-parser.yy" ++#line 1931 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesNames_NoDictElement()); + } +@@ -3497,7 +3497,7 @@ namespace yy { + break; + + case 179: // var: VARIABLE_FILES_TMP_CONTENT "Dictionary element" +-#line 1933 "seclang-parser.yy" ++#line 1935 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpContent_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3505,7 +3505,7 @@ namespace yy { + break; + + case 180: // var: VARIABLE_FILES_TMP_CONTENT "Dictionary element, selected by regexp" +-#line 1937 "seclang-parser.yy" ++#line 1939 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpContent_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3513,7 +3513,7 @@ namespace yy { + break; + + case 181: // var: VARIABLE_FILES_TMP_CONTENT +-#line 1941 "seclang-parser.yy" ++#line 1943 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpContent_NoDictElement()); + } +@@ -3521,7 +3521,7 @@ namespace yy { + break; + + case 182: // var: VARIABLE_MULTIPART_FILENAME "Dictionary element" +-#line 1945 "seclang-parser.yy" ++#line 1947 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartFileName_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3529,7 +3529,7 @@ namespace yy { + break; + + case 183: // var: VARIABLE_MULTIPART_FILENAME "Dictionary element, selected by regexp" +-#line 1949 "seclang-parser.yy" ++#line 1951 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartFileName_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3537,7 +3537,7 @@ namespace yy { + break; + + case 184: // var: VARIABLE_MULTIPART_FILENAME +-#line 1953 "seclang-parser.yy" ++#line 1955 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartFileName_NoDictElement()); + } +@@ -3545,7 +3545,7 @@ namespace yy { + break; + + case 185: // var: VARIABLE_MULTIPART_NAME "Dictionary element" +-#line 1957 "seclang-parser.yy" ++#line 1959 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartName_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3553,7 +3553,7 @@ namespace yy { + break; + + case 186: // var: VARIABLE_MULTIPART_NAME "Dictionary element, selected by regexp" +-#line 1961 "seclang-parser.yy" ++#line 1963 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartName_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3561,7 +3561,7 @@ namespace yy { + break; + + case 187: // var: VARIABLE_MULTIPART_NAME +-#line 1965 "seclang-parser.yy" ++#line 1967 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartName_NoDictElement()); + } +@@ -3569,7 +3569,7 @@ namespace yy { + break; + + case 188: // var: VARIABLE_MATCHED_VARS_NAMES "Dictionary element" +-#line 1969 "seclang-parser.yy" ++#line 1971 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarsNames_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3577,7 +3577,7 @@ namespace yy { + break; + + case 189: // var: VARIABLE_MATCHED_VARS_NAMES "Dictionary element, selected by regexp" +-#line 1973 "seclang-parser.yy" ++#line 1975 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarsNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3585,7 +3585,7 @@ namespace yy { + break; + + case 190: // var: VARIABLE_MATCHED_VARS_NAMES +-#line 1977 "seclang-parser.yy" ++#line 1979 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarsNames_NoDictElement()); + } +@@ -3593,7 +3593,7 @@ namespace yy { + break; + + case 191: // var: VARIABLE_MATCHED_VARS "Dictionary element" +-#line 1981 "seclang-parser.yy" ++#line 1983 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVars_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3601,7 +3601,7 @@ namespace yy { + break; + + case 192: // var: VARIABLE_MATCHED_VARS "Dictionary element, selected by regexp" +-#line 1985 "seclang-parser.yy" ++#line 1987 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVars_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3609,7 +3609,7 @@ namespace yy { + break; + + case 193: // var: VARIABLE_MATCHED_VARS +-#line 1989 "seclang-parser.yy" ++#line 1991 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVars_NoDictElement()); + } +@@ -3617,7 +3617,7 @@ namespace yy { + break; + + case 194: // var: VARIABLE_FILES "Dictionary element" +-#line 1993 "seclang-parser.yy" ++#line 1995 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Files_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3625,7 +3625,7 @@ namespace yy { + break; + + case 195: // var: VARIABLE_FILES "Dictionary element, selected by regexp" +-#line 1997 "seclang-parser.yy" ++#line 1999 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Files_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3633,7 +3633,7 @@ namespace yy { + break; + + case 196: // var: VARIABLE_FILES +-#line 2001 "seclang-parser.yy" ++#line 2003 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Files_NoDictElement()); + } +@@ -3641,7 +3641,7 @@ namespace yy { + break; + + case 197: // var: VARIABLE_REQUEST_COOKIES "Dictionary element" +-#line 2005 "seclang-parser.yy" ++#line 2007 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookies_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3649,7 +3649,7 @@ namespace yy { + break; + + case 198: // var: VARIABLE_REQUEST_COOKIES "Dictionary element, selected by regexp" +-#line 2009 "seclang-parser.yy" ++#line 2011 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookies_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3657,7 +3657,7 @@ namespace yy { + break; + + case 199: // var: VARIABLE_REQUEST_COOKIES +-#line 2013 "seclang-parser.yy" ++#line 2015 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookies_NoDictElement()); + } +@@ -3665,7 +3665,7 @@ namespace yy { + break; + + case 200: // var: VARIABLE_REQUEST_HEADERS "Dictionary element" +-#line 2017 "seclang-parser.yy" ++#line 2019 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeaders_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3673,7 +3673,7 @@ namespace yy { + break; + + case 201: // var: VARIABLE_REQUEST_HEADERS "Dictionary element, selected by regexp" +-#line 2021 "seclang-parser.yy" ++#line 2023 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeaders_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3681,7 +3681,7 @@ namespace yy { + break; + + case 202: // var: VARIABLE_REQUEST_HEADERS +-#line 2025 "seclang-parser.yy" ++#line 2027 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeaders_NoDictElement()); + } +@@ -3689,7 +3689,7 @@ namespace yy { + break; + + case 203: // var: VARIABLE_RESPONSE_HEADERS "Dictionary element" +-#line 2029 "seclang-parser.yy" ++#line 2031 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeaders_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3697,7 +3697,7 @@ namespace yy { + break; + + case 204: // var: VARIABLE_RESPONSE_HEADERS "Dictionary element, selected by regexp" +-#line 2033 "seclang-parser.yy" ++#line 2035 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeaders_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3705,7 +3705,7 @@ namespace yy { + break; + + case 205: // var: VARIABLE_RESPONSE_HEADERS +-#line 2037 "seclang-parser.yy" ++#line 2039 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeaders_NoDictElement()); + } +@@ -3713,7 +3713,7 @@ namespace yy { + break; + + case 206: // var: VARIABLE_GEO "Dictionary element" +-#line 2041 "seclang-parser.yy" ++#line 2043 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Geo_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3721,7 +3721,7 @@ namespace yy { + break; + + case 207: // var: VARIABLE_GEO "Dictionary element, selected by regexp" +-#line 2045 "seclang-parser.yy" ++#line 2047 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Geo_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3729,7 +3729,7 @@ namespace yy { + break; + + case 208: // var: VARIABLE_GEO +-#line 2049 "seclang-parser.yy" ++#line 2051 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Geo_NoDictElement()); + } +@@ -3737,7 +3737,7 @@ namespace yy { + break; + + case 209: // var: VARIABLE_REQUEST_COOKIES_NAMES "Dictionary element" +-#line 2053 "seclang-parser.yy" ++#line 2055 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookiesNames_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3745,7 +3745,7 @@ namespace yy { + break; + + case 210: // var: VARIABLE_REQUEST_COOKIES_NAMES "Dictionary element, selected by regexp" +-#line 2057 "seclang-parser.yy" ++#line 2059 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookiesNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3753,1905 +3753,1929 @@ namespace yy { + break; + + case 211: // var: VARIABLE_REQUEST_COOKIES_NAMES +-#line 2061 "seclang-parser.yy" ++#line 2063 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookiesNames_NoDictElement()); + } + #line 3761 "seclang-parser.cc" + break; + +- case 212: // var: VARIABLE_RULE "Dictionary element" +-#line 2065 "seclang-parser.yy" ++ case 212: // var: VARIABLE_MULTIPART_PART_HEADERS "Dictionary element" ++#line 2067 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartPartHeaders_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3769 "seclang-parser.cc" + break; + +- case 213: // var: VARIABLE_RULE "Dictionary element, selected by regexp" +-#line 2069 "seclang-parser.yy" ++ case 213: // var: VARIABLE_MULTIPART_PART_HEADERS "Dictionary element, selected by regexp" ++#line 2071 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartPartHeaders_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3777 "seclang-parser.cc" + break; + +- case 214: // var: VARIABLE_RULE +-#line 2073 "seclang-parser.yy" ++ case 214: // var: VARIABLE_MULTIPART_PART_HEADERS ++#line 2075 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartPartHeaders_NoDictElement()); + } + #line 3785 "seclang-parser.cc" + break; + +- case 215: // var: "RUN_TIME_VAR_ENV" "Dictionary element" +-#line 2077 "seclang-parser.yy" ++ case 215: // var: VARIABLE_RULE "Dictionary element" ++#line 2079 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3793 "seclang-parser.cc" + break; + +- case 216: // var: "RUN_TIME_VAR_ENV" "Dictionary element, selected by regexp" +-#line 2081 "seclang-parser.yy" ++ case 216: // var: VARIABLE_RULE "Dictionary element, selected by regexp" ++#line 2083 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3801 "seclang-parser.cc" + break; + +- case 217: // var: "RUN_TIME_VAR_ENV" +-#line 2085 "seclang-parser.yy" ++ case 217: // var: VARIABLE_RULE ++#line 2087 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV")); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_NoDictElement()); + } + #line 3809 "seclang-parser.cc" + break; + +- case 218: // var: "RUN_TIME_VAR_XML" "Dictionary element" +-#line 2089 "seclang-parser.yy" ++ case 218: // var: "RUN_TIME_VAR_ENV" "Dictionary element" ++#line 2091 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); + } + #line 3817 "seclang-parser.cc" + break; + +- case 219: // var: "RUN_TIME_VAR_XML" "Dictionary element, selected by regexp" +-#line 2093 "seclang-parser.yy" ++ case 219: // var: "RUN_TIME_VAR_ENV" "Dictionary element, selected by regexp" ++#line 2095 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); + } + #line 3825 "seclang-parser.cc" + break; + +- case 220: // var: "RUN_TIME_VAR_XML" +-#line 2097 "seclang-parser.yy" ++ case 220: // var: "RUN_TIME_VAR_ENV" ++#line 2099 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV")); + } + #line 3833 "seclang-parser.cc" + break; + +- case 221: // var: "FILES_TMPNAMES" "Dictionary element" +-#line 2101 "seclang-parser.yy" ++ case 221: // var: "RUN_TIME_VAR_XML" "Dictionary element" ++#line 2103 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); + } + #line 3841 "seclang-parser.cc" + break; + +- case 222: // var: "FILES_TMPNAMES" "Dictionary element, selected by regexp" +-#line 2105 "seclang-parser.yy" ++ case 222: // var: "RUN_TIME_VAR_XML" "Dictionary element, selected by regexp" ++#line 2107 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); + } + #line 3849 "seclang-parser.cc" + break; + +- case 223: // var: "FILES_TMPNAMES" +-#line 2109 "seclang-parser.yy" ++ case 223: // var: "RUN_TIME_VAR_XML" ++#line 2111 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML_NoDictElement()); + } + #line 3857 "seclang-parser.cc" + break; + +- case 224: // var: "RESOURCE" run_time_string +-#line 2113 "seclang-parser.yy" ++ case 224: // var: "FILES_TMPNAMES" "Dictionary element" ++#line 2115 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3865 "seclang-parser.cc" + break; + +- case 225: // var: "RESOURCE" "Dictionary element" +-#line 2117 "seclang-parser.yy" ++ case 225: // var: "FILES_TMPNAMES" "Dictionary element, selected by regexp" ++#line 2119 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3873 "seclang-parser.cc" + break; + +- case 226: // var: "RESOURCE" "Dictionary element, selected by regexp" +-#line 2121 "seclang-parser.yy" ++ case 226: // var: "FILES_TMPNAMES" ++#line 2123 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_NoDictElement()); + } + #line 3881 "seclang-parser.cc" + break; + +- case 227: // var: "RESOURCE" +-#line 2125 "seclang-parser.yy" ++ case 227: // var: "RESOURCE" run_time_string ++#line 2127 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3889 "seclang-parser.cc" + break; + +- case 228: // var: "VARIABLE_IP" run_time_string +-#line 2129 "seclang-parser.yy" ++ case 228: // var: "RESOURCE" "Dictionary element" ++#line 2131 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3897 "seclang-parser.cc" + break; + +- case 229: // var: "VARIABLE_IP" "Dictionary element" +-#line 2133 "seclang-parser.yy" ++ case 229: // var: "RESOURCE" "Dictionary element, selected by regexp" ++#line 2135 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3905 "seclang-parser.cc" + break; + +- case 230: // var: "VARIABLE_IP" "Dictionary element, selected by regexp" +-#line 2137 "seclang-parser.yy" ++ case 230: // var: "RESOURCE" ++#line 2139 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_NoDictElement()); + } + #line 3913 "seclang-parser.cc" + break; + +- case 231: // var: "VARIABLE_IP" +-#line 2141 "seclang-parser.yy" ++ case 231: // var: "VARIABLE_IP" run_time_string ++#line 2143 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3921 "seclang-parser.cc" + break; + +- case 232: // var: "VARIABLE_GLOBAL" run_time_string +-#line 2145 "seclang-parser.yy" ++ case 232: // var: "VARIABLE_IP" "Dictionary element" ++#line 2147 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3929 "seclang-parser.cc" + break; + +- case 233: // var: "VARIABLE_GLOBAL" "Dictionary element" +-#line 2149 "seclang-parser.yy" ++ case 233: // var: "VARIABLE_IP" "Dictionary element, selected by regexp" ++#line 2151 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3937 "seclang-parser.cc" + break; + +- case 234: // var: "VARIABLE_GLOBAL" "Dictionary element, selected by regexp" +-#line 2153 "seclang-parser.yy" ++ case 234: // var: "VARIABLE_IP" ++#line 2155 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_NoDictElement()); + } + #line 3945 "seclang-parser.cc" + break; + +- case 235: // var: "VARIABLE_GLOBAL" +-#line 2157 "seclang-parser.yy" ++ case 235: // var: "VARIABLE_GLOBAL" run_time_string ++#line 2159 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3953 "seclang-parser.cc" + break; + +- case 236: // var: "VARIABLE_USER" run_time_string +-#line 2161 "seclang-parser.yy" ++ case 236: // var: "VARIABLE_GLOBAL" "Dictionary element" ++#line 2163 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3961 "seclang-parser.cc" + break; + +- case 237: // var: "VARIABLE_USER" "Dictionary element" +-#line 2165 "seclang-parser.yy" ++ case 237: // var: "VARIABLE_GLOBAL" "Dictionary element, selected by regexp" ++#line 2167 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3969 "seclang-parser.cc" + break; + +- case 238: // var: "VARIABLE_USER" "Dictionary element, selected by regexp" +-#line 2169 "seclang-parser.yy" ++ case 238: // var: "VARIABLE_GLOBAL" ++#line 2171 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_NoDictElement()); + } + #line 3977 "seclang-parser.cc" + break; + +- case 239: // var: "VARIABLE_USER" +-#line 2173 "seclang-parser.yy" ++ case 239: // var: "VARIABLE_USER" run_time_string ++#line 2175 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3985 "seclang-parser.cc" + break; + +- case 240: // var: "VARIABLE_TX" run_time_string +-#line 2177 "seclang-parser.yy" ++ case 240: // var: "VARIABLE_USER" "Dictionary element" ++#line 2179 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3993 "seclang-parser.cc" + break; + +- case 241: // var: "VARIABLE_TX" "Dictionary element" +-#line 2181 "seclang-parser.yy" ++ case 241: // var: "VARIABLE_USER" "Dictionary element, selected by regexp" ++#line 2183 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4001 "seclang-parser.cc" + break; + +- case 242: // var: "VARIABLE_TX" "Dictionary element, selected by regexp" +-#line 2185 "seclang-parser.yy" ++ case 242: // var: "VARIABLE_USER" ++#line 2187 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_NoDictElement()); + } + #line 4009 "seclang-parser.cc" + break; + +- case 243: // var: "VARIABLE_TX" +-#line 2189 "seclang-parser.yy" ++ case 243: // var: "VARIABLE_TX" run_time_string ++#line 2191 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 4017 "seclang-parser.cc" + break; + +- case 244: // var: "VARIABLE_SESSION" run_time_string +-#line 2193 "seclang-parser.yy" ++ case 244: // var: "VARIABLE_TX" "Dictionary element" ++#line 2195 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4025 "seclang-parser.cc" + break; + +- case 245: // var: "VARIABLE_SESSION" "Dictionary element" +-#line 2197 "seclang-parser.yy" ++ case 245: // var: "VARIABLE_TX" "Dictionary element, selected by regexp" ++#line 2199 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4033 "seclang-parser.cc" + break; + +- case 246: // var: "VARIABLE_SESSION" "Dictionary element, selected by regexp" +-#line 2201 "seclang-parser.yy" ++ case 246: // var: "VARIABLE_TX" ++#line 2203 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_NoDictElement()); + } + #line 4041 "seclang-parser.cc" + break; + +- case 247: // var: "VARIABLE_SESSION" +-#line 2205 "seclang-parser.yy" ++ case 247: // var: "VARIABLE_SESSION" run_time_string ++#line 2207 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 4049 "seclang-parser.cc" + break; + +- case 248: // var: "Variable ARGS_NAMES" "Dictionary element" +-#line 2209 "seclang-parser.yy" ++ case 248: // var: "VARIABLE_SESSION" "Dictionary element" ++#line 2211 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4057 "seclang-parser.cc" + break; + +- case 249: // var: "Variable ARGS_NAMES" "Dictionary element, selected by regexp" +-#line 2213 "seclang-parser.yy" ++ case 249: // var: "VARIABLE_SESSION" "Dictionary element, selected by regexp" ++#line 2215 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4065 "seclang-parser.cc" + break; + +- case 250: // var: "Variable ARGS_NAMES" +-#line 2217 "seclang-parser.yy" ++ case 250: // var: "VARIABLE_SESSION" ++#line 2219 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_NoDictElement()); + } + #line 4073 "seclang-parser.cc" + break; + +- case 251: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element" +-#line 2221 "seclang-parser.yy" ++ case 251: // var: "Variable ARGS_NAMES" "Dictionary element" ++#line 2223 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4081 "seclang-parser.cc" + break; + +- case 252: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element, selected by regexp" +-#line 2225 "seclang-parser.yy" ++ case 252: // var: "Variable ARGS_NAMES" "Dictionary element, selected by regexp" ++#line 2227 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4089 "seclang-parser.cc" + break; + +- case 253: // var: VARIABLE_ARGS_GET_NAMES +-#line 2229 "seclang-parser.yy" ++ case 253: // var: "Variable ARGS_NAMES" ++#line 2231 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_NoDictElement()); + } + #line 4097 "seclang-parser.cc" + break; + +- case 254: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element" +-#line 2234 "seclang-parser.yy" ++ case 254: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element" ++#line 2235 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4105 "seclang-parser.cc" + break; + +- case 255: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element, selected by regexp" +-#line 2238 "seclang-parser.yy" ++ case 255: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element, selected by regexp" ++#line 2239 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4113 "seclang-parser.cc" + break; + +- case 256: // var: VARIABLE_ARGS_POST_NAMES +-#line 2242 "seclang-parser.yy" ++ case 256: // var: VARIABLE_ARGS_GET_NAMES ++#line 2243 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_NoDictElement()); + } + #line 4121 "seclang-parser.cc" + break; + +- case 257: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element" +-#line 2247 "seclang-parser.yy" ++ case 257: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element" ++#line 2248 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4129 "seclang-parser.cc" + break; + +- case 258: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element, selected by regexp" +-#line 2251 "seclang-parser.yy" ++ case 258: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element, selected by regexp" ++#line 2252 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4137 "seclang-parser.cc" + break; + +- case 259: // var: VARIABLE_REQUEST_HEADERS_NAMES +-#line 2255 "seclang-parser.yy" ++ case 259: // var: VARIABLE_ARGS_POST_NAMES ++#line 2256 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_NoDictElement()); + } + #line 4145 "seclang-parser.cc" + break; + +- case 260: // var: VARIABLE_RESPONSE_CONTENT_TYPE +-#line 2260 "seclang-parser.yy" ++ case 260: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element" ++#line 2261 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentType()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4153 "seclang-parser.cc" + break; + +- case 261: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element" ++ case 261: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element, selected by regexp" + #line 2265 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4161 "seclang-parser.cc" + break; + +- case 262: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element, selected by regexp" ++ case 262: // var: VARIABLE_REQUEST_HEADERS_NAMES + #line 2269 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_NoDictElement()); + } + #line 4169 "seclang-parser.cc" + break; + +- case 263: // var: VARIABLE_RESPONSE_HEADERS_NAMES +-#line 2273 "seclang-parser.yy" ++ case 263: // var: VARIABLE_RESPONSE_CONTENT_TYPE ++#line 2274 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentType()); + } + #line 4177 "seclang-parser.cc" + break; + +- case 264: // var: VARIABLE_ARGS_COMBINED_SIZE +-#line 2277 "seclang-parser.yy" ++ case 264: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element" ++#line 2279 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsCombinedSize()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4185 "seclang-parser.cc" + break; + +- case 265: // var: "AUTH_TYPE" +-#line 2281 "seclang-parser.yy" ++ case 265: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element, selected by regexp" ++#line 2283 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::AuthType()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4193 "seclang-parser.cc" + break; + +- case 266: // var: "FILES_COMBINED_SIZE" +-#line 2285 "seclang-parser.yy" ++ case 266: // var: VARIABLE_RESPONSE_HEADERS_NAMES ++#line 2287 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesCombinedSize()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_NoDictElement()); + } + #line 4201 "seclang-parser.cc" + break; + +- case 267: // var: "FULL_REQUEST" +-#line 2289 "seclang-parser.yy" ++ case 267: // var: VARIABLE_ARGS_COMBINED_SIZE ++#line 2291 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequest()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsCombinedSize()); + } + #line 4209 "seclang-parser.cc" + break; + +- case 268: // var: "FULL_REQUEST_LENGTH" +-#line 2293 "seclang-parser.yy" ++ case 268: // var: "AUTH_TYPE" ++#line 2295 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequestLength()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::AuthType()); + } + #line 4217 "seclang-parser.cc" + break; + +- case 269: // var: "INBOUND_DATA_ERROR" +-#line 2297 "seclang-parser.yy" ++ case 269: // var: "FILES_COMBINED_SIZE" ++#line 2299 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::InboundDataError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesCombinedSize()); + } + #line 4225 "seclang-parser.cc" + break; + +- case 270: // var: "MATCHED_VAR" +-#line 2301 "seclang-parser.yy" ++ case 270: // var: "FULL_REQUEST" ++#line 2303 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVar()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequest()); + } + #line 4233 "seclang-parser.cc" + break; + +- case 271: // var: "MATCHED_VAR_NAME" +-#line 2305 "seclang-parser.yy" ++ case 271: // var: "FULL_REQUEST_LENGTH" ++#line 2307 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarName()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequestLength()); + } + #line 4241 "seclang-parser.cc" + break; + +- case 272: // var: VARIABLE_MULTIPART_BOUNDARY_QUOTED +-#line 2309 "seclang-parser.yy" ++ case 272: // var: "INBOUND_DATA_ERROR" ++#line 2311 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryQuoted()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::InboundDataError()); + } + #line 4249 "seclang-parser.cc" + break; + +- case 273: // var: VARIABLE_MULTIPART_BOUNDARY_WHITESPACE +-#line 2313 "seclang-parser.yy" ++ case 273: // var: "MATCHED_VAR" ++#line 2315 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryWhiteSpace()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVar()); + } + #line 4257 "seclang-parser.cc" + break; + +- case 274: // var: "MULTIPART_CRLF_LF_LINES" +-#line 2317 "seclang-parser.yy" ++ case 274: // var: "MATCHED_VAR_NAME" ++#line 2319 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartCrlfLFLines()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarName()); + } + #line 4265 "seclang-parser.cc" + break; + +- case 275: // var: "MULTIPART_DATA_AFTER" +-#line 2321 "seclang-parser.yy" ++ case 275: // var: VARIABLE_MULTIPART_BOUNDARY_QUOTED ++#line 2323 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateAfter()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryQuoted()); + } + #line 4273 "seclang-parser.cc" + break; + +- case 276: // var: VARIABLE_MULTIPART_DATA_BEFORE +-#line 2325 "seclang-parser.yy" ++ case 276: // var: VARIABLE_MULTIPART_BOUNDARY_WHITESPACE ++#line 2327 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateBefore()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryWhiteSpace()); + } + #line 4281 "seclang-parser.cc" + break; + +- case 277: // var: "MULTIPART_FILE_LIMIT_EXCEEDED" +-#line 2329 "seclang-parser.yy" ++ case 277: // var: "MULTIPART_CRLF_LF_LINES" ++#line 2331 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartFileLimitExceeded()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartCrlfLFLines()); + } + #line 4289 "seclang-parser.cc" + break; + +- case 278: // var: "MULTIPART_HEADER_FOLDING" +-#line 2333 "seclang-parser.yy" ++ case 278: // var: "MULTIPART_DATA_AFTER" ++#line 2335 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartHeaderFolding()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateAfter()); + } + #line 4297 "seclang-parser.cc" + break; + +- case 279: // var: "MULTIPART_INVALID_HEADER_FOLDING" +-#line 2337 "seclang-parser.yy" ++ case 279: // var: VARIABLE_MULTIPART_DATA_BEFORE ++#line 2339 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidHeaderFolding()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateBefore()); + } + #line 4305 "seclang-parser.cc" + break; + +- case 280: // var: VARIABLE_MULTIPART_INVALID_PART +-#line 2341 "seclang-parser.yy" ++ case 280: // var: "MULTIPART_FILE_LIMIT_EXCEEDED" ++#line 2343 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidPart()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartFileLimitExceeded()); + } + #line 4313 "seclang-parser.cc" + break; + +- case 281: // var: "MULTIPART_INVALID_QUOTING" +-#line 2345 "seclang-parser.yy" ++ case 281: // var: "MULTIPART_HEADER_FOLDING" ++#line 2347 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidQuoting()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartHeaderFolding()); + } + #line 4321 "seclang-parser.cc" + break; + +- case 282: // var: VARIABLE_MULTIPART_LF_LINE +-#line 2349 "seclang-parser.yy" ++ case 282: // var: "MULTIPART_INVALID_HEADER_FOLDING" ++#line 2351 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartLFLine()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidHeaderFolding()); + } + #line 4329 "seclang-parser.cc" + break; + +- case 283: // var: VARIABLE_MULTIPART_MISSING_SEMICOLON +-#line 2353 "seclang-parser.yy" ++ case 283: // var: VARIABLE_MULTIPART_INVALID_PART ++#line 2355 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidPart()); + } + #line 4337 "seclang-parser.cc" + break; + +- case 284: // var: VARIABLE_MULTIPART_SEMICOLON_MISSING +-#line 2357 "seclang-parser.yy" ++ case 284: // var: "MULTIPART_INVALID_QUOTING" ++#line 2359 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidQuoting()); + } + #line 4345 "seclang-parser.cc" + break; + +- case 285: // var: "MULTIPART_STRICT_ERROR" +-#line 2361 "seclang-parser.yy" ++ case 285: // var: VARIABLE_MULTIPART_LF_LINE ++#line 2363 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartStrictError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartLFLine()); + } + #line 4353 "seclang-parser.cc" + break; + +- case 286: // var: "MULTIPART_UNMATCHED_BOUNDARY" +-#line 2365 "seclang-parser.yy" ++ case 286: // var: VARIABLE_MULTIPART_MISSING_SEMICOLON ++#line 2367 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartUnmatchedBoundary()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); + } + #line 4361 "seclang-parser.cc" + break; + +- case 287: // var: "OUTBOUND_DATA_ERROR" +-#line 2369 "seclang-parser.yy" ++ case 287: // var: VARIABLE_MULTIPART_SEMICOLON_MISSING ++#line 2371 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::OutboundDataError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); + } + #line 4369 "seclang-parser.cc" + break; + +- case 288: // var: "PATH_INFO" +-#line 2373 "seclang-parser.yy" ++ case 288: // var: "MULTIPART_STRICT_ERROR" ++#line 2375 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::PathInfo()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartStrictError()); + } + #line 4377 "seclang-parser.cc" + break; + +- case 289: // var: "QUERY_STRING" +-#line 2377 "seclang-parser.yy" ++ case 289: // var: "MULTIPART_UNMATCHED_BOUNDARY" ++#line 2379 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::QueryString()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartUnmatchedBoundary()); + } + #line 4385 "seclang-parser.cc" + break; + +- case 290: // var: "REMOTE_ADDR" +-#line 2381 "seclang-parser.yy" ++ case 290: // var: "OUTBOUND_DATA_ERROR" ++#line 2383 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteAddr()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::OutboundDataError()); + } + #line 4393 "seclang-parser.cc" + break; + +- case 291: // var: "REMOTE_HOST" +-#line 2385 "seclang-parser.yy" ++ case 291: // var: "PATH_INFO" ++#line 2387 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteHost()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::PathInfo()); + } + #line 4401 "seclang-parser.cc" + break; + +- case 292: // var: "REMOTE_PORT" +-#line 2389 "seclang-parser.yy" ++ case 292: // var: "QUERY_STRING" ++#line 2391 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemotePort()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::QueryString()); + } + #line 4409 "seclang-parser.cc" + break; + +- case 293: // var: "REQBODY_ERROR" +-#line 2393 "seclang-parser.yy" ++ case 293: // var: "REMOTE_ADDR" ++#line 2395 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteAddr()); + } + #line 4417 "seclang-parser.cc" + break; + +- case 294: // var: "REQBODY_ERROR_MSG" +-#line 2397 "seclang-parser.yy" ++ case 294: // var: "REMOTE_HOST" ++#line 2399 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyErrorMsg()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteHost()); + } + #line 4425 "seclang-parser.cc" + break; + +- case 295: // var: "REQBODY_PROCESSOR" +-#line 2401 "seclang-parser.yy" ++ case 295: // var: "REMOTE_PORT" ++#line 2403 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessor()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemotePort()); + } + #line 4433 "seclang-parser.cc" + break; + +- case 296: // var: "REQBODY_PROCESSOR_ERROR" +-#line 2405 "seclang-parser.yy" ++ case 296: // var: "REQBODY_ERROR" ++#line 2407 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyError()); + } + #line 4441 "seclang-parser.cc" + break; + +- case 297: // var: "REQBODY_PROCESSOR_ERROR_MSG" +-#line 2409 "seclang-parser.yy" ++ case 297: // var: "REQBODY_ERROR_MSG" ++#line 2411 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorErrorMsg()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyErrorMsg()); + } + #line 4449 "seclang-parser.cc" + break; + +- case 298: // var: "REQUEST_BASENAME" +-#line 2413 "seclang-parser.yy" ++ case 298: // var: "REQBODY_PROCESSOR" ++#line 2415 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBasename()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessor()); + } + #line 4457 "seclang-parser.cc" + break; + +- case 299: // var: "REQUEST_BODY" +-#line 2417 "seclang-parser.yy" ++ case 299: // var: "REQBODY_PROCESSOR_ERROR" ++#line 2419 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBody()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorError()); + } + #line 4465 "seclang-parser.cc" + break; + +- case 300: // var: "REQUEST_BODY_LENGTH" +-#line 2421 "seclang-parser.yy" ++ case 300: // var: "REQBODY_PROCESSOR_ERROR_MSG" ++#line 2423 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBodyLength()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorErrorMsg()); + } + #line 4473 "seclang-parser.cc" + break; + +- case 301: // var: "REQUEST_FILENAME" +-#line 2425 "seclang-parser.yy" ++ case 301: // var: "REQUEST_BASENAME" ++#line 2427 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestFilename()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBasename()); + } + #line 4481 "seclang-parser.cc" + break; + +- case 302: // var: "REQUEST_LINE" +-#line 2429 "seclang-parser.yy" ++ case 302: // var: "REQUEST_BODY" ++#line 2431 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestLine()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBody()); + } + #line 4489 "seclang-parser.cc" + break; + +- case 303: // var: "REQUEST_METHOD" +-#line 2433 "seclang-parser.yy" ++ case 303: // var: "REQUEST_BODY_LENGTH" ++#line 2435 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestMethod()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBodyLength()); + } + #line 4497 "seclang-parser.cc" + break; + +- case 304: // var: "REQUEST_PROTOCOL" +-#line 2437 "seclang-parser.yy" ++ case 304: // var: "REQUEST_FILENAME" ++#line 2439 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestProtocol()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestFilename()); + } + #line 4505 "seclang-parser.cc" + break; + +- case 305: // var: "REQUEST_URI" +-#line 2441 "seclang-parser.yy" ++ case 305: // var: "REQUEST_LINE" ++#line 2443 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURI()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestLine()); + } + #line 4513 "seclang-parser.cc" + break; + +- case 306: // var: "REQUEST_URI_RAW" +-#line 2445 "seclang-parser.yy" ++ case 306: // var: "REQUEST_METHOD" ++#line 2447 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURIRaw()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestMethod()); + } + #line 4521 "seclang-parser.cc" + break; + +- case 307: // var: "RESPONSE_BODY" +-#line 2449 "seclang-parser.yy" ++ case 307: // var: "REQUEST_PROTOCOL" ++#line 2451 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseBody()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestProtocol()); + } + #line 4529 "seclang-parser.cc" + break; + +- case 308: // var: "RESPONSE_CONTENT_LENGTH" +-#line 2453 "seclang-parser.yy" ++ case 308: // var: "REQUEST_URI" ++#line 2455 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentLength()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURI()); + } + #line 4537 "seclang-parser.cc" + break; + +- case 309: // var: "RESPONSE_PROTOCOL" +-#line 2457 "seclang-parser.yy" ++ case 309: // var: "REQUEST_URI_RAW" ++#line 2459 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseProtocol()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURIRaw()); + } + #line 4545 "seclang-parser.cc" + break; + +- case 310: // var: "RESPONSE_STATUS" +-#line 2461 "seclang-parser.yy" ++ case 310: // var: "RESPONSE_BODY" ++#line 2463 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseStatus()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseBody()); + } + #line 4553 "seclang-parser.cc" + break; + +- case 311: // var: "SERVER_ADDR" +-#line 2465 "seclang-parser.yy" ++ case 311: // var: "RESPONSE_CONTENT_LENGTH" ++#line 2467 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerAddr()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentLength()); + } + #line 4561 "seclang-parser.cc" + break; + +- case 312: // var: "SERVER_NAME" +-#line 2469 "seclang-parser.yy" ++ case 312: // var: "RESPONSE_PROTOCOL" ++#line 2471 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerName()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseProtocol()); + } + #line 4569 "seclang-parser.cc" + break; + +- case 313: // var: "SERVER_PORT" +-#line 2473 "seclang-parser.yy" ++ case 313: // var: "RESPONSE_STATUS" ++#line 2475 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerPort()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseStatus()); + } + #line 4577 "seclang-parser.cc" + break; + +- case 314: // var: "SESSIONID" +-#line 2477 "seclang-parser.yy" ++ case 314: // var: "SERVER_ADDR" ++#line 2479 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::SessionID()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerAddr()); + } + #line 4585 "seclang-parser.cc" + break; + +- case 315: // var: "UNIQUE_ID" +-#line 2481 "seclang-parser.yy" ++ case 315: // var: "SERVER_NAME" ++#line 2483 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UniqueID()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerName()); + } + #line 4593 "seclang-parser.cc" + break; + +- case 316: // var: "URLENCODED_ERROR" +-#line 2485 "seclang-parser.yy" ++ case 316: // var: "SERVER_PORT" ++#line 2487 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UrlEncodedError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerPort()); + } + #line 4601 "seclang-parser.cc" + break; + +- case 317: // var: "USERID" +-#line 2489 "seclang-parser.yy" ++ case 317: // var: "SESSIONID" ++#line 2491 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UserID()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::SessionID()); + } + #line 4609 "seclang-parser.cc" + break; + +- case 318: // var: "VARIABLE_STATUS" +-#line 2493 "seclang-parser.yy" ++ case 318: // var: "UNIQUE_ID" ++#line 2495 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UniqueID()); + } + #line 4617 "seclang-parser.cc" + break; + +- case 319: // var: "VARIABLE_STATUS_LINE" +-#line 2497 "seclang-parser.yy" ++ case 319: // var: "URLENCODED_ERROR" ++#line 2499 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UrlEncodedError()); + } + #line 4625 "seclang-parser.cc" + break; + +- case 320: // var: "WEBAPPID" +-#line 2501 "seclang-parser.yy" ++ case 320: // var: "USERID" ++#line 2503 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::WebAppId()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UserID()); + } + #line 4633 "seclang-parser.cc" + break; + +- case 321: // var: "RUN_TIME_VAR_DUR" +-#line 2505 "seclang-parser.yy" ++ case 321: // var: "VARIABLE_STATUS" ++#line 2507 "seclang-parser.yy" ++ { ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ } ++#line 4641 "seclang-parser.cc" ++ break; ++ ++ case 322: // var: "VARIABLE_STATUS_LINE" ++#line 2511 "seclang-parser.yy" ++ { ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ } ++#line 4649 "seclang-parser.cc" ++ break; ++ ++ case 323: // var: "WEBAPPID" ++#line 2515 "seclang-parser.yy" ++ { ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::WebAppId()); ++ } ++#line 4657 "seclang-parser.cc" ++ break; ++ ++ case 324: // var: "RUN_TIME_VAR_DUR" ++#line 2519 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new Duration(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4644 "seclang-parser.cc" ++#line 4668 "seclang-parser.cc" + break; + +- case 322: // var: "RUN_TIME_VAR_BLD" +-#line 2513 "seclang-parser.yy" ++ case 325: // var: "RUN_TIME_VAR_BLD" ++#line 2527 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new ModsecBuild(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4655 "seclang-parser.cc" ++#line 4679 "seclang-parser.cc" + break; + +- case 323: // var: "RUN_TIME_VAR_HSV" +-#line 2520 "seclang-parser.yy" ++ case 326: // var: "RUN_TIME_VAR_HSV" ++#line 2534 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new HighestSeverity(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4666 "seclang-parser.cc" ++#line 4690 "seclang-parser.cc" + break; + +- case 324: // var: "RUN_TIME_VAR_REMOTE_USER" +-#line 2527 "seclang-parser.yy" ++ case 327: // var: "RUN_TIME_VAR_REMOTE_USER" ++#line 2541 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new RemoteUser(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4677 "seclang-parser.cc" ++#line 4701 "seclang-parser.cc" + break; + +- case 325: // var: "RUN_TIME_VAR_TIME" +-#line 2534 "seclang-parser.yy" ++ case 328: // var: "RUN_TIME_VAR_TIME" ++#line 2548 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new Time(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4688 "seclang-parser.cc" ++#line 4712 "seclang-parser.cc" + break; + +- case 326: // var: "RUN_TIME_VAR_TIME_DAY" +-#line 2541 "seclang-parser.yy" ++ case 329: // var: "RUN_TIME_VAR_TIME_DAY" ++#line 2555 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeDay(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4699 "seclang-parser.cc" ++#line 4723 "seclang-parser.cc" + break; + +- case 327: // var: "RUN_TIME_VAR_TIME_EPOCH" +-#line 2548 "seclang-parser.yy" ++ case 330: // var: "RUN_TIME_VAR_TIME_EPOCH" ++#line 2562 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeEpoch(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4710 "seclang-parser.cc" ++#line 4734 "seclang-parser.cc" + break; + +- case 328: // var: "RUN_TIME_VAR_TIME_HOUR" +-#line 2555 "seclang-parser.yy" ++ case 331: // var: "RUN_TIME_VAR_TIME_HOUR" ++#line 2569 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeHour(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4721 "seclang-parser.cc" ++#line 4745 "seclang-parser.cc" + break; + +- case 329: // var: "RUN_TIME_VAR_TIME_MIN" +-#line 2562 "seclang-parser.yy" ++ case 332: // var: "RUN_TIME_VAR_TIME_MIN" ++#line 2576 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeMin(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4732 "seclang-parser.cc" ++#line 4756 "seclang-parser.cc" + break; + +- case 330: // var: "RUN_TIME_VAR_TIME_MON" +-#line 2569 "seclang-parser.yy" ++ case 333: // var: "RUN_TIME_VAR_TIME_MON" ++#line 2583 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeMon(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4743 "seclang-parser.cc" ++#line 4767 "seclang-parser.cc" + break; + +- case 331: // var: "RUN_TIME_VAR_TIME_SEC" +-#line 2576 "seclang-parser.yy" ++ case 334: // var: "RUN_TIME_VAR_TIME_SEC" ++#line 2590 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeSec(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4754 "seclang-parser.cc" ++#line 4778 "seclang-parser.cc" + break; + +- case 332: // var: "RUN_TIME_VAR_TIME_WDAY" +-#line 2583 "seclang-parser.yy" ++ case 335: // var: "RUN_TIME_VAR_TIME_WDAY" ++#line 2597 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeWDay(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4765 "seclang-parser.cc" ++#line 4789 "seclang-parser.cc" + break; + +- case 333: // var: "RUN_TIME_VAR_TIME_YEAR" +-#line 2590 "seclang-parser.yy" ++ case 336: // var: "RUN_TIME_VAR_TIME_YEAR" ++#line 2604 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeYear(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4776 "seclang-parser.cc" ++#line 4800 "seclang-parser.cc" + break; + +- case 334: // act: "Accuracy" +-#line 2600 "seclang-parser.yy" ++ case 337: // act: "Accuracy" ++#line 2614 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Accuracy(yystack_[0].value.as < std::string > ())); + } +-#line 4784 "seclang-parser.cc" ++#line 4808 "seclang-parser.cc" + break; + +- case 335: // act: "Allow" +-#line 2604 "seclang-parser.yy" ++ case 338: // act: "Allow" ++#line 2618 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Allow(yystack_[0].value.as < std::string > ())); + } +-#line 4792 "seclang-parser.cc" ++#line 4816 "seclang-parser.cc" + break; + +- case 336: // act: "Append" +-#line 2608 "seclang-parser.yy" ++ case 339: // act: "Append" ++#line 2622 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Append", yystack_[1].location); + } +-#line 4800 "seclang-parser.cc" ++#line 4824 "seclang-parser.cc" + break; + +- case 337: // act: "AuditLog" +-#line 2612 "seclang-parser.yy" ++ case 340: // act: "AuditLog" ++#line 2626 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::AuditLog(yystack_[0].value.as < std::string > ())); + } +-#line 4808 "seclang-parser.cc" ++#line 4832 "seclang-parser.cc" + break; + +- case 338: // act: "Block" +-#line 2616 "seclang-parser.yy" ++ case 341: // act: "Block" ++#line 2630 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Block(yystack_[0].value.as < std::string > ())); + } +-#line 4816 "seclang-parser.cc" ++#line 4840 "seclang-parser.cc" + break; + +- case 339: // act: "Capture" +-#line 2620 "seclang-parser.yy" ++ case 342: // act: "Capture" ++#line 2634 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Capture(yystack_[0].value.as < std::string > ())); + } +-#line 4824 "seclang-parser.cc" ++#line 4848 "seclang-parser.cc" + break; + +- case 340: // act: "Chain" +-#line 2624 "seclang-parser.yy" ++ case 343: // act: "Chain" ++#line 2638 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Chain(yystack_[0].value.as < std::string > ())); + } +-#line 4832 "seclang-parser.cc" ++#line 4856 "seclang-parser.cc" + break; + +- case 341: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_ON" +-#line 2628 "seclang-parser.yy" ++ case 344: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_ON" ++#line 2642 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditEngine("ctl:auditengine=on")); + driver.m_auditLog->setCtlAuditEngineActive(); + } +-#line 4841 "seclang-parser.cc" ++#line 4865 "seclang-parser.cc" + break; + +- case 342: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_OFF" +-#line 2633 "seclang-parser.yy" ++ case 345: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_OFF" ++#line 2647 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditEngine("ctl:auditengine=off")); + } +-#line 4849 "seclang-parser.cc" ++#line 4873 "seclang-parser.cc" + break; + +- case 343: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_RELEVANT_ONLY" +-#line 2637 "seclang-parser.yy" ++ case 346: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_RELEVANT_ONLY" ++#line 2651 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditEngine("ctl:auditengine=relevantonly")); + driver.m_auditLog->setCtlAuditEngineActive(); + } +-#line 4858 "seclang-parser.cc" ++#line 4882 "seclang-parser.cc" + break; + +- case 344: // act: "ACTION_CTL_AUDIT_LOG_PARTS" +-#line 2642 "seclang-parser.yy" ++ case 347: // act: "ACTION_CTL_AUDIT_LOG_PARTS" ++#line 2656 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditLogParts(yystack_[0].value.as < std::string > ())); + } +-#line 4866 "seclang-parser.cc" ++#line 4890 "seclang-parser.cc" + break; + +- case 345: // act: "ACTION_CTL_BDY_JSON" +-#line 2646 "seclang-parser.yy" ++ case 348: // act: "ACTION_CTL_BDY_JSON" ++#line 2660 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyProcessorJSON(yystack_[0].value.as < std::string > ())); + } +-#line 4874 "seclang-parser.cc" ++#line 4898 "seclang-parser.cc" + break; + +- case 346: // act: "ACTION_CTL_BDY_XML" +-#line 2650 "seclang-parser.yy" ++ case 349: // act: "ACTION_CTL_BDY_XML" ++#line 2664 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyProcessorXML(yystack_[0].value.as < std::string > ())); + } +-#line 4882 "seclang-parser.cc" ++#line 4906 "seclang-parser.cc" + break; + +- case 347: // act: "ACTION_CTL_BDY_URLENCODED" +-#line 2654 "seclang-parser.yy" ++ case 350: // act: "ACTION_CTL_BDY_URLENCODED" ++#line 2668 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyProcessorURLENCODED(yystack_[0].value.as < std::string > ())); + } +-#line 4890 "seclang-parser.cc" ++#line 4914 "seclang-parser.cc" + break; + +- case 348: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_ON" +-#line 2658 "seclang-parser.yy" ++ case 351: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_ON" ++#line 2672 "seclang-parser.yy" + { + //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0); + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Action(yystack_[1].value.as < std::string > ())); + } +-#line 4899 "seclang-parser.cc" ++#line 4923 "seclang-parser.cc" + break; + +- case 349: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_OFF" +-#line 2663 "seclang-parser.yy" ++ case 352: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_OFF" ++#line 2677 "seclang-parser.yy" + { + //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0); + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Action(yystack_[1].value.as < std::string > ())); + } +-#line 4908 "seclang-parser.cc" ++#line 4932 "seclang-parser.cc" + break; + +- case 350: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_ON" +-#line 2668 "seclang-parser.yy" ++ case 353: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_ON" ++#line 2682 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyAccess(yystack_[1].value.as < std::string > () + "true")); + } +-#line 4916 "seclang-parser.cc" ++#line 4940 "seclang-parser.cc" + break; + +- case 351: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_OFF" +-#line 2672 "seclang-parser.yy" ++ case 354: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_OFF" ++#line 2686 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyAccess(yystack_[1].value.as < std::string > () + "false")); + } +-#line 4924 "seclang-parser.cc" ++#line 4948 "seclang-parser.cc" + break; + +- case 352: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_ON" +-#line 2676 "seclang-parser.yy" ++ case 355: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_ON" ++#line 2690 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=on")); + } +-#line 4932 "seclang-parser.cc" ++#line 4956 "seclang-parser.cc" + break; + +- case 353: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_OFF" +-#line 2680 "seclang-parser.yy" ++ case 356: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_OFF" ++#line 2694 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=off")); + } +-#line 4940 "seclang-parser.cc" ++#line 4964 "seclang-parser.cc" + break; + +- case 354: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_DETC" +-#line 2684 "seclang-parser.yy" ++ case 357: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_DETC" ++#line 2698 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=detectiononly")); + } +-#line 4948 "seclang-parser.cc" ++#line 4972 "seclang-parser.cc" + break; + +- case 355: // act: "ACTION_CTL_RULE_REMOVE_BY_ID" +-#line 2688 "seclang-parser.yy" ++ case 358: // act: "ACTION_CTL_RULE_REMOVE_BY_ID" ++#line 2702 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveById(yystack_[0].value.as < std::string > ())); + } +-#line 4956 "seclang-parser.cc" ++#line 4980 "seclang-parser.cc" + break; + +- case 356: // act: "ACTION_CTL_RULE_REMOVE_BY_TAG" +-#line 2692 "seclang-parser.yy" ++ case 359: // act: "ACTION_CTL_RULE_REMOVE_BY_TAG" ++#line 2706 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveByTag(yystack_[0].value.as < std::string > ())); + } +-#line 4964 "seclang-parser.cc" ++#line 4988 "seclang-parser.cc" + break; + +- case 357: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" +-#line 2696 "seclang-parser.yy" ++ case 360: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" ++#line 2710 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveTargetById(yystack_[0].value.as < std::string > ())); + } +-#line 4972 "seclang-parser.cc" ++#line 4996 "seclang-parser.cc" + break; + +- case 358: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" +-#line 2700 "seclang-parser.yy" ++ case 361: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" ++#line 2714 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveTargetByTag(yystack_[0].value.as < std::string > ())); + } +-#line 4980 "seclang-parser.cc" ++#line 5004 "seclang-parser.cc" + break; + +- case 359: // act: "Deny" +-#line 2704 "seclang-parser.yy" ++ case 362: // act: "Deny" ++#line 2718 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Deny(yystack_[0].value.as < std::string > ())); + } +-#line 4988 "seclang-parser.cc" ++#line 5012 "seclang-parser.cc" + break; + +- case 360: // act: "DeprecateVar" +-#line 2708 "seclang-parser.yy" ++ case 363: // act: "DeprecateVar" ++#line 2722 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("DeprecateVar", yystack_[1].location); + } +-#line 4996 "seclang-parser.cc" ++#line 5020 "seclang-parser.cc" + break; + +- case 361: // act: "Drop" +-#line 2712 "seclang-parser.yy" ++ case 364: // act: "Drop" ++#line 2726 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Drop(yystack_[0].value.as < std::string > ())); + } +-#line 5004 "seclang-parser.cc" ++#line 5028 "seclang-parser.cc" + break; + +- case 362: // act: "Exec" +-#line 2716 "seclang-parser.yy" ++ case 365: // act: "Exec" ++#line 2730 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Exec(yystack_[0].value.as < std::string > ())); + } +-#line 5012 "seclang-parser.cc" ++#line 5036 "seclang-parser.cc" + break; + +- case 363: // act: "ExpireVar" +-#line 2720 "seclang-parser.yy" ++ case 366: // act: "ExpireVar" ++#line 2734 "seclang-parser.yy" + { + //ACTION_NOT_SUPPORTED("ExpireVar", @0); + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Action(yystack_[0].value.as < std::string > ())); + } +-#line 5021 "seclang-parser.cc" ++#line 5045 "seclang-parser.cc" + break; + +- case 364: // act: "Id" +-#line 2725 "seclang-parser.yy" ++ case 367: // act: "Id" ++#line 2739 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::RuleId(yystack_[0].value.as < std::string > ())); + } +-#line 5029 "seclang-parser.cc" ++#line 5053 "seclang-parser.cc" + break; + +- case 365: // act: "InitCol" run_time_string +-#line 2729 "seclang-parser.yy" ++ case 368: // act: "InitCol" run_time_string ++#line 2743 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::InitCol(yystack_[1].value.as < std::string > (), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5037 "seclang-parser.cc" ++#line 5061 "seclang-parser.cc" + break; + +- case 366: // act: "LogData" run_time_string +-#line 2733 "seclang-parser.yy" ++ case 369: // act: "LogData" run_time_string ++#line 2747 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::LogData(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5045 "seclang-parser.cc" ++#line 5069 "seclang-parser.cc" + break; + +- case 367: // act: "Log" +-#line 2737 "seclang-parser.yy" ++ case 370: // act: "Log" ++#line 2751 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Log(yystack_[0].value.as < std::string > ())); + } +-#line 5053 "seclang-parser.cc" ++#line 5077 "seclang-parser.cc" + break; + +- case 368: // act: "Maturity" +-#line 2741 "seclang-parser.yy" ++ case 371: // act: "Maturity" ++#line 2755 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Maturity(yystack_[0].value.as < std::string > ())); + } +-#line 5061 "seclang-parser.cc" ++#line 5085 "seclang-parser.cc" + break; + +- case 369: // act: "Msg" run_time_string +-#line 2745 "seclang-parser.yy" ++ case 372: // act: "Msg" run_time_string ++#line 2759 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Msg(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5069 "seclang-parser.cc" ++#line 5093 "seclang-parser.cc" + break; + +- case 370: // act: "MultiMatch" +-#line 2749 "seclang-parser.yy" ++ case 373: // act: "MultiMatch" ++#line 2763 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::MultiMatch(yystack_[0].value.as < std::string > ())); + } +-#line 5077 "seclang-parser.cc" ++#line 5101 "seclang-parser.cc" + break; + +- case 371: // act: "NoAuditLog" +-#line 2753 "seclang-parser.yy" ++ case 374: // act: "NoAuditLog" ++#line 2767 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::NoAuditLog(yystack_[0].value.as < std::string > ())); + } +-#line 5085 "seclang-parser.cc" ++#line 5109 "seclang-parser.cc" + break; + +- case 372: // act: "NoLog" +-#line 2757 "seclang-parser.yy" ++ case 375: // act: "NoLog" ++#line 2771 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::NoLog(yystack_[0].value.as < std::string > ())); + } +-#line 5093 "seclang-parser.cc" ++#line 5117 "seclang-parser.cc" + break; + +- case 373: // act: "Pass" +-#line 2761 "seclang-parser.yy" ++ case 376: // act: "Pass" ++#line 2775 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Pass(yystack_[0].value.as < std::string > ())); + } +-#line 5101 "seclang-parser.cc" ++#line 5125 "seclang-parser.cc" + break; + +- case 374: // act: "Pause" +-#line 2765 "seclang-parser.yy" ++ case 377: // act: "Pause" ++#line 2779 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Pause", yystack_[1].location); + } +-#line 5109 "seclang-parser.cc" ++#line 5133 "seclang-parser.cc" + break; + +- case 375: // act: "Phase" +-#line 2769 "seclang-parser.yy" ++ case 378: // act: "Phase" ++#line 2783 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Phase(yystack_[0].value.as < std::string > ())); + } +-#line 5117 "seclang-parser.cc" ++#line 5141 "seclang-parser.cc" + break; + +- case 376: // act: "Prepend" +-#line 2773 "seclang-parser.yy" ++ case 379: // act: "Prepend" ++#line 2787 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Prepend", yystack_[1].location); + } +-#line 5125 "seclang-parser.cc" ++#line 5149 "seclang-parser.cc" + break; + +- case 377: // act: "Proxy" +-#line 2777 "seclang-parser.yy" ++ case 380: // act: "Proxy" ++#line 2791 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Proxy", yystack_[1].location); + } +-#line 5133 "seclang-parser.cc" ++#line 5157 "seclang-parser.cc" + break; + +- case 378: // act: "Redirect" run_time_string +-#line 2781 "seclang-parser.yy" ++ case 381: // act: "Redirect" run_time_string ++#line 2795 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Redirect(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5141 "seclang-parser.cc" ++#line 5165 "seclang-parser.cc" + break; + +- case 379: // act: "Rev" +-#line 2785 "seclang-parser.yy" ++ case 382: // act: "Rev" ++#line 2799 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Rev(yystack_[0].value.as < std::string > ())); + } +-#line 5149 "seclang-parser.cc" ++#line 5173 "seclang-parser.cc" + break; + +- case 380: // act: "SanitiseArg" +-#line 2789 "seclang-parser.yy" ++ case 383: // act: "SanitiseArg" ++#line 2803 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseArg", yystack_[1].location); + } +-#line 5157 "seclang-parser.cc" ++#line 5181 "seclang-parser.cc" + break; + +- case 381: // act: "SanitiseMatched" +-#line 2793 "seclang-parser.yy" ++ case 384: // act: "SanitiseMatched" ++#line 2807 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseMatched", yystack_[1].location); + } +-#line 5165 "seclang-parser.cc" ++#line 5189 "seclang-parser.cc" + break; + +- case 382: // act: "SanitiseMatchedBytes" +-#line 2797 "seclang-parser.yy" ++ case 385: // act: "SanitiseMatchedBytes" ++#line 2811 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseMatchedBytes", yystack_[1].location); + } +-#line 5173 "seclang-parser.cc" ++#line 5197 "seclang-parser.cc" + break; + +- case 383: // act: "SanitiseRequestHeader" +-#line 2801 "seclang-parser.yy" ++ case 386: // act: "SanitiseRequestHeader" ++#line 2815 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseRequestHeader", yystack_[1].location); + } +-#line 5181 "seclang-parser.cc" ++#line 5205 "seclang-parser.cc" + break; + +- case 384: // act: "SanitiseResponseHeader" +-#line 2805 "seclang-parser.yy" ++ case 387: // act: "SanitiseResponseHeader" ++#line 2819 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseResponseHeader", yystack_[1].location); + } +-#line 5189 "seclang-parser.cc" ++#line 5213 "seclang-parser.cc" + break; + +- case 385: // act: "SetEnv" run_time_string +-#line 2809 "seclang-parser.yy" ++ case 388: // act: "SetEnv" run_time_string ++#line 2823 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetENV(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5197 "seclang-parser.cc" ++#line 5221 "seclang-parser.cc" + break; + +- case 386: // act: "SetRsc" run_time_string +-#line 2813 "seclang-parser.yy" ++ case 389: // act: "SetRsc" run_time_string ++#line 2827 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetRSC(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5205 "seclang-parser.cc" ++#line 5229 "seclang-parser.cc" + break; + +- case 387: // act: "SetSid" run_time_string +-#line 2817 "seclang-parser.yy" ++ case 390: // act: "SetSid" run_time_string ++#line 2831 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetSID(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5213 "seclang-parser.cc" ++#line 5237 "seclang-parser.cc" + break; + +- case 388: // act: "SetUID" run_time_string +-#line 2821 "seclang-parser.yy" ++ case 391: // act: "SetUID" run_time_string ++#line 2835 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetUID(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5221 "seclang-parser.cc" ++#line 5245 "seclang-parser.cc" + break; + +- case 389: // act: "SetVar" setvar_action +-#line 2825 "seclang-parser.yy" ++ case 392: // act: "SetVar" setvar_action ++#line 2839 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[0].value.as < std::unique_ptr > ()); + } +-#line 5229 "seclang-parser.cc" ++#line 5253 "seclang-parser.cc" + break; + +- case 390: // act: "Severity" +-#line 2829 "seclang-parser.yy" ++ case 393: // act: "Severity" ++#line 2843 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Severity(yystack_[0].value.as < std::string > ())); + } +-#line 5237 "seclang-parser.cc" ++#line 5261 "seclang-parser.cc" + break; + +- case 391: // act: "Skip" +-#line 2833 "seclang-parser.yy" ++ case 394: // act: "Skip" ++#line 2847 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Skip(yystack_[0].value.as < std::string > ())); + } +-#line 5245 "seclang-parser.cc" ++#line 5269 "seclang-parser.cc" + break; + +- case 392: // act: "SkipAfter" +-#line 2837 "seclang-parser.yy" ++ case 395: // act: "SkipAfter" ++#line 2851 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SkipAfter(yystack_[0].value.as < std::string > ())); + } +-#line 5253 "seclang-parser.cc" ++#line 5277 "seclang-parser.cc" + break; + +- case 393: // act: "Status" +-#line 2841 "seclang-parser.yy" ++ case 396: // act: "Status" ++#line 2855 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::data::Status(yystack_[0].value.as < std::string > ())); + } +-#line 5261 "seclang-parser.cc" ++#line 5285 "seclang-parser.cc" + break; + +- case 394: // act: "Tag" run_time_string +-#line 2845 "seclang-parser.yy" ++ case 397: // act: "Tag" run_time_string ++#line 2859 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Tag(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5269 "seclang-parser.cc" ++#line 5293 "seclang-parser.cc" + break; + +- case 395: // act: "Ver" +-#line 2849 "seclang-parser.yy" ++ case 398: // act: "Ver" ++#line 2863 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Ver(yystack_[0].value.as < std::string > ())); + } +-#line 5277 "seclang-parser.cc" ++#line 5301 "seclang-parser.cc" + break; + +- case 396: // act: "xmlns" +-#line 2853 "seclang-parser.yy" ++ case 399: // act: "xmlns" ++#line 2867 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::XmlNS(yystack_[0].value.as < std::string > ())); + } +-#line 5285 "seclang-parser.cc" ++#line 5309 "seclang-parser.cc" + break; + +- case 397: // act: "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" +-#line 2857 "seclang-parser.yy" ++ case 400: // act: "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" ++#line 2871 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ParityZero7bit(yystack_[0].value.as < std::string > ())); + } +-#line 5293 "seclang-parser.cc" ++#line 5317 "seclang-parser.cc" + break; + +- case 398: // act: "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" +-#line 2861 "seclang-parser.yy" ++ case 401: // act: "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" ++#line 2875 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ParityOdd7bit(yystack_[0].value.as < std::string > ())); + } +-#line 5301 "seclang-parser.cc" ++#line 5325 "seclang-parser.cc" + break; + +- case 399: // act: "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" +-#line 2865 "seclang-parser.yy" ++ case 402: // act: "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" ++#line 2879 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ParityEven7bit(yystack_[0].value.as < std::string > ())); + } +-#line 5309 "seclang-parser.cc" ++#line 5333 "seclang-parser.cc" + break; + +- case 400: // act: "ACTION_TRANSFORMATION_SQL_HEX_DECODE" +-#line 2869 "seclang-parser.yy" ++ case 403: // act: "ACTION_TRANSFORMATION_SQL_HEX_DECODE" ++#line 2883 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::SqlHexDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5317 "seclang-parser.cc" ++#line 5341 "seclang-parser.cc" + break; + +- case 401: // act: "ACTION_TRANSFORMATION_BASE_64_ENCODE" +-#line 2873 "seclang-parser.yy" ++ case 404: // act: "ACTION_TRANSFORMATION_BASE_64_ENCODE" ++#line 2887 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Base64Encode(yystack_[0].value.as < std::string > ())); + } +-#line 5325 "seclang-parser.cc" ++#line 5349 "seclang-parser.cc" + break; + +- case 402: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE" +-#line 2877 "seclang-parser.yy" ++ case 405: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE" ++#line 2891 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Base64Decode(yystack_[0].value.as < std::string > ())); + } +-#line 5333 "seclang-parser.cc" ++#line 5357 "seclang-parser.cc" + break; + +- case 403: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" +-#line 2881 "seclang-parser.yy" ++ case 406: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" ++#line 2895 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Base64DecodeExt(yystack_[0].value.as < std::string > ())); + } +-#line 5341 "seclang-parser.cc" ++#line 5365 "seclang-parser.cc" + break; + +- case 404: // act: "ACTION_TRANSFORMATION_CMD_LINE" +-#line 2885 "seclang-parser.yy" ++ case 407: // act: "ACTION_TRANSFORMATION_CMD_LINE" ++#line 2899 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::CmdLine(yystack_[0].value.as < std::string > ())); + } +-#line 5349 "seclang-parser.cc" ++#line 5373 "seclang-parser.cc" + break; + +- case 405: // act: "ACTION_TRANSFORMATION_SHA1" +-#line 2889 "seclang-parser.yy" ++ case 408: // act: "ACTION_TRANSFORMATION_SHA1" ++#line 2903 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Sha1(yystack_[0].value.as < std::string > ())); + } +-#line 5357 "seclang-parser.cc" ++#line 5381 "seclang-parser.cc" + break; + +- case 406: // act: "ACTION_TRANSFORMATION_MD5" +-#line 2893 "seclang-parser.yy" ++ case 409: // act: "ACTION_TRANSFORMATION_MD5" ++#line 2907 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Md5(yystack_[0].value.as < std::string > ())); + } +-#line 5365 "seclang-parser.cc" ++#line 5389 "seclang-parser.cc" + break; + +- case 407: // act: "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" +-#line 2897 "seclang-parser.yy" ++ case 410: // act: "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" ++#line 2911 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::EscapeSeqDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5373 "seclang-parser.cc" ++#line 5397 "seclang-parser.cc" + break; + +- case 408: // act: "ACTION_TRANSFORMATION_HEX_ENCODE" +-#line 2901 "seclang-parser.yy" ++ case 411: // act: "ACTION_TRANSFORMATION_HEX_ENCODE" ++#line 2915 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::HexEncode(yystack_[0].value.as < std::string > ())); + } +-#line 5381 "seclang-parser.cc" ++#line 5405 "seclang-parser.cc" + break; + +- case 409: // act: "ACTION_TRANSFORMATION_HEX_DECODE" +-#line 2905 "seclang-parser.yy" ++ case 412: // act: "ACTION_TRANSFORMATION_HEX_DECODE" ++#line 2919 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::HexDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5389 "seclang-parser.cc" ++#line 5413 "seclang-parser.cc" + break; + +- case 410: // act: "ACTION_TRANSFORMATION_LOWERCASE" +-#line 2909 "seclang-parser.yy" ++ case 413: // act: "ACTION_TRANSFORMATION_LOWERCASE" ++#line 2923 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::LowerCase(yystack_[0].value.as < std::string > ())); + } +-#line 5397 "seclang-parser.cc" ++#line 5421 "seclang-parser.cc" + break; + +- case 411: // act: "ACTION_TRANSFORMATION_UPPERCASE" +-#line 2913 "seclang-parser.yy" ++ case 414: // act: "ACTION_TRANSFORMATION_UPPERCASE" ++#line 2927 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UpperCase(yystack_[0].value.as < std::string > ())); + } +-#line 5405 "seclang-parser.cc" ++#line 5429 "seclang-parser.cc" + break; + +- case 412: // act: "ACTION_TRANSFORMATION_URL_DECODE_UNI" +-#line 2917 "seclang-parser.yy" ++ case 415: // act: "ACTION_TRANSFORMATION_URL_DECODE_UNI" ++#line 2931 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UrlDecodeUni(yystack_[0].value.as < std::string > ())); + } +-#line 5413 "seclang-parser.cc" ++#line 5437 "seclang-parser.cc" + break; + +- case 413: // act: "ACTION_TRANSFORMATION_URL_DECODE" +-#line 2921 "seclang-parser.yy" ++ case 416: // act: "ACTION_TRANSFORMATION_URL_DECODE" ++#line 2935 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UrlDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5421 "seclang-parser.cc" ++#line 5445 "seclang-parser.cc" + break; + +- case 414: // act: "ACTION_TRANSFORMATION_URL_ENCODE" +-#line 2925 "seclang-parser.yy" ++ case 417: // act: "ACTION_TRANSFORMATION_URL_ENCODE" ++#line 2939 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UrlEncode(yystack_[0].value.as < std::string > ())); + } +-#line 5429 "seclang-parser.cc" ++#line 5453 "seclang-parser.cc" + break; + +- case 415: // act: "ACTION_TRANSFORMATION_NONE" +-#line 2929 "seclang-parser.yy" ++ case 418: // act: "ACTION_TRANSFORMATION_NONE" ++#line 2943 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::None(yystack_[0].value.as < std::string > ())); + } +-#line 5437 "seclang-parser.cc" ++#line 5461 "seclang-parser.cc" + break; + +- case 416: // act: "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" +-#line 2933 "seclang-parser.yy" ++ case 419: // act: "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" ++#line 2947 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::CompressWhitespace(yystack_[0].value.as < std::string > ())); + } +-#line 5445 "seclang-parser.cc" ++#line 5469 "seclang-parser.cc" + break; + +- case 417: // act: "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" +-#line 2937 "seclang-parser.yy" ++ case 420: // act: "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" ++#line 2951 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveWhitespace(yystack_[0].value.as < std::string > ())); + } +-#line 5453 "seclang-parser.cc" ++#line 5477 "seclang-parser.cc" + break; + +- case 418: // act: "ACTION_TRANSFORMATION_REPLACE_NULLS" +-#line 2941 "seclang-parser.yy" ++ case 421: // act: "ACTION_TRANSFORMATION_REPLACE_NULLS" ++#line 2955 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ReplaceNulls(yystack_[0].value.as < std::string > ())); + } +-#line 5461 "seclang-parser.cc" ++#line 5485 "seclang-parser.cc" + break; + +- case 419: // act: "ACTION_TRANSFORMATION_REMOVE_NULLS" +-#line 2945 "seclang-parser.yy" ++ case 422: // act: "ACTION_TRANSFORMATION_REMOVE_NULLS" ++#line 2959 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveNulls(yystack_[0].value.as < std::string > ())); + } +-#line 5469 "seclang-parser.cc" ++#line 5493 "seclang-parser.cc" + break; + +- case 420: // act: "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" +-#line 2949 "seclang-parser.yy" ++ case 423: // act: "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" ++#line 2963 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::HtmlEntityDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5477 "seclang-parser.cc" ++#line 5501 "seclang-parser.cc" + break; + +- case 421: // act: "ACTION_TRANSFORMATION_JS_DECODE" +-#line 2953 "seclang-parser.yy" ++ case 424: // act: "ACTION_TRANSFORMATION_JS_DECODE" ++#line 2967 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::JsDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5485 "seclang-parser.cc" ++#line 5509 "seclang-parser.cc" + break; + +- case 422: // act: "ACTION_TRANSFORMATION_CSS_DECODE" +-#line 2957 "seclang-parser.yy" ++ case 425: // act: "ACTION_TRANSFORMATION_CSS_DECODE" ++#line 2971 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::CssDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5493 "seclang-parser.cc" ++#line 5517 "seclang-parser.cc" + break; + +- case 423: // act: "ACTION_TRANSFORMATION_TRIM" +-#line 2961 "seclang-parser.yy" ++ case 426: // act: "ACTION_TRANSFORMATION_TRIM" ++#line 2975 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Trim(yystack_[0].value.as < std::string > ())); + } +-#line 5501 "seclang-parser.cc" ++#line 5525 "seclang-parser.cc" + break; + +- case 424: // act: "ACTION_TRANSFORMATION_TRIM_LEFT" +-#line 2965 "seclang-parser.yy" ++ case 427: // act: "ACTION_TRANSFORMATION_TRIM_LEFT" ++#line 2979 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::TrimLeft(yystack_[0].value.as < std::string > ())); + } +-#line 5509 "seclang-parser.cc" ++#line 5533 "seclang-parser.cc" + break; + +- case 425: // act: "ACTION_TRANSFORMATION_TRIM_RIGHT" +-#line 2969 "seclang-parser.yy" ++ case 428: // act: "ACTION_TRANSFORMATION_TRIM_RIGHT" ++#line 2983 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::TrimRight(yystack_[0].value.as < std::string > ())); + } +-#line 5517 "seclang-parser.cc" ++#line 5541 "seclang-parser.cc" + break; + +- case 426: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" +-#line 2973 "seclang-parser.yy" ++ case 429: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" ++#line 2987 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::NormalisePathWin(yystack_[0].value.as < std::string > ())); + } +-#line 5525 "seclang-parser.cc" ++#line 5549 "seclang-parser.cc" + break; + +- case 427: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH" +-#line 2977 "seclang-parser.yy" ++ case 430: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH" ++#line 2991 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::NormalisePath(yystack_[0].value.as < std::string > ())); + } +-#line 5533 "seclang-parser.cc" ++#line 5557 "seclang-parser.cc" + break; + +- case 428: // act: "ACTION_TRANSFORMATION_LENGTH" +-#line 2981 "seclang-parser.yy" ++ case 431: // act: "ACTION_TRANSFORMATION_LENGTH" ++#line 2995 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Length(yystack_[0].value.as < std::string > ())); + } +-#line 5541 "seclang-parser.cc" ++#line 5565 "seclang-parser.cc" + break; + +- case 429: // act: "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" +-#line 2985 "seclang-parser.yy" ++ case 432: // act: "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" ++#line 2999 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Utf8ToUnicode(yystack_[0].value.as < std::string > ())); + } +-#line 5549 "seclang-parser.cc" ++#line 5573 "seclang-parser.cc" + break; + +- case 430: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" +-#line 2989 "seclang-parser.yy" ++ case 433: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" ++#line 3003 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveCommentsChar(yystack_[0].value.as < std::string > ())); + } +-#line 5557 "seclang-parser.cc" ++#line 5581 "seclang-parser.cc" + break; + +- case 431: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS" +-#line 2993 "seclang-parser.yy" ++ case 434: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS" ++#line 3007 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveComments(yystack_[0].value.as < std::string > ())); + } +-#line 5565 "seclang-parser.cc" ++#line 5589 "seclang-parser.cc" + break; + +- case 432: // act: "ACTION_TRANSFORMATION_REPLACE_COMMENTS" +-#line 2997 "seclang-parser.yy" ++ case 435: // act: "ACTION_TRANSFORMATION_REPLACE_COMMENTS" ++#line 3011 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ReplaceComments(yystack_[0].value.as < std::string > ())); + } +-#line 5573 "seclang-parser.cc" ++#line 5597 "seclang-parser.cc" + break; + +- case 433: // setvar_action: "NOT" var +-#line 3004 "seclang-parser.yy" ++ case 436: // setvar_action: "NOT" var ++#line 3018 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::unsetOperation, std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5581 "seclang-parser.cc" ++#line 5605 "seclang-parser.cc" + break; + +- case 434: // setvar_action: var +-#line 3008 "seclang-parser.yy" ++ case 437: // setvar_action: var ++#line 3022 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::setToOneOperation, std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5589 "seclang-parser.cc" ++#line 5613 "seclang-parser.cc" + break; + +- case 435: // setvar_action: var SETVAR_OPERATION_EQUALS run_time_string +-#line 3012 "seclang-parser.yy" ++ case 438: // setvar_action: var SETVAR_OPERATION_EQUALS run_time_string ++#line 3026 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::setOperation, std::move(yystack_[2].value.as < std::unique_ptr > ()), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5597 "seclang-parser.cc" ++#line 5621 "seclang-parser.cc" + break; + +- case 436: // setvar_action: var SETVAR_OPERATION_EQUALS_PLUS run_time_string +-#line 3016 "seclang-parser.yy" ++ case 439: // setvar_action: var SETVAR_OPERATION_EQUALS_PLUS run_time_string ++#line 3030 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::sumAndSetOperation, std::move(yystack_[2].value.as < std::unique_ptr > ()), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5605 "seclang-parser.cc" ++#line 5629 "seclang-parser.cc" + break; + +- case 437: // setvar_action: var SETVAR_OPERATION_EQUALS_MINUS run_time_string +-#line 3020 "seclang-parser.yy" ++ case 440: // setvar_action: var SETVAR_OPERATION_EQUALS_MINUS run_time_string ++#line 3034 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::substractAndSetOperation, std::move(yystack_[2].value.as < std::unique_ptr > ()), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5613 "seclang-parser.cc" ++#line 5637 "seclang-parser.cc" + break; + +- case 438: // run_time_string: run_time_string "FREE_TEXT_QUOTE_MACRO_EXPANSION" +-#line 3027 "seclang-parser.yy" ++ case 441: // run_time_string: run_time_string "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++#line 3041 "seclang-parser.yy" + { + yystack_[1].value.as < std::unique_ptr > ()->appendText(yystack_[0].value.as < std::string > ()); + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[1].value.as < std::unique_ptr > ()); + } +-#line 5622 "seclang-parser.cc" ++#line 5646 "seclang-parser.cc" + break; + +- case 439: // run_time_string: run_time_string var +-#line 3032 "seclang-parser.yy" ++ case 442: // run_time_string: run_time_string var ++#line 3046 "seclang-parser.yy" + { + yystack_[1].value.as < std::unique_ptr > ()->appendVar(std::move(yystack_[0].value.as < std::unique_ptr > ())); + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[1].value.as < std::unique_ptr > ()); + } +-#line 5631 "seclang-parser.cc" ++#line 5655 "seclang-parser.cc" + break; + +- case 440: // run_time_string: "FREE_TEXT_QUOTE_MACRO_EXPANSION" +-#line 3037 "seclang-parser.yy" ++ case 443: // run_time_string: "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++#line 3051 "seclang-parser.yy" + { + std::unique_ptr r(new RunTimeString()); + r->appendText(yystack_[0].value.as < std::string > ()); + yylhs.value.as < std::unique_ptr > () = std::move(r); + } +-#line 5641 "seclang-parser.cc" ++#line 5665 "seclang-parser.cc" + break; + +- case 441: // run_time_string: var +-#line 3043 "seclang-parser.yy" ++ case 444: // run_time_string: var ++#line 3057 "seclang-parser.yy" + { + std::unique_ptr r(new RunTimeString()); + r->appendVar(std::move(yystack_[0].value.as < std::unique_ptr > ())); + yylhs.value.as < std::unique_ptr > () = std::move(r); + } +-#line 5651 "seclang-parser.cc" ++#line 5675 "seclang-parser.cc" + break; + + +-#line 5655 "seclang-parser.cc" ++#line 5679 "seclang-parser.cc" + + default: + break; +@@ -6000,66 +6024,67 @@ namespace yy { + } + + +- const short seclang_parser::yypact_ninf_ = -413; ++ const short seclang_parser::yypact_ninf_ = -402; + + const signed char seclang_parser::yytable_ninf_ = -1; + + const short + seclang_parser::yypact_[] = + { +- 2507, -413, -256, -413, -91, -413, -251, -413, -413, -413, +- -413, -413, -275, -413, -413, -413, -413, -413, -290, -413, +- -413, -413, -249, -158, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -155, +- -413, -413, -156, -413, -148, -413, -149, -144, -413, -283, +- 2855, 2855, -413, -413, -413, -413, -142, -300, -413, -413, +- -413, 1149, 1149, 1149, 2855, -269, -133, -413, -413, -413, +- -131, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- 1149, 2855, 2668, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, 2125, -261, -413, -413, -413, +- -413, -413, -413, -413, -267, -413, -413, -413, -413, -129, +- -127, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, 2219, -413, 2219, -413, 2219, -413, -413, -413, -413, +- -413, -413, -413, -413, 2219, -413, -413, -413, -413, -413, +- -413, 2219, 2219, 2219, 2219, -413, -413, -413, -413, 2219, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, 3038, -413, +- 2, -413, -413, -413, -413, -413, -413, 2550, 2550, -161, +- -159, -157, -154, -152, -150, -147, -145, -143, -140, -138, +- -136, -132, -130, -128, -126, -413, -124, -122, -120, -118, +- -413, -413, -116, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -114, -413, +- -413, -413, -413, -413, 49, -413, -413, -413, -112, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, 457, 546, 635, 969, 1058, -110, -108, 1482, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, 4, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, 1662, -413, -413, -413, -413, +- 2550, -53, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, 3, 3038, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, 2324, -413, -413, -413, -413, 2324, +- -413, -413, 2324, -413, -413, 2324, -413, -413, 2324, -413, +- -413, 2324, -413, -413, -413, -413, 8, 1573, 1993, 2219, +- 2219, 2219, -413, -413, 2219, 2219, 2219, -413, 2219, 2219, +- 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, +- 2219, 2219, 2219, 2219, -413, 2219, 2219, 2219, 2219, -413, +- -413, 2219, 2219, 2219, 2219, 2219, 2855, -413, 2324, -413, +- 2219, 2219, 2219, -413, -413, -413, -413, -413, 2550, 2550, +- -413, -413, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, -413, 2324, 2324, 2324, -413, -413 ++ 2776, -402, -277, -402, -100, -402, -157, -402, -402, -402, ++ -402, -402, -292, -402, -402, -402, -402, -402, -274, -402, ++ -402, -402, -155, -153, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -149, ++ -402, -402, -150, -402, -145, -402, -146, -135, -402, -284, ++ -90, -90, -402, -402, -402, -402, -133, -301, -402, -402, ++ -402, 1492, 1492, 1492, -90, -271, -131, -402, -402, -402, ++ -129, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ 1492, -90, 2920, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, 2340, -259, -402, -402, -402, ++ -402, -402, -402, -402, -265, -402, -402, -402, -402, -127, ++ -125, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, 2473, -402, 2473, -402, 2473, -402, -402, -402, -402, ++ -402, -402, -402, -402, 2473, -402, -402, -402, -402, -402, ++ -402, 2473, 2473, 2473, 2473, -402, -402, -402, -402, 2473, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, 3107, -402, ++ 2, -402, -402, -402, -402, -402, -402, 2672, 2672, -159, ++ -156, -154, -152, -148, -142, -140, -138, -134, -132, -130, ++ -128, -126, -124, -122, -120, -118, -402, -116, -114, -112, ++ -110, -402, -402, -108, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -104, ++ -402, -402, -402, -402, -402, 460, -402, -402, -402, -102, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, 550, 640, 975, 1065, 1155, -99, -97, 1584, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, 16, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, 2008, -402, -402, -402, ++ -402, 2672, -50, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 3, 3107, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, 2563, -402, -402, ++ -402, -402, 2563, -402, -402, 2563, -402, -402, 2563, -402, ++ -402, 2563, -402, -402, 2563, -402, -402, -402, -402, 8, ++ 1676, 2141, 2473, 2473, 2473, -402, -402, 2473, 2473, 2473, ++ -402, 2473, 2473, 2473, 2473, 2473, 2473, 2473, 2473, 2473, ++ 2473, 2473, 2473, 2473, 2473, 2473, 2473, -402, 2473, 2473, ++ 2473, 2473, -402, -402, 2473, 2473, 2473, 2473, 2473, -90, ++ -402, 2563, -402, 2473, 2473, 2473, -402, -402, -402, -402, ++ -402, 2672, 2672, -402, -402, 2563, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 2563, 2563, -402, 2563, 2563, ++ 2563, -402, -402 + }; + + const short +@@ -6076,216 +6101,218 @@ namespace yy { + 0, 0, 0, 4, 74, 5, 98, 97, 15, 16, + 91, 90, 9, 10, 8, 20, 19, 18, 96, 95, + 101, 100, 85, 84, 134, 135, 87, 86, 136, 137, +- 114, 113, 83, 81, 82, 0, 0, 334, 335, 336, +- 337, 338, 339, 340, 0, 344, 345, 346, 347, 0, +- 0, 355, 356, 357, 358, 359, 360, 361, 362, 363, +- 364, 0, 367, 0, 368, 0, 370, 371, 372, 373, +- 374, 375, 376, 377, 0, 379, 380, 381, 382, 383, +- 384, 0, 0, 0, 0, 390, 391, 392, 393, 0, +- 401, 402, 403, 404, 416, 422, 407, 408, 409, 420, +- 421, 428, 410, 406, 415, 427, 426, 399, 398, 397, +- 431, 430, 419, 417, 432, 418, 405, 400, 423, 424, +- 425, 411, 414, 413, 412, 429, 395, 396, 0, 77, ++ 114, 113, 83, 81, 82, 0, 0, 337, 338, 339, ++ 340, 341, 342, 343, 0, 347, 348, 349, 350, 0, ++ 0, 358, 359, 360, 361, 362, 363, 364, 365, 366, ++ 367, 0, 370, 0, 371, 0, 373, 374, 375, 376, ++ 377, 378, 379, 380, 0, 382, 383, 384, 385, 386, ++ 387, 0, 0, 0, 0, 393, 394, 395, 396, 0, ++ 404, 405, 406, 407, 419, 425, 410, 411, 412, 423, ++ 424, 431, 413, 409, 418, 430, 429, 402, 401, 400, ++ 434, 433, 422, 420, 435, 421, 408, 403, 426, 427, ++ 428, 414, 417, 416, 415, 432, 398, 399, 0, 77, + 30, 32, 79, 109, 108, 138, 139, 0, 0, 166, + 169, 172, 175, 178, 181, 184, 187, 190, 193, 196, +- 199, 202, 205, 208, 211, 264, 253, 214, 250, 256, +- 265, 266, 223, 267, 268, 269, 270, 271, 272, 273, +- 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, +- 284, 285, 286, 287, 288, 289, 290, 291, 292, 294, +- 293, 297, 296, 295, 298, 300, 299, 301, 259, 302, +- 303, 304, 306, 305, 227, 307, 308, 260, 263, 309, +- 310, 311, 312, 313, 314, 315, 316, 317, 320, 318, +- 319, 231, 235, 243, 247, 239, 217, 220, 0, 322, +- 321, 323, 324, 325, 326, 327, 328, 329, 330, 331, +- 332, 333, 121, 156, 161, 122, 123, 124, 22, 21, +- 23, 28, 27, 144, 145, 0, 155, 78, 1, 3, +- 0, 434, 389, 354, 353, 352, 342, 341, 343, 349, +- 348, 351, 350, 440, 441, 365, 366, 369, 378, 385, +- 386, 387, 388, 394, 0, 0, 163, 162, 164, 165, +- 167, 168, 170, 171, 173, 174, 176, 177, 179, 180, +- 182, 183, 185, 186, 188, 189, 191, 192, 194, 195, +- 197, 198, 200, 201, 203, 204, 206, 207, 209, 210, +- 251, 252, 212, 213, 248, 249, 254, 255, 221, 222, +- 257, 258, 225, 226, 224, 261, 262, 229, 230, 228, +- 233, 234, 232, 241, 242, 240, 245, 246, 244, 237, +- 238, 236, 215, 216, 218, 219, 0, 0, 0, 0, +- 0, 0, 38, 39, 0, 0, 0, 73, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 37, 0, 0, 0, 0, 40, +- 41, 0, 0, 0, 0, 0, 76, 33, 35, 433, +- 0, 0, 0, 438, 439, 29, 31, 157, 0, 0, +- 158, 34, 36, 72, 56, 55, 57, 58, 43, 59, +- 52, 60, 42, 61, 62, 63, 64, 65, 66, 67, +- 53, 68, 69, 70, 71, 44, 45, 46, 47, 48, +- 49, 50, 51, 54, 75, 435, 436, 437, 160, 159 ++ 199, 202, 205, 208, 211, 214, 267, 256, 217, 253, ++ 259, 268, 269, 226, 270, 271, 272, 273, 274, 275, ++ 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, ++ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, ++ 297, 296, 300, 299, 298, 301, 303, 302, 304, 262, ++ 305, 306, 307, 309, 308, 230, 310, 311, 263, 266, ++ 312, 313, 314, 315, 316, 317, 318, 319, 320, 323, ++ 321, 322, 234, 238, 246, 250, 242, 220, 223, 0, ++ 325, 324, 326, 327, 328, 329, 330, 331, 332, 333, ++ 334, 335, 336, 121, 156, 161, 122, 123, 124, 22, ++ 21, 23, 28, 27, 144, 145, 0, 155, 78, 1, ++ 3, 0, 437, 392, 357, 356, 355, 345, 344, 346, ++ 352, 351, 354, 353, 443, 444, 368, 369, 372, 381, ++ 388, 389, 390, 391, 397, 0, 0, 163, 162, 164, ++ 165, 167, 168, 170, 171, 173, 174, 176, 177, 179, ++ 180, 182, 183, 185, 186, 188, 189, 191, 192, 194, ++ 195, 197, 198, 200, 201, 203, 204, 206, 207, 209, ++ 210, 212, 213, 254, 255, 215, 216, 251, 252, 257, ++ 258, 224, 225, 260, 261, 228, 229, 227, 264, 265, ++ 232, 233, 231, 236, 237, 235, 244, 245, 243, 248, ++ 249, 247, 240, 241, 239, 218, 219, 221, 222, 0, ++ 0, 0, 0, 0, 0, 38, 39, 0, 0, 0, ++ 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, ++ 0, 0, 40, 41, 0, 0, 0, 0, 0, 76, ++ 33, 35, 436, 0, 0, 0, 441, 442, 29, 31, ++ 157, 0, 0, 158, 34, 36, 72, 56, 55, 57, ++ 58, 43, 59, 52, 60, 42, 61, 62, 63, 64, ++ 65, 66, 67, 53, 68, 69, 70, 71, 44, 45, ++ 46, 47, 48, 49, 50, 51, 54, 75, 438, 439, ++ 440, 160, 159 + }; + + const short + seclang_parser::yypgoto_[] = + { +- -413, -413, -70, -413, -47, -192, -413, -412, -413, -413, +- -55, -153, -61, -332, -413, -134 ++ -402, -402, -74, -402, -47, -170, -402, -401, -402, -402, ++ -51, -254, -61, -316, -402, -136 + }; + + const short + seclang_parser::yydefgoto_[] = + { +- -1, 82, 83, 84, 209, 210, 476, 477, 85, 335, +- 322, 323, 354, 211, 342, 355 ++ -1, 82, 83, 84, 209, 210, 479, 480, 85, 336, ++ 323, 324, 355, 211, 343, 356 + }; + + const short + seclang_parser::yytable_[] = + { +- 324, 324, 324, 215, 212, 365, 365, 325, 326, 356, +- 437, 357, 339, 216, 437, 95, 364, 327, 96, 324, +- 358, 112, 97, 113, 114, 336, 491, 359, 360, 361, +- 362, 92, 93, 486, 337, 363, 94, 328, 329, 346, +- 347, 0, 330, 343, 348, 344, 345, 480, 481, 482, +- 86, 87, 88, 89, 341, 90, 91, 98, 99, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 100, 101, +- 414, 102, 103, 104, 105, 436, 366, 367, 106, 107, +- 108, 109, 110, 111, 213, 214, 0, 419, 422, 425, +- 428, 431, 0, 331, 332, 333, 334, 349, 350, 351, +- 352, 368, 369, 370, 371, 372, 373, 0, 374, 375, +- 376, 377, 378, 379, 0, 380, 381, 382, 383, 384, +- 385, 478, 386, 387, 388, 389, 390, 391, 0, 0, +- 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, +- 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, +- 415, 416, 432, 433, 434, 435, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 324, 0, 0, ++ 325, 325, 325, 215, 212, 366, 366, 357, 340, 358, ++ 115, 326, 327, 216, 440, 92, 93, 328, 359, 325, ++ 94, 112, 440, 113, 114, 360, 361, 362, 363, 337, ++ 86, 87, 95, 364, 338, 96, 329, 330, 365, 97, ++ 494, 331, 347, 348, 88, 89, 344, 349, 345, 346, ++ 489, 483, 484, 485, 342, 439, 116, 117, 118, 119, ++ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, ++ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, ++ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, ++ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, ++ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, ++ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, ++ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, ++ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, ++ 200, 201, 202, 203, 204, 205, 206, 207, 0, 417, ++ 90, 91, 98, 99, 100, 101, 367, 368, 102, 103, ++ 104, 105, 106, 107, 108, 109, 422, 425, 428, 431, ++ 434, 0, 110, 111, 213, 214, 332, 333, 334, 335, ++ 350, 351, 352, 353, 369, 370, 0, 371, 372, 373, ++ 374, 375, 376, 0, 0, 377, 378, 0, 0, 0, ++ 481, 379, 380, 381, 382, 383, 384, 0, 0, 385, ++ 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, ++ 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, ++ 406, 407, 408, 409, 410, 411, 412, 0, 208, 413, ++ 414, 418, 419, 0, 435, 436, 437, 438, 325, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 479, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 0, 492, 493, 494, 495, 0, 0, +- 496, 497, 498, 0, 499, 500, 501, 502, 503, 504, +- 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, +- 485, 515, 516, 517, 518, 487, 0, 519, 520, 521, +- 522, 523, 0, 0, 0, 0, 525, 526, 527, 0, +- 0, 0, 0, 484, 0, 0, 0, 0, 484, 0, +- 0, 484, 0, 0, 484, 0, 0, 484, 0, 0, +- 484, 0, 0, 0, 0, 353, 490, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, +- 0, 412, 413, 0, 0, 0, 0, 0, 0, 0, ++ 482, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 0, 495, 496, 497, 498, 0, ++ 0, 499, 500, 501, 0, 502, 503, 504, 505, 506, ++ 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, ++ 517, 488, 518, 519, 520, 521, 490, 0, 522, 523, ++ 524, 525, 526, 0, 0, 0, 0, 528, 529, 530, ++ 0, 0, 0, 0, 0, 0, 487, 0, 0, 0, ++ 0, 487, 0, 0, 487, 0, 0, 487, 0, 0, ++ 487, 0, 0, 487, 0, 0, 0, 0, 0, 493, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 484, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 528, 529, 524, +- 0, 484, 484, 484, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 484, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 484, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 0, 484, 484, 484, 219, 220, 221, +- 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, +- 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, +- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, +- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, +- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, +- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, +- 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, +- 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, +- 302, 303, 304, 305, 306, 307, 219, 220, 221, 222, +- 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, +- 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, +- 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, +- 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, +- 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, +- 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, +- 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, +- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, +- 303, 304, 305, 306, 307, 219, 220, 221, 222, 223, +- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, +- 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, +- 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, +- 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, +- 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, +- 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, +- 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, +- 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, +- 304, 305, 306, 307, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 487, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 531, 532, 527, 0, 487, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 487, 487, 0, 487, 487, 487, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 353, 0, 309, 310, 311, 312, 313, +- 314, 315, 316, 317, 318, 319, 320, 321, 0, 417, +- 418, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 354, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 0, 415, 416, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 353, 0, 309, 310, 311, 312, 313, 314, +- 315, 316, 317, 318, 319, 320, 321, 0, 420, 421, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 354, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 0, 420, 421, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 353, 0, 309, 310, 311, 312, 313, 314, 315, +- 316, 317, 318, 319, 320, 321, 0, 423, 424, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 219, 220, +- 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, +- 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, +- 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, +- 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, +- 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, +- 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, +- 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, +- 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, +- 301, 302, 303, 304, 305, 306, 307, 217, 218, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 354, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 0, 423, 424, 219, 220, 221, 222, 223, ++ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, ++ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 304, 305, 306, 307, 308, 219, 220, 221, 222, 223, ++ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, ++ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 304, 305, 306, 307, 308, 219, 220, 221, 222, 223, ++ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, ++ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 304, 305, 306, 307, 308, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 353, 0, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, +- 0, 426, 427, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 354, 0, 310, 311, 312, 313, 314, 315, ++ 316, 317, 318, 319, 320, 321, 322, 0, 426, 427, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 353, 0, 309, 310, 311, 312, +- 313, 314, 315, 316, 317, 318, 319, 320, 321, 0, +- 429, 430, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 354, 0, 310, 311, 312, 313, 314, 315, ++ 316, 317, 318, 319, 320, 321, 322, 0, 429, 430, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 308, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 354, 0, 310, 311, 312, 313, 314, 315, ++ 316, 317, 318, 319, 320, 321, 322, 0, 432, 433, + 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, + 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, + 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, +@@ -6295,31 +6322,31 @@ namespace yy { + 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, +- 307, 488, 489, 219, 220, 221, 222, 223, 224, 225, +- 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, +- 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, +- 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, +- 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, +- 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, +- 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, +- 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, +- 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, +- 306, 307, 219, 220, 221, 222, 223, 224, 225, 226, +- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, +- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, +- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, +- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, +- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, +- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, +- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, +- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, +- 307, 0, 0, 0, 0, 438, 439, 440, 441, 442, +- 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, +- 453, 454, 455, 456, 457, 458, 459, 0, 460, 461, +- 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, +- 472, 473, 474, 475, 0, 0, 0, 0, 0, 0, ++ 307, 308, 217, 218, 219, 220, 221, 222, 223, 224, ++ 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, ++ 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, ++ 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, ++ 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, ++ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, ++ 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, ++ 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, ++ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, ++ 305, 306, 307, 308, 491, 492, 219, 220, 221, 222, ++ 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, ++ 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, ++ 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, ++ 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, ++ 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, ++ 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, ++ 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, ++ 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, ++ 303, 304, 305, 306, 307, 308, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, +- 319, 320, 321, 0, 0, 0, 0, 0, 0, 0, ++ 319, 320, 321, 322, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -6327,17 +6354,64 @@ namespace yy { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 309, 310, 311, 312, 313, 314, 315, 316, 317, +- 318, 319, 320, 321, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 310, 311, 312, 313, 314, 315, 316, ++ 317, 318, 319, 320, 321, 322, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 353, 0, +- 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, +- 319, 320, 321, 219, 220, 221, 222, 223, 224, 225, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 310, 311, 312, 313, 314, ++ 315, 316, 317, 318, 319, 320, 321, 322, 219, 220, ++ 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, ++ 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, ++ 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, ++ 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, ++ 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, ++ 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, ++ 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, ++ 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, ++ 301, 302, 303, 304, 305, 306, 307, 308, 0, 0, ++ 0, 0, 441, 442, 443, 444, 445, 446, 447, 448, ++ 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, ++ 459, 460, 461, 462, 0, 463, 464, 465, 466, 467, ++ 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, ++ 478, 219, 220, 221, 222, 223, 224, 225, 226, 227, ++ 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, ++ 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, ++ 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, ++ 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, ++ 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, ++ 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, ++ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, ++ 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, ++ 308, 0, 0, 0, 0, 0, 442, 443, 444, 445, ++ 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, ++ 456, 457, 458, 459, 460, 461, 462, 0, 463, 464, ++ 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, ++ 475, 476, 477, 478, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 354, 0, 310, 311, 312, ++ 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, ++ 0, 0, 0, 0, 341, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 354, 0, ++ 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, ++ 320, 321, 322, 219, 220, 221, 222, 223, 224, 225, + 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, + 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, + 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, +@@ -6346,116 +6420,75 @@ namespace yy { + 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, + 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, + 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, +- 306, 307, 0, 0, 0, 0, 0, 439, 440, 441, +- 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, +- 452, 453, 454, 455, 456, 457, 458, 459, 0, 460, +- 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, +- 471, 472, 473, 474, 475, 219, 220, 221, 222, 223, +- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, +- 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, +- 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, +- 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, +- 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, +- 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, +- 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, +- 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, +- 304, 305, 306, 307, 0, 0, 0, 0, 340, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 0, 353, +- 0, 309, 310, 311, 312, 313, 314, 315, 316, 317, +- 318, 319, 320, 321, 219, 220, 221, 222, 223, 224, +- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, +- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, +- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, +- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, +- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, +- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, +- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, +- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, +- 305, 306, 307, 0, 0, 0, 0, 0, 0, 0, ++ 306, 307, 308, 219, 220, 221, 222, 223, 224, 225, ++ 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, ++ 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, ++ 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, ++ 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, ++ 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, ++ 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, ++ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, ++ 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, ++ 306, 307, 308, 0, 0, 0, 0, 0, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 219, 220, 221, 222, 223, 224, 225, 226, ++ 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, ++ 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, ++ 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, ++ 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, ++ 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, ++ 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, ++ 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, ++ 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, ++ 307, 308, 0, 0, 0, 0, 1, 0, 0, 0, ++ 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 354, 0, 310, 311, 312, 313, 314, 315, 316, 317, ++ 318, 319, 320, 321, 322, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 309, 310, 311, 312, 313, 314, 315, +- 316, 317, 318, 319, 320, 321, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, +- 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 353, 0, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, +- 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, +- 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, +- 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, +- 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, +- 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, +- 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, +- 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, +- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, +- 299, 300, 301, 302, 303, 304, 305, 306, 307, 4, +- 483, 0, 309, 310, 311, 312, 313, 314, 315, 316, +- 317, 318, 319, 320, 321, 0, 0, 0, 338, 0, +- 0, 0, 2, 3, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 486, 0, 310, 311, 312, 313, 314, 315, 316, 317, ++ 318, 319, 320, 321, 322, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, ++ 339, 0, 0, 0, 2, 3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 5, 6, 7, 8, 9, 10, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 310, 311, 312, 313, 314, 315, 316, 317, 318, ++ 319, 320, 321, 322, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 0, 54, 55, 56, 57, 58, 59, ++ 51, 52, 53, 4, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, +- 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 309, 310, +- 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, +- 321, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 5, 6, 7, 8, 9, +- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, +- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, +- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, +- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, +- 50, 51, 52, 53, 115, 54, 55, 56, 57, 58, +- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, +- 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 70, 71, 72, 73, 74, 75, 76, 77, +- 78, 79, 80, 81, 0, 0, 0, 0, 0, 0, +- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, +- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, +- 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, +- 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, +- 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, +- 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, +- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, +- 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, +- 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, +- 206, 207, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 115, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 208, 116, 117, 118, 119, 120, 121, 122, ++ 0, 0, 0, 0, 0, 0, 0, 0, 5, 6, ++ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ++ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, ++ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, ++ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ++ 47, 48, 49, 50, 51, 52, 53, 115, 54, 55, ++ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, ++ 66, 67, 68, 69, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 0, 0, 0, ++ 0, 0, 0, 116, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, +@@ -6470,155 +6503,156 @@ namespace yy { + const short + seclang_parser::yycheck_[] = + { +- 61, 62, 63, 303, 51, 3, 3, 62, 63, 143, +- 6, 145, 82, 313, 6, 305, 208, 64, 308, 80, +- 154, 304, 312, 306, 307, 80, 438, 161, 162, 163, +- 164, 306, 307, 365, 81, 169, 311, 306, 307, 306, +- 307, -1, 311, 304, 311, 306, 307, 100, 101, 102, +- 306, 307, 143, 144, 115, 306, 307, 306, 307, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, 306, 307, +- 284, 306, 307, 309, 310, 308, 217, 218, 306, 307, +- 309, 310, 306, 307, 306, 307, -1, 301, 302, 303, +- 304, 305, -1, 306, 307, 306, 307, 306, 307, 306, +- 307, 342, 343, 342, 343, 342, 343, -1, 342, 343, +- 342, 343, 342, 343, -1, 342, 343, 342, 343, 342, +- 343, 335, 342, 343, 342, 343, 342, 343, -1, -1, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 308, -1, -1, ++ 61, 62, 63, 304, 51, 3, 3, 143, 82, 145, ++ 100, 62, 63, 314, 6, 307, 308, 64, 154, 80, ++ 312, 305, 6, 307, 308, 161, 162, 163, 164, 80, ++ 307, 308, 306, 169, 81, 309, 307, 308, 208, 313, ++ 441, 312, 307, 308, 144, 145, 305, 312, 307, 308, ++ 366, 101, 102, 103, 115, 309, 146, 147, 148, 149, ++ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, ++ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, ++ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, ++ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, ++ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, ++ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, ++ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, ++ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, ++ 230, 231, 232, 233, 234, 235, 236, 237, -1, 285, ++ 307, 308, 307, 308, 307, 308, 217, 218, 307, 308, ++ 310, 311, 307, 308, 310, 311, 302, 303, 304, 305, ++ 306, -1, 307, 308, 307, 308, 307, 308, 307, 308, ++ 307, 308, 307, 308, 343, 344, -1, 343, 344, 343, ++ 344, 343, 344, -1, -1, 343, 344, -1, -1, -1, ++ 336, 343, 344, 343, 344, 343, 344, -1, -1, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, -1, 328, 343, ++ 344, 343, 344, -1, 343, 344, 343, 344, 309, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, -1, 340, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, 355, 356, 357, 358, 359, 360, +- 361, 362, 363, -1, 438, 439, 440, 441, -1, -1, +- 444, 445, 446, -1, 448, 449, 450, 451, 452, 453, +- 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, +- 327, 465, 466, 467, 468, 327, -1, 471, 472, 473, +- 474, 475, -1, -1, -1, -1, 480, 481, 482, -1, +- -1, -1, -1, 414, -1, -1, -1, -1, 419, -1, ++ 341, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 356, 357, 358, 359, 360, ++ 361, 362, 363, 364, -1, 441, 442, 443, 444, -1, ++ -1, 447, 448, 449, -1, 451, 452, 453, 454, 455, ++ 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, ++ 466, 328, 468, 469, 470, 471, 328, -1, 474, 475, ++ 476, 477, 478, -1, -1, -1, -1, 483, 484, 485, ++ -1, -1, -1, -1, -1, -1, 417, -1, -1, -1, + -1, 422, -1, -1, 425, -1, -1, 428, -1, -1, +- 431, -1, -1, -1, -1, 326, 437, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, +- -1, 342, 343, -1, -1, -1, -1, -1, -1, -1, ++ 431, -1, -1, 434, -1, -1, -1, -1, -1, 440, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 478, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 488, 489, 476, +- -1, 492, 493, 494, 495, 496, 497, 498, 499, 500, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 481, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 491, 492, 479, -1, 495, 496, 497, 498, 499, 500, + 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, + 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, +- 521, 522, 523, -1, 525, 526, 527, 10, 11, 12, +- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, +- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, +- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, +- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, +- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, +- 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, +- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, +- 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, +- 93, 94, 95, 96, 97, 98, 10, 11, 12, 13, +- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, +- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, +- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, +- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, +- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, +- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, +- 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, +- 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, +- 94, 95, 96, 97, 98, 10, 11, 12, 13, 14, +- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, +- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, +- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, +- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, +- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, +- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, +- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, +- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, +- 95, 96, 97, 98, -1, -1, -1, -1, -1, -1, ++ 521, 522, 523, 524, 525, 526, -1, 528, 529, 530, ++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ++ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ++ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, ++ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, ++ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ++ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ++ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ++ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, ++ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, ++ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ++ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ++ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ++ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, ++ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, ++ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ++ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, 326, -1, 328, 329, 330, 331, 332, +- 333, 334, 335, 336, 337, 338, 339, 340, -1, 342, +- 343, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, 327, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, -1, 343, 344, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, 326, -1, 328, 329, 330, 331, 332, 333, +- 334, 335, 336, 337, 338, 339, 340, -1, 342, 343, ++ -1, -1, -1, -1, -1, -1, -1, 327, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, -1, 343, 344, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, 327, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, -1, 343, 344, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, ++ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, ++ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, ++ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, ++ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, ++ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, ++ 95, 96, 97, 98, 99, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, ++ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, ++ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, ++ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, ++ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, ++ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, ++ 95, 96, 97, 98, 99, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, ++ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, ++ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, ++ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, ++ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, ++ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, ++ 95, 96, 97, 98, 99, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 326, -1, 328, 329, 330, 331, 332, 333, 334, +- 335, 336, 337, 338, 339, 340, -1, 342, 343, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, 10, 11, +- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, +- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, +- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, +- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, +- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, +- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, +- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, +- 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, +- 92, 93, 94, 95, 96, 97, 98, 8, 9, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, 327, -1, 329, 330, 331, 332, 333, 334, ++ 335, 336, 337, 338, 339, 340, 341, -1, 343, 344, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 326, -1, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, +- -1, 342, 343, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, 326, -1, 328, 329, 330, 331, +- 332, 333, 334, 335, 336, 337, 338, 339, 340, -1, +- 342, 343, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, 327, -1, 329, 330, 331, 332, 333, 334, ++ 335, 336, 337, 338, 339, 340, 341, -1, 343, 344, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, 327, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, 327, -1, 329, 330, 331, 332, 333, 334, ++ 335, 336, 337, 338, 339, 340, 341, -1, 343, 344, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, +@@ -6628,104 +6662,82 @@ namespace yy { + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, +- 98, 8, 9, 10, 11, 12, 13, 14, 15, 16, +- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, +- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, +- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, +- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, +- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, +- 97, 98, 10, 11, 12, 13, 14, 15, 16, 17, +- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, +- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, +- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, +- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, +- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, +- 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, +- 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, +- 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, +- 98, -1, -1, -1, -1, 103, 104, 105, 106, 107, +- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, +- 118, 119, 120, 121, 122, 123, 124, -1, 126, 127, +- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, +- 138, 139, 140, 141, -1, -1, -1, -1, -1, -1, +- 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, +- 338, 339, 340, -1, -1, -1, -1, -1, -1, -1, ++ 98, 99, 8, 9, 10, 11, 12, 13, 14, 15, ++ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, ++ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, ++ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, ++ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, ++ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, ++ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ++ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, ++ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, ++ 96, 97, 98, 99, 8, 9, 10, 11, 12, 13, ++ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, ++ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, ++ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, ++ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, ++ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, ++ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ++ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, ++ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, ++ 94, 95, 96, 97, 98, 99, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, ++ 338, 339, 340, 341, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 328, 329, 330, 331, 332, 333, 334, 335, 336, +- 337, 338, 339, 340, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, 329, 330, 331, 332, 333, 334, 335, ++ 336, 337, 338, 339, 340, 341, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, 326, -1, +- 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, +- 338, 339, 340, 10, 11, 12, 13, 14, 15, 16, +- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, +- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, +- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, +- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, +- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, +- 97, 98, -1, -1, -1, -1, -1, 104, 105, 106, +- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, +- 117, 118, 119, 120, 121, 122, 123, 124, -1, 126, +- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, +- 137, 138, 139, 140, 141, 10, 11, 12, 13, 14, +- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, +- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, +- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, +- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, +- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, +- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, +- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, +- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, +- 95, 96, 97, 98, -1, -1, -1, -1, 103, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, -1, 326, +- -1, 328, 329, 330, 331, 332, 333, 334, 335, 336, +- 337, 338, 339, 340, 10, 11, 12, 13, 14, 15, +- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, +- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, +- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, +- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, +- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, +- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, +- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, +- 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, +- 96, 97, 98, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, 328, 329, 330, 331, 332, 333, 334, +- 335, 336, 337, 338, 339, 340, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, +- -1, 4, 5, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 329, 330, 331, 332, 333, ++ 334, 335, 336, 337, 338, 339, 340, 341, 10, 11, ++ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, ++ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, ++ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, ++ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, ++ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, ++ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, ++ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ++ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, ++ 92, 93, 94, 95, 96, 97, 98, 99, -1, -1, ++ -1, -1, 104, 105, 106, 107, 108, 109, 110, 111, ++ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, ++ 122, 123, 124, 125, -1, 127, 128, 129, 130, 131, ++ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, ++ 142, 10, 11, 12, 13, 14, 15, 16, 17, 18, ++ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, ++ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, ++ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, ++ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, ++ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, ++ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, ++ 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, ++ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, ++ 99, -1, -1, -1, -1, -1, 105, 106, 107, 108, ++ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, ++ 119, 120, 121, 122, 123, 124, 125, -1, 127, 128, ++ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, ++ 139, 140, 141, 142, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 326, -1, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 327, -1, 329, 330, 331, ++ 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, +@@ -6734,97 +6746,125 @@ namespace yy { + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, +- 90, 91, 92, 93, 94, 95, 96, 97, 98, 142, +- 326, -1, 328, 329, 330, 331, 332, 333, 334, 335, +- 336, 337, 338, 339, 340, -1, -1, -1, 0, -1, +- -1, -1, 4, 5, -1, -1, -1, -1, -1, -1, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ++ -1, -1, -1, -1, 104, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, 327, -1, ++ 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, ++ 339, 340, 341, 10, 11, 12, 13, 14, 15, 16, ++ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, ++ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, ++ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ++ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, ++ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, ++ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ++ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, ++ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, ++ 97, 98, 99, 10, 11, 12, 13, 14, 15, 16, ++ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, ++ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, ++ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ++ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, ++ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, ++ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ++ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, ++ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, ++ 97, 98, 99, -1, -1, -1, -1, -1, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, 10, 11, 12, 13, 14, 15, 16, 17, ++ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, ++ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, ++ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, ++ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, ++ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, ++ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ++ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, ++ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, ++ 98, 99, -1, -1, -1, -1, 0, -1, -1, -1, ++ 4, 5, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 327, -1, 329, 330, 331, 332, 333, 334, 335, 336, ++ 337, 338, 339, 340, 341, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, 237, 238, 239, 240, 241, 242, +- 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, +- 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, +- 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, +- 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, +- 283, 284, 285, -1, 287, 288, 289, 290, 291, 292, +- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, +- 142, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 314, 315, 316, 317, 318, 319, 320, 321, 322, +- 323, 324, 325, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 327, -1, 329, 330, 331, 332, 333, 334, 335, 336, ++ 337, 338, 339, 340, 341, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, 143, ++ 0, -1, -1, -1, 4, 5, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, 328, 329, +- 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, +- 340, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 237, 238, 239, 240, 241, +- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, +- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, +- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, +- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, +- 282, 283, 284, 285, 99, 287, 288, 289, 290, 291, +- 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, +- 302, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, 314, 315, 316, 317, 318, 319, 320, 321, +- 322, 323, 324, 325, -1, -1, -1, -1, -1, -1, +- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, +- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, +- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, +- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, +- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, +- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, +- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, +- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, +- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, +- 235, 236, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, 329, 330, 331, 332, 333, 334, 335, 336, 337, ++ 338, 339, 340, 341, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 143, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, 315, 316, 317, 318, 319, 320, 321, 322, 323, ++ 324, 325, 326, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, 327, 145, 146, 147, 148, 149, 150, 151, +- 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, +- 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, +- 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, +- 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, +- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, +- 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, +- 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, +- 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, +- 232, 233, 234, 235, 236 ++ -1, -1, -1, -1, -1, -1, -1, -1, 238, 239, ++ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, ++ 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, ++ 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, ++ 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, ++ 280, 281, 282, 283, 284, 285, 286, 100, 288, 289, ++ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, ++ 300, 301, 302, 303, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 315, 316, 317, 318, 319, ++ 320, 321, 322, 323, 324, 325, 326, -1, -1, -1, ++ -1, -1, -1, 146, 147, 148, 149, 150, 151, 152, ++ 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, ++ 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, ++ 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, ++ 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, ++ 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, ++ 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, ++ 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, ++ 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, ++ 233, 234, 235, 236, 237 + }; + + const short + seclang_parser::yystos_[] = + { +- 0, 0, 4, 5, 142, 237, 238, 239, 240, 241, +- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, +- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, +- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, +- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, +- 282, 283, 284, 285, 287, 288, 289, 290, 291, 292, +- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, +- 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, +- 324, 325, 345, 346, 347, 352, 306, 307, 143, 144, +- 306, 307, 306, 307, 311, 305, 308, 312, 306, 307, +- 306, 307, 306, 307, 309, 310, 306, 307, 309, 310, +- 306, 307, 304, 306, 307, 99, 145, 146, 147, 148, +- 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, +- 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, +- 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, +- 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, +- 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, +- 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, +- 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, +- 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, +- 229, 230, 231, 232, 233, 234, 235, 236, 327, 348, +- 349, 357, 348, 306, 307, 303, 313, 8, 9, 10, ++ 0, 0, 4, 5, 143, 238, 239, 240, 241, 242, ++ 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, ++ 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, ++ 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, ++ 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, ++ 283, 284, 285, 286, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, ++ 325, 326, 346, 347, 348, 353, 307, 308, 144, 145, ++ 307, 308, 307, 308, 312, 306, 309, 313, 307, 308, ++ 307, 308, 307, 308, 310, 311, 307, 308, 310, 311, ++ 307, 308, 305, 307, 308, 100, 146, 147, 148, 149, ++ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, ++ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, ++ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, ++ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, ++ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, ++ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, ++ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, ++ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, ++ 230, 231, 232, 233, 234, 235, 236, 237, 328, 349, ++ 350, 358, 349, 307, 308, 304, 314, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +@@ -6833,67 +6873,51 @@ namespace yy { + 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, 327, 328, ++ 91, 92, 93, 94, 95, 96, 97, 98, 99, 328, + 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, +- 339, 340, 354, 355, 356, 354, 354, 348, 306, 307, +- 311, 306, 307, 306, 307, 353, 354, 348, 0, 346, +- 103, 356, 358, 304, 306, 307, 306, 307, 311, 306, +- 307, 306, 307, 326, 356, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 349, 3, 356, 356, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 359, 342, 343, 342, 343, 359, +- 342, 343, 359, 342, 343, 359, 342, 343, 359, 342, +- 343, 359, 342, 343, 342, 343, 355, 6, 103, 104, +- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, +- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, +- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, +- 136, 137, 138, 139, 140, 141, 350, 351, 359, 356, +- 100, 101, 102, 326, 356, 327, 357, 327, 8, 9, +- 356, 351, 359, 359, 359, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 359, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 359, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 348, 359, 359, 359, 356, 356 ++ 339, 340, 341, 355, 356, 357, 355, 355, 349, 307, ++ 308, 312, 307, 308, 307, 308, 354, 355, 349, 0, ++ 347, 104, 357, 359, 305, 307, 308, 307, 308, 312, ++ 307, 308, 307, 308, 327, 357, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 350, 3, 357, 357, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 360, 343, 344, ++ 343, 344, 360, 343, 344, 360, 343, 344, 360, 343, ++ 344, 360, 343, 344, 360, 343, 344, 343, 344, 356, ++ 6, 104, 105, 106, 107, 108, 109, 110, 111, 112, ++ 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, ++ 123, 124, 125, 127, 128, 129, 130, 131, 132, 133, ++ 134, 135, 136, 137, 138, 139, 140, 141, 142, 351, ++ 352, 360, 357, 101, 102, 103, 327, 357, 328, 358, ++ 328, 8, 9, 357, 352, 360, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 360, 360, 349, 360, 360, ++ 360, 357, 357 + }; + + const short + seclang_parser::yyr1_[] = + { +- 0, 344, 345, 345, 345, 346, 347, 347, 347, 347, +- 347, 347, 347, 347, 347, 347, 347, 347, 347, 347, +- 347, 347, 347, 347, 347, 347, 347, 347, 347, 348, +- 348, 349, 349, 350, 350, 350, 350, 351, 351, 351, +- 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, +- 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, +- 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, +- 351, 351, 351, 351, 352, 352, 352, 352, 352, 352, ++ 0, 345, 346, 346, 346, 347, 348, 348, 348, 348, ++ 348, 348, 348, 348, 348, 348, 348, 348, 348, 348, ++ 348, 348, 348, 348, 348, 348, 348, 348, 348, 349, ++ 349, 350, 350, 351, 351, 351, 351, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 353, 354, 354, 355, 355, +- 355, 355, 355, 355, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 352, 352, 352, 352, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 354, 355, 355, 356, 356, + 356, 356, 356, 356, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, +@@ -6904,8 +6928,25 @@ namespace yy { + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, +- 357, 357, 357, 358, 358, 358, 358, 358, 359, 359, +- 359, 359 ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 359, 359, 359, 359, ++ 359, 360, 360, 360, 360 + }; + + const signed char +@@ -6933,11 +6974,11 @@ namespace yy { + 1, 2, 2, 1, 2, 2, 1, 2, 2, 1, + 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, + 2, 1, 2, 2, 1, 2, 2, 1, 2, 2, +- 1, 2, 2, 1, 2, 2, 2, 1, 2, 2, +- 2, 1, 2, 2, 2, 1, 2, 2, 2, 1, +- 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, ++ 1, 2, 2, 1, 2, 2, 1, 2, 2, 2, ++ 1, 2, 2, 2, 1, 2, 2, 2, 1, 2, ++ 2, 2, 1, 2, 2, 2, 1, 2, 2, 2, + 1, 2, 2, 1, 2, 2, 1, 2, 2, 1, +- 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, ++ 2, 2, 1, 1, 2, 2, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +@@ -6945,17 +6986,17 @@ namespace yy { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +- 1, 2, 2, 2, 1, 1, 1, 1, 2, 2, +- 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, +- 1, 1, 1, 1, 1, 2, 2, 1, 1, 2, +- 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, +- 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, +- 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, ++ 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, ++ 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, ++ 1, 2, 1, 1, 1, 1, 1, 1, 2, 2, ++ 2, 2, 2, 1, 1, 1, 1, 2, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +- 1, 1, 1, 2, 1, 3, 3, 3, 2, 2, +- 1, 1 ++ 1, 1, 1, 1, 1, 1, 2, 1, 3, 3, ++ 3, 2, 2, 1, 1 + }; + + +@@ -6974,11 +7015,12 @@ namespace yy { + "VARIABLE_MATCHED_VARS_NAMES", "VARIABLE_MATCHED_VARS", "VARIABLE_FILES", + "VARIABLE_REQUEST_COOKIES", "VARIABLE_REQUEST_HEADERS", + "VARIABLE_RESPONSE_HEADERS", "VARIABLE_GEO", +- "VARIABLE_REQUEST_COOKIES_NAMES", "VARIABLE_ARGS_COMBINED_SIZE", +- "VARIABLE_ARGS_GET_NAMES", "VARIABLE_RULE", "\"Variable ARGS_NAMES\"", +- "VARIABLE_ARGS_POST_NAMES", "\"AUTH_TYPE\"", "\"FILES_COMBINED_SIZE\"", +- "\"FILES_TMPNAMES\"", "\"FULL_REQUEST\"", "\"FULL_REQUEST_LENGTH\"", +- "\"INBOUND_DATA_ERROR\"", "\"MATCHED_VAR\"", "\"MATCHED_VAR_NAME\"", ++ "VARIABLE_REQUEST_COOKIES_NAMES", "VARIABLE_MULTIPART_PART_HEADERS", ++ "VARIABLE_ARGS_COMBINED_SIZE", "VARIABLE_ARGS_GET_NAMES", ++ "VARIABLE_RULE", "\"Variable ARGS_NAMES\"", "VARIABLE_ARGS_POST_NAMES", ++ "\"AUTH_TYPE\"", "\"FILES_COMBINED_SIZE\"", "\"FILES_TMPNAMES\"", ++ "\"FULL_REQUEST\"", "\"FULL_REQUEST_LENGTH\"", "\"INBOUND_DATA_ERROR\"", ++ "\"MATCHED_VAR\"", "\"MATCHED_VAR_NAME\"", + "VARIABLE_MULTIPART_BOUNDARY_QUOTED", + "VARIABLE_MULTIPART_BOUNDARY_WHITESPACE", "\"MULTIPART_CRLF_LF_LINES\"", + "\"MULTIPART_DATA_AFTER\"", "VARIABLE_MULTIPART_DATA_BEFORE", +@@ -7147,51 +7189,51 @@ namespace yy { + const short + seclang_parser::yyrline_[] = + { +- 0, 712, 712, 716, 717, 720, 725, 731, 737, 741, +- 745, 751, 757, 763, 769, 774, 779, 785, 792, 796, +- 800, 806, 810, 814, 819, 824, 829, 834, 838, 845, +- 849, 856, 862, 872, 881, 891, 900, 913, 917, 921, +- 925, 929, 933, 937, 941, 945, 949, 954, 958, 962, +- 966, 970, 974, 979, 984, 988, 992, 996, 1000, 1004, +- 1008, 1012, 1016, 1020, 1024, 1028, 1032, 1036, 1040, 1044, +- 1048, 1052, 1056, 1060, 1074, 1075, 1105, 1124, 1143, 1171, +- 1228, 1235, 1239, 1243, 1247, 1251, 1255, 1259, 1263, 1272, +- 1276, 1281, 1284, 1289, 1294, 1299, 1304, 1307, 1312, 1315, +- 1320, 1325, 1328, 1333, 1338, 1343, 1348, 1353, 1358, 1363, +- 1366, 1371, 1376, 1381, 1386, 1389, 1394, 1399, 1404, 1417, +- 1430, 1443, 1456, 1469, 1495, 1523, 1535, 1555, 1582, 1587, +- 1593, 1598, 1603, 1612, 1617, 1621, 1625, 1629, 1633, 1637, +- 1641, 1646, 1651, 1663, 1669, 1673, 1677, 1688, 1697, 1698, +- 1705, 1710, 1715, 1769, 1776, 1784, 1821, 1825, 1832, 1837, +- 1843, 1849, 1855, 1862, 1872, 1876, 1880, 1884, 1888, 1892, +- 1896, 1900, 1904, 1908, 1912, 1916, 1920, 1924, 1928, 1932, +- 1936, 1940, 1944, 1948, 1952, 1956, 1960, 1964, 1968, 1972, +- 1976, 1980, 1984, 1988, 1992, 1996, 2000, 2004, 2008, 2012, +- 2016, 2020, 2024, 2028, 2032, 2036, 2040, 2044, 2048, 2052, +- 2056, 2060, 2064, 2068, 2072, 2076, 2080, 2084, 2088, 2092, +- 2096, 2100, 2104, 2108, 2112, 2116, 2120, 2124, 2128, 2132, +- 2136, 2140, 2144, 2148, 2152, 2156, 2160, 2164, 2168, 2172, +- 2176, 2180, 2184, 2188, 2192, 2196, 2200, 2204, 2208, 2212, +- 2216, 2220, 2224, 2228, 2233, 2237, 2241, 2246, 2250, 2254, +- 2259, 2264, 2268, 2272, 2276, 2280, 2284, 2288, 2292, 2296, +- 2300, 2304, 2308, 2312, 2316, 2320, 2324, 2328, 2332, 2336, +- 2340, 2344, 2348, 2352, 2356, 2360, 2364, 2368, 2372, 2376, +- 2380, 2384, 2388, 2392, 2396, 2400, 2404, 2408, 2412, 2416, +- 2420, 2424, 2428, 2432, 2436, 2440, 2444, 2448, 2452, 2456, +- 2460, 2464, 2468, 2472, 2476, 2480, 2484, 2488, 2492, 2496, +- 2500, 2504, 2512, 2519, 2526, 2533, 2540, 2547, 2554, 2561, +- 2568, 2575, 2582, 2589, 2599, 2603, 2607, 2611, 2615, 2619, +- 2623, 2627, 2632, 2636, 2641, 2645, 2649, 2653, 2657, 2662, +- 2667, 2671, 2675, 2679, 2683, 2687, 2691, 2695, 2699, 2703, +- 2707, 2711, 2715, 2719, 2724, 2728, 2732, 2736, 2740, 2744, +- 2748, 2752, 2756, 2760, 2764, 2768, 2772, 2776, 2780, 2784, +- 2788, 2792, 2796, 2800, 2804, 2808, 2812, 2816, 2820, 2824, +- 2828, 2832, 2836, 2840, 2844, 2848, 2852, 2856, 2860, 2864, +- 2868, 2872, 2876, 2880, 2884, 2888, 2892, 2896, 2900, 2904, +- 2908, 2912, 2916, 2920, 2924, 2928, 2932, 2936, 2940, 2944, +- 2948, 2952, 2956, 2960, 2964, 2968, 2972, 2976, 2980, 2984, +- 2988, 2992, 2996, 3003, 3007, 3011, 3015, 3019, 3026, 3031, +- 3036, 3042 ++ 0, 714, 714, 718, 719, 722, 727, 733, 739, 743, ++ 747, 753, 759, 765, 771, 776, 781, 787, 794, 798, ++ 802, 808, 812, 816, 821, 826, 831, 836, 840, 847, ++ 851, 858, 864, 874, 883, 893, 902, 915, 919, 923, ++ 927, 931, 935, 939, 943, 947, 951, 956, 960, 964, ++ 968, 972, 976, 981, 986, 990, 994, 998, 1002, 1006, ++ 1010, 1014, 1018, 1022, 1026, 1030, 1034, 1038, 1042, 1046, ++ 1050, 1054, 1058, 1062, 1076, 1077, 1107, 1126, 1145, 1173, ++ 1230, 1237, 1241, 1245, 1249, 1253, 1257, 1261, 1265, 1274, ++ 1278, 1283, 1286, 1291, 1296, 1301, 1306, 1309, 1314, 1317, ++ 1322, 1327, 1330, 1335, 1340, 1345, 1350, 1355, 1360, 1365, ++ 1368, 1373, 1378, 1383, 1388, 1391, 1396, 1401, 1406, 1419, ++ 1432, 1445, 1458, 1471, 1497, 1525, 1537, 1557, 1584, 1589, ++ 1595, 1600, 1605, 1614, 1619, 1623, 1627, 1631, 1635, 1639, ++ 1643, 1648, 1653, 1665, 1671, 1675, 1679, 1690, 1699, 1700, ++ 1707, 1712, 1717, 1771, 1778, 1786, 1823, 1827, 1834, 1839, ++ 1845, 1851, 1857, 1864, 1874, 1878, 1882, 1886, 1890, 1894, ++ 1898, 1902, 1906, 1910, 1914, 1918, 1922, 1926, 1930, 1934, ++ 1938, 1942, 1946, 1950, 1954, 1958, 1962, 1966, 1970, 1974, ++ 1978, 1982, 1986, 1990, 1994, 1998, 2002, 2006, 2010, 2014, ++ 2018, 2022, 2026, 2030, 2034, 2038, 2042, 2046, 2050, 2054, ++ 2058, 2062, 2066, 2070, 2074, 2078, 2082, 2086, 2090, 2094, ++ 2098, 2102, 2106, 2110, 2114, 2118, 2122, 2126, 2130, 2134, ++ 2138, 2142, 2146, 2150, 2154, 2158, 2162, 2166, 2170, 2174, ++ 2178, 2182, 2186, 2190, 2194, 2198, 2202, 2206, 2210, 2214, ++ 2218, 2222, 2226, 2230, 2234, 2238, 2242, 2247, 2251, 2255, ++ 2260, 2264, 2268, 2273, 2278, 2282, 2286, 2290, 2294, 2298, ++ 2302, 2306, 2310, 2314, 2318, 2322, 2326, 2330, 2334, 2338, ++ 2342, 2346, 2350, 2354, 2358, 2362, 2366, 2370, 2374, 2378, ++ 2382, 2386, 2390, 2394, 2398, 2402, 2406, 2410, 2414, 2418, ++ 2422, 2426, 2430, 2434, 2438, 2442, 2446, 2450, 2454, 2458, ++ 2462, 2466, 2470, 2474, 2478, 2482, 2486, 2490, 2494, 2498, ++ 2502, 2506, 2510, 2514, 2518, 2526, 2533, 2540, 2547, 2554, ++ 2561, 2568, 2575, 2582, 2589, 2596, 2603, 2613, 2617, 2621, ++ 2625, 2629, 2633, 2637, 2641, 2646, 2650, 2655, 2659, 2663, ++ 2667, 2671, 2676, 2681, 2685, 2689, 2693, 2697, 2701, 2705, ++ 2709, 2713, 2717, 2721, 2725, 2729, 2733, 2738, 2742, 2746, ++ 2750, 2754, 2758, 2762, 2766, 2770, 2774, 2778, 2782, 2786, ++ 2790, 2794, 2798, 2802, 2806, 2810, 2814, 2818, 2822, 2826, ++ 2830, 2834, 2838, 2842, 2846, 2850, 2854, 2858, 2862, 2866, ++ 2870, 2874, 2878, 2882, 2886, 2890, 2894, 2898, 2902, 2906, ++ 2910, 2914, 2918, 2922, 2926, 2930, 2934, 2938, 2942, 2946, ++ 2950, 2954, 2958, 2962, 2966, 2970, 2974, 2978, 2982, 2986, ++ 2990, 2994, 2998, 3002, 3006, 3010, 3017, 3021, 3025, 3029, ++ 3033, 3040, 3045, 3050, 3056 + }; + + void +@@ -7223,9 +7265,9 @@ namespace yy { + + + } // yy +-#line 7227 "seclang-parser.cc" ++#line 7269 "seclang-parser.cc" + +-#line 3049 "seclang-parser.yy" ++#line 3063 "seclang-parser.yy" + + + void yy::seclang_parser::error (const location_type& l, const std::string& m) { +diff --git a/src/parser/seclang-parser.hh b/src/parser/seclang-parser.hh +index 8cdbe22e..360ae8c3 100644 +--- a/src/parser/seclang-parser.hh ++++ b/src/parser/seclang-parser.hh +@@ -256,6 +256,7 @@ class Driver; + #include "src/variables/request_body_length.h" + #include "src/variables/request_cookies.h" + #include "src/variables/request_cookies_names.h" ++#include "src/variables/multipart_part_headers.h" + #include "src/variables/request_file_name.h" + #include "src/variables/request_headers.h" + #include "src/variables/request_headers_names.h" +@@ -351,7 +352,7 @@ using namespace modsecurity::operators; + a = std::move(c); + + +-#line 355 "seclang-parser.hh" ++#line 356 "seclang-parser.hh" + + # include + # include // std::abort +@@ -485,7 +486,7 @@ using namespace modsecurity::operators; + #endif + + namespace yy { +-#line 489 "seclang-parser.hh" ++#line 490 "seclang-parser.hh" + + + +@@ -995,324 +996,325 @@ namespace yy { + TOK_VARIABLE_RESPONSE_HEADERS = 278, // VARIABLE_RESPONSE_HEADERS + TOK_VARIABLE_GEO = 279, // VARIABLE_GEO + TOK_VARIABLE_REQUEST_COOKIES_NAMES = 280, // VARIABLE_REQUEST_COOKIES_NAMES +- TOK_VARIABLE_ARGS_COMBINED_SIZE = 281, // VARIABLE_ARGS_COMBINED_SIZE +- TOK_VARIABLE_ARGS_GET_NAMES = 282, // VARIABLE_ARGS_GET_NAMES +- TOK_VARIABLE_RULE = 283, // VARIABLE_RULE +- TOK_VARIABLE_ARGS_NAMES = 284, // "Variable ARGS_NAMES" +- TOK_VARIABLE_ARGS_POST_NAMES = 285, // VARIABLE_ARGS_POST_NAMES +- TOK_VARIABLE_AUTH_TYPE = 286, // "AUTH_TYPE" +- TOK_VARIABLE_FILES_COMBINED_SIZE = 287, // "FILES_COMBINED_SIZE" +- TOK_VARIABLE_FILES_TMP_NAMES = 288, // "FILES_TMPNAMES" +- TOK_VARIABLE_FULL_REQUEST = 289, // "FULL_REQUEST" +- TOK_VARIABLE_FULL_REQUEST_LENGTH = 290, // "FULL_REQUEST_LENGTH" +- TOK_VARIABLE_INBOUND_DATA_ERROR = 291, // "INBOUND_DATA_ERROR" +- TOK_VARIABLE_MATCHED_VAR = 292, // "MATCHED_VAR" +- TOK_VARIABLE_MATCHED_VAR_NAME = 293, // "MATCHED_VAR_NAME" +- TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 294, // VARIABLE_MULTIPART_BOUNDARY_QUOTED +- TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 295, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE +- TOK_VARIABLE_MULTIPART_CRLF_LF_LINES = 296, // "MULTIPART_CRLF_LF_LINES" +- TOK_VARIABLE_MULTIPART_DATA_AFTER = 297, // "MULTIPART_DATA_AFTER" +- TOK_VARIABLE_MULTIPART_DATA_BEFORE = 298, // VARIABLE_MULTIPART_DATA_BEFORE +- TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 299, // "MULTIPART_FILE_LIMIT_EXCEEDED" +- TOK_VARIABLE_MULTIPART_HEADER_FOLDING = 300, // "MULTIPART_HEADER_FOLDING" +- TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 301, // "MULTIPART_INVALID_HEADER_FOLDING" +- TOK_VARIABLE_MULTIPART_INVALID_PART = 302, // VARIABLE_MULTIPART_INVALID_PART +- TOK_VARIABLE_MULTIPART_INVALID_QUOTING = 303, // "MULTIPART_INVALID_QUOTING" +- TOK_VARIABLE_MULTIPART_LF_LINE = 304, // VARIABLE_MULTIPART_LF_LINE +- TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON = 305, // VARIABLE_MULTIPART_MISSING_SEMICOLON +- TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING = 306, // VARIABLE_MULTIPART_SEMICOLON_MISSING +- TOK_VARIABLE_MULTIPART_STRICT_ERROR = 307, // "MULTIPART_STRICT_ERROR" +- TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 308, // "MULTIPART_UNMATCHED_BOUNDARY" +- TOK_VARIABLE_OUTBOUND_DATA_ERROR = 309, // "OUTBOUND_DATA_ERROR" +- TOK_VARIABLE_PATH_INFO = 310, // "PATH_INFO" +- TOK_VARIABLE_QUERY_STRING = 311, // "QUERY_STRING" +- TOK_VARIABLE_REMOTE_ADDR = 312, // "REMOTE_ADDR" +- TOK_VARIABLE_REMOTE_HOST = 313, // "REMOTE_HOST" +- TOK_VARIABLE_REMOTE_PORT = 314, // "REMOTE_PORT" +- TOK_VARIABLE_REQBODY_ERROR_MSG = 315, // "REQBODY_ERROR_MSG" +- TOK_VARIABLE_REQBODY_ERROR = 316, // "REQBODY_ERROR" +- TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 317, // "REQBODY_PROCESSOR_ERROR_MSG" +- TOK_VARIABLE_REQBODY_PROCESSOR_ERROR = 318, // "REQBODY_PROCESSOR_ERROR" +- TOK_VARIABLE_REQBODY_PROCESSOR = 319, // "REQBODY_PROCESSOR" +- TOK_VARIABLE_REQUEST_BASENAME = 320, // "REQUEST_BASENAME" +- TOK_VARIABLE_REQUEST_BODY_LENGTH = 321, // "REQUEST_BODY_LENGTH" +- TOK_VARIABLE_REQUEST_BODY = 322, // "REQUEST_BODY" +- TOK_VARIABLE_REQUEST_FILE_NAME = 323, // "REQUEST_FILENAME" +- TOK_VARIABLE_REQUEST_HEADERS_NAMES = 324, // VARIABLE_REQUEST_HEADERS_NAMES +- TOK_VARIABLE_REQUEST_LINE = 325, // "REQUEST_LINE" +- TOK_VARIABLE_REQUEST_METHOD = 326, // "REQUEST_METHOD" +- TOK_VARIABLE_REQUEST_PROTOCOL = 327, // "REQUEST_PROTOCOL" +- TOK_VARIABLE_REQUEST_URI_RAW = 328, // "REQUEST_URI_RAW" +- TOK_VARIABLE_REQUEST_URI = 329, // "REQUEST_URI" +- TOK_VARIABLE_RESOURCE = 330, // "RESOURCE" +- TOK_VARIABLE_RESPONSE_BODY = 331, // "RESPONSE_BODY" +- TOK_VARIABLE_RESPONSE_CONTENT_LENGTH = 332, // "RESPONSE_CONTENT_LENGTH" +- TOK_VARIABLE_RESPONSE_CONTENT_TYPE = 333, // VARIABLE_RESPONSE_CONTENT_TYPE +- TOK_VARIABLE_RESPONSE_HEADERS_NAMES = 334, // VARIABLE_RESPONSE_HEADERS_NAMES +- TOK_VARIABLE_RESPONSE_PROTOCOL = 335, // "RESPONSE_PROTOCOL" +- TOK_VARIABLE_RESPONSE_STATUS = 336, // "RESPONSE_STATUS" +- TOK_VARIABLE_SERVER_ADDR = 337, // "SERVER_ADDR" +- TOK_VARIABLE_SERVER_NAME = 338, // "SERVER_NAME" +- TOK_VARIABLE_SERVER_PORT = 339, // "SERVER_PORT" +- TOK_VARIABLE_SESSION_ID = 340, // "SESSIONID" +- TOK_VARIABLE_UNIQUE_ID = 341, // "UNIQUE_ID" +- TOK_VARIABLE_URL_ENCODED_ERROR = 342, // "URLENCODED_ERROR" +- TOK_VARIABLE_USER_ID = 343, // "USERID" +- TOK_VARIABLE_WEB_APP_ID = 344, // "WEBAPPID" +- TOK_VARIABLE_STATUS = 345, // "VARIABLE_STATUS" +- TOK_VARIABLE_STATUS_LINE = 346, // "VARIABLE_STATUS_LINE" +- TOK_VARIABLE_IP = 347, // "VARIABLE_IP" +- TOK_VARIABLE_GLOBAL = 348, // "VARIABLE_GLOBAL" +- TOK_VARIABLE_TX = 349, // "VARIABLE_TX" +- TOK_VARIABLE_SESSION = 350, // "VARIABLE_SESSION" +- TOK_VARIABLE_USER = 351, // "VARIABLE_USER" +- TOK_RUN_TIME_VAR_ENV = 352, // "RUN_TIME_VAR_ENV" +- TOK_RUN_TIME_VAR_XML = 353, // "RUN_TIME_VAR_XML" +- TOK_ACTION_SETVAR = 354, // "SetVar" +- TOK_SETVAR_OPERATION_EQUALS = 355, // SETVAR_OPERATION_EQUALS +- TOK_SETVAR_OPERATION_EQUALS_PLUS = 356, // SETVAR_OPERATION_EQUALS_PLUS +- TOK_SETVAR_OPERATION_EQUALS_MINUS = 357, // SETVAR_OPERATION_EQUALS_MINUS +- TOK_NOT = 358, // "NOT" +- TOK_OPERATOR_BEGINS_WITH = 359, // "OPERATOR_BEGINS_WITH" +- TOK_OPERATOR_CONTAINS = 360, // "OPERATOR_CONTAINS" +- TOK_OPERATOR_CONTAINS_WORD = 361, // "OPERATOR_CONTAINS_WORD" +- TOK_OPERATOR_DETECT_SQLI = 362, // "OPERATOR_DETECT_SQLI" +- TOK_OPERATOR_DETECT_XSS = 363, // "OPERATOR_DETECT_XSS" +- TOK_OPERATOR_ENDS_WITH = 364, // "OPERATOR_ENDS_WITH" +- TOK_OPERATOR_EQ = 365, // "OPERATOR_EQ" +- TOK_OPERATOR_FUZZY_HASH = 366, // "OPERATOR_FUZZY_HASH" +- TOK_OPERATOR_GEOLOOKUP = 367, // "OPERATOR_GEOLOOKUP" +- TOK_OPERATOR_GE = 368, // "OPERATOR_GE" +- TOK_OPERATOR_GSB_LOOKUP = 369, // "OPERATOR_GSB_LOOKUP" +- TOK_OPERATOR_GT = 370, // "OPERATOR_GT" +- TOK_OPERATOR_INSPECT_FILE = 371, // "OPERATOR_INSPECT_FILE" +- TOK_OPERATOR_IP_MATCH_FROM_FILE = 372, // "OPERATOR_IP_MATCH_FROM_FILE" +- TOK_OPERATOR_IP_MATCH = 373, // "OPERATOR_IP_MATCH" +- TOK_OPERATOR_LE = 374, // "OPERATOR_LE" +- TOK_OPERATOR_LT = 375, // "OPERATOR_LT" +- TOK_OPERATOR_PM_FROM_FILE = 376, // "OPERATOR_PM_FROM_FILE" +- TOK_OPERATOR_PM = 377, // "OPERATOR_PM" +- TOK_OPERATOR_RBL = 378, // "OPERATOR_RBL" +- TOK_OPERATOR_RSUB = 379, // "OPERATOR_RSUB" +- TOK_OPERATOR_RX_CONTENT_ONLY = 380, // "Operator RX (content only)" +- TOK_OPERATOR_RX = 381, // "OPERATOR_RX" +- TOK_OPERATOR_RX_GLOBAL = 382, // "OPERATOR_RX_GLOBAL" +- TOK_OPERATOR_STR_EQ = 383, // "OPERATOR_STR_EQ" +- TOK_OPERATOR_STR_MATCH = 384, // "OPERATOR_STR_MATCH" +- TOK_OPERATOR_UNCONDITIONAL_MATCH = 385, // "OPERATOR_UNCONDITIONAL_MATCH" +- TOK_OPERATOR_VALIDATE_BYTE_RANGE = 386, // "OPERATOR_VALIDATE_BYTE_RANGE" +- TOK_OPERATOR_VALIDATE_DTD = 387, // "OPERATOR_VALIDATE_DTD" +- TOK_OPERATOR_VALIDATE_HASH = 388, // "OPERATOR_VALIDATE_HASH" +- TOK_OPERATOR_VALIDATE_SCHEMA = 389, // "OPERATOR_VALIDATE_SCHEMA" +- TOK_OPERATOR_VALIDATE_URL_ENCODING = 390, // "OPERATOR_VALIDATE_URL_ENCODING" +- TOK_OPERATOR_VALIDATE_UTF8_ENCODING = 391, // "OPERATOR_VALIDATE_UTF8_ENCODING" +- TOK_OPERATOR_VERIFY_CC = 392, // "OPERATOR_VERIFY_CC" +- TOK_OPERATOR_VERIFY_CPF = 393, // "OPERATOR_VERIFY_CPF" +- TOK_OPERATOR_VERIFY_SSN = 394, // "OPERATOR_VERIFY_SSN" +- TOK_OPERATOR_VERIFY_SVNR = 395, // "OPERATOR_VERIFY_SVNR" +- TOK_OPERATOR_WITHIN = 396, // "OPERATOR_WITHIN" +- TOK_CONFIG_DIR_AUDIT_LOG_FMT = 397, // CONFIG_DIR_AUDIT_LOG_FMT +- TOK_JSON = 398, // JSON +- TOK_NATIVE = 399, // NATIVE +- TOK_ACTION_CTL_RULE_ENGINE = 400, // "ACTION_CTL_RULE_ENGINE" +- TOK_ACTION_ACCURACY = 401, // "Accuracy" +- TOK_ACTION_ALLOW = 402, // "Allow" +- TOK_ACTION_APPEND = 403, // "Append" +- TOK_ACTION_AUDIT_LOG = 404, // "AuditLog" +- TOK_ACTION_BLOCK = 405, // "Block" +- TOK_ACTION_CAPTURE = 406, // "Capture" +- TOK_ACTION_CHAIN = 407, // "Chain" +- TOK_ACTION_CTL_AUDIT_ENGINE = 408, // "ACTION_CTL_AUDIT_ENGINE" +- TOK_ACTION_CTL_AUDIT_LOG_PARTS = 409, // "ACTION_CTL_AUDIT_LOG_PARTS" +- TOK_ACTION_CTL_BDY_JSON = 410, // "ACTION_CTL_BDY_JSON" +- TOK_ACTION_CTL_BDY_XML = 411, // "ACTION_CTL_BDY_XML" +- TOK_ACTION_CTL_BDY_URLENCODED = 412, // "ACTION_CTL_BDY_URLENCODED" +- TOK_ACTION_CTL_FORCE_REQ_BODY_VAR = 413, // "ACTION_CTL_FORCE_REQ_BODY_VAR" +- TOK_ACTION_CTL_REQUEST_BODY_ACCESS = 414, // "ACTION_CTL_REQUEST_BODY_ACCESS" +- TOK_ACTION_CTL_RULE_REMOVE_BY_ID = 415, // "ACTION_CTL_RULE_REMOVE_BY_ID" +- TOK_ACTION_CTL_RULE_REMOVE_BY_TAG = 416, // "ACTION_CTL_RULE_REMOVE_BY_TAG" +- TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 417, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" +- TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 418, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" +- TOK_ACTION_DENY = 419, // "Deny" +- TOK_ACTION_DEPRECATE_VAR = 420, // "DeprecateVar" +- TOK_ACTION_DROP = 421, // "Drop" +- TOK_ACTION_EXEC = 422, // "Exec" +- TOK_ACTION_EXPIRE_VAR = 423, // "ExpireVar" +- TOK_ACTION_ID = 424, // "Id" +- TOK_ACTION_INITCOL = 425, // "InitCol" +- TOK_ACTION_LOG = 426, // "Log" +- TOK_ACTION_LOG_DATA = 427, // "LogData" +- TOK_ACTION_MATURITY = 428, // "Maturity" +- TOK_ACTION_MSG = 429, // "Msg" +- TOK_ACTION_MULTI_MATCH = 430, // "MultiMatch" +- TOK_ACTION_NO_AUDIT_LOG = 431, // "NoAuditLog" +- TOK_ACTION_NO_LOG = 432, // "NoLog" +- TOK_ACTION_PASS = 433, // "Pass" +- TOK_ACTION_PAUSE = 434, // "Pause" +- TOK_ACTION_PHASE = 435, // "Phase" +- TOK_ACTION_PREPEND = 436, // "Prepend" +- TOK_ACTION_PROXY = 437, // "Proxy" +- TOK_ACTION_REDIRECT = 438, // "Redirect" +- TOK_ACTION_REV = 439, // "Rev" +- TOK_ACTION_SANITISE_ARG = 440, // "SanitiseArg" +- TOK_ACTION_SANITISE_MATCHED = 441, // "SanitiseMatched" +- TOK_ACTION_SANITISE_MATCHED_BYTES = 442, // "SanitiseMatchedBytes" +- TOK_ACTION_SANITISE_REQUEST_HEADER = 443, // "SanitiseRequestHeader" +- TOK_ACTION_SANITISE_RESPONSE_HEADER = 444, // "SanitiseResponseHeader" +- TOK_ACTION_SETENV = 445, // "SetEnv" +- TOK_ACTION_SETRSC = 446, // "SetRsc" +- TOK_ACTION_SETSID = 447, // "SetSid" +- TOK_ACTION_SETUID = 448, // "SetUID" +- TOK_ACTION_SEVERITY = 449, // "Severity" +- TOK_ACTION_SKIP = 450, // "Skip" +- TOK_ACTION_SKIP_AFTER = 451, // "SkipAfter" +- TOK_ACTION_STATUS = 452, // "Status" +- TOK_ACTION_TAG = 453, // "Tag" +- TOK_ACTION_TRANSFORMATION_BASE_64_ENCODE = 454, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" +- TOK_ACTION_TRANSFORMATION_BASE_64_DECODE = 455, // "ACTION_TRANSFORMATION_BASE_64_DECODE" +- TOK_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 456, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" +- TOK_ACTION_TRANSFORMATION_CMD_LINE = 457, // "ACTION_TRANSFORMATION_CMD_LINE" +- TOK_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 458, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" +- TOK_ACTION_TRANSFORMATION_CSS_DECODE = 459, // "ACTION_TRANSFORMATION_CSS_DECODE" +- TOK_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 460, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" +- TOK_ACTION_TRANSFORMATION_HEX_ENCODE = 461, // "ACTION_TRANSFORMATION_HEX_ENCODE" +- TOK_ACTION_TRANSFORMATION_HEX_DECODE = 462, // "ACTION_TRANSFORMATION_HEX_DECODE" +- TOK_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 463, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" +- TOK_ACTION_TRANSFORMATION_JS_DECODE = 464, // "ACTION_TRANSFORMATION_JS_DECODE" +- TOK_ACTION_TRANSFORMATION_LENGTH = 465, // "ACTION_TRANSFORMATION_LENGTH" +- TOK_ACTION_TRANSFORMATION_LOWERCASE = 466, // "ACTION_TRANSFORMATION_LOWERCASE" +- TOK_ACTION_TRANSFORMATION_MD5 = 467, // "ACTION_TRANSFORMATION_MD5" +- TOK_ACTION_TRANSFORMATION_NONE = 468, // "ACTION_TRANSFORMATION_NONE" +- TOK_ACTION_TRANSFORMATION_NORMALISE_PATH = 469, // "ACTION_TRANSFORMATION_NORMALISE_PATH" +- TOK_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 470, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" +- TOK_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 471, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" +- TOK_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 472, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" +- TOK_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 473, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" +- TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 474, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" +- TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 475, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" +- TOK_ACTION_TRANSFORMATION_REMOVE_NULLS = 476, // "ACTION_TRANSFORMATION_REMOVE_NULLS" +- TOK_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 477, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" +- TOK_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 478, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" +- TOK_ACTION_TRANSFORMATION_REPLACE_NULLS = 479, // "ACTION_TRANSFORMATION_REPLACE_NULLS" +- TOK_ACTION_TRANSFORMATION_SHA1 = 480, // "ACTION_TRANSFORMATION_SHA1" +- TOK_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 481, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" +- TOK_ACTION_TRANSFORMATION_TRIM = 482, // "ACTION_TRANSFORMATION_TRIM" +- TOK_ACTION_TRANSFORMATION_TRIM_LEFT = 483, // "ACTION_TRANSFORMATION_TRIM_LEFT" +- TOK_ACTION_TRANSFORMATION_TRIM_RIGHT = 484, // "ACTION_TRANSFORMATION_TRIM_RIGHT" +- TOK_ACTION_TRANSFORMATION_UPPERCASE = 485, // "ACTION_TRANSFORMATION_UPPERCASE" +- TOK_ACTION_TRANSFORMATION_URL_ENCODE = 486, // "ACTION_TRANSFORMATION_URL_ENCODE" +- TOK_ACTION_TRANSFORMATION_URL_DECODE = 487, // "ACTION_TRANSFORMATION_URL_DECODE" +- TOK_ACTION_TRANSFORMATION_URL_DECODE_UNI = 488, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" +- TOK_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 489, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" +- TOK_ACTION_VER = 490, // "Ver" +- TOK_ACTION_XMLNS = 491, // "xmlns" +- TOK_CONFIG_COMPONENT_SIG = 492, // "CONFIG_COMPONENT_SIG" +- TOK_CONFIG_CONN_ENGINE = 493, // "CONFIG_CONN_ENGINE" +- TOK_CONFIG_SEC_ARGUMENT_SEPARATOR = 494, // "CONFIG_SEC_ARGUMENT_SEPARATOR" +- TOK_CONFIG_SEC_WEB_APP_ID = 495, // "CONFIG_SEC_WEB_APP_ID" +- TOK_CONFIG_SEC_SERVER_SIG = 496, // "CONFIG_SEC_SERVER_SIG" +- TOK_CONFIG_DIR_AUDIT_DIR = 497, // "CONFIG_DIR_AUDIT_DIR" +- TOK_CONFIG_DIR_AUDIT_DIR_MOD = 498, // "CONFIG_DIR_AUDIT_DIR_MOD" +- TOK_CONFIG_DIR_AUDIT_ENG = 499, // "CONFIG_DIR_AUDIT_ENG" +- TOK_CONFIG_DIR_AUDIT_FLE_MOD = 500, // "CONFIG_DIR_AUDIT_FLE_MOD" +- TOK_CONFIG_DIR_AUDIT_LOG = 501, // "CONFIG_DIR_AUDIT_LOG" +- TOK_CONFIG_DIR_AUDIT_LOG2 = 502, // "CONFIG_DIR_AUDIT_LOG2" +- TOK_CONFIG_DIR_AUDIT_LOG_P = 503, // "CONFIG_DIR_AUDIT_LOG_P" +- TOK_CONFIG_DIR_AUDIT_STS = 504, // "CONFIG_DIR_AUDIT_STS" +- TOK_CONFIG_DIR_AUDIT_TPE = 505, // "CONFIG_DIR_AUDIT_TPE" +- TOK_CONFIG_DIR_DEBUG_LOG = 506, // "CONFIG_DIR_DEBUG_LOG" +- TOK_CONFIG_DIR_DEBUG_LVL = 507, // "CONFIG_DIR_DEBUG_LVL" +- TOK_CONFIG_SEC_CACHE_TRANSFORMATIONS = 508, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" +- TOK_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 509, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" +- TOK_CONFIG_SEC_HASH_ENGINE = 510, // "CONFIG_SEC_HASH_ENGINE" +- TOK_CONFIG_SEC_HASH_KEY = 511, // "CONFIG_SEC_HASH_KEY" +- TOK_CONFIG_SEC_HASH_PARAM = 512, // "CONFIG_SEC_HASH_PARAM" +- TOK_CONFIG_SEC_HASH_METHOD_RX = 513, // "CONFIG_SEC_HASH_METHOD_RX" +- TOK_CONFIG_SEC_HASH_METHOD_PM = 514, // "CONFIG_SEC_HASH_METHOD_PM" +- TOK_CONFIG_SEC_CHROOT_DIR = 515, // "CONFIG_SEC_CHROOT_DIR" +- TOK_CONFIG_DIR_GEO_DB = 516, // "CONFIG_DIR_GEO_DB" +- TOK_CONFIG_DIR_GSB_DB = 517, // "CONFIG_DIR_GSB_DB" +- TOK_CONFIG_SEC_GUARDIAN_LOG = 518, // "CONFIG_SEC_GUARDIAN_LOG" +- TOK_CONFIG_DIR_PCRE_MATCH_LIMIT = 519, // "CONFIG_DIR_PCRE_MATCH_LIMIT" +- TOK_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 520, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" +- TOK_CONFIG_SEC_CONN_R_STATE_LIMIT = 521, // "CONFIG_SEC_CONN_R_STATE_LIMIT" +- TOK_CONFIG_SEC_CONN_W_STATE_LIMIT = 522, // "CONFIG_SEC_CONN_W_STATE_LIMIT" +- TOK_CONFIG_SEC_SENSOR_ID = 523, // "CONFIG_SEC_SENSOR_ID" +- TOK_CONFIG_DIR_ARGS_LIMIT = 524, // "CONFIG_DIR_ARGS_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 525, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY = 526, // "CONFIG_DIR_REQ_BODY" +- TOK_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 527, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY_LIMIT = 528, // "CONFIG_DIR_REQ_BODY_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 529, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" +- TOK_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 530, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" +- TOK_CONFIG_DIR_RES_BODY = 531, // "CONFIG_DIR_RES_BODY" +- TOK_CONFIG_DIR_RES_BODY_LIMIT = 532, // "CONFIG_DIR_RES_BODY_LIMIT" +- TOK_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 533, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" +- TOK_CONFIG_SEC_RULE_INHERITANCE = 534, // "CONFIG_SEC_RULE_INHERITANCE" +- TOK_CONFIG_SEC_RULE_PERF_TIME = 535, // "CONFIG_SEC_RULE_PERF_TIME" +- TOK_CONFIG_DIR_RULE_ENG = 536, // "CONFIG_DIR_RULE_ENG" +- TOK_CONFIG_DIR_SEC_ACTION = 537, // "CONFIG_DIR_SEC_ACTION" +- TOK_CONFIG_DIR_SEC_DEFAULT_ACTION = 538, // "CONFIG_DIR_SEC_DEFAULT_ACTION" +- TOK_CONFIG_DIR_SEC_MARKER = 539, // "CONFIG_DIR_SEC_MARKER" +- TOK_CONFIG_DIR_UNICODE_MAP_FILE = 540, // "CONFIG_DIR_UNICODE_MAP_FILE" +- TOK_CONFIG_DIR_UNICODE_CODE_PAGE = 541, // "CONFIG_DIR_UNICODE_CODE_PAGE" +- TOK_CONFIG_SEC_COLLECTION_TIMEOUT = 542, // "CONFIG_SEC_COLLECTION_TIMEOUT" +- TOK_CONFIG_SEC_HTTP_BLKEY = 543, // "CONFIG_SEC_HTTP_BLKEY" +- TOK_CONFIG_SEC_INTERCEPT_ON_ERROR = 544, // "CONFIG_SEC_INTERCEPT_ON_ERROR" +- TOK_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 545, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" +- TOK_CONFIG_SEC_RULE_REMOVE_BY_ID = 546, // "CONFIG_SEC_RULE_REMOVE_BY_ID" +- TOK_CONFIG_SEC_RULE_REMOVE_BY_MSG = 547, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" +- TOK_CONFIG_SEC_RULE_REMOVE_BY_TAG = 548, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" +- TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 549, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" +- TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 550, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" +- TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 551, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" +- TOK_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 552, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" +- TOK_CONFIG_UPDLOAD_KEEP_FILES = 553, // "CONFIG_UPDLOAD_KEEP_FILES" +- TOK_CONFIG_UPDLOAD_SAVE_TMP_FILES = 554, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" +- TOK_CONFIG_UPLOAD_DIR = 555, // "CONFIG_UPLOAD_DIR" +- TOK_CONFIG_UPLOAD_FILE_LIMIT = 556, // "CONFIG_UPLOAD_FILE_LIMIT" +- TOK_CONFIG_UPLOAD_FILE_MODE = 557, // "CONFIG_UPLOAD_FILE_MODE" +- TOK_CONFIG_VALUE_ABORT = 558, // "CONFIG_VALUE_ABORT" +- TOK_CONFIG_VALUE_DETC = 559, // "CONFIG_VALUE_DETC" +- TOK_CONFIG_VALUE_HTTPS = 560, // "CONFIG_VALUE_HTTPS" +- TOK_CONFIG_VALUE_OFF = 561, // "CONFIG_VALUE_OFF" +- TOK_CONFIG_VALUE_ON = 562, // "CONFIG_VALUE_ON" +- TOK_CONFIG_VALUE_PARALLEL = 563, // "CONFIG_VALUE_PARALLEL" +- TOK_CONFIG_VALUE_PROCESS_PARTIAL = 564, // "CONFIG_VALUE_PROCESS_PARTIAL" +- TOK_CONFIG_VALUE_REJECT = 565, // "CONFIG_VALUE_REJECT" +- TOK_CONFIG_VALUE_RELEVANT_ONLY = 566, // "CONFIG_VALUE_RELEVANT_ONLY" +- TOK_CONFIG_VALUE_SERIAL = 567, // "CONFIG_VALUE_SERIAL" +- TOK_CONFIG_VALUE_WARN = 568, // "CONFIG_VALUE_WARN" +- TOK_CONFIG_XML_EXTERNAL_ENTITY = 569, // "CONFIG_XML_EXTERNAL_ENTITY" +- TOK_CONGIG_DIR_RESPONSE_BODY_MP = 570, // "CONGIG_DIR_RESPONSE_BODY_MP" +- TOK_CONGIG_DIR_SEC_ARG_SEP = 571, // "CONGIG_DIR_SEC_ARG_SEP" +- TOK_CONGIG_DIR_SEC_COOKIE_FORMAT = 572, // "CONGIG_DIR_SEC_COOKIE_FORMAT" +- TOK_CONFIG_SEC_COOKIEV0_SEPARATOR = 573, // "CONFIG_SEC_COOKIEV0_SEPARATOR" +- TOK_CONGIG_DIR_SEC_DATA_DIR = 574, // "CONGIG_DIR_SEC_DATA_DIR" +- TOK_CONGIG_DIR_SEC_STATUS_ENGINE = 575, // "CONGIG_DIR_SEC_STATUS_ENGINE" +- TOK_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 576, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" +- TOK_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 577, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" +- TOK_CONGIG_DIR_SEC_TMP_DIR = 578, // "CONGIG_DIR_SEC_TMP_DIR" +- TOK_DIRECTIVE = 579, // "DIRECTIVE" +- TOK_DIRECTIVE_SECRULESCRIPT = 580, // "DIRECTIVE_SECRULESCRIPT" +- TOK_FREE_TEXT_QUOTE_MACRO_EXPANSION = 581, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" +- TOK_QUOTATION_MARK = 582, // "QUOTATION_MARK" +- TOK_RUN_TIME_VAR_BLD = 583, // "RUN_TIME_VAR_BLD" +- TOK_RUN_TIME_VAR_DUR = 584, // "RUN_TIME_VAR_DUR" +- TOK_RUN_TIME_VAR_HSV = 585, // "RUN_TIME_VAR_HSV" +- TOK_RUN_TIME_VAR_REMOTE_USER = 586, // "RUN_TIME_VAR_REMOTE_USER" +- TOK_RUN_TIME_VAR_TIME = 587, // "RUN_TIME_VAR_TIME" +- TOK_RUN_TIME_VAR_TIME_DAY = 588, // "RUN_TIME_VAR_TIME_DAY" +- TOK_RUN_TIME_VAR_TIME_EPOCH = 589, // "RUN_TIME_VAR_TIME_EPOCH" +- TOK_RUN_TIME_VAR_TIME_HOUR = 590, // "RUN_TIME_VAR_TIME_HOUR" +- TOK_RUN_TIME_VAR_TIME_MIN = 591, // "RUN_TIME_VAR_TIME_MIN" +- TOK_RUN_TIME_VAR_TIME_MON = 592, // "RUN_TIME_VAR_TIME_MON" +- TOK_RUN_TIME_VAR_TIME_SEC = 593, // "RUN_TIME_VAR_TIME_SEC" +- TOK_RUN_TIME_VAR_TIME_WDAY = 594, // "RUN_TIME_VAR_TIME_WDAY" +- TOK_RUN_TIME_VAR_TIME_YEAR = 595, // "RUN_TIME_VAR_TIME_YEAR" +- TOK_VARIABLE = 596, // "VARIABLE" +- TOK_DICT_ELEMENT = 597, // "Dictionary element" +- TOK_DICT_ELEMENT_REGEXP = 598 // "Dictionary element, selected by regexp" ++ TOK_VARIABLE_MULTIPART_PART_HEADERS = 281, // VARIABLE_MULTIPART_PART_HEADERS ++ TOK_VARIABLE_ARGS_COMBINED_SIZE = 282, // VARIABLE_ARGS_COMBINED_SIZE ++ TOK_VARIABLE_ARGS_GET_NAMES = 283, // VARIABLE_ARGS_GET_NAMES ++ TOK_VARIABLE_RULE = 284, // VARIABLE_RULE ++ TOK_VARIABLE_ARGS_NAMES = 285, // "Variable ARGS_NAMES" ++ TOK_VARIABLE_ARGS_POST_NAMES = 286, // VARIABLE_ARGS_POST_NAMES ++ TOK_VARIABLE_AUTH_TYPE = 287, // "AUTH_TYPE" ++ TOK_VARIABLE_FILES_COMBINED_SIZE = 288, // "FILES_COMBINED_SIZE" ++ TOK_VARIABLE_FILES_TMP_NAMES = 289, // "FILES_TMPNAMES" ++ TOK_VARIABLE_FULL_REQUEST = 290, // "FULL_REQUEST" ++ TOK_VARIABLE_FULL_REQUEST_LENGTH = 291, // "FULL_REQUEST_LENGTH" ++ TOK_VARIABLE_INBOUND_DATA_ERROR = 292, // "INBOUND_DATA_ERROR" ++ TOK_VARIABLE_MATCHED_VAR = 293, // "MATCHED_VAR" ++ TOK_VARIABLE_MATCHED_VAR_NAME = 294, // "MATCHED_VAR_NAME" ++ TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 295, // VARIABLE_MULTIPART_BOUNDARY_QUOTED ++ TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 296, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE ++ TOK_VARIABLE_MULTIPART_CRLF_LF_LINES = 297, // "MULTIPART_CRLF_LF_LINES" ++ TOK_VARIABLE_MULTIPART_DATA_AFTER = 298, // "MULTIPART_DATA_AFTER" ++ TOK_VARIABLE_MULTIPART_DATA_BEFORE = 299, // VARIABLE_MULTIPART_DATA_BEFORE ++ TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 300, // "MULTIPART_FILE_LIMIT_EXCEEDED" ++ TOK_VARIABLE_MULTIPART_HEADER_FOLDING = 301, // "MULTIPART_HEADER_FOLDING" ++ TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 302, // "MULTIPART_INVALID_HEADER_FOLDING" ++ TOK_VARIABLE_MULTIPART_INVALID_PART = 303, // VARIABLE_MULTIPART_INVALID_PART ++ TOK_VARIABLE_MULTIPART_INVALID_QUOTING = 304, // "MULTIPART_INVALID_QUOTING" ++ TOK_VARIABLE_MULTIPART_LF_LINE = 305, // VARIABLE_MULTIPART_LF_LINE ++ TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON = 306, // VARIABLE_MULTIPART_MISSING_SEMICOLON ++ TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING = 307, // VARIABLE_MULTIPART_SEMICOLON_MISSING ++ TOK_VARIABLE_MULTIPART_STRICT_ERROR = 308, // "MULTIPART_STRICT_ERROR" ++ TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 309, // "MULTIPART_UNMATCHED_BOUNDARY" ++ TOK_VARIABLE_OUTBOUND_DATA_ERROR = 310, // "OUTBOUND_DATA_ERROR" ++ TOK_VARIABLE_PATH_INFO = 311, // "PATH_INFO" ++ TOK_VARIABLE_QUERY_STRING = 312, // "QUERY_STRING" ++ TOK_VARIABLE_REMOTE_ADDR = 313, // "REMOTE_ADDR" ++ TOK_VARIABLE_REMOTE_HOST = 314, // "REMOTE_HOST" ++ TOK_VARIABLE_REMOTE_PORT = 315, // "REMOTE_PORT" ++ TOK_VARIABLE_REQBODY_ERROR_MSG = 316, // "REQBODY_ERROR_MSG" ++ TOK_VARIABLE_REQBODY_ERROR = 317, // "REQBODY_ERROR" ++ TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 318, // "REQBODY_PROCESSOR_ERROR_MSG" ++ TOK_VARIABLE_REQBODY_PROCESSOR_ERROR = 319, // "REQBODY_PROCESSOR_ERROR" ++ TOK_VARIABLE_REQBODY_PROCESSOR = 320, // "REQBODY_PROCESSOR" ++ TOK_VARIABLE_REQUEST_BASENAME = 321, // "REQUEST_BASENAME" ++ TOK_VARIABLE_REQUEST_BODY_LENGTH = 322, // "REQUEST_BODY_LENGTH" ++ TOK_VARIABLE_REQUEST_BODY = 323, // "REQUEST_BODY" ++ TOK_VARIABLE_REQUEST_FILE_NAME = 324, // "REQUEST_FILENAME" ++ TOK_VARIABLE_REQUEST_HEADERS_NAMES = 325, // VARIABLE_REQUEST_HEADERS_NAMES ++ TOK_VARIABLE_REQUEST_LINE = 326, // "REQUEST_LINE" ++ TOK_VARIABLE_REQUEST_METHOD = 327, // "REQUEST_METHOD" ++ TOK_VARIABLE_REQUEST_PROTOCOL = 328, // "REQUEST_PROTOCOL" ++ TOK_VARIABLE_REQUEST_URI_RAW = 329, // "REQUEST_URI_RAW" ++ TOK_VARIABLE_REQUEST_URI = 330, // "REQUEST_URI" ++ TOK_VARIABLE_RESOURCE = 331, // "RESOURCE" ++ TOK_VARIABLE_RESPONSE_BODY = 332, // "RESPONSE_BODY" ++ TOK_VARIABLE_RESPONSE_CONTENT_LENGTH = 333, // "RESPONSE_CONTENT_LENGTH" ++ TOK_VARIABLE_RESPONSE_CONTENT_TYPE = 334, // VARIABLE_RESPONSE_CONTENT_TYPE ++ TOK_VARIABLE_RESPONSE_HEADERS_NAMES = 335, // VARIABLE_RESPONSE_HEADERS_NAMES ++ TOK_VARIABLE_RESPONSE_PROTOCOL = 336, // "RESPONSE_PROTOCOL" ++ TOK_VARIABLE_RESPONSE_STATUS = 337, // "RESPONSE_STATUS" ++ TOK_VARIABLE_SERVER_ADDR = 338, // "SERVER_ADDR" ++ TOK_VARIABLE_SERVER_NAME = 339, // "SERVER_NAME" ++ TOK_VARIABLE_SERVER_PORT = 340, // "SERVER_PORT" ++ TOK_VARIABLE_SESSION_ID = 341, // "SESSIONID" ++ TOK_VARIABLE_UNIQUE_ID = 342, // "UNIQUE_ID" ++ TOK_VARIABLE_URL_ENCODED_ERROR = 343, // "URLENCODED_ERROR" ++ TOK_VARIABLE_USER_ID = 344, // "USERID" ++ TOK_VARIABLE_WEB_APP_ID = 345, // "WEBAPPID" ++ TOK_VARIABLE_STATUS = 346, // "VARIABLE_STATUS" ++ TOK_VARIABLE_STATUS_LINE = 347, // "VARIABLE_STATUS_LINE" ++ TOK_VARIABLE_IP = 348, // "VARIABLE_IP" ++ TOK_VARIABLE_GLOBAL = 349, // "VARIABLE_GLOBAL" ++ TOK_VARIABLE_TX = 350, // "VARIABLE_TX" ++ TOK_VARIABLE_SESSION = 351, // "VARIABLE_SESSION" ++ TOK_VARIABLE_USER = 352, // "VARIABLE_USER" ++ TOK_RUN_TIME_VAR_ENV = 353, // "RUN_TIME_VAR_ENV" ++ TOK_RUN_TIME_VAR_XML = 354, // "RUN_TIME_VAR_XML" ++ TOK_ACTION_SETVAR = 355, // "SetVar" ++ TOK_SETVAR_OPERATION_EQUALS = 356, // SETVAR_OPERATION_EQUALS ++ TOK_SETVAR_OPERATION_EQUALS_PLUS = 357, // SETVAR_OPERATION_EQUALS_PLUS ++ TOK_SETVAR_OPERATION_EQUALS_MINUS = 358, // SETVAR_OPERATION_EQUALS_MINUS ++ TOK_NOT = 359, // "NOT" ++ TOK_OPERATOR_BEGINS_WITH = 360, // "OPERATOR_BEGINS_WITH" ++ TOK_OPERATOR_CONTAINS = 361, // "OPERATOR_CONTAINS" ++ TOK_OPERATOR_CONTAINS_WORD = 362, // "OPERATOR_CONTAINS_WORD" ++ TOK_OPERATOR_DETECT_SQLI = 363, // "OPERATOR_DETECT_SQLI" ++ TOK_OPERATOR_DETECT_XSS = 364, // "OPERATOR_DETECT_XSS" ++ TOK_OPERATOR_ENDS_WITH = 365, // "OPERATOR_ENDS_WITH" ++ TOK_OPERATOR_EQ = 366, // "OPERATOR_EQ" ++ TOK_OPERATOR_FUZZY_HASH = 367, // "OPERATOR_FUZZY_HASH" ++ TOK_OPERATOR_GEOLOOKUP = 368, // "OPERATOR_GEOLOOKUP" ++ TOK_OPERATOR_GE = 369, // "OPERATOR_GE" ++ TOK_OPERATOR_GSB_LOOKUP = 370, // "OPERATOR_GSB_LOOKUP" ++ TOK_OPERATOR_GT = 371, // "OPERATOR_GT" ++ TOK_OPERATOR_INSPECT_FILE = 372, // "OPERATOR_INSPECT_FILE" ++ TOK_OPERATOR_IP_MATCH_FROM_FILE = 373, // "OPERATOR_IP_MATCH_FROM_FILE" ++ TOK_OPERATOR_IP_MATCH = 374, // "OPERATOR_IP_MATCH" ++ TOK_OPERATOR_LE = 375, // "OPERATOR_LE" ++ TOK_OPERATOR_LT = 376, // "OPERATOR_LT" ++ TOK_OPERATOR_PM_FROM_FILE = 377, // "OPERATOR_PM_FROM_FILE" ++ TOK_OPERATOR_PM = 378, // "OPERATOR_PM" ++ TOK_OPERATOR_RBL = 379, // "OPERATOR_RBL" ++ TOK_OPERATOR_RSUB = 380, // "OPERATOR_RSUB" ++ TOK_OPERATOR_RX_CONTENT_ONLY = 381, // "Operator RX (content only)" ++ TOK_OPERATOR_RX = 382, // "OPERATOR_RX" ++ TOK_OPERATOR_RX_GLOBAL = 383, // "OPERATOR_RX_GLOBAL" ++ TOK_OPERATOR_STR_EQ = 384, // "OPERATOR_STR_EQ" ++ TOK_OPERATOR_STR_MATCH = 385, // "OPERATOR_STR_MATCH" ++ TOK_OPERATOR_UNCONDITIONAL_MATCH = 386, // "OPERATOR_UNCONDITIONAL_MATCH" ++ TOK_OPERATOR_VALIDATE_BYTE_RANGE = 387, // "OPERATOR_VALIDATE_BYTE_RANGE" ++ TOK_OPERATOR_VALIDATE_DTD = 388, // "OPERATOR_VALIDATE_DTD" ++ TOK_OPERATOR_VALIDATE_HASH = 389, // "OPERATOR_VALIDATE_HASH" ++ TOK_OPERATOR_VALIDATE_SCHEMA = 390, // "OPERATOR_VALIDATE_SCHEMA" ++ TOK_OPERATOR_VALIDATE_URL_ENCODING = 391, // "OPERATOR_VALIDATE_URL_ENCODING" ++ TOK_OPERATOR_VALIDATE_UTF8_ENCODING = 392, // "OPERATOR_VALIDATE_UTF8_ENCODING" ++ TOK_OPERATOR_VERIFY_CC = 393, // "OPERATOR_VERIFY_CC" ++ TOK_OPERATOR_VERIFY_CPF = 394, // "OPERATOR_VERIFY_CPF" ++ TOK_OPERATOR_VERIFY_SSN = 395, // "OPERATOR_VERIFY_SSN" ++ TOK_OPERATOR_VERIFY_SVNR = 396, // "OPERATOR_VERIFY_SVNR" ++ TOK_OPERATOR_WITHIN = 397, // "OPERATOR_WITHIN" ++ TOK_CONFIG_DIR_AUDIT_LOG_FMT = 398, // CONFIG_DIR_AUDIT_LOG_FMT ++ TOK_JSON = 399, // JSON ++ TOK_NATIVE = 400, // NATIVE ++ TOK_ACTION_CTL_RULE_ENGINE = 401, // "ACTION_CTL_RULE_ENGINE" ++ TOK_ACTION_ACCURACY = 402, // "Accuracy" ++ TOK_ACTION_ALLOW = 403, // "Allow" ++ TOK_ACTION_APPEND = 404, // "Append" ++ TOK_ACTION_AUDIT_LOG = 405, // "AuditLog" ++ TOK_ACTION_BLOCK = 406, // "Block" ++ TOK_ACTION_CAPTURE = 407, // "Capture" ++ TOK_ACTION_CHAIN = 408, // "Chain" ++ TOK_ACTION_CTL_AUDIT_ENGINE = 409, // "ACTION_CTL_AUDIT_ENGINE" ++ TOK_ACTION_CTL_AUDIT_LOG_PARTS = 410, // "ACTION_CTL_AUDIT_LOG_PARTS" ++ TOK_ACTION_CTL_BDY_JSON = 411, // "ACTION_CTL_BDY_JSON" ++ TOK_ACTION_CTL_BDY_XML = 412, // "ACTION_CTL_BDY_XML" ++ TOK_ACTION_CTL_BDY_URLENCODED = 413, // "ACTION_CTL_BDY_URLENCODED" ++ TOK_ACTION_CTL_FORCE_REQ_BODY_VAR = 414, // "ACTION_CTL_FORCE_REQ_BODY_VAR" ++ TOK_ACTION_CTL_REQUEST_BODY_ACCESS = 415, // "ACTION_CTL_REQUEST_BODY_ACCESS" ++ TOK_ACTION_CTL_RULE_REMOVE_BY_ID = 416, // "ACTION_CTL_RULE_REMOVE_BY_ID" ++ TOK_ACTION_CTL_RULE_REMOVE_BY_TAG = 417, // "ACTION_CTL_RULE_REMOVE_BY_TAG" ++ TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 418, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" ++ TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 419, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" ++ TOK_ACTION_DENY = 420, // "Deny" ++ TOK_ACTION_DEPRECATE_VAR = 421, // "DeprecateVar" ++ TOK_ACTION_DROP = 422, // "Drop" ++ TOK_ACTION_EXEC = 423, // "Exec" ++ TOK_ACTION_EXPIRE_VAR = 424, // "ExpireVar" ++ TOK_ACTION_ID = 425, // "Id" ++ TOK_ACTION_INITCOL = 426, // "InitCol" ++ TOK_ACTION_LOG = 427, // "Log" ++ TOK_ACTION_LOG_DATA = 428, // "LogData" ++ TOK_ACTION_MATURITY = 429, // "Maturity" ++ TOK_ACTION_MSG = 430, // "Msg" ++ TOK_ACTION_MULTI_MATCH = 431, // "MultiMatch" ++ TOK_ACTION_NO_AUDIT_LOG = 432, // "NoAuditLog" ++ TOK_ACTION_NO_LOG = 433, // "NoLog" ++ TOK_ACTION_PASS = 434, // "Pass" ++ TOK_ACTION_PAUSE = 435, // "Pause" ++ TOK_ACTION_PHASE = 436, // "Phase" ++ TOK_ACTION_PREPEND = 437, // "Prepend" ++ TOK_ACTION_PROXY = 438, // "Proxy" ++ TOK_ACTION_REDIRECT = 439, // "Redirect" ++ TOK_ACTION_REV = 440, // "Rev" ++ TOK_ACTION_SANITISE_ARG = 441, // "SanitiseArg" ++ TOK_ACTION_SANITISE_MATCHED = 442, // "SanitiseMatched" ++ TOK_ACTION_SANITISE_MATCHED_BYTES = 443, // "SanitiseMatchedBytes" ++ TOK_ACTION_SANITISE_REQUEST_HEADER = 444, // "SanitiseRequestHeader" ++ TOK_ACTION_SANITISE_RESPONSE_HEADER = 445, // "SanitiseResponseHeader" ++ TOK_ACTION_SETENV = 446, // "SetEnv" ++ TOK_ACTION_SETRSC = 447, // "SetRsc" ++ TOK_ACTION_SETSID = 448, // "SetSid" ++ TOK_ACTION_SETUID = 449, // "SetUID" ++ TOK_ACTION_SEVERITY = 450, // "Severity" ++ TOK_ACTION_SKIP = 451, // "Skip" ++ TOK_ACTION_SKIP_AFTER = 452, // "SkipAfter" ++ TOK_ACTION_STATUS = 453, // "Status" ++ TOK_ACTION_TAG = 454, // "Tag" ++ TOK_ACTION_TRANSFORMATION_BASE_64_ENCODE = 455, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" ++ TOK_ACTION_TRANSFORMATION_BASE_64_DECODE = 456, // "ACTION_TRANSFORMATION_BASE_64_DECODE" ++ TOK_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 457, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" ++ TOK_ACTION_TRANSFORMATION_CMD_LINE = 458, // "ACTION_TRANSFORMATION_CMD_LINE" ++ TOK_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 459, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" ++ TOK_ACTION_TRANSFORMATION_CSS_DECODE = 460, // "ACTION_TRANSFORMATION_CSS_DECODE" ++ TOK_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 461, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" ++ TOK_ACTION_TRANSFORMATION_HEX_ENCODE = 462, // "ACTION_TRANSFORMATION_HEX_ENCODE" ++ TOK_ACTION_TRANSFORMATION_HEX_DECODE = 463, // "ACTION_TRANSFORMATION_HEX_DECODE" ++ TOK_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 464, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" ++ TOK_ACTION_TRANSFORMATION_JS_DECODE = 465, // "ACTION_TRANSFORMATION_JS_DECODE" ++ TOK_ACTION_TRANSFORMATION_LENGTH = 466, // "ACTION_TRANSFORMATION_LENGTH" ++ TOK_ACTION_TRANSFORMATION_LOWERCASE = 467, // "ACTION_TRANSFORMATION_LOWERCASE" ++ TOK_ACTION_TRANSFORMATION_MD5 = 468, // "ACTION_TRANSFORMATION_MD5" ++ TOK_ACTION_TRANSFORMATION_NONE = 469, // "ACTION_TRANSFORMATION_NONE" ++ TOK_ACTION_TRANSFORMATION_NORMALISE_PATH = 470, // "ACTION_TRANSFORMATION_NORMALISE_PATH" ++ TOK_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 471, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" ++ TOK_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 472, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" ++ TOK_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 473, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" ++ TOK_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 474, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" ++ TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 475, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" ++ TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 476, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" ++ TOK_ACTION_TRANSFORMATION_REMOVE_NULLS = 477, // "ACTION_TRANSFORMATION_REMOVE_NULLS" ++ TOK_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 478, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" ++ TOK_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 479, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" ++ TOK_ACTION_TRANSFORMATION_REPLACE_NULLS = 480, // "ACTION_TRANSFORMATION_REPLACE_NULLS" ++ TOK_ACTION_TRANSFORMATION_SHA1 = 481, // "ACTION_TRANSFORMATION_SHA1" ++ TOK_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 482, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" ++ TOK_ACTION_TRANSFORMATION_TRIM = 483, // "ACTION_TRANSFORMATION_TRIM" ++ TOK_ACTION_TRANSFORMATION_TRIM_LEFT = 484, // "ACTION_TRANSFORMATION_TRIM_LEFT" ++ TOK_ACTION_TRANSFORMATION_TRIM_RIGHT = 485, // "ACTION_TRANSFORMATION_TRIM_RIGHT" ++ TOK_ACTION_TRANSFORMATION_UPPERCASE = 486, // "ACTION_TRANSFORMATION_UPPERCASE" ++ TOK_ACTION_TRANSFORMATION_URL_ENCODE = 487, // "ACTION_TRANSFORMATION_URL_ENCODE" ++ TOK_ACTION_TRANSFORMATION_URL_DECODE = 488, // "ACTION_TRANSFORMATION_URL_DECODE" ++ TOK_ACTION_TRANSFORMATION_URL_DECODE_UNI = 489, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" ++ TOK_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 490, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" ++ TOK_ACTION_VER = 491, // "Ver" ++ TOK_ACTION_XMLNS = 492, // "xmlns" ++ TOK_CONFIG_COMPONENT_SIG = 493, // "CONFIG_COMPONENT_SIG" ++ TOK_CONFIG_CONN_ENGINE = 494, // "CONFIG_CONN_ENGINE" ++ TOK_CONFIG_SEC_ARGUMENT_SEPARATOR = 495, // "CONFIG_SEC_ARGUMENT_SEPARATOR" ++ TOK_CONFIG_SEC_WEB_APP_ID = 496, // "CONFIG_SEC_WEB_APP_ID" ++ TOK_CONFIG_SEC_SERVER_SIG = 497, // "CONFIG_SEC_SERVER_SIG" ++ TOK_CONFIG_DIR_AUDIT_DIR = 498, // "CONFIG_DIR_AUDIT_DIR" ++ TOK_CONFIG_DIR_AUDIT_DIR_MOD = 499, // "CONFIG_DIR_AUDIT_DIR_MOD" ++ TOK_CONFIG_DIR_AUDIT_ENG = 500, // "CONFIG_DIR_AUDIT_ENG" ++ TOK_CONFIG_DIR_AUDIT_FLE_MOD = 501, // "CONFIG_DIR_AUDIT_FLE_MOD" ++ TOK_CONFIG_DIR_AUDIT_LOG = 502, // "CONFIG_DIR_AUDIT_LOG" ++ TOK_CONFIG_DIR_AUDIT_LOG2 = 503, // "CONFIG_DIR_AUDIT_LOG2" ++ TOK_CONFIG_DIR_AUDIT_LOG_P = 504, // "CONFIG_DIR_AUDIT_LOG_P" ++ TOK_CONFIG_DIR_AUDIT_STS = 505, // "CONFIG_DIR_AUDIT_STS" ++ TOK_CONFIG_DIR_AUDIT_TPE = 506, // "CONFIG_DIR_AUDIT_TPE" ++ TOK_CONFIG_DIR_DEBUG_LOG = 507, // "CONFIG_DIR_DEBUG_LOG" ++ TOK_CONFIG_DIR_DEBUG_LVL = 508, // "CONFIG_DIR_DEBUG_LVL" ++ TOK_CONFIG_SEC_CACHE_TRANSFORMATIONS = 509, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" ++ TOK_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 510, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" ++ TOK_CONFIG_SEC_HASH_ENGINE = 511, // "CONFIG_SEC_HASH_ENGINE" ++ TOK_CONFIG_SEC_HASH_KEY = 512, // "CONFIG_SEC_HASH_KEY" ++ TOK_CONFIG_SEC_HASH_PARAM = 513, // "CONFIG_SEC_HASH_PARAM" ++ TOK_CONFIG_SEC_HASH_METHOD_RX = 514, // "CONFIG_SEC_HASH_METHOD_RX" ++ TOK_CONFIG_SEC_HASH_METHOD_PM = 515, // "CONFIG_SEC_HASH_METHOD_PM" ++ TOK_CONFIG_SEC_CHROOT_DIR = 516, // "CONFIG_SEC_CHROOT_DIR" ++ TOK_CONFIG_DIR_GEO_DB = 517, // "CONFIG_DIR_GEO_DB" ++ TOK_CONFIG_DIR_GSB_DB = 518, // "CONFIG_DIR_GSB_DB" ++ TOK_CONFIG_SEC_GUARDIAN_LOG = 519, // "CONFIG_SEC_GUARDIAN_LOG" ++ TOK_CONFIG_DIR_PCRE_MATCH_LIMIT = 520, // "CONFIG_DIR_PCRE_MATCH_LIMIT" ++ TOK_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 521, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" ++ TOK_CONFIG_SEC_CONN_R_STATE_LIMIT = 522, // "CONFIG_SEC_CONN_R_STATE_LIMIT" ++ TOK_CONFIG_SEC_CONN_W_STATE_LIMIT = 523, // "CONFIG_SEC_CONN_W_STATE_LIMIT" ++ TOK_CONFIG_SEC_SENSOR_ID = 524, // "CONFIG_SEC_SENSOR_ID" ++ TOK_CONFIG_DIR_ARGS_LIMIT = 525, // "CONFIG_DIR_ARGS_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 526, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY = 527, // "CONFIG_DIR_REQ_BODY" ++ TOK_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 528, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY_LIMIT = 529, // "CONFIG_DIR_REQ_BODY_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 530, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" ++ TOK_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 531, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" ++ TOK_CONFIG_DIR_RES_BODY = 532, // "CONFIG_DIR_RES_BODY" ++ TOK_CONFIG_DIR_RES_BODY_LIMIT = 533, // "CONFIG_DIR_RES_BODY_LIMIT" ++ TOK_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 534, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" ++ TOK_CONFIG_SEC_RULE_INHERITANCE = 535, // "CONFIG_SEC_RULE_INHERITANCE" ++ TOK_CONFIG_SEC_RULE_PERF_TIME = 536, // "CONFIG_SEC_RULE_PERF_TIME" ++ TOK_CONFIG_DIR_RULE_ENG = 537, // "CONFIG_DIR_RULE_ENG" ++ TOK_CONFIG_DIR_SEC_ACTION = 538, // "CONFIG_DIR_SEC_ACTION" ++ TOK_CONFIG_DIR_SEC_DEFAULT_ACTION = 539, // "CONFIG_DIR_SEC_DEFAULT_ACTION" ++ TOK_CONFIG_DIR_SEC_MARKER = 540, // "CONFIG_DIR_SEC_MARKER" ++ TOK_CONFIG_DIR_UNICODE_MAP_FILE = 541, // "CONFIG_DIR_UNICODE_MAP_FILE" ++ TOK_CONFIG_DIR_UNICODE_CODE_PAGE = 542, // "CONFIG_DIR_UNICODE_CODE_PAGE" ++ TOK_CONFIG_SEC_COLLECTION_TIMEOUT = 543, // "CONFIG_SEC_COLLECTION_TIMEOUT" ++ TOK_CONFIG_SEC_HTTP_BLKEY = 544, // "CONFIG_SEC_HTTP_BLKEY" ++ TOK_CONFIG_SEC_INTERCEPT_ON_ERROR = 545, // "CONFIG_SEC_INTERCEPT_ON_ERROR" ++ TOK_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 546, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" ++ TOK_CONFIG_SEC_RULE_REMOVE_BY_ID = 547, // "CONFIG_SEC_RULE_REMOVE_BY_ID" ++ TOK_CONFIG_SEC_RULE_REMOVE_BY_MSG = 548, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" ++ TOK_CONFIG_SEC_RULE_REMOVE_BY_TAG = 549, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" ++ TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 550, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" ++ TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 551, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" ++ TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 552, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" ++ TOK_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 553, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" ++ TOK_CONFIG_UPDLOAD_KEEP_FILES = 554, // "CONFIG_UPDLOAD_KEEP_FILES" ++ TOK_CONFIG_UPDLOAD_SAVE_TMP_FILES = 555, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" ++ TOK_CONFIG_UPLOAD_DIR = 556, // "CONFIG_UPLOAD_DIR" ++ TOK_CONFIG_UPLOAD_FILE_LIMIT = 557, // "CONFIG_UPLOAD_FILE_LIMIT" ++ TOK_CONFIG_UPLOAD_FILE_MODE = 558, // "CONFIG_UPLOAD_FILE_MODE" ++ TOK_CONFIG_VALUE_ABORT = 559, // "CONFIG_VALUE_ABORT" ++ TOK_CONFIG_VALUE_DETC = 560, // "CONFIG_VALUE_DETC" ++ TOK_CONFIG_VALUE_HTTPS = 561, // "CONFIG_VALUE_HTTPS" ++ TOK_CONFIG_VALUE_OFF = 562, // "CONFIG_VALUE_OFF" ++ TOK_CONFIG_VALUE_ON = 563, // "CONFIG_VALUE_ON" ++ TOK_CONFIG_VALUE_PARALLEL = 564, // "CONFIG_VALUE_PARALLEL" ++ TOK_CONFIG_VALUE_PROCESS_PARTIAL = 565, // "CONFIG_VALUE_PROCESS_PARTIAL" ++ TOK_CONFIG_VALUE_REJECT = 566, // "CONFIG_VALUE_REJECT" ++ TOK_CONFIG_VALUE_RELEVANT_ONLY = 567, // "CONFIG_VALUE_RELEVANT_ONLY" ++ TOK_CONFIG_VALUE_SERIAL = 568, // "CONFIG_VALUE_SERIAL" ++ TOK_CONFIG_VALUE_WARN = 569, // "CONFIG_VALUE_WARN" ++ TOK_CONFIG_XML_EXTERNAL_ENTITY = 570, // "CONFIG_XML_EXTERNAL_ENTITY" ++ TOK_CONGIG_DIR_RESPONSE_BODY_MP = 571, // "CONGIG_DIR_RESPONSE_BODY_MP" ++ TOK_CONGIG_DIR_SEC_ARG_SEP = 572, // "CONGIG_DIR_SEC_ARG_SEP" ++ TOK_CONGIG_DIR_SEC_COOKIE_FORMAT = 573, // "CONGIG_DIR_SEC_COOKIE_FORMAT" ++ TOK_CONFIG_SEC_COOKIEV0_SEPARATOR = 574, // "CONFIG_SEC_COOKIEV0_SEPARATOR" ++ TOK_CONGIG_DIR_SEC_DATA_DIR = 575, // "CONGIG_DIR_SEC_DATA_DIR" ++ TOK_CONGIG_DIR_SEC_STATUS_ENGINE = 576, // "CONGIG_DIR_SEC_STATUS_ENGINE" ++ TOK_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 577, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" ++ TOK_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 578, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" ++ TOK_CONGIG_DIR_SEC_TMP_DIR = 579, // "CONGIG_DIR_SEC_TMP_DIR" ++ TOK_DIRECTIVE = 580, // "DIRECTIVE" ++ TOK_DIRECTIVE_SECRULESCRIPT = 581, // "DIRECTIVE_SECRULESCRIPT" ++ TOK_FREE_TEXT_QUOTE_MACRO_EXPANSION = 582, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++ TOK_QUOTATION_MARK = 583, // "QUOTATION_MARK" ++ TOK_RUN_TIME_VAR_BLD = 584, // "RUN_TIME_VAR_BLD" ++ TOK_RUN_TIME_VAR_DUR = 585, // "RUN_TIME_VAR_DUR" ++ TOK_RUN_TIME_VAR_HSV = 586, // "RUN_TIME_VAR_HSV" ++ TOK_RUN_TIME_VAR_REMOTE_USER = 587, // "RUN_TIME_VAR_REMOTE_USER" ++ TOK_RUN_TIME_VAR_TIME = 588, // "RUN_TIME_VAR_TIME" ++ TOK_RUN_TIME_VAR_TIME_DAY = 589, // "RUN_TIME_VAR_TIME_DAY" ++ TOK_RUN_TIME_VAR_TIME_EPOCH = 590, // "RUN_TIME_VAR_TIME_EPOCH" ++ TOK_RUN_TIME_VAR_TIME_HOUR = 591, // "RUN_TIME_VAR_TIME_HOUR" ++ TOK_RUN_TIME_VAR_TIME_MIN = 592, // "RUN_TIME_VAR_TIME_MIN" ++ TOK_RUN_TIME_VAR_TIME_MON = 593, // "RUN_TIME_VAR_TIME_MON" ++ TOK_RUN_TIME_VAR_TIME_SEC = 594, // "RUN_TIME_VAR_TIME_SEC" ++ TOK_RUN_TIME_VAR_TIME_WDAY = 595, // "RUN_TIME_VAR_TIME_WDAY" ++ TOK_RUN_TIME_VAR_TIME_YEAR = 596, // "RUN_TIME_VAR_TIME_YEAR" ++ TOK_VARIABLE = 597, // "VARIABLE" ++ TOK_DICT_ELEMENT = 598, // "Dictionary element" ++ TOK_DICT_ELEMENT_REGEXP = 599 // "Dictionary element, selected by regexp" + }; + /// Backward compatibility alias (Bison 3.6). + typedef token_kind_type yytokentype; +@@ -1329,7 +1331,7 @@ namespace yy { + { + enum symbol_kind_type + { +- YYNTOKENS = 344, ///< Number of tokens. ++ YYNTOKENS = 345, ///< Number of tokens. + S_YYEMPTY = -2, + S_YYEOF = 0, // "end of file" + S_YYerror = 1, // error +@@ -1357,340 +1359,341 @@ namespace yy { + S_VARIABLE_RESPONSE_HEADERS = 23, // VARIABLE_RESPONSE_HEADERS + S_VARIABLE_GEO = 24, // VARIABLE_GEO + S_VARIABLE_REQUEST_COOKIES_NAMES = 25, // VARIABLE_REQUEST_COOKIES_NAMES +- S_VARIABLE_ARGS_COMBINED_SIZE = 26, // VARIABLE_ARGS_COMBINED_SIZE +- S_VARIABLE_ARGS_GET_NAMES = 27, // VARIABLE_ARGS_GET_NAMES +- S_VARIABLE_RULE = 28, // VARIABLE_RULE +- S_VARIABLE_ARGS_NAMES = 29, // "Variable ARGS_NAMES" +- S_VARIABLE_ARGS_POST_NAMES = 30, // VARIABLE_ARGS_POST_NAMES +- S_VARIABLE_AUTH_TYPE = 31, // "AUTH_TYPE" +- S_VARIABLE_FILES_COMBINED_SIZE = 32, // "FILES_COMBINED_SIZE" +- S_VARIABLE_FILES_TMP_NAMES = 33, // "FILES_TMPNAMES" +- S_VARIABLE_FULL_REQUEST = 34, // "FULL_REQUEST" +- S_VARIABLE_FULL_REQUEST_LENGTH = 35, // "FULL_REQUEST_LENGTH" +- S_VARIABLE_INBOUND_DATA_ERROR = 36, // "INBOUND_DATA_ERROR" +- S_VARIABLE_MATCHED_VAR = 37, // "MATCHED_VAR" +- S_VARIABLE_MATCHED_VAR_NAME = 38, // "MATCHED_VAR_NAME" +- S_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 39, // VARIABLE_MULTIPART_BOUNDARY_QUOTED +- S_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 40, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE +- S_VARIABLE_MULTIPART_CRLF_LF_LINES = 41, // "MULTIPART_CRLF_LF_LINES" +- S_VARIABLE_MULTIPART_DATA_AFTER = 42, // "MULTIPART_DATA_AFTER" +- S_VARIABLE_MULTIPART_DATA_BEFORE = 43, // VARIABLE_MULTIPART_DATA_BEFORE +- S_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 44, // "MULTIPART_FILE_LIMIT_EXCEEDED" +- S_VARIABLE_MULTIPART_HEADER_FOLDING = 45, // "MULTIPART_HEADER_FOLDING" +- S_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 46, // "MULTIPART_INVALID_HEADER_FOLDING" +- S_VARIABLE_MULTIPART_INVALID_PART = 47, // VARIABLE_MULTIPART_INVALID_PART +- S_VARIABLE_MULTIPART_INVALID_QUOTING = 48, // "MULTIPART_INVALID_QUOTING" +- S_VARIABLE_MULTIPART_LF_LINE = 49, // VARIABLE_MULTIPART_LF_LINE +- S_VARIABLE_MULTIPART_MISSING_SEMICOLON = 50, // VARIABLE_MULTIPART_MISSING_SEMICOLON +- S_VARIABLE_MULTIPART_SEMICOLON_MISSING = 51, // VARIABLE_MULTIPART_SEMICOLON_MISSING +- S_VARIABLE_MULTIPART_STRICT_ERROR = 52, // "MULTIPART_STRICT_ERROR" +- S_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 53, // "MULTIPART_UNMATCHED_BOUNDARY" +- S_VARIABLE_OUTBOUND_DATA_ERROR = 54, // "OUTBOUND_DATA_ERROR" +- S_VARIABLE_PATH_INFO = 55, // "PATH_INFO" +- S_VARIABLE_QUERY_STRING = 56, // "QUERY_STRING" +- S_VARIABLE_REMOTE_ADDR = 57, // "REMOTE_ADDR" +- S_VARIABLE_REMOTE_HOST = 58, // "REMOTE_HOST" +- S_VARIABLE_REMOTE_PORT = 59, // "REMOTE_PORT" +- S_VARIABLE_REQBODY_ERROR_MSG = 60, // "REQBODY_ERROR_MSG" +- S_VARIABLE_REQBODY_ERROR = 61, // "REQBODY_ERROR" +- S_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 62, // "REQBODY_PROCESSOR_ERROR_MSG" +- S_VARIABLE_REQBODY_PROCESSOR_ERROR = 63, // "REQBODY_PROCESSOR_ERROR" +- S_VARIABLE_REQBODY_PROCESSOR = 64, // "REQBODY_PROCESSOR" +- S_VARIABLE_REQUEST_BASENAME = 65, // "REQUEST_BASENAME" +- S_VARIABLE_REQUEST_BODY_LENGTH = 66, // "REQUEST_BODY_LENGTH" +- S_VARIABLE_REQUEST_BODY = 67, // "REQUEST_BODY" +- S_VARIABLE_REQUEST_FILE_NAME = 68, // "REQUEST_FILENAME" +- S_VARIABLE_REQUEST_HEADERS_NAMES = 69, // VARIABLE_REQUEST_HEADERS_NAMES +- S_VARIABLE_REQUEST_LINE = 70, // "REQUEST_LINE" +- S_VARIABLE_REQUEST_METHOD = 71, // "REQUEST_METHOD" +- S_VARIABLE_REQUEST_PROTOCOL = 72, // "REQUEST_PROTOCOL" +- S_VARIABLE_REQUEST_URI_RAW = 73, // "REQUEST_URI_RAW" +- S_VARIABLE_REQUEST_URI = 74, // "REQUEST_URI" +- S_VARIABLE_RESOURCE = 75, // "RESOURCE" +- S_VARIABLE_RESPONSE_BODY = 76, // "RESPONSE_BODY" +- S_VARIABLE_RESPONSE_CONTENT_LENGTH = 77, // "RESPONSE_CONTENT_LENGTH" +- S_VARIABLE_RESPONSE_CONTENT_TYPE = 78, // VARIABLE_RESPONSE_CONTENT_TYPE +- S_VARIABLE_RESPONSE_HEADERS_NAMES = 79, // VARIABLE_RESPONSE_HEADERS_NAMES +- S_VARIABLE_RESPONSE_PROTOCOL = 80, // "RESPONSE_PROTOCOL" +- S_VARIABLE_RESPONSE_STATUS = 81, // "RESPONSE_STATUS" +- S_VARIABLE_SERVER_ADDR = 82, // "SERVER_ADDR" +- S_VARIABLE_SERVER_NAME = 83, // "SERVER_NAME" +- S_VARIABLE_SERVER_PORT = 84, // "SERVER_PORT" +- S_VARIABLE_SESSION_ID = 85, // "SESSIONID" +- S_VARIABLE_UNIQUE_ID = 86, // "UNIQUE_ID" +- S_VARIABLE_URL_ENCODED_ERROR = 87, // "URLENCODED_ERROR" +- S_VARIABLE_USER_ID = 88, // "USERID" +- S_VARIABLE_WEB_APP_ID = 89, // "WEBAPPID" +- S_VARIABLE_STATUS = 90, // "VARIABLE_STATUS" +- S_VARIABLE_STATUS_LINE = 91, // "VARIABLE_STATUS_LINE" +- S_VARIABLE_IP = 92, // "VARIABLE_IP" +- S_VARIABLE_GLOBAL = 93, // "VARIABLE_GLOBAL" +- S_VARIABLE_TX = 94, // "VARIABLE_TX" +- S_VARIABLE_SESSION = 95, // "VARIABLE_SESSION" +- S_VARIABLE_USER = 96, // "VARIABLE_USER" +- S_RUN_TIME_VAR_ENV = 97, // "RUN_TIME_VAR_ENV" +- S_RUN_TIME_VAR_XML = 98, // "RUN_TIME_VAR_XML" +- S_ACTION_SETVAR = 99, // "SetVar" +- S_SETVAR_OPERATION_EQUALS = 100, // SETVAR_OPERATION_EQUALS +- S_SETVAR_OPERATION_EQUALS_PLUS = 101, // SETVAR_OPERATION_EQUALS_PLUS +- S_SETVAR_OPERATION_EQUALS_MINUS = 102, // SETVAR_OPERATION_EQUALS_MINUS +- S_NOT = 103, // "NOT" +- S_OPERATOR_BEGINS_WITH = 104, // "OPERATOR_BEGINS_WITH" +- S_OPERATOR_CONTAINS = 105, // "OPERATOR_CONTAINS" +- S_OPERATOR_CONTAINS_WORD = 106, // "OPERATOR_CONTAINS_WORD" +- S_OPERATOR_DETECT_SQLI = 107, // "OPERATOR_DETECT_SQLI" +- S_OPERATOR_DETECT_XSS = 108, // "OPERATOR_DETECT_XSS" +- S_OPERATOR_ENDS_WITH = 109, // "OPERATOR_ENDS_WITH" +- S_OPERATOR_EQ = 110, // "OPERATOR_EQ" +- S_OPERATOR_FUZZY_HASH = 111, // "OPERATOR_FUZZY_HASH" +- S_OPERATOR_GEOLOOKUP = 112, // "OPERATOR_GEOLOOKUP" +- S_OPERATOR_GE = 113, // "OPERATOR_GE" +- S_OPERATOR_GSB_LOOKUP = 114, // "OPERATOR_GSB_LOOKUP" +- S_OPERATOR_GT = 115, // "OPERATOR_GT" +- S_OPERATOR_INSPECT_FILE = 116, // "OPERATOR_INSPECT_FILE" +- S_OPERATOR_IP_MATCH_FROM_FILE = 117, // "OPERATOR_IP_MATCH_FROM_FILE" +- S_OPERATOR_IP_MATCH = 118, // "OPERATOR_IP_MATCH" +- S_OPERATOR_LE = 119, // "OPERATOR_LE" +- S_OPERATOR_LT = 120, // "OPERATOR_LT" +- S_OPERATOR_PM_FROM_FILE = 121, // "OPERATOR_PM_FROM_FILE" +- S_OPERATOR_PM = 122, // "OPERATOR_PM" +- S_OPERATOR_RBL = 123, // "OPERATOR_RBL" +- S_OPERATOR_RSUB = 124, // "OPERATOR_RSUB" +- S_OPERATOR_RX_CONTENT_ONLY = 125, // "Operator RX (content only)" +- S_OPERATOR_RX = 126, // "OPERATOR_RX" +- S_OPERATOR_RX_GLOBAL = 127, // "OPERATOR_RX_GLOBAL" +- S_OPERATOR_STR_EQ = 128, // "OPERATOR_STR_EQ" +- S_OPERATOR_STR_MATCH = 129, // "OPERATOR_STR_MATCH" +- S_OPERATOR_UNCONDITIONAL_MATCH = 130, // "OPERATOR_UNCONDITIONAL_MATCH" +- S_OPERATOR_VALIDATE_BYTE_RANGE = 131, // "OPERATOR_VALIDATE_BYTE_RANGE" +- S_OPERATOR_VALIDATE_DTD = 132, // "OPERATOR_VALIDATE_DTD" +- S_OPERATOR_VALIDATE_HASH = 133, // "OPERATOR_VALIDATE_HASH" +- S_OPERATOR_VALIDATE_SCHEMA = 134, // "OPERATOR_VALIDATE_SCHEMA" +- S_OPERATOR_VALIDATE_URL_ENCODING = 135, // "OPERATOR_VALIDATE_URL_ENCODING" +- S_OPERATOR_VALIDATE_UTF8_ENCODING = 136, // "OPERATOR_VALIDATE_UTF8_ENCODING" +- S_OPERATOR_VERIFY_CC = 137, // "OPERATOR_VERIFY_CC" +- S_OPERATOR_VERIFY_CPF = 138, // "OPERATOR_VERIFY_CPF" +- S_OPERATOR_VERIFY_SSN = 139, // "OPERATOR_VERIFY_SSN" +- S_OPERATOR_VERIFY_SVNR = 140, // "OPERATOR_VERIFY_SVNR" +- S_OPERATOR_WITHIN = 141, // "OPERATOR_WITHIN" +- S_CONFIG_DIR_AUDIT_LOG_FMT = 142, // CONFIG_DIR_AUDIT_LOG_FMT +- S_JSON = 143, // JSON +- S_NATIVE = 144, // NATIVE +- S_ACTION_CTL_RULE_ENGINE = 145, // "ACTION_CTL_RULE_ENGINE" +- S_ACTION_ACCURACY = 146, // "Accuracy" +- S_ACTION_ALLOW = 147, // "Allow" +- S_ACTION_APPEND = 148, // "Append" +- S_ACTION_AUDIT_LOG = 149, // "AuditLog" +- S_ACTION_BLOCK = 150, // "Block" +- S_ACTION_CAPTURE = 151, // "Capture" +- S_ACTION_CHAIN = 152, // "Chain" +- S_ACTION_CTL_AUDIT_ENGINE = 153, // "ACTION_CTL_AUDIT_ENGINE" +- S_ACTION_CTL_AUDIT_LOG_PARTS = 154, // "ACTION_CTL_AUDIT_LOG_PARTS" +- S_ACTION_CTL_BDY_JSON = 155, // "ACTION_CTL_BDY_JSON" +- S_ACTION_CTL_BDY_XML = 156, // "ACTION_CTL_BDY_XML" +- S_ACTION_CTL_BDY_URLENCODED = 157, // "ACTION_CTL_BDY_URLENCODED" +- S_ACTION_CTL_FORCE_REQ_BODY_VAR = 158, // "ACTION_CTL_FORCE_REQ_BODY_VAR" +- S_ACTION_CTL_REQUEST_BODY_ACCESS = 159, // "ACTION_CTL_REQUEST_BODY_ACCESS" +- S_ACTION_CTL_RULE_REMOVE_BY_ID = 160, // "ACTION_CTL_RULE_REMOVE_BY_ID" +- S_ACTION_CTL_RULE_REMOVE_BY_TAG = 161, // "ACTION_CTL_RULE_REMOVE_BY_TAG" +- S_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 162, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" +- S_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 163, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" +- S_ACTION_DENY = 164, // "Deny" +- S_ACTION_DEPRECATE_VAR = 165, // "DeprecateVar" +- S_ACTION_DROP = 166, // "Drop" +- S_ACTION_EXEC = 167, // "Exec" +- S_ACTION_EXPIRE_VAR = 168, // "ExpireVar" +- S_ACTION_ID = 169, // "Id" +- S_ACTION_INITCOL = 170, // "InitCol" +- S_ACTION_LOG = 171, // "Log" +- S_ACTION_LOG_DATA = 172, // "LogData" +- S_ACTION_MATURITY = 173, // "Maturity" +- S_ACTION_MSG = 174, // "Msg" +- S_ACTION_MULTI_MATCH = 175, // "MultiMatch" +- S_ACTION_NO_AUDIT_LOG = 176, // "NoAuditLog" +- S_ACTION_NO_LOG = 177, // "NoLog" +- S_ACTION_PASS = 178, // "Pass" +- S_ACTION_PAUSE = 179, // "Pause" +- S_ACTION_PHASE = 180, // "Phase" +- S_ACTION_PREPEND = 181, // "Prepend" +- S_ACTION_PROXY = 182, // "Proxy" +- S_ACTION_REDIRECT = 183, // "Redirect" +- S_ACTION_REV = 184, // "Rev" +- S_ACTION_SANITISE_ARG = 185, // "SanitiseArg" +- S_ACTION_SANITISE_MATCHED = 186, // "SanitiseMatched" +- S_ACTION_SANITISE_MATCHED_BYTES = 187, // "SanitiseMatchedBytes" +- S_ACTION_SANITISE_REQUEST_HEADER = 188, // "SanitiseRequestHeader" +- S_ACTION_SANITISE_RESPONSE_HEADER = 189, // "SanitiseResponseHeader" +- S_ACTION_SETENV = 190, // "SetEnv" +- S_ACTION_SETRSC = 191, // "SetRsc" +- S_ACTION_SETSID = 192, // "SetSid" +- S_ACTION_SETUID = 193, // "SetUID" +- S_ACTION_SEVERITY = 194, // "Severity" +- S_ACTION_SKIP = 195, // "Skip" +- S_ACTION_SKIP_AFTER = 196, // "SkipAfter" +- S_ACTION_STATUS = 197, // "Status" +- S_ACTION_TAG = 198, // "Tag" +- S_ACTION_TRANSFORMATION_BASE_64_ENCODE = 199, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" +- S_ACTION_TRANSFORMATION_BASE_64_DECODE = 200, // "ACTION_TRANSFORMATION_BASE_64_DECODE" +- S_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 201, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" +- S_ACTION_TRANSFORMATION_CMD_LINE = 202, // "ACTION_TRANSFORMATION_CMD_LINE" +- S_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 203, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" +- S_ACTION_TRANSFORMATION_CSS_DECODE = 204, // "ACTION_TRANSFORMATION_CSS_DECODE" +- S_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 205, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" +- S_ACTION_TRANSFORMATION_HEX_ENCODE = 206, // "ACTION_TRANSFORMATION_HEX_ENCODE" +- S_ACTION_TRANSFORMATION_HEX_DECODE = 207, // "ACTION_TRANSFORMATION_HEX_DECODE" +- S_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 208, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" +- S_ACTION_TRANSFORMATION_JS_DECODE = 209, // "ACTION_TRANSFORMATION_JS_DECODE" +- S_ACTION_TRANSFORMATION_LENGTH = 210, // "ACTION_TRANSFORMATION_LENGTH" +- S_ACTION_TRANSFORMATION_LOWERCASE = 211, // "ACTION_TRANSFORMATION_LOWERCASE" +- S_ACTION_TRANSFORMATION_MD5 = 212, // "ACTION_TRANSFORMATION_MD5" +- S_ACTION_TRANSFORMATION_NONE = 213, // "ACTION_TRANSFORMATION_NONE" +- S_ACTION_TRANSFORMATION_NORMALISE_PATH = 214, // "ACTION_TRANSFORMATION_NORMALISE_PATH" +- S_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 215, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" +- S_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 216, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" +- S_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 217, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" +- S_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 218, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" +- S_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 219, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" +- S_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 220, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" +- S_ACTION_TRANSFORMATION_REMOVE_NULLS = 221, // "ACTION_TRANSFORMATION_REMOVE_NULLS" +- S_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 222, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" +- S_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 223, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" +- S_ACTION_TRANSFORMATION_REPLACE_NULLS = 224, // "ACTION_TRANSFORMATION_REPLACE_NULLS" +- S_ACTION_TRANSFORMATION_SHA1 = 225, // "ACTION_TRANSFORMATION_SHA1" +- S_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 226, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" +- S_ACTION_TRANSFORMATION_TRIM = 227, // "ACTION_TRANSFORMATION_TRIM" +- S_ACTION_TRANSFORMATION_TRIM_LEFT = 228, // "ACTION_TRANSFORMATION_TRIM_LEFT" +- S_ACTION_TRANSFORMATION_TRIM_RIGHT = 229, // "ACTION_TRANSFORMATION_TRIM_RIGHT" +- S_ACTION_TRANSFORMATION_UPPERCASE = 230, // "ACTION_TRANSFORMATION_UPPERCASE" +- S_ACTION_TRANSFORMATION_URL_ENCODE = 231, // "ACTION_TRANSFORMATION_URL_ENCODE" +- S_ACTION_TRANSFORMATION_URL_DECODE = 232, // "ACTION_TRANSFORMATION_URL_DECODE" +- S_ACTION_TRANSFORMATION_URL_DECODE_UNI = 233, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" +- S_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 234, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" +- S_ACTION_VER = 235, // "Ver" +- S_ACTION_XMLNS = 236, // "xmlns" +- S_CONFIG_COMPONENT_SIG = 237, // "CONFIG_COMPONENT_SIG" +- S_CONFIG_CONN_ENGINE = 238, // "CONFIG_CONN_ENGINE" +- S_CONFIG_SEC_ARGUMENT_SEPARATOR = 239, // "CONFIG_SEC_ARGUMENT_SEPARATOR" +- S_CONFIG_SEC_WEB_APP_ID = 240, // "CONFIG_SEC_WEB_APP_ID" +- S_CONFIG_SEC_SERVER_SIG = 241, // "CONFIG_SEC_SERVER_SIG" +- S_CONFIG_DIR_AUDIT_DIR = 242, // "CONFIG_DIR_AUDIT_DIR" +- S_CONFIG_DIR_AUDIT_DIR_MOD = 243, // "CONFIG_DIR_AUDIT_DIR_MOD" +- S_CONFIG_DIR_AUDIT_ENG = 244, // "CONFIG_DIR_AUDIT_ENG" +- S_CONFIG_DIR_AUDIT_FLE_MOD = 245, // "CONFIG_DIR_AUDIT_FLE_MOD" +- S_CONFIG_DIR_AUDIT_LOG = 246, // "CONFIG_DIR_AUDIT_LOG" +- S_CONFIG_DIR_AUDIT_LOG2 = 247, // "CONFIG_DIR_AUDIT_LOG2" +- S_CONFIG_DIR_AUDIT_LOG_P = 248, // "CONFIG_DIR_AUDIT_LOG_P" +- S_CONFIG_DIR_AUDIT_STS = 249, // "CONFIG_DIR_AUDIT_STS" +- S_CONFIG_DIR_AUDIT_TPE = 250, // "CONFIG_DIR_AUDIT_TPE" +- S_CONFIG_DIR_DEBUG_LOG = 251, // "CONFIG_DIR_DEBUG_LOG" +- S_CONFIG_DIR_DEBUG_LVL = 252, // "CONFIG_DIR_DEBUG_LVL" +- S_CONFIG_SEC_CACHE_TRANSFORMATIONS = 253, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" +- S_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 254, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" +- S_CONFIG_SEC_HASH_ENGINE = 255, // "CONFIG_SEC_HASH_ENGINE" +- S_CONFIG_SEC_HASH_KEY = 256, // "CONFIG_SEC_HASH_KEY" +- S_CONFIG_SEC_HASH_PARAM = 257, // "CONFIG_SEC_HASH_PARAM" +- S_CONFIG_SEC_HASH_METHOD_RX = 258, // "CONFIG_SEC_HASH_METHOD_RX" +- S_CONFIG_SEC_HASH_METHOD_PM = 259, // "CONFIG_SEC_HASH_METHOD_PM" +- S_CONFIG_SEC_CHROOT_DIR = 260, // "CONFIG_SEC_CHROOT_DIR" +- S_CONFIG_DIR_GEO_DB = 261, // "CONFIG_DIR_GEO_DB" +- S_CONFIG_DIR_GSB_DB = 262, // "CONFIG_DIR_GSB_DB" +- S_CONFIG_SEC_GUARDIAN_LOG = 263, // "CONFIG_SEC_GUARDIAN_LOG" +- S_CONFIG_DIR_PCRE_MATCH_LIMIT = 264, // "CONFIG_DIR_PCRE_MATCH_LIMIT" +- S_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 265, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" +- S_CONFIG_SEC_CONN_R_STATE_LIMIT = 266, // "CONFIG_SEC_CONN_R_STATE_LIMIT" +- S_CONFIG_SEC_CONN_W_STATE_LIMIT = 267, // "CONFIG_SEC_CONN_W_STATE_LIMIT" +- S_CONFIG_SEC_SENSOR_ID = 268, // "CONFIG_SEC_SENSOR_ID" +- S_CONFIG_DIR_ARGS_LIMIT = 269, // "CONFIG_DIR_ARGS_LIMIT" +- S_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 270, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" +- S_CONFIG_DIR_REQ_BODY = 271, // "CONFIG_DIR_REQ_BODY" +- S_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 272, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" +- S_CONFIG_DIR_REQ_BODY_LIMIT = 273, // "CONFIG_DIR_REQ_BODY_LIMIT" +- S_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 274, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" +- S_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 275, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" +- S_CONFIG_DIR_RES_BODY = 276, // "CONFIG_DIR_RES_BODY" +- S_CONFIG_DIR_RES_BODY_LIMIT = 277, // "CONFIG_DIR_RES_BODY_LIMIT" +- S_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 278, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" +- S_CONFIG_SEC_RULE_INHERITANCE = 279, // "CONFIG_SEC_RULE_INHERITANCE" +- S_CONFIG_SEC_RULE_PERF_TIME = 280, // "CONFIG_SEC_RULE_PERF_TIME" +- S_CONFIG_DIR_RULE_ENG = 281, // "CONFIG_DIR_RULE_ENG" +- S_CONFIG_DIR_SEC_ACTION = 282, // "CONFIG_DIR_SEC_ACTION" +- S_CONFIG_DIR_SEC_DEFAULT_ACTION = 283, // "CONFIG_DIR_SEC_DEFAULT_ACTION" +- S_CONFIG_DIR_SEC_MARKER = 284, // "CONFIG_DIR_SEC_MARKER" +- S_CONFIG_DIR_UNICODE_MAP_FILE = 285, // "CONFIG_DIR_UNICODE_MAP_FILE" +- S_CONFIG_DIR_UNICODE_CODE_PAGE = 286, // "CONFIG_DIR_UNICODE_CODE_PAGE" +- S_CONFIG_SEC_COLLECTION_TIMEOUT = 287, // "CONFIG_SEC_COLLECTION_TIMEOUT" +- S_CONFIG_SEC_HTTP_BLKEY = 288, // "CONFIG_SEC_HTTP_BLKEY" +- S_CONFIG_SEC_INTERCEPT_ON_ERROR = 289, // "CONFIG_SEC_INTERCEPT_ON_ERROR" +- S_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 290, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" +- S_CONFIG_SEC_RULE_REMOVE_BY_ID = 291, // "CONFIG_SEC_RULE_REMOVE_BY_ID" +- S_CONFIG_SEC_RULE_REMOVE_BY_MSG = 292, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" +- S_CONFIG_SEC_RULE_REMOVE_BY_TAG = 293, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" +- S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 294, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" +- S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 295, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" +- S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 296, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" +- S_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 297, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" +- S_CONFIG_UPDLOAD_KEEP_FILES = 298, // "CONFIG_UPDLOAD_KEEP_FILES" +- S_CONFIG_UPDLOAD_SAVE_TMP_FILES = 299, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" +- S_CONFIG_UPLOAD_DIR = 300, // "CONFIG_UPLOAD_DIR" +- S_CONFIG_UPLOAD_FILE_LIMIT = 301, // "CONFIG_UPLOAD_FILE_LIMIT" +- S_CONFIG_UPLOAD_FILE_MODE = 302, // "CONFIG_UPLOAD_FILE_MODE" +- S_CONFIG_VALUE_ABORT = 303, // "CONFIG_VALUE_ABORT" +- S_CONFIG_VALUE_DETC = 304, // "CONFIG_VALUE_DETC" +- S_CONFIG_VALUE_HTTPS = 305, // "CONFIG_VALUE_HTTPS" +- S_CONFIG_VALUE_OFF = 306, // "CONFIG_VALUE_OFF" +- S_CONFIG_VALUE_ON = 307, // "CONFIG_VALUE_ON" +- S_CONFIG_VALUE_PARALLEL = 308, // "CONFIG_VALUE_PARALLEL" +- S_CONFIG_VALUE_PROCESS_PARTIAL = 309, // "CONFIG_VALUE_PROCESS_PARTIAL" +- S_CONFIG_VALUE_REJECT = 310, // "CONFIG_VALUE_REJECT" +- S_CONFIG_VALUE_RELEVANT_ONLY = 311, // "CONFIG_VALUE_RELEVANT_ONLY" +- S_CONFIG_VALUE_SERIAL = 312, // "CONFIG_VALUE_SERIAL" +- S_CONFIG_VALUE_WARN = 313, // "CONFIG_VALUE_WARN" +- S_CONFIG_XML_EXTERNAL_ENTITY = 314, // "CONFIG_XML_EXTERNAL_ENTITY" +- S_CONGIG_DIR_RESPONSE_BODY_MP = 315, // "CONGIG_DIR_RESPONSE_BODY_MP" +- S_CONGIG_DIR_SEC_ARG_SEP = 316, // "CONGIG_DIR_SEC_ARG_SEP" +- S_CONGIG_DIR_SEC_COOKIE_FORMAT = 317, // "CONGIG_DIR_SEC_COOKIE_FORMAT" +- S_CONFIG_SEC_COOKIEV0_SEPARATOR = 318, // "CONFIG_SEC_COOKIEV0_SEPARATOR" +- S_CONGIG_DIR_SEC_DATA_DIR = 319, // "CONGIG_DIR_SEC_DATA_DIR" +- S_CONGIG_DIR_SEC_STATUS_ENGINE = 320, // "CONGIG_DIR_SEC_STATUS_ENGINE" +- S_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 321, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" +- S_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 322, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" +- S_CONGIG_DIR_SEC_TMP_DIR = 323, // "CONGIG_DIR_SEC_TMP_DIR" +- S_DIRECTIVE = 324, // "DIRECTIVE" +- S_DIRECTIVE_SECRULESCRIPT = 325, // "DIRECTIVE_SECRULESCRIPT" +- S_FREE_TEXT_QUOTE_MACRO_EXPANSION = 326, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" +- S_QUOTATION_MARK = 327, // "QUOTATION_MARK" +- S_RUN_TIME_VAR_BLD = 328, // "RUN_TIME_VAR_BLD" +- S_RUN_TIME_VAR_DUR = 329, // "RUN_TIME_VAR_DUR" +- S_RUN_TIME_VAR_HSV = 330, // "RUN_TIME_VAR_HSV" +- S_RUN_TIME_VAR_REMOTE_USER = 331, // "RUN_TIME_VAR_REMOTE_USER" +- S_RUN_TIME_VAR_TIME = 332, // "RUN_TIME_VAR_TIME" +- S_RUN_TIME_VAR_TIME_DAY = 333, // "RUN_TIME_VAR_TIME_DAY" +- S_RUN_TIME_VAR_TIME_EPOCH = 334, // "RUN_TIME_VAR_TIME_EPOCH" +- S_RUN_TIME_VAR_TIME_HOUR = 335, // "RUN_TIME_VAR_TIME_HOUR" +- S_RUN_TIME_VAR_TIME_MIN = 336, // "RUN_TIME_VAR_TIME_MIN" +- S_RUN_TIME_VAR_TIME_MON = 337, // "RUN_TIME_VAR_TIME_MON" +- S_RUN_TIME_VAR_TIME_SEC = 338, // "RUN_TIME_VAR_TIME_SEC" +- S_RUN_TIME_VAR_TIME_WDAY = 339, // "RUN_TIME_VAR_TIME_WDAY" +- S_RUN_TIME_VAR_TIME_YEAR = 340, // "RUN_TIME_VAR_TIME_YEAR" +- S_VARIABLE = 341, // "VARIABLE" +- S_DICT_ELEMENT = 342, // "Dictionary element" +- S_DICT_ELEMENT_REGEXP = 343, // "Dictionary element, selected by regexp" +- S_YYACCEPT = 344, // $accept +- S_input = 345, // input +- S_line = 346, // line +- S_audit_log = 347, // audit_log +- S_actions = 348, // actions +- S_actions_may_quoted = 349, // actions_may_quoted +- S_op = 350, // op +- S_op_before_init = 351, // op_before_init +- S_expression = 352, // expression +- S_variables = 353, // variables +- S_variables_pre_process = 354, // variables_pre_process +- S_variables_may_be_quoted = 355, // variables_may_be_quoted +- S_var = 356, // var +- S_act = 357, // act +- S_setvar_action = 358, // setvar_action +- S_run_time_string = 359 // run_time_string ++ S_VARIABLE_MULTIPART_PART_HEADERS = 26, // VARIABLE_MULTIPART_PART_HEADERS ++ S_VARIABLE_ARGS_COMBINED_SIZE = 27, // VARIABLE_ARGS_COMBINED_SIZE ++ S_VARIABLE_ARGS_GET_NAMES = 28, // VARIABLE_ARGS_GET_NAMES ++ S_VARIABLE_RULE = 29, // VARIABLE_RULE ++ S_VARIABLE_ARGS_NAMES = 30, // "Variable ARGS_NAMES" ++ S_VARIABLE_ARGS_POST_NAMES = 31, // VARIABLE_ARGS_POST_NAMES ++ S_VARIABLE_AUTH_TYPE = 32, // "AUTH_TYPE" ++ S_VARIABLE_FILES_COMBINED_SIZE = 33, // "FILES_COMBINED_SIZE" ++ S_VARIABLE_FILES_TMP_NAMES = 34, // "FILES_TMPNAMES" ++ S_VARIABLE_FULL_REQUEST = 35, // "FULL_REQUEST" ++ S_VARIABLE_FULL_REQUEST_LENGTH = 36, // "FULL_REQUEST_LENGTH" ++ S_VARIABLE_INBOUND_DATA_ERROR = 37, // "INBOUND_DATA_ERROR" ++ S_VARIABLE_MATCHED_VAR = 38, // "MATCHED_VAR" ++ S_VARIABLE_MATCHED_VAR_NAME = 39, // "MATCHED_VAR_NAME" ++ S_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 40, // VARIABLE_MULTIPART_BOUNDARY_QUOTED ++ S_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 41, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE ++ S_VARIABLE_MULTIPART_CRLF_LF_LINES = 42, // "MULTIPART_CRLF_LF_LINES" ++ S_VARIABLE_MULTIPART_DATA_AFTER = 43, // "MULTIPART_DATA_AFTER" ++ S_VARIABLE_MULTIPART_DATA_BEFORE = 44, // VARIABLE_MULTIPART_DATA_BEFORE ++ S_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 45, // "MULTIPART_FILE_LIMIT_EXCEEDED" ++ S_VARIABLE_MULTIPART_HEADER_FOLDING = 46, // "MULTIPART_HEADER_FOLDING" ++ S_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 47, // "MULTIPART_INVALID_HEADER_FOLDING" ++ S_VARIABLE_MULTIPART_INVALID_PART = 48, // VARIABLE_MULTIPART_INVALID_PART ++ S_VARIABLE_MULTIPART_INVALID_QUOTING = 49, // "MULTIPART_INVALID_QUOTING" ++ S_VARIABLE_MULTIPART_LF_LINE = 50, // VARIABLE_MULTIPART_LF_LINE ++ S_VARIABLE_MULTIPART_MISSING_SEMICOLON = 51, // VARIABLE_MULTIPART_MISSING_SEMICOLON ++ S_VARIABLE_MULTIPART_SEMICOLON_MISSING = 52, // VARIABLE_MULTIPART_SEMICOLON_MISSING ++ S_VARIABLE_MULTIPART_STRICT_ERROR = 53, // "MULTIPART_STRICT_ERROR" ++ S_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 54, // "MULTIPART_UNMATCHED_BOUNDARY" ++ S_VARIABLE_OUTBOUND_DATA_ERROR = 55, // "OUTBOUND_DATA_ERROR" ++ S_VARIABLE_PATH_INFO = 56, // "PATH_INFO" ++ S_VARIABLE_QUERY_STRING = 57, // "QUERY_STRING" ++ S_VARIABLE_REMOTE_ADDR = 58, // "REMOTE_ADDR" ++ S_VARIABLE_REMOTE_HOST = 59, // "REMOTE_HOST" ++ S_VARIABLE_REMOTE_PORT = 60, // "REMOTE_PORT" ++ S_VARIABLE_REQBODY_ERROR_MSG = 61, // "REQBODY_ERROR_MSG" ++ S_VARIABLE_REQBODY_ERROR = 62, // "REQBODY_ERROR" ++ S_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 63, // "REQBODY_PROCESSOR_ERROR_MSG" ++ S_VARIABLE_REQBODY_PROCESSOR_ERROR = 64, // "REQBODY_PROCESSOR_ERROR" ++ S_VARIABLE_REQBODY_PROCESSOR = 65, // "REQBODY_PROCESSOR" ++ S_VARIABLE_REQUEST_BASENAME = 66, // "REQUEST_BASENAME" ++ S_VARIABLE_REQUEST_BODY_LENGTH = 67, // "REQUEST_BODY_LENGTH" ++ S_VARIABLE_REQUEST_BODY = 68, // "REQUEST_BODY" ++ S_VARIABLE_REQUEST_FILE_NAME = 69, // "REQUEST_FILENAME" ++ S_VARIABLE_REQUEST_HEADERS_NAMES = 70, // VARIABLE_REQUEST_HEADERS_NAMES ++ S_VARIABLE_REQUEST_LINE = 71, // "REQUEST_LINE" ++ S_VARIABLE_REQUEST_METHOD = 72, // "REQUEST_METHOD" ++ S_VARIABLE_REQUEST_PROTOCOL = 73, // "REQUEST_PROTOCOL" ++ S_VARIABLE_REQUEST_URI_RAW = 74, // "REQUEST_URI_RAW" ++ S_VARIABLE_REQUEST_URI = 75, // "REQUEST_URI" ++ S_VARIABLE_RESOURCE = 76, // "RESOURCE" ++ S_VARIABLE_RESPONSE_BODY = 77, // "RESPONSE_BODY" ++ S_VARIABLE_RESPONSE_CONTENT_LENGTH = 78, // "RESPONSE_CONTENT_LENGTH" ++ S_VARIABLE_RESPONSE_CONTENT_TYPE = 79, // VARIABLE_RESPONSE_CONTENT_TYPE ++ S_VARIABLE_RESPONSE_HEADERS_NAMES = 80, // VARIABLE_RESPONSE_HEADERS_NAMES ++ S_VARIABLE_RESPONSE_PROTOCOL = 81, // "RESPONSE_PROTOCOL" ++ S_VARIABLE_RESPONSE_STATUS = 82, // "RESPONSE_STATUS" ++ S_VARIABLE_SERVER_ADDR = 83, // "SERVER_ADDR" ++ S_VARIABLE_SERVER_NAME = 84, // "SERVER_NAME" ++ S_VARIABLE_SERVER_PORT = 85, // "SERVER_PORT" ++ S_VARIABLE_SESSION_ID = 86, // "SESSIONID" ++ S_VARIABLE_UNIQUE_ID = 87, // "UNIQUE_ID" ++ S_VARIABLE_URL_ENCODED_ERROR = 88, // "URLENCODED_ERROR" ++ S_VARIABLE_USER_ID = 89, // "USERID" ++ S_VARIABLE_WEB_APP_ID = 90, // "WEBAPPID" ++ S_VARIABLE_STATUS = 91, // "VARIABLE_STATUS" ++ S_VARIABLE_STATUS_LINE = 92, // "VARIABLE_STATUS_LINE" ++ S_VARIABLE_IP = 93, // "VARIABLE_IP" ++ S_VARIABLE_GLOBAL = 94, // "VARIABLE_GLOBAL" ++ S_VARIABLE_TX = 95, // "VARIABLE_TX" ++ S_VARIABLE_SESSION = 96, // "VARIABLE_SESSION" ++ S_VARIABLE_USER = 97, // "VARIABLE_USER" ++ S_RUN_TIME_VAR_ENV = 98, // "RUN_TIME_VAR_ENV" ++ S_RUN_TIME_VAR_XML = 99, // "RUN_TIME_VAR_XML" ++ S_ACTION_SETVAR = 100, // "SetVar" ++ S_SETVAR_OPERATION_EQUALS = 101, // SETVAR_OPERATION_EQUALS ++ S_SETVAR_OPERATION_EQUALS_PLUS = 102, // SETVAR_OPERATION_EQUALS_PLUS ++ S_SETVAR_OPERATION_EQUALS_MINUS = 103, // SETVAR_OPERATION_EQUALS_MINUS ++ S_NOT = 104, // "NOT" ++ S_OPERATOR_BEGINS_WITH = 105, // "OPERATOR_BEGINS_WITH" ++ S_OPERATOR_CONTAINS = 106, // "OPERATOR_CONTAINS" ++ S_OPERATOR_CONTAINS_WORD = 107, // "OPERATOR_CONTAINS_WORD" ++ S_OPERATOR_DETECT_SQLI = 108, // "OPERATOR_DETECT_SQLI" ++ S_OPERATOR_DETECT_XSS = 109, // "OPERATOR_DETECT_XSS" ++ S_OPERATOR_ENDS_WITH = 110, // "OPERATOR_ENDS_WITH" ++ S_OPERATOR_EQ = 111, // "OPERATOR_EQ" ++ S_OPERATOR_FUZZY_HASH = 112, // "OPERATOR_FUZZY_HASH" ++ S_OPERATOR_GEOLOOKUP = 113, // "OPERATOR_GEOLOOKUP" ++ S_OPERATOR_GE = 114, // "OPERATOR_GE" ++ S_OPERATOR_GSB_LOOKUP = 115, // "OPERATOR_GSB_LOOKUP" ++ S_OPERATOR_GT = 116, // "OPERATOR_GT" ++ S_OPERATOR_INSPECT_FILE = 117, // "OPERATOR_INSPECT_FILE" ++ S_OPERATOR_IP_MATCH_FROM_FILE = 118, // "OPERATOR_IP_MATCH_FROM_FILE" ++ S_OPERATOR_IP_MATCH = 119, // "OPERATOR_IP_MATCH" ++ S_OPERATOR_LE = 120, // "OPERATOR_LE" ++ S_OPERATOR_LT = 121, // "OPERATOR_LT" ++ S_OPERATOR_PM_FROM_FILE = 122, // "OPERATOR_PM_FROM_FILE" ++ S_OPERATOR_PM = 123, // "OPERATOR_PM" ++ S_OPERATOR_RBL = 124, // "OPERATOR_RBL" ++ S_OPERATOR_RSUB = 125, // "OPERATOR_RSUB" ++ S_OPERATOR_RX_CONTENT_ONLY = 126, // "Operator RX (content only)" ++ S_OPERATOR_RX = 127, // "OPERATOR_RX" ++ S_OPERATOR_RX_GLOBAL = 128, // "OPERATOR_RX_GLOBAL" ++ S_OPERATOR_STR_EQ = 129, // "OPERATOR_STR_EQ" ++ S_OPERATOR_STR_MATCH = 130, // "OPERATOR_STR_MATCH" ++ S_OPERATOR_UNCONDITIONAL_MATCH = 131, // "OPERATOR_UNCONDITIONAL_MATCH" ++ S_OPERATOR_VALIDATE_BYTE_RANGE = 132, // "OPERATOR_VALIDATE_BYTE_RANGE" ++ S_OPERATOR_VALIDATE_DTD = 133, // "OPERATOR_VALIDATE_DTD" ++ S_OPERATOR_VALIDATE_HASH = 134, // "OPERATOR_VALIDATE_HASH" ++ S_OPERATOR_VALIDATE_SCHEMA = 135, // "OPERATOR_VALIDATE_SCHEMA" ++ S_OPERATOR_VALIDATE_URL_ENCODING = 136, // "OPERATOR_VALIDATE_URL_ENCODING" ++ S_OPERATOR_VALIDATE_UTF8_ENCODING = 137, // "OPERATOR_VALIDATE_UTF8_ENCODING" ++ S_OPERATOR_VERIFY_CC = 138, // "OPERATOR_VERIFY_CC" ++ S_OPERATOR_VERIFY_CPF = 139, // "OPERATOR_VERIFY_CPF" ++ S_OPERATOR_VERIFY_SSN = 140, // "OPERATOR_VERIFY_SSN" ++ S_OPERATOR_VERIFY_SVNR = 141, // "OPERATOR_VERIFY_SVNR" ++ S_OPERATOR_WITHIN = 142, // "OPERATOR_WITHIN" ++ S_CONFIG_DIR_AUDIT_LOG_FMT = 143, // CONFIG_DIR_AUDIT_LOG_FMT ++ S_JSON = 144, // JSON ++ S_NATIVE = 145, // NATIVE ++ S_ACTION_CTL_RULE_ENGINE = 146, // "ACTION_CTL_RULE_ENGINE" ++ S_ACTION_ACCURACY = 147, // "Accuracy" ++ S_ACTION_ALLOW = 148, // "Allow" ++ S_ACTION_APPEND = 149, // "Append" ++ S_ACTION_AUDIT_LOG = 150, // "AuditLog" ++ S_ACTION_BLOCK = 151, // "Block" ++ S_ACTION_CAPTURE = 152, // "Capture" ++ S_ACTION_CHAIN = 153, // "Chain" ++ S_ACTION_CTL_AUDIT_ENGINE = 154, // "ACTION_CTL_AUDIT_ENGINE" ++ S_ACTION_CTL_AUDIT_LOG_PARTS = 155, // "ACTION_CTL_AUDIT_LOG_PARTS" ++ S_ACTION_CTL_BDY_JSON = 156, // "ACTION_CTL_BDY_JSON" ++ S_ACTION_CTL_BDY_XML = 157, // "ACTION_CTL_BDY_XML" ++ S_ACTION_CTL_BDY_URLENCODED = 158, // "ACTION_CTL_BDY_URLENCODED" ++ S_ACTION_CTL_FORCE_REQ_BODY_VAR = 159, // "ACTION_CTL_FORCE_REQ_BODY_VAR" ++ S_ACTION_CTL_REQUEST_BODY_ACCESS = 160, // "ACTION_CTL_REQUEST_BODY_ACCESS" ++ S_ACTION_CTL_RULE_REMOVE_BY_ID = 161, // "ACTION_CTL_RULE_REMOVE_BY_ID" ++ S_ACTION_CTL_RULE_REMOVE_BY_TAG = 162, // "ACTION_CTL_RULE_REMOVE_BY_TAG" ++ S_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 163, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" ++ S_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 164, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" ++ S_ACTION_DENY = 165, // "Deny" ++ S_ACTION_DEPRECATE_VAR = 166, // "DeprecateVar" ++ S_ACTION_DROP = 167, // "Drop" ++ S_ACTION_EXEC = 168, // "Exec" ++ S_ACTION_EXPIRE_VAR = 169, // "ExpireVar" ++ S_ACTION_ID = 170, // "Id" ++ S_ACTION_INITCOL = 171, // "InitCol" ++ S_ACTION_LOG = 172, // "Log" ++ S_ACTION_LOG_DATA = 173, // "LogData" ++ S_ACTION_MATURITY = 174, // "Maturity" ++ S_ACTION_MSG = 175, // "Msg" ++ S_ACTION_MULTI_MATCH = 176, // "MultiMatch" ++ S_ACTION_NO_AUDIT_LOG = 177, // "NoAuditLog" ++ S_ACTION_NO_LOG = 178, // "NoLog" ++ S_ACTION_PASS = 179, // "Pass" ++ S_ACTION_PAUSE = 180, // "Pause" ++ S_ACTION_PHASE = 181, // "Phase" ++ S_ACTION_PREPEND = 182, // "Prepend" ++ S_ACTION_PROXY = 183, // "Proxy" ++ S_ACTION_REDIRECT = 184, // "Redirect" ++ S_ACTION_REV = 185, // "Rev" ++ S_ACTION_SANITISE_ARG = 186, // "SanitiseArg" ++ S_ACTION_SANITISE_MATCHED = 187, // "SanitiseMatched" ++ S_ACTION_SANITISE_MATCHED_BYTES = 188, // "SanitiseMatchedBytes" ++ S_ACTION_SANITISE_REQUEST_HEADER = 189, // "SanitiseRequestHeader" ++ S_ACTION_SANITISE_RESPONSE_HEADER = 190, // "SanitiseResponseHeader" ++ S_ACTION_SETENV = 191, // "SetEnv" ++ S_ACTION_SETRSC = 192, // "SetRsc" ++ S_ACTION_SETSID = 193, // "SetSid" ++ S_ACTION_SETUID = 194, // "SetUID" ++ S_ACTION_SEVERITY = 195, // "Severity" ++ S_ACTION_SKIP = 196, // "Skip" ++ S_ACTION_SKIP_AFTER = 197, // "SkipAfter" ++ S_ACTION_STATUS = 198, // "Status" ++ S_ACTION_TAG = 199, // "Tag" ++ S_ACTION_TRANSFORMATION_BASE_64_ENCODE = 200, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" ++ S_ACTION_TRANSFORMATION_BASE_64_DECODE = 201, // "ACTION_TRANSFORMATION_BASE_64_DECODE" ++ S_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 202, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" ++ S_ACTION_TRANSFORMATION_CMD_LINE = 203, // "ACTION_TRANSFORMATION_CMD_LINE" ++ S_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 204, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" ++ S_ACTION_TRANSFORMATION_CSS_DECODE = 205, // "ACTION_TRANSFORMATION_CSS_DECODE" ++ S_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 206, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" ++ S_ACTION_TRANSFORMATION_HEX_ENCODE = 207, // "ACTION_TRANSFORMATION_HEX_ENCODE" ++ S_ACTION_TRANSFORMATION_HEX_DECODE = 208, // "ACTION_TRANSFORMATION_HEX_DECODE" ++ S_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 209, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" ++ S_ACTION_TRANSFORMATION_JS_DECODE = 210, // "ACTION_TRANSFORMATION_JS_DECODE" ++ S_ACTION_TRANSFORMATION_LENGTH = 211, // "ACTION_TRANSFORMATION_LENGTH" ++ S_ACTION_TRANSFORMATION_LOWERCASE = 212, // "ACTION_TRANSFORMATION_LOWERCASE" ++ S_ACTION_TRANSFORMATION_MD5 = 213, // "ACTION_TRANSFORMATION_MD5" ++ S_ACTION_TRANSFORMATION_NONE = 214, // "ACTION_TRANSFORMATION_NONE" ++ S_ACTION_TRANSFORMATION_NORMALISE_PATH = 215, // "ACTION_TRANSFORMATION_NORMALISE_PATH" ++ S_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 216, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" ++ S_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 217, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" ++ S_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 218, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" ++ S_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 219, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" ++ S_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 220, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" ++ S_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 221, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" ++ S_ACTION_TRANSFORMATION_REMOVE_NULLS = 222, // "ACTION_TRANSFORMATION_REMOVE_NULLS" ++ S_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 223, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" ++ S_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 224, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" ++ S_ACTION_TRANSFORMATION_REPLACE_NULLS = 225, // "ACTION_TRANSFORMATION_REPLACE_NULLS" ++ S_ACTION_TRANSFORMATION_SHA1 = 226, // "ACTION_TRANSFORMATION_SHA1" ++ S_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 227, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" ++ S_ACTION_TRANSFORMATION_TRIM = 228, // "ACTION_TRANSFORMATION_TRIM" ++ S_ACTION_TRANSFORMATION_TRIM_LEFT = 229, // "ACTION_TRANSFORMATION_TRIM_LEFT" ++ S_ACTION_TRANSFORMATION_TRIM_RIGHT = 230, // "ACTION_TRANSFORMATION_TRIM_RIGHT" ++ S_ACTION_TRANSFORMATION_UPPERCASE = 231, // "ACTION_TRANSFORMATION_UPPERCASE" ++ S_ACTION_TRANSFORMATION_URL_ENCODE = 232, // "ACTION_TRANSFORMATION_URL_ENCODE" ++ S_ACTION_TRANSFORMATION_URL_DECODE = 233, // "ACTION_TRANSFORMATION_URL_DECODE" ++ S_ACTION_TRANSFORMATION_URL_DECODE_UNI = 234, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" ++ S_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 235, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" ++ S_ACTION_VER = 236, // "Ver" ++ S_ACTION_XMLNS = 237, // "xmlns" ++ S_CONFIG_COMPONENT_SIG = 238, // "CONFIG_COMPONENT_SIG" ++ S_CONFIG_CONN_ENGINE = 239, // "CONFIG_CONN_ENGINE" ++ S_CONFIG_SEC_ARGUMENT_SEPARATOR = 240, // "CONFIG_SEC_ARGUMENT_SEPARATOR" ++ S_CONFIG_SEC_WEB_APP_ID = 241, // "CONFIG_SEC_WEB_APP_ID" ++ S_CONFIG_SEC_SERVER_SIG = 242, // "CONFIG_SEC_SERVER_SIG" ++ S_CONFIG_DIR_AUDIT_DIR = 243, // "CONFIG_DIR_AUDIT_DIR" ++ S_CONFIG_DIR_AUDIT_DIR_MOD = 244, // "CONFIG_DIR_AUDIT_DIR_MOD" ++ S_CONFIG_DIR_AUDIT_ENG = 245, // "CONFIG_DIR_AUDIT_ENG" ++ S_CONFIG_DIR_AUDIT_FLE_MOD = 246, // "CONFIG_DIR_AUDIT_FLE_MOD" ++ S_CONFIG_DIR_AUDIT_LOG = 247, // "CONFIG_DIR_AUDIT_LOG" ++ S_CONFIG_DIR_AUDIT_LOG2 = 248, // "CONFIG_DIR_AUDIT_LOG2" ++ S_CONFIG_DIR_AUDIT_LOG_P = 249, // "CONFIG_DIR_AUDIT_LOG_P" ++ S_CONFIG_DIR_AUDIT_STS = 250, // "CONFIG_DIR_AUDIT_STS" ++ S_CONFIG_DIR_AUDIT_TPE = 251, // "CONFIG_DIR_AUDIT_TPE" ++ S_CONFIG_DIR_DEBUG_LOG = 252, // "CONFIG_DIR_DEBUG_LOG" ++ S_CONFIG_DIR_DEBUG_LVL = 253, // "CONFIG_DIR_DEBUG_LVL" ++ S_CONFIG_SEC_CACHE_TRANSFORMATIONS = 254, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" ++ S_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 255, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" ++ S_CONFIG_SEC_HASH_ENGINE = 256, // "CONFIG_SEC_HASH_ENGINE" ++ S_CONFIG_SEC_HASH_KEY = 257, // "CONFIG_SEC_HASH_KEY" ++ S_CONFIG_SEC_HASH_PARAM = 258, // "CONFIG_SEC_HASH_PARAM" ++ S_CONFIG_SEC_HASH_METHOD_RX = 259, // "CONFIG_SEC_HASH_METHOD_RX" ++ S_CONFIG_SEC_HASH_METHOD_PM = 260, // "CONFIG_SEC_HASH_METHOD_PM" ++ S_CONFIG_SEC_CHROOT_DIR = 261, // "CONFIG_SEC_CHROOT_DIR" ++ S_CONFIG_DIR_GEO_DB = 262, // "CONFIG_DIR_GEO_DB" ++ S_CONFIG_DIR_GSB_DB = 263, // "CONFIG_DIR_GSB_DB" ++ S_CONFIG_SEC_GUARDIAN_LOG = 264, // "CONFIG_SEC_GUARDIAN_LOG" ++ S_CONFIG_DIR_PCRE_MATCH_LIMIT = 265, // "CONFIG_DIR_PCRE_MATCH_LIMIT" ++ S_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 266, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" ++ S_CONFIG_SEC_CONN_R_STATE_LIMIT = 267, // "CONFIG_SEC_CONN_R_STATE_LIMIT" ++ S_CONFIG_SEC_CONN_W_STATE_LIMIT = 268, // "CONFIG_SEC_CONN_W_STATE_LIMIT" ++ S_CONFIG_SEC_SENSOR_ID = 269, // "CONFIG_SEC_SENSOR_ID" ++ S_CONFIG_DIR_ARGS_LIMIT = 270, // "CONFIG_DIR_ARGS_LIMIT" ++ S_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 271, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" ++ S_CONFIG_DIR_REQ_BODY = 272, // "CONFIG_DIR_REQ_BODY" ++ S_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 273, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" ++ S_CONFIG_DIR_REQ_BODY_LIMIT = 274, // "CONFIG_DIR_REQ_BODY_LIMIT" ++ S_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 275, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" ++ S_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 276, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" ++ S_CONFIG_DIR_RES_BODY = 277, // "CONFIG_DIR_RES_BODY" ++ S_CONFIG_DIR_RES_BODY_LIMIT = 278, // "CONFIG_DIR_RES_BODY_LIMIT" ++ S_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 279, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" ++ S_CONFIG_SEC_RULE_INHERITANCE = 280, // "CONFIG_SEC_RULE_INHERITANCE" ++ S_CONFIG_SEC_RULE_PERF_TIME = 281, // "CONFIG_SEC_RULE_PERF_TIME" ++ S_CONFIG_DIR_RULE_ENG = 282, // "CONFIG_DIR_RULE_ENG" ++ S_CONFIG_DIR_SEC_ACTION = 283, // "CONFIG_DIR_SEC_ACTION" ++ S_CONFIG_DIR_SEC_DEFAULT_ACTION = 284, // "CONFIG_DIR_SEC_DEFAULT_ACTION" ++ S_CONFIG_DIR_SEC_MARKER = 285, // "CONFIG_DIR_SEC_MARKER" ++ S_CONFIG_DIR_UNICODE_MAP_FILE = 286, // "CONFIG_DIR_UNICODE_MAP_FILE" ++ S_CONFIG_DIR_UNICODE_CODE_PAGE = 287, // "CONFIG_DIR_UNICODE_CODE_PAGE" ++ S_CONFIG_SEC_COLLECTION_TIMEOUT = 288, // "CONFIG_SEC_COLLECTION_TIMEOUT" ++ S_CONFIG_SEC_HTTP_BLKEY = 289, // "CONFIG_SEC_HTTP_BLKEY" ++ S_CONFIG_SEC_INTERCEPT_ON_ERROR = 290, // "CONFIG_SEC_INTERCEPT_ON_ERROR" ++ S_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 291, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" ++ S_CONFIG_SEC_RULE_REMOVE_BY_ID = 292, // "CONFIG_SEC_RULE_REMOVE_BY_ID" ++ S_CONFIG_SEC_RULE_REMOVE_BY_MSG = 293, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" ++ S_CONFIG_SEC_RULE_REMOVE_BY_TAG = 294, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" ++ S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 295, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" ++ S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 296, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" ++ S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 297, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" ++ S_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 298, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" ++ S_CONFIG_UPDLOAD_KEEP_FILES = 299, // "CONFIG_UPDLOAD_KEEP_FILES" ++ S_CONFIG_UPDLOAD_SAVE_TMP_FILES = 300, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" ++ S_CONFIG_UPLOAD_DIR = 301, // "CONFIG_UPLOAD_DIR" ++ S_CONFIG_UPLOAD_FILE_LIMIT = 302, // "CONFIG_UPLOAD_FILE_LIMIT" ++ S_CONFIG_UPLOAD_FILE_MODE = 303, // "CONFIG_UPLOAD_FILE_MODE" ++ S_CONFIG_VALUE_ABORT = 304, // "CONFIG_VALUE_ABORT" ++ S_CONFIG_VALUE_DETC = 305, // "CONFIG_VALUE_DETC" ++ S_CONFIG_VALUE_HTTPS = 306, // "CONFIG_VALUE_HTTPS" ++ S_CONFIG_VALUE_OFF = 307, // "CONFIG_VALUE_OFF" ++ S_CONFIG_VALUE_ON = 308, // "CONFIG_VALUE_ON" ++ S_CONFIG_VALUE_PARALLEL = 309, // "CONFIG_VALUE_PARALLEL" ++ S_CONFIG_VALUE_PROCESS_PARTIAL = 310, // "CONFIG_VALUE_PROCESS_PARTIAL" ++ S_CONFIG_VALUE_REJECT = 311, // "CONFIG_VALUE_REJECT" ++ S_CONFIG_VALUE_RELEVANT_ONLY = 312, // "CONFIG_VALUE_RELEVANT_ONLY" ++ S_CONFIG_VALUE_SERIAL = 313, // "CONFIG_VALUE_SERIAL" ++ S_CONFIG_VALUE_WARN = 314, // "CONFIG_VALUE_WARN" ++ S_CONFIG_XML_EXTERNAL_ENTITY = 315, // "CONFIG_XML_EXTERNAL_ENTITY" ++ S_CONGIG_DIR_RESPONSE_BODY_MP = 316, // "CONGIG_DIR_RESPONSE_BODY_MP" ++ S_CONGIG_DIR_SEC_ARG_SEP = 317, // "CONGIG_DIR_SEC_ARG_SEP" ++ S_CONGIG_DIR_SEC_COOKIE_FORMAT = 318, // "CONGIG_DIR_SEC_COOKIE_FORMAT" ++ S_CONFIG_SEC_COOKIEV0_SEPARATOR = 319, // "CONFIG_SEC_COOKIEV0_SEPARATOR" ++ S_CONGIG_DIR_SEC_DATA_DIR = 320, // "CONGIG_DIR_SEC_DATA_DIR" ++ S_CONGIG_DIR_SEC_STATUS_ENGINE = 321, // "CONGIG_DIR_SEC_STATUS_ENGINE" ++ S_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 322, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" ++ S_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 323, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" ++ S_CONGIG_DIR_SEC_TMP_DIR = 324, // "CONGIG_DIR_SEC_TMP_DIR" ++ S_DIRECTIVE = 325, // "DIRECTIVE" ++ S_DIRECTIVE_SECRULESCRIPT = 326, // "DIRECTIVE_SECRULESCRIPT" ++ S_FREE_TEXT_QUOTE_MACRO_EXPANSION = 327, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++ S_QUOTATION_MARK = 328, // "QUOTATION_MARK" ++ S_RUN_TIME_VAR_BLD = 329, // "RUN_TIME_VAR_BLD" ++ S_RUN_TIME_VAR_DUR = 330, // "RUN_TIME_VAR_DUR" ++ S_RUN_TIME_VAR_HSV = 331, // "RUN_TIME_VAR_HSV" ++ S_RUN_TIME_VAR_REMOTE_USER = 332, // "RUN_TIME_VAR_REMOTE_USER" ++ S_RUN_TIME_VAR_TIME = 333, // "RUN_TIME_VAR_TIME" ++ S_RUN_TIME_VAR_TIME_DAY = 334, // "RUN_TIME_VAR_TIME_DAY" ++ S_RUN_TIME_VAR_TIME_EPOCH = 335, // "RUN_TIME_VAR_TIME_EPOCH" ++ S_RUN_TIME_VAR_TIME_HOUR = 336, // "RUN_TIME_VAR_TIME_HOUR" ++ S_RUN_TIME_VAR_TIME_MIN = 337, // "RUN_TIME_VAR_TIME_MIN" ++ S_RUN_TIME_VAR_TIME_MON = 338, // "RUN_TIME_VAR_TIME_MON" ++ S_RUN_TIME_VAR_TIME_SEC = 339, // "RUN_TIME_VAR_TIME_SEC" ++ S_RUN_TIME_VAR_TIME_WDAY = 340, // "RUN_TIME_VAR_TIME_WDAY" ++ S_RUN_TIME_VAR_TIME_YEAR = 341, // "RUN_TIME_VAR_TIME_YEAR" ++ S_VARIABLE = 342, // "VARIABLE" ++ S_DICT_ELEMENT = 343, // "Dictionary element" ++ S_DICT_ELEMENT_REGEXP = 344, // "Dictionary element, selected by regexp" ++ S_YYACCEPT = 345, // $accept ++ S_input = 346, // input ++ S_line = 347, // line ++ S_audit_log = 348, // audit_log ++ S_actions = 349, // actions ++ S_actions_may_quoted = 350, // actions_may_quoted ++ S_op = 351, // op ++ S_op_before_init = 352, // op_before_init ++ S_expression = 353, // expression ++ S_variables = 354, // variables ++ S_variables_pre_process = 355, // variables_pre_process ++ S_variables_may_be_quoted = 356, // variables_may_be_quoted ++ S_var = 357, // var ++ S_act = 358, // act ++ S_setvar_action = 359, // setvar_action ++ S_run_time_string = 360 // run_time_string + }; + }; + +@@ -2413,13 +2416,13 @@ switch (yykind) + symbol_type (int tok, location_type l) + : super_type(token_type (tok), std::move (l)) + { +- YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); ++ YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_MULTIPART_PART_HEADERS || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); + } + #else + symbol_type (int tok, const location_type& l) + : super_type(token_type (tok), l) + { +- YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); ++ YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_MULTIPART_PART_HEADERS || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); + } + #endif + #if 201103L <= YY_CPLUSPLUS +@@ -2873,6 +2876,21 @@ switch (yykind) + return symbol_type (token::TOK_VARIABLE_REQUEST_COOKIES_NAMES, l); + } + #endif ++#if 201103L <= YY_CPLUSPLUS ++ static ++ symbol_type ++ make_VARIABLE_MULTIPART_PART_HEADERS (location_type l) ++ { ++ return symbol_type (token::TOK_VARIABLE_MULTIPART_PART_HEADERS, std::move (l)); ++ } ++#else ++ static ++ symbol_type ++ make_VARIABLE_MULTIPART_PART_HEADERS (const location_type& l) ++ { ++ return symbol_type (token::TOK_VARIABLE_MULTIPART_PART_HEADERS, l); ++ } ++#endif + #if 201103L <= YY_CPLUSPLUS + static + symbol_type +@@ -7973,9 +7991,9 @@ switch (yykind) + /// Constants. + enum + { +- yylast_ = 3274, ///< Last index in yytable_. ++ yylast_ = 3344, ///< Last index in yytable_. + yynnts_ = 16, ///< Number of nonterminal symbols. +- yyfinal_ = 338 ///< Termination state number. ++ yyfinal_ = 339 ///< Termination state number. + }; + + +@@ -8053,10 +8071,10 @@ switch (yykind) + 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, + 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, + 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, +- 335, 336, 337, 338, 339, 340, 341, 342, 343 ++ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344 + }; + // Last valid token kind. +- const int code_max = 598; ++ const int code_max = 599; + + if (t <= 0) + return symbol_kind::S_YYEOF; +@@ -8626,7 +8644,7 @@ switch (yykind) + } + + } // yy +-#line 8630 "seclang-parser.hh" ++#line 8648 "seclang-parser.hh" + + + +diff --git a/src/parser/seclang-parser.yy b/src/parser/seclang-parser.yy +index 0cbbee08..332a30d1 100644 +--- a/src/parser/seclang-parser.yy ++++ b/src/parser/seclang-parser.yy +@@ -217,6 +217,7 @@ class Driver; + #include "src/variables/request_body_length.h" + #include "src/variables/request_cookies.h" + #include "src/variables/request_cookies_names.h" ++#include "src/variables/multipart_part_headers.h" + #include "src/variables/request_file_name.h" + #include "src/variables/request_headers.h" + #include "src/variables/request_headers_names.h" +@@ -352,6 +353,7 @@ using namespace modsecurity::operators; + VARIABLE_RESPONSE_HEADERS + VARIABLE_GEO + VARIABLE_REQUEST_COOKIES_NAMES ++ VARIABLE_MULTIPART_PART_HEADERS + VARIABLE_ARGS_COMBINED_SIZE + VARIABLE_ARGS_GET_NAMES + VARIABLE_RULE +@@ -2061,6 +2063,18 @@ var: + { + VARIABLE_CONTAINER($$, new variables::RequestCookiesNames_NoDictElement()); + } ++ | VARIABLE_MULTIPART_PART_HEADERS DICT_ELEMENT ++ { ++ VARIABLE_CONTAINER($$, new variables::MultipartPartHeaders_DictElement($2)); ++ } ++ | VARIABLE_MULTIPART_PART_HEADERS DICT_ELEMENT_REGEXP ++ { ++ VARIABLE_CONTAINER($$, new variables::MultipartPartHeaders_DictElementRegexp($2)); ++ } ++ | VARIABLE_MULTIPART_PART_HEADERS ++ { ++ VARIABLE_CONTAINER($$, new variables::MultipartPartHeaders_NoDictElement()); ++ } + | VARIABLE_RULE DICT_ELEMENT + { + VARIABLE_CONTAINER($$, new variables::Rule_DictElement($2)); +diff --git a/src/parser/seclang-scanner.cc b/src/parser/seclang-scanner.cc +index 99fd50ca..3aa6f520 100644 +--- a/src/parser/seclang-scanner.cc ++++ b/src/parser/seclang-scanner.cc +@@ -433,8 +433,8 @@ static void yynoreturn yy_fatal_error ( const char* msg ); + /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\ + (yy_c_buf_p) = yy_cp; + /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ +-#define YY_NUM_RULES 542 +-#define YY_END_OF_BUFFER 543 ++#define YY_NUM_RULES 544 ++#define YY_END_OF_BUFFER 545 + /* This struct is not used in this scanner, + but its presence is necessary. */ + struct yy_trans_info +@@ -442,7 +442,7 @@ struct yy_trans_info + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +-static const flex_int16_t yy_accept[3953] = ++static const flex_int16_t yy_accept[3966] = + { 0, + 0, 0, 0, 0, 273, 273, 281, 281, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -451,108 +451,108 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 285, 285, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 543, 535, 529, 266, 270, 271, +- 269, 272, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 535, 535, 289, 289, 542, 289, 289, ++ 0, 0, 0, 0, 545, 537, 531, 266, 270, 271, ++ 269, 272, 537, 537, 537, 537, 537, 537, 537, 537, ++ 537, 537, 537, 537, 537, 289, 289, 544, 289, 289, + + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 126, 273, 279, 281, +- 283, 277, 276, 278, 275, 281, 274, 493, 493, 492, +- 493, 493, 493, 121, 120, 119, 128, 128, 128, 135, ++ 283, 277, 276, 278, 275, 281, 274, 495, 495, 494, ++ 495, 495, 495, 121, 120, 119, 128, 128, 128, 135, + 127, 128, 130, 130, 130, 129, 135, 130, 133, 133, +- 133, 132, 135, 131, 133, 534, 534, 534, 542, 495, +- 494, 444, 447, 542, 447, 444, 444, 444, 433, 433, +- 433, 436, 438, 433, 437, 433, 427, 433, 503, 503, +- 503, 502, 507, 503, 505, 505, 505, 504, 507, 505, ++ 133, 132, 135, 131, 133, 536, 536, 536, 544, 497, ++ 496, 446, 449, 544, 449, 446, 446, 446, 435, 435, ++ 435, 438, 440, 435, 439, 435, 429, 435, 505, 505, ++ 505, 504, 509, 505, 507, 507, 507, 506, 509, 507, + 118, 118, 110, 118, 115, 109, 118, 118, 118, 118, + + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, +- 118, 118, 118, 118, 113, 118, 112, 542, 512, 542, +- 508, 521, 542, 285, 286, 542, 499, 499, 498, 501, +- 499, 497, 497, 496, 501, 497, 150, 536, 537, 538, ++ 118, 118, 118, 118, 113, 118, 112, 544, 514, 544, ++ 510, 523, 544, 285, 286, 544, 501, 501, 500, 503, ++ 501, 499, 499, 498, 503, 499, 150, 538, 539, 540, + 137, 136, 137, 137, 137, 137, 137, 137, 141, 140, + 145, 146, 146, 145, 143, 142, 140, 148, 149, 149, +- 147, 148, 529, 266, 0, 269, 269, 269, 0, 0, ++ 147, 148, 531, 266, 0, 269, 269, 269, 0, 0, + 0, 0, 0, 0, 0, 0, 218, 0, 0, 0, +- 0, 0, 530, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 412, 0, 0, 0, ++ 0, 0, 532, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 414, 0, 0, 0, + +- 0, 0, 0, 0, 0, 0, 0, 0, 417, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 419, 0, + 0, 0, 0, 0, 122, 0, 125, 273, 279, 281, +- 283, 280, 281, 282, 283, 284, 529, 0, 0, 0, ++ 283, 280, 281, 282, 283, 284, 531, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 128, 0, 128, 128, 128, + 0, 134, 122, 128, 128, 130, 0, 0, 130, 130, + 130, 0, 130, 122, 130, 133, 0, 0, 133, 133, +- 133, 0, 133, 122, 133, 534, 534, 534, 0, 532, +- 534, 444, 0, 444, 0, 444, 444, 0, 444, 444, +- 433, 0, 0, 432, 433, 433, 433, 0, 433, 506, +- +- 433, 433, 0, 432, 0, 433, 425, 426, 433, 433, +- 503, 0, 0, 503, 503, 503, 0, 503, 122, 503, +- 505, 0, 505, 505, 0, 505, 0, 0, 122, 505, +- 505, 0, 110, 0, 109, 0, 111, 115, 116, 0, ++ 133, 0, 133, 122, 133, 536, 536, 536, 0, 534, ++ 536, 446, 0, 446, 0, 446, 446, 0, 446, 446, ++ 435, 0, 0, 434, 435, 435, 435, 0, 435, 508, ++ ++ 435, 435, 0, 434, 0, 435, 427, 428, 435, 435, ++ 505, 0, 0, 505, 505, 505, 0, 505, 122, 505, ++ 507, 0, 507, 507, 0, 507, 0, 0, 122, 507, ++ 507, 0, 110, 0, 109, 0, 111, 115, 116, 0, + 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 105, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 107, 0, 0, 113, 0, 114, 112, +- 112, 0, 512, 0, 521, 0, 512, 510, 520, 0, +- 508, 521, 0, 0, 528, 0, 511, 0, 285, 286, ++ 112, 0, 514, 0, 523, 0, 514, 512, 522, 0, ++ 510, 523, 0, 0, 530, 0, 513, 0, 285, 286, + +- 0, 286, 0, 0, 499, 0, 499, 0, 500, 499, +- 497, 0, 0, 497, 0, 497, 536, 537, 538, 0, ++ 0, 286, 0, 0, 501, 0, 501, 0, 502, 501, ++ 499, 0, 0, 499, 0, 499, 538, 539, 540, 0, + 0, 0, 0, 0, 0, 138, 139, 145, 0, 0, + 145, 0, 145, 144, 148, 0, 0, 148, 0, 148, + 269, 0, 0, 0, 0, 0, 0, 0, 217, 0, +- 0, 0, 0, 0, 0, 0, 530, 531, 0, 0, +- 0, 395, 0, 0, 385, 0, 0, 0, 420, 0, ++ 0, 0, 0, 0, 0, 0, 532, 533, 0, 0, ++ 0, 397, 0, 0, 385, 0, 0, 0, 422, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 423, 0, 0, 0, 0, 393, 122, +- 123, 124, 0, 0, 0, 0, 465, 0, 466, 0, ++ 0, 0, 0, 425, 0, 0, 0, 0, 395, 122, ++ 123, 124, 0, 0, 0, 0, 467, 0, 468, 0, + +- 467, 0, 0, 470, 471, 473, 0, 0, 475, 0, +- 0, 0, 0, 0, 0, 466, 0, 0, 0, 128, ++ 469, 0, 0, 472, 473, 475, 0, 0, 477, 0, ++ 0, 0, 0, 0, 0, 468, 0, 0, 0, 128, + 0, 0, 122, 123, 0, 130, 0, 0, 122, 123, +- 0, 133, 0, 0, 122, 123, 532, 533, 444, 0, +- 444, 0, 439, 0, 439, 0, 444, 0, 433, 0, +- 0, 433, 0, 432, 0, 433, 433, 433, 433, 433, +- 0, 0, 0, 0, 433, 433, 433, 0, 503, 0, +- 0, 122, 123, 0, 505, 0, 0, 122, 122, 123, ++ 0, 133, 0, 0, 122, 123, 534, 535, 446, 0, ++ 446, 0, 441, 0, 441, 0, 446, 0, 435, 0, ++ 0, 435, 0, 434, 0, 435, 435, 435, 435, 435, ++ 0, 0, 0, 0, 435, 435, 435, 0, 505, 0, ++ 0, 122, 123, 0, 507, 0, 0, 122, 122, 123, + 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, + + 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 107, 108, 510, 520, 516, 519, 0, +- 523, 0, 0, 528, 0, 0, 511, 509, 518, 0, +- 0, 287, 0, 0, 499, 0, 0, 0, 497, 0, ++ 0, 0, 0, 107, 108, 512, 522, 518, 521, 0, ++ 525, 0, 0, 530, 0, 0, 513, 511, 520, 0, ++ 0, 287, 0, 0, 501, 0, 0, 0, 499, 0, + 0, 0, 0, 0, 0, 0, 145, 0, 0, 0, + 148, 0, 0, 269, 0, 0, 0, 0, 0, 169, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 224, 531, 361, 0, 0, 396, 0, 0, 386, 0, ++ 224, 533, 361, 0, 0, 398, 0, 0, 386, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 389, 0, 0, 0, 408, 0, 0, +- 418, 0, 0, 394, 123, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 472, 474, 0, 0, 0, 0, ++ 0, 0, 0, 391, 0, 0, 0, 410, 0, 0, ++ 420, 0, 0, 396, 123, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 474, 476, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 128, 0, 123, +- 130, 0, 123, 133, 0, 123, 533, 444, 0, 0, +- 0, 0, 444, 0, 0, 440, 445, 441, 440, 445, +- 441, 433, 0, 433, 433, 433, 0, 433, 0, 0, +- 0, 0, 433, 0, 432, 0, 433, 433, 428, 434, ++ 130, 0, 123, 133, 0, 123, 535, 446, 0, 0, ++ 0, 0, 446, 0, 0, 442, 447, 443, 442, 447, ++ 443, 435, 0, 435, 435, 435, 0, 435, 0, 0, ++ 0, 0, 435, 0, 434, 0, 435, 435, 430, 436, + +- 429, 428, 434, 429, 0, 0, 433, 433, 503, 0, +- 123, 505, 0, 123, 123, 0, 0, 0, 0, 0, ++ 431, 430, 436, 431, 0, 0, 435, 435, 505, 0, ++ 123, 507, 0, 123, 123, 0, 0, 0, 0, 0, + 0, 0, 0, 5, 0, 0, 7, 0, 0, 0, + 8, 0, 0, 0, 49, 0, 0, 0, 13, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 63, 0, 0, 108, 516, +- 519, 515, 523, 0, 526, 0, 0, 522, 0, 0, +- 509, 518, 514, 517, 287, 0, 288, 499, 0, 497, ++ 0, 0, 0, 0, 0, 63, 0, 0, 108, 518, ++ 521, 517, 525, 0, 528, 0, 0, 524, 0, 0, ++ 511, 520, 516, 519, 287, 0, 288, 501, 0, 499, + + 0, 0, 0, 0, 0, 145, 0, 148, 0, 269, + 269, 214, 0, 0, 216, 0, 0, 0, 0, 0, +@@ -560,75 +560,75 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 362, 0, + 0, 0, 377, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 390, 0, +- 0, 0, 0, 0, 0, 424, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 491, ++ 0, 0, 0, 0, 0, 0, 0, 0, 392, 0, ++ 0, 0, 0, 0, 0, 426, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 493, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 0, 0, 0, 0, 0, 0, 0, 442, 442, 442, +- 0, 0, 430, 430, 0, 0, 0, 433, 433, 0, +- 430, 0, 433, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 444, 444, 444, ++ 0, 0, 432, 432, 0, 0, 0, 435, 435, 0, ++ 432, 0, 435, 0, 0, 0, 0, 0, 0, 0, + 26, 0, 0, 2, 0, 4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, + 14, 0, 0, 16, 0, 0, 53, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 75, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 515, 526, 0, 527, 522, 0, 524, 0, ++ 0, 0, 517, 528, 0, 529, 524, 0, 526, 0, + +- 514, 517, 513, 288, 0, 0, 0, 0, 0, 0, ++ 516, 519, 515, 288, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 269, 269, 0, 0, 0, + 170, 0, 0, 221, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, +- 0, 0, 0, 0, 0, 0, 378, 0, 0, 411, ++ 0, 0, 0, 0, 0, 0, 378, 0, 0, 413, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 415, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 417, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 359, 0, 0, 0, 0, + +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 477, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 446, +- 443, 446, 443, 435, 431, 435, 431, 0, 430, 0, +- 0, 0, 433, 0, 0, 0, 1, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 479, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 448, ++ 445, 448, 445, 437, 433, 437, 433, 0, 432, 0, ++ 0, 0, 435, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 41, 41, 0, 8, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 84, 0, 0, 0, 0, 74, 0, 92, 0, 0, +- 0, 0, 0, 0, 0, 0, 527, 524, 0, 525, ++ 0, 0, 0, 0, 0, 0, 529, 526, 0, 527, + +- 513, 0, 0, 0, 269, 269, 0, 0, 0, 0, ++ 515, 0, 0, 0, 269, 269, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 260, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 419, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 421, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 414, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 416, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 0, 0, 0, 461, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 463, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, + 0, 0, 41, 0, 41, 41, 0, 0, 0, 0, + 0, 0, 0, 50, 0, 0, 15, 0, 0, 52, + 0, 54, 22, 55, 56, 58, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 64, 0, 0, 65, 525, 0, 0, 269, 269, ++ 0, 64, 0, 0, 65, 527, 0, 0, 269, 269, + 0, 0, 0, 219, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 363, 0, 0, 0, 398, 0, 0, ++ 0, 0, 0, 363, 0, 0, 0, 400, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 413, 0, 0, +- 0, 0, 422, 0, 0, 401, 0, 0, 404, 405, +- 406, 0, 0, 0, 0, 360, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 469, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 415, 0, 0, ++ 0, 0, 424, 0, 0, 403, 0, 0, 406, 407, ++ 408, 0, 0, 0, 0, 360, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 471, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 27, 0, 0, 0, 0, 0, 0, +@@ -637,7 +637,7 @@ static const flex_int16_t yy_accept[3953] = + 57, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 97, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 64, 0, 269, 269, +- 0, 0, 0, 0, 539, 0, 0, 262, 0, 0, ++ 0, 0, 0, 0, 541, 0, 0, 262, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -646,10 +646,10 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 364, 0, 0, 365, 297, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 325, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 421, 0, 0, +- 0, 0, 356, 0, 0, 403, 409, 407, 357, 0, +- 0, 0, 463, 0, 0, 464, 0, 0, 0, 0, +- 468, 0, 476, 478, 0, 0, 486, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 423, 0, 0, ++ 0, 0, 356, 0, 0, 405, 411, 409, 357, 0, ++ 0, 0, 465, 0, 0, 466, 0, 0, 0, 0, ++ 470, 0, 478, 480, 0, 0, 488, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 40, 0, 40, 0, 0, + +@@ -668,9 +668,9 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 402, 0, 0, 0, +- 0, 0, 0, 481, 0, 490, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 487, 488, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 404, 0, 0, 0, ++ 0, 0, 0, 483, 0, 492, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 489, 490, 0, 0, 0, + 0, 0, 0, 25, 0, 25, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 46, 48, 0, + 48, 10, 11, 0, 0, 0, 0, 0, 0, 0, +@@ -679,7 +679,7 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 93, 0, 0, 0, 0, +- 0, 269, 0, 267, 267, 267, 267, 267, 0, 540, ++ 0, 269, 0, 267, 267, 267, 267, 267, 0, 542, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 193, 0, 0, +@@ -689,196 +689,197 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 294, 0, 0, 369, 367, + 0, 0, 0, 0, 0, 303, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 327, 328, 329, 400, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 345, 0, 0, 0, 0, 0, +- 353, 354, 355, 416, 0, 0, 479, 0, 0, 452, +- 449, 0, 0, 472, 0, 0, 0, 0, 0, 0, +- 0, 489, 0, 0, 458, 0, 455, 0, 0, 0, +- 0, 25, 0, 0, 0, 26, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 44, 44, 0, 0, 48, ++ 0, 327, 328, 329, 402, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 345, 0, 0, 0, 0, ++ 0, 353, 354, 355, 418, 0, 0, 481, 0, 0, ++ 454, 451, 0, 0, 474, 0, 0, 0, 0, 0, ++ 0, 0, 491, 0, 0, 460, 0, 457, 0, 0, ++ 0, 0, 25, 0, 0, 0, 26, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 44, 44, 0, 0, ++ ++ 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 61, 0, 0, 0, 91, 0, 78, 77, ++ 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 94, 80, 83, 81, 0, 269, 269, ++ 0, 0, 0, 0, 222, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 232, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 245, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, ++ 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 370, 368, 0, ++ 0, 300, 0, 0, 375, 0, 399, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 61, 0, 0, 0, 91, 0, 78, 77, 0, +- 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 94, 80, 83, 81, 0, 269, 269, 0, +- 0, 0, 0, 222, 0, 0, 0, 0, 0, 0, ++ 0, 326, 0, 0, 0, 337, 0, 0, 0, 341, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 232, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 245, 0, 0, 0, 0, ++ 0, 453, 482, 0, 0, 0, 485, 0, 0, 0, ++ 0, 0, 459, 0, 0, 0, 0, 24, 0, 0, ++ 24, 0, 0, 0, 0, 0, 0, 0, 0, 6, + +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, ++ 0, 44, 44, 0, 44, 0, 44, 44, 0, 0, ++ 47, 0, 0, 47, 0, 0, 0, 0, 0, 0, ++ 0, 0, 106, 0, 0, 0, 59, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 370, 368, 0, 0, +- 300, 0, 0, 375, 0, 397, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 326, +- 0, 0, 0, 337, 0, 0, 0, 341, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 451, +- 480, 0, 0, 0, 483, 0, 0, 0, 0, 0, +- 457, 0, 0, 0, 0, 24, 0, 0, 24, 0, +- 0, 0, 0, 0, 0, 0, 0, 6, 0, 44, +- +- 44, 0, 44, 0, 44, 44, 0, 0, 47, 0, +- 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, +- 106, 0, 0, 0, 59, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 268, +- 268, 268, 268, 268, 215, 0, 0, 0, 0, 0, +- 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 242, 0, 0, 0, 0, 0, 0, +- 0, 175, 0, 0, 0, 0, 0, 0, 243, 0, +- +- 0, 0, 192, 0, 0, 0, 0, 191, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 236, 0, 0, +- 0, 0, 0, 154, 154, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 376, 0, 0, 0, ++ 0, 268, 268, 268, 268, 268, 215, 0, 0, 0, ++ 0, 0, 167, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 242, 0, 0, 0, 0, ++ 0, 0, 0, 175, 0, 0, 0, 0, 0, 0, ++ ++ 243, 0, 0, 0, 192, 0, 0, 0, 0, 191, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 236, ++ 0, 0, 0, 0, 0, 154, 154, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 376, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 331, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 346, 0, 0, 0, 0, 0, 0, 462, +- 0, 0, 0, 484, 0, 0, 0, 0, 0, 0, +- 24, 25, 26, 0, 0, 0, 0, 0, 0, 103, +- 44, 43, 44, 44, 43, 0, 0, 44, 43, 0, +- +- 0, 44, 43, 44, 44, 45, 47, 48, 0, 0, +- 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, ++ 0, 0, 0, 0, 0, 331, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 346, 0, 0, 0, 0, ++ 0, 0, 464, 0, 0, 0, 486, 0, 0, 0, ++ 0, 0, 0, 24, 25, 26, 0, 0, 0, 0, ++ 0, 0, 103, 44, 43, 44, 44, 43, 0, 0, ++ ++ 44, 43, 0, 0, 44, 43, 44, 44, 45, 47, ++ 48, 0, 0, 0, 50, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 88, 0, 0, 0, 0, 0, 0, +- 220, 0, 0, 162, 0, 164, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 240, 0, 0, 0, 0, +- 0, 0, 0, 233, 0, 0, 0, 0, 0, 0, +- 250, 0, 0, 265, 265, 0, 0, 0, 0, 0, ++ 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 88, 0, 0, 0, ++ 0, 0, 0, 220, 0, 0, 162, 0, 164, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 240, 0, ++ 0, 0, 0, 0, 0, 0, 233, 0, 0, 0, ++ 0, 0, 0, 250, 0, 0, 265, 265, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 0, 0, 0, 210, 0, 0, 0, 0, 0, 0, +- 0, 0, 291, 0, 0, 391, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 210, 0, 0, 0, ++ 0, 0, 0, 0, 0, 291, 0, 0, 393, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 321, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 342, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 321, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 342, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 44, 0, 43, +- 0, 44, 44, 43, 0, 43, 0, 0, 43, 0, +- 0, 45, 43, 45, 45, 43, 0, 44, 43, 44, +- 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 44, 0, 43, 0, 44, 44, 43, 0, 43, ++ 0, 0, 43, 0, 0, 45, 43, 45, 45, 43, ++ 0, 44, 43, 44, 0, 0, 0, 0, 50, 0, + +- 0, 0, 0, 0, 0, 0, 60, 0, 60, 0, +- 60, 0, 0, 71, 70, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 87, 69, 82, 0, +- 0, 0, 171, 0, 0, 0, 0, 0, 0, 174, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, +- 0, 0, 0, 0, 0, 247, 246, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 237, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 153, 0, 0, 0, 0, 292, +- 295, 0, 392, 0, 0, 0, 0, 0, 0, 0, +- +- 0, 0, 0, 0, 0, 0, 0, 0, 320, 0, +- 0, 0, 0, 0, 0, 0, 0, 379, 0, 381, +- 0, 344, 0, 0, 0, 352, 0, 0, 0, 0, +- 0, 485, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 35, 0, 0, 42, 44, 42, 0, 44, 42, +- 0, 0, 42, 44, 0, 42, 0, 42, 45, 45, +- 42, 45, 26, 0, 18, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, +- 0, 0, 96, 96, 0, 67, 0, 0, 0, 0, +- 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- +- 241, 0, 0, 0, 0, 0, 0, 0, 0, 261, +- 0, 178, 178, 0, 248, 0, 0, 0, 0, 0, ++ 60, 0, 60, 0, 60, 0, 0, 71, 70, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 87, 69, 82, 0, 0, 0, 171, 0, 0, 0, ++ 0, 0, 0, 174, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 176, 0, 0, 0, 0, 0, 247, ++ 246, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 237, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 153, 0, ++ 0, 0, 0, 292, 295, 0, 394, 0, 0, 0, ++ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 320, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 379, 0, 381, 0, 344, 0, 0, 0, ++ 352, 0, 0, 0, 0, 0, 487, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 35, 0, 0, 42, ++ 44, 42, 0, 44, 42, 0, 0, 42, 44, 0, ++ 42, 0, 42, 45, 45, 42, 45, 26, 0, 18, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 211, 0, 0, 0, 153, 0, 0, 296, 0, +- 0, 0, 399, 0, 0, 302, 0, 0, 0, 0, ++ 0, 60, 0, 0, 0, 0, 0, 96, 96, 0, ++ 67, 0, 0, 0, 0, 98, 0, 0, 0, 0, ++ ++ 0, 0, 0, 0, 0, 241, 0, 0, 0, 0, ++ 0, 0, 0, 0, 261, 0, 178, 178, 0, 248, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 211, 0, 0, 0, ++ 153, 0, 0, 296, 0, 0, 0, 401, 0, 0, ++ 302, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 335, 0, ++ 380, 0, 338, 382, 0, 343, 0, 383, 0, 358, ++ 0, 470, 0, 0, 0, 0, 0, 0, 0, 28, ++ ++ 0, 0, 0, 0, 0, 0, 42, 42, 0, 42, ++ 0, 44, 0, 42, 45, 43, 45, 45, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, ++ 0, 0, 0, 0, 68, 66, 100, 0, 0, 0, ++ 0, 0, 0, 168, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 229, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 256, 0, 0, 0, 238, 0, 0, 0, 234, ++ 234, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0, ++ ++ 0, 0, 0, 317, 0, 0, 0, 0, 0, 0, ++ 330, 334, 0, 0, 0, 0, 384, 0, 351, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 335, 0, 380, 0, 338, 382, 0, 343, +- 0, 383, 0, 358, 0, 468, 0, 0, 0, 0, +- 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, +- +- 42, 42, 0, 42, 0, 44, 0, 42, 45, 43, +- 45, 45, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 60, 0, 0, 0, 0, 0, 0, 68, 66, +- 100, 0, 0, 0, 0, 0, 0, 168, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 229, 0, 0, ++ 0, 0, 0, 0, 43, 43, 45, 45, 43, 45, ++ 0, 0, 0, 0, 0, 0, 60, 0, 72, 0, ++ 76, 0, 0, 0, 0, 0, 101, 0, 0, 0, ++ 0, 0, 165, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 177, 0, 249, 0, 0, 0, 543, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 256, 0, 0, 0, 238, +- 0, 0, 0, 234, 234, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 371, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 317, 0, 0, +- +- 0, 0, 0, 330, 334, 0, 0, 0, 0, 384, +- 0, 351, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 43, 43, 45, +- 45, 43, 45, 0, 0, 0, 0, 0, 0, 60, +- 0, 72, 0, 76, 0, 0, 0, 0, 0, 101, +- 0, 0, 0, 0, 0, 165, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 177, 0, 249, 0, 0, +- 0, 541, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 208, 0, 290, 0, 372, 0, +- +- 301, 373, 0, 0, 0, 0, 311, 0, 0, 0, ++ ++ 0, 208, 0, 290, 0, 372, 0, 301, 373, 0, ++ 0, 0, 0, 311, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 482, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, +- 0, 0, 0, 60, 0, 89, 95, 95, 0, 86, +- 0, 181, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 155, 0, 0, 251, 180, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 195, 195, 0, ++ 0, 0, 484, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, ++ 0, 60, 0, 89, 95, 95, 0, 86, 0, 181, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 213, 0, 298, 299, 374, 0, 0, 0, 0, 310, ++ 155, 0, 0, 251, 180, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 195, 195, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 213, 0, + +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 324, +- 0, 336, 0, 0, 0, 0, 0, 410, 0, 0, ++ 298, 299, 374, 0, 0, 0, 0, 310, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 324, 0, ++ 336, 0, 0, 0, 0, 0, 412, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 156, +- 0, 166, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 187, 0, 0, 0, 0, 0, 0, +- 0, 0, 196, 196, 0, 198, 198, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 212, 225, 0, 0, +- 0, 307, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 450, 0, +- +- 0, 0, 456, 0, 0, 29, 0, 0, 0, 36, ++ 0, 0, 0, 0, 0, 0, 0, 0, 156, 0, ++ 166, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 187, 0, 0, 0, 0, 0, 0, 0, ++ 0, 196, 196, 0, 198, 198, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 212, 225, 0, 0, 0, ++ 307, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ ++ 0, 0, 0, 0, 0, 0, 0, 0, 452, 0, ++ 0, 0, 458, 0, 0, 29, 0, 0, 0, 36, + 0, 0, 19, 0, 0, 85, 99, 0, 0, 163, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 185, 0, 0, 190, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 194, 0, 0, 0, 308, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 387, 339, 0, 348, 0, +- 453, 0, 0, 459, 0, 0, 0, 0, 37, 0, +- 20, 0, 161, 228, 228, 0, 161, 157, 0, 0, +- 0, 264, 0, 252, 0, 231, 0, 0, 0, 0, +- +- 0, 0, 0, 0, 189, 0, 0, 197, 199, 0, +- 0, 0, 0, 152, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 315, 0, 0, 0, 322, +- 0, 0, 388, 340, 0, 349, 454, 0, 460, 0, +- 34, 0, 0, 21, 0, 0, 0, 158, 0, 0, +- 253, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 152, 0, 0, 209, 0, +- 0, 306, 0, 0, 0, 0, 0, 0, 0, 333, +- 347, 350, 0, 0, 0, 0, 160, 0, 0, 239, +- 0, 0, 0, 230, 0, 0, 263, 0, 0, 0, +- ++ 0, 0, 0, 0, 0, 0, 387, 339, 0, 348, ++ 0, 455, 0, 0, 461, 0, 0, 0, 0, 37, ++ 0, 20, 0, 161, 228, 228, 0, 161, 157, 0, ++ ++ 0, 0, 264, 0, 252, 0, 231, 0, 0, 0, ++ 0, 0, 0, 0, 0, 189, 0, 0, 197, 199, ++ 0, 0, 0, 0, 152, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 315, 0, 0, 389, ++ 0, 322, 0, 0, 388, 340, 0, 349, 456, 0, ++ 462, 0, 34, 0, 0, 21, 0, 0, 0, 158, ++ 0, 0, 253, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 152, 0, 0, ++ 209, 0, 0, 306, 0, 0, 0, 0, 0, 390, ++ 0, 0, 333, 347, 350, 0, 0, 0, 0, 160, ++ ++ 0, 0, 239, 0, 0, 0, 230, 0, 0, 263, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 312, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 159, 151, ++ 0, 0, 0, 0, 0, 0, 184, 0, 0, 226, ++ 226, 0, 207, 0, 205, 0, 0, 0, 257, 0, ++ 304, 0, 0, 0, 316, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 151, 0, 0, 0, 0, 0, ++ 188, 0, 0, 0, 203, 0, 201, 0, 258, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 312, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 159, 151, 0, 0, 0, +- 0, 0, 0, 184, 0, 0, 226, 226, 0, 207, +- 0, 205, 0, 0, 0, 257, 0, 304, 0, 0, +- 0, 316, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 151, 0, 0, 0, 0, 0, 188, 0, 0, +- 0, 203, 0, 201, 0, 258, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 38, 0, 172, +- 172, 0, 0, 0, 0, 0, 0, 0, 206, 204, +- +- 0, 0, 0, 0, 0, 318, 319, 0, 332, 0, +- 0, 0, 0, 39, 0, 259, 179, 0, 0, 186, +- 0, 202, 200, 0, 0, 0, 323, 0, 0, 0, +- 31, 173, 183, 0, 227, 305, 309, 0, 33, 30, +- 0, 182, 0, 0, 0, 0, 314, 0, 0, 0, +- 32, 0 ++ ++ 38, 0, 172, 172, 0, 0, 0, 0, 0, 0, ++ 0, 206, 204, 0, 0, 0, 0, 0, 318, 319, ++ 0, 332, 0, 0, 0, 0, 39, 0, 259, 179, ++ 0, 0, 186, 0, 202, 200, 0, 0, 0, 323, ++ 0, 0, 0, 31, 173, 183, 0, 227, 305, 309, ++ 0, 33, 30, 0, 182, 0, 0, 0, 0, 314, ++ 0, 0, 0, 32, 0 + } ; + + static const YY_CHAR yy_ec[256] = +@@ -926,953 +927,955 @@ static const YY_CHAR yy_meta[88] = + 15, 15, 15, 15, 17, 18, 1 + } ; + +-static const flex_int16_t yy_base[4238] = ++static const flex_int16_t yy_base[4251] = + { 0, + 0, 80, 161, 0, 4, 8, 14, 247, 21, 87, + 101, 254, 25, 40, 53, 261, 265, 275, 284, 290, +- 94, 304,11621,11620,11617,11573, 324, 347, 365, 383, ++ 94, 304,11801,11718,11649,11643, 324, 347, 365, 383, + 413, 434, 314, 448, 335, 397, 505, 0, 457, 464, + 591, 597, 603, 609, 419, 425, 271, 298, 102, 612, +- 11569,11568,11565,11539,11533,11532,11529,11504, 614, 622, +- 0, 0,11472,11471, 428, 611, 646, 668, 0, 0, +- 57, 79, 620, 627,11497,14261, 673,14261,14261,14261, +- 308,14261, 4, 25, 59, 52, 71, 72, 96, 279, +- 315, 97, 220, 271, 8,14261, 443,14261, 655, 269, ++ 11644,11641,11597,11591,11590,11587,11561,11555, 614, 622, ++ 0, 0,11528,11525, 428, 611, 646, 668, 0, 0, ++ 57, 79, 620, 627,11529,14283, 673,14283,14283,14283, ++ 308,14283, 4, 25, 59, 52, 71, 72, 96, 279, ++ 315, 97, 220, 271, 8,14283, 443,14283, 655, 269, + + 312, 578, 673, 330, 429, 681, 327, 358, 368, 686, +- 679, 699, 707, 421, 422, 38,11479, 133, 765, 771, +- 783,14261,14261,14261,14261, 789,14261,14261, 631,14261, +- 815, 76, 764,14261,14261,14261, 278, 798, 348, 417, +- 11426, 801, 372, 829, 752,11425, 540, 814, 855, 895, +- 883,11422, 546,11414, 904, 830, 901,14261, 913,14261, +- 14261, 918,11408,11407,11404, 924, 957, 964, 934, 980, +- 991,11315, 601, 1012,11109, 1024, 725, 1042, 770, 1054, +- 831,11103, 625, 1063, 645, 978, 802, 867, 663, 1072, +- 14261, 1081,14261,11156, 484, 475, 1047, 719, 764, 874, ++ 679, 699, 707, 421, 422, 38,11513, 133, 765, 771, ++ 783,14283,14283,14283,14283, 789,14283,14283, 631,14283, ++ 815, 76, 764,14283,14283,14283, 278, 798, 348, 417, ++ 11465, 801, 372, 829, 752,11462, 540, 814, 855, 895, ++ 883,11454, 546,11448, 904, 830, 901,14283, 913,14283, ++ 14283, 918,11447,11444,11436, 924, 957, 964, 934, 980, ++ 991,11430, 601, 1012,11429, 1024, 725, 1042, 770, 1054, ++ 831,11426, 625, 1063, 645, 978, 802, 867, 663, 1072, ++ 14283, 1081,14283,11391, 484, 475, 1047, 719, 764, 874, + + 717, 940, 752, 1056, 800, 953, 1064, 818, 1059, 917, +- 821, 885, 405, 1139,14261,11153, 1143, 1147, 476, 309, +- 1153, 1159, 410, 1011, 490, 493, 1096, 1114,11055, 911, +- 1122, 1124, 1129,11049, 943, 1158,14261, 0, 0, 0, +- 14261,14261, 990, 1017, 1053, 1062, 1105, 1118,14261, 120, +- 1162,11048, 1113, 1168,14261,14261, 282, 1178,11045, 1116, +- 10966, 1199, 1200,14261, 495, 0, 1187,10954, 1135, 1140, +- 1144, 1149, 1180, 1172, 1168, 1184,14261, 1173, 1178, 1184, +- 1199, 1182, 636,11013, 1229, 620, 1196, 1187, 1190, 1187, ++ 821, 885, 405, 1139,14283,11185, 1143, 1147, 476, 309, ++ 1153, 1159, 410, 1011, 490, 493, 1096, 1114,11125, 911, ++ 1122, 1124, 1129,11124, 943, 1158,14283, 0, 0, 0, ++ 14283,14283, 990, 1017, 1053, 1062, 1105, 1118,14283, 120, ++ 1162,11121, 1113, 1168,14283,14283, 282, 1178,11077, 1116, ++ 11071, 1199, 1200,14283, 495, 0, 1187,11064, 1135, 1140, ++ 1144, 1149, 1180, 1172, 1168, 1184,14283, 1173, 1178, 1184, ++ 1199, 1182, 636,11121, 1229, 620, 1196, 1187, 1190, 1187, + 1198, 1200, 1198, 1199, 1213, 1221, 297, 1205, 1225, 1220, + + 1213, 1214, 1234, 1230, 1232, 1236, 1245, 1237, 735, 1243, +- 1246, 1254, 1261, 1252, 641,11010,10902, 642, 1321, 1327, +- 1333,14261, 1293,14261, 1304,14261, 1294, 1279, 1270, 1283, ++ 1246, 1254, 1261, 1252, 641,11042,10954, 642, 1321, 1327, ++ 1333,14283, 1293,14283, 1304,14283, 1294, 1279, 1270, 1283, + 1297, 1268, 1304, 1311, 1298, 1302, 1317, 1302, 1314, 1328, +- 1321, 1329, 1354, 1321, 1339, 920,10924, 670, 1395, 1405, +- 1400,14261, 1409, 1410, 1406, 1416,10923,10920, 998, 1423, +- 1431, 1417, 1429, 1435, 1440, 1439,10912,10906, 1391, 1454, +- 1467, 1448, 1468, 1474, 1484, 1498, 1504,14261, 1510, 933, +- 1514, 1525,10905, 1518,10952, 1541, 1561, 346, 1578, 1584, +- 1585,10777,10773, 1609, 1527, 1624, 1642, 1500, 1648,14261, +- +- 1673, 1677, 1615, 1707, 842, 1708,14261,14261, 1733, 1739, +- 1488,10737,10687, 1005, 1722, 1549, 1633, 1684, 1745, 1701, +- 1568,10669, 1172, 1751, 1671, 1599, 1664, 1605, 1764, 1767, +- 1734, 1780,14261,10705, 949, 816,14261, 1784,14261,10701, ++ 1321, 1329, 1354, 1321, 1339, 920,10981, 670, 1395, 1405, ++ 1400,14283, 1409, 1410, 1406, 1416,10978,10952, 998, 1423, ++ 1431, 1417, 1429, 1435, 1440, 1439,10946,10945, 1391, 1454, ++ 1467, 1448, 1468, 1474, 1484, 1498, 1504,14283, 1510, 933, ++ 1514, 1525,10942, 1518,10984, 1541, 1561, 346, 1578, 1584, ++ 1585,10928,10927, 1609, 1527, 1624, 1642, 1500, 1648,14283, ++ ++ 1673, 1677, 1615, 1707, 842, 1708,14283,14283, 1733, 1739, ++ 1488,10924,10799, 1005, 1722, 1549, 1633, 1684, 1745, 1701, ++ 1568,10795, 1172, 1751, 1671, 1599, 1664, 1605, 1764, 1767, ++ 1734, 1780,14283,10813, 949, 816,14283, 1784,14283,10763, + 1463, 1335, 1402, 1444, 1474, 1477, 1503, 1529, 1581, 1753, +- 1658, 1746,10604, 1734, 1739, 1728, 1761, 1758, 1774, 1771, +- 14261, 1761, 1780, 1778, 1780, 1771, 1767, 1779, 1798, 1829, +- 1793, 1800, 1811, 1533,10589, 1880,14261,10583,14261, 1907, +- 1911, 1915, 1567, 701, 1921, 1075, 1691, 1560, 1847,10582, ++ 1658, 1746,10720, 1734, 1739, 1728, 1761, 1758, 1774, 1771, ++ 14283, 1761, 1780, 1778, 1780, 1771, 1767, 1779, 1798, 1829, ++ 1793, 1800, 1811, 1533,10727, 1880,14283,10723,14283, 1907, ++ 1911, 1915, 1567, 701, 1921, 1075, 1691, 1560, 1847,10651, + 1927, 1936, 1861, 898, 1755, 1100, 1886, 1035, 1940, 1854, + +- 1110, 1931, 1944,10579, 1943,10468, 1293, 1945,14261, 1947, +- 1949,10428,10422, 1428, 1951, 1953, 0, 0, 0, 1825, +- 1030, 1825, 1905, 1476, 1927,14261,14261, 1959,10421,10418, +- 1960, 1963, 1970,14261, 2011,10343,10307, 1976, 1984, 2022, +- 10235, 1931, 1948, 1952, 1957, 1969, 1970, 1980,14261, 1991, ++ 1110, 1931, 1944,10611, 1943,10551, 1293, 1945,14283, 1947, ++ 1949,10550,10547, 1428, 1951, 1953, 0, 0, 0, 1825, ++ 1030, 1825, 1905, 1476, 1927,14283,14283, 1959,10490,10450, ++ 1960, 1963, 1970,14283, 2011,10444,10443, 1976, 1984, 2022, ++ 10436, 1931, 1948, 1952, 1957, 1969, 1970, 1980,14283, 1991, + 1991, 1990, 1993, 2049, 1991, 1991, 1993, 2041, 1987, 2000, +- 2013, 1633, 2010, 2006, 1669, 2017, 2019, 2016,14261, 2029, ++ 2013, 1633, 2010, 2006, 1669, 2017, 2019, 2016,14283, 2029, + 2016, 2028, 2049, 2046, 2043, 2049, 2073, 2072, 2066, 2052, +- 2058, 2063, 2086,14261, 2087, 2101, 2089, 2107, 1948, 2065, +- 2069,14261, 2102, 2096, 2092, 2109,14261, 2088, 2102, 2116, ++ 2058, 2063, 2086,14283, 2087, 2101, 2089, 2107, 1948, 2065, ++ 2069,14283, 2102, 2096, 2092, 2109,14283, 2088, 2102, 2116, + +- 14261, 2101, 2108,14261,14261, 2117, 2112, 2104, 2120, 2110, ++ 14283, 2101, 2108,14283,14283, 2117, 2112, 2104, 2120, 2110, + 2126, 2118, 2113, 2113, 2119, 2128, 2141, 2135, 2123, 2180, +- 10121,10131, 2194, 2205,10113, 2188, 9761, 9370, 2209, 2216, +- 9369, 2215, 9340, 9367, 2226, 2233, 2198, 2207, 2250, 2175, +- 2273, 856, 2282, 9405, 2224, 1994, 2291, 9365, 2306, 9336, +- 9363, 2369, 2242, 2378, 2206, 2387, 2399, 2422, 2431, 2456, +- 9401, 2259, 2285, 2413, 2482, 2491, 2500, 9361, 2260, 9332, +- 9359, 2351, 2365, 2197, 2276, 9330, 9357, 2452, 2329, 2467, +- 14261, 2250, 2259, 2277, 2276, 2286, 2272, 2284, 9385, 2269, +- 2278, 2303, 2336, 2358, 2356, 2511, 2375, 2405, 2396, 9384, +- +- 2398, 2399, 2407,14261, 2437, 2441, 2442, 2470, 2467, 2483, +- 2490, 9383, 2487, 2510, 2492, 2482, 2491, 2512, 2521, 2497, ++ 10337,10329, 2194, 2205,10261, 2188,10143,10153, 2209, 2216, ++ 10135, 2215, 9783, 9392, 2226, 2233, 2198, 2207, 2250, 2175, ++ 2273, 856, 2282, 9430, 2224, 1994, 2291, 9390, 2306, 9361, ++ 9388, 2369, 2242, 2378, 2206, 2387, 2399, 2422, 2431, 2456, ++ 9426, 2259, 2285, 2413, 2482, 2491, 2500, 9386, 2260, 9357, ++ 9384, 2351, 2365, 2197, 2276, 9355, 9382, 2452, 2329, 2467, ++ 14283, 2250, 2259, 2277, 2276, 2286, 2272, 2284, 9410, 2269, ++ 2278, 2303, 2336, 2358, 2356, 2511, 2375, 2405, 2396, 9409, ++ ++ 2398, 2399, 2407,14283, 2437, 2441, 2442, 2470, 2467, 2483, ++ 2490, 9408, 2487, 2510, 2492, 2482, 2491, 2512, 2521, 2497, + 2517, 2498, 2537, 2517, 2515, 2532, 2530, 2538, 2529, 2551, +- 9382, 9381, 2534, 2254, 2303, 2339, 2607, 2344, 2613, 2614, +- 2360, 2621, 9405, 2398, 2628, 1372, 2629, 2579, 2635, 9404, +- 2636, 2606, 2642, 2539, 2597, 9321, 9348, 9347, 2638, 9318, +- 9345, 2590, 2587, 2590, 2598, 9310, 2646, 9281, 9308, 9306, +- 2656, 9277, 9293, 92, 2601, 2601, 2622, 2609, 2608,14261, ++ 9407, 9406, 2534, 2254, 2303, 2339, 2607, 2344, 2613, 2614, ++ 2360, 2621, 9430, 2398, 2628, 1372, 2629, 2579, 2635, 9429, ++ 2636, 2606, 2642, 2539, 2597, 9346, 9373, 9372, 2638, 9343, ++ 9370, 2590, 2587, 2590, 2598, 9369, 2646, 9340, 9367, 9332, ++ 2656, 9303, 9330, 92, 2601, 2601, 2622, 2609, 2608,14283, + 2610, 2622, 2630, 2636, 2618, 2640, 2651, 2669, 2671, 2668, + 2633, 2650, 2651, 2672, 2676, 2659, 2685, 2679, 2672, 2690, + +- 14261, 2735, 2716, 9255, 2675,14261, 2689, 9254,14261, 2710, +- 2710, 2696, 2714, 2720, 2717, 2713, 9251, 2705, 2711, 2717, +- 2728, 2713, 2720, 2241, 2732, 2729, 2719, 9246, 2720, 2728, +- 2777, 2730, 2743,14261, 2777, 2742, 2735, 2752, 2748, 2745, +- 2760, 2761, 2761, 2777, 2762,14261, 2779, 2770, 2779, 2772, ++ 14283, 2735, 2716, 9327, 2675,14283, 2689, 9326,14283, 2710, ++ 2710, 2696, 2714, 2720, 2717, 2713, 9314, 2705, 2711, 2717, ++ 2728, 2713, 2720, 2241, 2732, 2729, 2719, 9277, 2720, 2728, ++ 2777, 2730, 2743,14283, 2777, 2742, 2735, 2752, 2748, 2745, ++ 2760, 2761, 2761, 2777, 2762,14283, 2779, 2770, 2779, 2772, + 2779, 2780, 2782, 2786, 2781, 2779, 2787, 1723, 2822, 2851, + 2402, 2848, 2855, 2818, 2857, 2866, 2864, 2875, 947, 2825, +- 2852, 9240, 2892, 42, 2865, 9199, 916, 9195,14261, 9230, +- 14261, 2891, 2886, 2915, 2924, 2945, 1309, 2975, 2873, 2927, +- 9223, 2968, 2993, 2989, 3033, 1837, 3037, 3058, 3046, 1847, ++ 2852, 9316, 2892, 42, 2865, 9276, 916, 9274,14283, 9312, ++ 14283, 2891, 2886, 2915, 2924, 2945, 1309, 2975, 2873, 2927, ++ 9309, 2968, 2993, 2989, 3033, 1837, 3037, 3058, 3046, 1847, + +- 3057,14261, 9222,14261, 989, 1878, 3090, 3094, 2817, 2909, ++ 3057,14283, 9308,14283, 989, 1878, 3090, 3094, 2817, 2909, + 3014, 2831, 2908, 2966, 2884, 2852, 2911, 2945, 2949, 2965, +- 2958, 2985, 3062,14261, 3048, 3051,14261, 9125, 3037, 3108, +- 3133, 3055, 3058, 3070,14261, 3081, 3088, 3099,14261, 3102, +- 3104, 3105, 3086, 3094, 3091, 8916, 3094, 3101, 3100, 3122, ++ 2958, 2985, 3062,14283, 3048, 3051,14283, 9249, 3037, 3108, ++ 3133, 3055, 3058, 3070,14283, 3081, 3088, 3099,14283, 3102, ++ 3104, 3105, 3086, 3094, 3091, 9264, 3094, 3101, 3100, 3122, + 3123, 3132, 3118, 3147, 3123, 3130, 3146, 3138, 3133, 3150, +- 3130, 3142, 3152, 3143, 3135, 8902, 3148, 3145, 3152, 3166, +- 3157, 3161, 3155, 3161, 3168,14261, 8855, 3156, 2949, 3010, +- 3075, 3028, 3076, 3232, 3217, 3233, 3239, 3240, 3245, 8863, ++ 3130, 3142, 3152, 3143, 3135, 9245, 3148, 3145, 3152, 3166, ++ 3157, 3161, 3155, 3161, 3168,14283, 9096, 3156, 2949, 3010, ++ 3075, 3028, 3076, 3232, 3217, 3233, 3239, 3240, 3245, 9063, + 3246, 3251, 3252, 3257, 3258, 3263, 3264, 2957, 3262, 3220, + +- 3264, 3224, 3210, 3234, 2907, 3269, 3265, 3275, 3268, 8804, +- 8705,14261, 3232, 3231,14261, 3252, 3253, 3250, 3246, 3246, ++ 3264, 3224, 3210, 3234, 2907, 3269, 3265, 3275, 3268, 8881, ++ 8857,14283, 3232, 3231,14283, 3252, 3253, 3250, 3246, 3246, + 3268, 3250, 3265, 3269, 3272, 3258, 3268, 3257, 3310, 3266, + 3272, 3297, 3305, 3288, 3294, 3297, 3300, 3301, 3307, 3309, +- 3311, 3321, 3307, 3319, 3318, 3329, 3320, 3321,14261, 3359, ++ 3311, 3321, 3307, 3319, 3318, 3329, 3320, 3321,14283, 3359, + 3316, 3328, 3376, 3323, 3331, 3336, 3354, 3365, 3369, 3361, +- 3357, 3370, 8622, 3375, 3377, 3363, 3366, 3371,14261, 3368, +- 3372, 3369, 3413, 3386, 3389,14261, 3391, 3381, 3381, 3388, +- 3410, 3419, 3401, 3403, 3414, 3416, 3428, 3414, 3420,14261, ++ 3357, 3370, 8865, 3375, 3377, 3363, 3366, 3371,14283, 3368, ++ 3372, 3369, 3413, 3386, 3389,14283, 3391, 3381, 3381, 3388, ++ 3410, 3419, 3401, 3403, 3414, 3416, 3428, 3414, 3420,14283, + 3422, 3423, 3440, 3428, 3439, 3438, 3438, 3445, 3436, 3439, + +- 3451, 3431, 8594, 8617, 8575, 8602, 8543, 3505, 3499, 1508, +- 8563, 8534, 3517, 3500, 3479, 3485, 1344, 3526, 3538, 3539, +- 3592, 3571, 3604, 3541, 3613, 8501, 8433, 3469, 8431, 3499, +- 8486, 3513, 3510,14261, 3512,14261, 3526, 3556, 3573, 3580, +- 3567, 8443, 3588, 3660, 3580, 3576, 3588, 3587, 3593,14261, +- 14261, 8426, 3590,14261, 3600, 3606, 8436, 0, 3599, 3587, ++ 3451, 3431, 8836, 8860, 8778, 8788, 8753, 3505, 3499, 1508, ++ 8725, 8688, 3517, 3500, 3479, 3485, 1344, 3526, 3538, 3539, ++ 3592, 3571, 3604, 3541, 3613, 8706, 8656, 3469, 8610, 3499, ++ 8666, 3513, 3510,14283, 3512,14283, 3526, 3556, 3573, 3580, ++ 3567, 8638, 3588, 3660, 3580, 3576, 3588, 3587, 3593,14283, ++ 14283, 8550, 3590,14283, 3600, 3606, 8565, 0, 3599, 3587, + 3607, 3609, 3612, 3599, 3609, 3669, 3633, 3624, 3642, 3656, +- 3654, 3668, 3672, 3672, 3662, 3673, 3672, 3675,14261, 3676, +- 3669, 3674, 3669, 3673, 8418, 3678, 3674, 3683, 3685, 8385, +- 18, 8345, 3561, 3567, 3577, 3585, 3654, 3720, 3719, 3747, ++ 3654, 3668, 3672, 3672, 3662, 3673, 3672, 3675,14283, 3676, ++ 3669, 3674, 3669, 3673, 8512, 3678, 3674, 3683, 3685, 8453, ++ 18, 8431, 3561, 3567, 3577, 3585, 3654, 3720, 3719, 3747, + +- 3748, 3753, 3754, 3759, 3666, 8286, 8299, 8259, 3687, 3714, +- 3718, 8285, 8233, 8244, 8145, 8148, 8155, 3717, 3727, 3732, +- 14261, 3733, 3720,14261, 3726, 3732, 3721, 3734, 3736, 3730, ++ 3748, 3753, 3754, 3759, 3666, 8319, 8259, 8173, 3687, 3714, ++ 3718, 8200, 8158, 8147, 8094, 8062, 8031, 3717, 3727, 3732, ++ 14283, 3733, 3720,14283, 3726, 3732, 3721, 3734, 3736, 3730, + 3734, 3731, 3734, 3738, 3749, 3730, 3751, 3752, 3743, 3744, + 3739, 3750, 3743, 3757, 3777, 3784, 3776, 3771, 3777, 3789, +- 3776, 3774, 3777, 3793, 3795, 3797, 3786, 3801, 3798,14261, +- 3789, 3800, 3805, 3792, 3783, 3794,14261, 3835, 3806, 2941, +- 3792, 3809, 3811, 8166, 3817, 3830, 3831, 3828, 8052, 3823, +- 3830, 3848, 3833, 8047, 3839, 8046, 3855, 3841, 3843, 3850, +- 3855, 3857, 3857, 8038, 3848,14261, 3855, 3845, 3849, 3860, ++ 3776, 3774, 3777, 3793, 3795, 3797, 3786, 3801, 3798,14283, ++ 3789, 3800, 3805, 3792, 3783, 3794,14283, 3835, 3806, 2941, ++ 3792, 3809, 3811, 7988, 3817, 3830, 3831, 3828, 7987, 3823, ++ 3830, 3848, 3833, 7986, 3839, 7834, 3855, 3841, 3843, 3850, ++ 3855, 3857, 3857, 7822, 3848,14283, 3855, 3845, 3849, 3860, + +- 3850, 3862, 3866, 3879, 3885, 3898, 3900, 3891, 3903,14261, ++ 3850, 3862, 3866, 3879, 3885, 3898, 3900, 3891, 3903,14283, + 3886, 3903, 3907, 3884, 3896, 3891, 3897, 3909, 3913, 3927, +- 2307, 1689, 8052, 3928, 3971, 1903, 8033, 3964, 2395, 3989, +- 1749, 2447, 4015, 3931, 3914, 3955,14261, 3906, 3942, 3946, +- 3939, 3948, 3956, 3973, 3967, 0, 4033, 3957,14261, 3969, +- 3988, 3974, 4005, 3991, 4031, 4008, 4016, 4009, 8026, 4005, +- 7994, 7851, 7846, 7839, 7838, 4005, 4072, 4006, 7778, 7774, ++ 2307, 1689, 7858, 3928, 3971, 1903, 7803, 3964, 2395, 3989, ++ 1749, 2447, 4015, 3931, 3914, 3955,14283, 3906, 3942, 3946, ++ 3939, 3948, 3956, 3973, 3967, 0, 4033, 3957,14283, 3969, ++ 3988, 3974, 4005, 3991, 4031, 4008, 4016, 4009, 7787, 4005, ++ 7769, 7762, 7749, 7745, 7703, 4005, 4072, 4006, 7602, 7599, + 4018, 4010, 4024, 4014, 4026, 4030, 4041, 4045, 4030, 4052, +- 14261, 4072, 4055, 4057, 4079,14261, 4076, 4070, 4065, 4079, +- 4071, 4066, 966, 7741, 2483, 0, 3948, 3952, 4060, 3997, ++ 14283, 4072, 4055, 4057, 4079,14283, 4076, 4070, 4065, 4079, ++ 4071, 4066, 966, 7528, 2483, 0, 3948, 3952, 4060, 3997, + +- 4061, 3276, 4084, 4075, 7722, 7709, 4085, 4076, 4066, 4080, ++ 4061, 3276, 4084, 4075, 7431, 7418, 4085, 4076, 4066, 4080, + 4077, 4074, 4080, 4083, 4077, 4094, 4085, 4097, 4089, 4121, + 4100, 4097, 4125, 4124, 4114, 4134, 4122, 4123, 4136, 4136, + 4140, 4125, 4140, 4133, 4128, 4145, 4136, 4176, 4140, 4151, + 4137, 4159, 4152, 4161, 4167, 4186, 4175, 4169, 4183, 4178, +- 4186, 4181, 4185, 4188, 4188, 4203, 4196, 4193, 4190,14261, +- 7684, 7676, 7507, 4206, 4193, 4208, 4208, 4196, 4237, 7415, +- 7396, 4213, 4232, 4240, 4261, 4231, 4222, 4234, 4229, 4237, ++ 4186, 4181, 4185, 4188, 4188, 4203, 4196, 4193, 4190,14283, ++ 7341, 7128, 7122, 4206, 4193, 4208, 4208, 4196, 4237, 7115, ++ 7106, 4213, 4232, 4240, 4261, 4231, 4222, 4234, 4229, 4237, + 4238, 4252, 4256, 4259, 4252, 4258, 4259, 4259, 4244, 4254, + 4275, 4252, 4273, 4265, 4276, 4273, 4289, 4295, 4302, 4302, + +- 4297, 4287, 4305,14261, 4290, 4299, 4302, 4292, 4325, 4361, +- 4371, 4291, 4309, 4314, 4316,14261, 4317, 4325, 4309, 4345, +- 4335, 4342, 4389, 2971, 7361, 4390, 4362, 7378, 7372, 4343, +- 4349, 4361, 4374, 4413, 4369, 4382,14261, 4373, 4374,14261, +- 4390,14261,14261,14261,14261, 7368, 4374, 4395, 4440, 7351, ++ 4297, 4287, 4305,14283, 4290, 4299, 4302, 4292, 4325, 4361, ++ 4371, 4291, 4309, 4314, 4316,14283, 4317, 4325, 4309, 4345, ++ 4335, 4342, 4389, 2971, 7086, 4390, 4362, 7114, 7110, 4343, ++ 4349, 4361, 4374, 4413, 4369, 4382,14283, 4373, 4374,14283, ++ 4390,14283,14283,14283,14283, 7085, 4374, 4395, 4440, 7064, + 4397, 4408, 4416, 4419, 4422, 4423, 4424, 4425, 4434, 4440, + 4432, 4420, 4441, 4445, 4425, 4445, 4442, 4452, 4453, 4454, +- 4443, 7114, 4350, 7145, 0, 4404, 4454, 4477, 7058, 2002, +- 4446, 4447, 4490,14261, 4462, 4454, 4466, 4476, 4487, 4462, ++ 4443, 7013, 4350, 7050, 0, 4404, 4454, 4477, 6983, 2002, ++ 4446, 4447, 4490,14283, 4462, 4454, 4466, 4476, 4487, 4462, + 4470, 4490, 4480, 4481, 4491, 4480, 4486, 4496, 4493, 4491, + + 4492, 4493, 4491, 4492, 4502, 4498, 4508, 4509, 4514, 4504, + 4514, 4501, 4524, 4531, 4518, 4524, 4532, 4534, 4544, 4545, + 4548, 4536, 4536, 4537, 4537, 4544, 4540, 4537, 4556, 4557, +- 4546, 4543, 4565, 4583, 4563, 4549, 4566,14261, 4559, 4560, +- 4549, 4576, 4572, 4575, 4594, 4580, 4583, 4585, 7068, 4591, +- 4589, 4604, 4594, 4595, 4593, 4608, 4651, 4627, 7064, 4611, +- 4615, 4602,14261, 4614, 4610,14261, 4620, 4609,14261,14261, +- 14261, 4603, 4624, 4644, 4644,14261, 4632, 4649, 4641, 4644, ++ 4546, 4543, 4565, 4583, 4563, 4549, 4566,14283, 4559, 4560, ++ 4549, 4576, 4572, 4575, 4594, 4580, 4583, 4585, 6732, 4591, ++ 4589, 4604, 4594, 4595, 4593, 4608, 4651, 4627, 6708, 4611, ++ 4615, 4602,14283, 4614, 4610,14283, 4620, 4609,14283,14283, ++ 14283, 4603, 4624, 4644, 4644,14283, 4632, 4649, 4641, 4644, + 4643, 4657, 4647, 4647, 4648, 4665, 4667, 4665, 4663, 4671, + 4660, 4678, 4701, 4687, 4667, 4679, 4684, 4690, 4708, 4726, + +- 7090, 4714, 4699,14261, 4698, 4714, 4715, 4717, 4716, 4709, +- 7053, 4780, 7020, 4742, 7040, 4707, 0,14261, 7007, 4725, +- 4715, 4782, 4716, 4731, 4735, 4735, 4763, 7005, 4745, 4782, +- 14261, 7003, 4743, 4823, 4789, 4791, 4778, 4783, 4780, 4786, +- 4787, 4783, 4800,14261, 4804, 4797, 4830, 4834, 4831, 4834, +- 4833, 4833, 4840, 4827, 4828, 4823, 4827, 4860, 6660, 6636, +- 6432, 4826, 4834, 0, 4815, 4832, 4837,14261, 4838, 4839, ++ 6716, 4714, 4699,14283, 4698, 4714, 4715, 4717, 4716, 4709, ++ 6682, 4780, 6678, 4742, 6711, 4707, 0,14283, 6668, 4725, ++ 4715, 4782, 4716, 4731, 4735, 4735, 4763, 6490, 4745, 4782, ++ 14283, 6475, 4743, 4823, 4789, 4791, 4778, 4783, 4780, 4786, ++ 4787, 4783, 4800,14283, 4804, 4797, 4830, 4834, 4831, 4834, ++ 4833, 4833, 4840, 4827, 4828, 4823, 4827, 4860, 6311, 6300, ++ 6295, 4826, 4834, 0, 4815, 4832, 4837,14283, 4838, 4839, + 4840, 4841, 4856, 4841, 4857, 4868, 4881, 4877, 4871, 4886, + 4875, 4879, 4875, 4891, 4886, 4887, 4898, 4893, 4876, 4882, + 4886, 4894, 4901, 4937, 4887, 4893, 4893, 4896, 4909, 4909, + + 4900, 4918, 4919, 4934, 4931, 4923, 4942, 4939, 4977, 4945, +- 4946, 4949, 4947, 4952, 4949,14261, 4947, 4943, 4976,14261, +- 4962, 4962, 4964, 4959, 4966, 4967, 4976, 4979, 4982, 6306, +- 4989,14261, 4985, 4992, 4979, 4984, 4998, 4988, 4989, 5008, +- 4995, 5002, 5007, 5004, 5009, 4997, 4998,14261, 5044, 5013, +- 5007, 5007,14261, 5013, 5020,14261,14261,14261,14261, 5025, +- 6293, 5013, 5013, 5037, 5031,14261, 5046, 5042, 5043, 5053, +- 5047, 5054,14261,14261, 5058, 5077,14261, 5063, 5057, 5058, ++ 4946, 4949, 4947, 4952, 4949,14283, 4947, 4943, 4976,14283, ++ 4962, 4962, 4964, 4959, 4966, 4967, 4976, 4979, 4982, 6199, ++ 4989,14283, 4985, 4992, 4979, 4984, 4998, 4988, 4989, 5008, ++ 4995, 5002, 5007, 5004, 5009, 4997, 4998,14283, 5044, 5013, ++ 5007, 5007,14283, 5013, 5020,14283,14283,14283,14283, 5025, ++ 6091, 5013, 5013, 5037, 5031,14283, 5046, 5042, 5043, 5053, ++ 5047, 5054,14283,14283, 5058, 5077,14283, 5063, 5057, 5058, + 5061, 5057, 5067, 5075, 5106, 5088, 5070, 5071, 5111, 5084, +- 5084, 5091, 5101, 5096, 5104, 5177, 6317, 5139, 5140, 6218, ++ 5084, 5091, 5101, 5096, 5104, 5177, 6132, 5139, 5140, 6108, + +- 6110, 5146, 5121, 5125,14261, 5128, 5136, 5124, 5133, 5127, +- 5134,14261, 5142, 5140, 5160, 5159, 5223, 6095, 5165, 5158, +- 14261, 5155, 5171, 5174, 5176, 5177, 5173, 5178, 5174, 5175, ++ 6059, 5146, 5121, 5125,14283, 5128, 5136, 5124, 5133, 5127, ++ 5134,14283, 5142, 5140, 5160, 5159, 5223, 5994, 5165, 5158, ++ 14283, 5155, 5171, 5174, 5176, 5177, 5173, 5178, 5174, 5175, + 5173, 5193, 5201, 5215, 5210, 5225, 5233, 5230, 5218, 5231, +- 5221, 5237, 5238, 5229, 2600, 5933, 5276, 5920, 5304,14261, +- 5230, 5788, 5225, 5241, 5237, 5255, 5273, 5281, 5274, 5275, +- 5272, 5278, 5284, 5269, 5282, 5277, 5772, 5213, 5286, 5293, +- 5293, 5275, 5276, 5284, 5290,14261, 5292, 5300, 5297, 5288, ++ 5221, 5237, 5238, 5229, 2600, 5963, 5276, 5961, 5304,14283, ++ 5230, 5977, 5225, 5241, 5237, 5255, 5273, 5281, 5274, 5275, ++ 5272, 5278, 5284, 5269, 5282, 5277, 5787, 5213, 5286, 5293, ++ 5293, 5275, 5276, 5284, 5290,14283, 5292, 5300, 5297, 5288, + 5361, 5303, 5286, 5307, 5308, 5309, 5334, 5334, 5327, 5334, + 5343, 5341, 5338, 5334, 5335, 5329, 5379, 5331, 5340, 5346, + +- 5348, 5353, 5355, 5342, 5347, 5361, 5376,14261, 5350, 5356, ++ 5348, 5353, 5355, 5342, 5347, 5361, 5376,14283, 5350, 5356, + 5347, 5350, 5378, 5379, 5365, 5369, 5375, 5378, 5386, 5425, +- 5401, 5390, 5390, 5393, 5394, 5397, 5399, 5405, 5402, 5418, +- 5410, 5423, 5439, 5433, 5431, 5437, 5445, 5443, 5445, 5459, +- 5451, 5450, 5453, 5468, 5456, 5472,14261, 5721, 5473, 5473, +- 5468, 5475, 5742,14261, 5655,14261, 5473, 5472, 5484, 5475, +- 5466, 5473, 5493, 5492, 5482,14261,14261, 5478, 5494, 1035, +- 1169, 5492, 5490, 5163, 5532, 5534, 5515, 5520, 5512, 5512, +- 5524, 5512, 5527, 5524, 5538, 5526, 5214,14261, 5551, 5559, +- 5560,14261,14261, 5536, 5525, 5524, 5530, 5538, 5544, 5536, +- +- 5540, 5549, 5543, 5547, 5606, 5669, 5564, 5567, 5583, 5599, +- 5576, 5578, 5604, 0, 5603, 5605, 5591, 5614, 5605, 5618, +- 5619, 5605,14261, 5621, 5622, 5623, 5636, 5640, 5628, 5636, +- 5655, 5659, 5655, 5650, 5670,14261, 5655, 5671, 5673, 5674, +- 5671, 5562, 5556, 5709, 1883, 5658, 5714, 5717, 5680,14261, +- 5684, 5669, 5678, 5691, 5773, 5688, 5687, 5694, 5690, 5697, +- 5693, 5709, 5701, 5700, 5700, 5428, 5741, 5720, 5723, 5710, +- 5711, 5717, 5717, 5717, 5721, 5710, 5730, 5434, 0, 5748, +- 5746, 5751, 5765, 5754, 5751, 5750, 5749, 5756, 5753, 0, +- 5767, 5768, 5774, 5760, 0, 5810, 5767, 5787, 5772, 5794, +- +- 5804, 5838, 5798, 5809, 5802,14261, 5821, 5809, 5571, 5583, +- 5811, 5810, 5806, 5822, 5827, 5810, 5826, 5816, 5814, 5832, +- 5826, 5831, 5825, 5835, 5835, 5844, 5842, 5832, 5828, 5842, +- 14261,14261,14261,14261, 5850, 5863, 5863, 5845, 5860, 5873, +- 5875, 5875, 5873, 5862, 5554, 5879, 5870, 5884, 5871, 5886, +- 14261,14261,14261,14261, 5883, 5871,14261, 5873, 5575,14261, +- 14261, 5887, 5882,14261, 5883, 5880, 5897, 5883, 5895, 5892, +- 5899,14261, 1446, 1625,14261, 2350,14261, 5904, 5909, 5916, +- 5391, 5389, 5942, 5374, 5944,14261, 5908, 5927, 5928, 5919, +- 5935, 5929, 5924, 5922, 5930, 250, 5976, 5400, 5278, 5164, +- +- 5959, 5160, 5961, 5935, 5940, 5947, 5939, 5942, 5938, 5945, +- 5949,14261, 5973, 5956, 5962, 6001, 5967, 5963, 5984, 5995, +- 5985, 5985, 6000, 6005, 6002, 6010, 6009, 5997, 6010, 5998, +- 6001, 0, 6005, 6006, 6014,14261, 6019,14261,14261, 5999, +- 14261, 6009, 6010, 6016, 5181, 6016, 6019, 6021, 6014, 6022, +- 6025, 6030,14261,14261, 6034,14261, 6053, 5112, 6094, 5005, +- 6099, 6032, 6063,14261, 6063, 6056, 6104, 6105, 6069, 6073, +- 6085, 6082, 6069, 6065, 6072, 6122, 6081, 6080, 6095, 6081, +- 6083, 6094, 6092, 6102, 0, 6136, 6162, 6107, 6100, 6119, +- 6120, 6121, 6116, 6133, 6138,14261, 6171, 6129, 4814, 6133, +- +- 6142, 6145, 6136, 6149, 6146, 6147, 6152, 6138, 6155, 0, +- 6147, 6153, 6148, 6162, 4808, 6153, 6151, 6196, 6164, 6158, +- 6224, 6175, 6174, 6175, 6168, 6182,14261,14261, 6189, 6184, +- 4756, 6182, 4738, 6216, 6191,14261, 6186, 6198, 6191, 6200, +- 6212, 6195, 4726, 6199, 6206, 6207, 6203, 6210, 6223,14261, +- 6207, 6222, 6215, 4611, 6221, 6217, 6227,14261, 6219, 6221, +- 6219, 6217, 6223, 6246, 6234, 6236, 6243, 6245, 6262,14261, +- 14261, 6261, 6267, 6264,14261, 6264, 6268, 6269, 4392, 2671, +- 14261, 6274, 6271, 4385, 4371, 4190, 6295, 4171, 6297, 6298, +- 6261, 6274, 6269, 6265, 6272, 6274, 6268,14261, 6267, 4036, +- +- 6351, 6311, 6313, 6355, 6367, 6371, 3982, 3980, 3899, 6324, +- 3943, 6335, 6337, 6293, 3936, 6310, 6317, 6334, 6325, 6328, +- 14261, 6347, 6353, 6345,14261, 6356, 6354, 6363, 6362, 6350, +- 6365, 6352, 6356, 6358, 6357, 6358, 6362, 6366, 6369, 6376, +- 6373, 6386, 6388, 6388, 6396, 6399, 6405, 6409, 3814, 6409, +- 3707, 6409, 6397, 6412, 6406, 6409, 6418, 6409, 6409, 3607, +- 6455,14261, 3600, 6460,14261, 6414, 6420, 6428, 6435, 0, +- 0, 6333, 6423, 6431, 6428, 6430, 6441, 6440, 6440, 6451, +- 6486, 6440, 6453,14261, 6465, 6447, 6465, 6471, 6457, 3643, +- 0, 0, 6453, 6468, 6467, 6477, 6478, 6479,14261, 6473, +- +- 6521, 6478,14261, 6490, 6485, 6484, 6506,14261, 6491, 6499, +- 6511, 6543, 6515, 6520, 6508, 6519, 6509,14261, 6510, 6520, +- 6556, 6517, 6528, 0, 6570, 1544, 6524, 3586, 6524, 6541, +- 6544, 6536, 6536, 6547, 6551, 6556,14261, 6551, 6565, 6553, +- 6562, 6568, 6565, 6568, 6572, 6563, 6558, 6573, 6570, 6571, +- 6580, 3535, 3523, 6563, 6584, 6574, 6585, 6590, 6574, 6595, +- 6599, 6603,14261, 6606, 6607, 6600, 6595, 6599, 6606,14261, +- 6613, 6611, 6606,14261, 6612, 6612, 6623, 6617, 6617, 6628, +- 6652, 6653,14261, 6622, 6636, 6633, 6637, 6637, 6641,14261, +- 3546, 6663, 6696, 6700, 3468, 6685, 6694, 6701, 6661, 6719, +- +- 6731, 6754, 652, 6760, 6766, 3506, 6665, 6707, 6680, 6677, +- 6686,14261, 6711, 6714, 6703, 6710, 6710, 6720, 6728, 6736, +- 6740, 6742, 6751, 6747, 6742, 6754, 6757, 6759, 6749,14261, +- 6766, 6761, 6766, 6767, 6753, 6771, 6770, 6756, 6758, 6777, +- 6771, 6782, 6772,14261, 6777, 6800, 6790, 6805, 6802, 6809, +- 14261, 6814, 6803,14261, 3497, 0, 6804, 6813, 6806, 6800, +- 6816, 6804, 6818, 6810, 0, 0, 6817, 6820, 6808, 6828, +- 6827, 6811, 6831,14261, 3416, 6829, 6820, 6831, 6683, 6735, +- 14261, 6827, 6818, 0, 6739, 6847, 6848, 6890, 6865, 6842, +- 6868, 6866, 6847, 6901, 6878, 6881, 6863, 6879, 6860, 6882, +- +- 6886, 6879, 0, 0, 6881, 6876, 6883, 1551, 3362, 3034, +- 6888, 6879, 6711, 6882, 3348, 6919, 6899, 6903, 6902, 6905, +- 6924, 6914, 6924, 3240, 3233, 6916, 6926, 6921, 6925, 6926, +- 6950, 6935, 6936, 6920, 6936, 6929, 6924, 6932, 6941, 6928, +- 6936, 6933,14261, 6939, 6934, 6946, 6946, 6962, 6953, 6961, +- 6960, 6967, 6968, 6982, 6983, 6983, 6973, 6976, 6987, 6977, +- 7012, 6990, 6978, 6978, 6973, 3220, 7000, 7056, 7017, 749, +- 7060, 7068, 7079, 7091, 3231, 3179, 7047, 7070, 7076, 7078, +- 1915, 7109, 942, 7127, 7138, 7139, 7147, 6735, 7158, 7170, +- 7045, 3206, 3205, 7003,14261, 7017, 7014, 7038, 7045, 7061, +- +- 7072, 7082, 7082, 3113, 7122, 7122,14261, 7129,14261, 7129, +- 14261, 7134, 7130, 7143,14261, 7144, 7135, 7148, 7148, 7150, +- 7152, 7143, 7155, 7148, 7154, 7157,14261,14261,14261, 7168, +- 7157, 7171,14261, 7166, 7169, 7182, 7168, 7166, 7189,14261, +- 7175, 3117, 7181, 7181, 7195, 7182, 7184, 7038, 7187,14261, +- 7194, 7193, 7198, 7242, 7252,14261,14261, 7195, 7210, 0, +- 7219, 7222, 7212, 7212, 7227, 7222, 7237, 7225, 7270, 7242, +- 0, 7286, 7223, 7226, 7225, 7285, 7243, 7231, 7264, 7257, +- 3100, 7257, 7269, 7263, 3002, 3311, 3029, 7262, 7272,14261, +- 7084, 7263,14261, 7271, 7272, 7262, 7270, 7276, 7286, 7291, +- +- 7281, 7293, 7298, 7288, 7284, 7296, 7292, 7293,14261, 7293, +- 7291, 7309, 7300, 7305, 7310, 7321, 7315, 7344, 7327, 7350, +- 7326,14261, 7321, 7324, 7330,14261, 7329, 2968, 7344, 7350, +- 7341,14261, 7341, 7355, 7358, 7346, 7359, 2991, 7343, 7344, +- 7364,14261, 7342, 7367, 1445, 7422, 2883, 7399, 7400, 7375, +- 7428, 7434, 7440, 7459, 2890, 7419, 7438, 2039, 7463, 7447, +- 7475, 7494,14261, 2872, 7412, 7415, 7423, 2765, 7450, 2682, +- 7449, 2660, 7454, 7449, 7463, 7454,14261, 7463, 7448, 7454, +- 7471, 7462, 7455, 7457, 7463,14261, 7464, 7466, 7487, 7469, +- 14261, 7493, 7475, 7493, 7484, 7484, 7535, 7508, 7507, 7502, +- +- 14261, 7513, 7518, 7508, 7519, 7517, 7566, 7535, 7556,14261, +- 7535, 0, 7558, 0, 7593, 7526, 7525, 2612, 7540, 7547, +- 7538, 7538, 7553, 7563, 7568, 7565, 7566, 7573, 7616, 7582, +- 7568, 7588, 2576, 7581, 7585, 7575, 7608, 7581, 7587, 7593, +- 7595,14261, 7592, 7611, 7614, 4759, 7602, 7599,14261, 7618, +- 7610, 7624,14261, 7617, 7628,14261, 7616, 7629, 7630, 7632, +- 7625, 7630, 2425, 7636, 7636, 7635, 7631, 2424, 7637, 7628, +- 7641, 7631,14261, 7644,14261, 7638,14261,14261, 7640,14261, +- 2387, 7685, 7644,14261, 7645,14261, 7655, 7671, 7677, 7671, +- 7667, 7684, 7674,14261, 7671, 7689, 7689, 7675, 7685, 7677, +- +- 7725, 7726, 2880, 7755, 7759, 7763, 7729, 7788, 7789, 2931, +- 7819, 7820, 7673, 7696, 7731, 7743, 7733, 2418, 7742, 7738, +- 7748,14261, 7735, 7741, 7775, 7777, 7775, 7780,14261,14261, +- 7790, 7795, 7780, 7780, 7610, 7798, 7802,14261, 7848, 7793, +- 7805, 7810, 7798, 7794, 7813, 7812, 7814, 7869, 7820, 7881, +- 7848, 2414, 7839, 7873, 0, 7843, 7862, 7864, 7866, 7872, +- 7875, 7882, 7873, 7874, 7883, 7909, 7724, 7882, 7883,14261, +- 7877, 7888, 7889, 0, 7771, 7877, 7893, 7906, 7858, 7891, +- 7951, 7906, 7918, 7923, 7903, 7432, 7910, 7913, 7913, 7908, +- 2315, 7914, 7930, 7932, 7927, 7935, 2192,14261, 2188, 7927, +- +- 7938, 7939, 7930,14261, 2176, 7926, 7946, 7947, 7965,14261, +- 7936,14261, 7936, 7949, 7949, 7954, 7962, 7964, 7972, 7979, +- 2198, 7969, 7983, 7972, 7984, 7988, 7983, 8021, 8020, 8050, +- 8015, 8051, 8069, 7981, 8009, 8019, 8018, 8028, 2208,14261, +- 8009,14261, 8036,14261, 8034, 8028, 8029, 8037, 8048,14261, +- 8040, 8097, 8032, 8051, 8096, 8107, 8037, 8091, 8099, 8099, +- 8100, 8111, 8116, 8112, 8112, 8145, 8113,14261, 8111, 8171, +- 8125, 0, 8130, 8125, 8132, 8146, 8131, 8157, 8165, 8162, +- 8169,14261, 8088, 8089, 8104, 8161, 8156, 8205, 8165, 8163, +- 8177, 8212, 8213, 8233,14261, 8166,14261, 8184,14261, 8182, +- +- 14261, 7542, 2155, 8179, 8187, 8178, 7845, 8197, 8192, 8223, +- 8194, 8201, 8198, 8228, 8215, 8231, 8229, 8225, 8229, 8240, +- 8221, 8246, 8241, 8241,14261, 8236, 8242, 8244, 8239, 8245, +- 8271, 8252, 8253, 8259, 2165, 8256, 8264, 8317, 8267, 8279, +- 8284, 2063, 8262,14261, 8290,14261,14261,14261, 8294,14261, +- 8278, 8339, 8365, 8326, 8362, 8291, 8308, 8309, 8299, 8302, +- 8313, 8312,14261, 8331, 8338,14261, 8400, 8349, 8371, 8356, +- 8361, 8373, 8409, 8378, 8366, 8366, 8367, 0, 8331, 8332, +- 8444, 8396, 8397, 8445, 8395, 8385, 8396, 2064, 8333, 8459, +- 8450, 8382,14261,14261,14261, 8413, 8400, 8414, 8439,14261, +- +- 8439, 8449, 8457, 8462, 8444, 8461, 2002, 8449, 1997,14261, +- 8450,14261, 8464, 8465, 8457, 8456, 8460,14261, 1966, 8467, +- 8461, 3532, 8469, 8463, 8505, 8467, 8498, 8513, 0, 1807, +- 8499, 8502, 8517, 8519, 1759, 8519, 8507, 8506, 8543, 8565, +- 8591,14261, 8521, 8524, 8528, 8507, 8539, 8528, 8555, 8508, +- 8549, 8546, 8548,14261, 8555, 8558, 8619, 8572, 8558, 8559, +- 8625, 8554, 1709, 8645, 0, 1652, 8646, 0, 8574, 8579, +- 5041, 8616, 8619, 8613, 8666, 8676, 8685,14261, 8615, 8675, +- 8670,14261, 8680, 1579, 8682, 8686, 8670, 8674, 8677, 8678, +- 8677, 8691, 8676, 8676, 8677, 8690, 8693, 8694,14261, 1374, +- +- 8693, 3983,14261, 4005, 8694, 8729, 8719, 8723, 8724, 0, +- 0, 8742,14261, 8727, 8741,14261,14261, 8775, 8786, 8713, +- 8755, 8554, 8743, 8814, 8555, 0, 8739, 8656, 8744, 8746, +- 8756, 8741, 8747, 8823, 8748, 8785,14261, 8849, 8795, 8783, +- 1313, 1065, 8791, 8838, 7557, 1008, 7972, 8781, 8799, 8817, +- 8873, 8817, 8824, 8844,14261, 8847, 8844, 8850, 8835, 8836, +- 8848, 8850, 8853, 8857, 8858, 8214, 8425, 8854,14261, 8857, +- 14261, 989, 4343,14261, 4654, 8877, 914, 8869, 0, 8864, +- 14261, 8872, 8920, 8935, 0, 0, 0,14261, 8871, 8662, +- 8874, 8933, 8663, 0, 0, 8776, 0, 8898, 8889, 8896, +- +- 8901, 8906, 8906, 8923, 8955, 8913, 8929,14261,14261, 8931, +- 8933, 8919, 8939, 879, 8105, 876, 8944, 8934, 8936, 8936, +- 8937, 8939, 8935, 8950, 8962,14261, 8960, 8967, 8952,14261, +- 8951, 8955,14261,14261, 8966, 8836,14261, 4752,14261, 8957, +- 14261, 8962, 8969,14261, 830, 8958, 0, 9036, 0, 9003, +- 0, 743, 8969, 8981, 8979, 8985, 8984, 8989, 8996, 9001, +- 9040, 8670, 8671, 9007, 9012, 9043, 9008, 9016,14261, 9021, +- 9022,14261, 9025, 9022, 9015, 9020, 9020, 9017, 9025, 670, +- 14261,14261, 9031, 9023, 9039, 9043,14261, 9026, 602, 0, +- 9054, 447, 9069,14261, 9029, 9034,14261, 9037, 9043, 9044, +- +- 9051, 9050, 8786, 9063, 9107, 9120, 8816, 9126, 9060, 9060, +- 9079, 9066, 9084,14261, 436, 9083, 9079, 9090, 9096, 9091, +- 9104, 461, 367, 9099, 9135,14261, 330, 9131, 366, 9100, +- 9098, 9105, 9102,14261, 9096, 9106, 0, 9149, 9110, 9154, +- 0, 9164, 0, 9174, 9180,14261, 9111,14261, 9119, 9133, +- 9139,14261, 9132, 9140, 9155, 9140, 9158, 9155, 0, 315, +- 9192, 9153, 9146, 9196, 9142, 9161, 9202,14261, 9167, 262, +- 254, 9206, 0, 9219, 0,14261, 9184, 9182, 9177, 9181, +- 9190, 9181, 9194, 9190, 9184, 9187, 9193, 0, 0, 143, +- 9240, 0, 9194, 9249, 9244, 9189, 9260, 9246,14261,14261, +- +- 138, 109, 9245, 9253, 9247,14261,14261, 9235,14261, 9256, +- 9247, 9251, 9252, 0, 43,14261, 9276, 9305, 9306, 9314, +- 9266,14261,14261, 9280, 9289, 9310,14261, 6, 9301, 9311, +- 14261,14261, 9333, 9359,14261,14261,14261, 9308,14261,14261, +- 9304, 9368, 9305, 9335, 9332, 9325,14261, 9337, 9365, 9367, +- 14261,14261, 9429, 9447, 9465, 9483, 9501, 9519, 9537, 9555, +- 9573, 9591, 9609, 9627, 9645, 9663, 9681, 9699, 9717, 9735, +- 9753, 9771, 9789, 9807, 9825, 9843, 9861, 9879, 9897, 9915, +- 9933, 9951, 9969, 9987,10005,10023,10041,10059,10077,10095, +- 10113,10131,10149,10167,10185,10203,10221,10239,10257,10275, +- +- 10293,10311,10329,10347,10365,10383,10401,10419,10437,10455, +- 10473,10490,10508,10526,10544,10562,10580,10597,10615,10633, +- 10651,10669,10687,10705,10723,10741,10759,10777,10795,10813, +- 10831,10849,10867,10885,10903,10921,10939,10957,10975,10993, +- 11011,11028,11046,11064,11082,11100,11118,11136,11154,11171, +- 11189,11207,11225,11243,11261,11279,11297,11315,11333,11351, +- 11369,11387,11405,11423,11441,11459,11477,11495,11512,11530, +- 11548,11566,11584,11602,11620,11637,11655,11673,11691,11709, +- 11727,11745,11763,11781,11799,11817,11835,11853,11871,11889, +- 11907,11925,11943,11960,11978,11996,12014,12032,12050,12068, +- +- 12086,12104,12122,12140,12151,12165,12183,12191,12207,12224, +- 12228,12244,12262,12272,12288,12306,12324,12342,12359,12375, +- 12393,12411,12429,12447,12465,12482,12498,12516,12525,12541, +- 12559,12577,12595,12612,12620,12635,12651,12668,12686,12704, +- 12722,12740,12758,12776,12794,12812,12830,12848,12858,12866, +- 12881,12896,12907,12915,12923,12939,12955,12971,12988,13006, +- 13024,13042,13060,13078,13096,13114,13132,13150,13168,13186, +- 13204,13222,13240,13258,13271,13279,13287,13295,13306,13322, +- 13338,13346,13354,13370,13388,13406,13424,13442,13460,13478, +- 13496,13514,13532,13550,13568,13584,13600,13618,13636,13646, +- +- 13662,13678,13691,13709,13726,13743,13760,13771,13787,13804, +- 13821,13833,13849,13867,13884,13902,13919,13937,13954,13970, +- 13987,13997,14013,14030,14048,14065,14083,14101,14118,14135, +- 14153,14165,14181,14198,14215,14226,14242 ++ 5401, 5390, 5390, 5394, 5395, 5399, 5402, 5406, 5403, 5421, ++ 5420, 5428, 5446, 5437, 5432, 5439, 5449, 5445, 5449, 5465, ++ 5453, 5453, 5458, 5472, 5458, 5476,14283, 5734, 5478, 5476, ++ 5470, 5478, 5785,14283, 5753,14283, 5477, 5475, 5486, 5478, ++ 5469, 5475, 5495, 5494, 5482,14283,14283, 5485, 5498, 1035, ++ 1169, 5493, 5496, 5163, 5528, 5538, 5521, 5524, 5518, 5518, ++ 5529, 5518, 5532, 5527, 5540, 5529, 5214,14283, 5545, 5555, ++ 5563,14283,14283, 5539, 5528, 5527, 5533, 5541, 5546, 5537, ++ ++ 5541, 5549, 5538, 5566, 5625, 5602, 5547, 5555, 5598, 5591, ++ 5591, 5592, 5607, 0, 5607, 5609, 5600, 5619, 5608, 5622, ++ 5636, 5622,14283, 5638, 5639, 5640, 5641, 5643, 5631, 5637, ++ 5647, 5651, 5646, 5642, 5661,14283, 5645, 5661, 5663, 5674, ++ 5671, 5684, 5579, 5709, 1883, 5712, 5725, 5728, 5678,14283, ++ 5686, 5678, 5685, 5696, 5784, 5692, 5691, 5695, 5692, 5699, ++ 5695, 5710, 5702, 5699, 5700, 5428, 5749, 5717, 5721, 5709, ++ 5710, 5717, 5716, 5720, 5733, 5724, 5731, 5434, 0, 5756, ++ 5753, 5751, 5765, 5754, 5751, 5750, 5749, 5757, 5758, 0, ++ 5773, 5774, 5780, 5763, 0, 5441, 5768, 5784, 5768, 5775, ++ ++ 5786, 5845, 5791, 5802, 5808,14283, 5821, 5809, 5602, 5838, ++ 5811, 5811, 5807, 5824, 5833, 5818, 5834, 5824, 5822, 5840, ++ 5833, 5838, 5830, 5839, 5838, 5847, 5852, 5854, 5842, 5838, ++ 5853,14283,14283,14283,14283, 5846, 5860, 5859, 5852, 5867, ++ 5874, 5876, 5877, 5875, 5865, 5574, 5886, 5879, 5893, 5880, ++ 5895,14283,14283,14283,14283, 5892, 5880,14283, 5881, 5613, ++ 14283,14283, 5895, 5888,14283, 5889, 5884, 5905, 5893, 5906, ++ 5903, 5910,14283, 1446, 1625,14283, 2350,14283, 5903, 5907, ++ 5914, 5543, 5537, 5745, 5536, 5948,14283, 5914, 5927, 5928, ++ 5919, 5936, 5930, 5926, 5928, 5937, 250, 5983, 5402, 5372, ++ ++ 5278, 5968, 5164, 5969, 5943, 5948, 5951, 5942, 5945, 5951, ++ 5957, 5947,14283, 5970, 5955, 5962, 6023, 5967, 5965, 5988, ++ 5984, 5980, 5988, 6007, 6004, 6014, 6022, 6021, 6009, 6022, ++ 6009, 6014, 0, 6018, 6019, 6027,14283, 6034,14283,14283, ++ 6014,14283, 6024, 6025, 6028, 5191, 6028, 6031, 6033, 6026, ++ 6034, 6036, 6034,14283,14283, 6029,14283, 6050, 5150, 6107, ++ 5112, 6111, 6034, 6063,14283, 6083, 6051, 6014, 6119, 6076, ++ 6081, 6088, 6092, 6078, 6074, 6081, 6129, 6088, 6084, 6100, ++ 6087, 6089, 6099, 6098, 6107, 0, 6169, 6170, 6110, 6100, ++ 6119, 6125, 6128, 6136, 6147, 6150,14283, 6183, 6141, 5055, ++ ++ 6147, 6156, 6158, 6148, 6159, 6156, 6157, 6162, 6148, 6164, ++ 0, 6156, 6162, 6157, 6171, 4814, 6162, 6159, 6206, 6171, ++ 6161, 6211, 6184, 6202, 6202, 6195, 6204,14283,14283, 6205, ++ 6197, 4757, 6194, 4756, 6227, 6201,14283, 6195, 6205, 6198, ++ 6207, 6219, 6199, 4738, 6203, 6210, 6206, 6213, 6210, 6216, ++ 6229,14283, 6213, 6227, 6219, 4726, 6232, 6228, 6248,14283, ++ 6247, 6248, 6246, 6240, 6246, 6263, 6248, 6251, 6254, 6255, ++ 6270,14283,14283, 6269, 6275, 6272,14283, 6270, 6274, 6275, ++ 4642, 2671,14283, 6281, 6278, 4392, 4400, 4326, 6302, 4235, ++ 6303, 6304, 6267, 6279, 6273, 6276, 6283, 6295, 6290,14283, ++ ++ 6288, 4168, 6361, 6336, 6329, 6367, 6373, 6382, 4036, 3985, ++ 3935, 6338, 3944, 6341, 6342, 6305, 3943, 6315, 6337, 6345, ++ 6341, 6351,14283, 6363, 6368, 6359,14283, 6370, 6367, 6375, ++ 6373, 6364, 6377, 6364, 6367, 6368, 6367, 6369, 6373, 6377, ++ 6378, 6386, 6382, 6393, 6403, 6399, 6411, 6413, 6421, 6425, ++ 3922, 6425, 3814, 6423, 6410, 6425, 6418, 6420, 6429, 6420, ++ 6422, 3676, 6466,14283, 3607, 6474,14283, 6428, 6426, 6434, ++ 6443, 0, 0, 6491, 6433, 6440, 6435, 6446, 6455, 6454, ++ 6456, 6468, 6510, 6455, 6468,14283, 6477, 6463, 6479, 6485, ++ 6473, 3650, 0, 0, 6468, 6482, 6483, 6494, 6496, 6492, ++ ++ 14283, 6491, 6538, 6490,14283, 6506, 6501, 6496, 6519,14283, ++ 6505, 6515, 6527, 6558, 6530, 6533, 6522, 6534, 6524,14283, ++ 6525, 6535, 6570, 6542, 6538, 0, 6586, 1544, 6534, 3592, ++ 6533, 6555, 6561, 6551, 6551, 6561, 6566, 6571,14283, 6563, ++ 6578, 6567, 6578, 6584, 6581, 6583, 6588, 6578, 6572, 6587, ++ 6574, 6586, 6587, 6596, 3586, 3535, 6581, 6601, 6594, 6603, ++ 6609, 6593, 6612, 6618, 6625,14283, 6622, 6624, 6616, 6611, ++ 6615, 6620,14283, 6628, 6628, 6623,14283, 6629, 6629, 6640, ++ 6634, 6633, 6643, 6668, 6669,14283, 6638, 6652, 6651, 6654, ++ 6657, 6659,14283, 3566, 6692, 6722, 6726, 3504, 6690, 6701, ++ ++ 6703, 6679, 6738, 6752, 6758, 652, 6770, 6789, 3510, 6685, ++ 6705, 6709, 6698, 6703,14283, 6721, 6726, 6720, 6734, 6738, ++ 6738, 6741, 6745, 6753, 6755, 6763, 6759, 6755, 6768, 6771, ++ 6773, 6763,14283, 6779, 6774, 6782, 6784, 6772, 6790, 6789, ++ 6775, 6779, 6800, 6795, 6805, 6798,14283, 6794, 6809, 6799, ++ 6814, 6815, 6821,14283, 6825, 6815,14283, 3514, 0, 6816, ++ 6826, 6820, 6814, 6831, 6819, 6833, 6824, 0, 0, 6834, ++ 6837, 6825, 6847, 6846, 6830, 6850,14283, 3497, 6850, 6843, ++ 6855, 6707, 6766,14283, 6850, 6844, 0, 6909, 6864, 6857, ++ 6899, 6892, 6850, 6879, 6877, 6860, 6915, 6886, 6893, 6875, ++ ++ 6894, 6875, 6903, 6908, 6902, 0, 0, 6903, 6899, 6906, ++ 1551, 3366, 3034, 6911, 6899, 6123, 6900, 3361, 6334, 6915, ++ 6919, 6905, 6908, 6930, 6923, 6934, 3348, 3240, 6927, 6940, ++ 6937, 6941, 6942, 6969, 3233, 6954, 6955, 6940, 6956, 6949, ++ 6944, 6952, 6963, 6951, 6958, 6953,14283, 6959, 6952, 6962, ++ 6962, 6978, 6963, 6968, 6966, 6975, 6979, 6993, 6994, 6994, ++ 6987, 6992, 7003, 6993, 7031, 7009, 6998, 6998, 6993, 3220, ++ 7017, 7077, 7039, 749, 7078, 7096, 7097, 7108, 3231, 3179, ++ 7057, 7088, 7093, 7104, 1915, 7134, 942, 7155, 7164, 7170, ++ 7176, 7042, 7185, 7196, 7061, 3206, 3205, 7031,14283, 7057, ++ ++ 7043, 7075, 7077, 7089, 7093, 7094, 7092, 3113, 7141, 7146, ++ 14283, 7156,14283, 7159,14283, 7160, 7152, 7169,14283, 7171, ++ 7162, 7176, 7172, 7177, 7177, 7168, 7180, 7170, 7180, 7184, ++ 14283,14283,14283, 7194, 7182, 7192,14283, 7191, 7196, 7209, ++ 7192, 7193, 7218,14283, 7202, 3117, 7208, 7208, 7220, 7210, ++ 7211, 7056, 7214,14283, 7221, 7221, 7222, 7076, 7269,14283, ++ 14283, 7222, 7233, 0, 7244, 7248, 7238, 7235, 7246, 7241, ++ 7264, 7243, 7127, 7258, 0, 7297, 7242, 7248, 7254, 7142, ++ 7272, 7261, 7283, 7276, 3100, 7276, 7287, 7280, 3002, 3311, ++ 3029, 7282, 7288,14283, 7043, 7279,14283, 7286, 7287, 7277, ++ ++ 7289, 7295, 7305, 7310, 7300, 7320, 7312, 7306, 7305, 7318, ++ 7317, 7318,14283, 7325, 7319, 7317, 7339, 7325, 7325, 7330, ++ 7342, 7334, 7365, 7348, 7369, 7342,14283, 7337, 7339, 7349, ++ 14283, 7348, 2968, 7363, 7373, 7363,14283, 7363, 7376, 7379, ++ 7368, 7381, 2991, 7367, 7368, 7388,14283, 7365, 7390, 1445, ++ 7448, 2883, 7427, 7136, 7400, 7459, 7463, 7471, 7489, 2890, ++ 7440, 7460, 2039, 7507, 7413, 7519, 7525,14283, 2872, 7398, ++ 7393, 7416, 2765, 7421, 2682, 7432, 2660, 7445, 7441, 7456, ++ 7463,14283, 7473, 7457, 7474, 7491, 7484, 7480, 7488, 7492, ++ 14283, 7493, 7495, 7514, 7497,14283, 7518, 7500, 7518, 7510, ++ ++ 7506, 7438, 7527, 7522, 7517,14283, 7527, 7532, 7523, 7531, ++ 7528, 7587, 7537, 7488,14283, 7540, 0, 7497, 0, 7596, ++ 7549, 7549, 2612, 7561, 7571, 7562, 7570, 7573, 7581, 7585, ++ 7580, 7581, 7588, 7632, 7588, 7586, 7605, 2576, 7599, 7602, ++ 7592, 7501, 7597, 7603, 7625, 7626,14283, 7623, 7630, 7636, ++ 4759, 7622, 7617,14283, 7635, 7625, 7639,14283, 7632, 7643, ++ 14283, 7631, 7644, 7645, 7647, 7640, 7645, 2425, 7651, 7651, ++ 7650, 7656, 7650, 2424, 7656, 7647, 7659, 7649,14283, 7661, ++ 14283, 7672,14283,14283, 7673,14283, 2387, 7701, 7679,14283, ++ 7685,14283, 7678, 7693, 7698, 7688, 7684, 7701, 7691,14283, ++ ++ 7688, 7706, 7706, 7692, 7702, 7694, 7769, 7760, 2880, 7780, ++ 7781, 7789, 7766, 7800, 7801, 2931, 7820, 7838, 7692, 7716, ++ 7762, 7780, 7770, 2418, 7782, 7778, 7791,14283, 7781, 7787, ++ 7799, 7802, 7802, 7805,14283,14283, 7818, 7821, 7806, 7806, ++ 7621, 7825, 7829,14283, 7741, 7821, 7831, 7837, 7825, 7821, ++ 7834, 7832, 7830, 7885, 7835, 7895, 7890, 2414, 7879, 7884, ++ 0, 7883, 7891, 7892, 7884, 7890, 7891, 7898, 7890, 7891, ++ 7900, 7917, 7748, 7908, 7909,14283, 7902, 7913, 7914, 0, ++ 7752, 7901, 7920, 7931, 7876, 7916, 7885, 7918, 7929, 7934, ++ 7914, 7416, 7921, 7924, 7930, 7925, 2315, 7931, 7946, 7948, ++ ++ 7941, 7949, 2192,14283, 2188, 7955, 7942, 7953, 7954, 7945, ++ 14283, 2176, 7941, 7970, 7971, 7978,14283, 7959,14283, 7959, ++ 7972, 7971, 7982, 7988, 7990, 7985, 7991, 2198, 7981, 7994, ++ 7990, 8002, 8006, 8001, 8055, 8029, 8066, 8027, 8067, 8078, ++ 7997, 8028, 8026, 8034, 8044, 2208,14283, 8033,14283, 8060, ++ 14283, 8057, 8050, 8053, 8060, 8064,14283, 8055, 8127, 8038, ++ 8067, 8124, 8135, 8053, 8072, 8058, 8058, 8059, 8068, 8074, ++ 8070, 8070, 8162, 8072,14283, 8129, 8188, 8143, 0, 8161, ++ 8145, 8152, 8162, 8147, 8156, 8164, 8161, 8166,14283, 8116, ++ 8214, 8216, 8158, 8153, 8230, 8171, 8184, 8198, 8234, 8235, ++ ++ 8244,14283, 8194,14283, 8212,14283, 8210,14283, 8116, 2155, ++ 8208, 8216, 8207, 8225, 8215, 8210, 8239, 8207, 8225, 8216, ++ 8225, 8240, 8233, 8254, 8252, 8248, 8249, 8258, 8239, 8264, ++ 8259, 8259,14283, 8254, 8260, 8262, 8259, 8265, 8292, 8273, ++ 8275, 8278, 2165, 8275, 8280, 8339, 8294, 8296, 8302, 2063, ++ 8279,14283, 8303,14283,14283,14283, 8306,14283, 8294, 8360, ++ 8386, 8236, 8383, 8296, 8308, 8309, 8299, 8318, 8328, 8326, ++ 14283, 8323, 8329,14283, 8406, 8341, 8401, 8386, 8391, 8402, ++ 8436, 8405, 8393, 8393, 8394, 0, 8348, 8396, 8443, 8414, ++ 8415, 8447, 8416, 8407, 8416, 2064, 8350, 8480, 8467, 8401, ++ ++ 14283,14283,14283, 8461, 8430, 8448, 8450,14283, 8459, 8468, ++ 8476, 8481, 8462, 8480, 8481, 2002, 8469, 1997,14283, 8470, ++ 14283, 8484, 8485, 8477, 8476, 8480,14283, 1966, 8488, 8483, ++ 3532, 8491, 8485, 8527, 8497, 8505, 8534, 0, 1807, 8520, ++ 8522, 8537, 8539, 1759, 8539, 8527, 8354, 8565, 8585, 8611, ++ 14283, 8543, 8546, 8550, 8358, 8561, 8564, 8576, 8387, 8571, ++ 8567, 8569,14283, 8572, 8579, 8639, 8593, 8578, 8579, 8647, ++ 8574, 1709, 8471, 0, 1652, 8528, 0, 8584, 8585, 5041, ++ 8618, 8634, 8628, 8666, 8694, 8703,14283, 8621, 8635, 8630, ++ 14283, 8640, 1579, 8642, 8646, 8632, 8636, 8639, 8635, 8641, ++ ++ 8662, 8699, 8684, 8684, 8685, 8699, 8702, 8703,14283, 1374, ++ 8702, 3983,14283, 4005, 8703, 8713, 8690, 8694, 8706, 0, ++ 0, 8724,14283, 8709, 8723,14283,14283, 8772, 8771, 8780, ++ 8749, 8455, 8737, 8808, 8456, 0, 8738, 8574, 8741, 8763, ++ 8773, 8759, 8765, 8799, 8786, 8795,14283, 8847, 8814, 8802, ++ 1313, 1065, 8811, 8812, 7572, 1008, 7574, 8803, 8821, 8821, ++ 8872, 8812, 8820, 8825,14283, 8826, 8841, 8852, 8850, 8851, ++ 8863, 8854, 8865, 8857, 8861, 8862, 8449, 8892, 8860,14283, ++ 8862,14283, 989, 4343,14283, 4654, 8881, 914, 8864, 0, ++ 8860,14283, 8868, 8943, 8947, 0, 0, 0,14283, 8868, ++ ++ 8839, 8876, 8944, 8917, 0, 0, 8954, 0, 8892, 8908, ++ 8915, 8930, 8935, 8935, 8936, 8957, 8936, 8952,14283,14283, ++ 8955, 8956, 8942, 8961, 879, 8986, 876, 8955, 8945, 8947, ++ 8947, 8948, 8950, 8950, 8962, 8972,14283, 8969, 8976, 8909, ++ 8961,14283, 8960, 8964,14283,14283, 8975, 8988,14283, 4752, ++ 14283, 8973,14283, 8983, 8992,14283, 830, 8979, 0, 9043, ++ 0, 9037, 0, 743, 8997, 9008, 9007, 9013, 9011, 9009, ++ 9012, 9018, 9058, 8529, 8770, 9024, 9025, 9057, 9020, 9028, ++ 14283, 9033, 9034,14283, 9038, 9035, 9025, 9032, 9032,14283, ++ 9029, 9040, 670,14283,14283, 9048, 9040, 9057, 9061,14283, ++ ++ 9049, 602, 0, 9079, 447, 9095,14283, 9054, 9064,14283, ++ 9067, 9072, 9069, 9078, 9073, 9119, 9089, 9123, 9127, 9138, ++ 9142, 9079, 9082, 9099, 9093, 9113,14283, 436, 9112, 9111, ++ 9115, 9122, 9114, 9127, 461, 367, 9122, 9158,14283, 330, ++ 9155, 366, 9125, 9121, 9127, 9124,14283, 9118, 9125, 0, ++ 9169, 9130, 9173, 0, 9196, 0, 9197, 9203,14283, 9135, ++ 14283, 9137, 9153, 9153,14283, 9145, 9147, 9175, 9160, 9181, ++ 9174, 0, 315, 9219, 9166, 9170, 9225, 9170, 9183, 9227, ++ 14283, 9196, 262, 254, 9231, 0, 9242, 0,14283, 9204, ++ 9205, 9195, 9201, 9209, 9203, 9215, 9212, 9206, 9209, 9215, ++ ++ 0, 0, 143, 9259, 0, 9216, 9270, 9260, 9220, 9282, ++ 9240,14283,14283, 138, 109, 9267, 9275, 9269,14283,14283, ++ 9257,14283, 9278, 9269, 9273, 9274, 0, 43,14283, 9298, ++ 9327, 9276, 9336, 9288,14283,14283, 9302, 9311, 9332,14283, ++ 6, 9323, 9333,14283,14283, 9355, 9381,14283,14283,14283, ++ 9330,14283,14283, 9326, 9390, 9327, 9357, 9354, 9347,14283, ++ 9359, 9387, 9389,14283,14283, 9451, 9469, 9487, 9505, 9523, ++ 9541, 9559, 9577, 9595, 9613, 9631, 9649, 9667, 9685, 9703, ++ 9721, 9739, 9757, 9775, 9793, 9811, 9829, 9847, 9865, 9883, ++ 9901, 9919, 9937, 9955, 9973, 9991,10009,10027,10045,10063, ++ ++ 10081,10099,10117,10135,10153,10171,10189,10207,10225,10243, ++ 10261,10279,10297,10315,10333,10351,10369,10387,10405,10423, ++ 10441,10459,10477,10495,10512,10530,10548,10566,10584,10602, ++ 10619,10637,10655,10673,10691,10709,10727,10745,10763,10781, ++ 10799,10817,10835,10853,10871,10889,10907,10925,10943,10961, ++ 10979,10997,11015,11033,11050,11068,11086,11104,11122,11140, ++ 11158,11176,11193,11211,11229,11247,11265,11283,11301,11319, ++ 11337,11355,11373,11391,11409,11427,11445,11463,11481,11499, ++ 11517,11534,11552,11570,11588,11606,11624,11642,11659,11677, ++ 11695,11713,11731,11749,11767,11785,11803,11821,11839,11857, ++ ++ 11875,11893,11911,11929,11947,11965,11982,12000,12018,12036, ++ 12054,12072,12090,12108,12126,12144,12162,12173,12187,12205, ++ 12213,12229,12246,12250,12266,12284,12294,12310,12328,12346, ++ 12364,12381,12397,12415,12433,12451,12469,12487,12504,12520, ++ 12538,12547,12563,12581,12599,12617,12634,12642,12657,12673, ++ 12690,12708,12726,12744,12762,12780,12798,12816,12834,12852, ++ 12870,12880,12888,12903,12918,12929,12937,12945,12961,12977, ++ 12993,13010,13028,13046,13064,13082,13100,13118,13136,13154, ++ 13172,13190,13208,13226,13244,13262,13280,13293,13301,13309, ++ 13317,13328,13344,13360,13368,13376,13392,13410,13428,13446, ++ ++ 13464,13482,13500,13518,13536,13554,13572,13590,13606,13622, ++ 13640,13658,13668,13684,13700,13713,13731,13748,13765,13782, ++ 13793,13809,13826,13843,13855,13871,13889,13906,13924,13941, ++ 13959,13976,13992,14009,14019,14035,14052,14070,14087,14105, ++ 14123,14140,14157,14175,14187,14203,14220,14237,14248,14264 + } ; + +-static const flex_int16_t yy_def[4238] = ++static const flex_int16_t yy_def[4251] = + { 0, +- 3953, 3953, 3952, 3, 3954, 3954, 3, 3, 3955, 3955, +- 3955, 3955, 3956, 3956, 3957, 3957, 3958, 3958, 3959, 3959, +- 3960, 3960, 3954, 3954, 3954, 3954, 3961, 3961, 3962, 3962, +- 3962, 3962, 3963, 3963, 3964, 3964, 3952, 37, 37, 37, +- 3954, 3954, 3954, 3954, 3954, 3954, 3965, 3965, 3966, 3966, +- 3967, 3967, 3968, 3968, 3969, 3969, 3970, 3970, 3971, 3971, +- 3954, 3954, 3972, 3972, 3973, 3973, 3971, 3971, 3954, 3954, +- 3974, 3974, 3975, 3975, 3952, 3952, 3952, 3952, 3952, 3952, +- 3976, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 131, 3952, 3952, 3952, 3977, 3977, 3977, 3952, +- 3952, 3977, 3978, 3978, 3978, 3952, 3979, 3978, 3980, 3980, +- 3980, 3952, 3981, 3952, 3980, 3982, 3982, 3952, 3982, 3952, +- 3952, 3983, 3952, 3952, 3952, 3983, 3984, 3983, 3985, 3985, +- 3985, 3952, 3986, 3985, 3952, 3987, 3952, 3985, 3988, 3988, +- 3988, 3952, 3989, 3988, 3990, 3990, 3990, 3952, 3952, 3990, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3991, 3991, 3952, 3952, +- 3991, 3992, 3992, 3952, 3993, 3992, 3952, 3994, 3995, 3996, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3997, 3952, 3998, 3997, 3952, 3952, 3952, 3999, 3952, 4000, +- 3952, 3999, 3952, 3952, 3952, 4001, 4001, 4001, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4002, 3952, 4002, 4002, 4002, +- 3952, 3952, 4002, 4002, 4002, 4003, 3952, 4004, 4003, 4003, +- 4003, 3952, 4003, 4003, 4003, 4005, 3952, 4006, 4005, 4005, +- 4005, 3952, 4005, 4005, 4005, 4007, 4007, 3952, 4007, 3952, +- 4007, 4008, 3952, 4008, 3952, 4009, 4010, 4011, 4010, 4008, +- 4012, 3952, 4013, 4012, 4012, 4012, 4012, 3952, 4012, 3952, +- +- 4014, 4015, 4016, 4015, 4017, 4015, 3952, 3952, 4012, 4012, +- 4018, 3952, 4019, 4018, 4018, 4018, 3952, 4018, 4018, 4018, +- 4020, 3952, 4020, 4020, 3952, 4020, 3952, 3952, 4020, 4020, +- 4020, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 4021, 3952, 4021, 3952, 3952, 4021, +- 4022, 3952, 4023, 4022, 3952, 4022, 4024, 4025, 4026, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4027, 3952, 4028, +- 4027, 3952, 4027, 3952, 4029, 3952, 4030, 4029, 3952, 4029, +- 4031, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4032, +- 3952, 3952, 4032, 4032, 4033, 4034, 3952, 3952, 4034, 4034, +- 4035, 4036, 3952, 3952, 4036, 4036, 3952, 3952, 4037, 4038, +- 4037, 4039, 4040, 4041, 4041, 4041, 4040, 4042, 4043, 3952, +- 3952, 4044, 4045, 4044, 4046, 4044, 4047, 4048, 4048, 4048, +- 4049, 4049, 4049, 4050, 4048, 4043, 4043, 4051, 4052, 3952, +- 3952, 4052, 4052, 3952, 4053, 3952, 3952, 4053, 3952, 4053, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4054, 3952, 3952, 4055, 4056, 3952, +- 3952, 3952, 3952, 3952, 3952, 4057, 4058, 3952, 3952, 4059, +- 4060, 3952, 3952, 4061, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4062, 3952, 4062, +- 4063, 3952, 4063, 4064, 3952, 4064, 3952, 4065, 4066, 4066, +- 4066, 4067, 4065, 4067, 4067, 3952, 4068, 3952, 3952, 4068, +- 3952, 4043, 3952, 4069, 4069, 4069, 4070, 4071, 4070, 4070, +- 4072, 4073, 4069, 4074, 4071, 4072, 4071, 4071, 4043, 4075, +- +- 4043, 3952, 4075, 3952, 4075, 4075, 4076, 4043, 4077, 3952, +- 4077, 4078, 3952, 4078, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4079, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4080, 3952, 4081, +- +- 3952, 3952, 3952, 3952, 3952, 4082, 3952, 4083, 3952, 4084, +- 4084, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 4085, 3952, 4086, 3952, 4087, 4088, 4089, +- 4090, 3952, 4069, 4091, 4091, 4091, 4072, 4069, 4071, 4072, +- 4071, 4092, 4071, 4093, 4094, 4095, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4096, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4079, 4097, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4098, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 4099, 3952, 3952, 3952, +- 3952, 4100, 3952, 4101, 3952, 4102, 4102, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4088, +- 4089, 4088, 4089, 4091, 4071, 4091, 4072, 4091, 4072, 4103, +- 4072, 4072, 4071, 4093, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4096, 4104, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4105, 3952, 3952, 3952, 4097, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4098, 3952, 4098, 4106, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 4102, 4102, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4091, 4072, +- 4092, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4104, 4107, 4096, 4104, 3952, 3952, 3952, 3952, +- 3952, 3952, 4108, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4098, 3952, 4106, 3952, 3952, 3952, 4102, 4109, +- 3952, 3952, 4110, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4072, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4096, 4104, 3952, 4107, 4096, 3952, 4111, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4098, 3952, 4102, 4112, +- 4113, 3952, 3952, 4114, 4110, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4115, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4104, 3952, 4107, 4107, 3952, +- +- 4111, 4116, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4117, 4112, 4112, 4113, 4113, 3952, +- 3952, 4114, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4118, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4119, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4115, 4120, 4115, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4121, 3952, 4116, 4122, +- 4116, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4123, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4124, 4125, 4112, 3952, 4112, 4113, 4113, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4126, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4118, 4127, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4128, +- 3952, 3952, 3952, 3952, 4129, 4119, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4115, 4120, 3952, 4120, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4121, 4130, 4131, 3952, 4116, +- +- 4122, 3952, 4122, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4123, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4124, 4132, 4125, +- 4133, 3952, 3952, 3952, 3952, 3952, 4134, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4135, 4126, 4136, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4127, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4128, +- 3952, 3952, 3952, 3952, 4129, 3952, 3952, 3952, 3952, 3952, +- 4137, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4120, 3952, 4115, 4120, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4138, +- +- 4130, 4139, 4121, 4140, 4141, 4130, 4142, 3952, 3952, 4143, +- 3952, 4144, 4143, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4145, +- 4146, 3952, 4147, 4148, 3952, 3952, 3952, 3952, 3952, 4149, +- 4150, 4151, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4152, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4153, +- 4154, 4155, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 4156, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4157, 3952, 3952, 4158, 4158, 4159, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4160, 4161, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4162, 4163, 4164, 4165, 3952, 4166, 4167, 4163, 4168, 4169, +- +- 4170, 4171, 4162, 4164, 4171, 4172, 4173, 4174, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4175, 4176, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4177, 4178, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4179, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4180, 4180, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4181, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 4182, 4183, 3952, 3952, 3952, 4184, 3952, 4184, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4185, 3952, 3952, 3952, 3952, 3952, 3952, 4164, 4186, 4162, +- 4187, 4164, 4164, 4188, 3952, 3952, 4186, 4186, 4189, 4189, +- 4190, 4191, 4172, 4191, 4191, 4192, 4192, 4162, 4193, 4193, +- 4194, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4177, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4195, 4196, 3952, 3952, 3952, 3952, 4197, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4198, 4181, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4182, 3952, 3952, 3952, 3952, 4184, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4162, 4164, 3952, 4186, 4162, 4190, +- 4191, 4187, 4193, 4164, 3952, 4189, 4186, 4172, 4191, 4172, +- 4199, 4191, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4195, 4195, 4200, 4196, 3952, 3952, 4197, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4198, 3952, 3952, 3952, 4201, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4184, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 4164, 4186, 4190, 4187, 4187, 4193, 4189, 4191, 4199, 4172, +- 4191, 4199, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4202, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4200, 3952, 3952, 4203, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4201, 4201, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4164, 4186, 4199, +- 4172, 4191, 4199, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4203, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4204, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4205, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4199, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4204, 4204, 4206, +- 4207, 3952, 3952, 3952, 3952, 3952, 3952, 4205, 4205, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4208, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4206, 4206, 4209, 4207, 4207, 4210, 3952, 3952, +- 4211, 3952, 3952, 3952, 4205, 4205, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4208, +- 4212, 3952, 3952, 3952, 3952, 3952, 3952, 4213, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4214, 3952, 4215, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4209, 4210, 3952, 3952, 4211, 3952, 4211, 3952, 3952, 3952, +- 4205, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4212, 3952, +- 3952, 3952, 4213, 4213, 4216, 4217, 4218, 3952, 3952, 4219, +- 3952, 3952, 3952, 4214, 4220, 4215, 4221, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4211, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4217, 3952, 4222, 4219, 4223, 4224, +- 4220, 4221, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4211, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4222, 4223, +- 4224, 3952, 4224, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 4225, 3952, 4226, 4227, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4224, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4225, 4225, 3952, 4226, +- 4228, 4227, 4229, 4230, 4231, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4232, 3952, +- 4233, 4224, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4228, +- 4229, 4230, 4234, 4231, 4235, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4232, 4236, 4233, +- 4233, 4237, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 4234, 4235, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4236, 4237, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 0, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952 ++ 3966, 3966, 3965, 3, 3967, 3967, 3, 3, 3968, 3968, ++ 3968, 3968, 3969, 3969, 3970, 3970, 3971, 3971, 3972, 3972, ++ 3973, 3973, 3967, 3967, 3967, 3967, 3974, 3974, 3975, 3975, ++ 3975, 3975, 3976, 3976, 3977, 3977, 3965, 37, 37, 37, ++ 3967, 3967, 3967, 3967, 3967, 3967, 3978, 3978, 3979, 3979, ++ 3980, 3980, 3981, 3981, 3982, 3982, 3983, 3983, 3984, 3984, ++ 3967, 3967, 3985, 3985, 3986, 3986, 3984, 3984, 3967, 3967, ++ 3987, 3987, 3988, 3988, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3989, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 131, 3965, 3965, 3965, 3990, 3990, 3990, 3965, ++ 3965, 3990, 3991, 3991, 3991, 3965, 3992, 3991, 3993, 3993, ++ 3993, 3965, 3994, 3965, 3993, 3995, 3995, 3965, 3995, 3965, ++ 3965, 3996, 3965, 3965, 3965, 3996, 3997, 3996, 3998, 3998, ++ 3998, 3965, 3999, 3998, 3965, 4000, 3965, 3998, 4001, 4001, ++ 4001, 3965, 4002, 4001, 4003, 4003, 4003, 3965, 3965, 4003, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4004, 4004, 3965, 3965, ++ 4004, 4005, 4005, 3965, 4006, 4005, 3965, 4007, 4008, 4009, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4010, 3965, 4011, 4010, 3965, 3965, 3965, 4012, 3965, 4013, ++ 3965, 4012, 3965, 3965, 3965, 4014, 4014, 4014, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4015, 3965, 4015, 4015, 4015, ++ 3965, 3965, 4015, 4015, 4015, 4016, 3965, 4017, 4016, 4016, ++ 4016, 3965, 4016, 4016, 4016, 4018, 3965, 4019, 4018, 4018, ++ 4018, 3965, 4018, 4018, 4018, 4020, 4020, 3965, 4020, 3965, ++ 4020, 4021, 3965, 4021, 3965, 4022, 4023, 4024, 4023, 4021, ++ 4025, 3965, 4026, 4025, 4025, 4025, 4025, 3965, 4025, 3965, ++ ++ 4027, 4028, 4029, 4028, 4030, 4028, 3965, 3965, 4025, 4025, ++ 4031, 3965, 4032, 4031, 4031, 4031, 3965, 4031, 4031, 4031, ++ 4033, 3965, 4033, 4033, 3965, 4033, 3965, 3965, 4033, 4033, ++ 4033, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 4034, 3965, 4034, 3965, 3965, 4034, ++ 4035, 3965, 4036, 4035, 3965, 4035, 4037, 4038, 4039, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4040, 3965, 4041, ++ 4040, 3965, 4040, 3965, 4042, 3965, 4043, 4042, 3965, 4042, ++ 4044, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4045, ++ 3965, 3965, 4045, 4045, 4046, 4047, 3965, 3965, 4047, 4047, ++ 4048, 4049, 3965, 3965, 4049, 4049, 3965, 3965, 4050, 4051, ++ 4050, 4052, 4053, 4054, 4054, 4054, 4053, 4055, 4056, 3965, ++ 3965, 4057, 4058, 4057, 4059, 4057, 4060, 4061, 4061, 4061, ++ 4062, 4062, 4062, 4063, 4061, 4056, 4056, 4064, 4065, 3965, ++ 3965, 4065, 4065, 3965, 4066, 3965, 3965, 4066, 3965, 4066, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4067, 3965, 3965, 4068, 4069, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4070, 4071, 3965, 3965, 4072, ++ 4073, 3965, 3965, 4074, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4075, 3965, 4075, ++ 4076, 3965, 4076, 4077, 3965, 4077, 3965, 4078, 4079, 4079, ++ 4079, 4080, 4078, 4080, 4080, 3965, 4081, 3965, 3965, 4081, ++ 3965, 4056, 3965, 4082, 4082, 4082, 4083, 4084, 4083, 4083, ++ 4085, 4086, 4082, 4087, 4084, 4085, 4084, 4084, 4056, 4088, ++ ++ 4056, 3965, 4088, 3965, 4088, 4088, 4089, 4056, 4090, 3965, ++ 4090, 4091, 3965, 4091, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4092, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4093, 3965, 4094, ++ ++ 3965, 3965, 3965, 3965, 3965, 4095, 3965, 4096, 3965, 4097, ++ 4097, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 4098, 3965, 4099, 3965, 4100, 4101, 4102, ++ 4103, 3965, 4082, 4104, 4104, 4104, 4085, 4082, 4084, 4085, ++ 4084, 4105, 4084, 4106, 4107, 4108, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4109, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4092, 4110, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4111, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 4112, 3965, 3965, 3965, ++ 3965, 4113, 3965, 4114, 3965, 4115, 4115, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4101, ++ 4102, 4101, 4102, 4104, 4084, 4104, 4085, 4104, 4085, 4116, ++ 4085, 4085, 4084, 4106, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4109, 4117, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4118, 3965, 3965, 3965, 4110, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4111, 3965, 4111, 4119, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 4115, 4115, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4104, 4085, ++ 4105, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4117, 4120, 4109, 4117, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4121, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4111, 3965, 4119, 3965, 3965, 3965, 4115, 4122, ++ 3965, 3965, 4123, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4085, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4109, 4117, 3965, 4120, 4109, 3965, 4124, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4111, 3965, 4115, 4125, ++ 4126, 3965, 3965, 4127, 4123, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4128, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4117, 3965, 4120, 4120, 3965, ++ ++ 4124, 4129, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4130, 4125, 4125, 4126, 4126, 3965, ++ 3965, 4127, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4131, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4132, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4128, 4133, 4128, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4134, 3965, 4129, 4135, ++ 4129, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4136, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4137, 4138, 4125, 3965, 4125, 4126, 4126, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4139, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4131, 4140, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4141, ++ 3965, 3965, 3965, 3965, 4142, 4132, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4128, 4133, 3965, 4133, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4134, 4143, 4144, 3965, ++ ++ 4129, 4135, 3965, 4135, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4136, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4137, 4145, ++ 4138, 4146, 3965, 3965, 3965, 3965, 3965, 4147, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4148, 4139, 4149, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4140, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4141, 3965, 3965, 3965, 3965, 4142, 3965, 3965, 3965, 3965, ++ 3965, 4150, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4133, 3965, ++ 4128, 4133, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 4151, 4143, 4152, 4134, 4153, 4154, 4143, 4155, 3965, ++ 3965, 4156, 3965, 4157, 4156, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4158, 4159, 3965, 4160, 4161, 3965, 3965, 3965, 3965, ++ 3965, 4162, 4163, 4164, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4165, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4166, 4167, 4168, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 4169, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4170, 3965, 3965, 4171, 4171, 4172, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4173, 4174, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4175, 4176, 4177, 4178, 3965, 4179, 4180, ++ ++ 4176, 4181, 4182, 4183, 4184, 4175, 4177, 4184, 4185, 4186, ++ 4187, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4188, 4189, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4190, 4191, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4192, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4193, 4193, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4194, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 4195, 4196, 3965, 3965, 3965, ++ 4197, 3965, 4197, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4198, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4177, 4199, 4175, 4200, 4177, 4177, 4201, 3965, 3965, ++ 4199, 4199, 4202, 4202, 4203, 4204, 4185, 4204, 4204, 4205, ++ 4205, 4175, 4206, 4206, 4207, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4190, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4208, 4209, 3965, ++ 3965, 3965, 3965, 4210, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4211, 4194, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4195, 3965, 3965, 3965, 3965, 4197, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4175, ++ 4177, 3965, 4199, 4175, 4203, 4204, 4200, 4206, 4177, 3965, ++ 4202, 4199, 4185, 4204, 4185, 4212, 4204, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4208, 4208, 4213, 4209, ++ 3965, 3965, 4210, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4211, 3965, 3965, ++ 3965, 4214, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4197, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 4177, 4199, 4203, 4200, ++ 4200, 4206, 4202, 4204, 4212, 4185, 4204, 4212, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4215, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4213, 3965, 3965, ++ 4216, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4214, ++ 4214, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4177, 4199, 4212, 4185, 4204, 4212, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4216, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4217, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4218, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4212, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4217, 4217, 4219, 4220, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4218, 4218, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4221, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4219, 4219, 4222, 4220, 4220, 4223, 3965, 3965, 4224, ++ 3965, 3965, 3965, 4218, 4218, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4221, ++ 4225, 3965, 3965, 3965, 3965, 3965, 3965, 4226, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4227, 3965, 4228, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4222, 4223, 3965, 3965, 4224, 3965, 4224, 3965, 3965, 3965, ++ 4218, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4225, ++ 3965, 3965, 3965, 4226, 4226, 4229, 4230, 4231, 3965, 3965, ++ ++ 4232, 3965, 3965, 3965, 4227, 4233, 4228, 4234, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4224, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4230, 3965, 4235, 4232, ++ 4236, 4237, 4233, 4234, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4224, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 4235, 4236, 4237, 3965, 4237, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4238, 3965, 4239, 4240, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4237, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4238, ++ 4238, 3965, 4239, 4241, 4240, 4242, 4243, 4244, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4245, 3965, 4246, 4237, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4241, 4242, 4243, 4247, 4244, 4248, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 4245, 4249, 4246, 4246, 4250, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4247, 4248, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4249, 4250, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 0, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965 + } ; + +-static const flex_int16_t yy_nxt[14349] = ++static const flex_int16_t yy_nxt[14371] = + { 0, +- 3952, 77, 78, 79, 77, 118, 80, 81, 118, 118, +- 283, 284, 118, 3952, 82, 119, 120, 121, 119, 122, +- 123, 3952, 129, 98, 124, 129, 130, 98, 125, 1394, +- 83, 135, 84, 85, 3939, 269, 136, 86, 87, 88, +- 315, 316, 98, 89, 90, 91, 135, 92, 93, 3932, ++ 3965, 77, 78, 79, 77, 118, 80, 81, 118, 118, ++ 283, 284, 118, 3965, 82, 119, 120, 121, 119, 122, ++ 123, 3965, 129, 98, 124, 129, 130, 98, 125, 1394, ++ 83, 135, 84, 85, 3952, 269, 136, 86, 87, 88, ++ 315, 316, 98, 89, 90, 91, 135, 92, 93, 3945, + 131, 136, 94, 1110, 138, 139, 95, 138, 83, 874, + 84, 85, 140, 269, 141, 86, 87, 88, 256, 270, + 126, 89, 90, 91, 1395, 92, 93, 132, 283, 284, +@@ -1880,10 +1883,10 @@ static const flex_int16_t yy_nxt[14349] = + 256, 129, 130, 271, 82, 157, 158, 270, 157, 127, + + 96, 272, 129, 98, 233, 129, 130, 257, 234, 142, +- 83, 235, 84, 85, 273, 3923, 131, 86, 87, 88, ++ 83, 235, 84, 85, 273, 3936, 131, 86, 87, 88, + 274, 271, 1010, 89, 90, 91, 275, 92, 93, 272, + 133, 280, 94, 526, 318, 527, 95, 318, 83, 1011, +- 84, 85, 273, 132, 3922, 86, 87, 88, 274, 3952, ++ 84, 85, 273, 132, 3935, 86, 87, 88, 274, 3965, + 159, 89, 90, 91, 275, 92, 93, 132, 236, 280, + 94, 96, 97, 98, 96, 97, 96, 96, 96, 96, + 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, +@@ -1896,8 +1899,8 @@ static const flex_int16_t yy_nxt[14349] = + 96, 106, 96, 107, 108, 109, 110, 111, 112, 113, + 96, 114, 115, 96, 96, 96, 96, 117, 119, 120, + 121, 119, 122, 123, 281, 129, 98, 124, 129, 130, +- 3900, 125, 138, 139, 2298, 138, 144, 145, 3899, 144, +- 140, 146, 141, 228, 147, 229, 144, 145, 2500, 144, ++ 3913, 125, 138, 139, 2299, 138, 144, 145, 3912, 144, ++ 140, 146, 141, 228, 147, 229, 144, 145, 2502, 144, + 230, 146, 281, 133, 147, 150, 151, 347, 150, 347, + 152, 150, 151, 153, 150, 526, 152, 527, 154, 153, + +@@ -1905,12 +1908,12 @@ static const flex_int16_t yy_nxt[14349] = + 132, 489, 267, 569, 276, 180, 181, 142, 180, 289, + 182, 148, 277, 183, 569, 163, 164, 231, 163, 282, + 165, 148, 127, 96, 348, 166, 186, 187, 163, 188, +- 155, 167, 276, 3889, 189, 278, 155, 289, 163, 164, ++ 155, 167, 276, 3902, 189, 278, 155, 289, 163, 164, + 277, 163, 163, 165, 231, 290, 268, 347, 166, 347, + 159, 163, 279, 645, 167, 490, 170, 171, 295, 170, +- 184, 172, 3793, 278, 173, 163, 174, 301, 357, 175, +- 168, 358, 176, 290, 170, 171, 3829, 170, 302, 172, +- 279, 190, 173, 177, 174, 3859, 295, 175, 186, 187, ++ 184, 172, 3806, 278, 173, 163, 174, 301, 357, 175, ++ 168, 358, 176, 290, 170, 171, 3842, 170, 302, 172, ++ 279, 190, 173, 177, 174, 3872, 295, 175, 186, 187, + + 176, 188, 646, 168, 348, 301, 189, 474, 475, 163, + 163, 177, 497, 498, 170, 171, 302, 170, 303, 172, +@@ -1920,10 +1923,10 @@ static const flex_int16_t yy_nxt[14349] = + 181, 176, 180, 190, 182, 313, 252, 183, 214, 215, + 216, 217, 177, 191, 314, 214, 215, 216, 217, 178, + 191, 191, 296, 351, 297, 226, 441, 487, 191, 441, +- 487, 226, 488, 313, 254, 438, 439, 440, 438, 3858, +- 178, 502, 314, 3851, 502, 503, 504, 283, 284, 286, ++ 487, 226, 488, 313, 254, 438, 439, 440, 438, 3871, ++ 178, 502, 314, 3864, 502, 503, 504, 283, 284, 286, + +- 296, 352, 297, 3829, 184, 191, 192, 193, 194, 192, ++ 296, 352, 297, 3842, 184, 191, 192, 193, 194, 192, + 191, 195, 191, 191, 191, 191, 191, 191, 191, 196, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 197, 198, 199, 200, 201, +@@ -1934,58 +1937,58 @@ static const flex_int16_t yy_nxt[14349] = + 208, 209, 210, 191, 211, 191, 212, 191, 191, 191, + 191, 191, 218, 219, 220, 221, 359, 222, 218, 219, + +- 220, 221, 369, 222, 218, 219, 220, 221, 3826, 222, ++ 220, 221, 369, 222, 218, 219, 220, 221, 3839, 222, + 218, 219, 220, 221, 233, 222, 291, 252, 234, 242, + 253, 235, 315, 316, 352, 252, 259, 242, 292, 260, + 352, 261, 327, 259, 259, 327, 260, 557, 261, 252, + 557, 259, 590, 318, 291, 590, 318, 223, 259, 422, + 243, 242, 244, 223, 422, 259, 292, 395, 243, 223, +- 244, 245, 246, 247, 248, 223, 2298, 254, 236, 245, ++ 244, 245, 246, 247, 248, 223, 2299, 254, 236, 245, + 246, 247, 248, 242, 263, 264, 262, 263, 243, 619, + 244, 414, 243, 262, 244, 400, 243, 265, 244, 245, + 246, 247, 248, 245, 246, 247, 248, 245, 246, 247, + +- 248, 423, 287, 489, 243, 288, 244, 293, 2888, 400, ++ 248, 423, 287, 489, 243, 288, 244, 293, 2892, 400, + 243, 298, 244, 306, 294, 245, 246, 247, 248, 428, +- 304, 245, 246, 247, 248, 299, 620, 3820, 307, 265, ++ 304, 245, 246, 247, 248, 299, 620, 3833, 307, 265, + 287, 300, 243, 288, 244, 293, 305, 308, 407, 298, +- 408, 306, 294, 245, 246, 247, 248, 400, 304, 3794, ++ 408, 306, 294, 245, 246, 247, 248, 400, 304, 3807, + 310, 584, 309, 299, 311, 312, 307, 490, 357, 300, +- 446, 358, 584, 2298, 305, 308, 319, 320, 321, 319, ++ 446, 358, 584, 2299, 305, 308, 319, 320, 321, 319, + 452, 322, 323, 320, 321, 323, 412, 324, 310, 413, + 309, 398, 311, 312, 325, 321, 321, 325, 446, 326, + 323, 320, 321, 323, 447, 324, 455, 342, 452, 349, + +- 343, 448, 349, 353, 354, 3049, 422, 347, 359, 347, ++ 343, 448, 349, 353, 354, 3054, 422, 347, 359, 347, + 347, 422, 347, 449, 344, 345, 364, 365, 474, 475, + 357, 320, 447, 358, 455, 342, 414, 320, 343, 448, +- 360, 377, 378, 360, 377, 357, 3787, 412, 358, 321, ++ 360, 377, 378, 360, 377, 357, 3800, 412, 358, 321, + 413, 449, 344, 345, 459, 320, 328, 329, 330, 331, + 332, 333, 465, 334, 350, 472, 335, 355, 423, 662, + 336, 367, 337, 338, 368, 339, 340, 341, 285, 367, + 363, 285, 459, 874, 328, 329, 330, 331, 332, 333, +- 465, 334, 3647, 472, 335, 361, 379, 414, 336, 367, ++ 465, 334, 3657, 472, 335, 361, 379, 414, 336, 367, + 337, 338, 368, 339, 340, 341, 370, 367, 663, 370, + + 742, 367, 377, 378, 368, 377, 374, 375, 450, 367, + 367, 369, 875, 368, 377, 380, 381, 377, 367, 383, + 383, 451, 383, 427, 383, 383, 383, 473, 383, 347, +- 383, 347, 383, 645, 637, 3716, 450, 637, 383, 369, +- 392, 386, 3741, 393, 470, 394, 383, 471, 392, 451, +- 441, 371, 383, 441, 743, 473, 2298, 379, 383, 388, ++ 383, 347, 383, 645, 637, 3727, 450, 637, 383, 369, ++ 392, 386, 3753, 393, 470, 394, 383, 471, 392, 451, ++ 441, 371, 383, 441, 743, 473, 2299, 379, 383, 388, + 373, 383, 392, 383, 870, 383, 383, 508, 383, 379, + 383, 388, 646, 453, 384, 471, 348, 1572, 383, 424, + 384, 396, 425, 454, 396, 383, 392, 422, 460, 393, +- 395, 394, 383, 3737, 392, 509, 461, 392, 3060, 514, ++ 395, 394, 383, 3749, 392, 509, 461, 392, 3065, 514, + + 393, 453, 394, 383, 383, 392, 662, 625, 392, 383, + 383, 454, 499, 389, 668, 499, 460, 500, 392, 392, + 390, 393, 1573, 394, 461, 391, 392, 509, 391, 401, +- 392, 520, 872, 403, 426, 404, 397, 749, 405, 2274, +- 392, 2275, 383, 388, 409, 410, 569, 395, 392, 383, ++ 392, 520, 872, 403, 426, 404, 397, 749, 405, 2275, ++ 392, 2276, 383, 388, 409, 410, 569, 395, 392, 383, + 383, 393, 392, 394, 626, 415, 392, 569, 415, 520, +- 412, 669, 521, 413, 3716, 419, 420, 501, 395, 412, +- 392, 3709, 413, 659, 429, 430, 422, 497, 498, 442, ++ 412, 669, 521, 413, 3727, 419, 420, 501, 395, 412, ++ 392, 3720, 413, 659, 429, 430, 422, 497, 498, 442, + 406, 422, 432, 433, 434, 432, 456, 522, 443, 466, + 521, 750, 444, 467, 462, 435, 523, 445, 399, 468, + +@@ -1996,7 +1999,7 @@ static const flex_int16_t yy_nxt[14349] = + 476, 477, 478, 476, 480, 477, 478, 481, 482, 483, + 484, 482, 507, 485, 482, 483, 484, 491, 524, 485, + 492, 493, 494, 492, 512, 495, 525, 513, 529, 531, +- 507, 530, 538, 2276, 529, 2277, 529, 530, 510, 542, ++ 507, 530, 538, 2277, 529, 2278, 529, 530, 510, 542, + 514, 674, 529, 543, 536, 514, 524, 537, 267, 536, + 529, 267, 536, 544, 525, 436, 529, 534, 545, 436, + +@@ -2012,13 +2015,13 @@ static const flex_int16_t yy_nxt[14349] = + 573, 574, 588, 589, 323, 327, 575, 323, 327, 324, + + 576, 579, 754, 582, 577, 325, 578, 583, 325, 585, +- 326, 580, 581, 593, 594, 586, 587, 595, 598, 3708, ++ 326, 580, 581, 593, 594, 586, 587, 595, 598, 3719, + 588, 589, 319, 320, 321, 319, 889, 322, 323, 320, + 321, 323, 604, 324, 325, 321, 321, 325, 599, 326, + 596, 593, 594, 597, 606, 595, 598, 605, 607, 755, + 265, 610, 600, 601, 602, 1329, 603, 611, 612, 614, + 604, 1117, 613, 615, 617, 608, 599, 682, 596, 618, +- 609, 597, 606, 613, 989, 605, 607, 320, 3671, 610, ++ 609, 597, 606, 613, 989, 605, 607, 320, 3682, 610, + 600, 601, 602, 320, 603, 611, 612, 614, 616, 321, + 613, 615, 617, 608, 891, 682, 349, 618, 609, 349, + +@@ -2027,49 +2030,49 @@ static const flex_int16_t yy_nxt[14349] = + 347, 347, 357, 363, 360, 358, 627, 360, 990, 357, + 600, 601, 358, 364, 365, 357, 629, 758, 358, 629, + 625, 357, 630, 683, 358, 367, 357, 632, 368, 358, +- 2480, 350, 2481, 367, 373, 370, 622, 633, 370, 2298, ++ 2482, 350, 2483, 367, 373, 370, 622, 633, 370, 2299, + 367, 620, 355, 368, 441, 348, 348, 441, 367, 374, + 375, 683, 359, 628, 367, 635, 631, 368, 635, 361, + 367, 367, 367, 368, 759, 363, 636, 626, 367, 684, + 367, 359, 584, 368, 412, 369, 359, 413, 367, 377, + +- 378, 3049, 377, 584, 634, 377, 378, 685, 377, 650, ++ 378, 3054, 377, 584, 634, 377, 378, 685, 377, 650, + 371, 377, 380, 381, 377, 377, 638, 684, 377, 383, + 383, 686, 383, 632, 373, 874, 383, 383, 399, 383, + 369, 383, 383, 392, 734, 685, 648, 734, 394, 383, + 369, 392, 383, 640, 414, 383, 383, 383, 687, 686, +- 2809, 419, 420, 383, 379, 640, 651, 2985, 668, 688, ++ 2812, 419, 420, 383, 379, 640, 651, 2989, 668, 688, + 379, 736, 383, 388, 736, 383, 379, 383, 487, 383, + 379, 487, 422, 488, 390, 388, 687, 422, 643, 383, + 388, 384, 383, 649, 382, 383, 383, 688, 383, 383, + 383, 392, 388, 1323, 393, 643, 394, 641, 383, 392, + +- 2810, 429, 430, 383, 383, 669, 383, 2986, 674, 431, ++ 2813, 429, 430, 383, 383, 669, 383, 2990, 674, 431, + 383, 383, 383, 392, 676, 392, 399, 389, 393, 399, +- 394, 399, 689, 392, 423, 396, 642, 640, 396, 2274, +- 392, 2275, 660, 393, 647, 394, 3656, 392, 392, 418, ++ 394, 399, 689, 392, 423, 396, 642, 640, 396, 2275, ++ 392, 2276, 660, 393, 647, 394, 3666, 392, 392, 418, + 390, 395, 670, 399, 409, 410, 383, 388, 392, 806, +- 689, 648, 392, 394, 392, 675, 392, 393, 3952, 394, ++ 689, 648, 392, 394, 392, 675, 392, 393, 3965, 394, + 806, 677, 392, 383, 388, 395, 315, 316, 431, 383, + 383, 406, 285, 676, 391, 285, 392, 391, 391, 392, + 397, 391, 653, 392, 654, 809, 403, 655, 404, 671, + 412, 405, 487, 413, 658, 487, 809, 488, 649, 661, + + 399, 392, 693, 673, 399, 392, 870, 412, 391, 391, +- 413, 391, 391, 392, 392, 3952, 403, 664, 404, 404, ++ 413, 391, 391, 392, 392, 3965, 403, 664, 404, 404, + 677, 405, 405, 415, 658, 658, 415, 427, 412, 656, + 693, 413, 1102, 406, 666, 392, 391, 666, 422, 392, + 418, 667, 393, 422, 394, 392, 672, 392, 393, 672, + 394, 412, 424, 392, 413, 425, 744, 414, 657, 744, + 422, 392, 391, 406, 665, 678, 1117, 392, 679, 680, +- 2525, 422, 697, 422, 872, 698, 422, 699, 416, 620, ++ 2527, 422, 697, 422, 872, 698, 422, 699, 416, 620, + 694, 432, 433, 434, 432, 438, 439, 440, 438, 395, + 431, 695, 391, 391, 435, 395, 690, 700, 691, 701, + + 697, 414, 692, 698, 702, 699, 704, 426, 694, 705, + 707, 706, 708, 710, 713, 703, 714, 716, 715, 695, + 423, 711, 709, 423, 690, 700, 691, 701, 717, 731, +- 692, 712, 702, 888, 704, 3611, 436, 705, 707, 706, ++ 692, 712, 702, 888, 704, 3621, 436, 705, 707, 706, + 708, 710, 713, 703, 714, 716, 715, 732, 737, 711, + 709, 737, 733, 738, 1117, 502, 717, 731, 502, 712, + 718, 719, 740, 720, 662, 740, 721, 741, 722, 762, +@@ -2079,12 +2082,12 @@ static const flex_int16_t yy_nxt[14349] = + + 725, 763, 726, 663, 727, 728, 729, 730, 480, 477, + 478, 480, 480, 477, 478, 481, 482, 483, 484, 482, +- 889, 485, 492, 493, 494, 492, 2887, 495, 482, 483, ++ 889, 485, 492, 493, 494, 492, 2891, 495, 482, 483, + 484, 491, 502, 485, 1124, 502, 436, 492, 493, 494, +- 492, 499, 495, 2507, 499, 751, 500, 506, 751, 510, ++ 492, 499, 495, 2509, 499, 751, 500, 506, 751, 510, + 752, 506, 506, 764, 756, 512, 506, 516, 513, 512, + 760, 765, 513, 436, 834, 529, 529, 436, 530, 766, +- 3599, 486, 768, 529, 529, 834, 529, 496, 775, 530, ++ 3609, 486, 768, 529, 529, 834, 529, 496, 775, 530, + 776, 764, 536, 486, 529, 770, 777, 529, 891, 765, + 536, 533, 496, 772, 557, 540, 501, 557, 529, 507, + +@@ -2093,11 +2096,11 @@ static const flex_int16_t yy_nxt[14349] = + 537, 782, 536, 783, 784, 536, 533, 785, 536, 800, + 778, 537, 771, 536, 801, 803, 536, 804, 779, 536, + 773, 780, 802, 805, 807, 802, 781, 808, 810, 782, +- 536, 783, 784, 2298, 3592, 785, 811, 800, 266, 3590, +- 812, 813, 801, 803, 814, 804, 590, 538, 3575, 590, +- 835, 805, 807, 835, 2525, 808, 810, 815, 540, 786, ++ 536, 783, 784, 2299, 3602, 785, 811, 800, 266, 3600, ++ 812, 813, 801, 803, 814, 804, 590, 538, 3584, 590, ++ 835, 805, 807, 835, 2527, 808, 810, 815, 540, 786, + 816, 787, 788, 817, 811, 789, 790, 791, 812, 813, +- 818, 792, 814, 819, 793, 3060, 794, 795, 796, 797, ++ 818, 792, 814, 819, 793, 3065, 794, 795, 796, 797, + + 824, 798, 799, 825, 820, 815, 826, 786, 816, 787, + 788, 817, 827, 789, 790, 791, 822, 823, 818, 792, +@@ -2108,13 +2111,13 @@ static const flex_int16_t yy_nxt[14349] = + 852, 829, 853, 830, 831, 832, 836, 837, 854, 838, + 839, 840, 855, 856, 841, 842, 857, 843, 844, 351, + 845, 846, 847, 833, 848, 849, 850, 851, 852, 347, +- 853, 347, 870, 3529, 357, 623, 854, 358, 623, 637, ++ 853, 347, 870, 3538, 357, 623, 854, 358, 623, 637, + + 855, 856, 637, 347, 857, 347, 860, 355, 867, 860, +- 629, 867, 3496, 629, 347, 357, 347, 863, 358, 2525, +- 863, 367, 357, 889, 368, 358, 3431, 635, 879, 367, +- 635, 871, 367, 3416, 866, 368, 858, 866, 880, 367, +- 367, 645, 368, 399, 861, 3411, 399, 367, 399, 3410, ++ 629, 867, 3504, 629, 347, 357, 347, 863, 358, 2527, ++ 863, 367, 357, 889, 368, 358, 3439, 635, 879, 367, ++ 635, 871, 367, 3424, 866, 368, 858, 866, 880, 367, ++ 367, 645, 368, 399, 861, 3418, 399, 367, 399, 3417, + 348, 383, 640, 428, 383, 734, 383, 1069, 734, 886, + 872, 348, 890, 902, 640, 359, 412, 868, 1069, 413, + 399, 864, 359, 903, 383, 640, 662, 383, 383, 382, +@@ -2126,21 +2129,21 @@ static const flex_int16_t yy_nxt[14349] = + 392, 921, 922, 924, 874, 925, 887, 888, 916, 873, + 590, 917, 912, 590, 392, 642, 640, 926, 389, 918, + 736, 906, 919, 736, 904, 980, 920, 647, 980, 921, +- 922, 924, 672, 925, 2276, 672, 2277, 412, 642, 640, ++ 922, 924, 672, 925, 2277, 672, 2278, 412, 642, 640, + 413, 983, 882, 875, 983, 926, 911, 878, 388, 911, +- 391, 412, 3404, 391, 413, 392, 383, 388, 653, 391, ++ 391, 412, 3411, 391, 413, 392, 383, 388, 653, 391, + 654, 927, 391, 655, 392, 428, 884, 653, 391, 654, + 928, 391, 655, 392, 929, 884, 892, 392, 654, 744, + + 391, 655, 744, 391, 884, 392, 392, 414, 894, 927, + 895, 1104, 1117, 896, 399, 391, 897, 399, 928, 399, +- 3368, 414, 929, 391, 932, 656, 899, 392, 392, 2525, ++ 3375, 414, 929, 391, 932, 656, 899, 392, 392, 2527, + 660, 403, 391, 404, 656, 391, 900, 392, 933, 658, +- 403, 399, 404, 893, 3309, 405, 934, 936, 658, 937, ++ 403, 399, 404, 893, 3316, 405, 934, 936, 658, 937, + 392, 938, 932, 678, 657, 898, 679, 391, 626, 392, + 899, 422, 392, 657, 1117, 403, 933, 404, 914, 406, + 900, 915, 657, 658, 934, 936, 422, 937, 406, 938, +- 1327, 3301, 3296, 391, 392, 939, 391, 659, 392, 940, ++ 1327, 3308, 3302, 391, 392, 939, 391, 659, 392, 940, + 941, 403, 666, 404, 1572, 666, 405, 392, 399, 658, + + 393, 908, 394, 1510, 908, 392, 392, 901, 423, 393, +@@ -2151,19 +2154,19 @@ static const flex_int16_t yy_nxt[14349] = + 966, 961, 945, 947, 953, 954, 395, 949, 950, 967, + 951, 952, 968, 957, 969, 958, 962, 391, 955, 959, + 956, 964, 948, 960, 963, 970, 972, 978, 966, 961, +- 991, 965, 3270, 991, 971, 949, 950, 967, 951, 952, ++ 991, 965, 3276, 991, 971, 949, 950, 967, 951, 952, + 968, 957, 969, 958, 962, 508, 973, 959, 974, 964, + + 975, 506, 2143, 970, 972, 978, 506, 995, 737, 965, +- 995, 737, 971, 738, 981, 740, 3255, 981, 740, 982, ++ 995, 737, 971, 738, 981, 740, 3261, 981, 740, 982, + 741, 1002, 984, 510, 973, 984, 974, 985, 975, 987, + 747, 1003, 987, 747, 988, 748, 992, 751, 1004, 992, + 751, 993, 752, 996, 512, 1005, 996, 513, 997, 1002, + 1012, 1013, 529, 998, 1014, 530, 266, 1015, 1016, 1003, + 529, 1017, 536, 1018, 1019, 537, 1004, 536, 1020, 1021, +- 536, 2525, 1022, 1005, 529, 2480, 1036, 2481, 1012, 1013, ++ 536, 2527, 1022, 1005, 529, 2482, 1036, 2483, 1012, 1013, + 1037, 1025, 1014, 1038, 536, 1015, 1016, 1023, 1026, 1017, +- 1024, 1018, 1019, 2525, 1000, 1027, 1020, 1021, 1034, 1028, ++ 1024, 1018, 1019, 2527, 1000, 1027, 1020, 1021, 1034, 1028, + + 1022, 1043, 1006, 1029, 1036, 1031, 1039, 1030, 1037, 1025, + 1041, 1038, 1008, 1046, 1047, 1023, 1026, 1035, 1024, 1032, +@@ -2172,7 +2175,7 @@ static const flex_int16_t yy_nxt[14349] = + 1055, 1046, 1047, 1049, 1056, 1035, 1057, 1032, 1048, 1033, + 1040, 1058, 1052, 1042, 1059, 1060, 1044, 1061, 1045, 1063, + 1064, 1065, 1066, 1067, 1068, 1053, 1070, 1071, 1055, 1072, +- 1074, 1075, 1056, 1050, 1057, 1078, 2525, 1079, 835, 1058, ++ 1074, 1075, 1056, 1050, 1057, 1078, 2527, 1079, 835, 1058, + 1080, 835, 1059, 1060, 1081, 1061, 1082, 1063, 1064, 1065, + 1066, 1067, 1068, 1076, 1070, 1071, 1083, 1072, 1074, 1075, + +@@ -2185,33 +2188,33 @@ static const flex_int16_t yy_nxt[14349] = + 347, 357, 347, 373, 358, 867, 1107, 866, 867, 870, + 866, 390, 367, 669, 632, 368, 383, 640, 622, 383, + 367, 383, 874, 1905, 1114, 835, 1108, 675, 835, 640, +- 889, 3205, 868, 383, 640, 1112, 383, 392, 383, 1130, ++ 889, 3211, 868, 383, 640, 1112, 383, 392, 383, 1130, + +- 1111, 3057, 394, 383, 628, 392, 640, 348, 2507, 868, ++ 1111, 3062, 394, 383, 628, 392, 640, 348, 2509, 868, + 872, 359, 431, 634, 399, 418, 391, 1129, 1127, 391, + 383, 392, 369, 1076, 653, 391, 1113, 1130, 391, 655, +- 392, 641, 884, 653, 1076, 654, 1115, 872, 655, 3055, +- 428, 884, 651, 392, 889, 2298, 391, 649, 873, 391, ++ 392, 641, 884, 653, 1076, 654, 1115, 872, 655, 3060, ++ 428, 884, 651, 392, 889, 2299, 391, 649, 873, 391, + 979, 392, 392, 979, 653, 399, 1113, 1460, 891, 655, + 642, 640, 884, 1131, 677, 671, 1205, 914, 1460, 399, + 915, 656, 399, 392, 399, 422, 391, 642, 640, 391, +- 885, 392, 1713, 1116, 894, 886, 895, 3331, 1132, 896, ++ 885, 392, 1713, 1116, 894, 886, 895, 3338, 1132, 896, + 399, 1131, 897, 399, 391, 399, 399, 391, 1133, 392, + + 657, 885, 653, 392, 654, 1134, 1119, 655, 1135, 657, +- 884, 980, 891, 755, 980, 911, 1132, 399, 911, 3194, +- 412, 392, 423, 413, 656, 3185, 1133, 1714, 1136, 1193, +- 657, 888, 1193, 1134, 391, 2810, 1135, 391, 391, 392, +- 2985, 391, 894, 392, 895, 898, 894, 896, 1121, 1118, +- 897, 896, 392, 888, 897, 393, 1136, 394, 2987, 391, ++ 884, 980, 891, 755, 980, 911, 1132, 399, 911, 3200, ++ 412, 392, 423, 413, 656, 3191, 1133, 1714, 1136, 1193, ++ 657, 888, 1193, 1134, 391, 2813, 1135, 391, 391, 392, ++ 2989, 391, 894, 392, 895, 898, 894, 896, 1121, 1118, ++ 897, 896, 392, 888, 897, 393, 1136, 394, 2991, 391, + 392, 392, 391, 392, 392, 392, 393, 1122, 394, 895, + 414, 392, 896, 891, 392, 897, 981, 983, 657, 981, + 983, 982, 1140, 1141, 1143, 392, 391, 1145, 1146, 898, +- 2810, 391, 1137, 898, 391, 908, 392, 1138, 908, 1125, ++ 2813, 391, 1137, 898, 391, 908, 392, 1138, 908, 1125, + +- 392, 404, 395, 393, 405, 394, 3142, 658, 392, 1139, ++ 392, 404, 395, 393, 405, 394, 3147, 658, 392, 1139, + 1140, 1141, 1143, 395, 1123, 1145, 1146, 1147, 391, 1148, +- 1137, 1149, 392, 3101, 2525, 1138, 1144, 1144, 1144, 1144, ++ 1137, 1149, 392, 3106, 2527, 1138, 1144, 1144, 1144, 1144, + 1144, 1144, 1144, 1144, 1144, 1150, 1151, 1139, 1152, 1153, + 1154, 1155, 1156, 1159, 1160, 1147, 665, 1148, 1161, 1149, + 395, 931, 931, 931, 931, 931, 931, 931, 931, 931, +@@ -2221,30 +2224,30 @@ static const flex_int16_t yy_nxt[14349] = + 1164, 1180, 1182, 1165, 1183, 1181, 1185, 1184, 1186, 1187, + + 1188, 1168, 1189, 1190, 1192, 1167, 1169, 1170, 1171, 1172, +- 1173, 1174, 1175, 1176, 1177, 1178, 3063, 1905, 1194, 1180, ++ 1173, 1174, 1175, 1176, 1177, 1178, 3068, 1905, 1194, 1180, + 1182, 1194, 1183, 1181, 1185, 1184, 1186, 1187, 1188, 1207, +- 1189, 1190, 1192, 984, 1195, 3055, 984, 1195, 985, 1196, +- 987, 1197, 2880, 987, 1197, 988, 1198, 991, 3042, 1198, ++ 1189, 1190, 1192, 984, 1195, 3060, 984, 1195, 985, 1196, ++ 987, 1197, 2884, 987, 1197, 988, 1198, 991, 3047, 1198, + 991, 1199, 992, 1201, 1209, 992, 1201, 993, 1202, 995, + 1210, 1202, 995, 1203, 996, 1204, 510, 996, 1204, 997, + 516, 1206, 1211, 1208, 1213, 529, 759, 1215, 1212, 1218, + 1219, 536, 1209, 529, 1214, 1220, 536, 1221, 1210, 536, +- 3002, 1222, 1460, 533, 1223, 1224, 540, 3001, 1225, 1226, ++ 3014, 1222, 1460, 533, 1223, 1224, 540, 3006, 1225, 1226, + + 1211, 1227, 1228, 1460, 1229, 1230, 1235, 1218, 1219, 1231, +- 1232, 1233, 1234, 1220, 1238, 1221, 1239, 3146, 757, 1222, ++ 1232, 1233, 1234, 1220, 1238, 1221, 1239, 3151, 757, 1222, + 761, 769, 1223, 1224, 773, 767, 1225, 1226, 1240, 1227, + 1228, 771, 1229, 1230, 1235, 1241, 1242, 1231, 1232, 1233, + 1234, 1236, 1238, 1243, 1239, 1237, 1244, 1245, 1246, 1247, + 1250, 1253, 1255, 1248, 1251, 1249, 1240, 1256, 1252, 1257, +- 1258, 1259, 1260, 1241, 1242, 1265, 1266, 2810, 1254, 1236, ++ 1258, 1259, 1260, 1241, 1242, 1265, 1266, 2813, 1254, 1236, + 1269, 1243, 1270, 1237, 1244, 1245, 1246, 1247, 1250, 1253, + 1255, 1248, 1251, 1249, 1271, 1256, 1252, 1257, 1258, 1259, + 1260, 1261, 1267, 1265, 1266, 1262, 1254, 1272, 1269, 1273, + +- 1270, 1274, 1263, 1267, 1264, 2992, 1275, 1276, 1277, 1279, +- 1280, 1281, 1271, 1282, 1283, 1284, 1285, 1286, 2987, 1261, +- 1294, 1295, 2950, 1262, 1296, 1272, 1297, 1273, 1298, 1274, ++ 1270, 1274, 1263, 1267, 1264, 3005, 1275, 1276, 1277, 1279, ++ 1280, 1281, 1271, 1282, 1283, 1284, 1285, 1286, 2996, 1261, ++ 1294, 1295, 2991, 1262, 1296, 1272, 1297, 1273, 1298, 1274, + 1263, 1299, 1264, 1268, 1275, 1276, 1277, 1279, 1280, 1281, + 1300, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1294, 1295, + 1289, 1301, 1296, 1302, 1297, 1290, 1298, 1303, 1304, 1299, +@@ -2253,24 +2256,24 @@ static const flex_int16_t yy_nxt[14349] = + 1317, 1302, 1318, 1290, 1319, 1303, 1304, 351, 1305, 1291, + 1306, 1307, 1308, 1292, 1309, 1293, 889, 1310, 1311, 1312, + +- 1313, 1314, 889, 2933, 1315, 1316, 383, 640, 1317, 383, ++ 1313, 1314, 889, 2954, 1315, 1316, 383, 640, 1317, 383, + 1318, 383, 1319, 1322, 1326, 355, 870, 889, 391, 1320, +- 2298, 391, 868, 392, 2875, 428, 653, 391, 654, 1335, +- 391, 1324, 392, 383, 884, 1330, 3602, 654, 3603, 391, ++ 2937, 391, 868, 392, 2299, 428, 653, 391, 654, 1335, ++ 391, 1324, 392, 383, 884, 1330, 3612, 654, 3613, 391, + 655, 1328, 391, 884, 392, 392, 1337, 894, 1331, 1121, + 1334, 1338, 896, 431, 391, 897, 1117, 1335, 662, 1339, +- 2298, 641, 1193, 885, 891, 1193, 392, 399, 1194, 399, ++ 2879, 641, 1193, 885, 891, 1193, 392, 399, 1194, 399, + 891, 1194, 399, 656, 1337, 399, 1340, 399, 1195, 1338, +- 2836, 1195, 893, 1196, 1323, 1327, 1397, 1339, 1119, 1397, +- 1321, 640, 2835, 391, 888, 1332, 391, 906, 392, 399, ++ 2299, 1195, 893, 1196, 1323, 1327, 1397, 1339, 1119, 1397, ++ 1321, 640, 2840, 391, 888, 1332, 391, 906, 392, 399, + + 1341, 894, 1325, 895, 1340, 391, 896, 1342, 391, 897, + 392, 657, 1344, 894, 399, 895, 1345, 399, 896, 399, + 392, 897, 1348, 1343, 1350, 1351, 1352, 898, 1341, 1353, + 660, 1354, 392, 1356, 1357, 1342, 1358, 1360, 1361, 1362, +- 1344, 399, 1363, 2812, 1345, 1364, 1365, 1366, 898, 2774, +- 1348, 1343, 1350, 1351, 1352, 1197, 2361, 1353, 1197, 1354, +- 1333, 1356, 1357, 2359, 1358, 1360, 1361, 1362, 1368, 406, ++ 1344, 399, 1363, 2839, 1345, 1364, 1365, 1366, 898, 2815, ++ 1348, 1343, 1350, 1351, 1352, 1197, 2777, 1353, 1197, 1354, ++ 1333, 1356, 1357, 2362, 1358, 1360, 1361, 1362, 1368, 406, + 1363, 1349, 1369, 1364, 1365, 1366, 1370, 1325, 1144, 1144, + 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1367, 1367, 1367, + 1367, 1367, 1367, 1367, 1367, 1367, 1368, 1371, 399, 1372, +@@ -2278,7 +2281,7 @@ static const flex_int16_t yy_nxt[14349] = + 1369, 1373, 1374, 1377, 1370, 1375, 1376, 1378, 1379, 1380, + 1381, 1382, 1383, 1384, 1385, 1387, 1388, 1389, 1390, 1391, + 1398, 1198, 508, 1398, 1198, 1371, 1199, 1372, 1402, 1373, +- 1374, 1377, 2742, 1375, 1376, 1378, 1379, 1380, 1381, 1382, ++ 1374, 1377, 2360, 1375, 1376, 1378, 1379, 1380, 1381, 1382, + 1383, 1384, 1385, 1387, 1388, 1389, 1390, 1391, 1399, 1201, + 510, 1399, 1201, 1400, 1202, 1401, 1402, 1202, 1401, 1203, + 1204, 1403, 1404, 1204, 1407, 1408, 1409, 1410, 1411, 1412, +@@ -2289,7 +2292,7 @@ static const flex_int16_t yy_nxt[14349] = + 1415, 1416, 1417, 1418, 1419, 1420, 1422, 1423, 1424, 1425, + 1426, 1421, 1427, 1428, 1429, 1430, 1431, 1433, 1434, 1432, + 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1445, +- 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 2740, ++ 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 2745, + 1459, 1461, 1462, 1444, 1463, 1433, 1434, 1465, 1435, 1436, + 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1445, 1446, 1447, + 1448, 1449, 1450, 1451, 1452, 1453, 1454, 1455, 1459, 1461, +@@ -2301,19 +2304,19 @@ static const flex_int16_t yy_nxt[14349] = + 1475, 1457, 1458, 1477, 1478, 1479, 1480, 1482, 1483, 1484, + 1486, 1487, 1481, 1494, 1488, 1489, 1490, 1491, 1492, 1495, + 1496, 1493, 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, +- 1505, 1506, 1507, 1508, 870, 889, 1512, 2683, 662, 1397, +- 1515, 1494, 1397, 1398, 2513, 2511, 1398, 1495, 1496, 3952, ++ 1505, 1506, 1507, 1508, 870, 889, 1512, 2743, 662, 1397, ++ 1515, 1494, 1397, 1398, 2686, 2515, 1398, 1495, 1496, 3965, + 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, + 1507, 1508, 391, 1509, 1512, 391, 1516, 392, 1515, 1517, +- 894, 889, 895, 871, 890, 896, 1518, 3602, 897, 3603, +- 399, 2091, 399, 399, 1519, 399, 2298, 1520, 1576, 392, ++ 894, 889, 895, 871, 890, 896, 1518, 3612, 897, 3613, ++ 399, 2513, 399, 399, 1519, 399, 2091, 1520, 1576, 392, + +- 1513, 1576, 1514, 1521, 1516, 1522, 886, 1517, 1527, 3673, +- 1528, 3674, 872, 891, 1518, 659, 391, 399, 1529, 391, ++ 1513, 1576, 1514, 1521, 1516, 1522, 886, 1517, 1527, 3684, ++ 1528, 3685, 872, 891, 1518, 659, 391, 399, 1529, 391, + 1116, 392, 1519, 1530, 1511, 1520, 895, 898, 1513, 896, + 1514, 1521, 897, 1522, 1524, 1531, 1527, 1524, 1528, 1524, + 1532, 1537, 1533, 391, 1525, 656, 1529, 1524, 1538, 891, +- 2298, 1530, 1539, 1541, 1547, 1548, 1551, 1552, 1553, 1554, ++ 2299, 1530, 1539, 1541, 1547, 1548, 1551, 1552, 1553, 1554, + 1555, 1399, 1401, 1531, 1399, 1401, 1400, 1583, 1532, 1537, + 1583, 1123, 1535, 1556, 888, 1557, 1538, 1558, 1536, 1559, + 1539, 1541, 1547, 1548, 1551, 1552, 1553, 1554, 1555, 1526, +@@ -2327,14 +2330,14 @@ static const flex_int16_t yy_nxt[14349] = + 1585, 1586, 1587, 1588, 1589, 1594, 1590, 1591, 1599, 1592, + 1600, 1593, 1597, 1598, 1601, 1602, 1603, 1604, 1595, 1605, + 1606, 1610, 1611, 1596, 1612, 1613, 1607, 1614, 1608, 1615, +- 1616, 1609, 2490, 1594, 1623, 1624, 1599, 1625, 1600, 1626, ++ 1616, 1609, 2299, 1594, 1623, 1624, 1599, 1625, 1600, 1626, + 1627, 1628, 1601, 1602, 1603, 1604, 1595, 1605, 1606, 1610, + + 1611, 1596, 1612, 1613, 1607, 1614, 1608, 1615, 1616, 1609, + 1617, 1629, 1623, 1624, 1618, 1625, 1630, 1626, 1627, 1628, + 1631, 1619, 1632, 1620, 1621, 1633, 1622, 1634, 1635, 1636, + 1637, 1638, 1639, 1640, 1641, 1642, 1643, 1647, 1617, 1629, +- 1648, 1649, 1618, 1650, 1630, 1651, 2488, 1658, 1631, 1619, ++ 1648, 1649, 1618, 1650, 1630, 1651, 2492, 1658, 1631, 1619, + 1632, 1620, 1621, 1633, 1622, 1634, 1635, 1636, 1637, 1638, + 1639, 1640, 1641, 1642, 1643, 1647, 1659, 1652, 1648, 1649, + 1660, 1650, 1665, 1651, 1653, 1658, 1666, 1663, 1667, 1668, +@@ -2345,15 +2348,15 @@ static const flex_int16_t yy_nxt[14349] = + 1654, 1661, 1671, 1662, 1672, 1655, 1685, 1673, 1674, 1675, + 1676, 1677, 1686, 1680, 1678, 1679, 1687, 1664, 1681, 1682, + 1688, 1683, 1689, 1684, 1690, 1691, 1692, 1693, 1695, 1697, +- 1698, 1699, 889, 1696, 1685, 1701, 1702, 3673, 1703, 3674, ++ 1698, 1699, 889, 1696, 1685, 1701, 1702, 3684, 1703, 3685, + 1686, 1680, 1704, 1694, 1687, 1705, 1681, 1706, 1688, 1707, + 1689, 1757, 1690, 1691, 1692, 1693, 1695, 1697, 1698, 1699, + 1700, 1696, 399, 1701, 1702, 399, 1703, 399, 1117, 1708, +- 1704, 1694, 2076, 1705, 1709, 1706, 1710, 1707, 1119, 399, ++ 1704, 1694, 2490, 1705, 1709, 1706, 1710, 1707, 1119, 399, + 1524, 1524, 1716, 1524, 1524, 1524, 1524, 1719, 1720, 399, + + 1711, 1711, 1721, 1524, 1524, 1576, 1395, 1708, 1576, 885, +- 891, 2680, 1709, 1726, 1710, 1723, 1727, 1332, 2677, 1724, ++ 891, 2076, 1709, 1726, 1710, 1723, 1727, 1332, 2683, 1724, + 1716, 1725, 1728, 1729, 1730, 1719, 1720, 898, 1732, 1733, + 1721, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, + 1736, 1726, 1737, 1723, 1727, 1712, 1526, 1724, 1738, 1725, +@@ -2379,8 +2382,8 @@ static const flex_int16_t yy_nxt[14349] = + 1814, 1824, 1825, 1826, 1815, 1818, 1819, 1827, 1820, 1821, + 1822, 1828, 1823, 1829, 1830, 1832, 1833, 1834, 1835, 1836, + 1817, 1837, 1838, 1848, 1850, 1851, 1852, 1853, 1854, 1824, +- 1825, 1826, 1855, 1839, 1848, 1827, 1856, 1857, 3738, 1828, +- 3739, 1829, 1830, 1832, 1833, 1834, 1835, 1836, 2656, 1837, ++ 1825, 1826, 1855, 1839, 1848, 1827, 1856, 1857, 3750, 1828, ++ 3751, 1829, 1830, 1832, 1833, 1834, 1835, 1836, 2680, 1837, + 1838, 1858, 1850, 1851, 1852, 1853, 1854, 1859, 1860, 1861, + 1855, 1839, 1840, 1841, 1856, 1857, 1842, 1862, 1843, 1863, + 1864, 1865, 1844, 1845, 1866, 1867, 1846, 1868, 1869, 1858, +@@ -2390,15 +2393,15 @@ static const flex_int16_t yy_nxt[14349] = + 1844, 1845, 1866, 1867, 1846, 1868, 1869, 1882, 1870, 1847, + 1871, 1872, 1873, 1877, 1883, 1879, 1874, 1875, 1880, 1884, + 1876, 1881, 1885, 1117, 1887, 1888, 1878, 1889, 1890, 1891, +- 1894, 1892, 1895, 1898, 1900, 1882, 3738, 1903, 3739, 1904, +- 1906, 1877, 1883, 1879, 1893, 2985, 1880, 1884, 1907, 1908, ++ 1894, 1892, 1895, 1898, 1900, 1882, 3750, 1903, 3751, 1904, ++ 1906, 1877, 1883, 1879, 1893, 2989, 1880, 1884, 1907, 1908, + 1885, 1909, 1887, 1888, 1878, 1889, 1890, 1891, 1894, 1892, +- 1895, 1524, 1900, 2646, 1524, 1903, 1524, 1904, 1906, 1913, +- 1918, 1896, 1893, 1905, 1524, 2636, 1907, 1908, 1899, 1909, ++ 1895, 1524, 1900, 2659, 1524, 1903, 1524, 1904, 1906, 1913, ++ 1918, 1896, 1893, 1905, 1524, 2648, 1907, 1908, 1899, 1909, + + 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1910, +- 888, 1911, 1914, 2634, 2618, 2986, 3952, 1913, 1918, 3952, +- 2603, 3952, 1919, 1920, 1915, 1921, 1922, 1923, 1924, 1916, ++ 888, 1911, 1914, 2638, 2636, 2990, 3965, 1913, 1918, 3965, ++ 2620, 3965, 1919, 1920, 1915, 1921, 1922, 1923, 1924, 1916, + 1925, 1926, 1927, 1928, 1929, 1930, 1526, 1910, 1572, 1911, + 1914, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, + 1919, 1920, 1915, 1921, 1922, 1923, 1924, 1916, 1925, 1926, +@@ -2422,12 +2425,12 @@ static const flex_int16_t yy_nxt[14349] = + 2000, 1996, 2001, 2003, 2004, 2005, 2014, 2002, 2006, 2007, + 2019, 2010, 2021, 2022, 2011, 2023, 2012, 2024, 2015, 2016, + 2013, 2025, 2026, 2009, 2017, 2027, 2028, 2018, 2029, 2031, +- 2032, 2033, 2034, 2035, 2036, 2037, 2043, 3646, 2019, 2044, ++ 2032, 2033, 2034, 2035, 2036, 2037, 2043, 3656, 2019, 2044, + 2021, 2022, 2030, 2023, 2045, 2024, 2046, 2047, 2048, 2025, +- 2026, 2361, 2050, 2027, 2028, 2051, 2029, 2031, 2032, 2033, ++ 2026, 2605, 2050, 2027, 2028, 2051, 2029, 2031, 2032, 2033, + 2034, 2035, 2036, 2037, 2043, 2038, 2039, 2044, 2052, 2053, + 2030, 2040, 2045, 2054, 2046, 2047, 2048, 2055, 2056, 2041, +- 2050, 2057, 2042, 2051, 2058, 2059, 2060, 3647, 2066, 2075, ++ 2050, 2057, 2042, 2051, 2058, 2059, 2060, 3657, 2066, 2075, + + 2067, 2068, 2069, 2038, 2039, 2070, 2052, 2053, 2061, 2040, + 2062, 2054, 2071, 2072, 2063, 2055, 2056, 2041, 2077, 2057, +@@ -2435,14 +2438,14 @@ static const flex_int16_t yy_nxt[14349] = + 2069, 2081, 2082, 2070, 2083, 2084, 2061, 2061, 2062, 2062, + 2071, 2072, 2063, 2063, 2076, 2079, 2077, 2085, 2086, 2078, + 1713, 1713, 2080, 2064, 2064, 2065, 2073, 2090, 2092, 2081, +- 2082, 2093, 2083, 2084, 2094, 2061, 2095, 2062, 2359, 2098, +- 2096, 2063, 2097, 2079, 2281, 2085, 2086, 2099, 1524, 2100, ++ 2082, 2093, 2083, 2084, 2094, 2061, 2095, 2062, 2362, 2098, ++ 2096, 2063, 2097, 2079, 2282, 2085, 2086, 2099, 1524, 2100, + 2080, 1524, 2064, 1524, 2073, 2101, 2092, 2102, 1711, 2093, + 2103, 1524, 2094, 2104, 2095, 1714, 1899, 2098, 2096, 2115, + +- 2097, 2116, 2091, 2117, 2118, 2099, 2550, 2100, 2119, 2120, +- 2121, 2122, 2123, 2101, 2166, 2102, 2511, 2166, 2103, 2282, +- 2091, 2104, 2124, 2125, 2127, 2297, 2128, 2115, 2298, 2116, ++ 2097, 2116, 2091, 2117, 2118, 2099, 2360, 2100, 2119, 2120, ++ 2121, 2122, 2123, 2101, 2166, 2102, 2552, 2166, 2103, 2283, ++ 2513, 2104, 2124, 2125, 2127, 2298, 2128, 2115, 2299, 2116, + 2126, 2117, 2118, 1712, 2105, 2129, 2119, 2120, 2121, 2122, + 2123, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, + 2124, 2125, 2127, 2107, 2128, 2108, 2109, 2110, 2126, 2130, +@@ -2454,7 +2457,7 @@ static const flex_int16_t yy_nxt[14349] = + 2141, 2149, 2151, 2113, 2134, 2147, 2145, 2148, 2147, 2155, + 2152, 2156, 2157, 2158, 2153, 2159, 2160, 2161, 2162, 2154, + 2163, 2164, 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, +- 2175, 2176, 1947, 2177, 2508, 2180, 2181, 2155, 2182, 2156, ++ 2175, 2176, 1947, 2177, 2091, 2180, 2181, 2155, 2182, 2156, + 2157, 2158, 2183, 2159, 2160, 2161, 2162, 2184, 2163, 2164, + 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, + 1949, 2177, 1981, 2180, 2181, 1981, 2182, 2179, 2185, 2186, +@@ -2464,997 +2467,999 @@ static const flex_int16_t yy_nxt[14349] = + + 2188, 2189, 2190, 2206, 2191, 2192, 2193, 2194, 2211, 2197, + 2198, 2212, 2199, 2213, 2200, 2201, 2202, 2203, 2204, 2205, +- 2214, 2207, 2208, 2209, 2215, 2216, 2210, 2217, 2507, 2166, +- 2488, 2229, 2166, 2230, 2385, 3952, 2211, 2231, 3952, 2212, +- 3952, 2213, 2232, 2233, 2234, 2076, 2235, 2485, 2214, 2236, +- 2237, 2238, 2215, 2216, 2239, 2217, 2218, 2219, 2220, 2229, +- 2221, 2230, 2222, 2223, 2240, 2231, 2224, 2225, 2226, 2241, +- 2232, 2233, 2234, 2227, 2235, 2228, 2242, 2236, 2237, 2238, ++ 2214, 2207, 2208, 2209, 2215, 2216, 2210, 2217, 2510, 2166, ++ 2509, 2230, 2166, 2231, 2386, 3965, 2211, 2232, 3965, 2212, ++ 3965, 2213, 3965, 2233, 2234, 3965, 2235, 3965, 2214, 2236, ++ 2237, 2238, 2215, 2216, 2239, 2217, 2218, 2219, 2220, 2230, ++ 2221, 2231, 2222, 2223, 2240, 2232, 2224, 2225, 2226, 2241, ++ 2227, 2233, 2234, 2228, 2235, 2229, 2242, 2236, 2237, 2238, + 2243, 2244, 2239, 2245, 2218, 2219, 2220, 2246, 2221, 2247, +- 2222, 2223, 2240, 2248, 2224, 2225, 2226, 2241, 2249, 2250, +- +- 2251, 2227, 2252, 2228, 2242, 2253, 2254, 2256, 2243, 2244, +- 2257, 2245, 2258, 2259, 2262, 2246, 2263, 2247, 2264, 2265, +- 2266, 2248, 2267, 2268, 2269, 2272, 2249, 2250, 2251, 2270, +- 2252, 2271, 2273, 2253, 2254, 2256, 2278, 2279, 2257, 2280, +- 2258, 2259, 2262, 2284, 2263, 2281, 2264, 2265, 2266, 2286, +- 2267, 2268, 2269, 2272, 2287, 2288, 2289, 2270, 2290, 2271, +- 2273, 2291, 2299, 2292, 2278, 2279, 2293, 2280, 2294, 2295, +- 2302, 2299, 2304, 2305, 2306, 2307, 2308, 2286, 2309, 2470, +- 2310, 2311, 2287, 2288, 2289, 2312, 2290, 2427, 2285, 2291, +- 2076, 2292, 2313, 2314, 2293, 2315, 2294, 2295, 2427, 2428, +- +- 2304, 2305, 2306, 2307, 2308, 2324, 2309, 2300, 2310, 2311, +- 2428, 2461, 2361, 2312, 2325, 2303, 2091, 2326, 2359, 2329, +- 2313, 2314, 2330, 2315, 2316, 2316, 2316, 2316, 2316, 2316, +- 2316, 2316, 2316, 2324, 2331, 2333, 2317, 2334, 2318, 2319, +- 2320, 2327, 2325, 2335, 2321, 2326, 2328, 2329, 2336, 2322, +- 2330, 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2323, 2261, +- 2145, 2146, 2331, 2333, 2317, 2334, 2318, 2319, 2320, 2327, +- 2344, 2335, 2321, 2345, 2328, 2346, 2336, 2322, 2347, 2337, +- 2338, 2339, 2340, 2341, 2342, 2343, 2323, 2106, 2106, 2106, +- 2106, 2106, 2106, 2106, 2106, 2106, 2348, 2349, 2344, 2350, +- +- 2351, 2345, 2352, 2346, 2353, 2354, 2347, 2355, 2356, 2357, +- 2144, 2145, 2146, 2144, 1947, 2147, 2145, 2148, 2147, 2145, +- 2148, 2362, 2363, 2364, 2348, 2349, 2365, 2350, 2351, 2366, +- 2352, 2375, 2353, 2354, 2376, 2355, 2356, 2357, 2377, 2378, +- 2379, 2380, 2387, 2381, 2382, 2387, 2260, 2383, 2384, 2362, +- 2363, 2364, 2389, 2390, 2365, 2391, 2392, 2366, 2393, 2375, +- 2394, 2395, 2376, 2396, 2397, 1947, 2377, 2378, 2379, 2380, +- 1949, 2381, 2382, 1949, 2367, 2383, 2384, 2367, 2255, 2398, +- 2389, 2390, 2388, 2391, 2392, 2400, 2393, 2401, 2394, 2395, +- 2165, 2396, 2397, 2368, 2150, 2402, 2403, 2404, 2405, 2406, +- +- 2407, 2408, 2409, 2411, 2412, 2413, 2369, 2398, 2370, 2414, +- 2388, 3952, 2416, 2400, 3952, 2401, 3952, 2417, 2371, 2418, +- 2372, 2373, 2374, 2402, 2403, 2404, 2405, 2406, 2407, 2408, +- 2409, 2411, 2412, 2413, 2369, 2419, 2370, 2414, 2420, 2421, +- 2416, 2422, 2421, 2423, 2424, 2417, 2371, 2418, 2372, 2373, +- 2374, 2425, 2426, 2429, 2430, 2431, 2432, 2433, 2434, 2436, +- 2437, 2438, 2439, 2419, 2440, 2441, 2420, 2435, 2442, 2422, +- 2443, 2423, 2424, 2444, 2445, 2448, 2446, 2449, 2450, 2425, +- 2426, 2429, 2430, 2431, 2432, 2433, 2434, 2436, 2437, 2438, +- 2439, 2447, 2440, 2441, 2451, 2452, 2442, 2453, 2443, 2454, +- +- 2455, 2444, 2445, 2448, 2446, 2449, 2450, 2456, 2457, 2458, +- 2459, 2460, 2462, 2463, 2464, 2465, 2466, 2467, 2468, 2447, +- 2469, 2471, 2451, 2452, 2472, 2453, 2473, 2454, 2455, 2474, +- 2475, 2476, 2477, 2478, 2479, 2456, 2457, 2458, 2459, 2460, +- 2462, 2463, 2464, 2465, 2466, 2467, 2468, 2482, 2469, 2471, +- 2483, 2484, 2472, 2486, 2473, 2489, 2491, 2474, 2475, 2476, +- 2477, 2478, 2479, 2492, 2493, 2494, 2495, 2496, 2497, 2498, +- 2509, 2499, 2512, 2514, 2515, 2482, 1949, 2502, 2483, 2484, +- 2502, 2516, 2502, 2517, 2491, 2518, 2519, 2503, 2520, 1947, +- 2504, 2492, 2493, 2494, 2495, 2496, 2497, 2498, 2487, 2499, +- +- 2490, 2514, 2515, 2521, 2505, 2522, 2523, 2524, 2526, 2516, +- 2527, 2517, 2525, 2518, 2519, 2510, 2520, 2513, 2528, 2316, +- 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2531, 2532, +- 2533, 2521, 2506, 2522, 2523, 2524, 2526, 2529, 2527, 2534, +- 2535, 2536, 2530, 2537, 2538, 2539, 2528, 2540, 2541, 2542, +- 2543, 2544, 2545, 2546, 2547, 2548, 2531, 2532, 2533, 2549, +- 2551, 2552, 2553, 2554, 2555, 2529, 2556, 2534, 2535, 2536, +- 2530, 2537, 2538, 2539, 2557, 2540, 2541, 2542, 2543, 2544, +- 2545, 2546, 2547, 2548, 2558, 2559, 2565, 2549, 2551, 2552, +- 2553, 2554, 2555, 2566, 2556, 2561, 2562, 2567, 2561, 2569, +- +- 2564, 2562, 2557, 2564, 2568, 2367, 2572, 2573, 2367, 2572, +- 2570, 2574, 2558, 2559, 2565, 2576, 2577, 2575, 2578, 2579, +- 2580, 2566, 2114, 2581, 2582, 2567, 2581, 2569, 2583, 2584, +- 2585, 2586, 2568, 2587, 2588, 2573, 2589, 3952, 2088, 2574, +- 3952, 2593, 3952, 2576, 2577, 2575, 2578, 2579, 2580, 2594, +- 2359, 2595, 2582, 2596, 2597, 2361, 2583, 2584, 2585, 2586, +- 2598, 2587, 2588, 2387, 2589, 2358, 2387, 2599, 2591, 2593, +- 2360, 2600, 2601, 2602, 2604, 2601, 2605, 2594, 2606, 2595, +- 2607, 2596, 2597, 2608, 2609, 2610, 2611, 2612, 2598, 2613, +- 2614, 2615, 2616, 2617, 2619, 2599, 2620, 2621, 2622, 2600, +- +- 2621, 2602, 2604, 2623, 2605, 2627, 2606, 2628, 2607, 2629, +- 2630, 2608, 2609, 2610, 2611, 2612, 2631, 2613, 2614, 2615, +- 2616, 2617, 2619, 2632, 2620, 2625, 2622, 2633, 2625, 2635, +- 2626, 2623, 2637, 2627, 2639, 2628, 2640, 2629, 2630, 2641, +- 2642, 2643, 2644, 2637, 2631, 2087, 2645, 2647, 2648, 2649, +- 2650, 2632, 2651, 2652, 2653, 2633, 2654, 2635, 2655, 2657, +- 2658, 2659, 2639, 2660, 2640, 2661, 2662, 2641, 2642, 2643, +- 2644, 2663, 2664, 2638, 2645, 2647, 2648, 2649, 2650, 2665, +- 2651, 2652, 2653, 2666, 2654, 2667, 2655, 2657, 2658, 2659, +- 2668, 2660, 2669, 2661, 2662, 2670, 2671, 2672, 2673, 2663, +- +- 2664, 2674, 2675, 2676, 2678, 2679, 2681, 2665, 2281, 2486, +- 2683, 2666, 2684, 2667, 2685, 2686, 2687, 2688, 2668, 2689, +- 2669, 2690, 2695, 2670, 2671, 2672, 2673, 2298, 1899, 2674, +- 2675, 2676, 2678, 2679, 2572, 2707, 2709, 2572, 2683, 2696, +- 2684, 2500, 2685, 2686, 2687, 2688, 2299, 2689, 2509, 2690, +- 2049, 2490, 2502, 2682, 2490, 2502, 2502, 2502, 2710, 2502, +- 2711, 2502, 2692, 2020, 2709, 2504, 2699, 2697, 2502, 2698, +- 2712, 2502, 2502, 2502, 1905, 2502, 2713, 2502, 2703, 2693, +- 2513, 2504, 2692, 2700, 2714, 2504, 2710, 2715, 2711, 2716, +- 2717, 2708, 2718, 2513, 2719, 2704, 2720, 2721, 2712, 2693, +- +- 2722, 2723, 1905, 2724, 2713, 2725, 2726, 2694, 2727, 2728, +- 2729, 2701, 2714, 2730, 2731, 2715, 2732, 2716, 2717, 2733, +- 2718, 2734, 2719, 2705, 2720, 2721, 2735, 2506, 2722, 2723, +- 2736, 2724, 2737, 2725, 2726, 2738, 2727, 2728, 2729, 2739, +- 2741, 2730, 2731, 2743, 2732, 2744, 2745, 2733, 2746, 2734, +- 2747, 2748, 2749, 2750, 2735, 2751, 2561, 2562, 2736, 2561, +- 2737, 2564, 2562, 2738, 2564, 2752, 2753, 2739, 2741, 2754, +- 2757, 2743, 2758, 2744, 2745, 2759, 2746, 2760, 2747, 2748, +- 2749, 2750, 2761, 2751, 2762, 2763, 2764, 2581, 1949, 2767, +- 2581, 2768, 2765, 2752, 2753, 2769, 2770, 2754, 2757, 2771, +- +- 2758, 2772, 2773, 2759, 2776, 2760, 2777, 2778, 2779, 2780, +- 2761, 2359, 2762, 2763, 2764, 2781, 2361, 2767, 2782, 2768, +- 2783, 2786, 2785, 2769, 2770, 2785, 2358, 2771, 2787, 2772, +- 2773, 2360, 2776, 2788, 2777, 2778, 2779, 2780, 2789, 2790, +- 2791, 2792, 2793, 2781, 2794, 2795, 2782, 2794, 2783, 2786, +- 2797, 2798, 2799, 2800, 2801, 2802, 2787, 2621, 2805, 2806, +- 2621, 2788, 2803, 2807, 2796, 2811, 2789, 2790, 2791, 2792, +- 2793, 2625, 2813, 2795, 2625, 2814, 2626, 2815, 2797, 2798, +- 2799, 2800, 2801, 2802, 2816, 2817, 2805, 2806, 2818, 2819, +- 2820, 2807, 2796, 2811, 2821, 2822, 2823, 2824, 2825, 2826, +- +- 2813, 2827, 2828, 2814, 2829, 2815, 2830, 2831, 2832, 2833, +- 2834, 2837, 2816, 2817, 2838, 2839, 2818, 2819, 2820, 2840, +- 2841, 2842, 2821, 2822, 2823, 2824, 2825, 2826, 2843, 2827, +- 2828, 2844, 2829, 2845, 2830, 2831, 2832, 2833, 2834, 2837, +- 2846, 2847, 2838, 2839, 2848, 2849, 2850, 2840, 2841, 2842, +- 2851, 2852, 2853, 2854, 2855, 2856, 2843, 2857, 2858, 2844, +- 2859, 2845, 2860, 2486, 2861, 2862, 2863, 2864, 2846, 2847, +- 2865, 2866, 2848, 2849, 2850, 2867, 2509, 2298, 2851, 2852, +- 2853, 2854, 2855, 2856, 2954, 2857, 2858, 2954, 2859, 2507, +- 2860, 2500, 1947, 2862, 2863, 2864, 2876, 2869, 2865, 2866, +- +- 2869, 2502, 2869, 2867, 2502, 2879, 2502, 2870, 2487, 2076, +- 2871, 2874, 2506, 2877, 2504, 2298, 2892, 2881, 2891, 2698, +- 2869, 2510, 2696, 2869, 2872, 2869, 2893, 2990, 2693, 2500, +- 2883, 1945, 2502, 2871, 2894, 2502, 2955, 2502, 2990, 2955, +- 2785, 2878, 2886, 2785, 2892, 2895, 2890, 2884, 2896, 2298, +- 2880, 2897, 2873, 2898, 2893, 2502, 2506, 2899, 2502, 2700, +- 2502, 2869, 2894, 2091, 2869, 2703, 2869, 2502, 2504, 2900, +- 2502, 2870, 2502, 2895, 2871, 2885, 2896, 2889, 2901, 2897, +- 2504, 2898, 2704, 2902, 2903, 2899, 2904, 2887, 2872, 2905, +- 2906, 2907, 2908, 2909, 2704, 2910, 2911, 2900, 2912, 2913, +- +- 2914, 2915, 2916, 2917, 2918, 2919, 2901, 2920, 2921, 2922, +- 2705, 2902, 2903, 2923, 2904, 2924, 2873, 2905, 2906, 2907, +- 2908, 2909, 2890, 2910, 2911, 2925, 2912, 2913, 2914, 2915, +- 2916, 2917, 2918, 2919, 2926, 2920, 2921, 2922, 2927, 2928, +- 2929, 2923, 2930, 2924, 2931, 2932, 2934, 2935, 2936, 2937, +- 2938, 2939, 2940, 2925, 2941, 2943, 2944, 2945, 2946, 2947, +- 2948, 2949, 2926, 2951, 2952, 2953, 2927, 2928, 2929, 2956, +- 2930, 2957, 2931, 2932, 2934, 2935, 2936, 2937, 2938, 2939, +- 2940, 2958, 2941, 2943, 2944, 2945, 2946, 2947, 2948, 2949, +- 2959, 2951, 2952, 2953, 2960, 2962, 2967, 2956, 2968, 2957, +- +- 2969, 2970, 2794, 2963, 2964, 2794, 2965, 2971, 2966, 2958, +- 2973, 2974, 2975, 2976, 2977, 2978, 2979, 2980, 2959, 2982, +- 2983, 2984, 2988, 2962, 2967, 2961, 2968, 2989, 2969, 2970, +- 2991, 2963, 2964, 2994, 2965, 2993, 2966, 2995, 2973, 2974, +- 2975, 2976, 2977, 2978, 2979, 2980, 2993, 2982, 2983, 2984, +- 2988, 2996, 2997, 2961, 2998, 2989, 2999, 3000, 2991, 3003, +- 3005, 2994, 3006, 3007, 3008, 2995, 3009, 3010, 3011, 3012, +- 3013, 3014, 3015, 3004, 3016, 3017, 3018, 3009, 3019, 2996, +- 2997, 3020, 2998, 3021, 2999, 3000, 3022, 3003, 3005, 3023, +- 3006, 3007, 3008, 3024, 3025, 3010, 3011, 3012, 3013, 3014, +- +- 3015, 3026, 3016, 3017, 3018, 3027, 3019, 3028, 3029, 3020, +- 3030, 3021, 3031, 3032, 3022, 3033, 3034, 3023, 3035, 3036, +- 3037, 3024, 3025, 2486, 3038, 3039, 3040, 3041, 3047, 3026, +- 1917, 3043, 1912, 3027, 1902, 3028, 3029, 3064, 3030, 3107, +- 3031, 3032, 3107, 3033, 3034, 2877, 3035, 3036, 3037, 3044, +- 3065, 1526, 3038, 3039, 3040, 3041, 2509, 2869, 3047, 3043, +- 2869, 2869, 2869, 3066, 2869, 3064, 2869, 3045, 2285, 2869, +- 2871, 3050, 2869, 3048, 2869, 2877, 1897, 3044, 3065, 3045, +- 2869, 3056, 2871, 2869, 2872, 2869, 3067, 2695, 3051, 2695, +- 3053, 3066, 2502, 2871, 3068, 2502, 2872, 2502, 2877, 3069, +- +- 3149, 2303, 2692, 3048, 2696, 2504, 2696, 2872, 3070, 1715, +- 2869, 3149, 3046, 2869, 3067, 2869, 3052, 1886, 3071, 2693, +- 3058, 1849, 3068, 2871, 3046, 1831, 3057, 3069, 2869, 3072, +- 1759, 2869, 2697, 2869, 2880, 3054, 3070, 2884, 3058, 2869, +- 2502, 2871, 2869, 2502, 2869, 2502, 3071, 2694, 2502, 3061, +- 2699, 2502, 2871, 2502, 3073, 2884, 1395, 3072, 2699, 2502, +- 3074, 3075, 2502, 3076, 2502, 3059, 2884, 2700, 3077, 2703, +- 1574, 2502, 2504, 3078, 2502, 2700, 2502, 3079, 3080, 3081, +- 3082, 2703, 3073, 3059, 2504, 3083, 2704, 3084, 3074, 3075, +- 3085, 3076, 3086, 3087, 3062, 2701, 3077, 3088, 2704, 3089, +- +- 3090, 3078, 3091, 2887, 3092, 3079, 3080, 3081, 3082, 3093, +- 3094, 3095, 3096, 3083, 2705, 3084, 3097, 3098, 3085, 3099, +- 3086, 3087, 3100, 3102, 3103, 3088, 2890, 3089, 3090, 3104, +- 3091, 3105, 3092, 3106, 3108, 3109, 3110, 3093, 3094, 3095, +- 3096, 3111, 3116, 3113, 3097, 3098, 3113, 3099, 3117, 3119, +- 3100, 3102, 3103, 2955, 3120, 3121, 2955, 3104, 3114, 3105, +- 3122, 3106, 3108, 3109, 3110, 3123, 3124, 3125, 3128, 3111, +- 3116, 3129, 3134, 3135, 3129, 3136, 3117, 3119, 3126, 3127, +- 3130, 3138, 3120, 3121, 3131, 3139, 3137, 3952, 3122, 3137, +- 3952, 3132, 3952, 3123, 3124, 3125, 3128, 3140, 3141, 3143, +- +- 3134, 3135, 3144, 3136, 3145, 3147, 3126, 3127, 3130, 3138, +- 3148, 3150, 3131, 3139, 3151, 3152, 3153, 3154, 3155, 3132, +- 3156, 3157, 3158, 3159, 3160, 3140, 3141, 3143, 3161, 3162, +- 3144, 3163, 3145, 3147, 3164, 3165, 3166, 3167, 3148, 3150, +- 3168, 3169, 3151, 3152, 3153, 3154, 3155, 3170, 3156, 3157, +- 3158, 3159, 3160, 3171, 3172, 3173, 3161, 3162, 3174, 3163, +- 3175, 3177, 3164, 3165, 3166, 3167, 3178, 3180, 3168, 3169, +- 3181, 3175, 3182, 1735, 3183, 3170, 3184, 3178, 3186, 1731, +- 3187, 3171, 3172, 3173, 3188, 3189, 3174, 3190, 3191, 3177, +- 3192, 3193, 3195, 3196, 3197, 3180, 3199, 3200, 3181, 1718, +- +- 3182, 3176, 3183, 2507, 3184, 1717, 3186, 3179, 3187, 3198, +- 3202, 3054, 3188, 3189, 2298, 3190, 3191, 1715, 3192, 3193, +- 3195, 3196, 3197, 2869, 3199, 3200, 2869, 2877, 2869, 2869, +- 2695, 3203, 2869, 3201, 2869, 2869, 2871, 3198, 2869, 3058, +- 2869, 2502, 2871, 3213, 2502, 3204, 2502, 2696, 3399, 3047, +- 2872, 2703, 3214, 1657, 2504, 3057, 2884, 3215, 3062, 3399, +- 2869, 2298, 3051, 2869, 2869, 2869, 2877, 2869, 2704, 2869, +- 3045, 3213, 1656, 2871, 3208, 3207, 2502, 2871, 3054, 2502, +- 3214, 2502, 3216, 3217, 3059, 3215, 3210, 2872, 3218, 2504, +- 3205, 2884, 3219, 3220, 3057, 2869, 3206, 3221, 2869, 3222, +- +- 2869, 3223, 3224, 3211, 3225, 3058, 3226, 3227, 2871, 3228, +- 3216, 3217, 3229, 3230, 3231, 3054, 3218, 3232, 3233, 3062, +- 3219, 3220, 2884, 3234, 3235, 3221, 3236, 3222, 3237, 3223, +- 3224, 3212, 3225, 3238, 3226, 3227, 3239, 3228, 3240, 3239, +- 3229, 3230, 3231, 3241, 3242, 3232, 3233, 3243, 3244, 3245, +- 3062, 3234, 3235, 3246, 3236, 3247, 3237, 3250, 3495, 3113, +- 3250, 3238, 3113, 3714, 1646, 3249, 3240, 3107, 3251, 3495, +- 3107, 3241, 3242, 3253, 3254, 3243, 3244, 3245, 3256, 3257, +- 3258, 3246, 3259, 3247, 3248, 3248, 3248, 3248, 3248, 3248, +- 3248, 3248, 3248, 3249, 3952, 3260, 3251, 3952, 3261, 3952, +- +- 3262, 3253, 3254, 3263, 3264, 3265, 3256, 3257, 3258, 3275, +- 3259, 3352, 3275, 3715, 3352, 3267, 3268, 3129, 3269, 3271, +- 3129, 3272, 3273, 3260, 3276, 3277, 3261, 3278, 3262, 3279, +- 3280, 3263, 3264, 3265, 3266, 3266, 3266, 3266, 3266, 3266, +- 3266, 3266, 3266, 3267, 3268, 3281, 3269, 3271, 3282, 3272, +- 3273, 3283, 3276, 3277, 3284, 3278, 3285, 3279, 3280, 3286, +- 3287, 3288, 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3297, +- 3298, 3299, 3300, 3281, 3302, 3303, 3282, 3304, 3305, 3283, +- 3306, 3307, 3284, 3308, 3285, 3312, 3313, 3286, 3287, 3288, +- 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3297, 3298, 3299, +- +- 3300, 3310, 3302, 3303, 3314, 3304, 3305, 3315, 3306, 3307, +- 3316, 3308, 3310, 3312, 3313, 3317, 3318, 3319, 3320, 3321, +- 3322, 3323, 3324, 3325, 3327, 3383, 2869, 3334, 3383, 2869, +- 3335, 2869, 3314, 1645, 3326, 3315, 3045, 3047, 3316, 2871, +- 3329, 1644, 3311, 3317, 3318, 3319, 3320, 3321, 3322, 3323, +- 3324, 3325, 3327, 2872, 2877, 3334, 2869, 2696, 3335, 2869, +- 2869, 2869, 3326, 2869, 2502, 2869, 3050, 2502, 3336, 2502, +- 3050, 1580, 3275, 3337, 3328, 3275, 3338, 2504, 3339, 3340, +- 3341, 3046, 3048, 3051, 3342, 2880, 3343, 3051, 1579, 2869, +- 2502, 2704, 2869, 2502, 2869, 2502, 3336, 1574, 1550, 3058, +- +- 3210, 3337, 2871, 2504, 3338, 1549, 3339, 3340, 3341, 3344, +- 3345, 3052, 3342, 3346, 3343, 3205, 2884, 3211, 3347, 2890, +- 2869, 2502, 3348, 2869, 2502, 2869, 2502, 3349, 3350, 3351, +- 2883, 3332, 3353, 2871, 2504, 3354, 3357, 3344, 3345, 3358, +- 3359, 3346, 3360, 3361, 3059, 3330, 3347, 2884, 3211, 3239, +- 3348, 3362, 3239, 3363, 3355, 3349, 3350, 3351, 3364, 3392, +- 3353, 3500, 3392, 3354, 3357, 1546, 1545, 3358, 3359, 3365, +- 3360, 3361, 3500, 1544, 3370, 2885, 3333, 3370, 1543, 3362, +- 3367, 3363, 3250, 3369, 3373, 3250, 3364, 3248, 3248, 3248, +- 3248, 3248, 3248, 3248, 3248, 3248, 3374, 3365, 3375, 3366, +- +- 3366, 3366, 3366, 3366, 3366, 3366, 3366, 3366, 3367, 3376, +- 3377, 3369, 3373, 3378, 3379, 3380, 3381, 3382, 3384, 3385, +- 3371, 3386, 3387, 3388, 3374, 3389, 3375, 3266, 3266, 3266, +- 3266, 3266, 3266, 3266, 3266, 3266, 3390, 3376, 3377, 3391, +- 3393, 3378, 3379, 3380, 3381, 3382, 3384, 3385, 3371, 3386, +- 3387, 3388, 3394, 3389, 3395, 3394, 3396, 3397, 3398, 3400, +- 3401, 3402, 3403, 3405, 3390, 3406, 3407, 3391, 3393, 3408, +- 3409, 3412, 3413, 3414, 3415, 3417, 3418, 3419, 3714, 3422, +- 3423, 3424, 3395, 3425, 3396, 3397, 3398, 3400, 3401, 3402, +- 3403, 3405, 3426, 3406, 3407, 3427, 3428, 3408, 3409, 3412, +- +- 3413, 3414, 3415, 3417, 3418, 3419, 3420, 3422, 3423, 3424, +- 3429, 3425, 3430, 3432, 3421, 3433, 3434, 3435, 3436, 3437, +- 3426, 1542, 2869, 3427, 3428, 2869, 3333, 2869, 3647, 2298, +- 3439, 3047, 3045, 3453, 3420, 2871, 3453, 1540, 3429, 3440, +- 3430, 3432, 3421, 3433, 3434, 3435, 3436, 3437, 2877, 2872, +- 1117, 2502, 2869, 3441, 2502, 2869, 2502, 2869, 3439, 3442, +- 3443, 3438, 3058, 3444, 2504, 2871, 3445, 3440, 3446, 874, +- 2502, 3447, 3448, 2502, 3449, 2502, 2878, 2873, 3211, 2884, +- 3210, 3441, 3450, 2504, 3451, 3454, 3456, 3442, 3443, 3479, +- 3480, 3444, 3479, 3480, 3445, 1485, 3446, 3211, 3352, 3447, +- +- 3448, 3352, 3449, 1476, 1474, 3481, 3333, 2885, 3481, 1469, +- 3450, 3766, 3451, 3454, 3456, 3452, 3452, 3452, 3452, 3452, +- 3452, 3452, 3452, 3452, 3457, 3333, 3455, 3455, 3455, 3455, +- 3455, 3455, 3455, 3455, 3455, 3455, 3455, 3356, 3356, 3356, +- 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3458, 3459, +- 3460, 3455, 3457, 3461, 3462, 3463, 3464, 3465, 3466, 3468, +- 3469, 3647, 3356, 3366, 3366, 3366, 3366, 3366, 3366, 3366, +- 3366, 3366, 3370, 3470, 3471, 3370, 3458, 3459, 3460, 3472, +- 3473, 3461, 3462, 3463, 3464, 3465, 3466, 3468, 3469, 3467, +- 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3474, 3475, +- +- 3476, 3470, 3471, 3477, 3482, 3483, 3484, 3472, 3473, 3484, +- 3485, 3486, 3487, 3489, 3490, 3492, 3489, 3490, 3493, 3494, +- 3497, 3498, 3499, 1464, 1406, 1405, 3474, 3475, 3476, 540, +- 3733, 3477, 3482, 3483, 3394, 3501, 3502, 3394, 3485, 3486, +- 3487, 3733, 3506, 3492, 3507, 3508, 3493, 3494, 3497, 3498, +- 3499, 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3491, +- 3503, 3509, 3510, 3501, 3502, 3511, 3512, 3513, 3504, 3505, +- 3506, 3514, 3507, 3508, 3515, 3516, 3517, 3518, 3519, 3520, +- 3521, 3522, 3523, 3524, 3525, 3526, 3525, 3527, 3503, 3509, +- 3510, 3528, 3530, 3511, 3512, 3513, 3504, 3505, 3531, 3514, +- +- 538, 3532, 3515, 3516, 3517, 3518, 3519, 3520, 3521, 3522, +- 3523, 3524, 3533, 3526, 3534, 3527, 3535, 533, 2502, 3528, +- 3530, 2502, 3536, 2502, 3537, 3538, 3531, 3541, 3210, 3532, +- 3541, 2504, 3479, 3564, 3489, 3479, 3564, 3576, 3565, 3543, +- 3533, 531, 3534, 516, 3535, 3211, 3544, 3545, 3546, 3547, +- 3536, 3548, 3537, 3538, 3549, 514, 3525, 3452, 3452, 3452, +- 3452, 3452, 3452, 3452, 3452, 3452, 3453, 3543, 3542, 3453, +- 510, 3539, 1396, 3330, 3544, 3545, 3546, 3547, 3550, 3548, +- 3551, 3552, 3549, 3540, 3540, 3540, 3540, 3540, 3540, 3540, +- 3540, 3540, 3455, 3455, 3455, 3455, 3455, 3455, 3455, 3455, +- +- 3455, 3455, 3455, 3553, 3554, 3555, 3550, 3556, 3551, 3552, +- 3557, 1392, 3559, 3557, 3560, 3561, 3562, 3455, 3467, 3467, +- 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3569, 3570, 3572, +- 3573, 3553, 3554, 3555, 3574, 3556, 3578, 1386, 3581, 3558, +- 3559, 3734, 3560, 3561, 3562, 3567, 3484, 3952, 3567, 3484, +- 3568, 3571, 3734, 1355, 1347, 3569, 3570, 3572, 3573, 3579, +- 3490, 3582, 3574, 3490, 3578, 3580, 3581, 3558, 3491, 3491, +- 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3577, 3577, 3577, +- 3577, 3577, 3577, 3577, 3577, 3577, 3583, 3579, 3584, 3582, +- 3585, 3586, 3587, 3580, 3588, 3589, 3591, 3593, 3594, 3595, +- +- 3596, 3597, 3598, 3600, 3601, 3604, 3605, 3618, 3624, 3628, +- 3618, 3624, 3628, 1336, 3583, 431, 3584, 418, 3585, 3586, +- 3587, 3607, 3588, 3589, 3591, 3593, 3594, 3595, 3596, 3597, +- 3598, 3600, 3601, 3604, 3605, 3606, 3606, 3606, 3606, 3606, +- 3606, 3606, 3606, 3606, 3606, 3606, 3608, 3609, 3612, 3607, +- 3613, 3614, 3615, 3616, 3617, 3690, 3693, 414, 3690, 3693, +- 3606, 3619, 3619, 3619, 3619, 3619, 3619, 3619, 3619, 3619, +- 3621, 3622, 3623, 3625, 3608, 3609, 3612, 3626, 3613, 3614, +- 3615, 3616, 3617, 3540, 3540, 3540, 3540, 3540, 3540, 3540, +- 3540, 3540, 3541, 3627, 3629, 3541, 3630, 3631, 3621, 3622, +- +- 3623, 3625, 3632, 3633, 3635, 3626, 3636, 3637, 3640, 3620, +- 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 399, 395, +- 3557, 3627, 3629, 3557, 3630, 3631, 3638, 373, 3643, 3638, +- 3632, 3633, 3635, 3644, 3636, 3637, 3640, 3634, 3634, 3634, +- 3634, 3634, 3634, 3634, 3634, 3634, 3564, 3567, 3648, 3564, +- 3567, 3565, 3568, 3649, 3650, 3639, 3643, 3628, 369, 363, +- 3628, 3644, 3697, 3690, 3693, 3652, 3690, 3693, 3747, 3750, +- 3575, 3805, 3806, 359, 3805, 3806, 3648, 3489, 355, 1278, +- 3576, 3649, 3650, 3639, 3651, 3651, 3651, 3651, 3651, 3651, +- 3651, 3651, 3651, 3652, 3651, 3651, 3651, 3651, 3651, 3651, +- +- 3651, 3651, 3651, 3577, 3577, 3577, 3577, 3577, 3577, 3577, +- 3577, 3577, 3653, 3654, 3655, 3657, 3658, 3659, 3660, 3661, +- 3662, 3663, 3664, 3665, 3666, 3667, 3668, 3669, 3670, 3672, +- 3675, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, +- 3653, 3654, 3655, 3657, 3658, 3659, 3660, 3661, 3662, 3663, +- 3664, 3665, 3666, 3667, 3668, 3669, 3670, 3672, 3675, 3606, +- 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, +- 3676, 3677, 3678, 3680, 3681, 3682, 3684, 3952, 3685, 3684, +- 3952, 3686, 3952, 1217, 3606, 3689, 3691, 3838, 3695, 3685, +- 3838, 3698, 3688, 3699, 3700, 3701, 3702, 3703, 3676, 3677, +- +- 3678, 3680, 3681, 3682, 3619, 3619, 3619, 3619, 3619, 3619, +- 3619, 3619, 3619, 3689, 3691, 3624, 3695, 3844, 3624, 3698, +- 3844, 3699, 3700, 3701, 3702, 3703, 3704, 3706, 3707, 3710, +- 3717, 3718, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, +- 3692, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, +- 3638, 3719, 3782, 3638, 3704, 3706, 3707, 3710, 3717, 3718, +- 3687, 3720, 3721, 3782, 1216, 1200, 1191, 3705, 3705, 3705, +- 3705, 3705, 3705, 3705, 3705, 3705, 3711, 3575, 3722, 3719, +- 3712, 3723, 3724, 3725, 3726, 3727, 3728, 3713, 3729, 3720, +- 3721, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, +- +- 3730, 3731, 3732, 3735, 3711, 3736, 3722, 3740, 3712, 3723, +- 3724, 3725, 3726, 3727, 3728, 3713, 3729, 3742, 3743, 3744, +- 3746, 3685, 3749, 3685, 3685, 1179, 3952, 1158, 3730, 3731, +- 3732, 3735, 3753, 3736, 3685, 3740, 3684, 3754, 3685, 3684, +- 3755, 3686, 3756, 3757, 3758, 3742, 3743, 3744, 3746, 3685, +- 3749, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, +- 3753, 3759, 3760, 3761, 3762, 3754, 3763, 3764, 3755, 3765, +- 3756, 3757, 3758, 3705, 3705, 3705, 3705, 3705, 3705, 3705, +- 3705, 3705, 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3759, +- 3760, 3761, 3762, 3774, 3763, 3764, 3775, 3765, 3776, 3777, +- +- 3778, 3779, 3780, 3781, 3783, 3687, 3784, 3785, 3788, 3792, +- 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3795, 3786, 3796, +- 3687, 3774, 3797, 3798, 3775, 3799, 3776, 3777, 3778, 3779, +- 3780, 3781, 3783, 3800, 3784, 3785, 3788, 3952, 3801, 3802, +- 3952, 3803, 3952, 3807, 3803, 3795, 3786, 3796, 3808, 3714, +- 3797, 3798, 3809, 3799, 3810, 3811, 3812, 3813, 3814, 3793, +- 3827, 3800, 3815, 3816, 3817, 3818, 3801, 3802, 3819, 3821, +- 3822, 3807, 3823, 3824, 3825, 3827, 3808, 3830, 3831, 3832, +- 3809, 3833, 3810, 3811, 3812, 3813, 3814, 3834, 3804, 3835, +- 3815, 3816, 3817, 3818, 3836, 3839, 3819, 3821, 3822, 3715, +- +- 3823, 3824, 3825, 3846, 3847, 3830, 3831, 3832, 3805, 3833, +- 3828, 3805, 3848, 3841, 3849, 3834, 3804, 3835, 3850, 3852, +- 3853, 3806, 3836, 3839, 3806, 3793, 3843, 3845, 3854, 3855, +- 3845, 3846, 3847, 3856, 3857, 3860, 3861, 3862, 3863, 3861, +- 3848, 3864, 3849, 3865, 3866, 3867, 3850, 3852, 3853, 3868, +- 3838, 3869, 1142, 3838, 3876, 3952, 3854, 3855, 3952, 3827, +- 3952, 3856, 3857, 3860, 3877, 3952, 3863, 3878, 3952, 3864, +- 3952, 3865, 3866, 3867, 3879, 3844, 3880, 3868, 3844, 3869, +- 3873, 3845, 3876, 3881, 3845, 3882, 3875, 3793, 3883, 3884, +- 3893, 3895, 3877, 3891, 3885, 3878, 3891, 3894, 3892, 3896, +- +- 3894, 3898, 3879, 3897, 3880, 3886, 3897, 3952, 3887, 3828, +- 3952, 3881, 3952, 3882, 3903, 3904, 3883, 3884, 3893, 3895, +- 3952, 3905, 3885, 3952, 3906, 3952, 3907, 3896, 3908, 3898, +- 3909, 3910, 3911, 3886, 3912, 3913, 3887, 3916, 3919, 662, +- 1117, 3891, 3903, 3904, 3891, 3918, 3892, 645, 3918, 3905, +- 3894, 385, 3906, 3894, 3907, 385, 3908, 874, 3909, 3910, +- 3911, 3897, 3912, 3913, 3897, 3916, 3919, 3917, 3917, 3917, +- 3917, 3917, 3917, 3917, 3917, 3917, 3921, 3924, 3920, 3920, +- 3920, 3920, 3920, 3920, 3920, 3920, 3920, 3925, 3926, 3927, +- 3928, 3929, 3930, 3931, 3917, 3917, 3917, 3917, 3917, 3917, +- +- 3917, 3917, 3917, 1073, 3921, 3924, 3918, 3934, 1062, 3918, +- 3934, 1054, 1051, 3935, 3936, 3925, 3926, 3927, 3928, 3929, +- 3930, 3931, 3937, 3933, 3933, 3933, 3933, 3933, 3933, 3933, +- 3933, 3933, 3920, 3920, 3920, 3920, 3920, 3920, 3920, 3920, +- 3920, 3935, 3936, 3938, 3940, 3941, 3943, 3944, 3945, 1009, +- 3937, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, +- 3934, 540, 538, 3934, 1007, 533, 531, 3946, 3947, 3948, +- 3949, 3938, 3940, 3941, 3943, 3944, 3945, 3942, 3942, 3942, +- 3942, 3942, 3942, 3942, 3942, 3942, 3942, 3942, 3942, 3942, +- 3942, 3942, 3942, 3942, 3942, 3946, 3947, 3948, 3949, 3950, +- +- 3951, 1001, 516, 514, 999, 510, 994, 986, 977, 976, +- 946, 935, 923, 913, 431, 910, 418, 414, 662, 883, +- 399, 395, 645, 865, 373, 369, 862, 3950, 3951, 76, +- 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, +- 76, 76, 76, 76, 76, 76, 76, 98, 98, 98, ++ 2222, 2223, 2240, 2248, 2224, 2225, 2226, 2241, 2227, 2249, ++ ++ 2250, 2228, 2251, 2229, 2242, 2252, 2253, 2254, 2243, 2244, ++ 2255, 2245, 2257, 2258, 2259, 2246, 2260, 2247, 2263, 2264, ++ 2265, 2248, 2266, 2267, 2268, 2269, 2270, 2249, 2250, 2271, ++ 2251, 2272, 2273, 2252, 2253, 2254, 2274, 2279, 2255, 2285, ++ 2257, 2258, 2259, 2280, 2260, 2281, 2263, 2264, 2265, 2282, ++ 2266, 2267, 2268, 2269, 2270, 2287, 2300, 2271, 2288, 2272, ++ 2273, 2289, 2290, 2291, 2274, 2279, 2303, 2292, 2293, 2294, ++ 2295, 2280, 2296, 2281, 2300, 2305, 2306, 2307, 2308, 2309, ++ 2310, 2311, 2312, 2287, 2286, 2313, 2288, 2314, 2325, 2289, ++ 2290, 2291, 2490, 2076, 2076, 2292, 2293, 2294, 2295, 2487, ++ ++ 2296, 2301, 2326, 2305, 2306, 2307, 2308, 2309, 2310, 2311, ++ 2312, 2304, 2315, 2313, 2316, 2314, 2325, 2472, 2428, 2091, ++ 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2428, ++ 2326, 2463, 2327, 2328, 2330, 2362, 2331, 2332, 2329, 2334, ++ 2315, 2335, 2316, 2317, 2317, 2317, 2317, 2317, 2317, 2317, ++ 2317, 2317, 2336, 2337, 2338, 2318, 2339, 2319, 2320, 2321, ++ 2327, 2328, 2330, 2322, 2331, 2332, 2329, 2334, 2323, 2335, ++ 2340, 2341, 2342, 2343, 2344, 2345, 2346, 2324, 2347, 2348, ++ 2336, 2337, 2338, 2318, 2339, 2319, 2320, 2321, 2349, 2350, ++ 2351, 2322, 2352, 2353, 2354, 2355, 2323, 2356, 2340, 2341, ++ ++ 2342, 2343, 2344, 2345, 2346, 2324, 2347, 2348, 2357, 2358, ++ 2144, 2145, 2146, 2144, 2145, 2146, 2349, 2350, 2351, 2363, ++ 2352, 2353, 2354, 2355, 2364, 2356, 2147, 2145, 2148, 2147, ++ 2145, 2148, 2365, 2366, 2367, 2376, 2357, 2358, 2377, 2378, ++ 2360, 2379, 2380, 2381, 2382, 2383, 2384, 2363, 2385, 2390, ++ 2388, 2391, 2364, 2388, 2392, 2393, 2488, 2262, 2394, 2395, ++ 2365, 2366, 2367, 2376, 2396, 1947, 2377, 2378, 1947, 2379, ++ 2380, 2381, 2382, 2383, 2384, 2397, 2385, 2390, 2398, 2391, ++ 2399, 1949, 2392, 2393, 1949, 2368, 2394, 2395, 2368, 2261, ++ 2389, 2256, 2396, 2401, 2402, 2403, 2404, 2405, 2406, 2407, ++ ++ 2408, 2489, 2409, 2397, 2369, 2165, 2398, 2410, 2399, 2412, ++ 2413, 2414, 2415, 2417, 2418, 2419, 2420, 2370, 2389, 2371, ++ 2421, 2401, 2402, 2403, 2404, 2405, 2406, 2407, 2408, 2372, ++ 2409, 2373, 2374, 2375, 2423, 2410, 2424, 2412, 2413, 2414, ++ 2415, 2417, 2418, 2419, 2420, 2370, 2422, 2371, 2421, 2422, ++ 2425, 2426, 2427, 2430, 2429, 2431, 2432, 2372, 2433, 2373, ++ 2374, 2375, 2423, 2434, 2424, 2429, 2435, 2437, 2438, 2439, ++ 2440, 2441, 2442, 2443, 2444, 2436, 2445, 2446, 2425, 2426, ++ 2427, 2430, 2447, 2431, 2432, 2450, 2433, 2451, 2448, 2452, ++ 2453, 2434, 2454, 2455, 2435, 2437, 2438, 2439, 2440, 2441, ++ ++ 2442, 2443, 2444, 2449, 2445, 2446, 2456, 2457, 2458, 2459, ++ 2447, 2460, 2461, 2450, 2462, 2451, 2448, 2452, 2453, 2464, ++ 2454, 2455, 2465, 2466, 2467, 2468, 2469, 2470, 2471, 2473, ++ 2474, 2449, 2475, 2476, 2456, 2457, 2458, 2459, 2477, 2460, ++ 2461, 2478, 2462, 2479, 2480, 2481, 2484, 2464, 2485, 2486, ++ 2465, 2466, 2467, 2468, 2469, 2470, 2471, 2473, 2474, 2491, ++ 2475, 2476, 2493, 2494, 2495, 2496, 2477, 2497, 2498, 2478, ++ 2499, 2479, 2480, 2481, 2484, 2500, 2485, 2486, 2501, 2511, ++ 2514, 2516, 2517, 2150, 2504, 2518, 2519, 2504, 2520, 2504, ++ 2493, 2494, 2495, 2496, 2505, 2497, 2498, 2506, 2499, 2521, ++ ++ 2522, 2523, 2524, 2500, 2492, 2525, 2501, 2526, 2528, 2516, ++ 2517, 2507, 2529, 2518, 2519, 2368, 2520, 1949, 2368, 1947, ++ 2572, 2114, 2530, 2533, 2512, 2515, 2531, 2521, 2522, 2523, ++ 2524, 2532, 2534, 2525, 2527, 2526, 2528, 2535, 2536, 2508, ++ 2529, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, ++ 2530, 2533, 2537, 2538, 2531, 2539, 2540, 2541, 2542, 2532, ++ 2534, 2543, 2544, 2545, 2546, 2535, 2536, 2547, 2548, 2549, ++ 2550, 2551, 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, ++ 2537, 2538, 2561, 2539, 2540, 2541, 2542, 2088, 2567, 2543, ++ 2544, 2545, 2546, 2568, 2571, 2547, 2548, 2549, 2550, 2551, ++ ++ 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, 2563, 2564, ++ 2561, 2563, 2566, 2564, 2575, 2566, 2567, 2569, 2578, 2576, ++ 2574, 2568, 2571, 2574, 2570, 2577, 2579, 2580, 2581, 2582, ++ 2583, 2584, 2585, 2583, 2586, 2087, 2587, 2588, 2589, 2994, ++ 2590, 2591, 2575, 1899, 2595, 2569, 2578, 2576, 2049, 2596, ++ 2994, 2597, 2570, 2577, 2579, 2580, 2581, 2582, 2598, 2584, ++ 2585, 2599, 2586, 2360, 2587, 2588, 2589, 2362, 2590, 2591, ++ 3965, 2388, 2595, 3965, 2388, 3965, 2593, 2596, 2359, 2597, ++ 2600, 2601, 2361, 2602, 2603, 2604, 2598, 2603, 2606, 2599, ++ 2607, 2608, 2609, 2610, 2611, 2612, 2613, 2614, 2615, 2616, ++ ++ 2617, 2618, 2619, 2621, 2622, 2624, 2625, 2623, 2600, 2601, ++ 2623, 2602, 2627, 2604, 2629, 2627, 2606, 2628, 2607, 2608, ++ 2609, 2610, 2611, 2612, 2613, 2614, 2615, 2616, 2617, 2618, ++ 2619, 2621, 2622, 2624, 2625, 2630, 2631, 2632, 2633, 2634, ++ 2635, 2637, 2629, 2639, 2641, 2642, 2643, 2644, 2645, 2646, ++ 2647, 2649, 2650, 2651, 2639, 2652, 2020, 2653, 2654, 2655, ++ 2656, 2657, 2658, 2630, 2631, 2632, 2633, 2634, 2635, 2637, ++ 2660, 2661, 2641, 2642, 2643, 2644, 2645, 2646, 2647, 2649, ++ 2650, 2651, 2662, 2652, 2640, 2653, 2654, 2655, 2656, 2657, ++ 2658, 2663, 2664, 2665, 2666, 2667, 2668, 2669, 2660, 2661, ++ ++ 2670, 2671, 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, ++ 2662, 2681, 2682, 2684, 2282, 2488, 2686, 2687, 2688, 2663, ++ 2664, 2665, 2666, 2667, 2668, 2669, 2689, 2690, 2670, 2671, ++ 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, 2691, 2681, ++ 2682, 2692, 2693, 2299, 2686, 2687, 2688, 2698, 2712, 2710, ++ 2997, 1949, 2300, 2511, 2689, 2690, 1947, 2502, 2492, 2685, ++ 2492, 2997, 2504, 2713, 2699, 2504, 2691, 2504, 2504, 2692, ++ 2693, 2504, 2695, 2504, 2504, 2506, 2712, 2504, 2702, 2504, ++ 2714, 2715, 1945, 2504, 2706, 2701, 2504, 2506, 2504, 2696, ++ 1905, 2713, 2700, 2695, 2515, 2703, 2506, 2711, 2515, 2716, ++ ++ 2717, 2707, 2718, 2719, 2720, 2721, 2722, 2723, 2714, 2715, ++ 2696, 2724, 2725, 2726, 2727, 2728, 2729, 2697, 1905, 2730, ++ 2731, 2732, 2733, 2704, 2734, 2735, 2736, 2716, 2717, 2708, ++ 2718, 2719, 2720, 2721, 2722, 2723, 2737, 2738, 2508, 2724, ++ 2725, 2726, 2727, 2728, 2729, 2739, 2740, 2730, 2731, 2732, ++ 2733, 2741, 2734, 2735, 2736, 2742, 2744, 2746, 2747, 2748, ++ 2749, 2750, 2751, 2752, 2737, 2738, 2753, 2563, 2564, 2754, ++ 2563, 2755, 2756, 2739, 2740, 2566, 2564, 2757, 2566, 2741, ++ 2760, 2761, 2762, 2742, 2744, 2746, 2747, 2748, 2749, 2750, ++ 2751, 2752, 2574, 2763, 2753, 2574, 2764, 2754, 2765, 2755, ++ ++ 2756, 2766, 1917, 2767, 2770, 2757, 2771, 2772, 2760, 2761, ++ 2762, 2583, 2773, 2774, 2583, 2775, 2768, 1912, 2776, 2779, ++ 2780, 2763, 2360, 2781, 2764, 2782, 2765, 2783, 2784, 2766, ++ 2362, 2767, 2770, 2789, 2771, 2772, 2785, 2359, 2786, 2788, ++ 2773, 2774, 2788, 2775, 2790, 2361, 2776, 2779, 2780, 2791, ++ 2792, 2781, 2793, 2782, 2794, 2783, 2784, 2795, 2796, 2797, ++ 2798, 2789, 2797, 2800, 2785, 2801, 2786, 2802, 2803, 2804, ++ 2805, 2623, 2790, 2810, 2623, 2814, 2806, 2791, 2792, 2799, ++ 2793, 2816, 2794, 2808, 2809, 2795, 2796, 2627, 2798, 2817, ++ 2627, 2800, 2628, 2801, 2818, 2802, 2803, 2804, 2805, 2819, ++ ++ 2820, 2810, 2821, 2814, 2822, 2823, 2824, 2799, 2825, 2816, ++ 2826, 2808, 2809, 2827, 2828, 2829, 2830, 2817, 2831, 2832, ++ 2833, 2834, 2818, 2835, 2836, 2837, 2838, 2819, 2820, 2841, ++ 2821, 2842, 2822, 2823, 2824, 2843, 2825, 2844, 2826, 2845, ++ 2846, 2827, 2828, 2829, 2830, 2847, 2831, 2832, 2833, 2834, ++ 2848, 2835, 2836, 2837, 2838, 2849, 2850, 2841, 2851, 2842, ++ 2852, 2853, 2854, 2843, 2855, 2844, 2856, 2845, 2846, 2857, ++ 2858, 2859, 2860, 2847, 2861, 2862, 2863, 2864, 2848, 2488, ++ 2865, 2866, 2867, 2849, 2850, 2868, 2851, 2869, 2852, 2853, ++ 2854, 2870, 2855, 2871, 2856, 1902, 2511, 2857, 2858, 2859, ++ ++ 2860, 2880, 2861, 2862, 2863, 2864, 2299, 2509, 2958, 2866, ++ 2867, 2958, 2883, 2868, 2508, 2869, 2895, 2299, 2881, 2870, ++ 2502, 2871, 1526, 2873, 2489, 2076, 2873, 2504, 2873, 2699, ++ 2504, 2502, 2504, 2874, 1897, 2885, 2875, 2878, 1715, 2873, ++ 2506, 2512, 2873, 1886, 2873, 2896, 2882, 2897, 2701, 2887, ++ 2876, 2898, 2875, 2504, 2696, 2899, 2504, 2884, 2504, 2504, ++ 2900, 2091, 2504, 2890, 2504, 1849, 2888, 2959, 2901, 2706, ++ 2959, 2873, 2506, 2896, 2873, 2897, 2873, 2902, 2877, 2898, ++ 2703, 2874, 2508, 2899, 2875, 2903, 2707, 2904, 2900, 1831, ++ 2504, 2905, 2906, 2504, 2889, 2504, 2901, 2907, 2876, 2908, ++ ++ 2893, 2909, 2910, 2506, 2911, 2902, 2912, 2913, 2891, 2914, ++ 2915, 2916, 2917, 2903, 2708, 2904, 2918, 2707, 2919, 2905, ++ 2906, 2920, 2921, 2922, 2923, 2907, 2877, 2908, 2924, 2909, ++ 2910, 2925, 2911, 2926, 2912, 2913, 2927, 2914, 2915, 2916, ++ 2917, 2928, 2929, 2930, 2918, 2894, 2919, 2931, 2932, 2920, ++ 2921, 2922, 2923, 2933, 2934, 2935, 2924, 2936, 2938, 2925, ++ 2939, 2926, 2940, 2941, 2927, 2942, 2943, 2944, 2945, 2928, ++ 2929, 2930, 2947, 2948, 2949, 2931, 2932, 2950, 2951, 2952, ++ 2953, 2933, 2934, 2935, 2955, 2936, 2938, 2956, 2939, 2957, ++ 2940, 2941, 2960, 2942, 2943, 2944, 2945, 2961, 2962, 2963, ++ ++ 2947, 2948, 2949, 2964, 2971, 2950, 2951, 2952, 2953, 2972, ++ 2788, 2973, 2955, 2788, 2974, 2956, 2797, 2957, 2977, 2797, ++ 2960, 2975, 2966, 2978, 2979, 2961, 2962, 2963, 2980, 2981, ++ 2967, 2968, 2971, 2969, 2965, 2970, 2982, 2972, 2983, 2973, ++ 2984, 2986, 2974, 2987, 2988, 2992, 2977, 2993, 2995, 2998, ++ 2966, 2978, 2979, 2999, 3000, 3001, 2980, 2981, 2967, 2968, ++ 3002, 2969, 2965, 2970, 2982, 3003, 2983, 3004, 2984, 2986, ++ 3007, 2987, 2988, 2992, 3009, 2993, 2995, 2998, 3010, 3011, ++ 3012, 2999, 3000, 3001, 3008, 3013, 3015, 3016, 3002, 3017, ++ 3018, 3019, 3020, 3003, 3021, 3004, 3013, 3022, 3007, 3023, ++ ++ 3024, 3025, 3009, 3026, 3027, 3028, 3010, 3011, 3012, 3029, ++ 3030, 3031, 3032, 3033, 3015, 3016, 3034, 3017, 3018, 3019, ++ 3020, 3035, 3021, 3036, 3037, 3022, 3038, 3023, 3024, 3025, ++ 3039, 3026, 3027, 3028, 3040, 3041, 3042, 3029, 3030, 3031, ++ 3032, 3033, 2488, 3043, 3034, 3044, 3045, 3046, 3048, 3035, ++ 3052, 3036, 3037, 2894, 3038, 1759, 2299, 3112, 3039, 3154, ++ 3112, 1395, 3040, 3041, 3042, 3069, 3049, 2881, 3052, 1574, ++ 3154, 3043, 2511, 3044, 3045, 3046, 3048, 3118, 2873, 2873, ++ 3118, 2873, 2873, 2873, 2873, 2881, 1735, 2286, 3050, 3055, ++ 3070, 2875, 3071, 3069, 3049, 3053, 1731, 2873, 2873, 3061, ++ ++ 2873, 2873, 2873, 2873, 2698, 2876, 3056, 3050, 3058, 2504, ++ 2875, 2875, 2504, 3053, 2504, 2698, 2881, 2304, 3070, 2695, ++ 3071, 2699, 2506, 3072, 2876, 2876, 3073, 3074, 3134, 3075, ++ 3076, 3134, 2699, 3051, 3057, 2873, 2696, 1718, 2873, 3077, ++ 2873, 1717, 1715, 3142, 3062, 3063, 3142, 3059, 2875, 2700, ++ 2299, 3072, 3051, 3059, 3073, 3074, 2873, 3075, 3076, 2873, ++ 2884, 2873, 2888, 1657, 2697, 2873, 3063, 3077, 2873, 2875, ++ 2873, 2504, 1656, 3078, 2504, 3066, 2504, 2504, 2875, 1646, ++ 2504, 2702, 2504, 2888, 3079, 1645, 2504, 2702, 3080, 2504, ++ 3064, 2504, 2888, 3081, 3082, 3083, 2706, 2504, 2703, 2506, ++ ++ 2504, 3078, 2504, 3084, 2703, 3085, 3086, 2706, 3087, 3088, ++ 2506, 3064, 3079, 2707, 3089, 3090, 3080, 3091, 3092, 3093, ++ 3067, 3081, 3082, 3083, 2707, 3094, 2704, 3095, 3096, 3097, ++ 3098, 3084, 2891, 3085, 3086, 3099, 3087, 3088, 3100, 3101, ++ 3102, 2708, 3089, 3090, 3103, 3091, 3092, 3093, 3104, 3105, ++ 3107, 3108, 2894, 3094, 3109, 3095, 3096, 3097, 3098, 3110, ++ 3111, 3113, 3114, 3099, 3115, 3116, 3100, 3101, 3102, 3121, ++ 2959, 3122, 3103, 2959, 3124, 3119, 3104, 3105, 3107, 3108, ++ 3125, 3126, 3109, 3127, 3128, 3129, 3133, 3110, 3111, 3113, ++ 3114, 3139, 3115, 3116, 3130, 3140, 3135, 3121, 3965, 3122, ++ ++ 3136, 3965, 3124, 3965, 3141, 3131, 3132, 3137, 3125, 3126, ++ 3143, 3127, 3128, 3129, 3133, 3144, 3145, 3146, 3148, 3139, ++ 3149, 3150, 3130, 3140, 3135, 3152, 3153, 3155, 3136, 3156, ++ 3157, 3158, 3141, 3131, 3132, 3137, 3159, 3160, 3143, 3161, ++ 3162, 3163, 3166, 3144, 3145, 3146, 3148, 3167, 3149, 3150, ++ 3164, 3165, 3168, 3152, 3153, 3155, 3169, 3156, 3157, 3158, ++ 3170, 3171, 3172, 3173, 3159, 3160, 3174, 3161, 3162, 3163, ++ 3166, 3175, 3176, 3177, 3178, 3167, 3179, 3180, 3164, 3165, ++ 3168, 3181, 3183, 3186, 3169, 3184, 3187, 3188, 3170, 3171, ++ 3172, 3173, 3181, 3189, 3174, 3190, 3184, 3192, 1644, 3175, ++ ++ 3176, 3177, 3178, 3193, 3179, 3180, 3194, 3195, 3196, 3197, ++ 3183, 3186, 3198, 3199, 3187, 3188, 3201, 3202, 3203, 3205, ++ 3206, 3189, 3182, 3190, 3067, 3192, 3185, 2299, 2509, 3219, ++ 3220, 3193, 3406, 3204, 3194, 3195, 3196, 3197, 3208, 3245, ++ 3198, 3199, 3245, 3406, 3201, 3202, 3203, 3205, 3206, 2873, ++ 3221, 2698, 2873, 3222, 2873, 2881, 3209, 3219, 3220, 3207, ++ 2873, 3204, 2875, 2873, 2873, 2873, 3223, 2873, 2699, 2873, ++ 3063, 3052, 2504, 2875, 3210, 2504, 2876, 2504, 3221, 3224, ++ 1580, 3222, 2706, 3062, 3225, 2506, 3226, 2888, 2881, 3256, ++ 2873, 3056, 3256, 2873, 3223, 2873, 3213, 1579, 3118, 2707, ++ ++ 3050, 3118, 3281, 2875, 3059, 3281, 3227, 3224, 2873, 3228, ++ 3229, 2873, 3225, 2873, 3226, 3064, 3062, 2876, 3214, 3211, ++ 2504, 2875, 3230, 2504, 3231, 2504, 2873, 3212, 3232, 2873, ++ 3216, 2873, 3233, 2506, 3227, 2888, 3063, 3228, 3229, 2875, ++ 3234, 3235, 3236, 3237, 3238, 3059, 3239, 3217, 3240, 3241, ++ 3230, 3242, 3231, 2888, 3243, 3244, 3232, 3246, 3247, 3248, ++ 3233, 3249, 3250, 3067, 3251, 3252, 3253, 3255, 3234, 3235, ++ 3236, 3237, 3238, 3257, 3239, 3218, 3240, 3241, 3725, 3242, ++ 3725, 3067, 3243, 3244, 1574, 3246, 3247, 3248, 3112, 3249, ++ 3250, 3112, 3251, 3252, 3253, 3255, 3259, 3965, 3260, 3262, ++ ++ 3965, 3257, 3965, 3263, 3264, 3254, 3254, 3254, 3254, 3254, ++ 3254, 3254, 3254, 3254, 3265, 3266, 3267, 3268, 3269, 3270, ++ 3271, 3273, 3359, 1550, 3259, 3359, 3260, 3262, 3726, 1549, ++ 3657, 3263, 3264, 3134, 3274, 3275, 3134, 3277, 3278, 3279, ++ 3282, 3283, 3265, 3266, 3267, 3268, 3269, 3270, 3271, 3273, ++ 3272, 3272, 3272, 3272, 3272, 3272, 3272, 3272, 3272, 3284, ++ 3285, 3286, 3274, 3275, 3287, 3277, 3278, 3279, 3282, 3283, ++ 3288, 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3296, 3297, ++ 3298, 3299, 3300, 3301, 3303, 3304, 3305, 3284, 3285, 3286, ++ 3306, 3307, 3287, 3309, 3310, 3311, 3312, 3313, 3288, 3289, ++ ++ 3290, 3291, 3292, 3293, 3294, 3295, 3296, 3297, 3298, 3299, ++ 3300, 3301, 3303, 3304, 3305, 3314, 3315, 3317, 3306, 3307, ++ 3319, 3309, 3310, 3311, 3312, 3313, 3320, 3321, 3317, 3322, ++ 1546, 3323, 3324, 3325, 3326, 3327, 3328, 3329, 3330, 3331, ++ 3332, 3334, 3245, 3314, 3315, 3245, 3341, 3362, 3319, 3390, ++ 3342, 3333, 3390, 3281, 3320, 3321, 3281, 3322, 3318, 3323, ++ 3324, 3325, 3326, 3327, 3328, 3329, 3330, 3331, 3332, 3334, ++ 2873, 3052, 1545, 2873, 3341, 2873, 1544, 3336, 3342, 3333, ++ 3050, 2873, 2873, 2875, 2873, 2873, 2873, 2873, 2881, 1543, ++ 2504, 3055, 3055, 2504, 2699, 2504, 1542, 2876, 1540, 3343, ++ ++ 3335, 2873, 2504, 2506, 2873, 2504, 2873, 2504, 3056, 3056, ++ 3344, 3063, 3216, 3345, 2875, 2506, 3053, 2707, 3346, 3347, ++ 1117, 2873, 2884, 3348, 2873, 3051, 2873, 3343, 2888, 3217, ++ 3349, 2887, 3350, 3351, 2875, 3352, 3057, 3211, 3344, 2504, ++ 3353, 3345, 2504, 3354, 2504, 2894, 3346, 3347, 2888, 3339, ++ 3355, 3348, 2506, 3356, 3357, 3358, 3064, 3337, 3349, 3360, ++ 3350, 3351, 3361, 3352, 3364, 3365, 3217, 3366, 3353, 3367, ++ 3368, 3354, 3369, 3370, 3371, 874, 2889, 3399, 3355, 1485, ++ 3399, 3356, 3357, 3358, 3372, 3377, 3401, 3360, 3377, 3401, ++ 3361, 1476, 3364, 3365, 3340, 3366, 3256, 3367, 3368, 3256, ++ ++ 3369, 3370, 3371, 3254, 3254, 3254, 3254, 3254, 3254, 3254, ++ 3254, 3254, 3372, 3373, 3373, 3373, 3373, 3373, 3373, 3373, ++ 3373, 3373, 3374, 3376, 3380, 3381, 3382, 3383, 3384, 3385, ++ 3386, 3378, 3387, 3388, 3389, 3272, 3272, 3272, 3272, 3272, ++ 3272, 3272, 3272, 3272, 3391, 3392, 3393, 3394, 3395, 3396, ++ 3374, 3376, 3380, 3381, 3382, 3383, 3384, 3385, 3386, 3378, ++ 3387, 3388, 3389, 3397, 3398, 3400, 3402, 3403, 3404, 3405, ++ 3407, 3408, 3391, 3392, 3393, 3394, 3395, 3396, 3409, 3410, ++ 3412, 3413, 3414, 3415, 3416, 3419, 3420, 3421, 3422, 3423, ++ 3425, 3397, 3398, 3400, 3402, 3403, 3404, 3405, 3407, 3408, ++ ++ 3426, 3427, 3430, 3431, 3432, 3433, 3409, 3410, 3412, 3413, ++ 3414, 3415, 3416, 3419, 3420, 3421, 3422, 3423, 3425, 3428, ++ 3434, 3435, 3436, 3437, 3438, 3440, 3441, 3429, 3426, 3427, ++ 3430, 3431, 3432, 3433, 3442, 3443, 3444, 3445, 3340, 3461, ++ 3052, 2299, 3461, 1474, 1469, 1464, 3447, 3428, 3434, 3435, ++ 3436, 3437, 3438, 3440, 3441, 3429, 2873, 2881, 3448, 2873, ++ 3449, 2873, 3442, 3443, 3444, 3445, 3050, 2504, 2873, 2875, ++ 2504, 2873, 2504, 2873, 3447, 3450, 3451, 3446, 3063, 2504, ++ 2506, 2875, 2504, 2876, 2504, 2882, 3448, 3452, 3449, 3216, ++ 3453, 3454, 2506, 3455, 3217, 2888, 3456, 3457, 3458, 3459, ++ ++ 1406, 3462, 3464, 3450, 3451, 3465, 3217, 3466, 3467, 3468, ++ 3469, 2877, 3470, 3471, 3472, 3452, 3473, 3487, 3453, 3454, ++ 3487, 3455, 3340, 2889, 3456, 3457, 3458, 3459, 3359, 3462, ++ 3464, 3359, 3503, 3465, 3340, 3466, 3467, 3468, 3469, 1405, ++ 3470, 3471, 3472, 3503, 3473, 3460, 3460, 3460, 3460, 3460, ++ 3460, 3460, 3460, 3460, 3463, 3463, 3463, 3463, 3463, 3463, ++ 3463, 3463, 3463, 3463, 3463, 3363, 3363, 3363, 3363, 3363, ++ 3363, 3363, 3363, 3363, 3363, 3363, 3474, 3476, 540, 3463, ++ 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3377, ++ 3363, 3477, 3377, 3478, 3479, 3480, 3481, 3482, 3483, 3484, ++ ++ 3485, 3490, 3491, 538, 3474, 3476, 3475, 3475, 3475, 3475, ++ 3475, 3475, 3475, 3475, 3475, 3488, 3493, 3489, 3488, 3477, ++ 3489, 3478, 3479, 3480, 3481, 3482, 3483, 3484, 3485, 3490, ++ 3491, 3492, 3494, 3495, 3492, 3497, 3498, 3550, 3497, 3498, ++ 3550, 3508, 533, 3500, 3493, 3401, 3501, 3502, 3401, 3505, ++ 3506, 3507, 3508, 3509, 3510, 3514, 531, 516, 3515, 3516, ++ 3494, 3495, 3499, 3499, 3499, 3499, 3499, 3499, 3499, 3499, ++ 3499, 3500, 3517, 3518, 3501, 3502, 3511, 3505, 3506, 3507, ++ 3519, 3509, 3510, 3514, 3512, 3513, 3515, 3516, 3520, 3521, ++ 3522, 3523, 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, ++ ++ 3517, 3518, 3532, 3533, 3511, 3534, 3535, 3534, 3519, 3536, ++ 3537, 3539, 3512, 3513, 3540, 514, 3520, 3521, 3522, 3523, ++ 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, 3541, 3542, ++ 3532, 3533, 3543, 3544, 3535, 3545, 3546, 3536, 3537, 3539, ++ 2504, 3547, 3540, 2504, 3552, 2504, 3553, 3554, 3555, 3487, ++ 3216, 3497, 3487, 2506, 3585, 3628, 3541, 3542, 3628, 3634, ++ 3543, 3544, 3634, 3545, 3546, 3556, 3557, 3217, 3558, 3547, ++ 3559, 3560, 3552, 3561, 3553, 3554, 3555, 3534, 3460, 3460, ++ 3460, 3460, 3460, 3460, 3460, 3460, 3460, 3461, 3638, 3551, ++ 3461, 3638, 3548, 3556, 3557, 3337, 3558, 3573, 3559, 3560, ++ ++ 3573, 3561, 3574, 510, 3549, 3549, 3549, 3549, 3549, 3549, ++ 3549, 3549, 3549, 3463, 3463, 3463, 3463, 3463, 3463, 3463, ++ 3463, 3463, 3463, 3463, 3475, 3475, 3475, 3475, 3475, 3475, ++ 3475, 3475, 3475, 3562, 3563, 3564, 3565, 3566, 3463, 3568, ++ 3566, 3569, 3570, 3571, 3576, 3578, 3579, 3576, 3492, 3577, ++ 3581, 3492, 3582, 3580, 3583, 3587, 3701, 3704, 1396, 3701, ++ 3704, 3562, 3563, 3564, 3565, 3745, 3567, 3568, 3590, 3569, ++ 3570, 3571, 3573, 3578, 3579, 3573, 3745, 3574, 3581, 1392, ++ 3582, 3498, 3583, 3587, 3498, 3499, 3499, 3499, 3499, 3499, ++ 3499, 3499, 3499, 3499, 3567, 3591, 3590, 3592, 3586, 3586, ++ ++ 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3588, 3593, 3594, ++ 3595, 3596, 3597, 3589, 3598, 3599, 3601, 3603, 3604, 3605, ++ 3606, 3607, 3608, 3591, 3610, 3592, 3611, 3614, 3615, 3576, ++ 3818, 1386, 3576, 3818, 3577, 3588, 3593, 3594, 3595, 3596, ++ 3597, 3589, 3598, 3599, 3601, 3603, 3604, 3605, 3606, 3607, ++ 3608, 3617, 3610, 3618, 3611, 3614, 3615, 3616, 3616, 3616, ++ 3616, 3616, 3616, 3616, 3616, 3616, 3616, 3616, 3619, 3622, ++ 3623, 3624, 3625, 3626, 3627, 3638, 3965, 1355, 3638, 3617, ++ 3708, 3618, 3616, 3629, 3629, 3629, 3629, 3629, 3629, 3629, ++ 3629, 3629, 3631, 3632, 3633, 3635, 3619, 3622, 3623, 3624, ++ ++ 3625, 3626, 3627, 3549, 3549, 3549, 3549, 3549, 3549, 3549, ++ 3549, 3549, 3550, 3636, 3637, 3550, 3639, 3640, 3641, 3642, ++ 3631, 3632, 3633, 3635, 3643, 3645, 3646, 3647, 3650, 3630, ++ 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3653, 3654, ++ 3566, 3636, 3637, 3566, 3639, 3640, 3641, 3642, 3648, 1347, ++ 3658, 3648, 3643, 3645, 3646, 3647, 3650, 3644, 3644, 3644, ++ 3644, 3644, 3644, 3644, 3644, 3644, 3653, 3654, 3659, 3660, ++ 3584, 3662, 3663, 3664, 3665, 3667, 3668, 3649, 3658, 3669, ++ 3670, 3671, 3672, 3673, 3661, 3661, 3661, 3661, 3661, 3661, ++ 3661, 3661, 3661, 1336, 431, 3497, 3659, 3660, 3585, 3662, ++ ++ 3663, 3664, 3665, 3667, 3668, 3649, 3674, 3669, 3670, 3671, ++ 3672, 3673, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, ++ 3661, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, ++ 3675, 3676, 3677, 3678, 3674, 3679, 3680, 3681, 3683, 3686, ++ 418, 3687, 3688, 3616, 3616, 3616, 3616, 3616, 3616, 3616, ++ 3616, 3616, 3616, 3616, 3689, 3691, 3692, 3693, 3675, 3676, ++ 3677, 3678, 414, 3679, 3680, 3681, 3683, 3686, 3616, 3687, ++ 3688, 3819, 399, 3695, 3819, 3696, 3695, 3699, 3697, 3700, ++ 3702, 395, 3689, 3691, 3692, 3693, 3696, 3706, 3709, 3629, ++ 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3630, 3630, ++ ++ 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3700, 3702, 3634, ++ 3710, 3711, 3634, 3712, 3713, 3706, 3709, 3644, 3644, 3644, ++ 3644, 3644, 3644, 3644, 3644, 3644, 3703, 3703, 3703, 3703, ++ 3703, 3703, 3703, 3703, 3703, 3714, 3715, 373, 3710, 3711, ++ 3701, 3712, 3713, 3701, 369, 3759, 3717, 3718, 3648, 3721, ++ 3722, 3648, 3728, 3729, 3723, 3730, 3731, 3698, 3732, 3733, ++ 3734, 3724, 363, 3714, 3715, 3716, 3716, 3716, 3716, 3716, ++ 3716, 3716, 3716, 3716, 3717, 3718, 3584, 3721, 3722, 3735, ++ 3728, 3729, 3723, 3730, 3731, 3736, 3732, 3733, 3734, 3724, ++ 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3737, ++ ++ 3738, 3739, 3740, 3741, 3742, 3743, 3744, 3735, 3746, 3747, ++ 3748, 3752, 3754, 3736, 3755, 3756, 359, 3758, 3704, 3746, ++ 355, 3704, 1278, 3762, 3761, 3790, 3765, 3737, 3738, 3739, ++ 3740, 3741, 3742, 3743, 3744, 1217, 3790, 3747, 3748, 3752, ++ 3754, 1216, 3755, 3756, 3696, 3758, 3696, 3696, 3695, 3965, ++ 3696, 3695, 3761, 3697, 3765, 3965, 3766, 3696, 3965, 3767, ++ 3965, 3696, 3703, 3703, 3703, 3703, 3703, 3703, 3703, 3703, ++ 3703, 3768, 3769, 3770, 3771, 3716, 3716, 3716, 3716, 3716, ++ 3716, 3716, 3716, 3716, 3766, 3772, 3773, 3767, 3774, 3775, ++ 3776, 3777, 3778, 3779, 3780, 3781, 3782, 3783, 3784, 3768, ++ ++ 3769, 3770, 3771, 3785, 3795, 3786, 3787, 3788, 3789, 3791, ++ 3792, 3793, 3794, 3772, 3773, 3795, 3774, 3775, 3776, 3777, ++ 3796, 3779, 3780, 3781, 3782, 3783, 3784, 3797, 3698, 3801, ++ 3798, 3785, 3698, 3786, 3787, 3788, 3789, 3791, 3792, 3793, ++ 3794, 3799, 3657, 3805, 3965, 3808, 3809, 3965, 3796, 3965, ++ 3810, 3811, 3812, 3813, 3814, 3797, 3815, 3801, 3798, 3816, ++ 3820, 3821, 3816, 3725, 3822, 1200, 3823, 3824, 3825, 3799, ++ 3826, 3827, 3828, 3808, 3809, 3829, 3830, 3831, 3810, 3811, ++ 3812, 3813, 3814, 3832, 3815, 3840, 3834, 3835, 3820, 3821, ++ 3836, 3837, 3822, 3806, 3823, 3824, 3825, 3838, 3826, 3827, ++ ++ 3828, 3840, 3843, 3829, 3830, 3831, 3817, 1191, 3844, 3845, ++ 3846, 3832, 3847, 3726, 3834, 3835, 3848, 3849, 3836, 3837, ++ 3851, 3852, 3859, 3851, 3818, 3838, 3860, 3818, 3819, 3854, ++ 3843, 3819, 3861, 3856, 3817, 3841, 3844, 3845, 3846, 3857, ++ 3847, 3862, 3857, 3858, 3848, 3849, 3858, 3863, 3865, 3852, ++ 3859, 3806, 3866, 3867, 3860, 3868, 3869, 3870, 3873, 3874, ++ 3861, 3875, 3874, 3876, 3877, 3878, 3879, 3880, 3881, 3862, ++ 3851, 3882, 3840, 3851, 3965, 3863, 3865, 3965, 3889, 3965, ++ 3866, 3867, 3890, 3868, 3869, 3870, 3873, 3891, 3892, 3893, ++ 3894, 3876, 3877, 3878, 3879, 3880, 3881, 3965, 3857, 3882, ++ ++ 3965, 3857, 3965, 3886, 3858, 3895, 3889, 3858, 3896, 3888, ++ 3890, 3806, 3897, 3898, 3906, 3891, 3892, 3893, 3894, 3908, ++ 3904, 3909, 3841, 3904, 3899, 3905, 3907, 3900, 3910, 3907, ++ 3911, 3910, 3965, 3895, 3916, 3965, 3896, 3965, 3917, 3918, ++ 3897, 3898, 3906, 3965, 3919, 3920, 3965, 3908, 3965, 3909, ++ 3921, 3922, 3899, 3923, 3924, 3900, 3925, 3926, 3911, 3929, ++ 3904, 3931, 3916, 3904, 3931, 3905, 3917, 3918, 1179, 3932, ++ 3934, 3907, 3919, 3920, 3907, 1158, 1142, 3947, 3921, 3922, ++ 3947, 3923, 3924, 3910, 3925, 3926, 3910, 3929, 3930, 3930, ++ 3930, 3930, 3930, 3930, 3930, 3930, 3930, 3932, 3934, 3937, ++ ++ 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3938, ++ 3939, 3940, 3941, 3942, 3943, 3944, 3930, 3930, 3930, 3930, ++ 3930, 3930, 3930, 3930, 3930, 662, 1117, 3937, 3931, 645, ++ 385, 3931, 385, 874, 1073, 3948, 3949, 3938, 3939, 3940, ++ 3941, 3942, 3943, 3944, 3950, 3946, 3946, 3946, 3946, 3946, ++ 3946, 3946, 3946, 3946, 3933, 3933, 3933, 3933, 3933, 3933, ++ 3933, 3933, 3933, 3948, 3949, 3951, 3953, 3954, 3956, 3957, ++ 3958, 1062, 3950, 3946, 3946, 3946, 3946, 3946, 3946, 3946, ++ 3946, 3946, 3947, 1054, 1051, 3947, 1009, 540, 538, 3959, ++ 3960, 3961, 3962, 3951, 3953, 3954, 3956, 3957, 3958, 3955, ++ ++ 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, ++ 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3959, 3960, 3961, ++ 3962, 3963, 3964, 1007, 533, 531, 1001, 516, 514, 999, ++ 510, 994, 986, 977, 976, 946, 935, 923, 913, 431, ++ 910, 418, 414, 662, 883, 399, 395, 645, 865, 3963, ++ 3964, 76, 76, 76, 76, 76, 76, 76, 76, 76, ++ 76, 76, 76, 76, 76, 76, 76, 76, 76, 98, + 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, +- 98, 98, 98, 98, 98, 128, 128, 128, 128, 128, ++ 98, 98, 98, 98, 98, 98, 98, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, +- 128, 128, 128, 134, 134, 134, 134, 134, 134, 134, +- 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, + +- 134, 137, 137, 137, 137, 137, 137, 137, 137, 137, +- 137, 137, 137, 137, 137, 137, 137, 137, 137, 143, +- 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, +- 143, 143, 143, 143, 143, 143, 143, 149, 149, 149, ++ 128, 128, 128, 128, 128, 134, 134, 134, 134, 134, ++ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, ++ 134, 134, 134, 137, 137, 137, 137, 137, 137, 137, ++ 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, ++ 137, 143, 143, 143, 143, 143, 143, 143, 143, 143, ++ 143, 143, 143, 143, 143, 143, 143, 143, 143, 149, + 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, +- 149, 149, 149, 149, 149, 156, 156, 156, 156, 156, ++ 149, 149, 149, 149, 149, 149, 149, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, +- 156, 156, 156, 162, 162, 162, 162, 162, 162, 162, +- 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, +- 162, 169, 169, 169, 169, 169, 169, 169, 169, 169, ++ 156, 156, 156, 156, 156, 162, 162, 162, 162, 162, + +- 169, 169, 169, 169, 169, 169, 169, 169, 169, 179, +- 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, +- 179, 179, 179, 179, 179, 179, 179, 185, 185, 185, ++ 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, ++ 162, 162, 162, 169, 169, 169, 169, 169, 169, 169, ++ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, ++ 169, 179, 179, 179, 179, 179, 179, 179, 179, 179, ++ 179, 179, 179, 179, 179, 179, 179, 179, 179, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, +- 185, 185, 185, 185, 185, 227, 227, 227, 227, 227, ++ 185, 185, 185, 185, 185, 185, 185, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, +- 227, 227, 227, 232, 232, 232, 232, 232, 232, 232, ++ 227, 227, 227, 227, 227, 232, 232, 232, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, +- 232, 237, 237, 237, 237, 237, 237, 237, 237, 237, +- 237, 237, 237, 237, 237, 237, 237, 237, 237, 238, + +- 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, +- 238, 238, 238, 238, 238, 238, 238, 239, 239, 239, ++ 232, 232, 232, 237, 237, 237, 237, 237, 237, 237, ++ 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, ++ 237, 238, 238, 238, 238, 238, 238, 238, 238, 238, ++ 238, 238, 238, 238, 238, 238, 238, 238, 238, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, +- 239, 239, 239, 239, 239, 240, 240, 240, 240, 240, ++ 239, 239, 239, 239, 239, 239, 239, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, +- 240, 240, 240, 241, 241, 241, 241, 241, 241, 241, ++ 240, 240, 240, 240, 240, 241, 241, 241, 241, 241, + 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, +- 241, 249, 249, 249, 249, 249, 249, 249, 249, 249, +- 249, 249, 249, 249, 249, 249, 249, 249, 249, 251, +- 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, ++ 241, 241, 241, 249, 249, 249, 249, 249, 249, 249, + +- 251, 251, 251, 251, 251, 251, 251, 255, 255, 255, ++ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, ++ 249, 251, 251, 251, 251, 251, 251, 251, 251, 251, ++ 251, 251, 251, 251, 251, 251, 251, 251, 251, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, +- 255, 255, 255, 255, 255, 258, 258, 258, 258, 258, ++ 255, 255, 255, 255, 255, 255, 255, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, +- 258, 258, 258, 266, 266, 363, 266, 266, 266, 266, ++ 258, 258, 258, 258, 258, 266, 266, 373, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 346, 346, 346, 346, 346, 346, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 363, 363, 363, ++ 266, 266, 266, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, + ++ 346, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 356, 356, 356, 356, 356, 356, 356, 356, 356, 363, + 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 363, 363, 366, 366, 366, 366, 366, ++ 363, 363, 363, 363, 363, 363, 363, 366, 366, 366, + 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 366, 366, 373, 373, 373, 373, 373, 373, 373, ++ 366, 366, 366, 366, 366, 373, 373, 373, 373, 373, + 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, +- 373, 376, 376, 376, 376, 376, 376, 376, 376, 376, +- 376, 376, 376, 376, 376, 376, 376, 376, 376, 382, +- 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, +- 382, 382, 382, 382, 382, 382, 382, 387, 387, 387, +- 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, ++ 373, 373, 373, 376, 376, 376, 376, 376, 376, 376, ++ 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, ++ 376, 382, 382, 382, 382, 382, 382, 382, 382, 382, + +- 387, 387, 387, 387, 387, 391, 391, 391, 391, 391, ++ 382, 382, 382, 382, 382, 382, 382, 382, 382, 387, ++ 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, ++ 387, 387, 387, 387, 387, 387, 387, 391, 391, 391, + 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, +- 391, 391, 391, 399, 399, 399, 399, 399, 399, 399, ++ 391, 391, 391, 391, 391, 399, 399, 399, 399, 399, + 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- 399, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 402, 402, 402, 402, 402, 402, 402, 411, +- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 411, 411, 411, 411, 418, 418, 418, +- 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, +- 418, 418, 418, 418, 418, 421, 421, 421, 421, 421, ++ 399, 399, 399, 402, 402, 402, 402, 402, 402, 402, ++ 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, ++ 402, 411, 411, 411, 411, 411, 411, 411, 411, 411, ++ 411, 411, 411, 411, 411, 411, 411, 411, 411, 418, + ++ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 418, 418, 418, 418, 418, 418, 418, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 421, 421, 505, 505, 505, 505, 505, 505, 505, ++ 421, 421, 421, 421, 421, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 511, 511, 511, 511, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 517, 517, 359, +- 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, +- 517, 517, 517, 517, 517, 518, 518, 859, 518, 518, +- 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, ++ 505, 505, 505, 511, 511, 511, 511, 511, 511, 511, ++ 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, ++ 511, 516, 516, 516, 516, 516, 516, 516, 516, 516, ++ 516, 516, 516, 516, 516, 516, 516, 516, 516, 517, ++ 517, 369, 517, 517, 517, 517, 517, 517, 517, 517, + +- 518, 518, 518, 519, 519, 355, 519, 519, 519, 519, ++ 517, 517, 517, 517, 517, 517, 517, 518, 518, 862, ++ 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, ++ 518, 518, 518, 518, 518, 519, 519, 363, 519, 519, + 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, +- 519, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 528, 528, 528, 528, 528, 528, 533, +- 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 533, 533, 533, 533, 535, 535, 535, ++ 519, 519, 519, 528, 528, 528, 528, 528, 528, 528, ++ 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, ++ 528, 533, 533, 533, 533, 533, 533, 533, 533, 533, ++ 533, 533, 533, 533, 533, 533, 533, 533, 533, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 535, 535, 540, 540, 540, 540, 540, +- 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, +- 540, 540, 540, 266, 266, 774, 266, 266, 266, 266, ++ 535, 535, 535, 535, 535, 535, 535, 540, 540, 540, + ++ 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, ++ 540, 540, 540, 540, 540, 266, 266, 359, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 346, 346, 346, 346, 346, 346, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 363, 363, 363, ++ 266, 266, 266, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 346, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 356, 356, 356, 356, 356, 356, 356, 356, 356, 363, + 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 538, 363, 366, 366, 366, 366, 366, ++ 363, 363, 363, 363, 363, 859, 363, 366, 366, 366, + 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 366, 366, 373, 373, 373, 373, 373, 373, 373, +- 373, 373, 373, 373, 373, 373, 373, 373, 373, 539, + +- 373, 376, 376, 376, 376, 376, 376, 376, 376, 376, +- 376, 376, 376, 376, 376, 376, 376, 376, 376, 382, +- 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, +- 382, 382, 382, 382, 382, 382, 382, 639, 639, 639, ++ 366, 366, 366, 366, 366, 373, 373, 373, 373, 373, ++ 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, ++ 373, 355, 373, 376, 376, 376, 376, 376, 376, 376, ++ 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, ++ 376, 382, 382, 382, 382, 382, 382, 382, 382, 382, ++ 382, 382, 382, 382, 382, 382, 382, 382, 382, 639, + 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 639, 639, 387, 387, 387, 387, 387, ++ 639, 639, 639, 639, 639, 639, 639, 387, 387, 387, + 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, +- 387, 387, 387, 644, 531, 644, 644, 532, 514, 644, +- 644, 644, 644, 644, 515, 644, 644, 644, 644, 644, +- 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, ++ 387, 387, 387, 387, 387, 644, 774, 644, 644, 538, + +- 391, 391, 391, 391, 391, 391, 391, 391, 399, 399, ++ 539, 644, 644, 644, 644, 644, 531, 644, 644, 644, ++ 644, 644, 391, 391, 391, 391, 391, 391, 391, 391, ++ 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, + 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- 399, 399, 399, 399, 508, 399, 652, 652, 652, 652, ++ 399, 399, 399, 399, 399, 399, 532, 399, 652, 652, + 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, +- 652, 652, 652, 652, 402, 402, 402, 402, 402, 402, ++ 652, 652, 652, 652, 652, 652, 402, 402, 402, 402, + 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 659, 659, 659, 659, 659, 659, 659, 659, ++ 402, 402, 402, 402, 659, 659, 659, 659, 659, 659, + 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, +- 661, 753, 661, 661, 739, 479, 661, 661, 661, 661, +- 661, 735, 661, 661, 661, 661, 661, 411, 411, 411, + ++ 659, 659, 661, 514, 661, 661, 515, 508, 661, 661, ++ 661, 661, 661, 753, 661, 661, 661, 661, 661, 411, + 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 411, 411, 418, 418, 418, 418, 418, ++ 411, 411, 411, 411, 411, 411, 411, 418, 418, 418, + 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, +- 418, 696, 418, 421, 421, 421, 421, 421, 421, 421, ++ 418, 418, 418, 739, 418, 421, 421, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 505, 505, 505, 505, 505, 505, 505, 505, 511, +- 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 511, 511, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, ++ 421, 421, 421, 505, 505, 505, 505, 505, 505, 505, ++ 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, ++ 505, 511, 511, 511, 511, 511, 511, 511, 511, 511, + +- 516, 516, 516, 681, 516, 517, 517, 437, 517, 517, ++ 511, 511, 511, 511, 511, 511, 511, 511, 511, 516, ++ 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, ++ 516, 516, 516, 516, 516, 479, 516, 517, 517, 735, + 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, +- 517, 517, 517, 518, 518, 428, 518, 518, 518, 518, ++ 517, 517, 517, 517, 517, 518, 518, 696, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, +- 518, 519, 519, 414, 519, 519, 519, 519, 519, 519, +- 519, 519, 519, 519, 519, 519, 519, 519, 519, 528, +- 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 528, 528, 528, 528, 533, 533, 533, +- 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 417, 533, 535, 535, 535, 535, 535, ++ 518, 518, 518, 519, 519, 681, 519, 519, 519, 519, ++ 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, ++ 519, 528, 528, 528, 528, 528, 528, 528, 528, 528, ++ 528, 528, 528, 528, 528, 528, 528, 528, 528, 533, + ++ 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, ++ 533, 533, 533, 533, 533, 437, 533, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 540, 540, 540, 540, 540, 540, 540, +- 540, 540, 540, 540, 540, 540, 540, 540, 540, 395, +- 540, 266, 266, 398, 266, 266, 266, 266, 266, 266, +- 266, 266, 266, 266, 266, 266, 266, 266, 266, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 363, 363, 363, ++ 535, 535, 535, 535, 535, 540, 540, 540, 540, 540, ++ 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, ++ 540, 428, 540, 266, 266, 414, 266, 266, 266, 266, ++ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, ++ 266, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 363, + 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 363, 363, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, + +- 356, 356, 356, 373, 373, 373, 373, 373, 373, 373, ++ 363, 363, 363, 363, 363, 363, 363, 356, 356, 356, ++ 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 356, 356, 356, 356, 356, 373, 373, 373, 373, 373, + 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, +- 373, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 366, 366, 366, 366, 366, 366, 366, 366, 639, +- 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 639, 639, 639, 639, 869, 390, 869, +- 869, 385, 369, 869, 869, 869, 869, 869, 372, 869, +- 869, 869, 869, 869, 869, 872, 359, 872, 872, 362, +- 351, 872, 872, 872, 872, 872, 592, 872, 872, 872, +- 872, 872, 872, 387, 387, 387, 387, 387, 387, 387, ++ 373, 373, 373, 366, 366, 366, 366, 366, 366, 366, ++ 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, ++ 366, 639, 639, 639, 639, 639, 639, 639, 639, 639, ++ 639, 639, 639, 639, 639, 639, 639, 639, 639, 869, ++ 417, 869, 869, 395, 398, 869, 869, 869, 869, 869, ++ 390, 869, 869, 869, 869, 869, 869, 872, 385, 872, + ++ 872, 369, 372, 872, 872, 872, 872, 872, 359, 872, ++ 872, 872, 872, 872, 872, 387, 387, 387, 387, 387, + 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, +- 387, 644, 591, 644, 644, 558, 541, 644, 644, 644, +- 644, 644, 539, 644, 644, 644, 644, 644, 399, 399, ++ 387, 387, 387, 644, 362, 644, 644, 351, 592, 644, ++ 644, 644, 644, 644, 591, 644, 644, 644, 644, 644, + 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- 399, 399, 399, 399, 399, 399, 391, 391, 391, 391, ++ 399, 399, 399, 399, 399, 399, 399, 399, 391, 391, + 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, +- 391, 391, 391, 391, 652, 652, 652, 652, 652, 652, ++ 391, 391, 391, 391, 391, 391, 652, 652, 652, 652, + 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, +- 652, 652, 885, 885, 885, 885, 885, 885, 885, 885, +- 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, + +- 887, 539, 887, 887, 532, 515, 887, 887, 887, 887, +- 887, 508, 887, 887, 887, 887, 887, 887, 657, 657, ++ 652, 652, 652, 652, 885, 885, 885, 885, 885, 885, ++ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 885, 885, 887, 558, 887, 887, 541, 539, 887, 887, ++ 887, 887, 887, 539, 887, 887, 887, 887, 887, 887, + 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, +- 657, 657, 657, 657, 657, 657, 402, 402, 402, 402, ++ 657, 657, 657, 657, 657, 657, 657, 657, 402, 402, + 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 402, 402, 661, 479, 661, 661, 437, 417, +- 661, 661, 661, 661, 661, 398, 661, 661, 661, 661, +- 661, 659, 659, 659, 659, 659, 659, 659, 659, 659, +- 659, 659, 659, 659, 659, 659, 659, 659, 659, 418, +- 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 402, 402, 402, 402, 402, 402, 661, 532, 661, 661, ++ 515, 508, 661, 661, 661, 661, 661, 479, 661, 661, ++ 661, 661, 661, 659, 659, 659, 659, 659, 659, 659, + +- 418, 418, 418, 418, 418, 418, 418, 411, 411, 411, ++ 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, ++ 659, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 418, 418, 418, 418, 418, 418, 418, 418, 418, 411, + 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 411, 411, 421, 421, 421, 421, 421, ++ 411, 411, 411, 411, 411, 411, 411, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 421, 421, 505, 505, 505, 505, 505, 505, 505, ++ 421, 421, 421, 421, 421, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 516, 516, 516, 516, 516, 516, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 516, 511, +- 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 511, 511, 533, 533, 533, ++ 505, 505, 505, 516, 516, 516, 516, 516, 516, 516, ++ 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, + ++ 516, 511, 511, 511, 511, 511, 511, 511, 511, 511, ++ 511, 511, 511, 511, 511, 511, 511, 511, 511, 533, + 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 533, 533, 528, 528, 528, 528, 528, ++ 533, 533, 533, 533, 533, 533, 533, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 540, 540, 540, 540, 540, 540, 540, ++ 528, 528, 528, 528, 528, 540, 540, 540, 540, 540, + 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, +- 540, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 535, 535, 535, 535, 535, 535, 266, +- 266, 398, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 266, 266, 266, 266, 266, 266, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 540, 540, 540, 535, 535, 535, 535, 535, 535, 535, ++ 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, ++ 535, 266, 266, 437, 266, 266, 266, 266, 266, 266, + +- 346, 346, 346, 346, 346, 356, 356, 356, 356, 356, ++ 266, 266, 266, 266, 266, 266, 266, 266, 266, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 356, 356, 356, + 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 366, 366, 366, 366, 366, 366, 366, ++ 356, 356, 356, 356, 356, 366, 366, 366, 366, 366, + 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 639, 639, 639, 639, 639, 639, 869, +- 385, 869, 869, 385, 385, 869, 869, 869, 869, 869, +- 372, 869, 869, 869, 869, 869, 869, 872, 372, 872, +- 872, 362, 351, 872, 872, 872, 872, 872, 317, 872, +- 872, 872, 872, 872, 872, 644, 3952, 644, 644, 250, ++ 366, 366, 366, 639, 639, 639, 639, 639, 639, 639, ++ 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, ++ 639, 869, 417, 869, 869, 398, 398, 869, 869, 869, ++ 869, 869, 385, 869, 869, 869, 869, 869, 869, 872, + +- 250, 644, 644, 644, 644, 644, 98, 644, 644, 644, +- 644, 644, 652, 652, 652, 652, 652, 652, 652, 652, ++ 385, 872, 872, 385, 372, 872, 872, 872, 872, 872, ++ 372, 872, 872, 872, 872, 872, 872, 644, 362, 644, ++ 644, 351, 317, 644, 644, 644, 644, 644, 3965, 644, ++ 644, 644, 644, 644, 652, 652, 652, 652, 652, 652, + 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, +- 887, 98, 887, 887, 98, 98, 887, 887, 887, 887, +- 887, 98, 887, 887, 887, 887, 887, 887, 657, 657, ++ 652, 652, 887, 250, 887, 887, 250, 98, 887, 887, ++ 887, 887, 887, 98, 887, 887, 887, 887, 887, 887, + 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, +- 657, 657, 657, 657, 657, 657, 891, 98, 891, 891, +- 98, 98, 891, 891, 891, 891, 891, 161, 891, 891, +- 891, 891, 891, 891, 885, 885, 885, 885, 885, 885, +- 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 657, 657, 657, 657, 657, 657, 657, 657, 891, 98, ++ 891, 891, 98, 98, 891, 891, 891, 891, 891, 98, + +- 885, 885, 888, 888, 888, 888, 888, 888, 888, 888, ++ 891, 891, 891, 891, 891, 891, 885, 885, 885, 885, ++ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 885, 885, 885, 885, 888, 888, 888, 888, 888, 888, + 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, +- 661, 161, 661, 661, 160, 160, 661, 661, 661, 661, +- 661, 3952, 661, 661, 661, 661, 661, 402, 402, 402, ++ 888, 888, 661, 98, 661, 661, 98, 161, 661, 661, ++ 661, 661, 661, 161, 661, 661, 661, 661, 661, 402, + 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 402, 402, 402, 411, 411, 411, 411, 411, ++ 402, 402, 402, 402, 402, 402, 402, 411, 411, 411, + 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 421, 421, 421, 421, 421, 421, 421, +- 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, ++ 411, 411, 411, 411, 411, 421, 421, 421, 421, 421, + +- 3952, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 505, +- 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 505, 505, 505, 505, 505, 505, 511, 511, 511, ++ 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, ++ 421, 421, 421, 1157, 1157, 1157, 1157, 1157, 1157, 1157, ++ 1157, 1157, 160, 1157, 1157, 1157, 1157, 1157, 1157, 1157, ++ 1157, 505, 505, 505, 505, 505, 505, 505, 505, 505, ++ 505, 505, 505, 505, 505, 505, 505, 505, 505, 511, + 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 528, 528, 528, 528, 528, ++ 511, 511, 511, 511, 511, 511, 511, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 535, 535, 535, 535, 535, 535, 535, ++ 528, 528, 528, 528, 528, 535, 535, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 266, 266, 3952, 266, 266, 266, 266, 266, 266, +- 266, 266, 266, 266, 266, 266, 266, 266, 266, 363, + +- 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 363, 363, 363, 363, 373, 373, 373, ++ 535, 535, 535, 266, 266, 160, 266, 266, 266, 266, ++ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, ++ 266, 363, 363, 363, 363, 363, 363, 363, 363, 363, ++ 363, 363, 363, 363, 363, 363, 363, 363, 363, 373, + 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, +- 373, 373, 373, 373, 373, 639, 639, 639, 639, 639, ++ 373, 373, 373, 373, 373, 373, 373, 639, 639, 639, + 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 869, 3952, 869, 869, 3952, 3952, 869, +- 869, 869, 869, 869, 3952, 869, 869, 869, 869, 869, +- 869, 872, 3952, 872, 872, 3952, 3952, 872, 872, 872, +- 872, 872, 3952, 872, 872, 872, 872, 872, 872, 399, +- 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- +- 399, 399, 399, 399, 399, 399, 399, 887, 3952, 887, +- 887, 3952, 3952, 887, 887, 887, 887, 887, 3952, 887, +- 887, 887, 887, 887, 887, 888, 888, 888, 888, 888, ++ 639, 639, 639, 639, 639, 869, 3965, 869, 869, 3965, ++ 3965, 869, 869, 869, 869, 869, 3965, 869, 869, 869, ++ 869, 869, 869, 872, 3965, 872, 872, 3965, 3965, 872, ++ ++ 872, 872, 872, 872, 3965, 872, 872, 872, 872, 872, ++ 872, 399, 399, 399, 399, 399, 399, 399, 399, 399, ++ 399, 399, 399, 399, 399, 399, 399, 399, 399, 887, ++ 3965, 887, 887, 3965, 3965, 887, 887, 887, 887, 887, ++ 3965, 887, 887, 887, 887, 887, 887, 888, 888, 888, + 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, +- 888, 888, 888, 661, 3952, 661, 661, 3952, 3952, 661, +- 661, 661, 661, 661, 661, 661, 661, 661, 661, 661, ++ 888, 888, 888, 888, 888, 661, 3965, 661, 661, 3965, ++ 3965, 661, 661, 661, 661, 661, 661, 661, 661, 661, ++ 661, 661, 659, 659, 659, 659, 659, 659, 659, 659, + 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, +- 659, 659, 659, 659, 659, 659, 659, 659, 418, 418, +- 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, +- 418, 418, 418, 418, 418, 418, 1346, 3952, 1346, 1346, + +- 3952, 3952, 1346, 1346, 1346, 3952, 1346, 1346, 1346, 1346, +- 1346, 1346, 1346, 1346, 1359, 1359, 1359, 1359, 1359, 1359, +- 1359, 3952, 1359, 3952, 1359, 1359, 1359, 1359, 1359, 1359, +- 1359, 1359, 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, ++ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 418, 418, 418, 418, 418, 418, 418, 418, 1346, 3965, ++ 1346, 1346, 3965, 3965, 1346, 1346, 1346, 3965, 1346, 1346, ++ 1346, 1346, 1346, 1346, 1346, 1346, 1359, 1359, 1359, 1359, ++ 1359, 1359, 1359, 3965, 1359, 3965, 1359, 1359, 1359, 1359, ++ 1359, 1359, 1359, 1359, 1393, 1393, 1393, 1393, 1393, 1393, + 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, ++ 1393, 1393, 516, 516, 516, 516, 516, 516, 516, 516, + 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 533, 533, + 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 533, 533, 533, 540, 540, 540, 540, +- 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, + +- 540, 540, 540, 540, 266, 266, 3952, 266, 266, 266, ++ 533, 533, 533, 533, 533, 533, 533, 533, 540, 540, ++ 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, ++ 540, 540, 540, 540, 540, 540, 266, 266, 3965, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 266, 885, 885, 885, 885, 885, 885, 885, 885, ++ 266, 266, 266, 266, 885, 885, 885, 885, 885, 885, + 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 885, 885, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, + 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, +- 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1534, 3952, +- 3952, 1534, 3952, 3952, 1534, 1575, 3952, 3952, 3952, 3952, +- 3952, 1575, 1575, 1575, 3952, 1575, 1575, 1575, 1575, 1575, +- 1575, 1575, 1575, 1524, 1524, 1524, 1524, 1524, 1524, 1524, +- 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, ++ 1534, 3965, 3965, 1534, 3965, 3965, 1534, 1575, 3965, 3965, ++ 3965, 3965, 3965, 1575, 1575, 1575, 3965, 1575, 1575, 1575, + +- 1524, 1722, 3952, 3952, 1722, 3952, 1722, 1760, 1760, 1760, ++ 1575, 1575, 1575, 1575, 1575, 1524, 1524, 1524, 1524, 1524, ++ 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, ++ 1524, 1524, 1524, 1722, 3965, 3965, 1722, 3965, 1722, 1760, + 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, +- 1760, 1760, 1760, 1760, 1760, 1765, 3952, 3952, 1765, 1765, +- 3952, 3952, 1765, 3952, 1765, 3952, 1765, 1765, 1765, 1765, +- 1901, 1901, 1901, 1901, 1946, 1946, 3952, 1946, 1946, 1946, ++ 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1765, 3965, 3965, ++ 1765, 1765, 3965, 3965, 1765, 3965, 1765, 3965, 1765, 1765, ++ 1765, 1765, 1901, 1901, 1901, 1901, 1946, 1946, 3965, 1946, + 1946, 1946, 1946, 1946, 1946, 1946, 1946, 1946, 1946, 1946, +- 1946, 1946, 1948, 1948, 3952, 1948, 1948, 1948, 1948, 1948, ++ 1946, 1946, 1946, 1946, 1948, 1948, 3965, 1948, 1948, 1948, + 1948, 1948, 1948, 1948, 1948, 1948, 1948, 1948, 1948, 1948, +- 1952, 3952, 1952, 3952, 1952, 1952, 1952, 1952, 2074, 2074, +- 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, + +- 2074, 2074, 2074, 2074, 2074, 2074, 2089, 2089, 2089, 2089, ++ 1948, 1948, 1952, 3965, 1952, 3965, 1952, 1952, 1952, 1952, ++ 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, ++ 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2089, 2089, + 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, +- 2089, 2089, 2089, 2089, 2142, 2142, 2142, 2142, 2142, 2142, ++ 2089, 2089, 2089, 2089, 2089, 2089, 2142, 2142, 2142, 2142, + 2142, 2142, 2142, 2142, 2142, 2142, 2142, 2142, 2142, 2142, +- 2142, 2142, 2178, 2178, 3952, 3952, 2178, 2178, 2178, 2178, +- 2178, 3952, 2178, 2178, 2178, 2178, 2178, 2178, 2178, 2178, +- 2196, 3952, 3952, 2196, 2196, 3952, 3952, 2196, 3952, 2196, +- 3952, 2196, 2196, 2196, 2196, 2283, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2296, 3952, 2296, 2296, 3952, 3952, 2296, +- +- 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, +- 2296, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2332, +- 3952, 3952, 3952, 3952, 3952, 2332, 2332, 2332, 3952, 2332, +- 2332, 2332, 2332, 2332, 2332, 2332, 2332, 2358, 2358, 3952, +- 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, +- 2358, 2358, 2358, 2358, 2358, 2360, 2360, 3952, 2360, 2360, +- 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, +- 2360, 2360, 2360, 2386, 3952, 3952, 2386, 2386, 3952, 3952, +- 2386, 3952, 2386, 3952, 2386, 2386, 2386, 2386, 2399, 3952, +- +- 3952, 3952, 3952, 3952, 2399, 2399, 2399, 3952, 2399, 2399, +- 2399, 2399, 2399, 2399, 2399, 2399, 2410, 2410, 3952, 2410, +- 2410, 3952, 2410, 2410, 2410, 2410, 2410, 2410, 2410, 2410, +- 2410, 2410, 2410, 2415, 3952, 2415, 3952, 2415, 2415, 2415, +- 2415, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2298, +- 3952, 2298, 2298, 3952, 3952, 2298, 2298, 2298, 2298, 2298, +- 2298, 2298, 2298, 2298, 2298, 2298, 2298, 2560, 2560, 2560, +- 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, +- 2560, 2560, 2560, 2560, 2560, 2563, 2563, 2563, 2563, 2563, +- +- 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, +- 2563, 2563, 2563, 2571, 3952, 3952, 2571, 2571, 3952, 3952, +- 2571, 3952, 2571, 3952, 2571, 2571, 2571, 2571, 2590, 3952, +- 2590, 3952, 2590, 2590, 2590, 2590, 2592, 3952, 3952, 2592, +- 2592, 3952, 3952, 2592, 3952, 2592, 3952, 2592, 2592, 2592, +- 2592, 2624, 2624, 3952, 2624, 2624, 2624, 2624, 2624, 2624, +- 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2691, 3952, +- 2691, 2691, 3952, 3952, 2691, 2691, 2691, 2691, 2691, 2691, +- 2691, 2691, 2691, 2691, 2691, 2691, 2502, 2502, 2502, 2502, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- +- 2502, 2502, 2502, 2502, 2504, 2504, 2504, 2504, 2504, 2504, ++ 2142, 2142, 2142, 2142, 2178, 2178, 3965, 3965, 2178, 2178, ++ 2178, 2178, 2178, 3965, 2178, 2178, 2178, 2178, 2178, 2178, ++ 2178, 2178, 2196, 3965, 3965, 2196, 2196, 3965, 3965, 2196, ++ 3965, 2196, 3965, 2196, 2196, 2196, 2196, 2284, 2284, 2284, ++ ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2297, 3965, 2297, 2297, 3965, ++ 3965, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, ++ 2297, 2297, 2297, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2333, 3965, 3965, 3965, 3965, 3965, 2333, 2333, 2333, ++ 3965, 2333, 2333, 2333, 2333, 2333, 2333, 2333, 2333, 2359, ++ 2359, 3965, 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, ++ 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2361, 2361, 3965, ++ 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, ++ ++ 2361, 2361, 2361, 2361, 2361, 2387, 3965, 3965, 2387, 2387, ++ 3965, 3965, 2387, 3965, 2387, 3965, 2387, 2387, 2387, 2387, ++ 2400, 3965, 3965, 3965, 3965, 3965, 2400, 2400, 2400, 3965, ++ 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2411, 2411, ++ 3965, 2411, 2411, 3965, 2411, 2411, 2411, 2411, 2411, 2411, ++ 2411, 2411, 2411, 2411, 2411, 2416, 3965, 2416, 3965, 2416, ++ 2416, 2416, 2416, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2299, 3965, 2299, 2299, 3965, 3965, 2299, 2299, 2299, ++ 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2562, ++ ++ 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, ++ 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2565, 2565, 2565, ++ 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, ++ 2565, 2565, 2565, 2565, 2565, 2573, 3965, 3965, 2573, 2573, ++ 3965, 3965, 2573, 3965, 2573, 3965, 2573, 2573, 2573, 2573, ++ 2592, 3965, 2592, 3965, 2592, 2592, 2592, 2592, 2594, 3965, ++ 3965, 2594, 2594, 3965, 3965, 2594, 3965, 2594, 3965, 2594, ++ 2594, 2594, 2594, 2626, 2626, 3965, 2626, 2626, 2626, 2626, ++ 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, ++ 2694, 3965, 2694, 2694, 3965, 3965, 2694, 2694, 2694, 2694, ++ ++ 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2504, 2504, + 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, +- 2504, 2504, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2706, 3952, 2706, 2706, 3952, 3952, 2706, 2706, 2706, 2706, +- 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2089, 2089, 2089, 2089, ++ 2504, 2504, 2504, 2504, 2504, 2504, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2709, 3965, 2709, 2709, 3965, 3965, 2709, 2709, ++ 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2089, 2089, ++ + 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, +- 2089, 2089, 2089, 2089, 2358, 2358, 3952, 2358, 2358, 2358, +- +- 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, +- 2358, 2358, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, +- 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, +- 2360, 2360, 3952, 2360, 2360, 2360, 2360, 2360, 2360, 2360, +- 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2563, 2563, +- 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, +- 2563, 2563, 2563, 2563, 2563, 2563, 2755, 3952, 2755, 3952, +- 2755, 2755, 2755, 2755, 2571, 3952, 2571, 3952, 2571, 2571, +- 2571, 2571, 2756, 3952, 3952, 2756, 3952, 3952, 3952, 2756, +- 3952, 2756, 3952, 2756, 2756, 2756, 2756, 2766, 3952, 3952, +- +- 2766, 2766, 3952, 3952, 2766, 3952, 2766, 3952, 2766, 2766, +- 2766, 2766, 2590, 3952, 3952, 2590, 3952, 2590, 3952, 2590, +- 2590, 2590, 2590, 2775, 3952, 2775, 3952, 2775, 2775, 2775, +- 2775, 2592, 3952, 2592, 3952, 2592, 2592, 2592, 2592, 2784, +- 2784, 3952, 2784, 2784, 3952, 2784, 2784, 2784, 2784, 2784, +- 2784, 2784, 2784, 2784, 2784, 2784, 2804, 3952, 3952, 2804, +- 2804, 3952, 3952, 2804, 3952, 2804, 3952, 2804, 2804, 2804, +- 2804, 2624, 2624, 3952, 2624, 2624, 3952, 2624, 2624, 2624, +- 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2808, 2808, +- 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, +- +- 2808, 2808, 2808, 2808, 2808, 2808, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2283, 2074, 2074, 2074, 2074, 2074, 2074, ++ 2089, 2089, 2089, 2089, 2089, 2089, 2359, 2359, 3965, 2359, ++ 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, ++ 2359, 2359, 2359, 2359, 2562, 2562, 2562, 2562, 2562, 2562, ++ 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, ++ 2562, 2562, 2361, 2361, 3965, 2361, 2361, 2361, 2361, 2361, ++ 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, ++ 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, ++ 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2758, 3965, ++ 2758, 3965, 2758, 2758, 2758, 2758, 2573, 3965, 2573, 3965, ++ ++ 2573, 2573, 2573, 2573, 2759, 3965, 3965, 2759, 3965, 3965, ++ 3965, 2759, 3965, 2759, 3965, 2759, 2759, 2759, 2759, 2769, ++ 3965, 3965, 2769, 2769, 3965, 3965, 2769, 3965, 2769, 3965, ++ 2769, 2769, 2769, 2769, 2592, 3965, 3965, 2592, 3965, 2592, ++ 3965, 2592, 2592, 2592, 2592, 2778, 3965, 2778, 3965, 2778, ++ 2778, 2778, 2778, 2594, 3965, 2594, 3965, 2594, 2594, 2594, ++ 2594, 2787, 2787, 3965, 2787, 2787, 3965, 2787, 2787, 2787, ++ 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2807, 3965, ++ 3965, 2807, 2807, 3965, 3965, 2807, 3965, 2807, 3965, 2807, ++ 2807, 2807, 2807, 2626, 2626, 3965, 2626, 2626, 3965, 2626, ++ ++ 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, ++ 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, ++ 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2074, 2074, 2074, 2074, + 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, +- 2074, 2074, 2691, 3952, 2691, 2691, 3952, 3952, 2691, 2691, +- 2691, 2691, 2691, 2691, 2691, 2691, 2691, 2691, 2691, 2691, +- 2296, 3952, 2296, 2296, 3952, 3952, 2296, 2296, 2296, 2296, +- 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2868, 2868, +- 2868, 2868, 2868, 2868, 2868, 2868, 2868, 2868, 2868, 2868, +- 2868, 2868, 2868, 2868, 2868, 2868, 2501, 2501, 2501, 2501, +- +- 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2501, 2501, 2501, 2501, 2869, 2869, 2869, 2869, 2869, 2869, +- 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, +- 2869, 2869, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- 2298, 3952, 2298, 2298, 3952, 3952, 2298, 2298, 2298, 2298, +- 2298, 2298, 2298, 2298, 2298, 2298, 2298, 2298, 2882, 2882, +- 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, +- 2882, 2882, 2882, 2882, 2882, 2882, 2504, 2504, 2504, 2504, ++ 2074, 2074, 2074, 2074, 2694, 3965, 2694, 2694, 3965, 3965, ++ 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, ++ 2694, 2694, 2297, 3965, 2297, 2297, 3965, 3965, 2297, 2297, ++ 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, ++ ++ 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, ++ 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2873, 2873, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2504, 2504, 2504, 2504, 2504, 2504, + 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, +- +- 2504, 2504, 2504, 2504, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2706, 3952, 2706, 2706, 3952, 3952, 2706, 2706, +- 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2089, 2089, ++ 2504, 2504, 2299, 3965, 2299, 2299, 3965, 3965, 2299, 2299, ++ 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, ++ 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, ++ ++ 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2709, 3965, 2709, 2709, 3965, 3965, ++ 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, ++ 2709, 2709, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, + 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, +- 2089, 2089, 2089, 2089, 2089, 2089, 2755, 3952, 3952, 2755, +- 3952, 2755, 3952, 2755, 2755, 2755, 2755, 2756, 3952, 2756, +- 3952, 2756, 2756, 2756, 2756, 2942, 3952, 2942, 3952, 2942, +- +- 2942, 2942, 2942, 2766, 3952, 2766, 3952, 2766, 2766, 2766, +- 2766, 2775, 3952, 3952, 2775, 3952, 2775, 3952, 2775, 2775, +- 2775, 2775, 2784, 2784, 3952, 2784, 2784, 3952, 2784, 2784, +- 2784, 2784, 2784, 2784, 2784, 2784, 2784, 2784, 2784, 2972, +- 3952, 3952, 2972, 2972, 3952, 3952, 2972, 3952, 2972, 3952, +- 2972, 2972, 2972, 2972, 2981, 3952, 2981, 3952, 2981, 2981, +- 2981, 2981, 2804, 3952, 2804, 3952, 2804, 2804, 2804, 2804, +- 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, +- 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2283, 2283, +- 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, +- +- 2283, 2283, 2283, 2283, 2283, 2283, 2869, 2869, 2869, 2869, +- 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, +- 2869, 2869, 2869, 2869, 2871, 2871, 2871, 2871, 2871, 2871, +- 2871, 2871, 2871, 2871, 2871, 2871, 2871, 2871, 2871, 2871, +- 2871, 2871, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2298, 3952, +- 2298, 2298, 3952, 3952, 2298, 2298, 2298, 2298, 2298, 2298, +- 2298, 2298, 2298, 2298, 2298, 2298, 2882, 2882, 2882, 2882, +- +- 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, +- 2882, 2882, 2882, 2882, 2504, 2504, 2504, 2504, 2504, 2504, ++ 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2758, 3965, ++ ++ 3965, 2758, 3965, 2758, 3965, 2758, 2758, 2758, 2758, 2759, ++ 3965, 2759, 3965, 2759, 2759, 2759, 2759, 2946, 3965, 2946, ++ 3965, 2946, 2946, 2946, 2946, 2769, 3965, 2769, 3965, 2769, ++ 2769, 2769, 2769, 2778, 3965, 3965, 2778, 3965, 2778, 3965, ++ 2778, 2778, 2778, 2778, 2787, 2787, 3965, 2787, 2787, 3965, ++ 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, ++ 2787, 2976, 3965, 3965, 2976, 2976, 3965, 3965, 2976, 3965, ++ 2976, 3965, 2976, 2976, 2976, 2976, 2985, 3965, 2985, 3965, ++ 2985, 2985, 2985, 2985, 2807, 3965, 2807, 3965, 2807, 2807, ++ 2807, 2807, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, ++ ++ 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2873, 2873, 2875, 2875, 2875, 2875, ++ 2875, 2875, 2875, 2875, 2875, 2875, 2875, 2875, 2875, 2875, ++ 2875, 2875, 2875, 2875, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, + 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, +- 2504, 2504, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 3112, 3112, +- 3952, 3112, 3112, 3952, 3112, 3112, 3112, 3112, 3112, 3112, +- 3112, 3112, 3112, 3112, 3112, 3115, 3952, 3952, 3115, 3115, +- 3952, 3952, 3115, 3952, 3115, 3952, 3115, 3115, 3115, 3115, +- +- 3118, 3118, 3118, 3118, 3952, 3118, 3118, 3118, 3118, 3118, +- 3118, 3118, 3118, 3118, 3118, 3118, 3118, 3118, 3133, 3952, +- 3952, 3952, 3952, 3952, 3133, 3133, 3133, 3952, 3133, 3133, +- 3133, 3133, 3133, 3133, 3133, 3133, 3209, 3209, 3209, 3209, +- 3209, 3209, 3209, 3209, 3209, 3209, 3209, 3209, 3209, 3209, +- 3209, 3209, 3209, 3209, 3252, 3952, 3252, 3952, 3252, 3252, +- 3252, 3252, 3274, 3274, 3952, 3274, 3274, 3952, 3274, 3274, +- 3274, 3274, 3274, 3274, 3274, 3274, 3274, 3274, 3274, 3356, +- 3952, 3952, 3356, 3356, 3952, 3952, 3952, 3952, 3952, 3952, +- 3356, 3372, 3372, 3952, 3952, 3952, 3372, 3372, 3372, 3372, +- +- 3372, 3372, 3372, 3372, 3372, 3372, 3372, 3372, 3372, 3478, +- 3478, 3952, 3478, 3478, 3952, 3478, 3478, 3478, 3478, 3478, +- 3478, 3478, 3478, 3478, 3478, 3478, 3488, 3488, 3952, 3488, +- 3488, 3952, 3488, 3488, 3488, 3488, 3488, 3488, 3488, 3488, +- 3488, 3488, 3488, 3563, 3563, 3952, 3563, 3563, 3563, 3563, +- 3563, 3563, 3563, 3563, 3563, 3563, 3563, 3563, 3563, 3563, +- 3566, 3566, 3952, 3566, 3566, 3566, 3566, 3566, 3566, 3566, +- 3566, 3566, 3566, 3566, 3566, 3566, 3566, 3610, 3952, 3610, +- 3952, 3610, 3952, 3610, 3610, 3610, 3610, 3641, 3641, 3952, +- 3641, 3641, 3952, 3641, 3641, 3641, 3641, 3641, 3641, 3641, +- +- 3641, 3641, 3641, 3641, 3642, 3642, 3952, 3642, 3642, 3952, +- 3642, 3642, 3642, 3642, 3642, 3642, 3642, 3642, 3642, 3642, +- 3642, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, +- 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3679, +- 3952, 3679, 3952, 3679, 3952, 3679, 3679, 3679, 3679, 3683, +- 3683, 3952, 3683, 3683, 3683, 3683, 3683, 3683, 3683, 3683, +- 3683, 3683, 3683, 3683, 3683, 3683, 3683, 3694, 3694, 3952, +- 3694, 3694, 3952, 3694, 3694, 3694, 3694, 3694, 3694, 3694, +- 3694, 3694, 3694, 3694, 3696, 3696, 3952, 3952, 3696, 3696, +- 3696, 3696, 3696, 3952, 3696, 3696, 3696, 3696, 3696, 3696, +- +- 3696, 3696, 3685, 3685, 3952, 3685, 3685, 3952, 3685, 3685, +- 3685, 3685, 3685, 3685, 3685, 3685, 3685, 3685, 3685, 3745, +- 3952, 3952, 3952, 3952, 3952, 3745, 3745, 3745, 3952, 3745, +- 3745, 3745, 3745, 3745, 3745, 3745, 3745, 3687, 3952, 3952, +- 3952, 3952, 3952, 3687, 3687, 3687, 3952, 3687, 3687, 3687, +- 3687, 3687, 3687, 3687, 3687, 3748, 3952, 3952, 3748, 3748, +- 3952, 3952, 3748, 3952, 3748, 3952, 3748, 3748, 3748, 3748, +- 3751, 3751, 3952, 3751, 3751, 3952, 3751, 3751, 3751, 3751, +- 3751, 3751, 3751, 3751, 3751, 3751, 3751, 3752, 3952, 3952, +- 3952, 3952, 3952, 3752, 3752, 3752, 3952, 3752, 3752, 3752, +- +- 3752, 3752, 3752, 3752, 3752, 3789, 3952, 3789, 3952, 3789, +- 3789, 3789, 3789, 3790, 3790, 3952, 3790, 3790, 3952, 3790, +- 3790, 3790, 3790, 3790, 3790, 3790, 3790, 3790, 3790, 3790, +- 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, +- 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3837, 3837, +- 3952, 3837, 3837, 3952, 3837, 3837, 3837, 3837, 3837, 3837, +- 3837, 3837, 3837, 3837, 3837, 3840, 3840, 3952, 3952, 3840, +- 3840, 3840, 3840, 3840, 3952, 3840, 3840, 3840, 3840, 3840, +- 3840, 3840, 3840, 3842, 3842, 3952, 3952, 3842, 3842, 3842, +- 3842, 3842, 3952, 3842, 3842, 3842, 3842, 3842, 3842, 3842, +- +- 3842, 3870, 3870, 3952, 3870, 3870, 3952, 3870, 3870, 3870, +- 3870, 3870, 3870, 3870, 3870, 3870, 3870, 3870, 3871, 3871, +- 3952, 3871, 3871, 3952, 3871, 3871, 3871, 3871, 3871, 3871, +- 3871, 3871, 3871, 3871, 3871, 3872, 3872, 3952, 3952, 3872, +- 3872, 3872, 3872, 3872, 3952, 3872, 3872, 3872, 3872, 3872, +- 3872, 3872, 3872, 3874, 3874, 3952, 3952, 3874, 3874, 3874, +- 3874, 3874, 3952, 3874, 3874, 3874, 3874, 3874, 3874, 3874, +- 3874, 3888, 3952, 3888, 3952, 3888, 3952, 3888, 3888, 3888, +- 3888, 3890, 3890, 3952, 3890, 3890, 3890, 3890, 3890, 3890, +- 3890, 3890, 3890, 3890, 3890, 3890, 3890, 3890, 3901, 3901, +- +- 3952, 3901, 3901, 3952, 3901, 3901, 3901, 3901, 3901, 3901, +- 3901, 3901, 3901, 3901, 3901, 3902, 3902, 3952, 3902, 3902, +- 3952, 3902, 3902, 3902, 3902, 3902, 3902, 3902, 3902, 3902, +- 3902, 3902, 3914, 3952, 3914, 3952, 3914, 3952, 3914, 3914, +- 3914, 3914, 3915, 3952, 3952, 3952, 3952, 3952, 3915, 3915, +- 3915, 3952, 3915, 3915, 3915, 3915, 3915, 3915, 3915, 3915, +- 75, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952 ++ ++ 2299, 3965, 2299, 2299, 3965, 3965, 2299, 2299, 2299, 2299, ++ 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2886, 2886, ++ 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, ++ 2886, 2886, 2886, 2886, 2886, 2886, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 3117, 3117, 3965, 3117, 3117, 3965, 3117, 3117, 3117, 3117, ++ ++ 3117, 3117, 3117, 3117, 3117, 3117, 3117, 3120, 3965, 3965, ++ 3120, 3120, 3965, 3965, 3120, 3965, 3120, 3965, 3120, 3120, ++ 3120, 3120, 3123, 3123, 3123, 3123, 3965, 3123, 3123, 3123, ++ 3123, 3123, 3123, 3123, 3123, 3123, 3123, 3123, 3123, 3123, ++ 3138, 3965, 3965, 3965, 3965, 3965, 3138, 3138, 3138, 3965, ++ 3138, 3138, 3138, 3138, 3138, 3138, 3138, 3138, 3215, 3215, ++ 3215, 3215, 3215, 3215, 3215, 3215, 3215, 3215, 3215, 3215, ++ 3215, 3215, 3215, 3215, 3215, 3215, 3258, 3965, 3258, 3965, ++ 3258, 3258, 3258, 3258, 3280, 3280, 3965, 3280, 3280, 3965, ++ 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, ++ ++ 3280, 3363, 3965, 3965, 3363, 3363, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3363, 3379, 3379, 3965, 3965, 3965, 3379, 3379, ++ 3379, 3379, 3379, 3379, 3379, 3379, 3379, 3379, 3379, 3379, ++ 3379, 3486, 3486, 3965, 3486, 3486, 3965, 3486, 3486, 3486, ++ 3486, 3486, 3486, 3486, 3486, 3486, 3486, 3486, 3496, 3496, ++ 3965, 3496, 3496, 3965, 3496, 3496, 3496, 3496, 3496, 3496, ++ 3496, 3496, 3496, 3496, 3496, 3572, 3572, 3965, 3572, 3572, ++ 3572, 3572, 3572, 3572, 3572, 3572, 3572, 3572, 3572, 3572, ++ 3572, 3572, 3575, 3575, 3965, 3575, 3575, 3575, 3575, 3575, ++ 3575, 3575, 3575, 3575, 3575, 3575, 3575, 3575, 3575, 3620, ++ ++ 3965, 3620, 3965, 3620, 3965, 3620, 3620, 3620, 3620, 3651, ++ 3651, 3965, 3651, 3651, 3965, 3651, 3651, 3651, 3651, 3651, ++ 3651, 3651, 3651, 3651, 3651, 3651, 3652, 3652, 3965, 3652, ++ 3652, 3965, 3652, 3652, 3652, 3652, 3652, 3652, 3652, 3652, ++ 3652, 3652, 3652, 3655, 3655, 3655, 3655, 3655, 3655, 3655, ++ 3655, 3655, 3655, 3655, 3655, 3655, 3655, 3655, 3655, 3655, ++ 3655, 3690, 3965, 3690, 3965, 3690, 3965, 3690, 3690, 3690, ++ 3690, 3694, 3694, 3965, 3694, 3694, 3694, 3694, 3694, 3694, ++ 3694, 3694, 3694, 3694, 3694, 3694, 3694, 3694, 3694, 3705, ++ 3705, 3965, 3705, 3705, 3965, 3705, 3705, 3705, 3705, 3705, ++ ++ 3705, 3705, 3705, 3705, 3705, 3705, 3707, 3707, 3965, 3965, ++ 3707, 3707, 3707, 3707, 3707, 3965, 3707, 3707, 3707, 3707, ++ 3707, 3707, 3707, 3707, 3696, 3696, 3965, 3696, 3696, 3965, ++ 3696, 3696, 3696, 3696, 3696, 3696, 3696, 3696, 3696, 3696, ++ 3696, 3757, 3965, 3965, 3965, 3965, 3965, 3757, 3757, 3757, ++ 3965, 3757, 3757, 3757, 3757, 3757, 3757, 3757, 3757, 3698, ++ 3965, 3965, 3965, 3965, 3965, 3698, 3698, 3698, 3965, 3698, ++ 3698, 3698, 3698, 3698, 3698, 3698, 3698, 3760, 3965, 3965, ++ 3760, 3760, 3965, 3965, 3760, 3965, 3760, 3965, 3760, 3760, ++ 3760, 3760, 3763, 3763, 3965, 3763, 3763, 3965, 3763, 3763, ++ ++ 3763, 3763, 3763, 3763, 3763, 3763, 3763, 3763, 3763, 3764, ++ 3965, 3965, 3965, 3965, 3965, 3764, 3764, 3764, 3965, 3764, ++ 3764, 3764, 3764, 3764, 3764, 3764, 3764, 3802, 3965, 3802, ++ 3965, 3802, 3802, 3802, 3802, 3803, 3803, 3965, 3803, 3803, ++ 3965, 3803, 3803, 3803, 3803, 3803, 3803, 3803, 3803, 3803, ++ 3803, 3803, 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, ++ 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, ++ 3850, 3850, 3965, 3850, 3850, 3965, 3850, 3850, 3850, 3850, ++ 3850, 3850, 3850, 3850, 3850, 3850, 3850, 3853, 3853, 3965, ++ 3965, 3853, 3853, 3853, 3853, 3853, 3965, 3853, 3853, 3853, ++ ++ 3853, 3853, 3853, 3853, 3853, 3855, 3855, 3965, 3965, 3855, ++ 3855, 3855, 3855, 3855, 3965, 3855, 3855, 3855, 3855, 3855, ++ 3855, 3855, 3855, 3883, 3883, 3965, 3883, 3883, 3965, 3883, ++ 3883, 3883, 3883, 3883, 3883, 3883, 3883, 3883, 3883, 3883, ++ 3884, 3884, 3965, 3884, 3884, 3965, 3884, 3884, 3884, 3884, ++ 3884, 3884, 3884, 3884, 3884, 3884, 3884, 3885, 3885, 3965, ++ 3965, 3885, 3885, 3885, 3885, 3885, 3965, 3885, 3885, 3885, ++ 3885, 3885, 3885, 3885, 3885, 3887, 3887, 3965, 3965, 3887, ++ 3887, 3887, 3887, 3887, 3965, 3887, 3887, 3887, 3887, 3887, ++ 3887, 3887, 3887, 3901, 3965, 3901, 3965, 3901, 3965, 3901, ++ ++ 3901, 3901, 3901, 3903, 3903, 3965, 3903, 3903, 3903, 3903, ++ 3903, 3903, 3903, 3903, 3903, 3903, 3903, 3903, 3903, 3903, ++ 3914, 3914, 3965, 3914, 3914, 3965, 3914, 3914, 3914, 3914, ++ 3914, 3914, 3914, 3914, 3914, 3914, 3914, 3915, 3915, 3965, ++ 3915, 3915, 3965, 3915, 3915, 3915, 3915, 3915, 3915, 3915, ++ 3915, 3915, 3915, 3915, 3927, 3965, 3927, 3965, 3927, 3965, ++ 3927, 3927, 3927, 3927, 3928, 3965, 3965, 3965, 3965, 3965, ++ 3928, 3928, 3928, 3965, 3928, 3928, 3928, 3928, 3928, 3928, ++ 3928, 3928, 75, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965 + } ; + +-static const flex_int16_t yy_chk[14349] = ++static const flex_int16_t yy_chk[14371] = + { 0, + 0, 1, 1, 1, 1, 5, 1, 1, 5, 6, + 95, 95, 6, 0, 1, 7, 7, 7, 7, 7, + 7, 0, 9, 9, 7, 9, 9, 13, 7, 1191, +- 1, 13, 1, 1, 3928, 83, 13, 1, 1, 1, +- 116, 116, 14, 1, 1, 1, 14, 1, 1, 3915, ++ 1, 13, 1, 1, 3941, 83, 13, 1, 1, 1, ++ 116, 116, 14, 1, 1, 1, 14, 1, 1, 3928, + 9, 14, 1, 874, 15, 15, 1, 15, 1, 874, + 1, 1, 15, 83, 15, 1, 1, 1, 71, 84, + 7, 1, 1, 1, 1191, 1, 1, 9, 132, 132, +@@ -3462,10 +3467,10 @@ static const flex_int16_t yy_chk[14349] = + 72, 10, 10, 85, 2, 21, 21, 84, 21, 7, + + 7, 86, 11, 11, 49, 11, 11, 72, 49, 15, +- 2, 49, 2, 2, 87, 3902, 10, 2, 2, 2, ++ 2, 49, 2, 2, 87, 3915, 10, 2, 2, 2, + 88, 85, 774, 2, 2, 2, 89, 2, 2, 86, + 11, 92, 2, 250, 118, 250, 2, 118, 2, 774, +- 2, 2, 87, 10, 3901, 2, 2, 2, 88, 3890, ++ 2, 2, 87, 10, 3914, 2, 2, 2, 88, 3903, + 21, 2, 2, 2, 89, 2, 2, 11, 49, 92, + 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, +@@ -3478,8 +3483,8 @@ static const flex_int16_t yy_chk[14349] = + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 8, 8, + 8, 8, 8, 8, 93, 12, 12, 8, 12, 12, +- 3871, 8, 16, 16, 2296, 16, 17, 17, 3870, 17, +- 16, 17, 16, 47, 17, 47, 18, 18, 2296, 18, ++ 3884, 8, 16, 16, 2297, 16, 17, 17, 3883, 17, ++ 16, 17, 16, 47, 17, 47, 18, 18, 2297, 18, + 47, 18, 93, 12, 18, 19, 19, 137, 19, 137, + 19, 20, 20, 19, 20, 257, 20, 257, 19, 20, + +@@ -3487,12 +3492,12 @@ static const flex_int16_t yy_chk[14349] = + 12, 220, 81, 297, 90, 33, 33, 16, 33, 100, + 33, 17, 90, 33, 297, 27, 27, 47, 27, 94, + 27, 18, 8, 8, 137, 27, 35, 35, 27, 35, +- 19, 27, 90, 3860, 35, 91, 20, 100, 28, 28, ++ 19, 27, 90, 3873, 35, 91, 20, 100, 28, 28, + 90, 28, 27, 28, 48, 101, 81, 139, 28, 139, + 22, 28, 91, 388, 28, 220, 29, 29, 104, 29, +- 33, 29, 3829, 91, 29, 28, 29, 107, 143, 29, +- 27, 143, 29, 101, 30, 30, 3827, 30, 108, 30, +- 91, 35, 30, 29, 30, 3823, 104, 30, 36, 36, ++ 33, 29, 3842, 91, 29, 28, 29, 107, 143, 29, ++ 27, 143, 29, 101, 30, 30, 3840, 30, 108, 30, ++ 91, 35, 30, 29, 30, 3836, 104, 30, 36, 36, + + 30, 36, 388, 28, 139, 107, 36, 213, 213, 27, + 27, 30, 223, 223, 31, 31, 108, 31, 109, 31, +@@ -3502,10 +3507,10 @@ static const flex_int16_t yy_chk[14349] = + 34, 32, 34, 36, 34, 114, 65, 34, 39, 39, + 39, 39, 32, 39, 115, 40, 40, 40, 40, 31, + 40, 39, 105, 140, 105, 45, 196, 219, 40, 196, +- 219, 46, 219, 114, 65, 195, 195, 195, 195, 3822, +- 32, 225, 115, 3815, 225, 226, 226, 265, 265, 97, ++ 219, 46, 219, 114, 65, 195, 195, 195, 195, 3835, ++ 32, 225, 115, 3828, 225, 226, 226, 265, 265, 97, + +- 105, 140, 105, 3792, 34, 37, 37, 37, 37, 37, ++ 105, 140, 105, 3805, 34, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, +@@ -3516,49 +3521,49 @@ static const flex_int16_t yy_chk[14349] = + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 41, 41, 41, 41, 147, 41, 42, 42, + +- 42, 42, 153, 42, 43, 43, 43, 43, 3789, 43, ++ 42, 42, 153, 42, 43, 43, 43, 43, 3802, 43, + 44, 44, 44, 44, 50, 44, 102, 66, 50, 59, + 66, 50, 286, 286, 147, 66, 73, 60, 102, 73, + 153, 73, 129, 74, 73, 129, 74, 283, 74, 66, + 283, 74, 315, 318, 102, 315, 318, 41, 73, 185, + 59, 67, 59, 42, 185, 74, 102, 173, 60, 43, +- 60, 59, 59, 59, 59, 44, 2703, 66, 50, 60, ++ 60, 59, 59, 59, 59, 44, 2706, 66, 50, 60, + 60, 60, 60, 68, 77, 77, 73, 77, 59, 348, + 59, 183, 67, 74, 67, 173, 60, 129, 60, 59, + 59, 59, 59, 67, 67, 67, 67, 60, 60, 60, + +- 60, 185, 99, 484, 68, 99, 68, 103, 2703, 183, ++ 60, 185, 99, 484, 68, 99, 68, 103, 2706, 183, + 67, 106, 67, 111, 103, 68, 68, 68, 68, 189, +- 110, 67, 67, 67, 67, 106, 348, 3780, 111, 77, ++ 110, 67, 67, 67, 67, 106, 348, 3793, 111, 77, + 99, 106, 68, 99, 68, 103, 110, 112, 177, 106, +- 177, 111, 103, 68, 68, 68, 68, 189, 110, 3752, ++ 177, 111, 103, 68, 68, 68, 68, 189, 110, 3764, + 113, 309, 112, 106, 113, 113, 111, 484, 145, 106, +- 198, 145, 309, 2870, 110, 112, 119, 119, 119, 119, ++ 198, 145, 309, 2874, 110, 112, 119, 119, 119, 119, + 201, 119, 120, 120, 120, 120, 179, 120, 113, 179, + 112, 177, 113, 113, 121, 121, 121, 121, 198, 121, + 126, 126, 126, 126, 199, 126, 203, 133, 201, 138, + +- 133, 199, 138, 142, 142, 2870, 187, 138, 145, 138, ++ 133, 199, 138, 142, 142, 2874, 187, 138, 145, 138, + 142, 187, 142, 199, 133, 133, 148, 148, 436, 436, + 148, 119, 199, 148, 203, 133, 179, 120, 133, 199, +- 144, 156, 156, 144, 156, 144, 3745, 181, 144, 121, ++ 144, 156, 156, 144, 156, 144, 3757, 181, 144, 121, + 181, 199, 133, 133, 205, 126, 131, 131, 131, 131, + 131, 131, 208, 131, 138, 211, 131, 142, 187, 405, + 131, 149, 131, 131, 149, 131, 131, 131, 188, 149, + 148, 188, 205, 642, 131, 131, 131, 131, 131, 131, +- 208, 131, 3716, 211, 131, 144, 156, 181, 131, 151, ++ 208, 131, 3727, 211, 131, 144, 156, 181, 131, 151, + 131, 131, 151, 131, 131, 131, 150, 151, 405, 150, + + 494, 150, 157, 157, 150, 157, 155, 155, 200, 150, + 155, 149, 642, 155, 159, 159, 159, 159, 155, 162, + 162, 200, 162, 188, 162, 166, 166, 212, 166, 346, +- 166, 346, 162, 877, 380, 3714, 200, 380, 166, 151, +- 169, 166, 3677, 169, 210, 169, 162, 210, 169, 200, +- 435, 150, 166, 435, 494, 212, 2883, 157, 167, 167, ++ 166, 346, 162, 877, 380, 3725, 200, 380, 166, 151, ++ 169, 166, 3688, 169, 210, 169, 162, 210, 169, 200, ++ 435, 150, 166, 435, 494, 212, 2887, 157, 167, 167, + 155, 167, 169, 167, 869, 168, 168, 230, 168, 159, + 168, 167, 877, 202, 162, 210, 346, 1393, 168, 186, + 166, 170, 186, 202, 170, 167, 170, 186, 206, 170, +- 169, 170, 168, 3672, 170, 230, 206, 171, 2883, 235, ++ 169, 170, 168, 3683, 170, 230, 206, 171, 2887, 235, + + 171, 202, 171, 162, 162, 171, 905, 359, 170, 166, + 166, 202, 224, 167, 414, 224, 206, 224, 174, 171, +@@ -3566,8 +3571,8 @@ static const flex_int16_t yy_chk[14349] = + 176, 243, 869, 176, 186, 176, 170, 498, 176, 2070, + 174, 2070, 167, 167, 178, 178, 521, 171, 178, 168, + 168, 178, 176, 178, 359, 180, 178, 521, 180, 243, +- 180, 414, 244, 180, 3646, 184, 184, 224, 174, 184, +- 178, 3642, 184, 905, 190, 190, 190, 486, 486, 197, ++ 180, 414, 244, 180, 3656, 184, 184, 224, 174, 184, ++ 178, 3652, 184, 905, 190, 190, 190, 486, 486, 197, + 176, 190, 192, 192, 192, 192, 204, 245, 197, 209, + 244, 498, 197, 209, 207, 192, 246, 197, 178, 209, + +@@ -3594,13 +3599,13 @@ static const flex_int16_t yy_chk[14349] = + 301, 302, 313, 314, 323, 327, 303, 323, 327, 323, + + 304, 305, 507, 307, 304, 325, 304, 308, 325, 310, +- 325, 306, 306, 328, 329, 311, 312, 330, 332, 3641, ++ 325, 306, 306, 328, 329, 311, 312, 330, 332, 3651, + 313, 314, 319, 319, 319, 319, 887, 319, 320, 320, + 320, 320, 335, 320, 321, 321, 321, 321, 333, 321, + 331, 328, 329, 331, 336, 330, 332, 335, 337, 507, + 327, 338, 333, 333, 334, 1117, 334, 339, 340, 341, + 335, 1117, 340, 342, 344, 337, 333, 442, 331, 345, +- 337, 331, 336, 345, 746, 335, 337, 319, 3600, 338, ++ 337, 331, 336, 345, 746, 335, 337, 319, 3610, 338, + 333, 333, 334, 320, 334, 339, 340, 341, 343, 321, + 340, 342, 344, 337, 887, 442, 349, 345, 337, 349, + +@@ -3609,49 +3614,49 @@ static const flex_int16_t yy_chk[14349] = + 353, 354, 356, 362, 360, 356, 362, 360, 746, 360, + 343, 343, 360, 361, 361, 363, 364, 514, 363, 364, + 361, 364, 365, 443, 364, 366, 365, 369, 366, 365, +- 2273, 349, 2273, 366, 372, 370, 351, 372, 370, 3045, ++ 2274, 349, 2274, 366, 372, 370, 351, 372, 370, 3050, + 370, 350, 355, 370, 441, 353, 354, 441, 370, 371, + 371, 443, 356, 362, 373, 374, 371, 373, 374, 360, + 374, 371, 373, 374, 514, 363, 375, 361, 374, 444, + 375, 364, 524, 375, 411, 366, 365, 411, 375, 376, + +- 376, 3045, 376, 524, 372, 377, 377, 445, 377, 398, ++ 376, 3050, 376, 524, 372, 377, 377, 445, 377, 398, + 370, 379, 379, 379, 379, 381, 381, 444, 381, 384, + 384, 446, 384, 371, 373, 1110, 382, 382, 398, 382, + 374, 382, 384, 395, 474, 445, 395, 474, 395, 382, + 375, 395, 386, 386, 411, 386, 384, 386, 447, 446, +- 2626, 416, 416, 382, 376, 386, 398, 2808, 416, 448, ++ 2628, 416, 416, 382, 376, 386, 398, 2811, 416, 448, + 377, 488, 387, 387, 488, 387, 379, 387, 483, 386, + 381, 483, 421, 483, 384, 387, 447, 421, 387, 389, + 389, 382, 389, 395, 389, 390, 390, 448, 390, 387, + 390, 391, 389, 1110, 391, 389, 391, 386, 390, 391, + +- 2626, 426, 426, 384, 384, 416, 389, 2808, 426, 428, ++ 2628, 426, 426, 384, 384, 416, 389, 2811, 426, 428, + 382, 382, 390, 391, 428, 394, 403, 387, 394, 403, +- 394, 403, 449, 394, 421, 396, 386, 386, 396, 2274, +- 396, 2274, 403, 396, 389, 396, 3584, 394, 396, 417, ++ 394, 403, 449, 394, 421, 396, 386, 386, 396, 2275, ++ 396, 2275, 403, 396, 389, 396, 3593, 394, 396, 417, + 390, 391, 417, 403, 397, 397, 387, 387, 397, 562, +- 449, 397, 396, 397, 399, 426, 397, 399, 3566, 399, ++ 449, 397, 396, 397, 399, 426, 397, 399, 3575, 399, + 562, 428, 399, 389, 389, 394, 427, 427, 427, 390, + 390, 403, 425, 427, 401, 425, 399, 401, 402, 401, + 396, 402, 401, 402, 401, 565, 402, 401, 402, 417, + 418, 402, 487, 418, 402, 487, 565, 487, 397, 403, + + 403, 401, 451, 420, 399, 402, 1322, 420, 404, 406, +- 420, 404, 406, 404, 406, 3563, 404, 406, 404, 406, ++ 420, 404, 406, 404, 406, 3572, 404, 406, 404, 406, + 427, 404, 406, 415, 404, 406, 415, 425, 415, 401, + 451, 415, 858, 402, 409, 404, 406, 409, 431, 409, + 418, 410, 409, 431, 409, 410, 419, 409, 410, 419, + 410, 419, 424, 410, 419, 424, 495, 420, 401, 495, + 424, 409, 402, 404, 406, 429, 1331, 410, 429, 430, +- 3535, 430, 454, 429, 1322, 455, 430, 456, 415, 858, ++ 3544, 430, 454, 429, 1322, 455, 430, 456, 415, 858, + 452, 432, 432, 432, 432, 438, 438, 438, 438, 409, + 431, 452, 404, 406, 432, 410, 450, 457, 450, 458, + + 454, 419, 450, 455, 459, 456, 460, 424, 452, 462, + 463, 462, 464, 465, 466, 459, 467, 468, 467, 452, + 429, 465, 464, 430, 450, 457, 450, 458, 469, 471, +- 450, 465, 459, 1331, 460, 3530, 432, 462, 463, 462, ++ 450, 465, 459, 1331, 460, 3539, 432, 462, 463, 462, + 464, 465, 466, 459, 467, 468, 467, 472, 489, 465, + 464, 489, 473, 489, 896, 500, 469, 471, 500, 465, + 470, 470, 493, 470, 900, 493, 470, 493, 470, 520, +@@ -3661,12 +3666,12 @@ static const flex_int16_t yy_chk[14349] = + + 470, 522, 470, 900, 470, 470, 470, 470, 480, 480, + 480, 480, 481, 481, 481, 481, 482, 482, 482, 482, +- 1326, 482, 485, 485, 485, 485, 2881, 485, 491, 491, ++ 1326, 482, 485, 485, 485, 485, 2885, 485, 491, 491, + 491, 491, 502, 491, 906, 502, 476, 492, 492, 492, +- 492, 499, 492, 2881, 499, 503, 499, 505, 503, 508, ++ 492, 499, 492, 2885, 499, 503, 499, 505, 503, 508, + 503, 510, 505, 523, 508, 511, 510, 515, 511, 516, + 515, 525, 516, 480, 589, 528, 531, 481, 528, 531, +- 3519, 482, 532, 528, 531, 589, 533, 485, 542, 533, ++ 3528, 482, 532, 528, 531, 589, 533, 485, 542, 533, + 543, 523, 538, 491, 533, 538, 544, 528, 1326, 525, + 538, 532, 492, 539, 557, 539, 499, 557, 533, 505, + +@@ -3675,11 +3680,11 @@ static const flex_int16_t yy_chk[14349] = + 535, 550, 535, 551, 552, 535, 533, 553, 540, 555, + 545, 540, 538, 540, 556, 559, 540, 560, 546, 535, + 539, 547, 558, 561, 563, 558, 548, 564, 566, 550, +- 540, 551, 552, 3058, 3509, 553, 567, 555, 1580, 3507, +- 568, 570, 556, 559, 571, 560, 590, 535, 3488, 590, +- 591, 561, 563, 591, 3442, 564, 566, 572, 540, 554, ++ 540, 551, 552, 3063, 3518, 553, 567, 555, 1580, 3516, ++ 568, 570, 556, 559, 571, 560, 590, 535, 3496, 590, ++ 591, 561, 563, 591, 3450, 564, 566, 572, 540, 554, + 573, 554, 554, 574, 567, 554, 554, 554, 568, 570, +- 575, 554, 571, 576, 554, 3058, 554, 554, 554, 554, ++ 575, 554, 571, 576, 554, 3063, 554, 554, 554, 554, + + 579, 554, 554, 580, 577, 572, 581, 554, 573, 554, + 554, 574, 582, 554, 554, 554, 578, 578, 575, 554, +@@ -3690,13 +3695,13 @@ static const flex_int16_t yy_chk[14349] = + 613, 585, 614, 586, 587, 588, 593, 594, 615, 595, + 596, 598, 616, 617, 599, 600, 618, 602, 603, 619, + 606, 607, 608, 588, 609, 610, 611, 612, 613, 620, +- 614, 620, 640, 3435, 626, 623, 615, 626, 623, 637, ++ 614, 620, 640, 3443, 626, 623, 615, 626, 623, 637, + + 616, 617, 637, 623, 618, 623, 624, 619, 638, 624, +- 629, 638, 3403, 629, 624, 629, 624, 630, 629, 3339, +- 630, 632, 630, 655, 632, 630, 3321, 635, 645, 632, +- 635, 640, 635, 3305, 636, 635, 620, 636, 645, 636, +- 635, 645, 636, 653, 626, 3299, 653, 636, 653, 3297, ++ 629, 638, 3410, 629, 624, 629, 624, 630, 629, 3346, ++ 630, 632, 630, 655, 632, 630, 3328, 635, 645, 632, ++ 635, 640, 635, 3312, 636, 635, 620, 636, 645, 636, ++ 635, 645, 636, 653, 626, 3305, 653, 636, 653, 3303, + 623, 639, 639, 674, 639, 734, 639, 824, 734, 653, + 640, 624, 655, 662, 639, 629, 669, 639, 824, 669, + 653, 632, 630, 662, 641, 641, 662, 641, 639, 641, +@@ -3708,21 +3713,21 @@ static const flex_int16_t yy_chk[14349] = + 649, 687, 688, 690, 1321, 691, 653, 653, 682, 641, + 679, 683, 675, 679, 649, 639, 639, 692, 643, 684, + 736, 663, 685, 736, 662, 738, 686, 647, 738, 687, +- 688, 690, 672, 691, 2276, 672, 2276, 672, 641, 641, ++ 688, 690, 672, 691, 2277, 672, 2277, 672, 641, 641, + 672, 741, 649, 1321, 741, 692, 673, 643, 643, 673, +- 652, 673, 3291, 652, 673, 652, 647, 647, 652, 654, ++ 652, 673, 3297, 652, 673, 652, 647, 647, 652, 654, + 652, 693, 654, 652, 654, 679, 652, 654, 656, 654, + 694, 656, 654, 656, 695, 654, 656, 652, 656, 744, + + 657, 656, 744, 657, 656, 657, 654, 672, 657, 693, + 657, 861, 1329, 657, 664, 656, 657, 664, 694, 664, +- 3252, 673, 695, 658, 697, 652, 658, 657, 658, 3218, ++ 3258, 673, 695, 658, 697, 652, 658, 657, 658, 3224, + 664, 658, 659, 658, 654, 659, 658, 659, 698, 658, +- 659, 664, 659, 656, 3181, 659, 699, 701, 659, 702, ++ 659, 664, 659, 656, 3187, 659, 699, 701, 659, 702, + 658, 703, 697, 678, 652, 657, 678, 660, 861, 659, + 660, 678, 660, 654, 1332, 660, 698, 660, 680, 664, + 660, 680, 656, 660, 699, 701, 680, 702, 658, 703, +- 1329, 3168, 3163, 665, 660, 705, 665, 659, 665, 706, ++ 1329, 3174, 3168, 665, 660, 705, 665, 659, 665, 706, + 707, 665, 666, 665, 1395, 666, 665, 666, 664, 665, + + 666, 667, 666, 1332, 667, 666, 667, 658, 678, 667, +@@ -3733,19 +3738,19 @@ static const flex_int16_t yy_chk[14349] = + 724, 721, 711, 713, 715, 716, 667, 714, 714, 725, + 714, 714, 726, 719, 727, 719, 721, 665, 717, 719, + 718, 723, 714, 720, 722, 728, 729, 733, 724, 721, +- 748, 723, 3133, 748, 728, 714, 714, 725, 714, 714, ++ 748, 723, 3138, 748, 728, 714, 714, 725, 714, 714, + 726, 719, 727, 719, 721, 754, 730, 719, 730, 723, + + 730, 755, 1945, 728, 729, 733, 755, 752, 737, 723, +- 752, 737, 728, 737, 739, 740, 3118, 739, 740, 739, ++ 752, 737, 728, 737, 739, 740, 3123, 739, 740, 739, + 740, 762, 742, 754, 730, 742, 730, 742, 730, 745, + 747, 763, 745, 747, 745, 747, 749, 751, 764, 749, + 751, 749, 751, 753, 759, 765, 753, 759, 753, 762, + 775, 776, 767, 755, 777, 767, 1945, 778, 779, 763, + 767, 781, 771, 782, 783, 771, 764, 771, 784, 785, +- 771, 3072, 786, 765, 767, 2480, 791, 2480, 775, 776, ++ 771, 3077, 786, 765, 767, 2482, 791, 2482, 775, 776, + 792, 787, 777, 793, 771, 778, 779, 786, 787, 781, +- 786, 782, 783, 3070, 759, 787, 784, 785, 790, 788, ++ 786, 782, 783, 3075, 759, 787, 784, 785, 790, 788, + + 786, 796, 767, 788, 791, 789, 794, 788, 792, 787, + 795, 793, 771, 798, 799, 786, 787, 790, 786, 789, +@@ -3754,7 +3759,7 @@ static const flex_int16_t yy_chk[14349] = + 810, 798, 799, 803, 811, 790, 812, 789, 800, 789, + 794, 813, 805, 795, 814, 815, 797, 816, 797, 818, + 819, 820, 821, 822, 823, 807, 825, 826, 810, 827, +- 829, 830, 811, 803, 812, 832, 3068, 833, 835, 813, ++ 829, 830, 811, 803, 812, 832, 3073, 833, 835, 813, + 836, 835, 814, 815, 837, 816, 838, 818, 819, 820, + 821, 822, 823, 831, 825, 826, 839, 827, 829, 830, + +@@ -3766,34 +3771,34 @@ static const flex_int16_t yy_chk[14349] = + 855, 856, 860, 857, 862, 860, 863, 862, 871, 863, + 860, 863, 860, 865, 863, 867, 865, 866, 867, 871, + 866, 875, 866, 909, 864, 866, 868, 868, 859, 868, +- 866, 868, 875, 3064, 889, 915, 868, 912, 915, 868, +- 889, 3203, 868, 873, 873, 883, 873, 882, 873, 916, ++ 866, 868, 875, 3069, 889, 915, 868, 912, 915, 868, ++ 889, 3209, 868, 873, 873, 883, 873, 882, 873, 916, + +- 882, 3055, 882, 868, 862, 882, 873, 860, 3203, 873, ++ 882, 3060, 882, 868, 862, 882, 873, 860, 3209, 873, + 870, 863, 913, 865, 883, 910, 884, 913, 910, 884, + 873, 884, 866, 1005, 884, 885, 884, 916, 885, 884, +- 885, 868, 884, 885, 1005, 885, 890, 871, 885, 3047, +- 915, 885, 883, 884, 890, 3210, 886, 882, 873, 886, ++ 885, 868, 884, 885, 1005, 885, 890, 871, 885, 3052, ++ 915, 885, 883, 884, 890, 3216, 886, 882, 873, 886, + 979, 886, 885, 979, 886, 890, 886, 1270, 889, 886, + 868, 868, 886, 917, 913, 910, 998, 914, 1270, 892, + 914, 884, 892, 886, 892, 914, 888, 873, 873, 888, +- 885, 888, 1524, 890, 888, 892, 888, 3210, 918, 888, ++ 885, 888, 1524, 890, 888, 892, 888, 3216, 918, 888, + 894, 917, 888, 894, 893, 894, 892, 893, 919, 893, + + 884, 886, 893, 888, 893, 920, 894, 893, 921, 885, +- 893, 980, 890, 998, 980, 911, 918, 894, 911, 3038, +- 911, 893, 914, 911, 892, 3028, 919, 1524, 922, 982, +- 886, 888, 982, 920, 895, 2987, 921, 895, 897, 895, +- 2810, 897, 895, 897, 895, 894, 897, 895, 897, 893, +- 895, 897, 899, 892, 897, 899, 922, 899, 2985, 898, ++ 893, 980, 890, 998, 980, 911, 918, 894, 911, 3043, ++ 911, 893, 914, 911, 892, 3033, 919, 1524, 922, 982, ++ 886, 888, 982, 920, 895, 2991, 921, 895, 897, 895, ++ 2813, 897, 895, 897, 895, 894, 897, 895, 897, 893, ++ 895, 897, 899, 892, 897, 899, 922, 899, 2989, 898, + 899, 895, 898, 901, 898, 897, 901, 898, 901, 898, + 911, 901, 898, 894, 899, 898, 981, 983, 893, 981, + 983, 981, 925, 926, 929, 901, 898, 932, 933, 895, +- 2810, 907, 923, 897, 907, 908, 907, 923, 908, 907, ++ 2813, 907, 923, 897, 907, 908, 907, 923, 908, 907, + +- 908, 907, 899, 908, 907, 908, 2981, 907, 908, 923, ++ 908, 907, 899, 908, 907, 908, 2985, 907, 908, 923, + 925, 926, 929, 901, 898, 932, 933, 934, 907, 936, +- 923, 937, 908, 2942, 2904, 923, 930, 930, 930, 930, ++ 923, 937, 908, 2946, 2908, 923, 930, 930, 930, 930, + 930, 930, 930, 930, 930, 938, 940, 923, 941, 942, + 943, 944, 945, 947, 948, 934, 907, 936, 949, 937, + 908, 931, 931, 931, 931, 931, 931, 931, 931, 931, +@@ -3803,30 +3808,30 @@ static const flex_int16_t yy_chk[14349] = + 952, 967, 968, 953, 969, 967, 970, 969, 971, 972, + + 973, 955, 974, 975, 978, 954, 956, 957, 958, 959, +- 960, 961, 962, 963, 964, 965, 2893, 2892, 985, 967, ++ 960, 961, 962, 963, 964, 965, 2897, 2896, 985, 967, + 968, 985, 969, 967, 970, 969, 971, 972, 973, 1000, +- 974, 975, 978, 984, 986, 2876, 984, 986, 984, 986, +- 987, 988, 2875, 987, 988, 987, 989, 991, 2866, 989, ++ 974, 975, 978, 984, 986, 2880, 984, 986, 984, 986, ++ 987, 988, 2879, 987, 988, 987, 989, 991, 2870, 989, + 991, 989, 992, 993, 1002, 992, 993, 992, 994, 995, + 1003, 994, 995, 994, 996, 997, 999, 996, 997, 996, + 1001, 999, 1004, 1001, 1007, 1006, 1000, 1009, 1006, 1013, + 1014, 1008, 1002, 1006, 1008, 1016, 1008, 1017, 1003, 1008, +- 2825, 1018, 1402, 1007, 1019, 1020, 1009, 2824, 1021, 1022, ++ 2835, 1018, 1402, 1007, 1019, 1020, 1009, 2828, 1021, 1022, + + 1004, 1023, 1024, 1402, 1025, 1026, 1028, 1013, 1014, 1027, +- 1027, 1027, 1027, 1016, 1030, 1017, 1031, 2986, 999, 1018, ++ 1027, 1027, 1027, 1016, 1030, 1017, 1031, 2990, 999, 1018, + 1001, 1007, 1019, 1020, 1009, 1006, 1021, 1022, 1032, 1023, + 1024, 1008, 1025, 1026, 1028, 1033, 1034, 1027, 1027, 1027, + 1027, 1029, 1030, 1035, 1031, 1029, 1036, 1037, 1038, 1039, + 1040, 1042, 1043, 1039, 1041, 1039, 1032, 1044, 1041, 1045, +- 1046, 1047, 1048, 1033, 1034, 1051, 1052, 2986, 1042, 1029, ++ 1046, 1047, 1048, 1033, 1034, 1051, 1052, 2990, 1042, 1029, + 1054, 1035, 1055, 1029, 1036, 1037, 1038, 1039, 1040, 1042, + 1043, 1039, 1041, 1039, 1056, 1044, 1041, 1045, 1046, 1047, + 1048, 1050, 1053, 1051, 1052, 1050, 1042, 1057, 1054, 1058, + +- 1055, 1059, 1050, 1053, 1050, 2815, 1060, 1061, 1062, 1064, +- 1065, 1066, 1056, 1067, 1068, 1070, 1071, 1072, 2809, 1050, +- 1074, 1075, 2775, 1050, 1077, 1057, 1078, 1058, 1079, 1059, ++ 1055, 1059, 1050, 1053, 1050, 2827, 1060, 1061, 1062, 1064, ++ 1065, 1066, 1056, 1067, 1068, 1070, 1071, 1072, 2818, 1050, ++ 1074, 1075, 2812, 1050, 1077, 1057, 1078, 1058, 1079, 1059, + 1050, 1080, 1050, 1053, 1060, 1061, 1062, 1064, 1065, 1066, + 1081, 1067, 1068, 1070, 1071, 1072, 1073, 1073, 1074, 1075, + 1073, 1082, 1077, 1083, 1078, 1073, 1079, 1084, 1085, 1080, +@@ -3835,24 +3840,24 @@ static const flex_int16_t yy_chk[14349] = + 1099, 1083, 1100, 1073, 1101, 1084, 1085, 1102, 1086, 1073, + 1087, 1088, 1089, 1073, 1091, 1073, 1115, 1092, 1093, 1094, + +- 1095, 1096, 1116, 2755, 1097, 1098, 1108, 1108, 1099, 1108, ++ 1095, 1096, 1116, 2778, 1097, 1098, 1108, 1108, 1099, 1108, + 1100, 1108, 1101, 1109, 1114, 1102, 1109, 1114, 1113, 1108, +- 2706, 1113, 1108, 1113, 2695, 1128, 1113, 1118, 1113, 1130, +- 1118, 1113, 1118, 1108, 1113, 1118, 3522, 1118, 3522, 1119, ++ 2758, 1113, 1108, 1113, 2709, 1128, 1113, 1118, 1113, 1130, ++ 1118, 1113, 1118, 1108, 1113, 1118, 3531, 1118, 3531, 1119, + 1118, 1116, 1119, 1118, 1119, 1113, 1132, 1119, 1120, 1119, + 1124, 1133, 1119, 1128, 1118, 1119, 1120, 1130, 1124, 1135, +- 2691, 1108, 1193, 1115, 1115, 1193, 1119, 1120, 1194, 1124, ++ 2698, 1108, 1193, 1115, 1115, 1193, 1119, 1120, 1194, 1124, + 1116, 1194, 1122, 1113, 1132, 1122, 1137, 1122, 1195, 1133, +- 2653, 1195, 1118, 1195, 1109, 1114, 1196, 1135, 1122, 1196, +- 1108, 1108, 2652, 1121, 1119, 1120, 1121, 1124, 1121, 1122, ++ 2694, 1195, 1118, 1195, 1109, 1114, 1196, 1135, 1122, 1196, ++ 1108, 1108, 2656, 1121, 1119, 1120, 1121, 1124, 1121, 1122, + + 1138, 1121, 1113, 1121, 1137, 1123, 1121, 1139, 1123, 1121, + 1123, 1118, 1140, 1123, 1125, 1123, 1141, 1125, 1123, 1125, + 1121, 1123, 1143, 1139, 1145, 1146, 1147, 1122, 1138, 1148, + 1125, 1149, 1123, 1153, 1155, 1139, 1156, 1159, 1160, 1161, +- 1140, 1125, 1162, 2628, 1141, 1163, 1164, 1165, 1121, 2590, +- 1143, 1139, 1145, 1146, 1147, 1197, 2563, 1148, 1197, 1149, +- 1123, 1153, 1155, 2560, 1156, 1159, 1160, 1161, 1167, 1125, ++ 1140, 1125, 1162, 2655, 1141, 1163, 1164, 1165, 1121, 2630, ++ 1143, 1139, 1145, 1146, 1147, 1197, 2592, 1148, 1197, 1149, ++ 1123, 1153, 1155, 2565, 1156, 1159, 1160, 1161, 1167, 1125, + 1162, 1144, 1168, 1163, 1164, 1165, 1169, 1121, 1144, 1144, + 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1166, 1166, 1166, + 1166, 1166, 1166, 1166, 1166, 1166, 1167, 1170, 1125, 1171, +@@ -3860,7 +3865,7 @@ static const flex_int16_t yy_chk[14349] = + 1168, 1172, 1173, 1175, 1169, 1174, 1174, 1176, 1177, 1178, + 1180, 1181, 1182, 1183, 1184, 1186, 1187, 1188, 1189, 1189, + 1199, 1198, 1205, 1199, 1198, 1170, 1198, 1171, 1209, 1172, +- 1173, 1175, 2551, 1174, 1174, 1176, 1177, 1178, 1180, 1181, ++ 1173, 1175, 2562, 1174, 1174, 1176, 1177, 1178, 1180, 1181, + 1182, 1183, 1184, 1186, 1187, 1188, 1189, 1189, 1200, 1201, + 1205, 1200, 1201, 1200, 1202, 1203, 1209, 1202, 1203, 1202, + 1204, 1210, 1211, 1204, 1218, 1219, 1220, 1222, 1223, 1225, +@@ -3871,7 +3876,7 @@ static const flex_int16_t yy_chk[14349] = + 1228, 1229, 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237, + 1238, 1233, 1239, 1240, 1241, 1242, 1243, 1245, 1246, 1244, + 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, +- 1257, 1258, 1259, 1261, 1262, 1263, 1264, 1265, 1266, 2549, ++ 1257, 1258, 1259, 1261, 1262, 1263, 1264, 1265, 1266, 2553, + 1269, 1271, 1272, 1255, 1273, 1245, 1246, 1275, 1247, 1248, + 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258, + 1259, 1261, 1262, 1263, 1264, 1265, 1266, 1268, 1269, 1271, +@@ -3883,19 +3888,19 @@ static const flex_int16_t yy_chk[14349] = + 1285, 1268, 1268, 1287, 1288, 1289, 1290, 1291, 1292, 1293, + 1295, 1297, 1290, 1304, 1298, 1299, 1300, 1301, 1302, 1305, + 1306, 1303, 1307, 1308, 1309, 1311, 1312, 1313, 1314, 1315, +- 1316, 1317, 1318, 1319, 1320, 1324, 1335, 2515, 1334, 1397, +- 1338, 1304, 1397, 1398, 2511, 2509, 1398, 1305, 1306, 1334, ++ 1316, 1317, 1318, 1319, 1320, 1324, 1335, 2551, 1334, 1397, ++ 1338, 1304, 1397, 1398, 2517, 2513, 1398, 1305, 1306, 1334, + 1307, 1308, 1309, 1311, 1312, 1313, 1314, 1315, 1316, 1317, + 1318, 1319, 1325, 1328, 1335, 1325, 1339, 1325, 1338, 1340, +- 1325, 1328, 1325, 1320, 1324, 1325, 1341, 3602, 1325, 3602, +- 1330, 2508, 1328, 1330, 1342, 1330, 2507, 1343, 1400, 1325, ++ 1325, 1328, 1325, 1320, 1324, 1325, 1341, 3612, 1325, 3612, ++ 1330, 2511, 1328, 1330, 1342, 1330, 2510, 1343, 1400, 1325, + +- 1336, 1400, 1336, 1344, 1339, 1345, 1330, 1340, 1348, 3604, +- 1350, 3604, 1320, 1324, 1341, 1334, 1333, 1330, 1351, 1333, ++ 1336, 1400, 1336, 1344, 1339, 1345, 1330, 1340, 1348, 3614, ++ 1350, 3614, 1320, 1324, 1341, 1334, 1333, 1330, 1351, 1333, + 1328, 1333, 1342, 1352, 1333, 1343, 1333, 1325, 1336, 1333, + 1336, 1344, 1333, 1345, 1347, 1353, 1348, 1347, 1350, 1347, + 1354, 1356, 1355, 1333, 1347, 1330, 1351, 1347, 1357, 1328, +- 2500, 1352, 1358, 1360, 1366, 1368, 1371, 1372, 1373, 1374, ++ 2509, 1352, 1358, 1360, 1366, 1368, 1371, 1372, 1373, 1374, + 1375, 1399, 1401, 1353, 1399, 1401, 1399, 1409, 1354, 1356, + 1409, 1333, 1355, 1376, 1330, 1377, 1357, 1378, 1355, 1379, + 1358, 1360, 1366, 1368, 1371, 1372, 1373, 1374, 1375, 1347, +@@ -3909,14 +3914,14 @@ static const flex_int16_t yy_chk[14349] = + 1411, 1412, 1413, 1414, 1415, 1420, 1416, 1417, 1423, 1418, + 1424, 1419, 1421, 1422, 1425, 1426, 1427, 1428, 1420, 1429, + 1430, 1431, 1432, 1420, 1433, 1434, 1430, 1435, 1430, 1436, +- 1437, 1430, 2488, 1420, 1439, 1440, 1423, 1441, 1424, 1442, ++ 1437, 1430, 2502, 1420, 1439, 1440, 1423, 1441, 1424, 1442, + 1443, 1444, 1425, 1426, 1427, 1428, 1420, 1429, 1430, 1431, + + 1432, 1420, 1433, 1434, 1430, 1435, 1430, 1436, 1437, 1430, + 1438, 1445, 1439, 1440, 1438, 1441, 1446, 1442, 1443, 1444, + 1447, 1438, 1448, 1438, 1438, 1449, 1438, 1450, 1451, 1452, + 1453, 1454, 1455, 1456, 1457, 1458, 1459, 1464, 1438, 1445, +- 1465, 1466, 1438, 1467, 1446, 1468, 2486, 1472, 1447, 1438, ++ 1465, 1466, 1438, 1467, 1446, 1468, 2490, 1472, 1447, 1438, + 1448, 1438, 1438, 1449, 1438, 1450, 1451, 1452, 1453, 1454, + 1455, 1456, 1457, 1458, 1459, 1464, 1473, 1469, 1465, 1466, + 1474, 1467, 1476, 1468, 1469, 1472, 1477, 1475, 1478, 1479, +@@ -3927,15 +3932,15 @@ static const flex_int16_t yy_chk[14349] = + 1469, 1474, 1482, 1474, 1483, 1469, 1495, 1484, 1485, 1486, + 1487, 1488, 1496, 1491, 1489, 1490, 1497, 1475, 1491, 1492, + 1498, 1493, 1499, 1494, 1500, 1501, 1502, 1503, 1505, 1506, +- 1507, 1508, 1509, 1505, 1495, 1512, 1513, 3673, 1514, 3673, ++ 1507, 1508, 1509, 1505, 1495, 1512, 1513, 3684, 1514, 3684, + 1496, 1491, 1515, 1503, 1497, 1517, 1491, 1518, 1498, 1519, + 1499, 1573, 1500, 1501, 1502, 1503, 1505, 1506, 1507, 1508, + 1510, 1505, 1511, 1512, 1513, 1511, 1514, 1511, 1510, 1520, +- 1515, 1503, 2485, 1517, 1521, 1518, 1522, 1519, 1511, 1510, ++ 1515, 1503, 2488, 1517, 1521, 1518, 1522, 1519, 1511, 1510, + 1523, 1526, 1527, 1523, 1526, 1523, 1526, 1530, 1531, 1511, + + 1523, 1526, 1532, 1523, 1526, 1576, 1573, 1520, 1576, 1509, +- 1509, 2484, 1521, 1535, 1522, 1533, 1536, 1510, 2479, 1533, ++ 1509, 2487, 1521, 1535, 1522, 1533, 1536, 1510, 2486, 1533, + 1527, 1533, 1538, 1539, 1541, 1530, 1531, 1511, 1547, 1548, + 1532, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, + 1551, 1535, 1552, 1533, 1536, 1523, 1526, 1533, 1553, 1533, +@@ -3961,8 +3966,8 @@ static const flex_int16_t yy_chk[14349] = + 1632, 1642, 1643, 1644, 1633, 1635, 1636, 1645, 1637, 1639, + 1640, 1646, 1641, 1647, 1648, 1650, 1651, 1652, 1653, 1654, + 1634, 1655, 1656, 1658, 1660, 1661, 1662, 1664, 1665, 1642, +- 1643, 1644, 1667, 1656, 1658, 1645, 1668, 1672, 3675, 1646, +- 3675, 1647, 1648, 1650, 1651, 1652, 1653, 1654, 2454, 1655, ++ 1643, 1644, 1667, 1656, 1658, 1645, 1668, 1672, 3686, 1646, ++ 3686, 1647, 1648, 1650, 1651, 1652, 1653, 1654, 2481, 1655, + 1656, 1673, 1660, 1661, 1662, 1664, 1665, 1674, 1675, 1677, + 1667, 1656, 1657, 1657, 1668, 1672, 1657, 1678, 1657, 1679, + 1680, 1681, 1657, 1657, 1682, 1683, 1657, 1684, 1685, 1673, +@@ -3972,15 +3977,15 @@ static const flex_int16_t yy_chk[14349] = + 1657, 1657, 1682, 1683, 1657, 1684, 1685, 1696, 1686, 1657, + 1687, 1688, 1689, 1693, 1697, 1694, 1690, 1691, 1694, 1698, + 1692, 1695, 1699, 1700, 1702, 1703, 1693, 1705, 1706, 1707, +- 1709, 1708, 1710, 1714, 1716, 1696, 3738, 1720, 3738, 1721, +- 1723, 1693, 1697, 1694, 1708, 3146, 1694, 1698, 1724, 1725, ++ 1709, 1708, 1710, 1714, 1716, 1696, 3750, 1720, 3750, 1721, ++ 1723, 1693, 1697, 1694, 1708, 3151, 1694, 1698, 1724, 1725, + 1699, 1726, 1702, 1703, 1693, 1705, 1706, 1707, 1709, 1708, +- 1710, 1712, 1716, 2443, 1712, 1720, 1712, 1721, 1723, 1729, +- 1733, 1712, 1708, 1722, 1712, 2433, 1724, 1725, 1714, 1726, ++ 1710, 1712, 1716, 2456, 1712, 1720, 1712, 1721, 1723, 1729, ++ 1733, 1712, 1708, 1722, 1712, 2444, 1724, 1725, 1714, 1726, + + 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1727, +- 1700, 1727, 1730, 2431, 2415, 3146, 1765, 1729, 1733, 1765, +- 2399, 1765, 1735, 1735, 1730, 1736, 1737, 1738, 1739, 1730, ++ 1700, 1727, 1730, 2434, 2432, 3151, 1765, 1729, 1733, 1765, ++ 2416, 1765, 1735, 1735, 1730, 1736, 1737, 1738, 1739, 1730, + 1740, 1741, 1742, 1743, 1745, 1746, 1712, 1727, 1757, 1727, + 1730, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, + 1735, 1735, 1730, 1736, 1737, 1738, 1739, 1730, 1740, 1741, +@@ -4004,12 +4009,12 @@ static const flex_int16_t yy_chk[14349] = + 1812, 1808, 1812, 1813, 1814, 1815, 1824, 1812, 1817, 1818, + 1829, 1821, 1831, 1833, 1822, 1834, 1823, 1835, 1825, 1826, + 1824, 1836, 1837, 1819, 1827, 1838, 1839, 1828, 1840, 1841, +- 1842, 1843, 1844, 1845, 1846, 1847, 1850, 3571, 1829, 1851, ++ 1842, 1843, 1844, 1845, 1846, 1847, 1850, 3580, 1829, 1851, + 1831, 1833, 1840, 1834, 1852, 1835, 1854, 1855, 1860, 1836, +- 1837, 2360, 1862, 1838, 1839, 1863, 1840, 1841, 1842, 1843, ++ 1837, 2400, 1862, 1838, 1839, 1863, 1840, 1841, 1842, 1843, + 1844, 1845, 1846, 1847, 1850, 1849, 1849, 1851, 1864, 1865, + 1840, 1849, 1852, 1867, 1854, 1855, 1860, 1868, 1869, 1849, +- 1862, 1870, 1849, 1863, 1871, 1872, 1875, 3571, 1878, 1886, ++ 1862, 1870, 1849, 1863, 1871, 1872, 1875, 3580, 1878, 1886, + + 1879, 1880, 1881, 1849, 1849, 1882, 1864, 1865, 1876, 1849, + 1876, 1867, 1883, 1884, 1876, 1868, 1869, 1849, 1887, 1870, +@@ -4017,14 +4022,14 @@ static const flex_int16_t yy_chk[14349] = + 1881, 1890, 1891, 1882, 1892, 1893, 1876, 1885, 1876, 1885, + 1883, 1884, 1876, 1885, 1886, 1889, 1887, 1894, 1895, 1888, + 1898, 1899, 1889, 1876, 1885, 1876, 1885, 1902, 1903, 1890, +- 1891, 1904, 1892, 1893, 1906, 1885, 1907, 1885, 2358, 1909, ++ 1891, 1904, 1892, 1893, 1906, 1885, 1907, 1885, 2361, 1909, + 1908, 1885, 1908, 1889, 2074, 1894, 1895, 1910, 1896, 1911, + 1889, 1896, 1885, 1896, 1885, 1913, 1903, 1914, 1896, 1904, + 1915, 1896, 1906, 1916, 1907, 1898, 1899, 1909, 1908, 1919, + +- 1908, 1920, 1902, 1922, 1923, 1910, 2345, 1911, 1924, 1925, +- 1926, 1927, 1928, 1913, 1968, 1914, 2302, 1968, 1915, 2074, +- 2300, 1916, 1929, 1930, 1931, 2087, 1932, 1919, 2087, 1920, ++ 1908, 1920, 1902, 1922, 1923, 1910, 2359, 1911, 1924, 1925, ++ 1926, 1927, 1928, 1913, 1968, 1914, 2346, 1968, 1915, 2074, ++ 2303, 1916, 1929, 1930, 1931, 2087, 1932, 1919, 2087, 1920, + 1930, 1922, 1923, 1896, 1917, 1933, 1924, 1925, 1926, 1927, + 1928, 1917, 1917, 1917, 1917, 1917, 1917, 1917, 1917, 1917, + 1929, 1930, 1931, 1917, 1932, 1917, 1917, 1917, 1930, 1934, +@@ -4036,7 +4041,7 @@ static const flex_int16_t yy_chk[14349] = + 1944, 1951, 1953, 1917, 1937, 1949, 1949, 1949, 1949, 1957, + 1954, 1958, 1959, 1960, 1955, 1961, 1962, 1963, 1964, 1956, + 1965, 1966, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1977, +- 1978, 1979, 1947, 1980, 2299, 1982, 1983, 1957, 1984, 1958, ++ 1978, 1979, 1947, 1980, 2301, 1982, 1983, 1957, 1984, 1958, + 1959, 1960, 1985, 1961, 1962, 1963, 1964, 1986, 1965, 1966, + 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1977, 1978, 1979, + 1949, 1980, 1981, 1982, 1983, 1981, 1984, 1981, 1987, 1988, +@@ -4046,988 +4051,990 @@ static const flex_int16_t yy_chk[14349] = + + 1990, 1991, 1992, 2007, 1993, 1994, 1995, 1996, 2013, 1998, + 1999, 2014, 2000, 2015, 2001, 2002, 2003, 2004, 2005, 2006, +- 2016, 2009, 2010, 2011, 2017, 2018, 2012, 2019, 2298, 2166, +- 2284, 2021, 2166, 2022, 2166, 2178, 2013, 2023, 2178, 2014, +- 2178, 2015, 2024, 2025, 2026, 2282, 2027, 2281, 2016, 2028, +- 2029, 2030, 2017, 2018, 2031, 2019, 2020, 2020, 2020, 2021, +- 2020, 2022, 2020, 2020, 2032, 2023, 2020, 2020, 2020, 2033, +- 2024, 2025, 2026, 2020, 2027, 2020, 2034, 2028, 2029, 2030, +- 2035, 2036, 2031, 2037, 2020, 2020, 2020, 2038, 2020, 2039, +- 2020, 2020, 2032, 2040, 2020, 2020, 2020, 2033, 2041, 2042, +- +- 2043, 2020, 2044, 2020, 2034, 2045, 2046, 2049, 2035, 2036, +- 2050, 2037, 2051, 2052, 2057, 2038, 2058, 2039, 2059, 2060, +- 2061, 2040, 2062, 2063, 2064, 2068, 2041, 2042, 2043, 2065, +- 2044, 2065, 2069, 2045, 2046, 2049, 2072, 2073, 2050, 2073, +- 2051, 2052, 2057, 2075, 2058, 2076, 2059, 2060, 2061, 2077, +- 2062, 2063, 2064, 2068, 2078, 2079, 2080, 2065, 2081, 2065, +- 2069, 2082, 2089, 2083, 2072, 2073, 2084, 2073, 2085, 2086, +- 2090, 2091, 2094, 2095, 2096, 2097, 2098, 2077, 2099, 2259, +- 2100, 2101, 2078, 2079, 2080, 2102, 2081, 2209, 2075, 2082, +- 2076, 2083, 2103, 2104, 2084, 2104, 2085, 2086, 2209, 2210, +- +- 2094, 2095, 2096, 2097, 2098, 2107, 2099, 2089, 2100, 2101, +- 2210, 2245, 2143, 2102, 2108, 2090, 2091, 2109, 2142, 2111, +- 2103, 2104, 2112, 2104, 2105, 2105, 2105, 2105, 2105, 2105, +- 2105, 2105, 2105, 2107, 2113, 2115, 2105, 2116, 2105, 2105, +- 2105, 2110, 2108, 2117, 2105, 2109, 2110, 2111, 2118, 2105, +- 2112, 2119, 2120, 2121, 2122, 2124, 2125, 2126, 2105, 2055, +- 2146, 2146, 2113, 2115, 2105, 2116, 2105, 2105, 2105, 2110, +- 2127, 2117, 2105, 2128, 2110, 2129, 2118, 2105, 2130, 2119, +- 2120, 2121, 2122, 2124, 2125, 2126, 2105, 2106, 2106, 2106, +- 2106, 2106, 2106, 2106, 2106, 2106, 2131, 2132, 2127, 2133, +- +- 2134, 2128, 2135, 2129, 2137, 2138, 2130, 2139, 2140, 2141, +- 2144, 2144, 2144, 2144, 2146, 2147, 2147, 2147, 2147, 2148, +- 2148, 2149, 2151, 2152, 2131, 2132, 2153, 2133, 2134, 2154, +- 2135, 2156, 2137, 2138, 2157, 2139, 2140, 2141, 2158, 2159, +- 2160, 2161, 2167, 2162, 2163, 2167, 2053, 2164, 2165, 2149, +- 2151, 2152, 2168, 2169, 2153, 2170, 2171, 2154, 2172, 2156, +- 2173, 2174, 2157, 2175, 2176, 2144, 2158, 2159, 2160, 2161, +- 2147, 2162, 2163, 2148, 2155, 2164, 2165, 2155, 2048, 2177, +- 2168, 2169, 2167, 2170, 2171, 2180, 2172, 2181, 2173, 2174, +- 1967, 2175, 2176, 2155, 1952, 2182, 2183, 2184, 2185, 2186, +- +- 2187, 2188, 2189, 2191, 2192, 2193, 2155, 2177, 2155, 2194, +- 2167, 2196, 2197, 2180, 2196, 2181, 2196, 2198, 2155, 2199, +- 2155, 2155, 2155, 2182, 2183, 2184, 2185, 2186, 2187, 2188, +- 2189, 2191, 2192, 2193, 2155, 2200, 2155, 2194, 2201, 2202, +- 2197, 2203, 2202, 2204, 2205, 2198, 2155, 2199, 2155, 2155, +- 2155, 2207, 2208, 2211, 2212, 2213, 2214, 2215, 2216, 2217, +- 2218, 2219, 2220, 2200, 2221, 2222, 2201, 2216, 2223, 2203, +- 2224, 2204, 2205, 2225, 2226, 2228, 2227, 2229, 2230, 2207, +- 2208, 2211, 2212, 2213, 2214, 2215, 2216, 2217, 2218, 2219, +- 2220, 2227, 2221, 2222, 2235, 2236, 2223, 2237, 2224, 2238, +- +- 2239, 2225, 2226, 2228, 2227, 2229, 2230, 2240, 2241, 2242, +- 2243, 2244, 2246, 2247, 2248, 2249, 2250, 2255, 2256, 2227, +- 2258, 2262, 2235, 2236, 2263, 2237, 2265, 2238, 2239, 2266, +- 2267, 2268, 2269, 2270, 2271, 2240, 2241, 2242, 2243, 2244, +- 2246, 2247, 2248, 2249, 2250, 2255, 2256, 2278, 2258, 2262, +- 2279, 2280, 2263, 2283, 2265, 2285, 2287, 2266, 2267, 2268, +- 2269, 2270, 2271, 2288, 2289, 2290, 2291, 2292, 2293, 2294, +- 2301, 2295, 2303, 2304, 2305, 2278, 1948, 2297, 2279, 2280, +- 2297, 2306, 2297, 2307, 2287, 2308, 2309, 2297, 2310, 1946, +- 2297, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2283, 2295, +- +- 2285, 2304, 2305, 2311, 2297, 2313, 2314, 2315, 2317, 2306, +- 2318, 2307, 2316, 2308, 2309, 2301, 2310, 2303, 2319, 2316, +- 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2321, 2322, +- 2323, 2311, 2297, 2313, 2314, 2315, 2317, 2320, 2318, 2324, +- 2325, 2326, 2320, 2327, 2328, 2329, 2319, 2330, 2331, 2333, +- 2334, 2335, 2337, 2340, 2342, 2343, 2321, 2322, 2323, 2344, +- 2346, 2347, 2348, 2349, 2350, 2320, 2351, 2324, 2325, 2326, +- 2320, 2327, 2328, 2329, 2352, 2330, 2331, 2333, 2334, 2335, +- 2337, 2340, 2342, 2343, 2355, 2357, 2362, 2344, 2346, 2347, +- 2348, 2349, 2350, 2363, 2351, 2359, 2359, 2365, 2359, 2366, +- +- 2361, 2361, 2352, 2361, 2365, 2367, 2368, 2369, 2367, 2368, +- 2367, 2370, 2355, 2357, 2362, 2371, 2372, 2370, 2373, 2374, +- 2375, 2363, 1918, 2376, 2377, 2365, 2376, 2366, 2378, 2379, +- 2380, 2381, 2365, 2382, 2383, 2369, 2384, 2386, 1901, 2370, +- 2386, 2388, 2386, 2371, 2372, 2370, 2373, 2374, 2375, 2389, +- 2359, 2390, 2377, 2391, 2392, 2361, 2378, 2379, 2380, 2381, +- 2393, 2382, 2383, 2387, 2384, 2359, 2387, 2394, 2387, 2388, +- 2361, 2395, 2397, 2398, 2400, 2397, 2401, 2389, 2402, 2390, +- 2403, 2391, 2392, 2404, 2405, 2406, 2407, 2408, 2393, 2409, +- 2411, 2412, 2413, 2414, 2416, 2394, 2417, 2418, 2419, 2395, +- +- 2418, 2398, 2400, 2420, 2401, 2422, 2402, 2423, 2403, 2424, +- 2425, 2404, 2405, 2406, 2407, 2408, 2426, 2409, 2411, 2412, +- 2413, 2414, 2416, 2429, 2417, 2421, 2419, 2430, 2421, 2432, +- 2421, 2420, 2434, 2422, 2435, 2423, 2437, 2424, 2425, 2438, +- 2439, 2440, 2441, 2434, 2426, 1900, 2442, 2444, 2445, 2446, +- 2447, 2429, 2448, 2449, 2451, 2430, 2452, 2432, 2453, 2455, +- 2456, 2457, 2435, 2459, 2437, 2460, 2461, 2438, 2439, 2440, +- 2441, 2462, 2463, 2434, 2442, 2444, 2445, 2446, 2447, 2464, +- 2448, 2449, 2451, 2465, 2452, 2466, 2453, 2455, 2456, 2457, +- 2467, 2459, 2468, 2460, 2461, 2469, 2472, 2473, 2474, 2462, +- +- 2463, 2476, 2477, 2478, 2482, 2483, 2487, 2464, 2489, 2490, +- 2491, 2465, 2492, 2466, 2493, 2494, 2495, 2496, 2467, 2497, +- 2468, 2499, 2502, 2469, 2472, 2473, 2474, 2503, 1897, 2476, +- 2477, 2478, 2482, 2483, 2572, 2510, 2514, 2572, 2491, 2502, +- 2492, 2503, 2493, 2494, 2495, 2496, 2512, 2497, 2513, 2499, +- 1861, 2487, 2501, 2489, 2490, 2501, 2504, 2501, 2516, 2504, +- 2517, 2504, 2501, 1830, 2514, 2501, 2504, 2502, 2505, 2503, +- 2518, 2505, 2506, 2505, 2519, 2506, 2520, 2506, 2505, 2501, +- 2510, 2505, 2506, 2504, 2522, 2506, 2516, 2523, 2517, 2524, +- 2526, 2512, 2527, 2513, 2528, 2505, 2529, 2530, 2518, 2506, +- +- 2531, 2532, 2519, 2533, 2520, 2534, 2535, 2501, 2536, 2537, +- 2538, 2504, 2522, 2539, 2540, 2523, 2541, 2524, 2526, 2542, +- 2527, 2543, 2528, 2505, 2529, 2530, 2544, 2506, 2531, 2532, +- 2545, 2533, 2546, 2534, 2535, 2547, 2536, 2537, 2538, 2548, +- 2550, 2539, 2540, 2552, 2541, 2553, 2554, 2542, 2555, 2543, +- 2556, 2557, 2558, 2559, 2544, 2566, 2561, 2561, 2545, 2561, +- 2546, 2564, 2564, 2547, 2564, 2567, 2568, 2548, 2550, 2569, +- 2573, 2552, 2574, 2553, 2554, 2575, 2555, 2576, 2556, 2557, +- 2558, 2559, 2577, 2566, 2578, 2579, 2580, 2581, 1761, 2582, +- 2581, 2583, 2581, 2567, 2568, 2585, 2586, 2569, 2573, 2587, +- +- 2574, 2588, 2589, 2575, 2593, 2576, 2594, 2595, 2596, 2597, +- 2577, 2561, 2578, 2579, 2580, 2598, 2564, 2582, 2600, 2583, +- 2600, 2602, 2601, 2585, 2586, 2601, 2561, 2587, 2604, 2588, +- 2589, 2564, 2593, 2605, 2594, 2595, 2596, 2597, 2606, 2607, +- 2609, 2610, 2611, 2598, 2612, 2613, 2600, 2612, 2600, 2602, +- 2614, 2615, 2616, 2617, 2619, 2620, 2604, 2621, 2622, 2622, +- 2621, 2605, 2621, 2623, 2613, 2627, 2606, 2607, 2609, 2610, +- 2611, 2625, 2629, 2613, 2625, 2630, 2625, 2631, 2614, 2615, +- 2616, 2617, 2619, 2620, 2632, 2633, 2622, 2622, 2634, 2635, +- 2636, 2623, 2613, 2627, 2638, 2639, 2640, 2641, 2642, 2643, +- +- 2629, 2644, 2645, 2630, 2646, 2631, 2647, 2648, 2649, 2650, +- 2651, 2654, 2632, 2633, 2655, 2656, 2634, 2635, 2636, 2657, +- 2658, 2659, 2638, 2639, 2640, 2641, 2642, 2643, 2660, 2644, +- 2645, 2661, 2646, 2662, 2647, 2648, 2649, 2650, 2651, 2654, +- 2664, 2665, 2655, 2656, 2666, 2667, 2668, 2657, 2658, 2659, +- 2669, 2671, 2672, 2673, 2675, 2676, 2660, 2677, 2678, 2661, +- 2679, 2662, 2680, 2681, 2682, 2684, 2685, 2686, 2664, 2665, +- 2687, 2688, 2666, 2667, 2668, 2689, 2707, 2692, 2669, 2671, +- 2672, 2673, 2675, 2676, 2779, 2677, 2678, 2779, 2679, 2699, +- 2680, 2692, 1760, 2684, 2685, 2686, 2696, 2693, 2687, 2688, +- +- 2693, 2694, 2693, 2689, 2694, 2697, 2694, 2693, 2681, 2682, +- 2693, 2694, 2698, 2696, 2694, 2698, 2709, 2699, 2708, 2692, +- 2700, 2707, 2697, 2700, 2693, 2700, 2710, 2813, 2694, 2698, +- 2700, 1759, 2701, 2700, 2711, 2701, 2780, 2701, 2813, 2780, +- 2785, 2696, 2701, 2785, 2709, 2713, 2888, 2700, 2714, 2888, +- 2697, 2715, 2693, 2716, 2710, 2702, 2694, 2717, 2702, 2701, +- 2702, 2704, 2711, 2708, 2704, 2702, 2704, 2705, 2702, 2718, +- 2705, 2704, 2705, 2713, 2704, 2700, 2714, 2705, 2719, 2715, +- 2705, 2716, 2702, 2720, 2721, 2717, 2722, 2701, 2704, 2723, +- 2724, 2725, 2726, 2727, 2705, 2728, 2729, 2718, 2731, 2732, +- +- 2733, 2734, 2735, 2736, 2737, 2738, 2719, 2739, 2740, 2741, +- 2702, 2720, 2721, 2742, 2722, 2743, 2704, 2723, 2724, 2725, +- 2726, 2727, 2705, 2728, 2729, 2745, 2731, 2732, 2733, 2734, +- 2735, 2736, 2737, 2738, 2746, 2739, 2740, 2741, 2747, 2748, +- 2749, 2742, 2750, 2743, 2752, 2753, 2757, 2758, 2759, 2760, +- 2761, 2762, 2763, 2745, 2764, 2767, 2768, 2769, 2770, 2771, +- 2772, 2773, 2746, 2776, 2777, 2778, 2747, 2748, 2749, 2782, +- 2750, 2783, 2752, 2753, 2757, 2758, 2759, 2760, 2761, 2762, +- 2763, 2786, 2764, 2767, 2768, 2769, 2770, 2771, 2772, 2773, +- 2787, 2776, 2777, 2778, 2788, 2789, 2790, 2782, 2791, 2783, +- +- 2792, 2793, 2794, 2789, 2789, 2794, 2789, 2794, 2789, 2786, +- 2795, 2796, 2797, 2798, 2799, 2800, 2801, 2802, 2787, 2805, +- 2806, 2807, 2811, 2789, 2790, 2788, 2791, 2812, 2792, 2793, +- 2814, 2789, 2789, 2817, 2789, 2816, 2789, 2818, 2795, 2796, +- 2797, 2798, 2799, 2800, 2801, 2802, 2816, 2805, 2806, 2807, +- 2811, 2819, 2820, 2788, 2821, 2812, 2822, 2823, 2814, 2826, +- 2827, 2817, 2828, 2829, 2830, 2818, 2831, 2832, 2833, 2834, +- 2835, 2836, 2837, 2826, 2838, 2839, 2840, 2831, 2841, 2819, +- 2820, 2842, 2821, 2844, 2822, 2823, 2845, 2826, 2827, 2846, +- 2828, 2829, 2830, 2847, 2848, 2832, 2833, 2834, 2835, 2836, +- +- 2837, 2849, 2838, 2839, 2840, 2850, 2841, 2851, 2852, 2842, +- 2853, 2844, 2854, 2855, 2845, 2856, 2857, 2846, 2858, 2859, +- 2860, 2847, 2848, 2861, 2862, 2863, 2864, 2865, 2869, 2849, +- 1732, 2867, 1728, 2850, 1719, 2851, 2852, 2894, 2853, 2948, +- 2854, 2855, 2948, 2856, 2857, 2869, 2858, 2859, 2860, 2867, +- 2896, 1715, 2862, 2863, 2864, 2865, 2891, 2868, 2877, 2867, +- 2868, 2871, 2868, 2897, 2871, 2894, 2871, 2868, 2861, 2872, +- 2868, 2871, 2872, 2869, 2872, 2877, 1713, 2867, 2896, 2872, +- 2873, 2878, 2872, 2873, 2868, 2873, 2898, 2879, 2871, 2880, +- 2873, 2897, 2874, 2873, 2899, 2874, 2872, 2874, 2878, 2900, +- +- 2991, 2891, 2874, 2877, 2879, 2874, 2880, 2873, 2901, 1711, +- 2882, 2991, 2868, 2882, 2898, 2882, 2871, 1701, 2902, 2874, +- 2882, 1659, 2899, 2882, 2872, 1649, 2878, 2900, 2884, 2903, +- 1579, 2884, 2879, 2884, 2880, 2873, 2901, 2882, 2884, 2885, +- 2886, 2884, 2885, 2886, 2885, 2886, 2902, 2874, 2887, 2885, +- 2886, 2887, 2885, 2887, 2905, 2884, 1574, 2903, 2887, 2889, +- 2906, 2908, 2889, 2910, 2889, 2882, 2885, 2886, 2912, 2889, +- 1572, 2890, 2889, 2913, 2890, 2887, 2890, 2914, 2916, 2917, +- 2918, 2890, 2905, 2884, 2890, 2919, 2889, 2920, 2906, 2908, +- 2921, 2910, 2922, 2923, 2885, 2886, 2912, 2924, 2890, 2925, +- +- 2926, 2913, 2930, 2887, 2931, 2914, 2916, 2917, 2918, 2932, +- 2934, 2935, 2936, 2919, 2889, 2920, 2937, 2938, 2921, 2939, +- 2922, 2923, 2941, 2943, 2944, 2924, 2890, 2925, 2926, 2945, +- 2930, 2946, 2931, 2947, 2949, 2951, 2952, 2932, 2934, 2935, +- 2936, 2953, 2958, 2954, 2937, 2938, 2954, 2939, 2959, 2961, +- 2941, 2943, 2944, 2955, 2962, 2963, 2955, 2945, 2955, 2946, +- 2964, 2947, 2949, 2951, 2952, 2965, 2966, 2967, 2968, 2953, +- 2958, 2969, 2973, 2974, 2969, 2975, 2959, 2961, 2967, 2967, +- 2970, 2977, 2962, 2963, 2970, 2978, 2976, 2972, 2964, 2976, +- 2972, 2970, 2972, 2965, 2966, 2967, 2968, 2979, 2980, 2982, +- +- 2973, 2974, 2983, 2975, 2984, 2988, 2967, 2967, 2970, 2977, +- 2989, 2992, 2970, 2978, 2994, 2995, 2996, 2997, 2998, 2970, +- 2999, 3000, 3001, 3002, 3002, 2979, 2980, 2982, 3003, 3004, +- 2983, 3005, 2984, 2988, 3006, 3007, 3008, 3010, 2989, 2992, +- 3011, 3012, 2994, 2995, 2996, 2997, 2998, 3013, 2999, 3000, +- 3001, 3002, 3002, 3014, 3015, 3016, 3003, 3004, 3017, 3005, +- 3018, 3019, 3006, 3007, 3008, 3010, 3020, 3021, 3011, 3012, +- 3023, 3018, 3024, 1550, 3025, 3013, 3027, 3020, 3029, 1546, +- 3030, 3014, 3015, 3016, 3031, 3033, 3017, 3034, 3035, 3019, +- 3036, 3037, 3039, 3040, 3041, 3021, 3043, 3044, 3023, 1529, +- +- 3024, 3018, 3025, 3050, 3027, 1528, 3029, 3020, 3030, 3041, +- 3048, 3049, 3031, 3033, 3049, 3034, 3035, 1525, 3036, 3037, +- 3039, 3040, 3041, 3046, 3043, 3044, 3046, 3048, 3046, 3051, +- 3056, 3050, 3051, 3046, 3051, 3052, 3046, 3041, 3052, 3051, +- 3052, 3053, 3051, 3065, 3053, 3052, 3053, 3056, 3286, 3057, +- 3046, 3053, 3066, 1471, 3053, 3048, 3051, 3067, 3060, 3286, +- 3054, 3060, 3052, 3054, 3059, 3054, 3057, 3059, 3053, 3059, +- 3054, 3065, 1470, 3054, 3059, 3056, 3061, 3059, 3046, 3061, +- 3066, 3061, 3069, 3071, 3051, 3067, 3061, 3054, 3073, 3061, +- 3052, 3059, 3074, 3075, 3057, 3062, 3053, 3076, 3062, 3078, +- +- 3062, 3079, 3080, 3061, 3081, 3062, 3082, 3083, 3062, 3084, +- 3069, 3071, 3085, 3087, 3088, 3054, 3073, 3089, 3090, 3059, +- 3074, 3075, 3062, 3092, 3093, 3076, 3094, 3078, 3095, 3079, +- 3080, 3061, 3081, 3096, 3082, 3083, 3097, 3084, 3098, 3097, +- 3085, 3087, 3088, 3099, 3100, 3089, 3090, 3102, 3103, 3104, +- 3062, 3092, 3093, 3105, 3094, 3106, 3095, 3109, 3402, 3113, +- 3109, 3096, 3113, 3645, 1463, 3108, 3098, 3107, 3111, 3402, +- 3107, 3099, 3100, 3116, 3117, 3102, 3103, 3104, 3119, 3120, +- 3121, 3105, 3122, 3106, 3107, 3107, 3107, 3107, 3107, 3107, +- 3107, 3107, 3107, 3108, 3115, 3123, 3111, 3115, 3124, 3115, +- +- 3125, 3116, 3117, 3126, 3127, 3128, 3119, 3120, 3121, 3137, +- 3122, 3235, 3137, 3645, 3235, 3130, 3131, 3129, 3132, 3134, +- 3129, 3135, 3136, 3123, 3138, 3139, 3124, 3140, 3125, 3141, +- 3143, 3126, 3127, 3128, 3129, 3129, 3129, 3129, 3129, 3129, +- 3129, 3129, 3129, 3130, 3131, 3144, 3132, 3134, 3145, 3135, +- 3136, 3147, 3138, 3139, 3148, 3140, 3150, 3141, 3143, 3151, +- 3152, 3154, 3155, 3157, 3158, 3159, 3160, 3161, 3162, 3164, +- 3165, 3166, 3167, 3144, 3169, 3170, 3145, 3171, 3172, 3147, +- 3174, 3176, 3148, 3179, 3150, 3183, 3185, 3151, 3152, 3154, +- 3155, 3157, 3158, 3159, 3160, 3161, 3162, 3164, 3165, 3166, +- +- 3167, 3182, 3169, 3170, 3187, 3171, 3172, 3188, 3174, 3176, +- 3189, 3179, 3182, 3183, 3185, 3190, 3191, 3192, 3193, 3195, +- 3196, 3197, 3198, 3199, 3200, 3267, 3201, 3213, 3267, 3201, +- 3214, 3201, 3187, 1462, 3199, 3188, 3201, 3202, 3189, 3201, +- 3207, 1461, 3182, 3190, 3191, 3192, 3193, 3195, 3196, 3197, +- 3198, 3199, 3200, 3201, 3202, 3213, 3204, 3207, 3214, 3204, +- 3205, 3204, 3199, 3205, 3206, 3205, 3204, 3206, 3215, 3206, +- 3205, 1406, 3275, 3216, 3206, 3275, 3217, 3206, 3219, 3220, +- 3221, 3201, 3202, 3204, 3223, 3207, 3224, 3205, 1405, 3208, +- 3209, 3206, 3208, 3209, 3208, 3209, 3215, 1394, 1370, 3208, +- +- 3209, 3216, 3208, 3209, 3217, 1369, 3219, 3220, 3221, 3225, +- 3226, 3204, 3223, 3227, 3224, 3205, 3208, 3209, 3228, 3206, +- 3211, 3212, 3231, 3211, 3212, 3211, 3212, 3232, 3233, 3234, +- 3211, 3212, 3236, 3211, 3212, 3237, 3240, 3225, 3226, 3241, +- 3242, 3227, 3243, 3244, 3208, 3209, 3228, 3211, 3212, 3239, +- 3231, 3245, 3239, 3246, 3239, 3232, 3233, 3234, 3247, 3279, +- 3236, 3407, 3279, 3237, 3240, 1365, 1364, 3241, 3242, 3249, +- 3243, 3244, 3407, 1363, 3254, 3211, 3212, 3254, 1362, 3245, +- 3251, 3246, 3250, 3253, 3256, 3250, 3247, 3248, 3248, 3248, +- 3248, 3248, 3248, 3248, 3248, 3248, 3257, 3249, 3258, 3250, +- +- 3250, 3250, 3250, 3250, 3250, 3250, 3250, 3250, 3251, 3259, +- 3260, 3253, 3256, 3261, 3262, 3263, 3264, 3265, 3268, 3269, +- 3254, 3271, 3272, 3273, 3257, 3276, 3258, 3266, 3266, 3266, +- 3266, 3266, 3266, 3266, 3266, 3266, 3277, 3259, 3260, 3278, +- 3280, 3261, 3262, 3263, 3264, 3265, 3268, 3269, 3254, 3271, +- 3272, 3273, 3281, 3276, 3282, 3281, 3283, 3284, 3285, 3287, +- 3288, 3289, 3290, 3292, 3277, 3293, 3294, 3278, 3280, 3295, +- 3296, 3300, 3301, 3302, 3303, 3306, 3307, 3308, 3647, 3311, +- 3313, 3314, 3282, 3315, 3283, 3284, 3285, 3287, 3288, 3289, +- 3290, 3292, 3316, 3293, 3294, 3317, 3318, 3295, 3296, 3300, +- +- 3301, 3302, 3303, 3306, 3307, 3308, 3309, 3311, 3313, 3314, +- 3319, 3315, 3320, 3322, 3309, 3323, 3324, 3325, 3326, 3327, +- 3316, 1361, 3328, 3317, 3318, 3328, 3331, 3328, 3647, 3331, +- 3334, 3329, 3328, 3353, 3309, 3328, 3353, 1359, 3319, 3335, +- 3320, 3322, 3309, 3323, 3324, 3325, 3326, 3327, 3329, 3328, +- 1327, 3330, 3332, 3336, 3330, 3332, 3330, 3332, 3334, 3337, +- 3338, 3330, 3332, 3341, 3330, 3332, 3343, 3335, 3345, 1323, +- 3333, 3346, 3347, 3333, 3348, 3333, 3329, 3328, 3330, 3332, +- 3333, 3336, 3349, 3333, 3351, 3354, 3357, 3337, 3338, 3383, +- 3384, 3341, 3383, 3384, 3343, 1294, 3345, 3333, 3352, 3346, +- +- 3347, 3352, 3348, 1286, 1284, 3385, 3330, 3332, 3385, 1279, +- 3349, 3715, 3351, 3354, 3357, 3352, 3352, 3352, 3352, 3352, +- 3352, 3352, 3352, 3352, 3358, 3333, 3355, 3355, 3355, 3355, +- 3355, 3355, 3355, 3355, 3355, 3355, 3355, 3356, 3356, 3356, +- 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3359, 3360, +- 3361, 3355, 3358, 3362, 3363, 3364, 3365, 3367, 3369, 3371, +- 3373, 3715, 3356, 3366, 3366, 3366, 3366, 3366, 3366, 3366, +- 3366, 3366, 3370, 3374, 3375, 3370, 3359, 3360, 3361, 3376, +- 3377, 3362, 3363, 3364, 3365, 3367, 3369, 3371, 3373, 3370, +- 3370, 3370, 3370, 3370, 3370, 3370, 3370, 3370, 3378, 3379, +- +- 3380, 3374, 3375, 3381, 3386, 3387, 3388, 3376, 3377, 3388, +- 3389, 3390, 3391, 3392, 3393, 3396, 3392, 3393, 3398, 3400, +- 3404, 3405, 3406, 1274, 1217, 1216, 3378, 3379, 3380, 1215, +- 3666, 3381, 3386, 3387, 3394, 3408, 3409, 3394, 3389, 3390, +- 3391, 3666, 3411, 3396, 3412, 3413, 3398, 3400, 3404, 3405, +- 3406, 3394, 3394, 3394, 3394, 3394, 3394, 3394, 3394, 3394, +- 3410, 3414, 3415, 3408, 3409, 3416, 3417, 3418, 3410, 3410, +- 3411, 3419, 3412, 3413, 3420, 3421, 3422, 3423, 3424, 3426, +- 3427, 3428, 3429, 3430, 3431, 3432, 3431, 3433, 3410, 3414, +- 3415, 3434, 3436, 3416, 3417, 3418, 3410, 3410, 3437, 3419, +- +- 1214, 3439, 3420, 3421, 3422, 3423, 3424, 3426, 3427, 3428, +- 3429, 3430, 3440, 3432, 3441, 3433, 3443, 1213, 3438, 3434, +- 3436, 3438, 3445, 3438, 3449, 3451, 3437, 3454, 3438, 3439, +- 3454, 3438, 3479, 3480, 3489, 3479, 3480, 3489, 3480, 3456, +- 3440, 1212, 3441, 1208, 3443, 3438, 3457, 3458, 3459, 3460, +- 3445, 3461, 3449, 3451, 3462, 1207, 3431, 3452, 3452, 3452, +- 3452, 3452, 3452, 3452, 3452, 3452, 3453, 3456, 3455, 3453, +- 1206, 3453, 1192, 3438, 3457, 3458, 3459, 3460, 3464, 3461, +- 3465, 3468, 3462, 3453, 3453, 3453, 3453, 3453, 3453, 3453, +- 3453, 3453, 3455, 3455, 3455, 3455, 3455, 3455, 3455, 3455, +- +- 3455, 3455, 3455, 3469, 3470, 3471, 3464, 3472, 3465, 3468, +- 3473, 1190, 3474, 3473, 3475, 3476, 3477, 3455, 3467, 3467, +- 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3482, 3483, 3485, +- 3486, 3469, 3470, 3471, 3487, 3472, 3492, 1185, 3497, 3473, +- 3474, 3667, 3475, 3476, 3477, 3481, 3484, 1157, 3481, 3484, +- 3481, 3484, 3667, 1152, 1142, 3482, 3483, 3485, 3486, 3496, +- 3490, 3498, 3487, 3490, 3492, 3496, 3497, 3473, 3491, 3491, +- 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3490, 3490, 3490, +- 3490, 3490, 3490, 3490, 3490, 3490, 3499, 3496, 3501, 3498, +- 3502, 3503, 3504, 3496, 3505, 3506, 3508, 3511, 3513, 3514, +- +- 3515, 3516, 3517, 3520, 3521, 3523, 3524, 3538, 3546, 3550, +- 3538, 3546, 3550, 1131, 3499, 1129, 3501, 1127, 3502, 3503, +- 3504, 3526, 3505, 3506, 3508, 3511, 3513, 3514, 3515, 3516, +- 3517, 3520, 3521, 3523, 3524, 3525, 3525, 3525, 3525, 3525, +- 3525, 3525, 3525, 3525, 3525, 3525, 3527, 3528, 3531, 3526, +- 3532, 3533, 3534, 3536, 3537, 3622, 3625, 1126, 3622, 3625, +- 3525, 3539, 3539, 3539, 3539, 3539, 3539, 3539, 3539, 3539, +- 3543, 3544, 3545, 3547, 3527, 3528, 3531, 3548, 3532, 3533, +- 3534, 3536, 3537, 3540, 3540, 3540, 3540, 3540, 3540, 3540, +- 3540, 3540, 3541, 3549, 3551, 3541, 3552, 3553, 3543, 3544, +- +- 3545, 3547, 3555, 3556, 3558, 3548, 3559, 3560, 3562, 3541, +- 3541, 3541, 3541, 3541, 3541, 3541, 3541, 3541, 1112, 1111, +- 3557, 3549, 3551, 3557, 3552, 3553, 3561, 1107, 3569, 3561, +- 3555, 3556, 3558, 3570, 3559, 3560, 3562, 3557, 3557, 3557, +- 3557, 3557, 3557, 3557, 3557, 3557, 3564, 3567, 3572, 3564, +- 3567, 3564, 3567, 3573, 3574, 3561, 3569, 3628, 1106, 1105, +- 3628, 3570, 3628, 3690, 3693, 3579, 3690, 3693, 3690, 3693, +- 3575, 3762, 3763, 1104, 3762, 3763, 3572, 3576, 1103, 1063, +- 3576, 3573, 3574, 3561, 3575, 3575, 3575, 3575, 3575, 3575, +- 3575, 3575, 3575, 3579, 3576, 3576, 3576, 3576, 3576, 3576, +- +- 3576, 3576, 3576, 3577, 3577, 3577, 3577, 3577, 3577, 3577, +- 3577, 3577, 3580, 3581, 3583, 3585, 3586, 3587, 3588, 3589, +- 3590, 3591, 3592, 3593, 3594, 3595, 3596, 3597, 3598, 3601, +- 3605, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, +- 3580, 3581, 3583, 3585, 3586, 3587, 3588, 3589, 3590, 3591, +- 3592, 3593, 3594, 3595, 3596, 3597, 3598, 3601, 3605, 3606, +- 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, +- 3607, 3608, 3609, 3612, 3614, 3615, 3618, 3696, 3618, 3618, +- 3696, 3618, 3696, 1011, 3606, 3621, 3623, 3803, 3627, 3618, +- 3803, 3629, 3619, 3630, 3631, 3632, 3633, 3635, 3607, 3608, +- +- 3609, 3612, 3614, 3615, 3619, 3619, 3619, 3619, 3619, 3619, +- 3619, 3619, 3619, 3621, 3623, 3624, 3627, 3807, 3624, 3629, +- 3807, 3630, 3631, 3632, 3633, 3635, 3636, 3639, 3640, 3643, +- 3648, 3649, 3624, 3624, 3624, 3624, 3624, 3624, 3624, 3624, +- 3624, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, +- 3638, 3650, 3736, 3638, 3636, 3639, 3640, 3643, 3648, 3649, +- 3618, 3652, 3653, 3736, 1010, 990, 977, 3638, 3638, 3638, +- 3638, 3638, 3638, 3638, 3638, 3638, 3644, 3651, 3654, 3650, +- 3644, 3656, 3657, 3658, 3659, 3660, 3661, 3644, 3662, 3652, +- 3653, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, +- +- 3663, 3664, 3665, 3668, 3644, 3670, 3654, 3676, 3644, 3656, +- 3657, 3658, 3659, 3660, 3661, 3644, 3662, 3678, 3680, 3682, +- 3689, 3683, 3691, 3683, 3683, 966, 3683, 946, 3663, 3664, +- 3665, 3668, 3698, 3670, 3683, 3676, 3684, 3699, 3684, 3684, +- 3700, 3684, 3701, 3702, 3703, 3678, 3680, 3682, 3689, 3684, +- 3691, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, +- 3698, 3704, 3706, 3707, 3710, 3699, 3711, 3712, 3700, 3713, +- 3701, 3702, 3703, 3705, 3705, 3705, 3705, 3705, 3705, 3705, +- 3705, 3705, 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3704, +- 3706, 3707, 3710, 3724, 3711, 3712, 3725, 3713, 3727, 3728, +- +- 3729, 3731, 3732, 3735, 3740, 3683, 3742, 3743, 3746, 3750, +- 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3753, 3743, 3754, +- 3684, 3724, 3755, 3756, 3725, 3757, 3727, 3728, 3729, 3731, +- 3732, 3735, 3740, 3758, 3742, 3743, 3746, 3748, 3759, 3760, +- 3748, 3761, 3748, 3764, 3761, 3753, 3743, 3754, 3765, 3766, +- 3755, 3756, 3767, 3757, 3768, 3770, 3771, 3773, 3774, 3750, +- 3791, 3758, 3775, 3776, 3777, 3778, 3759, 3760, 3779, 3783, +- 3784, 3764, 3785, 3786, 3788, 3793, 3765, 3795, 3796, 3798, +- 3767, 3799, 3768, 3770, 3771, 3773, 3774, 3800, 3761, 3801, +- 3775, 3776, 3777, 3778, 3802, 3804, 3779, 3783, 3784, 3766, +- +- 3785, 3786, 3788, 3809, 3810, 3795, 3796, 3798, 3805, 3799, +- 3791, 3805, 3811, 3805, 3812, 3800, 3761, 3801, 3813, 3816, +- 3817, 3806, 3802, 3804, 3806, 3793, 3806, 3808, 3818, 3819, +- 3808, 3809, 3810, 3820, 3821, 3824, 3825, 3828, 3830, 3825, +- 3811, 3831, 3812, 3832, 3833, 3835, 3813, 3816, 3817, 3836, +- 3838, 3839, 928, 3838, 3847, 3840, 3818, 3819, 3840, 3862, +- 3840, 3820, 3821, 3824, 3849, 3842, 3830, 3850, 3842, 3831, +- 3842, 3832, 3833, 3835, 3851, 3844, 3853, 3836, 3844, 3839, +- 3844, 3845, 3847, 3854, 3845, 3855, 3845, 3828, 3856, 3857, +- 3863, 3865, 3849, 3861, 3858, 3850, 3861, 3864, 3861, 3866, +- +- 3864, 3869, 3851, 3867, 3853, 3858, 3867, 3872, 3858, 3862, +- 3872, 3854, 3872, 3855, 3877, 3878, 3856, 3857, 3863, 3865, +- 3874, 3879, 3858, 3874, 3880, 3874, 3881, 3866, 3882, 3869, +- 3883, 3884, 3885, 3858, 3886, 3887, 3858, 3893, 3896, 903, +- 891, 3891, 3877, 3878, 3891, 3895, 3891, 880, 3895, 3879, +- 3894, 878, 3880, 3894, 3881, 876, 3882, 872, 3883, 3884, +- 3885, 3897, 3886, 3887, 3897, 3893, 3896, 3894, 3894, 3894, +- 3894, 3894, 3894, 3894, 3894, 3894, 3898, 3903, 3897, 3897, +- 3897, 3897, 3897, 3897, 3897, 3897, 3897, 3904, 3905, 3908, +- 3910, 3911, 3912, 3913, 3917, 3917, 3917, 3917, 3917, 3917, +- +- 3917, 3917, 3917, 828, 3898, 3903, 3918, 3919, 817, 3918, +- 3919, 808, 804, 3921, 3924, 3904, 3905, 3908, 3910, 3911, +- 3912, 3913, 3925, 3918, 3918, 3918, 3918, 3918, 3918, 3918, +- 3918, 3918, 3920, 3920, 3920, 3920, 3920, 3920, 3920, 3920, +- 3920, 3921, 3924, 3926, 3929, 3930, 3938, 3941, 3943, 773, +- 3925, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, +- 3934, 772, 770, 3934, 769, 768, 766, 3944, 3945, 3946, +- 3948, 3926, 3929, 3930, 3938, 3941, 3943, 3934, 3934, 3934, +- 3934, 3934, 3934, 3934, 3934, 3934, 3942, 3942, 3942, 3942, +- 3942, 3942, 3942, 3942, 3942, 3944, 3945, 3946, 3948, 3949, +- +- 3950, 761, 760, 758, 757, 756, 750, 743, 732, 731, +- 712, 700, 689, 677, 676, 671, 670, 668, 661, 651, +- 650, 648, 644, 634, 633, 631, 628, 3949, 3950, 3953, +- 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3953, +- 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3954, 3954, 3954, +- 3954, 3954, 3954, 3954, 3954, 3954, 3954, 3954, 3954, 3954, +- 3954, 3954, 3954, 3954, 3954, 3955, 3955, 3955, 3955, 3955, +- 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, +- 3955, 3955, 3955, 3956, 3956, 3956, 3956, 3956, 3956, 3956, +- 3956, 3956, 3956, 3956, 3956, 3956, 3956, 3956, 3956, 3956, +- +- 3956, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, +- 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3958, +- 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3958, +- 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3959, 3959, 3959, +- 3959, 3959, 3959, 3959, 3959, 3959, 3959, 3959, 3959, 3959, +- 3959, 3959, 3959, 3959, 3959, 3960, 3960, 3960, 3960, 3960, +- 3960, 3960, 3960, 3960, 3960, 3960, 3960, 3960, 3960, 3960, +- 3960, 3960, 3960, 3961, 3961, 3961, 3961, 3961, 3961, 3961, +- 3961, 3961, 3961, 3961, 3961, 3961, 3961, 3961, 3961, 3961, +- 3961, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, +- +- 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3963, +- 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3963, +- 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3964, 3964, 3964, +- 3964, 3964, 3964, 3964, 3964, 3964, 3964, 3964, 3964, 3964, +- 3964, 3964, 3964, 3964, 3964, 3965, 3965, 3965, 3965, 3965, +- 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, +- 3965, 3965, 3965, 3966, 3966, 3966, 3966, 3966, 3966, 3966, +- 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, +- 3966, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, +- 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3968, +- ++ 2016, 2009, 2010, 2011, 2017, 2018, 2012, 2019, 2300, 2166, ++ 2299, 2021, 2166, 2022, 2166, 2178, 2013, 2023, 2178, 2014, ++ 2178, 2015, 2196, 2024, 2025, 2196, 2026, 2196, 2016, 2027, ++ 2028, 2029, 2017, 2018, 2030, 2019, 2020, 2020, 2020, 2021, ++ 2020, 2022, 2020, 2020, 2031, 2023, 2020, 2020, 2020, 2032, ++ 2020, 2024, 2025, 2020, 2026, 2020, 2033, 2027, 2028, 2029, ++ 2034, 2035, 2030, 2036, 2020, 2020, 2020, 2037, 2020, 2038, ++ 2020, 2020, 2031, 2039, 2020, 2020, 2020, 2032, 2020, 2040, ++ ++ 2041, 2020, 2042, 2020, 2033, 2043, 2044, 2045, 2034, 2035, ++ 2046, 2036, 2049, 2050, 2051, 2037, 2052, 2038, 2057, 2058, ++ 2059, 2039, 2060, 2061, 2062, 2063, 2064, 2040, 2041, 2065, ++ 2042, 2065, 2068, 2043, 2044, 2045, 2069, 2072, 2046, 2075, ++ 2049, 2050, 2051, 2073, 2052, 2073, 2057, 2058, 2059, 2076, ++ 2060, 2061, 2062, 2063, 2064, 2077, 2089, 2065, 2078, 2065, ++ 2068, 2079, 2080, 2081, 2069, 2072, 2090, 2082, 2083, 2084, ++ 2085, 2073, 2086, 2073, 2091, 2094, 2095, 2096, 2097, 2098, ++ 2099, 2100, 2101, 2077, 2075, 2102, 2078, 2103, 2107, 2079, ++ 2080, 2081, 2285, 2283, 2076, 2082, 2083, 2084, 2085, 2282, ++ ++ 2086, 2089, 2108, 2094, 2095, 2096, 2097, 2098, 2099, 2100, ++ 2101, 2090, 2104, 2102, 2104, 2103, 2107, 2260, 2209, 2091, ++ 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2209, ++ 2108, 2246, 2109, 2110, 2111, 2143, 2112, 2113, 2110, 2115, ++ 2104, 2116, 2104, 2105, 2105, 2105, 2105, 2105, 2105, 2105, ++ 2105, 2105, 2117, 2118, 2119, 2105, 2120, 2105, 2105, 2105, ++ 2109, 2110, 2111, 2105, 2112, 2113, 2110, 2115, 2105, 2116, ++ 2121, 2122, 2124, 2125, 2126, 2127, 2128, 2105, 2129, 2130, ++ 2117, 2118, 2119, 2105, 2120, 2105, 2105, 2105, 2131, 2132, ++ 2133, 2105, 2134, 2135, 2137, 2138, 2105, 2139, 2121, 2122, ++ ++ 2124, 2125, 2126, 2127, 2128, 2105, 2129, 2130, 2140, 2141, ++ 2144, 2144, 2144, 2144, 2146, 2146, 2131, 2132, 2133, 2149, ++ 2134, 2135, 2137, 2138, 2151, 2139, 2147, 2147, 2147, 2147, ++ 2148, 2148, 2152, 2153, 2154, 2156, 2140, 2141, 2157, 2158, ++ 2142, 2159, 2160, 2161, 2162, 2163, 2164, 2149, 2165, 2168, ++ 2167, 2169, 2151, 2167, 2170, 2171, 2284, 2055, 2172, 2173, ++ 2152, 2153, 2154, 2156, 2174, 2144, 2157, 2158, 2146, 2159, ++ 2160, 2161, 2162, 2163, 2164, 2175, 2165, 2168, 2176, 2169, ++ 2177, 2147, 2170, 2171, 2148, 2155, 2172, 2173, 2155, 2053, ++ 2167, 2048, 2174, 2180, 2181, 2182, 2183, 2184, 2185, 2186, ++ ++ 2187, 2284, 2188, 2175, 2155, 1967, 2176, 2189, 2177, 2191, ++ 2192, 2193, 2194, 2197, 2198, 2199, 2200, 2155, 2167, 2155, ++ 2201, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2155, ++ 2188, 2155, 2155, 2155, 2203, 2189, 2204, 2191, 2192, 2193, ++ 2194, 2197, 2198, 2199, 2200, 2155, 2202, 2155, 2201, 2202, ++ 2205, 2207, 2208, 2211, 2210, 2212, 2213, 2155, 2214, 2155, ++ 2155, 2155, 2203, 2215, 2204, 2210, 2216, 2217, 2218, 2219, ++ 2220, 2221, 2222, 2223, 2224, 2216, 2225, 2226, 2205, 2207, ++ 2208, 2211, 2227, 2212, 2213, 2229, 2214, 2230, 2228, 2231, ++ 2236, 2215, 2237, 2238, 2216, 2217, 2218, 2219, 2220, 2221, ++ ++ 2222, 2223, 2224, 2228, 2225, 2226, 2239, 2240, 2241, 2242, ++ 2227, 2243, 2244, 2229, 2245, 2230, 2228, 2231, 2236, 2247, ++ 2237, 2238, 2248, 2249, 2250, 2251, 2256, 2257, 2259, 2263, ++ 2264, 2228, 2266, 2267, 2239, 2240, 2241, 2242, 2268, 2243, ++ 2244, 2269, 2245, 2270, 2271, 2272, 2279, 2247, 2280, 2281, ++ 2248, 2249, 2250, 2251, 2256, 2257, 2259, 2263, 2264, 2286, ++ 2266, 2267, 2288, 2289, 2290, 2291, 2268, 2292, 2293, 2269, ++ 2294, 2270, 2271, 2272, 2279, 2295, 2280, 2281, 2296, 2302, ++ 2304, 2305, 2306, 1952, 2298, 2307, 2308, 2298, 2309, 2298, ++ 2288, 2289, 2290, 2291, 2298, 2292, 2293, 2298, 2294, 2310, ++ ++ 2311, 2312, 2314, 2295, 2286, 2315, 2296, 2316, 2318, 2305, ++ 2306, 2298, 2319, 2307, 2308, 2368, 2309, 1948, 2368, 1946, ++ 2368, 1918, 2320, 2322, 2302, 2304, 2321, 2310, 2311, 2312, ++ 2314, 2321, 2323, 2315, 2317, 2316, 2318, 2324, 2325, 2298, ++ 2319, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, ++ 2320, 2322, 2326, 2327, 2321, 2328, 2329, 2330, 2331, 2321, ++ 2323, 2332, 2334, 2335, 2336, 2324, 2325, 2338, 2341, 2343, ++ 2344, 2345, 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2356, ++ 2326, 2327, 2358, 2328, 2329, 2330, 2331, 1901, 2363, 2332, ++ 2334, 2335, 2336, 2364, 2367, 2338, 2341, 2343, 2344, 2345, ++ ++ 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2356, 2360, 2360, ++ 2358, 2360, 2362, 2362, 2370, 2362, 2363, 2366, 2372, 2371, ++ 2369, 2364, 2367, 2369, 2366, 2371, 2373, 2374, 2375, 2376, ++ 2377, 2378, 2379, 2377, 2380, 1900, 2381, 2382, 2383, 2816, ++ 2384, 2385, 2370, 1897, 2389, 2366, 2372, 2371, 1861, 2390, ++ 2816, 2391, 2366, 2371, 2373, 2374, 2375, 2376, 2392, 2378, ++ 2379, 2393, 2380, 2360, 2381, 2382, 2383, 2362, 2384, 2385, ++ 2387, 2388, 2389, 2387, 2388, 2387, 2388, 2390, 2360, 2391, ++ 2394, 2395, 2362, 2396, 2398, 2399, 2392, 2398, 2401, 2393, ++ 2402, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 2410, 2412, ++ ++ 2413, 2414, 2415, 2417, 2418, 2420, 2421, 2419, 2394, 2395, ++ 2419, 2396, 2422, 2399, 2423, 2422, 2401, 2422, 2402, 2403, ++ 2404, 2405, 2406, 2407, 2408, 2409, 2410, 2412, 2413, 2414, ++ 2415, 2417, 2418, 2420, 2421, 2424, 2425, 2426, 2427, 2430, ++ 2431, 2433, 2423, 2435, 2436, 2438, 2439, 2440, 2441, 2442, ++ 2443, 2445, 2446, 2447, 2435, 2448, 1830, 2449, 2450, 2451, ++ 2453, 2454, 2455, 2424, 2425, 2426, 2427, 2430, 2431, 2433, ++ 2457, 2458, 2436, 2438, 2439, 2440, 2441, 2442, 2443, 2445, ++ 2446, 2447, 2459, 2448, 2435, 2449, 2450, 2451, 2453, 2454, ++ 2455, 2461, 2462, 2463, 2464, 2465, 2466, 2467, 2457, 2458, ++ ++ 2468, 2469, 2470, 2471, 2474, 2475, 2476, 2478, 2479, 2480, ++ 2459, 2484, 2485, 2489, 2491, 2492, 2493, 2494, 2495, 2461, ++ 2462, 2463, 2464, 2465, 2466, 2467, 2496, 2497, 2468, 2469, ++ 2470, 2471, 2474, 2475, 2476, 2478, 2479, 2480, 2498, 2484, ++ 2485, 2499, 2501, 2505, 2493, 2494, 2495, 2504, 2516, 2512, ++ 2819, 1761, 2514, 2515, 2496, 2497, 1760, 2505, 2489, 2491, ++ 2492, 2819, 2503, 2518, 2504, 2503, 2498, 2503, 2506, 2499, ++ 2501, 2506, 2503, 2506, 2507, 2503, 2516, 2507, 2506, 2507, ++ 2519, 2520, 1759, 2508, 2507, 2505, 2508, 2507, 2508, 2503, ++ 2521, 2518, 2504, 2508, 2512, 2506, 2508, 2514, 2515, 2522, ++ ++ 2524, 2507, 2525, 2526, 2528, 2529, 2530, 2531, 2519, 2520, ++ 2508, 2532, 2533, 2534, 2535, 2536, 2537, 2503, 2521, 2538, ++ 2539, 2540, 2541, 2506, 2542, 2543, 2544, 2522, 2524, 2507, ++ 2525, 2526, 2528, 2529, 2530, 2531, 2545, 2546, 2508, 2532, ++ 2533, 2534, 2535, 2536, 2537, 2547, 2548, 2538, 2539, 2540, ++ 2541, 2549, 2542, 2543, 2544, 2550, 2552, 2554, 2555, 2556, ++ 2557, 2558, 2559, 2560, 2545, 2546, 2561, 2563, 2563, 2568, ++ 2563, 2569, 2570, 2547, 2548, 2566, 2566, 2571, 2566, 2549, ++ 2575, 2576, 2577, 2550, 2552, 2554, 2555, 2556, 2557, 2558, ++ 2559, 2560, 2574, 2578, 2561, 2574, 2579, 2568, 2580, 2569, ++ ++ 2570, 2581, 1732, 2582, 2584, 2571, 2585, 2587, 2575, 2576, ++ 2577, 2583, 2588, 2589, 2583, 2590, 2583, 1728, 2591, 2595, ++ 2596, 2578, 2563, 2597, 2579, 2598, 2580, 2599, 2600, 2581, ++ 2566, 2582, 2584, 2604, 2585, 2587, 2602, 2563, 2602, 2603, ++ 2588, 2589, 2603, 2590, 2606, 2566, 2591, 2595, 2596, 2607, ++ 2608, 2597, 2609, 2598, 2611, 2599, 2600, 2612, 2613, 2614, ++ 2615, 2604, 2614, 2616, 2602, 2617, 2602, 2618, 2619, 2621, ++ 2622, 2623, 2606, 2625, 2623, 2629, 2623, 2607, 2608, 2615, ++ 2609, 2631, 2611, 2624, 2624, 2612, 2613, 2627, 2615, 2632, ++ 2627, 2616, 2627, 2617, 2633, 2618, 2619, 2621, 2622, 2634, ++ ++ 2635, 2625, 2636, 2629, 2637, 2638, 2640, 2615, 2641, 2631, ++ 2642, 2624, 2624, 2643, 2644, 2645, 2646, 2632, 2647, 2648, ++ 2649, 2650, 2633, 2651, 2652, 2653, 2654, 2634, 2635, 2657, ++ 2636, 2658, 2637, 2638, 2640, 2659, 2641, 2660, 2642, 2661, ++ 2662, 2643, 2644, 2645, 2646, 2663, 2647, 2648, 2649, 2650, ++ 2664, 2651, 2652, 2653, 2654, 2665, 2667, 2657, 2668, 2658, ++ 2669, 2670, 2671, 2659, 2672, 2660, 2674, 2661, 2662, 2675, ++ 2676, 2678, 2679, 2663, 2680, 2681, 2682, 2683, 2664, 2684, ++ 2685, 2687, 2688, 2665, 2667, 2689, 2668, 2690, 2669, 2670, ++ 2671, 2691, 2672, 2692, 2674, 1719, 2710, 2675, 2676, 2678, ++ ++ 2679, 2699, 2680, 2681, 2682, 2683, 2695, 2702, 2782, 2687, ++ 2688, 2782, 2700, 2689, 2701, 2690, 2711, 2701, 2699, 2691, ++ 2695, 2692, 1715, 2696, 2684, 2685, 2696, 2697, 2696, 2700, ++ 2697, 2701, 2697, 2696, 1713, 2702, 2696, 2697, 1711, 2703, ++ 2697, 2710, 2703, 1701, 2703, 2712, 2699, 2713, 2695, 2703, ++ 2696, 2714, 2703, 2704, 2697, 2716, 2704, 2700, 2704, 2705, ++ 2717, 2711, 2705, 2704, 2705, 1659, 2703, 2783, 2718, 2705, ++ 2783, 2707, 2705, 2712, 2707, 2713, 2707, 2719, 2696, 2714, ++ 2704, 2707, 2697, 2716, 2707, 2720, 2705, 2721, 2717, 1649, ++ 2708, 2722, 2723, 2708, 2703, 2708, 2718, 2724, 2707, 2725, ++ ++ 2708, 2726, 2727, 2708, 2728, 2719, 2729, 2730, 2704, 2731, ++ 2732, 2734, 2735, 2720, 2705, 2721, 2736, 2708, 2737, 2722, ++ 2723, 2738, 2739, 2740, 2741, 2724, 2707, 2725, 2742, 2726, ++ 2727, 2743, 2728, 2744, 2729, 2730, 2745, 2731, 2732, 2734, ++ 2735, 2746, 2748, 2749, 2736, 2708, 2737, 2750, 2751, 2738, ++ 2739, 2740, 2741, 2752, 2753, 2755, 2742, 2756, 2760, 2743, ++ 2761, 2744, 2762, 2763, 2745, 2764, 2765, 2766, 2767, 2746, ++ 2748, 2749, 2770, 2771, 2772, 2750, 2751, 2773, 2774, 2775, ++ 2776, 2752, 2753, 2755, 2779, 2756, 2760, 2780, 2761, 2781, ++ 2762, 2763, 2785, 2764, 2765, 2766, 2767, 2786, 2789, 2790, ++ ++ 2770, 2771, 2772, 2791, 2793, 2773, 2774, 2775, 2776, 2794, ++ 2788, 2795, 2779, 2788, 2796, 2780, 2797, 2781, 2798, 2797, ++ 2785, 2797, 2792, 2799, 2800, 2786, 2789, 2790, 2801, 2802, ++ 2792, 2792, 2793, 2792, 2791, 2792, 2803, 2794, 2804, 2795, ++ 2805, 2808, 2796, 2809, 2810, 2814, 2798, 2815, 2817, 2820, ++ 2792, 2799, 2800, 2821, 2822, 2823, 2801, 2802, 2792, 2792, ++ 2824, 2792, 2791, 2792, 2803, 2825, 2804, 2826, 2805, 2808, ++ 2829, 2809, 2810, 2814, 2830, 2815, 2817, 2820, 2831, 2832, ++ 2833, 2821, 2822, 2823, 2829, 2834, 2836, 2837, 2824, 2838, ++ 2839, 2840, 2841, 2825, 2842, 2826, 2834, 2843, 2829, 2844, ++ ++ 2845, 2846, 2830, 2848, 2849, 2850, 2831, 2832, 2833, 2851, ++ 2852, 2853, 2854, 2855, 2836, 2837, 2856, 2838, 2839, 2840, ++ 2841, 2857, 2842, 2858, 2859, 2843, 2860, 2844, 2845, 2846, ++ 2861, 2848, 2849, 2850, 2862, 2863, 2864, 2851, 2852, 2853, ++ 2854, 2855, 2865, 2866, 2856, 2867, 2868, 2869, 2871, 2857, ++ 2873, 2858, 2859, 2892, 2860, 1579, 2892, 2952, 2861, 2995, ++ 2952, 1574, 2862, 2863, 2864, 2898, 2871, 2873, 2881, 1572, ++ 2995, 2866, 2895, 2867, 2868, 2869, 2871, 2958, 2872, 2875, ++ 2958, 2872, 2875, 2872, 2875, 2881, 1550, 2865, 2872, 2875, ++ 2900, 2872, 2901, 2898, 2871, 2873, 1546, 2876, 2877, 2882, ++ ++ 2876, 2877, 2876, 2877, 2883, 2872, 2875, 2876, 2877, 2878, ++ 2876, 2877, 2878, 2881, 2878, 2884, 2882, 2895, 2900, 2878, ++ 2901, 2883, 2878, 2902, 2876, 2877, 2903, 2904, 2973, 2905, ++ 2906, 2973, 2884, 2872, 2875, 2886, 2878, 1529, 2886, 2907, ++ 2886, 1528, 1525, 2980, 2882, 2886, 2980, 3054, 2886, 2883, ++ 3054, 2902, 2876, 2877, 2903, 2904, 2888, 2905, 2906, 2888, ++ 2884, 2888, 2886, 1471, 2878, 2889, 2888, 2907, 2889, 2888, ++ 2889, 2890, 1470, 2909, 2890, 2889, 2890, 2891, 2889, 1463, ++ 2891, 2890, 2891, 2888, 2910, 1462, 2893, 2891, 2912, 2893, ++ 2886, 2893, 2889, 2914, 2916, 2917, 2893, 2894, 2890, 2893, ++ ++ 2894, 2909, 2894, 2918, 2891, 2920, 2921, 2894, 2922, 2923, ++ 2894, 2888, 2910, 2893, 2924, 2925, 2912, 2926, 2927, 2928, ++ 2889, 2914, 2916, 2917, 2894, 2929, 2890, 2930, 2934, 2935, ++ 2936, 2918, 2891, 2920, 2921, 2938, 2922, 2923, 2939, 2940, ++ 2941, 2893, 2924, 2925, 2942, 2926, 2927, 2928, 2943, 2945, ++ 2947, 2948, 2894, 2929, 2949, 2930, 2934, 2935, 2936, 2950, ++ 2951, 2953, 2955, 2938, 2956, 2957, 2939, 2940, 2941, 2962, ++ 2959, 2963, 2942, 2959, 2965, 2959, 2943, 2945, 2947, 2948, ++ 2966, 2967, 2949, 2968, 2969, 2970, 2972, 2950, 2951, 2953, ++ 2955, 2977, 2956, 2957, 2971, 2978, 2974, 2962, 2976, 2963, ++ ++ 2974, 2976, 2965, 2976, 2979, 2971, 2971, 2974, 2966, 2967, ++ 2981, 2968, 2969, 2970, 2972, 2982, 2983, 2984, 2986, 2977, ++ 2987, 2988, 2971, 2978, 2974, 2992, 2993, 2996, 2974, 2998, ++ 2999, 3000, 2979, 2971, 2971, 2974, 3001, 3002, 2981, 3003, ++ 3004, 3005, 3007, 2982, 2983, 2984, 2986, 3008, 2987, 2988, ++ 3006, 3006, 3009, 2992, 2993, 2996, 3010, 2998, 2999, 3000, ++ 3011, 3012, 3014, 3015, 3001, 3002, 3016, 3003, 3004, 3005, ++ 3007, 3017, 3018, 3019, 3020, 3008, 3021, 3022, 3006, 3006, ++ 3009, 3023, 3024, 3026, 3010, 3025, 3028, 3029, 3011, 3012, ++ 3014, 3015, 3023, 3030, 3016, 3032, 3025, 3034, 1461, 3017, ++ ++ 3018, 3019, 3020, 3035, 3021, 3022, 3036, 3038, 3039, 3040, ++ 3024, 3026, 3041, 3042, 3028, 3029, 3044, 3045, 3046, 3048, ++ 3049, 3030, 3023, 3032, 3065, 3034, 3025, 3065, 3055, 3070, ++ 3071, 3035, 3292, 3046, 3036, 3038, 3039, 3040, 3053, 3102, ++ 3041, 3042, 3102, 3292, 3044, 3045, 3046, 3048, 3049, 3051, ++ 3072, 3061, 3051, 3074, 3051, 3053, 3055, 3070, 3071, 3051, ++ 3056, 3046, 3051, 3056, 3057, 3056, 3076, 3057, 3061, 3057, ++ 3056, 3062, 3058, 3056, 3057, 3058, 3051, 3058, 3072, 3078, ++ 1406, 3074, 3058, 3053, 3079, 3058, 3080, 3056, 3062, 3114, ++ 3059, 3057, 3114, 3059, 3076, 3059, 3061, 1405, 3118, 3058, ++ ++ 3059, 3118, 3142, 3059, 3051, 3142, 3081, 3078, 3064, 3083, ++ 3084, 3064, 3079, 3064, 3080, 3056, 3062, 3059, 3064, 3057, ++ 3066, 3064, 3085, 3066, 3086, 3066, 3067, 3058, 3087, 3067, ++ 3066, 3067, 3088, 3066, 3081, 3064, 3067, 3083, 3084, 3067, ++ 3089, 3090, 3092, 3093, 3094, 3059, 3095, 3066, 3097, 3098, ++ 3085, 3099, 3086, 3067, 3100, 3101, 3087, 3103, 3104, 3105, ++ 3088, 3107, 3108, 3064, 3109, 3110, 3111, 3113, 3089, 3090, ++ 3092, 3093, 3094, 3116, 3095, 3066, 3097, 3098, 3655, 3099, ++ 3657, 3067, 3100, 3101, 1394, 3103, 3104, 3105, 3112, 3107, ++ 3108, 3112, 3109, 3110, 3111, 3113, 3121, 3120, 3122, 3124, ++ ++ 3120, 3116, 3120, 3125, 3126, 3112, 3112, 3112, 3112, 3112, ++ 3112, 3112, 3112, 3112, 3127, 3128, 3129, 3130, 3131, 3132, ++ 3133, 3135, 3241, 1370, 3121, 3241, 3122, 3124, 3655, 1369, ++ 3657, 3125, 3126, 3134, 3136, 3137, 3134, 3139, 3140, 3141, ++ 3143, 3144, 3127, 3128, 3129, 3130, 3131, 3132, 3133, 3135, ++ 3134, 3134, 3134, 3134, 3134, 3134, 3134, 3134, 3134, 3145, ++ 3146, 3148, 3136, 3137, 3149, 3139, 3140, 3141, 3143, 3144, ++ 3150, 3152, 3153, 3155, 3156, 3157, 3159, 3160, 3162, 3163, ++ 3164, 3165, 3166, 3167, 3169, 3170, 3171, 3145, 3146, 3148, ++ 3172, 3173, 3149, 3175, 3176, 3177, 3178, 3180, 3150, 3152, ++ ++ 3153, 3155, 3156, 3157, 3159, 3160, 3162, 3163, 3164, 3165, ++ 3166, 3167, 3169, 3170, 3171, 3182, 3185, 3188, 3172, 3173, ++ 3189, 3175, 3176, 3177, 3178, 3180, 3191, 3193, 3188, 3194, ++ 1365, 3195, 3196, 3197, 3198, 3199, 3201, 3202, 3203, 3204, ++ 3205, 3206, 3245, 3182, 3185, 3245, 3219, 3245, 3189, 3273, ++ 3220, 3205, 3273, 3281, 3191, 3193, 3281, 3194, 3188, 3195, ++ 3196, 3197, 3198, 3199, 3201, 3202, 3203, 3204, 3205, 3206, ++ 3207, 3208, 1364, 3207, 3219, 3207, 1363, 3213, 3220, 3205, ++ 3207, 3210, 3211, 3207, 3210, 3211, 3210, 3211, 3208, 1362, ++ 3212, 3210, 3211, 3212, 3213, 3212, 1361, 3207, 1359, 3221, ++ ++ 3212, 3214, 3215, 3212, 3214, 3215, 3214, 3215, 3210, 3211, ++ 3222, 3214, 3215, 3223, 3214, 3215, 3208, 3212, 3225, 3226, ++ 1327, 3217, 3213, 3227, 3217, 3207, 3217, 3221, 3214, 3215, ++ 3229, 3217, 3230, 3231, 3217, 3232, 3210, 3211, 3222, 3218, ++ 3233, 3223, 3218, 3234, 3218, 3212, 3225, 3226, 3217, 3218, ++ 3237, 3227, 3218, 3238, 3239, 3240, 3214, 3215, 3229, 3242, ++ 3230, 3231, 3243, 3232, 3246, 3247, 3218, 3248, 3233, 3249, ++ 3250, 3234, 3251, 3252, 3253, 1323, 3217, 3285, 3237, 1294, ++ 3285, 3238, 3239, 3240, 3255, 3260, 3287, 3242, 3260, 3287, ++ 3243, 1286, 3246, 3247, 3218, 3248, 3256, 3249, 3250, 3256, ++ ++ 3251, 3252, 3253, 3254, 3254, 3254, 3254, 3254, 3254, 3254, ++ 3254, 3254, 3255, 3256, 3256, 3256, 3256, 3256, 3256, 3256, ++ 3256, 3256, 3257, 3259, 3262, 3263, 3264, 3265, 3266, 3267, ++ 3268, 3260, 3269, 3270, 3271, 3272, 3272, 3272, 3272, 3272, ++ 3272, 3272, 3272, 3272, 3274, 3275, 3277, 3278, 3279, 3282, ++ 3257, 3259, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 3260, ++ 3269, 3270, 3271, 3283, 3284, 3286, 3288, 3289, 3290, 3291, ++ 3293, 3294, 3274, 3275, 3277, 3278, 3279, 3282, 3295, 3296, ++ 3298, 3299, 3300, 3301, 3302, 3306, 3307, 3308, 3309, 3310, ++ 3313, 3283, 3284, 3286, 3288, 3289, 3290, 3291, 3293, 3294, ++ ++ 3314, 3315, 3318, 3320, 3321, 3322, 3295, 3296, 3298, 3299, ++ 3300, 3301, 3302, 3306, 3307, 3308, 3309, 3310, 3313, 3316, ++ 3323, 3324, 3325, 3326, 3327, 3329, 3330, 3316, 3314, 3315, ++ 3318, 3320, 3321, 3322, 3331, 3332, 3333, 3334, 3338, 3360, ++ 3336, 3338, 3360, 1284, 1279, 1274, 3341, 3316, 3323, 3324, ++ 3325, 3326, 3327, 3329, 3330, 3316, 3335, 3336, 3342, 3335, ++ 3343, 3335, 3331, 3332, 3333, 3334, 3335, 3337, 3339, 3335, ++ 3337, 3339, 3337, 3339, 3341, 3344, 3345, 3337, 3339, 3340, ++ 3337, 3339, 3340, 3335, 3340, 3336, 3342, 3348, 3343, 3340, ++ 3350, 3352, 3340, 3353, 3337, 3339, 3354, 3355, 3356, 3358, ++ ++ 1217, 3361, 3364, 3344, 3345, 3365, 3340, 3366, 3367, 3368, ++ 3369, 3335, 3370, 3371, 3372, 3348, 3374, 3390, 3350, 3352, ++ 3390, 3353, 3337, 3339, 3354, 3355, 3356, 3358, 3359, 3361, ++ 3364, 3359, 3409, 3365, 3340, 3366, 3367, 3368, 3369, 1216, ++ 3370, 3371, 3372, 3409, 3374, 3359, 3359, 3359, 3359, 3359, ++ 3359, 3359, 3359, 3359, 3362, 3362, 3362, 3362, 3362, 3362, ++ 3362, 3362, 3362, 3362, 3362, 3363, 3363, 3363, 3363, 3363, ++ 3363, 3363, 3363, 3363, 3363, 3363, 3376, 3378, 1215, 3362, ++ 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3377, ++ 3363, 3380, 3377, 3381, 3382, 3383, 3384, 3385, 3386, 3387, ++ ++ 3388, 3393, 3394, 1214, 3376, 3378, 3377, 3377, 3377, 3377, ++ 3377, 3377, 3377, 3377, 3377, 3391, 3396, 3392, 3391, 3380, ++ 3392, 3381, 3382, 3383, 3384, 3385, 3386, 3387, 3388, 3393, ++ 3394, 3395, 3397, 3398, 3395, 3399, 3400, 3462, 3399, 3400, ++ 3462, 3414, 1213, 3403, 3396, 3401, 3405, 3407, 3401, 3411, ++ 3412, 3413, 3414, 3415, 3416, 3418, 1212, 1208, 3419, 3420, ++ 3397, 3398, 3401, 3401, 3401, 3401, 3401, 3401, 3401, 3401, ++ 3401, 3403, 3421, 3422, 3405, 3407, 3417, 3411, 3412, 3413, ++ 3423, 3415, 3416, 3418, 3417, 3417, 3419, 3420, 3424, 3425, ++ 3426, 3427, 3428, 3429, 3430, 3431, 3432, 3434, 3435, 3436, ++ ++ 3421, 3422, 3437, 3438, 3417, 3439, 3440, 3439, 3423, 3441, ++ 3442, 3444, 3417, 3417, 3445, 1207, 3424, 3425, 3426, 3427, ++ 3428, 3429, 3430, 3431, 3432, 3434, 3435, 3436, 3447, 3448, ++ 3437, 3438, 3449, 3451, 3440, 3453, 3457, 3441, 3442, 3444, ++ 3446, 3459, 3445, 3446, 3464, 3446, 3465, 3466, 3467, 3487, ++ 3446, 3497, 3487, 3446, 3497, 3547, 3447, 3448, 3547, 3555, ++ 3449, 3451, 3555, 3453, 3457, 3468, 3469, 3446, 3470, 3459, ++ 3472, 3473, 3464, 3476, 3465, 3466, 3467, 3439, 3460, 3460, ++ 3460, 3460, 3460, 3460, 3460, 3460, 3460, 3461, 3559, 3463, ++ 3461, 3559, 3461, 3468, 3469, 3446, 3470, 3488, 3472, 3473, ++ ++ 3488, 3476, 3488, 1206, 3461, 3461, 3461, 3461, 3461, 3461, ++ 3461, 3461, 3461, 3463, 3463, 3463, 3463, 3463, 3463, 3463, ++ 3463, 3463, 3463, 3463, 3475, 3475, 3475, 3475, 3475, 3475, ++ 3475, 3475, 3475, 3477, 3478, 3479, 3480, 3481, 3463, 3482, ++ 3481, 3483, 3484, 3485, 3489, 3490, 3491, 3489, 3492, 3489, ++ 3493, 3492, 3494, 3492, 3495, 3500, 3632, 3635, 1192, 3632, ++ 3635, 3477, 3478, 3479, 3480, 3677, 3481, 3482, 3505, 3483, ++ 3484, 3485, 3573, 3490, 3491, 3573, 3677, 3573, 3493, 1190, ++ 3494, 3498, 3495, 3500, 3498, 3499, 3499, 3499, 3499, 3499, ++ 3499, 3499, 3499, 3499, 3481, 3506, 3505, 3507, 3498, 3498, ++ ++ 3498, 3498, 3498, 3498, 3498, 3498, 3498, 3504, 3509, 3510, ++ 3511, 3512, 3513, 3504, 3514, 3515, 3517, 3520, 3522, 3523, ++ 3524, 3525, 3526, 3506, 3529, 3507, 3530, 3532, 3533, 3576, ++ 3774, 1185, 3576, 3774, 3576, 3504, 3509, 3510, 3511, 3512, ++ 3513, 3504, 3514, 3515, 3517, 3520, 3522, 3523, 3524, 3525, ++ 3526, 3535, 3529, 3536, 3530, 3532, 3533, 3534, 3534, 3534, ++ 3534, 3534, 3534, 3534, 3534, 3534, 3534, 3534, 3537, 3540, ++ 3541, 3542, 3543, 3545, 3546, 3638, 1157, 1152, 3638, 3535, ++ 3638, 3536, 3534, 3548, 3548, 3548, 3548, 3548, 3548, 3548, ++ 3548, 3548, 3552, 3553, 3554, 3556, 3537, 3540, 3541, 3542, ++ ++ 3543, 3545, 3546, 3549, 3549, 3549, 3549, 3549, 3549, 3549, ++ 3549, 3549, 3550, 3557, 3558, 3550, 3560, 3561, 3562, 3564, ++ 3552, 3553, 3554, 3556, 3565, 3567, 3568, 3569, 3571, 3550, ++ 3550, 3550, 3550, 3550, 3550, 3550, 3550, 3550, 3578, 3579, ++ 3566, 3557, 3558, 3566, 3560, 3561, 3562, 3564, 3570, 1142, ++ 3581, 3570, 3565, 3567, 3568, 3569, 3571, 3566, 3566, 3566, ++ 3566, 3566, 3566, 3566, 3566, 3566, 3578, 3579, 3582, 3583, ++ 3584, 3588, 3589, 3590, 3592, 3594, 3595, 3570, 3581, 3596, ++ 3597, 3598, 3599, 3600, 3584, 3584, 3584, 3584, 3584, 3584, ++ 3584, 3584, 3584, 1131, 1129, 3585, 3582, 3583, 3585, 3588, ++ ++ 3589, 3590, 3592, 3594, 3595, 3570, 3601, 3596, 3597, 3598, ++ 3599, 3600, 3585, 3585, 3585, 3585, 3585, 3585, 3585, 3585, ++ 3585, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, ++ 3602, 3603, 3604, 3605, 3601, 3606, 3607, 3608, 3611, 3615, ++ 1127, 3617, 3618, 3616, 3616, 3616, 3616, 3616, 3616, 3616, ++ 3616, 3616, 3616, 3616, 3619, 3622, 3624, 3625, 3602, 3603, ++ 3604, 3605, 1126, 3606, 3607, 3608, 3611, 3615, 3616, 3617, ++ 3618, 3775, 1112, 3628, 3775, 3628, 3628, 3629, 3628, 3631, ++ 3633, 1111, 3619, 3622, 3624, 3625, 3628, 3637, 3639, 3629, ++ 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3630, 3630, ++ ++ 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3631, 3633, 3634, ++ 3640, 3641, 3634, 3642, 3643, 3637, 3639, 3644, 3644, 3644, ++ 3644, 3644, 3644, 3644, 3644, 3644, 3634, 3634, 3634, 3634, ++ 3634, 3634, 3634, 3634, 3634, 3645, 3646, 1107, 3640, 3641, ++ 3701, 3642, 3643, 3701, 1106, 3701, 3649, 3650, 3648, 3653, ++ 3654, 3648, 3658, 3659, 3654, 3660, 3662, 3628, 3663, 3664, ++ 3666, 3654, 1105, 3645, 3646, 3648, 3648, 3648, 3648, 3648, ++ 3648, 3648, 3648, 3648, 3649, 3650, 3661, 3653, 3654, 3667, ++ 3658, 3659, 3654, 3660, 3662, 3668, 3663, 3664, 3666, 3654, ++ 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3669, ++ ++ 3670, 3671, 3672, 3673, 3674, 3675, 3676, 3667, 3678, 3679, ++ 3681, 3687, 3689, 3668, 3691, 3693, 1104, 3700, 3704, 3678, ++ 1103, 3704, 1063, 3704, 3702, 3740, 3709, 3669, 3670, 3671, ++ 3672, 3673, 3674, 3675, 3676, 1011, 3740, 3679, 3681, 3687, ++ 3689, 1010, 3691, 3693, 3694, 3700, 3694, 3694, 3695, 3694, ++ 3695, 3695, 3702, 3695, 3709, 3707, 3710, 3694, 3707, 3711, ++ 3707, 3695, 3703, 3703, 3703, 3703, 3703, 3703, 3703, 3703, ++ 3703, 3712, 3713, 3714, 3715, 3716, 3716, 3716, 3716, 3716, ++ 3716, 3716, 3716, 3716, 3710, 3717, 3718, 3711, 3721, 3722, ++ 3723, 3724, 3726, 3728, 3729, 3730, 3731, 3732, 3733, 3712, ++ ++ 3713, 3714, 3715, 3734, 3748, 3735, 3736, 3738, 3739, 3741, ++ 3743, 3744, 3747, 3717, 3718, 3748, 3721, 3722, 3723, 3724, ++ 3752, 3728, 3729, 3730, 3731, 3732, 3733, 3754, 3694, 3758, ++ 3755, 3734, 3695, 3735, 3736, 3738, 3739, 3741, 3743, 3744, ++ 3747, 3755, 3726, 3762, 3760, 3765, 3766, 3760, 3752, 3760, ++ 3767, 3768, 3769, 3770, 3771, 3754, 3772, 3758, 3755, 3773, ++ 3776, 3777, 3773, 3778, 3779, 990, 3780, 3782, 3783, 3755, ++ 3785, 3786, 3787, 3765, 3766, 3788, 3789, 3791, 3767, 3768, ++ 3769, 3770, 3771, 3792, 3772, 3804, 3796, 3797, 3776, 3777, ++ 3798, 3799, 3779, 3762, 3780, 3782, 3783, 3801, 3785, 3786, ++ ++ 3787, 3806, 3808, 3788, 3789, 3791, 3773, 977, 3809, 3811, ++ 3812, 3792, 3813, 3778, 3796, 3797, 3814, 3815, 3798, 3799, ++ 3816, 3817, 3822, 3816, 3818, 3801, 3823, 3818, 3819, 3818, ++ 3808, 3819, 3824, 3819, 3773, 3804, 3809, 3811, 3812, 3820, ++ 3813, 3825, 3820, 3821, 3814, 3815, 3821, 3826, 3829, 3817, ++ 3822, 3806, 3830, 3831, 3823, 3832, 3833, 3834, 3837, 3838, ++ 3824, 3841, 3838, 3843, 3844, 3845, 3846, 3848, 3849, 3825, ++ 3851, 3852, 3875, 3851, 3853, 3826, 3829, 3853, 3860, 3853, ++ 3830, 3831, 3862, 3832, 3833, 3834, 3837, 3863, 3864, 3866, ++ 3867, 3843, 3844, 3845, 3846, 3848, 3849, 3855, 3857, 3852, ++ ++ 3855, 3857, 3855, 3857, 3858, 3868, 3860, 3858, 3869, 3858, ++ 3862, 3841, 3870, 3871, 3876, 3863, 3864, 3866, 3867, 3878, ++ 3874, 3879, 3875, 3874, 3871, 3874, 3877, 3871, 3880, 3877, ++ 3882, 3880, 3885, 3868, 3890, 3885, 3869, 3885, 3891, 3892, ++ 3870, 3871, 3876, 3887, 3893, 3894, 3887, 3878, 3887, 3879, ++ 3895, 3896, 3871, 3897, 3898, 3871, 3899, 3900, 3882, 3906, ++ 3904, 3908, 3890, 3904, 3908, 3904, 3891, 3892, 966, 3909, ++ 3911, 3907, 3893, 3894, 3907, 946, 928, 3932, 3895, 3896, ++ 3932, 3897, 3898, 3910, 3899, 3900, 3910, 3906, 3907, 3907, ++ 3907, 3907, 3907, 3907, 3907, 3907, 3907, 3909, 3911, 3916, ++ ++ 3910, 3910, 3910, 3910, 3910, 3910, 3910, 3910, 3910, 3917, ++ 3918, 3921, 3923, 3924, 3925, 3926, 3930, 3930, 3930, 3930, ++ 3930, 3930, 3930, 3930, 3930, 903, 891, 3916, 3931, 880, ++ 878, 3931, 876, 872, 828, 3934, 3937, 3917, 3918, 3921, ++ 3923, 3924, 3925, 3926, 3938, 3931, 3931, 3931, 3931, 3931, ++ 3931, 3931, 3931, 3931, 3933, 3933, 3933, 3933, 3933, 3933, ++ 3933, 3933, 3933, 3934, 3937, 3939, 3942, 3943, 3951, 3954, ++ 3956, 817, 3938, 3946, 3946, 3946, 3946, 3946, 3946, 3946, ++ 3946, 3946, 3947, 808, 804, 3947, 773, 772, 770, 3957, ++ 3958, 3959, 3961, 3939, 3942, 3943, 3951, 3954, 3956, 3947, ++ ++ 3947, 3947, 3947, 3947, 3947, 3947, 3947, 3947, 3955, 3955, ++ 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3957, 3958, 3959, ++ 3961, 3962, 3963, 769, 768, 766, 761, 760, 758, 757, ++ 756, 750, 743, 732, 731, 712, 700, 689, 677, 676, ++ 671, 670, 668, 661, 651, 650, 648, 644, 634, 3962, ++ 3963, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, ++ 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3967, ++ 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, ++ 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3968, 3968, 3968, + 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3968, +- 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3969, 3969, 3969, ++ ++ 3968, 3968, 3968, 3968, 3968, 3969, 3969, 3969, 3969, 3969, + 3969, 3969, 3969, 3969, 3969, 3969, 3969, 3969, 3969, 3969, +- 3969, 3969, 3969, 3969, 3969, 3970, 3970, 3970, 3970, 3970, ++ 3969, 3969, 3969, 3970, 3970, 3970, 3970, 3970, 3970, 3970, + 3970, 3970, 3970, 3970, 3970, 3970, 3970, 3970, 3970, 3970, +- 3970, 3970, 3970, 3971, 3971, 3971, 3971, 3971, 3971, 3971, +- 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, +- 3971, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, +- 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3973, ++ 3970, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, ++ 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3972, ++ 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, ++ 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3973, 3973, 3973, + 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3973, ++ 3973, 3973, 3973, 3973, 3973, 3974, 3974, 3974, 3974, 3974, + +- 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3974, 3974, 3974, + 3974, 3974, 3974, 3974, 3974, 3974, 3974, 3974, 3974, 3974, +- 3974, 3974, 3974, 3974, 3974, 3975, 3975, 3975, 3975, 3975, ++ 3974, 3974, 3974, 3975, 3975, 3975, 3975, 3975, 3975, 3975, + 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, +- 3975, 3975, 3975, 3976, 3976, 627, 3976, 3976, 3976, 3976, +- 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, +- 3976, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, +- 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3978, ++ 3975, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, ++ 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3977, ++ 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, ++ 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3978, 3978, 3978, + 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3978, +- 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3979, 3979, 3979, +- ++ 3978, 3978, 3978, 3978, 3978, 3979, 3979, 3979, 3979, 3979, + 3979, 3979, 3979, 3979, 3979, 3979, 3979, 3979, 3979, 3979, +- 3979, 3979, 3979, 3979, 3979, 3980, 3980, 3980, 3980, 3980, ++ ++ 3979, 3979, 3979, 3980, 3980, 3980, 3980, 3980, 3980, 3980, + 3980, 3980, 3980, 3980, 3980, 3980, 3980, 3980, 3980, 3980, +- 3980, 3980, 3980, 3981, 3981, 3981, 3981, 3981, 3981, 3981, +- 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, +- 3981, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, +- 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3983, ++ 3980, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, ++ 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3982, ++ 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, ++ 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3983, 3983, 3983, + 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, +- 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3984, 3984, 3984, ++ 3983, 3983, 3983, 3983, 3983, 3984, 3984, 3984, 3984, 3984, + 3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, ++ 3984, 3984, 3984, 3985, 3985, 3985, 3985, 3985, 3985, 3985, + +- 3984, 3984, 3984, 3984, 3984, 3985, 3985, 3985, 3985, 3985, + 3985, 3985, 3985, 3985, 3985, 3985, 3985, 3985, 3985, 3985, +- 3985, 3985, 3985, 3986, 3986, 3986, 3986, 3986, 3986, 3986, +- 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, +- 3986, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, +- 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3988, ++ 3985, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, ++ 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3987, ++ 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, ++ 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3988, 3988, 3988, + 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3988, +- 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3989, 3989, 3989, ++ 3988, 3988, 3988, 3988, 3988, 3989, 3989, 633, 3989, 3989, + 3989, 3989, 3989, 3989, 3989, 3989, 3989, 3989, 3989, 3989, +- 3989, 3989, 3989, 3989, 3989, 3990, 3990, 3990, 3990, 3990, +- ++ 3989, 3989, 3989, 3990, 3990, 3990, 3990, 3990, 3990, 3990, + 3990, 3990, 3990, 3990, 3990, 3990, 3990, 3990, 3990, 3990, +- 3990, 3990, 3990, 3991, 3991, 3991, 3991, 3991, 3991, 3991, +- 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, +- 3991, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, +- 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3993, ++ ++ 3990, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, ++ 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3992, ++ 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, ++ 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3993, 3993, 3993, + 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3993, +- 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3994, 3994, 625, ++ 3993, 3993, 3993, 3993, 3993, 3994, 3994, 3994, 3994, 3994, + 3994, 3994, 3994, 3994, 3994, 3994, 3994, 3994, 3994, 3994, +- 3994, 3994, 3994, 3994, 3994, 3995, 3995, 622, 3995, 3995, ++ 3994, 3994, 3994, 3995, 3995, 3995, 3995, 3995, 3995, 3995, + 3995, 3995, 3995, 3995, 3995, 3995, 3995, 3995, 3995, 3995, ++ 3995, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, + +- 3995, 3995, 3995, 3996, 3996, 621, 3996, 3996, 3996, 3996, +- 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, +- 3996, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, +- 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3998, ++ 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3997, ++ 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, ++ 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3998, 3998, 3998, + 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3998, +- 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3999, 3999, 3999, ++ 3998, 3998, 3998, 3998, 3998, 3999, 3999, 3999, 3999, 3999, + 3999, 3999, 3999, 3999, 3999, 3999, 3999, 3999, 3999, 3999, +- 3999, 3999, 3999, 3999, 3999, 4000, 4000, 4000, 4000, 4000, ++ 3999, 3999, 3999, 4000, 4000, 4000, 4000, 4000, 4000, 4000, + 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, +- 4000, 4000, 4000, 4001, 4001, 541, 4001, 4001, 4001, 4001, ++ 4000, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, ++ 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4002, + +- 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, +- 4001, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, +- 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4003, ++ 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, ++ 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4003, 4003, 4003, + 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4003, +- 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4004, 4004, 4004, ++ 4003, 4003, 4003, 4003, 4003, 4004, 4004, 4004, 4004, 4004, + 4004, 4004, 4004, 4004, 4004, 4004, 4004, 4004, 4004, 4004, +- 4004, 4004, 4004, 537, 4004, 4005, 4005, 4005, 4005, 4005, ++ 4004, 4004, 4004, 4005, 4005, 4005, 4005, 4005, 4005, 4005, + 4005, 4005, 4005, 4005, 4005, 4005, 4005, 4005, 4005, 4005, +- 4005, 4005, 4005, 4006, 4006, 4006, 4006, 4006, 4006, 4006, +- 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 536, ++ 4005, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, ++ 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4007, ++ 4007, 631, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, + +- 4006, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, +- 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4008, ++ 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4008, 4008, 628, + 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4008, +- 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4009, 4009, 4009, ++ 4008, 4008, 4008, 4008, 4008, 4009, 4009, 627, 4009, 4009, + 4009, 4009, 4009, 4009, 4009, 4009, 4009, 4009, 4009, 4009, +- 4009, 4009, 4009, 4009, 4009, 4010, 4010, 4010, 4010, 4010, ++ 4009, 4009, 4009, 4010, 4010, 4010, 4010, 4010, 4010, 4010, + 4010, 4010, 4010, 4010, 4010, 4010, 4010, 4010, 4010, 4010, +- 4010, 4010, 4010, 4011, 530, 4011, 4011, 529, 513, 4011, +- 4011, 4011, 4011, 4011, 512, 4011, 4011, 4011, 4011, 4011, ++ 4010, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, ++ 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4012, + 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, ++ 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4013, 4013, 4013, + +- 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4013, 4013, + 4013, 4013, 4013, 4013, 4013, 4013, 4013, 4013, 4013, 4013, +- 4013, 4013, 4013, 4013, 506, 4013, 4014, 4014, 4014, 4014, ++ 4013, 4013, 4013, 4013, 4013, 4014, 4014, 625, 4014, 4014, + 4014, 4014, 4014, 4014, 4014, 4014, 4014, 4014, 4014, 4014, +- 4014, 4014, 4014, 4014, 4015, 4015, 4015, 4015, 4015, 4015, ++ 4014, 4014, 4014, 4015, 4015, 4015, 4015, 4015, 4015, 4015, + 4015, 4015, 4015, 4015, 4015, 4015, 4015, 4015, 4015, 4015, +- 4015, 4015, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, +- 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, +- 4017, 504, 4017, 4017, 490, 478, 4017, 4017, 4017, 4017, +- 4017, 475, 4017, 4017, 4017, 4017, 4017, 4018, 4018, 4018, +- ++ 4015, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, ++ 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4017, ++ 4017, 4017, 4017, 4017, 4017, 4017, 4017, 4017, 4017, 4017, ++ 4017, 4017, 4017, 4017, 4017, 622, 4017, 4018, 4018, 4018, + 4018, 4018, 4018, 4018, 4018, 4018, 4018, 4018, 4018, 4018, ++ + 4018, 4018, 4018, 4018, 4018, 4019, 4019, 4019, 4019, 4019, + 4019, 4019, 4019, 4019, 4019, 4019, 4019, 4019, 4019, 4019, +- 4019, 453, 4019, 4020, 4020, 4020, 4020, 4020, 4020, 4020, ++ 4019, 621, 4019, 4020, 4020, 4020, 4020, 4020, 4020, 4020, + 4020, 4020, 4020, 4020, 4020, 4020, 4020, 4020, 4020, 4020, + 4020, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, + 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4022, + 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4022, + 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4023, 4023, 4023, + 4023, 4023, 4023, 4023, 4023, 4023, 4023, 4023, 4023, 4023, ++ 4023, 4023, 4023, 4023, 4023, 4024, 541, 4024, 4024, 537, + +- 4023, 4023, 4023, 440, 4023, 4024, 4024, 434, 4024, 4024, +- 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, +- 4024, 4024, 4024, 4025, 4025, 422, 4025, 4025, 4025, 4025, ++ 536, 4024, 4024, 4024, 4024, 4024, 530, 4024, 4024, 4024, ++ 4024, 4024, 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, + 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, +- 4025, 4026, 4026, 413, 4026, 4026, 4026, 4026, 4026, 4026, +- 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4027, ++ 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, ++ 4026, 4026, 4026, 4026, 4026, 4026, 529, 4026, 4027, 4027, + 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4027, +- 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4028, 4028, 4028, ++ 4027, 4027, 4027, 4027, 4027, 4027, 4028, 4028, 4028, 4028, + 4028, 4028, 4028, 4028, 4028, 4028, 4028, 4028, 4028, 4028, +- 4028, 4028, 4028, 412, 4028, 4029, 4029, 4029, 4029, 4029, +- ++ 4028, 4028, 4028, 4028, 4029, 4029, 4029, 4029, 4029, 4029, + 4029, 4029, 4029, 4029, 4029, 4029, 4029, 4029, 4029, 4029, +- 4029, 4029, 4029, 4030, 4030, 4030, 4030, 4030, 4030, 4030, +- 4030, 4030, 4030, 4030, 4030, 4030, 4030, 4030, 4030, 393, +- 4030, 4031, 4031, 392, 4031, 4031, 4031, 4031, 4031, 4031, +- 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4032, ++ ++ 4029, 4029, 4030, 513, 4030, 4030, 512, 506, 4030, 4030, ++ 4030, 4030, 4030, 504, 4030, 4030, 4030, 4030, 4030, 4031, ++ 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, ++ 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4032, 4032, 4032, + 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4032, +- 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4033, 4033, 4033, ++ 4032, 4032, 4032, 490, 4032, 4033, 4033, 4033, 4033, 4033, + 4033, 4033, 4033, 4033, 4033, 4033, 4033, 4033, 4033, 4033, +- 4033, 4033, 4033, 4033, 4033, 4034, 4034, 4034, 4034, 4034, ++ 4033, 4033, 4033, 4034, 4034, 4034, 4034, 4034, 4034, 4034, + 4034, 4034, 4034, 4034, 4034, 4034, 4034, 4034, 4034, 4034, ++ 4034, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, + +- 4034, 4034, 4034, 4035, 4035, 4035, 4035, 4035, 4035, 4035, +- 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, +- 4035, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, +- 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4037, ++ 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4036, ++ 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, ++ 4036, 4036, 4036, 4036, 4036, 478, 4036, 4037, 4037, 475, + 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4037, +- 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4038, 385, 4038, +- 4038, 383, 368, 4038, 4038, 4038, 4038, 4038, 367, 4038, +- 4038, 4038, 4038, 4038, 4038, 4039, 358, 4039, 4039, 357, +- 347, 4039, 4039, 4039, 4039, 4039, 317, 4039, 4039, 4039, +- 4039, 4039, 4039, 4040, 4040, 4040, 4040, 4040, 4040, 4040, +- +- 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, +- 4040, 4041, 316, 4041, 4041, 284, 268, 4041, 4041, 4041, +- 4041, 4041, 261, 4041, 4041, 4041, 4041, 4041, 4042, 4042, ++ 4037, 4037, 4037, 4037, 4037, 4038, 4038, 453, 4038, 4038, ++ 4038, 4038, 4038, 4038, 4038, 4038, 4038, 4038, 4038, 4038, ++ 4038, 4038, 4038, 4039, 4039, 440, 4039, 4039, 4039, 4039, ++ 4039, 4039, 4039, 4039, 4039, 4039, 4039, 4039, 4039, 4039, ++ 4039, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, ++ 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4041, ++ ++ 4041, 4041, 4041, 4041, 4041, 4041, 4041, 4041, 4041, 4041, ++ 4041, 4041, 4041, 4041, 4041, 434, 4041, 4042, 4042, 4042, + 4042, 4042, 4042, 4042, 4042, 4042, 4042, 4042, 4042, 4042, +- 4042, 4042, 4042, 4042, 4042, 4042, 4043, 4043, 4043, 4043, ++ 4042, 4042, 4042, 4042, 4042, 4043, 4043, 4043, 4043, 4043, + 4043, 4043, 4043, 4043, 4043, 4043, 4043, 4043, 4043, 4043, +- 4043, 4043, 4043, 4043, 4044, 4044, 4044, 4044, 4044, 4044, ++ 4043, 422, 4043, 4044, 4044, 413, 4044, 4044, 4044, 4044, + 4044, 4044, 4044, 4044, 4044, 4044, 4044, 4044, 4044, 4044, +- 4044, 4044, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, +- 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, ++ 4044, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, ++ 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4046, ++ 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4046, + +- 4046, 259, 4046, 4046, 252, 234, 4046, 4046, 4046, 4046, +- 4046, 229, 4046, 4046, 4046, 4046, 4046, 4046, 4047, 4047, ++ 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4047, 4047, 4047, + 4047, 4047, 4047, 4047, 4047, 4047, 4047, 4047, 4047, 4047, +- 4047, 4047, 4047, 4047, 4047, 4047, 4048, 4048, 4048, 4048, ++ 4047, 4047, 4047, 4047, 4047, 4048, 4048, 4048, 4048, 4048, + 4048, 4048, 4048, 4048, 4048, 4048, 4048, 4048, 4048, 4048, +- 4048, 4048, 4048, 4048, 4049, 216, 4049, 4049, 194, 182, +- 4049, 4049, 4049, 4049, 4049, 175, 4049, 4049, 4049, 4049, ++ 4048, 4048, 4048, 4049, 4049, 4049, 4049, 4049, 4049, 4049, ++ 4049, 4049, 4049, 4049, 4049, 4049, 4049, 4049, 4049, 4049, + 4049, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, + 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4051, +- 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4051, ++ 412, 4051, 4051, 393, 392, 4051, 4051, 4051, 4051, 4051, ++ 385, 4051, 4051, 4051, 4051, 4051, 4051, 4052, 383, 4052, + +- 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4052, 4052, 4052, +- 4052, 4052, 4052, 4052, 4052, 4052, 4052, 4052, 4052, 4052, ++ 4052, 368, 367, 4052, 4052, 4052, 4052, 4052, 358, 4052, + 4052, 4052, 4052, 4052, 4052, 4053, 4053, 4053, 4053, 4053, + 4053, 4053, 4053, 4053, 4053, 4053, 4053, 4053, 4053, 4053, +- 4053, 4053, 4053, 4054, 4054, 4054, 4054, 4054, 4054, 4054, +- 4054, 4054, 4054, 4054, 4054, 4054, 4054, 4054, 4054, 4054, +- 4054, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, +- 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4056, ++ 4053, 4053, 4053, 4054, 357, 4054, 4054, 347, 317, 4054, ++ 4054, 4054, 4054, 4054, 316, 4054, 4054, 4054, 4054, 4054, ++ 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, ++ 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4056, 4056, + 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4056, +- 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4057, 4057, 4057, +- ++ 4056, 4056, 4056, 4056, 4056, 4056, 4057, 4057, 4057, 4057, + 4057, 4057, 4057, 4057, 4057, 4057, 4057, 4057, 4057, 4057, +- 4057, 4057, 4057, 4057, 4057, 4058, 4058, 4058, 4058, 4058, ++ ++ 4057, 4057, 4057, 4057, 4058, 4058, 4058, 4058, 4058, 4058, + 4058, 4058, 4058, 4058, 4058, 4058, 4058, 4058, 4058, 4058, +- 4058, 4058, 4058, 4059, 4059, 4059, 4059, 4059, 4059, 4059, +- 4059, 4059, 4059, 4059, 4059, 4059, 4059, 4059, 4059, 4059, +- 4059, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, +- 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4061, +- 4061, 172, 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, +- 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4062, 4062, 4062, +- 4062, 4062, 4062, 4062, 4062, 4062, 4062, 4062, 4062, 4062, +- +- 4062, 4062, 4062, 4062, 4062, 4063, 4063, 4063, 4063, 4063, ++ 4058, 4058, 4059, 284, 4059, 4059, 268, 261, 4059, 4059, ++ 4059, 4059, 4059, 259, 4059, 4059, 4059, 4059, 4059, 4059, ++ 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, ++ 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4061, 4061, ++ 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, ++ 4061, 4061, 4061, 4061, 4061, 4061, 4062, 252, 4062, 4062, ++ 234, 229, 4062, 4062, 4062, 4062, 4062, 216, 4062, 4062, ++ 4062, 4062, 4062, 4063, 4063, 4063, 4063, 4063, 4063, 4063, ++ + 4063, 4063, 4063, 4063, 4063, 4063, 4063, 4063, 4063, 4063, +- 4063, 4063, 4063, 4064, 4064, 4064, 4064, 4064, 4064, 4064, +- 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, +- 4064, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, +- 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4066, +- 165, 4066, 4066, 164, 163, 4066, 4066, 4066, 4066, 4066, +- 154, 4066, 4066, 4066, 4066, 4066, 4066, 4067, 152, 4067, +- 4067, 146, 141, 4067, 4067, 4067, 4067, 4067, 117, 4067, +- 4067, 4067, 4067, 4067, 4067, 4068, 75, 4068, 4068, 64, +- +- 63, 4068, 4068, 4068, 4068, 4068, 58, 4068, 4068, 4068, +- 4068, 4068, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, +- 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, +- 4070, 57, 4070, 4070, 56, 55, 4070, 4070, 4070, 4070, +- 4070, 54, 4070, 4070, 4070, 4070, 4070, 4070, 4071, 4071, ++ 4063, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, ++ 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4065, ++ 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, ++ 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4066, 4066, 4066, ++ 4066, 4066, 4066, 4066, 4066, 4066, 4066, 4066, 4066, 4066, ++ 4066, 4066, 4066, 4066, 4066, 4067, 4067, 4067, 4067, 4067, ++ 4067, 4067, 4067, 4067, 4067, 4067, 4067, 4067, 4067, 4067, ++ 4067, 4067, 4067, 4068, 4068, 4068, 4068, 4068, 4068, 4068, ++ 4068, 4068, 4068, 4068, 4068, 4068, 4068, 4068, 4068, 4068, ++ ++ 4068, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, ++ 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4070, ++ 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4070, ++ 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4071, 4071, 4071, + 4071, 4071, 4071, 4071, 4071, 4071, 4071, 4071, 4071, 4071, +- 4071, 4071, 4071, 4071, 4071, 4071, 4072, 53, 4072, 4072, +- 52, 51, 4072, 4072, 4072, 4072, 4072, 26, 4072, 4072, +- 4072, 4072, 4072, 4072, 4073, 4073, 4073, 4073, 4073, 4073, ++ 4071, 4071, 4071, 4071, 4071, 4072, 4072, 4072, 4072, 4072, ++ 4072, 4072, 4072, 4072, 4072, 4072, 4072, 4072, 4072, 4072, ++ 4072, 4072, 4072, 4073, 4073, 4073, 4073, 4073, 4073, 4073, + 4073, 4073, 4073, 4073, 4073, 4073, 4073, 4073, 4073, 4073, ++ 4073, 4074, 4074, 194, 4074, 4074, 4074, 4074, 4074, 4074, + +- 4073, 4073, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, +- 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, +- 4075, 25, 4075, 4075, 24, 23, 4075, 4075, 4075, 4075, +- 4075, 0, 4075, 4075, 4075, 4075, 4075, 4076, 4076, 4076, ++ 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4075, ++ 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4075, ++ 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4076, 4076, 4076, + 4076, 4076, 4076, 4076, 4076, 4076, 4076, 4076, 4076, 4076, + 4076, 4076, 4076, 4076, 4076, 4077, 4077, 4077, 4077, 4077, + 4077, 4077, 4077, 4077, 4077, 4077, 4077, 4077, 4077, 4077, + 4077, 4077, 4077, 4078, 4078, 4078, 4078, 4078, 4078, 4078, + 4078, 4078, 4078, 4078, 4078, 4078, 4078, 4078, 4078, 4078, +- 4078, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4079, ++ 4078, 4079, 182, 4079, 4079, 175, 172, 4079, 4079, 4079, ++ 4079, 4079, 165, 4079, 4079, 4079, 4079, 4079, 4079, 4080, + +- 0, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4080, +- 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4080, +- 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4081, 4081, 4081, +- 4081, 4081, 4081, 4081, 4081, 4081, 4081, 4081, 4081, 4081, +- 4081, 4081, 4081, 4081, 4081, 4082, 4082, 4082, 4082, 4082, ++ 164, 4080, 4080, 163, 154, 4080, 4080, 4080, 4080, 4080, ++ 152, 4080, 4080, 4080, 4080, 4080, 4080, 4081, 146, 4081, ++ 4081, 141, 117, 4081, 4081, 4081, 4081, 4081, 75, 4081, ++ 4081, 4081, 4081, 4081, 4082, 4082, 4082, 4082, 4082, 4082, + 4082, 4082, 4082, 4082, 4082, 4082, 4082, 4082, 4082, 4082, +- 4082, 4082, 4082, 4083, 4083, 4083, 4083, 4083, 4083, 4083, +- 4083, 4083, 4083, 4083, 4083, 4083, 4083, 4083, 4083, 4083, +- 4083, 4084, 4084, 0, 4084, 4084, 4084, 4084, 4084, 4084, +- 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4085, ++ 4082, 4082, 4083, 64, 4083, 4083, 63, 58, 4083, 4083, ++ 4083, 4083, 4083, 57, 4083, 4083, 4083, 4083, 4083, 4083, ++ 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, ++ 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4085, 56, ++ 4085, 4085, 55, 54, 4085, 4085, 4085, 4085, 4085, 53, + +- 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4085, +- 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4086, 4086, 4086, ++ 4085, 4085, 4085, 4085, 4085, 4085, 4086, 4086, 4086, 4086, + 4086, 4086, 4086, 4086, 4086, 4086, 4086, 4086, 4086, 4086, +- 4086, 4086, 4086, 4086, 4086, 4087, 4087, 4087, 4087, 4087, ++ 4086, 4086, 4086, 4086, 4087, 4087, 4087, 4087, 4087, 4087, + 4087, 4087, 4087, 4087, 4087, 4087, 4087, 4087, 4087, 4087, +- 4087, 4087, 4087, 4088, 0, 4088, 4088, 0, 0, 4088, +- 4088, 4088, 4088, 4088, 0, 4088, 4088, 4088, 4088, 4088, +- 4088, 4089, 0, 4089, 4089, 0, 0, 4089, 4089, 4089, +- 4089, 4089, 0, 4089, 4089, 4089, 4089, 4089, 4089, 4090, ++ 4087, 4087, 4088, 52, 4088, 4088, 51, 26, 4088, 4088, ++ 4088, 4088, 4088, 25, 4088, 4088, 4088, 4088, 4088, 4089, ++ 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4089, ++ 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4090, 4090, 4090, + 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4090, ++ 4090, 4090, 4090, 4090, 4090, 4091, 4091, 4091, 4091, 4091, + +- 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4091, 0, 4091, +- 4091, 0, 0, 4091, 4091, 4091, 4091, 4091, 0, 4091, +- 4091, 4091, 4091, 4091, 4091, 4092, 4092, 4092, 4092, 4092, +- 4092, 4092, 4092, 4092, 4092, 4092, 4092, 4092, 4092, 4092, +- 4092, 4092, 4092, 4093, 0, 4093, 4093, 0, 0, 4093, +- 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, ++ 4091, 4091, 4091, 4091, 4091, 4091, 4091, 4091, 4091, 4091, ++ 4091, 4091, 4091, 4092, 4092, 4092, 4092, 4092, 4092, 4092, ++ 4092, 4092, 24, 4092, 4092, 4092, 4092, 4092, 4092, 4092, ++ 4092, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, ++ 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4094, + 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, +- 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4095, 4095, ++ 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4095, 4095, 4095, + 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, +- 4095, 4095, 4095, 4095, 4095, 4095, 4096, 0, 4096, 4096, ++ 4095, 4095, 4095, 4095, 4095, 4096, 4096, 4096, 4096, 4096, ++ 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, + +- 0, 0, 4096, 4096, 4096, 0, 4096, 4096, 4096, 4096, +- 4096, 4096, 4096, 4096, 4097, 4097, 4097, 4097, 4097, 4097, +- 4097, 0, 4097, 0, 4097, 4097, 4097, 4097, 4097, 4097, +- 4097, 4097, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, +- 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, ++ 4096, 4096, 4096, 4097, 4097, 23, 4097, 4097, 4097, 4097, ++ 4097, 4097, 4097, 4097, 4097, 4097, 4097, 4097, 4097, 4097, ++ 4097, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, ++ 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4099, + 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, +- 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4100, 4100, ++ 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4100, 4100, 4100, + 4100, 4100, 4100, 4100, 4100, 4100, 4100, 4100, 4100, 4100, +- 4100, 4100, 4100, 4100, 4100, 4100, 4101, 4101, 4101, 4101, +- 4101, 4101, 4101, 4101, 4101, 4101, 4101, 4101, 4101, 4101, +- +- 4101, 4101, 4101, 4101, 4102, 4102, 0, 4102, 4102, 4102, +- 4102, 4102, 4102, 4102, 4102, 4102, 4102, 4102, 4102, 4102, +- 4102, 4102, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, +- 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, +- 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, +- 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4105, 0, +- 0, 4105, 0, 0, 4105, 4106, 0, 0, 0, 0, +- 0, 4106, 4106, 4106, 0, 4106, 4106, 4106, 4106, 4106, +- 4106, 4106, 4106, 4107, 4107, 4107, 4107, 4107, 4107, 4107, ++ 4100, 4100, 4100, 4100, 4100, 4101, 0, 4101, 4101, 0, ++ 0, 4101, 4101, 4101, 4101, 4101, 0, 4101, 4101, 4101, ++ 4101, 4101, 4101, 4102, 0, 4102, 4102, 0, 0, 4102, ++ ++ 4102, 4102, 4102, 4102, 0, 4102, 4102, 4102, 4102, 4102, ++ 4102, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, ++ 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4104, ++ 0, 4104, 4104, 0, 0, 4104, 4104, 4104, 4104, 4104, ++ 0, 4104, 4104, 4104, 4104, 4104, 4104, 4105, 4105, 4105, ++ 4105, 4105, 4105, 4105, 4105, 4105, 4105, 4105, 4105, 4105, ++ 4105, 4105, 4105, 4105, 4105, 4106, 0, 4106, 4106, 0, ++ 0, 4106, 4106, 4106, 4106, 4106, 4106, 4106, 4106, 4106, ++ 4106, 4106, 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, + 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, + +- 4107, 4108, 0, 0, 4108, 0, 4108, 4109, 4109, 4109, +- 4109, 4109, 4109, 4109, 4109, 4109, 4109, 4109, 4109, 4109, +- 4109, 4109, 4109, 4109, 4109, 4110, 0, 0, 4110, 4110, +- 0, 0, 4110, 0, 4110, 0, 4110, 4110, 4110, 4110, +- 4111, 4111, 4111, 4111, 4112, 4112, 0, 4112, 4112, 4112, ++ 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, ++ 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4109, 0, ++ 4109, 4109, 0, 0, 4109, 4109, 4109, 0, 4109, 4109, ++ 4109, 4109, 4109, 4109, 4109, 4109, 4110, 4110, 4110, 4110, ++ 4110, 4110, 4110, 0, 4110, 0, 4110, 4110, 4110, 4110, ++ 4110, 4110, 4110, 4110, 4111, 4111, 4111, 4111, 4111, 4111, ++ 4111, 4111, 4111, 4111, 4111, 4111, 4111, 4111, 4111, 4111, ++ 4111, 4111, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, + 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, +- 4112, 4112, 4113, 4113, 0, 4113, 4113, 4113, 4113, 4113, + 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, +- 4114, 0, 4114, 0, 4114, 4114, 4114, 4114, 4115, 4115, +- 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, + +- 4115, 4115, 4115, 4115, 4115, 4115, 4116, 4116, 4116, 4116, ++ 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4114, 4114, ++ 4114, 4114, 4114, 4114, 4114, 4114, 4114, 4114, 4114, 4114, ++ 4114, 4114, 4114, 4114, 4114, 4114, 4115, 4115, 0, 4115, ++ 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, ++ 4115, 4115, 4115, 4115, 4116, 4116, 4116, 4116, 4116, 4116, + 4116, 4116, 4116, 4116, 4116, 4116, 4116, 4116, 4116, 4116, +- 4116, 4116, 4116, 4116, 4117, 4117, 4117, 4117, 4117, 4117, ++ 4116, 4116, 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, + 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, +- 4117, 4117, 4118, 4118, 0, 0, 4118, 4118, 4118, 4118, +- 4118, 0, 4118, 4118, 4118, 4118, 4118, 4118, 4118, 4118, +- 4119, 0, 0, 4119, 4119, 0, 0, 4119, 0, 4119, +- 0, 4119, 4119, 4119, 4119, 4120, 4120, 4120, 4120, 4120, ++ 4118, 0, 0, 4118, 0, 0, 4118, 4119, 0, 0, ++ 0, 0, 0, 4119, 4119, 4119, 0, 4119, 4119, 4119, ++ ++ 4119, 4119, 4119, 4119, 4119, 4120, 4120, 4120, 4120, 4120, + 4120, 4120, 4120, 4120, 4120, 4120, 4120, 4120, 4120, 4120, +- 4120, 4120, 4120, 4121, 0, 4121, 4121, 0, 0, 4121, +- +- 4121, 4121, 4121, 4121, 4121, 4121, 4121, 4121, 4121, 4121, +- 4121, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, +- 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4123, +- 0, 0, 0, 0, 0, 4123, 4123, 4123, 0, 4123, +- 4123, 4123, 4123, 4123, 4123, 4123, 4123, 4124, 4124, 0, +- 4124, 4124, 4124, 4124, 4124, 4124, 4124, 4124, 4124, 4124, +- 4124, 4124, 4124, 4124, 4124, 4125, 4125, 0, 4125, 4125, ++ 4120, 4120, 4120, 4121, 0, 0, 4121, 0, 4121, 4122, ++ 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, ++ 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4123, 0, 0, ++ 4123, 4123, 0, 0, 4123, 0, 4123, 0, 4123, 4123, ++ 4123, 4123, 4124, 4124, 4124, 4124, 4125, 4125, 0, 4125, + 4125, 4125, 4125, 4125, 4125, 4125, 4125, 4125, 4125, 4125, +- 4125, 4125, 4125, 4126, 0, 0, 4126, 4126, 0, 0, +- 4126, 0, 4126, 0, 4126, 4126, 4126, 4126, 4127, 0, +- +- 0, 0, 0, 0, 4127, 4127, 4127, 0, 4127, 4127, +- 4127, 4127, 4127, 4127, 4127, 4127, 4128, 4128, 0, 4128, +- 4128, 0, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, +- 4128, 4128, 4128, 4129, 0, 4129, 0, 4129, 4129, 4129, +- 4129, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, +- 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4131, +- 0, 4131, 4131, 0, 0, 4131, 4131, 4131, 4131, 4131, +- 4131, 4131, 4131, 4131, 4131, 4131, 4131, 4132, 4132, 4132, +- 4132, 4132, 4132, 4132, 4132, 4132, 4132, 4132, 4132, 4132, +- 4132, 4132, 4132, 4132, 4132, 4133, 4133, 4133, 4133, 4133, ++ 4125, 4125, 4125, 4125, 4126, 4126, 0, 4126, 4126, 4126, ++ 4126, 4126, 4126, 4126, 4126, 4126, 4126, 4126, 4126, 4126, ++ ++ 4126, 4126, 4127, 0, 4127, 0, 4127, 4127, 4127, 4127, ++ 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, ++ 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4129, 4129, ++ 4129, 4129, 4129, 4129, 4129, 4129, 4129, 4129, 4129, 4129, ++ 4129, 4129, 4129, 4129, 4129, 4129, 4130, 4130, 4130, 4130, ++ 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, ++ 4130, 4130, 4130, 4130, 4131, 4131, 0, 0, 4131, 4131, ++ 4131, 4131, 4131, 0, 4131, 4131, 4131, 4131, 4131, 4131, ++ 4131, 4131, 4132, 0, 0, 4132, 4132, 0, 0, 4132, ++ 0, 4132, 0, 4132, 4132, 4132, 4132, 4133, 4133, 4133, + + 4133, 4133, 4133, 4133, 4133, 4133, 4133, 4133, 4133, 4133, +- 4133, 4133, 4133, 4134, 0, 0, 4134, 4134, 0, 0, +- 4134, 0, 4134, 0, 4134, 4134, 4134, 4134, 4135, 0, +- 4135, 0, 4135, 4135, 4135, 4135, 4136, 0, 0, 4136, +- 4136, 0, 0, 4136, 0, 4136, 0, 4136, 4136, 4136, +- 4136, 4137, 4137, 0, 4137, 4137, 4137, 4137, 4137, 4137, +- 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4138, 0, +- 4138, 4138, 0, 0, 4138, 4138, 4138, 4138, 4138, 4138, +- 4138, 4138, 4138, 4138, 4138, 4138, 4139, 4139, 4139, 4139, +- 4139, 4139, 4139, 4139, 4139, 4139, 4139, 4139, 4139, 4139, +- +- 4139, 4139, 4139, 4139, 4140, 4140, 4140, 4140, 4140, 4140, +- 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, +- 4140, 4140, 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, +- 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, +- 4142, 0, 4142, 4142, 0, 0, 4142, 4142, 4142, 4142, +- 4142, 4142, 4142, 4142, 4142, 4142, 4142, 4142, 4143, 4143, ++ 4133, 4133, 4133, 4133, 4133, 4134, 0, 4134, 4134, 0, ++ 0, 4134, 4134, 4134, 4134, 4134, 4134, 4134, 4134, 4134, ++ 4134, 4134, 4134, 4135, 4135, 4135, 4135, 4135, 4135, 4135, ++ 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4135, ++ 4135, 4136, 0, 0, 0, 0, 0, 4136, 4136, 4136, ++ 0, 4136, 4136, 4136, 4136, 4136, 4136, 4136, 4136, 4137, ++ 4137, 0, 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4137, ++ 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4138, 4138, 0, ++ 4138, 4138, 4138, 4138, 4138, 4138, 4138, 4138, 4138, 4138, ++ ++ 4138, 4138, 4138, 4138, 4138, 4139, 0, 0, 4139, 4139, ++ 0, 0, 4139, 0, 4139, 0, 4139, 4139, 4139, 4139, ++ 4140, 0, 0, 0, 0, 0, 4140, 4140, 4140, 0, ++ 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4141, 4141, ++ 0, 4141, 4141, 0, 4141, 4141, 4141, 4141, 4141, 4141, ++ 4141, 4141, 4141, 4141, 4141, 4142, 0, 4142, 0, 4142, ++ 4142, 4142, 4142, 4143, 4143, 4143, 4143, 4143, 4143, 4143, + 4143, 4143, 4143, 4143, 4143, 4143, 4143, 4143, 4143, 4143, +- 4143, 4143, 4143, 4143, 4143, 4143, 4144, 4144, 4144, 4144, +- 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, +- 4144, 4144, 4144, 4144, 4145, 4145, 0, 4145, 4145, 4145, ++ 4143, 4144, 0, 4144, 4144, 0, 0, 4144, 4144, 4144, ++ 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4145, + + 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4145, +- 4145, 4145, 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, ++ 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4146, 4146, 4146, + 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, +- 4147, 4147, 0, 4147, 4147, 4147, 4147, 4147, 4147, 4147, +- 4147, 4147, 4147, 4147, 4147, 4147, 4147, 4147, 4148, 4148, +- 4148, 4148, 4148, 4148, 4148, 4148, 4148, 4148, 4148, 4148, +- 4148, 4148, 4148, 4148, 4148, 4148, 4149, 0, 4149, 0, +- 4149, 4149, 4149, 4149, 4150, 0, 4150, 0, 4150, 4150, +- 4150, 4150, 4151, 0, 0, 4151, 0, 0, 0, 4151, +- 0, 4151, 0, 4151, 4151, 4151, 4151, 4152, 0, 0, +- +- 4152, 4152, 0, 0, 4152, 0, 4152, 0, 4152, 4152, +- 4152, 4152, 4153, 0, 0, 4153, 0, 4153, 0, 4153, +- 4153, 4153, 4153, 4154, 0, 4154, 0, 4154, 4154, 4154, +- 4154, 4155, 0, 4155, 0, 4155, 4155, 4155, 4155, 4156, +- 4156, 0, 4156, 4156, 0, 4156, 4156, 4156, 4156, 4156, +- 4156, 4156, 4156, 4156, 4156, 4156, 4157, 0, 0, 4157, +- 4157, 0, 0, 4157, 0, 4157, 0, 4157, 4157, 4157, +- 4157, 4158, 4158, 0, 4158, 4158, 0, 4158, 4158, 4158, +- 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4159, 4159, ++ 4146, 4146, 4146, 4146, 4146, 4147, 0, 0, 4147, 4147, ++ 0, 0, 4147, 0, 4147, 0, 4147, 4147, 4147, 4147, ++ 4148, 0, 4148, 0, 4148, 4148, 4148, 4148, 4149, 0, ++ 0, 4149, 4149, 0, 0, 4149, 0, 4149, 0, 4149, ++ 4149, 4149, 4149, 4150, 4150, 0, 4150, 4150, 4150, 4150, ++ 4150, 4150, 4150, 4150, 4150, 4150, 4150, 4150, 4150, 4150, ++ 4151, 0, 4151, 4151, 0, 0, 4151, 4151, 4151, 4151, ++ ++ 4151, 4151, 4151, 4151, 4151, 4151, 4151, 4151, 4152, 4152, ++ 4152, 4152, 4152, 4152, 4152, 4152, 4152, 4152, 4152, 4152, ++ 4152, 4152, 4152, 4152, 4152, 4152, 4153, 4153, 4153, 4153, ++ 4153, 4153, 4153, 4153, 4153, 4153, 4153, 4153, 4153, 4153, ++ 4153, 4153, 4153, 4153, 4154, 4154, 4154, 4154, 4154, 4154, ++ 4154, 4154, 4154, 4154, 4154, 4154, 4154, 4154, 4154, 4154, ++ 4154, 4154, 4155, 0, 4155, 4155, 0, 0, 4155, 4155, ++ 4155, 4155, 4155, 4155, 4155, 4155, 4155, 4155, 4155, 4155, ++ 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, ++ 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4157, 4157, ++ ++ 4157, 4157, 4157, 4157, 4157, 4157, 4157, 4157, 4157, 4157, ++ 4157, 4157, 4157, 4157, 4157, 4157, 4158, 4158, 0, 4158, ++ 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, ++ 4158, 4158, 4158, 4158, 4159, 4159, 4159, 4159, 4159, 4159, + 4159, 4159, 4159, 4159, 4159, 4159, 4159, 4159, 4159, 4159, +- +- 4159, 4159, 4159, 4159, 4159, 4159, 4160, 4160, 4160, 4160, ++ 4159, 4159, 4160, 4160, 0, 4160, 4160, 4160, 4160, 4160, + 4160, 4160, 4160, 4160, 4160, 4160, 4160, 4160, 4160, 4160, +- 4160, 4160, 4160, 4160, 4161, 4161, 4161, 4161, 4161, 4161, + 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, +- 4161, 4161, 4162, 0, 4162, 4162, 0, 0, 4162, 4162, +- 4162, 4162, 4162, 4162, 4162, 4162, 4162, 4162, 4162, 4162, +- 4163, 0, 4163, 4163, 0, 0, 4163, 4163, 4163, 4163, +- 4163, 4163, 4163, 4163, 4163, 4163, 4163, 4163, 4164, 4164, +- 4164, 4164, 4164, 4164, 4164, 4164, 4164, 4164, 4164, 4164, +- 4164, 4164, 4164, 4164, 4164, 4164, 4165, 4165, 4165, 4165, +- +- 4165, 4165, 4165, 4165, 4165, 4165, 4165, 4165, 4165, 4165, +- 4165, 4165, 4165, 4165, 4166, 4166, 4166, 4166, 4166, 4166, +- 4166, 4166, 4166, 4166, 4166, 4166, 4166, 4166, 4166, 4166, +- 4166, 4166, 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, +- 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, +- 4168, 0, 4168, 4168, 0, 0, 4168, 4168, 4168, 4168, +- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4169, 4169, +- 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, +- 4169, 4169, 4169, 4169, 4169, 4169, 4170, 4170, 4170, 4170, +- 4170, 4170, 4170, 4170, 4170, 4170, 4170, 4170, 4170, 4170, +- +- 4170, 4170, 4170, 4170, 4171, 4171, 4171, 4171, 4171, 4171, ++ 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4162, 0, ++ 4162, 0, 4162, 4162, 4162, 4162, 4163, 0, 4163, 0, ++ ++ 4163, 4163, 4163, 4163, 4164, 0, 0, 4164, 0, 0, ++ 0, 4164, 0, 4164, 0, 4164, 4164, 4164, 4164, 4165, ++ 0, 0, 4165, 4165, 0, 0, 4165, 0, 4165, 0, ++ 4165, 4165, 4165, 4165, 4166, 0, 0, 4166, 0, 4166, ++ 0, 4166, 4166, 4166, 4166, 4167, 0, 4167, 0, 4167, ++ 4167, 4167, 4167, 4168, 0, 4168, 0, 4168, 4168, 4168, ++ 4168, 4169, 4169, 0, 4169, 4169, 0, 4169, 4169, 4169, ++ 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4170, 0, ++ 0, 4170, 4170, 0, 0, 4170, 0, 4170, 0, 4170, ++ 4170, 4170, 4170, 4171, 4171, 0, 4171, 4171, 0, 4171, ++ + 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, +- 4171, 4171, 4172, 0, 4172, 4172, 0, 0, 4172, 4172, + 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, ++ 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4173, 4173, + 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, +- 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4174, 4174, ++ 4173, 4173, 4173, 4173, 4173, 4173, 4174, 4174, 4174, 4174, + 4174, 4174, 4174, 4174, 4174, 4174, 4174, 4174, 4174, 4174, +- 4174, 4174, 4174, 4174, 4174, 4174, 4175, 0, 0, 4175, +- 0, 4175, 0, 4175, 4175, 4175, 4175, 4176, 0, 4176, +- 0, 4176, 4176, 4176, 4176, 4177, 0, 4177, 0, 4177, +- +- 4177, 4177, 4177, 4178, 0, 4178, 0, 4178, 4178, 4178, +- 4178, 4179, 0, 0, 4179, 0, 4179, 0, 4179, 4179, +- 4179, 4179, 4180, 4180, 0, 4180, 4180, 0, 4180, 4180, +- 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4181, +- 0, 0, 4181, 4181, 0, 0, 4181, 0, 4181, 0, +- 4181, 4181, 4181, 4181, 4182, 0, 4182, 0, 4182, 4182, +- 4182, 4182, 4183, 0, 4183, 0, 4183, 4183, 4183, 4183, ++ 4174, 4174, 4174, 4174, 4175, 0, 4175, 4175, 0, 0, ++ 4175, 4175, 4175, 4175, 4175, 4175, 4175, 4175, 4175, 4175, ++ 4175, 4175, 4176, 0, 4176, 4176, 0, 0, 4176, 4176, ++ 4176, 4176, 4176, 4176, 4176, 4176, 4176, 4176, 4176, 4176, ++ ++ 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, ++ 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4178, 4178, ++ 4178, 4178, 4178, 4178, 4178, 4178, 4178, 4178, 4178, 4178, ++ 4178, 4178, 4178, 4178, 4178, 4178, 4179, 4179, 4179, 4179, ++ 4179, 4179, 4179, 4179, 4179, 4179, 4179, 4179, 4179, 4179, ++ 4179, 4179, 4179, 4179, 4180, 4180, 4180, 4180, 4180, 4180, ++ 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, ++ 4180, 4180, 4181, 0, 4181, 4181, 0, 0, 4181, 4181, ++ 4181, 4181, 4181, 4181, 4181, 4181, 4181, 4181, 4181, 4181, ++ 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, ++ ++ 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4183, 4183, ++ 4183, 4183, 4183, 4183, 4183, 4183, 4183, 4183, 4183, 4183, ++ 4183, 4183, 4183, 4183, 4183, 4183, 4184, 4184, 4184, 4184, + 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, +- 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4185, 4185, ++ 4184, 4184, 4184, 4184, 4185, 0, 4185, 4185, 0, 0, + 4185, 4185, 4185, 4185, 4185, 4185, 4185, 4185, 4185, 4185, +- +- 4185, 4185, 4185, 4185, 4185, 4185, 4186, 4186, 4186, 4186, ++ 4185, 4185, 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, + 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, +- 4186, 4186, 4186, 4186, 4187, 4187, 4187, 4187, 4187, 4187, + 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, +- 4187, 4187, 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, +- 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, +- 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, +- 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4190, 0, +- 4190, 4190, 0, 0, 4190, 4190, 4190, 4190, 4190, 4190, +- 4190, 4190, 4190, 4190, 4190, 4190, 4191, 4191, 4191, 4191, +- +- 4191, 4191, 4191, 4191, 4191, 4191, 4191, 4191, 4191, 4191, +- 4191, 4191, 4191, 4191, 4192, 4192, 4192, 4192, 4192, 4192, +- 4192, 4192, 4192, 4192, 4192, 4192, 4192, 4192, 4192, 4192, +- 4192, 4192, 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, ++ 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4188, 0, ++ ++ 0, 4188, 0, 4188, 0, 4188, 4188, 4188, 4188, 4189, ++ 0, 4189, 0, 4189, 4189, 4189, 4189, 4190, 0, 4190, ++ 0, 4190, 4190, 4190, 4190, 4191, 0, 4191, 0, 4191, ++ 4191, 4191, 4191, 4192, 0, 0, 4192, 0, 4192, 0, ++ 4192, 4192, 4192, 4192, 4193, 4193, 0, 4193, 4193, 0, + 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, +- 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, +- 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4195, 4195, +- 0, 4195, 4195, 0, 4195, 4195, 4195, 4195, 4195, 4195, +- 4195, 4195, 4195, 4195, 4195, 4196, 0, 0, 4196, 4196, +- 0, 0, 4196, 0, 4196, 0, 4196, 4196, 4196, 4196, +- +- 4197, 4197, 4197, 4197, 0, 4197, 4197, 4197, 4197, 4197, +- 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4198, 0, +- 0, 0, 0, 0, 4198, 4198, 4198, 0, 4198, 4198, +- 4198, 4198, 4198, 4198, 4198, 4198, 4199, 4199, 4199, 4199, ++ 4193, 4194, 0, 0, 4194, 4194, 0, 0, 4194, 0, ++ 4194, 0, 4194, 4194, 4194, 4194, 4195, 0, 4195, 0, ++ 4195, 4195, 4195, 4195, 4196, 0, 4196, 0, 4196, 4196, ++ 4196, 4196, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, ++ ++ 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, ++ 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, ++ 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4199, 4199, + 4199, 4199, 4199, 4199, 4199, 4199, 4199, 4199, 4199, 4199, +- 4199, 4199, 4199, 4199, 4200, 0, 4200, 0, 4200, 4200, +- 4200, 4200, 4201, 4201, 0, 4201, 4201, 0, 4201, 4201, +- 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4202, +- 0, 0, 4202, 4202, 0, 0, 0, 0, 0, 0, +- 4202, 4203, 4203, 0, 0, 0, 4203, 4203, 4203, 4203, +- +- 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4204, +- 4204, 0, 4204, 4204, 0, 4204, 4204, 4204, 4204, 4204, +- 4204, 4204, 4204, 4204, 4204, 4204, 4205, 4205, 0, 4205, +- 4205, 0, 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, +- 4205, 4205, 4205, 4206, 4206, 0, 4206, 4206, 4206, 4206, ++ 4199, 4199, 4199, 4199, 4199, 4199, 4200, 4200, 4200, 4200, ++ 4200, 4200, 4200, 4200, 4200, 4200, 4200, 4200, 4200, 4200, ++ 4200, 4200, 4200, 4200, 4201, 4201, 4201, 4201, 4201, 4201, ++ 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, ++ 4201, 4201, 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, ++ 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, ++ ++ 4203, 0, 4203, 4203, 0, 0, 4203, 4203, 4203, 4203, ++ 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4204, 4204, ++ 4204, 4204, 4204, 4204, 4204, 4204, 4204, 4204, 4204, 4204, ++ 4204, 4204, 4204, 4204, 4204, 4204, 4205, 4205, 4205, 4205, ++ 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, ++ 4205, 4205, 4205, 4205, 4206, 4206, 4206, 4206, 4206, 4206, + 4206, 4206, 4206, 4206, 4206, 4206, 4206, 4206, 4206, 4206, +- 4207, 4207, 0, 4207, 4207, 4207, 4207, 4207, 4207, 4207, +- 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4208, 0, 4208, +- 0, 4208, 0, 4208, 4208, 4208, 4208, 4209, 4209, 0, +- 4209, 4209, 0, 4209, 4209, 4209, 4209, 4209, 4209, 4209, ++ 4206, 4206, 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, ++ 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, ++ 4208, 4208, 0, 4208, 4208, 0, 4208, 4208, 4208, 4208, + +- 4209, 4209, 4209, 4209, 4210, 4210, 0, 4210, 4210, 0, ++ 4208, 4208, 4208, 4208, 4208, 4208, 4208, 4209, 0, 0, ++ 4209, 4209, 0, 0, 4209, 0, 4209, 0, 4209, 4209, ++ 4209, 4209, 4210, 4210, 4210, 4210, 0, 4210, 4210, 4210, + 4210, 4210, 4210, 4210, 4210, 4210, 4210, 4210, 4210, 4210, +- 4210, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, +- 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4212, +- 0, 4212, 0, 4212, 0, 4212, 4212, 4212, 4212, 4213, +- 4213, 0, 4213, 4213, 4213, 4213, 4213, 4213, 4213, 4213, +- 4213, 4213, 4213, 4213, 4213, 4213, 4213, 4214, 4214, 0, +- 4214, 4214, 0, 4214, 4214, 4214, 4214, 4214, 4214, 4214, +- 4214, 4214, 4214, 4214, 4215, 4215, 0, 0, 4215, 4215, +- 4215, 4215, 4215, 0, 4215, 4215, 4215, 4215, 4215, 4215, +- +- 4215, 4215, 4216, 4216, 0, 4216, 4216, 0, 4216, 4216, +- 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4217, +- 0, 0, 0, 0, 0, 4217, 4217, 4217, 0, 4217, +- 4217, 4217, 4217, 4217, 4217, 4217, 4217, 4218, 0, 0, +- 0, 0, 0, 4218, 4218, 4218, 0, 4218, 4218, 4218, +- 4218, 4218, 4218, 4218, 4218, 4219, 0, 0, 4219, 4219, +- 0, 0, 4219, 0, 4219, 0, 4219, 4219, 4219, 4219, +- 4220, 4220, 0, 4220, 4220, 0, 4220, 4220, 4220, 4220, +- 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4221, 0, 0, +- 0, 0, 0, 4221, 4221, 4221, 0, 4221, 4221, 4221, +- +- 4221, 4221, 4221, 4221, 4221, 4222, 0, 4222, 0, 4222, +- 4222, 4222, 4222, 4223, 4223, 0, 4223, 4223, 0, 4223, +- 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, ++ 4211, 0, 0, 0, 0, 0, 4211, 4211, 4211, 0, ++ 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4212, 4212, ++ 4212, 4212, 4212, 4212, 4212, 4212, 4212, 4212, 4212, 4212, ++ 4212, 4212, 4212, 4212, 4212, 4212, 4213, 0, 4213, 0, ++ 4213, 4213, 4213, 4213, 4214, 4214, 0, 4214, 4214, 0, ++ 4214, 4214, 4214, 4214, 4214, 4214, 4214, 4214, 4214, 4214, ++ ++ 4214, 4215, 0, 0, 4215, 4215, 0, 0, 0, 0, ++ 0, 0, 4215, 4216, 4216, 0, 0, 0, 4216, 4216, ++ 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, ++ 4216, 4217, 4217, 0, 4217, 4217, 0, 4217, 4217, 4217, ++ 4217, 4217, 4217, 4217, 4217, 4217, 4217, 4217, 4218, 4218, ++ 0, 4218, 4218, 0, 4218, 4218, 4218, 4218, 4218, 4218, ++ 4218, 4218, 4218, 4218, 4218, 4219, 4219, 0, 4219, 4219, ++ 4219, 4219, 4219, 4219, 4219, 4219, 4219, 4219, 4219, 4219, ++ 4219, 4219, 4220, 4220, 0, 4220, 4220, 4220, 4220, 4220, ++ 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4221, ++ ++ 0, 4221, 0, 4221, 0, 4221, 4221, 4221, 4221, 4222, ++ 4222, 0, 4222, 4222, 0, 4222, 4222, 4222, 4222, 4222, ++ 4222, 4222, 4222, 4222, 4222, 4222, 4223, 4223, 0, 4223, ++ 4223, 0, 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, ++ 4223, 4223, 4223, 4224, 4224, 4224, 4224, 4224, 4224, 4224, + 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, +- 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4225, 4225, +- 0, 4225, 4225, 0, 4225, 4225, 4225, 4225, 4225, 4225, +- 4225, 4225, 4225, 4225, 4225, 4226, 4226, 0, 0, 4226, +- 4226, 4226, 4226, 4226, 0, 4226, 4226, 4226, 4226, 4226, +- 4226, 4226, 4226, 4227, 4227, 0, 0, 4227, 4227, 4227, +- 4227, 4227, 0, 4227, 4227, 4227, 4227, 4227, 4227, 4227, +- +- 4227, 4228, 4228, 0, 4228, 4228, 0, 4228, 4228, 4228, +- 4228, 4228, 4228, 4228, 4228, 4228, 4228, 4228, 4229, 4229, +- 0, 4229, 4229, 0, 4229, 4229, 4229, 4229, 4229, 4229, +- 4229, 4229, 4229, 4229, 4229, 4230, 4230, 0, 0, 4230, +- 4230, 4230, 4230, 4230, 0, 4230, 4230, 4230, 4230, 4230, +- 4230, 4230, 4230, 4231, 4231, 0, 0, 4231, 4231, 4231, +- 4231, 4231, 0, 4231, 4231, 4231, 4231, 4231, 4231, 4231, +- 4231, 4232, 0, 4232, 0, 4232, 0, 4232, 4232, 4232, +- 4232, 4233, 4233, 0, 4233, 4233, 4233, 4233, 4233, 4233, +- 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4234, 4234, +- +- 0, 4234, 4234, 0, 4234, 4234, 4234, 4234, 4234, 4234, +- 4234, 4234, 4234, 4234, 4234, 4235, 4235, 0, 4235, 4235, +- 0, 4235, 4235, 4235, 4235, 4235, 4235, 4235, 4235, 4235, +- 4235, 4235, 4236, 0, 4236, 0, 4236, 0, 4236, 4236, +- 4236, 4236, 4237, 0, 0, 0, 0, 0, 4237, 4237, +- 4237, 0, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952 ++ 4224, 4225, 0, 4225, 0, 4225, 0, 4225, 4225, 4225, ++ 4225, 4226, 4226, 0, 4226, 4226, 4226, 4226, 4226, 4226, ++ 4226, 4226, 4226, 4226, 4226, 4226, 4226, 4226, 4226, 4227, ++ 4227, 0, 4227, 4227, 0, 4227, 4227, 4227, 4227, 4227, ++ ++ 4227, 4227, 4227, 4227, 4227, 4227, 4228, 4228, 0, 0, ++ 4228, 4228, 4228, 4228, 4228, 0, 4228, 4228, 4228, 4228, ++ 4228, 4228, 4228, 4228, 4229, 4229, 0, 4229, 4229, 0, ++ 4229, 4229, 4229, 4229, 4229, 4229, 4229, 4229, 4229, 4229, ++ 4229, 4230, 0, 0, 0, 0, 0, 4230, 4230, 4230, ++ 0, 4230, 4230, 4230, 4230, 4230, 4230, 4230, 4230, 4231, ++ 0, 0, 0, 0, 0, 4231, 4231, 4231, 0, 4231, ++ 4231, 4231, 4231, 4231, 4231, 4231, 4231, 4232, 0, 0, ++ 4232, 4232, 0, 0, 4232, 0, 4232, 0, 4232, 4232, ++ 4232, 4232, 4233, 4233, 0, 4233, 4233, 0, 4233, 4233, ++ ++ 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4234, ++ 0, 0, 0, 0, 0, 4234, 4234, 4234, 0, 4234, ++ 4234, 4234, 4234, 4234, 4234, 4234, 4234, 4235, 0, 4235, ++ 0, 4235, 4235, 4235, 4235, 4236, 4236, 0, 4236, 4236, ++ 0, 4236, 4236, 4236, 4236, 4236, 4236, 4236, 4236, 4236, ++ 4236, 4236, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, ++ 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, ++ 4238, 4238, 0, 4238, 4238, 0, 4238, 4238, 4238, 4238, ++ 4238, 4238, 4238, 4238, 4238, 4238, 4238, 4239, 4239, 0, ++ 0, 4239, 4239, 4239, 4239, 4239, 0, 4239, 4239, 4239, ++ ++ 4239, 4239, 4239, 4239, 4239, 4240, 4240, 0, 0, 4240, ++ 4240, 4240, 4240, 4240, 0, 4240, 4240, 4240, 4240, 4240, ++ 4240, 4240, 4240, 4241, 4241, 0, 4241, 4241, 0, 4241, ++ 4241, 4241, 4241, 4241, 4241, 4241, 4241, 4241, 4241, 4241, ++ 4242, 4242, 0, 4242, 4242, 0, 4242, 4242, 4242, 4242, ++ 4242, 4242, 4242, 4242, 4242, 4242, 4242, 4243, 4243, 0, ++ 0, 4243, 4243, 4243, 4243, 4243, 0, 4243, 4243, 4243, ++ 4243, 4243, 4243, 4243, 4243, 4244, 4244, 0, 0, 4244, ++ 4244, 4244, 4244, 4244, 0, 4244, 4244, 4244, 4244, 4244, ++ 4244, 4244, 4244, 4245, 0, 4245, 0, 4245, 0, 4245, ++ ++ 4245, 4245, 4245, 4246, 4246, 0, 4246, 4246, 4246, 4246, ++ 4246, 4246, 4246, 4246, 4246, 4246, 4246, 4246, 4246, 4246, ++ 4247, 4247, 0, 4247, 4247, 0, 4247, 4247, 4247, 4247, ++ 4247, 4247, 4247, 4247, 4247, 4247, 4247, 4248, 4248, 0, ++ 4248, 4248, 0, 4248, 4248, 4248, 4248, 4248, 4248, 4248, ++ 4248, 4248, 4248, 4248, 4249, 0, 4249, 0, 4249, 0, ++ 4249, 4249, 4249, 4249, 4250, 0, 0, 0, 0, 0, ++ 4250, 4250, 4250, 0, 4250, 4250, 4250, 4250, 4250, 4250, ++ 4250, 4250, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965 + } ; + + static yy_state_type yy_last_accepting_state; +@@ -5036,68 +5043,68 @@ static char *yy_last_accepting_cpos; + extern int yy_flex_debug; + int yy_flex_debug = 1; + +-static const flex_int16_t yy_rule_linenum[542] = ++static const flex_int16_t yy_rule_linenum[544] = + { 0, +- 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, +- 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, +- 526, 527, 529, 530, 531, 532, 533, 534, 535, 536, +- 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, +- 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, +- 557, 558, 559, 560, 561, 562, 564, 565, 568, 569, +- 570, 571, 572, 573, 574, 576, 577, 578, 579, 580, +- 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, +- 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, +- 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, +- +- 611, 612, 614, 615, 616, 617, 618, 619, 623, 628, +- 629, 634, 635, 636, 641, 642, 643, 648, 653, 654, +- 655, 660, 661, 665, 666, 667, 671, 672, 676, 677, +- 681, 682, 683, 687, 688, 692, 693, 698, 699, 700, +- 704, 708, 709, 717, 722, 723, 728, 729, 730, 739, +- 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, +- 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, +- 762, 763, 764, 765, 768, 769, 770, 771, 772, 773, +- 774, 775, 776, 778, 779, 780, 781, 782, 783, 784, +- 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, +- +- 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, +- 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, +- 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, +- 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, +- 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, +- 845, 846, 847, 848, 849, 850, 851, 852, 853, 855, +- 856, 857, 859, 860, 861, 862, 863, 864, 865, 866, +- 867, 868, 871, 875, 876, 877, 878, 879, 883, 884, +- 885, 886, 887, 888, 892, 893, 894, 895, 900, 901, +- 902, 903, 904, 905, 906, 907, 908, 909, 910, 911, +- +- 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, +- 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, +- 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, +- 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, +- 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, +- 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, +- 972, 973, 974, 975, 976, 977, 978, 979, 980, 981, +- 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, +- 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, +- 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, +- +- 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1023, +- 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1035, 1036, +- 1037, 1038, 1039, 1040, 1045, 1046, 1047, 1048, 1049, 1050, +- 1051, 1052, 1053, 1055, 1056, 1057, 1058, 1059, 1064, 1065, +- 1066, 1067, 1068, 1069, 1071, 1072, 1074, 1075, 1081, 1082, +- 1083, 1084, 1085, 1086, 1089, 1090, 1091, 1092, 1093, 1094, +- 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, +- 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, +- 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, +- 1128, 1130, 1131, 1136, 1140, 1144, 1145, 1149, 1150, 1153, +- +- 1154, 1158, 1159, 1163, 1164, 1168, 1169, 1174, 1176, 1177, +- 1178, 1179, 1181, 1182, 1183, 1184, 1186, 1187, 1188, 1189, +- 1191, 1193, 1194, 1196, 1197, 1198, 1199, 1201, 1206, 1207, +- 1208, 1212, 1213, 1214, 1219, 1221, 1222, 1223, 1242, 1269, +- 1299 ++ 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, ++ 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, ++ 527, 528, 530, 531, 532, 533, 534, 535, 536, 537, ++ 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, ++ 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, ++ 558, 559, 560, 561, 562, 563, 565, 566, 569, 570, ++ 571, 572, 573, 574, 575, 577, 578, 579, 580, 581, ++ 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, ++ 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, ++ 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, ++ ++ 612, 613, 615, 616, 617, 618, 619, 620, 624, 629, ++ 630, 635, 636, 637, 642, 643, 644, 649, 654, 655, ++ 656, 661, 662, 666, 667, 668, 672, 673, 677, 678, ++ 682, 683, 684, 688, 689, 693, 694, 699, 700, 701, ++ 705, 709, 710, 718, 723, 724, 729, 730, 731, 740, ++ 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, ++ 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, ++ 763, 764, 765, 766, 769, 770, 771, 772, 773, 774, ++ 775, 776, 777, 779, 780, 781, 782, 783, 784, 785, ++ 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, ++ ++ 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, ++ 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, ++ 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, ++ 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, ++ 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, ++ 846, 847, 848, 849, 850, 851, 852, 853, 854, 856, ++ 857, 858, 860, 861, 862, 863, 864, 865, 866, 867, ++ 868, 869, 872, 876, 877, 878, 879, 880, 884, 885, ++ 886, 887, 888, 889, 893, 894, 895, 896, 901, 902, ++ 903, 904, 905, 906, 907, 908, 909, 910, 911, 912, ++ ++ 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, ++ 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, ++ 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, ++ 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, ++ 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, ++ 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, ++ 973, 974, 975, 976, 977, 978, 979, 980, 981, 982, ++ 983, 984, 985, 986, 987, 988, 989, 990, 991, 992, ++ 993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002, ++ 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, ++ ++ 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, ++ 1023, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, ++ 1038, 1039, 1040, 1041, 1042, 1043, 1048, 1049, 1050, 1051, ++ 1052, 1053, 1054, 1055, 1056, 1058, 1059, 1060, 1061, 1062, ++ 1067, 1068, 1069, 1070, 1071, 1072, 1074, 1075, 1077, 1078, ++ 1084, 1085, 1086, 1087, 1088, 1089, 1092, 1093, 1094, 1095, ++ 1096, 1097, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, ++ 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, ++ 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, ++ 1129, 1130, 1131, 1133, 1134, 1139, 1143, 1147, 1148, 1152, ++ ++ 1153, 1156, 1157, 1161, 1162, 1166, 1167, 1171, 1172, 1177, ++ 1179, 1180, 1181, 1182, 1184, 1185, 1186, 1187, 1189, 1190, ++ 1191, 1192, 1194, 1196, 1197, 1199, 1200, 1201, 1202, 1204, ++ 1209, 1210, 1211, 1215, 1216, 1217, 1222, 1224, 1225, 1226, ++ 1245, 1272, 1302 + } ; + + /* The intent behind this definition is that it'll catch +@@ -5183,15 +5190,15 @@ static std::stack YY_PREVIOUS_STATE; + #define BEGIN_PREVIOUS() { BEGIN(YY_PREVIOUS_STATE.top()); YY_PREVIOUS_STATE.pop(); } + + // The location of the current token. +-#line 5187 "seclang-scanner.cc" ++#line 5194 "seclang-scanner.cc" + #define YY_NO_INPUT 1 + +-#line 493 "seclang-scanner.ll" ++#line 494 "seclang-scanner.ll" + // Code run each time a pattern is matched. + # define YY_USER_ACTION driver.loc.back()->columns (yyleng); + +-#line 5194 "seclang-scanner.cc" +-#line 5195 "seclang-scanner.cc" ++#line 5201 "seclang-scanner.cc" ++#line 5202 "seclang-scanner.cc" + + #define INITIAL 0 + #define EXPECTING_ACTION_PREDICATE_VARIABLE 1 +@@ -5505,15 +5512,15 @@ YY_DECL + + { + /* %% [7.0] user's declarations go here */ +-#line 498 "seclang-scanner.ll" ++#line 499 "seclang-scanner.ll" + + + +-#line 502 "seclang-scanner.ll" ++#line 503 "seclang-scanner.ll" + // Code run each time yylex is called. + driver.loc.back()->step(); + +-#line 5517 "seclang-scanner.cc" ++#line 5524 "seclang-scanner.cc" + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ + { +@@ -5542,13 +5549,13 @@ yy_match: + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 3953 ) ++ if ( yy_current_state >= 3966 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + ++yy_cp; + } +- while ( yy_current_state != 3952 ); ++ while ( yy_current_state != 3965 ); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); + +@@ -5567,13 +5574,13 @@ do_action: /* This label is used only to access EOF actions. */ + { + if ( yy_act == 0 ) + fprintf( stderr, "--scanner backing up\n" ); +- else if ( yy_act < 542 ) ++ else if ( yy_act < 544 ) + fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", + (long)yy_rule_linenum[yy_act], yytext ); +- else if ( yy_act == 542 ) ++ else if ( yy_act == 544 ) + fprintf( stderr, "--accepting default rule (\"%s\")\n", + yytext ); +- else if ( yy_act == 543 ) ++ else if ( yy_act == 545 ) + fprintf( stderr, "--(end of buffer or a NUL)\n" ); + else + fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); +@@ -5591,564 +5598,564 @@ do_action: /* This label is used only to access EOF actions. */ + + case 1: + YY_RULE_SETUP +-#line 506 "seclang-scanner.ll" ++#line 507 "seclang-scanner.ll" + { return p::make_ACTION_APPEND(yytext, *driver.loc.back()); } + YY_BREAK + case 2: + YY_RULE_SETUP +-#line 507 "seclang-scanner.ll" ++#line 508 "seclang-scanner.ll" + { return p::make_ACTION_BLOCK(yytext, *driver.loc.back()); } + YY_BREAK + case 3: + YY_RULE_SETUP +-#line 508 "seclang-scanner.ll" ++#line 509 "seclang-scanner.ll" + { return p::make_ACTION_CAPTURE(yytext, *driver.loc.back()); } + YY_BREAK + case 4: + YY_RULE_SETUP +-#line 509 "seclang-scanner.ll" ++#line 510 "seclang-scanner.ll" + { return p::make_ACTION_CHAIN(yytext, *driver.loc.back()); } + YY_BREAK + case 5: + YY_RULE_SETUP +-#line 510 "seclang-scanner.ll" ++#line 511 "seclang-scanner.ll" + { return p::make_ACTION_DENY(yytext, *driver.loc.back()); } + YY_BREAK + case 6: + YY_RULE_SETUP +-#line 511 "seclang-scanner.ll" ++#line 512 "seclang-scanner.ll" + { return p::make_ACTION_DEPRECATE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 7: + YY_RULE_SETUP +-#line 512 "seclang-scanner.ll" ++#line 513 "seclang-scanner.ll" + { return p::make_ACTION_DROP(yytext, *driver.loc.back()); } + YY_BREAK + case 8: + YY_RULE_SETUP +-#line 513 "seclang-scanner.ll" ++#line 514 "seclang-scanner.ll" + { return p::make_ACTION_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 9: + YY_RULE_SETUP +-#line 514 "seclang-scanner.ll" ++#line 515 "seclang-scanner.ll" + { return p::make_ACTION_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 10: + YY_RULE_SETUP +-#line 515 "seclang-scanner.ll" ++#line 516 "seclang-scanner.ll" + { return p::make_ACTION_MULTI_MATCH(yytext, *driver.loc.back()); } + YY_BREAK + case 11: + YY_RULE_SETUP +-#line 516 "seclang-scanner.ll" ++#line 517 "seclang-scanner.ll" + { return p::make_ACTION_NO_AUDIT_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 12: + YY_RULE_SETUP +-#line 517 "seclang-scanner.ll" ++#line 518 "seclang-scanner.ll" + { return p::make_ACTION_NO_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 13: + YY_RULE_SETUP +-#line 518 "seclang-scanner.ll" ++#line 519 "seclang-scanner.ll" + { return p::make_ACTION_PASS(yytext, *driver.loc.back()); } + YY_BREAK + case 14: + YY_RULE_SETUP +-#line 519 "seclang-scanner.ll" ++#line 520 "seclang-scanner.ll" + { return p::make_ACTION_PAUSE(yytext, *driver.loc.back()); } + YY_BREAK + case 15: + YY_RULE_SETUP +-#line 520 "seclang-scanner.ll" ++#line 521 "seclang-scanner.ll" + { return p::make_ACTION_PREPEND(yytext, *driver.loc.back()); } + YY_BREAK + case 16: + YY_RULE_SETUP +-#line 521 "seclang-scanner.ll" ++#line 522 "seclang-scanner.ll" + { return p::make_ACTION_PROXY(yytext, *driver.loc.back()); } + YY_BREAK + case 17: + YY_RULE_SETUP +-#line 522 "seclang-scanner.ll" ++#line 523 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_ARG(yytext, *driver.loc.back()); } + YY_BREAK + case 18: + YY_RULE_SETUP +-#line 523 "seclang-scanner.ll" ++#line 524 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_MATCHED(yytext, *driver.loc.back()); } + YY_BREAK + case 19: + YY_RULE_SETUP +-#line 524 "seclang-scanner.ll" ++#line 525 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_MATCHED_BYTES(yytext, *driver.loc.back()); } + YY_BREAK + case 20: + YY_RULE_SETUP +-#line 525 "seclang-scanner.ll" ++#line 526 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_REQUEST_HEADER(yytext, *driver.loc.back()); } + YY_BREAK + case 21: + YY_RULE_SETUP +-#line 526 "seclang-scanner.ll" ++#line 527 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_RESPONSE_HEADER(yytext, *driver.loc.back()); } + YY_BREAK + case 22: + YY_RULE_SETUP +-#line 527 "seclang-scanner.ll" ++#line 528 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETRSC(yytext, *driver.loc.back()); } + YY_BREAK + case 23: + YY_RULE_SETUP +-#line 529 "seclang-scanner.ll" ++#line 530 "seclang-scanner.ll" + { return p::make_ACTION_STATUS(yytext, *driver.loc.back()); } + YY_BREAK + case 24: + /* rule 24 can match eol */ + YY_RULE_SETUP +-#line 530 "seclang-scanner.ll" ++#line 531 "seclang-scanner.ll" + { return p::make_ACTION_ACCURACY(yytext, *driver.loc.back()); } + YY_BREAK + case 25: + /* rule 25 can match eol */ + YY_RULE_SETUP +-#line 531 "seclang-scanner.ll" ++#line 532 "seclang-scanner.ll" + { return p::make_ACTION_ACCURACY(yytext, *driver.loc.back()); } + YY_BREAK + case 26: + YY_RULE_SETUP +-#line 532 "seclang-scanner.ll" ++#line 533 "seclang-scanner.ll" + { return p::make_ACTION_ALLOW(yytext, *driver.loc.back()); } + YY_BREAK + case 27: + YY_RULE_SETUP +-#line 533 "seclang-scanner.ll" ++#line 534 "seclang-scanner.ll" + { return p::make_ACTION_AUDIT_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 28: + YY_RULE_SETUP +-#line 534 "seclang-scanner.ll" ++#line 535 "seclang-scanner.ll" + { return p::make_ACTION_CTL_AUDIT_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 29: + YY_RULE_SETUP +-#line 535 "seclang-scanner.ll" ++#line 536 "seclang-scanner.ll" + { return p::make_ACTION_CTL_AUDIT_LOG_PARTS(yytext, *driver.loc.back()); } + YY_BREAK + case 30: + YY_RULE_SETUP +-#line 536 "seclang-scanner.ll" ++#line 537 "seclang-scanner.ll" + { return p::make_ACTION_CTL_BDY_JSON(yytext, *driver.loc.back()); } + YY_BREAK + case 31: + YY_RULE_SETUP +-#line 537 "seclang-scanner.ll" ++#line 538 "seclang-scanner.ll" + { return p::make_ACTION_CTL_BDY_XML(yytext, *driver.loc.back()); } + YY_BREAK + case 32: + YY_RULE_SETUP +-#line 538 "seclang-scanner.ll" ++#line 539 "seclang-scanner.ll" + { return p::make_ACTION_CTL_BDY_URLENCODED(yytext, *driver.loc.back()); } + YY_BREAK + case 33: + YY_RULE_SETUP +-#line 539 "seclang-scanner.ll" ++#line 540 "seclang-scanner.ll" + { return p::make_ACTION_CTL_FORCE_REQ_BODY_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 34: + YY_RULE_SETUP +-#line 540 "seclang-scanner.ll" ++#line 541 "seclang-scanner.ll" + { return p::make_ACTION_CTL_REQUEST_BODY_ACCESS(yytext, *driver.loc.back()); } + YY_BREAK + case 35: + YY_RULE_SETUP +-#line 541 "seclang-scanner.ll" ++#line 542 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_ENGINE(*driver.loc.back()); } + YY_BREAK + case 36: + YY_RULE_SETUP +-#line 542 "seclang-scanner.ll" ++#line 543 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_BY_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 37: + YY_RULE_SETUP +-#line 543 "seclang-scanner.ll" ++#line 544 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_BY_TAG(yytext, *driver.loc.back()); } + YY_BREAK + case 38: + YY_RULE_SETUP +-#line 544 "seclang-scanner.ll" ++#line 545 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 39: + YY_RULE_SETUP +-#line 545 "seclang-scanner.ll" ++#line 546 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG(yytext, *driver.loc.back()); } + YY_BREAK + case 40: + /* rule 40 can match eol */ + YY_RULE_SETUP +-#line 546 "seclang-scanner.ll" ++#line 547 "seclang-scanner.ll" + { return p::make_ACTION_EXEC(yytext, *driver.loc.back()); } + YY_BREAK + case 41: + /* rule 41 can match eol */ + YY_RULE_SETUP +-#line 547 "seclang-scanner.ll" ++#line 548 "seclang-scanner.ll" + { return p::make_ACTION_EXEC(yytext, *driver.loc.back()); } + YY_BREAK + case 42: + /* rule 42 can match eol */ + YY_RULE_SETUP +-#line 548 "seclang-scanner.ll" ++#line 549 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 43: + /* rule 43 can match eol */ + YY_RULE_SETUP +-#line 549 "seclang-scanner.ll" ++#line 550 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 44: + /* rule 44 can match eol */ + YY_RULE_SETUP +-#line 550 "seclang-scanner.ll" ++#line 551 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 45: + /* rule 45 can match eol */ + YY_RULE_SETUP +-#line 551 "seclang-scanner.ll" ++#line 552 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 46: + YY_RULE_SETUP +-#line 552 "seclang-scanner.ll" ++#line 553 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_INITCOL(yytext, *driver.loc.back()); } + YY_BREAK + case 47: + /* rule 47 can match eol */ + YY_RULE_SETUP +-#line 553 "seclang-scanner.ll" ++#line 554 "seclang-scanner.ll" + { return p::make_ACTION_MATURITY(yytext, *driver.loc.back()); } + YY_BREAK + case 48: + /* rule 48 can match eol */ + YY_RULE_SETUP +-#line 554 "seclang-scanner.ll" ++#line 555 "seclang-scanner.ll" + { return p::make_ACTION_MATURITY(yytext, *driver.loc.back()); } + YY_BREAK + case 49: + YY_RULE_SETUP +-#line 555 "seclang-scanner.ll" ++#line 556 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_MSG(yytext, *driver.loc.back()); } + YY_BREAK + case 50: + YY_RULE_SETUP +-#line 556 "seclang-scanner.ll" ++#line 557 "seclang-scanner.ll" + { return p::make_ACTION_PHASE(yytext, *driver.loc.back()); } + YY_BREAK + case 51: + YY_RULE_SETUP +-#line 557 "seclang-scanner.ll" ++#line 558 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_REDIRECT(yytext, *driver.loc.back()); } + YY_BREAK + case 52: + /* rule 52 can match eol */ + YY_RULE_SETUP +-#line 558 "seclang-scanner.ll" ++#line 559 "seclang-scanner.ll" + { return p::make_ACTION_REV(yytext, *driver.loc.back()); } + YY_BREAK + case 53: + /* rule 53 can match eol */ + YY_RULE_SETUP +-#line 559 "seclang-scanner.ll" ++#line 560 "seclang-scanner.ll" + { return p::make_ACTION_REV(yytext, *driver.loc.back()); } + YY_BREAK + case 54: + YY_RULE_SETUP +-#line 560 "seclang-scanner.ll" ++#line 561 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETENV(yytext, *driver.loc.back()); } + YY_BREAK + case 55: + YY_RULE_SETUP +-#line 561 "seclang-scanner.ll" ++#line 562 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETSID(yytext, *driver.loc.back()); } + YY_BREAK + case 56: + YY_RULE_SETUP +-#line 562 "seclang-scanner.ll" ++#line 563 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETUID(yytext, *driver.loc.back()); } + YY_BREAK + case 57: + YY_RULE_SETUP +-#line 564 "seclang-scanner.ll" ++#line 565 "seclang-scanner.ll" + { BEGIN(SETVAR_ACTION_QUOTED); return p::make_ACTION_SETVAR(*driver.loc.back()); } + YY_BREAK + case 58: + YY_RULE_SETUP +-#line 565 "seclang-scanner.ll" ++#line 566 "seclang-scanner.ll" + { BEGIN(SETVAR_ACTION_NONQUOTED); return p::make_ACTION_SETVAR(*driver.loc.back()); } + YY_BREAK + case 59: + YY_RULE_SETUP +-#line 568 "seclang-scanner.ll" ++#line 569 "seclang-scanner.ll" + { return p::make_ACTION_SEVERITY(yytext, *driver.loc.back()); } + YY_BREAK + case 60: + YY_RULE_SETUP +-#line 569 "seclang-scanner.ll" ++#line 570 "seclang-scanner.ll" + { return p::make_ACTION_SEVERITY(yytext, *driver.loc.back()); } + YY_BREAK + case 61: + YY_RULE_SETUP +-#line 570 "seclang-scanner.ll" ++#line 571 "seclang-scanner.ll" + { return p::make_ACTION_SKIP_AFTER(yytext, *driver.loc.back()); } + YY_BREAK + case 62: + YY_RULE_SETUP +-#line 571 "seclang-scanner.ll" ++#line 572 "seclang-scanner.ll" + { return p::make_ACTION_SKIP(yytext, *driver.loc.back()); } + YY_BREAK + case 63: + YY_RULE_SETUP +-#line 572 "seclang-scanner.ll" ++#line 573 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_TAG(yytext, *driver.loc.back()); } + YY_BREAK + case 64: + /* rule 64 can match eol */ + YY_RULE_SETUP +-#line 573 "seclang-scanner.ll" ++#line 574 "seclang-scanner.ll" + { return p::make_ACTION_VER(yytext, *driver.loc.back()); } + YY_BREAK + case 65: + YY_RULE_SETUP +-#line 574 "seclang-scanner.ll" ++#line 575 "seclang-scanner.ll" + { return p::make_ACTION_XMLNS(yytext, *driver.loc.back()); } + YY_BREAK + case 66: + YY_RULE_SETUP +-#line 576 "seclang-scanner.ll" ++#line 577 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT(yytext, *driver.loc.back()); } + YY_BREAK + case 67: + YY_RULE_SETUP +-#line 577 "seclang-scanner.ll" ++#line 578 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT(yytext, *driver.loc.back()); } + YY_BREAK + case 68: + YY_RULE_SETUP +-#line 578 "seclang-scanner.ll" ++#line 579 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT(yytext, *driver.loc.back()); } + YY_BREAK + case 69: + YY_RULE_SETUP +-#line 579 "seclang-scanner.ll" ++#line 580 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_SQL_HEX_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 70: + YY_RULE_SETUP +-#line 580 "seclang-scanner.ll" ++#line 581 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_BASE_64_ENCODE(yytext, *driver.loc.back()); } + YY_BREAK + case 71: + YY_RULE_SETUP +-#line 581 "seclang-scanner.ll" ++#line 582 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_BASE_64_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 72: + YY_RULE_SETUP +-#line 582 "seclang-scanner.ll" ++#line 583 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT(yytext, *driver.loc.back()); } + YY_BREAK + case 73: + YY_RULE_SETUP +-#line 583 "seclang-scanner.ll" ++#line 584 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_CMD_LINE(yytext, *driver.loc.back()); } + YY_BREAK + case 74: + YY_RULE_SETUP +-#line 584 "seclang-scanner.ll" ++#line 585 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_SHA1(yytext, *driver.loc.back()); } + YY_BREAK + case 75: + YY_RULE_SETUP +-#line 585 "seclang-scanner.ll" ++#line 586 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_MD5(yytext, *driver.loc.back()); } + YY_BREAK + case 76: + YY_RULE_SETUP +-#line 586 "seclang-scanner.ll" ++#line 587 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 77: + YY_RULE_SETUP +-#line 587 "seclang-scanner.ll" ++#line 588 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_HEX_ENCODE(yytext, *driver.loc.back()); } + YY_BREAK + case 78: + YY_RULE_SETUP +-#line 588 "seclang-scanner.ll" ++#line 589 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_HEX_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 79: + YY_RULE_SETUP +-#line 589 "seclang-scanner.ll" ++#line 590 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_LOWERCASE(yytext, *driver.loc.back()); } + YY_BREAK + case 80: + YY_RULE_SETUP +-#line 590 "seclang-scanner.ll" ++#line 591 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_UPPERCASE(yytext, *driver.loc.back()); } + YY_BREAK + case 81: + YY_RULE_SETUP +-#line 591 "seclang-scanner.ll" ++#line 592 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_URL_ENCODE(yytext, *driver.loc.back()); } + YY_BREAK + case 82: + YY_RULE_SETUP +-#line 592 "seclang-scanner.ll" ++#line 593 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_URL_DECODE_UNI(yytext, *driver.loc.back()); } + YY_BREAK + case 83: + YY_RULE_SETUP +-#line 593 "seclang-scanner.ll" ++#line 594 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_URL_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 84: + YY_RULE_SETUP +-#line 594 "seclang-scanner.ll" ++#line 595 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_NONE(yytext, *driver.loc.back()); } + YY_BREAK + case 85: + YY_RULE_SETUP +-#line 595 "seclang-scanner.ll" ++#line 596 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE(yytext, *driver.loc.back()); } + YY_BREAK + case 86: + YY_RULE_SETUP +-#line 596 "seclang-scanner.ll" ++#line 597 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_WHITESPACE(yytext, *driver.loc.back()); } + YY_BREAK + case 87: + YY_RULE_SETUP +-#line 597 "seclang-scanner.ll" ++#line 598 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REPLACE_NULLS(yytext, *driver.loc.back()); } + YY_BREAK + case 88: + YY_RULE_SETUP +-#line 598 "seclang-scanner.ll" ++#line 599 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_NULLS(yytext, *driver.loc.back()); } + YY_BREAK + case 89: + YY_RULE_SETUP +-#line 599 "seclang-scanner.ll" ++#line 600 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 90: + YY_RULE_SETUP +-#line 600 "seclang-scanner.ll" ++#line 601 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_JS_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 91: + YY_RULE_SETUP +-#line 601 "seclang-scanner.ll" ++#line 602 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_CSS_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 92: + YY_RULE_SETUP +-#line 602 "seclang-scanner.ll" ++#line 603 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_TRIM(yytext, *driver.loc.back()); } + YY_BREAK + case 93: + YY_RULE_SETUP +-#line 603 "seclang-scanner.ll" ++#line 604 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_TRIM_LEFT(yytext, *driver.loc.back()); } + YY_BREAK + case 94: + YY_RULE_SETUP +-#line 604 "seclang-scanner.ll" ++#line 605 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_TRIM_RIGHT(yytext, *driver.loc.back()); } + YY_BREAK + case 95: + YY_RULE_SETUP +-#line 605 "seclang-scanner.ll" ++#line 606 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN(yytext, *driver.loc.back()); } + YY_BREAK + case 96: + YY_RULE_SETUP +-#line 606 "seclang-scanner.ll" ++#line 607 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_NORMALISE_PATH(yytext, *driver.loc.back()); } + YY_BREAK + case 97: + YY_RULE_SETUP +-#line 607 "seclang-scanner.ll" ++#line 608 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_LENGTH(yytext, *driver.loc.back()); } + YY_BREAK + case 98: + YY_RULE_SETUP +-#line 608 "seclang-scanner.ll" ++#line 609 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_UTF8_TO_UNICODE(yytext, *driver.loc.back()); } + YY_BREAK + case 99: + YY_RULE_SETUP +-#line 609 "seclang-scanner.ll" ++#line 610 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR(yytext, *driver.loc.back()); } + YY_BREAK + case 100: + YY_RULE_SETUP +-#line 610 "seclang-scanner.ll" ++#line 611 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_COMMENTS(yytext, *driver.loc.back()); } + YY_BREAK + case 101: + YY_RULE_SETUP +-#line 611 "seclang-scanner.ll" ++#line 612 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REPLACE_COMMENTS(yytext, *driver.loc.back()); } + YY_BREAK + case 102: + YY_RULE_SETUP +-#line 612 "seclang-scanner.ll" ++#line 613 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_LOG_DATA(yytext, *driver.loc.back()); } + YY_BREAK + case 103: + YY_RULE_SETUP +-#line 614 "seclang-scanner.ll" ++#line 615 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_DETC(yytext, *driver.loc.back()); } + YY_BREAK + case 104: + YY_RULE_SETUP +-#line 615 "seclang-scanner.ll" ++#line 616 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_OFF(yytext, *driver.loc.back()); } + YY_BREAK + case 105: + YY_RULE_SETUP +-#line 616 "seclang-scanner.ll" ++#line 617 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_ON(yytext, *driver.loc.back()); } + YY_BREAK + case 106: + YY_RULE_SETUP +-#line 617 "seclang-scanner.ll" ++#line 618 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_RELEVANT_ONLY(yytext, *driver.loc.back()); } + YY_BREAK + case 107: + /* rule 107 can match eol */ + YY_RULE_SETUP +-#line 618 "seclang-scanner.ll" ++#line 619 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 108: + /* rule 108 can match eol */ + YY_RULE_SETUP +-#line 619 "seclang-scanner.ll" ++#line 620 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 109: + YY_RULE_SETUP +-#line 623 "seclang-scanner.ll" ++#line 624 "seclang-scanner.ll" + { return p::make_COMMA(*driver.loc.back()); } + YY_BREAK + +@@ -6156,75 +6163,75 @@ YY_RULE_SETUP + case 110: + /* rule 110 can match eol */ + YY_RULE_SETUP +-#line 628 "seclang-scanner.ll" ++#line 629 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 111: + /* rule 111 can match eol */ + YY_RULE_SETUP +-#line 629 "seclang-scanner.ll" ++#line 630 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 112: + YY_RULE_SETUP +-#line 634 "seclang-scanner.ll" ++#line 635 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); } + YY_BREAK + case 113: + /* rule 113 can match eol */ + YY_RULE_SETUP +-#line 635 "seclang-scanner.ll" ++#line 636 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(1); } + YY_BREAK + case 114: + /* rule 114 can match eol */ + YY_RULE_SETUP +-#line 636 "seclang-scanner.ll" ++#line 637 "seclang-scanner.ll" + { BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 115: + YY_RULE_SETUP +-#line 641 "seclang-scanner.ll" ++#line 642 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); p::make_NEW_LINE(*driver.loc.back()); } + YY_BREAK + case 116: + /* rule 116 can match eol */ + YY_RULE_SETUP +-#line 642 "seclang-scanner.ll" ++#line 643 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(1); } + YY_BREAK + case 117: + /* rule 117 can match eol */ + YY_RULE_SETUP +-#line 643 "seclang-scanner.ll" ++#line 644 "seclang-scanner.ll" + { BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 118: + YY_RULE_SETUP +-#line 648 "seclang-scanner.ll" ++#line 649 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_ACTION); yyless(0); } + YY_BREAK + + + case 119: + YY_RULE_SETUP +-#line 653 "seclang-scanner.ll" ++#line 654 "seclang-scanner.ll" + { BEGIN(ACTION_PREDICATE_ENDS_WITH_QUOTE); } + YY_BREAK + case 120: + YY_RULE_SETUP +-#line 654 "seclang-scanner.ll" ++#line 655 "seclang-scanner.ll" + { BEGIN(ACTION_PREDICATE_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 121: + YY_RULE_SETUP +-#line 655 "seclang-scanner.ll" ++#line 656 "seclang-scanner.ll" + { BEGIN(ACTION_PREDICATE_ENDS_WITH_COMMA_OR_DOUBLE_QUOTE); yyless(0); } + YY_BREAK + +@@ -6232,116 +6239,116 @@ YY_RULE_SETUP + case 122: + /* rule 122 can match eol */ + YY_RULE_SETUP +-#line 660 "seclang-scanner.ll" ++#line 661 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 123: + /* rule 123 can match eol */ + YY_RULE_SETUP +-#line 661 "seclang-scanner.ll" ++#line 662 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 124: + YY_RULE_SETUP +-#line 665 "seclang-scanner.ll" ++#line 666 "seclang-scanner.ll" + { yyless(1); BEGIN_PREVIOUS(); } + YY_BREAK + case 125: + YY_RULE_SETUP +-#line 666 "seclang-scanner.ll" ++#line 667 "seclang-scanner.ll" + { BEGIN_PREVIOUS(); } + YY_BREAK + case 126: + YY_RULE_SETUP +-#line 667 "seclang-scanner.ll" ++#line 668 "seclang-scanner.ll" + { BEGIN_PREVIOUS(); } + YY_BREAK + + + case 127: + YY_RULE_SETUP +-#line 671 "seclang-scanner.ll" ++#line 672 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(yyleng); } + YY_BREAK + case 128: + /* rule 128 can match eol */ + YY_RULE_SETUP +-#line 672 "seclang-scanner.ll" ++#line 673 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 129: + YY_RULE_SETUP +-#line 676 "seclang-scanner.ll" ++#line 677 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(yyleng); } + YY_BREAK + case 130: + /* rule 130 can match eol */ + YY_RULE_SETUP +-#line 677 "seclang-scanner.ll" ++#line 678 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 131: + YY_RULE_SETUP +-#line 681 "seclang-scanner.ll" ++#line 682 "seclang-scanner.ll" + { yyless(0); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 132: + YY_RULE_SETUP +-#line 682 "seclang-scanner.ll" ++#line 683 "seclang-scanner.ll" + { yyless(0); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE);} + YY_BREAK + case 133: + /* rule 133 can match eol */ + YY_RULE_SETUP +-#line 683 "seclang-scanner.ll" ++#line 684 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 134: + YY_RULE_SETUP +-#line 687 "seclang-scanner.ll" ++#line 688 "seclang-scanner.ll" + { BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + case 135: + YY_RULE_SETUP +-#line 688 "seclang-scanner.ll" ++#line 689 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } + YY_BREAK + + + case 136: + YY_RULE_SETUP +-#line 692 "seclang-scanner.ll" ++#line 693 "seclang-scanner.ll" + { return p::make_NOT(*driver.loc.back()); } + YY_BREAK + case 137: + /* rule 137 can match eol */ + YY_RULE_SETUP +-#line 693 "seclang-scanner.ll" ++#line 694 "seclang-scanner.ll" + { BEGIN_ACTION_OPERATION(); yyless(0); } + YY_BREAK + + + case 138: + YY_RULE_SETUP +-#line 698 "seclang-scanner.ll" ++#line 699 "seclang-scanner.ll" + { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } + YY_BREAK + case 139: + YY_RULE_SETUP +-#line 699 "seclang-scanner.ll" ++#line 700 "seclang-scanner.ll" + { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } + YY_BREAK + case 140: + YY_RULE_SETUP +-#line 700 "seclang-scanner.ll" ++#line 701 "seclang-scanner.ll" + { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } + YY_BREAK + +@@ -6349,27 +6356,27 @@ YY_RULE_SETUP + case 141: + /* rule 141 can match eol */ + YY_RULE_SETUP +-#line 704 "seclang-scanner.ll" ++#line 705 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0);} + YY_BREAK + + + case 142: + YY_RULE_SETUP +-#line 708 "seclang-scanner.ll" ++#line 709 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 143: + /* rule 143 can match eol */ + YY_RULE_SETUP +-#line 709 "seclang-scanner.ll" ++#line 710 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_ACTION); yyless(0); } + YY_BREAK + + + case 144: + YY_RULE_SETUP +-#line 717 "seclang-scanner.ll" ++#line 718 "seclang-scanner.ll" + { BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + +@@ -6377,1995 +6384,1993 @@ YY_RULE_SETUP + case 145: + /* rule 145 can match eol */ + YY_RULE_SETUP +-#line 722 "seclang-scanner.ll" ++#line 723 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 146: + /* rule 146 can match eol */ + YY_RULE_SETUP +-#line 723 "seclang-scanner.ll" ++#line 724 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0); } + YY_BREAK + + + case 147: + YY_RULE_SETUP +-#line 728 "seclang-scanner.ll" ++#line 729 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 148: + /* rule 148 can match eol */ + YY_RULE_SETUP +-#line 729 "seclang-scanner.ll" ++#line 730 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 149: + /* rule 149 can match eol */ + YY_RULE_SETUP +-#line 730 "seclang-scanner.ll" ++#line 731 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0); } + YY_BREAK + + + case YY_STATE_EOF(FINISH_ACTIONS): +-#line 738 "seclang-scanner.ll" ++#line 739 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(0); p::make_NEW_LINE(*driver.loc.back()); } + YY_BREAK + case 150: + YY_RULE_SETUP +-#line 739 "seclang-scanner.ll" ++#line 740 "seclang-scanner.ll" + { BEGIN(INITIAL); } + YY_BREAK + + case 151: + /* rule 151 can match eol */ + YY_RULE_SETUP +-#line 742 "seclang-scanner.ll" ++#line 743 "seclang-scanner.ll" + { return p::make_CONFIG_COMPONENT_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); } + YY_BREAK + case 152: + /* rule 152 can match eol */ + YY_RULE_SETUP +-#line 743 "seclang-scanner.ll" ++#line 744 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_SERVER_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); } + YY_BREAK + case 153: + /* rule 153 can match eol */ + YY_RULE_SETUP +-#line 744 "seclang-scanner.ll" ++#line 745 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(strchr(yytext, ' ') + 2), *driver.loc.back()); } + YY_BREAK + case 154: + YY_RULE_SETUP +-#line 745 "seclang-scanner.ll" ++#line 746 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 155: + YY_RULE_SETUP +-#line 746 "seclang-scanner.ll" ++#line 747 "seclang-scanner.ll" + { return p::make_CONFIG_CONTENT_INJECTION(*driver.loc.back()); } + YY_BREAK + case 156: + YY_RULE_SETUP +-#line 747 "seclang-scanner.ll" ++#line 748 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR_MOD(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 157: + YY_RULE_SETUP +-#line 748 "seclang-scanner.ll" ++#line 749 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR_MOD(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 158: + YY_RULE_SETUP +-#line 749 "seclang-scanner.ll" ++#line 750 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 159: + YY_RULE_SETUP +-#line 750 "seclang-scanner.ll" ++#line 751 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 160: + YY_RULE_SETUP +-#line 751 "seclang-scanner.ll" ++#line 752 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_ARGUMENT_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 161: + YY_RULE_SETUP +-#line 752 "seclang-scanner.ll" ++#line 753 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_ARGUMENT_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 162: + YY_RULE_SETUP +-#line 753 "seclang-scanner.ll" ++#line 754 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_ENG(yytext, *driver.loc.back()); } + YY_BREAK + case 163: + YY_RULE_SETUP +-#line 754 "seclang-scanner.ll" ++#line 755 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_FLE_MOD(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 164: + YY_RULE_SETUP +-#line 755 "seclang-scanner.ll" ++#line 756 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG2(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 165: + YY_RULE_SETUP +-#line 756 "seclang-scanner.ll" ++#line 757 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG_P(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 166: + YY_RULE_SETUP +-#line 757 "seclang-scanner.ll" ++#line 758 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG_P(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 167: + YY_RULE_SETUP +-#line 758 "seclang-scanner.ll" ++#line 759 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 168: + YY_RULE_SETUP +-#line 759 "seclang-scanner.ll" ++#line 760 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG_FMT(*driver.loc.back()); } + YY_BREAK + case 169: + YY_RULE_SETUP +-#line 760 "seclang-scanner.ll" ++#line 761 "seclang-scanner.ll" + { return p::make_JSON(*driver.loc.back()); } + YY_BREAK + case 170: + YY_RULE_SETUP +-#line 761 "seclang-scanner.ll" ++#line 762 "seclang-scanner.ll" + { return p::make_NATIVE(*driver.loc.back()); } + YY_BREAK + case 171: + YY_RULE_SETUP +-#line 762 "seclang-scanner.ll" ++#line 763 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 172: + YY_RULE_SETUP +-#line 763 "seclang-scanner.ll" ++#line 764 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_STS(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 173: + YY_RULE_SETUP +-#line 764 "seclang-scanner.ll" ++#line 765 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_STS(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 174: + YY_RULE_SETUP +-#line 765 "seclang-scanner.ll" ++#line 766 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_TPE(yytext, *driver.loc.back()); } + YY_BREAK + case 175: + YY_RULE_SETUP +-#line 768 "seclang-scanner.ll" ++#line 769 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_DEBUG_LOG(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 176: + YY_RULE_SETUP +-#line 769 "seclang-scanner.ll" ++#line 770 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_DEBUG_LOG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 177: + YY_RULE_SETUP +-#line 770 "seclang-scanner.ll" ++#line 771 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_DEBUG_LVL(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 178: + YY_RULE_SETUP +-#line 771 "seclang-scanner.ll" ++#line 772 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_GEO_DB(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 179: + YY_RULE_SETUP +-#line 772 "seclang-scanner.ll" ++#line 773 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 180: + YY_RULE_SETUP +-#line 773 "seclang-scanner.ll" ++#line 774 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_PCRE_MATCH_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 181: + YY_RULE_SETUP +-#line 774 "seclang-scanner.ll" ++#line 775 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_ARGS_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 182: + YY_RULE_SETUP +-#line 775 "seclang-scanner.ll" ++#line 776 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 183: + YY_RULE_SETUP +-#line 776 "seclang-scanner.ll" ++#line 777 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 184: + YY_RULE_SETUP +-#line 778 "seclang-scanner.ll" ++#line 779 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_LIMIT_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 185: + YY_RULE_SETUP +-#line 779 "seclang-scanner.ll" ++#line 780 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 186: + YY_RULE_SETUP +-#line 780 "seclang-scanner.ll" ++#line 781 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 187: + YY_RULE_SETUP +-#line 781 "seclang-scanner.ll" ++#line 782 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY(yytext, *driver.loc.back()); } + YY_BREAK + case 188: + YY_RULE_SETUP +-#line 782 "seclang-scanner.ll" ++#line 783 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RES_BODY_LIMIT_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 189: + YY_RULE_SETUP +-#line 783 "seclang-scanner.ll" ++#line 784 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RES_BODY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 190: + YY_RULE_SETUP +-#line 784 "seclang-scanner.ll" ++#line 785 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RES_BODY(yytext, *driver.loc.back()); } + YY_BREAK + case 191: + YY_RULE_SETUP +-#line 785 "seclang-scanner.ll" ++#line 786 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RULE_ENG(yytext, *driver.loc.back()); } + YY_BREAK + case 192: + YY_RULE_SETUP +-#line 786 "seclang-scanner.ll" ++#line 787 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_SEC_MARKER(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 193: + YY_RULE_SETUP +-#line 787 "seclang-scanner.ll" ++#line 788 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_SEC_MARKER(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 194: + YY_RULE_SETUP +-#line 788 "seclang-scanner.ll" ++#line 789 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_UNICODE_MAP_FILE(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 195: + YY_RULE_SETUP +-#line 789 "seclang-scanner.ll" ++#line 790 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 196: + YY_RULE_SETUP +-#line 790 "seclang-scanner.ll" ++#line 791 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 197: + YY_RULE_SETUP +-#line 791 "seclang-scanner.ll" ++#line 792 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 198: + YY_RULE_SETUP +-#line 792 "seclang-scanner.ll" ++#line 793 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 199: + YY_RULE_SETUP +-#line 793 "seclang-scanner.ll" ++#line 794 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 200: + YY_RULE_SETUP +-#line 794 "seclang-scanner.ll" ++#line 795 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 201: + YY_RULE_SETUP +-#line 795 "seclang-scanner.ll" ++#line 796 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 202: + YY_RULE_SETUP +-#line 796 "seclang-scanner.ll" ++#line 797 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 203: + YY_RULE_SETUP +-#line 797 "seclang-scanner.ll" ++#line 798 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 204: + YY_RULE_SETUP +-#line 798 "seclang-scanner.ll" ++#line 799 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 205: + YY_RULE_SETUP +-#line 799 "seclang-scanner.ll" ++#line 800 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 206: + YY_RULE_SETUP +-#line 800 "seclang-scanner.ll" ++#line 801 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 207: + YY_RULE_SETUP +-#line 801 "seclang-scanner.ll" ++#line 802 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 208: + YY_RULE_SETUP +-#line 802 "seclang-scanner.ll" ++#line 803 "seclang-scanner.ll" + { return p::make_CONFIG_UPDLOAD_KEEP_FILES(yytext, *driver.loc.back()); } + YY_BREAK + case 209: + YY_RULE_SETUP +-#line 803 "seclang-scanner.ll" ++#line 804 "seclang-scanner.ll" + { return p::make_CONFIG_UPDLOAD_SAVE_TMP_FILES(yytext, *driver.loc.back()); } + YY_BREAK + case 210: + YY_RULE_SETUP +-#line 804 "seclang-scanner.ll" ++#line 805 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 211: + YY_RULE_SETUP +-#line 805 "seclang-scanner.ll" ++#line 806 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 212: + YY_RULE_SETUP +-#line 806 "seclang-scanner.ll" ++#line 807 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_FILE_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 213: + YY_RULE_SETUP +-#line 807 "seclang-scanner.ll" ++#line 808 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_FILE_MODE(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 214: + YY_RULE_SETUP +-#line 808 "seclang-scanner.ll" ++#line 809 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_ABORT(yytext, *driver.loc.back()); } + YY_BREAK + case 215: + YY_RULE_SETUP +-#line 809 "seclang-scanner.ll" ++#line 810 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_DETC(yytext, *driver.loc.back()); } + YY_BREAK + case 216: + YY_RULE_SETUP +-#line 810 "seclang-scanner.ll" ++#line 811 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_HTTPS(yytext, *driver.loc.back()); } + YY_BREAK + case 217: + YY_RULE_SETUP +-#line 811 "seclang-scanner.ll" ++#line 812 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_OFF(yytext, *driver.loc.back()); } + YY_BREAK + case 218: + YY_RULE_SETUP +-#line 812 "seclang-scanner.ll" ++#line 813 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_ON(yytext, *driver.loc.back()); } + YY_BREAK + case 219: + YY_RULE_SETUP +-#line 813 "seclang-scanner.ll" ++#line 814 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_PARALLEL(yytext, *driver.loc.back()); } + YY_BREAK + case 220: + YY_RULE_SETUP +-#line 814 "seclang-scanner.ll" ++#line 815 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_PROCESS_PARTIAL(yytext, *driver.loc.back()); } + YY_BREAK + case 221: + YY_RULE_SETUP +-#line 815 "seclang-scanner.ll" ++#line 816 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_REJECT(yytext, *driver.loc.back()); } + YY_BREAK + case 222: + YY_RULE_SETUP +-#line 816 "seclang-scanner.ll" ++#line 817 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_RELEVANT_ONLY(yytext, *driver.loc.back()); } + YY_BREAK + case 223: + YY_RULE_SETUP +-#line 817 "seclang-scanner.ll" ++#line 818 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_SERIAL(yytext, *driver.loc.back()); } + YY_BREAK + case 224: + YY_RULE_SETUP +-#line 818 "seclang-scanner.ll" ++#line 819 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_WARN(yytext, *driver.loc.back()); } + YY_BREAK + case 225: + YY_RULE_SETUP +-#line 819 "seclang-scanner.ll" ++#line 820 "seclang-scanner.ll" + { return p::make_CONFIG_XML_EXTERNAL_ENTITY(yytext, *driver.loc.back()); } + YY_BREAK + case 226: + YY_RULE_SETUP +-#line 820 "seclang-scanner.ll" ++#line 821 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_RESPONSE_BODY_MP(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 227: + YY_RULE_SETUP +-#line 821 "seclang-scanner.ll" ++#line 822 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR(*driver.loc.back()); } + YY_BREAK + case 228: + YY_RULE_SETUP +-#line 822 "seclang-scanner.ll" ++#line 823 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_ARG_SEP(yytext, *driver.loc.back()); } + YY_BREAK + case 229: + YY_RULE_SETUP +-#line 823 "seclang-scanner.ll" ++#line 824 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_COOKIE_FORMAT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 230: + YY_RULE_SETUP +-#line 824 "seclang-scanner.ll" ++#line 825 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_COOKIEV0_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 231: + YY_RULE_SETUP +-#line 825 "seclang-scanner.ll" ++#line 826 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_COOKIEV0_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 232: + YY_RULE_SETUP +-#line 826 "seclang-scanner.ll" ++#line 827 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_DATA_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 233: + YY_RULE_SETUP +-#line 827 "seclang-scanner.ll" ++#line 828 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_DATA_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 234: + YY_RULE_SETUP +-#line 828 "seclang-scanner.ll" ++#line 829 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_STATUS_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 235: + YY_RULE_SETUP +-#line 829 "seclang-scanner.ll" ++#line 830 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_TMP_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 236: + YY_RULE_SETUP +-#line 830 "seclang-scanner.ll" ++#line 831 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_TMP_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 237: + YY_RULE_SETUP +-#line 831 "seclang-scanner.ll" ++#line 832 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_DIRECTIVE_SECRULESCRIPT(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 238: + YY_RULE_SETUP +-#line 832 "seclang-scanner.ll" ++#line 833 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_DIRECTIVE_SECRULESCRIPT(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 239: + YY_RULE_SETUP +-#line 833 "seclang-scanner.ll" ++#line 834 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CACHE_TRANSFORMATIONS(yytext, *driver.loc.back()); } + YY_BREAK + case 240: + YY_RULE_SETUP +-#line 834 "seclang-scanner.ll" ++#line 835 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CHROOT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 241: + YY_RULE_SETUP +-#line 835 "seclang-scanner.ll" ++#line 836 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CHROOT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 242: + YY_RULE_SETUP +-#line 836 "seclang-scanner.ll" ++#line 837 "seclang-scanner.ll" + { return p::make_CONFIG_CONN_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 243: + YY_RULE_SETUP +-#line 837 "seclang-scanner.ll" ++#line 838 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 244: + YY_RULE_SETUP +-#line 838 "seclang-scanner.ll" ++#line 839 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_KEY(yytext, *driver.loc.back()); } + YY_BREAK + case 245: + YY_RULE_SETUP +-#line 839 "seclang-scanner.ll" ++#line 840 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_PARAM(yytext, *driver.loc.back()); } + YY_BREAK + case 246: + YY_RULE_SETUP +-#line 840 "seclang-scanner.ll" ++#line 841 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_METHOD_RX(yytext, *driver.loc.back()); } + YY_BREAK + case 247: + YY_RULE_SETUP +-#line 841 "seclang-scanner.ll" ++#line 842 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_METHOD_PM(yytext, *driver.loc.back()); } + YY_BREAK + case 248: + YY_RULE_SETUP +-#line 842 "seclang-scanner.ll" ++#line 843 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_GSB_DB(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 249: + YY_RULE_SETUP +-#line 843 "seclang-scanner.ll" ++#line 844 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_GSB_DB(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 250: + YY_RULE_SETUP +-#line 844 "seclang-scanner.ll" ++#line 845 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_GUARDIAN_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 251: + YY_RULE_SETUP +-#line 845 "seclang-scanner.ll" ++#line 846 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_INTERCEPT_ON_ERROR(yytext, *driver.loc.back()); } + YY_BREAK + case 252: + YY_RULE_SETUP +-#line 846 "seclang-scanner.ll" ++#line 847 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CONN_R_STATE_LIMIT(yytext, *driver.loc.back()); } + YY_BREAK + case 253: + YY_RULE_SETUP +-#line 847 "seclang-scanner.ll" ++#line 848 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CONN_W_STATE_LIMIT(yytext, *driver.loc.back()); } + YY_BREAK + case 254: + YY_RULE_SETUP +-#line 848 "seclang-scanner.ll" ++#line 849 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_SENSOR_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 255: + YY_RULE_SETUP +-#line 849 "seclang-scanner.ll" ++#line 850 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_INHERITANCE(yytext, *driver.loc.back()); } + YY_BREAK + case 256: + YY_RULE_SETUP +-#line 850 "seclang-scanner.ll" ++#line 851 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_PERF_TIME(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 257: + YY_RULE_SETUP +-#line 851 "seclang-scanner.ll" ++#line 852 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_STREAM_IN_BODY_INSPECTION(yytext, *driver.loc.back()); } + YY_BREAK + case 258: + YY_RULE_SETUP +-#line 852 "seclang-scanner.ll" ++#line 853 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION(yytext, *driver.loc.back()); } + YY_BREAK + case 259: + YY_RULE_SETUP +-#line 853 "seclang-scanner.ll" ++#line 854 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_DISABLE_BACKEND_COMPRESS(yytext, *driver.loc.back()); } + YY_BREAK + case 260: + YY_RULE_SETUP +-#line 855 "seclang-scanner.ll" ++#line 856 "seclang-scanner.ll" + { BEGIN(TRANSACTION_TO_VARIABLE); return p::make_DIRECTIVE(yytext, *driver.loc.back()); } + YY_BREAK + case 261: + YY_RULE_SETUP +-#line 856 "seclang-scanner.ll" ++#line 857 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_CONFIG_DIR_SEC_DEFAULT_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 262: + YY_RULE_SETUP +-#line 857 "seclang-scanner.ll" ++#line 858 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_CONFIG_DIR_SEC_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 263: + YY_RULE_SETUP +-#line 859 "seclang-scanner.ll" ++#line 860 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 264: + YY_RULE_SETUP +-#line 860 "seclang-scanner.ll" ++#line 861 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_COLLECTION_TIMEOUT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 265: + YY_RULE_SETUP +-#line 861 "seclang-scanner.ll" ++#line 862 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HTTP_BLKEY(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 266: + /* rule 266 can match eol */ + YY_RULE_SETUP +-#line 862 "seclang-scanner.ll" ++#line 863 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 267: + /* rule 267 can match eol */ + YY_RULE_SETUP +-#line 863 "seclang-scanner.ll" ++#line 864 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(COMMENT); } + YY_BREAK + case 268: + /* rule 268 can match eol */ + YY_RULE_SETUP +-#line 864 "seclang-scanner.ll" ++#line 865 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(COMMENT); } + YY_BREAK + case 269: + YY_RULE_SETUP +-#line 865 "seclang-scanner.ll" ++#line 866 "seclang-scanner.ll" + { driver.loc.back()->step(); /* comment, just ignore. */ } + YY_BREAK + case 270: + YY_RULE_SETUP +-#line 866 "seclang-scanner.ll" ++#line 867 "seclang-scanner.ll" + { driver.loc.back()->step(); /* carriage return, just ignore. */} + YY_BREAK + case 271: + YY_RULE_SETUP +-#line 867 "seclang-scanner.ll" ++#line 868 "seclang-scanner.ll" + { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } + YY_BREAK + case 272: + YY_RULE_SETUP +-#line 868 "seclang-scanner.ll" ++#line 869 "seclang-scanner.ll" + { return p::make_COMMA(*driver.loc.back()); } + YY_BREAK + + case 273: + YY_RULE_SETUP +-#line 871 "seclang-scanner.ll" ++#line 872 "seclang-scanner.ll" + { BEGIN(EXPECTING_VARIABLE); } + YY_BREAK + + + case 274: + YY_RULE_SETUP +-#line 875 "seclang-scanner.ll" ++#line 876 "seclang-scanner.ll" + { return p::make_PIPE(*driver.loc.back()); } + YY_BREAK + case 275: + YY_RULE_SETUP +-#line 876 "seclang-scanner.ll" ++#line 877 "seclang-scanner.ll" + { return p::make_PIPE(*driver.loc.back()); } + YY_BREAK + case 276: + YY_RULE_SETUP +-#line 877 "seclang-scanner.ll" ++#line 878 "seclang-scanner.ll" + { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } + YY_BREAK + case 277: + YY_RULE_SETUP +-#line 878 "seclang-scanner.ll" ++#line 879 "seclang-scanner.ll" + { return p::make_VAR_EXCLUSION(*driver.loc.back()); } + YY_BREAK + case 278: + YY_RULE_SETUP +-#line 879 "seclang-scanner.ll" ++#line 880 "seclang-scanner.ll" + { return p::make_VAR_COUNT(*driver.loc.back()); } + YY_BREAK + + + case 279: + YY_RULE_SETUP +-#line 883 "seclang-scanner.ll" ++#line 884 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 280: + YY_RULE_SETUP +-#line 884 "seclang-scanner.ll" ++#line 885 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 281: + /* rule 281 can match eol */ + YY_RULE_SETUP +-#line 885 "seclang-scanner.ll" ++#line 886 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 282: + /* rule 282 can match eol */ + YY_RULE_SETUP +-#line 886 "seclang-scanner.ll" ++#line 887 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 283: + /* rule 283 can match eol */ + YY_RULE_SETUP +-#line 887 "seclang-scanner.ll" ++#line 888 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 284: + /* rule 284 can match eol */ + YY_RULE_SETUP +-#line 888 "seclang-scanner.ll" ++#line 889 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + + + case 285: + YY_RULE_SETUP +-#line 892 "seclang-scanner.ll" ++#line 893 "seclang-scanner.ll" + { } + YY_BREAK + case 286: + YY_RULE_SETUP +-#line 893 "seclang-scanner.ll" ++#line 894 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 287: + /* rule 287 can match eol */ + YY_RULE_SETUP +-#line 894 "seclang-scanner.ll" ++#line 895 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 288: + /* rule 288 can match eol */ + YY_RULE_SETUP +-#line 895 "seclang-scanner.ll" ++#line 896 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + + + case 289: + YY_RULE_SETUP +-#line 900 "seclang-scanner.ll" ++#line 901 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } + YY_BREAK + case 290: + YY_RULE_SETUP +-#line 901 "seclang-scanner.ll" ++#line 902 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_COMBINED_SIZE(*driver.loc.back()); } + YY_BREAK + case 291: + YY_RULE_SETUP +-#line 902 "seclang-scanner.ll" ++#line 903 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_GET_NAMES(*driver.loc.back()); } + YY_BREAK + case 292: + YY_RULE_SETUP +-#line 903 "seclang-scanner.ll" ++#line 904 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_GET_NAMES(*driver.loc.back()); } + YY_BREAK + case 293: + YY_RULE_SETUP +-#line 904 "seclang-scanner.ll" ++#line 905 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_NAMES(*driver.loc.back()); } + YY_BREAK + case 294: + YY_RULE_SETUP +-#line 905 "seclang-scanner.ll" ++#line 906 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_NAMES(*driver.loc.back()); } + YY_BREAK + case 295: + YY_RULE_SETUP +-#line 906 "seclang-scanner.ll" ++#line 907 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_POST_NAMES(*driver.loc.back()); } + YY_BREAK + case 296: + YY_RULE_SETUP +-#line 907 "seclang-scanner.ll" ++#line 908 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_POST_NAMES(*driver.loc.back()); } + YY_BREAK + case 297: + YY_RULE_SETUP +-#line 908 "seclang-scanner.ll" ++#line 909 "seclang-scanner.ll" + { return p::make_VARIABLE_AUTH_TYPE(*driver.loc.back()); } + YY_BREAK + case 298: + YY_RULE_SETUP +-#line 909 "seclang-scanner.ll" ++#line 910 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_COMBINED_SIZE(*driver.loc.back()); } + YY_BREAK + case 299: + YY_RULE_SETUP +-#line 910 "seclang-scanner.ll" ++#line 911 "seclang-scanner.ll" + { return p::make_VARIABLE_FULL_REQUEST_LENGTH(*driver.loc.back()); } + YY_BREAK + case 300: + YY_RULE_SETUP +-#line 911 "seclang-scanner.ll" ++#line 912 "seclang-scanner.ll" + { return p::make_VARIABLE_FULL_REQUEST(*driver.loc.back()); } + YY_BREAK + case 301: + YY_RULE_SETUP +-#line 912 "seclang-scanner.ll" ++#line 913 "seclang-scanner.ll" + { return p::make_VARIABLE_INBOUND_DATA_ERROR(*driver.loc.back()); } + YY_BREAK + case 302: + YY_RULE_SETUP +-#line 913 "seclang-scanner.ll" ++#line 914 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VAR_NAME(*driver.loc.back()); } + YY_BREAK + case 303: + YY_RULE_SETUP +-#line 914 "seclang-scanner.ll" ++#line 915 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VAR(*driver.loc.back()); } + YY_BREAK + case 304: + YY_RULE_SETUP +-#line 915 "seclang-scanner.ll" ++#line 916 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_BOUNDARY_QUOTED(*driver.loc.back()); } + YY_BREAK + case 305: + YY_RULE_SETUP +-#line 916 "seclang-scanner.ll" ++#line 917 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE(*driver.loc.back()); } + YY_BREAK + case 306: + YY_RULE_SETUP +-#line 917 "seclang-scanner.ll" ++#line 918 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_CRLF_LF_LINES(*driver.loc.back()); } + YY_BREAK + case 307: + YY_RULE_SETUP +-#line 918 "seclang-scanner.ll" ++#line 919 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_DATA_AFTER(*driver.loc.back()); } + YY_BREAK + case 308: + YY_RULE_SETUP +-#line 919 "seclang-scanner.ll" ++#line 920 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_DATA_BEFORE(*driver.loc.back()); } + YY_BREAK + case 309: + YY_RULE_SETUP +-#line 920 "seclang-scanner.ll" ++#line 921 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED(*driver.loc.back()); } + YY_BREAK + case 310: + YY_RULE_SETUP +-#line 921 "seclang-scanner.ll" ++#line 922 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_FILENAME(*driver.loc.back()); } + YY_BREAK + case 311: + YY_RULE_SETUP +-#line 922 "seclang-scanner.ll" ++#line 923 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_FILENAME(*driver.loc.back()); } + YY_BREAK + case 312: + YY_RULE_SETUP +-#line 923 "seclang-scanner.ll" ++#line 924 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_HEADER_FOLDING(*driver.loc.back()); } + YY_BREAK + case 313: + YY_RULE_SETUP +-#line 924 "seclang-scanner.ll" ++#line 925 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_HEADER_FOLDING(*driver.loc.back()); } + YY_BREAK + case 314: + YY_RULE_SETUP +-#line 925 "seclang-scanner.ll" ++#line 926 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING(*driver.loc.back()); } + YY_BREAK + case 315: + YY_RULE_SETUP +-#line 926 "seclang-scanner.ll" ++#line 927 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_INVALID_PART(*driver.loc.back()); } + YY_BREAK + case 316: + YY_RULE_SETUP +-#line 927 "seclang-scanner.ll" ++#line 928 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_INVALID_QUOTING(*driver.loc.back()); } + YY_BREAK + case 317: + YY_RULE_SETUP +-#line 928 "seclang-scanner.ll" ++#line 929 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_LF_LINE(*driver.loc.back()); } + YY_BREAK + case 318: + YY_RULE_SETUP +-#line 929 "seclang-scanner.ll" ++#line 930 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_MISSING_SEMICOLON(*driver.loc.back()); } + YY_BREAK + case 319: + YY_RULE_SETUP +-#line 930 "seclang-scanner.ll" ++#line 931 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_SEMICOLON_MISSING(*driver.loc.back()); } + YY_BREAK + case 320: + YY_RULE_SETUP +-#line 931 "seclang-scanner.ll" ++#line 932 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_NAME(*driver.loc.back()); } + YY_BREAK + case 321: + YY_RULE_SETUP +-#line 932 "seclang-scanner.ll" ++#line 933 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_NAME(*driver.loc.back()); } + YY_BREAK + case 322: + YY_RULE_SETUP +-#line 933 "seclang-scanner.ll" ++#line 934 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_STRICT_ERROR(*driver.loc.back()); } + YY_BREAK + case 323: + YY_RULE_SETUP +-#line 934 "seclang-scanner.ll" ++#line 935 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY(*driver.loc.back()); } + YY_BREAK + case 324: + YY_RULE_SETUP +-#line 935 "seclang-scanner.ll" ++#line 936 "seclang-scanner.ll" + { return p::make_VARIABLE_OUTBOUND_DATA_ERROR(*driver.loc.back()); } + YY_BREAK + case 325: + YY_RULE_SETUP +-#line 936 "seclang-scanner.ll" ++#line 937 "seclang-scanner.ll" + { return p::make_VARIABLE_PATH_INFO(*driver.loc.back()); } + YY_BREAK + case 326: + YY_RULE_SETUP +-#line 937 "seclang-scanner.ll" ++#line 938 "seclang-scanner.ll" + { return p::make_VARIABLE_QUERY_STRING(*driver.loc.back()); } + YY_BREAK + case 327: + YY_RULE_SETUP +-#line 938 "seclang-scanner.ll" ++#line 939 "seclang-scanner.ll" + { return p::make_VARIABLE_REMOTE_ADDR(*driver.loc.back()); } + YY_BREAK + case 328: + YY_RULE_SETUP +-#line 939 "seclang-scanner.ll" ++#line 940 "seclang-scanner.ll" + { return p::make_VARIABLE_REMOTE_HOST(*driver.loc.back()); } + YY_BREAK + case 329: + YY_RULE_SETUP +-#line 940 "seclang-scanner.ll" ++#line 941 "seclang-scanner.ll" + { return p::make_VARIABLE_REMOTE_PORT(*driver.loc.back()); } + YY_BREAK + case 330: + YY_RULE_SETUP +-#line 941 "seclang-scanner.ll" ++#line 942 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_ERROR_MSG(*driver.loc.back()); } + YY_BREAK + case 331: + YY_RULE_SETUP +-#line 942 "seclang-scanner.ll" ++#line 943 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_ERROR(*driver.loc.back()); } + YY_BREAK + case 332: + YY_RULE_SETUP +-#line 943 "seclang-scanner.ll" ++#line 944 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG(*driver.loc.back()); } + YY_BREAK + case 333: + YY_RULE_SETUP +-#line 944 "seclang-scanner.ll" ++#line 945 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_PROCESSOR_ERROR(*driver.loc.back()); } + YY_BREAK + case 334: + YY_RULE_SETUP +-#line 945 "seclang-scanner.ll" ++#line 946 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_PROCESSOR(*driver.loc.back()); } + YY_BREAK + case 335: + YY_RULE_SETUP +-#line 946 "seclang-scanner.ll" ++#line 947 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_BASENAME(*driver.loc.back()); } + YY_BREAK + case 336: + YY_RULE_SETUP +-#line 947 "seclang-scanner.ll" ++#line 948 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_BODY_LENGTH(*driver.loc.back()); } + YY_BREAK + case 337: + YY_RULE_SETUP +-#line 948 "seclang-scanner.ll" ++#line 949 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_BODY(*driver.loc.back()); } + YY_BREAK + case 338: + YY_RULE_SETUP +-#line 949 "seclang-scanner.ll" ++#line 950 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_FILE_NAME(*driver.loc.back()); } + YY_BREAK + case 339: + YY_RULE_SETUP +-#line 950 "seclang-scanner.ll" ++#line 951 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 340: + YY_RULE_SETUP +-#line 951 "seclang-scanner.ll" ++#line 952 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 341: + YY_RULE_SETUP +-#line 952 "seclang-scanner.ll" ++#line 953 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_LINE(*driver.loc.back()); } + YY_BREAK + case 342: + YY_RULE_SETUP +-#line 953 "seclang-scanner.ll" ++#line 954 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_METHOD(*driver.loc.back()); } + YY_BREAK + case 343: + YY_RULE_SETUP +-#line 954 "seclang-scanner.ll" ++#line 955 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_PROTOCOL(*driver.loc.back()); } + YY_BREAK + case 344: + YY_RULE_SETUP +-#line 955 "seclang-scanner.ll" ++#line 956 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_URI_RAW(*driver.loc.back()); } + YY_BREAK + case 345: + YY_RULE_SETUP +-#line 956 "seclang-scanner.ll" ++#line 957 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_URI(*driver.loc.back()); } + YY_BREAK + case 346: + YY_RULE_SETUP +-#line 957 "seclang-scanner.ll" ++#line 958 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_BODY(*driver.loc.back()); } + YY_BREAK + case 347: + YY_RULE_SETUP +-#line 958 "seclang-scanner.ll" ++#line 959 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_CONTENT_LENGTH(*driver.loc.back()); } + YY_BREAK + case 348: + YY_RULE_SETUP +-#line 959 "seclang-scanner.ll" ++#line 960 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_CONTENT_TYPE(*driver.loc.back()); } + YY_BREAK + case 349: + YY_RULE_SETUP +-#line 960 "seclang-scanner.ll" ++#line 961 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 350: + YY_RULE_SETUP +-#line 961 "seclang-scanner.ll" ++#line 962 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RESPONSE_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 351: + YY_RULE_SETUP +-#line 962 "seclang-scanner.ll" ++#line 963 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_PROTOCOL(*driver.loc.back()); } + YY_BREAK + case 352: + YY_RULE_SETUP +-#line 963 "seclang-scanner.ll" ++#line 964 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_STATUS(*driver.loc.back()); } + YY_BREAK + case 353: + YY_RULE_SETUP +-#line 964 "seclang-scanner.ll" ++#line 965 "seclang-scanner.ll" + { return p::make_VARIABLE_SERVER_ADDR(*driver.loc.back()); } + YY_BREAK + case 354: + YY_RULE_SETUP +-#line 965 "seclang-scanner.ll" ++#line 966 "seclang-scanner.ll" + { return p::make_VARIABLE_SERVER_NAME(*driver.loc.back()); } + YY_BREAK + case 355: + YY_RULE_SETUP +-#line 966 "seclang-scanner.ll" ++#line 967 "seclang-scanner.ll" + { return p::make_VARIABLE_SERVER_PORT(*driver.loc.back()); } + YY_BREAK + case 356: + YY_RULE_SETUP +-#line 967 "seclang-scanner.ll" ++#line 968 "seclang-scanner.ll" + { return p::make_VARIABLE_SESSION_ID(*driver.loc.back()); } + YY_BREAK + case 357: + YY_RULE_SETUP +-#line 968 "seclang-scanner.ll" ++#line 969 "seclang-scanner.ll" + { return p::make_VARIABLE_UNIQUE_ID(*driver.loc.back()); } + YY_BREAK + case 358: + YY_RULE_SETUP +-#line 969 "seclang-scanner.ll" ++#line 970 "seclang-scanner.ll" + { return p::make_VARIABLE_URL_ENCODED_ERROR(*driver.loc.back()); } + YY_BREAK + case 359: + YY_RULE_SETUP +-#line 970 "seclang-scanner.ll" ++#line 971 "seclang-scanner.ll" + { return p::make_VARIABLE_USER_ID(*driver.loc.back()); } + YY_BREAK + case 360: + YY_RULE_SETUP +-#line 971 "seclang-scanner.ll" ++#line 972 "seclang-scanner.ll" + { return p::make_VARIABLE_WEB_APP_ID(*driver.loc.back()); } + YY_BREAK + case 361: + YY_RULE_SETUP +-#line 972 "seclang-scanner.ll" ++#line 973 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS(*driver.loc.back()); } + YY_BREAK + case 362: + YY_RULE_SETUP +-#line 973 "seclang-scanner.ll" ++#line 974 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS(*driver.loc.back()); } + YY_BREAK + case 363: + YY_RULE_SETUP +-#line 974 "seclang-scanner.ll" ++#line 975 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_GET(*driver.loc.back()); } + YY_BREAK + case 364: + YY_RULE_SETUP +-#line 975 "seclang-scanner.ll" ++#line 976 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_GET(*driver.loc.back()); } + YY_BREAK + case 365: + YY_RULE_SETUP +-#line 976 "seclang-scanner.ll" ++#line 977 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_POST(*driver.loc.back()); } + YY_BREAK + case 366: + YY_RULE_SETUP +-#line 977 "seclang-scanner.ll" ++#line 978 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_POST(*driver.loc.back()); } + YY_BREAK + case 367: + YY_RULE_SETUP +-#line 978 "seclang-scanner.ll" ++#line 979 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_SIZES(*driver.loc.back()); } + YY_BREAK + case 368: + YY_RULE_SETUP +-#line 979 "seclang-scanner.ll" ++#line 980 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_SIZES(*driver.loc.back()); } + YY_BREAK + case 369: + YY_RULE_SETUP +-#line 980 "seclang-scanner.ll" ++#line 981 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_NAMES(*driver.loc.back()); } + YY_BREAK + case 370: + YY_RULE_SETUP +-#line 981 "seclang-scanner.ll" ++#line 982 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_NAMES(*driver.loc.back()); } + YY_BREAK + case 371: + YY_RULE_SETUP +-#line 982 "seclang-scanner.ll" ++#line 983 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_TMP_CONTENT(*driver.loc.back()); } + YY_BREAK + case 372: + YY_RULE_SETUP +-#line 983 "seclang-scanner.ll" ++#line 984 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_CONTENT(*driver.loc.back()); } + YY_BREAK + case 373: + YY_RULE_SETUP +-#line 984 "seclang-scanner.ll" ++#line 985 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VARS_NAMES(*driver.loc.back()); } + YY_BREAK + case 374: + YY_RULE_SETUP +-#line 985 "seclang-scanner.ll" ++#line 986 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MATCHED_VARS_NAMES(*driver.loc.back()); } + YY_BREAK + case 375: + YY_RULE_SETUP +-#line 986 "seclang-scanner.ll" ++#line 987 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VARS(*driver.loc.back()); } + YY_BREAK + case 376: + YY_RULE_SETUP +-#line 987 "seclang-scanner.ll" ++#line 988 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MATCHED_VARS(*driver.loc.back()); } + YY_BREAK + case 377: + YY_RULE_SETUP +-#line 988 "seclang-scanner.ll" ++#line 989 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES(*driver.loc.back()); } + YY_BREAK + case 378: + YY_RULE_SETUP +-#line 989 "seclang-scanner.ll" ++#line 990 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES(*driver.loc.back()); } + YY_BREAK + case 379: + YY_RULE_SETUP +-#line 990 "seclang-scanner.ll" ++#line 991 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_COOKIES(*driver.loc.back()); } + YY_BREAK + case 380: + YY_RULE_SETUP +-#line 991 "seclang-scanner.ll" ++#line 992 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES(*driver.loc.back()); } + YY_BREAK + case 381: + YY_RULE_SETUP +-#line 992 "seclang-scanner.ll" ++#line 993 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_HEADERS(*driver.loc.back()); } + YY_BREAK + case 382: + YY_RULE_SETUP +-#line 993 "seclang-scanner.ll" ++#line 994 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_HEADERS(*driver.loc.back()); } + YY_BREAK + case 383: + YY_RULE_SETUP +-#line 994 "seclang-scanner.ll" ++#line 995 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_HEADERS(*driver.loc.back()); } + YY_BREAK + case 384: + YY_RULE_SETUP +-#line 995 "seclang-scanner.ll" ++#line 996 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RESPONSE_HEADERS(*driver.loc.back()); } + YY_BREAK + case 385: + YY_RULE_SETUP +-#line 996 "seclang-scanner.ll" ++#line 997 "seclang-scanner.ll" + { return p::make_VARIABLE_GEO(*driver.loc.back()); } + YY_BREAK + case 386: + YY_RULE_SETUP +-#line 997 "seclang-scanner.ll" ++#line 998 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_GEO(*driver.loc.back()); } + YY_BREAK + case 387: + YY_RULE_SETUP +-#line 998 "seclang-scanner.ll" ++#line 999 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } + YY_BREAK + case 388: + YY_RULE_SETUP +-#line 999 "seclang-scanner.ll" ++#line 1000 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } + YY_BREAK + case 389: + YY_RULE_SETUP +-#line 1000 "seclang-scanner.ll" +-{ return p::make_VARIABLE_RULE(*driver.loc.back()); } ++#line 1001 "seclang-scanner.ll" ++{ return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } + YY_BREAK + case 390: + YY_RULE_SETUP +-#line 1001 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RULE(*driver.loc.back()); } ++#line 1002 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } + YY_BREAK + case 391: + YY_RULE_SETUP +-#line 1002 "seclang-scanner.ll" +-{ return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } ++#line 1003 "seclang-scanner.ll" ++{ return p::make_VARIABLE_RULE(*driver.loc.back()); } + YY_BREAK + case 392: + YY_RULE_SETUP +-#line 1003 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } ++#line 1004 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RULE(*driver.loc.back()); } + YY_BREAK + case 393: + YY_RULE_SETUP +-#line 1004 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } ++#line 1005 "seclang-scanner.ll" ++{ return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } + YY_BREAK + case 394: + YY_RULE_SETUP +-#line 1005 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } ++#line 1006 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } + YY_BREAK + case 395: + YY_RULE_SETUP +-#line 1006 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } ++#line 1007 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } + YY_BREAK + case 396: + YY_RULE_SETUP +-#line 1007 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } ++#line 1008 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } + YY_BREAK + case 397: + YY_RULE_SETUP +-#line 1008 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_BLD(yytext, *driver.loc.back()); } ++#line 1009 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } + YY_BREAK + case 398: + YY_RULE_SETUP +-#line 1009 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_DUR(yytext, *driver.loc.back()); } ++#line 1010 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } + YY_BREAK + case 399: + YY_RULE_SETUP +-#line 1010 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_HSV(yytext, *driver.loc.back()); } ++#line 1011 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_BLD(yytext, *driver.loc.back()); } + YY_BREAK + case 400: + YY_RULE_SETUP +-#line 1011 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_REMOTE_USER(yytext, *driver.loc.back()); } ++#line 1012 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_DUR(yytext, *driver.loc.back()); } + YY_BREAK + case 401: + YY_RULE_SETUP +-#line 1012 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_DAY(yytext, *driver.loc.back()); } ++#line 1013 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_HSV(yytext, *driver.loc.back()); } + YY_BREAK + case 402: + YY_RULE_SETUP +-#line 1013 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_EPOCH(yytext, *driver.loc.back()); } ++#line 1014 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_REMOTE_USER(yytext, *driver.loc.back()); } + YY_BREAK + case 403: + YY_RULE_SETUP +-#line 1014 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_HOUR(yytext, *driver.loc.back()); } ++#line 1015 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_DAY(yytext, *driver.loc.back()); } + YY_BREAK + case 404: + YY_RULE_SETUP +-#line 1015 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_MIN(yytext, *driver.loc.back()); } ++#line 1016 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_EPOCH(yytext, *driver.loc.back()); } + YY_BREAK + case 405: + YY_RULE_SETUP +-#line 1016 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_MON(yytext, *driver.loc.back()); } ++#line 1017 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_HOUR(yytext, *driver.loc.back()); } + YY_BREAK + case 406: + YY_RULE_SETUP +-#line 1017 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_SEC(yytext, *driver.loc.back()); } ++#line 1018 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_MIN(yytext, *driver.loc.back()); } + YY_BREAK + case 407: + YY_RULE_SETUP +-#line 1018 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_YEAR(yytext, *driver.loc.back()); } ++#line 1019 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_MON(yytext, *driver.loc.back()); } + YY_BREAK + case 408: + YY_RULE_SETUP +-#line 1019 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME(yytext, *driver.loc.back()); } ++#line 1020 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_SEC(yytext, *driver.loc.back()); } + YY_BREAK + case 409: + YY_RULE_SETUP +-#line 1020 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_WDAY(yytext, *driver.loc.back()); } ++#line 1021 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_YEAR(yytext, *driver.loc.back()); } + YY_BREAK + case 410: + YY_RULE_SETUP +-#line 1023 "seclang-scanner.ll" +-{ driver.error (*driver.loc.back(), "Variable VARIABLE_WEBSERVER_ERROR_LOG is not supported by libModSecurity", ""); throw p::syntax_error(*driver.loc.back(), "");} ++#line 1022 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME(yytext, *driver.loc.back()); } + YY_BREAK + case 411: + YY_RULE_SETUP +-#line 1024 "seclang-scanner.ll" +-{ return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } ++#line 1023 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_WDAY(yytext, *driver.loc.back()); } + YY_BREAK + case 412: + YY_RULE_SETUP +-#line 1025 "seclang-scanner.ll" +-{ return p::make_VARIABLE_IP(*driver.loc.back()); } ++#line 1026 "seclang-scanner.ll" ++{ driver.error (*driver.loc.back(), "Variable VARIABLE_WEBSERVER_ERROR_LOG is not supported by libModSecurity", ""); throw p::syntax_error(*driver.loc.back(), "");} + YY_BREAK + case 413: + YY_RULE_SETUP +-#line 1026 "seclang-scanner.ll" +-{ return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } ++#line 1027 "seclang-scanner.ll" ++{ return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } + YY_BREAK + case 414: + YY_RULE_SETUP +-#line 1027 "seclang-scanner.ll" +-{ return p::make_VARIABLE_SESSION(*driver.loc.back()); } ++#line 1028 "seclang-scanner.ll" ++{ return p::make_VARIABLE_IP(*driver.loc.back()); } + YY_BREAK + case 415: + YY_RULE_SETUP +-#line 1028 "seclang-scanner.ll" +-{ return p::make_VARIABLE_STATUS(*driver.loc.back()); } ++#line 1029 "seclang-scanner.ll" ++{ return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } + YY_BREAK + case 416: + YY_RULE_SETUP +-#line 1029 "seclang-scanner.ll" +-{ return p::make_VARIABLE_STATUS_LINE(*driver.loc.back()); } ++#line 1030 "seclang-scanner.ll" ++{ return p::make_VARIABLE_SESSION(*driver.loc.back()); } + YY_BREAK + case 417: + YY_RULE_SETUP +-#line 1030 "seclang-scanner.ll" +-{ return p::make_VARIABLE_TX(*driver.loc.back()); } ++#line 1031 "seclang-scanner.ll" ++{ return p::make_VARIABLE_STATUS(*driver.loc.back()); } + YY_BREAK + case 418: + YY_RULE_SETUP +-#line 1031 "seclang-scanner.ll" +-{ return p::make_VARIABLE_USER(*driver.loc.back()); } ++#line 1032 "seclang-scanner.ll" ++{ return p::make_VARIABLE_STATUS_LINE(*driver.loc.back()); } + YY_BREAK +- +- + case 419: + YY_RULE_SETUP +-#line 1035 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } ++#line 1033 "seclang-scanner.ll" ++{ return p::make_VARIABLE_TX(*driver.loc.back()); } + YY_BREAK + case 420: + YY_RULE_SETUP +-#line 1036 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_IP(*driver.loc.back()); } ++#line 1034 "seclang-scanner.ll" ++{ return p::make_VARIABLE_USER(*driver.loc.back()); } + YY_BREAK ++ ++ + case 421: + YY_RULE_SETUP +-#line 1037 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } ++#line 1038 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } + YY_BREAK + case 422: + YY_RULE_SETUP +-#line 1038 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_SESSION(*driver.loc.back()); } ++#line 1039 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_IP(*driver.loc.back()); } + YY_BREAK + case 423: + YY_RULE_SETUP +-#line 1039 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_TX(*driver.loc.back()); } ++#line 1040 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } + YY_BREAK + case 424: + YY_RULE_SETUP +-#line 1040 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_USER(*driver.loc.back()); } ++#line 1041 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_SESSION(*driver.loc.back()); } + YY_BREAK +- +- + case 425: + YY_RULE_SETUP +-#line 1045 "seclang-scanner.ll" +-{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } ++#line 1042 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_TX(*driver.loc.back()); } + YY_BREAK + case 426: + YY_RULE_SETUP +-#line 1046 "seclang-scanner.ll" +-{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } ++#line 1043 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_USER(*driver.loc.back()); } + YY_BREAK ++ ++ + case 427: + YY_RULE_SETUP +-#line 1047 "seclang-scanner.ll" +-{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } ++#line 1048 "seclang-scanner.ll" ++{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } + YY_BREAK + case 428: +-/* rule 428 can match eol */ + YY_RULE_SETUP +-#line 1048 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1049 "seclang-scanner.ll" ++{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } + YY_BREAK + case 429: +-/* rule 429 can match eol */ + YY_RULE_SETUP +-#line 1049 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1050 "seclang-scanner.ll" ++{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } + YY_BREAK + case 430: + /* rule 430 can match eol */ + YY_RULE_SETUP +-#line 1050 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1051 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 431: + /* rule 431 can match eol */ + YY_RULE_SETUP +-#line 1051 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1052 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 432: + /* rule 432 can match eol */ + YY_RULE_SETUP +-#line 1052 "seclang-scanner.ll" +-{ yyless(yyleng - 1); BEGIN_PREVIOUS(); return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1053 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 433: + /* rule 433 can match eol */ + YY_RULE_SETUP +-#line 1053 "seclang-scanner.ll" +-{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1054 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 434: + /* rule 434 can match eol */ + YY_RULE_SETUP + #line 1055 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++{ yyless(yyleng - 1); BEGIN_PREVIOUS(); return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 435: + /* rule 435 can match eol */ + YY_RULE_SETUP + #line 1056 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 436: ++/* rule 436 can match eol */ + YY_RULE_SETUP +-#line 1057 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(0); } ++#line 1058 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 437: ++/* rule 437 can match eol */ + YY_RULE_SETUP +-#line 1058 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(0); } ++#line 1059 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 438: + YY_RULE_SETUP +-#line 1059 "seclang-scanner.ll" +-{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } ++#line 1060 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(0); } + YY_BREAK +- +- + case 439: +-/* rule 439 can match eol */ + YY_RULE_SETUP +-#line 1064 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1061 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(0); } + YY_BREAK + case 440: +-/* rule 440 can match eol */ + YY_RULE_SETUP +-#line 1065 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1062 "seclang-scanner.ll" ++{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } + YY_BREAK ++ ++ + case 441: + /* rule 441 can match eol */ + YY_RULE_SETUP +-#line 1066 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1067 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 442: + /* rule 442 can match eol */ + YY_RULE_SETUP +-#line 1067 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1068 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 443: + /* rule 443 can match eol */ + YY_RULE_SETUP +-#line 1068 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1069 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 444: + /* rule 444 can match eol */ + YY_RULE_SETUP +-#line 1069 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); return p::make_DICT_ELEMENT(yytext, *driver.loc.back()); } ++#line 1070 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 445: + /* rule 445 can match eol */ + YY_RULE_SETUP + #line 1071 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 446: + /* rule 446 can match eol */ + YY_RULE_SETUP + #line 1072 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++{ BEGIN_PREVIOUS(); return p::make_DICT_ELEMENT(yytext, *driver.loc.back()); } + YY_BREAK + case 447: ++/* rule 447 can match eol */ + YY_RULE_SETUP + #line 1074 "seclang-scanner.ll" +-{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 448: ++/* rule 448 can match eol */ + YY_RULE_SETUP + #line 1075 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++ YY_BREAK ++case 449: ++YY_RULE_SETUP ++#line 1077 "seclang-scanner.ll" ++{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } ++ YY_BREAK ++case 450: ++YY_RULE_SETUP ++#line 1078 "seclang-scanner.ll" + { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } + YY_BREAK + + +-case 449: ++case 451: + YY_RULE_SETUP +-#line 1081 "seclang-scanner.ll" ++#line 1084 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_GEOLOOKUP(*driver.loc.back()); } + YY_BREAK +-case 450: ++case 452: + YY_RULE_SETUP +-#line 1082 "seclang-scanner.ll" ++#line 1085 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_UNCONDITIONAL_MATCH(*driver.loc.back()); } + YY_BREAK +-case 451: ++case 453: + YY_RULE_SETUP +-#line 1083 "seclang-scanner.ll" ++#line 1086 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_SQLI(*driver.loc.back()); } + YY_BREAK +-case 452: ++case 454: + YY_RULE_SETUP +-#line 1084 "seclang-scanner.ll" ++#line 1087 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_XSS(*driver.loc.back()); } + YY_BREAK +-case 453: ++case 455: + YY_RULE_SETUP +-#line 1085 "seclang-scanner.ll" ++#line 1088 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_URL_ENCODING(*driver.loc.back()); } + YY_BREAK +-case 454: ++case 456: + YY_RULE_SETUP +-#line 1086 "seclang-scanner.ll" ++#line 1089 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_UTF8_ENCODING(*driver.loc.back()); } + YY_BREAK + + +-case 455: ++case 457: + YY_RULE_SETUP +-#line 1089 "seclang-scanner.ll" ++#line 1092 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_GEOLOOKUP(*driver.loc.back()); } + YY_BREAK +-case 456: ++case 458: + YY_RULE_SETUP +-#line 1090 "seclang-scanner.ll" ++#line 1093 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_UNCONDITIONAL_MATCH(*driver.loc.back()); } + YY_BREAK +-case 457: ++case 459: + YY_RULE_SETUP +-#line 1091 "seclang-scanner.ll" ++#line 1094 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_SQLI(*driver.loc.back()); } + YY_BREAK +-case 458: ++case 460: + YY_RULE_SETUP +-#line 1092 "seclang-scanner.ll" ++#line 1095 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_XSS(*driver.loc.back()); } + YY_BREAK +-case 459: ++case 461: + YY_RULE_SETUP +-#line 1093 "seclang-scanner.ll" ++#line 1096 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_URL_ENCODING(*driver.loc.back()); } + YY_BREAK +-case 460: ++case 462: + YY_RULE_SETUP +-#line 1094 "seclang-scanner.ll" ++#line 1097 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_UTF8_ENCODING(*driver.loc.back()); } + YY_BREAK + + +-case 461: +-YY_RULE_SETUP +-#line 1098 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_WITHIN(*driver.loc.back()); } +- YY_BREAK +-case 462: +-YY_RULE_SETUP +-#line 1099 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS_WORD(*driver.loc.back()); } +- YY_BREAK + case 463: + YY_RULE_SETUP +-#line 1100 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS(*driver.loc.back()); } ++#line 1101 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_WITHIN(*driver.loc.back()); } + YY_BREAK + case 464: + YY_RULE_SETUP +-#line 1101 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_ENDS_WITH(*driver.loc.back()); } ++#line 1102 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS_WORD(*driver.loc.back()); } + YY_BREAK + case 465: + YY_RULE_SETUP +-#line 1102 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_EQ(*driver.loc.back()); } ++#line 1103 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS(*driver.loc.back()); } + YY_BREAK + case 466: + YY_RULE_SETUP +-#line 1103 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_GE(*driver.loc.back()); } ++#line 1104 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_ENDS_WITH(*driver.loc.back()); } + YY_BREAK + case 467: + YY_RULE_SETUP +-#line 1104 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_GT(*driver.loc.back()); } ++#line 1105 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_EQ(*driver.loc.back()); } + YY_BREAK + case 468: + YY_RULE_SETUP +-#line 1105 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH_FROM_FILE(*driver.loc.back()); } ++#line 1106 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_GE(*driver.loc.back()); } + YY_BREAK + case 469: + YY_RULE_SETUP +-#line 1106 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH(*driver.loc.back()); } ++#line 1107 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_GT(*driver.loc.back()); } + YY_BREAK + case 470: + YY_RULE_SETUP +-#line 1107 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_LE(*driver.loc.back()); } ++#line 1108 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH_FROM_FILE(*driver.loc.back()); } + YY_BREAK + case 471: + YY_RULE_SETUP +-#line 1108 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_LT(*driver.loc.back()); } ++#line 1109 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH(*driver.loc.back()); } + YY_BREAK + case 472: + YY_RULE_SETUP +-#line 1109 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM_FROM_FILE(*driver.loc.back()); } ++#line 1110 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_LE(*driver.loc.back()); } + YY_BREAK + case 473: + YY_RULE_SETUP +-#line 1110 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM(*driver.loc.back()); } ++#line 1111 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_LT(*driver.loc.back()); } + YY_BREAK + case 474: + YY_RULE_SETUP +-#line 1111 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RBL( *driver.loc.back()); } ++#line 1112 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM_FROM_FILE(*driver.loc.back()); } + YY_BREAK + case 475: + YY_RULE_SETUP +-#line 1112 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX(*driver.loc.back()); } ++#line 1113 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM(*driver.loc.back()); } + YY_BREAK + case 476: + YY_RULE_SETUP +-#line 1113 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX_GLOBAL(*driver.loc.back()); } ++#line 1114 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RBL( *driver.loc.back()); } + YY_BREAK + case 477: + YY_RULE_SETUP +-#line 1114 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_EQ(*driver.loc.back()); } ++#line 1115 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX(*driver.loc.back()); } + YY_BREAK + case 478: + YY_RULE_SETUP +-#line 1115 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_MATCH(*driver.loc.back()); } ++#line 1116 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX_GLOBAL(*driver.loc.back()); } + YY_BREAK + case 479: + YY_RULE_SETUP +-#line 1116 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_BEGINS_WITH(*driver.loc.back()); } ++#line 1117 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_EQ(*driver.loc.back()); } + YY_BREAK + case 480: + YY_RULE_SETUP +-#line 1117 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_INSPECT_FILE(*driver.loc.back()); } ++#line 1118 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_MATCH(*driver.loc.back()); } + YY_BREAK + case 481: + YY_RULE_SETUP +-#line 1118 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_FUZZY_HASH(*driver.loc.back()); } ++#line 1119 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_BEGINS_WITH(*driver.loc.back()); } + YY_BREAK + case 482: + YY_RULE_SETUP +-#line 1119 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_BYTE_RANGE(*driver.loc.back()); } ++#line 1120 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_INSPECT_FILE(*driver.loc.back()); } + YY_BREAK + case 483: + YY_RULE_SETUP +-#line 1120 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_DTD(*driver.loc.back()); } ++#line 1121 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_FUZZY_HASH(*driver.loc.back()); } + YY_BREAK + case 484: + YY_RULE_SETUP +-#line 1121 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_HASH(*driver.loc.back()); } ++#line 1122 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_BYTE_RANGE(*driver.loc.back()); } + YY_BREAK + case 485: + YY_RULE_SETUP +-#line 1122 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_SCHEMA(*driver.loc.back()); } ++#line 1123 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_DTD(*driver.loc.back()); } + YY_BREAK + case 486: + YY_RULE_SETUP +-#line 1123 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CC(*driver.loc.back()); } ++#line 1124 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_HASH(*driver.loc.back()); } + YY_BREAK + case 487: + YY_RULE_SETUP +-#line 1124 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CPF(*driver.loc.back()); } ++#line 1125 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_SCHEMA(*driver.loc.back()); } + YY_BREAK + case 488: + YY_RULE_SETUP +-#line 1125 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SSN(*driver.loc.back()); } ++#line 1126 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CC(*driver.loc.back()); } + YY_BREAK + case 489: + YY_RULE_SETUP +-#line 1126 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SVNR(*driver.loc.back()); } ++#line 1127 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CPF(*driver.loc.back()); } + YY_BREAK + case 490: + YY_RULE_SETUP +-#line 1127 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_GSB_LOOKUP(*driver.loc.back()); } ++#line 1128 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SSN(*driver.loc.back()); } + YY_BREAK + case 491: + YY_RULE_SETUP +-#line 1128 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RSUB(*driver.loc.back()); } ++#line 1129 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SVNR(*driver.loc.back()); } + YY_BREAK + case 492: + YY_RULE_SETUP + #line 1130 "seclang-scanner.ll" +-{ return p::make_NOT(*driver.loc.back()); } ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_GSB_LOOKUP(*driver.loc.back()); } + YY_BREAK + case 493: + YY_RULE_SETUP + #line 1131 "seclang-scanner.ll" +-{ BEGIN_NO_OP_INFORMED(); yyless(0); } ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RSUB(*driver.loc.back()); } + YY_BREAK +- +- + case 494: + YY_RULE_SETUP +-#line 1136 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_SPACE); } ++#line 1133 "seclang-scanner.ll" ++{ return p::make_NOT(*driver.loc.back()); } + YY_BREAK +- +- + case 495: + YY_RULE_SETUP +-#line 1140 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_QUOTE); } ++#line 1134 "seclang-scanner.ll" ++{ BEGIN_NO_OP_INFORMED(); yyless(0); } + YY_BREAK + + + case 496: + YY_RULE_SETUP +-#line 1144 "seclang-scanner.ll" +-{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } ++#line 1139 "seclang-scanner.ll" ++{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_SPACE); } + YY_BREAK ++ ++ + case 497: +-/* rule 497 can match eol */ + YY_RULE_SETUP +-#line 1145 "seclang-scanner.ll" +-{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1143 "seclang-scanner.ll" ++{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_QUOTE); } + YY_BREAK + + + case 498: + YY_RULE_SETUP +-#line 1149 "seclang-scanner.ll" ++#line 1147 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 499: + /* rule 499 can match eol */ + YY_RULE_SETUP +-#line 1150 "seclang-scanner.ll" ++#line 1148 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 500: + YY_RULE_SETUP +-#line 1153 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } ++#line 1152 "seclang-scanner.ll" ++{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 501: ++/* rule 501 can match eol */ + YY_RULE_SETUP +-#line 1154 "seclang-scanner.ll" +-{ BEGIN(LEXING_ERROR); yyless(0); } ++#line 1153 "seclang-scanner.ll" ++{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 502: + YY_RULE_SETUP +-#line 1158 "seclang-scanner.ll" +-{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } ++#line 1156 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + case 503: +-/* rule 503 can match eol */ + YY_RULE_SETUP +-#line 1159 "seclang-scanner.ll" +-{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1157 "seclang-scanner.ll" ++{ BEGIN(LEXING_ERROR); yyless(0); } + YY_BREAK + + + case 504: + YY_RULE_SETUP +-#line 1163 "seclang-scanner.ll" ++#line 1161 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 505: + /* rule 505 can match eol */ + YY_RULE_SETUP +-#line 1164 "seclang-scanner.ll" ++#line 1162 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 506: + YY_RULE_SETUP +-#line 1168 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } ++#line 1166 "seclang-scanner.ll" ++{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 507: ++/* rule 507 can match eol */ + YY_RULE_SETUP +-#line 1169 "seclang-scanner.ll" +-{ BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } ++#line 1167 "seclang-scanner.ll" ++{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 508: + YY_RULE_SETUP +-#line 1174 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++#line 1171 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + case 509: +-/* rule 509 can match eol */ + YY_RULE_SETUP +-#line 1176 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++#line 1172 "seclang-scanner.ll" ++{ BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } + YY_BREAK ++ ++ + case 510: +-/* rule 510 can match eol */ + YY_RULE_SETUP + #line 1177 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 511: + /* rule 511 can match eol */ + YY_RULE_SETUP +-#line 1178 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++#line 1179 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 512: + /* rule 512 can match eol */ + YY_RULE_SETUP +-#line 1179 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++#line 1180 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 513: + /* rule 513 can match eol */ + YY_RULE_SETUP + #line 1181 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 514: + /* rule 514 can match eol */ + YY_RULE_SETUP + #line 1182 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 515: + /* rule 515 can match eol */ + YY_RULE_SETUP +-#line 1183 "seclang-scanner.ll" ++#line 1184 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 516: + /* rule 516 can match eol */ + YY_RULE_SETUP +-#line 1184 "seclang-scanner.ll" ++#line 1185 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 517: + /* rule 517 can match eol */ + YY_RULE_SETUP + #line 1186 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 518: + /* rule 518 can match eol */ + YY_RULE_SETUP + #line 1187 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 519: + /* rule 519 can match eol */ + YY_RULE_SETUP +-#line 1188 "seclang-scanner.ll" ++#line 1189 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 520: + /* rule 520 can match eol */ + YY_RULE_SETUP +-#line 1189 "seclang-scanner.ll" ++#line 1190 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 521: ++/* rule 521 can match eol */ + YY_RULE_SETUP + #line 1191 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 522: + /* rule 522 can match eol */ + YY_RULE_SETUP +-#line 1193 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++#line 1192 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 523: +-/* rule 523 can match eol */ + YY_RULE_SETUP + #line 1194 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 524: + /* rule 524 can match eol */ +@@ -8382,78 +8387,90 @@ YY_RULE_SETUP + case 526: + /* rule 526 can match eol */ + YY_RULE_SETUP +-#line 1198 "seclang-scanner.ll" ++#line 1199 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 527: + /* rule 527 can match eol */ + YY_RULE_SETUP +-#line 1199 "seclang-scanner.ll" ++#line 1200 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 528: ++/* rule 528 can match eol */ + YY_RULE_SETUP + #line 1201 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK +- +- + case 529: ++/* rule 529 can match eol */ + YY_RULE_SETUP +-#line 1206 "seclang-scanner.ll" +-{ } ++#line 1202 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 530: +-/* rule 530 can match eol */ + YY_RULE_SETUP +-#line 1207 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); } ++#line 1204 "seclang-scanner.ll" ++{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK ++ ++ + case 531: +-/* rule 531 can match eol */ + YY_RULE_SETUP +-#line 1208 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); } ++#line 1209 "seclang-scanner.ll" ++{ } + YY_BREAK +- +- + case 532: + /* rule 532 can match eol */ + YY_RULE_SETUP +-#line 1212 "seclang-scanner.ll" ++#line 1210 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 533: + /* rule 533 can match eol */ + YY_RULE_SETUP +-#line 1213 "seclang-scanner.ll" ++#line 1211 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK ++ ++ + case 534: + /* rule 534 can match eol */ + YY_RULE_SETUP +-#line 1214 "seclang-scanner.ll" +-{ BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } ++#line 1215 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK +- + case 535: ++/* rule 535 can match eol */ + YY_RULE_SETUP +-#line 1219 "seclang-scanner.ll" +-{ BEGIN(LEXING_ERROR); yyless(0); } ++#line 1216 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 536: ++/* rule 536 can match eol */ + YY_RULE_SETUP +-#line 1221 "seclang-scanner.ll" +-{ driver.error (*driver.loc.back(), "Invalid input: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++#line 1217 "seclang-scanner.ll" ++{ BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK ++ + case 537: + YY_RULE_SETUP + #line 1222 "seclang-scanner.ll" +-{ driver.error (*driver.loc.back(), "Expecting an action, got: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++{ BEGIN(LEXING_ERROR); yyless(0); } + YY_BREAK + case 538: + YY_RULE_SETUP +-#line 1223 "seclang-scanner.ll" ++#line 1224 "seclang-scanner.ll" ++{ driver.error (*driver.loc.back(), "Invalid input: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++ YY_BREAK ++case 539: ++YY_RULE_SETUP ++#line 1225 "seclang-scanner.ll" ++{ driver.error (*driver.loc.back(), "Expecting an action, got: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++ YY_BREAK ++case 540: ++YY_RULE_SETUP ++#line 1226 "seclang-scanner.ll" + { driver.error (*driver.loc.back(), "Expecting a variable, got: : ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } + YY_BREAK + case YY_STATE_EOF(INITIAL): +@@ -8492,7 +8509,7 @@ case YY_STATE_EOF(SETVAR_ACTION_QUOTED): + case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_COLLECTION_ELEM): + case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_OPERATION): + case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_CONTENT): +-#line 1226 "seclang-scanner.ll" ++#line 1229 "seclang-scanner.ll" + { + if (yyin) { + fclose(yyin); +@@ -8508,9 +8525,9 @@ case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_CONTENT): + delete l; + } + YY_BREAK +-case 539: ++case 541: + YY_RULE_SETUP +-#line 1242 "seclang-scanner.ll" ++#line 1245 "seclang-scanner.ll" + { + std::string err; + const char *file = strchr(yytext, ' ') + 1; +@@ -8538,9 +8555,9 @@ YY_RULE_SETUP + } + } + YY_BREAK +-case 540: ++case 542: + YY_RULE_SETUP +-#line 1269 "seclang-scanner.ll" ++#line 1272 "seclang-scanner.ll" + { + std::string err; + const char *file = strchr(yytext, ' ') + 1; +@@ -8571,10 +8588,10 @@ YY_RULE_SETUP + free(f); + } + YY_BREAK +-case 541: +-/* rule 541 can match eol */ ++case 543: ++/* rule 543 can match eol */ + YY_RULE_SETUP +-#line 1299 "seclang-scanner.ll" ++#line 1302 "seclang-scanner.ll" + { + HttpsClient c; + std::string key; +@@ -8610,12 +8627,12 @@ YY_RULE_SETUP + yy_scan_string(c.content.c_str()); + } + YY_BREAK +-case 542: ++case 544: + YY_RULE_SETUP +-#line 1335 "seclang-scanner.ll" ++#line 1338 "seclang-scanner.ll" + ECHO; + YY_BREAK +-#line 8619 "seclang-scanner.cc" ++#line 8636 "seclang-scanner.cc" + + case YY_END_OF_BUFFER: + { +@@ -8934,7 +8951,7 @@ static int yy_get_next_buffer (void) + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 3953 ) ++ if ( yy_current_state >= 3966 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; +@@ -8967,11 +8984,11 @@ static int yy_get_next_buffer (void) + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 3953 ) ++ if ( yy_current_state >= 3966 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; +- yy_is_jam = (yy_current_state == 3952); ++ yy_is_jam = (yy_current_state == 3965); + + return yy_is_jam ? 0 : yy_current_state; + } +@@ -9720,7 +9737,7 @@ void yyfree (void * ptr ) + + /* %ok-for-header */ + +-#line 1335 "seclang-scanner.ll" ++#line 1338 "seclang-scanner.ll" + + + namespace modsecurity { +diff --git a/src/parser/seclang-scanner.ll b/src/parser/seclang-scanner.ll +index 8f26cd6f..4cb12685 100755 +--- a/src/parser/seclang-scanner.ll ++++ b/src/parser/seclang-scanner.ll +@@ -253,6 +253,7 @@ VARIABLE_REQUEST_HEADERS (?i:REQUEST_HEADERS) + VARIABLE_RESPONSE_HEADERS (?i:RESPONSE_HEADERS) + VARIABLE_GEO (?i:GEO) + VARIABLE_REQUEST_COOKIES_NAMES (?i:REQUEST_COOKIES_NAMES) ++VARIABLE_MULTIPART_PART_HEADERS (?i:MULTIPART_PART_HEADERS) + VARIABLE_RULE (?i:RULE) + VARIABLE_SESSION (?i:(SESSION)) + VARIABLE_IP (?i:(IP)) +@@ -996,6 +997,8 @@ EQUALS_MINUS (?i:=\-) + {VARIABLE_GEO}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_GEO(*driver.loc.back()); } + {VARIABLE_REQUEST_COOKIES_NAMES} { return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } + {VARIABLE_REQUEST_COOKIES_NAMES}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } ++{VARIABLE_MULTIPART_PART_HEADERS} { return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } ++{VARIABLE_MULTIPART_PART_HEADERS}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } + {VARIABLE_RULE} { return p::make_VARIABLE_RULE(*driver.loc.back()); } + {VARIABLE_RULE}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RULE(*driver.loc.back()); } + {VARIABLE_FILES_TMP_NAMES} { return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } +diff --git a/src/request_body_processor/multipart.cc b/src/request_body_processor/multipart.cc +index 310b7bcb..5686725b 100644 +--- a/src/request_body_processor/multipart.cc ++++ b/src/request_body_processor/multipart.cc +@@ -102,8 +102,11 @@ Multipart::Multipart(const std::string &header, Transaction *transaction) + m_bufptr(NULL), + m_bufleft(0), + m_buf_offset(0), ++ m_crlf_state(0), ++ m_crlf_state_buf_end(0), + m_mpp(NULL), + m_mpp_state(0), ++ m_mpp_substate_part_data_read(0), + m_reserve{0}, + m_seen_data(0), + m_is_complete(0), +@@ -504,6 +507,8 @@ int Multipart::process_part_data(std::string *error, size_t offset) { + char localreserve[2] = { '\0', '\0' }; /* initialized to quiet warning */ + int bytes_reserved = 0; + ++ m_mpp_substate_part_data_read = 1; ++ + /* Preserve some bytes for later. */ + if (((MULTIPART_BUF_SIZE - m_bufleft) >= 1) && (*(p - 1) == '\n')) { + if (((MULTIPART_BUF_SIZE - m_bufleft) >= 2) && (*(p - 2) == '\r')) { +@@ -697,6 +702,7 @@ int Multipart::process_part_header(std::string *error, int offset) { + + /* Check for nul bytes. */ + len = MULTIPART_BUF_SIZE - m_bufleft; ++ int len_without_termination = len - 1; + for (i = 0; i < len; i++) { + if (m_buf[i] == '\0') { + ms_dbg_a(m_transaction, 1, +@@ -714,6 +720,7 @@ int Multipart::process_part_header(std::string *error, int offset) { + if (len > 1) { + if (m_buf[len - 2] == '\r') { + m_flag_crlf_line = 1; ++ len_without_termination--; + } else { + m_flag_lf_line = 1; + } +@@ -727,6 +734,13 @@ int Multipart::process_part_header(std::string *error, int offset) { + std::string header_value(""); + int rc; + ++ /* record the previous completed header */ ++ if (!m_mpp->m_last_header_line.empty()) { ++ m_mpp->m_header_lines.push_back(std::make_pair( ++ offset-m_mpp->m_last_header_line.length(), m_mpp->m_last_header_line)); ++ m_mpp->m_last_header_line.assign(""); ++ } ++ + if (m_mpp->m_headers.count("Content-Disposition") == 0) { + ms_dbg_a(m_transaction, 1, + "Multipart: Part missing Content-Disposition header."); +@@ -787,6 +801,7 @@ int Multipart::process_part_header(std::string *error, int offset) { + } + + m_mpp_state = 1; ++ m_mpp_substate_part_data_read = 0; + m_mpp->m_last_header_name.assign(""); + } else { /* Header line. */ + if (isspace(m_buf[0])) { +@@ -848,12 +863,21 @@ int Multipart::process_part_header(std::string *error, int offset) { + error->assign("Multipart: Part header too long."); + return false; + } ++ ++ m_mpp->m_last_header_line = m_mpp->m_last_header_name + ": " + new_value; + } else { + char *data; + std::string header_value; + std::string header_name; + /* new header */ + ++ /* record the previous completed header */ ++ if (!m_mpp->m_last_header_line.empty()) { ++ m_mpp->m_header_lines.push_back(std::make_pair( ++ offset-m_mpp->m_last_header_line.length(), m_mpp->m_last_header_line)); ++ m_mpp->m_last_header_line.assign(""); ++ } ++ + data = m_buf; + while ((*data != ':') && (*data != '\0')) { + data++; +@@ -910,6 +934,11 @@ int Multipart::process_part_header(std::string *error, int offset) { + ms_dbg_a(m_transaction, 9, + "Multipart: Added part header \"" + header_name \ + + "\" \"" + header_value + "\"."); ++ if (len_without_termination > 0) { ++ m_mpp->m_last_header_line.assign(m_buf); ++ } else { ++ m_mpp->m_last_header_line.assign(""); ++ } + } + } + +@@ -920,6 +949,13 @@ int Multipart::process_part_header(std::string *error, int offset) { + int Multipart::process_boundary(int last_part) { + /* if there was a part being built finish it */ + if (m_mpp != NULL) { ++ /* record all the part header lines from the part into the transaction collection */ ++ for (const auto& header_line : m_mpp->m_header_lines) { ++ m_transaction->m_variableMultipartPartHeaders.set(m_mpp->m_name, ++ header_line.second, header_line.first); ++ ms_dbg_a(m_transaction, 9, "Multipart: Added part header line:" + header_line.second ); ++ } ++ + /* close the temp file */ + if ((m_mpp->m_type == MULTIPART_FILE) && (m_mpp->m_tmp_file) + && (m_mpp->m_tmp_file->isValid())) { +@@ -972,6 +1008,7 @@ int Multipart::process_boundary(int last_part) { + m_mpp = new MultipartPart(); + + m_mpp_state = 0; ++ m_mpp_substate_part_data_read = 0; + + m_reserve[0] = 0; + m_reserve[1] = 0; +@@ -1099,6 +1136,33 @@ int Multipart::multipart_complete(std::string *error) { + m_boundary.size()) == 0) + && (*(m_buf + 2 + m_boundary.size()) == '-') + && (*(m_buf + 2 + m_boundary.size() + 1) == '-')) { ++ // these next two checks may result in repeating work from earlier in this fn ++ // ignore the duplication for now to minimize refactoring ++ if ((m_crlf_state_buf_end == 2) && (m_flag_lf_line != 1)) { ++ m_flag_lf_line = 1; ++ m_transaction->m_variableMultipartLFLine.set(std::to_string(m_flag_lf_line), ++ m_transaction->m_variableOffset); ++ m_transaction->m_variableMultipartCrlfLFLines.set(std::to_string(m_flag_crlf_line && m_flag_lf_line), ++ m_transaction->m_variableOffset); ++ if (m_flag_crlf_line && m_flag_lf_line) { ++ ms_dbg_a(m_transaction, 4, "Multipart: Warning: mixed line endings used (CRLF/LF)."); ++ } else if (m_flag_lf_line) { ++ ms_dbg_a(m_transaction, 4, "Multipart: Warning: incorrect line endings used (LF)."); ++ } ++ m_transaction->m_variableMultipartStrictError.set( ++ std::to_string(m_flag_lf_line) , m_transaction->m_variableOffset); ++ } ++ if ((m_mpp_substate_part_data_read == 0) && (m_flag_invalid_part != 1)) { ++ // it looks like the final boundary, but it's where part data should begin ++ m_flag_invalid_part = 1; ++ ms_dbg_a(m_transaction, 3, "Multipart: Invalid part (data contains final boundary)"); ++ m_transaction->m_variableMultipartStrictError.set( ++ std::to_string(m_flag_invalid_part) , m_transaction->m_variableOffset); ++ m_transaction->m_variableMultipartInvalidPart.set(std::to_string(m_flag_invalid_part), ++ m_transaction->m_variableOffset); ++ ms_dbg_a(m_transaction, 4, "Multipart: Warning: invalid part parsing."); ++ } ++ + /* Looks like the final boundary - process it. */ + if (process_boundary(1 /* final */) < 0) { + m_flag_error = 1; +@@ -1493,70 +1557,80 @@ bool Multipart::process(const std::string& data, std::string *error, + if ((strlen(m_buf) >= m_boundary.size() + 2) + && (strncmp(m_buf + 2, m_boundary.c_str(), + m_boundary.size()) == 0)) { +- char *boundary_end = m_buf + 2 + m_boundary.size(); +- /* if it match, AND there was a matched boundary at least, +- set the m_flag_unmatched_boundary flag to 2 +- this indicates that there were an opened boundary, which +- matches the reference, and here is the final boundary. +- The flag will differ from 0, so the previous rules ("!@eq 0") +- will catch all "errors", without any modification, but we can +- use the new, permission mode with "@eq 1" +- */ +- if (m_boundary_count > 0) { +- m_flag_unmatched_boundary = 2; +- } +- int is_final = 0; ++ if (m_crlf_state_buf_end == 2) { ++ m_flag_lf_line = 1; ++ } ++ if ((m_mpp_substate_part_data_read == 0) && (m_boundary_count > 0)) { ++ /* string matches our boundary, but it's where part data should begin */ ++ m_flag_invalid_part = 1; ++ ms_dbg_a(m_transaction, 3, "Multipart: Invalid part (data contains boundary)"); + +- /* Is this the final boundary? */ +- if ((*boundary_end == '-') +- && (*(boundary_end + 1)== '-')) { +- is_final = 1; +- boundary_end += 2; ++ } else { ++ char *boundary_end = m_buf + 2 + m_boundary.size(); ++ /* if it match, AND there was a matched boundary at least, ++ set the m_flag_unmatched_boundary flag to 2 ++ this indicates that there were an opened boundary, which ++ matches the reference, and here is the final boundary. ++ The flag will differ from 0, so the previous rules ("!@eq 0") ++ will catch all "errors", without any modification, but we can ++ use the new, permission mode with "@eq 1" ++ */ ++ if (m_boundary_count > 0) { ++ m_flag_unmatched_boundary = 2; ++ } ++ int is_final = 0; ++ ++ /* Is this the final boundary? */ ++ if ((*boundary_end == '-') ++ && (*(boundary_end + 1)== '-')) { ++ is_final = 1; ++ boundary_end += 2; ++ ++ if (m_is_complete != 0) { ++ m_flag_error = 1; ++ ms_dbg_a(m_transaction, 4, ++ "Multipart: Invalid boundary " \ ++ "(final duplicate)."); ++ ++ error->assign("Multipart: Invalid boundary " \ ++ "(final duplicate)."); ++ return false; ++ } ++ } + +- if (m_is_complete != 0) { +- m_flag_error = 1; +- ms_dbg_a(m_transaction, 4, +- "Multipart: Invalid boundary " \ +- "(final duplicate)."); ++ /* Allow for CRLF and LF line endings. */ ++ if (((*boundary_end == '\r') ++ && (*(boundary_end + 1) == '\n') ++ && (*(boundary_end + 2) == '\0')) ++ || ((*boundary_end == '\n') ++ && (*(boundary_end + 1) == '\0'))) { ++ if (*boundary_end == '\n') { ++ m_flag_lf_line = 1; ++ } else { ++ m_flag_crlf_line = 1; ++ } + +- error->assign("Multipart: Invalid boundary " \ +- "(final duplicate)."); +- return false; +- } +- } ++ if (process_boundary((is_final ? 1 : 0)) < 0) { ++ m_flag_error = true; ++ return false; ++ } + +- /* Allow for CRLF and LF line endings. */ +- if (((*boundary_end == '\r') +- && (*(boundary_end + 1) == '\n') +- && (*(boundary_end + 2) == '\0')) +- || ((*boundary_end == '\n') +- && (*(boundary_end + 1) == '\0'))) { +- if (*boundary_end == '\n') { +- m_flag_lf_line = 1; +- } else { +- m_flag_crlf_line = 1; +- } ++ if (is_final) { ++ m_is_complete = 1; ++ } + +- if (process_boundary((is_final ? 1 : 0)) < 0) { +- m_flag_error = true; ++ processed_as_boundary = 1; ++ m_boundary_count++; ++ } else { ++ /* error */ ++ m_flag_error = 1; ++ ms_dbg_a(m_transaction, 4, ++ "Multipart: Invalid boundary: " \ ++ + std::string(m_buf)); ++ error->assign("Multipart: Invalid boundary: " \ ++ + std::string(m_buf)); + return false; + } +- +- if (is_final) { +- m_is_complete = 1; +- } +- +- processed_as_boundary = 1; +- m_boundary_count++; +- } else { +- /* error */ +- m_flag_error = 1; +- ms_dbg_a(m_transaction, 4, +- "Multipart: Invalid boundary: " \ +- + std::string(m_buf)); +- error->assign("Multipart: Invalid boundary: " \ +- + std::string(m_buf)); +- return false; + } + } else { /* It looks like a boundary but */ + /* we couldn't match it. */ +@@ -1667,8 +1741,25 @@ bool Multipart::process(const std::string& data, std::string *error, + m_bufptr = m_buf; + m_bufleft = MULTIPART_BUF_SIZE; + m_buf_contains_line = (c == 0x0a) ? 1 : 0; ++ ++ if (c == 0x0a) { ++ if (m_crlf_state == 1) { ++ m_crlf_state = 3; ++ } else { ++ m_crlf_state = 2; ++ } ++ } ++ m_crlf_state_buf_end = m_crlf_state; ++ + } + ++ if (c == 0x0d) { ++ m_crlf_state = 1; ++ } else if (c != 0x0a) { ++ m_crlf_state = 0; ++ } ++ ++ + if ((m_is_complete) && (inleft != 0)) { + m_flag_data_after = 1; + ms_dbg_a(m_transaction, 4, +diff --git a/src/request_body_processor/multipart.h b/src/request_body_processor/multipart.h +index 185656e7..bfada4b9 100644 +--- a/src/request_body_processor/multipart.h ++++ b/src/request_body_processor/multipart.h +@@ -138,6 +138,9 @@ class MultipartPart { + std::string m_last_header_name; + std::unordered_map, + MyHash, MyEqual> m_headers; ++ std::string m_last_header_line; ++ std::vector> m_header_lines; ++ + + unsigned int m_offset; + unsigned int m_length; +@@ -186,6 +189,15 @@ class Multipart { + + unsigned int m_buf_offset; + ++ /* line ending status seen immediately before current position. ++ * 0 = neither LF nor CR; 1 = prev char CR; 2 = prev char LF alone; ++ * 3 = prev two chars were CRLF ++ */ ++ int m_crlf_state; ++ ++ /* crlf_state at end of previous buffer */ ++ int m_crlf_state_buf_end; ++ + /* pointer that keeps track of a part while + * it is being built + */ +@@ -197,6 +209,14 @@ class Multipart { + */ + int m_mpp_state; + ++ /* part parsing substate; if mpp_state is 1 (collecting ++ * data), then for this variable: ++ * 0 means we have not yet read any data between the ++ * post-headers blank line and the next boundary ++ * 1 means we have read at some data after that blank line ++ */ ++ int m_mpp_substate_part_data_read; ++ + /* because of the way this parsing algorithm + * works we hold back the last two bytes of + * each data chunk so that we can discard it +diff --git a/src/variables/multipart_part_headers.h b/src/variables/multipart_part_headers.h +new file mode 100644 +index 00000000..9af328eb +--- /dev/null ++++ b/src/variables/multipart_part_headers.h +@@ -0,0 +1,40 @@ ++/* ++ * ModSecurity, http://www.modsecurity.org/ ++ * Copyright (c) 2022 Trustwave Holdings, Inc. (http://www.trustwave.com/) ++ * ++ * You may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * If any of the files related to licensing are missing or if you have any ++ * other questions related to licensing please contact Trustwave Holdings, Inc. ++ * directly using the email address security at modsecurity.org. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#ifndef SRC_VARIABLES_MULTIPART_PART_HEADERS_H_ ++#define SRC_VARIABLES_MULTIPART_PART_HEADERS_H_ ++ ++#include "src/variables/variable.h" ++ ++namespace modsecurity { ++ ++class Transaction; ++namespace variables { ++ ++ ++DEFINE_VARIABLE_DICT(MultipartPartHeaders, MULTIPART_PART_HEADERS, ++ m_variableMultipartPartHeaders) ++ ++ ++} // namespace variables ++} // namespace modsecurity ++ ++#endif // SRC_VARIABLES_MULTIPART_PART_HEADERS_H_ +diff --git a/test/cppcheck_suppressions.txt b/test/cppcheck_suppressions.txt +index 5a8eb58a..1f455e7d 100644 +--- a/test/cppcheck_suppressions.txt ++++ b/test/cppcheck_suppressions.txt +@@ -54,7 +54,7 @@ duplicateBranch:src/request_body_processor/multipart.cc:93 + danglingTempReference:src/modsecurity.cc:206 + knownConditionTrueFalse:src/operators/validate_url_encoding.cc:77 + knownConditionTrueFalse:src/operators/verify_svnr.cc:87 +-rethrowNoCurrentException:headers/modsecurity/transaction.h:307 ++rethrowNoCurrentException:headers/modsecurity/transaction.h:309 + rethrowNoCurrentException:src/rule_with_actions.cc:123 + ctunullpointer:src/rule_with_actions.cc:237 + ctunullpointer:src/rule_with_operator.cc:135 +diff --git a/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json b/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json +new file mode 100644 +index 00000000..6caf58f0 +--- /dev/null ++++ b/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json +@@ -0,0 +1,166 @@ ++[ ++ { ++ "enabled":1, ++ "version_min":300000, ++ "title":"Testing Variables :: MULTIPART_PART_HEADERS (all headers)", ++ "client":{ ++ "ip":"200.249.12.31", ++ "port":123 ++ }, ++ "server":{ ++ "ip":"200.249.12.31", ++ "port":80 ++ }, ++ "request":{ ++ "headers":{ ++ "Host":"localhost", ++ "User-Agent":"curl/7.38.0", ++ "Accept":"*/*", ++ "Content-Length":"330", ++ "Content-Type":"multipart/form-data; boundary=-----------------------------69343412719991675451336310646", ++ "Expect":"100-continue" ++ }, ++ "uri":"/", ++ "method":"POST", ++ "body":[ ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm1", ++ "Content-Type: image/jpeg", ++ "", ++ "1", ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm2", ++ "", ++ "2", ++ "-------------------------------69343412719991675451336310646--" ++ ] ++ }, ++ "response":{ ++ "headers":{ ++ "Date":"Mon, 13 Jul 2015 20:02:41 GMT", ++ "Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT", ++ "Content-Type":"text/html" ++ }, ++ "body":[ ++ "no need." ++ ] ++ }, ++ "expected":{ ++ "http_code": 403, ++ "debug_log":"Variable: MULTIPART_PART_HEADERS:parm1.*Rule returned 1" ++ }, ++ "rules":[ ++ "SecRuleEngine On", ++ "SecRule MULTIPART_PART_HEADERS \"@rx content-type:.*jpeg\" \"phase:2,deny,status:403,id:500074,t:lowercase\"" ++ ] ++ }, ++ { ++ "enabled":1, ++ "version_min":300000, ++ "title":"Testing Variables :: MULTIPART_PART_HEADERS (specific header - match)", ++ "client":{ ++ "ip":"200.249.12.31", ++ "port":123 ++ }, ++ "server":{ ++ "ip":"200.249.12.31", ++ "port":80 ++ }, ++ "request":{ ++ "headers":{ ++ "Host":"localhost", ++ "User-Agent":"curl/7.38.0", ++ "Accept":"*/*", ++ "Content-Length":"330", ++ "Content-Type":"multipart/form-data; boundary=-----------------------------69343412719991675451336310646", ++ "Expect":"100-continue" ++ }, ++ "uri":"/", ++ "method":"POST", ++ "body":[ ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm1", ++ "Content-Type: image/jpeg", ++ "", ++ "1", ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm2", ++ "", ++ "2", ++ "-------------------------------69343412719991675451336310646--" ++ ] ++ }, ++ "response":{ ++ "headers":{ ++ "Date":"Mon, 13 Jul 2015 20:02:41 GMT", ++ "Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT", ++ "Content-Type":"text/html" ++ }, ++ "body":[ ++ "no need." ++ ] ++ }, ++ "expected":{ ++ "http_code": 403, ++ "debug_log":"Variable: MULTIPART_PART_HEADERS:parm1.*Rule returned 1" ++ }, ++ "rules":[ ++ "SecRuleEngine On", ++ "SecRule MULTIPART_PART_HEADERS:parm1 \"@rx content-type:.*jpeg\" \"phase:2,deny,status:403,id:500074,t:lowercase\"" ++ ] ++ }, ++ { ++ "enabled":1, ++ "version_min":300000, ++ "title":"Testing Variables :: MULTIPART_PART_HEADERS (specific header - no match)", ++ "client":{ ++ "ip":"200.249.12.31", ++ "port":123 ++ }, ++ "server":{ ++ "ip":"200.249.12.31", ++ "port":80 ++ }, ++ "request":{ ++ "headers":{ ++ "Host":"localhost", ++ "User-Agent":"curl/7.38.0", ++ "Accept":"*/*", ++ "Content-Length":"330", ++ "Content-Type":"multipart/form-data; boundary=-----------------------------69343412719991675451336310646", ++ "Expect":"100-continue" ++ }, ++ "uri":"/", ++ "method":"POST", ++ "body":[ ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm1", ++ "Content-Type: image/jpeg", ++ "", ++ "1", ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm2", ++ "", ++ "2", ++ "-------------------------------69343412719991675451336310646--" ++ ] ++ }, ++ "response":{ ++ "headers":{ ++ "Date":"Mon, 13 Jul 2015 20:02:41 GMT", ++ "Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT", ++ "Content-Type":"text/html" ++ }, ++ "body":[ ++ "no need." ++ ] ++ }, ++ "expected":{ ++ "http_code": 200 ++ }, ++ "rules":[ ++ "SecRuleEngine On", ++ "SecRule MULTIPART_PART_HEADERS:parm2 \"@rx content-type:.*jpeg\" \"phase:2,deny,status:403,id:500074,t:lowercase\"" ++ ] ++ } ++] +-- +2.37.2 + diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 916ba8fbcb..1fd11034a0 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -15,6 +15,9 @@ LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity # We're patching build/libmaxmind.m4 and build/pcre.m4 LIBMODSECURITY_AUTORECONF = YES +#0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch +LIBMODSECURITY_IGNORE_CVES += CVE-2022-48279 + LIBMODSECURITY_DEPENDENCIES = pcre2 LIBMODSECURITY_CONF_OPTS = \ --without-pcre \ -- 2.37.2 From frank.vanbever at mind.be Mon Feb 20 15:46:29 2023 From: frank.vanbever at mind.be (Frank Vanbever) Date: Mon, 20 Feb 2023 16:46:29 +0100 Subject: [Buildroot] [PATCH 2022.11.x 1/1] package/libmodsecurity: fix CVE-2022-48279 Message-ID: <20230220154629.58424-1-frank.vanbever@mind.be> In ModSecurity before 2.9.6 and 3.x before 3.0.8, HTTP multipart requests were incorrectly parsed and could bypass the Web Application Firewall. NOTE: this is related to CVE-2022-39956 but can be considered independent changes to the ModSecurity (C language) codebase. Signed-off-by: Frank Vanbever --- ...g-fixes-and-new-MULTIPART_PART_HEADE.patch | 19602 ++++++++++++++++ package/libmodsecurity/libmodsecurity.mk | 3 + 2 files changed, 19605 insertions(+) create mode 100644 package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch diff --git a/package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch b/package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch new file mode 100644 index 0000000000..ebecea983e --- /dev/null +++ b/package/libmodsecurity/0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch @@ -0,0 +1,19602 @@ +From 1abda9e196ff9db978efba3ad770f9a74ae00444 Mon Sep 17 00:00:00 2001 +From: Martin Vierula +Date: Wed, 7 Sep 2022 06:29:20 -0700 +Subject: [PATCH] Multipart parsing fixes and new MULTIPART_PART_HEADERS + collection + +Signed-off-by: Frank Vanbever +--- + CHANGES | 5 + + Makefile.am | 1 + + headers/modsecurity/transaction.h | 2 + + src/parser/seclang-parser.cc | 3226 +++---- + src/parser/seclang-parser.hh | 1342 +-- + src/parser/seclang-parser.yy | 14 + + src/parser/seclang-scanner.cc | 7767 +++++++++-------- + src/parser/seclang-scanner.ll | 3 + + src/request_body_processor/multipart.cc | 205 +- + src/request_body_processor/multipart.h | 20 + + src/variables/multipart_part_headers.h | 40 + + test/cppcheck_suppressions.txt | 2 +- + .../variable-MULTIPART_PART_HEADERS.json | 166 + + 13 files changed, 6606 insertions(+), 6187 deletions(-) + create mode 100644 src/variables/multipart_part_headers.h + create mode 100644 test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json + +diff --git a/CHANGES b/CHANGES +index 2f9cec67..94dcc218 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -1,3 +1,8 @@ ++v3.0.8 backports ++-------------------- ++ - Multipart parsing fixes and new MULTIPART_PART_HEADERS collection ++ [Issue #2795 - @terjanq, @martinhsv] ++ + v3.0.7 - 2022-May-30 + -------------------- + +diff --git a/Makefile.am b/Makefile.am +index 93c3de01..17eb62b0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -225,6 +225,7 @@ TESTS+=test/test-cases/regression/variable-MULTIPART_CRLF_LF_LINES.json + TESTS+=test/test-cases/regression/variable-MULTIPART_FILENAME.json + TESTS+=test/test-cases/regression/variable-MULTIPART_INVALID_HEADER_FOLDING.json + TESTS+=test/test-cases/regression/variable-MULTIPART_NAME.json ++TESTS+=test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json + TESTS+=test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json + TESTS+=test/test-cases/regression/variable-MULTIPART_UNMATCHED_BOUNDARY.json + TESTS+=test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json +diff --git a/headers/modsecurity/transaction.h b/headers/modsecurity/transaction.h +index 194b544c..4244ddd3 100644 +--- a/headers/modsecurity/transaction.h ++++ b/headers/modsecurity/transaction.h +@@ -201,6 +201,7 @@ class TransactionAnchoredVariables { + m_variableGeo(t, "GEO"), + m_variableRequestCookiesNames(t, "REQUEST_COOKIES_NAMES"), + m_variableFilesTmpNames(t, "FILES_TMPNAMES"), ++ m_variableMultipartPartHeaders(t, "MULTIPART_PART_HEADERS"), + m_variableOffset(0), + m_variableArgsNames("ARGS_NAMES", &m_variableArgs), + m_variableArgsGetNames("ARGS_GET_NAMES", &m_variableArgsGet), +@@ -282,6 +283,7 @@ class TransactionAnchoredVariables { + AnchoredSetVariable m_variableGeo; + AnchoredSetVariable m_variableRequestCookiesNames; + AnchoredSetVariable m_variableFilesTmpNames; ++ AnchoredSetVariable m_variableMultipartPartHeaders; + + int m_variableOffset; + +diff --git a/src/parser/seclang-parser.cc b/src/parser/seclang-parser.cc +index 98af1904..c8423b36 100644 +--- a/src/parser/seclang-parser.cc ++++ b/src/parser/seclang-parser.cc +@@ -42,7 +42,7 @@ + + + // Unqualified %code blocks. +-#line 326 "seclang-parser.yy" ++#line 327 "seclang-parser.yy" + + #include "src/parser/driver.h" + +@@ -1318,7 +1318,7 @@ namespace yy { + + + // User initialization code. +-#line 319 "seclang-parser.yy" ++#line 320 "seclang-parser.yy" + { + // Initialize the initial location. + yyla.location.begin.filename = yyla.location.end.filename = new std::string(driver.file); +@@ -1690,7 +1690,7 @@ namespace yy { + switch (yyn) + { + case 2: // input: "end of file" +-#line 713 "seclang-parser.yy" ++#line 715 "seclang-parser.yy" + { + return 0; + } +@@ -1698,7 +1698,7 @@ namespace yy { + break; + + case 6: // audit_log: "CONFIG_DIR_AUDIT_DIR_MOD" +-#line 726 "seclang-parser.yy" ++#line 728 "seclang-parser.yy" + { + driver.m_auditLog->setStorageDirMode(strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 8)); + } +@@ -1706,7 +1706,7 @@ namespace yy { + break; + + case 7: // audit_log: "CONFIG_DIR_AUDIT_DIR" +-#line 732 "seclang-parser.yy" ++#line 734 "seclang-parser.yy" + { + driver.m_auditLog->setStorageDir(yystack_[0].value.as < std::string > ()); + } +@@ -1714,7 +1714,7 @@ namespace yy { + break; + + case 8: // audit_log: "CONFIG_DIR_AUDIT_ENG" "CONFIG_VALUE_RELEVANT_ONLY" +-#line 738 "seclang-parser.yy" ++#line 740 "seclang-parser.yy" + { + driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::RelevantOnlyAuditLogStatus); + } +@@ -1722,7 +1722,7 @@ namespace yy { + break; + + case 9: // audit_log: "CONFIG_DIR_AUDIT_ENG" "CONFIG_VALUE_OFF" +-#line 742 "seclang-parser.yy" ++#line 744 "seclang-parser.yy" + { + driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::OffAuditLogStatus); + } +@@ -1730,7 +1730,7 @@ namespace yy { + break; + + case 10: // audit_log: "CONFIG_DIR_AUDIT_ENG" "CONFIG_VALUE_ON" +-#line 746 "seclang-parser.yy" ++#line 748 "seclang-parser.yy" + { + driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::OnAuditLogStatus); + } +@@ -1738,7 +1738,7 @@ namespace yy { + break; + + case 11: // audit_log: "CONFIG_DIR_AUDIT_FLE_MOD" +-#line 752 "seclang-parser.yy" ++#line 754 "seclang-parser.yy" + { + driver.m_auditLog->setFileMode(strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 8)); + } +@@ -1746,7 +1746,7 @@ namespace yy { + break; + + case 12: // audit_log: "CONFIG_DIR_AUDIT_LOG2" +-#line 758 "seclang-parser.yy" ++#line 760 "seclang-parser.yy" + { + driver.m_auditLog->setFilePath2(yystack_[0].value.as < std::string > ()); + } +@@ -1754,7 +1754,7 @@ namespace yy { + break; + + case 13: // audit_log: "CONFIG_DIR_AUDIT_LOG_P" +-#line 764 "seclang-parser.yy" ++#line 766 "seclang-parser.yy" + { + driver.m_auditLog->setParts(yystack_[0].value.as < std::string > ()); + } +@@ -1762,7 +1762,7 @@ namespace yy { + break; + + case 14: // audit_log: "CONFIG_DIR_AUDIT_LOG" +-#line 770 "seclang-parser.yy" ++#line 772 "seclang-parser.yy" + { + driver.m_auditLog->setFilePath1(yystack_[0].value.as < std::string > ()); + } +@@ -1770,7 +1770,7 @@ namespace yy { + break; + + case 15: // audit_log: CONFIG_DIR_AUDIT_LOG_FMT JSON +-#line 775 "seclang-parser.yy" ++#line 777 "seclang-parser.yy" + { + driver.m_auditLog->setFormat(modsecurity::audit_log::AuditLog::JSONAuditLogFormat); + } +@@ -1778,7 +1778,7 @@ namespace yy { + break; + + case 16: // audit_log: CONFIG_DIR_AUDIT_LOG_FMT NATIVE +-#line 780 "seclang-parser.yy" ++#line 782 "seclang-parser.yy" + { + driver.m_auditLog->setFormat(modsecurity::audit_log::AuditLog::NativeAuditLogFormat); + } +@@ -1786,7 +1786,7 @@ namespace yy { + break; + + case 17: // audit_log: "CONFIG_DIR_AUDIT_STS" +-#line 786 "seclang-parser.yy" ++#line 788 "seclang-parser.yy" + { + std::string relevant_status(yystack_[0].value.as < std::string > ()); + driver.m_auditLog->setRelevantStatus(relevant_status); +@@ -1795,7 +1795,7 @@ namespace yy { + break; + + case 18: // audit_log: "CONFIG_DIR_AUDIT_TPE" "CONFIG_VALUE_SERIAL" +-#line 793 "seclang-parser.yy" ++#line 795 "seclang-parser.yy" + { + driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::SerialAuditLogType); + } +@@ -1803,7 +1803,7 @@ namespace yy { + break; + + case 19: // audit_log: "CONFIG_DIR_AUDIT_TPE" "CONFIG_VALUE_PARALLEL" +-#line 797 "seclang-parser.yy" ++#line 799 "seclang-parser.yy" + { + driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::ParallelAuditLogType); + } +@@ -1811,7 +1811,7 @@ namespace yy { + break; + + case 20: // audit_log: "CONFIG_DIR_AUDIT_TPE" "CONFIG_VALUE_HTTPS" +-#line 801 "seclang-parser.yy" ++#line 803 "seclang-parser.yy" + { + driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::HttpsAuditLogType); + } +@@ -1819,7 +1819,7 @@ namespace yy { + break; + + case 21: // audit_log: "CONFIG_UPDLOAD_KEEP_FILES" "CONFIG_VALUE_ON" +-#line 807 "seclang-parser.yy" ++#line 809 "seclang-parser.yy" + { + driver.m_uploadKeepFiles = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -1827,7 +1827,7 @@ namespace yy { + break; + + case 22: // audit_log: "CONFIG_UPDLOAD_KEEP_FILES" "CONFIG_VALUE_OFF" +-#line 811 "seclang-parser.yy" ++#line 813 "seclang-parser.yy" + { + driver.m_uploadKeepFiles = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -1835,7 +1835,7 @@ namespace yy { + break; + + case 23: // audit_log: "CONFIG_UPDLOAD_KEEP_FILES" "CONFIG_VALUE_RELEVANT_ONLY" +-#line 815 "seclang-parser.yy" ++#line 817 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecUploadKeepFiles RelevantOnly is not currently supported. Accepted values are On or Off"); + YYERROR; +@@ -1844,7 +1844,7 @@ namespace yy { + break; + + case 24: // audit_log: "CONFIG_UPLOAD_FILE_LIMIT" +-#line 820 "seclang-parser.yy" ++#line 822 "seclang-parser.yy" + { + driver.m_uploadFileLimit.m_set = true; + driver.m_uploadFileLimit.m_value = strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 10); +@@ -1853,7 +1853,7 @@ namespace yy { + break; + + case 25: // audit_log: "CONFIG_UPLOAD_FILE_MODE" +-#line 825 "seclang-parser.yy" ++#line 827 "seclang-parser.yy" + { + driver.m_uploadFileMode.m_set = true; + driver.m_uploadFileMode.m_value = strtol(yystack_[0].value.as < std::string > ().c_str(), NULL, 8); +@@ -1862,7 +1862,7 @@ namespace yy { + break; + + case 26: // audit_log: "CONFIG_UPLOAD_DIR" +-#line 830 "seclang-parser.yy" ++#line 832 "seclang-parser.yy" + { + driver.m_uploadDirectory.m_set = true; + driver.m_uploadDirectory.m_value = yystack_[0].value.as < std::string > (); +@@ -1871,7 +1871,7 @@ namespace yy { + break; + + case 27: // audit_log: "CONFIG_UPDLOAD_SAVE_TMP_FILES" "CONFIG_VALUE_ON" +-#line 835 "seclang-parser.yy" ++#line 837 "seclang-parser.yy" + { + driver.m_tmpSaveUploadedFiles = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -1879,7 +1879,7 @@ namespace yy { + break; + + case 28: // audit_log: "CONFIG_UPDLOAD_SAVE_TMP_FILES" "CONFIG_VALUE_OFF" +-#line 839 "seclang-parser.yy" ++#line 841 "seclang-parser.yy" + { + driver.m_tmpSaveUploadedFiles = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -1887,7 +1887,7 @@ namespace yy { + break; + + case 29: // actions: "QUOTATION_MARK" actions_may_quoted "QUOTATION_MARK" +-#line 846 "seclang-parser.yy" ++#line 848 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[1].value.as < std::unique_ptr > > > ()); + } +@@ -1895,7 +1895,7 @@ namespace yy { + break; + + case 30: // actions: actions_may_quoted +-#line 850 "seclang-parser.yy" ++#line 852 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[0].value.as < std::unique_ptr > > > ()); + } +@@ -1903,7 +1903,7 @@ namespace yy { + break; + + case 31: // actions_may_quoted: actions_may_quoted "," act +-#line 857 "seclang-parser.yy" ++#line 859 "seclang-parser.yy" + { + ACTION_INIT(yystack_[0].value.as < std::unique_ptr > (), yystack_[3].location) + yystack_[2].value.as < std::unique_ptr > > > ()->push_back(std::move(yystack_[0].value.as < std::unique_ptr > ())); +@@ -1913,7 +1913,7 @@ namespace yy { + break; + + case 32: // actions_may_quoted: act +-#line 863 "seclang-parser.yy" ++#line 865 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + ACTION_INIT(yystack_[0].value.as < std::unique_ptr > (), yystack_[1].location) +@@ -1924,7 +1924,7 @@ namespace yy { + break; + + case 33: // op: op_before_init +-#line 873 "seclang-parser.yy" ++#line 875 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[0].value.as < std::unique_ptr > ()); + std::string error; +@@ -1937,7 +1937,7 @@ namespace yy { + break; + + case 34: // op: "NOT" op_before_init +-#line 882 "seclang-parser.yy" ++#line 884 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[0].value.as < std::unique_ptr > ()); + yylhs.value.as < std::unique_ptr > ()->m_negation = true; +@@ -1951,7 +1951,7 @@ namespace yy { + break; + + case 35: // op: run_time_string +-#line 892 "seclang-parser.yy" ++#line 894 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + std::string error; +@@ -1964,7 +1964,7 @@ namespace yy { + break; + + case 36: // op: "NOT" run_time_string +-#line 901 "seclang-parser.yy" ++#line 903 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + yylhs.value.as < std::unique_ptr > ()->m_negation = true; +@@ -1978,7 +1978,7 @@ namespace yy { + break; + + case 37: // op_before_init: "OPERATOR_UNCONDITIONAL_MATCH" +-#line 914 "seclang-parser.yy" ++#line 916 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::UnconditionalMatch()); + } +@@ -1986,7 +1986,7 @@ namespace yy { + break; + + case 38: // op_before_init: "OPERATOR_DETECT_SQLI" +-#line 918 "seclang-parser.yy" ++#line 920 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::DetectSQLi()); + } +@@ -1994,7 +1994,7 @@ namespace yy { + break; + + case 39: // op_before_init: "OPERATOR_DETECT_XSS" +-#line 922 "seclang-parser.yy" ++#line 924 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::DetectXSS()); + } +@@ -2002,7 +2002,7 @@ namespace yy { + break; + + case 40: // op_before_init: "OPERATOR_VALIDATE_URL_ENCODING" +-#line 926 "seclang-parser.yy" ++#line 928 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateUrlEncoding()); + } +@@ -2010,7 +2010,7 @@ namespace yy { + break; + + case 41: // op_before_init: "OPERATOR_VALIDATE_UTF8_ENCODING" +-#line 930 "seclang-parser.yy" ++#line 932 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateUtf8Encoding()); + } +@@ -2018,7 +2018,7 @@ namespace yy { + break; + + case 42: // op_before_init: "OPERATOR_INSPECT_FILE" run_time_string +-#line 934 "seclang-parser.yy" ++#line 936 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::InspectFile(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2026,7 +2026,7 @@ namespace yy { + break; + + case 43: // op_before_init: "OPERATOR_FUZZY_HASH" run_time_string +-#line 938 "seclang-parser.yy" ++#line 940 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::FuzzyHash(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2034,7 +2034,7 @@ namespace yy { + break; + + case 44: // op_before_init: "OPERATOR_VALIDATE_BYTE_RANGE" run_time_string +-#line 942 "seclang-parser.yy" ++#line 944 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateByteRange(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2042,7 +2042,7 @@ namespace yy { + break; + + case 45: // op_before_init: "OPERATOR_VALIDATE_DTD" run_time_string +-#line 946 "seclang-parser.yy" ++#line 948 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateDTD(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2050,7 +2050,7 @@ namespace yy { + break; + + case 46: // op_before_init: "OPERATOR_VALIDATE_HASH" run_time_string +-#line 950 "seclang-parser.yy" ++#line 952 "seclang-parser.yy" + { + /* $$ = new operators::ValidateHash($1); */ + OPERATOR_NOT_SUPPORTED("ValidateHash", yystack_[2].location); +@@ -2059,7 +2059,7 @@ namespace yy { + break; + + case 47: // op_before_init: "OPERATOR_VALIDATE_SCHEMA" run_time_string +-#line 955 "seclang-parser.yy" ++#line 957 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ValidateSchema(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2067,7 +2067,7 @@ namespace yy { + break; + + case 48: // op_before_init: "OPERATOR_VERIFY_CC" run_time_string +-#line 959 "seclang-parser.yy" ++#line 961 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifyCC(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2075,7 +2075,7 @@ namespace yy { + break; + + case 49: // op_before_init: "OPERATOR_VERIFY_CPF" run_time_string +-#line 963 "seclang-parser.yy" ++#line 965 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifyCPF(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2083,7 +2083,7 @@ namespace yy { + break; + + case 50: // op_before_init: "OPERATOR_VERIFY_SSN" run_time_string +-#line 967 "seclang-parser.yy" ++#line 969 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifySSN(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2091,7 +2091,7 @@ namespace yy { + break; + + case 51: // op_before_init: "OPERATOR_VERIFY_SVNR" run_time_string +-#line 971 "seclang-parser.yy" ++#line 973 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::VerifySVNR(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2099,7 +2099,7 @@ namespace yy { + break; + + case 52: // op_before_init: "OPERATOR_GSB_LOOKUP" run_time_string +-#line 975 "seclang-parser.yy" ++#line 977 "seclang-parser.yy" + { + /* $$ = new operators::GsbLookup($1); */ + OPERATOR_NOT_SUPPORTED("GsbLookup", yystack_[2].location); +@@ -2108,7 +2108,7 @@ namespace yy { + break; + + case 53: // op_before_init: "OPERATOR_RSUB" run_time_string +-#line 980 "seclang-parser.yy" ++#line 982 "seclang-parser.yy" + { + /* $$ = new operators::Rsub($1); */ + OPERATOR_NOT_SUPPORTED("Rsub", yystack_[2].location); +@@ -2117,7 +2117,7 @@ namespace yy { + break; + + case 54: // op_before_init: "OPERATOR_WITHIN" run_time_string +-#line 985 "seclang-parser.yy" ++#line 987 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Within(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2125,7 +2125,7 @@ namespace yy { + break; + + case 55: // op_before_init: "OPERATOR_CONTAINS_WORD" run_time_string +-#line 989 "seclang-parser.yy" ++#line 991 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::ContainsWord(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2133,7 +2133,7 @@ namespace yy { + break; + + case 56: // op_before_init: "OPERATOR_CONTAINS" run_time_string +-#line 993 "seclang-parser.yy" ++#line 995 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Contains(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2141,7 +2141,7 @@ namespace yy { + break; + + case 57: // op_before_init: "OPERATOR_ENDS_WITH" run_time_string +-#line 997 "seclang-parser.yy" ++#line 999 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::EndsWith(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2149,7 +2149,7 @@ namespace yy { + break; + + case 58: // op_before_init: "OPERATOR_EQ" run_time_string +-#line 1001 "seclang-parser.yy" ++#line 1003 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Eq(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2157,7 +2157,7 @@ namespace yy { + break; + + case 59: // op_before_init: "OPERATOR_GE" run_time_string +-#line 1005 "seclang-parser.yy" ++#line 1007 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Ge(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2165,7 +2165,7 @@ namespace yy { + break; + + case 60: // op_before_init: "OPERATOR_GT" run_time_string +-#line 1009 "seclang-parser.yy" ++#line 1011 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Gt(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2173,7 +2173,7 @@ namespace yy { + break; + + case 61: // op_before_init: "OPERATOR_IP_MATCH_FROM_FILE" run_time_string +-#line 1013 "seclang-parser.yy" ++#line 1015 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::IpMatchF(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2181,7 +2181,7 @@ namespace yy { + break; + + case 62: // op_before_init: "OPERATOR_IP_MATCH" run_time_string +-#line 1017 "seclang-parser.yy" ++#line 1019 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::IpMatch(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2189,7 +2189,7 @@ namespace yy { + break; + + case 63: // op_before_init: "OPERATOR_LE" run_time_string +-#line 1021 "seclang-parser.yy" ++#line 1023 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Le(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2197,7 +2197,7 @@ namespace yy { + break; + + case 64: // op_before_init: "OPERATOR_LT" run_time_string +-#line 1025 "seclang-parser.yy" ++#line 1027 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Lt(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2205,7 +2205,7 @@ namespace yy { + break; + + case 65: // op_before_init: "OPERATOR_PM_FROM_FILE" run_time_string +-#line 1029 "seclang-parser.yy" ++#line 1031 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::PmFromFile(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2213,7 +2213,7 @@ namespace yy { + break; + + case 66: // op_before_init: "OPERATOR_PM" run_time_string +-#line 1033 "seclang-parser.yy" ++#line 1035 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Pm(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2221,7 +2221,7 @@ namespace yy { + break; + + case 67: // op_before_init: "OPERATOR_RBL" run_time_string +-#line 1037 "seclang-parser.yy" ++#line 1039 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rbl(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2229,7 +2229,7 @@ namespace yy { + break; + + case 68: // op_before_init: "OPERATOR_RX" run_time_string +-#line 1041 "seclang-parser.yy" ++#line 1043 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2237,7 +2237,7 @@ namespace yy { + break; + + case 69: // op_before_init: "OPERATOR_RX_GLOBAL" run_time_string +-#line 1045 "seclang-parser.yy" ++#line 1047 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::RxGlobal(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2245,7 +2245,7 @@ namespace yy { + break; + + case 70: // op_before_init: "OPERATOR_STR_EQ" run_time_string +-#line 1049 "seclang-parser.yy" ++#line 1051 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::StrEq(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2253,7 +2253,7 @@ namespace yy { + break; + + case 71: // op_before_init: "OPERATOR_STR_MATCH" run_time_string +-#line 1053 "seclang-parser.yy" ++#line 1055 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::StrMatch(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2261,7 +2261,7 @@ namespace yy { + break; + + case 72: // op_before_init: "OPERATOR_BEGINS_WITH" run_time_string +-#line 1057 "seclang-parser.yy" ++#line 1059 "seclang-parser.yy" + { + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::BeginsWith(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +@@ -2269,7 +2269,7 @@ namespace yy { + break; + + case 73: // op_before_init: "OPERATOR_GEOLOOKUP" +-#line 1061 "seclang-parser.yy" ++#line 1063 "seclang-parser.yy" + { + #if defined(WITH_GEOIP) or defined(WITH_MAXMIND) + OPERATOR_CONTAINER(yylhs.value.as < std::unique_ptr > (), new operators::GeoLookup()); +@@ -2284,7 +2284,7 @@ namespace yy { + break; + + case 75: // expression: "DIRECTIVE" variables op actions +-#line 1076 "seclang-parser.yy" ++#line 1078 "seclang-parser.yy" + { + std::vector *a = new std::vector(); + std::vector *t = new std::vector(); +@@ -2318,7 +2318,7 @@ namespace yy { + break; + + case 76: // expression: "DIRECTIVE" variables op +-#line 1106 "seclang-parser.yy" ++#line 1108 "seclang-parser.yy" + { + variables::Variables *v = new variables::Variables(); + for (auto &i : *yystack_[1].value.as < std::unique_ptr > > > ().get()) { +@@ -2341,7 +2341,7 @@ namespace yy { + break; + + case 77: // expression: "CONFIG_DIR_SEC_ACTION" actions +-#line 1125 "seclang-parser.yy" ++#line 1127 "seclang-parser.yy" + { + std::vector *a = new std::vector(); + std::vector *t = new std::vector(); +@@ -2364,7 +2364,7 @@ namespace yy { + break; + + case 78: // expression: "DIRECTIVE_SECRULESCRIPT" actions +-#line 1144 "seclang-parser.yy" ++#line 1146 "seclang-parser.yy" + { + std::string err; + std::vector *a = new std::vector(); +@@ -2396,7 +2396,7 @@ namespace yy { + break; + + case 79: // expression: "CONFIG_DIR_SEC_DEFAULT_ACTION" actions +-#line 1172 "seclang-parser.yy" ++#line 1174 "seclang-parser.yy" + { + bool hasDisruptive = false; + std::vector *actions = new std::vector(); +@@ -2457,7 +2457,7 @@ namespace yy { + break; + + case 80: // expression: "CONFIG_DIR_SEC_MARKER" +-#line 1229 "seclang-parser.yy" ++#line 1231 "seclang-parser.yy" + { + driver.addSecMarker(modsecurity::utils::string::removeBracketsIfNeeded(yystack_[0].value.as < std::string > ()), + /* file name */ std::unique_ptr(new std::string(*yystack_[0].location.end.filename)), +@@ -2468,7 +2468,7 @@ namespace yy { + break; + + case 81: // expression: "CONFIG_DIR_RULE_ENG" "CONFIG_VALUE_OFF" +-#line 1236 "seclang-parser.yy" ++#line 1238 "seclang-parser.yy" + { + driver.m_secRuleEngine = modsecurity::RulesSet::DisabledRuleEngine; + } +@@ -2476,7 +2476,7 @@ namespace yy { + break; + + case 82: // expression: "CONFIG_DIR_RULE_ENG" "CONFIG_VALUE_ON" +-#line 1240 "seclang-parser.yy" ++#line 1242 "seclang-parser.yy" + { + driver.m_secRuleEngine = modsecurity::RulesSet::EnabledRuleEngine; + } +@@ -2484,7 +2484,7 @@ namespace yy { + break; + + case 83: // expression: "CONFIG_DIR_RULE_ENG" "CONFIG_VALUE_DETC" +-#line 1244 "seclang-parser.yy" ++#line 1246 "seclang-parser.yy" + { + driver.m_secRuleEngine = modsecurity::RulesSet::DetectionOnlyRuleEngine; + } +@@ -2492,7 +2492,7 @@ namespace yy { + break; + + case 84: // expression: "CONFIG_DIR_REQ_BODY" "CONFIG_VALUE_ON" +-#line 1248 "seclang-parser.yy" ++#line 1250 "seclang-parser.yy" + { + driver.m_secRequestBodyAccess = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -2500,7 +2500,7 @@ namespace yy { + break; + + case 85: // expression: "CONFIG_DIR_REQ_BODY" "CONFIG_VALUE_OFF" +-#line 1252 "seclang-parser.yy" ++#line 1254 "seclang-parser.yy" + { + driver.m_secRequestBodyAccess = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -2508,7 +2508,7 @@ namespace yy { + break; + + case 86: // expression: "CONFIG_DIR_RES_BODY" "CONFIG_VALUE_ON" +-#line 1256 "seclang-parser.yy" ++#line 1258 "seclang-parser.yy" + { + driver.m_secResponseBodyAccess = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -2516,7 +2516,7 @@ namespace yy { + break; + + case 87: // expression: "CONFIG_DIR_RES_BODY" "CONFIG_VALUE_OFF" +-#line 1260 "seclang-parser.yy" ++#line 1262 "seclang-parser.yy" + { + driver.m_secResponseBodyAccess = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -2524,7 +2524,7 @@ namespace yy { + break; + + case 88: // expression: "CONFIG_SEC_ARGUMENT_SEPARATOR" +-#line 1264 "seclang-parser.yy" ++#line 1266 "seclang-parser.yy" + { + if (yystack_[0].value.as < std::string > ().length() != 1) { + driver.error(yystack_[1].location, "Argument separator should be set to a single character."); +@@ -2537,7 +2537,7 @@ namespace yy { + break; + + case 89: // expression: "CONFIG_COMPONENT_SIG" +-#line 1273 "seclang-parser.yy" ++#line 1275 "seclang-parser.yy" + { + driver.m_components.push_back(yystack_[0].value.as < std::string > ()); + } +@@ -2545,7 +2545,7 @@ namespace yy { + break; + + case 90: // expression: "CONFIG_CONN_ENGINE" "CONFIG_VALUE_ON" +-#line 1277 "seclang-parser.yy" ++#line 1279 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecConnEngine is not yet supported."); + YYERROR; +@@ -2554,14 +2554,14 @@ namespace yy { + break; + + case 91: // expression: "CONFIG_CONN_ENGINE" "CONFIG_VALUE_OFF" +-#line 1282 "seclang-parser.yy" ++#line 1284 "seclang-parser.yy" + { + } + #line 2561 "seclang-parser.cc" + break; + + case 92: // expression: "CONFIG_SEC_WEB_APP_ID" +-#line 1285 "seclang-parser.yy" ++#line 1287 "seclang-parser.yy" + { + driver.m_secWebAppId.m_value = yystack_[0].value.as < std::string > (); + driver.m_secWebAppId.m_set = true; +@@ -2570,7 +2570,7 @@ namespace yy { + break; + + case 93: // expression: "CONFIG_SEC_SERVER_SIG" +-#line 1290 "seclang-parser.yy" ++#line 1292 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecServerSignature is not supported."); + YYERROR; +@@ -2579,7 +2579,7 @@ namespace yy { + break; + + case 94: // expression: "CONFIG_SEC_CACHE_TRANSFORMATIONS" +-#line 1295 "seclang-parser.yy" ++#line 1297 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecCacheTransformations is not supported."); + YYERROR; +@@ -2588,7 +2588,7 @@ namespace yy { + break; + + case 95: // expression: "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" "CONFIG_VALUE_ON" +-#line 1300 "seclang-parser.yy" ++#line 1302 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecDisableBackendCompression is not supported."); + YYERROR; +@@ -2597,14 +2597,14 @@ namespace yy { + break; + + case 96: // expression: "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" "CONFIG_VALUE_OFF" +-#line 1305 "seclang-parser.yy" ++#line 1307 "seclang-parser.yy" + { + } + #line 2604 "seclang-parser.cc" + break; + + case 97: // expression: "CONFIG_CONTENT_INJECTION" "CONFIG_VALUE_ON" +-#line 1308 "seclang-parser.yy" ++#line 1310 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecContentInjection is not yet supported."); + YYERROR; +@@ -2613,14 +2613,14 @@ namespace yy { + break; + + case 98: // expression: "CONFIG_CONTENT_INJECTION" "CONFIG_VALUE_OFF" +-#line 1313 "seclang-parser.yy" ++#line 1315 "seclang-parser.yy" + { + } + #line 2620 "seclang-parser.cc" + break; + + case 99: // expression: "CONFIG_SEC_CHROOT_DIR" +-#line 1316 "seclang-parser.yy" ++#line 1318 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecChrootDir is not supported."); + YYERROR; +@@ -2629,7 +2629,7 @@ namespace yy { + break; + + case 100: // expression: "CONFIG_SEC_HASH_ENGINE" "CONFIG_VALUE_ON" +-#line 1321 "seclang-parser.yy" ++#line 1323 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecHashEngine is not yet supported."); + YYERROR; +@@ -2638,14 +2638,14 @@ namespace yy { + break; + + case 101: // expression: "CONFIG_SEC_HASH_ENGINE" "CONFIG_VALUE_OFF" +-#line 1326 "seclang-parser.yy" ++#line 1328 "seclang-parser.yy" + { + } + #line 2645 "seclang-parser.cc" + break; + + case 102: // expression: "CONFIG_SEC_HASH_KEY" +-#line 1329 "seclang-parser.yy" ++#line 1331 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashKey is not yet supported."); + YYERROR; +@@ -2654,7 +2654,7 @@ namespace yy { + break; + + case 103: // expression: "CONFIG_SEC_HASH_PARAM" +-#line 1334 "seclang-parser.yy" ++#line 1336 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashParam is not yet supported."); + YYERROR; +@@ -2663,7 +2663,7 @@ namespace yy { + break; + + case 104: // expression: "CONFIG_SEC_HASH_METHOD_RX" +-#line 1339 "seclang-parser.yy" ++#line 1341 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashMethodRx is not yet supported."); + YYERROR; +@@ -2672,7 +2672,7 @@ namespace yy { + break; + + case 105: // expression: "CONFIG_SEC_HASH_METHOD_PM" +-#line 1344 "seclang-parser.yy" ++#line 1346 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecHashMethodPm is not yet supported."); + YYERROR; +@@ -2681,7 +2681,7 @@ namespace yy { + break; + + case 106: // expression: "CONFIG_DIR_GSB_DB" +-#line 1349 "seclang-parser.yy" ++#line 1351 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecGsbLookupDb is not supported."); + YYERROR; +@@ -2690,7 +2690,7 @@ namespace yy { + break; + + case 107: // expression: "CONFIG_SEC_GUARDIAN_LOG" +-#line 1354 "seclang-parser.yy" ++#line 1356 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecGuardianLog is not supported."); + YYERROR; +@@ -2699,7 +2699,7 @@ namespace yy { + break; + + case 108: // expression: "CONFIG_SEC_INTERCEPT_ON_ERROR" "CONFIG_VALUE_ON" +-#line 1359 "seclang-parser.yy" ++#line 1361 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecInterceptOnError is not yet supported."); + YYERROR; +@@ -2708,14 +2708,14 @@ namespace yy { + break; + + case 109: // expression: "CONFIG_SEC_INTERCEPT_ON_ERROR" "CONFIG_VALUE_OFF" +-#line 1364 "seclang-parser.yy" ++#line 1366 "seclang-parser.yy" + { + } + #line 2715 "seclang-parser.cc" + break; + + case 110: // expression: "CONFIG_SEC_CONN_R_STATE_LIMIT" +-#line 1367 "seclang-parser.yy" ++#line 1369 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecConnReadStateLimit is not yet supported."); + YYERROR; +@@ -2724,7 +2724,7 @@ namespace yy { + break; + + case 111: // expression: "CONFIG_SEC_CONN_W_STATE_LIMIT" +-#line 1372 "seclang-parser.yy" ++#line 1374 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecConnWriteStateLimit is not yet supported."); + YYERROR; +@@ -2733,7 +2733,7 @@ namespace yy { + break; + + case 112: // expression: "CONFIG_SEC_SENSOR_ID" +-#line 1377 "seclang-parser.yy" ++#line 1379 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecSensorId is not yet supported."); + YYERROR; +@@ -2742,7 +2742,7 @@ namespace yy { + break; + + case 113: // expression: "CONFIG_SEC_RULE_INHERITANCE" "CONFIG_VALUE_ON" +-#line 1382 "seclang-parser.yy" ++#line 1384 "seclang-parser.yy" + { + driver.error(yystack_[2].location, "SecRuleInheritance is not yet supported."); + YYERROR; +@@ -2751,14 +2751,14 @@ namespace yy { + break; + + case 114: // expression: "CONFIG_SEC_RULE_INHERITANCE" "CONFIG_VALUE_OFF" +-#line 1387 "seclang-parser.yy" ++#line 1389 "seclang-parser.yy" + { + } + #line 2758 "seclang-parser.cc" + break; + + case 115: // expression: "CONFIG_SEC_RULE_PERF_TIME" +-#line 1390 "seclang-parser.yy" ++#line 1392 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecRulePerfTime is not yet supported."); + YYERROR; +@@ -2767,7 +2767,7 @@ namespace yy { + break; + + case 116: // expression: "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" +-#line 1395 "seclang-parser.yy" ++#line 1397 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecStreamInBodyInspection is not supported."); + YYERROR; +@@ -2776,7 +2776,7 @@ namespace yy { + break; + + case 117: // expression: "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" +-#line 1400 "seclang-parser.yy" ++#line 1402 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecStreamOutBodyInspection is not supported."); + YYERROR; +@@ -2785,7 +2785,7 @@ namespace yy { + break; + + case 118: // expression: "CONFIG_SEC_RULE_REMOVE_BY_ID" +-#line 1405 "seclang-parser.yy" ++#line 1407 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.load(yystack_[0].value.as < std::string > (), &error) == false) { +@@ -2802,7 +2802,7 @@ namespace yy { + break; + + case 119: // expression: "CONFIG_SEC_RULE_REMOVE_BY_TAG" +-#line 1418 "seclang-parser.yy" ++#line 1420 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadRemoveRuleByTag(yystack_[0].value.as < std::string > (), &error) == false) { +@@ -2819,7 +2819,7 @@ namespace yy { + break; + + case 120: // expression: "CONFIG_SEC_RULE_REMOVE_BY_MSG" +-#line 1431 "seclang-parser.yy" ++#line 1433 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadRemoveRuleByMsg(yystack_[0].value.as < std::string > (), &error) == false) { +@@ -2836,7 +2836,7 @@ namespace yy { + break; + + case 121: // expression: "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" variables_pre_process +-#line 1444 "seclang-parser.yy" ++#line 1446 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadUpdateTargetByTag(yystack_[1].value.as < std::string > (), std::move(yystack_[0].value.as < std::unique_ptr > > > ()), &error) == false) { +@@ -2853,7 +2853,7 @@ namespace yy { + break; + + case 122: // expression: "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" variables_pre_process +-#line 1457 "seclang-parser.yy" ++#line 1459 "seclang-parser.yy" + { + std::string error; + if (driver.m_exceptions.loadUpdateTargetByMsg(yystack_[1].value.as < std::string > (), std::move(yystack_[0].value.as < std::unique_ptr > > > ()), &error) == false) { +@@ -2870,7 +2870,7 @@ namespace yy { + break; + + case 123: // expression: "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" variables_pre_process +-#line 1470 "seclang-parser.yy" ++#line 1472 "seclang-parser.yy" + { + std::string error; + double ruleId; +@@ -2900,7 +2900,7 @@ namespace yy { + break; + + case 124: // expression: "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" actions +-#line 1496 "seclang-parser.yy" ++#line 1498 "seclang-parser.yy" + { + std::string error; + double ruleId; +@@ -2931,7 +2931,7 @@ namespace yy { + break; + + case 125: // expression: "CONFIG_DIR_DEBUG_LVL" +-#line 1524 "seclang-parser.yy" ++#line 1526 "seclang-parser.yy" + { + if (driver.m_debugLog != NULL) { + driver.m_debugLog->setDebugLogLevel(atoi(yystack_[0].value.as < std::string > ().c_str())); +@@ -2947,7 +2947,7 @@ namespace yy { + break; + + case 126: // expression: "CONFIG_DIR_DEBUG_LOG" +-#line 1536 "seclang-parser.yy" ++#line 1538 "seclang-parser.yy" + { + if (driver.m_debugLog != NULL) { + std::string error; +@@ -2970,7 +2970,7 @@ namespace yy { + break; + + case 127: // expression: "CONFIG_DIR_GEO_DB" +-#line 1556 "seclang-parser.yy" ++#line 1558 "seclang-parser.yy" + { + #if defined(WITH_GEOIP) or defined(WITH_MAXMIND) + std::string err; +@@ -3001,7 +3001,7 @@ namespace yy { + break; + + case 128: // expression: "CONFIG_DIR_ARGS_LIMIT" +-#line 1583 "seclang-parser.yy" ++#line 1585 "seclang-parser.yy" + { + driver.m_argumentsLimit.m_set = true; + driver.m_argumentsLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3010,7 +3010,7 @@ namespace yy { + break; + + case 129: // expression: "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" +-#line 1588 "seclang-parser.yy" ++#line 1590 "seclang-parser.yy" + { + driver.m_requestBodyJsonDepthLimit.m_set = true; + driver.m_requestBodyJsonDepthLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3019,7 +3019,7 @@ namespace yy { + break; + + case 130: // expression: "CONFIG_DIR_REQ_BODY_LIMIT" +-#line 1594 "seclang-parser.yy" ++#line 1596 "seclang-parser.yy" + { + driver.m_requestBodyLimit.m_set = true; + driver.m_requestBodyLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3028,7 +3028,7 @@ namespace yy { + break; + + case 131: // expression: "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" +-#line 1599 "seclang-parser.yy" ++#line 1601 "seclang-parser.yy" + { + driver.m_requestBodyNoFilesLimit.m_set = true; + driver.m_requestBodyNoFilesLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3037,7 +3037,7 @@ namespace yy { + break; + + case 132: // expression: "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" +-#line 1604 "seclang-parser.yy" ++#line 1606 "seclang-parser.yy" + { + std::stringstream ss; + ss << "As of ModSecurity version 3.0, SecRequestBodyInMemoryLimit is no longer "; +@@ -3050,7 +3050,7 @@ namespace yy { + break; + + case 133: // expression: "CONFIG_DIR_RES_BODY_LIMIT" +-#line 1613 "seclang-parser.yy" ++#line 1615 "seclang-parser.yy" + { + driver.m_responseBodyLimit.m_set = true; + driver.m_responseBodyLimit.m_value = atoi(yystack_[0].value.as < std::string > ().c_str()); +@@ -3059,7 +3059,7 @@ namespace yy { + break; + + case 134: // expression: "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" "CONFIG_VALUE_PROCESS_PARTIAL" +-#line 1618 "seclang-parser.yy" ++#line 1620 "seclang-parser.yy" + { + driver.m_requestBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::ProcessPartialBodyLimitAction; + } +@@ -3067,7 +3067,7 @@ namespace yy { + break; + + case 135: // expression: "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" "CONFIG_VALUE_REJECT" +-#line 1622 "seclang-parser.yy" ++#line 1624 "seclang-parser.yy" + { + driver.m_requestBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::RejectBodyLimitAction; + } +@@ -3075,7 +3075,7 @@ namespace yy { + break; + + case 136: // expression: "CONFIG_DIR_RES_BODY_LIMIT_ACTION" "CONFIG_VALUE_PROCESS_PARTIAL" +-#line 1626 "seclang-parser.yy" ++#line 1628 "seclang-parser.yy" + { + driver.m_responseBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::ProcessPartialBodyLimitAction; + } +@@ -3083,7 +3083,7 @@ namespace yy { + break; + + case 137: // expression: "CONFIG_DIR_RES_BODY_LIMIT_ACTION" "CONFIG_VALUE_REJECT" +-#line 1630 "seclang-parser.yy" ++#line 1632 "seclang-parser.yy" + { + driver.m_responseBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::RejectBodyLimitAction; + } +@@ -3091,7 +3091,7 @@ namespace yy { + break; + + case 138: // expression: "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" "CONFIG_VALUE_ABORT" +-#line 1634 "seclang-parser.yy" ++#line 1636 "seclang-parser.yy" + { + driver.m_remoteRulesActionOnFailed = RulesSet::OnFailedRemoteRulesAction::AbortOnFailedRemoteRulesAction; + } +@@ -3099,7 +3099,7 @@ namespace yy { + break; + + case 139: // expression: "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" "CONFIG_VALUE_WARN" +-#line 1638 "seclang-parser.yy" ++#line 1640 "seclang-parser.yy" + { + driver.m_remoteRulesActionOnFailed = RulesSet::OnFailedRemoteRulesAction::WarnOnFailedRemoteRulesAction; + } +@@ -3107,7 +3107,7 @@ namespace yy { + break; + + case 142: // expression: "CONGIG_DIR_RESPONSE_BODY_MP" +-#line 1652 "seclang-parser.yy" ++#line 1654 "seclang-parser.yy" + { + std::istringstream buf(yystack_[0].value.as < std::string > ()); + std::istream_iterator beg(buf), end; +@@ -3123,7 +3123,7 @@ namespace yy { + break; + + case 143: // expression: "CONGIG_DIR_RESPONSE_BODY_MP_CLEAR" +-#line 1664 "seclang-parser.yy" ++#line 1666 "seclang-parser.yy" + { + driver.m_responseBodyTypeToBeInspected.m_set = true; + driver.m_responseBodyTypeToBeInspected.m_clear = true; +@@ -3133,7 +3133,7 @@ namespace yy { + break; + + case 144: // expression: "CONFIG_XML_EXTERNAL_ENTITY" "CONFIG_VALUE_OFF" +-#line 1670 "seclang-parser.yy" ++#line 1672 "seclang-parser.yy" + { + driver.m_secXMLExternalEntity = modsecurity::RulesSetProperties::FalseConfigBoolean; + } +@@ -3141,7 +3141,7 @@ namespace yy { + break; + + case 145: // expression: "CONFIG_XML_EXTERNAL_ENTITY" "CONFIG_VALUE_ON" +-#line 1674 "seclang-parser.yy" ++#line 1676 "seclang-parser.yy" + { + driver.m_secXMLExternalEntity = modsecurity::RulesSetProperties::TrueConfigBoolean; + } +@@ -3149,7 +3149,7 @@ namespace yy { + break; + + case 146: // expression: "CONGIG_DIR_SEC_TMP_DIR" +-#line 1678 "seclang-parser.yy" ++#line 1680 "seclang-parser.yy" + { + /* Parser error disabled to avoid breaking default installations with modsecurity.conf-recommended + std::stringstream ss; +@@ -3164,7 +3164,7 @@ namespace yy { + break; + + case 149: // expression: "CONGIG_DIR_SEC_COOKIE_FORMAT" +-#line 1699 "seclang-parser.yy" ++#line 1701 "seclang-parser.yy" + { + if (atoi(yystack_[0].value.as < std::string > ().c_str()) == 1) { + driver.error(yystack_[1].location, "SecCookieFormat 1 is not yet supported."); +@@ -3175,7 +3175,7 @@ namespace yy { + break; + + case 150: // expression: "CONFIG_SEC_COOKIEV0_SEPARATOR" +-#line 1706 "seclang-parser.yy" ++#line 1708 "seclang-parser.yy" + { + driver.error(yystack_[1].location, "SecCookieV0Separator is not yet supported."); + YYERROR; +@@ -3184,7 +3184,7 @@ namespace yy { + break; + + case 152: // expression: "CONFIG_DIR_UNICODE_MAP_FILE" +-#line 1716 "seclang-parser.yy" ++#line 1718 "seclang-parser.yy" + { + std::string error; + std::vector param; +@@ -3242,7 +3242,7 @@ namespace yy { + break; + + case 153: // expression: "CONFIG_SEC_COLLECTION_TIMEOUT" +-#line 1770 "seclang-parser.yy" ++#line 1772 "seclang-parser.yy" + { + /* Parser error disabled to avoid breaking default CRS installations with crs-setup.conf-recommended + driver.error(@0, "SecCollectionTimeout is not yet supported."); +@@ -3253,7 +3253,7 @@ namespace yy { + break; + + case 154: // expression: "CONFIG_SEC_HTTP_BLKEY" +-#line 1777 "seclang-parser.yy" ++#line 1779 "seclang-parser.yy" + { + driver.m_httpblKey.m_set = true; + driver.m_httpblKey.m_value = yystack_[0].value.as < std::string > (); +@@ -3262,7 +3262,7 @@ namespace yy { + break; + + case 155: // variables: variables_pre_process +-#line 1785 "seclang-parser.yy" ++#line 1787 "seclang-parser.yy" + { + std::unique_ptr > > originalList = std::move(yystack_[0].value.as < std::unique_ptr > > > ()); + std::unique_ptr>> newList(new std::vector>()); +@@ -3300,7 +3300,7 @@ namespace yy { + break; + + case 156: // variables_pre_process: variables_may_be_quoted +-#line 1822 "seclang-parser.yy" ++#line 1824 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[0].value.as < std::unique_ptr > > > ()); + } +@@ -3308,7 +3308,7 @@ namespace yy { + break; + + case 157: // variables_pre_process: "QUOTATION_MARK" variables_may_be_quoted "QUOTATION_MARK" +-#line 1826 "seclang-parser.yy" ++#line 1828 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[1].value.as < std::unique_ptr > > > ()); + } +@@ -3316,7 +3316,7 @@ namespace yy { + break; + + case 158: // variables_may_be_quoted: variables_may_be_quoted PIPE var +-#line 1833 "seclang-parser.yy" ++#line 1835 "seclang-parser.yy" + { + yystack_[2].value.as < std::unique_ptr > > > ()->push_back(std::move(yystack_[0].value.as < std::unique_ptr > ())); + yylhs.value.as < std::unique_ptr > > > () = std::move(yystack_[2].value.as < std::unique_ptr > > > ()); +@@ -3325,7 +3325,7 @@ namespace yy { + break; + + case 159: // variables_may_be_quoted: variables_may_be_quoted PIPE VAR_EXCLUSION var +-#line 1838 "seclang-parser.yy" ++#line 1840 "seclang-parser.yy" + { + std::unique_ptr c(new VariableModificatorExclusion(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + yystack_[3].value.as < std::unique_ptr > > > ()->push_back(std::move(c)); +@@ -3335,7 +3335,7 @@ namespace yy { + break; + + case 160: // variables_may_be_quoted: variables_may_be_quoted PIPE VAR_COUNT var +-#line 1844 "seclang-parser.yy" ++#line 1846 "seclang-parser.yy" + { + std::unique_ptr c(new VariableModificatorCount(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + yystack_[3].value.as < std::unique_ptr > > > ()->push_back(std::move(c)); +@@ -3345,7 +3345,7 @@ namespace yy { + break; + + case 161: // variables_may_be_quoted: var +-#line 1850 "seclang-parser.yy" ++#line 1852 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + b->push_back(std::move(yystack_[0].value.as < std::unique_ptr > ())); +@@ -3355,7 +3355,7 @@ namespace yy { + break; + + case 162: // variables_may_be_quoted: VAR_EXCLUSION var +-#line 1856 "seclang-parser.yy" ++#line 1858 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + std::unique_ptr c(new VariableModificatorExclusion(std::move(yystack_[0].value.as < std::unique_ptr > ()))); +@@ -3366,7 +3366,7 @@ namespace yy { + break; + + case 163: // variables_may_be_quoted: VAR_COUNT var +-#line 1863 "seclang-parser.yy" ++#line 1865 "seclang-parser.yy" + { + std::unique_ptr>> b(new std::vector>()); + std::unique_ptr c(new VariableModificatorCount(std::move(yystack_[0].value.as < std::unique_ptr > ()))); +@@ -3377,7 +3377,7 @@ namespace yy { + break; + + case 164: // var: VARIABLE_ARGS "Dictionary element" +-#line 1873 "seclang-parser.yy" ++#line 1875 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Args_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3385,7 +3385,7 @@ namespace yy { + break; + + case 165: // var: VARIABLE_ARGS "Dictionary element, selected by regexp" +-#line 1877 "seclang-parser.yy" ++#line 1879 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Args_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3393,7 +3393,7 @@ namespace yy { + break; + + case 166: // var: VARIABLE_ARGS +-#line 1881 "seclang-parser.yy" ++#line 1883 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Args_NoDictElement()); + } +@@ -3401,7 +3401,7 @@ namespace yy { + break; + + case 167: // var: VARIABLE_ARGS_POST "Dictionary element" +-#line 1885 "seclang-parser.yy" ++#line 1887 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPost_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3409,7 +3409,7 @@ namespace yy { + break; + + case 168: // var: VARIABLE_ARGS_POST "Dictionary element, selected by regexp" +-#line 1889 "seclang-parser.yy" ++#line 1891 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPost_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3417,7 +3417,7 @@ namespace yy { + break; + + case 169: // var: VARIABLE_ARGS_POST +-#line 1893 "seclang-parser.yy" ++#line 1895 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPost_NoDictElement()); + } +@@ -3425,7 +3425,7 @@ namespace yy { + break; + + case 170: // var: VARIABLE_ARGS_GET "Dictionary element" +-#line 1897 "seclang-parser.yy" ++#line 1899 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGet_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3433,7 +3433,7 @@ namespace yy { + break; + + case 171: // var: VARIABLE_ARGS_GET "Dictionary element, selected by regexp" +-#line 1901 "seclang-parser.yy" ++#line 1903 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGet_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3441,7 +3441,7 @@ namespace yy { + break; + + case 172: // var: VARIABLE_ARGS_GET +-#line 1905 "seclang-parser.yy" ++#line 1907 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGet_NoDictElement()); + } +@@ -3449,7 +3449,7 @@ namespace yy { + break; + + case 173: // var: VARIABLE_FILES_SIZES "Dictionary element" +-#line 1909 "seclang-parser.yy" ++#line 1911 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesSizes_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3457,7 +3457,7 @@ namespace yy { + break; + + case 174: // var: VARIABLE_FILES_SIZES "Dictionary element, selected by regexp" +-#line 1913 "seclang-parser.yy" ++#line 1915 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesSizes_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3465,7 +3465,7 @@ namespace yy { + break; + + case 175: // var: VARIABLE_FILES_SIZES +-#line 1917 "seclang-parser.yy" ++#line 1919 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesSizes_NoDictElement()); + } +@@ -3473,7 +3473,7 @@ namespace yy { + break; + + case 176: // var: VARIABLE_FILES_NAMES "Dictionary element" +-#line 1921 "seclang-parser.yy" ++#line 1923 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesNames_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3481,7 +3481,7 @@ namespace yy { + break; + + case 177: // var: VARIABLE_FILES_NAMES "Dictionary element, selected by regexp" +-#line 1925 "seclang-parser.yy" ++#line 1927 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3489,7 +3489,7 @@ namespace yy { + break; + + case 178: // var: VARIABLE_FILES_NAMES +-#line 1929 "seclang-parser.yy" ++#line 1931 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesNames_NoDictElement()); + } +@@ -3497,7 +3497,7 @@ namespace yy { + break; + + case 179: // var: VARIABLE_FILES_TMP_CONTENT "Dictionary element" +-#line 1933 "seclang-parser.yy" ++#line 1935 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpContent_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3505,7 +3505,7 @@ namespace yy { + break; + + case 180: // var: VARIABLE_FILES_TMP_CONTENT "Dictionary element, selected by regexp" +-#line 1937 "seclang-parser.yy" ++#line 1939 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpContent_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3513,7 +3513,7 @@ namespace yy { + break; + + case 181: // var: VARIABLE_FILES_TMP_CONTENT +-#line 1941 "seclang-parser.yy" ++#line 1943 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpContent_NoDictElement()); + } +@@ -3521,7 +3521,7 @@ namespace yy { + break; + + case 182: // var: VARIABLE_MULTIPART_FILENAME "Dictionary element" +-#line 1945 "seclang-parser.yy" ++#line 1947 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartFileName_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3529,7 +3529,7 @@ namespace yy { + break; + + case 183: // var: VARIABLE_MULTIPART_FILENAME "Dictionary element, selected by regexp" +-#line 1949 "seclang-parser.yy" ++#line 1951 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartFileName_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3537,7 +3537,7 @@ namespace yy { + break; + + case 184: // var: VARIABLE_MULTIPART_FILENAME +-#line 1953 "seclang-parser.yy" ++#line 1955 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartFileName_NoDictElement()); + } +@@ -3545,7 +3545,7 @@ namespace yy { + break; + + case 185: // var: VARIABLE_MULTIPART_NAME "Dictionary element" +-#line 1957 "seclang-parser.yy" ++#line 1959 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartName_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3553,7 +3553,7 @@ namespace yy { + break; + + case 186: // var: VARIABLE_MULTIPART_NAME "Dictionary element, selected by regexp" +-#line 1961 "seclang-parser.yy" ++#line 1963 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartName_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3561,7 +3561,7 @@ namespace yy { + break; + + case 187: // var: VARIABLE_MULTIPART_NAME +-#line 1965 "seclang-parser.yy" ++#line 1967 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultiPartName_NoDictElement()); + } +@@ -3569,7 +3569,7 @@ namespace yy { + break; + + case 188: // var: VARIABLE_MATCHED_VARS_NAMES "Dictionary element" +-#line 1969 "seclang-parser.yy" ++#line 1971 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarsNames_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3577,7 +3577,7 @@ namespace yy { + break; + + case 189: // var: VARIABLE_MATCHED_VARS_NAMES "Dictionary element, selected by regexp" +-#line 1973 "seclang-parser.yy" ++#line 1975 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarsNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3585,7 +3585,7 @@ namespace yy { + break; + + case 190: // var: VARIABLE_MATCHED_VARS_NAMES +-#line 1977 "seclang-parser.yy" ++#line 1979 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarsNames_NoDictElement()); + } +@@ -3593,7 +3593,7 @@ namespace yy { + break; + + case 191: // var: VARIABLE_MATCHED_VARS "Dictionary element" +-#line 1981 "seclang-parser.yy" ++#line 1983 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVars_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3601,7 +3601,7 @@ namespace yy { + break; + + case 192: // var: VARIABLE_MATCHED_VARS "Dictionary element, selected by regexp" +-#line 1985 "seclang-parser.yy" ++#line 1987 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVars_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3609,7 +3609,7 @@ namespace yy { + break; + + case 193: // var: VARIABLE_MATCHED_VARS +-#line 1989 "seclang-parser.yy" ++#line 1991 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVars_NoDictElement()); + } +@@ -3617,7 +3617,7 @@ namespace yy { + break; + + case 194: // var: VARIABLE_FILES "Dictionary element" +-#line 1993 "seclang-parser.yy" ++#line 1995 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Files_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3625,7 +3625,7 @@ namespace yy { + break; + + case 195: // var: VARIABLE_FILES "Dictionary element, selected by regexp" +-#line 1997 "seclang-parser.yy" ++#line 1999 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Files_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3633,7 +3633,7 @@ namespace yy { + break; + + case 196: // var: VARIABLE_FILES +-#line 2001 "seclang-parser.yy" ++#line 2003 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Files_NoDictElement()); + } +@@ -3641,7 +3641,7 @@ namespace yy { + break; + + case 197: // var: VARIABLE_REQUEST_COOKIES "Dictionary element" +-#line 2005 "seclang-parser.yy" ++#line 2007 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookies_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3649,7 +3649,7 @@ namespace yy { + break; + + case 198: // var: VARIABLE_REQUEST_COOKIES "Dictionary element, selected by regexp" +-#line 2009 "seclang-parser.yy" ++#line 2011 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookies_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3657,7 +3657,7 @@ namespace yy { + break; + + case 199: // var: VARIABLE_REQUEST_COOKIES +-#line 2013 "seclang-parser.yy" ++#line 2015 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookies_NoDictElement()); + } +@@ -3665,7 +3665,7 @@ namespace yy { + break; + + case 200: // var: VARIABLE_REQUEST_HEADERS "Dictionary element" +-#line 2017 "seclang-parser.yy" ++#line 2019 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeaders_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3673,7 +3673,7 @@ namespace yy { + break; + + case 201: // var: VARIABLE_REQUEST_HEADERS "Dictionary element, selected by regexp" +-#line 2021 "seclang-parser.yy" ++#line 2023 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeaders_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3681,7 +3681,7 @@ namespace yy { + break; + + case 202: // var: VARIABLE_REQUEST_HEADERS +-#line 2025 "seclang-parser.yy" ++#line 2027 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeaders_NoDictElement()); + } +@@ -3689,7 +3689,7 @@ namespace yy { + break; + + case 203: // var: VARIABLE_RESPONSE_HEADERS "Dictionary element" +-#line 2029 "seclang-parser.yy" ++#line 2031 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeaders_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3697,7 +3697,7 @@ namespace yy { + break; + + case 204: // var: VARIABLE_RESPONSE_HEADERS "Dictionary element, selected by regexp" +-#line 2033 "seclang-parser.yy" ++#line 2035 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeaders_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3705,7 +3705,7 @@ namespace yy { + break; + + case 205: // var: VARIABLE_RESPONSE_HEADERS +-#line 2037 "seclang-parser.yy" ++#line 2039 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeaders_NoDictElement()); + } +@@ -3713,7 +3713,7 @@ namespace yy { + break; + + case 206: // var: VARIABLE_GEO "Dictionary element" +-#line 2041 "seclang-parser.yy" ++#line 2043 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Geo_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3721,7 +3721,7 @@ namespace yy { + break; + + case 207: // var: VARIABLE_GEO "Dictionary element, selected by regexp" +-#line 2045 "seclang-parser.yy" ++#line 2047 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Geo_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3729,7 +3729,7 @@ namespace yy { + break; + + case 208: // var: VARIABLE_GEO +-#line 2049 "seclang-parser.yy" ++#line 2051 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Geo_NoDictElement()); + } +@@ -3737,7 +3737,7 @@ namespace yy { + break; + + case 209: // var: VARIABLE_REQUEST_COOKIES_NAMES "Dictionary element" +-#line 2053 "seclang-parser.yy" ++#line 2055 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookiesNames_DictElement(yystack_[0].value.as < std::string > ())); + } +@@ -3745,7 +3745,7 @@ namespace yy { + break; + + case 210: // var: VARIABLE_REQUEST_COOKIES_NAMES "Dictionary element, selected by regexp" +-#line 2057 "seclang-parser.yy" ++#line 2059 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookiesNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } +@@ -3753,1905 +3753,1929 @@ namespace yy { + break; + + case 211: // var: VARIABLE_REQUEST_COOKIES_NAMES +-#line 2061 "seclang-parser.yy" ++#line 2063 "seclang-parser.yy" + { + VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestCookiesNames_NoDictElement()); + } + #line 3761 "seclang-parser.cc" + break; + +- case 212: // var: VARIABLE_RULE "Dictionary element" +-#line 2065 "seclang-parser.yy" ++ case 212: // var: VARIABLE_MULTIPART_PART_HEADERS "Dictionary element" ++#line 2067 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartPartHeaders_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3769 "seclang-parser.cc" + break; + +- case 213: // var: VARIABLE_RULE "Dictionary element, selected by regexp" +-#line 2069 "seclang-parser.yy" ++ case 213: // var: VARIABLE_MULTIPART_PART_HEADERS "Dictionary element, selected by regexp" ++#line 2071 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartPartHeaders_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3777 "seclang-parser.cc" + break; + +- case 214: // var: VARIABLE_RULE +-#line 2073 "seclang-parser.yy" ++ case 214: // var: VARIABLE_MULTIPART_PART_HEADERS ++#line 2075 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartPartHeaders_NoDictElement()); + } + #line 3785 "seclang-parser.cc" + break; + +- case 215: // var: "RUN_TIME_VAR_ENV" "Dictionary element" +-#line 2077 "seclang-parser.yy" ++ case 215: // var: VARIABLE_RULE "Dictionary element" ++#line 2079 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3793 "seclang-parser.cc" + break; + +- case 216: // var: "RUN_TIME_VAR_ENV" "Dictionary element, selected by regexp" +-#line 2081 "seclang-parser.yy" ++ case 216: // var: VARIABLE_RULE "Dictionary element, selected by regexp" ++#line 2083 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3801 "seclang-parser.cc" + break; + +- case 217: // var: "RUN_TIME_VAR_ENV" +-#line 2085 "seclang-parser.yy" ++ case 217: // var: VARIABLE_RULE ++#line 2087 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV")); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Rule_NoDictElement()); + } + #line 3809 "seclang-parser.cc" + break; + +- case 218: // var: "RUN_TIME_VAR_XML" "Dictionary element" +-#line 2089 "seclang-parser.yy" ++ case 218: // var: "RUN_TIME_VAR_ENV" "Dictionary element" ++#line 2091 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); + } + #line 3817 "seclang-parser.cc" + break; + +- case 219: // var: "RUN_TIME_VAR_XML" "Dictionary element, selected by regexp" +-#line 2093 "seclang-parser.yy" ++ case 219: // var: "RUN_TIME_VAR_ENV" "Dictionary element, selected by regexp" ++#line 2095 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as < std::string > ())); + } + #line 3825 "seclang-parser.cc" + break; + +- case 220: // var: "RUN_TIME_VAR_XML" +-#line 2097 "seclang-parser.yy" ++ case 220: // var: "RUN_TIME_VAR_ENV" ++#line 2099 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Env("ENV")); + } + #line 3833 "seclang-parser.cc" + break; + +- case 221: // var: "FILES_TMPNAMES" "Dictionary element" +-#line 2101 "seclang-parser.yy" ++ case 221: // var: "RUN_TIME_VAR_XML" "Dictionary element" ++#line 2103 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); + } + #line 3841 "seclang-parser.cc" + break; + +- case 222: // var: "FILES_TMPNAMES" "Dictionary element, selected by regexp" +-#line 2105 "seclang-parser.yy" ++ case 222: // var: "RUN_TIME_VAR_XML" "Dictionary element, selected by regexp" ++#line 2107 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as < std::string > ())); + } + #line 3849 "seclang-parser.cc" + break; + +- case 223: // var: "FILES_TMPNAMES" +-#line 2109 "seclang-parser.yy" ++ case 223: // var: "RUN_TIME_VAR_XML" ++#line 2111 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::XML_NoDictElement()); + } + #line 3857 "seclang-parser.cc" + break; + +- case 224: // var: "RESOURCE" run_time_string +-#line 2113 "seclang-parser.yy" ++ case 224: // var: "FILES_TMPNAMES" "Dictionary element" ++#line 2115 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3865 "seclang-parser.cc" + break; + +- case 225: // var: "RESOURCE" "Dictionary element" +-#line 2117 "seclang-parser.yy" ++ case 225: // var: "FILES_TMPNAMES" "Dictionary element, selected by regexp" ++#line 2119 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3873 "seclang-parser.cc" + break; + +- case 226: // var: "RESOURCE" "Dictionary element, selected by regexp" +-#line 2121 "seclang-parser.yy" ++ case 226: // var: "FILES_TMPNAMES" ++#line 2123 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesTmpNames_NoDictElement()); + } + #line 3881 "seclang-parser.cc" + break; + +- case 227: // var: "RESOURCE" +-#line 2125 "seclang-parser.yy" ++ case 227: // var: "RESOURCE" run_time_string ++#line 2127 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3889 "seclang-parser.cc" + break; + +- case 228: // var: "VARIABLE_IP" run_time_string +-#line 2129 "seclang-parser.yy" ++ case 228: // var: "RESOURCE" "Dictionary element" ++#line 2131 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3897 "seclang-parser.cc" + break; + +- case 229: // var: "VARIABLE_IP" "Dictionary element" +-#line 2133 "seclang-parser.yy" ++ case 229: // var: "RESOURCE" "Dictionary element, selected by regexp" ++#line 2135 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3905 "seclang-parser.cc" + break; + +- case 230: // var: "VARIABLE_IP" "Dictionary element, selected by regexp" +-#line 2137 "seclang-parser.yy" ++ case 230: // var: "RESOURCE" ++#line 2139 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Resource_NoDictElement()); + } + #line 3913 "seclang-parser.cc" + break; + +- case 231: // var: "VARIABLE_IP" +-#line 2141 "seclang-parser.yy" ++ case 231: // var: "VARIABLE_IP" run_time_string ++#line 2143 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3921 "seclang-parser.cc" + break; + +- case 232: // var: "VARIABLE_GLOBAL" run_time_string +-#line 2145 "seclang-parser.yy" ++ case 232: // var: "VARIABLE_IP" "Dictionary element" ++#line 2147 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3929 "seclang-parser.cc" + break; + +- case 233: // var: "VARIABLE_GLOBAL" "Dictionary element" +-#line 2149 "seclang-parser.yy" ++ case 233: // var: "VARIABLE_IP" "Dictionary element, selected by regexp" ++#line 2151 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3937 "seclang-parser.cc" + break; + +- case 234: // var: "VARIABLE_GLOBAL" "Dictionary element, selected by regexp" +-#line 2153 "seclang-parser.yy" ++ case 234: // var: "VARIABLE_IP" ++#line 2155 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Ip_NoDictElement()); + } + #line 3945 "seclang-parser.cc" + break; + +- case 235: // var: "VARIABLE_GLOBAL" +-#line 2157 "seclang-parser.yy" ++ case 235: // var: "VARIABLE_GLOBAL" run_time_string ++#line 2159 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3953 "seclang-parser.cc" + break; + +- case 236: // var: "VARIABLE_USER" run_time_string +-#line 2161 "seclang-parser.yy" ++ case 236: // var: "VARIABLE_GLOBAL" "Dictionary element" ++#line 2163 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3961 "seclang-parser.cc" + break; + +- case 237: // var: "VARIABLE_USER" "Dictionary element" +-#line 2165 "seclang-parser.yy" ++ case 237: // var: "VARIABLE_GLOBAL" "Dictionary element, selected by regexp" ++#line 2167 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 3969 "seclang-parser.cc" + break; + +- case 238: // var: "VARIABLE_USER" "Dictionary element, selected by regexp" +-#line 2169 "seclang-parser.yy" ++ case 238: // var: "VARIABLE_GLOBAL" ++#line 2171 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Global_NoDictElement()); + } + #line 3977 "seclang-parser.cc" + break; + +- case 239: // var: "VARIABLE_USER" +-#line 2173 "seclang-parser.yy" ++ case 239: // var: "VARIABLE_USER" run_time_string ++#line 2175 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 3985 "seclang-parser.cc" + break; + +- case 240: // var: "VARIABLE_TX" run_time_string +-#line 2177 "seclang-parser.yy" ++ case 240: // var: "VARIABLE_USER" "Dictionary element" ++#line 2179 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 3993 "seclang-parser.cc" + break; + +- case 241: // var: "VARIABLE_TX" "Dictionary element" +-#line 2181 "seclang-parser.yy" ++ case 241: // var: "VARIABLE_USER" "Dictionary element, selected by regexp" ++#line 2183 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4001 "seclang-parser.cc" + break; + +- case 242: // var: "VARIABLE_TX" "Dictionary element, selected by regexp" +-#line 2185 "seclang-parser.yy" ++ case 242: // var: "VARIABLE_USER" ++#line 2187 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::User_NoDictElement()); + } + #line 4009 "seclang-parser.cc" + break; + +- case 243: // var: "VARIABLE_TX" +-#line 2189 "seclang-parser.yy" ++ case 243: // var: "VARIABLE_TX" run_time_string ++#line 2191 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 4017 "seclang-parser.cc" + break; + +- case 244: // var: "VARIABLE_SESSION" run_time_string +-#line 2193 "seclang-parser.yy" ++ case 244: // var: "VARIABLE_TX" "Dictionary element" ++#line 2195 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4025 "seclang-parser.cc" + break; + +- case 245: // var: "VARIABLE_SESSION" "Dictionary element" +-#line 2197 "seclang-parser.yy" ++ case 245: // var: "VARIABLE_TX" "Dictionary element, selected by regexp" ++#line 2199 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4033 "seclang-parser.cc" + break; + +- case 246: // var: "VARIABLE_SESSION" "Dictionary element, selected by regexp" +-#line 2201 "seclang-parser.yy" ++ case 246: // var: "VARIABLE_TX" ++#line 2203 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Tx_NoDictElement()); + } + #line 4041 "seclang-parser.cc" + break; + +- case 247: // var: "VARIABLE_SESSION" +-#line 2205 "seclang-parser.yy" ++ case 247: // var: "VARIABLE_SESSION" run_time_string ++#line 2207 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DynamicElement(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } + #line 4049 "seclang-parser.cc" + break; + +- case 248: // var: "Variable ARGS_NAMES" "Dictionary element" +-#line 2209 "seclang-parser.yy" ++ case 248: // var: "VARIABLE_SESSION" "Dictionary element" ++#line 2211 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4057 "seclang-parser.cc" + break; + +- case 249: // var: "Variable ARGS_NAMES" "Dictionary element, selected by regexp" +-#line 2213 "seclang-parser.yy" ++ case 249: // var: "VARIABLE_SESSION" "Dictionary element, selected by regexp" ++#line 2215 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4065 "seclang-parser.cc" + break; + +- case 250: // var: "Variable ARGS_NAMES" +-#line 2217 "seclang-parser.yy" ++ case 250: // var: "VARIABLE_SESSION" ++#line 2219 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Session_NoDictElement()); + } + #line 4073 "seclang-parser.cc" + break; + +- case 251: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element" +-#line 2221 "seclang-parser.yy" ++ case 251: // var: "Variable ARGS_NAMES" "Dictionary element" ++#line 2223 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4081 "seclang-parser.cc" + break; + +- case 252: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element, selected by regexp" +-#line 2225 "seclang-parser.yy" ++ case 252: // var: "Variable ARGS_NAMES" "Dictionary element, selected by regexp" ++#line 2227 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4089 "seclang-parser.cc" + break; + +- case 253: // var: VARIABLE_ARGS_GET_NAMES +-#line 2229 "seclang-parser.yy" ++ case 253: // var: "Variable ARGS_NAMES" ++#line 2231 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsNames_NoDictElement()); + } + #line 4097 "seclang-parser.cc" + break; + +- case 254: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element" +-#line 2234 "seclang-parser.yy" ++ case 254: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element" ++#line 2235 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4105 "seclang-parser.cc" + break; + +- case 255: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element, selected by regexp" +-#line 2238 "seclang-parser.yy" ++ case 255: // var: VARIABLE_ARGS_GET_NAMES "Dictionary element, selected by regexp" ++#line 2239 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4113 "seclang-parser.cc" + break; + +- case 256: // var: VARIABLE_ARGS_POST_NAMES +-#line 2242 "seclang-parser.yy" ++ case 256: // var: VARIABLE_ARGS_GET_NAMES ++#line 2243 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsGetNames_NoDictElement()); + } + #line 4121 "seclang-parser.cc" + break; + +- case 257: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element" +-#line 2247 "seclang-parser.yy" ++ case 257: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element" ++#line 2248 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4129 "seclang-parser.cc" + break; + +- case 258: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element, selected by regexp" +-#line 2251 "seclang-parser.yy" ++ case 258: // var: VARIABLE_ARGS_POST_NAMES "Dictionary element, selected by regexp" ++#line 2252 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4137 "seclang-parser.cc" + break; + +- case 259: // var: VARIABLE_REQUEST_HEADERS_NAMES +-#line 2255 "seclang-parser.yy" ++ case 259: // var: VARIABLE_ARGS_POST_NAMES ++#line 2256 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsPostNames_NoDictElement()); + } + #line 4145 "seclang-parser.cc" + break; + +- case 260: // var: VARIABLE_RESPONSE_CONTENT_TYPE +-#line 2260 "seclang-parser.yy" ++ case 260: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element" ++#line 2261 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentType()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4153 "seclang-parser.cc" + break; + +- case 261: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element" ++ case 261: // var: VARIABLE_REQUEST_HEADERS_NAMES "Dictionary element, selected by regexp" + #line 2265 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4161 "seclang-parser.cc" + break; + +- case 262: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element, selected by regexp" ++ case 262: // var: VARIABLE_REQUEST_HEADERS_NAMES + #line 2269 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestHeadersNames_NoDictElement()); + } + #line 4169 "seclang-parser.cc" + break; + +- case 263: // var: VARIABLE_RESPONSE_HEADERS_NAMES +-#line 2273 "seclang-parser.yy" ++ case 263: // var: VARIABLE_RESPONSE_CONTENT_TYPE ++#line 2274 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_NoDictElement()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentType()); + } + #line 4177 "seclang-parser.cc" + break; + +- case 264: // var: VARIABLE_ARGS_COMBINED_SIZE +-#line 2277 "seclang-parser.yy" ++ case 264: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element" ++#line 2279 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsCombinedSize()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElement(yystack_[0].value.as < std::string > ())); + } + #line 4185 "seclang-parser.cc" + break; + +- case 265: // var: "AUTH_TYPE" +-#line 2281 "seclang-parser.yy" ++ case 265: // var: VARIABLE_RESPONSE_HEADERS_NAMES "Dictionary element, selected by regexp" ++#line 2283 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::AuthType()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_DictElementRegexp(yystack_[0].value.as < std::string > ())); + } + #line 4193 "seclang-parser.cc" + break; + +- case 266: // var: "FILES_COMBINED_SIZE" +-#line 2285 "seclang-parser.yy" ++ case 266: // var: VARIABLE_RESPONSE_HEADERS_NAMES ++#line 2287 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesCombinedSize()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseHeadersNames_NoDictElement()); + } + #line 4201 "seclang-parser.cc" + break; + +- case 267: // var: "FULL_REQUEST" +-#line 2289 "seclang-parser.yy" ++ case 267: // var: VARIABLE_ARGS_COMBINED_SIZE ++#line 2291 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequest()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ArgsCombinedSize()); + } + #line 4209 "seclang-parser.cc" + break; + +- case 268: // var: "FULL_REQUEST_LENGTH" +-#line 2293 "seclang-parser.yy" ++ case 268: // var: "AUTH_TYPE" ++#line 2295 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequestLength()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::AuthType()); + } + #line 4217 "seclang-parser.cc" + break; + +- case 269: // var: "INBOUND_DATA_ERROR" +-#line 2297 "seclang-parser.yy" ++ case 269: // var: "FILES_COMBINED_SIZE" ++#line 2299 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::InboundDataError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FilesCombinedSize()); + } + #line 4225 "seclang-parser.cc" + break; + +- case 270: // var: "MATCHED_VAR" +-#line 2301 "seclang-parser.yy" ++ case 270: // var: "FULL_REQUEST" ++#line 2303 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVar()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequest()); + } + #line 4233 "seclang-parser.cc" + break; + +- case 271: // var: "MATCHED_VAR_NAME" +-#line 2305 "seclang-parser.yy" ++ case 271: // var: "FULL_REQUEST_LENGTH" ++#line 2307 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarName()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::FullRequestLength()); + } + #line 4241 "seclang-parser.cc" + break; + +- case 272: // var: VARIABLE_MULTIPART_BOUNDARY_QUOTED +-#line 2309 "seclang-parser.yy" ++ case 272: // var: "INBOUND_DATA_ERROR" ++#line 2311 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryQuoted()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::InboundDataError()); + } + #line 4249 "seclang-parser.cc" + break; + +- case 273: // var: VARIABLE_MULTIPART_BOUNDARY_WHITESPACE +-#line 2313 "seclang-parser.yy" ++ case 273: // var: "MATCHED_VAR" ++#line 2315 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryWhiteSpace()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVar()); + } + #line 4257 "seclang-parser.cc" + break; + +- case 274: // var: "MULTIPART_CRLF_LF_LINES" +-#line 2317 "seclang-parser.yy" ++ case 274: // var: "MATCHED_VAR_NAME" ++#line 2319 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartCrlfLFLines()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MatchedVarName()); + } + #line 4265 "seclang-parser.cc" + break; + +- case 275: // var: "MULTIPART_DATA_AFTER" +-#line 2321 "seclang-parser.yy" ++ case 275: // var: VARIABLE_MULTIPART_BOUNDARY_QUOTED ++#line 2323 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateAfter()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryQuoted()); + } + #line 4273 "seclang-parser.cc" + break; + +- case 276: // var: VARIABLE_MULTIPART_DATA_BEFORE +-#line 2325 "seclang-parser.yy" ++ case 276: // var: VARIABLE_MULTIPART_BOUNDARY_WHITESPACE ++#line 2327 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateBefore()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartBoundaryWhiteSpace()); + } + #line 4281 "seclang-parser.cc" + break; + +- case 277: // var: "MULTIPART_FILE_LIMIT_EXCEEDED" +-#line 2329 "seclang-parser.yy" ++ case 277: // var: "MULTIPART_CRLF_LF_LINES" ++#line 2331 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartFileLimitExceeded()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartCrlfLFLines()); + } + #line 4289 "seclang-parser.cc" + break; + +- case 278: // var: "MULTIPART_HEADER_FOLDING" +-#line 2333 "seclang-parser.yy" ++ case 278: // var: "MULTIPART_DATA_AFTER" ++#line 2335 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartHeaderFolding()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateAfter()); + } + #line 4297 "seclang-parser.cc" + break; + +- case 279: // var: "MULTIPART_INVALID_HEADER_FOLDING" +-#line 2337 "seclang-parser.yy" ++ case 279: // var: VARIABLE_MULTIPART_DATA_BEFORE ++#line 2339 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidHeaderFolding()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartDateBefore()); + } + #line 4305 "seclang-parser.cc" + break; + +- case 280: // var: VARIABLE_MULTIPART_INVALID_PART +-#line 2341 "seclang-parser.yy" ++ case 280: // var: "MULTIPART_FILE_LIMIT_EXCEEDED" ++#line 2343 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidPart()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartFileLimitExceeded()); + } + #line 4313 "seclang-parser.cc" + break; + +- case 281: // var: "MULTIPART_INVALID_QUOTING" +-#line 2345 "seclang-parser.yy" ++ case 281: // var: "MULTIPART_HEADER_FOLDING" ++#line 2347 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidQuoting()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartHeaderFolding()); + } + #line 4321 "seclang-parser.cc" + break; + +- case 282: // var: VARIABLE_MULTIPART_LF_LINE +-#line 2349 "seclang-parser.yy" ++ case 282: // var: "MULTIPART_INVALID_HEADER_FOLDING" ++#line 2351 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartLFLine()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidHeaderFolding()); + } + #line 4329 "seclang-parser.cc" + break; + +- case 283: // var: VARIABLE_MULTIPART_MISSING_SEMICOLON +-#line 2353 "seclang-parser.yy" ++ case 283: // var: VARIABLE_MULTIPART_INVALID_PART ++#line 2355 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidPart()); + } + #line 4337 "seclang-parser.cc" + break; + +- case 284: // var: VARIABLE_MULTIPART_SEMICOLON_MISSING +-#line 2357 "seclang-parser.yy" ++ case 284: // var: "MULTIPART_INVALID_QUOTING" ++#line 2359 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartInvalidQuoting()); + } + #line 4345 "seclang-parser.cc" + break; + +- case 285: // var: "MULTIPART_STRICT_ERROR" +-#line 2361 "seclang-parser.yy" ++ case 285: // var: VARIABLE_MULTIPART_LF_LINE ++#line 2363 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartStrictError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartLFLine()); + } + #line 4353 "seclang-parser.cc" + break; + +- case 286: // var: "MULTIPART_UNMATCHED_BOUNDARY" +-#line 2365 "seclang-parser.yy" ++ case 286: // var: VARIABLE_MULTIPART_MISSING_SEMICOLON ++#line 2367 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartUnmatchedBoundary()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); + } + #line 4361 "seclang-parser.cc" + break; + +- case 287: // var: "OUTBOUND_DATA_ERROR" +-#line 2369 "seclang-parser.yy" ++ case 287: // var: VARIABLE_MULTIPART_SEMICOLON_MISSING ++#line 2371 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::OutboundDataError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartMissingSemicolon()); + } + #line 4369 "seclang-parser.cc" + break; + +- case 288: // var: "PATH_INFO" +-#line 2373 "seclang-parser.yy" ++ case 288: // var: "MULTIPART_STRICT_ERROR" ++#line 2375 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::PathInfo()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartStrictError()); + } + #line 4377 "seclang-parser.cc" + break; + +- case 289: // var: "QUERY_STRING" +-#line 2377 "seclang-parser.yy" ++ case 289: // var: "MULTIPART_UNMATCHED_BOUNDARY" ++#line 2379 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::QueryString()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::MultipartUnmatchedBoundary()); + } + #line 4385 "seclang-parser.cc" + break; + +- case 290: // var: "REMOTE_ADDR" +-#line 2381 "seclang-parser.yy" ++ case 290: // var: "OUTBOUND_DATA_ERROR" ++#line 2383 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteAddr()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::OutboundDataError()); + } + #line 4393 "seclang-parser.cc" + break; + +- case 291: // var: "REMOTE_HOST" +-#line 2385 "seclang-parser.yy" ++ case 291: // var: "PATH_INFO" ++#line 2387 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteHost()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::PathInfo()); + } + #line 4401 "seclang-parser.cc" + break; + +- case 292: // var: "REMOTE_PORT" +-#line 2389 "seclang-parser.yy" ++ case 292: // var: "QUERY_STRING" ++#line 2391 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemotePort()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::QueryString()); + } + #line 4409 "seclang-parser.cc" + break; + +- case 293: // var: "REQBODY_ERROR" +-#line 2393 "seclang-parser.yy" ++ case 293: // var: "REMOTE_ADDR" ++#line 2395 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteAddr()); + } + #line 4417 "seclang-parser.cc" + break; + +- case 294: // var: "REQBODY_ERROR_MSG" +-#line 2397 "seclang-parser.yy" ++ case 294: // var: "REMOTE_HOST" ++#line 2399 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyErrorMsg()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemoteHost()); + } + #line 4425 "seclang-parser.cc" + break; + +- case 295: // var: "REQBODY_PROCESSOR" +-#line 2401 "seclang-parser.yy" ++ case 295: // var: "REMOTE_PORT" ++#line 2403 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessor()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RemotePort()); + } + #line 4433 "seclang-parser.cc" + break; + +- case 296: // var: "REQBODY_PROCESSOR_ERROR" +-#line 2405 "seclang-parser.yy" ++ case 296: // var: "REQBODY_ERROR" ++#line 2407 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyError()); + } + #line 4441 "seclang-parser.cc" + break; + +- case 297: // var: "REQBODY_PROCESSOR_ERROR_MSG" +-#line 2409 "seclang-parser.yy" ++ case 297: // var: "REQBODY_ERROR_MSG" ++#line 2411 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorErrorMsg()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyErrorMsg()); + } + #line 4449 "seclang-parser.cc" + break; + +- case 298: // var: "REQUEST_BASENAME" +-#line 2413 "seclang-parser.yy" ++ case 298: // var: "REQBODY_PROCESSOR" ++#line 2415 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBasename()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessor()); + } + #line 4457 "seclang-parser.cc" + break; + +- case 299: // var: "REQUEST_BODY" +-#line 2417 "seclang-parser.yy" ++ case 299: // var: "REQBODY_PROCESSOR_ERROR" ++#line 2419 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBody()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorError()); + } + #line 4465 "seclang-parser.cc" + break; + +- case 300: // var: "REQUEST_BODY_LENGTH" +-#line 2421 "seclang-parser.yy" ++ case 300: // var: "REQBODY_PROCESSOR_ERROR_MSG" ++#line 2423 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBodyLength()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ReqbodyProcessorErrorMsg()); + } + #line 4473 "seclang-parser.cc" + break; + +- case 301: // var: "REQUEST_FILENAME" +-#line 2425 "seclang-parser.yy" ++ case 301: // var: "REQUEST_BASENAME" ++#line 2427 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestFilename()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBasename()); + } + #line 4481 "seclang-parser.cc" + break; + +- case 302: // var: "REQUEST_LINE" +-#line 2429 "seclang-parser.yy" ++ case 302: // var: "REQUEST_BODY" ++#line 2431 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestLine()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBody()); + } + #line 4489 "seclang-parser.cc" + break; + +- case 303: // var: "REQUEST_METHOD" +-#line 2433 "seclang-parser.yy" ++ case 303: // var: "REQUEST_BODY_LENGTH" ++#line 2435 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestMethod()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestBodyLength()); + } + #line 4497 "seclang-parser.cc" + break; + +- case 304: // var: "REQUEST_PROTOCOL" +-#line 2437 "seclang-parser.yy" ++ case 304: // var: "REQUEST_FILENAME" ++#line 2439 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestProtocol()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestFilename()); + } + #line 4505 "seclang-parser.cc" + break; + +- case 305: // var: "REQUEST_URI" +-#line 2441 "seclang-parser.yy" ++ case 305: // var: "REQUEST_LINE" ++#line 2443 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURI()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestLine()); + } + #line 4513 "seclang-parser.cc" + break; + +- case 306: // var: "REQUEST_URI_RAW" +-#line 2445 "seclang-parser.yy" ++ case 306: // var: "REQUEST_METHOD" ++#line 2447 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURIRaw()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestMethod()); + } + #line 4521 "seclang-parser.cc" + break; + +- case 307: // var: "RESPONSE_BODY" +-#line 2449 "seclang-parser.yy" ++ case 307: // var: "REQUEST_PROTOCOL" ++#line 2451 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseBody()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestProtocol()); + } + #line 4529 "seclang-parser.cc" + break; + +- case 308: // var: "RESPONSE_CONTENT_LENGTH" +-#line 2453 "seclang-parser.yy" ++ case 308: // var: "REQUEST_URI" ++#line 2455 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentLength()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURI()); + } + #line 4537 "seclang-parser.cc" + break; + +- case 309: // var: "RESPONSE_PROTOCOL" +-#line 2457 "seclang-parser.yy" ++ case 309: // var: "REQUEST_URI_RAW" ++#line 2459 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseProtocol()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::RequestURIRaw()); + } + #line 4545 "seclang-parser.cc" + break; + +- case 310: // var: "RESPONSE_STATUS" +-#line 2461 "seclang-parser.yy" ++ case 310: // var: "RESPONSE_BODY" ++#line 2463 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseStatus()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseBody()); + } + #line 4553 "seclang-parser.cc" + break; + +- case 311: // var: "SERVER_ADDR" +-#line 2465 "seclang-parser.yy" ++ case 311: // var: "RESPONSE_CONTENT_LENGTH" ++#line 2467 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerAddr()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseContentLength()); + } + #line 4561 "seclang-parser.cc" + break; + +- case 312: // var: "SERVER_NAME" +-#line 2469 "seclang-parser.yy" ++ case 312: // var: "RESPONSE_PROTOCOL" ++#line 2471 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerName()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseProtocol()); + } + #line 4569 "seclang-parser.cc" + break; + +- case 313: // var: "SERVER_PORT" +-#line 2473 "seclang-parser.yy" ++ case 313: // var: "RESPONSE_STATUS" ++#line 2475 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerPort()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ResponseStatus()); + } + #line 4577 "seclang-parser.cc" + break; + +- case 314: // var: "SESSIONID" +-#line 2477 "seclang-parser.yy" ++ case 314: // var: "SERVER_ADDR" ++#line 2479 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::SessionID()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerAddr()); + } + #line 4585 "seclang-parser.cc" + break; + +- case 315: // var: "UNIQUE_ID" +-#line 2481 "seclang-parser.yy" ++ case 315: // var: "SERVER_NAME" ++#line 2483 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UniqueID()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerName()); + } + #line 4593 "seclang-parser.cc" + break; + +- case 316: // var: "URLENCODED_ERROR" +-#line 2485 "seclang-parser.yy" ++ case 316: // var: "SERVER_PORT" ++#line 2487 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UrlEncodedError()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::ServerPort()); + } + #line 4601 "seclang-parser.cc" + break; + +- case 317: // var: "USERID" +-#line 2489 "seclang-parser.yy" ++ case 317: // var: "SESSIONID" ++#line 2491 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UserID()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::SessionID()); + } + #line 4609 "seclang-parser.cc" + break; + +- case 318: // var: "VARIABLE_STATUS" +-#line 2493 "seclang-parser.yy" ++ case 318: // var: "UNIQUE_ID" ++#line 2495 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UniqueID()); + } + #line 4617 "seclang-parser.cc" + break; + +- case 319: // var: "VARIABLE_STATUS_LINE" +-#line 2497 "seclang-parser.yy" ++ case 319: // var: "URLENCODED_ERROR" ++#line 2499 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UrlEncodedError()); + } + #line 4625 "seclang-parser.cc" + break; + +- case 320: // var: "WEBAPPID" +-#line 2501 "seclang-parser.yy" ++ case 320: // var: "USERID" ++#line 2503 "seclang-parser.yy" + { +- VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::WebAppId()); ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::UserID()); + } + #line 4633 "seclang-parser.cc" + break; + +- case 321: // var: "RUN_TIME_VAR_DUR" +-#line 2505 "seclang-parser.yy" ++ case 321: // var: "VARIABLE_STATUS" ++#line 2507 "seclang-parser.yy" ++ { ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ } ++#line 4641 "seclang-parser.cc" ++ break; ++ ++ case 322: // var: "VARIABLE_STATUS_LINE" ++#line 2511 "seclang-parser.yy" ++ { ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::Status()); ++ } ++#line 4649 "seclang-parser.cc" ++ break; ++ ++ case 323: // var: "WEBAPPID" ++#line 2515 "seclang-parser.yy" ++ { ++ VARIABLE_CONTAINER(yylhs.value.as < std::unique_ptr > (), new variables::WebAppId()); ++ } ++#line 4657 "seclang-parser.cc" ++ break; ++ ++ case 324: // var: "RUN_TIME_VAR_DUR" ++#line 2519 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new Duration(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4644 "seclang-parser.cc" ++#line 4668 "seclang-parser.cc" + break; + +- case 322: // var: "RUN_TIME_VAR_BLD" +-#line 2513 "seclang-parser.yy" ++ case 325: // var: "RUN_TIME_VAR_BLD" ++#line 2527 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new ModsecBuild(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4655 "seclang-parser.cc" ++#line 4679 "seclang-parser.cc" + break; + +- case 323: // var: "RUN_TIME_VAR_HSV" +-#line 2520 "seclang-parser.yy" ++ case 326: // var: "RUN_TIME_VAR_HSV" ++#line 2534 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new HighestSeverity(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4666 "seclang-parser.cc" ++#line 4690 "seclang-parser.cc" + break; + +- case 324: // var: "RUN_TIME_VAR_REMOTE_USER" +-#line 2527 "seclang-parser.yy" ++ case 327: // var: "RUN_TIME_VAR_REMOTE_USER" ++#line 2541 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new RemoteUser(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4677 "seclang-parser.cc" ++#line 4701 "seclang-parser.cc" + break; + +- case 325: // var: "RUN_TIME_VAR_TIME" +-#line 2534 "seclang-parser.yy" ++ case 328: // var: "RUN_TIME_VAR_TIME" ++#line 2548 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new Time(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4688 "seclang-parser.cc" ++#line 4712 "seclang-parser.cc" + break; + +- case 326: // var: "RUN_TIME_VAR_TIME_DAY" +-#line 2541 "seclang-parser.yy" ++ case 329: // var: "RUN_TIME_VAR_TIME_DAY" ++#line 2555 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeDay(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4699 "seclang-parser.cc" ++#line 4723 "seclang-parser.cc" + break; + +- case 327: // var: "RUN_TIME_VAR_TIME_EPOCH" +-#line 2548 "seclang-parser.yy" ++ case 330: // var: "RUN_TIME_VAR_TIME_EPOCH" ++#line 2562 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeEpoch(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4710 "seclang-parser.cc" ++#line 4734 "seclang-parser.cc" + break; + +- case 328: // var: "RUN_TIME_VAR_TIME_HOUR" +-#line 2555 "seclang-parser.yy" ++ case 331: // var: "RUN_TIME_VAR_TIME_HOUR" ++#line 2569 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeHour(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4721 "seclang-parser.cc" ++#line 4745 "seclang-parser.cc" + break; + +- case 329: // var: "RUN_TIME_VAR_TIME_MIN" +-#line 2562 "seclang-parser.yy" ++ case 332: // var: "RUN_TIME_VAR_TIME_MIN" ++#line 2576 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeMin(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4732 "seclang-parser.cc" ++#line 4756 "seclang-parser.cc" + break; + +- case 330: // var: "RUN_TIME_VAR_TIME_MON" +-#line 2569 "seclang-parser.yy" ++ case 333: // var: "RUN_TIME_VAR_TIME_MON" ++#line 2583 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeMon(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4743 "seclang-parser.cc" ++#line 4767 "seclang-parser.cc" + break; + +- case 331: // var: "RUN_TIME_VAR_TIME_SEC" +-#line 2576 "seclang-parser.yy" ++ case 334: // var: "RUN_TIME_VAR_TIME_SEC" ++#line 2590 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeSec(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4754 "seclang-parser.cc" ++#line 4778 "seclang-parser.cc" + break; + +- case 332: // var: "RUN_TIME_VAR_TIME_WDAY" +-#line 2583 "seclang-parser.yy" ++ case 335: // var: "RUN_TIME_VAR_TIME_WDAY" ++#line 2597 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeWDay(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4765 "seclang-parser.cc" ++#line 4789 "seclang-parser.cc" + break; + +- case 333: // var: "RUN_TIME_VAR_TIME_YEAR" +-#line 2590 "seclang-parser.yy" ++ case 336: // var: "RUN_TIME_VAR_TIME_YEAR" ++#line 2604 "seclang-parser.yy" + { + std::string name(yystack_[0].value.as < std::string > ()); + char z = name.at(0); + std::unique_ptr c(new TimeYear(name)); + yylhs.value.as < std::unique_ptr > () = std::move(c); + } +-#line 4776 "seclang-parser.cc" ++#line 4800 "seclang-parser.cc" + break; + +- case 334: // act: "Accuracy" +-#line 2600 "seclang-parser.yy" ++ case 337: // act: "Accuracy" ++#line 2614 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Accuracy(yystack_[0].value.as < std::string > ())); + } +-#line 4784 "seclang-parser.cc" ++#line 4808 "seclang-parser.cc" + break; + +- case 335: // act: "Allow" +-#line 2604 "seclang-parser.yy" ++ case 338: // act: "Allow" ++#line 2618 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Allow(yystack_[0].value.as < std::string > ())); + } +-#line 4792 "seclang-parser.cc" ++#line 4816 "seclang-parser.cc" + break; + +- case 336: // act: "Append" +-#line 2608 "seclang-parser.yy" ++ case 339: // act: "Append" ++#line 2622 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Append", yystack_[1].location); + } +-#line 4800 "seclang-parser.cc" ++#line 4824 "seclang-parser.cc" + break; + +- case 337: // act: "AuditLog" +-#line 2612 "seclang-parser.yy" ++ case 340: // act: "AuditLog" ++#line 2626 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::AuditLog(yystack_[0].value.as < std::string > ())); + } +-#line 4808 "seclang-parser.cc" ++#line 4832 "seclang-parser.cc" + break; + +- case 338: // act: "Block" +-#line 2616 "seclang-parser.yy" ++ case 341: // act: "Block" ++#line 2630 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Block(yystack_[0].value.as < std::string > ())); + } +-#line 4816 "seclang-parser.cc" ++#line 4840 "seclang-parser.cc" + break; + +- case 339: // act: "Capture" +-#line 2620 "seclang-parser.yy" ++ case 342: // act: "Capture" ++#line 2634 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Capture(yystack_[0].value.as < std::string > ())); + } +-#line 4824 "seclang-parser.cc" ++#line 4848 "seclang-parser.cc" + break; + +- case 340: // act: "Chain" +-#line 2624 "seclang-parser.yy" ++ case 343: // act: "Chain" ++#line 2638 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Chain(yystack_[0].value.as < std::string > ())); + } +-#line 4832 "seclang-parser.cc" ++#line 4856 "seclang-parser.cc" + break; + +- case 341: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_ON" +-#line 2628 "seclang-parser.yy" ++ case 344: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_ON" ++#line 2642 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditEngine("ctl:auditengine=on")); + driver.m_auditLog->setCtlAuditEngineActive(); + } +-#line 4841 "seclang-parser.cc" ++#line 4865 "seclang-parser.cc" + break; + +- case 342: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_OFF" +-#line 2633 "seclang-parser.yy" ++ case 345: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_OFF" ++#line 2647 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditEngine("ctl:auditengine=off")); + } +-#line 4849 "seclang-parser.cc" ++#line 4873 "seclang-parser.cc" + break; + +- case 343: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_RELEVANT_ONLY" +-#line 2637 "seclang-parser.yy" ++ case 346: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_RELEVANT_ONLY" ++#line 2651 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditEngine("ctl:auditengine=relevantonly")); + driver.m_auditLog->setCtlAuditEngineActive(); + } +-#line 4858 "seclang-parser.cc" ++#line 4882 "seclang-parser.cc" + break; + +- case 344: // act: "ACTION_CTL_AUDIT_LOG_PARTS" +-#line 2642 "seclang-parser.yy" ++ case 347: // act: "ACTION_CTL_AUDIT_LOG_PARTS" ++#line 2656 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::AuditLogParts(yystack_[0].value.as < std::string > ())); + } +-#line 4866 "seclang-parser.cc" ++#line 4890 "seclang-parser.cc" + break; + +- case 345: // act: "ACTION_CTL_BDY_JSON" +-#line 2646 "seclang-parser.yy" ++ case 348: // act: "ACTION_CTL_BDY_JSON" ++#line 2660 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyProcessorJSON(yystack_[0].value.as < std::string > ())); + } +-#line 4874 "seclang-parser.cc" ++#line 4898 "seclang-parser.cc" + break; + +- case 346: // act: "ACTION_CTL_BDY_XML" +-#line 2650 "seclang-parser.yy" ++ case 349: // act: "ACTION_CTL_BDY_XML" ++#line 2664 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyProcessorXML(yystack_[0].value.as < std::string > ())); + } +-#line 4882 "seclang-parser.cc" ++#line 4906 "seclang-parser.cc" + break; + +- case 347: // act: "ACTION_CTL_BDY_URLENCODED" +-#line 2654 "seclang-parser.yy" ++ case 350: // act: "ACTION_CTL_BDY_URLENCODED" ++#line 2668 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyProcessorURLENCODED(yystack_[0].value.as < std::string > ())); + } +-#line 4890 "seclang-parser.cc" ++#line 4914 "seclang-parser.cc" + break; + +- case 348: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_ON" +-#line 2658 "seclang-parser.yy" ++ case 351: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_ON" ++#line 2672 "seclang-parser.yy" + { + //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0); + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Action(yystack_[1].value.as < std::string > ())); + } +-#line 4899 "seclang-parser.cc" ++#line 4923 "seclang-parser.cc" + break; + +- case 349: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_OFF" +-#line 2663 "seclang-parser.yy" ++ case 352: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_OFF" ++#line 2677 "seclang-parser.yy" + { + //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0); + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Action(yystack_[1].value.as < std::string > ())); + } +-#line 4908 "seclang-parser.cc" ++#line 4932 "seclang-parser.cc" + break; + +- case 350: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_ON" +-#line 2668 "seclang-parser.yy" ++ case 353: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_ON" ++#line 2682 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyAccess(yystack_[1].value.as < std::string > () + "true")); + } +-#line 4916 "seclang-parser.cc" ++#line 4940 "seclang-parser.cc" + break; + +- case 351: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_OFF" +-#line 2672 "seclang-parser.yy" ++ case 354: // act: "ACTION_CTL_REQUEST_BODY_ACCESS" "CONFIG_VALUE_OFF" ++#line 2686 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RequestBodyAccess(yystack_[1].value.as < std::string > () + "false")); + } +-#line 4924 "seclang-parser.cc" ++#line 4948 "seclang-parser.cc" + break; + +- case 352: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_ON" +-#line 2676 "seclang-parser.yy" ++ case 355: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_ON" ++#line 2690 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=on")); + } +-#line 4932 "seclang-parser.cc" ++#line 4956 "seclang-parser.cc" + break; + +- case 353: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_OFF" +-#line 2680 "seclang-parser.yy" ++ case 356: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_OFF" ++#line 2694 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=off")); + } +-#line 4940 "seclang-parser.cc" ++#line 4964 "seclang-parser.cc" + break; + +- case 354: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_DETC" +-#line 2684 "seclang-parser.yy" ++ case 357: // act: "ACTION_CTL_RULE_ENGINE" "CONFIG_VALUE_DETC" ++#line 2698 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=detectiononly")); + } +-#line 4948 "seclang-parser.cc" ++#line 4972 "seclang-parser.cc" + break; + +- case 355: // act: "ACTION_CTL_RULE_REMOVE_BY_ID" +-#line 2688 "seclang-parser.yy" ++ case 358: // act: "ACTION_CTL_RULE_REMOVE_BY_ID" ++#line 2702 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveById(yystack_[0].value.as < std::string > ())); + } +-#line 4956 "seclang-parser.cc" ++#line 4980 "seclang-parser.cc" + break; + +- case 356: // act: "ACTION_CTL_RULE_REMOVE_BY_TAG" +-#line 2692 "seclang-parser.yy" ++ case 359: // act: "ACTION_CTL_RULE_REMOVE_BY_TAG" ++#line 2706 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveByTag(yystack_[0].value.as < std::string > ())); + } +-#line 4964 "seclang-parser.cc" ++#line 4988 "seclang-parser.cc" + break; + +- case 357: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" +-#line 2696 "seclang-parser.yy" ++ case 360: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" ++#line 2710 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveTargetById(yystack_[0].value.as < std::string > ())); + } +-#line 4972 "seclang-parser.cc" ++#line 4996 "seclang-parser.cc" + break; + +- case 358: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" +-#line 2700 "seclang-parser.yy" ++ case 361: // act: "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" ++#line 2714 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::ctl::RuleRemoveTargetByTag(yystack_[0].value.as < std::string > ())); + } +-#line 4980 "seclang-parser.cc" ++#line 5004 "seclang-parser.cc" + break; + +- case 359: // act: "Deny" +-#line 2704 "seclang-parser.yy" ++ case 362: // act: "Deny" ++#line 2718 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Deny(yystack_[0].value.as < std::string > ())); + } +-#line 4988 "seclang-parser.cc" ++#line 5012 "seclang-parser.cc" + break; + +- case 360: // act: "DeprecateVar" +-#line 2708 "seclang-parser.yy" ++ case 363: // act: "DeprecateVar" ++#line 2722 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("DeprecateVar", yystack_[1].location); + } +-#line 4996 "seclang-parser.cc" ++#line 5020 "seclang-parser.cc" + break; + +- case 361: // act: "Drop" +-#line 2712 "seclang-parser.yy" ++ case 364: // act: "Drop" ++#line 2726 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Drop(yystack_[0].value.as < std::string > ())); + } +-#line 5004 "seclang-parser.cc" ++#line 5028 "seclang-parser.cc" + break; + +- case 362: // act: "Exec" +-#line 2716 "seclang-parser.yy" ++ case 365: // act: "Exec" ++#line 2730 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Exec(yystack_[0].value.as < std::string > ())); + } +-#line 5012 "seclang-parser.cc" ++#line 5036 "seclang-parser.cc" + break; + +- case 363: // act: "ExpireVar" +-#line 2720 "seclang-parser.yy" ++ case 366: // act: "ExpireVar" ++#line 2734 "seclang-parser.yy" + { + //ACTION_NOT_SUPPORTED("ExpireVar", @0); + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Action(yystack_[0].value.as < std::string > ())); + } +-#line 5021 "seclang-parser.cc" ++#line 5045 "seclang-parser.cc" + break; + +- case 364: // act: "Id" +-#line 2725 "seclang-parser.yy" ++ case 367: // act: "Id" ++#line 2739 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::RuleId(yystack_[0].value.as < std::string > ())); + } +-#line 5029 "seclang-parser.cc" ++#line 5053 "seclang-parser.cc" + break; + +- case 365: // act: "InitCol" run_time_string +-#line 2729 "seclang-parser.yy" ++ case 368: // act: "InitCol" run_time_string ++#line 2743 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::InitCol(yystack_[1].value.as < std::string > (), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5037 "seclang-parser.cc" ++#line 5061 "seclang-parser.cc" + break; + +- case 366: // act: "LogData" run_time_string +-#line 2733 "seclang-parser.yy" ++ case 369: // act: "LogData" run_time_string ++#line 2747 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::LogData(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5045 "seclang-parser.cc" ++#line 5069 "seclang-parser.cc" + break; + +- case 367: // act: "Log" +-#line 2737 "seclang-parser.yy" ++ case 370: // act: "Log" ++#line 2751 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Log(yystack_[0].value.as < std::string > ())); + } +-#line 5053 "seclang-parser.cc" ++#line 5077 "seclang-parser.cc" + break; + +- case 368: // act: "Maturity" +-#line 2741 "seclang-parser.yy" ++ case 371: // act: "Maturity" ++#line 2755 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Maturity(yystack_[0].value.as < std::string > ())); + } +-#line 5061 "seclang-parser.cc" ++#line 5085 "seclang-parser.cc" + break; + +- case 369: // act: "Msg" run_time_string +-#line 2745 "seclang-parser.yy" ++ case 372: // act: "Msg" run_time_string ++#line 2759 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Msg(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5069 "seclang-parser.cc" ++#line 5093 "seclang-parser.cc" + break; + +- case 370: // act: "MultiMatch" +-#line 2749 "seclang-parser.yy" ++ case 373: // act: "MultiMatch" ++#line 2763 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::MultiMatch(yystack_[0].value.as < std::string > ())); + } +-#line 5077 "seclang-parser.cc" ++#line 5101 "seclang-parser.cc" + break; + +- case 371: // act: "NoAuditLog" +-#line 2753 "seclang-parser.yy" ++ case 374: // act: "NoAuditLog" ++#line 2767 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::NoAuditLog(yystack_[0].value.as < std::string > ())); + } +-#line 5085 "seclang-parser.cc" ++#line 5109 "seclang-parser.cc" + break; + +- case 372: // act: "NoLog" +-#line 2757 "seclang-parser.yy" ++ case 375: // act: "NoLog" ++#line 2771 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::NoLog(yystack_[0].value.as < std::string > ())); + } +-#line 5093 "seclang-parser.cc" ++#line 5117 "seclang-parser.cc" + break; + +- case 373: // act: "Pass" +-#line 2761 "seclang-parser.yy" ++ case 376: // act: "Pass" ++#line 2775 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Pass(yystack_[0].value.as < std::string > ())); + } +-#line 5101 "seclang-parser.cc" ++#line 5125 "seclang-parser.cc" + break; + +- case 374: // act: "Pause" +-#line 2765 "seclang-parser.yy" ++ case 377: // act: "Pause" ++#line 2779 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Pause", yystack_[1].location); + } +-#line 5109 "seclang-parser.cc" ++#line 5133 "seclang-parser.cc" + break; + +- case 375: // act: "Phase" +-#line 2769 "seclang-parser.yy" ++ case 378: // act: "Phase" ++#line 2783 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Phase(yystack_[0].value.as < std::string > ())); + } +-#line 5117 "seclang-parser.cc" ++#line 5141 "seclang-parser.cc" + break; + +- case 376: // act: "Prepend" +-#line 2773 "seclang-parser.yy" ++ case 379: // act: "Prepend" ++#line 2787 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Prepend", yystack_[1].location); + } +-#line 5125 "seclang-parser.cc" ++#line 5149 "seclang-parser.cc" + break; + +- case 377: // act: "Proxy" +-#line 2777 "seclang-parser.yy" ++ case 380: // act: "Proxy" ++#line 2791 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("Proxy", yystack_[1].location); + } +-#line 5133 "seclang-parser.cc" ++#line 5157 "seclang-parser.cc" + break; + +- case 378: // act: "Redirect" run_time_string +-#line 2781 "seclang-parser.yy" ++ case 381: // act: "Redirect" run_time_string ++#line 2795 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::disruptive::Redirect(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5141 "seclang-parser.cc" ++#line 5165 "seclang-parser.cc" + break; + +- case 379: // act: "Rev" +-#line 2785 "seclang-parser.yy" ++ case 382: // act: "Rev" ++#line 2799 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Rev(yystack_[0].value.as < std::string > ())); + } +-#line 5149 "seclang-parser.cc" ++#line 5173 "seclang-parser.cc" + break; + +- case 380: // act: "SanitiseArg" +-#line 2789 "seclang-parser.yy" ++ case 383: // act: "SanitiseArg" ++#line 2803 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseArg", yystack_[1].location); + } +-#line 5157 "seclang-parser.cc" ++#line 5181 "seclang-parser.cc" + break; + +- case 381: // act: "SanitiseMatched" +-#line 2793 "seclang-parser.yy" ++ case 384: // act: "SanitiseMatched" ++#line 2807 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseMatched", yystack_[1].location); + } +-#line 5165 "seclang-parser.cc" ++#line 5189 "seclang-parser.cc" + break; + +- case 382: // act: "SanitiseMatchedBytes" +-#line 2797 "seclang-parser.yy" ++ case 385: // act: "SanitiseMatchedBytes" ++#line 2811 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseMatchedBytes", yystack_[1].location); + } +-#line 5173 "seclang-parser.cc" ++#line 5197 "seclang-parser.cc" + break; + +- case 383: // act: "SanitiseRequestHeader" +-#line 2801 "seclang-parser.yy" ++ case 386: // act: "SanitiseRequestHeader" ++#line 2815 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseRequestHeader", yystack_[1].location); + } +-#line 5181 "seclang-parser.cc" ++#line 5205 "seclang-parser.cc" + break; + +- case 384: // act: "SanitiseResponseHeader" +-#line 2805 "seclang-parser.yy" ++ case 387: // act: "SanitiseResponseHeader" ++#line 2819 "seclang-parser.yy" + { + ACTION_NOT_SUPPORTED("SanitiseResponseHeader", yystack_[1].location); + } +-#line 5189 "seclang-parser.cc" ++#line 5213 "seclang-parser.cc" + break; + +- case 385: // act: "SetEnv" run_time_string +-#line 2809 "seclang-parser.yy" ++ case 388: // act: "SetEnv" run_time_string ++#line 2823 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetENV(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5197 "seclang-parser.cc" ++#line 5221 "seclang-parser.cc" + break; + +- case 386: // act: "SetRsc" run_time_string +-#line 2813 "seclang-parser.yy" ++ case 389: // act: "SetRsc" run_time_string ++#line 2827 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetRSC(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5205 "seclang-parser.cc" ++#line 5229 "seclang-parser.cc" + break; + +- case 387: // act: "SetSid" run_time_string +-#line 2817 "seclang-parser.yy" ++ case 390: // act: "SetSid" run_time_string ++#line 2831 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetSID(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5213 "seclang-parser.cc" ++#line 5237 "seclang-parser.cc" + break; + +- case 388: // act: "SetUID" run_time_string +-#line 2821 "seclang-parser.yy" ++ case 391: // act: "SetUID" run_time_string ++#line 2835 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetUID(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5221 "seclang-parser.cc" ++#line 5245 "seclang-parser.cc" + break; + +- case 389: // act: "SetVar" setvar_action +-#line 2825 "seclang-parser.yy" ++ case 392: // act: "SetVar" setvar_action ++#line 2839 "seclang-parser.yy" + { + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[0].value.as < std::unique_ptr > ()); + } +-#line 5229 "seclang-parser.cc" ++#line 5253 "seclang-parser.cc" + break; + +- case 390: // act: "Severity" +-#line 2829 "seclang-parser.yy" ++ case 393: // act: "Severity" ++#line 2843 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Severity(yystack_[0].value.as < std::string > ())); + } +-#line 5237 "seclang-parser.cc" ++#line 5261 "seclang-parser.cc" + break; + +- case 391: // act: "Skip" +-#line 2833 "seclang-parser.yy" ++ case 394: // act: "Skip" ++#line 2847 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Skip(yystack_[0].value.as < std::string > ())); + } +-#line 5245 "seclang-parser.cc" ++#line 5269 "seclang-parser.cc" + break; + +- case 392: // act: "SkipAfter" +-#line 2837 "seclang-parser.yy" ++ case 395: // act: "SkipAfter" ++#line 2851 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SkipAfter(yystack_[0].value.as < std::string > ())); + } +-#line 5253 "seclang-parser.cc" ++#line 5277 "seclang-parser.cc" + break; + +- case 393: // act: "Status" +-#line 2841 "seclang-parser.yy" ++ case 396: // act: "Status" ++#line 2855 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::data::Status(yystack_[0].value.as < std::string > ())); + } +-#line 5261 "seclang-parser.cc" ++#line 5285 "seclang-parser.cc" + break; + +- case 394: // act: "Tag" run_time_string +-#line 2845 "seclang-parser.yy" ++ case 397: // act: "Tag" run_time_string ++#line 2859 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Tag(std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5269 "seclang-parser.cc" ++#line 5293 "seclang-parser.cc" + break; + +- case 395: // act: "Ver" +-#line 2849 "seclang-parser.yy" ++ case 398: // act: "Ver" ++#line 2863 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::Ver(yystack_[0].value.as < std::string > ())); + } +-#line 5277 "seclang-parser.cc" ++#line 5301 "seclang-parser.cc" + break; + +- case 396: // act: "xmlns" +-#line 2853 "seclang-parser.yy" ++ case 399: // act: "xmlns" ++#line 2867 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::XmlNS(yystack_[0].value.as < std::string > ())); + } +-#line 5285 "seclang-parser.cc" ++#line 5309 "seclang-parser.cc" + break; + +- case 397: // act: "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" +-#line 2857 "seclang-parser.yy" ++ case 400: // act: "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" ++#line 2871 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ParityZero7bit(yystack_[0].value.as < std::string > ())); + } +-#line 5293 "seclang-parser.cc" ++#line 5317 "seclang-parser.cc" + break; + +- case 398: // act: "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" +-#line 2861 "seclang-parser.yy" ++ case 401: // act: "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" ++#line 2875 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ParityOdd7bit(yystack_[0].value.as < std::string > ())); + } +-#line 5301 "seclang-parser.cc" ++#line 5325 "seclang-parser.cc" + break; + +- case 399: // act: "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" +-#line 2865 "seclang-parser.yy" ++ case 402: // act: "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" ++#line 2879 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ParityEven7bit(yystack_[0].value.as < std::string > ())); + } +-#line 5309 "seclang-parser.cc" ++#line 5333 "seclang-parser.cc" + break; + +- case 400: // act: "ACTION_TRANSFORMATION_SQL_HEX_DECODE" +-#line 2869 "seclang-parser.yy" ++ case 403: // act: "ACTION_TRANSFORMATION_SQL_HEX_DECODE" ++#line 2883 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::SqlHexDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5317 "seclang-parser.cc" ++#line 5341 "seclang-parser.cc" + break; + +- case 401: // act: "ACTION_TRANSFORMATION_BASE_64_ENCODE" +-#line 2873 "seclang-parser.yy" ++ case 404: // act: "ACTION_TRANSFORMATION_BASE_64_ENCODE" ++#line 2887 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Base64Encode(yystack_[0].value.as < std::string > ())); + } +-#line 5325 "seclang-parser.cc" ++#line 5349 "seclang-parser.cc" + break; + +- case 402: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE" +-#line 2877 "seclang-parser.yy" ++ case 405: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE" ++#line 2891 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Base64Decode(yystack_[0].value.as < std::string > ())); + } +-#line 5333 "seclang-parser.cc" ++#line 5357 "seclang-parser.cc" + break; + +- case 403: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" +-#line 2881 "seclang-parser.yy" ++ case 406: // act: "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" ++#line 2895 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Base64DecodeExt(yystack_[0].value.as < std::string > ())); + } +-#line 5341 "seclang-parser.cc" ++#line 5365 "seclang-parser.cc" + break; + +- case 404: // act: "ACTION_TRANSFORMATION_CMD_LINE" +-#line 2885 "seclang-parser.yy" ++ case 407: // act: "ACTION_TRANSFORMATION_CMD_LINE" ++#line 2899 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::CmdLine(yystack_[0].value.as < std::string > ())); + } +-#line 5349 "seclang-parser.cc" ++#line 5373 "seclang-parser.cc" + break; + +- case 405: // act: "ACTION_TRANSFORMATION_SHA1" +-#line 2889 "seclang-parser.yy" ++ case 408: // act: "ACTION_TRANSFORMATION_SHA1" ++#line 2903 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Sha1(yystack_[0].value.as < std::string > ())); + } +-#line 5357 "seclang-parser.cc" ++#line 5381 "seclang-parser.cc" + break; + +- case 406: // act: "ACTION_TRANSFORMATION_MD5" +-#line 2893 "seclang-parser.yy" ++ case 409: // act: "ACTION_TRANSFORMATION_MD5" ++#line 2907 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Md5(yystack_[0].value.as < std::string > ())); + } +-#line 5365 "seclang-parser.cc" ++#line 5389 "seclang-parser.cc" + break; + +- case 407: // act: "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" +-#line 2897 "seclang-parser.yy" ++ case 410: // act: "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" ++#line 2911 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::EscapeSeqDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5373 "seclang-parser.cc" ++#line 5397 "seclang-parser.cc" + break; + +- case 408: // act: "ACTION_TRANSFORMATION_HEX_ENCODE" +-#line 2901 "seclang-parser.yy" ++ case 411: // act: "ACTION_TRANSFORMATION_HEX_ENCODE" ++#line 2915 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::HexEncode(yystack_[0].value.as < std::string > ())); + } +-#line 5381 "seclang-parser.cc" ++#line 5405 "seclang-parser.cc" + break; + +- case 409: // act: "ACTION_TRANSFORMATION_HEX_DECODE" +-#line 2905 "seclang-parser.yy" ++ case 412: // act: "ACTION_TRANSFORMATION_HEX_DECODE" ++#line 2919 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::HexDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5389 "seclang-parser.cc" ++#line 5413 "seclang-parser.cc" + break; + +- case 410: // act: "ACTION_TRANSFORMATION_LOWERCASE" +-#line 2909 "seclang-parser.yy" ++ case 413: // act: "ACTION_TRANSFORMATION_LOWERCASE" ++#line 2923 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::LowerCase(yystack_[0].value.as < std::string > ())); + } +-#line 5397 "seclang-parser.cc" ++#line 5421 "seclang-parser.cc" + break; + +- case 411: // act: "ACTION_TRANSFORMATION_UPPERCASE" +-#line 2913 "seclang-parser.yy" ++ case 414: // act: "ACTION_TRANSFORMATION_UPPERCASE" ++#line 2927 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UpperCase(yystack_[0].value.as < std::string > ())); + } +-#line 5405 "seclang-parser.cc" ++#line 5429 "seclang-parser.cc" + break; + +- case 412: // act: "ACTION_TRANSFORMATION_URL_DECODE_UNI" +-#line 2917 "seclang-parser.yy" ++ case 415: // act: "ACTION_TRANSFORMATION_URL_DECODE_UNI" ++#line 2931 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UrlDecodeUni(yystack_[0].value.as < std::string > ())); + } +-#line 5413 "seclang-parser.cc" ++#line 5437 "seclang-parser.cc" + break; + +- case 413: // act: "ACTION_TRANSFORMATION_URL_DECODE" +-#line 2921 "seclang-parser.yy" ++ case 416: // act: "ACTION_TRANSFORMATION_URL_DECODE" ++#line 2935 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UrlDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5421 "seclang-parser.cc" ++#line 5445 "seclang-parser.cc" + break; + +- case 414: // act: "ACTION_TRANSFORMATION_URL_ENCODE" +-#line 2925 "seclang-parser.yy" ++ case 417: // act: "ACTION_TRANSFORMATION_URL_ENCODE" ++#line 2939 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::UrlEncode(yystack_[0].value.as < std::string > ())); + } +-#line 5429 "seclang-parser.cc" ++#line 5453 "seclang-parser.cc" + break; + +- case 415: // act: "ACTION_TRANSFORMATION_NONE" +-#line 2929 "seclang-parser.yy" ++ case 418: // act: "ACTION_TRANSFORMATION_NONE" ++#line 2943 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::None(yystack_[0].value.as < std::string > ())); + } +-#line 5437 "seclang-parser.cc" ++#line 5461 "seclang-parser.cc" + break; + +- case 416: // act: "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" +-#line 2933 "seclang-parser.yy" ++ case 419: // act: "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" ++#line 2947 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::CompressWhitespace(yystack_[0].value.as < std::string > ())); + } +-#line 5445 "seclang-parser.cc" ++#line 5469 "seclang-parser.cc" + break; + +- case 417: // act: "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" +-#line 2937 "seclang-parser.yy" ++ case 420: // act: "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" ++#line 2951 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveWhitespace(yystack_[0].value.as < std::string > ())); + } +-#line 5453 "seclang-parser.cc" ++#line 5477 "seclang-parser.cc" + break; + +- case 418: // act: "ACTION_TRANSFORMATION_REPLACE_NULLS" +-#line 2941 "seclang-parser.yy" ++ case 421: // act: "ACTION_TRANSFORMATION_REPLACE_NULLS" ++#line 2955 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ReplaceNulls(yystack_[0].value.as < std::string > ())); + } +-#line 5461 "seclang-parser.cc" ++#line 5485 "seclang-parser.cc" + break; + +- case 419: // act: "ACTION_TRANSFORMATION_REMOVE_NULLS" +-#line 2945 "seclang-parser.yy" ++ case 422: // act: "ACTION_TRANSFORMATION_REMOVE_NULLS" ++#line 2959 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveNulls(yystack_[0].value.as < std::string > ())); + } +-#line 5469 "seclang-parser.cc" ++#line 5493 "seclang-parser.cc" + break; + +- case 420: // act: "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" +-#line 2949 "seclang-parser.yy" ++ case 423: // act: "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" ++#line 2963 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::HtmlEntityDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5477 "seclang-parser.cc" ++#line 5501 "seclang-parser.cc" + break; + +- case 421: // act: "ACTION_TRANSFORMATION_JS_DECODE" +-#line 2953 "seclang-parser.yy" ++ case 424: // act: "ACTION_TRANSFORMATION_JS_DECODE" ++#line 2967 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::JsDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5485 "seclang-parser.cc" ++#line 5509 "seclang-parser.cc" + break; + +- case 422: // act: "ACTION_TRANSFORMATION_CSS_DECODE" +-#line 2957 "seclang-parser.yy" ++ case 425: // act: "ACTION_TRANSFORMATION_CSS_DECODE" ++#line 2971 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::CssDecode(yystack_[0].value.as < std::string > ())); + } +-#line 5493 "seclang-parser.cc" ++#line 5517 "seclang-parser.cc" + break; + +- case 423: // act: "ACTION_TRANSFORMATION_TRIM" +-#line 2961 "seclang-parser.yy" ++ case 426: // act: "ACTION_TRANSFORMATION_TRIM" ++#line 2975 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Trim(yystack_[0].value.as < std::string > ())); + } +-#line 5501 "seclang-parser.cc" ++#line 5525 "seclang-parser.cc" + break; + +- case 424: // act: "ACTION_TRANSFORMATION_TRIM_LEFT" +-#line 2965 "seclang-parser.yy" ++ case 427: // act: "ACTION_TRANSFORMATION_TRIM_LEFT" ++#line 2979 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::TrimLeft(yystack_[0].value.as < std::string > ())); + } +-#line 5509 "seclang-parser.cc" ++#line 5533 "seclang-parser.cc" + break; + +- case 425: // act: "ACTION_TRANSFORMATION_TRIM_RIGHT" +-#line 2969 "seclang-parser.yy" ++ case 428: // act: "ACTION_TRANSFORMATION_TRIM_RIGHT" ++#line 2983 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::TrimRight(yystack_[0].value.as < std::string > ())); + } +-#line 5517 "seclang-parser.cc" ++#line 5541 "seclang-parser.cc" + break; + +- case 426: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" +-#line 2973 "seclang-parser.yy" ++ case 429: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" ++#line 2987 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::NormalisePathWin(yystack_[0].value.as < std::string > ())); + } +-#line 5525 "seclang-parser.cc" ++#line 5549 "seclang-parser.cc" + break; + +- case 427: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH" +-#line 2977 "seclang-parser.yy" ++ case 430: // act: "ACTION_TRANSFORMATION_NORMALISE_PATH" ++#line 2991 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::NormalisePath(yystack_[0].value.as < std::string > ())); + } +-#line 5533 "seclang-parser.cc" ++#line 5557 "seclang-parser.cc" + break; + +- case 428: // act: "ACTION_TRANSFORMATION_LENGTH" +-#line 2981 "seclang-parser.yy" ++ case 431: // act: "ACTION_TRANSFORMATION_LENGTH" ++#line 2995 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Length(yystack_[0].value.as < std::string > ())); + } +-#line 5541 "seclang-parser.cc" ++#line 5565 "seclang-parser.cc" + break; + +- case 429: // act: "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" +-#line 2985 "seclang-parser.yy" ++ case 432: // act: "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" ++#line 2999 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::Utf8ToUnicode(yystack_[0].value.as < std::string > ())); + } +-#line 5549 "seclang-parser.cc" ++#line 5573 "seclang-parser.cc" + break; + +- case 430: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" +-#line 2989 "seclang-parser.yy" ++ case 433: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" ++#line 3003 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveCommentsChar(yystack_[0].value.as < std::string > ())); + } +-#line 5557 "seclang-parser.cc" ++#line 5581 "seclang-parser.cc" + break; + +- case 431: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS" +-#line 2993 "seclang-parser.yy" ++ case 434: // act: "ACTION_TRANSFORMATION_REMOVE_COMMENTS" ++#line 3007 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::RemoveComments(yystack_[0].value.as < std::string > ())); + } +-#line 5565 "seclang-parser.cc" ++#line 5589 "seclang-parser.cc" + break; + +- case 432: // act: "ACTION_TRANSFORMATION_REPLACE_COMMENTS" +-#line 2997 "seclang-parser.yy" ++ case 435: // act: "ACTION_TRANSFORMATION_REPLACE_COMMENTS" ++#line 3011 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::transformations::ReplaceComments(yystack_[0].value.as < std::string > ())); + } +-#line 5573 "seclang-parser.cc" ++#line 5597 "seclang-parser.cc" + break; + +- case 433: // setvar_action: "NOT" var +-#line 3004 "seclang-parser.yy" ++ case 436: // setvar_action: "NOT" var ++#line 3018 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::unsetOperation, std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5581 "seclang-parser.cc" ++#line 5605 "seclang-parser.cc" + break; + +- case 434: // setvar_action: var +-#line 3008 "seclang-parser.yy" ++ case 437: // setvar_action: var ++#line 3022 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::setToOneOperation, std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5589 "seclang-parser.cc" ++#line 5613 "seclang-parser.cc" + break; + +- case 435: // setvar_action: var SETVAR_OPERATION_EQUALS run_time_string +-#line 3012 "seclang-parser.yy" ++ case 438: // setvar_action: var SETVAR_OPERATION_EQUALS run_time_string ++#line 3026 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::setOperation, std::move(yystack_[2].value.as < std::unique_ptr > ()), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5597 "seclang-parser.cc" ++#line 5621 "seclang-parser.cc" + break; + +- case 436: // setvar_action: var SETVAR_OPERATION_EQUALS_PLUS run_time_string +-#line 3016 "seclang-parser.yy" ++ case 439: // setvar_action: var SETVAR_OPERATION_EQUALS_PLUS run_time_string ++#line 3030 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::sumAndSetOperation, std::move(yystack_[2].value.as < std::unique_ptr > ()), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5605 "seclang-parser.cc" ++#line 5629 "seclang-parser.cc" + break; + +- case 437: // setvar_action: var SETVAR_OPERATION_EQUALS_MINUS run_time_string +-#line 3020 "seclang-parser.yy" ++ case 440: // setvar_action: var SETVAR_OPERATION_EQUALS_MINUS run_time_string ++#line 3034 "seclang-parser.yy" + { + ACTION_CONTAINER(yylhs.value.as < std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::substractAndSetOperation, std::move(yystack_[2].value.as < std::unique_ptr > ()), std::move(yystack_[0].value.as < std::unique_ptr > ()))); + } +-#line 5613 "seclang-parser.cc" ++#line 5637 "seclang-parser.cc" + break; + +- case 438: // run_time_string: run_time_string "FREE_TEXT_QUOTE_MACRO_EXPANSION" +-#line 3027 "seclang-parser.yy" ++ case 441: // run_time_string: run_time_string "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++#line 3041 "seclang-parser.yy" + { + yystack_[1].value.as < std::unique_ptr > ()->appendText(yystack_[0].value.as < std::string > ()); + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[1].value.as < std::unique_ptr > ()); + } +-#line 5622 "seclang-parser.cc" ++#line 5646 "seclang-parser.cc" + break; + +- case 439: // run_time_string: run_time_string var +-#line 3032 "seclang-parser.yy" ++ case 442: // run_time_string: run_time_string var ++#line 3046 "seclang-parser.yy" + { + yystack_[1].value.as < std::unique_ptr > ()->appendVar(std::move(yystack_[0].value.as < std::unique_ptr > ())); + yylhs.value.as < std::unique_ptr > () = std::move(yystack_[1].value.as < std::unique_ptr > ()); + } +-#line 5631 "seclang-parser.cc" ++#line 5655 "seclang-parser.cc" + break; + +- case 440: // run_time_string: "FREE_TEXT_QUOTE_MACRO_EXPANSION" +-#line 3037 "seclang-parser.yy" ++ case 443: // run_time_string: "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++#line 3051 "seclang-parser.yy" + { + std::unique_ptr r(new RunTimeString()); + r->appendText(yystack_[0].value.as < std::string > ()); + yylhs.value.as < std::unique_ptr > () = std::move(r); + } +-#line 5641 "seclang-parser.cc" ++#line 5665 "seclang-parser.cc" + break; + +- case 441: // run_time_string: var +-#line 3043 "seclang-parser.yy" ++ case 444: // run_time_string: var ++#line 3057 "seclang-parser.yy" + { + std::unique_ptr r(new RunTimeString()); + r->appendVar(std::move(yystack_[0].value.as < std::unique_ptr > ())); + yylhs.value.as < std::unique_ptr > () = std::move(r); + } +-#line 5651 "seclang-parser.cc" ++#line 5675 "seclang-parser.cc" + break; + + +-#line 5655 "seclang-parser.cc" ++#line 5679 "seclang-parser.cc" + + default: + break; +@@ -6000,66 +6024,67 @@ namespace yy { + } + + +- const short seclang_parser::yypact_ninf_ = -413; ++ const short seclang_parser::yypact_ninf_ = -402; + + const signed char seclang_parser::yytable_ninf_ = -1; + + const short + seclang_parser::yypact_[] = + { +- 2507, -413, -256, -413, -91, -413, -251, -413, -413, -413, +- -413, -413, -275, -413, -413, -413, -413, -413, -290, -413, +- -413, -413, -249, -158, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -155, +- -413, -413, -156, -413, -148, -413, -149, -144, -413, -283, +- 2855, 2855, -413, -413, -413, -413, -142, -300, -413, -413, +- -413, 1149, 1149, 1149, 2855, -269, -133, -413, -413, -413, +- -131, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- 1149, 2855, 2668, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, 2125, -261, -413, -413, -413, +- -413, -413, -413, -413, -267, -413, -413, -413, -413, -129, +- -127, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, 2219, -413, 2219, -413, 2219, -413, -413, -413, -413, +- -413, -413, -413, -413, 2219, -413, -413, -413, -413, -413, +- -413, 2219, 2219, 2219, 2219, -413, -413, -413, -413, 2219, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, 3038, -413, +- 2, -413, -413, -413, -413, -413, -413, 2550, 2550, -161, +- -159, -157, -154, -152, -150, -147, -145, -143, -140, -138, +- -136, -132, -130, -128, -126, -413, -124, -122, -120, -118, +- -413, -413, -116, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -114, -413, +- -413, -413, -413, -413, 49, -413, -413, -413, -112, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, 457, 546, 635, 969, 1058, -110, -108, 1482, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, 4, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, 1662, -413, -413, -413, -413, +- 2550, -53, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, 3, 3038, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, -413, -413, -413, -413, -413, -413, +- -413, -413, -413, -413, 2324, -413, -413, -413, -413, 2324, +- -413, -413, 2324, -413, -413, 2324, -413, -413, 2324, -413, +- -413, 2324, -413, -413, -413, -413, 8, 1573, 1993, 2219, +- 2219, 2219, -413, -413, 2219, 2219, 2219, -413, 2219, 2219, +- 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, +- 2219, 2219, 2219, 2219, -413, 2219, 2219, 2219, 2219, -413, +- -413, 2219, 2219, 2219, 2219, 2219, 2855, -413, 2324, -413, +- 2219, 2219, 2219, -413, -413, -413, -413, -413, 2550, 2550, +- -413, -413, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, +- 2324, 2324, 2324, 2324, -413, 2324, 2324, 2324, -413, -413 ++ 2776, -402, -277, -402, -100, -402, -157, -402, -402, -402, ++ -402, -402, -292, -402, -402, -402, -402, -402, -274, -402, ++ -402, -402, -155, -153, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -149, ++ -402, -402, -150, -402, -145, -402, -146, -135, -402, -284, ++ -90, -90, -402, -402, -402, -402, -133, -301, -402, -402, ++ -402, 1492, 1492, 1492, -90, -271, -131, -402, -402, -402, ++ -129, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ 1492, -90, 2920, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, 2340, -259, -402, -402, -402, ++ -402, -402, -402, -402, -265, -402, -402, -402, -402, -127, ++ -125, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, 2473, -402, 2473, -402, 2473, -402, -402, -402, -402, ++ -402, -402, -402, -402, 2473, -402, -402, -402, -402, -402, ++ -402, 2473, 2473, 2473, 2473, -402, -402, -402, -402, 2473, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, 3107, -402, ++ 2, -402, -402, -402, -402, -402, -402, 2672, 2672, -159, ++ -156, -154, -152, -148, -142, -140, -138, -134, -132, -130, ++ -128, -126, -124, -122, -120, -118, -402, -116, -114, -112, ++ -110, -402, -402, -108, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -104, ++ -402, -402, -402, -402, -402, 460, -402, -402, -402, -102, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, 550, 640, 975, 1065, 1155, -99, -97, 1584, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, 16, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, 2008, -402, -402, -402, ++ -402, 2672, -50, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 3, 3107, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, ++ -402, -402, -402, -402, -402, -402, -402, 2563, -402, -402, ++ -402, -402, 2563, -402, -402, 2563, -402, -402, 2563, -402, ++ -402, 2563, -402, -402, 2563, -402, -402, -402, -402, 8, ++ 1676, 2141, 2473, 2473, 2473, -402, -402, 2473, 2473, 2473, ++ -402, 2473, 2473, 2473, 2473, 2473, 2473, 2473, 2473, 2473, ++ 2473, 2473, 2473, 2473, 2473, 2473, 2473, -402, 2473, 2473, ++ 2473, 2473, -402, -402, 2473, 2473, 2473, 2473, 2473, -90, ++ -402, 2563, -402, 2473, 2473, 2473, -402, -402, -402, -402, ++ -402, 2672, 2672, -402, -402, 2563, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, ++ 2563, 2563, 2563, 2563, 2563, 2563, 2563, -402, 2563, 2563, ++ 2563, -402, -402 + }; + + const short +@@ -6076,216 +6101,218 @@ namespace yy { + 0, 0, 0, 4, 74, 5, 98, 97, 15, 16, + 91, 90, 9, 10, 8, 20, 19, 18, 96, 95, + 101, 100, 85, 84, 134, 135, 87, 86, 136, 137, +- 114, 113, 83, 81, 82, 0, 0, 334, 335, 336, +- 337, 338, 339, 340, 0, 344, 345, 346, 347, 0, +- 0, 355, 356, 357, 358, 359, 360, 361, 362, 363, +- 364, 0, 367, 0, 368, 0, 370, 371, 372, 373, +- 374, 375, 376, 377, 0, 379, 380, 381, 382, 383, +- 384, 0, 0, 0, 0, 390, 391, 392, 393, 0, +- 401, 402, 403, 404, 416, 422, 407, 408, 409, 420, +- 421, 428, 410, 406, 415, 427, 426, 399, 398, 397, +- 431, 430, 419, 417, 432, 418, 405, 400, 423, 424, +- 425, 411, 414, 413, 412, 429, 395, 396, 0, 77, ++ 114, 113, 83, 81, 82, 0, 0, 337, 338, 339, ++ 340, 341, 342, 343, 0, 347, 348, 349, 350, 0, ++ 0, 358, 359, 360, 361, 362, 363, 364, 365, 366, ++ 367, 0, 370, 0, 371, 0, 373, 374, 375, 376, ++ 377, 378, 379, 380, 0, 382, 383, 384, 385, 386, ++ 387, 0, 0, 0, 0, 393, 394, 395, 396, 0, ++ 404, 405, 406, 407, 419, 425, 410, 411, 412, 423, ++ 424, 431, 413, 409, 418, 430, 429, 402, 401, 400, ++ 434, 433, 422, 420, 435, 421, 408, 403, 426, 427, ++ 428, 414, 417, 416, 415, 432, 398, 399, 0, 77, + 30, 32, 79, 109, 108, 138, 139, 0, 0, 166, + 169, 172, 175, 178, 181, 184, 187, 190, 193, 196, +- 199, 202, 205, 208, 211, 264, 253, 214, 250, 256, +- 265, 266, 223, 267, 268, 269, 270, 271, 272, 273, +- 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, +- 284, 285, 286, 287, 288, 289, 290, 291, 292, 294, +- 293, 297, 296, 295, 298, 300, 299, 301, 259, 302, +- 303, 304, 306, 305, 227, 307, 308, 260, 263, 309, +- 310, 311, 312, 313, 314, 315, 316, 317, 320, 318, +- 319, 231, 235, 243, 247, 239, 217, 220, 0, 322, +- 321, 323, 324, 325, 326, 327, 328, 329, 330, 331, +- 332, 333, 121, 156, 161, 122, 123, 124, 22, 21, +- 23, 28, 27, 144, 145, 0, 155, 78, 1, 3, +- 0, 434, 389, 354, 353, 352, 342, 341, 343, 349, +- 348, 351, 350, 440, 441, 365, 366, 369, 378, 385, +- 386, 387, 388, 394, 0, 0, 163, 162, 164, 165, +- 167, 168, 170, 171, 173, 174, 176, 177, 179, 180, +- 182, 183, 185, 186, 188, 189, 191, 192, 194, 195, +- 197, 198, 200, 201, 203, 204, 206, 207, 209, 210, +- 251, 252, 212, 213, 248, 249, 254, 255, 221, 222, +- 257, 258, 225, 226, 224, 261, 262, 229, 230, 228, +- 233, 234, 232, 241, 242, 240, 245, 246, 244, 237, +- 238, 236, 215, 216, 218, 219, 0, 0, 0, 0, +- 0, 0, 38, 39, 0, 0, 0, 73, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 37, 0, 0, 0, 0, 40, +- 41, 0, 0, 0, 0, 0, 76, 33, 35, 433, +- 0, 0, 0, 438, 439, 29, 31, 157, 0, 0, +- 158, 34, 36, 72, 56, 55, 57, 58, 43, 59, +- 52, 60, 42, 61, 62, 63, 64, 65, 66, 67, +- 53, 68, 69, 70, 71, 44, 45, 46, 47, 48, +- 49, 50, 51, 54, 75, 435, 436, 437, 160, 159 ++ 199, 202, 205, 208, 211, 214, 267, 256, 217, 253, ++ 259, 268, 269, 226, 270, 271, 272, 273, 274, 275, ++ 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, ++ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, ++ 297, 296, 300, 299, 298, 301, 303, 302, 304, 262, ++ 305, 306, 307, 309, 308, 230, 310, 311, 263, 266, ++ 312, 313, 314, 315, 316, 317, 318, 319, 320, 323, ++ 321, 322, 234, 238, 246, 250, 242, 220, 223, 0, ++ 325, 324, 326, 327, 328, 329, 330, 331, 332, 333, ++ 334, 335, 336, 121, 156, 161, 122, 123, 124, 22, ++ 21, 23, 28, 27, 144, 145, 0, 155, 78, 1, ++ 3, 0, 437, 392, 357, 356, 355, 345, 344, 346, ++ 352, 351, 354, 353, 443, 444, 368, 369, 372, 381, ++ 388, 389, 390, 391, 397, 0, 0, 163, 162, 164, ++ 165, 167, 168, 170, 171, 173, 174, 176, 177, 179, ++ 180, 182, 183, 185, 186, 188, 189, 191, 192, 194, ++ 195, 197, 198, 200, 201, 203, 204, 206, 207, 209, ++ 210, 212, 213, 254, 255, 215, 216, 251, 252, 257, ++ 258, 224, 225, 260, 261, 228, 229, 227, 264, 265, ++ 232, 233, 231, 236, 237, 235, 244, 245, 243, 248, ++ 249, 247, 240, 241, 239, 218, 219, 221, 222, 0, ++ 0, 0, 0, 0, 0, 38, 39, 0, 0, 0, ++ 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, ++ 0, 0, 40, 41, 0, 0, 0, 0, 0, 76, ++ 33, 35, 436, 0, 0, 0, 441, 442, 29, 31, ++ 157, 0, 0, 158, 34, 36, 72, 56, 55, 57, ++ 58, 43, 59, 52, 60, 42, 61, 62, 63, 64, ++ 65, 66, 67, 53, 68, 69, 70, 71, 44, 45, ++ 46, 47, 48, 49, 50, 51, 54, 75, 438, 439, ++ 440, 160, 159 + }; + + const short + seclang_parser::yypgoto_[] = + { +- -413, -413, -70, -413, -47, -192, -413, -412, -413, -413, +- -55, -153, -61, -332, -413, -134 ++ -402, -402, -74, -402, -47, -170, -402, -401, -402, -402, ++ -51, -254, -61, -316, -402, -136 + }; + + const short + seclang_parser::yydefgoto_[] = + { +- -1, 82, 83, 84, 209, 210, 476, 477, 85, 335, +- 322, 323, 354, 211, 342, 355 ++ -1, 82, 83, 84, 209, 210, 479, 480, 85, 336, ++ 323, 324, 355, 211, 343, 356 + }; + + const short + seclang_parser::yytable_[] = + { +- 324, 324, 324, 215, 212, 365, 365, 325, 326, 356, +- 437, 357, 339, 216, 437, 95, 364, 327, 96, 324, +- 358, 112, 97, 113, 114, 336, 491, 359, 360, 361, +- 362, 92, 93, 486, 337, 363, 94, 328, 329, 346, +- 347, 0, 330, 343, 348, 344, 345, 480, 481, 482, +- 86, 87, 88, 89, 341, 90, 91, 98, 99, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 100, 101, +- 414, 102, 103, 104, 105, 436, 366, 367, 106, 107, +- 108, 109, 110, 111, 213, 214, 0, 419, 422, 425, +- 428, 431, 0, 331, 332, 333, 334, 349, 350, 351, +- 352, 368, 369, 370, 371, 372, 373, 0, 374, 375, +- 376, 377, 378, 379, 0, 380, 381, 382, 383, 384, +- 385, 478, 386, 387, 388, 389, 390, 391, 0, 0, +- 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, +- 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, +- 415, 416, 432, 433, 434, 435, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 324, 0, 0, ++ 325, 325, 325, 215, 212, 366, 366, 357, 340, 358, ++ 115, 326, 327, 216, 440, 92, 93, 328, 359, 325, ++ 94, 112, 440, 113, 114, 360, 361, 362, 363, 337, ++ 86, 87, 95, 364, 338, 96, 329, 330, 365, 97, ++ 494, 331, 347, 348, 88, 89, 344, 349, 345, 346, ++ 489, 483, 484, 485, 342, 439, 116, 117, 118, 119, ++ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, ++ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, ++ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, ++ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, ++ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, ++ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, ++ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, ++ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, ++ 200, 201, 202, 203, 204, 205, 206, 207, 0, 417, ++ 90, 91, 98, 99, 100, 101, 367, 368, 102, 103, ++ 104, 105, 106, 107, 108, 109, 422, 425, 428, 431, ++ 434, 0, 110, 111, 213, 214, 332, 333, 334, 335, ++ 350, 351, 352, 353, 369, 370, 0, 371, 372, 373, ++ 374, 375, 376, 0, 0, 377, 378, 0, 0, 0, ++ 481, 379, 380, 381, 382, 383, 384, 0, 0, 385, ++ 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, ++ 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, ++ 406, 407, 408, 409, 410, 411, 412, 0, 208, 413, ++ 414, 418, 419, 0, 435, 436, 437, 438, 325, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 479, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 0, 492, 493, 494, 495, 0, 0, +- 496, 497, 498, 0, 499, 500, 501, 502, 503, 504, +- 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, +- 485, 515, 516, 517, 518, 487, 0, 519, 520, 521, +- 522, 523, 0, 0, 0, 0, 525, 526, 527, 0, +- 0, 0, 0, 484, 0, 0, 0, 0, 484, 0, +- 0, 484, 0, 0, 484, 0, 0, 484, 0, 0, +- 484, 0, 0, 0, 0, 353, 490, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, +- 0, 412, 413, 0, 0, 0, 0, 0, 0, 0, ++ 482, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 0, 495, 496, 497, 498, 0, ++ 0, 499, 500, 501, 0, 502, 503, 504, 505, 506, ++ 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, ++ 517, 488, 518, 519, 520, 521, 490, 0, 522, 523, ++ 524, 525, 526, 0, 0, 0, 0, 528, 529, 530, ++ 0, 0, 0, 0, 0, 0, 487, 0, 0, 0, ++ 0, 487, 0, 0, 487, 0, 0, 487, 0, 0, ++ 487, 0, 0, 487, 0, 0, 0, 0, 0, 493, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 484, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 528, 529, 524, +- 0, 484, 484, 484, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 484, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 484, 484, 484, 484, 484, 484, 484, +- 484, 484, 484, 0, 484, 484, 484, 219, 220, 221, +- 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, +- 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, +- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, +- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, +- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, +- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, +- 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, +- 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, +- 302, 303, 304, 305, 306, 307, 219, 220, 221, 222, +- 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, +- 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, +- 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, +- 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, +- 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, +- 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, +- 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, +- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, +- 303, 304, 305, 306, 307, 219, 220, 221, 222, 223, +- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, +- 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, +- 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, +- 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, +- 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, +- 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, +- 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, +- 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, +- 304, 305, 306, 307, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 487, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 531, 532, 527, 0, 487, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, ++ 487, 487, 487, 487, 487, 487, 0, 487, 487, 487, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 353, 0, 309, 310, 311, 312, 313, +- 314, 315, 316, 317, 318, 319, 320, 321, 0, 417, +- 418, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 354, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 0, 415, 416, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 353, 0, 309, 310, 311, 312, 313, 314, +- 315, 316, 317, 318, 319, 320, 321, 0, 420, 421, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 354, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 0, 420, 421, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 353, 0, 309, 310, 311, 312, 313, 314, 315, +- 316, 317, 318, 319, 320, 321, 0, 423, 424, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 219, 220, +- 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, +- 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, +- 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, +- 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, +- 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, +- 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, +- 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, +- 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, +- 301, 302, 303, 304, 305, 306, 307, 217, 218, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 354, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 0, 423, 424, 219, 220, 221, 222, 223, ++ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, ++ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 304, 305, 306, 307, 308, 219, 220, 221, 222, 223, ++ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, ++ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 304, 305, 306, 307, 308, 219, 220, 221, 222, 223, ++ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, ++ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 304, 305, 306, 307, 308, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 353, 0, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, +- 0, 426, 427, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 354, 0, 310, 311, 312, 313, 314, 315, ++ 316, 317, 318, 319, 320, 321, 322, 0, 426, 427, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 353, 0, 309, 310, 311, 312, +- 313, 314, 315, 316, 317, 318, 319, 320, 321, 0, +- 429, 430, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 354, 0, 310, 311, 312, 313, 314, 315, ++ 316, 317, 318, 319, 320, 321, 322, 0, 429, 430, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 308, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 354, 0, 310, 311, 312, 313, 314, 315, ++ 316, 317, 318, 319, 320, 321, 322, 0, 432, 433, + 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, + 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, + 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, +@@ -6295,31 +6322,31 @@ namespace yy { + 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, +- 307, 488, 489, 219, 220, 221, 222, 223, 224, 225, +- 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, +- 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, +- 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, +- 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, +- 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, +- 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, +- 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, +- 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, +- 306, 307, 219, 220, 221, 222, 223, 224, 225, 226, +- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, +- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, +- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, +- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, +- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, +- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, +- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, +- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, +- 307, 0, 0, 0, 0, 438, 439, 440, 441, 442, +- 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, +- 453, 454, 455, 456, 457, 458, 459, 0, 460, 461, +- 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, +- 472, 473, 474, 475, 0, 0, 0, 0, 0, 0, ++ 307, 308, 217, 218, 219, 220, 221, 222, 223, 224, ++ 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, ++ 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, ++ 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, ++ 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, ++ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, ++ 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, ++ 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, ++ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, ++ 305, 306, 307, 308, 491, 492, 219, 220, 221, 222, ++ 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, ++ 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, ++ 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, ++ 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, ++ 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, ++ 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, ++ 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, ++ 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, ++ 303, 304, 305, 306, 307, 308, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, +- 319, 320, 321, 0, 0, 0, 0, 0, 0, 0, ++ 319, 320, 321, 322, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -6327,17 +6354,64 @@ namespace yy { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 309, 310, 311, 312, 313, 314, 315, 316, 317, +- 318, 319, 320, 321, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 310, 311, 312, 313, 314, 315, 316, ++ 317, 318, 319, 320, 321, 322, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 353, 0, +- 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, +- 319, 320, 321, 219, 220, 221, 222, 223, 224, 225, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 310, 311, 312, 313, 314, ++ 315, 316, 317, 318, 319, 320, 321, 322, 219, 220, ++ 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, ++ 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, ++ 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, ++ 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, ++ 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, ++ 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, ++ 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, ++ 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, ++ 301, 302, 303, 304, 305, 306, 307, 308, 0, 0, ++ 0, 0, 441, 442, 443, 444, 445, 446, 447, 448, ++ 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, ++ 459, 460, 461, 462, 0, 463, 464, 465, 466, 467, ++ 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, ++ 478, 219, 220, 221, 222, 223, 224, 225, 226, 227, ++ 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, ++ 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, ++ 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, ++ 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, ++ 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, ++ 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, ++ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, ++ 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, ++ 308, 0, 0, 0, 0, 0, 442, 443, 444, 445, ++ 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, ++ 456, 457, 458, 459, 460, 461, 462, 0, 463, 464, ++ 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, ++ 475, 476, 477, 478, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 354, 0, 310, 311, 312, ++ 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, ++ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, ++ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, ++ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, ++ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, ++ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, ++ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, ++ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, ++ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, ++ 0, 0, 0, 0, 341, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 354, 0, ++ 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, ++ 320, 321, 322, 219, 220, 221, 222, 223, 224, 225, + 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, + 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, + 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, +@@ -6346,116 +6420,75 @@ namespace yy { + 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, + 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, + 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, +- 306, 307, 0, 0, 0, 0, 0, 439, 440, 441, +- 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, +- 452, 453, 454, 455, 456, 457, 458, 459, 0, 460, +- 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, +- 471, 472, 473, 474, 475, 219, 220, 221, 222, 223, +- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, +- 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, +- 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, +- 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, +- 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, +- 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, +- 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, +- 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, +- 304, 305, 306, 307, 0, 0, 0, 0, 340, 219, +- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, +- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, +- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, +- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, +- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, +- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, +- 300, 301, 302, 303, 304, 305, 306, 307, 0, 353, +- 0, 309, 310, 311, 312, 313, 314, 315, 316, 317, +- 318, 319, 320, 321, 219, 220, 221, 222, 223, 224, +- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, +- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, +- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, +- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, +- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, +- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, +- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, +- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, +- 305, 306, 307, 0, 0, 0, 0, 0, 0, 0, ++ 306, 307, 308, 219, 220, 221, 222, 223, 224, 225, ++ 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, ++ 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, ++ 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, ++ 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, ++ 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, ++ 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, ++ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, ++ 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, ++ 306, 307, 308, 0, 0, 0, 0, 0, 0, 310, ++ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 219, 220, 221, 222, 223, 224, 225, 226, ++ 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, ++ 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, ++ 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, ++ 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, ++ 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, ++ 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, ++ 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, ++ 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, ++ 307, 308, 0, 0, 0, 0, 1, 0, 0, 0, ++ 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 354, 0, 310, 311, 312, 313, 314, 315, 316, 317, ++ 318, 319, 320, 321, 322, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 309, 310, 311, 312, 313, 314, 315, +- 316, 317, 318, 319, 320, 321, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, +- 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 353, 0, 309, 310, 311, +- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, +- 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, +- 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, +- 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, +- 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, +- 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, +- 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, +- 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, +- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, +- 299, 300, 301, 302, 303, 304, 305, 306, 307, 4, +- 483, 0, 309, 310, 311, 312, 313, 314, 315, 316, +- 317, 318, 319, 320, 321, 0, 0, 0, 338, 0, +- 0, 0, 2, 3, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 486, 0, 310, 311, 312, 313, 314, 315, 316, 317, ++ 318, 319, 320, 321, 322, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, ++ 339, 0, 0, 0, 2, 3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 5, 6, 7, 8, 9, 10, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 310, 311, 312, 313, 314, 315, 316, 317, 318, ++ 319, 320, 321, 322, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 0, 54, 55, 56, 57, 58, 59, ++ 51, 52, 53, 4, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, +- 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 309, 310, +- 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, +- 321, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 5, 6, 7, 8, 9, +- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, +- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, +- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, +- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, +- 50, 51, 52, 53, 115, 54, 55, 56, 57, 58, +- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, +- 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 70, 71, 72, 73, 74, 75, 76, 77, +- 78, 79, 80, 81, 0, 0, 0, 0, 0, 0, +- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, +- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, +- 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, +- 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, +- 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, +- 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, +- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, +- 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, +- 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, +- 206, 207, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 115, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 208, 116, 117, 118, 119, 120, 121, 122, ++ 0, 0, 0, 0, 0, 0, 0, 0, 5, 6, ++ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ++ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, ++ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, ++ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ++ 47, 48, 49, 50, 51, 52, 53, 115, 54, 55, ++ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, ++ 66, 67, 68, 69, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 0, 0, 0, ++ 0, 0, 0, 116, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, +@@ -6470,155 +6503,156 @@ namespace yy { + const short + seclang_parser::yycheck_[] = + { +- 61, 62, 63, 303, 51, 3, 3, 62, 63, 143, +- 6, 145, 82, 313, 6, 305, 208, 64, 308, 80, +- 154, 304, 312, 306, 307, 80, 438, 161, 162, 163, +- 164, 306, 307, 365, 81, 169, 311, 306, 307, 306, +- 307, -1, 311, 304, 311, 306, 307, 100, 101, 102, +- 306, 307, 143, 144, 115, 306, 307, 306, 307, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, 306, 307, +- 284, 306, 307, 309, 310, 308, 217, 218, 306, 307, +- 309, 310, 306, 307, 306, 307, -1, 301, 302, 303, +- 304, 305, -1, 306, 307, 306, 307, 306, 307, 306, +- 307, 342, 343, 342, 343, 342, 343, -1, 342, 343, +- 342, 343, 342, 343, -1, 342, 343, 342, 343, 342, +- 343, 335, 342, 343, 342, 343, 342, 343, -1, -1, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 308, -1, -1, ++ 61, 62, 63, 304, 51, 3, 3, 143, 82, 145, ++ 100, 62, 63, 314, 6, 307, 308, 64, 154, 80, ++ 312, 305, 6, 307, 308, 161, 162, 163, 164, 80, ++ 307, 308, 306, 169, 81, 309, 307, 308, 208, 313, ++ 441, 312, 307, 308, 144, 145, 305, 312, 307, 308, ++ 366, 101, 102, 103, 115, 309, 146, 147, 148, 149, ++ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, ++ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, ++ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, ++ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, ++ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, ++ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, ++ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, ++ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, ++ 230, 231, 232, 233, 234, 235, 236, 237, -1, 285, ++ 307, 308, 307, 308, 307, 308, 217, 218, 307, 308, ++ 310, 311, 307, 308, 310, 311, 302, 303, 304, 305, ++ 306, -1, 307, 308, 307, 308, 307, 308, 307, 308, ++ 307, 308, 307, 308, 343, 344, -1, 343, 344, 343, ++ 344, 343, 344, -1, -1, 343, 344, -1, -1, -1, ++ 336, 343, 344, 343, 344, 343, 344, -1, -1, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, -1, 328, 343, ++ 344, 343, 344, -1, 343, 344, 343, 344, 309, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, -1, 340, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, 355, 356, 357, 358, 359, 360, +- 361, 362, 363, -1, 438, 439, 440, 441, -1, -1, +- 444, 445, 446, -1, 448, 449, 450, 451, 452, 453, +- 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, +- 327, 465, 466, 467, 468, 327, -1, 471, 472, 473, +- 474, 475, -1, -1, -1, -1, 480, 481, 482, -1, +- -1, -1, -1, 414, -1, -1, -1, -1, 419, -1, ++ 341, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 356, 357, 358, 359, 360, ++ 361, 362, 363, 364, -1, 441, 442, 443, 444, -1, ++ -1, 447, 448, 449, -1, 451, 452, 453, 454, 455, ++ 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, ++ 466, 328, 468, 469, 470, 471, 328, -1, 474, 475, ++ 476, 477, 478, -1, -1, -1, -1, 483, 484, 485, ++ -1, -1, -1, -1, -1, -1, 417, -1, -1, -1, + -1, 422, -1, -1, 425, -1, -1, 428, -1, -1, +- 431, -1, -1, -1, -1, 326, 437, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, +- -1, 342, 343, -1, -1, -1, -1, -1, -1, -1, ++ 431, -1, -1, 434, -1, -1, -1, -1, -1, 440, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 478, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 488, 489, 476, +- -1, 492, 493, 494, 495, 496, 497, 498, 499, 500, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 481, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 491, 492, 479, -1, 495, 496, 497, 498, 499, 500, + 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, + 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, +- 521, 522, 523, -1, 525, 526, 527, 10, 11, 12, +- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, +- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, +- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, +- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, +- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, +- 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, +- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, +- 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, +- 93, 94, 95, 96, 97, 98, 10, 11, 12, 13, +- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, +- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, +- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, +- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, +- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, +- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, +- 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, +- 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, +- 94, 95, 96, 97, 98, 10, 11, 12, 13, 14, +- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, +- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, +- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, +- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, +- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, +- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, +- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, +- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, +- 95, 96, 97, 98, -1, -1, -1, -1, -1, -1, ++ 521, 522, 523, 524, 525, 526, -1, 528, 529, 530, ++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ++ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ++ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, ++ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, ++ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ++ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ++ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ++ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, ++ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, ++ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ++ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ++ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ++ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, ++ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, ++ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ++ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, 326, -1, 328, 329, 330, 331, 332, +- 333, 334, 335, 336, 337, 338, 339, 340, -1, 342, +- 343, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, 327, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, -1, 343, 344, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, 326, -1, 328, 329, 330, 331, 332, 333, +- 334, 335, 336, 337, 338, 339, 340, -1, 342, 343, ++ -1, -1, -1, -1, -1, -1, -1, 327, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, -1, 343, 344, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, 327, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, -1, 343, 344, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, ++ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, ++ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, ++ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, ++ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, ++ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, ++ 95, 96, 97, 98, 99, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, ++ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, ++ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, ++ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, ++ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, ++ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, ++ 95, 96, 97, 98, 99, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, ++ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, ++ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, ++ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, ++ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ++ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, ++ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, ++ 95, 96, 97, 98, 99, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 326, -1, 328, 329, 330, 331, 332, 333, 334, +- 335, 336, 337, 338, 339, 340, -1, 342, 343, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, 10, 11, +- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, +- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, +- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, +- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, +- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, +- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, +- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, +- 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, +- 92, 93, 94, 95, 96, 97, 98, 8, 9, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, 327, -1, 329, 330, 331, 332, 333, 334, ++ 335, 336, 337, 338, 339, 340, 341, -1, 343, 344, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 326, -1, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, +- -1, 342, 343, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, 326, -1, 328, 329, 330, 331, +- 332, 333, 334, 335, 336, 337, 338, 339, 340, -1, +- 342, 343, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, 327, -1, 329, 330, 331, 332, 333, 334, ++ 335, 336, 337, 338, 339, 340, 341, -1, 343, 344, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, 327, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, 327, -1, 329, 330, 331, 332, 333, 334, ++ 335, 336, 337, 338, 339, 340, 341, -1, 343, 344, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, +@@ -6628,104 +6662,82 @@ namespace yy { + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, +- 98, 8, 9, 10, 11, 12, 13, 14, 15, 16, +- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, +- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, +- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, +- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, +- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, +- 97, 98, 10, 11, 12, 13, 14, 15, 16, 17, +- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, +- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, +- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, +- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, +- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, +- 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, +- 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, +- 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, +- 98, -1, -1, -1, -1, 103, 104, 105, 106, 107, +- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, +- 118, 119, 120, 121, 122, 123, 124, -1, 126, 127, +- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, +- 138, 139, 140, 141, -1, -1, -1, -1, -1, -1, +- 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, +- 338, 339, 340, -1, -1, -1, -1, -1, -1, -1, ++ 98, 99, 8, 9, 10, 11, 12, 13, 14, 15, ++ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, ++ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, ++ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, ++ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, ++ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, ++ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ++ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, ++ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, ++ 96, 97, 98, 99, 8, 9, 10, 11, 12, 13, ++ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, ++ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, ++ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, ++ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, ++ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, ++ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, ++ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, ++ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, ++ 94, 95, 96, 97, 98, 99, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, ++ 338, 339, 340, 341, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 328, 329, 330, 331, 332, 333, 334, 335, 336, +- 337, 338, 339, 340, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, 329, 330, 331, 332, 333, 334, 335, ++ 336, 337, 338, 339, 340, 341, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, 326, -1, +- 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, +- 338, 339, 340, 10, 11, 12, 13, 14, 15, 16, +- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, +- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, +- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, +- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, +- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, +- 97, 98, -1, -1, -1, -1, -1, 104, 105, 106, +- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, +- 117, 118, 119, 120, 121, 122, 123, 124, -1, 126, +- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, +- 137, 138, 139, 140, 141, 10, 11, 12, 13, 14, +- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, +- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, +- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, +- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, +- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, +- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, +- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, +- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, +- 95, 96, 97, 98, -1, -1, -1, -1, 103, 10, +- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, +- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, +- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, +- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, -1, 326, +- -1, 328, 329, 330, 331, 332, 333, 334, 335, 336, +- 337, 338, 339, 340, 10, 11, 12, 13, 14, 15, +- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, +- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, +- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, +- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, +- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, +- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, +- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, +- 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, +- 96, 97, 98, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, 328, 329, 330, 331, 332, 333, 334, +- 335, 336, 337, 338, 339, 340, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, +- -1, 4, 5, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 329, 330, 331, 332, 333, ++ 334, 335, 336, 337, 338, 339, 340, 341, 10, 11, ++ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, ++ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, ++ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, ++ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, ++ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, ++ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, ++ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ++ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, ++ 92, 93, 94, 95, 96, 97, 98, 99, -1, -1, ++ -1, -1, 104, 105, 106, 107, 108, 109, 110, 111, ++ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, ++ 122, 123, 124, 125, -1, 127, 128, 129, 130, 131, ++ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, ++ 142, 10, 11, 12, 13, 14, 15, 16, 17, 18, ++ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, ++ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, ++ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, ++ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, ++ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, ++ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, ++ 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, ++ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, ++ 99, -1, -1, -1, -1, -1, 105, 106, 107, 108, ++ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, ++ 119, 120, 121, 122, 123, 124, 125, -1, 127, 128, ++ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, ++ 139, 140, 141, 142, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 326, -1, 328, 329, 330, +- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 327, -1, 329, 330, 331, ++ 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, +@@ -6734,97 +6746,125 @@ namespace yy { + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, +- 90, 91, 92, 93, 94, 95, 96, 97, 98, 142, +- 326, -1, 328, 329, 330, 331, 332, 333, 334, 335, +- 336, 337, 338, 339, 340, -1, -1, -1, 0, -1, +- -1, -1, 4, 5, -1, -1, -1, -1, -1, -1, ++ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ++ -1, -1, -1, -1, 104, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, 327, -1, ++ 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, ++ 339, 340, 341, 10, 11, 12, 13, 14, 15, 16, ++ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, ++ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, ++ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ++ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, ++ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, ++ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ++ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, ++ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, ++ 97, 98, 99, 10, 11, 12, 13, 14, 15, 16, ++ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, ++ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, ++ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ++ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, ++ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, ++ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ++ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, ++ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, ++ 97, 98, 99, -1, -1, -1, -1, -1, -1, 329, ++ 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, ++ 340, 341, 10, 11, 12, 13, 14, 15, 16, 17, ++ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, ++ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, ++ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, ++ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, ++ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, ++ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ++ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, ++ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, ++ 98, 99, -1, -1, -1, -1, 0, -1, -1, -1, ++ 4, 5, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 327, -1, 329, 330, 331, 332, 333, 334, 335, 336, ++ 337, 338, 339, 340, 341, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, 237, 238, 239, 240, 241, 242, +- 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, +- 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, +- 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, +- 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, +- 283, 284, 285, -1, 287, 288, 289, 290, 291, 292, +- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, +- 142, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 314, 315, 316, 317, 318, 319, 320, 321, 322, +- 323, 324, 325, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ 327, -1, 329, 330, 331, 332, 333, 334, 335, 336, ++ 337, 338, 339, 340, 341, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, 143, ++ 0, -1, -1, -1, 4, 5, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, 328, 329, +- 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, +- 340, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 237, 238, 239, 240, 241, +- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, +- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, +- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, +- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, +- 282, 283, 284, 285, 99, 287, 288, 289, 290, 291, +- 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, +- 302, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, 314, 315, 316, 317, 318, 319, 320, 321, +- 322, 323, 324, 325, -1, -1, -1, -1, -1, -1, +- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, +- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, +- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, +- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, +- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, +- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, +- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, +- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, +- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, +- 235, 236, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, 329, 330, 331, 332, 333, 334, 335, 336, 337, ++ 338, 339, 340, 341, 238, 239, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, ++ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, ++ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, ++ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, ++ 284, 285, 286, 143, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, 315, 316, 317, 318, 319, 320, 321, 322, 323, ++ 324, 325, 326, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, 327, 145, 146, 147, 148, 149, 150, 151, +- 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, +- 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, +- 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, +- 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, +- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, +- 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, +- 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, +- 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, +- 232, 233, 234, 235, 236 ++ -1, -1, -1, -1, -1, -1, -1, -1, 238, 239, ++ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, ++ 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, ++ 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, ++ 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, ++ 280, 281, 282, 283, 284, 285, 286, 100, 288, 289, ++ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, ++ 300, 301, 302, 303, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, 315, 316, 317, 318, 319, ++ 320, 321, 322, 323, 324, 325, 326, -1, -1, -1, ++ -1, -1, -1, 146, 147, 148, 149, 150, 151, 152, ++ 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, ++ 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, ++ 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, ++ 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, ++ 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, ++ 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, ++ 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, ++ 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, ++ 233, 234, 235, 236, 237 + }; + + const short + seclang_parser::yystos_[] = + { +- 0, 0, 4, 5, 142, 237, 238, 239, 240, 241, +- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, +- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, +- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, +- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, +- 282, 283, 284, 285, 287, 288, 289, 290, 291, 292, +- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, +- 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, +- 324, 325, 345, 346, 347, 352, 306, 307, 143, 144, +- 306, 307, 306, 307, 311, 305, 308, 312, 306, 307, +- 306, 307, 306, 307, 309, 310, 306, 307, 309, 310, +- 306, 307, 304, 306, 307, 99, 145, 146, 147, 148, +- 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, +- 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, +- 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, +- 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, +- 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, +- 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, +- 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, +- 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, +- 229, 230, 231, 232, 233, 234, 235, 236, 327, 348, +- 349, 357, 348, 306, 307, 303, 313, 8, 9, 10, ++ 0, 0, 4, 5, 143, 238, 239, 240, 241, 242, ++ 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, ++ 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, ++ 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, ++ 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, ++ 283, 284, 285, 286, 288, 289, 290, 291, 292, 293, ++ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, ++ 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, ++ 325, 326, 346, 347, 348, 353, 307, 308, 144, 145, ++ 307, 308, 307, 308, 312, 306, 309, 313, 307, 308, ++ 307, 308, 307, 308, 310, 311, 307, 308, 310, 311, ++ 307, 308, 305, 307, 308, 100, 146, 147, 148, 149, ++ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, ++ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, ++ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, ++ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, ++ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, ++ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, ++ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, ++ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, ++ 230, 231, 232, 233, 234, 235, 236, 237, 328, 349, ++ 350, 358, 349, 307, 308, 304, 314, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +@@ -6833,67 +6873,51 @@ namespace yy { + 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 93, 94, 95, 96, 97, 98, 327, 328, ++ 91, 92, 93, 94, 95, 96, 97, 98, 99, 328, + 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, +- 339, 340, 354, 355, 356, 354, 354, 348, 306, 307, +- 311, 306, 307, 306, 307, 353, 354, 348, 0, 346, +- 103, 356, 358, 304, 306, 307, 306, 307, 311, 306, +- 307, 306, 307, 326, 356, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 349, 3, 356, 356, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 342, 343, 342, 343, 342, 343, +- 342, 343, 342, 343, 359, 342, 343, 342, 343, 359, +- 342, 343, 359, 342, 343, 359, 342, 343, 359, 342, +- 343, 359, 342, 343, 342, 343, 355, 6, 103, 104, +- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, +- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, +- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, +- 136, 137, 138, 139, 140, 141, 350, 351, 359, 356, +- 100, 101, 102, 326, 356, 327, 357, 327, 8, 9, +- 356, 351, 359, 359, 359, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 359, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 359, 359, 359, 359, 359, 359, +- 359, 359, 359, 359, 348, 359, 359, 359, 356, 356 ++ 339, 340, 341, 355, 356, 357, 355, 355, 349, 307, ++ 308, 312, 307, 308, 307, 308, 354, 355, 349, 0, ++ 347, 104, 357, 359, 305, 307, 308, 307, 308, 312, ++ 307, 308, 307, 308, 327, 357, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 350, 3, 357, 357, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 343, 344, 343, ++ 344, 343, 344, 343, 344, 343, 344, 360, 343, 344, ++ 343, 344, 360, 343, 344, 360, 343, 344, 360, 343, ++ 344, 360, 343, 344, 360, 343, 344, 343, 344, 356, ++ 6, 104, 105, 106, 107, 108, 109, 110, 111, 112, ++ 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, ++ 123, 124, 125, 127, 128, 129, 130, 131, 132, 133, ++ 134, 135, 136, 137, 138, 139, 140, 141, 142, 351, ++ 352, 360, 357, 101, 102, 103, 327, 357, 328, 358, ++ 328, 8, 9, 357, 352, 360, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, ++ 360, 360, 360, 360, 360, 360, 360, 349, 360, 360, ++ 360, 357, 357 + }; + + const short + seclang_parser::yyr1_[] = + { +- 0, 344, 345, 345, 345, 346, 347, 347, 347, 347, +- 347, 347, 347, 347, 347, 347, 347, 347, 347, 347, +- 347, 347, 347, 347, 347, 347, 347, 347, 347, 348, +- 348, 349, 349, 350, 350, 350, 350, 351, 351, 351, +- 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, +- 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, +- 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, +- 351, 351, 351, 351, 352, 352, 352, 352, 352, 352, ++ 0, 345, 346, 346, 346, 347, 348, 348, 348, 348, ++ 348, 348, 348, 348, 348, 348, 348, 348, 348, 348, ++ 348, 348, 348, 348, 348, 348, 348, 348, 348, 349, ++ 349, 350, 350, 351, 351, 351, 351, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, +- 352, 352, 352, 352, 352, 353, 354, 354, 355, 355, +- 355, 355, 355, 355, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 352, 352, 352, 352, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, ++ 353, 353, 353, 353, 353, 354, 355, 355, 356, 356, + 356, 356, 356, 356, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, +@@ -6904,8 +6928,25 @@ namespace yy { + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, +- 357, 357, 357, 358, 358, 358, 358, 358, 359, 359, +- 359, 359 ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, ++ 357, 357, 357, 357, 357, 357, 357, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, ++ 358, 358, 358, 358, 358, 358, 359, 359, 359, 359, ++ 359, 360, 360, 360, 360 + }; + + const signed char +@@ -6933,11 +6974,11 @@ namespace yy { + 1, 2, 2, 1, 2, 2, 1, 2, 2, 1, + 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, + 2, 1, 2, 2, 1, 2, 2, 1, 2, 2, +- 1, 2, 2, 1, 2, 2, 2, 1, 2, 2, +- 2, 1, 2, 2, 2, 1, 2, 2, 2, 1, +- 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, ++ 1, 2, 2, 1, 2, 2, 1, 2, 2, 2, ++ 1, 2, 2, 2, 1, 2, 2, 2, 1, 2, ++ 2, 2, 1, 2, 2, 2, 1, 2, 2, 2, + 1, 2, 2, 1, 2, 2, 1, 2, 2, 1, +- 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, ++ 2, 2, 1, 1, 2, 2, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +@@ -6945,17 +6986,17 @@ namespace yy { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +- 1, 2, 2, 2, 1, 1, 1, 1, 2, 2, +- 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, +- 1, 1, 1, 1, 1, 2, 2, 1, 1, 2, +- 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, +- 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, +- 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, ++ 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, ++ 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, ++ 1, 2, 1, 1, 1, 1, 1, 1, 2, 2, ++ 2, 2, 2, 1, 1, 1, 1, 2, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +- 1, 1, 1, 2, 1, 3, 3, 3, 2, 2, +- 1, 1 ++ 1, 1, 1, 1, 1, 1, 2, 1, 3, 3, ++ 3, 2, 2, 1, 1 + }; + + +@@ -6974,11 +7015,12 @@ namespace yy { + "VARIABLE_MATCHED_VARS_NAMES", "VARIABLE_MATCHED_VARS", "VARIABLE_FILES", + "VARIABLE_REQUEST_COOKIES", "VARIABLE_REQUEST_HEADERS", + "VARIABLE_RESPONSE_HEADERS", "VARIABLE_GEO", +- "VARIABLE_REQUEST_COOKIES_NAMES", "VARIABLE_ARGS_COMBINED_SIZE", +- "VARIABLE_ARGS_GET_NAMES", "VARIABLE_RULE", "\"Variable ARGS_NAMES\"", +- "VARIABLE_ARGS_POST_NAMES", "\"AUTH_TYPE\"", "\"FILES_COMBINED_SIZE\"", +- "\"FILES_TMPNAMES\"", "\"FULL_REQUEST\"", "\"FULL_REQUEST_LENGTH\"", +- "\"INBOUND_DATA_ERROR\"", "\"MATCHED_VAR\"", "\"MATCHED_VAR_NAME\"", ++ "VARIABLE_REQUEST_COOKIES_NAMES", "VARIABLE_MULTIPART_PART_HEADERS", ++ "VARIABLE_ARGS_COMBINED_SIZE", "VARIABLE_ARGS_GET_NAMES", ++ "VARIABLE_RULE", "\"Variable ARGS_NAMES\"", "VARIABLE_ARGS_POST_NAMES", ++ "\"AUTH_TYPE\"", "\"FILES_COMBINED_SIZE\"", "\"FILES_TMPNAMES\"", ++ "\"FULL_REQUEST\"", "\"FULL_REQUEST_LENGTH\"", "\"INBOUND_DATA_ERROR\"", ++ "\"MATCHED_VAR\"", "\"MATCHED_VAR_NAME\"", + "VARIABLE_MULTIPART_BOUNDARY_QUOTED", + "VARIABLE_MULTIPART_BOUNDARY_WHITESPACE", "\"MULTIPART_CRLF_LF_LINES\"", + "\"MULTIPART_DATA_AFTER\"", "VARIABLE_MULTIPART_DATA_BEFORE", +@@ -7147,51 +7189,51 @@ namespace yy { + const short + seclang_parser::yyrline_[] = + { +- 0, 712, 712, 716, 717, 720, 725, 731, 737, 741, +- 745, 751, 757, 763, 769, 774, 779, 785, 792, 796, +- 800, 806, 810, 814, 819, 824, 829, 834, 838, 845, +- 849, 856, 862, 872, 881, 891, 900, 913, 917, 921, +- 925, 929, 933, 937, 941, 945, 949, 954, 958, 962, +- 966, 970, 974, 979, 984, 988, 992, 996, 1000, 1004, +- 1008, 1012, 1016, 1020, 1024, 1028, 1032, 1036, 1040, 1044, +- 1048, 1052, 1056, 1060, 1074, 1075, 1105, 1124, 1143, 1171, +- 1228, 1235, 1239, 1243, 1247, 1251, 1255, 1259, 1263, 1272, +- 1276, 1281, 1284, 1289, 1294, 1299, 1304, 1307, 1312, 1315, +- 1320, 1325, 1328, 1333, 1338, 1343, 1348, 1353, 1358, 1363, +- 1366, 1371, 1376, 1381, 1386, 1389, 1394, 1399, 1404, 1417, +- 1430, 1443, 1456, 1469, 1495, 1523, 1535, 1555, 1582, 1587, +- 1593, 1598, 1603, 1612, 1617, 1621, 1625, 1629, 1633, 1637, +- 1641, 1646, 1651, 1663, 1669, 1673, 1677, 1688, 1697, 1698, +- 1705, 1710, 1715, 1769, 1776, 1784, 1821, 1825, 1832, 1837, +- 1843, 1849, 1855, 1862, 1872, 1876, 1880, 1884, 1888, 1892, +- 1896, 1900, 1904, 1908, 1912, 1916, 1920, 1924, 1928, 1932, +- 1936, 1940, 1944, 1948, 1952, 1956, 1960, 1964, 1968, 1972, +- 1976, 1980, 1984, 1988, 1992, 1996, 2000, 2004, 2008, 2012, +- 2016, 2020, 2024, 2028, 2032, 2036, 2040, 2044, 2048, 2052, +- 2056, 2060, 2064, 2068, 2072, 2076, 2080, 2084, 2088, 2092, +- 2096, 2100, 2104, 2108, 2112, 2116, 2120, 2124, 2128, 2132, +- 2136, 2140, 2144, 2148, 2152, 2156, 2160, 2164, 2168, 2172, +- 2176, 2180, 2184, 2188, 2192, 2196, 2200, 2204, 2208, 2212, +- 2216, 2220, 2224, 2228, 2233, 2237, 2241, 2246, 2250, 2254, +- 2259, 2264, 2268, 2272, 2276, 2280, 2284, 2288, 2292, 2296, +- 2300, 2304, 2308, 2312, 2316, 2320, 2324, 2328, 2332, 2336, +- 2340, 2344, 2348, 2352, 2356, 2360, 2364, 2368, 2372, 2376, +- 2380, 2384, 2388, 2392, 2396, 2400, 2404, 2408, 2412, 2416, +- 2420, 2424, 2428, 2432, 2436, 2440, 2444, 2448, 2452, 2456, +- 2460, 2464, 2468, 2472, 2476, 2480, 2484, 2488, 2492, 2496, +- 2500, 2504, 2512, 2519, 2526, 2533, 2540, 2547, 2554, 2561, +- 2568, 2575, 2582, 2589, 2599, 2603, 2607, 2611, 2615, 2619, +- 2623, 2627, 2632, 2636, 2641, 2645, 2649, 2653, 2657, 2662, +- 2667, 2671, 2675, 2679, 2683, 2687, 2691, 2695, 2699, 2703, +- 2707, 2711, 2715, 2719, 2724, 2728, 2732, 2736, 2740, 2744, +- 2748, 2752, 2756, 2760, 2764, 2768, 2772, 2776, 2780, 2784, +- 2788, 2792, 2796, 2800, 2804, 2808, 2812, 2816, 2820, 2824, +- 2828, 2832, 2836, 2840, 2844, 2848, 2852, 2856, 2860, 2864, +- 2868, 2872, 2876, 2880, 2884, 2888, 2892, 2896, 2900, 2904, +- 2908, 2912, 2916, 2920, 2924, 2928, 2932, 2936, 2940, 2944, +- 2948, 2952, 2956, 2960, 2964, 2968, 2972, 2976, 2980, 2984, +- 2988, 2992, 2996, 3003, 3007, 3011, 3015, 3019, 3026, 3031, +- 3036, 3042 ++ 0, 714, 714, 718, 719, 722, 727, 733, 739, 743, ++ 747, 753, 759, 765, 771, 776, 781, 787, 794, 798, ++ 802, 808, 812, 816, 821, 826, 831, 836, 840, 847, ++ 851, 858, 864, 874, 883, 893, 902, 915, 919, 923, ++ 927, 931, 935, 939, 943, 947, 951, 956, 960, 964, ++ 968, 972, 976, 981, 986, 990, 994, 998, 1002, 1006, ++ 1010, 1014, 1018, 1022, 1026, 1030, 1034, 1038, 1042, 1046, ++ 1050, 1054, 1058, 1062, 1076, 1077, 1107, 1126, 1145, 1173, ++ 1230, 1237, 1241, 1245, 1249, 1253, 1257, 1261, 1265, 1274, ++ 1278, 1283, 1286, 1291, 1296, 1301, 1306, 1309, 1314, 1317, ++ 1322, 1327, 1330, 1335, 1340, 1345, 1350, 1355, 1360, 1365, ++ 1368, 1373, 1378, 1383, 1388, 1391, 1396, 1401, 1406, 1419, ++ 1432, 1445, 1458, 1471, 1497, 1525, 1537, 1557, 1584, 1589, ++ 1595, 1600, 1605, 1614, 1619, 1623, 1627, 1631, 1635, 1639, ++ 1643, 1648, 1653, 1665, 1671, 1675, 1679, 1690, 1699, 1700, ++ 1707, 1712, 1717, 1771, 1778, 1786, 1823, 1827, 1834, 1839, ++ 1845, 1851, 1857, 1864, 1874, 1878, 1882, 1886, 1890, 1894, ++ 1898, 1902, 1906, 1910, 1914, 1918, 1922, 1926, 1930, 1934, ++ 1938, 1942, 1946, 1950, 1954, 1958, 1962, 1966, 1970, 1974, ++ 1978, 1982, 1986, 1990, 1994, 1998, 2002, 2006, 2010, 2014, ++ 2018, 2022, 2026, 2030, 2034, 2038, 2042, 2046, 2050, 2054, ++ 2058, 2062, 2066, 2070, 2074, 2078, 2082, 2086, 2090, 2094, ++ 2098, 2102, 2106, 2110, 2114, 2118, 2122, 2126, 2130, 2134, ++ 2138, 2142, 2146, 2150, 2154, 2158, 2162, 2166, 2170, 2174, ++ 2178, 2182, 2186, 2190, 2194, 2198, 2202, 2206, 2210, 2214, ++ 2218, 2222, 2226, 2230, 2234, 2238, 2242, 2247, 2251, 2255, ++ 2260, 2264, 2268, 2273, 2278, 2282, 2286, 2290, 2294, 2298, ++ 2302, 2306, 2310, 2314, 2318, 2322, 2326, 2330, 2334, 2338, ++ 2342, 2346, 2350, 2354, 2358, 2362, 2366, 2370, 2374, 2378, ++ 2382, 2386, 2390, 2394, 2398, 2402, 2406, 2410, 2414, 2418, ++ 2422, 2426, 2430, 2434, 2438, 2442, 2446, 2450, 2454, 2458, ++ 2462, 2466, 2470, 2474, 2478, 2482, 2486, 2490, 2494, 2498, ++ 2502, 2506, 2510, 2514, 2518, 2526, 2533, 2540, 2547, 2554, ++ 2561, 2568, 2575, 2582, 2589, 2596, 2603, 2613, 2617, 2621, ++ 2625, 2629, 2633, 2637, 2641, 2646, 2650, 2655, 2659, 2663, ++ 2667, 2671, 2676, 2681, 2685, 2689, 2693, 2697, 2701, 2705, ++ 2709, 2713, 2717, 2721, 2725, 2729, 2733, 2738, 2742, 2746, ++ 2750, 2754, 2758, 2762, 2766, 2770, 2774, 2778, 2782, 2786, ++ 2790, 2794, 2798, 2802, 2806, 2810, 2814, 2818, 2822, 2826, ++ 2830, 2834, 2838, 2842, 2846, 2850, 2854, 2858, 2862, 2866, ++ 2870, 2874, 2878, 2882, 2886, 2890, 2894, 2898, 2902, 2906, ++ 2910, 2914, 2918, 2922, 2926, 2930, 2934, 2938, 2942, 2946, ++ 2950, 2954, 2958, 2962, 2966, 2970, 2974, 2978, 2982, 2986, ++ 2990, 2994, 2998, 3002, 3006, 3010, 3017, 3021, 3025, 3029, ++ 3033, 3040, 3045, 3050, 3056 + }; + + void +@@ -7223,9 +7265,9 @@ namespace yy { + + + } // yy +-#line 7227 "seclang-parser.cc" ++#line 7269 "seclang-parser.cc" + +-#line 3049 "seclang-parser.yy" ++#line 3063 "seclang-parser.yy" + + + void yy::seclang_parser::error (const location_type& l, const std::string& m) { +diff --git a/src/parser/seclang-parser.hh b/src/parser/seclang-parser.hh +index 8cdbe22e..360ae8c3 100644 +--- a/src/parser/seclang-parser.hh ++++ b/src/parser/seclang-parser.hh +@@ -256,6 +256,7 @@ class Driver; + #include "src/variables/request_body_length.h" + #include "src/variables/request_cookies.h" + #include "src/variables/request_cookies_names.h" ++#include "src/variables/multipart_part_headers.h" + #include "src/variables/request_file_name.h" + #include "src/variables/request_headers.h" + #include "src/variables/request_headers_names.h" +@@ -351,7 +352,7 @@ using namespace modsecurity::operators; + a = std::move(c); + + +-#line 355 "seclang-parser.hh" ++#line 356 "seclang-parser.hh" + + # include + # include // std::abort +@@ -485,7 +486,7 @@ using namespace modsecurity::operators; + #endif + + namespace yy { +-#line 489 "seclang-parser.hh" ++#line 490 "seclang-parser.hh" + + + +@@ -995,324 +996,325 @@ namespace yy { + TOK_VARIABLE_RESPONSE_HEADERS = 278, // VARIABLE_RESPONSE_HEADERS + TOK_VARIABLE_GEO = 279, // VARIABLE_GEO + TOK_VARIABLE_REQUEST_COOKIES_NAMES = 280, // VARIABLE_REQUEST_COOKIES_NAMES +- TOK_VARIABLE_ARGS_COMBINED_SIZE = 281, // VARIABLE_ARGS_COMBINED_SIZE +- TOK_VARIABLE_ARGS_GET_NAMES = 282, // VARIABLE_ARGS_GET_NAMES +- TOK_VARIABLE_RULE = 283, // VARIABLE_RULE +- TOK_VARIABLE_ARGS_NAMES = 284, // "Variable ARGS_NAMES" +- TOK_VARIABLE_ARGS_POST_NAMES = 285, // VARIABLE_ARGS_POST_NAMES +- TOK_VARIABLE_AUTH_TYPE = 286, // "AUTH_TYPE" +- TOK_VARIABLE_FILES_COMBINED_SIZE = 287, // "FILES_COMBINED_SIZE" +- TOK_VARIABLE_FILES_TMP_NAMES = 288, // "FILES_TMPNAMES" +- TOK_VARIABLE_FULL_REQUEST = 289, // "FULL_REQUEST" +- TOK_VARIABLE_FULL_REQUEST_LENGTH = 290, // "FULL_REQUEST_LENGTH" +- TOK_VARIABLE_INBOUND_DATA_ERROR = 291, // "INBOUND_DATA_ERROR" +- TOK_VARIABLE_MATCHED_VAR = 292, // "MATCHED_VAR" +- TOK_VARIABLE_MATCHED_VAR_NAME = 293, // "MATCHED_VAR_NAME" +- TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 294, // VARIABLE_MULTIPART_BOUNDARY_QUOTED +- TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 295, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE +- TOK_VARIABLE_MULTIPART_CRLF_LF_LINES = 296, // "MULTIPART_CRLF_LF_LINES" +- TOK_VARIABLE_MULTIPART_DATA_AFTER = 297, // "MULTIPART_DATA_AFTER" +- TOK_VARIABLE_MULTIPART_DATA_BEFORE = 298, // VARIABLE_MULTIPART_DATA_BEFORE +- TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 299, // "MULTIPART_FILE_LIMIT_EXCEEDED" +- TOK_VARIABLE_MULTIPART_HEADER_FOLDING = 300, // "MULTIPART_HEADER_FOLDING" +- TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 301, // "MULTIPART_INVALID_HEADER_FOLDING" +- TOK_VARIABLE_MULTIPART_INVALID_PART = 302, // VARIABLE_MULTIPART_INVALID_PART +- TOK_VARIABLE_MULTIPART_INVALID_QUOTING = 303, // "MULTIPART_INVALID_QUOTING" +- TOK_VARIABLE_MULTIPART_LF_LINE = 304, // VARIABLE_MULTIPART_LF_LINE +- TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON = 305, // VARIABLE_MULTIPART_MISSING_SEMICOLON +- TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING = 306, // VARIABLE_MULTIPART_SEMICOLON_MISSING +- TOK_VARIABLE_MULTIPART_STRICT_ERROR = 307, // "MULTIPART_STRICT_ERROR" +- TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 308, // "MULTIPART_UNMATCHED_BOUNDARY" +- TOK_VARIABLE_OUTBOUND_DATA_ERROR = 309, // "OUTBOUND_DATA_ERROR" +- TOK_VARIABLE_PATH_INFO = 310, // "PATH_INFO" +- TOK_VARIABLE_QUERY_STRING = 311, // "QUERY_STRING" +- TOK_VARIABLE_REMOTE_ADDR = 312, // "REMOTE_ADDR" +- TOK_VARIABLE_REMOTE_HOST = 313, // "REMOTE_HOST" +- TOK_VARIABLE_REMOTE_PORT = 314, // "REMOTE_PORT" +- TOK_VARIABLE_REQBODY_ERROR_MSG = 315, // "REQBODY_ERROR_MSG" +- TOK_VARIABLE_REQBODY_ERROR = 316, // "REQBODY_ERROR" +- TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 317, // "REQBODY_PROCESSOR_ERROR_MSG" +- TOK_VARIABLE_REQBODY_PROCESSOR_ERROR = 318, // "REQBODY_PROCESSOR_ERROR" +- TOK_VARIABLE_REQBODY_PROCESSOR = 319, // "REQBODY_PROCESSOR" +- TOK_VARIABLE_REQUEST_BASENAME = 320, // "REQUEST_BASENAME" +- TOK_VARIABLE_REQUEST_BODY_LENGTH = 321, // "REQUEST_BODY_LENGTH" +- TOK_VARIABLE_REQUEST_BODY = 322, // "REQUEST_BODY" +- TOK_VARIABLE_REQUEST_FILE_NAME = 323, // "REQUEST_FILENAME" +- TOK_VARIABLE_REQUEST_HEADERS_NAMES = 324, // VARIABLE_REQUEST_HEADERS_NAMES +- TOK_VARIABLE_REQUEST_LINE = 325, // "REQUEST_LINE" +- TOK_VARIABLE_REQUEST_METHOD = 326, // "REQUEST_METHOD" +- TOK_VARIABLE_REQUEST_PROTOCOL = 327, // "REQUEST_PROTOCOL" +- TOK_VARIABLE_REQUEST_URI_RAW = 328, // "REQUEST_URI_RAW" +- TOK_VARIABLE_REQUEST_URI = 329, // "REQUEST_URI" +- TOK_VARIABLE_RESOURCE = 330, // "RESOURCE" +- TOK_VARIABLE_RESPONSE_BODY = 331, // "RESPONSE_BODY" +- TOK_VARIABLE_RESPONSE_CONTENT_LENGTH = 332, // "RESPONSE_CONTENT_LENGTH" +- TOK_VARIABLE_RESPONSE_CONTENT_TYPE = 333, // VARIABLE_RESPONSE_CONTENT_TYPE +- TOK_VARIABLE_RESPONSE_HEADERS_NAMES = 334, // VARIABLE_RESPONSE_HEADERS_NAMES +- TOK_VARIABLE_RESPONSE_PROTOCOL = 335, // "RESPONSE_PROTOCOL" +- TOK_VARIABLE_RESPONSE_STATUS = 336, // "RESPONSE_STATUS" +- TOK_VARIABLE_SERVER_ADDR = 337, // "SERVER_ADDR" +- TOK_VARIABLE_SERVER_NAME = 338, // "SERVER_NAME" +- TOK_VARIABLE_SERVER_PORT = 339, // "SERVER_PORT" +- TOK_VARIABLE_SESSION_ID = 340, // "SESSIONID" +- TOK_VARIABLE_UNIQUE_ID = 341, // "UNIQUE_ID" +- TOK_VARIABLE_URL_ENCODED_ERROR = 342, // "URLENCODED_ERROR" +- TOK_VARIABLE_USER_ID = 343, // "USERID" +- TOK_VARIABLE_WEB_APP_ID = 344, // "WEBAPPID" +- TOK_VARIABLE_STATUS = 345, // "VARIABLE_STATUS" +- TOK_VARIABLE_STATUS_LINE = 346, // "VARIABLE_STATUS_LINE" +- TOK_VARIABLE_IP = 347, // "VARIABLE_IP" +- TOK_VARIABLE_GLOBAL = 348, // "VARIABLE_GLOBAL" +- TOK_VARIABLE_TX = 349, // "VARIABLE_TX" +- TOK_VARIABLE_SESSION = 350, // "VARIABLE_SESSION" +- TOK_VARIABLE_USER = 351, // "VARIABLE_USER" +- TOK_RUN_TIME_VAR_ENV = 352, // "RUN_TIME_VAR_ENV" +- TOK_RUN_TIME_VAR_XML = 353, // "RUN_TIME_VAR_XML" +- TOK_ACTION_SETVAR = 354, // "SetVar" +- TOK_SETVAR_OPERATION_EQUALS = 355, // SETVAR_OPERATION_EQUALS +- TOK_SETVAR_OPERATION_EQUALS_PLUS = 356, // SETVAR_OPERATION_EQUALS_PLUS +- TOK_SETVAR_OPERATION_EQUALS_MINUS = 357, // SETVAR_OPERATION_EQUALS_MINUS +- TOK_NOT = 358, // "NOT" +- TOK_OPERATOR_BEGINS_WITH = 359, // "OPERATOR_BEGINS_WITH" +- TOK_OPERATOR_CONTAINS = 360, // "OPERATOR_CONTAINS" +- TOK_OPERATOR_CONTAINS_WORD = 361, // "OPERATOR_CONTAINS_WORD" +- TOK_OPERATOR_DETECT_SQLI = 362, // "OPERATOR_DETECT_SQLI" +- TOK_OPERATOR_DETECT_XSS = 363, // "OPERATOR_DETECT_XSS" +- TOK_OPERATOR_ENDS_WITH = 364, // "OPERATOR_ENDS_WITH" +- TOK_OPERATOR_EQ = 365, // "OPERATOR_EQ" +- TOK_OPERATOR_FUZZY_HASH = 366, // "OPERATOR_FUZZY_HASH" +- TOK_OPERATOR_GEOLOOKUP = 367, // "OPERATOR_GEOLOOKUP" +- TOK_OPERATOR_GE = 368, // "OPERATOR_GE" +- TOK_OPERATOR_GSB_LOOKUP = 369, // "OPERATOR_GSB_LOOKUP" +- TOK_OPERATOR_GT = 370, // "OPERATOR_GT" +- TOK_OPERATOR_INSPECT_FILE = 371, // "OPERATOR_INSPECT_FILE" +- TOK_OPERATOR_IP_MATCH_FROM_FILE = 372, // "OPERATOR_IP_MATCH_FROM_FILE" +- TOK_OPERATOR_IP_MATCH = 373, // "OPERATOR_IP_MATCH" +- TOK_OPERATOR_LE = 374, // "OPERATOR_LE" +- TOK_OPERATOR_LT = 375, // "OPERATOR_LT" +- TOK_OPERATOR_PM_FROM_FILE = 376, // "OPERATOR_PM_FROM_FILE" +- TOK_OPERATOR_PM = 377, // "OPERATOR_PM" +- TOK_OPERATOR_RBL = 378, // "OPERATOR_RBL" +- TOK_OPERATOR_RSUB = 379, // "OPERATOR_RSUB" +- TOK_OPERATOR_RX_CONTENT_ONLY = 380, // "Operator RX (content only)" +- TOK_OPERATOR_RX = 381, // "OPERATOR_RX" +- TOK_OPERATOR_RX_GLOBAL = 382, // "OPERATOR_RX_GLOBAL" +- TOK_OPERATOR_STR_EQ = 383, // "OPERATOR_STR_EQ" +- TOK_OPERATOR_STR_MATCH = 384, // "OPERATOR_STR_MATCH" +- TOK_OPERATOR_UNCONDITIONAL_MATCH = 385, // "OPERATOR_UNCONDITIONAL_MATCH" +- TOK_OPERATOR_VALIDATE_BYTE_RANGE = 386, // "OPERATOR_VALIDATE_BYTE_RANGE" +- TOK_OPERATOR_VALIDATE_DTD = 387, // "OPERATOR_VALIDATE_DTD" +- TOK_OPERATOR_VALIDATE_HASH = 388, // "OPERATOR_VALIDATE_HASH" +- TOK_OPERATOR_VALIDATE_SCHEMA = 389, // "OPERATOR_VALIDATE_SCHEMA" +- TOK_OPERATOR_VALIDATE_URL_ENCODING = 390, // "OPERATOR_VALIDATE_URL_ENCODING" +- TOK_OPERATOR_VALIDATE_UTF8_ENCODING = 391, // "OPERATOR_VALIDATE_UTF8_ENCODING" +- TOK_OPERATOR_VERIFY_CC = 392, // "OPERATOR_VERIFY_CC" +- TOK_OPERATOR_VERIFY_CPF = 393, // "OPERATOR_VERIFY_CPF" +- TOK_OPERATOR_VERIFY_SSN = 394, // "OPERATOR_VERIFY_SSN" +- TOK_OPERATOR_VERIFY_SVNR = 395, // "OPERATOR_VERIFY_SVNR" +- TOK_OPERATOR_WITHIN = 396, // "OPERATOR_WITHIN" +- TOK_CONFIG_DIR_AUDIT_LOG_FMT = 397, // CONFIG_DIR_AUDIT_LOG_FMT +- TOK_JSON = 398, // JSON +- TOK_NATIVE = 399, // NATIVE +- TOK_ACTION_CTL_RULE_ENGINE = 400, // "ACTION_CTL_RULE_ENGINE" +- TOK_ACTION_ACCURACY = 401, // "Accuracy" +- TOK_ACTION_ALLOW = 402, // "Allow" +- TOK_ACTION_APPEND = 403, // "Append" +- TOK_ACTION_AUDIT_LOG = 404, // "AuditLog" +- TOK_ACTION_BLOCK = 405, // "Block" +- TOK_ACTION_CAPTURE = 406, // "Capture" +- TOK_ACTION_CHAIN = 407, // "Chain" +- TOK_ACTION_CTL_AUDIT_ENGINE = 408, // "ACTION_CTL_AUDIT_ENGINE" +- TOK_ACTION_CTL_AUDIT_LOG_PARTS = 409, // "ACTION_CTL_AUDIT_LOG_PARTS" +- TOK_ACTION_CTL_BDY_JSON = 410, // "ACTION_CTL_BDY_JSON" +- TOK_ACTION_CTL_BDY_XML = 411, // "ACTION_CTL_BDY_XML" +- TOK_ACTION_CTL_BDY_URLENCODED = 412, // "ACTION_CTL_BDY_URLENCODED" +- TOK_ACTION_CTL_FORCE_REQ_BODY_VAR = 413, // "ACTION_CTL_FORCE_REQ_BODY_VAR" +- TOK_ACTION_CTL_REQUEST_BODY_ACCESS = 414, // "ACTION_CTL_REQUEST_BODY_ACCESS" +- TOK_ACTION_CTL_RULE_REMOVE_BY_ID = 415, // "ACTION_CTL_RULE_REMOVE_BY_ID" +- TOK_ACTION_CTL_RULE_REMOVE_BY_TAG = 416, // "ACTION_CTL_RULE_REMOVE_BY_TAG" +- TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 417, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" +- TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 418, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" +- TOK_ACTION_DENY = 419, // "Deny" +- TOK_ACTION_DEPRECATE_VAR = 420, // "DeprecateVar" +- TOK_ACTION_DROP = 421, // "Drop" +- TOK_ACTION_EXEC = 422, // "Exec" +- TOK_ACTION_EXPIRE_VAR = 423, // "ExpireVar" +- TOK_ACTION_ID = 424, // "Id" +- TOK_ACTION_INITCOL = 425, // "InitCol" +- TOK_ACTION_LOG = 426, // "Log" +- TOK_ACTION_LOG_DATA = 427, // "LogData" +- TOK_ACTION_MATURITY = 428, // "Maturity" +- TOK_ACTION_MSG = 429, // "Msg" +- TOK_ACTION_MULTI_MATCH = 430, // "MultiMatch" +- TOK_ACTION_NO_AUDIT_LOG = 431, // "NoAuditLog" +- TOK_ACTION_NO_LOG = 432, // "NoLog" +- TOK_ACTION_PASS = 433, // "Pass" +- TOK_ACTION_PAUSE = 434, // "Pause" +- TOK_ACTION_PHASE = 435, // "Phase" +- TOK_ACTION_PREPEND = 436, // "Prepend" +- TOK_ACTION_PROXY = 437, // "Proxy" +- TOK_ACTION_REDIRECT = 438, // "Redirect" +- TOK_ACTION_REV = 439, // "Rev" +- TOK_ACTION_SANITISE_ARG = 440, // "SanitiseArg" +- TOK_ACTION_SANITISE_MATCHED = 441, // "SanitiseMatched" +- TOK_ACTION_SANITISE_MATCHED_BYTES = 442, // "SanitiseMatchedBytes" +- TOK_ACTION_SANITISE_REQUEST_HEADER = 443, // "SanitiseRequestHeader" +- TOK_ACTION_SANITISE_RESPONSE_HEADER = 444, // "SanitiseResponseHeader" +- TOK_ACTION_SETENV = 445, // "SetEnv" +- TOK_ACTION_SETRSC = 446, // "SetRsc" +- TOK_ACTION_SETSID = 447, // "SetSid" +- TOK_ACTION_SETUID = 448, // "SetUID" +- TOK_ACTION_SEVERITY = 449, // "Severity" +- TOK_ACTION_SKIP = 450, // "Skip" +- TOK_ACTION_SKIP_AFTER = 451, // "SkipAfter" +- TOK_ACTION_STATUS = 452, // "Status" +- TOK_ACTION_TAG = 453, // "Tag" +- TOK_ACTION_TRANSFORMATION_BASE_64_ENCODE = 454, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" +- TOK_ACTION_TRANSFORMATION_BASE_64_DECODE = 455, // "ACTION_TRANSFORMATION_BASE_64_DECODE" +- TOK_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 456, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" +- TOK_ACTION_TRANSFORMATION_CMD_LINE = 457, // "ACTION_TRANSFORMATION_CMD_LINE" +- TOK_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 458, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" +- TOK_ACTION_TRANSFORMATION_CSS_DECODE = 459, // "ACTION_TRANSFORMATION_CSS_DECODE" +- TOK_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 460, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" +- TOK_ACTION_TRANSFORMATION_HEX_ENCODE = 461, // "ACTION_TRANSFORMATION_HEX_ENCODE" +- TOK_ACTION_TRANSFORMATION_HEX_DECODE = 462, // "ACTION_TRANSFORMATION_HEX_DECODE" +- TOK_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 463, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" +- TOK_ACTION_TRANSFORMATION_JS_DECODE = 464, // "ACTION_TRANSFORMATION_JS_DECODE" +- TOK_ACTION_TRANSFORMATION_LENGTH = 465, // "ACTION_TRANSFORMATION_LENGTH" +- TOK_ACTION_TRANSFORMATION_LOWERCASE = 466, // "ACTION_TRANSFORMATION_LOWERCASE" +- TOK_ACTION_TRANSFORMATION_MD5 = 467, // "ACTION_TRANSFORMATION_MD5" +- TOK_ACTION_TRANSFORMATION_NONE = 468, // "ACTION_TRANSFORMATION_NONE" +- TOK_ACTION_TRANSFORMATION_NORMALISE_PATH = 469, // "ACTION_TRANSFORMATION_NORMALISE_PATH" +- TOK_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 470, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" +- TOK_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 471, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" +- TOK_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 472, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" +- TOK_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 473, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" +- TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 474, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" +- TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 475, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" +- TOK_ACTION_TRANSFORMATION_REMOVE_NULLS = 476, // "ACTION_TRANSFORMATION_REMOVE_NULLS" +- TOK_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 477, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" +- TOK_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 478, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" +- TOK_ACTION_TRANSFORMATION_REPLACE_NULLS = 479, // "ACTION_TRANSFORMATION_REPLACE_NULLS" +- TOK_ACTION_TRANSFORMATION_SHA1 = 480, // "ACTION_TRANSFORMATION_SHA1" +- TOK_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 481, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" +- TOK_ACTION_TRANSFORMATION_TRIM = 482, // "ACTION_TRANSFORMATION_TRIM" +- TOK_ACTION_TRANSFORMATION_TRIM_LEFT = 483, // "ACTION_TRANSFORMATION_TRIM_LEFT" +- TOK_ACTION_TRANSFORMATION_TRIM_RIGHT = 484, // "ACTION_TRANSFORMATION_TRIM_RIGHT" +- TOK_ACTION_TRANSFORMATION_UPPERCASE = 485, // "ACTION_TRANSFORMATION_UPPERCASE" +- TOK_ACTION_TRANSFORMATION_URL_ENCODE = 486, // "ACTION_TRANSFORMATION_URL_ENCODE" +- TOK_ACTION_TRANSFORMATION_URL_DECODE = 487, // "ACTION_TRANSFORMATION_URL_DECODE" +- TOK_ACTION_TRANSFORMATION_URL_DECODE_UNI = 488, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" +- TOK_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 489, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" +- TOK_ACTION_VER = 490, // "Ver" +- TOK_ACTION_XMLNS = 491, // "xmlns" +- TOK_CONFIG_COMPONENT_SIG = 492, // "CONFIG_COMPONENT_SIG" +- TOK_CONFIG_CONN_ENGINE = 493, // "CONFIG_CONN_ENGINE" +- TOK_CONFIG_SEC_ARGUMENT_SEPARATOR = 494, // "CONFIG_SEC_ARGUMENT_SEPARATOR" +- TOK_CONFIG_SEC_WEB_APP_ID = 495, // "CONFIG_SEC_WEB_APP_ID" +- TOK_CONFIG_SEC_SERVER_SIG = 496, // "CONFIG_SEC_SERVER_SIG" +- TOK_CONFIG_DIR_AUDIT_DIR = 497, // "CONFIG_DIR_AUDIT_DIR" +- TOK_CONFIG_DIR_AUDIT_DIR_MOD = 498, // "CONFIG_DIR_AUDIT_DIR_MOD" +- TOK_CONFIG_DIR_AUDIT_ENG = 499, // "CONFIG_DIR_AUDIT_ENG" +- TOK_CONFIG_DIR_AUDIT_FLE_MOD = 500, // "CONFIG_DIR_AUDIT_FLE_MOD" +- TOK_CONFIG_DIR_AUDIT_LOG = 501, // "CONFIG_DIR_AUDIT_LOG" +- TOK_CONFIG_DIR_AUDIT_LOG2 = 502, // "CONFIG_DIR_AUDIT_LOG2" +- TOK_CONFIG_DIR_AUDIT_LOG_P = 503, // "CONFIG_DIR_AUDIT_LOG_P" +- TOK_CONFIG_DIR_AUDIT_STS = 504, // "CONFIG_DIR_AUDIT_STS" +- TOK_CONFIG_DIR_AUDIT_TPE = 505, // "CONFIG_DIR_AUDIT_TPE" +- TOK_CONFIG_DIR_DEBUG_LOG = 506, // "CONFIG_DIR_DEBUG_LOG" +- TOK_CONFIG_DIR_DEBUG_LVL = 507, // "CONFIG_DIR_DEBUG_LVL" +- TOK_CONFIG_SEC_CACHE_TRANSFORMATIONS = 508, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" +- TOK_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 509, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" +- TOK_CONFIG_SEC_HASH_ENGINE = 510, // "CONFIG_SEC_HASH_ENGINE" +- TOK_CONFIG_SEC_HASH_KEY = 511, // "CONFIG_SEC_HASH_KEY" +- TOK_CONFIG_SEC_HASH_PARAM = 512, // "CONFIG_SEC_HASH_PARAM" +- TOK_CONFIG_SEC_HASH_METHOD_RX = 513, // "CONFIG_SEC_HASH_METHOD_RX" +- TOK_CONFIG_SEC_HASH_METHOD_PM = 514, // "CONFIG_SEC_HASH_METHOD_PM" +- TOK_CONFIG_SEC_CHROOT_DIR = 515, // "CONFIG_SEC_CHROOT_DIR" +- TOK_CONFIG_DIR_GEO_DB = 516, // "CONFIG_DIR_GEO_DB" +- TOK_CONFIG_DIR_GSB_DB = 517, // "CONFIG_DIR_GSB_DB" +- TOK_CONFIG_SEC_GUARDIAN_LOG = 518, // "CONFIG_SEC_GUARDIAN_LOG" +- TOK_CONFIG_DIR_PCRE_MATCH_LIMIT = 519, // "CONFIG_DIR_PCRE_MATCH_LIMIT" +- TOK_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 520, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" +- TOK_CONFIG_SEC_CONN_R_STATE_LIMIT = 521, // "CONFIG_SEC_CONN_R_STATE_LIMIT" +- TOK_CONFIG_SEC_CONN_W_STATE_LIMIT = 522, // "CONFIG_SEC_CONN_W_STATE_LIMIT" +- TOK_CONFIG_SEC_SENSOR_ID = 523, // "CONFIG_SEC_SENSOR_ID" +- TOK_CONFIG_DIR_ARGS_LIMIT = 524, // "CONFIG_DIR_ARGS_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 525, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY = 526, // "CONFIG_DIR_REQ_BODY" +- TOK_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 527, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY_LIMIT = 528, // "CONFIG_DIR_REQ_BODY_LIMIT" +- TOK_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 529, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" +- TOK_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 530, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" +- TOK_CONFIG_DIR_RES_BODY = 531, // "CONFIG_DIR_RES_BODY" +- TOK_CONFIG_DIR_RES_BODY_LIMIT = 532, // "CONFIG_DIR_RES_BODY_LIMIT" +- TOK_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 533, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" +- TOK_CONFIG_SEC_RULE_INHERITANCE = 534, // "CONFIG_SEC_RULE_INHERITANCE" +- TOK_CONFIG_SEC_RULE_PERF_TIME = 535, // "CONFIG_SEC_RULE_PERF_TIME" +- TOK_CONFIG_DIR_RULE_ENG = 536, // "CONFIG_DIR_RULE_ENG" +- TOK_CONFIG_DIR_SEC_ACTION = 537, // "CONFIG_DIR_SEC_ACTION" +- TOK_CONFIG_DIR_SEC_DEFAULT_ACTION = 538, // "CONFIG_DIR_SEC_DEFAULT_ACTION" +- TOK_CONFIG_DIR_SEC_MARKER = 539, // "CONFIG_DIR_SEC_MARKER" +- TOK_CONFIG_DIR_UNICODE_MAP_FILE = 540, // "CONFIG_DIR_UNICODE_MAP_FILE" +- TOK_CONFIG_DIR_UNICODE_CODE_PAGE = 541, // "CONFIG_DIR_UNICODE_CODE_PAGE" +- TOK_CONFIG_SEC_COLLECTION_TIMEOUT = 542, // "CONFIG_SEC_COLLECTION_TIMEOUT" +- TOK_CONFIG_SEC_HTTP_BLKEY = 543, // "CONFIG_SEC_HTTP_BLKEY" +- TOK_CONFIG_SEC_INTERCEPT_ON_ERROR = 544, // "CONFIG_SEC_INTERCEPT_ON_ERROR" +- TOK_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 545, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" +- TOK_CONFIG_SEC_RULE_REMOVE_BY_ID = 546, // "CONFIG_SEC_RULE_REMOVE_BY_ID" +- TOK_CONFIG_SEC_RULE_REMOVE_BY_MSG = 547, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" +- TOK_CONFIG_SEC_RULE_REMOVE_BY_TAG = 548, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" +- TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 549, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" +- TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 550, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" +- TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 551, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" +- TOK_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 552, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" +- TOK_CONFIG_UPDLOAD_KEEP_FILES = 553, // "CONFIG_UPDLOAD_KEEP_FILES" +- TOK_CONFIG_UPDLOAD_SAVE_TMP_FILES = 554, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" +- TOK_CONFIG_UPLOAD_DIR = 555, // "CONFIG_UPLOAD_DIR" +- TOK_CONFIG_UPLOAD_FILE_LIMIT = 556, // "CONFIG_UPLOAD_FILE_LIMIT" +- TOK_CONFIG_UPLOAD_FILE_MODE = 557, // "CONFIG_UPLOAD_FILE_MODE" +- TOK_CONFIG_VALUE_ABORT = 558, // "CONFIG_VALUE_ABORT" +- TOK_CONFIG_VALUE_DETC = 559, // "CONFIG_VALUE_DETC" +- TOK_CONFIG_VALUE_HTTPS = 560, // "CONFIG_VALUE_HTTPS" +- TOK_CONFIG_VALUE_OFF = 561, // "CONFIG_VALUE_OFF" +- TOK_CONFIG_VALUE_ON = 562, // "CONFIG_VALUE_ON" +- TOK_CONFIG_VALUE_PARALLEL = 563, // "CONFIG_VALUE_PARALLEL" +- TOK_CONFIG_VALUE_PROCESS_PARTIAL = 564, // "CONFIG_VALUE_PROCESS_PARTIAL" +- TOK_CONFIG_VALUE_REJECT = 565, // "CONFIG_VALUE_REJECT" +- TOK_CONFIG_VALUE_RELEVANT_ONLY = 566, // "CONFIG_VALUE_RELEVANT_ONLY" +- TOK_CONFIG_VALUE_SERIAL = 567, // "CONFIG_VALUE_SERIAL" +- TOK_CONFIG_VALUE_WARN = 568, // "CONFIG_VALUE_WARN" +- TOK_CONFIG_XML_EXTERNAL_ENTITY = 569, // "CONFIG_XML_EXTERNAL_ENTITY" +- TOK_CONGIG_DIR_RESPONSE_BODY_MP = 570, // "CONGIG_DIR_RESPONSE_BODY_MP" +- TOK_CONGIG_DIR_SEC_ARG_SEP = 571, // "CONGIG_DIR_SEC_ARG_SEP" +- TOK_CONGIG_DIR_SEC_COOKIE_FORMAT = 572, // "CONGIG_DIR_SEC_COOKIE_FORMAT" +- TOK_CONFIG_SEC_COOKIEV0_SEPARATOR = 573, // "CONFIG_SEC_COOKIEV0_SEPARATOR" +- TOK_CONGIG_DIR_SEC_DATA_DIR = 574, // "CONGIG_DIR_SEC_DATA_DIR" +- TOK_CONGIG_DIR_SEC_STATUS_ENGINE = 575, // "CONGIG_DIR_SEC_STATUS_ENGINE" +- TOK_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 576, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" +- TOK_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 577, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" +- TOK_CONGIG_DIR_SEC_TMP_DIR = 578, // "CONGIG_DIR_SEC_TMP_DIR" +- TOK_DIRECTIVE = 579, // "DIRECTIVE" +- TOK_DIRECTIVE_SECRULESCRIPT = 580, // "DIRECTIVE_SECRULESCRIPT" +- TOK_FREE_TEXT_QUOTE_MACRO_EXPANSION = 581, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" +- TOK_QUOTATION_MARK = 582, // "QUOTATION_MARK" +- TOK_RUN_TIME_VAR_BLD = 583, // "RUN_TIME_VAR_BLD" +- TOK_RUN_TIME_VAR_DUR = 584, // "RUN_TIME_VAR_DUR" +- TOK_RUN_TIME_VAR_HSV = 585, // "RUN_TIME_VAR_HSV" +- TOK_RUN_TIME_VAR_REMOTE_USER = 586, // "RUN_TIME_VAR_REMOTE_USER" +- TOK_RUN_TIME_VAR_TIME = 587, // "RUN_TIME_VAR_TIME" +- TOK_RUN_TIME_VAR_TIME_DAY = 588, // "RUN_TIME_VAR_TIME_DAY" +- TOK_RUN_TIME_VAR_TIME_EPOCH = 589, // "RUN_TIME_VAR_TIME_EPOCH" +- TOK_RUN_TIME_VAR_TIME_HOUR = 590, // "RUN_TIME_VAR_TIME_HOUR" +- TOK_RUN_TIME_VAR_TIME_MIN = 591, // "RUN_TIME_VAR_TIME_MIN" +- TOK_RUN_TIME_VAR_TIME_MON = 592, // "RUN_TIME_VAR_TIME_MON" +- TOK_RUN_TIME_VAR_TIME_SEC = 593, // "RUN_TIME_VAR_TIME_SEC" +- TOK_RUN_TIME_VAR_TIME_WDAY = 594, // "RUN_TIME_VAR_TIME_WDAY" +- TOK_RUN_TIME_VAR_TIME_YEAR = 595, // "RUN_TIME_VAR_TIME_YEAR" +- TOK_VARIABLE = 596, // "VARIABLE" +- TOK_DICT_ELEMENT = 597, // "Dictionary element" +- TOK_DICT_ELEMENT_REGEXP = 598 // "Dictionary element, selected by regexp" ++ TOK_VARIABLE_MULTIPART_PART_HEADERS = 281, // VARIABLE_MULTIPART_PART_HEADERS ++ TOK_VARIABLE_ARGS_COMBINED_SIZE = 282, // VARIABLE_ARGS_COMBINED_SIZE ++ TOK_VARIABLE_ARGS_GET_NAMES = 283, // VARIABLE_ARGS_GET_NAMES ++ TOK_VARIABLE_RULE = 284, // VARIABLE_RULE ++ TOK_VARIABLE_ARGS_NAMES = 285, // "Variable ARGS_NAMES" ++ TOK_VARIABLE_ARGS_POST_NAMES = 286, // VARIABLE_ARGS_POST_NAMES ++ TOK_VARIABLE_AUTH_TYPE = 287, // "AUTH_TYPE" ++ TOK_VARIABLE_FILES_COMBINED_SIZE = 288, // "FILES_COMBINED_SIZE" ++ TOK_VARIABLE_FILES_TMP_NAMES = 289, // "FILES_TMPNAMES" ++ TOK_VARIABLE_FULL_REQUEST = 290, // "FULL_REQUEST" ++ TOK_VARIABLE_FULL_REQUEST_LENGTH = 291, // "FULL_REQUEST_LENGTH" ++ TOK_VARIABLE_INBOUND_DATA_ERROR = 292, // "INBOUND_DATA_ERROR" ++ TOK_VARIABLE_MATCHED_VAR = 293, // "MATCHED_VAR" ++ TOK_VARIABLE_MATCHED_VAR_NAME = 294, // "MATCHED_VAR_NAME" ++ TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 295, // VARIABLE_MULTIPART_BOUNDARY_QUOTED ++ TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 296, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE ++ TOK_VARIABLE_MULTIPART_CRLF_LF_LINES = 297, // "MULTIPART_CRLF_LF_LINES" ++ TOK_VARIABLE_MULTIPART_DATA_AFTER = 298, // "MULTIPART_DATA_AFTER" ++ TOK_VARIABLE_MULTIPART_DATA_BEFORE = 299, // VARIABLE_MULTIPART_DATA_BEFORE ++ TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 300, // "MULTIPART_FILE_LIMIT_EXCEEDED" ++ TOK_VARIABLE_MULTIPART_HEADER_FOLDING = 301, // "MULTIPART_HEADER_FOLDING" ++ TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 302, // "MULTIPART_INVALID_HEADER_FOLDING" ++ TOK_VARIABLE_MULTIPART_INVALID_PART = 303, // VARIABLE_MULTIPART_INVALID_PART ++ TOK_VARIABLE_MULTIPART_INVALID_QUOTING = 304, // "MULTIPART_INVALID_QUOTING" ++ TOK_VARIABLE_MULTIPART_LF_LINE = 305, // VARIABLE_MULTIPART_LF_LINE ++ TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON = 306, // VARIABLE_MULTIPART_MISSING_SEMICOLON ++ TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING = 307, // VARIABLE_MULTIPART_SEMICOLON_MISSING ++ TOK_VARIABLE_MULTIPART_STRICT_ERROR = 308, // "MULTIPART_STRICT_ERROR" ++ TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 309, // "MULTIPART_UNMATCHED_BOUNDARY" ++ TOK_VARIABLE_OUTBOUND_DATA_ERROR = 310, // "OUTBOUND_DATA_ERROR" ++ TOK_VARIABLE_PATH_INFO = 311, // "PATH_INFO" ++ TOK_VARIABLE_QUERY_STRING = 312, // "QUERY_STRING" ++ TOK_VARIABLE_REMOTE_ADDR = 313, // "REMOTE_ADDR" ++ TOK_VARIABLE_REMOTE_HOST = 314, // "REMOTE_HOST" ++ TOK_VARIABLE_REMOTE_PORT = 315, // "REMOTE_PORT" ++ TOK_VARIABLE_REQBODY_ERROR_MSG = 316, // "REQBODY_ERROR_MSG" ++ TOK_VARIABLE_REQBODY_ERROR = 317, // "REQBODY_ERROR" ++ TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 318, // "REQBODY_PROCESSOR_ERROR_MSG" ++ TOK_VARIABLE_REQBODY_PROCESSOR_ERROR = 319, // "REQBODY_PROCESSOR_ERROR" ++ TOK_VARIABLE_REQBODY_PROCESSOR = 320, // "REQBODY_PROCESSOR" ++ TOK_VARIABLE_REQUEST_BASENAME = 321, // "REQUEST_BASENAME" ++ TOK_VARIABLE_REQUEST_BODY_LENGTH = 322, // "REQUEST_BODY_LENGTH" ++ TOK_VARIABLE_REQUEST_BODY = 323, // "REQUEST_BODY" ++ TOK_VARIABLE_REQUEST_FILE_NAME = 324, // "REQUEST_FILENAME" ++ TOK_VARIABLE_REQUEST_HEADERS_NAMES = 325, // VARIABLE_REQUEST_HEADERS_NAMES ++ TOK_VARIABLE_REQUEST_LINE = 326, // "REQUEST_LINE" ++ TOK_VARIABLE_REQUEST_METHOD = 327, // "REQUEST_METHOD" ++ TOK_VARIABLE_REQUEST_PROTOCOL = 328, // "REQUEST_PROTOCOL" ++ TOK_VARIABLE_REQUEST_URI_RAW = 329, // "REQUEST_URI_RAW" ++ TOK_VARIABLE_REQUEST_URI = 330, // "REQUEST_URI" ++ TOK_VARIABLE_RESOURCE = 331, // "RESOURCE" ++ TOK_VARIABLE_RESPONSE_BODY = 332, // "RESPONSE_BODY" ++ TOK_VARIABLE_RESPONSE_CONTENT_LENGTH = 333, // "RESPONSE_CONTENT_LENGTH" ++ TOK_VARIABLE_RESPONSE_CONTENT_TYPE = 334, // VARIABLE_RESPONSE_CONTENT_TYPE ++ TOK_VARIABLE_RESPONSE_HEADERS_NAMES = 335, // VARIABLE_RESPONSE_HEADERS_NAMES ++ TOK_VARIABLE_RESPONSE_PROTOCOL = 336, // "RESPONSE_PROTOCOL" ++ TOK_VARIABLE_RESPONSE_STATUS = 337, // "RESPONSE_STATUS" ++ TOK_VARIABLE_SERVER_ADDR = 338, // "SERVER_ADDR" ++ TOK_VARIABLE_SERVER_NAME = 339, // "SERVER_NAME" ++ TOK_VARIABLE_SERVER_PORT = 340, // "SERVER_PORT" ++ TOK_VARIABLE_SESSION_ID = 341, // "SESSIONID" ++ TOK_VARIABLE_UNIQUE_ID = 342, // "UNIQUE_ID" ++ TOK_VARIABLE_URL_ENCODED_ERROR = 343, // "URLENCODED_ERROR" ++ TOK_VARIABLE_USER_ID = 344, // "USERID" ++ TOK_VARIABLE_WEB_APP_ID = 345, // "WEBAPPID" ++ TOK_VARIABLE_STATUS = 346, // "VARIABLE_STATUS" ++ TOK_VARIABLE_STATUS_LINE = 347, // "VARIABLE_STATUS_LINE" ++ TOK_VARIABLE_IP = 348, // "VARIABLE_IP" ++ TOK_VARIABLE_GLOBAL = 349, // "VARIABLE_GLOBAL" ++ TOK_VARIABLE_TX = 350, // "VARIABLE_TX" ++ TOK_VARIABLE_SESSION = 351, // "VARIABLE_SESSION" ++ TOK_VARIABLE_USER = 352, // "VARIABLE_USER" ++ TOK_RUN_TIME_VAR_ENV = 353, // "RUN_TIME_VAR_ENV" ++ TOK_RUN_TIME_VAR_XML = 354, // "RUN_TIME_VAR_XML" ++ TOK_ACTION_SETVAR = 355, // "SetVar" ++ TOK_SETVAR_OPERATION_EQUALS = 356, // SETVAR_OPERATION_EQUALS ++ TOK_SETVAR_OPERATION_EQUALS_PLUS = 357, // SETVAR_OPERATION_EQUALS_PLUS ++ TOK_SETVAR_OPERATION_EQUALS_MINUS = 358, // SETVAR_OPERATION_EQUALS_MINUS ++ TOK_NOT = 359, // "NOT" ++ TOK_OPERATOR_BEGINS_WITH = 360, // "OPERATOR_BEGINS_WITH" ++ TOK_OPERATOR_CONTAINS = 361, // "OPERATOR_CONTAINS" ++ TOK_OPERATOR_CONTAINS_WORD = 362, // "OPERATOR_CONTAINS_WORD" ++ TOK_OPERATOR_DETECT_SQLI = 363, // "OPERATOR_DETECT_SQLI" ++ TOK_OPERATOR_DETECT_XSS = 364, // "OPERATOR_DETECT_XSS" ++ TOK_OPERATOR_ENDS_WITH = 365, // "OPERATOR_ENDS_WITH" ++ TOK_OPERATOR_EQ = 366, // "OPERATOR_EQ" ++ TOK_OPERATOR_FUZZY_HASH = 367, // "OPERATOR_FUZZY_HASH" ++ TOK_OPERATOR_GEOLOOKUP = 368, // "OPERATOR_GEOLOOKUP" ++ TOK_OPERATOR_GE = 369, // "OPERATOR_GE" ++ TOK_OPERATOR_GSB_LOOKUP = 370, // "OPERATOR_GSB_LOOKUP" ++ TOK_OPERATOR_GT = 371, // "OPERATOR_GT" ++ TOK_OPERATOR_INSPECT_FILE = 372, // "OPERATOR_INSPECT_FILE" ++ TOK_OPERATOR_IP_MATCH_FROM_FILE = 373, // "OPERATOR_IP_MATCH_FROM_FILE" ++ TOK_OPERATOR_IP_MATCH = 374, // "OPERATOR_IP_MATCH" ++ TOK_OPERATOR_LE = 375, // "OPERATOR_LE" ++ TOK_OPERATOR_LT = 376, // "OPERATOR_LT" ++ TOK_OPERATOR_PM_FROM_FILE = 377, // "OPERATOR_PM_FROM_FILE" ++ TOK_OPERATOR_PM = 378, // "OPERATOR_PM" ++ TOK_OPERATOR_RBL = 379, // "OPERATOR_RBL" ++ TOK_OPERATOR_RSUB = 380, // "OPERATOR_RSUB" ++ TOK_OPERATOR_RX_CONTENT_ONLY = 381, // "Operator RX (content only)" ++ TOK_OPERATOR_RX = 382, // "OPERATOR_RX" ++ TOK_OPERATOR_RX_GLOBAL = 383, // "OPERATOR_RX_GLOBAL" ++ TOK_OPERATOR_STR_EQ = 384, // "OPERATOR_STR_EQ" ++ TOK_OPERATOR_STR_MATCH = 385, // "OPERATOR_STR_MATCH" ++ TOK_OPERATOR_UNCONDITIONAL_MATCH = 386, // "OPERATOR_UNCONDITIONAL_MATCH" ++ TOK_OPERATOR_VALIDATE_BYTE_RANGE = 387, // "OPERATOR_VALIDATE_BYTE_RANGE" ++ TOK_OPERATOR_VALIDATE_DTD = 388, // "OPERATOR_VALIDATE_DTD" ++ TOK_OPERATOR_VALIDATE_HASH = 389, // "OPERATOR_VALIDATE_HASH" ++ TOK_OPERATOR_VALIDATE_SCHEMA = 390, // "OPERATOR_VALIDATE_SCHEMA" ++ TOK_OPERATOR_VALIDATE_URL_ENCODING = 391, // "OPERATOR_VALIDATE_URL_ENCODING" ++ TOK_OPERATOR_VALIDATE_UTF8_ENCODING = 392, // "OPERATOR_VALIDATE_UTF8_ENCODING" ++ TOK_OPERATOR_VERIFY_CC = 393, // "OPERATOR_VERIFY_CC" ++ TOK_OPERATOR_VERIFY_CPF = 394, // "OPERATOR_VERIFY_CPF" ++ TOK_OPERATOR_VERIFY_SSN = 395, // "OPERATOR_VERIFY_SSN" ++ TOK_OPERATOR_VERIFY_SVNR = 396, // "OPERATOR_VERIFY_SVNR" ++ TOK_OPERATOR_WITHIN = 397, // "OPERATOR_WITHIN" ++ TOK_CONFIG_DIR_AUDIT_LOG_FMT = 398, // CONFIG_DIR_AUDIT_LOG_FMT ++ TOK_JSON = 399, // JSON ++ TOK_NATIVE = 400, // NATIVE ++ TOK_ACTION_CTL_RULE_ENGINE = 401, // "ACTION_CTL_RULE_ENGINE" ++ TOK_ACTION_ACCURACY = 402, // "Accuracy" ++ TOK_ACTION_ALLOW = 403, // "Allow" ++ TOK_ACTION_APPEND = 404, // "Append" ++ TOK_ACTION_AUDIT_LOG = 405, // "AuditLog" ++ TOK_ACTION_BLOCK = 406, // "Block" ++ TOK_ACTION_CAPTURE = 407, // "Capture" ++ TOK_ACTION_CHAIN = 408, // "Chain" ++ TOK_ACTION_CTL_AUDIT_ENGINE = 409, // "ACTION_CTL_AUDIT_ENGINE" ++ TOK_ACTION_CTL_AUDIT_LOG_PARTS = 410, // "ACTION_CTL_AUDIT_LOG_PARTS" ++ TOK_ACTION_CTL_BDY_JSON = 411, // "ACTION_CTL_BDY_JSON" ++ TOK_ACTION_CTL_BDY_XML = 412, // "ACTION_CTL_BDY_XML" ++ TOK_ACTION_CTL_BDY_URLENCODED = 413, // "ACTION_CTL_BDY_URLENCODED" ++ TOK_ACTION_CTL_FORCE_REQ_BODY_VAR = 414, // "ACTION_CTL_FORCE_REQ_BODY_VAR" ++ TOK_ACTION_CTL_REQUEST_BODY_ACCESS = 415, // "ACTION_CTL_REQUEST_BODY_ACCESS" ++ TOK_ACTION_CTL_RULE_REMOVE_BY_ID = 416, // "ACTION_CTL_RULE_REMOVE_BY_ID" ++ TOK_ACTION_CTL_RULE_REMOVE_BY_TAG = 417, // "ACTION_CTL_RULE_REMOVE_BY_TAG" ++ TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 418, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" ++ TOK_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 419, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" ++ TOK_ACTION_DENY = 420, // "Deny" ++ TOK_ACTION_DEPRECATE_VAR = 421, // "DeprecateVar" ++ TOK_ACTION_DROP = 422, // "Drop" ++ TOK_ACTION_EXEC = 423, // "Exec" ++ TOK_ACTION_EXPIRE_VAR = 424, // "ExpireVar" ++ TOK_ACTION_ID = 425, // "Id" ++ TOK_ACTION_INITCOL = 426, // "InitCol" ++ TOK_ACTION_LOG = 427, // "Log" ++ TOK_ACTION_LOG_DATA = 428, // "LogData" ++ TOK_ACTION_MATURITY = 429, // "Maturity" ++ TOK_ACTION_MSG = 430, // "Msg" ++ TOK_ACTION_MULTI_MATCH = 431, // "MultiMatch" ++ TOK_ACTION_NO_AUDIT_LOG = 432, // "NoAuditLog" ++ TOK_ACTION_NO_LOG = 433, // "NoLog" ++ TOK_ACTION_PASS = 434, // "Pass" ++ TOK_ACTION_PAUSE = 435, // "Pause" ++ TOK_ACTION_PHASE = 436, // "Phase" ++ TOK_ACTION_PREPEND = 437, // "Prepend" ++ TOK_ACTION_PROXY = 438, // "Proxy" ++ TOK_ACTION_REDIRECT = 439, // "Redirect" ++ TOK_ACTION_REV = 440, // "Rev" ++ TOK_ACTION_SANITISE_ARG = 441, // "SanitiseArg" ++ TOK_ACTION_SANITISE_MATCHED = 442, // "SanitiseMatched" ++ TOK_ACTION_SANITISE_MATCHED_BYTES = 443, // "SanitiseMatchedBytes" ++ TOK_ACTION_SANITISE_REQUEST_HEADER = 444, // "SanitiseRequestHeader" ++ TOK_ACTION_SANITISE_RESPONSE_HEADER = 445, // "SanitiseResponseHeader" ++ TOK_ACTION_SETENV = 446, // "SetEnv" ++ TOK_ACTION_SETRSC = 447, // "SetRsc" ++ TOK_ACTION_SETSID = 448, // "SetSid" ++ TOK_ACTION_SETUID = 449, // "SetUID" ++ TOK_ACTION_SEVERITY = 450, // "Severity" ++ TOK_ACTION_SKIP = 451, // "Skip" ++ TOK_ACTION_SKIP_AFTER = 452, // "SkipAfter" ++ TOK_ACTION_STATUS = 453, // "Status" ++ TOK_ACTION_TAG = 454, // "Tag" ++ TOK_ACTION_TRANSFORMATION_BASE_64_ENCODE = 455, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" ++ TOK_ACTION_TRANSFORMATION_BASE_64_DECODE = 456, // "ACTION_TRANSFORMATION_BASE_64_DECODE" ++ TOK_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 457, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" ++ TOK_ACTION_TRANSFORMATION_CMD_LINE = 458, // "ACTION_TRANSFORMATION_CMD_LINE" ++ TOK_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 459, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" ++ TOK_ACTION_TRANSFORMATION_CSS_DECODE = 460, // "ACTION_TRANSFORMATION_CSS_DECODE" ++ TOK_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 461, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" ++ TOK_ACTION_TRANSFORMATION_HEX_ENCODE = 462, // "ACTION_TRANSFORMATION_HEX_ENCODE" ++ TOK_ACTION_TRANSFORMATION_HEX_DECODE = 463, // "ACTION_TRANSFORMATION_HEX_DECODE" ++ TOK_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 464, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" ++ TOK_ACTION_TRANSFORMATION_JS_DECODE = 465, // "ACTION_TRANSFORMATION_JS_DECODE" ++ TOK_ACTION_TRANSFORMATION_LENGTH = 466, // "ACTION_TRANSFORMATION_LENGTH" ++ TOK_ACTION_TRANSFORMATION_LOWERCASE = 467, // "ACTION_TRANSFORMATION_LOWERCASE" ++ TOK_ACTION_TRANSFORMATION_MD5 = 468, // "ACTION_TRANSFORMATION_MD5" ++ TOK_ACTION_TRANSFORMATION_NONE = 469, // "ACTION_TRANSFORMATION_NONE" ++ TOK_ACTION_TRANSFORMATION_NORMALISE_PATH = 470, // "ACTION_TRANSFORMATION_NORMALISE_PATH" ++ TOK_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 471, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" ++ TOK_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 472, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" ++ TOK_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 473, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" ++ TOK_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 474, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" ++ TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 475, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" ++ TOK_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 476, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" ++ TOK_ACTION_TRANSFORMATION_REMOVE_NULLS = 477, // "ACTION_TRANSFORMATION_REMOVE_NULLS" ++ TOK_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 478, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" ++ TOK_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 479, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" ++ TOK_ACTION_TRANSFORMATION_REPLACE_NULLS = 480, // "ACTION_TRANSFORMATION_REPLACE_NULLS" ++ TOK_ACTION_TRANSFORMATION_SHA1 = 481, // "ACTION_TRANSFORMATION_SHA1" ++ TOK_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 482, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" ++ TOK_ACTION_TRANSFORMATION_TRIM = 483, // "ACTION_TRANSFORMATION_TRIM" ++ TOK_ACTION_TRANSFORMATION_TRIM_LEFT = 484, // "ACTION_TRANSFORMATION_TRIM_LEFT" ++ TOK_ACTION_TRANSFORMATION_TRIM_RIGHT = 485, // "ACTION_TRANSFORMATION_TRIM_RIGHT" ++ TOK_ACTION_TRANSFORMATION_UPPERCASE = 486, // "ACTION_TRANSFORMATION_UPPERCASE" ++ TOK_ACTION_TRANSFORMATION_URL_ENCODE = 487, // "ACTION_TRANSFORMATION_URL_ENCODE" ++ TOK_ACTION_TRANSFORMATION_URL_DECODE = 488, // "ACTION_TRANSFORMATION_URL_DECODE" ++ TOK_ACTION_TRANSFORMATION_URL_DECODE_UNI = 489, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" ++ TOK_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 490, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" ++ TOK_ACTION_VER = 491, // "Ver" ++ TOK_ACTION_XMLNS = 492, // "xmlns" ++ TOK_CONFIG_COMPONENT_SIG = 493, // "CONFIG_COMPONENT_SIG" ++ TOK_CONFIG_CONN_ENGINE = 494, // "CONFIG_CONN_ENGINE" ++ TOK_CONFIG_SEC_ARGUMENT_SEPARATOR = 495, // "CONFIG_SEC_ARGUMENT_SEPARATOR" ++ TOK_CONFIG_SEC_WEB_APP_ID = 496, // "CONFIG_SEC_WEB_APP_ID" ++ TOK_CONFIG_SEC_SERVER_SIG = 497, // "CONFIG_SEC_SERVER_SIG" ++ TOK_CONFIG_DIR_AUDIT_DIR = 498, // "CONFIG_DIR_AUDIT_DIR" ++ TOK_CONFIG_DIR_AUDIT_DIR_MOD = 499, // "CONFIG_DIR_AUDIT_DIR_MOD" ++ TOK_CONFIG_DIR_AUDIT_ENG = 500, // "CONFIG_DIR_AUDIT_ENG" ++ TOK_CONFIG_DIR_AUDIT_FLE_MOD = 501, // "CONFIG_DIR_AUDIT_FLE_MOD" ++ TOK_CONFIG_DIR_AUDIT_LOG = 502, // "CONFIG_DIR_AUDIT_LOG" ++ TOK_CONFIG_DIR_AUDIT_LOG2 = 503, // "CONFIG_DIR_AUDIT_LOG2" ++ TOK_CONFIG_DIR_AUDIT_LOG_P = 504, // "CONFIG_DIR_AUDIT_LOG_P" ++ TOK_CONFIG_DIR_AUDIT_STS = 505, // "CONFIG_DIR_AUDIT_STS" ++ TOK_CONFIG_DIR_AUDIT_TPE = 506, // "CONFIG_DIR_AUDIT_TPE" ++ TOK_CONFIG_DIR_DEBUG_LOG = 507, // "CONFIG_DIR_DEBUG_LOG" ++ TOK_CONFIG_DIR_DEBUG_LVL = 508, // "CONFIG_DIR_DEBUG_LVL" ++ TOK_CONFIG_SEC_CACHE_TRANSFORMATIONS = 509, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" ++ TOK_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 510, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" ++ TOK_CONFIG_SEC_HASH_ENGINE = 511, // "CONFIG_SEC_HASH_ENGINE" ++ TOK_CONFIG_SEC_HASH_KEY = 512, // "CONFIG_SEC_HASH_KEY" ++ TOK_CONFIG_SEC_HASH_PARAM = 513, // "CONFIG_SEC_HASH_PARAM" ++ TOK_CONFIG_SEC_HASH_METHOD_RX = 514, // "CONFIG_SEC_HASH_METHOD_RX" ++ TOK_CONFIG_SEC_HASH_METHOD_PM = 515, // "CONFIG_SEC_HASH_METHOD_PM" ++ TOK_CONFIG_SEC_CHROOT_DIR = 516, // "CONFIG_SEC_CHROOT_DIR" ++ TOK_CONFIG_DIR_GEO_DB = 517, // "CONFIG_DIR_GEO_DB" ++ TOK_CONFIG_DIR_GSB_DB = 518, // "CONFIG_DIR_GSB_DB" ++ TOK_CONFIG_SEC_GUARDIAN_LOG = 519, // "CONFIG_SEC_GUARDIAN_LOG" ++ TOK_CONFIG_DIR_PCRE_MATCH_LIMIT = 520, // "CONFIG_DIR_PCRE_MATCH_LIMIT" ++ TOK_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 521, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" ++ TOK_CONFIG_SEC_CONN_R_STATE_LIMIT = 522, // "CONFIG_SEC_CONN_R_STATE_LIMIT" ++ TOK_CONFIG_SEC_CONN_W_STATE_LIMIT = 523, // "CONFIG_SEC_CONN_W_STATE_LIMIT" ++ TOK_CONFIG_SEC_SENSOR_ID = 524, // "CONFIG_SEC_SENSOR_ID" ++ TOK_CONFIG_DIR_ARGS_LIMIT = 525, // "CONFIG_DIR_ARGS_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 526, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY = 527, // "CONFIG_DIR_REQ_BODY" ++ TOK_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 528, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY_LIMIT = 529, // "CONFIG_DIR_REQ_BODY_LIMIT" ++ TOK_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 530, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" ++ TOK_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 531, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" ++ TOK_CONFIG_DIR_RES_BODY = 532, // "CONFIG_DIR_RES_BODY" ++ TOK_CONFIG_DIR_RES_BODY_LIMIT = 533, // "CONFIG_DIR_RES_BODY_LIMIT" ++ TOK_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 534, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" ++ TOK_CONFIG_SEC_RULE_INHERITANCE = 535, // "CONFIG_SEC_RULE_INHERITANCE" ++ TOK_CONFIG_SEC_RULE_PERF_TIME = 536, // "CONFIG_SEC_RULE_PERF_TIME" ++ TOK_CONFIG_DIR_RULE_ENG = 537, // "CONFIG_DIR_RULE_ENG" ++ TOK_CONFIG_DIR_SEC_ACTION = 538, // "CONFIG_DIR_SEC_ACTION" ++ TOK_CONFIG_DIR_SEC_DEFAULT_ACTION = 539, // "CONFIG_DIR_SEC_DEFAULT_ACTION" ++ TOK_CONFIG_DIR_SEC_MARKER = 540, // "CONFIG_DIR_SEC_MARKER" ++ TOK_CONFIG_DIR_UNICODE_MAP_FILE = 541, // "CONFIG_DIR_UNICODE_MAP_FILE" ++ TOK_CONFIG_DIR_UNICODE_CODE_PAGE = 542, // "CONFIG_DIR_UNICODE_CODE_PAGE" ++ TOK_CONFIG_SEC_COLLECTION_TIMEOUT = 543, // "CONFIG_SEC_COLLECTION_TIMEOUT" ++ TOK_CONFIG_SEC_HTTP_BLKEY = 544, // "CONFIG_SEC_HTTP_BLKEY" ++ TOK_CONFIG_SEC_INTERCEPT_ON_ERROR = 545, // "CONFIG_SEC_INTERCEPT_ON_ERROR" ++ TOK_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 546, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" ++ TOK_CONFIG_SEC_RULE_REMOVE_BY_ID = 547, // "CONFIG_SEC_RULE_REMOVE_BY_ID" ++ TOK_CONFIG_SEC_RULE_REMOVE_BY_MSG = 548, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" ++ TOK_CONFIG_SEC_RULE_REMOVE_BY_TAG = 549, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" ++ TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 550, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" ++ TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 551, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" ++ TOK_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 552, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" ++ TOK_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 553, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" ++ TOK_CONFIG_UPDLOAD_KEEP_FILES = 554, // "CONFIG_UPDLOAD_KEEP_FILES" ++ TOK_CONFIG_UPDLOAD_SAVE_TMP_FILES = 555, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" ++ TOK_CONFIG_UPLOAD_DIR = 556, // "CONFIG_UPLOAD_DIR" ++ TOK_CONFIG_UPLOAD_FILE_LIMIT = 557, // "CONFIG_UPLOAD_FILE_LIMIT" ++ TOK_CONFIG_UPLOAD_FILE_MODE = 558, // "CONFIG_UPLOAD_FILE_MODE" ++ TOK_CONFIG_VALUE_ABORT = 559, // "CONFIG_VALUE_ABORT" ++ TOK_CONFIG_VALUE_DETC = 560, // "CONFIG_VALUE_DETC" ++ TOK_CONFIG_VALUE_HTTPS = 561, // "CONFIG_VALUE_HTTPS" ++ TOK_CONFIG_VALUE_OFF = 562, // "CONFIG_VALUE_OFF" ++ TOK_CONFIG_VALUE_ON = 563, // "CONFIG_VALUE_ON" ++ TOK_CONFIG_VALUE_PARALLEL = 564, // "CONFIG_VALUE_PARALLEL" ++ TOK_CONFIG_VALUE_PROCESS_PARTIAL = 565, // "CONFIG_VALUE_PROCESS_PARTIAL" ++ TOK_CONFIG_VALUE_REJECT = 566, // "CONFIG_VALUE_REJECT" ++ TOK_CONFIG_VALUE_RELEVANT_ONLY = 567, // "CONFIG_VALUE_RELEVANT_ONLY" ++ TOK_CONFIG_VALUE_SERIAL = 568, // "CONFIG_VALUE_SERIAL" ++ TOK_CONFIG_VALUE_WARN = 569, // "CONFIG_VALUE_WARN" ++ TOK_CONFIG_XML_EXTERNAL_ENTITY = 570, // "CONFIG_XML_EXTERNAL_ENTITY" ++ TOK_CONGIG_DIR_RESPONSE_BODY_MP = 571, // "CONGIG_DIR_RESPONSE_BODY_MP" ++ TOK_CONGIG_DIR_SEC_ARG_SEP = 572, // "CONGIG_DIR_SEC_ARG_SEP" ++ TOK_CONGIG_DIR_SEC_COOKIE_FORMAT = 573, // "CONGIG_DIR_SEC_COOKIE_FORMAT" ++ TOK_CONFIG_SEC_COOKIEV0_SEPARATOR = 574, // "CONFIG_SEC_COOKIEV0_SEPARATOR" ++ TOK_CONGIG_DIR_SEC_DATA_DIR = 575, // "CONGIG_DIR_SEC_DATA_DIR" ++ TOK_CONGIG_DIR_SEC_STATUS_ENGINE = 576, // "CONGIG_DIR_SEC_STATUS_ENGINE" ++ TOK_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 577, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" ++ TOK_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 578, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" ++ TOK_CONGIG_DIR_SEC_TMP_DIR = 579, // "CONGIG_DIR_SEC_TMP_DIR" ++ TOK_DIRECTIVE = 580, // "DIRECTIVE" ++ TOK_DIRECTIVE_SECRULESCRIPT = 581, // "DIRECTIVE_SECRULESCRIPT" ++ TOK_FREE_TEXT_QUOTE_MACRO_EXPANSION = 582, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++ TOK_QUOTATION_MARK = 583, // "QUOTATION_MARK" ++ TOK_RUN_TIME_VAR_BLD = 584, // "RUN_TIME_VAR_BLD" ++ TOK_RUN_TIME_VAR_DUR = 585, // "RUN_TIME_VAR_DUR" ++ TOK_RUN_TIME_VAR_HSV = 586, // "RUN_TIME_VAR_HSV" ++ TOK_RUN_TIME_VAR_REMOTE_USER = 587, // "RUN_TIME_VAR_REMOTE_USER" ++ TOK_RUN_TIME_VAR_TIME = 588, // "RUN_TIME_VAR_TIME" ++ TOK_RUN_TIME_VAR_TIME_DAY = 589, // "RUN_TIME_VAR_TIME_DAY" ++ TOK_RUN_TIME_VAR_TIME_EPOCH = 590, // "RUN_TIME_VAR_TIME_EPOCH" ++ TOK_RUN_TIME_VAR_TIME_HOUR = 591, // "RUN_TIME_VAR_TIME_HOUR" ++ TOK_RUN_TIME_VAR_TIME_MIN = 592, // "RUN_TIME_VAR_TIME_MIN" ++ TOK_RUN_TIME_VAR_TIME_MON = 593, // "RUN_TIME_VAR_TIME_MON" ++ TOK_RUN_TIME_VAR_TIME_SEC = 594, // "RUN_TIME_VAR_TIME_SEC" ++ TOK_RUN_TIME_VAR_TIME_WDAY = 595, // "RUN_TIME_VAR_TIME_WDAY" ++ TOK_RUN_TIME_VAR_TIME_YEAR = 596, // "RUN_TIME_VAR_TIME_YEAR" ++ TOK_VARIABLE = 597, // "VARIABLE" ++ TOK_DICT_ELEMENT = 598, // "Dictionary element" ++ TOK_DICT_ELEMENT_REGEXP = 599 // "Dictionary element, selected by regexp" + }; + /// Backward compatibility alias (Bison 3.6). + typedef token_kind_type yytokentype; +@@ -1329,7 +1331,7 @@ namespace yy { + { + enum symbol_kind_type + { +- YYNTOKENS = 344, ///< Number of tokens. ++ YYNTOKENS = 345, ///< Number of tokens. + S_YYEMPTY = -2, + S_YYEOF = 0, // "end of file" + S_YYerror = 1, // error +@@ -1357,340 +1359,341 @@ namespace yy { + S_VARIABLE_RESPONSE_HEADERS = 23, // VARIABLE_RESPONSE_HEADERS + S_VARIABLE_GEO = 24, // VARIABLE_GEO + S_VARIABLE_REQUEST_COOKIES_NAMES = 25, // VARIABLE_REQUEST_COOKIES_NAMES +- S_VARIABLE_ARGS_COMBINED_SIZE = 26, // VARIABLE_ARGS_COMBINED_SIZE +- S_VARIABLE_ARGS_GET_NAMES = 27, // VARIABLE_ARGS_GET_NAMES +- S_VARIABLE_RULE = 28, // VARIABLE_RULE +- S_VARIABLE_ARGS_NAMES = 29, // "Variable ARGS_NAMES" +- S_VARIABLE_ARGS_POST_NAMES = 30, // VARIABLE_ARGS_POST_NAMES +- S_VARIABLE_AUTH_TYPE = 31, // "AUTH_TYPE" +- S_VARIABLE_FILES_COMBINED_SIZE = 32, // "FILES_COMBINED_SIZE" +- S_VARIABLE_FILES_TMP_NAMES = 33, // "FILES_TMPNAMES" +- S_VARIABLE_FULL_REQUEST = 34, // "FULL_REQUEST" +- S_VARIABLE_FULL_REQUEST_LENGTH = 35, // "FULL_REQUEST_LENGTH" +- S_VARIABLE_INBOUND_DATA_ERROR = 36, // "INBOUND_DATA_ERROR" +- S_VARIABLE_MATCHED_VAR = 37, // "MATCHED_VAR" +- S_VARIABLE_MATCHED_VAR_NAME = 38, // "MATCHED_VAR_NAME" +- S_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 39, // VARIABLE_MULTIPART_BOUNDARY_QUOTED +- S_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 40, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE +- S_VARIABLE_MULTIPART_CRLF_LF_LINES = 41, // "MULTIPART_CRLF_LF_LINES" +- S_VARIABLE_MULTIPART_DATA_AFTER = 42, // "MULTIPART_DATA_AFTER" +- S_VARIABLE_MULTIPART_DATA_BEFORE = 43, // VARIABLE_MULTIPART_DATA_BEFORE +- S_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 44, // "MULTIPART_FILE_LIMIT_EXCEEDED" +- S_VARIABLE_MULTIPART_HEADER_FOLDING = 45, // "MULTIPART_HEADER_FOLDING" +- S_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 46, // "MULTIPART_INVALID_HEADER_FOLDING" +- S_VARIABLE_MULTIPART_INVALID_PART = 47, // VARIABLE_MULTIPART_INVALID_PART +- S_VARIABLE_MULTIPART_INVALID_QUOTING = 48, // "MULTIPART_INVALID_QUOTING" +- S_VARIABLE_MULTIPART_LF_LINE = 49, // VARIABLE_MULTIPART_LF_LINE +- S_VARIABLE_MULTIPART_MISSING_SEMICOLON = 50, // VARIABLE_MULTIPART_MISSING_SEMICOLON +- S_VARIABLE_MULTIPART_SEMICOLON_MISSING = 51, // VARIABLE_MULTIPART_SEMICOLON_MISSING +- S_VARIABLE_MULTIPART_STRICT_ERROR = 52, // "MULTIPART_STRICT_ERROR" +- S_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 53, // "MULTIPART_UNMATCHED_BOUNDARY" +- S_VARIABLE_OUTBOUND_DATA_ERROR = 54, // "OUTBOUND_DATA_ERROR" +- S_VARIABLE_PATH_INFO = 55, // "PATH_INFO" +- S_VARIABLE_QUERY_STRING = 56, // "QUERY_STRING" +- S_VARIABLE_REMOTE_ADDR = 57, // "REMOTE_ADDR" +- S_VARIABLE_REMOTE_HOST = 58, // "REMOTE_HOST" +- S_VARIABLE_REMOTE_PORT = 59, // "REMOTE_PORT" +- S_VARIABLE_REQBODY_ERROR_MSG = 60, // "REQBODY_ERROR_MSG" +- S_VARIABLE_REQBODY_ERROR = 61, // "REQBODY_ERROR" +- S_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 62, // "REQBODY_PROCESSOR_ERROR_MSG" +- S_VARIABLE_REQBODY_PROCESSOR_ERROR = 63, // "REQBODY_PROCESSOR_ERROR" +- S_VARIABLE_REQBODY_PROCESSOR = 64, // "REQBODY_PROCESSOR" +- S_VARIABLE_REQUEST_BASENAME = 65, // "REQUEST_BASENAME" +- S_VARIABLE_REQUEST_BODY_LENGTH = 66, // "REQUEST_BODY_LENGTH" +- S_VARIABLE_REQUEST_BODY = 67, // "REQUEST_BODY" +- S_VARIABLE_REQUEST_FILE_NAME = 68, // "REQUEST_FILENAME" +- S_VARIABLE_REQUEST_HEADERS_NAMES = 69, // VARIABLE_REQUEST_HEADERS_NAMES +- S_VARIABLE_REQUEST_LINE = 70, // "REQUEST_LINE" +- S_VARIABLE_REQUEST_METHOD = 71, // "REQUEST_METHOD" +- S_VARIABLE_REQUEST_PROTOCOL = 72, // "REQUEST_PROTOCOL" +- S_VARIABLE_REQUEST_URI_RAW = 73, // "REQUEST_URI_RAW" +- S_VARIABLE_REQUEST_URI = 74, // "REQUEST_URI" +- S_VARIABLE_RESOURCE = 75, // "RESOURCE" +- S_VARIABLE_RESPONSE_BODY = 76, // "RESPONSE_BODY" +- S_VARIABLE_RESPONSE_CONTENT_LENGTH = 77, // "RESPONSE_CONTENT_LENGTH" +- S_VARIABLE_RESPONSE_CONTENT_TYPE = 78, // VARIABLE_RESPONSE_CONTENT_TYPE +- S_VARIABLE_RESPONSE_HEADERS_NAMES = 79, // VARIABLE_RESPONSE_HEADERS_NAMES +- S_VARIABLE_RESPONSE_PROTOCOL = 80, // "RESPONSE_PROTOCOL" +- S_VARIABLE_RESPONSE_STATUS = 81, // "RESPONSE_STATUS" +- S_VARIABLE_SERVER_ADDR = 82, // "SERVER_ADDR" +- S_VARIABLE_SERVER_NAME = 83, // "SERVER_NAME" +- S_VARIABLE_SERVER_PORT = 84, // "SERVER_PORT" +- S_VARIABLE_SESSION_ID = 85, // "SESSIONID" +- S_VARIABLE_UNIQUE_ID = 86, // "UNIQUE_ID" +- S_VARIABLE_URL_ENCODED_ERROR = 87, // "URLENCODED_ERROR" +- S_VARIABLE_USER_ID = 88, // "USERID" +- S_VARIABLE_WEB_APP_ID = 89, // "WEBAPPID" +- S_VARIABLE_STATUS = 90, // "VARIABLE_STATUS" +- S_VARIABLE_STATUS_LINE = 91, // "VARIABLE_STATUS_LINE" +- S_VARIABLE_IP = 92, // "VARIABLE_IP" +- S_VARIABLE_GLOBAL = 93, // "VARIABLE_GLOBAL" +- S_VARIABLE_TX = 94, // "VARIABLE_TX" +- S_VARIABLE_SESSION = 95, // "VARIABLE_SESSION" +- S_VARIABLE_USER = 96, // "VARIABLE_USER" +- S_RUN_TIME_VAR_ENV = 97, // "RUN_TIME_VAR_ENV" +- S_RUN_TIME_VAR_XML = 98, // "RUN_TIME_VAR_XML" +- S_ACTION_SETVAR = 99, // "SetVar" +- S_SETVAR_OPERATION_EQUALS = 100, // SETVAR_OPERATION_EQUALS +- S_SETVAR_OPERATION_EQUALS_PLUS = 101, // SETVAR_OPERATION_EQUALS_PLUS +- S_SETVAR_OPERATION_EQUALS_MINUS = 102, // SETVAR_OPERATION_EQUALS_MINUS +- S_NOT = 103, // "NOT" +- S_OPERATOR_BEGINS_WITH = 104, // "OPERATOR_BEGINS_WITH" +- S_OPERATOR_CONTAINS = 105, // "OPERATOR_CONTAINS" +- S_OPERATOR_CONTAINS_WORD = 106, // "OPERATOR_CONTAINS_WORD" +- S_OPERATOR_DETECT_SQLI = 107, // "OPERATOR_DETECT_SQLI" +- S_OPERATOR_DETECT_XSS = 108, // "OPERATOR_DETECT_XSS" +- S_OPERATOR_ENDS_WITH = 109, // "OPERATOR_ENDS_WITH" +- S_OPERATOR_EQ = 110, // "OPERATOR_EQ" +- S_OPERATOR_FUZZY_HASH = 111, // "OPERATOR_FUZZY_HASH" +- S_OPERATOR_GEOLOOKUP = 112, // "OPERATOR_GEOLOOKUP" +- S_OPERATOR_GE = 113, // "OPERATOR_GE" +- S_OPERATOR_GSB_LOOKUP = 114, // "OPERATOR_GSB_LOOKUP" +- S_OPERATOR_GT = 115, // "OPERATOR_GT" +- S_OPERATOR_INSPECT_FILE = 116, // "OPERATOR_INSPECT_FILE" +- S_OPERATOR_IP_MATCH_FROM_FILE = 117, // "OPERATOR_IP_MATCH_FROM_FILE" +- S_OPERATOR_IP_MATCH = 118, // "OPERATOR_IP_MATCH" +- S_OPERATOR_LE = 119, // "OPERATOR_LE" +- S_OPERATOR_LT = 120, // "OPERATOR_LT" +- S_OPERATOR_PM_FROM_FILE = 121, // "OPERATOR_PM_FROM_FILE" +- S_OPERATOR_PM = 122, // "OPERATOR_PM" +- S_OPERATOR_RBL = 123, // "OPERATOR_RBL" +- S_OPERATOR_RSUB = 124, // "OPERATOR_RSUB" +- S_OPERATOR_RX_CONTENT_ONLY = 125, // "Operator RX (content only)" +- S_OPERATOR_RX = 126, // "OPERATOR_RX" +- S_OPERATOR_RX_GLOBAL = 127, // "OPERATOR_RX_GLOBAL" +- S_OPERATOR_STR_EQ = 128, // "OPERATOR_STR_EQ" +- S_OPERATOR_STR_MATCH = 129, // "OPERATOR_STR_MATCH" +- S_OPERATOR_UNCONDITIONAL_MATCH = 130, // "OPERATOR_UNCONDITIONAL_MATCH" +- S_OPERATOR_VALIDATE_BYTE_RANGE = 131, // "OPERATOR_VALIDATE_BYTE_RANGE" +- S_OPERATOR_VALIDATE_DTD = 132, // "OPERATOR_VALIDATE_DTD" +- S_OPERATOR_VALIDATE_HASH = 133, // "OPERATOR_VALIDATE_HASH" +- S_OPERATOR_VALIDATE_SCHEMA = 134, // "OPERATOR_VALIDATE_SCHEMA" +- S_OPERATOR_VALIDATE_URL_ENCODING = 135, // "OPERATOR_VALIDATE_URL_ENCODING" +- S_OPERATOR_VALIDATE_UTF8_ENCODING = 136, // "OPERATOR_VALIDATE_UTF8_ENCODING" +- S_OPERATOR_VERIFY_CC = 137, // "OPERATOR_VERIFY_CC" +- S_OPERATOR_VERIFY_CPF = 138, // "OPERATOR_VERIFY_CPF" +- S_OPERATOR_VERIFY_SSN = 139, // "OPERATOR_VERIFY_SSN" +- S_OPERATOR_VERIFY_SVNR = 140, // "OPERATOR_VERIFY_SVNR" +- S_OPERATOR_WITHIN = 141, // "OPERATOR_WITHIN" +- S_CONFIG_DIR_AUDIT_LOG_FMT = 142, // CONFIG_DIR_AUDIT_LOG_FMT +- S_JSON = 143, // JSON +- S_NATIVE = 144, // NATIVE +- S_ACTION_CTL_RULE_ENGINE = 145, // "ACTION_CTL_RULE_ENGINE" +- S_ACTION_ACCURACY = 146, // "Accuracy" +- S_ACTION_ALLOW = 147, // "Allow" +- S_ACTION_APPEND = 148, // "Append" +- S_ACTION_AUDIT_LOG = 149, // "AuditLog" +- S_ACTION_BLOCK = 150, // "Block" +- S_ACTION_CAPTURE = 151, // "Capture" +- S_ACTION_CHAIN = 152, // "Chain" +- S_ACTION_CTL_AUDIT_ENGINE = 153, // "ACTION_CTL_AUDIT_ENGINE" +- S_ACTION_CTL_AUDIT_LOG_PARTS = 154, // "ACTION_CTL_AUDIT_LOG_PARTS" +- S_ACTION_CTL_BDY_JSON = 155, // "ACTION_CTL_BDY_JSON" +- S_ACTION_CTL_BDY_XML = 156, // "ACTION_CTL_BDY_XML" +- S_ACTION_CTL_BDY_URLENCODED = 157, // "ACTION_CTL_BDY_URLENCODED" +- S_ACTION_CTL_FORCE_REQ_BODY_VAR = 158, // "ACTION_CTL_FORCE_REQ_BODY_VAR" +- S_ACTION_CTL_REQUEST_BODY_ACCESS = 159, // "ACTION_CTL_REQUEST_BODY_ACCESS" +- S_ACTION_CTL_RULE_REMOVE_BY_ID = 160, // "ACTION_CTL_RULE_REMOVE_BY_ID" +- S_ACTION_CTL_RULE_REMOVE_BY_TAG = 161, // "ACTION_CTL_RULE_REMOVE_BY_TAG" +- S_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 162, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" +- S_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 163, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" +- S_ACTION_DENY = 164, // "Deny" +- S_ACTION_DEPRECATE_VAR = 165, // "DeprecateVar" +- S_ACTION_DROP = 166, // "Drop" +- S_ACTION_EXEC = 167, // "Exec" +- S_ACTION_EXPIRE_VAR = 168, // "ExpireVar" +- S_ACTION_ID = 169, // "Id" +- S_ACTION_INITCOL = 170, // "InitCol" +- S_ACTION_LOG = 171, // "Log" +- S_ACTION_LOG_DATA = 172, // "LogData" +- S_ACTION_MATURITY = 173, // "Maturity" +- S_ACTION_MSG = 174, // "Msg" +- S_ACTION_MULTI_MATCH = 175, // "MultiMatch" +- S_ACTION_NO_AUDIT_LOG = 176, // "NoAuditLog" +- S_ACTION_NO_LOG = 177, // "NoLog" +- S_ACTION_PASS = 178, // "Pass" +- S_ACTION_PAUSE = 179, // "Pause" +- S_ACTION_PHASE = 180, // "Phase" +- S_ACTION_PREPEND = 181, // "Prepend" +- S_ACTION_PROXY = 182, // "Proxy" +- S_ACTION_REDIRECT = 183, // "Redirect" +- S_ACTION_REV = 184, // "Rev" +- S_ACTION_SANITISE_ARG = 185, // "SanitiseArg" +- S_ACTION_SANITISE_MATCHED = 186, // "SanitiseMatched" +- S_ACTION_SANITISE_MATCHED_BYTES = 187, // "SanitiseMatchedBytes" +- S_ACTION_SANITISE_REQUEST_HEADER = 188, // "SanitiseRequestHeader" +- S_ACTION_SANITISE_RESPONSE_HEADER = 189, // "SanitiseResponseHeader" +- S_ACTION_SETENV = 190, // "SetEnv" +- S_ACTION_SETRSC = 191, // "SetRsc" +- S_ACTION_SETSID = 192, // "SetSid" +- S_ACTION_SETUID = 193, // "SetUID" +- S_ACTION_SEVERITY = 194, // "Severity" +- S_ACTION_SKIP = 195, // "Skip" +- S_ACTION_SKIP_AFTER = 196, // "SkipAfter" +- S_ACTION_STATUS = 197, // "Status" +- S_ACTION_TAG = 198, // "Tag" +- S_ACTION_TRANSFORMATION_BASE_64_ENCODE = 199, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" +- S_ACTION_TRANSFORMATION_BASE_64_DECODE = 200, // "ACTION_TRANSFORMATION_BASE_64_DECODE" +- S_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 201, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" +- S_ACTION_TRANSFORMATION_CMD_LINE = 202, // "ACTION_TRANSFORMATION_CMD_LINE" +- S_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 203, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" +- S_ACTION_TRANSFORMATION_CSS_DECODE = 204, // "ACTION_TRANSFORMATION_CSS_DECODE" +- S_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 205, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" +- S_ACTION_TRANSFORMATION_HEX_ENCODE = 206, // "ACTION_TRANSFORMATION_HEX_ENCODE" +- S_ACTION_TRANSFORMATION_HEX_DECODE = 207, // "ACTION_TRANSFORMATION_HEX_DECODE" +- S_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 208, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" +- S_ACTION_TRANSFORMATION_JS_DECODE = 209, // "ACTION_TRANSFORMATION_JS_DECODE" +- S_ACTION_TRANSFORMATION_LENGTH = 210, // "ACTION_TRANSFORMATION_LENGTH" +- S_ACTION_TRANSFORMATION_LOWERCASE = 211, // "ACTION_TRANSFORMATION_LOWERCASE" +- S_ACTION_TRANSFORMATION_MD5 = 212, // "ACTION_TRANSFORMATION_MD5" +- S_ACTION_TRANSFORMATION_NONE = 213, // "ACTION_TRANSFORMATION_NONE" +- S_ACTION_TRANSFORMATION_NORMALISE_PATH = 214, // "ACTION_TRANSFORMATION_NORMALISE_PATH" +- S_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 215, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" +- S_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 216, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" +- S_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 217, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" +- S_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 218, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" +- S_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 219, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" +- S_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 220, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" +- S_ACTION_TRANSFORMATION_REMOVE_NULLS = 221, // "ACTION_TRANSFORMATION_REMOVE_NULLS" +- S_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 222, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" +- S_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 223, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" +- S_ACTION_TRANSFORMATION_REPLACE_NULLS = 224, // "ACTION_TRANSFORMATION_REPLACE_NULLS" +- S_ACTION_TRANSFORMATION_SHA1 = 225, // "ACTION_TRANSFORMATION_SHA1" +- S_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 226, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" +- S_ACTION_TRANSFORMATION_TRIM = 227, // "ACTION_TRANSFORMATION_TRIM" +- S_ACTION_TRANSFORMATION_TRIM_LEFT = 228, // "ACTION_TRANSFORMATION_TRIM_LEFT" +- S_ACTION_TRANSFORMATION_TRIM_RIGHT = 229, // "ACTION_TRANSFORMATION_TRIM_RIGHT" +- S_ACTION_TRANSFORMATION_UPPERCASE = 230, // "ACTION_TRANSFORMATION_UPPERCASE" +- S_ACTION_TRANSFORMATION_URL_ENCODE = 231, // "ACTION_TRANSFORMATION_URL_ENCODE" +- S_ACTION_TRANSFORMATION_URL_DECODE = 232, // "ACTION_TRANSFORMATION_URL_DECODE" +- S_ACTION_TRANSFORMATION_URL_DECODE_UNI = 233, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" +- S_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 234, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" +- S_ACTION_VER = 235, // "Ver" +- S_ACTION_XMLNS = 236, // "xmlns" +- S_CONFIG_COMPONENT_SIG = 237, // "CONFIG_COMPONENT_SIG" +- S_CONFIG_CONN_ENGINE = 238, // "CONFIG_CONN_ENGINE" +- S_CONFIG_SEC_ARGUMENT_SEPARATOR = 239, // "CONFIG_SEC_ARGUMENT_SEPARATOR" +- S_CONFIG_SEC_WEB_APP_ID = 240, // "CONFIG_SEC_WEB_APP_ID" +- S_CONFIG_SEC_SERVER_SIG = 241, // "CONFIG_SEC_SERVER_SIG" +- S_CONFIG_DIR_AUDIT_DIR = 242, // "CONFIG_DIR_AUDIT_DIR" +- S_CONFIG_DIR_AUDIT_DIR_MOD = 243, // "CONFIG_DIR_AUDIT_DIR_MOD" +- S_CONFIG_DIR_AUDIT_ENG = 244, // "CONFIG_DIR_AUDIT_ENG" +- S_CONFIG_DIR_AUDIT_FLE_MOD = 245, // "CONFIG_DIR_AUDIT_FLE_MOD" +- S_CONFIG_DIR_AUDIT_LOG = 246, // "CONFIG_DIR_AUDIT_LOG" +- S_CONFIG_DIR_AUDIT_LOG2 = 247, // "CONFIG_DIR_AUDIT_LOG2" +- S_CONFIG_DIR_AUDIT_LOG_P = 248, // "CONFIG_DIR_AUDIT_LOG_P" +- S_CONFIG_DIR_AUDIT_STS = 249, // "CONFIG_DIR_AUDIT_STS" +- S_CONFIG_DIR_AUDIT_TPE = 250, // "CONFIG_DIR_AUDIT_TPE" +- S_CONFIG_DIR_DEBUG_LOG = 251, // "CONFIG_DIR_DEBUG_LOG" +- S_CONFIG_DIR_DEBUG_LVL = 252, // "CONFIG_DIR_DEBUG_LVL" +- S_CONFIG_SEC_CACHE_TRANSFORMATIONS = 253, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" +- S_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 254, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" +- S_CONFIG_SEC_HASH_ENGINE = 255, // "CONFIG_SEC_HASH_ENGINE" +- S_CONFIG_SEC_HASH_KEY = 256, // "CONFIG_SEC_HASH_KEY" +- S_CONFIG_SEC_HASH_PARAM = 257, // "CONFIG_SEC_HASH_PARAM" +- S_CONFIG_SEC_HASH_METHOD_RX = 258, // "CONFIG_SEC_HASH_METHOD_RX" +- S_CONFIG_SEC_HASH_METHOD_PM = 259, // "CONFIG_SEC_HASH_METHOD_PM" +- S_CONFIG_SEC_CHROOT_DIR = 260, // "CONFIG_SEC_CHROOT_DIR" +- S_CONFIG_DIR_GEO_DB = 261, // "CONFIG_DIR_GEO_DB" +- S_CONFIG_DIR_GSB_DB = 262, // "CONFIG_DIR_GSB_DB" +- S_CONFIG_SEC_GUARDIAN_LOG = 263, // "CONFIG_SEC_GUARDIAN_LOG" +- S_CONFIG_DIR_PCRE_MATCH_LIMIT = 264, // "CONFIG_DIR_PCRE_MATCH_LIMIT" +- S_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 265, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" +- S_CONFIG_SEC_CONN_R_STATE_LIMIT = 266, // "CONFIG_SEC_CONN_R_STATE_LIMIT" +- S_CONFIG_SEC_CONN_W_STATE_LIMIT = 267, // "CONFIG_SEC_CONN_W_STATE_LIMIT" +- S_CONFIG_SEC_SENSOR_ID = 268, // "CONFIG_SEC_SENSOR_ID" +- S_CONFIG_DIR_ARGS_LIMIT = 269, // "CONFIG_DIR_ARGS_LIMIT" +- S_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 270, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" +- S_CONFIG_DIR_REQ_BODY = 271, // "CONFIG_DIR_REQ_BODY" +- S_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 272, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" +- S_CONFIG_DIR_REQ_BODY_LIMIT = 273, // "CONFIG_DIR_REQ_BODY_LIMIT" +- S_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 274, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" +- S_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 275, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" +- S_CONFIG_DIR_RES_BODY = 276, // "CONFIG_DIR_RES_BODY" +- S_CONFIG_DIR_RES_BODY_LIMIT = 277, // "CONFIG_DIR_RES_BODY_LIMIT" +- S_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 278, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" +- S_CONFIG_SEC_RULE_INHERITANCE = 279, // "CONFIG_SEC_RULE_INHERITANCE" +- S_CONFIG_SEC_RULE_PERF_TIME = 280, // "CONFIG_SEC_RULE_PERF_TIME" +- S_CONFIG_DIR_RULE_ENG = 281, // "CONFIG_DIR_RULE_ENG" +- S_CONFIG_DIR_SEC_ACTION = 282, // "CONFIG_DIR_SEC_ACTION" +- S_CONFIG_DIR_SEC_DEFAULT_ACTION = 283, // "CONFIG_DIR_SEC_DEFAULT_ACTION" +- S_CONFIG_DIR_SEC_MARKER = 284, // "CONFIG_DIR_SEC_MARKER" +- S_CONFIG_DIR_UNICODE_MAP_FILE = 285, // "CONFIG_DIR_UNICODE_MAP_FILE" +- S_CONFIG_DIR_UNICODE_CODE_PAGE = 286, // "CONFIG_DIR_UNICODE_CODE_PAGE" +- S_CONFIG_SEC_COLLECTION_TIMEOUT = 287, // "CONFIG_SEC_COLLECTION_TIMEOUT" +- S_CONFIG_SEC_HTTP_BLKEY = 288, // "CONFIG_SEC_HTTP_BLKEY" +- S_CONFIG_SEC_INTERCEPT_ON_ERROR = 289, // "CONFIG_SEC_INTERCEPT_ON_ERROR" +- S_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 290, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" +- S_CONFIG_SEC_RULE_REMOVE_BY_ID = 291, // "CONFIG_SEC_RULE_REMOVE_BY_ID" +- S_CONFIG_SEC_RULE_REMOVE_BY_MSG = 292, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" +- S_CONFIG_SEC_RULE_REMOVE_BY_TAG = 293, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" +- S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 294, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" +- S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 295, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" +- S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 296, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" +- S_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 297, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" +- S_CONFIG_UPDLOAD_KEEP_FILES = 298, // "CONFIG_UPDLOAD_KEEP_FILES" +- S_CONFIG_UPDLOAD_SAVE_TMP_FILES = 299, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" +- S_CONFIG_UPLOAD_DIR = 300, // "CONFIG_UPLOAD_DIR" +- S_CONFIG_UPLOAD_FILE_LIMIT = 301, // "CONFIG_UPLOAD_FILE_LIMIT" +- S_CONFIG_UPLOAD_FILE_MODE = 302, // "CONFIG_UPLOAD_FILE_MODE" +- S_CONFIG_VALUE_ABORT = 303, // "CONFIG_VALUE_ABORT" +- S_CONFIG_VALUE_DETC = 304, // "CONFIG_VALUE_DETC" +- S_CONFIG_VALUE_HTTPS = 305, // "CONFIG_VALUE_HTTPS" +- S_CONFIG_VALUE_OFF = 306, // "CONFIG_VALUE_OFF" +- S_CONFIG_VALUE_ON = 307, // "CONFIG_VALUE_ON" +- S_CONFIG_VALUE_PARALLEL = 308, // "CONFIG_VALUE_PARALLEL" +- S_CONFIG_VALUE_PROCESS_PARTIAL = 309, // "CONFIG_VALUE_PROCESS_PARTIAL" +- S_CONFIG_VALUE_REJECT = 310, // "CONFIG_VALUE_REJECT" +- S_CONFIG_VALUE_RELEVANT_ONLY = 311, // "CONFIG_VALUE_RELEVANT_ONLY" +- S_CONFIG_VALUE_SERIAL = 312, // "CONFIG_VALUE_SERIAL" +- S_CONFIG_VALUE_WARN = 313, // "CONFIG_VALUE_WARN" +- S_CONFIG_XML_EXTERNAL_ENTITY = 314, // "CONFIG_XML_EXTERNAL_ENTITY" +- S_CONGIG_DIR_RESPONSE_BODY_MP = 315, // "CONGIG_DIR_RESPONSE_BODY_MP" +- S_CONGIG_DIR_SEC_ARG_SEP = 316, // "CONGIG_DIR_SEC_ARG_SEP" +- S_CONGIG_DIR_SEC_COOKIE_FORMAT = 317, // "CONGIG_DIR_SEC_COOKIE_FORMAT" +- S_CONFIG_SEC_COOKIEV0_SEPARATOR = 318, // "CONFIG_SEC_COOKIEV0_SEPARATOR" +- S_CONGIG_DIR_SEC_DATA_DIR = 319, // "CONGIG_DIR_SEC_DATA_DIR" +- S_CONGIG_DIR_SEC_STATUS_ENGINE = 320, // "CONGIG_DIR_SEC_STATUS_ENGINE" +- S_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 321, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" +- S_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 322, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" +- S_CONGIG_DIR_SEC_TMP_DIR = 323, // "CONGIG_DIR_SEC_TMP_DIR" +- S_DIRECTIVE = 324, // "DIRECTIVE" +- S_DIRECTIVE_SECRULESCRIPT = 325, // "DIRECTIVE_SECRULESCRIPT" +- S_FREE_TEXT_QUOTE_MACRO_EXPANSION = 326, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" +- S_QUOTATION_MARK = 327, // "QUOTATION_MARK" +- S_RUN_TIME_VAR_BLD = 328, // "RUN_TIME_VAR_BLD" +- S_RUN_TIME_VAR_DUR = 329, // "RUN_TIME_VAR_DUR" +- S_RUN_TIME_VAR_HSV = 330, // "RUN_TIME_VAR_HSV" +- S_RUN_TIME_VAR_REMOTE_USER = 331, // "RUN_TIME_VAR_REMOTE_USER" +- S_RUN_TIME_VAR_TIME = 332, // "RUN_TIME_VAR_TIME" +- S_RUN_TIME_VAR_TIME_DAY = 333, // "RUN_TIME_VAR_TIME_DAY" +- S_RUN_TIME_VAR_TIME_EPOCH = 334, // "RUN_TIME_VAR_TIME_EPOCH" +- S_RUN_TIME_VAR_TIME_HOUR = 335, // "RUN_TIME_VAR_TIME_HOUR" +- S_RUN_TIME_VAR_TIME_MIN = 336, // "RUN_TIME_VAR_TIME_MIN" +- S_RUN_TIME_VAR_TIME_MON = 337, // "RUN_TIME_VAR_TIME_MON" +- S_RUN_TIME_VAR_TIME_SEC = 338, // "RUN_TIME_VAR_TIME_SEC" +- S_RUN_TIME_VAR_TIME_WDAY = 339, // "RUN_TIME_VAR_TIME_WDAY" +- S_RUN_TIME_VAR_TIME_YEAR = 340, // "RUN_TIME_VAR_TIME_YEAR" +- S_VARIABLE = 341, // "VARIABLE" +- S_DICT_ELEMENT = 342, // "Dictionary element" +- S_DICT_ELEMENT_REGEXP = 343, // "Dictionary element, selected by regexp" +- S_YYACCEPT = 344, // $accept +- S_input = 345, // input +- S_line = 346, // line +- S_audit_log = 347, // audit_log +- S_actions = 348, // actions +- S_actions_may_quoted = 349, // actions_may_quoted +- S_op = 350, // op +- S_op_before_init = 351, // op_before_init +- S_expression = 352, // expression +- S_variables = 353, // variables +- S_variables_pre_process = 354, // variables_pre_process +- S_variables_may_be_quoted = 355, // variables_may_be_quoted +- S_var = 356, // var +- S_act = 357, // act +- S_setvar_action = 358, // setvar_action +- S_run_time_string = 359 // run_time_string ++ S_VARIABLE_MULTIPART_PART_HEADERS = 26, // VARIABLE_MULTIPART_PART_HEADERS ++ S_VARIABLE_ARGS_COMBINED_SIZE = 27, // VARIABLE_ARGS_COMBINED_SIZE ++ S_VARIABLE_ARGS_GET_NAMES = 28, // VARIABLE_ARGS_GET_NAMES ++ S_VARIABLE_RULE = 29, // VARIABLE_RULE ++ S_VARIABLE_ARGS_NAMES = 30, // "Variable ARGS_NAMES" ++ S_VARIABLE_ARGS_POST_NAMES = 31, // VARIABLE_ARGS_POST_NAMES ++ S_VARIABLE_AUTH_TYPE = 32, // "AUTH_TYPE" ++ S_VARIABLE_FILES_COMBINED_SIZE = 33, // "FILES_COMBINED_SIZE" ++ S_VARIABLE_FILES_TMP_NAMES = 34, // "FILES_TMPNAMES" ++ S_VARIABLE_FULL_REQUEST = 35, // "FULL_REQUEST" ++ S_VARIABLE_FULL_REQUEST_LENGTH = 36, // "FULL_REQUEST_LENGTH" ++ S_VARIABLE_INBOUND_DATA_ERROR = 37, // "INBOUND_DATA_ERROR" ++ S_VARIABLE_MATCHED_VAR = 38, // "MATCHED_VAR" ++ S_VARIABLE_MATCHED_VAR_NAME = 39, // "MATCHED_VAR_NAME" ++ S_VARIABLE_MULTIPART_BOUNDARY_QUOTED = 40, // VARIABLE_MULTIPART_BOUNDARY_QUOTED ++ S_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE = 41, // VARIABLE_MULTIPART_BOUNDARY_WHITESPACE ++ S_VARIABLE_MULTIPART_CRLF_LF_LINES = 42, // "MULTIPART_CRLF_LF_LINES" ++ S_VARIABLE_MULTIPART_DATA_AFTER = 43, // "MULTIPART_DATA_AFTER" ++ S_VARIABLE_MULTIPART_DATA_BEFORE = 44, // VARIABLE_MULTIPART_DATA_BEFORE ++ S_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED = 45, // "MULTIPART_FILE_LIMIT_EXCEEDED" ++ S_VARIABLE_MULTIPART_HEADER_FOLDING = 46, // "MULTIPART_HEADER_FOLDING" ++ S_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING = 47, // "MULTIPART_INVALID_HEADER_FOLDING" ++ S_VARIABLE_MULTIPART_INVALID_PART = 48, // VARIABLE_MULTIPART_INVALID_PART ++ S_VARIABLE_MULTIPART_INVALID_QUOTING = 49, // "MULTIPART_INVALID_QUOTING" ++ S_VARIABLE_MULTIPART_LF_LINE = 50, // VARIABLE_MULTIPART_LF_LINE ++ S_VARIABLE_MULTIPART_MISSING_SEMICOLON = 51, // VARIABLE_MULTIPART_MISSING_SEMICOLON ++ S_VARIABLE_MULTIPART_SEMICOLON_MISSING = 52, // VARIABLE_MULTIPART_SEMICOLON_MISSING ++ S_VARIABLE_MULTIPART_STRICT_ERROR = 53, // "MULTIPART_STRICT_ERROR" ++ S_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY = 54, // "MULTIPART_UNMATCHED_BOUNDARY" ++ S_VARIABLE_OUTBOUND_DATA_ERROR = 55, // "OUTBOUND_DATA_ERROR" ++ S_VARIABLE_PATH_INFO = 56, // "PATH_INFO" ++ S_VARIABLE_QUERY_STRING = 57, // "QUERY_STRING" ++ S_VARIABLE_REMOTE_ADDR = 58, // "REMOTE_ADDR" ++ S_VARIABLE_REMOTE_HOST = 59, // "REMOTE_HOST" ++ S_VARIABLE_REMOTE_PORT = 60, // "REMOTE_PORT" ++ S_VARIABLE_REQBODY_ERROR_MSG = 61, // "REQBODY_ERROR_MSG" ++ S_VARIABLE_REQBODY_ERROR = 62, // "REQBODY_ERROR" ++ S_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG = 63, // "REQBODY_PROCESSOR_ERROR_MSG" ++ S_VARIABLE_REQBODY_PROCESSOR_ERROR = 64, // "REQBODY_PROCESSOR_ERROR" ++ S_VARIABLE_REQBODY_PROCESSOR = 65, // "REQBODY_PROCESSOR" ++ S_VARIABLE_REQUEST_BASENAME = 66, // "REQUEST_BASENAME" ++ S_VARIABLE_REQUEST_BODY_LENGTH = 67, // "REQUEST_BODY_LENGTH" ++ S_VARIABLE_REQUEST_BODY = 68, // "REQUEST_BODY" ++ S_VARIABLE_REQUEST_FILE_NAME = 69, // "REQUEST_FILENAME" ++ S_VARIABLE_REQUEST_HEADERS_NAMES = 70, // VARIABLE_REQUEST_HEADERS_NAMES ++ S_VARIABLE_REQUEST_LINE = 71, // "REQUEST_LINE" ++ S_VARIABLE_REQUEST_METHOD = 72, // "REQUEST_METHOD" ++ S_VARIABLE_REQUEST_PROTOCOL = 73, // "REQUEST_PROTOCOL" ++ S_VARIABLE_REQUEST_URI_RAW = 74, // "REQUEST_URI_RAW" ++ S_VARIABLE_REQUEST_URI = 75, // "REQUEST_URI" ++ S_VARIABLE_RESOURCE = 76, // "RESOURCE" ++ S_VARIABLE_RESPONSE_BODY = 77, // "RESPONSE_BODY" ++ S_VARIABLE_RESPONSE_CONTENT_LENGTH = 78, // "RESPONSE_CONTENT_LENGTH" ++ S_VARIABLE_RESPONSE_CONTENT_TYPE = 79, // VARIABLE_RESPONSE_CONTENT_TYPE ++ S_VARIABLE_RESPONSE_HEADERS_NAMES = 80, // VARIABLE_RESPONSE_HEADERS_NAMES ++ S_VARIABLE_RESPONSE_PROTOCOL = 81, // "RESPONSE_PROTOCOL" ++ S_VARIABLE_RESPONSE_STATUS = 82, // "RESPONSE_STATUS" ++ S_VARIABLE_SERVER_ADDR = 83, // "SERVER_ADDR" ++ S_VARIABLE_SERVER_NAME = 84, // "SERVER_NAME" ++ S_VARIABLE_SERVER_PORT = 85, // "SERVER_PORT" ++ S_VARIABLE_SESSION_ID = 86, // "SESSIONID" ++ S_VARIABLE_UNIQUE_ID = 87, // "UNIQUE_ID" ++ S_VARIABLE_URL_ENCODED_ERROR = 88, // "URLENCODED_ERROR" ++ S_VARIABLE_USER_ID = 89, // "USERID" ++ S_VARIABLE_WEB_APP_ID = 90, // "WEBAPPID" ++ S_VARIABLE_STATUS = 91, // "VARIABLE_STATUS" ++ S_VARIABLE_STATUS_LINE = 92, // "VARIABLE_STATUS_LINE" ++ S_VARIABLE_IP = 93, // "VARIABLE_IP" ++ S_VARIABLE_GLOBAL = 94, // "VARIABLE_GLOBAL" ++ S_VARIABLE_TX = 95, // "VARIABLE_TX" ++ S_VARIABLE_SESSION = 96, // "VARIABLE_SESSION" ++ S_VARIABLE_USER = 97, // "VARIABLE_USER" ++ S_RUN_TIME_VAR_ENV = 98, // "RUN_TIME_VAR_ENV" ++ S_RUN_TIME_VAR_XML = 99, // "RUN_TIME_VAR_XML" ++ S_ACTION_SETVAR = 100, // "SetVar" ++ S_SETVAR_OPERATION_EQUALS = 101, // SETVAR_OPERATION_EQUALS ++ S_SETVAR_OPERATION_EQUALS_PLUS = 102, // SETVAR_OPERATION_EQUALS_PLUS ++ S_SETVAR_OPERATION_EQUALS_MINUS = 103, // SETVAR_OPERATION_EQUALS_MINUS ++ S_NOT = 104, // "NOT" ++ S_OPERATOR_BEGINS_WITH = 105, // "OPERATOR_BEGINS_WITH" ++ S_OPERATOR_CONTAINS = 106, // "OPERATOR_CONTAINS" ++ S_OPERATOR_CONTAINS_WORD = 107, // "OPERATOR_CONTAINS_WORD" ++ S_OPERATOR_DETECT_SQLI = 108, // "OPERATOR_DETECT_SQLI" ++ S_OPERATOR_DETECT_XSS = 109, // "OPERATOR_DETECT_XSS" ++ S_OPERATOR_ENDS_WITH = 110, // "OPERATOR_ENDS_WITH" ++ S_OPERATOR_EQ = 111, // "OPERATOR_EQ" ++ S_OPERATOR_FUZZY_HASH = 112, // "OPERATOR_FUZZY_HASH" ++ S_OPERATOR_GEOLOOKUP = 113, // "OPERATOR_GEOLOOKUP" ++ S_OPERATOR_GE = 114, // "OPERATOR_GE" ++ S_OPERATOR_GSB_LOOKUP = 115, // "OPERATOR_GSB_LOOKUP" ++ S_OPERATOR_GT = 116, // "OPERATOR_GT" ++ S_OPERATOR_INSPECT_FILE = 117, // "OPERATOR_INSPECT_FILE" ++ S_OPERATOR_IP_MATCH_FROM_FILE = 118, // "OPERATOR_IP_MATCH_FROM_FILE" ++ S_OPERATOR_IP_MATCH = 119, // "OPERATOR_IP_MATCH" ++ S_OPERATOR_LE = 120, // "OPERATOR_LE" ++ S_OPERATOR_LT = 121, // "OPERATOR_LT" ++ S_OPERATOR_PM_FROM_FILE = 122, // "OPERATOR_PM_FROM_FILE" ++ S_OPERATOR_PM = 123, // "OPERATOR_PM" ++ S_OPERATOR_RBL = 124, // "OPERATOR_RBL" ++ S_OPERATOR_RSUB = 125, // "OPERATOR_RSUB" ++ S_OPERATOR_RX_CONTENT_ONLY = 126, // "Operator RX (content only)" ++ S_OPERATOR_RX = 127, // "OPERATOR_RX" ++ S_OPERATOR_RX_GLOBAL = 128, // "OPERATOR_RX_GLOBAL" ++ S_OPERATOR_STR_EQ = 129, // "OPERATOR_STR_EQ" ++ S_OPERATOR_STR_MATCH = 130, // "OPERATOR_STR_MATCH" ++ S_OPERATOR_UNCONDITIONAL_MATCH = 131, // "OPERATOR_UNCONDITIONAL_MATCH" ++ S_OPERATOR_VALIDATE_BYTE_RANGE = 132, // "OPERATOR_VALIDATE_BYTE_RANGE" ++ S_OPERATOR_VALIDATE_DTD = 133, // "OPERATOR_VALIDATE_DTD" ++ S_OPERATOR_VALIDATE_HASH = 134, // "OPERATOR_VALIDATE_HASH" ++ S_OPERATOR_VALIDATE_SCHEMA = 135, // "OPERATOR_VALIDATE_SCHEMA" ++ S_OPERATOR_VALIDATE_URL_ENCODING = 136, // "OPERATOR_VALIDATE_URL_ENCODING" ++ S_OPERATOR_VALIDATE_UTF8_ENCODING = 137, // "OPERATOR_VALIDATE_UTF8_ENCODING" ++ S_OPERATOR_VERIFY_CC = 138, // "OPERATOR_VERIFY_CC" ++ S_OPERATOR_VERIFY_CPF = 139, // "OPERATOR_VERIFY_CPF" ++ S_OPERATOR_VERIFY_SSN = 140, // "OPERATOR_VERIFY_SSN" ++ S_OPERATOR_VERIFY_SVNR = 141, // "OPERATOR_VERIFY_SVNR" ++ S_OPERATOR_WITHIN = 142, // "OPERATOR_WITHIN" ++ S_CONFIG_DIR_AUDIT_LOG_FMT = 143, // CONFIG_DIR_AUDIT_LOG_FMT ++ S_JSON = 144, // JSON ++ S_NATIVE = 145, // NATIVE ++ S_ACTION_CTL_RULE_ENGINE = 146, // "ACTION_CTL_RULE_ENGINE" ++ S_ACTION_ACCURACY = 147, // "Accuracy" ++ S_ACTION_ALLOW = 148, // "Allow" ++ S_ACTION_APPEND = 149, // "Append" ++ S_ACTION_AUDIT_LOG = 150, // "AuditLog" ++ S_ACTION_BLOCK = 151, // "Block" ++ S_ACTION_CAPTURE = 152, // "Capture" ++ S_ACTION_CHAIN = 153, // "Chain" ++ S_ACTION_CTL_AUDIT_ENGINE = 154, // "ACTION_CTL_AUDIT_ENGINE" ++ S_ACTION_CTL_AUDIT_LOG_PARTS = 155, // "ACTION_CTL_AUDIT_LOG_PARTS" ++ S_ACTION_CTL_BDY_JSON = 156, // "ACTION_CTL_BDY_JSON" ++ S_ACTION_CTL_BDY_XML = 157, // "ACTION_CTL_BDY_XML" ++ S_ACTION_CTL_BDY_URLENCODED = 158, // "ACTION_CTL_BDY_URLENCODED" ++ S_ACTION_CTL_FORCE_REQ_BODY_VAR = 159, // "ACTION_CTL_FORCE_REQ_BODY_VAR" ++ S_ACTION_CTL_REQUEST_BODY_ACCESS = 160, // "ACTION_CTL_REQUEST_BODY_ACCESS" ++ S_ACTION_CTL_RULE_REMOVE_BY_ID = 161, // "ACTION_CTL_RULE_REMOVE_BY_ID" ++ S_ACTION_CTL_RULE_REMOVE_BY_TAG = 162, // "ACTION_CTL_RULE_REMOVE_BY_TAG" ++ S_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID = 163, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_ID" ++ S_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG = 164, // "ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG" ++ S_ACTION_DENY = 165, // "Deny" ++ S_ACTION_DEPRECATE_VAR = 166, // "DeprecateVar" ++ S_ACTION_DROP = 167, // "Drop" ++ S_ACTION_EXEC = 168, // "Exec" ++ S_ACTION_EXPIRE_VAR = 169, // "ExpireVar" ++ S_ACTION_ID = 170, // "Id" ++ S_ACTION_INITCOL = 171, // "InitCol" ++ S_ACTION_LOG = 172, // "Log" ++ S_ACTION_LOG_DATA = 173, // "LogData" ++ S_ACTION_MATURITY = 174, // "Maturity" ++ S_ACTION_MSG = 175, // "Msg" ++ S_ACTION_MULTI_MATCH = 176, // "MultiMatch" ++ S_ACTION_NO_AUDIT_LOG = 177, // "NoAuditLog" ++ S_ACTION_NO_LOG = 178, // "NoLog" ++ S_ACTION_PASS = 179, // "Pass" ++ S_ACTION_PAUSE = 180, // "Pause" ++ S_ACTION_PHASE = 181, // "Phase" ++ S_ACTION_PREPEND = 182, // "Prepend" ++ S_ACTION_PROXY = 183, // "Proxy" ++ S_ACTION_REDIRECT = 184, // "Redirect" ++ S_ACTION_REV = 185, // "Rev" ++ S_ACTION_SANITISE_ARG = 186, // "SanitiseArg" ++ S_ACTION_SANITISE_MATCHED = 187, // "SanitiseMatched" ++ S_ACTION_SANITISE_MATCHED_BYTES = 188, // "SanitiseMatchedBytes" ++ S_ACTION_SANITISE_REQUEST_HEADER = 189, // "SanitiseRequestHeader" ++ S_ACTION_SANITISE_RESPONSE_HEADER = 190, // "SanitiseResponseHeader" ++ S_ACTION_SETENV = 191, // "SetEnv" ++ S_ACTION_SETRSC = 192, // "SetRsc" ++ S_ACTION_SETSID = 193, // "SetSid" ++ S_ACTION_SETUID = 194, // "SetUID" ++ S_ACTION_SEVERITY = 195, // "Severity" ++ S_ACTION_SKIP = 196, // "Skip" ++ S_ACTION_SKIP_AFTER = 197, // "SkipAfter" ++ S_ACTION_STATUS = 198, // "Status" ++ S_ACTION_TAG = 199, // "Tag" ++ S_ACTION_TRANSFORMATION_BASE_64_ENCODE = 200, // "ACTION_TRANSFORMATION_BASE_64_ENCODE" ++ S_ACTION_TRANSFORMATION_BASE_64_DECODE = 201, // "ACTION_TRANSFORMATION_BASE_64_DECODE" ++ S_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT = 202, // "ACTION_TRANSFORMATION_BASE_64_DECODE_EXT" ++ S_ACTION_TRANSFORMATION_CMD_LINE = 203, // "ACTION_TRANSFORMATION_CMD_LINE" ++ S_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE = 204, // "ACTION_TRANSFORMATION_COMPRESS_WHITESPACE" ++ S_ACTION_TRANSFORMATION_CSS_DECODE = 205, // "ACTION_TRANSFORMATION_CSS_DECODE" ++ S_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE = 206, // "ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE" ++ S_ACTION_TRANSFORMATION_HEX_ENCODE = 207, // "ACTION_TRANSFORMATION_HEX_ENCODE" ++ S_ACTION_TRANSFORMATION_HEX_DECODE = 208, // "ACTION_TRANSFORMATION_HEX_DECODE" ++ S_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE = 209, // "ACTION_TRANSFORMATION_HTML_ENTITY_DECODE" ++ S_ACTION_TRANSFORMATION_JS_DECODE = 210, // "ACTION_TRANSFORMATION_JS_DECODE" ++ S_ACTION_TRANSFORMATION_LENGTH = 211, // "ACTION_TRANSFORMATION_LENGTH" ++ S_ACTION_TRANSFORMATION_LOWERCASE = 212, // "ACTION_TRANSFORMATION_LOWERCASE" ++ S_ACTION_TRANSFORMATION_MD5 = 213, // "ACTION_TRANSFORMATION_MD5" ++ S_ACTION_TRANSFORMATION_NONE = 214, // "ACTION_TRANSFORMATION_NONE" ++ S_ACTION_TRANSFORMATION_NORMALISE_PATH = 215, // "ACTION_TRANSFORMATION_NORMALISE_PATH" ++ S_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN = 216, // "ACTION_TRANSFORMATION_NORMALISE_PATH_WIN" ++ S_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT = 217, // "ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT" ++ S_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT = 218, // "ACTION_TRANSFORMATION_PARITY_ODD_7_BIT" ++ S_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT = 219, // "ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT" ++ S_ACTION_TRANSFORMATION_REMOVE_COMMENTS = 220, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS" ++ S_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR = 221, // "ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR" ++ S_ACTION_TRANSFORMATION_REMOVE_NULLS = 222, // "ACTION_TRANSFORMATION_REMOVE_NULLS" ++ S_ACTION_TRANSFORMATION_REMOVE_WHITESPACE = 223, // "ACTION_TRANSFORMATION_REMOVE_WHITESPACE" ++ S_ACTION_TRANSFORMATION_REPLACE_COMMENTS = 224, // "ACTION_TRANSFORMATION_REPLACE_COMMENTS" ++ S_ACTION_TRANSFORMATION_REPLACE_NULLS = 225, // "ACTION_TRANSFORMATION_REPLACE_NULLS" ++ S_ACTION_TRANSFORMATION_SHA1 = 226, // "ACTION_TRANSFORMATION_SHA1" ++ S_ACTION_TRANSFORMATION_SQL_HEX_DECODE = 227, // "ACTION_TRANSFORMATION_SQL_HEX_DECODE" ++ S_ACTION_TRANSFORMATION_TRIM = 228, // "ACTION_TRANSFORMATION_TRIM" ++ S_ACTION_TRANSFORMATION_TRIM_LEFT = 229, // "ACTION_TRANSFORMATION_TRIM_LEFT" ++ S_ACTION_TRANSFORMATION_TRIM_RIGHT = 230, // "ACTION_TRANSFORMATION_TRIM_RIGHT" ++ S_ACTION_TRANSFORMATION_UPPERCASE = 231, // "ACTION_TRANSFORMATION_UPPERCASE" ++ S_ACTION_TRANSFORMATION_URL_ENCODE = 232, // "ACTION_TRANSFORMATION_URL_ENCODE" ++ S_ACTION_TRANSFORMATION_URL_DECODE = 233, // "ACTION_TRANSFORMATION_URL_DECODE" ++ S_ACTION_TRANSFORMATION_URL_DECODE_UNI = 234, // "ACTION_TRANSFORMATION_URL_DECODE_UNI" ++ S_ACTION_TRANSFORMATION_UTF8_TO_UNICODE = 235, // "ACTION_TRANSFORMATION_UTF8_TO_UNICODE" ++ S_ACTION_VER = 236, // "Ver" ++ S_ACTION_XMLNS = 237, // "xmlns" ++ S_CONFIG_COMPONENT_SIG = 238, // "CONFIG_COMPONENT_SIG" ++ S_CONFIG_CONN_ENGINE = 239, // "CONFIG_CONN_ENGINE" ++ S_CONFIG_SEC_ARGUMENT_SEPARATOR = 240, // "CONFIG_SEC_ARGUMENT_SEPARATOR" ++ S_CONFIG_SEC_WEB_APP_ID = 241, // "CONFIG_SEC_WEB_APP_ID" ++ S_CONFIG_SEC_SERVER_SIG = 242, // "CONFIG_SEC_SERVER_SIG" ++ S_CONFIG_DIR_AUDIT_DIR = 243, // "CONFIG_DIR_AUDIT_DIR" ++ S_CONFIG_DIR_AUDIT_DIR_MOD = 244, // "CONFIG_DIR_AUDIT_DIR_MOD" ++ S_CONFIG_DIR_AUDIT_ENG = 245, // "CONFIG_DIR_AUDIT_ENG" ++ S_CONFIG_DIR_AUDIT_FLE_MOD = 246, // "CONFIG_DIR_AUDIT_FLE_MOD" ++ S_CONFIG_DIR_AUDIT_LOG = 247, // "CONFIG_DIR_AUDIT_LOG" ++ S_CONFIG_DIR_AUDIT_LOG2 = 248, // "CONFIG_DIR_AUDIT_LOG2" ++ S_CONFIG_DIR_AUDIT_LOG_P = 249, // "CONFIG_DIR_AUDIT_LOG_P" ++ S_CONFIG_DIR_AUDIT_STS = 250, // "CONFIG_DIR_AUDIT_STS" ++ S_CONFIG_DIR_AUDIT_TPE = 251, // "CONFIG_DIR_AUDIT_TPE" ++ S_CONFIG_DIR_DEBUG_LOG = 252, // "CONFIG_DIR_DEBUG_LOG" ++ S_CONFIG_DIR_DEBUG_LVL = 253, // "CONFIG_DIR_DEBUG_LVL" ++ S_CONFIG_SEC_CACHE_TRANSFORMATIONS = 254, // "CONFIG_SEC_CACHE_TRANSFORMATIONS" ++ S_CONFIG_SEC_DISABLE_BACKEND_COMPRESS = 255, // "CONFIG_SEC_DISABLE_BACKEND_COMPRESS" ++ S_CONFIG_SEC_HASH_ENGINE = 256, // "CONFIG_SEC_HASH_ENGINE" ++ S_CONFIG_SEC_HASH_KEY = 257, // "CONFIG_SEC_HASH_KEY" ++ S_CONFIG_SEC_HASH_PARAM = 258, // "CONFIG_SEC_HASH_PARAM" ++ S_CONFIG_SEC_HASH_METHOD_RX = 259, // "CONFIG_SEC_HASH_METHOD_RX" ++ S_CONFIG_SEC_HASH_METHOD_PM = 260, // "CONFIG_SEC_HASH_METHOD_PM" ++ S_CONFIG_SEC_CHROOT_DIR = 261, // "CONFIG_SEC_CHROOT_DIR" ++ S_CONFIG_DIR_GEO_DB = 262, // "CONFIG_DIR_GEO_DB" ++ S_CONFIG_DIR_GSB_DB = 263, // "CONFIG_DIR_GSB_DB" ++ S_CONFIG_SEC_GUARDIAN_LOG = 264, // "CONFIG_SEC_GUARDIAN_LOG" ++ S_CONFIG_DIR_PCRE_MATCH_LIMIT = 265, // "CONFIG_DIR_PCRE_MATCH_LIMIT" ++ S_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION = 266, // "CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION" ++ S_CONFIG_SEC_CONN_R_STATE_LIMIT = 267, // "CONFIG_SEC_CONN_R_STATE_LIMIT" ++ S_CONFIG_SEC_CONN_W_STATE_LIMIT = 268, // "CONFIG_SEC_CONN_W_STATE_LIMIT" ++ S_CONFIG_SEC_SENSOR_ID = 269, // "CONFIG_SEC_SENSOR_ID" ++ S_CONFIG_DIR_ARGS_LIMIT = 270, // "CONFIG_DIR_ARGS_LIMIT" ++ S_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT = 271, // "CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT" ++ S_CONFIG_DIR_REQ_BODY = 272, // "CONFIG_DIR_REQ_BODY" ++ S_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT = 273, // "CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT" ++ S_CONFIG_DIR_REQ_BODY_LIMIT = 274, // "CONFIG_DIR_REQ_BODY_LIMIT" ++ S_CONFIG_DIR_REQ_BODY_LIMIT_ACTION = 275, // "CONFIG_DIR_REQ_BODY_LIMIT_ACTION" ++ S_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT = 276, // "CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT" ++ S_CONFIG_DIR_RES_BODY = 277, // "CONFIG_DIR_RES_BODY" ++ S_CONFIG_DIR_RES_BODY_LIMIT = 278, // "CONFIG_DIR_RES_BODY_LIMIT" ++ S_CONFIG_DIR_RES_BODY_LIMIT_ACTION = 279, // "CONFIG_DIR_RES_BODY_LIMIT_ACTION" ++ S_CONFIG_SEC_RULE_INHERITANCE = 280, // "CONFIG_SEC_RULE_INHERITANCE" ++ S_CONFIG_SEC_RULE_PERF_TIME = 281, // "CONFIG_SEC_RULE_PERF_TIME" ++ S_CONFIG_DIR_RULE_ENG = 282, // "CONFIG_DIR_RULE_ENG" ++ S_CONFIG_DIR_SEC_ACTION = 283, // "CONFIG_DIR_SEC_ACTION" ++ S_CONFIG_DIR_SEC_DEFAULT_ACTION = 284, // "CONFIG_DIR_SEC_DEFAULT_ACTION" ++ S_CONFIG_DIR_SEC_MARKER = 285, // "CONFIG_DIR_SEC_MARKER" ++ S_CONFIG_DIR_UNICODE_MAP_FILE = 286, // "CONFIG_DIR_UNICODE_MAP_FILE" ++ S_CONFIG_DIR_UNICODE_CODE_PAGE = 287, // "CONFIG_DIR_UNICODE_CODE_PAGE" ++ S_CONFIG_SEC_COLLECTION_TIMEOUT = 288, // "CONFIG_SEC_COLLECTION_TIMEOUT" ++ S_CONFIG_SEC_HTTP_BLKEY = 289, // "CONFIG_SEC_HTTP_BLKEY" ++ S_CONFIG_SEC_INTERCEPT_ON_ERROR = 290, // "CONFIG_SEC_INTERCEPT_ON_ERROR" ++ S_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION = 291, // "CONFIG_SEC_REMOTE_RULES_FAIL_ACTION" ++ S_CONFIG_SEC_RULE_REMOVE_BY_ID = 292, // "CONFIG_SEC_RULE_REMOVE_BY_ID" ++ S_CONFIG_SEC_RULE_REMOVE_BY_MSG = 293, // "CONFIG_SEC_RULE_REMOVE_BY_MSG" ++ S_CONFIG_SEC_RULE_REMOVE_BY_TAG = 294, // "CONFIG_SEC_RULE_REMOVE_BY_TAG" ++ S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG = 295, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG" ++ S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG = 296, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG" ++ S_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID = 297, // "CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID" ++ S_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID = 298, // "CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID" ++ S_CONFIG_UPDLOAD_KEEP_FILES = 299, // "CONFIG_UPDLOAD_KEEP_FILES" ++ S_CONFIG_UPDLOAD_SAVE_TMP_FILES = 300, // "CONFIG_UPDLOAD_SAVE_TMP_FILES" ++ S_CONFIG_UPLOAD_DIR = 301, // "CONFIG_UPLOAD_DIR" ++ S_CONFIG_UPLOAD_FILE_LIMIT = 302, // "CONFIG_UPLOAD_FILE_LIMIT" ++ S_CONFIG_UPLOAD_FILE_MODE = 303, // "CONFIG_UPLOAD_FILE_MODE" ++ S_CONFIG_VALUE_ABORT = 304, // "CONFIG_VALUE_ABORT" ++ S_CONFIG_VALUE_DETC = 305, // "CONFIG_VALUE_DETC" ++ S_CONFIG_VALUE_HTTPS = 306, // "CONFIG_VALUE_HTTPS" ++ S_CONFIG_VALUE_OFF = 307, // "CONFIG_VALUE_OFF" ++ S_CONFIG_VALUE_ON = 308, // "CONFIG_VALUE_ON" ++ S_CONFIG_VALUE_PARALLEL = 309, // "CONFIG_VALUE_PARALLEL" ++ S_CONFIG_VALUE_PROCESS_PARTIAL = 310, // "CONFIG_VALUE_PROCESS_PARTIAL" ++ S_CONFIG_VALUE_REJECT = 311, // "CONFIG_VALUE_REJECT" ++ S_CONFIG_VALUE_RELEVANT_ONLY = 312, // "CONFIG_VALUE_RELEVANT_ONLY" ++ S_CONFIG_VALUE_SERIAL = 313, // "CONFIG_VALUE_SERIAL" ++ S_CONFIG_VALUE_WARN = 314, // "CONFIG_VALUE_WARN" ++ S_CONFIG_XML_EXTERNAL_ENTITY = 315, // "CONFIG_XML_EXTERNAL_ENTITY" ++ S_CONGIG_DIR_RESPONSE_BODY_MP = 316, // "CONGIG_DIR_RESPONSE_BODY_MP" ++ S_CONGIG_DIR_SEC_ARG_SEP = 317, // "CONGIG_DIR_SEC_ARG_SEP" ++ S_CONGIG_DIR_SEC_COOKIE_FORMAT = 318, // "CONGIG_DIR_SEC_COOKIE_FORMAT" ++ S_CONFIG_SEC_COOKIEV0_SEPARATOR = 319, // "CONFIG_SEC_COOKIEV0_SEPARATOR" ++ S_CONGIG_DIR_SEC_DATA_DIR = 320, // "CONGIG_DIR_SEC_DATA_DIR" ++ S_CONGIG_DIR_SEC_STATUS_ENGINE = 321, // "CONGIG_DIR_SEC_STATUS_ENGINE" ++ S_CONFIG_SEC_STREAM_IN_BODY_INSPECTION = 322, // "CONFIG_SEC_STREAM_IN_BODY_INSPECTION" ++ S_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION = 323, // "CONFIG_SEC_STREAM_OUT_BODY_INSPECTION" ++ S_CONGIG_DIR_SEC_TMP_DIR = 324, // "CONGIG_DIR_SEC_TMP_DIR" ++ S_DIRECTIVE = 325, // "DIRECTIVE" ++ S_DIRECTIVE_SECRULESCRIPT = 326, // "DIRECTIVE_SECRULESCRIPT" ++ S_FREE_TEXT_QUOTE_MACRO_EXPANSION = 327, // "FREE_TEXT_QUOTE_MACRO_EXPANSION" ++ S_QUOTATION_MARK = 328, // "QUOTATION_MARK" ++ S_RUN_TIME_VAR_BLD = 329, // "RUN_TIME_VAR_BLD" ++ S_RUN_TIME_VAR_DUR = 330, // "RUN_TIME_VAR_DUR" ++ S_RUN_TIME_VAR_HSV = 331, // "RUN_TIME_VAR_HSV" ++ S_RUN_TIME_VAR_REMOTE_USER = 332, // "RUN_TIME_VAR_REMOTE_USER" ++ S_RUN_TIME_VAR_TIME = 333, // "RUN_TIME_VAR_TIME" ++ S_RUN_TIME_VAR_TIME_DAY = 334, // "RUN_TIME_VAR_TIME_DAY" ++ S_RUN_TIME_VAR_TIME_EPOCH = 335, // "RUN_TIME_VAR_TIME_EPOCH" ++ S_RUN_TIME_VAR_TIME_HOUR = 336, // "RUN_TIME_VAR_TIME_HOUR" ++ S_RUN_TIME_VAR_TIME_MIN = 337, // "RUN_TIME_VAR_TIME_MIN" ++ S_RUN_TIME_VAR_TIME_MON = 338, // "RUN_TIME_VAR_TIME_MON" ++ S_RUN_TIME_VAR_TIME_SEC = 339, // "RUN_TIME_VAR_TIME_SEC" ++ S_RUN_TIME_VAR_TIME_WDAY = 340, // "RUN_TIME_VAR_TIME_WDAY" ++ S_RUN_TIME_VAR_TIME_YEAR = 341, // "RUN_TIME_VAR_TIME_YEAR" ++ S_VARIABLE = 342, // "VARIABLE" ++ S_DICT_ELEMENT = 343, // "Dictionary element" ++ S_DICT_ELEMENT_REGEXP = 344, // "Dictionary element, selected by regexp" ++ S_YYACCEPT = 345, // $accept ++ S_input = 346, // input ++ S_line = 347, // line ++ S_audit_log = 348, // audit_log ++ S_actions = 349, // actions ++ S_actions_may_quoted = 350, // actions_may_quoted ++ S_op = 351, // op ++ S_op_before_init = 352, // op_before_init ++ S_expression = 353, // expression ++ S_variables = 354, // variables ++ S_variables_pre_process = 355, // variables_pre_process ++ S_variables_may_be_quoted = 356, // variables_may_be_quoted ++ S_var = 357, // var ++ S_act = 358, // act ++ S_setvar_action = 359, // setvar_action ++ S_run_time_string = 360 // run_time_string + }; + }; + +@@ -2413,13 +2416,13 @@ switch (yykind) + symbol_type (int tok, location_type l) + : super_type(token_type (tok), std::move (l)) + { +- YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); ++ YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_MULTIPART_PART_HEADERS || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); + } + #else + symbol_type (int tok, const location_type& l) + : super_type(token_type (tok), l) + { +- YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); ++ YY_ASSERT (tok == token::TOK_END || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_COMMA || tok == token::TOK_CONFIG_CONTENT_INJECTION || tok == token::TOK_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR || tok == token::TOK_PIPE || tok == token::TOK_NEW_LINE || tok == token::TOK_VAR_COUNT || tok == token::TOK_VAR_EXCLUSION || tok == token::TOK_VARIABLE_ARGS || tok == token::TOK_VARIABLE_ARGS_POST || tok == token::TOK_VARIABLE_ARGS_GET || tok == token::TOK_VARIABLE_FILES_SIZES || tok == token::TOK_VARIABLE_FILES_NAMES || tok == token::TOK_VARIABLE_FILES_TMP_CONTENT || tok == token::TOK_VARIABLE_MULTIPART_FILENAME || tok == token::TOK_VARIABLE_MULTIPART_NAME || tok == token::TOK_VARIABLE_MATCHED_VARS_NAMES || tok == token::TOK_VARIABLE_MATCHED_VARS || tok == token::TOK_VARIABLE_FILES || tok == token::TOK_VARIABLE_REQUEST_COOKIES || tok == token::TOK_VARIABLE_REQUEST_HEADERS || tok == token::TOK_VARIABLE_RESPONSE_HEADERS || tok == token::TOK_VARIABLE_GEO || tok == token::TOK_VARIABLE_REQUEST_COOKIES_NAMES || tok == token::TOK_VARIABLE_MULTIPART_PART_HEADERS || tok == token::TOK_VARIABLE_ARGS_COMBINED_SIZE || tok == token::TOK_VARIABLE_ARGS_GET_NAMES || tok == token::TOK_VARIABLE_RULE || tok == token::TOK_VARIABLE_ARGS_NAMES || tok == token::TOK_VARIABLE_ARGS_POST_NAMES || tok == token::TOK_VARIABLE_AUTH_TYPE || tok == token::TOK_VARIABLE_FILES_COMBINED_SIZE || tok == token::TOK_VARIABLE_FILES_TMP_NAMES || tok == token::TOK_VARIABLE_FULL_REQUEST || tok == token::TOK_VARIABLE_FULL_REQUEST_LENGTH || tok == token::TOK_VARIABLE_INBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_MATCHED_VAR || tok == token::TOK_VARIABLE_MATCHED_VAR_NAME || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_QUOTED || tok == token::TOK_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE || tok == token::TOK_VARIABLE_MULTIPART_CRLF_LF_LINES || tok == token::TOK_VARIABLE_MULTIPART_DATA_AFTER || tok == token::TOK_VARIABLE_MULTIPART_DATA_BEFORE || tok == token::TOK_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED || tok == token::TOK_VARIABLE_MULTIPART_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING || tok == token::TOK_VARIABLE_MULTIPART_INVALID_PART || tok == token::TOK_VARIABLE_MULTIPART_INVALID_QUOTING || tok == token::TOK_VARIABLE_MULTIPART_LF_LINE || tok == token::TOK_VARIABLE_MULTIPART_MISSING_SEMICOLON || tok == token::TOK_VARIABLE_MULTIPART_SEMICOLON_MISSING || tok == token::TOK_VARIABLE_MULTIPART_STRICT_ERROR || tok == token::TOK_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY || tok == token::TOK_VARIABLE_OUTBOUND_DATA_ERROR || tok == token::TOK_VARIABLE_PATH_INFO || tok == token::TOK_VARIABLE_QUERY_STRING || tok == token::TOK_VARIABLE_REMOTE_ADDR || tok == token::TOK_VARIABLE_REMOTE_HOST || tok == token::TOK_VARIABLE_REMOTE_PORT || tok == token::TOK_VARIABLE_REQBODY_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR_ERROR || tok == token::TOK_VARIABLE_REQBODY_PROCESSOR || tok == token::TOK_VARIABLE_REQUEST_BASENAME || tok == token::TOK_VARIABLE_REQUEST_BODY_LENGTH || tok == token::TOK_VARIABLE_REQUEST_BODY || tok == token::TOK_VARIABLE_REQUEST_FILE_NAME || tok == token::TOK_VARIABLE_REQUEST_HEADERS_NAMES || tok == token::TOK_VARIABLE_REQUEST_LINE || tok == token::TOK_VARIABLE_REQUEST_METHOD || tok == token::TOK_VARIABLE_REQUEST_PROTOCOL || tok == token::TOK_VARIABLE_REQUEST_URI_RAW || tok == token::TOK_VARIABLE_REQUEST_URI || tok == token::TOK_VARIABLE_RESOURCE || tok == token::TOK_VARIABLE_RESPONSE_BODY || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_LENGTH || tok == token::TOK_VARIABLE_RESPONSE_CONTENT_TYPE || tok == token::TOK_VARIABLE_RESPONSE_HEADERS_NAMES || tok == token::TOK_VARIABLE_RESPONSE_PROTOCOL || tok == token::TOK_VARIABLE_RESPONSE_STATUS || tok == token::TOK_VARIABLE_SERVER_ADDR || tok == token::TOK_VARIABLE_SERVER_NAME || tok == token::TOK_VARIABLE_SERVER_PORT || tok == token::TOK_VARIABLE_SESSION_ID || tok == token::TOK_VARIABLE_UNIQUE_ID || tok == token::TOK_VARIABLE_URL_ENCODED_ERROR || tok == token::TOK_VARIABLE_USER_ID || tok == token::TOK_VARIABLE_WEB_APP_ID || tok == token::TOK_VARIABLE_STATUS || tok == token::TOK_VARIABLE_STATUS_LINE || tok == token::TOK_VARIABLE_IP || tok == token::TOK_VARIABLE_GLOBAL || tok == token::TOK_VARIABLE_TX || tok == token::TOK_VARIABLE_SESSION || tok == token::TOK_VARIABLE_USER || tok == token::TOK_RUN_TIME_VAR_ENV || tok == token::TOK_RUN_TIME_VAR_XML || tok == token::TOK_ACTION_SETVAR || tok == token::TOK_SETVAR_OPERATION_EQUALS || tok == token::TOK_SETVAR_OPERATION_EQUALS_PLUS || tok == token::TOK_SETVAR_OPERATION_EQUALS_MINUS || tok == token::TOK_NOT || tok == token::TOK_OPERATOR_BEGINS_WITH || tok == token::TOK_OPERATOR_CONTAINS || tok == token::TOK_OPERATOR_CONTAINS_WORD || tok == token::TOK_OPERATOR_DETECT_SQLI || tok == token::TOK_OPERATOR_DETECT_XSS || tok == token::TOK_OPERATOR_ENDS_WITH || tok == token::TOK_OPERATOR_EQ || tok == token::TOK_OPERATOR_FUZZY_HASH || tok == token::TOK_OPERATOR_GEOLOOKUP || tok == token::TOK_OPERATOR_GE || tok == token::TOK_OPERATOR_GSB_LOOKUP || tok == token::TOK_OPERATOR_GT || tok == token::TOK_OPERATOR_INSPECT_FILE || tok == token::TOK_OPERATOR_IP_MATCH_FROM_FILE || tok == token::TOK_OPERATOR_IP_MATCH || tok == token::TOK_OPERATOR_LE || tok == token::TOK_OPERATOR_LT || tok == token::TOK_OPERATOR_PM_FROM_FILE || tok == token::TOK_OPERATOR_PM || tok == token::TOK_OPERATOR_RBL || tok == token::TOK_OPERATOR_RSUB || tok == token::TOK_OPERATOR_RX_CONTENT_ONLY || tok == token::TOK_OPERATOR_RX || tok == token::TOK_OPERATOR_RX_GLOBAL || tok == token::TOK_OPERATOR_STR_EQ || tok == token::TOK_OPERATOR_STR_MATCH || tok == token::TOK_OPERATOR_UNCONDITIONAL_MATCH || tok == token::TOK_OPERATOR_VALIDATE_BYTE_RANGE || tok == token::TOK_OPERATOR_VALIDATE_DTD || tok == token::TOK_OPERATOR_VALIDATE_HASH || tok == token::TOK_OPERATOR_VALIDATE_SCHEMA || tok == token::TOK_OPERATOR_VALIDATE_URL_ENCODING || tok == token::TOK_OPERATOR_VALIDATE_UTF8_ENCODING || tok == token::TOK_OPERATOR_VERIFY_CC || tok == token::TOK_OPERATOR_VERIFY_CPF || tok == token::TOK_OPERATOR_VERIFY_SSN || tok == token::TOK_OPERATOR_VERIFY_SVNR || tok == token::TOK_OPERATOR_WITHIN || tok == token::TOK_CONFIG_DIR_AUDIT_LOG_FMT || tok == token::TOK_JSON || tok == token::TOK_NATIVE || tok == token::TOK_ACTION_CTL_RULE_ENGINE); + } + #endif + #if 201103L <= YY_CPLUSPLUS +@@ -2873,6 +2876,21 @@ switch (yykind) + return symbol_type (token::TOK_VARIABLE_REQUEST_COOKIES_NAMES, l); + } + #endif ++#if 201103L <= YY_CPLUSPLUS ++ static ++ symbol_type ++ make_VARIABLE_MULTIPART_PART_HEADERS (location_type l) ++ { ++ return symbol_type (token::TOK_VARIABLE_MULTIPART_PART_HEADERS, std::move (l)); ++ } ++#else ++ static ++ symbol_type ++ make_VARIABLE_MULTIPART_PART_HEADERS (const location_type& l) ++ { ++ return symbol_type (token::TOK_VARIABLE_MULTIPART_PART_HEADERS, l); ++ } ++#endif + #if 201103L <= YY_CPLUSPLUS + static + symbol_type +@@ -7973,9 +7991,9 @@ switch (yykind) + /// Constants. + enum + { +- yylast_ = 3274, ///< Last index in yytable_. ++ yylast_ = 3344, ///< Last index in yytable_. + yynnts_ = 16, ///< Number of nonterminal symbols. +- yyfinal_ = 338 ///< Termination state number. ++ yyfinal_ = 339 ///< Termination state number. + }; + + +@@ -8053,10 +8071,10 @@ switch (yykind) + 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, + 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, + 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, +- 335, 336, 337, 338, 339, 340, 341, 342, 343 ++ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344 + }; + // Last valid token kind. +- const int code_max = 598; ++ const int code_max = 599; + + if (t <= 0) + return symbol_kind::S_YYEOF; +@@ -8626,7 +8644,7 @@ switch (yykind) + } + + } // yy +-#line 8630 "seclang-parser.hh" ++#line 8648 "seclang-parser.hh" + + + +diff --git a/src/parser/seclang-parser.yy b/src/parser/seclang-parser.yy +index 0cbbee08..332a30d1 100644 +--- a/src/parser/seclang-parser.yy ++++ b/src/parser/seclang-parser.yy +@@ -217,6 +217,7 @@ class Driver; + #include "src/variables/request_body_length.h" + #include "src/variables/request_cookies.h" + #include "src/variables/request_cookies_names.h" ++#include "src/variables/multipart_part_headers.h" + #include "src/variables/request_file_name.h" + #include "src/variables/request_headers.h" + #include "src/variables/request_headers_names.h" +@@ -352,6 +353,7 @@ using namespace modsecurity::operators; + VARIABLE_RESPONSE_HEADERS + VARIABLE_GEO + VARIABLE_REQUEST_COOKIES_NAMES ++ VARIABLE_MULTIPART_PART_HEADERS + VARIABLE_ARGS_COMBINED_SIZE + VARIABLE_ARGS_GET_NAMES + VARIABLE_RULE +@@ -2061,6 +2063,18 @@ var: + { + VARIABLE_CONTAINER($$, new variables::RequestCookiesNames_NoDictElement()); + } ++ | VARIABLE_MULTIPART_PART_HEADERS DICT_ELEMENT ++ { ++ VARIABLE_CONTAINER($$, new variables::MultipartPartHeaders_DictElement($2)); ++ } ++ | VARIABLE_MULTIPART_PART_HEADERS DICT_ELEMENT_REGEXP ++ { ++ VARIABLE_CONTAINER($$, new variables::MultipartPartHeaders_DictElementRegexp($2)); ++ } ++ | VARIABLE_MULTIPART_PART_HEADERS ++ { ++ VARIABLE_CONTAINER($$, new variables::MultipartPartHeaders_NoDictElement()); ++ } + | VARIABLE_RULE DICT_ELEMENT + { + VARIABLE_CONTAINER($$, new variables::Rule_DictElement($2)); +diff --git a/src/parser/seclang-scanner.cc b/src/parser/seclang-scanner.cc +index 99fd50ca..3aa6f520 100644 +--- a/src/parser/seclang-scanner.cc ++++ b/src/parser/seclang-scanner.cc +@@ -433,8 +433,8 @@ static void yynoreturn yy_fatal_error ( const char* msg ); + /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\ + (yy_c_buf_p) = yy_cp; + /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ +-#define YY_NUM_RULES 542 +-#define YY_END_OF_BUFFER 543 ++#define YY_NUM_RULES 544 ++#define YY_END_OF_BUFFER 545 + /* This struct is not used in this scanner, + but its presence is necessary. */ + struct yy_trans_info +@@ -442,7 +442,7 @@ struct yy_trans_info + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +-static const flex_int16_t yy_accept[3953] = ++static const flex_int16_t yy_accept[3966] = + { 0, + 0, 0, 0, 0, 273, 273, 281, 281, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -451,108 +451,108 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 285, 285, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 543, 535, 529, 266, 270, 271, +- 269, 272, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 535, 535, 289, 289, 542, 289, 289, ++ 0, 0, 0, 0, 545, 537, 531, 266, 270, 271, ++ 269, 272, 537, 537, 537, 537, 537, 537, 537, 537, ++ 537, 537, 537, 537, 537, 289, 289, 544, 289, 289, + + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 126, 273, 279, 281, +- 283, 277, 276, 278, 275, 281, 274, 493, 493, 492, +- 493, 493, 493, 121, 120, 119, 128, 128, 128, 135, ++ 283, 277, 276, 278, 275, 281, 274, 495, 495, 494, ++ 495, 495, 495, 121, 120, 119, 128, 128, 128, 135, + 127, 128, 130, 130, 130, 129, 135, 130, 133, 133, +- 133, 132, 135, 131, 133, 534, 534, 534, 542, 495, +- 494, 444, 447, 542, 447, 444, 444, 444, 433, 433, +- 433, 436, 438, 433, 437, 433, 427, 433, 503, 503, +- 503, 502, 507, 503, 505, 505, 505, 504, 507, 505, ++ 133, 132, 135, 131, 133, 536, 536, 536, 544, 497, ++ 496, 446, 449, 544, 449, 446, 446, 446, 435, 435, ++ 435, 438, 440, 435, 439, 435, 429, 435, 505, 505, ++ 505, 504, 509, 505, 507, 507, 507, 506, 509, 507, + 118, 118, 110, 118, 115, 109, 118, 118, 118, 118, + + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, +- 118, 118, 118, 118, 113, 118, 112, 542, 512, 542, +- 508, 521, 542, 285, 286, 542, 499, 499, 498, 501, +- 499, 497, 497, 496, 501, 497, 150, 536, 537, 538, ++ 118, 118, 118, 118, 113, 118, 112, 544, 514, 544, ++ 510, 523, 544, 285, 286, 544, 501, 501, 500, 503, ++ 501, 499, 499, 498, 503, 499, 150, 538, 539, 540, + 137, 136, 137, 137, 137, 137, 137, 137, 141, 140, + 145, 146, 146, 145, 143, 142, 140, 148, 149, 149, +- 147, 148, 529, 266, 0, 269, 269, 269, 0, 0, ++ 147, 148, 531, 266, 0, 269, 269, 269, 0, 0, + 0, 0, 0, 0, 0, 0, 218, 0, 0, 0, +- 0, 0, 530, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 412, 0, 0, 0, ++ 0, 0, 532, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 414, 0, 0, 0, + +- 0, 0, 0, 0, 0, 0, 0, 0, 417, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 419, 0, + 0, 0, 0, 0, 122, 0, 125, 273, 279, 281, +- 283, 280, 281, 282, 283, 284, 529, 0, 0, 0, ++ 283, 280, 281, 282, 283, 284, 531, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 128, 0, 128, 128, 128, + 0, 134, 122, 128, 128, 130, 0, 0, 130, 130, + 130, 0, 130, 122, 130, 133, 0, 0, 133, 133, +- 133, 0, 133, 122, 133, 534, 534, 534, 0, 532, +- 534, 444, 0, 444, 0, 444, 444, 0, 444, 444, +- 433, 0, 0, 432, 433, 433, 433, 0, 433, 506, +- +- 433, 433, 0, 432, 0, 433, 425, 426, 433, 433, +- 503, 0, 0, 503, 503, 503, 0, 503, 122, 503, +- 505, 0, 505, 505, 0, 505, 0, 0, 122, 505, +- 505, 0, 110, 0, 109, 0, 111, 115, 116, 0, ++ 133, 0, 133, 122, 133, 536, 536, 536, 0, 534, ++ 536, 446, 0, 446, 0, 446, 446, 0, 446, 446, ++ 435, 0, 0, 434, 435, 435, 435, 0, 435, 508, ++ ++ 435, 435, 0, 434, 0, 435, 427, 428, 435, 435, ++ 505, 0, 0, 505, 505, 505, 0, 505, 122, 505, ++ 507, 0, 507, 507, 0, 507, 0, 0, 122, 507, ++ 507, 0, 110, 0, 109, 0, 111, 115, 116, 0, + 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 105, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 107, 0, 0, 113, 0, 114, 112, +- 112, 0, 512, 0, 521, 0, 512, 510, 520, 0, +- 508, 521, 0, 0, 528, 0, 511, 0, 285, 286, ++ 112, 0, 514, 0, 523, 0, 514, 512, 522, 0, ++ 510, 523, 0, 0, 530, 0, 513, 0, 285, 286, + +- 0, 286, 0, 0, 499, 0, 499, 0, 500, 499, +- 497, 0, 0, 497, 0, 497, 536, 537, 538, 0, ++ 0, 286, 0, 0, 501, 0, 501, 0, 502, 501, ++ 499, 0, 0, 499, 0, 499, 538, 539, 540, 0, + 0, 0, 0, 0, 0, 138, 139, 145, 0, 0, + 145, 0, 145, 144, 148, 0, 0, 148, 0, 148, + 269, 0, 0, 0, 0, 0, 0, 0, 217, 0, +- 0, 0, 0, 0, 0, 0, 530, 531, 0, 0, +- 0, 395, 0, 0, 385, 0, 0, 0, 420, 0, ++ 0, 0, 0, 0, 0, 0, 532, 533, 0, 0, ++ 0, 397, 0, 0, 385, 0, 0, 0, 422, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 423, 0, 0, 0, 0, 393, 122, +- 123, 124, 0, 0, 0, 0, 465, 0, 466, 0, ++ 0, 0, 0, 425, 0, 0, 0, 0, 395, 122, ++ 123, 124, 0, 0, 0, 0, 467, 0, 468, 0, + +- 467, 0, 0, 470, 471, 473, 0, 0, 475, 0, +- 0, 0, 0, 0, 0, 466, 0, 0, 0, 128, ++ 469, 0, 0, 472, 473, 475, 0, 0, 477, 0, ++ 0, 0, 0, 0, 0, 468, 0, 0, 0, 128, + 0, 0, 122, 123, 0, 130, 0, 0, 122, 123, +- 0, 133, 0, 0, 122, 123, 532, 533, 444, 0, +- 444, 0, 439, 0, 439, 0, 444, 0, 433, 0, +- 0, 433, 0, 432, 0, 433, 433, 433, 433, 433, +- 0, 0, 0, 0, 433, 433, 433, 0, 503, 0, +- 0, 122, 123, 0, 505, 0, 0, 122, 122, 123, ++ 0, 133, 0, 0, 122, 123, 534, 535, 446, 0, ++ 446, 0, 441, 0, 441, 0, 446, 0, 435, 0, ++ 0, 435, 0, 434, 0, 435, 435, 435, 435, 435, ++ 0, 0, 0, 0, 435, 435, 435, 0, 505, 0, ++ 0, 122, 123, 0, 507, 0, 0, 122, 122, 123, + 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, + + 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 107, 108, 510, 520, 516, 519, 0, +- 523, 0, 0, 528, 0, 0, 511, 509, 518, 0, +- 0, 287, 0, 0, 499, 0, 0, 0, 497, 0, ++ 0, 0, 0, 107, 108, 512, 522, 518, 521, 0, ++ 525, 0, 0, 530, 0, 0, 513, 511, 520, 0, ++ 0, 287, 0, 0, 501, 0, 0, 0, 499, 0, + 0, 0, 0, 0, 0, 0, 145, 0, 0, 0, + 148, 0, 0, 269, 0, 0, 0, 0, 0, 169, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 224, 531, 361, 0, 0, 396, 0, 0, 386, 0, ++ 224, 533, 361, 0, 0, 398, 0, 0, 386, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 389, 0, 0, 0, 408, 0, 0, +- 418, 0, 0, 394, 123, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 472, 474, 0, 0, 0, 0, ++ 0, 0, 0, 391, 0, 0, 0, 410, 0, 0, ++ 420, 0, 0, 396, 123, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 474, 476, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 128, 0, 123, +- 130, 0, 123, 133, 0, 123, 533, 444, 0, 0, +- 0, 0, 444, 0, 0, 440, 445, 441, 440, 445, +- 441, 433, 0, 433, 433, 433, 0, 433, 0, 0, +- 0, 0, 433, 0, 432, 0, 433, 433, 428, 434, ++ 130, 0, 123, 133, 0, 123, 535, 446, 0, 0, ++ 0, 0, 446, 0, 0, 442, 447, 443, 442, 447, ++ 443, 435, 0, 435, 435, 435, 0, 435, 0, 0, ++ 0, 0, 435, 0, 434, 0, 435, 435, 430, 436, + +- 429, 428, 434, 429, 0, 0, 433, 433, 503, 0, +- 123, 505, 0, 123, 123, 0, 0, 0, 0, 0, ++ 431, 430, 436, 431, 0, 0, 435, 435, 505, 0, ++ 123, 507, 0, 123, 123, 0, 0, 0, 0, 0, + 0, 0, 0, 5, 0, 0, 7, 0, 0, 0, + 8, 0, 0, 0, 49, 0, 0, 0, 13, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 63, 0, 0, 108, 516, +- 519, 515, 523, 0, 526, 0, 0, 522, 0, 0, +- 509, 518, 514, 517, 287, 0, 288, 499, 0, 497, ++ 0, 0, 0, 0, 0, 63, 0, 0, 108, 518, ++ 521, 517, 525, 0, 528, 0, 0, 524, 0, 0, ++ 511, 520, 516, 519, 287, 0, 288, 501, 0, 499, + + 0, 0, 0, 0, 0, 145, 0, 148, 0, 269, + 269, 214, 0, 0, 216, 0, 0, 0, 0, 0, +@@ -560,75 +560,75 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 362, 0, + 0, 0, 377, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 390, 0, +- 0, 0, 0, 0, 0, 424, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 491, ++ 0, 0, 0, 0, 0, 0, 0, 0, 392, 0, ++ 0, 0, 0, 0, 0, 426, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 493, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 0, 0, 0, 0, 0, 0, 0, 442, 442, 442, +- 0, 0, 430, 430, 0, 0, 0, 433, 433, 0, +- 430, 0, 433, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 444, 444, 444, ++ 0, 0, 432, 432, 0, 0, 0, 435, 435, 0, ++ 432, 0, 435, 0, 0, 0, 0, 0, 0, 0, + 26, 0, 0, 2, 0, 4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, + 14, 0, 0, 16, 0, 0, 53, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 75, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 515, 526, 0, 527, 522, 0, 524, 0, ++ 0, 0, 517, 528, 0, 529, 524, 0, 526, 0, + +- 514, 517, 513, 288, 0, 0, 0, 0, 0, 0, ++ 516, 519, 515, 288, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 269, 269, 0, 0, 0, + 170, 0, 0, 221, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, +- 0, 0, 0, 0, 0, 0, 378, 0, 0, 411, ++ 0, 0, 0, 0, 0, 0, 378, 0, 0, 413, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 415, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 417, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 359, 0, 0, 0, 0, + +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 477, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 446, +- 443, 446, 443, 435, 431, 435, 431, 0, 430, 0, +- 0, 0, 433, 0, 0, 0, 1, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 479, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 448, ++ 445, 448, 445, 437, 433, 437, 433, 0, 432, 0, ++ 0, 0, 435, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 41, 41, 0, 8, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 84, 0, 0, 0, 0, 74, 0, 92, 0, 0, +- 0, 0, 0, 0, 0, 0, 527, 524, 0, 525, ++ 0, 0, 0, 0, 0, 0, 529, 526, 0, 527, + +- 513, 0, 0, 0, 269, 269, 0, 0, 0, 0, ++ 515, 0, 0, 0, 269, 269, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 260, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 419, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 421, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 414, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 416, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 0, 0, 0, 461, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 463, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, + 0, 0, 41, 0, 41, 41, 0, 0, 0, 0, + 0, 0, 0, 50, 0, 0, 15, 0, 0, 52, + 0, 54, 22, 55, 56, 58, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 64, 0, 0, 65, 525, 0, 0, 269, 269, ++ 0, 64, 0, 0, 65, 527, 0, 0, 269, 269, + 0, 0, 0, 219, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 363, 0, 0, 0, 398, 0, 0, ++ 0, 0, 0, 363, 0, 0, 0, 400, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 413, 0, 0, +- 0, 0, 422, 0, 0, 401, 0, 0, 404, 405, +- 406, 0, 0, 0, 0, 360, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 469, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 415, 0, 0, ++ 0, 0, 424, 0, 0, 403, 0, 0, 406, 407, ++ 408, 0, 0, 0, 0, 360, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 471, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 27, 0, 0, 0, 0, 0, 0, +@@ -637,7 +637,7 @@ static const flex_int16_t yy_accept[3953] = + 57, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 97, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 64, 0, 269, 269, +- 0, 0, 0, 0, 539, 0, 0, 262, 0, 0, ++ 0, 0, 0, 0, 541, 0, 0, 262, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -646,10 +646,10 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 364, 0, 0, 365, 297, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 325, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 421, 0, 0, +- 0, 0, 356, 0, 0, 403, 409, 407, 357, 0, +- 0, 0, 463, 0, 0, 464, 0, 0, 0, 0, +- 468, 0, 476, 478, 0, 0, 486, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 423, 0, 0, ++ 0, 0, 356, 0, 0, 405, 411, 409, 357, 0, ++ 0, 0, 465, 0, 0, 466, 0, 0, 0, 0, ++ 470, 0, 478, 480, 0, 0, 488, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 40, 0, 40, 0, 0, + +@@ -668,9 +668,9 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 402, 0, 0, 0, +- 0, 0, 0, 481, 0, 490, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 487, 488, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 404, 0, 0, 0, ++ 0, 0, 0, 483, 0, 492, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 489, 490, 0, 0, 0, + 0, 0, 0, 25, 0, 25, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 46, 48, 0, + 48, 10, 11, 0, 0, 0, 0, 0, 0, 0, +@@ -679,7 +679,7 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 93, 0, 0, 0, 0, +- 0, 269, 0, 267, 267, 267, 267, 267, 0, 540, ++ 0, 269, 0, 267, 267, 267, 267, 267, 0, 542, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 193, 0, 0, +@@ -689,196 +689,197 @@ static const flex_int16_t yy_accept[3953] = + 0, 0, 0, 0, 0, 294, 0, 0, 369, 367, + 0, 0, 0, 0, 0, 303, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 327, 328, 329, 400, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 345, 0, 0, 0, 0, 0, +- 353, 354, 355, 416, 0, 0, 479, 0, 0, 452, +- 449, 0, 0, 472, 0, 0, 0, 0, 0, 0, +- 0, 489, 0, 0, 458, 0, 455, 0, 0, 0, +- 0, 25, 0, 0, 0, 26, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 44, 44, 0, 0, 48, ++ 0, 327, 328, 329, 402, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 345, 0, 0, 0, 0, ++ 0, 353, 354, 355, 418, 0, 0, 481, 0, 0, ++ 454, 451, 0, 0, 474, 0, 0, 0, 0, 0, ++ 0, 0, 491, 0, 0, 460, 0, 457, 0, 0, ++ 0, 0, 25, 0, 0, 0, 26, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 44, 44, 0, 0, ++ ++ 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 61, 0, 0, 0, 91, 0, 78, 77, ++ 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 94, 80, 83, 81, 0, 269, 269, ++ 0, 0, 0, 0, 222, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 232, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 245, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, ++ 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 370, 368, 0, ++ 0, 300, 0, 0, 375, 0, 399, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 61, 0, 0, 0, 91, 0, 78, 77, 0, +- 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 94, 80, 83, 81, 0, 269, 269, 0, +- 0, 0, 0, 222, 0, 0, 0, 0, 0, 0, ++ 0, 326, 0, 0, 0, 337, 0, 0, 0, 341, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 232, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 245, 0, 0, 0, 0, ++ 0, 453, 482, 0, 0, 0, 485, 0, 0, 0, ++ 0, 0, 459, 0, 0, 0, 0, 24, 0, 0, ++ 24, 0, 0, 0, 0, 0, 0, 0, 0, 6, + +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, ++ 0, 44, 44, 0, 44, 0, 44, 44, 0, 0, ++ 47, 0, 0, 47, 0, 0, 0, 0, 0, 0, ++ 0, 0, 106, 0, 0, 0, 59, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 370, 368, 0, 0, +- 300, 0, 0, 375, 0, 397, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 326, +- 0, 0, 0, 337, 0, 0, 0, 341, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 451, +- 480, 0, 0, 0, 483, 0, 0, 0, 0, 0, +- 457, 0, 0, 0, 0, 24, 0, 0, 24, 0, +- 0, 0, 0, 0, 0, 0, 0, 6, 0, 44, +- +- 44, 0, 44, 0, 44, 44, 0, 0, 47, 0, +- 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, +- 106, 0, 0, 0, 59, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 268, +- 268, 268, 268, 268, 215, 0, 0, 0, 0, 0, +- 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 242, 0, 0, 0, 0, 0, 0, +- 0, 175, 0, 0, 0, 0, 0, 0, 243, 0, +- +- 0, 0, 192, 0, 0, 0, 0, 191, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 236, 0, 0, +- 0, 0, 0, 154, 154, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 376, 0, 0, 0, ++ 0, 268, 268, 268, 268, 268, 215, 0, 0, 0, ++ 0, 0, 167, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 242, 0, 0, 0, 0, ++ 0, 0, 0, 175, 0, 0, 0, 0, 0, 0, ++ ++ 243, 0, 0, 0, 192, 0, 0, 0, 0, 191, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 236, ++ 0, 0, 0, 0, 0, 154, 154, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 376, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 331, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 346, 0, 0, 0, 0, 0, 0, 462, +- 0, 0, 0, 484, 0, 0, 0, 0, 0, 0, +- 24, 25, 26, 0, 0, 0, 0, 0, 0, 103, +- 44, 43, 44, 44, 43, 0, 0, 44, 43, 0, +- +- 0, 44, 43, 44, 44, 45, 47, 48, 0, 0, +- 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, ++ 0, 0, 0, 0, 0, 331, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 346, 0, 0, 0, 0, ++ 0, 0, 464, 0, 0, 0, 486, 0, 0, 0, ++ 0, 0, 0, 24, 25, 26, 0, 0, 0, 0, ++ 0, 0, 103, 44, 43, 44, 44, 43, 0, 0, ++ ++ 44, 43, 0, 0, 44, 43, 44, 44, 45, 47, ++ 48, 0, 0, 0, 50, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 88, 0, 0, 0, 0, 0, 0, +- 220, 0, 0, 162, 0, 164, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 240, 0, 0, 0, 0, +- 0, 0, 0, 233, 0, 0, 0, 0, 0, 0, +- 250, 0, 0, 265, 265, 0, 0, 0, 0, 0, ++ 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 88, 0, 0, 0, ++ 0, 0, 0, 220, 0, 0, 162, 0, 164, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 240, 0, ++ 0, 0, 0, 0, 0, 0, 233, 0, 0, 0, ++ 0, 0, 0, 250, 0, 0, 265, 265, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +- 0, 0, 0, 210, 0, 0, 0, 0, 0, 0, +- 0, 0, 291, 0, 0, 391, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 210, 0, 0, 0, ++ 0, 0, 0, 0, 0, 291, 0, 0, 393, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 321, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 342, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 321, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 342, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 44, 0, 43, +- 0, 44, 44, 43, 0, 43, 0, 0, 43, 0, +- 0, 45, 43, 45, 45, 43, 0, 44, 43, 44, +- 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 44, 0, 43, 0, 44, 44, 43, 0, 43, ++ 0, 0, 43, 0, 0, 45, 43, 45, 45, 43, ++ 0, 44, 43, 44, 0, 0, 0, 0, 50, 0, + +- 0, 0, 0, 0, 0, 0, 60, 0, 60, 0, +- 60, 0, 0, 71, 70, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 87, 69, 82, 0, +- 0, 0, 171, 0, 0, 0, 0, 0, 0, 174, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, +- 0, 0, 0, 0, 0, 247, 246, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 237, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 153, 0, 0, 0, 0, 292, +- 295, 0, 392, 0, 0, 0, 0, 0, 0, 0, +- +- 0, 0, 0, 0, 0, 0, 0, 0, 320, 0, +- 0, 0, 0, 0, 0, 0, 0, 379, 0, 381, +- 0, 344, 0, 0, 0, 352, 0, 0, 0, 0, +- 0, 485, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 35, 0, 0, 42, 44, 42, 0, 44, 42, +- 0, 0, 42, 44, 0, 42, 0, 42, 45, 45, +- 42, 45, 26, 0, 18, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, +- 0, 0, 96, 96, 0, 67, 0, 0, 0, 0, +- 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- +- 241, 0, 0, 0, 0, 0, 0, 0, 0, 261, +- 0, 178, 178, 0, 248, 0, 0, 0, 0, 0, ++ 60, 0, 60, 0, 60, 0, 0, 71, 70, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 87, 69, 82, 0, 0, 0, 171, 0, 0, 0, ++ 0, 0, 0, 174, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 176, 0, 0, 0, 0, 0, 247, ++ 246, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 237, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 153, 0, ++ 0, 0, 0, 292, 295, 0, 394, 0, 0, 0, ++ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 320, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 379, 0, 381, 0, 344, 0, 0, 0, ++ 352, 0, 0, 0, 0, 0, 487, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 35, 0, 0, 42, ++ 44, 42, 0, 44, 42, 0, 0, 42, 44, 0, ++ 42, 0, 42, 45, 45, 42, 45, 26, 0, 18, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 211, 0, 0, 0, 153, 0, 0, 296, 0, +- 0, 0, 399, 0, 0, 302, 0, 0, 0, 0, ++ 0, 60, 0, 0, 0, 0, 0, 96, 96, 0, ++ 67, 0, 0, 0, 0, 98, 0, 0, 0, 0, ++ ++ 0, 0, 0, 0, 0, 241, 0, 0, 0, 0, ++ 0, 0, 0, 0, 261, 0, 178, 178, 0, 248, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 211, 0, 0, 0, ++ 153, 0, 0, 296, 0, 0, 0, 401, 0, 0, ++ 302, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 335, 0, ++ 380, 0, 338, 382, 0, 343, 0, 383, 0, 358, ++ 0, 470, 0, 0, 0, 0, 0, 0, 0, 28, ++ ++ 0, 0, 0, 0, 0, 0, 42, 42, 0, 42, ++ 0, 44, 0, 42, 45, 43, 45, 45, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, ++ 0, 0, 0, 0, 68, 66, 100, 0, 0, 0, ++ 0, 0, 0, 168, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 229, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 256, 0, 0, 0, 238, 0, 0, 0, 234, ++ 234, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0, ++ ++ 0, 0, 0, 317, 0, 0, 0, 0, 0, 0, ++ 330, 334, 0, 0, 0, 0, 384, 0, 351, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 335, 0, 380, 0, 338, 382, 0, 343, +- 0, 383, 0, 358, 0, 468, 0, 0, 0, 0, +- 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, +- +- 42, 42, 0, 42, 0, 44, 0, 42, 45, 43, +- 45, 45, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 60, 0, 0, 0, 0, 0, 0, 68, 66, +- 100, 0, 0, 0, 0, 0, 0, 168, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 229, 0, 0, ++ 0, 0, 0, 0, 43, 43, 45, 45, 43, 45, ++ 0, 0, 0, 0, 0, 0, 60, 0, 72, 0, ++ 76, 0, 0, 0, 0, 0, 101, 0, 0, 0, ++ 0, 0, 165, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 177, 0, 249, 0, 0, 0, 543, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 256, 0, 0, 0, 238, +- 0, 0, 0, 234, 234, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 371, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 317, 0, 0, +- +- 0, 0, 0, 330, 334, 0, 0, 0, 0, 384, +- 0, 351, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 43, 43, 45, +- 45, 43, 45, 0, 0, 0, 0, 0, 0, 60, +- 0, 72, 0, 76, 0, 0, 0, 0, 0, 101, +- 0, 0, 0, 0, 0, 165, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 177, 0, 249, 0, 0, +- 0, 541, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 208, 0, 290, 0, 372, 0, +- +- 301, 373, 0, 0, 0, 0, 311, 0, 0, 0, ++ ++ 0, 208, 0, 290, 0, 372, 0, 301, 373, 0, ++ 0, 0, 0, 311, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 482, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, +- 0, 0, 0, 60, 0, 89, 95, 95, 0, 86, +- 0, 181, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 155, 0, 0, 251, 180, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 195, 195, 0, ++ 0, 0, 484, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, ++ 0, 60, 0, 89, 95, 95, 0, 86, 0, 181, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 213, 0, 298, 299, 374, 0, 0, 0, 0, 310, ++ 155, 0, 0, 251, 180, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 195, 195, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 213, 0, + +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 324, +- 0, 336, 0, 0, 0, 0, 0, 410, 0, 0, ++ 298, 299, 374, 0, 0, 0, 0, 310, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 324, 0, ++ 336, 0, 0, 0, 0, 0, 412, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 156, +- 0, 166, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 187, 0, 0, 0, 0, 0, 0, +- 0, 0, 196, 196, 0, 198, 198, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 212, 225, 0, 0, +- 0, 307, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 450, 0, +- +- 0, 0, 456, 0, 0, 29, 0, 0, 0, 36, ++ 0, 0, 0, 0, 0, 0, 0, 0, 156, 0, ++ 166, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 187, 0, 0, 0, 0, 0, 0, 0, ++ 0, 196, 196, 0, 198, 198, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 212, 225, 0, 0, 0, ++ 307, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ ++ 0, 0, 0, 0, 0, 0, 0, 0, 452, 0, ++ 0, 0, 458, 0, 0, 29, 0, 0, 0, 36, + 0, 0, 19, 0, 0, 85, 99, 0, 0, 163, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 185, 0, 0, 190, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 194, 0, 0, 0, 308, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 387, 339, 0, 348, 0, +- 453, 0, 0, 459, 0, 0, 0, 0, 37, 0, +- 20, 0, 161, 228, 228, 0, 161, 157, 0, 0, +- 0, 264, 0, 252, 0, 231, 0, 0, 0, 0, +- +- 0, 0, 0, 0, 189, 0, 0, 197, 199, 0, +- 0, 0, 0, 152, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 315, 0, 0, 0, 322, +- 0, 0, 388, 340, 0, 349, 454, 0, 460, 0, +- 34, 0, 0, 21, 0, 0, 0, 158, 0, 0, +- 253, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 152, 0, 0, 209, 0, +- 0, 306, 0, 0, 0, 0, 0, 0, 0, 333, +- 347, 350, 0, 0, 0, 0, 160, 0, 0, 239, +- 0, 0, 0, 230, 0, 0, 263, 0, 0, 0, +- ++ 0, 0, 0, 0, 0, 0, 387, 339, 0, 348, ++ 0, 455, 0, 0, 461, 0, 0, 0, 0, 37, ++ 0, 20, 0, 161, 228, 228, 0, 161, 157, 0, ++ ++ 0, 0, 264, 0, 252, 0, 231, 0, 0, 0, ++ 0, 0, 0, 0, 0, 189, 0, 0, 197, 199, ++ 0, 0, 0, 0, 152, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 315, 0, 0, 389, ++ 0, 322, 0, 0, 388, 340, 0, 349, 456, 0, ++ 462, 0, 34, 0, 0, 21, 0, 0, 0, 158, ++ 0, 0, 253, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 152, 0, 0, ++ 209, 0, 0, 306, 0, 0, 0, 0, 0, 390, ++ 0, 0, 333, 347, 350, 0, 0, 0, 0, 160, ++ ++ 0, 0, 239, 0, 0, 0, 230, 0, 0, 263, ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 312, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, 159, 151, ++ 0, 0, 0, 0, 0, 0, 184, 0, 0, 226, ++ 226, 0, 207, 0, 205, 0, 0, 0, 257, 0, ++ 304, 0, 0, 0, 316, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 151, 0, 0, 0, 0, 0, ++ 188, 0, 0, 0, 203, 0, 201, 0, 258, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 312, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 159, 151, 0, 0, 0, +- 0, 0, 0, 184, 0, 0, 226, 226, 0, 207, +- 0, 205, 0, 0, 0, 257, 0, 304, 0, 0, +- 0, 316, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 151, 0, 0, 0, 0, 0, 188, 0, 0, +- 0, 203, 0, 201, 0, 258, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 38, 0, 172, +- 172, 0, 0, 0, 0, 0, 0, 0, 206, 204, +- +- 0, 0, 0, 0, 0, 318, 319, 0, 332, 0, +- 0, 0, 0, 39, 0, 259, 179, 0, 0, 186, +- 0, 202, 200, 0, 0, 0, 323, 0, 0, 0, +- 31, 173, 183, 0, 227, 305, 309, 0, 33, 30, +- 0, 182, 0, 0, 0, 0, 314, 0, 0, 0, +- 32, 0 ++ ++ 38, 0, 172, 172, 0, 0, 0, 0, 0, 0, ++ 0, 206, 204, 0, 0, 0, 0, 0, 318, 319, ++ 0, 332, 0, 0, 0, 0, 39, 0, 259, 179, ++ 0, 0, 186, 0, 202, 200, 0, 0, 0, 323, ++ 0, 0, 0, 31, 173, 183, 0, 227, 305, 309, ++ 0, 33, 30, 0, 182, 0, 0, 0, 0, 314, ++ 0, 0, 0, 32, 0 + } ; + + static const YY_CHAR yy_ec[256] = +@@ -926,953 +927,955 @@ static const YY_CHAR yy_meta[88] = + 15, 15, 15, 15, 17, 18, 1 + } ; + +-static const flex_int16_t yy_base[4238] = ++static const flex_int16_t yy_base[4251] = + { 0, + 0, 80, 161, 0, 4, 8, 14, 247, 21, 87, + 101, 254, 25, 40, 53, 261, 265, 275, 284, 290, +- 94, 304,11621,11620,11617,11573, 324, 347, 365, 383, ++ 94, 304,11801,11718,11649,11643, 324, 347, 365, 383, + 413, 434, 314, 448, 335, 397, 505, 0, 457, 464, + 591, 597, 603, 609, 419, 425, 271, 298, 102, 612, +- 11569,11568,11565,11539,11533,11532,11529,11504, 614, 622, +- 0, 0,11472,11471, 428, 611, 646, 668, 0, 0, +- 57, 79, 620, 627,11497,14261, 673,14261,14261,14261, +- 308,14261, 4, 25, 59, 52, 71, 72, 96, 279, +- 315, 97, 220, 271, 8,14261, 443,14261, 655, 269, ++ 11644,11641,11597,11591,11590,11587,11561,11555, 614, 622, ++ 0, 0,11528,11525, 428, 611, 646, 668, 0, 0, ++ 57, 79, 620, 627,11529,14283, 673,14283,14283,14283, ++ 308,14283, 4, 25, 59, 52, 71, 72, 96, 279, ++ 315, 97, 220, 271, 8,14283, 443,14283, 655, 269, + + 312, 578, 673, 330, 429, 681, 327, 358, 368, 686, +- 679, 699, 707, 421, 422, 38,11479, 133, 765, 771, +- 783,14261,14261,14261,14261, 789,14261,14261, 631,14261, +- 815, 76, 764,14261,14261,14261, 278, 798, 348, 417, +- 11426, 801, 372, 829, 752,11425, 540, 814, 855, 895, +- 883,11422, 546,11414, 904, 830, 901,14261, 913,14261, +- 14261, 918,11408,11407,11404, 924, 957, 964, 934, 980, +- 991,11315, 601, 1012,11109, 1024, 725, 1042, 770, 1054, +- 831,11103, 625, 1063, 645, 978, 802, 867, 663, 1072, +- 14261, 1081,14261,11156, 484, 475, 1047, 719, 764, 874, ++ 679, 699, 707, 421, 422, 38,11513, 133, 765, 771, ++ 783,14283,14283,14283,14283, 789,14283,14283, 631,14283, ++ 815, 76, 764,14283,14283,14283, 278, 798, 348, 417, ++ 11465, 801, 372, 829, 752,11462, 540, 814, 855, 895, ++ 883,11454, 546,11448, 904, 830, 901,14283, 913,14283, ++ 14283, 918,11447,11444,11436, 924, 957, 964, 934, 980, ++ 991,11430, 601, 1012,11429, 1024, 725, 1042, 770, 1054, ++ 831,11426, 625, 1063, 645, 978, 802, 867, 663, 1072, ++ 14283, 1081,14283,11391, 484, 475, 1047, 719, 764, 874, + + 717, 940, 752, 1056, 800, 953, 1064, 818, 1059, 917, +- 821, 885, 405, 1139,14261,11153, 1143, 1147, 476, 309, +- 1153, 1159, 410, 1011, 490, 493, 1096, 1114,11055, 911, +- 1122, 1124, 1129,11049, 943, 1158,14261, 0, 0, 0, +- 14261,14261, 990, 1017, 1053, 1062, 1105, 1118,14261, 120, +- 1162,11048, 1113, 1168,14261,14261, 282, 1178,11045, 1116, +- 10966, 1199, 1200,14261, 495, 0, 1187,10954, 1135, 1140, +- 1144, 1149, 1180, 1172, 1168, 1184,14261, 1173, 1178, 1184, +- 1199, 1182, 636,11013, 1229, 620, 1196, 1187, 1190, 1187, ++ 821, 885, 405, 1139,14283,11185, 1143, 1147, 476, 309, ++ 1153, 1159, 410, 1011, 490, 493, 1096, 1114,11125, 911, ++ 1122, 1124, 1129,11124, 943, 1158,14283, 0, 0, 0, ++ 14283,14283, 990, 1017, 1053, 1062, 1105, 1118,14283, 120, ++ 1162,11121, 1113, 1168,14283,14283, 282, 1178,11077, 1116, ++ 11071, 1199, 1200,14283, 495, 0, 1187,11064, 1135, 1140, ++ 1144, 1149, 1180, 1172, 1168, 1184,14283, 1173, 1178, 1184, ++ 1199, 1182, 636,11121, 1229, 620, 1196, 1187, 1190, 1187, + 1198, 1200, 1198, 1199, 1213, 1221, 297, 1205, 1225, 1220, + + 1213, 1214, 1234, 1230, 1232, 1236, 1245, 1237, 735, 1243, +- 1246, 1254, 1261, 1252, 641,11010,10902, 642, 1321, 1327, +- 1333,14261, 1293,14261, 1304,14261, 1294, 1279, 1270, 1283, ++ 1246, 1254, 1261, 1252, 641,11042,10954, 642, 1321, 1327, ++ 1333,14283, 1293,14283, 1304,14283, 1294, 1279, 1270, 1283, + 1297, 1268, 1304, 1311, 1298, 1302, 1317, 1302, 1314, 1328, +- 1321, 1329, 1354, 1321, 1339, 920,10924, 670, 1395, 1405, +- 1400,14261, 1409, 1410, 1406, 1416,10923,10920, 998, 1423, +- 1431, 1417, 1429, 1435, 1440, 1439,10912,10906, 1391, 1454, +- 1467, 1448, 1468, 1474, 1484, 1498, 1504,14261, 1510, 933, +- 1514, 1525,10905, 1518,10952, 1541, 1561, 346, 1578, 1584, +- 1585,10777,10773, 1609, 1527, 1624, 1642, 1500, 1648,14261, +- +- 1673, 1677, 1615, 1707, 842, 1708,14261,14261, 1733, 1739, +- 1488,10737,10687, 1005, 1722, 1549, 1633, 1684, 1745, 1701, +- 1568,10669, 1172, 1751, 1671, 1599, 1664, 1605, 1764, 1767, +- 1734, 1780,14261,10705, 949, 816,14261, 1784,14261,10701, ++ 1321, 1329, 1354, 1321, 1339, 920,10981, 670, 1395, 1405, ++ 1400,14283, 1409, 1410, 1406, 1416,10978,10952, 998, 1423, ++ 1431, 1417, 1429, 1435, 1440, 1439,10946,10945, 1391, 1454, ++ 1467, 1448, 1468, 1474, 1484, 1498, 1504,14283, 1510, 933, ++ 1514, 1525,10942, 1518,10984, 1541, 1561, 346, 1578, 1584, ++ 1585,10928,10927, 1609, 1527, 1624, 1642, 1500, 1648,14283, ++ ++ 1673, 1677, 1615, 1707, 842, 1708,14283,14283, 1733, 1739, ++ 1488,10924,10799, 1005, 1722, 1549, 1633, 1684, 1745, 1701, ++ 1568,10795, 1172, 1751, 1671, 1599, 1664, 1605, 1764, 1767, ++ 1734, 1780,14283,10813, 949, 816,14283, 1784,14283,10763, + 1463, 1335, 1402, 1444, 1474, 1477, 1503, 1529, 1581, 1753, +- 1658, 1746,10604, 1734, 1739, 1728, 1761, 1758, 1774, 1771, +- 14261, 1761, 1780, 1778, 1780, 1771, 1767, 1779, 1798, 1829, +- 1793, 1800, 1811, 1533,10589, 1880,14261,10583,14261, 1907, +- 1911, 1915, 1567, 701, 1921, 1075, 1691, 1560, 1847,10582, ++ 1658, 1746,10720, 1734, 1739, 1728, 1761, 1758, 1774, 1771, ++ 14283, 1761, 1780, 1778, 1780, 1771, 1767, 1779, 1798, 1829, ++ 1793, 1800, 1811, 1533,10727, 1880,14283,10723,14283, 1907, ++ 1911, 1915, 1567, 701, 1921, 1075, 1691, 1560, 1847,10651, + 1927, 1936, 1861, 898, 1755, 1100, 1886, 1035, 1940, 1854, + +- 1110, 1931, 1944,10579, 1943,10468, 1293, 1945,14261, 1947, +- 1949,10428,10422, 1428, 1951, 1953, 0, 0, 0, 1825, +- 1030, 1825, 1905, 1476, 1927,14261,14261, 1959,10421,10418, +- 1960, 1963, 1970,14261, 2011,10343,10307, 1976, 1984, 2022, +- 10235, 1931, 1948, 1952, 1957, 1969, 1970, 1980,14261, 1991, ++ 1110, 1931, 1944,10611, 1943,10551, 1293, 1945,14283, 1947, ++ 1949,10550,10547, 1428, 1951, 1953, 0, 0, 0, 1825, ++ 1030, 1825, 1905, 1476, 1927,14283,14283, 1959,10490,10450, ++ 1960, 1963, 1970,14283, 2011,10444,10443, 1976, 1984, 2022, ++ 10436, 1931, 1948, 1952, 1957, 1969, 1970, 1980,14283, 1991, + 1991, 1990, 1993, 2049, 1991, 1991, 1993, 2041, 1987, 2000, +- 2013, 1633, 2010, 2006, 1669, 2017, 2019, 2016,14261, 2029, ++ 2013, 1633, 2010, 2006, 1669, 2017, 2019, 2016,14283, 2029, + 2016, 2028, 2049, 2046, 2043, 2049, 2073, 2072, 2066, 2052, +- 2058, 2063, 2086,14261, 2087, 2101, 2089, 2107, 1948, 2065, +- 2069,14261, 2102, 2096, 2092, 2109,14261, 2088, 2102, 2116, ++ 2058, 2063, 2086,14283, 2087, 2101, 2089, 2107, 1948, 2065, ++ 2069,14283, 2102, 2096, 2092, 2109,14283, 2088, 2102, 2116, + +- 14261, 2101, 2108,14261,14261, 2117, 2112, 2104, 2120, 2110, ++ 14283, 2101, 2108,14283,14283, 2117, 2112, 2104, 2120, 2110, + 2126, 2118, 2113, 2113, 2119, 2128, 2141, 2135, 2123, 2180, +- 10121,10131, 2194, 2205,10113, 2188, 9761, 9370, 2209, 2216, +- 9369, 2215, 9340, 9367, 2226, 2233, 2198, 2207, 2250, 2175, +- 2273, 856, 2282, 9405, 2224, 1994, 2291, 9365, 2306, 9336, +- 9363, 2369, 2242, 2378, 2206, 2387, 2399, 2422, 2431, 2456, +- 9401, 2259, 2285, 2413, 2482, 2491, 2500, 9361, 2260, 9332, +- 9359, 2351, 2365, 2197, 2276, 9330, 9357, 2452, 2329, 2467, +- 14261, 2250, 2259, 2277, 2276, 2286, 2272, 2284, 9385, 2269, +- 2278, 2303, 2336, 2358, 2356, 2511, 2375, 2405, 2396, 9384, +- +- 2398, 2399, 2407,14261, 2437, 2441, 2442, 2470, 2467, 2483, +- 2490, 9383, 2487, 2510, 2492, 2482, 2491, 2512, 2521, 2497, ++ 10337,10329, 2194, 2205,10261, 2188,10143,10153, 2209, 2216, ++ 10135, 2215, 9783, 9392, 2226, 2233, 2198, 2207, 2250, 2175, ++ 2273, 856, 2282, 9430, 2224, 1994, 2291, 9390, 2306, 9361, ++ 9388, 2369, 2242, 2378, 2206, 2387, 2399, 2422, 2431, 2456, ++ 9426, 2259, 2285, 2413, 2482, 2491, 2500, 9386, 2260, 9357, ++ 9384, 2351, 2365, 2197, 2276, 9355, 9382, 2452, 2329, 2467, ++ 14283, 2250, 2259, 2277, 2276, 2286, 2272, 2284, 9410, 2269, ++ 2278, 2303, 2336, 2358, 2356, 2511, 2375, 2405, 2396, 9409, ++ ++ 2398, 2399, 2407,14283, 2437, 2441, 2442, 2470, 2467, 2483, ++ 2490, 9408, 2487, 2510, 2492, 2482, 2491, 2512, 2521, 2497, + 2517, 2498, 2537, 2517, 2515, 2532, 2530, 2538, 2529, 2551, +- 9382, 9381, 2534, 2254, 2303, 2339, 2607, 2344, 2613, 2614, +- 2360, 2621, 9405, 2398, 2628, 1372, 2629, 2579, 2635, 9404, +- 2636, 2606, 2642, 2539, 2597, 9321, 9348, 9347, 2638, 9318, +- 9345, 2590, 2587, 2590, 2598, 9310, 2646, 9281, 9308, 9306, +- 2656, 9277, 9293, 92, 2601, 2601, 2622, 2609, 2608,14261, ++ 9407, 9406, 2534, 2254, 2303, 2339, 2607, 2344, 2613, 2614, ++ 2360, 2621, 9430, 2398, 2628, 1372, 2629, 2579, 2635, 9429, ++ 2636, 2606, 2642, 2539, 2597, 9346, 9373, 9372, 2638, 9343, ++ 9370, 2590, 2587, 2590, 2598, 9369, 2646, 9340, 9367, 9332, ++ 2656, 9303, 9330, 92, 2601, 2601, 2622, 2609, 2608,14283, + 2610, 2622, 2630, 2636, 2618, 2640, 2651, 2669, 2671, 2668, + 2633, 2650, 2651, 2672, 2676, 2659, 2685, 2679, 2672, 2690, + +- 14261, 2735, 2716, 9255, 2675,14261, 2689, 9254,14261, 2710, +- 2710, 2696, 2714, 2720, 2717, 2713, 9251, 2705, 2711, 2717, +- 2728, 2713, 2720, 2241, 2732, 2729, 2719, 9246, 2720, 2728, +- 2777, 2730, 2743,14261, 2777, 2742, 2735, 2752, 2748, 2745, +- 2760, 2761, 2761, 2777, 2762,14261, 2779, 2770, 2779, 2772, ++ 14283, 2735, 2716, 9327, 2675,14283, 2689, 9326,14283, 2710, ++ 2710, 2696, 2714, 2720, 2717, 2713, 9314, 2705, 2711, 2717, ++ 2728, 2713, 2720, 2241, 2732, 2729, 2719, 9277, 2720, 2728, ++ 2777, 2730, 2743,14283, 2777, 2742, 2735, 2752, 2748, 2745, ++ 2760, 2761, 2761, 2777, 2762,14283, 2779, 2770, 2779, 2772, + 2779, 2780, 2782, 2786, 2781, 2779, 2787, 1723, 2822, 2851, + 2402, 2848, 2855, 2818, 2857, 2866, 2864, 2875, 947, 2825, +- 2852, 9240, 2892, 42, 2865, 9199, 916, 9195,14261, 9230, +- 14261, 2891, 2886, 2915, 2924, 2945, 1309, 2975, 2873, 2927, +- 9223, 2968, 2993, 2989, 3033, 1837, 3037, 3058, 3046, 1847, ++ 2852, 9316, 2892, 42, 2865, 9276, 916, 9274,14283, 9312, ++ 14283, 2891, 2886, 2915, 2924, 2945, 1309, 2975, 2873, 2927, ++ 9309, 2968, 2993, 2989, 3033, 1837, 3037, 3058, 3046, 1847, + +- 3057,14261, 9222,14261, 989, 1878, 3090, 3094, 2817, 2909, ++ 3057,14283, 9308,14283, 989, 1878, 3090, 3094, 2817, 2909, + 3014, 2831, 2908, 2966, 2884, 2852, 2911, 2945, 2949, 2965, +- 2958, 2985, 3062,14261, 3048, 3051,14261, 9125, 3037, 3108, +- 3133, 3055, 3058, 3070,14261, 3081, 3088, 3099,14261, 3102, +- 3104, 3105, 3086, 3094, 3091, 8916, 3094, 3101, 3100, 3122, ++ 2958, 2985, 3062,14283, 3048, 3051,14283, 9249, 3037, 3108, ++ 3133, 3055, 3058, 3070,14283, 3081, 3088, 3099,14283, 3102, ++ 3104, 3105, 3086, 3094, 3091, 9264, 3094, 3101, 3100, 3122, + 3123, 3132, 3118, 3147, 3123, 3130, 3146, 3138, 3133, 3150, +- 3130, 3142, 3152, 3143, 3135, 8902, 3148, 3145, 3152, 3166, +- 3157, 3161, 3155, 3161, 3168,14261, 8855, 3156, 2949, 3010, +- 3075, 3028, 3076, 3232, 3217, 3233, 3239, 3240, 3245, 8863, ++ 3130, 3142, 3152, 3143, 3135, 9245, 3148, 3145, 3152, 3166, ++ 3157, 3161, 3155, 3161, 3168,14283, 9096, 3156, 2949, 3010, ++ 3075, 3028, 3076, 3232, 3217, 3233, 3239, 3240, 3245, 9063, + 3246, 3251, 3252, 3257, 3258, 3263, 3264, 2957, 3262, 3220, + +- 3264, 3224, 3210, 3234, 2907, 3269, 3265, 3275, 3268, 8804, +- 8705,14261, 3232, 3231,14261, 3252, 3253, 3250, 3246, 3246, ++ 3264, 3224, 3210, 3234, 2907, 3269, 3265, 3275, 3268, 8881, ++ 8857,14283, 3232, 3231,14283, 3252, 3253, 3250, 3246, 3246, + 3268, 3250, 3265, 3269, 3272, 3258, 3268, 3257, 3310, 3266, + 3272, 3297, 3305, 3288, 3294, 3297, 3300, 3301, 3307, 3309, +- 3311, 3321, 3307, 3319, 3318, 3329, 3320, 3321,14261, 3359, ++ 3311, 3321, 3307, 3319, 3318, 3329, 3320, 3321,14283, 3359, + 3316, 3328, 3376, 3323, 3331, 3336, 3354, 3365, 3369, 3361, +- 3357, 3370, 8622, 3375, 3377, 3363, 3366, 3371,14261, 3368, +- 3372, 3369, 3413, 3386, 3389,14261, 3391, 3381, 3381, 3388, +- 3410, 3419, 3401, 3403, 3414, 3416, 3428, 3414, 3420,14261, ++ 3357, 3370, 8865, 3375, 3377, 3363, 3366, 3371,14283, 3368, ++ 3372, 3369, 3413, 3386, 3389,14283, 3391, 3381, 3381, 3388, ++ 3410, 3419, 3401, 3403, 3414, 3416, 3428, 3414, 3420,14283, + 3422, 3423, 3440, 3428, 3439, 3438, 3438, 3445, 3436, 3439, + +- 3451, 3431, 8594, 8617, 8575, 8602, 8543, 3505, 3499, 1508, +- 8563, 8534, 3517, 3500, 3479, 3485, 1344, 3526, 3538, 3539, +- 3592, 3571, 3604, 3541, 3613, 8501, 8433, 3469, 8431, 3499, +- 8486, 3513, 3510,14261, 3512,14261, 3526, 3556, 3573, 3580, +- 3567, 8443, 3588, 3660, 3580, 3576, 3588, 3587, 3593,14261, +- 14261, 8426, 3590,14261, 3600, 3606, 8436, 0, 3599, 3587, ++ 3451, 3431, 8836, 8860, 8778, 8788, 8753, 3505, 3499, 1508, ++ 8725, 8688, 3517, 3500, 3479, 3485, 1344, 3526, 3538, 3539, ++ 3592, 3571, 3604, 3541, 3613, 8706, 8656, 3469, 8610, 3499, ++ 8666, 3513, 3510,14283, 3512,14283, 3526, 3556, 3573, 3580, ++ 3567, 8638, 3588, 3660, 3580, 3576, 3588, 3587, 3593,14283, ++ 14283, 8550, 3590,14283, 3600, 3606, 8565, 0, 3599, 3587, + 3607, 3609, 3612, 3599, 3609, 3669, 3633, 3624, 3642, 3656, +- 3654, 3668, 3672, 3672, 3662, 3673, 3672, 3675,14261, 3676, +- 3669, 3674, 3669, 3673, 8418, 3678, 3674, 3683, 3685, 8385, +- 18, 8345, 3561, 3567, 3577, 3585, 3654, 3720, 3719, 3747, ++ 3654, 3668, 3672, 3672, 3662, 3673, 3672, 3675,14283, 3676, ++ 3669, 3674, 3669, 3673, 8512, 3678, 3674, 3683, 3685, 8453, ++ 18, 8431, 3561, 3567, 3577, 3585, 3654, 3720, 3719, 3747, + +- 3748, 3753, 3754, 3759, 3666, 8286, 8299, 8259, 3687, 3714, +- 3718, 8285, 8233, 8244, 8145, 8148, 8155, 3717, 3727, 3732, +- 14261, 3733, 3720,14261, 3726, 3732, 3721, 3734, 3736, 3730, ++ 3748, 3753, 3754, 3759, 3666, 8319, 8259, 8173, 3687, 3714, ++ 3718, 8200, 8158, 8147, 8094, 8062, 8031, 3717, 3727, 3732, ++ 14283, 3733, 3720,14283, 3726, 3732, 3721, 3734, 3736, 3730, + 3734, 3731, 3734, 3738, 3749, 3730, 3751, 3752, 3743, 3744, + 3739, 3750, 3743, 3757, 3777, 3784, 3776, 3771, 3777, 3789, +- 3776, 3774, 3777, 3793, 3795, 3797, 3786, 3801, 3798,14261, +- 3789, 3800, 3805, 3792, 3783, 3794,14261, 3835, 3806, 2941, +- 3792, 3809, 3811, 8166, 3817, 3830, 3831, 3828, 8052, 3823, +- 3830, 3848, 3833, 8047, 3839, 8046, 3855, 3841, 3843, 3850, +- 3855, 3857, 3857, 8038, 3848,14261, 3855, 3845, 3849, 3860, ++ 3776, 3774, 3777, 3793, 3795, 3797, 3786, 3801, 3798,14283, ++ 3789, 3800, 3805, 3792, 3783, 3794,14283, 3835, 3806, 2941, ++ 3792, 3809, 3811, 7988, 3817, 3830, 3831, 3828, 7987, 3823, ++ 3830, 3848, 3833, 7986, 3839, 7834, 3855, 3841, 3843, 3850, ++ 3855, 3857, 3857, 7822, 3848,14283, 3855, 3845, 3849, 3860, + +- 3850, 3862, 3866, 3879, 3885, 3898, 3900, 3891, 3903,14261, ++ 3850, 3862, 3866, 3879, 3885, 3898, 3900, 3891, 3903,14283, + 3886, 3903, 3907, 3884, 3896, 3891, 3897, 3909, 3913, 3927, +- 2307, 1689, 8052, 3928, 3971, 1903, 8033, 3964, 2395, 3989, +- 1749, 2447, 4015, 3931, 3914, 3955,14261, 3906, 3942, 3946, +- 3939, 3948, 3956, 3973, 3967, 0, 4033, 3957,14261, 3969, +- 3988, 3974, 4005, 3991, 4031, 4008, 4016, 4009, 8026, 4005, +- 7994, 7851, 7846, 7839, 7838, 4005, 4072, 4006, 7778, 7774, ++ 2307, 1689, 7858, 3928, 3971, 1903, 7803, 3964, 2395, 3989, ++ 1749, 2447, 4015, 3931, 3914, 3955,14283, 3906, 3942, 3946, ++ 3939, 3948, 3956, 3973, 3967, 0, 4033, 3957,14283, 3969, ++ 3988, 3974, 4005, 3991, 4031, 4008, 4016, 4009, 7787, 4005, ++ 7769, 7762, 7749, 7745, 7703, 4005, 4072, 4006, 7602, 7599, + 4018, 4010, 4024, 4014, 4026, 4030, 4041, 4045, 4030, 4052, +- 14261, 4072, 4055, 4057, 4079,14261, 4076, 4070, 4065, 4079, +- 4071, 4066, 966, 7741, 2483, 0, 3948, 3952, 4060, 3997, ++ 14283, 4072, 4055, 4057, 4079,14283, 4076, 4070, 4065, 4079, ++ 4071, 4066, 966, 7528, 2483, 0, 3948, 3952, 4060, 3997, + +- 4061, 3276, 4084, 4075, 7722, 7709, 4085, 4076, 4066, 4080, ++ 4061, 3276, 4084, 4075, 7431, 7418, 4085, 4076, 4066, 4080, + 4077, 4074, 4080, 4083, 4077, 4094, 4085, 4097, 4089, 4121, + 4100, 4097, 4125, 4124, 4114, 4134, 4122, 4123, 4136, 4136, + 4140, 4125, 4140, 4133, 4128, 4145, 4136, 4176, 4140, 4151, + 4137, 4159, 4152, 4161, 4167, 4186, 4175, 4169, 4183, 4178, +- 4186, 4181, 4185, 4188, 4188, 4203, 4196, 4193, 4190,14261, +- 7684, 7676, 7507, 4206, 4193, 4208, 4208, 4196, 4237, 7415, +- 7396, 4213, 4232, 4240, 4261, 4231, 4222, 4234, 4229, 4237, ++ 4186, 4181, 4185, 4188, 4188, 4203, 4196, 4193, 4190,14283, ++ 7341, 7128, 7122, 4206, 4193, 4208, 4208, 4196, 4237, 7115, ++ 7106, 4213, 4232, 4240, 4261, 4231, 4222, 4234, 4229, 4237, + 4238, 4252, 4256, 4259, 4252, 4258, 4259, 4259, 4244, 4254, + 4275, 4252, 4273, 4265, 4276, 4273, 4289, 4295, 4302, 4302, + +- 4297, 4287, 4305,14261, 4290, 4299, 4302, 4292, 4325, 4361, +- 4371, 4291, 4309, 4314, 4316,14261, 4317, 4325, 4309, 4345, +- 4335, 4342, 4389, 2971, 7361, 4390, 4362, 7378, 7372, 4343, +- 4349, 4361, 4374, 4413, 4369, 4382,14261, 4373, 4374,14261, +- 4390,14261,14261,14261,14261, 7368, 4374, 4395, 4440, 7351, ++ 4297, 4287, 4305,14283, 4290, 4299, 4302, 4292, 4325, 4361, ++ 4371, 4291, 4309, 4314, 4316,14283, 4317, 4325, 4309, 4345, ++ 4335, 4342, 4389, 2971, 7086, 4390, 4362, 7114, 7110, 4343, ++ 4349, 4361, 4374, 4413, 4369, 4382,14283, 4373, 4374,14283, ++ 4390,14283,14283,14283,14283, 7085, 4374, 4395, 4440, 7064, + 4397, 4408, 4416, 4419, 4422, 4423, 4424, 4425, 4434, 4440, + 4432, 4420, 4441, 4445, 4425, 4445, 4442, 4452, 4453, 4454, +- 4443, 7114, 4350, 7145, 0, 4404, 4454, 4477, 7058, 2002, +- 4446, 4447, 4490,14261, 4462, 4454, 4466, 4476, 4487, 4462, ++ 4443, 7013, 4350, 7050, 0, 4404, 4454, 4477, 6983, 2002, ++ 4446, 4447, 4490,14283, 4462, 4454, 4466, 4476, 4487, 4462, + 4470, 4490, 4480, 4481, 4491, 4480, 4486, 4496, 4493, 4491, + + 4492, 4493, 4491, 4492, 4502, 4498, 4508, 4509, 4514, 4504, + 4514, 4501, 4524, 4531, 4518, 4524, 4532, 4534, 4544, 4545, + 4548, 4536, 4536, 4537, 4537, 4544, 4540, 4537, 4556, 4557, +- 4546, 4543, 4565, 4583, 4563, 4549, 4566,14261, 4559, 4560, +- 4549, 4576, 4572, 4575, 4594, 4580, 4583, 4585, 7068, 4591, +- 4589, 4604, 4594, 4595, 4593, 4608, 4651, 4627, 7064, 4611, +- 4615, 4602,14261, 4614, 4610,14261, 4620, 4609,14261,14261, +- 14261, 4603, 4624, 4644, 4644,14261, 4632, 4649, 4641, 4644, ++ 4546, 4543, 4565, 4583, 4563, 4549, 4566,14283, 4559, 4560, ++ 4549, 4576, 4572, 4575, 4594, 4580, 4583, 4585, 6732, 4591, ++ 4589, 4604, 4594, 4595, 4593, 4608, 4651, 4627, 6708, 4611, ++ 4615, 4602,14283, 4614, 4610,14283, 4620, 4609,14283,14283, ++ 14283, 4603, 4624, 4644, 4644,14283, 4632, 4649, 4641, 4644, + 4643, 4657, 4647, 4647, 4648, 4665, 4667, 4665, 4663, 4671, + 4660, 4678, 4701, 4687, 4667, 4679, 4684, 4690, 4708, 4726, + +- 7090, 4714, 4699,14261, 4698, 4714, 4715, 4717, 4716, 4709, +- 7053, 4780, 7020, 4742, 7040, 4707, 0,14261, 7007, 4725, +- 4715, 4782, 4716, 4731, 4735, 4735, 4763, 7005, 4745, 4782, +- 14261, 7003, 4743, 4823, 4789, 4791, 4778, 4783, 4780, 4786, +- 4787, 4783, 4800,14261, 4804, 4797, 4830, 4834, 4831, 4834, +- 4833, 4833, 4840, 4827, 4828, 4823, 4827, 4860, 6660, 6636, +- 6432, 4826, 4834, 0, 4815, 4832, 4837,14261, 4838, 4839, ++ 6716, 4714, 4699,14283, 4698, 4714, 4715, 4717, 4716, 4709, ++ 6682, 4780, 6678, 4742, 6711, 4707, 0,14283, 6668, 4725, ++ 4715, 4782, 4716, 4731, 4735, 4735, 4763, 6490, 4745, 4782, ++ 14283, 6475, 4743, 4823, 4789, 4791, 4778, 4783, 4780, 4786, ++ 4787, 4783, 4800,14283, 4804, 4797, 4830, 4834, 4831, 4834, ++ 4833, 4833, 4840, 4827, 4828, 4823, 4827, 4860, 6311, 6300, ++ 6295, 4826, 4834, 0, 4815, 4832, 4837,14283, 4838, 4839, + 4840, 4841, 4856, 4841, 4857, 4868, 4881, 4877, 4871, 4886, + 4875, 4879, 4875, 4891, 4886, 4887, 4898, 4893, 4876, 4882, + 4886, 4894, 4901, 4937, 4887, 4893, 4893, 4896, 4909, 4909, + + 4900, 4918, 4919, 4934, 4931, 4923, 4942, 4939, 4977, 4945, +- 4946, 4949, 4947, 4952, 4949,14261, 4947, 4943, 4976,14261, +- 4962, 4962, 4964, 4959, 4966, 4967, 4976, 4979, 4982, 6306, +- 4989,14261, 4985, 4992, 4979, 4984, 4998, 4988, 4989, 5008, +- 4995, 5002, 5007, 5004, 5009, 4997, 4998,14261, 5044, 5013, +- 5007, 5007,14261, 5013, 5020,14261,14261,14261,14261, 5025, +- 6293, 5013, 5013, 5037, 5031,14261, 5046, 5042, 5043, 5053, +- 5047, 5054,14261,14261, 5058, 5077,14261, 5063, 5057, 5058, ++ 4946, 4949, 4947, 4952, 4949,14283, 4947, 4943, 4976,14283, ++ 4962, 4962, 4964, 4959, 4966, 4967, 4976, 4979, 4982, 6199, ++ 4989,14283, 4985, 4992, 4979, 4984, 4998, 4988, 4989, 5008, ++ 4995, 5002, 5007, 5004, 5009, 4997, 4998,14283, 5044, 5013, ++ 5007, 5007,14283, 5013, 5020,14283,14283,14283,14283, 5025, ++ 6091, 5013, 5013, 5037, 5031,14283, 5046, 5042, 5043, 5053, ++ 5047, 5054,14283,14283, 5058, 5077,14283, 5063, 5057, 5058, + 5061, 5057, 5067, 5075, 5106, 5088, 5070, 5071, 5111, 5084, +- 5084, 5091, 5101, 5096, 5104, 5177, 6317, 5139, 5140, 6218, ++ 5084, 5091, 5101, 5096, 5104, 5177, 6132, 5139, 5140, 6108, + +- 6110, 5146, 5121, 5125,14261, 5128, 5136, 5124, 5133, 5127, +- 5134,14261, 5142, 5140, 5160, 5159, 5223, 6095, 5165, 5158, +- 14261, 5155, 5171, 5174, 5176, 5177, 5173, 5178, 5174, 5175, ++ 6059, 5146, 5121, 5125,14283, 5128, 5136, 5124, 5133, 5127, ++ 5134,14283, 5142, 5140, 5160, 5159, 5223, 5994, 5165, 5158, ++ 14283, 5155, 5171, 5174, 5176, 5177, 5173, 5178, 5174, 5175, + 5173, 5193, 5201, 5215, 5210, 5225, 5233, 5230, 5218, 5231, +- 5221, 5237, 5238, 5229, 2600, 5933, 5276, 5920, 5304,14261, +- 5230, 5788, 5225, 5241, 5237, 5255, 5273, 5281, 5274, 5275, +- 5272, 5278, 5284, 5269, 5282, 5277, 5772, 5213, 5286, 5293, +- 5293, 5275, 5276, 5284, 5290,14261, 5292, 5300, 5297, 5288, ++ 5221, 5237, 5238, 5229, 2600, 5963, 5276, 5961, 5304,14283, ++ 5230, 5977, 5225, 5241, 5237, 5255, 5273, 5281, 5274, 5275, ++ 5272, 5278, 5284, 5269, 5282, 5277, 5787, 5213, 5286, 5293, ++ 5293, 5275, 5276, 5284, 5290,14283, 5292, 5300, 5297, 5288, + 5361, 5303, 5286, 5307, 5308, 5309, 5334, 5334, 5327, 5334, + 5343, 5341, 5338, 5334, 5335, 5329, 5379, 5331, 5340, 5346, + +- 5348, 5353, 5355, 5342, 5347, 5361, 5376,14261, 5350, 5356, ++ 5348, 5353, 5355, 5342, 5347, 5361, 5376,14283, 5350, 5356, + 5347, 5350, 5378, 5379, 5365, 5369, 5375, 5378, 5386, 5425, +- 5401, 5390, 5390, 5393, 5394, 5397, 5399, 5405, 5402, 5418, +- 5410, 5423, 5439, 5433, 5431, 5437, 5445, 5443, 5445, 5459, +- 5451, 5450, 5453, 5468, 5456, 5472,14261, 5721, 5473, 5473, +- 5468, 5475, 5742,14261, 5655,14261, 5473, 5472, 5484, 5475, +- 5466, 5473, 5493, 5492, 5482,14261,14261, 5478, 5494, 1035, +- 1169, 5492, 5490, 5163, 5532, 5534, 5515, 5520, 5512, 5512, +- 5524, 5512, 5527, 5524, 5538, 5526, 5214,14261, 5551, 5559, +- 5560,14261,14261, 5536, 5525, 5524, 5530, 5538, 5544, 5536, +- +- 5540, 5549, 5543, 5547, 5606, 5669, 5564, 5567, 5583, 5599, +- 5576, 5578, 5604, 0, 5603, 5605, 5591, 5614, 5605, 5618, +- 5619, 5605,14261, 5621, 5622, 5623, 5636, 5640, 5628, 5636, +- 5655, 5659, 5655, 5650, 5670,14261, 5655, 5671, 5673, 5674, +- 5671, 5562, 5556, 5709, 1883, 5658, 5714, 5717, 5680,14261, +- 5684, 5669, 5678, 5691, 5773, 5688, 5687, 5694, 5690, 5697, +- 5693, 5709, 5701, 5700, 5700, 5428, 5741, 5720, 5723, 5710, +- 5711, 5717, 5717, 5717, 5721, 5710, 5730, 5434, 0, 5748, +- 5746, 5751, 5765, 5754, 5751, 5750, 5749, 5756, 5753, 0, +- 5767, 5768, 5774, 5760, 0, 5810, 5767, 5787, 5772, 5794, +- +- 5804, 5838, 5798, 5809, 5802,14261, 5821, 5809, 5571, 5583, +- 5811, 5810, 5806, 5822, 5827, 5810, 5826, 5816, 5814, 5832, +- 5826, 5831, 5825, 5835, 5835, 5844, 5842, 5832, 5828, 5842, +- 14261,14261,14261,14261, 5850, 5863, 5863, 5845, 5860, 5873, +- 5875, 5875, 5873, 5862, 5554, 5879, 5870, 5884, 5871, 5886, +- 14261,14261,14261,14261, 5883, 5871,14261, 5873, 5575,14261, +- 14261, 5887, 5882,14261, 5883, 5880, 5897, 5883, 5895, 5892, +- 5899,14261, 1446, 1625,14261, 2350,14261, 5904, 5909, 5916, +- 5391, 5389, 5942, 5374, 5944,14261, 5908, 5927, 5928, 5919, +- 5935, 5929, 5924, 5922, 5930, 250, 5976, 5400, 5278, 5164, +- +- 5959, 5160, 5961, 5935, 5940, 5947, 5939, 5942, 5938, 5945, +- 5949,14261, 5973, 5956, 5962, 6001, 5967, 5963, 5984, 5995, +- 5985, 5985, 6000, 6005, 6002, 6010, 6009, 5997, 6010, 5998, +- 6001, 0, 6005, 6006, 6014,14261, 6019,14261,14261, 5999, +- 14261, 6009, 6010, 6016, 5181, 6016, 6019, 6021, 6014, 6022, +- 6025, 6030,14261,14261, 6034,14261, 6053, 5112, 6094, 5005, +- 6099, 6032, 6063,14261, 6063, 6056, 6104, 6105, 6069, 6073, +- 6085, 6082, 6069, 6065, 6072, 6122, 6081, 6080, 6095, 6081, +- 6083, 6094, 6092, 6102, 0, 6136, 6162, 6107, 6100, 6119, +- 6120, 6121, 6116, 6133, 6138,14261, 6171, 6129, 4814, 6133, +- +- 6142, 6145, 6136, 6149, 6146, 6147, 6152, 6138, 6155, 0, +- 6147, 6153, 6148, 6162, 4808, 6153, 6151, 6196, 6164, 6158, +- 6224, 6175, 6174, 6175, 6168, 6182,14261,14261, 6189, 6184, +- 4756, 6182, 4738, 6216, 6191,14261, 6186, 6198, 6191, 6200, +- 6212, 6195, 4726, 6199, 6206, 6207, 6203, 6210, 6223,14261, +- 6207, 6222, 6215, 4611, 6221, 6217, 6227,14261, 6219, 6221, +- 6219, 6217, 6223, 6246, 6234, 6236, 6243, 6245, 6262,14261, +- 14261, 6261, 6267, 6264,14261, 6264, 6268, 6269, 4392, 2671, +- 14261, 6274, 6271, 4385, 4371, 4190, 6295, 4171, 6297, 6298, +- 6261, 6274, 6269, 6265, 6272, 6274, 6268,14261, 6267, 4036, +- +- 6351, 6311, 6313, 6355, 6367, 6371, 3982, 3980, 3899, 6324, +- 3943, 6335, 6337, 6293, 3936, 6310, 6317, 6334, 6325, 6328, +- 14261, 6347, 6353, 6345,14261, 6356, 6354, 6363, 6362, 6350, +- 6365, 6352, 6356, 6358, 6357, 6358, 6362, 6366, 6369, 6376, +- 6373, 6386, 6388, 6388, 6396, 6399, 6405, 6409, 3814, 6409, +- 3707, 6409, 6397, 6412, 6406, 6409, 6418, 6409, 6409, 3607, +- 6455,14261, 3600, 6460,14261, 6414, 6420, 6428, 6435, 0, +- 0, 6333, 6423, 6431, 6428, 6430, 6441, 6440, 6440, 6451, +- 6486, 6440, 6453,14261, 6465, 6447, 6465, 6471, 6457, 3643, +- 0, 0, 6453, 6468, 6467, 6477, 6478, 6479,14261, 6473, +- +- 6521, 6478,14261, 6490, 6485, 6484, 6506,14261, 6491, 6499, +- 6511, 6543, 6515, 6520, 6508, 6519, 6509,14261, 6510, 6520, +- 6556, 6517, 6528, 0, 6570, 1544, 6524, 3586, 6524, 6541, +- 6544, 6536, 6536, 6547, 6551, 6556,14261, 6551, 6565, 6553, +- 6562, 6568, 6565, 6568, 6572, 6563, 6558, 6573, 6570, 6571, +- 6580, 3535, 3523, 6563, 6584, 6574, 6585, 6590, 6574, 6595, +- 6599, 6603,14261, 6606, 6607, 6600, 6595, 6599, 6606,14261, +- 6613, 6611, 6606,14261, 6612, 6612, 6623, 6617, 6617, 6628, +- 6652, 6653,14261, 6622, 6636, 6633, 6637, 6637, 6641,14261, +- 3546, 6663, 6696, 6700, 3468, 6685, 6694, 6701, 6661, 6719, +- +- 6731, 6754, 652, 6760, 6766, 3506, 6665, 6707, 6680, 6677, +- 6686,14261, 6711, 6714, 6703, 6710, 6710, 6720, 6728, 6736, +- 6740, 6742, 6751, 6747, 6742, 6754, 6757, 6759, 6749,14261, +- 6766, 6761, 6766, 6767, 6753, 6771, 6770, 6756, 6758, 6777, +- 6771, 6782, 6772,14261, 6777, 6800, 6790, 6805, 6802, 6809, +- 14261, 6814, 6803,14261, 3497, 0, 6804, 6813, 6806, 6800, +- 6816, 6804, 6818, 6810, 0, 0, 6817, 6820, 6808, 6828, +- 6827, 6811, 6831,14261, 3416, 6829, 6820, 6831, 6683, 6735, +- 14261, 6827, 6818, 0, 6739, 6847, 6848, 6890, 6865, 6842, +- 6868, 6866, 6847, 6901, 6878, 6881, 6863, 6879, 6860, 6882, +- +- 6886, 6879, 0, 0, 6881, 6876, 6883, 1551, 3362, 3034, +- 6888, 6879, 6711, 6882, 3348, 6919, 6899, 6903, 6902, 6905, +- 6924, 6914, 6924, 3240, 3233, 6916, 6926, 6921, 6925, 6926, +- 6950, 6935, 6936, 6920, 6936, 6929, 6924, 6932, 6941, 6928, +- 6936, 6933,14261, 6939, 6934, 6946, 6946, 6962, 6953, 6961, +- 6960, 6967, 6968, 6982, 6983, 6983, 6973, 6976, 6987, 6977, +- 7012, 6990, 6978, 6978, 6973, 3220, 7000, 7056, 7017, 749, +- 7060, 7068, 7079, 7091, 3231, 3179, 7047, 7070, 7076, 7078, +- 1915, 7109, 942, 7127, 7138, 7139, 7147, 6735, 7158, 7170, +- 7045, 3206, 3205, 7003,14261, 7017, 7014, 7038, 7045, 7061, +- +- 7072, 7082, 7082, 3113, 7122, 7122,14261, 7129,14261, 7129, +- 14261, 7134, 7130, 7143,14261, 7144, 7135, 7148, 7148, 7150, +- 7152, 7143, 7155, 7148, 7154, 7157,14261,14261,14261, 7168, +- 7157, 7171,14261, 7166, 7169, 7182, 7168, 7166, 7189,14261, +- 7175, 3117, 7181, 7181, 7195, 7182, 7184, 7038, 7187,14261, +- 7194, 7193, 7198, 7242, 7252,14261,14261, 7195, 7210, 0, +- 7219, 7222, 7212, 7212, 7227, 7222, 7237, 7225, 7270, 7242, +- 0, 7286, 7223, 7226, 7225, 7285, 7243, 7231, 7264, 7257, +- 3100, 7257, 7269, 7263, 3002, 3311, 3029, 7262, 7272,14261, +- 7084, 7263,14261, 7271, 7272, 7262, 7270, 7276, 7286, 7291, +- +- 7281, 7293, 7298, 7288, 7284, 7296, 7292, 7293,14261, 7293, +- 7291, 7309, 7300, 7305, 7310, 7321, 7315, 7344, 7327, 7350, +- 7326,14261, 7321, 7324, 7330,14261, 7329, 2968, 7344, 7350, +- 7341,14261, 7341, 7355, 7358, 7346, 7359, 2991, 7343, 7344, +- 7364,14261, 7342, 7367, 1445, 7422, 2883, 7399, 7400, 7375, +- 7428, 7434, 7440, 7459, 2890, 7419, 7438, 2039, 7463, 7447, +- 7475, 7494,14261, 2872, 7412, 7415, 7423, 2765, 7450, 2682, +- 7449, 2660, 7454, 7449, 7463, 7454,14261, 7463, 7448, 7454, +- 7471, 7462, 7455, 7457, 7463,14261, 7464, 7466, 7487, 7469, +- 14261, 7493, 7475, 7493, 7484, 7484, 7535, 7508, 7507, 7502, +- +- 14261, 7513, 7518, 7508, 7519, 7517, 7566, 7535, 7556,14261, +- 7535, 0, 7558, 0, 7593, 7526, 7525, 2612, 7540, 7547, +- 7538, 7538, 7553, 7563, 7568, 7565, 7566, 7573, 7616, 7582, +- 7568, 7588, 2576, 7581, 7585, 7575, 7608, 7581, 7587, 7593, +- 7595,14261, 7592, 7611, 7614, 4759, 7602, 7599,14261, 7618, +- 7610, 7624,14261, 7617, 7628,14261, 7616, 7629, 7630, 7632, +- 7625, 7630, 2425, 7636, 7636, 7635, 7631, 2424, 7637, 7628, +- 7641, 7631,14261, 7644,14261, 7638,14261,14261, 7640,14261, +- 2387, 7685, 7644,14261, 7645,14261, 7655, 7671, 7677, 7671, +- 7667, 7684, 7674,14261, 7671, 7689, 7689, 7675, 7685, 7677, +- +- 7725, 7726, 2880, 7755, 7759, 7763, 7729, 7788, 7789, 2931, +- 7819, 7820, 7673, 7696, 7731, 7743, 7733, 2418, 7742, 7738, +- 7748,14261, 7735, 7741, 7775, 7777, 7775, 7780,14261,14261, +- 7790, 7795, 7780, 7780, 7610, 7798, 7802,14261, 7848, 7793, +- 7805, 7810, 7798, 7794, 7813, 7812, 7814, 7869, 7820, 7881, +- 7848, 2414, 7839, 7873, 0, 7843, 7862, 7864, 7866, 7872, +- 7875, 7882, 7873, 7874, 7883, 7909, 7724, 7882, 7883,14261, +- 7877, 7888, 7889, 0, 7771, 7877, 7893, 7906, 7858, 7891, +- 7951, 7906, 7918, 7923, 7903, 7432, 7910, 7913, 7913, 7908, +- 2315, 7914, 7930, 7932, 7927, 7935, 2192,14261, 2188, 7927, +- +- 7938, 7939, 7930,14261, 2176, 7926, 7946, 7947, 7965,14261, +- 7936,14261, 7936, 7949, 7949, 7954, 7962, 7964, 7972, 7979, +- 2198, 7969, 7983, 7972, 7984, 7988, 7983, 8021, 8020, 8050, +- 8015, 8051, 8069, 7981, 8009, 8019, 8018, 8028, 2208,14261, +- 8009,14261, 8036,14261, 8034, 8028, 8029, 8037, 8048,14261, +- 8040, 8097, 8032, 8051, 8096, 8107, 8037, 8091, 8099, 8099, +- 8100, 8111, 8116, 8112, 8112, 8145, 8113,14261, 8111, 8171, +- 8125, 0, 8130, 8125, 8132, 8146, 8131, 8157, 8165, 8162, +- 8169,14261, 8088, 8089, 8104, 8161, 8156, 8205, 8165, 8163, +- 8177, 8212, 8213, 8233,14261, 8166,14261, 8184,14261, 8182, +- +- 14261, 7542, 2155, 8179, 8187, 8178, 7845, 8197, 8192, 8223, +- 8194, 8201, 8198, 8228, 8215, 8231, 8229, 8225, 8229, 8240, +- 8221, 8246, 8241, 8241,14261, 8236, 8242, 8244, 8239, 8245, +- 8271, 8252, 8253, 8259, 2165, 8256, 8264, 8317, 8267, 8279, +- 8284, 2063, 8262,14261, 8290,14261,14261,14261, 8294,14261, +- 8278, 8339, 8365, 8326, 8362, 8291, 8308, 8309, 8299, 8302, +- 8313, 8312,14261, 8331, 8338,14261, 8400, 8349, 8371, 8356, +- 8361, 8373, 8409, 8378, 8366, 8366, 8367, 0, 8331, 8332, +- 8444, 8396, 8397, 8445, 8395, 8385, 8396, 2064, 8333, 8459, +- 8450, 8382,14261,14261,14261, 8413, 8400, 8414, 8439,14261, +- +- 8439, 8449, 8457, 8462, 8444, 8461, 2002, 8449, 1997,14261, +- 8450,14261, 8464, 8465, 8457, 8456, 8460,14261, 1966, 8467, +- 8461, 3532, 8469, 8463, 8505, 8467, 8498, 8513, 0, 1807, +- 8499, 8502, 8517, 8519, 1759, 8519, 8507, 8506, 8543, 8565, +- 8591,14261, 8521, 8524, 8528, 8507, 8539, 8528, 8555, 8508, +- 8549, 8546, 8548,14261, 8555, 8558, 8619, 8572, 8558, 8559, +- 8625, 8554, 1709, 8645, 0, 1652, 8646, 0, 8574, 8579, +- 5041, 8616, 8619, 8613, 8666, 8676, 8685,14261, 8615, 8675, +- 8670,14261, 8680, 1579, 8682, 8686, 8670, 8674, 8677, 8678, +- 8677, 8691, 8676, 8676, 8677, 8690, 8693, 8694,14261, 1374, +- +- 8693, 3983,14261, 4005, 8694, 8729, 8719, 8723, 8724, 0, +- 0, 8742,14261, 8727, 8741,14261,14261, 8775, 8786, 8713, +- 8755, 8554, 8743, 8814, 8555, 0, 8739, 8656, 8744, 8746, +- 8756, 8741, 8747, 8823, 8748, 8785,14261, 8849, 8795, 8783, +- 1313, 1065, 8791, 8838, 7557, 1008, 7972, 8781, 8799, 8817, +- 8873, 8817, 8824, 8844,14261, 8847, 8844, 8850, 8835, 8836, +- 8848, 8850, 8853, 8857, 8858, 8214, 8425, 8854,14261, 8857, +- 14261, 989, 4343,14261, 4654, 8877, 914, 8869, 0, 8864, +- 14261, 8872, 8920, 8935, 0, 0, 0,14261, 8871, 8662, +- 8874, 8933, 8663, 0, 0, 8776, 0, 8898, 8889, 8896, +- +- 8901, 8906, 8906, 8923, 8955, 8913, 8929,14261,14261, 8931, +- 8933, 8919, 8939, 879, 8105, 876, 8944, 8934, 8936, 8936, +- 8937, 8939, 8935, 8950, 8962,14261, 8960, 8967, 8952,14261, +- 8951, 8955,14261,14261, 8966, 8836,14261, 4752,14261, 8957, +- 14261, 8962, 8969,14261, 830, 8958, 0, 9036, 0, 9003, +- 0, 743, 8969, 8981, 8979, 8985, 8984, 8989, 8996, 9001, +- 9040, 8670, 8671, 9007, 9012, 9043, 9008, 9016,14261, 9021, +- 9022,14261, 9025, 9022, 9015, 9020, 9020, 9017, 9025, 670, +- 14261,14261, 9031, 9023, 9039, 9043,14261, 9026, 602, 0, +- 9054, 447, 9069,14261, 9029, 9034,14261, 9037, 9043, 9044, +- +- 9051, 9050, 8786, 9063, 9107, 9120, 8816, 9126, 9060, 9060, +- 9079, 9066, 9084,14261, 436, 9083, 9079, 9090, 9096, 9091, +- 9104, 461, 367, 9099, 9135,14261, 330, 9131, 366, 9100, +- 9098, 9105, 9102,14261, 9096, 9106, 0, 9149, 9110, 9154, +- 0, 9164, 0, 9174, 9180,14261, 9111,14261, 9119, 9133, +- 9139,14261, 9132, 9140, 9155, 9140, 9158, 9155, 0, 315, +- 9192, 9153, 9146, 9196, 9142, 9161, 9202,14261, 9167, 262, +- 254, 9206, 0, 9219, 0,14261, 9184, 9182, 9177, 9181, +- 9190, 9181, 9194, 9190, 9184, 9187, 9193, 0, 0, 143, +- 9240, 0, 9194, 9249, 9244, 9189, 9260, 9246,14261,14261, +- +- 138, 109, 9245, 9253, 9247,14261,14261, 9235,14261, 9256, +- 9247, 9251, 9252, 0, 43,14261, 9276, 9305, 9306, 9314, +- 9266,14261,14261, 9280, 9289, 9310,14261, 6, 9301, 9311, +- 14261,14261, 9333, 9359,14261,14261,14261, 9308,14261,14261, +- 9304, 9368, 9305, 9335, 9332, 9325,14261, 9337, 9365, 9367, +- 14261,14261, 9429, 9447, 9465, 9483, 9501, 9519, 9537, 9555, +- 9573, 9591, 9609, 9627, 9645, 9663, 9681, 9699, 9717, 9735, +- 9753, 9771, 9789, 9807, 9825, 9843, 9861, 9879, 9897, 9915, +- 9933, 9951, 9969, 9987,10005,10023,10041,10059,10077,10095, +- 10113,10131,10149,10167,10185,10203,10221,10239,10257,10275, +- +- 10293,10311,10329,10347,10365,10383,10401,10419,10437,10455, +- 10473,10490,10508,10526,10544,10562,10580,10597,10615,10633, +- 10651,10669,10687,10705,10723,10741,10759,10777,10795,10813, +- 10831,10849,10867,10885,10903,10921,10939,10957,10975,10993, +- 11011,11028,11046,11064,11082,11100,11118,11136,11154,11171, +- 11189,11207,11225,11243,11261,11279,11297,11315,11333,11351, +- 11369,11387,11405,11423,11441,11459,11477,11495,11512,11530, +- 11548,11566,11584,11602,11620,11637,11655,11673,11691,11709, +- 11727,11745,11763,11781,11799,11817,11835,11853,11871,11889, +- 11907,11925,11943,11960,11978,11996,12014,12032,12050,12068, +- +- 12086,12104,12122,12140,12151,12165,12183,12191,12207,12224, +- 12228,12244,12262,12272,12288,12306,12324,12342,12359,12375, +- 12393,12411,12429,12447,12465,12482,12498,12516,12525,12541, +- 12559,12577,12595,12612,12620,12635,12651,12668,12686,12704, +- 12722,12740,12758,12776,12794,12812,12830,12848,12858,12866, +- 12881,12896,12907,12915,12923,12939,12955,12971,12988,13006, +- 13024,13042,13060,13078,13096,13114,13132,13150,13168,13186, +- 13204,13222,13240,13258,13271,13279,13287,13295,13306,13322, +- 13338,13346,13354,13370,13388,13406,13424,13442,13460,13478, +- 13496,13514,13532,13550,13568,13584,13600,13618,13636,13646, +- +- 13662,13678,13691,13709,13726,13743,13760,13771,13787,13804, +- 13821,13833,13849,13867,13884,13902,13919,13937,13954,13970, +- 13987,13997,14013,14030,14048,14065,14083,14101,14118,14135, +- 14153,14165,14181,14198,14215,14226,14242 ++ 5401, 5390, 5390, 5394, 5395, 5399, 5402, 5406, 5403, 5421, ++ 5420, 5428, 5446, 5437, 5432, 5439, 5449, 5445, 5449, 5465, ++ 5453, 5453, 5458, 5472, 5458, 5476,14283, 5734, 5478, 5476, ++ 5470, 5478, 5785,14283, 5753,14283, 5477, 5475, 5486, 5478, ++ 5469, 5475, 5495, 5494, 5482,14283,14283, 5485, 5498, 1035, ++ 1169, 5493, 5496, 5163, 5528, 5538, 5521, 5524, 5518, 5518, ++ 5529, 5518, 5532, 5527, 5540, 5529, 5214,14283, 5545, 5555, ++ 5563,14283,14283, 5539, 5528, 5527, 5533, 5541, 5546, 5537, ++ ++ 5541, 5549, 5538, 5566, 5625, 5602, 5547, 5555, 5598, 5591, ++ 5591, 5592, 5607, 0, 5607, 5609, 5600, 5619, 5608, 5622, ++ 5636, 5622,14283, 5638, 5639, 5640, 5641, 5643, 5631, 5637, ++ 5647, 5651, 5646, 5642, 5661,14283, 5645, 5661, 5663, 5674, ++ 5671, 5684, 5579, 5709, 1883, 5712, 5725, 5728, 5678,14283, ++ 5686, 5678, 5685, 5696, 5784, 5692, 5691, 5695, 5692, 5699, ++ 5695, 5710, 5702, 5699, 5700, 5428, 5749, 5717, 5721, 5709, ++ 5710, 5717, 5716, 5720, 5733, 5724, 5731, 5434, 0, 5756, ++ 5753, 5751, 5765, 5754, 5751, 5750, 5749, 5757, 5758, 0, ++ 5773, 5774, 5780, 5763, 0, 5441, 5768, 5784, 5768, 5775, ++ ++ 5786, 5845, 5791, 5802, 5808,14283, 5821, 5809, 5602, 5838, ++ 5811, 5811, 5807, 5824, 5833, 5818, 5834, 5824, 5822, 5840, ++ 5833, 5838, 5830, 5839, 5838, 5847, 5852, 5854, 5842, 5838, ++ 5853,14283,14283,14283,14283, 5846, 5860, 5859, 5852, 5867, ++ 5874, 5876, 5877, 5875, 5865, 5574, 5886, 5879, 5893, 5880, ++ 5895,14283,14283,14283,14283, 5892, 5880,14283, 5881, 5613, ++ 14283,14283, 5895, 5888,14283, 5889, 5884, 5905, 5893, 5906, ++ 5903, 5910,14283, 1446, 1625,14283, 2350,14283, 5903, 5907, ++ 5914, 5543, 5537, 5745, 5536, 5948,14283, 5914, 5927, 5928, ++ 5919, 5936, 5930, 5926, 5928, 5937, 250, 5983, 5402, 5372, ++ ++ 5278, 5968, 5164, 5969, 5943, 5948, 5951, 5942, 5945, 5951, ++ 5957, 5947,14283, 5970, 5955, 5962, 6023, 5967, 5965, 5988, ++ 5984, 5980, 5988, 6007, 6004, 6014, 6022, 6021, 6009, 6022, ++ 6009, 6014, 0, 6018, 6019, 6027,14283, 6034,14283,14283, ++ 6014,14283, 6024, 6025, 6028, 5191, 6028, 6031, 6033, 6026, ++ 6034, 6036, 6034,14283,14283, 6029,14283, 6050, 5150, 6107, ++ 5112, 6111, 6034, 6063,14283, 6083, 6051, 6014, 6119, 6076, ++ 6081, 6088, 6092, 6078, 6074, 6081, 6129, 6088, 6084, 6100, ++ 6087, 6089, 6099, 6098, 6107, 0, 6169, 6170, 6110, 6100, ++ 6119, 6125, 6128, 6136, 6147, 6150,14283, 6183, 6141, 5055, ++ ++ 6147, 6156, 6158, 6148, 6159, 6156, 6157, 6162, 6148, 6164, ++ 0, 6156, 6162, 6157, 6171, 4814, 6162, 6159, 6206, 6171, ++ 6161, 6211, 6184, 6202, 6202, 6195, 6204,14283,14283, 6205, ++ 6197, 4757, 6194, 4756, 6227, 6201,14283, 6195, 6205, 6198, ++ 6207, 6219, 6199, 4738, 6203, 6210, 6206, 6213, 6210, 6216, ++ 6229,14283, 6213, 6227, 6219, 4726, 6232, 6228, 6248,14283, ++ 6247, 6248, 6246, 6240, 6246, 6263, 6248, 6251, 6254, 6255, ++ 6270,14283,14283, 6269, 6275, 6272,14283, 6270, 6274, 6275, ++ 4642, 2671,14283, 6281, 6278, 4392, 4400, 4326, 6302, 4235, ++ 6303, 6304, 6267, 6279, 6273, 6276, 6283, 6295, 6290,14283, ++ ++ 6288, 4168, 6361, 6336, 6329, 6367, 6373, 6382, 4036, 3985, ++ 3935, 6338, 3944, 6341, 6342, 6305, 3943, 6315, 6337, 6345, ++ 6341, 6351,14283, 6363, 6368, 6359,14283, 6370, 6367, 6375, ++ 6373, 6364, 6377, 6364, 6367, 6368, 6367, 6369, 6373, 6377, ++ 6378, 6386, 6382, 6393, 6403, 6399, 6411, 6413, 6421, 6425, ++ 3922, 6425, 3814, 6423, 6410, 6425, 6418, 6420, 6429, 6420, ++ 6422, 3676, 6466,14283, 3607, 6474,14283, 6428, 6426, 6434, ++ 6443, 0, 0, 6491, 6433, 6440, 6435, 6446, 6455, 6454, ++ 6456, 6468, 6510, 6455, 6468,14283, 6477, 6463, 6479, 6485, ++ 6473, 3650, 0, 0, 6468, 6482, 6483, 6494, 6496, 6492, ++ ++ 14283, 6491, 6538, 6490,14283, 6506, 6501, 6496, 6519,14283, ++ 6505, 6515, 6527, 6558, 6530, 6533, 6522, 6534, 6524,14283, ++ 6525, 6535, 6570, 6542, 6538, 0, 6586, 1544, 6534, 3592, ++ 6533, 6555, 6561, 6551, 6551, 6561, 6566, 6571,14283, 6563, ++ 6578, 6567, 6578, 6584, 6581, 6583, 6588, 6578, 6572, 6587, ++ 6574, 6586, 6587, 6596, 3586, 3535, 6581, 6601, 6594, 6603, ++ 6609, 6593, 6612, 6618, 6625,14283, 6622, 6624, 6616, 6611, ++ 6615, 6620,14283, 6628, 6628, 6623,14283, 6629, 6629, 6640, ++ 6634, 6633, 6643, 6668, 6669,14283, 6638, 6652, 6651, 6654, ++ 6657, 6659,14283, 3566, 6692, 6722, 6726, 3504, 6690, 6701, ++ ++ 6703, 6679, 6738, 6752, 6758, 652, 6770, 6789, 3510, 6685, ++ 6705, 6709, 6698, 6703,14283, 6721, 6726, 6720, 6734, 6738, ++ 6738, 6741, 6745, 6753, 6755, 6763, 6759, 6755, 6768, 6771, ++ 6773, 6763,14283, 6779, 6774, 6782, 6784, 6772, 6790, 6789, ++ 6775, 6779, 6800, 6795, 6805, 6798,14283, 6794, 6809, 6799, ++ 6814, 6815, 6821,14283, 6825, 6815,14283, 3514, 0, 6816, ++ 6826, 6820, 6814, 6831, 6819, 6833, 6824, 0, 0, 6834, ++ 6837, 6825, 6847, 6846, 6830, 6850,14283, 3497, 6850, 6843, ++ 6855, 6707, 6766,14283, 6850, 6844, 0, 6909, 6864, 6857, ++ 6899, 6892, 6850, 6879, 6877, 6860, 6915, 6886, 6893, 6875, ++ ++ 6894, 6875, 6903, 6908, 6902, 0, 0, 6903, 6899, 6906, ++ 1551, 3366, 3034, 6911, 6899, 6123, 6900, 3361, 6334, 6915, ++ 6919, 6905, 6908, 6930, 6923, 6934, 3348, 3240, 6927, 6940, ++ 6937, 6941, 6942, 6969, 3233, 6954, 6955, 6940, 6956, 6949, ++ 6944, 6952, 6963, 6951, 6958, 6953,14283, 6959, 6952, 6962, ++ 6962, 6978, 6963, 6968, 6966, 6975, 6979, 6993, 6994, 6994, ++ 6987, 6992, 7003, 6993, 7031, 7009, 6998, 6998, 6993, 3220, ++ 7017, 7077, 7039, 749, 7078, 7096, 7097, 7108, 3231, 3179, ++ 7057, 7088, 7093, 7104, 1915, 7134, 942, 7155, 7164, 7170, ++ 7176, 7042, 7185, 7196, 7061, 3206, 3205, 7031,14283, 7057, ++ ++ 7043, 7075, 7077, 7089, 7093, 7094, 7092, 3113, 7141, 7146, ++ 14283, 7156,14283, 7159,14283, 7160, 7152, 7169,14283, 7171, ++ 7162, 7176, 7172, 7177, 7177, 7168, 7180, 7170, 7180, 7184, ++ 14283,14283,14283, 7194, 7182, 7192,14283, 7191, 7196, 7209, ++ 7192, 7193, 7218,14283, 7202, 3117, 7208, 7208, 7220, 7210, ++ 7211, 7056, 7214,14283, 7221, 7221, 7222, 7076, 7269,14283, ++ 14283, 7222, 7233, 0, 7244, 7248, 7238, 7235, 7246, 7241, ++ 7264, 7243, 7127, 7258, 0, 7297, 7242, 7248, 7254, 7142, ++ 7272, 7261, 7283, 7276, 3100, 7276, 7287, 7280, 3002, 3311, ++ 3029, 7282, 7288,14283, 7043, 7279,14283, 7286, 7287, 7277, ++ ++ 7289, 7295, 7305, 7310, 7300, 7320, 7312, 7306, 7305, 7318, ++ 7317, 7318,14283, 7325, 7319, 7317, 7339, 7325, 7325, 7330, ++ 7342, 7334, 7365, 7348, 7369, 7342,14283, 7337, 7339, 7349, ++ 14283, 7348, 2968, 7363, 7373, 7363,14283, 7363, 7376, 7379, ++ 7368, 7381, 2991, 7367, 7368, 7388,14283, 7365, 7390, 1445, ++ 7448, 2883, 7427, 7136, 7400, 7459, 7463, 7471, 7489, 2890, ++ 7440, 7460, 2039, 7507, 7413, 7519, 7525,14283, 2872, 7398, ++ 7393, 7416, 2765, 7421, 2682, 7432, 2660, 7445, 7441, 7456, ++ 7463,14283, 7473, 7457, 7474, 7491, 7484, 7480, 7488, 7492, ++ 14283, 7493, 7495, 7514, 7497,14283, 7518, 7500, 7518, 7510, ++ ++ 7506, 7438, 7527, 7522, 7517,14283, 7527, 7532, 7523, 7531, ++ 7528, 7587, 7537, 7488,14283, 7540, 0, 7497, 0, 7596, ++ 7549, 7549, 2612, 7561, 7571, 7562, 7570, 7573, 7581, 7585, ++ 7580, 7581, 7588, 7632, 7588, 7586, 7605, 2576, 7599, 7602, ++ 7592, 7501, 7597, 7603, 7625, 7626,14283, 7623, 7630, 7636, ++ 4759, 7622, 7617,14283, 7635, 7625, 7639,14283, 7632, 7643, ++ 14283, 7631, 7644, 7645, 7647, 7640, 7645, 2425, 7651, 7651, ++ 7650, 7656, 7650, 2424, 7656, 7647, 7659, 7649,14283, 7661, ++ 14283, 7672,14283,14283, 7673,14283, 2387, 7701, 7679,14283, ++ 7685,14283, 7678, 7693, 7698, 7688, 7684, 7701, 7691,14283, ++ ++ 7688, 7706, 7706, 7692, 7702, 7694, 7769, 7760, 2880, 7780, ++ 7781, 7789, 7766, 7800, 7801, 2931, 7820, 7838, 7692, 7716, ++ 7762, 7780, 7770, 2418, 7782, 7778, 7791,14283, 7781, 7787, ++ 7799, 7802, 7802, 7805,14283,14283, 7818, 7821, 7806, 7806, ++ 7621, 7825, 7829,14283, 7741, 7821, 7831, 7837, 7825, 7821, ++ 7834, 7832, 7830, 7885, 7835, 7895, 7890, 2414, 7879, 7884, ++ 0, 7883, 7891, 7892, 7884, 7890, 7891, 7898, 7890, 7891, ++ 7900, 7917, 7748, 7908, 7909,14283, 7902, 7913, 7914, 0, ++ 7752, 7901, 7920, 7931, 7876, 7916, 7885, 7918, 7929, 7934, ++ 7914, 7416, 7921, 7924, 7930, 7925, 2315, 7931, 7946, 7948, ++ ++ 7941, 7949, 2192,14283, 2188, 7955, 7942, 7953, 7954, 7945, ++ 14283, 2176, 7941, 7970, 7971, 7978,14283, 7959,14283, 7959, ++ 7972, 7971, 7982, 7988, 7990, 7985, 7991, 2198, 7981, 7994, ++ 7990, 8002, 8006, 8001, 8055, 8029, 8066, 8027, 8067, 8078, ++ 7997, 8028, 8026, 8034, 8044, 2208,14283, 8033,14283, 8060, ++ 14283, 8057, 8050, 8053, 8060, 8064,14283, 8055, 8127, 8038, ++ 8067, 8124, 8135, 8053, 8072, 8058, 8058, 8059, 8068, 8074, ++ 8070, 8070, 8162, 8072,14283, 8129, 8188, 8143, 0, 8161, ++ 8145, 8152, 8162, 8147, 8156, 8164, 8161, 8166,14283, 8116, ++ 8214, 8216, 8158, 8153, 8230, 8171, 8184, 8198, 8234, 8235, ++ ++ 8244,14283, 8194,14283, 8212,14283, 8210,14283, 8116, 2155, ++ 8208, 8216, 8207, 8225, 8215, 8210, 8239, 8207, 8225, 8216, ++ 8225, 8240, 8233, 8254, 8252, 8248, 8249, 8258, 8239, 8264, ++ 8259, 8259,14283, 8254, 8260, 8262, 8259, 8265, 8292, 8273, ++ 8275, 8278, 2165, 8275, 8280, 8339, 8294, 8296, 8302, 2063, ++ 8279,14283, 8303,14283,14283,14283, 8306,14283, 8294, 8360, ++ 8386, 8236, 8383, 8296, 8308, 8309, 8299, 8318, 8328, 8326, ++ 14283, 8323, 8329,14283, 8406, 8341, 8401, 8386, 8391, 8402, ++ 8436, 8405, 8393, 8393, 8394, 0, 8348, 8396, 8443, 8414, ++ 8415, 8447, 8416, 8407, 8416, 2064, 8350, 8480, 8467, 8401, ++ ++ 14283,14283,14283, 8461, 8430, 8448, 8450,14283, 8459, 8468, ++ 8476, 8481, 8462, 8480, 8481, 2002, 8469, 1997,14283, 8470, ++ 14283, 8484, 8485, 8477, 8476, 8480,14283, 1966, 8488, 8483, ++ 3532, 8491, 8485, 8527, 8497, 8505, 8534, 0, 1807, 8520, ++ 8522, 8537, 8539, 1759, 8539, 8527, 8354, 8565, 8585, 8611, ++ 14283, 8543, 8546, 8550, 8358, 8561, 8564, 8576, 8387, 8571, ++ 8567, 8569,14283, 8572, 8579, 8639, 8593, 8578, 8579, 8647, ++ 8574, 1709, 8471, 0, 1652, 8528, 0, 8584, 8585, 5041, ++ 8618, 8634, 8628, 8666, 8694, 8703,14283, 8621, 8635, 8630, ++ 14283, 8640, 1579, 8642, 8646, 8632, 8636, 8639, 8635, 8641, ++ ++ 8662, 8699, 8684, 8684, 8685, 8699, 8702, 8703,14283, 1374, ++ 8702, 3983,14283, 4005, 8703, 8713, 8690, 8694, 8706, 0, ++ 0, 8724,14283, 8709, 8723,14283,14283, 8772, 8771, 8780, ++ 8749, 8455, 8737, 8808, 8456, 0, 8738, 8574, 8741, 8763, ++ 8773, 8759, 8765, 8799, 8786, 8795,14283, 8847, 8814, 8802, ++ 1313, 1065, 8811, 8812, 7572, 1008, 7574, 8803, 8821, 8821, ++ 8872, 8812, 8820, 8825,14283, 8826, 8841, 8852, 8850, 8851, ++ 8863, 8854, 8865, 8857, 8861, 8862, 8449, 8892, 8860,14283, ++ 8862,14283, 989, 4343,14283, 4654, 8881, 914, 8864, 0, ++ 8860,14283, 8868, 8943, 8947, 0, 0, 0,14283, 8868, ++ ++ 8839, 8876, 8944, 8917, 0, 0, 8954, 0, 8892, 8908, ++ 8915, 8930, 8935, 8935, 8936, 8957, 8936, 8952,14283,14283, ++ 8955, 8956, 8942, 8961, 879, 8986, 876, 8955, 8945, 8947, ++ 8947, 8948, 8950, 8950, 8962, 8972,14283, 8969, 8976, 8909, ++ 8961,14283, 8960, 8964,14283,14283, 8975, 8988,14283, 4752, ++ 14283, 8973,14283, 8983, 8992,14283, 830, 8979, 0, 9043, ++ 0, 9037, 0, 743, 8997, 9008, 9007, 9013, 9011, 9009, ++ 9012, 9018, 9058, 8529, 8770, 9024, 9025, 9057, 9020, 9028, ++ 14283, 9033, 9034,14283, 9038, 9035, 9025, 9032, 9032,14283, ++ 9029, 9040, 670,14283,14283, 9048, 9040, 9057, 9061,14283, ++ ++ 9049, 602, 0, 9079, 447, 9095,14283, 9054, 9064,14283, ++ 9067, 9072, 9069, 9078, 9073, 9119, 9089, 9123, 9127, 9138, ++ 9142, 9079, 9082, 9099, 9093, 9113,14283, 436, 9112, 9111, ++ 9115, 9122, 9114, 9127, 461, 367, 9122, 9158,14283, 330, ++ 9155, 366, 9125, 9121, 9127, 9124,14283, 9118, 9125, 0, ++ 9169, 9130, 9173, 0, 9196, 0, 9197, 9203,14283, 9135, ++ 14283, 9137, 9153, 9153,14283, 9145, 9147, 9175, 9160, 9181, ++ 9174, 0, 315, 9219, 9166, 9170, 9225, 9170, 9183, 9227, ++ 14283, 9196, 262, 254, 9231, 0, 9242, 0,14283, 9204, ++ 9205, 9195, 9201, 9209, 9203, 9215, 9212, 9206, 9209, 9215, ++ ++ 0, 0, 143, 9259, 0, 9216, 9270, 9260, 9220, 9282, ++ 9240,14283,14283, 138, 109, 9267, 9275, 9269,14283,14283, ++ 9257,14283, 9278, 9269, 9273, 9274, 0, 43,14283, 9298, ++ 9327, 9276, 9336, 9288,14283,14283, 9302, 9311, 9332,14283, ++ 6, 9323, 9333,14283,14283, 9355, 9381,14283,14283,14283, ++ 9330,14283,14283, 9326, 9390, 9327, 9357, 9354, 9347,14283, ++ 9359, 9387, 9389,14283,14283, 9451, 9469, 9487, 9505, 9523, ++ 9541, 9559, 9577, 9595, 9613, 9631, 9649, 9667, 9685, 9703, ++ 9721, 9739, 9757, 9775, 9793, 9811, 9829, 9847, 9865, 9883, ++ 9901, 9919, 9937, 9955, 9973, 9991,10009,10027,10045,10063, ++ ++ 10081,10099,10117,10135,10153,10171,10189,10207,10225,10243, ++ 10261,10279,10297,10315,10333,10351,10369,10387,10405,10423, ++ 10441,10459,10477,10495,10512,10530,10548,10566,10584,10602, ++ 10619,10637,10655,10673,10691,10709,10727,10745,10763,10781, ++ 10799,10817,10835,10853,10871,10889,10907,10925,10943,10961, ++ 10979,10997,11015,11033,11050,11068,11086,11104,11122,11140, ++ 11158,11176,11193,11211,11229,11247,11265,11283,11301,11319, ++ 11337,11355,11373,11391,11409,11427,11445,11463,11481,11499, ++ 11517,11534,11552,11570,11588,11606,11624,11642,11659,11677, ++ 11695,11713,11731,11749,11767,11785,11803,11821,11839,11857, ++ ++ 11875,11893,11911,11929,11947,11965,11982,12000,12018,12036, ++ 12054,12072,12090,12108,12126,12144,12162,12173,12187,12205, ++ 12213,12229,12246,12250,12266,12284,12294,12310,12328,12346, ++ 12364,12381,12397,12415,12433,12451,12469,12487,12504,12520, ++ 12538,12547,12563,12581,12599,12617,12634,12642,12657,12673, ++ 12690,12708,12726,12744,12762,12780,12798,12816,12834,12852, ++ 12870,12880,12888,12903,12918,12929,12937,12945,12961,12977, ++ 12993,13010,13028,13046,13064,13082,13100,13118,13136,13154, ++ 13172,13190,13208,13226,13244,13262,13280,13293,13301,13309, ++ 13317,13328,13344,13360,13368,13376,13392,13410,13428,13446, ++ ++ 13464,13482,13500,13518,13536,13554,13572,13590,13606,13622, ++ 13640,13658,13668,13684,13700,13713,13731,13748,13765,13782, ++ 13793,13809,13826,13843,13855,13871,13889,13906,13924,13941, ++ 13959,13976,13992,14009,14019,14035,14052,14070,14087,14105, ++ 14123,14140,14157,14175,14187,14203,14220,14237,14248,14264 + } ; + +-static const flex_int16_t yy_def[4238] = ++static const flex_int16_t yy_def[4251] = + { 0, +- 3953, 3953, 3952, 3, 3954, 3954, 3, 3, 3955, 3955, +- 3955, 3955, 3956, 3956, 3957, 3957, 3958, 3958, 3959, 3959, +- 3960, 3960, 3954, 3954, 3954, 3954, 3961, 3961, 3962, 3962, +- 3962, 3962, 3963, 3963, 3964, 3964, 3952, 37, 37, 37, +- 3954, 3954, 3954, 3954, 3954, 3954, 3965, 3965, 3966, 3966, +- 3967, 3967, 3968, 3968, 3969, 3969, 3970, 3970, 3971, 3971, +- 3954, 3954, 3972, 3972, 3973, 3973, 3971, 3971, 3954, 3954, +- 3974, 3974, 3975, 3975, 3952, 3952, 3952, 3952, 3952, 3952, +- 3976, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 131, 3952, 3952, 3952, 3977, 3977, 3977, 3952, +- 3952, 3977, 3978, 3978, 3978, 3952, 3979, 3978, 3980, 3980, +- 3980, 3952, 3981, 3952, 3980, 3982, 3982, 3952, 3982, 3952, +- 3952, 3983, 3952, 3952, 3952, 3983, 3984, 3983, 3985, 3985, +- 3985, 3952, 3986, 3985, 3952, 3987, 3952, 3985, 3988, 3988, +- 3988, 3952, 3989, 3988, 3990, 3990, 3990, 3952, 3952, 3990, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3991, 3991, 3952, 3952, +- 3991, 3992, 3992, 3952, 3993, 3992, 3952, 3994, 3995, 3996, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3997, 3952, 3998, 3997, 3952, 3952, 3952, 3999, 3952, 4000, +- 3952, 3999, 3952, 3952, 3952, 4001, 4001, 4001, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4002, 3952, 4002, 4002, 4002, +- 3952, 3952, 4002, 4002, 4002, 4003, 3952, 4004, 4003, 4003, +- 4003, 3952, 4003, 4003, 4003, 4005, 3952, 4006, 4005, 4005, +- 4005, 3952, 4005, 4005, 4005, 4007, 4007, 3952, 4007, 3952, +- 4007, 4008, 3952, 4008, 3952, 4009, 4010, 4011, 4010, 4008, +- 4012, 3952, 4013, 4012, 4012, 4012, 4012, 3952, 4012, 3952, +- +- 4014, 4015, 4016, 4015, 4017, 4015, 3952, 3952, 4012, 4012, +- 4018, 3952, 4019, 4018, 4018, 4018, 3952, 4018, 4018, 4018, +- 4020, 3952, 4020, 4020, 3952, 4020, 3952, 3952, 4020, 4020, +- 4020, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 4021, 3952, 4021, 3952, 3952, 4021, +- 4022, 3952, 4023, 4022, 3952, 4022, 4024, 4025, 4026, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4027, 3952, 4028, +- 4027, 3952, 4027, 3952, 4029, 3952, 4030, 4029, 3952, 4029, +- 4031, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4032, +- 3952, 3952, 4032, 4032, 4033, 4034, 3952, 3952, 4034, 4034, +- 4035, 4036, 3952, 3952, 4036, 4036, 3952, 3952, 4037, 4038, +- 4037, 4039, 4040, 4041, 4041, 4041, 4040, 4042, 4043, 3952, +- 3952, 4044, 4045, 4044, 4046, 4044, 4047, 4048, 4048, 4048, +- 4049, 4049, 4049, 4050, 4048, 4043, 4043, 4051, 4052, 3952, +- 3952, 4052, 4052, 3952, 4053, 3952, 3952, 4053, 3952, 4053, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4054, 3952, 3952, 4055, 4056, 3952, +- 3952, 3952, 3952, 3952, 3952, 4057, 4058, 3952, 3952, 4059, +- 4060, 3952, 3952, 4061, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4062, 3952, 4062, +- 4063, 3952, 4063, 4064, 3952, 4064, 3952, 4065, 4066, 4066, +- 4066, 4067, 4065, 4067, 4067, 3952, 4068, 3952, 3952, 4068, +- 3952, 4043, 3952, 4069, 4069, 4069, 4070, 4071, 4070, 4070, +- 4072, 4073, 4069, 4074, 4071, 4072, 4071, 4071, 4043, 4075, +- +- 4043, 3952, 4075, 3952, 4075, 4075, 4076, 4043, 4077, 3952, +- 4077, 4078, 3952, 4078, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4079, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4080, 3952, 4081, +- +- 3952, 3952, 3952, 3952, 3952, 4082, 3952, 4083, 3952, 4084, +- 4084, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 4085, 3952, 4086, 3952, 4087, 4088, 4089, +- 4090, 3952, 4069, 4091, 4091, 4091, 4072, 4069, 4071, 4072, +- 4071, 4092, 4071, 4093, 4094, 4095, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4096, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4079, 4097, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4098, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 4099, 3952, 3952, 3952, +- 3952, 4100, 3952, 4101, 3952, 4102, 4102, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4088, +- 4089, 4088, 4089, 4091, 4071, 4091, 4072, 4091, 4072, 4103, +- 4072, 4072, 4071, 4093, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4096, 4104, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4105, 3952, 3952, 3952, 4097, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4098, 3952, 4098, 4106, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 4102, 4102, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4091, 4072, +- 4092, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4104, 4107, 4096, 4104, 3952, 3952, 3952, 3952, +- 3952, 3952, 4108, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4098, 3952, 4106, 3952, 3952, 3952, 4102, 4109, +- 3952, 3952, 4110, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4072, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4096, 4104, 3952, 4107, 4096, 3952, 4111, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4098, 3952, 4102, 4112, +- 4113, 3952, 3952, 4114, 4110, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4115, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4104, 3952, 4107, 4107, 3952, +- +- 4111, 4116, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4117, 4112, 4112, 4113, 4113, 3952, +- 3952, 4114, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4118, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4119, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4115, 4120, 4115, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4121, 3952, 4116, 4122, +- 4116, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4123, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4124, 4125, 4112, 3952, 4112, 4113, 4113, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4126, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4118, 4127, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4128, +- 3952, 3952, 3952, 3952, 4129, 4119, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4115, 4120, 3952, 4120, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4121, 4130, 4131, 3952, 4116, +- +- 4122, 3952, 4122, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4123, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4124, 4132, 4125, +- 4133, 3952, 3952, 3952, 3952, 3952, 4134, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4135, 4126, 4136, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4127, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4128, +- 3952, 3952, 3952, 3952, 4129, 3952, 3952, 3952, 3952, 3952, +- 4137, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4120, 3952, 4115, 4120, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4138, +- +- 4130, 4139, 4121, 4140, 4141, 4130, 4142, 3952, 3952, 4143, +- 3952, 4144, 4143, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4145, +- 4146, 3952, 4147, 4148, 3952, 3952, 3952, 3952, 3952, 4149, +- 4150, 4151, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4152, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4153, +- 4154, 4155, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 4156, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4157, 3952, 3952, 4158, 4158, 4159, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4160, 4161, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4162, 4163, 4164, 4165, 3952, 4166, 4167, 4163, 4168, 4169, +- +- 4170, 4171, 4162, 4164, 4171, 4172, 4173, 4174, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4175, 4176, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4177, 4178, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4179, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4180, 4180, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4181, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 4182, 4183, 3952, 3952, 3952, 4184, 3952, 4184, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4185, 3952, 3952, 3952, 3952, 3952, 3952, 4164, 4186, 4162, +- 4187, 4164, 4164, 4188, 3952, 3952, 4186, 4186, 4189, 4189, +- 4190, 4191, 4172, 4191, 4191, 4192, 4192, 4162, 4193, 4193, +- 4194, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4177, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4195, 4196, 3952, 3952, 3952, 3952, 4197, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4198, 4181, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4182, 3952, 3952, 3952, 3952, 4184, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4162, 4164, 3952, 4186, 4162, 4190, +- 4191, 4187, 4193, 4164, 3952, 4189, 4186, 4172, 4191, 4172, +- 4199, 4191, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4195, 4195, 4200, 4196, 3952, 3952, 4197, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4198, 3952, 3952, 3952, 4201, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4184, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 4164, 4186, 4190, 4187, 4187, 4193, 4189, 4191, 4199, 4172, +- 4191, 4199, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4202, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4200, 3952, 3952, 4203, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4201, 4201, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4164, 4186, 4199, +- 4172, 4191, 4199, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4203, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4204, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 4205, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4199, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4204, 4204, 4206, +- 4207, 3952, 3952, 3952, 3952, 3952, 3952, 4205, 4205, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4208, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 4206, 4206, 4209, 4207, 4207, 4210, 3952, 3952, +- 4211, 3952, 3952, 3952, 4205, 4205, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4208, +- 4212, 3952, 3952, 3952, 3952, 3952, 3952, 4213, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4214, 3952, 4215, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 4209, 4210, 3952, 3952, 4211, 3952, 4211, 3952, 3952, 3952, +- 4205, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4212, 3952, +- 3952, 3952, 4213, 4213, 4216, 4217, 4218, 3952, 3952, 4219, +- 3952, 3952, 3952, 4214, 4220, 4215, 4221, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4211, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 4217, 3952, 4222, 4219, 4223, 4224, +- 4220, 4221, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 4211, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4222, 4223, +- 4224, 3952, 4224, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 4225, 3952, 4226, 4227, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4224, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 4225, 4225, 3952, 4226, +- 4228, 4227, 4229, 4230, 4231, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4232, 3952, +- 4233, 4224, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4228, +- 4229, 4230, 4234, 4231, 4235, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 4232, 4236, 4233, +- 4233, 4237, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 4234, 4235, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 4236, 4237, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 0, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952 ++ 3966, 3966, 3965, 3, 3967, 3967, 3, 3, 3968, 3968, ++ 3968, 3968, 3969, 3969, 3970, 3970, 3971, 3971, 3972, 3972, ++ 3973, 3973, 3967, 3967, 3967, 3967, 3974, 3974, 3975, 3975, ++ 3975, 3975, 3976, 3976, 3977, 3977, 3965, 37, 37, 37, ++ 3967, 3967, 3967, 3967, 3967, 3967, 3978, 3978, 3979, 3979, ++ 3980, 3980, 3981, 3981, 3982, 3982, 3983, 3983, 3984, 3984, ++ 3967, 3967, 3985, 3985, 3986, 3986, 3984, 3984, 3967, 3967, ++ 3987, 3987, 3988, 3988, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3989, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 131, 3965, 3965, 3965, 3990, 3990, 3990, 3965, ++ 3965, 3990, 3991, 3991, 3991, 3965, 3992, 3991, 3993, 3993, ++ 3993, 3965, 3994, 3965, 3993, 3995, 3995, 3965, 3995, 3965, ++ 3965, 3996, 3965, 3965, 3965, 3996, 3997, 3996, 3998, 3998, ++ 3998, 3965, 3999, 3998, 3965, 4000, 3965, 3998, 4001, 4001, ++ 4001, 3965, 4002, 4001, 4003, 4003, 4003, 3965, 3965, 4003, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4004, 4004, 3965, 3965, ++ 4004, 4005, 4005, 3965, 4006, 4005, 3965, 4007, 4008, 4009, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4010, 3965, 4011, 4010, 3965, 3965, 3965, 4012, 3965, 4013, ++ 3965, 4012, 3965, 3965, 3965, 4014, 4014, 4014, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4015, 3965, 4015, 4015, 4015, ++ 3965, 3965, 4015, 4015, 4015, 4016, 3965, 4017, 4016, 4016, ++ 4016, 3965, 4016, 4016, 4016, 4018, 3965, 4019, 4018, 4018, ++ 4018, 3965, 4018, 4018, 4018, 4020, 4020, 3965, 4020, 3965, ++ 4020, 4021, 3965, 4021, 3965, 4022, 4023, 4024, 4023, 4021, ++ 4025, 3965, 4026, 4025, 4025, 4025, 4025, 3965, 4025, 3965, ++ ++ 4027, 4028, 4029, 4028, 4030, 4028, 3965, 3965, 4025, 4025, ++ 4031, 3965, 4032, 4031, 4031, 4031, 3965, 4031, 4031, 4031, ++ 4033, 3965, 4033, 4033, 3965, 4033, 3965, 3965, 4033, 4033, ++ 4033, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 4034, 3965, 4034, 3965, 3965, 4034, ++ 4035, 3965, 4036, 4035, 3965, 4035, 4037, 4038, 4039, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4040, 3965, 4041, ++ 4040, 3965, 4040, 3965, 4042, 3965, 4043, 4042, 3965, 4042, ++ 4044, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4045, ++ 3965, 3965, 4045, 4045, 4046, 4047, 3965, 3965, 4047, 4047, ++ 4048, 4049, 3965, 3965, 4049, 4049, 3965, 3965, 4050, 4051, ++ 4050, 4052, 4053, 4054, 4054, 4054, 4053, 4055, 4056, 3965, ++ 3965, 4057, 4058, 4057, 4059, 4057, 4060, 4061, 4061, 4061, ++ 4062, 4062, 4062, 4063, 4061, 4056, 4056, 4064, 4065, 3965, ++ 3965, 4065, 4065, 3965, 4066, 3965, 3965, 4066, 3965, 4066, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4067, 3965, 3965, 4068, 4069, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4070, 4071, 3965, 3965, 4072, ++ 4073, 3965, 3965, 4074, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4075, 3965, 4075, ++ 4076, 3965, 4076, 4077, 3965, 4077, 3965, 4078, 4079, 4079, ++ 4079, 4080, 4078, 4080, 4080, 3965, 4081, 3965, 3965, 4081, ++ 3965, 4056, 3965, 4082, 4082, 4082, 4083, 4084, 4083, 4083, ++ 4085, 4086, 4082, 4087, 4084, 4085, 4084, 4084, 4056, 4088, ++ ++ 4056, 3965, 4088, 3965, 4088, 4088, 4089, 4056, 4090, 3965, ++ 4090, 4091, 3965, 4091, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4092, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4093, 3965, 4094, ++ ++ 3965, 3965, 3965, 3965, 3965, 4095, 3965, 4096, 3965, 4097, ++ 4097, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 4098, 3965, 4099, 3965, 4100, 4101, 4102, ++ 4103, 3965, 4082, 4104, 4104, 4104, 4085, 4082, 4084, 4085, ++ 4084, 4105, 4084, 4106, 4107, 4108, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4109, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4092, 4110, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4111, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 4112, 3965, 3965, 3965, ++ 3965, 4113, 3965, 4114, 3965, 4115, 4115, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4101, ++ 4102, 4101, 4102, 4104, 4084, 4104, 4085, 4104, 4085, 4116, ++ 4085, 4085, 4084, 4106, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4109, 4117, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4118, 3965, 3965, 3965, 4110, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4111, 3965, 4111, 4119, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 4115, 4115, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4104, 4085, ++ 4105, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4117, 4120, 4109, 4117, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4121, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4111, 3965, 4119, 3965, 3965, 3965, 4115, 4122, ++ 3965, 3965, 4123, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4085, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4109, 4117, 3965, 4120, 4109, 3965, 4124, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4111, 3965, 4115, 4125, ++ 4126, 3965, 3965, 4127, 4123, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4128, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4117, 3965, 4120, 4120, 3965, ++ ++ 4124, 4129, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4130, 4125, 4125, 4126, 4126, 3965, ++ 3965, 4127, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4131, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4132, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4128, 4133, 4128, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4134, 3965, 4129, 4135, ++ 4129, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4136, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4137, 4138, 4125, 3965, 4125, 4126, 4126, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4139, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4131, 4140, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4141, ++ 3965, 3965, 3965, 3965, 4142, 4132, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4128, 4133, 3965, 4133, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4134, 4143, 4144, 3965, ++ ++ 4129, 4135, 3965, 4135, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4136, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4137, 4145, ++ 4138, 4146, 3965, 3965, 3965, 3965, 3965, 4147, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4148, 4139, 4149, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4140, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4141, 3965, 3965, 3965, 3965, 4142, 3965, 3965, 3965, 3965, ++ 3965, 4150, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4133, 3965, ++ 4128, 4133, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 4151, 4143, 4152, 4134, 4153, 4154, 4143, 4155, 3965, ++ 3965, 4156, 3965, 4157, 4156, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4158, 4159, 3965, 4160, 4161, 3965, 3965, 3965, 3965, ++ 3965, 4162, 4163, 4164, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4165, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4166, 4167, 4168, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 4169, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4170, 3965, 3965, 4171, 4171, 4172, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4173, 4174, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4175, 4176, 4177, 4178, 3965, 4179, 4180, ++ ++ 4176, 4181, 4182, 4183, 4184, 4175, 4177, 4184, 4185, 4186, ++ 4187, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4188, 4189, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4190, 4191, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4192, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4193, 4193, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4194, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 4195, 4196, 3965, 3965, 3965, ++ 4197, 3965, 4197, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4198, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4177, 4199, 4175, 4200, 4177, 4177, 4201, 3965, 3965, ++ 4199, 4199, 4202, 4202, 4203, 4204, 4185, 4204, 4204, 4205, ++ 4205, 4175, 4206, 4206, 4207, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4190, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4208, 4209, 3965, ++ 3965, 3965, 3965, 4210, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4211, 4194, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4195, 3965, 3965, 3965, 3965, 4197, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4175, ++ 4177, 3965, 4199, 4175, 4203, 4204, 4200, 4206, 4177, 3965, ++ 4202, 4199, 4185, 4204, 4185, 4212, 4204, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4208, 4208, 4213, 4209, ++ 3965, 3965, 4210, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4211, 3965, 3965, ++ 3965, 4214, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4197, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 4177, 4199, 4203, 4200, ++ 4200, 4206, 4202, 4204, 4212, 4185, 4204, 4212, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4215, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4213, 3965, 3965, ++ 4216, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4214, ++ 4214, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 4177, 4199, 4212, 4185, 4204, 4212, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4216, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4217, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4218, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4212, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4217, 4217, 4219, 4220, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4218, 4218, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4221, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4219, 4219, 4222, 4220, 4220, 4223, 3965, 3965, 4224, ++ 3965, 3965, 3965, 4218, 4218, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4221, ++ 4225, 3965, 3965, 3965, 3965, 3965, 3965, 4226, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4227, 3965, 4228, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4222, 4223, 3965, 3965, 4224, 3965, 4224, 3965, 3965, 3965, ++ 4218, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4225, ++ 3965, 3965, 3965, 4226, 4226, 4229, 4230, 4231, 3965, 3965, ++ ++ 4232, 3965, 3965, 3965, 4227, 4233, 4228, 4234, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4224, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4230, 3965, 4235, 4232, ++ 4236, 4237, 4233, 4234, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4224, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 4235, 4236, 4237, 3965, 4237, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 4238, 3965, 4239, 4240, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 4237, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 4238, ++ 4238, 3965, 4239, 4241, 4240, 4242, 4243, 4244, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 4245, 3965, 4246, 4237, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 4241, 4242, 4243, 4247, 4244, 4248, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 4245, 4249, 4246, 4246, 4250, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 4247, 4248, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 4249, 4250, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 0, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965 + } ; + +-static const flex_int16_t yy_nxt[14349] = ++static const flex_int16_t yy_nxt[14371] = + { 0, +- 3952, 77, 78, 79, 77, 118, 80, 81, 118, 118, +- 283, 284, 118, 3952, 82, 119, 120, 121, 119, 122, +- 123, 3952, 129, 98, 124, 129, 130, 98, 125, 1394, +- 83, 135, 84, 85, 3939, 269, 136, 86, 87, 88, +- 315, 316, 98, 89, 90, 91, 135, 92, 93, 3932, ++ 3965, 77, 78, 79, 77, 118, 80, 81, 118, 118, ++ 283, 284, 118, 3965, 82, 119, 120, 121, 119, 122, ++ 123, 3965, 129, 98, 124, 129, 130, 98, 125, 1394, ++ 83, 135, 84, 85, 3952, 269, 136, 86, 87, 88, ++ 315, 316, 98, 89, 90, 91, 135, 92, 93, 3945, + 131, 136, 94, 1110, 138, 139, 95, 138, 83, 874, + 84, 85, 140, 269, 141, 86, 87, 88, 256, 270, + 126, 89, 90, 91, 1395, 92, 93, 132, 283, 284, +@@ -1880,10 +1883,10 @@ static const flex_int16_t yy_nxt[14349] = + 256, 129, 130, 271, 82, 157, 158, 270, 157, 127, + + 96, 272, 129, 98, 233, 129, 130, 257, 234, 142, +- 83, 235, 84, 85, 273, 3923, 131, 86, 87, 88, ++ 83, 235, 84, 85, 273, 3936, 131, 86, 87, 88, + 274, 271, 1010, 89, 90, 91, 275, 92, 93, 272, + 133, 280, 94, 526, 318, 527, 95, 318, 83, 1011, +- 84, 85, 273, 132, 3922, 86, 87, 88, 274, 3952, ++ 84, 85, 273, 132, 3935, 86, 87, 88, 274, 3965, + 159, 89, 90, 91, 275, 92, 93, 132, 236, 280, + 94, 96, 97, 98, 96, 97, 96, 96, 96, 96, + 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, +@@ -1896,8 +1899,8 @@ static const flex_int16_t yy_nxt[14349] = + 96, 106, 96, 107, 108, 109, 110, 111, 112, 113, + 96, 114, 115, 96, 96, 96, 96, 117, 119, 120, + 121, 119, 122, 123, 281, 129, 98, 124, 129, 130, +- 3900, 125, 138, 139, 2298, 138, 144, 145, 3899, 144, +- 140, 146, 141, 228, 147, 229, 144, 145, 2500, 144, ++ 3913, 125, 138, 139, 2299, 138, 144, 145, 3912, 144, ++ 140, 146, 141, 228, 147, 229, 144, 145, 2502, 144, + 230, 146, 281, 133, 147, 150, 151, 347, 150, 347, + 152, 150, 151, 153, 150, 526, 152, 527, 154, 153, + +@@ -1905,12 +1908,12 @@ static const flex_int16_t yy_nxt[14349] = + 132, 489, 267, 569, 276, 180, 181, 142, 180, 289, + 182, 148, 277, 183, 569, 163, 164, 231, 163, 282, + 165, 148, 127, 96, 348, 166, 186, 187, 163, 188, +- 155, 167, 276, 3889, 189, 278, 155, 289, 163, 164, ++ 155, 167, 276, 3902, 189, 278, 155, 289, 163, 164, + 277, 163, 163, 165, 231, 290, 268, 347, 166, 347, + 159, 163, 279, 645, 167, 490, 170, 171, 295, 170, +- 184, 172, 3793, 278, 173, 163, 174, 301, 357, 175, +- 168, 358, 176, 290, 170, 171, 3829, 170, 302, 172, +- 279, 190, 173, 177, 174, 3859, 295, 175, 186, 187, ++ 184, 172, 3806, 278, 173, 163, 174, 301, 357, 175, ++ 168, 358, 176, 290, 170, 171, 3842, 170, 302, 172, ++ 279, 190, 173, 177, 174, 3872, 295, 175, 186, 187, + + 176, 188, 646, 168, 348, 301, 189, 474, 475, 163, + 163, 177, 497, 498, 170, 171, 302, 170, 303, 172, +@@ -1920,10 +1923,10 @@ static const flex_int16_t yy_nxt[14349] = + 181, 176, 180, 190, 182, 313, 252, 183, 214, 215, + 216, 217, 177, 191, 314, 214, 215, 216, 217, 178, + 191, 191, 296, 351, 297, 226, 441, 487, 191, 441, +- 487, 226, 488, 313, 254, 438, 439, 440, 438, 3858, +- 178, 502, 314, 3851, 502, 503, 504, 283, 284, 286, ++ 487, 226, 488, 313, 254, 438, 439, 440, 438, 3871, ++ 178, 502, 314, 3864, 502, 503, 504, 283, 284, 286, + +- 296, 352, 297, 3829, 184, 191, 192, 193, 194, 192, ++ 296, 352, 297, 3842, 184, 191, 192, 193, 194, 192, + 191, 195, 191, 191, 191, 191, 191, 191, 191, 196, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 197, 198, 199, 200, 201, +@@ -1934,58 +1937,58 @@ static const flex_int16_t yy_nxt[14349] = + 208, 209, 210, 191, 211, 191, 212, 191, 191, 191, + 191, 191, 218, 219, 220, 221, 359, 222, 218, 219, + +- 220, 221, 369, 222, 218, 219, 220, 221, 3826, 222, ++ 220, 221, 369, 222, 218, 219, 220, 221, 3839, 222, + 218, 219, 220, 221, 233, 222, 291, 252, 234, 242, + 253, 235, 315, 316, 352, 252, 259, 242, 292, 260, + 352, 261, 327, 259, 259, 327, 260, 557, 261, 252, + 557, 259, 590, 318, 291, 590, 318, 223, 259, 422, + 243, 242, 244, 223, 422, 259, 292, 395, 243, 223, +- 244, 245, 246, 247, 248, 223, 2298, 254, 236, 245, ++ 244, 245, 246, 247, 248, 223, 2299, 254, 236, 245, + 246, 247, 248, 242, 263, 264, 262, 263, 243, 619, + 244, 414, 243, 262, 244, 400, 243, 265, 244, 245, + 246, 247, 248, 245, 246, 247, 248, 245, 246, 247, + +- 248, 423, 287, 489, 243, 288, 244, 293, 2888, 400, ++ 248, 423, 287, 489, 243, 288, 244, 293, 2892, 400, + 243, 298, 244, 306, 294, 245, 246, 247, 248, 428, +- 304, 245, 246, 247, 248, 299, 620, 3820, 307, 265, ++ 304, 245, 246, 247, 248, 299, 620, 3833, 307, 265, + 287, 300, 243, 288, 244, 293, 305, 308, 407, 298, +- 408, 306, 294, 245, 246, 247, 248, 400, 304, 3794, ++ 408, 306, 294, 245, 246, 247, 248, 400, 304, 3807, + 310, 584, 309, 299, 311, 312, 307, 490, 357, 300, +- 446, 358, 584, 2298, 305, 308, 319, 320, 321, 319, ++ 446, 358, 584, 2299, 305, 308, 319, 320, 321, 319, + 452, 322, 323, 320, 321, 323, 412, 324, 310, 413, + 309, 398, 311, 312, 325, 321, 321, 325, 446, 326, + 323, 320, 321, 323, 447, 324, 455, 342, 452, 349, + +- 343, 448, 349, 353, 354, 3049, 422, 347, 359, 347, ++ 343, 448, 349, 353, 354, 3054, 422, 347, 359, 347, + 347, 422, 347, 449, 344, 345, 364, 365, 474, 475, + 357, 320, 447, 358, 455, 342, 414, 320, 343, 448, +- 360, 377, 378, 360, 377, 357, 3787, 412, 358, 321, ++ 360, 377, 378, 360, 377, 357, 3800, 412, 358, 321, + 413, 449, 344, 345, 459, 320, 328, 329, 330, 331, + 332, 333, 465, 334, 350, 472, 335, 355, 423, 662, + 336, 367, 337, 338, 368, 339, 340, 341, 285, 367, + 363, 285, 459, 874, 328, 329, 330, 331, 332, 333, +- 465, 334, 3647, 472, 335, 361, 379, 414, 336, 367, ++ 465, 334, 3657, 472, 335, 361, 379, 414, 336, 367, + 337, 338, 368, 339, 340, 341, 370, 367, 663, 370, + + 742, 367, 377, 378, 368, 377, 374, 375, 450, 367, + 367, 369, 875, 368, 377, 380, 381, 377, 367, 383, + 383, 451, 383, 427, 383, 383, 383, 473, 383, 347, +- 383, 347, 383, 645, 637, 3716, 450, 637, 383, 369, +- 392, 386, 3741, 393, 470, 394, 383, 471, 392, 451, +- 441, 371, 383, 441, 743, 473, 2298, 379, 383, 388, ++ 383, 347, 383, 645, 637, 3727, 450, 637, 383, 369, ++ 392, 386, 3753, 393, 470, 394, 383, 471, 392, 451, ++ 441, 371, 383, 441, 743, 473, 2299, 379, 383, 388, + 373, 383, 392, 383, 870, 383, 383, 508, 383, 379, + 383, 388, 646, 453, 384, 471, 348, 1572, 383, 424, + 384, 396, 425, 454, 396, 383, 392, 422, 460, 393, +- 395, 394, 383, 3737, 392, 509, 461, 392, 3060, 514, ++ 395, 394, 383, 3749, 392, 509, 461, 392, 3065, 514, + + 393, 453, 394, 383, 383, 392, 662, 625, 392, 383, + 383, 454, 499, 389, 668, 499, 460, 500, 392, 392, + 390, 393, 1573, 394, 461, 391, 392, 509, 391, 401, +- 392, 520, 872, 403, 426, 404, 397, 749, 405, 2274, +- 392, 2275, 383, 388, 409, 410, 569, 395, 392, 383, ++ 392, 520, 872, 403, 426, 404, 397, 749, 405, 2275, ++ 392, 2276, 383, 388, 409, 410, 569, 395, 392, 383, + 383, 393, 392, 394, 626, 415, 392, 569, 415, 520, +- 412, 669, 521, 413, 3716, 419, 420, 501, 395, 412, +- 392, 3709, 413, 659, 429, 430, 422, 497, 498, 442, ++ 412, 669, 521, 413, 3727, 419, 420, 501, 395, 412, ++ 392, 3720, 413, 659, 429, 430, 422, 497, 498, 442, + 406, 422, 432, 433, 434, 432, 456, 522, 443, 466, + 521, 750, 444, 467, 462, 435, 523, 445, 399, 468, + +@@ -1996,7 +1999,7 @@ static const flex_int16_t yy_nxt[14349] = + 476, 477, 478, 476, 480, 477, 478, 481, 482, 483, + 484, 482, 507, 485, 482, 483, 484, 491, 524, 485, + 492, 493, 494, 492, 512, 495, 525, 513, 529, 531, +- 507, 530, 538, 2276, 529, 2277, 529, 530, 510, 542, ++ 507, 530, 538, 2277, 529, 2278, 529, 530, 510, 542, + 514, 674, 529, 543, 536, 514, 524, 537, 267, 536, + 529, 267, 536, 544, 525, 436, 529, 534, 545, 436, + +@@ -2012,13 +2015,13 @@ static const flex_int16_t yy_nxt[14349] = + 573, 574, 588, 589, 323, 327, 575, 323, 327, 324, + + 576, 579, 754, 582, 577, 325, 578, 583, 325, 585, +- 326, 580, 581, 593, 594, 586, 587, 595, 598, 3708, ++ 326, 580, 581, 593, 594, 586, 587, 595, 598, 3719, + 588, 589, 319, 320, 321, 319, 889, 322, 323, 320, + 321, 323, 604, 324, 325, 321, 321, 325, 599, 326, + 596, 593, 594, 597, 606, 595, 598, 605, 607, 755, + 265, 610, 600, 601, 602, 1329, 603, 611, 612, 614, + 604, 1117, 613, 615, 617, 608, 599, 682, 596, 618, +- 609, 597, 606, 613, 989, 605, 607, 320, 3671, 610, ++ 609, 597, 606, 613, 989, 605, 607, 320, 3682, 610, + 600, 601, 602, 320, 603, 611, 612, 614, 616, 321, + 613, 615, 617, 608, 891, 682, 349, 618, 609, 349, + +@@ -2027,49 +2030,49 @@ static const flex_int16_t yy_nxt[14349] = + 347, 347, 357, 363, 360, 358, 627, 360, 990, 357, + 600, 601, 358, 364, 365, 357, 629, 758, 358, 629, + 625, 357, 630, 683, 358, 367, 357, 632, 368, 358, +- 2480, 350, 2481, 367, 373, 370, 622, 633, 370, 2298, ++ 2482, 350, 2483, 367, 373, 370, 622, 633, 370, 2299, + 367, 620, 355, 368, 441, 348, 348, 441, 367, 374, + 375, 683, 359, 628, 367, 635, 631, 368, 635, 361, + 367, 367, 367, 368, 759, 363, 636, 626, 367, 684, + 367, 359, 584, 368, 412, 369, 359, 413, 367, 377, + +- 378, 3049, 377, 584, 634, 377, 378, 685, 377, 650, ++ 378, 3054, 377, 584, 634, 377, 378, 685, 377, 650, + 371, 377, 380, 381, 377, 377, 638, 684, 377, 383, + 383, 686, 383, 632, 373, 874, 383, 383, 399, 383, + 369, 383, 383, 392, 734, 685, 648, 734, 394, 383, + 369, 392, 383, 640, 414, 383, 383, 383, 687, 686, +- 2809, 419, 420, 383, 379, 640, 651, 2985, 668, 688, ++ 2812, 419, 420, 383, 379, 640, 651, 2989, 668, 688, + 379, 736, 383, 388, 736, 383, 379, 383, 487, 383, + 379, 487, 422, 488, 390, 388, 687, 422, 643, 383, + 388, 384, 383, 649, 382, 383, 383, 688, 383, 383, + 383, 392, 388, 1323, 393, 643, 394, 641, 383, 392, + +- 2810, 429, 430, 383, 383, 669, 383, 2986, 674, 431, ++ 2813, 429, 430, 383, 383, 669, 383, 2990, 674, 431, + 383, 383, 383, 392, 676, 392, 399, 389, 393, 399, +- 394, 399, 689, 392, 423, 396, 642, 640, 396, 2274, +- 392, 2275, 660, 393, 647, 394, 3656, 392, 392, 418, ++ 394, 399, 689, 392, 423, 396, 642, 640, 396, 2275, ++ 392, 2276, 660, 393, 647, 394, 3666, 392, 392, 418, + 390, 395, 670, 399, 409, 410, 383, 388, 392, 806, +- 689, 648, 392, 394, 392, 675, 392, 393, 3952, 394, ++ 689, 648, 392, 394, 392, 675, 392, 393, 3965, 394, + 806, 677, 392, 383, 388, 395, 315, 316, 431, 383, + 383, 406, 285, 676, 391, 285, 392, 391, 391, 392, + 397, 391, 653, 392, 654, 809, 403, 655, 404, 671, + 412, 405, 487, 413, 658, 487, 809, 488, 649, 661, + + 399, 392, 693, 673, 399, 392, 870, 412, 391, 391, +- 413, 391, 391, 392, 392, 3952, 403, 664, 404, 404, ++ 413, 391, 391, 392, 392, 3965, 403, 664, 404, 404, + 677, 405, 405, 415, 658, 658, 415, 427, 412, 656, + 693, 413, 1102, 406, 666, 392, 391, 666, 422, 392, + 418, 667, 393, 422, 394, 392, 672, 392, 393, 672, + 394, 412, 424, 392, 413, 425, 744, 414, 657, 744, + 422, 392, 391, 406, 665, 678, 1117, 392, 679, 680, +- 2525, 422, 697, 422, 872, 698, 422, 699, 416, 620, ++ 2527, 422, 697, 422, 872, 698, 422, 699, 416, 620, + 694, 432, 433, 434, 432, 438, 439, 440, 438, 395, + 431, 695, 391, 391, 435, 395, 690, 700, 691, 701, + + 697, 414, 692, 698, 702, 699, 704, 426, 694, 705, + 707, 706, 708, 710, 713, 703, 714, 716, 715, 695, + 423, 711, 709, 423, 690, 700, 691, 701, 717, 731, +- 692, 712, 702, 888, 704, 3611, 436, 705, 707, 706, ++ 692, 712, 702, 888, 704, 3621, 436, 705, 707, 706, + 708, 710, 713, 703, 714, 716, 715, 732, 737, 711, + 709, 737, 733, 738, 1117, 502, 717, 731, 502, 712, + 718, 719, 740, 720, 662, 740, 721, 741, 722, 762, +@@ -2079,12 +2082,12 @@ static const flex_int16_t yy_nxt[14349] = + + 725, 763, 726, 663, 727, 728, 729, 730, 480, 477, + 478, 480, 480, 477, 478, 481, 482, 483, 484, 482, +- 889, 485, 492, 493, 494, 492, 2887, 495, 482, 483, ++ 889, 485, 492, 493, 494, 492, 2891, 495, 482, 483, + 484, 491, 502, 485, 1124, 502, 436, 492, 493, 494, +- 492, 499, 495, 2507, 499, 751, 500, 506, 751, 510, ++ 492, 499, 495, 2509, 499, 751, 500, 506, 751, 510, + 752, 506, 506, 764, 756, 512, 506, 516, 513, 512, + 760, 765, 513, 436, 834, 529, 529, 436, 530, 766, +- 3599, 486, 768, 529, 529, 834, 529, 496, 775, 530, ++ 3609, 486, 768, 529, 529, 834, 529, 496, 775, 530, + 776, 764, 536, 486, 529, 770, 777, 529, 891, 765, + 536, 533, 496, 772, 557, 540, 501, 557, 529, 507, + +@@ -2093,11 +2096,11 @@ static const flex_int16_t yy_nxt[14349] = + 537, 782, 536, 783, 784, 536, 533, 785, 536, 800, + 778, 537, 771, 536, 801, 803, 536, 804, 779, 536, + 773, 780, 802, 805, 807, 802, 781, 808, 810, 782, +- 536, 783, 784, 2298, 3592, 785, 811, 800, 266, 3590, +- 812, 813, 801, 803, 814, 804, 590, 538, 3575, 590, +- 835, 805, 807, 835, 2525, 808, 810, 815, 540, 786, ++ 536, 783, 784, 2299, 3602, 785, 811, 800, 266, 3600, ++ 812, 813, 801, 803, 814, 804, 590, 538, 3584, 590, ++ 835, 805, 807, 835, 2527, 808, 810, 815, 540, 786, + 816, 787, 788, 817, 811, 789, 790, 791, 812, 813, +- 818, 792, 814, 819, 793, 3060, 794, 795, 796, 797, ++ 818, 792, 814, 819, 793, 3065, 794, 795, 796, 797, + + 824, 798, 799, 825, 820, 815, 826, 786, 816, 787, + 788, 817, 827, 789, 790, 791, 822, 823, 818, 792, +@@ -2108,13 +2111,13 @@ static const flex_int16_t yy_nxt[14349] = + 852, 829, 853, 830, 831, 832, 836, 837, 854, 838, + 839, 840, 855, 856, 841, 842, 857, 843, 844, 351, + 845, 846, 847, 833, 848, 849, 850, 851, 852, 347, +- 853, 347, 870, 3529, 357, 623, 854, 358, 623, 637, ++ 853, 347, 870, 3538, 357, 623, 854, 358, 623, 637, + + 855, 856, 637, 347, 857, 347, 860, 355, 867, 860, +- 629, 867, 3496, 629, 347, 357, 347, 863, 358, 2525, +- 863, 367, 357, 889, 368, 358, 3431, 635, 879, 367, +- 635, 871, 367, 3416, 866, 368, 858, 866, 880, 367, +- 367, 645, 368, 399, 861, 3411, 399, 367, 399, 3410, ++ 629, 867, 3504, 629, 347, 357, 347, 863, 358, 2527, ++ 863, 367, 357, 889, 368, 358, 3439, 635, 879, 367, ++ 635, 871, 367, 3424, 866, 368, 858, 866, 880, 367, ++ 367, 645, 368, 399, 861, 3418, 399, 367, 399, 3417, + 348, 383, 640, 428, 383, 734, 383, 1069, 734, 886, + 872, 348, 890, 902, 640, 359, 412, 868, 1069, 413, + 399, 864, 359, 903, 383, 640, 662, 383, 383, 382, +@@ -2126,21 +2129,21 @@ static const flex_int16_t yy_nxt[14349] = + 392, 921, 922, 924, 874, 925, 887, 888, 916, 873, + 590, 917, 912, 590, 392, 642, 640, 926, 389, 918, + 736, 906, 919, 736, 904, 980, 920, 647, 980, 921, +- 922, 924, 672, 925, 2276, 672, 2277, 412, 642, 640, ++ 922, 924, 672, 925, 2277, 672, 2278, 412, 642, 640, + 413, 983, 882, 875, 983, 926, 911, 878, 388, 911, +- 391, 412, 3404, 391, 413, 392, 383, 388, 653, 391, ++ 391, 412, 3411, 391, 413, 392, 383, 388, 653, 391, + 654, 927, 391, 655, 392, 428, 884, 653, 391, 654, + 928, 391, 655, 392, 929, 884, 892, 392, 654, 744, + + 391, 655, 744, 391, 884, 392, 392, 414, 894, 927, + 895, 1104, 1117, 896, 399, 391, 897, 399, 928, 399, +- 3368, 414, 929, 391, 932, 656, 899, 392, 392, 2525, ++ 3375, 414, 929, 391, 932, 656, 899, 392, 392, 2527, + 660, 403, 391, 404, 656, 391, 900, 392, 933, 658, +- 403, 399, 404, 893, 3309, 405, 934, 936, 658, 937, ++ 403, 399, 404, 893, 3316, 405, 934, 936, 658, 937, + 392, 938, 932, 678, 657, 898, 679, 391, 626, 392, + 899, 422, 392, 657, 1117, 403, 933, 404, 914, 406, + 900, 915, 657, 658, 934, 936, 422, 937, 406, 938, +- 1327, 3301, 3296, 391, 392, 939, 391, 659, 392, 940, ++ 1327, 3308, 3302, 391, 392, 939, 391, 659, 392, 940, + 941, 403, 666, 404, 1572, 666, 405, 392, 399, 658, + + 393, 908, 394, 1510, 908, 392, 392, 901, 423, 393, +@@ -2151,19 +2154,19 @@ static const flex_int16_t yy_nxt[14349] = + 966, 961, 945, 947, 953, 954, 395, 949, 950, 967, + 951, 952, 968, 957, 969, 958, 962, 391, 955, 959, + 956, 964, 948, 960, 963, 970, 972, 978, 966, 961, +- 991, 965, 3270, 991, 971, 949, 950, 967, 951, 952, ++ 991, 965, 3276, 991, 971, 949, 950, 967, 951, 952, + 968, 957, 969, 958, 962, 508, 973, 959, 974, 964, + + 975, 506, 2143, 970, 972, 978, 506, 995, 737, 965, +- 995, 737, 971, 738, 981, 740, 3255, 981, 740, 982, ++ 995, 737, 971, 738, 981, 740, 3261, 981, 740, 982, + 741, 1002, 984, 510, 973, 984, 974, 985, 975, 987, + 747, 1003, 987, 747, 988, 748, 992, 751, 1004, 992, + 751, 993, 752, 996, 512, 1005, 996, 513, 997, 1002, + 1012, 1013, 529, 998, 1014, 530, 266, 1015, 1016, 1003, + 529, 1017, 536, 1018, 1019, 537, 1004, 536, 1020, 1021, +- 536, 2525, 1022, 1005, 529, 2480, 1036, 2481, 1012, 1013, ++ 536, 2527, 1022, 1005, 529, 2482, 1036, 2483, 1012, 1013, + 1037, 1025, 1014, 1038, 536, 1015, 1016, 1023, 1026, 1017, +- 1024, 1018, 1019, 2525, 1000, 1027, 1020, 1021, 1034, 1028, ++ 1024, 1018, 1019, 2527, 1000, 1027, 1020, 1021, 1034, 1028, + + 1022, 1043, 1006, 1029, 1036, 1031, 1039, 1030, 1037, 1025, + 1041, 1038, 1008, 1046, 1047, 1023, 1026, 1035, 1024, 1032, +@@ -2172,7 +2175,7 @@ static const flex_int16_t yy_nxt[14349] = + 1055, 1046, 1047, 1049, 1056, 1035, 1057, 1032, 1048, 1033, + 1040, 1058, 1052, 1042, 1059, 1060, 1044, 1061, 1045, 1063, + 1064, 1065, 1066, 1067, 1068, 1053, 1070, 1071, 1055, 1072, +- 1074, 1075, 1056, 1050, 1057, 1078, 2525, 1079, 835, 1058, ++ 1074, 1075, 1056, 1050, 1057, 1078, 2527, 1079, 835, 1058, + 1080, 835, 1059, 1060, 1081, 1061, 1082, 1063, 1064, 1065, + 1066, 1067, 1068, 1076, 1070, 1071, 1083, 1072, 1074, 1075, + +@@ -2185,33 +2188,33 @@ static const flex_int16_t yy_nxt[14349] = + 347, 357, 347, 373, 358, 867, 1107, 866, 867, 870, + 866, 390, 367, 669, 632, 368, 383, 640, 622, 383, + 367, 383, 874, 1905, 1114, 835, 1108, 675, 835, 640, +- 889, 3205, 868, 383, 640, 1112, 383, 392, 383, 1130, ++ 889, 3211, 868, 383, 640, 1112, 383, 392, 383, 1130, + +- 1111, 3057, 394, 383, 628, 392, 640, 348, 2507, 868, ++ 1111, 3062, 394, 383, 628, 392, 640, 348, 2509, 868, + 872, 359, 431, 634, 399, 418, 391, 1129, 1127, 391, + 383, 392, 369, 1076, 653, 391, 1113, 1130, 391, 655, +- 392, 641, 884, 653, 1076, 654, 1115, 872, 655, 3055, +- 428, 884, 651, 392, 889, 2298, 391, 649, 873, 391, ++ 392, 641, 884, 653, 1076, 654, 1115, 872, 655, 3060, ++ 428, 884, 651, 392, 889, 2299, 391, 649, 873, 391, + 979, 392, 392, 979, 653, 399, 1113, 1460, 891, 655, + 642, 640, 884, 1131, 677, 671, 1205, 914, 1460, 399, + 915, 656, 399, 392, 399, 422, 391, 642, 640, 391, +- 885, 392, 1713, 1116, 894, 886, 895, 3331, 1132, 896, ++ 885, 392, 1713, 1116, 894, 886, 895, 3338, 1132, 896, + 399, 1131, 897, 399, 391, 399, 399, 391, 1133, 392, + + 657, 885, 653, 392, 654, 1134, 1119, 655, 1135, 657, +- 884, 980, 891, 755, 980, 911, 1132, 399, 911, 3194, +- 412, 392, 423, 413, 656, 3185, 1133, 1714, 1136, 1193, +- 657, 888, 1193, 1134, 391, 2810, 1135, 391, 391, 392, +- 2985, 391, 894, 392, 895, 898, 894, 896, 1121, 1118, +- 897, 896, 392, 888, 897, 393, 1136, 394, 2987, 391, ++ 884, 980, 891, 755, 980, 911, 1132, 399, 911, 3200, ++ 412, 392, 423, 413, 656, 3191, 1133, 1714, 1136, 1193, ++ 657, 888, 1193, 1134, 391, 2813, 1135, 391, 391, 392, ++ 2989, 391, 894, 392, 895, 898, 894, 896, 1121, 1118, ++ 897, 896, 392, 888, 897, 393, 1136, 394, 2991, 391, + 392, 392, 391, 392, 392, 392, 393, 1122, 394, 895, + 414, 392, 896, 891, 392, 897, 981, 983, 657, 981, + 983, 982, 1140, 1141, 1143, 392, 391, 1145, 1146, 898, +- 2810, 391, 1137, 898, 391, 908, 392, 1138, 908, 1125, ++ 2813, 391, 1137, 898, 391, 908, 392, 1138, 908, 1125, + +- 392, 404, 395, 393, 405, 394, 3142, 658, 392, 1139, ++ 392, 404, 395, 393, 405, 394, 3147, 658, 392, 1139, + 1140, 1141, 1143, 395, 1123, 1145, 1146, 1147, 391, 1148, +- 1137, 1149, 392, 3101, 2525, 1138, 1144, 1144, 1144, 1144, ++ 1137, 1149, 392, 3106, 2527, 1138, 1144, 1144, 1144, 1144, + 1144, 1144, 1144, 1144, 1144, 1150, 1151, 1139, 1152, 1153, + 1154, 1155, 1156, 1159, 1160, 1147, 665, 1148, 1161, 1149, + 395, 931, 931, 931, 931, 931, 931, 931, 931, 931, +@@ -2221,30 +2224,30 @@ static const flex_int16_t yy_nxt[14349] = + 1164, 1180, 1182, 1165, 1183, 1181, 1185, 1184, 1186, 1187, + + 1188, 1168, 1189, 1190, 1192, 1167, 1169, 1170, 1171, 1172, +- 1173, 1174, 1175, 1176, 1177, 1178, 3063, 1905, 1194, 1180, ++ 1173, 1174, 1175, 1176, 1177, 1178, 3068, 1905, 1194, 1180, + 1182, 1194, 1183, 1181, 1185, 1184, 1186, 1187, 1188, 1207, +- 1189, 1190, 1192, 984, 1195, 3055, 984, 1195, 985, 1196, +- 987, 1197, 2880, 987, 1197, 988, 1198, 991, 3042, 1198, ++ 1189, 1190, 1192, 984, 1195, 3060, 984, 1195, 985, 1196, ++ 987, 1197, 2884, 987, 1197, 988, 1198, 991, 3047, 1198, + 991, 1199, 992, 1201, 1209, 992, 1201, 993, 1202, 995, + 1210, 1202, 995, 1203, 996, 1204, 510, 996, 1204, 997, + 516, 1206, 1211, 1208, 1213, 529, 759, 1215, 1212, 1218, + 1219, 536, 1209, 529, 1214, 1220, 536, 1221, 1210, 536, +- 3002, 1222, 1460, 533, 1223, 1224, 540, 3001, 1225, 1226, ++ 3014, 1222, 1460, 533, 1223, 1224, 540, 3006, 1225, 1226, + + 1211, 1227, 1228, 1460, 1229, 1230, 1235, 1218, 1219, 1231, +- 1232, 1233, 1234, 1220, 1238, 1221, 1239, 3146, 757, 1222, ++ 1232, 1233, 1234, 1220, 1238, 1221, 1239, 3151, 757, 1222, + 761, 769, 1223, 1224, 773, 767, 1225, 1226, 1240, 1227, + 1228, 771, 1229, 1230, 1235, 1241, 1242, 1231, 1232, 1233, + 1234, 1236, 1238, 1243, 1239, 1237, 1244, 1245, 1246, 1247, + 1250, 1253, 1255, 1248, 1251, 1249, 1240, 1256, 1252, 1257, +- 1258, 1259, 1260, 1241, 1242, 1265, 1266, 2810, 1254, 1236, ++ 1258, 1259, 1260, 1241, 1242, 1265, 1266, 2813, 1254, 1236, + 1269, 1243, 1270, 1237, 1244, 1245, 1246, 1247, 1250, 1253, + 1255, 1248, 1251, 1249, 1271, 1256, 1252, 1257, 1258, 1259, + 1260, 1261, 1267, 1265, 1266, 1262, 1254, 1272, 1269, 1273, + +- 1270, 1274, 1263, 1267, 1264, 2992, 1275, 1276, 1277, 1279, +- 1280, 1281, 1271, 1282, 1283, 1284, 1285, 1286, 2987, 1261, +- 1294, 1295, 2950, 1262, 1296, 1272, 1297, 1273, 1298, 1274, ++ 1270, 1274, 1263, 1267, 1264, 3005, 1275, 1276, 1277, 1279, ++ 1280, 1281, 1271, 1282, 1283, 1284, 1285, 1286, 2996, 1261, ++ 1294, 1295, 2991, 1262, 1296, 1272, 1297, 1273, 1298, 1274, + 1263, 1299, 1264, 1268, 1275, 1276, 1277, 1279, 1280, 1281, + 1300, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1294, 1295, + 1289, 1301, 1296, 1302, 1297, 1290, 1298, 1303, 1304, 1299, +@@ -2253,24 +2256,24 @@ static const flex_int16_t yy_nxt[14349] = + 1317, 1302, 1318, 1290, 1319, 1303, 1304, 351, 1305, 1291, + 1306, 1307, 1308, 1292, 1309, 1293, 889, 1310, 1311, 1312, + +- 1313, 1314, 889, 2933, 1315, 1316, 383, 640, 1317, 383, ++ 1313, 1314, 889, 2954, 1315, 1316, 383, 640, 1317, 383, + 1318, 383, 1319, 1322, 1326, 355, 870, 889, 391, 1320, +- 2298, 391, 868, 392, 2875, 428, 653, 391, 654, 1335, +- 391, 1324, 392, 383, 884, 1330, 3602, 654, 3603, 391, ++ 2937, 391, 868, 392, 2299, 428, 653, 391, 654, 1335, ++ 391, 1324, 392, 383, 884, 1330, 3612, 654, 3613, 391, + 655, 1328, 391, 884, 392, 392, 1337, 894, 1331, 1121, + 1334, 1338, 896, 431, 391, 897, 1117, 1335, 662, 1339, +- 2298, 641, 1193, 885, 891, 1193, 392, 399, 1194, 399, ++ 2879, 641, 1193, 885, 891, 1193, 392, 399, 1194, 399, + 891, 1194, 399, 656, 1337, 399, 1340, 399, 1195, 1338, +- 2836, 1195, 893, 1196, 1323, 1327, 1397, 1339, 1119, 1397, +- 1321, 640, 2835, 391, 888, 1332, 391, 906, 392, 399, ++ 2299, 1195, 893, 1196, 1323, 1327, 1397, 1339, 1119, 1397, ++ 1321, 640, 2840, 391, 888, 1332, 391, 906, 392, 399, + + 1341, 894, 1325, 895, 1340, 391, 896, 1342, 391, 897, + 392, 657, 1344, 894, 399, 895, 1345, 399, 896, 399, + 392, 897, 1348, 1343, 1350, 1351, 1352, 898, 1341, 1353, + 660, 1354, 392, 1356, 1357, 1342, 1358, 1360, 1361, 1362, +- 1344, 399, 1363, 2812, 1345, 1364, 1365, 1366, 898, 2774, +- 1348, 1343, 1350, 1351, 1352, 1197, 2361, 1353, 1197, 1354, +- 1333, 1356, 1357, 2359, 1358, 1360, 1361, 1362, 1368, 406, ++ 1344, 399, 1363, 2839, 1345, 1364, 1365, 1366, 898, 2815, ++ 1348, 1343, 1350, 1351, 1352, 1197, 2777, 1353, 1197, 1354, ++ 1333, 1356, 1357, 2362, 1358, 1360, 1361, 1362, 1368, 406, + 1363, 1349, 1369, 1364, 1365, 1366, 1370, 1325, 1144, 1144, + 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1367, 1367, 1367, + 1367, 1367, 1367, 1367, 1367, 1367, 1368, 1371, 399, 1372, +@@ -2278,7 +2281,7 @@ static const flex_int16_t yy_nxt[14349] = + 1369, 1373, 1374, 1377, 1370, 1375, 1376, 1378, 1379, 1380, + 1381, 1382, 1383, 1384, 1385, 1387, 1388, 1389, 1390, 1391, + 1398, 1198, 508, 1398, 1198, 1371, 1199, 1372, 1402, 1373, +- 1374, 1377, 2742, 1375, 1376, 1378, 1379, 1380, 1381, 1382, ++ 1374, 1377, 2360, 1375, 1376, 1378, 1379, 1380, 1381, 1382, + 1383, 1384, 1385, 1387, 1388, 1389, 1390, 1391, 1399, 1201, + 510, 1399, 1201, 1400, 1202, 1401, 1402, 1202, 1401, 1203, + 1204, 1403, 1404, 1204, 1407, 1408, 1409, 1410, 1411, 1412, +@@ -2289,7 +2292,7 @@ static const flex_int16_t yy_nxt[14349] = + 1415, 1416, 1417, 1418, 1419, 1420, 1422, 1423, 1424, 1425, + 1426, 1421, 1427, 1428, 1429, 1430, 1431, 1433, 1434, 1432, + 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1445, +- 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 2740, ++ 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 2745, + 1459, 1461, 1462, 1444, 1463, 1433, 1434, 1465, 1435, 1436, + 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1445, 1446, 1447, + 1448, 1449, 1450, 1451, 1452, 1453, 1454, 1455, 1459, 1461, +@@ -2301,19 +2304,19 @@ static const flex_int16_t yy_nxt[14349] = + 1475, 1457, 1458, 1477, 1478, 1479, 1480, 1482, 1483, 1484, + 1486, 1487, 1481, 1494, 1488, 1489, 1490, 1491, 1492, 1495, + 1496, 1493, 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, +- 1505, 1506, 1507, 1508, 870, 889, 1512, 2683, 662, 1397, +- 1515, 1494, 1397, 1398, 2513, 2511, 1398, 1495, 1496, 3952, ++ 1505, 1506, 1507, 1508, 870, 889, 1512, 2743, 662, 1397, ++ 1515, 1494, 1397, 1398, 2686, 2515, 1398, 1495, 1496, 3965, + 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, + 1507, 1508, 391, 1509, 1512, 391, 1516, 392, 1515, 1517, +- 894, 889, 895, 871, 890, 896, 1518, 3602, 897, 3603, +- 399, 2091, 399, 399, 1519, 399, 2298, 1520, 1576, 392, ++ 894, 889, 895, 871, 890, 896, 1518, 3612, 897, 3613, ++ 399, 2513, 399, 399, 1519, 399, 2091, 1520, 1576, 392, + +- 1513, 1576, 1514, 1521, 1516, 1522, 886, 1517, 1527, 3673, +- 1528, 3674, 872, 891, 1518, 659, 391, 399, 1529, 391, ++ 1513, 1576, 1514, 1521, 1516, 1522, 886, 1517, 1527, 3684, ++ 1528, 3685, 872, 891, 1518, 659, 391, 399, 1529, 391, + 1116, 392, 1519, 1530, 1511, 1520, 895, 898, 1513, 896, + 1514, 1521, 897, 1522, 1524, 1531, 1527, 1524, 1528, 1524, + 1532, 1537, 1533, 391, 1525, 656, 1529, 1524, 1538, 891, +- 2298, 1530, 1539, 1541, 1547, 1548, 1551, 1552, 1553, 1554, ++ 2299, 1530, 1539, 1541, 1547, 1548, 1551, 1552, 1553, 1554, + 1555, 1399, 1401, 1531, 1399, 1401, 1400, 1583, 1532, 1537, + 1583, 1123, 1535, 1556, 888, 1557, 1538, 1558, 1536, 1559, + 1539, 1541, 1547, 1548, 1551, 1552, 1553, 1554, 1555, 1526, +@@ -2327,14 +2330,14 @@ static const flex_int16_t yy_nxt[14349] = + 1585, 1586, 1587, 1588, 1589, 1594, 1590, 1591, 1599, 1592, + 1600, 1593, 1597, 1598, 1601, 1602, 1603, 1604, 1595, 1605, + 1606, 1610, 1611, 1596, 1612, 1613, 1607, 1614, 1608, 1615, +- 1616, 1609, 2490, 1594, 1623, 1624, 1599, 1625, 1600, 1626, ++ 1616, 1609, 2299, 1594, 1623, 1624, 1599, 1625, 1600, 1626, + 1627, 1628, 1601, 1602, 1603, 1604, 1595, 1605, 1606, 1610, + + 1611, 1596, 1612, 1613, 1607, 1614, 1608, 1615, 1616, 1609, + 1617, 1629, 1623, 1624, 1618, 1625, 1630, 1626, 1627, 1628, + 1631, 1619, 1632, 1620, 1621, 1633, 1622, 1634, 1635, 1636, + 1637, 1638, 1639, 1640, 1641, 1642, 1643, 1647, 1617, 1629, +- 1648, 1649, 1618, 1650, 1630, 1651, 2488, 1658, 1631, 1619, ++ 1648, 1649, 1618, 1650, 1630, 1651, 2492, 1658, 1631, 1619, + 1632, 1620, 1621, 1633, 1622, 1634, 1635, 1636, 1637, 1638, + 1639, 1640, 1641, 1642, 1643, 1647, 1659, 1652, 1648, 1649, + 1660, 1650, 1665, 1651, 1653, 1658, 1666, 1663, 1667, 1668, +@@ -2345,15 +2348,15 @@ static const flex_int16_t yy_nxt[14349] = + 1654, 1661, 1671, 1662, 1672, 1655, 1685, 1673, 1674, 1675, + 1676, 1677, 1686, 1680, 1678, 1679, 1687, 1664, 1681, 1682, + 1688, 1683, 1689, 1684, 1690, 1691, 1692, 1693, 1695, 1697, +- 1698, 1699, 889, 1696, 1685, 1701, 1702, 3673, 1703, 3674, ++ 1698, 1699, 889, 1696, 1685, 1701, 1702, 3684, 1703, 3685, + 1686, 1680, 1704, 1694, 1687, 1705, 1681, 1706, 1688, 1707, + 1689, 1757, 1690, 1691, 1692, 1693, 1695, 1697, 1698, 1699, + 1700, 1696, 399, 1701, 1702, 399, 1703, 399, 1117, 1708, +- 1704, 1694, 2076, 1705, 1709, 1706, 1710, 1707, 1119, 399, ++ 1704, 1694, 2490, 1705, 1709, 1706, 1710, 1707, 1119, 399, + 1524, 1524, 1716, 1524, 1524, 1524, 1524, 1719, 1720, 399, + + 1711, 1711, 1721, 1524, 1524, 1576, 1395, 1708, 1576, 885, +- 891, 2680, 1709, 1726, 1710, 1723, 1727, 1332, 2677, 1724, ++ 891, 2076, 1709, 1726, 1710, 1723, 1727, 1332, 2683, 1724, + 1716, 1725, 1728, 1729, 1730, 1719, 1720, 898, 1732, 1733, + 1721, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, + 1736, 1726, 1737, 1723, 1727, 1712, 1526, 1724, 1738, 1725, +@@ -2379,8 +2382,8 @@ static const flex_int16_t yy_nxt[14349] = + 1814, 1824, 1825, 1826, 1815, 1818, 1819, 1827, 1820, 1821, + 1822, 1828, 1823, 1829, 1830, 1832, 1833, 1834, 1835, 1836, + 1817, 1837, 1838, 1848, 1850, 1851, 1852, 1853, 1854, 1824, +- 1825, 1826, 1855, 1839, 1848, 1827, 1856, 1857, 3738, 1828, +- 3739, 1829, 1830, 1832, 1833, 1834, 1835, 1836, 2656, 1837, ++ 1825, 1826, 1855, 1839, 1848, 1827, 1856, 1857, 3750, 1828, ++ 3751, 1829, 1830, 1832, 1833, 1834, 1835, 1836, 2680, 1837, + 1838, 1858, 1850, 1851, 1852, 1853, 1854, 1859, 1860, 1861, + 1855, 1839, 1840, 1841, 1856, 1857, 1842, 1862, 1843, 1863, + 1864, 1865, 1844, 1845, 1866, 1867, 1846, 1868, 1869, 1858, +@@ -2390,15 +2393,15 @@ static const flex_int16_t yy_nxt[14349] = + 1844, 1845, 1866, 1867, 1846, 1868, 1869, 1882, 1870, 1847, + 1871, 1872, 1873, 1877, 1883, 1879, 1874, 1875, 1880, 1884, + 1876, 1881, 1885, 1117, 1887, 1888, 1878, 1889, 1890, 1891, +- 1894, 1892, 1895, 1898, 1900, 1882, 3738, 1903, 3739, 1904, +- 1906, 1877, 1883, 1879, 1893, 2985, 1880, 1884, 1907, 1908, ++ 1894, 1892, 1895, 1898, 1900, 1882, 3750, 1903, 3751, 1904, ++ 1906, 1877, 1883, 1879, 1893, 2989, 1880, 1884, 1907, 1908, + 1885, 1909, 1887, 1888, 1878, 1889, 1890, 1891, 1894, 1892, +- 1895, 1524, 1900, 2646, 1524, 1903, 1524, 1904, 1906, 1913, +- 1918, 1896, 1893, 1905, 1524, 2636, 1907, 1908, 1899, 1909, ++ 1895, 1524, 1900, 2659, 1524, 1903, 1524, 1904, 1906, 1913, ++ 1918, 1896, 1893, 1905, 1524, 2648, 1907, 1908, 1899, 1909, + + 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1910, +- 888, 1911, 1914, 2634, 2618, 2986, 3952, 1913, 1918, 3952, +- 2603, 3952, 1919, 1920, 1915, 1921, 1922, 1923, 1924, 1916, ++ 888, 1911, 1914, 2638, 2636, 2990, 3965, 1913, 1918, 3965, ++ 2620, 3965, 1919, 1920, 1915, 1921, 1922, 1923, 1924, 1916, + 1925, 1926, 1927, 1928, 1929, 1930, 1526, 1910, 1572, 1911, + 1914, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, + 1919, 1920, 1915, 1921, 1922, 1923, 1924, 1916, 1925, 1926, +@@ -2422,12 +2425,12 @@ static const flex_int16_t yy_nxt[14349] = + 2000, 1996, 2001, 2003, 2004, 2005, 2014, 2002, 2006, 2007, + 2019, 2010, 2021, 2022, 2011, 2023, 2012, 2024, 2015, 2016, + 2013, 2025, 2026, 2009, 2017, 2027, 2028, 2018, 2029, 2031, +- 2032, 2033, 2034, 2035, 2036, 2037, 2043, 3646, 2019, 2044, ++ 2032, 2033, 2034, 2035, 2036, 2037, 2043, 3656, 2019, 2044, + 2021, 2022, 2030, 2023, 2045, 2024, 2046, 2047, 2048, 2025, +- 2026, 2361, 2050, 2027, 2028, 2051, 2029, 2031, 2032, 2033, ++ 2026, 2605, 2050, 2027, 2028, 2051, 2029, 2031, 2032, 2033, + 2034, 2035, 2036, 2037, 2043, 2038, 2039, 2044, 2052, 2053, + 2030, 2040, 2045, 2054, 2046, 2047, 2048, 2055, 2056, 2041, +- 2050, 2057, 2042, 2051, 2058, 2059, 2060, 3647, 2066, 2075, ++ 2050, 2057, 2042, 2051, 2058, 2059, 2060, 3657, 2066, 2075, + + 2067, 2068, 2069, 2038, 2039, 2070, 2052, 2053, 2061, 2040, + 2062, 2054, 2071, 2072, 2063, 2055, 2056, 2041, 2077, 2057, +@@ -2435,14 +2438,14 @@ static const flex_int16_t yy_nxt[14349] = + 2069, 2081, 2082, 2070, 2083, 2084, 2061, 2061, 2062, 2062, + 2071, 2072, 2063, 2063, 2076, 2079, 2077, 2085, 2086, 2078, + 1713, 1713, 2080, 2064, 2064, 2065, 2073, 2090, 2092, 2081, +- 2082, 2093, 2083, 2084, 2094, 2061, 2095, 2062, 2359, 2098, +- 2096, 2063, 2097, 2079, 2281, 2085, 2086, 2099, 1524, 2100, ++ 2082, 2093, 2083, 2084, 2094, 2061, 2095, 2062, 2362, 2098, ++ 2096, 2063, 2097, 2079, 2282, 2085, 2086, 2099, 1524, 2100, + 2080, 1524, 2064, 1524, 2073, 2101, 2092, 2102, 1711, 2093, + 2103, 1524, 2094, 2104, 2095, 1714, 1899, 2098, 2096, 2115, + +- 2097, 2116, 2091, 2117, 2118, 2099, 2550, 2100, 2119, 2120, +- 2121, 2122, 2123, 2101, 2166, 2102, 2511, 2166, 2103, 2282, +- 2091, 2104, 2124, 2125, 2127, 2297, 2128, 2115, 2298, 2116, ++ 2097, 2116, 2091, 2117, 2118, 2099, 2360, 2100, 2119, 2120, ++ 2121, 2122, 2123, 2101, 2166, 2102, 2552, 2166, 2103, 2283, ++ 2513, 2104, 2124, 2125, 2127, 2298, 2128, 2115, 2299, 2116, + 2126, 2117, 2118, 1712, 2105, 2129, 2119, 2120, 2121, 2122, + 2123, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, + 2124, 2125, 2127, 2107, 2128, 2108, 2109, 2110, 2126, 2130, +@@ -2454,7 +2457,7 @@ static const flex_int16_t yy_nxt[14349] = + 2141, 2149, 2151, 2113, 2134, 2147, 2145, 2148, 2147, 2155, + 2152, 2156, 2157, 2158, 2153, 2159, 2160, 2161, 2162, 2154, + 2163, 2164, 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, +- 2175, 2176, 1947, 2177, 2508, 2180, 2181, 2155, 2182, 2156, ++ 2175, 2176, 1947, 2177, 2091, 2180, 2181, 2155, 2182, 2156, + 2157, 2158, 2183, 2159, 2160, 2161, 2162, 2184, 2163, 2164, + 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, + 1949, 2177, 1981, 2180, 2181, 1981, 2182, 2179, 2185, 2186, +@@ -2464,997 +2467,999 @@ static const flex_int16_t yy_nxt[14349] = + + 2188, 2189, 2190, 2206, 2191, 2192, 2193, 2194, 2211, 2197, + 2198, 2212, 2199, 2213, 2200, 2201, 2202, 2203, 2204, 2205, +- 2214, 2207, 2208, 2209, 2215, 2216, 2210, 2217, 2507, 2166, +- 2488, 2229, 2166, 2230, 2385, 3952, 2211, 2231, 3952, 2212, +- 3952, 2213, 2232, 2233, 2234, 2076, 2235, 2485, 2214, 2236, +- 2237, 2238, 2215, 2216, 2239, 2217, 2218, 2219, 2220, 2229, +- 2221, 2230, 2222, 2223, 2240, 2231, 2224, 2225, 2226, 2241, +- 2232, 2233, 2234, 2227, 2235, 2228, 2242, 2236, 2237, 2238, ++ 2214, 2207, 2208, 2209, 2215, 2216, 2210, 2217, 2510, 2166, ++ 2509, 2230, 2166, 2231, 2386, 3965, 2211, 2232, 3965, 2212, ++ 3965, 2213, 3965, 2233, 2234, 3965, 2235, 3965, 2214, 2236, ++ 2237, 2238, 2215, 2216, 2239, 2217, 2218, 2219, 2220, 2230, ++ 2221, 2231, 2222, 2223, 2240, 2232, 2224, 2225, 2226, 2241, ++ 2227, 2233, 2234, 2228, 2235, 2229, 2242, 2236, 2237, 2238, + 2243, 2244, 2239, 2245, 2218, 2219, 2220, 2246, 2221, 2247, +- 2222, 2223, 2240, 2248, 2224, 2225, 2226, 2241, 2249, 2250, +- +- 2251, 2227, 2252, 2228, 2242, 2253, 2254, 2256, 2243, 2244, +- 2257, 2245, 2258, 2259, 2262, 2246, 2263, 2247, 2264, 2265, +- 2266, 2248, 2267, 2268, 2269, 2272, 2249, 2250, 2251, 2270, +- 2252, 2271, 2273, 2253, 2254, 2256, 2278, 2279, 2257, 2280, +- 2258, 2259, 2262, 2284, 2263, 2281, 2264, 2265, 2266, 2286, +- 2267, 2268, 2269, 2272, 2287, 2288, 2289, 2270, 2290, 2271, +- 2273, 2291, 2299, 2292, 2278, 2279, 2293, 2280, 2294, 2295, +- 2302, 2299, 2304, 2305, 2306, 2307, 2308, 2286, 2309, 2470, +- 2310, 2311, 2287, 2288, 2289, 2312, 2290, 2427, 2285, 2291, +- 2076, 2292, 2313, 2314, 2293, 2315, 2294, 2295, 2427, 2428, +- +- 2304, 2305, 2306, 2307, 2308, 2324, 2309, 2300, 2310, 2311, +- 2428, 2461, 2361, 2312, 2325, 2303, 2091, 2326, 2359, 2329, +- 2313, 2314, 2330, 2315, 2316, 2316, 2316, 2316, 2316, 2316, +- 2316, 2316, 2316, 2324, 2331, 2333, 2317, 2334, 2318, 2319, +- 2320, 2327, 2325, 2335, 2321, 2326, 2328, 2329, 2336, 2322, +- 2330, 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2323, 2261, +- 2145, 2146, 2331, 2333, 2317, 2334, 2318, 2319, 2320, 2327, +- 2344, 2335, 2321, 2345, 2328, 2346, 2336, 2322, 2347, 2337, +- 2338, 2339, 2340, 2341, 2342, 2343, 2323, 2106, 2106, 2106, +- 2106, 2106, 2106, 2106, 2106, 2106, 2348, 2349, 2344, 2350, +- +- 2351, 2345, 2352, 2346, 2353, 2354, 2347, 2355, 2356, 2357, +- 2144, 2145, 2146, 2144, 1947, 2147, 2145, 2148, 2147, 2145, +- 2148, 2362, 2363, 2364, 2348, 2349, 2365, 2350, 2351, 2366, +- 2352, 2375, 2353, 2354, 2376, 2355, 2356, 2357, 2377, 2378, +- 2379, 2380, 2387, 2381, 2382, 2387, 2260, 2383, 2384, 2362, +- 2363, 2364, 2389, 2390, 2365, 2391, 2392, 2366, 2393, 2375, +- 2394, 2395, 2376, 2396, 2397, 1947, 2377, 2378, 2379, 2380, +- 1949, 2381, 2382, 1949, 2367, 2383, 2384, 2367, 2255, 2398, +- 2389, 2390, 2388, 2391, 2392, 2400, 2393, 2401, 2394, 2395, +- 2165, 2396, 2397, 2368, 2150, 2402, 2403, 2404, 2405, 2406, +- +- 2407, 2408, 2409, 2411, 2412, 2413, 2369, 2398, 2370, 2414, +- 2388, 3952, 2416, 2400, 3952, 2401, 3952, 2417, 2371, 2418, +- 2372, 2373, 2374, 2402, 2403, 2404, 2405, 2406, 2407, 2408, +- 2409, 2411, 2412, 2413, 2369, 2419, 2370, 2414, 2420, 2421, +- 2416, 2422, 2421, 2423, 2424, 2417, 2371, 2418, 2372, 2373, +- 2374, 2425, 2426, 2429, 2430, 2431, 2432, 2433, 2434, 2436, +- 2437, 2438, 2439, 2419, 2440, 2441, 2420, 2435, 2442, 2422, +- 2443, 2423, 2424, 2444, 2445, 2448, 2446, 2449, 2450, 2425, +- 2426, 2429, 2430, 2431, 2432, 2433, 2434, 2436, 2437, 2438, +- 2439, 2447, 2440, 2441, 2451, 2452, 2442, 2453, 2443, 2454, +- +- 2455, 2444, 2445, 2448, 2446, 2449, 2450, 2456, 2457, 2458, +- 2459, 2460, 2462, 2463, 2464, 2465, 2466, 2467, 2468, 2447, +- 2469, 2471, 2451, 2452, 2472, 2453, 2473, 2454, 2455, 2474, +- 2475, 2476, 2477, 2478, 2479, 2456, 2457, 2458, 2459, 2460, +- 2462, 2463, 2464, 2465, 2466, 2467, 2468, 2482, 2469, 2471, +- 2483, 2484, 2472, 2486, 2473, 2489, 2491, 2474, 2475, 2476, +- 2477, 2478, 2479, 2492, 2493, 2494, 2495, 2496, 2497, 2498, +- 2509, 2499, 2512, 2514, 2515, 2482, 1949, 2502, 2483, 2484, +- 2502, 2516, 2502, 2517, 2491, 2518, 2519, 2503, 2520, 1947, +- 2504, 2492, 2493, 2494, 2495, 2496, 2497, 2498, 2487, 2499, +- +- 2490, 2514, 2515, 2521, 2505, 2522, 2523, 2524, 2526, 2516, +- 2527, 2517, 2525, 2518, 2519, 2510, 2520, 2513, 2528, 2316, +- 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2531, 2532, +- 2533, 2521, 2506, 2522, 2523, 2524, 2526, 2529, 2527, 2534, +- 2535, 2536, 2530, 2537, 2538, 2539, 2528, 2540, 2541, 2542, +- 2543, 2544, 2545, 2546, 2547, 2548, 2531, 2532, 2533, 2549, +- 2551, 2552, 2553, 2554, 2555, 2529, 2556, 2534, 2535, 2536, +- 2530, 2537, 2538, 2539, 2557, 2540, 2541, 2542, 2543, 2544, +- 2545, 2546, 2547, 2548, 2558, 2559, 2565, 2549, 2551, 2552, +- 2553, 2554, 2555, 2566, 2556, 2561, 2562, 2567, 2561, 2569, +- +- 2564, 2562, 2557, 2564, 2568, 2367, 2572, 2573, 2367, 2572, +- 2570, 2574, 2558, 2559, 2565, 2576, 2577, 2575, 2578, 2579, +- 2580, 2566, 2114, 2581, 2582, 2567, 2581, 2569, 2583, 2584, +- 2585, 2586, 2568, 2587, 2588, 2573, 2589, 3952, 2088, 2574, +- 3952, 2593, 3952, 2576, 2577, 2575, 2578, 2579, 2580, 2594, +- 2359, 2595, 2582, 2596, 2597, 2361, 2583, 2584, 2585, 2586, +- 2598, 2587, 2588, 2387, 2589, 2358, 2387, 2599, 2591, 2593, +- 2360, 2600, 2601, 2602, 2604, 2601, 2605, 2594, 2606, 2595, +- 2607, 2596, 2597, 2608, 2609, 2610, 2611, 2612, 2598, 2613, +- 2614, 2615, 2616, 2617, 2619, 2599, 2620, 2621, 2622, 2600, +- +- 2621, 2602, 2604, 2623, 2605, 2627, 2606, 2628, 2607, 2629, +- 2630, 2608, 2609, 2610, 2611, 2612, 2631, 2613, 2614, 2615, +- 2616, 2617, 2619, 2632, 2620, 2625, 2622, 2633, 2625, 2635, +- 2626, 2623, 2637, 2627, 2639, 2628, 2640, 2629, 2630, 2641, +- 2642, 2643, 2644, 2637, 2631, 2087, 2645, 2647, 2648, 2649, +- 2650, 2632, 2651, 2652, 2653, 2633, 2654, 2635, 2655, 2657, +- 2658, 2659, 2639, 2660, 2640, 2661, 2662, 2641, 2642, 2643, +- 2644, 2663, 2664, 2638, 2645, 2647, 2648, 2649, 2650, 2665, +- 2651, 2652, 2653, 2666, 2654, 2667, 2655, 2657, 2658, 2659, +- 2668, 2660, 2669, 2661, 2662, 2670, 2671, 2672, 2673, 2663, +- +- 2664, 2674, 2675, 2676, 2678, 2679, 2681, 2665, 2281, 2486, +- 2683, 2666, 2684, 2667, 2685, 2686, 2687, 2688, 2668, 2689, +- 2669, 2690, 2695, 2670, 2671, 2672, 2673, 2298, 1899, 2674, +- 2675, 2676, 2678, 2679, 2572, 2707, 2709, 2572, 2683, 2696, +- 2684, 2500, 2685, 2686, 2687, 2688, 2299, 2689, 2509, 2690, +- 2049, 2490, 2502, 2682, 2490, 2502, 2502, 2502, 2710, 2502, +- 2711, 2502, 2692, 2020, 2709, 2504, 2699, 2697, 2502, 2698, +- 2712, 2502, 2502, 2502, 1905, 2502, 2713, 2502, 2703, 2693, +- 2513, 2504, 2692, 2700, 2714, 2504, 2710, 2715, 2711, 2716, +- 2717, 2708, 2718, 2513, 2719, 2704, 2720, 2721, 2712, 2693, +- +- 2722, 2723, 1905, 2724, 2713, 2725, 2726, 2694, 2727, 2728, +- 2729, 2701, 2714, 2730, 2731, 2715, 2732, 2716, 2717, 2733, +- 2718, 2734, 2719, 2705, 2720, 2721, 2735, 2506, 2722, 2723, +- 2736, 2724, 2737, 2725, 2726, 2738, 2727, 2728, 2729, 2739, +- 2741, 2730, 2731, 2743, 2732, 2744, 2745, 2733, 2746, 2734, +- 2747, 2748, 2749, 2750, 2735, 2751, 2561, 2562, 2736, 2561, +- 2737, 2564, 2562, 2738, 2564, 2752, 2753, 2739, 2741, 2754, +- 2757, 2743, 2758, 2744, 2745, 2759, 2746, 2760, 2747, 2748, +- 2749, 2750, 2761, 2751, 2762, 2763, 2764, 2581, 1949, 2767, +- 2581, 2768, 2765, 2752, 2753, 2769, 2770, 2754, 2757, 2771, +- +- 2758, 2772, 2773, 2759, 2776, 2760, 2777, 2778, 2779, 2780, +- 2761, 2359, 2762, 2763, 2764, 2781, 2361, 2767, 2782, 2768, +- 2783, 2786, 2785, 2769, 2770, 2785, 2358, 2771, 2787, 2772, +- 2773, 2360, 2776, 2788, 2777, 2778, 2779, 2780, 2789, 2790, +- 2791, 2792, 2793, 2781, 2794, 2795, 2782, 2794, 2783, 2786, +- 2797, 2798, 2799, 2800, 2801, 2802, 2787, 2621, 2805, 2806, +- 2621, 2788, 2803, 2807, 2796, 2811, 2789, 2790, 2791, 2792, +- 2793, 2625, 2813, 2795, 2625, 2814, 2626, 2815, 2797, 2798, +- 2799, 2800, 2801, 2802, 2816, 2817, 2805, 2806, 2818, 2819, +- 2820, 2807, 2796, 2811, 2821, 2822, 2823, 2824, 2825, 2826, +- +- 2813, 2827, 2828, 2814, 2829, 2815, 2830, 2831, 2832, 2833, +- 2834, 2837, 2816, 2817, 2838, 2839, 2818, 2819, 2820, 2840, +- 2841, 2842, 2821, 2822, 2823, 2824, 2825, 2826, 2843, 2827, +- 2828, 2844, 2829, 2845, 2830, 2831, 2832, 2833, 2834, 2837, +- 2846, 2847, 2838, 2839, 2848, 2849, 2850, 2840, 2841, 2842, +- 2851, 2852, 2853, 2854, 2855, 2856, 2843, 2857, 2858, 2844, +- 2859, 2845, 2860, 2486, 2861, 2862, 2863, 2864, 2846, 2847, +- 2865, 2866, 2848, 2849, 2850, 2867, 2509, 2298, 2851, 2852, +- 2853, 2854, 2855, 2856, 2954, 2857, 2858, 2954, 2859, 2507, +- 2860, 2500, 1947, 2862, 2863, 2864, 2876, 2869, 2865, 2866, +- +- 2869, 2502, 2869, 2867, 2502, 2879, 2502, 2870, 2487, 2076, +- 2871, 2874, 2506, 2877, 2504, 2298, 2892, 2881, 2891, 2698, +- 2869, 2510, 2696, 2869, 2872, 2869, 2893, 2990, 2693, 2500, +- 2883, 1945, 2502, 2871, 2894, 2502, 2955, 2502, 2990, 2955, +- 2785, 2878, 2886, 2785, 2892, 2895, 2890, 2884, 2896, 2298, +- 2880, 2897, 2873, 2898, 2893, 2502, 2506, 2899, 2502, 2700, +- 2502, 2869, 2894, 2091, 2869, 2703, 2869, 2502, 2504, 2900, +- 2502, 2870, 2502, 2895, 2871, 2885, 2896, 2889, 2901, 2897, +- 2504, 2898, 2704, 2902, 2903, 2899, 2904, 2887, 2872, 2905, +- 2906, 2907, 2908, 2909, 2704, 2910, 2911, 2900, 2912, 2913, +- +- 2914, 2915, 2916, 2917, 2918, 2919, 2901, 2920, 2921, 2922, +- 2705, 2902, 2903, 2923, 2904, 2924, 2873, 2905, 2906, 2907, +- 2908, 2909, 2890, 2910, 2911, 2925, 2912, 2913, 2914, 2915, +- 2916, 2917, 2918, 2919, 2926, 2920, 2921, 2922, 2927, 2928, +- 2929, 2923, 2930, 2924, 2931, 2932, 2934, 2935, 2936, 2937, +- 2938, 2939, 2940, 2925, 2941, 2943, 2944, 2945, 2946, 2947, +- 2948, 2949, 2926, 2951, 2952, 2953, 2927, 2928, 2929, 2956, +- 2930, 2957, 2931, 2932, 2934, 2935, 2936, 2937, 2938, 2939, +- 2940, 2958, 2941, 2943, 2944, 2945, 2946, 2947, 2948, 2949, +- 2959, 2951, 2952, 2953, 2960, 2962, 2967, 2956, 2968, 2957, +- +- 2969, 2970, 2794, 2963, 2964, 2794, 2965, 2971, 2966, 2958, +- 2973, 2974, 2975, 2976, 2977, 2978, 2979, 2980, 2959, 2982, +- 2983, 2984, 2988, 2962, 2967, 2961, 2968, 2989, 2969, 2970, +- 2991, 2963, 2964, 2994, 2965, 2993, 2966, 2995, 2973, 2974, +- 2975, 2976, 2977, 2978, 2979, 2980, 2993, 2982, 2983, 2984, +- 2988, 2996, 2997, 2961, 2998, 2989, 2999, 3000, 2991, 3003, +- 3005, 2994, 3006, 3007, 3008, 2995, 3009, 3010, 3011, 3012, +- 3013, 3014, 3015, 3004, 3016, 3017, 3018, 3009, 3019, 2996, +- 2997, 3020, 2998, 3021, 2999, 3000, 3022, 3003, 3005, 3023, +- 3006, 3007, 3008, 3024, 3025, 3010, 3011, 3012, 3013, 3014, +- +- 3015, 3026, 3016, 3017, 3018, 3027, 3019, 3028, 3029, 3020, +- 3030, 3021, 3031, 3032, 3022, 3033, 3034, 3023, 3035, 3036, +- 3037, 3024, 3025, 2486, 3038, 3039, 3040, 3041, 3047, 3026, +- 1917, 3043, 1912, 3027, 1902, 3028, 3029, 3064, 3030, 3107, +- 3031, 3032, 3107, 3033, 3034, 2877, 3035, 3036, 3037, 3044, +- 3065, 1526, 3038, 3039, 3040, 3041, 2509, 2869, 3047, 3043, +- 2869, 2869, 2869, 3066, 2869, 3064, 2869, 3045, 2285, 2869, +- 2871, 3050, 2869, 3048, 2869, 2877, 1897, 3044, 3065, 3045, +- 2869, 3056, 2871, 2869, 2872, 2869, 3067, 2695, 3051, 2695, +- 3053, 3066, 2502, 2871, 3068, 2502, 2872, 2502, 2877, 3069, +- +- 3149, 2303, 2692, 3048, 2696, 2504, 2696, 2872, 3070, 1715, +- 2869, 3149, 3046, 2869, 3067, 2869, 3052, 1886, 3071, 2693, +- 3058, 1849, 3068, 2871, 3046, 1831, 3057, 3069, 2869, 3072, +- 1759, 2869, 2697, 2869, 2880, 3054, 3070, 2884, 3058, 2869, +- 2502, 2871, 2869, 2502, 2869, 2502, 3071, 2694, 2502, 3061, +- 2699, 2502, 2871, 2502, 3073, 2884, 1395, 3072, 2699, 2502, +- 3074, 3075, 2502, 3076, 2502, 3059, 2884, 2700, 3077, 2703, +- 1574, 2502, 2504, 3078, 2502, 2700, 2502, 3079, 3080, 3081, +- 3082, 2703, 3073, 3059, 2504, 3083, 2704, 3084, 3074, 3075, +- 3085, 3076, 3086, 3087, 3062, 2701, 3077, 3088, 2704, 3089, +- +- 3090, 3078, 3091, 2887, 3092, 3079, 3080, 3081, 3082, 3093, +- 3094, 3095, 3096, 3083, 2705, 3084, 3097, 3098, 3085, 3099, +- 3086, 3087, 3100, 3102, 3103, 3088, 2890, 3089, 3090, 3104, +- 3091, 3105, 3092, 3106, 3108, 3109, 3110, 3093, 3094, 3095, +- 3096, 3111, 3116, 3113, 3097, 3098, 3113, 3099, 3117, 3119, +- 3100, 3102, 3103, 2955, 3120, 3121, 2955, 3104, 3114, 3105, +- 3122, 3106, 3108, 3109, 3110, 3123, 3124, 3125, 3128, 3111, +- 3116, 3129, 3134, 3135, 3129, 3136, 3117, 3119, 3126, 3127, +- 3130, 3138, 3120, 3121, 3131, 3139, 3137, 3952, 3122, 3137, +- 3952, 3132, 3952, 3123, 3124, 3125, 3128, 3140, 3141, 3143, +- +- 3134, 3135, 3144, 3136, 3145, 3147, 3126, 3127, 3130, 3138, +- 3148, 3150, 3131, 3139, 3151, 3152, 3153, 3154, 3155, 3132, +- 3156, 3157, 3158, 3159, 3160, 3140, 3141, 3143, 3161, 3162, +- 3144, 3163, 3145, 3147, 3164, 3165, 3166, 3167, 3148, 3150, +- 3168, 3169, 3151, 3152, 3153, 3154, 3155, 3170, 3156, 3157, +- 3158, 3159, 3160, 3171, 3172, 3173, 3161, 3162, 3174, 3163, +- 3175, 3177, 3164, 3165, 3166, 3167, 3178, 3180, 3168, 3169, +- 3181, 3175, 3182, 1735, 3183, 3170, 3184, 3178, 3186, 1731, +- 3187, 3171, 3172, 3173, 3188, 3189, 3174, 3190, 3191, 3177, +- 3192, 3193, 3195, 3196, 3197, 3180, 3199, 3200, 3181, 1718, +- +- 3182, 3176, 3183, 2507, 3184, 1717, 3186, 3179, 3187, 3198, +- 3202, 3054, 3188, 3189, 2298, 3190, 3191, 1715, 3192, 3193, +- 3195, 3196, 3197, 2869, 3199, 3200, 2869, 2877, 2869, 2869, +- 2695, 3203, 2869, 3201, 2869, 2869, 2871, 3198, 2869, 3058, +- 2869, 2502, 2871, 3213, 2502, 3204, 2502, 2696, 3399, 3047, +- 2872, 2703, 3214, 1657, 2504, 3057, 2884, 3215, 3062, 3399, +- 2869, 2298, 3051, 2869, 2869, 2869, 2877, 2869, 2704, 2869, +- 3045, 3213, 1656, 2871, 3208, 3207, 2502, 2871, 3054, 2502, +- 3214, 2502, 3216, 3217, 3059, 3215, 3210, 2872, 3218, 2504, +- 3205, 2884, 3219, 3220, 3057, 2869, 3206, 3221, 2869, 3222, +- +- 2869, 3223, 3224, 3211, 3225, 3058, 3226, 3227, 2871, 3228, +- 3216, 3217, 3229, 3230, 3231, 3054, 3218, 3232, 3233, 3062, +- 3219, 3220, 2884, 3234, 3235, 3221, 3236, 3222, 3237, 3223, +- 3224, 3212, 3225, 3238, 3226, 3227, 3239, 3228, 3240, 3239, +- 3229, 3230, 3231, 3241, 3242, 3232, 3233, 3243, 3244, 3245, +- 3062, 3234, 3235, 3246, 3236, 3247, 3237, 3250, 3495, 3113, +- 3250, 3238, 3113, 3714, 1646, 3249, 3240, 3107, 3251, 3495, +- 3107, 3241, 3242, 3253, 3254, 3243, 3244, 3245, 3256, 3257, +- 3258, 3246, 3259, 3247, 3248, 3248, 3248, 3248, 3248, 3248, +- 3248, 3248, 3248, 3249, 3952, 3260, 3251, 3952, 3261, 3952, +- +- 3262, 3253, 3254, 3263, 3264, 3265, 3256, 3257, 3258, 3275, +- 3259, 3352, 3275, 3715, 3352, 3267, 3268, 3129, 3269, 3271, +- 3129, 3272, 3273, 3260, 3276, 3277, 3261, 3278, 3262, 3279, +- 3280, 3263, 3264, 3265, 3266, 3266, 3266, 3266, 3266, 3266, +- 3266, 3266, 3266, 3267, 3268, 3281, 3269, 3271, 3282, 3272, +- 3273, 3283, 3276, 3277, 3284, 3278, 3285, 3279, 3280, 3286, +- 3287, 3288, 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3297, +- 3298, 3299, 3300, 3281, 3302, 3303, 3282, 3304, 3305, 3283, +- 3306, 3307, 3284, 3308, 3285, 3312, 3313, 3286, 3287, 3288, +- 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3297, 3298, 3299, +- +- 3300, 3310, 3302, 3303, 3314, 3304, 3305, 3315, 3306, 3307, +- 3316, 3308, 3310, 3312, 3313, 3317, 3318, 3319, 3320, 3321, +- 3322, 3323, 3324, 3325, 3327, 3383, 2869, 3334, 3383, 2869, +- 3335, 2869, 3314, 1645, 3326, 3315, 3045, 3047, 3316, 2871, +- 3329, 1644, 3311, 3317, 3318, 3319, 3320, 3321, 3322, 3323, +- 3324, 3325, 3327, 2872, 2877, 3334, 2869, 2696, 3335, 2869, +- 2869, 2869, 3326, 2869, 2502, 2869, 3050, 2502, 3336, 2502, +- 3050, 1580, 3275, 3337, 3328, 3275, 3338, 2504, 3339, 3340, +- 3341, 3046, 3048, 3051, 3342, 2880, 3343, 3051, 1579, 2869, +- 2502, 2704, 2869, 2502, 2869, 2502, 3336, 1574, 1550, 3058, +- +- 3210, 3337, 2871, 2504, 3338, 1549, 3339, 3340, 3341, 3344, +- 3345, 3052, 3342, 3346, 3343, 3205, 2884, 3211, 3347, 2890, +- 2869, 2502, 3348, 2869, 2502, 2869, 2502, 3349, 3350, 3351, +- 2883, 3332, 3353, 2871, 2504, 3354, 3357, 3344, 3345, 3358, +- 3359, 3346, 3360, 3361, 3059, 3330, 3347, 2884, 3211, 3239, +- 3348, 3362, 3239, 3363, 3355, 3349, 3350, 3351, 3364, 3392, +- 3353, 3500, 3392, 3354, 3357, 1546, 1545, 3358, 3359, 3365, +- 3360, 3361, 3500, 1544, 3370, 2885, 3333, 3370, 1543, 3362, +- 3367, 3363, 3250, 3369, 3373, 3250, 3364, 3248, 3248, 3248, +- 3248, 3248, 3248, 3248, 3248, 3248, 3374, 3365, 3375, 3366, +- +- 3366, 3366, 3366, 3366, 3366, 3366, 3366, 3366, 3367, 3376, +- 3377, 3369, 3373, 3378, 3379, 3380, 3381, 3382, 3384, 3385, +- 3371, 3386, 3387, 3388, 3374, 3389, 3375, 3266, 3266, 3266, +- 3266, 3266, 3266, 3266, 3266, 3266, 3390, 3376, 3377, 3391, +- 3393, 3378, 3379, 3380, 3381, 3382, 3384, 3385, 3371, 3386, +- 3387, 3388, 3394, 3389, 3395, 3394, 3396, 3397, 3398, 3400, +- 3401, 3402, 3403, 3405, 3390, 3406, 3407, 3391, 3393, 3408, +- 3409, 3412, 3413, 3414, 3415, 3417, 3418, 3419, 3714, 3422, +- 3423, 3424, 3395, 3425, 3396, 3397, 3398, 3400, 3401, 3402, +- 3403, 3405, 3426, 3406, 3407, 3427, 3428, 3408, 3409, 3412, +- +- 3413, 3414, 3415, 3417, 3418, 3419, 3420, 3422, 3423, 3424, +- 3429, 3425, 3430, 3432, 3421, 3433, 3434, 3435, 3436, 3437, +- 3426, 1542, 2869, 3427, 3428, 2869, 3333, 2869, 3647, 2298, +- 3439, 3047, 3045, 3453, 3420, 2871, 3453, 1540, 3429, 3440, +- 3430, 3432, 3421, 3433, 3434, 3435, 3436, 3437, 2877, 2872, +- 1117, 2502, 2869, 3441, 2502, 2869, 2502, 2869, 3439, 3442, +- 3443, 3438, 3058, 3444, 2504, 2871, 3445, 3440, 3446, 874, +- 2502, 3447, 3448, 2502, 3449, 2502, 2878, 2873, 3211, 2884, +- 3210, 3441, 3450, 2504, 3451, 3454, 3456, 3442, 3443, 3479, +- 3480, 3444, 3479, 3480, 3445, 1485, 3446, 3211, 3352, 3447, +- +- 3448, 3352, 3449, 1476, 1474, 3481, 3333, 2885, 3481, 1469, +- 3450, 3766, 3451, 3454, 3456, 3452, 3452, 3452, 3452, 3452, +- 3452, 3452, 3452, 3452, 3457, 3333, 3455, 3455, 3455, 3455, +- 3455, 3455, 3455, 3455, 3455, 3455, 3455, 3356, 3356, 3356, +- 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3458, 3459, +- 3460, 3455, 3457, 3461, 3462, 3463, 3464, 3465, 3466, 3468, +- 3469, 3647, 3356, 3366, 3366, 3366, 3366, 3366, 3366, 3366, +- 3366, 3366, 3370, 3470, 3471, 3370, 3458, 3459, 3460, 3472, +- 3473, 3461, 3462, 3463, 3464, 3465, 3466, 3468, 3469, 3467, +- 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3474, 3475, +- +- 3476, 3470, 3471, 3477, 3482, 3483, 3484, 3472, 3473, 3484, +- 3485, 3486, 3487, 3489, 3490, 3492, 3489, 3490, 3493, 3494, +- 3497, 3498, 3499, 1464, 1406, 1405, 3474, 3475, 3476, 540, +- 3733, 3477, 3482, 3483, 3394, 3501, 3502, 3394, 3485, 3486, +- 3487, 3733, 3506, 3492, 3507, 3508, 3493, 3494, 3497, 3498, +- 3499, 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3491, +- 3503, 3509, 3510, 3501, 3502, 3511, 3512, 3513, 3504, 3505, +- 3506, 3514, 3507, 3508, 3515, 3516, 3517, 3518, 3519, 3520, +- 3521, 3522, 3523, 3524, 3525, 3526, 3525, 3527, 3503, 3509, +- 3510, 3528, 3530, 3511, 3512, 3513, 3504, 3505, 3531, 3514, +- +- 538, 3532, 3515, 3516, 3517, 3518, 3519, 3520, 3521, 3522, +- 3523, 3524, 3533, 3526, 3534, 3527, 3535, 533, 2502, 3528, +- 3530, 2502, 3536, 2502, 3537, 3538, 3531, 3541, 3210, 3532, +- 3541, 2504, 3479, 3564, 3489, 3479, 3564, 3576, 3565, 3543, +- 3533, 531, 3534, 516, 3535, 3211, 3544, 3545, 3546, 3547, +- 3536, 3548, 3537, 3538, 3549, 514, 3525, 3452, 3452, 3452, +- 3452, 3452, 3452, 3452, 3452, 3452, 3453, 3543, 3542, 3453, +- 510, 3539, 1396, 3330, 3544, 3545, 3546, 3547, 3550, 3548, +- 3551, 3552, 3549, 3540, 3540, 3540, 3540, 3540, 3540, 3540, +- 3540, 3540, 3455, 3455, 3455, 3455, 3455, 3455, 3455, 3455, +- +- 3455, 3455, 3455, 3553, 3554, 3555, 3550, 3556, 3551, 3552, +- 3557, 1392, 3559, 3557, 3560, 3561, 3562, 3455, 3467, 3467, +- 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3569, 3570, 3572, +- 3573, 3553, 3554, 3555, 3574, 3556, 3578, 1386, 3581, 3558, +- 3559, 3734, 3560, 3561, 3562, 3567, 3484, 3952, 3567, 3484, +- 3568, 3571, 3734, 1355, 1347, 3569, 3570, 3572, 3573, 3579, +- 3490, 3582, 3574, 3490, 3578, 3580, 3581, 3558, 3491, 3491, +- 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3577, 3577, 3577, +- 3577, 3577, 3577, 3577, 3577, 3577, 3583, 3579, 3584, 3582, +- 3585, 3586, 3587, 3580, 3588, 3589, 3591, 3593, 3594, 3595, +- +- 3596, 3597, 3598, 3600, 3601, 3604, 3605, 3618, 3624, 3628, +- 3618, 3624, 3628, 1336, 3583, 431, 3584, 418, 3585, 3586, +- 3587, 3607, 3588, 3589, 3591, 3593, 3594, 3595, 3596, 3597, +- 3598, 3600, 3601, 3604, 3605, 3606, 3606, 3606, 3606, 3606, +- 3606, 3606, 3606, 3606, 3606, 3606, 3608, 3609, 3612, 3607, +- 3613, 3614, 3615, 3616, 3617, 3690, 3693, 414, 3690, 3693, +- 3606, 3619, 3619, 3619, 3619, 3619, 3619, 3619, 3619, 3619, +- 3621, 3622, 3623, 3625, 3608, 3609, 3612, 3626, 3613, 3614, +- 3615, 3616, 3617, 3540, 3540, 3540, 3540, 3540, 3540, 3540, +- 3540, 3540, 3541, 3627, 3629, 3541, 3630, 3631, 3621, 3622, +- +- 3623, 3625, 3632, 3633, 3635, 3626, 3636, 3637, 3640, 3620, +- 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 399, 395, +- 3557, 3627, 3629, 3557, 3630, 3631, 3638, 373, 3643, 3638, +- 3632, 3633, 3635, 3644, 3636, 3637, 3640, 3634, 3634, 3634, +- 3634, 3634, 3634, 3634, 3634, 3634, 3564, 3567, 3648, 3564, +- 3567, 3565, 3568, 3649, 3650, 3639, 3643, 3628, 369, 363, +- 3628, 3644, 3697, 3690, 3693, 3652, 3690, 3693, 3747, 3750, +- 3575, 3805, 3806, 359, 3805, 3806, 3648, 3489, 355, 1278, +- 3576, 3649, 3650, 3639, 3651, 3651, 3651, 3651, 3651, 3651, +- 3651, 3651, 3651, 3652, 3651, 3651, 3651, 3651, 3651, 3651, +- +- 3651, 3651, 3651, 3577, 3577, 3577, 3577, 3577, 3577, 3577, +- 3577, 3577, 3653, 3654, 3655, 3657, 3658, 3659, 3660, 3661, +- 3662, 3663, 3664, 3665, 3666, 3667, 3668, 3669, 3670, 3672, +- 3675, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, +- 3653, 3654, 3655, 3657, 3658, 3659, 3660, 3661, 3662, 3663, +- 3664, 3665, 3666, 3667, 3668, 3669, 3670, 3672, 3675, 3606, +- 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, +- 3676, 3677, 3678, 3680, 3681, 3682, 3684, 3952, 3685, 3684, +- 3952, 3686, 3952, 1217, 3606, 3689, 3691, 3838, 3695, 3685, +- 3838, 3698, 3688, 3699, 3700, 3701, 3702, 3703, 3676, 3677, +- +- 3678, 3680, 3681, 3682, 3619, 3619, 3619, 3619, 3619, 3619, +- 3619, 3619, 3619, 3689, 3691, 3624, 3695, 3844, 3624, 3698, +- 3844, 3699, 3700, 3701, 3702, 3703, 3704, 3706, 3707, 3710, +- 3717, 3718, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, +- 3692, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, +- 3638, 3719, 3782, 3638, 3704, 3706, 3707, 3710, 3717, 3718, +- 3687, 3720, 3721, 3782, 1216, 1200, 1191, 3705, 3705, 3705, +- 3705, 3705, 3705, 3705, 3705, 3705, 3711, 3575, 3722, 3719, +- 3712, 3723, 3724, 3725, 3726, 3727, 3728, 3713, 3729, 3720, +- 3721, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, +- +- 3730, 3731, 3732, 3735, 3711, 3736, 3722, 3740, 3712, 3723, +- 3724, 3725, 3726, 3727, 3728, 3713, 3729, 3742, 3743, 3744, +- 3746, 3685, 3749, 3685, 3685, 1179, 3952, 1158, 3730, 3731, +- 3732, 3735, 3753, 3736, 3685, 3740, 3684, 3754, 3685, 3684, +- 3755, 3686, 3756, 3757, 3758, 3742, 3743, 3744, 3746, 3685, +- 3749, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, +- 3753, 3759, 3760, 3761, 3762, 3754, 3763, 3764, 3755, 3765, +- 3756, 3757, 3758, 3705, 3705, 3705, 3705, 3705, 3705, 3705, +- 3705, 3705, 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3759, +- 3760, 3761, 3762, 3774, 3763, 3764, 3775, 3765, 3776, 3777, +- +- 3778, 3779, 3780, 3781, 3783, 3687, 3784, 3785, 3788, 3792, +- 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3795, 3786, 3796, +- 3687, 3774, 3797, 3798, 3775, 3799, 3776, 3777, 3778, 3779, +- 3780, 3781, 3783, 3800, 3784, 3785, 3788, 3952, 3801, 3802, +- 3952, 3803, 3952, 3807, 3803, 3795, 3786, 3796, 3808, 3714, +- 3797, 3798, 3809, 3799, 3810, 3811, 3812, 3813, 3814, 3793, +- 3827, 3800, 3815, 3816, 3817, 3818, 3801, 3802, 3819, 3821, +- 3822, 3807, 3823, 3824, 3825, 3827, 3808, 3830, 3831, 3832, +- 3809, 3833, 3810, 3811, 3812, 3813, 3814, 3834, 3804, 3835, +- 3815, 3816, 3817, 3818, 3836, 3839, 3819, 3821, 3822, 3715, +- +- 3823, 3824, 3825, 3846, 3847, 3830, 3831, 3832, 3805, 3833, +- 3828, 3805, 3848, 3841, 3849, 3834, 3804, 3835, 3850, 3852, +- 3853, 3806, 3836, 3839, 3806, 3793, 3843, 3845, 3854, 3855, +- 3845, 3846, 3847, 3856, 3857, 3860, 3861, 3862, 3863, 3861, +- 3848, 3864, 3849, 3865, 3866, 3867, 3850, 3852, 3853, 3868, +- 3838, 3869, 1142, 3838, 3876, 3952, 3854, 3855, 3952, 3827, +- 3952, 3856, 3857, 3860, 3877, 3952, 3863, 3878, 3952, 3864, +- 3952, 3865, 3866, 3867, 3879, 3844, 3880, 3868, 3844, 3869, +- 3873, 3845, 3876, 3881, 3845, 3882, 3875, 3793, 3883, 3884, +- 3893, 3895, 3877, 3891, 3885, 3878, 3891, 3894, 3892, 3896, +- +- 3894, 3898, 3879, 3897, 3880, 3886, 3897, 3952, 3887, 3828, +- 3952, 3881, 3952, 3882, 3903, 3904, 3883, 3884, 3893, 3895, +- 3952, 3905, 3885, 3952, 3906, 3952, 3907, 3896, 3908, 3898, +- 3909, 3910, 3911, 3886, 3912, 3913, 3887, 3916, 3919, 662, +- 1117, 3891, 3903, 3904, 3891, 3918, 3892, 645, 3918, 3905, +- 3894, 385, 3906, 3894, 3907, 385, 3908, 874, 3909, 3910, +- 3911, 3897, 3912, 3913, 3897, 3916, 3919, 3917, 3917, 3917, +- 3917, 3917, 3917, 3917, 3917, 3917, 3921, 3924, 3920, 3920, +- 3920, 3920, 3920, 3920, 3920, 3920, 3920, 3925, 3926, 3927, +- 3928, 3929, 3930, 3931, 3917, 3917, 3917, 3917, 3917, 3917, +- +- 3917, 3917, 3917, 1073, 3921, 3924, 3918, 3934, 1062, 3918, +- 3934, 1054, 1051, 3935, 3936, 3925, 3926, 3927, 3928, 3929, +- 3930, 3931, 3937, 3933, 3933, 3933, 3933, 3933, 3933, 3933, +- 3933, 3933, 3920, 3920, 3920, 3920, 3920, 3920, 3920, 3920, +- 3920, 3935, 3936, 3938, 3940, 3941, 3943, 3944, 3945, 1009, +- 3937, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, +- 3934, 540, 538, 3934, 1007, 533, 531, 3946, 3947, 3948, +- 3949, 3938, 3940, 3941, 3943, 3944, 3945, 3942, 3942, 3942, +- 3942, 3942, 3942, 3942, 3942, 3942, 3942, 3942, 3942, 3942, +- 3942, 3942, 3942, 3942, 3942, 3946, 3947, 3948, 3949, 3950, +- +- 3951, 1001, 516, 514, 999, 510, 994, 986, 977, 976, +- 946, 935, 923, 913, 431, 910, 418, 414, 662, 883, +- 399, 395, 645, 865, 373, 369, 862, 3950, 3951, 76, +- 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, +- 76, 76, 76, 76, 76, 76, 76, 98, 98, 98, ++ 2222, 2223, 2240, 2248, 2224, 2225, 2226, 2241, 2227, 2249, ++ ++ 2250, 2228, 2251, 2229, 2242, 2252, 2253, 2254, 2243, 2244, ++ 2255, 2245, 2257, 2258, 2259, 2246, 2260, 2247, 2263, 2264, ++ 2265, 2248, 2266, 2267, 2268, 2269, 2270, 2249, 2250, 2271, ++ 2251, 2272, 2273, 2252, 2253, 2254, 2274, 2279, 2255, 2285, ++ 2257, 2258, 2259, 2280, 2260, 2281, 2263, 2264, 2265, 2282, ++ 2266, 2267, 2268, 2269, 2270, 2287, 2300, 2271, 2288, 2272, ++ 2273, 2289, 2290, 2291, 2274, 2279, 2303, 2292, 2293, 2294, ++ 2295, 2280, 2296, 2281, 2300, 2305, 2306, 2307, 2308, 2309, ++ 2310, 2311, 2312, 2287, 2286, 2313, 2288, 2314, 2325, 2289, ++ 2290, 2291, 2490, 2076, 2076, 2292, 2293, 2294, 2295, 2487, ++ ++ 2296, 2301, 2326, 2305, 2306, 2307, 2308, 2309, 2310, 2311, ++ 2312, 2304, 2315, 2313, 2316, 2314, 2325, 2472, 2428, 2091, ++ 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2428, ++ 2326, 2463, 2327, 2328, 2330, 2362, 2331, 2332, 2329, 2334, ++ 2315, 2335, 2316, 2317, 2317, 2317, 2317, 2317, 2317, 2317, ++ 2317, 2317, 2336, 2337, 2338, 2318, 2339, 2319, 2320, 2321, ++ 2327, 2328, 2330, 2322, 2331, 2332, 2329, 2334, 2323, 2335, ++ 2340, 2341, 2342, 2343, 2344, 2345, 2346, 2324, 2347, 2348, ++ 2336, 2337, 2338, 2318, 2339, 2319, 2320, 2321, 2349, 2350, ++ 2351, 2322, 2352, 2353, 2354, 2355, 2323, 2356, 2340, 2341, ++ ++ 2342, 2343, 2344, 2345, 2346, 2324, 2347, 2348, 2357, 2358, ++ 2144, 2145, 2146, 2144, 2145, 2146, 2349, 2350, 2351, 2363, ++ 2352, 2353, 2354, 2355, 2364, 2356, 2147, 2145, 2148, 2147, ++ 2145, 2148, 2365, 2366, 2367, 2376, 2357, 2358, 2377, 2378, ++ 2360, 2379, 2380, 2381, 2382, 2383, 2384, 2363, 2385, 2390, ++ 2388, 2391, 2364, 2388, 2392, 2393, 2488, 2262, 2394, 2395, ++ 2365, 2366, 2367, 2376, 2396, 1947, 2377, 2378, 1947, 2379, ++ 2380, 2381, 2382, 2383, 2384, 2397, 2385, 2390, 2398, 2391, ++ 2399, 1949, 2392, 2393, 1949, 2368, 2394, 2395, 2368, 2261, ++ 2389, 2256, 2396, 2401, 2402, 2403, 2404, 2405, 2406, 2407, ++ ++ 2408, 2489, 2409, 2397, 2369, 2165, 2398, 2410, 2399, 2412, ++ 2413, 2414, 2415, 2417, 2418, 2419, 2420, 2370, 2389, 2371, ++ 2421, 2401, 2402, 2403, 2404, 2405, 2406, 2407, 2408, 2372, ++ 2409, 2373, 2374, 2375, 2423, 2410, 2424, 2412, 2413, 2414, ++ 2415, 2417, 2418, 2419, 2420, 2370, 2422, 2371, 2421, 2422, ++ 2425, 2426, 2427, 2430, 2429, 2431, 2432, 2372, 2433, 2373, ++ 2374, 2375, 2423, 2434, 2424, 2429, 2435, 2437, 2438, 2439, ++ 2440, 2441, 2442, 2443, 2444, 2436, 2445, 2446, 2425, 2426, ++ 2427, 2430, 2447, 2431, 2432, 2450, 2433, 2451, 2448, 2452, ++ 2453, 2434, 2454, 2455, 2435, 2437, 2438, 2439, 2440, 2441, ++ ++ 2442, 2443, 2444, 2449, 2445, 2446, 2456, 2457, 2458, 2459, ++ 2447, 2460, 2461, 2450, 2462, 2451, 2448, 2452, 2453, 2464, ++ 2454, 2455, 2465, 2466, 2467, 2468, 2469, 2470, 2471, 2473, ++ 2474, 2449, 2475, 2476, 2456, 2457, 2458, 2459, 2477, 2460, ++ 2461, 2478, 2462, 2479, 2480, 2481, 2484, 2464, 2485, 2486, ++ 2465, 2466, 2467, 2468, 2469, 2470, 2471, 2473, 2474, 2491, ++ 2475, 2476, 2493, 2494, 2495, 2496, 2477, 2497, 2498, 2478, ++ 2499, 2479, 2480, 2481, 2484, 2500, 2485, 2486, 2501, 2511, ++ 2514, 2516, 2517, 2150, 2504, 2518, 2519, 2504, 2520, 2504, ++ 2493, 2494, 2495, 2496, 2505, 2497, 2498, 2506, 2499, 2521, ++ ++ 2522, 2523, 2524, 2500, 2492, 2525, 2501, 2526, 2528, 2516, ++ 2517, 2507, 2529, 2518, 2519, 2368, 2520, 1949, 2368, 1947, ++ 2572, 2114, 2530, 2533, 2512, 2515, 2531, 2521, 2522, 2523, ++ 2524, 2532, 2534, 2525, 2527, 2526, 2528, 2535, 2536, 2508, ++ 2529, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, ++ 2530, 2533, 2537, 2538, 2531, 2539, 2540, 2541, 2542, 2532, ++ 2534, 2543, 2544, 2545, 2546, 2535, 2536, 2547, 2548, 2549, ++ 2550, 2551, 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, ++ 2537, 2538, 2561, 2539, 2540, 2541, 2542, 2088, 2567, 2543, ++ 2544, 2545, 2546, 2568, 2571, 2547, 2548, 2549, 2550, 2551, ++ ++ 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, 2563, 2564, ++ 2561, 2563, 2566, 2564, 2575, 2566, 2567, 2569, 2578, 2576, ++ 2574, 2568, 2571, 2574, 2570, 2577, 2579, 2580, 2581, 2582, ++ 2583, 2584, 2585, 2583, 2586, 2087, 2587, 2588, 2589, 2994, ++ 2590, 2591, 2575, 1899, 2595, 2569, 2578, 2576, 2049, 2596, ++ 2994, 2597, 2570, 2577, 2579, 2580, 2581, 2582, 2598, 2584, ++ 2585, 2599, 2586, 2360, 2587, 2588, 2589, 2362, 2590, 2591, ++ 3965, 2388, 2595, 3965, 2388, 3965, 2593, 2596, 2359, 2597, ++ 2600, 2601, 2361, 2602, 2603, 2604, 2598, 2603, 2606, 2599, ++ 2607, 2608, 2609, 2610, 2611, 2612, 2613, 2614, 2615, 2616, ++ ++ 2617, 2618, 2619, 2621, 2622, 2624, 2625, 2623, 2600, 2601, ++ 2623, 2602, 2627, 2604, 2629, 2627, 2606, 2628, 2607, 2608, ++ 2609, 2610, 2611, 2612, 2613, 2614, 2615, 2616, 2617, 2618, ++ 2619, 2621, 2622, 2624, 2625, 2630, 2631, 2632, 2633, 2634, ++ 2635, 2637, 2629, 2639, 2641, 2642, 2643, 2644, 2645, 2646, ++ 2647, 2649, 2650, 2651, 2639, 2652, 2020, 2653, 2654, 2655, ++ 2656, 2657, 2658, 2630, 2631, 2632, 2633, 2634, 2635, 2637, ++ 2660, 2661, 2641, 2642, 2643, 2644, 2645, 2646, 2647, 2649, ++ 2650, 2651, 2662, 2652, 2640, 2653, 2654, 2655, 2656, 2657, ++ 2658, 2663, 2664, 2665, 2666, 2667, 2668, 2669, 2660, 2661, ++ ++ 2670, 2671, 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, ++ 2662, 2681, 2682, 2684, 2282, 2488, 2686, 2687, 2688, 2663, ++ 2664, 2665, 2666, 2667, 2668, 2669, 2689, 2690, 2670, 2671, ++ 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, 2691, 2681, ++ 2682, 2692, 2693, 2299, 2686, 2687, 2688, 2698, 2712, 2710, ++ 2997, 1949, 2300, 2511, 2689, 2690, 1947, 2502, 2492, 2685, ++ 2492, 2997, 2504, 2713, 2699, 2504, 2691, 2504, 2504, 2692, ++ 2693, 2504, 2695, 2504, 2504, 2506, 2712, 2504, 2702, 2504, ++ 2714, 2715, 1945, 2504, 2706, 2701, 2504, 2506, 2504, 2696, ++ 1905, 2713, 2700, 2695, 2515, 2703, 2506, 2711, 2515, 2716, ++ ++ 2717, 2707, 2718, 2719, 2720, 2721, 2722, 2723, 2714, 2715, ++ 2696, 2724, 2725, 2726, 2727, 2728, 2729, 2697, 1905, 2730, ++ 2731, 2732, 2733, 2704, 2734, 2735, 2736, 2716, 2717, 2708, ++ 2718, 2719, 2720, 2721, 2722, 2723, 2737, 2738, 2508, 2724, ++ 2725, 2726, 2727, 2728, 2729, 2739, 2740, 2730, 2731, 2732, ++ 2733, 2741, 2734, 2735, 2736, 2742, 2744, 2746, 2747, 2748, ++ 2749, 2750, 2751, 2752, 2737, 2738, 2753, 2563, 2564, 2754, ++ 2563, 2755, 2756, 2739, 2740, 2566, 2564, 2757, 2566, 2741, ++ 2760, 2761, 2762, 2742, 2744, 2746, 2747, 2748, 2749, 2750, ++ 2751, 2752, 2574, 2763, 2753, 2574, 2764, 2754, 2765, 2755, ++ ++ 2756, 2766, 1917, 2767, 2770, 2757, 2771, 2772, 2760, 2761, ++ 2762, 2583, 2773, 2774, 2583, 2775, 2768, 1912, 2776, 2779, ++ 2780, 2763, 2360, 2781, 2764, 2782, 2765, 2783, 2784, 2766, ++ 2362, 2767, 2770, 2789, 2771, 2772, 2785, 2359, 2786, 2788, ++ 2773, 2774, 2788, 2775, 2790, 2361, 2776, 2779, 2780, 2791, ++ 2792, 2781, 2793, 2782, 2794, 2783, 2784, 2795, 2796, 2797, ++ 2798, 2789, 2797, 2800, 2785, 2801, 2786, 2802, 2803, 2804, ++ 2805, 2623, 2790, 2810, 2623, 2814, 2806, 2791, 2792, 2799, ++ 2793, 2816, 2794, 2808, 2809, 2795, 2796, 2627, 2798, 2817, ++ 2627, 2800, 2628, 2801, 2818, 2802, 2803, 2804, 2805, 2819, ++ ++ 2820, 2810, 2821, 2814, 2822, 2823, 2824, 2799, 2825, 2816, ++ 2826, 2808, 2809, 2827, 2828, 2829, 2830, 2817, 2831, 2832, ++ 2833, 2834, 2818, 2835, 2836, 2837, 2838, 2819, 2820, 2841, ++ 2821, 2842, 2822, 2823, 2824, 2843, 2825, 2844, 2826, 2845, ++ 2846, 2827, 2828, 2829, 2830, 2847, 2831, 2832, 2833, 2834, ++ 2848, 2835, 2836, 2837, 2838, 2849, 2850, 2841, 2851, 2842, ++ 2852, 2853, 2854, 2843, 2855, 2844, 2856, 2845, 2846, 2857, ++ 2858, 2859, 2860, 2847, 2861, 2862, 2863, 2864, 2848, 2488, ++ 2865, 2866, 2867, 2849, 2850, 2868, 2851, 2869, 2852, 2853, ++ 2854, 2870, 2855, 2871, 2856, 1902, 2511, 2857, 2858, 2859, ++ ++ 2860, 2880, 2861, 2862, 2863, 2864, 2299, 2509, 2958, 2866, ++ 2867, 2958, 2883, 2868, 2508, 2869, 2895, 2299, 2881, 2870, ++ 2502, 2871, 1526, 2873, 2489, 2076, 2873, 2504, 2873, 2699, ++ 2504, 2502, 2504, 2874, 1897, 2885, 2875, 2878, 1715, 2873, ++ 2506, 2512, 2873, 1886, 2873, 2896, 2882, 2897, 2701, 2887, ++ 2876, 2898, 2875, 2504, 2696, 2899, 2504, 2884, 2504, 2504, ++ 2900, 2091, 2504, 2890, 2504, 1849, 2888, 2959, 2901, 2706, ++ 2959, 2873, 2506, 2896, 2873, 2897, 2873, 2902, 2877, 2898, ++ 2703, 2874, 2508, 2899, 2875, 2903, 2707, 2904, 2900, 1831, ++ 2504, 2905, 2906, 2504, 2889, 2504, 2901, 2907, 2876, 2908, ++ ++ 2893, 2909, 2910, 2506, 2911, 2902, 2912, 2913, 2891, 2914, ++ 2915, 2916, 2917, 2903, 2708, 2904, 2918, 2707, 2919, 2905, ++ 2906, 2920, 2921, 2922, 2923, 2907, 2877, 2908, 2924, 2909, ++ 2910, 2925, 2911, 2926, 2912, 2913, 2927, 2914, 2915, 2916, ++ 2917, 2928, 2929, 2930, 2918, 2894, 2919, 2931, 2932, 2920, ++ 2921, 2922, 2923, 2933, 2934, 2935, 2924, 2936, 2938, 2925, ++ 2939, 2926, 2940, 2941, 2927, 2942, 2943, 2944, 2945, 2928, ++ 2929, 2930, 2947, 2948, 2949, 2931, 2932, 2950, 2951, 2952, ++ 2953, 2933, 2934, 2935, 2955, 2936, 2938, 2956, 2939, 2957, ++ 2940, 2941, 2960, 2942, 2943, 2944, 2945, 2961, 2962, 2963, ++ ++ 2947, 2948, 2949, 2964, 2971, 2950, 2951, 2952, 2953, 2972, ++ 2788, 2973, 2955, 2788, 2974, 2956, 2797, 2957, 2977, 2797, ++ 2960, 2975, 2966, 2978, 2979, 2961, 2962, 2963, 2980, 2981, ++ 2967, 2968, 2971, 2969, 2965, 2970, 2982, 2972, 2983, 2973, ++ 2984, 2986, 2974, 2987, 2988, 2992, 2977, 2993, 2995, 2998, ++ 2966, 2978, 2979, 2999, 3000, 3001, 2980, 2981, 2967, 2968, ++ 3002, 2969, 2965, 2970, 2982, 3003, 2983, 3004, 2984, 2986, ++ 3007, 2987, 2988, 2992, 3009, 2993, 2995, 2998, 3010, 3011, ++ 3012, 2999, 3000, 3001, 3008, 3013, 3015, 3016, 3002, 3017, ++ 3018, 3019, 3020, 3003, 3021, 3004, 3013, 3022, 3007, 3023, ++ ++ 3024, 3025, 3009, 3026, 3027, 3028, 3010, 3011, 3012, 3029, ++ 3030, 3031, 3032, 3033, 3015, 3016, 3034, 3017, 3018, 3019, ++ 3020, 3035, 3021, 3036, 3037, 3022, 3038, 3023, 3024, 3025, ++ 3039, 3026, 3027, 3028, 3040, 3041, 3042, 3029, 3030, 3031, ++ 3032, 3033, 2488, 3043, 3034, 3044, 3045, 3046, 3048, 3035, ++ 3052, 3036, 3037, 2894, 3038, 1759, 2299, 3112, 3039, 3154, ++ 3112, 1395, 3040, 3041, 3042, 3069, 3049, 2881, 3052, 1574, ++ 3154, 3043, 2511, 3044, 3045, 3046, 3048, 3118, 2873, 2873, ++ 3118, 2873, 2873, 2873, 2873, 2881, 1735, 2286, 3050, 3055, ++ 3070, 2875, 3071, 3069, 3049, 3053, 1731, 2873, 2873, 3061, ++ ++ 2873, 2873, 2873, 2873, 2698, 2876, 3056, 3050, 3058, 2504, ++ 2875, 2875, 2504, 3053, 2504, 2698, 2881, 2304, 3070, 2695, ++ 3071, 2699, 2506, 3072, 2876, 2876, 3073, 3074, 3134, 3075, ++ 3076, 3134, 2699, 3051, 3057, 2873, 2696, 1718, 2873, 3077, ++ 2873, 1717, 1715, 3142, 3062, 3063, 3142, 3059, 2875, 2700, ++ 2299, 3072, 3051, 3059, 3073, 3074, 2873, 3075, 3076, 2873, ++ 2884, 2873, 2888, 1657, 2697, 2873, 3063, 3077, 2873, 2875, ++ 2873, 2504, 1656, 3078, 2504, 3066, 2504, 2504, 2875, 1646, ++ 2504, 2702, 2504, 2888, 3079, 1645, 2504, 2702, 3080, 2504, ++ 3064, 2504, 2888, 3081, 3082, 3083, 2706, 2504, 2703, 2506, ++ ++ 2504, 3078, 2504, 3084, 2703, 3085, 3086, 2706, 3087, 3088, ++ 2506, 3064, 3079, 2707, 3089, 3090, 3080, 3091, 3092, 3093, ++ 3067, 3081, 3082, 3083, 2707, 3094, 2704, 3095, 3096, 3097, ++ 3098, 3084, 2891, 3085, 3086, 3099, 3087, 3088, 3100, 3101, ++ 3102, 2708, 3089, 3090, 3103, 3091, 3092, 3093, 3104, 3105, ++ 3107, 3108, 2894, 3094, 3109, 3095, 3096, 3097, 3098, 3110, ++ 3111, 3113, 3114, 3099, 3115, 3116, 3100, 3101, 3102, 3121, ++ 2959, 3122, 3103, 2959, 3124, 3119, 3104, 3105, 3107, 3108, ++ 3125, 3126, 3109, 3127, 3128, 3129, 3133, 3110, 3111, 3113, ++ 3114, 3139, 3115, 3116, 3130, 3140, 3135, 3121, 3965, 3122, ++ ++ 3136, 3965, 3124, 3965, 3141, 3131, 3132, 3137, 3125, 3126, ++ 3143, 3127, 3128, 3129, 3133, 3144, 3145, 3146, 3148, 3139, ++ 3149, 3150, 3130, 3140, 3135, 3152, 3153, 3155, 3136, 3156, ++ 3157, 3158, 3141, 3131, 3132, 3137, 3159, 3160, 3143, 3161, ++ 3162, 3163, 3166, 3144, 3145, 3146, 3148, 3167, 3149, 3150, ++ 3164, 3165, 3168, 3152, 3153, 3155, 3169, 3156, 3157, 3158, ++ 3170, 3171, 3172, 3173, 3159, 3160, 3174, 3161, 3162, 3163, ++ 3166, 3175, 3176, 3177, 3178, 3167, 3179, 3180, 3164, 3165, ++ 3168, 3181, 3183, 3186, 3169, 3184, 3187, 3188, 3170, 3171, ++ 3172, 3173, 3181, 3189, 3174, 3190, 3184, 3192, 1644, 3175, ++ ++ 3176, 3177, 3178, 3193, 3179, 3180, 3194, 3195, 3196, 3197, ++ 3183, 3186, 3198, 3199, 3187, 3188, 3201, 3202, 3203, 3205, ++ 3206, 3189, 3182, 3190, 3067, 3192, 3185, 2299, 2509, 3219, ++ 3220, 3193, 3406, 3204, 3194, 3195, 3196, 3197, 3208, 3245, ++ 3198, 3199, 3245, 3406, 3201, 3202, 3203, 3205, 3206, 2873, ++ 3221, 2698, 2873, 3222, 2873, 2881, 3209, 3219, 3220, 3207, ++ 2873, 3204, 2875, 2873, 2873, 2873, 3223, 2873, 2699, 2873, ++ 3063, 3052, 2504, 2875, 3210, 2504, 2876, 2504, 3221, 3224, ++ 1580, 3222, 2706, 3062, 3225, 2506, 3226, 2888, 2881, 3256, ++ 2873, 3056, 3256, 2873, 3223, 2873, 3213, 1579, 3118, 2707, ++ ++ 3050, 3118, 3281, 2875, 3059, 3281, 3227, 3224, 2873, 3228, ++ 3229, 2873, 3225, 2873, 3226, 3064, 3062, 2876, 3214, 3211, ++ 2504, 2875, 3230, 2504, 3231, 2504, 2873, 3212, 3232, 2873, ++ 3216, 2873, 3233, 2506, 3227, 2888, 3063, 3228, 3229, 2875, ++ 3234, 3235, 3236, 3237, 3238, 3059, 3239, 3217, 3240, 3241, ++ 3230, 3242, 3231, 2888, 3243, 3244, 3232, 3246, 3247, 3248, ++ 3233, 3249, 3250, 3067, 3251, 3252, 3253, 3255, 3234, 3235, ++ 3236, 3237, 3238, 3257, 3239, 3218, 3240, 3241, 3725, 3242, ++ 3725, 3067, 3243, 3244, 1574, 3246, 3247, 3248, 3112, 3249, ++ 3250, 3112, 3251, 3252, 3253, 3255, 3259, 3965, 3260, 3262, ++ ++ 3965, 3257, 3965, 3263, 3264, 3254, 3254, 3254, 3254, 3254, ++ 3254, 3254, 3254, 3254, 3265, 3266, 3267, 3268, 3269, 3270, ++ 3271, 3273, 3359, 1550, 3259, 3359, 3260, 3262, 3726, 1549, ++ 3657, 3263, 3264, 3134, 3274, 3275, 3134, 3277, 3278, 3279, ++ 3282, 3283, 3265, 3266, 3267, 3268, 3269, 3270, 3271, 3273, ++ 3272, 3272, 3272, 3272, 3272, 3272, 3272, 3272, 3272, 3284, ++ 3285, 3286, 3274, 3275, 3287, 3277, 3278, 3279, 3282, 3283, ++ 3288, 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3296, 3297, ++ 3298, 3299, 3300, 3301, 3303, 3304, 3305, 3284, 3285, 3286, ++ 3306, 3307, 3287, 3309, 3310, 3311, 3312, 3313, 3288, 3289, ++ ++ 3290, 3291, 3292, 3293, 3294, 3295, 3296, 3297, 3298, 3299, ++ 3300, 3301, 3303, 3304, 3305, 3314, 3315, 3317, 3306, 3307, ++ 3319, 3309, 3310, 3311, 3312, 3313, 3320, 3321, 3317, 3322, ++ 1546, 3323, 3324, 3325, 3326, 3327, 3328, 3329, 3330, 3331, ++ 3332, 3334, 3245, 3314, 3315, 3245, 3341, 3362, 3319, 3390, ++ 3342, 3333, 3390, 3281, 3320, 3321, 3281, 3322, 3318, 3323, ++ 3324, 3325, 3326, 3327, 3328, 3329, 3330, 3331, 3332, 3334, ++ 2873, 3052, 1545, 2873, 3341, 2873, 1544, 3336, 3342, 3333, ++ 3050, 2873, 2873, 2875, 2873, 2873, 2873, 2873, 2881, 1543, ++ 2504, 3055, 3055, 2504, 2699, 2504, 1542, 2876, 1540, 3343, ++ ++ 3335, 2873, 2504, 2506, 2873, 2504, 2873, 2504, 3056, 3056, ++ 3344, 3063, 3216, 3345, 2875, 2506, 3053, 2707, 3346, 3347, ++ 1117, 2873, 2884, 3348, 2873, 3051, 2873, 3343, 2888, 3217, ++ 3349, 2887, 3350, 3351, 2875, 3352, 3057, 3211, 3344, 2504, ++ 3353, 3345, 2504, 3354, 2504, 2894, 3346, 3347, 2888, 3339, ++ 3355, 3348, 2506, 3356, 3357, 3358, 3064, 3337, 3349, 3360, ++ 3350, 3351, 3361, 3352, 3364, 3365, 3217, 3366, 3353, 3367, ++ 3368, 3354, 3369, 3370, 3371, 874, 2889, 3399, 3355, 1485, ++ 3399, 3356, 3357, 3358, 3372, 3377, 3401, 3360, 3377, 3401, ++ 3361, 1476, 3364, 3365, 3340, 3366, 3256, 3367, 3368, 3256, ++ ++ 3369, 3370, 3371, 3254, 3254, 3254, 3254, 3254, 3254, 3254, ++ 3254, 3254, 3372, 3373, 3373, 3373, 3373, 3373, 3373, 3373, ++ 3373, 3373, 3374, 3376, 3380, 3381, 3382, 3383, 3384, 3385, ++ 3386, 3378, 3387, 3388, 3389, 3272, 3272, 3272, 3272, 3272, ++ 3272, 3272, 3272, 3272, 3391, 3392, 3393, 3394, 3395, 3396, ++ 3374, 3376, 3380, 3381, 3382, 3383, 3384, 3385, 3386, 3378, ++ 3387, 3388, 3389, 3397, 3398, 3400, 3402, 3403, 3404, 3405, ++ 3407, 3408, 3391, 3392, 3393, 3394, 3395, 3396, 3409, 3410, ++ 3412, 3413, 3414, 3415, 3416, 3419, 3420, 3421, 3422, 3423, ++ 3425, 3397, 3398, 3400, 3402, 3403, 3404, 3405, 3407, 3408, ++ ++ 3426, 3427, 3430, 3431, 3432, 3433, 3409, 3410, 3412, 3413, ++ 3414, 3415, 3416, 3419, 3420, 3421, 3422, 3423, 3425, 3428, ++ 3434, 3435, 3436, 3437, 3438, 3440, 3441, 3429, 3426, 3427, ++ 3430, 3431, 3432, 3433, 3442, 3443, 3444, 3445, 3340, 3461, ++ 3052, 2299, 3461, 1474, 1469, 1464, 3447, 3428, 3434, 3435, ++ 3436, 3437, 3438, 3440, 3441, 3429, 2873, 2881, 3448, 2873, ++ 3449, 2873, 3442, 3443, 3444, 3445, 3050, 2504, 2873, 2875, ++ 2504, 2873, 2504, 2873, 3447, 3450, 3451, 3446, 3063, 2504, ++ 2506, 2875, 2504, 2876, 2504, 2882, 3448, 3452, 3449, 3216, ++ 3453, 3454, 2506, 3455, 3217, 2888, 3456, 3457, 3458, 3459, ++ ++ 1406, 3462, 3464, 3450, 3451, 3465, 3217, 3466, 3467, 3468, ++ 3469, 2877, 3470, 3471, 3472, 3452, 3473, 3487, 3453, 3454, ++ 3487, 3455, 3340, 2889, 3456, 3457, 3458, 3459, 3359, 3462, ++ 3464, 3359, 3503, 3465, 3340, 3466, 3467, 3468, 3469, 1405, ++ 3470, 3471, 3472, 3503, 3473, 3460, 3460, 3460, 3460, 3460, ++ 3460, 3460, 3460, 3460, 3463, 3463, 3463, 3463, 3463, 3463, ++ 3463, 3463, 3463, 3463, 3463, 3363, 3363, 3363, 3363, 3363, ++ 3363, 3363, 3363, 3363, 3363, 3363, 3474, 3476, 540, 3463, ++ 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3377, ++ 3363, 3477, 3377, 3478, 3479, 3480, 3481, 3482, 3483, 3484, ++ ++ 3485, 3490, 3491, 538, 3474, 3476, 3475, 3475, 3475, 3475, ++ 3475, 3475, 3475, 3475, 3475, 3488, 3493, 3489, 3488, 3477, ++ 3489, 3478, 3479, 3480, 3481, 3482, 3483, 3484, 3485, 3490, ++ 3491, 3492, 3494, 3495, 3492, 3497, 3498, 3550, 3497, 3498, ++ 3550, 3508, 533, 3500, 3493, 3401, 3501, 3502, 3401, 3505, ++ 3506, 3507, 3508, 3509, 3510, 3514, 531, 516, 3515, 3516, ++ 3494, 3495, 3499, 3499, 3499, 3499, 3499, 3499, 3499, 3499, ++ 3499, 3500, 3517, 3518, 3501, 3502, 3511, 3505, 3506, 3507, ++ 3519, 3509, 3510, 3514, 3512, 3513, 3515, 3516, 3520, 3521, ++ 3522, 3523, 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, ++ ++ 3517, 3518, 3532, 3533, 3511, 3534, 3535, 3534, 3519, 3536, ++ 3537, 3539, 3512, 3513, 3540, 514, 3520, 3521, 3522, 3523, ++ 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, 3541, 3542, ++ 3532, 3533, 3543, 3544, 3535, 3545, 3546, 3536, 3537, 3539, ++ 2504, 3547, 3540, 2504, 3552, 2504, 3553, 3554, 3555, 3487, ++ 3216, 3497, 3487, 2506, 3585, 3628, 3541, 3542, 3628, 3634, ++ 3543, 3544, 3634, 3545, 3546, 3556, 3557, 3217, 3558, 3547, ++ 3559, 3560, 3552, 3561, 3553, 3554, 3555, 3534, 3460, 3460, ++ 3460, 3460, 3460, 3460, 3460, 3460, 3460, 3461, 3638, 3551, ++ 3461, 3638, 3548, 3556, 3557, 3337, 3558, 3573, 3559, 3560, ++ ++ 3573, 3561, 3574, 510, 3549, 3549, 3549, 3549, 3549, 3549, ++ 3549, 3549, 3549, 3463, 3463, 3463, 3463, 3463, 3463, 3463, ++ 3463, 3463, 3463, 3463, 3475, 3475, 3475, 3475, 3475, 3475, ++ 3475, 3475, 3475, 3562, 3563, 3564, 3565, 3566, 3463, 3568, ++ 3566, 3569, 3570, 3571, 3576, 3578, 3579, 3576, 3492, 3577, ++ 3581, 3492, 3582, 3580, 3583, 3587, 3701, 3704, 1396, 3701, ++ 3704, 3562, 3563, 3564, 3565, 3745, 3567, 3568, 3590, 3569, ++ 3570, 3571, 3573, 3578, 3579, 3573, 3745, 3574, 3581, 1392, ++ 3582, 3498, 3583, 3587, 3498, 3499, 3499, 3499, 3499, 3499, ++ 3499, 3499, 3499, 3499, 3567, 3591, 3590, 3592, 3586, 3586, ++ ++ 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3588, 3593, 3594, ++ 3595, 3596, 3597, 3589, 3598, 3599, 3601, 3603, 3604, 3605, ++ 3606, 3607, 3608, 3591, 3610, 3592, 3611, 3614, 3615, 3576, ++ 3818, 1386, 3576, 3818, 3577, 3588, 3593, 3594, 3595, 3596, ++ 3597, 3589, 3598, 3599, 3601, 3603, 3604, 3605, 3606, 3607, ++ 3608, 3617, 3610, 3618, 3611, 3614, 3615, 3616, 3616, 3616, ++ 3616, 3616, 3616, 3616, 3616, 3616, 3616, 3616, 3619, 3622, ++ 3623, 3624, 3625, 3626, 3627, 3638, 3965, 1355, 3638, 3617, ++ 3708, 3618, 3616, 3629, 3629, 3629, 3629, 3629, 3629, 3629, ++ 3629, 3629, 3631, 3632, 3633, 3635, 3619, 3622, 3623, 3624, ++ ++ 3625, 3626, 3627, 3549, 3549, 3549, 3549, 3549, 3549, 3549, ++ 3549, 3549, 3550, 3636, 3637, 3550, 3639, 3640, 3641, 3642, ++ 3631, 3632, 3633, 3635, 3643, 3645, 3646, 3647, 3650, 3630, ++ 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3653, 3654, ++ 3566, 3636, 3637, 3566, 3639, 3640, 3641, 3642, 3648, 1347, ++ 3658, 3648, 3643, 3645, 3646, 3647, 3650, 3644, 3644, 3644, ++ 3644, 3644, 3644, 3644, 3644, 3644, 3653, 3654, 3659, 3660, ++ 3584, 3662, 3663, 3664, 3665, 3667, 3668, 3649, 3658, 3669, ++ 3670, 3671, 3672, 3673, 3661, 3661, 3661, 3661, 3661, 3661, ++ 3661, 3661, 3661, 1336, 431, 3497, 3659, 3660, 3585, 3662, ++ ++ 3663, 3664, 3665, 3667, 3668, 3649, 3674, 3669, 3670, 3671, ++ 3672, 3673, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, ++ 3661, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, ++ 3675, 3676, 3677, 3678, 3674, 3679, 3680, 3681, 3683, 3686, ++ 418, 3687, 3688, 3616, 3616, 3616, 3616, 3616, 3616, 3616, ++ 3616, 3616, 3616, 3616, 3689, 3691, 3692, 3693, 3675, 3676, ++ 3677, 3678, 414, 3679, 3680, 3681, 3683, 3686, 3616, 3687, ++ 3688, 3819, 399, 3695, 3819, 3696, 3695, 3699, 3697, 3700, ++ 3702, 395, 3689, 3691, 3692, 3693, 3696, 3706, 3709, 3629, ++ 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3630, 3630, ++ ++ 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3700, 3702, 3634, ++ 3710, 3711, 3634, 3712, 3713, 3706, 3709, 3644, 3644, 3644, ++ 3644, 3644, 3644, 3644, 3644, 3644, 3703, 3703, 3703, 3703, ++ 3703, 3703, 3703, 3703, 3703, 3714, 3715, 373, 3710, 3711, ++ 3701, 3712, 3713, 3701, 369, 3759, 3717, 3718, 3648, 3721, ++ 3722, 3648, 3728, 3729, 3723, 3730, 3731, 3698, 3732, 3733, ++ 3734, 3724, 363, 3714, 3715, 3716, 3716, 3716, 3716, 3716, ++ 3716, 3716, 3716, 3716, 3717, 3718, 3584, 3721, 3722, 3735, ++ 3728, 3729, 3723, 3730, 3731, 3736, 3732, 3733, 3734, 3724, ++ 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3737, ++ ++ 3738, 3739, 3740, 3741, 3742, 3743, 3744, 3735, 3746, 3747, ++ 3748, 3752, 3754, 3736, 3755, 3756, 359, 3758, 3704, 3746, ++ 355, 3704, 1278, 3762, 3761, 3790, 3765, 3737, 3738, 3739, ++ 3740, 3741, 3742, 3743, 3744, 1217, 3790, 3747, 3748, 3752, ++ 3754, 1216, 3755, 3756, 3696, 3758, 3696, 3696, 3695, 3965, ++ 3696, 3695, 3761, 3697, 3765, 3965, 3766, 3696, 3965, 3767, ++ 3965, 3696, 3703, 3703, 3703, 3703, 3703, 3703, 3703, 3703, ++ 3703, 3768, 3769, 3770, 3771, 3716, 3716, 3716, 3716, 3716, ++ 3716, 3716, 3716, 3716, 3766, 3772, 3773, 3767, 3774, 3775, ++ 3776, 3777, 3778, 3779, 3780, 3781, 3782, 3783, 3784, 3768, ++ ++ 3769, 3770, 3771, 3785, 3795, 3786, 3787, 3788, 3789, 3791, ++ 3792, 3793, 3794, 3772, 3773, 3795, 3774, 3775, 3776, 3777, ++ 3796, 3779, 3780, 3781, 3782, 3783, 3784, 3797, 3698, 3801, ++ 3798, 3785, 3698, 3786, 3787, 3788, 3789, 3791, 3792, 3793, ++ 3794, 3799, 3657, 3805, 3965, 3808, 3809, 3965, 3796, 3965, ++ 3810, 3811, 3812, 3813, 3814, 3797, 3815, 3801, 3798, 3816, ++ 3820, 3821, 3816, 3725, 3822, 1200, 3823, 3824, 3825, 3799, ++ 3826, 3827, 3828, 3808, 3809, 3829, 3830, 3831, 3810, 3811, ++ 3812, 3813, 3814, 3832, 3815, 3840, 3834, 3835, 3820, 3821, ++ 3836, 3837, 3822, 3806, 3823, 3824, 3825, 3838, 3826, 3827, ++ ++ 3828, 3840, 3843, 3829, 3830, 3831, 3817, 1191, 3844, 3845, ++ 3846, 3832, 3847, 3726, 3834, 3835, 3848, 3849, 3836, 3837, ++ 3851, 3852, 3859, 3851, 3818, 3838, 3860, 3818, 3819, 3854, ++ 3843, 3819, 3861, 3856, 3817, 3841, 3844, 3845, 3846, 3857, ++ 3847, 3862, 3857, 3858, 3848, 3849, 3858, 3863, 3865, 3852, ++ 3859, 3806, 3866, 3867, 3860, 3868, 3869, 3870, 3873, 3874, ++ 3861, 3875, 3874, 3876, 3877, 3878, 3879, 3880, 3881, 3862, ++ 3851, 3882, 3840, 3851, 3965, 3863, 3865, 3965, 3889, 3965, ++ 3866, 3867, 3890, 3868, 3869, 3870, 3873, 3891, 3892, 3893, ++ 3894, 3876, 3877, 3878, 3879, 3880, 3881, 3965, 3857, 3882, ++ ++ 3965, 3857, 3965, 3886, 3858, 3895, 3889, 3858, 3896, 3888, ++ 3890, 3806, 3897, 3898, 3906, 3891, 3892, 3893, 3894, 3908, ++ 3904, 3909, 3841, 3904, 3899, 3905, 3907, 3900, 3910, 3907, ++ 3911, 3910, 3965, 3895, 3916, 3965, 3896, 3965, 3917, 3918, ++ 3897, 3898, 3906, 3965, 3919, 3920, 3965, 3908, 3965, 3909, ++ 3921, 3922, 3899, 3923, 3924, 3900, 3925, 3926, 3911, 3929, ++ 3904, 3931, 3916, 3904, 3931, 3905, 3917, 3918, 1179, 3932, ++ 3934, 3907, 3919, 3920, 3907, 1158, 1142, 3947, 3921, 3922, ++ 3947, 3923, 3924, 3910, 3925, 3926, 3910, 3929, 3930, 3930, ++ 3930, 3930, 3930, 3930, 3930, 3930, 3930, 3932, 3934, 3937, ++ ++ 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3938, ++ 3939, 3940, 3941, 3942, 3943, 3944, 3930, 3930, 3930, 3930, ++ 3930, 3930, 3930, 3930, 3930, 662, 1117, 3937, 3931, 645, ++ 385, 3931, 385, 874, 1073, 3948, 3949, 3938, 3939, 3940, ++ 3941, 3942, 3943, 3944, 3950, 3946, 3946, 3946, 3946, 3946, ++ 3946, 3946, 3946, 3946, 3933, 3933, 3933, 3933, 3933, 3933, ++ 3933, 3933, 3933, 3948, 3949, 3951, 3953, 3954, 3956, 3957, ++ 3958, 1062, 3950, 3946, 3946, 3946, 3946, 3946, 3946, 3946, ++ 3946, 3946, 3947, 1054, 1051, 3947, 1009, 540, 538, 3959, ++ 3960, 3961, 3962, 3951, 3953, 3954, 3956, 3957, 3958, 3955, ++ ++ 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, ++ 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3959, 3960, 3961, ++ 3962, 3963, 3964, 1007, 533, 531, 1001, 516, 514, 999, ++ 510, 994, 986, 977, 976, 946, 935, 923, 913, 431, ++ 910, 418, 414, 662, 883, 399, 395, 645, 865, 3963, ++ 3964, 76, 76, 76, 76, 76, 76, 76, 76, 76, ++ 76, 76, 76, 76, 76, 76, 76, 76, 76, 98, + 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, +- 98, 98, 98, 98, 98, 128, 128, 128, 128, 128, ++ 98, 98, 98, 98, 98, 98, 98, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, +- 128, 128, 128, 134, 134, 134, 134, 134, 134, 134, +- 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, + +- 134, 137, 137, 137, 137, 137, 137, 137, 137, 137, +- 137, 137, 137, 137, 137, 137, 137, 137, 137, 143, +- 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, +- 143, 143, 143, 143, 143, 143, 143, 149, 149, 149, ++ 128, 128, 128, 128, 128, 134, 134, 134, 134, 134, ++ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, ++ 134, 134, 134, 137, 137, 137, 137, 137, 137, 137, ++ 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, ++ 137, 143, 143, 143, 143, 143, 143, 143, 143, 143, ++ 143, 143, 143, 143, 143, 143, 143, 143, 143, 149, + 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, +- 149, 149, 149, 149, 149, 156, 156, 156, 156, 156, ++ 149, 149, 149, 149, 149, 149, 149, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, +- 156, 156, 156, 162, 162, 162, 162, 162, 162, 162, +- 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, +- 162, 169, 169, 169, 169, 169, 169, 169, 169, 169, ++ 156, 156, 156, 156, 156, 162, 162, 162, 162, 162, + +- 169, 169, 169, 169, 169, 169, 169, 169, 169, 179, +- 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, +- 179, 179, 179, 179, 179, 179, 179, 185, 185, 185, ++ 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, ++ 162, 162, 162, 169, 169, 169, 169, 169, 169, 169, ++ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, ++ 169, 179, 179, 179, 179, 179, 179, 179, 179, 179, ++ 179, 179, 179, 179, 179, 179, 179, 179, 179, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, +- 185, 185, 185, 185, 185, 227, 227, 227, 227, 227, ++ 185, 185, 185, 185, 185, 185, 185, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, +- 227, 227, 227, 232, 232, 232, 232, 232, 232, 232, ++ 227, 227, 227, 227, 227, 232, 232, 232, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, +- 232, 237, 237, 237, 237, 237, 237, 237, 237, 237, +- 237, 237, 237, 237, 237, 237, 237, 237, 237, 238, + +- 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, +- 238, 238, 238, 238, 238, 238, 238, 239, 239, 239, ++ 232, 232, 232, 237, 237, 237, 237, 237, 237, 237, ++ 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, ++ 237, 238, 238, 238, 238, 238, 238, 238, 238, 238, ++ 238, 238, 238, 238, 238, 238, 238, 238, 238, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, +- 239, 239, 239, 239, 239, 240, 240, 240, 240, 240, ++ 239, 239, 239, 239, 239, 239, 239, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, +- 240, 240, 240, 241, 241, 241, 241, 241, 241, 241, ++ 240, 240, 240, 240, 240, 241, 241, 241, 241, 241, + 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, +- 241, 249, 249, 249, 249, 249, 249, 249, 249, 249, +- 249, 249, 249, 249, 249, 249, 249, 249, 249, 251, +- 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, ++ 241, 241, 241, 249, 249, 249, 249, 249, 249, 249, + +- 251, 251, 251, 251, 251, 251, 251, 255, 255, 255, ++ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, ++ 249, 251, 251, 251, 251, 251, 251, 251, 251, 251, ++ 251, 251, 251, 251, 251, 251, 251, 251, 251, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, +- 255, 255, 255, 255, 255, 258, 258, 258, 258, 258, ++ 255, 255, 255, 255, 255, 255, 255, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, +- 258, 258, 258, 266, 266, 363, 266, 266, 266, 266, ++ 258, 258, 258, 258, 258, 266, 266, 373, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 346, 346, 346, 346, 346, 346, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 363, 363, 363, ++ 266, 266, 266, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, + ++ 346, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 356, 356, 356, 356, 356, 356, 356, 356, 356, 363, + 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 363, 363, 366, 366, 366, 366, 366, ++ 363, 363, 363, 363, 363, 363, 363, 366, 366, 366, + 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 366, 366, 373, 373, 373, 373, 373, 373, 373, ++ 366, 366, 366, 366, 366, 373, 373, 373, 373, 373, + 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, +- 373, 376, 376, 376, 376, 376, 376, 376, 376, 376, +- 376, 376, 376, 376, 376, 376, 376, 376, 376, 382, +- 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, +- 382, 382, 382, 382, 382, 382, 382, 387, 387, 387, +- 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, ++ 373, 373, 373, 376, 376, 376, 376, 376, 376, 376, ++ 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, ++ 376, 382, 382, 382, 382, 382, 382, 382, 382, 382, + +- 387, 387, 387, 387, 387, 391, 391, 391, 391, 391, ++ 382, 382, 382, 382, 382, 382, 382, 382, 382, 387, ++ 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, ++ 387, 387, 387, 387, 387, 387, 387, 391, 391, 391, + 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, +- 391, 391, 391, 399, 399, 399, 399, 399, 399, 399, ++ 391, 391, 391, 391, 391, 399, 399, 399, 399, 399, + 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- 399, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 402, 402, 402, 402, 402, 402, 402, 411, +- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 411, 411, 411, 411, 418, 418, 418, +- 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, +- 418, 418, 418, 418, 418, 421, 421, 421, 421, 421, ++ 399, 399, 399, 402, 402, 402, 402, 402, 402, 402, ++ 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, ++ 402, 411, 411, 411, 411, 411, 411, 411, 411, 411, ++ 411, 411, 411, 411, 411, 411, 411, 411, 411, 418, + ++ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 418, 418, 418, 418, 418, 418, 418, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 421, 421, 505, 505, 505, 505, 505, 505, 505, ++ 421, 421, 421, 421, 421, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 511, 511, 511, 511, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 517, 517, 359, +- 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, +- 517, 517, 517, 517, 517, 518, 518, 859, 518, 518, +- 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, ++ 505, 505, 505, 511, 511, 511, 511, 511, 511, 511, ++ 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, ++ 511, 516, 516, 516, 516, 516, 516, 516, 516, 516, ++ 516, 516, 516, 516, 516, 516, 516, 516, 516, 517, ++ 517, 369, 517, 517, 517, 517, 517, 517, 517, 517, + +- 518, 518, 518, 519, 519, 355, 519, 519, 519, 519, ++ 517, 517, 517, 517, 517, 517, 517, 518, 518, 862, ++ 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, ++ 518, 518, 518, 518, 518, 519, 519, 363, 519, 519, + 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, +- 519, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 528, 528, 528, 528, 528, 528, 533, +- 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 533, 533, 533, 533, 535, 535, 535, ++ 519, 519, 519, 528, 528, 528, 528, 528, 528, 528, ++ 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, ++ 528, 533, 533, 533, 533, 533, 533, 533, 533, 533, ++ 533, 533, 533, 533, 533, 533, 533, 533, 533, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 535, 535, 540, 540, 540, 540, 540, +- 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, +- 540, 540, 540, 266, 266, 774, 266, 266, 266, 266, ++ 535, 535, 535, 535, 535, 535, 535, 540, 540, 540, + ++ 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, ++ 540, 540, 540, 540, 540, 266, 266, 359, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 346, 346, 346, 346, 346, 346, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 363, 363, 363, ++ 266, 266, 266, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 346, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 356, 356, 356, 356, 356, 356, 356, 356, 356, 363, + 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 538, 363, 366, 366, 366, 366, 366, ++ 363, 363, 363, 363, 363, 859, 363, 366, 366, 366, + 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 366, 366, 373, 373, 373, 373, 373, 373, 373, +- 373, 373, 373, 373, 373, 373, 373, 373, 373, 539, + +- 373, 376, 376, 376, 376, 376, 376, 376, 376, 376, +- 376, 376, 376, 376, 376, 376, 376, 376, 376, 382, +- 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, +- 382, 382, 382, 382, 382, 382, 382, 639, 639, 639, ++ 366, 366, 366, 366, 366, 373, 373, 373, 373, 373, ++ 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, ++ 373, 355, 373, 376, 376, 376, 376, 376, 376, 376, ++ 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, ++ 376, 382, 382, 382, 382, 382, 382, 382, 382, 382, ++ 382, 382, 382, 382, 382, 382, 382, 382, 382, 639, + 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 639, 639, 387, 387, 387, 387, 387, ++ 639, 639, 639, 639, 639, 639, 639, 387, 387, 387, + 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, +- 387, 387, 387, 644, 531, 644, 644, 532, 514, 644, +- 644, 644, 644, 644, 515, 644, 644, 644, 644, 644, +- 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, ++ 387, 387, 387, 387, 387, 644, 774, 644, 644, 538, + +- 391, 391, 391, 391, 391, 391, 391, 391, 399, 399, ++ 539, 644, 644, 644, 644, 644, 531, 644, 644, 644, ++ 644, 644, 391, 391, 391, 391, 391, 391, 391, 391, ++ 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, + 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- 399, 399, 399, 399, 508, 399, 652, 652, 652, 652, ++ 399, 399, 399, 399, 399, 399, 532, 399, 652, 652, + 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, +- 652, 652, 652, 652, 402, 402, 402, 402, 402, 402, ++ 652, 652, 652, 652, 652, 652, 402, 402, 402, 402, + 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 659, 659, 659, 659, 659, 659, 659, 659, ++ 402, 402, 402, 402, 659, 659, 659, 659, 659, 659, + 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, +- 661, 753, 661, 661, 739, 479, 661, 661, 661, 661, +- 661, 735, 661, 661, 661, 661, 661, 411, 411, 411, + ++ 659, 659, 661, 514, 661, 661, 515, 508, 661, 661, ++ 661, 661, 661, 753, 661, 661, 661, 661, 661, 411, + 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 411, 411, 418, 418, 418, 418, 418, ++ 411, 411, 411, 411, 411, 411, 411, 418, 418, 418, + 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, +- 418, 696, 418, 421, 421, 421, 421, 421, 421, 421, ++ 418, 418, 418, 739, 418, 421, 421, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 505, 505, 505, 505, 505, 505, 505, 505, 511, +- 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 511, 511, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, ++ 421, 421, 421, 505, 505, 505, 505, 505, 505, 505, ++ 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, ++ 505, 511, 511, 511, 511, 511, 511, 511, 511, 511, + +- 516, 516, 516, 681, 516, 517, 517, 437, 517, 517, ++ 511, 511, 511, 511, 511, 511, 511, 511, 511, 516, ++ 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, ++ 516, 516, 516, 516, 516, 479, 516, 517, 517, 735, + 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, +- 517, 517, 517, 518, 518, 428, 518, 518, 518, 518, ++ 517, 517, 517, 517, 517, 518, 518, 696, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, +- 518, 519, 519, 414, 519, 519, 519, 519, 519, 519, +- 519, 519, 519, 519, 519, 519, 519, 519, 519, 528, +- 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 528, 528, 528, 528, 533, 533, 533, +- 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 417, 533, 535, 535, 535, 535, 535, ++ 518, 518, 518, 519, 519, 681, 519, 519, 519, 519, ++ 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, ++ 519, 528, 528, 528, 528, 528, 528, 528, 528, 528, ++ 528, 528, 528, 528, 528, 528, 528, 528, 528, 533, + ++ 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, ++ 533, 533, 533, 533, 533, 437, 533, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 540, 540, 540, 540, 540, 540, 540, +- 540, 540, 540, 540, 540, 540, 540, 540, 540, 395, +- 540, 266, 266, 398, 266, 266, 266, 266, 266, 266, +- 266, 266, 266, 266, 266, 266, 266, 266, 266, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 363, 363, 363, ++ 535, 535, 535, 535, 535, 540, 540, 540, 540, 540, ++ 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, ++ 540, 428, 540, 266, 266, 414, 266, 266, 266, 266, ++ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, ++ 266, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 363, + 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 363, 363, 356, 356, 356, 356, 356, +- 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, + +- 356, 356, 356, 373, 373, 373, 373, 373, 373, 373, ++ 363, 363, 363, 363, 363, 363, 363, 356, 356, 356, ++ 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, ++ 356, 356, 356, 356, 356, 373, 373, 373, 373, 373, + 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, +- 373, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 366, 366, 366, 366, 366, 366, 366, 366, 639, +- 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 639, 639, 639, 639, 869, 390, 869, +- 869, 385, 369, 869, 869, 869, 869, 869, 372, 869, +- 869, 869, 869, 869, 869, 872, 359, 872, 872, 362, +- 351, 872, 872, 872, 872, 872, 592, 872, 872, 872, +- 872, 872, 872, 387, 387, 387, 387, 387, 387, 387, ++ 373, 373, 373, 366, 366, 366, 366, 366, 366, 366, ++ 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, ++ 366, 639, 639, 639, 639, 639, 639, 639, 639, 639, ++ 639, 639, 639, 639, 639, 639, 639, 639, 639, 869, ++ 417, 869, 869, 395, 398, 869, 869, 869, 869, 869, ++ 390, 869, 869, 869, 869, 869, 869, 872, 385, 872, + ++ 872, 369, 372, 872, 872, 872, 872, 872, 359, 872, ++ 872, 872, 872, 872, 872, 387, 387, 387, 387, 387, + 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, +- 387, 644, 591, 644, 644, 558, 541, 644, 644, 644, +- 644, 644, 539, 644, 644, 644, 644, 644, 399, 399, ++ 387, 387, 387, 644, 362, 644, 644, 351, 592, 644, ++ 644, 644, 644, 644, 591, 644, 644, 644, 644, 644, + 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- 399, 399, 399, 399, 399, 399, 391, 391, 391, 391, ++ 399, 399, 399, 399, 399, 399, 399, 399, 391, 391, + 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, +- 391, 391, 391, 391, 652, 652, 652, 652, 652, 652, ++ 391, 391, 391, 391, 391, 391, 652, 652, 652, 652, + 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, +- 652, 652, 885, 885, 885, 885, 885, 885, 885, 885, +- 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, + +- 887, 539, 887, 887, 532, 515, 887, 887, 887, 887, +- 887, 508, 887, 887, 887, 887, 887, 887, 657, 657, ++ 652, 652, 652, 652, 885, 885, 885, 885, 885, 885, ++ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 885, 885, 887, 558, 887, 887, 541, 539, 887, 887, ++ 887, 887, 887, 539, 887, 887, 887, 887, 887, 887, + 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, +- 657, 657, 657, 657, 657, 657, 402, 402, 402, 402, ++ 657, 657, 657, 657, 657, 657, 657, 657, 402, 402, + 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 402, 402, 661, 479, 661, 661, 437, 417, +- 661, 661, 661, 661, 661, 398, 661, 661, 661, 661, +- 661, 659, 659, 659, 659, 659, 659, 659, 659, 659, +- 659, 659, 659, 659, 659, 659, 659, 659, 659, 418, +- 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 402, 402, 402, 402, 402, 402, 661, 532, 661, 661, ++ 515, 508, 661, 661, 661, 661, 661, 479, 661, 661, ++ 661, 661, 661, 659, 659, 659, 659, 659, 659, 659, + +- 418, 418, 418, 418, 418, 418, 418, 411, 411, 411, ++ 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, ++ 659, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 418, 418, 418, 418, 418, 418, 418, 418, 418, 411, + 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 411, 411, 421, 421, 421, 421, 421, ++ 411, 411, 411, 411, 411, 411, 411, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 421, 421, 505, 505, 505, 505, 505, 505, 505, ++ 421, 421, 421, 421, 421, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 516, 516, 516, 516, 516, 516, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 516, 511, +- 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 511, 511, 533, 533, 533, ++ 505, 505, 505, 516, 516, 516, 516, 516, 516, 516, ++ 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, + ++ 516, 511, 511, 511, 511, 511, 511, 511, 511, 511, ++ 511, 511, 511, 511, 511, 511, 511, 511, 511, 533, + 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 533, 533, 528, 528, 528, 528, 528, ++ 533, 533, 533, 533, 533, 533, 533, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 540, 540, 540, 540, 540, 540, 540, ++ 528, 528, 528, 528, 528, 540, 540, 540, 540, 540, + 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, +- 540, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 535, 535, 535, 535, 535, 535, 535, 535, 266, +- 266, 398, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 266, 266, 266, 266, 266, 266, 346, 346, 346, +- 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 540, 540, 540, 535, 535, 535, 535, 535, 535, 535, ++ 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, ++ 535, 266, 266, 437, 266, 266, 266, 266, 266, 266, + +- 346, 346, 346, 346, 346, 356, 356, 356, 356, 356, ++ 266, 266, 266, 266, 266, 266, 266, 266, 266, 346, ++ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, ++ 346, 346, 346, 346, 346, 346, 346, 356, 356, 356, + 356, 356, 356, 356, 356, 356, 356, 356, 356, 356, +- 356, 356, 356, 366, 366, 366, 366, 366, 366, 366, ++ 356, 356, 356, 356, 356, 366, 366, 366, 366, 366, + 366, 366, 366, 366, 366, 366, 366, 366, 366, 366, +- 366, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 639, 639, 639, 639, 639, 639, 869, +- 385, 869, 869, 385, 385, 869, 869, 869, 869, 869, +- 372, 869, 869, 869, 869, 869, 869, 872, 372, 872, +- 872, 362, 351, 872, 872, 872, 872, 872, 317, 872, +- 872, 872, 872, 872, 872, 644, 3952, 644, 644, 250, ++ 366, 366, 366, 639, 639, 639, 639, 639, 639, 639, ++ 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, ++ 639, 869, 417, 869, 869, 398, 398, 869, 869, 869, ++ 869, 869, 385, 869, 869, 869, 869, 869, 869, 872, + +- 250, 644, 644, 644, 644, 644, 98, 644, 644, 644, +- 644, 644, 652, 652, 652, 652, 652, 652, 652, 652, ++ 385, 872, 872, 385, 372, 872, 872, 872, 872, 872, ++ 372, 872, 872, 872, 872, 872, 872, 644, 362, 644, ++ 644, 351, 317, 644, 644, 644, 644, 644, 3965, 644, ++ 644, 644, 644, 644, 652, 652, 652, 652, 652, 652, + 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, +- 887, 98, 887, 887, 98, 98, 887, 887, 887, 887, +- 887, 98, 887, 887, 887, 887, 887, 887, 657, 657, ++ 652, 652, 887, 250, 887, 887, 250, 98, 887, 887, ++ 887, 887, 887, 98, 887, 887, 887, 887, 887, 887, + 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, +- 657, 657, 657, 657, 657, 657, 891, 98, 891, 891, +- 98, 98, 891, 891, 891, 891, 891, 161, 891, 891, +- 891, 891, 891, 891, 885, 885, 885, 885, 885, 885, +- 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 657, 657, 657, 657, 657, 657, 657, 657, 891, 98, ++ 891, 891, 98, 98, 891, 891, 891, 891, 891, 98, + +- 885, 885, 888, 888, 888, 888, 888, 888, 888, 888, ++ 891, 891, 891, 891, 891, 891, 885, 885, 885, 885, ++ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 885, 885, 885, 885, 888, 888, 888, 888, 888, 888, + 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, +- 661, 161, 661, 661, 160, 160, 661, 661, 661, 661, +- 661, 3952, 661, 661, 661, 661, 661, 402, 402, 402, ++ 888, 888, 661, 98, 661, 661, 98, 161, 661, 661, ++ 661, 661, 661, 161, 661, 661, 661, 661, 661, 402, + 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, +- 402, 402, 402, 402, 402, 411, 411, 411, 411, 411, ++ 402, 402, 402, 402, 402, 402, 402, 411, 411, 411, + 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, +- 411, 411, 411, 421, 421, 421, 421, 421, 421, 421, +- 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, +- 421, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, ++ 411, 411, 411, 411, 411, 421, 421, 421, 421, 421, + +- 3952, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 505, +- 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, +- 505, 505, 505, 505, 505, 505, 505, 511, 511, 511, ++ 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, ++ 421, 421, 421, 1157, 1157, 1157, 1157, 1157, 1157, 1157, ++ 1157, 1157, 160, 1157, 1157, 1157, 1157, 1157, 1157, 1157, ++ 1157, 505, 505, 505, 505, 505, 505, 505, 505, 505, ++ 505, 505, 505, 505, 505, 505, 505, 505, 505, 511, + 511, 511, 511, 511, 511, 511, 511, 511, 511, 511, +- 511, 511, 511, 511, 511, 528, 528, 528, 528, 528, ++ 511, 511, 511, 511, 511, 511, 511, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, +- 528, 528, 528, 535, 535, 535, 535, 535, 535, 535, ++ 528, 528, 528, 528, 528, 535, 535, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, +- 535, 266, 266, 3952, 266, 266, 266, 266, 266, 266, +- 266, 266, 266, 266, 266, 266, 266, 266, 266, 363, + +- 363, 363, 363, 363, 363, 363, 363, 363, 363, 363, +- 363, 363, 363, 363, 363, 363, 363, 373, 373, 373, ++ 535, 535, 535, 266, 266, 160, 266, 266, 266, 266, ++ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, ++ 266, 363, 363, 363, 363, 363, 363, 363, 363, 363, ++ 363, 363, 363, 363, 363, 363, 363, 363, 363, 373, + 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, +- 373, 373, 373, 373, 373, 639, 639, 639, 639, 639, ++ 373, 373, 373, 373, 373, 373, 373, 639, 639, 639, + 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, +- 639, 639, 639, 869, 3952, 869, 869, 3952, 3952, 869, +- 869, 869, 869, 869, 3952, 869, 869, 869, 869, 869, +- 869, 872, 3952, 872, 872, 3952, 3952, 872, 872, 872, +- 872, 872, 3952, 872, 872, 872, 872, 872, 872, 399, +- 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, +- +- 399, 399, 399, 399, 399, 399, 399, 887, 3952, 887, +- 887, 3952, 3952, 887, 887, 887, 887, 887, 3952, 887, +- 887, 887, 887, 887, 887, 888, 888, 888, 888, 888, ++ 639, 639, 639, 639, 639, 869, 3965, 869, 869, 3965, ++ 3965, 869, 869, 869, 869, 869, 3965, 869, 869, 869, ++ 869, 869, 869, 872, 3965, 872, 872, 3965, 3965, 872, ++ ++ 872, 872, 872, 872, 3965, 872, 872, 872, 872, 872, ++ 872, 399, 399, 399, 399, 399, 399, 399, 399, 399, ++ 399, 399, 399, 399, 399, 399, 399, 399, 399, 887, ++ 3965, 887, 887, 3965, 3965, 887, 887, 887, 887, 887, ++ 3965, 887, 887, 887, 887, 887, 887, 888, 888, 888, + 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, +- 888, 888, 888, 661, 3952, 661, 661, 3952, 3952, 661, +- 661, 661, 661, 661, 661, 661, 661, 661, 661, 661, ++ 888, 888, 888, 888, 888, 661, 3965, 661, 661, 3965, ++ 3965, 661, 661, 661, 661, 661, 661, 661, 661, 661, ++ 661, 661, 659, 659, 659, 659, 659, 659, 659, 659, + 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, +- 659, 659, 659, 659, 659, 659, 659, 659, 418, 418, +- 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, +- 418, 418, 418, 418, 418, 418, 1346, 3952, 1346, 1346, + +- 3952, 3952, 1346, 1346, 1346, 3952, 1346, 1346, 1346, 1346, +- 1346, 1346, 1346, 1346, 1359, 1359, 1359, 1359, 1359, 1359, +- 1359, 3952, 1359, 3952, 1359, 1359, 1359, 1359, 1359, 1359, +- 1359, 1359, 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, ++ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, ++ 418, 418, 418, 418, 418, 418, 418, 418, 1346, 3965, ++ 1346, 1346, 3965, 3965, 1346, 1346, 1346, 3965, 1346, 1346, ++ 1346, 1346, 1346, 1346, 1346, 1346, 1359, 1359, 1359, 1359, ++ 1359, 1359, 1359, 3965, 1359, 3965, 1359, 1359, 1359, 1359, ++ 1359, 1359, 1359, 1359, 1393, 1393, 1393, 1393, 1393, 1393, + 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, 1393, ++ 1393, 1393, 516, 516, 516, 516, 516, 516, 516, 516, + 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, +- 516, 516, 516, 516, 516, 516, 516, 516, 533, 533, + 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, +- 533, 533, 533, 533, 533, 533, 540, 540, 540, 540, +- 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, + +- 540, 540, 540, 540, 266, 266, 3952, 266, 266, 266, ++ 533, 533, 533, 533, 533, 533, 533, 533, 540, 540, ++ 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, ++ 540, 540, 540, 540, 540, 540, 266, 266, 3965, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, +- 266, 266, 885, 885, 885, 885, 885, 885, 885, 885, ++ 266, 266, 266, 266, 885, 885, 885, 885, 885, 885, + 885, 885, 885, 885, 885, 885, 885, 885, 885, 885, ++ 885, 885, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, + 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, +- 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1534, 3952, +- 3952, 1534, 3952, 3952, 1534, 1575, 3952, 3952, 3952, 3952, +- 3952, 1575, 1575, 1575, 3952, 1575, 1575, 1575, 1575, 1575, +- 1575, 1575, 1575, 1524, 1524, 1524, 1524, 1524, 1524, 1524, +- 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, ++ 1534, 3965, 3965, 1534, 3965, 3965, 1534, 1575, 3965, 3965, ++ 3965, 3965, 3965, 1575, 1575, 1575, 3965, 1575, 1575, 1575, + +- 1524, 1722, 3952, 3952, 1722, 3952, 1722, 1760, 1760, 1760, ++ 1575, 1575, 1575, 1575, 1575, 1524, 1524, 1524, 1524, 1524, ++ 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, ++ 1524, 1524, 1524, 1722, 3965, 3965, 1722, 3965, 1722, 1760, + 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, +- 1760, 1760, 1760, 1760, 1760, 1765, 3952, 3952, 1765, 1765, +- 3952, 3952, 1765, 3952, 1765, 3952, 1765, 1765, 1765, 1765, +- 1901, 1901, 1901, 1901, 1946, 1946, 3952, 1946, 1946, 1946, ++ 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1765, 3965, 3965, ++ 1765, 1765, 3965, 3965, 1765, 3965, 1765, 3965, 1765, 1765, ++ 1765, 1765, 1901, 1901, 1901, 1901, 1946, 1946, 3965, 1946, + 1946, 1946, 1946, 1946, 1946, 1946, 1946, 1946, 1946, 1946, +- 1946, 1946, 1948, 1948, 3952, 1948, 1948, 1948, 1948, 1948, ++ 1946, 1946, 1946, 1946, 1948, 1948, 3965, 1948, 1948, 1948, + 1948, 1948, 1948, 1948, 1948, 1948, 1948, 1948, 1948, 1948, +- 1952, 3952, 1952, 3952, 1952, 1952, 1952, 1952, 2074, 2074, +- 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, + +- 2074, 2074, 2074, 2074, 2074, 2074, 2089, 2089, 2089, 2089, ++ 1948, 1948, 1952, 3965, 1952, 3965, 1952, 1952, 1952, 1952, ++ 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, ++ 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2089, 2089, + 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, +- 2089, 2089, 2089, 2089, 2142, 2142, 2142, 2142, 2142, 2142, ++ 2089, 2089, 2089, 2089, 2089, 2089, 2142, 2142, 2142, 2142, + 2142, 2142, 2142, 2142, 2142, 2142, 2142, 2142, 2142, 2142, +- 2142, 2142, 2178, 2178, 3952, 3952, 2178, 2178, 2178, 2178, +- 2178, 3952, 2178, 2178, 2178, 2178, 2178, 2178, 2178, 2178, +- 2196, 3952, 3952, 2196, 2196, 3952, 3952, 2196, 3952, 2196, +- 3952, 2196, 2196, 2196, 2196, 2283, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2296, 3952, 2296, 2296, 3952, 3952, 2296, +- +- 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, +- 2296, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2332, +- 3952, 3952, 3952, 3952, 3952, 2332, 2332, 2332, 3952, 2332, +- 2332, 2332, 2332, 2332, 2332, 2332, 2332, 2358, 2358, 3952, +- 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, +- 2358, 2358, 2358, 2358, 2358, 2360, 2360, 3952, 2360, 2360, +- 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, +- 2360, 2360, 2360, 2386, 3952, 3952, 2386, 2386, 3952, 3952, +- 2386, 3952, 2386, 3952, 2386, 2386, 2386, 2386, 2399, 3952, +- +- 3952, 3952, 3952, 3952, 2399, 2399, 2399, 3952, 2399, 2399, +- 2399, 2399, 2399, 2399, 2399, 2399, 2410, 2410, 3952, 2410, +- 2410, 3952, 2410, 2410, 2410, 2410, 2410, 2410, 2410, 2410, +- 2410, 2410, 2410, 2415, 3952, 2415, 3952, 2415, 2415, 2415, +- 2415, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2298, +- 3952, 2298, 2298, 3952, 3952, 2298, 2298, 2298, 2298, 2298, +- 2298, 2298, 2298, 2298, 2298, 2298, 2298, 2560, 2560, 2560, +- 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, +- 2560, 2560, 2560, 2560, 2560, 2563, 2563, 2563, 2563, 2563, +- +- 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, +- 2563, 2563, 2563, 2571, 3952, 3952, 2571, 2571, 3952, 3952, +- 2571, 3952, 2571, 3952, 2571, 2571, 2571, 2571, 2590, 3952, +- 2590, 3952, 2590, 2590, 2590, 2590, 2592, 3952, 3952, 2592, +- 2592, 3952, 3952, 2592, 3952, 2592, 3952, 2592, 2592, 2592, +- 2592, 2624, 2624, 3952, 2624, 2624, 2624, 2624, 2624, 2624, +- 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2691, 3952, +- 2691, 2691, 3952, 3952, 2691, 2691, 2691, 2691, 2691, 2691, +- 2691, 2691, 2691, 2691, 2691, 2691, 2502, 2502, 2502, 2502, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- +- 2502, 2502, 2502, 2502, 2504, 2504, 2504, 2504, 2504, 2504, ++ 2142, 2142, 2142, 2142, 2178, 2178, 3965, 3965, 2178, 2178, ++ 2178, 2178, 2178, 3965, 2178, 2178, 2178, 2178, 2178, 2178, ++ 2178, 2178, 2196, 3965, 3965, 2196, 2196, 3965, 3965, 2196, ++ 3965, 2196, 3965, 2196, 2196, 2196, 2196, 2284, 2284, 2284, ++ ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2297, 3965, 2297, 2297, 3965, ++ 3965, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, ++ 2297, 2297, 2297, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2333, 3965, 3965, 3965, 3965, 3965, 2333, 2333, 2333, ++ 3965, 2333, 2333, 2333, 2333, 2333, 2333, 2333, 2333, 2359, ++ 2359, 3965, 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, ++ 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2361, 2361, 3965, ++ 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, ++ ++ 2361, 2361, 2361, 2361, 2361, 2387, 3965, 3965, 2387, 2387, ++ 3965, 3965, 2387, 3965, 2387, 3965, 2387, 2387, 2387, 2387, ++ 2400, 3965, 3965, 3965, 3965, 3965, 2400, 2400, 2400, 3965, ++ 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2411, 2411, ++ 3965, 2411, 2411, 3965, 2411, 2411, 2411, 2411, 2411, 2411, ++ 2411, 2411, 2411, 2411, 2411, 2416, 3965, 2416, 3965, 2416, ++ 2416, 2416, 2416, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2299, 3965, 2299, 2299, 3965, 3965, 2299, 2299, 2299, ++ 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2562, ++ ++ 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, ++ 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2565, 2565, 2565, ++ 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, ++ 2565, 2565, 2565, 2565, 2565, 2573, 3965, 3965, 2573, 2573, ++ 3965, 3965, 2573, 3965, 2573, 3965, 2573, 2573, 2573, 2573, ++ 2592, 3965, 2592, 3965, 2592, 2592, 2592, 2592, 2594, 3965, ++ 3965, 2594, 2594, 3965, 3965, 2594, 3965, 2594, 3965, 2594, ++ 2594, 2594, 2594, 2626, 2626, 3965, 2626, 2626, 2626, 2626, ++ 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, ++ 2694, 3965, 2694, 2694, 3965, 3965, 2694, 2694, 2694, 2694, ++ ++ 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2504, 2504, + 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, +- 2504, 2504, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2706, 3952, 2706, 2706, 3952, 3952, 2706, 2706, 2706, 2706, +- 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2089, 2089, 2089, 2089, ++ 2504, 2504, 2504, 2504, 2504, 2504, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2709, 3965, 2709, 2709, 3965, 3965, 2709, 2709, ++ 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2089, 2089, ++ + 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, +- 2089, 2089, 2089, 2089, 2358, 2358, 3952, 2358, 2358, 2358, +- +- 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, 2358, +- 2358, 2358, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, +- 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, +- 2360, 2360, 3952, 2360, 2360, 2360, 2360, 2360, 2360, 2360, +- 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2360, 2563, 2563, +- 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, 2563, +- 2563, 2563, 2563, 2563, 2563, 2563, 2755, 3952, 2755, 3952, +- 2755, 2755, 2755, 2755, 2571, 3952, 2571, 3952, 2571, 2571, +- 2571, 2571, 2756, 3952, 3952, 2756, 3952, 3952, 3952, 2756, +- 3952, 2756, 3952, 2756, 2756, 2756, 2756, 2766, 3952, 3952, +- +- 2766, 2766, 3952, 3952, 2766, 3952, 2766, 3952, 2766, 2766, +- 2766, 2766, 2590, 3952, 3952, 2590, 3952, 2590, 3952, 2590, +- 2590, 2590, 2590, 2775, 3952, 2775, 3952, 2775, 2775, 2775, +- 2775, 2592, 3952, 2592, 3952, 2592, 2592, 2592, 2592, 2784, +- 2784, 3952, 2784, 2784, 3952, 2784, 2784, 2784, 2784, 2784, +- 2784, 2784, 2784, 2784, 2784, 2784, 2804, 3952, 3952, 2804, +- 2804, 3952, 3952, 2804, 3952, 2804, 3952, 2804, 2804, 2804, +- 2804, 2624, 2624, 3952, 2624, 2624, 3952, 2624, 2624, 2624, +- 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2624, 2808, 2808, +- 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, +- +- 2808, 2808, 2808, 2808, 2808, 2808, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, +- 2283, 2283, 2283, 2283, 2074, 2074, 2074, 2074, 2074, 2074, ++ 2089, 2089, 2089, 2089, 2089, 2089, 2359, 2359, 3965, 2359, ++ 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, 2359, ++ 2359, 2359, 2359, 2359, 2562, 2562, 2562, 2562, 2562, 2562, ++ 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, 2562, ++ 2562, 2562, 2361, 2361, 3965, 2361, 2361, 2361, 2361, 2361, ++ 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, 2361, ++ 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, ++ 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2565, 2758, 3965, ++ 2758, 3965, 2758, 2758, 2758, 2758, 2573, 3965, 2573, 3965, ++ ++ 2573, 2573, 2573, 2573, 2759, 3965, 3965, 2759, 3965, 3965, ++ 3965, 2759, 3965, 2759, 3965, 2759, 2759, 2759, 2759, 2769, ++ 3965, 3965, 2769, 2769, 3965, 3965, 2769, 3965, 2769, 3965, ++ 2769, 2769, 2769, 2769, 2592, 3965, 3965, 2592, 3965, 2592, ++ 3965, 2592, 2592, 2592, 2592, 2778, 3965, 2778, 3965, 2778, ++ 2778, 2778, 2778, 2594, 3965, 2594, 3965, 2594, 2594, 2594, ++ 2594, 2787, 2787, 3965, 2787, 2787, 3965, 2787, 2787, 2787, ++ 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2807, 3965, ++ 3965, 2807, 2807, 3965, 3965, 2807, 3965, 2807, 3965, 2807, ++ 2807, 2807, 2807, 2626, 2626, 3965, 2626, 2626, 3965, 2626, ++ ++ 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, ++ 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, ++ 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2074, 2074, 2074, 2074, + 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, 2074, +- 2074, 2074, 2691, 3952, 2691, 2691, 3952, 3952, 2691, 2691, +- 2691, 2691, 2691, 2691, 2691, 2691, 2691, 2691, 2691, 2691, +- 2296, 3952, 2296, 2296, 3952, 3952, 2296, 2296, 2296, 2296, +- 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2296, 2868, 2868, +- 2868, 2868, 2868, 2868, 2868, 2868, 2868, 2868, 2868, 2868, +- 2868, 2868, 2868, 2868, 2868, 2868, 2501, 2501, 2501, 2501, +- +- 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2501, 2501, 2501, 2501, 2869, 2869, 2869, 2869, 2869, 2869, +- 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, +- 2869, 2869, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- 2298, 3952, 2298, 2298, 3952, 3952, 2298, 2298, 2298, 2298, +- 2298, 2298, 2298, 2298, 2298, 2298, 2298, 2298, 2882, 2882, +- 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, +- 2882, 2882, 2882, 2882, 2882, 2882, 2504, 2504, 2504, 2504, ++ 2074, 2074, 2074, 2074, 2694, 3965, 2694, 2694, 3965, 3965, ++ 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, 2694, ++ 2694, 2694, 2297, 3965, 2297, 2297, 3965, 3965, 2297, 2297, ++ 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, 2297, ++ ++ 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, ++ 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2872, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2873, 2873, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2504, 2504, 2504, 2504, 2504, 2504, + 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, +- +- 2504, 2504, 2504, 2504, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2706, 3952, 2706, 2706, 3952, 3952, 2706, 2706, +- 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2089, 2089, ++ 2504, 2504, 2299, 3965, 2299, 2299, 3965, 3965, 2299, 2299, ++ 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, ++ 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, ++ ++ 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2709, 3965, 2709, 2709, 3965, 3965, ++ 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, 2709, ++ 2709, 2709, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, + 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, +- 2089, 2089, 2089, 2089, 2089, 2089, 2755, 3952, 3952, 2755, +- 3952, 2755, 3952, 2755, 2755, 2755, 2755, 2756, 3952, 2756, +- 3952, 2756, 2756, 2756, 2756, 2942, 3952, 2942, 3952, 2942, +- +- 2942, 2942, 2942, 2766, 3952, 2766, 3952, 2766, 2766, 2766, +- 2766, 2775, 3952, 3952, 2775, 3952, 2775, 3952, 2775, 2775, +- 2775, 2775, 2784, 2784, 3952, 2784, 2784, 3952, 2784, 2784, +- 2784, 2784, 2784, 2784, 2784, 2784, 2784, 2784, 2784, 2972, +- 3952, 3952, 2972, 2972, 3952, 3952, 2972, 3952, 2972, 3952, +- 2972, 2972, 2972, 2972, 2981, 3952, 2981, 3952, 2981, 2981, +- 2981, 2981, 2804, 3952, 2804, 3952, 2804, 2804, 2804, 2804, +- 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, +- 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2808, 2283, 2283, +- 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, 2283, +- +- 2283, 2283, 2283, 2283, 2283, 2283, 2869, 2869, 2869, 2869, +- 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, 2869, +- 2869, 2869, 2869, 2869, 2871, 2871, 2871, 2871, 2871, 2871, +- 2871, 2871, 2871, 2871, 2871, 2871, 2871, 2871, 2871, 2871, +- 2871, 2871, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, 2501, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, +- 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2502, 2298, 3952, +- 2298, 2298, 3952, 3952, 2298, 2298, 2298, 2298, 2298, 2298, +- 2298, 2298, 2298, 2298, 2298, 2298, 2882, 2882, 2882, 2882, +- +- 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, 2882, +- 2882, 2882, 2882, 2882, 2504, 2504, 2504, 2504, 2504, 2504, ++ 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2758, 3965, ++ ++ 3965, 2758, 3965, 2758, 3965, 2758, 2758, 2758, 2758, 2759, ++ 3965, 2759, 3965, 2759, 2759, 2759, 2759, 2946, 3965, 2946, ++ 3965, 2946, 2946, 2946, 2946, 2769, 3965, 2769, 3965, 2769, ++ 2769, 2769, 2769, 2778, 3965, 3965, 2778, 3965, 2778, 3965, ++ 2778, 2778, 2778, 2778, 2787, 2787, 3965, 2787, 2787, 3965, ++ 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, 2787, ++ 2787, 2976, 3965, 3965, 2976, 2976, 3965, 3965, 2976, 3965, ++ 2976, 3965, 2976, 2976, 2976, 2976, 2985, 3965, 2985, 3965, ++ 2985, 2985, 2985, 2985, 2807, 3965, 2807, 3965, 2807, 2807, ++ 2807, 2807, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, ++ ++ 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, 2811, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, ++ 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2284, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, 2873, ++ 2873, 2873, 2873, 2873, 2873, 2873, 2875, 2875, 2875, 2875, ++ 2875, 2875, 2875, 2875, 2875, 2875, 2875, 2875, 2875, 2875, ++ 2875, 2875, 2875, 2875, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, 2503, ++ 2503, 2503, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, + 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, 2504, +- 2504, 2504, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, +- 2301, 2301, 2301, 2301, 2301, 2301, 2301, 2301, 3112, 3112, +- 3952, 3112, 3112, 3952, 3112, 3112, 3112, 3112, 3112, 3112, +- 3112, 3112, 3112, 3112, 3112, 3115, 3952, 3952, 3115, 3115, +- 3952, 3952, 3115, 3952, 3115, 3952, 3115, 3115, 3115, 3115, +- +- 3118, 3118, 3118, 3118, 3952, 3118, 3118, 3118, 3118, 3118, +- 3118, 3118, 3118, 3118, 3118, 3118, 3118, 3118, 3133, 3952, +- 3952, 3952, 3952, 3952, 3133, 3133, 3133, 3952, 3133, 3133, +- 3133, 3133, 3133, 3133, 3133, 3133, 3209, 3209, 3209, 3209, +- 3209, 3209, 3209, 3209, 3209, 3209, 3209, 3209, 3209, 3209, +- 3209, 3209, 3209, 3209, 3252, 3952, 3252, 3952, 3252, 3252, +- 3252, 3252, 3274, 3274, 3952, 3274, 3274, 3952, 3274, 3274, +- 3274, 3274, 3274, 3274, 3274, 3274, 3274, 3274, 3274, 3356, +- 3952, 3952, 3356, 3356, 3952, 3952, 3952, 3952, 3952, 3952, +- 3356, 3372, 3372, 3952, 3952, 3952, 3372, 3372, 3372, 3372, +- +- 3372, 3372, 3372, 3372, 3372, 3372, 3372, 3372, 3372, 3478, +- 3478, 3952, 3478, 3478, 3952, 3478, 3478, 3478, 3478, 3478, +- 3478, 3478, 3478, 3478, 3478, 3478, 3488, 3488, 3952, 3488, +- 3488, 3952, 3488, 3488, 3488, 3488, 3488, 3488, 3488, 3488, +- 3488, 3488, 3488, 3563, 3563, 3952, 3563, 3563, 3563, 3563, +- 3563, 3563, 3563, 3563, 3563, 3563, 3563, 3563, 3563, 3563, +- 3566, 3566, 3952, 3566, 3566, 3566, 3566, 3566, 3566, 3566, +- 3566, 3566, 3566, 3566, 3566, 3566, 3566, 3610, 3952, 3610, +- 3952, 3610, 3952, 3610, 3610, 3610, 3610, 3641, 3641, 3952, +- 3641, 3641, 3952, 3641, 3641, 3641, 3641, 3641, 3641, 3641, +- +- 3641, 3641, 3641, 3641, 3642, 3642, 3952, 3642, 3642, 3952, +- 3642, 3642, 3642, 3642, 3642, 3642, 3642, 3642, 3642, 3642, +- 3642, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, +- 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3679, +- 3952, 3679, 3952, 3679, 3952, 3679, 3679, 3679, 3679, 3683, +- 3683, 3952, 3683, 3683, 3683, 3683, 3683, 3683, 3683, 3683, +- 3683, 3683, 3683, 3683, 3683, 3683, 3683, 3694, 3694, 3952, +- 3694, 3694, 3952, 3694, 3694, 3694, 3694, 3694, 3694, 3694, +- 3694, 3694, 3694, 3694, 3696, 3696, 3952, 3952, 3696, 3696, +- 3696, 3696, 3696, 3952, 3696, 3696, 3696, 3696, 3696, 3696, +- +- 3696, 3696, 3685, 3685, 3952, 3685, 3685, 3952, 3685, 3685, +- 3685, 3685, 3685, 3685, 3685, 3685, 3685, 3685, 3685, 3745, +- 3952, 3952, 3952, 3952, 3952, 3745, 3745, 3745, 3952, 3745, +- 3745, 3745, 3745, 3745, 3745, 3745, 3745, 3687, 3952, 3952, +- 3952, 3952, 3952, 3687, 3687, 3687, 3952, 3687, 3687, 3687, +- 3687, 3687, 3687, 3687, 3687, 3748, 3952, 3952, 3748, 3748, +- 3952, 3952, 3748, 3952, 3748, 3952, 3748, 3748, 3748, 3748, +- 3751, 3751, 3952, 3751, 3751, 3952, 3751, 3751, 3751, 3751, +- 3751, 3751, 3751, 3751, 3751, 3751, 3751, 3752, 3952, 3952, +- 3952, 3952, 3952, 3752, 3752, 3752, 3952, 3752, 3752, 3752, +- +- 3752, 3752, 3752, 3752, 3752, 3789, 3952, 3789, 3952, 3789, +- 3789, 3789, 3789, 3790, 3790, 3952, 3790, 3790, 3952, 3790, +- 3790, 3790, 3790, 3790, 3790, 3790, 3790, 3790, 3790, 3790, +- 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, +- 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3791, 3837, 3837, +- 3952, 3837, 3837, 3952, 3837, 3837, 3837, 3837, 3837, 3837, +- 3837, 3837, 3837, 3837, 3837, 3840, 3840, 3952, 3952, 3840, +- 3840, 3840, 3840, 3840, 3952, 3840, 3840, 3840, 3840, 3840, +- 3840, 3840, 3840, 3842, 3842, 3952, 3952, 3842, 3842, 3842, +- 3842, 3842, 3952, 3842, 3842, 3842, 3842, 3842, 3842, 3842, +- +- 3842, 3870, 3870, 3952, 3870, 3870, 3952, 3870, 3870, 3870, +- 3870, 3870, 3870, 3870, 3870, 3870, 3870, 3870, 3871, 3871, +- 3952, 3871, 3871, 3952, 3871, 3871, 3871, 3871, 3871, 3871, +- 3871, 3871, 3871, 3871, 3871, 3872, 3872, 3952, 3952, 3872, +- 3872, 3872, 3872, 3872, 3952, 3872, 3872, 3872, 3872, 3872, +- 3872, 3872, 3872, 3874, 3874, 3952, 3952, 3874, 3874, 3874, +- 3874, 3874, 3952, 3874, 3874, 3874, 3874, 3874, 3874, 3874, +- 3874, 3888, 3952, 3888, 3952, 3888, 3952, 3888, 3888, 3888, +- 3888, 3890, 3890, 3952, 3890, 3890, 3890, 3890, 3890, 3890, +- 3890, 3890, 3890, 3890, 3890, 3890, 3890, 3890, 3901, 3901, +- +- 3952, 3901, 3901, 3952, 3901, 3901, 3901, 3901, 3901, 3901, +- 3901, 3901, 3901, 3901, 3901, 3902, 3902, 3952, 3902, 3902, +- 3952, 3902, 3902, 3902, 3902, 3902, 3902, 3902, 3902, 3902, +- 3902, 3902, 3914, 3952, 3914, 3952, 3914, 3952, 3914, 3914, +- 3914, 3914, 3915, 3952, 3952, 3952, 3952, 3952, 3915, 3915, +- 3915, 3952, 3915, 3915, 3915, 3915, 3915, 3915, 3915, 3915, +- 75, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952 ++ ++ 2299, 3965, 2299, 2299, 3965, 3965, 2299, 2299, 2299, 2299, ++ 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2299, 2886, 2886, ++ 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, ++ 2886, 2886, 2886, 2886, 2886, 2886, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, ++ 2506, 2506, 2506, 2506, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, 2705, ++ 2705, 2705, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, 2302, ++ 3117, 3117, 3965, 3117, 3117, 3965, 3117, 3117, 3117, 3117, ++ ++ 3117, 3117, 3117, 3117, 3117, 3117, 3117, 3120, 3965, 3965, ++ 3120, 3120, 3965, 3965, 3120, 3965, 3120, 3965, 3120, 3120, ++ 3120, 3120, 3123, 3123, 3123, 3123, 3965, 3123, 3123, 3123, ++ 3123, 3123, 3123, 3123, 3123, 3123, 3123, 3123, 3123, 3123, ++ 3138, 3965, 3965, 3965, 3965, 3965, 3138, 3138, 3138, 3965, ++ 3138, 3138, 3138, 3138, 3138, 3138, 3138, 3138, 3215, 3215, ++ 3215, 3215, 3215, 3215, 3215, 3215, 3215, 3215, 3215, 3215, ++ 3215, 3215, 3215, 3215, 3215, 3215, 3258, 3965, 3258, 3965, ++ 3258, 3258, 3258, 3258, 3280, 3280, 3965, 3280, 3280, 3965, ++ 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, ++ ++ 3280, 3363, 3965, 3965, 3363, 3363, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3363, 3379, 3379, 3965, 3965, 3965, 3379, 3379, ++ 3379, 3379, 3379, 3379, 3379, 3379, 3379, 3379, 3379, 3379, ++ 3379, 3486, 3486, 3965, 3486, 3486, 3965, 3486, 3486, 3486, ++ 3486, 3486, 3486, 3486, 3486, 3486, 3486, 3486, 3496, 3496, ++ 3965, 3496, 3496, 3965, 3496, 3496, 3496, 3496, 3496, 3496, ++ 3496, 3496, 3496, 3496, 3496, 3572, 3572, 3965, 3572, 3572, ++ 3572, 3572, 3572, 3572, 3572, 3572, 3572, 3572, 3572, 3572, ++ 3572, 3572, 3575, 3575, 3965, 3575, 3575, 3575, 3575, 3575, ++ 3575, 3575, 3575, 3575, 3575, 3575, 3575, 3575, 3575, 3620, ++ ++ 3965, 3620, 3965, 3620, 3965, 3620, 3620, 3620, 3620, 3651, ++ 3651, 3965, 3651, 3651, 3965, 3651, 3651, 3651, 3651, 3651, ++ 3651, 3651, 3651, 3651, 3651, 3651, 3652, 3652, 3965, 3652, ++ 3652, 3965, 3652, 3652, 3652, 3652, 3652, 3652, 3652, 3652, ++ 3652, 3652, 3652, 3655, 3655, 3655, 3655, 3655, 3655, 3655, ++ 3655, 3655, 3655, 3655, 3655, 3655, 3655, 3655, 3655, 3655, ++ 3655, 3690, 3965, 3690, 3965, 3690, 3965, 3690, 3690, 3690, ++ 3690, 3694, 3694, 3965, 3694, 3694, 3694, 3694, 3694, 3694, ++ 3694, 3694, 3694, 3694, 3694, 3694, 3694, 3694, 3694, 3705, ++ 3705, 3965, 3705, 3705, 3965, 3705, 3705, 3705, 3705, 3705, ++ ++ 3705, 3705, 3705, 3705, 3705, 3705, 3707, 3707, 3965, 3965, ++ 3707, 3707, 3707, 3707, 3707, 3965, 3707, 3707, 3707, 3707, ++ 3707, 3707, 3707, 3707, 3696, 3696, 3965, 3696, 3696, 3965, ++ 3696, 3696, 3696, 3696, 3696, 3696, 3696, 3696, 3696, 3696, ++ 3696, 3757, 3965, 3965, 3965, 3965, 3965, 3757, 3757, 3757, ++ 3965, 3757, 3757, 3757, 3757, 3757, 3757, 3757, 3757, 3698, ++ 3965, 3965, 3965, 3965, 3965, 3698, 3698, 3698, 3965, 3698, ++ 3698, 3698, 3698, 3698, 3698, 3698, 3698, 3760, 3965, 3965, ++ 3760, 3760, 3965, 3965, 3760, 3965, 3760, 3965, 3760, 3760, ++ 3760, 3760, 3763, 3763, 3965, 3763, 3763, 3965, 3763, 3763, ++ ++ 3763, 3763, 3763, 3763, 3763, 3763, 3763, 3763, 3763, 3764, ++ 3965, 3965, 3965, 3965, 3965, 3764, 3764, 3764, 3965, 3764, ++ 3764, 3764, 3764, 3764, 3764, 3764, 3764, 3802, 3965, 3802, ++ 3965, 3802, 3802, 3802, 3802, 3803, 3803, 3965, 3803, 3803, ++ 3965, 3803, 3803, 3803, 3803, 3803, 3803, 3803, 3803, 3803, ++ 3803, 3803, 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, ++ 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, 3804, ++ 3850, 3850, 3965, 3850, 3850, 3965, 3850, 3850, 3850, 3850, ++ 3850, 3850, 3850, 3850, 3850, 3850, 3850, 3853, 3853, 3965, ++ 3965, 3853, 3853, 3853, 3853, 3853, 3965, 3853, 3853, 3853, ++ ++ 3853, 3853, 3853, 3853, 3853, 3855, 3855, 3965, 3965, 3855, ++ 3855, 3855, 3855, 3855, 3965, 3855, 3855, 3855, 3855, 3855, ++ 3855, 3855, 3855, 3883, 3883, 3965, 3883, 3883, 3965, 3883, ++ 3883, 3883, 3883, 3883, 3883, 3883, 3883, 3883, 3883, 3883, ++ 3884, 3884, 3965, 3884, 3884, 3965, 3884, 3884, 3884, 3884, ++ 3884, 3884, 3884, 3884, 3884, 3884, 3884, 3885, 3885, 3965, ++ 3965, 3885, 3885, 3885, 3885, 3885, 3965, 3885, 3885, 3885, ++ 3885, 3885, 3885, 3885, 3885, 3887, 3887, 3965, 3965, 3887, ++ 3887, 3887, 3887, 3887, 3965, 3887, 3887, 3887, 3887, 3887, ++ 3887, 3887, 3887, 3901, 3965, 3901, 3965, 3901, 3965, 3901, ++ ++ 3901, 3901, 3901, 3903, 3903, 3965, 3903, 3903, 3903, 3903, ++ 3903, 3903, 3903, 3903, 3903, 3903, 3903, 3903, 3903, 3903, ++ 3914, 3914, 3965, 3914, 3914, 3965, 3914, 3914, 3914, 3914, ++ 3914, 3914, 3914, 3914, 3914, 3914, 3914, 3915, 3915, 3965, ++ 3915, 3915, 3965, 3915, 3915, 3915, 3915, 3915, 3915, 3915, ++ 3915, 3915, 3915, 3915, 3927, 3965, 3927, 3965, 3927, 3965, ++ 3927, 3927, 3927, 3927, 3928, 3965, 3965, 3965, 3965, 3965, ++ 3928, 3928, 3928, 3965, 3928, 3928, 3928, 3928, 3928, 3928, ++ 3928, 3928, 75, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965 + } ; + +-static const flex_int16_t yy_chk[14349] = ++static const flex_int16_t yy_chk[14371] = + { 0, + 0, 1, 1, 1, 1, 5, 1, 1, 5, 6, + 95, 95, 6, 0, 1, 7, 7, 7, 7, 7, + 7, 0, 9, 9, 7, 9, 9, 13, 7, 1191, +- 1, 13, 1, 1, 3928, 83, 13, 1, 1, 1, +- 116, 116, 14, 1, 1, 1, 14, 1, 1, 3915, ++ 1, 13, 1, 1, 3941, 83, 13, 1, 1, 1, ++ 116, 116, 14, 1, 1, 1, 14, 1, 1, 3928, + 9, 14, 1, 874, 15, 15, 1, 15, 1, 874, + 1, 1, 15, 83, 15, 1, 1, 1, 71, 84, + 7, 1, 1, 1, 1191, 1, 1, 9, 132, 132, +@@ -3462,10 +3467,10 @@ static const flex_int16_t yy_chk[14349] = + 72, 10, 10, 85, 2, 21, 21, 84, 21, 7, + + 7, 86, 11, 11, 49, 11, 11, 72, 49, 15, +- 2, 49, 2, 2, 87, 3902, 10, 2, 2, 2, ++ 2, 49, 2, 2, 87, 3915, 10, 2, 2, 2, + 88, 85, 774, 2, 2, 2, 89, 2, 2, 86, + 11, 92, 2, 250, 118, 250, 2, 118, 2, 774, +- 2, 2, 87, 10, 3901, 2, 2, 2, 88, 3890, ++ 2, 2, 87, 10, 3914, 2, 2, 2, 88, 3903, + 21, 2, 2, 2, 89, 2, 2, 11, 49, 92, + 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, +@@ -3478,8 +3483,8 @@ static const flex_int16_t yy_chk[14349] = + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 8, 8, + 8, 8, 8, 8, 93, 12, 12, 8, 12, 12, +- 3871, 8, 16, 16, 2296, 16, 17, 17, 3870, 17, +- 16, 17, 16, 47, 17, 47, 18, 18, 2296, 18, ++ 3884, 8, 16, 16, 2297, 16, 17, 17, 3883, 17, ++ 16, 17, 16, 47, 17, 47, 18, 18, 2297, 18, + 47, 18, 93, 12, 18, 19, 19, 137, 19, 137, + 19, 20, 20, 19, 20, 257, 20, 257, 19, 20, + +@@ -3487,12 +3492,12 @@ static const flex_int16_t yy_chk[14349] = + 12, 220, 81, 297, 90, 33, 33, 16, 33, 100, + 33, 17, 90, 33, 297, 27, 27, 47, 27, 94, + 27, 18, 8, 8, 137, 27, 35, 35, 27, 35, +- 19, 27, 90, 3860, 35, 91, 20, 100, 28, 28, ++ 19, 27, 90, 3873, 35, 91, 20, 100, 28, 28, + 90, 28, 27, 28, 48, 101, 81, 139, 28, 139, + 22, 28, 91, 388, 28, 220, 29, 29, 104, 29, +- 33, 29, 3829, 91, 29, 28, 29, 107, 143, 29, +- 27, 143, 29, 101, 30, 30, 3827, 30, 108, 30, +- 91, 35, 30, 29, 30, 3823, 104, 30, 36, 36, ++ 33, 29, 3842, 91, 29, 28, 29, 107, 143, 29, ++ 27, 143, 29, 101, 30, 30, 3840, 30, 108, 30, ++ 91, 35, 30, 29, 30, 3836, 104, 30, 36, 36, + + 30, 36, 388, 28, 139, 107, 36, 213, 213, 27, + 27, 30, 223, 223, 31, 31, 108, 31, 109, 31, +@@ -3502,10 +3507,10 @@ static const flex_int16_t yy_chk[14349] = + 34, 32, 34, 36, 34, 114, 65, 34, 39, 39, + 39, 39, 32, 39, 115, 40, 40, 40, 40, 31, + 40, 39, 105, 140, 105, 45, 196, 219, 40, 196, +- 219, 46, 219, 114, 65, 195, 195, 195, 195, 3822, +- 32, 225, 115, 3815, 225, 226, 226, 265, 265, 97, ++ 219, 46, 219, 114, 65, 195, 195, 195, 195, 3835, ++ 32, 225, 115, 3828, 225, 226, 226, 265, 265, 97, + +- 105, 140, 105, 3792, 34, 37, 37, 37, 37, 37, ++ 105, 140, 105, 3805, 34, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, +@@ -3516,49 +3521,49 @@ static const flex_int16_t yy_chk[14349] = + 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 41, 41, 41, 41, 147, 41, 42, 42, + +- 42, 42, 153, 42, 43, 43, 43, 43, 3789, 43, ++ 42, 42, 153, 42, 43, 43, 43, 43, 3802, 43, + 44, 44, 44, 44, 50, 44, 102, 66, 50, 59, + 66, 50, 286, 286, 147, 66, 73, 60, 102, 73, + 153, 73, 129, 74, 73, 129, 74, 283, 74, 66, + 283, 74, 315, 318, 102, 315, 318, 41, 73, 185, + 59, 67, 59, 42, 185, 74, 102, 173, 60, 43, +- 60, 59, 59, 59, 59, 44, 2703, 66, 50, 60, ++ 60, 59, 59, 59, 59, 44, 2706, 66, 50, 60, + 60, 60, 60, 68, 77, 77, 73, 77, 59, 348, + 59, 183, 67, 74, 67, 173, 60, 129, 60, 59, + 59, 59, 59, 67, 67, 67, 67, 60, 60, 60, + +- 60, 185, 99, 484, 68, 99, 68, 103, 2703, 183, ++ 60, 185, 99, 484, 68, 99, 68, 103, 2706, 183, + 67, 106, 67, 111, 103, 68, 68, 68, 68, 189, +- 110, 67, 67, 67, 67, 106, 348, 3780, 111, 77, ++ 110, 67, 67, 67, 67, 106, 348, 3793, 111, 77, + 99, 106, 68, 99, 68, 103, 110, 112, 177, 106, +- 177, 111, 103, 68, 68, 68, 68, 189, 110, 3752, ++ 177, 111, 103, 68, 68, 68, 68, 189, 110, 3764, + 113, 309, 112, 106, 113, 113, 111, 484, 145, 106, +- 198, 145, 309, 2870, 110, 112, 119, 119, 119, 119, ++ 198, 145, 309, 2874, 110, 112, 119, 119, 119, 119, + 201, 119, 120, 120, 120, 120, 179, 120, 113, 179, + 112, 177, 113, 113, 121, 121, 121, 121, 198, 121, + 126, 126, 126, 126, 199, 126, 203, 133, 201, 138, + +- 133, 199, 138, 142, 142, 2870, 187, 138, 145, 138, ++ 133, 199, 138, 142, 142, 2874, 187, 138, 145, 138, + 142, 187, 142, 199, 133, 133, 148, 148, 436, 436, + 148, 119, 199, 148, 203, 133, 179, 120, 133, 199, +- 144, 156, 156, 144, 156, 144, 3745, 181, 144, 121, ++ 144, 156, 156, 144, 156, 144, 3757, 181, 144, 121, + 181, 199, 133, 133, 205, 126, 131, 131, 131, 131, + 131, 131, 208, 131, 138, 211, 131, 142, 187, 405, + 131, 149, 131, 131, 149, 131, 131, 131, 188, 149, + 148, 188, 205, 642, 131, 131, 131, 131, 131, 131, +- 208, 131, 3716, 211, 131, 144, 156, 181, 131, 151, ++ 208, 131, 3727, 211, 131, 144, 156, 181, 131, 151, + 131, 131, 151, 131, 131, 131, 150, 151, 405, 150, + + 494, 150, 157, 157, 150, 157, 155, 155, 200, 150, + 155, 149, 642, 155, 159, 159, 159, 159, 155, 162, + 162, 200, 162, 188, 162, 166, 166, 212, 166, 346, +- 166, 346, 162, 877, 380, 3714, 200, 380, 166, 151, +- 169, 166, 3677, 169, 210, 169, 162, 210, 169, 200, +- 435, 150, 166, 435, 494, 212, 2883, 157, 167, 167, ++ 166, 346, 162, 877, 380, 3725, 200, 380, 166, 151, ++ 169, 166, 3688, 169, 210, 169, 162, 210, 169, 200, ++ 435, 150, 166, 435, 494, 212, 2887, 157, 167, 167, + 155, 167, 169, 167, 869, 168, 168, 230, 168, 159, + 168, 167, 877, 202, 162, 210, 346, 1393, 168, 186, + 166, 170, 186, 202, 170, 167, 170, 186, 206, 170, +- 169, 170, 168, 3672, 170, 230, 206, 171, 2883, 235, ++ 169, 170, 168, 3683, 170, 230, 206, 171, 2887, 235, + + 171, 202, 171, 162, 162, 171, 905, 359, 170, 166, + 166, 202, 224, 167, 414, 224, 206, 224, 174, 171, +@@ -3566,8 +3571,8 @@ static const flex_int16_t yy_chk[14349] = + 176, 243, 869, 176, 186, 176, 170, 498, 176, 2070, + 174, 2070, 167, 167, 178, 178, 521, 171, 178, 168, + 168, 178, 176, 178, 359, 180, 178, 521, 180, 243, +- 180, 414, 244, 180, 3646, 184, 184, 224, 174, 184, +- 178, 3642, 184, 905, 190, 190, 190, 486, 486, 197, ++ 180, 414, 244, 180, 3656, 184, 184, 224, 174, 184, ++ 178, 3652, 184, 905, 190, 190, 190, 486, 486, 197, + 176, 190, 192, 192, 192, 192, 204, 245, 197, 209, + 244, 498, 197, 209, 207, 192, 246, 197, 178, 209, + +@@ -3594,13 +3599,13 @@ static const flex_int16_t yy_chk[14349] = + 301, 302, 313, 314, 323, 327, 303, 323, 327, 323, + + 304, 305, 507, 307, 304, 325, 304, 308, 325, 310, +- 325, 306, 306, 328, 329, 311, 312, 330, 332, 3641, ++ 325, 306, 306, 328, 329, 311, 312, 330, 332, 3651, + 313, 314, 319, 319, 319, 319, 887, 319, 320, 320, + 320, 320, 335, 320, 321, 321, 321, 321, 333, 321, + 331, 328, 329, 331, 336, 330, 332, 335, 337, 507, + 327, 338, 333, 333, 334, 1117, 334, 339, 340, 341, + 335, 1117, 340, 342, 344, 337, 333, 442, 331, 345, +- 337, 331, 336, 345, 746, 335, 337, 319, 3600, 338, ++ 337, 331, 336, 345, 746, 335, 337, 319, 3610, 338, + 333, 333, 334, 320, 334, 339, 340, 341, 343, 321, + 340, 342, 344, 337, 887, 442, 349, 345, 337, 349, + +@@ -3609,49 +3614,49 @@ static const flex_int16_t yy_chk[14349] = + 353, 354, 356, 362, 360, 356, 362, 360, 746, 360, + 343, 343, 360, 361, 361, 363, 364, 514, 363, 364, + 361, 364, 365, 443, 364, 366, 365, 369, 366, 365, +- 2273, 349, 2273, 366, 372, 370, 351, 372, 370, 3045, ++ 2274, 349, 2274, 366, 372, 370, 351, 372, 370, 3050, + 370, 350, 355, 370, 441, 353, 354, 441, 370, 371, + 371, 443, 356, 362, 373, 374, 371, 373, 374, 360, + 374, 371, 373, 374, 514, 363, 375, 361, 374, 444, + 375, 364, 524, 375, 411, 366, 365, 411, 375, 376, + +- 376, 3045, 376, 524, 372, 377, 377, 445, 377, 398, ++ 376, 3050, 376, 524, 372, 377, 377, 445, 377, 398, + 370, 379, 379, 379, 379, 381, 381, 444, 381, 384, + 384, 446, 384, 371, 373, 1110, 382, 382, 398, 382, + 374, 382, 384, 395, 474, 445, 395, 474, 395, 382, + 375, 395, 386, 386, 411, 386, 384, 386, 447, 446, +- 2626, 416, 416, 382, 376, 386, 398, 2808, 416, 448, ++ 2628, 416, 416, 382, 376, 386, 398, 2811, 416, 448, + 377, 488, 387, 387, 488, 387, 379, 387, 483, 386, + 381, 483, 421, 483, 384, 387, 447, 421, 387, 389, + 389, 382, 389, 395, 389, 390, 390, 448, 390, 387, + 390, 391, 389, 1110, 391, 389, 391, 386, 390, 391, + +- 2626, 426, 426, 384, 384, 416, 389, 2808, 426, 428, ++ 2628, 426, 426, 384, 384, 416, 389, 2811, 426, 428, + 382, 382, 390, 391, 428, 394, 403, 387, 394, 403, +- 394, 403, 449, 394, 421, 396, 386, 386, 396, 2274, +- 396, 2274, 403, 396, 389, 396, 3584, 394, 396, 417, ++ 394, 403, 449, 394, 421, 396, 386, 386, 396, 2275, ++ 396, 2275, 403, 396, 389, 396, 3593, 394, 396, 417, + 390, 391, 417, 403, 397, 397, 387, 387, 397, 562, +- 449, 397, 396, 397, 399, 426, 397, 399, 3566, 399, ++ 449, 397, 396, 397, 399, 426, 397, 399, 3575, 399, + 562, 428, 399, 389, 389, 394, 427, 427, 427, 390, + 390, 403, 425, 427, 401, 425, 399, 401, 402, 401, + 396, 402, 401, 402, 401, 565, 402, 401, 402, 417, + 418, 402, 487, 418, 402, 487, 565, 487, 397, 403, + + 403, 401, 451, 420, 399, 402, 1322, 420, 404, 406, +- 420, 404, 406, 404, 406, 3563, 404, 406, 404, 406, ++ 420, 404, 406, 404, 406, 3572, 404, 406, 404, 406, + 427, 404, 406, 415, 404, 406, 415, 425, 415, 401, + 451, 415, 858, 402, 409, 404, 406, 409, 431, 409, + 418, 410, 409, 431, 409, 410, 419, 409, 410, 419, + 410, 419, 424, 410, 419, 424, 495, 420, 401, 495, + 424, 409, 402, 404, 406, 429, 1331, 410, 429, 430, +- 3535, 430, 454, 429, 1322, 455, 430, 456, 415, 858, ++ 3544, 430, 454, 429, 1322, 455, 430, 456, 415, 858, + 452, 432, 432, 432, 432, 438, 438, 438, 438, 409, + 431, 452, 404, 406, 432, 410, 450, 457, 450, 458, + + 454, 419, 450, 455, 459, 456, 460, 424, 452, 462, + 463, 462, 464, 465, 466, 459, 467, 468, 467, 452, + 429, 465, 464, 430, 450, 457, 450, 458, 469, 471, +- 450, 465, 459, 1331, 460, 3530, 432, 462, 463, 462, ++ 450, 465, 459, 1331, 460, 3539, 432, 462, 463, 462, + 464, 465, 466, 459, 467, 468, 467, 472, 489, 465, + 464, 489, 473, 489, 896, 500, 469, 471, 500, 465, + 470, 470, 493, 470, 900, 493, 470, 493, 470, 520, +@@ -3661,12 +3666,12 @@ static const flex_int16_t yy_chk[14349] = + + 470, 522, 470, 900, 470, 470, 470, 470, 480, 480, + 480, 480, 481, 481, 481, 481, 482, 482, 482, 482, +- 1326, 482, 485, 485, 485, 485, 2881, 485, 491, 491, ++ 1326, 482, 485, 485, 485, 485, 2885, 485, 491, 491, + 491, 491, 502, 491, 906, 502, 476, 492, 492, 492, +- 492, 499, 492, 2881, 499, 503, 499, 505, 503, 508, ++ 492, 499, 492, 2885, 499, 503, 499, 505, 503, 508, + 503, 510, 505, 523, 508, 511, 510, 515, 511, 516, + 515, 525, 516, 480, 589, 528, 531, 481, 528, 531, +- 3519, 482, 532, 528, 531, 589, 533, 485, 542, 533, ++ 3528, 482, 532, 528, 531, 589, 533, 485, 542, 533, + 543, 523, 538, 491, 533, 538, 544, 528, 1326, 525, + 538, 532, 492, 539, 557, 539, 499, 557, 533, 505, + +@@ -3675,11 +3680,11 @@ static const flex_int16_t yy_chk[14349] = + 535, 550, 535, 551, 552, 535, 533, 553, 540, 555, + 545, 540, 538, 540, 556, 559, 540, 560, 546, 535, + 539, 547, 558, 561, 563, 558, 548, 564, 566, 550, +- 540, 551, 552, 3058, 3509, 553, 567, 555, 1580, 3507, +- 568, 570, 556, 559, 571, 560, 590, 535, 3488, 590, +- 591, 561, 563, 591, 3442, 564, 566, 572, 540, 554, ++ 540, 551, 552, 3063, 3518, 553, 567, 555, 1580, 3516, ++ 568, 570, 556, 559, 571, 560, 590, 535, 3496, 590, ++ 591, 561, 563, 591, 3450, 564, 566, 572, 540, 554, + 573, 554, 554, 574, 567, 554, 554, 554, 568, 570, +- 575, 554, 571, 576, 554, 3058, 554, 554, 554, 554, ++ 575, 554, 571, 576, 554, 3063, 554, 554, 554, 554, + + 579, 554, 554, 580, 577, 572, 581, 554, 573, 554, + 554, 574, 582, 554, 554, 554, 578, 578, 575, 554, +@@ -3690,13 +3695,13 @@ static const flex_int16_t yy_chk[14349] = + 613, 585, 614, 586, 587, 588, 593, 594, 615, 595, + 596, 598, 616, 617, 599, 600, 618, 602, 603, 619, + 606, 607, 608, 588, 609, 610, 611, 612, 613, 620, +- 614, 620, 640, 3435, 626, 623, 615, 626, 623, 637, ++ 614, 620, 640, 3443, 626, 623, 615, 626, 623, 637, + + 616, 617, 637, 623, 618, 623, 624, 619, 638, 624, +- 629, 638, 3403, 629, 624, 629, 624, 630, 629, 3339, +- 630, 632, 630, 655, 632, 630, 3321, 635, 645, 632, +- 635, 640, 635, 3305, 636, 635, 620, 636, 645, 636, +- 635, 645, 636, 653, 626, 3299, 653, 636, 653, 3297, ++ 629, 638, 3410, 629, 624, 629, 624, 630, 629, 3346, ++ 630, 632, 630, 655, 632, 630, 3328, 635, 645, 632, ++ 635, 640, 635, 3312, 636, 635, 620, 636, 645, 636, ++ 635, 645, 636, 653, 626, 3305, 653, 636, 653, 3303, + 623, 639, 639, 674, 639, 734, 639, 824, 734, 653, + 640, 624, 655, 662, 639, 629, 669, 639, 824, 669, + 653, 632, 630, 662, 641, 641, 662, 641, 639, 641, +@@ -3708,21 +3713,21 @@ static const flex_int16_t yy_chk[14349] = + 649, 687, 688, 690, 1321, 691, 653, 653, 682, 641, + 679, 683, 675, 679, 649, 639, 639, 692, 643, 684, + 736, 663, 685, 736, 662, 738, 686, 647, 738, 687, +- 688, 690, 672, 691, 2276, 672, 2276, 672, 641, 641, ++ 688, 690, 672, 691, 2277, 672, 2277, 672, 641, 641, + 672, 741, 649, 1321, 741, 692, 673, 643, 643, 673, +- 652, 673, 3291, 652, 673, 652, 647, 647, 652, 654, ++ 652, 673, 3297, 652, 673, 652, 647, 647, 652, 654, + 652, 693, 654, 652, 654, 679, 652, 654, 656, 654, + 694, 656, 654, 656, 695, 654, 656, 652, 656, 744, + + 657, 656, 744, 657, 656, 657, 654, 672, 657, 693, + 657, 861, 1329, 657, 664, 656, 657, 664, 694, 664, +- 3252, 673, 695, 658, 697, 652, 658, 657, 658, 3218, ++ 3258, 673, 695, 658, 697, 652, 658, 657, 658, 3224, + 664, 658, 659, 658, 654, 659, 658, 659, 698, 658, +- 659, 664, 659, 656, 3181, 659, 699, 701, 659, 702, ++ 659, 664, 659, 656, 3187, 659, 699, 701, 659, 702, + 658, 703, 697, 678, 652, 657, 678, 660, 861, 659, + 660, 678, 660, 654, 1332, 660, 698, 660, 680, 664, + 660, 680, 656, 660, 699, 701, 680, 702, 658, 703, +- 1329, 3168, 3163, 665, 660, 705, 665, 659, 665, 706, ++ 1329, 3174, 3168, 665, 660, 705, 665, 659, 665, 706, + 707, 665, 666, 665, 1395, 666, 665, 666, 664, 665, + + 666, 667, 666, 1332, 667, 666, 667, 658, 678, 667, +@@ -3733,19 +3738,19 @@ static const flex_int16_t yy_chk[14349] = + 724, 721, 711, 713, 715, 716, 667, 714, 714, 725, + 714, 714, 726, 719, 727, 719, 721, 665, 717, 719, + 718, 723, 714, 720, 722, 728, 729, 733, 724, 721, +- 748, 723, 3133, 748, 728, 714, 714, 725, 714, 714, ++ 748, 723, 3138, 748, 728, 714, 714, 725, 714, 714, + 726, 719, 727, 719, 721, 754, 730, 719, 730, 723, + + 730, 755, 1945, 728, 729, 733, 755, 752, 737, 723, +- 752, 737, 728, 737, 739, 740, 3118, 739, 740, 739, ++ 752, 737, 728, 737, 739, 740, 3123, 739, 740, 739, + 740, 762, 742, 754, 730, 742, 730, 742, 730, 745, + 747, 763, 745, 747, 745, 747, 749, 751, 764, 749, + 751, 749, 751, 753, 759, 765, 753, 759, 753, 762, + 775, 776, 767, 755, 777, 767, 1945, 778, 779, 763, + 767, 781, 771, 782, 783, 771, 764, 771, 784, 785, +- 771, 3072, 786, 765, 767, 2480, 791, 2480, 775, 776, ++ 771, 3077, 786, 765, 767, 2482, 791, 2482, 775, 776, + 792, 787, 777, 793, 771, 778, 779, 786, 787, 781, +- 786, 782, 783, 3070, 759, 787, 784, 785, 790, 788, ++ 786, 782, 783, 3075, 759, 787, 784, 785, 790, 788, + + 786, 796, 767, 788, 791, 789, 794, 788, 792, 787, + 795, 793, 771, 798, 799, 786, 787, 790, 786, 789, +@@ -3754,7 +3759,7 @@ static const flex_int16_t yy_chk[14349] = + 810, 798, 799, 803, 811, 790, 812, 789, 800, 789, + 794, 813, 805, 795, 814, 815, 797, 816, 797, 818, + 819, 820, 821, 822, 823, 807, 825, 826, 810, 827, +- 829, 830, 811, 803, 812, 832, 3068, 833, 835, 813, ++ 829, 830, 811, 803, 812, 832, 3073, 833, 835, 813, + 836, 835, 814, 815, 837, 816, 838, 818, 819, 820, + 821, 822, 823, 831, 825, 826, 839, 827, 829, 830, + +@@ -3766,34 +3771,34 @@ static const flex_int16_t yy_chk[14349] = + 855, 856, 860, 857, 862, 860, 863, 862, 871, 863, + 860, 863, 860, 865, 863, 867, 865, 866, 867, 871, + 866, 875, 866, 909, 864, 866, 868, 868, 859, 868, +- 866, 868, 875, 3064, 889, 915, 868, 912, 915, 868, +- 889, 3203, 868, 873, 873, 883, 873, 882, 873, 916, ++ 866, 868, 875, 3069, 889, 915, 868, 912, 915, 868, ++ 889, 3209, 868, 873, 873, 883, 873, 882, 873, 916, + +- 882, 3055, 882, 868, 862, 882, 873, 860, 3203, 873, ++ 882, 3060, 882, 868, 862, 882, 873, 860, 3209, 873, + 870, 863, 913, 865, 883, 910, 884, 913, 910, 884, + 873, 884, 866, 1005, 884, 885, 884, 916, 885, 884, +- 885, 868, 884, 885, 1005, 885, 890, 871, 885, 3047, +- 915, 885, 883, 884, 890, 3210, 886, 882, 873, 886, ++ 885, 868, 884, 885, 1005, 885, 890, 871, 885, 3052, ++ 915, 885, 883, 884, 890, 3216, 886, 882, 873, 886, + 979, 886, 885, 979, 886, 890, 886, 1270, 889, 886, + 868, 868, 886, 917, 913, 910, 998, 914, 1270, 892, + 914, 884, 892, 886, 892, 914, 888, 873, 873, 888, +- 885, 888, 1524, 890, 888, 892, 888, 3210, 918, 888, ++ 885, 888, 1524, 890, 888, 892, 888, 3216, 918, 888, + 894, 917, 888, 894, 893, 894, 892, 893, 919, 893, + + 884, 886, 893, 888, 893, 920, 894, 893, 921, 885, +- 893, 980, 890, 998, 980, 911, 918, 894, 911, 3038, +- 911, 893, 914, 911, 892, 3028, 919, 1524, 922, 982, +- 886, 888, 982, 920, 895, 2987, 921, 895, 897, 895, +- 2810, 897, 895, 897, 895, 894, 897, 895, 897, 893, +- 895, 897, 899, 892, 897, 899, 922, 899, 2985, 898, ++ 893, 980, 890, 998, 980, 911, 918, 894, 911, 3043, ++ 911, 893, 914, 911, 892, 3033, 919, 1524, 922, 982, ++ 886, 888, 982, 920, 895, 2991, 921, 895, 897, 895, ++ 2813, 897, 895, 897, 895, 894, 897, 895, 897, 893, ++ 895, 897, 899, 892, 897, 899, 922, 899, 2989, 898, + 899, 895, 898, 901, 898, 897, 901, 898, 901, 898, + 911, 901, 898, 894, 899, 898, 981, 983, 893, 981, + 983, 981, 925, 926, 929, 901, 898, 932, 933, 895, +- 2810, 907, 923, 897, 907, 908, 907, 923, 908, 907, ++ 2813, 907, 923, 897, 907, 908, 907, 923, 908, 907, + +- 908, 907, 899, 908, 907, 908, 2981, 907, 908, 923, ++ 908, 907, 899, 908, 907, 908, 2985, 907, 908, 923, + 925, 926, 929, 901, 898, 932, 933, 934, 907, 936, +- 923, 937, 908, 2942, 2904, 923, 930, 930, 930, 930, ++ 923, 937, 908, 2946, 2908, 923, 930, 930, 930, 930, + 930, 930, 930, 930, 930, 938, 940, 923, 941, 942, + 943, 944, 945, 947, 948, 934, 907, 936, 949, 937, + 908, 931, 931, 931, 931, 931, 931, 931, 931, 931, +@@ -3803,30 +3808,30 @@ static const flex_int16_t yy_chk[14349] = + 952, 967, 968, 953, 969, 967, 970, 969, 971, 972, + + 973, 955, 974, 975, 978, 954, 956, 957, 958, 959, +- 960, 961, 962, 963, 964, 965, 2893, 2892, 985, 967, ++ 960, 961, 962, 963, 964, 965, 2897, 2896, 985, 967, + 968, 985, 969, 967, 970, 969, 971, 972, 973, 1000, +- 974, 975, 978, 984, 986, 2876, 984, 986, 984, 986, +- 987, 988, 2875, 987, 988, 987, 989, 991, 2866, 989, ++ 974, 975, 978, 984, 986, 2880, 984, 986, 984, 986, ++ 987, 988, 2879, 987, 988, 987, 989, 991, 2870, 989, + 991, 989, 992, 993, 1002, 992, 993, 992, 994, 995, + 1003, 994, 995, 994, 996, 997, 999, 996, 997, 996, + 1001, 999, 1004, 1001, 1007, 1006, 1000, 1009, 1006, 1013, + 1014, 1008, 1002, 1006, 1008, 1016, 1008, 1017, 1003, 1008, +- 2825, 1018, 1402, 1007, 1019, 1020, 1009, 2824, 1021, 1022, ++ 2835, 1018, 1402, 1007, 1019, 1020, 1009, 2828, 1021, 1022, + + 1004, 1023, 1024, 1402, 1025, 1026, 1028, 1013, 1014, 1027, +- 1027, 1027, 1027, 1016, 1030, 1017, 1031, 2986, 999, 1018, ++ 1027, 1027, 1027, 1016, 1030, 1017, 1031, 2990, 999, 1018, + 1001, 1007, 1019, 1020, 1009, 1006, 1021, 1022, 1032, 1023, + 1024, 1008, 1025, 1026, 1028, 1033, 1034, 1027, 1027, 1027, + 1027, 1029, 1030, 1035, 1031, 1029, 1036, 1037, 1038, 1039, + 1040, 1042, 1043, 1039, 1041, 1039, 1032, 1044, 1041, 1045, +- 1046, 1047, 1048, 1033, 1034, 1051, 1052, 2986, 1042, 1029, ++ 1046, 1047, 1048, 1033, 1034, 1051, 1052, 2990, 1042, 1029, + 1054, 1035, 1055, 1029, 1036, 1037, 1038, 1039, 1040, 1042, + 1043, 1039, 1041, 1039, 1056, 1044, 1041, 1045, 1046, 1047, + 1048, 1050, 1053, 1051, 1052, 1050, 1042, 1057, 1054, 1058, + +- 1055, 1059, 1050, 1053, 1050, 2815, 1060, 1061, 1062, 1064, +- 1065, 1066, 1056, 1067, 1068, 1070, 1071, 1072, 2809, 1050, +- 1074, 1075, 2775, 1050, 1077, 1057, 1078, 1058, 1079, 1059, ++ 1055, 1059, 1050, 1053, 1050, 2827, 1060, 1061, 1062, 1064, ++ 1065, 1066, 1056, 1067, 1068, 1070, 1071, 1072, 2818, 1050, ++ 1074, 1075, 2812, 1050, 1077, 1057, 1078, 1058, 1079, 1059, + 1050, 1080, 1050, 1053, 1060, 1061, 1062, 1064, 1065, 1066, + 1081, 1067, 1068, 1070, 1071, 1072, 1073, 1073, 1074, 1075, + 1073, 1082, 1077, 1083, 1078, 1073, 1079, 1084, 1085, 1080, +@@ -3835,24 +3840,24 @@ static const flex_int16_t yy_chk[14349] = + 1099, 1083, 1100, 1073, 1101, 1084, 1085, 1102, 1086, 1073, + 1087, 1088, 1089, 1073, 1091, 1073, 1115, 1092, 1093, 1094, + +- 1095, 1096, 1116, 2755, 1097, 1098, 1108, 1108, 1099, 1108, ++ 1095, 1096, 1116, 2778, 1097, 1098, 1108, 1108, 1099, 1108, + 1100, 1108, 1101, 1109, 1114, 1102, 1109, 1114, 1113, 1108, +- 2706, 1113, 1108, 1113, 2695, 1128, 1113, 1118, 1113, 1130, +- 1118, 1113, 1118, 1108, 1113, 1118, 3522, 1118, 3522, 1119, ++ 2758, 1113, 1108, 1113, 2709, 1128, 1113, 1118, 1113, 1130, ++ 1118, 1113, 1118, 1108, 1113, 1118, 3531, 1118, 3531, 1119, + 1118, 1116, 1119, 1118, 1119, 1113, 1132, 1119, 1120, 1119, + 1124, 1133, 1119, 1128, 1118, 1119, 1120, 1130, 1124, 1135, +- 2691, 1108, 1193, 1115, 1115, 1193, 1119, 1120, 1194, 1124, ++ 2698, 1108, 1193, 1115, 1115, 1193, 1119, 1120, 1194, 1124, + 1116, 1194, 1122, 1113, 1132, 1122, 1137, 1122, 1195, 1133, +- 2653, 1195, 1118, 1195, 1109, 1114, 1196, 1135, 1122, 1196, +- 1108, 1108, 2652, 1121, 1119, 1120, 1121, 1124, 1121, 1122, ++ 2694, 1195, 1118, 1195, 1109, 1114, 1196, 1135, 1122, 1196, ++ 1108, 1108, 2656, 1121, 1119, 1120, 1121, 1124, 1121, 1122, + + 1138, 1121, 1113, 1121, 1137, 1123, 1121, 1139, 1123, 1121, + 1123, 1118, 1140, 1123, 1125, 1123, 1141, 1125, 1123, 1125, + 1121, 1123, 1143, 1139, 1145, 1146, 1147, 1122, 1138, 1148, + 1125, 1149, 1123, 1153, 1155, 1139, 1156, 1159, 1160, 1161, +- 1140, 1125, 1162, 2628, 1141, 1163, 1164, 1165, 1121, 2590, +- 1143, 1139, 1145, 1146, 1147, 1197, 2563, 1148, 1197, 1149, +- 1123, 1153, 1155, 2560, 1156, 1159, 1160, 1161, 1167, 1125, ++ 1140, 1125, 1162, 2655, 1141, 1163, 1164, 1165, 1121, 2630, ++ 1143, 1139, 1145, 1146, 1147, 1197, 2592, 1148, 1197, 1149, ++ 1123, 1153, 1155, 2565, 1156, 1159, 1160, 1161, 1167, 1125, + 1162, 1144, 1168, 1163, 1164, 1165, 1169, 1121, 1144, 1144, + 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1166, 1166, 1166, + 1166, 1166, 1166, 1166, 1166, 1166, 1167, 1170, 1125, 1171, +@@ -3860,7 +3865,7 @@ static const flex_int16_t yy_chk[14349] = + 1168, 1172, 1173, 1175, 1169, 1174, 1174, 1176, 1177, 1178, + 1180, 1181, 1182, 1183, 1184, 1186, 1187, 1188, 1189, 1189, + 1199, 1198, 1205, 1199, 1198, 1170, 1198, 1171, 1209, 1172, +- 1173, 1175, 2551, 1174, 1174, 1176, 1177, 1178, 1180, 1181, ++ 1173, 1175, 2562, 1174, 1174, 1176, 1177, 1178, 1180, 1181, + 1182, 1183, 1184, 1186, 1187, 1188, 1189, 1189, 1200, 1201, + 1205, 1200, 1201, 1200, 1202, 1203, 1209, 1202, 1203, 1202, + 1204, 1210, 1211, 1204, 1218, 1219, 1220, 1222, 1223, 1225, +@@ -3871,7 +3876,7 @@ static const flex_int16_t yy_chk[14349] = + 1228, 1229, 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237, + 1238, 1233, 1239, 1240, 1241, 1242, 1243, 1245, 1246, 1244, + 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, +- 1257, 1258, 1259, 1261, 1262, 1263, 1264, 1265, 1266, 2549, ++ 1257, 1258, 1259, 1261, 1262, 1263, 1264, 1265, 1266, 2553, + 1269, 1271, 1272, 1255, 1273, 1245, 1246, 1275, 1247, 1248, + 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258, + 1259, 1261, 1262, 1263, 1264, 1265, 1266, 1268, 1269, 1271, +@@ -3883,19 +3888,19 @@ static const flex_int16_t yy_chk[14349] = + 1285, 1268, 1268, 1287, 1288, 1289, 1290, 1291, 1292, 1293, + 1295, 1297, 1290, 1304, 1298, 1299, 1300, 1301, 1302, 1305, + 1306, 1303, 1307, 1308, 1309, 1311, 1312, 1313, 1314, 1315, +- 1316, 1317, 1318, 1319, 1320, 1324, 1335, 2515, 1334, 1397, +- 1338, 1304, 1397, 1398, 2511, 2509, 1398, 1305, 1306, 1334, ++ 1316, 1317, 1318, 1319, 1320, 1324, 1335, 2551, 1334, 1397, ++ 1338, 1304, 1397, 1398, 2517, 2513, 1398, 1305, 1306, 1334, + 1307, 1308, 1309, 1311, 1312, 1313, 1314, 1315, 1316, 1317, + 1318, 1319, 1325, 1328, 1335, 1325, 1339, 1325, 1338, 1340, +- 1325, 1328, 1325, 1320, 1324, 1325, 1341, 3602, 1325, 3602, +- 1330, 2508, 1328, 1330, 1342, 1330, 2507, 1343, 1400, 1325, ++ 1325, 1328, 1325, 1320, 1324, 1325, 1341, 3612, 1325, 3612, ++ 1330, 2511, 1328, 1330, 1342, 1330, 2510, 1343, 1400, 1325, + +- 1336, 1400, 1336, 1344, 1339, 1345, 1330, 1340, 1348, 3604, +- 1350, 3604, 1320, 1324, 1341, 1334, 1333, 1330, 1351, 1333, ++ 1336, 1400, 1336, 1344, 1339, 1345, 1330, 1340, 1348, 3614, ++ 1350, 3614, 1320, 1324, 1341, 1334, 1333, 1330, 1351, 1333, + 1328, 1333, 1342, 1352, 1333, 1343, 1333, 1325, 1336, 1333, + 1336, 1344, 1333, 1345, 1347, 1353, 1348, 1347, 1350, 1347, + 1354, 1356, 1355, 1333, 1347, 1330, 1351, 1347, 1357, 1328, +- 2500, 1352, 1358, 1360, 1366, 1368, 1371, 1372, 1373, 1374, ++ 2509, 1352, 1358, 1360, 1366, 1368, 1371, 1372, 1373, 1374, + 1375, 1399, 1401, 1353, 1399, 1401, 1399, 1409, 1354, 1356, + 1409, 1333, 1355, 1376, 1330, 1377, 1357, 1378, 1355, 1379, + 1358, 1360, 1366, 1368, 1371, 1372, 1373, 1374, 1375, 1347, +@@ -3909,14 +3914,14 @@ static const flex_int16_t yy_chk[14349] = + 1411, 1412, 1413, 1414, 1415, 1420, 1416, 1417, 1423, 1418, + 1424, 1419, 1421, 1422, 1425, 1426, 1427, 1428, 1420, 1429, + 1430, 1431, 1432, 1420, 1433, 1434, 1430, 1435, 1430, 1436, +- 1437, 1430, 2488, 1420, 1439, 1440, 1423, 1441, 1424, 1442, ++ 1437, 1430, 2502, 1420, 1439, 1440, 1423, 1441, 1424, 1442, + 1443, 1444, 1425, 1426, 1427, 1428, 1420, 1429, 1430, 1431, + + 1432, 1420, 1433, 1434, 1430, 1435, 1430, 1436, 1437, 1430, + 1438, 1445, 1439, 1440, 1438, 1441, 1446, 1442, 1443, 1444, + 1447, 1438, 1448, 1438, 1438, 1449, 1438, 1450, 1451, 1452, + 1453, 1454, 1455, 1456, 1457, 1458, 1459, 1464, 1438, 1445, +- 1465, 1466, 1438, 1467, 1446, 1468, 2486, 1472, 1447, 1438, ++ 1465, 1466, 1438, 1467, 1446, 1468, 2490, 1472, 1447, 1438, + 1448, 1438, 1438, 1449, 1438, 1450, 1451, 1452, 1453, 1454, + 1455, 1456, 1457, 1458, 1459, 1464, 1473, 1469, 1465, 1466, + 1474, 1467, 1476, 1468, 1469, 1472, 1477, 1475, 1478, 1479, +@@ -3927,15 +3932,15 @@ static const flex_int16_t yy_chk[14349] = + 1469, 1474, 1482, 1474, 1483, 1469, 1495, 1484, 1485, 1486, + 1487, 1488, 1496, 1491, 1489, 1490, 1497, 1475, 1491, 1492, + 1498, 1493, 1499, 1494, 1500, 1501, 1502, 1503, 1505, 1506, +- 1507, 1508, 1509, 1505, 1495, 1512, 1513, 3673, 1514, 3673, ++ 1507, 1508, 1509, 1505, 1495, 1512, 1513, 3684, 1514, 3684, + 1496, 1491, 1515, 1503, 1497, 1517, 1491, 1518, 1498, 1519, + 1499, 1573, 1500, 1501, 1502, 1503, 1505, 1506, 1507, 1508, + 1510, 1505, 1511, 1512, 1513, 1511, 1514, 1511, 1510, 1520, +- 1515, 1503, 2485, 1517, 1521, 1518, 1522, 1519, 1511, 1510, ++ 1515, 1503, 2488, 1517, 1521, 1518, 1522, 1519, 1511, 1510, + 1523, 1526, 1527, 1523, 1526, 1523, 1526, 1530, 1531, 1511, + + 1523, 1526, 1532, 1523, 1526, 1576, 1573, 1520, 1576, 1509, +- 1509, 2484, 1521, 1535, 1522, 1533, 1536, 1510, 2479, 1533, ++ 1509, 2487, 1521, 1535, 1522, 1533, 1536, 1510, 2486, 1533, + 1527, 1533, 1538, 1539, 1541, 1530, 1531, 1511, 1547, 1548, + 1532, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, 1534, + 1551, 1535, 1552, 1533, 1536, 1523, 1526, 1533, 1553, 1533, +@@ -3961,8 +3966,8 @@ static const flex_int16_t yy_chk[14349] = + 1632, 1642, 1643, 1644, 1633, 1635, 1636, 1645, 1637, 1639, + 1640, 1646, 1641, 1647, 1648, 1650, 1651, 1652, 1653, 1654, + 1634, 1655, 1656, 1658, 1660, 1661, 1662, 1664, 1665, 1642, +- 1643, 1644, 1667, 1656, 1658, 1645, 1668, 1672, 3675, 1646, +- 3675, 1647, 1648, 1650, 1651, 1652, 1653, 1654, 2454, 1655, ++ 1643, 1644, 1667, 1656, 1658, 1645, 1668, 1672, 3686, 1646, ++ 3686, 1647, 1648, 1650, 1651, 1652, 1653, 1654, 2481, 1655, + 1656, 1673, 1660, 1661, 1662, 1664, 1665, 1674, 1675, 1677, + 1667, 1656, 1657, 1657, 1668, 1672, 1657, 1678, 1657, 1679, + 1680, 1681, 1657, 1657, 1682, 1683, 1657, 1684, 1685, 1673, +@@ -3972,15 +3977,15 @@ static const flex_int16_t yy_chk[14349] = + 1657, 1657, 1682, 1683, 1657, 1684, 1685, 1696, 1686, 1657, + 1687, 1688, 1689, 1693, 1697, 1694, 1690, 1691, 1694, 1698, + 1692, 1695, 1699, 1700, 1702, 1703, 1693, 1705, 1706, 1707, +- 1709, 1708, 1710, 1714, 1716, 1696, 3738, 1720, 3738, 1721, +- 1723, 1693, 1697, 1694, 1708, 3146, 1694, 1698, 1724, 1725, ++ 1709, 1708, 1710, 1714, 1716, 1696, 3750, 1720, 3750, 1721, ++ 1723, 1693, 1697, 1694, 1708, 3151, 1694, 1698, 1724, 1725, + 1699, 1726, 1702, 1703, 1693, 1705, 1706, 1707, 1709, 1708, +- 1710, 1712, 1716, 2443, 1712, 1720, 1712, 1721, 1723, 1729, +- 1733, 1712, 1708, 1722, 1712, 2433, 1724, 1725, 1714, 1726, ++ 1710, 1712, 1716, 2456, 1712, 1720, 1712, 1721, 1723, 1729, ++ 1733, 1712, 1708, 1722, 1712, 2444, 1724, 1725, 1714, 1726, + + 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1727, +- 1700, 1727, 1730, 2431, 2415, 3146, 1765, 1729, 1733, 1765, +- 2399, 1765, 1735, 1735, 1730, 1736, 1737, 1738, 1739, 1730, ++ 1700, 1727, 1730, 2434, 2432, 3151, 1765, 1729, 1733, 1765, ++ 2416, 1765, 1735, 1735, 1730, 1736, 1737, 1738, 1739, 1730, + 1740, 1741, 1742, 1743, 1745, 1746, 1712, 1727, 1757, 1727, + 1730, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, 1734, + 1735, 1735, 1730, 1736, 1737, 1738, 1739, 1730, 1740, 1741, +@@ -4004,12 +4009,12 @@ static const flex_int16_t yy_chk[14349] = + 1812, 1808, 1812, 1813, 1814, 1815, 1824, 1812, 1817, 1818, + 1829, 1821, 1831, 1833, 1822, 1834, 1823, 1835, 1825, 1826, + 1824, 1836, 1837, 1819, 1827, 1838, 1839, 1828, 1840, 1841, +- 1842, 1843, 1844, 1845, 1846, 1847, 1850, 3571, 1829, 1851, ++ 1842, 1843, 1844, 1845, 1846, 1847, 1850, 3580, 1829, 1851, + 1831, 1833, 1840, 1834, 1852, 1835, 1854, 1855, 1860, 1836, +- 1837, 2360, 1862, 1838, 1839, 1863, 1840, 1841, 1842, 1843, ++ 1837, 2400, 1862, 1838, 1839, 1863, 1840, 1841, 1842, 1843, + 1844, 1845, 1846, 1847, 1850, 1849, 1849, 1851, 1864, 1865, + 1840, 1849, 1852, 1867, 1854, 1855, 1860, 1868, 1869, 1849, +- 1862, 1870, 1849, 1863, 1871, 1872, 1875, 3571, 1878, 1886, ++ 1862, 1870, 1849, 1863, 1871, 1872, 1875, 3580, 1878, 1886, + + 1879, 1880, 1881, 1849, 1849, 1882, 1864, 1865, 1876, 1849, + 1876, 1867, 1883, 1884, 1876, 1868, 1869, 1849, 1887, 1870, +@@ -4017,14 +4022,14 @@ static const flex_int16_t yy_chk[14349] = + 1881, 1890, 1891, 1882, 1892, 1893, 1876, 1885, 1876, 1885, + 1883, 1884, 1876, 1885, 1886, 1889, 1887, 1894, 1895, 1888, + 1898, 1899, 1889, 1876, 1885, 1876, 1885, 1902, 1903, 1890, +- 1891, 1904, 1892, 1893, 1906, 1885, 1907, 1885, 2358, 1909, ++ 1891, 1904, 1892, 1893, 1906, 1885, 1907, 1885, 2361, 1909, + 1908, 1885, 1908, 1889, 2074, 1894, 1895, 1910, 1896, 1911, + 1889, 1896, 1885, 1896, 1885, 1913, 1903, 1914, 1896, 1904, + 1915, 1896, 1906, 1916, 1907, 1898, 1899, 1909, 1908, 1919, + +- 1908, 1920, 1902, 1922, 1923, 1910, 2345, 1911, 1924, 1925, +- 1926, 1927, 1928, 1913, 1968, 1914, 2302, 1968, 1915, 2074, +- 2300, 1916, 1929, 1930, 1931, 2087, 1932, 1919, 2087, 1920, ++ 1908, 1920, 1902, 1922, 1923, 1910, 2359, 1911, 1924, 1925, ++ 1926, 1927, 1928, 1913, 1968, 1914, 2346, 1968, 1915, 2074, ++ 2303, 1916, 1929, 1930, 1931, 2087, 1932, 1919, 2087, 1920, + 1930, 1922, 1923, 1896, 1917, 1933, 1924, 1925, 1926, 1927, + 1928, 1917, 1917, 1917, 1917, 1917, 1917, 1917, 1917, 1917, + 1929, 1930, 1931, 1917, 1932, 1917, 1917, 1917, 1930, 1934, +@@ -4036,7 +4041,7 @@ static const flex_int16_t yy_chk[14349] = + 1944, 1951, 1953, 1917, 1937, 1949, 1949, 1949, 1949, 1957, + 1954, 1958, 1959, 1960, 1955, 1961, 1962, 1963, 1964, 1956, + 1965, 1966, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1977, +- 1978, 1979, 1947, 1980, 2299, 1982, 1983, 1957, 1984, 1958, ++ 1978, 1979, 1947, 1980, 2301, 1982, 1983, 1957, 1984, 1958, + 1959, 1960, 1985, 1961, 1962, 1963, 1964, 1986, 1965, 1966, + 1969, 1970, 1971, 1972, 1973, 1974, 1975, 1977, 1978, 1979, + 1949, 1980, 1981, 1982, 1983, 1981, 1984, 1981, 1987, 1988, +@@ -4046,988 +4051,990 @@ static const flex_int16_t yy_chk[14349] = + + 1990, 1991, 1992, 2007, 1993, 1994, 1995, 1996, 2013, 1998, + 1999, 2014, 2000, 2015, 2001, 2002, 2003, 2004, 2005, 2006, +- 2016, 2009, 2010, 2011, 2017, 2018, 2012, 2019, 2298, 2166, +- 2284, 2021, 2166, 2022, 2166, 2178, 2013, 2023, 2178, 2014, +- 2178, 2015, 2024, 2025, 2026, 2282, 2027, 2281, 2016, 2028, +- 2029, 2030, 2017, 2018, 2031, 2019, 2020, 2020, 2020, 2021, +- 2020, 2022, 2020, 2020, 2032, 2023, 2020, 2020, 2020, 2033, +- 2024, 2025, 2026, 2020, 2027, 2020, 2034, 2028, 2029, 2030, +- 2035, 2036, 2031, 2037, 2020, 2020, 2020, 2038, 2020, 2039, +- 2020, 2020, 2032, 2040, 2020, 2020, 2020, 2033, 2041, 2042, +- +- 2043, 2020, 2044, 2020, 2034, 2045, 2046, 2049, 2035, 2036, +- 2050, 2037, 2051, 2052, 2057, 2038, 2058, 2039, 2059, 2060, +- 2061, 2040, 2062, 2063, 2064, 2068, 2041, 2042, 2043, 2065, +- 2044, 2065, 2069, 2045, 2046, 2049, 2072, 2073, 2050, 2073, +- 2051, 2052, 2057, 2075, 2058, 2076, 2059, 2060, 2061, 2077, +- 2062, 2063, 2064, 2068, 2078, 2079, 2080, 2065, 2081, 2065, +- 2069, 2082, 2089, 2083, 2072, 2073, 2084, 2073, 2085, 2086, +- 2090, 2091, 2094, 2095, 2096, 2097, 2098, 2077, 2099, 2259, +- 2100, 2101, 2078, 2079, 2080, 2102, 2081, 2209, 2075, 2082, +- 2076, 2083, 2103, 2104, 2084, 2104, 2085, 2086, 2209, 2210, +- +- 2094, 2095, 2096, 2097, 2098, 2107, 2099, 2089, 2100, 2101, +- 2210, 2245, 2143, 2102, 2108, 2090, 2091, 2109, 2142, 2111, +- 2103, 2104, 2112, 2104, 2105, 2105, 2105, 2105, 2105, 2105, +- 2105, 2105, 2105, 2107, 2113, 2115, 2105, 2116, 2105, 2105, +- 2105, 2110, 2108, 2117, 2105, 2109, 2110, 2111, 2118, 2105, +- 2112, 2119, 2120, 2121, 2122, 2124, 2125, 2126, 2105, 2055, +- 2146, 2146, 2113, 2115, 2105, 2116, 2105, 2105, 2105, 2110, +- 2127, 2117, 2105, 2128, 2110, 2129, 2118, 2105, 2130, 2119, +- 2120, 2121, 2122, 2124, 2125, 2126, 2105, 2106, 2106, 2106, +- 2106, 2106, 2106, 2106, 2106, 2106, 2131, 2132, 2127, 2133, +- +- 2134, 2128, 2135, 2129, 2137, 2138, 2130, 2139, 2140, 2141, +- 2144, 2144, 2144, 2144, 2146, 2147, 2147, 2147, 2147, 2148, +- 2148, 2149, 2151, 2152, 2131, 2132, 2153, 2133, 2134, 2154, +- 2135, 2156, 2137, 2138, 2157, 2139, 2140, 2141, 2158, 2159, +- 2160, 2161, 2167, 2162, 2163, 2167, 2053, 2164, 2165, 2149, +- 2151, 2152, 2168, 2169, 2153, 2170, 2171, 2154, 2172, 2156, +- 2173, 2174, 2157, 2175, 2176, 2144, 2158, 2159, 2160, 2161, +- 2147, 2162, 2163, 2148, 2155, 2164, 2165, 2155, 2048, 2177, +- 2168, 2169, 2167, 2170, 2171, 2180, 2172, 2181, 2173, 2174, +- 1967, 2175, 2176, 2155, 1952, 2182, 2183, 2184, 2185, 2186, +- +- 2187, 2188, 2189, 2191, 2192, 2193, 2155, 2177, 2155, 2194, +- 2167, 2196, 2197, 2180, 2196, 2181, 2196, 2198, 2155, 2199, +- 2155, 2155, 2155, 2182, 2183, 2184, 2185, 2186, 2187, 2188, +- 2189, 2191, 2192, 2193, 2155, 2200, 2155, 2194, 2201, 2202, +- 2197, 2203, 2202, 2204, 2205, 2198, 2155, 2199, 2155, 2155, +- 2155, 2207, 2208, 2211, 2212, 2213, 2214, 2215, 2216, 2217, +- 2218, 2219, 2220, 2200, 2221, 2222, 2201, 2216, 2223, 2203, +- 2224, 2204, 2205, 2225, 2226, 2228, 2227, 2229, 2230, 2207, +- 2208, 2211, 2212, 2213, 2214, 2215, 2216, 2217, 2218, 2219, +- 2220, 2227, 2221, 2222, 2235, 2236, 2223, 2237, 2224, 2238, +- +- 2239, 2225, 2226, 2228, 2227, 2229, 2230, 2240, 2241, 2242, +- 2243, 2244, 2246, 2247, 2248, 2249, 2250, 2255, 2256, 2227, +- 2258, 2262, 2235, 2236, 2263, 2237, 2265, 2238, 2239, 2266, +- 2267, 2268, 2269, 2270, 2271, 2240, 2241, 2242, 2243, 2244, +- 2246, 2247, 2248, 2249, 2250, 2255, 2256, 2278, 2258, 2262, +- 2279, 2280, 2263, 2283, 2265, 2285, 2287, 2266, 2267, 2268, +- 2269, 2270, 2271, 2288, 2289, 2290, 2291, 2292, 2293, 2294, +- 2301, 2295, 2303, 2304, 2305, 2278, 1948, 2297, 2279, 2280, +- 2297, 2306, 2297, 2307, 2287, 2308, 2309, 2297, 2310, 1946, +- 2297, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2283, 2295, +- +- 2285, 2304, 2305, 2311, 2297, 2313, 2314, 2315, 2317, 2306, +- 2318, 2307, 2316, 2308, 2309, 2301, 2310, 2303, 2319, 2316, +- 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2316, 2321, 2322, +- 2323, 2311, 2297, 2313, 2314, 2315, 2317, 2320, 2318, 2324, +- 2325, 2326, 2320, 2327, 2328, 2329, 2319, 2330, 2331, 2333, +- 2334, 2335, 2337, 2340, 2342, 2343, 2321, 2322, 2323, 2344, +- 2346, 2347, 2348, 2349, 2350, 2320, 2351, 2324, 2325, 2326, +- 2320, 2327, 2328, 2329, 2352, 2330, 2331, 2333, 2334, 2335, +- 2337, 2340, 2342, 2343, 2355, 2357, 2362, 2344, 2346, 2347, +- 2348, 2349, 2350, 2363, 2351, 2359, 2359, 2365, 2359, 2366, +- +- 2361, 2361, 2352, 2361, 2365, 2367, 2368, 2369, 2367, 2368, +- 2367, 2370, 2355, 2357, 2362, 2371, 2372, 2370, 2373, 2374, +- 2375, 2363, 1918, 2376, 2377, 2365, 2376, 2366, 2378, 2379, +- 2380, 2381, 2365, 2382, 2383, 2369, 2384, 2386, 1901, 2370, +- 2386, 2388, 2386, 2371, 2372, 2370, 2373, 2374, 2375, 2389, +- 2359, 2390, 2377, 2391, 2392, 2361, 2378, 2379, 2380, 2381, +- 2393, 2382, 2383, 2387, 2384, 2359, 2387, 2394, 2387, 2388, +- 2361, 2395, 2397, 2398, 2400, 2397, 2401, 2389, 2402, 2390, +- 2403, 2391, 2392, 2404, 2405, 2406, 2407, 2408, 2393, 2409, +- 2411, 2412, 2413, 2414, 2416, 2394, 2417, 2418, 2419, 2395, +- +- 2418, 2398, 2400, 2420, 2401, 2422, 2402, 2423, 2403, 2424, +- 2425, 2404, 2405, 2406, 2407, 2408, 2426, 2409, 2411, 2412, +- 2413, 2414, 2416, 2429, 2417, 2421, 2419, 2430, 2421, 2432, +- 2421, 2420, 2434, 2422, 2435, 2423, 2437, 2424, 2425, 2438, +- 2439, 2440, 2441, 2434, 2426, 1900, 2442, 2444, 2445, 2446, +- 2447, 2429, 2448, 2449, 2451, 2430, 2452, 2432, 2453, 2455, +- 2456, 2457, 2435, 2459, 2437, 2460, 2461, 2438, 2439, 2440, +- 2441, 2462, 2463, 2434, 2442, 2444, 2445, 2446, 2447, 2464, +- 2448, 2449, 2451, 2465, 2452, 2466, 2453, 2455, 2456, 2457, +- 2467, 2459, 2468, 2460, 2461, 2469, 2472, 2473, 2474, 2462, +- +- 2463, 2476, 2477, 2478, 2482, 2483, 2487, 2464, 2489, 2490, +- 2491, 2465, 2492, 2466, 2493, 2494, 2495, 2496, 2467, 2497, +- 2468, 2499, 2502, 2469, 2472, 2473, 2474, 2503, 1897, 2476, +- 2477, 2478, 2482, 2483, 2572, 2510, 2514, 2572, 2491, 2502, +- 2492, 2503, 2493, 2494, 2495, 2496, 2512, 2497, 2513, 2499, +- 1861, 2487, 2501, 2489, 2490, 2501, 2504, 2501, 2516, 2504, +- 2517, 2504, 2501, 1830, 2514, 2501, 2504, 2502, 2505, 2503, +- 2518, 2505, 2506, 2505, 2519, 2506, 2520, 2506, 2505, 2501, +- 2510, 2505, 2506, 2504, 2522, 2506, 2516, 2523, 2517, 2524, +- 2526, 2512, 2527, 2513, 2528, 2505, 2529, 2530, 2518, 2506, +- +- 2531, 2532, 2519, 2533, 2520, 2534, 2535, 2501, 2536, 2537, +- 2538, 2504, 2522, 2539, 2540, 2523, 2541, 2524, 2526, 2542, +- 2527, 2543, 2528, 2505, 2529, 2530, 2544, 2506, 2531, 2532, +- 2545, 2533, 2546, 2534, 2535, 2547, 2536, 2537, 2538, 2548, +- 2550, 2539, 2540, 2552, 2541, 2553, 2554, 2542, 2555, 2543, +- 2556, 2557, 2558, 2559, 2544, 2566, 2561, 2561, 2545, 2561, +- 2546, 2564, 2564, 2547, 2564, 2567, 2568, 2548, 2550, 2569, +- 2573, 2552, 2574, 2553, 2554, 2575, 2555, 2576, 2556, 2557, +- 2558, 2559, 2577, 2566, 2578, 2579, 2580, 2581, 1761, 2582, +- 2581, 2583, 2581, 2567, 2568, 2585, 2586, 2569, 2573, 2587, +- +- 2574, 2588, 2589, 2575, 2593, 2576, 2594, 2595, 2596, 2597, +- 2577, 2561, 2578, 2579, 2580, 2598, 2564, 2582, 2600, 2583, +- 2600, 2602, 2601, 2585, 2586, 2601, 2561, 2587, 2604, 2588, +- 2589, 2564, 2593, 2605, 2594, 2595, 2596, 2597, 2606, 2607, +- 2609, 2610, 2611, 2598, 2612, 2613, 2600, 2612, 2600, 2602, +- 2614, 2615, 2616, 2617, 2619, 2620, 2604, 2621, 2622, 2622, +- 2621, 2605, 2621, 2623, 2613, 2627, 2606, 2607, 2609, 2610, +- 2611, 2625, 2629, 2613, 2625, 2630, 2625, 2631, 2614, 2615, +- 2616, 2617, 2619, 2620, 2632, 2633, 2622, 2622, 2634, 2635, +- 2636, 2623, 2613, 2627, 2638, 2639, 2640, 2641, 2642, 2643, +- +- 2629, 2644, 2645, 2630, 2646, 2631, 2647, 2648, 2649, 2650, +- 2651, 2654, 2632, 2633, 2655, 2656, 2634, 2635, 2636, 2657, +- 2658, 2659, 2638, 2639, 2640, 2641, 2642, 2643, 2660, 2644, +- 2645, 2661, 2646, 2662, 2647, 2648, 2649, 2650, 2651, 2654, +- 2664, 2665, 2655, 2656, 2666, 2667, 2668, 2657, 2658, 2659, +- 2669, 2671, 2672, 2673, 2675, 2676, 2660, 2677, 2678, 2661, +- 2679, 2662, 2680, 2681, 2682, 2684, 2685, 2686, 2664, 2665, +- 2687, 2688, 2666, 2667, 2668, 2689, 2707, 2692, 2669, 2671, +- 2672, 2673, 2675, 2676, 2779, 2677, 2678, 2779, 2679, 2699, +- 2680, 2692, 1760, 2684, 2685, 2686, 2696, 2693, 2687, 2688, +- +- 2693, 2694, 2693, 2689, 2694, 2697, 2694, 2693, 2681, 2682, +- 2693, 2694, 2698, 2696, 2694, 2698, 2709, 2699, 2708, 2692, +- 2700, 2707, 2697, 2700, 2693, 2700, 2710, 2813, 2694, 2698, +- 2700, 1759, 2701, 2700, 2711, 2701, 2780, 2701, 2813, 2780, +- 2785, 2696, 2701, 2785, 2709, 2713, 2888, 2700, 2714, 2888, +- 2697, 2715, 2693, 2716, 2710, 2702, 2694, 2717, 2702, 2701, +- 2702, 2704, 2711, 2708, 2704, 2702, 2704, 2705, 2702, 2718, +- 2705, 2704, 2705, 2713, 2704, 2700, 2714, 2705, 2719, 2715, +- 2705, 2716, 2702, 2720, 2721, 2717, 2722, 2701, 2704, 2723, +- 2724, 2725, 2726, 2727, 2705, 2728, 2729, 2718, 2731, 2732, +- +- 2733, 2734, 2735, 2736, 2737, 2738, 2719, 2739, 2740, 2741, +- 2702, 2720, 2721, 2742, 2722, 2743, 2704, 2723, 2724, 2725, +- 2726, 2727, 2705, 2728, 2729, 2745, 2731, 2732, 2733, 2734, +- 2735, 2736, 2737, 2738, 2746, 2739, 2740, 2741, 2747, 2748, +- 2749, 2742, 2750, 2743, 2752, 2753, 2757, 2758, 2759, 2760, +- 2761, 2762, 2763, 2745, 2764, 2767, 2768, 2769, 2770, 2771, +- 2772, 2773, 2746, 2776, 2777, 2778, 2747, 2748, 2749, 2782, +- 2750, 2783, 2752, 2753, 2757, 2758, 2759, 2760, 2761, 2762, +- 2763, 2786, 2764, 2767, 2768, 2769, 2770, 2771, 2772, 2773, +- 2787, 2776, 2777, 2778, 2788, 2789, 2790, 2782, 2791, 2783, +- +- 2792, 2793, 2794, 2789, 2789, 2794, 2789, 2794, 2789, 2786, +- 2795, 2796, 2797, 2798, 2799, 2800, 2801, 2802, 2787, 2805, +- 2806, 2807, 2811, 2789, 2790, 2788, 2791, 2812, 2792, 2793, +- 2814, 2789, 2789, 2817, 2789, 2816, 2789, 2818, 2795, 2796, +- 2797, 2798, 2799, 2800, 2801, 2802, 2816, 2805, 2806, 2807, +- 2811, 2819, 2820, 2788, 2821, 2812, 2822, 2823, 2814, 2826, +- 2827, 2817, 2828, 2829, 2830, 2818, 2831, 2832, 2833, 2834, +- 2835, 2836, 2837, 2826, 2838, 2839, 2840, 2831, 2841, 2819, +- 2820, 2842, 2821, 2844, 2822, 2823, 2845, 2826, 2827, 2846, +- 2828, 2829, 2830, 2847, 2848, 2832, 2833, 2834, 2835, 2836, +- +- 2837, 2849, 2838, 2839, 2840, 2850, 2841, 2851, 2852, 2842, +- 2853, 2844, 2854, 2855, 2845, 2856, 2857, 2846, 2858, 2859, +- 2860, 2847, 2848, 2861, 2862, 2863, 2864, 2865, 2869, 2849, +- 1732, 2867, 1728, 2850, 1719, 2851, 2852, 2894, 2853, 2948, +- 2854, 2855, 2948, 2856, 2857, 2869, 2858, 2859, 2860, 2867, +- 2896, 1715, 2862, 2863, 2864, 2865, 2891, 2868, 2877, 2867, +- 2868, 2871, 2868, 2897, 2871, 2894, 2871, 2868, 2861, 2872, +- 2868, 2871, 2872, 2869, 2872, 2877, 1713, 2867, 2896, 2872, +- 2873, 2878, 2872, 2873, 2868, 2873, 2898, 2879, 2871, 2880, +- 2873, 2897, 2874, 2873, 2899, 2874, 2872, 2874, 2878, 2900, +- +- 2991, 2891, 2874, 2877, 2879, 2874, 2880, 2873, 2901, 1711, +- 2882, 2991, 2868, 2882, 2898, 2882, 2871, 1701, 2902, 2874, +- 2882, 1659, 2899, 2882, 2872, 1649, 2878, 2900, 2884, 2903, +- 1579, 2884, 2879, 2884, 2880, 2873, 2901, 2882, 2884, 2885, +- 2886, 2884, 2885, 2886, 2885, 2886, 2902, 2874, 2887, 2885, +- 2886, 2887, 2885, 2887, 2905, 2884, 1574, 2903, 2887, 2889, +- 2906, 2908, 2889, 2910, 2889, 2882, 2885, 2886, 2912, 2889, +- 1572, 2890, 2889, 2913, 2890, 2887, 2890, 2914, 2916, 2917, +- 2918, 2890, 2905, 2884, 2890, 2919, 2889, 2920, 2906, 2908, +- 2921, 2910, 2922, 2923, 2885, 2886, 2912, 2924, 2890, 2925, +- +- 2926, 2913, 2930, 2887, 2931, 2914, 2916, 2917, 2918, 2932, +- 2934, 2935, 2936, 2919, 2889, 2920, 2937, 2938, 2921, 2939, +- 2922, 2923, 2941, 2943, 2944, 2924, 2890, 2925, 2926, 2945, +- 2930, 2946, 2931, 2947, 2949, 2951, 2952, 2932, 2934, 2935, +- 2936, 2953, 2958, 2954, 2937, 2938, 2954, 2939, 2959, 2961, +- 2941, 2943, 2944, 2955, 2962, 2963, 2955, 2945, 2955, 2946, +- 2964, 2947, 2949, 2951, 2952, 2965, 2966, 2967, 2968, 2953, +- 2958, 2969, 2973, 2974, 2969, 2975, 2959, 2961, 2967, 2967, +- 2970, 2977, 2962, 2963, 2970, 2978, 2976, 2972, 2964, 2976, +- 2972, 2970, 2972, 2965, 2966, 2967, 2968, 2979, 2980, 2982, +- +- 2973, 2974, 2983, 2975, 2984, 2988, 2967, 2967, 2970, 2977, +- 2989, 2992, 2970, 2978, 2994, 2995, 2996, 2997, 2998, 2970, +- 2999, 3000, 3001, 3002, 3002, 2979, 2980, 2982, 3003, 3004, +- 2983, 3005, 2984, 2988, 3006, 3007, 3008, 3010, 2989, 2992, +- 3011, 3012, 2994, 2995, 2996, 2997, 2998, 3013, 2999, 3000, +- 3001, 3002, 3002, 3014, 3015, 3016, 3003, 3004, 3017, 3005, +- 3018, 3019, 3006, 3007, 3008, 3010, 3020, 3021, 3011, 3012, +- 3023, 3018, 3024, 1550, 3025, 3013, 3027, 3020, 3029, 1546, +- 3030, 3014, 3015, 3016, 3031, 3033, 3017, 3034, 3035, 3019, +- 3036, 3037, 3039, 3040, 3041, 3021, 3043, 3044, 3023, 1529, +- +- 3024, 3018, 3025, 3050, 3027, 1528, 3029, 3020, 3030, 3041, +- 3048, 3049, 3031, 3033, 3049, 3034, 3035, 1525, 3036, 3037, +- 3039, 3040, 3041, 3046, 3043, 3044, 3046, 3048, 3046, 3051, +- 3056, 3050, 3051, 3046, 3051, 3052, 3046, 3041, 3052, 3051, +- 3052, 3053, 3051, 3065, 3053, 3052, 3053, 3056, 3286, 3057, +- 3046, 3053, 3066, 1471, 3053, 3048, 3051, 3067, 3060, 3286, +- 3054, 3060, 3052, 3054, 3059, 3054, 3057, 3059, 3053, 3059, +- 3054, 3065, 1470, 3054, 3059, 3056, 3061, 3059, 3046, 3061, +- 3066, 3061, 3069, 3071, 3051, 3067, 3061, 3054, 3073, 3061, +- 3052, 3059, 3074, 3075, 3057, 3062, 3053, 3076, 3062, 3078, +- +- 3062, 3079, 3080, 3061, 3081, 3062, 3082, 3083, 3062, 3084, +- 3069, 3071, 3085, 3087, 3088, 3054, 3073, 3089, 3090, 3059, +- 3074, 3075, 3062, 3092, 3093, 3076, 3094, 3078, 3095, 3079, +- 3080, 3061, 3081, 3096, 3082, 3083, 3097, 3084, 3098, 3097, +- 3085, 3087, 3088, 3099, 3100, 3089, 3090, 3102, 3103, 3104, +- 3062, 3092, 3093, 3105, 3094, 3106, 3095, 3109, 3402, 3113, +- 3109, 3096, 3113, 3645, 1463, 3108, 3098, 3107, 3111, 3402, +- 3107, 3099, 3100, 3116, 3117, 3102, 3103, 3104, 3119, 3120, +- 3121, 3105, 3122, 3106, 3107, 3107, 3107, 3107, 3107, 3107, +- 3107, 3107, 3107, 3108, 3115, 3123, 3111, 3115, 3124, 3115, +- +- 3125, 3116, 3117, 3126, 3127, 3128, 3119, 3120, 3121, 3137, +- 3122, 3235, 3137, 3645, 3235, 3130, 3131, 3129, 3132, 3134, +- 3129, 3135, 3136, 3123, 3138, 3139, 3124, 3140, 3125, 3141, +- 3143, 3126, 3127, 3128, 3129, 3129, 3129, 3129, 3129, 3129, +- 3129, 3129, 3129, 3130, 3131, 3144, 3132, 3134, 3145, 3135, +- 3136, 3147, 3138, 3139, 3148, 3140, 3150, 3141, 3143, 3151, +- 3152, 3154, 3155, 3157, 3158, 3159, 3160, 3161, 3162, 3164, +- 3165, 3166, 3167, 3144, 3169, 3170, 3145, 3171, 3172, 3147, +- 3174, 3176, 3148, 3179, 3150, 3183, 3185, 3151, 3152, 3154, +- 3155, 3157, 3158, 3159, 3160, 3161, 3162, 3164, 3165, 3166, +- +- 3167, 3182, 3169, 3170, 3187, 3171, 3172, 3188, 3174, 3176, +- 3189, 3179, 3182, 3183, 3185, 3190, 3191, 3192, 3193, 3195, +- 3196, 3197, 3198, 3199, 3200, 3267, 3201, 3213, 3267, 3201, +- 3214, 3201, 3187, 1462, 3199, 3188, 3201, 3202, 3189, 3201, +- 3207, 1461, 3182, 3190, 3191, 3192, 3193, 3195, 3196, 3197, +- 3198, 3199, 3200, 3201, 3202, 3213, 3204, 3207, 3214, 3204, +- 3205, 3204, 3199, 3205, 3206, 3205, 3204, 3206, 3215, 3206, +- 3205, 1406, 3275, 3216, 3206, 3275, 3217, 3206, 3219, 3220, +- 3221, 3201, 3202, 3204, 3223, 3207, 3224, 3205, 1405, 3208, +- 3209, 3206, 3208, 3209, 3208, 3209, 3215, 1394, 1370, 3208, +- +- 3209, 3216, 3208, 3209, 3217, 1369, 3219, 3220, 3221, 3225, +- 3226, 3204, 3223, 3227, 3224, 3205, 3208, 3209, 3228, 3206, +- 3211, 3212, 3231, 3211, 3212, 3211, 3212, 3232, 3233, 3234, +- 3211, 3212, 3236, 3211, 3212, 3237, 3240, 3225, 3226, 3241, +- 3242, 3227, 3243, 3244, 3208, 3209, 3228, 3211, 3212, 3239, +- 3231, 3245, 3239, 3246, 3239, 3232, 3233, 3234, 3247, 3279, +- 3236, 3407, 3279, 3237, 3240, 1365, 1364, 3241, 3242, 3249, +- 3243, 3244, 3407, 1363, 3254, 3211, 3212, 3254, 1362, 3245, +- 3251, 3246, 3250, 3253, 3256, 3250, 3247, 3248, 3248, 3248, +- 3248, 3248, 3248, 3248, 3248, 3248, 3257, 3249, 3258, 3250, +- +- 3250, 3250, 3250, 3250, 3250, 3250, 3250, 3250, 3251, 3259, +- 3260, 3253, 3256, 3261, 3262, 3263, 3264, 3265, 3268, 3269, +- 3254, 3271, 3272, 3273, 3257, 3276, 3258, 3266, 3266, 3266, +- 3266, 3266, 3266, 3266, 3266, 3266, 3277, 3259, 3260, 3278, +- 3280, 3261, 3262, 3263, 3264, 3265, 3268, 3269, 3254, 3271, +- 3272, 3273, 3281, 3276, 3282, 3281, 3283, 3284, 3285, 3287, +- 3288, 3289, 3290, 3292, 3277, 3293, 3294, 3278, 3280, 3295, +- 3296, 3300, 3301, 3302, 3303, 3306, 3307, 3308, 3647, 3311, +- 3313, 3314, 3282, 3315, 3283, 3284, 3285, 3287, 3288, 3289, +- 3290, 3292, 3316, 3293, 3294, 3317, 3318, 3295, 3296, 3300, +- +- 3301, 3302, 3303, 3306, 3307, 3308, 3309, 3311, 3313, 3314, +- 3319, 3315, 3320, 3322, 3309, 3323, 3324, 3325, 3326, 3327, +- 3316, 1361, 3328, 3317, 3318, 3328, 3331, 3328, 3647, 3331, +- 3334, 3329, 3328, 3353, 3309, 3328, 3353, 1359, 3319, 3335, +- 3320, 3322, 3309, 3323, 3324, 3325, 3326, 3327, 3329, 3328, +- 1327, 3330, 3332, 3336, 3330, 3332, 3330, 3332, 3334, 3337, +- 3338, 3330, 3332, 3341, 3330, 3332, 3343, 3335, 3345, 1323, +- 3333, 3346, 3347, 3333, 3348, 3333, 3329, 3328, 3330, 3332, +- 3333, 3336, 3349, 3333, 3351, 3354, 3357, 3337, 3338, 3383, +- 3384, 3341, 3383, 3384, 3343, 1294, 3345, 3333, 3352, 3346, +- +- 3347, 3352, 3348, 1286, 1284, 3385, 3330, 3332, 3385, 1279, +- 3349, 3715, 3351, 3354, 3357, 3352, 3352, 3352, 3352, 3352, +- 3352, 3352, 3352, 3352, 3358, 3333, 3355, 3355, 3355, 3355, +- 3355, 3355, 3355, 3355, 3355, 3355, 3355, 3356, 3356, 3356, +- 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3356, 3359, 3360, +- 3361, 3355, 3358, 3362, 3363, 3364, 3365, 3367, 3369, 3371, +- 3373, 3715, 3356, 3366, 3366, 3366, 3366, 3366, 3366, 3366, +- 3366, 3366, 3370, 3374, 3375, 3370, 3359, 3360, 3361, 3376, +- 3377, 3362, 3363, 3364, 3365, 3367, 3369, 3371, 3373, 3370, +- 3370, 3370, 3370, 3370, 3370, 3370, 3370, 3370, 3378, 3379, +- +- 3380, 3374, 3375, 3381, 3386, 3387, 3388, 3376, 3377, 3388, +- 3389, 3390, 3391, 3392, 3393, 3396, 3392, 3393, 3398, 3400, +- 3404, 3405, 3406, 1274, 1217, 1216, 3378, 3379, 3380, 1215, +- 3666, 3381, 3386, 3387, 3394, 3408, 3409, 3394, 3389, 3390, +- 3391, 3666, 3411, 3396, 3412, 3413, 3398, 3400, 3404, 3405, +- 3406, 3394, 3394, 3394, 3394, 3394, 3394, 3394, 3394, 3394, +- 3410, 3414, 3415, 3408, 3409, 3416, 3417, 3418, 3410, 3410, +- 3411, 3419, 3412, 3413, 3420, 3421, 3422, 3423, 3424, 3426, +- 3427, 3428, 3429, 3430, 3431, 3432, 3431, 3433, 3410, 3414, +- 3415, 3434, 3436, 3416, 3417, 3418, 3410, 3410, 3437, 3419, +- +- 1214, 3439, 3420, 3421, 3422, 3423, 3424, 3426, 3427, 3428, +- 3429, 3430, 3440, 3432, 3441, 3433, 3443, 1213, 3438, 3434, +- 3436, 3438, 3445, 3438, 3449, 3451, 3437, 3454, 3438, 3439, +- 3454, 3438, 3479, 3480, 3489, 3479, 3480, 3489, 3480, 3456, +- 3440, 1212, 3441, 1208, 3443, 3438, 3457, 3458, 3459, 3460, +- 3445, 3461, 3449, 3451, 3462, 1207, 3431, 3452, 3452, 3452, +- 3452, 3452, 3452, 3452, 3452, 3452, 3453, 3456, 3455, 3453, +- 1206, 3453, 1192, 3438, 3457, 3458, 3459, 3460, 3464, 3461, +- 3465, 3468, 3462, 3453, 3453, 3453, 3453, 3453, 3453, 3453, +- 3453, 3453, 3455, 3455, 3455, 3455, 3455, 3455, 3455, 3455, +- +- 3455, 3455, 3455, 3469, 3470, 3471, 3464, 3472, 3465, 3468, +- 3473, 1190, 3474, 3473, 3475, 3476, 3477, 3455, 3467, 3467, +- 3467, 3467, 3467, 3467, 3467, 3467, 3467, 3482, 3483, 3485, +- 3486, 3469, 3470, 3471, 3487, 3472, 3492, 1185, 3497, 3473, +- 3474, 3667, 3475, 3476, 3477, 3481, 3484, 1157, 3481, 3484, +- 3481, 3484, 3667, 1152, 1142, 3482, 3483, 3485, 3486, 3496, +- 3490, 3498, 3487, 3490, 3492, 3496, 3497, 3473, 3491, 3491, +- 3491, 3491, 3491, 3491, 3491, 3491, 3491, 3490, 3490, 3490, +- 3490, 3490, 3490, 3490, 3490, 3490, 3499, 3496, 3501, 3498, +- 3502, 3503, 3504, 3496, 3505, 3506, 3508, 3511, 3513, 3514, +- +- 3515, 3516, 3517, 3520, 3521, 3523, 3524, 3538, 3546, 3550, +- 3538, 3546, 3550, 1131, 3499, 1129, 3501, 1127, 3502, 3503, +- 3504, 3526, 3505, 3506, 3508, 3511, 3513, 3514, 3515, 3516, +- 3517, 3520, 3521, 3523, 3524, 3525, 3525, 3525, 3525, 3525, +- 3525, 3525, 3525, 3525, 3525, 3525, 3527, 3528, 3531, 3526, +- 3532, 3533, 3534, 3536, 3537, 3622, 3625, 1126, 3622, 3625, +- 3525, 3539, 3539, 3539, 3539, 3539, 3539, 3539, 3539, 3539, +- 3543, 3544, 3545, 3547, 3527, 3528, 3531, 3548, 3532, 3533, +- 3534, 3536, 3537, 3540, 3540, 3540, 3540, 3540, 3540, 3540, +- 3540, 3540, 3541, 3549, 3551, 3541, 3552, 3553, 3543, 3544, +- +- 3545, 3547, 3555, 3556, 3558, 3548, 3559, 3560, 3562, 3541, +- 3541, 3541, 3541, 3541, 3541, 3541, 3541, 3541, 1112, 1111, +- 3557, 3549, 3551, 3557, 3552, 3553, 3561, 1107, 3569, 3561, +- 3555, 3556, 3558, 3570, 3559, 3560, 3562, 3557, 3557, 3557, +- 3557, 3557, 3557, 3557, 3557, 3557, 3564, 3567, 3572, 3564, +- 3567, 3564, 3567, 3573, 3574, 3561, 3569, 3628, 1106, 1105, +- 3628, 3570, 3628, 3690, 3693, 3579, 3690, 3693, 3690, 3693, +- 3575, 3762, 3763, 1104, 3762, 3763, 3572, 3576, 1103, 1063, +- 3576, 3573, 3574, 3561, 3575, 3575, 3575, 3575, 3575, 3575, +- 3575, 3575, 3575, 3579, 3576, 3576, 3576, 3576, 3576, 3576, +- +- 3576, 3576, 3576, 3577, 3577, 3577, 3577, 3577, 3577, 3577, +- 3577, 3577, 3580, 3581, 3583, 3585, 3586, 3587, 3588, 3589, +- 3590, 3591, 3592, 3593, 3594, 3595, 3596, 3597, 3598, 3601, +- 3605, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, 3620, +- 3580, 3581, 3583, 3585, 3586, 3587, 3588, 3589, 3590, 3591, +- 3592, 3593, 3594, 3595, 3596, 3597, 3598, 3601, 3605, 3606, +- 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, 3606, +- 3607, 3608, 3609, 3612, 3614, 3615, 3618, 3696, 3618, 3618, +- 3696, 3618, 3696, 1011, 3606, 3621, 3623, 3803, 3627, 3618, +- 3803, 3629, 3619, 3630, 3631, 3632, 3633, 3635, 3607, 3608, +- +- 3609, 3612, 3614, 3615, 3619, 3619, 3619, 3619, 3619, 3619, +- 3619, 3619, 3619, 3621, 3623, 3624, 3627, 3807, 3624, 3629, +- 3807, 3630, 3631, 3632, 3633, 3635, 3636, 3639, 3640, 3643, +- 3648, 3649, 3624, 3624, 3624, 3624, 3624, 3624, 3624, 3624, +- 3624, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, 3634, +- 3638, 3650, 3736, 3638, 3636, 3639, 3640, 3643, 3648, 3649, +- 3618, 3652, 3653, 3736, 1010, 990, 977, 3638, 3638, 3638, +- 3638, 3638, 3638, 3638, 3638, 3638, 3644, 3651, 3654, 3650, +- 3644, 3656, 3657, 3658, 3659, 3660, 3661, 3644, 3662, 3652, +- 3653, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, 3651, +- +- 3663, 3664, 3665, 3668, 3644, 3670, 3654, 3676, 3644, 3656, +- 3657, 3658, 3659, 3660, 3661, 3644, 3662, 3678, 3680, 3682, +- 3689, 3683, 3691, 3683, 3683, 966, 3683, 946, 3663, 3664, +- 3665, 3668, 3698, 3670, 3683, 3676, 3684, 3699, 3684, 3684, +- 3700, 3684, 3701, 3702, 3703, 3678, 3680, 3682, 3689, 3684, +- 3691, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, 3692, +- 3698, 3704, 3706, 3707, 3710, 3699, 3711, 3712, 3700, 3713, +- 3701, 3702, 3703, 3705, 3705, 3705, 3705, 3705, 3705, 3705, +- 3705, 3705, 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3704, +- 3706, 3707, 3710, 3724, 3711, 3712, 3725, 3713, 3727, 3728, +- +- 3729, 3731, 3732, 3735, 3740, 3683, 3742, 3743, 3746, 3750, +- 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3753, 3743, 3754, +- 3684, 3724, 3755, 3756, 3725, 3757, 3727, 3728, 3729, 3731, +- 3732, 3735, 3740, 3758, 3742, 3743, 3746, 3748, 3759, 3760, +- 3748, 3761, 3748, 3764, 3761, 3753, 3743, 3754, 3765, 3766, +- 3755, 3756, 3767, 3757, 3768, 3770, 3771, 3773, 3774, 3750, +- 3791, 3758, 3775, 3776, 3777, 3778, 3759, 3760, 3779, 3783, +- 3784, 3764, 3785, 3786, 3788, 3793, 3765, 3795, 3796, 3798, +- 3767, 3799, 3768, 3770, 3771, 3773, 3774, 3800, 3761, 3801, +- 3775, 3776, 3777, 3778, 3802, 3804, 3779, 3783, 3784, 3766, +- +- 3785, 3786, 3788, 3809, 3810, 3795, 3796, 3798, 3805, 3799, +- 3791, 3805, 3811, 3805, 3812, 3800, 3761, 3801, 3813, 3816, +- 3817, 3806, 3802, 3804, 3806, 3793, 3806, 3808, 3818, 3819, +- 3808, 3809, 3810, 3820, 3821, 3824, 3825, 3828, 3830, 3825, +- 3811, 3831, 3812, 3832, 3833, 3835, 3813, 3816, 3817, 3836, +- 3838, 3839, 928, 3838, 3847, 3840, 3818, 3819, 3840, 3862, +- 3840, 3820, 3821, 3824, 3849, 3842, 3830, 3850, 3842, 3831, +- 3842, 3832, 3833, 3835, 3851, 3844, 3853, 3836, 3844, 3839, +- 3844, 3845, 3847, 3854, 3845, 3855, 3845, 3828, 3856, 3857, +- 3863, 3865, 3849, 3861, 3858, 3850, 3861, 3864, 3861, 3866, +- +- 3864, 3869, 3851, 3867, 3853, 3858, 3867, 3872, 3858, 3862, +- 3872, 3854, 3872, 3855, 3877, 3878, 3856, 3857, 3863, 3865, +- 3874, 3879, 3858, 3874, 3880, 3874, 3881, 3866, 3882, 3869, +- 3883, 3884, 3885, 3858, 3886, 3887, 3858, 3893, 3896, 903, +- 891, 3891, 3877, 3878, 3891, 3895, 3891, 880, 3895, 3879, +- 3894, 878, 3880, 3894, 3881, 876, 3882, 872, 3883, 3884, +- 3885, 3897, 3886, 3887, 3897, 3893, 3896, 3894, 3894, 3894, +- 3894, 3894, 3894, 3894, 3894, 3894, 3898, 3903, 3897, 3897, +- 3897, 3897, 3897, 3897, 3897, 3897, 3897, 3904, 3905, 3908, +- 3910, 3911, 3912, 3913, 3917, 3917, 3917, 3917, 3917, 3917, +- +- 3917, 3917, 3917, 828, 3898, 3903, 3918, 3919, 817, 3918, +- 3919, 808, 804, 3921, 3924, 3904, 3905, 3908, 3910, 3911, +- 3912, 3913, 3925, 3918, 3918, 3918, 3918, 3918, 3918, 3918, +- 3918, 3918, 3920, 3920, 3920, 3920, 3920, 3920, 3920, 3920, +- 3920, 3921, 3924, 3926, 3929, 3930, 3938, 3941, 3943, 773, +- 3925, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, 3933, +- 3934, 772, 770, 3934, 769, 768, 766, 3944, 3945, 3946, +- 3948, 3926, 3929, 3930, 3938, 3941, 3943, 3934, 3934, 3934, +- 3934, 3934, 3934, 3934, 3934, 3934, 3942, 3942, 3942, 3942, +- 3942, 3942, 3942, 3942, 3942, 3944, 3945, 3946, 3948, 3949, +- +- 3950, 761, 760, 758, 757, 756, 750, 743, 732, 731, +- 712, 700, 689, 677, 676, 671, 670, 668, 661, 651, +- 650, 648, 644, 634, 633, 631, 628, 3949, 3950, 3953, +- 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3953, +- 3953, 3953, 3953, 3953, 3953, 3953, 3953, 3954, 3954, 3954, +- 3954, 3954, 3954, 3954, 3954, 3954, 3954, 3954, 3954, 3954, +- 3954, 3954, 3954, 3954, 3954, 3955, 3955, 3955, 3955, 3955, +- 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3955, +- 3955, 3955, 3955, 3956, 3956, 3956, 3956, 3956, 3956, 3956, +- 3956, 3956, 3956, 3956, 3956, 3956, 3956, 3956, 3956, 3956, +- +- 3956, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, +- 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3957, 3958, +- 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3958, +- 3958, 3958, 3958, 3958, 3958, 3958, 3958, 3959, 3959, 3959, +- 3959, 3959, 3959, 3959, 3959, 3959, 3959, 3959, 3959, 3959, +- 3959, 3959, 3959, 3959, 3959, 3960, 3960, 3960, 3960, 3960, +- 3960, 3960, 3960, 3960, 3960, 3960, 3960, 3960, 3960, 3960, +- 3960, 3960, 3960, 3961, 3961, 3961, 3961, 3961, 3961, 3961, +- 3961, 3961, 3961, 3961, 3961, 3961, 3961, 3961, 3961, 3961, +- 3961, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, +- +- 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3962, 3963, +- 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3963, +- 3963, 3963, 3963, 3963, 3963, 3963, 3963, 3964, 3964, 3964, +- 3964, 3964, 3964, 3964, 3964, 3964, 3964, 3964, 3964, 3964, +- 3964, 3964, 3964, 3964, 3964, 3965, 3965, 3965, 3965, 3965, +- 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, +- 3965, 3965, 3965, 3966, 3966, 3966, 3966, 3966, 3966, 3966, +- 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, +- 3966, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, +- 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3968, +- ++ 2016, 2009, 2010, 2011, 2017, 2018, 2012, 2019, 2300, 2166, ++ 2299, 2021, 2166, 2022, 2166, 2178, 2013, 2023, 2178, 2014, ++ 2178, 2015, 2196, 2024, 2025, 2196, 2026, 2196, 2016, 2027, ++ 2028, 2029, 2017, 2018, 2030, 2019, 2020, 2020, 2020, 2021, ++ 2020, 2022, 2020, 2020, 2031, 2023, 2020, 2020, 2020, 2032, ++ 2020, 2024, 2025, 2020, 2026, 2020, 2033, 2027, 2028, 2029, ++ 2034, 2035, 2030, 2036, 2020, 2020, 2020, 2037, 2020, 2038, ++ 2020, 2020, 2031, 2039, 2020, 2020, 2020, 2032, 2020, 2040, ++ ++ 2041, 2020, 2042, 2020, 2033, 2043, 2044, 2045, 2034, 2035, ++ 2046, 2036, 2049, 2050, 2051, 2037, 2052, 2038, 2057, 2058, ++ 2059, 2039, 2060, 2061, 2062, 2063, 2064, 2040, 2041, 2065, ++ 2042, 2065, 2068, 2043, 2044, 2045, 2069, 2072, 2046, 2075, ++ 2049, 2050, 2051, 2073, 2052, 2073, 2057, 2058, 2059, 2076, ++ 2060, 2061, 2062, 2063, 2064, 2077, 2089, 2065, 2078, 2065, ++ 2068, 2079, 2080, 2081, 2069, 2072, 2090, 2082, 2083, 2084, ++ 2085, 2073, 2086, 2073, 2091, 2094, 2095, 2096, 2097, 2098, ++ 2099, 2100, 2101, 2077, 2075, 2102, 2078, 2103, 2107, 2079, ++ 2080, 2081, 2285, 2283, 2076, 2082, 2083, 2084, 2085, 2282, ++ ++ 2086, 2089, 2108, 2094, 2095, 2096, 2097, 2098, 2099, 2100, ++ 2101, 2090, 2104, 2102, 2104, 2103, 2107, 2260, 2209, 2091, ++ 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2209, ++ 2108, 2246, 2109, 2110, 2111, 2143, 2112, 2113, 2110, 2115, ++ 2104, 2116, 2104, 2105, 2105, 2105, 2105, 2105, 2105, 2105, ++ 2105, 2105, 2117, 2118, 2119, 2105, 2120, 2105, 2105, 2105, ++ 2109, 2110, 2111, 2105, 2112, 2113, 2110, 2115, 2105, 2116, ++ 2121, 2122, 2124, 2125, 2126, 2127, 2128, 2105, 2129, 2130, ++ 2117, 2118, 2119, 2105, 2120, 2105, 2105, 2105, 2131, 2132, ++ 2133, 2105, 2134, 2135, 2137, 2138, 2105, 2139, 2121, 2122, ++ ++ 2124, 2125, 2126, 2127, 2128, 2105, 2129, 2130, 2140, 2141, ++ 2144, 2144, 2144, 2144, 2146, 2146, 2131, 2132, 2133, 2149, ++ 2134, 2135, 2137, 2138, 2151, 2139, 2147, 2147, 2147, 2147, ++ 2148, 2148, 2152, 2153, 2154, 2156, 2140, 2141, 2157, 2158, ++ 2142, 2159, 2160, 2161, 2162, 2163, 2164, 2149, 2165, 2168, ++ 2167, 2169, 2151, 2167, 2170, 2171, 2284, 2055, 2172, 2173, ++ 2152, 2153, 2154, 2156, 2174, 2144, 2157, 2158, 2146, 2159, ++ 2160, 2161, 2162, 2163, 2164, 2175, 2165, 2168, 2176, 2169, ++ 2177, 2147, 2170, 2171, 2148, 2155, 2172, 2173, 2155, 2053, ++ 2167, 2048, 2174, 2180, 2181, 2182, 2183, 2184, 2185, 2186, ++ ++ 2187, 2284, 2188, 2175, 2155, 1967, 2176, 2189, 2177, 2191, ++ 2192, 2193, 2194, 2197, 2198, 2199, 2200, 2155, 2167, 2155, ++ 2201, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2155, ++ 2188, 2155, 2155, 2155, 2203, 2189, 2204, 2191, 2192, 2193, ++ 2194, 2197, 2198, 2199, 2200, 2155, 2202, 2155, 2201, 2202, ++ 2205, 2207, 2208, 2211, 2210, 2212, 2213, 2155, 2214, 2155, ++ 2155, 2155, 2203, 2215, 2204, 2210, 2216, 2217, 2218, 2219, ++ 2220, 2221, 2222, 2223, 2224, 2216, 2225, 2226, 2205, 2207, ++ 2208, 2211, 2227, 2212, 2213, 2229, 2214, 2230, 2228, 2231, ++ 2236, 2215, 2237, 2238, 2216, 2217, 2218, 2219, 2220, 2221, ++ ++ 2222, 2223, 2224, 2228, 2225, 2226, 2239, 2240, 2241, 2242, ++ 2227, 2243, 2244, 2229, 2245, 2230, 2228, 2231, 2236, 2247, ++ 2237, 2238, 2248, 2249, 2250, 2251, 2256, 2257, 2259, 2263, ++ 2264, 2228, 2266, 2267, 2239, 2240, 2241, 2242, 2268, 2243, ++ 2244, 2269, 2245, 2270, 2271, 2272, 2279, 2247, 2280, 2281, ++ 2248, 2249, 2250, 2251, 2256, 2257, 2259, 2263, 2264, 2286, ++ 2266, 2267, 2288, 2289, 2290, 2291, 2268, 2292, 2293, 2269, ++ 2294, 2270, 2271, 2272, 2279, 2295, 2280, 2281, 2296, 2302, ++ 2304, 2305, 2306, 1952, 2298, 2307, 2308, 2298, 2309, 2298, ++ 2288, 2289, 2290, 2291, 2298, 2292, 2293, 2298, 2294, 2310, ++ ++ 2311, 2312, 2314, 2295, 2286, 2315, 2296, 2316, 2318, 2305, ++ 2306, 2298, 2319, 2307, 2308, 2368, 2309, 1948, 2368, 1946, ++ 2368, 1918, 2320, 2322, 2302, 2304, 2321, 2310, 2311, 2312, ++ 2314, 2321, 2323, 2315, 2317, 2316, 2318, 2324, 2325, 2298, ++ 2319, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2317, ++ 2320, 2322, 2326, 2327, 2321, 2328, 2329, 2330, 2331, 2321, ++ 2323, 2332, 2334, 2335, 2336, 2324, 2325, 2338, 2341, 2343, ++ 2344, 2345, 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2356, ++ 2326, 2327, 2358, 2328, 2329, 2330, 2331, 1901, 2363, 2332, ++ 2334, 2335, 2336, 2364, 2367, 2338, 2341, 2343, 2344, 2345, ++ ++ 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2356, 2360, 2360, ++ 2358, 2360, 2362, 2362, 2370, 2362, 2363, 2366, 2372, 2371, ++ 2369, 2364, 2367, 2369, 2366, 2371, 2373, 2374, 2375, 2376, ++ 2377, 2378, 2379, 2377, 2380, 1900, 2381, 2382, 2383, 2816, ++ 2384, 2385, 2370, 1897, 2389, 2366, 2372, 2371, 1861, 2390, ++ 2816, 2391, 2366, 2371, 2373, 2374, 2375, 2376, 2392, 2378, ++ 2379, 2393, 2380, 2360, 2381, 2382, 2383, 2362, 2384, 2385, ++ 2387, 2388, 2389, 2387, 2388, 2387, 2388, 2390, 2360, 2391, ++ 2394, 2395, 2362, 2396, 2398, 2399, 2392, 2398, 2401, 2393, ++ 2402, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 2410, 2412, ++ ++ 2413, 2414, 2415, 2417, 2418, 2420, 2421, 2419, 2394, 2395, ++ 2419, 2396, 2422, 2399, 2423, 2422, 2401, 2422, 2402, 2403, ++ 2404, 2405, 2406, 2407, 2408, 2409, 2410, 2412, 2413, 2414, ++ 2415, 2417, 2418, 2420, 2421, 2424, 2425, 2426, 2427, 2430, ++ 2431, 2433, 2423, 2435, 2436, 2438, 2439, 2440, 2441, 2442, ++ 2443, 2445, 2446, 2447, 2435, 2448, 1830, 2449, 2450, 2451, ++ 2453, 2454, 2455, 2424, 2425, 2426, 2427, 2430, 2431, 2433, ++ 2457, 2458, 2436, 2438, 2439, 2440, 2441, 2442, 2443, 2445, ++ 2446, 2447, 2459, 2448, 2435, 2449, 2450, 2451, 2453, 2454, ++ 2455, 2461, 2462, 2463, 2464, 2465, 2466, 2467, 2457, 2458, ++ ++ 2468, 2469, 2470, 2471, 2474, 2475, 2476, 2478, 2479, 2480, ++ 2459, 2484, 2485, 2489, 2491, 2492, 2493, 2494, 2495, 2461, ++ 2462, 2463, 2464, 2465, 2466, 2467, 2496, 2497, 2468, 2469, ++ 2470, 2471, 2474, 2475, 2476, 2478, 2479, 2480, 2498, 2484, ++ 2485, 2499, 2501, 2505, 2493, 2494, 2495, 2504, 2516, 2512, ++ 2819, 1761, 2514, 2515, 2496, 2497, 1760, 2505, 2489, 2491, ++ 2492, 2819, 2503, 2518, 2504, 2503, 2498, 2503, 2506, 2499, ++ 2501, 2506, 2503, 2506, 2507, 2503, 2516, 2507, 2506, 2507, ++ 2519, 2520, 1759, 2508, 2507, 2505, 2508, 2507, 2508, 2503, ++ 2521, 2518, 2504, 2508, 2512, 2506, 2508, 2514, 2515, 2522, ++ ++ 2524, 2507, 2525, 2526, 2528, 2529, 2530, 2531, 2519, 2520, ++ 2508, 2532, 2533, 2534, 2535, 2536, 2537, 2503, 2521, 2538, ++ 2539, 2540, 2541, 2506, 2542, 2543, 2544, 2522, 2524, 2507, ++ 2525, 2526, 2528, 2529, 2530, 2531, 2545, 2546, 2508, 2532, ++ 2533, 2534, 2535, 2536, 2537, 2547, 2548, 2538, 2539, 2540, ++ 2541, 2549, 2542, 2543, 2544, 2550, 2552, 2554, 2555, 2556, ++ 2557, 2558, 2559, 2560, 2545, 2546, 2561, 2563, 2563, 2568, ++ 2563, 2569, 2570, 2547, 2548, 2566, 2566, 2571, 2566, 2549, ++ 2575, 2576, 2577, 2550, 2552, 2554, 2555, 2556, 2557, 2558, ++ 2559, 2560, 2574, 2578, 2561, 2574, 2579, 2568, 2580, 2569, ++ ++ 2570, 2581, 1732, 2582, 2584, 2571, 2585, 2587, 2575, 2576, ++ 2577, 2583, 2588, 2589, 2583, 2590, 2583, 1728, 2591, 2595, ++ 2596, 2578, 2563, 2597, 2579, 2598, 2580, 2599, 2600, 2581, ++ 2566, 2582, 2584, 2604, 2585, 2587, 2602, 2563, 2602, 2603, ++ 2588, 2589, 2603, 2590, 2606, 2566, 2591, 2595, 2596, 2607, ++ 2608, 2597, 2609, 2598, 2611, 2599, 2600, 2612, 2613, 2614, ++ 2615, 2604, 2614, 2616, 2602, 2617, 2602, 2618, 2619, 2621, ++ 2622, 2623, 2606, 2625, 2623, 2629, 2623, 2607, 2608, 2615, ++ 2609, 2631, 2611, 2624, 2624, 2612, 2613, 2627, 2615, 2632, ++ 2627, 2616, 2627, 2617, 2633, 2618, 2619, 2621, 2622, 2634, ++ ++ 2635, 2625, 2636, 2629, 2637, 2638, 2640, 2615, 2641, 2631, ++ 2642, 2624, 2624, 2643, 2644, 2645, 2646, 2632, 2647, 2648, ++ 2649, 2650, 2633, 2651, 2652, 2653, 2654, 2634, 2635, 2657, ++ 2636, 2658, 2637, 2638, 2640, 2659, 2641, 2660, 2642, 2661, ++ 2662, 2643, 2644, 2645, 2646, 2663, 2647, 2648, 2649, 2650, ++ 2664, 2651, 2652, 2653, 2654, 2665, 2667, 2657, 2668, 2658, ++ 2669, 2670, 2671, 2659, 2672, 2660, 2674, 2661, 2662, 2675, ++ 2676, 2678, 2679, 2663, 2680, 2681, 2682, 2683, 2664, 2684, ++ 2685, 2687, 2688, 2665, 2667, 2689, 2668, 2690, 2669, 2670, ++ 2671, 2691, 2672, 2692, 2674, 1719, 2710, 2675, 2676, 2678, ++ ++ 2679, 2699, 2680, 2681, 2682, 2683, 2695, 2702, 2782, 2687, ++ 2688, 2782, 2700, 2689, 2701, 2690, 2711, 2701, 2699, 2691, ++ 2695, 2692, 1715, 2696, 2684, 2685, 2696, 2697, 2696, 2700, ++ 2697, 2701, 2697, 2696, 1713, 2702, 2696, 2697, 1711, 2703, ++ 2697, 2710, 2703, 1701, 2703, 2712, 2699, 2713, 2695, 2703, ++ 2696, 2714, 2703, 2704, 2697, 2716, 2704, 2700, 2704, 2705, ++ 2717, 2711, 2705, 2704, 2705, 1659, 2703, 2783, 2718, 2705, ++ 2783, 2707, 2705, 2712, 2707, 2713, 2707, 2719, 2696, 2714, ++ 2704, 2707, 2697, 2716, 2707, 2720, 2705, 2721, 2717, 1649, ++ 2708, 2722, 2723, 2708, 2703, 2708, 2718, 2724, 2707, 2725, ++ ++ 2708, 2726, 2727, 2708, 2728, 2719, 2729, 2730, 2704, 2731, ++ 2732, 2734, 2735, 2720, 2705, 2721, 2736, 2708, 2737, 2722, ++ 2723, 2738, 2739, 2740, 2741, 2724, 2707, 2725, 2742, 2726, ++ 2727, 2743, 2728, 2744, 2729, 2730, 2745, 2731, 2732, 2734, ++ 2735, 2746, 2748, 2749, 2736, 2708, 2737, 2750, 2751, 2738, ++ 2739, 2740, 2741, 2752, 2753, 2755, 2742, 2756, 2760, 2743, ++ 2761, 2744, 2762, 2763, 2745, 2764, 2765, 2766, 2767, 2746, ++ 2748, 2749, 2770, 2771, 2772, 2750, 2751, 2773, 2774, 2775, ++ 2776, 2752, 2753, 2755, 2779, 2756, 2760, 2780, 2761, 2781, ++ 2762, 2763, 2785, 2764, 2765, 2766, 2767, 2786, 2789, 2790, ++ ++ 2770, 2771, 2772, 2791, 2793, 2773, 2774, 2775, 2776, 2794, ++ 2788, 2795, 2779, 2788, 2796, 2780, 2797, 2781, 2798, 2797, ++ 2785, 2797, 2792, 2799, 2800, 2786, 2789, 2790, 2801, 2802, ++ 2792, 2792, 2793, 2792, 2791, 2792, 2803, 2794, 2804, 2795, ++ 2805, 2808, 2796, 2809, 2810, 2814, 2798, 2815, 2817, 2820, ++ 2792, 2799, 2800, 2821, 2822, 2823, 2801, 2802, 2792, 2792, ++ 2824, 2792, 2791, 2792, 2803, 2825, 2804, 2826, 2805, 2808, ++ 2829, 2809, 2810, 2814, 2830, 2815, 2817, 2820, 2831, 2832, ++ 2833, 2821, 2822, 2823, 2829, 2834, 2836, 2837, 2824, 2838, ++ 2839, 2840, 2841, 2825, 2842, 2826, 2834, 2843, 2829, 2844, ++ ++ 2845, 2846, 2830, 2848, 2849, 2850, 2831, 2832, 2833, 2851, ++ 2852, 2853, 2854, 2855, 2836, 2837, 2856, 2838, 2839, 2840, ++ 2841, 2857, 2842, 2858, 2859, 2843, 2860, 2844, 2845, 2846, ++ 2861, 2848, 2849, 2850, 2862, 2863, 2864, 2851, 2852, 2853, ++ 2854, 2855, 2865, 2866, 2856, 2867, 2868, 2869, 2871, 2857, ++ 2873, 2858, 2859, 2892, 2860, 1579, 2892, 2952, 2861, 2995, ++ 2952, 1574, 2862, 2863, 2864, 2898, 2871, 2873, 2881, 1572, ++ 2995, 2866, 2895, 2867, 2868, 2869, 2871, 2958, 2872, 2875, ++ 2958, 2872, 2875, 2872, 2875, 2881, 1550, 2865, 2872, 2875, ++ 2900, 2872, 2901, 2898, 2871, 2873, 1546, 2876, 2877, 2882, ++ ++ 2876, 2877, 2876, 2877, 2883, 2872, 2875, 2876, 2877, 2878, ++ 2876, 2877, 2878, 2881, 2878, 2884, 2882, 2895, 2900, 2878, ++ 2901, 2883, 2878, 2902, 2876, 2877, 2903, 2904, 2973, 2905, ++ 2906, 2973, 2884, 2872, 2875, 2886, 2878, 1529, 2886, 2907, ++ 2886, 1528, 1525, 2980, 2882, 2886, 2980, 3054, 2886, 2883, ++ 3054, 2902, 2876, 2877, 2903, 2904, 2888, 2905, 2906, 2888, ++ 2884, 2888, 2886, 1471, 2878, 2889, 2888, 2907, 2889, 2888, ++ 2889, 2890, 1470, 2909, 2890, 2889, 2890, 2891, 2889, 1463, ++ 2891, 2890, 2891, 2888, 2910, 1462, 2893, 2891, 2912, 2893, ++ 2886, 2893, 2889, 2914, 2916, 2917, 2893, 2894, 2890, 2893, ++ ++ 2894, 2909, 2894, 2918, 2891, 2920, 2921, 2894, 2922, 2923, ++ 2894, 2888, 2910, 2893, 2924, 2925, 2912, 2926, 2927, 2928, ++ 2889, 2914, 2916, 2917, 2894, 2929, 2890, 2930, 2934, 2935, ++ 2936, 2918, 2891, 2920, 2921, 2938, 2922, 2923, 2939, 2940, ++ 2941, 2893, 2924, 2925, 2942, 2926, 2927, 2928, 2943, 2945, ++ 2947, 2948, 2894, 2929, 2949, 2930, 2934, 2935, 2936, 2950, ++ 2951, 2953, 2955, 2938, 2956, 2957, 2939, 2940, 2941, 2962, ++ 2959, 2963, 2942, 2959, 2965, 2959, 2943, 2945, 2947, 2948, ++ 2966, 2967, 2949, 2968, 2969, 2970, 2972, 2950, 2951, 2953, ++ 2955, 2977, 2956, 2957, 2971, 2978, 2974, 2962, 2976, 2963, ++ ++ 2974, 2976, 2965, 2976, 2979, 2971, 2971, 2974, 2966, 2967, ++ 2981, 2968, 2969, 2970, 2972, 2982, 2983, 2984, 2986, 2977, ++ 2987, 2988, 2971, 2978, 2974, 2992, 2993, 2996, 2974, 2998, ++ 2999, 3000, 2979, 2971, 2971, 2974, 3001, 3002, 2981, 3003, ++ 3004, 3005, 3007, 2982, 2983, 2984, 2986, 3008, 2987, 2988, ++ 3006, 3006, 3009, 2992, 2993, 2996, 3010, 2998, 2999, 3000, ++ 3011, 3012, 3014, 3015, 3001, 3002, 3016, 3003, 3004, 3005, ++ 3007, 3017, 3018, 3019, 3020, 3008, 3021, 3022, 3006, 3006, ++ 3009, 3023, 3024, 3026, 3010, 3025, 3028, 3029, 3011, 3012, ++ 3014, 3015, 3023, 3030, 3016, 3032, 3025, 3034, 1461, 3017, ++ ++ 3018, 3019, 3020, 3035, 3021, 3022, 3036, 3038, 3039, 3040, ++ 3024, 3026, 3041, 3042, 3028, 3029, 3044, 3045, 3046, 3048, ++ 3049, 3030, 3023, 3032, 3065, 3034, 3025, 3065, 3055, 3070, ++ 3071, 3035, 3292, 3046, 3036, 3038, 3039, 3040, 3053, 3102, ++ 3041, 3042, 3102, 3292, 3044, 3045, 3046, 3048, 3049, 3051, ++ 3072, 3061, 3051, 3074, 3051, 3053, 3055, 3070, 3071, 3051, ++ 3056, 3046, 3051, 3056, 3057, 3056, 3076, 3057, 3061, 3057, ++ 3056, 3062, 3058, 3056, 3057, 3058, 3051, 3058, 3072, 3078, ++ 1406, 3074, 3058, 3053, 3079, 3058, 3080, 3056, 3062, 3114, ++ 3059, 3057, 3114, 3059, 3076, 3059, 3061, 1405, 3118, 3058, ++ ++ 3059, 3118, 3142, 3059, 3051, 3142, 3081, 3078, 3064, 3083, ++ 3084, 3064, 3079, 3064, 3080, 3056, 3062, 3059, 3064, 3057, ++ 3066, 3064, 3085, 3066, 3086, 3066, 3067, 3058, 3087, 3067, ++ 3066, 3067, 3088, 3066, 3081, 3064, 3067, 3083, 3084, 3067, ++ 3089, 3090, 3092, 3093, 3094, 3059, 3095, 3066, 3097, 3098, ++ 3085, 3099, 3086, 3067, 3100, 3101, 3087, 3103, 3104, 3105, ++ 3088, 3107, 3108, 3064, 3109, 3110, 3111, 3113, 3089, 3090, ++ 3092, 3093, 3094, 3116, 3095, 3066, 3097, 3098, 3655, 3099, ++ 3657, 3067, 3100, 3101, 1394, 3103, 3104, 3105, 3112, 3107, ++ 3108, 3112, 3109, 3110, 3111, 3113, 3121, 3120, 3122, 3124, ++ ++ 3120, 3116, 3120, 3125, 3126, 3112, 3112, 3112, 3112, 3112, ++ 3112, 3112, 3112, 3112, 3127, 3128, 3129, 3130, 3131, 3132, ++ 3133, 3135, 3241, 1370, 3121, 3241, 3122, 3124, 3655, 1369, ++ 3657, 3125, 3126, 3134, 3136, 3137, 3134, 3139, 3140, 3141, ++ 3143, 3144, 3127, 3128, 3129, 3130, 3131, 3132, 3133, 3135, ++ 3134, 3134, 3134, 3134, 3134, 3134, 3134, 3134, 3134, 3145, ++ 3146, 3148, 3136, 3137, 3149, 3139, 3140, 3141, 3143, 3144, ++ 3150, 3152, 3153, 3155, 3156, 3157, 3159, 3160, 3162, 3163, ++ 3164, 3165, 3166, 3167, 3169, 3170, 3171, 3145, 3146, 3148, ++ 3172, 3173, 3149, 3175, 3176, 3177, 3178, 3180, 3150, 3152, ++ ++ 3153, 3155, 3156, 3157, 3159, 3160, 3162, 3163, 3164, 3165, ++ 3166, 3167, 3169, 3170, 3171, 3182, 3185, 3188, 3172, 3173, ++ 3189, 3175, 3176, 3177, 3178, 3180, 3191, 3193, 3188, 3194, ++ 1365, 3195, 3196, 3197, 3198, 3199, 3201, 3202, 3203, 3204, ++ 3205, 3206, 3245, 3182, 3185, 3245, 3219, 3245, 3189, 3273, ++ 3220, 3205, 3273, 3281, 3191, 3193, 3281, 3194, 3188, 3195, ++ 3196, 3197, 3198, 3199, 3201, 3202, 3203, 3204, 3205, 3206, ++ 3207, 3208, 1364, 3207, 3219, 3207, 1363, 3213, 3220, 3205, ++ 3207, 3210, 3211, 3207, 3210, 3211, 3210, 3211, 3208, 1362, ++ 3212, 3210, 3211, 3212, 3213, 3212, 1361, 3207, 1359, 3221, ++ ++ 3212, 3214, 3215, 3212, 3214, 3215, 3214, 3215, 3210, 3211, ++ 3222, 3214, 3215, 3223, 3214, 3215, 3208, 3212, 3225, 3226, ++ 1327, 3217, 3213, 3227, 3217, 3207, 3217, 3221, 3214, 3215, ++ 3229, 3217, 3230, 3231, 3217, 3232, 3210, 3211, 3222, 3218, ++ 3233, 3223, 3218, 3234, 3218, 3212, 3225, 3226, 3217, 3218, ++ 3237, 3227, 3218, 3238, 3239, 3240, 3214, 3215, 3229, 3242, ++ 3230, 3231, 3243, 3232, 3246, 3247, 3218, 3248, 3233, 3249, ++ 3250, 3234, 3251, 3252, 3253, 1323, 3217, 3285, 3237, 1294, ++ 3285, 3238, 3239, 3240, 3255, 3260, 3287, 3242, 3260, 3287, ++ 3243, 1286, 3246, 3247, 3218, 3248, 3256, 3249, 3250, 3256, ++ ++ 3251, 3252, 3253, 3254, 3254, 3254, 3254, 3254, 3254, 3254, ++ 3254, 3254, 3255, 3256, 3256, 3256, 3256, 3256, 3256, 3256, ++ 3256, 3256, 3257, 3259, 3262, 3263, 3264, 3265, 3266, 3267, ++ 3268, 3260, 3269, 3270, 3271, 3272, 3272, 3272, 3272, 3272, ++ 3272, 3272, 3272, 3272, 3274, 3275, 3277, 3278, 3279, 3282, ++ 3257, 3259, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 3260, ++ 3269, 3270, 3271, 3283, 3284, 3286, 3288, 3289, 3290, 3291, ++ 3293, 3294, 3274, 3275, 3277, 3278, 3279, 3282, 3295, 3296, ++ 3298, 3299, 3300, 3301, 3302, 3306, 3307, 3308, 3309, 3310, ++ 3313, 3283, 3284, 3286, 3288, 3289, 3290, 3291, 3293, 3294, ++ ++ 3314, 3315, 3318, 3320, 3321, 3322, 3295, 3296, 3298, 3299, ++ 3300, 3301, 3302, 3306, 3307, 3308, 3309, 3310, 3313, 3316, ++ 3323, 3324, 3325, 3326, 3327, 3329, 3330, 3316, 3314, 3315, ++ 3318, 3320, 3321, 3322, 3331, 3332, 3333, 3334, 3338, 3360, ++ 3336, 3338, 3360, 1284, 1279, 1274, 3341, 3316, 3323, 3324, ++ 3325, 3326, 3327, 3329, 3330, 3316, 3335, 3336, 3342, 3335, ++ 3343, 3335, 3331, 3332, 3333, 3334, 3335, 3337, 3339, 3335, ++ 3337, 3339, 3337, 3339, 3341, 3344, 3345, 3337, 3339, 3340, ++ 3337, 3339, 3340, 3335, 3340, 3336, 3342, 3348, 3343, 3340, ++ 3350, 3352, 3340, 3353, 3337, 3339, 3354, 3355, 3356, 3358, ++ ++ 1217, 3361, 3364, 3344, 3345, 3365, 3340, 3366, 3367, 3368, ++ 3369, 3335, 3370, 3371, 3372, 3348, 3374, 3390, 3350, 3352, ++ 3390, 3353, 3337, 3339, 3354, 3355, 3356, 3358, 3359, 3361, ++ 3364, 3359, 3409, 3365, 3340, 3366, 3367, 3368, 3369, 1216, ++ 3370, 3371, 3372, 3409, 3374, 3359, 3359, 3359, 3359, 3359, ++ 3359, 3359, 3359, 3359, 3362, 3362, 3362, 3362, 3362, 3362, ++ 3362, 3362, 3362, 3362, 3362, 3363, 3363, 3363, 3363, 3363, ++ 3363, 3363, 3363, 3363, 3363, 3363, 3376, 3378, 1215, 3362, ++ 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3373, 3377, ++ 3363, 3380, 3377, 3381, 3382, 3383, 3384, 3385, 3386, 3387, ++ ++ 3388, 3393, 3394, 1214, 3376, 3378, 3377, 3377, 3377, 3377, ++ 3377, 3377, 3377, 3377, 3377, 3391, 3396, 3392, 3391, 3380, ++ 3392, 3381, 3382, 3383, 3384, 3385, 3386, 3387, 3388, 3393, ++ 3394, 3395, 3397, 3398, 3395, 3399, 3400, 3462, 3399, 3400, ++ 3462, 3414, 1213, 3403, 3396, 3401, 3405, 3407, 3401, 3411, ++ 3412, 3413, 3414, 3415, 3416, 3418, 1212, 1208, 3419, 3420, ++ 3397, 3398, 3401, 3401, 3401, 3401, 3401, 3401, 3401, 3401, ++ 3401, 3403, 3421, 3422, 3405, 3407, 3417, 3411, 3412, 3413, ++ 3423, 3415, 3416, 3418, 3417, 3417, 3419, 3420, 3424, 3425, ++ 3426, 3427, 3428, 3429, 3430, 3431, 3432, 3434, 3435, 3436, ++ ++ 3421, 3422, 3437, 3438, 3417, 3439, 3440, 3439, 3423, 3441, ++ 3442, 3444, 3417, 3417, 3445, 1207, 3424, 3425, 3426, 3427, ++ 3428, 3429, 3430, 3431, 3432, 3434, 3435, 3436, 3447, 3448, ++ 3437, 3438, 3449, 3451, 3440, 3453, 3457, 3441, 3442, 3444, ++ 3446, 3459, 3445, 3446, 3464, 3446, 3465, 3466, 3467, 3487, ++ 3446, 3497, 3487, 3446, 3497, 3547, 3447, 3448, 3547, 3555, ++ 3449, 3451, 3555, 3453, 3457, 3468, 3469, 3446, 3470, 3459, ++ 3472, 3473, 3464, 3476, 3465, 3466, 3467, 3439, 3460, 3460, ++ 3460, 3460, 3460, 3460, 3460, 3460, 3460, 3461, 3559, 3463, ++ 3461, 3559, 3461, 3468, 3469, 3446, 3470, 3488, 3472, 3473, ++ ++ 3488, 3476, 3488, 1206, 3461, 3461, 3461, 3461, 3461, 3461, ++ 3461, 3461, 3461, 3463, 3463, 3463, 3463, 3463, 3463, 3463, ++ 3463, 3463, 3463, 3463, 3475, 3475, 3475, 3475, 3475, 3475, ++ 3475, 3475, 3475, 3477, 3478, 3479, 3480, 3481, 3463, 3482, ++ 3481, 3483, 3484, 3485, 3489, 3490, 3491, 3489, 3492, 3489, ++ 3493, 3492, 3494, 3492, 3495, 3500, 3632, 3635, 1192, 3632, ++ 3635, 3477, 3478, 3479, 3480, 3677, 3481, 3482, 3505, 3483, ++ 3484, 3485, 3573, 3490, 3491, 3573, 3677, 3573, 3493, 1190, ++ 3494, 3498, 3495, 3500, 3498, 3499, 3499, 3499, 3499, 3499, ++ 3499, 3499, 3499, 3499, 3481, 3506, 3505, 3507, 3498, 3498, ++ ++ 3498, 3498, 3498, 3498, 3498, 3498, 3498, 3504, 3509, 3510, ++ 3511, 3512, 3513, 3504, 3514, 3515, 3517, 3520, 3522, 3523, ++ 3524, 3525, 3526, 3506, 3529, 3507, 3530, 3532, 3533, 3576, ++ 3774, 1185, 3576, 3774, 3576, 3504, 3509, 3510, 3511, 3512, ++ 3513, 3504, 3514, 3515, 3517, 3520, 3522, 3523, 3524, 3525, ++ 3526, 3535, 3529, 3536, 3530, 3532, 3533, 3534, 3534, 3534, ++ 3534, 3534, 3534, 3534, 3534, 3534, 3534, 3534, 3537, 3540, ++ 3541, 3542, 3543, 3545, 3546, 3638, 1157, 1152, 3638, 3535, ++ 3638, 3536, 3534, 3548, 3548, 3548, 3548, 3548, 3548, 3548, ++ 3548, 3548, 3552, 3553, 3554, 3556, 3537, 3540, 3541, 3542, ++ ++ 3543, 3545, 3546, 3549, 3549, 3549, 3549, 3549, 3549, 3549, ++ 3549, 3549, 3550, 3557, 3558, 3550, 3560, 3561, 3562, 3564, ++ 3552, 3553, 3554, 3556, 3565, 3567, 3568, 3569, 3571, 3550, ++ 3550, 3550, 3550, 3550, 3550, 3550, 3550, 3550, 3578, 3579, ++ 3566, 3557, 3558, 3566, 3560, 3561, 3562, 3564, 3570, 1142, ++ 3581, 3570, 3565, 3567, 3568, 3569, 3571, 3566, 3566, 3566, ++ 3566, 3566, 3566, 3566, 3566, 3566, 3578, 3579, 3582, 3583, ++ 3584, 3588, 3589, 3590, 3592, 3594, 3595, 3570, 3581, 3596, ++ 3597, 3598, 3599, 3600, 3584, 3584, 3584, 3584, 3584, 3584, ++ 3584, 3584, 3584, 1131, 1129, 3585, 3582, 3583, 3585, 3588, ++ ++ 3589, 3590, 3592, 3594, 3595, 3570, 3601, 3596, 3597, 3598, ++ 3599, 3600, 3585, 3585, 3585, 3585, 3585, 3585, 3585, 3585, ++ 3585, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, 3586, ++ 3602, 3603, 3604, 3605, 3601, 3606, 3607, 3608, 3611, 3615, ++ 1127, 3617, 3618, 3616, 3616, 3616, 3616, 3616, 3616, 3616, ++ 3616, 3616, 3616, 3616, 3619, 3622, 3624, 3625, 3602, 3603, ++ 3604, 3605, 1126, 3606, 3607, 3608, 3611, 3615, 3616, 3617, ++ 3618, 3775, 1112, 3628, 3775, 3628, 3628, 3629, 3628, 3631, ++ 3633, 1111, 3619, 3622, 3624, 3625, 3628, 3637, 3639, 3629, ++ 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3629, 3630, 3630, ++ ++ 3630, 3630, 3630, 3630, 3630, 3630, 3630, 3631, 3633, 3634, ++ 3640, 3641, 3634, 3642, 3643, 3637, 3639, 3644, 3644, 3644, ++ 3644, 3644, 3644, 3644, 3644, 3644, 3634, 3634, 3634, 3634, ++ 3634, 3634, 3634, 3634, 3634, 3645, 3646, 1107, 3640, 3641, ++ 3701, 3642, 3643, 3701, 1106, 3701, 3649, 3650, 3648, 3653, ++ 3654, 3648, 3658, 3659, 3654, 3660, 3662, 3628, 3663, 3664, ++ 3666, 3654, 1105, 3645, 3646, 3648, 3648, 3648, 3648, 3648, ++ 3648, 3648, 3648, 3648, 3649, 3650, 3661, 3653, 3654, 3667, ++ 3658, 3659, 3654, 3660, 3662, 3668, 3663, 3664, 3666, 3654, ++ 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3661, 3669, ++ ++ 3670, 3671, 3672, 3673, 3674, 3675, 3676, 3667, 3678, 3679, ++ 3681, 3687, 3689, 3668, 3691, 3693, 1104, 3700, 3704, 3678, ++ 1103, 3704, 1063, 3704, 3702, 3740, 3709, 3669, 3670, 3671, ++ 3672, 3673, 3674, 3675, 3676, 1011, 3740, 3679, 3681, 3687, ++ 3689, 1010, 3691, 3693, 3694, 3700, 3694, 3694, 3695, 3694, ++ 3695, 3695, 3702, 3695, 3709, 3707, 3710, 3694, 3707, 3711, ++ 3707, 3695, 3703, 3703, 3703, 3703, 3703, 3703, 3703, 3703, ++ 3703, 3712, 3713, 3714, 3715, 3716, 3716, 3716, 3716, 3716, ++ 3716, 3716, 3716, 3716, 3710, 3717, 3718, 3711, 3721, 3722, ++ 3723, 3724, 3726, 3728, 3729, 3730, 3731, 3732, 3733, 3712, ++ ++ 3713, 3714, 3715, 3734, 3748, 3735, 3736, 3738, 3739, 3741, ++ 3743, 3744, 3747, 3717, 3718, 3748, 3721, 3722, 3723, 3724, ++ 3752, 3728, 3729, 3730, 3731, 3732, 3733, 3754, 3694, 3758, ++ 3755, 3734, 3695, 3735, 3736, 3738, 3739, 3741, 3743, 3744, ++ 3747, 3755, 3726, 3762, 3760, 3765, 3766, 3760, 3752, 3760, ++ 3767, 3768, 3769, 3770, 3771, 3754, 3772, 3758, 3755, 3773, ++ 3776, 3777, 3773, 3778, 3779, 990, 3780, 3782, 3783, 3755, ++ 3785, 3786, 3787, 3765, 3766, 3788, 3789, 3791, 3767, 3768, ++ 3769, 3770, 3771, 3792, 3772, 3804, 3796, 3797, 3776, 3777, ++ 3798, 3799, 3779, 3762, 3780, 3782, 3783, 3801, 3785, 3786, ++ ++ 3787, 3806, 3808, 3788, 3789, 3791, 3773, 977, 3809, 3811, ++ 3812, 3792, 3813, 3778, 3796, 3797, 3814, 3815, 3798, 3799, ++ 3816, 3817, 3822, 3816, 3818, 3801, 3823, 3818, 3819, 3818, ++ 3808, 3819, 3824, 3819, 3773, 3804, 3809, 3811, 3812, 3820, ++ 3813, 3825, 3820, 3821, 3814, 3815, 3821, 3826, 3829, 3817, ++ 3822, 3806, 3830, 3831, 3823, 3832, 3833, 3834, 3837, 3838, ++ 3824, 3841, 3838, 3843, 3844, 3845, 3846, 3848, 3849, 3825, ++ 3851, 3852, 3875, 3851, 3853, 3826, 3829, 3853, 3860, 3853, ++ 3830, 3831, 3862, 3832, 3833, 3834, 3837, 3863, 3864, 3866, ++ 3867, 3843, 3844, 3845, 3846, 3848, 3849, 3855, 3857, 3852, ++ ++ 3855, 3857, 3855, 3857, 3858, 3868, 3860, 3858, 3869, 3858, ++ 3862, 3841, 3870, 3871, 3876, 3863, 3864, 3866, 3867, 3878, ++ 3874, 3879, 3875, 3874, 3871, 3874, 3877, 3871, 3880, 3877, ++ 3882, 3880, 3885, 3868, 3890, 3885, 3869, 3885, 3891, 3892, ++ 3870, 3871, 3876, 3887, 3893, 3894, 3887, 3878, 3887, 3879, ++ 3895, 3896, 3871, 3897, 3898, 3871, 3899, 3900, 3882, 3906, ++ 3904, 3908, 3890, 3904, 3908, 3904, 3891, 3892, 966, 3909, ++ 3911, 3907, 3893, 3894, 3907, 946, 928, 3932, 3895, 3896, ++ 3932, 3897, 3898, 3910, 3899, 3900, 3910, 3906, 3907, 3907, ++ 3907, 3907, 3907, 3907, 3907, 3907, 3907, 3909, 3911, 3916, ++ ++ 3910, 3910, 3910, 3910, 3910, 3910, 3910, 3910, 3910, 3917, ++ 3918, 3921, 3923, 3924, 3925, 3926, 3930, 3930, 3930, 3930, ++ 3930, 3930, 3930, 3930, 3930, 903, 891, 3916, 3931, 880, ++ 878, 3931, 876, 872, 828, 3934, 3937, 3917, 3918, 3921, ++ 3923, 3924, 3925, 3926, 3938, 3931, 3931, 3931, 3931, 3931, ++ 3931, 3931, 3931, 3931, 3933, 3933, 3933, 3933, 3933, 3933, ++ 3933, 3933, 3933, 3934, 3937, 3939, 3942, 3943, 3951, 3954, ++ 3956, 817, 3938, 3946, 3946, 3946, 3946, 3946, 3946, 3946, ++ 3946, 3946, 3947, 808, 804, 3947, 773, 772, 770, 3957, ++ 3958, 3959, 3961, 3939, 3942, 3943, 3951, 3954, 3956, 3947, ++ ++ 3947, 3947, 3947, 3947, 3947, 3947, 3947, 3947, 3955, 3955, ++ 3955, 3955, 3955, 3955, 3955, 3955, 3955, 3957, 3958, 3959, ++ 3961, 3962, 3963, 769, 768, 766, 761, 760, 758, 757, ++ 756, 750, 743, 732, 731, 712, 700, 689, 677, 676, ++ 671, 670, 668, 661, 651, 650, 648, 644, 634, 3962, ++ 3963, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, ++ 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3966, 3967, ++ 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3967, ++ 3967, 3967, 3967, 3967, 3967, 3967, 3967, 3968, 3968, 3968, + 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3968, +- 3968, 3968, 3968, 3968, 3968, 3968, 3968, 3969, 3969, 3969, ++ ++ 3968, 3968, 3968, 3968, 3968, 3969, 3969, 3969, 3969, 3969, + 3969, 3969, 3969, 3969, 3969, 3969, 3969, 3969, 3969, 3969, +- 3969, 3969, 3969, 3969, 3969, 3970, 3970, 3970, 3970, 3970, ++ 3969, 3969, 3969, 3970, 3970, 3970, 3970, 3970, 3970, 3970, + 3970, 3970, 3970, 3970, 3970, 3970, 3970, 3970, 3970, 3970, +- 3970, 3970, 3970, 3971, 3971, 3971, 3971, 3971, 3971, 3971, +- 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, +- 3971, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, +- 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3973, ++ 3970, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, ++ 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3971, 3972, ++ 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3972, ++ 3972, 3972, 3972, 3972, 3972, 3972, 3972, 3973, 3973, 3973, + 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3973, ++ 3973, 3973, 3973, 3973, 3973, 3974, 3974, 3974, 3974, 3974, + +- 3973, 3973, 3973, 3973, 3973, 3973, 3973, 3974, 3974, 3974, + 3974, 3974, 3974, 3974, 3974, 3974, 3974, 3974, 3974, 3974, +- 3974, 3974, 3974, 3974, 3974, 3975, 3975, 3975, 3975, 3975, ++ 3974, 3974, 3974, 3975, 3975, 3975, 3975, 3975, 3975, 3975, + 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, 3975, +- 3975, 3975, 3975, 3976, 3976, 627, 3976, 3976, 3976, 3976, +- 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, +- 3976, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, +- 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3978, ++ 3975, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, ++ 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3976, 3977, ++ 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3977, ++ 3977, 3977, 3977, 3977, 3977, 3977, 3977, 3978, 3978, 3978, + 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3978, +- 3978, 3978, 3978, 3978, 3978, 3978, 3978, 3979, 3979, 3979, +- ++ 3978, 3978, 3978, 3978, 3978, 3979, 3979, 3979, 3979, 3979, + 3979, 3979, 3979, 3979, 3979, 3979, 3979, 3979, 3979, 3979, +- 3979, 3979, 3979, 3979, 3979, 3980, 3980, 3980, 3980, 3980, ++ ++ 3979, 3979, 3979, 3980, 3980, 3980, 3980, 3980, 3980, 3980, + 3980, 3980, 3980, 3980, 3980, 3980, 3980, 3980, 3980, 3980, +- 3980, 3980, 3980, 3981, 3981, 3981, 3981, 3981, 3981, 3981, +- 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, +- 3981, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, +- 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3983, ++ 3980, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, ++ 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3981, 3982, ++ 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3982, ++ 3982, 3982, 3982, 3982, 3982, 3982, 3982, 3983, 3983, 3983, + 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3983, +- 3983, 3983, 3983, 3983, 3983, 3983, 3983, 3984, 3984, 3984, ++ 3983, 3983, 3983, 3983, 3983, 3984, 3984, 3984, 3984, 3984, + 3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, 3984, ++ 3984, 3984, 3984, 3985, 3985, 3985, 3985, 3985, 3985, 3985, + +- 3984, 3984, 3984, 3984, 3984, 3985, 3985, 3985, 3985, 3985, + 3985, 3985, 3985, 3985, 3985, 3985, 3985, 3985, 3985, 3985, +- 3985, 3985, 3985, 3986, 3986, 3986, 3986, 3986, 3986, 3986, +- 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, +- 3986, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, +- 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3988, ++ 3985, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, ++ 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3986, 3987, ++ 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3987, ++ 3987, 3987, 3987, 3987, 3987, 3987, 3987, 3988, 3988, 3988, + 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3988, +- 3988, 3988, 3988, 3988, 3988, 3988, 3988, 3989, 3989, 3989, ++ 3988, 3988, 3988, 3988, 3988, 3989, 3989, 633, 3989, 3989, + 3989, 3989, 3989, 3989, 3989, 3989, 3989, 3989, 3989, 3989, +- 3989, 3989, 3989, 3989, 3989, 3990, 3990, 3990, 3990, 3990, +- ++ 3989, 3989, 3989, 3990, 3990, 3990, 3990, 3990, 3990, 3990, + 3990, 3990, 3990, 3990, 3990, 3990, 3990, 3990, 3990, 3990, +- 3990, 3990, 3990, 3991, 3991, 3991, 3991, 3991, 3991, 3991, +- 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, +- 3991, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, +- 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3993, ++ ++ 3990, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, ++ 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3991, 3992, ++ 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3992, ++ 3992, 3992, 3992, 3992, 3992, 3992, 3992, 3993, 3993, 3993, + 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3993, +- 3993, 3993, 3993, 3993, 3993, 3993, 3993, 3994, 3994, 625, ++ 3993, 3993, 3993, 3993, 3993, 3994, 3994, 3994, 3994, 3994, + 3994, 3994, 3994, 3994, 3994, 3994, 3994, 3994, 3994, 3994, +- 3994, 3994, 3994, 3994, 3994, 3995, 3995, 622, 3995, 3995, ++ 3994, 3994, 3994, 3995, 3995, 3995, 3995, 3995, 3995, 3995, + 3995, 3995, 3995, 3995, 3995, 3995, 3995, 3995, 3995, 3995, ++ 3995, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, + +- 3995, 3995, 3995, 3996, 3996, 621, 3996, 3996, 3996, 3996, +- 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, +- 3996, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, +- 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3998, ++ 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3996, 3997, ++ 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3997, ++ 3997, 3997, 3997, 3997, 3997, 3997, 3997, 3998, 3998, 3998, + 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3998, +- 3998, 3998, 3998, 3998, 3998, 3998, 3998, 3999, 3999, 3999, ++ 3998, 3998, 3998, 3998, 3998, 3999, 3999, 3999, 3999, 3999, + 3999, 3999, 3999, 3999, 3999, 3999, 3999, 3999, 3999, 3999, +- 3999, 3999, 3999, 3999, 3999, 4000, 4000, 4000, 4000, 4000, ++ 3999, 3999, 3999, 4000, 4000, 4000, 4000, 4000, 4000, 4000, + 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, +- 4000, 4000, 4000, 4001, 4001, 541, 4001, 4001, 4001, 4001, ++ 4000, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, ++ 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4002, + +- 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, 4001, +- 4001, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, +- 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4003, ++ 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4002, ++ 4002, 4002, 4002, 4002, 4002, 4002, 4002, 4003, 4003, 4003, + 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4003, +- 4003, 4003, 4003, 4003, 4003, 4003, 4003, 4004, 4004, 4004, ++ 4003, 4003, 4003, 4003, 4003, 4004, 4004, 4004, 4004, 4004, + 4004, 4004, 4004, 4004, 4004, 4004, 4004, 4004, 4004, 4004, +- 4004, 4004, 4004, 537, 4004, 4005, 4005, 4005, 4005, 4005, ++ 4004, 4004, 4004, 4005, 4005, 4005, 4005, 4005, 4005, 4005, + 4005, 4005, 4005, 4005, 4005, 4005, 4005, 4005, 4005, 4005, +- 4005, 4005, 4005, 4006, 4006, 4006, 4006, 4006, 4006, 4006, +- 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 536, ++ 4005, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, ++ 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4006, 4007, ++ 4007, 631, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, + +- 4006, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, +- 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4008, ++ 4007, 4007, 4007, 4007, 4007, 4007, 4007, 4008, 4008, 628, + 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4008, +- 4008, 4008, 4008, 4008, 4008, 4008, 4008, 4009, 4009, 4009, ++ 4008, 4008, 4008, 4008, 4008, 4009, 4009, 627, 4009, 4009, + 4009, 4009, 4009, 4009, 4009, 4009, 4009, 4009, 4009, 4009, +- 4009, 4009, 4009, 4009, 4009, 4010, 4010, 4010, 4010, 4010, ++ 4009, 4009, 4009, 4010, 4010, 4010, 4010, 4010, 4010, 4010, + 4010, 4010, 4010, 4010, 4010, 4010, 4010, 4010, 4010, 4010, +- 4010, 4010, 4010, 4011, 530, 4011, 4011, 529, 513, 4011, +- 4011, 4011, 4011, 4011, 512, 4011, 4011, 4011, 4011, 4011, ++ 4010, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, ++ 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4011, 4012, + 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, ++ 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4013, 4013, 4013, + +- 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4012, 4013, 4013, + 4013, 4013, 4013, 4013, 4013, 4013, 4013, 4013, 4013, 4013, +- 4013, 4013, 4013, 4013, 506, 4013, 4014, 4014, 4014, 4014, ++ 4013, 4013, 4013, 4013, 4013, 4014, 4014, 625, 4014, 4014, + 4014, 4014, 4014, 4014, 4014, 4014, 4014, 4014, 4014, 4014, +- 4014, 4014, 4014, 4014, 4015, 4015, 4015, 4015, 4015, 4015, ++ 4014, 4014, 4014, 4015, 4015, 4015, 4015, 4015, 4015, 4015, + 4015, 4015, 4015, 4015, 4015, 4015, 4015, 4015, 4015, 4015, +- 4015, 4015, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, +- 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, +- 4017, 504, 4017, 4017, 490, 478, 4017, 4017, 4017, 4017, +- 4017, 475, 4017, 4017, 4017, 4017, 4017, 4018, 4018, 4018, +- ++ 4015, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, ++ 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4016, 4017, ++ 4017, 4017, 4017, 4017, 4017, 4017, 4017, 4017, 4017, 4017, ++ 4017, 4017, 4017, 4017, 4017, 622, 4017, 4018, 4018, 4018, + 4018, 4018, 4018, 4018, 4018, 4018, 4018, 4018, 4018, 4018, ++ + 4018, 4018, 4018, 4018, 4018, 4019, 4019, 4019, 4019, 4019, + 4019, 4019, 4019, 4019, 4019, 4019, 4019, 4019, 4019, 4019, +- 4019, 453, 4019, 4020, 4020, 4020, 4020, 4020, 4020, 4020, ++ 4019, 621, 4019, 4020, 4020, 4020, 4020, 4020, 4020, 4020, + 4020, 4020, 4020, 4020, 4020, 4020, 4020, 4020, 4020, 4020, + 4020, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, + 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4021, 4022, + 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4022, + 4022, 4022, 4022, 4022, 4022, 4022, 4022, 4023, 4023, 4023, + 4023, 4023, 4023, 4023, 4023, 4023, 4023, 4023, 4023, 4023, ++ 4023, 4023, 4023, 4023, 4023, 4024, 541, 4024, 4024, 537, + +- 4023, 4023, 4023, 440, 4023, 4024, 4024, 434, 4024, 4024, +- 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, +- 4024, 4024, 4024, 4025, 4025, 422, 4025, 4025, 4025, 4025, ++ 536, 4024, 4024, 4024, 4024, 4024, 530, 4024, 4024, 4024, ++ 4024, 4024, 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, + 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, 4025, +- 4025, 4026, 4026, 413, 4026, 4026, 4026, 4026, 4026, 4026, +- 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4027, ++ 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, 4026, ++ 4026, 4026, 4026, 4026, 4026, 4026, 529, 4026, 4027, 4027, + 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4027, +- 4027, 4027, 4027, 4027, 4027, 4027, 4027, 4028, 4028, 4028, ++ 4027, 4027, 4027, 4027, 4027, 4027, 4028, 4028, 4028, 4028, + 4028, 4028, 4028, 4028, 4028, 4028, 4028, 4028, 4028, 4028, +- 4028, 4028, 4028, 412, 4028, 4029, 4029, 4029, 4029, 4029, +- ++ 4028, 4028, 4028, 4028, 4029, 4029, 4029, 4029, 4029, 4029, + 4029, 4029, 4029, 4029, 4029, 4029, 4029, 4029, 4029, 4029, +- 4029, 4029, 4029, 4030, 4030, 4030, 4030, 4030, 4030, 4030, +- 4030, 4030, 4030, 4030, 4030, 4030, 4030, 4030, 4030, 393, +- 4030, 4031, 4031, 392, 4031, 4031, 4031, 4031, 4031, 4031, +- 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4032, ++ ++ 4029, 4029, 4030, 513, 4030, 4030, 512, 506, 4030, 4030, ++ 4030, 4030, 4030, 504, 4030, 4030, 4030, 4030, 4030, 4031, ++ 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4031, ++ 4031, 4031, 4031, 4031, 4031, 4031, 4031, 4032, 4032, 4032, + 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4032, +- 4032, 4032, 4032, 4032, 4032, 4032, 4032, 4033, 4033, 4033, ++ 4032, 4032, 4032, 490, 4032, 4033, 4033, 4033, 4033, 4033, + 4033, 4033, 4033, 4033, 4033, 4033, 4033, 4033, 4033, 4033, +- 4033, 4033, 4033, 4033, 4033, 4034, 4034, 4034, 4034, 4034, ++ 4033, 4033, 4033, 4034, 4034, 4034, 4034, 4034, 4034, 4034, + 4034, 4034, 4034, 4034, 4034, 4034, 4034, 4034, 4034, 4034, ++ 4034, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, + +- 4034, 4034, 4034, 4035, 4035, 4035, 4035, 4035, 4035, 4035, +- 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, +- 4035, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, +- 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4037, ++ 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4035, 4036, ++ 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, 4036, ++ 4036, 4036, 4036, 4036, 4036, 478, 4036, 4037, 4037, 475, + 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4037, +- 4037, 4037, 4037, 4037, 4037, 4037, 4037, 4038, 385, 4038, +- 4038, 383, 368, 4038, 4038, 4038, 4038, 4038, 367, 4038, +- 4038, 4038, 4038, 4038, 4038, 4039, 358, 4039, 4039, 357, +- 347, 4039, 4039, 4039, 4039, 4039, 317, 4039, 4039, 4039, +- 4039, 4039, 4039, 4040, 4040, 4040, 4040, 4040, 4040, 4040, +- +- 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, +- 4040, 4041, 316, 4041, 4041, 284, 268, 4041, 4041, 4041, +- 4041, 4041, 261, 4041, 4041, 4041, 4041, 4041, 4042, 4042, ++ 4037, 4037, 4037, 4037, 4037, 4038, 4038, 453, 4038, 4038, ++ 4038, 4038, 4038, 4038, 4038, 4038, 4038, 4038, 4038, 4038, ++ 4038, 4038, 4038, 4039, 4039, 440, 4039, 4039, 4039, 4039, ++ 4039, 4039, 4039, 4039, 4039, 4039, 4039, 4039, 4039, 4039, ++ 4039, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, ++ 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4040, 4041, ++ ++ 4041, 4041, 4041, 4041, 4041, 4041, 4041, 4041, 4041, 4041, ++ 4041, 4041, 4041, 4041, 4041, 434, 4041, 4042, 4042, 4042, + 4042, 4042, 4042, 4042, 4042, 4042, 4042, 4042, 4042, 4042, +- 4042, 4042, 4042, 4042, 4042, 4042, 4043, 4043, 4043, 4043, ++ 4042, 4042, 4042, 4042, 4042, 4043, 4043, 4043, 4043, 4043, + 4043, 4043, 4043, 4043, 4043, 4043, 4043, 4043, 4043, 4043, +- 4043, 4043, 4043, 4043, 4044, 4044, 4044, 4044, 4044, 4044, ++ 4043, 422, 4043, 4044, 4044, 413, 4044, 4044, 4044, 4044, + 4044, 4044, 4044, 4044, 4044, 4044, 4044, 4044, 4044, 4044, +- 4044, 4044, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, +- 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, ++ 4044, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, ++ 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4045, 4046, ++ 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4046, + +- 4046, 259, 4046, 4046, 252, 234, 4046, 4046, 4046, 4046, +- 4046, 229, 4046, 4046, 4046, 4046, 4046, 4046, 4047, 4047, ++ 4046, 4046, 4046, 4046, 4046, 4046, 4046, 4047, 4047, 4047, + 4047, 4047, 4047, 4047, 4047, 4047, 4047, 4047, 4047, 4047, +- 4047, 4047, 4047, 4047, 4047, 4047, 4048, 4048, 4048, 4048, ++ 4047, 4047, 4047, 4047, 4047, 4048, 4048, 4048, 4048, 4048, + 4048, 4048, 4048, 4048, 4048, 4048, 4048, 4048, 4048, 4048, +- 4048, 4048, 4048, 4048, 4049, 216, 4049, 4049, 194, 182, +- 4049, 4049, 4049, 4049, 4049, 175, 4049, 4049, 4049, 4049, ++ 4048, 4048, 4048, 4049, 4049, 4049, 4049, 4049, 4049, 4049, ++ 4049, 4049, 4049, 4049, 4049, 4049, 4049, 4049, 4049, 4049, + 4049, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, + 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4050, 4051, +- 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4051, ++ 412, 4051, 4051, 393, 392, 4051, 4051, 4051, 4051, 4051, ++ 385, 4051, 4051, 4051, 4051, 4051, 4051, 4052, 383, 4052, + +- 4051, 4051, 4051, 4051, 4051, 4051, 4051, 4052, 4052, 4052, +- 4052, 4052, 4052, 4052, 4052, 4052, 4052, 4052, 4052, 4052, ++ 4052, 368, 367, 4052, 4052, 4052, 4052, 4052, 358, 4052, + 4052, 4052, 4052, 4052, 4052, 4053, 4053, 4053, 4053, 4053, + 4053, 4053, 4053, 4053, 4053, 4053, 4053, 4053, 4053, 4053, +- 4053, 4053, 4053, 4054, 4054, 4054, 4054, 4054, 4054, 4054, +- 4054, 4054, 4054, 4054, 4054, 4054, 4054, 4054, 4054, 4054, +- 4054, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, +- 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4056, ++ 4053, 4053, 4053, 4054, 357, 4054, 4054, 347, 317, 4054, ++ 4054, 4054, 4054, 4054, 316, 4054, 4054, 4054, 4054, 4054, ++ 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, ++ 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4055, 4056, 4056, + 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4056, +- 4056, 4056, 4056, 4056, 4056, 4056, 4056, 4057, 4057, 4057, +- ++ 4056, 4056, 4056, 4056, 4056, 4056, 4057, 4057, 4057, 4057, + 4057, 4057, 4057, 4057, 4057, 4057, 4057, 4057, 4057, 4057, +- 4057, 4057, 4057, 4057, 4057, 4058, 4058, 4058, 4058, 4058, ++ ++ 4057, 4057, 4057, 4057, 4058, 4058, 4058, 4058, 4058, 4058, + 4058, 4058, 4058, 4058, 4058, 4058, 4058, 4058, 4058, 4058, +- 4058, 4058, 4058, 4059, 4059, 4059, 4059, 4059, 4059, 4059, +- 4059, 4059, 4059, 4059, 4059, 4059, 4059, 4059, 4059, 4059, +- 4059, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, +- 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4061, +- 4061, 172, 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, +- 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4062, 4062, 4062, +- 4062, 4062, 4062, 4062, 4062, 4062, 4062, 4062, 4062, 4062, +- +- 4062, 4062, 4062, 4062, 4062, 4063, 4063, 4063, 4063, 4063, ++ 4058, 4058, 4059, 284, 4059, 4059, 268, 261, 4059, 4059, ++ 4059, 4059, 4059, 259, 4059, 4059, 4059, 4059, 4059, 4059, ++ 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, ++ 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4060, 4061, 4061, ++ 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, 4061, ++ 4061, 4061, 4061, 4061, 4061, 4061, 4062, 252, 4062, 4062, ++ 234, 229, 4062, 4062, 4062, 4062, 4062, 216, 4062, 4062, ++ 4062, 4062, 4062, 4063, 4063, 4063, 4063, 4063, 4063, 4063, ++ + 4063, 4063, 4063, 4063, 4063, 4063, 4063, 4063, 4063, 4063, +- 4063, 4063, 4063, 4064, 4064, 4064, 4064, 4064, 4064, 4064, +- 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, +- 4064, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, +- 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4066, +- 165, 4066, 4066, 164, 163, 4066, 4066, 4066, 4066, 4066, +- 154, 4066, 4066, 4066, 4066, 4066, 4066, 4067, 152, 4067, +- 4067, 146, 141, 4067, 4067, 4067, 4067, 4067, 117, 4067, +- 4067, 4067, 4067, 4067, 4067, 4068, 75, 4068, 4068, 64, +- +- 63, 4068, 4068, 4068, 4068, 4068, 58, 4068, 4068, 4068, +- 4068, 4068, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, +- 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, +- 4070, 57, 4070, 4070, 56, 55, 4070, 4070, 4070, 4070, +- 4070, 54, 4070, 4070, 4070, 4070, 4070, 4070, 4071, 4071, ++ 4063, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, ++ 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4064, 4065, ++ 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4065, ++ 4065, 4065, 4065, 4065, 4065, 4065, 4065, 4066, 4066, 4066, ++ 4066, 4066, 4066, 4066, 4066, 4066, 4066, 4066, 4066, 4066, ++ 4066, 4066, 4066, 4066, 4066, 4067, 4067, 4067, 4067, 4067, ++ 4067, 4067, 4067, 4067, 4067, 4067, 4067, 4067, 4067, 4067, ++ 4067, 4067, 4067, 4068, 4068, 4068, 4068, 4068, 4068, 4068, ++ 4068, 4068, 4068, 4068, 4068, 4068, 4068, 4068, 4068, 4068, ++ ++ 4068, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, ++ 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4069, 4070, ++ 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4070, ++ 4070, 4070, 4070, 4070, 4070, 4070, 4070, 4071, 4071, 4071, + 4071, 4071, 4071, 4071, 4071, 4071, 4071, 4071, 4071, 4071, +- 4071, 4071, 4071, 4071, 4071, 4071, 4072, 53, 4072, 4072, +- 52, 51, 4072, 4072, 4072, 4072, 4072, 26, 4072, 4072, +- 4072, 4072, 4072, 4072, 4073, 4073, 4073, 4073, 4073, 4073, ++ 4071, 4071, 4071, 4071, 4071, 4072, 4072, 4072, 4072, 4072, ++ 4072, 4072, 4072, 4072, 4072, 4072, 4072, 4072, 4072, 4072, ++ 4072, 4072, 4072, 4073, 4073, 4073, 4073, 4073, 4073, 4073, + 4073, 4073, 4073, 4073, 4073, 4073, 4073, 4073, 4073, 4073, ++ 4073, 4074, 4074, 194, 4074, 4074, 4074, 4074, 4074, 4074, + +- 4073, 4073, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, +- 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, +- 4075, 25, 4075, 4075, 24, 23, 4075, 4075, 4075, 4075, +- 4075, 0, 4075, 4075, 4075, 4075, 4075, 4076, 4076, 4076, ++ 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4074, 4075, ++ 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4075, ++ 4075, 4075, 4075, 4075, 4075, 4075, 4075, 4076, 4076, 4076, + 4076, 4076, 4076, 4076, 4076, 4076, 4076, 4076, 4076, 4076, + 4076, 4076, 4076, 4076, 4076, 4077, 4077, 4077, 4077, 4077, + 4077, 4077, 4077, 4077, 4077, 4077, 4077, 4077, 4077, 4077, + 4077, 4077, 4077, 4078, 4078, 4078, 4078, 4078, 4078, 4078, + 4078, 4078, 4078, 4078, 4078, 4078, 4078, 4078, 4078, 4078, +- 4078, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4079, ++ 4078, 4079, 182, 4079, 4079, 175, 172, 4079, 4079, 4079, ++ 4079, 4079, 165, 4079, 4079, 4079, 4079, 4079, 4079, 4080, + +- 0, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4079, 4080, +- 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4080, +- 4080, 4080, 4080, 4080, 4080, 4080, 4080, 4081, 4081, 4081, +- 4081, 4081, 4081, 4081, 4081, 4081, 4081, 4081, 4081, 4081, +- 4081, 4081, 4081, 4081, 4081, 4082, 4082, 4082, 4082, 4082, ++ 164, 4080, 4080, 163, 154, 4080, 4080, 4080, 4080, 4080, ++ 152, 4080, 4080, 4080, 4080, 4080, 4080, 4081, 146, 4081, ++ 4081, 141, 117, 4081, 4081, 4081, 4081, 4081, 75, 4081, ++ 4081, 4081, 4081, 4081, 4082, 4082, 4082, 4082, 4082, 4082, + 4082, 4082, 4082, 4082, 4082, 4082, 4082, 4082, 4082, 4082, +- 4082, 4082, 4082, 4083, 4083, 4083, 4083, 4083, 4083, 4083, +- 4083, 4083, 4083, 4083, 4083, 4083, 4083, 4083, 4083, 4083, +- 4083, 4084, 4084, 0, 4084, 4084, 4084, 4084, 4084, 4084, +- 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4085, ++ 4082, 4082, 4083, 64, 4083, 4083, 63, 58, 4083, 4083, ++ 4083, 4083, 4083, 57, 4083, 4083, 4083, 4083, 4083, 4083, ++ 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, ++ 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4084, 4085, 56, ++ 4085, 4085, 55, 54, 4085, 4085, 4085, 4085, 4085, 53, + +- 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4085, +- 4085, 4085, 4085, 4085, 4085, 4085, 4085, 4086, 4086, 4086, ++ 4085, 4085, 4085, 4085, 4085, 4085, 4086, 4086, 4086, 4086, + 4086, 4086, 4086, 4086, 4086, 4086, 4086, 4086, 4086, 4086, +- 4086, 4086, 4086, 4086, 4086, 4087, 4087, 4087, 4087, 4087, ++ 4086, 4086, 4086, 4086, 4087, 4087, 4087, 4087, 4087, 4087, + 4087, 4087, 4087, 4087, 4087, 4087, 4087, 4087, 4087, 4087, +- 4087, 4087, 4087, 4088, 0, 4088, 4088, 0, 0, 4088, +- 4088, 4088, 4088, 4088, 0, 4088, 4088, 4088, 4088, 4088, +- 4088, 4089, 0, 4089, 4089, 0, 0, 4089, 4089, 4089, +- 4089, 4089, 0, 4089, 4089, 4089, 4089, 4089, 4089, 4090, ++ 4087, 4087, 4088, 52, 4088, 4088, 51, 26, 4088, 4088, ++ 4088, 4088, 4088, 25, 4088, 4088, 4088, 4088, 4088, 4089, ++ 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4089, ++ 4089, 4089, 4089, 4089, 4089, 4089, 4089, 4090, 4090, 4090, + 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4090, ++ 4090, 4090, 4090, 4090, 4090, 4091, 4091, 4091, 4091, 4091, + +- 4090, 4090, 4090, 4090, 4090, 4090, 4090, 4091, 0, 4091, +- 4091, 0, 0, 4091, 4091, 4091, 4091, 4091, 0, 4091, +- 4091, 4091, 4091, 4091, 4091, 4092, 4092, 4092, 4092, 4092, +- 4092, 4092, 4092, 4092, 4092, 4092, 4092, 4092, 4092, 4092, +- 4092, 4092, 4092, 4093, 0, 4093, 4093, 0, 0, 4093, +- 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, ++ 4091, 4091, 4091, 4091, 4091, 4091, 4091, 4091, 4091, 4091, ++ 4091, 4091, 4091, 4092, 4092, 4092, 4092, 4092, 4092, 4092, ++ 4092, 4092, 24, 4092, 4092, 4092, 4092, 4092, 4092, 4092, ++ 4092, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, ++ 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4093, 4094, + 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, +- 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4095, 4095, ++ 4094, 4094, 4094, 4094, 4094, 4094, 4094, 4095, 4095, 4095, + 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, +- 4095, 4095, 4095, 4095, 4095, 4095, 4096, 0, 4096, 4096, ++ 4095, 4095, 4095, 4095, 4095, 4096, 4096, 4096, 4096, 4096, ++ 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, + +- 0, 0, 4096, 4096, 4096, 0, 4096, 4096, 4096, 4096, +- 4096, 4096, 4096, 4096, 4097, 4097, 4097, 4097, 4097, 4097, +- 4097, 0, 4097, 0, 4097, 4097, 4097, 4097, 4097, 4097, +- 4097, 4097, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, +- 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, ++ 4096, 4096, 4096, 4097, 4097, 23, 4097, 4097, 4097, 4097, ++ 4097, 4097, 4097, 4097, 4097, 4097, 4097, 4097, 4097, 4097, ++ 4097, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, ++ 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4098, 4099, + 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, +- 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4100, 4100, ++ 4099, 4099, 4099, 4099, 4099, 4099, 4099, 4100, 4100, 4100, + 4100, 4100, 4100, 4100, 4100, 4100, 4100, 4100, 4100, 4100, +- 4100, 4100, 4100, 4100, 4100, 4100, 4101, 4101, 4101, 4101, +- 4101, 4101, 4101, 4101, 4101, 4101, 4101, 4101, 4101, 4101, +- +- 4101, 4101, 4101, 4101, 4102, 4102, 0, 4102, 4102, 4102, +- 4102, 4102, 4102, 4102, 4102, 4102, 4102, 4102, 4102, 4102, +- 4102, 4102, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, +- 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, +- 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, +- 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4104, 4105, 0, +- 0, 4105, 0, 0, 4105, 4106, 0, 0, 0, 0, +- 0, 4106, 4106, 4106, 0, 4106, 4106, 4106, 4106, 4106, +- 4106, 4106, 4106, 4107, 4107, 4107, 4107, 4107, 4107, 4107, ++ 4100, 4100, 4100, 4100, 4100, 4101, 0, 4101, 4101, 0, ++ 0, 4101, 4101, 4101, 4101, 4101, 0, 4101, 4101, 4101, ++ 4101, 4101, 4101, 4102, 0, 4102, 4102, 0, 0, 4102, ++ ++ 4102, 4102, 4102, 4102, 0, 4102, 4102, 4102, 4102, 4102, ++ 4102, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, ++ 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4103, 4104, ++ 0, 4104, 4104, 0, 0, 4104, 4104, 4104, 4104, 4104, ++ 0, 4104, 4104, 4104, 4104, 4104, 4104, 4105, 4105, 4105, ++ 4105, 4105, 4105, 4105, 4105, 4105, 4105, 4105, 4105, 4105, ++ 4105, 4105, 4105, 4105, 4105, 4106, 0, 4106, 4106, 0, ++ 0, 4106, 4106, 4106, 4106, 4106, 4106, 4106, 4106, 4106, ++ 4106, 4106, 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, + 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, 4107, + +- 4107, 4108, 0, 0, 4108, 0, 4108, 4109, 4109, 4109, +- 4109, 4109, 4109, 4109, 4109, 4109, 4109, 4109, 4109, 4109, +- 4109, 4109, 4109, 4109, 4109, 4110, 0, 0, 4110, 4110, +- 0, 0, 4110, 0, 4110, 0, 4110, 4110, 4110, 4110, +- 4111, 4111, 4111, 4111, 4112, 4112, 0, 4112, 4112, 4112, ++ 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, ++ 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4108, 4109, 0, ++ 4109, 4109, 0, 0, 4109, 4109, 4109, 0, 4109, 4109, ++ 4109, 4109, 4109, 4109, 4109, 4109, 4110, 4110, 4110, 4110, ++ 4110, 4110, 4110, 0, 4110, 0, 4110, 4110, 4110, 4110, ++ 4110, 4110, 4110, 4110, 4111, 4111, 4111, 4111, 4111, 4111, ++ 4111, 4111, 4111, 4111, 4111, 4111, 4111, 4111, 4111, 4111, ++ 4111, 4111, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, + 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, +- 4112, 4112, 4113, 4113, 0, 4113, 4113, 4113, 4113, 4113, + 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, +- 4114, 0, 4114, 0, 4114, 4114, 4114, 4114, 4115, 4115, +- 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, + +- 4115, 4115, 4115, 4115, 4115, 4115, 4116, 4116, 4116, 4116, ++ 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4113, 4114, 4114, ++ 4114, 4114, 4114, 4114, 4114, 4114, 4114, 4114, 4114, 4114, ++ 4114, 4114, 4114, 4114, 4114, 4114, 4115, 4115, 0, 4115, ++ 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, 4115, ++ 4115, 4115, 4115, 4115, 4116, 4116, 4116, 4116, 4116, 4116, + 4116, 4116, 4116, 4116, 4116, 4116, 4116, 4116, 4116, 4116, +- 4116, 4116, 4116, 4116, 4117, 4117, 4117, 4117, 4117, 4117, ++ 4116, 4116, 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, + 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, 4117, +- 4117, 4117, 4118, 4118, 0, 0, 4118, 4118, 4118, 4118, +- 4118, 0, 4118, 4118, 4118, 4118, 4118, 4118, 4118, 4118, +- 4119, 0, 0, 4119, 4119, 0, 0, 4119, 0, 4119, +- 0, 4119, 4119, 4119, 4119, 4120, 4120, 4120, 4120, 4120, ++ 4118, 0, 0, 4118, 0, 0, 4118, 4119, 0, 0, ++ 0, 0, 0, 4119, 4119, 4119, 0, 4119, 4119, 4119, ++ ++ 4119, 4119, 4119, 4119, 4119, 4120, 4120, 4120, 4120, 4120, + 4120, 4120, 4120, 4120, 4120, 4120, 4120, 4120, 4120, 4120, +- 4120, 4120, 4120, 4121, 0, 4121, 4121, 0, 0, 4121, +- +- 4121, 4121, 4121, 4121, 4121, 4121, 4121, 4121, 4121, 4121, +- 4121, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, +- 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4123, +- 0, 0, 0, 0, 0, 4123, 4123, 4123, 0, 4123, +- 4123, 4123, 4123, 4123, 4123, 4123, 4123, 4124, 4124, 0, +- 4124, 4124, 4124, 4124, 4124, 4124, 4124, 4124, 4124, 4124, +- 4124, 4124, 4124, 4124, 4124, 4125, 4125, 0, 4125, 4125, ++ 4120, 4120, 4120, 4121, 0, 0, 4121, 0, 4121, 4122, ++ 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4122, ++ 4122, 4122, 4122, 4122, 4122, 4122, 4122, 4123, 0, 0, ++ 4123, 4123, 0, 0, 4123, 0, 4123, 0, 4123, 4123, ++ 4123, 4123, 4124, 4124, 4124, 4124, 4125, 4125, 0, 4125, + 4125, 4125, 4125, 4125, 4125, 4125, 4125, 4125, 4125, 4125, +- 4125, 4125, 4125, 4126, 0, 0, 4126, 4126, 0, 0, +- 4126, 0, 4126, 0, 4126, 4126, 4126, 4126, 4127, 0, +- +- 0, 0, 0, 0, 4127, 4127, 4127, 0, 4127, 4127, +- 4127, 4127, 4127, 4127, 4127, 4127, 4128, 4128, 0, 4128, +- 4128, 0, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, +- 4128, 4128, 4128, 4129, 0, 4129, 0, 4129, 4129, 4129, +- 4129, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, +- 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4131, +- 0, 4131, 4131, 0, 0, 4131, 4131, 4131, 4131, 4131, +- 4131, 4131, 4131, 4131, 4131, 4131, 4131, 4132, 4132, 4132, +- 4132, 4132, 4132, 4132, 4132, 4132, 4132, 4132, 4132, 4132, +- 4132, 4132, 4132, 4132, 4132, 4133, 4133, 4133, 4133, 4133, ++ 4125, 4125, 4125, 4125, 4126, 4126, 0, 4126, 4126, 4126, ++ 4126, 4126, 4126, 4126, 4126, 4126, 4126, 4126, 4126, 4126, ++ ++ 4126, 4126, 4127, 0, 4127, 0, 4127, 4127, 4127, 4127, ++ 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, ++ 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4128, 4129, 4129, ++ 4129, 4129, 4129, 4129, 4129, 4129, 4129, 4129, 4129, 4129, ++ 4129, 4129, 4129, 4129, 4129, 4129, 4130, 4130, 4130, 4130, ++ 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, 4130, ++ 4130, 4130, 4130, 4130, 4131, 4131, 0, 0, 4131, 4131, ++ 4131, 4131, 4131, 0, 4131, 4131, 4131, 4131, 4131, 4131, ++ 4131, 4131, 4132, 0, 0, 4132, 4132, 0, 0, 4132, ++ 0, 4132, 0, 4132, 4132, 4132, 4132, 4133, 4133, 4133, + + 4133, 4133, 4133, 4133, 4133, 4133, 4133, 4133, 4133, 4133, +- 4133, 4133, 4133, 4134, 0, 0, 4134, 4134, 0, 0, +- 4134, 0, 4134, 0, 4134, 4134, 4134, 4134, 4135, 0, +- 4135, 0, 4135, 4135, 4135, 4135, 4136, 0, 0, 4136, +- 4136, 0, 0, 4136, 0, 4136, 0, 4136, 4136, 4136, +- 4136, 4137, 4137, 0, 4137, 4137, 4137, 4137, 4137, 4137, +- 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4138, 0, +- 4138, 4138, 0, 0, 4138, 4138, 4138, 4138, 4138, 4138, +- 4138, 4138, 4138, 4138, 4138, 4138, 4139, 4139, 4139, 4139, +- 4139, 4139, 4139, 4139, 4139, 4139, 4139, 4139, 4139, 4139, +- +- 4139, 4139, 4139, 4139, 4140, 4140, 4140, 4140, 4140, 4140, +- 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, +- 4140, 4140, 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, +- 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, 4141, +- 4142, 0, 4142, 4142, 0, 0, 4142, 4142, 4142, 4142, +- 4142, 4142, 4142, 4142, 4142, 4142, 4142, 4142, 4143, 4143, ++ 4133, 4133, 4133, 4133, 4133, 4134, 0, 4134, 4134, 0, ++ 0, 4134, 4134, 4134, 4134, 4134, 4134, 4134, 4134, 4134, ++ 4134, 4134, 4134, 4135, 4135, 4135, 4135, 4135, 4135, 4135, ++ 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4135, ++ 4135, 4136, 0, 0, 0, 0, 0, 4136, 4136, 4136, ++ 0, 4136, 4136, 4136, 4136, 4136, 4136, 4136, 4136, 4137, ++ 4137, 0, 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4137, ++ 4137, 4137, 4137, 4137, 4137, 4137, 4137, 4138, 4138, 0, ++ 4138, 4138, 4138, 4138, 4138, 4138, 4138, 4138, 4138, 4138, ++ ++ 4138, 4138, 4138, 4138, 4138, 4139, 0, 0, 4139, 4139, ++ 0, 0, 4139, 0, 4139, 0, 4139, 4139, 4139, 4139, ++ 4140, 0, 0, 0, 0, 0, 4140, 4140, 4140, 0, ++ 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4140, 4141, 4141, ++ 0, 4141, 4141, 0, 4141, 4141, 4141, 4141, 4141, 4141, ++ 4141, 4141, 4141, 4141, 4141, 4142, 0, 4142, 0, 4142, ++ 4142, 4142, 4142, 4143, 4143, 4143, 4143, 4143, 4143, 4143, + 4143, 4143, 4143, 4143, 4143, 4143, 4143, 4143, 4143, 4143, +- 4143, 4143, 4143, 4143, 4143, 4143, 4144, 4144, 4144, 4144, +- 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, +- 4144, 4144, 4144, 4144, 4145, 4145, 0, 4145, 4145, 4145, ++ 4143, 4144, 0, 4144, 4144, 0, 0, 4144, 4144, 4144, ++ 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4144, 4145, + + 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4145, +- 4145, 4145, 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, ++ 4145, 4145, 4145, 4145, 4145, 4145, 4145, 4146, 4146, 4146, + 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, 4146, +- 4147, 4147, 0, 4147, 4147, 4147, 4147, 4147, 4147, 4147, +- 4147, 4147, 4147, 4147, 4147, 4147, 4147, 4147, 4148, 4148, +- 4148, 4148, 4148, 4148, 4148, 4148, 4148, 4148, 4148, 4148, +- 4148, 4148, 4148, 4148, 4148, 4148, 4149, 0, 4149, 0, +- 4149, 4149, 4149, 4149, 4150, 0, 4150, 0, 4150, 4150, +- 4150, 4150, 4151, 0, 0, 4151, 0, 0, 0, 4151, +- 0, 4151, 0, 4151, 4151, 4151, 4151, 4152, 0, 0, +- +- 4152, 4152, 0, 0, 4152, 0, 4152, 0, 4152, 4152, +- 4152, 4152, 4153, 0, 0, 4153, 0, 4153, 0, 4153, +- 4153, 4153, 4153, 4154, 0, 4154, 0, 4154, 4154, 4154, +- 4154, 4155, 0, 4155, 0, 4155, 4155, 4155, 4155, 4156, +- 4156, 0, 4156, 4156, 0, 4156, 4156, 4156, 4156, 4156, +- 4156, 4156, 4156, 4156, 4156, 4156, 4157, 0, 0, 4157, +- 4157, 0, 0, 4157, 0, 4157, 0, 4157, 4157, 4157, +- 4157, 4158, 4158, 0, 4158, 4158, 0, 4158, 4158, 4158, +- 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4159, 4159, ++ 4146, 4146, 4146, 4146, 4146, 4147, 0, 0, 4147, 4147, ++ 0, 0, 4147, 0, 4147, 0, 4147, 4147, 4147, 4147, ++ 4148, 0, 4148, 0, 4148, 4148, 4148, 4148, 4149, 0, ++ 0, 4149, 4149, 0, 0, 4149, 0, 4149, 0, 4149, ++ 4149, 4149, 4149, 4150, 4150, 0, 4150, 4150, 4150, 4150, ++ 4150, 4150, 4150, 4150, 4150, 4150, 4150, 4150, 4150, 4150, ++ 4151, 0, 4151, 4151, 0, 0, 4151, 4151, 4151, 4151, ++ ++ 4151, 4151, 4151, 4151, 4151, 4151, 4151, 4151, 4152, 4152, ++ 4152, 4152, 4152, 4152, 4152, 4152, 4152, 4152, 4152, 4152, ++ 4152, 4152, 4152, 4152, 4152, 4152, 4153, 4153, 4153, 4153, ++ 4153, 4153, 4153, 4153, 4153, 4153, 4153, 4153, 4153, 4153, ++ 4153, 4153, 4153, 4153, 4154, 4154, 4154, 4154, 4154, 4154, ++ 4154, 4154, 4154, 4154, 4154, 4154, 4154, 4154, 4154, 4154, ++ 4154, 4154, 4155, 0, 4155, 4155, 0, 0, 4155, 4155, ++ 4155, 4155, 4155, 4155, 4155, 4155, 4155, 4155, 4155, 4155, ++ 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, ++ 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4156, 4157, 4157, ++ ++ 4157, 4157, 4157, 4157, 4157, 4157, 4157, 4157, 4157, 4157, ++ 4157, 4157, 4157, 4157, 4157, 4157, 4158, 4158, 0, 4158, ++ 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, 4158, ++ 4158, 4158, 4158, 4158, 4159, 4159, 4159, 4159, 4159, 4159, + 4159, 4159, 4159, 4159, 4159, 4159, 4159, 4159, 4159, 4159, +- +- 4159, 4159, 4159, 4159, 4159, 4159, 4160, 4160, 4160, 4160, ++ 4159, 4159, 4160, 4160, 0, 4160, 4160, 4160, 4160, 4160, + 4160, 4160, 4160, 4160, 4160, 4160, 4160, 4160, 4160, 4160, +- 4160, 4160, 4160, 4160, 4161, 4161, 4161, 4161, 4161, 4161, + 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, +- 4161, 4161, 4162, 0, 4162, 4162, 0, 0, 4162, 4162, +- 4162, 4162, 4162, 4162, 4162, 4162, 4162, 4162, 4162, 4162, +- 4163, 0, 4163, 4163, 0, 0, 4163, 4163, 4163, 4163, +- 4163, 4163, 4163, 4163, 4163, 4163, 4163, 4163, 4164, 4164, +- 4164, 4164, 4164, 4164, 4164, 4164, 4164, 4164, 4164, 4164, +- 4164, 4164, 4164, 4164, 4164, 4164, 4165, 4165, 4165, 4165, +- +- 4165, 4165, 4165, 4165, 4165, 4165, 4165, 4165, 4165, 4165, +- 4165, 4165, 4165, 4165, 4166, 4166, 4166, 4166, 4166, 4166, +- 4166, 4166, 4166, 4166, 4166, 4166, 4166, 4166, 4166, 4166, +- 4166, 4166, 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, +- 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, 4167, +- 4168, 0, 4168, 4168, 0, 0, 4168, 4168, 4168, 4168, +- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4169, 4169, +- 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, +- 4169, 4169, 4169, 4169, 4169, 4169, 4170, 4170, 4170, 4170, +- 4170, 4170, 4170, 4170, 4170, 4170, 4170, 4170, 4170, 4170, +- +- 4170, 4170, 4170, 4170, 4171, 4171, 4171, 4171, 4171, 4171, ++ 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4161, 4162, 0, ++ 4162, 0, 4162, 4162, 4162, 4162, 4163, 0, 4163, 0, ++ ++ 4163, 4163, 4163, 4163, 4164, 0, 0, 4164, 0, 0, ++ 0, 4164, 0, 4164, 0, 4164, 4164, 4164, 4164, 4165, ++ 0, 0, 4165, 4165, 0, 0, 4165, 0, 4165, 0, ++ 4165, 4165, 4165, 4165, 4166, 0, 0, 4166, 0, 4166, ++ 0, 4166, 4166, 4166, 4166, 4167, 0, 4167, 0, 4167, ++ 4167, 4167, 4167, 4168, 0, 4168, 0, 4168, 4168, 4168, ++ 4168, 4169, 4169, 0, 4169, 4169, 0, 4169, 4169, 4169, ++ 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4169, 4170, 0, ++ 0, 4170, 4170, 0, 0, 4170, 0, 4170, 0, 4170, ++ 4170, 4170, 4170, 4171, 4171, 0, 4171, 4171, 0, 4171, ++ + 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, +- 4171, 4171, 4172, 0, 4172, 4172, 0, 0, 4172, 4172, + 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, ++ 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4172, 4173, 4173, + 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, +- 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4173, 4174, 4174, ++ 4173, 4173, 4173, 4173, 4173, 4173, 4174, 4174, 4174, 4174, + 4174, 4174, 4174, 4174, 4174, 4174, 4174, 4174, 4174, 4174, +- 4174, 4174, 4174, 4174, 4174, 4174, 4175, 0, 0, 4175, +- 0, 4175, 0, 4175, 4175, 4175, 4175, 4176, 0, 4176, +- 0, 4176, 4176, 4176, 4176, 4177, 0, 4177, 0, 4177, +- +- 4177, 4177, 4177, 4178, 0, 4178, 0, 4178, 4178, 4178, +- 4178, 4179, 0, 0, 4179, 0, 4179, 0, 4179, 4179, +- 4179, 4179, 4180, 4180, 0, 4180, 4180, 0, 4180, 4180, +- 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4181, +- 0, 0, 4181, 4181, 0, 0, 4181, 0, 4181, 0, +- 4181, 4181, 4181, 4181, 4182, 0, 4182, 0, 4182, 4182, +- 4182, 4182, 4183, 0, 4183, 0, 4183, 4183, 4183, 4183, ++ 4174, 4174, 4174, 4174, 4175, 0, 4175, 4175, 0, 0, ++ 4175, 4175, 4175, 4175, 4175, 4175, 4175, 4175, 4175, 4175, ++ 4175, 4175, 4176, 0, 4176, 4176, 0, 0, 4176, 4176, ++ 4176, 4176, 4176, 4176, 4176, 4176, 4176, 4176, 4176, 4176, ++ ++ 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, ++ 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4177, 4178, 4178, ++ 4178, 4178, 4178, 4178, 4178, 4178, 4178, 4178, 4178, 4178, ++ 4178, 4178, 4178, 4178, 4178, 4178, 4179, 4179, 4179, 4179, ++ 4179, 4179, 4179, 4179, 4179, 4179, 4179, 4179, 4179, 4179, ++ 4179, 4179, 4179, 4179, 4180, 4180, 4180, 4180, 4180, 4180, ++ 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, 4180, ++ 4180, 4180, 4181, 0, 4181, 4181, 0, 0, 4181, 4181, ++ 4181, 4181, 4181, 4181, 4181, 4181, 4181, 4181, 4181, 4181, ++ 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, ++ ++ 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4182, 4183, 4183, ++ 4183, 4183, 4183, 4183, 4183, 4183, 4183, 4183, 4183, 4183, ++ 4183, 4183, 4183, 4183, 4183, 4183, 4184, 4184, 4184, 4184, + 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, +- 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4184, 4185, 4185, ++ 4184, 4184, 4184, 4184, 4185, 0, 4185, 4185, 0, 0, + 4185, 4185, 4185, 4185, 4185, 4185, 4185, 4185, 4185, 4185, +- +- 4185, 4185, 4185, 4185, 4185, 4185, 4186, 4186, 4186, 4186, ++ 4185, 4185, 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, + 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, 4186, +- 4186, 4186, 4186, 4186, 4187, 4187, 4187, 4187, 4187, 4187, + 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, +- 4187, 4187, 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, +- 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, 4188, +- 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, +- 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4189, 4190, 0, +- 4190, 4190, 0, 0, 4190, 4190, 4190, 4190, 4190, 4190, +- 4190, 4190, 4190, 4190, 4190, 4190, 4191, 4191, 4191, 4191, +- +- 4191, 4191, 4191, 4191, 4191, 4191, 4191, 4191, 4191, 4191, +- 4191, 4191, 4191, 4191, 4192, 4192, 4192, 4192, 4192, 4192, +- 4192, 4192, 4192, 4192, 4192, 4192, 4192, 4192, 4192, 4192, +- 4192, 4192, 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, ++ 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4187, 4188, 0, ++ ++ 0, 4188, 0, 4188, 0, 4188, 4188, 4188, 4188, 4189, ++ 0, 4189, 0, 4189, 4189, 4189, 4189, 4190, 0, 4190, ++ 0, 4190, 4190, 4190, 4190, 4191, 0, 4191, 0, 4191, ++ 4191, 4191, 4191, 4192, 0, 0, 4192, 0, 4192, 0, ++ 4192, 4192, 4192, 4192, 4193, 4193, 0, 4193, 4193, 0, + 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, 4193, +- 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, +- 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4194, 4195, 4195, +- 0, 4195, 4195, 0, 4195, 4195, 4195, 4195, 4195, 4195, +- 4195, 4195, 4195, 4195, 4195, 4196, 0, 0, 4196, 4196, +- 0, 0, 4196, 0, 4196, 0, 4196, 4196, 4196, 4196, +- +- 4197, 4197, 4197, 4197, 0, 4197, 4197, 4197, 4197, 4197, +- 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4198, 0, +- 0, 0, 0, 0, 4198, 4198, 4198, 0, 4198, 4198, +- 4198, 4198, 4198, 4198, 4198, 4198, 4199, 4199, 4199, 4199, ++ 4193, 4194, 0, 0, 4194, 4194, 0, 0, 4194, 0, ++ 4194, 0, 4194, 4194, 4194, 4194, 4195, 0, 4195, 0, ++ 4195, 4195, 4195, 4195, 4196, 0, 4196, 0, 4196, 4196, ++ 4196, 4196, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, ++ ++ 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, 4197, ++ 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, ++ 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4198, 4199, 4199, + 4199, 4199, 4199, 4199, 4199, 4199, 4199, 4199, 4199, 4199, +- 4199, 4199, 4199, 4199, 4200, 0, 4200, 0, 4200, 4200, +- 4200, 4200, 4201, 4201, 0, 4201, 4201, 0, 4201, 4201, +- 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4202, +- 0, 0, 4202, 4202, 0, 0, 0, 0, 0, 0, +- 4202, 4203, 4203, 0, 0, 0, 4203, 4203, 4203, 4203, +- +- 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4204, +- 4204, 0, 4204, 4204, 0, 4204, 4204, 4204, 4204, 4204, +- 4204, 4204, 4204, 4204, 4204, 4204, 4205, 4205, 0, 4205, +- 4205, 0, 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, +- 4205, 4205, 4205, 4206, 4206, 0, 4206, 4206, 4206, 4206, ++ 4199, 4199, 4199, 4199, 4199, 4199, 4200, 4200, 4200, 4200, ++ 4200, 4200, 4200, 4200, 4200, 4200, 4200, 4200, 4200, 4200, ++ 4200, 4200, 4200, 4200, 4201, 4201, 4201, 4201, 4201, 4201, ++ 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, 4201, ++ 4201, 4201, 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, ++ 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, 4202, ++ ++ 4203, 0, 4203, 4203, 0, 0, 4203, 4203, 4203, 4203, ++ 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4203, 4204, 4204, ++ 4204, 4204, 4204, 4204, 4204, 4204, 4204, 4204, 4204, 4204, ++ 4204, 4204, 4204, 4204, 4204, 4204, 4205, 4205, 4205, 4205, ++ 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, 4205, ++ 4205, 4205, 4205, 4205, 4206, 4206, 4206, 4206, 4206, 4206, + 4206, 4206, 4206, 4206, 4206, 4206, 4206, 4206, 4206, 4206, +- 4207, 4207, 0, 4207, 4207, 4207, 4207, 4207, 4207, 4207, +- 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4208, 0, 4208, +- 0, 4208, 0, 4208, 4208, 4208, 4208, 4209, 4209, 0, +- 4209, 4209, 0, 4209, 4209, 4209, 4209, 4209, 4209, 4209, ++ 4206, 4206, 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, ++ 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, 4207, ++ 4208, 4208, 0, 4208, 4208, 0, 4208, 4208, 4208, 4208, + +- 4209, 4209, 4209, 4209, 4210, 4210, 0, 4210, 4210, 0, ++ 4208, 4208, 4208, 4208, 4208, 4208, 4208, 4209, 0, 0, ++ 4209, 4209, 0, 0, 4209, 0, 4209, 0, 4209, 4209, ++ 4209, 4209, 4210, 4210, 4210, 4210, 0, 4210, 4210, 4210, + 4210, 4210, 4210, 4210, 4210, 4210, 4210, 4210, 4210, 4210, +- 4210, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, +- 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4212, +- 0, 4212, 0, 4212, 0, 4212, 4212, 4212, 4212, 4213, +- 4213, 0, 4213, 4213, 4213, 4213, 4213, 4213, 4213, 4213, +- 4213, 4213, 4213, 4213, 4213, 4213, 4213, 4214, 4214, 0, +- 4214, 4214, 0, 4214, 4214, 4214, 4214, 4214, 4214, 4214, +- 4214, 4214, 4214, 4214, 4215, 4215, 0, 0, 4215, 4215, +- 4215, 4215, 4215, 0, 4215, 4215, 4215, 4215, 4215, 4215, +- +- 4215, 4215, 4216, 4216, 0, 4216, 4216, 0, 4216, 4216, +- 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4217, +- 0, 0, 0, 0, 0, 4217, 4217, 4217, 0, 4217, +- 4217, 4217, 4217, 4217, 4217, 4217, 4217, 4218, 0, 0, +- 0, 0, 0, 4218, 4218, 4218, 0, 4218, 4218, 4218, +- 4218, 4218, 4218, 4218, 4218, 4219, 0, 0, 4219, 4219, +- 0, 0, 4219, 0, 4219, 0, 4219, 4219, 4219, 4219, +- 4220, 4220, 0, 4220, 4220, 0, 4220, 4220, 4220, 4220, +- 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4221, 0, 0, +- 0, 0, 0, 4221, 4221, 4221, 0, 4221, 4221, 4221, +- +- 4221, 4221, 4221, 4221, 4221, 4222, 0, 4222, 0, 4222, +- 4222, 4222, 4222, 4223, 4223, 0, 4223, 4223, 0, 4223, +- 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, ++ 4211, 0, 0, 0, 0, 0, 4211, 4211, 4211, 0, ++ 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4211, 4212, 4212, ++ 4212, 4212, 4212, 4212, 4212, 4212, 4212, 4212, 4212, 4212, ++ 4212, 4212, 4212, 4212, 4212, 4212, 4213, 0, 4213, 0, ++ 4213, 4213, 4213, 4213, 4214, 4214, 0, 4214, 4214, 0, ++ 4214, 4214, 4214, 4214, 4214, 4214, 4214, 4214, 4214, 4214, ++ ++ 4214, 4215, 0, 0, 4215, 4215, 0, 0, 0, 0, ++ 0, 0, 4215, 4216, 4216, 0, 0, 0, 4216, 4216, ++ 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, 4216, ++ 4216, 4217, 4217, 0, 4217, 4217, 0, 4217, 4217, 4217, ++ 4217, 4217, 4217, 4217, 4217, 4217, 4217, 4217, 4218, 4218, ++ 0, 4218, 4218, 0, 4218, 4218, 4218, 4218, 4218, 4218, ++ 4218, 4218, 4218, 4218, 4218, 4219, 4219, 0, 4219, 4219, ++ 4219, 4219, 4219, 4219, 4219, 4219, 4219, 4219, 4219, 4219, ++ 4219, 4219, 4220, 4220, 0, 4220, 4220, 4220, 4220, 4220, ++ 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4220, 4221, ++ ++ 0, 4221, 0, 4221, 0, 4221, 4221, 4221, 4221, 4222, ++ 4222, 0, 4222, 4222, 0, 4222, 4222, 4222, 4222, 4222, ++ 4222, 4222, 4222, 4222, 4222, 4222, 4223, 4223, 0, 4223, ++ 4223, 0, 4223, 4223, 4223, 4223, 4223, 4223, 4223, 4223, ++ 4223, 4223, 4223, 4224, 4224, 4224, 4224, 4224, 4224, 4224, + 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, +- 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224, 4225, 4225, +- 0, 4225, 4225, 0, 4225, 4225, 4225, 4225, 4225, 4225, +- 4225, 4225, 4225, 4225, 4225, 4226, 4226, 0, 0, 4226, +- 4226, 4226, 4226, 4226, 0, 4226, 4226, 4226, 4226, 4226, +- 4226, 4226, 4226, 4227, 4227, 0, 0, 4227, 4227, 4227, +- 4227, 4227, 0, 4227, 4227, 4227, 4227, 4227, 4227, 4227, +- +- 4227, 4228, 4228, 0, 4228, 4228, 0, 4228, 4228, 4228, +- 4228, 4228, 4228, 4228, 4228, 4228, 4228, 4228, 4229, 4229, +- 0, 4229, 4229, 0, 4229, 4229, 4229, 4229, 4229, 4229, +- 4229, 4229, 4229, 4229, 4229, 4230, 4230, 0, 0, 4230, +- 4230, 4230, 4230, 4230, 0, 4230, 4230, 4230, 4230, 4230, +- 4230, 4230, 4230, 4231, 4231, 0, 0, 4231, 4231, 4231, +- 4231, 4231, 0, 4231, 4231, 4231, 4231, 4231, 4231, 4231, +- 4231, 4232, 0, 4232, 0, 4232, 0, 4232, 4232, 4232, +- 4232, 4233, 4233, 0, 4233, 4233, 4233, 4233, 4233, 4233, +- 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4234, 4234, +- +- 0, 4234, 4234, 0, 4234, 4234, 4234, 4234, 4234, 4234, +- 4234, 4234, 4234, 4234, 4234, 4235, 4235, 0, 4235, 4235, +- 0, 4235, 4235, 4235, 4235, 4235, 4235, 4235, 4235, 4235, +- 4235, 4235, 4236, 0, 4236, 0, 4236, 0, 4236, 4236, +- 4236, 4236, 4237, 0, 0, 0, 0, 0, 4237, 4237, +- 4237, 0, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952, +- 3952, 3952, 3952, 3952, 3952, 3952, 3952, 3952 ++ 4224, 4225, 0, 4225, 0, 4225, 0, 4225, 4225, 4225, ++ 4225, 4226, 4226, 0, 4226, 4226, 4226, 4226, 4226, 4226, ++ 4226, 4226, 4226, 4226, 4226, 4226, 4226, 4226, 4226, 4227, ++ 4227, 0, 4227, 4227, 0, 4227, 4227, 4227, 4227, 4227, ++ ++ 4227, 4227, 4227, 4227, 4227, 4227, 4228, 4228, 0, 0, ++ 4228, 4228, 4228, 4228, 4228, 0, 4228, 4228, 4228, 4228, ++ 4228, 4228, 4228, 4228, 4229, 4229, 0, 4229, 4229, 0, ++ 4229, 4229, 4229, 4229, 4229, 4229, 4229, 4229, 4229, 4229, ++ 4229, 4230, 0, 0, 0, 0, 0, 4230, 4230, 4230, ++ 0, 4230, 4230, 4230, 4230, 4230, 4230, 4230, 4230, 4231, ++ 0, 0, 0, 0, 0, 4231, 4231, 4231, 0, 4231, ++ 4231, 4231, 4231, 4231, 4231, 4231, 4231, 4232, 0, 0, ++ 4232, 4232, 0, 0, 4232, 0, 4232, 0, 4232, 4232, ++ 4232, 4232, 4233, 4233, 0, 4233, 4233, 0, 4233, 4233, ++ ++ 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4233, 4234, ++ 0, 0, 0, 0, 0, 4234, 4234, 4234, 0, 4234, ++ 4234, 4234, 4234, 4234, 4234, 4234, 4234, 4235, 0, 4235, ++ 0, 4235, 4235, 4235, 4235, 4236, 4236, 0, 4236, 4236, ++ 0, 4236, 4236, 4236, 4236, 4236, 4236, 4236, 4236, 4236, ++ 4236, 4236, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, ++ 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, 4237, ++ 4238, 4238, 0, 4238, 4238, 0, 4238, 4238, 4238, 4238, ++ 4238, 4238, 4238, 4238, 4238, 4238, 4238, 4239, 4239, 0, ++ 0, 4239, 4239, 4239, 4239, 4239, 0, 4239, 4239, 4239, ++ ++ 4239, 4239, 4239, 4239, 4239, 4240, 4240, 0, 0, 4240, ++ 4240, 4240, 4240, 4240, 0, 4240, 4240, 4240, 4240, 4240, ++ 4240, 4240, 4240, 4241, 4241, 0, 4241, 4241, 0, 4241, ++ 4241, 4241, 4241, 4241, 4241, 4241, 4241, 4241, 4241, 4241, ++ 4242, 4242, 0, 4242, 4242, 0, 4242, 4242, 4242, 4242, ++ 4242, 4242, 4242, 4242, 4242, 4242, 4242, 4243, 4243, 0, ++ 0, 4243, 4243, 4243, 4243, 4243, 0, 4243, 4243, 4243, ++ 4243, 4243, 4243, 4243, 4243, 4244, 4244, 0, 0, 4244, ++ 4244, 4244, 4244, 4244, 0, 4244, 4244, 4244, 4244, 4244, ++ 4244, 4244, 4244, 4245, 0, 4245, 0, 4245, 0, 4245, ++ ++ 4245, 4245, 4245, 4246, 4246, 0, 4246, 4246, 4246, 4246, ++ 4246, 4246, 4246, 4246, 4246, 4246, 4246, 4246, 4246, 4246, ++ 4247, 4247, 0, 4247, 4247, 0, 4247, 4247, 4247, 4247, ++ 4247, 4247, 4247, 4247, 4247, 4247, 4247, 4248, 4248, 0, ++ 4248, 4248, 0, 4248, 4248, 4248, 4248, 4248, 4248, 4248, ++ 4248, 4248, 4248, 4248, 4249, 0, 4249, 0, 4249, 0, ++ 4249, 4249, 4249, 4249, 4250, 0, 0, 0, 0, 0, ++ 4250, 4250, 4250, 0, 4250, 4250, 4250, 4250, 4250, 4250, ++ 4250, 4250, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, ++ 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965, 3965 + } ; + + static yy_state_type yy_last_accepting_state; +@@ -5036,68 +5043,68 @@ static char *yy_last_accepting_cpos; + extern int yy_flex_debug; + int yy_flex_debug = 1; + +-static const flex_int16_t yy_rule_linenum[542] = ++static const flex_int16_t yy_rule_linenum[544] = + { 0, +- 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, +- 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, +- 526, 527, 529, 530, 531, 532, 533, 534, 535, 536, +- 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, +- 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, +- 557, 558, 559, 560, 561, 562, 564, 565, 568, 569, +- 570, 571, 572, 573, 574, 576, 577, 578, 579, 580, +- 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, +- 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, +- 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, +- +- 611, 612, 614, 615, 616, 617, 618, 619, 623, 628, +- 629, 634, 635, 636, 641, 642, 643, 648, 653, 654, +- 655, 660, 661, 665, 666, 667, 671, 672, 676, 677, +- 681, 682, 683, 687, 688, 692, 693, 698, 699, 700, +- 704, 708, 709, 717, 722, 723, 728, 729, 730, 739, +- 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, +- 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, +- 762, 763, 764, 765, 768, 769, 770, 771, 772, 773, +- 774, 775, 776, 778, 779, 780, 781, 782, 783, 784, +- 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, +- +- 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, +- 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, +- 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, +- 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, +- 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, +- 845, 846, 847, 848, 849, 850, 851, 852, 853, 855, +- 856, 857, 859, 860, 861, 862, 863, 864, 865, 866, +- 867, 868, 871, 875, 876, 877, 878, 879, 883, 884, +- 885, 886, 887, 888, 892, 893, 894, 895, 900, 901, +- 902, 903, 904, 905, 906, 907, 908, 909, 910, 911, +- +- 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, +- 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, +- 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, +- 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, +- 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, +- 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, +- 972, 973, 974, 975, 976, 977, 978, 979, 980, 981, +- 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, +- 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, +- 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, +- +- 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1023, +- 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1035, 1036, +- 1037, 1038, 1039, 1040, 1045, 1046, 1047, 1048, 1049, 1050, +- 1051, 1052, 1053, 1055, 1056, 1057, 1058, 1059, 1064, 1065, +- 1066, 1067, 1068, 1069, 1071, 1072, 1074, 1075, 1081, 1082, +- 1083, 1084, 1085, 1086, 1089, 1090, 1091, 1092, 1093, 1094, +- 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, +- 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, +- 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, +- 1128, 1130, 1131, 1136, 1140, 1144, 1145, 1149, 1150, 1153, +- +- 1154, 1158, 1159, 1163, 1164, 1168, 1169, 1174, 1176, 1177, +- 1178, 1179, 1181, 1182, 1183, 1184, 1186, 1187, 1188, 1189, +- 1191, 1193, 1194, 1196, 1197, 1198, 1199, 1201, 1206, 1207, +- 1208, 1212, 1213, 1214, 1219, 1221, 1222, 1223, 1242, 1269, +- 1299 ++ 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, ++ 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, ++ 527, 528, 530, 531, 532, 533, 534, 535, 536, 537, ++ 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, ++ 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, ++ 558, 559, 560, 561, 562, 563, 565, 566, 569, 570, ++ 571, 572, 573, 574, 575, 577, 578, 579, 580, 581, ++ 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, ++ 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, ++ 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, ++ ++ 612, 613, 615, 616, 617, 618, 619, 620, 624, 629, ++ 630, 635, 636, 637, 642, 643, 644, 649, 654, 655, ++ 656, 661, 662, 666, 667, 668, 672, 673, 677, 678, ++ 682, 683, 684, 688, 689, 693, 694, 699, 700, 701, ++ 705, 709, 710, 718, 723, 724, 729, 730, 731, 740, ++ 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, ++ 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, ++ 763, 764, 765, 766, 769, 770, 771, 772, 773, 774, ++ 775, 776, 777, 779, 780, 781, 782, 783, 784, 785, ++ 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, ++ ++ 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, ++ 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, ++ 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, ++ 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, ++ 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, ++ 846, 847, 848, 849, 850, 851, 852, 853, 854, 856, ++ 857, 858, 860, 861, 862, 863, 864, 865, 866, 867, ++ 868, 869, 872, 876, 877, 878, 879, 880, 884, 885, ++ 886, 887, 888, 889, 893, 894, 895, 896, 901, 902, ++ 903, 904, 905, 906, 907, 908, 909, 910, 911, 912, ++ ++ 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, ++ 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, ++ 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, ++ 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, ++ 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, ++ 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, ++ 973, 974, 975, 976, 977, 978, 979, 980, 981, 982, ++ 983, 984, 985, 986, 987, 988, 989, 990, 991, 992, ++ 993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002, ++ 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, ++ ++ 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, ++ 1023, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, ++ 1038, 1039, 1040, 1041, 1042, 1043, 1048, 1049, 1050, 1051, ++ 1052, 1053, 1054, 1055, 1056, 1058, 1059, 1060, 1061, 1062, ++ 1067, 1068, 1069, 1070, 1071, 1072, 1074, 1075, 1077, 1078, ++ 1084, 1085, 1086, 1087, 1088, 1089, 1092, 1093, 1094, 1095, ++ 1096, 1097, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, ++ 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, ++ 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, ++ 1129, 1130, 1131, 1133, 1134, 1139, 1143, 1147, 1148, 1152, ++ ++ 1153, 1156, 1157, 1161, 1162, 1166, 1167, 1171, 1172, 1177, ++ 1179, 1180, 1181, 1182, 1184, 1185, 1186, 1187, 1189, 1190, ++ 1191, 1192, 1194, 1196, 1197, 1199, 1200, 1201, 1202, 1204, ++ 1209, 1210, 1211, 1215, 1216, 1217, 1222, 1224, 1225, 1226, ++ 1245, 1272, 1302 + } ; + + /* The intent behind this definition is that it'll catch +@@ -5183,15 +5190,15 @@ static std::stack YY_PREVIOUS_STATE; + #define BEGIN_PREVIOUS() { BEGIN(YY_PREVIOUS_STATE.top()); YY_PREVIOUS_STATE.pop(); } + + // The location of the current token. +-#line 5187 "seclang-scanner.cc" ++#line 5194 "seclang-scanner.cc" + #define YY_NO_INPUT 1 + +-#line 493 "seclang-scanner.ll" ++#line 494 "seclang-scanner.ll" + // Code run each time a pattern is matched. + # define YY_USER_ACTION driver.loc.back()->columns (yyleng); + +-#line 5194 "seclang-scanner.cc" +-#line 5195 "seclang-scanner.cc" ++#line 5201 "seclang-scanner.cc" ++#line 5202 "seclang-scanner.cc" + + #define INITIAL 0 + #define EXPECTING_ACTION_PREDICATE_VARIABLE 1 +@@ -5505,15 +5512,15 @@ YY_DECL + + { + /* %% [7.0] user's declarations go here */ +-#line 498 "seclang-scanner.ll" ++#line 499 "seclang-scanner.ll" + + + +-#line 502 "seclang-scanner.ll" ++#line 503 "seclang-scanner.ll" + // Code run each time yylex is called. + driver.loc.back()->step(); + +-#line 5517 "seclang-scanner.cc" ++#line 5524 "seclang-scanner.cc" + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ + { +@@ -5542,13 +5549,13 @@ yy_match: + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 3953 ) ++ if ( yy_current_state >= 3966 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + ++yy_cp; + } +- while ( yy_current_state != 3952 ); ++ while ( yy_current_state != 3965 ); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); + +@@ -5567,13 +5574,13 @@ do_action: /* This label is used only to access EOF actions. */ + { + if ( yy_act == 0 ) + fprintf( stderr, "--scanner backing up\n" ); +- else if ( yy_act < 542 ) ++ else if ( yy_act < 544 ) + fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", + (long)yy_rule_linenum[yy_act], yytext ); +- else if ( yy_act == 542 ) ++ else if ( yy_act == 544 ) + fprintf( stderr, "--accepting default rule (\"%s\")\n", + yytext ); +- else if ( yy_act == 543 ) ++ else if ( yy_act == 545 ) + fprintf( stderr, "--(end of buffer or a NUL)\n" ); + else + fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); +@@ -5591,564 +5598,564 @@ do_action: /* This label is used only to access EOF actions. */ + + case 1: + YY_RULE_SETUP +-#line 506 "seclang-scanner.ll" ++#line 507 "seclang-scanner.ll" + { return p::make_ACTION_APPEND(yytext, *driver.loc.back()); } + YY_BREAK + case 2: + YY_RULE_SETUP +-#line 507 "seclang-scanner.ll" ++#line 508 "seclang-scanner.ll" + { return p::make_ACTION_BLOCK(yytext, *driver.loc.back()); } + YY_BREAK + case 3: + YY_RULE_SETUP +-#line 508 "seclang-scanner.ll" ++#line 509 "seclang-scanner.ll" + { return p::make_ACTION_CAPTURE(yytext, *driver.loc.back()); } + YY_BREAK + case 4: + YY_RULE_SETUP +-#line 509 "seclang-scanner.ll" ++#line 510 "seclang-scanner.ll" + { return p::make_ACTION_CHAIN(yytext, *driver.loc.back()); } + YY_BREAK + case 5: + YY_RULE_SETUP +-#line 510 "seclang-scanner.ll" ++#line 511 "seclang-scanner.ll" + { return p::make_ACTION_DENY(yytext, *driver.loc.back()); } + YY_BREAK + case 6: + YY_RULE_SETUP +-#line 511 "seclang-scanner.ll" ++#line 512 "seclang-scanner.ll" + { return p::make_ACTION_DEPRECATE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 7: + YY_RULE_SETUP +-#line 512 "seclang-scanner.ll" ++#line 513 "seclang-scanner.ll" + { return p::make_ACTION_DROP(yytext, *driver.loc.back()); } + YY_BREAK + case 8: + YY_RULE_SETUP +-#line 513 "seclang-scanner.ll" ++#line 514 "seclang-scanner.ll" + { return p::make_ACTION_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 9: + YY_RULE_SETUP +-#line 514 "seclang-scanner.ll" ++#line 515 "seclang-scanner.ll" + { return p::make_ACTION_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 10: + YY_RULE_SETUP +-#line 515 "seclang-scanner.ll" ++#line 516 "seclang-scanner.ll" + { return p::make_ACTION_MULTI_MATCH(yytext, *driver.loc.back()); } + YY_BREAK + case 11: + YY_RULE_SETUP +-#line 516 "seclang-scanner.ll" ++#line 517 "seclang-scanner.ll" + { return p::make_ACTION_NO_AUDIT_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 12: + YY_RULE_SETUP +-#line 517 "seclang-scanner.ll" ++#line 518 "seclang-scanner.ll" + { return p::make_ACTION_NO_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 13: + YY_RULE_SETUP +-#line 518 "seclang-scanner.ll" ++#line 519 "seclang-scanner.ll" + { return p::make_ACTION_PASS(yytext, *driver.loc.back()); } + YY_BREAK + case 14: + YY_RULE_SETUP +-#line 519 "seclang-scanner.ll" ++#line 520 "seclang-scanner.ll" + { return p::make_ACTION_PAUSE(yytext, *driver.loc.back()); } + YY_BREAK + case 15: + YY_RULE_SETUP +-#line 520 "seclang-scanner.ll" ++#line 521 "seclang-scanner.ll" + { return p::make_ACTION_PREPEND(yytext, *driver.loc.back()); } + YY_BREAK + case 16: + YY_RULE_SETUP +-#line 521 "seclang-scanner.ll" ++#line 522 "seclang-scanner.ll" + { return p::make_ACTION_PROXY(yytext, *driver.loc.back()); } + YY_BREAK + case 17: + YY_RULE_SETUP +-#line 522 "seclang-scanner.ll" ++#line 523 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_ARG(yytext, *driver.loc.back()); } + YY_BREAK + case 18: + YY_RULE_SETUP +-#line 523 "seclang-scanner.ll" ++#line 524 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_MATCHED(yytext, *driver.loc.back()); } + YY_BREAK + case 19: + YY_RULE_SETUP +-#line 524 "seclang-scanner.ll" ++#line 525 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_MATCHED_BYTES(yytext, *driver.loc.back()); } + YY_BREAK + case 20: + YY_RULE_SETUP +-#line 525 "seclang-scanner.ll" ++#line 526 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_REQUEST_HEADER(yytext, *driver.loc.back()); } + YY_BREAK + case 21: + YY_RULE_SETUP +-#line 526 "seclang-scanner.ll" ++#line 527 "seclang-scanner.ll" + { return p::make_ACTION_SANITISE_RESPONSE_HEADER(yytext, *driver.loc.back()); } + YY_BREAK + case 22: + YY_RULE_SETUP +-#line 527 "seclang-scanner.ll" ++#line 528 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETRSC(yytext, *driver.loc.back()); } + YY_BREAK + case 23: + YY_RULE_SETUP +-#line 529 "seclang-scanner.ll" ++#line 530 "seclang-scanner.ll" + { return p::make_ACTION_STATUS(yytext, *driver.loc.back()); } + YY_BREAK + case 24: + /* rule 24 can match eol */ + YY_RULE_SETUP +-#line 530 "seclang-scanner.ll" ++#line 531 "seclang-scanner.ll" + { return p::make_ACTION_ACCURACY(yytext, *driver.loc.back()); } + YY_BREAK + case 25: + /* rule 25 can match eol */ + YY_RULE_SETUP +-#line 531 "seclang-scanner.ll" ++#line 532 "seclang-scanner.ll" + { return p::make_ACTION_ACCURACY(yytext, *driver.loc.back()); } + YY_BREAK + case 26: + YY_RULE_SETUP +-#line 532 "seclang-scanner.ll" ++#line 533 "seclang-scanner.ll" + { return p::make_ACTION_ALLOW(yytext, *driver.loc.back()); } + YY_BREAK + case 27: + YY_RULE_SETUP +-#line 533 "seclang-scanner.ll" ++#line 534 "seclang-scanner.ll" + { return p::make_ACTION_AUDIT_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 28: + YY_RULE_SETUP +-#line 534 "seclang-scanner.ll" ++#line 535 "seclang-scanner.ll" + { return p::make_ACTION_CTL_AUDIT_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 29: + YY_RULE_SETUP +-#line 535 "seclang-scanner.ll" ++#line 536 "seclang-scanner.ll" + { return p::make_ACTION_CTL_AUDIT_LOG_PARTS(yytext, *driver.loc.back()); } + YY_BREAK + case 30: + YY_RULE_SETUP +-#line 536 "seclang-scanner.ll" ++#line 537 "seclang-scanner.ll" + { return p::make_ACTION_CTL_BDY_JSON(yytext, *driver.loc.back()); } + YY_BREAK + case 31: + YY_RULE_SETUP +-#line 537 "seclang-scanner.ll" ++#line 538 "seclang-scanner.ll" + { return p::make_ACTION_CTL_BDY_XML(yytext, *driver.loc.back()); } + YY_BREAK + case 32: + YY_RULE_SETUP +-#line 538 "seclang-scanner.ll" ++#line 539 "seclang-scanner.ll" + { return p::make_ACTION_CTL_BDY_URLENCODED(yytext, *driver.loc.back()); } + YY_BREAK + case 33: + YY_RULE_SETUP +-#line 539 "seclang-scanner.ll" ++#line 540 "seclang-scanner.ll" + { return p::make_ACTION_CTL_FORCE_REQ_BODY_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 34: + YY_RULE_SETUP +-#line 540 "seclang-scanner.ll" ++#line 541 "seclang-scanner.ll" + { return p::make_ACTION_CTL_REQUEST_BODY_ACCESS(yytext, *driver.loc.back()); } + YY_BREAK + case 35: + YY_RULE_SETUP +-#line 541 "seclang-scanner.ll" ++#line 542 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_ENGINE(*driver.loc.back()); } + YY_BREAK + case 36: + YY_RULE_SETUP +-#line 542 "seclang-scanner.ll" ++#line 543 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_BY_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 37: + YY_RULE_SETUP +-#line 543 "seclang-scanner.ll" ++#line 544 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_BY_TAG(yytext, *driver.loc.back()); } + YY_BREAK + case 38: + YY_RULE_SETUP +-#line 544 "seclang-scanner.ll" ++#line 545 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 39: + YY_RULE_SETUP +-#line 545 "seclang-scanner.ll" ++#line 546 "seclang-scanner.ll" + { return p::make_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG(yytext, *driver.loc.back()); } + YY_BREAK + case 40: + /* rule 40 can match eol */ + YY_RULE_SETUP +-#line 546 "seclang-scanner.ll" ++#line 547 "seclang-scanner.ll" + { return p::make_ACTION_EXEC(yytext, *driver.loc.back()); } + YY_BREAK + case 41: + /* rule 41 can match eol */ + YY_RULE_SETUP +-#line 547 "seclang-scanner.ll" ++#line 548 "seclang-scanner.ll" + { return p::make_ACTION_EXEC(yytext, *driver.loc.back()); } + YY_BREAK + case 42: + /* rule 42 can match eol */ + YY_RULE_SETUP +-#line 548 "seclang-scanner.ll" ++#line 549 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 43: + /* rule 43 can match eol */ + YY_RULE_SETUP +-#line 549 "seclang-scanner.ll" ++#line 550 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 44: + /* rule 44 can match eol */ + YY_RULE_SETUP +-#line 550 "seclang-scanner.ll" ++#line 551 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 45: + /* rule 45 can match eol */ + YY_RULE_SETUP +-#line 551 "seclang-scanner.ll" ++#line 552 "seclang-scanner.ll" + { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } + YY_BREAK + case 46: + YY_RULE_SETUP +-#line 552 "seclang-scanner.ll" ++#line 553 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_INITCOL(yytext, *driver.loc.back()); } + YY_BREAK + case 47: + /* rule 47 can match eol */ + YY_RULE_SETUP +-#line 553 "seclang-scanner.ll" ++#line 554 "seclang-scanner.ll" + { return p::make_ACTION_MATURITY(yytext, *driver.loc.back()); } + YY_BREAK + case 48: + /* rule 48 can match eol */ + YY_RULE_SETUP +-#line 554 "seclang-scanner.ll" ++#line 555 "seclang-scanner.ll" + { return p::make_ACTION_MATURITY(yytext, *driver.loc.back()); } + YY_BREAK + case 49: + YY_RULE_SETUP +-#line 555 "seclang-scanner.ll" ++#line 556 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_MSG(yytext, *driver.loc.back()); } + YY_BREAK + case 50: + YY_RULE_SETUP +-#line 556 "seclang-scanner.ll" ++#line 557 "seclang-scanner.ll" + { return p::make_ACTION_PHASE(yytext, *driver.loc.back()); } + YY_BREAK + case 51: + YY_RULE_SETUP +-#line 557 "seclang-scanner.ll" ++#line 558 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_REDIRECT(yytext, *driver.loc.back()); } + YY_BREAK + case 52: + /* rule 52 can match eol */ + YY_RULE_SETUP +-#line 558 "seclang-scanner.ll" ++#line 559 "seclang-scanner.ll" + { return p::make_ACTION_REV(yytext, *driver.loc.back()); } + YY_BREAK + case 53: + /* rule 53 can match eol */ + YY_RULE_SETUP +-#line 559 "seclang-scanner.ll" ++#line 560 "seclang-scanner.ll" + { return p::make_ACTION_REV(yytext, *driver.loc.back()); } + YY_BREAK + case 54: + YY_RULE_SETUP +-#line 560 "seclang-scanner.ll" ++#line 561 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETENV(yytext, *driver.loc.back()); } + YY_BREAK + case 55: + YY_RULE_SETUP +-#line 561 "seclang-scanner.ll" ++#line 562 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETSID(yytext, *driver.loc.back()); } + YY_BREAK + case 56: + YY_RULE_SETUP +-#line 562 "seclang-scanner.ll" ++#line 563 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETUID(yytext, *driver.loc.back()); } + YY_BREAK + case 57: + YY_RULE_SETUP +-#line 564 "seclang-scanner.ll" ++#line 565 "seclang-scanner.ll" + { BEGIN(SETVAR_ACTION_QUOTED); return p::make_ACTION_SETVAR(*driver.loc.back()); } + YY_BREAK + case 58: + YY_RULE_SETUP +-#line 565 "seclang-scanner.ll" ++#line 566 "seclang-scanner.ll" + { BEGIN(SETVAR_ACTION_NONQUOTED); return p::make_ACTION_SETVAR(*driver.loc.back()); } + YY_BREAK + case 59: + YY_RULE_SETUP +-#line 568 "seclang-scanner.ll" ++#line 569 "seclang-scanner.ll" + { return p::make_ACTION_SEVERITY(yytext, *driver.loc.back()); } + YY_BREAK + case 60: + YY_RULE_SETUP +-#line 569 "seclang-scanner.ll" ++#line 570 "seclang-scanner.ll" + { return p::make_ACTION_SEVERITY(yytext, *driver.loc.back()); } + YY_BREAK + case 61: + YY_RULE_SETUP +-#line 570 "seclang-scanner.ll" ++#line 571 "seclang-scanner.ll" + { return p::make_ACTION_SKIP_AFTER(yytext, *driver.loc.back()); } + YY_BREAK + case 62: + YY_RULE_SETUP +-#line 571 "seclang-scanner.ll" ++#line 572 "seclang-scanner.ll" + { return p::make_ACTION_SKIP(yytext, *driver.loc.back()); } + YY_BREAK + case 63: + YY_RULE_SETUP +-#line 572 "seclang-scanner.ll" ++#line 573 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_TAG(yytext, *driver.loc.back()); } + YY_BREAK + case 64: + /* rule 64 can match eol */ + YY_RULE_SETUP +-#line 573 "seclang-scanner.ll" ++#line 574 "seclang-scanner.ll" + { return p::make_ACTION_VER(yytext, *driver.loc.back()); } + YY_BREAK + case 65: + YY_RULE_SETUP +-#line 574 "seclang-scanner.ll" ++#line 575 "seclang-scanner.ll" + { return p::make_ACTION_XMLNS(yytext, *driver.loc.back()); } + YY_BREAK + case 66: + YY_RULE_SETUP +-#line 576 "seclang-scanner.ll" ++#line 577 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT(yytext, *driver.loc.back()); } + YY_BREAK + case 67: + YY_RULE_SETUP +-#line 577 "seclang-scanner.ll" ++#line 578 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT(yytext, *driver.loc.back()); } + YY_BREAK + case 68: + YY_RULE_SETUP +-#line 578 "seclang-scanner.ll" ++#line 579 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT(yytext, *driver.loc.back()); } + YY_BREAK + case 69: + YY_RULE_SETUP +-#line 579 "seclang-scanner.ll" ++#line 580 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_SQL_HEX_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 70: + YY_RULE_SETUP +-#line 580 "seclang-scanner.ll" ++#line 581 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_BASE_64_ENCODE(yytext, *driver.loc.back()); } + YY_BREAK + case 71: + YY_RULE_SETUP +-#line 581 "seclang-scanner.ll" ++#line 582 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_BASE_64_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 72: + YY_RULE_SETUP +-#line 582 "seclang-scanner.ll" ++#line 583 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_BASE_64_DECODE_EXT(yytext, *driver.loc.back()); } + YY_BREAK + case 73: + YY_RULE_SETUP +-#line 583 "seclang-scanner.ll" ++#line 584 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_CMD_LINE(yytext, *driver.loc.back()); } + YY_BREAK + case 74: + YY_RULE_SETUP +-#line 584 "seclang-scanner.ll" ++#line 585 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_SHA1(yytext, *driver.loc.back()); } + YY_BREAK + case 75: + YY_RULE_SETUP +-#line 585 "seclang-scanner.ll" ++#line 586 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_MD5(yytext, *driver.loc.back()); } + YY_BREAK + case 76: + YY_RULE_SETUP +-#line 586 "seclang-scanner.ll" ++#line 587 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_ESCAPE_SEQ_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 77: + YY_RULE_SETUP +-#line 587 "seclang-scanner.ll" ++#line 588 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_HEX_ENCODE(yytext, *driver.loc.back()); } + YY_BREAK + case 78: + YY_RULE_SETUP +-#line 588 "seclang-scanner.ll" ++#line 589 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_HEX_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 79: + YY_RULE_SETUP +-#line 589 "seclang-scanner.ll" ++#line 590 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_LOWERCASE(yytext, *driver.loc.back()); } + YY_BREAK + case 80: + YY_RULE_SETUP +-#line 590 "seclang-scanner.ll" ++#line 591 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_UPPERCASE(yytext, *driver.loc.back()); } + YY_BREAK + case 81: + YY_RULE_SETUP +-#line 591 "seclang-scanner.ll" ++#line 592 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_URL_ENCODE(yytext, *driver.loc.back()); } + YY_BREAK + case 82: + YY_RULE_SETUP +-#line 592 "seclang-scanner.ll" ++#line 593 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_URL_DECODE_UNI(yytext, *driver.loc.back()); } + YY_BREAK + case 83: + YY_RULE_SETUP +-#line 593 "seclang-scanner.ll" ++#line 594 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_URL_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 84: + YY_RULE_SETUP +-#line 594 "seclang-scanner.ll" ++#line 595 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_NONE(yytext, *driver.loc.back()); } + YY_BREAK + case 85: + YY_RULE_SETUP +-#line 595 "seclang-scanner.ll" ++#line 596 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE(yytext, *driver.loc.back()); } + YY_BREAK + case 86: + YY_RULE_SETUP +-#line 596 "seclang-scanner.ll" ++#line 597 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_WHITESPACE(yytext, *driver.loc.back()); } + YY_BREAK + case 87: + YY_RULE_SETUP +-#line 597 "seclang-scanner.ll" ++#line 598 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REPLACE_NULLS(yytext, *driver.loc.back()); } + YY_BREAK + case 88: + YY_RULE_SETUP +-#line 598 "seclang-scanner.ll" ++#line 599 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_NULLS(yytext, *driver.loc.back()); } + YY_BREAK + case 89: + YY_RULE_SETUP +-#line 599 "seclang-scanner.ll" ++#line 600 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 90: + YY_RULE_SETUP +-#line 600 "seclang-scanner.ll" ++#line 601 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_JS_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 91: + YY_RULE_SETUP +-#line 601 "seclang-scanner.ll" ++#line 602 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_CSS_DECODE(yytext, *driver.loc.back()); } + YY_BREAK + case 92: + YY_RULE_SETUP +-#line 602 "seclang-scanner.ll" ++#line 603 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_TRIM(yytext, *driver.loc.back()); } + YY_BREAK + case 93: + YY_RULE_SETUP +-#line 603 "seclang-scanner.ll" ++#line 604 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_TRIM_LEFT(yytext, *driver.loc.back()); } + YY_BREAK + case 94: + YY_RULE_SETUP +-#line 604 "seclang-scanner.ll" ++#line 605 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_TRIM_RIGHT(yytext, *driver.loc.back()); } + YY_BREAK + case 95: + YY_RULE_SETUP +-#line 605 "seclang-scanner.ll" ++#line 606 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN(yytext, *driver.loc.back()); } + YY_BREAK + case 96: + YY_RULE_SETUP +-#line 606 "seclang-scanner.ll" ++#line 607 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_NORMALISE_PATH(yytext, *driver.loc.back()); } + YY_BREAK + case 97: + YY_RULE_SETUP +-#line 607 "seclang-scanner.ll" ++#line 608 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_LENGTH(yytext, *driver.loc.back()); } + YY_BREAK + case 98: + YY_RULE_SETUP +-#line 608 "seclang-scanner.ll" ++#line 609 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_UTF8_TO_UNICODE(yytext, *driver.loc.back()); } + YY_BREAK + case 99: + YY_RULE_SETUP +-#line 609 "seclang-scanner.ll" ++#line 610 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR(yytext, *driver.loc.back()); } + YY_BREAK + case 100: + YY_RULE_SETUP +-#line 610 "seclang-scanner.ll" ++#line 611 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REMOVE_COMMENTS(yytext, *driver.loc.back()); } + YY_BREAK + case 101: + YY_RULE_SETUP +-#line 611 "seclang-scanner.ll" ++#line 612 "seclang-scanner.ll" + { return p::make_ACTION_TRANSFORMATION_REPLACE_COMMENTS(yytext, *driver.loc.back()); } + YY_BREAK + case 102: + YY_RULE_SETUP +-#line 612 "seclang-scanner.ll" ++#line 613 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_LOG_DATA(yytext, *driver.loc.back()); } + YY_BREAK + case 103: + YY_RULE_SETUP +-#line 614 "seclang-scanner.ll" ++#line 615 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_DETC(yytext, *driver.loc.back()); } + YY_BREAK + case 104: + YY_RULE_SETUP +-#line 615 "seclang-scanner.ll" ++#line 616 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_OFF(yytext, *driver.loc.back()); } + YY_BREAK + case 105: + YY_RULE_SETUP +-#line 616 "seclang-scanner.ll" ++#line 617 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_ON(yytext, *driver.loc.back()); } + YY_BREAK + case 106: + YY_RULE_SETUP +-#line 617 "seclang-scanner.ll" ++#line 618 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_RELEVANT_ONLY(yytext, *driver.loc.back()); } + YY_BREAK + case 107: + /* rule 107 can match eol */ + YY_RULE_SETUP +-#line 618 "seclang-scanner.ll" ++#line 619 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 108: + /* rule 108 can match eol */ + YY_RULE_SETUP +-#line 619 "seclang-scanner.ll" ++#line 620 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 109: + YY_RULE_SETUP +-#line 623 "seclang-scanner.ll" ++#line 624 "seclang-scanner.ll" + { return p::make_COMMA(*driver.loc.back()); } + YY_BREAK + +@@ -6156,75 +6163,75 @@ YY_RULE_SETUP + case 110: + /* rule 110 can match eol */ + YY_RULE_SETUP +-#line 628 "seclang-scanner.ll" ++#line 629 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 111: + /* rule 111 can match eol */ + YY_RULE_SETUP +-#line 629 "seclang-scanner.ll" ++#line 630 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 112: + YY_RULE_SETUP +-#line 634 "seclang-scanner.ll" ++#line 635 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); } + YY_BREAK + case 113: + /* rule 113 can match eol */ + YY_RULE_SETUP +-#line 635 "seclang-scanner.ll" ++#line 636 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(1); } + YY_BREAK + case 114: + /* rule 114 can match eol */ + YY_RULE_SETUP +-#line 636 "seclang-scanner.ll" ++#line 637 "seclang-scanner.ll" + { BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 115: + YY_RULE_SETUP +-#line 641 "seclang-scanner.ll" ++#line 642 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(yyleng); p::make_NEW_LINE(*driver.loc.back()); } + YY_BREAK + case 116: + /* rule 116 can match eol */ + YY_RULE_SETUP +-#line 642 "seclang-scanner.ll" ++#line 643 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(1); } + YY_BREAK + case 117: + /* rule 117 can match eol */ + YY_RULE_SETUP +-#line 643 "seclang-scanner.ll" ++#line 644 "seclang-scanner.ll" + { BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 118: + YY_RULE_SETUP +-#line 648 "seclang-scanner.ll" ++#line 649 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_ACTION); yyless(0); } + YY_BREAK + + + case 119: + YY_RULE_SETUP +-#line 653 "seclang-scanner.ll" ++#line 654 "seclang-scanner.ll" + { BEGIN(ACTION_PREDICATE_ENDS_WITH_QUOTE); } + YY_BREAK + case 120: + YY_RULE_SETUP +-#line 654 "seclang-scanner.ll" ++#line 655 "seclang-scanner.ll" + { BEGIN(ACTION_PREDICATE_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 121: + YY_RULE_SETUP +-#line 655 "seclang-scanner.ll" ++#line 656 "seclang-scanner.ll" + { BEGIN(ACTION_PREDICATE_ENDS_WITH_COMMA_OR_DOUBLE_QUOTE); yyless(0); } + YY_BREAK + +@@ -6232,116 +6239,116 @@ YY_RULE_SETUP + case 122: + /* rule 122 can match eol */ + YY_RULE_SETUP +-#line 660 "seclang-scanner.ll" ++#line 661 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 123: + /* rule 123 can match eol */ + YY_RULE_SETUP +-#line 661 "seclang-scanner.ll" ++#line 662 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + + + case 124: + YY_RULE_SETUP +-#line 665 "seclang-scanner.ll" ++#line 666 "seclang-scanner.ll" + { yyless(1); BEGIN_PREVIOUS(); } + YY_BREAK + case 125: + YY_RULE_SETUP +-#line 666 "seclang-scanner.ll" ++#line 667 "seclang-scanner.ll" + { BEGIN_PREVIOUS(); } + YY_BREAK + case 126: + YY_RULE_SETUP +-#line 667 "seclang-scanner.ll" ++#line 668 "seclang-scanner.ll" + { BEGIN_PREVIOUS(); } + YY_BREAK + + + case 127: + YY_RULE_SETUP +-#line 671 "seclang-scanner.ll" ++#line 672 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(yyleng); } + YY_BREAK + case 128: + /* rule 128 can match eol */ + YY_RULE_SETUP +-#line 672 "seclang-scanner.ll" ++#line 673 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 129: + YY_RULE_SETUP +-#line 676 "seclang-scanner.ll" ++#line 677 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(yyleng); } + YY_BREAK + case 130: + /* rule 130 can match eol */ + YY_RULE_SETUP +-#line 677 "seclang-scanner.ll" ++#line 678 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 131: + YY_RULE_SETUP +-#line 681 "seclang-scanner.ll" ++#line 682 "seclang-scanner.ll" + { yyless(0); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 132: + YY_RULE_SETUP +-#line 682 "seclang-scanner.ll" ++#line 683 "seclang-scanner.ll" + { yyless(0); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE);} + YY_BREAK + case 133: + /* rule 133 can match eol */ + YY_RULE_SETUP +-#line 683 "seclang-scanner.ll" ++#line 684 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 134: + YY_RULE_SETUP +-#line 687 "seclang-scanner.ll" ++#line 688 "seclang-scanner.ll" + { BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + case 135: + YY_RULE_SETUP +-#line 688 "seclang-scanner.ll" ++#line 689 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } + YY_BREAK + + + case 136: + YY_RULE_SETUP +-#line 692 "seclang-scanner.ll" ++#line 693 "seclang-scanner.ll" + { return p::make_NOT(*driver.loc.back()); } + YY_BREAK + case 137: + /* rule 137 can match eol */ + YY_RULE_SETUP +-#line 693 "seclang-scanner.ll" ++#line 694 "seclang-scanner.ll" + { BEGIN_ACTION_OPERATION(); yyless(0); } + YY_BREAK + + + case 138: + YY_RULE_SETUP +-#line 698 "seclang-scanner.ll" ++#line 699 "seclang-scanner.ll" + { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } + YY_BREAK + case 139: + YY_RULE_SETUP +-#line 699 "seclang-scanner.ll" ++#line 700 "seclang-scanner.ll" + { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } + YY_BREAK + case 140: + YY_RULE_SETUP +-#line 700 "seclang-scanner.ll" ++#line 701 "seclang-scanner.ll" + { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } + YY_BREAK + +@@ -6349,27 +6356,27 @@ YY_RULE_SETUP + case 141: + /* rule 141 can match eol */ + YY_RULE_SETUP +-#line 704 "seclang-scanner.ll" ++#line 705 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0);} + YY_BREAK + + + case 142: + YY_RULE_SETUP +-#line 708 "seclang-scanner.ll" ++#line 709 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 143: + /* rule 143 can match eol */ + YY_RULE_SETUP +-#line 709 "seclang-scanner.ll" ++#line 710 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_ACTION); yyless(0); } + YY_BREAK + + + case 144: + YY_RULE_SETUP +-#line 717 "seclang-scanner.ll" ++#line 718 "seclang-scanner.ll" + { BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + +@@ -6377,1995 +6384,1993 @@ YY_RULE_SETUP + case 145: + /* rule 145 can match eol */ + YY_RULE_SETUP +-#line 722 "seclang-scanner.ll" ++#line 723 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 146: + /* rule 146 can match eol */ + YY_RULE_SETUP +-#line 723 "seclang-scanner.ll" ++#line 724 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0); } + YY_BREAK + + + case 147: + YY_RULE_SETUP +-#line 728 "seclang-scanner.ll" ++#line 729 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 148: + /* rule 148 can match eol */ + YY_RULE_SETUP +-#line 729 "seclang-scanner.ll" ++#line 730 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 149: + /* rule 149 can match eol */ + YY_RULE_SETUP +-#line 730 "seclang-scanner.ll" ++#line 731 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0); } + YY_BREAK + + + case YY_STATE_EOF(FINISH_ACTIONS): +-#line 738 "seclang-scanner.ll" ++#line 739 "seclang-scanner.ll" + { BEGIN(INITIAL); yyless(0); p::make_NEW_LINE(*driver.loc.back()); } + YY_BREAK + case 150: + YY_RULE_SETUP +-#line 739 "seclang-scanner.ll" ++#line 740 "seclang-scanner.ll" + { BEGIN(INITIAL); } + YY_BREAK + + case 151: + /* rule 151 can match eol */ + YY_RULE_SETUP +-#line 742 "seclang-scanner.ll" ++#line 743 "seclang-scanner.ll" + { return p::make_CONFIG_COMPONENT_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); } + YY_BREAK + case 152: + /* rule 152 can match eol */ + YY_RULE_SETUP +-#line 743 "seclang-scanner.ll" ++#line 744 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_SERVER_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); } + YY_BREAK + case 153: + /* rule 153 can match eol */ + YY_RULE_SETUP +-#line 744 "seclang-scanner.ll" ++#line 745 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(strchr(yytext, ' ') + 2), *driver.loc.back()); } + YY_BREAK + case 154: + YY_RULE_SETUP +-#line 745 "seclang-scanner.ll" ++#line 746 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 155: + YY_RULE_SETUP +-#line 746 "seclang-scanner.ll" ++#line 747 "seclang-scanner.ll" + { return p::make_CONFIG_CONTENT_INJECTION(*driver.loc.back()); } + YY_BREAK + case 156: + YY_RULE_SETUP +-#line 747 "seclang-scanner.ll" ++#line 748 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR_MOD(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 157: + YY_RULE_SETUP +-#line 748 "seclang-scanner.ll" ++#line 749 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR_MOD(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 158: + YY_RULE_SETUP +-#line 749 "seclang-scanner.ll" ++#line 750 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 159: + YY_RULE_SETUP +-#line 750 "seclang-scanner.ll" ++#line 751 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 160: + YY_RULE_SETUP +-#line 751 "seclang-scanner.ll" ++#line 752 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_ARGUMENT_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 161: + YY_RULE_SETUP +-#line 752 "seclang-scanner.ll" ++#line 753 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_ARGUMENT_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 162: + YY_RULE_SETUP +-#line 753 "seclang-scanner.ll" ++#line 754 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_ENG(yytext, *driver.loc.back()); } + YY_BREAK + case 163: + YY_RULE_SETUP +-#line 754 "seclang-scanner.ll" ++#line 755 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_FLE_MOD(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 164: + YY_RULE_SETUP +-#line 755 "seclang-scanner.ll" ++#line 756 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG2(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 165: + YY_RULE_SETUP +-#line 756 "seclang-scanner.ll" ++#line 757 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG_P(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 166: + YY_RULE_SETUP +-#line 757 "seclang-scanner.ll" ++#line 758 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG_P(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 167: + YY_RULE_SETUP +-#line 758 "seclang-scanner.ll" ++#line 759 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 168: + YY_RULE_SETUP +-#line 759 "seclang-scanner.ll" ++#line 760 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG_FMT(*driver.loc.back()); } + YY_BREAK + case 169: + YY_RULE_SETUP +-#line 760 "seclang-scanner.ll" ++#line 761 "seclang-scanner.ll" + { return p::make_JSON(*driver.loc.back()); } + YY_BREAK + case 170: + YY_RULE_SETUP +-#line 761 "seclang-scanner.ll" ++#line 762 "seclang-scanner.ll" + { return p::make_NATIVE(*driver.loc.back()); } + YY_BREAK + case 171: + YY_RULE_SETUP +-#line 762 "seclang-scanner.ll" ++#line 763 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_LOG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 172: + YY_RULE_SETUP +-#line 763 "seclang-scanner.ll" ++#line 764 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_STS(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 173: + YY_RULE_SETUP +-#line 764 "seclang-scanner.ll" ++#line 765 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_STS(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 174: + YY_RULE_SETUP +-#line 765 "seclang-scanner.ll" ++#line 766 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_AUDIT_TPE(yytext, *driver.loc.back()); } + YY_BREAK + case 175: + YY_RULE_SETUP +-#line 768 "seclang-scanner.ll" ++#line 769 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_DEBUG_LOG(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 176: + YY_RULE_SETUP +-#line 769 "seclang-scanner.ll" ++#line 770 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_DEBUG_LOG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 177: + YY_RULE_SETUP +-#line 770 "seclang-scanner.ll" ++#line 771 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_DEBUG_LVL(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 178: + YY_RULE_SETUP +-#line 771 "seclang-scanner.ll" ++#line 772 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_GEO_DB(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 179: + YY_RULE_SETUP +-#line 772 "seclang-scanner.ll" ++#line 773 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 180: + YY_RULE_SETUP +-#line 773 "seclang-scanner.ll" ++#line 774 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_PCRE_MATCH_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 181: + YY_RULE_SETUP +-#line 774 "seclang-scanner.ll" ++#line 775 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_ARGS_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 182: + YY_RULE_SETUP +-#line 775 "seclang-scanner.ll" ++#line 776 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_JSON_DEPTH_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 183: + YY_RULE_SETUP +-#line 776 "seclang-scanner.ll" ++#line 777 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 184: + YY_RULE_SETUP +-#line 778 "seclang-scanner.ll" ++#line 779 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_LIMIT_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 185: + YY_RULE_SETUP +-#line 779 "seclang-scanner.ll" ++#line 780 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 186: + YY_RULE_SETUP +-#line 780 "seclang-scanner.ll" ++#line 781 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 187: + YY_RULE_SETUP +-#line 781 "seclang-scanner.ll" ++#line 782 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_REQ_BODY(yytext, *driver.loc.back()); } + YY_BREAK + case 188: + YY_RULE_SETUP +-#line 782 "seclang-scanner.ll" ++#line 783 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RES_BODY_LIMIT_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 189: + YY_RULE_SETUP +-#line 783 "seclang-scanner.ll" ++#line 784 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RES_BODY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 190: + YY_RULE_SETUP +-#line 784 "seclang-scanner.ll" ++#line 785 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RES_BODY(yytext, *driver.loc.back()); } + YY_BREAK + case 191: + YY_RULE_SETUP +-#line 785 "seclang-scanner.ll" ++#line 786 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_RULE_ENG(yytext, *driver.loc.back()); } + YY_BREAK + case 192: + YY_RULE_SETUP +-#line 786 "seclang-scanner.ll" ++#line 787 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_SEC_MARKER(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 193: + YY_RULE_SETUP +-#line 787 "seclang-scanner.ll" ++#line 788 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_SEC_MARKER(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 194: + YY_RULE_SETUP +-#line 788 "seclang-scanner.ll" ++#line 789 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_UNICODE_MAP_FILE(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 195: + YY_RULE_SETUP +-#line 789 "seclang-scanner.ll" ++#line 790 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 196: + YY_RULE_SETUP +-#line 790 "seclang-scanner.ll" ++#line 791 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 197: + YY_RULE_SETUP +-#line 791 "seclang-scanner.ll" ++#line 792 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 198: + YY_RULE_SETUP +-#line 792 "seclang-scanner.ll" ++#line 793 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 199: + YY_RULE_SETUP +-#line 793 "seclang-scanner.ll" ++#line 794 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_REMOVE_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 200: + YY_RULE_SETUP +-#line 794 "seclang-scanner.ll" ++#line 795 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 201: + YY_RULE_SETUP +-#line 795 "seclang-scanner.ll" ++#line 796 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 202: + YY_RULE_SETUP +-#line 796 "seclang-scanner.ll" ++#line 797 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 203: + YY_RULE_SETUP +-#line 797 "seclang-scanner.ll" ++#line 798 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 204: + YY_RULE_SETUP +-#line 798 "seclang-scanner.ll" ++#line 799 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 205: + YY_RULE_SETUP +-#line 799 "seclang-scanner.ll" ++#line 800 "seclang-scanner.ll" + { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 206: + YY_RULE_SETUP +-#line 800 "seclang-scanner.ll" ++#line 801 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 207: + YY_RULE_SETUP +-#line 801 "seclang-scanner.ll" ++#line 802 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 208: + YY_RULE_SETUP +-#line 802 "seclang-scanner.ll" ++#line 803 "seclang-scanner.ll" + { return p::make_CONFIG_UPDLOAD_KEEP_FILES(yytext, *driver.loc.back()); } + YY_BREAK + case 209: + YY_RULE_SETUP +-#line 803 "seclang-scanner.ll" ++#line 804 "seclang-scanner.ll" + { return p::make_CONFIG_UPDLOAD_SAVE_TMP_FILES(yytext, *driver.loc.back()); } + YY_BREAK + case 210: + YY_RULE_SETUP +-#line 804 "seclang-scanner.ll" ++#line 805 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 211: + YY_RULE_SETUP +-#line 805 "seclang-scanner.ll" ++#line 806 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 212: + YY_RULE_SETUP +-#line 806 "seclang-scanner.ll" ++#line 807 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_FILE_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 213: + YY_RULE_SETUP +-#line 807 "seclang-scanner.ll" ++#line 808 "seclang-scanner.ll" + { return p::make_CONFIG_UPLOAD_FILE_MODE(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 214: + YY_RULE_SETUP +-#line 808 "seclang-scanner.ll" ++#line 809 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_ABORT(yytext, *driver.loc.back()); } + YY_BREAK + case 215: + YY_RULE_SETUP +-#line 809 "seclang-scanner.ll" ++#line 810 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_DETC(yytext, *driver.loc.back()); } + YY_BREAK + case 216: + YY_RULE_SETUP +-#line 810 "seclang-scanner.ll" ++#line 811 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_HTTPS(yytext, *driver.loc.back()); } + YY_BREAK + case 217: + YY_RULE_SETUP +-#line 811 "seclang-scanner.ll" ++#line 812 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_OFF(yytext, *driver.loc.back()); } + YY_BREAK + case 218: + YY_RULE_SETUP +-#line 812 "seclang-scanner.ll" ++#line 813 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_ON(yytext, *driver.loc.back()); } + YY_BREAK + case 219: + YY_RULE_SETUP +-#line 813 "seclang-scanner.ll" ++#line 814 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_PARALLEL(yytext, *driver.loc.back()); } + YY_BREAK + case 220: + YY_RULE_SETUP +-#line 814 "seclang-scanner.ll" ++#line 815 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_PROCESS_PARTIAL(yytext, *driver.loc.back()); } + YY_BREAK + case 221: + YY_RULE_SETUP +-#line 815 "seclang-scanner.ll" ++#line 816 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_REJECT(yytext, *driver.loc.back()); } + YY_BREAK + case 222: + YY_RULE_SETUP +-#line 816 "seclang-scanner.ll" ++#line 817 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_RELEVANT_ONLY(yytext, *driver.loc.back()); } + YY_BREAK + case 223: + YY_RULE_SETUP +-#line 817 "seclang-scanner.ll" ++#line 818 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_SERIAL(yytext, *driver.loc.back()); } + YY_BREAK + case 224: + YY_RULE_SETUP +-#line 818 "seclang-scanner.ll" ++#line 819 "seclang-scanner.ll" + { return p::make_CONFIG_VALUE_WARN(yytext, *driver.loc.back()); } + YY_BREAK + case 225: + YY_RULE_SETUP +-#line 819 "seclang-scanner.ll" ++#line 820 "seclang-scanner.ll" + { return p::make_CONFIG_XML_EXTERNAL_ENTITY(yytext, *driver.loc.back()); } + YY_BREAK + case 226: + YY_RULE_SETUP +-#line 820 "seclang-scanner.ll" ++#line 821 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_RESPONSE_BODY_MP(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 227: + YY_RULE_SETUP +-#line 821 "seclang-scanner.ll" ++#line 822 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR(*driver.loc.back()); } + YY_BREAK + case 228: + YY_RULE_SETUP +-#line 822 "seclang-scanner.ll" ++#line 823 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_ARG_SEP(yytext, *driver.loc.back()); } + YY_BREAK + case 229: + YY_RULE_SETUP +-#line 823 "seclang-scanner.ll" ++#line 824 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_COOKIE_FORMAT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 230: + YY_RULE_SETUP +-#line 824 "seclang-scanner.ll" ++#line 825 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_COOKIEV0_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 231: + YY_RULE_SETUP +-#line 825 "seclang-scanner.ll" ++#line 826 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_COOKIEV0_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 232: + YY_RULE_SETUP +-#line 826 "seclang-scanner.ll" ++#line 827 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_DATA_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 233: + YY_RULE_SETUP +-#line 827 "seclang-scanner.ll" ++#line 828 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_DATA_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 234: + YY_RULE_SETUP +-#line 828 "seclang-scanner.ll" ++#line 829 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_STATUS_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 235: + YY_RULE_SETUP +-#line 829 "seclang-scanner.ll" ++#line 830 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_TMP_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 236: + YY_RULE_SETUP +-#line 830 "seclang-scanner.ll" ++#line 831 "seclang-scanner.ll" + { return p::make_CONGIG_DIR_SEC_TMP_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 237: + YY_RULE_SETUP +-#line 831 "seclang-scanner.ll" ++#line 832 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_DIRECTIVE_SECRULESCRIPT(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 238: + YY_RULE_SETUP +-#line 832 "seclang-scanner.ll" ++#line 833 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_DIRECTIVE_SECRULESCRIPT(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 239: + YY_RULE_SETUP +-#line 833 "seclang-scanner.ll" ++#line 834 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CACHE_TRANSFORMATIONS(yytext, *driver.loc.back()); } + YY_BREAK + case 240: + YY_RULE_SETUP +-#line 834 "seclang-scanner.ll" ++#line 835 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CHROOT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 241: + YY_RULE_SETUP +-#line 835 "seclang-scanner.ll" ++#line 836 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CHROOT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 242: + YY_RULE_SETUP +-#line 836 "seclang-scanner.ll" ++#line 837 "seclang-scanner.ll" + { return p::make_CONFIG_CONN_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 243: + YY_RULE_SETUP +-#line 837 "seclang-scanner.ll" ++#line 838 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_ENGINE(yytext, *driver.loc.back()); } + YY_BREAK + case 244: + YY_RULE_SETUP +-#line 838 "seclang-scanner.ll" ++#line 839 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_KEY(yytext, *driver.loc.back()); } + YY_BREAK + case 245: + YY_RULE_SETUP +-#line 839 "seclang-scanner.ll" ++#line 840 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_PARAM(yytext, *driver.loc.back()); } + YY_BREAK + case 246: + YY_RULE_SETUP +-#line 840 "seclang-scanner.ll" ++#line 841 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_METHOD_RX(yytext, *driver.loc.back()); } + YY_BREAK + case 247: + YY_RULE_SETUP +-#line 841 "seclang-scanner.ll" ++#line 842 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HASH_METHOD_PM(yytext, *driver.loc.back()); } + YY_BREAK + case 248: + YY_RULE_SETUP +-#line 842 "seclang-scanner.ll" ++#line 843 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_GSB_DB(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 249: + YY_RULE_SETUP +-#line 843 "seclang-scanner.ll" ++#line 844 "seclang-scanner.ll" + { return p::make_CONFIG_DIR_GSB_DB(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } + YY_BREAK + case 250: + YY_RULE_SETUP +-#line 844 "seclang-scanner.ll" ++#line 845 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_GUARDIAN_LOG(yytext, *driver.loc.back()); } + YY_BREAK + case 251: + YY_RULE_SETUP +-#line 845 "seclang-scanner.ll" ++#line 846 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_INTERCEPT_ON_ERROR(yytext, *driver.loc.back()); } + YY_BREAK + case 252: + YY_RULE_SETUP +-#line 846 "seclang-scanner.ll" ++#line 847 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CONN_R_STATE_LIMIT(yytext, *driver.loc.back()); } + YY_BREAK + case 253: + YY_RULE_SETUP +-#line 847 "seclang-scanner.ll" ++#line 848 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_CONN_W_STATE_LIMIT(yytext, *driver.loc.back()); } + YY_BREAK + case 254: + YY_RULE_SETUP +-#line 848 "seclang-scanner.ll" ++#line 849 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_SENSOR_ID(yytext, *driver.loc.back()); } + YY_BREAK + case 255: + YY_RULE_SETUP +-#line 849 "seclang-scanner.ll" ++#line 850 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_INHERITANCE(yytext, *driver.loc.back()); } + YY_BREAK + case 256: + YY_RULE_SETUP +-#line 850 "seclang-scanner.ll" ++#line 851 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_RULE_PERF_TIME(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 257: + YY_RULE_SETUP +-#line 851 "seclang-scanner.ll" ++#line 852 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_STREAM_IN_BODY_INSPECTION(yytext, *driver.loc.back()); } + YY_BREAK + case 258: + YY_RULE_SETUP +-#line 852 "seclang-scanner.ll" ++#line 853 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_STREAM_OUT_BODY_INSPECTION(yytext, *driver.loc.back()); } + YY_BREAK + case 259: + YY_RULE_SETUP +-#line 853 "seclang-scanner.ll" ++#line 854 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_DISABLE_BACKEND_COMPRESS(yytext, *driver.loc.back()); } + YY_BREAK + case 260: + YY_RULE_SETUP +-#line 855 "seclang-scanner.ll" ++#line 856 "seclang-scanner.ll" + { BEGIN(TRANSACTION_TO_VARIABLE); return p::make_DIRECTIVE(yytext, *driver.loc.back()); } + YY_BREAK + case 261: + YY_RULE_SETUP +-#line 856 "seclang-scanner.ll" ++#line 857 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_CONFIG_DIR_SEC_DEFAULT_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 262: + YY_RULE_SETUP +-#line 857 "seclang-scanner.ll" ++#line 858 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_CONFIG_DIR_SEC_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 263: + YY_RULE_SETUP +-#line 859 "seclang-scanner.ll" ++#line 860 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION(yytext, *driver.loc.back()); } + YY_BREAK + case 264: + YY_RULE_SETUP +-#line 860 "seclang-scanner.ll" ++#line 861 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_COLLECTION_TIMEOUT(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 265: + YY_RULE_SETUP +-#line 861 "seclang-scanner.ll" ++#line 862 "seclang-scanner.ll" + { return p::make_CONFIG_SEC_HTTP_BLKEY(strchr(yytext, ' ') + 1, *driver.loc.back()); } + YY_BREAK + case 266: + /* rule 266 can match eol */ + YY_RULE_SETUP +-#line 862 "seclang-scanner.ll" ++#line 863 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 267: + /* rule 267 can match eol */ + YY_RULE_SETUP +-#line 863 "seclang-scanner.ll" ++#line 864 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(COMMENT); } + YY_BREAK + case 268: + /* rule 268 can match eol */ + YY_RULE_SETUP +-#line 864 "seclang-scanner.ll" ++#line 865 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(COMMENT); } + YY_BREAK + case 269: + YY_RULE_SETUP +-#line 865 "seclang-scanner.ll" ++#line 866 "seclang-scanner.ll" + { driver.loc.back()->step(); /* comment, just ignore. */ } + YY_BREAK + case 270: + YY_RULE_SETUP +-#line 866 "seclang-scanner.ll" ++#line 867 "seclang-scanner.ll" + { driver.loc.back()->step(); /* carriage return, just ignore. */} + YY_BREAK + case 271: + YY_RULE_SETUP +-#line 867 "seclang-scanner.ll" ++#line 868 "seclang-scanner.ll" + { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } + YY_BREAK + case 272: + YY_RULE_SETUP +-#line 868 "seclang-scanner.ll" ++#line 869 "seclang-scanner.ll" + { return p::make_COMMA(*driver.loc.back()); } + YY_BREAK + + case 273: + YY_RULE_SETUP +-#line 871 "seclang-scanner.ll" ++#line 872 "seclang-scanner.ll" + { BEGIN(EXPECTING_VARIABLE); } + YY_BREAK + + + case 274: + YY_RULE_SETUP +-#line 875 "seclang-scanner.ll" ++#line 876 "seclang-scanner.ll" + { return p::make_PIPE(*driver.loc.back()); } + YY_BREAK + case 275: + YY_RULE_SETUP +-#line 876 "seclang-scanner.ll" ++#line 877 "seclang-scanner.ll" + { return p::make_PIPE(*driver.loc.back()); } + YY_BREAK + case 276: + YY_RULE_SETUP +-#line 877 "seclang-scanner.ll" ++#line 878 "seclang-scanner.ll" + { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } + YY_BREAK + case 277: + YY_RULE_SETUP +-#line 878 "seclang-scanner.ll" ++#line 879 "seclang-scanner.ll" + { return p::make_VAR_EXCLUSION(*driver.loc.back()); } + YY_BREAK + case 278: + YY_RULE_SETUP +-#line 879 "seclang-scanner.ll" ++#line 880 "seclang-scanner.ll" + { return p::make_VAR_COUNT(*driver.loc.back()); } + YY_BREAK + + + case 279: + YY_RULE_SETUP +-#line 883 "seclang-scanner.ll" ++#line 884 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 280: + YY_RULE_SETUP +-#line 884 "seclang-scanner.ll" ++#line 885 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 281: + /* rule 281 can match eol */ + YY_RULE_SETUP +-#line 885 "seclang-scanner.ll" ++#line 886 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 282: + /* rule 282 can match eol */ + YY_RULE_SETUP +-#line 886 "seclang-scanner.ll" ++#line 887 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 283: + /* rule 283 can match eol */ + YY_RULE_SETUP +-#line 887 "seclang-scanner.ll" ++#line 888 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + case 284: + /* rule 284 can match eol */ + YY_RULE_SETUP +-#line 888 "seclang-scanner.ll" ++#line 889 "seclang-scanner.ll" + { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } + YY_BREAK + + + case 285: + YY_RULE_SETUP +-#line 892 "seclang-scanner.ll" ++#line 893 "seclang-scanner.ll" + { } + YY_BREAK + case 286: + YY_RULE_SETUP +-#line 893 "seclang-scanner.ll" ++#line 894 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 287: + /* rule 287 can match eol */ + YY_RULE_SETUP +-#line 894 "seclang-scanner.ll" ++#line 895 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 288: + /* rule 288 can match eol */ + YY_RULE_SETUP +-#line 895 "seclang-scanner.ll" ++#line 896 "seclang-scanner.ll" + { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + + + case 289: + YY_RULE_SETUP +-#line 900 "seclang-scanner.ll" ++#line 901 "seclang-scanner.ll" + { BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } + YY_BREAK + case 290: + YY_RULE_SETUP +-#line 901 "seclang-scanner.ll" ++#line 902 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_COMBINED_SIZE(*driver.loc.back()); } + YY_BREAK + case 291: + YY_RULE_SETUP +-#line 902 "seclang-scanner.ll" ++#line 903 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_GET_NAMES(*driver.loc.back()); } + YY_BREAK + case 292: + YY_RULE_SETUP +-#line 903 "seclang-scanner.ll" ++#line 904 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_GET_NAMES(*driver.loc.back()); } + YY_BREAK + case 293: + YY_RULE_SETUP +-#line 904 "seclang-scanner.ll" ++#line 905 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_NAMES(*driver.loc.back()); } + YY_BREAK + case 294: + YY_RULE_SETUP +-#line 905 "seclang-scanner.ll" ++#line 906 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_NAMES(*driver.loc.back()); } + YY_BREAK + case 295: + YY_RULE_SETUP +-#line 906 "seclang-scanner.ll" ++#line 907 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_POST_NAMES(*driver.loc.back()); } + YY_BREAK + case 296: + YY_RULE_SETUP +-#line 907 "seclang-scanner.ll" ++#line 908 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_POST_NAMES(*driver.loc.back()); } + YY_BREAK + case 297: + YY_RULE_SETUP +-#line 908 "seclang-scanner.ll" ++#line 909 "seclang-scanner.ll" + { return p::make_VARIABLE_AUTH_TYPE(*driver.loc.back()); } + YY_BREAK + case 298: + YY_RULE_SETUP +-#line 909 "seclang-scanner.ll" ++#line 910 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_COMBINED_SIZE(*driver.loc.back()); } + YY_BREAK + case 299: + YY_RULE_SETUP +-#line 910 "seclang-scanner.ll" ++#line 911 "seclang-scanner.ll" + { return p::make_VARIABLE_FULL_REQUEST_LENGTH(*driver.loc.back()); } + YY_BREAK + case 300: + YY_RULE_SETUP +-#line 911 "seclang-scanner.ll" ++#line 912 "seclang-scanner.ll" + { return p::make_VARIABLE_FULL_REQUEST(*driver.loc.back()); } + YY_BREAK + case 301: + YY_RULE_SETUP +-#line 912 "seclang-scanner.ll" ++#line 913 "seclang-scanner.ll" + { return p::make_VARIABLE_INBOUND_DATA_ERROR(*driver.loc.back()); } + YY_BREAK + case 302: + YY_RULE_SETUP +-#line 913 "seclang-scanner.ll" ++#line 914 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VAR_NAME(*driver.loc.back()); } + YY_BREAK + case 303: + YY_RULE_SETUP +-#line 914 "seclang-scanner.ll" ++#line 915 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VAR(*driver.loc.back()); } + YY_BREAK + case 304: + YY_RULE_SETUP +-#line 915 "seclang-scanner.ll" ++#line 916 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_BOUNDARY_QUOTED(*driver.loc.back()); } + YY_BREAK + case 305: + YY_RULE_SETUP +-#line 916 "seclang-scanner.ll" ++#line 917 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE(*driver.loc.back()); } + YY_BREAK + case 306: + YY_RULE_SETUP +-#line 917 "seclang-scanner.ll" ++#line 918 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_CRLF_LF_LINES(*driver.loc.back()); } + YY_BREAK + case 307: + YY_RULE_SETUP +-#line 918 "seclang-scanner.ll" ++#line 919 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_DATA_AFTER(*driver.loc.back()); } + YY_BREAK + case 308: + YY_RULE_SETUP +-#line 919 "seclang-scanner.ll" ++#line 920 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_DATA_BEFORE(*driver.loc.back()); } + YY_BREAK + case 309: + YY_RULE_SETUP +-#line 920 "seclang-scanner.ll" ++#line 921 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED(*driver.loc.back()); } + YY_BREAK + case 310: + YY_RULE_SETUP +-#line 921 "seclang-scanner.ll" ++#line 922 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_FILENAME(*driver.loc.back()); } + YY_BREAK + case 311: + YY_RULE_SETUP +-#line 922 "seclang-scanner.ll" ++#line 923 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_FILENAME(*driver.loc.back()); } + YY_BREAK + case 312: + YY_RULE_SETUP +-#line 923 "seclang-scanner.ll" ++#line 924 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_HEADER_FOLDING(*driver.loc.back()); } + YY_BREAK + case 313: + YY_RULE_SETUP +-#line 924 "seclang-scanner.ll" ++#line 925 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_HEADER_FOLDING(*driver.loc.back()); } + YY_BREAK + case 314: + YY_RULE_SETUP +-#line 925 "seclang-scanner.ll" ++#line 926 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING(*driver.loc.back()); } + YY_BREAK + case 315: + YY_RULE_SETUP +-#line 926 "seclang-scanner.ll" ++#line 927 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_INVALID_PART(*driver.loc.back()); } + YY_BREAK + case 316: + YY_RULE_SETUP +-#line 927 "seclang-scanner.ll" ++#line 928 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_INVALID_QUOTING(*driver.loc.back()); } + YY_BREAK + case 317: + YY_RULE_SETUP +-#line 928 "seclang-scanner.ll" ++#line 929 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_LF_LINE(*driver.loc.back()); } + YY_BREAK + case 318: + YY_RULE_SETUP +-#line 929 "seclang-scanner.ll" ++#line 930 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_MISSING_SEMICOLON(*driver.loc.back()); } + YY_BREAK + case 319: + YY_RULE_SETUP +-#line 930 "seclang-scanner.ll" ++#line 931 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_SEMICOLON_MISSING(*driver.loc.back()); } + YY_BREAK + case 320: + YY_RULE_SETUP +-#line 931 "seclang-scanner.ll" ++#line 932 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_NAME(*driver.loc.back()); } + YY_BREAK + case 321: + YY_RULE_SETUP +-#line 932 "seclang-scanner.ll" ++#line 933 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_NAME(*driver.loc.back()); } + YY_BREAK + case 322: + YY_RULE_SETUP +-#line 933 "seclang-scanner.ll" ++#line 934 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_STRICT_ERROR(*driver.loc.back()); } + YY_BREAK + case 323: + YY_RULE_SETUP +-#line 934 "seclang-scanner.ll" ++#line 935 "seclang-scanner.ll" + { return p::make_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY(*driver.loc.back()); } + YY_BREAK + case 324: + YY_RULE_SETUP +-#line 935 "seclang-scanner.ll" ++#line 936 "seclang-scanner.ll" + { return p::make_VARIABLE_OUTBOUND_DATA_ERROR(*driver.loc.back()); } + YY_BREAK + case 325: + YY_RULE_SETUP +-#line 936 "seclang-scanner.ll" ++#line 937 "seclang-scanner.ll" + { return p::make_VARIABLE_PATH_INFO(*driver.loc.back()); } + YY_BREAK + case 326: + YY_RULE_SETUP +-#line 937 "seclang-scanner.ll" ++#line 938 "seclang-scanner.ll" + { return p::make_VARIABLE_QUERY_STRING(*driver.loc.back()); } + YY_BREAK + case 327: + YY_RULE_SETUP +-#line 938 "seclang-scanner.ll" ++#line 939 "seclang-scanner.ll" + { return p::make_VARIABLE_REMOTE_ADDR(*driver.loc.back()); } + YY_BREAK + case 328: + YY_RULE_SETUP +-#line 939 "seclang-scanner.ll" ++#line 940 "seclang-scanner.ll" + { return p::make_VARIABLE_REMOTE_HOST(*driver.loc.back()); } + YY_BREAK + case 329: + YY_RULE_SETUP +-#line 940 "seclang-scanner.ll" ++#line 941 "seclang-scanner.ll" + { return p::make_VARIABLE_REMOTE_PORT(*driver.loc.back()); } + YY_BREAK + case 330: + YY_RULE_SETUP +-#line 941 "seclang-scanner.ll" ++#line 942 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_ERROR_MSG(*driver.loc.back()); } + YY_BREAK + case 331: + YY_RULE_SETUP +-#line 942 "seclang-scanner.ll" ++#line 943 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_ERROR(*driver.loc.back()); } + YY_BREAK + case 332: + YY_RULE_SETUP +-#line 943 "seclang-scanner.ll" ++#line 944 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG(*driver.loc.back()); } + YY_BREAK + case 333: + YY_RULE_SETUP +-#line 944 "seclang-scanner.ll" ++#line 945 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_PROCESSOR_ERROR(*driver.loc.back()); } + YY_BREAK + case 334: + YY_RULE_SETUP +-#line 945 "seclang-scanner.ll" ++#line 946 "seclang-scanner.ll" + { return p::make_VARIABLE_REQBODY_PROCESSOR(*driver.loc.back()); } + YY_BREAK + case 335: + YY_RULE_SETUP +-#line 946 "seclang-scanner.ll" ++#line 947 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_BASENAME(*driver.loc.back()); } + YY_BREAK + case 336: + YY_RULE_SETUP +-#line 947 "seclang-scanner.ll" ++#line 948 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_BODY_LENGTH(*driver.loc.back()); } + YY_BREAK + case 337: + YY_RULE_SETUP +-#line 948 "seclang-scanner.ll" ++#line 949 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_BODY(*driver.loc.back()); } + YY_BREAK + case 338: + YY_RULE_SETUP +-#line 949 "seclang-scanner.ll" ++#line 950 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_FILE_NAME(*driver.loc.back()); } + YY_BREAK + case 339: + YY_RULE_SETUP +-#line 950 "seclang-scanner.ll" ++#line 951 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 340: + YY_RULE_SETUP +-#line 951 "seclang-scanner.ll" ++#line 952 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 341: + YY_RULE_SETUP +-#line 952 "seclang-scanner.ll" ++#line 953 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_LINE(*driver.loc.back()); } + YY_BREAK + case 342: + YY_RULE_SETUP +-#line 953 "seclang-scanner.ll" ++#line 954 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_METHOD(*driver.loc.back()); } + YY_BREAK + case 343: + YY_RULE_SETUP +-#line 954 "seclang-scanner.ll" ++#line 955 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_PROTOCOL(*driver.loc.back()); } + YY_BREAK + case 344: + YY_RULE_SETUP +-#line 955 "seclang-scanner.ll" ++#line 956 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_URI_RAW(*driver.loc.back()); } + YY_BREAK + case 345: + YY_RULE_SETUP +-#line 956 "seclang-scanner.ll" ++#line 957 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_URI(*driver.loc.back()); } + YY_BREAK + case 346: + YY_RULE_SETUP +-#line 957 "seclang-scanner.ll" ++#line 958 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_BODY(*driver.loc.back()); } + YY_BREAK + case 347: + YY_RULE_SETUP +-#line 958 "seclang-scanner.ll" ++#line 959 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_CONTENT_LENGTH(*driver.loc.back()); } + YY_BREAK + case 348: + YY_RULE_SETUP +-#line 959 "seclang-scanner.ll" ++#line 960 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_CONTENT_TYPE(*driver.loc.back()); } + YY_BREAK + case 349: + YY_RULE_SETUP +-#line 960 "seclang-scanner.ll" ++#line 961 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 350: + YY_RULE_SETUP +-#line 961 "seclang-scanner.ll" ++#line 962 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RESPONSE_HEADERS_NAMES(*driver.loc.back()); } + YY_BREAK + case 351: + YY_RULE_SETUP +-#line 962 "seclang-scanner.ll" ++#line 963 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_PROTOCOL(*driver.loc.back()); } + YY_BREAK + case 352: + YY_RULE_SETUP +-#line 963 "seclang-scanner.ll" ++#line 964 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_STATUS(*driver.loc.back()); } + YY_BREAK + case 353: + YY_RULE_SETUP +-#line 964 "seclang-scanner.ll" ++#line 965 "seclang-scanner.ll" + { return p::make_VARIABLE_SERVER_ADDR(*driver.loc.back()); } + YY_BREAK + case 354: + YY_RULE_SETUP +-#line 965 "seclang-scanner.ll" ++#line 966 "seclang-scanner.ll" + { return p::make_VARIABLE_SERVER_NAME(*driver.loc.back()); } + YY_BREAK + case 355: + YY_RULE_SETUP +-#line 966 "seclang-scanner.ll" ++#line 967 "seclang-scanner.ll" + { return p::make_VARIABLE_SERVER_PORT(*driver.loc.back()); } + YY_BREAK + case 356: + YY_RULE_SETUP +-#line 967 "seclang-scanner.ll" ++#line 968 "seclang-scanner.ll" + { return p::make_VARIABLE_SESSION_ID(*driver.loc.back()); } + YY_BREAK + case 357: + YY_RULE_SETUP +-#line 968 "seclang-scanner.ll" ++#line 969 "seclang-scanner.ll" + { return p::make_VARIABLE_UNIQUE_ID(*driver.loc.back()); } + YY_BREAK + case 358: + YY_RULE_SETUP +-#line 969 "seclang-scanner.ll" ++#line 970 "seclang-scanner.ll" + { return p::make_VARIABLE_URL_ENCODED_ERROR(*driver.loc.back()); } + YY_BREAK + case 359: + YY_RULE_SETUP +-#line 970 "seclang-scanner.ll" ++#line 971 "seclang-scanner.ll" + { return p::make_VARIABLE_USER_ID(*driver.loc.back()); } + YY_BREAK + case 360: + YY_RULE_SETUP +-#line 971 "seclang-scanner.ll" ++#line 972 "seclang-scanner.ll" + { return p::make_VARIABLE_WEB_APP_ID(*driver.loc.back()); } + YY_BREAK + case 361: + YY_RULE_SETUP +-#line 972 "seclang-scanner.ll" ++#line 973 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS(*driver.loc.back()); } + YY_BREAK + case 362: + YY_RULE_SETUP +-#line 973 "seclang-scanner.ll" ++#line 974 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS(*driver.loc.back()); } + YY_BREAK + case 363: + YY_RULE_SETUP +-#line 974 "seclang-scanner.ll" ++#line 975 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_GET(*driver.loc.back()); } + YY_BREAK + case 364: + YY_RULE_SETUP +-#line 975 "seclang-scanner.ll" ++#line 976 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_GET(*driver.loc.back()); } + YY_BREAK + case 365: + YY_RULE_SETUP +-#line 976 "seclang-scanner.ll" ++#line 977 "seclang-scanner.ll" + { return p::make_VARIABLE_ARGS_POST(*driver.loc.back()); } + YY_BREAK + case 366: + YY_RULE_SETUP +-#line 977 "seclang-scanner.ll" ++#line 978 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_POST(*driver.loc.back()); } + YY_BREAK + case 367: + YY_RULE_SETUP +-#line 978 "seclang-scanner.ll" ++#line 979 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_SIZES(*driver.loc.back()); } + YY_BREAK + case 368: + YY_RULE_SETUP +-#line 979 "seclang-scanner.ll" ++#line 980 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_SIZES(*driver.loc.back()); } + YY_BREAK + case 369: + YY_RULE_SETUP +-#line 980 "seclang-scanner.ll" ++#line 981 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_NAMES(*driver.loc.back()); } + YY_BREAK + case 370: + YY_RULE_SETUP +-#line 981 "seclang-scanner.ll" ++#line 982 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_NAMES(*driver.loc.back()); } + YY_BREAK + case 371: + YY_RULE_SETUP +-#line 982 "seclang-scanner.ll" ++#line 983 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES_TMP_CONTENT(*driver.loc.back()); } + YY_BREAK + case 372: + YY_RULE_SETUP +-#line 983 "seclang-scanner.ll" ++#line 984 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_CONTENT(*driver.loc.back()); } + YY_BREAK + case 373: + YY_RULE_SETUP +-#line 984 "seclang-scanner.ll" ++#line 985 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VARS_NAMES(*driver.loc.back()); } + YY_BREAK + case 374: + YY_RULE_SETUP +-#line 985 "seclang-scanner.ll" ++#line 986 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MATCHED_VARS_NAMES(*driver.loc.back()); } + YY_BREAK + case 375: + YY_RULE_SETUP +-#line 986 "seclang-scanner.ll" ++#line 987 "seclang-scanner.ll" + { return p::make_VARIABLE_MATCHED_VARS(*driver.loc.back()); } + YY_BREAK + case 376: + YY_RULE_SETUP +-#line 987 "seclang-scanner.ll" ++#line 988 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MATCHED_VARS(*driver.loc.back()); } + YY_BREAK + case 377: + YY_RULE_SETUP +-#line 988 "seclang-scanner.ll" ++#line 989 "seclang-scanner.ll" + { return p::make_VARIABLE_FILES(*driver.loc.back()); } + YY_BREAK + case 378: + YY_RULE_SETUP +-#line 989 "seclang-scanner.ll" ++#line 990 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES(*driver.loc.back()); } + YY_BREAK + case 379: + YY_RULE_SETUP +-#line 990 "seclang-scanner.ll" ++#line 991 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_COOKIES(*driver.loc.back()); } + YY_BREAK + case 380: + YY_RULE_SETUP +-#line 991 "seclang-scanner.ll" ++#line 992 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES(*driver.loc.back()); } + YY_BREAK + case 381: + YY_RULE_SETUP +-#line 992 "seclang-scanner.ll" ++#line 993 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_HEADERS(*driver.loc.back()); } + YY_BREAK + case 382: + YY_RULE_SETUP +-#line 993 "seclang-scanner.ll" ++#line 994 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_HEADERS(*driver.loc.back()); } + YY_BREAK + case 383: + YY_RULE_SETUP +-#line 994 "seclang-scanner.ll" ++#line 995 "seclang-scanner.ll" + { return p::make_VARIABLE_RESPONSE_HEADERS(*driver.loc.back()); } + YY_BREAK + case 384: + YY_RULE_SETUP +-#line 995 "seclang-scanner.ll" ++#line 996 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RESPONSE_HEADERS(*driver.loc.back()); } + YY_BREAK + case 385: + YY_RULE_SETUP +-#line 996 "seclang-scanner.ll" ++#line 997 "seclang-scanner.ll" + { return p::make_VARIABLE_GEO(*driver.loc.back()); } + YY_BREAK + case 386: + YY_RULE_SETUP +-#line 997 "seclang-scanner.ll" ++#line 998 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_GEO(*driver.loc.back()); } + YY_BREAK + case 387: + YY_RULE_SETUP +-#line 998 "seclang-scanner.ll" ++#line 999 "seclang-scanner.ll" + { return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } + YY_BREAK + case 388: + YY_RULE_SETUP +-#line 999 "seclang-scanner.ll" ++#line 1000 "seclang-scanner.ll" + { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } + YY_BREAK + case 389: + YY_RULE_SETUP +-#line 1000 "seclang-scanner.ll" +-{ return p::make_VARIABLE_RULE(*driver.loc.back()); } ++#line 1001 "seclang-scanner.ll" ++{ return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } + YY_BREAK + case 390: + YY_RULE_SETUP +-#line 1001 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RULE(*driver.loc.back()); } ++#line 1002 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } + YY_BREAK + case 391: + YY_RULE_SETUP +-#line 1002 "seclang-scanner.ll" +-{ return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } ++#line 1003 "seclang-scanner.ll" ++{ return p::make_VARIABLE_RULE(*driver.loc.back()); } + YY_BREAK + case 392: + YY_RULE_SETUP +-#line 1003 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } ++#line 1004 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RULE(*driver.loc.back()); } + YY_BREAK + case 393: + YY_RULE_SETUP +-#line 1004 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } ++#line 1005 "seclang-scanner.ll" ++{ return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } + YY_BREAK + case 394: + YY_RULE_SETUP +-#line 1005 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } ++#line 1006 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } + YY_BREAK + case 395: + YY_RULE_SETUP +-#line 1006 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } ++#line 1007 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } + YY_BREAK + case 396: + YY_RULE_SETUP +-#line 1007 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } ++#line 1008 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } + YY_BREAK + case 397: + YY_RULE_SETUP +-#line 1008 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_BLD(yytext, *driver.loc.back()); } ++#line 1009 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } + YY_BREAK + case 398: + YY_RULE_SETUP +-#line 1009 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_DUR(yytext, *driver.loc.back()); } ++#line 1010 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } + YY_BREAK + case 399: + YY_RULE_SETUP +-#line 1010 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_HSV(yytext, *driver.loc.back()); } ++#line 1011 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_BLD(yytext, *driver.loc.back()); } + YY_BREAK + case 400: + YY_RULE_SETUP +-#line 1011 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_REMOTE_USER(yytext, *driver.loc.back()); } ++#line 1012 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_DUR(yytext, *driver.loc.back()); } + YY_BREAK + case 401: + YY_RULE_SETUP +-#line 1012 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_DAY(yytext, *driver.loc.back()); } ++#line 1013 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_HSV(yytext, *driver.loc.back()); } + YY_BREAK + case 402: + YY_RULE_SETUP +-#line 1013 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_EPOCH(yytext, *driver.loc.back()); } ++#line 1014 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_REMOTE_USER(yytext, *driver.loc.back()); } + YY_BREAK + case 403: + YY_RULE_SETUP +-#line 1014 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_HOUR(yytext, *driver.loc.back()); } ++#line 1015 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_DAY(yytext, *driver.loc.back()); } + YY_BREAK + case 404: + YY_RULE_SETUP +-#line 1015 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_MIN(yytext, *driver.loc.back()); } ++#line 1016 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_EPOCH(yytext, *driver.loc.back()); } + YY_BREAK + case 405: + YY_RULE_SETUP +-#line 1016 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_MON(yytext, *driver.loc.back()); } ++#line 1017 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_HOUR(yytext, *driver.loc.back()); } + YY_BREAK + case 406: + YY_RULE_SETUP +-#line 1017 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_SEC(yytext, *driver.loc.back()); } ++#line 1018 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_MIN(yytext, *driver.loc.back()); } + YY_BREAK + case 407: + YY_RULE_SETUP +-#line 1018 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_YEAR(yytext, *driver.loc.back()); } ++#line 1019 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_MON(yytext, *driver.loc.back()); } + YY_BREAK + case 408: + YY_RULE_SETUP +-#line 1019 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME(yytext, *driver.loc.back()); } ++#line 1020 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_SEC(yytext, *driver.loc.back()); } + YY_BREAK + case 409: + YY_RULE_SETUP +-#line 1020 "seclang-scanner.ll" +-{ return p::make_RUN_TIME_VAR_TIME_WDAY(yytext, *driver.loc.back()); } ++#line 1021 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_YEAR(yytext, *driver.loc.back()); } + YY_BREAK + case 410: + YY_RULE_SETUP +-#line 1023 "seclang-scanner.ll" +-{ driver.error (*driver.loc.back(), "Variable VARIABLE_WEBSERVER_ERROR_LOG is not supported by libModSecurity", ""); throw p::syntax_error(*driver.loc.back(), "");} ++#line 1022 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME(yytext, *driver.loc.back()); } + YY_BREAK + case 411: + YY_RULE_SETUP +-#line 1024 "seclang-scanner.ll" +-{ return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } ++#line 1023 "seclang-scanner.ll" ++{ return p::make_RUN_TIME_VAR_TIME_WDAY(yytext, *driver.loc.back()); } + YY_BREAK + case 412: + YY_RULE_SETUP +-#line 1025 "seclang-scanner.ll" +-{ return p::make_VARIABLE_IP(*driver.loc.back()); } ++#line 1026 "seclang-scanner.ll" ++{ driver.error (*driver.loc.back(), "Variable VARIABLE_WEBSERVER_ERROR_LOG is not supported by libModSecurity", ""); throw p::syntax_error(*driver.loc.back(), "");} + YY_BREAK + case 413: + YY_RULE_SETUP +-#line 1026 "seclang-scanner.ll" +-{ return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } ++#line 1027 "seclang-scanner.ll" ++{ return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } + YY_BREAK + case 414: + YY_RULE_SETUP +-#line 1027 "seclang-scanner.ll" +-{ return p::make_VARIABLE_SESSION(*driver.loc.back()); } ++#line 1028 "seclang-scanner.ll" ++{ return p::make_VARIABLE_IP(*driver.loc.back()); } + YY_BREAK + case 415: + YY_RULE_SETUP +-#line 1028 "seclang-scanner.ll" +-{ return p::make_VARIABLE_STATUS(*driver.loc.back()); } ++#line 1029 "seclang-scanner.ll" ++{ return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } + YY_BREAK + case 416: + YY_RULE_SETUP +-#line 1029 "seclang-scanner.ll" +-{ return p::make_VARIABLE_STATUS_LINE(*driver.loc.back()); } ++#line 1030 "seclang-scanner.ll" ++{ return p::make_VARIABLE_SESSION(*driver.loc.back()); } + YY_BREAK + case 417: + YY_RULE_SETUP +-#line 1030 "seclang-scanner.ll" +-{ return p::make_VARIABLE_TX(*driver.loc.back()); } ++#line 1031 "seclang-scanner.ll" ++{ return p::make_VARIABLE_STATUS(*driver.loc.back()); } + YY_BREAK + case 418: + YY_RULE_SETUP +-#line 1031 "seclang-scanner.ll" +-{ return p::make_VARIABLE_USER(*driver.loc.back()); } ++#line 1032 "seclang-scanner.ll" ++{ return p::make_VARIABLE_STATUS_LINE(*driver.loc.back()); } + YY_BREAK +- +- + case 419: + YY_RULE_SETUP +-#line 1035 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } ++#line 1033 "seclang-scanner.ll" ++{ return p::make_VARIABLE_TX(*driver.loc.back()); } + YY_BREAK + case 420: + YY_RULE_SETUP +-#line 1036 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_IP(*driver.loc.back()); } ++#line 1034 "seclang-scanner.ll" ++{ return p::make_VARIABLE_USER(*driver.loc.back()); } + YY_BREAK ++ ++ + case 421: + YY_RULE_SETUP +-#line 1037 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } ++#line 1038 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } + YY_BREAK + case 422: + YY_RULE_SETUP +-#line 1038 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_SESSION(*driver.loc.back()); } ++#line 1039 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_IP(*driver.loc.back()); } + YY_BREAK + case 423: + YY_RULE_SETUP +-#line 1039 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_TX(*driver.loc.back()); } ++#line 1040 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } + YY_BREAK + case 424: + YY_RULE_SETUP +-#line 1040 "seclang-scanner.ll" +-{ BEGINX_(); return p::make_VARIABLE_USER(*driver.loc.back()); } ++#line 1041 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_SESSION(*driver.loc.back()); } + YY_BREAK +- +- + case 425: + YY_RULE_SETUP +-#line 1045 "seclang-scanner.ll" +-{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } ++#line 1042 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_TX(*driver.loc.back()); } + YY_BREAK + case 426: + YY_RULE_SETUP +-#line 1046 "seclang-scanner.ll" +-{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } ++#line 1043 "seclang-scanner.ll" ++{ BEGINX_(); return p::make_VARIABLE_USER(*driver.loc.back()); } + YY_BREAK ++ ++ + case 427: + YY_RULE_SETUP +-#line 1047 "seclang-scanner.ll" +-{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } ++#line 1048 "seclang-scanner.ll" ++{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } + YY_BREAK + case 428: +-/* rule 428 can match eol */ + YY_RULE_SETUP +-#line 1048 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1049 "seclang-scanner.ll" ++{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } + YY_BREAK + case 429: +-/* rule 429 can match eol */ + YY_RULE_SETUP +-#line 1049 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1050 "seclang-scanner.ll" ++{ BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } + YY_BREAK + case 430: + /* rule 430 can match eol */ + YY_RULE_SETUP +-#line 1050 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1051 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 431: + /* rule 431 can match eol */ + YY_RULE_SETUP +-#line 1051 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1052 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 432: + /* rule 432 can match eol */ + YY_RULE_SETUP +-#line 1052 "seclang-scanner.ll" +-{ yyless(yyleng - 1); BEGIN_PREVIOUS(); return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1053 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 433: + /* rule 433 can match eol */ + YY_RULE_SETUP +-#line 1053 "seclang-scanner.ll" +-{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1054 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 434: + /* rule 434 can match eol */ + YY_RULE_SETUP + #line 1055 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++{ yyless(yyleng - 1); BEGIN_PREVIOUS(); return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 435: + /* rule 435 can match eol */ + YY_RULE_SETUP + #line 1056 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + case 436: ++/* rule 436 can match eol */ + YY_RULE_SETUP +-#line 1057 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(0); } ++#line 1058 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 437: ++/* rule 437 can match eol */ + YY_RULE_SETUP +-#line 1058 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(0); } ++#line 1059 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 438: + YY_RULE_SETUP +-#line 1059 "seclang-scanner.ll" +-{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } ++#line 1060 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(0); } + YY_BREAK +- +- + case 439: +-/* rule 439 can match eol */ + YY_RULE_SETUP +-#line 1064 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1061 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(0); } + YY_BREAK + case 440: +-/* rule 440 can match eol */ + YY_RULE_SETUP +-#line 1065 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1062 "seclang-scanner.ll" ++{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } + YY_BREAK ++ ++ + case 441: + /* rule 441 can match eol */ + YY_RULE_SETUP +-#line 1066 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++#line 1067 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 442: + /* rule 442 can match eol */ + YY_RULE_SETUP +-#line 1067 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1068 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 443: + /* rule 443 can match eol */ + YY_RULE_SETUP +-#line 1068 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++#line 1069 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 444: + /* rule 444 can match eol */ + YY_RULE_SETUP +-#line 1069 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); return p::make_DICT_ELEMENT(yytext, *driver.loc.back()); } ++#line 1070 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 445: + /* rule 445 can match eol */ + YY_RULE_SETUP + #line 1071 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } + YY_BREAK + case 446: + /* rule 446 can match eol */ + YY_RULE_SETUP + #line 1072 "seclang-scanner.ll" +-{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++{ BEGIN_PREVIOUS(); return p::make_DICT_ELEMENT(yytext, *driver.loc.back()); } + YY_BREAK + case 447: ++/* rule 447 can match eol */ + YY_RULE_SETUP + #line 1074 "seclang-scanner.ll" +-{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } + YY_BREAK + case 448: ++/* rule 448 can match eol */ + YY_RULE_SETUP + #line 1075 "seclang-scanner.ll" ++{ BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ++ YY_BREAK ++case 449: ++YY_RULE_SETUP ++#line 1077 "seclang-scanner.ll" ++{ BEGINX(LEXING_ERROR_ACTION); yyless(0); } ++ YY_BREAK ++case 450: ++YY_RULE_SETUP ++#line 1078 "seclang-scanner.ll" + { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } + YY_BREAK + + +-case 449: ++case 451: + YY_RULE_SETUP +-#line 1081 "seclang-scanner.ll" ++#line 1084 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_GEOLOOKUP(*driver.loc.back()); } + YY_BREAK +-case 450: ++case 452: + YY_RULE_SETUP +-#line 1082 "seclang-scanner.ll" ++#line 1085 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_UNCONDITIONAL_MATCH(*driver.loc.back()); } + YY_BREAK +-case 451: ++case 453: + YY_RULE_SETUP +-#line 1083 "seclang-scanner.ll" ++#line 1086 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_SQLI(*driver.loc.back()); } + YY_BREAK +-case 452: ++case 454: + YY_RULE_SETUP +-#line 1084 "seclang-scanner.ll" ++#line 1087 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_XSS(*driver.loc.back()); } + YY_BREAK +-case 453: ++case 455: + YY_RULE_SETUP +-#line 1085 "seclang-scanner.ll" ++#line 1088 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_URL_ENCODING(*driver.loc.back()); } + YY_BREAK +-case 454: ++case 456: + YY_RULE_SETUP +-#line 1086 "seclang-scanner.ll" ++#line 1089 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_UTF8_ENCODING(*driver.loc.back()); } + YY_BREAK + + +-case 455: ++case 457: + YY_RULE_SETUP +-#line 1089 "seclang-scanner.ll" ++#line 1092 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_GEOLOOKUP(*driver.loc.back()); } + YY_BREAK +-case 456: ++case 458: + YY_RULE_SETUP +-#line 1090 "seclang-scanner.ll" ++#line 1093 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_UNCONDITIONAL_MATCH(*driver.loc.back()); } + YY_BREAK +-case 457: ++case 459: + YY_RULE_SETUP +-#line 1091 "seclang-scanner.ll" ++#line 1094 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_SQLI(*driver.loc.back()); } + YY_BREAK +-case 458: ++case 460: + YY_RULE_SETUP +-#line 1092 "seclang-scanner.ll" ++#line 1095 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_XSS(*driver.loc.back()); } + YY_BREAK +-case 459: ++case 461: + YY_RULE_SETUP +-#line 1093 "seclang-scanner.ll" ++#line 1096 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_URL_ENCODING(*driver.loc.back()); } + YY_BREAK +-case 460: ++case 462: + YY_RULE_SETUP +-#line 1094 "seclang-scanner.ll" ++#line 1097 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_UTF8_ENCODING(*driver.loc.back()); } + YY_BREAK + + +-case 461: +-YY_RULE_SETUP +-#line 1098 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_WITHIN(*driver.loc.back()); } +- YY_BREAK +-case 462: +-YY_RULE_SETUP +-#line 1099 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS_WORD(*driver.loc.back()); } +- YY_BREAK + case 463: + YY_RULE_SETUP +-#line 1100 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS(*driver.loc.back()); } ++#line 1101 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_WITHIN(*driver.loc.back()); } + YY_BREAK + case 464: + YY_RULE_SETUP +-#line 1101 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_ENDS_WITH(*driver.loc.back()); } ++#line 1102 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS_WORD(*driver.loc.back()); } + YY_BREAK + case 465: + YY_RULE_SETUP +-#line 1102 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_EQ(*driver.loc.back()); } ++#line 1103 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS(*driver.loc.back()); } + YY_BREAK + case 466: + YY_RULE_SETUP +-#line 1103 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_GE(*driver.loc.back()); } ++#line 1104 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_ENDS_WITH(*driver.loc.back()); } + YY_BREAK + case 467: + YY_RULE_SETUP +-#line 1104 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_GT(*driver.loc.back()); } ++#line 1105 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_EQ(*driver.loc.back()); } + YY_BREAK + case 468: + YY_RULE_SETUP +-#line 1105 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH_FROM_FILE(*driver.loc.back()); } ++#line 1106 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_GE(*driver.loc.back()); } + YY_BREAK + case 469: + YY_RULE_SETUP +-#line 1106 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH(*driver.loc.back()); } ++#line 1107 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_GT(*driver.loc.back()); } + YY_BREAK + case 470: + YY_RULE_SETUP +-#line 1107 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_LE(*driver.loc.back()); } ++#line 1108 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH_FROM_FILE(*driver.loc.back()); } + YY_BREAK + case 471: + YY_RULE_SETUP +-#line 1108 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_LT(*driver.loc.back()); } ++#line 1109 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH(*driver.loc.back()); } + YY_BREAK + case 472: + YY_RULE_SETUP +-#line 1109 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM_FROM_FILE(*driver.loc.back()); } ++#line 1110 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_LE(*driver.loc.back()); } + YY_BREAK + case 473: + YY_RULE_SETUP +-#line 1110 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM(*driver.loc.back()); } ++#line 1111 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_LT(*driver.loc.back()); } + YY_BREAK + case 474: + YY_RULE_SETUP +-#line 1111 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RBL( *driver.loc.back()); } ++#line 1112 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM_FROM_FILE(*driver.loc.back()); } + YY_BREAK + case 475: + YY_RULE_SETUP +-#line 1112 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX(*driver.loc.back()); } ++#line 1113 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_PM(*driver.loc.back()); } + YY_BREAK + case 476: + YY_RULE_SETUP +-#line 1113 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX_GLOBAL(*driver.loc.back()); } ++#line 1114 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RBL( *driver.loc.back()); } + YY_BREAK + case 477: + YY_RULE_SETUP +-#line 1114 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_EQ(*driver.loc.back()); } ++#line 1115 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX(*driver.loc.back()); } + YY_BREAK + case 478: + YY_RULE_SETUP +-#line 1115 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_MATCH(*driver.loc.back()); } ++#line 1116 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RX_GLOBAL(*driver.loc.back()); } + YY_BREAK + case 479: + YY_RULE_SETUP +-#line 1116 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_BEGINS_WITH(*driver.loc.back()); } ++#line 1117 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_EQ(*driver.loc.back()); } + YY_BREAK + case 480: + YY_RULE_SETUP +-#line 1117 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_INSPECT_FILE(*driver.loc.back()); } ++#line 1118 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_STR_MATCH(*driver.loc.back()); } + YY_BREAK + case 481: + YY_RULE_SETUP +-#line 1118 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_FUZZY_HASH(*driver.loc.back()); } ++#line 1119 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_BEGINS_WITH(*driver.loc.back()); } + YY_BREAK + case 482: + YY_RULE_SETUP +-#line 1119 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_BYTE_RANGE(*driver.loc.back()); } ++#line 1120 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_INSPECT_FILE(*driver.loc.back()); } + YY_BREAK + case 483: + YY_RULE_SETUP +-#line 1120 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_DTD(*driver.loc.back()); } ++#line 1121 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_FUZZY_HASH(*driver.loc.back()); } + YY_BREAK + case 484: + YY_RULE_SETUP +-#line 1121 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_HASH(*driver.loc.back()); } ++#line 1122 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_BYTE_RANGE(*driver.loc.back()); } + YY_BREAK + case 485: + YY_RULE_SETUP +-#line 1122 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_SCHEMA(*driver.loc.back()); } ++#line 1123 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_DTD(*driver.loc.back()); } + YY_BREAK + case 486: + YY_RULE_SETUP +-#line 1123 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CC(*driver.loc.back()); } ++#line 1124 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_HASH(*driver.loc.back()); } + YY_BREAK + case 487: + YY_RULE_SETUP +-#line 1124 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CPF(*driver.loc.back()); } ++#line 1125 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_SCHEMA(*driver.loc.back()); } + YY_BREAK + case 488: + YY_RULE_SETUP +-#line 1125 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SSN(*driver.loc.back()); } ++#line 1126 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CC(*driver.loc.back()); } + YY_BREAK + case 489: + YY_RULE_SETUP +-#line 1126 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SVNR(*driver.loc.back()); } ++#line 1127 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CPF(*driver.loc.back()); } + YY_BREAK + case 490: + YY_RULE_SETUP +-#line 1127 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_GSB_LOOKUP(*driver.loc.back()); } ++#line 1128 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SSN(*driver.loc.back()); } + YY_BREAK + case 491: + YY_RULE_SETUP +-#line 1128 "seclang-scanner.ll" +-{ BEGIN_PARAMETER(); return p::make_OPERATOR_RSUB(*driver.loc.back()); } ++#line 1129 "seclang-scanner.ll" ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SVNR(*driver.loc.back()); } + YY_BREAK + case 492: + YY_RULE_SETUP + #line 1130 "seclang-scanner.ll" +-{ return p::make_NOT(*driver.loc.back()); } ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_GSB_LOOKUP(*driver.loc.back()); } + YY_BREAK + case 493: + YY_RULE_SETUP + #line 1131 "seclang-scanner.ll" +-{ BEGIN_NO_OP_INFORMED(); yyless(0); } ++{ BEGIN_PARAMETER(); return p::make_OPERATOR_RSUB(*driver.loc.back()); } + YY_BREAK +- +- + case 494: + YY_RULE_SETUP +-#line 1136 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_SPACE); } ++#line 1133 "seclang-scanner.ll" ++{ return p::make_NOT(*driver.loc.back()); } + YY_BREAK +- +- + case 495: + YY_RULE_SETUP +-#line 1140 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_QUOTE); } ++#line 1134 "seclang-scanner.ll" ++{ BEGIN_NO_OP_INFORMED(); yyless(0); } + YY_BREAK + + + case 496: + YY_RULE_SETUP +-#line 1144 "seclang-scanner.ll" +-{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } ++#line 1139 "seclang-scanner.ll" ++{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_SPACE); } + YY_BREAK ++ ++ + case 497: +-/* rule 497 can match eol */ + YY_RULE_SETUP +-#line 1145 "seclang-scanner.ll" +-{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1143 "seclang-scanner.ll" ++{ BEGIN(EXPECTING_PARAMETER_ENDS_WITH_QUOTE); } + YY_BREAK + + + case 498: + YY_RULE_SETUP +-#line 1149 "seclang-scanner.ll" ++#line 1147 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 499: + /* rule 499 can match eol */ + YY_RULE_SETUP +-#line 1150 "seclang-scanner.ll" ++#line 1148 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 500: + YY_RULE_SETUP +-#line 1153 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } ++#line 1152 "seclang-scanner.ll" ++{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 501: ++/* rule 501 can match eol */ + YY_RULE_SETUP +-#line 1154 "seclang-scanner.ll" +-{ BEGIN(LEXING_ERROR); yyless(0); } ++#line 1153 "seclang-scanner.ll" ++{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 502: + YY_RULE_SETUP +-#line 1158 "seclang-scanner.ll" +-{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } ++#line 1156 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + case 503: +-/* rule 503 can match eol */ + YY_RULE_SETUP +-#line 1159 "seclang-scanner.ll" +-{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } ++#line 1157 "seclang-scanner.ll" ++{ BEGIN(LEXING_ERROR); yyless(0); } + YY_BREAK + + + case 504: + YY_RULE_SETUP +-#line 1163 "seclang-scanner.ll" ++#line 1161 "seclang-scanner.ll" + { BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 505: + /* rule 505 can match eol */ + YY_RULE_SETUP +-#line 1164 "seclang-scanner.ll" ++#line 1162 "seclang-scanner.ll" + { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 506: + YY_RULE_SETUP +-#line 1168 "seclang-scanner.ll" +-{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } ++#line 1166 "seclang-scanner.ll" ++{ BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } + YY_BREAK + case 507: ++/* rule 507 can match eol */ + YY_RULE_SETUP +-#line 1169 "seclang-scanner.ll" +-{ BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } ++#line 1167 "seclang-scanner.ll" ++{ return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } + YY_BREAK + + + case 508: + YY_RULE_SETUP +-#line 1174 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++#line 1171 "seclang-scanner.ll" ++{ BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } + YY_BREAK + case 509: +-/* rule 509 can match eol */ + YY_RULE_SETUP +-#line 1176 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++#line 1172 "seclang-scanner.ll" ++{ BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } + YY_BREAK ++ ++ + case 510: +-/* rule 510 can match eol */ + YY_RULE_SETUP + #line 1177 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 511: + /* rule 511 can match eol */ + YY_RULE_SETUP +-#line 1178 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++#line 1179 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 512: + /* rule 512 can match eol */ + YY_RULE_SETUP +-#line 1179 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++#line 1180 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 513: + /* rule 513 can match eol */ + YY_RULE_SETUP + #line 1181 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 514: + /* rule 514 can match eol */ + YY_RULE_SETUP + #line 1182 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 515: + /* rule 515 can match eol */ + YY_RULE_SETUP +-#line 1183 "seclang-scanner.ll" ++#line 1184 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 516: + /* rule 516 can match eol */ + YY_RULE_SETUP +-#line 1184 "seclang-scanner.ll" ++#line 1185 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 517: + /* rule 517 can match eol */ + YY_RULE_SETUP + #line 1186 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 518: + /* rule 518 can match eol */ + YY_RULE_SETUP + #line 1187 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 519: + /* rule 519 can match eol */ + YY_RULE_SETUP +-#line 1188 "seclang-scanner.ll" ++#line 1189 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 520: + /* rule 520 can match eol */ + YY_RULE_SETUP +-#line 1189 "seclang-scanner.ll" ++#line 1190 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 521: ++/* rule 521 can match eol */ + YY_RULE_SETUP + #line 1191 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 522: + /* rule 522 can match eol */ + YY_RULE_SETUP +-#line 1193 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++#line 1192 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } + YY_BREAK + case 523: +-/* rule 523 can match eol */ + YY_RULE_SETUP + #line 1194 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 524: + /* rule 524 can match eol */ +@@ -8382,78 +8387,90 @@ YY_RULE_SETUP + case 526: + /* rule 526 can match eol */ + YY_RULE_SETUP +-#line 1198 "seclang-scanner.ll" ++#line 1199 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 527: + /* rule 527 can match eol */ + YY_RULE_SETUP +-#line 1199 "seclang-scanner.ll" ++#line 1200 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 528: ++/* rule 528 can match eol */ + YY_RULE_SETUP + #line 1201 "seclang-scanner.ll" +-{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK +- +- + case 529: ++/* rule 529 can match eol */ + YY_RULE_SETUP +-#line 1206 "seclang-scanner.ll" +-{ } ++#line 1202 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK + case 530: +-/* rule 530 can match eol */ + YY_RULE_SETUP +-#line 1207 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); } ++#line 1204 "seclang-scanner.ll" ++{ BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } + YY_BREAK ++ ++ + case 531: +-/* rule 531 can match eol */ + YY_RULE_SETUP +-#line 1208 "seclang-scanner.ll" +-{ driver.loc.back()->lines(1); driver.loc.back()->step(); } ++#line 1209 "seclang-scanner.ll" ++{ } + YY_BREAK +- +- + case 532: + /* rule 532 can match eol */ + YY_RULE_SETUP +-#line 1212 "seclang-scanner.ll" ++#line 1210 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 533: + /* rule 533 can match eol */ + YY_RULE_SETUP +-#line 1213 "seclang-scanner.ll" ++#line 1211 "seclang-scanner.ll" + { driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK ++ ++ + case 534: + /* rule 534 can match eol */ + YY_RULE_SETUP +-#line 1214 "seclang-scanner.ll" +-{ BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } ++#line 1215 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK +- + case 535: ++/* rule 535 can match eol */ + YY_RULE_SETUP +-#line 1219 "seclang-scanner.ll" +-{ BEGIN(LEXING_ERROR); yyless(0); } ++#line 1216 "seclang-scanner.ll" ++{ driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK + case 536: ++/* rule 536 can match eol */ + YY_RULE_SETUP +-#line 1221 "seclang-scanner.ll" +-{ driver.error (*driver.loc.back(), "Invalid input: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++#line 1217 "seclang-scanner.ll" ++{ BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } + YY_BREAK ++ + case 537: + YY_RULE_SETUP + #line 1222 "seclang-scanner.ll" +-{ driver.error (*driver.loc.back(), "Expecting an action, got: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++{ BEGIN(LEXING_ERROR); yyless(0); } + YY_BREAK + case 538: + YY_RULE_SETUP +-#line 1223 "seclang-scanner.ll" ++#line 1224 "seclang-scanner.ll" ++{ driver.error (*driver.loc.back(), "Invalid input: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++ YY_BREAK ++case 539: ++YY_RULE_SETUP ++#line 1225 "seclang-scanner.ll" ++{ driver.error (*driver.loc.back(), "Expecting an action, got: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } ++ YY_BREAK ++case 540: ++YY_RULE_SETUP ++#line 1226 "seclang-scanner.ll" + { driver.error (*driver.loc.back(), "Expecting a variable, got: : ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } + YY_BREAK + case YY_STATE_EOF(INITIAL): +@@ -8492,7 +8509,7 @@ case YY_STATE_EOF(SETVAR_ACTION_QUOTED): + case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_COLLECTION_ELEM): + case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_OPERATION): + case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_CONTENT): +-#line 1226 "seclang-scanner.ll" ++#line 1229 "seclang-scanner.ll" + { + if (yyin) { + fclose(yyin); +@@ -8508,9 +8525,9 @@ case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_CONTENT): + delete l; + } + YY_BREAK +-case 539: ++case 541: + YY_RULE_SETUP +-#line 1242 "seclang-scanner.ll" ++#line 1245 "seclang-scanner.ll" + { + std::string err; + const char *file = strchr(yytext, ' ') + 1; +@@ -8538,9 +8555,9 @@ YY_RULE_SETUP + } + } + YY_BREAK +-case 540: ++case 542: + YY_RULE_SETUP +-#line 1269 "seclang-scanner.ll" ++#line 1272 "seclang-scanner.ll" + { + std::string err; + const char *file = strchr(yytext, ' ') + 1; +@@ -8571,10 +8588,10 @@ YY_RULE_SETUP + free(f); + } + YY_BREAK +-case 541: +-/* rule 541 can match eol */ ++case 543: ++/* rule 543 can match eol */ + YY_RULE_SETUP +-#line 1299 "seclang-scanner.ll" ++#line 1302 "seclang-scanner.ll" + { + HttpsClient c; + std::string key; +@@ -8610,12 +8627,12 @@ YY_RULE_SETUP + yy_scan_string(c.content.c_str()); + } + YY_BREAK +-case 542: ++case 544: + YY_RULE_SETUP +-#line 1335 "seclang-scanner.ll" ++#line 1338 "seclang-scanner.ll" + ECHO; + YY_BREAK +-#line 8619 "seclang-scanner.cc" ++#line 8636 "seclang-scanner.cc" + + case YY_END_OF_BUFFER: + { +@@ -8934,7 +8951,7 @@ static int yy_get_next_buffer (void) + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 3953 ) ++ if ( yy_current_state >= 3966 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; +@@ -8967,11 +8984,11 @@ static int yy_get_next_buffer (void) + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 3953 ) ++ if ( yy_current_state >= 3966 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; +- yy_is_jam = (yy_current_state == 3952); ++ yy_is_jam = (yy_current_state == 3965); + + return yy_is_jam ? 0 : yy_current_state; + } +@@ -9720,7 +9737,7 @@ void yyfree (void * ptr ) + + /* %ok-for-header */ + +-#line 1335 "seclang-scanner.ll" ++#line 1338 "seclang-scanner.ll" + + + namespace modsecurity { +diff --git a/src/parser/seclang-scanner.ll b/src/parser/seclang-scanner.ll +index 8f26cd6f..4cb12685 100755 +--- a/src/parser/seclang-scanner.ll ++++ b/src/parser/seclang-scanner.ll +@@ -253,6 +253,7 @@ VARIABLE_REQUEST_HEADERS (?i:REQUEST_HEADERS) + VARIABLE_RESPONSE_HEADERS (?i:RESPONSE_HEADERS) + VARIABLE_GEO (?i:GEO) + VARIABLE_REQUEST_COOKIES_NAMES (?i:REQUEST_COOKIES_NAMES) ++VARIABLE_MULTIPART_PART_HEADERS (?i:MULTIPART_PART_HEADERS) + VARIABLE_RULE (?i:RULE) + VARIABLE_SESSION (?i:(SESSION)) + VARIABLE_IP (?i:(IP)) +@@ -996,6 +997,8 @@ EQUALS_MINUS (?i:=\-) + {VARIABLE_GEO}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_GEO(*driver.loc.back()); } + {VARIABLE_REQUEST_COOKIES_NAMES} { return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } + {VARIABLE_REQUEST_COOKIES_NAMES}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } ++{VARIABLE_MULTIPART_PART_HEADERS} { return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } ++{VARIABLE_MULTIPART_PART_HEADERS}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_PART_HEADERS(*driver.loc.back()); } + {VARIABLE_RULE} { return p::make_VARIABLE_RULE(*driver.loc.back()); } + {VARIABLE_RULE}[:.] { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RULE(*driver.loc.back()); } + {VARIABLE_FILES_TMP_NAMES} { return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } +diff --git a/src/request_body_processor/multipart.cc b/src/request_body_processor/multipart.cc +index 310b7bcb..5686725b 100644 +--- a/src/request_body_processor/multipart.cc ++++ b/src/request_body_processor/multipart.cc +@@ -102,8 +102,11 @@ Multipart::Multipart(const std::string &header, Transaction *transaction) + m_bufptr(NULL), + m_bufleft(0), + m_buf_offset(0), ++ m_crlf_state(0), ++ m_crlf_state_buf_end(0), + m_mpp(NULL), + m_mpp_state(0), ++ m_mpp_substate_part_data_read(0), + m_reserve{0}, + m_seen_data(0), + m_is_complete(0), +@@ -504,6 +507,8 @@ int Multipart::process_part_data(std::string *error, size_t offset) { + char localreserve[2] = { '\0', '\0' }; /* initialized to quiet warning */ + int bytes_reserved = 0; + ++ m_mpp_substate_part_data_read = 1; ++ + /* Preserve some bytes for later. */ + if (((MULTIPART_BUF_SIZE - m_bufleft) >= 1) && (*(p - 1) == '\n')) { + if (((MULTIPART_BUF_SIZE - m_bufleft) >= 2) && (*(p - 2) == '\r')) { +@@ -697,6 +702,7 @@ int Multipart::process_part_header(std::string *error, int offset) { + + /* Check for nul bytes. */ + len = MULTIPART_BUF_SIZE - m_bufleft; ++ int len_without_termination = len - 1; + for (i = 0; i < len; i++) { + if (m_buf[i] == '\0') { + ms_dbg_a(m_transaction, 1, +@@ -714,6 +720,7 @@ int Multipart::process_part_header(std::string *error, int offset) { + if (len > 1) { + if (m_buf[len - 2] == '\r') { + m_flag_crlf_line = 1; ++ len_without_termination--; + } else { + m_flag_lf_line = 1; + } +@@ -727,6 +734,13 @@ int Multipart::process_part_header(std::string *error, int offset) { + std::string header_value(""); + int rc; + ++ /* record the previous completed header */ ++ if (!m_mpp->m_last_header_line.empty()) { ++ m_mpp->m_header_lines.push_back(std::make_pair( ++ offset-m_mpp->m_last_header_line.length(), m_mpp->m_last_header_line)); ++ m_mpp->m_last_header_line.assign(""); ++ } ++ + if (m_mpp->m_headers.count("Content-Disposition") == 0) { + ms_dbg_a(m_transaction, 1, + "Multipart: Part missing Content-Disposition header."); +@@ -787,6 +801,7 @@ int Multipart::process_part_header(std::string *error, int offset) { + } + + m_mpp_state = 1; ++ m_mpp_substate_part_data_read = 0; + m_mpp->m_last_header_name.assign(""); + } else { /* Header line. */ + if (isspace(m_buf[0])) { +@@ -848,12 +863,21 @@ int Multipart::process_part_header(std::string *error, int offset) { + error->assign("Multipart: Part header too long."); + return false; + } ++ ++ m_mpp->m_last_header_line = m_mpp->m_last_header_name + ": " + new_value; + } else { + char *data; + std::string header_value; + std::string header_name; + /* new header */ + ++ /* record the previous completed header */ ++ if (!m_mpp->m_last_header_line.empty()) { ++ m_mpp->m_header_lines.push_back(std::make_pair( ++ offset-m_mpp->m_last_header_line.length(), m_mpp->m_last_header_line)); ++ m_mpp->m_last_header_line.assign(""); ++ } ++ + data = m_buf; + while ((*data != ':') && (*data != '\0')) { + data++; +@@ -910,6 +934,11 @@ int Multipart::process_part_header(std::string *error, int offset) { + ms_dbg_a(m_transaction, 9, + "Multipart: Added part header \"" + header_name \ + + "\" \"" + header_value + "\"."); ++ if (len_without_termination > 0) { ++ m_mpp->m_last_header_line.assign(m_buf); ++ } else { ++ m_mpp->m_last_header_line.assign(""); ++ } + } + } + +@@ -920,6 +949,13 @@ int Multipart::process_part_header(std::string *error, int offset) { + int Multipart::process_boundary(int last_part) { + /* if there was a part being built finish it */ + if (m_mpp != NULL) { ++ /* record all the part header lines from the part into the transaction collection */ ++ for (const auto& header_line : m_mpp->m_header_lines) { ++ m_transaction->m_variableMultipartPartHeaders.set(m_mpp->m_name, ++ header_line.second, header_line.first); ++ ms_dbg_a(m_transaction, 9, "Multipart: Added part header line:" + header_line.second ); ++ } ++ + /* close the temp file */ + if ((m_mpp->m_type == MULTIPART_FILE) && (m_mpp->m_tmp_file) + && (m_mpp->m_tmp_file->isValid())) { +@@ -972,6 +1008,7 @@ int Multipart::process_boundary(int last_part) { + m_mpp = new MultipartPart(); + + m_mpp_state = 0; ++ m_mpp_substate_part_data_read = 0; + + m_reserve[0] = 0; + m_reserve[1] = 0; +@@ -1099,6 +1136,33 @@ int Multipart::multipart_complete(std::string *error) { + m_boundary.size()) == 0) + && (*(m_buf + 2 + m_boundary.size()) == '-') + && (*(m_buf + 2 + m_boundary.size() + 1) == '-')) { ++ // these next two checks may result in repeating work from earlier in this fn ++ // ignore the duplication for now to minimize refactoring ++ if ((m_crlf_state_buf_end == 2) && (m_flag_lf_line != 1)) { ++ m_flag_lf_line = 1; ++ m_transaction->m_variableMultipartLFLine.set(std::to_string(m_flag_lf_line), ++ m_transaction->m_variableOffset); ++ m_transaction->m_variableMultipartCrlfLFLines.set(std::to_string(m_flag_crlf_line && m_flag_lf_line), ++ m_transaction->m_variableOffset); ++ if (m_flag_crlf_line && m_flag_lf_line) { ++ ms_dbg_a(m_transaction, 4, "Multipart: Warning: mixed line endings used (CRLF/LF)."); ++ } else if (m_flag_lf_line) { ++ ms_dbg_a(m_transaction, 4, "Multipart: Warning: incorrect line endings used (LF)."); ++ } ++ m_transaction->m_variableMultipartStrictError.set( ++ std::to_string(m_flag_lf_line) , m_transaction->m_variableOffset); ++ } ++ if ((m_mpp_substate_part_data_read == 0) && (m_flag_invalid_part != 1)) { ++ // it looks like the final boundary, but it's where part data should begin ++ m_flag_invalid_part = 1; ++ ms_dbg_a(m_transaction, 3, "Multipart: Invalid part (data contains final boundary)"); ++ m_transaction->m_variableMultipartStrictError.set( ++ std::to_string(m_flag_invalid_part) , m_transaction->m_variableOffset); ++ m_transaction->m_variableMultipartInvalidPart.set(std::to_string(m_flag_invalid_part), ++ m_transaction->m_variableOffset); ++ ms_dbg_a(m_transaction, 4, "Multipart: Warning: invalid part parsing."); ++ } ++ + /* Looks like the final boundary - process it. */ + if (process_boundary(1 /* final */) < 0) { + m_flag_error = 1; +@@ -1493,70 +1557,80 @@ bool Multipart::process(const std::string& data, std::string *error, + if ((strlen(m_buf) >= m_boundary.size() + 2) + && (strncmp(m_buf + 2, m_boundary.c_str(), + m_boundary.size()) == 0)) { +- char *boundary_end = m_buf + 2 + m_boundary.size(); +- /* if it match, AND there was a matched boundary at least, +- set the m_flag_unmatched_boundary flag to 2 +- this indicates that there were an opened boundary, which +- matches the reference, and here is the final boundary. +- The flag will differ from 0, so the previous rules ("!@eq 0") +- will catch all "errors", without any modification, but we can +- use the new, permission mode with "@eq 1" +- */ +- if (m_boundary_count > 0) { +- m_flag_unmatched_boundary = 2; +- } +- int is_final = 0; ++ if (m_crlf_state_buf_end == 2) { ++ m_flag_lf_line = 1; ++ } ++ if ((m_mpp_substate_part_data_read == 0) && (m_boundary_count > 0)) { ++ /* string matches our boundary, but it's where part data should begin */ ++ m_flag_invalid_part = 1; ++ ms_dbg_a(m_transaction, 3, "Multipart: Invalid part (data contains boundary)"); + +- /* Is this the final boundary? */ +- if ((*boundary_end == '-') +- && (*(boundary_end + 1)== '-')) { +- is_final = 1; +- boundary_end += 2; ++ } else { ++ char *boundary_end = m_buf + 2 + m_boundary.size(); ++ /* if it match, AND there was a matched boundary at least, ++ set the m_flag_unmatched_boundary flag to 2 ++ this indicates that there were an opened boundary, which ++ matches the reference, and here is the final boundary. ++ The flag will differ from 0, so the previous rules ("!@eq 0") ++ will catch all "errors", without any modification, but we can ++ use the new, permission mode with "@eq 1" ++ */ ++ if (m_boundary_count > 0) { ++ m_flag_unmatched_boundary = 2; ++ } ++ int is_final = 0; ++ ++ /* Is this the final boundary? */ ++ if ((*boundary_end == '-') ++ && (*(boundary_end + 1)== '-')) { ++ is_final = 1; ++ boundary_end += 2; ++ ++ if (m_is_complete != 0) { ++ m_flag_error = 1; ++ ms_dbg_a(m_transaction, 4, ++ "Multipart: Invalid boundary " \ ++ "(final duplicate)."); ++ ++ error->assign("Multipart: Invalid boundary " \ ++ "(final duplicate)."); ++ return false; ++ } ++ } + +- if (m_is_complete != 0) { +- m_flag_error = 1; +- ms_dbg_a(m_transaction, 4, +- "Multipart: Invalid boundary " \ +- "(final duplicate)."); ++ /* Allow for CRLF and LF line endings. */ ++ if (((*boundary_end == '\r') ++ && (*(boundary_end + 1) == '\n') ++ && (*(boundary_end + 2) == '\0')) ++ || ((*boundary_end == '\n') ++ && (*(boundary_end + 1) == '\0'))) { ++ if (*boundary_end == '\n') { ++ m_flag_lf_line = 1; ++ } else { ++ m_flag_crlf_line = 1; ++ } + +- error->assign("Multipart: Invalid boundary " \ +- "(final duplicate)."); +- return false; +- } +- } ++ if (process_boundary((is_final ? 1 : 0)) < 0) { ++ m_flag_error = true; ++ return false; ++ } + +- /* Allow for CRLF and LF line endings. */ +- if (((*boundary_end == '\r') +- && (*(boundary_end + 1) == '\n') +- && (*(boundary_end + 2) == '\0')) +- || ((*boundary_end == '\n') +- && (*(boundary_end + 1) == '\0'))) { +- if (*boundary_end == '\n') { +- m_flag_lf_line = 1; +- } else { +- m_flag_crlf_line = 1; +- } ++ if (is_final) { ++ m_is_complete = 1; ++ } + +- if (process_boundary((is_final ? 1 : 0)) < 0) { +- m_flag_error = true; ++ processed_as_boundary = 1; ++ m_boundary_count++; ++ } else { ++ /* error */ ++ m_flag_error = 1; ++ ms_dbg_a(m_transaction, 4, ++ "Multipart: Invalid boundary: " \ ++ + std::string(m_buf)); ++ error->assign("Multipart: Invalid boundary: " \ ++ + std::string(m_buf)); + return false; + } +- +- if (is_final) { +- m_is_complete = 1; +- } +- +- processed_as_boundary = 1; +- m_boundary_count++; +- } else { +- /* error */ +- m_flag_error = 1; +- ms_dbg_a(m_transaction, 4, +- "Multipart: Invalid boundary: " \ +- + std::string(m_buf)); +- error->assign("Multipart: Invalid boundary: " \ +- + std::string(m_buf)); +- return false; + } + } else { /* It looks like a boundary but */ + /* we couldn't match it. */ +@@ -1667,8 +1741,25 @@ bool Multipart::process(const std::string& data, std::string *error, + m_bufptr = m_buf; + m_bufleft = MULTIPART_BUF_SIZE; + m_buf_contains_line = (c == 0x0a) ? 1 : 0; ++ ++ if (c == 0x0a) { ++ if (m_crlf_state == 1) { ++ m_crlf_state = 3; ++ } else { ++ m_crlf_state = 2; ++ } ++ } ++ m_crlf_state_buf_end = m_crlf_state; ++ + } + ++ if (c == 0x0d) { ++ m_crlf_state = 1; ++ } else if (c != 0x0a) { ++ m_crlf_state = 0; ++ } ++ ++ + if ((m_is_complete) && (inleft != 0)) { + m_flag_data_after = 1; + ms_dbg_a(m_transaction, 4, +diff --git a/src/request_body_processor/multipart.h b/src/request_body_processor/multipart.h +index 185656e7..bfada4b9 100644 +--- a/src/request_body_processor/multipart.h ++++ b/src/request_body_processor/multipart.h +@@ -138,6 +138,9 @@ class MultipartPart { + std::string m_last_header_name; + std::unordered_map, + MyHash, MyEqual> m_headers; ++ std::string m_last_header_line; ++ std::vector> m_header_lines; ++ + + unsigned int m_offset; + unsigned int m_length; +@@ -186,6 +189,15 @@ class Multipart { + + unsigned int m_buf_offset; + ++ /* line ending status seen immediately before current position. ++ * 0 = neither LF nor CR; 1 = prev char CR; 2 = prev char LF alone; ++ * 3 = prev two chars were CRLF ++ */ ++ int m_crlf_state; ++ ++ /* crlf_state at end of previous buffer */ ++ int m_crlf_state_buf_end; ++ + /* pointer that keeps track of a part while + * it is being built + */ +@@ -197,6 +209,14 @@ class Multipart { + */ + int m_mpp_state; + ++ /* part parsing substate; if mpp_state is 1 (collecting ++ * data), then for this variable: ++ * 0 means we have not yet read any data between the ++ * post-headers blank line and the next boundary ++ * 1 means we have read at some data after that blank line ++ */ ++ int m_mpp_substate_part_data_read; ++ + /* because of the way this parsing algorithm + * works we hold back the last two bytes of + * each data chunk so that we can discard it +diff --git a/src/variables/multipart_part_headers.h b/src/variables/multipart_part_headers.h +new file mode 100644 +index 00000000..9af328eb +--- /dev/null ++++ b/src/variables/multipart_part_headers.h +@@ -0,0 +1,40 @@ ++/* ++ * ModSecurity, http://www.modsecurity.org/ ++ * Copyright (c) 2022 Trustwave Holdings, Inc. (http://www.trustwave.com/) ++ * ++ * You may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * If any of the files related to licensing are missing or if you have any ++ * other questions related to licensing please contact Trustwave Holdings, Inc. ++ * directly using the email address security at modsecurity.org. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#ifndef SRC_VARIABLES_MULTIPART_PART_HEADERS_H_ ++#define SRC_VARIABLES_MULTIPART_PART_HEADERS_H_ ++ ++#include "src/variables/variable.h" ++ ++namespace modsecurity { ++ ++class Transaction; ++namespace variables { ++ ++ ++DEFINE_VARIABLE_DICT(MultipartPartHeaders, MULTIPART_PART_HEADERS, ++ m_variableMultipartPartHeaders) ++ ++ ++} // namespace variables ++} // namespace modsecurity ++ ++#endif // SRC_VARIABLES_MULTIPART_PART_HEADERS_H_ +diff --git a/test/cppcheck_suppressions.txt b/test/cppcheck_suppressions.txt +index 5a8eb58a..1f455e7d 100644 +--- a/test/cppcheck_suppressions.txt ++++ b/test/cppcheck_suppressions.txt +@@ -54,7 +54,7 @@ duplicateBranch:src/request_body_processor/multipart.cc:93 + danglingTempReference:src/modsecurity.cc:206 + knownConditionTrueFalse:src/operators/validate_url_encoding.cc:77 + knownConditionTrueFalse:src/operators/verify_svnr.cc:87 +-rethrowNoCurrentException:headers/modsecurity/transaction.h:307 ++rethrowNoCurrentException:headers/modsecurity/transaction.h:309 + rethrowNoCurrentException:src/rule_with_actions.cc:123 + ctunullpointer:src/rule_with_actions.cc:237 + ctunullpointer:src/rule_with_operator.cc:135 +diff --git a/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json b/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json +new file mode 100644 +index 00000000..6caf58f0 +--- /dev/null ++++ b/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json +@@ -0,0 +1,166 @@ ++[ ++ { ++ "enabled":1, ++ "version_min":300000, ++ "title":"Testing Variables :: MULTIPART_PART_HEADERS (all headers)", ++ "client":{ ++ "ip":"200.249.12.31", ++ "port":123 ++ }, ++ "server":{ ++ "ip":"200.249.12.31", ++ "port":80 ++ }, ++ "request":{ ++ "headers":{ ++ "Host":"localhost", ++ "User-Agent":"curl/7.38.0", ++ "Accept":"*/*", ++ "Content-Length":"330", ++ "Content-Type":"multipart/form-data; boundary=-----------------------------69343412719991675451336310646", ++ "Expect":"100-continue" ++ }, ++ "uri":"/", ++ "method":"POST", ++ "body":[ ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm1", ++ "Content-Type: image/jpeg", ++ "", ++ "1", ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm2", ++ "", ++ "2", ++ "-------------------------------69343412719991675451336310646--" ++ ] ++ }, ++ "response":{ ++ "headers":{ ++ "Date":"Mon, 13 Jul 2015 20:02:41 GMT", ++ "Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT", ++ "Content-Type":"text/html" ++ }, ++ "body":[ ++ "no need." ++ ] ++ }, ++ "expected":{ ++ "http_code": 403, ++ "debug_log":"Variable: MULTIPART_PART_HEADERS:parm1.*Rule returned 1" ++ }, ++ "rules":[ ++ "SecRuleEngine On", ++ "SecRule MULTIPART_PART_HEADERS \"@rx content-type:.*jpeg\" \"phase:2,deny,status:403,id:500074,t:lowercase\"" ++ ] ++ }, ++ { ++ "enabled":1, ++ "version_min":300000, ++ "title":"Testing Variables :: MULTIPART_PART_HEADERS (specific header - match)", ++ "client":{ ++ "ip":"200.249.12.31", ++ "port":123 ++ }, ++ "server":{ ++ "ip":"200.249.12.31", ++ "port":80 ++ }, ++ "request":{ ++ "headers":{ ++ "Host":"localhost", ++ "User-Agent":"curl/7.38.0", ++ "Accept":"*/*", ++ "Content-Length":"330", ++ "Content-Type":"multipart/form-data; boundary=-----------------------------69343412719991675451336310646", ++ "Expect":"100-continue" ++ }, ++ "uri":"/", ++ "method":"POST", ++ "body":[ ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm1", ++ "Content-Type: image/jpeg", ++ "", ++ "1", ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm2", ++ "", ++ "2", ++ "-------------------------------69343412719991675451336310646--" ++ ] ++ }, ++ "response":{ ++ "headers":{ ++ "Date":"Mon, 13 Jul 2015 20:02:41 GMT", ++ "Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT", ++ "Content-Type":"text/html" ++ }, ++ "body":[ ++ "no need." ++ ] ++ }, ++ "expected":{ ++ "http_code": 403, ++ "debug_log":"Variable: MULTIPART_PART_HEADERS:parm1.*Rule returned 1" ++ }, ++ "rules":[ ++ "SecRuleEngine On", ++ "SecRule MULTIPART_PART_HEADERS:parm1 \"@rx content-type:.*jpeg\" \"phase:2,deny,status:403,id:500074,t:lowercase\"" ++ ] ++ }, ++ { ++ "enabled":1, ++ "version_min":300000, ++ "title":"Testing Variables :: MULTIPART_PART_HEADERS (specific header - no match)", ++ "client":{ ++ "ip":"200.249.12.31", ++ "port":123 ++ }, ++ "server":{ ++ "ip":"200.249.12.31", ++ "port":80 ++ }, ++ "request":{ ++ "headers":{ ++ "Host":"localhost", ++ "User-Agent":"curl/7.38.0", ++ "Accept":"*/*", ++ "Content-Length":"330", ++ "Content-Type":"multipart/form-data; boundary=-----------------------------69343412719991675451336310646", ++ "Expect":"100-continue" ++ }, ++ "uri":"/", ++ "method":"POST", ++ "body":[ ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm1", ++ "Content-Type: image/jpeg", ++ "", ++ "1", ++ "-------------------------------69343412719991675451336310646", ++ "Content-Disposition: form-data; name=parm2", ++ "", ++ "2", ++ "-------------------------------69343412719991675451336310646--" ++ ] ++ }, ++ "response":{ ++ "headers":{ ++ "Date":"Mon, 13 Jul 2015 20:02:41 GMT", ++ "Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT", ++ "Content-Type":"text/html" ++ }, ++ "body":[ ++ "no need." ++ ] ++ }, ++ "expected":{ ++ "http_code": 200 ++ }, ++ "rules":[ ++ "SecRuleEngine On", ++ "SecRule MULTIPART_PART_HEADERS:parm2 \"@rx content-type:.*jpeg\" \"phase:2,deny,status:403,id:500074,t:lowercase\"" ++ ] ++ } ++] +-- +2.37.2 + diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 916ba8fbcb..1fd11034a0 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -15,6 +15,9 @@ LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity # We're patching build/libmaxmind.m4 and build/pcre.m4 LIBMODSECURITY_AUTORECONF = YES +#0005-Multipart-parsing-fixes-and-new-MULTIPART_PART_HEADE.patch +LIBMODSECURITY_IGNORE_CVES += CVE-2022-48279 + LIBMODSECURITY_DEPENDENCIES = pcre2 LIBMODSECURITY_CONF_OPTS = \ --without-pcre \ -- 2.37.2 From thomas.petazzoni at bootlin.com Mon Feb 27 07:39:43 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 27 Feb 2023 07:39:43 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-26 Message-ID: <20230227073951.3E47E4017B@smtp2.osuosl.org> Hello, Autobuild statistics for 2023-02-26 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 11 | 13 | 0 | 24 | master | 141 | 126 | 0 | 267 | next | 22 | 18 | 0 | 40 | Classification of failures by reason for master ----------------------------------------------- elfutils-0.186 | 8 host-go-1.19.6 | 6 glibc-2.36-81-g4f4d7a13edfd... | 5 host-binutils-2.38 | 5 libgcrypt-1.10.1 | 5 host-binutils-2.39 | 4 linux-6.1.11 | 4 olsr-0.9.8 | 4 unknown | 4 busybox-1.36.0 | 3 host-pahole-1.24 | 3 libglib2-2.72.3 | 3 libgpg-error-1.46 | 3 fs/ubifs/ubifs.mk:49: /home... | 2 host-rust-1.67.0 | 2 json-c-0.16 | 2 linux-5.10.162-cip24-rt10 | 2 mxs-bootlets-10.12.01 | 2 open62541-v1.3.4 | 2 package/multipath-tools/mul... | 2 perl-5.36.0 | 2 php-xdebug-3.0.4 | 2 tbb-2021.5.0 | 2 uccp420wlan-6.9.1 | 2 bat-0.19.0 | 1 brltty-6.5 | 1 coremark-1.01 | 1 docker-cli-23.0.0 | 1 f2fs-tools-1.15.0 | 1 file-5.43 | 1 fontconfig-2.13.1 | 1 freeradius-client-1.1.7 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/romfs/romfs.mk:32: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gdal-3.5.2 | 1 gerbera-1.10.0 | 1 gobject-introspection-1.72.0 | 1 host-binutils-2.37 | 1 host-gcc-initial-11.3.0 | 1 host-runc-1.1.4 | 1 lapack-3.10.1 | 1 libndp-1.8 | 1 libunwind-1.6.2 | 1 linux-tools | 1 ltp-testsuite-20220930 | 1 lttng-modules-2.13.7 | 1 network-manager-1.40.10 | 1 openssh-9.1p1 | 1 pcm-tools-202110 | 1 proxychains-ng-4.16 | 1 rdma-core-44.0 | 1 rtl8189es-e58bd86c9d9408c64... | 1 rtty-8.1.0 | 1 sdl-1.2.15 | 1 speechd-0.11.4 | 1 toolchain-external-codescap... | 1 uboot-tools-2021.07 | 1 valgrind-3.19.0 | 1 wolfssl-5.5.3 | 1 xenomai-3.0.10 | 1 xvisor-0.3.1 | 1 xwayland-22.1.8 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/d359c5a1caf9cc039089908e4d8bcdda87c302c0 | powerpc | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/f076937123d7c1fc2c95d86f655a77347f603837 | mips | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/33ff4d87eb24387c3ccdb6f5d4c1717fea91d668 | ORPH mipsel | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/65d3005aaafab5382faac6f734f1befd30103d0a | ORPH arm | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/d662c8ac62fdacd3b68813bc6ecbc83e07faad6f | ORPH microblaze | coremark-1.01 | NOK | http://autobuild.buildroot.net/results/77982ac868a4120034bc9762f56b59d17cf1098d | x86_64 | docker-cli-23.0.0 | NOK | http://autobuild.buildroot.net/results/02079f0795a75d31f62435da5ccd7a76093b0973 | microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/6892399294f0b4c320b1f2a1022f88f1eace357c | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/8508ccea4bf86f1716413e210f004f493090f619 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/0d6b4518a922ef0e455678e4f88769692d98890c | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/cd4e83a2ac30cfdc3a163c12369db0e518470484 | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/4ea3f9deb2798588540d821553957849b946caed | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/63315a676850a536f1db20391b5ccb2b5057473f | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/71d15219c9afdadc69f93e9ff72d2a8fdfcd4135 | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/eb63ad1a920ddcc3d3519f9cf892122de5c31906 | ORPH or1k | f2fs-tools-1.15.0 | NOK | http://autobuild.buildroot.net/results/085c91b0d6b1f6ac297b82c899b1e1e0816386ac | i686 | file-5.43 | NOK | http://autobuild.buildroot.net/results/80166602d01819ba98f1702133d2e77e304585d8 | ORPH riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/53b801c69eaae50321520ce2bb2395de65e926cb | ORPH riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/2d40fec0a8bc7dd32c6ccc6237d4265d2d42db31 | powerpc64le | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/961ccfa10ad3f5f957d132ae87e6db2902723430 | aarch64_be | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/a1d5dddf3f5c516884c83a9097e5fbe40f61d58e | or1k | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/ba53e1eaf0aa3dfce16d35425b0cc8fa987f5a5a | i686 | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/f1371c23e36095c133a7cc9eb0ba4320e40d88f0 | s390x | fs/romfs/romfs.mk:32: /home... | NOK | http://autobuild.buildroot.net/results/1eaec44366a0fe5500143eb2aadcb3f3f331b8c4 | powerpc64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/95b7154e5c84471925b9cbe274e354b1e96873e4 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/200e0b33c5a587fb4b82eeab1276b24c3c39e6e5 | nios2 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/4581cb327e67c95f4e7853ea72d964ffacb21142 | sparc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/c0e70b73a8e314bb378d29729a21fb63fba035c3 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/238ec09c67adb4b62a1a62d74de434eb50dce9d2 | aarch64_be | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/0255fbd68afd0f16f67b4839d55e0e97b96f9449 | sparc | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/5f0947a0ac3308aacecd5e26a8728aeeaf8fcae9 | s390x | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/7d01d09c87f862c15228d4beec2cc43de2aa4e2c | mipsel | gdal-3.5.2 | NOK | http://autobuild.buildroot.net/results/aa2a88990a07e551c40efb0c2180768add600c4f | powerpc64le | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/74a44ed2c0084424ca570d0b4a1a20384c79446e | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/953b1dc17928312899add4ba2cbc10b3374d8f3e | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/82d963fcd42c94311807a7d6e403c3d754fb829a | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/7f90adc63443f3ba289e37dd464bdad9e0c1cbbd | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/214c4956a2a4d7289927766ee218ac395d39cd15 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/9c9f1ea06306ac22655fbbd0c10f4aedd9808b6b | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/994cc64adf1541555174c5b97bb2e1bb4eea4dc9 | ORPH mips | host-binutils-2.37 | NOK | http://autobuild.buildroot.net/results/2820e59c856c1c09de87ca19704e1cc312b28b8a | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/71aa317e1a85c36e98ff093bff25a676c372c608 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/b80593bee3e88954b62d02dcd2e82c86ba658ab0 | s390x | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/33314415a06359cd4b62134b6c9c46fdc150c0f9 | mips64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/4de4252a4a648efc44d993a48689c838c32c92b9 | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/b9d49a1c7d26b79bb284f2ce8fc138a74bb63e3e | mipsel | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/a21a612f348e2a22b2c0ca78b061bb1b2d5c4b11 | i586 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/2f8da7b66c10de49ec9a52f58fa9007936d5b160 | powerpc64le | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/66748b53d289631c7687b6a5303efe61e3c31b1e | i586 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/23193bb4e3914d47e940e612b844f1e0c7e44e82 | mipsel | host-gcc-initial-11.3.0 | NOK | http://autobuild.buildroot.net/results/7f6ccfb1ec81bae4d6a8d20bfdd1a9ea95bec3e1 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/c58d6adafd4e7c77900b0dbaccecc55053e95eea | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/4f73da6a223866cb00309972b4a4dd89ae01d78e | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/415671041898b7f3c004cff741a900b3b8a4efee | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/5a410867816999f5298a8449dd2816d64b06415d | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/df9ee852d7bf23c7895d76008b08854a24fa11d7 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/8e85d20b784a1e2669c379151fa4ad852bc88463 | microblaze | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/8f5771975ee505b7bb379a9b08eac90f690eac90 | riscv32 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/3d128590ace2c3f21e27d10b2f2c19bfc3fdeafc | i686 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/93c6d914d829fcb49e93cb032dd9d6aed97ea860 | sparc | host-runc-1.1.4 | NOK | http://autobuild.buildroot.net/results/e3aad73680a4806362b08fd65354007fb688859d | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/7bfe53685e47be73609bfdf1ab770e6b7982706f | i686 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/3e915f01567c053f75b081ff0c74364227bb7743 | or1k | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/2f9cfe5d4fba663b6695e5642eb41c8ea326ed67 | riscv64 | json-c-0.16 | NOK | http://autobuild.buildroot.net/results/550f4622f3d0a30200ecc143cb68e4b2ed7ee725 | sh4 | lapack-3.10.1 | NOK | http://autobuild.buildroot.net/results/bc71780512d0f1e05788da8b26929a786e1c25f3 | i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/a702fa5d95b0274e0ae8b0e477078cf6623e65fe | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/614af65fbe8a1df790f236ca94cdb822d04c8fc8 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/886d48c551b5904ccb8e10b844858ec844a48264 | ORPH armeb | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/14ff1f9ca7e0d34c35d451a59df1885cfd4158f7 | ORPH i686 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/c7a04604bfb94d876c7b5cbdc175b1ba05f5678d | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/127a957748ad0824f3e032090af04d36ff5f27e0 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/52c16b1e14a2f9aaa619aabc61975ba7409f0c83 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/059b92bcb5f6beade6236e0b0cd30b5a69ea0a95 | aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/65ce1988c4e9441f3db585fd772d6b092153dbe1 | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/bdf82d021efdea3753de180a8d0e625e83bc684b | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/18d22d95960f1f71c120df578690adf6ea8f25f2 | ORPH riscv64 | libndp-1.8 | NOK | http://autobuild.buildroot.net/results/926441b7c388f0b066dea33ec20446fcb59a1a3f | aarch64 | libunwind-1.6.2 | NOK | http://autobuild.buildroot.net/results/f45c7f173948da11826f963da36706ee1dd59079 | ORPH m68k | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/1816df3d96663533c631a9a5f50725636392c6fc | ORPH sh4a | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/861acab636500e95ef27f4312468416d51269171 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/b031d4da2cfe3f868e64142aa17f0a280352b216 | ORPH x86_64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/d40d84a0312896d45f8bd27b7d6e41e721b0f7d0 | ORPH mips | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/1f379e543df574be186058ae254eb6d887b1ea88 | ORPH mips64el | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/516b08976d6524b8f8866ac677ff7466bf632ee4 | ORPH mips64 | linux-tools | NOK | http://autobuild.buildroot.net/results/48a1b4c520c041167e609c0526e92d891b4c823c | ORPH i586 | ltp-testsuite-20220930 | NOK | http://autobuild.buildroot.net/results/b53e3e8f46a458fd8f7064637f7565470f8951e1 | powerpc64le | lttng-modules-2.13.7 | NOK | http://autobuild.buildroot.net/results/0f0ef3ae623afec9bbc2266eae44494ba7225a37 | arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/14e73676aa57e28fe6e6a0de42ceae46b4cedd7f | ORPH arm | mxs-bootlets-10.12.01 | NOK | http://autobuild.buildroot.net/results/2ae073556bb77fa5292bf022ea394fb86d530c2b | ORPH mipsel | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/e0c98ca5ca147a8825b5cc1dc9ca22f224fd7ca0 | ORPH sh4 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/fa7ae8c9d3f0f52ab20351b202bbd2481b15eea4 | ORPH arm | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/68f85e1c2815337185d209169d2a7dea4303dc79 | ORPH sh4eb | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/8e1981743807ac7b333489a7cf3b32149276f3e3 | ORPH mips64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/e7fb9304ea4561744d2f81c8047bcefc0007e6a9 | ORPH nios2 | open62541-v1.3.4 | NOK | http://autobuild.buildroot.net/results/8030da7146c423fa9d9fbd18dcb7180e6b2fe069 | ORPH nios2 | open62541-v1.3.4 | NOK | http://autobuild.buildroot.net/results/4a16f9d34b684fea9c60056c50b55407a97bbe5b | ORPH m68k | openssh-9.1p1 | NOK | http://autobuild.buildroot.net/results/4cf5f51f1eb440153638336d631b1300db1fb6cd | ORPH aarch64 | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/54ca43da642e30d7d561f28ab5d4af752d87f012 | aarch64_be | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/a4cb0c48e2cc97dfff2404dceb9d499d8a9fa9aa | x86_64 | pcm-tools-202110 | NOK | http://autobuild.buildroot.net/results/d28ef7b5056d588c8a54d07e1129038a1798761b | ORPH sh4 | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/8f4ee06771b98fec61cb3df63cdceed9cb8074e3 | arc | perl-5.36.0 | NOK | http://autobuild.buildroot.net/results/709930e2fa55f1dbc0018a925879df47e1c9304a | powerpc64 | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/d21f58f6caf0e272df2a67f34b83208a81e995de | mipsel | php-xdebug-3.0.4 | NOK | http://autobuild.buildroot.net/results/ad26dc42ede5b75cec059c2ad34e094fca8d8b76 | mips64 | proxychains-ng-4.16 | NOK | http://autobuild.buildroot.net/results/e9ca1f8b089697d912e06956b6a4a2bc9cd94bd2 | ORPH armeb | rdma-core-44.0 | NOK | http://autobuild.buildroot.net/results/55966526989e3d4d9a8317f4fab7cc63a04cafeb | powerpc64 | rtl8189es-e58bd86c9d9408c64... | NOK | http://autobuild.buildroot.net/results/45efdb0806d0bb2f7d542be80ed02bf2dc080df4 | sparc | rtty-8.1.0 | NOK | http://autobuild.buildroot.net/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 | sh4eb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/e06f83566565c2a6483dad3a777d6da114e2eb65 | ORPH armeb | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/6cc9fe329adc8d2c68e6cb0a529fa0ccca48a290 | i686 | tbb-2021.5.0 | NOK | http://autobuild.buildroot.net/results/8689491f079f93ea5cc61db0ec868d1d604c66e6 | i686 | tbb-2021.5.0 | NOK | http://autobuild.buildroot.net/results/07914c6525af1be58e27c0cfc1d538a667faddb0 | mips | toolchain-external-codescap... | NOK | http://autobuild.buildroot.net/results/39576cd8c81426fdaf1c27ea627130e9784335c2 | ORPH mips64el | uboot-tools-2021.07 | NOK | http://autobuild.buildroot.net/results/b6bf5f32c3fa444446664816c5bf0f56695cb749 | ORPH powerpc64 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/ebc38a28b7e20d76dc486442a9e0688562a351c4 | powerpc64 | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/7cd7151e390b8f7a0df3e647fe4cd5d6319a830b | or1k | unknown | NOK | http://autobuild.buildroot.net/results/4b209774b62cb83385ca695f72155ea0d6d4a4a9 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/23f0341c41a3a518f11b001385b07189e5797ef3 | mips | unknown | NOK | http://autobuild.buildroot.net/results/0672553db5de0278033cb0b21b3769bba52e3d61 | arc | unknown | NOK | http://autobuild.buildroot.net/results/31377a9222ec38eeaa9a192cf7c6829bbf4032f4 | mips64el | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/7fe3d35e3c2099e0eecee1e2e5fded86ffbf340b | ORPH mips | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/19cbf934ca1c01533cf9ab079139abbacc8be322 | aarch64 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/5b97496b2d8d8accb6cf778309a699a19709d93d | riscv32 | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/a15579974043d92c36f12e1135b27b31923d40b1 | aarch64_be | xwayland-22.1.8 | NOK | http://autobuild.buildroot.net/results/cccc8f97d452ed2adbcbc4624f159a00287a3d38 | Classification of failures by reason for next --------------------------------------------- host-pahole-1.24 | 3 gobject-introspection-1.72.0 | 2 unknown | 2 android-tools-4.2.2+git2013... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 glibc-2.36-81-g4f4d7a13edfd... | 1 gqrx-2.14.4 | 1 host-go-1.19.6 | 1 libglib2-2.72.3 | 1 mutt-2.2.9 | 1 optee-client-3.19.0 | 1 package/network-manager/net... | 1 sdl-1.2.15 | 1 xenomai-3.0.10 | 1 Detail of failures for next --------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/4b1ea99ebde09867f580fc6985396526421c152f | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/7c472d586194fb97d1f4cae112199747ec14f5fc | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/fac0583002f3dd32543578060fed53c3eb2fc3bc | or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/354fc7a4a787a803e47f2b4f48e8f71307476b25 | ORPH mips | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/4e4686a01a5e207f4c4b6c813f75bb05abaf2002 | ORPH or1k | gqrx-2.14.4 | NOK | http://autobuild.buildroot.net/results/cc9f87441fdcf0389370a3640deacc465124b2d5 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/563d7d6afc195bfcae6ce8f38dbfb613e5ef4c33 | powerpc | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/e14ebad94a79da7ece47d3b3957a0b698cb9fae1 | aarch64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/f84cf0126d124c3537fc59d42138c6a8918bb2dd | sh4aeb | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/af8997da46d37a0e98f5ef22a95b03968c2e7d56 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/03013da54101cf827cf85dcf6ca1358913bc29c7 | mips64 | mutt-2.2.9 | NOK | http://autobuild.buildroot.net/results/5ebb752c146d841f9c622d7e0b55cf187fffc954 | arc | optee-client-3.19.0 | NOK | http://autobuild.buildroot.net/results/1c11e7e2f05098d967b1c8e25da92f47de9278ed | sparc64 | package/network-manager/net... | NOK | http://autobuild.buildroot.net/results/fec307b784010fc66217242f61476657739e663b | sh4eb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/09473f4ad5266c965989a29f1b008b72da1e10a8 | ORPH powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/cfca1ea2b0ab2b28517fe5f7540d0d0330348ac7 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/a8177ad3d3081fafa85bdfb64380b599ee015dee | microblazeel | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/5c7eaae71114f366b04221467b67f72731dd4241 | Classification of failures by reason for 2022.11.x -------------------------------------------------- python-numpy-1.23.4 | 2 boost-1.80.0 | 1 gcr-3.40.0 | 1 gdb-11.2 | 1 glibc-2.36-66-ga1dc0be03c9d... | 1 gobject-introspection-1.72.0 | 1 host-go-1.19.5 | 1 libgcrypt-1.10.1 | 1 libglib2-2.72.3 | 1 lttng-modules-2.13.1 | 1 mongodb-4.2.18 | 1 ssdp-responder-1.8 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/eb2c9d92c347a38d85ead3ecb411ff46ae51f96f | x86_64 | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/07cc3be53e1db3c98c5efa0bdc5485ed54305fcf | ORPH xtensa | gdb-11.2 | NOK | http://autobuild.buildroot.net/results/fc5232659678d6e4790d19a96bcca49acd3cc33a | ORPH powerpc | glibc-2.36-66-ga1dc0be03c9d... | NOK | http://autobuild.buildroot.net/results/ed89a3cd01a42468eeafe27305e5a2a61188de7b | mips | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/715ae2ad9a290e13131d4e0935660cedb2dbb2f6 | ORPH mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/54613237d55470a4945d021fdef2816b33220df0 | i586 | libgcrypt-1.10.1 | NOK | http://autobuild.buildroot.net/results/cf4977f46017cdccded71ede2b1f8ecd2e79c077 | ORPH arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/a1ee19f9fe9b6a09c2502f3117971d6223f33ff0 | aarch64 | lttng-modules-2.13.1 | NOK | http://autobuild.buildroot.net/results/197699b3bbd6ca2be332878116761b81df7dbd58 | aarch64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/9433845c0225e45e6784566e0772474f6be3a576 | aarch64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/bcd17aa6925bd6f17db0d33ba0d29a577c67d215 | aarch64 | python-numpy-1.23.4 | NOK | http://autobuild.buildroot.net/results/68023d341e85884ee11df18cd5ad0b074fb5dbb1 | x86_64 | ssdp-responder-1.8 | NOK | http://autobuild.buildroot.net/results/f405dece0413e6935172a28446c294c8ab37be90 | Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.0.6 | 7.0.11 | ORPH acpica | DISTRO | https://release-monitoring.org/project/00018 | 20220331 | 20222010 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 43 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.5.4 | 4.6.0 | alfred | DISTRO | https://release-monitoring.org/project/241870 | 2022.1 | 2023.0 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 13.0.0_r31 | angularjs | DISTRO | https://release-monitoring.org/project/21321 | 1.8.2 | 1.8.3 | apitrace | DISTRO | https://release-monitoring.org/project/06170 | 10.0 | 11.1 | apr | DISTRO | https://release-monitoring.org/project/00095 | 1.7.0 | 1.7.2 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 12.0.1 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.29.1 | 20.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.46.0 | atkmm | DISTRO | https://release-monitoring.org/project/07962 | 2.36.1 | 2.36.2 | atop | DISTRO | https://release-monitoring.org/project/00135 | 2.8.0 | 2.8.1 | audit | DISTRO | https://release-monitoring.org/project/15225 | 3.0.7 | 3.1 | autoconf-archive | DISTRO | https://release-monitoring.org/project/00142 | 2022.09.03 | 2023.02.20 | ORPH avocado | DISTRO | https://release-monitoring.org/project/13385 | 98.0 | 100.1 | avrdude | DISTRO | https://release-monitoring.org/project/10751 | 6.4 | 7.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_07_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.12.2 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 20.10.26 | 20.10.29 | bat | DISTRO | https://release-monitoring.org/project/241901 | 0.19.0 | 0.22.1 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2023.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2022.3 | 2023.0 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.8.2 | 1.9.0 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.2.25 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.2.25 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.2.25 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.5 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.38 | 2.40 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.11 | 2.0.12 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 24.0.1 | bluez5_utils | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bluez5_utils-headers | DISTRO | https://release-monitoring.org/project/10029 | 5.65 | 5.66 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH boost | DISTRO | https://release-monitoring.org/project/06845 | 1.80.0 | 1.81.0 | bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.2.3 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.16.2 | 6.1.3 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.21 | 3.25 | cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.8 | cairomm | DISTRO | https://release-monitoring.org/project/07959 | 1.16.1 | 1.16.2 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.5.0 | 1.5.2 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 3.9.1 | 4.2.1 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.15 | 7.0 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.18.0 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.8 | 1.0.1 | clang | DISTRO | https://release-monitoring.org/project/11811 | 11.1.0 | 15.0.7 | cli11 | DISTRO | https://release-monitoring.org/project/20578 | 2.3.1 | 2.3.2 | clinfo | DISTRO | https://release-monitoring.org/project/10503 | 3.0.21.02.21 | 3.0.23.01.25 | cloop | DISTRO | https://release-monitoring.org/project/21332 | 3.14.1.3 | 3.14.1.3+... | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.22.3 | 3.25.2 | collectl | DISTRO | https://release-monitoring.org/project/00330 | 4.3.2 | 4.3.8 | compiler-rt | GUESS | https://release-monitoring.org/project/17705 | 11.1.0 | 900 | ORPH containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.6.16 | 1.6.18 | crucible | DISTRO | https://release-monitoring.org/project/267616 | 2022.05.25 | 2022.12.06 | crudini | DISTRO | https://release-monitoring.org/project/21669 | 0.9.3 | 0.9.4 | crun | DISTRO | https://release-monitoring.org/project/96792 | 1.7.2 | 1.8 | cryptopp | DISTRO | https://release-monitoring.org/project/14487 | 8.6.0 | 8.7.0 | cukinia | DISTRO | https://release-monitoring.org/project/138119 | 0.6.0 | 0.6.1 | ORPH cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.16 | 1.28.17 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.7.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | dado | DISTRO | https://release-monitoring.org/project/58442 | 1.8.3-1 | 2.1.0-1 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.9 | 3.0.11 | dash | DISTRO | https://release-monitoring.org/project/00394 | 0.5.11.5 | 0.5.12 | ORPH datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.13.2 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.3.4 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.2.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.4.0 | dav1d | DISTRO | https://release-monitoring.org/project/18920 | 1.0.0 | 1.1.0 | dbus | DISTRO | https://release-monitoring.org/project/05356 | 1.12.24 | 1.14.6 | ORPH dbus-broker | DISTRO | https://release-monitoring.org/project/271475 | 32 | 33 | dbus-python | DISTRO | https://release-monitoring.org/project/00402 | 1.2.18 | 1.3.2 | ORPH dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH ddrescue | DISTRO | https://release-monitoring.org/project/00410 | 1.26 | 1.27 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.20.0 | 1.20.1 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20220117 | 1.3-20230209 | ORPH diffutils | DISTRO | https://release-monitoring.org/project/00436 | 3.8 | 3.9 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 23.0.0 | 23.0.1 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 2.15.1 | 2.16.0 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 23.0.0 | 23.0.1 | domoticz | DISTRO | https://release-monitoring.org/project/21342 | 2022.2 | 2023.1 | dos2unix | DISTRO | https://release-monitoring.org/project/00453 | 7.4.3 | 7.4.4 | dracut | DISTRO | https://release-monitoring.org/project/10627 | 057 | 059 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.21.4 | 9.23.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH dtc | DISTRO | https://release-monitoring.org/project/16911 | 1.6.1 | 1.7.0 | dust | DISTRO | https://release-monitoring.org/project/141344 | 0.8.1 | 0.8.4 | ORPH e2fsprogs | DISTRO | https://release-monitoring.org/project/00646 | 1.46.5 | 1.47.0 | ORPH easy-rsa | DISTRO | https://release-monitoring.org/project/17770 | 3.1.1 | 3.1.2 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.18 | 1.19 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202211 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.1 | 1.26.3 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 21.12 | 23.01 | elfutils | DISTRO | https://release-monitoring.org/project/05679 | 0.186 | 0.188 | ORPH empty | DISTRO | https://release-monitoring.org/project/20564 | 0.6.22b | 0.6.23c | ORPH enchant | DISTRO | https://release-monitoring.org/project/06601 | 2.3.3 | 2.3.4 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.1 | 0.25.4 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 25.2.3 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.21 | 1.0.22 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.11.1 | 1.11.5 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.9.1 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.16 | 1.0.22 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.29 | 1.0.30 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.14 | 1.0.15 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.10 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.8 | 1.0.9 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.47 | 1.0.49 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.27 | 1.0.29 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.47 | 1.2.7 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.13 | 1.1.16 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.23 | 1.0.25 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.5.6 | 1.6.1 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.32 | 1.0.36 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.12 | 1.0.15 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.10 | 1.0.12 | ethtool | DISTRO | https://release-monitoring.org/project/00763 | 6.1 | 6.2 | ORPH execline | DISTRO | https://release-monitoring.org/project/05482 | 2.9.0.1 | 2.9.2.1 | exiv2 | DISTRO | https://release-monitoring.org/project/00769 | 0.27.5 | 0.27.6 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.30.1 | 1.31 | ORPH feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.9.1 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.35 | 6.4.37 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.3 | 5.1.2 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH file | DISTRO | https://release-monitoring.org/project/00807 | 5.43 | 5.44 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.33 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.21.2 | flashrom | DISTRO | https://release-monitoring.org/project/10202 | 1.2.1 | 1.3.0 | flatbuffers | DISTRO | https://release-monitoring.org/project/16642 | 2.0.8 | 23.1.21 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.4 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fmc | GUESS | https://release-monitoring.org/project/145761 | LSDK-21.08 | 0.2.0 | ORPH font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 6.3.0 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.14.2 | ORPH freeradius-server | DISTRO | https://release-monitoring.org/project/00853 | 3.2.0 | 3.2.2 | freetype | DISTRO | https://release-monitoring.org/project/00854 | 2.12.1 | 2.13.0 | fscryptctl | DISTRO | https://release-monitoring.org/project/270981 | 1.0.0 | 1.1.0 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 22.09.00 | 23.01.00 | gawk | DISTRO | https://release-monitoring.org/project/00868 | 5.2.0 | 5.2.1 | ORPH gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 4.0.0 | ORPH gdal | DISTRO | https://release-monitoring.org/project/00881 | 3.5.2 | 3.6.2 | gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.5.5 | 2.6.2 | gerbera | DISTRO | https://release-monitoring.org/project/18420 | 1.10.0 | 1.12.1 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.56.1 | 10.0.0 | gitlab-runner | DISTRO | https://release-monitoring.org/project/11337 | 15.5.0 | 15.9.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.70.1 | 2.74.0 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.74.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.10.4.0 | 3.10.5.1 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.8 | 3.8.0 | ORPH go | DISTRO | https://release-monitoring.org/project/01227 | 1.19.6 | 1.20.1 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.72.0 | 1.74.0 | ORPH gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.9 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 7.1.0 | ORPH grantlee | DISTRO | https://release-monitoring.org/project/21448 | 5.2.0 | 5.3.1 | graphicsmagick | DISTRO | https://release-monitoring.org/project/01248 | 1.3.38 | 1.3.40 | grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.51.1 | 1.52.1 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 43.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gssdp | DISTRO | https://release-monitoring.org/project/01262 | 1.4.0.1 | 1.6.2 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.1.0 | gst1-shark | DISTRO | https://release-monitoring.org/project/21854 | v0.7.5 | 0.8.1 | gtest | DISTRO | https://release-monitoring.org/project/18290 | 1.12.1 | 1.13.0 | gtkmm3 | DISTRO | https://release-monitoring.org/project/311572 | 3.22.0 | 3.24.7 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.6.2 | guile | DISTRO | https://release-monitoring.org/project/01277 | 3.0.8 | 3.0.9 | gupnp | DISTRO | https://release-monitoring.org/project/01281 | 1.4.3 | 1.6.3 | gupnp-av | DISTRO | https://release-monitoring.org/project/01282 | 0.14.0 | 0.14.1 | gupnp-tools | DISTRO | https://release-monitoring.org/project/01284 | 0.10.3 | 0.12.0 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.50.3 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.6.5 | 2.7.3 | harfbuzz | DISTRO | https://release-monitoring.org/project/01299 | 5.3.1 | 7.0.1 | heimdal | DISTRO | https://release-monitoring.org/project/01307 | 7.7.1 | 7.8.0 | ORPH hiawatha | DISTRO | https://release-monitoring.org/project/13375 | 11.2 | 11.3 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.13.1 | ORPH hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.22.10 | ORPH htop | DISTRO | https://release-monitoring.org/project/01332 | 3.2.1 | 3.2.2 | ORPH htpdate | DISTRO | https://release-monitoring.org/project/132187 | 1.3.6 | 1.3.7 | hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.365 | 0.367 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.8.0 | 2.9.0 | hyperfine | DISTRO | https://release-monitoring.org/project/18526 | 1.14.0 | 1.15.0 | ORPH i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.43.0 | 2.46.1 | ibm-sw-tpm2 | DISTRO | https://release-monitoring.org/project/18952 | 1661 | 1682 | icu | DISTRO | https://release-monitoring.org/project/16134 | 70-1 | 72-1 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.41 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-51 | 7.1.0-62 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.10.0 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.6.0 | ORPH intel-gmmlib | DISTRO | https://release-monitoring.org/project/20342 | 22.3.3 | 22.3.4 | intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 23.1.0 | 23.1.2 | intel-mediasdk | DISTRO | https://release-monitoring.org/project/21814 | 23.1.0 | 23.1.2 | intel-microcode | DISTRO | https://release-monitoring.org/project/20614 | 20221108 | 20230214 | iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.493 | 3.494 | iperf3 | DISTRO | https://release-monitoring.org/project/01389 | 3.12 | 3.13 | ORPH iproute2 | DISTRO | https://release-monitoring.org/project/01392 | 6.1.0 | 6.2.0 | ipset | DISTRO | https://release-monitoring.org/project/01393 | 7.16 | 7.17 | irqbalance | DISTRO | https://release-monitoring.org/project/01402 | 1.9.0 | 1.9.2 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | irssi | DISTRO | https://release-monitoring.org/project/01404 | 1.4.2 | 1.4.3 | jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.21 | 1.9.22 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 1.1.1 | 1.1.2 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 4.0.0 | jimtcl | DISTRO | https://release-monitoring.org/project/01459 | 0.81 | 0.82 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.6 | 1.9 | jpeg-turbo | DISTRO | https://release-monitoring.org/project/01648 | 2.1.4 | 2.1.5.1 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.13.1 | 1.13.2 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.2 | jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.10.0 | 3.10.1 | kexec | DISTRO | https://release-monitoring.org/project/12689 | 2.0.25 | 2.0.26 | ORPH kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.103.0 | kodi | DISTRO | https://release-monitoring.org/project/20547 | 19.5-Matrix | 20.0-Nexus | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.7-Ma... | 21.0.1-Omega | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.3-Ma... | 20.5.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-jsonschemabuilder | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.4-Ma... | 21.0.0-Omega | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.5-Ma... | 21.0.0-Omega | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.1-Ma... | 20.5.0-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.1.0-Ma... | 20.4.0-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.6-Ma... | 20.6.1-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.3.0-Ma... | 21.1.1-Omega | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.11-M... | 20.3.2-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.6-Ma... | 20.4.0-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.3.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.4.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.3.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.4-Ma... | 20.3.1-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 21.1.1-Omega | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.5-Ma... | 20.4.0-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.1-Ma... | 21.1.1-Omega | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.3.1-Ma... | 21.1.0-Omega | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.3.0-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.16-M... | 20.3.6-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-texturepacker | DISTRO | https://release-monitoring.org/project/05511 | 19.5-Matrix | 20.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.2.0-Ma... | 20.3.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.2-Ma... | 20.1.1-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.3-Ma... | 20.2.1-Nexus | ksmbd-tools | DISTRO | https://release-monitoring.org/project/241856 | 3.4.6 | 3.4.7 | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 2.1.0 | 2.2.0 | lapack | DISTRO | https://release-monitoring.org/project/01534 | 3.10.1 | 3.11.0 | leafpad | DISTRO | https://release-monitoring.org/project/01544 | 0.8.18.1 | 0.8.19 | ORPH lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.3 | 0.3.95 | leptonica | DISTRO | https://release-monitoring.org/project/01549 | 1.82.0 | 1.83.0 | less | DISTRO | https://release-monitoring.org/project/01550 | 590 | 628 | ORPH libabseil-cpp | DISTRO | https://release-monitoring.org/project/115295 | 20220623.1 | 20230125.1 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libass | DISTRO | https://release-monitoring.org/project/01560 | 0.17.0 | 0.17.1 | libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.26 | 2.28-1 | ORPH libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.7 | libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.65 | 2.67 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 3.0.0 | libcurl | DISTRO | https://release-monitoring.org/project/00381 | 7.88.0 | 7.88.1 | libdeflate | DISTRO | https://release-monitoring.org/project/242778 | 1.15 | 1.17 | libdnet | DISTRO | https://release-monitoring.org/project/06308 | 1.16.1 | 1.16.3 | ORPH libebml | DISTRO | https://release-monitoring.org/project/07879 | 1.4.2 | 1.4.4 | libedit | DISTRO | https://release-monitoring.org/project/01599 | 20210910-3.1 | 20221030-3.1 | libevdev | DISTRO | https://release-monitoring.org/project/20540 | 1.12.1 | 1.13.0 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.14.0 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgit2 | DISTRO | https://release-monitoring.org/project/01627 | 1.5.1 | 1.6.1 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.40.0 | ORPH libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.72.3 | 2.74.6 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.4.0 | 1.6.0 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.17.1 | 1.18.0 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.30 | ORPH libgpiod | DISTRO | https://release-monitoring.org/project/20640 | 1.6.3 | 1.6.4 | ORPH libgsasl | DISTRO | https://release-monitoring.org/project/01563 | 1.10.0 | 2.2.0 | ORPH libgsm | DISTRO | https://release-monitoring.org/project/12587 | 1.0.19 | 1.0.22 | libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.8.3 | libhtp | DISTRO | https://release-monitoring.org/project/01632 | 0.5.40 | 0.5.42 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.40 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.16 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.17 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.2 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.20.1 | 1.22.1 | libjxl | DISTRO | https://release-monitoring.org/project/232764 | 0.7.0 | 0.8.1 | liblinear | DISTRO | https://release-monitoring.org/project/21363 | 2.45 | 2.46 | libmatroska | DISTRO | https://release-monitoring.org/project/01657 | 1.6.3 | 1.7.1 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.14 | 0.12.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.8 | 3.1.10 | libmodplug | DISTRO | https://release-monitoring.org/project/05669 | d1b97ed | 0.8.9.0 | ORPH libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.11 | libnfs | DISTRO | https://release-monitoring.org/project/07325 | 4.0.0 | 5.0.2 | ORPH libnftnl | DISTRO | https://release-monitoring.org/project/01681 | 1.2.3 | 1.2.4 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.2.2 | 5.0.1 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.14 | libpam-tacplus | DISTRO | https://release-monitoring.org/project/20537 | 1.6.1 | 1.7.0 | ORPH libpcap | DISTRO | https://release-monitoring.org/project/01702 | 1.10.2 | 1.10.3 | libpeas | DISTRO | https://release-monitoring.org/project/06871 | 1.32.0 | 1.34.0 | ORPH libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.7.4 | libqrtr-glib | DISTRO | https://release-monitoring.org/project/192056 | 1.0.0 | 1.2.2 | librelp | DISTRO | https://release-monitoring.org/project/01713 | 1.10.0 | 1.11.0 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.54.5 | librsync | DISTRO | https://release-monitoring.org/project/06309 | 2.3.2 | 2.3.4 | librtas | DISTRO | https://release-monitoring.org/project/10717 | 2.0.3 | 2.0.4 | ORPH libselinux | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.5 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsolv | DISTRO | https://release-monitoring.org/project/07908 | 0.7.22 | 0.7.23 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.2 | 3.2.2 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.2 | 2.5.0 | libtalloc | DISTRO | https://release-monitoring.org/project/01733 | 2.3.4 | 2.4.0 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21.1 | ORPH libtool | DISTRO | https://release-monitoring.org/project/01741 | 2.4.6 | 2.4.7 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.8 | libucl | DISTRO | https://release-monitoring.org/project/21371 | 0.8.1 | 0.8.2 | libupnp | DISTRO | https://release-monitoring.org/project/21315 | 1.14.13 | 1.14.15 | libupnpp | DISTRO | https://release-monitoring.org/project/15849 | 0.21.0 | 0.22.4 | ORPH liburcu | DISTRO | https://release-monitoring.org/project/07134 | 0.13.2 | 0.14.0 | liburing | DISTRO | https://release-monitoring.org/project/230185 | 2.2 | 2.3 | libv4l | DISTRO | https://release-monitoring.org/project/09998 | 1.22.1 | 1.24.1 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.14.1 | libvirt | DISTRO | https://release-monitoring.org/project/13830 | 7.10.0 | 9.0.0 | libvpx | DISTRO | https://release-monitoring.org/project/11083 | 1.12.0 | 1.13.0 | libwpe | DISTRO | https://release-monitoring.org/project/17789 | 1.14.0 | 1.14.1 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.29 | 4.4.33 | libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.4.0 | 1.5.0 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.54.06 | lightning | DISTRO | https://release-monitoring.org/project/01816 | 2.2.0 | 2.2.1 | lilv | DISTRO | https://release-monitoring.org/project/01818 | 0.24.12 | 0.24.20 | links | DISTRO | https://release-monitoring.org/project/01822 | 2.26 | 2.28 | ORPH linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.11 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20221214 | 20230210 | liquid-dsp | DISTRO | https://release-monitoring.org/project/14535 | 1.4.0 | 1.5.0 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2023.01.19 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.15 | 1.0.16 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 11.1.0 | 15.0.7 | log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.13.0 | 1.0.0 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.20.1 | 3.21.0 | ORPH lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | lsof | DISTRO | https://release-monitoring.org/project/01844 | 4.96.5 | 4.98.0 | ORPH ltp-testsuite | DISTRO | https://release-monitoring.org/project/21502 | 20220930 | 20230127 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.6 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.11 | lttng-libust | DISTRO | https://release-monitoring.org/project/07135 | 2.13.1 | 2.13.5 | lttng-modules | DISTRO | https://release-monitoring.org/project/07141 | 2.13.7 | 2.13.8 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.8 | 2.13.9 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.4 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luarocks | DISTRO | https://release-monitoring.org/project/01856 | 3.9.1 | 3.9.2 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.43.0-0 | 1.44.2-1 | ORPH luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.13.0 | 2.14.0 | ORPH lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.19 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzma-alone | DISTRO | https://release-monitoring.org/project/242840 | 9.22 | 2201 | ORPH lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.4.1 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.36 | 11.0.1 | ORPH mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.2 | 3.3.0 | mc | DISTRO | https://release-monitoring.org/project/01954 | 4.8.28 | 4.8.29 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.6.0 | 0.1.6.2 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.2.25 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.17 | 1.6.18 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 6.10 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 22.3.5 | 23.0.0 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 22.3.5 | 23.0.0 | meson | DISTRO | https://release-monitoring.org/project/06472 | 1.0.0 | 1.0.1 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.46.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | minizip | DISTRO | https://release-monitoring.org/project/301509 | 3.0.7 | 3.0.8 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2022.12 | 2023.02 | moby-buildkit | DISTRO | https://release-monitoring.org/project/20836 | 0.11.2 | 0.11.3 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.20.4 | 1.21.2 | modsecurity2 | DISTRO | https://release-monitoring.org/project/68638 | 2.9.7 | 3.0.8 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 6.2.0 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.8 | 7.9 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.33.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.182 | 6.12.0.190 | mp4v2 | DISTRO | https://release-monitoring.org/project/98413 | 2.1.1 | 2.1.2 | ORPH mpc | DISTRO | https://release-monitoring.org/project/01667 | 1.2.1 | 1.3.1 | ORPH mpfr | DISTRO | https://release-monitoring.org/project/02019 | 4.1.1 | 4.2.0 | ORPH mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.31.2 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.35.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 5.0.0 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.22 | 1.8.23 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.38 | 4.0.42 | ORPH nanomsg | DISTRO | https://release-monitoring.org/project/14540 | 1.1.5 | 1.2 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.18 | 2.2.2 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.3-20221224 | 6.4-20230225 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.32.4 | 0.32.5 | ORPH netatalk | DISTRO | https://release-monitoring.org/project/02063 | 3.1.13 | 3.1.14 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | 1.218 | 1.219 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.33.1 | 1.38.1 | network-manager | DISTRO | https://release-monitoring.org/project/21197 | 1.42.0 | 1.42.2 | ORPH newt | DISTRO | https://release-monitoring.org/project/15129 | 0.52.21 | 0.52.23 | ORPH nftables | DISTRO | https://release-monitoring.org/project/02082 | 1.0.5 | 1.0.6 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.52.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.22.1 | 1.23.3 | ninja | DISTRO | https://release-monitoring.org/project/02089 | 1.11.1.g9... | 1.11.1 | nmap | DISTRO | https://release-monitoring.org/project/02096 | 7.92 | 7.93 | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 16.18.1 | 19.7.0 | noip | DISTRO | https://release-monitoring.org/project/21539 | 2.1.9 | 3.0.0 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.151 | 390.157 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 525.89.02 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 2.3 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.34 | 2.0 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.6.2 | ola | DISTRO | https://release-monitoring.org/project/08354 | 0.10.8 | 0.10.9 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.3.4 | 1.3.5 | ORPH openal | DISTRO | https://release-monitoring.org/project/08172 | 1.22.0 | 1.23.0 | ORPH opencl-clhpp | DISTRO | https://release-monitoring.org/project/271141 | 2.0.16 | 2023.02.06 | opencore-amr | DISTRO | https://release-monitoring.org/project/21548 | 0.1.5 | 0.1.6 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.19 | 4.7.0 | opencv4 | DISTRO | https://release-monitoring.org/project/06615 | 4.6.0 | 4.7.0 | openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.18+10 | 21+11 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.1.4 | 4.1.5 | openocd | DISTRO | https://release-monitoring.org/project/02557 | 0.11.0 | 0.12.0 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.46 | opensc | DISTRO | https://release-monitoring.org/project/02559 | 0.22.0 | 0.23.0 | openssh | DISTRO | https://release-monitoring.org/project/02565 | 9.1p1 | 9.2p1 | ORPH openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 11.3.5-18... | 12.1.5 | openvpn | DISTRO | https://release-monitoring.org/project/02567 | 2.5.7 | 2.6.0 | ORPH opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.6.1 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | optee-benchmark | DISTRO | https://release-monitoring.org/project/21555 | 3.19.0 | 3.20.0 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 3.19.0 | 3.20.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 3.19.0 | 3.20.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 3.19.0 | 3.20.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.32 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.2.25 | ORPH osm2pgsql | DISTRO | https://release-monitoring.org/project/02575 | 1.8.0 | 1.8.1 | paho-mqtt-c | DISTRO | https://release-monitoring.org/project/21375 | 1.3.11 | 1.3.12 | pango | DISTRO | https://release-monitoring.org/project/11783 | 1.50.12 | 1.50.13 | ORPH pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.1 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.13 | 0.17.2 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.7 | ORPH pciutils | DISTRO | https://release-monitoring.org/project/02605 | 3.8.0 | 3.9.0 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202302 | ORPH pdbg | DISTRO | https://release-monitoring.org/project/21378 | 3.5 | 3.6 | perl-class-method-modifiers | DISTRO | https://release-monitoring.org/project/06735 | 2.13 | 2.14 | perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.89 | 6.90 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-file-sharedir-install | DISTRO | https://release-monitoring.org/project/11851 | 0.13 | 0.14 | perl-gdgraph | DISTRO | https://release-monitoring.org/project/09187 | 1.54 | 1.56 | perl-html-parser | DISTRO | https://release-monitoring.org/project/02967 | 3.80 | 3.81 | perl-http-daemon | DISTRO | https://release-monitoring.org/project/02975 | 6.14 | 6.16 | perl-image-exiftool | DISTRO | https://release-monitoring.org/project/06175 | 12.50 | 12.57 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.080 | 2.081 | perl-json-maybexs | DISTRO | https://release-monitoring.org/project/11953 | 1.004003 | 1.004004 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20220520 | 1.20230212 | perl-mime-tools | DISTRO | https://release-monitoring.org/project/11809 | 5.509 | 5.510 | perl-mojolicious-plugin-aut... | DISTRO | https://release-monitoring.org/project/21729 | 1.37 | 1.39 | perl-moo | DISTRO | https://release-monitoring.org/project/03123 | 2.005004 | 2.005005 | perl-net-ssh2 | DISTRO | https://release-monitoring.org/project/03163 | 0.72 | 0.73 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.93_01 | 1.92 | perl-package-stash | DISTRO | https://release-monitoring.org/project/11885 | 0.39 | 0.40 | perl-plack | DISTRO | https://release-monitoring.org/project/06578 | 1.0048 | 1.0050 | perl-sub-install | DISTRO | https://release-monitoring.org/project/03345 | 0.928 | 0.929 | perl-sub-quote | DISTRO | https://release-monitoring.org/project/12678 | 2.006006 | 2.006008 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-type-tiny | DISTRO | https://release-monitoring.org/project/14406 | 1.012004 | 2.002001 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0208 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.22 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-memcached | DISTRO | https://release-monitoring.org/project/17400 | 3.1.5 | 3.2.0 | ORPH php-pam | DISTRO | https://release-monitoring.org/project/241707 | 2.2.3 | 2.2.4 | php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.2.0 | pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.65 | 0.3.66 | pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.9.4 | ORPH pngquant | DISTRO | https://release-monitoring.org/project/03674 | 2.17.0 | 3.0.1 | poco | DISTRO | https://release-monitoring.org/project/05418 | 1.12.2 | 1.12.4 | policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 22.10.0 | 23.02.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.10 | 1.3.11 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.15 | privoxy | DISTRO | https://release-monitoring.org/project/03712 | 3.0.33 | 3.0.34 | ORPH procps-ng | DISTRO | https://release-monitoring.org/project/03708 | 3.3.17 | 4.0.3 | ORPH proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 9.1.1 | prosody | DISTRO | https://release-monitoring.org/project/03709 | 0.11.14 | 0.12.3 | protobuf | DISTRO | https://release-monitoring.org/project/03715 | 21.12 | 22.0 | pru-software-support | DISTRO | https://release-monitoring.org/project/21825 | 6.0.1 | 6.1.0 | psmisc | DISTRO | https://release-monitoring.org/project/03721 | 23.5 | 23.6 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH putty | DISTRO | https://release-monitoring.org/project/05749 | 0.76 | 0.78 | python-aexpect | DISTRO | https://release-monitoring.org/project/12442 | 1.6.4 | 1.7.0 | python-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.5.1 | 0.6.0 | python-aiofiles | DISTRO | https://release-monitoring.org/project/12743 | 22.1.0 | 23.1.0 | python-aiohttp | DISTRO | https://release-monitoring.org/project/06713 | 3.8.3 | 3.8.4 | python-aiohttp-jinja2 | DISTRO | https://release-monitoring.org/project/21247 | 1.5 | 1.5.1 | python-alembic | DISTRO | https://release-monitoring.org/project/03766 | 1.9.1 | 1.9.4 | python-argh | DISTRO | https://release-monitoring.org/project/09299 | 0.26.2 | 0.28.1 | python-async-lru | DISTRO | https://release-monitoring.org/project/56566 | 1.0.3 | 2.0.2 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 22.12.1 | 23.1.2 | python-beautifulsoup4 | DISTRO | https://release-monitoring.org/project/03779 | 4.11.1 | 4.11.2 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.26.45 | 1.26.79 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.29.45 | 1.29.79 | python-bottle | DISTRO | https://release-monitoring.org/project/11101 | 0.12.23 | 0.12.24 | python-bsdiff4 | DISTRO | https://release-monitoring.org/project/44268 | 1.2.2 | 1.2.3 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.6.1 | python-dbus-fast | DISTRO | https://release-monitoring.org/project/287975 | 1.84.0 | 1.84.2 | python-dnspython | DISTRO | https://release-monitoring.org/project/13190 | 2.2.1 | 2.3.0 | python-dtschema | DISTRO | https://release-monitoring.org/project/100908 | 2022.12 | 2023.1 | python-esptool | DISTRO | https://release-monitoring.org/project/11619 | 4.4 | 4.5 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 2.2.2 | 2.2.3 | python-flask-babel | DISTRO | https://release-monitoring.org/project/20024 | 2.0.0 | 3.0.1 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 3.0.2 | 3.0.3 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 1.0.1 | 1.1.1 | python-flatbuffers | DISTRO | https://release-monitoring.org/project/85010 | 2.0.7 | 23.1.21 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.31 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.10 | python-hatchling | DISTRO | https://release-monitoring.org/project/185085 | 1.12.2 | 1.13.0 | python-hiredis | DISTRO | https://release-monitoring.org/project/12002 | 2.0.0 | 2.2.2 | python-iptables | DISTRO | https://release-monitoring.org/project/11475 | 1.0.0 | 1.0.1 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 8.8.0 | 8.10.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-jaraco-functools | DISTRO | https://release-monitoring.org/project/20165 | 3.5.2 | 3.6.0 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.6 | 2.4.8 | python-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.1.1 | 2.1.2 | python-marshmallow-sqlalchemy | DISTRO | https://release-monitoring.org/project/50566 | 0.28.1 | 0.28.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.7.0 | python-maturin | DISTRO | https://release-monitoring.org/project/42653 | 0.14.13 | 0.14.14 | python-mbstrdecoder | DISTRO | https://release-monitoring.org/project/21702 | 1.1.1 | 1.1.2 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 2.0.4 | 2.0.5 | python-modbus-tk | DISTRO | https://release-monitoring.org/project/22813 | 1.1.2 | 1.1.3 | python-mpd2 | DISTRO | https://release-monitoring.org/project/19721 | 3.0.5 | 3.1.0 | python-mypy-extensions | DISTRO | https://release-monitoring.org/project/23367 | 0.4.3 | 1.0.0 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.23.5 | 1.24.2 | python-orjson | DISTRO | https://release-monitoring.org/project/31737 | 3.8.4 | 3.8.6 | python-packaging | DISTRO | https://release-monitoring.org/project/11718 | 22.0 | 23.0 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.12.0 | 3.0.0 | python-pathspec | DISTRO | https://release-monitoring.org/project/15607 | 0.10.3 | 0.11.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.11.0 | 5.11.1 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 22.3.1 | 23.0.1 | python-prompt-toolkit | DISTRO | https://release-monitoring.org/project/08742 | 3.0.36 | 3.0.37 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 21.12 | 22.0 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.16.0 | 3.17 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.10.4 | 1.10.5 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.3 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 3.0.2 | 3.1.3 | python-pypa-build | DISTRO | https://release-monitoring.org/project/132276 | 0.9.0 | 0.10.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.15.6 | 5.15.9 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.7.3 | 0.7.5 | python-pysmb | DISTRO | https://release-monitoring.org/project/21589 | 1.2.9 | 1.2.9.1 | python-pyspnego | DISTRO | https://release-monitoring.org/project/107092 | 0.7.0 | 0.8.0 | python-pytest | DISTRO | https://release-monitoring.org/project/03765 | 7.2.0 | 7.2.1 | python-pythran | DISTRO | https://release-monitoring.org/project/21140 | 0.12.0 | 0.12.1 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2022.7 | 2022.7.1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 24.0.1 | 25.0.0b1 | python-qrcode | DISTRO | https://release-monitoring.org/project/20011 | 7.3.1 | 7.4.2 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 4.4.0 | 4.5.1 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.28.1 | 2.28.2 | python-rtoml | DISTRO | https://release-monitoring.org/project/62048 | 0.8.0 | 0.9.0 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-scipy | DISTRO | https://release-monitoring.org/project/04768 | 1.8.1 | 1.10.1 | python-selenium | DISTRO | https://release-monitoring.org/project/05645 | 4.8.0 | 4.8.2 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.12.1 | 1.15.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 65.6.3 | 67.4.0 | python-sh | DISTRO | https://release-monitoring.org/project/10429 | 1.14.3 | 2.0.2 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.18.1 | 3.18.3 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.19.25 | 6.7.7 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.3.2.post1 | 2.4 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.4.42 | 2.0.4 | python-systemd | DISTRO | https://release-monitoring.org/project/07314 | 234 | 235 | python-tabledata | DISTRO | https://release-monitoring.org/project/21613 | 1.3.0 | 1.3.1 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 5.2.0 | 5.2.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.4 | 1.1.6 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.8.0 | 5.9.0 | python-txaio | DISTRO | https://release-monitoring.org/project/07202 | 22.2.1 | 23.1.1 | python-txtorcon | DISTRO | https://release-monitoring.org/project/19661 | 22.0.0 | 23.0.0 | python-typeguard | DISTRO | https://release-monitoring.org/project/38819 | 2.13.3 | 3.0.0b2 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 4.4.0 | 4.5.0 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.13 | 1.26.14 | python-watchdog | DISTRO | https://release-monitoring.org/project/05341 | 2.2.1 | 2.3.0 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.2.5 | 0.2.6 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 57.2 | 58.0b1 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.23.0 | 2.23.1 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 1.4.2 | 1.5.1 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 2.2.2 | 2.2.3 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.32 | 0.33 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.6 | 3.0.8 | python-zc-lockfile | DISTRO | https://release-monitoring.org/project/04100 | 2.0 | 3.0 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.39.4 | 0.47.3 | python-zlmdb | DISTRO | https://release-monitoring.org/project/66674 | 22.6.1 | 23.1.1 | qcom-db410c-firmware | DISTRO | https://release-monitoring.org/project/235382 | 1034.2.1 | 1036.1 | qlibc | DISTRO | https://release-monitoring.org/project/21737 | 2.4.7 | 2.4.8 | ORPH qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 11.3.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.38.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.4.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.8 | 6.4.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.3 | 1.4 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-c | DISTRO | https://release-monitoring.org/project/13768 | 0.11.0 | 0.13.0 | ragel | DISTRO | https://release-monitoring.org/project/12105 | 6.10 | 7.0.4 | ORPH ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | raspberrypi-usbboot | DISTRO | https://release-monitoring.org/project/115700 | 2021.07.01 | 20221215-... | ORPH redis | DISTRO | https://release-monitoring.org/project/04181 | 7.0.7 | 7.0.8 | refpolicy | DISTRO | https://release-monitoring.org/project/21663 | 2.20220106 | 2.20221101 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.5 | 2.0.1 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 7.9.2 | rrdtool | DISTRO | https://release-monitoring.org/project/04214 | 1.7.2 | 1.8.0 | ORPH rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2204.1 | 8.2302.0 | ORPH rt-tests | DISTRO | https://release-monitoring.org/project/59450 | 2.4 | 2.5 | rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.1.0 | ruby | DISTRO | https://release-monitoring.org/project/04223 | 3.1.3 | 3.2.1 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.42.1 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.11.1.2 | 2.11.3.0 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.4 | 2.3.5.5 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.8.0 | 1.1.0.0 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.6.0.0 | 2.6.1.2 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.5.1.1 | 2.5.1.3 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.5.0 | 2.3.0.1 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.3.2 | 0.5.4.1 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.12 | 4.17.5 | sane-backends | DISTRO | https://release-monitoring.org/project/04760 | 1.1.1 | 1.2.1 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.4.0 | sdl2_image | DISTRO | https://release-monitoring.org/project/04781 | 2.6.2 | 2.6.3 | sdl2_mixer | DISTRO | https://release-monitoring.org/project/04782 | 2.0.4 | 2.6.3 | ORPH sdl2_net | DISTRO | https://release-monitoring.org/project/04783 | 2.0.1 | 2.2.0 | ORPH sdl2_ttf | DISTRO | https://release-monitoring.org/project/04784 | 2.20.1 | 2.20.2 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdl_sound | DISTRO | https://release-monitoring.org/project/10262 | 1.0.3 | 2.0.1 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | selinux-python | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.5 | semodule-utils | DISTRO | https://release-monitoring.org/project/01717 | 3.3 | 3.5 | ORPH sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 2.8.0 | 2.13.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.6.0 | ser2net | DISTRO | https://release-monitoring.org/project/21655 | 4.3.8 | 4.3.11 | serd | DISTRO | https://release-monitoring.org/project/230531 | 0.30.14 | 0.30.16 | setools | DISTRO | https://release-monitoring.org/project/08951 | 4.4.0 | 4.4.1 | ORPH shairport-sync | DISTRO | https://release-monitoring.org/project/21384 | 3.3.9 | 4.1.1 | ORPH shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.2 | ORPH shim | DISTRO | https://release-monitoring.org/project/10719 | 15.4 | 15.7 | signal-estimator | DISTRO | https://release-monitoring.org/project/284559 | v0.0.4 | 0.0.5 | ORPH sispmctl | DISTRO | https://release-monitoring.org/project/21653 | 4.9 | 4.10 | skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.12.0.1 | 2.13.1.0 | snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.10 | 3.5.0 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.40.0 | 3.1.56.0 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.12 | 1.13.14 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sord | DISTRO | https://release-monitoring.org/project/230536 | 0.16.12 | 0.16.14 | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | spawn-fcgi | DISTRO | https://release-monitoring.org/project/05388 | 1.6.4 | 1.6.5 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice | DISTRO | https://release-monitoring.org/project/04871 | 0.15.0 | 0.15.1 | sqlcipher | DISTRO | https://release-monitoring.org/project/11213 | 4.5.1 | 4.5.3 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.40.1 | 3.41.0 | sshpass | DISTRO | https://release-monitoring.org/project/12961 | 1.09 | 1.10 | start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.21 | ORPH strace | DISTRO | https://release-monitoring.org/project/04897 | 6.1 | 6.2 | stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.5 | 1.0.7 | stress-ng | DISTRO | https://release-monitoring.org/project/12538 | 0.13.05 | 0.15.04 | strongswan | DISTRO | https://release-monitoring.org/project/04899 | 5.9.8 | 5.9.9 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.65 | 5.68 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.5 | ORPH suricata | DISTRO | https://release-monitoring.org/project/10925 | 6.0.6 | 6.0.10 | sway | DISTRO | https://release-monitoring.org/project/11497 | 1.7 | 1.8.1 | synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.29.3 | 0.30.2 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.38.1 | 4.0.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.46.0 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.6.1 | 12.6.2 | ORPH system-config-printer | DISTRO | https://release-monitoring.org/project/08855 | 1.5.15 | 1.5.18 | ORPH systemd | DISTRO | https://release-monitoring.org/project/05440 | 252.4 | 253 | systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.04 | ORPH tbb | DISTRO | https://release-monitoring.org/project/08217 | 2021.5.0 | 2021.8.0 | tcl | DISTRO | https://release-monitoring.org/project/04941 | 8.6.12 | 8.6.13 | ORPH tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | ORPH tcllib | DISTRO | https://release-monitoring.org/project/04943 | 1.20 | 1.21 | tcpreplay | DISTRO | https://release-monitoring.org/project/13716 | 4.4.2 | 4.4.3 | ORPH terminology | DISTRO | https://release-monitoring.org/project/04951 | 1.12.1 | 1.13.0 | tesseract-ocr | DISTRO | https://release-monitoring.org/project/04954 | 5.0.1 | 5.3.0 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.5.1 | 2.5.2 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.18.0 | ORPH timescaledb | DISTRO | https://release-monitoring.org/project/17545 | 2.9.3 | 2.10.0 | tinifier | DISTRO | https://release-monitoring.org/project/241900 | 3.4.0 | 4.1.0 | tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20220801 | 20230101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tio | DISTRO | https://release-monitoring.org/project/20587 | 1.47 | 2.5 | tk | DISTRO | https://release-monitoring.org/project/11426 | 8.6.12 | 8.6.13 | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 3.0.0 | ORPH tpm2-pkcs11 | DISTRO | https://release-monitoring.org/project/18777 | 1.8.0 | 1.9.0 | tpm2-tools | DISTRO | https://release-monitoring.org/project/12841 | 5.2 | 5.5 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.1.0 | 4.0.1 | ORPH trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | 2.9.7 | 3.1.6 | traceroute | DISTRO | https://release-monitoring.org/project/14877 | 2.1.0 | 2.1.2 | transmission | DISTRO | https://release-monitoring.org/project/05002 | 3.00 | 4.0.1 | tree | DISTRO | https://release-monitoring.org/project/05006 | 2.0.2 | 2.1.0 | tzdata | DISTRO | https://release-monitoring.org/project/05021 | 2022f | 2022g | uacme | DISTRO | https://release-monitoring.org/project/22795 | 1.7.3 | 1.7.4 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2023.01 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.12 | 0.13.1 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 4.3.0.0 | 4.4.0.0 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 3.2 | ORPH unrar | DISTRO | https://release-monitoring.org/project/13306 | 6.1.7 | 6.2.6 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.7.2 | ORPH upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.19 | 1.90.0 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.38 | 2.38.1 | ORPH vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.56.4 | ORPH valgrind | DISTRO | https://release-monitoring.org/project/13639 | 3.19.0 | 3.20.0 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.7 | 1.0 | ORPH vdr | DISTRO | https://release-monitoring.org/project/05069 | 2.6.3 | 2.6.4 | vim | DISTRO | https://release-monitoring.org/project/05092 | 9.0.1260 | 9.0.1355 | ORPH vis-network | DISTRO | https://release-monitoring.org/project/270536 | 9.1.0 | 9.1.4 | volk | DISTRO | https://release-monitoring.org/project/147733 | 2.5.2 | 3.0.0 | vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vte | DISTRO | https://release-monitoring.org/project/10895 | 0.66.2 | 0.70.3 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.45 | 3.2.47 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.2.203 | 1.3.242 | ORPH waf | DISTRO | https://release-monitoring.org/project/05116 | 2.0.24 | 2.0.25 | wavpack | DISTRO | https://release-monitoring.org/project/05121 | 5.5.0 | 5.6.0 | ORPH waylandpp | DISTRO | https://release-monitoring.org/project/16969 | 0.2.8 | 1.0.0 | webp | DISTRO | https://release-monitoring.org/project/01761 | 1.2.4 | 1.3.0 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH weston | DISTRO | https://release-monitoring.org/project/13745 | 10.0.1 | 11.0.1 | whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.14 | 5.5.15 | wine | DISTRO | https://release-monitoring.org/project/05134 | 8.0 | 8.2 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.8 | 0.4.13 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.15.1 | 0.16.2 | wtfutil | DISTRO | https://release-monitoring.org/project/243189 | 0.41.0 | 0.43.0 | xapian | DISTRO | https://release-monitoring.org/project/15919 | 1.4.19 | 1.4.22 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20230201 | xdata_xbitmaps | DISTRO | https://release-monitoring.org/project/13645 | 1.1.2 | 1.1.3 | xdata_xcursor-themes | DISTRO | https://release-monitoring.org/project/15905 | 1.0.6 | 1.0.7 | xdriver_xf86-video-amdgpu | DISTRO | https://release-monitoring.org/project/15900 | 22.0.0 | 23.0.0 | xdriver_xf86-video-ark | DISTRO | https://release-monitoring.org/project/21712 | 0.7.5 | 0.7.6 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.5 | 4.17.0 | xfsprogs | DISTRO | https://release-monitoring.org/project/05188 | 5.14.2 | 6.1.1 | ORPH xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.37 | 2.38 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 6.03 | 6.06.1 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.22 | 3.23 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 376 | 379 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.1 | 0.3.2 | xz | DISTRO | https://release-monitoring.org/project/05277 | 5.2.10 | 5.4.1 | ORPH yad | DISTRO | https://release-monitoring.org/project/05280 | 0.40.0 | 12.3 | zchunk | DISTRO | https://release-monitoring.org/project/178035 | 1.2.2 | 1.3.0 | zeek | DISTRO | https://release-monitoring.org/project/267106 | 4.1.1 | 5.1.3 | zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.1.7 | 2.1.9 | zic | DISTRO | https://release-monitoring.org/project/16905 | 2022f | 2022g | zxing-cpp | DISTRO | https://release-monitoring.org/project/101246 | 1.4.0 | 2.0.0 | Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 containerd | CVE-2023-25153 | https://security-tracker.debian.org/tracker/CVE-2023-25153 containerd | CVE-2023-25173 | https://security-tracker.debian.org/tracker/CVE-2023-25173 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2023-25725 | https://security-tracker.debian.org/tracker/CVE-2023-25725 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nodejs | CVE-2023-23936 | https://security-tracker.debian.org/tracker/CVE-2023-23936 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-ipython | CVE-2023-24816 | https://security-tracker.debian.org/tracker/CVE-2023-24816 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-werkzeug | CVE-2023-23934 | https://security-tracker.debian.org/tracker/CVE-2023-23934 python-werkzeug | CVE-2023-25577 | https://security-tracker.debian.org/tracker/CVE-2023-25577 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 speechd | CVE-2001-0956 | https://security-tracker.debian.org/tracker/CVE-2001-0956 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the 'next' branch -------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 containerd | CVE-2023-25153 | https://security-tracker.debian.org/tracker/CVE-2023-25153 containerd | CVE-2023-25173 | https://security-tracker.debian.org/tracker/CVE-2023-25173 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2023-25725 | https://security-tracker.debian.org/tracker/CVE-2023-25725 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nodejs | CVE-2023-23936 | https://security-tracker.debian.org/tracker/CVE-2023-23936 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-ipython | CVE-2023-24816 | https://security-tracker.debian.org/tracker/CVE-2023-24816 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-werkzeug | CVE-2023-23934 | https://security-tracker.debian.org/tracker/CVE-2023-23934 python-werkzeug | CVE-2023-25577 | https://security-tracker.debian.org/tracker/CVE-2023-25577 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 shadow | CVE-2013-4235 | https://security-tracker.debian.org/tracker/CVE-2013-4235 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 speechd | CVE-2001-0956 | https://security-tracker.debian.org/tracker/CVE-2001-0956 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 containerd | CVE-2023-25153 | https://security-tracker.debian.org/tracker/CVE-2023-25153 containerd | CVE-2023-25173 | https://security-tracker.debian.org/tracker/CVE-2023-25173 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dropbear | CVE-2021-36369 | https://security-tracker.debian.org/tracker/CVE-2021-36369 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 git | CVE-2023-22490 | https://security-tracker.debian.org/tracker/CVE-2023-22490 git | CVE-2023-22743 | https://security-tracker.debian.org/tracker/CVE-2023-22743 git | CVE-2023-23946 | https://security-tracker.debian.org/tracker/CVE-2023-23946 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-3998 | https://security-tracker.debian.org/tracker/CVE-2021-3998 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2021-3981 | https://security-tracker.debian.org/tracker/CVE-2021-3981 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2022-0711 | https://security-tracker.debian.org/tracker/CVE-2022-0711 haproxy | CVE-2023-25725 | https://security-tracker.debian.org/tracker/CVE-2023-25725 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 less | CVE-2022-46663 | https://security-tracker.debian.org/tracker/CVE-2022-46663 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libbpf | CVE-2021-45940 | https://security-tracker.debian.org/tracker/CVE-2021-45940 libbpf | CVE-2021-45941 | https://security-tracker.debian.org/tracker/CVE-2021-45941 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libopenssl | CVE-2022-4304 | https://security-tracker.debian.org/tracker/CVE-2022-4304 libopenssl | CVE-2022-4450 | https://security-tracker.debian.org/tracker/CVE-2022-4450 libopenssl | CVE-2023-0215 | https://security-tracker.debian.org/tracker/CVE-2023-0215 libopenssl | CVE-2023-0286 | https://security-tracker.debian.org/tracker/CVE-2023-0286 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libxslt | CVE-2022-29824 | https://security-tracker.debian.org/tracker/CVE-2022-29824 lighttpd | CVE-2022-41556 | https://security-tracker.debian.org/tracker/CVE-2022-41556 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mender | CVE-2022-29555 | https://security-tracker.debian.org/tracker/CVE-2022-29555 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 nodejs | CVE-2022-35256 | https://security-tracker.debian.org/tracker/CVE-2022-35256 nodejs | CVE-2022-43548 | https://security-tracker.debian.org/tracker/CVE-2022-43548 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 patchelf | CVE-2022-44940 | https://security-tracker.debian.org/tracker/CVE-2022-44940 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php | CVE-2023-0568 | https://security-tracker.debian.org/tracker/CVE-2023-0568 php | CVE-2023-0662 | https://security-tracker.debian.org/tracker/CVE-2023-0662 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 proftpd | CVE-2021-46854 | https://security-tracker.debian.org/tracker/CVE-2021-46854 python-aiohttp | CVE-2022-33124 | https://security-tracker.debian.org/tracker/CVE-2022-33124 python-cryptography | CVE-2023-23931 | https://security-tracker.debian.org/tracker/CVE-2023-23931 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-django | CVE-2023-24580 | https://security-tracker.debian.org/tracker/CVE-2023-24580 python-ipython | CVE-2023-24816 | https://security-tracker.debian.org/tracker/CVE-2023-24816 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-45198 | https://security-tracker.debian.org/tracker/CVE-2022-45198 python-pillow | CVE-2022-45199 | https://security-tracker.debian.org/tracker/CVE-2022-45199 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pyjwt | CVE-2022-29217 | https://security-tracker.debian.org/tracker/CVE-2022-29217 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python-web2py | CVE-2022-33146 | https://security-tracker.debian.org/tracker/CVE-2022-33146 python-werkzeug | CVE-2022-29361 | https://security-tracker.debian.org/tracker/CVE-2022-29361 python-werkzeug | CVE-2023-23934 | https://security-tracker.debian.org/tracker/CVE-2023-23934 python-werkzeug | CVE-2023-25577 | https://security-tracker.debian.org/tracker/CVE-2023-25577 python3 | CVE-2022-42919 | https://security-tracker.debian.org/tracker/CVE-2022-42919 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3611 | https://security-tracker.debian.org/tracker/CVE-2021-3611 qemu | CVE-2021-3750 | https://security-tracker.debian.org/tracker/CVE-2021-3750 qemu | CVE-2021-3929 | https://security-tracker.debian.org/tracker/CVE-2021-3929 qemu | CVE-2021-3947 | https://security-tracker.debian.org/tracker/CVE-2021-3947 qemu | CVE-2021-4158 | https://security-tracker.debian.org/tracker/CVE-2021-4158 qemu | CVE-2021-4206 | https://security-tracker.debian.org/tracker/CVE-2021-4206 qemu | CVE-2021-4207 | https://security-tracker.debian.org/tracker/CVE-2021-4207 qemu | CVE-2022-0358 | https://security-tracker.debian.org/tracker/CVE-2022-0358 qemu | CVE-2022-26353 | https://security-tracker.debian.org/tracker/CVE-2022-26353 qemu | CVE-2022-26354 | https://security-tracker.debian.org/tracker/CVE-2022-26354 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-35414 | https://security-tracker.debian.org/tracker/CVE-2022-35414 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 rabbitmq-server | CVE-2021-22116 | https://security-tracker.debian.org/tracker/CVE-2021-22116 rabbitmq-server | CVE-2021-22117 | https://security-tracker.debian.org/tracker/CVE-2021-22117 rabbitmq-server | CVE-2021-32718 | https://security-tracker.debian.org/tracker/CVE-2021-32718 rabbitmq-server | CVE-2021-32719 | https://security-tracker.debian.org/tracker/CVE-2021-32719 rabbitmq-server | CVE-2022-31008 | https://security-tracker.debian.org/tracker/CVE-2022-31008 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 rpm | CVE-2021-3521 | https://security-tracker.debian.org/tracker/CVE-2021-3521 rpm | CVE-2021-35937 | https://security-tracker.debian.org/tracker/CVE-2021-35937 rpm | CVE-2021-35938 | https://security-tracker.debian.org/tracker/CVE-2021-35938 rpm | CVE-2021-35939 | https://security-tracker.debian.org/tracker/CVE-2021-35939 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unbound | CVE-2022-30698 | https://security-tracker.debian.org/tracker/CVE-2022-30698 unbound | CVE-2022-30699 | https://security-tracker.debian.org/tracker/CVE-2022-30699 unbound | CVE-2022-3204 | https://security-tracker.debian.org/tracker/CVE-2022-3204 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 usbguard | CVE-2019-25058 | https://security-tracker.debian.org/tracker/CVE-2019-25058 wavpack | CVE-2022-2476 | https://security-tracker.debian.org/tracker/CVE-2022-2476 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xerces | CVE-2018-1311 | https://security-tracker.debian.org/tracker/CVE-2018-1311 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2022.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2022-24963 | https://security-tracker.debian.org/tracker/CVE-2022-24963 apr | CVE-2022-28331 | https://security-tracker.debian.org/tracker/CVE-2022-28331 apr-util | CVE-2022-25147 | https://security-tracker.debian.org/tracker/CVE-2022-25147 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 bind | CVE-2022-3094 | https://security-tracker.debian.org/tracker/CVE-2022-3094 bind | CVE-2022-3736 | https://security-tracker.debian.org/tracker/CVE-2022-3736 bind | CVE-2022-3924 | https://security-tracker.debian.org/tracker/CVE-2022-3924 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 containerd | CVE-2023-25153 | https://security-tracker.debian.org/tracker/CVE-2023-25153 containerd | CVE-2023-25173 | https://security-tracker.debian.org/tracker/CVE-2023-25173 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 dnsmasq | CVE-2022-0934 | https://security-tracker.debian.org/tracker/CVE-2022-0934 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 enlightenment | CVE-2022-37706 | https://security-tracker.debian.org/tracker/CVE-2022-37706 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 exfat | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exfat-utils | CVE-2022-29973 | https://security-tracker.debian.org/tracker/CVE-2022-29973 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-3964 | https://security-tracker.debian.org/tracker/CVE-2022-3964 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 giflib | CVE-2022-28506 | https://security-tracker.debian.org/tracker/CVE-2022-28506 git | CVE-2022-24765 | https://security-tracker.debian.org/tracker/CVE-2022-24765 git | CVE-2022-24975 | https://security-tracker.debian.org/tracker/CVE-2022-24975 git | CVE-2022-41953 | https://security-tracker.debian.org/tracker/CVE-2022-41953 git | CVE-2023-22490 | https://security-tracker.debian.org/tracker/CVE-2023-22490 git | CVE-2023-22743 | https://security-tracker.debian.org/tracker/CVE-2023-22743 git | CVE-2023-23946 | https://security-tracker.debian.org/tracker/CVE-2023-23946 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3515 | https://security-tracker.debian.org/tracker/CVE-2022-3515 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grub2 | CVE-2022-2601 | https://security-tracker.debian.org/tracker/CVE-2022-2601 grub2 | CVE-2022-3775 | https://security-tracker.debian.org/tracker/CVE-2022-3775 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2023-25725 | https://security-tracker.debian.org/tracker/CVE-2023-25725 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2022-41751 | https://security-tracker.debian.org/tracker/CVE-2022-41751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 less | CVE-2022-46663 | https://security-tracker.debian.org/tracker/CVE-2022-46663 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmodsecurity | CVE-2022-48279 | https://security-tracker.debian.org/tracker/CVE-2022-48279 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libopenssl | CVE-2022-4304 | https://security-tracker.debian.org/tracker/CVE-2022-4304 libopenssl | CVE-2022-4450 | https://security-tracker.debian.org/tracker/CVE-2022-4450 libopenssl | CVE-2023-0215 | https://security-tracker.debian.org/tracker/CVE-2023-0215 libopenssl | CVE-2023-0286 | https://security-tracker.debian.org/tracker/CVE-2023-0286 libpjsip | CVE-2022-23537 | https://security-tracker.debian.org/tracker/CVE-2022-23537 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-35530 | https://security-tracker.debian.org/tracker/CVE-2020-35530 libraw | CVE-2020-35531 | https://security-tracker.debian.org/tracker/CVE-2020-35531 libraw | CVE-2020-35532 | https://security-tracker.debian.org/tracker/CVE-2020-35532 libraw | CVE-2020-35533 | https://security-tracker.debian.org/tracker/CVE-2020-35533 libraw | CVE-2020-35534 | https://security-tracker.debian.org/tracker/CVE-2020-35534 libraw | CVE-2020-35535 | https://security-tracker.debian.org/tracker/CVE-2020-35535 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mariadb | CVE-2022-47015 | https://security-tracker.debian.org/tracker/CVE-2022-47015 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 minetest | CVE-2022-35978 | https://security-tracker.debian.org/tracker/CVE-2022-35978 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ncurses | CVE-2022-29458 | https://security-tracker.debian.org/tracker/CVE-2022-29458 netatalk | CVE-2022-45188 | https://security-tracker.debian.org/tracker/CVE-2022-45188 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 netsnmp | CVE-2022-44792 | https://security-tracker.debian.org/tracker/CVE-2022-44792 netsnmp | CVE-2022-44793 | https://security-tracker.debian.org/tracker/CVE-2022-44793 nginx | CVE-2021-3618 | https://security-tracker.debian.org/tracker/CVE-2021-3618 nodejs | CVE-2023-23936 | https://security-tracker.debian.org/tracker/CVE-2023-23936 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjdk | CVE-2022-21540 | https://security-tracker.debian.org/tracker/CVE-2022-21540 openjdk | CVE-2022-21541 | https://security-tracker.debian.org/tracker/CVE-2022-21541 openjdk | CVE-2022-34169 | https://security-tracker.debian.org/tracker/CVE-2022-34169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3067 | https://security-tracker.debian.org/tracker/CVE-2018-3067 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2018-3073 | https://security-tracker.debian.org/tracker/CVE-2018-3073 oracle-mysql | CVE-2018-3074 | https://security-tracker.debian.org/tracker/CVE-2018-3074 oracle-mysql | CVE-2018-3075 | https://security-tracker.debian.org/tracker/CVE-2018-3075 oracle-mysql | CVE-2018-3078 | https://security-tracker.debian.org/tracker/CVE-2018-3078 oracle-mysql | CVE-2018-3079 | https://security-tracker.debian.org/tracker/CVE-2018-3079 oracle-mysql | CVE-2018-3080 | https://security-tracker.debian.org/tracker/CVE-2018-3080 oracle-mysql | CVE-2018-3082 | https://security-tracker.debian.org/tracker/CVE-2018-3082 oracle-mysql | CVE-2018-3084 | https://security-tracker.debian.org/tracker/CVE-2018-3084 oracle-mysql | CVE-2018-3137 | https://security-tracker.debian.org/tracker/CVE-2018-3137 oracle-mysql | CVE-2018-3145 | https://security-tracker.debian.org/tracker/CVE-2018-3145 oracle-mysql | CVE-2018-3170 | https://security-tracker.debian.org/tracker/CVE-2018-3170 oracle-mysql | CVE-2018-3182 | https://security-tracker.debian.org/tracker/CVE-2018-3182 oracle-mysql | CVE-2018-3186 | https://security-tracker.debian.org/tracker/CVE-2018-3186 oracle-mysql | CVE-2018-3195 | https://security-tracker.debian.org/tracker/CVE-2018-3195 oracle-mysql | CVE-2018-3203 | https://security-tracker.debian.org/tracker/CVE-2018-3203 oracle-mysql | CVE-2018-3212 | https://security-tracker.debian.org/tracker/CVE-2018-3212 oracle-mysql | CVE-2018-3279 | https://security-tracker.debian.org/tracker/CVE-2018-3279 oracle-mysql | CVE-2018-3280 | https://security-tracker.debian.org/tracker/CVE-2018-3280 oracle-mysql | CVE-2018-3285 | https://security-tracker.debian.org/tracker/CVE-2018-3285 oracle-mysql | CVE-2018-3286 | https://security-tracker.debian.org/tracker/CVE-2018-3286 oracle-mysql | CVE-2019-2494 | https://security-tracker.debian.org/tracker/CVE-2019-2494 oracle-mysql | CVE-2019-2495 | https://security-tracker.debian.org/tracker/CVE-2019-2495 oracle-mysql | CVE-2019-2502 | https://security-tracker.debian.org/tracker/CVE-2019-2502 oracle-mysql | CVE-2019-2513 | https://security-tracker.debian.org/tracker/CVE-2019-2513 oracle-mysql | CVE-2019-2535 | https://security-tracker.debian.org/tracker/CVE-2019-2535 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2743 | https://security-tracker.debian.org/tracker/CVE-2019-2743 oracle-mysql | CVE-2019-2746 | https://security-tracker.debian.org/tracker/CVE-2019-2746 oracle-mysql | CVE-2019-2747 | https://security-tracker.debian.org/tracker/CVE-2019-2747 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-2822 | https://security-tracker.debian.org/tracker/CVE-2019-2822 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14575 | https://security-tracker.debian.org/tracker/CVE-2020-14575 oracle-mysql | CVE-2020-14597 | https://security-tracker.debian.org/tracker/CVE-2020-14597 oracle-mysql | CVE-2020-14614 | https://security-tracker.debian.org/tracker/CVE-2020-14614 oracle-mysql | CVE-2020-14619 | https://security-tracker.debian.org/tracker/CVE-2020-14619 oracle-mysql | CVE-2020-14620 | https://security-tracker.debian.org/tracker/CVE-2020-14620 oracle-mysql | CVE-2020-14623 | https://security-tracker.debian.org/tracker/CVE-2020-14623 oracle-mysql | CVE-2020-14624 | https://security-tracker.debian.org/tracker/CVE-2020-14624 oracle-mysql | CVE-2020-14631 | https://security-tracker.debian.org/tracker/CVE-2020-14631 oracle-mysql | CVE-2020-14643 | https://security-tracker.debian.org/tracker/CVE-2020-14643 oracle-mysql | CVE-2020-14651 | https://security-tracker.debian.org/tracker/CVE-2020-14651 oracle-mysql | CVE-2020-14654 | https://security-tracker.debian.org/tracker/CVE-2020-14654 oracle-mysql | CVE-2020-14656 | https://security-tracker.debian.org/tracker/CVE-2020-14656 oracle-mysql | CVE-2020-14663 | https://security-tracker.debian.org/tracker/CVE-2020-14663 oracle-mysql | CVE-2020-14678 | https://security-tracker.debian.org/tracker/CVE-2020-14678 oracle-mysql | CVE-2020-14680 | https://security-tracker.debian.org/tracker/CVE-2020-14680 oracle-mysql | CVE-2020-14697 | https://security-tracker.debian.org/tracker/CVE-2020-14697 oracle-mysql | CVE-2020-14702 | https://security-tracker.debian.org/tracker/CVE-2020-14702 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php | CVE-2023-0568 | https://security-tracker.debian.org/tracker/CVE-2023-0568 php | CVE-2023-0662 | https://security-tracker.debian.org/tracker/CVE-2023-0662 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 polkit | CVE-2021-4034 | https://security-tracker.debian.org/tracker/CVE-2021-4034 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 pppd | CVE-2018-11574 | https://security-tracker.debian.org/tracker/CVE-2018-11574 python-cryptography | CVE-2023-23931 | https://security-tracker.debian.org/tracker/CVE-2023-23931 python-django | CVE-2023-23969 | https://security-tracker.debian.org/tracker/CVE-2023-23969 python-django | CVE-2023-24580 | https://security-tracker.debian.org/tracker/CVE-2023-24580 python-ipython | CVE-2023-24816 | https://security-tracker.debian.org/tracker/CVE-2023-24816 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-setuptools | CVE-2022-40897 | https://security-tracker.debian.org/tracker/CVE-2022-40897 python-twisted | CVE-2022-24801 | https://security-tracker.debian.org/tracker/CVE-2022-24801 python-twisted | CVE-2022-39348 | https://security-tracker.debian.org/tracker/CVE-2022-39348 python-werkzeug | CVE-2023-23934 | https://security-tracker.debian.org/tracker/CVE-2023-23934 python-werkzeug | CVE-2023-25577 | https://security-tracker.debian.org/tracker/CVE-2023-25577 python3 | CVE-2022-42919 | https://security-tracker.debian.org/tracker/CVE-2022-42919 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2022-2962 | https://security-tracker.debian.org/tracker/CVE-2022-2962 qemu | CVE-2022-3165 | https://security-tracker.debian.org/tracker/CVE-2022-3165 qemu | CVE-2022-3872 | https://security-tracker.debian.org/tracker/CVE-2022-3872 qemu | CVE-2022-4144 | https://security-tracker.debian.org/tracker/CVE-2022-4144 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2023-22795 | https://security-tracker.debian.org/tracker/CVE-2023-22795 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2022-43995 | https://security-tracker.debian.org/tracker/CVE-2022-43995 sudo | CVE-2023-22809 | https://security-tracker.debian.org/tracker/CVE-2023-22809 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 systemd | CVE-2022-3821 | https://security-tracker.debian.org/tracker/CVE-2022-3821 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 systemd | CVE-2022-45873 | https://security-tracker.debian.org/tracker/CVE-2022-45873 tar | CVE-2022-48303 | https://security-tracker.debian.org/tracker/CVE-2022-48303 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-48281 | https://security-tracker.debian.org/tracker/CVE-2022-48281 timescaledb | CVE-2023-25149 | https://security-tracker.debian.org/tracker/CVE-2023-25149 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 wireshark | CVE-2022-4344 | https://security-tracker.debian.org/tracker/CVE-2022-4344 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xerces | CVE-2018-1311 | https://security-tracker.debian.org/tracker/CVE-2018-1311 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From d.lang at abatec.at Mon Feb 27 08:46:13 2023 From: d.lang at abatec.at (Lang Daniel) Date: Mon, 27 Feb 2023 08:46:13 +0000 Subject: [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: Signed-off-by: Daniel Lang --- 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 11dc5cce07..5cbef197ab 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.14" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" 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 52eb534b40..f45b244e6b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz +sha256 a27076011efec7ad11e9ed0644f512c34cab4c5ed5ba42cfe71c83fabebe810d linux-6.1.14.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz -sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz -sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz +sha256 348d974c143fdef8517ec703fdaa24bade12a49047848be92cb9e3253b19ef98 linux-5.15.96.tar.xz +sha256 a2b51876befb8cc35724ed62820845f2b387d471a6cf46e8eedd0b6cb595825f linux-5.10.170.tar.xz +sha256 5a1e5754b4f2a4fe73b119d810ecda2ce07ecfb6f6cbbd16547c9ecd30b97627 linux-5.4.233.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz -sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz +sha256 4e1c1555c306874e0477d1af282d04a4efb285121456ab3f79519c92e406b701 linux-4.14.307.tar.xz +sha256 64a265a193c9e3e14d1397278e2348386ef6d6043af76d693c0fbbafed345ca8 linux-4.19.274.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 18c179ec8d..ae40520c51 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -384,12 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.305" if BR2_KERNEL_HEADERS_4_14 - default "4.19.272" if BR2_KERNEL_HEADERS_4_19 - default "5.4.231" if BR2_KERNEL_HEADERS_5_4 - default "5.10.167" if BR2_KERNEL_HEADERS_5_10 - default "5.15.93" if BR2_KERNEL_HEADERS_5_15 - default "6.1.11" if BR2_KERNEL_HEADERS_6_1 + default "4.14.307" if BR2_KERNEL_HEADERS_4_14 + default "4.19.274" if BR2_KERNEL_HEADERS_4_19 + default "5.4.233" if BR2_KERNEL_HEADERS_5_4 + default "5.10.170" if BR2_KERNEL_HEADERS_5_10 + default "5.15.96" if BR2_KERNEL_HEADERS_5_15 + default "6.1.14" if BR2_KERNEL_HEADERS_6_1 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.25.1 From d.lang at abatec.at Mon Feb 27 08:46:25 2023 From: d.lang at abatec.at (Lang Daniel) Date: Mon, 27 Feb 2023 08:46:25 +0000 Subject: [Buildroot] [PATCH 3/3] linux: bump _KERNEL_LATEST_VERSION to 6.2 Message-ID: Signed-off-by: Daniel Lang --- linux/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 5cbef197ab..495fc48997 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,8 +28,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.1)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.2)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.162-cip24)" @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.2.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ -- 2.25.1 From d.lang at abatec.at Mon Feb 27 08:46:19 2023 From: d.lang at abatec.at (Lang Daniel) Date: Mon, 27 Feb 2023 08:46:19 +0000 Subject: [Buildroot] [PATCH 2/3] {toolchain, linux-headers}: add support for 6.2 headers Message-ID: Signed-off-by: Daniel Lang --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index f45b244e6b..75f1342313 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 2fcc07e1c90ea4ce148f50f9beeb0dca0b6e4b379a768de8abc7a4a26f252534 linux-6.2.1.tar.xz sha256 a27076011efec7ad11e9ed0644f512c34cab4c5ed5ba42cfe71c83fabebe810d linux-6.1.14.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 348d974c143fdef8517ec703fdaa24bade12a49047848be92cb9e3253b19ef98 linux-5.15.96.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ae40520c51..9b4fa2bb12 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_1 + default BR2_KERNEL_HEADERS_6_2 help Select the kernel version to get headers from. @@ -48,6 +48,10 @@ config BR2_KERNEL_HEADERS_5_15 config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + +config BR2_KERNEL_HEADERS_6_2 + bool "Linux 6.2.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -125,8 +129,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_2 + bool "6.2.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1 - bool "6.1.x or later" + bool "6.1.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0 @@ -390,6 +398,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.170" if BR2_KERNEL_HEADERS_5_10 default "5.15.96" if BR2_KERNEL_HEADERS_5_15 default "6.1.14" if BR2_KERNEL_HEADERS_6_1 + default "6.2.1" if BR2_KERNEL_HEADERS_6_2 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 \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 08e4ccad9e..80b2dbde4d 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -600,6 +600,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -613,6 +617,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 default "6.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 default "6.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 default "5.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 1c39334ddd..8f3905b8d7 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -127,8 +127,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_2 + bool "6.2.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_1 - bool "6.1.x or later" + bool "6.1.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_0 -- 2.25.1 From thomas at devoogdt.com Mon Feb 27 10:39:54 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:39:54 +0100 Subject: [Buildroot] [PATCH v2 1/3] pkg-cmake: add option to select the Ninja generator In-Reply-To: <20230224111509.2434694-3-thomas.devoogdt@barco.com> References: <20230224111509.2434694-3-thomas.devoogdt@barco.com> Message-ID: <20230227103956.128236-1-thomas.devoogdt@barco.com> E.g. Commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 can now be replaced by: WEBKITGTK_CMAKE_NINJA = YES Packages that are selecting Ninja (or overtime another generator), should also use the _BUILD_{ENV,OPTS} variables iso the _MAKE variables. No _INSTALL{,_STAGING,_TARGET}_OPTS used so far: $ grep '_INSTALL_OPTS' $(grep -rl "cmake-package" package/*/*.mk) $ grep '_INSTALL_STAGING_OPTS' $(grep -rl "cmake-package" package/*/*.mk) $ grep '_INSTALL_TARGET_OPTS' $(grep -rl "cmake-package" package/*/*.mk) The _MAKE_{ENV,OPTS} are translated to _BUILD_{ENV,OPTS}: $ grep '_MAKE_ENV =' $(grep -rl "cmake-package" package/*/*.mk) > package/netopeer2/netopeer2.mk:NETOPEER2_MAKE_ENV = \ > package/racehound/racehound.mk:RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) $ grep '_MAKE_OPTS =' $(grep -rl "cmake-package" package/*/*.mk) > package/mariadb/mariadb.mk:HOST_MARIADB_MAKE_OPTS = import_executables > package/zeek/zeek.mk:HOST_ZEEK_MAKE_OPTS = binpac bifcl Only "musepack" seems to overwrite MAKE to enforce -j1, so replace it: $ grep '_MAKE =' $(grep -rl "cmake-package" package/*/*.mk) > package/musepack/musepack.mk:MUSEPACK_MAKE = $(MAKE1) Signed-off-by: Thomas Devoogdt --- v2: made generator use more generic, other generators can now easily be added if required --- package/musepack/musepack.mk | 2 +- package/netopeer2/netopeer2.mk | 2 +- package/pkg-cmake.mk | 26 ++++++++++++++------------ package/racehound/racehound.mk | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk index fc66c684a5..d4dd08df36 100644 --- a/package/musepack/musepack.mk +++ b/package/musepack/musepack.mk @@ -9,7 +9,7 @@ MUSEPACK_SITE = http://files.musepack.net/source MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz MUSEPACK_DEPENDENCIES = libcuefile libreplaygain MUSEPACK_INSTALL_STAGING = YES -MUSEPACK_MAKE = $(MAKE1) +MUSEPACK_BUILD_OPTS = -j1 MUSEPACK_LICENSE = BSD-3-Clause (*mpcdec), LGPL-2.1+ (*mpcenc) MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 47fcd31acd..2ebb23eccd 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -24,7 +24,7 @@ NETOPEER2_CONF_OPTS = \ # affected mutualy. NETOPEER2_SYSREPO_SHM_PREFIX = sr_buildroot$(subst /,_,$(CONFIG_DIR))_netopeer2 -NETOPEER2_MAKE_ENV = \ +NETOPEER2_BUILD_ENV = \ SYSREPOCTL_EXECUTABLE=$(HOST_DIR)/bin/sysrepoctl \ SYSREPO_SHM_PREFIX=$(NETOPEER2_SYSREPO_SHM_PREFIX) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 8c375779cb..205a93db5f 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -51,11 +51,6 @@ endif define inner-cmake-package -$(2)_MAKE ?= $$(MAKE) -$(2)_INSTALL_OPTS ?= install -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast - $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES @@ -65,6 +60,13 @@ else $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build endif +ifeq ($$($(3)_CMAKE_NINJA),YES) +$(2)_DEPENDENCIES += host-ninja +$(2)_GENERATOR = "Ninja" +else +$(2)_GENERATOR = "Unix Makefiles" +endif + # # Configure step. Only define it if not already defined by the package # .mk file. And take care of the differences between host and target @@ -88,7 +90,7 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ @@ -119,7 +121,7 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -166,11 +168,11 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) $$(BUILD_OPTS) $$($$(PKG)_BUILD_OPTS) endef else define $(2)_BUILD_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) $$(BUILD_OPTS) $$($$(PKG)_BUILD_OPTS) endef endif endif @@ -181,7 +183,7 @@ endif # ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) endef endif @@ -191,7 +193,7 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(STAGING_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_STAGING_OPTS) endef endif @@ -201,7 +203,7 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(TARGET_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_TARGET_OPTS) endef endif diff --git a/package/racehound/racehound.mk b/package/racehound/racehound.mk index 6499e166d8..f63bb233f6 100644 --- a/package/racehound/racehound.mk +++ b/package/racehound/racehound.mk @@ -22,6 +22,6 @@ RACEHOUND_CONF_OPTS += \ -DKBUILD_VERSION_STRING=$(LINUX_VERSION_PROBED) # cross compile environment for linux kernel module -RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) +RACEHOUND_BUILD_ENV = $(LINUX_MAKE_FLAGS) $(eval $(cmake-package)) -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:39:55 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:39:55 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/webkitgtk: use the CMAKE_NINJA flag In-Reply-To: <20230227103956.128236-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-3-thomas.devoogdt@barco.com> <20230227103956.128236-1-thomas.devoogdt@barco.com> Message-ID: <20230227103956.128236-2-thomas.devoogdt@barco.com> Replaces: commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 Author: Peter Korsgaard Date: Thu Feb 9 18:07:05 2023 +0100 package/webkitgtk: Build with ninja Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Devoogdt --- package/webkitgtk/webkitgtk.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 3263f7fea0..b43f97f0ca 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -13,6 +13,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk +WEBKITGTK_CMAKE_NINJA = YES WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 @@ -139,23 +140,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# webkitgtk needs cmake >= 3.20 when not building with ninja, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WEBKITGTK_CONF_OPTS += -GNinja -WEBKITGTK_DEPENDENCIES += host-ninja - -define WEBKITGTK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - $(eval $(cmake-package)) -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:39:56 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:39:56 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/wpewebkit: use the CMAKE_NINJA flag In-Reply-To: <20230227103956.128236-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-3-thomas.devoogdt@barco.com> <20230227103956.128236-1-thomas.devoogdt@barco.com> Message-ID: <20230227103956.128236-3-thomas.devoogdt@barco.com> Replaces: commit 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd Author: Peter Korsgaard Date: Thu Feb 9 18:07:06 2023 +0100 package/wpewebkit: Build with ninja Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Devoogdt --- package/wpewebkit/wpewebkit.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 48e5c2f8cd..c1b5dee121 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -14,6 +14,7 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit +WPEWEBKIT_CMAKE_NINJA = YES WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo @@ -103,23 +104,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# wpewebkit needs cmake >= 3.20 when building with the make backend, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WPEWEBKIT_CONF_OPTS += -GNinja -WPEWEBKIT_DEPENDENCIES += host-ninja - -define WPEWEBKIT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - $(eval $(cmake-package)) -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:58:34 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:58:34 +0100 Subject: [Buildroot] [PATCH v5 1/5] package/at-spi2-core: bump to version 2.47.1 Message-ID: <20230227105838.358916-1-thomas.devoogdt@barco.com> From: Daniel Lang https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_47_1/NEWS - X11 is now optional. - libxml2 is no longer optional. - atk and at-spi2-atk have been merged into at-spi2-core. - atk introspection option added. Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) v5: rebased + grouped patches --- package/at-spi2-core/Config.in | 8 ++------ package/at-spi2-core/at-spi2-core.hash | 4 ++-- package/at-spi2-core/at-spi2-core.mk | 20 +++++++++++++++++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/package/at-spi2-core/Config.in b/package/at-spi2-core/Config.in index f56c5b93c4..1f6c421777 100644 --- a/package/at-spi2-core/Config.in +++ b/package/at-spi2-core/Config.in @@ -1,12 +1,12 @@ config BR2_PACKAGE_AT_SPI2_CORE bool "at-spi2-core" - depends on BR2_PACKAGE_XORG7 # xlib-libxtst depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2 depends on BR2_USE_MMU # glib2 depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_XORG7 # optionally for X11 help The At-Spi2 Core package is a part of the GNOME Accessibility Project. It provides a Service Provider @@ -19,7 +19,3 @@ config BR2_PACKAGE_AT_SPI2_CORE comment "at-spi2-core needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -comment "at-spi2-core depends on X.org" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_XORG7 diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index 764e4c3661..4531bf396c 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum -sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz +# From https://download.gnome.org/sources/at-spi2-core/2.47/at-spi2-core-2.47.1.sha256sum +sha256 c6ba7c160434edebf09d2936933569c936f6ec972301766f2bdac5a4d418153c at-spi2-core-2.47.1.tar.xz # locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index f0b019c0ed..e98e779884 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -4,17 +4,31 @@ # ################################################################################ -AT_SPI2_CORE_VERSION_MAJOR = 2.36 -AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 +AT_SPI2_CORE_VERSION_MAJOR = 2.47 +AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).1 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) AT_SPI2_CORE_LICENSE = LGPL-2.1+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES -AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \ +AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 libxml2 \ $(TARGET_NLS_DEPENDENCIES) AT_SPI2_CORE_CONF_OPTS = -Ddbus_daemon=/usr/bin/dbus-daemon +ifeq ($(BR2_PACKAGE_XORG7),y) +AT_SPI2_CORE_CONF_OPTS += -Dx11=enabled +AT_SPI2_CORE_DEPENDENCIES += xlib_libXtst +else +AT_SPI2_CORE_CONF_OPTS += -Dx11=disabled +endif + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +AT_SPI2_CORE_CONF_OPTS += -Dintrospection=enabled +AT_SPI2_CORE_DEPENDENCIES += gobject-introspection +else +AT_SPI2_CORE_CONF_OPTS += -Dintrospection=disabled +endif + AT_SPI2_CORE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) $(eval $(meson-package)) -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:58:35 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:58:35 +0100 Subject: [Buildroot] [PATCH v5 2/5] package/at-spi2-atk: remove package In-Reply-To: <20230227105838.358916-1-thomas.devoogdt@barco.com> References: <20230227105838.358916-1-thomas.devoogdt@barco.com> Message-ID: <20230227105838.358916-2-thomas.devoogdt@barco.com> From: Daniel Lang at-spi2-atk has been merged into at-spi2-core with version 2.45.1. https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_45_1/NEWS https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78 Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) v5: rebased + grouped patches --- Config.in.legacy | 7 +++ DEVELOPERS | 1 - package/Config.in | 1 - .../0001-meson-add-tests-option.patch | 43 ------------------- package/at-spi2-atk/Config.in | 22 ---------- package/at-spi2-atk/at-spi2-atk.hash | 5 --- package/at-spi2-atk/at-spi2-atk.mk | 19 -------- 7 files changed, 7 insertions(+), 91 deletions(-) delete mode 100644 package/at-spi2-atk/0001-meson-add-tests-option.patch delete mode 100644 package/at-spi2-atk/Config.in delete mode 100644 package/at-spi2-atk/at-spi2-atk.hash delete mode 100644 package/at-spi2-atk/at-spi2-atk.mk diff --git a/Config.in.legacy b/Config.in.legacy index 381e1e3a8c..b303677d3f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_AT_SPI2_ATK + bool "at-spi2-atk removed" + select BR2_LEGACY + select BR2_PACKAGE_AT_SPI2_CORE + help + at-spi2-atk is now part of at-spi2-core. + config BR2_PACKAGE_UCCP420WLAN bool "uccp420wlan removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 6256576e02..9530c4cfb2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1612,7 +1612,6 @@ F: support/testing/tests/package/test_avocado.py F: support/testing/tests/package/test_python_aexpect.py N: Joseph Kogut -F: package/at-spi2-atk/ F: package/at-spi2-core/ F: package/clang/ F: package/earlyoom/ diff --git a/package/Config.in b/package/Config.in index 3ace25c665..42173fa2b1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1552,7 +1552,6 @@ endmenu menu "Graphics" source "package/assimp/Config.in" - source "package/at-spi2-atk/Config.in" source "package/at-spi2-core/Config.in" source "package/atk/Config.in" source "package/atkmm/Config.in" diff --git a/package/at-spi2-atk/0001-meson-add-tests-option.patch b/package/at-spi2-atk/0001-meson-add-tests-option.patch deleted file mode 100644 index 3a2aefa090..0000000000 --- a/package/at-spi2-atk/0001-meson-add-tests-option.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 466d04a57b32417dbf2d5e818af1b7593af5f802 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 May 2020 10:29:36 +0200 -Subject: [PATCH] meson: add tests option - -Add tests option to allow the user to build at-spi2-atk without tests, -it is especially useful as one of the test requires libxml-2.0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/at-spi2-atk/-/merge_requests/22] ---- - meson.build | 4 +++- - meson_options.txt | 4 ++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9fce5d6..61bc93d 100644 ---- a/meson.build -+++ b/meson.build -@@ -61,4 +61,6 @@ install_data('at-spi2-atk.desktop', - - subdir('droute') - subdir('atk-adaptor') --subdir('tests') -+if get_option('tests') -+ subdir('tests') -+endif -diff --git a/meson_options.txt b/meson_options.txt -index 24c9228..a4abdc2 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -2,3 +2,7 @@ option('disable_p2p', - description: 'Disable peer-to-peer DBus connections', - type: 'boolean', - value: false) -+option('tests', -+ description: 'Whether to build tests', -+ type: 'boolean', -+ value: true) --- -2.26.2 - diff --git a/package/at-spi2-atk/Config.in b/package/at-spi2-atk/Config.in deleted file mode 100644 index 9a7cfde0af..0000000000 --- a/package/at-spi2-atk/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_AT_SPI2_ATK - bool "at-spi2-atk" - depends on BR2_PACKAGE_XORG7 # at-spi2-core - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_USE_WCHAR # glib2 - select BR2_PACKAGE_ATK - select BR2_PACKAGE_AT_SPI2_CORE - select BR2_PACKAGE_LIBGLIB2 - help - The At-Spi2 Atk package contains a library that bridges - ATK to At-Spi2 D-Bus service. - - https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/ - -comment "at-spi2-atk needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -comment "at-spi2-atk depends on X.org" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_XORG7 diff --git a/package/at-spi2-atk/at-spi2-atk.hash b/package/at-spi2-atk/at-spi2-atk.hash deleted file mode 100644 index 9c564c32af..0000000000 --- a/package/at-spi2-atk/at-spi2-atk.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.sha256sum -sha256 901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0 at-spi2-atk-2.34.2.tar.xz - -# locally calculated -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-atk/at-spi2-atk.mk b/package/at-spi2-atk/at-spi2-atk.mk deleted file mode 100644 index 232b577230..0000000000 --- a/package/at-spi2-atk/at-spi2-atk.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# at-spi2-atk -# -################################################################################ - -AT_SPI2_ATK_VERSION_MAJOR = 2.34 -AT_SPI2_ATK_VERSION = $(AT_SPI2_ATK_VERSION_MAJOR).2 -AT_SPI2_ATK_SOURCE = at-spi2-atk-$(AT_SPI2_ATK_VERSION).tar.xz -AT_SPI2_ATK_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) -AT_SPI2_ATK_LICENSE = LGPL-2.1+ -AT_SPI2_ATK_LICENSE_FILES = COPYING -AT_SPI2_ATK_CPE_ID_VENDOR = gnome -AT_SPI2_ATK_INSTALL_STAGING = YES -AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf -AT_SPI2_ATK_CONF_OPTS = -Dtests=false - -$(eval $(meson-package)) -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:58:36 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:58:36 +0100 Subject: [Buildroot] [PATCH v5 3/5] package/atk: remove package In-Reply-To: <20230227105838.358916-1-thomas.devoogdt@barco.com> References: <20230227105838.358916-1-thomas.devoogdt@barco.com> Message-ID: <20230227105838.358916-3-thomas.devoogdt@barco.com> From: Daniel Lang atk has been merged into at-spi2-core with version 2.45.1. https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_45_1/NEWS https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78 Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt at barco.com/) v5: rebased + grouped patches --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/atk/Config.in | 14 -------------- package/atk/atk.hash | 5 ----- package/atk/atk.mk | 25 ------------------------- package/atkmm/Config.in | 8 ++++---- package/atkmm/atkmm.mk | 2 +- package/libglade/Config.in | 2 +- package/libglade/libglade.mk | 2 +- package/libgtk2/Config.in | 2 +- package/libgtk2/libgtk2.mk | 2 +- package/libgtk3/Config.in | 2 +- package/libgtk3/libgtk3.mk | 2 +- 13 files changed, 18 insertions(+), 56 deletions(-) delete mode 100644 package/atk/Config.in delete mode 100644 package/atk/atk.hash delete mode 100644 package/atk/atk.mk diff --git a/Config.in.legacy b/Config.in.legacy index b303677d3f..2d3b1d41ea 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_ATK + bool "atk removed" + select BR2_LEGACY + select BR2_PACKAGE_AT_SPI2_CORE + help + atk is now part of at-spi2-core. + config BR2_PACKAGE_AT_SPI2_ATK bool "at-spi2-atk removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 42173fa2b1..3891f5abdd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1553,7 +1553,6 @@ endmenu menu "Graphics" source "package/assimp/Config.in" source "package/at-spi2-core/Config.in" - source "package/atk/Config.in" source "package/atkmm/Config.in" source "package/bayer2rgb-neon/Config.in" source "package/bullet/Config.in" diff --git a/package/atk/Config.in b/package/atk/Config.in deleted file mode 100644 index d9371b879b..0000000000 --- a/package/atk/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_ATK - bool "atk" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - The ATK accessibility toolkit, needed to build GTK+-2.x. - - https://gitlab.gnome.org/GNOME/atk - -comment "atk needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/atk/atk.hash b/package/atk/atk.hash deleted file mode 100644 index d8cd69ff1f..0000000000 --- a/package/atk/atk.hash +++ /dev/null @@ -1,5 +0,0 @@ -# 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 deleted file mode 100644 index 2820fb486d..0000000000 --- a/package/atk/atk.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# atk -# -################################################################################ - -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) -ATK_LICENSE = LGPL-2.0+ -ATK_LICENSE_FILES = COPYING -ATK_INSTALL_STAGING = YES -ATK_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) - -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -ATK_CONF_OPTS += -Dintrospection=true -ATK_DEPENDENCIES += gobject-introspection -else -ATK_CONF_OPTS += -Dintrospection=false -endif - -ATK_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) - -$(eval $(meson-package)) diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in index aa58f8d593..f6f2ca8fc2 100644 --- a/package/atkmm/Config.in +++ b/package/atkmm/Config.in @@ -2,10 +2,10 @@ config BR2_PACKAGE_ATKMM bool "atkmm" depends on BR2_INSTALL_LIBSTDCPP # glibmm depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc - depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 - depends on BR2_USE_MMU # atk/glibmm -> libglib2 - depends on BR2_USE_WCHAR # atk/glibmm -> libglib2 - select BR2_PACKAGE_ATK + depends on BR2_TOOLCHAIN_HAS_THREADS # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_MMU # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_WCHAR # at-spi2-core/glibmm -> libglib2 + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_GLIBMM select BR2_PACKAGE_LIBSIGC diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk index 7ceb87b047..da763c8386 100644 --- a/package/atkmm/atkmm.mk +++ b/package/atkmm/atkmm.mk @@ -11,6 +11,6 @@ ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR) ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) ATKMM_LICENSE_FILES = COPYING COPYING.tools ATKMM_INSTALL_STAGING = YES -ATKMM_DEPENDENCIES = atk glibmm libsigc host-pkgconf +ATKMM_DEPENDENCIES = at-spi2-core glibmm libsigc host-pkgconf $(eval $(meson-package)) diff --git a/package/libglade/Config.in b/package/libglade/Config.in index c97c9becd2..8d0d26f159 100644 --- a/package/libglade/Config.in +++ b/package/libglade/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBGLADE depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_LIBXML2 help Libglade allows you to load glade interface files in a program diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk index 21aed60605..af73d8bd00 100644 --- a/package/libglade/libglade.mk +++ b/package/libglade/libglade.mk @@ -9,7 +9,7 @@ LIBGLADE_VERSION = $(LIBGLADE_VERSION_MAJOR).4 LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2 LIBGLADE_SITE = https://download.gnome.org/sources/libglade/$(LIBGLADE_VERSION_MAJOR) LIBGLADE_INSTALL_STAGING = YES -LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2 +LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 at-spi2-core libxml2 LIBGLADE_LICENSE = LGPL-2.0+ LIBGLADE_LICENSE_FILES = COPYING diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index c75c37fb63..f2888b2f51 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 859925e8d3..608c263e4d 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -23,7 +23,7 @@ LIBGTK2_CONF_ENV = \ LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no -LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk \ +LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango at-spi2-core \ gdk-pixbuf $(TARGET_NLS_DEPENDENCIES) LIBGTK2_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS) diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 82ca68d2da..34b8d49eb3 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -23,7 +23,7 @@ config BR2_PACKAGE_LIBGTK3 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 283c129cef..2821c7eb52 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -14,7 +14,7 @@ LIBGTK3_CPE_ID_VENDOR = gnome LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \ +LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 at-spi2-core libglib2 cairo pango \ gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:58:37 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:58:37 +0100 Subject: [Buildroot] [PATCH v5 4/5] package/libgtk3: re-enable atk-bridge In-Reply-To: <20230227105838.358916-1-thomas.devoogdt@barco.com> References: <20230227105838.358916-1-thomas.devoogdt@barco.com> Message-ID: <20230227105838.358916-4-thomas.devoogdt@barco.com> The at-spi2-core and at-spi2-atk were merged, and are now built by default, so this patch is no longer required. Signed-off-by: Thomas Devoogdt --- v5: added re-enable atk-bridge patch to the package/at-spi2-core: bump to version 2.47.1 group --- package/libgtk3/0001-disable-atk-bridge.patch | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch deleted file mode 100644 index f3e9bff2ba..0000000000 --- a/package/libgtk3/0001-disable-atk-bridge.patch +++ /dev/null @@ -1,41 +0,0 @@ -Remove atk-bridge support. - -atk-bridge doesn't seem useful for now in Buildroot and requires to -add two new packages just for it: at-spi2-core and at-spi2-atk. - -Signed-off-by: Hadrien Boutteville - ---- a/gtk/a11y/gtkaccessibility.c -+++ b/gtk/a11y/gtkaccessibility.c -@@ -37,10 +37,6 @@ - #include - #include - --#ifdef GDK_WINDOWING_X11 --#include --#endif -- - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, - guint n_param_values, - const GValue *param_values, -@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) - _gtk_accessibility_override_atk_util (); - do_window_event_initialization (); - --#ifdef GDK_WINDOWING_X11 -- atk_bridge_adaptor_init (NULL, NULL); --#endif -- - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); - } ---- a/meson.build -+++ b/meson.build -@@ -564,7 +564,7 @@ if x11_enabled - xfixes_dep = dependency('xfixes', required: false) - xcomposite_dep = dependency('xcomposite', required: false) - fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) -- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) -+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) - - backend_immodules += ['xim'] - -- 2.39.2 From thomas at devoogdt.com Mon Feb 27 10:58:38 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 27 Feb 2023 11:58:38 +0100 Subject: [Buildroot] [PATCH v5 5/5] package/libgtk3: fix update-icon-cache on empty directory In-Reply-To: <20230227105838.358916-1-thomas.devoogdt@barco.com> References: <20230227105838.358916-1-thomas.devoogdt@barco.com> Message-ID: <20230227105838.358916-5-thomas.devoogdt@barco.com> If both, hicolor-icon-theme (selected by libgtk3-demo) and adwaita-icon-theme is not selected, then the /usr/share/icons folder is empty, causing find to fail. Signed-off-by: Thomas Devoogdt --- v5: - Fixed indentation. - Grouped patches. --- package/libgtk3/libgtk3.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 2821c7eb52..191e28dda6 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -146,8 +146,9 @@ endef # Create icon-theme.cache for each of the icon directories/themes # It's not strictly necessary but speeds up lookups define LIBGTK3_UPDATE_ICON_CACHE - find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ - -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; + [ ! -d $(TARGET_DIR)/usr/share/icons ] || \ + find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ + -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; endef LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE -- 2.39.2 From sebastien.szymanski at armadeus.com Mon Feb 27 10:22:40 2023 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Mon, 27 Feb 2023 11:22:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/glmark2: bump to version 2023.01 Message-ID: <20230227102240.30064-1-sebastien.szymanski@armadeus.com> Convert the package to a meson package as recommanded by upstream. Drop no more needed patchs. Fixes: http://autobuild.buildroot.net/results/b32/b3245c4ee8e0b3592b09e0bc57bc0928018936c2 Signed-off-by: S?bastien Szymanski --- ...find_program-to-find-wayland-scanner.patch | 50 ------------------- ...ibmatrix-Add-missing-utility-include.patch | 30 ----------- package/glmark2/glmark2.hash | 2 +- package/glmark2/glmark2.mk | 11 ++-- 4 files changed, 5 insertions(+), 88 deletions(-) delete mode 100644 package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch delete mode 100644 package/glmark2/0002-libmatrix-Add-missing-utility-include.patch diff --git a/package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch b/package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch deleted file mode 100644 index 681f0c679463..000000000000 --- a/package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 303d5c4fef1760ede5786bc62c7012dd7ae93722 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 8 Nov 2020 23:46:49 +0100 -Subject: [PATCH] wscript: use find_program to find wayland-scanner - -Use find_program instead of check_cfg to find wayland-scanner. This will -fix the following build failure when cross-compiling: - -[ 3/73] Compiling doc/glmark2.1.in -/bin/sh: 1: /usr/bin/wayland-scanner: not found - -Fixes: - - http://autobuild.buildroot.org/results//361dc40e558e2646cb93f405c7b1f621d400fea3 - -Signed-off-by: Fabrice Fontaine ---- - src/wscript_build | 2 +- - wscript | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/wscript_build b/src/wscript_build -index bbe7a77..ed3e8d6 100644 ---- a/src/wscript_build -+++ b/src/wscript_build -@@ -51,7 +51,7 @@ else: - - if 'WAYLAND_SCANNER_wayland_scanner' in bld.env.keys(): - def wayland_scanner_cmd(arg, src): -- return '%s %s < %s > ${TGT}' % (bld.env['WAYLAND_SCANNER_wayland_scanner'], arg, src) -+ return '%s %s < %s > ${TGT}' % (bld.env['WAYLAND_SCANNER_wayland_scanner'][0], arg, src) - - def wayland_proto_src_path(proto, ver): - wp_dir = bld.env['WAYLAND_PROTOCOLS_pkgdatadir'] -diff --git a/wscript b/wscript -index e09fa78..fe2494f 100644 ---- a/wscript -+++ b/wscript -@@ -227,8 +227,7 @@ def configure_linux(ctx): - # wayland-protocols >= 1.12 required for xdg-shell stable - ctx.check_cfg(package = 'wayland-protocols', atleast_version = '1.12', - variables = ['pkgdatadir'], uselib_store = 'WAYLAND_PROTOCOLS') -- ctx.check_cfg(package = 'wayland-scanner', variables = ['wayland_scanner'], -- uselib_store = 'WAYLAND_SCANNER') -+ ctx.find_program('wayland-scanner', var = 'WAYLAND_SCANNER_wayland_scanner') - - # Prepend CXX flags so that they can be overriden by the - # CXXFLAGS environment variable --- -2.28.0 - diff --git a/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch b/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch deleted file mode 100644 index 65b6183867f8..000000000000 --- a/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d1ca3f53c96dc8a4048b17dc16147a8fac782d4a Mon Sep 17 00:00:00 2001 -From: Alexandros Frantzis -Date: Mon, 14 Feb 2022 13:54:09 +0200 -Subject: [PATCH] libmatrix: Add missing include - -Fixes compilation with GCC 12. - -Fixes #169 -[Paul: backport upstream d1ca3f53c96dc8a4048b17dc16147a8fac782d4a] -Signed-off-by: Paul Cercueil ---- - - src/libmatrix/program.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h -index f95b470..1c9de08 100644 ---- a/src/libmatrix/program.h -+++ b/src/libmatrix/program.h -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include "mat.h" - - // Simple shader container. Abstracts all of the OpenGL bits, but leaves --- -2.35.1 - diff --git a/package/glmark2/glmark2.hash b/package/glmark2/glmark2.hash index 84058197701f..5b1d13b46812 100644 --- a/package/glmark2/glmark2.hash +++ b/package/glmark2/glmark2.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 12aef3ce80406bc723542979b9818886a28d0a4c93f62379eaadfd830974790d glmark2-06e78b67702b5413335ecdf1ae816da9c20f6ed9.tar.gz +sha256 8fece3fc323b643644a525be163dc4931a4189971eda1de8ad4c1712c5db3d67 glmark2-2023.01.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 16fbc228292bd774b263b212ae422c524cbf3b2078bcf21b22f8bdd4373be617 COPYING.SGI diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index bac9d9ff6fc2..0fc466aff37e 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -4,15 +4,12 @@ # ################################################################################ -GLMARK2_VERSION = 06e78b67702b5413335ecdf1ae816da9c20f6ed9 +GLMARK2_VERSION = 2023.01 GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION)) GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng -# The bundled waf script is too old for >= python3.11 -GLMARK2_NEEDS_EXTERNAL_WAF = YES - ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y) GLMARK2_DEPENDENCIES += libdrm libgbm libgles udev GLMARK2_FLAVORS += drm-glesv2 @@ -44,7 +41,7 @@ GLMARK2_FLAVORS += wayland-gl endif GLMARK2_CONF_OPTS += \ - --prefix=/usr \ - --with-flavors=$(subst $(space),$(comma),$(GLMARK2_FLAVORS)) + -Dflavors=$(subst $(space),$(comma),$(GLMARK2_FLAVORS)) \ + --prefix=/usr -$(eval $(waf-package)) +$(eval $(meson-package)) -- 2.39.2 From marcus.hoffmann at othermo.de Mon Feb 27 14:25:06 2023 From: marcus.hoffmann at othermo.de (Marcus Hoffmann) Date: Mon, 27 Feb 2023 15:25:06 +0100 Subject: [Buildroot] [git commit] package/sudo: fix SUDO_ENABLE_SUDO_GROUP_RULE following version bump In-Reply-To: <20220718215158.C299083CCF@busybox.osuosl.org> References: <20220718215158.C299083CCF@busybox.osuosl.org> Message-ID: Hi Peter, the needs to be backported to 2022.11.x and 2022.02.x Best, Marcus On 19.07.22 00:05, Yann E.MORIN wrote: > commit: https://git.buildroot.net/buildroot/commit/?id=079fccdee5a2a10fc8275094512b8423548ea147 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > > Since the version bump of sudo to v1.9.11p2 in commit 9b7f8da96b, the > sed magic in SUDO_ENABLE_SUDO_GROUP_RULE no longer does its job, due > to a slight change in the example sudoers file provided by upstream > sudo. > > This commit fixes the regexp to match the new sudoers file. > > Fixes bug #14891 (https://bugs.busybox.net/show_bug.cgi?id=14891) > > Reported-by: Matthias Hardt > Signed-off-by: Thomas Petazzoni > Signed-off-by: Yann E. MORIN > --- > package/sudo/sudo.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk > index 2b9ba76a51..4f9fdb4b2c 100644 > --- a/package/sudo/sudo.mk > +++ b/package/sudo/sudo.mk > @@ -80,7 +80,7 @@ define SUDO_USERS > endef > > define SUDO_ENABLE_SUDO_GROUP_RULE > - $(SED) '/^# \%sudo\tALL=(ALL) ALL/s/^# //' $(TARGET_DIR)/etc/sudoers > + $(SED) '/^# \%sudo\tALL=(ALL:ALL) ALL/s/^# //' $(TARGET_DIR)/etc/sudoers > endef > SUDO_POST_INSTALL_TARGET_HOOKS += SUDO_ENABLE_SUDO_GROUP_RULE > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot ________________________________ othermo GmbH | Sitz der Gesellschaft: Alzenau | Amtsgericht Aschaffenburg: HRB 14783 | USt-IdNr.: DE319977978 | Gesch?ftsf?hrung: Dr. Dennis Metz. From peter at korsgaard.com Mon Feb 27 14:39:11 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:39:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: fix build without NPTL In-Reply-To: <20230226120732.39710-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 13:07:32 +0100") References: <20230226120732.39710-1-fontaine.fabrice@gmail.com> Message-ID: <87zg8znpf4.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without NPTL raised since the addition > of the package in commit 1e64fa2956171cdc9d6e6c8896b4b589ce573513: > /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': > /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: > error: 'pthread_spin_init' was not declared in this scope; did you > mean 'pthread_cond_init'? > 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) > | ^~~~~~~~~~~~~~~~~ > | pthread_cond_init > Fixes: > - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:39:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:39:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xwayland: xlib_libxshmfence is mandatory In-Reply-To: <20230226122336.49814-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 13:23:36 +0100") References: <20230226122336.49814-1-fontaine.fabrice@gmail.com> Message-ID: <87v8jnnpds.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > xlib_libxshmfence is mandatory, not optional, since the addition of the > package in commit 05c3177493aa8447d5cb568c8c13e0c09eded18b: > ../miext/sync/misyncshm.c:36:10: fatal error: X11/xshmfence.h: No such file or directory > 36 | #include > | ^~~~~~~~~~~~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/cccc8f97d452ed2adbcbc4624f159a00287a3d38 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:40:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:40:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-werkzeug: security bump to version 2.2.3 In-Reply-To: <20230226131048.75813-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 14:10:48 +0100") References: <20230226131048.75813-1-fontaine.fabrice@gmail.com> Message-ID: <87r0ubnpde.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-23934 and CVE-2023-25577 > https://github.com/pallets/werkzeug/security/advisories/GHSA-px8h-6qxv-m22q > https://github.com/pallets/werkzeug/security/advisories/GHSA-xg9f-g7g7-2323 > https://werkzeug.palletsprojects.com/en/2.2.x/changes/#version-2-2-3 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:40:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:40:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/bind: security bump to version 9.16.38 In-Reply-To: <20230226132026.82185-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 14:20:26 +0100") References: <20230226132026.82185-1-fontaine.fabrice@gmail.com> Message-ID: <87mt4znpc6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2022-3094, CVE-2022-3736 and CVE-2022-3924 > - Update hash of COPYRIGHT (year updated with > https://gitlab.isc.org/isc-projects/bind9/-/commit/1a5d707f52282117c9912a27dcc89f2ec412577a) > https://downloads.isc.org/isc/bind9/9.16.38/doc/arm/html/notes.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:43:53 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:43:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-m2crypto: fix CVE-2020-25657 In-Reply-To: <20230226132747.86908-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 14:27:47 +0100") References: <20230226132747.86908-1-fontaine.fabrice@gmail.com> Message-ID: <87ilfnnp7a.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > A flaw was found in all released versions of m2crypto, where they are > vulnerable to Bleichenbacher timing attacks in the RSA decryption API > via the timed processing of valid PKCS#1 v1.5 Ciphertext. The highest > threat from this vulnerability is to confidentiality. > Signed-off-by: Fabrice Fontaine Annoying that this is still not in a released version :/ Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:44:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:44:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/haproxy: security bump to version 2.6.9 In-Reply-To: <20230226133357.97330-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 14:33:57 +0100") References: <20230226133357.97330-1-fontaine.fabrice@gmail.com> Message-ID: <87edqbnp63.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-25725 > https://www.mail-archive.com/haproxy at formilux.org/msg43229.html > https://www.mail-archive.com/haproxy at formilux.org/msg43224.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:45:12 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:45:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/tiff: fix CVE-2022-48281 In-Reply-To: <20230226133946.102275-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 14:39:46 +0100") References: <20230226133946.102275-1-fontaine.fabrice@gmail.com> Message-ID: <87a60znp53.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > processCropSelections in tools/tiffcrop.c in LibTIFF through 4.5.0 has a > heap-based buffer overflow (e.g., "WRITE of size 307203") via a crafted > TIFF image. > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:47:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:47:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpjsip: fix CVE-2022-235{3, 4}7 In-Reply-To: <20230226135503.112605-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 14:55:03 +0100") References: <20230226135503.112605-1-fontaine.fabrice@gmail.com> Message-ID: <875ybnnp1x.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/pjsip/pjproject/security/advisories/GHSA-9pfh-r8x4-w26w > https://github.com/pjsip/pjproject/security/advisories/GHSA-cxwq-5g9x-x7fr > Signed-off-by: Fabrice Fontaine > --- > ...ull-request-from-GHSA-9pfh-r8x4-w26w.patch | 99 +++++++++++++++++++ > package/libpjsip/libpjsip.mk | 6 ++ > 2 files changed, 105 insertions(+) > create mode 100644 package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch .. > +# 0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch > +LIBPJSIP_IGNORE_CVES += CVE-2022-23537 > + > +# 0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch > +LIBPJSIP_IGNORE_CVES += CVE-2022-23547 Did you forget to git add the patch for 0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch? -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:47:47 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:47:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/proxychains-ng: set -fPIC In-Reply-To: <20230226154421.47285-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 16:44:21 +0100") References: <20230226154421.47285-1-fontaine.fabrice@gmail.com> Message-ID: <871qmbnp0s.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Set -fPIC to avoid the following build failure with some architectures > such as mips or aarch64 raised since bump to version 4.14 in commit > 35953d1e61aa8581be09c9dca39365955b10590e and > https://github.com/rofl0r/proxychains-ng/commit/35a674bdbc294730429a1007c9e7ce01e65b49b5: > checking what's the option to use in linker to set library name ... > cannot find an option to set library name > Fixes: > - http://autobuild.buildroot.org/results/8ed1481e29321ed3da40251f700cb3bd66f62c94 > - http://autobuild.buildroot.org/results/fd01df6eb9a37257894740d44a33eece9123355a > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:49:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:49:17 +0100 Subject: [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series In-Reply-To: (Lang Daniel via buildroot's message of "Mon, 27 Feb 2023 08:46:13 +0000") References: Message-ID: <87wn43madu.fsf@dell.be.48ers.dk> >>>>> "Lang" == Lang Daniel via buildroot writes: > Signed-off-by: Daniel Lang Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:50:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:50:01 +0100 Subject: [Buildroot] [PATCH 3/3] linux: bump _KERNEL_LATEST_VERSION to 6.2 In-Reply-To: (Lang Daniel via buildroot's message of "Mon, 27 Feb 2023 08:46:25 +0000") References: Message-ID: <87sfermacm.fsf@dell.be.48ers.dk> >>>>> "Lang" == Lang Daniel via buildroot writes: > Signed-off-by: Daniel Lang > --- > linux/Config.in | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > diff --git a/linux/Config.in b/linux/Config.in > index 5cbef197ab..495fc48997 100644 > --- a/linux/Config.in > +++ b/linux/Config.in > @@ -28,8 +28,8 @@ choice > prompt "Kernel version" > config BR2_LINUX_KERNEL_LATEST_VERSION > - bool "Latest version (6.1)" > - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 if BR2_KERNEL_HEADERS_AS_KERNEL > + bool "Latest version (6.2)" > + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 if BR2_KERNEL_HEADERS_AS_KERNEL Given that 6.1 is a LTS kernel I would prefer to wait with patch 2+3 until after 2023.02 is released (E.G. in a few days). -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 14:57:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:57:22 +0100 Subject: [Buildroot] [Help] Building from a private PyPi server In-Reply-To: (Alberto Fahrenkrog's message of "Mon, 27 Feb 2023 00:17:25 +0000") References: Message-ID: <87o7pfma0d.fsf@dell.be.48ers.dk> >>>>> "Alberto" == Alberto Fahrenkrog writes: > Hello all, > In our company we have custom Python packages stored in a private PyPi > server. To install them we simply add the --extra-index-url in our > requirements.txt file when using pip. Are you aware of the security issues with --extra-index-url? https://github.com/pypa/pip/issues/9612 > The packages are also available for manual download from the server, > however all URLs to any .tar.gz file are in the form > https://git.ourserver.com/packages/pypi/package-name/version-number/files/1234. This > leads me to the following options (I think): > * Try to get Buildroot to use the private PyPi server. I had a look > at the "scanpypi" script and it generated the .mk and .in files for a > regular PyPi package, but I could not find a way to tell scanpypi to > use an extra url or private pypi address scanpypi is indeed hard coded to use pypi and their JSON API (https://pypi.org/pypi/{pkg}/json), so not trivial to use with a local repo. Do your private server expose the same API? If so, I guess we could add an argument to scanpypi to use a custom URI instead of pypi.org. > * Find a way, using wget, to download the package from the address > above. Unfortunately I've had no luck with that yet. With the command: > wget > https://ourserver.com/-/packages/pypi/package-name/version_nr/files/5525 Notice: You have an additional /-/ compared to the URL above. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 13:41:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 14:41:21 +0100 Subject: [Buildroot] [git commit] package/gdal: fix build without NPTL Message-ID: <20230227145800.6D29686BEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93f5ba38533edb66e9446086266da6f9be904a80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without NPTL raised since the addition of the package in commit 1e64fa2956171cdc9d6e6c8896b4b589ce573513: /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: error: 'pthread_spin_init' was not declared in this scope; did you mean 'pthread_cond_init'? 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) | ^~~~~~~~~~~~~~~~~ | pthread_cond_init Fixes: - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../gdal/0001-fix-uclibc-build-without-NPTL.patch | 102 +++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/package/gdal/0001-fix-uclibc-build-without-NPTL.patch b/package/gdal/0001-fix-uclibc-build-without-NPTL.patch new file mode 100644 index 0000000000..6ecbfc7f95 --- /dev/null +++ b/package/gdal/0001-fix-uclibc-build-without-NPTL.patch @@ -0,0 +1,102 @@ +From 0d3ee8a7661dcd85a9d7b636124af32de8d1b2f1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 11:31:23 +0100 +Subject: [PATCH] fix uclibc build without NPTL + +Check for pthread_spin_lock instead of pthread_spin_lock_t to avoid the +following uclibc build failure: + +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: error: 'pthread_spin_init' was not declared in this scope; did you mean 'pthread_cond_init'? + 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) + | ^~~~~~~~~~~~~~~~~ + | pthread_cond_init +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'int CPLAcquireSpinLock(CPLSpinLock*)': +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2283:12: error: 'pthread_spin_lock' was not declared in this scope; did you mean 'pthread_spinlock_t'? + 2283 | return pthread_spin_lock( &(psSpin->spin) ) == 0; + | ^~~~~~~~~~~~~~~~~ + | pthread_spinlock_t + +Fixes: + - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OSGeo/gdal/pull/7318] +--- + cmake/helpers/configure.cmake | 4 ++-- + cmake/template/cpl_config.h.in | 4 ++-- + port/cpl_config.h.in | 4 ++-- + port/cpl_multiproc.cpp | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/cmake/helpers/configure.cmake b/cmake/helpers/configure.cmake +index 08549df434..62a4f636ba 100644 +--- a/cmake/helpers/configure.cmake ++++ b/cmake/helpers/configure.cmake +@@ -110,9 +110,9 @@ else () + " + #define _GNU_SOURCE + #include +- int main() { pthread_spinlock_t spin; return 1; } ++ int main() { pthread_spinlock_t spin; return pthread_spin_lock(&spin); } + " +- HAVE_PTHREAD_SPINLOCK) ++ HAVE_PTHREAD_SPIN_LOCK) + + check_c_source_compiles( + " +diff --git a/cmake/template/cpl_config.h.in b/cmake/template/cpl_config.h.in +index cfa7da94aa..d1fd80bda9 100644 +--- a/cmake/template/cpl_config.h.in ++++ b/cmake/template/cpl_config.h.in +@@ -61,8 +61,8 @@ + /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ + #cmakedefine HAVE_PTHREAD_MUTEX_ADAPTIVE_NP 1 + +-/* Define to 1 if you have the `pthread_spinlock_t' type. */ +-#cmakedefine HAVE_PTHREAD_SPINLOCK 1 ++/* Define to 1 if you have the `pthread_spin_lock' function. */ ++#cmakedefine HAVE_PTHREAD_SPIN_LOCK 1 + + /* Define to 1 if you have the `pthread_atfork' function. */ + #cmakedefine HAVE_PTHREAD_ATFORK 1 +diff --git a/port/cpl_config.h.in b/port/cpl_config.h.in +index ea28efb3f0..09a48f242d 100644 +--- a/port/cpl_config.h.in ++++ b/port/cpl_config.h.in +@@ -51,8 +51,8 @@ + /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ + #undef HAVE_PTHREAD_MUTEX_ADAPTIVE_NP + +-/* Define to 1 if you have the `pthread_spinlock_t' type. */ +-#undef HAVE_PTHREAD_SPINLOCK ++/* Define to 1 if you have the `pthread_spin_lock' function. */ ++#undef HAVE_PTHREAD_SPIN_LOCK + + /* Define to 1 if you have the 5 args `mremap' function. */ + #undef HAVE_5ARGS_MREMAP +diff --git a/port/cpl_multiproc.cpp b/port/cpl_multiproc.cpp +index 7f5bcd9127..474ff5bb29 100644 +--- a/port/cpl_multiproc.cpp ++++ b/port/cpl_multiproc.cpp +@@ -2232,7 +2232,7 @@ void CPLCleanupTLS() + /* CPLCreateSpinLock() */ + /************************************************************************/ + +-#if defined(HAVE_PTHREAD_SPINLOCK) ++#if defined(HAVE_PTHREAD_SPIN_LOCK) + #define HAVE_SPINLOCK_IMPL + + struct _CPLSpinLock +@@ -2310,7 +2310,7 @@ void CPLDestroySpinLock(CPLSpinLock *psSpin) + pthread_spin_destroy(&(psSpin->spin)); + free(psSpin); + } +-#endif // HAVE_PTHREAD_SPINLOCK ++#endif // HAVE_PTHREAD_SPIN_LOCK + + #endif // def CPL_MULTIPROC_PTHREAD + +-- +2.39.1 + From peter at korsgaard.com Mon Feb 27 14:40:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:40:46 +0100 Subject: [Buildroot] [git commit] package/bind: security bump to version 9.16.38 Message-ID: <20230227145800.A832586BEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7abc9a0554cc1c1bbc1ad4273622024020fa2c7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fix CVE-2022-3094, CVE-2022-3736 and CVE-2022-3924 - Update hash of COPYRIGHT (year updated with https://gitlab.isc.org/isc-projects/bind9/-/commit/1a5d707f52282117c9912a27dcc89f2ec412577a) https://downloads.isc.org/isc/bind9/9.16.38/doc/arm/html/notes.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 6 +++--- package/bind/bind.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index d41a9bbc5e..32804b5ce0 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.16.33/bind-9.16.33.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.38/bind-9.16.38.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 ec4fbea4b2e368d1824971509e33fa159224ad14b436034c6bcd46104c328d91 bind-9.16.33.tar.xz -sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT +sha256 8df44c9d9a84a28ab8b49d55f3c33b624b90ef8f6a8b9ee6a4c33cc17c14c50f bind-9.16.38.tar.xz +sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 2f83a6276e..70987a9823 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.33 +BIND_VERSION = 9.16.38 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. From peter at korsgaard.com Mon Feb 27 14:40:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:40:09 +0100 Subject: [Buildroot] [git commit] package/python-werkzeug: security bump to version 2.2.3 Message-ID: <20230227145800.9495C86BF4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=da5d2adf572f9b89b6ea82f9548bd4dfba7482ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2023-23934 and CVE-2023-25577 https://github.com/pallets/werkzeug/security/advisories/GHSA-px8h-6qxv-m22q https://github.com/pallets/werkzeug/security/advisories/GHSA-xg9f-g7g7-2323 https://werkzeug.palletsprojects.com/en/2.2.x/changes/#version-2-2-3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-werkzeug/python-werkzeug.hash | 6 +++--- package/python-werkzeug/python-werkzeug.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash index 13b95bc448..0b60a40066 100644 --- a/package/python-werkzeug/python-werkzeug.hash +++ b/package/python-werkzeug/python-werkzeug.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/Werkzeug/json -md5 9d7e50c5bb3a9fc12823b5faf374b90e Werkzeug-2.2.2.tar.gz -sha256 7ea2d48322cc7c0f8b3a215ed73eabd7b5d75d0b50e31ab006286ccff9e00b8f Werkzeug-2.2.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/werkzeug/json +md5 28c3ec6a4b1ce8f06c85612c1dfa351a Werkzeug-2.2.3.tar.gz +sha256 2e1ccc9417d4da358b9de6f174e3ac094391ea1d4fbef2d667865d819dfd0afe Werkzeug-2.2.3.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk index 3ebae3c165..0dd27d145f 100644 --- a/package/python-werkzeug/python-werkzeug.mk +++ b/package/python-werkzeug/python-werkzeug.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 2.2.2 +PYTHON_WERKZEUG_VERSION = 2.2.3 PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/f8/c1/1c8e539f040acd80f844c69a5ef8e2fccdf8b442dabb969e497b55d544e1 +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/02/3c/baaebf3235c87d61d6593467056d5a8fba7c75ac838b8d100a5e64eba7a0 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst From peter at korsgaard.com Mon Feb 27 14:44:50 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:44:50 +0100 Subject: [Buildroot] [git commit] package/tiff: fix CVE-2022-48281 Message-ID: <20230227145800.DBFFA86BEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7ae47f0c68607a90e6a65cbfff5bfb3007b019d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master processCropSelections in tools/tiffcrop.c in LibTIFF through 4.5.0 has a heap-based buffer overflow (e.g., "WRITE of size 307203") via a crafted TIFF image. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...p-Correct-simple-copy-paste-error-Fix-488.patch | 28 ++++++++++++++++++++++ package/tiff/tiff.mk | 3 +++ 2 files changed, 31 insertions(+) diff --git a/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch b/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch new file mode 100644 index 0000000000..73c0d10ffc --- /dev/null +++ b/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch @@ -0,0 +1,28 @@ +From 97d65859bc29ee334012e9c73022d8a8e55ed586 Mon Sep 17 00:00:00 2001 +From: Su Laus +Date: Sat, 21 Jan 2023 15:58:10 +0000 +Subject: [PATCH] tiffcrop: Correct simple copy paste error. Fix #488. + +[Retrieved from: +https://gitlab.com/libtiff/libtiff/-/commit/97d65859bc29ee334012e9c73022d8a8e55ed586] +Signed-off-by: Fabrice Fontaine +--- + tools/tiffcrop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c +index 14fa18da..7db69883 100644 +--- a/tools/tiffcrop.c ++++ b/tools/tiffcrop.c +@@ -8591,7 +8591,7 @@ static int processCropSelections(struct image_data *image, + cropsize + NUM_BUFF_OVERSIZE_BYTES); + else + { +- prev_cropsize = seg_buffs[0].size; ++ prev_cropsize = seg_buffs[i].size; + if (prev_cropsize < cropsize) + { + next_buff = _TIFFrealloc( +-- +GitLab + diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index e7de51ea1e..f9754a4b49 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -12,6 +12,9 @@ TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES +# 0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch +TIFF_IGNORE_CVES += CVE-2022-48281 + # webp has a (optional) dependency on tiff, so we can't have webp # support in tiff, or that would create a circular dependency. TIFF_CONF_OPTS = \ From peter at korsgaard.com Mon Feb 27 14:39:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:39:28 +0100 Subject: [Buildroot] [git commit] package/x11r7/xwayland: xlib_libxshmfence is mandatory Message-ID: <20230227145800.80B4A86BF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=daf01a38be705ada7ce3e083f096d424ead5544c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master xlib_libxshmfence is mandatory, not optional, since the addition of the package in commit 05c3177493aa8447d5cb568c8c13e0c09eded18b: ../miext/sync/misyncshm.c:36:10: fatal error: X11/xshmfence.h: No such file or directory 36 | #include | ^~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/cccc8f97d452ed2adbcbc4624f159a00287a3d38 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/weston/Config.in | 4 ++++ package/wlroots/Config.in | 4 ++++ package/x11r7/xwayland/Config.in | 5 +++++ package/x11r7/xwayland/xwayland.mk | 5 +++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 09119edaaa..d5dbf27bbd 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -114,6 +114,8 @@ config BR2_PACKAGE_WESTON_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 @@ -125,6 +127,8 @@ comment "XWayland support needs libepoxy and X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS # Weston needs at least one shell; this can be one of the bundled ones, diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index b2d3f3c3b1..fb23e9069c 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -47,6 +47,8 @@ config BR2_PACKAGE_WLROOTS_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XCB_UTIL_WM select BR2_PACKAGE_XWAYLAND @@ -58,6 +60,8 @@ comment "XWayland support needs X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS endif diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in index 4f14f2cc36..241ab73ad3 100644 --- a/package/x11r7/xwayland/Config.in +++ b/package/x11r7/xwayland/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_XWAYLAND # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. + depends on !BR2_RISCV_32 # xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_WAYLAND @@ -14,6 +16,7 @@ config BR2_PACKAGE_XWAYLAND select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XLIB_LIBXKBFILE select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXSHMFENCE select BR2_PACKAGE_XLIB_XTRANS select BR2_PACKAGE_XORGPROTO help @@ -23,4 +26,6 @@ config BR2_PACKAGE_XWAYLAND comment "xwayland needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 174b440b07..7aef1156d3 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -18,6 +18,7 @@ XWAYLAND_DEPENDENCIES = \ xlib_libXfont2 \ xlib_libxkbfile \ xlib_libXrandr \ + xlib_libxshmfence \ xlib_xtrans \ xorgproto XWAYLAND_CONF_OPTS = \ @@ -77,9 +78,9 @@ XWAYLAND_CONF_OPTS += -Dsha1=libsha1 XWAYLAND_DEPENDENCIES += libsha1 endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_LIBDRM),yy) +ifeq ($(BR2_PACKAGE_LIBDRM),y) XWAYLAND_CONF_OPTS += -Ddri3=true -XWAYLAND_DEPENDENCIES += xlib_libxshmfence libdrm +XWAYLAND_DEPENDENCIES += libdrm else XWAYLAND_CONF_OPTS += -Ddri3=false endif From peter at korsgaard.com Mon Feb 27 14:47:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:47:41 +0100 Subject: [Buildroot] [git commit] package/proxychains-ng: set -fPIC Message-ID: <20230227145800.ED1EE86BF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=441b859a1e3a5b2a6bbbc8990f67c33913aa2385 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set -fPIC to avoid the following build failure with some architectures such as mips or aarch64 raised since bump to version 4.14 in commit 35953d1e61aa8581be09c9dca39365955b10590e and https://github.com/rofl0r/proxychains-ng/commit/35a674bdbc294730429a1007c9e7ce01e65b49b5: checking what's the option to use in linker to set library name ... cannot find an option to set library name Fixes: - http://autobuild.buildroot.org/results/8ed1481e29321ed3da40251f700cb3bd66f62c94 - http://autobuild.buildroot.org/results/fd01df6eb9a37257894740d44a33eece9123355a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/proxychains-ng/proxychains-ng.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk index c4d487c7db..beb8909088 100644 --- a/package/proxychains-ng/proxychains-ng.mk +++ b/package/proxychains-ng/proxychains-ng.mk @@ -13,7 +13,8 @@ PROXYCHAINS_NG_CPE_ID_VENDOR = proxychains-ng_project define PROXYCHAINS_NG_CONFIGURE_CMDS cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) ./configure --prefix=/usr --sysconfdir=/etc + $(TARGET_CONFIGURE_OPTS) CPPFLAGS="$(TARGET_CPPFLAGS) -fPIC" \ + ./configure --prefix=/usr --sysconfdir=/etc endef define PROXYCHAINS_NG_BUILD_CMDS From peter at korsgaard.com Mon Feb 27 14:44:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:44:26 +0100 Subject: [Buildroot] [git commit] package/haproxy: security bump to version 2.6.9 Message-ID: <20230227145800.CB35186BF4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af9e64f120dc6a060e98bb0915c8b6b34d644896 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2023-25725 https://www.mail-archive.com/haproxy at formilux.org/msg43229.html https://www.mail-archive.com/haproxy at formilux.org/msg43224.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 2cd8ff1806..f5540ee44a 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.5.tar.gz.sha256 -sha256 ce9e19ebfcdd43e51af8a6090f1df8d512d972ddf742fa648a643bbb19056605 haproxy-2.6.5.tar.gz +# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.9.tar.gz.sha256 +sha256 f01a1c5f465dc1b5cd175d0b28b98beb4dfe82b5b5b63ddcc68d1df433641701 haproxy-2.6.9.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 c37508f63b..012c1dfdb6 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.6 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).5 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).9 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 Feb 27 14:48:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:48:43 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Message-ID: <20230227145801.06C4A86BEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=159df6a531676021607ea26309b994c68e5e501d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Daniel Lang 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 11dc5cce07..5cbef197ab 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.14" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" 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 52eb534b40..f45b244e6b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz +sha256 a27076011efec7ad11e9ed0644f512c34cab4c5ed5ba42cfe71c83fabebe810d linux-6.1.14.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz -sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz -sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz +sha256 348d974c143fdef8517ec703fdaa24bade12a49047848be92cb9e3253b19ef98 linux-5.15.96.tar.xz +sha256 a2b51876befb8cc35724ed62820845f2b387d471a6cf46e8eedd0b6cb595825f linux-5.10.170.tar.xz +sha256 5a1e5754b4f2a4fe73b119d810ecda2ce07ecfb6f6cbbd16547c9ecd30b97627 linux-5.4.233.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz -sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz +sha256 4e1c1555c306874e0477d1af282d04a4efb285121456ab3f79519c92e406b701 linux-4.14.307.tar.xz +sha256 64a265a193c9e3e14d1397278e2348386ef6d6043af76d693c0fbbafed345ca8 linux-4.19.274.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 18c179ec8d..ae40520c51 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -384,12 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.305" if BR2_KERNEL_HEADERS_4_14 - default "4.19.272" if BR2_KERNEL_HEADERS_4_19 - default "5.4.231" if BR2_KERNEL_HEADERS_5_4 - default "5.10.167" if BR2_KERNEL_HEADERS_5_10 - default "5.15.93" if BR2_KERNEL_HEADERS_5_15 - default "6.1.11" if BR2_KERNEL_HEADERS_6_1 + default "4.14.307" if BR2_KERNEL_HEADERS_4_14 + default "4.19.274" if BR2_KERNEL_HEADERS_4_19 + default "5.4.233" if BR2_KERNEL_HEADERS_5_4 + default "5.10.170" if BR2_KERNEL_HEADERS_5_10 + default "5.15.96" if BR2_KERNEL_HEADERS_5_15 + default "6.1.14" if BR2_KERNEL_HEADERS_6_1 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 Mon Feb 27 14:41:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 15:41:21 +0100 Subject: [Buildroot] [git commit] package/python-m2crypto: fix CVE-2020-25657 Message-ID: <20230227145800.B740F86BF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a86d44a3eb009d3deb5b558f7ccb0870eb877c6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A flaw was found in all released versions of m2crypto, where they are vulnerable to Bleichenbacher timing attacks in the RSA decryption API via the timed processing of valid PKCS#1 v1.5 Ciphertext. The highest threat from this vulnerability is to confidentiality. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-in-the-RSA-decryption-API-CVE-2020-25657.patch | 174 +++++++++++++++++++++ package/python-m2crypto/python-m2crypto.mk | 3 + 2 files changed, 177 insertions(+) diff --git a/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch b/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch new file mode 100644 index 0000000000..68200b7d9b --- /dev/null +++ b/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch @@ -0,0 +1,174 @@ +From 84c53958def0f510e92119fca14d74f94215827a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= +Date: Tue, 28 Jun 2022 21:17:01 +0200 +Subject: [PATCH] Mitigate the Bleichenbacher timing attacks in the RSA + decryption API (CVE-2020-25657) + +Fixes #282 + +[Retrieved from: +https://gitlab.com/m2crypto/m2crypto/-/commit/84c53958def0f510e92119fca14d74f94215827a] +Signed-off-by: Fabrice Fontaine +--- + src/SWIG/_m2crypto_wrap.c | 20 ++++++++++++-------- + src/SWIG/_rsa.i | 20 ++++++++++++-------- + tests/test_rsa.py | 15 +++++++-------- + 3 files changed, 31 insertions(+), 24 deletions(-) + +diff --git a/src/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c +index aba9eb6d..a9f30da9 100644 +--- a/src/SWIG/_m2crypto_wrap.c ++++ b/src/SWIG/_m2crypto_wrap.c +@@ -7040,9 +7040,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7070,9 +7071,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7097,9 +7099,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7124,9 +7127,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); + +diff --git a/src/SWIG/_rsa.i b/src/SWIG/_rsa.i +index bc714e01..1377b8be 100644 +--- a/src/SWIG/_rsa.i ++++ b/src/SWIG/_rsa.i +@@ -239,9 +239,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -269,9 +270,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -296,9 +298,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -323,9 +326,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); + +diff --git a/tests/test_rsa.py b/tests/test_rsa.py +index 7bb3af75..5e75d681 100644 +--- a/tests/test_rsa.py ++++ b/tests/test_rsa.py +@@ -109,8 +109,9 @@ class RSATestCase(unittest.TestCase): + # The other paddings. + for padding in self.s_padding_nok: + p = getattr(RSA, padding) +- with self.assertRaises(RSA.RSAError): +- priv.private_encrypt(self.data, p) ++ # Exception disabled as a part of mitigation against CVE-2020-25657 ++ # with self.assertRaises(RSA.RSAError): ++ priv.private_encrypt(self.data, p) + # Type-check the data to be encrypted. + with self.assertRaises(TypeError): + priv.private_encrypt(self.gen_callback, RSA.pkcs1_padding) +@@ -127,10 +128,12 @@ class RSATestCase(unittest.TestCase): + self.assertEqual(ptxt, self.data) + + # no_padding +- with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): +- priv.public_encrypt(self.data, RSA.no_padding) ++ # Exception disabled as a part of mitigation against CVE-2020-25657 ++ # with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): ++ priv.public_encrypt(self.data, RSA.no_padding) + + # Type-check the data to be encrypted. ++ # Exception disabled as a part of mitigation against CVE-2020-25657 + with self.assertRaises(TypeError): + priv.public_encrypt(self.gen_callback, RSA.pkcs1_padding) + +@@ -146,10 +149,6 @@ class RSATestCase(unittest.TestCase): + b'\000\000\000\003\001\000\001') # aka 65537 aka 0xf4 + with self.assertRaises(RSA.RSAError): + setattr(rsa, 'e', '\000\000\000\003\001\000\001') +- with self.assertRaises(RSA.RSAError): +- rsa.private_encrypt(1) +- with self.assertRaises(RSA.RSAError): +- rsa.private_decrypt(1) + assert rsa.check_key() + + def test_loadpub_bad(self): +-- +GitLab + diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 02ad76d3f4..3c28fa3b0d 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -15,4 +15,7 @@ PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr +# 0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch +PYTHON_M2CRYPTO_IGNORE_CVES += CVE-2020-25657 + $(eval $(python-package)) From peter at korsgaard.com Mon Feb 27 15:12:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:12:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcm-tools: needs NPTL In-Reply-To: <20230226120636.39100-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 13:06:36 +0100") References: <20230226120636.39100-1-fontaine.fabrice@gmail.com> Message-ID: <87k003m9bl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > pcm-tools needs NPTL since its addition in commit > 60eb2cec80e5258a0c43090f539749606744e182: > cpucounters.cpp: In constructor 'pcm::TemporalThreadAffinity::TemporalThreadAffinity(pcm::uint32, bool)': > cpucounters.cpp:252:9: error: 'pthread_getaffinity_np' was not declared in this scope; did you mean 'sched_getaffinity'? > 252 | pthread_getaffinity_np(pthread_self(), set_size, old_affinity); > | ^~~~~~~~~~~~~~~~~~~~~~ > | sched_getaffinity > Fixes: > - http://autobuild.buildroot.org/results/8bbf9c36af332bbf5e7c1abcbb594a0b231ef97e > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 15:12:48 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:12:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/php-xdebug: bump to version 3.2.0 In-Reply-To: <20230226102223.325041-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 11:22:23 +0100") References: <20230226102223.325041-1-fontaine.fabrice@gmail.com> Message-ID: <87fsarm9an.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Use official tarball > - This bump will fix the following build failure raised since bump of > php to version 8.2.1 in commit > 90ab065162a35b8aa2c429903e3d59d4ad2c0d7f: > checking Check for supported PHP versions... configure: error: not supported. Need a PHP version >= 7.2.0 and < 8.2.0 (found 8.2.1) > https://xdebug.org/announcements/2022-12-08 > https://xdebug.org/updates#x_3_2_0 > Fixes: > - http://autobuild.buildroot.org/results/092a6d388fc6801c109eb46635e8df80d06a803e > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 15:12:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:12:06 +0100 Subject: [Buildroot] [git commit] package/pcm-tools: needs NPTL Message-ID: <20230227151305.3DA9286BFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d74f85c97d21461a5a23b27eb682c1157875bdb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master pcm-tools needs NPTL since its addition in commit 60eb2cec80e5258a0c43090f539749606744e182: cpucounters.cpp: In constructor 'pcm::TemporalThreadAffinity::TemporalThreadAffinity(pcm::uint32, bool)': cpucounters.cpp:252:9: error: 'pthread_getaffinity_np' was not declared in this scope; did you mean 'sched_getaffinity'? 252 | pthread_getaffinity_np(pthread_self(), set_size, old_affinity); | ^~~~~~~~~~~~~~~~~~~~~~ | sched_getaffinity Fixes: - http://autobuild.buildroot.org/results/8bbf9c36af332bbf5e7c1abcbb594a0b231ef97e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/pcm-tools/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/pcm-tools/Config.in b/package/pcm-tools/Config.in index ca9719dc5f..6bf05f32d7 100644 --- a/package/pcm-tools/Config.in +++ b/package/pcm-tools/Config.in @@ -1,11 +1,13 @@ -comment "pcm-tools needs a toolchain w/ C++" +comment "pcm-tools needs a toolchain w/ C++, NPTL" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_INSTALL_LIBSTDCPP + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL config BR2_PACKAGE_PCM_TOOLS bool "pcm-tools" depends on BR2_i386 || BR2_x86_64 depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_HWDATA select BR2_PACKAGE_HWDATA_PCI_IDS help From peter at korsgaard.com Mon Feb 27 15:12:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:12:32 +0100 Subject: [Buildroot] [git commit] package/php-xdebug: bump to version 3.2.0 Message-ID: <20230227151305.4B47686C01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8280400fbadde09e51ccff312d7a4ef6a386f589 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Use official tarball - This bump will fix the following build failure raised since bump of php to version 8.2.1 in commit 90ab065162a35b8aa2c429903e3d59d4ad2c0d7f: checking Check for supported PHP versions... configure: error: not supported. Need a PHP version >= 7.2.0 and < 8.2.0 (found 8.2.1) https://xdebug.org/announcements/2022-12-08 https://xdebug.org/updates#x_3_2_0 Fixes: - http://autobuild.buildroot.org/results/092a6d388fc6801c109eb46635e8df80d06a803e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/php-xdebug/php-xdebug.hash | 2 +- package/php-xdebug/php-xdebug.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/php-xdebug/php-xdebug.hash b/package/php-xdebug/php-xdebug.hash index 72bfac67ce..fa92ee82ed 100644 --- a/package/php-xdebug/php-xdebug.hash +++ b/package/php-xdebug/php-xdebug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7e4f28fc65c8b535de43b6d2ec57429476a6de1d53c4d440a9108ae8d28e01f4 php-xdebug-3.0.4.tar.gz +sha256 7769b20eecdadf5fbe9f582512c10b394fb575b6f7a8c3a3a82db6883e0032b7 xdebug-3.2.0.tgz sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272 LICENSE diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk index 18ebc32592..9429d4afee 100644 --- a/package/php-xdebug/php-xdebug.mk +++ b/package/php-xdebug/php-xdebug.mk @@ -4,8 +4,9 @@ # ################################################################################ -PHP_XDEBUG_VERSION = 3.0.4 -PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION)) +PHP_XDEBUG_VERSION = 3.2.0 +PHP_XDEBUG_SOURCE = xdebug-$(PHP_XDEBUG_VERSION).tgz +PHP_XDEBUG_SITE = https://xdebug.org/files PHP_XDEBUG_INSTALL_STAGING = YES PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like) PHP_XDEBUG_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 27 15:13:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:13:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/flac: drop unrecognized option In-Reply-To: <20230225232217.27171-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 00:22:17 +0100") References: <20230225232217.27171-1-fontaine.fabrice@gmail.com> Message-ID: <87bklfm99e.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > xmms-plugin has been dropped since version 1.4.2 and > https://github.com/xiph/flac/commit/8fbeff238c41464fe220cd23c45861c9302d1172 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 15:13:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:13:17 +0100 Subject: [Buildroot] [git commit] package/flac: drop unrecognized option Message-ID: <20230227151507.0A0A586C04@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99d9dc1ad87796be17c4cdc9a1ac72d1b31c111b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master xmms-plugin has been dropped since version 1.4.2 and https://github.com/xiph/flac/commit/8fbeff238c41464fe220cd23c45861c9302d1172 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/flac/flac.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/flac/flac.mk b/package/flac/flac.mk index ebb4778521..595c2379b0 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -17,7 +17,6 @@ FLAC_CONF_OPTS = \ $(if $(BR2_POWERPC_CPU_HAS_ALTIVEC),--enable-altivec,--disable-altivec) \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ $(if $(BR2_POWERPC_CPU_HAS_VSX),--enable-vsx,--disable-vsx) \ - --disable-xmms-plugin \ --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) From peter at korsgaard.com Mon Feb 27 15:23:49 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:23:49 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: add boot-wrapper-aarch64 handling In-Reply-To: <20230225225031.9260-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 25 Feb 2023 23:50:31 +0100") References: <20230225225031.9260-1-fontaine.fabrice@gmail.com> Message-ID: <877cw3m8sa.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since the addition of the package > in commit 7689b72e00fd4d8c017880004e83a1c79144ab7b: > configure: error: Could not find DTB file: > /home/autobuild/autobuild/instance-9/output-1/build/linux-6.1.9/arch/arm64/boot/dts/.dtb > Fixes: > - http://autobuild.buildroot.org/results/44287ccc8cc9767704642919e6d928d1f57b436d > Signed-off-by: Fabrice Fontaine > --- > utils/genrandconfig | 4 ++++ > 1 file changed, 4 insertions(+) > diff --git a/utils/genrandconfig b/utils/genrandconfig > index a3d98119c7..ca465547d8 100755 > --- a/utils/genrandconfig > +++ b/utils/genrandconfig > @@ -487,6 +487,10 @@ def fixup_config(sysinfo, configfile): > 'BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n' in configlines: > return False Hmm, this doesn't match current code? Manually fixed up and committed, thanks. > + if 'BR2_TARGET_BOOT_WRAPPER_AARCH64=y\n' in configlines and \ > + 'BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS=""\n' in configlines: > + return False > + > if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ > 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: > return False > -- > 2.39.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 15:22:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:22:54 +0100 Subject: [Buildroot] [git commit] utils/genrandconfig: add boot-wrapper-aarch64 handling Message-ID: <20230227152416.6AC3E86C09@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad4982d18e66ec909b0c906768d233fd8d4a1be0 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 7689b72e00fd4d8c017880004e83a1c79144ab7b: configure: error: Could not find DTB file: /home/autobuild/autobuild/instance-9/output-1/build/linux-6.1.9/arch/arm64/boot/dts/.dtb Fixes: - http://autobuild.buildroot.org/results/44287ccc8cc9767704642919e6d928d1f57b436d Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 6ec398851a..2b0baedf31 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -492,6 +492,10 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_BAREBOX_USE_DEFCONFIG=y\n') configlines.remove('BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n') + if 'BR2_TARGET_BOOT_WRAPPER_AARCH64=y\n' in configlines and \ + 'BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS=""\n' in configlines: + return False + if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: return False From peter at korsgaard.com Mon Feb 27 15:36:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:36:46 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/sudo: fix SUDO_ENABLE_SUDO_GROUP_RULE following version bump Message-ID: <20230227153748.2F3A586C1D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35ddf2f7707d33c8272fddeb2a0fae5647ed8426 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Since the version bump of sudo to v1.9.11p2 in commit 9b7f8da96b, the sed magic in SUDO_ENABLE_SUDO_GROUP_RULE no longer does its job, due to a slight change in the example sudoers file provided by upstream sudo. This commit fixes the regexp to match the new sudoers file. Fixes bug #14891 (https://bugs.busybox.net/show_bug.cgi?id=14891) Reported-by: Matthias Hardt Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit 079fccdee5a2a10fc8275094512b8423548ea147) Signed-off-by: Peter Korsgaard --- package/sudo/sudo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 8bf1ce5e9c..c4eaafa6b1 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -82,7 +82,7 @@ define SUDO_USERS endef define SUDO_ENABLE_SUDO_GROUP_RULE - $(SED) '/^# \%sudo\tALL=(ALL) ALL/s/^# //' $(TARGET_DIR)/etc/sudoers + $(SED) '/^# \%sudo\tALL=(ALL:ALL) ALL/s/^# //' $(TARGET_DIR)/etc/sudoers endef SUDO_POST_INSTALL_TARGET_HOOKS += SUDO_ENABLE_SUDO_GROUP_RULE From peter at korsgaard.com Mon Feb 27 15:38:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 16:38:05 +0100 Subject: [Buildroot] [git commit] package/sudo: fix SUDO_ENABLE_SUDO_GROUP_RULE following version bump In-Reply-To: (Marcus Hoffmann's message of "Mon, 27 Feb 2023 15:25:06 +0100") References: <20220718215158.C299083CCF@busybox.osuosl.org> Message-ID: <87356rm84i.fsf@dell.be.48ers.dk> >>>>> "Marcus" == Marcus Hoffmann writes: > Hi Peter, > the needs to be backported to 2022.11.x and 2022.02.x This is a commit from July 2022, so it is already in 2022.11.x (and 2022.08.x): git branch --contains 079fccdee5a2a10fc8275094512b8423548ea147|grep '2022\.' 2022.08.x 2022.11.x But it was indeed missed from 2022.02.x: git shortlog 2022.02..2022.02.x -- package/sudo Fabrice Fontaine (2): package/sudo: fix CVE-2022-43995 package/sudo: bump to version 1.9.11p2 Francois Perrad (1): package/sudo: bump to version 1.9.12p1 Nuno Gon?alves (2): packages/sudo: explicitly set with-tzdir packages/sudo: explicitly set enable-tmpfiles.d Yair Ben-Avraham (1): package/sudo: security bump to version 1.9.12p2 So I have cherry-picked it now, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 16:02:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:02:41 +0100 Subject: [Buildroot] [PATCH] package/rtl8723bu: fix module installation In-Reply-To: <20230225210357.1449825-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sat, 25 Feb 2023 22:03:57 +0100") References: <20230225210357.1449825-1-giulio.benetti@benettiengineering.com> Message-ID: <87wn43ksf2.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > At the moment module is build but not installed to target/. To fix this > let's bump package to 2023-02-18 version on master branch to fix module > installation. > Signed-off-by: Giulio Benetti Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 16:03:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:03:42 +0100 Subject: [Buildroot] [PATCH 1/1] boot/mxs-bootlets: fix build without any bootstream In-Reply-To: <20230225231419.22342-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 00:14:19 +0100") References: <20230225231419.22342-1-fontaine.fabrice@gmail.com> Message-ID: <87sferksdd.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since the addition of the package > in commit 2a636d15217cd326b4546e7017538c7a9e9d399c: > sed -i 's,[^ > *]power_prep.*;,\tpower_prep="/home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/power_prep/power_prep";,' > /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/ > sed: couldn't edit /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/: not a regular file > Fixes: > - http://autobuild.buildroot.org/results/b4b26f6b02fd1991f46eba5db240e5050b96d333 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 16:04:25 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:04:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtty: fix openssl static build with -latomic In-Reply-To: <20230226195315.1184297-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 26 Feb 2023 20:53:15 +0100") References: <20230226195315.1184297-1-fontaine.fabrice@gmail.com> Message-ID: <87o7pfksc6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following openssl static build failure with -latomic raised > since bump to version 8.1.0 in commit > 7e608885a2df51ba77378f210f4c0e8cb59d5b8b: > /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: > /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): > in function `ssl_cert_free': > ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' > Fixes: > - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 27 16:00:33 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:00:33 +0100 Subject: [Buildroot] [git commit] package/rtl8723bu: fix module installation Message-ID: <20230227160515.DEB7586C3A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df83b6fb1404826cc6dbc154c5b4b5cb5a94c1ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master At the moment module is build but not installed to target/. To fix this let's bump package to 2023-02-18 version on master branch to fix module installation. Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 6a28c34773..bc3b8fc727 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 21372b654886c6d100f46636d7807428698bd618e00db1b8b49cfc3037e46d10 rtl8723bu-f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255.tar.gz +sha256 d0db523f256795d8f3284fa2ec03855f231747ede8337e878bc096325b965654 rtl8723bu-92c19318cb54ef96c2cfb4a22b2c98eb512812d8.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index af1ac9454e..ad9bb9a462 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255 +RTL8723BU_VERSION = 92c19318cb54ef96c2cfb4a22b2c98eb512812d8 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) From peter at korsgaard.com Mon Feb 27 16:03:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:03:15 +0100 Subject: [Buildroot] [git commit] boot/mxs-bootlets: fix build without any bootstream Message-ID: <20230227160515.E92BD86C3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c4435190773195fc5d1a97f819e1160f4bd52ca 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 2a636d15217cd326b4546e7017538c7a9e9d399c: sed -i 's,[^ *]power_prep.*;,\tpower_prep="/home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/power_prep/power_prep";,' /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/ sed: couldn't edit /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/: not a regular file Fixes: - http://autobuild.buildroot.org/results/b4b26f6b02fd1991f46eba5db240e5050b96d333 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- boot/mxs-bootlets/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in index b3e392afa8..8f9334b610 100644 --- a/boot/mxs-bootlets/Config.in +++ b/boot/mxs-bootlets/Config.in @@ -1,6 +1,8 @@ config BR2_TARGET_MXS_BOOTLETS bool "mxs-bootlets" depends on BR2_arm + depends on BR2_TARGET_BAREBOX || BR2_LINUX_KERNEL || \ + BR2_TARGET_UBOOT help Stage1 bootloaders for Freescale iMX23/iMX28 SoCs From peter at korsgaard.com Mon Feb 27 16:04:16 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:04:16 +0100 Subject: [Buildroot] [git commit] package/rtty: fix openssl static build with -latomic Message-ID: <20230227160516.0093C86C3C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3aa7821d77386b597c7c63d9bdafa3278df60c36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following openssl static build failure with -latomic raised since bump to version 8.1.0 in commit 7e608885a2df51ba77378f210f4c0e8cb59d5b8b: /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...1-CMakeLists.txt-prefer-pkg_check_modules.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch new file mode 100644 index 0000000000..3714050445 --- /dev/null +++ b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch @@ -0,0 +1,40 @@ +From 565c003ac412c9b0fa39d208d4a911f4300477c3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 20:39:11 +0100 +Subject: [PATCH] CMakeLists.txt: prefer pkg_check_modules + +Prefer pkg_check_modules over find_package to avoid the following static +build failure with openssl and -latomic: + +/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': +ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' + +Fixes: + - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zhaojh329/ssl/pull/4] +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ssl/CMakeLists.txt b/src/ssl/CMakeLists.txt +index 4868bf7..36488c7 100644 +--- a/src/ssl/CMakeLists.txt ++++ b/src/ssl/CMakeLists.txt +@@ -14,10 +14,10 @@ endif() + + find_package(PkgConfig QUIET) + +-find_package(OpenSSL) ++pkg_check_modules(OPENSSL openssl) + + if (NOT OPENSSL_FOUND) +- pkg_check_modules(OPENSSL openssl) ++ find_package(OpenSSL) + endif() + + find_package(WolfSSL) +-- +2.39.1 + From fontaine.fabrice at gmail.com Mon Feb 27 16:08:22 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 27 Feb 2023 17:08:22 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/libpjsip: fix CVE-2022-235{3, 4}7 Message-ID: <20230227160822.1552039-1-fontaine.fabrice@gmail.com> https://github.com/pjsip/pjproject/security/advisories/GHSA-9pfh-r8x4-w26w https://github.com/pjsip/pjproject/security/advisories/GHSA-cxwq-5g9x-x7fr Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Peter Korsgaard): - Add missing patch ...ull-request-from-GHSA-9pfh-r8x4-w26w.patch | 99 +++++++++++++++++++ ...ull-request-from-GHSA-cxwq-5g9x-x7fr.patch | 54 ++++++++++ package/libpjsip/libpjsip.mk | 6 ++ 3 files changed, 159 insertions(+) create mode 100644 package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch create mode 100644 package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch diff --git a/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch new file mode 100644 index 0000000000..01e1878189 --- /dev/null +++ b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch @@ -0,0 +1,99 @@ +From d8440f4d711a654b511f50f79c0445b26f9dd1e1 Mon Sep 17 00:00:00 2001 +From: Nanang Izzuddin +Date: Tue, 20 Dec 2022 11:39:12 +0700 +Subject: [PATCH] Merge pull request from GHSA-9pfh-r8x4-w26w + +* Fix buffer overread in STUN message decoder + +* Updates based on comments + +[Retrieved from: +https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1] +Signed-off-by: Fabrice Fontaine +--- + pjnath/include/pjnath/stun_msg.h | 4 ++++ + pjnath/src/pjnath/stun_msg.c | 14 +++++++++++--- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h +index b52f95c586..e49f096f3a 100644 +--- a/pjnath/include/pjnath/stun_msg.h ++++ b/pjnath/include/pjnath/stun_msg.h +@@ -442,6 +442,7 @@ typedef enum pj_stun_status + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_msg_hdr + { + /** +@@ -473,6 +474,7 @@ typedef struct pj_stun_msg_hdr + pj_uint8_t tsx_id[12]; + + } pj_stun_msg_hdr; ++#pragma pack() + + + /** +@@ -490,6 +492,7 @@ typedef struct pj_stun_msg_hdr + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_attr_hdr + { + /** +@@ -506,6 +509,7 @@ typedef struct pj_stun_attr_hdr + pj_uint16_t length; + + } pj_stun_attr_hdr; ++#pragma pack() + + + /** +diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c +index 3def6b3eac..e904a0ba47 100644 +--- a/pjnath/src/pjnath/stun_msg.c ++++ b/pjnath/src/pjnath/stun_msg.c +@@ -746,7 +746,7 @@ PJ_DEF(int) pj_stun_set_padding_char(int chr) + + #define INIT_ATTR(a,t,l) (a)->hdr.type=(pj_uint16_t)(t), \ + (a)->hdr.length=(pj_uint16_t)(l) +-#define ATTR_HDR_LEN 4 ++#define ATTR_HDR_LEN sizeof(pj_stun_attr_hdr) + + static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos) + { +@@ -2327,6 +2327,14 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + status = pj_stun_msg_check(pdu, pdu_len, options); + if (status != PJ_SUCCESS) + return status; ++ } else { ++ /* For safety, verify packet length at least */ ++ pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20; ++ if (msg_len > pdu_len || ++ ((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len)) ++ { ++ return PJNATH_EINSTUNMSGLEN; ++ } + } + + /* Create the message, copy the header, and convert to host byte order */ +@@ -2345,7 +2353,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + p_response = NULL; + + /* Parse attributes */ +- while (pdu_len >= 4) { ++ while (pdu_len >= ATTR_HDR_LEN) { + unsigned attr_type, attr_val_len; + const struct attr_desc *adesc; + +@@ -2357,7 +2365,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + attr_val_len = (attr_val_len + 3) & (~3); + + /* Check length */ +- if (pdu_len < attr_val_len) { ++ if (pdu_len < attr_val_len + ATTR_HDR_LEN) { + pj_str_t err_msg; + char err_msg_buf[80]; + diff --git a/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch b/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch new file mode 100644 index 0000000000..82249a2076 --- /dev/null +++ b/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch @@ -0,0 +1,54 @@ +From bc4812d31a67d5e2f973fbfaf950d6118226cf36 Mon Sep 17 00:00:00 2001 +From: sauwming +Date: Fri, 23 Dec 2022 15:05:28 +0800 +Subject: [PATCH] Merge pull request from GHSA-cxwq-5g9x-x7fr + +* Fixed heap buffer overflow when parsing STUN errcode attribute + +* Also fixed uint parsing + +[Retrieved from: +https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36] +Signed-off-by: Fabrice Fontaine +--- + pjnath/src/pjnath/stun_msg.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c +index c6b0bdd284..b55d29849a 100644 +--- a/pjnath/src/pjnath/stun_msg.c ++++ b/pjnath/src/pjnath/stun_msg.c +@@ -1438,12 +1438,12 @@ static pj_status_t decode_uint_attr(pj_pool_t *pool, + attr = PJ_POOL_ZALLOC_T(pool, pj_stun_uint_attr); + GETATTRHDR(buf, &attr->hdr); + +- attr->value = GETVAL32H(buf, 4); +- + /* Check that the attribute length is valid */ + if (attr->hdr.length != 4) + return PJNATH_ESTUNINATTRLEN; + ++ attr->value = GETVAL32H(buf, 4); ++ + /* Done */ + *p_attr = attr; + +@@ -1757,14 +1757,15 @@ static pj_status_t decode_errcode_attr(pj_pool_t *pool, + attr = PJ_POOL_ZALLOC_T(pool, pj_stun_errcode_attr); + GETATTRHDR(buf, &attr->hdr); + ++ /* Check that the attribute length is valid */ ++ if (attr->hdr.length < 4) ++ return PJNATH_ESTUNINATTRLEN; ++ + attr->err_code = buf[6] * 100 + buf[7]; + + /* Get pointer to the string in the message */ + value.ptr = ((char*)buf + ATTR_HDR_LEN + 4); + value.slen = attr->hdr.length - 4; +- /* Make sure the length is never negative */ +- if (value.slen < 0) +- value.slen = 0; + + /* Copy the string to the attribute */ + pj_strdup(pool, &attr->reason, &value); diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 5cc0423f5d..24db641446 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -15,6 +15,12 @@ LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) +# 0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch +LIBPJSIP_IGNORE_CVES += CVE-2022-23537 + +# 0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch +LIBPJSIP_IGNORE_CVES += CVE-2022-23547 + LIBPJSIP_CFLAGS = $(TARGET_CFLAGS) -DPJ_HAS_IPV6=1 # relocation truncated to fit: R_68K_GOT16O -- 2.39.1 From peter at korsgaard.com Mon Feb 27 16:10:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:10:39 +0100 Subject: [Buildroot] [PATCH] package/libcurl: bump version to 7.88.1 Message-ID: <20230227161040.2239744-1-peter@korsgaard.com> Bugfix release fixing a number of issues introduced in 7.88.0: https://curl.se/changes.html#7_88_1 https://daniel.haxx.se/blog/2023/02/20/7-88-1-the-second-final-one/ Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 714b02acb0..32b3d0b5e2 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.88.0.tar.xz.asc +# https://curl.se/download/curl-7.88.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f curl-7.88.1.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index eb481e4782..1a1594a45e 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.88.0 +LIBCURL_VERSION = 7.88.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ -- 2.30.2 From peter at korsgaard.com Mon Feb 27 16:43:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:43:10 +0100 Subject: [Buildroot] [git commit] Update for 2023.02-rc2 Message-ID: <20230227164344.AB76386C46@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=debec267fc41b1b0ff3e23cbc06d3d4186bd466a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 20 ++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 52 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 21e349f3a8..04b49a94cb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,23 @@ +2023.02-rc2, released February 27th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: asterisk, at91dataflashboot, bind, + efivar, erlang, flac, fluent-bit, freerdp, gcc, gdal, gerbera, + gnuradio, gqrx, haproxy, hawktracer, imx-gpu-g2d, + intel-gmmlib, libarchive, libblockdev, libcamera-apps, libjxl, + libmodsecurity, libsigrokdecode, lightning, lirc-tools, + lttng-babeltrace, modem-manager, modsecurity2, + multipath-tools, mutt, mxs-bootlets, netsurf, network-manager, + nginx-naxsi, ntpsec, opensbi, optee-client, pcm-tools, + php-xdebug, pistache, postgresql, proxychains-ng, + python-m2crypto, python-numpy, python-webargs, + python-werkzeug, rtl8723bu, rtty, speechd, sudo, systemd, + tiff, tmux, wilc-driver, wpa_supplicant, xerces, + xtables-addons, xwayland, zabbix + + Removed packages: uccp420wlan + 2023.02-rc1, released February 20th, 2023 Numerous package updates and many (62) new packages. diff --git a/Makefile b/Makefile index c97086c09c..8edc90ac50 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02-rc1 +export BR2_VERSION := 2023.02-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1676923000 +BR2_VERSION_EPOCH = 1677516000 # 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 a6b9a9a7c4..12f967db14 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@ -

        Latest release candidate: 2023.02-rc1

        +

        Latest release candidate: 2023.02-rc2

        - +
        - +
        -

        buildroot-2023.02-rc1.tar.gz

        -

        PGP signature

        +

        buildroot-2023.02-rc2.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2023.02-rc1.tar.xz

        -

        PGP signature

        +

        buildroot-2023.02-rc2.tar.xz

        +

        PGP signature

        diff --git a/docs/website/news.html b/docs/website/news.html index 8acf454052..0f8bd26702 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

        News

          +
        • +
          +
          +
          +

          2023.02-rc2 released

          +

          27 February 2023

          +
          +
          +

          2023.02-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

          + +

          Head to the downloads page to pick up the + 2023.02-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

          +
          +
          +
          • +
        • From peter at korsgaard.com Mon Feb 27 16:50:22 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 27 Feb 2023 17:50:22 +0100 Subject: [Buildroot] Buildroot 2023.02-rc2 released Message-ID: <87k003kq7l.fsf@dell.be.48ers.dk> Hi, Buildroot 2023.02-rc2 is released - Go download it at: http://buildroot.net/downloads/buildroot-2023.02-rc2.tar.gz or http://buildroot.net/downloads/buildroot-2023.02-rc2.tar.xz Or get it from Git: git://git.buildroot.net/buildroot Later than hoped, but here is another release candidate. Please give it a spin and report any problems to the mailing list or bug tracker. Many thanks to the people contributing to this release: git shortlog -sn 2023.02-rc1.. 72 Fabrice Fontaine 2 Giulio Benetti 1 Alexander Egorenkov 1 Heiko Thiery 1 Julien Olivain 1 Lang Daniel 1 Marcus Folkesson 1 Maxim Kochetkov 1 Peter Korsgaard 1 Sergey Matyukevich 1 S?bastien Szymanski 1 Thomas Petazzoni For more details, see the CHANGES file: http://git.buildroot.net/buildroot/plain/CHANGES?id=2023.02-rc2 Expect the final 2023.02 release by the end of the week. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Mon Feb 27 17:15:48 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 27 Feb 2023 18:15:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: disable with header-only pugixml Message-ID: <20230227171548.140054-1-fontaine.fabrice@gmail.com> Fix the following build failure with header-only pugixml raised since commit cc3a4a7b1de7b158354c650d234339e8a969a730: /home/thomas/autobuild/instance-2/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.4.0/../../../../nios2-buildroot-linux-gnu/bin/ld: CMakeFiles/gerbera.dir/src/main.cc.o: in function `ConfigGenerator::~ConfigGenerator()': /home/thomas/autobuild/instance-2/output-1/build/gerbera-1.10.0/src/config/config_generator.h:33: undefined reference to `pugi::xml_document::~xml_document()' Fixes: - http://autobuild.buildroot.org/results/800537a1ef5f48d24c20aad7a9c96c56dfdc77f5 Signed-off-by: Fabrice Fontaine --- package/gerbera/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gerbera/Config.in b/package/gerbera/Config.in index 46a163ec78..e1f09e6780 100644 --- a/package/gerbera/Config.in +++ b/package/gerbera/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_GERBERA depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # fmt + depends on !BR2_PACKAGE_PUGIXML_HEADER_ONLY select BR2_PACKAGE_FMT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBUPNP if !BR2_PACKAGE_LIBNPUPNP @@ -32,3 +33,6 @@ comment "gerbera needs a toolchain w/ C++, dynamic library, threads, wchar, gcc depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_8 + +comment "gerbera can't be built with header-only pugixml" + depends on BR2_PACKAGE_PUGIXML_HEADER_ONLY -- 2.39.1 From ju.o at free.fr Mon Feb 27 20:53:33 2023 From: ju.o at free.fr (Julien Olivain) Date: Mon, 27 Feb 2023 21:53:33 +0100 Subject: [Buildroot] [PATCH next 1/2] support/testing/tests/package/test_stress_ng.py: new runtime test Message-ID: <20230227205334.497405-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- Patch tested on top of branch next at commit b793f3a with command: python3 -m flake8 support/testing/tests/package/test_stress_ng.py [no-output] --- DEVELOPERS | 1 + .../testing/tests/package/test_stress_ng.py | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 support/testing/tests/package/test_stress_ng.py diff --git a/DEVELOPERS b/DEVELOPERS index d052e59122..f00614468f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1732,6 +1732,7 @@ F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ +F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_z3.py F: support/testing/tests/package/test_z3/ diff --git a/support/testing/tests/package/test_stress_ng.py b/support/testing/tests/package/test_stress_ng.py new file mode 100644 index 0000000000..12fd6ec9e6 --- /dev/null +++ b/support/testing/tests/package/test_stress_ng.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestStressNG(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_STRESS_NG=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("stress-ng --version") + self.assertRunOk("stress-ng --cpu 1 --timeout 3") -- 2.39.2 From ju.o at free.fr Mon Feb 27 20:53:34 2023 From: ju.o at free.fr (Julien Olivain) Date: Mon, 27 Feb 2023 21:53:34 +0100 Subject: [Buildroot] [PATCH next 2/2] package/stress-ng: bump to version V0.15.04 In-Reply-To: <20230227205334.497405-1-ju.o@free.fr> References: <20230227205334.497405-1-ju.o@free.fr> Message-ID: <20230227205334.497405-2-ju.o@free.fr> This commit dropped the patch, included upstream in: https://github.com/ColinIanKing/stress-ng/commit/5d419c790e648c7a2f96f34ed1b93b326f725545 which was included in V0.14.04. Three patches are also introduced to fix build issues (all upstream not but not yet in version). Also, this new version now depends on BR2_TOOLCHAIN_HAS_SYNC_4. Finally, a new _MAKE_FLAGS is introduced to prevent the package to modify too much its CFLAGS. For change log since V0.13.05, see: - https://github.com/ColinIanKing/stress-ng/blob/V0.15.04/debian/changelog or commit logs: - https://github.com/ColinIanKing/stress-ng/commits/V0.15.04 Signed-off-by: Julien Olivain --- Patch tested on top of branch next at commit b793f3a with commands: make check-package ... 0 warnings generated support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_stress_ng ... OK utils/test-pkg -a -p stress-ng arm-aarch64 [ 1/45]: OK bootlin-aarch64-glibc [ 2/45]: OK bootlin-arcle-hs38-uclibc [ 3/45]: SKIPPED bootlin-armv5-uclibc [ 4/45]: OK bootlin-armv7-glibc [ 5/45]: OK bootlin-armv7m-uclibc [ 6/45]: SKIPPED bootlin-armv7-musl [ 7/45]: OK bootlin-m68k-5208-uclibc [ 8/45]: SKIPPED bootlin-m68k-68040-uclibc [ 9/45]: OK bootlin-microblazeel-uclibc [10/45]: OK bootlin-mipsel32r6-glibc [11/45]: OK bootlin-mipsel-uclibc [12/45]: OK bootlin-nios2-glibc [13/45]: SKIPPED bootlin-openrisc-uclibc [14/45]: OK bootlin-powerpc64le-power8-glibc [15/45]: OK bootlin-powerpc-e500mc-uclibc [16/45]: OK bootlin-riscv32-glibc [17/45]: OK bootlin-riscv64-glibc [18/45]: OK bootlin-riscv64-musl [19/45]: OK bootlin-s390x-z13-glibc [20/45]: OK bootlin-sh4-uclibc [21/45]: OK bootlin-sparc64-glibc [22/45]: OK bootlin-sparc-uclibc [23/45]: SKIPPED bootlin-x86-64-glibc [24/45]: OK bootlin-x86-64-musl [25/45]: OK bootlin-x86-64-uclibc [26/45]: OK bootlin-xtensa-uclibc [27/45]: OK br-arm-basic [28/45]: OK br-arm-full-nothread [29/45]: OK br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [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]: OK 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-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: SKIPPED 45 builds, 6 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- ...1-Makefile-fix-build-with-kernel-5.6.patch | 60 -------------- ...build-with-HAVE_SYSCALL-or-__NR_mmap.patch | 54 +++++++++++++ ...002-stress-regs-fix-build-on-riscv32.patch | 43 ++++++++++ ...introduce-PRESERVE_CFLAGS-build-flag.patch | 78 +++++++++++++++++++ package/stress-ng/Config.in | 2 + package/stress-ng/stress-ng.hash | 2 +- package/stress-ng/stress-ng.mk | 7 +- 7 files changed, 183 insertions(+), 63 deletions(-) delete mode 100644 package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch create mode 100644 package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch create mode 100644 package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch create mode 100644 package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch diff --git a/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch b/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch deleted file mode 100644 index 4c62da3241..0000000000 --- a/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5d419c790e648c7a2f96f34ed1b93b326f725545 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 13 Aug 2022 17:17:05 +0200 -Subject: [PATCH] Makefile: fix build with kernel < 5.6 - -Fix the following build failure with kernel >= 5.1 and < 5.5 (i.e. -before -https://github.com/torvalds/linux/commit/9e3aa61ae3e01ce1ce6361a41ef725e1f4d1d2bf) -raised since version 0.11.21 and -https://github.com/ColinIanKing/stress-ng/commit/3d6fccdbe53d0cbcb75dd4b91571aaaae7ee1ad4: - -In file included from stress-io-uring.c:26: -io-uring.h:1:9: error: macro names must be identifiers - 1 | #define #define HAVE_IORING_OP_NOP 0 - | ^ - -Moreover, IORING_OP_FALLOCATE is not available before kernel 5.6 and -https://github.com/torvalds/linux/commit/d63d1b5edb7b832210bfde587ba9e7549fa064eb - -Fixes: - - http://autobuild.buildroot.org/results/1bf3f2bbc849bdce531d56b1024fa87f0c1ae667 - -Signed-off-by: Fabrice Fontaine -[Retrieved (and backported) from -https://github.com/ColinIanKing/stress-ng/commit/5d419c790e648c7a2f96f34ed1b93b326f725545] ---- - Makefile | 2 +- - stress-io-uring.c | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 2f9cc9918..ee17ae08b 100644 ---- a/Makefile -+++ b/Makefile -@@ -528,7 +528,7 @@ stress-personality.c: personality.h - # - io-uring.h: - $(V)$(CPP) $(CFLAGS) core-io-uring.c | $(GREP) IORING_OP | sed 's/,//' | \ -- sed 's/IORING_OP_/#define HAVE_IORING_OP_/' > io-uring.h -+ sed 's/.*\(IORING_OP_.*\)/#define HAVE_\1/' > io-uring.h - $(Q)echo "MK io-uring.h" - - stress-io-uring.c: io-uring.h -diff --git a/stress-io-uring.c b/stress-io-uring.c -index ab9fd0749..84f463611 100644 ---- a/stress-io-uring.c -+++ b/stress-io-uring.c -@@ -311,7 +311,11 @@ static inline int stress_io_uring_complete( - break; - - cqe = &cring->cqes[head & *submit->cq_ring.ring_mask]; -- if ((cqe->res < 0) && (opcode != IORING_OP_FALLOCATE)) { -+ if ((cqe->res < 0) -+#ifdef HAVE_IORING_OP_FALLOCATE -+ && (opcode != IORING_OP_FALLOCATE) -+#endif -+ ) { - const int err = abs(cqe->res); - - /* Silently ignore EOPNOTSUPP completion errors */ diff --git a/package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch b/package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch new file mode 100644 index 0000000000..41a2647133 --- /dev/null +++ b/package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch @@ -0,0 +1,54 @@ +From 625dd7e458e6aa488f7dd4764e4a62b6fbf79a9d Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Thu, 23 Feb 2023 21:54:16 +0100 +Subject: [PATCH] stress-mmap: fix build with HAVE_SYSCALL or __NR_mmap2 is + undefined + +Commit afae500a added macro tests for defined(HAVE_SYSCALL) and +system call numbers. + +More specifically, in stress-mmap.c, function mmap2_try() was defined +only if __NR_mmap2 is defined. See: +https://github.com/ColinIanKing/stress-ng/commit/afae500a23b198b9df421ad0fd9270fcdf65c3fb#diff-ffb0db2473f6c5e1b93dd33bce389ee836671a628fff9f903d097733f7ddfc9c + +This commit forgot to replicate the same test when the mmap2_try() +function is used later at: +https://github.com/ColinIanKing/stress-ng/blob/50f3ef2560e928c4694894be0bb652e663af5076/stress-mmap.c#L754 + +When HAVE_SYSCALL or __NR_mmap2 is undefined, compilation fails with: + + stress-mmap.c: In function 'stress_mmap': + stress-mmap.c:809:31: error: 'mmap2_try' undeclared (first use in this function); did you mean 'mmap_prot'? + context.mmap = (mmap_func_t)mmap2_try; + ^~~~~~~~~ + mmap_prot + stress-mmap.c:809:31: note: each undeclared identifier is reported only once for each function it appears in + +This patch fixes this issue. + +Upstream-reference: +https://github.com/ColinIanKing/stress-ng/commit/3da49180fdfa8a70307569202ed9431f5295913e + +Signed-off-by: Julien Olivain +--- + stress-mmap.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/stress-mmap.c b/stress-mmap.c +index cf343078..68f5a9b8 100644 +--- a/stress-mmap.c ++++ b/stress-mmap.c +@@ -805,7 +805,9 @@ static int stress_mmap(const stress_args_t *args) + context.mmap_file = true; + + if (mmap_mmap2) { +-#if defined(HAVE_MMAP2) ++#if defined(HAVE_MMAP2) && \ ++ defined(HAVE_SYSCALL) && \ ++ defined(__NR_mmap2) + context.mmap = (mmap_func_t)mmap2_try; + #else + if (args->instance == 0) +-- +2.39.2 + diff --git a/package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch b/package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch new file mode 100644 index 0000000000..cb2a507bfd --- /dev/null +++ b/package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch @@ -0,0 +1,43 @@ +From 40309f5d313524f4189f4ef158920391e92e226d Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Thu, 23 Feb 2023 21:38:25 +0100 +Subject: [PATCH] stress-regs: fix build on riscv32 + +RISC-V register test routine is using 64bit registers only. +When compiling on 32bit RISC-V, compilation fails with output: + + stress-regs.c: In function 'stress_regs_helper': + stress-regs.c:485:27: error: register specified for 's1' isn't suitable for data type + 485 | register uint64_t s1 __asm__("s1") = v; + | ^~ + stress-regs.c:495:27: error: register specified for 's11' isn't suitable for data type + 495 | register uint64_t s11 __asm__("s11") = s1 ^ 0xa5a5a5a5a5a5a5a5ULL; + | ^~~ + +This patch fix this issue by protecting the stress_regs_helper() +function with an additional test, to restrict to 64bit. + +Upstream-reference: +https://github.com/ColinIanKing/stress-ng/commit/6c335ac3abba535e79ddbddf34591ef5b9ee0a96 + +Signed-off-by: Julien Olivain +--- + stress-regs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/stress-regs.c b/stress-regs.c +index 4d4d32d2..0ffac4d1 100644 +--- a/stress-regs.c ++++ b/stress-regs.c +@@ -473,7 +473,7 @@ do { \ + } + #endif + +-#if defined(STRESS_ARCH_RISCV) ++#if defined(STRESS_ARCH_RISCV) && (__riscv_xlen == 64) + + #define STRESS_REGS_HELPER + /* +-- +2.39.2 + diff --git a/package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch b/package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch new file mode 100644 index 0000000000..beb5429dc1 --- /dev/null +++ b/package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch @@ -0,0 +1,78 @@ +From d3ab0bad6afc2e8f4be70fe38dd24788f1b3d4be Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 24 Feb 2023 21:11:30 +0100 +Subject: [PATCH] Makefile: introduce PRESERVE_CFLAGS build flag + +The stress-ng Makefile includes many nice environment auto-detection +features to adjust compilation flags. This is very convenient in +many compilation use-cases. However, in some other specific cross +compilation environments, those automatic CFLAGS adjustments may +create compilation failures. + +For example, commit c00e695ed5 added -fstack-protector-strong if the +compiler recognize the flag. In some situations, for example a gcc +toolchain based on uClibc-ng without stack-protector libssp +enabled, gcc will recognize the option. Then, the Makefile adds the +option to CFLAGS, and the compilation/link fails at link time with an +error like: + + /toolchain/arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lssp_nonshared: No such file or directory + /toolchain/arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lssp: No such file or directory + +stress-ng is included in the Buildroot build system [1] [2], which +supports many architectures and toolchain configurations. This build +system carefully controls its CFLAGS. In such a case, it is +preferable for a package to avoid changing compilation flags. + +This patch introduces the PRESERVE_CFLAGS Makefile variable which will +disable those CFLAGS adjustments, if set to 1. The current build +behavior is preserved if unset. + +Upstream-reference: +https://github.com/ColinIanKing/stress-ng/commit/3d87d50561505a5a79008c01e35fc2e100000160 + +[1] https://buildroot.org/ +[2] https://git.buildroot.org/buildroot/tree/package/stress-ng?h=2022.11.1 + +Signed-off-by: Julien Olivain +--- + Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Makefile b/Makefile +index 7a969aba..35151d74 100644 +--- a/Makefile ++++ b/Makefile +@@ -45,6 +45,7 @@ endif + # Test for hardening flags and apply them if applicable + # + MACHINE = $(shell uname -m) ++ifneq ($(PRESERVE_CFLAGS),1) + ifneq ($(MACHINE),$(filter $(MACHINE),alpha parisc)) + ifeq ($(shell $(CC) $(CFLAGS) -fstack-protector-strong -E -xc /dev/null > /dev/null 2>& 1 && echo 1),1) + CFLAGS += -fstack-protector-strong +@@ -58,6 +59,7 @@ ifeq ($(shell $(CC) $(CFLAGS) -D_FORTIFY_SOURCE=2 -E -xc /dev/null > /dev/null 2 + CFLAGS += -D_FORTIFY_SOURCE=2 + endif + endif ++endif + + # + # Expected build warnings +@@ -83,11 +85,13 @@ PRE_V= + PRE_Q=@# + endif + ++ifneq ($(PRESERVE_CFLAGS),1) + ifeq ($(findstring icc,$(CC)),icc) + CFLAGS += -no-inline-max-size -no-inline-max-total-size + CFLAGS += -axAVX,CORE-AVX2,CORE-AVX-I,CORE-AVX512,SSE2,SSE3,SSSE3,SSE4.1,SSE4.2,SANDYBRIDGE,SKYLAKE,SKYLAKE-AVX512,TIGERLAKE,SAPPHIRERAPIDS + CFLAGS += -ip -falign-loops -funroll-loops -ansi-alias -fma -qoverride-limits + endif ++endif + + #ifeq ($(findstring clang,$(CC)),clang) + #CFLAGS += -Weverything +-- +2.39.2 + diff --git a/package/stress-ng/Config.in b/package/stress-ng/Config.in index 839cbb1cc0..918c3db194 100644 --- a/package/stress-ng/Config.in +++ b/package/stress-ng/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_STRESS_NG bool "stress-ng" depends on BR2_USE_MMU # fork() # perf.c needs PERF_COUNT_HW_REF_CPU_CYCLES + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 and ARC depends on !BR2_nios2 @@ -16,5 +17,6 @@ config BR2_PACKAGE_STRESS_NG comment "stress-ng needs a toolchain w/ headers >= 3.3" depends on !BR2_nios2 && !BR2_arc + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash index 2e3f998769..5b967d2b95 100644 --- a/package/stress-ng/stress-ng.hash +++ b/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3de49e1100866634f549e99c1644283d0cde817b844a69dcf7f80afa2227d350 stress-ng-0.13.05.tar.gz +sha256 92922b979b5ca6ee05b03fd792c32a0b25a01fea6161b418b5e672c64ffb549f stress-ng-0.15.04.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 0b2287c7fb..28116b455d 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -4,11 +4,14 @@ # ################################################################################ -STRESS_NG_VERSION = 0.13.05 +STRESS_NG_VERSION = 0.15.04 STRESS_NG_SITE = $(call github,ColinIanKing,stress-ng,V$(STRESS_NG_VERSION)) STRESS_NG_LICENSE = GPL-2.0+ STRESS_NG_LICENSE_FILES = COPYING +STRESS_NG_MAKE_FLAGS = \ + PRESERVE_CFLAGS=1 + ifeq ($(BR2_PACKAGE_LIBBSD),y) STRESS_NG_DEPENDENCIES += libbsd endif @@ -18,7 +21,7 @@ STRESS_NG_DEPENDENCIES += keyutils endif define STRESS_NG_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(STRESS_NG_MAKE_FLAGS) endef # Don't use make install otherwise stress-ng will be rebuild without -- 2.39.2 From ps.report at gmx.net Mon Feb 27 21:08:23 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 27 Feb 2023 22:08:23 +0100 Subject: [Buildroot] [PATCH v1] package/speechd: fix gettext version mismatch Message-ID: <20230227210823.10437-1-ps.report@gmx.net> - fix gettext version mismatch in case of BR2_SYSTEM_ENABLE_NLS and BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-gnu" by setting SPEECHD_GETTEXTIZE Fixes: - http://autobuild.buildroot.net/results/283333290c5adb48d0c6e592b3261992537f92d3 Making all in po *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.19 but the autoconf macros are from gettext version 0.20 Signed-off-by: Peter Seiderer --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index dee94a6752..ec62980986 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -11,6 +11,7 @@ SPEECHD_LICENSE_FILES = COPYING.GPL-2 COPYING.GPL-3 COPYING.LGPL SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES +SPEECHD_GETTEXTIZE = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" SPEECHD_CONF_OPTS = --without-kali -- 2.39.2 From vfazio at xes-inc.com Mon Feb 27 21:17:40 2023 From: vfazio at xes-inc.com (Vincent Fazio) Date: Mon, 27 Feb 2023 21:17:40 +0000 Subject: [Buildroot] [PATCH v1] package/speechd: fix gettext version mismatch Message-ID: Peter, > -----Original Message----- > From: buildroot On Behalf Of Peter > Seiderer > Sent: Monday, February 27, 2023 3:08 PM > To: buildroot at buildroot.org > Subject: [External] - [Buildroot] [PATCH v1] package/speechd: fix gettext > version mismatch > > - fix gettext version mismatch in case of BR2_SYSTEM_ENABLE_NLS and > BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-gnu" by setting > SPEECHD_GETTEXTIZE > > Fixes: > > - > http://autobuild.buildroot.net/results/283333290c5adb48d0c6e592b3261992 > 537f92d3 > > Making all in po > *** error: gettext infrastructure mismatch: using a Makefile.in.in from > gettext version 0.19 but the autoconf macros are from gettext version 0.20 > > Signed-off-by: Peter Seiderer > --- > package/speechd/speechd.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk > index dee94a6752..ec62980986 100644 > --- a/package/speechd/speechd.mk > +++ b/package/speechd/speechd.mk > @@ -11,6 +11,7 @@ SPEECHD_LICENSE_FILES = COPYING.GPL-2 > COPYING.GPL-3 COPYING.LGPL SPEECHD_INSTALL_STAGING = YES # > speechd source code is released without configure script > SPEECHD_AUTORECONF = YES > +SPEECHD_GETTEXTIZE = YES I wonder if this will actually be necessary after https://patchwork.ozlabs.org/project/buildroot/list/?series=343029 Can you test to see if it's still a problem after applying the series and using autopoint? Otherwise I'll try to find some time to test your patch with autopoint to see if there's still an issue. > SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile > SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" > SPEECHD_CONF_OPTS = --without-kali > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > CAUTION: This email originated from outside of the organization. Do not click > links or open attachments unless you recognize the sender and know the > content is safe. From ps.report at gmx.net Mon Feb 27 21:41:13 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 27 Feb 2023 22:41:13 +0100 Subject: [Buildroot] [PATCH v1] package/speechd: fix gettext version mismatch In-Reply-To: References: Message-ID: <20230227224113.0eb16910@gmx.net> Hello Vincent, On Mon, 27 Feb 2023 21:17:40 +0000, Vincent Fazio wrote: > Peter, > > > -----Original Message----- > > From: buildroot On Behalf Of Peter > > Seiderer > > Sent: Monday, February 27, 2023 3:08 PM > > To: buildroot at buildroot.org > > Subject: [External] - [Buildroot] [PATCH v1] package/speechd: fix gettext > > version mismatch > > > > - fix gettext version mismatch in case of BR2_SYSTEM_ENABLE_NLS and > > BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-gnu" by setting > > SPEECHD_GETTEXTIZE > > > > Fixes: > > > > - > > http://autobuild.buildroot.net/results/283333290c5adb48d0c6e592b3261992 > > 537f92d3 > > > > Making all in po > > *** error: gettext infrastructure mismatch: using a Makefile.in.in from > > gettext version 0.19 but the autoconf macros are from gettext version 0.20 > > > > Signed-off-by: Peter Seiderer > > --- > > package/speechd/speechd.mk | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk > > index dee94a6752..ec62980986 100644 > > --- a/package/speechd/speechd.mk > > +++ b/package/speechd/speechd.mk > > @@ -11,6 +11,7 @@ SPEECHD_LICENSE_FILES = COPYING.GPL-2 > > COPYING.GPL-3 COPYING.LGPL SPEECHD_INSTALL_STAGING = YES # > > speechd source code is released without configure script > > SPEECHD_AUTORECONF = YES > > +SPEECHD_GETTEXTIZE = YES > > I wonder if this will actually be necessary after https://patchwork.ozlabs.org/project/buildroot/list/?series=343029 > > Can you test to see if it's still a problem after applying the series and using autopoint? Yes, already on my ToDo list ;-), in the meantime (and for master branch/2023.2) this minimal patch... > Otherwise I'll try to find some time to test your patch with autopoint to see if there's still an issue. Thanks for taking a look at it... Regards, Peter > > > SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile > > SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" > > SPEECHD_CONF_OPTS = --without-kali > > -- > > 2.39.2 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > CAUTION: This email originated from outside of the organization. Do not click > > links or open attachments unless you recognize the sender and know the > > content is safe. > From ps.report at gmx.net Mon Feb 27 21:42:20 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 27 Feb 2023 22:42:20 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/speechd: add default configure options In-Reply-To: <20230227214220.12101-1-ps.report@gmx.net> References: <20230227214220.12101-1-ps.report@gmx.net> Message-ID: <20230227214220.12101-2-ps.report@gmx.net> - add default configure options for all optional speechd features/ output modules (disable all with additional library dependencies, enable oss) Signed-off-by: Peter Seiderer --- package/speechd/speechd.mk | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index b545863035..5944ea3a28 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -14,7 +14,22 @@ SPEECHD_AUTORECONF = YES SPEECHD_GETTEXTIZE = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" -SPEECHD_CONF_OPTS = --without-kali +SPEECHD_CONF_OPTS = \ + --disable-python \ + --without-espeak \ + --without-espeak-ng \ + --without-flite \ + --without-ibmtts \ + --without-voxin \ + --without-ivona \ + --without-pico \ + --without-baratinoo \ + --without-kali \ + --without-pulse \ + --without-libao \ + --without-alsa \ + --with-oss \ + --without-nas # fix missing config.rpath (needed for autoreconf) in the codebase define SPEECHD_TOUCH_CONFIG_RPATH -- 2.39.2 From ps.report at gmx.net Mon Feb 27 21:42:19 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 27 Feb 2023 22:42:19 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/speechd: fix libltdl enable/disable configure option Message-ID: <20230227214220.12101-1-ps.report@gmx.net> - libltdl usage is configured by --disable/enable-ltdl (see configure.ac 'AC_ARG_ENABLE([ltdl], [...])') Fixes: configure: WARNING: unrecognized options: [...] --with-libltdl Signed-off-by: Peter Seiderer --- package/speechd/speechd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index ec62980986..b545863035 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -24,9 +24,9 @@ SPEECHD_PRE_CONFIGURE_HOOKS += SPEECHD_TOUCH_CONFIG_RPATH ifeq ($(BR2_PACKAGE_LIBTOOL),y) SPEECHD_DEPENDENCIES += libtool -SPEECHD_CONF_OPTS += --with-libltdl +SPEECHD_CONF_OPTS += --enable-ltdl else -SPEECHD_CONF_OPTS += --without-libltdl +SPEECHD_CONF_OPTS += --disable-ltdl endif define SPEECHD_INSTALL_INIT_SYSTEMD -- 2.39.2 From ps.report at gmx.net Mon Feb 27 21:56:00 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 27 Feb 2023 22:56:00 +0100 Subject: [Buildroot] [PATCH v1] package/speechd: fix gettext version mismatch In-Reply-To: <20230227224113.0eb16910@gmx.net> References: <20230227224113.0eb16910@gmx.net> Message-ID: <20230227225600.786e1389@gmx.net> Hello Vincent, On Mon, 27 Feb 2023 22:41:13 +0100, Peter Seiderer wrote: > Hello Vincent, > > On Mon, 27 Feb 2023 21:17:40 +0000, Vincent Fazio wrote: > > > Peter, > > > > > -----Original Message----- > > > From: buildroot On Behalf Of Peter > > > Seiderer > > > Sent: Monday, February 27, 2023 3:08 PM > > > To: buildroot at buildroot.org > > > Subject: [External] - [Buildroot] [PATCH v1] package/speechd: fix gettext > > > version mismatch > > > > > > - fix gettext version mismatch in case of BR2_SYSTEM_ENABLE_NLS and > > > BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-gnu" by setting > > > SPEECHD_GETTEXTIZE > > > > > > Fixes: > > > > > > - > > > http://autobuild.buildroot.net/results/283333290c5adb48d0c6e592b3261992 > > > 537f92d3 > > > > > > Making all in po > > > *** error: gettext infrastructure mismatch: using a Makefile.in.in from > > > gettext version 0.19 but the autoconf macros are from gettext version 0.20 > > > > > > Signed-off-by: Peter Seiderer > > > --- > > > package/speechd/speechd.mk | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk > > > index dee94a6752..ec62980986 100644 > > > --- a/package/speechd/speechd.mk > > > +++ b/package/speechd/speechd.mk > > > @@ -11,6 +11,7 @@ SPEECHD_LICENSE_FILES = COPYING.GPL-2 > > > COPYING.GPL-3 COPYING.LGPL SPEECHD_INSTALL_STAGING = YES # > > > speechd source code is released without configure script > > > SPEECHD_AUTORECONF = YES > > > +SPEECHD_GETTEXTIZE = YES > > > > I wonder if this will actually be necessary after https://patchwork.ozlabs.org/project/buildroot/list/?series=343029 > > > > Can you test to see if it's still a problem after applying the series and using autopoint? package/speechd needs 'SPEECHD_AUTOPOINT = YES'... Regards, Peter > > Yes, already on my ToDo list ;-), in the meantime (and for master branch/2023.2) this minimal patch... > > > Otherwise I'll try to find some time to test your patch with autopoint to see if there's still an issue. > > Thanks for taking a look at it... > > Regards, > Peter > > > > > > SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile > > > SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" > > > SPEECHD_CONF_OPTS = --without-kali > > > -- > > > 2.39.2 > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > CAUTION: This email originated from outside of the organization. Do not click > > > links or open attachments unless you recognize the sender and know the > > > content is safe. > > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From stefan at agner.ch Tue Feb 28 07:15:02 2023 From: stefan at agner.ch (Stefan Agner) Date: Tue, 28 Feb 2023 08:15:02 +0100 Subject: [Buildroot] [PATCH] rtl8812au-aircrack-ng: bump to latest rev d98018 Message-ID: <893660729815cb737418892a77d27ba089a6cbde.1677568448.git.stefan@agner.ch> Fixes build against kernel 6.1.x. Signed-off-by: Stefan Agner --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index bc3a926314..cdf5f3b4e2 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eed4888da9cfdc0f83ad3335beaf73af33ce0796b0a2637aeec102d47e1eb8f0 rtl8812au-aircrack-ng-e7a4a390ccbdd768411e1b2a8922c47837f76b47.tar.gz +sha256 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index 45a6ce5729..ab3ebe2077 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = e7a4a390ccbdd768411e1b2a8922c47837f76b47 +RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE -- 2.39.1 From stefan at agner.ch Tue Feb 28 07:19:28 2023 From: stefan at agner.ch (Stefan Agner) Date: Tue, 28 Feb 2023 08:19:28 +0100 Subject: [Buildroot] [PATCH v2] package/dbus-broker: bump to release 33 In-Reply-To: <20230221094329.79cf0b8e@windsurf> References: <29cebb7af48c3652e440c61cc90fafa4fe3f8046.1676300324.git.stefan@agner.ch> <20230221094329.79cf0b8e@windsurf> Message-ID: On 2023-02-21 09:43, Thomas Petazzoni wrote: > Hello Stefan, > > On Mon, 13 Feb 2023 15:58:57 +0100 > Stefan Agner wrote: > >> This release contains mostly a bugfixes, with some improvements around >> error handling for unimplemented functionality and resiliency against >> runtime changes of dbus service-files. >> >> Signed-off-by: Stefan Agner > > Thanks a lot for the update. However see below for a comment. > >> --- >> package/dbus-broker/dbus-broker.hash | 6 +++--- >> package/dbus-broker/dbus-broker.mk | 2 +- >> 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash >> index f6c2cbe160..06c8f229b7 100644 >> --- a/package/dbus-broker/dbus-broker.hash >> +++ b/package/dbus-broker/dbus-broker.hash >> @@ -1,5 +1,5 @@ >> # Locally calculated >> -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz >> +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz >> sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE >> sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS >> sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md >> @@ -11,7 +11,7 @@ sha256 23f24eeaaded5fedd6e7840b6f7b73838f9a4e2112ad6a12fe1ef958f73d0214 subpro >> sha256 05113a24aca4c537819dd0d91b95b13edb85bea4b6a77a6d9269becb397ed374 subprojects/libcrbtree-3/README.md >> sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS >> sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md >> -sha256 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 subprojects/libcstdaux-1/AUTHORS >> -sha256 7c4b6c325b0bc02150089112f65132ee999b0f44500b73d1fc06d96c93161037 subprojects/libcstdaux-1/README.md >> +sha256 e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 subprojects/libcstdaux-1/AUTHORS >> +sha256 92006886d7f28894fef08bf97e35ef52147067bd3c4d4d6381da7c59f9901dae subprojects/libcstdaux-1/README.md > > When there are changes in the license files, we need to have a short > explanation in the commit log about these. Indeed, if we simply > "blindly" update the hashes, then having those hashes in the first > place is completely useless: the whole point of having hashes for > license files is to detect changes in the license files, analyze them > and justify if they require or not a change in how the licensing of the > package is described in Buildroot. Sure that makes sense. I checked license and posted a summary in a email response to v1. I missed adding this to the commit message. Will do and resend v3. -- Stefan > > Could you resend with an updated commit message that explain the > changes in the license files? Even if they are minimal/trivial, having > this explanation in the commit log will help the reviewers/maintainers > to make sure the changes in those license files have been verified. > > Thanks a lot! > > Thomas From stefan at agner.ch Tue Feb 28 07:20:36 2023 From: stefan at agner.ch (Stefan Agner) Date: Tue, 28 Feb 2023 08:20:36 +0100 Subject: [Buildroot] [PATCH v3] package/dbus-broker: bump to release 33 Message-ID: This release contains mostly a bugfixes, with some improvements around error handling for unimplemented functionality and resiliency against runtime changes of dbus service-files. Also update hashes of license files. There was no change in license, the hashes changed due to copyright date bump and additional authors listend in the same files. Signed-off-by: Stefan Agner --- Changes in v2: - Update license hashes Changes in v3: - Updated commit message to reflect reasons of license hash changes package/dbus-broker/dbus-broker.hash | 6 +++--- package/dbus-broker/dbus-broker.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash index f6c2cbe160..06c8f229b7 100644 --- a/package/dbus-broker/dbus-broker.hash +++ b/package/dbus-broker/dbus-broker.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md @@ -11,7 +11,7 @@ sha256 23f24eeaaded5fedd6e7840b6f7b73838f9a4e2112ad6a12fe1ef958f73d0214 subpro sha256 05113a24aca4c537819dd0d91b95b13edb85bea4b6a77a6d9269becb397ed374 subprojects/libcrbtree-3/README.md sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md -sha256 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 subprojects/libcstdaux-1/AUTHORS -sha256 7c4b6c325b0bc02150089112f65132ee999b0f44500b73d1fc06d96c93161037 subprojects/libcstdaux-1/README.md +sha256 e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 subprojects/libcstdaux-1/AUTHORS +sha256 92006886d7f28894fef08bf97e35ef52147067bd3c4d4d6381da7c59f9901dae subprojects/libcstdaux-1/README.md sha256 7e660796fea0400a1a9a539226c345b3c656a745a334e323e33258de7864e985 subprojects/libcutf8-1/AUTHORS sha256 106099cc1c488cbf8911f56da7977a955f6b27a7bb5b815985e59d9fae0e6fe7 subprojects/libcutf8-1/README.md diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index e82b79220d..c4e3679a2e 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_BROKER_VERSION = 32 +DBUS_BROKER_VERSION = 33 DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) -- 2.39.1 From thomas.petazzoni at bootlin.com Tue Feb 28 07:36:58 2023 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 28 Feb 2023 07:36:58 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2023-02-27 Message-ID: <20230228073704.9CD9741824@smtp4.osuosl.org> Hello, Autobuild statistics for 2023-02-27 =================================== branch | OK | NOK | TIM | TOT | 2022.11.x | 10 | 9 | 0 | 19 | master | 140 | 126 | 1 | 267 | next | 12 | 17 | 0 | 29 | Classification of failures by reason for master ----------------------------------------------- gobject-introspection-1.72.0 | 11 host-binutils-2.38 | 9 host-go-1.19.6 | 8 glibc-2.36-81-g4f4d7a13edfd... | 7 linux-6.1.11 | 5 host-gdb-arc-2020.09-releas... | 4 libglib2-2.72.3 | 4 busybox-1.36.0 | 3 gerbera-1.10.0 | 3 host-rust-1.67.0 | 3 speechd-0.11.4 | 3 unknown | 3 brltty-6.5 | 2 host-gcc-final-11.3.0 | 2 host-pahole-1.24 | 2 ocf-linux-20171122 | 2 php-8.2.3 | 2 xenomai-3.0.10 | 2 assimp-5.2.5 | 1 bat-0.19.0 | 1 boost-1.80.0 | 1 check-0.15.2 | 1 dahdi-linux-3.2.0 | 1 ding-libs-0.6.2 | 1 dust-0.8.1 | 1 elfutils-0.186 | 1 freeradius-client-1.1.7 | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /ho... | 1 fs/cramfs/cramfs.mk:46: /tm... | 1 fs/romfs/romfs.mk:32: /home... | 1 fs/ubi/ubi.mk:51: /tmp/inst... | 1 fs/ubi/ubi.mk:51: /tmp/inst... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /home... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 fs/ubifs/ubifs.mk:49: /tmp/... | 1 gmp-6.2.1 | 1 gobject-introspection | 1 host-binutils-2.39 | 1 janet-1.26.0 | 1 jq-a17dd3248a666d01be75f6b1... | 1 libcap-ng-0.8.3 | 1 libfreeimage-3.18.0 | 1 libglvnd-1.4.0 | 1 libgpg-error-1.46 | 1 liblog4c-localtime-1.0 | 1 librsvg-2.50.7 | 1 libsigsegv-2.14 | 1 linux-5.10.162-cip24 | 1 linux-5.10.162-cip24-rt10 | 1 mariadb-10.3.36 | 1 micropython-1.19.1 | 1 network-manager-1.40.10 | 1 nodejs-16.18.1 | 1 olsr-0.9.8 | 1 package/multipath-tools/mul... | 1 pv-1.6.20 | 1 python-pyicu-2.10.2 | 1 quickjs-2021-03-27 | 1 rtl_433-22.11 | 1 rtty-8.1.0 | 1 sdl-1.2.15 | 1 valgrind-3.19.0 | 1 wolfssl-5.5.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | assimp-5.2.5 | NOK | http://autobuild.buildroot.net/results/0b31c2ea3146bbe4f920f2de6ff1b583de0def62 | ORPH armeb | bat-0.19.0 | NOK | http://autobuild.buildroot.net/results/303a52e057dcca8afbbadc5a0aaa56b3f5ab5aaf | arceb | boost-1.80.0 | NOK | http://autobuild.buildroot.net/results/5ed6380225146076acdea63b7b91fd02bee729dc | or1k | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/7d3bffd18470d35d960260d31cbf4005da216228 | microblazeel | brltty-6.5 | NOK | http://autobuild.buildroot.net/results/0c4ec33fe58fc251193d7eb71ffe53104de552fb | mips64el | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/504b7ea0dac9d031d638bd42340456325d6e9bc2 | ORPH mips64 | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/653640c27cc188020d2c1c298920cbaeadf03f92 | ORPH mips64 | busybox-1.36.0 | NOK | http://autobuild.buildroot.net/results/f1919fa68fa571cf28a43929644c6932448fc1af | ORPH riscv32 | check-0.15.2 | NOK | http://autobuild.buildroot.net/results/a20472e7959611da4699bdf7b9188e12c5b17c42 | ORPH mips | dahdi-linux-3.2.0 | NOK | http://autobuild.buildroot.net/results/45b76a2ee84a3b8efa640bc4ac3c0d8044a18e0a | arceb | ding-libs-0.6.2 | NOK | http://autobuild.buildroot.net/results/f9eb3616c84e618e96a3ea37afce041cf7f81e04 | mipsel | dust-0.8.1 | NOK | http://autobuild.buildroot.net/results/25d97014b4b135e03262db3aa6ec786450c7cbbe | ORPH microblaze | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/92af2d956385b58442e0596ef32ad3eea83b3d1d | ORPH riscv64 | freeradius-client-1.1.7 | NOK | http://autobuild.buildroot.net/results/318e281c6d51186b68de60396c80ae3331ca1547 | sh4 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/3a6742d4a13aaf126cc7fd9bbebff0b1b6ec47ab | sparc64 | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/3f85fe0e8b7d68ca1b5d4bf406daec63075c2862 | aarch64_be | fs/cramfs/cramfs.mk:46: /ho... | NOK | http://autobuild.buildroot.net/results/dd0b73d20d7ee8dffa2a57c1fe84e9afac18e411 | x86_64 | fs/cramfs/cramfs.mk:46: /tm... | NOK | http://autobuild.buildroot.net/results/f025d59d68fd3e7800125557c69b06fa5c85a72d | mips64 | fs/romfs/romfs.mk:32: /home... | NOK | http://autobuild.buildroot.net/results/cd91373053f44842624113da575a4957695c6c16 | x86_64 | fs/ubi/ubi.mk:51: /tmp/inst... | NOK | http://autobuild.buildroot.net/results/51b670ecdeeb9da060e078e52f917e75111c442f | mipsel | fs/ubi/ubi.mk:51: /tmp/inst... | NOK | http://autobuild.buildroot.net/results/24db2b3cef191980ead66afc33d7e0db18a77ff8 | arc | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/412e156fc90bfcd5ced425a471d54f1cdcce2294 | aarch64_be | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/766c2785b1ea9257bd032903fc2a356ff91657f7 | powerpc64le | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/2a579c74e3320f28ef9754eccdaac82e10e677e5 | s390x | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/fcf5ef5f6dcf8ac42be9b7eaa29a3ced8009d01d | sparc64 | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/c959ade5661aa9bd4f2871689259e31156a4a2fa | arceb | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/61873d2cd37b847bbfd379ea2c7cf4c0e0a983f4 | microblaze | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/74f7668f770f00fda03d73ef796d04cc6a3004a4 | microblaze | fs/ubifs/ubifs.mk:49: /tmp/... | NOK | http://autobuild.buildroot.net/results/a7388f3cbe4a3da8f0e946240f7f020230874c5f | nios2 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/800537a1ef5f48d24c20aad7a9c96c56dfdc77f5 | microblazeel | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/5d1a9420174669758f121ce65d82e1cdaadab32d | x86_64 | gerbera-1.10.0 | NOK | http://autobuild.buildroot.net/results/61b8ee4f12ccd9a8de3e10a186914654f23ce263 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/1aa55feb9084ae7a06a46186b52b8aad1d1550ae | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/5b1fe0affa022ab63360ca21e62899b1c1ab1d6e | arc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/8ff20e3924e7a74bd7eec7b148723d41f4df378f | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/3e3ad96fc41f3cdf61fd3f49355be72f5364d564 | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/dfd4a36489ceb2308d938fa5ab9494b2410c3d1d | powerpc | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/e7991c5f723b3eb38492f76d95abfe6bc0a2a8fd | arceb | glibc-2.36-81-g4f4d7a13edfd... | NOK | http://autobuild.buildroot.net/results/45b06d3f503fbb4a79085fe0d75f88e72fb28980 | riscv64 | gmp-6.2.1 | NOK | http://autobuild.buildroot.net/results/d90a301050bd3a2e41a9d0358fbb672b102da2a9 | ORPH microblazeel | gobject-introspection | TIM | http://autobuild.buildroot.net/results/a0cb43d96adc2295f01c99a6d2664b4fd2c75d7e | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/55eca1317844bf086456fd4433568131a08f6648 | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/d05e127654650383a257632c355bdb2c3153a43b | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/21676a787feb7615da7551d405ce21941e4c683b | ORPH i686 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/9f4056e998915526e7e672c41fca79c88ed5284d | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/6ed048bab1b7458351a9dab5718360548c197a9b | ORPH sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/3dbcbe663e3749df3de7a79c0d6d861d98d85f60 | ORPH s390x | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/01534f2702f13e461228e16d49b117755b36e01d | ORPH microblaze | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/79e44d02448c9972a0da5d67c5e44c46b742544e | ORPH nios2 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/662828c78252a08a439f49094b3864d69a72840b | ORPH or1k | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/1b504d9e59b198d162c1d68f5d69903d15dd0b50 | ORPH x86_64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/8317a20de677ced230746fc3dd9b2c59e0e6e0a0 | ORPH riscv64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/98b0354f79bda17963b8d34f0bee943997a9c6fc | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/f5baf343f35647fe0f3538424b80c1112ada888b | mips | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/2eaa4d369f2fadfced04e0e64fb9a9fa9cfdc61c | riscv32 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/d38528872616095fc3711a00beb32b2240b54cb3 | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/ece3252739724b2b5194fe4d7177dabe82e7c685 | sparc64 | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/e272b8c04b690e7b6cbefa8e544e6c04be6ad7c9 | m68k | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/0ad6925c7e9d04c20bb5bf30dd1dcdb2d414b4ca | microblaze | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/6ba2be938f0328f55b7881422befc18e5a6bcf5c | microblazeel | host-binutils-2.38 | NOK | http://autobuild.buildroot.net/results/af5626937b105c38bb98351083cf87694da94462 | or1k | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/4adf05014c19f778cae85e788c3650f7e3114125 | microblazeel | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/a8b14ab09aa89b2685f4ce9276b366707e10df75 | microblaze | host-gcc-final-11.3.0 | NOK | http://autobuild.buildroot.net/results/8af90ef250cefb841ba7e01a2fd1d528cf01303e | arceb | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/002f6984edfb5ec29e6ef335fe8c38c9dfb324c5 | ORPH arceb | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/1d4ae1ae6cb8fc0acd1aced5c4b604f1302564d1 | ORPH arc | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/7af065d52405646b8d2c748ca6a0ced7683bc726 | ORPH arceb | host-gdb-arc-2020.09-releas... | NOK | http://autobuild.buildroot.net/results/fe03bdfa2ace6d707ad5d1071fae144d67fd073a | ORPH i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/d85a6eeb3ca789707c0d932adaffb744f8bc1367 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/a54726c45255f82a97ffc77c7050f0119c4852db | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/71fa137ecb92d4700e575594d5b6d4e5bb84d0b0 | i686 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/5d42c30dab698991fb4630e4cea23bbac73b8bde | mips64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/6df838997647751b0aabdb9a7a8053b20b399932 | mips64el | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/0c04360fd7738d72010f75ce3d06dc20f49cda89 | riscv64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/1eb5d8baf1315b8ed69db9d4fb304c5e6fdf3e73 | aarch64 | host-go-1.19.6 | NOK | http://autobuild.buildroot.net/results/62e559c3460318f5145f9cc479d75a3d128c1192 | x86_64 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/f42dbded483737dea00ba7befa5c0bc6a6a19368 | i686 | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/63f72cb4e81fe02dd35371796e611086a44a2735 | sparc64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/4727cfc9f17c66171950e8667ee7ab64f8c0dceb | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/f98f5ff1d568b9adaffd88597162bd240268fb48 | x86_64 | host-rust-1.67.0 | NOK | http://autobuild.buildroot.net/results/46d5dc7ec4824e9b00c1b65c5db24a38a90c026c | m68k | janet-1.26.0 | NOK | http://autobuild.buildroot.net/results/f8ffb30f68847ed022fb457aae791d44787d663f | arc | jq-a17dd3248a666d01be75f6b1... | NOK | http://autobuild.buildroot.net/results/723adb73385154f3581fa50fc3e0fa1b0884769b | riscv64 | libcap-ng-0.8.3 | NOK | http://autobuild.buildroot.net/results/a295eae916cf7b372215b56d9bd7b6d1d2a63d86 | microblaze | libfreeimage-3.18.0 | NOK | http://autobuild.buildroot.net/results/1a4f3b8c9ca09442d961469d84e79818237f2b94 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/0b68ad01c772e766cafac08e79c78f4f95fd9817 | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/9c91808550eedc49b87bd38c407bab37f1e574a4 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/d383d4de3fc2b2b7ec297c57f0afce430a5dec1a | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/9c07c36d20f9cc21f080d6b84ffbe6bb3e2256d8 | xtensa | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/8ca4ffd1c7d53fc93878d99f8769ac65f9c1740d | ORPH aarch64_be | libgpg-error-1.46 | NOK | http://autobuild.buildroot.net/results/997b56b898791b4cb2775204292c5681a85ec938 | ORPH riscv64 | liblog4c-localtime-1.0 | NOK | http://autobuild.buildroot.net/results/f1f3a364f32d763e3cb15cc83ac6209c8738837a | arm | librsvg-2.50.7 | NOK | http://autobuild.buildroot.net/results/526e6f737a4800fe1e89ff41a898956915c8569a | powerpc | libsigsegv-2.14 | NOK | http://autobuild.buildroot.net/results/7810ac09e0294713b06a76f885c4c72b17100683 | sh4a | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/829b940836dde1d44ae6c9ee22b255c05ef7d47a | ORPH nios2 | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/700e3c152309fa7012faa072e1accc44f94116f1 | ORPH sh4aeb | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/13ad9549335cfc8f33cee1687439dde766c4e947 | ORPH sh4aeb | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/877178f84d52a8d3a42f1d0dd83cf7e005b2a9bf | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/78d071d6fe74c73053e49f405b94972abef5ce11 | ORPH mips64 | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/7fd4b000759872f87dfafb958a2678f25e2e0448 | ORPH mipsel | linux-6.1.11 | NOK | http://autobuild.buildroot.net/results/62eccbb3075b71423816e19eb5d3d862253eec03 | ORPH sparc | mariadb-10.3.36 | NOK | http://autobuild.buildroot.net/results/189b534f704fdcaa7862f2d6da2f1473d2ff6612 | ORPH aarch64 | micropython-1.19.1 | NOK | http://autobuild.buildroot.net/results/51c20df596b29d85914e867f5887fa5f129c89fd | sparc64 | network-manager-1.40.10 | NOK | http://autobuild.buildroot.net/results/fdbf3577392812313605b5789edc608794591bc4 | ORPH x86_64 | nodejs-16.18.1 | NOK | http://autobuild.buildroot.net/results/07ff63bd149bd82a0bd1a4d0bb0d303c57c9f6f0 | i686 | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/ab7388d1ccc31494927ca8b97bc3f8b2c1187909 | ORPH microblazeel | ocf-linux-20171122 | NOK | http://autobuild.buildroot.net/results/8e1bca2aacf2729c524abbb1ce795dbd71c5943c | ORPH powerpc64 | olsr-0.9.8 | NOK | http://autobuild.buildroot.net/results/9b5d238c8e16f870fd39cdc97d1da025285fa352 | ORPH s390x | package/multipath-tools/mul... | NOK | http://autobuild.buildroot.net/results/07855dab478627179adf0db01251445987b3e0ed | or1k | php-8.2.3 | NOK | http://autobuild.buildroot.net/results/849c0dad1dba4ca681e97d8b971b5691a7cde784 | microblaze | php-8.2.3 | NOK | http://autobuild.buildroot.net/results/87116d89f464003c24c5513ae76cb15888e3999e | armeb | pv-1.6.20 | NOK | http://autobuild.buildroot.net/results/496994c1dd23b57df9fd6ddb5aa1de582705473d | ORPH nios2 | python-pyicu-2.10.2 | NOK | http://autobuild.buildroot.net/results/7fdff57a34a298524d2b4953c8b167cd37c1944c | sh4 | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/2d0e9bb746ecb3c0c3c1ba4878c98bfc4df5caca | mips64 | rtl_433-22.11 | NOK | http://autobuild.buildroot.net/results/870543fe722313ffe111723593405a77eef5aad9 | arc | rtty-8.1.0 | NOK | http://autobuild.buildroot.net/results/d57d39d97fd83e9fe5a5936d5e8466bbbcf8600b | sh4 | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/85a85d4af3d102a26783b24abf163bb3cffe9391 | ORPH sparc64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/40202c8aeaf4a5e288dd775f9fce1b24bdc49bb6 | sparc64 | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/aa0579e226dfc03825c65c3f5c0ba0c10f770150 | aarch64_be | speechd-0.11.4 | NOK | http://autobuild.buildroot.net/results/3778e4313e24a6178bc14d64989afc62f3fb4873 | armeb | unknown | NOK | http://autobuild.buildroot.net/results/19ec82de7dd5d9beb5bff9a4940eac0f492a530c | m68k | unknown | NOK | http://autobuild.buildroot.net/results/597365593180b0d54912f9e378deaf463c181791 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/7882d4dea44338752ae8b662c0fd5b8d23a20977 | mips64el | valgrind-3.19.0 | NOK | http://autobuild.buildroot.net/results/ddec98cc29362ef24d1f8ca5ae423f34e98c00aa | ORPH mips | wolfssl-5.5.3 | NOK | http://autobuild.buildroot.net/results/bfdf24da8cf308594ace32ab7476dad993142ac8 | i686 | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/ee7d25b225faf85c27f92cd4191a0c5bc5644efc | microblazeel | xenomai-3.0.10 | NOK | http://autobuild.buildroot.net/results/e8863c2d4e6ce66ce18e44d4d05ccc5650fb99e6 | Classification of failures by reason for next --------------------------------------------- unknown | 5 host-rust-1.67.1 | 2 flare-engine-1.14 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 host-binutils-2.39 | 1 host-pahole-1.24 | 1 python-numpy-1.23.5 | 1 quickjs-2021-03-27 | 1 sdl-1.2.15 | 1 uccp420wlan-6.9.1 | 1 uqmi-0a19b5b77140465c29e2af... | 1 xfsprogs-5.14.2 | 1 Detail of failures for next --------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | flare-engine-1.14 | NOK | http://autobuild.buildroot.net/results/2b9bb464fec978742039c3d39a1b28a407cc4899 | arceb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/675c89e453080b12d8f21de69328388cd92829d5 | mips64 | host-binutils-2.39 | NOK | http://autobuild.buildroot.net/results/e900eb185ea8bd4da3ede894c307f2a4283296c4 | mips | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/ca35da5847f83496ee1822d54d879952275870d2 | armeb | host-rust-1.67.1 | NOK | http://autobuild.buildroot.net/results/03855d38f05bf7db4fb4ee4a15419ecdb3ed844c | powerpc64le | host-rust-1.67.1 | NOK | http://autobuild.buildroot.net/results/b7f2e18fc0d38963bb2370e031ecbb1a127c2abb | mipsel | python-numpy-1.23.5 | NOK | http://autobuild.buildroot.net/results/08570937efb670d6e07d8fb3041d12a8a500e83d | sh4 | quickjs-2021-03-27 | NOK | http://autobuild.buildroot.net/results/6d5a75eba935645c3583eed984ae11509a93ae4f | sh4eb | sdl-1.2.15 | NOK | http://autobuild.buildroot.net/results/1e4a65f104f753323ec866cdc71f76201507f7d0 | ORPH powerpc64le | uccp420wlan-6.9.1 | NOK | http://autobuild.buildroot.net/results/c7b0770de372320993b1c0904d3cc09c5999b827 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/8cd8ef2f8c3a1e0c0043796ba86a87ccf075a9c8 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/4605b1715abf2631dd16b33fe559601c01dcc0f7 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/15b1f1a265670171d3c43637d3301b99569b56dd | sh4a | unknown | NOK | http://autobuild.buildroot.net/results/c416118f7e31a00f9be7d37bc5d130f88d2df9b9 | arceb | unknown | NOK | http://autobuild.buildroot.net/results/e4025ce4a1649cf22ec52304aac4f5aa41963c5b | mipsel | uqmi-0a19b5b77140465c29e2af... | NOK | http://autobuild.buildroot.net/results/0783e6cdccf42974aacba7ca8af8cff08415e6b9 | ORPH nios2 | xfsprogs-5.14.2 | NOK | http://autobuild.buildroot.net/results/fc9fd74d1316691542f88db0b4c5f0d6ccbad332 | ORPH Classification of failures by reason for 2022.11.x -------------------------------------------------- libglib2-2.72.3 | 3 cppcms-2.0.0-beta2 | 1 fs/ubifs/ubifs.mk:49: /home... | 1 gobject-introspection-1.72.0 | 1 host-go-1.19.5 | 1 host-pahole-1.24 | 1 python3-3.10.8 | 1 Detail of failures for 2022.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | cppcms-2.0.0-beta2 | NOK | http://autobuild.buildroot.net/results/9f172c94e40f8589f35d6ed3cfc6904d70029533 | ORPH sh4eb | fs/ubifs/ubifs.mk:49: /home... | NOK | http://autobuild.buildroot.net/results/79c29bc148bf0f5230cc1588523d8a101f08ecc5 | sparc64 | gobject-introspection-1.72.0 | NOK | http://autobuild.buildroot.net/results/0df44b17065fe16401596b00a6a41bd86cdde9bb | ORPH mips64el | host-go-1.19.5 | NOK | http://autobuild.buildroot.net/results/f2369ddf4f5ca88deda282f617993101da3affc4 | xtensa | host-pahole-1.24 | NOK | http://autobuild.buildroot.net/results/b7b5b9664385738676164afd686e294bd1ec06ca | arc | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/6e5a41de985484468b9b0c7393f1d43eb520a6d7 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/308376d18371c3ac240bff588268f78d9286eeb5 | arceb | libglib2-2.72.3 | NOK | http://autobuild.buildroot.net/results/f7fc989bd14d17808524f71a2d226eef469ad43b | x86_64 | python3-3.10.8 | NOK | http://autobuild.buildroot.net/results/4c1ae2654aaae264457264c2491aeedf331b5ae8 | -- http://autobuild.buildroot.net From Alberto.Fahrenkrog at rigtechnologies.com.au Tue Feb 28 07:43:48 2023 From: Alberto.Fahrenkrog at rigtechnologies.com.au (Alberto Fahrenkrog) Date: Tue, 28 Feb 2023 07:43:48 +0000 Subject: [Buildroot] [Help] Building from a private PyPi server In-Reply-To: <87o7pfma0d.fsf@dell.be.48ers.dk> References: <87o7pfma0d.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, I believe the API used (JSON) is the same (similar?), I can confirm with one of my colleagues. Is scanpypi written in C or Python? I could have a look at the code. I don't know where the source is, but I'll look it up. The typo was accidental (below), the fact is that even manually using wget I have not yet figured out how to read from the link, also something I will follow up with my colleague. I wasn't aware of the --extra-index-url, I'll pass that information along to our software guys. I found a workaround to get it to work, using our repos directly. I need to sort some things out with our software department, but I'm making progress in the right direction. Cheers, Alberto Alberto Fahrenkrog Senior Embedded Engineer Orica - Perth Technology Centre p: +61 (0) 8 6365 4056 e: Alberto.Fahrenkrog at rigtechnologies.com.au ________________________________ From: Peter Korsgaard Sent: Monday, February 27, 2023 10:57 PM To: Alberto Fahrenkrog Cc: buildroot at buildroot.org Subject: Re: [Help] Building from a private PyPi server >>>>> "Alberto" == Alberto Fahrenkrog writes: > Hello all, > In our company we have custom Python packages stored in a private PyPi > server. To install them we simply add the --extra-index-url in our > requirements.txt file when using pip. Are you aware of the security issues with --extra-index-url? https://github.com/pypa/pip/issues/9612 > The packages are also available for manual download from the server, > however all URLs to any .tar.gz file are in the form > https://git.ourserver.com/packages/pypi/package-name/version-number/files/1234. This > leads me to the following options (I think): > * Try to get Buildroot to use the private PyPi server. I had a look > at the "scanpypi" script and it generated the .mk and .in files for a > regular PyPi package, but I could not find a way to tell scanpypi to > use an extra url or private pypi address scanpypi is indeed hard coded to use pypi and their JSON API (https://pypi.org/pypi/{pkg}/json), so not trivial to use with a local repo. Do your private server expose the same API? If so, I guess we could add an argument to scanpypi to use a custom URI instead of pypi.org. > * Find a way, using wget, to download the package from the address > above. Unfortunately I've had no luck with that yet. With the command: > wget > https://ourserver.com/-/packages/pypi/package-name/version_nr/files/5525 Notice: You have an additional /-/ compared to the URL above. -- Bye, Peter Korsgaard -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: image520031.png Type: image/png Size: 14270 bytes Desc: image520031.png URL: From stefan at agner.ch Tue Feb 28 07:44:40 2023 From: stefan at agner.ch (Stefan Agner) Date: Tue, 28 Feb 2023 08:44:40 +0100 Subject: [Buildroot] [PATCH] package/linux-firmware: Add Broadcom BNX2 firmware Message-ID: <1c5a072be17f6aeb1ff9f39d506141ed8024d7bf.1677570263.git.stefan@agner.ch> Signed-off-by: Stefan Agner --- package/linux-firmware/Config.in | 7 ++++++- package/linux-firmware/linux-firmware.mk | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 4b415a7da2..72a5bcddcd 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -449,8 +449,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3 Firmware files for Broadcom Tigon3 ethernet cards (tigon) -config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X +config BR2_PACKAGE_LINUX_FIRMWARE_BNX2 bool "Broadcom NetXtremeII" + help + Firmware files for Broadcom NetXtreme ethernet cards (bnx2) + +config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X + bool "Broadcom NetXtremeII 10Gb" help Firmware files for Broadcom NetXtreme 10Gb ethernet cards (bnx2x) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 9d9d12bd5f..36b8fbbe91 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -527,6 +527,12 @@ LINUX_FIRMWARE_FILES += tigon/* # which is installed unconditionally endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2),y) +LINUX_FIRMWARE_FILES += bnx2/* +# No license file; the license is in the file WHENCE +# which is installed unconditionally +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X),y) LINUX_FIRMWARE_FILES += bnx2x/* # No license file; the license is in the file WHENCE -- 2.39.1 From stefan at agner.ch Tue Feb 28 07:53:28 2023 From: stefan at agner.ch (Stefan Agner) Date: Tue, 28 Feb 2023 08:53:28 +0100 Subject: [Buildroot] [PATCH] package/iptables: add option to use iptables with nf_tables backend In-Reply-To: References: <330af443072a1a0716c5890eb87216a6bfbe99e7.1669645942.git.stefan@agner.ch> Message-ID: <155bdecc9b001d1d078cb9e313f53a63@agner.ch> Anything I can help to get this patch merged? -- Stefan On 2023-01-25 09:33, Stefan Agner wrote: > Any thoughts on this patch? > > -- > Stefan > > On 2022-11-28 15:33, Stefan Agner wrote: >> Add a configuration option to let the iptables and ip6tables symlinks >> point to the nf_tables variant. >> >> Signed-off-by: Stefan Agner >> --- >> package/iptables/Config.in | 5 +++++ >> package/iptables/iptables.mk | 9 +++++++++ >> 2 files changed, 14 insertions(+) >> >> diff --git a/package/iptables/Config.in b/package/iptables/Config.in >> index e6b12603e0..ec7fbb7eea 100644 >> --- a/package/iptables/Config.in >> +++ b/package/iptables/Config.in >> @@ -24,6 +24,11 @@ config BR2_PACKAGE_IPTABLES_NFTABLES >> help >> Build nftables compat utilities. >> >> +config BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT >> + bool "nftables compat as default" >> + help >> + Use nftables compat utilities by default for iptables/ip6tables. >> + >> comment "nftables compat needs a toolchain w/ wchar, dynamic library, >> headers >= 3.12" >> depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ >> !BR2_USE_WCHAR || BR2_STATIC_LIBS >> diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk >> index a6143677d1..b53ae928af 100644 >> --- a/package/iptables/iptables.mk >> +++ b/package/iptables/iptables.mk >> @@ -49,6 +49,15 @@ else >> IPTABLES_CONF_OPTS += --disable-bpf-compiler --disable-nfsynproxy >> endif >> >> +ifeq ($(BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT),y) >> +define IPTABLES_INSTALL_SYMLINK >> + ln -fs xtables-nft-multi $(TARGET_DIR)/usr/sbin/iptables >> + ln -fs xtables-nft-multi $(TARGET_DIR)/usr/sbin/ip6tables >> +endef >> + >> +IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_INSTALL_SYMLINK >> +endif >> + >> define IPTABLES_LINUX_CONFIG_FIXUPS >> $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) >> $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) From stefan at agner.ch Tue Feb 28 07:55:23 2023 From: stefan at agner.ch (Stefan Agner) Date: Tue, 28 Feb 2023 08:55:23 +0100 Subject: [Buildroot] [PATCH] rtl8812au-aircrack-ng: bump to latest rev d98018 In-Reply-To: <893660729815cb737418892a77d27ba089a6cbde.1677568448.git.stefan@agner.ch> References: <893660729815cb737418892a77d27ba089a6cbde.1677568448.git.stefan@agner.ch> Message-ID: <1186bf5ba2b8379429686a77858c683f@agner.ch> On 2023-02-28 08:15, Stefan Agner wrote: > Fixes build against kernel 6.1.x. Please ignore this patch, the same change got merged two weeks ago. -- Stefan > > Signed-off-by: Stefan Agner > --- > package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- > package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash > b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash > index bc3a926314..cdf5f3b4e2 100644 > --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash > +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 > eed4888da9cfdc0f83ad3335beaf73af33ce0796b0a2637aeec102d47e1eb8f0 > rtl8812au-aircrack-ng-e7a4a390ccbdd768411e1b2a8922c47837f76b47.tar.gz > +sha256 > 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f > rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.tar.gz > sha256 > 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 > LICENSE > diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk > b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk > index 45a6ce5729..ab3ebe2077 100644 > --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk > +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk > @@ -4,7 +4,7 @@ > # > > ################################################################################ > > -RTL8812AU_AIRCRACK_NG_VERSION = e7a4a390ccbdd768411e1b2a8922c47837f76b47 > +RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e > RTL8812AU_AIRCRACK_NG_SITE = $(call > github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) > RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 > RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE From peter at korsgaard.com Tue Feb 28 09:37:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 10:37:09 +0100 Subject: [Buildroot] [Help] Building from a private PyPi server In-Reply-To: (Alberto Fahrenkrog's message of "Tue, 28 Feb 2023 07:43:48 +0000") References: <87o7pfma0d.fsf@dell.be.48ers.dk> Message-ID: <87fsaqku62.fsf@dell.be.48ers.dk> >>>>> "Alberto" == Alberto Fahrenkrog writes: > Hi Peter, > I believe the API used (JSON) is the same (similar?), I can confirm > with one of my colleagues. Is scanpypi written in C or Python? I could > have a look at the code. I don't know where the source is, but I'll > look it up. It is a python script, just have a look at utils/scanpypi. > The typo was accidental (below), the fact is that even manually using > wget I have not yet figured out how to read from the link, also > something I will follow up with my colleague. > I wasn't aware of the --extra-index-url, I'll pass that information > along to our software guys. > I found a workaround to get it to work, using our repos directly. I > need to sort some things out with our software department, but I'm > making progress in the right direction. OK. -- Bye, Peter Korsgaard From d.lang at abatec.at Tue Feb 28 09:48:21 2023 From: d.lang at abatec.at (Lang Daniel) Date: Tue, 28 Feb 2023 09:48:21 +0000 Subject: [Buildroot] [PATCH 1/1] package/paho-mqtt-c: security bump to version 1.3.12 Message-ID: Contains a fix for a possible race condition that can lead to use after free: https://github.com/eclipse/paho.mqtt.c/commit/911488a9f0fdad31c85ec86712be52587afdbbb8 https://github.com/eclipse/paho.mqtt.c/milestone/19?closed=1 https://github.com/eclipse/paho.mqtt.c/releases/tag/v1.3.12 Signed-off-by: Daniel Lang --- 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 1949abdf1a..529c538ff2 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 d7bba3f8b8978802e11e2b1f28e96e6b7f4ed5d8a268af52a4d3b1bcbd1db16b paho-mqtt-c-1.3.11.tar.gz +sha256 6a70a664ed3bbcc1eafdc45a5dc11f3ad70c9bac12a54c2f8cef15c0e7d0a93b paho-mqtt-c-1.3.12.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 30daf863ad..8d1fe009a7 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.11 +PAHO_MQTT_C_VERSION = 1.3.12 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.25.1 From mf at go-sys.de Tue Feb 28 12:41:51 2023 From: mf at go-sys.de (Michael Fischer) Date: Tue, 28 Feb 2023 13:41:51 +0100 Subject: [Buildroot] [PATCH] package/libcurl: bump version to 7.88.1 Message-ID: <20230228124151.16044-1-mf@go-sys.de> Changelog: https://curl.se/changes.html#7_88_1 Signed-off-by: Michael Fischer --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 714b02acb0..32b3d0b5e2 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.88.0.tar.xz.asc +# https://curl.se/download/curl-7.88.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f curl-7.88.1.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index eb481e4782..1a1594a45e 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.88.0 +LIBCURL_VERSION = 7.88.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ -- 2.20.1 From baruch at tkos.co.il Tue Feb 28 12:50:30 2023 From: baruch at tkos.co.il (Baruch Siach) Date: Tue, 28 Feb 2023 14:50:30 +0200 Subject: [Buildroot] [PATCH] package/libcurl: bump version to 7.88.1 In-Reply-To: <20230228124151.16044-1-mf@go-sys.de> References: <20230228124151.16044-1-mf@go-sys.de> Message-ID: <87h6v67y23.fsf@tarshish> Hi Michael, On Tue, Feb 28 2023, Michael Fischer wrote: > Changelog: https://curl.se/changes.html#7_88_1 > > Signed-off-by: Michael Fischer There is a pending patch from Peter K doing the same bump: http://patchwork.ozlabs.org/project/buildroot/patch/20230227161040.2239744-1-peter at korsgaard.com/ baruch > --- > package/libcurl/libcurl.hash | 4 ++-- > package/libcurl/libcurl.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash > index 714b02acb0..32b3d0b5e2 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.88.0.tar.xz.asc > +# https://curl.se/download/curl-7.88.1.tar.xz.asc > # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 > -sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz > +sha256 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f curl-7.88.1.tar.xz > sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index eb481e4782..1a1594a45e 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBCURL_VERSION = 7.88.0 > +LIBCURL_VERSION = 7.88.1 > 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 stephane.gonauer at 6wind.com Tue Feb 28 13:08:43 2023 From: stephane.gonauer at 6wind.com (=?iso-8859-1?Q?St=E9phane?= GONAUER) Date: Tue, 28 Feb 2023 14:08:43 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: <20230222232157.380b6109@windsurf> References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> <20230222232157.380b6109@windsurf> Message-ID: <20230228130843.GC32199@carcass.dev.6wind.com> Hello, On Wed, Feb 22, 2023 at 11:21:57PM +0100, Thomas Petazzoni via buildroot wrote: > On Sat, 24 Dec 2022 18:19:20 +0100 > Raphael Pavlidis wrote: > > > shadow provides utilities to deal with user accounts. > > > > The shadow package includes the necessary programs for converting UNIX > > password files to the shadow password format, plus programs for managing > > user and group accounts. Especially it is useful if rootless podman > > container should be used, which requires newuidmap and newgidmap. > > > > Co-authored-by: Nicolas Carrier > > [Nicolas.Carrier at orolia.com provided the test case] > > Signed-off-by: Raphael Pavlidis > > --- > > Changes v3 -> v4: > > - fix formatting issues in Config.in and shadow.mk. > > - bump to version 4.13. > > - add SHADOW_CPE_ID_VENDOR in shadow.mk. > > - add userdel in the setuid list. > > - fix typo in SHADOW_ACCOUNT_TOOLS_SETUID_PERMISSIONS. > > I have finally applied your patch. I fixed only two things: > > - Added a dependency on !BR2_STATIC_LIBS, because shadow uses > unconditionally > > - Fixed the Config.in comment that already existed that said "shared > libs", while we normally use "dynamic library". > > With those changes, applied to our next branch. Thanks! > > Thomas I am testing shadow package and I think there may be a compatibility issue. I rebuilt qemu_x86_64_defconfig where I added the following packages : BR2_PACKAGE_LINUX_PAM=y BR2_INIT_SYSTEMD=y BR2_PACKAGE_SHADOW=y There is no way to log into the image. Welcome to Buildroot buildroot login: root Login incorrect buildroot login: One possible clue I find in the target folder is that a system-auth is referenced but not found in target/etc/pam.d /output/target/etc/pam.d$ grep system * chfn:password include system-auth chsh:password include system-auth groupmems:password include system-auth login:auth include system-auth login:account include system-auth login:password include system-auth login:session include system-auth passwd:auth include system-auth passwd:account include system-auth passwd:password include system-auth /output/target/etc/pam.d$ ls -l total 24 -rw-r--r-- 1 gonauer users 103 Feb 28 09:23 chfn -rw-r--r-- 1 gonauer users 103 Feb 28 09:23 chsh -rw-r--r-- 1 gonauer users 103 Feb 28 09:23 groupmems -rw-r--r-- 1 gonauer users 438 Feb 28 09:23 login -rw-r--r-- 1 gonauer users 120 Feb 27 18:11 other -rw-r--r-- 1 gonauer users 97 Feb 28 09:23 passwd system-auth is found in target/usr/share/factory/etc/pam.d/system-auth /output/target$ find . -name system-auth ./usr/share/factory/etc/pam.d/system-auth I haven't been able to boot the image without login to further debug the issue. My whole .config can be found at the end of this email I'm interested in getting this configuration working. What could be done to better understand the issue and/or fix it ? Best Regards, St?phane GONAUER ----8<------ # # Automatically generated file; DO NOT EDIT. # Buildroot 2023.02-rc1-29-g463d0dd494 Configuration # BR2_HAVE_DOT_CONFIG=y BR2_HOST_GCC_AT_LEAST_4_9=y BR2_HOST_GCC_AT_LEAST_5=y BR2_HOST_GCC_AT_LEAST_6=y BR2_HOST_GCC_AT_LEAST_7=y BR2_HOST_GCC_AT_LEAST_8=y BR2_NEEDS_HOST_UTF8_LOCALE=y # # Target options # BR2_ARCH_IS_64=y BR2_USE_MMU=y # BR2_arcle is not set # BR2_arceb is not set # BR2_arm is not set # BR2_armeb is not set # BR2_aarch64 is not set # BR2_aarch64_be is not set # BR2_i386 is not set # BR2_m68k is not set # BR2_microblazeel is not set # BR2_microblazebe is not set # BR2_mips is not set # BR2_mipsel is not set # BR2_mips64 is not set # BR2_mips64el is not set # BR2_nios2 is not set # BR2_or1k is not set # BR2_powerpc is not set # BR2_powerpc64 is not set # BR2_powerpc64le is not set # BR2_riscv is not set # BR2_s390x is not set # BR2_sh is not set # BR2_sparc is not set # BR2_sparc64 is not set BR2_x86_64=y # BR2_xtensa is not set BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT=y BR2_ARCH="x86_64" BR2_NORMALIZED_ARCH="x86_64" BR2_ENDIAN="LITTLE" BR2_GCC_TARGET_ARCH="x86-64" BR2_BINFMT_SUPPORTS_SHARED=y BR2_READELF_ARCH_NAME="Advanced Micro Devices X86-64" BR2_X86_CPU_HAS_MMX=y BR2_X86_CPU_HAS_SSE=y BR2_X86_CPU_HAS_SSE2=y BR2_x86_x86_64=y # BR2_x86_x86_64_v2 is not set # BR2_x86_x86_64_v3 is not set # BR2_x86_x86_64_v4 is not set # BR2_x86_nocona is not set # BR2_x86_core2 is not set # BR2_x86_corei7 is not set # BR2_x86_nehalem is not set # BR2_x86_westmere is not set # BR2_x86_corei7_avx is not set # BR2_x86_sandybridge is not set # BR2_x86_core_avx2 is not set # BR2_x86_haswell is not set # BR2_x86_broadwell is not set # BR2_x86_skylake is not set # BR2_x86_atom is not set # BR2_x86_bonnell is not set # BR2_x86_silvermont is not set # BR2_x86_goldmont is not set # BR2_x86_goldmont_plus is not set # BR2_x86_tremont is not set # BR2_x86_skylake_avx512 is not set # BR2_x86_cannonlake is not set # BR2_x86_icelake_client is not set # BR2_x86_icelake_server is not set # BR2_x86_cascadelake is not set # BR2_x86_cooperlake is not set # BR2_x86_tigerlake is not set # BR2_x86_sapphirerapids is not set # BR2_x86_alderlake is not set # BR2_x86_rocketlake is not set # BR2_x86_opteron is not set # BR2_x86_opteron_sse3 is not set # BR2_x86_barcelona is not set # BR2_x86_jaguar is not set # BR2_x86_steamroller is not set BR2_BINFMT_ELF=y # # Toolchain # BR2_TOOLCHAIN=y BR2_TOOLCHAIN_USES_GLIBC=y BR2_TOOLCHAIN_BUILDROOT=y # BR2_TOOLCHAIN_EXTERNAL is not set # # Toolchain Buildroot Options # BR2_TOOLCHAIN_BUILDROOT_VENDOR="buildroot" # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # BR2_TOOLCHAIN_BUILDROOT_MUSL is not set BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc" # # Kernel Header Options # BR2_KERNEL_HEADERS_AS_KERNEL=y # BR2_KERNEL_HEADERS_4_14 is not set # BR2_KERNEL_HEADERS_4_19 is not set # BR2_KERNEL_HEADERS_5_4 is not set # BR2_KERNEL_HEADERS_5_10 is not set # BR2_KERNEL_HEADERS_5_15 is not set # BR2_KERNEL_HEADERS_6_1 is not set # BR2_KERNEL_HEADERS_VERSION is not set # BR2_KERNEL_HEADERS_CUSTOM_TARBALL is not set # BR2_KERNEL_HEADERS_CUSTOM_GIT is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_18 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16 is not set BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_5 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_0 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_16 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_15 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_11 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_8 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_7 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_6 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_5 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_3 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_2 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_1 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0 is not set # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD is not set BR2_PACKAGE_LINUX_HEADERS=y BR2_PACKAGE_MUSL_ARCH_SUPPORTS=y BR2_PACKAGE_MUSL_SUPPORTS=y BR2_PACKAGE_UCLIBC_ARCH_SUPPORTS=y BR2_PACKAGE_UCLIBC_SUPPORTS=y BR2_PACKAGE_GLIBC_ARCH_SUPPORTS=y BR2_PACKAGE_GLIBC_SUPPORTS=y # # Glibc Options # BR2_PACKAGE_GLIBC=y # BR2_PACKAGE_GLIBC_KERNEL_COMPAT is not set # BR2_PACKAGE_GLIBC_UTILS is not set # # Binutils Options # BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI=y # BR2_BINUTILS_VERSION_2_37_X is not set BR2_BINUTILS_VERSION_2_38_X=y # BR2_BINUTILS_VERSION_2_39_X is not set BR2_BINUTILS_VERSION="2.38" BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="" # # GCC Options # # BR2_GCC_VERSION_10_X is not set BR2_GCC_VERSION_11_X=y # BR2_GCC_VERSION_12_X is not set BR2_GCC_SUPPORTS_DLANG=y BR2_GCC_VERSION="11.3.0" BR2_EXTRA_GCC_CONFIG_OPTIONS="" # BR2_TOOLCHAIN_BUILDROOT_CXX is not set # BR2_TOOLCHAIN_BUILDROOT_FORTRAN is not set # BR2_TOOLCHAIN_BUILDROOT_DLANG is not set # BR2_GCC_ENABLE_OPENMP is not set # BR2_GCC_ENABLE_GRAPHITE is not set BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS=y # # Host GDB Options # # BR2_PACKAGE_HOST_GDB is not set # # Toolchain Generic Options # BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS=y BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK=y BR2_USE_WCHAR=y BR2_ENABLE_LOCALE=y BR2_TOOLCHAIN_HAS_THREADS=y BR2_TOOLCHAIN_HAS_THREADS_DEBUG=y BR2_TOOLCHAIN_HAS_THREADS_NPTL=y BR2_TOOLCHAIN_HAS_SSP=y BR2_TOOLCHAIN_HAS_SSP_STRONG=y BR2_TOOLCHAIN_HAS_UCONTEXT=y BR2_TOOLCHAIN_SUPPORTS_PIE=y # BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY is not set BR2_TOOLCHAIN_EXTRA_LIBS="" BR2_TOOLCHAIN_HAS_FULL_GETTEXT=y BR2_TARGET_OPTIMIZATION="" BR2_TARGET_LDFLAGS="" BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14=y BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15=y BR2_TOOLCHAIN_HEADERS_AT_LEAST="5.15" BR2_TOOLCHAIN_GCC_AT_LEAST_4_3=y BR2_TOOLCHAIN_GCC_AT_LEAST_4_4=y BR2_TOOLCHAIN_GCC_AT_LEAST_4_5=y BR2_TOOLCHAIN_GCC_AT_LEAST_4_6=y BR2_TOOLCHAIN_GCC_AT_LEAST_4_7=y BR2_TOOLCHAIN_GCC_AT_LEAST_4_8=y BR2_TOOLCHAIN_GCC_AT_LEAST_4_9=y BR2_TOOLCHAIN_GCC_AT_LEAST_5=y BR2_TOOLCHAIN_GCC_AT_LEAST_6=y BR2_TOOLCHAIN_GCC_AT_LEAST_7=y BR2_TOOLCHAIN_GCC_AT_LEAST_8=y BR2_TOOLCHAIN_GCC_AT_LEAST_9=y BR2_TOOLCHAIN_GCC_AT_LEAST_10=y BR2_TOOLCHAIN_GCC_AT_LEAST_11=y BR2_TOOLCHAIN_GCC_AT_LEAST="11" BR2_TOOLCHAIN_HAS_MNAN_OPTION=y BR2_TOOLCHAIN_HAS_SYNC_1=y BR2_TOOLCHAIN_HAS_SYNC_2=y BR2_TOOLCHAIN_HAS_SYNC_4=y BR2_TOOLCHAIN_HAS_SYNC_8=y BR2_TOOLCHAIN_HAS_LIBATOMIC=y BR2_TOOLCHAIN_HAS_ATOMIC=y BR2_TOOLCHAIN_HAS_LIBQUADMATH=y # # Build options # # # Commands # BR2_WGET="wget --passive-ftp -nd -t 3" BR2_SVN="svn --non-interactive" BR2_BZR="bzr" BR2_GIT="git" BR2_CVS="cvs" BR2_LOCALFILES="cp" BR2_SCP="scp" BR2_SFTP="sftp" BR2_HG="hg" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_XZCAT="xzcat" BR2_LZCAT="lzip -d -c" BR2_TAR_OPTIONS="" BR2_DEFCONFIG="/home/gonauer/dev/buildroot/configs/qemu_x86_64_defconfig" BR2_DL_DIR="$(TOPDIR)/dl" BR2_HOST_DIR="$(BASE_DIR)/host" # # Mirrors and Download locations # BR2_PRIMARY_SITE="" BR2_BACKUP_SITE="http://sources.buildroot.net" BR2_KERNEL_MIRROR="https://cdn.kernel.org/pub" BR2_GNU_MIRROR="http://ftpmirror.gnu.org" BR2_LUAROCKS_MIRROR="http://rocks.moonscript.org" BR2_CPAN_MIRROR="https://cpan.metacpan.org" BR2_JLEVEL=0 # BR2_CCACHE is not set # BR2_ENABLE_DEBUG is not set # BR2_ENABLE_RUNTIME_DEBUG is not set BR2_STRIP_strip=y BR2_STRIP_EXCLUDE_FILES="" BR2_STRIP_EXCLUDE_DIRS="" # BR2_OPTIMIZE_0 is not set # BR2_OPTIMIZE_1 is not set # BR2_OPTIMIZE_2 is not set # BR2_OPTIMIZE_3 is not set # BR2_OPTIMIZE_G is not set BR2_OPTIMIZE_S=y # BR2_OPTIMIZE_FAST is not set # BR2_ENABLE_LTO is not set # # static only needs a toolchain w/ uclibc or musl # BR2_SHARED_LIBS=y # BR2_SHARED_STATIC_LIBS is not set BR2_PACKAGE_OVERRIDE_FILE="$(CONFIG_DIR)/local.mk" BR2_GLOBAL_PATCH_DIR="" # # Advanced # # BR2_FORCE_HOST_BUILD is not set # BR2_REPRODUCIBLE is not set # BR2_PER_PACKAGE_DIRECTORIES is not set # # Security Hardening Options # BR2_PIC_PIE_ARCH_SUPPORTS=y BR2_PIC_PIE=y # BR2_SSP_NONE is not set # BR2_SSP_REGULAR is not set BR2_SSP_STRONG=y # BR2_SSP_ALL is not set BR2_SSP_OPTION="-fstack-protector-strong" # BR2_RELRO_NONE is not set # BR2_RELRO_PARTIAL is not set BR2_RELRO_FULL=y BR2_FORTIFY_SOURCE_ARCH_SUPPORTS=y # BR2_FORTIFY_SOURCE_NONE is not set BR2_FORTIFY_SOURCE_1=y # BR2_FORTIFY_SOURCE_2 is not set # # System configuration # BR2_ROOTFS_SKELETON_DEFAULT=y # BR2_ROOTFS_SKELETON_CUSTOM is not set BR2_TARGET_GENERIC_HOSTNAME="buildroot" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot" BR2_TARGET_GENERIC_PASSWD_SHA256=y # BR2_TARGET_GENERIC_PASSWD_SHA512 is not set BR2_TARGET_GENERIC_PASSWD_METHOD="sha-256" # BR2_INIT_BUSYBOX is not set # BR2_INIT_SYSV is not set # BR2_INIT_OPENRC is not set BR2_INIT_SYSTEMD=y # BR2_INIT_NONE is not set BR2_INIT_SYSTEMD_POPULATE_TMPFILES=y BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET="multi-user.target" # # /dev management using udev (from systemd) # BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt" # BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES is not set BR2_ROOTFS_MERGED_USR=y BR2_TARGET_ENABLE_ROOT_LOGIN=y BR2_TARGET_GENERIC_ROOT_PASSWD="" BR2_SYSTEM_BIN_SH_BUSYBOX=y # BR2_SYSTEM_BIN_SH_BASH is not set # BR2_SYSTEM_BIN_SH_DASH is not set # BR2_SYSTEM_BIN_SH_MKSH is not set # BR2_SYSTEM_BIN_SH_ZSH is not set # BR2_SYSTEM_BIN_SH_NONE is not set BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="console" BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP=y # BR2_TARGET_GENERIC_GETTY_BAUDRATE_9600 is not set # BR2_TARGET_GENERIC_GETTY_BAUDRATE_19200 is not set # BR2_TARGET_GENERIC_GETTY_BAUDRATE_38400 is not set # BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600 is not set # BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200 is not set BR2_TARGET_GENERIC_GETTY_BAUDRATE="0" BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y BR2_SYSTEM_DHCP="eth0" BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin" BR2_ENABLE_LOCALE_PURGE=y BR2_ENABLE_LOCALE_WHITELIST="C en_US" BR2_GENERATE_LOCALE="" # BR2_SYSTEM_ENABLE_NLS is not set BR2_TARGET_TZ_INFO=y BR2_TARGET_TZ_ZONELIST="default" BR2_TARGET_LOCALTIME="Etc/UTC" BR2_ROOTFS_USERS_TABLES="" BR2_ROOTFS_OVERLAY="" BR2_ROOTFS_PRE_BUILD_SCRIPT="" BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" BR2_ROOTFS_POST_FAKEROOT_SCRIPT="" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # # Kernel # BR2_LINUX_KERNEL=y # BR2_LINUX_KERNEL_LATEST_VERSION is not set # BR2_LINUX_KERNEL_LATEST_CIP_VERSION is not set # BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION is not set BR2_LINUX_KERNEL_CUSTOM_VERSION=y # BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set # BR2_LINUX_KERNEL_CUSTOM_GIT is not set # BR2_LINUX_KERNEL_CUSTOM_HG is not set # BR2_LINUX_KERNEL_CUSTOM_SVN is not set BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" BR2_LINUX_KERNEL_VERSION="5.15.18" BR2_LINUX_KERNEL_PATCH="" # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set # BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG is not set BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="" BR2_LINUX_KERNEL_CUSTOM_LOGO_PATH="" BR2_LINUX_KERNEL_BZIMAGE=y # BR2_LINUX_KERNEL_VMLINUX is not set # BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM is not set BR2_LINUX_KERNEL_GZIP=y # BR2_LINUX_KERNEL_LZ4 is not set # BR2_LINUX_KERNEL_LZMA is not set # BR2_LINUX_KERNEL_LZO is not set # BR2_LINUX_KERNEL_XZ is not set # BR2_LINUX_KERNEL_ZSTD is not set # BR2_LINUX_KERNEL_DTS_SUPPORT is not set # BR2_LINUX_KERNEL_INSTALL_TARGET is not set # BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL is not set BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE is not set # # Linux Kernel Extensions # # BR2_LINUX_KERNEL_EXT_XENOMAI is not set # BR2_LINUX_KERNEL_EXT_RTAI is not set # BR2_LINUX_KERNEL_EXT_EV3DEV_LINUX_DRIVERS is not set # BR2_LINUX_KERNEL_EXT_FBTFT is not set # BR2_LINUX_KERNEL_EXT_AUFS is not set # # Linux Kernel Tools # # BR2_PACKAGE_LINUX_TOOLS_CPUPOWER is not set # BR2_PACKAGE_LINUX_TOOLS_GPIO is not set # BR2_PACKAGE_LINUX_TOOLS_IIO is not set # BR2_PACKAGE_LINUX_TOOLS_PCI is not set # BR2_PACKAGE_LINUX_TOOLS_PERF is not set # BR2_PACKAGE_LINUX_TOOLS_SELFTESTS is not set # BR2_PACKAGE_LINUX_TOOLS_TMON is not set # BR2_PACKAGE_LINUX_TOOLS_HV is not set # # Target packages # BR2_PACKAGE_BUSYBOX=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="" BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y # BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES is not set # BR2_PACKAGE_BUSYBOX_WATCHDOG is not set BR2_PACKAGE_SKELETON=y BR2_PACKAGE_HAS_SKELETON=y BR2_PACKAGE_PROVIDES_SKELETON="skeleton-init-systemd" BR2_PACKAGE_SKELETON_INIT_COMMON=y BR2_PACKAGE_SKELETON_INIT_SYSTEMD=y # # Audio and video applications # # BR2_PACKAGE_ALSA_UTILS is not set # BR2_PACKAGE_ATEST is not set # BR2_PACKAGE_AUMIX is not set # BR2_PACKAGE_BLUEZ_ALSA is not set # BR2_PACKAGE_DVBLAST is not set # BR2_PACKAGE_DVDAUTHOR is not set # # dvdrw-tools needs a toolchain w/ threads, C++, wchar # # # espeak needs a toolchain w/ C++, wchar, threads, dynamic library # # BR2_PACKAGE_FAAD2 is not set BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS=y # BR2_PACKAGE_FFMPEG is not set # BR2_PACKAGE_FLAC is not set # BR2_PACKAGE_FLITE is not set # BR2_PACKAGE_FLUID_SOUNDFONT is not set # # fluidsynth needs a toolchain w/ threads, wchar, dynamic library, C++ # # BR2_PACKAGE_GMRENDER_RESURRECT is not set # BR2_PACKAGE_GSTREAMER1 is not set # BR2_PACKAGE_JACK1 is not set # # jack2 needs a toolchain w/ threads, C++, dynamic library # BR2_PACKAGE_KODI_ARCH_SUPPORTS=y # # kodi needs python3 w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.9 # # # kodi needs udev support for gbm # # # kodi needs an OpenGL EGL backend with OpenGL or GLES support # # BR2_PACKAGE_LAME is not set # BR2_PACKAGE_MADPLAY is not set # BR2_PACKAGE_MIMIC is not set # BR2_PACKAGE_MINIMODEM is not set # BR2_PACKAGE_MIRACLECAST is not set BR2_PACKAGE_MJPEGTOOLS_SIMD_SUPPORT=y # # mjpegtools needs a toolchain w/ C++, threads # # # modplugtools needs a toolchain w/ C++ # # BR2_PACKAGE_MOTION is not set # # mpd needs a toolchain w/ C++, threads, wchar, gcc >= 8, host gcc >= 8 # # BR2_PACKAGE_MPD_MPC is not set # BR2_PACKAGE_MPG123 is not set # # mpv needs a toolchain w/ C++, threads, gcc >= 4.9 # # BR2_PACKAGE_MULTICAT is not set # BR2_PACKAGE_MUSEPACK is not set # # ncmpc needs a toolchain w/ C++, wchar, threads, gcc >= 10 # # BR2_PACKAGE_OPUS_TOOLS is not set # BR2_PACKAGE_PIPEWIRE is not set BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC=y # BR2_PACKAGE_PULSEAUDIO is not set # BR2_PACKAGE_SOX is not set # BR2_PACKAGE_SPEECHD is not set # BR2_PACKAGE_SQUEEZELITE is not set # BR2_PACKAGE_TINYCOMPRESS is not set # # tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.9 # # BR2_PACKAGE_TSTOOLS is not set # BR2_PACKAGE_TWOLAME is not set # BR2_PACKAGE_UDPXY is not set # # upmpdcli needs a toolchain w/ C++, NPTL, gcc >= 4.9 # # # v4l2grab needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0 # # BR2_PACKAGE_V4L2LOOPBACK is not set # # vlc needs a toolchain w/ C++, dynamic library, wchar, threads, gcc >= 4.9, headers >= 3.7 # # BR2_PACKAGE_VORBIS_TOOLS is not set # BR2_PACKAGE_WAVPACK is not set # BR2_PACKAGE_YAVTA is not set # BR2_PACKAGE_YMPD is not set # # zynaddsubfx needs a toolchain w/ C++11 and threads # # # Compressors and decompressors # # BR2_PACKAGE_BROTLI is not set # BR2_PACKAGE_BZIP2 is not set # BR2_PACKAGE_GZIP is not set # # lrzip needs a toolchain w/ wchar, threads, C++ # # # lzip needs a toolchain w/ C++ # # BR2_PACKAGE_LZOP is not set # # p7zip needs a toolchain w/ threads, wchar, C++ # # BR2_PACKAGE_PIGZ is not set # BR2_PACKAGE_PIXZ is not set # # unrar needs a toolchain w/ C++, wchar, threads # # BR2_PACKAGE_UNZIP is not set # BR2_PACKAGE_XZ is not set # BR2_PACKAGE_ZIP is not set # BR2_PACKAGE_ZSTD is not set # # Debugging, profiling and benchmark # # BR2_PACKAGE_BABELTRACE2 is not set # BR2_PACKAGE_BLKTRACE is not set # # bonnie++ needs a toolchain w/ C++ # BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS=y # BR2_PACKAGE_BPFTOOL is not set # BR2_PACKAGE_CACHE_CALIBRATOR is not set # # clinfo needs an OpenCL provider # # # clpeak needs an OpenCL provider, a toolchain w/ C++, gcc >= 4.8 # # BR2_PACKAGE_COREMARK is not set # BR2_PACKAGE_COREMARK_PRO is not set # # dacapo needs OpenJDK # BR2_PACKAGE_DELVE_ARCH_SUPPORTS=y # BR2_PACKAGE_DELVE is not set # BR2_PACKAGE_DHRYSTONE is not set # BR2_PACKAGE_DIEHARDER is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_DROPWATCH is not set # BR2_PACKAGE_DSTAT is not set # BR2_PACKAGE_DT is not set # # duma needs a toolchain w/ C++, threads, dynamic library # # BR2_PACKAGE_FIO is not set BR2_PACKAGE_FWTS_ARCH_SUPPORTS=y # BR2_PACKAGE_FWTS is not set BR2_PACKAGE_GDB_ARCH_SUPPORTS=y # # gdb/gdbserver >= 8.x needs a toolchain w/ C++, gcc >= 4.8 # BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y # # google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++, gcc >= 4.8 # # BR2_PACKAGE_HYPERFINE is not set # BR2_PACKAGE_IOZONE is not set # BR2_PACKAGE_KEXEC is not set # BR2_PACKAGE_KMEMD is not set BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS=y # BR2_PACKAGE_KVM_UNIT_TESTS is not set # BR2_PACKAGE_LATENCYTOP is not set # BR2_PACKAGE_LIBBPF is not set # BR2_PACKAGE_LMBENCH is not set # BR2_PACKAGE_LSOF is not set BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS=y # BR2_PACKAGE_LTP_TESTSUITE is not set BR2_PACKAGE_LTRACE_ARCH_SUPPORTS=y # BR2_PACKAGE_LTRACE is not set # BR2_PACKAGE_LTTNG_BABELTRACE is not set # BR2_PACKAGE_LTTNG_MODULES is not set # BR2_PACKAGE_LTTNG_TOOLS is not set # BR2_PACKAGE_MBW is not set # BR2_PACKAGE_MCELOG is not set # BR2_PACKAGE_MEMSTAT is not set # BR2_PACKAGE_NETPERF is not set # BR2_PACKAGE_NETSNIFF_NG is not set # BR2_PACKAGE_NMON is not set BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS=y # # oprofile needs a toolchain w/ C++, wchar # # BR2_PACKAGE_PAX_UTILS is not set # # pcm-tools needs a toolchain w/ C++ # BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS=y # BR2_PACKAGE_PERFTEST is not set BR2_PACKAGE_PLY_ARCH_SUPPORTS=y # BR2_PACKAGE_PLY is not set # BR2_PACKAGE_POKE is not set # BR2_PACKAGE_PV is not set # # racehound needs a uClibc or glibc toolchain w/ C++, wchar, dynamic library, threads # # BR2_PACKAGE_RAMSMP is not set # BR2_PACKAGE_RAMSPEED is not set # BR2_PACKAGE_RT_TESTS is not set # # rwmem needs a toolchain w/ C++, wchar, gcc >= 5 # # # sentry-native needs a glibc toolchain with w/ wchar, thread, C++, gcc >= 4.8 # # # signal-estimator needs a toochain w/ C++, threads, gcc >= 7 # # BR2_PACKAGE_SPIDEV_TEST is not set # BR2_PACKAGE_STRACE is not set # BR2_PACKAGE_STRESS is not set # BR2_PACKAGE_STRESS_NG is not set # # sysdig needs a glibc toolchain w/ C++, threads, gcc >= 5, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built # # BR2_PACKAGE_SYSPROF is not set # BR2_PACKAGE_TCF_AGENT is not set BR2_PACKAGE_TCF_AGENT_ARCH="x86_64" BR2_PACKAGE_TCF_AGENT_ARCH_SUPPORTS=y # BR2_PACKAGE_TINYMEMBENCH is not set # BR2_PACKAGE_TRACE_CMD is not set BR2_PACKAGE_TRINITY_ARCH_SUPPORTS=y # BR2_PACKAGE_TRINITY is not set # BR2_PACKAGE_UCLIBC_NG_TEST is not set BR2_PACKAGE_UFTRACE_ARCH_SUPPORTS=y # BR2_PACKAGE_UFTRACE is not set BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS=y # BR2_PACKAGE_VALGRIND is not set # BR2_PACKAGE_VMTOUCH is not set # BR2_PACKAGE_WHETSTONE is not set # # Development tools # # BR2_PACKAGE_AVOCADO is not set # BR2_PACKAGE_BINUTILS is not set # BR2_PACKAGE_BITWISE is not set # BR2_PACKAGE_BSDIFF is not set # BR2_PACKAGE_BUSTLE is not set # BR2_PACKAGE_CHECK is not set BR2_PACKAGE_CMAKE_ARCH_SUPPORTS=y # # ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, NPTL # # # cppunit needs a toolchain w/ C++, dynamic library # # BR2_PACKAGE_CUKINIA is not set # BR2_PACKAGE_CUNIT is not set # BR2_PACKAGE_CVS is not set # # cxxtest needs a toolchain w/ C++ support # # BR2_PACKAGE_DIFFUTILS is not set # BR2_PACKAGE_DOS2UNIX is not set # BR2_PACKAGE_FINDUTILS is not set BR2_PACKAGE_FLEX=y # BR2_PACKAGE_GAWK is not set # BR2_PACKAGE_GETTEXT is not set BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-tiny" # BR2_PACKAGE_GIT is not set # # git-crypt needs a toolchain w/ C++, gcc >= 4.9 # # # gperf needs a toolchain w/ C++ # # BR2_PACKAGE_GREP is not set # BR2_PACKAGE_JO is not set # BR2_PACKAGE_JQ is not set # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_MAKE is not set # BR2_PACKAGE_MAWK is not set # BR2_PACKAGE_PATCH is not set # BR2_PACKAGE_PKGCONF is not set # BR2_PACKAGE_RIPGREP is not set # BR2_PACKAGE_SED is not set # BR2_PACKAGE_SUBVERSION is not set # BR2_PACKAGE_TREE is not set # BR2_PACKAGE_YASM is not set # # Filesystem and flash utilities # # BR2_PACKAGE_ABOOTIMG is not set # BR2_PACKAGE_AUFS_UTIL is not set # BR2_PACKAGE_AUTOFS is not set # BR2_PACKAGE_BTRFS_PROGS is not set # BR2_PACKAGE_CIFS_UTILS is not set # BR2_PACKAGE_CPIO is not set # BR2_PACKAGE_CRAMFS is not set # BR2_PACKAGE_CURLFTPFS is not set # BR2_PACKAGE_DAVFS2 is not set # BR2_PACKAGE_DOSFSTOOLS is not set # BR2_PACKAGE_DUST is not set # BR2_PACKAGE_E2FSPROGS is not set # BR2_PACKAGE_E2TOOLS is not set # BR2_PACKAGE_ECRYPTFS_UTILS is not set # BR2_PACKAGE_EROFS_UTILS is not set # BR2_PACKAGE_EXFAT is not set # BR2_PACKAGE_EXFAT_UTILS is not set # BR2_PACKAGE_EXFATPROGS is not set # BR2_PACKAGE_F2FS_TOOLS is not set # BR2_PACKAGE_FIRMWARE_UTILS is not set # BR2_PACKAGE_FLASHBENCH is not set # BR2_PACKAGE_FSCRYPTCTL is not set # BR2_PACKAGE_FUSE_OVERLAYFS is not set # BR2_PACKAGE_FWUP is not set # BR2_PACKAGE_GENEXT2FS is not set # BR2_PACKAGE_GENPART is not set # BR2_PACKAGE_GENROMFS is not set # BR2_PACKAGE_GOCRYPTFS is not set # BR2_PACKAGE_IMX_USB_LOADER is not set # BR2_PACKAGE_MMC_UTILS is not set # BR2_PACKAGE_MTD is not set # BR2_PACKAGE_MTOOLS is not set # BR2_PACKAGE_NFS_UTILS is not set # BR2_PACKAGE_NILFS_UTILS is not set # BR2_PACKAGE_NTFS_3G is not set # BR2_PACKAGE_SP_OOPS_EXTRACT is not set # BR2_PACKAGE_SQUASHFS is not set # BR2_PACKAGE_SSHFS is not set # BR2_PACKAGE_UDFTOOLS is not set # BR2_PACKAGE_UNIONFS is not set # BR2_PACKAGE_XFSPROGS is not set # BR2_PACKAGE_ZEROFREE is not set # BR2_PACKAGE_ZFS is not set # # Fonts, cursors, icons, sounds and themes # # # Cursors # # BR2_PACKAGE_COMIX_CURSORS is not set # BR2_PACKAGE_OBSIDIAN_CURSORS is not set # # Fonts # # BR2_PACKAGE_BITSTREAM_VERA is not set # BR2_PACKAGE_CANTARELL is not set # BR2_PACKAGE_DEJAVU is not set # BR2_PACKAGE_FONT_AWESOME is not set # BR2_PACKAGE_GHOSTSCRIPT_FONTS is not set # BR2_PACKAGE_INCONSOLATA is not set # BR2_PACKAGE_LIBERATION is not set # BR2_PACKAGE_WQY_ZENHEI is not set # # Icons # # BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS is not set # BR2_PACKAGE_HICOLOR_ICON_THEME is not set # # Sounds # # BR2_PACKAGE_SOUND_THEME_BOREALIS is not set # BR2_PACKAGE_SOUND_THEME_FREEDESKTOP is not set # # Themes # # # Games # # BR2_PACKAGE_ASCII_INVADERS is not set # BR2_PACKAGE_CHOCOLATE_DOOM is not set # # flare-engine needs a toolchain w/ C++, dynamic library # # BR2_PACKAGE_FROTZ is not set # # gnuchess needs a toolchain w/ C++, threads # # BR2_PACKAGE_LBREAKOUT2 is not set # BR2_PACKAGE_LTRIS is not set # # minetest needs a toolchain w/ C++, gcc >= 5.1, threads # # BR2_PACKAGE_OPENTYRIAN is not set # BR2_PACKAGE_PRBOOM is not set # BR2_PACKAGE_SL is not set # # solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.9, NPTL, dynamic library, and luajit or lua 5.1 # # # stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 7 # # BR2_PACKAGE_XORCURSES is not set # # Graphic libraries and applications (graphic/text) # # # Graphic applications # # # cage needs udev, EGL w/ Wayland backend and OpenGL ES support # # # cog needs wpewebkit and a toolchain w/ threads # # BR2_PACKAGE_FSWEBCAM is not set # BR2_PACKAGE_GHOSTSCRIPT is not set # # glmark2 needs a toolchain w/ C++, gcc >= 4.9 # # # glslsandbox-player needs openGL ES and EGL driver # # BR2_PACKAGE_GNUPLOT is not set # BR2_PACKAGE_JHEAD is not set # # kmscube needs EGL, GBM and OpenGL ES, and a toolchain w/ thread support # # # libva-utils needs a toolchain w/ C++, threads, dynamic library # BR2_PACKAGE_MIDORI_ARCH_SUPPORTS=y # # midori needs a glibc toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 8 # # # midori needs libgtk3 w/ X11 or wayland backend # BR2_PACKAGE_NETSURF_ARCH_SUPPORTS=y # BR2_PACKAGE_NETSURF is not set # BR2_PACKAGE_PNGQUANT is not set # BR2_PACKAGE_RRDTOOL is not set # # stellarium needs Qt5 and an OpenGL provider # # # sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support # # # sway needs a toolchain w/ wchar, threads, C++, dynamic library, gcc >= 4.9 # # # tesseract-ocr needs a toolchain w/ threads, C++, gcc >= 7, dynamic library, wchar # # BR2_PACKAGE_TINIFIER is not set # # Graphic libraries # # # cegui needs a toolchain w/ C++, threads, dynamic library, wchar, gcc >= 5 # # # directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5, dynamic library # # # efl needs a toolchain w/ C++, dynamic library, gcc >= 4.9, host gcc >= 4.9, threads, wchar # # BR2_PACKAGE_FB_TEST_APP is not set # BR2_PACKAGE_FBDUMP is not set # BR2_PACKAGE_FBGRAB is not set # BR2_PACKAGE_FBSET is not set # # fbterm needs a toolchain w/ C++, wchar, locale # # BR2_PACKAGE_FBV is not set # # freerdp needs a toolchain w/ wchar, dynamic library, threads, C++ # # BR2_PACKAGE_GRAPHICSMAGICK is not set # BR2_PACKAGE_IMAGEMAGICK is not set # BR2_PACKAGE_LIBGLVND is not set # BR2_PACKAGE_LINUX_FUSION is not set # # mesa3d needs a toolchain w/ C++, NPTL, dynamic library # # # ocrad needs a toolchain w/ C++ # # # ogre needs a toolchain w/ C++, dynamic library, gcc >= 4.8, threads, wchar # # BR2_PACKAGE_PSPLASH is not set # BR2_PACKAGE_SDL is not set # BR2_PACKAGE_SDL2 is not set # BR2_PACKAGE_VULKAN_HEADERS is not set # # Other GUIs # BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y # # Qt5 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library # BR2_PACKAGE_QT6_ARCH_SUPPORTS=y # # qt6 needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, host gcc >= 8 # # # tekui needs a Lua interpreter and a toolchain w/ threads, dynamic library # # BR2_PACKAGE_WESTON is not set # BR2_PACKAGE_XORG7 is not set # # apitrace needs a toolchain w/ C++, wchar, dynamic library, threads, gcc >= 7 # # # mupdf needs a toolchain w/ C++, gcc >= 4.9 # # # vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 10 # # # vte needs an OpenGL or an OpenGL-EGL/wayland backend # # BR2_PACKAGE_XKEYBOARD_CONFIG is not set # # Hardware handling # # # Firmware # # BR2_PACKAGE_ARMBIAN_FIRMWARE is not set # BR2_PACKAGE_B43_FIRMWARE is not set # BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI is not set # BR2_PACKAGE_LINUX_FIRMWARE is not set # BR2_PACKAGE_MURATA_CYW_FW is not set # BR2_PACKAGE_ODROIDC2_FIRMWARE is not set # BR2_PACKAGE_QCOM_DB410C_FIRMWARE is not set # BR2_PACKAGE_RCW_SMARC_SAL28 is not set # BR2_PACKAGE_UX500_FIRMWARE is not set # BR2_PACKAGE_WILC1000_FIRMWARE is not set # BR2_PACKAGE_WILC3000_FIRMWARE is not set # BR2_PACKAGE_WILINK_BT_FIRMWARE is not set # BR2_PACKAGE_ZD1211_FIRMWARE is not set # BR2_PACKAGE_18XX_TI_UTILS is not set # BR2_PACKAGE_ACPICA is not set # BR2_PACKAGE_ACPID is not set # # acpitool needs a toolchain w/ threads, C++, dynamic library # # BR2_PACKAGE_AER_INJECT is not set # BR2_PACKAGE_ALTERA_STAPL is not set # # apcupsd needs a toolchain w/ C++, threads # # BR2_PACKAGE_AVRDUDE is not set # BR2_PACKAGE_BCACHE_TOOLS is not set # BR2_PACKAGE_BIOSDEVNAME is not set # BR2_PACKAGE_BRICKD is not set # BR2_PACKAGE_BRLTTY is not set # # cc-tool needs a toolchain w/ C++, threads, wchar, gcc >= 4.9 # # BR2_PACKAGE_CDRKIT is not set # BR2_PACKAGE_CRUCIBLE is not set # BR2_PACKAGE_CRYPTSETUP is not set # BR2_PACKAGE_CWIID is not set # BR2_PACKAGE_DAHDI_LINUX is not set # BR2_PACKAGE_DAHDI_TOOLS is not set BR2_PACKAGE_DBUS=y # BR2_PACKAGE_DBUS_BROKER is not set # # dbus-c++ needs a uClibc or glibc toolchain w/ C++, threads # # # dbus-cxx needs a toolchain w/ C++, threads, gcc >= 7 and dynamic library support # # BR2_PACKAGE_DBUS_GLIB is not set # BR2_PACKAGE_DBUS_TRIGGERD is not set # BR2_PACKAGE_DFU_UTIL is not set # BR2_PACKAGE_DMIDECODE is not set # BR2_PACKAGE_DMRAID is not set # BR2_PACKAGE_DT_UTILS is not set # BR2_PACKAGE_DTBOCFG is not set # BR2_PACKAGE_DTV_SCAN_TABLES is not set # BR2_PACKAGE_DUMP1090 is not set # BR2_PACKAGE_DVB_APPS is not set # BR2_PACKAGE_DVBSNOOP is not set BR2_PACKAGE_PROVIDES_UDEV="systemd" # # eudev needs eudev /dev management # # BR2_PACKAGE_EVEMU is not set # BR2_PACKAGE_EVTEST is not set # BR2_PACKAGE_FAN_CTRL is not set # BR2_PACKAGE_FCONFIG is not set BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS=y # BR2_PACKAGE_FLASHROM is not set # BR2_PACKAGE_FMTOOLS is not set # BR2_PACKAGE_FREEIPMI is not set # BR2_PACKAGE_FXLOAD is not set # BR2_PACKAGE_GPM is not set # BR2_PACKAGE_GPSD is not set # # gptfdisk needs a toolchain w/ C++ # # BR2_PACKAGE_GVFS is not set # BR2_PACKAGE_HDDTEMP is not set # BR2_PACKAGE_HDPARM is not set # BR2_PACKAGE_HWDATA is not set # BR2_PACKAGE_HWLOC is not set # BR2_PACKAGE_I2C_TOOLS is not set # BR2_PACKAGE_I7Z is not set # BR2_PACKAGE_INPUT_EVENT_DAEMON is not set # BR2_PACKAGE_INTEL_MICROCODE is not set # BR2_PACKAGE_IPMITOOL is not set # BR2_PACKAGE_IPMIUTIL is not set # BR2_PACKAGE_IRDA_UTILS is not set # BR2_PACKAGE_IUCODE_TOOL is not set # BR2_PACKAGE_KBD is not set # BR2_PACKAGE_LCDPROC is not set # # libiec61850 needs a toolchain w/ C++, threads, dynamic library # # BR2_PACKAGE_LIBMANETTE is not set # BR2_PACKAGE_LIBUBOOTENV is not set # BR2_PACKAGE_LIBUIO is not set # BR2_PACKAGE_LINUX_BACKPORTS is not set # BR2_PACKAGE_LINUX_SERIAL_TEST is not set # BR2_PACKAGE_LINUXCONSOLETOOLS is not set # # lirc-tools needs a toolchain w/ threads, dynamic library, C++ # # BR2_PACKAGE_LM_SENSORS is not set # # lshw needs a toolchain w/ C++, wchar # # BR2_PACKAGE_LSSCSI is not set # BR2_PACKAGE_LSUIO is not set # BR2_PACKAGE_LUKSMETA is not set # BR2_PACKAGE_LVM2 is not set # BR2_PACKAGE_MBPFAN is not set # BR2_PACKAGE_MDADM is not set # BR2_PACKAGE_MDEVD is not set # BR2_PACKAGE_MDIO_TOOLS is not set # BR2_PACKAGE_MEMTEST86 is not set # BR2_PACKAGE_MEMTESTER is not set # BR2_PACKAGE_MEMTOOL is not set # BR2_PACKAGE_MINICOM is not set # BR2_PACKAGE_MSR_TOOLS is not set # BR2_PACKAGE_NANOCOM is not set # BR2_PACKAGE_NEARD is not set # BR2_PACKAGE_NVIDIA_DRIVER is not set # BR2_PACKAGE_NVIDIA_MODPROBE is not set # BR2_PACKAGE_NVME is not set # BR2_PACKAGE_OFONO is not set # # ola needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8 # # BR2_PACKAGE_OPEN2300 is not set # # openfpgaloader needs a toolchain w/ threads, C++, gcc >= 4.9 # # BR2_PACKAGE_OPENIPMI is not set # BR2_PACKAGE_OPENOCD is not set # # openpowerlink needs a toolchain w/ C++, threads # # BR2_PACKAGE_PARTED is not set # BR2_PACKAGE_PCIUTILS is not set # BR2_PACKAGE_PDBG is not set # BR2_PACKAGE_PICOCOM is not set # # powertop needs a toolchain w/ C++, threads, wchar # # BR2_PACKAGE_PPS_TOOLS is not set # BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE is not set # BR2_PACKAGE_RASPI_GPIO is not set # BR2_PACKAGE_RDMA_CORE is not set # BR2_PACKAGE_READ_EDID is not set # BR2_PACKAGE_RNG_TOOLS is not set # BR2_PACKAGE_RS485CONF is not set # BR2_PACKAGE_RTC_TOOLS is not set # BR2_PACKAGE_RTL8188EU is not set # BR2_PACKAGE_RTL8189ES is not set # BR2_PACKAGE_RTL8189FS is not set # BR2_PACKAGE_RTL8192EU is not set # BR2_PACKAGE_RTL8723BU is not set # BR2_PACKAGE_RTL8723DS is not set # BR2_PACKAGE_RTL8723DS_BT is not set # BR2_PACKAGE_RTL8812AU_AIRCRACK_NG is not set # BR2_PACKAGE_RTL8821AU is not set # BR2_PACKAGE_RTL8821CU is not set # BR2_PACKAGE_SANE_BACKENDS is not set # BR2_PACKAGE_SDPARM is not set BR2_PACKAGE_SEDUTIL_ARCH_SUPPORTS=y # # sedutil needs a toolchain w/ C++, gcc >= 4.8, headers >= 3.12 # # BR2_PACKAGE_SETSERIAL is not set # BR2_PACKAGE_SG3_UTILS is not set # BR2_PACKAGE_SIGROK_CLI is not set # BR2_PACKAGE_SISPMCTL is not set # # smartmontools needs a toolchain w/ C++ # # BR2_PACKAGE_SMSTOOLS3 is not set # BR2_PACKAGE_SPI_TOOLS is not set # BR2_PACKAGE_SREDIRD is not set # BR2_PACKAGE_STATSERIAL is not set # BR2_PACKAGE_STM32FLASH is not set # BR2_PACKAGE_SYSSTAT is not set # # targetcli-fb depends on Python # # BR2_PACKAGE_TI_UIM is not set # BR2_PACKAGE_TI_UTILS is not set # BR2_PACKAGE_TIO is not set # BR2_PACKAGE_TRIGGERHAPPY is not set # BR2_PACKAGE_UBOOT_TOOLS is not set # BR2_PACKAGE_UBUS is not set # BR2_PACKAGE_UCCP420WLAN is not set BR2_PACKAGE_HAS_UDEV=y # BR2_PACKAGE_UDISKS is not set # BR2_PACKAGE_UHUBCTL is not set # BR2_PACKAGE_UMTPRD is not set # BR2_PACKAGE_UPOWER is not set # BR2_PACKAGE_USB_MODESWITCH is not set # BR2_PACKAGE_USB_MODESWITCH_DATA is not set # # usbguard needs a toolchain w/ C++, threads, dynamic library, gcc >= 8 # # BR2_PACKAGE_USBMOUNT is not set # BR2_PACKAGE_USBUTILS is not set # BR2_PACKAGE_W_SCAN is not set # BR2_PACKAGE_WILC_DRIVER is not set # BR2_PACKAGE_WIPE is not set # BR2_PACKAGE_XORRISO is not set # # Interpreter languages and scripting # # BR2_PACKAGE_4TH is not set # BR2_PACKAGE_ENSCRIPT is not set BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS=y BR2_PACKAGE_ERLANG_ARCH_SUPPORTS=y # BR2_PACKAGE_ERLANG is not set # BR2_PACKAGE_EXECLINE is not set # BR2_PACKAGE_FICL is not set BR2_PACKAGE_GAUCHE_ARCH_SUPPORTS=y # BR2_PACKAGE_GAUCHE is not set # BR2_PACKAGE_GUILE is not set # BR2_PACKAGE_HASERL is not set # BR2_PACKAGE_JANET is not set # BR2_PACKAGE_JIMTCL is not set # BR2_PACKAGE_LUA is not set BR2_PACKAGE_PROVIDES_HOST_LUAINTERPRETER="host-lua" BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS=y # BR2_PACKAGE_LUAJIT is not set # BR2_PACKAGE_MICROPYTHON is not set # BR2_PACKAGE_MOARVM is not set BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS=y BR2_PACKAGE_MONO_ARCH_SUPPORTS=y # # mono needs a toolchain w/ C++, NPTL, dynamic library # BR2_PACKAGE_NODEJS_ARCH_SUPPORTS=y # # nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 7, wchar, host gcc >= 8 # # # octave needs a toolchain w/ C++ and fortran, gcc >= 4.8 # BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS=y BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS=y # # openjdk needs X.Org # # # openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads, C++, gcc >= 4.9, host gcc >= 4.9 # # BR2_PACKAGE_PERL is not set BR2_PACKAGE_PHP_ARCH_SUPPORTS=y # BR2_PACKAGE_PHP is not set # BR2_PACKAGE_PYTHON3 is not set # BR2_PACKAGE_QUICKJS is not set # BR2_PACKAGE_RUBY is not set # BR2_PACKAGE_TCL is not set # # Libraries # # # Audio/Sound # # BR2_PACKAGE_ALSA_LIB is not set # # alure needs a toolchain w/ C++, gcc >= 4.9, NPTL, wchar # # BR2_PACKAGE_AUBIO is not set # BR2_PACKAGE_BCG729 is not set # # caps needs a toolchain w/ C++, dynamic library # BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS=y # # fdk-aac needs a toolchain w/ C++ # # BR2_PACKAGE_LIBAO is not set # # asplib needs a toolchain w/ C++ # # BR2_PACKAGE_LIBBROADVOICE is not set # BR2_PACKAGE_LIBCDAUDIO is not set # BR2_PACKAGE_LIBCDDB is not set # BR2_PACKAGE_LIBCDIO is not set # BR2_PACKAGE_LIBCDIO_PARANOIA is not set # BR2_PACKAGE_LIBCODEC2 is not set # BR2_PACKAGE_LIBCUE is not set # BR2_PACKAGE_LIBCUEFILE is not set # BR2_PACKAGE_LIBEBUR128 is not set # BR2_PACKAGE_LIBG7221 is not set # BR2_PACKAGE_LIBGSM is not set # BR2_PACKAGE_LIBID3TAG is not set # BR2_PACKAGE_LIBILBC is not set # BR2_PACKAGE_LIBLO is not set # BR2_PACKAGE_LIBMAD is not set # # libmodplug needs a toolchain w/ C++ # # BR2_PACKAGE_LIBMPD is not set # BR2_PACKAGE_LIBMPDCLIENT is not set # BR2_PACKAGE_LIBREPLAYGAIN is not set # BR2_PACKAGE_LIBSAMPLERATE is not set # # libsidplay2 needs a toolchain w/ C++ # # BR2_PACKAGE_LIBSILK is not set # BR2_PACKAGE_LIBSNDFILE is not set # # libsoundtouch needs a toolchain w/ C++ # # BR2_PACKAGE_LIBSOXR is not set # BR2_PACKAGE_LIBVORBIS is not set # BR2_PACKAGE_LILV is not set # BR2_PACKAGE_LV2 is not set # # mp4v2 needs a toolchain w/ C++ # BR2_PACKAGE_OPENAL_ARCH_SUPPORTS=y # # openal needs a toolchain w/ NPTL, C++, gcc >= 4.9 # # # opencore-amr needs a toolchain w/ C++ # # BR2_PACKAGE_OPUS is not set # BR2_PACKAGE_OPUSFILE is not set # BR2_PACKAGE_PORTAUDIO is not set # BR2_PACKAGE_SBC is not set # BR2_PACKAGE_SPANDSP is not set # BR2_PACKAGE_SPEEX is not set # BR2_PACKAGE_SPEEXDSP is not set # BR2_PACKAGE_SRATOM is not set # # taglib needs a toolchain w/ C++, wchar # # BR2_PACKAGE_TINYALSA is not set # BR2_PACKAGE_TREMOR is not set # BR2_PACKAGE_VO_AACENC is not set BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS=y # # webrtc-audio-processing needs a toolchain w/ C++, NPTL, gcc >= 4.8 # # # Compression and decompression # # BR2_PACKAGE_LIBARCHIVE is not set # BR2_PACKAGE_LIBDEFLATE is not set # BR2_PACKAGE_LIBMSPACK is not set # # libsquish needs a toolchain w/ C++ # # BR2_PACKAGE_LIBZIP is not set # BR2_PACKAGE_LZ4 is not set # BR2_PACKAGE_LZO is not set # BR2_PACKAGE_MINIZIP is not set # BR2_PACKAGE_MINIZIP_ZLIB is not set # # snappy needs a toolchain w/ C++ # # BR2_PACKAGE_SZIP is not set # BR2_PACKAGE_ZCHUNK is not set BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS=y # BR2_PACKAGE_ZLIB is not set BR2_PACKAGE_PROVIDES_HOST_ZLIB="host-libzlib" # BR2_PACKAGE_ZZIPLIB is not set # # Crypto # # BR2_PACKAGE_BEARSSL is not set # BR2_PACKAGE_BEECRYPT is not set BR2_PACKAGE_BOTAN_ARCH_SUPPORTS=y # # botan needs a toolchain w/ C++, threads, gcc >= 4.8 # # BR2_PACKAGE_CA_CERTIFICATES is not set # BR2_PACKAGE_CRYPTODEV is not set # # cryptopp needs a toolchain w/ C++, dynamic library, wchar # # BR2_PACKAGE_GCR is not set # BR2_PACKAGE_GNUTLS is not set # BR2_PACKAGE_LIBARGON2 is not set # BR2_PACKAGE_LIBASSUAN is not set # BR2_PACKAGE_LIBB2 is not set # BR2_PACKAGE_LIBGCRYPT is not set BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBGPG_ERROR is not set BR2_PACKAGE_LIBGPG_ERROR_SYSCFG="x86_64-unknown-linux-gnu" # BR2_PACKAGE_LIBGPGME is not set # BR2_PACKAGE_LIBKCAPI is not set # BR2_PACKAGE_LIBKSBA is not set # BR2_PACKAGE_LIBMD is not set # BR2_PACKAGE_LIBMHASH is not set # BR2_PACKAGE_LIBNSS is not set # # libolm needs a toolchain w/ C++, gcc >= 4.8 # # BR2_PACKAGE_LIBP11 is not set # BR2_PACKAGE_LIBSCRYPT is not set # BR2_PACKAGE_LIBSECRET is not set # BR2_PACKAGE_LIBSHA1 is not set # BR2_PACKAGE_LIBSODIUM is not set # BR2_PACKAGE_LIBSSH is not set # BR2_PACKAGE_LIBSSH2 is not set # BR2_PACKAGE_LIBTOMCRYPT is not set # BR2_PACKAGE_LIBUECC is not set # BR2_PACKAGE_LIBXCRYPT is not set # BR2_PACKAGE_MBEDTLS is not set # BR2_PACKAGE_NETTLE is not set # BR2_PACKAGE_OPENSSL is not set BR2_PACKAGE_PROVIDES_HOST_OPENSSL="host-libopenssl" # BR2_PACKAGE_PKCS11_HELPER is not set # BR2_PACKAGE_RHASH is not set # BR2_PACKAGE_TINYDTLS is not set # BR2_PACKAGE_TPM2_PKCS11 is not set # BR2_PACKAGE_TPM2_TSS is not set # BR2_PACKAGE_TROUSERS is not set # BR2_PACKAGE_USTREAM_SSL is not set # BR2_PACKAGE_WOLFSSL is not set # BR2_PACKAGE_WOLFTPM is not set # # Database # # BR2_PACKAGE_BERKELEYDB is not set # BR2_PACKAGE_GDBM is not set # BR2_PACKAGE_HIREDIS is not set # # kompexsqlite needs a toolchain w/ C++, wchar, threads, dynamic library # # # leveldb needs a toolchain w/ C++, threads, gcc >= 4.8 # # BR2_PACKAGE_LIBDBI is not set # BR2_PACKAGE_LIBDBI_DRIVERS is not set # BR2_PACKAGE_LIBGIT2 is not set # BR2_PACKAGE_LIBMDBX is not set # # libodb needs a toolchain w/ C++, threads # BR2_PACKAGE_MONGODB_ARCH_SUPPORTS=y # # mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 7 # # # mysql needs a toolchain w/ C++, threads # # BR2_PACKAGE_POSTGRESQL is not set # BR2_PACKAGE_REDIS is not set BR2_PACKAGE_ROCKSDB_ARCH_SUPPORTS=y # # rocksdb needs a toolchain w/ C++, threads, wchar, gcc >= 4.8 # # BR2_PACKAGE_SQLCIPHER is not set # BR2_PACKAGE_SQLITE is not set # BR2_PACKAGE_UNIXODBC is not set # # Filesystem # # BR2_PACKAGE_GAMIN is not set # BR2_PACKAGE_LIBCONFIG is not set # BR2_PACKAGE_LIBCONFUSE is not set # BR2_PACKAGE_LIBFUSE is not set # BR2_PACKAGE_LIBFUSE3 is not set # BR2_PACKAGE_LIBLOCKFILE is not set # BR2_PACKAGE_LIBNFS is not set # BR2_PACKAGE_LIBSYSFS is not set # BR2_PACKAGE_LOCKDEV is not set # # physfs needs a toolchain w/ C++, threads # # # Graphics # # # assimp needs a toolchain w/ C++, wchar # # # at-spi2-atk depends on X.org # # # at-spi2-core depends on X.org # # BR2_PACKAGE_ATK is not set # # atkmm needs a toolchain w/ C++, wchar, threads, gcc >= 7 # # # bullet needs a toolchain w/ C++, dynamic library, threads, wchar # # BR2_PACKAGE_CAIRO is not set # # cairomm needs a toolchain w/ C++, wchar, threads, gcc >= 7 # # # chipmunk needs an OpenGL backend # # # exempi needs a toolchain w/ C++, dynamic library, threads, wchar # # # exiv2 needs a uClibc or glibc toolchain w/ C++, wchar, dynamic library, threads # # BR2_PACKAGE_FONTCONFIG is not set # BR2_PACKAGE_FREETYPE is not set # BR2_PACKAGE_GD is not set # BR2_PACKAGE_GDK_PIXBUF is not set # BR2_PACKAGE_GIFLIB is not set # # granite needs libgtk3 and a toolchain w/ wchar, threads, gcc >= 4.9 # # # graphite2 needs a toolchain w/ C++ # # # gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 7 # # # harfbuzz needs a toolchain w/ C++, gcc >= 4.9 # # BR2_PACKAGE_IJS is not set # BR2_PACKAGE_IMLIB2 is not set # # intel-gmmlib needs a toolchain w/ dynamic library, C++ # # # intel-mediadriver needs a toolchain w/ dynamic library, C++, NPTL # # # intel-mediasdk needs a toolchain w/ dynamic library, C++, NPTL # # # irrlicht needs a toolchain w/ C++ # # BR2_PACKAGE_JASPER is not set # BR2_PACKAGE_JBIG2DEC is not set BR2_PACKAGE_JPEG_SIMD_SUPPORT=y # BR2_PACKAGE_JPEG is not set # # kms++ needs a toolchain w/ threads, C++, gcc >= 4.8, headers >= 4.11, wchar # # BR2_PACKAGE_LCMS2 is not set # # lensfun needs a toolchain w/ C++, threads, wchar # # BR2_PACKAGE_LEPTONICA is not set # BR2_PACKAGE_LIBART is not set # BR2_PACKAGE_LIBDMTX is not set # BR2_PACKAGE_LIBDRM is not set # # libepoxy needs an OpenGL and/or OpenGL EGL backend # # BR2_PACKAGE_LIBEXIF is not set # # libfm needs X.org and a toolchain w/ wchar, threads, C++, gcc >= 4.9 # # BR2_PACKAGE_LIBFM_EXTRA is not set # # libfreeglut depends on X.org and needs an OpenGL backend # # # libfreeimage needs a toolchain w/ C++, dynamic library, wchar # # # libgeotiff needs a toolchain w/ C++, gcc >= 4.7, threads, wchar # # # libglew depends on X.org and needs an OpenGL backend # # # libglfw depends on X.org or Wayland and an OpenGL or GLES backend # # # libglu needs an OpenGL backend # # BR2_PACKAGE_LIBGTA is not set # # libgtk3 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9 # # # libgtk3 needs an OpenGL or an OpenGL-EGL/wayland backend # # # libjxl needs a toolchain with C++, threads, gcc >= 7, dynamic library # # BR2_PACKAGE_LIBMEDIAART is not set # BR2_PACKAGE_LIBMNG is not set # BR2_PACKAGE_LIBPNG is not set # BR2_PACKAGE_LIBQRENCODE is not set # # libraw needs a toolchain w/ C++ # # # librsvg needs a toolchain w/ wchar, threads, C++, gcc >= 4.9 # # BR2_PACKAGE_LIBSVG is not set # BR2_PACKAGE_LIBSVG_CAIRO is not set # BR2_PACKAGE_LIBSVGTINY is not set # BR2_PACKAGE_LIBVA is not set # BR2_PACKAGE_LIBVA_INTEL_DRIVER is not set # # libvips needs a toolchain w/ wchar, threads, C++ # # # libwpe needs a toolchain w/ C++, dynamic library and an OpenEGL-capable backend # # BR2_PACKAGE_MENU_CACHE is not set # # opencv3 needs a toolchain w/ C++, NPTL, wchar, dynamic library # # # opencv4 needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 4.8 # # BR2_PACKAGE_OPENJPEG is not set # # pango needs a toolchain w/ wchar, threads, C++, gcc >= 4.9 # # # pangomm needs a toolchain w/ C++, wchar, threads, gcc >= 7 # # BR2_PACKAGE_PIXMAN is not set # # poppler needs a toolchain w/ wchar, C++, threads, dynamic library, gcc >= 7 # # BR2_PACKAGE_STB is not set # BR2_PACKAGE_TIFF is not set # BR2_PACKAGE_WAYLAND is not set BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS=y # # webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9 # # BR2_PACKAGE_WEBP is not set # # wlroots needs udev, EGL w/ Wayland backend and OpenGL ES support # # # woff2 needs a toolchain w/ C++ # # # wpebackend-fdo needs a toolchain w/ C++, wchar, threads, dynamic library and an OpenEGL-capable Wayland backend # BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS=y # # wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9 # # # wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend # # # zbar needs a toolchain w/ threads, C++ and headers >= 3.0 # # # zxing-cpp needs a toolchain w/ C++, wchar, dynamic library # # # Hardware handling # # BR2_PACKAGE_ACSCCID is not set # BR2_PACKAGE_C_PERIPHERY is not set # BR2_PACKAGE_CCID is not set # BR2_PACKAGE_DTC is not set BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS=y # BR2_PACKAGE_GNU_EFI is not set # BR2_PACKAGE_HACKRF is not set # BR2_PACKAGE_HIDAPI is not set # BR2_PACKAGE_JITTERENTROPY_LIBRARY is not set # # lcdapi needs a toolchain w/ C++, threads # # # let-me-create needs a toolchain w/ C++, threads, dynamic library # # BR2_PACKAGE_LIBAIO is not set # BR2_PACKAGE_LIBATASMART is not set # BR2_PACKAGE_LIBBLOCKDEV is not set # # libcec needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.7 # # BR2_PACKAGE_LIBFREEFARE is not set # BR2_PACKAGE_LIBFTDI is not set # BR2_PACKAGE_LIBFTDI1 is not set # BR2_PACKAGE_LIBGPHOTO2 is not set # BR2_PACKAGE_LIBGPIOD is not set # BR2_PACKAGE_LIBGUDEV is not set # BR2_PACKAGE_LIBHID is not set # BR2_PACKAGE_LIBIIO is not set # BR2_PACKAGE_LIBINPUT is not set # BR2_PACKAGE_LIBIQRF is not set # BR2_PACKAGE_LIBLLCP is not set # BR2_PACKAGE_LIBMBIM is not set # BR2_PACKAGE_LIBNFC is not set # BR2_PACKAGE_LIBPCIACCESS is not set # BR2_PACKAGE_LIBPHIDGET is not set # BR2_PACKAGE_LIBPRI is not set # BR2_PACKAGE_LIBQMI is not set # BR2_PACKAGE_LIBQRTR_GLIB is not set # BR2_PACKAGE_LIBRAW1394 is not set # BR2_PACKAGE_LIBRTLSDR is not set # # libserial needs a toolchain w/ C++, gcc >= 5, threads, wchar # # BR2_PACKAGE_LIBSERIALPORT is not set # BR2_PACKAGE_LIBSIGROK is not set # BR2_PACKAGE_LIBSIGROKDECODE is not set # BR2_PACKAGE_LIBSOC is not set # BR2_PACKAGE_LIBSS7 is not set # BR2_PACKAGE_LIBUSB is not set # BR2_PACKAGE_LIBUSBGX is not set # # libv4l needs a toolchain w/ threads, C++ and headers >= 3.0 # # BR2_PACKAGE_LIBXKBCOMMON is not set BR2_PACKAGE_MRAA_ARCH_SUPPORTS=y # BR2_PACKAGE_MRAA is not set # BR2_PACKAGE_MTDEV is not set # BR2_PACKAGE_NEARDAL is not set # BR2_PACKAGE_OPENSC is not set # BR2_PACKAGE_OWFS is not set # BR2_PACKAGE_PCSC_LITE is not set # BR2_PACKAGE_TSLIB is not set # # uhd needs a toolchain w/ C++, NPTL, wchar, dynamic library # # # urg needs a toolchain w/ C++ # # # Javascript # # BR2_PACKAGE_ANGULARJS is not set # BR2_PACKAGE_BOOTSTRAP is not set # BR2_PACKAGE_CHARTJS is not set # BR2_PACKAGE_DATATABLES is not set # BR2_PACKAGE_DUKTAPE is not set # BR2_PACKAGE_EXPLORERCANVAS is not set # BR2_PACKAGE_FLOT is not set # BR2_PACKAGE_FORGE is not set # BR2_PACKAGE_JQUERY is not set # BR2_PACKAGE_JSMIN is not set # BR2_PACKAGE_JSON_JAVASCRIPT is not set # BR2_PACKAGE_JSZIP is not set # BR2_PACKAGE_OPENLAYERS is not set # BR2_PACKAGE_POPPERJS is not set # BR2_PACKAGE_VIS_NETWORK is not set # BR2_PACKAGE_VUEJS is not set # # JSON/XML # # # benejson needs a toolchain w/ C++ # # BR2_PACKAGE_CJSON is not set BR2_PACKAGE_EXPAT=y # BR2_PACKAGE_JANSSON is not set # BR2_PACKAGE_JOSE is not set # BR2_PACKAGE_JSMN is not set # BR2_PACKAGE_JSON_C is not set # # json-for-modern-cpp needs a toolchain w/ C++, gcc >= 4.9 # # BR2_PACKAGE_JSON_GLIB is not set # # jsoncpp needs a toolchain w/ C++, gcc >= 4.7 # # BR2_PACKAGE_LIBBSON is not set # BR2_PACKAGE_LIBFASTJSON is not set # # libjson needs a toolchain w/ C++ # # BR2_PACKAGE_LIBROXML is not set # BR2_PACKAGE_LIBUCL is not set # BR2_PACKAGE_LIBXML2 is not set # # libxml++ needs a toolchain w/ C++, wchar, threads, gcc >= 7 # # BR2_PACKAGE_LIBXMLRPC is not set # BR2_PACKAGE_LIBXSLT is not set # BR2_PACKAGE_LIBYAML is not set # BR2_PACKAGE_MXML is not set # # pugixml needs a toolchain w/ C++ # # # rapidjson needs a toolchain w/ C++ # # BR2_PACKAGE_RAPIDXML is not set # BR2_PACKAGE_RAPTOR is not set # BR2_PACKAGE_SERD is not set # BR2_PACKAGE_SORD is not set # # tinyxml needs a toolchain w/ C++ # # # tinyxml2 needs a toolchain w/ C++ # # # valijson needs a toolchain w/ C++ # # # xerces-c++ needs a toolchain w/ C++, dynamic library, wchar # # # xml-security-c needs a toolchain w/ C++, wchar, dynamic library, threads, gcc >= 4.7 # # BR2_PACKAGE_YAJL is not set # # yaml-cpp needs a toolchain w/ C++, gcc >= 4.7 # # # Logging # # # glog needs a toolchain w/ C++ # # # hawktracer needs a toolchain w/ C++, gcc >= 4.8 # # BR2_PACKAGE_LIBLOG4C_LOCALTIME is not set # BR2_PACKAGE_LIBLOGGING is not set # # log4cplus needs a toolchain w/ C++, wchar, threads, gcc >= 4.8 # # # log4cpp needs a toolchain w/ C++, threads # # # log4cxx needs a toolchain w/ C++, threads, dynamic library # # # log4qt needs qt5 # # # opentracing-cpp needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8 # # # spdlog needs a toolchain w/ C++, threads, wchar # # # ulog needs a toolchain w/ C++, threads # # BR2_PACKAGE_ZLOG is not set # # Multimedia # # # bento4 support needs a toolchain with C++ # # BR2_PACKAGE_BITSTREAM is not set # BR2_PACKAGE_DAV1D is not set # # kvazaar needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBAACS is not set # # libass needs a toolchain w/ C++, gcc >= 4.9 # # BR2_PACKAGE_LIBBDPLUS is not set # BR2_PACKAGE_LIBBLURAY is not set BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS=y # # libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8 # # # libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8 # # BR2_PACKAGE_LIBDVBCSA is not set # BR2_PACKAGE_LIBDVBPSI is not set # # libdvbsi++ needs a toolchain w/ C++, wchar, threads # # BR2_PACKAGE_LIBDVDCSS is not set # BR2_PACKAGE_LIBDVDNAV is not set # BR2_PACKAGE_LIBDVDREAD is not set # # libebml needs a toolchain w/ C++, wchar # # BR2_PACKAGE_LIBHDHOMERUN is not set # # libmatroska needs a toolchain w/ C++, wchar # # BR2_PACKAGE_LIBMMS is not set # BR2_PACKAGE_LIBMPEG2 is not set # BR2_PACKAGE_LIBOGG is not set # BR2_PACKAGE_LIBOPENAPTX is not set BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS=y # # libopenh264 needs a toolchain w/ C++, dynamic library, threads # # BR2_PACKAGE_LIBOPUSENC is not set # BR2_PACKAGE_LIBTHEORA is not set # BR2_PACKAGE_LIBUDFREAD is not set # BR2_PACKAGE_LIBVPX is not set # # libyuv needs a toolchain w/ C++, dynamic library # # # live555 needs a toolchain w/ C++ # # # mediastreamer needs a toolchain w/ threads, C++, dynamic library, gcc >= 5 # # BR2_PACKAGE_X264 is not set # # x265 needs a toolchain w/ C++, threads, dynamic library # # # Networking # # # agent++ needs a toolchain w/ threads, C++, dynamic library # # # azmq needs a toolchain w/ C++11, wchar and threads # # # azure-iot-sdk-c needs a toolchain w/ C++, NPTL and wchar # # BR2_PACKAGE_BATMAN_ADV is not set # # belle-sip needs a toolchain w/ threads, C++, dynamic library, wchar # # BR2_PACKAGE_C_ARES is not set # BR2_PACKAGE_CGIC is not set # BR2_PACKAGE_CNI_PLUGINS is not set # # cppzmq needs a toolchain w/ C++, threads # # # curlpp needs a toolchain w/ C++, dynamic library # # # czmq needs a toolchain w/ C++, threads # # BR2_PACKAGE_DAQ is not set # BR2_PACKAGE_DAQ3 is not set # BR2_PACKAGE_DAVICI is not set # BR2_PACKAGE_DHT is not set # BR2_PACKAGE_ENET is not set # # filemq needs a toolchain w/ C++, threads # # BR2_PACKAGE_FLICKCURL is not set # BR2_PACKAGE_FREERADIUS_CLIENT is not set # BR2_PACKAGE_GENSIO is not set # BR2_PACKAGE_GEOIP is not set # BR2_PACKAGE_GLIB_NETWORKING is not set # # grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 5 # # BR2_PACKAGE_GSSDP is not set # BR2_PACKAGE_GUPNP is not set # BR2_PACKAGE_GUPNP_AV is not set # BR2_PACKAGE_GUPNP_DLNA is not set # # ibrcommon needs a toolchain w/ C++, threads # # # ibrdtn needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBCGI is not set # # libcgicc needs a toolchain w/ C++ # # BR2_PACKAGE_LIBCOAP is not set # # libcpprestsdk needs a toolchain w/ NPTL, C++, wchar, locale # # BR2_PACKAGE_LIBCURL is not set # BR2_PACKAGE_LIBDNET is not set # BR2_PACKAGE_LIBEXOSIP2 is not set # BR2_PACKAGE_LIBEST is not set # BR2_PACKAGE_LIBFCGI is not set # BR2_PACKAGE_LIBGSASL is not set # BR2_PACKAGE_LIBHTP is not set # BR2_PACKAGE_LIBHTTPPARSER is not set # # libhttpserver needs a toolchain w/ C++, threads, gcc >= 5 # # BR2_PACKAGE_LIBIDN is not set # BR2_PACKAGE_LIBIDN2 is not set # BR2_PACKAGE_LIBISCSI is not set # BR2_PACKAGE_LIBKRB5 is not set # BR2_PACKAGE_LIBLDNS is not set # BR2_PACKAGE_LIBMAXMINDDB is not set # BR2_PACKAGE_LIBMBUS is not set # # libmemcached needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBMICROHTTPD is not set # BR2_PACKAGE_LIBMINIUPNPC is not set # BR2_PACKAGE_LIBMNL is not set # BR2_PACKAGE_LIBMODBUS is not set # # libmodsecurity needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBNATPMP is not set # BR2_PACKAGE_LIBNDP is not set # BR2_PACKAGE_LIBNET is not set # BR2_PACKAGE_LIBNETCONF2 is not set # BR2_PACKAGE_LIBNETFILTER_ACCT is not set # BR2_PACKAGE_LIBNETFILTER_CONNTRACK is not set # BR2_PACKAGE_LIBNETFILTER_CTHELPER is not set # BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT is not set # BR2_PACKAGE_LIBNETFILTER_LOG is not set # BR2_PACKAGE_LIBNETFILTER_QUEUE is not set # BR2_PACKAGE_LIBNFNETLINK is not set # BR2_PACKAGE_LIBNFTNL is not set # BR2_PACKAGE_LIBNICE is not set # BR2_PACKAGE_LIBNIDS is not set # BR2_PACKAGE_LIBNL is not set # # libnpupnp needs a toolchain w/ C++, threads, gcc >= 4.9 # # BR2_PACKAGE_LIBOAUTH is not set # BR2_PACKAGE_LIBOPING is not set # BR2_PACKAGE_LIBOSIP2 is not set # BR2_PACKAGE_LIBPAGEKITE is not set # BR2_PACKAGE_LIBPCAP is not set # # libpjsip needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBPSL is not set # BR2_PACKAGE_LIBRELP is not set # BR2_PACKAGE_LIBRSYNC is not set # BR2_PACKAGE_LIBSHAIRPLAY is not set # BR2_PACKAGE_LIBSHOUT is not set # BR2_PACKAGE_LIBSOCKETCAN is not set # BR2_PACKAGE_LIBSOUP is not set # BR2_PACKAGE_LIBSRTP is not set # BR2_PACKAGE_LIBSTROPHE is not set # BR2_PACKAGE_LIBTEAM is not set # BR2_PACKAGE_LIBTELNET is not set # BR2_PACKAGE_LIBTIRPC is not set # # libtorrent needs a toolchain w/ C++, threads # # # libtorrent-rasterbar needs a toolchain w/ C++, threads, wchar, gcc >= 4.9 # # BR2_PACKAGE_LIBUEV is not set # BR2_PACKAGE_LIBUHTTPD is not set # # libuhttpd needs a toolchain w/ gcc >= 4.9 # # BR2_PACKAGE_LIBUPNP is not set # # libupnpp needs a toolchain w/ C++, threads, gcc >= 4.9 # # BR2_PACKAGE_LIBURIPARSER is not set # # libutp support needs a toolchain with C++ # # BR2_PACKAGE_LIBUWSC is not set # BR2_PACKAGE_LIBVNCSERVER is not set # BR2_PACKAGE_LIBWEBSOCK is not set # BR2_PACKAGE_LIBWEBSOCKETS is not set # BR2_PACKAGE_LIBYANG is not set # BR2_PACKAGE_LKSCTP_TOOLS is not set # BR2_PACKAGE_MBUFFER is not set # BR2_PACKAGE_MONGOOSE is not set # BR2_PACKAGE_NANOMSG is not set # BR2_PACKAGE_NEON is not set # # netopeer2 needs a toolchain w/ gcc >= 4.8, C++, threads, dynamic library # # BR2_PACKAGE_NGHTTP2 is not set # # norm needs a toolchain w/ C++, threads, dynamic library # # BR2_PACKAGE_NSS_PAM_LDAPD is not set # # omniORB needs a toolchain w/ C++, threads # # BR2_PACKAGE_OPEN_ISNS is not set # BR2_PACKAGE_OPEN62541 is not set # BR2_PACKAGE_OPENLDAP is not set # # openmpi needs a toolchain w/ dynamic library, NPTL, wchar, C++ # # BR2_PACKAGE_OPENPGM is not set # # openzwave needs a toolchain w/ C++, dynamic library, NPTL, wchar # # # ortp needs a toolchain w/ C++, threads # # BR2_PACKAGE_PAHO_MQTT_C is not set # # paho-mqtt-cpp needs a toolchain w/ threads, C++ # # # pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597 # # BR2_PACKAGE_QDECODER is not set # # qpid-proton needs a toolchain w/ C++, dynamic library, threads # # BR2_PACKAGE_RABBITMQ_C is not set # # resiprocate needs a toolchain w/ C++, threads, wchar # # # restclient-cpp needs a toolchain w/ C++, gcc >= 4.8 # # BR2_PACKAGE_RTMPDUMP is not set # BR2_PACKAGE_SIPROXD is not set # BR2_PACKAGE_SLIRP is not set # BR2_PACKAGE_SLIRP4NETNS is not set # # snmp++ needs a toolchain w/ threads, C++, dynamic library # # BR2_PACKAGE_SOFIA_SIP is not set # BR2_PACKAGE_SSCEP is not set # # sysrepo needs a toolchain w/ C++, NPTL, dynamic library, gcc >= 4.8 # # # thrift needs a toolchain w/ C++, wchar, threads # # BR2_PACKAGE_USBREDIR is not set # # wampcc needs a toolchain w/ C++, NPTL, dynamic library # # # websocketpp needs a toolchain w/ C++ and gcc >= 4.8 # # # zeromq needs a toolchain w/ C++, threads # # # zmqpp needs a toolchain w/ C++, threads, gcc >= 4.7 # # # zyre needs a toolchain w/ C++, threads # # # Other # # # ACE needs a glibc toolchain, dynamic library, C++, gcc >= 4.8 # # BR2_PACKAGE_APR is not set # BR2_PACKAGE_APR_UTIL is not set # # armadillo needs a toolchain w/ fortran, C++ # # # atf needs a toolchain w/ C++ # # BR2_PACKAGE_AVRO_C is not set # # bctoolbox needs a toolchain w/ C++, threads # # BR2_PACKAGE_BDWGC is not set # # belr needs a toolchain w/ threads, C++ # # # boost needs a toolchain w/ C++, threads, wchar # # # c-capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic, ucontext and not gcc bug 64735 # # # capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic, ucontext and not gcc bug 64735 # # # catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 5 # # # cctz needs a toolchain w/ C++, threads, gcc >= 4.8 # # # cereal needs a toolchain w/ C++, gcc >= 4.7, threads, wchar # # # clang needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5 # # BR2_PACKAGE_CMOCKA is not set # # cppcms needs a toolchain w/ C++, NPTL, wchar, dynamic library # # BR2_PACKAGE_CRACKLIB is not set # # dawgdic needs a toolchain w/ C++, gcc >= 4.6 # # BR2_PACKAGE_DING_LIBS is not set # BR2_PACKAGE_DOTCONF is not set # # double-conversion needs a toolchain w/ C++ # # # eigen needs a toolchain w/ C++ # # BR2_PACKAGE_ELFUTILS is not set # BR2_PACKAGE_ELL is not set # BR2_PACKAGE_FFTW is not set # # flann needs a toolchain w/ C++, dynamic library # # # flatbuffers needs a toolchain w/ C++, gcc >= 4.7 # # BR2_PACKAGE_FLATCC is not set # BR2_PACKAGE_FXDIV is not set # BR2_PACKAGE_GCONF is not set # # gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar # # # gflags needs a toolchain w/ C++ # # # gli needs a toolchain w/ C++ # # # glibmm needs a toolchain w/ C++, wchar, threads, gcc >= 7 # # # glm needs a toolchain w/ C++ # # BR2_PACKAGE_GMP is not set BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS=y # # gobject-introspection needs python3 # # BR2_PACKAGE_GSL is not set # # gtest needs a toolchain w/ C++, wchar, threads, gcc >= 5 # # BR2_PACKAGE_GUMBO_PARSER is not set # # highway needs a toolchain w/ C++, gcc >= 7 # BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS=y # BR2_PACKAGE_JEMALLOC is not set BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y # # lapack/blas needs a toolchain w/ fortran # BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y # # libabseil-cpp needs a toolchain w/ gcc >= 4.9, C++, threads, dynamic library # # BR2_PACKAGE_LIBARGTABLE2 is not set BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBATOMIC_OPS is not set # BR2_PACKAGE_LIBAVL is not set # BR2_PACKAGE_LIBB64 is not set # BR2_PACKAGE_LIBBACKTRACE is not set BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBBSD is not set # BR2_PACKAGE_LIBBYTESIZE is not set BR2_PACKAGE_LIBCAP=y # BR2_PACKAGE_LIBCAP_TOOLS is not set # BR2_PACKAGE_LIBCAP_NG is not set # # libcgroup needs a glibc toolchain w/ C++ # # BR2_PACKAGE_LIBCLC is not set # BR2_PACKAGE_LIBCORRECT is not set # # libcrossguid needs a toolchain w/ C++, gcc >= 4.7 # # BR2_PACKAGE_LIBCSV is not set # BR2_PACKAGE_LIBDAEMON is not set # BR2_PACKAGE_LIBDILL is not set BR2_PACKAGE_LIBEASTL_ARCH_SUPPORTS=y # # libeastl needs a toolchain w/ C++, threads, gcc >= 4.9 # # BR2_PACKAGE_LIBEE is not set # BR2_PACKAGE_LIBEV is not set # BR2_PACKAGE_LIBEVDEV is not set # BR2_PACKAGE_LIBEVENT is not set # # libexecinfo needs a musl or uclibc toolchain w/ dynamic library # # BR2_PACKAGE_LIBFFI is not set # # libfutils needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBGEE is not set # # libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 27597 # # BR2_PACKAGE_LIBGLIB2 is not set # BR2_PACKAGE_LIBGLOB is not set # # libical needs a toolchain w/ C++, dynamic library, wchar # # BR2_PACKAGE_LIBITE is not set # # libks needs a toolchain w/ C++, NPTL, dynamic library # # # liblinear needs a toolchain w/ C++ # # # libloki needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBNPTH is not set BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT=y # BR2_PACKAGE_LIBNSPR is not set # # libosmium needs a toolchain w/ C++, wchar, threads, gcc >= 4.7 # # # libpeas needs python3 # # BR2_PACKAGE_LIBPFM4 is not set # # libplist needs a toolchain w/ C++, threads # # BR2_PACKAGE_LIBPTHREAD_STUBS is not set # BR2_PACKAGE_LIBPTHSEM is not set # BR2_PACKAGE_LIBPWQUALITY is not set # BR2_PACKAGE_LIBQB is not set BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBSECCOMP is not set # # libshdata needs a toolchain w/ C++, threads # # # libsigc++ needs a toolchain w/ C++, gcc >= 7 # BR2_PACKAGE_LIBSIGSEGV_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBSIGSEGV is not set # BR2_PACKAGE_LIBSOLV is not set # # libspatialindex needs a toolchain w/ C++, gcc >= 4.7 # # BR2_PACKAGE_LIBTALLOC is not set # BR2_PACKAGE_LIBTASN1 is not set # BR2_PACKAGE_LIBTOMMATH is not set # BR2_PACKAGE_LIBTPL is not set # BR2_PACKAGE_LIBUBOX is not set # BR2_PACKAGE_LIBUCI is not set BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBUNWIND is not set BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBURCU is not set # BR2_PACKAGE_LIBURING is not set # BR2_PACKAGE_LIBUV is not set # BR2_PACKAGE_LIGHTNING is not set BR2_PACKAGE_LINUX_PAM=y # # linux-pam plugins # # BR2_PACKAGE_LIBPAM_NFC is not set # BR2_PACKAGE_LIBPAM_RADIUS_AUTH is not set # BR2_PACKAGE_LIBPAM_TACPLUS is not set # BR2_PACKAGE_LIQUID_DSP is not set BR2_PACKAGE_LLVM_ARCH_SUPPORTS=y BR2_PACKAGE_LLVM_TARGET_ARCH="X86" # # llvm needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5 # # BR2_PACKAGE_LTTNG_LIBUST is not set # BR2_PACKAGE_MATIO is not set # BR2_PACKAGE_MPC is not set # BR2_PACKAGE_MPDECIMAL is not set # BR2_PACKAGE_MPFR is not set # BR2_PACKAGE_MPIR is not set # # msgpack needs a toolchain w/ C++ # # BR2_PACKAGE_NEON_2_SSE is not set # BR2_PACKAGE_ORC is not set # BR2_PACKAGE_P11_KIT is not set BR2_PACKAGE_POCO_ARCH_SUPPORTS=y # # poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w/ C++14 # BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS=y BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS=y # # protobuf needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8 # # # protobuf-c needs a toolchain w/ C++, threads # # # protozero needs a toolchain w/ C++, gcc >= 4.7 # # # qhull needs a toolchain w/ C++, gcc >= 4.4 # # BR2_PACKAGE_QLIBC is not set # BR2_PACKAGE_REPROC is not set # # riemann-c-client needs a toolchain w/ C++, threads # # # shapelib needs a toolchain w/ C++, threads # # BR2_PACKAGE_SKALIBS is not set # BR2_PACKAGE_SPHINXBASE is not set # # tbb needs a glibc or musl toolchain w/ dynamic library, threads, C++ # # BR2_PACKAGE_TINYCBOR is not set # # tl-expected needs a toolchain w/ C++, gcc >= 4.8 # BR2_PACKAGE_TZDATA=y # # uvw needs a toolchain w/ NPTL, dynamic library, C++, gcc >= 7 # # # volk needs a toolchain w/ C++, NPTL, wchar, dynamic library # # # xapian needs a toolchain w/ C++ # # # Security # # BR2_PACKAGE_LIBAPPARMOR is not set # BR2_PACKAGE_LIBSELINUX is not set # BR2_PACKAGE_LIBSEMANAGE is not set # BR2_PACKAGE_LIBSEPOL is not set # BR2_PACKAGE_SAFECLIB is not set # # softhsm2 needs a toolchain w/ C++, threads, gcc >= 4.8 and dynamic library support # # # Text and terminal handling # # BR2_PACKAGE_AUGEAS is not set # # cli11 needs a toolchain w/ C++, gcc >= 4.8 # # # docopt-cpp needs a toolchain w/ C++, gcc >= 4.7 # # # enchant needs a toolchain w/ C++, threads, wchar # # # fmt needs a toolchain w/ C++, wchar # # BR2_PACKAGE_FSTRCMP is not set # # icu needs a toolchain w/ C++, wchar, threads, gcc >= 4.9, host gcc >= 4.9 # # BR2_PACKAGE_INIH is not set # BR2_PACKAGE_LIBCLI is not set # BR2_PACKAGE_LIBEDIT is not set # BR2_PACKAGE_LIBENCA is not set # BR2_PACKAGE_LIBESTR is not set # BR2_PACKAGE_LIBFRIBIDI is not set # BR2_PACKAGE_LIBUNIBREAK is not set # BR2_PACKAGE_LIBUNISTRING is not set # BR2_PACKAGE_LINENOISE is not set # BR2_PACKAGE_NCURSES is not set # BR2_PACKAGE_NEWT is not set # BR2_PACKAGE_ONIGURUMA is not set # BR2_PACKAGE_PCRE is not set # BR2_PACKAGE_PCRE2 is not set # BR2_PACKAGE_POPT is not set # # re2 needs a toolchain w/ C++, threads, gcc >= 4.8 # # BR2_PACKAGE_READLINE is not set # BR2_PACKAGE_SLANG is not set # # tclap needs a toolchain w/ C++ # # # termcolor needs a toolchain w/ C++, gcc >= 4.8 # # BR2_PACKAGE_UTF8PROC is not set # # Mail # # BR2_PACKAGE_DOVECOT is not set # BR2_PACKAGE_EXIM is not set # BR2_PACKAGE_FETCHMAIL is not set # BR2_PACKAGE_HEIRLOOM_MAILX is not set # BR2_PACKAGE_LIBESMTP is not set # BR2_PACKAGE_MSMTP is not set # BR2_PACKAGE_MUTT is not set # # Miscellaneous # # BR2_PACKAGE_AESPIPE is not set # BR2_PACKAGE_BC is not set BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS=y # # bitcoin needs a toolchain w/ C++, threads, wchar # # # clamav needs a toolchain w/ C++, dynamic library, threads, wchar # # BR2_PACKAGE_COLLECTD is not set # BR2_PACKAGE_COLLECTL is not set # # domoticz needs lua 5.3 and a toolchain w/ C++, gcc >= 6, NPTL, wchar, dynamic library # # BR2_PACKAGE_EMPTY is not set # BR2_PACKAGE_GITLAB_RUNNER is not set # # gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 8 # # BR2_PACKAGE_GOOGLEFONTDIRECTORY is not set # # gqrx needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8 # # # gqrx needs qt5 # # BR2_PACKAGE_GSETTINGS_DESKTOP_SCHEMAS is not set # BR2_PACKAGE_HAVEGED is not set # BR2_PACKAGE_LINUX_SYSCALL_SUPPORT is not set # BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO is not set # BR2_PACKAGE_NETDATA is not set # # proj needs a toolchain w/ C++, gcc >= 4.7, threads, wchar # BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y # BR2_PACKAGE_QEMU is not set # # qpdf needs a toolchain w/ C++, gcc >= 5 # # BR2_PACKAGE_RTL_433 is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set # # sunwait needs a toolchain w/ C++ # # # taskd needs a toolchain w/ C++, wchar, dynamic library # BR2_PACKAGE_XMRIG_ARCH_SUPPORTS=y # # xmrig needs a glibc or musl toolchain w/ NPTL, dynamic library, C++ # # BR2_PACKAGE_XUTIL_UTIL_MACROS is not set BR2_PACKAGE_Z3_ARCH_SUPPORTS=y # # Networking applications # # # aircrack-ng needs a toolchain w/ dynamic library, threads, C++ # # BR2_PACKAGE_ALFRED is not set # BR2_PACKAGE_AOETOOLS is not set # BR2_PACKAGE_APACHE is not set # BR2_PACKAGE_ARGUS is not set # BR2_PACKAGE_ARP_SCAN is not set # BR2_PACKAGE_ARPTABLES is not set # # asterisk needs a glibc or uClibc toolchain w/ C++, dynamic library, threads, wchar # # BR2_PACKAGE_ATFTP is not set # BR2_PACKAGE_AVAHI is not set # BR2_PACKAGE_AXEL is not set # BR2_PACKAGE_BABELD is not set # BR2_PACKAGE_BANDWIDTHD is not set # BR2_PACKAGE_BATCTL is not set # # bcusdk needs a toolchain w/ C++ # # BR2_PACKAGE_BIND is not set # BR2_PACKAGE_BIRD is not set # BR2_PACKAGE_BLUEZ5_UTILS is not set # BR2_PACKAGE_BMON is not set # BR2_PACKAGE_BMX7 is not set # # boinc needs a toolchain w/ dynamic library, C++, threads, gcc >= 4.8 # # BR2_PACKAGE_BRCM_PATCHRAM_PLUS is not set # BR2_PACKAGE_BRIDGE_UTILS is not set # BR2_PACKAGE_BWM_NG is not set # BR2_PACKAGE_C_ICAP is not set # BR2_PACKAGE_CAN_UTILS is not set # # cannelloni needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8 # # BR2_PACKAGE_CASYNC is not set # BR2_PACKAGE_CFM is not set # BR2_PACKAGE_CHRONY is not set # BR2_PACKAGE_CIVETWEB is not set # BR2_PACKAGE_CONNMAN is not set # # connman-gtk needs libgtk3 and a glibc or uClibc toolchain w/ wchar, threads, resolver, dynamic library # # BR2_PACKAGE_CONNTRACK_TOOLS is not set # BR2_PACKAGE_CORKSCREW is not set # BR2_PACKAGE_CRDA is not set # # ctorrent needs a toolchain w/ C++ # # # cups needs a toolchain w/ C++, threads # # # cups-filters needs a toolchain w/ wchar, C++, threads and dynamic library, gcc >= 5 # # BR2_PACKAGE_DANTE is not set # BR2_PACKAGE_DARKHTTPD is not set # BR2_PACKAGE_DEHYDRATED is not set # BR2_PACKAGE_DHCP is not set # BR2_PACKAGE_DHCPCD is not set # BR2_PACKAGE_DHCPDUMP is not set # BR2_PACKAGE_DNSMASQ is not set # BR2_PACKAGE_DRBD_UTILS is not set # BR2_PACKAGE_DROPBEAR is not set # BR2_PACKAGE_EASYFRAMES is not set # BR2_PACKAGE_EBTABLES is not set # # ejabberd needs erlang, toolchain w/ C++ # # BR2_PACKAGE_ETHTOOL is not set # BR2_PACKAGE_FAIFA is not set # BR2_PACKAGE_FASTD is not set # BR2_PACKAGE_FCGIWRAP is not set # BR2_PACKAGE_FLANNEL is not set # BR2_PACKAGE_FPING is not set # BR2_PACKAGE_FREERADIUS_SERVER is not set # # freeswitch needs a toolchain w/ C++, dynamic library, threads, wchar # # BR2_PACKAGE_FRR is not set # # gerbera needs a toolchain w/ C++, dynamic library, threads, wchar, gcc >= 8 # # BR2_PACKAGE_GESFTPSERVER is not set # # gloox needs a toolchain w/ C++ # # BR2_PACKAGE_GLORYTUN is not set # # gupnp-tools needs libgtk3 # # # hans needs a toolchain w/ C++ # BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS=y # BR2_PACKAGE_HAPROXY is not set # BR2_PACKAGE_HIAWATHA is not set # BR2_PACKAGE_HOSTAPD is not set # BR2_PACKAGE_HTPDATE is not set # BR2_PACKAGE_HTTPING is not set # # i2pd needs a toolchain w/ C++, NPTL, wchar # # # ibrdtn-tools needs a toolchain w/ C++, threads # # # ibrdtnd needs a toolchain w/ C++, threads # # BR2_PACKAGE_IFENSLAVE is not set # BR2_PACKAGE_IFMETRIC is not set # BR2_PACKAGE_IFPLUGD is not set # BR2_PACKAGE_IFTOP is not set # BR2_PACKAGE_IFUPDOWN is not set # BR2_PACKAGE_IGD2_FOR_LINUX is not set # BR2_PACKAGE_IGH_ETHERCAT is not set # BR2_PACKAGE_IGMPPROXY is not set # BR2_PACKAGE_INADYN is not set # BR2_PACKAGE_IODINE is not set # BR2_PACKAGE_IPCALC is not set # # iperf needs a toolchain w/ C++ # # BR2_PACKAGE_IPERF3 is not set # BR2_PACKAGE_IPROUTE2 is not set # BR2_PACKAGE_IPSET is not set # BR2_PACKAGE_IPTABLES is not set # BR2_PACKAGE_IPTRAF_NG is not set # BR2_PACKAGE_IPUTILS is not set # BR2_PACKAGE_IRSSI is not set # BR2_PACKAGE_IW is not set # BR2_PACKAGE_IWD is not set # BR2_PACKAGE_JANUS_GATEWAY is not set # BR2_PACKAGE_KEEPALIVED is not set # # kismet needs a toolchain w/ threads, C++, gcc >= 5 # # BR2_PACKAGE_KNOCK is not set # BR2_PACKAGE_KSMBD_TOOLS is not set # BR2_PACKAGE_LEAFNODE2 is not set # BR2_PACKAGE_LFT is not set # # lftp requires a toolchain w/ C++, wchar # # BR2_PACKAGE_LIGHTTPD is not set # # linknx needs a toolchain w/ C++ # # BR2_PACKAGE_LINKS is not set # # linphone needs a toolchain w/ threads, C++, dynamic library, wchar, gcc >= 5 # # BR2_PACKAGE_LINUX_ZIGBEE is not set # BR2_PACKAGE_LINUXPTP is not set # BR2_PACKAGE_LLDPD is not set # BR2_PACKAGE_LRZSZ is not set # BR2_PACKAGE_LYNX is not set # BR2_PACKAGE_MACCHANGER is not set # BR2_PACKAGE_MEMCACHED is not set # BR2_PACKAGE_MII_DIAG is not set # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MINIDLNA is not set # BR2_PACKAGE_MINISSDPD is not set # BR2_PACKAGE_MJPG_STREAMER is not set # BR2_PACKAGE_MODEM_MANAGER is not set BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS=y # # mongrel2 needs a uClibc or glibc toolchain w/ C++, threads, dynamic library # # # mosh needs a toolchain w/ C++, threads, dynamic library, wchar, gcc >= 4.8 # # BR2_PACKAGE_MOSQUITTO is not set # BR2_PACKAGE_MROUTED is not set # BR2_PACKAGE_MRP is not set # BR2_PACKAGE_MSTPD is not set # BR2_PACKAGE_MTR is not set # BR2_PACKAGE_NBD is not set # BR2_PACKAGE_NCFTP is not set # BR2_PACKAGE_NDISC6 is not set # BR2_PACKAGE_NET_TOOLS is not set # BR2_PACKAGE_NETATALK is not set # BR2_PACKAGE_NETCALC is not set # BR2_PACKAGE_NETCAT is not set # BR2_PACKAGE_NETCAT_OPENBSD is not set # BR2_PACKAGE_NETPLUG is not set # BR2_PACKAGE_NETSNMP is not set # BR2_PACKAGE_NETSTAT_NAT is not set # BR2_PACKAGE_NETWORK_MANAGER is not set # BR2_PACKAGE_NETWORKD_DISPATCHER is not set # BR2_PACKAGE_NFACCT is not set # BR2_PACKAGE_NFTABLES is not set # BR2_PACKAGE_NGINX is not set # BR2_PACKAGE_NGIRCD is not set # BR2_PACKAGE_NGREP is not set # # nload needs a toolchain w/ C++ # # # nmap-nmap needs a toolchain w/ C++, threads # # BR2_PACKAGE_NOIP is not set # BR2_PACKAGE_NTP is not set # BR2_PACKAGE_NTPSEC is not set # BR2_PACKAGE_NUTTCP is not set # BR2_PACKAGE_ODHCP6C is not set # BR2_PACKAGE_ODHCPLOC is not set # BR2_PACKAGE_OLSR is not set # BR2_PACKAGE_OPEN_ISCSI is not set # BR2_PACKAGE_OPEN_LLDP is not set # BR2_PACKAGE_OPEN_PLC_UTILS is not set # BR2_PACKAGE_OPENNTPD is not set # BR2_PACKAGE_OPENOBEX is not set # BR2_PACKAGE_OPENRESOLV is not set # BR2_PACKAGE_OPENSSH is not set # BR2_PACKAGE_OPENSWAN is not set # BR2_PACKAGE_OPENVPN is not set # BR2_PACKAGE_P910ND is not set # BR2_PACKAGE_PARPROUTED is not set # BR2_PACKAGE_PHIDGETWEBSERVICE is not set # BR2_PACKAGE_PHYTOOL is not set # BR2_PACKAGE_PIMD is not set # BR2_PACKAGE_PIXIEWPS is not set # BR2_PACKAGE_POUND is not set # BR2_PACKAGE_PPPD is not set # BR2_PACKAGE_PPTP_LINUX is not set # BR2_PACKAGE_PRIVOXY is not set # BR2_PACKAGE_PROFTPD is not set # # prosody needs the lua interpreter, dynamic library # # BR2_PACKAGE_PROXYCHAINS_NG is not set # BR2_PACKAGE_PTPD is not set # BR2_PACKAGE_PTPD2 is not set # BR2_PACKAGE_PURE_FTPD is not set # BR2_PACKAGE_PUTTY is not set # BR2_PACKAGE_QUAGGA is not set # BR2_PACKAGE_RADVD is not set # BR2_PACKAGE_REAVER is not set # BR2_PACKAGE_REDIR is not set # BR2_PACKAGE_RP_PPPOE is not set # BR2_PACKAGE_RPCBIND is not set # BR2_PACKAGE_RSH_REDONE is not set # BR2_PACKAGE_RSYNC is not set # # rtorrent needs a toolchain w/ C++, threads, wchar, gcc >= 4.9 # # BR2_PACKAGE_RTPTOOLS is not set # BR2_PACKAGE_S6_DNS is not set # BR2_PACKAGE_S6_NETWORKING is not set # BR2_PACKAGE_SAMBA4 is not set # # sconeserver needs a toolchain with dynamic library, C++, NPTL # # BR2_PACKAGE_SER2NET is not set # BR2_PACKAGE_SHADOWSOCKS_LIBEV is not set # # shairport-sync needs a toolchain w/ C++, NPTL # # BR2_PACKAGE_SHELLINABOX is not set # BR2_PACKAGE_SMCROUTE is not set # BR2_PACKAGE_SNGREP is not set # BR2_PACKAGE_SNORT is not set # # snort3 needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.9 # # BR2_PACKAGE_SOCAT is not set # BR2_PACKAGE_SOCKETCAND is not set # BR2_PACKAGE_SOFTETHER is not set # BR2_PACKAGE_SPAWN_FCGI is not set # # spice server needs a toolchain w/ wchar, threads, C++ # # BR2_PACKAGE_SPICE_PROTOCOL is not set # # squid needs a toolchain w/ C++, threads, gcc >= 4.8 not affected by bug 64735 # # BR2_PACKAGE_SSDP_RESPONDER is not set # BR2_PACKAGE_SSHGUARD is not set # BR2_PACKAGE_SSHPASS is not set # BR2_PACKAGE_SSLH is not set # BR2_PACKAGE_STRONGSWAN is not set # BR2_PACKAGE_STUNNEL is not set # BR2_PACKAGE_SURICATA is not set # BR2_PACKAGE_TCPDUMP is not set # BR2_PACKAGE_TCPING is not set # BR2_PACKAGE_TCPREPLAY is not set # BR2_PACKAGE_TFTPD is not set # BR2_PACKAGE_THTTPD is not set # BR2_PACKAGE_TINC is not set # BR2_PACKAGE_TINYPROXY is not set # BR2_PACKAGE_TINYSSH is not set # BR2_PACKAGE_TOR is not set # BR2_PACKAGE_TRACEROUTE is not set # BR2_PACKAGE_TRANSMISSION is not set # BR2_PACKAGE_TUNCTL is not set # BR2_PACKAGE_TVHEADEND is not set # BR2_PACKAGE_UACME is not set # BR2_PACKAGE_UDPCAST is not set # BR2_PACKAGE_UFTP is not set # BR2_PACKAGE_UHTTPD is not set # BR2_PACKAGE_ULOGD is not set # BR2_PACKAGE_UNBOUND is not set # BR2_PACKAGE_UQMI is not set # BR2_PACKAGE_UREDIR is not set # BR2_PACKAGE_USHARE is not set # BR2_PACKAGE_USSP_PUSH is not set # BR2_PACKAGE_VDE2 is not set # # vdr needs a toolchain w/ C++, dynamic library, NPTL, wchar, headers >= 3.9 # # BR2_PACKAGE_VNSTAT is not set # BR2_PACKAGE_VPNC is not set # BR2_PACKAGE_VSFTPD is not set # BR2_PACKAGE_VTUN is not set # BR2_PACKAGE_WAVEMON is not set # BR2_PACKAGE_WGET is not set # BR2_PACKAGE_WHOIS is not set # BR2_PACKAGE_WIREGUARD_TOOLS is not set # BR2_PACKAGE_WIRELESS_REGDB is not set # BR2_PACKAGE_WIRELESS_TOOLS is not set # # wireshark needs a toolchain w/ wchar, threads, dynamic library, C++ # # BR2_PACKAGE_WPA_SUPPLICANT is not set # BR2_PACKAGE_WPAN_TOOLS is not set # BR2_PACKAGE_XINETD is not set # BR2_PACKAGE_XL2TP is not set # BR2_PACKAGE_XTABLES_ADDONS is not set # BR2_PACKAGE_ZABBIX is not set # # zeek needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 7 # # # znc needs a toolchain w/ C++, dynamic library, gcc >= 4.8, threads # # # Package managers # # # ------------------------------------------------------- # # # Please note: # # # - Buildroot does *not* generate binary packages, # # # - Buildroot does *not* install any package database. # # # * # # # It is up to you to provide those by yourself if you # # # want to use any of those package managers. # # # * # # # See the manual: # # # http://buildroot.org/manual.html#faq-no-binary-packages # # # ------------------------------------------------------- # # BR2_PACKAGE_OPKG is not set # BR2_PACKAGE_OPKG_UTILS is not set # # rpm needs a toolchain w/ dynamic library, threads and lua >= 5.3 # # # Real-Time # BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS=y # BR2_PACKAGE_XENOMAI is not set # # Security # # # apparmor needs a toolchain w/ headers >= 3.16, threads, C++ # # BR2_PACKAGE_CHECKPOLICY is not set # BR2_PACKAGE_IMA_EVM_UTILS is not set # BR2_PACKAGE_OPTEE_BENCHMARK is not set # BR2_PACKAGE_OPTEE_CLIENT is not set # BR2_PACKAGE_PAXTEST is not set # BR2_PACKAGE_POLICYCOREUTILS is not set # BR2_PACKAGE_REFPOLICY is not set # BR2_PACKAGE_RESTORECOND is not set # BR2_PACKAGE_SELINUX_PYTHON is not set # BR2_PACKAGE_SEMODULE_UTILS is not set # # setools needs python3 # # # Shell and utilities # # # Shells # # BR2_PACKAGE_BASH is not set # BR2_PACKAGE_DASH is not set # BR2_PACKAGE_MKSH is not set # BR2_PACKAGE_ZSH is not set # # Utilities # # BR2_PACKAGE_APG is not set # BR2_PACKAGE_AT is not set # BR2_PACKAGE_CATATONIT is not set # BR2_PACKAGE_CCRYPT is not set # BR2_PACKAGE_DIALOG is not set # BR2_PACKAGE_DTACH is not set # BR2_PACKAGE_EASY_RSA is not set # BR2_PACKAGE_FILE is not set # BR2_PACKAGE_GNUPG is not set BR2_PACKAGE_GNUPG2_DEPENDS=y # BR2_PACKAGE_GNUPG2 is not set # BR2_PACKAGE_INOTIFY_TOOLS is not set # BR2_PACKAGE_LOCKFILE_PROGS is not set # BR2_PACKAGE_LOGROTATE is not set # BR2_PACKAGE_LOGSURFER is not set # BR2_PACKAGE_NEOFETCH is not set # BR2_PACKAGE_PDMENU is not set # BR2_PACKAGE_PINENTRY is not set # BR2_PACKAGE_QPRINT is not set # BR2_PACKAGE_RANGER is not set # BR2_PACKAGE_RTTY is not set # BR2_PACKAGE_SCREEN is not set # BR2_PACKAGE_SCREENFETCH is not set # BR2_PACKAGE_SEXPECT is not set # BR2_PACKAGE_SUDO is not set # BR2_PACKAGE_TIME is not set # BR2_PACKAGE_TINI is not set # BR2_PACKAGE_TMUX is not set # BR2_PACKAGE_TTYD is not set # BR2_PACKAGE_WHICH is not set # BR2_PACKAGE_WTFUTIL is not set # BR2_PACKAGE_XMLSTARLET is not set # BR2_PACKAGE_XXHASH is not set # BR2_PACKAGE_YTREE is not set # # System tools # # BR2_PACKAGE_ACL is not set # BR2_PACKAGE_ANDROID_TOOLS is not set # BR2_PACKAGE_ATOP is not set # BR2_PACKAGE_ATTR is not set BR2_PACKAGE_AUDIT_ARCH_SUPPORTS=y # BR2_PACKAGE_AUDIT is not set # BR2_PACKAGE_BALENA_ENGINE is not set # BR2_PACKAGE_BUBBLEWRAP is not set # # circus needs Python 3 and a toolchain w/ C++, threads # # BR2_PACKAGE_CONTAINERD is not set # BR2_PACKAGE_COREUTILS is not set # BR2_PACKAGE_CPULIMIT is not set # BR2_PACKAGE_CPULOAD is not set # BR2_PACKAGE_CRUN is not set # BR2_PACKAGE_DAEMON is not set # BR2_PACKAGE_DC3DD is not set # BR2_PACKAGE_DCRON is not set # # ddrescue needs a toolchain w/ C++ # # BR2_PACKAGE_DEBIANUTILS is not set # BR2_PACKAGE_DOCKER_CLI is not set # # docker-compose needs docker-cli and a toolchain w/ threads # # BR2_PACKAGE_DOCKER_ENGINE is not set # BR2_PACKAGE_EARLYOOM is not set # BR2_PACKAGE_EFIBOOTMGR is not set BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS=y # BR2_PACKAGE_EFIVAR is not set # BR2_PACKAGE_EMBIGGEN_DISK is not set # BR2_PACKAGE_EMLOG is not set # BR2_PACKAGE_FLUENT_BIT is not set # BR2_PACKAGE_FTOP is not set # BR2_PACKAGE_GETENT is not set # BR2_PACKAGE_GKRELLM is not set # BR2_PACKAGE_HTOP is not set # BR2_PACKAGE_IBM_SW_TPM2 is not set # # iotop depends on python3 # # BR2_PACKAGE_IPRUTILS is not set # BR2_PACKAGE_IRQBALANCE is not set # BR2_PACKAGE_JAILHOUSE is not set # BR2_PACKAGE_KEYUTILS is not set BR2_PACKAGE_KMOD=y BR2_PACKAGE_KMOD_TOOLS=y # BR2_PACKAGE_KVMTOOL is not set # BR2_PACKAGE_LIBOSTREE is not set BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBVIRT is not set # BR2_PACKAGE_LXC is not set BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS=y # BR2_PACKAGE_MAKEDUMPFILE is not set # BR2_PACKAGE_MENDER is not set # BR2_PACKAGE_MENDER_CONNECT is not set # BR2_PACKAGE_MFOC is not set # BR2_PACKAGE_MOBY_BUILDKIT is not set # BR2_PACKAGE_MONIT is not set # BR2_PACKAGE_MULTIPATH_TOOLS is not set # BR2_PACKAGE_NCDU is not set # BR2_PACKAGE_NERDCTL is not set # # netifrc needs openrc as init system # # BR2_PACKAGE_NUMACTL is not set # # nut needs a toolchain w/ C++ # BR2_PACKAGE_OPENVMTOOLS_ARCH_SUPPORTS=y # BR2_PACKAGE_OPENVMTOOLS is not set # BR2_PACKAGE_PAMTESTER is not set # BR2_PACKAGE_POLKIT is not set # BR2_PACKAGE_PROCPS_NG is not set # BR2_PACKAGE_PROCRANK_LINUX is not set # BR2_PACKAGE_PSMISC is not set # BR2_PACKAGE_PWGEN is not set # BR2_PACKAGE_QUOTA is not set # BR2_PACKAGE_QUOTATOOL is not set # BR2_PACKAGE_RAUC is not set # BR2_PACKAGE_RSYSLOG is not set # BR2_PACKAGE_RUNC is not set # BR2_PACKAGE_S6 is not set # BR2_PACKAGE_S6_LINUX_INIT is not set # BR2_PACKAGE_S6_LINUX_UTILS is not set # BR2_PACKAGE_S6_PORTABLE_UTILS is not set # BR2_PACKAGE_S6_RC is not set # BR2_PACKAGE_SCRUB is not set # BR2_PACKAGE_SCRYPT is not set # # sdbus-c++ needs systemd and a toolchain w/ C++, gcc >= 7 # # # sdbusplus needs systemd and a toolchain w/ C++, gcc >= 7 # # BR2_PACKAGE_SEATD is not set BR2_PACKAGE_SHADOW=y # BR2_PACKAGE_SHADOW_SHADOWGRP is not set # BR2_PACKAGE_SHADOW_ACCOUNT_TOOLS_SETUID is not set # BR2_PACKAGE_SHADOW_UTMPX is not set # BR2_PACKAGE_SHADOW_SUBORDINATE_IDS is not set BR2_PACKAGE_SHADOW_SHA_CRYPT=y # BR2_PACKAGE_SHADOW_BCRYPT is not set # BR2_PACKAGE_SHADOW_YESCRYPT is not set # BR2_PACKAGE_SMACK is not set # BR2_PACKAGE_START_STOP_DAEMON is not set # # supervisor needs a python interpreter # # BR2_PACKAGE_SWUPDATE is not set # BR2_PACKAGE_SYSKLOGD is not set # BR2_PACKAGE_SYSLOG_NG is not set BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS=y BR2_PACKAGE_SYSTEMD=y # BR2_PACKAGE_SYSTEMD_BOOT is not set # BR2_PACKAGE_SYSTEMD_INITRD is not set # BR2_PACKAGE_SYSTEMD_KERNELINSTALL is not set # BR2_PACKAGE_SYSTEMD_ANALYZE is not set # BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE is not set # BR2_PACKAGE_SYSTEMD_BACKLIGHT is not set # BR2_PACKAGE_SYSTEMD_BINFMT is not set # BR2_PACKAGE_SYSTEMD_COREDUMP is not set BR2_PACKAGE_SYSTEMD_PSTORE=y # BR2_PACKAGE_SYSTEMD_FIRSTBOOT is not set # BR2_PACKAGE_SYSTEMD_HIBERNATE is not set # BR2_PACKAGE_SYSTEMD_HOMED is not set BR2_PACKAGE_SYSTEMD_HOSTNAMED=y BR2_PACKAGE_SYSTEMD_HWDB=y # BR2_PACKAGE_SYSTEMD_IMPORTD is not set # BR2_PACKAGE_SYSTEMD_CATALOGDB is not set # BR2_PACKAGE_SYSTEMD_LOCALED is not set BR2_PACKAGE_SYSTEMD_LOGIND=y # BR2_PACKAGE_SYSTEMD_MACHINED is not set BR2_PACKAGE_SYSTEMD_MYHOSTNAME=y BR2_PACKAGE_SYSTEMD_NETWORKD=y # BR2_PACKAGE_SYSTEMD_OOMD is not set # BR2_PACKAGE_SYSTEMD_POLKIT is not set # BR2_PACKAGE_SYSTEMD_PORTABLED is not set # BR2_PACKAGE_SYSTEMD_QUOTACHECK is not set # BR2_PACKAGE_SYSTEMD_RANDOMSEED is not set # BR2_PACKAGE_SYSTEMD_REPART is not set BR2_PACKAGE_SYSTEMD_RESOLVED=y # BR2_PACKAGE_SYSTEMD_RFKILL is not set # BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT is not set # BR2_PACKAGE_SYSTEMD_SYSEXT is not set # BR2_PACKAGE_SYSTEMD_SYSUPDATE is not set # BR2_PACKAGE_SYSTEMD_SYSUSERS is not set BR2_PACKAGE_SYSTEMD_TIMEDATED=y BR2_PACKAGE_SYSTEMD_TIMESYNCD=y # BR2_PACKAGE_SYSTEMD_USERDB is not set # BR2_PACKAGE_SYSTEMD_UTMP is not set BR2_PACKAGE_SYSTEMD_VCONSOLE=y BR2_PACKAGE_SYSTEMD_BOOTCHART_ARCH_SUPPORTS=y # BR2_PACKAGE_SYSTEMD_BOOTCHART is not set # BR2_PACKAGE_TAR is not set # BR2_PACKAGE_TEALDEER is not set # # thermald needs a toolchain w/ C++, wchar, threads # # BR2_PACKAGE_TPM_TOOLS is not set # BR2_PACKAGE_TPM2_ABRMD is not set # BR2_PACKAGE_TPM2_TOOLS is not set # BR2_PACKAGE_TPM2_TOTP is not set # BR2_PACKAGE_UNSCD is not set BR2_PACKAGE_UTIL_LINUX=y BR2_PACKAGE_UTIL_LINUX_LIBS=y BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y # BR2_PACKAGE_UTIL_LINUX_LIBFDISK is not set BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y # BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS is not set BR2_PACKAGE_UTIL_LINUX_LIBUUID=y # BR2_PACKAGE_UTIL_LINUX_BINARIES is not set BR2_PACKAGE_UTIL_LINUX_AGETTY=y # BR2_PACKAGE_UTIL_LINUX_BFS is not set # BR2_PACKAGE_UTIL_LINUX_CAL is not set # BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH is not set # BR2_PACKAGE_UTIL_LINUX_CHMEM is not set # BR2_PACKAGE_UTIL_LINUX_CRAMFS is not set # BR2_PACKAGE_UTIL_LINUX_EJECT is not set # BR2_PACKAGE_UTIL_LINUX_FALLOCATE is not set # BR2_PACKAGE_UTIL_LINUX_FDFORMAT is not set BR2_PACKAGE_UTIL_LINUX_FSCK=y # BR2_PACKAGE_UTIL_LINUX_HARDLINK is not set # BR2_PACKAGE_UTIL_LINUX_HWCLOCK is not set # BR2_PACKAGE_UTIL_LINUX_IPCMK is not set # BR2_PACKAGE_UTIL_LINUX_IPCRM is not set # BR2_PACKAGE_UTIL_LINUX_IPCS is not set # BR2_PACKAGE_UTIL_LINUX_IRQTOP is not set # BR2_PACKAGE_UTIL_LINUX_KILL is not set # BR2_PACKAGE_UTIL_LINUX_LAST is not set # BR2_PACKAGE_UTIL_LINUX_LINE is not set # BR2_PACKAGE_UTIL_LINUX_LOGGER is not set # BR2_PACKAGE_UTIL_LINUX_LOGIN is not set # BR2_PACKAGE_UTIL_LINUX_LOSETUP is not set # BR2_PACKAGE_UTIL_LINUX_LSFD is not set # BR2_PACKAGE_UTIL_LINUX_LSLOGINS is not set # BR2_PACKAGE_UTIL_LINUX_LSMEM is not set # BR2_PACKAGE_UTIL_LINUX_MESG is not set # BR2_PACKAGE_UTIL_LINUX_MINIX is not set # BR2_PACKAGE_UTIL_LINUX_MORE is not set BR2_PACKAGE_UTIL_LINUX_MOUNT=y # BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT is not set # BR2_PACKAGE_UTIL_LINUX_NEWGRP is not set # BR2_PACKAGE_UTIL_LINUX_NOLOGIN is not set # BR2_PACKAGE_UTIL_LINUX_NSENTER is not set # BR2_PACKAGE_UTIL_LINUX_PG is not set # BR2_PACKAGE_UTIL_LINUX_PARTX is not set # BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT is not set # # raw needs a toolchain w/ headers < 5.14 # # BR2_PACKAGE_UTIL_LINUX_RENAME is not set # BR2_PACKAGE_UTIL_LINUX_RFKILL is not set # BR2_PACKAGE_UTIL_LINUX_RUNUSER is not set # BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS is not set # BR2_PACKAGE_UTIL_LINUX_SETPRIV is not set # BR2_PACKAGE_UTIL_LINUX_SETTERM is not set # BR2_PACKAGE_UTIL_LINUX_SU is not set # BR2_PACKAGE_UTIL_LINUX_SULOGIN is not set # BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT is not set # BR2_PACKAGE_UTIL_LINUX_TUNELP is not set # BR2_PACKAGE_UTIL_LINUX_UL is not set # BR2_PACKAGE_UTIL_LINUX_UNSHARE is not set # BR2_PACKAGE_UTIL_LINUX_UTMPDUMP is not set # BR2_PACKAGE_UTIL_LINUX_UUIDD is not set # BR2_PACKAGE_UTIL_LINUX_VIPW is not set # BR2_PACKAGE_UTIL_LINUX_WALL is not set # BR2_PACKAGE_UTIL_LINUX_WIPEFS is not set # BR2_PACKAGE_UTIL_LINUX_WDCTL is not set # BR2_PACKAGE_UTIL_LINUX_WRITE is not set # BR2_PACKAGE_UTIL_LINUX_ZRAMCTL is not set # BR2_PACKAGE_WATCHDOG is not set # BR2_PACKAGE_WATCHDOGD is not set # BR2_PACKAGE_XDG_DBUS_PROXY is not set BR2_PACKAGE_XVISOR_ARCH_SUPPORTS=y # BR2_PACKAGE_XVISOR is not set # # Text editors and viewers # # BR2_PACKAGE_BAT is not set # BR2_PACKAGE_ED is not set # BR2_PACKAGE_JOE is not set # BR2_PACKAGE_LESS is not set # BR2_PACKAGE_MC is not set # BR2_PACKAGE_MG is not set # BR2_PACKAGE_MOST is not set # BR2_PACKAGE_NANO is not set # BR2_PACKAGE_UEMACS is not set # BR2_PACKAGE_VIM is not set # # Filesystem images # # BR2_TARGET_ROOTFS_AXFS is not set # BR2_TARGET_ROOTFS_BTRFS is not set # BR2_TARGET_ROOTFS_CLOOP is not set # BR2_TARGET_ROOTFS_CPIO is not set # BR2_TARGET_ROOTFS_CRAMFS is not set # BR2_TARGET_ROOTFS_EROFS is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_2=y # BR2_TARGET_ROOTFS_EXT2_2r0 is not set BR2_TARGET_ROOTFS_EXT2_2r1=y # BR2_TARGET_ROOTFS_EXT2_3 is not set # BR2_TARGET_ROOTFS_EXT2_4 is not set BR2_TARGET_ROOTFS_EXT2_GEN=2 BR2_TARGET_ROOTFS_EXT2_REV=1 BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" BR2_TARGET_ROOTFS_EXT2_SIZE="60M" BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_INODE_SIZE=256 BR2_TARGET_ROOTFS_EXT2_RESBLKS=5 BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit" BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZ4 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set # BR2_TARGET_ROOTFS_EXT2_LZO is not set # BR2_TARGET_ROOTFS_EXT2_XZ is not set # BR2_TARGET_ROOTFS_EXT2_ZSTD is not set # BR2_TARGET_ROOTFS_F2FS is not set # BR2_TARGET_ROOTFS_INITRAMFS is not set # # iso image needs a Linux kernel and either grub2 or isolinux to be built # # BR2_TARGET_ROOTFS_JFFS2 is not set # BR2_TARGET_ROOTFS_OCI is not set # BR2_TARGET_ROOTFS_ROMFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set # BR2_TARGET_ROOTFS_UBI is not set # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_YAFFS2 is not set # # Bootloaders # # BR2_TARGET_BAREBOX is not set BR2_TARGET_EDK2_ARCH_SUPPORTS=y # BR2_TARGET_EDK2 is not set BR2_TARGET_GRUB2_ARCH_SUPPORTS=y # BR2_TARGET_GRUB2 is not set BR2_PACKAGE_SHIM_ARCH_SUPPORTS=y # BR2_TARGET_SHIM is not set # BR2_TARGET_SYSLINUX is not set # BR2_TARGET_UBOOT is not set # # Host utilities # # BR2_PACKAGE_HOST_ABOOTIMG is not set # BR2_PACKAGE_HOST_AESPIPE is not set # BR2_PACKAGE_HOST_AGENT_PROXY is not set # BR2_PACKAGE_HOST_ANDROID_TOOLS is not set # BR2_PACKAGE_HOST_ASN1C is not set # BR2_PACKAGE_HOST_BABELTRACE2 is not set # BR2_PACKAGE_HOST_BMAP_TOOLS is not set # BR2_PACKAGE_HOST_BOOTGEN is not set # BR2_PACKAGE_HOST_BTRFS_PROGS is not set # BR2_PACKAGE_HOST_CHECKPOLICY is not set # BR2_PACKAGE_HOST_CHECKSEC is not set # BR2_PACKAGE_HOST_CMAKE is not set # BR2_PACKAGE_HOST_CRAMFS is not set # BR2_PACKAGE_HOST_CRUDINI is not set # BR2_PACKAGE_HOST_CRYPTSETUP is not set # BR2_PACKAGE_HOST_DBUS_PYTHON is not set # BR2_PACKAGE_HOST_DELVE is not set # BR2_PACKAGE_HOST_DFU_UTIL is not set # BR2_PACKAGE_HOST_DOS2UNIX is not set # BR2_PACKAGE_HOST_DOSFSTOOLS is not set # BR2_PACKAGE_HOST_DOXYGEN is not set # BR2_PACKAGE_HOST_DTC is not set BR2_PACKAGE_HOST_E2FSPROGS=y # BR2_PACKAGE_HOST_E2TOOLS is not set # BR2_PACKAGE_HOST_ENVIRONMENT_SETUP is not set # BR2_PACKAGE_HOST_EROFS_UTILS is not set # BR2_PACKAGE_HOST_EXFATPROGS is not set # BR2_PACKAGE_HOST_F2FS_TOOLS is not set # BR2_PACKAGE_HOST_FAKETIME is not set # BR2_PACKAGE_HOST_FATCAT is not set # BR2_PACKAGE_HOST_FIRMWARE_UTILS is not set # BR2_PACKAGE_HOST_FWUP is not set # BR2_PACKAGE_HOST_GENEXT2FS is not set # BR2_PACKAGE_HOST_GENIMAGE is not set # BR2_PACKAGE_HOST_GENPART is not set # BR2_PACKAGE_HOST_GNUPG is not set BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS=y BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y # BR2_PACKAGE_HOST_GPTFDISK is not set # BR2_PACKAGE_HOST_IMAGEMAGICK is not set # BR2_PACKAGE_HOST_IMX_MKIMAGE is not set # BR2_PACKAGE_HOST_JQ is not set # BR2_PACKAGE_HOST_JSMIN is not set BR2_PACKAGE_HOST_KMOD=y # BR2_PACKAGE_HOST_KMOD_GZ is not set # BR2_PACKAGE_HOST_KMOD_ZSTD is not set # BR2_PACKAGE_HOST_KMOD_XZ is not set # BR2_PACKAGE_HOST_LIBP11 is not set # BR2_PACKAGE_HOST_LLD is not set # BR2_PACKAGE_HOST_LPC3250LOADER is not set # BR2_PACKAGE_HOST_LTTNG_BABELTRACE is not set # BR2_PACKAGE_HOST_LZMA_ALONE is not set # BR2_PACKAGE_HOST_MENDER_ARTIFACT is not set # BR2_PACKAGE_HOST_MESON_TOOLS is not set # BR2_PACKAGE_HOST_MKPASSWD is not set # BR2_PACKAGE_HOST_MOBY_BUILDKIT is not set # BR2_PACKAGE_HOST_MOSQUITTO is not set # BR2_PACKAGE_HOST_MTD is not set # BR2_PACKAGE_HOST_MTOOLS is not set # BR2_PACKAGE_HOST_NODEJS is not set # BR2_PACKAGE_HOST_ODB is not set # BR2_PACKAGE_HOST_OPENOCD is not set # BR2_PACKAGE_HOST_OPKG_UTILS is not set # BR2_PACKAGE_HOST_PAHOLE is not set # BR2_PACKAGE_HOST_PARTED is not set BR2_PACKAGE_HOST_PATCHELF=y # BR2_PACKAGE_HOST_PIGZ is not set # BR2_PACKAGE_HOST_PKGCONF is not set # BR2_PACKAGE_HOST_PWGEN is not set # BR2_PACKAGE_HOST_PYTHON_CYTHON is not set # BR2_PACKAGE_HOST_PYTHON_GREENLET is not set # BR2_PACKAGE_HOST_PYTHON_INIPARSE is not set # BR2_PACKAGE_HOST_PYTHON_LXML is not set # BR2_PACKAGE_HOST_PYTHON_PYYAML is not set # BR2_PACKAGE_HOST_PYTHON_SIX is not set # BR2_PACKAGE_HOST_PYTHON_XLRD is not set # BR2_PACKAGE_HOST_PYTHON3 is not set BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_QEMU=y # # Emulators selection # BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y # BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE is not set # BR2_PACKAGE_HOST_QEMU_VDE2 is not set # BR2_PACKAGE_HOST_QEMU_VIRTFS is not set # BR2_PACKAGE_HOST_QEMU_USB is not set # BR2_PACKAGE_HOST_QORIQ_RCW is not set # BR2_PACKAGE_HOST_RAUC is not set # BR2_PACKAGE_HOST_RISCV_ISA_SIM is not set # BR2_PACKAGE_HOST_RUNC is not set BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS=y BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_RUSTC_ARCH="x86_64" # BR2_PACKAGE_HOST_RUSTC is not set BR2_PACKAGE_PROVIDES_HOST_RUSTC="host-rust-bin" # BR2_PACKAGE_HOST_SAM_BA is not set # BR2_PACKAGE_HOST_SDBUSPLUS is not set # BR2_PACKAGE_HOST_SENTRY_CLI is not set # BR2_PACKAGE_HOST_SLOCI_IMAGE is not set # BR2_PACKAGE_HOST_SQUASHFS is not set # BR2_PACKAGE_HOST_SWIG is not set BR2_PACKAGE_HOST_SYSTEMD=y # BR2_PACKAGE_HOST_UBOOT_TOOLS is not set BR2_PACKAGE_HOST_UTIL_LINUX=y # BR2_PACKAGE_HOST_UTP_COM is not set # BR2_PACKAGE_HOST_UUU is not set # BR2_PACKAGE_HOST_VBOOT_UTILS is not set # BR2_PACKAGE_HOST_XORRISO is not set # BR2_PACKAGE_HOST_ZIP is not set # BR2_PACKAGE_HOST_ZSTD is not set # # Legacy config options # # # Legacy options removed in 2023.02 # # BR2_KERNEL_HEADERS_6_0 is not set # BR2_KERNEL_HEADERS_4_9 is not set # BR2_PACKAGE_DOCKER_PROXY is not set # BR2_PACKAGE_PYTHON_BUNCH is not set # BR2_TARGET_GUMMIBOOT is not set # BR2_PACKAGE_IPUTILS_NINFOD is not set # BR2_PACKAGE_IPUTILS_RARPD is not set # BR2_PACKAGE_IPUTILS_RDISC is not set # BR2_PACKAGE_IPUTILS_RDISC_SERVER is not set # BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX is not set # BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE is not set # BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT is not set # BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 is not set # BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV is not set BR2_PACKAGE_QEMU_CUSTOM_TARGETS="" # BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD is not set # BR2_TARGET_SUN20I_D1_SPL is not set # BR2_PACKAGE_PYTHON_M2R is not set # BR2_PACKAGE_MESA3D_XVMC is not set # BR2_KERNEL_HEADERS_5_19 is not set # BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA is not set # BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT is not set # BR2_PACKAGE_USBREDIR_SERVER is not set # # Legacy options removed in 2022.11 # # BR2_PACKAGE_RABBITMQ_SERVER is not set # BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 is not set # BR2_PACKAGE_LIBDCADEC is not set # BR2_KERNEL_HEADERS_5_17 is not set # BR2_iwmmxt is not set # BR2_PACKAGE_UHD_N230 is not set # BR2_PACKAGE_UHD_RFNOC is not set # BR2_PACKAGE_GPSD_OLDSTYLE is not set # BR2_GDB_VERSION_9_2 is not set # # Legacy options removed in 2022.08 # # BR2_ECLIPSE_REGISTER is not set # BR2_csky is not set # BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 is not set # BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 is not set # BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU is not set # BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON is not set # BR2_GCC_VERSION_9_X is not set # BR2_PACKAGE_PHP_EXT_WDDX is not set # BR2_nds32 is not set # BR2_PACKAGE_RTL8723BS is not set # # Legacy options removed in 2022.05 # # BR2_PACKAGE_KTAP is not set # BR2_KERNEL_HEADERS_5_16 is not set # BR2_KERNEL_HEADERS_4_4 is not set # BR2_BINUTILS_VERSION_2_32_X is not set # BR2_sh2a is not set # BR2_BINUTILS_VERSION_2_35_X is not set # BR2_PACKAGE_BOOST_LAYOUT_TAGGED is not set # BR2_PACKAGE_BOOST_LAYOUT_VERSIONED is not set # # Legacy options removed in 2022.02 # BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS="" # BR2_PACKAGE_LIBCURL_LIBNSS is not set # BR2_PACKAGE_WESTON_DEFAULT_FBDEV is not set # BR2_PACKAGE_WESTON_FBDEV is not set # BR2_PACKAGE_PYTHON_PYCLI is not set # BR2_PACKAGE_LINUX_TOOLS_BPFTOOL is not set # BR2_TARGET_UBOOT_NEEDS_PYTHON2 is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS is not set # BR2_PACKAGE_PYTHON_FUNCTOOLS32 is not set # BR2_PACKAGE_PYTHON_ENUM34 is not set # BR2_PACKAGE_PYTHON_ENUM is not set # BR2_PACKAGE_PYTHON_DIALOG is not set # BR2_PACKAGE_PYTHON_CONFIGOBJ is not set # BR2_PACKAGE_PYTHON_YIELDFROM is not set # BR2_PACKAGE_PYTHON_TYPING is not set # BR2_PACKAGE_PYTHON_SUBPROCESS32 is not set # BR2_PACKAGE_PYTHON_SINGLEDISPATCH is not set # BR2_PACKAGE_PYTHON_PYRO is not set # BR2_PACKAGE_PYTHON_PYPCAP is not set # BR2_PACKAGE_PYTHON_PATHLIB2 is not set # BR2_PACKAGE_PYTHON_PAM is not set # BR2_PACKAGE_PYTHON_NFC is not set # BR2_PACKAGE_PYTHON_MAD is not set # BR2_PACKAGE_PYTHON_IPADDRESS is not set # BR2_PACKAGE_PYTHON_IPADDR is not set # BR2_PACKAGE_PYTHON_ID3 is not set # BR2_PACKAGE_PYTHON_FUTURES is not set # BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME is not set # BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE is not set # BR2_PACKAGE_PYTHON_BACKPORTS_ABC is not set # BR2_PACKAGE_PYTHON is not set # BR2_TARGET_UBOOT_ZYNQ_IMAGE is not set # BR2_PACKAGE_HOST_GDB_PYTHON is not set # BR2_PACKAGE_GSTREAMER1_MM is not set # BR2_KERNEL_HEADERS_5_14 is not set # BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE is not set # BR2_PACKAGE_CIVETWEB_WITH_LUA is not set # BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER is not set # BR2_PACKAGE_SUNXI_MALI_MAINLINE is not set # BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 is not set # BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 is not set # BR2_PACKAGE_QT5WEBKIT_EXAMPLES is not set # BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE is not set # BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE is not set # BR2_PACKAGE_IPUTILS_TFTPD is not set # BR2_PACKAGE_IPUTILS_TRACEROUTE6 is not set # BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE is not set # BR2_PACKAGE_MPD_UPNP is not set # # Legacy options removed in 2021.11 # # BR2_OPENJDK_VERSION_LTS is not set # BR2_OPENJDK_VERSION_LATEST is not set # BR2_PACKAGE_MPD_TIDAL is not set # BR2_PACKAGE_MROUTED_RSRR is not set # BR2_BINUTILS_VERSION_CSKY is not set # BR2_GCC_VERSION_CSKY is not set # BR2_PACKAGE_CANFESTIVAL is not set # BR2_PACKAGE_NMAP_NDIFF is not set # BR2_GDB_VERSION_8_3 is not set # BR2_PACKAGE_PYTHON_MELD3 is not set # BR2_PACKAGE_STRONGSWAN_EAP is not set # BR2_PACKAGE_GNURADIO_PAGER is not set # BR2_KERNEL_HEADERS_5_11 is not set # BR2_KERNEL_HEADERS_5_12 is not set # BR2_KERNEL_HEADERS_5_13 is not set # # Legacy options removed in 2021.08 # BR2_TARGET_GRUB2_BUILTIN_MODULES="" BR2_TARGET_GRUB2_BUILTIN_CONFIG="" # BR2_PACKAGE_LIBMCRYPT is not set # BR2_PACKAGE_MCRYPT is not set # BR2_PACKAGE_PHP_EXT_MCRYPT is not set # BR2_BINUTILS_VERSION_2_34_X is not set # BR2_PACKAGE_LIBSOIL is not set # BR2_PACKAGE_CLAPACK is not set # BR2_PACKAGE_SPIDERMONKEY is not set # BR2_PACKAGE_KODI_LIBVA is not set # BR2_PACKAGE_PYTHON_COHERENCE is not set # BR2_PACKAGE_PHP_EXT_XMLRPC is not set # BR2_GCC_VERSION_8_X is not set # # Legacy options removed in 2021.05 # # BR2_PACKAGE_UDISKS_LVM2 is not set # BR2_PACKAGE_LVM2_APP_LIBRARY is not set # BR2_PACKAGE_LVM2_LVMETAD is not set # BR2_PACKAGE_MONKEY is not set # BR2_PACKAGE_DOCKER_CONTAINERD is not set # BR2_PACKAGE_IOSTAT is not set # BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE is not set # BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV is not set # BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD is not set # BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE is not set # BR2_PACKAGE_MESA3D_OSMESA_CLASSIC is not set # BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST is not set # BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH is not set # # Legacy options removed in 2021.02 # # BR2_PACKAGE_MPD_AUDIOFILE is not set # BR2_PACKAGE_AUDIOFILE is not set # BR2_BINUTILS_VERSION_2_33_X is not set # BR2_PACKAGE_LIBUPNP18 is not set # BR2_PACKAGE_BOA is not set # BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA is not set # BR2_GDB_VERSION_8_2 is not set # BR2_PACKAGE_HOST_RCW is not set # BR2_KERNEL_HEADERS_5_9 is not set # BR2_KERNEL_HEADERS_5_8 is not set # BR2_powerpc_601 is not set # BR2_PACKAGE_TI_SGX_LIBGBM is not set # BR2_PACKAGE_IPSEC_TOOLS is not set # # Legacy options removed in 2020.11 # # BR2_PACKAGE_GPSD_FIXED_PORT_SPEED is not set # BR2_PACKAGE_GPSD_RECONFIGURE is not set # BR2_PACKAGE_GPSD_CONTROLSEND is not set # BR2_PACKAGE_OPENCV is not set # BR2_PACKAGE_LIBCROCO is not set # BR2_PACKAGE_BELLAGIO is not set # BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY is not set # BR2_TARGET_UBOOT_BOOT_SCRIPT is not set # BR2_TARGET_UBOOT_ENVIMAGE is not set # BR2_PACKAGE_KISMET_CLIENT is not set # BR2_PACKAGE_KISMET_DRONE is not set # BR2_GCC_VERSION_7_X is not set # BR2_PACKAGE_GST1_VALIDATE is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF is not set # BR2_PACKAGE_GQVIEW is not set # BR2_PACKAGE_WESTON_IMX is not set # BR2_KERNEL_HEADERS_5_7 is not set # BR2_PACKAGE_TINYHTTPD is not set # BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX is not set # BR2_PACKAGE_AMD_CATALYST is not set # BR2_PACKAGE_NVIDIA_TEGRA23 is not set # BR2_GDB_VERSION_8_1 is not set # # Legacy options removed in 2020.08 # # BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 is not set # BR2_KERNEL_HEADERS_5_6 is not set # BR2_KERNEL_HEADERS_5_5 is not set # BR2_BINUTILS_VERSION_2_31_X is not set # BR2_PACKAGE_KODI_PERIPHERAL_STEAMCONTROLLER is not set # # Legacy options removed in 2020.05 # # BR2_PACKAGE_WIRINGPI is not set # BR2_PACKAGE_PYTHON_PYCRYPTO is not set # BR2_PACKAGE_MTDEV2TUIO is not set # BR2_PACKAGE_EZXML is not set # BR2_PACKAGE_COLLECTD_LVM is not set # BR2_PACKAGE_PYTHON_PYASN is not set # BR2_PACKAGE_PYTHON_PYASN_MODULES is not set # BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174 is not set # BR2_PACKAGE_QT5CANVAS3D is not set # BR2_PACKAGE_KODI_LIBTHEORA is not set # BR2_PACKAGE_CEGUI06 is not set # BR2_GCC_VERSION_5_X is not set # # Legacy options removed in 2020.02 # # BR2_PACKAGE_JAMVM is not set # BR2_PACKAGE_CLASSPATH is not set # BR2_PACKAGE_QT5_VERSION_5_6 is not set # BR2_PACKAGE_CURL is not set # BR2_PACKAGE_GSTREAMER is not set # BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS is not set # BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_NV_SAMPLE_APPS is not set # BR2_PACKAGE_FREERDP_GSTREAMER is not set # BR2_PACKAGE_OPENCV3_WITH_GSTREAMER is not set # BR2_PACKAGE_OPENCV_WITH_GSTREAMER is not set # BR2_PACKAGE_LIBPLAYER is not set # BR2_GCC_VERSION_OR1K is not set # BR2_PACKAGE_BLUEZ_UTILS is not set # BR2_PACKAGE_GADGETFS_TEST is not set # BR2_PACKAGE_FIS is not set BR2_PACKAGE_REFPOLICY_POLICY_VERSION="" # BR2_PACKAGE_CELT051 is not set # BR2_PACKAGE_WIREGUARD is not set # BR2_PACKAGE_PERL_NET_PING is not set # BR2_PACKAGE_PERL_MIME_BASE64 is not set # BR2_PACKAGE_PERL_DIGEST_MD5 is not set # BR2_PACKAGE_ERLANG_P1_ICONV is not set # BR2_KERNEL_HEADERS_5_3 is not set # BR2_PACKAGE_PYTHON_SCAPY3K is not set # BR2_BINUTILS_VERSION_2_30_X is not set # BR2_PACKAGE_RPI_USERLAND_START_VCFILED is not set # BR2_PACKAGE_TI_SGX_KM_AM335X is not set # BR2_PACKAGE_TI_SGX_KM_AM437X is not set # BR2_PACKAGE_TI_SGX_KM_AM4430 is not set # BR2_PACKAGE_TI_SGX_KM_AM5430 is not set # # Legacy options removed in 2019.11 # # BR2_PACKAGE_OPENVMTOOLS_PROCPS is not set # BR2_PACKAGE_ALLJOYN is not set # BR2_PACKAGE_ALLJOYN_BASE is not set # BR2_PACKAGE_ALLJOYN_BASE_CONTROLPANEL is not set # BR2_PACKAGE_ALLJOYN_BASE_NOTIFICATION is not set # BR2_PACKAGE_ALLJOYN_BASE_ONBOARDING is not set # BR2_PACKAGE_ALLJOYN_TCL_BASE is not set # BR2_PACKAGE_ALLJOYN_TCL is not set BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS="" # BR2_PACKAGE_PYTHON_PYSNMP_APPS is not set # BR2_KERNEL_HEADERS_5_2 is not set # BR2_TARGET_RISCV_PK is not set # BR2_PACKAGE_SQLITE_STAT3 is not set # BR2_KERNEL_HEADERS_5_1 is not set # BR2_PACKAGE_DEVMEM2 is not set # BR2_PACKAGE_USTR is not set # BR2_PACKAGE_KODI_SCREENSAVER_PLANESTATE is not set # BR2_PACKAGE_KODI_VISUALISATION_WAVEFORHUE is not set # BR2_PACKAGE_KODI_AUDIODECODER_OPUS is not set # BR2_PACKAGE_MESA3D_OSMESA is not set # BR2_PACKAGE_HOSTAPD_DRIVER_RTW is not set # BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW is not set # BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD is not set # # Legacy options removed in 2019.08 # # BR2_TARGET_TS4800_MBRBOOT is not set # BR2_PACKAGE_LIBAMCODEC is not set # BR2_PACKAGE_ODROID_SCRIPTS is not set # BR2_PACKAGE_ODROID_MALI is not set # BR2_PACKAGE_KODI_PLATFORM_AML is not set # BR2_GCC_VERSION_6_X is not set # BR2_GCC_VERSION_4_9_X is not set # BR2_GDB_VERSION_7_12 is not set # BR2_PACKAGE_XAPP_MKFONTDIR is not set # BR2_GDB_VERSION_8_0 is not set # BR2_KERNEL_HEADERS_4_20 is not set # BR2_KERNEL_HEADERS_5_0 is not set # # Legacy options removed in 2019.05 # # BR2_CSKY_DSP is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IQA is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD is not set # BR2_PACKAGE_LUNIT is not set # BR2_PACKAGE_FFMPEG_FFSERVER is not set # BR2_PACKAGE_LIBUMP is not set # BR2_PACKAGE_SUNXI_MALI is not set # BR2_BINUTILS_VERSION_2_29_X is not set # BR2_BINUTILS_VERSION_2_28_X is not set # BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK is not set # # Legacy options removed in 2019.02 # # BR2_PACKAGE_QT is not set # BR2_PACKAGE_QTUIO is not set # BR2_PACKAGE_PINENTRY_QT4 is not set # BR2_PACKAGE_POPPLER_QT is not set # BR2_PACKAGE_OPENCV3_WITH_QT is not set # BR2_PACKAGE_OPENCV_WITH_QT is not set # BR2_PACKAGE_AMD_CATALYST_CCCLE is not set # BR2_PACKAGE_SDL_QTOPIA is not set # BR2_PACKAGE_PYTHON_PYQT is not set # BR2_PACKAGE_LUACRYPTO is not set # BR2_PACKAGE_TN5250 is not set # BR2_PACKAGE_BOOST_SIGNALS is not set # BR2_PACKAGE_FFTW_PRECISION_SINGLE is not set # BR2_PACKAGE_FFTW_PRECISION_DOUBLE is not set # BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE is not set # BR2_PACKAGE_FFTW_PRECISION_QUAD is not set # BR2_PACKAGE_LUA_5_2 is not set # BR2_TARGET_GENERIC_PASSWD_MD5 is not set # # Legacy options removed in 2018.11 # # BR2_TARGET_XLOADER is not set # BR2_PACKAGE_TIDSP_BINARIES is not set # BR2_PACKAGE_DSP_TOOLS is not set # BR2_PACKAGE_GST_DSP is not set # BR2_PACKAGE_BOOTUTILS is not set # BR2_PACKAGE_EXPEDITE is not set # BR2_PACKAGE_MESA3D_OPENGL_TEXTURE_FLOAT is not set # BR2_KERNEL_HEADERS_4_10 is not set # BR2_KERNEL_HEADERS_4_11 is not set # BR2_KERNEL_HEADERS_4_12 is not set # BR2_KERNEL_HEADERS_4_13 is not set # BR2_KERNEL_HEADERS_4_15 is not set # BR2_KERNEL_HEADERS_4_17 is not set # BR2_PACKAGE_LIBNFTNL_XML is not set # BR2_KERNEL_HEADERS_3_2 is not set # BR2_KERNEL_HEADERS_4_1 is not set # BR2_KERNEL_HEADERS_4_16 is not set # BR2_KERNEL_HEADERS_4_18 is not set # # Legacy options removed in 2018.08 # # BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT is not set # BR2_PACKAGE_XPROTO_APPLEWMPROTO is not set # BR2_PACKAGE_XPROTO_BIGREQSPROTO is not set # BR2_PACKAGE_XPROTO_COMPOSITEPROTO is not set # BR2_PACKAGE_XPROTO_DAMAGEPROTO is not set # BR2_PACKAGE_XPROTO_DMXPROTO is not set # BR2_PACKAGE_XPROTO_DRI2PROTO is not set # BR2_PACKAGE_XPROTO_DRI3PROTO is not set # BR2_PACKAGE_XPROTO_FIXESPROTO is not set # BR2_PACKAGE_XPROTO_FONTCACHEPROTO is not set # BR2_PACKAGE_XPROTO_FONTSPROTO is not set # BR2_PACKAGE_XPROTO_GLPROTO is not set # BR2_PACKAGE_XPROTO_INPUTPROTO is not set # BR2_PACKAGE_XPROTO_KBPROTO is not set # BR2_PACKAGE_XPROTO_PRESENTPROTO is not set # BR2_PACKAGE_XPROTO_RANDRPROTO is not set # BR2_PACKAGE_XPROTO_RECORDPROTO is not set # BR2_PACKAGE_XPROTO_RENDERPROTO is not set # BR2_PACKAGE_XPROTO_RESOURCEPROTO is not set # BR2_PACKAGE_XPROTO_SCRNSAVERPROTO is not set # BR2_PACKAGE_XPROTO_VIDEOPROTO is not set # BR2_PACKAGE_XPROTO_WINDOWSWMPROTO is not set # BR2_PACKAGE_XPROTO_XCMISCPROTO is not set # BR2_PACKAGE_XPROTO_XEXTPROTO is not set # BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO is not set # BR2_PACKAGE_XPROTO_XF86DGAPROTO is not set # BR2_PACKAGE_XPROTO_XF86DRIPROTO is not set # BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO is not set # BR2_PACKAGE_XPROTO_XINERAMAPROTO is not set # BR2_PACKAGE_XPROTO_XPROTO is not set # BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLES2 is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLX is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11 is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_DISPMANX is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER is not set # BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME is not set # BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123 is not set # BR2_GDB_VERSION_7_11 is not set # BR2_GDB_VERSION_7_10 is not set # # Legacy options removed in 2018.05 # # BR2_PACKAGE_MEDIAART_BACKEND_NONE is not set # BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF is not set # BR2_PACKAGE_MEDIAART_BACKEND_QT is not set # BR2_PACKAGE_TI_SGX_AM335X is not set # BR2_PACKAGE_TI_SGX_AM437X is not set # BR2_PACKAGE_TI_SGX_AM4430 is not set # BR2_PACKAGE_TI_SGX_AM5430 is not set # BR2_PACKAGE_JANUS_AUDIO_BRIDGE is not set # BR2_PACKAGE_JANUS_ECHO_TEST is not set # BR2_PACKAGE_JANUS_RECORDPLAY is not set # BR2_PACKAGE_JANUS_SIP_GATEWAY is not set # BR2_PACKAGE_JANUS_STREAMING is not set # BR2_PACKAGE_JANUS_TEXT_ROOM is not set # BR2_PACKAGE_JANUS_VIDEO_CALL is not set # BR2_PACKAGE_JANUS_VIDEO_ROOM is not set # BR2_PACKAGE_JANUS_MQTT is not set # BR2_PACKAGE_JANUS_RABBITMQ is not set # BR2_PACKAGE_JANUS_REST is not set # BR2_PACKAGE_JANUS_UNIX_SOCKETS is not set # BR2_PACKAGE_JANUS_WEBSOCKETS is not set # BR2_PACKAGE_IPSEC_SECCTX_DISABLE is not set # BR2_PACKAGE_IPSEC_SECCTX_ENABLE is not set # BR2_PACKAGE_IPSEC_SECCTX_KERNEL is not set # BR2_PACKAGE_LIBTFDI_CPP is not set # BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE is not set # BR2_PACKAGE_JQUERY_UI_THEME_BLITZER is not set # BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO is not set # BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE is not set # BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV is not set # BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT is not set # BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE is not set # BR2_PACKAGE_JQUERY_UI_THEME_FLICK is not set # BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS is not set # BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY is not set # BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG is not set # BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC is not set # BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST is not set # BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER is not set # BR2_PACKAGE_JQUERY_UI_THEME_REDMOND is not set # BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS is not set # BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET is not set # BR2_PACKAGE_JQUERY_UI_THEME_START is not set # BR2_PACKAGE_JQUERY_UI_THEME_SUNNY is not set # BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE is not set # BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC is not set # BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS is not set # BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS is not set # BR2_PACKAGE_JQUERY_UI_THEME_VADER is not set # BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH is not set # BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI is not set # BR2_PACKAGE_BLUEZ5_PLUGINS_NFC is not set # BR2_PACKAGE_BLUEZ5_PLUGINS_SAP is not set # BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS is not set # BR2_PACKAGE_TRANSMISSION_REMOTE is not set # BR2_PACKAGE_LIBKCAPI_APPS is not set # BR2_PACKAGE_MPLAYER is not set # BR2_PACKAGE_MPLAYER_MPLAYER is not set # BR2_PACKAGE_MPLAYER_MENCODER is not set # BR2_PACKAGE_LIBPLAYER_MPLAYER is not set # BR2_PACKAGE_IQVLINUX is not set # BR2_BINFMT_FLAT_SEP_DATA is not set # BR2_bfin is not set # BR2_PACKAGE_KODI_ADSP_BASIC is not set # BR2_PACKAGE_KODI_ADSP_FREESURROUND is not set # # Legacy options removed in 2018.02 # # BR2_KERNEL_HEADERS_3_4 is not set # BR2_KERNEL_HEADERS_3_10 is not set # BR2_KERNEL_HEADERS_3_12 is not set # BR2_BINUTILS_VERSION_2_27_X is not set # BR2_PACKAGE_EEPROG is not set # BR2_PACKAGE_GNUPG2_GPGV2 is not set # BR2_PACKAGE_IMX_GPU_VIV_APITRACE is not set # BR2_PACKAGE_IMX_GPU_VIV_G2D is not set # # Legacy options removed in 2017.11 # # BR2_PACKAGE_RFKILL is not set # BR2_PACKAGE_UTIL_LINUX_RESET is not set # BR2_PACKAGE_POLICYCOREUTILS_AUDIT2ALLOW is not set # BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND is not set # BR2_PACKAGE_SEPOLGEN is not set # BR2_PACKAGE_OPENOBEX_BLUEZ is not set # BR2_PACKAGE_OPENOBEX_LIBUSB is not set # BR2_PACKAGE_OPENOBEX_APPS is not set # BR2_PACKAGE_OPENOBEX_SYSLOG is not set # BR2_PACKAGE_OPENOBEX_DUMP is not set # BR2_PACKAGE_AICCU is not set # BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS is not set # # Legacy options removed in 2017.08 # # BR2_TARGET_GRUB is not set # BR2_PACKAGE_SIMICSFS is not set # BR2_BINUTILS_VERSION_2_26_X is not set BR2_XTENSA_OVERLAY_DIR="" BR2_XTENSA_CUSTOM_NAME="" # BR2_PACKAGE_HOST_MKE2IMG is not set BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES=0 # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDXAPARSE is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DATAURISRC is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DCCP is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MVE is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NUVDEMUX is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PATCHDETECT is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOMEASURE is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_APEXSINK is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL is not set # BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD is not set # BR2_STRIP_none is not set # BR2_PACKAGE_BEECRYPT_CPP is not set # BR2_PACKAGE_SPICE_CLIENT is not set # BR2_PACKAGE_SPICE_GUI is not set # BR2_PACKAGE_SPICE_TUNNEL is not set # BR2_PACKAGE_INPUT_TOOLS is not set # BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH is not set # BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set # BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set # BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH is not set # BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 is not set # BR2_GCC_VERSION_4_8_X is not set # # Legacy options removed in 2017.05 # # BR2_PACKAGE_SUNXI_MALI_R2P4 is not set # BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT is not set # BR2_PACKAGE_NODEJS_MODULES_EXPRESS is not set # BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL is not set # BR2_PACKAGE_OPENOCD_FT2XXX is not set # BR2_PACKAGE_KODI_RTMPDUMP is not set # BR2_PACKAGE_KODI_VISUALISATION_FOUNTAIN is not set # BR2_PACKAGE_PORTMAP is not set # BR2_BINUTILS_VERSION_2_25_X is not set # BR2_TOOLCHAIN_BUILDROOT_INET_RPC is not set BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS=0 # BR2_PACKAGE_SYSTEMD_KDBUS is not set # BR2_PACKAGE_POLARSSL is not set # BR2_NBD_CLIENT is not set # BR2_NBD_SERVER is not set # BR2_PACKAGE_GMOCK is not set # BR2_KERNEL_HEADERS_4_8 is not set # BR2_KERNEL_HEADERS_3_18 is not set # BR2_GLIBC_VERSION_2_22 is not set # # Legacy options removed in 2017.02 # # BR2_PACKAGE_PERL_DB_FILE is not set # BR2_KERNEL_HEADERS_4_7 is not set # BR2_KERNEL_HEADERS_4_6 is not set # BR2_KERNEL_HEADERS_4_5 is not set # BR2_KERNEL_HEADERS_3_14 is not set # BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS is not set # BR2_UCLIBC_INSTALL_TEST_SUITE is not set # BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX is not set # BR2_PACKAGE_MAKEDEVS is not set # BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A is not set # BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE is not set # BR2_PACKAGE_SNOWBALL_HDMISERVICE is not set # BR2_PACKAGE_SNOWBALL_INIT is not set # BR2_GDB_VERSION_7_9 is not set # # Legacy options removed in 2016.11 # # BR2_PACKAGE_PHP_SAPI_CLI_CGI is not set # BR2_PACKAGE_PHP_SAPI_CLI_FPM is not set # BR2_PACKAGE_WVSTREAMS is not set # BR2_PACKAGE_WVDIAL is not set # BR2_PACKAGE_WEBKITGTK24 is not set # BR2_PACKAGE_TORSMO is not set # BR2_PACKAGE_SSTRIP is not set # BR2_KERNEL_HEADERS_4_3 is not set # BR2_KERNEL_HEADERS_4_2 is not set # BR2_PACKAGE_KODI_ADDON_XVDR is not set # BR2_PACKAGE_IPKG is not set # BR2_GCC_VERSION_4_7_X is not set # BR2_BINUTILS_VERSION_2_24_X is not set # BR2_PACKAGE_WESTON_RPI is not set # BR2_LINUX_KERNEL_TOOL_CPUPOWER is not set # BR2_LINUX_KERNEL_TOOL_PERF is not set # BR2_LINUX_KERNEL_TOOL_SELFTESTS is not set # BR2_GCC_VERSION_4_8_ARC is not set # BR2_KERNEL_HEADERS_4_0 is not set # BR2_KERNEL_HEADERS_3_19 is not set # BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS is not set # BR2_PACKAGE_ELEMENTARY is not set # BR2_LINUX_KERNEL_CUSTOM_LOCAL is not set # # Legacy options removed in 2016.08 # # BR2_PACKAGE_EFL_JP2K is not set # BR2_PACKAGE_SYSTEMD_COMPAT is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIVEADDER is not set # BR2_PACKAGE_LIBFSLVPUWRAP is not set # BR2_PACKAGE_LIBFSLPARSER is not set # BR2_PACKAGE_LIBFSLCODEC is not set # BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE_FIT_SIGNATURE_SUPPORT is not set # BR2_PTHREADS_OLD is not set # BR2_BINUTILS_VERSION_2_23_X is not set # BR2_TOOLCHAIN_BUILDROOT_EGLIBC is not set # BR2_GDB_VERSION_7_8 is not set # # Legacy options removed in 2016.05 # # BR2_PACKAGE_OPENVPN_CRYPTO_POLARSSL is not set # BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP is not set # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPG123 is not set # BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC is not set # BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC_E500V2 is not set # BR2_x86_i386 is not set # BR2_PACKAGE_QT5QUICK1 is not set BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="" # BR2_PACKAGE_XDRIVER_XF86_INPUT_VOID is not set # BR2_KERNEL_HEADERS_3_17 is not set # BR2_GDB_VERSION_7_7 is not set # BR2_PACKAGE_FOOMATIC_FILTERS is not set # BR2_PACKAGE_SAMBA is not set # BR2_PACKAGE_KODI_WAVPACK is not set # BR2_PACKAGE_KODI_RSXS is not set # BR2_PACKAGE_KODI_GOOM is not set # BR2_PACKAGE_SYSTEMD_ALL_EXTRAS is not set # BR2_GCC_VERSION_4_5_X is not set # BR2_PACKAGE_SQLITE_READLINE is not set # # Legacy options removed in 2016.02 # # BR2_PACKAGE_DOVECOT_BZIP2 is not set # BR2_PACKAGE_DOVECOT_ZLIB is not set # BR2_PACKAGE_E2FSPROGS_FINDFS is not set # BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL is not set # BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE is not set # BR2_PACKAGE_OPENPOWERLINK_LIBPCAP is not set # BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set # BR2_PACKAGE_CUPS_PDFTOPS is not set # BR2_KERNEL_HEADERS_3_16 is not set # BR2_PACKAGE_PYTHON_PYXML is not set # BR2_ENABLE_SSP is not set # BR2_PACKAGE_DIRECTFB_CLE266 is not set # BR2_PACKAGE_DIRECTFB_UNICHROME is not set # BR2_PACKAGE_LIBELEMENTARY is not set # BR2_PACKAGE_LIBEINA is not set # BR2_PACKAGE_LIBEET is not set # BR2_PACKAGE_LIBEVAS is not set # BR2_PACKAGE_LIBECORE is not set # BR2_PACKAGE_LIBEDBUS is not set # BR2_PACKAGE_LIBEFREET is not set # BR2_PACKAGE_LIBEIO is not set # BR2_PACKAGE_LIBEMBRYO is not set # BR2_PACKAGE_LIBEDJE is not set # BR2_PACKAGE_LIBETHUMB is not set # BR2_PACKAGE_INFOZIP is not set # BR2_BR2_PACKAGE_NODEJS_0_10_X is not set # BR2_BR2_PACKAGE_NODEJS_0_12_X is not set # BR2_BR2_PACKAGE_NODEJS_4_X is not set # # Legacy options removed in 2015.11 # # BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REAL is not set # BR2_PACKAGE_MEDIA_CTL is not set # BR2_PACKAGE_SCHIFRA is not set # BR2_PACKAGE_ZXING is not set # BR2_PACKAGE_BLACKBOX is not set # BR2_KERNEL_HEADERS_3_0 is not set # BR2_KERNEL_HEADERS_3_11 is not set # BR2_KERNEL_HEADERS_3_13 is not set # BR2_KERNEL_HEADERS_3_15 is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_BLTLOAD is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_CPULOAD is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_DATABUFFER is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_DIOLOAD is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_DRIVERTEST is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_FIRE is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_FLIP is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_FONTS is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_INPUT is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_JOYSTICK is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_KNUCKLES is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_LAYER is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX_WATER is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_NETLOAD is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_PALETTE is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_PARTICLE is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_PORTER is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_STRESS is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_TEXTURE is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO_PARTICLE is not set # BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW is not set # BR2_PACKAGE_KOBS_NG is not set # BR2_PACKAGE_SAWMAN is not set # BR2_PACKAGE_DIVINE is not set # # Legacy options removed in 2015.08 # # BR2_PACKAGE_KODI_PVR_ADDONS is not set # BR2_BINUTILS_VERSION_2_23_2 is not set # BR2_BINUTILS_VERSION_2_24 is not set # BR2_BINUTILS_VERSION_2_25 is not set # BR2_PACKAGE_PERF is not set # BR2_BINUTILS_VERSION_2_22 is not set # BR2_PACKAGE_GPU_VIV_BIN_MX6Q is not set # BR2_TARGET_UBOOT_NETWORK is not set From stephane.gonauer at 6wind.com Tue Feb 28 14:38:23 2023 From: stephane.gonauer at 6wind.com (stephane gonauer) Date: Tue, 28 Feb 2023 15:38:23 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: <20230228130843.GC32199@carcass.dev.6wind.com> References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> <20230222232157.380b6109@windsurf> <20230228130843.GC32199@carcass.dev.6wind.com> Message-ID: Hi, Le mar. 28 f?vr. 2023 ? 14:09, St?phane GONAUER a ?crit : > > > With those changes, applied to our next branch. Thanks! > > > > Thomas > > > I am testing shadow package and I think there may be a compatibility issue. > I rebuilt qemu_x86_64_defconfig where I added the following packages : > > BR2_PACKAGE_LINUX_PAM=y > BR2_INIT_SYSTEMD=y > BR2_PACKAGE_SHADOW=y > > > # BR2_TARGET_UBOOT_NETWORK is not set The issue can be reproduce with a simpler configuration. Enabling both BR2_PACKAGE_LINUX_PAM and BR2_PACKAGE_SHADOW breaks the login. Here follow a defconfig that reproduces the issue : /etc/pam.d reference a system-auth that is not present anywhere in the build directory. This might be the root cause but I'm not sure how to properly test. --------------- uildroot/configs$ cat qemu_x86_64_defconfig BR2_x86_64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_PER_PACKAGE_DIRECTORIES=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_LINUX_PAM=y BR2_PACKAGE_SHADOW=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From peter at korsgaard.com Tue Feb 28 14:40:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 15:40:09 +0100 Subject: [Buildroot] [PATCH] package/libcurl: bump version to 7.88.1 In-Reply-To: <20230227161040.2239744-1-peter@korsgaard.com> (Peter Korsgaard's message of "Mon, 27 Feb 2023 17:10:39 +0100") References: <20230227161040.2239744-1-peter@korsgaard.com> Message-ID: <87bkldlupi.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Bugfix release fixing a number of issues introduced in 7.88.0: > https://curl.se/changes.html#7_88_1 > https://daniel.haxx.se/blog/2023/02/20/7-88-1-the-second-final-one/ > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 14:41:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 15:41:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/paho-mqtt-c: security bump to version 1.3.12 In-Reply-To: (Lang Daniel via buildroot's message of "Tue, 28 Feb 2023 09:48:21 +0000") References: Message-ID: <877cw1luni.fsf@dell.be.48ers.dk> >>>>> "Lang" == Lang Daniel via buildroot writes: > Contains a fix for a possible race condition that can lead to use after > free: > https://github.com/eclipse/paho.mqtt.c/commit/911488a9f0fdad31c85ec86712be52587afdbbb8 > https://github.com/eclipse/paho.mqtt.c/milestone/19?closed=1 > https://github.com/eclipse/paho.mqtt.c/releases/tag/v1.3.12 > Signed-off-by: Daniel Lang Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 14:39:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 15:39:46 +0100 Subject: [Buildroot] [git commit] package/libcurl: bump version to 7.88.1 Message-ID: <20230228144147.B32EB86C72@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb566be8dc0e3a36270fe76d669fe51379d498f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bugfix release fixing a number of issues introduced in 7.88.0: https://curl.se/changes.html#7_88_1 https://daniel.haxx.se/blog/2023/02/20/7-88-1-the-second-final-one/ Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 714b02acb0..32b3d0b5e2 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.88.0.tar.xz.asc +# https://curl.se/download/curl-7.88.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f curl-7.88.1.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index eb481e4782..1a1594a45e 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.88.0 +LIBCURL_VERSION = 7.88.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From peter at korsgaard.com Tue Feb 28 14:40:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 15:40:02 +0100 Subject: [Buildroot] [git commit] package/paho-mqtt-c: security bump to version 1.3.12 Message-ID: <20230228144147.BDC0986C45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc9acffa8a9263c51a66a54b4f2ff39421365b80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Contains a fix for a possible race condition that can lead to use after free: https://github.com/eclipse/paho.mqtt.c/commit/911488a9f0fdad31c85ec86712be52587afdbbb8 https://github.com/eclipse/paho.mqtt.c/milestone/19?closed=1 https://github.com/eclipse/paho.mqtt.c/releases/tag/v1.3.12 Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- 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 1949abdf1a..529c538ff2 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 d7bba3f8b8978802e11e2b1f28e96e6b7f4ed5d8a268af52a4d3b1bcbd1db16b paho-mqtt-c-1.3.11.tar.gz +sha256 6a70a664ed3bbcc1eafdc45a5dc11f3ad70c9bac12a54c2f8cef15c0e7d0a93b paho-mqtt-c-1.3.12.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 30daf863ad..8d1fe009a7 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.11 +PAHO_MQTT_C_VERSION = 1.3.12 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 From peter at korsgaard.com Tue Feb 28 14:41:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 15:41:51 +0100 Subject: [Buildroot] [PATCH] package/libcurl: bump version to 7.88.1 In-Reply-To: <87h6v67y23.fsf@tarshish> (Baruch Siach via buildroot's message of "Tue, 28 Feb 2023 14:50:30 +0200") References: <20230228124151.16044-1-mf@go-sys.de> <87h6v67y23.fsf@tarshish> Message-ID: <87356plumo.fsf@dell.be.48ers.dk> >>>>> "Baruch" == Baruch Siach via buildroot writes: > Hi Michael, > On Tue, Feb 28 2023, Michael Fischer wrote: >> Changelog: https://curl.se/changes.html#7_88_1 >> >> Signed-off-by: Michael Fischer > There is a pending patch from Peter K doing the same bump: > http://patchwork.ozlabs.org/project/buildroot/patch/20230227161040.2239744-1-peter at korsgaard.com/ yes, applied that and marked this as superseeded. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:05:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:05:10 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/libpjsip: fix CVE-2022-235{3, 4}7 In-Reply-To: <20230227160822.1552039-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 27 Feb 2023 17:08:22 +0100") References: <20230227160822.1552039-1-fontaine.fabrice@gmail.com> Message-ID: <87y1ohkezd.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/pjsip/pjproject/security/advisories/GHSA-9pfh-r8x4-w26w > https://github.com/pjsip/pjproject/security/advisories/GHSA-cxwq-5g9x-x7fr > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Peter Korsgaard): > - Add missing patch Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:04:56 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:04:56 +0100 Subject: [Buildroot] [git commit] package/libpjsip: fix CVE-2022-235{3, 4}7 Message-ID: <20230228150514.DA75A86C7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26344644eebca5cde9b02be849d29e38d5885741 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/pjsip/pjproject/security/advisories/GHSA-9pfh-r8x4-w26w https://github.com/pjsip/pjproject/security/advisories/GHSA-cxwq-5g9x-x7fr Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...rge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch | 99 ++++++++++++++++++++++ ...rge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch | 54 ++++++++++++ package/libpjsip/libpjsip.mk | 6 ++ 3 files changed, 159 insertions(+) diff --git a/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch new file mode 100644 index 0000000000..01e1878189 --- /dev/null +++ b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch @@ -0,0 +1,99 @@ +From d8440f4d711a654b511f50f79c0445b26f9dd1e1 Mon Sep 17 00:00:00 2001 +From: Nanang Izzuddin +Date: Tue, 20 Dec 2022 11:39:12 +0700 +Subject: [PATCH] Merge pull request from GHSA-9pfh-r8x4-w26w + +* Fix buffer overread in STUN message decoder + +* Updates based on comments + +[Retrieved from: +https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1] +Signed-off-by: Fabrice Fontaine +--- + pjnath/include/pjnath/stun_msg.h | 4 ++++ + pjnath/src/pjnath/stun_msg.c | 14 +++++++++++--- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h +index b52f95c586..e49f096f3a 100644 +--- a/pjnath/include/pjnath/stun_msg.h ++++ b/pjnath/include/pjnath/stun_msg.h +@@ -442,6 +442,7 @@ typedef enum pj_stun_status + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_msg_hdr + { + /** +@@ -473,6 +474,7 @@ typedef struct pj_stun_msg_hdr + pj_uint8_t tsx_id[12]; + + } pj_stun_msg_hdr; ++#pragma pack() + + + /** +@@ -490,6 +492,7 @@ typedef struct pj_stun_msg_hdr + + \endverbatim + */ ++#pragma pack(1) + typedef struct pj_stun_attr_hdr + { + /** +@@ -506,6 +509,7 @@ typedef struct pj_stun_attr_hdr + pj_uint16_t length; + + } pj_stun_attr_hdr; ++#pragma pack() + + + /** +diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c +index 3def6b3eac..e904a0ba47 100644 +--- a/pjnath/src/pjnath/stun_msg.c ++++ b/pjnath/src/pjnath/stun_msg.c +@@ -746,7 +746,7 @@ PJ_DEF(int) pj_stun_set_padding_char(int chr) + + #define INIT_ATTR(a,t,l) (a)->hdr.type=(pj_uint16_t)(t), \ + (a)->hdr.length=(pj_uint16_t)(l) +-#define ATTR_HDR_LEN 4 ++#define ATTR_HDR_LEN sizeof(pj_stun_attr_hdr) + + static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos) + { +@@ -2327,6 +2327,14 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + status = pj_stun_msg_check(pdu, pdu_len, options); + if (status != PJ_SUCCESS) + return status; ++ } else { ++ /* For safety, verify packet length at least */ ++ pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20; ++ if (msg_len > pdu_len || ++ ((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len)) ++ { ++ return PJNATH_EINSTUNMSGLEN; ++ } + } + + /* Create the message, copy the header, and convert to host byte order */ +@@ -2345,7 +2353,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + p_response = NULL; + + /* Parse attributes */ +- while (pdu_len >= 4) { ++ while (pdu_len >= ATTR_HDR_LEN) { + unsigned attr_type, attr_val_len; + const struct attr_desc *adesc; + +@@ -2357,7 +2365,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, + attr_val_len = (attr_val_len + 3) & (~3); + + /* Check length */ +- if (pdu_len < attr_val_len) { ++ if (pdu_len < attr_val_len + ATTR_HDR_LEN) { + pj_str_t err_msg; + char err_msg_buf[80]; + diff --git a/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch b/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch new file mode 100644 index 0000000000..82249a2076 --- /dev/null +++ b/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch @@ -0,0 +1,54 @@ +From bc4812d31a67d5e2f973fbfaf950d6118226cf36 Mon Sep 17 00:00:00 2001 +From: sauwming +Date: Fri, 23 Dec 2022 15:05:28 +0800 +Subject: [PATCH] Merge pull request from GHSA-cxwq-5g9x-x7fr + +* Fixed heap buffer overflow when parsing STUN errcode attribute + +* Also fixed uint parsing + +[Retrieved from: +https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36] +Signed-off-by: Fabrice Fontaine +--- + pjnath/src/pjnath/stun_msg.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c +index c6b0bdd284..b55d29849a 100644 +--- a/pjnath/src/pjnath/stun_msg.c ++++ b/pjnath/src/pjnath/stun_msg.c +@@ -1438,12 +1438,12 @@ static pj_status_t decode_uint_attr(pj_pool_t *pool, + attr = PJ_POOL_ZALLOC_T(pool, pj_stun_uint_attr); + GETATTRHDR(buf, &attr->hdr); + +- attr->value = GETVAL32H(buf, 4); +- + /* Check that the attribute length is valid */ + if (attr->hdr.length != 4) + return PJNATH_ESTUNINATTRLEN; + ++ attr->value = GETVAL32H(buf, 4); ++ + /* Done */ + *p_attr = attr; + +@@ -1757,14 +1757,15 @@ static pj_status_t decode_errcode_attr(pj_pool_t *pool, + attr = PJ_POOL_ZALLOC_T(pool, pj_stun_errcode_attr); + GETATTRHDR(buf, &attr->hdr); + ++ /* Check that the attribute length is valid */ ++ if (attr->hdr.length < 4) ++ return PJNATH_ESTUNINATTRLEN; ++ + attr->err_code = buf[6] * 100 + buf[7]; + + /* Get pointer to the string in the message */ + value.ptr = ((char*)buf + ATTR_HDR_LEN + 4); + value.slen = attr->hdr.length - 4; +- /* Make sure the length is never negative */ +- if (value.slen < 0) +- value.slen = 0; + + /* Copy the string to the attribute */ + pj_strdup(pool, &attr->reason, &value); diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 5cc0423f5d..24db641446 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -15,6 +15,12 @@ LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) +# 0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch +LIBPJSIP_IGNORE_CVES += CVE-2022-23537 + +# 0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch +LIBPJSIP_IGNORE_CVES += CVE-2022-23547 + LIBPJSIP_CFLAGS = $(TARGET_CFLAGS) -DPJ_HAS_IPV6=1 # relocation truncated to fit: R_68K_GOT16O From peter at korsgaard.com Tue Feb 28 15:29:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:29:37 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: silence gcc plugin test In-Reply-To: <20230207172450.921B78430F@busybox.osuosl.org> (Peter Korsgaard's message of "Tue, 7 Feb 2023 18:24:10 +0100") References: <20230207172450.921B78430F@busybox.osuosl.org> Message-ID: <87ttz5kdum.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=4fbd2f6d2cf26225f73f584c3a0cacb1b2476f5f > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The gcc plugin test was not using the -q option to grep causing it to print > the line to stdout, so fix that. > While we're at it, adjust the locale check to use grep -q instead of > redirecting to /dev/null for consistency with the other checks. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From john at metanate.com Tue Feb 28 15:33:10 2023 From: john at metanate.com (John Keeping) Date: Tue, 28 Feb 2023 15:33:10 +0000 Subject: [Buildroot] [PATCH v2 1/3] pkg-cmake: add option to select the Ninja generator In-Reply-To: <20230227103956.128236-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-3-thomas.devoogdt@barco.com> <20230227103956.128236-1-thomas.devoogdt@barco.com> Message-ID: On Mon, Feb 27, 2023 at 11:39:54AM +0100, Thomas Devoogdt wrote: > E.g. Commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 can now be replaced by: > WEBKITGTK_CMAKE_NINJA = YES > > Packages that are selecting Ninja (or overtime another generator), > should also use the _BUILD_{ENV,OPTS} variables iso the _MAKE variables. > > No _INSTALL{,_STAGING,_TARGET}_OPTS used so far: > > $ grep '_INSTALL_OPTS' $(grep -rl "cmake-package" package/*/*.mk) > $ grep '_INSTALL_STAGING_OPTS' $(grep -rl "cmake-package" package/*/*.mk) > $ grep '_INSTALL_TARGET_OPTS' $(grep -rl "cmake-package" package/*/*.mk) > > The _MAKE_{ENV,OPTS} are translated to _BUILD_{ENV,OPTS}: > > $ grep '_MAKE_ENV =' $(grep -rl "cmake-package" package/*/*.mk) > > > package/netopeer2/netopeer2.mk:NETOPEER2_MAKE_ENV = \ > > package/racehound/racehound.mk:RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) > > $ grep '_MAKE_OPTS =' $(grep -rl "cmake-package" package/*/*.mk) This misses package/gdal/gdal.mk which does '_MAKE_OPTS +='. > > package/mariadb/mariadb.mk:HOST_MARIADB_MAKE_OPTS = import_executables > > package/zeek/zeek.mk:HOST_ZEEK_MAKE_OPTS = binpac bifcl > > Only "musepack" seems to overwrite MAKE to enforce -j1, so replace it: > > $ grep '_MAKE =' $(grep -rl "cmake-package" package/*/*.mk) > > > package/musepack/musepack.mk:MUSEPACK_MAKE = $(MAKE1) > > Signed-off-by: Thomas Devoogdt > --- > v2: made generator use more generic, other generators can now easily be added if required > --- > package/musepack/musepack.mk | 2 +- > package/netopeer2/netopeer2.mk | 2 +- > package/pkg-cmake.mk | 26 ++++++++++++++------------ > package/racehound/racehound.mk | 2 +- > 4 files changed, 17 insertions(+), 15 deletions(-) > > diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk > index fc66c684a5..d4dd08df36 100644 > --- a/package/musepack/musepack.mk > +++ b/package/musepack/musepack.mk > @@ -9,7 +9,7 @@ MUSEPACK_SITE = http://files.musepack.net/source > MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz > MUSEPACK_DEPENDENCIES = libcuefile libreplaygain > MUSEPACK_INSTALL_STAGING = YES > -MUSEPACK_MAKE = $(MAKE1) > +MUSEPACK_BUILD_OPTS = -j1 > MUSEPACK_LICENSE = BSD-3-Clause (*mpcdec), LGPL-2.1+ (*mpcenc) > MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c > > diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk > index 47fcd31acd..2ebb23eccd 100644 > --- a/package/netopeer2/netopeer2.mk > +++ b/package/netopeer2/netopeer2.mk > @@ -24,7 +24,7 @@ NETOPEER2_CONF_OPTS = \ > # affected mutualy. > NETOPEER2_SYSREPO_SHM_PREFIX = sr_buildroot$(subst /,_,$(CONFIG_DIR))_netopeer2 > > -NETOPEER2_MAKE_ENV = \ > +NETOPEER2_BUILD_ENV = \ > SYSREPOCTL_EXECUTABLE=$(HOST_DIR)/bin/sysrepoctl \ > SYSREPO_SHM_PREFIX=$(NETOPEER2_SYSREPO_SHM_PREFIX) > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > index 8c375779cb..205a93db5f 100644 > --- a/package/pkg-cmake.mk > +++ b/package/pkg-cmake.mk > @@ -51,11 +51,6 @@ endif > > define inner-cmake-package > > -$(2)_MAKE ?= $$(MAKE) > -$(2)_INSTALL_OPTS ?= install > -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast > -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast > - > $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES > > > @@ -65,6 +60,13 @@ else > $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build > endif > > +ifeq ($$($(3)_CMAKE_NINJA),YES) > +$(2)_DEPENDENCIES += host-ninja > +$(2)_GENERATOR = "Ninja" > +else > +$(2)_GENERATOR = "Unix Makefiles" > +endif > + > # > # Configure step. Only define it if not already defined by the package > # .mk file. And take care of the differences between host and target > @@ -88,7 +90,7 @@ define $(2)_CONFIGURE_CMDS > rm -f CMakeCache.txt && \ > PATH=$$(BR_PATH) \ > $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > - -G"Unix Makefiles" \ > + -G$$($$(PKG)_GENERATOR) \ > -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ > -DCMAKE_INSTALL_PREFIX="/usr" \ > -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ > @@ -119,7 +121,7 @@ define $(2)_CONFIGURE_CMDS > PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ > $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > - -G"Unix Makefiles" \ > + -G$$($$(PKG)_GENERATOR) \ > -DCMAKE_INSTALL_SO_NO_EXE=0 \ > -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ > -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ > @@ -166,11 +168,11 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) > ifndef $(2)_BUILD_CMDS > ifeq ($(4),target) > define $(2)_BUILD_CMDS > - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) > + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) $$(BUILD_OPTS) $$($$(PKG)_BUILD_OPTS) Where is $$(BUILD_OPTS) set? As far as I can see this is not needed. > endef > else > define $(2)_BUILD_CMDS > - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) > + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) $$(BUILD_OPTS) $$($$(PKG)_BUILD_OPTS) > endef > endif > endif > @@ -181,7 +183,7 @@ endif > # > ifndef $(2)_INSTALL_CMDS > define $(2)_INSTALL_CMDS > - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) > + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) > endef > endif > > @@ -191,7 +193,7 @@ endif > # > ifndef $(2)_INSTALL_STAGING_CMDS > define $(2)_INSTALL_STAGING_CMDS > - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) > + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(STAGING_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_STAGING_OPTS) > endef > endif > > @@ -201,7 +203,7 @@ endif > # > ifndef $(2)_INSTALL_TARGET_CMDS > define $(2)_INSTALL_TARGET_CMDS > - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) > + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(TARGET_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_TARGET_OPTS) > endef > endif > > diff --git a/package/racehound/racehound.mk b/package/racehound/racehound.mk > index 6499e166d8..f63bb233f6 100644 > --- a/package/racehound/racehound.mk > +++ b/package/racehound/racehound.mk > @@ -22,6 +22,6 @@ RACEHOUND_CONF_OPTS += \ > -DKBUILD_VERSION_STRING=$(LINUX_VERSION_PROBED) > > # cross compile environment for linux kernel module > -RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) > +RACEHOUND_BUILD_ENV = $(LINUX_MAKE_FLAGS) > > $(eval $(cmake-package)) > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Tue Feb 28 15:34:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:34:08 +0100 Subject: [Buildroot] [PATCH] package/wolfssl: Disable broken asm implementations on 32-bit Arm In-Reply-To: <20230207223932.696d9190@windsurf> (Thomas Petazzoni via buildroot's message of "Tue, 7 Feb 2023 22:39:32 +0100") References: <20220614192445.2390329-1-ben.hutchings@mind.be> <20230207223932.696d9190@windsurf> Message-ID: <87pm9tkdn3.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > Hello Ben, > On Tue, 14 Jun 2022 21:24:45 +0200 > Ben Hutchings wrote: >> wolfSSL has ARMv8-A assembly implementations of some functions for >> both A64 and A32 ISAs. However, some of the A32 versions use r11, >> which is usually not allowed: >> >> wolfcrypt/src/port/arm/armv8-aes.c: In function 'wc_AesCbcEncrypt': >> wolfcrypt/src/port/arm/armv8-aes.c:3303:5: error: fp cannot be used in 'asm' here >> 3303 | } >> | ^ >> >> That can be fixed by adding the compiler flag -fomit-frame-pointer, >> but then there is another failure: >> >> /tmp/ccV19DQV.s: Assembler messages: >> /tmp/ccV19DQV.s:248: Error: first transfer register must be even -- `ldrd r11,r10,[r14,#4*14]' >> make[3]: *** [Makefile:5858: wolfcrypt/src/port/arm/src_libwolfssl_la-armv8-chacha.lo] Error 1 >> >> This is definitely not a valid instruction in A32, which suggests that >> this code isn't being tested at all upstream. So disable it here. >> >> Signed-off-by: Ben Hutchings >> --- >> package/wolfssl/wolfssl.mk | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) > Thanks, I finally applied your patch, after adding a reference to the > autobuilder failure it is fixing. I also pushed two other patches to > fix other wolfssl build failures: > https://gitlab.com/buildroot.org/buildroot/-/commit/36b8c9494b56b877fea62f17926f747c7c7bfb8d > https://gitlab.com/buildroot.org/buildroot/-/commit/f79a9c775ff0a59027f274a237d98b5f8d31c022 > https://gitlab.com/buildroot.org/buildroot/-/commit/d8dc5315eb712eca0a5cbf793a6714a47ab6e57e All 3 committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:28:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:28:31 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: silence gcc plugin test Message-ID: <20230228153524.3052086C93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1174407c5f6759e960b20c0e89ee6bae3820ebb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The gcc plugin test was not using the -q option to grep causing it to print the line to stdout, so fix that. While we're at it, adjust the locale check to use grep -q instead of redirecting to /dev/null for consistency with the other checks. Signed-off-by: Peter Korsgaard (cherry picked from commit 4fbd2f6d2cf26225f73f584c3a0cacb1b2476f5f) Signed-off-by: Peter Korsgaard --- 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 cd0e900ff6..3822f0ca0e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -203,7 +203,7 @@ if [ "${PATCH_MAJOR}" -lt 2 ] || [ "${PATCH_MAJOR}" -eq 2 -a "${PATCH_MINOR}" -l exit 1; fi -if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then +if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then if ! which locale > /dev/null ; then echo echo "You need locale support on your build machine to build a toolchain supporting locales" @@ -263,7 +263,7 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then fi fi -if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then +if grep -q ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then if ! echo "#include " | $HOSTCXX_NOCCACHE -I$($HOSTCXX_NOCCACHE -print-file-name=plugin)/include -x c++ -c - -o /dev/null ; then echo echo "Your Buildroot configuration needs a host compiler capable of building gcc plugins." From peter at korsgaard.com Tue Feb 28 15:32:29 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:32:29 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/wolfssl: handle ARM Thumb situation Message-ID: <20230228153524.467CF86CA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34c193e697a45ad41d7e6e5590f4372a6ad7f92a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x By default on ARM32, wolfssl uses assembly instructions that are not supported on Thumb (original Thumb, not Thumb 2), causing a build failure: /tmp/ccgn33X7.s:299: Error: selected processor does not support `umlal r4,r5,r10,ip' in Thumb mode /tmp/ccgn33X7.s:386: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' /tmp/ccgn33X7.s:387: Error: unshifted register required -- `adc r3,r3,#0' /tmp/ccgn33X7.s:395: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' Fix that by passing --with-arm-target=thumb, which tells wolfssl to use a different set of assembly routines. Fixes: http://autobuild.buildroot.net/results/907/907a5967439c3157c426023b0be1e613092d7bfe/ Signed-off-by: Thomas Petazzoni (cherry picked from commit f79a9c775ff0a59027f274a237d98b5f8d31c022) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index f415e11bb5..8f6cba56ec 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -43,4 +43,8 @@ else WOLFSSL_CONF_OPTS += --disable-armasm endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +WOLFSSL_CONF_OPTS += --with-arm-target=thumb +endif + $(eval $(autotools-package)) From peter at korsgaard.com Tue Feb 28 15:32:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:32:05 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/wolfssl: disable broken asm implementations on 32-bit Arm Message-ID: <20230228153524.3B0D786C94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aca885d9ef93a06516c59ea5d2f511145e0a1605 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x wolfSSL has ARMv8-A assembly implementations of some functions for both A64 and A32 ISAs. However, some of the A32 versions use r11, which is usually not allowed: wolfcrypt/src/port/arm/armv8-aes.c: In function 'wc_AesCbcEncrypt': wolfcrypt/src/port/arm/armv8-aes.c:3303:5: error: fp cannot be used in 'asm' here 3303 | } | ^ That can be fixed by adding the compiler flag -fomit-frame-pointer, but then there is another failure: /tmp/ccV19DQV.s: Assembler messages: /tmp/ccV19DQV.s:248: Error: first transfer register must be even -- `ldrd r11,r10,[r14,#4*14]' make[3]: *** [Makefile:5858: wolfcrypt/src/port/arm/src_libwolfssl_la-armv8-chacha.lo] Error 1 This is definitely not a valid instruction in A32, which suggests that this code isn't being tested at all upstream. So disable it here. Fixes: http://autobuild.buildroot.net/results/502/502a2b217845eb290c1961d4740b032462f8ae53/ Signed-off-by: Ben Hutchings Signed-off-by: Thomas Petazzoni (cherry picked from commit 36b8c9494b56b877fea62f17926f747c7c7bfb8d) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index cd3acd9411..f415e11bb5 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -33,14 +33,12 @@ WOLFSSL_CONF_OPTS += --disable-sslv3 endif # enable ARMv8 hardware acceleration -ifeq ($(BR2_ARM_CPU_ARMV8A),y) +ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm # the flag -mstrict-align is needed to prevent build errors caused by # some inline assembly in parts of the AES structure using the "m" # constraint -ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -mstrict-align" -endif else WOLFSSL_CONF_OPTS += --disable-armasm endif From peter at korsgaard.com Tue Feb 28 15:33:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:33:36 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/wolfssl: disable assembly when not supported Message-ID: <20230228153524.51C5486CA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=348b2e25df76b9a603639dc9a99c03442ab673e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x wolfssl contains some assembly code and its configure.ac script enables the assembly code depending on the CPU architecture. However, the detection logic is not sufficient and leads to using the assembly code in situation where it should not. Here are two examples: - As soon as the architecture is mips64/mips64el, it uses assembly code, but that assembly code is not mips64r6 compatible. - As soon as the architecture is RISC-V, it uses assembly code, but that assembly code uses multiplication instructions, without paying attention that the "M" extension may not be available in the RISC-V CPU instruction set. In order to avoid this, we introduce a BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS hidden boolean to decide when to enable/disable assembly code. We set an initial value with the supported CPU architectures, with the exclusion of the problematic cases described above. It is pretty likely that this variable will need tuning progressively, as it is difficult to determine which CPU variants exactly are supported by the assembly code in wolfssl. Fixes: - MIPS64 case: http://autobuild.buildroot.net/results/43e/43ee1a457cbeb986d958c9a70cac0676377661c0/ - RISC-V case: http://autobuild.buildroot.net/results/f05/f056ebe7749a69994afba39a9d4967e2774c45ea/ Signed-off-by: Thomas Petazzoni (cherry picked from commit d8dc5315eb712eca0a5cbf793a6714a47ab6e57e) Signed-off-by: Peter Korsgaard --- package/wolfssl/Config.in | 12 ++++++++++++ package/wolfssl/wolfssl.mk | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/package/wolfssl/Config.in b/package/wolfssl/Config.in index 3a97125e8d..c41bdb6888 100644 --- a/package/wolfssl/Config.in +++ b/package/wolfssl/Config.in @@ -1,3 +1,15 @@ +config BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm || BR2_armeb + default y if BR2_powerpc + default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_mips64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64el && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips || BR2_mipsel + default y if BR2_riscv && BR2_RISCV_ISA_RVM + default y if BR2_s390x + config BR2_PACKAGE_WOLFSSL bool "wolfssl" depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 8f6cba56ec..9f06bb1b4b 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -32,6 +32,12 @@ else WOLFSSL_CONF_OPTS += --disable-sslv3 endif +ifeq ($(BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS),y) +WOLFSSL_CONF_OPTS += --enable-asm +else +WOLFSSL_CONF_OPTS += --disable-asm +endif + # enable ARMv8 hardware acceleration ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm From peter at korsgaard.com Tue Feb 28 15:33:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:33:08 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wolfssl: disable broken asm implementations on 32-bit Arm Message-ID: <20230228153629.2175586CCB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4070181b570640876d1966015cac22757ab50e7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x wolfSSL has ARMv8-A assembly implementations of some functions for both A64 and A32 ISAs. However, some of the A32 versions use r11, which is usually not allowed: wolfcrypt/src/port/arm/armv8-aes.c: In function 'wc_AesCbcEncrypt': wolfcrypt/src/port/arm/armv8-aes.c:3303:5: error: fp cannot be used in 'asm' here 3303 | } | ^ That can be fixed by adding the compiler flag -fomit-frame-pointer, but then there is another failure: /tmp/ccV19DQV.s: Assembler messages: /tmp/ccV19DQV.s:248: Error: first transfer register must be even -- `ldrd r11,r10,[r14,#4*14]' make[3]: *** [Makefile:5858: wolfcrypt/src/port/arm/src_libwolfssl_la-armv8-chacha.lo] Error 1 This is definitely not a valid instruction in A32, which suggests that this code isn't being tested at all upstream. So disable it here. Fixes: http://autobuild.buildroot.net/results/502/502a2b217845eb290c1961d4740b032462f8ae53/ Signed-off-by: Ben Hutchings Signed-off-by: Thomas Petazzoni (cherry picked from commit 36b8c9494b56b877fea62f17926f747c7c7bfb8d) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index cd3acd9411..f415e11bb5 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -33,14 +33,12 @@ WOLFSSL_CONF_OPTS += --disable-sslv3 endif # enable ARMv8 hardware acceleration -ifeq ($(BR2_ARM_CPU_ARMV8A),y) +ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm # the flag -mstrict-align is needed to prevent build errors caused by # some inline assembly in parts of the AES structure using the "m" # constraint -ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -mstrict-align" -endif else WOLFSSL_CONF_OPTS += --disable-armasm endif From peter at korsgaard.com Tue Feb 28 15:28:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:28:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: silence gcc plugin test Message-ID: <20230228153629.136C686CC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f21a9f61c59bf1110b051fcbc73f3dcd9bea32ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The gcc plugin test was not using the -q option to grep causing it to print the line to stdout, so fix that. While we're at it, adjust the locale check to use grep -q instead of redirecting to /dev/null for consistency with the other checks. Signed-off-by: Peter Korsgaard (cherry picked from commit 4fbd2f6d2cf26225f73f584c3a0cacb1b2476f5f) Signed-off-by: Peter Korsgaard --- 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 cd0e900ff6..3822f0ca0e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -203,7 +203,7 @@ if [ "${PATCH_MAJOR}" -lt 2 ] || [ "${PATCH_MAJOR}" -eq 2 -a "${PATCH_MINOR}" -l exit 1; fi -if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then +if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then if ! which locale > /dev/null ; then echo echo "You need locale support on your build machine to build a toolchain supporting locales" @@ -263,7 +263,7 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then fi fi -if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then +if grep -q ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then if ! echo "#include " | $HOSTCXX_NOCCACHE -I$($HOSTCXX_NOCCACHE -print-file-name=plugin)/include -x c++ -c - -o /dev/null ; then echo echo "Your Buildroot configuration needs a host compiler capable of building gcc plugins." From peter at korsgaard.com Tue Feb 28 15:33:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:33:13 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wolfssl: handle ARM Thumb situation Message-ID: <20230228153629.2F57186CCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3430a8c853cce5cab1c7bb7a9975fd494b3e1ee8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x By default on ARM32, wolfssl uses assembly instructions that are not supported on Thumb (original Thumb, not Thumb 2), causing a build failure: /tmp/ccgn33X7.s:299: Error: selected processor does not support `umlal r4,r5,r10,ip' in Thumb mode /tmp/ccgn33X7.s:386: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' /tmp/ccgn33X7.s:387: Error: unshifted register required -- `adc r3,r3,#0' /tmp/ccgn33X7.s:395: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r6' Fix that by passing --with-arm-target=thumb, which tells wolfssl to use a different set of assembly routines. Fixes: http://autobuild.buildroot.net/results/907/907a5967439c3157c426023b0be1e613092d7bfe/ Signed-off-by: Thomas Petazzoni (cherry picked from commit f79a9c775ff0a59027f274a237d98b5f8d31c022) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index f415e11bb5..8f6cba56ec 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -43,4 +43,8 @@ else WOLFSSL_CONF_OPTS += --disable-armasm endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +WOLFSSL_CONF_OPTS += --with-arm-target=thumb +endif + $(eval $(autotools-package)) From peter at korsgaard.com Tue Feb 28 15:33:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:33:30 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wolfssl: disable assembly when not supported Message-ID: <20230228153629.3A93586CCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f176b6fa3708fd27740a69d6c31411439c2be08d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x wolfssl contains some assembly code and its configure.ac script enables the assembly code depending on the CPU architecture. However, the detection logic is not sufficient and leads to using the assembly code in situation where it should not. Here are two examples: - As soon as the architecture is mips64/mips64el, it uses assembly code, but that assembly code is not mips64r6 compatible. - As soon as the architecture is RISC-V, it uses assembly code, but that assembly code uses multiplication instructions, without paying attention that the "M" extension may not be available in the RISC-V CPU instruction set. In order to avoid this, we introduce a BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS hidden boolean to decide when to enable/disable assembly code. We set an initial value with the supported CPU architectures, with the exclusion of the problematic cases described above. It is pretty likely that this variable will need tuning progressively, as it is difficult to determine which CPU variants exactly are supported by the assembly code in wolfssl. Fixes: - MIPS64 case: http://autobuild.buildroot.net/results/43e/43ee1a457cbeb986d958c9a70cac0676377661c0/ - RISC-V case: http://autobuild.buildroot.net/results/f05/f056ebe7749a69994afba39a9d4967e2774c45ea/ Signed-off-by: Thomas Petazzoni (cherry picked from commit d8dc5315eb712eca0a5cbf793a6714a47ab6e57e) Signed-off-by: Peter Korsgaard --- package/wolfssl/Config.in | 12 ++++++++++++ package/wolfssl/wolfssl.mk | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/package/wolfssl/Config.in b/package/wolfssl/Config.in index 3a97125e8d..c41bdb6888 100644 --- a/package/wolfssl/Config.in +++ b/package/wolfssl/Config.in @@ -1,3 +1,15 @@ +config BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm || BR2_armeb + default y if BR2_powerpc + default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_mips64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64el && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips || BR2_mipsel + default y if BR2_riscv && BR2_RISCV_ISA_RVM + default y if BR2_s390x + config BR2_PACKAGE_WOLFSSL bool "wolfssl" depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 8f6cba56ec..9f06bb1b4b 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -32,6 +32,12 @@ else WOLFSSL_CONF_OPTS += --disable-sslv3 endif +ifeq ($(BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS),y) +WOLFSSL_CONF_OPTS += --enable-asm +else +WOLFSSL_CONF_OPTS += --disable-asm +endif + # enable ARMv8 hardware acceleration ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm From peter at korsgaard.com Tue Feb 28 15:48:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:48:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/xz: patch configure due to microblaze patch In-Reply-To: <87sffg41s5.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Wed, 08 Feb 2023 16:25:46 +0100") References: <20230208142358.2721276-1-vfazio@xes-inc.com> <87sffg41s5.fsf@dell.be.48ers.dk> Message-ID: <87lekhkczr.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Vincent" == Vincent Fazio writes: >> Commit bed21bb9b added a patch to change configure.ac but failed to >> update configure which caused build failures due to the timestamp >> difference between configure and configure.ac and the makefile attempting >> to run aclocal. >> XZ_AUTORECONF = YES creates a circular dependency where the host >> autotools need host-xz which also gets patched. Because of this, we need >> to patch xz's configure script manually. >> While we're doing this, correct the language in the commit body of the >> patch, remove a stray whitespace, and fix the offset for configure.ac >> Fixes: bed21bb9b ("package/xz: fix microblaze compiles") >> Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685// >> Signed-off-by: Vincent Fazio > This unfortunately still doesn't work as autoreconf is also triggered if > configure.ac is newer than Makefile.in, so I dropped the patching of > configure.ac which isn't strictly needed and committed, thanks. Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:48:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:48:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/xz: fix microblaze compiles In-Reply-To: <20230207170303.2508780-1-vfazio@xes-inc.com> (Vincent Fazio's message of "Tue, 7 Feb 2023 11:03:03 -0600") References: <20230207170303.2508780-1-vfazio@xes-inc.com> Message-ID: <87h6v5kcze.fsf@dell.be.48ers.dk> >>>>> "Vincent" == Vincent Fazio writes: > From: Vincent Fazio > Patch xz to check if __attribute__((symver ..)) is supported via a > compile check during configure. > Fixes: > http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// > Signed-off-by: Vincent Fazio Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:52:07 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:52:07 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring In-Reply-To: <20230207170040.3503236-1-peter@korsgaard.com> (Peter Korsgaard's message of "Tue, 7 Feb 2023 18:00:39 +0100") References: <20230207170040.3503236-1-peter@korsgaard.com> Message-ID: <87cz5tkct4.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > The vendoring done for cargo / go packages (may) need git, so ensure we > check for it in dependencies, similar to how it is done for packages > directly using git. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:47:00 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:47:00 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/xz: patch configure due to microblaze patch Message-ID: <20230228155307.6159B86CED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f3e133330d96946ceede50d745c8e80487dffd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Commit bed21bb9b added a patch to change configure.ac but failed to update configure which caused build failures due to the timestamp difference between configure and configure.ac and the makefile attempting to run aclocal. XZ_AUTORECONF = YES creates a circular dependency where the host autotools need host-xz which also gets patched. Because of this, we need to patch xz's configure script manually and NOT patch configure.ac so its timestamp stays older than Makefile.in. While we're doing this, correct the language in the commit body of the patch, remove a stray whitespace, and fix the offset for configure.ac Fixes: bed21bb9b ("package/xz: fix microblaze compiles") Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685/ Signed-off-by: Vincent Fazio [Peter: Only patch configure] Signed-off-by: Peter Korsgaard (cherry picked from commit e5a83df8da04f5854c2e248e23dea3af620954cd) Signed-off-by: Peter Korsgaard --- .../xz/0001-Detect-symver-attribute-support.patch | 71 ++++++++++++---------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch index 9ec43ea7a0..462fa9d86b 100644 --- a/package/xz/0001-Detect-symver-attribute-support.patch +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -1,11 +1,11 @@ -From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From f0e0e8bd08b4d4e7c89a5a3b7d9a3c083f7e5432 Mon Sep 17 00:00:00 2001 From: Vincent Fazio -Date: Tue, 7 Feb 2023 08:51:24 -0600 +Date: Wed, 8 Feb 2023 12:58:37 +0000 Subject: [PATCH] Detect symver attribute support -On non-ELF platforms, such as microblaze, builds will fail when trying -to add symver information because __attribute__((symver ..)) is not -supported even though __has_attribute(__symver__) returns true. +On Microblaze, builds will fail when trying to add symver information +because __attribute__((symver ..)) is not supported even though +__has_attribute(__symver__) returns true. Support for symver needs to be detected via a compile test since __has_attribute can report false positives [0]. @@ -18,33 +18,16 @@ it is supported and define a variable to advertise support. Upstream: https://github.com/tukaani-project/xz/pull/32 Signed-off-by: Thomas Petazzoni Signed-off-by: Vincent Fazio +[Peter: patch configure instead of configure.ac so autoreconf isn't +triggered at build time] +Signed-off-by: Peter Korsgaard --- - configure.ac | 9 +++++++++ - src/liblzma/common/common.h | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) + configure | 15 +++++++++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 5ad5589..08c623a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -791,6 +791,15 @@ else - time with Libtool if neither --with-pic nor - --without-pic is used). This define must be - used together with liblzma_linux.map.]) -+ OLD_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE( -+ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } -+ ])], -+ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], -+ [Define to 1 if GCC supports the symver attribute])], -+ []) -+ CFLAGS="$OLD_CFLAGS" - ;; - *) - enable_symbol_versions=generic diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h -index 11fec52..1d2ef9c 100644 +index 671d3bc..27b56ee 100644 --- a/src/liblzma/common/common.h +++ b/src/liblzma/common/common.h @@ -76,7 +76,7 @@ @@ -52,10 +35,36 @@ index 11fec52..1d2ef9c 100644 // is available. This should be far more reliable than looking at compiler // version macros as nowadays especially __GNUC__ is defined by many compilers. -# if lzma_has_attribute(__symver__) -+# if defined(HAVE_SYMVER_ATTRIBUTE) ++# if defined(HAVE_SYMVER_ATTRIBUTE) # define LZMA_SYMVER_API(extnamever, type, intname) \ extern __attribute__((__symver__(extnamever))) \ LZMA_API(type) intname +diff --git a/configure b/configure +index ff0eed5..e685b30 100755 +--- a/configure ++++ b/configure +@@ -16687,6 +16687,21 @@ printf "%s\n" "" >&6; } + + printf "%s\n" "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h + ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO" ++then : ++ ++printf "%s\n" "#define HAVE_SYMVER_ATTRIBUTE 1" >>confdefs.h ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic -- -2.25.1 +2.34.1 From peter at korsgaard.com Tue Feb 28 15:46:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:46:55 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/xz: fix microblaze compiles Message-ID: <20230228155307.53B5886CE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0407c5ed01f8b4e0ddb8f0f6132c18c758e61f7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Patch xz to check if __attribute__((symver ..)) is supported via a compile check during configure. Fixes: http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni (cherry picked from commit bed21bb9b462bece7cd1b9741643aa553ced4d35) Signed-off-by: Peter Korsgaard --- .../xz/0001-Detect-symver-attribute-support.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch new file mode 100644 index 0000000000..9ec43ea7a0 --- /dev/null +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -0,0 +1,61 @@ +From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 08:51:24 -0600 +Subject: [PATCH] Detect symver attribute support + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://github.com/tukaani-project/xz/pull/32 +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vincent Fazio +--- + configure.ac | 9 +++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5ad5589..08c623a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -791,6 +791,15 @@ else + time with Libtool if neither --with-pic nor + --without-pic is used). This define must be + used together with liblzma_linux.map.]) ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE( ++ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ])], ++ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], ++ [Define to 1 if GCC supports the symver attribute])], ++ []) ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic +diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h +index 11fec52..1d2ef9c 100644 +--- a/src/liblzma/common/common.h ++++ b/src/liblzma/common/common.h +@@ -76,7 +76,7 @@ + // too (which doesn't support __symver__) so use it to detect if __symver__ + // is available. This should be far more reliable than looking at compiler + // version macros as nowadays especially __GNUC__ is defined by many compilers. +-# if lzma_has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define LZMA_SYMVER_API(extnamever, type, intname) \ + extern __attribute__((__symver__(extnamever))) \ + LZMA_API(type) intname +-- +2.25.1 + From peter at korsgaard.com Tue Feb 28 15:52:46 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:52:46 +0100 Subject: [Buildroot] [PATCH 2/2] support/dependencies/dependencies.sh: ensure git is >= 2.0.0 for vendoring In-Reply-To: <20230207170040.3503236-2-peter@korsgaard.com> (Peter Korsgaard's message of "Tue, 7 Feb 2023 18:00:40 +0100") References: <20230207170040.3503236-1-peter@korsgaard.com> <20230207170040.3503236-2-peter@korsgaard.com> Message-ID: <878rghkcs1.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > The go vendoring fails on CentOS 7 (which uses git 1.8.3.1) with errors > related to shallow clones: > make docker-compose-source > .. > go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 > github.com/docker/compose/v2/pkg/mocks imports > github.com/theupdateframework/notary/client imports > github.com/docker/go/canonical/json: github.com/docker/go at v1.5.1-1.0.20160303222718-d30aec9fd63c: invalid pseudo-version: git fetch --unshallow -f origin in /home/jacmet/source/buildroot-mirror/output/host/share/go-path/pkg/mod/cache/vcs/48fbd2dfabec81f4c93170677bfc89087d4bec07a2d08f6ca5ce3d17962677ee: exit status 128: > fatal: git fetch-pack: expected shallow list > make[1]: *** [/home/jacmet/source/buildroot-mirror/output/build/docker-compose-2.15.1/.stamp_downloaded] Error 1 > It works with git 2.0.0 (released May 2014, included in Debian 8), so check > for >= 2.0.0 with logic similar to the GNU patch version check. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 15:51:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:51:31 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring Message-ID: <20230228155307.6CC6F86CEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d62b7f7f91ca6fa1bd761fca183a17131ceef751 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The vendoring done for cargo / go packages (may) need git, so ensure we check for it in dependencies, similar to how it is done for packages directly using git. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 8c8ee42bbe6ebb7f20978b06a581c42733197ae2) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f9c0ea71e1..31a8006216 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1250,6 +1250,13 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD +# cargo/go vendoring (may) need git +ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),cargo) +DL_TOOLS_DEPENDENCIES += git +else ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),go) +DL_TOOLS_DEPENDENCIES += git +endif + DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. From peter at korsgaard.com Tue Feb 28 15:46:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:46:51 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/xz: bump to version 5.2.10 Message-ID: <20230228155307.48B3D86CE8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=10ae94b6bbfac57c23508129b942f052f0797dce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit be3a6bf2e7130b084ec4ed65274ff7c4bf67510c) Signed-off-by: Peter Korsgaard --- package/xz/xz.hash | 3 ++- package/xz/xz.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 3aa68791fd..1153e02b4d 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,5 +1,6 @@ # Locally calculated after checking pgp signature -sha256 b65f1d0c2708e57716f4dd2216989a73847ac6fdb4168ffceb155767e22b834b xz-5.2.7.tar.bz2 +# https://tukaani.org/xz/xz-5.2.10.tar.bz2.sig +sha256 01b71df61521d9da698ce3c33148bff06a131628ff037398c09482f3a26e5408 xz-5.2.10.tar.bz2 # Hash for license files sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 004eea94b2..0120d23b85 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.2.7 +XZ_VERSION = 5.2.10 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 15:52:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:52:23 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: ensure git is >= 2.0.0 for vendoring Message-ID: <20230228155307.7899086CE8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=004660e84fa30d8fa033015f452b6ad807622afc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x The go vendoring fails on CentOS 7 (which uses git 1.8.3.1) with errors related to shallow clones: make docker-compose-source .. go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 github.com/docker/compose/v2/pkg/mocks imports github.com/theupdateframework/notary/client imports github.com/docker/go/canonical/json: github.com/docker/go at v1.5.1-1.0.20160303222718-d30aec9fd63c: invalid pseudo-version: git fetch --unshallow -f origin in /home/jacmet/source/buildroot-mirror/output/host/share/go-path/pkg/mod/cache/vcs/48fbd2dfabec81f4c93170677bfc89087d4bec07a2d08f6ca5ce3d17962677ee: exit status 128: fatal: git fetch-pack: expected shallow list make[1]: *** [/home/jacmet/source/buildroot-mirror/output/build/docker-compose-2.15.1/.stamp_downloaded] Error 1 It works with git 2.0.0 (released May 2014, included in Debian 8), so check for >= 2.0.0 with logic similar to the GNU patch version check. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit f229564c36ec64c1f1292b7281ae0bd33840d7a4) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 3822f0ca0e..89ed3c9df9 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -183,6 +183,16 @@ for prog in perl tar wget cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do echo " xargs is usually part of the findutils package in your distribution" fi fi + + # we need git >= 2.0.0 for shallow clones / vendoring + if test $prog = "git" ; then + GIT_VERSION="$(git --version | sed -n 's/^git version \(.*\)/\1/p')" + GIT_MAJOR="$(echo "${GIT_VERSION}" | cut -d . -f 1)" + if [ "${GIT_MAJOR}" -lt 2 ]; then + echo "You have git '${GIT_VERSION}' installed. Git >= 2.0.0 is required" + exit 1 + fi + fi done if test "${missing_progs}" = "yes" ; then From thomas at devoogdt.com Tue Feb 28 15:55:26 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 28 Feb 2023 16:55:26 +0100 Subject: [Buildroot] [PATCH v3 1/3] pkg-cmake: add option to select the Ninja generator In-Reply-To: References: Message-ID: <20230228155528.2430203-1-thomas.devoogdt@barco.com> E.g. Commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 can now be replaced by: WEBKITGTK_CMAKE_NINJA = YES Packages that are selecting Ninja (or overtime another generator), should also use the _BUILD_{ENV,OPTS} variables iso the _MAKE variables. No _INSTALL{,_STAGING,_TARGET}_OPTS used so far: $ grep '_INSTALL_OPTS' $(grep -rl "cmake-package" package/*/*.mk) $ grep '_INSTALL_STAGING_OPTS' $(grep -rl "cmake-package" package/*/*.mk) $ grep '_INSTALL_TARGET_OPTS' $(grep -rl "cmake-package" package/*/*.mk) The _MAKE_{ENV,OPTS} are translated to _BUILD_{ENV,OPTS}: $ grep '_MAKE_ENV =' $(grep -rl "cmake-package" package/*/*.mk) > package/netopeer2/netopeer2.mk:NETOPEER2_MAKE_ENV = \ > package/racehound/racehound.mk:RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) $ grep '_MAKE_OPTS =' $(grep -rl "cmake-package" package/*/*.mk) > package/mariadb/mariadb.mk:HOST_MARIADB_MAKE_OPTS = import_executables > package/zeek/zeek.mk:HOST_ZEEK_MAKE_OPTS = binpac bifcl Only "musepack" seems to overwrite MAKE to enforce -j1, so replace it: $ grep '_MAKE =' $(grep -rl "cmake-package" package/*/*.mk) > package/musepack/musepack.mk:MUSEPACK_MAKE = $(MAKE1) Signed-off-by: Thomas Devoogdt --- v2: - made generator use more generic, other generators can now easily be added if required v3: - add _GENERATOR_PROGRAM - add _GENERATOR_PARALLEL for make - dropped BUILD_OPTS - fix gdal.mk --- package/gdal/gdal.mk | 2 +- package/musepack/musepack.mk | 2 +- package/netopeer2/netopeer2.mk | 2 +- package/pkg-cmake.mk | 31 +++++++++++++++++++------------ package/racehound/racehound.mk | 2 +- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index a3b11c53af..d8ce623283 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -19,7 +19,7 @@ GDAL_SUPPORTS_IN_SOURCE_BUILD = NO # autotools in gdal. We need to force 'make' to use the Makefile, # which is generated by CMake. GNUmakefile and autoconf are dropped in # 3.6 so this can be dropped in future version. -GDAL_MAKE_OPTS += -f Makefile +GDAL_BUILD_OPTS += -f Makefile # gdal at its core only needs host-pkgconf, libgeotiff, proj and tiff # but since by default mrf driver support is enabled, it also needs diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk index fc66c684a5..d4dd08df36 100644 --- a/package/musepack/musepack.mk +++ b/package/musepack/musepack.mk @@ -9,7 +9,7 @@ MUSEPACK_SITE = http://files.musepack.net/source MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz MUSEPACK_DEPENDENCIES = libcuefile libreplaygain MUSEPACK_INSTALL_STAGING = YES -MUSEPACK_MAKE = $(MAKE1) +MUSEPACK_BUILD_OPTS = -j1 MUSEPACK_LICENSE = BSD-3-Clause (*mpcdec), LGPL-2.1+ (*mpcenc) MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 47fcd31acd..2ebb23eccd 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -24,7 +24,7 @@ NETOPEER2_CONF_OPTS = \ # affected mutualy. NETOPEER2_SYSREPO_SHM_PREFIX = sr_buildroot$(subst /,_,$(CONFIG_DIR))_netopeer2 -NETOPEER2_MAKE_ENV = \ +NETOPEER2_BUILD_ENV = \ SYSREPOCTL_EXECUTABLE=$(HOST_DIR)/bin/sysrepoctl \ SYSREPO_SHM_PREFIX=$(NETOPEER2_SYSREPO_SHM_PREFIX) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 8c375779cb..5f5988beb8 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -51,11 +51,6 @@ endif define inner-cmake-package -$(2)_MAKE ?= $$(MAKE) -$(2)_INSTALL_OPTS ?= install -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast - $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES @@ -65,6 +60,16 @@ else $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build endif +ifeq ($$($(3)_CMAKE_NINJA),YES) +$(2)_DEPENDENCIES += host-ninja +$(2)_GENERATOR = "Ninja" +$(2)_GENERATOR_PROGRAM = $(HOST_DIR)/bin/ninja +else +$(2)_GENERATOR = "Unix Makefiles" +$(2)_GENERATOR_PROGRAM = $(firstword $(BR2_MAKE)) +$(2)_GENERATOR_PARALLEL = -j$(PARALLEL_JOBS) +endif + # # Configure step. Only define it if not already defined by the package # .mk file. And take care of the differences between host and target @@ -88,7 +93,8 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ + -DCMAKE_MAKE_PROGRAM="$$($$(PKG)_GENERATOR_PROGRAM)" \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ @@ -119,7 +125,8 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ + -DCMAKE_MAKE_PROGRAM="$$($$(PKG)_GENERATOR_PROGRAM)" \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -166,11 +173,11 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) $$($$(PKG)_GENERATOR_PARALLEL) $$($$(PKG)_BUILD_OPTS) endef else define $(2)_BUILD_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --build $$($$(PKG)_BUILDDIR) $$($$(PKG)_GENERATOR_PARALLEL) $$($$(PKG)_BUILD_OPTS) endef endif endif @@ -181,7 +188,7 @@ endif # ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_BUILD_ENV) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) endef endif @@ -191,7 +198,7 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(STAGING_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_STAGING_OPTS) endef endif @@ -201,7 +208,7 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_BUILD_ENV) DESTDIR=$$(TARGET_DIR) $$(BR2_CMAKE) --install $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_TARGET_OPTS) endef endif diff --git a/package/racehound/racehound.mk b/package/racehound/racehound.mk index 6499e166d8..f63bb233f6 100644 --- a/package/racehound/racehound.mk +++ b/package/racehound/racehound.mk @@ -22,6 +22,6 @@ RACEHOUND_CONF_OPTS += \ -DKBUILD_VERSION_STRING=$(LINUX_VERSION_PROBED) # cross compile environment for linux kernel module -RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) +RACEHOUND_BUILD_ENV = $(LINUX_MAKE_FLAGS) $(eval $(cmake-package)) -- 2.39.2 From thomas at devoogdt.com Tue Feb 28 15:55:27 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 28 Feb 2023 16:55:27 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/webkitgtk: use the CMAKE_NINJA flag In-Reply-To: <20230228155528.2430203-1-thomas.devoogdt@barco.com> References: <20230228155528.2430203-1-thomas.devoogdt@barco.com> Message-ID: <20230228155528.2430203-2-thomas.devoogdt@barco.com> Replaces: commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 Author: Peter Korsgaard Date: Thu Feb 9 18:07:05 2023 +0100 package/webkitgtk: Build with ninja Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Devoogdt --- package/webkitgtk/webkitgtk.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 3263f7fea0..b43f97f0ca 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -13,6 +13,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk +WEBKITGTK_CMAKE_NINJA = YES WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 @@ -139,23 +140,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# webkitgtk needs cmake >= 3.20 when not building with ninja, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WEBKITGTK_CONF_OPTS += -GNinja -WEBKITGTK_DEPENDENCIES += host-ninja - -define WEBKITGTK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - $(eval $(cmake-package)) -- 2.39.2 From thomas at devoogdt.com Tue Feb 28 15:55:28 2023 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 28 Feb 2023 16:55:28 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/wpewebkit: use the CMAKE_NINJA flag In-Reply-To: <20230228155528.2430203-1-thomas.devoogdt@barco.com> References: <20230228155528.2430203-1-thomas.devoogdt@barco.com> Message-ID: <20230228155528.2430203-3-thomas.devoogdt@barco.com> Replaces: commit 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd Author: Peter Korsgaard Date: Thu Feb 9 18:07:06 2023 +0100 package/wpewebkit: Build with ninja Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Devoogdt --- package/wpewebkit/wpewebkit.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 48e5c2f8cd..c1b5dee121 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -14,6 +14,7 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit +WPEWEBKIT_CMAKE_NINJA = YES WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo @@ -103,23 +104,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# wpewebkit needs cmake >= 3.20 when building with the make backend, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WPEWEBKIT_CONF_OPTS += -GNinja -WPEWEBKIT_DEPENDENCIES += host-ninja - -define WPEWEBKIT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - $(eval $(cmake-package)) -- 2.39.2 From mail at jens-maus.de Tue Feb 28 15:48:51 2023 From: mail at jens-maus.de (Jens Maus) Date: Tue, 28 Feb 2023 16:48:51 +0100 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.4 In-Reply-To: <20230220205242.72DA9828C8@busybox.osuosl.org> References: <20230220205242.72DA9828C8@busybox.osuosl.org> Message-ID: Sorry if replying to this mail does not seem to be appropriate, but I just tested the latest Buildroot 2023.02-rc2 version and noticed that the builds of the mesa3d package immediately stopped working because in 22.3.x version of mesa3d the ?glslangValidator? tool seem to be a new dependency of mesa3d and the Buildroot package does not install this host tool itself (no gaslang-tools package), thus the build fails if the build host itself does not have this build tool installed. See here: ? cut here ? make[1]: Entering directory '/home/maus/projekte/thinroot-NUCs/thinroot/buildroot-2023.02-rc2' >>> mesa3d 22.3.4 Building PATH="/home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/host/bin:/home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/host/sbin:/home/maus/bin:/usr/local/bin:/usr/local/petlib/bin:/home/maus/bin:/home/maus/bin:/usr/local/bin:/usr/local/petlib/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/usr/local/cuda/bin:/opt/thinlinc/bin:/usr/local/cuda/bin" PYTHONNOUSERSITE=y /home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/host/bin/ninja -C /home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/build/mesa3d-22.3.4//build ninja: Entering directory `/home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/build/mesa3d-22.3.4//build' [3/845] Generating src/intel/vulkan/float64_spv.h with a custom command FAILED: src/intel/vulkan/float64_spv.h /home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/host/bin/python3 ../src/util/glsl2spirv.py ../src/compiler/glsl/float64.glsl src/intel/vulkan/float64_spv.h --create-entry main --vn float64_spv_source --glsl-version 450 -Olib Traceback (most recent call last): File "/home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/build/mesa3d-22.3.4/build/../src/util/glsl2spirv.py", line 175, in main() File "/home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/build/mesa3d-22.3.4/build/../src/util/glsl2spirv.py", line 171, in main process_file(args) File "/home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/build/mesa3d-22.3.4/build/../src/util/glsl2spirv.py", line 160, in process_file raise ShaderCompileError(message.strip()) ShaderCompileError: /bin/sh: 1: glslangValidator: not found [6/845] Compiling C object src/intel/vulkan/libanv_per_hw_ver90.a.p/genX_blorp_exec.c.o ninja: build stopped: subcommand failed. make[2]: *** [package/pkg-generic.mk:293: /home/maus/projekte/thinroot-NUCs/thinroot/build-intelnuc/build/mesa3d-22.3.4/.stamp_built] Error 1 make[1]: *** [Makefile:82: _all] Error 2 make[1]: Leaving directory '/home/maus/projekte/thinroot-NUCs/thinroot/buildroot-2023.02-rc2' ? cut here ? Best Regards, Jens > Am 28.01.2023 um 22:45 schrieb Thomas Petazzoni via buildroot : > > commit: https://git.buildroot.net/buildroot/commit/?id=08b680f6718746eeabf2b4a18111a0991744cda3 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next > > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.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 c1765c3eaa..03bf635816 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 = 22.3.3 > +MESA3D_HEADERS_VERSION = 22.3.4 > 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 c2ceaa6ead..e4de997f0e 100644 > --- a/package/mesa3d/mesa3d.hash > +++ b/package/mesa3d/mesa3d.hash > @@ -1,5 +1,5 @@ > -# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000699.html > -sha256 bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922 mesa-22.3.3.tar.xz > -sha512 dcf166bc7c80e6ad09337e0188219e5ea4bdc558bc4b4ca35ce30d5421568f6b5328e5508b3175a2696521214e466354d8652ade22468ce448d9f61d5709c8a1 mesa-22.3.3.tar.xz > +# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html > +sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz > +sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz > # License > sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index 9fa2c05230..cf2352a355 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 = 22.3.3 > +MESA3D_VERSION = 22.3.4 > MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz > MESA3D_SITE = https://archive.mesa3d.org > MESA3D_LICENSE = MIT, SGI, Khronos > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Jens Maus, Dresden/Germany http://jens-maus.de/ From peter at korsgaard.com Tue Feb 28 15:47:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:47:18 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/xz: bump to version 5.2.10 Message-ID: <20230228155909.3047486D0D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5d7c229e43c95309692c33c5830a39cf5e2799a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit be3a6bf2e7130b084ec4ed65274ff7c4bf67510c) Signed-off-by: Peter Korsgaard --- package/xz/xz.hash | 3 ++- package/xz/xz.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 3aa68791fd..1153e02b4d 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,5 +1,6 @@ # Locally calculated after checking pgp signature -sha256 b65f1d0c2708e57716f4dd2216989a73847ac6fdb4168ffceb155767e22b834b xz-5.2.7.tar.bz2 +# https://tukaani.org/xz/xz-5.2.10.tar.bz2.sig +sha256 01b71df61521d9da698ce3c33148bff06a131628ff037398c09482f3a26e5408 xz-5.2.10.tar.bz2 # Hash for license files sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 004eea94b2..0120d23b85 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.2.7 +XZ_VERSION = 5.2.10 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 15:47:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:47:13 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/xz: bump to version 5.2.7 Message-ID: <20230228155909.2517286D0B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36f98b644c7d7376fdb6f3815f284cf8fff9ea14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Drop patch (already in version) https://git.tukaani.org/?p=xz.git;a=blob;f=NEWS;h=0205423e79ce8297102096b0fc8b030ddf5b2023;hb=d24a57b7fc7e5e9267b84367cb0788d3acf7f569 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 3ac7d91c874ae9212ae8aee400a194356e301169) Signed-off-by: Peter Korsgaard --- package/xz/xz.hash | 3 +-- package/xz/xz.mk | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 9577e98e80..3aa68791fd 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,6 +1,5 @@ # Locally calculated after checking pgp signature -sha256 5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df xz-5.2.5.tar.bz2 -sha256 98c6cb1042284fe704ec30083f3fc87364ce9ed2ea51f62bbb0ee9d3448717ec xzgrep-ZDI-CAN-16587.patch +sha256 b65f1d0c2708e57716f4dd2216989a73847ac6fdb4168ffceb155767e22b834b xz-5.2.7.tar.bz2 # Hash for license files sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING diff --git a/package/xz/xz.mk b/package/xz/xz.mk index cdb01e06a9..004eea94b2 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.2.5 +XZ_VERSION = 5.2.7 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES @@ -13,10 +13,6 @@ XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+ XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani -XZ_PATCH = xzgrep-ZDI-CAN-16587.patch -# xzgrep-ZDI-CAN-16587.patch -XZ_IGNORE_CVES += CVE-2022-1271 - ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) XZ_CONF_OPTS += --enable-threads else From peter at korsgaard.com Tue Feb 28 15:47:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:47:23 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/xz: fix microblaze compiles Message-ID: <20230228155909.3AFA186D0E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f260466243b3a87b11e6af3eb85b767a95f582f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Patch xz to check if __attribute__((symver ..)) is supported via a compile check during configure. Fixes: http://autobuild.buildroot.org/results/c0d/c0de72e5a34b379e0c516ad08984bb2c4b0abb5c// Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni (cherry picked from commit bed21bb9b462bece7cd1b9741643aa553ced4d35) Signed-off-by: Peter Korsgaard --- .../xz/0001-Detect-symver-attribute-support.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch new file mode 100644 index 0000000000..9ec43ea7a0 --- /dev/null +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -0,0 +1,61 @@ +From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 7 Feb 2023 08:51:24 -0600 +Subject: [PATCH] Detect symver attribute support + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://github.com/tukaani-project/xz/pull/32 +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vincent Fazio +--- + configure.ac | 9 +++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5ad5589..08c623a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -791,6 +791,15 @@ else + time with Libtool if neither --with-pic nor + --without-pic is used). This define must be + used together with liblzma_linux.map.]) ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE( ++ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ])], ++ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], ++ [Define to 1 if GCC supports the symver attribute])], ++ []) ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic +diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h +index 11fec52..1d2ef9c 100644 +--- a/src/liblzma/common/common.h ++++ b/src/liblzma/common/common.h +@@ -76,7 +76,7 @@ + // too (which doesn't support __symver__) so use it to detect if __symver__ + // is available. This should be far more reliable than looking at compiler + // version macros as nowadays especially __GNUC__ is defined by many compilers. +-# if lzma_has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define LZMA_SYMVER_API(extnamever, type, intname) \ + extern __attribute__((__symver__(extnamever))) \ + LZMA_API(type) intname +-- +2.25.1 + From peter at korsgaard.com Tue Feb 28 15:51:26 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:51:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pkg-generic.mk: require git on the host for packages using cargo/go vendoring Message-ID: <20230228155909.5124286D0B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ace092f8f372c6e68a05e93ca24831e0af73e8ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The vendoring done for cargo / go packages (may) need git, so ensure we check for it in dependencies, similar to how it is done for packages directly using git. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 8c8ee42bbe6ebb7f20978b06a581c42733197ae2) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6c3b64b4c8..a9b923fcbc 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1250,6 +1250,13 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD +# cargo/go vendoring (may) need git +ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),cargo) +DL_TOOLS_DEPENDENCIES += git +else ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),go) +DL_TOOLS_DEPENDENCIES += git +endif + DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. From peter at korsgaard.com Tue Feb 28 15:47:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:47:31 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/xz: patch configure due to microblaze patch Message-ID: <20230228155909.4533B86D10@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30f7426bce3fc340d3970d2e5e9e798257611466 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit bed21bb9b added a patch to change configure.ac but failed to update configure which caused build failures due to the timestamp difference between configure and configure.ac and the makefile attempting to run aclocal. XZ_AUTORECONF = YES creates a circular dependency where the host autotools need host-xz which also gets patched. Because of this, we need to patch xz's configure script manually and NOT patch configure.ac so its timestamp stays older than Makefile.in. While we're doing this, correct the language in the commit body of the patch, remove a stray whitespace, and fix the offset for configure.ac Fixes: bed21bb9b ("package/xz: fix microblaze compiles") Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685/ Signed-off-by: Vincent Fazio [Peter: Only patch configure] Signed-off-by: Peter Korsgaard (cherry picked from commit e5a83df8da04f5854c2e248e23dea3af620954cd) Signed-off-by: Peter Korsgaard --- .../xz/0001-Detect-symver-attribute-support.patch | 71 ++++++++++++---------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch index 9ec43ea7a0..462fa9d86b 100644 --- a/package/xz/0001-Detect-symver-attribute-support.patch +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -1,11 +1,11 @@ -From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From f0e0e8bd08b4d4e7c89a5a3b7d9a3c083f7e5432 Mon Sep 17 00:00:00 2001 From: Vincent Fazio -Date: Tue, 7 Feb 2023 08:51:24 -0600 +Date: Wed, 8 Feb 2023 12:58:37 +0000 Subject: [PATCH] Detect symver attribute support -On non-ELF platforms, such as microblaze, builds will fail when trying -to add symver information because __attribute__((symver ..)) is not -supported even though __has_attribute(__symver__) returns true. +On Microblaze, builds will fail when trying to add symver information +because __attribute__((symver ..)) is not supported even though +__has_attribute(__symver__) returns true. Support for symver needs to be detected via a compile test since __has_attribute can report false positives [0]. @@ -18,33 +18,16 @@ it is supported and define a variable to advertise support. Upstream: https://github.com/tukaani-project/xz/pull/32 Signed-off-by: Thomas Petazzoni Signed-off-by: Vincent Fazio +[Peter: patch configure instead of configure.ac so autoreconf isn't +triggered at build time] +Signed-off-by: Peter Korsgaard --- - configure.ac | 9 +++++++++ - src/liblzma/common/common.h | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) + configure | 15 +++++++++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 5ad5589..08c623a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -791,6 +791,15 @@ else - time with Libtool if neither --with-pic nor - --without-pic is used). This define must be - used together with liblzma_linux.map.]) -+ OLD_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE( -+ [__attribute__ ((symver ("test at TEST"))) void foo(void) { } -+ ])], -+ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], -+ [Define to 1 if GCC supports the symver attribute])], -+ []) -+ CFLAGS="$OLD_CFLAGS" - ;; - *) - enable_symbol_versions=generic diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h -index 11fec52..1d2ef9c 100644 +index 671d3bc..27b56ee 100644 --- a/src/liblzma/common/common.h +++ b/src/liblzma/common/common.h @@ -76,7 +76,7 @@ @@ -52,10 +35,36 @@ index 11fec52..1d2ef9c 100644 // is available. This should be far more reliable than looking at compiler // version macros as nowadays especially __GNUC__ is defined by many compilers. -# if lzma_has_attribute(__symver__) -+# if defined(HAVE_SYMVER_ATTRIBUTE) ++# if defined(HAVE_SYMVER_ATTRIBUTE) # define LZMA_SYMVER_API(extnamever, type, intname) \ extern __attribute__((__symver__(extnamever))) \ LZMA_API(type) intname +diff --git a/configure b/configure +index ff0eed5..e685b30 100755 +--- a/configure ++++ b/configure +@@ -16687,6 +16687,21 @@ printf "%s\n" "" >&6; } + + printf "%s\n" "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h + ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++__attribute__ ((symver ("test at TEST"))) void foo(void) { } ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO" ++then : ++ ++printf "%s\n" "#define HAVE_SYMVER_ATTRIBUTE 1" >>confdefs.h ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic -- -2.25.1 +2.34.1 From peter at korsgaard.com Tue Feb 28 15:52:38 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 16:52:38 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: ensure git is >= 2.0.0 for vendoring Message-ID: <20230228155909.5C38D86D0D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff9115673eb413e300aa7cb7e868413489d9024a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The go vendoring fails on CentOS 7 (which uses git 1.8.3.1) with errors related to shallow clones: make docker-compose-source .. go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 github.com/docker/compose/v2/pkg/mocks imports github.com/theupdateframework/notary/client imports github.com/docker/go/canonical/json: github.com/docker/go at v1.5.1-1.0.20160303222718-d30aec9fd63c: invalid pseudo-version: git fetch --unshallow -f origin in /home/jacmet/source/buildroot-mirror/output/host/share/go-path/pkg/mod/cache/vcs/48fbd2dfabec81f4c93170677bfc89087d4bec07a2d08f6ca5ce3d17962677ee: exit status 128: fatal: git fetch-pack: expected shallow list make[1]: *** [/home/jacmet/source/buildroot-mirror/output/build/docker-compose-2.15.1/.stamp_downloaded] Error 1 It works with git 2.0.0 (released May 2014, included in Debian 8), so check for >= 2.0.0 with logic similar to the GNU patch version check. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit f229564c36ec64c1f1292b7281ae0bd33840d7a4) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 3822f0ca0e..89ed3c9df9 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -183,6 +183,16 @@ for prog in perl tar wget cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do echo " xargs is usually part of the findutils package in your distribution" fi fi + + # we need git >= 2.0.0 for shallow clones / vendoring + if test $prog = "git" ; then + GIT_VERSION="$(git --version | sed -n 's/^git version \(.*\)/\1/p')" + GIT_MAJOR="$(echo "${GIT_VERSION}" | cut -d . -f 1)" + if [ "${GIT_MAJOR}" -lt 2 ]; then + echo "You have git '${GIT_VERSION}' installed. Git >= 2.0.0 is required" + exit 1 + fi + fi done if test "${missing_progs}" = "yes" ; then From peter at korsgaard.com Tue Feb 28 16:10:31 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:10:31 +0100 Subject: [Buildroot] [PATCH] package/libressl: security bump to version 3.6.2 In-Reply-To: <20230208075300.15464-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 8 Feb 2023 08:53:00 +0100") References: <20230208075300.15464-1-francois.perrad@gadz.org> Message-ID: <871qm9kbyg.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > security fix: > A malicious certificate revocation list or timestamp response token > would allow an attacker to read arbitrary memory. > Signed-off-by: Francois Perrad Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 16:12:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:12:30 +0100 Subject: [Buildroot] [git commit] utils/brmake: fix shellcheck errors In-Reply-To: <20230208142851.D0048846E3@busybox.osuosl.org> (Arnout Vandecappelle's message of "Wed, 8 Feb 2023 15:28:28 +0100") References: <20230208142851.D0048846E3@busybox.osuosl.org> Message-ID: <87wn41ixap.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > commit: https://git.buildroot.net/buildroot/commit/?id=dc364c6ae65d3167409380b8883123a55270b18d > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > In utils/brmake line 6: > local found ret start d h m mf > ^---^ SC2034: found appears unused. Verify use (or export if used externally). > In utils/brmake line 16: >> >( while read line; do > ^--^ SC2162: read without -r will mangle backslashes. > For both, the suggestions from shellcheck can be applied. > Signed-off-by: Arnout Vandecappelle Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 16:14:42 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:14:42 +0100 Subject: [Buildroot] [PATCH 1/1] boot/afboot-stm32: disable stack-protector In-Reply-To: <20230208165605.73b2b986@windsurf> (Thomas Petazzoni via buildroot's message of "Wed, 8 Feb 2023 16:56:05 +0100") References: <20221231101451.521367-1-fontaine.fabrice@gmail.com> <20230208165605.73b2b986@windsurf> Message-ID: <87sfepix71.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Sat, 31 Dec 2022 11:14:51 +0100 > Fabrice Fontaine wrote: >> Disable stack-protector to avoid the following build failure: >> >> /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld >> -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf >> stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o >> /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: >> stm32f469i-disco.o: in function `main': >> stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' >> /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: >> stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference >> to `__stack_chk_fail' >> /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: >> stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference >> to `__stack_chk_guard' >> >> Fixes: >> - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 >> >> Signed-off-by: Fabrice Fontaine >> --- >> ...003-Makefile-disable-stack-protector.patch | 36 +++++++++++++++++++ >> 1 file changed, 36 insertions(+) >> create mode 100644 boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch > Applied to master, thanks. Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 16:15:40 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:15:40 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: security bump to version 1.1.1t In-Reply-To: <20230208162534.28581-1-ps.report@gmx.net> (Peter Seiderer's message of "Wed, 8 Feb 2023 17:25:34 +0100") References: <20230208162534.28581-1-ps.report@gmx.net> Message-ID: <87o7pdix5f.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Changelog (for details see [1] and [2]): > Changes between 1.1.1s and 1.1.1t [7 Feb 2023] > *) Fixed X.400 address type confusion in X.509 GeneralName. > There is a type confusion vulnerability relating to X.400 address processing > inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING > but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This > vulnerability may allow an attacker who can provide a certificate chain and > CRL (neither of which need have a valid signature) to pass arbitrary > pointers to a memcmp call, creating a possible read primitive, subject to > some constraints. Refer to the advisory for more information. Thanks to > David Benjamin for discovering this issue. (CVE-2023-0286) > This issue has been fixed by changing the public header file definition of > GENERAL_NAME so that x400Address reflects the implementation. It was not > possible for any existing application to successfully use the existing > definition; however, if any application references the x400Address field > (e.g. in dead code), note that the type of this field has changed. There is > no ABI change. > [Hugo Landau] > *) Fixed Use-after-free following BIO_new_NDEF. > The public API function BIO_new_NDEF is a helper function used for > streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL > to support the SMIME, CMS and PKCS7 streaming capabilities, but may also > be called directly by end user applications. > The function receives a BIO from the caller, prepends a new BIO_f_asn1 > filter BIO onto the front of it to form a BIO chain, and then returns > the new head of the BIO chain to the caller. Under certain conditions, > for example if a CMS recipient public key is invalid, the new filter BIO > is freed and the function returns a NULL result indicating a failure. > However, in this case, the BIO chain is not properly cleaned up and the > BIO passed by the caller still retains internal pointers to the previously > freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO > then a use-after-free will occur. This will most likely result in a crash. > (CVE-2023-0215) > [Viktor Dukhovni, Matt Caswell] > *) Fixed Double free after calling PEM_read_bio_ex. > The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and > decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload > data. If the function succeeds then the "name_out", "header" and "data" > arguments are populated with pointers to buffers containing the relevant > decoded data. The caller is responsible for freeing those buffers. It is > possible to construct a PEM file that results in 0 bytes of payload data. > In this case PEM_read_bio_ex() will return a failure code but will populate > the header argument with a pointer to a buffer that has already been freed. > If the caller also frees this buffer then a double free will occur. This > will most likely lead to a crash. > The functions PEM_read_bio() and PEM_read() are simple wrappers around > PEM_read_bio_ex() and therefore these functions are also directly affected. > These functions are also called indirectly by a number of other OpenSSL > functions including PEM_X509_INFO_read_bio_ex() and > SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL > internal uses of these functions are not vulnerable because the caller does > not free the header argument if PEM_read_bio_ex() returns a failure code. > (CVE-2022-4450) > [Kurt Roeckx, Matt Caswell] > *) Fixed Timing Oracle in RSA Decryption. > A timing based side channel exists in the OpenSSL RSA Decryption > implementation which could be sufficient to recover a plaintext across > a network in a Bleichenbacher style attack. To achieve a successful > decryption an attacker would have to be able to send a very large number > of trial messages for decryption. The vulnerability affects all RSA padding > modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. > (CVE-2022-4304) > [Dmitry Belyavsky, Hubert Kario] > Changes between 1.1.1r and 1.1.1s [1 Nov 2022] > *) Fixed a regression introduced in 1.1.1r version not refreshing the > certificate data to be signed before signing the certificate. > [Gibeom Gwon] > Changes between 1.1.1q and 1.1.1r [11 Oct 2022] > *) Fixed the linux-mips64 Configure target which was missing the > SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that > platform. > [Adam Joseph] > *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was > causing incorrect results in some cases as a result. > [Paul Dale] > *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to > report correct results in some cases > [Matt Caswell] > *) Fixed a regression introduced in 1.1.1o for re-signing certificates with > different key sizes > [Todd Short] > *) Added the loongarch64 target > [Shi Pujin] > *) Fixed a DRBG seed propagation thread safety issue > [Bernd Edlinger] > *) Fixed a memory leak in tls13_generate_secret > [Bernd Edlinger] > *) Fixed reported performance degradation on aarch64. Restored the > implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid > 32-bit lane assignment in CTR mode") for 64bit targets only, since it is > reportedly 2-17% slower and the silicon errata only affects 32bit targets. > The new algorithm is still used for 32 bit targets. > [Bernd Edlinger] > *) Added a missing header for memcmp that caused compilation failure on some > platforms > [Gregor Jasny] > [1] https://www.openssl.org/news/cl111.txt > [2] https://www.openssl.org/news/vulnerabilities.html > Signed-off-by: Peter Seiderer Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 16:16:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:16:32 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: update e-mail for Frank Vanbever In-Reply-To: <20230208164447.A0B178477B@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Wed, 8 Feb 2023 17:43:31 +0100") References: <20230208164447.A0B178477B@busybox.osuosl.org> Message-ID: <87h6v5ix3z.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=416213be39c6adb860a9d3e85f0a634139c27cac > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Signed-off-by: Frank Vanbever > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 16:12:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:12:08 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] utils/brmake: fix shellcheck errors Message-ID: <20230228161657.CF48D86D40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6444c034e31f359bfb33a4333994861a87f7fab0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x In utils/brmake line 6: local found ret start d h m mf ^---^ SC2034: found appears unused. Verify use (or export if used externally). In utils/brmake line 16: > >( while read line; do ^--^ SC2162: read without -r will mangle backslashes. For both, the suggestions from shellcheck can be applied. Signed-off-by: Arnout Vandecappelle (cherry picked from commit dc364c6ae65d3167409380b8883123a55270b18d) Signed-off-by: Peter Korsgaard --- utils/brmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/brmake b/utils/brmake index e30119dd10..70dfb6cdc8 100755 --- a/utils/brmake +++ b/utils/brmake @@ -3,7 +3,7 @@ # License: WTFPL, https://spdx.org/licenses/WTFPL.html main() { - local found ret start d h m mf + local ret start d h m mf if ! which unbuffer >/dev/null 2>&1; then printf "you need to install 'unbuffer' (from package expect or expect-dev)\n" >&2 @@ -13,7 +13,7 @@ main() { start=${SECONDS} ( exec 2>&1; unbuffer make "${@}"; ) \ - > >( while read line; do + > >( while read -r line; do printf "%(%Y-%m-%dT%H:%M:%S)T %s\n" -1 "${line}" done \ |tee -a br.log \ From peter at korsgaard.com Tue Feb 28 16:16:24 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:16:24 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] DEVELOPERS: update e-mail for Frank Vanbever Message-ID: <20230228161657.F29FA86D47@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5e528e048c44e6abbd0ac52d044cbc1a083d1f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni (cherry picked from commit 416213be39c6adb860a9d3e85f0a634139c27cac) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1ff3c6e5dc..3c4bcdb223 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1027,7 +1027,7 @@ F: package/ucl/ F: package/upx/ F: package/zxing-cpp/ -N: Frank Vanbever +N: Frank Vanbever F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ From peter at korsgaard.com Tue Feb 28 16:15:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:15:19 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/libopenssl: security bump to version 1.1.1t Message-ID: <20230228161658.AB33186D47@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d50aa1b2c82f8f5f3b4081b393ed183701cdfa0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Changelog (for details see [1] and [2]): Changes between 1.1.1s and 1.1.1t [7 Feb 2023] *) Fixed X.400 address type confusion in X.509 GeneralName. There is a type confusion vulnerability relating to X.400 address processing inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This vulnerability may allow an attacker who can provide a certificate chain and CRL (neither of which need have a valid signature) to pass arbitrary pointers to a memcmp call, creating a possible read primitive, subject to some constraints. Refer to the advisory for more information. Thanks to David Benjamin for discovering this issue. (CVE-2023-0286) This issue has been fixed by changing the public header file definition of GENERAL_NAME so that x400Address reflects the implementation. It was not possible for any existing application to successfully use the existing definition; however, if any application references the x400Address field (e.g. in dead code), note that the type of this field has changed. There is no ABI change. [Hugo Landau] *) Fixed Use-after-free following BIO_new_NDEF. The public API function BIO_new_NDEF is a helper function used for streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL to support the SMIME, CMS and PKCS7 streaming capabilities, but may also be called directly by end user applications. The function receives a BIO from the caller, prepends a new BIO_f_asn1 filter BIO onto the front of it to form a BIO chain, and then returns the new head of the BIO chain to the caller. Under certain conditions, for example if a CMS recipient public key is invalid, the new filter BIO is freed and the function returns a NULL result indicating a failure. However, in this case, the BIO chain is not properly cleaned up and the BIO passed by the caller still retains internal pointers to the previously freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO then a use-after-free will occur. This will most likely result in a crash. (CVE-2023-0215) [Viktor Dukhovni, Matt Caswell] *) Fixed Double free after calling PEM_read_bio_ex. The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload data. If the function succeeds then the "name_out", "header" and "data" arguments are populated with pointers to buffers containing the relevant decoded data. The caller is responsible for freeing those buffers. It is possible to construct a PEM file that results in 0 bytes of payload data. In this case PEM_read_bio_ex() will return a failure code but will populate the header argument with a pointer to a buffer that has already been freed. If the caller also frees this buffer then a double free will occur. This will most likely lead to a crash. The functions PEM_read_bio() and PEM_read() are simple wrappers around PEM_read_bio_ex() and therefore these functions are also directly affected. These functions are also called indirectly by a number of other OpenSSL functions including PEM_X509_INFO_read_bio_ex() and SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL internal uses of these functions are not vulnerable because the caller does not free the header argument if PEM_read_bio_ex() returns a failure code. (CVE-2022-4450) [Kurt Roeckx, Matt Caswell] *) Fixed Timing Oracle in RSA Decryption. A timing based side channel exists in the OpenSSL RSA Decryption implementation which could be sufficient to recover a plaintext across a network in a Bleichenbacher style attack. To achieve a successful decryption an attacker would have to be able to send a very large number of trial messages for decryption. The vulnerability affects all RSA padding modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. (CVE-2022-4304) [Dmitry Belyavsky, Hubert Kario] Changes between 1.1.1r and 1.1.1s [1 Nov 2022] *) Fixed a regression introduced in 1.1.1r version not refreshing the certificate data to be signed before signing the certificate. [Gibeom Gwon] Changes between 1.1.1q and 1.1.1r [11 Oct 2022] *) Fixed the linux-mips64 Configure target which was missing the SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that platform. [Adam Joseph] *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was causing incorrect results in some cases as a result. [Paul Dale] *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to report correct results in some cases [Matt Caswell] *) Fixed a regression introduced in 1.1.1o for re-signing certificates with different key sizes [Todd Short] *) Added the loongarch64 target [Shi Pujin] *) Fixed a DRBG seed propagation thread safety issue [Bernd Edlinger] *) Fixed a memory leak in tls13_generate_secret [Bernd Edlinger] *) Fixed reported performance degradation on aarch64. Restored the implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid 32-bit lane assignment in CTR mode") for 64bit targets only, since it is reportedly 2-17% slower and the silicon errata only affects 32bit targets. The new algorithm is still used for 32 bit targets. [Bernd Edlinger] *) Added a missing header for memcmp that caused compilation failure on some platforms [Gregor Jasny] [1] https://www.openssl.org/news/cl111.txt [2] https://www.openssl.org/news/vulnerabilities.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 040896bd4338f7ca419766578db49af154b762c7) 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 8457df6c0a..ebc56b11dd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1q.tar.gz.sha256 -sha256 d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca openssl-1.1.1q.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 +sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index fc22c20467..6e84f06175 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1q +LIBOPENSSL_VERSION = 1.1.1t LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Tue Feb 28 16:00:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:00:13 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/libressl: security bump to version 3.6.2 Message-ID: <20230228161658.8C78E86D40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13702acd003f951069c57fa1028c7b93c10c7394 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x security fix: A malicious certificate revocation list or timestamp response token would allow an attacker to read arbitrary memory. Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 02f80f5c224a1d8830fab48ae0c19a9e28f2c082) 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 0988e6a36d..907b9cdd06 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 acfac61316e93b919c28d62d53037ca734de85c46b4d703f19fd8395cf006774 libressl-3.6.1.tar.gz +sha256 4be80fff073746cf50b4a8e5babe2795acae98c6b132a9e02519b445dfbfd033 libressl-3.6.2.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 8fd7bccbc4..b5fae7e26e 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.6.1 +LIBRESSL_VERSION = 3.6.2 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 Tue Feb 28 16:15:13 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:15:13 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libopenssl: security bump to version 1.1.1t Message-ID: <20230228161657.E7FEA86D45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbff67534b32f8cbdad108ded4df0aacbfa42e0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Changelog (for details see [1] and [2]): Changes between 1.1.1s and 1.1.1t [7 Feb 2023] *) Fixed X.400 address type confusion in X.509 GeneralName. There is a type confusion vulnerability relating to X.400 address processing inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This vulnerability may allow an attacker who can provide a certificate chain and CRL (neither of which need have a valid signature) to pass arbitrary pointers to a memcmp call, creating a possible read primitive, subject to some constraints. Refer to the advisory for more information. Thanks to David Benjamin for discovering this issue. (CVE-2023-0286) This issue has been fixed by changing the public header file definition of GENERAL_NAME so that x400Address reflects the implementation. It was not possible for any existing application to successfully use the existing definition; however, if any application references the x400Address field (e.g. in dead code), note that the type of this field has changed. There is no ABI change. [Hugo Landau] *) Fixed Use-after-free following BIO_new_NDEF. The public API function BIO_new_NDEF is a helper function used for streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL to support the SMIME, CMS and PKCS7 streaming capabilities, but may also be called directly by end user applications. The function receives a BIO from the caller, prepends a new BIO_f_asn1 filter BIO onto the front of it to form a BIO chain, and then returns the new head of the BIO chain to the caller. Under certain conditions, for example if a CMS recipient public key is invalid, the new filter BIO is freed and the function returns a NULL result indicating a failure. However, in this case, the BIO chain is not properly cleaned up and the BIO passed by the caller still retains internal pointers to the previously freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO then a use-after-free will occur. This will most likely result in a crash. (CVE-2023-0215) [Viktor Dukhovni, Matt Caswell] *) Fixed Double free after calling PEM_read_bio_ex. The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload data. If the function succeeds then the "name_out", "header" and "data" arguments are populated with pointers to buffers containing the relevant decoded data. The caller is responsible for freeing those buffers. It is possible to construct a PEM file that results in 0 bytes of payload data. In this case PEM_read_bio_ex() will return a failure code but will populate the header argument with a pointer to a buffer that has already been freed. If the caller also frees this buffer then a double free will occur. This will most likely lead to a crash. The functions PEM_read_bio() and PEM_read() are simple wrappers around PEM_read_bio_ex() and therefore these functions are also directly affected. These functions are also called indirectly by a number of other OpenSSL functions including PEM_X509_INFO_read_bio_ex() and SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL internal uses of these functions are not vulnerable because the caller does not free the header argument if PEM_read_bio_ex() returns a failure code. (CVE-2022-4450) [Kurt Roeckx, Matt Caswell] *) Fixed Timing Oracle in RSA Decryption. A timing based side channel exists in the OpenSSL RSA Decryption implementation which could be sufficient to recover a plaintext across a network in a Bleichenbacher style attack. To achieve a successful decryption an attacker would have to be able to send a very large number of trial messages for decryption. The vulnerability affects all RSA padding modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. (CVE-2022-4304) [Dmitry Belyavsky, Hubert Kario] Changes between 1.1.1r and 1.1.1s [1 Nov 2022] *) Fixed a regression introduced in 1.1.1r version not refreshing the certificate data to be signed before signing the certificate. [Gibeom Gwon] Changes between 1.1.1q and 1.1.1r [11 Oct 2022] *) Fixed the linux-mips64 Configure target which was missing the SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that platform. [Adam Joseph] *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was causing incorrect results in some cases as a result. [Paul Dale] *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to report correct results in some cases [Matt Caswell] *) Fixed a regression introduced in 1.1.1o for re-signing certificates with different key sizes [Todd Short] *) Added the loongarch64 target [Shi Pujin] *) Fixed a DRBG seed propagation thread safety issue [Bernd Edlinger] *) Fixed a memory leak in tls13_generate_secret [Bernd Edlinger] *) Fixed reported performance degradation on aarch64. Restored the implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid 32-bit lane assignment in CTR mode") for 64bit targets only, since it is reportedly 2-17% slower and the silicon errata only affects 32bit targets. The new algorithm is still used for 32 bit targets. [Bernd Edlinger] *) Added a missing header for memcmp that caused compilation failure on some platforms [Gregor Jasny] [1] https://www.openssl.org/news/cl111.txt [2] https://www.openssl.org/news/vulnerabilities.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 040896bd4338f7ca419766578db49af154b762c7) 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 8457df6c0a..ebc56b11dd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1q.tar.gz.sha256 -sha256 d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca openssl-1.1.1q.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 +sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index fc22c20467..6e84f06175 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1q +LIBOPENSSL_VERSION = 1.1.1t LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Tue Feb 28 16:14:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:14:32 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] boot/afboot-stm32: disable stack-protector Message-ID: <20230228161657.DA55686D42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b97988c0e5acaead9b18790cad8b96092efa56f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Disable stack-protector to avoid the following build failure: /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c33a133704166d602090b0b0d394aa9428e6acd4) Signed-off-by: Peter Korsgaard --- .../0003-Makefile-disable-stack-protector.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch new file mode 100644 index 0000000000..27a81b45d5 --- /dev/null +++ b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch @@ -0,0 +1,36 @@ +From d65b07d6fe438e760fdbc33a8e42650a27d5b417 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 11:09:38 +0100 +Subject: [PATCH] Makefile: disable stack-protector + +Disable stack-protector to avoid the following build failure: + +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': +stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 8f42be1..8da7a25 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ CFLAGS := -mthumb -mcpu=cortex-m4 + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Os -std=gnu99 -Wall + CFLAGS += -fno-builtin ++CFLAGS += -fno-stack-protector + LINKERFLAGS := --gc-sections + + obj-y += gpio.o mpu.o qspi.o start_kernel.o +-- +2.35.1 + From peter at korsgaard.com Tue Feb 28 16:12:19 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:12:19 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] utils/brmake: fix shellcheck errors Message-ID: <20230228161658.961C486D42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76f2ec3f3dff67bdf4c89eb541d09ad964808f67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x In utils/brmake line 6: local found ret start d h m mf ^---^ SC2034: found appears unused. Verify use (or export if used externally). In utils/brmake line 16: > >( while read line; do ^--^ SC2162: read without -r will mangle backslashes. For both, the suggestions from shellcheck can be applied. Signed-off-by: Arnout Vandecappelle (cherry picked from commit dc364c6ae65d3167409380b8883123a55270b18d) Signed-off-by: Peter Korsgaard --- utils/brmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/brmake b/utils/brmake index e30119dd10..70dfb6cdc8 100755 --- a/utils/brmake +++ b/utils/brmake @@ -3,7 +3,7 @@ # License: WTFPL, https://spdx.org/licenses/WTFPL.html main() { - local found ret start d h m mf + local ret start d h m mf if ! which unbuffer >/dev/null 2>&1; then printf "you need to install 'unbuffer' (from package expect or expect-dev)\n" >&2 @@ -13,7 +13,7 @@ main() { start=${SECONDS} ( exec 2>&1; unbuffer make "${@}"; ) \ - > >( while read line; do + > >( while read -r line; do printf "%(%Y-%m-%dT%H:%M:%S)T %s\n" -1 "${line}" done \ |tee -a br.log \ From peter at korsgaard.com Tue Feb 28 16:16:17 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:16:17 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] DEVELOPERS: update e-mail for Frank Vanbever Message-ID: <20230228161658.B715386D40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ad9e059909f3b1cb463a48d7986a0f2776b8f53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni (cherry picked from commit 416213be39c6adb860a9d3e85f0a634139c27cac) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 7df31b1fdb..4647b1429e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1070,7 +1070,7 @@ F: package/ucl/ F: package/upx/ F: package/zxing-cpp/ -N: Frank Vanbever +N: Frank Vanbever F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ From peter at korsgaard.com Tue Feb 28 16:13:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:13:52 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] boot/afboot-stm32: disable stack-protector Message-ID: <20230228161658.9FC4786D45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80a82c28962ed243801f98bf23bf99f155b053e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Disable stack-protector to avoid the following build failure: /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c33a133704166d602090b0b0d394aa9428e6acd4) Signed-off-by: Peter Korsgaard --- .../0003-Makefile-disable-stack-protector.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch new file mode 100644 index 0000000000..27a81b45d5 --- /dev/null +++ b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch @@ -0,0 +1,36 @@ +From d65b07d6fe438e760fdbc33a8e42650a27d5b417 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 11:09:38 +0100 +Subject: [PATCH] Makefile: disable stack-protector + +Disable stack-protector to avoid the following build failure: + +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': +stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 8f42be1..8da7a25 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ CFLAGS := -mthumb -mcpu=cortex-m4 + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Os -std=gnu99 -Wall + CFLAGS += -fno-builtin ++CFLAGS += -fno-stack-protector + LINKERFLAGS := --gc-sections + + obj-y += gpio.o mpu.o qspi.o start_kernel.o +-- +2.35.1 + From peter at korsgaard.com Tue Feb 28 16:18:54 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:18:54 +0100 Subject: [Buildroot] [PATCH] package/rtl8723ds: change CFLAGS approach In-Reply-To: <20230208202816.3089d72d@windsurf> (Thomas Petazzoni via buildroot's message of "Wed, 8 Feb 2023 20:28:16 +0100") References: <20221213211313.735422-1-giulio.benetti@benettiengineering.com> <20230208202816.3089d72d@windsurf> Message-ID: <87cz5tix01.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Tue, 13 Dec 2022 22:13:13 +0100 > Giulio Benetti wrote: >> Instead of undefine endiannes CFLAGS let's change approach. >> Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default >> involving the endianness to be set to little. This way we can set the >> CFLAGS according to architecture with some default define like: >> -DCONFIG_IOCTL_CFG80211 >> -DRTW_USE_CFG80211_STA_EVENT >> -Wno-error >> >> Suggested-by: Arnout Vandecappelle >> Signed-off-by: Giulio Benetti >> --- >> package/rtl8723ds/rtl8723ds.mk | 9 +++++---- >> 1 file changed, 5 insertions(+), 4 deletions(-) > Applied to master, thanks. Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 16:18:23 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:18:23 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/rtl8723ds: change CFLAGS approach Message-ID: <20230228161909.58CA986D47@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e157c87919e6fbe6ad102ab3268045eec8bd3b74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Instead of undefining endiannes CFLAGS let's change the approach. Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default involving the endianness to be set to little. This way we can set the CFLAGS according to architecture with some default define like: -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -Wno-error Suggested-by: Arnout Vandecappelle Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 672544148b3cafa1cda47cd6e4b88210fc693e14) Signed-off-by: Peter Korsgaard --- package/rtl8723ds/rtl8723ds.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 7e27fa75ea..f303a24041 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -8,12 +8,14 @@ RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 -# Undefine the hardcoded CONFIG_LITTLE_ENDIAN -RTL8723DS_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN -# Set endianness -RTL8723DS_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN +RTL8723DS_USER_EXTRA_CLAGS = \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error RTL8723DS_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_I386_PC=n \ CONFIG_RTL8723DS=m \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) \ From raphael.pavlidis at gmail.com Tue Feb 28 16:51:17 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Tue, 28 Feb 2023 17:51:17 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> <20230222232157.380b6109@windsurf> <20230228130843.GC32199@carcass.dev.6wind.com> Message-ID: <886d6be9-94ba-2bc9-5583-4c9400bf3a76@gmail.com> Hi Stephane, On 28.02.23 15:38, stephane gonauer wrote: > Hi, > [SNIP] > > The issue can be reproduce with a simpler configuration. Enabling both > BR2_PACKAGE_LINUX_PAM and BR2_PACKAGE_SHADOW breaks the login. > Here follow a defconfig that reproduces the issue : Does it only happens if BR2_PACKAGE_LINUX_PAM **and** BR2_PACKAGE_SHADOW is enabled? > > /etc/pam.d reference a system-auth that is not present anywhere in the > build directory. This might be the root cause but I'm not sure how to > properly test. If system-auth is only located in /usr/share/factory/etc/pam.d/ and not also in /etc/pam.d/ during boot then something is wrong with the systemd-tmpfiles service. > > --------------- > uildroot/configs$ cat qemu_x86_64_defconfig > BR2_x86_64=y [SNIP] I am not so fit in qemu. Can you provide me the qemu command, so I can reproduce it, please? Thanks, Raphael Pavlidis From stephane.gonauer at 6wind.com Tue Feb 28 17:03:20 2023 From: stephane.gonauer at 6wind.com (stephane gonauer) Date: Tue, 28 Feb 2023 18:03:20 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: <886d6be9-94ba-2bc9-5583-4c9400bf3a76@gmail.com> References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> <20230222232157.380b6109@windsurf> <20230228130843.GC32199@carcass.dev.6wind.com> <886d6be9-94ba-2bc9-5583-4c9400bf3a76@gmail.com> Message-ID: Hi, Yes it also occurs with BR2_PACKAGE_LINUX_PAM **and** BR2_PACKAGE_SHADOW shadow doesn't install /etc/pam.d/system-auth Manually adding the one issued from systemd into the target folder solves the issue. What would be the good way to go ? Adding a patch that installs a system-auth to the shadow package ? And then what should be its content ? The same as the systemd file ? St?phane Le mar. 28 f?vr. 2023 ? 17:51, Raphael Pavlidis a ?crit : > > Hi Stephane, > > On 28.02.23 15:38, stephane gonauer wrote: > > Hi, > > > [SNIP] > > > > The issue can be reproduce with a simpler configuration. Enabling both > > BR2_PACKAGE_LINUX_PAM and BR2_PACKAGE_SHADOW breaks the login. > > Here follow a defconfig that reproduces the issue : > > Does it only happens if BR2_PACKAGE_LINUX_PAM **and** BR2_PACKAGE_SHADOW > is enabled? > > > > > /etc/pam.d reference a system-auth that is not present anywhere in the > > build directory. This might be the root cause but I'm not sure how to > > properly test. > > If system-auth is only located in /usr/share/factory/etc/pam.d/ and not > also in /etc/pam.d/ during boot then something is wrong with the > systemd-tmpfiles service. > > > > > --------------- > > uildroot/configs$ cat qemu_x86_64_defconfig > > BR2_x86_64=y > [SNIP] > > I am not so fit in qemu. Can you provide me the qemu command, so I can > reproduce it, please? > > > Thanks, > Raphael Pavlidis From stephane.gonauer at 6wind.com Tue Feb 28 17:10:17 2023 From: stephane.gonauer at 6wind.com (stephane gonauer) Date: Tue, 28 Feb 2023 18:10:17 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> <20230222232157.380b6109@windsurf> <20230228130843.GC32199@carcass.dev.6wind.com> <886d6be9-94ba-2bc9-5583-4c9400bf3a76@gmail.com> Message-ID: Hi, If my previous email is not clear : - qemu_x86_64_defconfig + BR2_PACKAGE_SHADOW -> works - qemu_x86_64_defconfig + BR2_PACKAGE_SHADOW + BR2_PACKAGE_LINUX_PAM -> fails and there is no "system-auth" file anywhere in the build - qemu_x86_64_defconfig + BR2_PACKAGE_SHADOW + BR2_PACKAGE_LINUX_PAM + BR2_INIT_SYSTEMD-> fails, system-auth is not in /etc/pam.d in the target folder. I don't know what happen at runtime (because I cannot login) in that case I also find target/usr/share/factory/etc/pam.d/system-auth Do you think with/without systemd case should be fixed differently ? In any case the missing file seems to be /etc/pam.d/system-auth. St?phane Le mar. 28 f?vr. 2023 ? 18:03, stephane gonauer a ?crit : > > Hi, > > Yes it also occurs with BR2_PACKAGE_LINUX_PAM **and** BR2_PACKAGE_SHADOW > shadow doesn't install /etc/pam.d/system-auth > > Manually adding the one issued from systemd into the target folder > solves the issue. > > What would be the good way to go ? > Adding a patch that installs a system-auth to the shadow package ? And > then what should be its content ? The same as the systemd file ? > > St?phane > > Le mar. 28 f?vr. 2023 ? 17:51, Raphael Pavlidis > a ?crit : > > > > Hi Stephane, > > > > On 28.02.23 15:38, stephane gonauer wrote: > > > Hi, > > > > > [SNIP] > > > > > > The issue can be reproduce with a simpler configuration. Enabling both > > > BR2_PACKAGE_LINUX_PAM and BR2_PACKAGE_SHADOW breaks the login. > > > Here follow a defconfig that reproduces the issue : > > > > Does it only happens if BR2_PACKAGE_LINUX_PAM **and** BR2_PACKAGE_SHADOW > > is enabled? > > > > > > > > /etc/pam.d reference a system-auth that is not present anywhere in the > > > build directory. This might be the root cause but I'm not sure how to > > > properly test. > > > > If system-auth is only located in /usr/share/factory/etc/pam.d/ and not > > also in /etc/pam.d/ during boot then something is wrong with the > > systemd-tmpfiles service. > > > > > > > > --------------- > > > uildroot/configs$ cat qemu_x86_64_defconfig > > > BR2_x86_64=y > > [SNIP] > > > > I am not so fit in qemu. Can you provide me the qemu command, so I can > > reproduce it, please? > > > > > > Thanks, > > Raphael Pavlidis From peter at korsgaard.com Tue Feb 28 20:10:37 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:10:37 +0100 Subject: [Buildroot] [PATCH 1/2] package/webkitgtk: Build with ninja In-Reply-To: <20230209170707.4066903-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 9 Feb 2023 18:07:05 +0100") References: <20230209170707.4066903-1-peter@korsgaard.com> Message-ID: <878rghim9u.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Webkitgtk needs cmake >= 3.20 when building with the make backend since > webkitgtk 3.8.0. > Cmake 3.20 is above our minimal version in > support/dependencies/check-host-cmake.mk, so this breaks builds on hosts > with cmake >= 3.18 < 3.20 - So use the ninja backend instead. > https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 20:10:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:10:43 +0100 Subject: [Buildroot] [PATCH 2/2] package/wpewebkit: Build with ninja In-Reply-To: <20230209170707.4066903-2-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 9 Feb 2023 18:07:06 +0100") References: <20230209170707.4066903-1-peter@korsgaard.com> <20230209170707.4066903-2-peter@korsgaard.com> Message-ID: <874jr5im9o.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Wpewebkit needs cmake >= 3.20 when building with the make backend since > wpewebkit 3.8.0. > Cmake 3.20 is above our minimal version in > support/dependencies/check-host-cmake.mk, so this breaks builds on hosts > with cmake >= 3.18 < 3.20 - So use the ninja backend instead. > https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 17:34:02 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:34:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/webkitgtk: security bump to version 2.38.4 Message-ID: <20230228201056.0E26186D8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79a25cdeee1f2f0712103f9719d254c2f1564ec7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://webkitgtk.org/2023/02/02/webkitgtk2.38.4-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit ca203080d132d44fc0b62148066b85cce66628fa) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index eff7f5c18f..34fd19d3de 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums -md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz -sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz -sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums +md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz +sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz +sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 1c8ad31176..cc80ad8649 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.3 +WEBKITGTK_VERSION = 2.38.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 17:33:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:33:51 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/webkitgtk: security bump to version 2.38.3 Message-ID: <20230228201056.04D3586D8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7fafc34c8953c5abd93c79495e03f20d4820dd18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Bugfix release, with a security patch for CVE-2022-42799, CVE-2022-42823, CVE-2022-42824, CVE-2022-42852, CVE-2022-42856, CVE-2022-42863, CVE-2022-42867, CVE-2022-46691, CVE-2022-46692, CVE-2022-46698, CVE-2022-46699 and CVE-2022-46700. Release notes: https://webkitgtk.org/2022/10/20/webkitgtk2.38.1-released.html https://webkitgtk.org/2022/11/04/webkitgtk2.38.2-released.html https://webkitgtk.org/2022/12/22/webkitgtk2.38.3-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2022-0010.html https://webkitgtk.org/security/WSA-2022-0011.html Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard (cherry picked from commit d64a089a64aff7c8cbf197beea460d644646243d) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index c2512be9c6..eff7f5c18f 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.0.tar.xz.sums -md5 a69cd8fc05f7299458b4faf1bc99b875 webkitgtk-2.38.0.tar.xz -sha1 6dcb65b8dc56c52f086bfeecfca7920e9cc78348 webkitgtk-2.38.0.tar.xz -sha256 f9ce6375a3b6e1329b0b609f46921e2627dc7ad6224b37b967ab2ea643bc0fbd webkitgtk-2.38.0.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums +md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz +sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz +sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 69e96e33c6..1c8ad31176 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.0 +WEBKITGTK_VERSION = 2.38.3 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 17:34:14 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:34:14 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/webkitgtk: Build with ninja Message-ID: <20230228201056.174EF86D90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5934348516e1c72fd5ab4f1a91c7503e67c3d079 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard (cherry picked from commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index cc80ad8649..1cefc3a472 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -133,4 +133,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# webkitgtk needs cmake >= 3.20 when not building with ninja, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WEBKITGTK_CONF_OPTS += -GNinja +WEBKITGTK_DEPENDENCIES += host-ninja + +define WEBKITGTK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + $(eval $(cmake-package)) From peter at korsgaard.com Tue Feb 28 17:36:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:36:03 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wpewebkit: security bump to version 2.38.4 Message-ID: <20230228201056.354AD86D8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4dfc6797e845678fff52bd7f2f16a2ce7f0af68f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.4.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit 02ace135ee0d31d30021cd000d0594bb6360ca94) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index ccd928b3df..dcd082e045 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums -md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz -sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz -sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums +md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz +sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz +sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b2bbc0301b..54f37fd702 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.3 +WPEWEBKIT_VERSION = 2.38.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 17:35:52 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:35:52 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wpewebkit: security bump to version 2.38.3 Message-ID: <20230228201056.2BA3A86D91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a5776f1a89e6e6e5fb833116f97af8bccc509a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Bugfix release, with security fixes for CVE-2022-42852, CVE-2022-42856, CVE-2022-42867, CVE-2022-46691, CVE-2022-46692, CVE-2022-46698, CVE-2022-46699, CVE-2022-46700, CVE-2022-42823, and CVE-2022-42799. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.3.html https://wpewebkit.org/release/wpewebkit-2.38.2.html https://wpewebkit.org/release/wpewebkit-2.38.1.html Accompanying security advisories: https://wpewebkit.org/security/WSA-2022-0011.html https://wpewebkit.org/security/WSA-2022-0010.html Additionally, the update brings in important bug fixes for the Bubblewrap sandbox support, scrolling in certain web sites, multimedia playback, and build fixes. Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit d8bbc215f5b6c978e9506927675181bbda06567f) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 5dd64b34b7..ccd928b3df 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.0.tar.xz.sums -md5 e0e6b98c86351c39e41da475afc50780 wpewebkit-2.38.0.tar.xz -sha1 66e6dd1c285a21ce50370fb4d60332838d801663 wpewebkit-2.38.0.tar.xz -sha256 e653e12eca63e6371c06d4cd9efcd5492db67f7d9ef324fd5d8668b1151e72b2 wpewebkit-2.38.0.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums +md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz +sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz +sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 001c701ee9..b2bbc0301b 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.0 +WPEWEBKIT_VERSION = 2.38.3 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 17:35:32 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:35:32 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wpewebkit: bump to version 2.38.0 Message-ID: <20230228201056.214B686D8D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08c10193ec536ddd10d32dbcfc67f91f3d75951c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Update to a new major release which brings in improvements and a few new features. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.0.html This release also includes security fixes for CVE-2022-32886, CVE-2022-32891, and CVE-2022-32912. Accompanying security advisory: https://wpewebkit.org/security/WSA-2022-0009.html Both building documentation and support for gobject-introspection have been added in this release. Version 2.38.0 also introduces a new WebRTC implementation based on GstWebRTC. Options for them are explicitly left disabled to keep the configuration as it was, and may be enabled in follow-up patches. Lastly, the SILENCE_CROSS_COMPILATION_NOTICES option removed because it no longer exists. The patch that fixes the build on 32-bit ARM targets is also updated for the 2.38 release series. Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit 917f05975f9c60eca92988ea9974de55a9e91e44) Signed-off-by: Peter Korsgaard --- ...NEON.cpp-fails-to-build-NEON-fast-path-se.patch | 30 ++++++++++++++++------ package/wpewebkit/wpewebkit.hash | 8 +++--- package/wpewebkit/wpewebkit.mk | 8 +++--- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch index b61909b2ac..ea1676abb6 100644 --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch @@ -1,4 +1,4 @@ -From 59c9e3a4aeb4753be97b3817d106816d9a4ebe73 Mon Sep 17 00:00:00 2001 +From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 11:19:06 +0300 Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems @@ -35,15 +35,28 @@ left for a follow-up fix. Signed-off-by: Adrian Perez de Castro [Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182] --- + Source/WebCore/Sources.txt | 1 + .../cpu/arm/filters/FELightingNEON.cpp | 4 +- - .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- + .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- .../graphics/filters/DistantLightSource.h | 4 ++ .../platform/graphics/filters/FELighting.h | 7 --- .../graphics/filters/PointLightSource.h | 4 ++ .../graphics/filters/SpotLightSource.h | 4 ++ .../software/FELightingSoftwareApplier.h | 16 ++++++ - 7 files changed, 56 insertions(+), 35 deletions(-) + 8 files changed, 58 insertions(+), 36 deletions(-) +diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt +index 8ce3510fe1a8..efd56bcb8746 100644 +--- a/Source/WebCore/Sources.txt ++++ b/Source/WebCore/Sources.txt +@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp + platform/graphics/WOFFFileFormat.cpp + platform/graphics/WidthIterator.cpp + platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp ++platform/graphics/cpu/arm/filters/FELightingNEON.cpp + platform/graphics/displaylists/DisplayList.cpp + platform/graphics/displaylists/DisplayListDrawingContext.cpp + platform/graphics/displaylists/DisplayListItems.cpp diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp index f6ff8c20a5a8..42a97ffc5372 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp @@ -67,7 +80,7 @@ index f6ff8c20a5a8..42a97ffc5372 100644 // Calling a powf function from the assembly code would require to save // and reload a lot of NEON registers. Since the base is in range [0..1] diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index b17c603d40d3..e4629cda0b7c 100644 +index b17c603d40d3..c6d17f573eca 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h @@ -24,14 +24,15 @@ @@ -98,9 +111,10 @@ index b17c603d40d3..e4629cda0b7c 100644 { - alignas(16) FELightingFloatArgumentsForNeon floatArguments; - FELightingPaintingDataForNeon neonData = { +- data.pixels->data(), + WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; + WebCore::FELightingPaintingDataForNeon neonData = { - data.pixels->data(), ++ data.pixels->bytes(), 1, - data.widthDecreasedByOne - 1, - data.heightDecreasedByOne - 1, @@ -244,7 +258,7 @@ index 0c073bc13f8c..e0db00545c17 100644 float m_surfaceScale; float m_diffuseConstant; diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h -index 5c9c7fb783e6..e53aa012ac1c 100644 +index 126b3b2350f6..d906db21aa9c 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ @@ -259,7 +273,7 @@ index 5c9c7fb783e6..e53aa012ac1c 100644 class PointLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h -index 04e331ec4ec0..763c8d400b00 100644 +index 641b205f986d..64380d9b6eb8 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ @@ -274,7 +288,7 @@ index 04e331ec4ec0..763c8d400b00 100644 class SpotLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h -index 3875b0a4b5de..6d3864aafb9a 100644 +index c974d92115ff..e2896660cfbd 100644 --- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h @@ -36,6 +36,7 @@ diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 9c8beecf2e..5dd64b34b7 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.36.8.tar.xz.sums -md5 939dc646bb6652fde9a5b6512c17fc58 wpewebkit-2.36.8.tar.xz -sha1 f45936c578f7dcfbb6064e87da6c098efe093e68 wpewebkit-2.36.8.tar.xz -sha256 8d42a349c910b2d0961b8d34fecef29cec3d21e3af5977346c90026692dc75eb wpewebkit-2.36.8.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.0.tar.xz.sums +md5 e0e6b98c86351c39e41da475afc50780 wpewebkit-2.38.0.tar.xz +sha1 66e6dd1c285a21ce50370fb4d60332838d801663 wpewebkit-2.38.0.tar.xz +sha256 e653e12eca63e6371c06d4cd9efcd5492db67f7d9ef324fd5d8668b1151e72b2 wpewebkit-2.38.0.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 0ff8204519..001c701ee9 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.36.8 +WPEWEBKIT_VERSION = 2.38.0 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -22,9 +22,11 @@ WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ -DENABLE_ACCESSIBILITY=OFF \ -DENABLE_API_TESTS=OFF \ + -DENABLE_DOCUMENTATION=OFF \ + -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=OFF \ - -DUSE_SOUP2=ON \ - -DSILENCE_CROSS_COMPILATION_NOTICES=ON + -DENABLE_WEB_RTC=OFF \ + -DUSE_SOUP2=ON ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) WPEWEBKIT_CONF_OPTS += \ From peter at korsgaard.com Tue Feb 28 17:36:10 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:36:10 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wpewebkit: Build with ninja Message-ID: <20230228201056.3EC8386D8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5048dfff7c72660d9e7fc934713ed43849fb6c4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard (cherry picked from commit 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 54f37fd702..b9c2fef395 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -103,4 +103,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# wpewebkit needs cmake >= 3.20 when building with the make backend, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WPEWEBKIT_CONF_OPTS += -GNinja +WPEWEBKIT_DEPENDENCIES += host-ninja + +define WPEWEBKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + $(eval $(cmake-package)) From peter at korsgaard.com Tue Feb 28 17:32:35 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 18:32:35 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/webkitgtk: bump to version 2.38.0 Message-ID: <20230228201055.EEE7686D8D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba4de93b333c6e7f8578171d4b9a28dbbd5abd7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Update to a new major release which brings in improvements and a few new features. Release notes: https://webkitgtk.org/2022/09/16/webkitgtk2.38.0-released.html This release also includes security fixes for CVE-2022-32886, CVE-2022-32891, and CVE-2022-32912. Accompanying security advisory: https://webkitgtk.org/security/WSA-2022-0009.html The CMake option to build the documentation has been renamed from ENABLE_GTK_DOC to ENABLE_DOCUMENTATION, therefore update the build recipe accordingly. Option USE_LIBNOTIFY is no longer available, as WebKit now uses the notification portal D-Bus API directly without relying on libnotify. Lastly, version 2.38.0 introduces a new WebRTC implementation based on GstWebRTC which is left disabled for now to keep the existing status quo (WebRTC not available), and adding an option to enable it can be done in a follow-up patch. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit ce4b87be82d13d3a042b4e78fe5835f3c8ddc29d) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 7c6d7d65b5..c2512be9c6 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.36.7.tar.xz.sums -md5 466351cf35e4f742590919380b5dee93 webkitgtk-2.36.7.tar.xz -sha1 36078148b6e0ef002f0279b25b1caf173f851ac8 webkitgtk-2.36.7.tar.xz -sha256 0c260cf2b32f0481d017670dfed1b61e554967cd067195606c9f9eb5fe731743 webkitgtk-2.36.7.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.0.tar.xz.sums +md5 a69cd8fc05f7299458b4faf1bc99b875 webkitgtk-2.38.0.tar.xz +sha1 6dcb65b8dc56c52f086bfeecfca7920e9cc78348 webkitgtk-2.38.0.tar.xz +sha256 f9ce6375a3b6e1329b0b609f46921e2627dc7ad6224b37b967ab2ea643bc0fbd webkitgtk-2.38.0.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index d1c517452d..69e96e33c6 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.36.7 +WEBKITGTK_VERSION = 2.38.0 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -19,12 +19,12 @@ WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \ WEBKITGTK_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ -DENABLE_GAMEPAD=OFF \ + -DENABLE_DOCUMENTATION=OFF \ -DENABLE_GEOLOCATION=OFF \ - -DENABLE_GTKDOC=OFF \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ + -DENABLE_WEB_RTC=OFF \ -DPORT=GTK \ - -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ -DUSE_SOUP2=ON \ From peter at korsgaard.com Tue Feb 28 16:23:41 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:23:41 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/webkitgtk: Build with ninja Message-ID: <20230228201209.1CFC186D98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f27eea92640b6e0e75196c983085a2e61fbaf551 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard (cherry picked from commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b1bca7b88a..22845af8b4 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -139,4 +139,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# webkitgtk needs cmake >= 3.20 when not building with ninja, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WEBKITGTK_CONF_OPTS += -GNinja +WEBKITGTK_DEPENDENCIES += host-ninja + +define WEBKITGTK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + $(eval $(cmake-package)) From peter at korsgaard.com Tue Feb 28 16:23:58 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 17:23:58 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/wpewebkit: Build with ninja Message-ID: <20230228201209.3068686D99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d80c54ba7bfad405a472d47330b91ebe417b5af9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard (cherry picked from commit 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b2bbc0301b..8ddee503e0 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -103,4 +103,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# wpewebkit needs cmake >= 3.20 when building with the make backend, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WPEWEBKIT_CONF_OPTS += -GNinja +WPEWEBKIT_DEPENDENCIES += host-ninja + +define WPEWEBKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + $(eval $(cmake-package)) From peter at korsgaard.com Tue Feb 28 20:21:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:21:06 +0100 Subject: [Buildroot] [git commit] configs/asus_tinker_rk3288: fix boot by prepending tpl to spl+u-boot In-Reply-To: <20230210223129.C431885174@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Fri, 10 Feb 2023 23:29:10 +0100") References: <20230210223129.C431885174@busybox.osuosl.org> Message-ID: <87ttz5h77x.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=e738d5b7251918a62922f3f3b6491b642f9ec182 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > During the last U-boot version bump it's not been noted that the TPL > was not prepended to SPL anymore preventing the board to boot, so > let's copy TPL to the image folder, prepend it to u-boot-spl-dtb.bin > and place it at offset 32KB, where RK3288 bootrom expects to find > it. Let's also place u-boot-dtb separated from SPL at offset 8M, where > the SPL expects it to find it. > Signed-off-by: Giulio Benetti > Signed-off-by: Thomas Petazzoni This is presumably the case since commit cb3b484505d6e1 (configs/asus_tinker_rk3288: bump to Linux kernel 5.14.13 and u-boot 2021.10), so committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 20:22:34 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:22:34 +0100 Subject: [Buildroot] [git commit] board/asus/tinker: rename label linux-next to linux in extlinux.conf In-Reply-To: <20230210223129.CE5C585178@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Fri, 10 Feb 2023 23:30:08 +0100") References: <20230210223129.CE5C585178@busybox.osuosl.org> Message-ID: <87pm9th75h.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=d4b46bc3c6997e32050b332d7578f0cb289b57be > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > We're not using next branch so let's rename label linux-next to linux. > Signed-off-by: Giulio Benetti > Signed-off-by: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From ju.o at free.fr Tue Feb 28 20:27:20 2023 From: ju.o at free.fr (Julien Olivain) Date: Tue, 28 Feb 2023 21:27:20 +0100 Subject: [Buildroot] [PATCH next 1/1] package/openmpi: bump to version 4.1.5 Message-ID: <20230228202720.6762-1-ju.o@free.fr> For change log, see: https://github.com/open-mpi/ompi/blob/v4.1.5/NEWS#L61 Signed-off-by: Julien Olivain --- Patch tested on branch next at commit b793f3a with commands: make check-package ... 0 warnings generated utils/test-pkg -a -p openmpi arm-aarch64 [ 1/45]: OK bootlin-aarch64-glibc [ 2/45]: OK bootlin-arcle-hs38-uclibc [ 3/45]: OK bootlin-armv5-uclibc [ 4/45]: OK bootlin-armv7-glibc [ 5/45]: OK bootlin-armv7m-uclibc [ 6/45]: SKIPPED bootlin-armv7-musl [ 7/45]: OK bootlin-m68k-5208-uclibc [ 8/45]: SKIPPED bootlin-m68k-68040-uclibc [ 9/45]: OK bootlin-microblazeel-uclibc [10/45]: OK bootlin-mipsel32r6-glibc [11/45]: OK bootlin-mipsel-uclibc [12/45]: OK bootlin-nios2-glibc [13/45]: OK bootlin-openrisc-uclibc [14/45]: OK bootlin-powerpc64le-power8-glibc [15/45]: OK bootlin-powerpc-e500mc-uclibc [16/45]: OK bootlin-riscv32-glibc [17/45]: OK bootlin-riscv64-glibc [18/45]: OK bootlin-riscv64-musl [19/45]: OK bootlin-s390x-z13-glibc [20/45]: OK bootlin-sh4-uclibc [21/45]: OK bootlin-sparc64-glibc [22/45]: OK bootlin-sparc-uclibc [23/45]: SKIPPED bootlin-x86-64-glibc [24/45]: OK bootlin-x86-64-musl [25/45]: OK bootlin-x86-64-uclibc [26/45]: OK bootlin-xtensa-uclibc [27/45]: OK br-arm-basic [28/45]: SKIPPED br-arm-full-nothread [29/45]: SKIPPED br-arm-full-static [30/45]: SKIPPED br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [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-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 7 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/openmpi/openmpi.hash | 6 +++--- package/openmpi/openmpi.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openmpi/openmpi.hash b/package/openmpi/openmpi.hash index 745ed7c580..567ffe4833 100644 --- a/package/openmpi/openmpi.hash +++ b/package/openmpi/openmpi.hash @@ -1,6 +1,6 @@ # From: https://www.open-mpi.org/software/ompi/v4.1/ -md5 f057e12aabaf7dd5a6a658180fca404e openmpi-4.1.4.tar.bz2 -sha1 357c61a8e06e103d987c0e4a054e8780a034c8b1 openmpi-4.1.4.tar.bz2 -sha256 92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d openmpi-4.1.4.tar.bz2 +md5 bb045df2d600744c2231c78b31a20da3 openmpi-4.1.5.tar.bz2 +sha1 eba2e6f9ee0c39fbca0a8cf53a79c9ed29643284 openmpi-4.1.5.tar.bz2 +sha256 a640986bc257389dd379886fdae6264c8cfa56bc98b71ce3ae3dfbd8ce61dbe3 openmpi-4.1.5.tar.bz2 # Locally computed sha256 2db71de9577ebfe15c186605844c470dcecd3717f4ef0118c9440d801c0f58f8 LICENSE diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index f14b55ced5..82a4b3eb1c 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -5,7 +5,7 @@ ################################################################################ OPENMPI_VERSION_MAJOR = 4.1 -OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).4 +OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).5 OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2 OPENMPI_LICENSE = BSD-3-Clause @@ -15,7 +15,7 @@ OPENMPI_INSTALL_STAGING = YES # The macro searching for IME (Infinite Memory Engine) filesystem # brings "-I/usr/local/include" in the CPPFLAGS, even if not # found. This makes the configuration fail. See: -# https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 +# https://github.com/open-mpi/ompi/blob/v4.1.5/config/ompi_check_ime.m4#L35 # Disable explicitly to avoid the issue. OPENMPI_CONF_OPTS = --without-ime -- 2.39.2 From peter at korsgaard.com Tue Feb 28 20:34:51 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:34:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/ssdp-responder; drop systemd unit installation, not needed In-Reply-To: <20230210184704.3381562-1-troglobit@gmail.com> (Joachim Wiberg's message of "Fri, 10 Feb 2023 19:47:04 +0100") References: <20230210184704.3381562-1-troglobit@gmail.com> Message-ID: <87lekhh6l0.fsf@dell.be.48ers.dk> >>>>> "Joachim" == Joachim Wiberg writes: > When systemd is enabled the ssdp-responder build system already installs > the unit file, with the correct name, so we can safely drop this. > This fixes the recurring autobuilder problems that cropped up the last > week+ or so after fixing the spelling error in 6e0ba6b. > - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 > - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 > - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 > - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 > - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 > Signed-off-by: Joachim Wiberg Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 20:34:30 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:34:30 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/ssdp-responder; drop systemd unit installation, not needed Message-ID: <20230228203520.8342F86DB0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d613d478ee2e4f16cf68e508451d1a26a7a612a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x When systemd is enabled the ssdp-responder build system already installs the unit file, with the correct name, so we can safely drop this. This fixes the recurring autobuilder problems that cropped up the last week+ or so after fixing the spelling error in 6e0ba6b. - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni (cherry picked from commit d6e3d36a85f19acedd2ed58f5b8616dbf24f57a4) Signed-off-by: Peter Korsgaard --- package/ssdp-responder/ssdp-responder.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index d878e3c629..9b477e48cc 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,9 +25,4 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service -endef - $(eval $(autotools-package)) From peter at korsgaard.com Tue Feb 28 20:21:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:21:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] configs/asus_tinker_rk3288: fix boot by prepending tpl to spl+u-boot Message-ID: <20230228203520.6C6E686DAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=305b06687d312159deeb162d3288d0e9e47c7a16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x During the last U-boot version bump it's not been noted that the TPL was not prepended to SPL anymore preventing the board to boot, so let's copy TPL to the image folder, prepend it to u-boot-spl-dtb.bin and place it at offset 32KB, where RK3288 bootrom expects to find it. Let's also place u-boot-dtb separated from SPL at offset 8M, where the SPL expects it to find it. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit e738d5b7251918a62922f3f3b6491b642f9ec182) Signed-off-by: Peter Korsgaard --- board/asus/tinker/genimage.cfg | 11 +++++++++-- board/asus/tinker/post-build.sh | 4 ++-- configs/asus_tinker_rk3288_defconfig | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/board/asus/tinker/genimage.cfg b/board/asus/tinker/genimage.cfg index a4b1e8d608..fa7fd734f2 100644 --- a/board/asus/tinker/genimage.cfg +++ b/board/asus/tinker/genimage.cfg @@ -2,12 +2,19 @@ image sdcard.img { hdimage { } - partition u-boot-spl-dtb { + partition u-boot-tpl-spl-dtb { in-partition-table = "no" - image = "u-boot-spl-dtb.img" + image = "u-boot-tpl-spl-dtb.img" offset = 32K } + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 8M + size = 30M + } + partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/asus/tinker/post-build.sh b/board/asus/tinker/post-build.sh index 8108ed83ff..ffbbcdeb58 100755 --- a/board/asus/tinker/post-build.sh +++ b/board/asus/tinker/post-build.sh @@ -3,7 +3,7 @@ MKIMAGE=$HOST_DIR/bin/mkimage BOARD_DIR="$(dirname $0)" -$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img -cat $BINARIES_DIR/u-boot-dtb.bin >> $BINARIES_DIR/u-boot-spl-dtb.img +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl-dtb.bin > $BINARIES_DIR/u-boot-tpl-spl-dtb.img install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 6963fa939f..02b340a7f1 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y From peter at korsgaard.com Tue Feb 28 20:22:01 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:22:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] board/asus/tinker: rename label linux-next to linux in extlinux.conf Message-ID: <20230228203520.76EB586DAF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72697a95c72d02cf852a1f59d9d48351deff2f08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x We're not using next branch so let's rename label linux-next to linux. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit d4b46bc3c6997e32050b332d7578f0cb289b57be) Signed-off-by: Peter Korsgaard --- board/asus/tinker/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf index 136af0debd..bb96ddb893 100644 --- a/board/asus/tinker/extlinux.conf +++ b/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ -label Tinker linux-next +label Tinker linux kernel /boot/uImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait From peter at korsgaard.com Tue Feb 28 20:22:15 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:22:15 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] board/asus/tinker: rename label linux-next to linux in extlinux.conf Message-ID: <20230228203626.AF86686DBA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00bc11c84f85363679bf79f52c048eb5c1752416 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x We're not using next branch so let's rename label linux-next to linux. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit d4b46bc3c6997e32050b332d7578f0cb289b57be) Signed-off-by: Peter Korsgaard --- board/asus/tinker/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf index 136af0debd..bb96ddb893 100644 --- a/board/asus/tinker/extlinux.conf +++ b/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ -label Tinker linux-next +label Tinker linux kernel /boot/uImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait From peter at korsgaard.com Tue Feb 28 20:15:03 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:15:03 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] configs/asus_tinker_rk3288: fix boot by prepending tpl to spl+u-boot Message-ID: <20230228203626.A60C086DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a31551e52ac74366786d943541b889bf33eba14f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x During the last U-boot version bump it's not been noted that the TPL was not prepended to SPL anymore preventing the board to boot, so let's copy TPL to the image folder, prepend it to u-boot-spl-dtb.bin and place it at offset 32KB, where RK3288 bootrom expects to find it. Let's also place u-boot-dtb separated from SPL at offset 8M, where the SPL expects it to find it. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit e738d5b7251918a62922f3f3b6491b642f9ec182) Signed-off-by: Peter Korsgaard --- board/asus/tinker/genimage.cfg | 11 +++++++++-- board/asus/tinker/post-build.sh | 4 ++-- configs/asus_tinker_rk3288_defconfig | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/board/asus/tinker/genimage.cfg b/board/asus/tinker/genimage.cfg index a4b1e8d608..fa7fd734f2 100644 --- a/board/asus/tinker/genimage.cfg +++ b/board/asus/tinker/genimage.cfg @@ -2,12 +2,19 @@ image sdcard.img { hdimage { } - partition u-boot-spl-dtb { + partition u-boot-tpl-spl-dtb { in-partition-table = "no" - image = "u-boot-spl-dtb.img" + image = "u-boot-tpl-spl-dtb.img" offset = 32K } + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 8M + size = 30M + } + partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/asus/tinker/post-build.sh b/board/asus/tinker/post-build.sh index 8108ed83ff..ffbbcdeb58 100755 --- a/board/asus/tinker/post-build.sh +++ b/board/asus/tinker/post-build.sh @@ -3,7 +3,7 @@ MKIMAGE=$HOST_DIR/bin/mkimage BOARD_DIR="$(dirname $0)" -$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img -cat $BINARIES_DIR/u-boot-dtb.bin >> $BINARIES_DIR/u-boot-spl-dtb.img +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl-dtb.bin > $BINARIES_DIR/u-boot-tpl-spl-dtb.img install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 6963fa939f..02b340a7f1 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y From peter at korsgaard.com Tue Feb 28 20:31:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:31:08 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/ssdp-responder; drop systemd unit installation, not needed Message-ID: <20230228203626.B8FA386DBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25b3c5ecb6c5043676f3bed8a5923279989994c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x When systemd is enabled the ssdp-responder build system already installs the unit file, with the correct name, so we can safely drop this. This fixes the recurring autobuilder problems that cropped up the last week+ or so after fixing the spelling error in 6e0ba6b. - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni (cherry picked from commit d6e3d36a85f19acedd2ed58f5b8616dbf24f57a4) Signed-off-by: Peter Korsgaard --- package/ssdp-responder/ssdp-responder.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index d878e3c629..9b477e48cc 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,9 +25,4 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service -endef - $(eval $(autotools-package)) From raphael.pavlidis at gmail.com Tue Feb 28 20:38:57 2023 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Tue, 28 Feb 2023 21:38:57 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/shadow: new package In-Reply-To: References: <20221224171920.11256-1-raphael.pavlidis@gmail.com> <20230222232157.380b6109@windsurf> <20230228130843.GC32199@carcass.dev.6wind.com> <886d6be9-94ba-2bc9-5583-4c9400bf3a76@gmail.com> Message-ID: <16816a3d-c62a-c1e9-9409-78541956b1ba@gmail.com> Hi Stephane, On 28.02.23 18:10, stephane gonauer wrote: > Hi, > > If my previous email is not clear : > > - qemu_x86_64_defconfig + BR2_PACKAGE_SHADOW -> works > - qemu_x86_64_defconfig + BR2_PACKAGE_SHADOW + BR2_PACKAGE_LINUX_PAM > -> fails and there is no "system-auth" file anywhere in the build > - qemu_x86_64_defconfig + BR2_PACKAGE_SHADOW + BR2_PACKAGE_LINUX_PAM > + BR2_INIT_SYSTEMD-> fails, system-auth is not in /etc/pam.d in the > target folder. I don't know what happen at runtime (because I cannot > login) in that case I also find > target/usr/share/factory/etc/pam.d/system-auth Thanks for the clarification. > > Do you think with/without systemd case should be fixed differently ? > In any case the missing file seems to be /etc/pam.d/system-auth. Yes, the file is present with systemd, but it is not copied during boot by systemd-tmpfiles.service. > > St?phane > [SNIP] Would you like to tell me, which command you are using with QEMU? I would like to check, what happened (if I find the time to). Thanks, Raphael Pavlidis From peter at korsgaard.com Tue Feb 28 20:39:06 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:39:06 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/wpewebkit: security bump to version 2.38.4 Message-ID: <20230228204338.A1DB786DC3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4313220d768a359ff1c688c19dd1d6a2f37322e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.4.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit 02ace135ee0d31d30021cd000d0594bb6360ca94) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index ccd928b3df..dcd082e045 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.3.tar.xz.sums -md5 60f79ff8dc68280f756963af23b67d6d wpewebkit-2.38.3.tar.xz -sha1 de15119a0dc29776d3a11fca1df4238b471f960f wpewebkit-2.38.3.tar.xz -sha256 1dd9075eec7253a1b0d038a73f92ddbb9174394e6a7527ec07b4464fa6290498 wpewebkit-2.38.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums +md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz +sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz +sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 8ddee503e0..b9c2fef395 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.3 +WPEWEBKIT_VERSION = 2.38.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 20:38:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:38:45 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/webkitgtk: security bump to version 2.38.4 Message-ID: <20230228204338.97D5786DC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c486d4fa4a53c28e83f28af7e6e6ecd855ba9a7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Bugfix release, with many security fixes, including (but not limited to) patches for CVE-2023-23517, CVE-2023-23518, and CVE-2022-42826. Release notes: https://webkitgtk.org/2023/02/02/webkitgtk2.38.4-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit ca203080d132d44fc0b62148066b85cce66628fa) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index eff7f5c18f..34fd19d3de 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums -md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz -sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz -sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums +md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz +sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz +sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 22845af8b4..a6974db926 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.3 +WEBKITGTK_VERSION = 2.38.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From peter at korsgaard.com Tue Feb 28 20:47:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:47:36 +0100 Subject: [Buildroot] [git commit] package/nodejs: add patch to adjust default NodeJS search path In-Reply-To: <20230210231402.BA856852D1@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 11 Feb 2023 00:11:29 +0100") References: <20230210231402.BA856852D1@busybox.osuosl.org> Message-ID: <87h6v5h5zr.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=0de216f95fc28c57cc430f39f011d5f88ead083b > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > By default, NodeJS searches global modules in /usr/lib/node, but NPM > installs them in /usr/lib/node_modules/. Therefore by default, if one > installs modules with BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL, they are > not accessible by NodeJS, unless by passing a > NODE_PATH=/usr/lib/node_modules/ variable. Since this is not obvious, > and it's nicer when things work out of the box, we simply patch NodeJS > to look for modules at the right place. > See > https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package > for some discussions on this topic. > Signed-off-by: Thomas Petazzoni > Reviewed-by: Romain Naour > Signed-off-by: Yann E. MORIN Committed to 2022.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 20:56:59 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:56:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 In-Reply-To: <20230211183142.397167-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 11 Feb 2023 19:31:42 +0100") References: <20230211183142.397167-1-bernd.kuhls@t-online.de> Message-ID: <87cz5th5k4.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.x.org/archives/xorg-announce/2023-February/003321.html > Fixes CVE-2023-0494: > https://lists.x.org/archives/xorg-announce/2023-February/003320.html > Signed-off-by: Bernd Kuhls Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 21:05:43 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:05:43 +0100 Subject: [Buildroot] [PATCH] support/dependencies/dependencies.sh: require diagnostics perl package for mosh In-Reply-To: <20230210150456.4535-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 10 Feb 2023 16:04:56 +0100") References: <20230210150456.4535-1-peter@korsgaard.com> Message-ID: <878rghh55k.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ > scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: > make[3]: Entering directory > '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' > perl -Mdiagnostics -c ./mosh.pl > Can't locate diagnostics.pm in @INC (you may need to install the > diagnostics module) (@INC contains: > /home/buildroot/autobuild/instance-2/output-1/host/lib/perl > /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 > /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl > /usr/lib64/perl5 /usr/share/perl5). > BEGIN failed--compilation aborted. > So add a check for it in dependencies.sh similar to the other perl modules. > Signed-off-by: Peter Korsgaard Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 21:13:55 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:13:55 +0100 Subject: [Buildroot] [PATCH 1/2] support/download: catch post-process errors In-Reply-To: <20230210223143.1060114-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Fri, 10 Feb 2023 23:31:42 +0100") References: <20230210223143.1060114-1-yann.morin.1998@free.fr> Message-ID: <874jr5h4rw.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Currently, when the post-process helper fails while downloading from > upstream, there is no fallback to the backup mirror. > In case the post-process helper fails, we mut consider that to be a > download failure, so we must bail out as if the download backend itself > did fail, but we fail to do so. > Duplicate the logic we have for the download helper: if the post-process > helper fails, remove the downloaded stuff, and continue on to the next > URI, which will ultimately hit the backup mirror (if one has been > configured). > Reported-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From bernd.kuhls at t-online.de Tue Feb 28 21:22:15 2023 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 28 Feb 2023 22:22:15 +0100 Subject: [Buildroot] [git commit branch/next] package/{mesa3d, mesa3d-headers}: bump version to 22.3.4 References: <20230220205242.72DA9828C8@busybox.osuosl.org> Message-ID: Am Tue, 28 Feb 2023 16:48:51 +0100 schrieb Jens Maus via buildroot: > Sorry if replying to this mail does not seem to be appropriate, but I > just tested the latest Buildroot 2023.02-rc2 version and noticed that > the builds of the mesa3d package immediately stopped working because in > 22.3.x version of mesa3d the ?glslangValidator? tool seem to be a new > dependency of mesa3d and the Buildroot package does not install this > host tool itself (no gaslang-tools package), thus the build fails if the > build host itself does not have this build tool installed. Hi Jens, do these patches fix the problem? http://patchwork.ozlabs.org/project/buildroot/list/?series=333585 Regards, Bernd From peter at korsgaard.com Tue Feb 28 20:45:45 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:45:45 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/nodejs: add patch to adjust default NodeJS search path Message-ID: <20230228212455.1765086DDA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d326dc09d6b119454a09b383ae08d1a6986c28d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x By default, NodeJS searches global modules in /usr/lib/node, but NPM installs them in /usr/lib/node_modules/. Therefore by default, if one installs modules with BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL, they are not accessible by NodeJS, unless by passing a NODE_PATH=/usr/lib/node_modules/ variable. Since this is not obvious, and it's nicer when things work out of the box, we simply patch NodeJS to look for modules at the right place. See https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package for some discussions on this topic. Signed-off-by: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 0de216f95fc28c57cc430f39f011d5f88ead083b) Signed-off-by: Peter Korsgaard --- ...l-modules-cjs-loader.js-adjust-default-pa.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch new file mode 100644 index 0000000000..5b93998e5e --- /dev/null +++ b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch @@ -0,0 +1,36 @@ +From a31425bdfcb5d695ab25c3d295898326784cffec Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 25 Sep 2022 11:10:06 +0200 +Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to + search modules + +NPM installs modules in /usr/lib/node_modules/, but by default NodeJS +searches for them only in /usr/lib/node/. We could also set the +NODE_PATH environment variable, but it is more convienient to have +NodeJS configured by default to find modules where they are installed. + +This issue is discussed at +https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package. + +Signed-off-by: Thomas Petazzoni +--- + lib/internal/modules/cjs/loader.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js +index f1971c40a4..5fe3884156 100644 +--- a/lib/internal/modules/cjs/loader.js ++++ b/lib/internal/modules/cjs/loader.js +@@ -1261,7 +1261,8 @@ Module._initPaths = function() { + path.resolve(process.execPath, '..') : + path.resolve(process.execPath, '..', '..'); + +- const paths = [path.resolve(prefixDir, 'lib', 'node')]; ++ const paths = [path.resolve(prefixDir, 'lib', 'node'), ++ path.resolve(prefixDir, 'lib', 'node_modules')]; + + if (homeDir) { + ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); +-- +2.37.3 + From peter at korsgaard.com Tue Feb 28 20:55:39 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:55:39 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 Message-ID: <20230228212455.2166B86DDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a2b638bc58b76aa9e4f347191bf10b68bcc3c0c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003321.html Fixes CVE-2023-0494: https://lists.x.org/archives/xorg-announce/2023-February/003320.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit d8f0c02574b485e3250030d8cbf5c057ced578a7) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 0c3c807ff3..e2a2a251c3 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003310.html -sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz -sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003321.html +sha256 d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb xorg-server-21.1.7.tar.xz +sha512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5 xorg-server-21.1.7.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 04eb5e90b7..33b35b7979 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.6 +XSERVER_XORG_SERVER_VERSION = 21.1.7 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From peter at korsgaard.com Tue Feb 28 21:12:21 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:12:21 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/download: catch post-process errors Message-ID: <20230228212455.3672B86DDD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f8b83f5e4ff3484fc39987652c31e1847ac1725 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes: http://autobuild.buildroot.net/results/12a/12a63ae177fe3ed0c9a1ef2fa01870f334f36b0f/ Currently, when the post-process helper fails while downloading from upstream, there is no fallback to the backup mirror. In case the post-process helper fails, we must consider that to be a download failure, so we must bail out as if the download backend itself did fail, but we fail to do so. Duplicate the logic we have for the download helper: if the post-process helper fails, remove the downloaded stuff, and continue on to the next URI, which will ultimately hit the backup mirror (if one has been configured). Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit a39116b5dba6cf0695620e2ba5302f21fa80a4a5) Signed-off-by: Peter Korsgaard --- support/download/dl-wrapper | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 09a6ac1f1a..1e8d6058f6 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -138,9 +138,15 @@ main() { fi if [ -n "${post_process}" ] ; then - "${OLDPWD}/support/download/${post_process}-post-process" \ - -o "${tmpf}" \ - -n "${raw_base_name}" + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + then + # cd back to keep path coherence + cd "${OLDPWD}" + rm -rf "${tmpd}" + continue + fi fi # cd back to free the temp-dir, so we can remove it later From peter at korsgaard.com Tue Feb 28 20:57:18 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:57:18 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] support/dependencies/dependencies.sh: require diagnostics perl package for mosh Message-ID: <20230228212455.2C31886DDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57a66d1f60a8b585555299dac705e091c890a857 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x Fixes: http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' perl -Mdiagnostics -c ./mosh.pl Can't locate diagnostics.pm in @INC (you may need to install the diagnostics module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5). BEGIN failed--compilation aborted. So add a check for it in dependencies.sh similar to the other perl modules. Signed-off-by: Peter Korsgaard (cherry picked from commit 5be2d9bb621e3f3aa552516c8887a7821ed62788) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 89ed3c9df9..70e951a7e6 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -290,6 +290,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules diagnostics" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From peter at korsgaard.com Tue Feb 28 20:57:09 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:57:09 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/dependencies/dependencies.sh: require diagnostics perl package for mosh Message-ID: <20230228212610.3FB9E86DEB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=470dd91a5a7fa04993656c099ec17ab91f85e3b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes: http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' perl -Mdiagnostics -c ./mosh.pl Can't locate diagnostics.pm in @INC (you may need to install the diagnostics module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5). BEGIN failed--compilation aborted. So add a check for it in dependencies.sh similar to the other perl modules. Signed-off-by: Peter Korsgaard (cherry picked from commit 5be2d9bb621e3f3aa552516c8887a7821ed62788) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 89ed3c9df9..70e951a7e6 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -290,6 +290,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules diagnostics" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From peter at korsgaard.com Tue Feb 28 21:09:36 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:09:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/download: catch post-process errors Message-ID: <20230228212610.4A75886DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f9cbe8bc85ac6234c628c1a8ca04bda796fb7d0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes: http://autobuild.buildroot.net/results/12a/12a63ae177fe3ed0c9a1ef2fa01870f334f36b0f/ Currently, when the post-process helper fails while downloading from upstream, there is no fallback to the backup mirror. In case the post-process helper fails, we must consider that to be a download failure, so we must bail out as if the download backend itself did fail, but we fail to do so. Duplicate the logic we have for the download helper: if the post-process helper fails, remove the downloaded stuff, and continue on to the next URI, which will ultimately hit the backup mirror (if one has been configured). Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit a39116b5dba6cf0695620e2ba5302f21fa80a4a5) Signed-off-by: Peter Korsgaard --- support/download/dl-wrapper | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 09a6ac1f1a..1e8d6058f6 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -138,9 +138,15 @@ main() { fi if [ -n "${post_process}" ] ; then - "${OLDPWD}/support/download/${post_process}-post-process" \ - -o "${tmpf}" \ - -n "${raw_base_name}" + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + then + # cd back to keep path coherence + cd "${OLDPWD}" + rm -rf "${tmpd}" + continue + fi fi # cd back to free the temp-dir, so we can remove it later From peter at korsgaard.com Tue Feb 28 20:56:05 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 21:56:05 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 Message-ID: <20230228212610.3517886DEA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d48b5b3652a1c724a4c04d97ab35f4c1484a9785 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003321.html Fixes CVE-2023-0494: https://lists.x.org/archives/xorg-announce/2023-February/003320.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit d8f0c02574b485e3250030d8cbf5c057ced578a7) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 0c3c807ff3..e2a2a251c3 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003310.html -sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz -sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003321.html +sha256 d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb xorg-server-21.1.7.tar.xz +sha512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5 xorg-server-21.1.7.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 04eb5e90b7..33b35b7979 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.6 +XSERVER_XORG_SERVER_VERSION = 21.1.7 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From peter at korsgaard.com Tue Feb 28 21:32:57 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:32:57 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/zabbix: fix BR2_SHARED_STATIC_LIBS In-Reply-To: <20230212124421.17787-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 12 Feb 2023 13:44:21 +0100") References: <20230212124421.17787-1-fontaine.fabrice@gmail.com> Message-ID: <87zg8xfpbq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > zabbix uses custom --enable-{static,shared} options, instead of standard > libtool directives resulting in the following build failure with openssl > or libcurl: > configure:13132: > /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -Ofast -g0 > -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -rdynamic -static > -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib > conftest.c -lssl -lcrypto -lm >&5 > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: > /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): > in function `dlfcn_globallookup': > dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked > applications requires at runtime the shared libraries from the glibc > version used for linking > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: > /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): > in function `BIO_lookup_ex': > b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically > linked applications requires at runtime the shared libraries from the > glibc version used for linking > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: > /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): > in function `BIO_gethostbyname': > b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically > linked applications requires at runtime the shared libraries from the > glibc version used for linking > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: > /tmp/cceWHjDi.o: in function `main': > conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' > [...] > configure: error: OpenSSL library libssl or libcrypto not found > --- > configure:15199: checking for main in -lz > configure:15219: > /home/autobuild/autobuild/instance-13/output-1/host/bin/s390x-buildroot-linux-gnu-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 > -I/home/autobuild/autobuild/instance-13/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -rdynamic -static > -L/home/autobuild/autobuild/instance-13/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib > conftest.c -lz -lm >&5 > /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/10.3.0/../../../../s390x-buildroot-linux-gnu/bin/ld: > cannot find -lz > collect2: error: ld returned 1 exit status > [...] > configure: error: static library z required for linking libcurl not found > Fixes: > - http://autobuild.buildroot.org/results/c05230d13fa0538323bb77e8f35533e6dd02453f > - http://autobuild.buildroot.org/results/cc947038510e16417298b381521f226f7c45f986 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Update commit log and comment Committed to 2022.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 28 21:31:28 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:31:28 +0100 Subject: [Buildroot] [git commit branch/2022.11.x] package/zabbix: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230228214026.9640486DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4621c597416b75ca60f9b61270dca5fe26181652 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.11.x zabbix uses custom --enable-{static,shared} options, instead of standard libtool directives resulting in the following build failure with openssl or libcurl: configure:13132: /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib conftest.c -lssl -lcrypto -lm >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): in function `dlfcn_globallookup': dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): in function `BIO_lookup_ex': b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): in function `BIO_gethostbyname': b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /tmp/cceWHjDi.o: in function `main': conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' [...] configure: error: OpenSSL library libssl or libcrypto not found Signed-off-by: Yann E. MORIN (cherry picked from commit 895686180fa73a23f2e4e9ee374618fa259a79ce) Signed-off-by: Peter Korsgaard --- package/zabbix/zabbix.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index adc54028ad..e00d693ba5 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -125,6 +125,13 @@ endif endif # BR2_PACKAGE_ZABBIX_SERVER +# zabbix uses custom --enable-{static,shared} options, instead of +# standard libtool directives resulting in a build failure with libcurl +# or openssl. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ZABBIX_CONF_OPTS += --disable-static +endif + define ZABBIX_INSTALL_INIT_SYSTEMD $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ From peter at korsgaard.com Tue Feb 28 21:32:08 2023 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 28 Feb 2023 22:32:08 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zabbix: fix BR2_SHARED_STATIC_LIBS Message-ID: <20230228214133.EE0B686DF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=160d949f05137dcf280c20efeca6d832f034c5bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x zabbix uses custom --enable-{static,shared} options, instead of standard libtool directives resulting in the following build failure with openssl or libcurl: configure:13132: /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib conftest.c -lssl -lcrypto -lm >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): in function `dlfcn_globallookup': dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): in function `BIO_lookup_ex': b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): in function `BIO_gethostbyname': b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /tmp/cceWHjDi.o: in function `main': conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' [...] configure: error: OpenSSL library libssl or libcrypto not found Signed-off-by: Yann E. MORIN (cherry picked from commit 895686180fa73a23f2e4e9ee374618fa259a79ce) Signed-off-by: Peter Korsgaard --- package/zabbix/zabbix.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index adc54028ad..e00d693ba5 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -125,6 +125,13 @@ endif endif # BR2_PACKAGE_ZABBIX_SERVER +# zabbix uses custom --enable-{static,shared} options, instead of +# standard libtool directives resulting in a build failure with libcurl +# or openssl. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ZABBIX_CONF_OPTS += --disable-static +endif + define ZABBIX_INSTALL_INIT_SYSTEMD $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ From fontaine.fabrice at gmail.com Tue Feb 28 22:07:39 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 28 Feb 2023 23:07:39 +0100 Subject: [Buildroot] [PATCH 1/3] package/proftpd: add libidn2 optional dependency Message-ID: <20230228220741.54827-1-fontaine.fabrice@gmail.com> libidn2 is an optional dependency which is enabled by default since version 1.3.8 and https://github.com/proftpd/proftpd/commit/5f61ac028e0930e7de9ea2a00864ccb6dc048f64 Signed-off-by: Fabrice Fontaine --- package/proftpd/proftpd.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 8e7d108c9e..d3b6308185 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -27,6 +27,10 @@ PROFTPD_CONF_OPTS = \ --with-gnu-ld \ --without-openssl-cmdline +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +PROFTPD_DEPENDENCIES += libidn2 +endif + ifeq ($(BR2_PACKAGE_PROFTPD_MOD_CAP),y) PROFTPD_CONF_OPTS += --enable-cap PROFTPD_DEPENDENCIES += libcap -- 2.39.1 From fontaine.fabrice at gmail.com Tue Feb 28 22:07:40 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 28 Feb 2023 23:07:40 +0100 Subject: [Buildroot] [PATCH 2/3] package/proftpd: add pcre2 optional dependency In-Reply-To: <20230228220741.54827-1-fontaine.fabrice@gmail.com> References: <20230228220741.54827-1-fontaine.fabrice@gmail.com> Message-ID: <20230228220741.54827-2-fontaine.fabrice@gmail.com> pcre2 is an optional dependency since version 1.3.8 and https://github.com/proftpd/proftpd/commit/e63cf016f574890c4096d587b8b1f55d87ac05d5 Signed-off-by: Fabrice Fontaine --- package/proftpd/proftpd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index d3b6308185..398155222d 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -31,6 +31,13 @@ ifeq ($(BR2_PACKAGE_LIBIDN2),y) PROFTPD_DEPENDENCIES += libidn2 endif +ifeq ($(BR2_PACKAGE_PCRE2),y) +PROFTPD_CONF_OPTS += --enable-pcre2 +PROFTPD_DEPENDENCIES += pcre2 +else +PROFTPD_CONF_OPTS += --disable-pcre2 +endif + ifeq ($(BR2_PACKAGE_PROFTPD_MOD_CAP),y) PROFTPD_CONF_OPTS += --enable-cap PROFTPD_DEPENDENCIES += libcap -- 2.39.1 From fontaine.fabrice at gmail.com Tue Feb 28 22:07:41 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 28 Feb 2023 23:07:41 +0100 Subject: [Buildroot] [PATCH 3/3] package/proftpd: needs dynamic library In-Reply-To: <20230228220741.54827-1-fontaine.fabrice@gmail.com> References: <20230228220741.54827-1-fontaine.fabrice@gmail.com> Message-ID: <20230228220741.54827-3-fontaine.fabrice@gmail.com> proftpd doesn't build statically because it does not use pkg-config to retrieve its dependencies since its addition in commit 5d173ec4122b89857e6d93fc337311b1f87631c9: /tmp/instance-13/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: /tmp/instance-13/output-1/host/arc-buildroot-linux-uclibc/sysroot/usr/lib/libidn2.a(libunistring_la-striconveh.o): in function `iconv_carefully_1': buildroot/build/libidn2-2.3.4/unistring/striconveh.c:233: undefined reference to `libiconv' [...] /tmp/instance-5/output-1/host/lib/gcc/arceb-buildroot-linux-uclibc/10.2.0/../../../../arceb-buildroot-linux-uclibc/bin/ld: /tmp/instance-5/output-1/host/arceb-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(bio_lib.o): in function `BIO_free': bio_lib.c:(.text+0x3f2): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/09f3f37b63dc68d31b18816b818df86fa3be095c - http://autobuild.buildroot.org/results/2aba5297206e44dc086c3138ace70e85739196f3 Signed-off-by: Fabrice Fontaine --- package/proftpd/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in index 33ad2cea54..8ac1da3fed 100644 --- a/package/proftpd/Config.in +++ b/package/proftpd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PROFTPD bool "proftpd" depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS help ProFTPD, a highly configurable FTP server. @@ -105,3 +106,7 @@ config BR2_PACKAGE_PROFTPD_BUFFER_SIZE 0 uses the default size of 1024. endif + +comment "proftpd needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS -- 2.39.1 From ps.report at gmx.net Tue Feb 28 22:16:25 2023 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 28 Feb 2023 23:16:25 +0100 Subject: [Buildroot] [PATCH v1] package/apr: security bump version to 1.7.2 Message-ID: <20230228221625.32577-1-ps.report@gmx.net> - remove 0001-cross-compile.patch (superseeded by upstream commit [1]) - rename 0002-sys-param-h.patch to 0001-sys-param-h.patch - remove 0003-Merge-r1887279-from-trunk.patch (from upstream [2]) - remove 0004-apr-1.7.0-CVE-2021-35940.patch (superseeded by upstream commit [3], remove APR_IGNORE_CVES accordingly) - set new configure option '--disable-sctp' (no libsctp provided by buildroot) - set new 'ac_cv_strerror_r_rc_int' explicitly to no (default for cross compile) - set new 'ac_cv_mmap__dev_zero' explicitly to yes - revert two upstream commits ([4], [5]) to fix apr-util build, fails otherwise because of some path mismatch where to find apr_rules.mk copied to apr-util-1.6.3/build/rules.mk, fixes: Makefile:50: .../build/apr-util-1.6.3/build/rules.mk: No such file or directory For details see [6]. [1] https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a [2] https://github.com/apache/apr/commit/0a763c5e500f4304b7c534fae0fad430d64982e8 [3] https://github.com/apache/apr/commit/e0be630b681fac7b8b5e2f2e402a8e18a147f966 [4] https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1 [5] https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c [6] https://downloads.apache.org/apr/CHANGES-APR-1.7 Signed-off-by: Peter Seiderer --- package/apr/0001-cross-compile.patch | 58 --------- ...s-param-h.patch => 0001-sys-param-h.patch} | 0 ...r1872164.-Fix-the-name-of-libtool-wh.patch | 30 +++++ .../apr/0003-Merge-r1887279-from-trunk.patch | 69 ----------- ...Add-the-ability-to-cross-compile-APR.patch | 112 ++++++++++++++++++ .../apr/0004-apr-1.7.0-CVE-2021-35940.patch | 57 --------- package/apr/apr.hash | 4 +- package/apr/apr.mk | 7 +- 8 files changed, 148 insertions(+), 189 deletions(-) delete mode 100644 package/apr/0001-cross-compile.patch rename package/apr/{0002-sys-param-h.patch => 0001-sys-param-h.patch} (100%) create mode 100644 package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch delete mode 100644 package/apr/0003-Merge-r1887279-from-trunk.patch create mode 100644 package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch delete mode 100644 package/apr/0004-apr-1.7.0-CVE-2021-35940.patch diff --git a/package/apr/0001-cross-compile.patch b/package/apr/0001-cross-compile.patch deleted file mode 100644 index 559ebb74ba..0000000000 --- a/package/apr/0001-cross-compile.patch +++ /dev/null @@ -1,58 +0,0 @@ -Fix cross-compilation - -Patch was backported from Apache httpd: -http://svn.apache.org/viewvc?view=revision&revision=1327907 -http://svn.apache.org/viewvc?view=revision&revision=1328390 -http://svn.apache.org/viewvc?view=revision&revision=1328714 - -Patch submitted upstream: -https://issues.apache.org/bugzilla/show_bug.cgi?id=57058 - -Signed-off-by: Bernd Kuhls - -diff -uNr apr-1.5.1.org/configure.in apr-1.5.1/configure.in ---- apr-1.5.1.org/configure.in 2014-01-25 16:17:29.000000000 +0100 -+++ apr-1.5.1/configure.in 2014-10-05 11:20:40.080746760 +0200 -@@ -118,6 +118,16 @@ - echo "Configuring APR library" - echo "Platform: $host" - -+dnl In case of cross compilation we set CC_FOR_BUILD to cc unless -+dnl we got already CC_FOR_BUILD from environment. -+if test "x${build_alias}" != "x${host_alias}"; then -+ if test "x${CC_FOR_BUILD}" = "x"; then -+ CC_FOR_BUILD=cc -+ fi -+fi -+AC_SUBST(CC_FOR_BUILD) -+AC_SUBST(CFLAGS_FOR_BUILD) -+ - dnl Some initial steps for configuration. We setup the default directory - dnl and which files are to be configured. - -diff -uNr apr-1.5.1.org/Makefile.in apr-1.5.1/Makefile.in ---- apr-1.5.1.org/Makefile.in 2014-03-17 16:10:26.000000000 +0100 -+++ apr-1.5.1/Makefile.in 2014-10-05 11:22:53.031070519 +0200 -@@ -8,6 +8,8 @@ - # APR (Apache Portable Runtime) library Makefile. - # - CPP = @CPP@ -+CC_FOR_BUILD = @CC_FOR_BUILD@ -+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ - - # get substituted into some targets - APR_MAJOR_VERSION=@APR_MAJOR_VERSION@ -@@ -134,8 +134,13 @@ - $(APR_MKDIR) tools - $(LT_COMPILE) - -+ifdef CC_FOR_BUILD -+tools/gen_test_char at EXEEXT@: tools/gen_test_char.c $(LOCAL_LIBS) -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $< -+else - tools/gen_test_char at EXEEXT@: $(OBJECTS_gen_test_char) - $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) -+endif - - include/private/apr_escape_test_char.h: tools/gen_test_char at EXEEXT@ - $(APR_MKDIR) include/private diff --git a/package/apr/0002-sys-param-h.patch b/package/apr/0001-sys-param-h.patch similarity index 100% rename from package/apr/0002-sys-param-h.patch rename to package/apr/0001-sys-param-h.patch diff --git a/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch b/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch new file mode 100644 index 0000000000..f80db1cb6b --- /dev/null +++ b/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch @@ -0,0 +1,30 @@ +From 0aa7e33372b479a26e5f04dfc4801e24573a8737 Mon Sep 17 00:00:00 2001 +From: Graham Leggett +Date: Wed, 1 Jan 2020 10:43:39 +0000 +Subject: [PATCH] Revert: Backport r1872164. Fix the name of libtool when + cross compiling. + +git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x at 1872165 13f79535-47bb-0310-9956-ffa450edef68 + +[Revert upstream commit https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1] +Signed-off-by: Peter Seiderer +--- + apr-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apr-config.in b/apr-config.in +index bed47ca..4873fc0 100644 +--- a/apr-config.in ++++ b/apr-config.in +@@ -246,7 +246,7 @@ while test $# -gt 0; do + if test "$location" = "installed"; then + echo "${installbuilddir}/libtool" + elif test "$location" = "crosscompile"; then +- echo "$APR_TARGET_DIR/${installbuilddir}/libtool" ++ echo "$APR_TARGET_DIR/${installbuilddir}/build" + else + echo "$APR_BUILD_DIR/libtool" + fi +-- +2.39.2 + diff --git a/package/apr/0003-Merge-r1887279-from-trunk.patch b/package/apr/0003-Merge-r1887279-from-trunk.patch deleted file mode 100644 index 444b9d2b06..0000000000 --- a/package/apr/0003-Merge-r1887279-from-trunk.patch +++ /dev/null @@ -1,69 +0,0 @@ -From a15958a37a06f71c42c690278f9c958b93b7ee20 Mon Sep 17 00:00:00 2001 -From: Yann Ylavic -Date: Thu, 11 Mar 2021 14:10:21 +0000 -Subject: [PATCH] Merge r1887279 from trunk: - -build/apr_common.m4: avoid explicit inclusion of "confdefs.h" - -The failure is observed on `autoconf-2.69d` (soon to be released -as `autoconf-2.70`). There `int64_t` detection fails as: - -$ autoreconf && ./configure -checking whether int64_t and int use fmt %d... no -checking whether int64_t and long use fmt %ld... no -checking whether int64_t and long long use fmt %lld... no -configure: error: could not determine the string function for int64_t -``` - -This happens because `./configure` always stumbles on warning: - -configure:3350: gcc -c -g -O2 -Werror conftest.c >&5 -In file included from conftest.c:31: -confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror] - 22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 - | - -It's triggered by double inclusion of `"confdefs.h"` contents: -explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly -via `AC_LANG_SOURCE` use. - -To fix it and avoid having to define `main()` declaration the change -uses `AC_LANG_PROGRAM` instead. - -Tested on both `autoconf-2.69` and `autoconf-2.69d`. - - -Github: closes #25 -Submitted by: Sergei Trofimovich -Reviewed by: ylavic - - -git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x at 1887485 13f79535-47bb-0310-9956-ffa450edef68 - -[Retrieved from: -https://github.com/apache/apr/commit/0a763c5e500f4304b7c534fae0fad430d64982e8] -Signed-off-by: Fabrice Fontaine ---- - build/apr_common.m4 | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/build/apr_common.m4 b/build/apr_common.m4 -index 297dd32cf75..b67a8608abe 100644 ---- a/build/apr_common.m4 -+++ b/build/apr_common.m4 -@@ -467,13 +467,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], - CFLAGS="$CFLAGS -Werror" - fi - AC_COMPILE_IFELSE( -- [AC_LANG_SOURCE( -- [#include "confdefs.h" -- ] -- [[$1]] -- [int main(int argc, const char *const *argv) {] -+ [AC_LANG_PROGRAM( -+ [[$1]], - [[$2]] -- [ return 0; }] - )], [CFLAGS=$apr_save_CFLAGS - $3], [CFLAGS=$apr_save_CFLAGS - $4]) diff --git a/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch b/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch new file mode 100644 index 0000000000..ad250d4427 --- /dev/null +++ b/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch @@ -0,0 +1,112 @@ +From ed1daed074fba0dabff825e63525d751b6bb7b8d Mon Sep 17 00:00:00 2001 +From: Graham Leggett +Date: Tue, 31 Dec 2019 21:26:02 +0000 +Subject: [PATCH] Revert: Add the ability to cross compile APR. + +git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x at 1872147 13f79535-47bb-0310-9956-ffa450edef68 + +[Revert upstream commit https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c] +Signed-off-by: Peter Seiderer +--- + CHANGES | 2 -- + apr-config.in | 22 ---------------------- + 2 files changed, 24 deletions(-) + +diff --git a/CHANGES b/CHANGES +index 71b2f0e..e751c90 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -56,8 +56,6 @@ Changes for APR 1.7.1 + *) Don't try to use PROC_PTHREAD by default when cross compiling. + [Yann Ylavic] + +- *) Add the ability to cross compile APR. [Graham Leggett] +- + *) While cross-compiling, the tools/gen_test_char could not + be executed at build time, use AX_PROG_CC_FOR_BUILD to + build native tools/gen_test_char +diff --git a/apr-config.in b/apr-config.in +index 4873fc0..84b4073 100644 +--- a/apr-config.in ++++ b/apr-config.in +@@ -48,14 +48,6 @@ APR_LIBNAME="@APR_LIBNAME@" + # NOTE: the following line is modified during 'make install': alter with care! + location=@APR_CONFIG_LOCATION@ + +-# absolute path, but not installed path - we're cross compiling +-case "$0" in +- "${bindir}/"*) ;; +- "/"*) location=crosscompile; +- APR_TARGET_DIR=${0%${bindir}/apr-${APR_MAJOR_VERSION}-config} ;; +- *) ;; +-esac +- + show_usage() + { + cat << EOF +@@ -101,8 +93,6 @@ fi + + if test "$location" = "installed"; then + LA_FILE="$libdir/lib${APR_LIBNAME}.la" +-elif test "$location" = "crosscompile"; then +- LA_FILE="$APR_TARGET_DIR/$libdir/lib${APR_LIBNAME}.la" + else + LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la" + fi +@@ -132,8 +122,6 @@ while test $# -gt 0; do + --includedir) + if test "$location" = "installed"; then + flags="$includedir" +- elif test "$location" = "crosscompile"; then +- flags="$APR_TARGET_DIR/$includedir" + elif test "$location" = "source"; then + flags="$APR_SOURCE_DIR/include" + else +@@ -166,8 +154,6 @@ while test $# -gt 0; do + --includes) + if test "$location" = "installed"; then + flags="$flags -I$includedir $EXTRA_INCLUDES" +- elif test "$location" = "crosscompile"; then +- flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES" + elif test "$location" = "source"; then + flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" + else +@@ -182,8 +168,6 @@ while test $# -gt 0; do + --installbuilddir) + if test "$location" = "installed"; then + echo "${installbuilddir}" +- elif test "$location" = "crosscompile"; then +- echo "$APR_TARGET_DIR/${installbuilddir}" + elif test "$location" = "source"; then + echo "$APR_SOURCE_DIR/build" + else +@@ -200,8 +184,6 @@ while test $# -gt 0; do + if test "$location" = "installed"; then + ### avoid using -L if libdir is a "standard" location like /usr/lib + flags="$flags -L$libdir -l${APR_LIBNAME}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}" + else + ### this surely can't work since the library is in .libs? + flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" +@@ -219,8 +201,6 @@ while test $# -gt 0; do + # Since the user is specifying they are linking with libtool, we + # *know* that -R will be recognized by libtool. + flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}" + else + flags="$flags $LA_FILE" + fi +@@ -245,8 +225,6 @@ while test $# -gt 0; do + --apr-libtool) + if test "$location" = "installed"; then + echo "${installbuilddir}/libtool" +- elif test "$location" = "crosscompile"; then +- echo "$APR_TARGET_DIR/${installbuilddir}/build" + else + echo "$APR_BUILD_DIR/libtool" + fi +-- +2.39.2 + 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 deleted file mode 100644 index b065a3330a..0000000000 --- a/package/apr/0004-apr-1.7.0-CVE-2021-35940.patch +++ /dev/null @@ -1,57 +0,0 @@ - -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.hash b/package/apr/apr.hash index d7739d7ed3..96f43d3710 100644 --- a/package/apr/apr.hash +++ b/package/apr/apr.hash @@ -1,4 +1,4 @@ -# From http://archive.apache.org/dist/apr/apr-1.7.0.tar.bz2.sha256 -sha256 e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea apr-1.7.0.tar.bz2 +# From https://archive.apache.org/dist/apr/apr-1.7.2.tar.bz2.sha256 +sha256 75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e apr-1.7.2.tar.bz2 # Locally calculated sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE diff --git a/package/apr/apr.mk b/package/apr/apr.mk index 77217ccbb3..bdc5e915c6 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -4,7 +4,7 @@ # ################################################################################ -APR_VERSION = 1.7.0 +APR_VERSION = 1.7.2 APR_SOURCE = apr-$(APR_VERSION).tar.bz2 APR_SITE = https://archive.apache.org/dist/apr APR_LICENSE = Apache-2.0 @@ -16,8 +16,7 @@ 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 +APR_CONF_OPTS = --disable-sctp # avoid apr_hints.m4 by setting apr_preload_done=yes and set # the needed CFLAGS on our own (avoids '-D_REENTRANT' in case @@ -32,6 +31,7 @@ APR_CONF_ENV = \ CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ CFLAGS="$(APR_CFLAGS)" \ ac_cv_file__dev_zero=yes \ + ac_cv_mmap__dev_zero=yes \ ac_cv_func_setpgrp_void=yes \ apr_cv_process_shared_works=yes \ apr_cv_mutex_robust_shared=no \ @@ -39,6 +39,7 @@ APR_CONF_ENV = \ ac_cv_sizeof_struct_iovec=8 \ ac_cv_sizeof_pid_t=4 \ ac_cv_struct_rlimit=yes \ + ac_cv_strerror_r_rc_int=no \ ac_cv_o_nonblock_inherited=no \ apr_cv_mutex_recursive=yes \ apr_cv_epoll=yes \ -- 2.39.2 From fontaine.fabrice at gmail.com Tue Feb 28 22:16:24 2023 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 28 Feb 2023 23:16:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/pugixml: drop header-only option Message-ID: <20230228221624.59583-1-fontaine.fabrice@gmail.com> Header-only option raises the following build failure with gerbera since commit cc3a4a7b1de7b158354c650d234339e8a969a730: /home/thomas/autobuild/instance-2/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.4.0/../../../../nios2-buildroot-linux-gnu/bin/ld: CMakeFiles/gerbera.dir/src/main.cc.o: in function `ConfigGenerator::~ConfigGenerator()': /home/thomas/autobuild/instance-2/output-1/build/gerbera-1.10.0/src/config/config_generator.h:33: undefined reference to `pugi::xml_document::~xml_document()' This build failure can't be fixed by adding a !BR2_PACKAGE_PUGIXML_HEADER_ONLY dependency as it will create the following recursive dependency: package/gerbera/Config.in:1:error: recursive dependency detected! package/gerbera/Config.in:1: symbol BR2_PACKAGE_GERBERA depends on BR2_PACKAGE_PUGIXML_HEADER_ONLY package/pugixml/Config.in:42: symbol BR2_PACKAGE_PUGIXML_HEADER_ONLY depends on BR2_PACKAGE_PUGIXML package/pugixml/Config.in:1: symbol BR2_PACKAGE_PUGIXML is selected by BR2_PACKAGE_GERBERA Moreover, commit 48b2e50eb8df36e3e3ab18692bd9e0dde3b38702 stated that "Compact and header-only modes are not strictly needed for our use case, but we did the work anyway and may be useful for someone else." So dropping header-only seems to be the right approach Fixes: - http://autobuild.buildroot.org/results/800537a1ef5f48d24c20aad7a9c96c56dfdc77f5 Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 6 ++++++ package/pugixml/Config.in | 9 --------- package/pugixml/pugixml.mk | 4 ---- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 381e1e3a8c..a31543d5fa 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_PUGIXML_HEADER_ONLY + bool "pugixml header-only removed" + select BR2_LEGACY + help + The header-only version raises a build failure with gerbera. + config BR2_PACKAGE_UCCP420WLAN bool "uccp420wlan removed" select BR2_LEGACY diff --git a/package/pugixml/Config.in b/package/pugixml/Config.in index 6b7d2e3259..d5a3cb3ebb 100644 --- a/package/pugixml/Config.in +++ b/package/pugixml/Config.in @@ -39,15 +39,6 @@ config BR2_PACKAGE_PUGIXML_COMPACT http://pugixml.org/docs/manual.html#dom.memory.compact -config BR2_PACKAGE_PUGIXML_HEADER_ONLY - bool "Enable header-only version" - help - All source code for pugixml will be included in every - translation unit that includes pugixml.hpp. This is how most - of Boost and STL libraries work. - - http://pugixml.org/docs/manual.html#install.building.header - endif comment "pugixml needs a toolchain w/ C++" diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index c8d59f0864..415227a40a 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -31,10 +31,6 @@ endif PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG HOST_PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG -ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) -PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY -endif - PUGIXML_CONF_OPTS += -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" HOST_PUGIXML_CONF_OPTS += \ -- 2.39.1 From stefan at agner.ch Tue Feb 28 23:55:47 2023 From: stefan at agner.ch (Stefan Agner) Date: Wed, 1 Mar 2023 00:55:47 +0100 Subject: [Buildroot] [PATCH] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.66 Message-ID: <674d788fda128807b203f3b1d8b407b5bb85948b.1677628527.git.stefan@agner.ch> bluez 5.66 contains various fixes and initial support for Basic Audio Profile and Volume Control Profile. Signed-off-by: Stefan Agner --- package/bluez5_utils-headers/bluez5_utils-headers.mk | 2 +- package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 565511120f..8ca3764935 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.65 +BLUEZ5_UTILS_HEADERS_VERSION = 5.66 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/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index e0c9f3cdb9..9467647592 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 2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4 bluez-5.65.tar.xz +sha256 39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574 bluez-5.66.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 76070dc3a9..4059b34556 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.65 +BLUEZ5_UTILS_VERSION = 5.66 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES -- 2.39.1